# failed system call counts, by pid
# (c) 2010, Tom Zanussi <tzanussi@gmail.com>
# Licensed under the terms of the GNU GPL License version 2
#
# Displays system-wide failed system call totals, broken down by pid.
# If a [comm] arg is specified, only syscalls called by [comm] are displayed.

import os
import sys

sys.path.append(os.environ['PERF_EXEC_PATH'] + \
	'/scripts/python/Perf-Trace-Util/lib/Perf/Trace')

from perf_trace_context import *
from Core import *
from Util import *

usage = "perf script -s syscall-counts-by-pid.py [comm|pid]\n";

for_comm = None
for_pid = None

if len(sys.argv) > 2:
	sys.exit(usage)

if len(sys.argv) > 1:
	try:
		for_pid = int(sys.argv[1])
	except:
		for_comm = sys.argv[1]

syscalls = autodict()

def trace_begin():
	print "Press control+C to stop and show the summary"

def trace_end():
	print_error_totals()

def raw_syscalls__sys_exit(event_name, context, common_cpu,
	common_secs, common_nsecs, common_pid, common_comm,
	id, ret):
	if (for_comm and common_comm != for_comm) or \
	   (for_pid  and common_pid  != for_pid ):
		return

	if ret < 0:
		try:
			syscalls[common_comm][common_pid][id][ret] += 1
		except TypeError:
			syscalls[common_comm][common_pid][id][ret] = 1

def print_error_totals():
    if for_comm is not None:
	    print "\nsyscall errors for %s:\n\n" % (for_comm),
    else:
	    print "\nsyscall errors:\n\n",

    print "%-30s  %10s\n" % ("comm [pid]", "count"),
    print "%-30s  %10s\n" % ("------------------------------", \
                                 "----------"),

    comm_keys = syscalls.keys()
    for comm in comm_keys:
	    pid_keys = syscalls[comm].keys()
	    for pid in pid_keys:
		    print "\n%s [%d]\n" % (comm, pid),
		    id_keys = syscalls[comm][pid].keys()
		    for id in id_keys:
			    print "  syscall: %-16s\n" % syscall_name(id),
			    ret_keys = syscalls[comm][pid][id].keys()
			    for ret, val in sorted(syscalls[comm][pid][id].iteritems(), key = lambda(k, v): (v, k),  reverse = True):
				    print "    err = %-20s  %10d\n" % (strerror(ret), val),
ue='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='h' value='v3.6-rc6'/><input type='hidden' name='id' value='567e47935a7cddd8e823c73bb8ee0b2805cd4940'/><input type='hidden' name='id2' value='f7e6746ebae984ea67b0a1a1e23c7e6698240631'/><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='/cgit/linux.git/diff/?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Diffstat</a></div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/CREDITS?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>CREDITS</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/ABI/stable/sysfs-bus-xen-backend?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/stable/sysfs-bus-xen-backend</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/ABI/stable/sysfs-devices-system-xen_memory?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/stable/sysfs-devices-system-xen_memory</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/ABI/testing/sysfs-bus-pci?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/testing/sysfs-bus-pci</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/ABI/testing/sysfs-bus-usb?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/testing/sysfs-bus-usb</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/ABI/testing/sysfs-devices-platform-docg3?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/testing/sysfs-devices-platform-docg3</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/ABI/testing/sysfs-driver-hid-multitouch?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/testing/sysfs-driver-hid-multitouch</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/ABI/testing/sysfs-driver-hid-roccat-isku?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/testing/sysfs-driver-hid-roccat-isku</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/ABI/testing/sysfs-driver-hid-wiimote?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/testing/sysfs-driver-hid-wiimote</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/ABI/testing/sysfs-driver-wacom?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/testing/sysfs-driver-wacom</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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/ABI/testing/sysfs-kernel-slab?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/testing/sysfs-kernel-slab</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/ABI/testing/sysfs-module?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/testing/sysfs-module</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/constraints.png.b64?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/constraints.png.b64</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/dvb/dvbproperty.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/dvb/dvbproperty.xml</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/dvb/frontend.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/dvb/frontend.xml</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/selection.png.b64?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/selection.png.b64</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/biblio.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/biblio.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/common.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/common.xml</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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/compat.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/compat.xml</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/controls.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/controls.xml</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/dev-capture.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-capture.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/dev-codec.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-codec.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/dev-effect.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-effect.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/dev-event.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-event.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/dev-osd.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-osd.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/dev-output.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-output.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/dev-overlay.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-overlay.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/dev-radio.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-radio.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/dev-raw-vbi.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-raw-vbi.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/dev-rds.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-rds.xml</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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/dev-sliced-vbi.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-sliced-vbi.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/dev-teletext.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-teletext.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/driver.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/driver.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/func-close.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/func-close.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/func-ioctl.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/func-ioctl.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/func-mmap.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/func-mmap.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/func-munmap.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/func-munmap.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/func-open.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/func-open.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/func-poll.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/func-poll.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/func-read.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/func-read.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/func-select.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/func-select.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/func-write.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/func-write.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/io.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/io.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/libv4l.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/libv4l.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-grey.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-grey.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-m420.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-m420.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-nv12.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-nv12.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-nv12m.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-nv12m.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-nv16.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-nv16.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-nv24.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-nv24.xml</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml</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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-packed-yuv.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-packed-yuv.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-sbggr16.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-sbggr16.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-sbggr8.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-sbggr8.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-sgbrg8.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-sgbrg8.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-uyvy.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-uyvy.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-vyuy.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-vyuy.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-y16.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-y16.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-y41p.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-y41p.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-yuv410.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-yuv410.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-yuv411p.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-yuv411p.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-yuv420.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-yuv420.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-yuv422p.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-yuv422p.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-yuyv.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-yuyv.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt-yvyu.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-yvyu.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/pixfmt.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt.xml</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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/selection-api.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/selection-api.xml</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/v4l2.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/v4l2.xml</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-enum-fmt.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-enum-fmt.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-enuminput.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-enuminput.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-enumoutput.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-enumoutput.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-enumstd.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-enumstd.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-frequency.xml</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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-g-input.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-input.xml</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-g-modulator.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-modulator.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-g-output.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-output.xml</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-g-priority.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-priority.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-g-selection.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-selection.xml</a></td><td class='right'>304</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='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-g-std.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-std.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-g-tuner.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-tuner.xml</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-querybuf.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-querybuf.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-queryctrl.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-queryctrl.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/DocBook/writing-an-alsa-driver.tmpl?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/writing-an-alsa-driver.tmpl</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/HOWTO?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/HOWTO</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/acpi/apei/einj.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/acpi/apei/einj.txt</a></td><td class='right'>55</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/arm/memory.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/arm/memory.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/cgroups/cgroups.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/cgroups/cgroups.txt</a></td><td class='right'>51</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='/cgit/linux.git/diff/Documentation/cgroups/memory.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/cgroups/memory.txt</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/cgroups/net_prio.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/cgroups/net_prio.txt</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/coccinelle.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/coccinelle.txt</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/cpu-freq/governors.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/cpu-freq/governors.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/development-process/5.Posting?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/development-process/5.Posting</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/devices.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devices.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/arm/fsl.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/arm/fsl.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/arm/gic.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/arm/gic.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/arm/insignal-boards.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/arm/insignal-boards.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/arm/samsung-boards.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/arm/samsung-boards.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/arm/tegra.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/arm/tegra.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/arm/vic.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/arm/vic.txt</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/c6x/clocks.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/c6x/clocks.txt</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/c6x/dscr.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/c6x/dscr.txt</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/c6x/emifa.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/c6x/emifa.txt</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/c6x/interrupt.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/c6x/interrupt.txt</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/c6x/soc.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/c6x/soc.txt</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/c6x/timer64.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/c6x/timer64.txt</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/dma/arm-pl330.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/dma/arm-pl330.txt</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/dma/atmel-dma.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/dma/atmel-dma.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/gpio/gpio-samsung.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/gpio/gpio-samsung.txt</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/i2c/i2c-designware.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/i2c/i2c-designware.txt</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/i2c/omap-i2c.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/i2c/omap-i2c.txt</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/i2c/trivial-devices.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/i2c/trivial-devices.txt</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/input/samsung-keypad.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/input/samsung-keypad.txt</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/input/tegra-kbc.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/input/tegra-kbc.txt</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/mfd/mc13xxx.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/mfd/mc13xxx.txt</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/mfd/twl-familly.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/mfd/twl-familly.txt</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/mtd/gpio-control-nand.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/mtd/gpio-control-nand.txt</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/net/calxeda-xgmac.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/net/calxeda-xgmac.txt</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/net/can/cc770.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/net/can/cc770.txt</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/net/macb.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/net/macb.txt</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/nvec/nvec_nvidia.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/nvec/nvec_nvidia.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/power_supply/olpc_battery.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/power_supply/olpc_battery.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/power_supply/sbs_sbs-battery.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/power_supply/sbs_sbs-battery.txt</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/powerpc/fsl/srio-rmu.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/powerpc/fsl/srio-rmu.txt</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/powerpc/fsl/srio.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/powerpc/fsl/srio.txt</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/regulator/fixed-regulator.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/regulator/fixed-regulator.txt</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/regulator/regulator.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/regulator/regulator.txt</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/resource-names.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/resource-names.txt</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/rtc/s3c-rtc.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/rtc/s3c-rtc.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/rtc/twl-rtc.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/rtc/twl-rtc.txt</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/serial/omap_serial.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/serial/omap_serial.txt</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/serial/samsung_uart.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/serial/samsung_uart.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/sound/tegra-audio-wm8903.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/sound/tegra-audio-wm8903.txt</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/sound/tegra20-das.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/sound/tegra20-das.txt</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/sound/tegra20-i2s.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/sound/tegra20-i2s.txt</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/sound/wm8903.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/sound/wm8903.txt</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/sound/wm8994.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/sound/wm8994.txt</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/usb/tegra-usb.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/usb/tegra-usb.txt</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/devicetree/bindings/vendor-prefixes.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/vendor-prefixes.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/digsig.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/digsig.txt</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/dma-buf-sharing.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/dma-buf-sharing.txt</a></td><td class='right'>228</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='upd'><a href='/cgit/linux.git/diff/Documentation/dmaengine.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/dmaengine.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/dontdiff?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/dontdiff</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/driver-model/devres.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/driver-model/devres.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'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/dvb/get_dvb_firmware?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/dvb/get_dvb_firmware</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/fb/api.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/fb/api.txt</a></td><td class='right'>306</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='upd'><a href='/cgit/linux.git/diff/Documentation/feature-removal-schedule.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/feature-removal-schedule.txt</a></td><td class='right'>95</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.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/Locking?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/Locking</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/ceph.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/ceph.txt</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/configfs/configfs.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/configfs/configfs.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='/cgit/linux.git/diff/Documentation/filesystems/debugfs.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/debugfs.txt</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/ext4.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/ext4.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/nfs/00-INDEX?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/nfs/00-INDEX</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/filesystems/nfs/fault_injection.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/nfs/fault_injection.txt</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/proc.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/proc.txt</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/squashfs.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/squashfs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/sysfs.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/sysfs.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='/cgit/linux.git/diff/Documentation/filesystems/vfs.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/hwmon/it87?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/hwmon/it87</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/hwmon/lm63?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/hwmon/lm63</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/hwmon/pmbus?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/hwmon/pmbus</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/hwmon/sysfs-interface?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/hwmon/sysfs-interface</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/hwmon/zl6100?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/hwmon/zl6100</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/input/alps.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/input/alps.txt</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/input/gpio-tilt.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/input/gpio-tilt.txt</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/input/sentelic.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/input/sentelic.txt</a></td><td class='right'>364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/ioctl/ioctl-number.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ioctl/ioctl-number.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='/cgit/linux.git/diff/Documentation/kbuild/makefiles.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/kbuild/makefiles.txt</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/kdump/kdump.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/kdump/kdump.txt</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/kernel-parameters.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/kernel-parameters.txt</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/kmemleak.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/kmemleak.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='/cgit/linux.git/diff/Documentation/md.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/md.txt</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/mmc/mmc-dev-attrs.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/mmc/mmc-dev-attrs.txt</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/mmc/mmc-dev-parts.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/mmc/mmc-dev-parts.txt</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/networking/00-INDEX?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/00-INDEX</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/networking/batman-adv.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/batman-adv.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/networking/bonding.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/bonding.txt</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/networking/ieee802154.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/ieee802154.txt</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/networking/ifenslave.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/ifenslave.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/networking/ip-sysctl.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/ip-sysctl.txt</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/networking/openvswitch.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/openvswitch.txt</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/networking/packet_mmap.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/packet_mmap.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='/cgit/linux.git/diff/Documentation/networking/scaling.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/scaling.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/networking/stmmac.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/stmmac.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/networking/team.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/team.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='/cgit/linux.git/diff/Documentation/pinctrl.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/pinctrl.txt</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/power/charger-manager.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/power/charger-manager.txt</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/power/devices.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/power/devices.txt</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/power/freezing-of-tasks.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/power/freezing-of-tasks.txt</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/power/regulator/regulator.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/power/regulator/regulator.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='/cgit/linux.git/diff/Documentation/power/runtime_pm.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/power/runtime_pm.txt</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/s390/Debugging390.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/s390/Debugging390.txt</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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/scsi/53c700.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/scsi/53c700.txt</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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/scsi/ChangeLog.megaraid_sas?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/scsi/ChangeLog.megaraid_sas</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/scsi/LICENSE.qla4xxx?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/scsi/LICENSE.qla4xxx</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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/security/00-INDEX?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/security/00-INDEX</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/security/LSM.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/security/LSM.txt</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/security/credentials.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/security/credentials.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/serial/driver?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/serial/driver</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/sound/alsa/HD-Audio-Models.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/sound/alsa/HD-Audio-Models.txt</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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/sound/alsa/compress_offload.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/sound/alsa/compress_offload.txt</a></td><td class='right'>188</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='/cgit/linux.git/diff/Documentation/sysctl/kernel.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/sysctl/kernel.txt</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 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='upd'><a href='/cgit/linux.git/diff/Documentation/target/tcm_mod_builder.py?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/target/tcm_mod_builder.py</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.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='/cgit/linux.git/diff/Documentation/trace/events-kmem.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/trace/events-kmem.txt</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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/trace/postprocess/trace-pagealloc-postprocess.pl?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/trace/postprocess/trace-pagealloc-postprocess.pl</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/trace/tracepoint-analysis.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/trace/tracepoint-analysis.txt</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/usb/usbmon.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/usb/usbmon.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/vgaarbiter.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/vgaarbiter.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='/cgit/linux.git/diff/Documentation/video4linux/CARDLIST.au0828?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/CARDLIST.au0828</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/CARDLIST.bttv?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/CARDLIST.bttv</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/CARDLIST.cx23885?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/CARDLIST.cx23885</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/CARDLIST.cx88?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/CARDLIST.cx88</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/CARDLIST.em28xx?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/CARDLIST.em28xx</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/CARDLIST.saa7134?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/CARDLIST.saa7134</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/CARDLIST.saa7164?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/CARDLIST.saa7164</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/gspca.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/gspca.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='/cgit/linux.git/diff/Documentation/video4linux/v4l2-controls.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/v4l2-controls.txt</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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/v4l2-framework.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/v4l2-framework.txt</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/virtual/kvm/api.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/virtual/kvm/api.txt</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/vm/slub.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/vm/slub.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/watchdog/00-INDEX?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/watchdog/00-INDEX</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/watchdog/convert_drivers_to_kernel_api.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/watchdog/convert_drivers_to_kernel_api.txt</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/watchdog/watchdog-kernel-api.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/watchdog/watchdog-kernel-api.txt</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/MAINTAINERS?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>MAINTAINERS</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><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='/cgit/linux.git/diff/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/alpha/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/alpha/include/asm/ipcbuf.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/alpha/include/asm/socket.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/alpha/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='/cgit/linux.git/diff/arch/alpha/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/alpha/include/asm/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/pci-noop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/alpha/kernel/pci-noop.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/alpha/kernel/pci.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.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='/cgit/linux.git/diff/arch/arm/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/Kconfig</a></td><td class='right'>70</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: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/Kconfig.debug?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/Kconfig.debug</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/compressed/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/compressed/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/compressed/head.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/compressed/head.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='/cgit/linux.git/diff/arch/arm/boot/dts/at91sam9g20.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/at91sam9g20.dtsi</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/at91sam9g45.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/at91sam9g45.dtsi</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/at91sam9m10g45ek.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/at91sam9m10g45ek.dts</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/exynos4210-origen.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/exynos4210-origen.dts</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/exynos4210-smdkv310.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/exynos4210-smdkv310.dts</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/exynos4210.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/exynos4210.dtsi</a></td><td class='right'>397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/highbank.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/highbank.dts</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/imx51-babbage.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx51-babbage.dts</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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/imx51.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx51.dtsi</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/imx53-ard.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx53-ard.dts</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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/imx53-evk.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx53-evk.dts</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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/imx53-qsb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx53-qsb.dts</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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/imx53-smd.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx53-smd.dts</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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/imx53.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx53.dtsi</a></td><td class='right'>34</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='mov'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/imx6q-arm2.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx6q-arm2.dts</a> (renamed from arch/arm/boot/dts/imx6q-sabreauto.dts)</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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/imx6q-sabrelite.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx6q-sabrelite.dts</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/imx6q.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx6q.dtsi</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/omap2.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/omap2.dtsi</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/omap3.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/omap3.dtsi</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/omap4.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/omap4.dtsi</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/tegra-cardhu.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/tegra-cardhu.dts</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/tegra-harmony.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/tegra-harmony.dts</a></td><td class='right'>29</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='add'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/tegra-paz00.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/tegra-paz00.dts</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/tegra-seaboard.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/tegra-seaboard.dts</a></td><td class='right'>74</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.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/tegra-trimslice.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/tegra-trimslice.dts</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/tegra-ventana.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/tegra-ventana.dts</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/tegra20.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/tegra20.dtsi</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/tegra30.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/tegra30.dtsi</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/testcases/tests-phandle.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/testcases/tests-phandle.dtsi</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/testcases/tests.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/testcases/tests.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='/cgit/linux.git/diff/arch/arm/boot/dts/usb_a9g20.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/usb_a9g20.dts</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/dts/versatile-pb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/versatile-pb.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='/cgit/linux.git/diff/arch/arm/common/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/common/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/gic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/common/gic.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/it8152.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/common/it8152.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/pl330.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/common/pl330.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/timer-sp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/common/timer-sp.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/via82c505.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/common/via82c505.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/vic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/common/vic.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/bonito_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/configs/bonito_defconfig</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/imx_v4_v5_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/configs/imx_v4_v5_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='add'><a href='/cgit/linux.git/diff/arch/arm/configs/kota2_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/configs/kota2_defconfig</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/marzen_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/configs/marzen_defconfig</a></td><td class='right'>87</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='/cgit/linux.git/diff/arch/arm/configs/omap1_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='del'><a href='/cgit/linux.git/diff/arch/arm/configs/pcontrol_g20_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/configs/pcontrol_g20_defconfig</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: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/tegra_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/configs/tegra_defconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/assembler.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/assembler.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/bug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/bug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/include/asm/cti.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/cti.h</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/include/asm/edac.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/edac.h</a></td><td class='right'>48</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='del'><a href='/cgit/linux.git/diff/arch/arm/include/asm/entry-macro-vic2.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/entry-macro-vic2.S</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.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/gpio.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardirq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/hardirq.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/entry-macro-gic.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/hardware/entry-macro-gic.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.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/gic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/hardware/gic.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/iop3xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/hardware/iop3xx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hardware/vic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/hardware/vic.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/hwcap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/hwcap.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/include/asm/idmap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/idmap.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/arch/arm/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/ipcbuf.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/kprobes.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/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='/cgit/linux.git/diff/arch/arm/include/asm/mach/arch.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/mach/arch.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/mach/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/mach/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='/cgit/linux.git/diff/arch/arm/include/asm/mach/time.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/mach/time.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/memblock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/memblock.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/include/asm/opcodes.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/opcodes.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/page.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/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.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/perf_event.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/perf_event.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/pgalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/pgalloc.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/pgtable-2level.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/pgtable-2level.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/include/asm/pgtable-3level-hwdef.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/pgtable-3level-hwdef.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/include/asm/pgtable-3level-types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/pgtable-3level-types.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/include/asm/pgtable-3level.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/pgtable-3level.h</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/pgtable-hwdef.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/pgtable-hwdef.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/pgtable.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/pgtable.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/pmu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/pmu.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/proc-fns.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/proc-fns.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/processor.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/processor.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/prom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/prom.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/ptrace.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/sched_clock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/sched_clock.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: 1.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/setup.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/setup.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/socket.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/swab.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/swab.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/system.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/thread_info.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/tlb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/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.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/unified.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/unified.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/include/asm/unistd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/unistd.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/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='/cgit/linux.git/diff/arch/arm/kernel/bios32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/bios32.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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/entry-armv.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/entry-armv.S</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/entry-common.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/entry-common.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/head.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/head.S</a></td><td class='right'>73</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='/cgit/linux.git/diff/arch/arm/kernel/hw_breakpoint.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/hw_breakpoint.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/kprobes-test.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/kprobes-test.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.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='/cgit/linux.git/diff/arch/arm/kernel/leds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/leds.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/machine_kexec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/machine_kexec.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/kernel/opcodes.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/opcodes.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/perf_event.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/perf_event.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/perf_event_v6.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/perf_event_v6.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/perf_event_v7.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/perf_event_v7.c</a></td><td class='right'>401</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/perf_event_xscale.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/perf_event_xscale.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/process.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/process.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/ptrace.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/sched_clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/sched_clock.c</a></td><td class='right'>118</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='/cgit/linux.git/diff/arch/arm/kernel/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/setup.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/sleep.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/sleep.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/smp.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.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/smp_twd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/smp_twd.c</a></td><td class='right'>95</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='/cgit/linux.git/diff/arch/arm/kernel/suspend.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/suspend.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/swp_emulate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/swp_emulate.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/tcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/tcm.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/vmlinux.lds.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/vmlinux.lds.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/lib/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/lib/call_with_stack.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/lib/call_with_stack.S</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91cap9.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91cap9.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91cap9_devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91cap9_devices.c</a></td><td class='right'>49</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='/cgit/linux.git/diff/arch/arm/mach-at91/at91rm9200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91rm9200.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91rm9200_devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91rm9200_devices.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91rm9200_time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91rm9200_time.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9260.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9260.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9260_devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9260_devices.c</a></td><td class='right'>55</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='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9261.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9261.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9261_devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9261_devices.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9263.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9263.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9263_devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9263_devices.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam926x_time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam926x_time.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9_alt_reset.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9_alt_reset.S</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9g45.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9g45.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9g45_devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9g45_devices.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9rl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9rl.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/at91sam9rl_devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9rl_devices.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-1arm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-1arm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-afeb-9260v1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-afeb-9260v1.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-cam60.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-cam60.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-cap9adk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-cap9adk.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-carmeva.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-carmeva.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-cpu9krea.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-cpu9krea.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-cpuat91.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-cpuat91.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-csb337.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-csb337.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-csb637.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-csb637.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-dt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-dt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-eb9200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-eb9200.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-ecbat91.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-ecbat91.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-eco920.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-eco920.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-flexibity.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-flexibity.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-foxg20.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-foxg20.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-gsia18s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-gsia18s.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-kafa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-kafa.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-kb9202.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-kb9202.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-neocore926.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-neocore926.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-pcontrol-g20.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-pcontrol-g20.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-picotux200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-picotux200.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-qil-a9260.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-qil-a9260.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-rm9200dk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-rm9200dk.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-rm9200ek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-rm9200ek.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-rsi-ews.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-rsi-ews.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-sam9-l9260.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-sam9-l9260.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-sam9260ek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-sam9260ek.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-sam9261ek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-sam9261ek.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-sam9263ek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-sam9263ek.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-sam9g20ek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-sam9g20ek.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-sam9m10g45ek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-sam9m10g45ek.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-sam9rlek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-sam9rlek.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-snapper9260.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-snapper9260.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-stamp9g20.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-stamp9g20.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-usb-a926x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-usb-a926x.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/board-yl-9200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-yl-9200.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/generic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/generic.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/gpio.c</a></td><td class='right'>85</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.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_aic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91_aic.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_dbgu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91_dbgu.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_pit.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91_pit.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_rtc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91_rtc.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91_shdwc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91_shdwc.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91cap9.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91cap9.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91rm9200.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91rm9200.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9260.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91sam9260.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9261.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91sam9261.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9263.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91sam9263.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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9_smc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91sam9_smc.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9g45.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91sam9g45.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91sam9rl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91sam9rl.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/at91x40.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91x40.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/board.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/board.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/debug-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/debug-macro.S</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/entry-macro.S</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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/gpio.h</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/hardware.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/hardware.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/io.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/irqs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/system.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/timex.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/timex.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.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='/cgit/linux.git/diff/arch/arm/mach-at91/include/mach/uncompress.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/uncompress.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/irq.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/sam9_smc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/sam9_smc.c</a></td><td class='right'>62</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.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/sam9_smc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/sam9_smc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/setup.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91/soc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/soc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-bcmring/arch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-bcmring/arch.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-bcmring/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-bcmring/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='/cgit/linux.git/diff/arch/arm/mach-bcmring/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-bcmring/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='/cgit/linux.git/diff/arch/arm/mach-bcmring/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-bcmring/include/mach/system.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-bcmring/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-bcmring/include/mach/vmalloc.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/autcpu12.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/autcpu12.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/cdb89712.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/cdb89712.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/ceiva.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/ceiva.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/clep7312.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/clep7312.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='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/common.c</a> (renamed from arch/arm/mach-clps711x/irq.c)</td><td class='right'>100</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='/cgit/linux.git/diff/arch/arm/mach-clps711x/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/edb7211-arch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/edb7211-arch.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/fortunet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/fortunet.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/include/mach/system.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/mm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/mm.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/p720t.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/p720t.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='/cgit/linux.git/diff/arch/arm/mach-clps711x/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/time.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-cns3xxx/cns3420vb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-cns3xxx/cns3420vb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-cns3xxx/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-cns3xxx/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='/cgit/linux.git/diff/arch/arm/mach-cns3xxx/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-cns3xxx/include/mach/entry-macro.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='/cgit/linux.git/diff/arch/arm/mach-cns3xxx/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-cns3xxx/include/mach/system.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-cns3xxx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-cns3xxx/include/mach/vmalloc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-cns3xxx/pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-cns3xxx/pcie.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-cns3xxx/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-cns3xxx/pm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/board-da830-evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-da830-evm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/board-da850-evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-da850-evm.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/board-dm355-evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-dm355-evm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/board-dm355-leopard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-dm355-leopard.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/board-dm365-evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-dm365-evm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/board-dm644x-evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-dm644x-evm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/board-dm646x-evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-dm646x-evm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/board-mityomapl138.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-mityomapl138.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/board-neuros-osd2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-neuros-osd2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/board-omapl138-hawk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-omapl138-hawk.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/board-sffsdr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-sffsdr.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/board-tnetv107x-evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-tnetv107x-evm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/clock.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/clock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/clock.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/common.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/da830.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/da830.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/da850.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/da850.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/devices-da8xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/devices-da8xx.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/devices.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/dm355.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/dm355.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/dm365.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/dm365.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/dm644x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/dm644x.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/dm646x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/dm646x.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/include/mach/common.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/da8xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/include/mach/da8xx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/dm646x.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/include/mach/dm646x.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.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/include/mach/io.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/include/mach/system.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/tnetv107x.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/include/mach/tnetv107x.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/include/mach/vmalloc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/io.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-davinci/tnetv107x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/tnetv107x.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-dove/addr-map.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-dove/addr-map.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-dove/cm-a510.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-dove/cm-a510.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-dove/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-dove/common.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-dove/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-dove/common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-dove/dove-db-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-dove/dove-db-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-dove/include/mach/dove.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-dove/include/mach/dove.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-dove/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-dove/include/mach/system.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-dove/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-dove/include/mach/vmalloc.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-dove/pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-dove/pcie.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ebsa110/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ebsa110/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ebsa110/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ebsa110/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-ebsa110/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ebsa110/include/mach/vmalloc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/adssphere.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/adssphere.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/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.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/edb93xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/edb93xx.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/gesbc9312.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/gesbc9312.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/dma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/include/mach/dma.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/include/mach/entry-macro.S</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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/platform.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/include/mach/platform.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/include/mach/system.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/include/mach/vmalloc.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/micro9.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/micro9.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/simone.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/simone.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/snappercl15.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/snappercl15.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/ts72xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/ts72xx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/vision_ep9307.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/vision_ep9307.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/Kconfig</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/clock-exynos4210.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/clock-exynos4210.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/clock-exynos4212.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/clock-exynos4212.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/clock.c</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/common.c</a></td><td class='right'>699</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/common.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/cpu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/cpu.c</a></td><td class='right'>293</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='add'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/dev-ohci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/dev-ohci.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/dma.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: 2.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/headsmp.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/headsmp.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='add'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/include/mach/cpufreq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/include/mach/cpufreq.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/include/mach/entry-macro.S</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: 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='/cgit/linux.git/diff/arch/arm/mach-exynos/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/include/mach/irqs.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/include/mach/map.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/include/mach/map.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/include/mach/ohci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/include/mach/ohci.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/include/mach/spi-clocks.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/include/mach/spi-clocks.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/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.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/irq-combiner.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/irq-combiner.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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='/cgit/linux.git/diff/arch/arm/mach-exynos/irq-eint.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/irq-eint.c</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: 3.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/mach-armlex4210.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/mach-armlex4210.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/mach-exynos4-dt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/mach-exynos4-dt.c</a></td><td class='right'>85</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='/cgit/linux.git/diff/arch/arm/mach-exynos/mach-nuri.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/mach-nuri.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/mach-origen.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/mach-origen.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/mach-smdk4x12.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/mach-smdk4x12.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/mach-smdkv310.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/mach-smdkv310.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/mach-universal_c210.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/mach-universal_c210.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/platsmp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/platsmp.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/pm.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/setup-sdhci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/setup-sdhci.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/setup-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/setup-spi.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-exynos/setup-usb-phy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/setup-usb-phy.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/cats-hw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-footbridge/cats-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='/cgit/linux.git/diff/arch/arm/mach-footbridge/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-footbridge/common.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-footbridge/common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/dc21285.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-footbridge/dc21285.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/ebsa285.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-footbridge/ebsa285.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-footbridge/include/mach/system.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.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-footbridge/include/mach/vmalloc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/netwinder-hw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-footbridge/netwinder-hw.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/personal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-footbridge/personal.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='/cgit/linux.git/diff/arch/arm/mach-gemini/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-gemini/include/mach/vmalloc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-h720x/common.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-h720x/common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/h7201-eval.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-h720x/h7201-eval.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/h7202-eval.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-h720x/h7202-eval.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-h720x/include/mach/system.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-h720x/include/mach/vmalloc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-highbank/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-highbank/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='/cgit/linux.git/diff/arch/arm/mach-highbank/highbank.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-highbank/highbank.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-highbank/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-highbank/include/mach/entry-macro.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='/cgit/linux.git/diff/arch/arm/mach-highbank/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-highbank/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-highbank/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-highbank/include/mach/vmalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-highbank/system.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-highbank/system.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/Makefile.boot?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/Makefile.boot</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/clock-imx6q.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/clock-imx6q.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/head-v7.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/head-v7.S</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-apf9328.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-apf9328.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-armadillo5x0.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-armadillo5x0.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-bug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-bug.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-cpuimx27.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-cpuimx27.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-cpuimx35.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-cpuimx35.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-eukrea_cpuimx25.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-eukrea_cpuimx25.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-imx27_visstrim_m10.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-imx27_visstrim_m10.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-imx27ipcam.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-imx27ipcam.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-imx27lite.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-imx27lite.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-imx6q.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-imx6q.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-kzm_arm11_01.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-kzm_arm11_01.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-mx1ads.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx1ads.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-mx21ads.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx21ads.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-mx25_3ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx25_3ds.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-mx27_3ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx27_3ds.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-mx27ads.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx27ads.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-mx31_3ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx31_3ds.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-mx31ads.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx31ads.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-mx31lilly.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx31lilly.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-mx31lite.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx31lite.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-mx31moboard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx31moboard.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-mx35_3ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx35_3ds.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-mxt_td60.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mxt_td60.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-pca100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-pca100.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-pcm037.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-pcm037.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-pcm038.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-pcm038.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-pcm043.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-pcm043.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-qong.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-qong.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-scb9328.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-scb9328.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/mach-vpr200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-vpr200.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/pm-imx6q.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/pm-imx6q.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/src.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/src.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-integrator/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-integrator/common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-integrator/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.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-integrator/include/mach/system.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-integrator/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/integrator_ap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-integrator/integrator_ap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/integrator_cp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-integrator/integrator_cp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/pci_v3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-integrator/pci_v3.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/iop13xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop13xx/include/mach/iop13xx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop13xx/include/mach/system.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop13xx/include/mach/vmalloc.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/iq81340mc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop13xx/iq81340mc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/iq81340sc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop13xx/iq81340sc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop13xx/pci.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop13xx/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop13xx/setup.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/em7210.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop32x/em7210.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/glantank.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop32x/glantank.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop32x/include/mach/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop32x/include/mach/system.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop32x/include/mach/vmalloc.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/iq31244.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop32x/iq31244.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/iq80321.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop32x/iq80321.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop32x/n2100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop32x/n2100.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop33x/include/mach/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop33x/include/mach/system.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop33x/include/mach/vmalloc.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/iq80331.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop33x/iq80331.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop33x/iq80332.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop33x/iq80332.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp2000/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/enp2611.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp2000/enp2611.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/platform.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp2000/include/mach/platform.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp2000/include/mach/system.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp2000/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/ixdp2400.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp2000/ixdp2400.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/ixdp2800.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp2000/ixdp2800.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/ixdp2x01.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp2000/ixdp2x01.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp2000/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp23xx/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/espresso.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp23xx/espresso.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp23xx/include/mach/io.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/platform.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp23xx/include/mach/platform.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp23xx/include/mach/system.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp23xx/include/mach/vmalloc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/ixdp2351.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp23xx/ixdp2351.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp23xx/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/roadrunner.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp23xx/roadrunner.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/avila-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/avila-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='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/common-pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/common-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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/common.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/coyote-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/coyote-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='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/dsmg600-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/dsmg600-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/fsg-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/fsg-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/gateway7001-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/gateway7001-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/goramo_mlr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/goramo_mlr.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/gtwx5715-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/gtwx5715-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/platform.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/include/mach/platform.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/include/mach/system.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/include/mach/vmalloc.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/ixdp425-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/ixdp425-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/nas100d-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/nas100d-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/nslu2-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/nslu2-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/omixp-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/omixp-setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/vulcan-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/vulcan-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/wg302v2-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/wg302v2-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/addr-map.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/addr-map.c</a></td><td class='right'>137</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='/cgit/linux.git/diff/arch/arm/mach-kirkwood/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/common.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/d2net_v2-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/d2net_v2-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/db88f6281-bp-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/db88f6281-bp-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/dockstar-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/dockstar-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/guruplug-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/guruplug-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/include/mach/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/include/mach/io.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/include/mach/kirkwood.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/include/mach/kirkwood.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/include/mach/system.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/include/mach/vmalloc.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/mpp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/mpp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/mpp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/mpp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/netspace_v2-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/netspace_v2-setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/netxbig_v2-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/netxbig_v2-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='/cgit/linux.git/diff/arch/arm/mach-kirkwood/openrd-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/openrd-setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/pcie.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/rd88f6192-nas-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/rd88f6281-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/rd88f6281-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/sheevaplug-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/sheevaplug-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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/t5325-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/t5325-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/ts219-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/ts219-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-kirkwood/ts41x-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/ts41x-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/board-acs5k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ks8695/board-acs5k.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/board-dsm320.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ks8695/board-dsm320.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/board-micrel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ks8695/board-micrel.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/generic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ks8695/generic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ks8695/include/mach/system.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ks8695/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ks8695/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='/cgit/linux.git/diff/arch/arm/mach-ks8695/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ks8695/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ks8695/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ks8695/time.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lpc32xx/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-lpc32xx/common.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lpc32xx/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-lpc32xx/common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lpc32xx/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-lpc32xx/include/mach/system.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-lpc32xx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-lpc32xx/include/mach/vmalloc.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lpc32xx/phy3250.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-lpc32xx/phy3250.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/aspenite.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/aspenite.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/avengers_lite.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/avengers_lite.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/brownstone.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/brownstone.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/common.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/flint.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/flint.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/gplugd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/gplugd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/include/mach/gpio-pxa.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/include/mach/gpio-pxa.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/include/mach/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/include/mach/gpio.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/include/mach/irqs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/include/mach/mmp2.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/include/mach/mmp2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/include/mach/pxa168.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/include/mach/pxa168.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/include/mach/pxa910.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/include/mach/pxa910.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/include/mach/system.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/include/mach/vmalloc.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/jasper.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/jasper.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/mmp2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/mmp2.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/pxa168.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/pxa168.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/pxa910.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/pxa910.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/tavorevb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/tavorevb.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/teton_bga.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/teton_bga.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/time.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mmp/ttc_dkb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/ttc_dkb.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/Kconfig</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.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/board-msm8960.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/board-msm8960.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/board-msm8x60.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/board-msm8x60.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/board-sapphire.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/board-sapphire.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/headsmp.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/headsmp.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='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/debug-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/debug-macro.S</a></td><td class='right'>51</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='del'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/entry-macro-qgic.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/entry-macro-qgic.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/entry-macro-vic.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/entry-macro-vic.S</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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/entry-macro.S</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/msm_iomap-7x00.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/msm_iomap-7x30.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/msm_iomap-8960.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/msm_iomap-8960.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/msm_iomap-8x50.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/msm_iomap-8x60.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/msm_iomap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/msm_iomap.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/system.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/include/mach/uncompress.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/uncompress.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/io.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/platsmp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/platsmp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/smd_debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/smd_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='/cgit/linux.git/diff/arch/arm/mach-msm/timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/timer.c</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-msm/vreg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/vreg.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/addr-map.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/addr-map.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: 1.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/buffalo-wxl-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/common.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/db78x00-bp-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/db78x00-bp-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/include/mach/system.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/include/mach/vmalloc.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/mpp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/mpp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/pcie.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/rd78x00-masa-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx5/board-cpuimx51.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-cpuimx51.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx5/board-cpuimx51sd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-cpuimx51sd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx5/board-mx50_rdp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-mx50_rdp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx5/board-mx51_3ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-mx51_3ds.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx5/board-mx51_babbage.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-mx51_babbage.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx5/board-mx51_efikamx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-mx51_efikamx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx5/board-mx51_efikasb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-mx51_efikasb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx5/board-mx53_ard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-mx53_ard.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx5/board-mx53_evk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-mx53_evk.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx5/board-mx53_loco.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-mx53_loco.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx5/board-mx53_smd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-mx53_smd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx5/imx51-dt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/imx51-dt.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx5/imx53-dt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/imx53-dt.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx5/mm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/mm.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mx5/system.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/system.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mxs/clock-mx23.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/clock-mx23.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mxs/clock-mx28.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/clock-mx28.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mxs/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/clock.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mxs/devices-mx28.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/devices-mx28.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mxs/devices/platform-mxs-saif.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/devices/platform-mxs-saif.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mxs/include/mach/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/include/mach/common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mxs/include/mach/devices-common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/include/mach/devices-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-mxs/include/mach/digctl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/include/mach/digctl.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mxs/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-mxs/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mxs/mach-m28evk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/mach-m28evk.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mxs/mach-mx23evk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/mach-mx23evk.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mxs/mach-mx28evk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/mach-mx28evk.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mxs/mach-stmp378x_devb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/mach-stmp378x_devb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mxs/mach-tx28.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/mach-tx28.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mxs/system.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/system.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-mxs/timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/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='/cgit/linux.git/diff/arch/arm/mach-netx/generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-netx/generic.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/generic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-netx/generic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-netx/include/mach/entry-macro.S</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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-netx/include/mach/system.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/nxdb500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-netx/nxdb500.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/nxdkn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-netx/nxdkn.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/nxeb500hmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-netx/nxeb500hmi.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-nomadik/board-nhk8815.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-nomadik/board-nhk8815.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-nomadik/cpu-8815.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-nomadik/cpu-8815.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-nomadik/cpu-8815.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-nomadik/cpu-8815.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-nomadik/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-nomadik/include/mach/entry-macro.S</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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-nomadik/include/mach/setup.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-nomadik/include/mach/setup.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-nomadik/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-nomadik/include/mach/system.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-nomadik/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-nomadik/include/mach/vmalloc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/Kconfig</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: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-ams-delta.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-ams-delta.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-fsample.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-fsample.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-generic.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-h2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-h2.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-h3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-h3.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-htcherald.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-htcherald.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-innovator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-innovator.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-nokia770.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-nokia770.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-osk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-osk.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-palmte.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-palmte.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-palmtt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-palmtt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-palmz71.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-palmz71.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-perseus2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-perseus2.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-sx1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-sx1.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-voiceblue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-voiceblue.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/clock.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/clock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/clock.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/clock_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/clock_data.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/common.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/devices.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/io.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/opp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/opp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/opp_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/opp_data.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/reset.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/reset.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/time.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.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/timer32k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/timer32k.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/Kconfig</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/Makefile</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-2430sdp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-2430sdp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-3430sdp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-3430sdp.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-3630sdp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-3630sdp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-4430sdp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-4430sdp.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: 1.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-am3517crane.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-am3517crane.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-am3517evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-am3517evm.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-apollon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-apollon.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-cm-t35.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-cm-t35.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-cm-t3517.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-cm-t3517.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-devkit8000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-devkit8000.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-generic.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-h4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-h4.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-igep0020.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-igep0020.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-ldp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-ldp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-n8x0.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-n8x0.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-omap3beagle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-omap3beagle.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-omap3evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-omap3evm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-omap3logic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-omap3logic.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-omap3pandora.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-omap3pandora.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-omap3stalker.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-omap3stalker.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-omap3touchbook.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-omap3touchbook.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-omap4panda.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-omap4panda.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: 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='/cgit/linux.git/diff/arch/arm/mach-omap2/board-overo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-overo.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-rm680.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-rm680.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-rx51-peripherals.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-rx51-peripherals.c</a></td><td class='right'>51</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-rx51.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-rx51.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-ti8168evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-ti8168evm.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-zoom-peripherals.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-zoom-peripherals.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-zoom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-zoom.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/clock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/clock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/clock.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/clock3xxx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/clock3xxx_data.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/clock44xx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/clock44xx_data.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/cm2xxx_3xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/cm2xxx_3xxx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/cm44xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/cm44xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/cminst44xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/cminst44xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/common.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/common.h</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/control.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/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='/cgit/linux.git/diff/arch/arm/mach-omap2/control.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/control.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/cpuidle34xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/cpuidle34xx.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/cpuidle44xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/cpuidle44xx.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/devices.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/display.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/hsmmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/hsmmc.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/hsmmc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/hsmmc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/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='/cgit/linux.git/diff/arch/arm/mach-omap2/id.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/id.c</a></td><td class='right'>54</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='/cgit/linux.git/diff/arch/arm/mach-omap2/include/mach/barriers.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/include/mach/barriers.h</a> (renamed from arch/arm/mach-netx/include/mach/vmalloc.h)</td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/include/mach/debug-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/include/mach/debug-macro.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/include/mach/entry-macro.S</a></td><td class='right'>137</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='add'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/include/mach/omap-secure.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/include/mach/omap-secure.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/include/mach/omap-wakeupgen.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/include/mach/omap-wakeupgen.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/include/mach/omap4-common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/include/mach/omap4-common.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.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/io.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/irq.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/mcbsp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/mcbsp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/mux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/mux.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/omap-headsmp.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap-headsmp.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/omap-hotplug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap-hotplug.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/omap-mpuss-lowpower.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap-mpuss-lowpower.c</a></td><td class='right'>398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/omap-secure.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap-secure.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/omap-smc.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap-smc.S</a> (renamed from arch/arm/mach-omap2/omap44xx-smc.S)</td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/omap-smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap-smp.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/omap-wakeupgen.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap-wakeupgen.c</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/omap4-common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap4-common.c</a></td><td class='right'>95</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='add'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/omap4-sar-layout.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap4-sar-layout.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/omap_hwmod.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap_hwmod.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap_hwmod_3xxx_data.c</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/omap_hwmod_44xx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap_hwmod_44xx_data.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/omap_phy_internal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap_phy_internal.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/opp2xxx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/opp2xxx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/pm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/pm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/pm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/pm24xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/pm24xx.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/pm34xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/pm34xx.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/pm44xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/pm44xx.c</a></td><td class='right'>155</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='/cgit/linux.git/diff/arch/arm/mach-omap2/prcm-common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/prcm-common.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/prcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/prcm.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/prcm_mpu44xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/prcm_mpu44xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/prm2xxx_3xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/prm2xxx_3xxx.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/prm2xxx_3xxx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/prm2xxx_3xxx.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/prm44xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/prm44xx.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/prm44xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/prm44xx.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/prm_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/prm_common.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/prminst44xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/prminst44xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/sdram-nokia.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/sdram-nokia.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/sdrc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/sdrc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/sdrc2xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/sdrc2xxx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/serial.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/serial.c</a></td><td class='right'>909</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 10.2%;'/><td class='none' style='width: 86.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/sleep44xx.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/sleep44xx.S</a></td><td class='right'>379</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='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/smartreflex.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/smartreflex.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/timer.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/usb-host.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/usb-host.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/usb-musb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/usb-musb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/vc3xxx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/vc3xxx_data.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/vc44xx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/vc44xx_data.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/voltage.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/voltage.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/voltagedomains3xxx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/voltagedomains3xxx_data.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/voltagedomains44xx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/voltagedomains44xx_data.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/vp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/vp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/vp3xxx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/vp3xxx_data.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/vp44xx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/vp44xx_data.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/addr-map.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/addr-map.c</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: 1.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/common.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/d2net-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/d2net-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='/cgit/linux.git/diff/arch/arm/mach-orion5x/db88f5281-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/db88f5281-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/dns323-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/dns323-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/edmini_v2-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/edmini_v2-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/include/mach/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/include/mach/io.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/include/mach/orion5x.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/include/mach/orion5x.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/include/mach/system.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/include/mach/vmalloc.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/kurobox_pro-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/kurobox_pro-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='/cgit/linux.git/diff/arch/arm/mach-orion5x/ls-chl-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/ls-chl-setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/ls_hgl-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/ls_hgl-setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/lsmini-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/lsmini-setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/mpp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/mpp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/mss2-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/mss2-setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/mv2120-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/mv2120-setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/net2big-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/net2big-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/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.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/rd88f5181l-ge-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/rd88f5182-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/rd88f5182-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/terastation_pro2-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/terastation_pro2-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/ts209-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/ts209-setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/ts409-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/ts409-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/ts78xx-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/ts78xx-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/wnr854t-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/wnr854t-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-orion5x/wrt350n-v2-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/wrt350n-v2-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-picoxcell/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-picoxcell/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/common.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-picoxcell/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-picoxcell/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/include/mach/entry-macro.S</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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-picoxcell/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/include/mach/irqs.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-picoxcell/include/mach/memory.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/include/mach/memory.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-picoxcell/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/include/mach/system.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-picoxcell/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/include/mach/vmalloc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-picoxcell/io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/io.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-picoxcell/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/time.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pnx4008/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pnx4008/include/mach/system.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pnx4008/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-prima2/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-prima2/common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-prima2/include/mach/map.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-prima2/include/mach/map.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-prima2/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-prima2/include/mach/system.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-prima2/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-prima2/include/mach/vmalloc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-prima2/prima2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-prima2/prima2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-prima2/rstc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-prima2/rstc.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/am200epd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/am200epd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/am300epd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/am300epd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/balloon3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/balloon3.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/capc7117.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/capc7117.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/cm-x270.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/cm-x270.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/cm-x2xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/cm-x2xx.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/cm-x300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/cm-x300.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/colibri-pxa270-income.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/colibri-pxa270-income.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/colibri-pxa270.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/colibri-pxa270.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/colibri-pxa300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/colibri-pxa300.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/colibri-pxa320.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/colibri-pxa320.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/corgi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/corgi.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/corgi_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/corgi_pm.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/csb726.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/csb726.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/devices.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/devices.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/devices.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/em-x270.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/em-x270.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/eseries.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/eseries.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/ezx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/ezx.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/generic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/generic.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/gumstix.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/gumstix.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/h5000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/h5000.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/himalaya.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/himalaya.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/hx4700.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/hx4700.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/icontrol.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/icontrol.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/idp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/idp.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/balloon3.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/balloon3.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/corgi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/corgi.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/csb726.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/csb726.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/entry-macro.S</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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/gpio-pxa.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/gpio-pxa.h</a></td><td class='right'>133</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='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/gpio.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/gumstix.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/gumstix.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/hx4700.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/hx4700.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/idp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/idp.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/irqs.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/littleton.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/littleton.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/magician.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/magician.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/palmld.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/palmld.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/palmt5.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/palmt5.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/palmtc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/palmtc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/palmtx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/palmtx.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/pcm027.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/pcm027.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/pcm990_baseboard.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/poodle.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/poodle.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/spitz.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/spitz.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/system.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/tosa.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/tosa.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/trizeps4.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/trizeps4.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/vmalloc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/irq.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.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/littleton.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/littleton.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/lpd270.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/lpd270.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/lubbock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/lubbock.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/magician.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/magician.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/mainstone.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/mainstone.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/mfp-pxa2xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/mfp-pxa2xx.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/mioa701.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/mioa701.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/mp900.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/mp900.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/mxm8x10.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/mxm8x10.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/palmld.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/palmld.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/palmt5.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/palmt5.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/palmtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/palmtc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/palmte2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/palmte2.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/palmtreo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/palmtreo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/palmtx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/palmtx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/palmz72.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/palmz72.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pcm027.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/pcm027.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pcm990-baseboard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/pcm990-baseboard.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/poodle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/poodle.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pxa25x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/pxa25x.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pxa27x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/pxa27x.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pxa300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/pxa300.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pxa320.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/pxa320.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pxa3xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/pxa3xx.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pxa95x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/pxa95x.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/raumfeld.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/raumfeld.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/reset.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/reset.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/saar.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/saar.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/saarb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/saarb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/sharpsl_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/sharpsl_pm.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/spitz.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/spitz.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/spitz_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/spitz_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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/stargate2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/stargate2.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/tavorevb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/tavorevb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/tavorevb3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/tavorevb3.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/time.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/tosa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/tosa.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/trizeps4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/trizeps4.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/viper.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/viper.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/vpac270.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/vpac270.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/xcep.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/xcep.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/z2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/z2.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/zeus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/zeus.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/zylonite.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/zylonite.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/zylonite_pxa300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/zylonite_pxa300.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/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='/cgit/linux.git/diff/arch/arm/mach-realview/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/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='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/include/mach/entry-macro.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='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/include/mach/system.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/platsmp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/platsmp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/realview_eb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/realview_eb.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/realview_pb1176.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/realview_pb1176.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/realview_pb11mp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/realview_pb11mp.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/realview_pba8.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/realview_pba8.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/realview_pbx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/realview_pbx.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-rpc/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-rpc/include/mach/system.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-rpc/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-rpc/include/mach/vmalloc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-rpc/riscpc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-rpc/riscpc.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/bast-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/bast-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='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/common.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/cpu-freq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/cpu-freq.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/dma.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/dma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/include/mach/dma.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/reset.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/include/mach/reset.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/system-reset.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/include/mach/system-reset.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/include/mach/system.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-amlm5900.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/mach-amlm5900.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-bast.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/mach-bast.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-h1940.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/mach-h1940.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-n30.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/mach-n30.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-otom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/mach-otom.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-qt2410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/mach-qt2410.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-smdk2410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/mach-smdk2410.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-tct_hammer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/mach-tct_hammer.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-vr1000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/mach-vr1000.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/pll.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/pll.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/pm.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/s3c2410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/s3c2410.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2412/clock.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/cpu-freq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2412/cpu-freq.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2412/dma.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2412/irq.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/mach-jive.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2412/mach-jive.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/mach-smdk2413.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2412/mach-smdk2413.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/mach-vstms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2412/mach-vstms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2412/pm.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2412/s3c2412.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2412/s3c2412.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2416/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2416/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2416/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2416/clock.c</a></td><td class='right'>68</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='/cgit/linux.git/diff/arch/arm/mach-s3c2416/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2416/irq.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2416/mach-smdk2416.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2416/mach-smdk2416.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2416/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2416/pm.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2416/s3c2416.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2416/s3c2416.c</a></td><td class='right'>22</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='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2416/setup-sdhci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2416/setup-sdhci.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/clock.c</a></td><td class='right'>59</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='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/common.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/dma.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/irq.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/mach-anubis.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/mach-anubis.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/mach-at2440evb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/mach-at2440evb.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/mach-gta02.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/mach-gta02.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/mach-mini2440.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/mach-mini2440.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/mach-nexcoder.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/mach-nexcoder.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/mach-osiris.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/mach-osiris.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/mach-rx1950.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/mach-rx1950.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.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/mach-rx3715.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/mach-rx3715.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/mach-smdk2440.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/mach-smdk2440.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/s3c2440-cpufreq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/s3c2440-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.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/s3c2440-pll-12000000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/s3c2440-pll-12000000.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/s3c2440-pll-16934400.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/s3c2440-pll-16934400.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/s3c2440.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/s3c2440.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/s3c2442.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/s3c2442.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/s3c244x-clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/s3c244x-clock.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/s3c244x-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/s3c244x-irq.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2440/s3c244x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/s3c244x.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2443/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2443/clock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2443/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2443/dma.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2443/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2443/irq.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2443/mach-smdk2443.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2443/mach-smdk2443.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2443/s3c2443.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2443/s3c2443.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/Makefile</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/clock.c</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/common.c</a></td><td class='right'>385</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/common.h</a></td><td class='right'>56</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='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/cpu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/cpu.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: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/dev-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/dev-spi.c</a></td><td class='right'>180</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='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/dma.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/include/mach/crag6410.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/include/mach/crag6410.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/include/mach/entry-macro.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/include/mach/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/include/mach/gpio.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/include/mach/irqs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/include/mach/map.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/include/mach/map.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/include/mach/system.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/irq-eint.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/irq-eint.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/irq.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.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/mach-anw6410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-anw6410.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/mach-crag6410-module.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-crag6410-module.c</a></td><td class='right'>56</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.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/mach-crag6410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-crag6410.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/mach-hmt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-hmt.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/mach-mini6410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-mini6410.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/mach-ncp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-ncp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/mach-real6410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-real6410.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/mach-smartq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-smartq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/mach-smartq5.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-smartq5.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/mach-smartq7.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-smartq7.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/mach-smdk6400.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-smdk6400.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/mach-smdk6410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-smdk6410.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/pm.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/s3c6400.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/s3c6400.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/s3c6410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/s3c6410.c</a></td><td class='right'>21</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='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/setup-sdhci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/setup-sdhci.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c64xx/setup-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/setup-spi.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/Kconfig</a></td><td class='right'>31</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='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/Makefile</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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/clock-s5p6440.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/clock-s5p6440.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/clock-s5p6450.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/clock-s5p6450.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/clock.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/common.c</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/common.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.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='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/cpu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/cpu.c</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: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/dev-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/dev-spi.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/dma.c</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: 2.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/include/mach/entry-macro.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/include/mach/irqs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/include/mach/map.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/include/mach/map.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/init.c</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: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/irq-eint.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/irq-eint.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: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/mach-smdk6440.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/mach-smdk6440.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/mach-smdk6450.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/mach-smdk6450.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/pm.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/setup-sdhci-gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/setup-sdhci-gpio.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s5p64x0/setup-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/setup-spi.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pc100/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pc100/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/Makefile</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pc100/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/clock.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pc100/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/common.c</a> (renamed from arch/arm/mach-s5pc100/cpu.c)</td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pc100/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/common.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pc100/dev-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/dev-spi.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pc100/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/dma.c</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pc100/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/include/mach/entry-macro.S</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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pc100/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/include/mach/irqs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pc100/include/mach/map.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/include/mach/map.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pc100/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pc100/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pc100/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/init.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pc100/mach-smdkc100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/mach-smdkc100.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pc100/setup-sdhci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/setup-sdhci.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pc100/setup-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/setup-spi.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/Makefile</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/clock.c</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/common.c</a> (renamed from arch/arm/mach-s5pv210/cpu.c)</td><td class='right'>107</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.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/common.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/dev-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/dev-spi.c</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: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/dma.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/include/mach/entry-macro.S</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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/include/mach/irqs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/include/mach/map.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/include/mach/map.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/init.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.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/mach-aquila.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/mach-aquila.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/mach-goni.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/mach-goni.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/mach-smdkc110.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/mach-smdkc110.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/mach-smdkv210.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/mach-smdkv210.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/mach-torbreck.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/mach-torbreck.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/pm.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/setup-sdhci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/setup-sdhci.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s5pv210/setup-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/setup-spi.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/assabet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/assabet.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/badge4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/badge4.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/cerf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/cerf.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/clock.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/collie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/collie.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/generic.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/generic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/generic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/h3100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/h3100.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/h3600.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/h3600.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/hackkit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/hackkit.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/include/mach/gpio.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/mcp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/include/mach/mcp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/include/mach/system.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/include/mach/vmalloc.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/jornada720.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/jornada720.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/lart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/lart.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/nanoengine.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/nanoengine.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/pci-nanoengine.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/pci-nanoengine.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/pleb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/pleb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/shannon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/shannon.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/simpad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/simpad.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/time.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shark/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shark/include/mach/system.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shark/include/mach/vmalloc.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/Kconfig</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/board-ag5evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/board-ag5evm.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/board-ap4evb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/board-ap4evb.c</a></td><td class='right'>49</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='/cgit/linux.git/diff/arch/arm/mach-shmobile/board-bonito.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/board-bonito.c</a></td><td class='right'>522</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='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/board-g3evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/board-g3evm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/board-g4evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/board-g4evm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/board-kota2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/board-kota2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/board-mackerel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/board-mackerel.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/board-marzen.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/board-marzen.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/clock-r8a7740.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/clock-r8a7740.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/clock-r8a7779.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/clock-r8a7779.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/clock-sh7372.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/clock-sh7372.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/clock-sh73a0.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/clock-sh73a0.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/entry-gic.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/entry-gic.S</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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/headsmp.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/headsmp.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='/cgit/linux.git/diff/arch/arm/mach-shmobile/hotplug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/hotplug.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/include/mach/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/include/mach/common.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/include/mach/entry-macro.S</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/include/mach/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/include/mach/gpio.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/include/mach/r8a7740.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/include/mach/r8a7740.h</a></td><td class='right'>584</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/include/mach/r8a7779.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/include/mach/r8a7779.h</a></td><td class='right'>363</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/include/mach/sh7372.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/include/mach/sh7372.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/include/mach/vmalloc.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/intc-r8a7740.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/intc-r8a7740.c</a></td><td class='right'>631</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/intc-r8a7779.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/intc-r8a7779.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/intc-sh7372.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/intc-sh7372.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/pfc-r8a7740.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/pfc-r8a7740.c</a></td><td class='right'>2562</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 39.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 60.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/pfc-r8a7779.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/pfc-r8a7779.c</a></td><td class='right'>2645</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 40.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 59.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/platsmp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/platsmp.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/pm-r8a7779.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/pm-r8a7779.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/pm-sh7372.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/pm-sh7372.c</a></td><td class='right'>196</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='add'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/setup-r8a7740.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/setup-r8a7740.c</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/setup-r8a7779.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/setup-r8a7779.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/setup-sh7372.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/setup-sh7372.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/setup-sh73a0.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/setup-sh73a0.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shmobile/sleep-sh7372.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/sleep-sh7372.S</a></td><td class='right'>21</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='/cgit/linux.git/diff/arch/arm/mach-shmobile/smp-r8a7779.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/smp-r8a7779.c</a></td><td class='right'>153</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='/cgit/linux.git/diff/arch/arm/mach-spear3xx/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear3xx/include/mach/entry-macro.S</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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-spear3xx/include/mach/generic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear3xx/include/mach/generic.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-spear3xx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear3xx/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-spear3xx/spear300_evb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear3xx/spear300_evb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-spear3xx/spear310_evb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear3xx/spear310_evb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-spear3xx/spear320_evb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear3xx/spear320_evb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-spear6xx/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear6xx/include/mach/entry-macro.S</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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-spear6xx/include/mach/generic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear6xx/include/mach/generic.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-spear6xx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear6xx/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-spear6xx/spear600_evb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear6xx/spear600_evb.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='/cgit/linux.git/diff/arch/arm/mach-tcc8k/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-tcc8k/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-tcc8k/Makefile.boot?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/Makefile.boot</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-tcc8k/board-tcc8000-sdk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/board-tcc8000-sdk.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: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-tcc8k/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/clock.c</a></td><td class='right'>580</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.9%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-tcc8k/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/common.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-tcc8k/devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/devices.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-tcc8k/io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/io.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-tcc8k/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/irq.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: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-tcc8k/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/time.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: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/Kconfig</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/Makefile</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/Makefile.boot?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/Makefile.boot</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/board-dt-tegra20.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-dt-tegra20.c</a> (renamed from arch/arm/mach-tegra/board-dt.c)</td><td class='right'>65</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='/cgit/linux.git/diff/arch/arm/mach-tegra/board-dt-tegra30.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-dt-tegra30.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/board-harmony-pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-harmony-pcie.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/board-harmony-pinmux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-harmony-pinmux.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/board-harmony.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-harmony.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/board-paz00-pinmux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-paz00-pinmux.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/board-paz00.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-paz00.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/board-paz00.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-paz00.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/board-pinmux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-pinmux.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/board-pinmux.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-pinmux.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/board-seaboard-pinmux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-seaboard-pinmux.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/board-seaboard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-seaboard.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/board-trimslice-pinmux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-trimslice-pinmux.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/board-trimslice.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-trimslice.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/board.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/clock.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/clock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/clock.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/common.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/include/mach/clk.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/include/mach/clk.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/include/mach/entry-macro.S</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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/include/mach/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/include/mach/io.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/include/mach/irqs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/include/mach/kbc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/include/mach/kbc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/include/mach/pinmux-tegra20.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/include/mach/pinmux-tegra20.h</a> (renamed from arch/arm/mach-tegra/include/mach/pinmux-t2.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/include/mach/pinmux-tegra30.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/include/mach/pinmux-tegra30.h</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/include/mach/pinmux.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/include/mach/pinmux.h</a></td><td class='right'>88</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.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/include/mach/system.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/io.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/pcie.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/pinmux-tegra20-tables.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/pinmux-tegra20-tables.c</a> (renamed from arch/arm/mach-tegra/pinmux-t2-tables.c)</td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/pinmux-tegra30-tables.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/pinmux-tegra30-tables.c</a></td><td class='right'>376</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='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/pinmux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/pinmux.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/tegra2_clocks.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/tegra2_clocks.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-tegra/timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/timer.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-u300/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-u300/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/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.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-u300/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/include/mach/entry-macro.S</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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-u300/include/mach/gpio-u300.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/include/mach/gpio-u300.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-u300/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/include/mach/irqs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-u300/include/mach/memory.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/include/mach/memory.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-u300/include/mach/platform.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/include/mach/platform.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-u300/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/include/mach/system.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-u300/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/include/mach/vmalloc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-u300/mmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/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='/cgit/linux.git/diff/arch/arm/mach-u300/timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/timer.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-u300/u300-gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/u300-gpio.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-u300/u300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/u300.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ux500/board-mop500-sdi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/board-mop500-sdi.c</a></td><td class='right'>88</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='/cgit/linux.git/diff/arch/arm/mach-ux500/board-mop500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/board-mop500.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ux500/board-mop500.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/board-mop500.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ux500/board-u5500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/board-u5500.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ux500/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/clock.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ux500/cpu-db5500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/cpu-db5500.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ux500/cpu-db8500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/cpu-db8500.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ux500/devices-db8500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/devices-db8500.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ux500/headsmp.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/headsmp.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='/cgit/linux.git/diff/arch/arm/mach-ux500/id.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/id.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ux500/include/mach/db5500-regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/db5500-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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ux500/include/mach/db8500-regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/db8500-regs.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ux500/include/mach/devices.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/devices.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ux500/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/entry-macro.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='/cgit/linux.git/diff/arch/arm/mach-ux500/include/mach/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/gpio.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ux500/include/mach/hardware.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/hardware.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ux500/include/mach/id.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/id.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/irqs-board-mop500.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ux500/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/system.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-ux500/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-versatile/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.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-versatile/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='/cgit/linux.git/diff/arch/arm/mach-versatile/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-versatile/include/mach/entry-macro.S</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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-versatile/include/mach/system.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-versatile/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-versatile/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.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/versatile_ab.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-versatile/versatile_ab.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/versatile_dt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-versatile/versatile_dt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/versatile_pb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-versatile/versatile_pb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-vexpress/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-vexpress/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-vexpress/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-vexpress/include/mach/entry-macro.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='/cgit/linux.git/diff/arch/arm/mach-vexpress/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-vexpress/include/mach/system.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-vexpress/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-vexpress/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-vexpress/platsmp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-vexpress/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-vexpress/v2m.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-vexpress/v2m.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-vt8500/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-vt8500/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-w90x900/clksel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/clksel.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-w90x900/cpu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/cpu.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-w90x900/dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/dev.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-w90x900/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/include/mach/system.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-w90x900/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/include/mach/vmalloc.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-w90x900/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-w90x900/mach-nuc910evb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/mach-nuc910evb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-w90x900/mach-nuc950evb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/mach-nuc950evb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-w90x900/mach-nuc960evb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/mach-nuc960evb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-w90x900/mfp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/mfp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-w90x900/nuc910.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/nuc910.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-w90x900/nuc950.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/nuc950.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-w90x900/nuc960.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/nuc960.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-w90x900/nuc9xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/nuc9xx.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-w90x900/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-zynq/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-zynq/common.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-zynq/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-zynq/include/mach/entry-macro.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='/cgit/linux.git/diff/arch/arm/mach-zynq/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-zynq/include/mach/system.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/mach-zynq/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-zynq/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/Kconfig</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/alignment.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/arch/arm/mm/context.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/context.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/fault.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/fault.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/fault.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/fault.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mm/fsr-2level.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/fsr-2level.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mm/fsr-3level.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/fsr-3level.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/idmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/idmap.c</a></td><td class='right'>93</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='/cgit/linux.git/diff/arch/arm/mm/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/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.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/iomap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/iomap.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/ioremap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/ioremap.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/mm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/mm.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/mmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/mmap.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/mmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/mmu.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/nommu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/nommu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/pgd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/pgd.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-arm1020.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm1020.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='/cgit/linux.git/diff/arch/arm/mm/proc-arm1020e.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm1020e.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='/cgit/linux.git/diff/arch/arm/mm/proc-arm1022.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm1022.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='/cgit/linux.git/diff/arch/arm/mm/proc-arm1026.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm1026.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='/cgit/linux.git/diff/arch/arm/mm/proc-arm6_7.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm6_7.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-arm720.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm720.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='/cgit/linux.git/diff/arch/arm/mm/proc-arm740.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm740.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='/cgit/linux.git/diff/arch/arm/mm/proc-arm7tdmi.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm7tdmi.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='/cgit/linux.git/diff/arch/arm/mm/proc-arm920.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm920.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='/cgit/linux.git/diff/arch/arm/mm/proc-arm922.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm922.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='/cgit/linux.git/diff/arch/arm/mm/proc-arm925.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm925.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='/cgit/linux.git/diff/arch/arm/mm/proc-arm926.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm926.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='/cgit/linux.git/diff/arch/arm/mm/proc-arm940.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm940.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='/cgit/linux.git/diff/arch/arm/mm/proc-arm946.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm946.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='/cgit/linux.git/diff/arch/arm/mm/proc-arm9tdmi.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm9tdmi.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='/cgit/linux.git/diff/arch/arm/mm/proc-fa526.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-fa526.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='/cgit/linux.git/diff/arch/arm/mm/proc-feroceon.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-feroceon.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='/cgit/linux.git/diff/arch/arm/mm/proc-macros.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-macros.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-mohawk.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-mohawk.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='/cgit/linux.git/diff/arch/arm/mm/proc-sa110.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-sa110.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='/cgit/linux.git/diff/arch/arm/mm/proc-sa1100.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-sa1100.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='/cgit/linux.git/diff/arch/arm/mm/proc-v6.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-v6.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='add'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-v7-2level.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-v7-2level.S</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-v7-3level.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-v7-3level.S</a></td><td class='right'>150</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='/cgit/linux.git/diff/arch/arm/mm/proc-v7.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-v7.S</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-xsc3.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-xsc3.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='/cgit/linux.git/diff/arch/arm/mm/proc-xscale.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-xscale.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='/cgit/linux.git/diff/arch/arm/nwfpe/entry.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/nwfpe/entry.S</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/nwfpe/fpopcode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/nwfpe/fpopcode.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/nwfpe/fpopcode.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/nwfpe/fpopcode.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-iop/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-iop/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-iop/io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-iop/io.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.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-iop/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-iop/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/plat-iop/restart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-iop/restart.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-iop/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-iop/time.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/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='/cgit/linux.git/diff/arch/arm/plat-mxc/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/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='/cgit/linux.git/diff/arch/arm/plat-mxc/gic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/gic.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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/include/mach/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/include/mach/entry-macro.S</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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/iomux-mx25.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/include/mach/iomux-mx25.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/mx1.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/include/mach/mx1.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/mx3fb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/include/mach/mx3fb.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/mxc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/include/mach/mxc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/include/mach/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/include/mach/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/system.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/system.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/time.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-mxc/tzic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/tzic.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-nomadik/include/plat/ste_dma40.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-nomadik/include/plat/ste_dma40.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-nomadik/timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-nomadik/timer.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/common.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/counter_32k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/counter_32k.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/cpu-omap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/cpu-omap.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/devices.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/dma.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/am33xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/am33xx.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/clkdev_omap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/clkdev_omap.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/clock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/clock.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/common.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: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/cpu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/cpu.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/hardware.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/hardware.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/io.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/iommu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/iommu.h</a></td><td class='right'>31</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='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/iovmm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/iovmm.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/irqs.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/mmc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/mmc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/omap-secure.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/omap-secure.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/omap-serial.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/omap-serial.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/omap34xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/omap34xx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/omap44xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/omap44xx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/omap_hwmod.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/omap_hwmod.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/serial.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/serial.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/sram.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/sram.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/ti81xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/ti81xx.h</a> (renamed from arch/arm/plat-omap/include/plat/ti816x.h)</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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/uncompress.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/uncompress.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/include/plat/usb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/usb.h</a></td><td class='right'>35</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='/cgit/linux.git/diff/arch/arm/plat-omap/io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/io.c</a></td><td class='right'>159</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='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/sram.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/sram.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/addr-map.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/addr-map.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/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.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/include/plat/addr-map.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/include/plat/addr-map.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/include/plat/audio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/include/plat/audio.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/include/plat/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/include/plat/common.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/include/plat/ehci-orion.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/include/plat/ehci-orion.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/include/plat/mv_xor.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/include/plat/mv_xor.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/include/plat/mvsdio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/include/plat/mvsdio.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/include/plat/pcie.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/include/plat/pcie.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/pcie.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-orion/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-pxa/include/plat/gpio-pxa.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-pxa/include/plat/gpio-pxa.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.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-pxa/include/plat/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-pxa/include/plat/gpio.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/common-smdk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s3c24xx/common-smdk.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/cpu-freq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s3c24xx/cpu-freq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/cpu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s3c24xx/cpu.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s3c24xx/dma.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s3c24xx/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='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/pm-simtec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s3c24xx/pm-simtec.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/s3c2410-clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s3c24xx/s3c2410-clock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/s3c2412-iotiming.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s3c24xx/s3c2412-iotiming.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s3c24xx/s3c2443-clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s3c24xx/s3c2443-clock.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s5p/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s5p/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='/cgit/linux.git/diff/arch/arm/plat-s5p/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s5p/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s5p/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s5p/clock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-s5p/cpu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s5p/cpu.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s5p/irq-eint.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s5p/irq-eint.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-s5p/s5p-time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s5p/s5p-time.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/clock-clksrc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/clock-clksrc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/clock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/devs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/devs.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/dma-ops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/dma-ops.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/cpu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/cpu.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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/devs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/devs.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/dma-ops.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/dma-ops.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/dma-pl330.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/dma-pl330.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/dma-s3c24xx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/dma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/dma.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/exynos4.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/exynos4.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/irqs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/keypad.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/keypad.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/pm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/pm.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/regs-serial.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/regs-serial.h</a></td><td class='right'>45</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='del'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/reset.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/reset.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/s3c2412.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s3c2412.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/s3c2416.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s3c2416.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/s3c2443.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s3c2443.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/s3c6400.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s3c6400.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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/s3c6410.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s3c6410.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s3c64xx-spi.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/s5p6440.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s5p6440.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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/s5p6450.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s5p6450.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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/s5pc100.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s5pc100.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/s5pv210.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s5pv210.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/sdhci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/sdhci.h</a></td><td class='right'>76</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='del'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/system-reset.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/system-reset.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/udc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/udc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/include/plat/watchdog-reset.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/watchdog-reset.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/platformdata.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/platformdata.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/pm-gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/pm-gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-samsung/wakeup-mask.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/wakeup-mask.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-spear/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-spear/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-spear/include/plat/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-spear/include/plat/system.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-spear/include/plat/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-spear/include/plat/vmalloc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/plat-spear/restart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-spear/restart.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-tcc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-tcc/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-tcc/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/clock.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-tcc/include/mach/clock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/clock.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.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-tcc/include/mach/debug-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/debug-macro.S</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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-tcc/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/entry-macro.S</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: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-tcc/include/mach/hardware.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/hardware.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.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-tcc/include/mach/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/io.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-tcc/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/irqs.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: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-tcc/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/system.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-tcc/include/mach/tcc8k-regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/tcc8k-regs.h</a></td><td class='right'>807</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 12.4%;'/><td class='none' style='width: 87.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-tcc/include/mach/timex.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/timex.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-tcc/include/mach/uncompress.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/uncompress.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-tcc/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/vmalloc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/arm/plat-tcc/system.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/system.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-versatile/headsmp.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-versatile/headsmp.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='/cgit/linux.git/diff/arch/arm/plat-versatile/sched-clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-versatile/sched-clock.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/tools/mach-types?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/tools/mach-types</a></td><td class='right'>713</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/boards/atngw100/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/boards/atngw100/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='/cgit/linux.git/diff/arch/avr32/boards/atstk1000/atstk1002.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/boards/atstk1000/atstk1002.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/boards/favr-32/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/boards/favr-32/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='/cgit/linux.git/diff/arch/avr32/boards/hammerhead/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/boards/hammerhead/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='/cgit/linux.git/diff/arch/avr32/boards/merisc/merisc_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/boards/merisc/merisc_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='/cgit/linux.git/diff/arch/avr32/boards/merisc/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/boards/merisc/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='/cgit/linux.git/diff/arch/avr32/boards/mimc200/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/boards/mimc200/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='/cgit/linux.git/diff/arch/avr32/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/include/asm/ipcbuf.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/include/asm/socket.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/include/asm/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/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='/cgit/linux.git/diff/arch/avr32/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/include/asm/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/kernel/cpu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/kernel/cpu.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/kernel/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/kernel/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='/cgit/linux.git/diff/arch/avr32/kernel/traps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/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='/cgit/linux.git/diff/arch/avr32/mach-at32ap/at32ap700x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/mach-at32ap/at32ap700x.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/avr32/mach-at32ap/include/mach/board.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/mach-at32ap/include/mach/board.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/configs/BF518F-EZBRD_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF518F-EZBRD_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='/cgit/linux.git/diff/arch/blackfin/configs/BF526-EZBRD_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF526-EZBRD_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='/cgit/linux.git/diff/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF527-AD7160-EVAL_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='/cgit/linux.git/diff/arch/blackfin/configs/BF527-EZKIT-V2_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF527-EZKIT-V2_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='/cgit/linux.git/diff/arch/blackfin/configs/BF527-EZKIT_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF527-EZKIT_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='/cgit/linux.git/diff/arch/blackfin/configs/BF533-EZKIT_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF533-EZKIT_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='/cgit/linux.git/diff/arch/blackfin/configs/BF533-STAMP_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF533-STAMP_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='/cgit/linux.git/diff/arch/blackfin/configs/BF537-STAMP_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF537-STAMP_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='/cgit/linux.git/diff/arch/blackfin/configs/BF538-EZKIT_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF538-EZKIT_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='/cgit/linux.git/diff/arch/blackfin/configs/BF548-EZKIT_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF548-EZKIT_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='/cgit/linux.git/diff/arch/blackfin/configs/BF561-ACVILON_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF561-ACVILON_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='/cgit/linux.git/diff/arch/blackfin/configs/BF561-EZKIT-SMP_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF561-EZKIT-SMP_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='/cgit/linux.git/diff/arch/blackfin/configs/BF561-EZKIT_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF561-EZKIT_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='/cgit/linux.git/diff/arch/blackfin/configs/BlackStamp_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BlackStamp_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='/cgit/linux.git/diff/arch/blackfin/configs/CM-BF527_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/CM-BF527_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='/cgit/linux.git/diff/arch/blackfin/configs/CM-BF533_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/CM-BF533_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='/cgit/linux.git/diff/arch/blackfin/configs/CM-BF537E_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/CM-BF537E_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='/cgit/linux.git/diff/arch/blackfin/configs/CM-BF537U_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/CM-BF537U_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='/cgit/linux.git/diff/arch/blackfin/configs/CM-BF548_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/CM-BF548_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='/cgit/linux.git/diff/arch/blackfin/configs/CM-BF561_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/CM-BF561_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='/cgit/linux.git/diff/arch/blackfin/configs/DNP5370_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/DNP5370_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='/cgit/linux.git/diff/arch/blackfin/configs/H8606_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/H8606_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='/cgit/linux.git/diff/arch/blackfin/configs/IP0X_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/IP0X_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='/cgit/linux.git/diff/arch/blackfin/configs/PNAV-10_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/PNAV-10_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='/cgit/linux.git/diff/arch/blackfin/configs/SRV1_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/SRV1_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='/cgit/linux.git/diff/arch/blackfin/configs/TCM-BF518_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/TCM-BF518_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='/cgit/linux.git/diff/arch/blackfin/configs/TCM-BF537_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/TCM-BF537_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='/cgit/linux.git/diff/arch/blackfin/include/asm/bfin_serial.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/include/asm/bfin_serial.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/cpu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/include/asm/cpu.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/include/asm/pci.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/smp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/include/asm/smp.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/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='/cgit/linux.git/diff/arch/blackfin/kernel/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/kernel/setup.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/kernel/time-ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/kernel/time-ts.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf518/boards/ezbrd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf518/boards/ezbrd.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf518/boards/tcm-bf518.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf518/boards/tcm-bf518.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/boards/ad7160eval.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf527/boards/ad7160eval.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/boards/cm_bf527.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf527/boards/cm_bf527.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/boards/ezbrd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf527/boards/ezbrd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/boards/ezkit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf527/boards/ezkit.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf527/boards/tll6527m.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf527/boards/tll6527m.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/boards/H8606.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf533/boards/H8606.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/boards/blackstamp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf533/boards/blackstamp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/boards/cm_bf533.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf533/boards/cm_bf533.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/boards/ezkit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf533/boards/ezkit.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/boards/ip0x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf533/boards/ip0x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf533/boards/stamp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf533/boards/stamp.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.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='/cgit/linux.git/diff/arch/blackfin/mach-bf537/boards/cm_bf537e.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf537/boards/cm_bf537e.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/boards/cm_bf537u.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf537/boards/cm_bf537u.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/boards/dnp5370.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf537/boards/dnp5370.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/boards/minotaur.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf537/boards/minotaur.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/boards/pnav10.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf537/boards/pnav10.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf537/boards/stamp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf537/boards/stamp.c</a></td><td class='right'>78</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='/cgit/linux.git/diff/arch/blackfin/mach-bf537/boards/tcm_bf537.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf537/boards/tcm_bf537.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf538/boards/ezkit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf538/boards/ezkit.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/boards/cm_bf548.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf548/boards/cm_bf548.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf548/boards/ezkit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf548/boards/ezkit.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/boards/acvilon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf561/boards/acvilon.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/boards/cm_bf561.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf561/boards/cm_bf561.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/boards/ezkit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf561/boards/ezkit.c</a></td><td class='right'>101</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.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/include/mach/pll.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf561/include/mach/pll.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-bf561/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf561/smp.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/blackfin/mach-common/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-common/smp.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/Kconfig</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/Makefile</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/boot/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/boot/Makefile</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/boot/dts/dsk6455.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/boot/dts/dsk6455.dts</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/boot/dts/evmc6457.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/boot/dts/evmc6457.dts</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/boot/dts/evmc6472.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/boot/dts/evmc6472.dts</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/boot/dts/evmc6474.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/boot/dts/evmc6474.dts</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/boot/dts/tms320c6455.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/boot/dts/tms320c6455.dtsi</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/boot/dts/tms320c6457.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/boot/dts/tms320c6457.dtsi</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/boot/dts/tms320c6472.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/boot/dts/tms320c6472.dtsi</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/boot/dts/tms320c6474.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/boot/dts/tms320c6474.dtsi</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/boot/linked_dtb.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/boot/linked_dtb.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='add'><a href='/cgit/linux.git/diff/arch/c6x/configs/dsk6455_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/configs/dsk6455_defconfig</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/configs/evmc6457_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/configs/evmc6457_defconfig</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/configs/evmc6472_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/configs/evmc6472_defconfig</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/configs/evmc6474_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/configs/evmc6474_defconfig</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/Kbuild?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/Kbuild</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/asm-offsets.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/asm-offsets.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/bitops.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/bitops.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/byteorder.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/byteorder.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/cache.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/cache.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/cacheflush.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/cacheflush.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/checksum.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/checksum.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/clkdev.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/clkdev.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/clock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/clock.h</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/delay.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/delay.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/dma-mapping.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/dma-mapping.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/dscr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/dscr.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/elf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/elf.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/ftrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/ftrace.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/hardirq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/hardirq.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/irq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/irq.h</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/irqflags.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/irqflags.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/linkage.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/linkage.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/megamod-pic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/megamod-pic.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/mmu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/mmu.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/module.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/module.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/mutex.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/mutex.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/page.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/page.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/pgtable.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/pgtable.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/processor.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/processor.h</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/procinfo.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/procinfo.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/prom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/prom.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/ptrace.h</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/sections.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/sections.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/setup.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/setup.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/sigcontext.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/sigcontext.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/signal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/signal.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/soc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/soc.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/string.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/string.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/swab.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/swab.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/syscall.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/syscall.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/syscalls.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/syscalls.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/system.h</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/thread_info.h</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/timer64.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/timer64.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/timex.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/timex.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/tlb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/traps.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/traps.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/uaccess.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/uaccess.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/unaligned.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/unaligned.h</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/include/asm/unistd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/include/asm/unistd.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/asm-offsets.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/asm-offsets.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/c6x_ksyms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/c6x_ksyms.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/devicetree.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/devicetree.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/dma.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/entry.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/entry.S</a></td><td class='right'>803</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/head.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/head.S</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/irq.c</a></td><td class='right'>728</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/module.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/module.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/process.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/process.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/ptrace.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/setup.c</a></td><td class='right'>510</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/signal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/signal.c</a></td><td class='right'>377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/soc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/soc.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/switch_to.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/switch_to.S</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/sys_c6x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/sys_c6x.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/time.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/traps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/traps.c</a></td><td class='right'>423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/vectors.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/vectors.S</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/kernel/vmlinux.lds.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/kernel/vmlinux.lds.S</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/checksum.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/checksum.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/csum_64plus.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/csum_64plus.S</a></td><td class='right'>419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/divi.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/divi.S</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/divremi.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/divremi.S</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/divremu.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/divremu.S</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/divu.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/divu.S</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/llshl.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/llshl.S</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/llshr.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/llshr.S</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/llshru.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/llshru.S</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/memcpy_64plus.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/memcpy_64plus.S</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/mpyll.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/mpyll.S</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/negll.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/negll.S</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/pop_rts.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/pop_rts.S</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/push_rts.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/push_rts.S</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/remi.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/remi.S</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/remu.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/remu.S</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/strasgi.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/strasgi.S</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/lib/strasgi_64plus.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/lib/strasgi_64plus.S</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/mm/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/mm/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/mm/dma-coherent.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/mm/dma-coherent.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/mm/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/mm/init.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/platforms/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/platforms/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/platforms/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/platforms/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/platforms/cache.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/platforms/cache.c</a></td><td class='right'>445</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/platforms/dscr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/platforms/dscr.c</a></td><td class='right'>598</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/platforms/emif.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/platforms/emif.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/platforms/megamod-pic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/platforms/megamod-pic.c</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/platforms/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/platforms/platform.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/platforms/pll.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/platforms/pll.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/platforms/plldata.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/platforms/plldata.c</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/c6x/platforms/timer64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/c6x/platforms/timer64.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/cris/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/Kconfig.debug?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/cris/Kconfig.debug</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/drivers/axisflashmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/cris/arch-v32/drivers/axisflashmap.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/cris/include/asm/ipcbuf.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/cris/include/asm/socket.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/cris/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='/cgit/linux.git/diff/arch/cris/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/cris/include/asm/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/include/asm/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/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='/cgit/linux.git/diff/arch/frv/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/include/asm/ipcbuf.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/include/asm/param.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/include/asm/param.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/include/asm/socket.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/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='/cgit/linux.git/diff/arch/frv/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/include/asm/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/mb93090-mb00/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/mb93090-mb00/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/mb93090-mb00/pci-frv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/mb93090-mb00/pci-frv.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/mb93090-mb00/pci-frv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/mb93090-mb00/pci-frv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/frv/mb93090-mb00/pci-iomap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/mb93090-mb00/pci-iomap.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/mb93090-mb00/pci-vdk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/mb93090-mb00/pci-vdk.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/h8300/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='/cgit/linux.git/diff/arch/h8300/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/h8300/include/asm/ipcbuf.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/h8300/include/asm/pci.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/h8300/include/asm/socket.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/h8300/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='/cgit/linux.git/diff/arch/h8300/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/h8300/include/asm/types.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/hexagon/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/hexagon/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/hp/common/aml_nfw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/hp/common/aml_nfw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/intrinsics.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/intrinsics.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/iommu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/iommu.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/ipcbuf.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/pci.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/processor.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/ptrace.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/socket.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/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='/cgit/linux.git/diff/arch/ia64/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/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='/cgit/linux.git/diff/arch/ia64/include/asm/unistd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/unistd.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/include/asm/xen/interface.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/xen/interface.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/acpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kernel/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/entry.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kernel/entry.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='/cgit/linux.git/diff/arch/ia64/kernel/err_inject.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kernel/err_inject.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/machine_kexec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kernel/machine_kexec.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/pci-dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kernel/pci-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='/cgit/linux.git/diff/arch/ia64/kernel/perfmon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kernel/perfmon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kernel/ptrace.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kernel/setup.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/topology.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kernel/topology.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kvm/kvm-ia64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kvm/kvm-ia64.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/pci/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/pci/pci.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/kernel/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/sn/kernel/irq.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/pci/pcibr/pcibr_provider.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/sn/pci/pcibr/pcibr_provider.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/pci/tioca_provider.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/sn/pci/tioca_provider.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m32r/include/asm/ipcbuf.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/include/asm/param.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m32r/include/asm/param.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m32r/include/asm/socket.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m32r/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='/cgit/linux.git/diff/arch/m32r/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m32r/include/asm/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/Kconfig.cpu?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/Kconfig.cpu</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/Kconfig.debug?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/Kconfig.debug</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/Kconfig.devices?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/Kconfig.devices</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.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='/cgit/linux.git/diff/arch/m68k/Kconfig.machine?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/Kconfig.machine</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/amiga/config.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/amiga/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='/cgit/linux.git/diff/arch/m68k/atari/ataints.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/atari/ataints.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/atari/debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/atari/debug.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/configs/amiga_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/configs/amiga_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='/cgit/linux.git/diff/arch/m68k/configs/apollo_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/configs/apollo_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='/cgit/linux.git/diff/arch/m68k/configs/atari_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/configs/atari_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='/cgit/linux.git/diff/arch/m68k/configs/multi_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/configs/multi_defconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/configs/mvme16x_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/configs/mvme16x_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='/cgit/linux.git/diff/arch/m68k/emu/nfeth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/emu/nfeth.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/hp300/config.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/hp300/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='del'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/anchor.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/anchor.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: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/atarihw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/atarihw.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/atomic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/atomic.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/blinken.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/blinken.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/cacheflush_mm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/cacheflush_mm.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/checksum.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/checksum.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/div64.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/div64.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/elf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/entry.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/entry.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/fpu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/fpu.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/gpio.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/ipcbuf.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/irq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/irq.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/m54xxacr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/m54xxacr.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/mac_baboon.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/mac_baboon.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/mac_iop.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/mac_iop.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/mac_oss.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/mac_oss.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/mac_psc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/mac_psc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/mac_via.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/mac_via.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/macintosh.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/macintosh.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/macints.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/macints.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/mcf_pgalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/mcf_pgalloc.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/mcf_pgtable.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/mcf_pgtable.h</a></td><td class='right'>425</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/mcfmmu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/mcfmmu.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/mmu_context.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/mmu_context.h</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/motorola_pgtable.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/motorola_pgtable.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/page.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/page.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/page_no.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/page_no.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/page_offset.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/page_offset.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/pgalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/pgalloc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/pgtable_mm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/pgtable_mm.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/processor.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/processor.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/segment.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/segment.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/serial.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/serial.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/setup.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/setup.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/sigcontext.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/sigcontext.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/socket.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/thread_info.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/tlbflush.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/tlbflush.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/traps.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/traps.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/uaccess_mm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/uaccess_mm.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/ucontext.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/ucontext.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/include/asm/unistd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/unistd.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/asm-offsets.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/asm-offsets.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/entry.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/entry.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='/cgit/linux.git/diff/arch/m68k/kernel/entry_mm.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/entry_mm.S</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/entry_no.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/entry_no.S</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/head.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/head.S</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/init_task.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/init_task.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/m68k_ksyms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/m68k_ksyms.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/process_mm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/process_mm.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/ptrace_mm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/ptrace_mm.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/setup_mm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/setup_mm.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/setup_no.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/setup_no.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/signal_mm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/signal_mm.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/time_no.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/time_no.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/traps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/traps.c</a></td><td class='right'>104</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='mov'><a href='/cgit/linux.git/diff/arch/m68k/kernel/vmlinux-nommu.lds?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/vmlinux-nommu.lds</a> (renamed from arch/m68k/kernel/vmlinux.lds_no.S)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/vmlinux-std.lds?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/vmlinux-std.lds</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/vmlinux-sun3.lds?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/vmlinux-sun3.lds</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/vmlinux.lds.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/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.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/m68k/kernel/vmlinux.lds_mm.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/vmlinux.lds_mm.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/lib/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/lib/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/m68k/lib/checksum.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/lib/checksum.c</a> (renamed from arch/m68k/lib/checksum_mm.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='del'><a href='/cgit/linux.git/diff/arch/m68k/lib/checksum_no.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/lib/checksum_no.c</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: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/lib/uaccess.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/lib/uaccess.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mac/baboon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mac/baboon.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.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mac/config.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mac/config.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mac/iop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mac/iop.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mac/macints.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mac/macints.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mac/oss.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mac/oss.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: 1.6%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mac/psc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mac/psc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mac/via.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mac/via.c</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mm/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mm/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mm/cache.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mm/cache.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mm/init_mm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mm/init_mm.c</a></td><td class='right'>36</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='/cgit/linux.git/diff/arch/m68k/mm/kmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mm/kmap.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='/cgit/linux.git/diff/arch/m68k/mm/mcfmmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mm/mcfmmu.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mm/memory.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mm/memory.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mvme16x/config.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mvme16x/config.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/platform/54xx/config.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/54xx/config.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/platform/68328/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/68328/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/platform/68328/bootlogo.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/68328/bootlogo.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/m68k/platform/68328/bootlogo.pl?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/68328/bootlogo.pl</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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/platform/68328/config.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/68328/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='/cgit/linux.git/diff/arch/m68k/platform/68328/head-pilot.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/68328/head-pilot.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/platform/68328/head-rom.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/68328/head-rom.S</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/platform/coldfire/entry.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/coldfire/entry.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/platform/coldfire/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/coldfire/gpio.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/platform/coldfire/head.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/coldfire/head.S</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/platform/coldfire/sltimers.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/coldfire/sltimers.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/microblaze/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/microblaze/boot/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/boot/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/microblaze/include/asm/irq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/include/asm/irq.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/microblaze/include/asm/page.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/include/asm/page.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/microblaze/include/asm/pci-bridge.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/include/asm/pci-bridge.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/microblaze/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/include/asm/pci.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/microblaze/include/asm/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/include/asm/ptrace.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/microblaze/include/asm/setup.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/include/asm/setup.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/microblaze/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/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='/cgit/linux.git/diff/arch/microblaze/include/asm/unistd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/include/asm/unistd.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/microblaze/kernel/early_printk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/early_printk.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/microblaze/kernel/entry.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/entry.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='/cgit/linux.git/diff/arch/microblaze/kernel/intc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/intc.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.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='/cgit/linux.git/diff/arch/microblaze/kernel/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/irq.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/microblaze/kernel/module.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/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='/cgit/linux.git/diff/arch/microblaze/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/ptrace.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/microblaze/kernel/reset.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/reset.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.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='/cgit/linux.git/diff/arch/microblaze/kernel/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/setup.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/microblaze/kernel/syscall_table.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/syscall_table.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='/cgit/linux.git/diff/arch/microblaze/kernel/timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/timer.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/microblaze/lib/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/lib/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/microblaze/lib/cmpdi2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/lib/cmpdi2.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/microblaze/pci/iomap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/pci/iomap.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/microblaze/pci/pci-common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/pci/pci-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.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/Kconfig</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/alchemy/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/Kconfig</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.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/alchemy/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/alchemy/Platform?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/Platform</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.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/alchemy/board-gpr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/board-gpr.c</a> (renamed from arch/mips/alchemy/gpr/platform.c)</td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/alchemy/board-mtx1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/board-mtx1.c</a> (renamed from arch/mips/alchemy/mtx-1/platform.c)</td><td class='right'>93</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='add'><a href='/cgit/linux.git/diff/arch/mips/alchemy/board-xxs1500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/board-xxs1500.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/alchemy/common/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/common/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/alchemy/common/dbdma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/common/dbdma.c</a></td><td class='right'>49</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/alchemy/common/gpiolib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/common/gpiolib.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/alchemy/common/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/common/irq.c</a></td><td class='right'>875</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.4%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 86.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/alchemy/common/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/common/platform.c</a></td><td class='right'>31</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='/cgit/linux.git/diff/arch/mips/alchemy/common/power.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/common/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='/cgit/linux.git/diff/arch/mips/alchemy/common/sleeper.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/common/sleeper.S</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/alchemy/common/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/common/time.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='/cgit/linux.git/diff/arch/mips/alchemy/common/vss.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/common/vss.c</a></td><td class='right'>84</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='/cgit/linux.git/diff/arch/mips/alchemy/devboards/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/Makefile</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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/bcsr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/bcsr.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/db1000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/db1000.c</a></td><td class='right'>565</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/db1200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/db1200.c</a> (renamed from arch/mips/alchemy/devboards/db1200/platform.c)</td><td class='right'>401</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/db1200/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/db1200/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='/cgit/linux.git/diff/arch/mips/alchemy/devboards/db1200/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/db1200/setup.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: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/db1300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/db1300.c</a></td><td class='right'>785</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/db1550.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/db1550.c</a></td><td class='right'>498</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/db1x00/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/db1x00/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/db1x00/board_setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/db1x00/board_setup.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/db1x00/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/db1x00/platform.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/pb1000/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1000/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/pb1000/board_setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1000/board_setup.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/pb1100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1100.c</a> (renamed from arch/mips/alchemy/devboards/pb1100/board_setup.c)</td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/pb1100/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1100/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/pb1100/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1100/platform.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/pb1200/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1200/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/pb1200/board_setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1200/board_setup.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: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/pb1200/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1200/platform.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: 5.2%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/pb1500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1500.c</a> (renamed from arch/mips/alchemy/devboards/pb1500/board_setup.c)</td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/pb1500/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1500/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/pb1500/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1500/platform.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/pb1550.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1550.c</a> (renamed from arch/mips/alchemy/devboards/pb1550/platform.c)</td><td class='right'>112</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='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/pb1550/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1550/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/pb1550/board_setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1550/board_setup.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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='/cgit/linux.git/diff/arch/mips/alchemy/devboards/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/platform.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/alchemy/devboards/prom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/prom.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/gpr/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/gpr/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/gpr/board_setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/gpr/board_setup.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/gpr/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/gpr/init.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: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/mtx-1/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/mtx-1/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/mtx-1/board_setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/mtx-1/board_setup.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/mtx-1/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/mtx-1/init.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/xxs1500/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/xxs1500/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/xxs1500/board_setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/xxs1500/board_setup.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: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/xxs1500/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/xxs1500/init.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: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/alchemy/xxs1500/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/xxs1500/platform.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: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ar7/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ar7/gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ar7/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ar7/platform.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ar7/prom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ar7/prom.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ar7/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ar7/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='/cgit/linux.git/diff/arch/mips/ath79/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/Kconfig</a></td><td class='right'>38</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='/cgit/linux.git/diff/arch/mips/ath79/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ath79/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/clock.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ath79/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/common.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/ath79/dev-ar913x-wmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/dev-ar913x-wmac.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.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ath79/dev-common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/dev-common.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/ath79/dev-usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/dev-usb.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/ath79/dev-usb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/dev-usb.h</a> (renamed from arch/mips/ath79/dev-ar913x-wmac.h)</td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/ath79/dev-wmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/dev-wmac.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/ath79/dev-wmac.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/dev-wmac.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ath79/early_printk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/early_printk.c</a></td><td class='right'>76</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ath79/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ath79/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/irq.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/ath79/mach-ap121.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/mach-ap121.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ath79/mach-ap81.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/mach-ap81.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ath79/mach-pb44.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/mach-pb44.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/ath79/mach-ubnt-xm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/mach-ubnt-xm.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ath79/machtypes.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/machtypes.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ath79/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/setup.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/bcm47xx/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm47xx/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/bcm63xx/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm63xx/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/bcm63xx/boards/board_bcm963xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm63xx/boards/board_bcm963xx.c</a></td><td class='right'>49</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/bcm63xx/clk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm63xx/clk.c</a></td><td class='right'>70</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='/cgit/linux.git/diff/arch/mips/bcm63xx/cpu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm63xx/cpu.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/bcm63xx/dev-uart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm63xx/dev-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='/cgit/linux.git/diff/arch/mips/bcm63xx/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm63xx/gpio.c</a></td><td class='right'>41</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='/cgit/linux.git/diff/arch/mips/bcm63xx/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm63xx/irq.c</a></td><td class='right'>403</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/bcm63xx/prom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm63xx/prom.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/bcm63xx/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm63xx/setup.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/boot/compressed/uart-alchemy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/boot/compressed/uart-alchemy.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/cavium-octeon/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/cavium-octeon/dma-octeon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/dma-octeon.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/cavium-octeon/executive/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c</a> (renamed from drivers/staging/octeon/cvmx-cmd-queue.c)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/cavium-octeon/executive/cvmx-fpa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/cvmx-fpa.c</a> (renamed from drivers/staging/octeon/cvmx-fpa.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='mov'><a href='/cgit/linux.git/diff/arch/mips/cavium-octeon/executive/cvmx-helper-board.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/cvmx-helper-board.c</a> (renamed from drivers/staging/octeon/cvmx-helper-board.c)</td><td class='right'>38</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='mov'><a href='/cgit/linux.git/diff/arch/mips/cavium-octeon/executive/cvmx-helper-fpa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/cvmx-helper-fpa.c</a> (renamed from drivers/staging/octeon/cvmx-helper-fpa.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='mov'><a href='/cgit/linux.git/diff/arch/mips/cavium-octeon/executive/cvmx-helper-loop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/cvmx-helper-loop.c</a> (renamed from drivers/staging/octeon/cvmx-helper-loop.c)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/cavium-octeon/executive/cvmx-helper-npi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/cvmx-helper-npi.c</a> (renamed from drivers/staging/octeon/cvmx-helper-npi.c)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c</a> (renamed from drivers/staging/octeon/cvmx-helper-rgmii.c)</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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c</a> (renamed from drivers/staging/octeon/cvmx-helper-sgmii.c)</td><td class='right'>18</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='/cgit/linux.git/diff/arch/mips/cavium-octeon/executive/cvmx-helper-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/cvmx-helper-spi.c</a> (renamed from drivers/staging/octeon/cvmx-helper-spi.c)</td><td class='right'>20</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='/cgit/linux.git/diff/arch/mips/cavium-octeon/executive/cvmx-helper-util.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/cvmx-helper-util.c</a> (renamed from drivers/staging/octeon/cvmx-helper-util.c)</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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c</a> (renamed from drivers/staging/octeon/cvmx-helper-xaui.c)</td><td class='right'>32</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='/cgit/linux.git/diff/arch/mips/cavium-octeon/executive/cvmx-helper.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/cvmx-helper.c</a> (renamed from drivers/staging/octeon/cvmx-helper.c)</td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c</a> (renamed from drivers/staging/octeon/cvmx-interrupt-decodes.c)</td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/cavium-octeon/executive/cvmx-interrupt-rsl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/cvmx-interrupt-rsl.c</a> (renamed from drivers/staging/octeon/cvmx-interrupt-rsl.c)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/cavium-octeon/executive/cvmx-pko.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/cvmx-pko.c</a> (renamed from drivers/staging/octeon/cvmx-pko.c)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/cavium-octeon/executive/cvmx-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/cvmx-spi.c</a> (renamed from drivers/staging/octeon/cvmx-spi.c)</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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/cavium-octeon/executive/octeon-model.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/octeon-model.c</a></td><td class='right'>119</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='/cgit/linux.git/diff/arch/mips/cavium-octeon/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/setup.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/cavium-octeon/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/db1000_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/configs/db1000_defconfig</a></td><td class='right'>369</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/configs/db1100_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/configs/db1100_defconfig</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: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/configs/db1300_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/configs/db1300_defconfig</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/configs/db1500_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/configs/db1500_defconfig</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: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/db1550_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/configs/db1550_defconfig</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/configs/nlm_xlp_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/configs/nlm_xlp_defconfig</a></td><td class='right'>570</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/nlm_xlr_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/configs/nlm_xlr_defconfig</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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/configs/pb1200_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/configs/pb1200_defconfig</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/dec/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/dec/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/Kbuild?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/Kbuild</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/bmips.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/bmips.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/bootinfo.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/bootinfo.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/branch.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/branch.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/cpu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/cpu.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/gio_device.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/gio_device.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/hazards.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/hazards.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/hugetlb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/hugetlb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/ip32/mace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/ip32/mace.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/ipcbuf.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/kprobes.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/kprobes.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-ath79/ar71xx_regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-ath79/ar71xx_regs.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-ath79/ar933x_uart.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-ath79/ar933x_uart.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-ath79/ath79.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-ath79/ath79.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-ath79/irq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-ath79/irq.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-ath79/pci-ath724x.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-ath79/pci-ath724x.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-au1x00/au1000.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-au1x00/au1000.h</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-au1x00/au1100_mmc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-au1x00/au1100_mmc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-au1x00/au1200fb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-au1x00/au1200fb.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-au1x00/au1550nd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-au1x00/au1550nd.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-au1x00/gpio-au1300.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-au1x00/gpio-au1300.h</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-au1x00/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-au1x00/gpio.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h</a></td><td class='right'>597</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-bcm63xx/bcm63xx_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='/cgit/linux.git/diff/arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.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='/cgit/linux.git/diff/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-bcm63xx/ioremap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-bcm63xx/ioremap.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-bcm63xx/irq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-bcm63xx/irq.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-db1x00/bcsr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-db1x00/bcsr.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-db1x00/db1200.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-db1x00/db1200.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-db1x00/db1300.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-db1x00/db1300.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-db1x00/db1x00.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-db1x00/db1x00.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-db1x00/irq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-db1x00/irq.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-generic/floppy.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-generic/floppy.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-jazz/floppy.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-jazz/floppy.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h</a></td><td class='right'>23</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='del'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-pb1x00/mc146818rtc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-pb1x00/mc146818rtc.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-pb1x00/pb1000.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-pb1x00/pb1000.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-pb1x00/pb1200.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-pb1x00/pb1200.h</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mach-pb1x00/pb1550.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-pb1x00/pb1550.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: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/mipsregs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mipsregs.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/module.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/module.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/netlogic/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/netlogic/common.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/netlogic/haldefs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/netlogic/haldefs.h</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/netlogic/xlp-hal/bridge.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/netlogic/xlp-hal/bridge.h</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/netlogic/xlp-hal/iomap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/netlogic/xlp-hal/iomap.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/netlogic/xlp-hal/pic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/netlogic/xlp-hal/pic.h</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/netlogic/xlp-hal/sys.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/netlogic/xlp-hal/sys.h</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/netlogic/xlp-hal/uart.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/netlogic/xlp-hal/uart.h</a></td><td class='right'>191</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='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/netlogic/xlp-hal/xlp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/netlogic/xlp-hal/xlp.h</a> (renamed from arch/mips/netlogic/xlr/xlr_console.c)</td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/netlogic/xlr/iomap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/netlogic/xlr/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.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/netlogic/xlr/msidef.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/netlogic/xlr/msidef.h</a></td><td class='right'>84</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='/cgit/linux.git/diff/arch/mips/include/asm/netlogic/xlr/pic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/netlogic/xlr/pic.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/netlogic/xlr/xlr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/netlogic/xlr/xlr.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-address.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-address.h</a> (renamed from drivers/staging/octeon/cvmx-address.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-asxx-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-asxx-defs.h</a> (renamed from drivers/staging/octeon/cvmx-asxx-defs.h)</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='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-bootinfo.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-bootinfo.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-cmd-queue.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-cmd-queue.h</a> (renamed from drivers/staging/octeon/cvmx-cmd-queue.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-config.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-config.h</a> (renamed from drivers/staging/octeon/cvmx-config.h)</td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-dbg-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-dbg-defs.h</a> (renamed from drivers/staging/octeon/cvmx-dbg-defs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-dpi-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-dpi-defs.h</a></td><td class='right'>643</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-fau.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-fau.h</a> (renamed from drivers/staging/octeon/cvmx-fau.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-fpa-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-fpa-defs.h</a> (renamed from drivers/staging/octeon/cvmx-fpa-defs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-fpa.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-fpa.h</a> (renamed from drivers/staging/octeon/cvmx-fpa.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-gmxx-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-gmxx-defs.h</a> (renamed from drivers/staging/octeon/cvmx-gmxx-defs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-helper-board.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-helper-board.h</a> (renamed from drivers/staging/octeon/cvmx-helper-board.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-helper-fpa.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-helper-fpa.h</a> (renamed from drivers/staging/octeon/cvmx-helper-fpa.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-helper-loop.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-helper-loop.h</a> (renamed from drivers/staging/octeon/cvmx-helper-loop.h)</td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-helper-npi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-helper-npi.h</a> (renamed from drivers/staging/octeon/cvmx-helper-npi.h)</td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-helper-rgmii.h</a> (renamed from drivers/staging/octeon/cvmx-helper-rgmii.h)</td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-helper-sgmii.h</a> (renamed from drivers/staging/octeon/cvmx-helper-sgmii.h)</td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-helper-spi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-helper-spi.h</a> (renamed from drivers/staging/octeon/cvmx-helper-spi.h)</td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-helper-util.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-helper-util.h</a> (renamed from drivers/staging/octeon/cvmx-helper-util.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-helper-xaui.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-helper-xaui.h</a> (renamed from drivers/staging/octeon/cvmx-helper-xaui.h)</td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-helper.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-helper.h</a> (renamed from drivers/staging/octeon/cvmx-helper.h)</td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-ipd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-ipd.h</a> (renamed from drivers/staging/octeon/cvmx-ipd.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-mdio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-mdio.h</a> (renamed from drivers/staging/octeon/cvmx-mdio.h)</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='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-mio-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-mio-defs.h</a></td><td class='right'>1033</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 84.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-npei-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-npei-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-pciercx-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-pciercx-defs.h</a></td><td class='right'>609</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-pcsx-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-pcsx-defs.h</a> (renamed from drivers/staging/octeon/cvmx-pcsx-defs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-pcsxx-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-pcsxx-defs.h</a> (renamed from drivers/staging/octeon/cvmx-pcsxx-defs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-pemx-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-pemx-defs.h</a></td><td class='right'>509</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-pexp-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-pexp-defs.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-pip-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-pip-defs.h</a> (renamed from drivers/staging/octeon/cvmx-pip-defs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-pip.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-pip.h</a> (renamed from drivers/staging/octeon/cvmx-pip.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-pko-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-pko-defs.h</a> (renamed from drivers/staging/octeon/cvmx-pko-defs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-pko.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-pko.h</a> (renamed from drivers/staging/octeon/cvmx-pko.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-pow.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-pow.h</a> (renamed from drivers/staging/octeon/cvmx-pow.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-scratch.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-scratch.h</a> (renamed from drivers/staging/octeon/cvmx-scratch.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-sli-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-sli-defs.h</a></td><td class='right'>2172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 33.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 66.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-spi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-spi.h</a> (renamed from drivers/staging/octeon/cvmx-spi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-spxx-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-spxx-defs.h</a> (renamed from drivers/staging/octeon/cvmx-spxx-defs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-sriox-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-sriox-defs.h</a></td><td class='right'>1036</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-srxx-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-srxx-defs.h</a> (renamed from drivers/staging/octeon/cvmx-srxx-defs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-stxx-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-stxx-defs.h</a> (renamed from drivers/staging/octeon/cvmx-stxx-defs.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx-wqe.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-wqe.h</a> (renamed from drivers/staging/octeon/cvmx-wqe.h)</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='/cgit/linux.git/diff/arch/mips/include/asm/octeon/cvmx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/octeon-feature.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/octeon-feature.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/octeon-model.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/octeon-model.h</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/octeon/pci-octeon.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/pci-octeon.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/page.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/page.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/pgtable-32.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/pgtable-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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/ptrace.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/socket.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/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='add'><a href='/cgit/linux.git/diff/arch/mips/include/asm/tlbmisc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/tlbmisc.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/traps.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/traps.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/jazz/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/jazz/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='/cgit/linux.git/diff/arch/mips/jazz/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/jazz/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/jz4740/board-qi_lb60.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/jz4740/board-qi_lb60.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/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='add'><a href='/cgit/linux.git/diff/arch/mips/kernel/bmips_vec.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/bmips_vec.S</a></td><td class='right'>255</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='/cgit/linux.git/diff/arch/mips/kernel/branch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/branch.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/cevt-bcm1480.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/cevt-bcm1480.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/cevt-ds1287.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/cevt-ds1287.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/cevt-gt641xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/cevt-gt641xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/cevt-r4k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/cevt-r4k.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/cevt-sb1250.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/cevt-sb1250.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/cevt-txx9.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/cevt-txx9.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/cpu-probe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/cpu-probe.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/i8253.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/i8253.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/kprobes.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/kprobes.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/perf_event_mipsxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/perf_event_mipsxx.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.9%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/ptrace.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/rtlx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/rtlx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/setup.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/kernel/smp-bmips.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/smp-bmips.c</a></td><td class='right'>458</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='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/smtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/smtc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/traps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/traps.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/lantiq/clk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/lantiq/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/lantiq/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/lantiq/irq.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/lantiq/xway/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/lantiq/xway/dma.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/lantiq/xway/ebu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/lantiq/xway/ebu.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/lantiq/xway/pmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/lantiq/xway/pmu.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/lantiq/xway/reset.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/lantiq/xway/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/lib/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/lib/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/lib/iomap-pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/lib/iomap-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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/loongson/common/cs5536/cs5536_mfgpt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/loongson/common/cs5536/cs5536_mfgpt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/math-emu/cp1emu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/math-emu/cp1emu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/mm/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/c-octeon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/mm/c-octeon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/c-r4k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/mm/c-r4k.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='/cgit/linux.git/diff/arch/mips/mm/gup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/mm/gup.c</a></td><td class='right'>315</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='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/mm/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/tlb-r3k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/mm/tlb-r3k.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/tlb-r4k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/mm/tlb-r4k.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.8%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mti-malta/malta-int.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/mti-malta/malta-int.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/netlogic/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/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='add'><a href='/cgit/linux.git/diff/arch/mips/netlogic/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/netlogic/Platform?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/Platform</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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/netlogic/common/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/common/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/netlogic/common/earlycons.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/common/earlycons.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/netlogic/common/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/common/irq.c</a></td><td class='right'>238</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='mov'><a href='/cgit/linux.git/diff/arch/mips/netlogic/common/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/common/smp.c</a> (renamed from arch/mips/netlogic/xlr/smp.c)</td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/netlogic/common/smpboot.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/common/smpboot.S</a></td><td class='right'>272</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='mov'><a href='/cgit/linux.git/diff/arch/mips/netlogic/common/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/common/time.c</a> (renamed from arch/mips/netlogic/xlr/time.c)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/netlogic/xlp/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/xlp/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/netlogic/xlp/nlm_hal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/xlp/nlm_hal.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/netlogic/xlp/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/xlp/platform.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/netlogic/xlp/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/xlp/setup.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/netlogic/xlp/wakeup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/xlp/wakeup.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/netlogic/xlr/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/xlr/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/netlogic/xlr/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/xlr/irq.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: 4.6%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/netlogic/xlr/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/xlr/platform.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/netlogic/xlr/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/xlr/setup.c</a></td><td class='right'>31</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='mov'><a href='/cgit/linux.git/diff/arch/mips/netlogic/xlr/wakeup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/xlr/wakeup.c</a> (renamed from arch/mips/netlogic/xlr/smpboot.S)</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.9%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/msi-octeon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/msi-octeon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/ops-pmcmsp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/ops-pmcmsp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/ops-tx3927.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/ops-tx3927.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-alchemy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pci-alchemy.c</a></td><td class='right'>138</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='add'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-ath724x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pci-ath724x.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-bcm63xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pci-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-octeon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pci-octeon.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-tx4927.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pci-tx4927.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-tx4938.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pci-tx4938.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-tx4939.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pci-tx4939.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-xlr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pci-xlr.c</a></td><td class='right'>128</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.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pci.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pcie-octeon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pcie-octeon.c</a></td><td class='right'>1349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.7%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 79.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pmc-sierra/msp71xx/msp_setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pmc-sierra/msp71xx/msp_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='/cgit/linux.git/diff/arch/mips/pmc-sierra/msp71xx/msp_smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pmc-sierra/msp71xx/msp_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pnx8550/common/int.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pnx8550/common/int.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pnx8550/common/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pnx8550/common/time.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip22/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sgi-ip22/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip22/ip22-gio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sgi-ip22/ip22-gio.c</a></td><td class='right'>428</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='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip22/ip22-int.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sgi-ip22/ip22-int.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip22/ip22-mc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sgi-ip22/ip22-mc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip22/ip22-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sgi-ip22/ip22-setup.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip27/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sgi-ip27/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip27/ip27-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sgi-ip27/ip27-irq.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip27/ip27-timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sgi-ip27/ip27-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='/cgit/linux.git/diff/arch/mips/sgi-ip32/ip32-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sgi-ip32/ip32-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='/cgit/linux.git/diff/arch/mips/sibyte/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sibyte/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='/cgit/linux.git/diff/arch/mips/sni/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sni/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='/cgit/linux.git/diff/arch/mips/sni/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sni/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/generic/7segled.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/txx9/generic/7segled.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/generic/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/txx9/generic/pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/generic/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/txx9/generic/setup.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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/txx9/generic/setup_tx4939.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/txx9/generic/setup_tx4939.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mn10300/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/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='/cgit/linux.git/diff/arch/mn10300/include/asm/exceptions.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/include/asm/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='/cgit/linux.git/diff/arch/mn10300/include/asm/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mn10300/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/include/asm/ipcbuf.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mn10300/include/asm/param.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/include/asm/param.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mn10300/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/include/asm/socket.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mn10300/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/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='/cgit/linux.git/diff/arch/mn10300/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/include/asm/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mn10300/unit-asb2305/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/unit-asb2305/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mn10300/unit-asb2305/pci-asb2305.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/unit-asb2305/pci-asb2305.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mn10300/unit-asb2305/pci-asb2305.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/unit-asb2305/pci-asb2305.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mn10300/unit-asb2305/pci-iomap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/unit-asb2305/pci-iomap.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mn10300/unit-asb2305/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/unit-asb2305/pci.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/openrisc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/openrisc/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/openrisc/boot/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/openrisc/boot/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/parisc/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='/cgit/linux.git/diff/arch/parisc/hpux/sys_hpux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/parisc/hpux/sys_hpux.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/include/asm/processor.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/parisc/include/asm/processor.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/parisc/include/asm/socket.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/parisc/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='/cgit/linux.git/diff/arch/parisc/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/parisc/include/asm/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/process.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/parisc/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='/cgit/linux.git/diff/arch/parisc/lib/iomap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/parisc/lib/iomap.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/Kconfig</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/Kconfig.debug?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/Kconfig.debug</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/Makefile</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dcr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dcr.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/div64.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/div64.S</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/asp834x-redboot.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/asp834x-redboot.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/currituck.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/currituck.dts</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/mpc8544si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/mpc8544si-post.dtsi</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p1010si-post.dtsi</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p1020si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p1020si-post.dtsi</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p1021si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p1021si-post.dtsi</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p1022si-post.dtsi</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p1023si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p1023si-post.dtsi</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p2020si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p2020si-post.dtsi</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p2041si-post.dtsi</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p3041si-post.dtsi</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p3060si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p3060si-post.dtsi</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p3060si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p3060si-pre.dtsi</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p4080si-post.dtsi</a></td><td class='right'>350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p5020si-post.dtsi</a></td><td class='right'>355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-dma-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-dma-0.dtsi</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-dma-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-dma-1.dtsi</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-duart-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-duart-0.dtsi</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-esdhc-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-esdhc-0.dtsi</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-espi-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-espi-0.dtsi</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-etsec1-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-etsec1-1.dtsi</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-etsec1-2.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-etsec1-2.dtsi</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-etsec1-3.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-etsec1-3.dtsi</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-etsec1-timer-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-etsec1-timer-0.dtsi</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-0.dtsi</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-1.dtsi</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-2.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-2.dtsi</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-i2c-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-i2c-0.dtsi</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-i2c-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-i2c-1.dtsi</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-mpic-timer-B.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-mpic-timer-B.dtsi</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-sata2-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-sata2-0.dtsi</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-sata2-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-sata2-1.dtsi</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-sec2.1-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-sec2.1-0.dtsi</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-sec3.0-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-sec3.0-0.dtsi</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-sec3.1-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-sec3.1-0.dtsi</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-sec3.3-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-sec3.3-0.dtsi</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-usb2-dr-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-usb2-dr-0.dtsi</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/pq3-usb2-dr-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/pq3-usb2-dr-1.dtsi</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/qoriq-dma-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/qoriq-dma-0.dtsi</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/qoriq-dma-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/qoriq-dma-1.dtsi</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/qoriq-duart-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/qoriq-duart-0.dtsi</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/qoriq-duart-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/qoriq-duart-1.dtsi</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/qoriq-esdhc-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/qoriq-esdhc-0.dtsi</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/qoriq-espi-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/qoriq-espi-0.dtsi</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/qoriq-gpio-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/qoriq-gpio-0.dtsi</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/qoriq-i2c-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/qoriq-i2c-0.dtsi</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/qoriq-i2c-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/qoriq-i2c-1.dtsi</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/qoriq-mpic.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/qoriq-mpic.dtsi</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/qoriq-rmu-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/qoriq-rmu-0.dtsi</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/qoriq-sata2-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/qoriq-sata2-0.dtsi</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/qoriq-sata2-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/qoriq-sata2-1.dtsi</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/qoriq-sec4.0-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/qoriq-sec4.0-0.dtsi</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/qoriq-sec4.1-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/qoriq-sec4.1-0.dtsi</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/qoriq-sec4.2-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/qoriq-sec4.2-0.dtsi</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/qoriq-usb2-dr-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/qoriq-usb2-dr-0.dtsi</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/fsl/qoriq-usb2-mph-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/fsl/qoriq-usb2-mph-0.dtsi</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/gef_ppc9a.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/gef_ppc9a.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/gef_sbc310.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/gef_sbc310.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/gef_sbc610.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/gef_sbc610.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/klondike.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/klondike.dts</a></td><td class='right'>227</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='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/kmeter1.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/kmeter1.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='/cgit/linux.git/diff/arch/powerpc/boot/dts/kuroboxHD.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/kuroboxHD.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/kuroboxHG.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/kuroboxHG.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8308_p1m.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8308_p1m.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8308rdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8308rdb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8313erdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8313erdb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8315erdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8315erdb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc832x_mds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc832x_mds.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc832x_rdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc832x_rdb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8349emitx.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8349emitx.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8349emitxgp.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8349emitxgp.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc834x_mds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc834x_mds.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc836x_mds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc836x_mds.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc836x_rdk.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc836x_rdk.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8377_mds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8377_mds.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8377_rdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8377_rdb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8377_wlan.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8377_wlan.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8378_mds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8378_mds.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8378_rdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8378_rdb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8379_mds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8379_mds.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8379_rdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8379_rdb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8536ds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8536ds.dts</a></td><td class='right'>456</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 6.7%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8536ds.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8536ds.dtsi</a></td><td class='right'>141</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='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8536ds_36b.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8536ds_36b.dts</a></td><td class='right'>410</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 6.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8540ads.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8540ads.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8541cds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8541cds.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8544ds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8544ds.dts</a></td><td class='right'>473</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 6.7%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8544ds.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8544ds.dtsi</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8548cds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8548cds.dts</a></td><td class='right'>505</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 5.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='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8555cds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8555cds.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8568mds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8568mds.dts</a></td><td class='right'>482</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 6.4%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8569mds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8569mds.dts</a></td><td class='right'>414</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 5.8%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8572ds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8572ds.dts</a></td><td class='right'>757</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 11.4%;'/><td class='none' style='width: 88.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8572ds.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8572ds.dtsi</a></td><td class='right'>397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8572ds_36b.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8572ds_36b.dts</a></td><td class='right'>746</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 11.2%;'/><td class='none' style='width: 88.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts</a></td><td class='right'>487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 7.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8610_hpcd.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8610_hpcd.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8641_hpcn.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8641_hpcn.dts</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8641_hpcn_36b.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/obs600.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/obs600.dts</a></td><td class='right'>314</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='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p1010rdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1010rdb.dts</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p1010rdb.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1010rdb.dtsi</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p1010rdb_36b.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1010rdb_36b.dts</a></td><td class='right'>89</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='del'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p1010si.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1010si.dtsi</a></td><td class='right'>374</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p1020rdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1020rdb.dts</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p1020rdb.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1020rdb.dtsi</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p1020rdb_36b.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1020rdb_36b.dts</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p1020rdb_camp_core0.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1020rdb_camp_core0.dts</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: 2.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='/cgit/linux.git/diff/arch/powerpc/boot/dts/p1020rdb_camp_core1.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1020rdb_camp_core1.dts</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p1020si.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1020si.dtsi</a></td><td class='right'>377</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='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p1021mds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1021mds.dts</a></td><td class='right'>425</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 6.1%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p1022ds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1022ds.dts</a></td><td class='right'>459</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 6.5%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p1023rds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1023rds.dts</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p2020ds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p2020ds.dts</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p2020ds.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p2020ds.dtsi</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p2020rdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p2020rdb.dts</a></td><td class='right'>71</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='/cgit/linux.git/diff/arch/powerpc/boot/dts/p2020rdb_camp_core0.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p2020rdb_camp_core0.dts</a></td><td class='right'>141</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p2020rdb_camp_core1.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p2020rdb_camp_core1.dts</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: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p2020si.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p2020si.dtsi</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: 5.9%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p2041rdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p2041rdb.dts</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p2041si.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p2041si.dtsi</a></td><td class='right'>692</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.6%;'/><td class='none' style='width: 89.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p3041ds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p3041ds.dts</a></td><td class='right'>23</td><td class='graph'><table summary='file 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='del'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p3041si.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p3041si.dtsi</a></td><td class='right'>729</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.2%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p3060qds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p3060qds.dts</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p3060si.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p3060si.dtsi</a></td><td class='right'>719</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.0%;'/><td class='none' style='width: 89.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p4080ds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p4080ds.dts</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p4080si.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p4080si.dtsi</a></td><td class='right'>755</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.6%;'/><td class='none' style='width: 88.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p5020ds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p5020ds.dts</a></td><td class='right'>24</td><td class='graph'><table summary='file 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='del'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/p5020si.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p5020si.dtsi</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: 11.0%;'/><td class='none' style='width: 89.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/sbc8349.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/sbc8349.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/sbc8548.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/sbc8548.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/sbc8641d.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/sbc8641d.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/socrates.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/socrates.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/storcenter.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/storcenter.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/stxssa8555.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/stxssa8555.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/tqm8540.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/tqm8540.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/tqm8541.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/tqm8541.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/tqm8548-bigflash.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/tqm8548-bigflash.dts</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/tqm8548.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/tqm8548.dts</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/tqm8555.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/tqm8555.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/tqm8xx.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/tqm8xx.dts</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/xcalibur1501.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/xcalibur1501.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/xpedite5200.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/xpedite5200.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/xpedite5200_xmon.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/xpedite5200_xmon.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/xpedite5301.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/xpedite5301.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/xpedite5330.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/xpedite5330.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/dts/xpedite5370.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/xpedite5370.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/boot/treeboot-currituck.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/treeboot-currituck.c</a></td><td class='right'>119</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'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/wrapper?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/wrapper</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/configs/40x/klondike_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/40x/klondike_defconfig</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/configs/40x/obs600_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/40x/obs600_defconfig</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/configs/44x/currituck_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/44x/currituck_defconfig</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/44x/iss476-smp_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/44x/iss476-smp_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='add'><a href='/cgit/linux.git/diff/arch/powerpc/configs/chroma_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/chroma_defconfig</a></td><td class='right'>307</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='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/corenet32_smp_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/corenet32_smp_defconfig</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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/corenet64_smp_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/corenet64_smp_defconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/mpc85xx_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/mpc85xx_defconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/mpc85xx_smp_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/mpc85xx_smp_defconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/ppc64_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/ppc64_defconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/ps3_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/ps3_defconfig</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/pseries_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/pseries_defconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/Kbuild?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/arch/powerpc/include/asm/cputable.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/cputable.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/cputime.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/cputime.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/fsl_ifc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/fsl_ifc.h</a></td><td class='right'>834</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/fsl_lbc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/fsl_lbc.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/hugetlb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/hugetlb.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/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='/cgit/linux.git/diff/arch/powerpc/include/asm/kdump.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/kdump.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/kexec.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/kexec.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/keylargo.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/keylargo.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/kvm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/kvm.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/lv1call.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/lv1call.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/machdep.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/machdep.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mmu-book3e.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/mmu-book3e.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mmu-hash64.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/mmu-hash64.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/mpic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/mpic.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/opal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/opal.h</a></td><td class='right'>131</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='/cgit/linux.git/diff/arch/powerpc/include/asm/paca.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/paca.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/page.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/page.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/page_64.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/page_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='/cgit/linux.git/diff/arch/powerpc/include/asm/pci-bridge.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/pci-bridge.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/pci.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/pgtable.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/pgtable.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/processor.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/processor.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/ptrace.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/reg.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/reg_booke.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/reg_booke.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/rtas.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/rtas.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/rwsem.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/rwsem.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: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/socket.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/spu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/spu.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/system.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/tce.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/tce.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/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='/cgit/linux.git/diff/arch/powerpc/include/asm/time.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/time.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/topology.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/topology.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/types.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/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='/cgit/linux.git/diff/arch/powerpc/kernel/asm-offsets.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/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='/cgit/linux.git/diff/arch/powerpc/kernel/cacheinfo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/cacheinfo.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/cpu_setup_a2.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/cpu_setup_a2.S</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/cputable.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/cputable.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/crash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/crash.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/crash_dump.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/crash_dump.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/exceptions-64s.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/exceptions-64s.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='/cgit/linux.git/diff/arch/powerpc/kernel/head_44x.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/head_44x.S</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/head_fsl_booke.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/head_fsl_booke.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='/cgit/linux.git/diff/arch/powerpc/kernel/idle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/idle.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/idle_power7.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/idle_power7.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/iomap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/iomap.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/irq.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/legacy_serial.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/legacy_serial.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/lparcfg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/lparcfg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/machine_kexec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/machine_kexec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/machine_kexec_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/machine_kexec_32.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/machine_kexec_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/machine_kexec_64.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/pci-common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/pci-common.c</a></td><td class='right'>108</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='/cgit/linux.git/diff/arch/powerpc/kernel/pci_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/pci_64.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/pci_dn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/pci_dn.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/process.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/process.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/prom_init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/prom_init.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/ptrace.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/reloc_32.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/reloc_32.S</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/rtas_flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/rtas_flash.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/rtasd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/rtasd.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/setup_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/setup_64.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/smp.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/sysfs.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/time.c</a></td><td class='right'>105</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='/cgit/linux.git/diff/arch/powerpc/kernel/traps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/traps.c</a></td><td class='right'>173</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='/cgit/linux.git/diff/arch/powerpc/kernel/vio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/vio.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/vmlinux.lds.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/vmlinux.lds.S</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kvm/book3s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kvm/book3s.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kvm/book3s_hv_builtin.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kvm/book3s_hv_builtin.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kvm/book3s_hv_rmhandlers.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kvm/book3s_hv_rmhandlers.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='/cgit/linux.git/diff/arch/powerpc/lib/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/lib/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/lib/copyuser_64.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/lib/copyuser_64.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/lib/copyuser_power7.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/lib/copyuser_power7.S</a></td><td class='right'>683</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/lib/copyuser_power7_vmx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/lib/copyuser_power7_vmx.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/44x_mmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/44x_mmu.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/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='/cgit/linux.git/diff/arch/powerpc/mm/fault.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/fault.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/hugetlbpage-book3e.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/hugetlbpage-book3e.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/hugetlbpage.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/hugetlbpage.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/mm/icswx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/icswx.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/mm/icswx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/icswx.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/mm/icswx_pid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/icswx_pid.c</a></td><td class='right'>87</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='/cgit/linux.git/diff/arch/powerpc/mm/init_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/init_32.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/mem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/mem.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/mmap_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/mmap_64.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/mmu_context_hash64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/mmu_context_hash64.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/numa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/tlb_low_64e.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/tlb_low_64e.S</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.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/tlb_nohash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/tlb_nohash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/40x/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/40x/Kconfig</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.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='/cgit/linux.git/diff/arch/powerpc/platforms/40x/ppc40x_simple.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/40x/ppc40x_simple.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/44x/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/44x/Kconfig</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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/44x/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/44x/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/44x/currituck.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/44x/currituck.c</a></td><td class='right'>204</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='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/44x/iss4xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/44x/iss4xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/512x/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/512x/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='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/asp834x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/asp834x.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/km83xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/km83xx.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.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/misc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/misc.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc830x_rdb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc830x_rdb.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc831x_rdb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc831x_rdb.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.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='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc832x_mds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc832x_mds.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc832x_rdb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc832x_rdb.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.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc834x_itx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc834x_itx.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc834x_mds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc834x_mds.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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc836x_mds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc836x_mds.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc836x_rdk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc836x_rdk.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc837x_mds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc837x_mds.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc837x_rdb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc837x_rdb.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.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc83xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc83xx.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/sbc834x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/sbc834x.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.7%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/common.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/corenet_ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/corenet_ds.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/ksi8560.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/ksi8560.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: 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='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/mpc8536_ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/mpc8536_ds.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.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/mpc85xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/mpc85xx.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/mpc85xx_ads.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/mpc85xx_ads.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 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='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/mpc85xx_cds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/mpc85xx_cds.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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/mpc85xx_ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/mpc85xx_ds.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.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='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/mpc85xx_mds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/mpc85xx_mds.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: 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='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/mpc85xx_rdb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/mpc85xx_rdb.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.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='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/p1010rdb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/p1010rdb.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.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/p1022_ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/p1022_ds.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.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/p1023_rds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/p1023_rds.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.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='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/sbc8548.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/sbc8548.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.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='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/sbc8560.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/sbc8560.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 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='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/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='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/smp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/smp.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/socrates.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/socrates.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/stx_gp3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/stx_gp3.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: 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='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/tqm85xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/tqm85xx.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: 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='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/xes_mpc85xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/xes_mpc85xx.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.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='/cgit/linux.git/diff/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/86xx/mpc86xx_hpcn.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/86xx/pic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/86xx/pic.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/Kconfig.cputype?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/Kconfig.cputype</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/cbe_thermal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/cell/cbe_thermal.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/iommu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/cell/iommu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/cell/setup.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/cell/smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spu_base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/cell/spu_base.c</a></td><td class='right'>61</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='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spu_syscalls.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/cell/spu_syscalls.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spufs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/cell/spufs/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spufs/spufs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/cell/spufs/spufs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spufs/syscalls.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/cell/spufs/syscalls.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/chrp/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/chrp/setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/embedded6xx/holly.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/embedded6xx/holly.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/embedded6xx/linkstation.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/embedded6xx/linkstation.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/embedded6xx/storcenter.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/embedded6xx/storcenter.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/iseries/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/iseries/smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/maple/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/maple/pci.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/maple/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/maple/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='/cgit/linux.git/diff/arch/powerpc/platforms/pasemi/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pasemi/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/cpufreq_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powermac/cpufreq_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='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/pic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powermac/pic.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: 1.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powermac/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powermac/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powernv/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powernv/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powernv/opal-wrappers.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powernv/opal-wrappers.S</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powernv/pci-ioda.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powernv/pci-ioda.c</a></td><td class='right'>1330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powernv/pci-p5ioc2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powernv/pci-p5ioc2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powernv/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powernv/pci.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powernv/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powernv/pci.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powernv/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powernv/smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/ps3/interrupt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/ps3/interrupt.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/ps3/repository.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/ps3/repository.c</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/ps3/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/ps3/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/ps3/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/ps3/smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/ps3/spu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/ps3/spu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/cmm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/cmm.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/hvCall.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/hvCall.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='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/hvCall_inst.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/hvCall_inst.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/iommu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/iommu.c</a></td><td class='right'>61</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='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/lpar.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/lpar.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/nvram.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/nvram.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/processor_idle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/processor_idle.c</a></td><td class='right'>329</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='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/pseries.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/pseries.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/pseries_energy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/pseries_energy.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/setup.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: 1.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/smp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/suspend.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/suspend.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/wsp/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/wsp/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/wsp/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/wsp/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/wsp/chroma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/wsp/chroma.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/wsp/h8.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/wsp/h8.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/wsp/opb_pic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/wsp/opb_pic.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/wsp/psr2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/wsp/psr2.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.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/wsp/wsp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/wsp/wsp.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/wsp/wsp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/wsp/wsp.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 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='/cgit/linux.git/diff/arch/powerpc/relocs_check.pl?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/relocs_check.pl</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/axonram.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/axonram.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/fsl_ifc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/fsl_ifc.c</a></td><td class='right'>310</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='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/fsl_lbc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/fsl_lbc.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/fsl_msi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/fsl_msi.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/fsl_msi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/fsl_msi.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/fsl_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/fsl_pci.c</a></td><td class='right'>84</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='/cgit/linux.git/diff/arch/powerpc/sysdev/fsl_rio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/fsl_rio.c</a></td><td class='right'>1519</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 19.2%;'/><td class='none' style='width: 76.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/fsl_rio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/fsl_rio.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/fsl_rmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/fsl_rmu.c</a></td><td class='right'>1104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/mpic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/mpic.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/ppc4xx_cpm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/ppc4xx_cpm.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/ppc4xx_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/ppc4xx_pci.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/ppc4xx_pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/ppc4xx_pci.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/qe_lib/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/qe_lib/gpio.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.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/qe_lib/qe_ic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/qe_lib/qe_ic.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/uic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/uic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/xics/icp-hv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/xics/icp-hv.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/xics/xics-common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/xics/xics-common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/xmon/xmon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/xmon/xmon.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/Kbuild?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/Kbuild</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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/boot/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/boot/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/hypfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/hypfs/inode.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/include/asm/chpid.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/chpid.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/include/asm/debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/debug.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/include/asm/itcw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/itcw.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/include/asm/kdebug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/kdebug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/include/asm/lowcore.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/lowcore.h</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.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='/cgit/linux.git/diff/arch/s390/include/asm/mman.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/include/asm/percpu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/percpu.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/include/asm/pgtable.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/pgtable.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/include/asm/processor.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/processor.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/include/asm/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/ptrace.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/include/asm/qdio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/qdio.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/include/asm/sigp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/sigp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/include/asm/smp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/smp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/socket.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/include/asm/sparsemem.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/sparsemem.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/include/asm/syscall.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/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='/cgit/linux.git/diff/arch/s390/include/asm/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/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='/cgit/linux.git/diff/arch/s390/include/asm/topology.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/topology.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/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='/cgit/linux.git/diff/arch/s390/include/asm/unistd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/unistd.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/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='/cgit/linux.git/diff/arch/s390/kernel/asm-offsets.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/asm-offsets.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/base.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/base.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/compat_linux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/compat_linux.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/compat_signal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/compat_signal.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/dis.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/dis.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/early.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/early.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/entry.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/entry.S</a></td><td class='right'>1103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 9.5%;'/><td class='none' style='width: 83.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/entry.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/entry.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/entry64.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/entry64.S</a></td><td class='right'>976</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 8.3%;'/><td class='none' style='width: 85.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/head.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/head.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/machine_kexec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/machine_kexec.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/mem_detect.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/mem_detect.c</a></td><td class='right'>122</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='/cgit/linux.git/diff/arch/s390/kernel/nmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/arch/s390/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/reipl64.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/reipl64.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/setup.c</a></td><td class='right'>69</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: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/signal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/signal.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/smp.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/sys_s390.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/sys_s390.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: 1.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/time.c</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/topology.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/topology.c</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.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='/cgit/linux.git/diff/arch/s390/kernel/traps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/traps.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/mm/fault.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/mm/fault.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/mm/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/mm/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.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/mm/pgtable.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/score/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/score/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/board-magicpanelr2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/boards/board-magicpanelr2.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/board-sh7757lcr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/boards/board-sh7757lcr.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-ap325rxa/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/boards/mach-ap325rxa/setup.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-ecovec24/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/boards/mach-ecovec24/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.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-kfr2r09/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/boards/mach-kfr2r09/setup.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-migor/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/boards/mach-migor/setup.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-rsk/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/boards/mach-rsk/setup.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.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='/cgit/linux.git/diff/arch/sh/boards/mach-se/7722/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/boards/mach-se/7722/setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/mach-se/7724/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/boards/mach-se/7724/setup.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.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/dma/dma-sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/drivers/dma/dma-sysfs.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/pci/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/drivers/pci/pci.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.8%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/include/asm/device.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/include/asm/device.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/include/asm/dma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/include/asm/dma.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/sh/include/asm/hwblk.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/include/asm/hwblk.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: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/include/asm/ptrace_32.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/include/asm/ptrace_32.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/include/asm/ptrace_64.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/include/asm/ptrace_64.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/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='/cgit/linux.git/diff/arch/sh/include/cpu-sh4/cpu/sh7722.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/include/cpu-sh4/cpu/sh7722.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh4/cpu/sh7723.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/include/cpu-sh4/cpu/sh7723.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/include/cpu-sh4/cpu/sh7724.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/include/cpu-sh4/cpu/sh7724.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/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='del'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/hwblk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/hwblk.c</a></td><td class='right'>159</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='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4/sq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4/sq.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4a/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4a/clock-sh7722.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/clock-sh7722.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4a/clock-sh7723.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/clock-sh7723.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4a/clock-sh7724.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/clock-sh7724.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4a/clock-sh7757.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/clock-sh7757.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/hwblk-sh7722.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: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4a/hwblk-sh7723.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/hwblk-sh7723.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4a/hwblk-sh7724.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/hwblk-sh7724.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: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4a/setup-sh7722.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/setup-sh7722.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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4a/setup-sh7723.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/setup-sh7723.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4a/setup-sh7724.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/setup-sh7724.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: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4a/setup-sh7757.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/setup-sh7757.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4a/setup-sh7780.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/setup-sh7780.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4a/setup-sh7785.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/setup-sh7785.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4a/setup-sh7786.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/setup-sh7786.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/shmobile/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/shmobile/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/shmobile/cpuidle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/shmobile/cpuidle.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='/cgit/linux.git/diff/arch/sh/kernel/cpu/shmobile/pm_runtime.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/shmobile/pm_runtime.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: 4.9%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/entry-common.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/entry-common.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='/cgit/linux.git/diff/arch/sh/kernel/process_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/process_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='/cgit/linux.git/diff/arch/sh/kernel/process_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/process_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='/cgit/linux.git/diff/arch/sh/kernel/ptrace_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/ptrace_32.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/ptrace_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/ptrace_64.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/signal_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/signal_32.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/signal_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/signal_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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/mm/cache-sh2a.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/mm/cache-sh2a.c</a></td><td class='right'>123</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='/cgit/linux.git/diff/arch/sparc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/atomic_32.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/atomic_32.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: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/io_32.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/io_32.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/io_64.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/arch/sparc/include/asm/page_32.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/page_32.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/pci_32.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/pci_32.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/pci_64.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/pci_64.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/pgtsun4.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/pgtsun4.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/posix_types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/posix_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='/cgit/linux.git/diff/arch/sparc/include/asm/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/ptrace.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/siginfo.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/siginfo.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/signal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/signal.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/socket.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/thread_info_32.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/thread_info_32.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/include/asm/thread_info_64.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/thread_info_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='/cgit/linux.git/diff/arch/sparc/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/leon_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/kernel/leon_pci.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/kernel/pci.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/ptrace_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/kernel/ptrace_64.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/smp_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/kernel/smp_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='/cgit/linux.git/diff/arch/sparc/kernel/sys_sparc_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/kernel/sys_sparc_64.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/kernel/sysfs.c</a></td><td class='right'>122</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.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/lib/atomic_32.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/lib/atomic_32.S</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.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/lib/iomap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/lib/iomap.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/lib/ksyms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/lib/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/tile/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/tile/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='/cgit/linux.git/diff/arch/tile/include/asm/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/tile/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='upd'><a href='/cgit/linux.git/diff/arch/tile/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/tile/include/asm/pci.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/tile/include/asm/signal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/tile/include/asm/signal.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/tile/kernel/machine_kexec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/tile/kernel/machine_kexec.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/tile/kernel/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/tile/kernel/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.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/tile/kernel/sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/tile/kernel/sysfs.c</a></td><td class='right'>61</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='/cgit/linux.git/diff/arch/um/Kconfig.common?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/um/Kconfig.common</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/um/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/um/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='/cgit/linux.git/diff/arch/um/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/um/kernel/ptrace.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/unicore32/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/unicore32/include/asm/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/include/asm/io.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/unicore32/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/include/asm/pci.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/unicore32/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/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='/cgit/linux.git/diff/arch/unicore32/kernel/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/kernel/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/unicore32/kernel/puv3-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/kernel/puv3-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='/cgit/linux.git/diff/arch/unicore32/kernel/puv3-nb0916.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/kernel/puv3-nb0916.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/unicore32/kernel/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/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='/cgit/linux.git/diff/arch/unicore32/kernel/signal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/kernel/signal.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/unicore32/kernel/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/kernel/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/.gitignore?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/Kconfig</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/Kconfig.cpu?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/Kconfig.cpu</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/Kconfig.debug?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/Kconfig.debug</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/boot/compressed/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/boot/compressed/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/boot/compressed/eboot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/boot/compressed/eboot.c</a></td><td class='right'>1022</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/boot/compressed/eboot.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/boot/compressed/eboot.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/boot/compressed/efi_stub_32.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/boot/compressed/efi_stub_32.S</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/boot/compressed/efi_stub_64.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/boot/compressed/efi_stub_64.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='/cgit/linux.git/diff/arch/x86/boot/compressed/head_32.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/boot/compressed/head_32.S</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/boot/compressed/head_64.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/boot/compressed/head_64.S</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/boot/compressed/string.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/boot/compressed/string.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/boot/header.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/boot/header.S</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/boot/string.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/boot/string.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/boot/tools/build.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/boot/tools/build.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/crypto/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/crypto/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/crypto/serpent-sse2-i586-asm_32.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/crypto/serpent-sse2-i586-asm_32.S</a></td><td class='right'>638</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/crypto/serpent-sse2-x86_64-asm_64.S</a></td><td class='right'>761</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/crypto/serpent_sse2_glue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/crypto/serpent_sse2_glue.c</a></td><td class='right'>1070</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/crypto/twofish_glue_3way.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/crypto/twofish_glue_3way.c</a></td><td class='right'>218</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='/cgit/linux.git/diff/arch/x86/ia32/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/ia32/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/ia32/ia32entry.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/ia32/ia32entry.S</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/ia32/nosyscall.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/ia32/nosyscall.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/ia32/syscall_ia32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/ia32/syscall_ia32.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/Kbuild?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/Kbuild</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/amd_nb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/amd_nb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/atomic64_32.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/atomic64_32.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/bootparam.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/bootparam.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/cpufeature.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/cpufeature.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/debugreg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/debugreg.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/desc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/desc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/efi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/efi.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/fixmap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/arch/x86/include/asm/ia32_unistd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/ia32_unistd.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/init.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/init.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/iommu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/iommu.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/kvm_emulate.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/kvm_emulate.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/kvm_host.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/kvm_host.h</a></td><td class='right'>90</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='/cgit/linux.git/diff/arch/x86/include/asm/mce.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/mce.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/mrst.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/mrst.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/pci.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/pci_x86.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/pci_x86.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/percpu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/percpu.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/include/asm/serpent.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/serpent.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/setup.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/setup.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/smp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/smp.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/syscall.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/syscall.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/thread_info.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/topology.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/topology.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/unistd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/unistd.h</a></td><td class='right'>55</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='del'><a href='/cgit/linux.git/diff/arch/x86/include/asm/unistd_32.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/unistd_32.h</a></td><td class='right'>401</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.2%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/x86/include/asm/unistd_64.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/unistd_64.h</a></td><td class='right'>732</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.2%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/include/asm/uv/uv_bau.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/uv/uv_bau.h</a></td><td class='right'>107</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='/cgit/linux.git/diff/arch/x86/include/asm/x86_init.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/x86_init.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/amd_nb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/amd_nb.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/apic/x2apic_uv_x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/apic/x2apic_uv_x.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/apm_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/apm_32.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/asm-offsets.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/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='/cgit/linux.git/diff/arch/x86/kernel/asm-offsets_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/asm-offsets_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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/asm-offsets_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/asm-offsets_64.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/cpu/common.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/intel_cacheinfo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/cpu/intel_cacheinfo.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/mcheck/mce-internal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/cpu/mcheck/mce-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/mcheck/mce.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/cpu/mcheck/mce.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/mcheck/mce_amd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/cpu/mcheck/mce_amd.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpu/mcheck/therm_throt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/cpu/mcheck/therm_throt.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/cpuid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/cpuid.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/e820.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/e820.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/early_printk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/early_printk.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/entry_32.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/entry_32.S</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/entry_64.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/entry_64.S</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/head_64.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/head_64.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/hpet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/hpet.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/irq_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/irq_32.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/irq_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/irq_64.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/irqinit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/irqinit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/kvm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/kvm.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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='/cgit/linux.git/diff/arch/x86/kernel/microcode_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/microcode_core.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/msr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/msr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/nmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/nmi.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/kernel/nmi_selftest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/nmi_selftest.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/pci-dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/pci-dma.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/ptrace.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/setup.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/signal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/signal.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/smp.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/smpboot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/smpboot.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/kernel/syscall_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/syscall_32.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/syscall_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/syscall_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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/x86/kernel/syscall_table_32.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/syscall_table_32.S</a></td><td class='right'>350</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='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/traps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/traps.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/tsc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/vm86_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/vm86_32.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kernel/x86_init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/x86_init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/kvm/cpuid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/cpuid.c</a></td><td class='right'>670</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/kvm/cpuid.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/cpuid.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/emulate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/emulate.c</a></td><td class='right'>436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/i8254.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/i8254.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/i8259.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/i8259.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/lapic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/lapic.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/lapic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/lapic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/mmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/mmu.c</a></td><td class='right'>547</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/mmu_audit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/mmu_audit.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/mmutrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/mmutrace.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/paging_tmpl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/paging_tmpl.h</a></td><td class='right'>86</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='/cgit/linux.git/diff/arch/x86/kvm/pmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/pmu.c</a></td><td class='right'>533</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/svm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/svm.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/timer.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/vmx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/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.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/x86.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/x86.c</a></td><td class='right'>1005</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 12.0%;'/><td class='none' style='width: 84.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/kvm/x86.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/x86.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/lguest/boot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/lguest/boot.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/lib/x86-opcode-map.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/lib/x86-opcode-map.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mm/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/mm/init.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mm/init_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/mm/init_32.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mm/init_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/mm/init_64.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mm/mmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/mm/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mm/mmio-mod.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/mm/mmio-mod.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mm/numa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/mm/numa.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mm/pageattr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/mm/pageattr.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/mm/srat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/mm/srat.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/pci/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/pci/acpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/acpi.c</a></td><td class='right'>75</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='/cgit/linux.git/diff/arch/x86/pci/amd_bus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/amd_bus.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.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/pci/broadcom_bus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/broadcom_bus.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/pci/bus_numa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/bus_numa.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/pci/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/common.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/pci/i386.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/i386.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/pci/legacy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/legacy.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/pci/numaq_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/numaq_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='/cgit/linux.git/diff/arch/x86/pci/pcbios.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/pcbios.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/platform/geode/alix.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/platform/geode/alix.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/platform/iris/iris.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/platform/iris/iris.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/platform/mrst/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/platform/mrst/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/platform/mrst/early_printk_mrst.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/platform/mrst/early_printk_mrst.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/platform/mrst/mrst.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/platform/mrst/mrst.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/platform/uv/tlb_uv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/platform/uv/tlb_uv.c</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/platform/uv/uv_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/platform/uv/uv_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='add'><a href='/cgit/linux.git/diff/arch/x86/syscalls/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/syscalls/Makefile</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/syscalls/syscall_32.tbl?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/syscalls/syscall_32.tbl</a></td><td class='right'>357</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/syscalls/syscall_64.tbl?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/syscalls/syscall_64.tbl</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/syscalls/syscallhdr.sh?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/syscalls/syscallhdr.sh</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/syscalls/syscalltbl.sh?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/syscalls/syscalltbl.sh</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/um/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/um/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/um/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/um/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/um/shared/sysdep/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/um/shared/sysdep/ptrace.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/x86/um/sys_call_table_32.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/um/sys_call_table_32.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86/um/sys_call_table_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/um/sys_call_table_32.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/um/sys_call_table_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/um/sys_call_table_64.c</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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/um/user-offsets.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/um/user-offsets.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/xen/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/xen/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/xen/debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/xen/debugfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/xen/debugfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/xen/debugfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/xen/grant-table.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/xen/grant-table.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86/xen/mmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/xen/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='/cgit/linux.git/diff/arch/xtensa/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/xtensa/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='/cgit/linux.git/diff/arch/xtensa/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/xtensa/include/asm/pci.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/xtensa/include/asm/socket.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/xtensa/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='/cgit/linux.git/diff/arch/xtensa/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/xtensa/include/asm/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='/cgit/linux.git/diff/arch/xtensa/kernel/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/xtensa/kernel/pci.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/xtensa/kernel/ptrace.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/blk-cgroup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/blk-cgroup.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/blk-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/blk-core.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/blk-exec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/blk-exec.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/blk-ioc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/blk-ioc.c</a></td><td class='right'>485</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/blk-settings.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/blk-settings.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/blk-sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/blk-sysfs.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/blk-throttle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/blk-throttle.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/blk.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/blk.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/bsg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/bsg.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/cfq-iosched.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/cfq-iosched.c</a></td><td class='right'>626</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 7.8%;'/><td class='none' style='width: 90.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/compat_ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/compat_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='/cgit/linux.git/diff/block/deadline-iosched.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/deadline-iosched.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/elevator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/elevator.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/genhd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/genhd.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/noop-iosched.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/noop-iosched.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/block/partition-generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partition-generic.c</a> (renamed from fs/partitions/check.c)</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: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/block/partitions/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/Kconfig</a> (renamed from fs/partitions/Kconfig)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/block/partitions/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/Makefile</a> (renamed from fs/partitions/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/block/partitions/acorn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/acorn.c</a> (renamed from fs/partitions/acorn.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='mov'><a href='/cgit/linux.git/diff/block/partitions/acorn.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/acorn.h</a> (renamed from fs/partitions/acorn.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/block/partitions/amiga.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/amiga.c</a> (renamed from fs/partitions/amiga.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='mov'><a href='/cgit/linux.git/diff/block/partitions/amiga.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/amiga.h</a> (renamed from fs/partitions/amiga.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/block/partitions/atari.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/atari.c</a> (renamed from fs/partitions/atari.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='mov'><a href='/cgit/linux.git/diff/block/partitions/atari.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/atari.h</a> (renamed from fs/partitions/atari.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/block/partitions/check.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/check.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/block/partitions/check.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/check.h</a> (renamed from fs/partitions/check.h)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/block/partitions/efi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/efi.c</a> (renamed from fs/partitions/efi.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='mov'><a href='/cgit/linux.git/diff/block/partitions/efi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/efi.h</a> (renamed from fs/partitions/efi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/block/partitions/ibm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/ibm.c</a> (renamed from fs/partitions/ibm.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='mov'><a href='/cgit/linux.git/diff/block/partitions/ibm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/ibm.h</a> (renamed from fs/partitions/ibm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/block/partitions/karma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/karma.c</a> (renamed from fs/partitions/karma.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='mov'><a href='/cgit/linux.git/diff/block/partitions/karma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/karma.h</a> (renamed from fs/partitions/karma.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/block/partitions/ldm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/ldm.c</a> (renamed from fs/partitions/ldm.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='mov'><a href='/cgit/linux.git/diff/block/partitions/ldm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/ldm.h</a> (renamed from fs/partitions/ldm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/block/partitions/mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/mac.c</a> (renamed from fs/partitions/mac.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='mov'><a href='/cgit/linux.git/diff/block/partitions/mac.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/mac.h</a> (renamed from fs/partitions/mac.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/block/partitions/msdos.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/msdos.c</a> (renamed from fs/partitions/msdos.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='mov'><a href='/cgit/linux.git/diff/block/partitions/msdos.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/msdos.h</a> (renamed from fs/partitions/msdos.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/block/partitions/osf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/osf.c</a> (renamed from fs/partitions/osf.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='mov'><a href='/cgit/linux.git/diff/block/partitions/osf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/osf.h</a> (renamed from fs/partitions/osf.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/block/partitions/sgi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/sgi.c</a> (renamed from fs/partitions/sgi.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='mov'><a href='/cgit/linux.git/diff/block/partitions/sgi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/sgi.h</a> (renamed from fs/partitions/sgi.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/block/partitions/sun.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/sun.c</a> (renamed from fs/partitions/sun.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='mov'><a href='/cgit/linux.git/diff/block/partitions/sun.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/sun.h</a> (renamed from fs/partitions/sun.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/block/partitions/sysv68.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/sysv68.c</a> (renamed from fs/partitions/sysv68.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='mov'><a href='/cgit/linux.git/diff/block/partitions/sysv68.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/sysv68.h</a> (renamed from fs/partitions/sysv68.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/block/partitions/ultrix.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/ultrix.c</a> (renamed from fs/partitions/ultrix.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='mov'><a href='/cgit/linux.git/diff/block/partitions/ultrix.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/partitions/ultrix.h</a> (renamed from fs/partitions/ultrix.h)</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='/cgit/linux.git/diff/block/scsi_ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/scsi_ioctl.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/Kconfig</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/algapi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/algapi.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/ansi_cprng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/ansi_cprng.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/crypto_user.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/crypto_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/lrw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/lrw.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/crypto/serpent.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/serpent.c</a></td><td class='right'>587</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.0%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/crypto/serpent_generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/serpent_generic.c</a></td><td class='right'>684</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/tcrypt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/tcrypt.c</a></td><td class='right'>310</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='upd'><a href='/cgit/linux.git/diff/crypto/tcrypt.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/tcrypt.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/testmgr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/testmgr.c</a></td><td class='right'>150</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='/cgit/linux.git/diff/crypto/testmgr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/testmgr.h</a></td><td class='right'>2759</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 42.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 57.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/twofish_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/twofish_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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/xts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/xts.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/accessibility/braille/braille_console.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/accessibility/braille/braille_console.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/Makefile</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/accommon.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/accommon.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/acconfig.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acconfig.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/acdebug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acdebug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/acdispat.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acdispat.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/acevents.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acevents.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/acglobal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acglobal.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/achware.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/achware.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/acinterp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acinterp.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/aclocal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/aclocal.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/acmacros.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acmacros.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/acnamesp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acnamesp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/acobject.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acobject.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/acopcode.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acopcode.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/acparser.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acparser.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/acpredef.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acpredef.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/acresrc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acresrc.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/acstruct.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acstruct.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/actables.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/actables.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/acutils.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acutils.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/amlcode.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/amlcode.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/amlresrc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/amlresrc.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/dsargs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dsargs.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/dscontrol.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dscontrol.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/dsfield.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dsfield.c</a></td><td class='right'>83</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.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/dsinit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/acpi/acpica/dsmethod.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dsmethod.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/dsmthdat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dsmthdat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/dsobject.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dsobject.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/dsopcode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dsopcode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/dsutils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dsutils.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/dswexec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dswexec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/dswload.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dswload.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/dswload2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dswload2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/dswscope.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dswscope.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/dswstate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dswstate.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/evevent.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evevent.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/evglock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evglock.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/evgpe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evgpe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/evgpeblk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evgpeblk.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/evgpeinit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evgpeinit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/evgpeutil.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evgpeutil.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/evmisc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evmisc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/evregion.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evregion.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/evrgnini.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evrgnini.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/evsci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evsci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/evxface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evxface.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/evxfevnt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evxfevnt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/evxfgpe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evxfgpe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/evxfregn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evxfregn.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exconfig.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exconfig.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exconvrt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exconvrt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/excreate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/excreate.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exdebug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exdebug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exdump.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exdump.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exfield.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exfield.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exfldio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exfldio.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exmisc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exmisc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exmutex.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exmutex.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exnames.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exnames.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exoparg1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exoparg1.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exoparg2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exoparg2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exoparg3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exoparg3.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exoparg6.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exoparg6.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exprep.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exprep.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exregion.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exregion.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exresnte.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exresnte.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exresolv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exresolv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exresop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exresop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exstore.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exstore.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exstoren.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exstoren.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exstorob.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exstorob.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exsystem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exsystem.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/exutils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exutils.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/hwacpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/hwacpi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/hwgpe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/hwgpe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/hwpci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/hwpci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/hwregs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/hwregs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/hwsleep.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/hwsleep.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/hwtimer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/hwtimer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/hwvalid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/hwvalid.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/hwxface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/hwxface.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/nsaccess.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/acpi/acpica/nsalloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsalloc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/nsdump.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/acpi/acpica/nsdumpdv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsdumpdv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/nseval.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nseval.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/nsinit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsinit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/nsload.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsload.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/nsnames.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsnames.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/nsobject.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsobject.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/nsparse.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/acpi/acpica/nspredef.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nspredef.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/nsrepair.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsrepair.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/nsrepair2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsrepair2.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/nssearch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nssearch.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/nsutils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsutils.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/nswalk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nswalk.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/nsxfeval.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsxfeval.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/nsxfname.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsxfname.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/nsxfobj.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsxfobj.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/psargs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/psargs.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/psloop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/psloop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/psopcode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/psopcode.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/psparse.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/psparse.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/psscope.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/psscope.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/pstree.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/pstree.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/psutils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/psutils.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/pswalk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/pswalk.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/psxface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/psxface.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/rsaddr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsaddr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/rscalc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rscalc.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/rscreate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rscreate.c</a></td><td class='right'>69</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='/cgit/linux.git/diff/drivers/acpi/acpica/rsdump.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsdump.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/rsinfo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsinfo.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/rsio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/rsirq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsirq.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/rslist.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rslist.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/rsmemory.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsmemory.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/rsmisc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsmisc.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/rsserial.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsserial.c</a></td><td class='right'>441</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/rsutils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsutils.c</a></td><td class='right'>56</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.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/rsxface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsxface.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/tbfadt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/tbfadt.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/tbfind.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/tbfind.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/tbinstal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/acpi/acpica/tbutils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/tbutils.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/tbxface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/tbxface.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/tbxfroot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/tbxfroot.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utaddress.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utaddress.c</a></td><td class='right'>294</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='/cgit/linux.git/diff/drivers/acpi/acpica/utalloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utalloc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utcopy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utcopy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utdebug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utdebug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utdecode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utdecode.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utdelete.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utdelete.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/uteval.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/uteval.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utglobal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utglobal.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utids.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utids.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utinit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utinit.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utlock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utlock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utmath.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utmath.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utmisc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utmisc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utmutex.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utmutex.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utobject.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utobject.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utosi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utosi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utresrc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utresrc.c</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utstate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utstate.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utxface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utxface.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utxferror.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utxferror.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/acpi/acpica/utxfmutex.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utxfmutex.c</a></td><td class='right'>187</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='/cgit/linux.git/diff/drivers/acpi/apei/apei-base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/apei/apei-base.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.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='/cgit/linux.git/diff/drivers/acpi/apei/apei-internal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/apei/apei-internal.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/apei/einj.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/apei/einj.c</a></td><td class='right'>290</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.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/apei/erst.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/apei/erst.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/apei/ghes.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/apei/ghes.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/apei/hest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/apei/hest.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/atomicio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/atomicio.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/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='/cgit/linux.git/diff/drivers/acpi/dock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/dock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/ec_sys.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/ec_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='/cgit/linux.git/diff/drivers/acpi/numa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/numa.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/nvs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/nvs.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/osl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/osl.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: 3.1%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/pci_irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/pci_irq.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/pci_root.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/pci_root.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/pci_slot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/pci_slot.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/processor_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/processor_core.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/processor_driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/processor_driver.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/processor_thermal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/processor_thermal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/sleep.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/sleep.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/video.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/amba/bus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/amba/bus.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/ahci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/ahci.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/ahci_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/ahci_platform.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/ata_piix.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/ata_piix.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/libahci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/libahci.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/libata-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/libata-core.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.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='/cgit/linux.git/diff/drivers/ata/libata-scsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/libata-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='/cgit/linux.git/diff/drivers/ata/libata-sff.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/libata-sff.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/libata-transport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/libata-transport.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/libata.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/libata.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_arasan_cf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_arasan_cf.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_at91.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_at91.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_bf54x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_bf54x.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_cs5536.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_cs5536.c</a></td><td class='right'>99</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='/cgit/linux.git/diff/drivers/ata/pata_imx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_imx.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_ixp4xx_cf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_ixp4xx_cf.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_mpc52xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_mpc52xx.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_of_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_of_platform.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_palmld.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_palmld.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_pxa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_pxa.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/pata_rb532_cf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_rb532_cf.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/sata_dwc_460ex.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/sata_dwc_460ex.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/sata_fsl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/sata_fsl.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/sata_mv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/sata_mv.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/sata_nv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/sata_nv.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ata/sata_sil24.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/sata_sil24.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/he.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/atm/he.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/iphase.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/base.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/base.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/bus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/bus.c</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/class.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/class.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/core.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/cpu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/cpu.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/devres.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/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='/cgit/linux.git/diff/drivers/base/devtmpfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/devtmpfs.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/base/dma-buf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/dma-buf.c</a></td><td class='right'>291</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='/cgit/linux.git/diff/drivers/base/firmware_class.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/firmware_class.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/memory.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/memory.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/node.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/node.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/platform.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/power/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/power/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/power/domain.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/power/domain.c</a></td><td class='right'>554</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/base/power/domain_governor.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/power/domain_governor.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/power/generic_ops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/power/generic_ops.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: 1.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/power/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/power/main.c</a></td><td class='right'>375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/power/qos.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/power/qos.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/power/runtime.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/power/runtime.c</a></td><td class='right'>157</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='/cgit/linux.git/diff/drivers/base/regmap/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/regmap/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/regmap/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/regmap/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/regmap/internal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/regmap/internal.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/base/regmap/regcache-indexed.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/regmap/regcache-indexed.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: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/regmap/regcache-lzo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/regmap/regcache-lzo.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/regmap/regcache-rbtree.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/regmap/regcache-rbtree.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/regmap/regcache.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/regmap/regcache.c</a></td><td class='right'>87</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.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/base/regmap/regmap-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/regmap/regmap-irq.c</a></td><td class='right'>302</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='/cgit/linux.git/diff/drivers/base/regmap/regmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/regmap/regmap.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/sys.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/topology.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/topology.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bcma/bcma_private.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bcma/bcma_private.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bcma/host_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bcma/host_pci.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bcma/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bcma/main.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bcma/sprom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bcma/sprom.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/amiflop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/amiflop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/aoe/aoechr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/aoe/aoechr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/brd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/brd.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/cciss.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/cciss.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/drbd/drbd_int.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/drbd/drbd_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/drbd/drbd_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/drbd/drbd_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/floppy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/floppy.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/loop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/loop.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/block/mtip32xx/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/mtip32xx/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/block/mtip32xx/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/mtip32xx/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/block/mtip32xx/mtip32xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/mtip32xx/mtip32xx.c</a></td><td class='right'>3651</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 56.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 44.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/block/mtip32xx/mtip32xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/mtip32xx/mtip32xx.h</a></td><td class='right'>423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/block/nvme.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/nvme.c</a></td><td class='right'>1739</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 26.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 73.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/paride/bpck6.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/paride/bpck6.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/paride/pcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/paride/pcd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/paride/pd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/paride/pd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/paride/pf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/paride/pf.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/paride/pg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/paride/pg.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/paride/pt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/paride/pt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/pktcdvd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/pktcdvd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/rbd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/rbd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/swim.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/block/sx8.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/sx8.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/ub.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/ub.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/virtio_blk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/virtio_blk.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/xd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/xd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/xen-blkback/blkback.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/xen-blkback/blkback.c</a></td><td class='right'>84</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='/cgit/linux.git/diff/drivers/block/xen-blkback/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/xen-blkback/common.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/xen-blkback/xenbus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/xen-blkback/xenbus.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/xen-blkfront.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/xen-blkfront.c</a></td><td class='right'>90</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.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/xsysace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/xsysace.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/ath3k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/ath3k.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/bcm203x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/bcm203x.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/bfusb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/bfusb.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/bluecard_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/bluecard_cs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/bpa10x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/bpa10x.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/bt3c_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/bt3c_cs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/btmrvl_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/btmrvl_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='/cgit/linux.git/diff/drivers/bluetooth/btuart_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/btuart_cs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/btusb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/btusb.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.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='/cgit/linux.git/diff/drivers/bluetooth/dtl1_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/dtl1_cs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/hci_bcsp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/hci_bcsp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/hci_ldisc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/hci_ldisc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/hci_vhci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/hci_vhci.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cdrom/cdrom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cdrom/cdrom.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/amd64-agp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/agp/amd64-agp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/agp/generic.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/sis-agp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/agp/sis-agp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hw_random/atmel-rng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/hw_random/atmel-rng.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hw_random/n2-drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/hw_random/n2-drv.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hw_random/nomadik-rng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/hw_random/nomadik-rng.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hw_random/octeon-rng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/hw_random/octeon-rng.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hw_random/pasemi-rng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/hw_random/pasemi-rng.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hw_random/picoxcell-rng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/hw_random/picoxcell-rng.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hw_random/ppc4xx-rng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/hw_random/ppc4xx-rng.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hw_random/timeriomem-rng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/hw_random/timeriomem-rng.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hw_random/virtio-rng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/hw_random/virtio-rng.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/i8k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/i8k.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ipmi/ipmi_bt_sm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/ipmi/ipmi_bt_sm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ipmi/ipmi_si_intf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/char/lp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/lp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/mem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/mem.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/misc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/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='/cgit/linux.git/diff/drivers/char/nwflash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/nwflash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/pcmcia/synclink_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/pcmcia/synclink_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='/cgit/linux.git/diff/drivers/char/ramoops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/ramoops.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/random.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/random.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/raw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/raw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/tile-srom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/tile-srom.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/tpm/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/tpm/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/tpm/tpm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/tpm/tpm.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/tpm/tpm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/tpm/tpm.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/tpm/tpm_tis.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/tpm/tpm_tis.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/virtio_console.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/virtio_console.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/clk/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/clk/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/clocksource/clksrc-dbx500-prcmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/clocksource/clksrc-dbx500-prcmu.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpufreq/Kconfig.arm?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/Kconfig.arm</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpufreq/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpufreq/cpufreq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/cpufreq.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpufreq/cpufreq_ondemand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/cpufreq_ondemand.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpufreq/cpufreq_stats.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/cpufreq_stats.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpufreq/cpufreq_userspace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/cpufreq_userspace.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/cpufreq/exynos-cpufreq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/exynos-cpufreq.c</a></td><td class='right'>290</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='/cgit/linux.git/diff/drivers/cpufreq/exynos4210-cpufreq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/exynos4210-cpufreq.c</a></td><td class='right'>643</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 7.9%;'/><td class='none' style='width: 90.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/cpufreq/omap-cpufreq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/omap-cpufreq.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpufreq/powernow-k8.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/powernow-k8.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpufreq/s3c64xx-cpufreq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/s3c64xx-cpufreq.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpuidle/cpuidle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpuidle/cpuidle.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpuidle/cpuidle.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpuidle/cpuidle.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpuidle/sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpuidle/sysfs.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/crypto/amcc/crypto4xx_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/amcc/crypto4xx_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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/crypto/caam/caamalg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/caam/caamalg.c</a></td><td class='right'>67</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='/cgit/linux.git/diff/drivers/crypto/caam/compat.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/caam/compat.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/crypto/caam/ctrl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/caam/ctrl.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/crypto/caam/desc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/caam/desc.h</a></td><td class='right'>2265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.4%;'/><td class='rem' style='width: 17.4%;'/><td class='none' style='width: 65.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/crypto/caam/desc_constr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/caam/desc_constr.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/crypto/caam/regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/caam/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='/cgit/linux.git/diff/drivers/crypto/mv_cesa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/mv_cesa.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/crypto/picoxcell_crypto.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/picoxcell_crypto.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/crypto/s5p-sss.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/s5p-sss.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/crypto/talitos.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/talitos.c</a></td><td class='right'>493</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/crypto/talitos.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/talitos.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/devfreq/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/devfreq/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/devfreq/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/devfreq/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/devfreq/devfreq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/devfreq/devfreq.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/devfreq/exynos4_bus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/devfreq/exynos4_bus.c</a></td><td class='right'>1135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/Kconfig</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/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='/cgit/linux.git/diff/drivers/dma/amba-pl08x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/amba-pl08x.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/at_hdmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/at_hdmac.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/at_hdmac_regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/at_hdmac_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='/cgit/linux.git/diff/drivers/dma/coh901318.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/coh901318.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/coh901318_lli.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/coh901318_lli.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/coh901318_lli.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/coh901318_lli.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/dmaengine.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/dmaengine.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/dmatest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/dmatest.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/dw_dmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/dw_dmac.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/dw_dmac_regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/dw_dmac_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='/cgit/linux.git/diff/drivers/dma/ep93xx_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/ep93xx_dma.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/fsldma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/fsldma.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/imx-dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/imx-dma.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/imx-sdma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/imx-sdma.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/intel_mid_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/intel_mid_dma.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/intel_mid_dma_regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/intel_mid_dma_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/iop-adma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/iop-adma.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/ipu/ipu_idmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/ipu/ipu_idmac.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/mpc512x_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/mpc512x_dma.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/mv_xor.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/mv_xor.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/mxs-dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/mxs-dma.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.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='/cgit/linux.git/diff/drivers/dma/pch_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/pch_dma.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/pl330.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/pl330.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/shdma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/shdma.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/dma/sirf-dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/sirf-dma.c</a></td><td class='right'>707</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/ste_dma40.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/ste_dma40.c</a></td><td class='right'>441</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/ste_dma40_ll.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/ste_dma40_ll.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/timb_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/timb_dma.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/dma/txx9dmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/txx9dmac.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/edac_core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/edac_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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/edac_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/edac_device.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/edac_device_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/edac_device_sysfs.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/edac_mc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/edac_mc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/edac_mc_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/edac_mc_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/edac_module.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/edac_module.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/edac_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/edac_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='/cgit/linux.git/diff/drivers/edac/edac_pci_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/edac_pci_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/edac_stub.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/edac_stub.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/i82975x_edac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/i82975x_edac.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/mce_amd_inj.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/mce_amd_inj.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/ppc4xx_edac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/ppc4xx_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/r82600_edac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/r82600_edac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/firewire/sbp2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/firewire/sbp2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/firmware/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/firmware/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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/firmware/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/firmware/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/firmware/efivars.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/firmware/efivars.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/firmware/google/gsmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/firmware/google/gsmi.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/firmware/iscsi_ibft.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/firmware/iscsi_ibft.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/Kconfig</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.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpio/devres.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/devres.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-adp5520.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-adp5520.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-adp5588.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-adp5588.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-bt8xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-bt8xx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-cs5535.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-cs5535.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-da9052.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-da9052.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-janz-ttl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-janz-ttl.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-ml-ioh.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-ml-ioh.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-nomadik.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-nomadik.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-pcf857x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-pcf857x.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-pch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-pch.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-pl061.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-pl061.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-pxa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-pxa.c</a></td><td class='right'>377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-rdc321x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-rdc321x.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-sa1100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-sa1100.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-samsung.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-samsung.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-sch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-sch.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-stmpe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-stmpe.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-tegra.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-tegra.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-timberdale.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-timberdale.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-tps65910.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-tps65910.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-ucb1400.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-ucb1400.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-vr41xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-vr41xx.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-vx855.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-vx855.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-wm8994.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-wm8994.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpio-xilinx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-xilinx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpio/gpiolib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpiolib.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/drm_context.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_context.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/drm_crtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_crtc.c</a></td><td class='right'>608</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/drm_crtc_helper.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_crtc_helper.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/drm_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_drv.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/drm_edid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_edid.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/drm_edid_modes.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_edid_modes.h</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/drm_fb_helper.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_fb_helper.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/drm_fops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_fops.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/drm_ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_ioctl.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/drm_lock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_lock.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='/cgit/linux.git/diff/drivers/gpu/drm/drm_sman.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_sman.c</a></td><td class='right'>351</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='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/drm_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_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='/cgit/linux.git/diff/drivers/gpu/drm/exynos/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_ddc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_ddc.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_drm_buf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_buf.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_drm_buf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_buf.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_drm_crtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_crtc.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_drm_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_drv.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_drm_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_drv.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_drm_encoder.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_encoder.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_drm_encoder.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_encoder.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_drm_fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_fb.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: 1.7%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_drm_fb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_fb.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_drm_fbdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_fbdev.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_drm_fimd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_fimd.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_drm_gem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_gem.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_drm_gem.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_gem.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_drm_hdmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_hdmi.c</a></td><td class='right'>439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_drm_hdmi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_hdmi.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_drm_plane.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_plane.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_drm_plane.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_plane.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_hdmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_hdmi.c</a></td><td class='right'>1176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_hdmi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_hdmi.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_hdmiphy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_hdmiphy.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_mixer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_mixer.c</a></td><td class='right'>1070</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/exynos_mixer.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_mixer.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/regs-hdmi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/regs-hdmi.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/regs-mixer.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/regs-mixer.h</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/exynos/regs-vp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/regs-vp.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/Kconfig</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/Makefile</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/accel_2d.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/accel_2d.c</a></td><td class='right'>364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/backlight.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/backlight.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/cdv_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/cdv_device.c</a></td><td class='right'>351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/cdv_device.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/cdv_device.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/cdv_intel_crt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/cdv_intel_crt.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/cdv_intel_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/cdv_intel_display.c</a></td><td class='right'>1508</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 76.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/cdv_intel_hdmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/cdv_intel_hdmi.c</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/cdv_intel_lvds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/cdv_intel_lvds.c</a></td><td class='right'>732</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/framebuffer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/framebuffer.c</a></td><td class='right'>831</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/framebuffer.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/framebuffer.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/gem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/gem.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/gem_glue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/gem_glue.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/gem_glue.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/gem_glue.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/gtt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/gtt.c</a></td><td class='right'>553</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/gtt.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/gtt.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/intel_bios.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/intel_bios.c</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/intel_bios.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/intel_bios.h</a></td><td class='right'>430</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/intel_gmbus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/intel_gmbus.c</a></td><td class='right'>493</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/intel_i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/intel_i2c.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/intel_opregion.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/intel_opregion.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/mid_bios.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/mid_bios.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/mid_bios.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/mid_bios.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/mmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/mmu.c</a></td><td class='right'>858</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/oaktrail.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/oaktrail.h</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/oaktrail_crtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/oaktrail_crtc.c</a></td><td class='right'>604</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/oaktrail_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/oaktrail_device.c</a></td><td class='right'>512</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/oaktrail_hdmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/oaktrail_hdmi.c</a></td><td class='right'>865</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/oaktrail_lvds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/oaktrail_lvds.c</a></td><td class='right'>449</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/power.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/power.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/power.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/power.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/psb_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/psb_device.c</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/psb_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/psb_drv.c</a></td><td class='right'>703</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/psb_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/psb_drv.h</a></td><td class='right'>956</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/psb_intel_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/psb_intel_display.c</a></td><td class='right'>1446</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/psb_intel_display.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/psb_intel_display.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/psb_intel_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/psb_intel_drv.h</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/psb_intel_lvds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/psb_intel_lvds.c</a></td><td class='right'>868</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/psb_intel_modes.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/psb_intel_modes.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/psb_intel_reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/psb_intel_reg.h</a></td><td class='right'>1309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/psb_intel_sdvo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/psb_intel_sdvo.c</a></td><td class='right'>2623</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 40.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 59.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/psb_intel_sdvo_regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/psb_intel_sdvo_regs.h</a></td><td class='right'>723</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/psb_irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/psb_irq.c</a></td><td class='right'>564</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/psb_irq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/psb_irq.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/psb_lid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/psb_lid.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/gma500/psb_reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/gma500/psb_reg.h</a></td><td class='right'>582</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/i810/i810_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i810/i810_dma.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/i810/i810_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i810/i810_drv.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/i810/i810_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i810/i810_drv.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/i915/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/i915/i915_debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/i915_debugfs.c</a></td><td class='right'>86</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='/cgit/linux.git/diff/drivers/gpu/drm/i915/i915_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/i915_dma.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/i915/i915_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/i915_drv.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.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/i915/i915_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/i915_drv.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/i915/i915_gem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/i915_gem.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/i915/i915_gem_execbuffer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/i915_gem_execbuffer.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/i915/i915_irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/i915_irq.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/i915/i915_reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/i915_reg.h</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.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='/cgit/linux.git/diff/drivers/gpu/drm/i915/intel_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/intel_display.c</a></td><td class='right'>360</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/i915/intel_dp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/intel_dp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/i915/intel_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/intel_drv.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/i915/intel_fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/intel_fb.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/i915/intel_hdmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/intel_hdmi.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/i915/intel_ringbuffer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/intel_ringbuffer.c</a></td><td class='right'>30</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='/cgit/linux.git/diff/drivers/gpu/drm/i915/intel_sdvo_regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/intel_sdvo_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='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/i915/intel_sprite.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/intel_sprite.c</a></td><td class='right'>668</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/mga/mga_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/mga/mga_drv.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_acpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_acpi.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_bios.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_bios.c</a></td><td class='right'>904</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 10.6%;'/><td class='none' style='width: 86.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_bios.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_bios.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.8%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_bo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_bo.c</a></td><td class='right'>119</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='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_channel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_channel.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_connector.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_connector.c</a></td><td class='right'>403</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_connector.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_connector.h</a></td><td class='right'>36</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='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_crtc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_crtc.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_debugfs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_display.c</a></td><td class='right'>198</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='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_dma.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_dp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_dp.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_drv.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_drv.h</a></td><td class='right'>135</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='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_fb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_fb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_fbcon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_fbcon.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_gpio.c</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_gpio.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_hdmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_hdmi.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_hwsq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_hwsq.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_i2c.c</a></td><td class='right'>556</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_i2c.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_i2c.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_mem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_mem.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_mxm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_mxm.c</a></td><td class='right'>677</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_notifier.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_notifier.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_object.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_object.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_perf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_perf.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_pm.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_pm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_pm.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_sgdma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_sgdma.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_state.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_state.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_temp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_temp.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_vm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_vm.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_vm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_vm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nouveau_volt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_volt.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv04_crtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv04_crtc.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv04_dac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv04_dac.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv04_dfp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv04_dfp.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv04_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv04_display.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv04_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv04_pm.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv04_timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv04_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='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv10_gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv10_gpio.c</a></td><td class='right'>117</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='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv17_tv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv17_tv.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv40_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv40_pm.c</a></td><td class='right'>50</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv50_crtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_crtc.c</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv50_dac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_dac.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv50_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_display.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><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='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv50_display.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_display.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv50_evo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_evo.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv50_fifo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_fifo.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv50_gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_gpio.c</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv50_graph.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_graph.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv50_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_pm.c</a></td><td class='right'>783</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 88.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv50_sor.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_sor.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv50_vm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_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='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv84_bsp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv84_bsp.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv84_vp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv84_vp.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv98_crypt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv98_crypt.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nv98_ppp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv98_ppp.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nva3_copy.fuc?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nva3_copy.fuc</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nva3_copy.fuc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nva3_copy.fuc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nva3_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nva3_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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nvc0_copy.fuc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_copy.fuc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nvc0_graph.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_graph.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nvc0_graph.fuc?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_graph.fuc</a></td><td class='right'>56</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='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nvc0_graph.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_graph.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nvc0_grctx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_grctx.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nvc0_grgpc.fuc?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_grgpc.fuc</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nvc0_grgpc.fuc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_grgpc.fuc.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nvc0_grhub.fuc?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_grhub.fuc</a></td><td class='right'>311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nvc0_grhub.fuc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_grhub.fuc.h</a></td><td class='right'>96</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='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nvc0_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_pm.c</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/nouveau/nvd0_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvd0_display.c</a></td><td class='right'>833</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 87.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/r128/r128_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/r128/r128_drv.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/atom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/atom.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/atombios_crtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/atombios_crtc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/atombios_encoders.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/atombios_encoders.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/evergreen.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/evergreen.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/evergreen_blit_kms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/evergreen_blit_kms.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/evergreen_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/evergreen_cs.c</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/evergreen_reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/evergreen_reg.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/evergreend.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/evergreend.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/ni.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/ni.c</a></td><td class='right'>395</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/nid.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/nid.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/r100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r100.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/r200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r200.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/r300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r300.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/r420.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r420.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/r500_reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r500_reg.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/r520.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r520.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/r600.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r600.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/r600_audio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r600_audio.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/r600_blit_kms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r600_blit_kms.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/r600_cp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r600_cp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/r600_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r600_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/r600_hdmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r600_hdmi.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/r600d.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r600d.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon.h</a></td><td class='right'>367</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_asic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_asic.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_asic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_asic.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_benchmark.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_benchmark.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_cs.c</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_device.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_drv.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_fb.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_fence.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_fence.c</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_gart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_gart.c</a></td><td class='right'>425</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_gem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_gem.c</a></td><td class='right'>147</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.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_irq_kms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_irq_kms.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_kms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_kms.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_legacy_crtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_legacy_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='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_mode.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_mode.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_object.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_object.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_object.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_object.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_pm.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_ring.c</a></td><td class='right'>465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_sa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_sa.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_semaphore.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_semaphore.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_test.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_test.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/radeon_ttm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_ttm.c</a></td><td class='right'>355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 2.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='/cgit/linux.git/diff/drivers/gpu/drm/radeon/rs400.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/rs400.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/rs600.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/rs600.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/rs690.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/rs690.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/rv515.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/rv515.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/radeon/rv770.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/rv770.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/savage/savage_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/savage/savage_drv.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/sis/sis_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/sis/sis_drv.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/sis/sis_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/sis/sis_drv.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/sis/sis_mm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/sis/sis_mm.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/tdfx/tdfx_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/tdfx/tdfx_drv.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/ttm/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/ttm/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/ttm/ttm_agp_backend.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/ttm/ttm_agp_backend.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/ttm/ttm_bo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/ttm/ttm_bo.c</a></td><td class='right'>90</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.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/ttm/ttm_bo_util.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/ttm/ttm_bo_util.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/ttm/ttm_bo_vm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/ttm/ttm_bo_vm.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/ttm/ttm_memory.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/ttm/ttm_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='/cgit/linux.git/diff/drivers/gpu/drm/ttm/ttm_page_alloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/ttm/ttm_page_alloc.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/ttm/ttm_page_alloc_dma.c</a></td><td class='right'>1142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/ttm/ttm_tt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/ttm/ttm_tt.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/via/via_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/via/via_drv.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/via/via_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/via/via_drv.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/via/via_map.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/via/via_map.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/via/via_mm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/via/via_mm.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c</a></td><td class='right'>71</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='/cgit/linux.git/diff/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/vmwgfx/vmwgfx_drv.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/vmwgfx/vmwgfx_kms.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/vmwgfx/vmwgfx_kms.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/vmwgfx/vmwgfx_resource.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/Kconfig</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/hid-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-core.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/hid-debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/hid-emsff.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-emsff.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/hid/hid-hyperv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-hyperv.c</a> (renamed from drivers/staging/hv/hv_mouse.c)</td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/hid-ids.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-ids.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/hid-input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-input.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/hid-lg4ff.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-lg4ff.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/hid-multitouch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-multitouch.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/hid-picolcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-picolcd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/hid-pl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-pl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/hid-prodikeys.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-prodikeys.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/hid/hid-quanta.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-quanta.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/hid-roccat-common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-roccat-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/hid/hid-roccat-isku.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-roccat-isku.c</a></td><td class='right'>487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/hid/hid-roccat-isku.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-roccat-isku.h</a></td><td class='right'>147</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='/cgit/linux.git/diff/drivers/hid/hid-roccat-kone.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-roccat-kone.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/hid-twinhan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-twinhan.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/hid-wacom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-wacom.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/hid/hid-wiimote-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-wiimote-core.c</a> (renamed from drivers/hid/hid-wiimote.c)</td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/hid/hid-wiimote-debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-wiimote-debug.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/hid/hid-wiimote-ext.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-wiimote-ext.c</a></td><td class='right'>752</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/hid/hid-wiimote.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-wiimote.h</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/usbhid/hid-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/usbhid/hid-core.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/usbhid/hid-quirks.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/usbhid/hid-quirks.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/usbhid/hiddev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/usbhid/hiddev.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/usbhid/usbhid.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/usbhid/usbhid.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/usbhid/usbkbd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/usbhid/usbkbd.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hid/usbhid/usbmouse.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/usbhid/usbmouse.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hv/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hv/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hv/channel_mgmt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hv/channel_mgmt.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hv/hv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hv/hv.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hv/hv_kvp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hv/hv_kvp.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hv/hyperv_vmbus.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hv/hyperv_vmbus.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hv/vmbus_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hv/vmbus_drv.c</a></td><td class='right'>30</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='/cgit/linux.git/diff/drivers/hwmon/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/Kconfig</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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/abituguru.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/abituguru.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/abituguru3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/abituguru3.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/acpi_power_meter.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/acpi_power_meter.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/adcxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/adcxx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/adm1021.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/adm1021.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/adm1031.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/adm1031.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/adm9240.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/adm9240.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/ads7828.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/adt7411.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/adt7411.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/adt7462.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/adt7462.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/adt7470.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/adt7470.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/adt7475.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/adt7475.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/amc6821.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/amc6821.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/applesmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/applesmc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/asc7621.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/asc7621.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/coretemp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/coretemp.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/dme1737.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/dme1737.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/ds620.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/ds620.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/emc1403.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/emc1403.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/emc2103.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/emc2103.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/emc6w201.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/emc6w201.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/f71882fg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/f71882fg.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.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/f75375s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/f75375s.c</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/g760a.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/g760a.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/gpio-fan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/gpio-fan.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/ibmaem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/ibmaem.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/it87.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/it87.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/jc42.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/jc42.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/lm63.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/lm63.c</a></td><td class='right'>592</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/lm73.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/lm73.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/lm75.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/lm75.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/lm75.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/lm75.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/lm80.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/lm80.c</a></td><td class='right'>70</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: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/lm90.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/lm90.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/lm93.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/lm93.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/lm95241.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/lm95241.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/lm95245.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/lm95245.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/ltc4261.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/ltc4261.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/max1111.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/max1111.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/max16065.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/max16065.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/max1668.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/max1668.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/max6639.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/max6639.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/max6642.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/max6642.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/max6650.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/max6650.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/pc87427.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/pc87427.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/pmbus/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/pmbus/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/pmbus/adm1275.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/pmbus/adm1275.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/pmbus/pmbus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/pmbus/pmbus.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/pmbus/zl6100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/pmbus/zl6100.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/sht15.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/hwmon/tmp102.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/tmp102.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/tmp401.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/tmp401.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/tmp421.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/hwmon/w83627ehf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/w83627ehf.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/w83627hf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/w83627hf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/w83781d.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/w83781d.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/w83791d.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/w83791d.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/w83792d.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/w83792d.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/w83793.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/w83793.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/w83795.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/w83795.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/w83l786ng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/w83l786ng.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-ali1535.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-ali1535.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-ali1563.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-ali1563.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-ali15x3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-ali15x3.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-amd756.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-amd756.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-amd8111.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-amd8111.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-at91.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-at91.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-au1550.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-au1550.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-cpm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-cpm.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-designware-pcidrv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-designware-pcidrv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-designware-platdrv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-designware-platdrv.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-diolan-u2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-diolan-u2c.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-eg20t.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-eg20t.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-highlander.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-highlander.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-hydra.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-hydra.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-i801.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-i801.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-ibm_iic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-ibm_iic.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-intel-mid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-intel-mid.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-iop3xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-iop3xx.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-isch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-isch.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-ixp2000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-ixp2000.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-mpc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-mpc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-mv64xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-mv64xxx.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-nforce2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-nforce2.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-ocores.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-ocores.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-octeon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-octeon.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-omap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-omap.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-pasemi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-pasemi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-pca-platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-pca-platform.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-piix4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-piix4.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-pmcmsp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-pmcmsp.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-powermac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-powermac.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-puv3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-puv3.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-pxa-pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-pxa-pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-sh7760.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-sh7760.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-simtec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-simtec.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-sis5595.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-sis5595.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-sis630.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-sis630.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-sis96x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-sis96x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-tegra.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-tegra.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-tiny-usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-tiny-usb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-via.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-via.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-viapro.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-viapro.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-xiic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-xiic.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/scx200_acb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/scx200_acb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/i2c-dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/i2c-dev.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/muxes/gpio-i2cmux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/muxes/gpio-i2cmux.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ali14xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/ali14xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/at91_ide.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/at91_ide.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/cmd640.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/cmd640.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/dtc2278.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/dtc2278.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/gayle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/gayle.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ht6560b.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/ht6560b.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-4drives.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/ide-4drives.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-acpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/ide-acpi.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-floppy_ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/ide-floppy_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='/cgit/linux.git/diff/drivers/ide/ide-pci-generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/ide-pci-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='/cgit/linux.git/diff/drivers/ide/qd65xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/qd65xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/umc8672.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/umc8672.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/idle/intel_idle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/idle/intel_idle.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee802154/fakehard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ieee802154/fakehard.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/infiniband/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/addr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/core/addr.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/cm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/core/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='/cgit/linux.git/diff/drivers/infiniband/core/cm_msgs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/core/cm_msgs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/cma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/core/cma.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/ucm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/core/ucm.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/user_mad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/infiniband/core/uverbs_cmd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/core/uverbs_cmd.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/uverbs_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/core/uverbs_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='/cgit/linux.git/diff/drivers/infiniband/hw/cxgb3/iwch_cm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/cxgb3/iwch_cm.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/cxgb4/cm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/cxgb4/cm.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ehca/ehca_classes.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/ehca/ehca_classes.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ehca/ehca_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/ehca/ehca_main.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_fs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/ipath/ipath_fs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mlx4/ah.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/mlx4/ah.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mlx4/cq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/mlx4/cq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mlx4/mad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/mlx4/mad.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mlx4/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/mlx4/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.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mlx4/qp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/mlx4/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/nes/nes.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/nes/nes.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/nes/nes_cm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/nes/nes_cm.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/nes/nes_hw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/nes/nes_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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/nes/nes_nic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/nes/nes_nic.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/nes/nes_utils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/nes/nes_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='/cgit/linux.git/diff/drivers/infiniband/hw/qib/qib_7220.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_7220.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/qib/qib_driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_driver.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/qib/qib_fs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_fs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/qib/qib_iba6120.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/qib/qib_iba7220.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_iba7220.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/qib/qib_iba7322.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_iba7322.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/qib/qib_init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_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='/cgit/linux.git/diff/drivers/infiniband/hw/qib/qib_pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_pcie.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/qib/qib_qsfp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_qsfp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/qib/qib_sd7220.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_sd7220.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/qib/qib_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_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='/cgit/linux.git/diff/drivers/infiniband/hw/qib/qib_verbs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_verbs.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/ipoib/ipoib_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/ulp/ipoib/ipoib_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.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/ipoib/ipoib_multicast.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/ulp/ipoib/ipoib_multicast.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/iser/iscsi_iser.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/ulp/iser/iscsi_iser.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/srpt/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/ulp/srpt/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/srpt/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/ulp/srpt/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/srpt/ib_dm_mad.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/ulp/srpt/ib_dm_mad.h</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/srpt/ib_srpt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/ulp/srpt/ib_srpt.c</a></td><td class='right'>4073</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 62.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 37.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/srpt/ib_srpt.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/ulp/srpt/ib_srpt.h</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/evdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/evdev.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/input-polldev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/input-polldev.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/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='/cgit/linux.git/diff/drivers/input/joystick/xpad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/joystick/xpad.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/adp5520-keys.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/adp5520-keys.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/atkbd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/atkbd.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/bf54x-keys.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/bf54x-keys.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/ep93xx_keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/ep93xx_keypad.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/gpio_keys_polled.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/gpio_keys_polled.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/imx_keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/imx_keypad.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/jornada680_kbd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/jornada680_kbd.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/jornada720_kbd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/jornada720_kbd.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/lm8323.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/lm8323.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/matrix_keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/matrix_keypad.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/nomadik-ske-keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/nomadik-ske-keypad.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/omap-keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/omap-keypad.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/omap4-keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/omap4-keypad.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/opencores-kbd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/opencores-kbd.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/pmic8xxx-keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/pmic8xxx-keypad.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/pxa27x_keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/pxa27x_keypad.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/pxa930_rotary.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/pxa930_rotary.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/samsung-keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/samsung-keypad.c</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/sh_keysc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/sh_keysc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/spear-keyboard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/spear-keyboard.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/stmpe-keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/stmpe-keypad.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/tc3589x-keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/tc3589x-keypad.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/input/keyboard/tca8418_keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/tca8418_keypad.c</a></td><td class='right'>430</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='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/tegra-kbc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/tegra-kbc.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/tnetv107x-keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/tnetv107x-keypad.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/twl4030_keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/twl4030_keypad.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/w90p910_keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/w90p910_keypad.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/88pm860x_onkey.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/88pm860x_onkey.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/Kconfig</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/ab8500-ponkey.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/ab8500-ponkey.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/adxl34x-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/adxl34x-spi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/adxl34x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/adxl34x.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/ati_remote2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/ati_remote2.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/bfin_rotary.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/bfin_rotary.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/cobalt_btns.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/cobalt_btns.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/dm355evm_keys.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/dm355evm_keys.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/input/misc/gp2ap002a00f.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/gp2ap002a00f.c</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/input/misc/gpio_tilt_polled.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/gpio_tilt_polled.c</a></td><td class='right'>213</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='/cgit/linux.git/diff/drivers/input/misc/ixp4xx-beeper.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/ixp4xx-beeper.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/keyspan_remote.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/keyspan_remote.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/max8925_onkey.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/max8925_onkey.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/mc13783-pwrbutton.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/mc13783-pwrbutton.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/mpu3050.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/mpu3050.c</a></td><td class='right'>128</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='/cgit/linux.git/diff/drivers/input/misc/pcap_keys.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/pcap_keys.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/pcf50633-input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/pcf50633-input.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/pcspkr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/pcspkr.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/pm8xxx-vibrator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/pm8xxx-vibrator.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/pmic8xxx-pwrkey.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/pmic8xxx-pwrkey.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/powermate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/powermate.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/pwm-beeper.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/pwm-beeper.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/rb532_button.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/rb532_button.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/rotary_encoder.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/rotary_encoder.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/sgi_btns.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/sgi_btns.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/twl4030-vibra.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/twl4030-vibra.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/twl6040-vibra.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/twl6040-vibra.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/wistron_btns.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/wistron_btns.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/wm831x-on.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/wm831x-on.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/xen-kbdfront.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/xen-kbdfront.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/yealink.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/yealink.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/alps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/alps.c</a></td><td class='right'>1036</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 84.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/alps.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/alps.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/appletouch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/appletouch.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/bcm5974.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/bcm5974.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/elantech.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/elantech.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/elantech.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/elantech.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/gpio_mouse.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/gpio_mouse.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/hgpk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/hgpk.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/logips2pp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/logips2pp.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/psmouse-base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/psmouse-base.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/psmouse.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/psmouse.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/pxa930_trkball.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/pxa930_trkball.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/sentelic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/sentelic.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/synaptics.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/synaptics.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/synaptics.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/synaptics.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/synaptics_i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/synaptics_i2c.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/trackpoint.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/trackpoint.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/altera_ps2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/serio/altera_ps2.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/ambakmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/serio/ambakmi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/hp_sdc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/serio/hp_sdc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/i8042.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/serio/i8042.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/rpckbd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/serio/rpckbd.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/serio_raw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/serio/serio_raw.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/xilinx_ps2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/serio/xilinx_ps2.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/tablet/acecad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/tablet/acecad.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/tablet/aiptek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/tablet/aiptek.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.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='/cgit/linux.git/diff/drivers/input/tablet/gtco.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/tablet/gtco.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/tablet/hanwang.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/tablet/hanwang.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/tablet/kbtab.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/tablet/kbtab.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/tablet/wacom_sys.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/tablet/wacom_sys.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/tablet/wacom_wac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/tablet/wacom_wac.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.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='/cgit/linux.git/diff/drivers/input/tablet/wacom_wac.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/tablet/wacom_wac.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/88pm860x-ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/88pm860x-ts.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/Kconfig</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/ad7877.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/ad7877.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/ad7879-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/ad7879-i2c.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/ad7879-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/ad7879-spi.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/ad7879.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/ad7879.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/ad7879.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/ad7879.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/ads7846.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/ads7846.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/atmel_tsadcc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/atmel_tsadcc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/auo-pixcir-ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/auo-pixcir-ts.c</a></td><td class='right'>652</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/da9034-ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/da9034-ts.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/eeti_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/eeti_ts.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/egalax_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/egalax_ts.c</a></td><td class='right'>303</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='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/htcpen.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/htcpen.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/intel-mid-touch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/intel-mid-touch.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/jornada720_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/jornada720_ts.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/lpc32xx_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/lpc32xx_ts.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/mainstone-wm97xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/mainstone-wm97xx.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/migor_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/migor_ts.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><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='/cgit/linux.git/diff/drivers/input/touchscreen/pcap_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/pcap_ts.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/pixcir_i2c_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/pixcir_i2c_ts.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/s3c2410_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/s3c2410_ts.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/st1232.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/st1232.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/stmpe-ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/stmpe-ts.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/tnetv107x-ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/tnetv107x-ts.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/tps6507x-ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/tps6507x-ts.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/tsc2005.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/tsc2005.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/ucb1400_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/ucb1400_ts.c</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/usbtouchscreen.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/usbtouchscreen.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/w90p910_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/w90p910_ts.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/wm831x-ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/wm831x-ts.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/zylonite-wm97xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/zylonite-wm97xx.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/iommu/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/iommu/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/iommu/amd_iommu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/amd_iommu.c</a></td><td class='right'>883</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 86.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/iommu/amd_iommu_init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/amd_iommu_init.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/iommu/amd_iommu_proto.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/amd_iommu_proto.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/iommu/amd_iommu_types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/amd_iommu_types.h</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/iommu/amd_iommu_v2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/amd_iommu_v2.c</a></td><td class='right'>994</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/iommu/intel-iommu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/intel-iommu.c</a></td><td class='right'>79</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='/cgit/linux.git/diff/drivers/iommu/iommu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/iommu.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.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='/cgit/linux.git/diff/drivers/iommu/msm_iommu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/msm_iommu.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/iommu/omap-iommu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/omap-iommu.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/iommu/omap-iovmm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/omap-iovmm.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/gigaset/i4l.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/isdn/gigaset/i4l.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hardware/avm/b1dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/isdn/hardware/avm/b1dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hardware/avm/c4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/isdn/hardware/avm/c4.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hardware/mISDN/hfcsusb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/isdn/hardware/mISDN/hfcsusb.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/enternow_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/isdn/hisax/enternow_pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/i4l/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/isdn/i4l/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/sc/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/isdn/sc/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='/cgit/linux.git/diff/drivers/leds/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/led-class.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/leds/led-triggers.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/led-triggers.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-88pm860x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-88pm860x.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-adp5520.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-adp5520.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-ams-delta.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-ams-delta.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-asic3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-asic3.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-atmel-pwm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-atmel-pwm.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-bd2802.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-bd2802.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-clevo-mail.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-clevo-mail.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-cobalt-qube.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-cobalt-qube.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-da903x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-da903x.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-dac124s085.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-dac124s085.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-fsg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-fsg.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-gpio.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-hp6xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-hp6xx.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-lm3530.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-lm3530.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-lp3944.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-lp3944.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-lp5521.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-lp5521.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-lp5523.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-lp5523.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-lt3593.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-lt3593.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/leds/leds-max8997.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-max8997.c</a></td><td class='right'>372</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='/cgit/linux.git/diff/drivers/leds/leds-mc13783.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-mc13783.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-netxbig.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-netxbig.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.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-ns2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-ns2.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-pca9532.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-pca9532.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-pca955x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-pca955x.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-pwm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-pwm.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-rb532.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-rb532.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-renesas-tpu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-renesas-tpu.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-s3c24xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-s3c24xx.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-ss4200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-ss4200.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/leds/leds-tca6507.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-tca6507.c</a></td><td class='right'>779</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-wm831x-status.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-wm831x-status.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-wm8350.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-wm8350.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/lguest/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/lguest/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/lguest/lguest_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/lguest/lguest_device.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/lguest/segments.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/lguest/segments.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/ams/ams-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/macintosh/ams/ams-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='/cgit/linux.git/diff/drivers/macintosh/ams/ams-input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/macintosh/ams/ams-input.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/smu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/macintosh/smu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/therm_adt746x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/macintosh/therm_adt746x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/bitmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/bitmap.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-flakey.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/dm-flakey.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-linear.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/dm-linear.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-mpath.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/dm-mpath.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-table.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/dm-table.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/dm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/md.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/md.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/md.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/md.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/multipath.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/multipath.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/raid1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/raid1.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/raid1.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/raid1.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/raid10.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/raid10.c</a></td><td class='right'>582</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/raid10.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/raid10.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/raid5.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/raid5.c</a></td><td class='right'>557</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/raid5.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/raid5.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/max2165.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/max2165.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/mc44s803.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/mc44s803.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/mt2060.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/mt2060.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/mt2060_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/mt2060_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='add'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/mt2063.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/mt2063.c</a></td><td class='right'>2307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 35.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 64.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/mt2063.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/mt2063.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/mt2131.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/mt2131.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/mt2131_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/mt2131_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='/cgit/linux.git/diff/drivers/media/common/tuners/mt2266.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/mt2266.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/mxl5005s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/mxl5005s.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/mxl5007t.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/mxl5007t.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><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='/cgit/linux.git/diff/drivers/media/common/tuners/qt1010.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/qt1010.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/qt1010_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/qt1010_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='/cgit/linux.git/diff/drivers/media/common/tuners/tda18212.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tda18212.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/tda18212.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tda18212.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/tda18218.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tda18218.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/tda18218_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tda18218_priv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/tda18271-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tda18271-fe.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/tda18271-maps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tda18271-maps.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/tda18271-priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tda18271-priv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/tda18271.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tda18271.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/tda827x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tda827x.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/tuner-simple.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tuner-simple.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/tuners/tuner-xc2028.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tuner-xc2028.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.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='/cgit/linux.git/diff/drivers/media/common/tuners/xc4000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/xc4000.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.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='/cgit/linux.git/diff/drivers/media/common/tuners/xc5000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/xc5000.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><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='/cgit/linux.git/diff/drivers/media/dvb/b2c2/flexcop-usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/b2c2/flexcop-usb.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/b2c2/flexcop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/b2c2/flexcop.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/bt8xx/dst.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/bt8xx/dst.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/bt8xx/dst_common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/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='/cgit/linux.git/diff/drivers/media/dvb/bt8xx/dvb-bt8xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/bt8xx/dvb-bt8xx.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ddbridge/ddbridge-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ddbridge/ddbridge-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dm1105/dm1105.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dm1105/dm1105.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/dvb_ca_en50221.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-core/dvb_ca_en50221.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/dvb_frontend.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-core/dvb_frontend.c</a></td><td class='right'>922</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 85.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/dvb_frontend.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-core/dvb_frontend.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/dvb_net.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-core/dvb_net.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/dvbdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-core/dvbdev.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/a800.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/a800.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/af9005-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/af9005-fe.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/af9005.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/af9005.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/af9005.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/af9005.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/af9015.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/af9015.c</a></td><td class='right'>512</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/af9015.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/af9015.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/anysee.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/anysee.c</a></td><td class='right'>424</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/anysee.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/anysee.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/au6610.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/au6610.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/az6027.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/az6027.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/ce6230.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/ce6230.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/cinergyT2-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/cinergyT2-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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/cinergyT2-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/cinergyT2-fe.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/cxusb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/cxusb.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dib0700.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dib0700.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dib0700_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dib0700_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.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dib0700_devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dib0700_devices.c</a></td><td class='right'>867</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 86.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dibusb-mb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dibusb-mb.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dibusb-mc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dibusb-mc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/digitv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/digitv.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dtt200u-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dtt200u-fe.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dtt200u.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dtt200u.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dtv5100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dtv5100.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dvb-usb-dvb.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dvb-usb-ids.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dvb-usb-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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dw2102.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dw2102.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/ec168.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/ec168.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/friio-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/friio-fe.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/friio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/friio.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/gl861.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/gl861.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/gp8psk-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/gp8psk-fe.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/gp8psk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/gp8psk.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/it913x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/it913x.c</a></td><td class='right'>357</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/lmedm04.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/lmedm04.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/m920x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/m920x.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/mxl111sf-demod.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/mxl111sf-demod.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/mxl111sf-tuner.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/mxl111sf-tuner.c</a></td><td class='right'>102</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='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/mxl111sf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/mxl111sf.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/nova-t-usb2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/nova-t-usb2.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/opera1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/opera1.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/pctv452e.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/pctv452e.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/technisat-usb2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/technisat-usb2.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/ttusb2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/ttusb2.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/umt-010.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/umt-010.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/vp702x-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/vp702x-fe.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/vp702x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/vp702x.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/vp7045-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/vp7045-fe.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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/vp7045.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/vp7045.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/firewire/firedtv-avc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/firewire/firedtv-avc.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/firewire/firedtv-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/firewire/firedtv-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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/firewire/firedtv-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/firewire/firedtv-fe.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/firewire/firedtv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/firewire/firedtv.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/af9013.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/af9013.c</a></td><td class='right'>1727</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.9%;'/><td class='rem' style='width: 13.6%;'/><td class='none' style='width: 73.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/af9013.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/af9013.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/af9013_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/af9013_priv.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/atbm8830.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/atbm8830.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/au8522_dig.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/au8522_dig.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/bcm3510.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/bcm3510.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/bsbe1.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/bsbe1.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/bsru6.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/bsru6.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cx22700.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cx22700.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cx22702.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cx22702.c</a></td><td class='right'>69</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='/cgit/linux.git/diff/drivers/media/dvb/frontends/cx24110.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cx24110.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cx24113.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cx24113.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cx24116.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cx24116.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cx24123.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cx24123.c</a></td><td class='right'>56</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='/cgit/linux.git/diff/drivers/media/dvb/frontends/cxd2820r.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cxd2820r.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cxd2820r_c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cxd2820r_c.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cxd2820r_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cxd2820r_core.c</a></td><td class='right'>641</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 6.7%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cxd2820r_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cxd2820r_priv.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.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cxd2820r_t.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cxd2820r_t.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cxd2820r_t2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cxd2820r_t2.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dib0070.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib0070.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dib0090.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib0090.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dib0090.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib0090.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dib3000mb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib3000mb.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dib3000mb_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib3000mb_priv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dib3000mc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib3000mc.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dib7000m.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib7000m.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dib7000p.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib7000p.c</a></td><td class='right'>456</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dib7000p.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib7000p.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dib8000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib8000.c</a></td><td class='right'>1073</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.1%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 83.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dib8000.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib8000.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dib9000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib9000.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dibx000_common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dibx000_common.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/drxd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/drxd.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/drxd_hard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/drxd_hard.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/drxk.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/drxk.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/drxk_hard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/drxk_hard.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/drxk_hard.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/drxk_hard.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/ds3000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/ds3000.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dvb-pll.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dvb-pll.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dvb_dummy_fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dvb_dummy_fe.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/ec100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/ec100.c</a></td><td class='right'>20</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='/cgit/linux.git/diff/drivers/media/dvb/frontends/hd29l2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/hd29l2.c</a></td><td class='right'>861</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/hd29l2.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/hd29l2.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/hd29l2_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/hd29l2_priv.h</a></td><td class='right'>314</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='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/it913x-fe-priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/it913x-fe-priv.h</a></td><td class='right'>806</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 87.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/it913x-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/it913x-fe.c</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 1.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='/cgit/linux.git/diff/drivers/media/dvb/frontends/it913x-fe.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/it913x-fe.h</a></td><td class='right'>43</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='/cgit/linux.git/diff/drivers/media/dvb/frontends/itd1000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/itd1000.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/ix2505v.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/ix2505v.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/l64781.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/l64781.c</a></td><td class='right'>117</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/lgdt3305.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/lgdt3305.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/lgdt330x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/lgdt330x.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/lgs8gl5.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/lgs8gl5.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/lgs8gxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/lgs8gxx.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/mb86a16.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/mb86a16.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/mb86a20s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/mb86a20s.c</a></td><td class='right'>546</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/mt312.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/mt312.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/mt352.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/mt352.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/nxt200x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/nxt200x.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/nxt6000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/nxt6000.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/or51132.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/or51132.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/or51211.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/or51211.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/s5h1409.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/s5h1409.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/s5h1411.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/s5h1411.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/s5h1420.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/s5h1420.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/s5h1432.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/s5h1432.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.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/s921.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/s921.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/si21xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/si21xx.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/sp8870.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/sp8870.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/sp887x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/sp887x.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/stb0899_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stb0899_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.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/stb6000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stb6000.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/stb6100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stb6100.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/stv0288.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stv0288.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/stv0297.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stv0297.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/stv0299.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stv0299.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/stv0367.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stv0367.c</a></td><td class='right'>156</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='/cgit/linux.git/diff/drivers/media/dvb/frontends/stv0900_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stv0900_core.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.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/stv090x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stv090x.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/stv6110.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stv6110.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/tda10021.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tda10021.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/tda10023.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tda10023.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/tda10048.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tda10048.c</a></td><td class='right'>83</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='/cgit/linux.git/diff/drivers/media/dvb/frontends/tda1004x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tda1004x.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/tda10071.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tda10071.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/tda10086.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tda10086.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/tda18271c2dd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tda18271c2dd.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/tda8083.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tda8083.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/tda826x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tda826x.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/tdhd1.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tdhd1.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/tua6100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tua6100.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/ves1820.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/ves1820.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/ves1x93.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/ves1x93.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/zl10036.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/zl10036.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/zl10039.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/zl10039.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/zl10353.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/zl10353.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/mantis/mantis_vp1033.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/mantis/mantis_vp1033.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/mantis/mantis_vp2033.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/mantis/mantis_vp2033.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/mantis/mantis_vp2040.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/mantis/mantis_vp2040.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ngene/ngene-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ngene/ngene-cards.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/pluto2/pluto2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/pluto2/pluto2.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/pt1/va1j5jf8007s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/pt1/va1j5jf8007s.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/pt1/va1j5jf8007t.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/pt1/va1j5jf8007t.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/siano/smsdvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/siano/smsdvb.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/siano/smsusb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/siano/smsusb.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/av7110.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ttpci/av7110.c</a></td><td class='right'>102</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='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/av7110.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ttpci/av7110.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/budget-av.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ttpci/budget-av.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/budget-ci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ttpci/budget-ci.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/budget-patch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ttpci/budget-patch.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/budget.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ttpci/budget.c</a></td><td class='right'>68</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: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttusb-dec/ttusb_dec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ttusb-dec/ttusb_dec.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttusb-dec/ttusbdecfe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ttusb-dec/ttusbdecfe.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/media-device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/media-device.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/Kconfig</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/dsbr100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/dsbr100.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-gemtek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/radio-gemtek.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-miropcm20.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/radio-miropcm20.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-mr800.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/radio-mr800.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-si4713.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/radio-si4713.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-timb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/radio-timb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-wl1273.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/radio-wl1273.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/si470x/radio-si470x-usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/si470x/radio-si470x-usb.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/tef6862.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/tef6862.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/wl128x/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/wl128x/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/wl128x/fmdrv_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/wl128x/fmdrv_common.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/wl128x/fmdrv_common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/wl128x/fmdrv_common.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/wl128x/fmdrv_rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/wl128x/fmdrv_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.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/wl128x/fmdrv_rx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/wl128x/fmdrv_rx.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/wl128x/fmdrv_tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/wl128x/fmdrv_tx.c</a></td><td class='right'>61</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='/cgit/linux.git/diff/drivers/media/radio/wl128x/fmdrv_tx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/wl128x/fmdrv_tx.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/wl128x/fmdrv_v4l2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/wl128x/fmdrv_v4l2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/rc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/rc/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/rc/ati_remote.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/ati_remote.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/rc/ene_ir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/ene_ir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/rc/ene_ir.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/ene_ir.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/rc/imon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/imon.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/rc/ir-nec-decoder.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/ir-nec-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/rc/ir-raw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/ir-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='/cgit/linux.git/diff/drivers/media/rc/ir-rc6-decoder.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/ir-rc6-decoder.c</a></td><td class='right'>67</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='/cgit/linux.git/diff/drivers/media/rc/ir-sanyo-decoder.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/ir-sanyo-decoder.c</a></td><td class='right'>205</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='upd'><a href='/cgit/linux.git/diff/drivers/media/rc/keymaps/rc-hauppauge.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/keymaps/rc-hauppauge.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/rc/keymaps/rc-videomate-m1f.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/keymaps/rc-videomate-m1f.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/rc/lirc_dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/media/rc/mceusb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/mceusb.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/rc/rc-core-priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/rc-core-priv.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/rc/rc-main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/rc-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='/cgit/linux.git/diff/drivers/media/rc/redrat3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/redrat3.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.8%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/rc/streamzap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/streamzap.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/rc/winbond-cir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/winbond-cir.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/Kconfig</a></td><td class='right'>427</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/adv7170.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/adv7170.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/as3645a.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/as3645a.c</a></td><td class='right'>905</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/atmel-isi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/atmel-isi.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/au0828/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/au0828/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='/cgit/linux.git/diff/drivers/media/video/au0828/au0828-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/au0828/au0828-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='/cgit/linux.git/diff/drivers/media/video/bt8xx/bt848.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/bt8xx/bt848.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/bt8xx/bttv-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/bt8xx/bttv-cards.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/bt8xx/bttv-driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/bt8xx/bttv-driver.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/bt8xx/bttv-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/bt8xx/bttv-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='/cgit/linux.git/diff/drivers/media/video/bt8xx/bttv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/bt8xx/bttv.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/c-qcam.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/c-qcam.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cs5345.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cs5345.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cs53l32a.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cs53l32a.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx18/cx18-driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx18/cx18-driver.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx18/cx18-fileops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx18/cx18-fileops.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx18/cx18-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx18/cx18-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='/cgit/linux.git/diff/drivers/media/video/cx18/cx18-i2c.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx18/cx18-i2c.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx231xx/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx231xx/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx231xx/cx231xx-audio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx231xx/cx231xx-audio.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx231xx/cx231xx-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx231xx/cx231xx-cards.c</a></td><td class='right'>110</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='/cgit/linux.git/diff/drivers/media/video/cx231xx/cx231xx-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx231xx/cx231xx-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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx231xx/cx231xx-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx231xx/cx231xx-dvb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx231xx/cx231xx-input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx231xx/cx231xx-input.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx231xx/cx231xx-vbi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx231xx/cx231xx-vbi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx231xx/cx231xx-video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx231xx/cx231xx-video.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx231xx/cx231xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx231xx/cx231xx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx23885/cx23885-417.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx23885/cx23885-417.c</a></td><td class='right'>141</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx23885/cx23885-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx23885/cx23885-cards.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx23885/cx23885-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx23885/cx23885-core.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx23885/cx23885-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx23885/cx23885-dvb.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx23885/cx23885-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx23885/cx23885-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='/cgit/linux.git/diff/drivers/media/video/cx23885/cx23885-video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx23885/cx23885-video.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx23885/cx23885.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx23885/cx23885.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25821/cx25821-alsa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-alsa.c</a></td><td class='right'>75</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25821/cx25821-audio-upstream.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-audio-upstream.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25821/cx25821-audio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-audio.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25821/cx25821-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-cards.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25821/cx25821-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-core.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25821/cx25821-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-i2c.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25821/cx25821-medusa-defines.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-medusa-defines.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25821/cx25821-medusa-reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-medusa-reg.h</a></td><td class='right'>518</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25821/cx25821-medusa-video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-medusa-video.c</a></td><td class='right'>410</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25821/cx25821-video-upstream-ch2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-video-upstream-ch2.c</a></td><td class='right'>138</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.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25821/cx25821-video-upstream.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-video-upstream.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25821/cx25821-video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-video.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25821/cx25821.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25840/cx25840-audio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25840/cx25840-audio.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25840/cx25840-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25840/cx25840-core.c</a></td><td class='right'>3241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 49.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 50.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx88/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx88/cx88-alsa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx88/cx88-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='/cgit/linux.git/diff/drivers/media/video/cx88/cx88-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx88/cx88-cards.c</a></td><td class='right'>118</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='/cgit/linux.git/diff/drivers/media/video/cx88/cx88-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx88/cx88-dvb.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx88/cx88-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx88/cx88-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='/cgit/linux.git/diff/drivers/media/video/cx88/cx88-input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx88/cx88-input.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx88/cx88.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx88/cx88.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/davinci/dm355_ccdc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/dm355_ccdc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/davinci/dm644x_ccdc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/dm644x_ccdc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/davinci/isif.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/isif.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/davinci/vpbe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/vpbe.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/davinci/vpbe_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/vpbe_display.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.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='/cgit/linux.git/diff/drivers/media/video/davinci/vpbe_osd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/vpbe_osd.c</a></td><td class='right'>491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/davinci/vpbe_venc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/vpbe_venc.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/davinci/vpfe_capture.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/vpfe_capture.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/davinci/vpif.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/vpif.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/davinci/vpif_capture.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/vpif_capture.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/davinci/vpif_capture.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/vpif_capture.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/davinci/vpif_display.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/vpif_display.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/em28xx/em28xx-audio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/em28xx/em28xx-audio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/em28xx/em28xx-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/em28xx/em28xx-cards.c</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/em28xx/em28xx-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/em28xx/em28xx-core.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.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/em28xx/em28xx-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/em28xx/em28xx-dvb.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/em28xx/em28xx-input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/em28xx/em28xx-input.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/em28xx/em28xx-reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/em28xx/em28xx-reg.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/em28xx/em28xx-video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/em28xx/em28xx-video.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/em28xx/em28xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/em28xx/em28xx.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/et61x251/et61x251_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/et61x251/et61x251_core.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/fsl-viu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/fsl-viu.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/benq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/benq.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/conex.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/conex.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/cpia1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/cpia1.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/etoms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/etoms.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/finepix.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/finepix.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/gl860/gl860.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/gl860/gl860.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/gspca.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/gspca.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/gspca.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/gspca.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/jeilinj.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/jeilinj.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/jl2005bcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/jl2005bcd.c</a></td><td class='right'>554</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/kinect.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/kinect.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/konica.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/konica.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/m5602/m5602_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/m5602/m5602_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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/m5602/m5602_mt9m111.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/m5602/m5602_mt9m111.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/m5602/m5602_ov7660.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/m5602/m5602_ov7660.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/m5602/m5602_ov9650.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/m5602/m5602_ov9650.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/m5602/m5602_po1030.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/m5602/m5602_po1030.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/m5602/m5602_s5k4aa.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/m5602/m5602_s5k4aa.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/m5602/m5602_s5k83a.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/m5602/m5602_s5k83a.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/mars.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/mars.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/mr97310a.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/mr97310a.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/nw80x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/nw80x.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/ov519.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/ov519.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/ov534.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/ov534.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/ov534_9.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/ov534_9.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/pac207.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/pac207.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/pac7302.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/pac7302.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/pac7311.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/pac7311.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/se401.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/se401.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/sn9c2028.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/sn9c2028.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/sn9c20x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/sn9c20x.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/sonixb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/sonixb.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/sonixj.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/sonixj.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/spca1528.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/spca1528.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/spca500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/spca500.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/spca501.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/spca501.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/spca505.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/spca505.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/spca506.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/spca506.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/spca508.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/spca508.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/spca561.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/spca561.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/sq905.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/sq905.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/sq905c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/sq905c.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/sq930x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/sq930x.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/stk014.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/stk014.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/stv0680.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/stv0680.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/stv06xx/stv06xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/stv06xx/stv06xx.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/sunplus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/sunplus.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/t613.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/t613.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/topro.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/topro.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/tv8532.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/tv8532.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/vc032x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/vc032x.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/vicam.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/vicam.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/xirlink_cit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/xirlink_cit.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/gspca/zc3xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/zc3xx.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/hdpvr/hdpvr-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/hdpvr/hdpvr-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.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ir-kbd-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ir-kbd-i2c.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ivtv/ivtv-driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ivtv/ivtv-driver.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ivtv/ivtv-driver.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ivtv/ivtv-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='/cgit/linux.git/diff/drivers/media/video/ivtv/ivtv-fileops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ivtv/ivtv-fileops.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><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='/cgit/linux.git/diff/drivers/media/video/ivtv/ivtv-i2c.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ivtv/ivtv-i2c.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ivtv/ivtv-ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ivtv/ivtv-ioctl.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ivtv/ivtv-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ivtv/ivtv-irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ivtv/ivtv-streams.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ivtv/ivtv-streams.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ivtv/ivtv-yuv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ivtv/ivtv-yuv.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ivtv/ivtvfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ivtv/ivtvfb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/m5mols/m5mols.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/m5mols/m5mols.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/m5mols/m5mols_capture.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/m5mols/m5mols_capture.c</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.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='/cgit/linux.git/diff/drivers/media/video/m5mols/m5mols_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/m5mols/m5mols_core.c</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/m5mols/m5mols_reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/m5mols/m5mols_reg.h</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/marvell-ccic/mcam-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/marvell-ccic/mcam-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.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/marvell-ccic/mmp-driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/marvell-ccic/mmp-driver.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/msp3400-driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/msp3400-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/msp3400-driver.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/msp3400-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/mt9m001.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mt9m001.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/mt9m111.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mt9m111.c</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/mt9p031.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mt9p031.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/mt9t001.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mt9t001.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/mt9t031.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mt9t031.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/mt9v022.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mt9v022.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/mt9v032.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mt9v032.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/mx1_camera.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mx1_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='/cgit/linux.git/diff/drivers/media/video/mx2_camera.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mx2_camera.c</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/mx3_camera.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mx3_camera.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap/omap_vout.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap/omap_vout.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap/omap_vout_vrfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap/omap_vout_vrfb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap/omap_voutdef.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap/omap_voutdef.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap1_camera.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap1_camera.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap24xxcam.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap24xxcam.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap3isp/isp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/isp.c</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: 1.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap3isp/isp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/isp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap3isp/ispccdc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispccdc.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.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap3isp/ispccdc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispccdc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap3isp/ispccp2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispccp2.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap3isp/ispccp2.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispccp2.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap3isp/ispcsi2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispcsi2.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap3isp/ispcsi2.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispcsi2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap3isp/isppreview.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/isppreview.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap3isp/isppreview.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/isppreview.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap3isp/ispresizer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispresizer.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap3isp/ispresizer.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispresizer.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap3isp/ispstat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispstat.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap3isp/ispvideo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispvideo.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/omap3isp/ispvideo.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispvideo.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ov7670.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ov7670.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-hdw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pvrusb2/pvrusb2-hdw.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-ctrl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-ctrl.c</a></td><td class='right'>935</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 12.3%;'/><td class='none' style='width: 85.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-dec1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-dec1.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-dec1.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-dec1.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-dec23.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-dec23.c</a></td><td class='right'>307</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='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-dec23.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-dec23.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-if.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-if.c</a></td><td class='right'>460</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-kiara.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-kiara.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-misc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-misc.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: 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='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-timon.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-timon.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-uncompress.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-uncompress.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.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='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-v4l.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-v4l.c</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pxa_camera.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pxa_camera.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/s2255drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s2255drv.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-fimc/fimc-capture.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-fimc/fimc-capture.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-fimc/fimc-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-fimc/fimc-core.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-fimc/fimc-core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-fimc/fimc-core.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-fimc/fimc-mdevice.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-fimc/fimc-mdevice.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-fimc/fimc-reg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-fimc/fimc-reg.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-fimc/mipi-csis.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-fimc/mipi-csis.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-fimc/mipi-csis.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-fimc/mipi-csis.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-fimc/regs-fimc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-fimc/regs-fimc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-g2d/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-g2d/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-g2d/g2d-hw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-g2d/g2d-hw.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-g2d/g2d-regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-g2d/g2d-regs.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-g2d/g2d.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-g2d/g2d.c</a></td><td class='right'>811</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-g2d/g2d.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-g2d/g2d.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-jpeg/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-jpeg/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-jpeg/jpeg-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-jpeg/jpeg-core.c</a></td><td class='right'>1482</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-jpeg/jpeg-core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-jpeg/jpeg-core.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-jpeg/jpeg-hw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-jpeg/jpeg-hw.h</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-jpeg/jpeg-regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-jpeg/jpeg-regs.h</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-mfc/s5p_mfc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-mfc/s5p_mfc.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-mfc/s5p_mfc_dec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-mfc/s5p_mfc_dec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-tv/hdmi_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-tv/hdmi_drv.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-tv/mixer.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-tv/mixer.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-tv/mixer_grp_layer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-tv/mixer_grp_layer.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-tv/mixer_video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-tv/mixer_video.c</a></td><td class='right'>342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-tv/mixer_vp_layer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-tv/mixer_vp_layer.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/s5p-tv/sdo_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-tv/sdo_drv.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7115.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7115.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7134/saa7134-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7134/saa7134-cards.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7134/saa7134-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7134/saa7134-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='/cgit/linux.git/diff/drivers/media/video/saa7134/saa7134-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7134/saa7134-dvb.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7134/saa7134-input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7134/saa7134-input.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7134/saa7134-tvaudio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7134/saa7134-tvaudio.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7134/saa7134-video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7134/saa7134-video.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7134/saa7134.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7134/saa7134.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7164/saa7164-bus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7164/saa7164-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7164/saa7164-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7164/saa7164-cards.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/sh_mobile_ceu_camera.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/sh_mobile_ceu_camera.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/sh_mobile_csi2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/sh_mobile_csi2.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/sn9c102/sn9c102_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/sn9c102/sn9c102_core.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/soc_camera.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/soc_camera.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/soc_camera_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/soc_camera_platform.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/stk-webcam.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/stk-webcam.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/timblogiw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/timblogiw.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tlg2300/pd-common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tlg2300/pd-common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tlg2300/pd-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tlg2300/pd-dvb.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tlg2300/pd-main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tlg2300/pd-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tm6000/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tm6000/tm6000-alsa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000-alsa.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tm6000/tm6000-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000-cards.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tm6000/tm6000-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000-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.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='/cgit/linux.git/diff/drivers/media/video/tm6000/tm6000-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000-dvb.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tm6000/tm6000-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000-i2c.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tm6000/tm6000-input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000-input.c</a></td><td class='right'>407</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tm6000/tm6000-regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000-regs.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tm6000/tm6000-stds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000-stds.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tm6000/tm6000-video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000-video.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tm6000/tm6000.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tuner-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tuner-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='/cgit/linux.git/diff/drivers/media/video/tvp514x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tvp514x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tvp5150.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tvp5150.c</a></td><td class='right'>81</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='/cgit/linux.git/diff/drivers/media/video/tvp7002.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tvp7002.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/upd64083.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/upd64083.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/usbvision/usbvision-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/usbvision/usbvision-i2c.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.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/uvc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/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='/cgit/linux.git/diff/drivers/media/video/uvc/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/uvc/uvc_ctrl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/uvc_ctrl.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/uvc/uvc_debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/uvc_debugfs.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/uvc/uvc_driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/uvc_driver.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/uvc/uvc_isight.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/uvc_isight.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/uvc/uvc_queue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/uvc_queue.c</a></td><td class='right'>564</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/uvc/uvc_v4l2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/uvc_v4l2.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/uvc/uvc_video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/uvc_video.c</a></td><td class='right'>625</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 90.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/uvc/uvcvideo.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/uvcvideo.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/v4l2-compat-ioctl32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/v4l2-compat-ioctl32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/v4l2-ctrls.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/v4l2-ctrls.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/v4l2-dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/v4l2-dev.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/v4l2-device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/v4l2-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/v4l2-ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/v4l2-ioctl.c</a></td><td class='right'>128</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='/cgit/linux.git/diff/drivers/media/video/v4l2-subdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/v4l2-subdev.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/via-camera.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/via-camera.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/videobuf-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/videobuf-dvb.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/videobuf2-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/videobuf2-core.c</a></td><td class='right'>118</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='/cgit/linux.git/diff/drivers/media/video/videobuf2-dma-sg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/videobuf2-dma-sg.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/videobuf2-memops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/videobuf2-memops.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/videobuf2-vmalloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/videobuf2-vmalloc.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/vino.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/vino.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/zoran/zoran_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/zoran/zoran_device.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/zoran/zoran_driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/zoran/zoran_driver.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/zoran/zr36060.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/zoran/zr36060.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/zr364xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/zr364xx.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/memstick/host/jmb38x_ms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/memstick/host/jmb38x_ms.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/memstick/host/r592.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/memstick/host/r592.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/memstick/host/tifm_ms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/memstick/host/tifm_ms.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/lsi/mpi_cnfg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/message/fusion/lsi/mpi_cnfg.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/lsi/mpi_ioc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/message/fusion/lsi/mpi_ioc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/mptbase.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/message/fusion/mptbase.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/mptbase.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/message/fusion/mptbase.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/mptsas.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/message/fusion/mptsas.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/i2o/i2o_proc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/message/i2o/i2o_proc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/88pm860x-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/88pm860x-i2c.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/Kconfig</a></td><td class='right'>64</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.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/aat2870-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/aat2870-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.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/ab5500-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ab5500-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='/cgit/linux.git/diff/drivers/mfd/ab5500-debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ab5500-debugfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/ab8500-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ab8500-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='/cgit/linux.git/diff/drivers/mfd/ab8500-debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ab8500-debugfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/ab8500-gpadc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ab8500-gpadc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/ab8500-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ab8500-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='/cgit/linux.git/diff/drivers/mfd/ab8500-sysctrl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ab8500-sysctrl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/cs5535-mfd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/cs5535-mfd.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mfd/da9052-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/da9052-core.c</a></td><td class='right'>694</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mfd/da9052-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/da9052-i2c.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mfd/da9052-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/da9052-spi.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/db8500-prcmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/db8500-prcmu.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/dm355evm_msp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/dm355evm_msp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/intel_msic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/intel_msic.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/janz-cmodio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/janz-cmodio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/jz4740-adc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/jz4740-adc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/lpc_sch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/lpc_sch.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/max8925-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/max8925-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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/max8925-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/max8925-i2c.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/max8997.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/max8997.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/max8998.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/max8998.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/mc13xxx-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/mc13xxx-core.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/mcp-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/mcp-core.c</a></td><td class='right'>44</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='/cgit/linux.git/diff/drivers/mfd/mcp-sa11x0.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/mcp-sa11x0.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/omap-usb-host.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/omap-usb-host.c</a></td><td class='right'>763</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 7.0%;'/><td class='none' style='width: 88.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/pcf50633-adc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/pcf50633-adc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mfd/s5m-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/s5m-core.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mfd/s5m-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/s5m-irq.c</a></td><td class='right'>487</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='upd'><a href='/cgit/linux.git/diff/drivers/mfd/sm501.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/sm501.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mfd/stmpe-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/stmpe-i2c.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mfd/stmpe-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/stmpe-spi.c</a></td><td class='right'>150</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='/cgit/linux.git/diff/drivers/mfd/stmpe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/stmpe.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/stmpe.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/stmpe.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/t7l66xb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/t7l66xb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/tc6387xb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/tc6387xb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/ti-ssp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ti-ssp.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/timberdale.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/timberdale.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/tps65910-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/tps65910-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='/cgit/linux.git/diff/drivers/mfd/tps65910.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/tps65910.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/tps65912-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/tps65912-spi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/twl-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/twl-core.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/twl4030-audio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/twl4030-audio.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/twl4030-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/twl4030-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='/cgit/linux.git/diff/drivers/mfd/twl4030-madc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/twl4030-madc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/twl4030-power.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/twl4030-power.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/twl6030-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/twl6030-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='/cgit/linux.git/diff/drivers/mfd/twl6040-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/twl6040-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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/ucb1x00-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ucb1x00-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.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/ucb1x00-ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ucb1x00-ts.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/vx855.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/vx855.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/wm831x-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm831x-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/wm831x-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm831x-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='/cgit/linux.git/diff/drivers/mfd/wm831x-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm831x-irq.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/wm831x-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm831x-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/wm8350-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm8350-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='/cgit/linux.git/diff/drivers/mfd/wm8350-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm8350-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/wm8400-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm8400-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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/wm8994-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm8994-core.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.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='/cgit/linux.git/diff/drivers/mfd/wm8994-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm8994-irq.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mfd/wm8994-regmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm8994-regmap.c</a></td><td class='right'>1238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mfd/wm8994.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm8994.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='upd'><a href='/cgit/linux.git/diff/drivers/misc/ab8500-pwm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ab8500-pwm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ad525x_dpot-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ad525x_dpot-i2c.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ad525x_dpot-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ad525x_dpot-spi.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.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='/cgit/linux.git/diff/drivers/misc/ad525x_dpot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ad525x_dpot.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ad525x_dpot.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ad525x_dpot.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/bmp085.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/bmp085.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/carma/carma-fpga-program.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/carma/carma-fpga-program.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/eeprom/eeprom_93cx6.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/eeprom/eeprom_93cx6.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ibmasm/command.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/command.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ibmasm/dot_command.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/dot_command.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ibmasm/dot_command.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/dot_command.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ibmasm/event.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/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='/cgit/linux.git/diff/drivers/misc/ibmasm/heartbeat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/heartbeat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ibmasm/i2o.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/i2o.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ibmasm/ibmasm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/ibmasm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ibmasm/ibmasmfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/ibmasmfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ibmasm/lowlevel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/lowlevel.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ibmasm/lowlevel.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/lowlevel.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ibmasm/module.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/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='/cgit/linux.git/diff/drivers/misc/ibmasm/r_heartbeat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/r_heartbeat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ibmasm/remote.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/remote.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ibmasm/uart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/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='/cgit/linux.git/diff/drivers/misc/isl29020.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/isl29020.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/iwmc3200top/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/iwmc3200top/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/lis3lv02d/lis3lv02d.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/lis3lv02d/lis3lv02d.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/misc/max8997-muic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/max8997-muic.c</a></td><td class='right'>505</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/sgi-gru/gruprocfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/sgi-gru/gruprocfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/sgi-xp/xpnet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/sgi-xp/xpnet.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ti-st/st_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ti-st/st_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.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ti-st/st_kim.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ti-st/st_kim.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/card/block.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/card/block.c</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/card/mmc_test.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/card/mmc_test.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/card/queue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/card/queue.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/core/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/core/bus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/bus.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mmc/core/cd-gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/cd-gpio.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/core/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/core.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/core/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/core/debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/core/host.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/host.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/core/mmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/mmc.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/core/sd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/sd.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/core/sdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/sdio.c</a></td><td class='right'>342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/core/sdio_io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/sdio_io.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/core/sdio_ops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/sdio_ops.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/at91_mci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/at91_mci.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/atmel-mci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/atmel-mci.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/au1xmmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/au1xmmc.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/bfin_sdh.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/bfin_sdh.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/cb710-mmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/cb710-mmc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/dw_mmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/dw_mmc.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/dw_mmc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/dw_mmc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/jz4740_mmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/jz4740_mmc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/mmc_spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/mmc_spi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/mmci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/mmci.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/msm_sdcc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/msm_sdcc.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/mvsdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/mvsdio.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/mxcmmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/mxcmmc.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.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/mxs-mmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/mxs-mmc.c</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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/omap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/omap.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/omap_hsmmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/omap_hsmmc.c</a></td><td class='right'>69</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: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/pxamci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/pxamci.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/s3cmci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/s3cmci.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdhci-cns3xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-cns3xxx.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdhci-dove.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-dove.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdhci-esdhc-imx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-esdhc-imx.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdhci-esdhc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-esdhc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdhci-of-esdhc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-of-esdhc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdhci-of-hlwd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-of-hlwd.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdhci-pci-data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-pci-data.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdhci-pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-pci.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdhci-pxav2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-pxav2.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdhci-pxav3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-pxav3.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdhci-s3c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-s3c.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdhci-spear.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-spear.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdhci-tegra.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-tegra.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdhci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sdhci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sh_mmcif.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sh_mmcif.c</a></td><td class='right'>730</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/sh_mobile_sdhi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sh_mobile_sdhi.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/tifm_sd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/tifm_sd.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/tmio_mmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/tmio_mmc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/tmio_mmc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/tmio_mmc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/tmio_mmc_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/tmio_mmc_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/tmio_mmc_pio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/tmio_mmc_pio.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/ushc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/ushc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/host/vub300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/vub300.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/afs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/afs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/ar7part.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ar7part.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mtd/bcm63xxpart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/bcm63xxpart.c</a></td><td class='right'>222</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='/cgit/linux.git/diff/drivers/mtd/chips/cfi_cmdset_0020.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/chips/cfi_cmdset_0020.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/block2mtd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/block2mtd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/doc2000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/doc2000.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/doc2001.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/doc2001.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/doc2001plus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/doc2001plus.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/docg3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/docg3.c</a></td><td class='right'>1441</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.8%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 77.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/docg3.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/docg3.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/docprobe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/docprobe.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/m25p80.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/m25p80.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/mtd_dataflash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/mtd_dataflash.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/sst25l.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/sst25l.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/ftl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ftl.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/inftlcore.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/inftlcore.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/inftlmount.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/inftlmount.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/lpddr/lpddr_cmds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/lpddr/lpddr_cmds.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/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='/cgit/linux.git/diff/drivers/mtd/maps/bcm963xx-flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/bcm963xx-flash.c</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: 4.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/bfin-async-flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/bfin-async-flash.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/gpio-addr-flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/gpio-addr-flash.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/ixp2000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/ixp2000.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/ixp4xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/ixp4xx.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/lantiq-flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/lantiq-flash.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/latch-addr-flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/latch-addr-flash.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/physmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/physmap.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/physmap_of.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/physmap_of.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/pxa2xx-flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/pxa2xx-flash.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/rbtx4939-flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/rbtx4939-flash.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/sa1100-flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/sa1100-flash.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/scb2_flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/scb2_flash.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/sun_uflash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/sun_uflash.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/mtd_blkdevs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/mtd_blkdevs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/mtdblock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/mtdblock.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/mtdblock_ro.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/mtdblock_ro.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/mtdchar.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/mtdchar.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/mtdconcat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/mtdconcat.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.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='/cgit/linux.git/diff/drivers/mtd/mtdcore.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/mtdcore.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/mtdoops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/mtdoops.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/mtdpart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/mtdpart.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/mtdswap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/mtdswap.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/alauda.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/alauda.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/ams-delta.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/ams-delta.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/atmel_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/atmel_nand.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/au1550nd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/au1550nd.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/bcm_umi_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/bcm_umi_nand.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/davinci_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/davinci_nand.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/diskonchip.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/diskonchip.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/fsl_elbc_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/fsl_elbc_nand.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/fsl_upm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/fsl_upm.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/gpio.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/gpmi-nand/gpmi-lib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/gpmi-nand/gpmi-lib.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/jz4740_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/jz4740_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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/mpc5121_nfc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/mpc5121_nfc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/nand_base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/nand_base.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/nand_bbt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/nand_bbt.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/nand_ids.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/nand_ids.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/nandsim.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/nandsim.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/ndfc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/ndfc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/nomadik_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/nomadik_nand.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/nuc900_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/nuc900_nand.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/omap2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/omap2.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/pasemi_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/pasemi_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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/plat_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/plat_nand.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/pxa3xx_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/pxa3xx_nand.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/r852.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/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='/cgit/linux.git/diff/drivers/mtd/nand/sharpsl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/sharpsl.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/sm_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/sm_common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/socrates_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/socrates_nand.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/tmio_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/tmio_nand.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/txx9ndfmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/txx9ndfmc.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nftlcore.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nftlcore.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nftlmount.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nftlmount.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/onenand/generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/onenand/generic.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/onenand/onenand_base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/onenand/onenand_base.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/onenand/samsung.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/onenand/samsung.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/redboot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/redboot.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/rfd_ftl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/rfd_ftl.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/sm_ftl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/sm_ftl.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/ssfdc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ssfdc.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/tests/mtd_oobtest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/tests/mtd_oobtest.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/tests/mtd_pagetest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/tests/mtd_pagetest.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/tests/mtd_readtest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/tests/mtd_readtest.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/tests/mtd_speedtest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/tests/mtd_speedtest.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/tests/mtd_stresstest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/tests/mtd_stresstest.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/tests/mtd_subpagetest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/tests/mtd_subpagetest.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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/tests/mtd_torturetest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/tests/mtd_torturetest.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/ubi/build.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/build.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/ubi/cdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/cdev.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/ubi/debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/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='/cgit/linux.git/diff/drivers/mtd/ubi/debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/debug.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/ubi/eba.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/eba.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/ubi/io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/io.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/ubi/kapi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/kapi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/ubi/ubi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/ubi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/ubi/vtbl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/vtbl.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/ubi/wl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/wl.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bonding/bond_alb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/bonding/bond_alb.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/bonding/bond_ipv6.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/bonding/bond_ipv6.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bonding/bond_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/bonding/bond_main.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bonding/bond_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/bonding/bond_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='/cgit/linux.git/diff/drivers/net/caif/caif_hsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/caif/caif_hsi.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/caif/caif_serial.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/caif/caif_serial.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/caif/caif_shmcore.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/caif/caif_shmcore.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/caif/caif_spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/caif/caif_spi.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/can/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/can/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/can/at91_can.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/at91_can.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/can/bfin_can.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/bfin_can.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/can/c_can/c_can_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/c_can/c_can_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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/can/cc770/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/cc770/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/can/cc770/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/cc770/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/can/cc770/cc770.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/cc770/cc770.c</a></td><td class='right'>881</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/can/cc770/cc770.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/cc770/cc770.h</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/can/cc770/cc770_isa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/cc770/cc770_isa.c</a></td><td class='right'>367</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/can/cc770/cc770_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/cc770/cc770_platform.c</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/can/dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/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='/cgit/linux.git/diff/drivers/net/can/flexcan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/flexcan.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/can/janz-ican3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/janz-ican3.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/can/mscan/mpc5xxx_can.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/mscan/mpc5xxx_can.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/can/mscan/mscan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/mscan/mscan.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/can/sja1000/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/sja1000/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='/cgit/linux.git/diff/drivers/net/can/sja1000/sja1000_isa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/sja1000/sja1000_isa.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/can/sja1000/sja1000_of_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/sja1000/sja1000_of_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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/can/sja1000/sja1000_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/sja1000/sja1000_platform.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/can/slcan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/slcan.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/can/softing/softing_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/softing/softing_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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/can/ti_hecc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/ti_hecc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/can/usb/ems_usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/usb/ems_usb.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/can/usb/esd_usb2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/usb/esd_usb2.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/can/vcan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/vcan.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/dsa/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/dsa/Kconfig</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/dsa/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/dsa/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/dsa/mv88e6060.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/dsa/mv88e6060.c</a> (renamed from net/dsa/mv88e6060.c)</td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/dsa/mv88e6123_61_65.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/dsa/mv88e6123_61_65.c</a> (renamed from net/dsa/mv88e6123_61_65.c)</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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/dsa/mv88e6131.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/dsa/mv88e6131.c</a> (renamed from net/dsa/mv88e6131.c)</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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/dsa/mv88e6xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/dsa/mv88e6xxx.c</a> (renamed from net/dsa/mv88e6xxx.c)</td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/dsa/mv88e6xxx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/dsa/mv88e6xxx.h</a> (renamed from net/dsa/mv88e6xxx.h)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/dummy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/dummy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/3com/3c589_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/3com/3c589_cs.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/3com/3c59x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/3com/3c59x.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/3com/typhoon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/3com/typhoon.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/8390/8390.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/8390.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/8390/apne.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/apne.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/8390/ax88796.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/ax88796.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/8390/es3210.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/es3210.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/8390/hp-plus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/hp-plus.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/8390/hp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/hp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/8390/hydra.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/hydra.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/8390/lne390.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/lne390.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/8390/ne-h8300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/ne-h8300.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/8390/ne.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/ne.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/8390/ne2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/ne2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/8390/ne2k-pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/ne2k-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/8390/ne3210.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/ne3210.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/8390/stnic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/stnic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/8390/zorro8390.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/zorro8390.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/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='/cgit/linux.git/diff/drivers/net/ethernet/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/adaptec/starfire.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/adaptec/starfire.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/adi/bfin_mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/adi/bfin_mac.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/aeroflex/greth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/aeroflex/greth.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/amd/amd8111e.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/amd/amd8111e.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/amd/amd8111e.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/amd/amd8111e.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/amd/au1000_eth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/amd/au1000_eth.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/amd/nmclan_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/amd/nmclan_cs.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/amd/pcnet32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/amd/pcnet32.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/amd/sunlance.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/amd/sunlance.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/atheros/atl1c/atl1c_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='/cgit/linux.git/diff/drivers/net/ethernet/atheros/atl1c/atl1c_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/atheros/atl1c/atl1c_main.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/atheros/atl1e/atl1e_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/atheros/atl1e/atl1e_main.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/atheros/atlx/atl1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/atheros/atlx/atl1.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/atheros/atlx/atl2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/atheros/atlx/atl2.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/atheros/atlx/atlx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/atheros/atlx/atlx.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/bcm63xx_enet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bcm63xx_enet.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/bnx2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/bnx2.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c</a></td><td class='right'>1248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.9%;'/><td class='rem' style='width: 8.2%;'/><td class='none' style='width: 80.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_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='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c</a></td><td class='right'>478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/cnic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/cnic.c</a></td><td class='right'>130</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='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/cnic_defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/cnic_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='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/cnic_if.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/cnic_if.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/sb1250-mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/sb1250-mac.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/tg3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/tg3.c</a></td><td class='right'>734</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 88.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/broadcom/tg3.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/tg3.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/brocade/bna/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/brocade/bna/bfa_cee.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bfa_cee.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/brocade/bna/bfa_cee.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bfa_cee.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/brocade/bna/bfa_defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bfa_defs.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/brocade/bna/bfa_ioc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bfa_ioc.c</a></td><td class='right'>493</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/brocade/bna/bfa_ioc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bfa_ioc.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/brocade/bna/bfi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bfi.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/brocade/bna/bna_enet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bna_enet.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/brocade/bna/bna_types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bna_types.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/brocade/bna/bnad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bnad.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/brocade/bna/bnad.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bnad.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/ethernet/brocade/bna/bnad_debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bnad_debugfs.c</a></td><td class='right'>623</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/brocade/bna/bnad_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bnad_ethtool.c</a></td><td class='right'>157</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='/cgit/linux.git/diff/drivers/net/ethernet/brocade/bna/cna.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/cna.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/brocade/bna/cna_fwimg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/cna_fwimg.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/cadence/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/cadence/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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/cadence/at91_ether.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/cadence/at91_ether.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/cadence/at91_ether.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/cadence/at91_ether.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/cadence/macb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/cadence/macb.c</a></td><td class='right'>419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/cadence/macb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/cadence/macb.h</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/ethernet/calxeda/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/calxeda/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/ethernet/calxeda/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/calxeda/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/ethernet/calxeda/xgmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/calxeda/xgmac.c</a></td><td class='right'>1928</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 29.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 70.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/chelsio/cxgb/cxgb2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb/cxgb2.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/chelsio/cxgb/sge.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb/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='/cgit/linux.git/diff/drivers/net/ethernet/chelsio/cxgb/sge.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb/sge.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/chelsio/cxgb3/l2t.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb3/l2t.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/chelsio/cxgb3/l2t.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_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.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='/cgit/linux.git/diff/drivers/net/ethernet/chelsio/cxgb4/sge.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb4/sge.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_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.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/chelsio/cxgb4vf/sge.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb4vf/sge.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/cisco/enic/enic_dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/cisco/enic/enic_dev.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/cisco/enic/enic_dev.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/cisco/enic/enic_dev.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/cisco/enic/enic_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/cisco/enic/enic_main.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/davicom/dm9000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/davicom/dm9000.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/dec/tulip/de2104x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/dec/tulip/de2104x.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/dec/tulip/de4x5.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/dec/tulip/de4x5.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/dec/tulip/dmfe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/dec/tulip/dmfe.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/dec/tulip/tulip_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/dec/tulip/tulip_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/dec/tulip/uli526x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/dec/tulip/uli526x.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/dec/tulip/winbond-840.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/dec/tulip/winbond-840.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/dlink/de600.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/dlink/de600.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/dlink/sundance.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/dlink/sundance.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/dnet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/dnet.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/emulex/benet/be.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/emulex/benet/be.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/emulex/benet/be_cmds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/emulex/benet/be_cmds.c</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/emulex/benet/be_cmds.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/emulex/benet/be_cmds.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/emulex/benet/be_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/emulex/benet/be_ethtool.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/emulex/benet/be_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/emulex/benet/be_main.c</a></td><td class='right'>588</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/ethoc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/ethoc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/fealnx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/fealnx.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/freescale/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/freescale/fec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/fec.c</a></td><td class='right'>90</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='/cgit/linux.git/diff/drivers/net/ethernet/freescale/fec.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/fec.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/fs_enet/mii-bitbang.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/freescale/fs_enet/mii-fec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/fs_enet/mii-fec.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/freescale/fsl_pq_mdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/fsl_pq_mdio.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/freescale/gianfar.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/gianfar.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/freescale/gianfar.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/gianfar.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/freescale/gianfar_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/gianfar_ethtool.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/freescale/gianfar_ptp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/gianfar_ptp.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/freescale/ucc_geth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/net/ethernet/freescale/ucc_geth.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/ucc_geth.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/fujitsu/fmvj18x_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/fujitsu/fmvj18x_cs.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/i825xx/eepro.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/i825xx/eepro.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/ibm/ehea/ehea_ethtool.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/ibm/ehea/ehea_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/ibm/ehea/ehea_main.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/ibm/ehea/ehea_qmr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/ibm/ehea/ehea_qmr.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/ibm/emac/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/ibm/emac/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='/cgit/linux.git/diff/drivers/net/ethernet/ibm/ibmveth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/ibm/ibmveth.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/icplus/ipg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/icplus/ipg.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/e100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/e100.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/e1000/e1000_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/e1000/e1000_ethtool.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/e1000/e1000_hw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/e1000/e1000_hw.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/e1000/e1000_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/e1000/e1000_main.c</a></td><td class='right'>61</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='/cgit/linux.git/diff/drivers/net/ethernet/intel/e1000e/e1000.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/e1000e/e1000.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/e1000e/ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/e1000e/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.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/e1000e/netdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/e1000e/netdev.c</a></td><td class='right'>465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/igb/e1000_82575.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/igb/e1000_82575.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/igb/igb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/igb/igb.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/igb/igb_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/igb/igb_ethtool.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/igb/igb_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/igb/igb_main.c</a></td><td class='right'>359</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/igbvf/ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/igbvf/ethtool.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/igbvf/netdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/igbvf/netdev.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgb/ixgb_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgb/ixgb_main.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c</a></td><td class='right'>96</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='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c</a></td><td class='right'>83</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='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_main.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_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='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_type.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgbevf/defines.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbevf/defines.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgbevf/ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbevf/ethtool.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgbevf/mbx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbevf/mbx.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgbevf/regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbevf/regs.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/intel/ixgbevf/vf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbevf/vf.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/jme.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/jme.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/korina.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/korina.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/lantiq_etop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/lantiq_etop.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/marvell/mv643xx_eth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/marvell/mv643xx_eth.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/marvell/pxa168_eth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/marvell/pxa168_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.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/marvell/skge.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/marvell/skge.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/marvell/sky2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/marvell/sky2.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/catas.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/catas.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/cmd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/cmd.c</a></td><td class='right'>1332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 79.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/cq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/cq.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/en_cq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/en_cq.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/en_ethtool.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/en_netdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/en_netdev.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/en_port.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/en_port.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: 1.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/en_port.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/en_port.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.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/en_resources.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/en_resources.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/en_rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/en_rx.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/en_selftest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/en_selftest.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/en_tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/en_tx.c</a></td><td class='right'>96</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='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/eq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/eq.c</a></td><td class='right'>430</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/fw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/fw.c</a></td><td class='right'>415</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/fw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/fw.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/icm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/icm.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/intf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/intf.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/main.c</a></td><td class='right'>902</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.2%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 86.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/mcg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/mcg.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/mlx4.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/mlx4.h</a></td><td class='right'>670</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/mlx4_en.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/mr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/mr.c</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/pd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/pd.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/port.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/port.c</a></td><td class='right'>616</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/profile.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/profile.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/qp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/qp.c</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/resource_tracker.c</a></td><td class='right'>3104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 47.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 52.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/sense.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/sense.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/mellanox/mlx4/srq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/srq.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/micrel/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/micrel/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/micrel/ks8842.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/micrel/ks8842.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/micrel/ks8851.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/micrel/ks8851.c</a></td><td class='right'>513</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/micrel/ks8851.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/micrel/ks8851.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/micrel/ks8851_mll.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/micrel/ks8851_mll.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/micrel/ksz884x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/micrel/ksz884x.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/myricom/myri10ge/myri10ge.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/myricom/myri10ge/myri10ge.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/natsemi/jazzsonic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/natsemi/jazzsonic.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/natsemi/macsonic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/natsemi/macsonic.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/natsemi/natsemi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/natsemi/natsemi.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/natsemi/ns83820.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/natsemi/ns83820.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/natsemi/xtsonic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/natsemi/xtsonic.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/neterion/s2io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/neterion/s2io.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/neterion/vxge/vxge-main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/neterion/vxge/vxge-main.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/nuvoton/w90p910_ether.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/nuvoton/w90p910_ether.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/nvidia/forcedeth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/nvidia/forcedeth.c</a></td><td class='right'>503</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/qlogic/qla3xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/qlogic/qla3xxx.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/qlogic/qlcnic/qlcnic.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/qlogic/qlge/qlge_ethtool.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/qlogic/qlge/qlge_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/qlogic/qlge/qlge_main.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/rdc/r6040.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/rdc/r6040.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/realtek/8139cp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/realtek/8139cp.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/realtek/8139too.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/realtek/8139too.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/realtek/r8169.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/realtek/r8169.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/renesas/sh_eth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/renesas/sh_eth.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/s6gmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/s6gmac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/seeq/sgiseeq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/seeq/sgiseeq.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sfc/efx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/efx.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sfc/efx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/efx.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sfc/ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/ethtool.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sfc/falcon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/falcon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sfc/filter.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/filter.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sfc/filter.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/filter.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sfc/mtd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/mtd.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sfc/net_driver.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/net_driver.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sfc/rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/rx.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sfc/selftest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/selftest.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sfc/siena.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/siena.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sfc/tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/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.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sgi/meth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sgi/meth.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sis/sis190.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sis/sis190.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sis/sis900.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sis/sis900.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sis/sis900.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sis/sis900.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/smsc/epic100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/smsc/epic100.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/smsc/smc911x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/smsc/smc911x.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/smsc/smc91c92_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/smsc/smc91c92_cs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/smsc/smc91x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/smsc/smc91x.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/smsc/smsc911x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/smsc/smsc911x.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/smsc/smsc911x.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/smsc/smsc911x.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/smsc/smsc9420.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/smsc/smsc9420.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/stmicro/stmmac/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/Kconfig</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/stmicro/stmmac/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/stmicro/stmmac/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/stmicro/stmmac/mmc_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/mmc_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='/cgit/linux.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/stmmac.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/stmmac_main.c</a></td><td class='right'>445</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sun/cassini.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sun/cassini.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sun/niu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sun/niu.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sun/sunbmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sun/sunbmac.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sun/sungem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sun/sungem.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/sun/sunhme.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sun/sunhme.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/tehuti/tehuti.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/tehuti/tehuti.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/ti/cpmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/ti/cpmac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/ti/davinci_emac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/ti/davinci_emac.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/ti/davinci_mdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/ti/davinci_mdio.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/tile/tilepro.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/tile/tilepro.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/toshiba/ps3_gelic_net.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/toshiba/ps3_gelic_net.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/tundra/tsi108_eth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/tundra/tsi108_eth.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/via/via-rhine.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/via/via-rhine.c</a></td><td class='right'>689</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 89.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/via/via-velocity.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/via/via-velocity.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/xilinx/ll_temac_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/xilinx/ll_temac_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.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/xilinx/xilinx_emaclite.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/xilinx/xilinx_emaclite.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ethernet/xircom/xirc2ps_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/xircom/xirc2ps_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='/cgit/linux.git/diff/drivers/net/ethernet/xscale/ixp4xx_eth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/xscale/ixp4xx_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='add'><a href='/cgit/linux.git/diff/drivers/net/hyperv/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/hyperv/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/hyperv/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/hyperv/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='mov'><a href='/cgit/linux.git/diff/drivers/net/hyperv/hyperv_net.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/hyperv/hyperv_net.h</a> (renamed from drivers/staging/hv/hyperv_net.h)</td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/hyperv/netvsc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/hyperv/netvsc.c</a> (renamed from drivers/staging/hv/netvsc.c)</td><td class='right'>164</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.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/hyperv/netvsc_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/hyperv/netvsc_drv.c</a> (renamed from drivers/staging/hv/netvsc_drv.c)</td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><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='mov'><a href='/cgit/linux.git/diff/drivers/net/hyperv/rndis_filter.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/hyperv/rndis_filter.c</a> (renamed from drivers/staging/hv/rndis_filter.c)</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.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='/cgit/linux.git/diff/drivers/net/ifb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ifb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/irda/au1000_ircc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/au1000_ircc.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/au1k_ir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/au1k_ir.c</a></td><td class='right'>1229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.5%;'/><td class='rem' style='width: 8.4%;'/><td class='none' style='width: 81.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/bfin_sir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/bfin_sir.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/donauboe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/donauboe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/irda-usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/irda-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.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/kingsun-sir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/kingsun-sir.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/ks959-sir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/ks959-sir.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/ksdazzle-sir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/ksdazzle-sir.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/mcs7780.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/mcs7780.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/nsc-ircc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/nsc-ircc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/pxaficp_ir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/pxaficp_ir.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/sh_irda.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/sh_irda.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/sh_sir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/sh_sir.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/smsc-ircc2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/smsc-ircc2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/stir4200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/stir4200.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/via-ircc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/via-ircc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/w83977af_ir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/w83977af_ir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/loopback.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/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='/cgit/linux.git/diff/drivers/net/macvlan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/macvlan.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/macvtap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/macvtap.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/mii.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/mii.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.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='/cgit/linux.git/diff/drivers/net/phy/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/phy/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/net/phy/dp83640.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/net/phy/fixed.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/fixed.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/phy/mdio-bitbang.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/mdio-bitbang.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/phy/mdio-gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/mdio-gpio.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/phy/mdio-octeon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/mdio-octeon.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/phy/mdio_bus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/mdio_bus.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/phy/phy_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/phy_device.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/phy/smsc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/smsc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/phy/spi_ks8995.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/spi_ks8995.c</a></td><td class='right'>375</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='upd'><a href='/cgit/linux.git/diff/drivers/net/ppp/pptp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ppp/pptp.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/team/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/team/Kconfig</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/team/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/team/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/team/team.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/team/team.c</a></td><td class='right'>1684</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/team/team_mode_activebackup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/team/team_mode_activebackup.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/team/team_mode_roundrobin.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/team/team_mode_roundrobin.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tun.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/tun.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/asix.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/asix.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/catc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/catc.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/cdc-phonet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/cdc-phonet.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/cdc_eem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/cdc_eem.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/cdc_ether.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/cdc_ether.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/cdc_ncm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/cdc_ncm.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/cdc_subset.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/cdc_subset.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/cx82310_eth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/cx82310_eth.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/dm9601.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/dm9601.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/gl620a.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/gl620a.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/int51x1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/int51x1.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/ipheth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/ipheth.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/kalmia.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/kalmia.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/kaweth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/kaweth.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/lg-vl600.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/lg-vl600.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/mcs7830.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/mcs7830.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/net1080.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/net1080.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/pegasus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/pegasus.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/plusb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/plusb.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/rndis_host.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/rndis_host.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/rtl8150.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/rtl8150.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/sierra_net.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/sierra_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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/smsc75xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/smsc75xx.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/smsc95xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/smsc95xx.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/usb/zaurus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/zaurus.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/veth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/veth.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/virtio_net.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/virtio_net.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/vmxnet3/vmxnet3_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/vmxnet3/vmxnet3_drv.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/vmxnet3/vmxnet3_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/vmxnet3/vmxnet3_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.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/vmxnet3/vmxnet3_int.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/vmxnet3/vmxnet3_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='/cgit/linux.git/diff/drivers/net/wan/sbni.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wan/sbni.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/sealevel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wan/sealevel.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wimax/i2400m/i2400m.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wimax/i2400m/i2400m.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wimax/i2400m/tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wimax/i2400m/tx.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wimax/i2400m/usb-tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wimax/i2400m/usb-tx.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/airo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/airo.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/ahb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/ahb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/ani.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/ani.c</a></td><td class='right'>91</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='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/ani.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/ani.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/ath5k.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/ath5k.h</a></td><td class='right'>571</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/attach.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/attach.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/base.c</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/caps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/caps.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/desc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/desc.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/desc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/desc.h</a></td><td class='right'>124</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='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/dma.c</a></td><td class='right'>370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/gpio.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/initvals.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/initvals.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/pcu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/pcu.c</a></td><td class='right'>222</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.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/phy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/phy.c</a></td><td class='right'>853</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.5%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 86.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/qcu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/qcu.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/reg.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/reset.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/reset.c</a></td><td class='right'>234</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='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/rfbuffer.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/rfbuffer.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/rfgain.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/rfgain.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath5k/trace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/trace.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/bmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/bmi.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: 3.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/bmi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/bmi.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/cfg80211.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/cfg80211.c</a></td><td class='right'>1695</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.1%;'/><td class='rem' style='width: 5.9%;'/><td class='none' style='width: 74.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/cfg80211.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/cfg80211.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/common.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/core.h</a></td><td class='right'>309</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='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/debug.c</a></td><td class='right'>849</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 87.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/debug.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/hif-ops.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/hif-ops.h</a></td><td class='right'>79</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='mov'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/hif.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/hif.c</a> (renamed from drivers/net/wireless/ath/ath6kl/htc_hif.c)</td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/hif.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/hif.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/htc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/htc.c</a></td><td class='right'>725</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 88.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/htc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/htc.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/htc_hif.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/htc_hif.h</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: 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='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/init.c</a></td><td class='right'>1013</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.3%;'/><td class='rem' style='width: 7.2%;'/><td class='none' style='width: 84.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/main.c</a></td><td class='right'>771</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 9.3%;'/><td class='none' style='width: 88.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/sdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/sdio.c</a></td><td class='right'>660</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/target.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/target.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/txrx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/txrx.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/wmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/wmi.c</a></td><td class='right'>834</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.6%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 87.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath6kl/wmi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/wmi.h</a></td><td class='right'>386</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/Kconfig</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/ani.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ani.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/ar5008_phy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar5008_phy.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/ar9002_calib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9002_calib.c</a></td><td class='right'>136</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='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/ar9002_mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9002_mac.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/ar9003_calib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_calib.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_eeprom.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_eeprom.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/ar9003_mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_mac.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/ar9003_mac.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_mac.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/ar9003_mci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_mci.c</a></td><td class='right'>1493</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/ar9003_mci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_mci.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/ar9003_paprd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_paprd.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/ar9003_phy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_phy.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/ar9003_phy.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/ar9003_rtt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_rtt.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h</a></td><td class='right'>60</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='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/ath9k.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ath9k.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/beacon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/beacon.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/btcoex.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/btcoex.c</a></td><td class='right'>135</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='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/btcoex.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/btcoex.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/calib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/calib.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/calib.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/calib.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/debug.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/debug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/dfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/dfs.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/dfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/dfs.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/dfs_debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/dfs_debug.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/dfs_debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/dfs_debug.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/eeprom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/eeprom.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/eeprom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/eeprom.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/eeprom_4k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/eeprom_4k.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/eeprom_9287.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/eeprom_9287.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/eeprom_def.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/eeprom_def.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.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/gpio.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/htc_drv_beacon.c</a></td><td class='right'>51</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/htc_drv_gpio.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/htc_drv_init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/htc_drv_init.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/htc_drv_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/htc_drv_main.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/htc_drv_txrx.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/hw-ops.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/hw-ops.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/hw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/hw.c</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/hw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/hw.h</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/init.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/mac.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/main.c</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/mci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/mci.c</a></td><td class='right'>668</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/mci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/mci.h</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/pci.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/rc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/rc.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/recv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/recv.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/reg.h</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/wmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/wmi.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/ath9k/xmit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/xmit.c</a></td><td class='right'>359</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/carl9170/debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/carl9170/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='/cgit/linux.git/diff/drivers/net/wireless/ath/carl9170/fw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/carl9170/fw.c</a></td><td class='right'>97</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.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/carl9170/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/carl9170/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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/carl9170/tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/carl9170/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/carl9170/usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/carl9170/usb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/key.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/key.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ath/regd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/regd.c</a></td><td class='right'>77</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/b43.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/b43.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/dma.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/leds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/leds.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/lo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/lo.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/main.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/phy_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/phy_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/phy_g.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/phy_g.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/phy_lp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/phy_lp.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/phy_n.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/phy_n.c</a></td><td class='right'>4112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 34.7%;'/><td class='rem' style='width: 28.4%;'/><td class='none' style='width: 36.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/phy_n.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/phy_n.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/pio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/pio.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/radio_2056.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/radio_2056.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/radio_2056.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/radio_2056.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/tables_nphy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/tables_nphy.c</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/tables_nphy.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/tables_nphy.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43/xmit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/xmit.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43legacy/b43legacy.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43legacy/b43legacy.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43legacy/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43legacy/dma.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43legacy/dma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43legacy/dma.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43legacy/leds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43legacy/leds.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43legacy/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43legacy/main.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/b43legacy/radio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43legacy/radio.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmfmac/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/Makefile</a></td><td class='right'>21</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='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/bcmchip.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c</a></td><td class='right'>153</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='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmfmac/dhd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/dhd.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><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='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c</a></td><td class='right'>50</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/dhd_common.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c</a></td><td class='right'>711</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 6.8%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c</a></td><td class='right'>1296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 14.0%;'/><td class='none' style='width: 80.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c</a></td><td class='right'>607</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/aiutils.c</a></td><td class='right'>1251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 16.0%;'/><td class='none' style='width: 80.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/aiutils.h</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/ampdu.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/channel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/channel.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: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/d11.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/d11.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/dma.c</a></td><td class='right'>469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/dma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/dma.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/main.c</a></td><td class='right'>1408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 12.8%;'/><td class='none' style='width: 78.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/main.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/main.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/nicpci.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.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='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/nicpci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/nicpci.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/otp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/otp.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/pmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/pmu.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/pmu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/pmu.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/pub.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/pub.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.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='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/rate.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/rate.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/srom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/srom.c</a></td><td class='right'>508</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 6.4%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/srom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/srom.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmsmac/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/types.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/brcmutil/utils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmutil/utils.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/include/brcmu_utils.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/include/brcmu_utils.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/include/chipcommon.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/include/chipcommon.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/include/defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/include/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='/cgit/linux.git/diff/drivers/net/wireless/brcm80211/include/soc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/include/soc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/hostap/hostap_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/hostap/hostap_cs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/hostap/hostap_ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/hostap/hostap_ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ipw2x00/ipw2100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ipw2x00/ipw2100.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ipw2x00/ipw2200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ipw2x00/ipw2200.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ipw2x00/libipw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ipw2x00/libipw.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ipw2x00/libipw_wx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ipw2x00/libipw_wx.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/3945-debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/3945-debug.c</a></td><td class='right'>505</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/3945-mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/3945-mac.c</a></td><td class='right'>3976</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 61.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 39.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/3945-rs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/3945-rs.c</a></td><td class='right'>986</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/3945.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/3945.c</a></td><td class='right'>2743</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 42.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 57.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/3945.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/3945.h</a></td><td class='right'>607</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/4965-calib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/4965-calib.c</a> (renamed from drivers/net/wireless/iwlegacy/iwl-4965-calib.c)</td><td class='right'>613</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 90.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/4965-debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/4965-debug.c</a></td><td class='right'>746</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/4965-mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/4965-mac.c</a></td><td class='right'>6515</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 100.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/4965-rs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/4965-rs.c</a></td><td class='right'>2860</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 43.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 56.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/4965.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/4965.c</a></td><td class='right'>2402</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 36.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 63.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/4965.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/4965.h</a></td><td class='right'>1301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/Kconfig</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.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/Makefile</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.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='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/commands.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/commands.h</a> (renamed from drivers/net/wireless/iwlegacy/iwl-commands.h)</td><td class='right'>1134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 8.9%;'/><td class='none' style='width: 82.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/common.c</a></td><td class='right'>5867</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 90.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 9.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/common.h</a></td><td class='right'>3246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 49.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 50.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/csr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/csr.h</a> (renamed from drivers/net/wireless/iwlegacy/iwl-csr.h)</td><td class='right'>93</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='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/debug.c</a></td><td class='right'>1411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 21.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 78.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c</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: 8.0%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-3945-debugfs.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.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-3945-fh.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-3945-fh.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: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-3945-hw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-3945-hw.h</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-3945-led.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-3945-led.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: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-3945-led.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-3945-led.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-3945-rs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-3945-rs.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: 15.3%;'/><td class='none' style='width: 84.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-3945.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-3945.c</a></td><td class='right'>2741</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 42.1%;'/><td class='none' style='width: 57.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-3945.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-3945.h</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c</a></td><td class='right'>774</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.9%;'/><td class='none' style='width: 88.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-4965-hw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-hw.h</a></td><td class='right'>811</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 12.4%;'/><td class='none' style='width: 87.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-4965-led.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-led.c</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: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-4965-led.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-led.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-4965-lib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-lib.c</a></td><td class='right'>1194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 18.3%;'/><td class='none' style='width: 81.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-4965-rs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-rs.c</a></td><td class='right'>2871</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 44.1%;'/><td class='none' style='width: 55.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-4965-rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-rx.c</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: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-4965-sta.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-sta.c</a></td><td class='right'>721</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.1%;'/><td class='none' style='width: 88.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-4965-tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-tx.c</a></td><td class='right'>1378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 21.2%;'/><td class='none' style='width: 78.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-4965-ucode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-ucode.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-4965.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965.c</a></td><td class='right'>2183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 33.5%;'/><td class='none' style='width: 66.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-4965.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965.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: 4.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-core.c</a></td><td class='right'>2661</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 40.8%;'/><td class='none' style='width: 59.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-core.h</a></td><td class='right'>636</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.8%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-debug.h</a></td><td class='right'>198</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='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-debugfs.c</a></td><td class='right'>1314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 20.2%;'/><td class='none' style='width: 79.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-dev.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-dev.h</a></td><td class='right'>1364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 20.9%;'/><td class='none' style='width: 79.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-devtrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-devtrace.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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-devtrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-devtrace.h</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-eeprom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-eeprom.c</a></td><td class='right'>553</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.5%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-eeprom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-eeprom.h</a></td><td class='right'>344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-fh.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-fh.h</a></td><td class='right'>513</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.9%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-hcmd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-hcmd.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-helpers.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-helpers.h</a></td><td class='right'>196</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='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-io.h</a></td><td class='right'>545</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.4%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-led.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-led.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-led.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-led.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.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-legacy-rs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-legacy-rs.h</a></td><td class='right'>456</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-power.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-power.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-power.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-power.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.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-rx.c</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: 4.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-scan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-scan.c</a></td><td class='right'>550</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.4%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-spectrum.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-spectrum.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-sta.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-sta.c</a></td><td class='right'>817</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 12.5%;'/><td class='none' style='width: 87.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-sta.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-sta.h</a></td><td class='right'>148</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='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl-tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-tx.c</a></td><td class='right'>659</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.1%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl3945-base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl3945-base.c</a></td><td class='right'>4016</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 61.6%;'/><td class='none' style='width: 38.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/iwl4965-base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl4965-base.c</a></td><td class='right'>3281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 50.4%;'/><td class='none' style='width: 49.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlegacy/prph.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/prph.h</a> (renamed from drivers/net/wireless/iwlegacy/iwl-prph.h)</td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/Kconfig</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-1000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-1000.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.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-2000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-2000.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.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='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-5000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-5000.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-6000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-6000.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.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-agn-calib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-calib.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-agn-calib.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-calib.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-agn-lib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-lib.c</a></td><td class='right'>436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-agn-rs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-rs.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.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-agn-rs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-rs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-agn-rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-rx.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-rxon.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-agn-sta.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-sta.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: 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='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-agn-tt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-tt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-agn-tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-tx.c</a></td><td class='right'>360</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-agn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn.c</a></td><td class='right'>1685</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 24.3%;'/><td class='none' style='width: 74.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-agn.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-bus.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-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.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-cfg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-cfg.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-commands.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-commands.h</a></td><td class='right'>111</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='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-core.c</a></td><td class='right'>381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-core.h</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: 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='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-csr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-csr.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-debug.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-debugfs.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-dev.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-dev.h</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-devtrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-devtrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-devtrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-devtrace.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-eeprom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-eeprom.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-eeprom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-eeprom.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-io.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-io.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-led.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-led.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-led.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-led.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-mac80211.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-mac80211.c</a></td><td class='right'>1601</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 75.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-pci.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-power.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-power.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-scan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-scan.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.8%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-shared.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-shared.h</a></td><td class='right'>237</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.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-testmode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-testmode.c</a> (renamed from drivers/net/wireless/iwlwifi/iwl-sv-open.c)</td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-testmode.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-testmode.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 2.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='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-trans-pcie.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: 1.9%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-trans.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-trans.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-ucode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-ucode.c</a> (renamed from drivers/net/wireless/iwlwifi/iwl-agn-ucode.c)</td><td class='right'>418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwlwifi/iwl-wifi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-wifi.h</a> (renamed from drivers/net/wireless/iwlegacy/iwl-4965-calib.h)</td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwmc3200wifi/cfg80211.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwmc3200wifi/cfg80211.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwmc3200wifi/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwmc3200wifi/main.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/iwmc3200wifi/rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwmc3200wifi/rx.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/libertas/cfg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/libertas/cfg.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/libertas/debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/libertas/debugfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/libertas/ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/libertas/ethtool.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/libertas/if_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/libertas/if_cs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/libertas/if_spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/libertas/if_spi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/libertas/if_usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/libertas/if_usb.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/libertas_tf/if_usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/libertas_tf/if_usb.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/libertas_tf/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/libertas_tf/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mac80211_hwsim.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mac80211_hwsim.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/11n_rxreorder.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/11n_rxreorder.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/cfg80211.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/cfg80211.c</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/cfg80211.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/cfg80211.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/cfp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/cfp.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/fw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/fw.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/init.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/ioctl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/ioctl.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/join.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/join.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/main.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/main.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/main.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/pcie.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/scan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/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.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/sdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/sdio.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/sdio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/sdio.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/sta_cmd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/sta_cmd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/sta_cmdresp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/sta_cmdresp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/sta_event.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/sta_event.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/sta_ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/sta_ioctl.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: 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='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/sta_rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/sta_rx.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwifiex/txrx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/txrx.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/mwl8k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwl8k.c</a></td><td class='right'>166</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='/cgit/linux.git/diff/drivers/net/wireless/orinoco/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/orinoco/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='/cgit/linux.git/diff/drivers/net/wireless/orinoco/orinoco_usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/orinoco/orinoco_usb.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/orinoco/scan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/orinoco/scan.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/p54/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/p54/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='/cgit/linux.git/diff/drivers/net/wireless/p54/p54spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/p54/p54spi.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/p54/p54usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/p54/p54usb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/p54/txrx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/p54/txrx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/prism54/isl_ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/prism54/isl_ioctl.c</a></td><td class='right'>333</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/prism54/isl_ioctl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/prism54/isl_ioctl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/prism54/islpci_dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/prism54/islpci_dev.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ray_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ray_cs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rayctl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rayctl.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rndis_wlan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rndis_wlan.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2500usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt2500usb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2800.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt2800.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2800lib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt2800lib.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2800pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt2800pci.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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2800usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt2800usb.c</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.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='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt2x00.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt2x00dev.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt2x00mac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt2x00usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt2x00usb.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt61pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt61pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rt2x00/rt73usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt73usb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtl818x/rtl8187/dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtl818x/rtl8187/dev.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtlwifi/base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/base.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtlwifi/base.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/base.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtlwifi/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/pci.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtlwifi/ps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/ps.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192ce/sw.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192cu/hw.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192cu/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='/cgit/linux.git/diff/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192cu/sw.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192cu/trx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtlwifi/rtl8192de/hw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192de/hw.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtlwifi/rtl8192de/sw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192de/sw.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtlwifi/rtl8192se/fw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192se/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtlwifi/rtl8192se/sw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192se/sw.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtlwifi/usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/usb.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/rtlwifi/wifi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/wifi.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl1251/spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl1251/spi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/acx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/acx.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><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='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/acx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/acx.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/boot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/boot.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/cmd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/cmd.c</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/cmd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/cmd.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/conf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/conf.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/debug.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/debugfs.c</a></td><td class='right'>157</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='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/event.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/event.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/event.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/event.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/init.c</a></td><td class='right'>491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/init.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/init.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/io.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/main.c</a></td><td class='right'>2058</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.2%;'/><td class='rem' style='width: 13.4%;'/><td class='none' style='width: 68.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/ps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/ps.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/ps.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/ps.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/reg.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/rx.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/scan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/scan.c</a></td><td class='right'>120</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='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/scan.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/scan.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/sdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/sdio.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/sdio_test.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/sdio_test.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: 8.3%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/spi.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/testmode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/testmode.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/tx.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/tx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/tx.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/wl12xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/wl12xx.h</a></td><td class='right'>386</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 3.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='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/wl12xx_80211.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/wl12xx_80211.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl12xx/wl12xx_platform_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/wl12xx_platform_data.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1201.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/zd1201.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/xen-netback/interface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/xen-netback/interface.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/xen-netback/netback.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/xen-netback/netback.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/xen-netback/xenbus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/xen-netback/xenbus.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/xen-netfront.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/xen-netfront.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/nfc/pn533.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/nfc/pn533.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.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='/cgit/linux.git/diff/drivers/of/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/of/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/of/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/of/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/of/address.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/of/address.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/of/base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/of/base.c</a></td><td class='right'>156</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='/cgit/linux.git/diff/drivers/of/fdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/of/fdt.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/of/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/of/gpio.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/of/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/of/irq.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/of/pdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/of/pdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/of/selftest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/of/selftest.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parisc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/parisc/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parisc/dino.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/parisc/dino.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parisc/lba_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/parisc/lba_pci.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parport/parport_ax88796.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/parport/parport_ax88796.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parport/parport_ip32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/parport/parport_ip32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parport/parport_mfc3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/parport/parport_mfc3.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parport/parport_pc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/parport/parport_pc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parport/parport_sunbpp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/parport/parport_sunbpp.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/access.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/access.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/ats.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/ats.c</a></td><td class='right'>107</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.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/bus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/bus.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/acpi_pcihp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/acpi_pcihp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/acpiphp_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/acpiphp_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='/cgit/linux.git/diff/drivers/pci/hotplug/acpiphp_ibm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/acpiphp_ibm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/cpcihp_zt5550.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/cpcihp_zt5550.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/cpqphp_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/cpqphp_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/ibmphp_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/ibmphp_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='/cgit/linux.git/diff/drivers/pci/hotplug/pci_hotplug_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/pci_hotplug_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='/cgit/linux.git/diff/drivers/pci/hotplug/pciehp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/pciehp.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/pciehp_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/pciehp_core.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/pciehp_ctrl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/pciehp_hpc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/pciehp_hpc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/pcihp_skeleton.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/pcihp_skeleton.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/rpaphp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/rpaphp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/rpaphp_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/rpaphp_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='/cgit/linux.git/diff/drivers/pci/hotplug/shpchp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/shpchp.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/shpchp_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/shpchp_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/iov.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/iov.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/msi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/msi.c</a></td><td class='right'>160</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.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/pci-acpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pci-acpi.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/pci-driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pci-driver.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/pci-label.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pci-label.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/pci-sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pci-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='/cgit/linux.git/diff/drivers/pci/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pci.c</a></td><td class='right'>153</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.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pci.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/pcie/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pcie/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/pcie/aer/aer_inject.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pcie/aer/aer_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='/cgit/linux.git/diff/drivers/pci/pcie/aer/aerdrv_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pcie/aer/aerdrv_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/pcie/aspm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pcie/aspm.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/probe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/probe.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/remove.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/remove.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/setup-res.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/setup-res.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/xen-pcifront.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/xen-pcifront.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/pcmcia/au1000_generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/au1000_generic.c</a></td><td class='right'>545</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.4%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/pcmcia/au1000_generic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/au1000_generic.h</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: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/pcmcia/au1000_pb1x00.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/au1000_pb1x00.c</a></td><td class='right'>294</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='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/db1xxx_ss.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/db1xxx_ss.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/pxa2xx_cm_x255.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/pxa2xx_cm_x255.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/pxa2xx_cm_x270.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/pxa2xx_cm_x270.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/pxa2xx_e740.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/pxa2xx_e740.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/pxa2xx_palmld.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/pxa2xx_palmld.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/pxa2xx_palmtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/pxa2xx_palmtc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/pxa2xx_stargate2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/pxa2xx_stargate2.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/pxa2xx_trizeps4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/pxa2xx_trizeps4.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/pxa2xx_vpac270.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/pxa2xx_vpac270.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/yenta_socket.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/yenta_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pinctrl/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pinctrl/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pinctrl/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pinctrl/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pinctrl/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pinctrl/core.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pinctrl/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pinctrl/core.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/pinctrl/pinconf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pinctrl/pinconf.c</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/pinctrl/pinconf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pinctrl/pinconf.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/pinctrl/pinctrl-coh901.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pinctrl/pinctrl-coh901.c</a> (renamed from drivers/gpio/gpio-u300.c)</td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/pinctrl/pinctrl-sirf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pinctrl/pinctrl-sirf.c</a> (renamed from drivers/pinctrl/pinmux-sirf.c)</td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/pinctrl/pinctrl-u300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pinctrl/pinctrl-u300.c</a> (renamed from drivers/pinctrl/pinmux-u300.c)</td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pinctrl/pinmux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pinctrl/pinmux.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/platform/x86/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/platform/x86/asus-laptop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/asus-laptop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/platform/x86/asus-wmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/asus-wmi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/platform/x86/asus_acpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/asus_acpi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/platform/x86/compal-laptop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/compal-laptop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/platform/x86/ibm_rtl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/ibm_rtl.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/platform/x86/ideapad-laptop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/ideapad-laptop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/platform/x86/intel_menlow.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/intel_menlow.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/platform/x86/intel_oaktrail.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/intel_oaktrail.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/platform/x86/intel_scu_ipc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/intel_scu_ipc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/platform/x86/msi-laptop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/msi-laptop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/platform/x86/samsung-laptop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/samsung-laptop.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/platform/x86/thinkpad_acpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/thinkpad_acpi.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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/platform/x86/wmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/wmi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pnp/quirks.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pnp/quirks.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/Kconfig</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/bq27x00_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/bq27x00_battery.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/power/charger-manager.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/charger-manager.c</a></td><td class='right'>1072</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='upd'><a href='/cgit/linux.git/diff/drivers/power/collie_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/collie_battery.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.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='/cgit/linux.git/diff/drivers/power/da9030_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/da9030_battery.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/power/da9052-battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/da9052-battery.c</a></td><td class='right'>664</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/ds2760_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/ds2760_battery.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/ds2780_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/ds2780_battery.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/gpio-charger.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/gpio-charger.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/intel_mid_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/intel_mid_battery.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/isp1704_charger.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/isp1704_charger.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/jz4740-battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/jz4740-battery.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/power/lp8727_charger.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/lp8727_charger.c</a></td><td class='right'>494</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/max17042_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/max17042_battery.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/max8903_charger.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/max8903_charger.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/max8925_power.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/max8925_power.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/max8997_charger.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/max8997_charger.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/max8998_charger.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/max8998_charger.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/olpc_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/olpc_battery.c</a></td><td class='right'>75</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='/cgit/linux.git/diff/drivers/power/pcf50633-charger.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/pcf50633-charger.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/pda_power.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/pda_power.c</a></td><td class='right'>89</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='/cgit/linux.git/diff/drivers/power/power_supply_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/power_supply_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.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/power_supply_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/power_supply_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.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/s3c_adc_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/s3c_adc_battery.c</a></td><td class='right'>37</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='mov'><a href='/cgit/linux.git/diff/drivers/power/sbs-battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/sbs-battery.c</a> (renamed from drivers/power/bq20z75.c)</td><td class='right'>481</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/tosa_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/tosa_battery.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/wm831x_backup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/wm831x_backup.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/wm831x_power.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/wm831x_power.c</a></td><td class='right'>56</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='/cgit/linux.git/diff/drivers/power/wm8350_power.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/wm8350_power.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/wm97xx_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/wm97xx_battery.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/power/z2_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/z2_battery.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/88pm8607.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/88pm8607.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/aat2870-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/aat2870-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/ab3100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/ab3100.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/ab8500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/ab8500.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/ad5398.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/ad5398.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/bq24022.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/bq24022.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/core.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/da903x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/da903x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/regulator/da9052-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/da9052-regulator.c</a></td><td class='right'>606</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/db8500-prcmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/db8500-prcmu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/dummy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/dummy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/fixed.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/fixed.c</a></td><td class='right'>85</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='/cgit/linux.git/diff/drivers/regulator/gpio-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/gpio-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='/cgit/linux.git/diff/drivers/regulator/isl6271a-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/isl6271a-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='/cgit/linux.git/diff/drivers/regulator/lp3971.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/lp3971.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/lp3972.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/lp3972.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/max1586.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/max1586.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/max8649.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/max8649.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/max8660.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/max8660.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/max8925-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/max8925-regulator.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/max8952.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/max8952.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/max8997.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/max8997.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/max8998.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/max8998.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/mc13783-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/mc13783-regulator.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/mc13892-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/mc13892-regulator.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/mc13xxx-regulator-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/mc13xxx-regulator-core.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/mc13xxx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/mc13xxx.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/regulator/of_regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/of_regulator.c</a></td><td class='right'>87</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='/cgit/linux.git/diff/drivers/regulator/pcap-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/pcap-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='/cgit/linux.git/diff/drivers/regulator/pcf50633-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/pcf50633-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='/cgit/linux.git/diff/drivers/regulator/tps6105x-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/tps6105x-regulator.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/tps65023-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/tps65023-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.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/tps6507x-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/tps6507x-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='/cgit/linux.git/diff/drivers/regulator/tps6524x-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/tps6524x-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='/cgit/linux.git/diff/drivers/regulator/tps6586x-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/tps6586x-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='/cgit/linux.git/diff/drivers/regulator/tps65910-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/tps65910-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.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/tps65912-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/tps65912-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='/cgit/linux.git/diff/drivers/regulator/twl-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/twl-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='/cgit/linux.git/diff/drivers/regulator/userspace-consumer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/userspace-consumer.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/virtual.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/virtual.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/wm831x-dcdc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/wm831x-dcdc.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/wm831x-isink.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/wm831x-isink.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/wm831x-ldo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/wm831x-ldo.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/regulator/wm8350-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/wm8350-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='/cgit/linux.git/diff/drivers/regulator/wm8400-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/wm8400-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='/cgit/linux.git/diff/drivers/regulator/wm8994-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/wm8994-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='/cgit/linux.git/diff/drivers/rtc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/interface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/interface.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-88pm860x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-88pm860x.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-ab8500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-ab8500.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-at91rm9200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-at91rm9200.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-bfin.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-bfin.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-bq4802.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-bq4802.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-cmos.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-cmos.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-dm355evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-dm355evm.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-ds1286.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-ds1286.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-ds1511.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-ds1511.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-ds1553.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-ds1553.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-ds1742.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-ds1742.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-jz4740.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-jz4740.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-lpc32xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-lpc32xx.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-m41t93.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-m41t93.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-m41t94.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-m41t94.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-m48t35.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-m48t35.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-m48t59.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-m48t59.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-m48t86.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-m48t86.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-max6902.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-max6902.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-max8925.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-max8925.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-max8998.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-max8998.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-mc13xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-mc13xxx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-mpc5121.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-mpc5121.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-mrst.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-mrst.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-mxc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-mxc.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-pcf2123.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-pcf2123.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-pcf50633.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-pcf50633.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-pl030.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-pl030.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-pl031.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-pl031.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-pm8xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-pm8xxx.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-puv3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-puv3.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-rs5c348.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-rs5c348.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-s3c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-s3c.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-sa1100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-sa1100.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-spear.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-spear.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-stk17ta8.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-stk17ta8.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-stmp3xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-stmp3xxx.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-twl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-twl.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-v3020.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-v3020.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-vr41xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-vr41xx.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-vt8500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-vt8500.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-wm831x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-wm831x.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.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-wm8350.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-wm8350.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/block/dasd.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_3990_erp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/block/dasd_3990_erp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_alias.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/block/dasd_alias.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_eckd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/block/dasd_eckd.c</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/xpram.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/block/xpram.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/raw3270.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/char/raw3270.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/sclp_config.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/char/sclp_config.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/tape_class.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/char/tape_class.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/vmwatchdog.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/char/vmwatchdog.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/cmf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/cio/cmf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/qdio_setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/cio/qdio_setup.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/crypto/zcrypt_pcixcc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/crypto/zcrypt_pcixcc.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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/kvm/kvm_virtio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/kvm/kvm_virtio.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/netiucv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/net/netiucv.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/qeth_core_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/net/qeth_core_main.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/qeth_l2_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/net/qeth_l2_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.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/qeth_l3_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/net/qeth_l3_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.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aacraid/commctrl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/aacraid/commctrl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aha1542.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/aha1542.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx/aicasm/aicasm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/aic7xxx/aicasm/aicasm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/be2iscsi/be_iscsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/be2iscsi/be_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='/cgit/linux.git/diff/drivers/scsi/be2iscsi/be_iscsi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/be2iscsi/be_iscsi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/be2iscsi/be_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/be2iscsi/be_main.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/bfa/bfa_defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfa_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/bfa/bfa_defs_svc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfa_defs_svc.h</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/bfa/bfa_fc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfa_fc.h</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: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/bfa/bfa_fcpim.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfa_fcpim.c</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/bfa/bfa_fcpim.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfa_fcpim.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/bfa/bfa_ioc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfa_ioc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/bfa/bfa_svc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfa_svc.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/bfa/bfad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfad.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/bfa/bfad_attr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfad_attr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/bfa/bfad_bsg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfad_bsg.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/bfa/bfad_debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfad_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/bfa/bfad_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfad_drv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/bfa/bfad_im.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfad_im.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/bfa/bfad_im.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfad_im.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/bnx2i/bnx2i_iscsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bnx2i/bnx2i_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='/cgit/linux.git/diff/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/cxgbi/cxgb3i/cxgb3i.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/cxgbi/cxgb4i/cxgb4i.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/cxgbi/libcxgbi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/cxgbi/libcxgbi.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/cxgbi/libcxgbi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/cxgbi/libcxgbi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/dc395x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/dc395x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/device_handler/scsi_dh.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/device_handler/scsi_dh.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/device_handler/scsi_dh_alua.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/device_handler/scsi_dh_alua.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/device_handler/scsi_dh_emc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/device_handler/scsi_dh_emc.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/device_handler/scsi_dh_hp_sw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/device_handler/scsi_dh_hp_sw.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/device_handler/scsi_dh_rdac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/device_handler/scsi_dh_rdac.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/fcoe/fcoe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/fcoe/fcoe.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/fcoe/fcoe.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/fcoe/fcoe.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/gdth.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/gdth.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/hpsa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/hpsa.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ipr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/ipr.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ipr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/ipr.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ips.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/ips.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/scsi/isci/firmware/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/firmware/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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/scsi/isci/firmware/README?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/firmware/README</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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/scsi/isci/firmware/create_fw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/firmware/create_fw.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/scsi/isci/firmware/create_fw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/firmware/create_fw.h</a></td><td class='right'>77</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='/cgit/linux.git/diff/drivers/scsi/isci/host.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/host.c</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 1.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='/cgit/linux.git/diff/drivers/scsi/isci/host.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/host.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/isci/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/init.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/isci/isci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/isci.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/isci/phy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/phy.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/isci/port.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/port.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/isci/port.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/port.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/isci/port_config.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/port_config.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/isci/probe_roms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/probe_roms.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/isci/probe_roms.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/probe_roms.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/isci/remote_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/remote_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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/isci/task.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/task.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/isci/task.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/task.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/iscsi_boot_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/iscsi_boot_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/iscsi_tcp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/iscsi_tcp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/jazz_esp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/jazz_esp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/libfc/fc_disc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/libfc/fc_disc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/libfc/fc_elsct.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/libfc/fc_elsct.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/libfc/fc_exch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/libfc/fc_exch.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/libfc/fc_fcp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/libfc/fc_fcp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/libfc/fc_lport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/libfc/fc_lport.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/libfc/fc_rport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/libfc/fc_rport.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_attr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_attr.c</a></td><td class='right'>436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_bsg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_bsg.c</a></td><td class='right'>432</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_bsg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_bsg.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_compat.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_compat.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_crtn.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_crtn.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_debugfs.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_els.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_els.c</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_hbadisc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_hbadisc.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_hw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_hw.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_hw4.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_hw4.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_init.c</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_mbox.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_mbox.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_mem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_mem.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_nportdisc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_nportdisc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_scsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_scsi.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_scsi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_scsi.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_sli.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_sli.c</a></td><td class='right'>704</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_sli4.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_sli4.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_version.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_version.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_vport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_vport.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/mac_esp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mac_esp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/mac_scsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mac_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='/cgit/linux.git/diff/drivers/scsi/megaraid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/megaraid.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/megaraid/megaraid_sas.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/megaraid/megaraid_sas.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/megaraid/megaraid_sas_base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/megaraid/megaraid_sas_base.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/megaraid/megaraid_sas_fp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/megaraid/megaraid_sas_fp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/mpt2sas/mpi/mpi2.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpi/mpi2.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/mpt2sas/mpi/mpi2_ioc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpi/mpi2_ioc.h</a></td><td class='right'>49</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='/cgit/linux.git/diff/drivers/scsi/mpt2sas/mpi/mpi2_raid.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpi/mpi2_raid.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/mpt2sas/mpi/mpi2_tool.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpi/mpi2_tool.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/mpt2sas/mpt2sas_base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpt2sas_base.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/mpt2sas/mpt2sas_base.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpt2sas_base.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/mpt2sas/mpt2sas_ctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpt2sas_ctl.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/mpt2sas/mpt2sas_scsih.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpt2sas_scsih.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/mpt2sas/mpt2sas_transport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpt2sas_transport.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/nsp32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/nsp32.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/pcmcia/nsp_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/pcmcia/nsp_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='/cgit/linux.git/diff/drivers/scsi/pmcraid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/pmcraid.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_attr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_attr.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_bsg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_bsg.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_dbg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_dbg.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_dbg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_dbg.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_def.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_def.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_gbl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_gbl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_gs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_gs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_init.c</a></td><td class='right'>95</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.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_iocb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_iocb.c</a></td><td class='right'>641</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.2%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_isr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_isr.c</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_mbx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_mbx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_nx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_nx.c</a></td><td class='right'>512</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 7.6%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_os.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_os.c</a></td><td class='right'>363</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_sup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_sup.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla4xxx/ql4_dbg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_dbg.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla4xxx/ql4_def.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_def.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla4xxx/ql4_fw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_fw.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla4xxx/ql4_init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_init.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla4xxx/ql4_isr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_isr.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla4xxx/ql4_mbx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_mbx.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla4xxx/ql4_nx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_nx.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla4xxx/ql4_nx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_nx.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla4xxx/ql4_os.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_os.c</a></td><td class='right'>648</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 90.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla4xxx/ql4_version.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_version.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_error.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsi_error.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_lib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsi_lib.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_netlink.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsi_netlink.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsi_pm.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsi_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='/cgit/linux.git/diff/drivers/scsi/scsi_scan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsi_scan.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_transport_fc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsi_transport_fc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_transport_iscsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsi_transport_iscsi.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_transport_spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsi_transport_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='/cgit/linux.git/diff/drivers/scsi/scsicam.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsicam.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/sd.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/sg.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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sni_53c710.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/sni_53c710.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sym53c8xx_2/sym_glue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/sym53c8xx_2/sym_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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/vmw_pvscsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/vmw_pvscsi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sh/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/sh/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sh/clk/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/sh/clk/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sh/clk/cpg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/sh/clk/cpg.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sh/intc/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/sh/intc/core.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sh/intc/internals.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/sh/intc/internals.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sh/intc/userimask.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/sh/intc/userimask.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sh/pfc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/sh/pfc.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/spi-dw-mid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/spi/spi-dw-mid.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/spi-ep93xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/spi/spi-ep93xx.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/spi-omap2-mcspi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/spi/spi-omap2-mcspi.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/spi-pl022.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/spi/spi-pl022.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><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='/cgit/linux.git/diff/drivers/spi/spi-s3c64xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/spi/spi-s3c64xx.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/spi-topcliff-pch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/spi/spi-topcliff-pch.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/spi/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='/cgit/linux.git/diff/drivers/ssb/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ssb/pci.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/Kconfig</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/TODO?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/TODO</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/android_pmem.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/android_pmem.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/ashmem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/ashmem.c</a></td><td class='right'>752</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/ashmem.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/ashmem.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/binder.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/binder.c</a></td><td class='right'>3600</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 55.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 44.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/binder.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/binder.h</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/logger.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/logger.c</a></td><td class='right'>616</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/logger.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/logger.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/lowmemorykiller.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/lowmemorykiller.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/pmem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/pmem.c</a></td><td class='right'>1345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/ram_console.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/ram_console.c</a></td><td class='right'>443</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/android/ram_console.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/ram_console.h</a> (renamed from arch/arm/mach-tegra/include/mach/vmalloc.h)</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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/switch/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/switch/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/switch/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/switch/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/switch/switch.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/switch/switch.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/switch/switch_class.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/switch/switch_class.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/switch/switch_gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/switch/switch_gpio.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/timed_gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/timed_gpio.c</a></td><td class='right'>176</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='mov'><a href='/cgit/linux.git/diff/drivers/staging/android/timed_gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/timed_gpio.h</a> (renamed from arch/arm/mach-msm/include/mach/vmalloc.h)</td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/timed_output.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/timed_output.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/android/timed_output.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/android/timed_output.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/asus_oled/asus_oled.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/asus_oled/asus_oled.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/bcm/Bcmchar.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/Bcmchar.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/bcm/HandleControlPacket.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/HandleControlPacket.c</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/bcm/InterfaceDld.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/InterfaceDld.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/bcm/InterfaceIdleMode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/InterfaceIdleMode.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/bcm/InterfaceInit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/InterfaceInit.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/bcm/InterfaceMisc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/InterfaceMisc.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/bcm/Misc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/Misc.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/bcm/hostmibs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/hostmibs.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/bcm/led_control.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/led_control.c</a></td><td class='right'>1131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 8.5%;'/><td class='none' style='width: 82.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/bcm/nvm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/nvm.c</a></td><td class='right'>95</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.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/bcm/target_params.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/target_params.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/comedi_fops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/comedi_fops.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/comedi_fops.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/comedi_fops.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/addi-data/addi_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/addi-data/addi_common.c</a></td><td class='right'>137</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='/cgit/linux.git/diff/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/adl_pci7230.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/adl_pci7230.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/adl_pci7296.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/adl_pci7296.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/adl_pci7432.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/adl_pci7432.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/adl_pci8164.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/adl_pci8164.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/adl_pci9111.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/adl_pci9111.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/adv_pci1710.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/adv_pci1710.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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/adv_pci_dio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/adv_pci_dio.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.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/amplc_dio200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/amplc_dio200.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/amplc_pc236.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/amplc_pc236.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/amplc_pc263.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/amplc_pc263.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/amplc_pci224.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/amplc_pci224.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/amplc_pci230.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/amplc_pci230.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/cb_das16_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/cb_das16_cs.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/cb_pcidas.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/cb_pcidas.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/cb_pcidas64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/cb_pcidas64.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/cb_pcidda.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/cb_pcidda.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/cb_pcidio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/cb_pcidio.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.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/cb_pcimdas.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/cb_pcimdas.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/cb_pcimdda.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/cb_pcimdda.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/contec_pci_dio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/contec_pci_dio.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/daqboard2000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/daqboard2000.c</a></td><td class='right'>73</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.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/das08.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/das08.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/das08_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/das08_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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/das16m1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/das16m1.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.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/das1800.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/das1800.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/das6402.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/das6402.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.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/das800.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/das800.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/dt3000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/dt3000.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/jr3_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/jr3_pci.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/ke_counter.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/ke_counter.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/me_daq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/me_daq.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/ni_at_a2150.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/ni_at_a2150.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/ni_daq_dio24.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/ni_daq_dio24.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/ni_labpc_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/ni_labpc_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='/cgit/linux.git/diff/drivers/staging/comedi/drivers/ni_pcimio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/ni_pcimio.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/pcl816.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/pcl816.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/pcl818.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/pcl818.c</a></td><td class='right'>108</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='/cgit/linux.git/diff/drivers/staging/comedi/drivers/pcmmio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/pcmmio.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/pcmuio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/pcmuio.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/serial2002.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/serial2002.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/comedi/drivers/usbduxsigma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/usbduxsigma.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/crystalhd/bc_dts_defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/crystalhd/bc_dts_defs.h</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/cxt1e1/comet.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/comet.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/cxt1e1/comet_tables.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/comet_tables.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/cxt1e1/comet_tables.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/comet_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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/cxt1e1/libsbew.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/libsbew.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/cxt1e1/musycc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/musycc.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.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/cxt1e1/musycc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/musycc.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/cxt1e1/ossiRelease.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/ossiRelease.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/cxt1e1/pmc93x6_eeprom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/pmc93x6_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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/cxt1e1/pmcc4.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/pmcc4.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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/cxt1e1/pmcc4_cpld.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/pmcc4_cpld.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/cxt1e1/pmcc4_defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/pmcc4_defs.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/cxt1e1/pmcc4_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/pmcc4_drv.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/cxt1e1/pmcc4_ioctls.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/pmcc4_ioctls.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/cxt1e1/sbe_bid.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/sbe_bid.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/cxt1e1/sbe_promformat.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/sbe_promformat.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/cxt1e1/sbecom_inline_linux.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/sbecom_inline_linux.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/cxt1e1/sbeproc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/sbeproc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/cxt1e1/sbew_ioc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/sbew_ioc.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.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/et131x/et131x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/et131x/et131x.c</a></td><td class='right'>370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/frontier/alphatrack.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/frontier/alphatrack.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/frontier/tranzport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/frontier/tranzport.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/ft1000/ft1000-usb/ft1000_hw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/ft1000/ft1000-usb/ft1000_usb.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/gma500/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/gma500/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/gma500/accel_2d.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/gma500/accel_2d.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/gma500/cdv_intel_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/gma500/cdv_intel_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/gma500/framebuffer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/gma500/framebuffer.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/gma500/mdfld_intel_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/gma500/mdfld_intel_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/gma500/mrst_crtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/gma500/mrst_crtc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/gma500/power.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/gma500/power.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/gma500/psb_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/gma500/psb_drv.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/gma500/psb_intel_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/gma500/psb_intel_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/hv/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/hv/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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/hv/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/hv/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/hv/TODO?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/hv/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/hv/storvsc_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/hv/storvsc_drv.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/Documentation/generic_buffer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/Documentation/generic_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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/Documentation/iio_utils.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/Documentation/iio_utils.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/Documentation/ring.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/Documentation/ring.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/Documentation/sysfs-bus-iio?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/Documentation/sysfs-bus-iio</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/staging/iio/accel/adis16201_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/accel/adis16201_core.c</a></td><td class='right'>49</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='/cgit/linux.git/diff/drivers/staging/iio/accel/adis16201_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/accel/adis16201_ring.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/accel/adis16203_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/accel/adis16203_core.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/accel/adis16203_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/accel/adis16203_ring.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/accel/adis16204_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/accel/adis16204_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.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/accel/adis16204_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/accel/adis16204_ring.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/accel/adis16209_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/accel/adis16209_core.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/accel/adis16209_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/accel/adis16209_ring.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/accel/adis16220_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/accel/adis16220_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.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/accel/adis16240_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/accel/adis16240_core.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/accel/adis16240_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/accel/adis16240_ring.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/accel/kxsd9.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/accel/kxsd9.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.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/accel/lis3l02dq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/accel/lis3l02dq.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/accel/lis3l02dq_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/accel/lis3l02dq_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.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/accel/lis3l02dq_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/accel/lis3l02dq_ring.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.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='/cgit/linux.git/diff/drivers/staging/iio/accel/sca3000_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/accel/sca3000_core.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.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/accel/sca3000_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/accel/sca3000_ring.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7192.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7192.c</a></td><td class='right'>97</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='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7280a.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7280a.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7291.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7291.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7298.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7298.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7298_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7298_core.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7298_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7298_ring.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.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='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7476.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7476.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7476_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7476_core.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7476_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7476_ring.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7606.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7606.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7606_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7606_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7606_par.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7606_par.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7606_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7606_ring.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7606_spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7606_spi.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7780.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7780.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7793.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7793.c</a></td><td class='right'>108</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='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7816.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7816.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7887.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7887.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7887_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7887_core.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad7887_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad7887_ring.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.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='/cgit/linux.git/diff/drivers/staging/iio/adc/ad799x.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad799x.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad799x_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad799x_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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/ad799x_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/ad799x_ring.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.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='/cgit/linux.git/diff/drivers/staging/iio/adc/adt7310.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/adt7310.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/adt7410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/adt7410.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/max1363.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/max1363.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/adc/max1363_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/max1363_core.c</a></td><td class='right'>92</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='/cgit/linux.git/diff/drivers/staging/iio/adc/max1363_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/adc/max1363_ring.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: 1.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/addac/adt7316-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/addac/adt7316-i2c.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/addac/adt7316-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/addac/adt7316-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.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/addac/adt7316.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/addac/adt7316.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='mov'><a href='/cgit/linux.git/diff/drivers/staging/iio/buffer.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/buffer.h</a> (renamed from drivers/staging/iio/buffer_generic.h)</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.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='/cgit/linux.git/diff/drivers/staging/iio/cdc/ad7150.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/cdc/ad7150.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/cdc/ad7152.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/cdc/ad7152.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.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='/cgit/linux.git/diff/drivers/staging/iio/cdc/ad7746.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/cdc/ad7746.c</a></td><td class='right'>64</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='del'><a href='/cgit/linux.git/diff/drivers/staging/iio/chrdev.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/chrdev.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dac/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dac/Kconfig</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dac/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dac/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dac/ad5064.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dac/ad5064.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dac/ad5360.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dac/ad5360.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/iio/dac/ad5380.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dac/ad5380.c</a></td><td class='right'>676</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/iio/dac/ad5421.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dac/ad5421.c</a></td><td class='right'>555</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/iio/dac/ad5421.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dac/ad5421.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dac/ad5446.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dac/ad5446.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dac/ad5446.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dac/ad5446.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dac/ad5504.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dac/ad5504.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dac/ad5504.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dac/ad5504.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dac/ad5624r.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dac/ad5624r.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dac/ad5624r_spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dac/ad5624r_spi.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dac/ad5686.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dac/ad5686.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/iio/dac/ad5764.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dac/ad5764.c</a></td><td class='right'>393</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dac/ad5791.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dac/ad5791.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dac/max517.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dac/max517.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dds/ad5930.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dds/ad5930.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dds/ad9832.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dds/ad9832.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dds/ad9834.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dds/ad9834.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dds/ad9850.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dds/ad9850.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dds/ad9852.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dds/ad9852.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dds/ad9910.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dds/ad9910.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/dds/ad9951.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/dds/ad9951.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/iio/events.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/events.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/gyro/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/gyro/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/gyro/adis16060_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/gyro/adis16060_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/gyro/adis16080_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/gyro/adis16080_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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/gyro/adis16130_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/gyro/adis16130_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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/gyro/adis16260_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/gyro/adis16260_core.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/gyro/adis16260_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/gyro/adis16260_ring.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/gyro/adxrs450.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/gyro/adxrs450.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/gyro/adxrs450_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/gyro/adxrs450_core.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/iio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/iio.h</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/iio_core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/iio_core.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/iio_core_trigger.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/iio_core_trigger.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/iio_dummy_evgen.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/iio_dummy_evgen.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/iio_simple_dummy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/iio_simple_dummy.c</a></td><td class='right'>49</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='/cgit/linux.git/diff/drivers/staging/iio/iio_simple_dummy_buffer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/iio_simple_dummy_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/iio_simple_dummy_events.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/iio_simple_dummy_events.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/impedance-analyzer/ad5933.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/impedance-analyzer/ad5933.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/imu/adis16400.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/imu/adis16400.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/imu/adis16400_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/imu/adis16400_core.c</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/imu/adis16400_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/imu/adis16400_ring.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/industrialio-buffer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/industrialio-buffer.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/industrialio-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/industrialio-core.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/industrialio-trigger.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/industrialio-trigger.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/kfifo_buf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/kfifo_buf.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.9%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/kfifo_buf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/kfifo_buf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/light/isl29018.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/light/isl29018.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/light/tsl2563.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/light/tsl2563.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/light/tsl2583.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/light/tsl2583.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/magnetometer/ak8975.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/magnetometer/ak8975.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/magnetometer/hmc5843.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/magnetometer/hmc5843.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/meter/ade7753.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/meter/ade7753.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/meter/ade7754.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/meter/ade7754.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/meter/ade7758_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/meter/ade7758_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.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='/cgit/linux.git/diff/drivers/staging/iio/meter/ade7758_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/meter/ade7758_ring.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/meter/ade7759.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/meter/ade7759.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/meter/ade7854-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/meter/ade7854-i2c.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/meter/ade7854-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/meter/ade7854-spi.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/resolver/ad2s1200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/resolver/ad2s1200.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/resolver/ad2s1210.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/resolver/ad2s1210.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/resolver/ad2s90.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/resolver/ad2s90.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/ring_sw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/ring_sw.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/ring_sw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/ring_sw.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/sysfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/sysfs.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.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/trigger.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/trigger.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/trigger/iio-trig-periodic-rtc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/iio/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/iio/types.h</a></td><td class='right'>49</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='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/TODO?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/intel_sst.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intel_sst.c</a></td><td class='right'>649</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.0%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/intel_sst.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intel_sst.h</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/intel_sst_app_interface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intel_sst_app_interface.c</a></td><td class='right'>1460</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 22.4%;'/><td class='none' style='width: 77.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/intel_sst_common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intel_sst_common.h</a></td><td class='right'>623</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='/cgit/linux.git/diff/drivers/staging/intel_sst/intel_sst_drv_interface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intel_sst_drv_interface.c</a></td><td class='right'>564</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='/cgit/linux.git/diff/drivers/staging/intel_sst/intel_sst_dsp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intel_sst_dsp.c</a></td><td class='right'>496</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.6%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/intel_sst_fw_ipc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intel_sst_fw_ipc.h</a></td><td class='right'>416</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='/cgit/linux.git/diff/drivers/staging/intel_sst/intel_sst_ioctl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intel_sst_ioctl.h</a></td><td class='right'>440</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.8%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/intel_sst_ipc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intel_sst_ipc.c</a></td><td class='right'>774</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.9%;'/><td class='none' style='width: 88.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/intel_sst_pvt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intel_sst_pvt.c</a></td><td class='right'>313</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='/cgit/linux.git/diff/drivers/staging/intel_sst/intel_sst_stream.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intel_sst_stream.c</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: 8.9%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/intel_sst_stream_encoded.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intel_sst_stream_encoded.c</a></td><td class='right'>1273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 19.5%;'/><td class='none' style='width: 80.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/intelmid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intelmid.c</a></td><td class='right'>1022</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 15.7%;'/><td class='none' style='width: 84.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/intelmid.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intelmid.h</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/intelmid_adc_control.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intelmid_adc_control.h</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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='/cgit/linux.git/diff/drivers/staging/intel_sst/intelmid_ctrl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intelmid_ctrl.c</a></td><td class='right'>921</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.1%;'/><td class='none' style='width: 85.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/intelmid_msic_control.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intelmid_msic_control.c</a></td><td class='right'>1047</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 16.1%;'/><td class='none' style='width: 83.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/intelmid_pvt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intelmid_pvt.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: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/intelmid_snd_control.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intelmid_snd_control.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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='/cgit/linux.git/diff/drivers/staging/intel_sst/intelmid_v0_control.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intelmid_v0_control.c</a></td><td class='right'>866</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.3%;'/><td class='none' style='width: 86.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/intelmid_v1_control.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intelmid_v1_control.c</a></td><td class='right'>978</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 15.0%;'/><td class='none' style='width: 85.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/intel_sst/intelmid_v2_control.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/intel_sst/intelmid_v2_control.c</a></td><td class='right'>1156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 17.7%;'/><td class='none' style='width: 82.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/keucr/smilmain.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/keucr/smilmain.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/keucr/usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/keucr/usb.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/line6/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/line6/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/line6/capture.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/line6/capture.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/line6/capture.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/line6/capture.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/line6/driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/line6/driver.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/line6/driver.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/line6/driver.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/line6/midi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/line6/midi.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/line6/midi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/line6/midi.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/line6/pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/line6/pcm.c</a></td><td class='right'>115</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='/cgit/linux.git/diff/drivers/staging/line6/pcm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/line6/pcm.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/line6/playback.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/line6/playback.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/line6/playback.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/line6/playback.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/line6/pod.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/line6/pod.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/line6/podhd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/line6/podhd.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/line6/podhd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/line6/podhd.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/line6/revision.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/line6/revision.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/line6/toneport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/line6/toneport.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/line6/usbdefs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/line6/usbdefs.h</a></td><td class='right'>91</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='/cgit/linux.git/diff/drivers/staging/line6/variax.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/line6/variax.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/as102/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/as102/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='/cgit/linux.git/diff/drivers/staging/media/as102/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/as102/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/as102/as102_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/as102/as102_drv.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/as102/as102_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/as102/as102_drv.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.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='/cgit/linux.git/diff/drivers/staging/media/as102/as102_fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/as102/as102_fe.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/as102/as102_fw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/as102/as102_fw.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/as102/as102_fw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/as102/as102_fw.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/as102/as102_usb_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/as102/as102_usb_drv.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/as102/as102_usb_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/as102/as102_usb_drv.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/as102/as10x_cmd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/as102/as10x_cmd.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/as102/as10x_cmd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/as102/as10x_cmd.h</a></td><td class='right'>895</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 7.0%;'/><td class='none' style='width: 86.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/as102/as10x_cmd_cfg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/as102/as10x_cmd_cfg.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/as102/as10x_cmd_stream.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/as102/as10x_cmd_stream.c</a></td><td class='right'>56</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='/cgit/linux.git/diff/drivers/staging/media/as102/as10x_handle.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/as102/as10x_handle.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/as102/as10x_types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/as102/as10x_types.h</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/dt3155v4l/dt3155v4l.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/dt3155v4l/dt3155v4l.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/easycap/easycap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/easycap/easycap.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/easycap/easycap_ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/easycap/easycap_ioctl.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/easycap/easycap_low.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/easycap/easycap_low.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/easycap/easycap_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/easycap/easycap_main.c</a></td><td class='right'>379</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/easycap/easycap_settings.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/easycap/easycap_settings.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/easycap/easycap_sound.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/easycap/easycap_sound.c</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/go7007/go7007-usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/go7007/go7007-usb.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.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/go7007/snd-go7007.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/go7007/snd-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='/cgit/linux.git/diff/drivers/staging/media/lirc/lirc_bt829.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/lirc/lirc_bt829.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/lirc/lirc_igorplugusb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/lirc/lirc_igorplugusb.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/lirc/lirc_imon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/lirc/lirc_imon.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/lirc/lirc_parallel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/lirc/lirc_parallel.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/lirc/lirc_sasem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/lirc/lirc_sasem.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/lirc/lirc_serial.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/lirc/lirc_serial.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/lirc/lirc_sir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/lirc/lirc_sir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/lirc/lirc_ttusbir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/lirc/lirc_ttusbir.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/lirc/lirc_zilog.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/lirc/lirc_zilog.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/media/solo6x10/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/solo6x10/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='/cgit/linux.git/diff/drivers/staging/media/solo6x10/solo6x10-jpeg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/solo6x10/solo6x10-jpeg.h</a> (renamed from drivers/staging/media/solo6x10/jpeg.h)</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='/cgit/linux.git/diff/drivers/staging/media/solo6x10/v4l2-enc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/media/solo6x10/v4l2-enc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/mei/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/mei/init.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.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='/cgit/linux.git/diff/drivers/staging/mei/interface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/mei/interface.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/mei/interface.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/mei/interface.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/mei/interrupt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/mei/interrupt.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/mei/iorw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/mei/iorw.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/mei/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/mei/main.c</a></td><td class='right'>576</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/mei/mei.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/mei/mei.txt</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/mei/mei_dev.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/mei/mei_dev.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/mei/wd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/mei/wd.c</a></td><td class='right'>32</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='/cgit/linux.git/diff/drivers/staging/nvec/nvec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/nvec/nvec.c</a></td><td class='right'>30</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='/cgit/linux.git/diff/drivers/staging/octeon/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/octeon/cvmx-packet.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-packet.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: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/octeon/cvmx-smix-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-smix-defs.h</a></td><td class='right'>178</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='upd'><a href='/cgit/linux.git/diff/drivers/staging/octeon/ethernet-defines.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/ethernet-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='/cgit/linux.git/diff/drivers/staging/octeon/ethernet-mdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/ethernet-mdio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/octeon/ethernet-mem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/ethernet-mem.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/octeon/ethernet-rgmii.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/ethernet-rgmii.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/octeon/ethernet-rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/ethernet-rx.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/octeon/ethernet-rx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/ethernet-rx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/octeon/ethernet-sgmii.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/ethernet-sgmii.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/octeon/ethernet-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/ethernet-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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/octeon/ethernet-tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/ethernet-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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/octeon/ethernet-xaui.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/ethernet-xaui.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/octeon/ethernet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/ethernet.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/olpc_dcon/olpc_dcon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/olpc_dcon/olpc_dcon.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/olpc_dcon/olpc_dcon.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/olpc_dcon/olpc_dcon.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/olpc_dcon/olpc_dcon_xo_1.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/Kconfig</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/TODO?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/TODO</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/omap_connector.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/omap_connector.c</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/omap_crtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/omap_crtc.c</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/omap_debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/omap_debugfs.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/omap_dmm_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/omap_dmm_priv.h</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/omap_dmm_tiler.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/omap_dmm_tiler.c</a></td><td class='right'>830</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/omap_dmm_tiler.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/omap_dmm_tiler.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/omap_drm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/omap_drm.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/omap_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/omap_drv.c</a></td><td class='right'>821</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/omap_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/omap_drv.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/omap_encoder.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/omap_encoder.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/omap_fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/omap_fb.c</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/omap_fbdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/omap_fbdev.c</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/omap_gem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/omap_gem.c</a></td><td class='right'>1231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/omap_gem_helpers.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/omap_gem_helpers.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/omap_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/omap_priv.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/tcm-sita.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/tcm-sita.c</a></td><td class='right'>703</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/tcm-sita.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/tcm-sita.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/omapdrm/tcm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/omapdrm/tcm.h</a></td><td class='right'>326</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='upd'><a href='/cgit/linux.git/diff/drivers/staging/phison/phison.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/phison/phison.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/pohmelfs/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/pohmelfs/dir.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/pohmelfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/pohmelfs/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/pohmelfs/netfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/pohmelfs/netfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/quatech_usb2/quatech_usb2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/quatech_usb2/quatech_usb2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/Kconfig</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/Makefile</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.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/dot11d.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/dot11d.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/dot11d.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/dot11d.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8190P_def.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/r8190P_def.h</a> (renamed from drivers/staging/rtl8192e/r8190P_def.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c</a> (renamed from drivers/staging/rtl8192e/r8190P_rtl8256.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='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h</a> (renamed from drivers/staging/rtl8192e/r8190P_rtl8256.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c</a> (renamed from drivers/staging/rtl8192e/r8192E_cmdpkt.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='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h</a> (renamed from drivers/staging/rtl8192e/r8192E_cmdpkt.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c</a> (renamed from drivers/staging/rtl8192e/r8192E_dev.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='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h</a> (renamed from drivers/staging/rtl8192e/r8192E_dev.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c</a> (renamed from drivers/staging/rtl8192e/r8192E_firmware.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='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h</a> (renamed from drivers/staging/rtl8192e/r8192E_firmware.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h</a> (renamed from drivers/staging/rtl8192e/r8192E_hw.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c</a> (renamed from drivers/staging/rtl8192e/r8192E_hwimg.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='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h</a> (renamed from drivers/staging/rtl8192e/r8192E_hwimg.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c</a> (renamed from drivers/staging/rtl8192e/r8192E_phy.c)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h</a> (renamed from drivers/staging/rtl8192e/r8192E_phy.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h</a> (renamed from drivers/staging/rtl8192e/r8192E_phyreg.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h</a> (renamed from drivers/staging/rtl8192e/r819xE_phyreg.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_cam.c</a> (renamed from drivers/staging/rtl8192e/rtl_cam.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='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_cam.h</a> (renamed from drivers/staging/rtl8192e/rtl_cam.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_core.c</a> (renamed from drivers/staging/rtl8192e/rtl_core.c)</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: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_core.h</a> (renamed from drivers/staging/rtl8192e/rtl_core.h)</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.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_crypto.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_crypto.h</a> (renamed from drivers/staging/rtl8192e/rtl_crypto.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_debug.c</a> (renamed from drivers/staging/rtl8192e/rtl_debug.c)</td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_dm.c</a> (renamed from drivers/staging/rtl8192e/rtl_dm.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='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_dm.h</a> (renamed from drivers/staging/rtl8192e/rtl_dm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c</a> (renamed from drivers/staging/rtl8192e/rtl_eeprom.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='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h</a> (renamed from drivers/staging/rtl8192e/rtl_eeprom.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c</a> (renamed from drivers/staging/rtl8192e/rtl_ethtool.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='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_pci.c</a> (renamed from drivers/staging/rtl8192e/rtl_pci.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='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_pci.h</a> (renamed from drivers/staging/rtl8192e/rtl_pci.h)</td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_pm.c</a> (renamed from drivers/staging/rtl8192e/rtl_pm.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_pm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_pm.h</a> (renamed from drivers/staging/rtl8192e/rtl_pm.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_ps.c</a> (renamed from drivers/staging/rtl8192e/rtl_ps.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='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_ps.h</a> (renamed from drivers/staging/rtl8192e/rtl_ps.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_wx.c</a> (renamed from drivers/staging/rtl8192e/rtl_wx.c)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl8192e/rtl_wx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl8192e/rtl_wx.h</a> (renamed from drivers/staging/rtl8192e/rtl_wx.h)</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='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl819x_BAProc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl819x_BAProc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl819x_HTProc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl819x_HTProc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl819x_TSProc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl819x_TSProc.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='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtl_debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtl_debug.h</a></td><td class='right'>299</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='upd'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtllib.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtllib.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtllib_crypt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtllib_crypt.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtllib_crypt.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtllib_crypt.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.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='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtllib_crypt_ccmp.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtllib_crypt_tkip.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtllib_crypt_tkip.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.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtllib_crypt_wep.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtllib_crypt_wep.c</a></td><td class='right'>25</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='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtllib_debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtllib_debug.h</a></td><td class='right'>86</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='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtllib_module.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtllib_module.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtllib_rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtllib_rx.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtllib_softmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtllib_softmac.c</a></td><td class='right'>96</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.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtllib_softmac_wx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtllib_softmac_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.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtllib_tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtllib_tx.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192e/rtllib_wx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192e/rtllib_wx.c</a></td><td class='right'>109</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='del'><a href='/cgit/linux.git/diff/drivers/staging/rtl8192u/ieee80211/api.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8192u/ieee80211/api.c</a></td><td class='right'>244</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='/cgit/linux.git/diff/drivers/staging/rtl8712/rtl871x_mlme.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rtl8712/rtl871x_mlme.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rts5139/rts51x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rts5139/rts51x.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rts5139/rts51x.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rts5139/rts51x.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rts5139/rts51x_transport.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rts5139/rts51x_transport.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/rts_pstor/rtsx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/rts_pstor/rtsx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/sep/sep_driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/sep/sep_driver.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/serial/68360serial.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/serial/68360serial.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/serqt_usb2/serqt_usb2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/serqt_usb2/serqt_usb2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/sm7xx/smtcfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/sm7xx/smtcfb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/speakup/kobjects.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/speakup/kobjects.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/speakup/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/speakup/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/speakup/speakup.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/speakup/speakup.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/speakup/synth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/speakup/synth.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/spectra/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/Kconfig</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/spectra/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/spectra/README?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/README</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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/spectra/ffsdefs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/ffsdefs.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.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/spectra/ffsport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/ffsport.c</a></td><td class='right'>834</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 12.8%;'/><td class='none' style='width: 87.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/spectra/ffsport.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/ffsport.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: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/spectra/flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/flash.c</a></td><td class='right'>4305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 66.1%;'/><td class='none' style='width: 33.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/spectra/flash.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/flash.h</a></td><td class='right'>198</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='/cgit/linux.git/diff/drivers/staging/spectra/lld.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/lld.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: 5.2%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/spectra/lld.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/lld.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: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/spectra/lld_cdma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/lld_cdma.c</a></td><td class='right'>910</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.0%;'/><td class='none' style='width: 86.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/spectra/lld_cdma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/lld_cdma.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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='/cgit/linux.git/diff/drivers/staging/spectra/lld_emu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/lld_emu.c</a></td><td class='right'>776</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.9%;'/><td class='none' style='width: 88.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/spectra/lld_emu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/lld_emu.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.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/spectra/lld_mtd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/lld_mtd.c</a></td><td class='right'>683</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='/cgit/linux.git/diff/drivers/staging/spectra/lld_mtd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/lld_mtd.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.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/spectra/lld_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/lld_nand.c</a></td><td class='right'>2619</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 40.2%;'/><td class='none' style='width: 59.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/spectra/lld_nand.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/lld_nand.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/spectra/nand_regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/nand_regs.h</a></td><td class='right'>619</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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='/cgit/linux.git/diff/drivers/staging/spectra/spectraswconfig.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/spectra/spectraswconfig.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: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/tidspbridge/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/tidspbridge/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/tidspbridge/rmgr/dbdcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/tidspbridge/rmgr/dbdcd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/usbip/stub_dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/usbip/stub_dev.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/usbip/stub_rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/usbip/stub_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='/cgit/linux.git/diff/drivers/staging/usbip/usbip_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/usbip/usbip_common.c</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.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='/cgit/linux.git/diff/drivers/staging/usbip/usbip_common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/usbip/usbip_common.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/usbip/vhci_rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/usbip/vhci_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='/cgit/linux.git/diff/drivers/staging/vme/TODO?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vme/TODO</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: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vme/bridges/vme_ca91cx42.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vme/bridges/vme_ca91cx42.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vme/bridges/vme_tsi148.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vme/bridges/vme_tsi148.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vme/devices/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vme/devices/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vme/devices/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vme/devices/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/vme/devices/vme_pio2.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vme/devices/vme_pio2.h</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/vme/devices/vme_pio2_cntr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vme/devices/vme_pio2_cntr.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/staging/vme/devices/vme_pio2_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vme/devices/vme_pio2_core.c</a></td><td class='right'>524</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='/cgit/linux.git/diff/drivers/staging/vme/devices/vme_pio2_gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vme/devices/vme_pio2_gpio.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vme/devices/vme_user.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vme/devices/vme_user.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vme/vme.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vme/vme.c</a></td><td class='right'>69</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='/cgit/linux.git/diff/drivers/staging/vme/vme.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vme/vme.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vme/vme_api.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vme/vme_api.txt</a></td><td class='right'>61</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='/cgit/linux.git/diff/drivers/staging/vme/vme_bridge.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vme/vme_bridge.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vt6655/device_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vt6655/device_main.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vt6655/ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vt6655/ioctl.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vt6655/iwctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vt6655/iwctl.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vt6655/iwctl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vt6655/iwctl.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vt6656/80211mgr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vt6656/80211mgr.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vt6656/baseband.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vt6656/baseband.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.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='/cgit/linux.git/diff/drivers/staging/vt6656/bssdb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vt6656/bssdb.c</a></td><td class='right'>100</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='/cgit/linux.git/diff/drivers/staging/vt6656/card.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vt6656/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.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vt6656/card.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vt6656/card.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vt6656/int.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vt6656/int.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vt6656/int.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/staging/vt6656/ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vt6656/ioctl.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vt6656/iwctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vt6656/iwctl.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vt6656/iwctl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vt6656/iwctl.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vt6656/mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vt6656/mac.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vt6656/mac.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vt6656/mac.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/vt6656/main_usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/vt6656/main_usb.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/winbond/wbusb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/winbond/wbusb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/debug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/dhfcfg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/dhfcfg.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/hcf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/hcf.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/hcf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/hcf.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/hcfcfg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/hcfcfg.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/hcfdef.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/hcfdef.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/mdd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/mdd.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/mmd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/mmd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/mmd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/mmd.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_cs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_cs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_enc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_enc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_enc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_enc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_if.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_if.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_internal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_main.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_main.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_netdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_netdev.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_netdev.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_pci.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_pci.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_priv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_priv.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_profile.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_profile.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_profile.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_profile.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_util.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_util.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_util.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_util.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_version.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_wext.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_wext.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlags49_h2/wl_wext.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlags49_h2/wl_wext.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/wlan-ng/prism2usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/wlan-ng/prism2usb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/xgifb/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/xgifb/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/xgifb/XGI_main.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/xgifb/XGI_main.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/xgifb/XGI_main_26.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/xgifb/XGI_main_26.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/xgifb/XGIfb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/xgifb/XGIfb.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/xgifb/vb_ext.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/xgifb/vb_ext.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.8%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/staging/xgifb/vb_ext.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/xgifb/vb_ext.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/xgifb/vb_init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/xgifb/vb_init.c</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/xgifb/vb_setmode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/xgifb/vb_setmode.c</a></td><td class='right'>1003</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 11.0%;'/><td class='none' style='width: 84.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/xgifb/vb_setmode.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/xgifb/vb_setmode.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/xgifb/vb_struct.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/xgifb/vb_struct.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/xgifb/vb_table.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/xgifb/vb_table.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/xgifb/vgatypes.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/xgifb/vgatypes.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/zcache/zcache-main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/zcache/zcache-main.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/staging/zram/zram_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/zram/zram_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='/cgit/linux.git/diff/drivers/staging/zram/zram_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/zram/zram_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/iscsi/iscsi_target.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/iscsi/iscsi_target.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/iscsi/iscsi_target_auth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/iscsi/iscsi_target_auth.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/iscsi/iscsi_target_configfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/iscsi/iscsi_target_configfs.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/iscsi/iscsi_target_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/iscsi/iscsi_target_device.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/iscsi/iscsi_target_erl0.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/iscsi/iscsi_target_erl0.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/iscsi/iscsi_target_erl1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/iscsi/iscsi_target_erl1.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/iscsi/iscsi_target_erl2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/iscsi/iscsi_target_erl2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/iscsi/iscsi_target_login.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/iscsi/iscsi_target_login.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/iscsi/iscsi_target_nego.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/iscsi/iscsi_target_nego.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/iscsi/iscsi_target_nodeattrib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/iscsi/iscsi_target_nodeattrib.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/iscsi/iscsi_target_stat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/iscsi/iscsi_target_stat.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/iscsi/iscsi_target_tmr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/iscsi/iscsi_target_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='/cgit/linux.git/diff/drivers/target/iscsi/iscsi_target_tpg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/iscsi/iscsi_target_tpg.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/iscsi/iscsi_target_util.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/iscsi/iscsi_target_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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/loopback/tcm_loop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/loopback/tcm_loop.c</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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/loopback/tcm_loop.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/loopback/tcm_loop.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/target_core_alua.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_alua.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/target_core_cdb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_cdb.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/target/target_core_cdb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_cdb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/target_core_configfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_configfs.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/target_core_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_device.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/target_core_fabric_configfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_fabric_configfs.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/target_core_fabric_lib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_fabric_lib.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/target_core_file.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_file.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/target_core_hba.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_hba.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/target/target_core_hba.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_hba.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/target_core_iblock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_iblock.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/target/target_core_internal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_internal.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/target_core_pr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_pr.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/target_core_pr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_pr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/target_core_pscsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_pscsi.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/target_core_rd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_rd.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/target_core_stat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_stat.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/target/target_core_stat.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_stat.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/target_core_tmr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_tmr.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/target_core_tpg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_tpg.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/target_core_transport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_transport.c</a></td><td class='right'>343</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.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/target_core_ua.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/target_core_ua.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/tcm_fc/tfc_cmd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/tcm_fc/tfc_cmd.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.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='/cgit/linux.git/diff/drivers/target/tcm_fc/tfc_conf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/tcm_fc/tfc_conf.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/tcm_fc/tfc_io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/tcm_fc/tfc_io.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/target/tcm_fc/tfc_sess.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/target/tcm_fc/tfc_sess.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/n_hdlc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/n_hdlc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/n_tty.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/n_tty.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/pty.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/pty.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/rocket.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/rocket.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/8250.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/8250.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: 1.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/8250.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/8250.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/8250_dw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/8250_dw.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/tty/serial/8250_fsl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/8250_fsl.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/8250_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/8250_pci.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/Kconfig</a></td><td class='right'>106</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.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/amba-pl010.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/amba-pl010.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/amba-pl011.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/amba-pl011.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/apbuart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/apbuart.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/tty/serial/ar933x_uart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/ar933x_uart.c</a></td><td class='right'>688</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/atmel_serial.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/atmel_serial.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/bfin_sport_uart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/bfin_sport_uart.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/bfin_sport_uart.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/bfin_sport_uart.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/bfin_uart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/bfin_uart.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/ifx6x60.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/ifx6x60.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/imx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/imx.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/m32r_sio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/m32r_sio.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/max3100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/max3100.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/max3107-aava.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/max3107-aava.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/max3107.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/max3107.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/mfd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/mfd.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/mrst_max3110.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/mrst_max3110.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/msm_serial_hs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/msm_serial_hs.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/mxs-auart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/mxs-auart.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/omap-serial.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/omap-serial.c</a></td><td class='right'>430</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/pch_uart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/pch_uart.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/pmac_zilog.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/pmac_zilog.c</a></td><td class='right'>423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/pmac_zilog.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/pmac_zilog.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/tty/serial/s3c2410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/s3c2410.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/tty/serial/s3c2412.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/s3c2412.c</a></td><td class='right'>149</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='/cgit/linux.git/diff/drivers/tty/serial/s3c2440.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/s3c2440.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/tty/serial/s3c6400.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/s3c6400.c</a></td><td class='right'>149</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='/cgit/linux.git/diff/drivers/tty/serial/s5pv210.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/s5pv210.c</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: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/samsung.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/samsung.c</a></td><td class='right'>639</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/samsung.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/samsung.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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/sc26xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/sc26xx.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/serial_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/serial_core.c</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/serial_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/serial_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/sh-sci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/sh-sci.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.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='/cgit/linux.git/diff/drivers/tty/serial/sh-sci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/sh-sci.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/tty/serial/sirfsoc_uart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/sirfsoc_uart.c</a></td><td class='right'>783</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/tty/serial/sirfsoc_uart.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/sirfsoc_uart.h</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/timbuart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/timbuart.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/serial/ucc_uart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/ucc_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='/cgit/linux.git/diff/drivers/tty/serial/vr41xx_siu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/serial/vr41xx_siu.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/synclink.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/synclink.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/synclinkmp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/synclinkmp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/sysrq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/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='/cgit/linux.git/diff/drivers/tty/tty_io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/tty_io.c</a></td><td class='right'>311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/tty_ldisc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/tty_ldisc.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tty/vt/consolemap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/tty/vt/consolemap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/uio/uio_pci_generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/uio/uio_pci_generic.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/uio/uio_pdrv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/uio/uio_pdrv.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/uio/uio_pdrv_genirq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/uio/uio_pdrv_genirq.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/uio/uio_pruss.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/uio/uio_pruss.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/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='/cgit/linux.git/diff/drivers/usb/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/atm/cxacru.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/atm/cxacru.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/atm/speedtch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/atm/speedtch.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/atm/ueagle-atm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/atm/ueagle-atm.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/c67x00/c67x00-drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/c67x00/c67x00-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.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/c67x00/c67x00-hcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/c67x00/c67x00-hcd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/class/cdc-acm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/class/cdc-acm.c</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><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='/cgit/linux.git/diff/drivers/usb/class/cdc-acm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/class/cdc-acm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/class/cdc-wdm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/class/cdc-wdm.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/class/usblp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/class/usblp.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/class/usbtmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/class/usbtmc.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/devio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/core/devio.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.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='/cgit/linux.git/diff/drivers/usb/core/driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/core/driver.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.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/file.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/core/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='/cgit/linux.git/diff/drivers/usb/core/hcd-pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/core/hcd-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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/hcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/core/hcd.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/hub.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/core/hub.c</a></td><td class='right'>97</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='/cgit/linux.git/diff/drivers/usb/core/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/core/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.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/quirks.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/core/quirks.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/core/sysfs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/core/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/usb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/core/usb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/dwc3/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/dwc3/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/dwc3/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/dwc3/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/dwc3/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/dwc3/core.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/dwc3/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/dwc3/core.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/dwc3/debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/dwc3/debugfs.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/dwc3/dwc3-omap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/dwc3/dwc3-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.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/dwc3/dwc3-pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/dwc3/dwc3-pci.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.7%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/dwc3/ep0.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/dwc3/ep0.c</a></td><td class='right'>160</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='/cgit/linux.git/diff/drivers/usb/dwc3/gadget.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/dwc3/gadget.c</a></td><td class='right'>440</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/dwc3/gadget.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/dwc3/gadget.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/dwc3/host.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/dwc3/host.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/dwc3/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/dwc3/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='/cgit/linux.git/diff/drivers/usb/gadget/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/Kconfig</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/amd5536udc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/amd5536udc.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/at91_udc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/at91_udc.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/atmel_usba_udc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/atmel_usba_udc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/ci13xxx_udc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/ci13xxx_udc.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/ci13xxx_udc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/ci13xxx_udc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/composite.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/composite.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/dbgp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/dbgp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/dummy_hcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/dummy_hcd.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/epautoconf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/epautoconf.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/ether.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/ether.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/f_fs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/f_fs.c</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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/f_mass_storage.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/f_mass_storage.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/f_phonet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/f_phonet.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/file_storage.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/file_storage.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/fsl_qe_udc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/fsl_qe_udc.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/fsl_udc_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/fsl_udc_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/fusb300_udc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/fusb300_udc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/goku_udc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/goku_udc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/imx_udc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/imx_udc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/inode.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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/langwell_udc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/langwell_udc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/m66592-udc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/m66592-udc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/mv_udc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/mv_udc.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/mv_udc_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/mv_udc_core.c</a></td><td class='right'>344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/net2272.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/net2272.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/net2280.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/net2280.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/omap_udc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/omap_udc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/pch_udc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/pch_udc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/printer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/printer.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/pxa25x_udc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/pxa25x_udc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/pxa27x_udc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/pxa27x_udc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/r8a66597-udc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/r8a66597-udc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/s3c-hsotg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/s3c-hsotg.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/s3c-hsudc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/s3c-hsudc.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/s3c2410_udc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/s3c2410_udc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/s3c2410_udc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/s3c2410_udc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/serial.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/serial.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/udc-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/udc-core.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/usbstring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/usbstring.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: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/zero.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/gadget/zero.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/alchemy-common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/alchemy-common.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-ath79.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ehci-ath79.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-au1xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ehci-au1xxx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-hcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ehci-hcd.c</a></td><td class='right'>71</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='add'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-mv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ehci-mv.c</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-octeon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ehci-octeon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-omap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ehci-omap.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-orion.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ehci-orion.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-ps3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ehci-ps3.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-pxa168.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ehci-pxa168.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-q.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ehci-q.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-s5p.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ehci-s5p.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-tegra.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ehci-tegra.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-vt8500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ehci-vt8500.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-w90x900.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ehci-w90x900.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-xilinx-of.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ehci-xilinx-of.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-xls.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ehci-xls.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/fhci-hcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/fhci-hcd.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/fsl-mph-dr-of.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/fsl-mph-dr-of.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/hwa-hc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/hwa-hc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/imx21-hcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/imx21-hcd.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/isp1760-hcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/isp1760-hcd.c</a></td><td class='right'>74</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.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/isp1760-if.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/isp1760-if.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-at91.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci-at91.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-au1xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci-au1xxx.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-dbg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci-dbg.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-ep93xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci-ep93xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-exynos.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci-exynos.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-hcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci-hcd.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-hub.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci-hub.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-omap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci-omap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-omap3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci-omap3.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci-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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-pxa27x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci-pxa27x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-q.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci-q.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-s3c2410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci-s3c2410.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-sh.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci-sh.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-sm501.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci-sm501.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-spear.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci-spear.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-tmio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci-tmio.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-xls.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci-xls.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/ohci.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/oxu210hp-hcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/oxu210hp-hcd.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/u132-hcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/u132-hcd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/uhci-hcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/uhci-hcd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/uhci-q.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/uhci-q.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/whci/qset.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/whci/qset.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/xhci-hub.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/xhci-hub.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/xhci-mem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/xhci-mem.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/xhci-ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/xhci-ring.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: 1.2%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/xhci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/xhci.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/xhci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/host/xhci.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/image/microtek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/image/microtek.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/adutux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/misc/adutux.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/cypress_cy7c63.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/misc/cypress_cy7c63.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/cytherm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/misc/cytherm.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/emi26.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/misc/emi26.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/emi62.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/misc/emi62.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/ftdi-elan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/misc/ftdi-elan.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/idmouse.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/misc/idmouse.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/iowarrior.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/misc/iowarrior.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/isight_firmware.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/misc/isight_firmware.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/ldusb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/misc/ldusb.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/legousbtower.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/misc/legousbtower.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/rio500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/misc/rio500.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/trancevibrator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/misc/trancevibrator.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/usblcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/misc/usblcd.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/usbled.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/misc/usbled.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/usbsevseg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/misc/usbsevseg.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/usbtest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/misc/usbtest.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/yurex.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/misc/yurex.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/musb/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/musb/Kconfig</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/musb/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/musb/Makefile</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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/musb/cppi_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/musb/cppi_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/musb/musb_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/musb/musb_core.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/musb/musb_debug.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/musb/musb_debugfs.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_gadget.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/musb/musb_gadget.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_gadget_ep0.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/musb/musb_gadget_ep0.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/musb/musb_io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/musb/musb_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='/cgit/linux.git/diff/drivers/usb/musb/omap2430.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/musb/omap2430.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/musb/tusb6010.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/musb/tusb6010.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/musb/ux500_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/musb/ux500_dma.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.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='/cgit/linux.git/diff/drivers/usb/otg/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/otg/Kconfig</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/otg/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/otg/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/otg/ab8500-usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/otg/ab8500-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='/cgit/linux.git/diff/drivers/usb/otg/fsl_otg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/otg/fsl_otg.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/otg/mv_otg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/otg/mv_otg.c</a></td><td class='right'>957</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/otg/mv_otg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/otg/mv_otg.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/renesas_usbhs/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/renesas_usbhs/common.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.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='/cgit/linux.git/diff/drivers/usb/renesas_usbhs/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/renesas_usbhs/common.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/renesas_usbhs/fifo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/renesas_usbhs/fifo.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/renesas_usbhs/fifo.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/renesas_usbhs/fifo.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/renesas_usbhs/mod.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/renesas_usbhs/mod.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/renesas_usbhs/mod_gadget.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/renesas_usbhs/mod_gadget.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/renesas_usbhs/mod_host.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/renesas_usbhs/mod_host.c</a></td><td class='right'>952</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/renesas_usbhs/pipe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/renesas_usbhs/pipe.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/renesas_usbhs/pipe.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/renesas_usbhs/pipe.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/usb/serial/ChangeLog.history?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/ChangeLog.history</a></td><td class='right'>730</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.2%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/aircable.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/aircable.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ark3116.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/ark3116.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/belkin_sa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/belkin_sa.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ch341.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/ch341.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/cp210x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/cp210x.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/cyberjack.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/cyberjack.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/cypress_m8.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/cypress_m8.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/digi_acceleport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/digi_acceleport.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/empeg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/empeg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ftdi_sio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/ftdi_sio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ftdi_sio_ids.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/ftdi_sio_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/funsoft.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/funsoft.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/garmin_gps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/garmin_gps.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/generic.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/io_edgeport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/io_edgeport.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/io_ti.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/io_ti.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ipaq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/ipaq.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.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ipw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/ipw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ir-usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/ir-usb.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/iuu_phoenix.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/iuu_phoenix.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/keyspan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/keyspan.c</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: 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='/cgit/linux.git/diff/drivers/usb/serial/keyspan_pda.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/keyspan_pda.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: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/kl5kusb105.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/kl5kusb105.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/kobil_sct.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/kobil_sct.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/mct_u232.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/mct_u232.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/mos7720.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/mos7720.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/mos7840.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/mos7840.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/navman.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/navman.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/omninet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/omninet.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.7%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/opticon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/opticon.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/option.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/option.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/oti6858.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/oti6858.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/pl2303.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/pl2303.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/qcserial.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/qcserial.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/safe_serial.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/safe_serial.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/sierra.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/sierra.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/spcp8x5.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/spcp8x5.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ssu100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/ssu100.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/symbolserial.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/symbolserial.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ti_usb_3410_5052.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/ti_usb_3410_5052.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/usb-serial.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/usb-serial.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/usb_debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/usb_debug.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/usb_wwan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/usb_wwan.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/visor.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/visor.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/whiteheat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/serial/whiteheat.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.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/alauda.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/storage/alauda.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/cypress_atacb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/storage/cypress_atacb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/datafab.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/storage/datafab.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/ene_ub6250.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/storage/ene_ub6250.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/freecom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/storage/freecom.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/isd200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/storage/isd200.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/jumpshot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/storage/jumpshot.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/karma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/storage/karma.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/onetouch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/storage/onetouch.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/realtek_cr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/storage/realtek_cr.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/sddr09.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/storage/sddr09.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/sddr55.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/storage/sddr55.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/shuttle_usbat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/storage/shuttle_usbat.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/uas.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/storage/uas.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/unusual_devs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/storage/unusual_devs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/storage/usb.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/usb-skeleton.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/usb-skeleton.c</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.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/wusbcore/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/wusbcore/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='/cgit/linux.git/diff/drivers/usb/wusbcore/cbaf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/wusbcore/cbaf.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/wusbcore/security.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/usb/wusbcore/security.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/uwb/est.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/uwb/est.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/uwb/hwa-rc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/uwb/hwa-rc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/uwb/i1480/dfu/usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/uwb/i1480/dfu/usb.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/vhost/net.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/vhost/net.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/amba-clcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/amba-clcd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/amifb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/amifb.c</a></td><td class='right'>3732</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 28.5%;'/><td class='rem' style='width: 28.8%;'/><td class='none' style='width: 42.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/atmel_lcdfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/atmel_lcdfb.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/aty/atyfb_base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/aty/atyfb_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/aty/radeon_base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/aty/radeon_base.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/au1100fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/au1100fb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/au1200fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/au1200fb.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/88pm860x_bl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/88pm860x_bl.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/adp5520_bl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/adp5520_bl.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/video/backlight/adx_bl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/adx_bl.c</a></td><td class='right'>182</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='/cgit/linux.git/diff/drivers/video/backlight/backlight.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/backlight.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/da903x_bl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/da903x_bl.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/ep93xx_bl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/ep93xx_bl.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/generic_bl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/generic_bl.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/jornada720_bl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/jornada720_bl.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/jornada720_lcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/jornada720_lcd.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/lcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/lcd.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/ld9040.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/ld9040.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/max8925_bl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/max8925_bl.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/omap1_bl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/omap1_bl.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/pcf50633-backlight.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/pcf50633-backlight.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/platform_lcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/platform_lcd.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/pwm_bl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/pwm_bl.c</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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/wm831x_bl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/backlight/wm831x_bl.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/bf54x-lq043fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/bf54x-lq043fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/bfin-t350mcqb-fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/bfin-t350mcqb-fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/cirrusfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/cirrusfb.c</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/console/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/newport_con.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/console/newport_con.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/controlfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/controlfb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/video/display/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/display/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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/video/display/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/display/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/video/display/display-sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/display/display-sysfs.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/fbmem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/fbmem.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/fsl-diu-fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/fsl-diu-fb.c</a></td><td class='right'>587</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/grvga.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/grvga.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/hgafb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/hgafb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/i810/i810_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/i810/i810_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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/intelfb/intelfbdrv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/intelfb/intelfbdrv.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/logo/logo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/logo/logo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/matrox/matroxfb_base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/matrox/matroxfb_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='/cgit/linux.git/diff/drivers/video/matrox/matroxfb_crtc2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/matrox/matroxfb_crtc2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/mbx/mbxfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/mbx/mbxfb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/mx3fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/mx3fb.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/mxsfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/mxsfb.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/neofb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/neofb.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/nuc900fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/nuc900fb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/nvidia/nvidia.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/nvidia/nvidia.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/offb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/offb.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_ams_delta.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap/lcd_ams_delta.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_h3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap/lcd_h3.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_htcherald.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap/lcd_htcherald.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_inn1510.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap/lcd_inn1510.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_inn1610.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap/lcd_inn1610.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_mipid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap/lcd_mipid.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_osk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap/lcd_osk.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_palmte.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap/lcd_palmte.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_palmtt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap/lcd_palmtt.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/lcd_palmz71.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap/lcd_palmz71.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/omapfb_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap/omapfb_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/rfbi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap/rfbi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap/sossi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap/sossi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/displays/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/displays/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/displays/panel-acx565akm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/displays/panel-acx565akm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/displays/panel-generic-dpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/displays/panel-generic-dpi.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/displays/panel-n8x0.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/displays/panel-n8x0.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/displays/panel-taal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/displays/panel-taal.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/displays/panel-tpo-td043mtea1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/displays/panel-tpo-td043mtea1.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/apply.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/apply.c</a></td><td class='right'>1324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/dispc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/dispc.c</a></td><td class='right'>407</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/dispc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/dispc.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/dispc_coefs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/dispc_coefs.c</a></td><td class='right'>326</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='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/dpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/dpi.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/dsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/dsi.c</a></td><td class='right'>616</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/dss.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/dss.h</a></td><td class='right'>76</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='/cgit/linux.git/diff/drivers/video/omap2/dss/dss_features.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/dss_features.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/dss_features.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/dss_features.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/hdmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/hdmi.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/manager.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/manager.c</a></td><td class='right'>1221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 16.8%;'/><td class='none' style='width: 81.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/overlay.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/overlay.c</a></td><td class='right'>435</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/rfbi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/rfbi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/sdi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/sdi.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/ti_hdmi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/ti_hdmi.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/ti_hdmi_4xxx_ip.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.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/dss/venc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/dss/venc.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/omapfb/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/omapfb/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/omapfb/omapfb-ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/omapfb/omapfb-ioctl.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/omapfb/omapfb-main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/omapfb/omapfb-main.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/omapfb/omapfb-sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/omapfb/omapfb-sysfs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/omap2/omapfb/omapfb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/omap2/omapfb/omapfb.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/pm2fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/pm2fb.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/pm3fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/pm3fb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/pnx4008/pnxrgbfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/pnx4008/pnxrgbfb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/pnx4008/sdum.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/pnx4008/sdum.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/pxa168fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/pxa168fb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/pxa3xx-gcu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/pxa3xx-gcu.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/riva/fbdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/riva/fbdev.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/s3c-fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/s3c-fb.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/s3c2410fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/s3c2410fb.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/s3fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/s3fb.c</a></td><td class='right'>30</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='/cgit/linux.git/diff/drivers/video/sbuslib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/sbuslib.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sh7760fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/sh7760fb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sh_mipi_dsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/sh_mipi_dsi.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sh_mobile_lcdcfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/sh_mobile_lcdcfb.c</a></td><td class='right'>375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sh_mobile_meram.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/sh_mobile_meram.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sm501fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/sm501fb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/smscufx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/smscufx.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sstfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/sstfb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/tdfxfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/tdfxfb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/udlfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/udlfb.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/uvesafb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/uvesafb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/vfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/vfb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/vt8500lcdfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/vt8500lcdfb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/w100fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/w100fb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/wm8505fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/wm8505fb.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/wmt_ge_rops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/wmt_ge_rops.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/xen-fbfront.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/xen-fbfront.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/xilinxfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/video/xilinxfb.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/virtio/virtio_balloon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/virtio/virtio_balloon.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/virtio/virtio_mmio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/virtio/virtio_mmio.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/virtio/virtio_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/virtio/virtio_pci.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/virtio/virtio_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/virtio/virtio_ring.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/masters/ds2490.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/w1/masters/ds2490.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/slaves/w1_therm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/w1/slaves/w1_therm.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/w1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/w1/w1.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/ar7_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/ar7_wdt.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/at91sam9_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/at91sam9_wdt.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/at91sam9_wdt.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/at91sam9_wdt.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/ath79_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/ath79_wdt.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/bcm63xx_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/bcm63xx_wdt.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/cpu5wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/cpu5wdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/cpwd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/cpwd.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/davinci_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/davinci_wdt.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/dw_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/dw_wdt.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/eurotechwdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/eurotechwdt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/f71808e_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/watchdog/ibmasr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/ibmasr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/indydog.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/indydog.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/iop_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/iop_wdt.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/ixp2000_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/ixp2000_wdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/ixp4xx_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/ixp4xx_wdt.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/jz4740_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/jz4740_wdt.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/ks8695_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/ks8695_wdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/lantiq_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/lantiq_wdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/max63xx_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/max63xx_wdt.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/mpc8xxx_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/mpc8xxx_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='/cgit/linux.git/diff/drivers/watchdog/mtx-1_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/mtx-1_wdt.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/nuc900_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/nuc900_wdt.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/of_xilinx_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/of_xilinx_wdt.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/omap_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/omap_wdt.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/orion_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/orion_wdt.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/pcwd_usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/pcwd_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.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/pnx4008_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/pnx4008_wdt.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/rc32434_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/rc32434_wdt.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/rdc321x_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/rdc321x_wdt.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/riowd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/riowd.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/s3c2410_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/s3c2410_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='/cgit/linux.git/diff/drivers/watchdog/sp805_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/sp805_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='/cgit/linux.git/diff/drivers/watchdog/stmp3xxx_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/stmp3xxx_wdt.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/ts72xx_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/ts72xx_wdt.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/twl4030_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/twl4030_wdt.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/watchdog/via_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/via_wdt.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/w83627hf_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/w83627hf_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/wm831x_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/wm831x_wdt.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/watchdog/wm8350_wdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/watchdog/wm8350_wdt.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/biomerge.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/biomerge.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/events.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/events.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/evtchn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/drivers/xen/gntalloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/gntalloc.c</a></td><td class='right'>121</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.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/gntdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/gntdev.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/grant-table.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/grant-table.c</a></td><td class='right'>518</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/xen/privcmd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/privcmd.c</a> (renamed from drivers/xen/xenfs/privcmd.c)</td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/xen/privcmd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/privcmd.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/swiotlb-xen.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/swiotlb-xen.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/xen-balloon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/xen-balloon.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/xen-pciback/conf_space.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/xen-pciback/conf_space.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/xen-pciback/pci_stub.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/xen-pciback/pci_stub.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/xen-pciback/xenbus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/xen-pciback/xenbus.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/xen-selfballoon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/xen-selfballoon.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/xenbus/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/xenbus/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/xenbus/xenbus_client.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/xenbus/xenbus_client.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/xenbus/xenbus_comms.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/xenbus/xenbus_comms.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/xen/xenbus/xenbus_dev_backend.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/xenbus/xenbus_dev_backend.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/xen/xenbus/xenbus_dev_frontend.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/xenbus/xenbus_dev_frontend.c</a> (renamed from drivers/xen/xenfs/xenbus.c)</td><td class='right'>40</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='/cgit/linux.git/diff/drivers/xen/xenbus/xenbus_probe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/xenbus/xenbus_probe.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/xenbus/xenbus_probe.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/xenbus/xenbus_probe.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/xenbus/xenbus_probe_backend.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/xenbus/xenbus_probe_backend.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/xenbus/xenbus_probe_frontend.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/xenbus/xenbus_probe_frontend.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/xenbus/xenbus_xs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/xenbus/xenbus_xs.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/xenfs/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/xenfs/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/xenfs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/xenfs/super.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/xen/xenfs/xenfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/xen/xenfs/xenfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/zorro/zorro.ids?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/zorro/zorro.ids</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/firmware/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>firmware/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='/cgit/linux.git/diff/firmware/isci/isci_firmware.bin.ihex?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>firmware/isci/isci_firmware.bin.ihex</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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/cache.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/9p/cache.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/fid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/9p/fid.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/v9fs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/9p/v9fs.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/v9fs_vfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/9p/v9fs_vfs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/vfs_addr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/9p/vfs_addr.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/vfs_dentry.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/9p/vfs_dentry.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/vfs_dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/9p/vfs_dir.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/vfs_file.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/9p/vfs_file.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/vfs_inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/9p/vfs_inode.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/vfs_inode_dotl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/9p/vfs_inode_dotl.c</a></td><td class='right'>137</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='/cgit/linux.git/diff/fs/9p/vfs_super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/9p/vfs_super.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/xattr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/9p/xattr.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/Kconfig.binfmt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/Kconfig.binfmt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/adfs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/adfs/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/affs/affs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/affs/affs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/affs/amigaffs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/affs/amigaffs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/affs/namei.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/affs/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/affs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/affs/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='/cgit/linux.git/diff/fs/afs/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/afs/dir.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/afs/mntpt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/afs/mntpt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/afs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/afs/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='/cgit/linux.git/diff/fs/aio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/aio.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/attr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/attr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/autofs4/autofs_i.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/autofs4/autofs_i.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/autofs4/dev-ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/autofs4/dev-ioctl.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/autofs4/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/autofs4/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/autofs4/root.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/autofs4/root.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/autofs4/waitq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/autofs4/waitq.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/bad_inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/bad_inode.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/befs/linuxvfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/befs/linuxvfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/bfs/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/bfs/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='/cgit/linux.git/diff/fs/bfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/bfs/inode.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/binfmt_elf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/binfmt_elf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/binfmt_misc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/binfmt_misc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/block_dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/block_dev.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/Kconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/async-thread.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/async-thread.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/backref.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/backref.c</a></td><td class='right'>1131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.5%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 82.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/backref.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/backref.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/btrfs_inode.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/btrfs_inode.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/btrfs/check-integrity.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/check-integrity.c</a></td><td class='right'>3068</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 47.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 52.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/btrfs/check-integrity.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/check-integrity.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/ctree.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/ctree.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/ctree.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/ctree.h</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/delayed-inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/delayed-inode.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/delayed-ref.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/delayed-ref.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/delayed-ref.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/delayed-ref.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/disk-io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/disk-io.c</a></td><td class='right'>132</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: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/disk-io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/disk-io.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/export.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/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='/cgit/linux.git/diff/fs/btrfs/extent-tree.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/extent-tree.c</a></td><td class='right'>465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/extent_io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/extent_io.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/extent_io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/extent_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='/cgit/linux.git/diff/fs/btrfs/file.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/file.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/free-space-cache.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/free-space-cache.c</a></td><td class='right'>419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/inode-map.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/inode-map.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/inode.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/ioctl.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/ioctl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/ioctl.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/locking.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/locking.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/relocation.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/relocation.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/scrub.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/scrub.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/super.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/transaction.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/transaction.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/tree-log.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/tree-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='add'><a href='/cgit/linux.git/diff/fs/btrfs/ulist.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/ulist.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/btrfs/ulist.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/ulist.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/volumes.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/volumes.c</a></td><td class='right'>993</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.7%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 84.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/volumes.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/volumes.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/btrfs/xattr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/btrfs/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='/cgit/linux.git/diff/fs/buffer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/buffer.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cachefiles/interface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/cachefiles/interface.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ceph/caps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ceph/caps.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ceph/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ceph/dir.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ceph/export.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ceph/export.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ceph/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ceph/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ceph/mds_client.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ceph/mds_client.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ceph/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ceph/super.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ceph/super.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ceph/super.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ceph/xattr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ceph/xattr.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/char_dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/char_dev.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifs_fs_sb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/cifs/cifs_fs_sb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifsfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/cifs/cifsfs.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifsfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/cifs/cifsfs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifsglob.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/cifs/cifsglob.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/connect.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/cifs/connect.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/cifs/dir.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/cifs/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/coda/cnode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/coda/cnode.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.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/coda/coda_fs_i.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/coda/coda_fs_i.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/coda/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/coda/dir.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/coda/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/coda/inode.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/compat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/compat.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/compat_ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/compat_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='/cgit/linux.git/diff/fs/configfs/configfs_internal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/configfs/configfs_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/configfs/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/configfs/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/configfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/configfs/inode.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cramfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/cramfs/inode.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dcache.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/dcache.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><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='/cgit/linux.git/diff/fs/debugfs/file.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/debugfs/file.c</a></td><td class='right'>117</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='/cgit/linux.git/diff/fs/debugfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/debugfs/inode.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/devpts/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/devpts/inode.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/direct-io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/direct-io.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dlm/config.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/dlm/config.c</a></td><td class='right'>130</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='/cgit/linux.git/diff/fs/dlm/config.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/dlm/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.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dlm/debug_fs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/dlm/debug_fs.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dlm/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/dlm/dir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dlm/dlm_internal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/dlm/dlm_internal.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dlm/lock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/dlm/lock.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dlm/lockspace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/dlm/lockspace.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dlm/lowcomms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/dlm/lowcomms.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dlm/member.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/dlm/member.c</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dlm/member.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/dlm/member.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dlm/rcom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/dlm/rcom.c</a></td><td class='right'>99</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='/cgit/linux.git/diff/fs/dlm/rcom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/dlm/rcom.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dlm/recover.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/dlm/recover.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dlm/recoverd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/dlm/recoverd.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dlm/user.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/dlm/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ecryptfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ecryptfs/inode.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ecryptfs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/efs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/efs/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='/cgit/linux.git/diff/fs/eventpoll.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/eventpoll.c</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/exec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/exec.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/exofs/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/exofs/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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/exofs/Kconfig.ore?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/exofs/Kconfig.ore</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/exofs/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/exofs/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='/cgit/linux.git/diff/fs/exofs/exofs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/exofs/exofs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/exofs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/exofs/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='/cgit/linux.git/diff/fs/exofs/namei.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/exofs/namei.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/exofs/ore.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/exofs/ore.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/exofs/ore_raid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/exofs/ore_raid.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/exofs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/exofs/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='/cgit/linux.git/diff/fs/ext2/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext2/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='/cgit/linux.git/diff/fs/ext2/ext2.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext2/ext2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext2/ialloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext2/ialloc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext2/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext2/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext2/ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext2/ioctl.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext2/namei.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext2/namei.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext2/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext2/super.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext2/xattr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext2/xattr.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext2/xattr_security.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext2/xattr_security.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext2/xattr_trusted.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext2/xattr_trusted.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext2/xattr_user.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext2/xattr_user.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/ialloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext3/ialloc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext3/inode.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext3/ioctl.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/namei.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext3/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.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext3/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.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/xattr_security.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext3/xattr_security.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/xattr_trusted.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext3/xattr_trusted.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/xattr_user.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext3/xattr_user.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/balloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext4/balloc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/block_validity.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext4/block_validity.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/ext4.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext4/ext4.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/extents.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext4/extents.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/ialloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext4/ialloc.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/indirect.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext4/indirect.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext4/inode.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.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='/cgit/linux.git/diff/fs/ext4/ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext4/ioctl.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/mballoc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext4/mballoc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/migrate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext4/migrate.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/namei.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext4/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/page-io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext4/page-io.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/resize.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext4/resize.c</a></td><td class='right'>1175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.6%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 82.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext4/super.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/xattr_security.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext4/xattr_security.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/xattr_trusted.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext4/xattr_trusted.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext4/xattr_user.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ext4/xattr_user.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fat/fat.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/fat/fat.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fat/file.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/fat/file.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fat/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/fat/inode.c</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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fat/namei_msdos.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/fat/namei_msdos.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fat/namei_vfat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/fat/namei_vfat.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fhandle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/fhandle.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/file_table.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/file_table.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/filesystems.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/filesystems.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/freevxfs/vxfs_inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/freevxfs/vxfs_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fs-writeback.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/fs-writeback.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fuse/dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/fuse/dev.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fuse/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/fuse/dir.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fuse/file.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/fuse/file.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.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='/cgit/linux.git/diff/fs/fuse/fuse_i.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/fuse/fuse_i.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fuse/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/fuse/inode.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/acl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/acl.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/aops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/aops.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/bmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/bmap.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/dir.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/dir.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/dir.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/export.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/export.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/file.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/file.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/glock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/glock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/glock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/glock.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/incore.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/incore.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/inode.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/lock_dlm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/lock_dlm.c</a></td><td class='right'>993</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 84.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/log.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/log.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/main.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/meta_io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/meta_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/ops_fstype.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/ops_fstype.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/quota.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/quota.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/recovery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/recovery.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/rgrp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/rgrp.c</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 2.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='/cgit/linux.git/diff/fs/gfs2/rgrp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/rgrp.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/super.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/sys.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/sys.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/sys.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/sys.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/trans.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/trans.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/gfs2/xattr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/gfs2/xattr.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hfs/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/hfs/dir.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hfs/hfs_fs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/hfs/hfs_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='/cgit/linux.git/diff/fs/hfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/hfs/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='/cgit/linux.git/diff/fs/hfs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/hfs/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hfsplus/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/hfsplus/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hfsplus/hfsplus_fs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/hfsplus/hfsplus_fs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hfsplus/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/hfsplus/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='/cgit/linux.git/diff/fs/hfsplus/ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/hfsplus/ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hfsplus/options.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/hfsplus/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hfsplus/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/hfsplus/super.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hostfs/hostfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/hostfs/hostfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hostfs/hostfs_kern.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/hostfs/hostfs_kern.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hpfs/namei.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/hpfs/namei.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hpfs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/hpfs/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='/cgit/linux.git/diff/fs/hppfs/hppfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/hppfs/hppfs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hugetlbfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/hugetlbfs/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.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/inode.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/internal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/internal.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ioprio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ioprio.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/isofs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/isofs/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/isofs/isofs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/isofs/isofs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd/checkpoint.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jbd/checkpoint.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd/commit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jbd/commit.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd/journal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jbd/journal.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd/revoke.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jbd/revoke.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd/transaction.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jbd/transaction.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd2/checkpoint.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jbd2/checkpoint.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd2/commit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jbd2/commit.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd2/journal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jbd2/journal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd2/revoke.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jbd2/revoke.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd2/transaction.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jbd2/transaction.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jffs2/dir.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/erase.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jffs2/erase.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/fs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/fs/jffs2/readinode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jffs2/readinode.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/scan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jffs2/scan.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jffs2/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/wbuf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jffs2/wbuf.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/writev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jffs2/writev.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jfs/ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jfs/ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jfs/jfs_logmgr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jfs/jfs_logmgr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jfs/jfs_txnmgr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jfs/jfs_txnmgr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jfs/namei.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jfs/namei.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jfs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/jfs/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/libfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/libfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/lockd/mon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/lockd/mon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/lockd/svcsubs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/lockd/svcsubs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/logfs/dev_mtd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/logfs/dev_mtd.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/logfs/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/logfs/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/logfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/logfs/inode.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/logfs/logfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/logfs/logfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/minix/bitmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/minix/bitmap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/minix/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/minix/inode.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/minix/minix.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/minix/minix.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/minix/namei.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/minix/namei.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/mount.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/mount.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/mpage.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/mpage.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/namei.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/namei.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/namespace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/namespace.c</a></td><td class='right'>831</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 7.5%;'/><td class='none' style='width: 87.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ncpfs/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ncpfs/dir.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ncpfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ncpfs/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ncpfs/ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ncpfs/ioctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ncpfs/ncplib_kernel.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ncpfs/ncplib_kernel.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ncpfs/symlink.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ncpfs/symlink.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/blocklayout/blocklayout.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/blocklayout/blocklayout.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/blocklayout/blocklayout.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/blocklayout/blocklayout.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/blocklayout/extents.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/blocklayout/extents.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/callback.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/callback.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/callback_proc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/callback_proc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/callback_xdr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/callback_xdr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/client.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/client.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/dir.c</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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/file.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/file.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/idmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/idmap.c</a></td><td class='right'>83</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='/cgit/linux.git/diff/fs/nfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/inode.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/internal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/nfs3proc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/nfs3proc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/nfs4_fs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/nfs4_fs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/nfs4filelayout.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/nfs4filelayout.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/nfs4filelayoutdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/nfs4filelayoutdev.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/nfs4proc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/nfs4proc.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.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='/cgit/linux.git/diff/fs/nfs/nfs4state.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/nfs4state.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/nfs4xdr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/nfs4xdr.c</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/objlayout/objio_osd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/objlayout/objio_osd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/objlayout/objlayout.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/objlayout/objlayout.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/pnfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/pnfs.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/pnfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/pnfs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/proc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/proc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/super.c</a></td><td class='right'>92</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='/cgit/linux.git/diff/fs/nfs/write.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfs/write.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfsd/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfsd/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/export.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfsd/export.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/nfsd/fault_inject.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfsd/fault_inject.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/nfsd/fault_inject.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfsd/fault_inject.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfs4callback.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfsd/nfs4callback.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfs4idmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfsd/nfs4idmap.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfs4proc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfsd/nfs4proc.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfs4recover.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfsd/nfs4recover.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfs4state.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfsd/nfs4state.c</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfs4xdr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfsd/nfs4xdr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfsctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfsd/nfsctl.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfsd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfsd/nfsd.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfsfh.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfsd/nfsfh.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfsfh.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfsd/nfsfh.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/state.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfsd/state.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/vfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfsd/vfs.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/vfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nfsd/vfs.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nilfs2/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nilfs2/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='/cgit/linux.git/diff/fs/nilfs2/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nilfs2/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='/cgit/linux.git/diff/fs/nilfs2/ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nilfs2/ioctl.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nilfs2/namei.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nilfs2/namei.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nilfs2/nilfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/fs/nilfs2/segment.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nilfs2/segment.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nilfs2/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nilfs2/super.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nls/nls_base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/nls/nls_base.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/notify/fanotify/fanotify_user.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/notify/fanotify/fanotify_user.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/notify/fsnotify.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/notify/fsnotify.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/notify/mark.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/notify/mark.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/notify/vfsmount_mark.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/notify/vfsmount_mark.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ntfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ntfs/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ntfs/inode.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/fs/ntfs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ntfs/super.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ntfs/volume.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ntfs/volume.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/cluster/netdebug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ocfs2/cluster/netdebug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/dlmfs/dlmfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ocfs2/dlmfs/dlmfs.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/file.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ocfs2/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='/cgit/linux.git/diff/fs/ocfs2/ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ocfs2/ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/move_extents.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ocfs2/move_extents.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/namei.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ocfs2/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/stack_user.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ocfs2/stack_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ocfs2/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/xattr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ocfs2/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='/cgit/linux.git/diff/fs/ocfs2/xattr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ocfs2/xattr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/omfs/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/omfs/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/omfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/omfs/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='/cgit/linux.git/diff/fs/omfs/omfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/omfs/omfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/open.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/open.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/openpromfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/openpromfs/inode.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/pipe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/pipe.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/pnode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/pnode.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/pnode.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/pnode.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/array.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/proc/array.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/proc/base.c</a></td><td class='right'>695</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/proc/generic.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/proc/inode.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/internal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/proc/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='/cgit/linux.git/diff/fs/proc/namespaces.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/proc/namespaces.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/proc_net.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/proc/proc_net.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/root.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/proc/root.c</a></td><td class='right'>70</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='/cgit/linux.git/diff/fs/proc_namespace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/proc_namespace.c</a></td><td class='right'>333</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='/cgit/linux.git/diff/fs/pstore/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/pstore/inode.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/pstore/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/pstore/platform.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/qnx4/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/qnx4/inode.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/quota/dquot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/quota/dquot.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/quota/quota.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/quota/quota.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ramfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ramfs/inode.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/bitmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/reiserfs/bitmap.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/reiserfs/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='/cgit/linux.git/diff/fs/reiserfs/ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/reiserfs/ioctl.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/journal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/reiserfs/journal.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/namei.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/reiserfs/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/reiserfs/super.c</a></td><td class='right'>200</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: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/xattr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/reiserfs/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='/cgit/linux.git/diff/fs/romfs/mmap-nommu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/romfs/mmap-nommu.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/romfs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/romfs/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='/cgit/linux.git/diff/fs/seq_file.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/seq_file.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/splice.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/splice.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/squashfs/cache.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/squashfs/cache.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/squashfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/squashfs/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/squashfs/squashfs_fs_sb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/squashfs/squashfs_fs_sb.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/squashfs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/squashfs/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='/cgit/linux.git/diff/fs/statfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/statfs.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/super.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/sync.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/sync.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/sysfs/file.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/sysfs/file.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/sysfs/group.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/sysfs/group.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/sysfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/sysfs/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='/cgit/linux.git/diff/fs/sysfs/sysfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/sysfs/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/sysv/ialloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/sysv/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='/cgit/linux.git/diff/fs/sysv/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/sysv/inode.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/sysv/itree.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/sysv/itree.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/sysv/namei.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/sysv/namei.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/sysv/sysv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/sysv/sysv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ubifs/debug.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ubifs/debug.h</a></td><td class='right'>75</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='/cgit/linux.git/diff/fs/ubifs/dir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ubifs/dir.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ubifs/ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/journal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ubifs/journal.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/lpt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ubifs/lpt.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/replay.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ubifs/replay.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ubifs/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/tnc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ubifs/tnc.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/tnc_misc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ubifs/tnc_misc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/ubifs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ubifs/ubifs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ubifs/xattr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ubifs/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/udf/file.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/udf/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/udf/ialloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/udf/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='/cgit/linux.git/diff/fs/udf/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/udf/inode.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/udf/namei.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/udf/namei.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/udf/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/udf/super.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/udf/symlink.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/udf/symlink.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/udf/udf_sb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/udf/udf_sb.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/udf/udfdecl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/fs/ufs/ialloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ufs/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='/cgit/linux.git/diff/fs/ufs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ufs/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ufs/namei.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ufs/namei.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ufs/super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ufs/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ufs/ufs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/ufs/ufs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xattr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xattr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_acl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_acl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_aops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_aops.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_attr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_attr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_attr_leaf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_attr_leaf.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_bmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_bmap.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_buf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_buf.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_buf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_buf.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dfrag.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_dfrag.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_discard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_discard.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dquot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_dquot.c</a></td><td class='right'>500</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dquot.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_dquot.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dquot_item.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_dquot_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_file.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_file.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_fs_subr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_fs_subr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_ialloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_ialloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_ialloc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_iget.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_iget.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_inode.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_inode.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_inode.h</a></td><td class='right'>116</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_inode_item.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_inode_item.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_ioctl.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_ioctl32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_ioctl32.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_iomap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_iomap.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_iops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_iops.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_log.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_log.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_log.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_log.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_log_cil.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_log_cil.c</a></td><td class='right'>98</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.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_mount.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_mount.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_qm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_qm.c</a></td><td class='right'>464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_qm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_qm.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_qm_syscalls.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_qm_syscalls.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_quota.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_quota.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_super.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_super.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.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='/cgit/linux.git/diff/fs/xfs/xfs_sync.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_sync.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_trace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_trace.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_trans.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_trans.c</a></td><td class='right'>475</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 7.2%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_trans.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_trans.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_utils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_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='/cgit/linux.git/diff/fs/xfs/xfs_utils.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_utils.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_vnodeops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_vnodeops.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_vnodeops.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/xfs/xfs_vnodeops.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acnames.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/acpi/acnames.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acpi_numa.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/acpi/acpi_numa.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acpiosxf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/acpi/acpiosxf.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acpixf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/acpi/acpixf.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acrestyp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/acpi/acrestyp.h</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/actbl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/acpi/actbl.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/actbl1.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/acpi/actbl1.h</a></td><td class='right'>57</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='add'><a href='/cgit/linux.git/diff/include/acpi/actbl3.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/acpi/actbl3.h</a></td><td class='right'>552</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/actypes.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/apei.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/acpi/apei.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/asm-generic/gpio.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/asm-generic/io.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/iomap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/asm-generic/iomap.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/page.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/asm-generic/page.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/param.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/asm-generic/param.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-generic/pci_iomap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/asm-generic/pci_iomap.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/asm-generic/socket.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/tlb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/asm-generic/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.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/asm-generic/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/uaccess.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/asm-generic/uaccess.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/crypto/algapi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/crypto/algapi.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/crypto/lrw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/crypto/lrw.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/crypto/serpent.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/crypto/serpent.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/crypto/twofish.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/crypto/twofish.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/crypto/xts.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/crypto/xts.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/drm/Kbuild?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/drm/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='/cgit/linux.git/diff/include/drm/drm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/drm/drm.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/drm/drmP.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/drm/drmP.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/drm/drm_crtc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/drm/drm_crtc.h</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/drm/drm_crtc_helper.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/drm/drm_crtc_helper.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/drm/drm_fourcc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/drm/drm_fourcc.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/drm/drm_mode.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/drm/drm_mode.h</a></td><td class='right'>74</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.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/drm/drm_sman.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/drm/drm_sman.h</a></td><td class='right'>176</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='upd'><a href='/cgit/linux.git/diff/include/drm/exynos_drm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/drm/exynos_drm.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/drm/gma_drm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/drm/gma_drm.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/drm/i915_drm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/drm/i915_drm.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/drm/radeon_drm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/drm/radeon_drm.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/drm/sis_drm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/drm/sis_drm.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/drm/ttm/ttm_bo_api.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/drm/ttm/ttm_bo_api.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/drm/ttm/ttm_bo_driver.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/drm/ttm/ttm_bo_driver.h</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/drm/ttm/ttm_page_alloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/drm/ttm/ttm_page_alloc.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/drm/via_drm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/drm/via_drm.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/Kbuild?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/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='/cgit/linux.git/diff/include/linux/acct.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/acct.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/acpi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/acpi.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/acpi_io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/acpi_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='upd'><a href='/cgit/linux.git/diff/include/linux/ahci_platform.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/ahci_platform.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/amba/bus.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/amba/bus.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/amba/mmci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/amba/mmci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/amba/pl022.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/amba/pl022.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/amba/pl061.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/amba/pl061.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/amba/pl08x.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/amba/pl08x.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/amba/pl330.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/amba/pl330.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/amd-iommu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/amd-iommu.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ata_platform.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/ata_platform.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/atmdev.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/atmdev.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/audit.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/audit.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/bcma/bcma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/bcma/bcma.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/bcma/bcma_driver_chipcommon.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/bcma/bcma_driver_chipcommon.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/bio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/bio.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/blkdev.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/blkdev.h</a></td><td class='right'>104</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='add'><a href='/cgit/linux.git/diff/include/linux/can/platform/cc770.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/can/platform/cc770.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/capability.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/capability.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/cgroup.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/cgroup.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/cgroup_subsys.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/cgroup_subsys.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/clk.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/clk.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/compat.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/compat.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/compiler-gcc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/compiler-gcc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/compiler-gcc4.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/compiler-gcc4.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/compiler.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/compiler.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/configfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/configfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/console.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/console.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/cordic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/cordic.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/cpu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/cpu.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/cpuidle.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/cpuidle.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/crash_dump.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/crash_dump.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/cred.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/cred.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/cuda.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/cuda.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/dcache.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/dcache.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/debugfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/debugfs.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/device.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/device.h</a></td><td class='right'>114</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.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/digsig.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/digsig.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/linux/display.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/display.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/dlm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/dlm.h</a></td><td class='right'>71</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='add'><a href='/cgit/linux.git/diff/include/linux/dma-buf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/dma-buf.h</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/dmaengine.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/dmaengine.h</a></td><td class='right'>99</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='/cgit/linux.git/diff/include/linux/dvb/frontend.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/dvb/frontend.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/dvb/version.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/dvb/version.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/dw_dmac.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/dw_dmac.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/dynamic_queue_limits.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/dynamic_queue_limits.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/edac.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/edac.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/eeprom_93cx6.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/eeprom_93cx6.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/efi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/efi.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/elevator.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/elevator.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/elf-em.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/elf-em.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/elf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/elf.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/errqueue.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/errqueue.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ethtool.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/ethtool.h</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/eventpoll.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/eventpoll.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ext3_fs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/ext3_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='/cgit/linux.git/diff/include/linux/fb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/fb.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/freezer.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/freezer.h</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.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='/cgit/linux.git/diff/include/linux/fs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/fs.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ftrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/ftrace.h</a></td><td class='right'>77</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='/cgit/linux.git/diff/include/linux/fuse.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/fuse.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/genetlink.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/genetlink.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/genhd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/genhd.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/gfp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/gfp.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/gfs2_ondisk.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/gfs2_ondisk.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/gpio-pxa.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/gpio-pxa.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/hid.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/hid.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/huge_mm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/huge_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='/cgit/linux.git/diff/include/linux/hyperv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/hyperv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/i2c.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/i2c.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/i2c/twl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/i2c/twl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ide.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/ide.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ieee80211.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/ieee80211.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/if.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/if.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/if_ether.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/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='add'><a href='/cgit/linux.git/diff/include/linux/if_team.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/if_team.h</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/if_vlan.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/if_vlan.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/inet_diag.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/inet_diag.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/init.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/init.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/init_task.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/init_task.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/input/auo-pixcir-ts.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/input/auo-pixcir-ts.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/input/gp2ap002a00f.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/input/gp2ap002a00f.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/input/gpio_tilt.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/input/gpio_tilt.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/input/pixcir_ts.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/input/pixcir_ts.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/input/samsung-keypad.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/input/samsung-keypad.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/input/tca8418_keypad.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/input/tca8418_keypad.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/iocontext.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/iocontext.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><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='/cgit/linux.git/diff/include/linux/iommu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/iommu.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ipc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/ipc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ipv6.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/ipv6.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/irqdomain.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/irqdomain.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/iscsi_boot_sysfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/iscsi_boot_sysfs.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/isdn_divertif.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/isdn_divertif.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/jbd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/jbd.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/jbd2.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/include/linux/kernel.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/kernel.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/key-type.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/key-type.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/key.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/key.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kmemleak.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/kmemleak.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kmod.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/kmod.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kmsg_dump.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/kmsg_dump.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kobject.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/kobject.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kref.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/kref.h</a></td><td class='right'>78</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='/cgit/linux.git/diff/include/linux/kthread.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/kthread.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kvm_host.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/kvm_host.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kvm_para.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/kvm_para.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/leds-tca6507.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/leds-tca6507.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/linkage.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/linkage.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/lockd/lockd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/lockd/lockd.h</a></td><td class='right'>8</td><td class='graph'><table summary='file 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'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/lp8727.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/lp8727.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mbus.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mbus.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mdio-bitbang.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mdio-bitbang.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mdio-gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mdio-gpio.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/memcontrol.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/memcontrol.h</a></td><td class='right'>126</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='/cgit/linux.git/diff/include/linux/memory.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/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='/cgit/linux.git/diff/include/linux/mempolicy.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mempolicy.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mfd/88pm860x.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/88pm860x.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='mov'><a href='/cgit/linux.git/diff/include/linux/mfd/abx500/ab5500.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/abx500/ab5500.h</a> (renamed from include/linux/mfd/ab5500/ab5500.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/include/linux/mfd/abx500/ab8500-gpadc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/abx500/ab8500-gpadc.h</a> (renamed from include/linux/mfd/ab8500/gpadc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/include/linux/mfd/abx500/ab8500-gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/abx500/ab8500-gpio.h</a> (renamed from include/linux/mfd/ab8500/gpio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/include/linux/mfd/abx500/ab8500-sysctrl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/abx500/ab8500-sysctrl.h</a> (renamed from include/linux/mfd/ab8500/sysctrl.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/include/linux/mfd/abx500/ab8500.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/abx500/ab8500.h</a> (renamed from include/linux/mfd/ab8500.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/mfd/da9052/da9052.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/da9052/da9052.h</a></td><td class='right'>131</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='mov'><a href='/cgit/linux.git/diff/include/linux/mfd/da9052/pdata.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/da9052/pdata.h</a> (renamed from arch/arm/mach-at91/include/mach/vmalloc.h)</td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/mfd/da9052/reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/da9052/reg.h</a></td><td class='right'>749</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mfd/max8925.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/max8925.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mfd/max8997.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/max8997.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mfd/mc13xxx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/mc13xxx.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mfd/mcp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/mcp.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/mfd/s5m87xx/s5m-core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/s5m87xx/s5m-core.h</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/mfd/s5m87xx/s5m-pmic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/s5m87xx/s5m-pmic.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/mfd/s5m87xx/s5m-rtc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/s5m87xx/s5m-rtc.h</a></td><td class='right'>84</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='/cgit/linux.git/diff/include/linux/mfd/stmpe.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/stmpe.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mfd/tps65910.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/tps65910.h</a></td><td class='right'>30</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='/cgit/linux.git/diff/include/linux/mfd/ucb1x00.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/ucb1x00.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mfd/wm8994/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/wm8994/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mfd/wm8994/pdata.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/wm8994/pdata.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mfd/wm8994/registers.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mfd/wm8994/registers.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/migrate.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/migrate.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mii.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mii.h</a></td><td class='right'>200</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='upd'><a href='/cgit/linux.git/diff/include/linux/miscdevice.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/miscdevice.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mlx4/cmd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mlx4/cmd.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mlx4/device.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mlx4/device.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mlx4/qp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mlx4/qp.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mm.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mm_inline.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mm_inline.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mm_types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mm_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mmc/card.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mmc/card.h</a></td><td class='right'>23</td><td class='graph'><table summary='file 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='/cgit/linux.git/diff/include/linux/mmc/cd-gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mmc/cd-gpio.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mmc/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mmc/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='/cgit/linux.git/diff/include/linux/mmc/dw_mmc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mmc/dw_mmc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mmc/host.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mmc/host.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mmc/mmc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mmc/mmc.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/mmc/sdhci-pci-data.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mmc/sdhci-pci-data.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mmc/sdhci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mmc/sdhci.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mmc/sdio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mmc/sdio.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mmzone.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mmzone.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mnt_namespace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mnt_namespace.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mod_devicetable.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mod_devicetable.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/module.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/module.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/moduleparam.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/moduleparam.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mount.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mount.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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/mpi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mpi.h</a></td><td class='right'>146</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='/cgit/linux.git/diff/include/linux/mroute6.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mroute6.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/msi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/msi.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/cfi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mtd/cfi.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/cfi_endian.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mtd/cfi_endian.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.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/mtd/gpmi-nand.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mtd/gpmi-nand.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/map.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mtd/map.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/mtd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mtd/mtd.h</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/nand.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mtd/nand.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/physmap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/mtd/physmap.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/neighbour.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/neighbour.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/netdev_features.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/netdev_features.h</a></td><td class='right'>146</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='/cgit/linux.git/diff/include/linux/netdevice.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/netdevice.h</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netfilter.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/netfilter.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netfilter/Kbuild?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/netfilter/Kbuild</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netfilter/nf_conntrack_tuple_common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/netfilter/nf_conntrack_tuple_common.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/netfilter/nf_nat.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/netfilter/nf_nat.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netfilter/nfnetlink.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/netfilter/nfnetlink.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/netfilter/nfnetlink_acct.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/netfilter/nfnetlink_acct.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netfilter/x_tables.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/netfilter/x_tables.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/netfilter/xt_ecn.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/netfilter/xt_ecn.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/netfilter/xt_nfacct.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/netfilter/xt_nfacct.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/netfilter/xt_rpfilter.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/netfilter/xt_rpfilter.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netfilter_ipv4/Kbuild?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/netfilter_ipv4/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='/cgit/linux.git/diff/include/linux/netfilter_ipv4/ipt_ecn.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/netfilter_ipv4/ipt_ecn.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/linux/netfilter_ipv4/nf_nat.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/netfilter_ipv4/nf_nat.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.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netlink.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/netlink.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/nfc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/nfc.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/nfs_fs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/nfs_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='/cgit/linux.git/diff/include/linux/nfs_fs_sb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/nfs_fs_sb.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/nfs_idmap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/nfs_idmap.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/nfs_xdr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/nfs_xdr.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/nl80211.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/nl80211.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/nls.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/nls.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/node.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/node.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/nvme.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/nvme.h</a></td><td class='right'>434</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='upd'><a href='/cgit/linux.git/diff/include/linux/of.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/of.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/of_fdt.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/of_fdt.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/of_gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/of_gpio.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/oom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/oom.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/openvswitch.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/openvswitch.h</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/page-debug-flags.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/page-debug-flags.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/page_cgroup.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/page_cgroup.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.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pagevec.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/pagevec.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/patchkey.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/patchkey.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pci-aspm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/pci-aspm.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/pci.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pci_ids.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/pci_ids.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pci_regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/pci_regs.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pda_power.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/pda_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='/cgit/linux.git/diff/include/linux/percpu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/percpu.h</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/phonet.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/phonet.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/phy.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/phy.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pid_namespace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/pid_namespace.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pinctrl/machine.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/pinctrl/machine.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/pinctrl/pinconf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/pinctrl/pinconf.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pinctrl/pinctrl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/pinctrl/pinctrl.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pinctrl/pinmux.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/pinctrl/pinmux.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pkt_sched.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/pkt_sched.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/platform_data/macb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/platform_data/macb.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/platform_data/mv_usb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/platform_data/mv_usb.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/platform_data/s3c-hsudc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/platform_data/s3c-hsudc.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/platform_device.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/platform_device.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.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='/cgit/linux.git/diff/include/linux/pm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/pm.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pm_domain.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/pm_domain.h</a></td><td class='right'>103</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='/cgit/linux.git/diff/include/linux/pm_qos.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/pm_qos.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pm_runtime.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/pm_runtime.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pmu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/pmu.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/power/charger-manager.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/power/charger-manager.h</a></td><td class='right'>147</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='mov'><a href='/cgit/linux.git/diff/include/linux/power/sbs-battery.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/power/sbs-battery.h</a> (renamed from include/linux/power/bq20z75.h)</td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/power_supply.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/power_supply.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/prctl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/prctl.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/proc_fs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/proc_fs.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pstore.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/pstore.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/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.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/radix-tree.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/radix-tree.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/raid/md_p.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/raid/md_p.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/raid/pq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/raid/pq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ramfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/ramfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/regmap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/regmap.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/regulator/consumer.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/regulator/consumer.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/regulator/driver.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/regulator/driver.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/regulator/of_regulator.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/regulator/of_regulator.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/reiserfs_fs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/reiserfs_fs.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/reiserfs_fs_sb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/reiserfs_fs_sb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/relay.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/relay.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/rmap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/rmap.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/s3c_adc_battery.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/s3c_adc_battery.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sched.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sched.h</a></td><td class='right'>80</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/security.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/security.h</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/seq_file.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/seq_file.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/serial_8250.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/serial_8250.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/serial_core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/serial_core.h</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: 1.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/serial_sci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/serial_sci.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sh_clk.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sh_clk.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sh_dma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sh_dma.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sh_intc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sh_intc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sh_pfc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sh_pfc.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/shmem_fs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/shmem_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='del'><a href='/cgit/linux.git/diff/include/linux/sigma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sigma.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.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/signal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/signal.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/sirfsoc_dma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sirfsoc_dma.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/skbuff.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/skbuff.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/slab_def.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/slab_def.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/smscphy.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/smscphy.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/sock_diag.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sock_diag.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sound.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sound.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/soundcard.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/soundcard.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/spi/spi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/spi/spi.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ssb/ssb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/ssb/ssb.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ssb/ssb_regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/ssb/ssb_regs.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sunrpc/auth.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sunrpc/auth.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sunrpc/auth_gss.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sunrpc/auth_gss.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sunrpc/cache.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sunrpc/cache.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sunrpc/clnt.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sunrpc/clnt.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sunrpc/rpc_pipe_fs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sunrpc/rpc_pipe_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='/cgit/linux.git/diff/include/linux/sunrpc/svc_xprt.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sunrpc/svc_xprt.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sunrpc/svcsock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sunrpc/svcsock.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sunrpc/xdr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sunrpc/xdr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/suspend.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/suspend.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/swap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/swap.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/swiotlb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/swiotlb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/syscalls.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/syscalls.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sysctl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sysctl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sysfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/sysfs.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/tcp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/tcp.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/tty_driver.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/tty_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='/cgit/linux.git/diff/include/linux/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/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='/cgit/linux.git/diff/include/linux/ucb1400.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/ucb1400.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/unix_diag.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/unix_diag.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/usb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/usb.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/usb/ch11.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/usb/ch11.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/usb/ch9.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/usb/ch9.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/usb/gadget.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/usb/gadget.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/usb/hcd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/usb/hcd.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/usb/renesas_usbhs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/usb/renesas_usbhs.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/usb/serial.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/usb/serial.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/videodev2.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/videodev2.h</a></td><td class='right'>58</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.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/virtio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/virtio.h</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.9%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/virtio_config.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/virtio_config.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/virtio_ring.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/virtio_ring.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/vmalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/vmalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/wanrouter.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/wanrouter.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/watchdog.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/watchdog.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/wl12xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/wl12xx.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/workqueue.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/workqueue.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/writeback.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/writeback.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/zorro_ids.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/linux/zorro_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/media/as3645a.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/media/as3645a.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/atmel-isi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/media/atmel-isi.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/cx25840.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/media/cx25840.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/davinci/vpbe.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/media/davinci/vpbe.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/davinci/vpbe_venc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/media/davinci/vpbe_venc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/media/davinci/vpif_types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/media/davinci/vpif_types.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/media-entity.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/media/media-entity.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/omap3isp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/media/omap3isp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/media/pwc-ioctl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/media/pwc-ioctl.h</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/rc-map.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/media/rc-map.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/soc_camera.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/media/soc_camera.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/tuner.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/media/tuner.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/v4l2-ioctl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/media/v4l2-ioctl.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/mtd/mtd-abi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/mtd/mtd-abi.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/9p/9p.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/9p/9p.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/addrconf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/addrconf.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/af_unix.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/af_unix.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/arp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/arp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/atmclip.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/atmclip.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/bluetooth/bluetooth.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/bluetooth/bluetooth.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/bluetooth/hci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/bluetooth/hci.h</a></td><td class='right'>83</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='/cgit/linux.git/diff/include/net/bluetooth/hci_core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/bluetooth/hci_core.h</a></td><td class='right'>370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/bluetooth/l2cap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/bluetooth/l2cap.h</a></td><td class='right'>457</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/bluetooth/mgmt.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/bluetooth/mgmt.h</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/bluetooth/smp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/bluetooth/smp.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/caif/caif_dev.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/caif/caif_dev.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/caif/caif_layer.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/caif/caif_layer.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/caif/caif_spi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/caif/caif_spi.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/caif/cfcnfg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/caif/cfcnfg.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/caif/cfserl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/caif/cfserl.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/cfg80211.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/cfg80211.h</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/dsa.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/dsa.h</a></td><td class='right'>144</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='/cgit/linux.git/diff/include/net/dst.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/dst.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/flow.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/flow.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/net/flow_keys.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/flow_keys.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/genetlink.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/genetlink.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/icmp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/icmp.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ieee80211_radiotap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/ieee80211_radiotap.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ieee802154.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/ieee802154.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/inet6_hashtables.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/inet6_hashtables.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/inet_connection_sock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/inet_connection_sock.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/inet_sock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/inet_sock.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/inet_timewait_sock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/inet_timewait_sock.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/inetpeer.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/inetpeer.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ip.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/ip.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ip6_fib.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/ip6_fib.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ip6_route.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/ip6_route.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ip_vs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/ip_vs.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ipv6.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/ipv6.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/iucv/af_iucv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/iucv/af_iucv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/mac80211.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/mac80211.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ndisc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/ndisc.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/neighbour.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/neighbour.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/net_namespace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/net_namespace.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/netfilter/nf_conntrack_acct.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/netfilter/nf_conntrack_acct.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/netfilter/nf_conntrack_expect.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/netfilter/nf_conntrack_expect.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/netfilter/nf_conntrack_tuple.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/netfilter/nf_conntrack_tuple.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/netfilter/nf_nat.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/netfilter/nf_nat.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/netfilter/nf_nat_core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/netfilter/nf_nat_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='/cgit/linux.git/diff/include/net/netfilter/nf_nat_protocol.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/netfilter/nf_nat_protocol.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/netfilter/nf_tproxy_core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/netfilter/nf_tproxy_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='/cgit/linux.git/diff/include/net/netns/ipv4.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/netns/ipv4.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/netns/mib.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/netns/mib.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/netns/xfrm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/netns/xfrm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/net/netprio_cgroup.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/netprio_cgroup.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/nfc/nci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/nfc/nci.h</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/nfc/nci_core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/nfc/nci_core.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/nfc/nfc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/nfc/nfc.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/protocol.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/protocol.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/red.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/red.h</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/regulatory.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/regulatory.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/sctp/sctp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/sctp/sctp.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/sctp/structs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/sctp/structs.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/snmp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/snmp.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/sock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/sock.h</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/tcp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/tcp.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/net/tcp_memcontrol.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/tcp_memcontrol.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/udp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/udp.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/xfrm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/net/xfrm.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/rdma/ib_addr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/rdma/ib_addr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/rdma/ib_cm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/rdma/ib_cm.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/scsi/libfc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/scsi/libfc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/scsi/scsi_device.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/scsi/scsi_device.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/scsi/scsi_host.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/scsi/scsi_host.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/scsi/scsi_transport_iscsi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/scsi/scsi_transport_iscsi.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/Kbuild?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/sound/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='/cgit/linux.git/diff/include/sound/compress_driver.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/sound/compress_driver.h</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/sound/compress_offload.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/sound/compress_offload.h</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/sound/compress_params.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/sound/compress_params.h</a></td><td class='right'>397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/control.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/sound/control.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/sound/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='/cgit/linux.git/diff/include/sound/info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/sound/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='/cgit/linux.git/diff/include/sound/minors.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/sound/minors.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/saif.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/sound/saif.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/sh_fsi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/sound/sh_fsi.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/soc-dapm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/sound/soc-dapm.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/soc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/sound/soc.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/sound/sta32x.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/sound/sta32x.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/wm8903.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/sound/wm8903.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/target/target_core_backend.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/target/target_core_backend.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/target/target_core_base.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/target/target_core_base.h</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/target/target_core_device.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/target/target_core_device.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: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/include/target/target_core_fabric.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/target/target_core_fabric.h</a> (renamed from include/target/target_core_fabric_ops.h)</td><td class='right'>94</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='del'><a href='/cgit/linux.git/diff/include/target/target_core_fabric_lib.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/target/target_core_fabric_lib.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/target/target_core_tmr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/target/target_core_tmr.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/target/target_core_tpg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/target/target_core_tpg.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.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/target/target_core_transport.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/target/target_core_transport.h</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/trace/events/btrfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/trace/events/btrfs.h</a></td><td class='right'>203</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='upd'><a href='/cgit/linux.git/diff/include/trace/events/ext4.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/trace/events/ext4.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/trace/events/kmem.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/trace/events/kmem.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/trace/events/oom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/trace/events/oom.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/trace/events/regmap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/trace/events/regmap.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/trace/events/task.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/trace/events/task.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/trace/events/vmscan.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/trace/events/vmscan.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/trace/events/writeback.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/trace/events/writeback.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/video/edid.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/video/edid.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/video/omapdss.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/video/omapdss.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/video/sh_mipi_dsi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/video/sh_mipi_dsi.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/video/sh_mobile_lcdc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/video/sh_mobile_lcdc.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/xen/balloon.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/xen/balloon.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/xen/events.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/xen/events.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/xen/grant_table.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/xen/grant_table.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/xen/interface/grant_table.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/xen/interface/grant_table.h</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/xen/interface/io/blkif.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/xen/interface/io/blkif.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/xen/interface/io/xs_wire.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/xen/interface/io/xs_wire.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/xen/interface/xen.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/xen/interface/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='/cgit/linux.git/diff/include/xen/xenbus.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/xen/xenbus.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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/xen/xenbus_dev.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>include/xen/xenbus_dev.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/init/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>init/Kconfig</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/init/calibrate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>init/calibrate.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/init/do_mounts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>init/do_mounts.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/init/initramfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>init/initramfs.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/init/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>init/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/ipc/mqueue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>ipc/mqueue.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/kernel/acct.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/acct.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.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/async.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/async.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/audit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/audit.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/audit.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/audit.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/auditfilter.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/auditfilter.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/auditsc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/auditsc.c</a></td><td class='right'>751</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 88.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/capability.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/capability.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/cgroup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/cgroup.c</a></td><td class='right'>423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/cgroup_freezer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/cgroup_freezer.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/cpu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/cpu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/cpuset.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/cpuset.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/debug/kdb/kdb_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/debug/kdb/kdb_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='/cgit/linux.git/diff/kernel/events/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/events/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/events/ring_buffer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/events/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='/cgit/linux.git/diff/kernel/exit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/exit.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/fork.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/fork.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/freezer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/freezer.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/irq/internals.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/irq/internals.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/irq/irqdomain.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/irq/irqdomain.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/irq/manage.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/irq/manage.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/irq/spurious.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/irq/spurious.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/jump_label.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/jump_label.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/kexec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/kexec.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/kmod.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/kmod.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/kprobes.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/kprobes.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/kthread.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/kthread.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/module.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/module.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/panic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/panic.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/params.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/params.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/pid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/pid.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/pid_namespace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/pid_namespace.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/power/hibernate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/power/hibernate.c</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: 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='/cgit/linux.git/diff/kernel/power/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/power/main.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/power/power.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/power/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='/cgit/linux.git/diff/kernel/power/process.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/power/process.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/power/snapshot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/power/snapshot.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/power/suspend.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/power/suspend.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/power/swap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/power/swap.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/power/user.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/power/user.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/printk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/printk.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/ptrace.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/relay.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/relay.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/res_counter.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/res_counter.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/rtmutex-tester.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/rtmutex-tester.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/sched/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/sched/core.c</a></td><td class='right'>75</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='/cgit/linux.git/diff/kernel/seccomp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/seccomp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/signal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/signal.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/sys.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/sys.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/sysctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/time/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/time/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/time/clockevents.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/time/clockevents.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/time/clocksource.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/time/clocksource.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/trace/blktrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/trace/blktrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/trace/ftrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/trace/ftrace.c</a></td><td class='right'>715</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 89.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/trace/trace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/trace/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='/cgit/linux.git/diff/kernel/trace/trace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/trace/trace.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/trace/trace_events_filter.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/trace/trace_events_filter.c</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/trace/trace_stack.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/trace/trace_stack.c</a></td><td class='right'>30</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='/cgit/linux.git/diff/kernel/tracepoint.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/tracepoint.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/workqueue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>kernel/workqueue.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/Kconfig</a></td><td class='right'>41</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='/cgit/linux.git/diff/lib/Kconfig.debug?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/Kconfig.debug</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/btree.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/btree.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/cordic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/cordic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/crc32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/crc32.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/decompress_bunzip2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/decompress_bunzip2.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/decompress_unlzma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/decompress_unlzma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/decompress_unlzo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/decompress_unlzo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/devres.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/devres.c</a></td><td class='right'>61</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='add'><a href='/cgit/linux.git/diff/lib/digsig.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/digsig.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/dynamic_queue_limits.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/dynamic_queue_limits.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/fault-inject.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/fault-inject.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/iomap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/iomap.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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/kobject.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/kobject.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.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/kobject_uevent.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/kobject_uevent.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='/cgit/linux.git/diff/lib/kref.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/kref.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/Makefile</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/generic_mpi-asm-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/generic_mpi-asm-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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/generic_mpih-add1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/generic_mpih-add1.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/generic_mpih-lshift.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/generic_mpih-lshift.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/generic_mpih-mul1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/generic_mpih-mul1.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/generic_mpih-mul2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/generic_mpih-mul2.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/generic_mpih-mul3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/generic_mpih-mul3.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/generic_mpih-rshift.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/generic_mpih-rshift.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/generic_mpih-sub1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/generic_mpih-sub1.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/longlong.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/longlong.h</a></td><td class='right'>1478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/mpi-add.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/mpi-add.c</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/mpi-bit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/mpi-bit.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/mpi-cmp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/mpi-cmp.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/mpi-div.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/mpi-div.c</a></td><td class='right'>333</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/mpi-gcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/mpi-gcd.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/mpi-inline.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/mpi-inline.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/mpi-inline.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/mpi-inline.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/mpi-internal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/mpi-internal.h</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/mpi-inv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/mpi-inv.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/mpi-mpow.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/mpi-mpow.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/mpi-mul.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/mpi-mul.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/mpi-pow.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/mpi-pow.c</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/mpi-scan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/mpi-scan.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/mpicoder.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/mpicoder.c</a></td><td class='right'>367</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/mpih-cmp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/mpih-cmp.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/mpi/mpih-div.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/mpih-div.c</a></td><td class='right'>541</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='/cgit/linux.git/diff/lib/mpi/mpih-mul.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/mpih-mul.c</a></td><td class='right'>527</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='/cgit/linux.git/diff/lib/mpi/mpiutil.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/mpi/mpiutil.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/pci_iomap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/pci_iomap.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/radix-tree.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/radix-tree.c</a></td><td class='right'>154</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='/cgit/linux.git/diff/lib/reciprocal_div.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/reciprocal_div.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/swiotlb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/swiotlb.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/vsprintf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>lib/vsprintf.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/Kconfig.debug?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/Kconfig.debug</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/backing-dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/backing-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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/bootmem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/bootmem.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/compaction.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/compaction.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/debug-pagealloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/debug-pagealloc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/fadvise.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/fadvise.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/failslab.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/failslab.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/filemap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/filemap.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/huge_memory.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/huge_memory.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/hugetlb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/hugetlb.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/kmemleak.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/kmemleak.c</a></td><td class='right'>158</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.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/ksm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/ksm.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/memcontrol.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/memcontrol.c</a></td><td class='right'>1227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.4%;'/><td class='rem' style='width: 9.4%;'/><td class='none' style='width: 81.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/memory-failure.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/memory-failure.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/memory.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/memory.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/memory_hotplug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/memory_hotplug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/mempolicy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/mempolicy.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/mempool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/mempool.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/migrate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/migrate.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.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='/cgit/linux.git/diff/mm/mmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/mmap.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/mremap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/mremap.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/oom_kill.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/oom_kill.c</a></td><td class='right'>50</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='/cgit/linux.git/diff/mm/page-writeback.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/page-writeback.c</a></td><td class='right'>538</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/page_alloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/page_alloc.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/page_cgroup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/page_cgroup.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/percpu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/percpu.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/rmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/rmap.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/shmem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/shmem.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/slab.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/slab.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/slub.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/slub.c</a></td><td class='right'>95</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='/cgit/linux.git/diff/mm/swap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/swap.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/swap_state.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/swap_state.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/swapfile.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/swapfile.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/vmalloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/vmalloc.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/vmscan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/vmscan.c</a></td><td class='right'>730</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/vmstat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>mm/vmstat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/8021q/vlan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/8021q/vlan.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/8021q/vlan.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/8021q/vlan.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/8021q/vlan_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/8021q/vlan_core.c</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/8021q/vlan_dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/8021q/vlan_dev.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><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='/cgit/linux.git/diff/net/8021q/vlan_gvrp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/8021q/vlan_gvrp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/8021q/vlan_netlink.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/8021q/vlan_netlink.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/8021q/vlanproc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/8021q/vlanproc.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/9p/client.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/9p/client.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.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='/cgit/linux.git/diff/net/9p/error.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/9p/error.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/9p/mod.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/9p/mod.c</a></td><td class='right'>31</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='/cgit/linux.git/diff/net/9p/protocol.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/9p/protocol.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/9p/trans_fd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/9p/trans_fd.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/9p/trans_rdma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/9p/trans_rdma.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/9p/trans_virtio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/9p/trans_virtio.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/9p/util.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/9p/util.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/net/atm/atm_misc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/atm/atm_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='/cgit/linux.git/diff/net/atm/br2684.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/atm/br2684.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/clip.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/atm/clip.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/atm/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.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/atm/common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/pppoatm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/atm/pppoatm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ax25/af_ax25.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ax25/af_ax25.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/batman-adv/bat_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/batman-adv/bat_sysfs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/batman-adv/bitarray.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/batman-adv/bitarray.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/batman-adv/gateway_client.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/batman-adv/gateway_client.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><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='/cgit/linux.git/diff/net/batman-adv/gateway_client.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/batman-adv/gateway_client.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/batman-adv/gateway_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/batman-adv/gateway_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/batman-adv/hash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/batman-adv/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/batman-adv/hash.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/batman-adv/hash.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/batman-adv/icmp_socket.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/batman-adv/main.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/batman-adv/main.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/batman-adv/originator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/batman-adv/originator.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/batman-adv/originator.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/batman-adv/originator.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/batman-adv/routing.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/batman-adv/routing.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/batman-adv/soft-interface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/batman-adv/soft-interface.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/batman-adv/translation-table.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/batman-adv/translation-table.c</a></td><td class='right'>437</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/batman-adv/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/batman-adv/types.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/batman-adv/vis.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/batman-adv/vis.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/Kconfig</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/af_bluetooth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/af_bluetooth.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/bnep/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/bnep/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/bnep/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/bnep/core.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/cmtp/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/cmtp/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/cmtp/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/cmtp/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/hci_conn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/hci_conn.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><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='/cgit/linux.git/diff/net/bluetooth/hci_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/hci_core.c</a></td><td class='right'>707</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/hci_event.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/hci_event.c</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/hci_sock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/hci_sock.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/hci_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/hci_sysfs.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/hidp/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/hidp/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/hidp/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/hidp/core.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.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='/cgit/linux.git/diff/net/bluetooth/l2cap_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/l2cap_core.c</a></td><td class='right'>1482</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.8%;'/><td class='rem' style='width: 8.0%;'/><td class='none' style='width: 77.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/l2cap_sock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/l2cap_sock.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/mgmt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/mgmt.c</a></td><td class='right'>1730</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.6%;'/><td class='rem' style='width: 10.0%;'/><td class='none' style='width: 73.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/rfcomm/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/rfcomm/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/rfcomm/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/rfcomm/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.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/rfcomm/sock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/rfcomm/sock.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/rfcomm/tty.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/rfcomm/tty.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/sco.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/sco.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.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='/cgit/linux.git/diff/net/bluetooth/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bluetooth/smp.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.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='/cgit/linux.git/diff/net/bridge/br.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bridge/br.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bridge/br_device.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_fdb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bridge/br_fdb.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_forward.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bridge/br_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='/cgit/linux.git/diff/net/bridge/br_if.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bridge/br_if.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_multicast.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bridge/br_multicast.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_netfilter.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bridge/br_netfilter.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_private.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bridge/br_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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/netfilter/ebt_ip6.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bridge/netfilter/ebt_ip6.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/netfilter/ebt_log.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/bridge/netfilter/ebt_log.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/caif/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/caif/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/caif/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/caif/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/caif/caif_dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/caif/caif_dev.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/caif/caif_usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/caif/caif_usb.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/caif/cfcnfg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/caif/cfcnfg.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.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/caif/cffrml.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/caif/cffrml.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/caif/cfpkt_skbuff.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/caif/cfpkt_skbuff.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/caif/cfrfml.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/caif/cfrfml.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/caif/cfserl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/caif/cfserl.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ceph/crush/mapper.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ceph/crush/mapper.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ceph/crypto.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ceph/crypto.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ceph/osd_client.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ceph/osd_client.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/core/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/core/dev.c</a></td><td class='right'>333</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/dev_addr_lists.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/core/dev_addr_lists.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/dst.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/core/dst.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/core/ethtool.c</a></td><td class='right'>712</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 8.3%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/core/flow_dissector.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/core/flow_dissector.c</a></td><td class='right'>143</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='/cgit/linux.git/diff/net/core/neighbour.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/core/neighbour.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/net-sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/core/net-sysfs.c</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/netpoll.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/core/netpoll.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/core/netprio_cgroup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/core/netprio_cgroup.c</a></td><td class='right'>344</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='/cgit/linux.git/diff/net/core/pktgen.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/core/pktgen.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/rtnetlink.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/core/rtnetlink.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/secure_seq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/core/secure_seq.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/skbuff.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/core/skbuff.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/sock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/core/sock.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/core/sock_diag.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/core/sock_diag.c</a></td><td class='right'>192</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='/cgit/linux.git/diff/net/core/sysctl_net_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/core/sysctl_net_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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ccids/ccid2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dccp/ccids/ccid2.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ccids/ccid3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dccp/ccids/ccid3.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ccids/lib/tfrc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dccp/ccids/lib/tfrc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ccids/lib/tfrc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dccp/ccids/lib/tfrc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/dccp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dccp/dccp.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/diag.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dccp/diag.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/feat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dccp/feat.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ipv4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dccp/ipv4.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ipv6.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dccp/ipv6.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/minisocks.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dccp/minisocks.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/options.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dccp/options.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/probe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dccp/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.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/proto.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dccp/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='/cgit/linux.git/diff/net/decnet/dn_dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/decnet/dn_dev.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/decnet/dn_neigh.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/decnet/dn_neigh.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/decnet/dn_route.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/decnet/dn_route.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/decnet/netfilter/dn_rtmsg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/decnet/netfilter/dn_rtmsg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dsa/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dsa/Kconfig</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dsa/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dsa/Makefile</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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dsa/dsa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dsa/dsa.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dsa/dsa_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dsa/dsa_priv.h</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: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dsa/tag_dsa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dsa/tag_edsa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dsa/tag_trailer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/econet/af_econet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/econet/af_econet.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee802154/6lowpan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ieee802154/6lowpan.c</a></td><td class='right'>374</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee802154/6lowpan.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ieee802154/6lowpan.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee802154/dgram.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ieee802154/dgram.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee802154/raw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ieee802154/raw.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/af_inet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/af_inet.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/arp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/arp.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/devinet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/devinet.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/fib_rules.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/fib_rules.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/fib_trie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/fib_trie.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/igmp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/igmp.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/inet_connection_sock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/inet_connection_sock.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/inet_diag.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/inet_diag.c</a></td><td class='right'>470</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/inetpeer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/inetpeer.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ip_fragment.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/ip_fragment.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ip_gre.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/ip_gre.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ip_output.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/ip_output.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ip_sockglue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/ip_sockglue.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipconfig.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/ipconfig.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipip.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/ipip.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipmr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/ipmr.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/net/ipv4/netfilter/ip_queue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/ip_queue.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ipt_MASQUERADE.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/ipt_MASQUERADE.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ipt_NETMAP.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/ipt_NETMAP.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ipt_REDIRECT.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/ipt_REDIRECT.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ipt_ULOG.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/ipt_ULOG.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ipt_ecn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/ipt_ecn.c</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: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ipt_rpfilter.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/ipt_rpfilter.c</a></td><td class='right'>141</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='/cgit/linux.git/diff/net/ipv4/netfilter/iptable_filter.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/iptable_filter.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_nat_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/nf_nat_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: 1.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_nat_h323.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/nf_nat_h323.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_nat_helper.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/nf_nat_helper.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_nat_pptp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/nf_nat_pptp.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_nat_proto_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/nf_nat_proto_common.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_nat_proto_dccp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/nf_nat_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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_nat_proto_gre.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/nf_nat_proto_gre.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_nat_proto_icmp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/nf_nat_proto_icmp.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_nat_proto_sctp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/nf_nat_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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_nat_proto_tcp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/nf_nat_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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_nat_proto_udp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/nf_nat_proto_udp.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_nat_proto_udplite.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/nf_nat_proto_udplite.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_nat_proto_unknown.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/nf_nat_proto_unknown.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_nat_rule.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/nf_nat_rule.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_nat_sip.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/nf_nat_sip.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_nat_standalone.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/netfilter/nf_nat_standalone.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ping.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/ping.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/proc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/proc.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/raw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/raw.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/route.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/route.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/syncookies.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/syncookies.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/sysctl_net_ipv4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/sysctl_net_ipv4.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/tcp.c</a></td><td class='right'>57</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='/cgit/linux.git/diff/net/ipv4/tcp_cong.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/tcp_cong.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_diag.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/tcp_diag.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/tcp_input.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_ipv4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/tcp_ipv4.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/ipv4/tcp_memcontrol.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/tcp_memcontrol.c</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_minisocks.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/tcp_minisocks.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_output.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/tcp_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.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/tcp_timer.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tunnel4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/tunnel4.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/udp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/udp.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/ipv4/udp_diag.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/udp_diag.c</a></td><td class='right'>200</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='upd'><a href='/cgit/linux.git/diff/net/ipv4/xfrm4_tunnel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv4/xfrm4_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/addrconf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/addrconf.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/af_inet6.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/af_inet6.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ah6.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/ah6.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/anycast.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/anycast.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/datagram.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/datagram.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/exthdrs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/exthdrs.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/exthdrs_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/exthdrs_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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/fib6_rules.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/fib6_rules.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/icmp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/icmp.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/inet6_connection_sock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/inet6_connection_sock.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ip6_fib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/ip6_fib.c</a></td><td class='right'>234</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='upd'><a href='/cgit/linux.git/diff/net/ipv6/ip6_flowlabel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/ip6_flowlabel.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ip6_input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/ip6_input.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ip6_output.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/ip6_output.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ip6_tunnel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/ip6_tunnel.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.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ip6mr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/ip6mr.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ipv6_sockglue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/ipv6_sockglue.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/mcast.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/mcast.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/mip6.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/mip6.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ndisc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/ndisc.c</a></td><td class='right'>54</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='/cgit/linux.git/diff/net/ipv6/netfilter/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/netfilter/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/netfilter/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/netfilter/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/netfilter/ip6_queue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/netfilter/ip6_queue.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/netfilter/ip6t_REJECT.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/netfilter/ip6t_REJECT.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/ipv6/netfilter/ip6t_rpfilter.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/netfilter/ip6t_rpfilter.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/netfilter/ip6table_filter.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/netfilter/ip6table_filter.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/proc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/proc.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/raw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/raw.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/reassembly.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/reassembly.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/route.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/route.c</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/sit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/sit.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/syncookies.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/syncookies.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/tcp_ipv6.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/tcp_ipv6.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/udp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/xfrm6_mode_beet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/xfrm6_mode_beet.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/xfrm6_mode_tunnel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/xfrm6_mode_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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/xfrm6_output.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/xfrm6_output.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/xfrm6_policy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/xfrm6_policy.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/xfrm6_state.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/ipv6/xfrm6_state.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/af_irda.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/irda/af_irda.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/irlan/irlan_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/irda/irlan/irlan_common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/irttp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/irda/irttp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/iucv/af_iucv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/iucv/af_iucv.c</a></td><td class='right'>103</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.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/key/af_key.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/key/af_key.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/agg-rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/agg-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.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/agg-tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/agg-tx.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/cfg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/cfg.c</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/debugfs.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/debugfs_netdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/debugfs_netdev.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/debugfs_sta.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/debugfs_sta.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/driver-ops.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/driver-ops.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/driver-trace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/driver-trace.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/ht.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/ht.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/ibss.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/ibss.c</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/ieee80211_i.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/ieee80211_i.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/iface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/iface.c</a></td><td class='right'>66</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='/cgit/linux.git/diff/net/mac80211/key.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/key.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/main.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/mesh.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/mesh.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/mesh.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/mesh.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/mesh_hwmp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/mesh_hwmp.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/mesh_pathtbl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/mesh_pathtbl.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.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/mesh_plink.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/mesh_plink.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/mlme.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/mlme.c</a></td><td class='right'>139</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='/cgit/linux.git/diff/net/mac80211/offchannel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/offchannel.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/pm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/rc80211_minstrel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/rc80211_minstrel.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/rc80211_minstrel_ht.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/rc80211_minstrel_ht.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/rc80211_pid_algo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/rc80211_pid_algo.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/rx.c</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/scan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/scan.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/sta_info.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/sta_info.c</a></td><td class='right'>385</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/sta_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/sta_info.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/status.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/status.c</a></td><td class='right'>102</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='/cgit/linux.git/diff/net/mac80211/tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/tx.c</a></td><td class='right'>417</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/util.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/util.c</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/wep.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/wep.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/wme.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/wme.c</a></td><td class='right'>38</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='/cgit/linux.git/diff/net/mac80211/wme.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/wme.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/work.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/work.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 2.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='/cgit/linux.git/diff/net/mac80211/wpa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/wpa.c</a></td><td class='right'>55</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/mac80211/wpa.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/mac80211/wpa.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/Kconfig</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/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'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/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.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/ipset/ip_set_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/ipset/ip_set_core.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/ipset/ip_set_getport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/ipset/ip_set_getport.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/ipset/ip_set_hash_ip.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/ipset/ip_set_hash_ip.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/ipset/ip_set_hash_net.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/ipset/ip_set_hash_net.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/ipvs/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/ipvs/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/ipvs/ip_vs_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/net/netfilter/ipvs/ip_vs_ctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/ipvs/ip_vs_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='/cgit/linux.git/diff/net/netfilter/ipvs/ip_vs_pe_sip.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/ipvs/ip_vs_pe_sip.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/ipvs/ip_vs_sh.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/ipvs/ip_vs_sh.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/ipvs/ip_vs_sync.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/ipvs/ip_vs_sync.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/ipvs/ip_vs_xmit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/ipvs/ip_vs_xmit.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_acct.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/nf_conntrack_acct.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/nf_conntrack_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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_ecache.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/nf_conntrack_ecache.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_expect.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/nf_conntrack_expect.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.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_extend.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/nf_conntrack_extend.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_ftp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/nf_conntrack_ftp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_h323_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/nf_conntrack_h323_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_helper.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/nf_conntrack_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='/cgit/linux.git/diff/net/netfilter/nf_conntrack_netlink.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/nf_conntrack_netlink.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_proto_dccp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_proto_gre.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/nf_conntrack_proto_gre.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_proto_sctp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_proto_tcp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_proto_udp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/nf_conntrack_proto_udp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_proto_udplite.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/nf_conntrack_proto_udplite.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_standalone.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/nf_conntrack_standalone.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_timestamp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/nf_conntrack_timestamp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_log.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/nf_log.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_queue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/nf_queue.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nfnetlink.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/nfnetlink.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/netfilter/nfnetlink_acct.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/nfnetlink_acct.c</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_AUDIT.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/xt_AUDIT.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_NFQUEUE.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/xt_NFQUEUE.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_TCPMSS.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/xt_TCPMSS.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_TCPOPTSTRIP.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/xt_TCPOPTSTRIP.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_TEE.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/xt_TEE.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_TPROXY.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/xt_TPROXY.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_addrtype.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/xt_addrtype.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_connbytes.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/xt_connbytes.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.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/netfilter/xt_ecn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/xt_ecn.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_hashlimit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/xt_hashlimit.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/netfilter/xt_nfacct.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/xt_nfacct.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_socket.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netfilter/xt_socket.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netlabel/netlabel_addrlist.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netlabel/netlabel_addrlist.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netlabel/netlabel_addrlist.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netlabel/netlabel_addrlist.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netlabel/netlabel_domainhash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netlabel/netlabel_domainhash.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netlabel/netlabel_domainhash.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netlabel/netlabel_domainhash.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netlabel/netlabel_kapi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netlabel/netlabel_kapi.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netlabel/netlabel_mgmt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netlabel/netlabel_mgmt.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netlabel/netlabel_unlabeled.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netlabel/netlabel_unlabeled.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netlink/af_netlink.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netlink/af_netlink.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netlink/genetlink.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netlink/genetlink.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netrom/af_netrom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netrom/af_netrom.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netrom/nr_route.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/netrom/nr_route.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/nfc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/nfc/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='/cgit/linux.git/diff/net/nfc/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/nfc/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/nfc/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/nfc/core.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/nfc/llcp/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/nfc/llcp/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/nfc/llcp/commands.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/nfc/llcp/commands.c</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/nfc/llcp/llcp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/nfc/llcp/llcp.c</a></td><td class='right'>971</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/nfc/llcp/llcp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/nfc/llcp/llcp.h</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/nfc/llcp/sock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/nfc/llcp/sock.c</a></td><td class='right'>675</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/nfc/nci/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/nfc/nci/core.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/nfc/nci/data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/nfc/nci/data.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/nfc/nci/lib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/nfc/nci/lib.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/nfc/nci/ntf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/nfc/nci/ntf.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/nfc/nci/rsp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/nfc/nci/rsp.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/nfc/netlink.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/nfc/netlink.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/nfc/nfc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/nfc/nfc.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/nfc/rawsock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/nfc/rawsock.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/openvswitch/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/openvswitch/Kconfig</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/openvswitch/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/openvswitch/Makefile</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/openvswitch/actions.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/openvswitch/actions.c</a></td><td class='right'>415</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/openvswitch/datapath.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/openvswitch/datapath.c</a></td><td class='right'>1910</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 29.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 70.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/openvswitch/datapath.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/openvswitch/datapath.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/openvswitch/dp_notify.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/openvswitch/dp_notify.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/openvswitch/flow.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/openvswitch/flow.c</a></td><td class='right'>1345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/openvswitch/flow.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/openvswitch/flow.h</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/openvswitch/vport-internal_dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/openvswitch/vport-internal_dev.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/openvswitch/vport-internal_dev.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/openvswitch/vport-internal_dev.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/openvswitch/vport-netdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/openvswitch/vport-netdev.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/openvswitch/vport-netdev.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/openvswitch/vport-netdev.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/openvswitch/vport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/openvswitch/vport.c</a></td><td class='right'>397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/openvswitch/vport.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/openvswitch/vport.h</a></td><td class='right'>205</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='upd'><a href='/cgit/linux.git/diff/net/packet/af_packet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/packet/af_packet.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/phonet/af_phonet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/phonet/af_phonet.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/phonet/pep.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/phonet/pep.c</a></td><td class='right'>106</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.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/phonet/pn_dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/phonet/pn_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='/cgit/linux.git/diff/net/phonet/socket.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/phonet/socket.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/rds/iw_rdma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/rds/iw_rdma.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/rfkill/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/rfkill/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/rfkill/rfkill-gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/rfkill/rfkill-gpio.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/rfkill/rfkill-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/rfkill/rfkill-regulator.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/rxrpc/ar-ack.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/rxrpc/ar-ack.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/rxrpc/ar-key.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/rxrpc/ar-key.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/rxrpc/ar-output.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/rxrpc/ar-output.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/cls_flow.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sched/cls_flow.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_api.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sched/sch_api.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_choke.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sched/sch_choke.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sched/sch_generic.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_gred.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sched/sch_gred.c</a></td><td class='right'>81</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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_hfsc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sched/sch_hfsc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_multiq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sched/sch_multiq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_netem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sched/sch_netem.c</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_qfq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sched/sch_qfq.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_red.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sched/sch_red.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_sfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sched/sch_sfb.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_sfq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sched/sch_sfq.c</a></td><td class='right'>495</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_tbf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sched/sch_tbf.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_teql.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sched/sch_teql.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/endpointola.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sctp/endpointola.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sctp/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='/cgit/linux.git/diff/net/sctp/ipv6.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sctp/ipv6.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/protocol.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/net/sctp/sm_make_chunk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sctp/sm_make_chunk.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/sm_sideeffect.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sctp/sm_sideeffect.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/socket.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sctp/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/transport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sctp/transport.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/socket.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/socket.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/addr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sunrpc/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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/auth_generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sunrpc/auth_generic.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/auth_gss/auth_gss.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sunrpc/auth_gss/auth_gss.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/cache.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sunrpc/cache.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/rpc_pipe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sunrpc/rpc_pipe.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/sched.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sunrpc/sched.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/svc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sunrpc/svc.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/svc_xprt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sunrpc/svc_xprt.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/svcauth_unix.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sunrpc/svcauth_unix.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/svcsock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sunrpc/svcsock.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/xdr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sunrpc/xdr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/xprtrdma/svc_rdma_transport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/sunrpc/xprtrdma/svc_rdma_transport.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/bcast.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/bcast.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/bcast.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/bcast.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/bearer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/bearer.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/bearer.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/bearer.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/config.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/config.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>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='/cgit/linux.git/diff/net/tipc/discover.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/discover.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/discover.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/discover.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/eth_media.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/eth_media.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/link.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/link.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/link.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/link.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/msg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/msg.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/msg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/msg.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/name_distr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/name_distr.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/name_table.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/name_table.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/name_table.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/name_table.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/net.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/net.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/node.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/node.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/node.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/node.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/port.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/port.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/port.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/port.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/ref.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/ref.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/socket.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/socket.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/subscr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/subscr.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/subscr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/tipc/subscr.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/unix/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/unix/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/unix/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/unix/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/unix/af_unix.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/unix/af_unix.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/unix/diag.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/unix/diag.c</a></td><td class='right'>329</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='upd'><a href='/cgit/linux.git/diff/net/wireless/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/wireless/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wireless/chan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/wireless/chan.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wireless/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/wireless/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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wireless/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/wireless/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.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wireless/genregdb.awk?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/wireless/genregdb.awk</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wireless/mesh.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/wireless/mesh.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wireless/mlme.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/wireless/mlme.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wireless/nl80211.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/wireless/nl80211.c</a></td><td class='right'>889</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 86.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wireless/nl80211.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/wireless/nl80211.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wireless/reg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/wireless/reg.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wireless/reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/wireless/reg.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wireless/regdb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/wireless/regdb.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wireless/scan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/wireless/scan.c</a></td><td class='right'>117</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.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wireless/sme.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/wireless/sme.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wireless/util.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/wireless/util.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wireless/wext-compat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/wireless/wext-compat.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/x25/af_x25.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/x25/af_x25.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/x25/x25_dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/x25/x25_dev.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/x25/x25_route.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/x25/x25_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='/cgit/linux.git/diff/net/xfrm/xfrm_policy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/xfrm/xfrm_policy.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/xfrm/xfrm_state.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/xfrm/xfrm_state.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/xfrm/xfrm_user.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/xfrm/xfrm_user.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/Makefile.headersinst?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/Makefile.headersinst</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/Makefile.lib?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/Makefile.lib</a></td><td class='right'>8</td><td class='graph'><table summary='file 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'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/checkpatch.pl?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/checkpatch.pl</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/checksyscalls.sh?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/checksyscalls.sh</a></td><td class='right'>15</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'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/coccicheck?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/coccicheck</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/coccinelle/api/devm_request_and_ioremap.cocci?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/coccinelle/api/devm_request_and_ioremap.cocci</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/coccinelle/api/kstrdup.cocci?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/coccinelle/api/kstrdup.cocci</a></td><td class='right'>75</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='/cgit/linux.git/diff/scripts/coccinelle/api/memdup.cocci?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/coccinelle/api/memdup.cocci</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/coccinelle/api/memdup_user.cocci?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/coccinelle/api/memdup_user.cocci</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/coccinelle/free/devm_free.cocci?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/coccinelle/free/devm_free.cocci</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/coccinelle/free/kfree.cocci?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/coccinelle/free/kfree.cocci</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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/coccinelle/iterators/fen.cocci?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/coccinelle/iterators/fen.cocci</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/coccinelle/iterators/itnull.cocci?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/coccinelle/iterators/itnull.cocci</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/coccinelle/locks/call_kern.cocci?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/coccinelle/locks/call_kern.cocci</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/coccinelle/locks/flags.cocci?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/coccinelle/locks/flags.cocci</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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/coccinelle/locks/mini_lock.cocci?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/coccinelle/locks/mini_lock.cocci</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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/coccinelle/misc/doubleinit.cocci?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/coccinelle/misc/doubleinit.cocci</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/coccinelle/null/eno.cocci?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/coccinelle/null/eno.cocci</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/dtc/dtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/dtc/dtc.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/dtc/srcpos.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/dtc/srcpos.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/dtc/srcpos.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/dtc/srcpos.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/genksyms/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/genksyms/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'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/get_maintainer.pl?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/get_maintainer.pl</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/kconfig/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/confdata.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/kconfig/confdata.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/expr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/kconfig/expr.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/gconf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/kconfig/gconf.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/lkc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/kconfig/lkc.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/mconf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/kconfig/mconf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/kconfig/merge_config.sh?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/kconfig/merge_config.sh</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/streamline_config.pl?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/kconfig/streamline_config.pl</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/mod/file2alias.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/mod/file2alias.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/package/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/package/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/recordmcount.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/recordmcount.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 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='/cgit/linux.git/diff/scripts/tags.sh?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>scripts/tags.sh</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/apparmor/apparmorfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/apparmor/apparmorfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/apparmor/audit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/apparmor/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='/cgit/linux.git/diff/security/apparmor/include/apparmor.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/apparmor/include/apparmor.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/apparmor/lsm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/apparmor/lsm.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/apparmor/path.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/apparmor/path.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/capability.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/capability.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/commoncap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/commoncap.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/device_cgroup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/device_cgroup.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/inode.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/integrity/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/integrity/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/integrity/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/integrity/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/security/integrity/digsig.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/integrity/digsig.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/integrity/evm/evm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/integrity/evm/evm.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/integrity/evm/evm_crypto.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/integrity/evm/evm_crypto.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/integrity/evm/evm_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/integrity/evm/evm_main.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/integrity/ima/ima_api.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/integrity/ima/ima_api.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/integrity/ima/ima_audit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/integrity/ima/ima_audit.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/integrity/ima/ima_policy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/integrity/ima/ima_policy.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/integrity/ima/ima_queue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/integrity/ima/ima_queue.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/integrity/integrity.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/integrity/integrity.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/keys/encrypted-keys/encrypted.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/keys/encrypted-keys/encrypted.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/keys/encrypted-keys/masterkey_trusted.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/keys/encrypted-keys/masterkey_trusted.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/keys/gc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/keys/gc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/keys/key.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/keys/key.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/keys/keyring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/keys/keyring.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/keys/trusted.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/keys/trusted.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/keys/user_defined.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/keys/user_defined.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/lsm_audit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/lsm_audit.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/security.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/security.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.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='/cgit/linux.git/diff/security/selinux/hooks.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/selinux/hooks.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.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='/cgit/linux.git/diff/security/selinux/netnode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/selinux/netnode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/selinux/selinuxfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/selinux/selinuxfs.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/selinux/ss/conditional.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/selinux/ss/conditional.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/smack/smack_lsm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/smack/smack_lsm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/security/tomoyo/.gitignore?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/tomoyo/.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='/cgit/linux.git/diff/security/tomoyo/audit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/tomoyo/audit.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/tomoyo/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/tomoyo/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/tomoyo/realpath.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/tomoyo/realpath.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/tomoyo/securityfs_if.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/tomoyo/securityfs_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='/cgit/linux.git/diff/security/tomoyo/tomoyo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/tomoyo/tomoyo.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/tomoyo/util.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>security/tomoyo/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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/aoa/codecs/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/aoa/codecs/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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/arm/aaci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/arm/aaci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/arm/pxa2xx-ac97.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/arm/pxa2xx-ac97.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/atmel/abdac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/atmel/abdac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/atmel/ac97c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/atmel/ac97c.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/core/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/core/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/core/compress_offload.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/core/compress_offload.c</a></td><td class='right'>765</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/core/ctljack.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/core/ctljack.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/oss/pcm_oss.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/core/oss/pcm_oss.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/seq/seq_dummy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/core/seq/seq_dummy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/sound.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/core/sound.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/aloop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/drivers/aloop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/dummy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/drivers/dummy.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/ml403-ac97cr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/drivers/ml403-ac97cr.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/mpu401/mpu401.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/drivers/mpu401/mpu401.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/mts64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/drivers/mts64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/opl3/opl3_midi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/drivers/opl3/opl3_midi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/opl3/opl3_seq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/drivers/opl3/opl3_seq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/pcsp/pcsp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/drivers/pcsp/pcsp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/pcsp/pcsp_lib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/drivers/pcsp/pcsp_lib.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/portman2x4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/drivers/portman2x4.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/serial-u16550.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/drivers/serial-u16550.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/virmidi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/drivers/virmidi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/ad1816a/ad1816a.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/ad1816a/ad1816a.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/ad1848/ad1848.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/ad1848/ad1848.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/adlib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/adlib.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/als100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/als100.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/azt2320.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/azt2320.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/cmi8330.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/cmi8330.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/cs423x/cs4231.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/cs423x/cs4231.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/cs423x/cs4236.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/cs423x/cs4236.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/es1688/es1688.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/es1688/es1688.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/es18xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/es18xx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/galaxy/galaxy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/galaxy/galaxy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/gus/gusclassic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/gus/gusclassic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/gus/gusextreme.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/gus/gusextreme.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/gus/gusmax.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/gus/gusmax.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/gus/interwave.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/gus/interwave.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/msnd/msnd_pinnacle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/msnd/msnd_pinnacle.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/opl3sa2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/opl3sa2.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/opti9xx/miro.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/opti9xx/miro.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/opti9xx/opti92x-ad1848.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/opti9xx/opti92x-ad1848.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/sb/jazz16.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/sb/jazz16.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/sb/sb16.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/sb/sb16.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/sb/sb8.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/sb/sb8.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/sc6000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/sc6000.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/wavefront/wavefront.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/isa/wavefront/wavefront.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/mips/hal2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/mips/hal2.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/mips/sgio2audio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/mips/sgio2audio.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/oss/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/ad1848.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/oss/ad1848.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/msnd_pinnacle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/oss/msnd_pinnacle.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/pas2_card.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/oss/pas2_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/pss.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/oss/pss.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/trix.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/oss/trix.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ac97/ac97_codec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/ac97/ac97_codec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ad1889.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/ad1889.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ali5451/ali5451.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/ali5451/ali5451.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/als300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/als300.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/als4000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/als4000.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/asihpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/asihpi.c</a></td><td class='right'>294</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.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpi.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpi6000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpi6000.c</a></td><td class='right'>61</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='/cgit/linux.git/diff/sound/pci/asihpi/hpi6000.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpi6000.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpi6205.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpi6205.c</a></td><td class='right'>57</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='/cgit/linux.git/diff/sound/pci/asihpi/hpi_internal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpi_internal.h</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: 1.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpi_version.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpi_version.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpicmn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpicmn.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpicmn.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpicmn.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpidebug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpidebug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpidebug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpidebug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpidspcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpidspcd.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpidspcd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpidspcd.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpifunc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpifunc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpimsginit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpimsginit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpimsginit.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpimsginit.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpimsgx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpimsgx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpimsgx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpimsgx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpioctl.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpioctl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpioctl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpios.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpios.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpios.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpios.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/asihpi/hpipcida.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/asihpi/hpipcida.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/atiixp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/atiixp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/atiixp_modem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/atiixp_modem.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/au88x0/au88x0.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/au88x0/au88x0.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/au88x0/au88x0.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/au88x0/au88x0.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/au88x0/au88x0_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/au88x0/au88x0_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/au88x0/au88x0_pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/au88x0/au88x0_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.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/au88x0/au88x0_xtalk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/au88x0/au88x0_xtalk.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.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='/cgit/linux.git/diff/sound/pci/aw2/aw2-alsa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/aw2/aw2-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='/cgit/linux.git/diff/sound/pci/azt3328.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/azt3328.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/bt87x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/bt87x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ca0106/ca0106_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/ca0106/ca0106_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='/cgit/linux.git/diff/sound/pci/cmipci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/cmipci.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/cs4281.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/cs4281.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/cs46xx/cs46xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/cs46xx/cs46xx.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/cs5530.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/cs5530.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/cs5535audio/cs5535audio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/cs5535audio/cs5535audio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ctxfi/ctsrc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/ctxfi/ctsrc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ctxfi/cttimer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/ctxfi/cttimer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ctxfi/xfi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/ctxfi/xfi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/echoaudio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/echoaudio/echoaudio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/emu10k1/emu10k1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/emu10k1/emu10k1.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/emu10k1/emu10k1_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/emu10k1/emu10k1_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.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/emu10k1/emu10k1x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/emu10k1/emu10k1x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ens1370.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/ens1370.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/es1938.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/es1938.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/es1968.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/es1968.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/fm801.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/fm801.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/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='/cgit/linux.git/diff/sound/pci/hda/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/sound/pci/hda/alc262_quirks.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/alc262_quirks.c</a></td><td class='right'>875</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.4%;'/><td class='none' style='width: 86.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/alc880_quirks.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/alc880_quirks.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/alc882_quirks.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/alc882_quirks.c</a></td><td class='right'>2867</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 44.0%;'/><td class='none' style='width: 56.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/hda_codec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/hda_codec.c</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/hda_codec.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/hda_codec.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/hda_intel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/hda_intel.c</a></td><td class='right'>113</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='add'><a href='/cgit/linux.git/diff/sound/pci/hda/hda_jack.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/hda_jack.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/hda/hda_jack.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/hda_jack.h</a></td><td class='right'>86</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='/cgit/linux.git/diff/sound/pci/hda/hda_local.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/hda_local.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.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='/cgit/linux.git/diff/sound/pci/hda/hda_proc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/hda_proc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/patch_analog.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/patch_analog.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/patch_ca0110.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/patch_ca0110.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/patch_cirrus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/patch_cirrus.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/patch_conexant.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/patch_conexant.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/patch_hdmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/patch_hdmi.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/patch_realtek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/patch_realtek.c</a></td><td class='right'>693</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 89.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/patch_sigmatel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/patch_sigmatel.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/patch_via.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/hda/patch_via.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ice1712/amp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/ice1712/amp.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ice1712/envy24ht.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/ice1712/envy24ht.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ice1712/ice1712.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/ice1712/ice1712.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ice1712/ice1724.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/ice1712/ice1724.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/intel8x0.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/intel8x0.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/intel8x0m.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/intel8x0m.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/korg1212/korg1212.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/korg1212/korg1212.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/lola/lola.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/lola/lola.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/lx6464es/lx6464es.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/lx6464es/lx6464es.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/maestro3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/maestro3.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/mixart/mixart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/mixart/mixart.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/nm256/nm256.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/nm256/nm256.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/oxygen/oxygen.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/oxygen/oxygen.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/oxygen/virtuoso.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/oxygen/virtuoso.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/oxygen/xonar_cs43xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/oxygen/xonar_cs43xx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/oxygen/xonar_dg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/oxygen/xonar_dg.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/oxygen/xonar_wm87x6.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/oxygen/xonar_wm87x6.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/pcxhr/pcxhr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/pcxhr/pcxhr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/riptide/riptide.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/riptide/riptide.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/rme32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/rme32.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/rme96.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/rme96.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/rme9652/hdsp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/rme9652/hdsp.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/rme9652/hdspm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/rme9652/hdspm.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/rme9652/rme9652.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/rme9652/rme9652.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/sis7019.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/sis7019.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/sonicvibes.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/sonicvibes.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/trident/trident.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/trident/trident.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/via82xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/via82xx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/via82xx_modem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/via82xx_modem.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/vx222/vx222.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/vx222/vx222.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ymfpci/ymfpci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pci/ymfpci/ymfpci.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pcmcia/pdaudiocf/pdaudiocf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pcmcia/pdaudiocf/pdaudiocf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pcmcia/vx/vxpocket.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/pcmcia/vx/vxpocket.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/ppc/powermac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/ppc/powermac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/sh/aica.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/sh/aica.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/sh/sh_dac_audio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/sh/sh_dac_audio.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/atmel/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/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='/cgit/linux.git/diff/sound/soc/atmel/atmel-pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/atmel/atmel-pcm.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/atmel/atmel_ssc_dai.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/atmel/atmel_ssc_dai.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/atmel/sam9g20_wm8731.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/atmel/sam9g20_wm8731.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/atmel/snd-soc-afeb9260.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/atmel/snd-soc-afeb9260.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/au1x/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/au1x/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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/au1x/ac97c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/au1x/ac97c.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/au1x/db1000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/au1x/db1000.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/au1x/db1200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/au1x/db1200.c</a></td><td class='right'>88</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.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/au1x/dbdma2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/au1x/dbdma2.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/au1x/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/au1x/dma.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/au1x/i2sc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/au1x/i2sc.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.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='/cgit/linux.git/diff/sound/soc/au1x/psc-ac97.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/au1x/psc-ac97.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.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/au1x/psc-i2s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/au1x/psc-i2s.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.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/blackfin/bf5xx-ac97-pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/blackfin/bf5xx-ac97-pcm.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/blackfin/bf5xx-ac97.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/blackfin/bf5xx-ac97.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/blackfin/bf5xx-ad1836.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/blackfin/bf5xx-ad1836.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/blackfin/bf5xx-ad193x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/blackfin/bf5xx-ad193x.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/blackfin/bf5xx-ad1980.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/blackfin/bf5xx-ad1980.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/blackfin/bf5xx-ad73311.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/blackfin/bf5xx-ad73311.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/blackfin/bf5xx-i2s-pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/blackfin/bf5xx-i2s-pcm.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/blackfin/bf5xx-i2s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/blackfin/bf5xx-i2s.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/blackfin/bf5xx-ssm2602.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/blackfin/bf5xx-ssm2602.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/blackfin/bf5xx-tdm-pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/blackfin/bf5xx-tdm-pcm.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/blackfin/bf5xx-tdm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/blackfin/bf5xx-tdm.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/blackfin/bfin-eval-adau1373.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/blackfin/bfin-eval-adau1373.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/blackfin/bfin-eval-adau1701.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/blackfin/bfin-eval-adau1701.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/blackfin/bfin-eval-adav80x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/blackfin/bfin-eval-adav80x.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/88pm860x-codec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/88pm860x-codec.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/Kconfig</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/Makefile</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/ac97.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/ac97.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/ad1836.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/ad1836.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/ad193x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/ad193x.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/ad193x.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/ad193x.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.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/ad1980.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/ad1980.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/ad73311.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/ad73311.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/adau1373.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/adau1373.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/adau1701.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/adau1701.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/adav80x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/adav80x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/ads117x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/ads117x.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/ak4104.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/ak4104.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/ak4535.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/ak4535.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/ak4641.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/ak4641.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/ak4642.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/ak4642.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/ak4671.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/ak4671.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/alc5623.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/alc5623.c</a></td><td class='right'>28</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='add'><a href='/cgit/linux.git/diff/sound/soc/codecs/alc5632.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/alc5632.c</a></td><td class='right'>1159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/soc/codecs/alc5632.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/alc5632.h</a></td><td class='right'>251</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='/cgit/linux.git/diff/sound/soc/codecs/cq93vc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/cq93vc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/cs4270.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/cs4270.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/cs4271.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/cs4271.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/cs42l51.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/cs42l51.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/soc/codecs/cs42l73.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/cs42l73.c</a></td><td class='right'>1453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/soc/codecs/cs42l73.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/cs42l73.h</a></td><td class='right'>227</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='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/cx20442.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/cx20442.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/da7210.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/da7210.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/dfbmcs320.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/dfbmcs320.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/dmic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/dmic.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/jz4740.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/jz4740.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/lm4857.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/lm4857.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/max98088.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/max98088.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/max98095.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/max98095.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/max9850.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/max9850.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/pcm3008.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/pcm3008.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/rt5631.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/rt5631.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/sgtl5000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/sgtl5000.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/sound/soc/codecs/sigmadsp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/sigmadsp.c</a> (renamed from drivers/firmware/sigma.c)</td><td class='right'>121</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.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/soc/codecs/sigmadsp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/sigmadsp.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/sn95031.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/sn95031.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/spdif_transciever.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/spdif_transciever.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/ssm2602.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/ssm2602.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/sta32x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/sta32x.c</a></td><td class='right'>103</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='/cgit/linux.git/diff/sound/soc/codecs/stac9766.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/stac9766.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/tlv320aic23.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/tlv320aic23.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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/tlv320aic26.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/tlv320aic26.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/tlv320aic32x4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/tlv320aic32x4.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/tlv320aic3x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/tlv320aic3x.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.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/tlv320dac33.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/tlv320dac33.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/tpa6130a2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/tpa6130a2.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/twl4030.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/twl4030.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/twl6040.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/twl6040.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/twl6040.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/twl6040.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/uda134x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/uda134x.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/uda1380.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/uda1380.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.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='/cgit/linux.git/diff/sound/soc/codecs/wl1273.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wl1273.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm1250-ev1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm1250-ev1.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm2000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm2000.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm2000.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm2000.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm5100-tables.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm5100-tables.c</a></td><td class='right'>1489</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 12.7%;'/><td class='none' style='width: 77.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm5100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm5100.c</a></td><td class='right'>415</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm5100.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm5100.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8350.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8350.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.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='/cgit/linux.git/diff/sound/soc/codecs/wm8400.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8400.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.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='/cgit/linux.git/diff/sound/soc/codecs/wm8510.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8510.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8523.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8523.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8580.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8580.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.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8711.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8711.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8727.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8727.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8728.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8728.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8731.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8731.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8737.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8737.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8741.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8741.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.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8750.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8750.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8753.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8753.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8770.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8770.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8776.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8776.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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8782.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8782.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8804.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8804.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8900.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8900.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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8903.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8903.c</a></td><td class='right'>664</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8904.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8904.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8940.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8940.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8955.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8955.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8958-dsp2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8958-dsp2.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8960.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8960.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: 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='/cgit/linux.git/diff/sound/soc/codecs/wm8961.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8961.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8962.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8962.c</a></td><td class='right'>1646</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.0%;'/><td class='rem' style='width: 12.3%;'/><td class='none' style='width: 74.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8971.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8971.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8974.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8974.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8978.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8978.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8983.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8983.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8985.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8985.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8988.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8988.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8990.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8990.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8991.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8991.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8993.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8993.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8994-tables.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8994-tables.c</a></td><td class='right'>3147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 48.3%;'/><td class='none' style='width: 51.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8994.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8994.c</a></td><td class='right'>659</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8994.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8994.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8995.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8995.c</a></td><td class='right'>732</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.5%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm8996.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm8996.c</a></td><td class='right'>945</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 6.5%;'/><td class='none' style='width: 85.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm9081.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm9081.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm9090.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm9090.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm9705.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm9705.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm9712.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm9712.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm9713.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm9713.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/codecs/wm_hubs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/codecs/wm_hubs.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/davinci/davinci-evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/davinci/davinci-evm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/davinci/davinci-i2s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/davinci/davinci-i2s.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.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='/cgit/linux.git/diff/sound/soc/davinci/davinci-mcasp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/davinci/davinci-mcasp.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.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='/cgit/linux.git/diff/sound/soc/davinci/davinci-pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/davinci/davinci-pcm.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/davinci/davinci-sffsdr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/davinci/davinci-sffsdr.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/davinci/davinci-vcif.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/davinci/davinci-vcif.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/ep93xx/edb93xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/ep93xx/edb93xx.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.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/ep93xx/ep93xx-ac97.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/ep93xx/ep93xx-ac97.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/ep93xx/ep93xx-i2s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/ep93xx/ep93xx-i2s.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/ep93xx/ep93xx-pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/ep93xx/ep93xx-pcm.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/ep93xx/simone.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/ep93xx/simone.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/ep93xx/snappercl15.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/ep93xx/snappercl15.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/fsl/efika-audio-fabric.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/fsl/efika-audio-fabric.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/fsl/fsl_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/fsl/fsl_dma.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/fsl/fsl_ssi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/fsl/fsl_ssi.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/fsl/mpc5200_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/fsl/mpc5200_dma.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/fsl/mpc5200_psc_ac97.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/fsl/mpc5200_psc_ac97.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/fsl/mpc5200_psc_i2s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/fsl/mpc5200_psc_i2s.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/fsl/mpc8610_hpcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/fsl/mpc8610_hpcd.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/fsl/p1022_ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/fsl/p1022_ds.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/fsl/pcm030-audio-fabric.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/fsl/pcm030-audio-fabric.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/imx/eukrea-tlv320.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/imx/eukrea-tlv320.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/imx/imx-pcm-dma-mx2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/imx/imx-pcm-dma-mx2.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/imx/imx-pcm-fiq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/imx/imx-pcm-fiq.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/imx/imx-ssi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/imx/imx-ssi.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/imx/mx27vis-aic32x4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/imx/mx27vis-aic32x4.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/imx/phycore-ac97.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/imx/phycore-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='/cgit/linux.git/diff/sound/soc/imx/wm1133-ev1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/imx/wm1133-ev1.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/jz4740/jz4740-i2s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/jz4740/jz4740-i2s.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/jz4740/jz4740-pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/jz4740/jz4740-pcm.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/jz4740/qi_lb60.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/jz4740/qi_lb60.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/kirkwood/kirkwood-dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/kirkwood/kirkwood-dma.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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/kirkwood/kirkwood-i2s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/kirkwood/kirkwood-i2s.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/kirkwood/kirkwood-openrd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/kirkwood/kirkwood-openrd.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/kirkwood/kirkwood-t5325.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/kirkwood/kirkwood-t5325.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/kirkwood/kirkwood.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/kirkwood/kirkwood.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/mid-x86/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/mid-x86/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='/cgit/linux.git/diff/sound/soc/mid-x86/mfld_machine.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/mid-x86/mfld_machine.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/mid-x86/sst_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/mid-x86/sst_platform.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/mid-x86/sst_platform.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/mid-x86/sst_platform.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/mxs/mxs-pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/mxs/mxs-pcm.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/mxs/mxs-saif.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/mxs/mxs-saif.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/mxs/mxs-sgtl5000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/mxs/mxs-sgtl5000.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/nuc900/nuc900-ac97.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/nuc900/nuc900-ac97.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/nuc900/nuc900-audio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/nuc900/nuc900-audio.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/nuc900/nuc900-pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/nuc900/nuc900-pcm.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/am3517evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/am3517evm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/ams-delta.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/ams-delta.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.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/igep0020.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/igep0020.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/n810.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/n810.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/soc/omap/omap-dmic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/omap-dmic.c</a></td><td class='right'>546</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/soc/omap/omap-dmic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/omap-dmic.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/omap-hdmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/omap-hdmi.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/omap-mcbsp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/omap-mcbsp.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/omap-mcpdm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/omap-mcpdm.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/omap-pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/omap-pcm.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/omap3evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/omap3evm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/omap3pandora.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/omap3pandora.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/omap4-hdmi-card.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/omap4-hdmi-card.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/osk5912.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/osk5912.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/overo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/overo.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/rx51.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/rx51.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/sdp3430.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/sdp3430.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/omap/sdp4430.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/sdp4430.c</a></td><td class='right'>86</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='/cgit/linux.git/diff/sound/soc/omap/zoom2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/omap/zoom2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/corgi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/corgi.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/e740_wm9705.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/e740_wm9705.c</a></td><td class='right'>84</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='/cgit/linux.git/diff/sound/soc/pxa/e750_wm9705.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/e750_wm9705.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/e800_wm9712.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/e800_wm9712.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/em-x270.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/em-x270.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/hx4700.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/hx4700.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.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/imote2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/imote2.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/magician.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/magician.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/mioa701_wm9713.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/mioa701_wm9713.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/palm27x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/palm27x.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/poodle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/poodle.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/pxa-ssp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/pxa-ssp.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/pxa2xx-ac97.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/pxa2xx-ac97.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/pxa2xx-i2s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/pxa2xx-i2s.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/pxa2xx-pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/pxa2xx-pcm.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/raumfeld.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/raumfeld.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/saarb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/saarb.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.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/spitz.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/spitz.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/tavorevb3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/tavorevb3.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.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/tosa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/tosa.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/z2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/z2.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.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/pxa/zylonite.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/pxa/zylonite.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/s6000/s6000-i2s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/s6000/s6000-i2s.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/s6000/s6000-pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/s6000/s6000-pcm.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/s6000/s6105-ipcam.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/s6000/s6105-ipcam.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/ac97.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/ac97.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/dma.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/goni_wm8994.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/goni_wm8994.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/h1940_uda1380.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/h1940_uda1380.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/i2s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/i2s.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.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/idma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/idma.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/idma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/idma.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/jive_wm8750.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/jive_wm8750.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/soc/samsung/littlemill.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/littlemill.c</a></td><td class='right'>253</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='/cgit/linux.git/diff/sound/soc/samsung/ln2440sbc_alc650.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/ln2440sbc_alc650.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/soc/samsung/lowland.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/lowland.c</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/neo1973_wm8753.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/neo1973_wm8753.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/pcm.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.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/rx1950_uda1380.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/rx1950_uda1380.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/s3c2412-i2s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/s3c2412-i2s.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/s3c24xx-i2s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/s3c24xx-i2s.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/s3c24xx_simtec_hermes.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/s3c24xx_simtec_hermes.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/s3c24xx_simtec_tlv320aic23.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/s3c24xx_uda134x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/s3c24xx_uda134x.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/smartq_wm8987.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/smartq_wm8987.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/smdk2443_wm9710.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/smdk2443_wm9710.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/smdk_spdif.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/smdk_spdif.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/smdk_wm8580.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/smdk_wm8580.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/smdk_wm8580pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/smdk_wm8580pcm.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/smdk_wm8994.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/smdk_wm8994.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/smdk_wm8994pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/smdk_wm8994pcm.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/smdk_wm9713.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/smdk_wm9713.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/spdif.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/spdif.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/samsung/speyside.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/speyside.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.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='/cgit/linux.git/diff/sound/soc/samsung/tobermory.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/samsung/tobermory.c</a> (renamed from sound/soc/samsung/speyside_wm8962.c)</td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/sh/dma-sh7760.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/sh/dma-sh7760.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/sh/fsi-ak4642.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/sh/fsi-ak4642.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: 1.8%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/sh/fsi-da7210.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/sh/fsi-da7210.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/sh/fsi-hdmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/sh/fsi-hdmi.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/sh/fsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/sh/fsi.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/sh/hac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/sh/hac.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/sh/migor.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/sh/migor.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/sh/sh7760-ac97.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/sh/sh7760-ac97.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/sh/siu_dai.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/sh/siu_dai.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.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/sh/siu_pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/sh/siu_pcm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/sh/ssi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/sh/ssi.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/soc-cache.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/soc-cache.c</a></td><td class='right'>765</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='upd'><a href='/cgit/linux.git/diff/sound/soc/soc-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/soc-core.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/soc-dapm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/soc-dapm.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/soc-jack.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/soc-jack.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/soc-pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/soc-pcm.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/tegra/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/tegra/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/tegra/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/tegra/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/soc/tegra/tegra_alc5632.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/tegra/tegra_alc5632.c</a></td><td class='right'>214</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='/cgit/linux.git/diff/sound/soc/tegra/tegra_das.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/tegra/tegra_das.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/tegra/tegra_i2s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/tegra/tegra_i2s.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/tegra/tegra_i2s.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/tegra/tegra_i2s.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/tegra/tegra_pcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/tegra/tegra_pcm.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/tegra/tegra_spdif.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/tegra/tegra_spdif.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/tegra/tegra_wm8903.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/tegra/tegra_wm8903.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><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='/cgit/linux.git/diff/sound/soc/tegra/trimslice.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/tegra/trimslice.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.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/txx9/txx9aclc-ac97.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/txx9/txx9aclc-ac97.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/txx9/txx9aclc-generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/txx9/txx9aclc-generic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/soc/txx9/txx9aclc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/soc/txx9/txx9aclc.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/sound_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/sound_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='/cgit/linux.git/diff/sound/sparc/amd7930.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/sparc/amd7930.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/sparc/cs4231.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/sparc/cs4231.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/sparc/dbri.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/sparc/dbri.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/usb/6fire/chip.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/usb/6fire/chip.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/usb/caiaq/device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/usb/caiaq/device.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/usb/card.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/usb/card.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/usb/endpoint.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/usb/endpoint.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/usb/format.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/usb/format.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/usb/misc/ua101.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/usb/misc/ua101.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/usb/quirks-table.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/usb/quirks-table.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/usb/usx2y/us122l.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/usb/usx2y/us122l.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/usb/usx2y/usb_stream.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/usb/usx2y/usb_stream.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/usb/usx2y/usbusx2y.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>sound/usb/usx2y/usbusx2y.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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/tools/lguest/.gitignore?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/lguest/.gitignore</a> (renamed from Documentation/virtual/lguest/.gitignore)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/tools/lguest/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/lguest/Makefile</a> (renamed from Documentation/virtual/lguest/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/tools/lguest/extract?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/lguest/extract</a> (renamed from Documentation/virtual/lguest/extract)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/tools/lguest/lguest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/lguest/lguest.c</a> (renamed from Documentation/virtual/lguest/lguest.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/tools/lguest/lguest.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/lguest/lguest.txt</a> (renamed from Documentation/virtual/lguest/lguest.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'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux.git/diff/tools/nfsd/inject_fault.sh?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/nfsd/inject_fault.sh</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/perf/Documentation/examples.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/perf/Documentation/examples.txt</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/perf/Documentation/perf-list.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/perf/Documentation/perf-list.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='/cgit/linux.git/diff/tools/perf/MANIFEST?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/perf/MANIFEST</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/perf/arch/powerpc/util/dwarf-regs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/perf/arch/powerpc/util/dwarf-regs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/perf/builtin-annotate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/perf/builtin-annotate.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/perf/builtin-kmem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/perf/builtin-kmem.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/perf/builtin-kvm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/perf/builtin-kvm.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/perf/builtin-script.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/perf/builtin-script.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/perf/builtin-test.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/perf/builtin-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='/cgit/linux.git/diff/tools/perf/builtin-top.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/perf/builtin-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.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/perf/util/evlist.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/perf/util/evlist.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/perf/util/hist.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/perf/util/hist.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/perf/util/hist.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/perf/util/hist.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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/perf/util/parse-events.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/perf/util/parse-events.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/perf/util/trace-event-info.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/perf/util/trace-event-info.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/perf/util/util.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/perf/util/util.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/perf/util/util.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/perf/util/util.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/power/x86/turbostat/turbostat.8?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/power/x86/turbostat/turbostat.8</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/power/x86/turbostat/turbostat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/power/x86/turbostat/turbostat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 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='/cgit/linux.git/diff/tools/testing/ktest/compare-ktest-sample.pl?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/testing/ktest/compare-ktest-sample.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: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux.git/diff/tools/testing/ktest/ktest.pl?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/testing/ktest/ktest.pl</a></td><td class='right'>682</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/testing/ktest/sample.conf?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/testing/ktest/sample.conf</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/tools/testing/selftests/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/testing/selftests/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/tools/testing/selftests/breakpoints/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/testing/selftests/breakpoints/Makefile</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/tools/testing/selftests/breakpoints/breakpoint_test.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/testing/selftests/breakpoints/breakpoint_test.c</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/tools/testing/selftests/run_tests?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/testing/selftests/run_tests</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/virtio/linux/virtio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/virtio/linux/virtio.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.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/tools/virtio/virtio_test.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>tools/virtio/virtio_test.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/virt/kvm/coalesced_mmio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>virt/kvm/coalesced_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.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/virt/kvm/ioapic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>virt/kvm/ioapic.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/virt/kvm/iommu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>virt/kvm/iommu.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/virt/kvm/kvm_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940&amp;id2=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>virt/kvm/kvm_main.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>9597 files changed, 464008 insertions, 259117 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/CREDITS b/CREDITS<br/>index 44fce988eaac..370b4c7da39b 100644<br/>--- a/<a href='/cgit/linux.git/tree/CREDITS?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>CREDITS</a><br/>+++ b/<a href='/cgit/linux.git/tree/CREDITS?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>CREDITS</a></div><div class='hunk'>@@ -514,6 +514,11 @@ S: Bessemerstraat 21</div><div class='ctx'> S: Amsterdam</div><div class='ctx'> S: The Netherlands</div><div class='ctx'> </div><div class='add'>+N: NeilBrown</div><div class='add'>+E: neil@brown.name</div><div class='add'>+P: 4096R/566281B9 1BC6 29EB D390 D870 7B5F  497A 39EC 9EDD 5662 81B9</div><div class='add'>+D: NFSD Maintainer 2000-2007</div><div class='add'>+</div><div class='ctx'> N: Zach Brown</div><div class='ctx'> E: zab@zabbo.net</div><div class='ctx'> D: maestro pci sound</div><div class='head'>diff --git a/Documentation/ABI/stable/sysfs-bus-xen-backend b/Documentation/ABI/stable/sysfs-bus-xen-backend<br/>new file mode 100644<br/>index 000000000000..3d5951c8bf5f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/stable/sysfs-bus-xen-backend?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/ABI/stable/sysfs-bus-xen-backend</a></div><div class='hunk'>@@ -0,0 +1,75 @@</div><div class='add'>+What:		/sys/bus/xen-backend/devices/*/devtype</div><div class='add'>+Date:		Feb 2009</div><div class='add'>+KernelVersion:	2.6.38</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+                The type of the device.  e.g., one of: 'vbd' (block),</div><div class='add'>+                'vif' (network), or 'vfb' (framebuffer).</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/xen-backend/devices/*/nodename</div><div class='add'>+Date:		Feb 2009</div><div class='add'>+KernelVersion:	2.6.38</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+                XenStore node (under /local/domain/NNN/) for this</div><div class='add'>+                backend device.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/xen-backend/devices/vbd-*/physical_device</div><div class='add'>+Date:		April 2011</div><div class='add'>+KernelVersion:	3.0</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+                The major:minor number (in hexidecimal) of the</div><div class='add'>+                physical device providing the storage for this backend</div><div class='add'>+                block device.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/xen-backend/devices/vbd-*/mode</div><div class='add'>+Date:		April 2011</div><div class='add'>+KernelVersion:	3.0</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+                Whether the block device is read-only ('r') or</div><div class='add'>+                read-write ('w').</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/xen-backend/devices/vbd-*/statistics/f_req</div><div class='add'>+Date:		April 2011</div><div class='add'>+KernelVersion:	3.0</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+                Number of flush requests from the frontend.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/xen-backend/devices/vbd-*/statistics/oo_req</div><div class='add'>+Date:		April 2011</div><div class='add'>+KernelVersion:	3.0</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+                Number of requests delayed because the backend was too</div><div class='add'>+                busy processing previous requests.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/xen-backend/devices/vbd-*/statistics/rd_req</div><div class='add'>+Date:		April 2011</div><div class='add'>+KernelVersion:	3.0</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+                Number of read requests from the frontend.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/xen-backend/devices/vbd-*/statistics/rd_sect</div><div class='add'>+Date:		April 2011</div><div class='add'>+KernelVersion:	3.0</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+                Number of sectors read by the frontend.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/xen-backend/devices/vbd-*/statistics/wr_req</div><div class='add'>+Date:		April 2011</div><div class='add'>+KernelVersion:	3.0</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+                Number of write requests from the frontend.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/xen-backend/devices/vbd-*/statistics/wr_sect</div><div class='add'>+Date:		April 2011</div><div class='add'>+KernelVersion:	3.0</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+                Number of sectors written by the frontend.</div><div class='head'>diff --git a/Documentation/ABI/stable/sysfs-devices-system-xen_memory b/Documentation/ABI/stable/sysfs-devices-system-xen_memory<br/>new file mode 100644<br/>index 000000000000..caa311d59ac1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/stable/sysfs-devices-system-xen_memory?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/ABI/stable/sysfs-devices-system-xen_memory</a></div><div class='hunk'>@@ -0,0 +1,77 @@</div><div class='add'>+What:		/sys/devices/system/xen_memory/xen_memory0/max_retry_count</div><div class='add'>+Date:		May 2011</div><div class='add'>+KernelVersion:	2.6.39</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The maximum number of times the balloon driver will</div><div class='add'>+		attempt to increase the balloon before giving up.  See</div><div class='add'>+		also 'retry_count' below.</div><div class='add'>+		A value of zero means retry forever and is the default one.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/xen_memory/xen_memory0/max_schedule_delay</div><div class='add'>+Date:		May 2011</div><div class='add'>+KernelVersion:	2.6.39</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The limit that 'schedule_delay' (see below) will be</div><div class='add'>+		increased to. The default value is 32 seconds.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/xen_memory/xen_memory0/retry_count</div><div class='add'>+Date:		May 2011</div><div class='add'>+KernelVersion:	2.6.39</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The current number of times that the balloon driver</div><div class='add'>+		has attempted to increase the size of the balloon.</div><div class='add'>+		The default value is one. With max_retry_count being</div><div class='add'>+		zero (unlimited), this means that the driver will attempt</div><div class='add'>+		to retry with a 'schedule_delay' delay.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/xen_memory/xen_memory0/schedule_delay</div><div class='add'>+Date:		May 2011</div><div class='add'>+KernelVersion:	2.6.39</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The time (in seconds) to wait between attempts to</div><div class='add'>+		increase the balloon.  Each time the balloon cannot be</div><div class='add'>+		increased, 'schedule_delay' is increased (until</div><div class='add'>+		'max_schedule_delay' is reached at which point it</div><div class='add'>+		will use the max value).</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/xen_memory/xen_memory0/target</div><div class='add'>+Date:		April 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The target number of pages to adjust this domain's</div><div class='add'>+		memory reservation to.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/xen_memory/xen_memory0/target_kb</div><div class='add'>+Date:		April 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		As target above, except the value is in KiB.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/xen_memory/xen_memory0/info/current_kb</div><div class='add'>+Date:		April 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Current size (in KiB) of this domain's memory</div><div class='add'>+		reservation.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/xen_memory/xen_memory0/info/high_kb</div><div class='add'>+Date:		April 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Amount (in KiB) of high memory in the balloon.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/system/xen_memory/xen_memory0/info/low_kb</div><div class='add'>+Date:		April 2008</div><div class='add'>+KernelVersion:	2.6.26</div><div class='add'>+Contact:	Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		Amount (in KiB) of low (or normal) memory in the</div><div class='add'>+		balloon.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci<br/>index 349ecf26ce10..34f51100f029 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-bus-pci?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/testing/sysfs-bus-pci</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-bus-pci?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/ABI/testing/sysfs-bus-pci</a></div><div class='hunk'>@@ -66,6 +66,24 @@ Description:</div><div class='ctx'> 		re-discover previously removed devices.</div><div class='ctx'> 		Depends on CONFIG_HOTPLUG.</div><div class='ctx'> </div><div class='add'>+What:		/sys/bus/pci/devices/.../msi_irqs/</div><div class='add'>+Date:		September, 2011</div><div class='add'>+Contact:	Neil Horman &lt;nhorman@tuxdriver.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		The /sys/devices/.../msi_irqs directory contains a variable set</div><div class='add'>+		of sub-directories, with each sub-directory being named after a</div><div class='add'>+		corresponding msi irq vector allocated to that device.  Each</div><div class='add'>+		numbered sub-directory N contains attributes of that irq.</div><div class='add'>+		Note that this directory is not created for device drivers which</div><div class='add'>+		do not support msi irqs</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/pci/devices/.../msi_irqs/&lt;N&gt;/mode</div><div class='add'>+Date:		September 2011</div><div class='add'>+Contact:	Neil Horman &lt;nhorman@tuxdriver.com&gt;</div><div class='add'>+Description:</div><div class='add'>+		This attribute indicates the mode that the irq vector named by</div><div class='add'>+		the parent directory is in (msi vs. msix)</div><div class='add'>+</div><div class='ctx'> What:		/sys/bus/pci/devices/.../remove</div><div class='ctx'> Date:		January 2009</div><div class='ctx'> Contact:	Linux PCI developers &lt;linux-pci@vger.kernel.org&gt;</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb<br/>index e647378e9e88..b4f548792e32 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-bus-usb?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/testing/sysfs-bus-usb</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-bus-usb?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/ABI/testing/sysfs-bus-usb</a></div><div class='hunk'>@@ -119,6 +119,31 @@ Description:</div><div class='ctx'> 		Write a 1 to force the device to disconnect</div><div class='ctx'> 		(equivalent to unplugging a wired USB device).</div><div class='ctx'> </div><div class='add'>+What:		/sys/bus/usb/drivers/.../new_id</div><div class='add'>+Date:		October 2011</div><div class='add'>+Contact:	linux-usb@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		Writing a device ID to this file will attempt to</div><div class='add'>+		dynamically add a new device ID to a USB device driver.</div><div class='add'>+		This may allow the driver to support more hardware than</div><div class='add'>+		was included in the driver's static device ID support</div><div class='add'>+		table at compile time. The format for the device ID is:</div><div class='add'>+		idVendor idProduct bInterfaceClass.</div><div class='add'>+		The vendor ID and device ID fields are required, the</div><div class='add'>+		interface class is optional.</div><div class='add'>+		Upon successfully adding an ID, the driver will probe</div><div class='add'>+		for the device and attempt to bind to it.  For example:</div><div class='add'>+		# echo "8086 10f5" &gt; /sys/bus/usb/drivers/foo/new_id</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/usb-serial/drivers/.../new_id</div><div class='add'>+Date:		October 2011</div><div class='add'>+Contact:	linux-usb@vger.kernel.org</div><div class='add'>+Description:</div><div class='add'>+		For serial USB drivers, this attribute appears under the</div><div class='add'>+		extra bus folder "usb-serial" in sysfs; apart from that</div><div class='add'>+		difference, all descriptions from the entry</div><div class='add'>+		"/sys/bus/usb/drivers/.../new_id" apply.</div><div class='add'>+</div><div class='ctx'> What:		/sys/bus/usb/drivers/.../remove_id</div><div class='ctx'> Date:		November 2009</div><div class='ctx'> Contact:	CHENG Renquan &lt;rqcheng@smu.edu.sg&gt;</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration b/Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration<br/>new file mode 100644<br/>index 000000000000..4cf1e72222d9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+What:           Attribute for calibrating ST-Ericsson AB8500 Real Time Clock</div><div class='add'>+Date:           Oct 2011</div><div class='add'>+KernelVersion:  3.0</div><div class='add'>+Contact:        Mark Godfrey &lt;mark.godfrey@stericsson.com&gt;</div><div class='add'>+Description:    The rtc_calibration attribute allows the userspace to</div><div class='add'>+                calibrate the AB8500.s 32KHz Real Time Clock.</div><div class='add'>+                Every 60 seconds the AB8500 will correct the RTC's value</div><div class='add'>+                by adding to it the value of this attribute.</div><div class='add'>+                The range of the attribute is -127 to +127 in units of</div><div class='add'>+                30.5 micro-seconds (half-parts-per-million of the 32KHz clock)</div><div class='add'>+Users:          The /vendor/st-ericsson/base_utilities/core/rtc_calibration</div><div class='add'>+                daemon uses this interface.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-devices-platform-docg3 b/Documentation/ABI/testing/sysfs-devices-platform-docg3<br/>new file mode 100644<br/>index 000000000000..8aa36716882f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-devices-platform-docg3?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/ABI/testing/sysfs-devices-platform-docg3</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+What:		/sys/devices/platform/docg3/f[0-3]_dps[01]_is_keylocked</div><div class='add'>+Date:		November 2011</div><div class='add'>+KernelVersion:	3.3</div><div class='add'>+Contact:	Robert Jarzmik &lt;robert.jarzmik@free.fr&gt;</div><div class='add'>+Description:</div><div class='add'>+		Show whether the floor (0 to 4), protection area (0 or 1) is</div><div class='add'>+		keylocked. Each docg3 chip (or floor) has 2 protection areas,</div><div class='add'>+		which can cover any part of it, block aligned, called DPS.</div><div class='add'>+		The protection has information embedded whether it blocks reads,</div><div class='add'>+		writes or both.</div><div class='add'>+		The result is:</div><div class='add'>+		0 -&gt; the DPS is not keylocked</div><div class='add'>+		1 -&gt; the DPS is keylocked</div><div class='add'>+Users:		None identified so far.</div><div class='add'>+</div><div class='add'>+What:		/sys/devices/platform/docg3/f[0-3]_dps[01]_protection_key</div><div class='add'>+Date:		November 2011</div><div class='add'>+KernelVersion:	3.3</div><div class='add'>+Contact:	Robert Jarzmik &lt;robert.jarzmik@free.fr&gt;</div><div class='add'>+Description:</div><div class='add'>+		Enter the protection key for the floor (0 to 4), protection area</div><div class='add'>+		(0 or 1). Each docg3 chip (or floor) has 2 protection areas,</div><div class='add'>+		which can cover any part of it, block aligned, called DPS.</div><div class='add'>+		The protection has information embedded whether it blocks reads,</div><div class='add'>+		writes or both.</div><div class='add'>+		The protection key is a string of 8 bytes (value 0-255).</div><div class='add'>+		Entering the correct value toggle the lock, and can be observed</div><div class='add'>+		through f[0-3]_dps[01]_is_keylocked.</div><div class='add'>+		Possible values are:</div><div class='add'>+			- 8 bytes</div><div class='add'>+		Typical values are:</div><div class='add'>+			- "00000000"</div><div class='add'>+			- "12345678"</div><div class='add'>+Users:		None identified so far.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff b/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff<br/>index 9aec8ef228b0..167d9032b970 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> What:		/sys/module/hid_logitech/drivers/hid:logitech/&lt;dev&gt;/range.</div><div class='ctx'> Date:		July 2011</div><div class='ctx'> KernelVersion:	3.2</div><div class='del'>-Contact:	Michal Malý &lt;madcatxster@gmail.com&gt;</div><div class='add'>+Contact:	Michal Malý &lt;madcatxster@gmail.com&gt;</div><div class='ctx'> Description:	Display minimum, maximum and current range of the steering</div><div class='ctx'> 		wheel. Writing a value within min and max boundaries sets the</div><div class='ctx'> 		range of the wheel.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-driver-hid-multitouch b/Documentation/ABI/testing/sysfs-driver-hid-multitouch<br/>new file mode 100644<br/>index 000000000000..f79839d1af37<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-driver-hid-multitouch?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/ABI/testing/sysfs-driver-hid-multitouch</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+What:		/sys/bus/usb/devices/&lt;busnum&gt;-&lt;devnum&gt;:&lt;config num&gt;.&lt;interface num&gt;/&lt;hid-bus&gt;:&lt;vendor-id&gt;:&lt;product-id&gt;.&lt;num&gt;/quirks</div><div class='add'>+Date:		November 2011</div><div class='add'>+Contact:	Benjamin Tissoires &lt;benjamin.tissoires@gmail.com&gt;</div><div class='add'>+Description:	The integer value of this attribute corresponds to the</div><div class='add'>+		quirks actually in place to handle the device's protocol.</div><div class='add'>+		When read, this attribute returns the current settings (see</div><div class='add'>+		MT_QUIRKS_* in hid-multitouch.c).</div><div class='add'>+		When written this attribute change on the fly the quirks, then</div><div class='add'>+		the protocol to handle the device.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-driver-hid-roccat-isku b/Documentation/ABI/testing/sysfs-driver-hid-roccat-isku<br/>new file mode 100644<br/>index 000000000000..189dc43891bf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-driver-hid-roccat-isku?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/ABI/testing/sysfs-driver-hid-roccat-isku</a></div><div class='hunk'>@@ -0,0 +1,135 @@</div><div class='add'>+What:		/sys/bus/usb/devices/&lt;busnum&gt;-&lt;devnum&gt;:&lt;config num&gt;.&lt;interface num&gt;/&lt;hid-bus&gt;:&lt;vendor-id&gt;:&lt;product-id&gt;.&lt;num&gt;/isku/roccatisku&lt;minor&gt;/actual_profile</div><div class='add'>+Date:		June 2011</div><div class='add'>+Contact:	Stefan Achatz &lt;erazor_de@users.sourceforge.net&gt;</div><div class='add'>+Description:	The integer value of this attribute ranges from 0-4.</div><div class='add'>+		When read, this attribute returns the number of the actual</div><div class='add'>+		profile. This value is persistent, so its equivalent to the</div><div class='add'>+		profile that's active when the device is powered on next time.</div><div class='add'>+		When written, this file sets the number of the startup profile</div><div class='add'>+		and the device activates this profile immediately.</div><div class='add'>+Users:		http://roccat.sourceforge.net</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/usb/devices/&lt;busnum&gt;-&lt;devnum&gt;:&lt;config num&gt;.&lt;interface num&gt;/&lt;hid-bus&gt;:&lt;vendor-id&gt;:&lt;product-id&gt;.&lt;num&gt;/isku/roccatisku&lt;minor&gt;/info</div><div class='add'>+Date:		June 2011</div><div class='add'>+Contact:	Stefan Achatz &lt;erazor_de@users.sourceforge.net&gt;</div><div class='add'>+Description:	When read, this file returns general data like firmware version.</div><div class='add'>+		The data is 6 bytes long.</div><div class='add'>+		This file is readonly.</div><div class='add'>+Users:		http://roccat.sourceforge.net</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/usb/devices/&lt;busnum&gt;-&lt;devnum&gt;:&lt;config num&gt;.&lt;interface num&gt;/&lt;hid-bus&gt;:&lt;vendor-id&gt;:&lt;product-id&gt;.&lt;num&gt;/isku/roccatisku&lt;minor&gt;/key_mask</div><div class='add'>+Date:		June 2011</div><div class='add'>+Contact:	Stefan Achatz &lt;erazor_de@users.sourceforge.net&gt;</div><div class='add'>+Description:	When written, this file lets one deactivate certain keys like</div><div class='add'>+		windows and application keys, to prevent accidental presses.</div><div class='add'>+		Profile number for which this settings occur is included in</div><div class='add'>+		written data. The data has to be 6 bytes long.</div><div class='add'>+		Before reading this file, control has to be written to select</div><div class='add'>+		which profile to read.</div><div class='add'>+Users:		http://roccat.sourceforge.net</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/usb/devices/&lt;busnum&gt;-&lt;devnum&gt;:&lt;config num&gt;.&lt;interface num&gt;/&lt;hid-bus&gt;:&lt;vendor-id&gt;:&lt;product-id&gt;.&lt;num&gt;/isku/roccatisku&lt;minor&gt;/keys_capslock</div><div class='add'>+Date:		June 2011</div><div class='add'>+Contact:	Stefan Achatz &lt;erazor_de@users.sourceforge.net&gt;</div><div class='add'>+Description:	When written, this file lets one set the function of the</div><div class='add'>+		capslock key for a specific profile. Profile number is included</div><div class='add'>+		in written data. The data has to be 6 bytes long.</div><div class='add'>+		Before reading this file, control has to be written to select</div><div class='add'>+		which profile to read.</div><div class='add'>+Users:		http://roccat.sourceforge.net</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/usb/devices/&lt;busnum&gt;-&lt;devnum&gt;:&lt;config num&gt;.&lt;interface num&gt;/&lt;hid-bus&gt;:&lt;vendor-id&gt;:&lt;product-id&gt;.&lt;num&gt;/isku/roccatisku&lt;minor&gt;/keys_easyzone</div><div class='add'>+Date:		June 2011</div><div class='add'>+Contact:	Stefan Achatz &lt;erazor_de@users.sourceforge.net&gt;</div><div class='add'>+Description:	When written, this file lets one set the function of the</div><div class='add'>+		easyzone keys for a specific profile. Profile number is included</div><div class='add'>+		in written data. The data has to be 65 bytes long.</div><div class='add'>+		Before reading this file, control has to be written to select</div><div class='add'>+		which profile to read.</div><div class='add'>+Users:		http://roccat.sourceforge.net</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/usb/devices/&lt;busnum&gt;-&lt;devnum&gt;:&lt;config num&gt;.&lt;interface num&gt;/&lt;hid-bus&gt;:&lt;vendor-id&gt;:&lt;product-id&gt;.&lt;num&gt;/isku/roccatisku&lt;minor&gt;/keys_function</div><div class='add'>+Date:		June 2011</div><div class='add'>+Contact:	Stefan Achatz &lt;erazor_de@users.sourceforge.net&gt;</div><div class='add'>+Description:	When written, this file lets one set the function of the</div><div class='add'>+		function keys for a specific profile. Profile number is included</div><div class='add'>+		in written data. The data has to be 41 bytes long.</div><div class='add'>+		Before reading this file, control has to be written to select</div><div class='add'>+		which profile to read.</div><div class='add'>+Users:		http://roccat.sourceforge.net</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/usb/devices/&lt;busnum&gt;-&lt;devnum&gt;:&lt;config num&gt;.&lt;interface num&gt;/&lt;hid-bus&gt;:&lt;vendor-id&gt;:&lt;product-id&gt;.&lt;num&gt;/isku/roccatisku&lt;minor&gt;/keys_macro</div><div class='add'>+Date:		June 2011</div><div class='add'>+Contact:	Stefan Achatz &lt;erazor_de@users.sourceforge.net&gt;</div><div class='add'>+Description:	When written, this file lets one set the function of the macro</div><div class='add'>+		keys for a specific profile. Profile number is included in</div><div class='add'>+		written data. The data has to be 35 bytes long.</div><div class='add'>+		Before reading this file, control has to be written to select</div><div class='add'>+		which profile to read.</div><div class='add'>+Users:		http://roccat.sourceforge.net</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/usb/devices/&lt;busnum&gt;-&lt;devnum&gt;:&lt;config num&gt;.&lt;interface num&gt;/&lt;hid-bus&gt;:&lt;vendor-id&gt;:&lt;product-id&gt;.&lt;num&gt;/isku/roccatisku&lt;minor&gt;/keys_media</div><div class='add'>+Date:		June 2011</div><div class='add'>+Contact:	Stefan Achatz &lt;erazor_de@users.sourceforge.net&gt;</div><div class='add'>+Description:	When written, this file lets one set the function of the media</div><div class='add'>+		keys for a specific profile. Profile number is included in</div><div class='add'>+		written data. The data has to be 29 bytes long.</div><div class='add'>+		Before reading this file, control has to be written to select</div><div class='add'>+		which profile to read.</div><div class='add'>+Users:		http://roccat.sourceforge.net</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/usb/devices/&lt;busnum&gt;-&lt;devnum&gt;:&lt;config num&gt;.&lt;interface num&gt;/&lt;hid-bus&gt;:&lt;vendor-id&gt;:&lt;product-id&gt;.&lt;num&gt;/isku/roccatisku&lt;minor&gt;/keys_thumbster</div><div class='add'>+Date:		June 2011</div><div class='add'>+Contact:	Stefan Achatz &lt;erazor_de@users.sourceforge.net&gt;</div><div class='add'>+Description:	When written, this file lets one set the function of the</div><div class='add'>+		thumbster keys for a specific profile. Profile number is included</div><div class='add'>+		in written data. The data has to be 23 bytes long.</div><div class='add'>+		Before reading this file, control has to be written to select</div><div class='add'>+		which profile to read.</div><div class='add'>+Users:		http://roccat.sourceforge.net</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/usb/devices/&lt;busnum&gt;-&lt;devnum&gt;:&lt;config num&gt;.&lt;interface num&gt;/&lt;hid-bus&gt;:&lt;vendor-id&gt;:&lt;product-id&gt;.&lt;num&gt;/isku/roccatisku&lt;minor&gt;/last_set</div><div class='add'>+Date:		June 2011</div><div class='add'>+Contact:	Stefan Achatz &lt;erazor_de@users.sourceforge.net&gt;</div><div class='add'>+Description:	When written, this file lets one set the time in secs since</div><div class='add'>+		epoch in which the last configuration took place.</div><div class='add'>+		The data has to be 20 bytes long.</div><div class='add'>+Users:		http://roccat.sourceforge.net</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/usb/devices/&lt;busnum&gt;-&lt;devnum&gt;:&lt;config num&gt;.&lt;interface num&gt;/&lt;hid-bus&gt;:&lt;vendor-id&gt;:&lt;product-id&gt;.&lt;num&gt;/isku/roccatisku&lt;minor&gt;/light</div><div class='add'>+Date:		June 2011</div><div class='add'>+Contact:	Stefan Achatz &lt;erazor_de@users.sourceforge.net&gt;</div><div class='add'>+Description:	When written, this file lets one set the backlight intensity for</div><div class='add'>+		a specific profile. Profile number is included in written data.</div><div class='add'>+		The data has to be 10 bytes long.</div><div class='add'>+		Before reading this file, control has to be written to select</div><div class='add'>+		which profile to read.</div><div class='add'>+Users:		http://roccat.sourceforge.net</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/usb/devices/&lt;busnum&gt;-&lt;devnum&gt;:&lt;config num&gt;.&lt;interface num&gt;/&lt;hid-bus&gt;:&lt;vendor-id&gt;:&lt;product-id&gt;.&lt;num&gt;/isku/roccatisku&lt;minor&gt;/macro</div><div class='add'>+Date:		June 2011</div><div class='add'>+Contact:	Stefan Achatz &lt;erazor_de@users.sourceforge.net&gt;</div><div class='add'>+Description:	When written, this file lets one store macros with max 500</div><div class='add'>+		keystrokes for a specific button for a specific profile.</div><div class='add'>+		Button and profile numbers are included in written data.</div><div class='add'>+		The data has to be 2083 bytes long.</div><div class='add'>+		Before reading this file, control has to be written to select</div><div class='add'>+		which profile and key to read.</div><div class='add'>+Users:		http://roccat.sourceforge.net</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/usb/devices/&lt;busnum&gt;-&lt;devnum&gt;:&lt;config num&gt;.&lt;interface num&gt;/&lt;hid-bus&gt;:&lt;vendor-id&gt;:&lt;product-id&gt;.&lt;num&gt;/isku/roccatisku&lt;minor&gt;/control</div><div class='add'>+Date:		June 2011</div><div class='add'>+Contact:	Stefan Achatz &lt;erazor_de@users.sourceforge.net&gt;</div><div class='add'>+Description:	When written, this file lets one select which data from which</div><div class='add'>+		profile will be	read next. The data has to be 3 bytes long.</div><div class='add'>+		This file is writeonly.</div><div class='add'>+Users:		http://roccat.sourceforge.net</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/usb/devices/&lt;busnum&gt;-&lt;devnum&gt;:&lt;config num&gt;.&lt;interface num&gt;/&lt;hid-bus&gt;:&lt;vendor-id&gt;:&lt;product-id&gt;.&lt;num&gt;/isku/roccatisku&lt;minor&gt;/talk</div><div class='add'>+Date:		June 2011</div><div class='add'>+Contact:	Stefan Achatz &lt;erazor_de@users.sourceforge.net&gt;</div><div class='add'>+Description:	When written, this file lets one trigger easyshift functionality</div><div class='add'>+		from the host.</div><div class='add'>+		The data has to be 16 bytes long.</div><div class='add'>+		This file is writeonly.</div><div class='add'>+Users:		http://roccat.sourceforge.net</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-driver-hid-wiimote b/Documentation/ABI/testing/sysfs-driver-hid-wiimote<br/>index 5d5a16ea57c6..3d98009f447a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-driver-hid-wiimote?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/testing/sysfs-driver-hid-wiimote</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-driver-hid-wiimote?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/ABI/testing/sysfs-driver-hid-wiimote</a></div><div class='hunk'>@@ -8,3 +8,15 @@ Contact:	David Herrmann &lt;dh.herrmann@googlemail.com&gt;</div><div class='ctx'> Description:	Make it possible to set/get current led state. Reading from it</div><div class='ctx'> 		returns 0 if led is off and 1 if it is on. Writing 0 to it</div><div class='ctx'> 		disables the led, writing 1 enables it.</div><div class='add'>+</div><div class='add'>+What:		/sys/bus/hid/drivers/wiimote/&lt;dev&gt;/extension</div><div class='add'>+Date:		August 2011</div><div class='add'>+KernelVersion:	3.2</div><div class='add'>+Contact:	David Herrmann &lt;dh.herrmann@googlemail.com&gt;</div><div class='add'>+Description:	This file contains the currently connected and initialized</div><div class='add'>+		extensions. It can be one of: none, motionp, nunchuck, classic,</div><div class='add'>+		motionp+nunchuck, motionp+classic</div><div class='add'>+		motionp is the official Nintendo Motion+ extension, nunchuck is</div><div class='add'>+		the official Nintendo Nunchuck extension and classic is the</div><div class='add'>+		Nintendo Classic Controller extension. The motionp extension can</div><div class='add'>+		be combined with the other two.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-driver-wacom b/Documentation/ABI/testing/sysfs-driver-wacom<br/>index 82d4df136444..0130d6683c14 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-driver-wacom?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/testing/sysfs-driver-wacom</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-driver-wacom?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/ABI/testing/sysfs-driver-wacom</a></div><div class='hunk'>@@ -15,9 +15,9 @@ Contact:	linux-input@vger.kernel.org</div><div class='ctx'> Description:</div><div class='ctx'> 		Attribute group for control of the status LEDs and the OLEDs.</div><div class='ctx'> 		This attribute group is only available for Intuos 4 M, L,</div><div class='del'>-		and XL (with LEDs and OLEDs) and Cintiq 21UX2 (LEDs only).</div><div class='del'>-		Therefore its presence implicitly signifies the presence of</div><div class='del'>-		said LEDs and OLEDs on the tablet device.</div><div class='add'>+		and XL (with LEDs and OLEDs) and Cintiq 21UX2 and Cintiq 24HD</div><div class='add'>+		(LEDs only). Therefore its presence implicitly signifies the</div><div class='add'>+		presence of said LEDs and OLEDs on the tablet device.</div><div class='ctx'> </div><div class='ctx'> What:		/sys/bus/usb/devices/&lt;busnum&gt;-&lt;devnum&gt;:&lt;cfg&gt;.&lt;intf&gt;/wacom_led/status0_luminance</div><div class='ctx'> Date:		August 2011</div><div class='hunk'>@@ -41,16 +41,17 @@ Date:		August 2011</div><div class='ctx'> Contact:	linux-input@vger.kernel.org</div><div class='ctx'> Description:</div><div class='ctx'> 		Writing to this file sets which one of the four (for Intuos 4)</div><div class='del'>-		or of the right four (for Cintiq 21UX2) status LEDs is active (0..3).</div><div class='del'>-		The other three LEDs on the same side are always inactive.</div><div class='add'>+		or of the right four (for Cintiq 21UX2 and Cintiq 24HD) status</div><div class='add'>+		LEDs is active (0..3). The other three LEDs on the same side are</div><div class='add'>+		always inactive.</div><div class='ctx'> </div><div class='ctx'> What:		/sys/bus/usb/devices/&lt;busnum&gt;-&lt;devnum&gt;:&lt;cfg&gt;.&lt;intf&gt;/wacom_led/status_led1_select</div><div class='ctx'> Date:		September 2011</div><div class='ctx'> Contact:	linux-input@vger.kernel.org</div><div class='ctx'> Description:</div><div class='del'>-		Writing to this file sets which one of the left four (for Cintiq 21UX2)</div><div class='del'>-		status LEDs is active (0..3). The other three LEDs on the left are always</div><div class='del'>-		inactive.</div><div class='add'>+		Writing to this file sets which one of the left four (for Cintiq 21UX2</div><div class='add'>+		and Cintiq 24HD) status LEDs is active (0..3). The other three LEDs on</div><div class='add'>+		the left are always inactive.</div><div class='ctx'> </div><div class='ctx'> What:		/sys/bus/usb/devices/&lt;busnum&gt;-&lt;devnum&gt;:&lt;cfg&gt;.&lt;intf&gt;/wacom_led/buttons_luminance</div><div class='ctx'> Date:		August 2011</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-kernel-slab b/Documentation/ABI/testing/sysfs-kernel-slab<br/>index 8b093f8222d3..91bd6ca5440f 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-kernel-slab?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/testing/sysfs-kernel-slab</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-kernel-slab?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/ABI/testing/sysfs-kernel-slab</a></div><div class='hunk'>@@ -346,6 +346,10 @@ Description:</div><div class='ctx'> 		number of objects per slab.  If a slab cannot be allocated</div><div class='ctx'> 		because of fragmentation, SLUB will retry with the minimum order</div><div class='ctx'> 		possible depending on its characteristics.</div><div class='add'>+		When debug_guardpage_minorder=N (N &gt; 0) parameter is specified</div><div class='add'>+		(see Documentation/kernel-parameters.txt), the minimum possible</div><div class='add'>+		order is used and this sysfs entry can not be used to change</div><div class='add'>+		the order at run time.</div><div class='ctx'> </div><div class='ctx'> What:		/sys/kernel/slab/cache/order_fallback</div><div class='ctx'> Date:		April 2008</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-module b/Documentation/ABI/testing/sysfs-module<br/>index 9489ea8e294c..47064c2b1f79 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-module?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ABI/testing/sysfs-module</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-module?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/ABI/testing/sysfs-module</a></div><div class='hunk'>@@ -33,3 +33,19 @@ Description:	Maximum time allowed for periodic transfers per microframe (μs)</div><div class='ctx'> 		Beware, non-standard modes are usually not thoroughly tested by</div><div class='ctx'> 		hardware designers, and the hardware can malfunction when this</div><div class='ctx'> 		setting differ from default 100.</div><div class='add'>+</div><div class='add'>+What:		/sys/module/*/{coresize,initsize}</div><div class='add'>+Date:		Jan 2012</div><div class='add'>+KernelVersion:»·3.3</div><div class='add'>+Contact:	Kay Sievers &lt;kay.sievers@vrfy.org&gt;</div><div class='add'>+Description:	Module size in bytes.</div><div class='add'>+</div><div class='add'>+What:		/sys/module/*/taint</div><div class='add'>+Date:		Jan 2012</div><div class='add'>+KernelVersion:»·3.3</div><div class='add'>+Contact:	Kay Sievers &lt;kay.sievers@vrfy.org&gt;</div><div class='add'>+Description:	Module taint flags:</div><div class='add'>+			P - proprietary module</div><div class='add'>+			O - out-of-tree module</div><div class='add'>+			F - force-loaded module</div><div class='add'>+			C - staging driver module</div><div class='head'>diff --git a/Documentation/DocBook/media/constraints.png.b64 b/Documentation/DocBook/media/constraints.png.b64<br/>new file mode 100644<br/>index 000000000000..125b4a94962c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/constraints.png.b64?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/constraints.png.b64</a></div><div class='hunk'>@@ -0,0 +1,59 @@</div><div class='add'>+iVBORw0KGgoAAAANSUhEUgAAAlQAAAFYCAYAAACVsmLPAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A</div><div class='add'>+/wD/oL2nkwAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAAd0SU1FB9sLCBIAKVtZsMAAAAxxSURBVHja</div><div class='add'>+7d3ZbqvIAkDRLsv//8v0QytXvpYZap7Wko56OAnE2AXbBSbhOI7jHwAAkr1sAgAAQQUAIKgAAAQV</div><div class='add'>+AICgAgBAUAEACCoAAEEFACCoAAAQVAAAzb2jvyMEWw0AmFvh37xnhgoAQFABAPT1zvruwtNlAADV</div><div class='add'>+VLxsyQwVAICgAgAQVAAAggoAQFABACCoYEohuFkugKACsmLq178DIKiAyJgSVQCCCigQU6IKQFAB</div><div class='add'>+BWJKVAEIKqBgKIkqAEEFFAgkUQUgqIACYSSqAAQViKkwxjIAEFSwbUyJKgBBBWJq8GUCIKhgm5gS</div><div class='add'>+VQCCCsSUqAIQVMBYoSOqAAQVLOk41lwXAIIKhoqqJyFUYhkACCpYMqpiQqjEMgAQVLBUVKWEUIll</div><div class='add'>+ACCoYImoygmhEssAQFDBElHVexkACCoAAEEFACCoAAAQVAAAggoAQFABAAgqAAAEFQCAoAIAEFQA</div><div class='add'>+AIIKAABBBQAgqAAABBUAgKACAOA/b5sAGjsO2wBgMWaoAAAEFQCAoAIAEFQAADtzUXohIQQbAYDi</div><div class='add'>+Dh9kmYIZKgAAQQUAIKgAAAQVAICgAgAgmU/5VeSTGQDE8InxeZmhAgAQVAAAggoAQFABAAgqAAAE</div><div class='add'>+FQCAoAIAEFQAAHtyY0/o4O7efe4JCzAXM1QAAIIKAEBQAQAIKgAAQQUAgKACABBUAACCCgBAUAEA</div><div class='add'>+IKgAAAQVAICgAgAQVAAACCoAAEEFACCoAAAEFVBICGMsAwBBBVPHVE4QlVgGAIIKpo6ps/9utQwA</div><div class='add'>+BBUsEVMpQVRiGQAIKlgqpmKCqMQyABBUsGRMzbouAAQVNHMca64LAEEFy0WVmAIQVCCqxBSAoAL6</div><div class='add'>+hI+YAhBUIKrEFICgAvqEkJgCEFQgqo4+3wuAoILto0pMAQgqICOQxBSAoAIyQklMAQgqICOYxBSA</div><div class='add'>+oAIyokpMAQgqICOqxBTAvN42AYwTVQDMyQwVAICgAgAQVAAAggoAQFABAJDMp/y4FIJtwJx8ehJo</div><div class='add'>+yQwVAICgAgDoyyk/HnMKhdE5RQ30YoYKAEBQAQAIKgAAQQUAIKgAABBUAACCCgBAUAEACCoAAAQV</div><div class='add'>+AICgAgAQVAAAggoAAEEFACCoAAAEFQCAoAIAQFABAAgqAABBBQAgqAAAEFQAAIIKAEBQAQAIKgAA</div><div class='add'>+BBUAgKACABBUAACCCgAAQQUAIKgAAAQVAICgAgBAUAEACCoAAEEFACCoAAAQVAAAggoAQFABAAgq</div><div class='add'>+AACGCKoQPAs2JQAIquwCUAI2JQAIqowCOPtvbEoAEFQRBaAEbEoAEFQFCkAJ2JQAIKgKFIASsClh</div><div class='add'>+szEKrDGoXkNuiOPwwim4iezYoc9+39iDfQbVq+mGEFOiCjZ7E23swR6D6tV8Q4gpUQWb7PeNPdhn</div><div class='add'>+UL26bAgxJapgk/2+sQd7DKr3EDE1y96mUPT1fqgh6Ffosbsz9mDdQfXquiEY/rUKlBtLYgoqDJZB</div><div class='add'>+Dmjlg8qRWlSBMSSmYLOoKhtUjtCiCowdMQUbRtXLswUgpkBU5XkXf9CmPJZ9nQJrft6Gife9XmC/</div><div class='add'>+t0mHg9tr3FcJYgrmjilgn8Fa55SfI7WYAvtnYKNBW+8+VLGn/zY6wtd4qDY1iCngx+BtdNCre1G6</div><div class='add'>+W3gPt7MXUwAwW1CJKjEFCzB2wODtH1SiSkyB/TKw+KB9DfnARJWYAvtnYKLB+m7+AJ+UgL2WTQmT</div><div class='add'>+jz1jEJVf0ASD7jXck2/vY1PCQscwE+6wfkz1CaqrB6wAbEoQVcBkMdUvqH49cAVgU4KoAiaMqb5B</div><div class='add'>+9bkBFIBNCaIKmDSm+geVArApYaOxZ4zCuoPq5VkDqL//F1Ow9qASVACV9/9iCtYfVIIKoOL+X0zB</div><div class='add'>+HoNKUAFU2v+LKdhnUAkqgAZvqoG1B5WgAgAQVAAAggoAQFABAAgqAAAEFQCAoAIAEFQAAIIKAABB</div><div class='add'>+BQAgqAAABBUAgKACAEBQAQAIKgAAQQUAIKgAABBUAACCCgBAUAEACCoAAAQVAICgAgAY3NsmIEYI</div><div class='add'>+//3zONK/7u/v/nx+zdPl/1rO0++LWd6vZZ59Xe7jSfnZSq3z6jnJ2ValX09PHj9AD2aoiPJ34Lo6</div><div class='add'>+wJWKiJQD7N2BN/WAzbNtZTsCuzJDRZeD8XHkH3zPZo5CSJudeTKbdrX+lkE7QkzFbq8VHj/AGTNU</div><div class='add'>+dDkY1ziw1jjY7nAA/wzKqxnIu5gSPICggoTIuDroXh1YRz3ohuCUlcgESOOUH81iZdR1fJ9+zL1Q</div><div class='add'>+use1Y6nrvLsearR46rHNAQQVw6l14HtyOurJz5USVqs9LynXt8V+ShBAUMHHQfdzFuMsQGqHSW5M</div><div class='add'>+PQmrVtdsjRCkOwY5gKBiGne3Okg5WJaMqbuw2uX5+P6aX4H8/f922F4AgorlgyD3hp47z3ycPfZf</div><div class='add'>+p/FSb00BIKjg4kD8/cm4mFNjKfd/OpsJyb2GJ+V+UzEXSK9wAfuvqGr9s7ooHRiV2yYgDCe8xUOp</div><div class='add'>+gHny2GNjVdwAOzJDRbUYSfnep8srfdCOWV6tr225ztzt3PpxiTRgdGaoAAAEFQBAX075sbS7C6dH</div><div class='add'>+OJU0w8/ocQEIKjY2w0F71bAQTMBOnPIDABBUAAB9OeXHY36tCAD8ZoYKAEBQAQD05ZQfl3xSCwDu</div><div class='add'>+maECABBUAACCCgBAUAEACCqgiRDczwtAUAFZMfXr3wEQVEBkTIkqAEEFFIgpUQUgqIACMSWqAAQV</div><div class='add'>+UDCURBWAoAIKBJKoAhBUQIEwElUAggrEVBhjGQAIKtg2pkQVgKACMTX4MgEQVLBNTIkqAEEFYkpU</div><div class='add'>+AQgqYKzQEVUAggqWdBxrrgsAQQVDRdWTECqxDAAEFSwZVTEhVGIZAAgqWCqqUkKoxDIAEFSwRFTl</div><div class='add'>+hFCJZQAgqGCJqOq9DAAEFQCAoAIAEFQAAAgqAABBBQAwibdNAECqcPKLJo8fH1cNN7+U8up7jpOP</div><div class='add'>+v6as//PvPr+/xPpTlsEazFABUDSmnsRTie/pvX74ZIYKgKz4+J55+fu7EMLPWZmU2auY9YsjejBD</div><div class='add'>+BUDRmDk7pdZq/Vf/P2bZT7/2OI7/rU/ICSoAiHIVLS2uFyq5Dtc3kcspPwCairmQvHUghhBOT1U+</div><div class='add'>+eQx/fyfQBBUALBNrtcPmc/l/QYagAoDqYi9ib/2zPZ2l+hVw7Ms1VAAkKXXbgpIXkH9eIF7r8T15</div><div class='add'>+bEJLUAHA4wD6FQ5PPoVXc/0ll3/3db/+sCen/ABIio7PU3U5YfIdY0++78n6RzPqxfiUYYYKqh94</div><div class='add'>+rv/AzFGV8nelouLue3JC5e5XzTx57E777SUcsa+4zxeIo8HlOw/vOgBwLBlqA1drGDNUAACCCgBA</div><div class='add'>+UAEATM2n/CpyQSIA7MEMFQCAoAIAEFQAAIIKAGBnLkovxI3XAGBfZqgAAAQVAEBfTvlBbXf3I3O6</div><div class='add'>+GGB6ZqgAAAQVAICgAgAQVAAAggoAAEEFACCoAAAEFQCAoAIAQFABAAgqAABBBQAgqAAAEFQAAIIK</div><div class='add'>+AEBQAQAIKiBFCGMsAwBBBVPHVE4QlVgGAM29bQIoGFOf/30c7ZcBrV/zd6/Rq6/7fs1/fs3T5Z+9</div><div class='add'>+AckZO2dvaL6XeffGJ/XxpPxspdZ59ZzkbKve278BM1RQOqaeDvbSy4CW/g5WV6/RUhHRcuwYc2W2</div><div class='add'>+VY3tP/hzY4YKar5bfLIDeLIMM1WsOnaOI/9AeTZzETt2YmbTrtbfMmhH2PfFbq/Syxxk/2iGCmrF</div><div class='add'>+1Kzrgplez78OpjUOsDu8qfkMyqsZyLvwSdleNZYpqGASLQe3GSpGHgNXB92r1+6or+sQvInptV+a</div><div class='add'>+eF/nlB/kDv7aO14xxUpahErqOr7Hc+yF9y3Hbul13l27NPJ+aJBTgYIKRo4qMcXK46b2wTVlHb9m</div><div class='add'>+3VpcXD/i85Kyb4v9lGCvZQoq2CiqxBQzvfY/ZzHOAqR2mOTG1JOwanXN1ghBunucR3INFYw4qMUU</div><div class='add'>+K/sLsO9rlXKuXSoZU99jcfXxmPpp5LP7f5W+B9Ukz4GggtGiSkxBn5ja/UL0v3D5/nO1jyq1zWos</div><div class='add'>+szGn/KDGTinnoliY9TV/FzZnr++U+z+dfcIw93qblPtNxVwUvcIF7N/7uZJRlbLMQS5KN0MFtQ4w</div><div class='add'>+YgrWGberjs+Y21vExmqN/eDAz0M4jsifrtZ5alh5ZyWmAMbaJxfe75qhgl7veMUUwDIEFfSMKjEF</div><div class='add'>+sAQXpUOrqJrk5nSwpLvT7yOMxxl+Ro9LUMFQUSWmoP348zN6XIIK7FgAWDWo/DZuAAAXpQMACCoA</div><div class='add'>+gM7iT/m5BgQA4P+YoQIAEFQAAIIKAEBQAQAIKgAABBUAgKACABBUAAB7+hfHbDX87cMFJQAAAABJ</div><div class='add'>+RU5ErkJggg==</div><div class='head'>diff --git a/Documentation/DocBook/media/dvb/dvbproperty.xml b/Documentation/DocBook/media/dvb/dvbproperty.xml<br/>index 3bc8a61efe30..c7a4ca517859 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/dvb/dvbproperty.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/dvb/dvbproperty.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/dvb/dvbproperty.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/dvb/dvbproperty.xml</a></div><div class='hunk'>@@ -163,14 +163,16 @@ get/set up to 64 properties. The actual meaning of each property is described on</div><div class='ctx'> 	&lt;section id="DTV-FREQUENCY"&gt;</div><div class='ctx'> 		&lt;title&gt;&lt;constant&gt;DTV_FREQUENCY&lt;/constant&gt;&lt;/title&gt;</div><div class='ctx'> </div><div class='del'>-		&lt;para&gt;Central frequency of the channel, in HZ.&lt;/para&gt;</div><div class='add'>+		&lt;para&gt;Central frequency of the channel.&lt;/para&gt;</div><div class='ctx'> </div><div class='ctx'> 		&lt;para&gt;Notes:&lt;/para&gt;</div><div class='del'>-		&lt;para&gt;1)For ISDB-T, the channels are usually transmitted with an offset of 143kHz.</div><div class='add'>+		&lt;para&gt;1)For satellital delivery systems, it is measured in kHz.</div><div class='add'>+			For the other ones, it is measured in Hz.&lt;/para&gt;</div><div class='add'>+		&lt;para&gt;2)For ISDB-T, the channels are usually transmitted with an offset of 143kHz.</div><div class='ctx'> 			E.g. a valid frequncy could be 474143 kHz. The stepping is bound to the bandwidth of</div><div class='ctx'> 			the channel which is 6MHz.&lt;/para&gt;</div><div class='ctx'> </div><div class='del'>-		&lt;para&gt;2)As in ISDB-Tsb the channel consists of only one or three segments the</div><div class='add'>+		&lt;para&gt;3)As in ISDB-Tsb the channel consists of only one or three segments the</div><div class='ctx'> 			frequency step is 429kHz, 3*429 respectively. As for ISDB-T the</div><div class='ctx'> 			central frequency of the channel is expected.&lt;/para&gt;</div><div class='ctx'> 	&lt;/section&gt;</div><div class='hunk'>@@ -334,9 +336,10 @@ typedef enum fe_rolloff {</div><div class='ctx'> 		&lt;title&gt;fe_delivery_system type&lt;/title&gt;</div><div class='ctx'> 		&lt;para&gt;Possible values: &lt;/para&gt;</div><div class='ctx'> &lt;programlisting&gt;</div><div class='add'>+</div><div class='ctx'> typedef enum fe_delivery_system {</div><div class='ctx'> 	SYS_UNDEFINED,</div><div class='del'>-	SYS_DVBC_ANNEX_AC,</div><div class='add'>+	SYS_DVBC_ANNEX_A,</div><div class='ctx'> 	SYS_DVBC_ANNEX_B,</div><div class='ctx'> 	SYS_DVBT,</div><div class='ctx'> 	SYS_DSS,</div><div class='hunk'>@@ -353,6 +356,7 @@ typedef enum fe_delivery_system {</div><div class='ctx'> 	SYS_DAB,</div><div class='ctx'> 	SYS_DVBT2,</div><div class='ctx'> 	SYS_TURBO,</div><div class='add'>+	SYS_DVBC_ANNEX_C,</div><div class='ctx'> } fe_delivery_system_t;</div><div class='ctx'> &lt;/programlisting&gt;</div><div class='ctx'> 		&lt;/section&gt;</div><div class='hunk'>@@ -647,6 +651,18 @@ typedef enum fe_hierarchy {</div><div class='ctx'> 			many data types via a single multiplex. The API will soon support this</div><div class='ctx'> 			at which point this section will be expanded.&lt;/para&gt;</div><div class='ctx'> 	&lt;/section&gt;</div><div class='add'>+	&lt;section id="DTV_ENUM_DELSYS"&gt;</div><div class='add'>+		&lt;title&gt;&lt;constant&gt;DTV_ENUM_DELSYS&lt;/constant&gt;&lt;/title&gt;</div><div class='add'>+		&lt;para&gt;A Multi standard frontend needs to advertise the delivery systems provided.</div><div class='add'>+			Applications need to enumerate the provided delivery systems, before using</div><div class='add'>+			any other operation with the frontend. Prior to it's introduction,</div><div class='add'>+			FE_GET_INFO was used to determine a frontend type. A frontend which</div><div class='add'>+			provides more than a single delivery system, FE_GET_INFO doesn't help much.</div><div class='add'>+			Applications which intends to use a multistandard frontend must enumerate</div><div class='add'>+			the delivery systems associated with it, rather than trying to use</div><div class='add'>+			FE_GET_INFO. In the case of a legacy frontend, the result is just the same</div><div class='add'>+			as with FE_GET_INFO, but in a more structured format &lt;/para&gt;</div><div class='add'>+	&lt;/section&gt;</div><div class='ctx'> &lt;/section&gt;</div><div class='ctx'> 	&lt;section id="frontend-property-terrestrial-systems"&gt;</div><div class='ctx'> 	&lt;title&gt;Properties used on terrestrial delivery systems&lt;/title&gt;</div><div class='hunk'>@@ -721,14 +737,10 @@ typedef enum fe_hierarchy {</div><div class='ctx'> 			&lt;listitem&gt;&lt;para&gt;&lt;link linkend="DTV-TUNE"&gt;&lt;constant&gt;DTV_TUNE&lt;/constant&gt;&lt;/link&gt;&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'> 			&lt;listitem&gt;&lt;para&gt;&lt;link linkend="DTV-CLEAR"&gt;&lt;constant&gt;DTV_CLEAR&lt;/constant&gt;&lt;/link&gt;&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'> 			&lt;listitem&gt;&lt;para&gt;&lt;link linkend="DTV-FREQUENCY"&gt;&lt;constant&gt;DTV_FREQUENCY&lt;/constant&gt;&lt;/link&gt;&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-			&lt;listitem&gt;&lt;para&gt;&lt;link linkend="DTV-MODULATION"&gt;&lt;constant&gt;DTV_MODULATION&lt;/constant&gt;&lt;/link&gt;&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'> 			&lt;listitem&gt;&lt;para&gt;&lt;link linkend="DTV-BANDWIDTH-HZ"&gt;&lt;constant&gt;DTV_BANDWIDTH_HZ&lt;/constant&gt;&lt;/link&gt;&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'> 			&lt;listitem&gt;&lt;para&gt;&lt;link linkend="DTV-INVERSION"&gt;&lt;constant&gt;DTV_INVERSION&lt;/constant&gt;&lt;/link&gt;&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-			&lt;listitem&gt;&lt;para&gt;&lt;link linkend="DTV-CODE-RATE-HP"&gt;&lt;constant&gt;DTV_CODE_RATE_HP&lt;/constant&gt;&lt;/link&gt;&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-			&lt;listitem&gt;&lt;para&gt;&lt;link linkend="DTV-CODE-RATE-LP"&gt;&lt;constant&gt;DTV_CODE_RATE_LP&lt;/constant&gt;&lt;/link&gt;&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'> 			&lt;listitem&gt;&lt;para&gt;&lt;link linkend="DTV-GUARD-INTERVAL"&gt;&lt;constant&gt;DTV_GUARD_INTERVAL&lt;/constant&gt;&lt;/link&gt;&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'> 			&lt;listitem&gt;&lt;para&gt;&lt;link linkend="DTV-TRANSMISSION-MODE"&gt;&lt;constant&gt;DTV_TRANSMISSION_MODE&lt;/constant&gt;&lt;/link&gt;&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-			&lt;listitem&gt;&lt;para&gt;&lt;link linkend="DTV-HIERARCHY"&gt;&lt;constant&gt;DTV_HIERARCHY&lt;/constant&gt;&lt;/link&gt;&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'> 			&lt;listitem&gt;&lt;para&gt;&lt;link linkend="DTV-ISDBT-LAYER-ENABLED"&gt;&lt;constant&gt;DTV_ISDBT_LAYER_ENABLED&lt;/constant&gt;&lt;/link&gt;&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'> 			&lt;listitem&gt;&lt;para&gt;&lt;link linkend="DTV-ISDBT-PARTIAL-RECEPTION"&gt;&lt;constant&gt;DTV_ISDBT_PARTIAL_RECEPTION&lt;/constant&gt;&lt;/link&gt;&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'> 			&lt;listitem&gt;&lt;para&gt;&lt;link linkend="DTV-ISDBT-SOUND-BROADCASTING"&gt;&lt;constant&gt;DTV_ISDBT_SOUND_BROADCASTING&lt;/constant&gt;&lt;/link&gt;&lt;/para&gt;&lt;/listitem&gt;</div><div class='hunk'>@@ -767,7 +779,8 @@ typedef enum fe_hierarchy {</div><div class='ctx'> 	&lt;title&gt;Properties used on cable delivery systems&lt;/title&gt;</div><div class='ctx'> 	&lt;section id="dvbc-params"&gt;</div><div class='ctx'> 		&lt;title&gt;DVB-C delivery system&lt;/title&gt;</div><div class='del'>-		&lt;para&gt;The DVB-C Annex-A/C is the widely used cable standard. Transmission uses QAM modulation.&lt;/para&gt;</div><div class='add'>+		&lt;para&gt;The DVB-C Annex-A is the widely used cable standard. Transmission uses QAM modulation.&lt;/para&gt;</div><div class='add'>+		&lt;para&gt;The DVB-C Annex-C is optimized for 6MHz, and is used in Japan. It supports a subset of the Annex A modulation types, and a roll-off of 0.13, instead of 0.15&lt;/para&gt;</div><div class='ctx'> 		&lt;para&gt;The following parameters are valid for DVB-C Annex A/C:&lt;/para&gt;</div><div class='ctx'> 		&lt;itemizedlist mark='opencircle'&gt;</div><div class='ctx'> 			&lt;listitem&gt;&lt;para&gt;&lt;link linkend="DTV-API-VERSION"&gt;&lt;constant&gt;DTV_API_VERSION&lt;/constant&gt;&lt;/link&gt;&lt;/para&gt;&lt;/listitem&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/dvb/frontend.xml b/Documentation/DocBook/media/dvb/frontend.xml<br/>index 61407eaba020..aeaed59d0f1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/dvb/frontend.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/dvb/frontend.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/dvb/frontend.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/dvb/frontend.xml</a></div><div class='hunk'>@@ -45,8 +45,8 @@ transmission. The fontend types are given by fe_type_t type, defined as:&lt;/para&gt;</div><div class='ctx'>   &lt;/row&gt;</div><div class='ctx'>   &lt;row&gt;</div><div class='ctx'>      &lt;entry id="FE_QAM"&gt;&lt;constant&gt;FE_QAM&lt;/constant&gt;&lt;/entry&gt;</div><div class='del'>-     &lt;entry&gt;For DVB-C annex A/C standard&lt;/entry&gt;</div><div class='del'>-     &lt;entry&gt;&lt;constant&gt;SYS_DVBC_ANNEX_AC&lt;/constant&gt;&lt;/entry&gt;</div><div class='add'>+     &lt;entry&gt;For DVB-C annex A standard&lt;/entry&gt;</div><div class='add'>+     &lt;entry&gt;&lt;constant&gt;SYS_DVBC_ANNEX_A&lt;/constant&gt;&lt;/entry&gt;</div><div class='ctx'>   &lt;/row&gt;</div><div class='ctx'>   &lt;row&gt;</div><div class='ctx'>      &lt;entry id="FE_OFDM"&gt;&lt;constant&gt;FE_OFDM&lt;/constant&gt;&lt;/entry&gt;</div><div class='hunk'>@@ -63,6 +63,10 @@ transmission. The fontend types are given by fe_type_t type, defined as:&lt;/para&gt;</div><div class='ctx'> &lt;para&gt;Newer formats like DVB-S2, ISDB-T, ISDB-S and DVB-T2 are not described at the above, as they're</div><div class='ctx'> supported via the new &lt;link linkend="FE_GET_SET_PROPERTY"&gt;FE_GET_PROPERTY/FE_GET_SET_PROPERTY&lt;/link&gt; ioctl's, using the &lt;link linkend="DTV-DELIVERY-SYSTEM"&gt;DTV_DELIVERY_SYSTEM&lt;/link&gt; parameter.</div><div class='ctx'> &lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;The usage of this field is deprecated, as it doesn't report all supported standards, and</div><div class='add'>+will provide an incomplete information for frontends that support multiple delivery systems.</div><div class='add'>+Please use &lt;link linkend="DTV_ENUM_DELSYS"&gt;DTV_ENUM_DELSYS&lt;/link&gt; instead.&lt;/para&gt;</div><div class='ctx'> &lt;/section&gt;</div><div class='ctx'> </div><div class='ctx'> &lt;section id="fe-caps-t"&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/selection.png.b64 b/Documentation/DocBook/media/selection.png.b64<br/>new file mode 100644<br/>index 000000000000..416186558cb2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/selection.png.b64?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/selection.png.b64</a></div><div class='hunk'>@@ -0,0 +1,206 @@</div><div class='add'>+iVBORw0KGgoAAAANSUhEUgAABIsAAAHpCAYAAAACi7yYAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A</div><div class='add'>+/wD/oL2nkwAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAAd0SU1FB9sLCBAiCLMGMtAAACAASURBVHja</div><div class='add'>+7d3rkds4FgZQaMohTBY7ObRCV+fgyWJy4P6wJavVIgmSAIjHOVWu3bElPkBSAj5dgpdpmqYAAAAA</div><div class='add'>+ACGEvzQBAAAAAHfCIgAAAAAehEUAAAAAPAiLAAAAAHgQFgEAAADwICwCAAAA4EFYBAAAAMDDD00A</div><div class='add'>+21wul9XXTNN0aHnP749Z39o2rK0jRzssLX/pvVve9+61S69Jdey2bn/sMTx6TAAA/cIW+oVb+2tb</div><div class='add'>+3p+izwioLIJsHYe9X+a979vae89ut6Pb1+txBwD0C3vZN0ERrFNZBAct/ZJxuVx2Vdg8v+/oLyEx</div><div class='add'>+69j7xbq2/1u2e0u75Th2Mevf8ytVzDkDAOgXjtYv3LquVP0nQRHEUVkEBTsJve/r0hfu2hdz7e0W</div><div class='add'>+27HQ4QAA9Avr7BcJiiCesAhO+GKK/YIt8SV+RscoNmippUPl1jIAQL/w3PUc7Y8JimAbYRGc9KVY</div><div class='add'>+Yu6b3OsYNUTRuQAA9AvL9AtT9LsERbCdOYsAX74ZOiVbO1M6LQCAfmH7/TzohcoiqOhLK+eXV4p1</div><div class='add'>+xP4y1krF0X1bn7dXBwIA0C+ss19oagAoR1gEJ4j9osv5iPq965imKUk59eidwNc/AIB+oX7h/HpK</div><div class='add'>+tzeMzm1oQJIv7Ra/eO/7sOWxtgAAtN0v1N+DdcIiyPQFlPP1JbZpTyehl19q1joQOhgAgH7hOf3C</div><div class='add'>+Pct9tz36c7DMbWhQwPMXUYkOQ6517P3Sj/216axJEdfWoyMBAOgXpukX5uqv7Xm/W9JgnsoiSGxr</div><div class='add'>+4FHiiyvlOu7v21pu/PqLzuuvOTHtlmIZW/bz+f1r6177ewBAv1C/8FwqjCCesAgSdwK2dAh63e+5</div><div class='add'>+fX8XuBxtt1SdkZhy6djt37vNOioAoF84Sr8wV39tzzIERvCd29Agg7knQ8T+unTk15mc64j5El17</div><div class='add'>+KsbRW75inrqR6glj79rELWsAgH5hmn7hmcckpt8HI7tMRjYAAAAA/KayCAAAAIAHYREAAAAAD8Ii</div><div class='add'>+AAAAAB6ERQAAAAA8CIsAAAAAeBAWAQAAAPAgLAIAAADgQVgEAAAAwIOwCAAAAIAHYREAAAAADz80</div><div class='add'>+AQAAqVwuF40AABWbpmn1NbvDIh0BAKDGzg3n0T8EgD7sCot0BAAAmDNNUwj6iwBQlS3fzIduQ7vd</div><div class='add'>+blobAMjuer1qhKZ6o4IiAGiZOYsAAMji0w+LAHC6jx0/unkaGgAAAAAPwiIAAAAAHoRFAAAAADwI</div><div class='add'>+iwAAAAB4EBYBAAAA8OBpaAAAFDf3ZJa5J6htef3za5eeyDb3urWnxsQuM/V7jmxX7Dr3HIMUbfj6</div><div class='add'>++qXjurZ977Zja1vuaVOAnqgsAgCgqKWB+rt/2/r6s7Z/z3aesf0x+1fjdgFQjsoiALpyfRng3J5+</div><div class='add'>+Fb7/2+3NL8Xv/m1pWa/veX7t/XXXN4OtuWXs+fe59c/t45H2erd/Mdu/9XX0b63q5zWkWHr9/d8+</div><div class='add'>+rtfFapOY9byz9L7X5e7ZzqVKmT2VP3ts2cc966+1MmfuGKkkAvhFZREA3XgON94FNnMhzlJQNLes</div><div class='add'>+1/ffX/f62ue/fw1d3r3m9d/nlhu7/rX22rv8LW20d/voT8ztYbEBzNJrS4YMubbzzNCidLs+BzX3</div><div class='add'>+datsAjiXsAiALrwLfPYGE1uXtaVK5l2YNLes2OXurdI5svwtbaSKiFdbg5Cl18f821y1UupAZu92</div><div class='add'>+1njblwobgLG5DQ0AZqSofjkSnOSuvsmxf2fsB5SUMtT5vN2+LC82xNoziXaJNthyO11MBdHS7YUA</div><div class='add'>+5CUsAmAo91u97rdGLc1jdKQi5t08QiH8uSVrTcwcSkekWv7avuTeD1hzD2TuwcOWqqIS8wa9C01G</div><div class='add'>+nD/neV9fQzQAyhMWAUAma5NVA23KEeLMhUZHJ5g+e/9jXyscAqiLOYsA6MK7+XLW5gWK/fdnsYHP</div><div class='add'>+2uvWJtveu969ti5/bxsJzNgTDOx5JP2z1yAmNsC4T7j8+ifXdj6vs7VjlGsdQiSAc6gsAqAbz7eY</div><div class='add'>+Pf9dqmVtWd7cbWivE0LPbe/rv80tL1Vb7Vl+TBvl3g/a8nx70dIj7e9/v/b6mKer1bBfc9tZ65w8</div><div class='add'>+pdt1bh1zQdFaGwNw3GWapmnzmy6XQx1wAIAt7gHTjm4LJTuWv/uI084QYC482Pv6LfMSvXtc/Nag</div><div class='add'>+pNR+xb7+yLYeXX9MG669ZunYpN7mEeeJAsZx/4y7/P7vmP6U29AAAChq6yPm9z6S3n7t34/c648J</div><div class='add'>+Z97N49TKuQDQOpVFAED1VBY10rGMrCwCAMpRWQQAAADAIcIiAAAAAB48DQ0AADqSciJsAMYkLAIA</div><div class='add'>+gI4IgwA4SlgEAADAZh9/X9/+/ed/t8Ovf37t3PKWXje3rq3LTP2eI9sVs961969t59r2LbX16zJi</div><div class='add'>+t+Xzv1vyduE4YVHpD9SZsuDnX4COlA7HLD/Ferase2lZW7Zh6/a+vn6pDda27912rK0vVbsCAEB1</div><div class='add'>+45qFwf3H39dNIcm715fY/rWQKsV7Wj5me93Dn6VlxgZKnEdYVPLiXAgTPq7X6BBh7rWpln/kPWv7</div><div class='add'>+LigBAIDGxzUrVT+vocTS6+//thYs7A1plt73utw927kUeixt3xnhWEybzO13qe0VHtVDWFTq4nwK</div><div class='add'>+cmKDni2B0NLy7/82F/4srWdPYLRneVvWUWvgNNfuAjIAALoZ10TcHhYbwNz/LiYwStpvf3PbU47t</div><div class='add'>+zL0v727/WqvqijlmEEIIf2mCAh+oK0HR0UBhbflbbuVKsT1ry4vdhhRt/nm7PdZdYr0AADCCreHC</div><div class='add'>+0utj/m0u3EkdcuzdzntQ09MxS7Gud23iFrQ2qCwqeXFmrjBZWv7n7XZ6WFLDNgAAAGNLGeq8Vilt</div><div class='add'>+ndz53fKO7sMZc0DlPjaCpfKERTVfKBsmqy617hr2de21qeduAgAAzvM6YfKWypQS8wa9q6IpVT3z</div><div class='add'>+vPyYp4pBLGERu55i1sSXytO2q2oCAAAe44MMIc5caDQ3B1KSsVzF4dC7p6KthWgqiOohLKr5A2zj</div><div class='add'>+RNW511/LurY8NQ4AAEhv661OMY9RXxwDPAUP9/+OGjtsDB+ObufzOnMFOTHLnZvoWhhDLBNcl/xA</div><div class='add'>+PRherIUka7dfLS333Z/a9j/VOoRIAACwc0wy86SzL/3tmadvLU12/Pra2vZryz6V3OZ3f44eMwhB</div><div class='add'>+ZVGZi/jpFqi5qqAj1UJry495Gltupbdhbh1zQdFauwEAAL/72i+PkU/x+hoeRb93O/fMi1R6Iuet</div><div class='add'>+xyz1emNDQRNc10NYVOoieQl0jnoNN2KWXyoo2jMH0lnbfKTdzm5nAAA4bXyzMJnyXHVLC0FA7fsV</div><div class='add'>+cxveu7mCWjoG1EFYVPKDZ2GS5diAYW0ZtQYYJZ/gtrSuexs9h201txsAAFQ7vtkYMGx5/dHXHgk/</div><div class='add'>+atmvI+9PNYF0ioqvGqrG2O4yTdO0+U2XSwghhJuBNABQwPV3qL+j20LJjuXvPuL9KPnRBWCbtVvE</div><div class='add'>+hCrsOq9+96Muv/87pj+lsggAAKDFAeBLsCBIaJ9jSC2ERQAAAB0QHgGpCIuI++JZmZRbmTkAAFTW</div><div class='add'>+h98QHn1cPzQYFPR5+6x6+4RFRJ7IN40AAAA19dGfwp+Yx6HHPr4cQFgEAADQuNfwZy08inkEOzAu</div><div class='add'>+YREAAECjYiqKdvl50bg04Ujg+Xr7Ze5bw1q63VNYlPzgXzUCAP13zNyeDJB/bJErCAKKB0WtERYB</div><div class='add'>+AACcNWA9IRBy6xnDX3eColXCoowUbgLQk0kTAMQPRguFQItPOHuzDXuCoss/jieV9Ul+Hrg2TwqK</div><div class='add'>+WnvioLAIAABgy6CvgiBoz/apKGL4a1dQFE1YBAAA8DywK3hrWOoAJ1U1EXR3XQuKNhEWAQAAYwwW</div><div class='add'>+Gw6B9u6foAgERXsIiwAAgLYHgoUnia4tgBESwcL1UUlQ9Hn7bCo8EhYBAAB1DvJOenR860GLoAh+</div><div class='add'>+f4ZUFBS1RlgEAACUH8R5ZLx9hJyfMYKiQ4RFAABAuoGSEMj+w9mfQ4Kiw4RFAADA+iBICAS08Fkl</div><div class='add'>+KEpCWAQAACMPrMwLBPTyeSYoSkZYBAAAPQ6ahEDASJ95gqKkhEUAANDaoMgtYQB/PhMFRckJiwAA</div><div class='add'>+oJYBjxAIYNvnpqAoC2ERAADkHlQIgQDyf+4JipIRFgEAwN4Bg3mBAKogKEpLWAQAAK+DASEQQDME</div><div class='add'>+RekJiwAAGIpbwgD6ISjKQ1gEAEAXhEAAZPl+GSwoCkFYBABA7Z10IRAAZ30HDRgUhSAsAgDgrA64</div><div class='add'>+eYEAqPl7atCgKARhEQAAR/17CSGEMP186WSHa9HNEAIB70zTNMy+Xi4XBzyRkYOiEIRFAAAs+ff8</div><div class='add'>+gYcQCICSRg+KQhAWAQCMSQgE0J25KioVR/EERb8IiwAAenJGCPS/6ctgZHp0sG+OB0AFXkMk4dF7</div><div class='add'>+gqI/hEUAAC04qxLof5O2B6B7gqKvhEUAAGcSAgFQ2HOlkSojQdE7wiIAgFxOvCUMAFgnKHpPWAQA</div><div class='add'>+sJUQCIBOjFxlJCiaJywCALgTAgHAEARFy4RFAED/zAsEAKvuVUa9VxgJitYJi6DmD+uf7//+8s/6</div><div class='add'>+a969ds/yU6xn636uLWttu9e2dakdX5cRuy2Xf/K2ETBDCAQAbHBWUPS63toJi6BSS8HD9DM+eJh7</div><div class='add'>+barlH3nPme2y5h7+LC0zNlACdnaq/r5+v/Zzh0NCIADotsJIUBRPWAQ1fjg/BSKxQc+WQGhp+fd/</div><div class='add'>+mwtJltaTOzCKbZe5fSoV6giPYKXD9BQCFSMEAoCx+x+Cok2ERVCZtUBk6e9TLP/5dqrY8CfmFqy1</div><div class='add'>+7Xm+/evdenO3C5CgMyQEAoC+xibT1EV1kaBoO2ERVCp38LG0/CPhT+vt8q4dlsIrARVDdBTffB58</div><div class='add'>+hGv29X7+d3v8/+v1+ui0AgDEqiUo+rx9NhUeCYug48FcCOfPI7T3faXmQOrtWECJa/eo5xAIAKi8</div><div class='add'>+v9Dw/EU1BUWtERYByQaXe8OQ5/fVXNUEvVyruQiBAIBaCIqOERZBJ7ZOVJ17/bUParfs1+utaGu3</div><div class='add'>+oKkgIqczrpfHuf+l43NzMABgpD5IQ/MXCYqOExZBxQPCI6HDWoVOzCPhlwaNJQa8c3MFCWPo9Zov</div><div class='add'>+zbUEAPRGUJSGsAgqE/M0siOBydryY546VmKw+jpwzt0ukMtZlXOuBQAgeb+m8uoiQVE6wiKo0Gsw</div><div class='add'>+kmKwOjcvUEuTMadul63rjQ3STHA9SGdJCAQAUA1BUVrCIqjU0m1ksYPFtWWcFWrEPHZ+7rH1Z243</div><div class='add'>+43BLGADATD+pwuoiQVF6wiKoWMzgce01a4HMGQPZLWFXim3J3Y4G+w11boRAAABdERTlISwCoHlC</div><div class='add'>+IACAgn2v6dczUmurMBIUpSMsAqDejoh5gQAAiCAoSktYBBQf4BuIIwQCACAVQVF6wiLAgJyk3BIG</div><div class='add'>+AEApgqI8hEUARBECAQDwpX9Y4ZPRchgtKApBWATgS14IBAAAb40YFIUgLALolnmBAADI3ufsuLpo</div><div class='add'>+1KAoBGERQHtfyEIgAADIauSgKARhEUBV3BIGAEBzfdjOqotGD4pCEBYBlPkCFQIBAED1BEW/CIsA</div><div class='add'>+DhACAQCMpbYKmmmaqtmO1quLBEV/CIsA3n3ZmRcIAACGISj6SlgEDEUIBABAT16reWqpNGqJoOg7</div><div class='add'>+YRHQDbeEAQAAWwiK3hMWAdUTAgEAQGQ/9qnSqHSVUWvzFgmK5gmLgNMIgQAAgDMIipYJi4DkzAsE</div><div class='add'>+AADnu1f5mMfoK0HROmEREE0IBAAAtOysoOh1vbUTFgEhBLeEAQBAr0pWGNU8b5GgKJ6wCDonBAIA</div><div class='add'>+AEYnKNpGWASNEgIBAACb+vODzmEkKNpOWASVMS8QAABAGrUERZ+3z6bCI2ERFCIEAgAAanC5XLJW</div><div class='add'>+F9Uyb1FNQVFrhEWQ+oOxUCgkBAIAAHaPJzIHRmcTFB0jLILaPrSFQAAAALsJio4TFkEhQiAAAKCq</div><div class='add'>+MUqH1UWCojSERZD6A1coBAAAUJygKJ2/nE4AAABASqUrlgRFaaksghQfhD+1Af1QHQcAQEsERemp</div><div class='add'>+LAIAAIBB1fCI+yMERXkIiwAAAIDmCYrScRsaJOYWHlrkVkoAgIHHMB08FU1QlJbKIgAAAKBZgqL0</div><div class='add'>+hEUAAABAkwRFeQiLAAAAAGaMFhSFICwCAAAAeGvEoCgEYREAAADAN6MGRSEIiwAAAGB4l8sl+TJb</div><div class='add'>+fsLayEFRCCH8cEkAQJkOTo5OGAAAaY0eFIUgLAJgcCV/8VpalyAJAOB8gqJfhEUADKPmUuh32yZA</div><div class='add'>+AgAoR1D0h7CIrgduBlp9DqqdM4xyHj9vv3MTACAfQdFXwiKAmcH5K4P19o9hT/vlfAQASENQ9J2w</div><div class='add'>+iO4HjQZUGKyPeXxG2V/nIQCQyuVyGa5PJSh6T1iEgR0kOIcN2H2OOA8BANoiKJonLAIwYG+6vfne</div><div class='add'>+Ls5BAIBlgqJlf2kCeh/oGVRyxvntvNO22gkAoE6ConUqiwAyDthDUOWRsi1xDgIAHHFWUPS63tqp</div><div class='add'>+LAIoMGAXdhxrP5yDAABHCYriCYsYYuBnkIQBu/ZCmwIA4xIUbSMsAjhhwI42Ort9tTEAMApB0XbC</div><div class='add'>+IoYZABoY4Vpoo120jfMQACCVWoKi1ibRFhYBGKhrD+0OANAdQdF+wiKAkwfqBusCCwAA0hIUHSMs</div><div class='add'>+YqjBoAEp1Pe54LoEACAlQdFxP5xGAOebpilcLpfh9rkVKY6NUAwAID9BURrCIoBKjBQY1Rqc5Gz/</div><div class='add'>+uWULkQAA0hAUpSMsYriB4YgVHLR1rfR+ftb0eVBDW79ug/AIAGA7QVFawiJgqIH5O7UNznsOjGpo</div><div class='add'>+69rb9nn7BEcAAOsERekJixhuIN77YJxjg3OD9D4/C1q93gVHAADLBEV5CIsAKhyk9xZonhV09NSG</div><div class='add'>+giMAgGWConSERQCRg3QD9PaOmXMSAGAMgqJkHc0Qpin85ZQip5oHMgZZ7BmglwwhejlHS+/HSLeY</div><div class='add'>+lj4nAQBqJChK2nkPIQRhEW0NisAAvbXvmslxse8AgDFcNoKiPIRFGMhCxV9+LZ+jpYMitAMAQA6j</div><div class='add'>+BUUhCItoZKB4HwAZCGFwPt71v9b+joE2AQDa6sO1ZMSgKARhEUCSwTnaXfsAAPRl1KAoBGERmbSU</div><div class='add'>+SEvPcY62t72CkPh20lYAANuNHBSFICyikcGOQSKtnaejEhQ5PwEAWjd6UBSCsAjAgFwbD9N22g8A</div><div class='add'>+YJmg6BdhEcnlmNi6pW0G134egg7tCACQk6DoD2ERBjuAa157AgAMTVD0lbCIpFqu0FFdRM2D8NrP</div><div class='add'>+z5zbJ9jQrgBAe/25lvoagqLvhEU0O5Ax0IE+OxbU8zkLANA7QdF7wiIAqiXM0MYAALkIiuYJi0im</div><div class='add'>+xYmtc+4DBt+ue+0IAECdBEXLhEUYlAMAAAxstB/NBUXrhEUAVNepEAQDAJDDWUHR63prJyyiukHj</div><div class='add'>+1kFi6kGlW9HgXIIiAAD9uRwERfGERQAAAEDXBEXbCIs4rMdKHNVFcM41oqoIAMDYJzVB0XbCIqqy</div><div class='add'>+d6BogAkAAMCrWoKi1ibRFhYBsImqIgAA/boW+nSCov2ERVTz4VLbQNGtaAAAAG0SFB0jLKIbqhLA</div><div class='add'>+9QsAQJyefxwXFB0nLIJBP0BpSy1himsCAICaCYrSEBZRxaAx1UBYdQK9XRsAANBKf/Xs8ZigKB1h</div><div class='add'>+EQCnEvICAHCUoCgtYRG79Dyxdc59Bdc9AABn9ud67NMJitITFtEdVQoAAABjEBTl8cOpBZBOjl9q</div><div class='add'>+eg5AhbsAAG32UWvs1wmK0lFZxKkfNLk+UFIv1+03AAAA9RIUpaWyCCCRnkNFgSkAgD7cnLOrigRF</div><div class='add'>+6akswoDRvlMxt2kBAMA8QVEeKovodhB8uVwEPBTjXKvvMwAAQL9Uny6F0YKiEFQWAVT7hSxMAQCA</div><div class='add'>+c40YFIWgsoiTBsSlBsGpq4umaTKAJ9t1AQAALfVHex8bjRoUhaCyCKDKL+aavngFYgAAjGbkoCgE</div><div class='add'>+lUUAmwlPjlOhBwDoC+rP1Wr0oCgElUWc8IFY+kMl9fp8OYx9HZQ4/oIUAAA4h6DoF5VFACtKBoSC</div><div class='add'>+IgAAatdrn1VQ9IewiKID5V4+VEx07bz3pQsAAP0QFH0lLGIIqZ+KRl9qODcERQAAtDK26o2g6Dth</div><div class='add'>+EVCMwG6cL1wAAGiBoOg9E1xTbHB/9oDYRNfUSFAEAEAr/dbe+q6ConnCIoATv3BrJxQFAKBHgqJl</div><div class='add'>+bkMDKGz0aiLVVAAA+m5nEhStU1nErB6fguZWNM4+/wQlAABwnrOCotf11k5lEUBmAiIAAPRjzyco</div><div class='add'>+iqeyiLd6rCrKtT2qi5g7z1QSAQBAHQRF26gsAjhIIAQAgL5tvQRF26ksAjhomqYvfwAAgDrUEhS1</div><div class='add'>+Nom2yiLeDnxTqTWVvlwuBvUUuYZUHQEAUKve+6qCov2ERQAZCY4AAGihr9pbf1VQdIzb0Fj8sDjC</div><div class='add'>+wBi+X18q2gAAIC9B0XHCIoYlzOIsQiMAAGrup7bcVxUUpSEsAjjxyxgAAEhDUJSOsIgsA9dWqnZU</div><div class='add'>+F1HDdSc0AgBAP/UYQVFawiKASr6MAQCA7QRF6QmLACohMAIAoMY+as39VEFRHj+c+qQepLZ2a9fl</div><div class='add'>+ckm6/9M0ub2t4XPj7C9C5w8AAOwjKEpHWATw5F1QUzpAEhgBAFCbe5+41n6qoCgtt6ExdFVRru12</div><div class='add'>+O1FfLpfL40+L1yUAAPRMUJSesAhgg5LBkcAIAIDa1NZHFRTlISwC2KlEaCQwAgCAc40WFIUgLBqe</div><div class='add'>+W9Dybb9B/jgERgAAjDaOHKWPOmJQFIKwCCCJ0nMaAQAAeY0aFIUgLCLhQBnIdy2oLgIAoDY991FH</div><div class='add'>+DopCEBa5sMk60NfGzqPWz6cc++K6AACgZqMHRSEIiwCyUG0HAMAIevshUFD0i7DIBW1QnHl/VFHg</div><div class='add'>+fAIAgPoJiv744XQAyONyuQh3AIDmTdOkavqlj1fzsXKO7CMo+kplEUBjnQkBFAAApCMo+k5YNCC3</div><div class='add'>+oJXfL4N7AACgxDjm+U+r48ySBEXvCYsACnxp+zIGAIC6CIrmCYsGo6rovP0zuAfXAwD47qb0mKZk</div><div class='add'>+lVFL54mgaJkJrvGFAax2MlzvAAD0QlC0TmURQAGeIAIAwNn90RJVRrX/yHhWUPS63toJiwaiMsAx</div><div class='add'>+wPkEAACjEhTFExYBcAphFwDAOXJXGNXYzxMUbSMsAgAAALolKNpOWDQIv+A7Fpyv5XmLzLkEAOjH</div><div class='add'>+6p+2eL7UEhS1Nom2sAgAAADojqBoP2HRAPwC4JjgXLL9AAC8U+IJaWcQFB0jLAIAAAC6ISg6TlgE</div><div class='add'>+QBTzFgEA6OttcUYVuaAoDWFR59zi4diAawEAgBEIitIRFgEAABDFjzx9a7m6SFCUlrAIgFM7EAAA</div><div class='add'>+cISgKD1hUcek/o4RuBYAANiitR8HBUV5CIsAAACA5gmK0hEWdcqv9I4V5JLr1ybXAgDov+Kc2UtQ</div><div class='add'>+lJawCAAAAGiWoCi9H04rYpjU9iu/puAz4ZLlOpimyecNAECnfb0cBEV5qCzqkCDDMcNxBgAA0hgt</div><div class='add'>+KApBWEQEv/IDJQnVAACMA2sxYlAUgrDIIItqPjgdO1wHrgcAMO6AeowaFIUgLAJoml98AAAgvZGD</div><div class='add'>+ohCERRiIahuK6PXXN9VFAAD01rcbPSgKQVjk4sMxBNeENgYAIIQgKLoTFjFL5Qzgs6JvgiIAfI/A</div><div class='add'>+H4KiP4RFYJCMjpT2064AAEMTFH0lLNLpx7GkUTWFlbm3xXWhPQEAchEUfScsovpBKBiU+9wYrS21</div><div class='add'>+IwBAGYKi94RFOv5UOEB2TF2baNMcbaf9AICzxzo1ERTNExYB+OJuarsEHtoMAOAoQdEyYRHNDELB</div><div class='add'>+4NxniPbVVgD4nsH5cpSgaJ2wyMWGY4tjp507bR9tBADw1VlB0et6aycsAkg8QM+theq/UtsoENEm</div><div class='add'>+AACxBEXxhEU0NwgFA3SfJ+/aH+0AADBHULSNsMigAMeYho5Ta4Fu6cBo1GtGWAkAME9QtJ2wiGYH</div><div class='add'>+oWCA7rNl7rg4BwEACKGeoKi1SbSFRQ0PEHCsOW9wfsZxEehuP072DwD0Vxm3Dyoo2u+HUx+g/g5Q</div><div class='add'>+60HR5XI5pR3v6+whaNMRBwCIJyg6RlhENwMpMCCv/3PmrPZ9Xm9rn3fOSQCAbQRFxwmLDGZpYEA8</div><div class='add'>+TZPKiMHPKddHnvOwxrZ1nQAA7CcoSkNYBFCxHqv+agiM7l6344z2Fg4B0INeftyk7XNFUJSOsAgf</div><div class='add'>+6uDaPGXfagxJ5rYpxbEQCgEA5CMoSktY1BiDjXEHwn6tGe8ccp347AUAYJ2gKL2/nFYGpIDr8sx9</div><div class='add'>+9TkEAMBegqI8hEUN8cu2Ab9zwHljv9H2AADvCYrSERYBGLTbf20OANA0QVFa5iwySABci1W1hQo6</div><div class='add'>+5xwAwBaCovRUFjXC4MmAzLngHBmpTbSLcw4AIIagKA+VRQAG7FW3kYDUOQcAcKbRgqIQVBY1IcdA</div><div class='add'>+yaDBOcF5A3bXn88r5xwAQBtGDIpCUFkERQZqwh0M1tO0n2vJOQcAUMqoQVEIwiIAA/YG21No5JwD</div><div class='add'>+AMhp5KAoBLehVc8taAZvJc8N0h1vt/6UaWO0CQB9j13gDKMHRSGoLAJINlDn3HYfsYPqvAMASEtQ</div><div class='add'>+9IuwyMACcB11dVxGCI2cgwAA6QmK/hAWVUwZZ3+Du9THdJomg0aDcRaOXS+fo85HAIC8BEVfCYsM</div><div class='add'>+DnBMnX8Mc821FB65BgFokR8zaZGg6DthEaT+gvypDaBW7zqvNQRIOtUAAOcQFL0nLAJgaEtBTcog</div><div class='add'>+SSAEAFAXQdE8YREAzBDwAAD0SVC0TFgEKQaU//z637lb0O7/DgAAwLkEReuERVBAzDxGAiUAAIC8</div><div class='add'>+zgqKXtdbO2ERVGItUBImAQDQRL/WE9G6O569EBTFExZBQnOBToonpKlOAgAA2EdQtI2wCAqICXEE</div><div class='add'>+SgAAAOkJirYTFkEl1kKcFGFS7HIESgAAHOpzuhWNStQSFH3ePpsKj4RF0IhS1UkxyxEmAQAAtasp</div><div class='add'>+KGqNsAg64nY3AACg6jFLoYozQdExwiIY7cPZ7W4AAEDHBEXHCYuAL2q63S12ewAAgPSmaWpumwVF</div><div class='add'>+aQiLgM3MnwQAANRGUJSOsAjIwvxJAABj80Q0ShIUpSUsAk5j/iQA8i3Z/QAADThJREFUAOAoQVF6</div><div class='add'>+wiKgWm53AwAAlgiK8hAWAU1zuxsAABCCoCglYRHQPYESAAD0TVCUlrAIIJg/CQAAWiUoSk9YBBDB</div><div class='add'>+/EkAADv6NZ6IxnM/NsO5ICjKQ1gEkOrLz+1uAADQndGCohCERQBFCZQAAGjBNE0aIYwZFIUgLAKo</div><div class='add'>+jvmTAADgfKMGRSEIiwCaY/4kAKAl5i1q85iNbuSgKARhEUCX3O4GAAD7jB4UhSAsAhiW290AACjW</div><div class='add'>+92ykukxQ9IuwCID3X+gV3e4Wuz0AALCXoOgPYREAu5k/CQCgL6POVyQo+kpYBEBW5k8CAKBmgqLv</div><div class='add'>+hEUAnM78SQDQN09Ea+c4jUZQ9J6wCIDqmT8JAIDUBEXzhEUAdMH8SQAAB/o3g1UVCYqWCYsAGIb5</div><div class='add'>+kwAAEBStExYBwBPzJwEAI1FR9HnKemsnLAKADdzuBgDQJkFRPGERACTmdjcAePO95YloVR6TIn2j</div><div class='add'>+Co67oGgbYREAnECgBABQhqBoO2ERAFTK/EkAQA4jzVNUS1D0eftsKjwSFgFAo86cP+kjXL92gP67</div><div class='add'>+OSAAQFVqCopaIywCgI6VCpQ+/r6uvkagBIB5i85t+1P6Iicdb0HRMcIiABhcqdvdBEoAQAmCouOE</div><div class='add'>+RQDAonuYNH3p/Ny+do4igqCoTtbMch6B1b+XEP43OSgAEOHsuYnOqCoSFKUhLAIADoupCEoVKIV/</div><div class='add'>+VzqewiQAGJKgKB1hEQBQRLFA6d+IXzEFSgB0aKSnnH3rQwiKkhIWAQDVmAuUrtfrr05wovmTBEoA</div><div class='add'>+0A9BUXrCIgCgHTEBzr+J5kcQKAGEEH7NO5OyYqX1J6KNXL2z9bwpQVCUh7AIAOhLTYGSMAkAihEU</div><div class='add'>+pSMsAgDGUypQUp0EwIDOqBwTFKUlLAIAeGctxHG7GwBUQVCUnrAIAGAPt7sBwDelq4oERXkIiwAA</div><div class='add'>+cnG7G9BRAGCSa2LOkx6NFhSFICwCADiXQAkAqjViUBSCsAgAoH7mTwKgcj1WFY0aFIUgLAIAaF8l</div><div class='add'>+8ydNP0O4/ONwANC+kYOiEIRFAABjKBQoTT+fOtrhGvWez/9ujg80wLxFLJ0bPRk9KApBWAQAwF2p</div><div class='add'>+291eO+V/X1dfI1ACoARB0S/CIgAA4qyESZfL5UtlUdLOu0AJoEo9VRUJiv4QFgEAkG7Q8E8I06OT</div><div class='add'>+fYvrnEcEQSmWI0wCYPY7RFD0hbAIAIBTxYQ4KQIl1UkA6ago6puwCACA6q2FOKWqk2K2BYB2CIre</div><div class='add'>+ExYBANC8UtVJscsRKNErT0Tjfh70QFA0T1gEAMAQagqUhEkA5xIULRMWAQDAfbBg/iSAWSqKxiEs</div><div class='add'>+AgCADcyfBNCus4Ki1/XWTlgEAAAJud0NtjFvUf1UFKVdbwuERQAAUJjb3QDKEhRtIywCAIAKCZSo</div><div class='add'>+VeonolH3se6BoGg7YREAADTK/EkAK59flQRFn7fPpsIjYREAAHTK/EnAXj1UFdUUFLVGWAQAAANz</div><div class='add'>+uxvQI0HRMcIiAABgkUCJV6nnLfJEtHqOaw8ERccJiwAAgMPMnwTUQFCUhrAIAADIzvxJUKeeKroE</div><div class='add'>+RekIiwAAgCq43S3xAPZpPwVk9E5QlJawCAAAaEYNt7u1GLx8/H0VGNHtvFCCovSERQAAQDdKVCe1</div><div class='add'>+WpkkMKJHgqI8hEUAAMBQSlQn1TBv0ud/t2/bkTIw8kS0Oo3choKidIRFAAAAzwO/CsKkmO2I3Zec</div><div class='add'>+gRFUc90KipISFgEAAGwZlJ44b9KekCdnYNRCFYtqpQGuSUFRcsIiAACAlAPXjPMm7b29TYUR3V5v</div><div class='add'>+gqIshEUAAAClB7iZAqWt74kJjKafjhdjGy0oCkFYBAAAUKV3IU6qW9y+L3PS4PDu+hgwKApBWAQA</div><div class='add'>+ANCMUvMlAeMGRSEIiwAAALqR6va2PXMZnTWwtl7r7Wm9tRAWAQAADCBn1ZEgwXqtty/Coozc9QsA</div><div class='add'>+AJwt5glqHwb01mu9p663NsIiAACAzsQERAb01mu9day3RsIiAACATpQKiUYc0Fuv9Y5EWJTY5+2m</div><div class='add'>+EQAAgHrGKAkDolEH9NZrvaMRFgEAAHQoR0g04oDeeq13RMIiAACATuQKiEYd0Fuv9Y7qL00AAACA</div><div class='add'>+Ab31Wi93wiIAAAAM6K3XenkQFgEAAGBAb73WW3C9tRMWAQAAYEBvvdZbaL0tEBYBAABgQG+91ltg</div><div class='add'>+va0QFgEAAGBAb73Wm3m9LREWAQAAMEuQYL3W2856UxEWAQAA8JYBvfVabzvrTekyTdO0+U2XSwgh</div><div class='add'>+hNvt5tMTAMjuer2GEELY0W2hZMfydx9xenSO9RWhFS3fLgMtKhkgffzuR11+/3dMf0plEQAAAAAP</div><div class='add'>+wiIAAAAAHn5oAgAAgLG1OKcKkI/KIgAAAAAehEUAAAAAPAiLAAAAAHgQFgEAAADwYIJrAAAAivq4</div><div class='add'>+frz9+7mJtre8/vm1SxN3z71ubl1bl5n6PUe2K3adW4/DWvsfPb5737PlmJrc/T2VRQAAABSzNHB/</div><div class='add'>+929bX3/W9u/ZzjO2/+gxOrrcrcve856alt8qlUUAAAAUsVb18zpoX3r9/d8+rh+L1Sdbq19itu91</div><div class='add'>+uXu28/73qapz9tiyjyWWneo9Z+xvb1QWAQAAkF3M7WGxAczSa3Pac9vbnu08M7RYu+3r8/b5eM3W</div><div class='add'>+dj/aFjmO8xnnUQuERQAAABSzNQhZen3Mv81VK6UOZPZu52i3Qe1p99zhmYqi79yGBgAAABFShjqf</div><div class='add'>+t88vy4sNsfZMon10H9fmYzozbMndHqMSFgEAANCleyBzDzS2VBWVmDfoXfVTrsqnFPv4/HevYRd9</div><div class='add'>+ERYBAABApBwhzlxodHRC59T7WGM4pIIoD2ERAAAAxWy9bWntaWdrnquL7v8dY2sIcXQ7n9d55oTd</div><div class='add'>+e7Z9yzHds2+520OF1HcmuAYAACC7mKdOzT1ZbG0enVqeHrZlO1sLKO5PQXv9s8WeY5b7ONdyHtVG</div><div class='add'>+ZREAAABFPM9zs6UqaOn1MQP8Ek/T2rOde+ZFamVC55T7lqo9SsxD1QuVRQAAABSz9RHzex9Jb7+O</div><div class='add'>+i7l1b8utc3uqkfa8p6blt+oyTdO0+U2XSwghhNvtpgUBgOyu12sIIYQd3RZKdix/9xGnRwdcXxEA</div><div class='add'>+zvbxux91+f3fMf0plUUAAAAAPJizCACA09yrxl7NVbBvef3za5cq4udeN7eurctM/Z4j2xW7ztT7</div><div class='add'>+eH/t2nGda//YZS7tz1q77DlmAL1SWQQAwCmWBvbv/m3r68/a/j3becb2x+5jDccixTLn9qXm9oc9</div><div class='add'>+Pq4fi38gRrHKopikvvQvG3vWs+fLxS8yfpEBAOb7DDH9taXX3//ter0u9pP29AvXtu91uXu2c6mP</div><div class='add'>+d6RftsWWdR89FiXsOWZ7zw+ojcmaSaFIZVGqXx5S/nqzd3v37r9fZAAA1sOGd3+/9votPz6msue2</div><div class='add'>+tz3bWWvgcsaxOLq81tof4EzZK4u2/mq05XVry1/7ZWPLLw4pvlBTbXcNHQS/yAAAOfoae19/u90W</div><div class='add'>+K5zvP3jN9V9S9lf2budaFXlpe6uacrRnquW11P4AZ8paWbT1V6PUy6/h1wO/yPjCBQD6kzNcWqrk</div><div class='add'>+fve61z9792duOTX05e7bkONHyL3tD9CzIreh5f6CWftlo9aORMntzn1Puy9XAKBmr2HDliqSEkHK</div><div class='add'>+7XYTWpx8fmh/gD9+1LhRZ06SfOQLodQEhEe+BN+VYKdc9mtbqCoCAHqVo5/zroJmy5QKqfclV9+x</div><div class='add'>+tr7snvYH6NmPkXe+9nCn1Q6T0AgAiO2LbekjrD3tLKav8lwtErvuPU/KPbKdc/2qVo5diW0+crtd</div><div class='add'>+D+0PkNtfNW7UvQz0tRz0zKdb7Nnu5+2v5YumxPbMlfECALz2tbY+DGTtCbO1PBxky3a21E86eiy2</div><div class='add'>+PiE4VT+9l/YHKKVIZdHR0s21JyDs/WWjhvmM/CIDAIzouX+3pSpo6fUxfbsSc2nu2c49fdaUUzds</div><div class='add'>+DWy27mOq45dif1K1P0DPslYWbf3VKPXya3uKQ6rt9osMANCDrQ/7qPmhJr3u17uK8b3bnGo/j94F</div><div class='add'>+0Op5BVDSZZqmafObLpdNH55rQcJrBcrWx83HLv/19ak+/Pc+Qn7rdqfc19flbA1+UuwLAGz9rt3R</div><div class='add'>+baFkx/J3H/F+lD59/wPA6T5+96Muv/87pj9VZM6iFGn93mXU8uQGv8gAAAAALShSWQQAcITKokY6</div><div class='add'>+liqLAKA6eyqLfmg2AADoj2kCANhLWAQAAB0SBgGwl7BohV9kAAAAgJEIi1YIgwAAAICRCIsAAMji</div><div class='add'>+Y6VCGwCo01+aAAAAAIA7lUUAACR10QQA0PZ3+TRN0+Y3XXQBAIDydnRbKNmx1EcEgC76UyqLAAAo</div><div class='add'>+1vkEAOq3KyzSEQAAAADokwmuAQAAAHgQFgEAAADwICwCAAAA4EFYBAAAAMCDsAgAAACAB2ERAAAA</div><div class='add'>+AA/CIgAAAAAehEUAAAAAPAiLAAAAAHgQFgEAAADwICwCAAAA4EFYBAAAAMCDsAgAAACAB2ERAAAA</div><div class='add'>+AA/CIgAAAAAehEUAAAAAPAiLAAAAAHgQFgEAAADwICwCAAAA4EFYBAAAAMCDsAgAAACAB2ERAAAA</div><div class='add'>+AA/CIgAAAAAe/g/10lQlA3JSSwAAAABJRU5ErkJggg==</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/biblio.xml b/Documentation/DocBook/media/v4l/biblio.xml<br/>index afc8a0dd2601..cea6fd3ed428 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/biblio.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/biblio.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/biblio.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/biblio.xml</a></div><div class='hunk'>@@ -178,11 +178,3 @@ in the frequency range from 87,5 to 108,0 MHz&lt;/title&gt;</div><div class='ctx'>     &lt;/biblioentry&gt;</div><div class='ctx'> </div><div class='ctx'>   &lt;/bibliography&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/common.xml b/Documentation/DocBook/media/v4l/common.xml<br/>index a86f7a045529..c79278acfb0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/common.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/common.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/common.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/common.xml</a></div><div class='hunk'>@@ -1168,6 +1168,8 @@ dheight = format.fmt.pix.height;</div><div class='ctx'>     &lt;/section&gt;</div><div class='ctx'>   &lt;/section&gt;</div><div class='ctx'> </div><div class='add'>+  &amp;sub-selection-api;</div><div class='add'>+</div><div class='ctx'>   &lt;section id="streaming-par"&gt;</div><div class='ctx'>     &lt;title&gt;Streaming Parameters&lt;/title&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -1195,11 +1197,3 @@ separate parameters for input and output devices.&lt;/para&gt;</div><div class='ctx'>     &lt;para&gt;These ioctls are optional, drivers need not implement</div><div class='ctx'> them. If so, they return the &amp;EINVAL;.&lt;/para&gt;</div><div class='ctx'>   &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml<br/>index b68698f96e7f..c736380b4647 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/compat.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/compat.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/compat.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/compat.xml</a></div><div class='hunk'>@@ -1082,7 +1082,7 @@ until the time in the timestamp field has arrived. I would like to</div><div class='ctx'> follow SGI's lead, and adopt a multimedia timestamping system like</div><div class='ctx'> their UST (Unadjusted System Time). See</div><div class='ctx'> http://web.archive.org/web/*/http://reality.sgi.com</div><div class='del'>-/cpirazzi_engr/lg/time/intro.html. </div><div class='add'>+/cpirazzi_engr/lg/time/intro.html.</div><div class='ctx'> UST uses timestamps that are 64-bit signed integers</div><div class='ctx'> (not struct timeval's) and given in nanosecond units. The UST clock</div><div class='ctx'> starts at zero when the system is booted and runs continuously and</div><div class='hunk'>@@ -2376,6 +2376,23 @@ that used it. It was originally scheduled for removal in 2.6.35.</div><div class='ctx'>         &lt;listitem&gt;</div><div class='ctx'> 	  &lt;para&gt;V4L2_CTRL_FLAG_VOLATILE was added to signal volatile controls to userspace.&lt;/para&gt;</div><div class='ctx'>         &lt;/listitem&gt;</div><div class='add'>+        &lt;listitem&gt;</div><div class='add'>+	  &lt;para&gt;Add selection API for extended control over cropping and</div><div class='add'>+composing. Does not affect the compatibility of current drivers and</div><div class='add'>+applications.  See &lt;link linkend="selection-api"&gt; selection API &lt;/link&gt; for</div><div class='add'>+details.&lt;/para&gt;</div><div class='add'>+        &lt;/listitem&gt;</div><div class='add'>+      &lt;/orderedlist&gt;</div><div class='add'>+    &lt;/section&gt;</div><div class='add'>+</div><div class='add'>+    &lt;section&gt;</div><div class='add'>+      &lt;title&gt;V4L2 in Linux 3.3&lt;/title&gt;</div><div class='add'>+      &lt;orderedlist&gt;</div><div class='add'>+        &lt;listitem&gt;</div><div class='add'>+	  &lt;para&gt;Added &lt;constant&gt;V4L2_CID_ALPHA_COMPONENT&lt;/constant&gt; control</div><div class='add'>+	    to the &lt;link linkend="control"&gt;User controls class&lt;/link&gt;.</div><div class='add'>+	  &lt;/para&gt;</div><div class='add'>+        &lt;/listitem&gt;</div><div class='ctx'>       &lt;/orderedlist&gt;</div><div class='ctx'>     &lt;/section&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -2489,6 +2506,9 @@ ioctls.&lt;/para&gt;</div><div class='ctx'>         &lt;listitem&gt;</div><div class='ctx'> 	  &lt;para&gt;&amp;VIDIOC-CREATE-BUFS; and &amp;VIDIOC-PREPARE-BUF; ioctls.&lt;/para&gt;</div><div class='ctx'>         &lt;/listitem&gt;</div><div class='add'>+        &lt;listitem&gt;</div><div class='add'>+	  &lt;para&gt;Selection API. &lt;xref linkend="selection-api" /&gt;&lt;/para&gt;</div><div class='add'>+        &lt;/listitem&gt;</div><div class='ctx'>       &lt;/itemizedlist&gt;</div><div class='ctx'>     &lt;/section&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -2507,11 +2527,3 @@ interfaces and should not be implemented in new drivers.&lt;/para&gt;</div><div class='ctx'>       &lt;/itemizedlist&gt;</div><div class='ctx'>     &lt;/section&gt;</div><div class='ctx'>   &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml<br/>index 3bc5ee8b2c74..a1be37897ad7 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/controls.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/controls.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/controls.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/controls.xml</a></div><div class='hunk'>@@ -324,12 +324,6 @@ minimum value disables backlight compensation.&lt;/entry&gt;</div><div class='ctx'> 		(usually a microscope).&lt;/entry&gt;</div><div class='ctx'> 	  &lt;/row&gt;</div><div class='ctx'> 	  &lt;row&gt;</div><div class='del'>-	    &lt;entry&gt;&lt;constant&gt;V4L2_CID_LASTP1&lt;/constant&gt;&lt;/entry&gt;</div><div class='del'>-	    &lt;entry&gt;&lt;/entry&gt;</div><div class='del'>-	    &lt;entry&gt;End of the predefined control IDs (currently</div><div class='del'>-&lt;constant&gt;V4L2_CID_ILLUMINATORS_2&lt;/constant&gt; + 1).&lt;/entry&gt;</div><div class='del'>-	  &lt;/row&gt;</div><div class='del'>-	  &lt;row&gt;</div><div class='ctx'> 	    &lt;entry&gt;&lt;constant&gt;V4L2_CID_MIN_BUFFERS_FOR_CAPTURE&lt;/constant&gt;&lt;/entry&gt;</div><div class='ctx'> 	    &lt;entry&gt;integer&lt;/entry&gt;</div><div class='ctx'> 	    &lt;entry&gt;This is a read-only control that can be read by the application</div><div class='hunk'>@@ -345,6 +339,25 @@ and used as a hint to determine the number of OUTPUT buffers to pass to REQBUFS.</div><div class='ctx'> The value is the minimum number of OUTPUT buffers that is necessary for hardware</div><div class='ctx'> to work.&lt;/entry&gt;</div><div class='ctx'> 	  &lt;/row&gt;</div><div class='add'>+	  &lt;row id="v4l2-alpha-component"&gt;</div><div class='add'>+	    &lt;entry&gt;&lt;constant&gt;V4L2_CID_ALPHA_COMPONENT&lt;/constant&gt;&lt;/entry&gt;</div><div class='add'>+	    &lt;entry&gt;integer&lt;/entry&gt;</div><div class='add'>+	    &lt;entry&gt; Sets the alpha color component on the capture device or on</div><div class='add'>+	    the capture buffer queue of a mem-to-mem device. When a mem-to-mem</div><div class='add'>+	    device produces frame format that includes an alpha component</div><div class='add'>+	    (e.g. &lt;link linkend="rgb-formats"&gt;packed RGB image formats&lt;/link&gt;)</div><div class='add'>+	    and the alpha value is not defined by the mem-to-mem input data</div><div class='add'>+	    this control lets you select the alpha component value of all</div><div class='add'>+	    pixels. It is applicable to any pixel format that contains an alpha</div><div class='add'>+	    component.</div><div class='add'>+	    &lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='add'>+	  &lt;row&gt;</div><div class='add'>+	    &lt;entry&gt;&lt;constant&gt;V4L2_CID_LASTP1&lt;/constant&gt;&lt;/entry&gt;</div><div class='add'>+	    &lt;entry&gt;&lt;/entry&gt;</div><div class='add'>+	    &lt;entry&gt;End of the predefined control IDs (currently</div><div class='add'>+	      &lt;constant&gt;V4L2_CID_ALPHA_COMPONENT&lt;/constant&gt; + 1).&lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='ctx'> 	  &lt;row&gt;</div><div class='ctx'> 	    &lt;entry&gt;&lt;constant&gt;V4L2_CID_PRIVATE_BASE&lt;/constant&gt;&lt;/entry&gt;</div><div class='ctx'> 	    &lt;entry&gt;&lt;/entry&gt;</div><div class='hunk'>@@ -3329,6 +3342,16 @@ interface and may change in the future.&lt;/para&gt;</div><div class='ctx'> 		  &lt;entry&gt;The short circuit protection of the flash</div><div class='ctx'> 		  controller has been triggered.&lt;/entry&gt;</div><div class='ctx'> 		&lt;/row&gt;</div><div class='add'>+		&lt;row&gt;</div><div class='add'>+		  &lt;entry&gt;&lt;constant&gt;V4L2_FLASH_FAULT_OVER_CURRENT&lt;/constant&gt;&lt;/entry&gt;</div><div class='add'>+		  &lt;entry&gt;Current in the LED power supply has exceeded the limit</div><div class='add'>+		  specific to the flash controller.&lt;/entry&gt;</div><div class='add'>+		&lt;/row&gt;</div><div class='add'>+		&lt;row&gt;</div><div class='add'>+		  &lt;entry&gt;&lt;constant&gt;V4L2_FLASH_FAULT_INDICATOR&lt;/constant&gt;&lt;/entry&gt;</div><div class='add'>+		  &lt;entry&gt;The flash controller has detected a short or open</div><div class='add'>+		  circuit condition on the indicator LED.&lt;/entry&gt;</div><div class='add'>+		&lt;/row&gt;</div><div class='ctx'> 	      &lt;/tbody&gt;</div><div class='ctx'> 	    &lt;/entrytbl&gt;</div><div class='ctx'> 	  &lt;/row&gt;</div><div class='hunk'>@@ -3357,11 +3380,3 @@ interface and may change in the future.&lt;/para&gt;</div><div class='ctx'> </div><div class='ctx'>     &lt;/section&gt;</div><div class='ctx'> &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "common.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/dev-capture.xml b/Documentation/DocBook/media/v4l/dev-capture.xml<br/>index 2237c661f26a..e1c5f9406d6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-capture.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-capture.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-capture.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/dev-capture.xml</a></div><div class='hunk'>@@ -108,11 +108,3 @@ linkend="mmap"&gt;memory mapping&lt;/link&gt; or &lt;link</div><div class='ctx'> linkend="userp"&gt;user pointer&lt;/link&gt;) I/O. See &lt;xref</div><div class='ctx'> linkend="io" /&gt; for details.&lt;/para&gt;</div><div class='ctx'>   &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/dev-codec.xml b/Documentation/DocBook/media/v4l/dev-codec.xml<br/>index 6e156dc45b94..dca0ecd54dc6 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-codec.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-codec.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-codec.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/dev-codec.xml</a></div><div class='hunk'>@@ -16,11 +16,3 @@ Applications send data to be converted to the driver through a</div><div class='ctx'> I/O.&lt;/para&gt;</div><div class='ctx'> </div><div class='ctx'>   &lt;para&gt;[to do]&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/dev-effect.xml b/Documentation/DocBook/media/v4l/dev-effect.xml<br/>index 9c243beba0e6..2350a67c0710 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-effect.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-effect.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-effect.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/dev-effect.xml</a></div><div class='hunk'>@@ -15,11 +15,3 @@ receive the result data either with &amp;func-read; and &amp;func-write;</div><div class='ctx'> functions, or through the streaming I/O mechanism.&lt;/para&gt;</div><div class='ctx'> </div><div class='ctx'>   &lt;para&gt;[to do]&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/dev-event.xml b/Documentation/DocBook/media/v4l/dev-event.xml<br/>index f14ae3fe107c..19f4becfae34 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-event.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-event.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-event.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/dev-event.xml</a></div><div class='hunk'>@@ -41,11 +41,3 @@ intermediate step leading up to that information. See the documentation for the</div><div class='ctx'> event you want to subscribe to whether this is applicable for that event or not.&lt;/para&gt;</div><div class='ctx'> 	&lt;/listitem&gt;</div><div class='ctx'>       &lt;/orderedlist&gt;&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/dev-osd.xml b/Documentation/DocBook/media/v4l/dev-osd.xml<br/>index c9a68a2ccd33..479d9433869a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-osd.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-osd.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-osd.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/dev-osd.xml</a></div><div class='hunk'>@@ -154,11 +154,3 @@ data flow. For more information see &lt;xref linkend="crop" /&gt;.&lt;/para&gt;</div><div class='ctx'> however the framebuffer interface of the driver may support the</div><div class='ctx'> &lt;constant&gt;FBIOBLANK&lt;/constant&gt; ioctl.&lt;/para&gt;</div><div class='ctx'>   &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/dev-output.xml b/Documentation/DocBook/media/v4l/dev-output.xml<br/>index 919e22c53854..9130a3dc7880 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-output.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-output.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-output.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/dev-output.xml</a></div><div class='hunk'>@@ -104,11 +104,3 @@ linkend="mmap"&gt;memory mapping&lt;/link&gt; or &lt;link</div><div class='ctx'> linkend="userp"&gt;user pointer&lt;/link&gt;) I/O. See &lt;xref</div><div class='ctx'> linkend="io" /&gt; for details.&lt;/para&gt;</div><div class='ctx'>   &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/dev-overlay.xml b/Documentation/DocBook/media/v4l/dev-overlay.xml<br/>index 92513cf79150..40d1d7681439 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-overlay.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-overlay.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-overlay.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/dev-overlay.xml</a></div><div class='hunk'>@@ -369,11 +369,3 @@ reasons. &lt;!-- video4linux-list@redhat.com on 22 Oct 2002 subject</div><div class='ctx'>     &lt;para&gt;To start or stop the frame buffer overlay applications call</div><div class='ctx'> the &amp;VIDIOC-OVERLAY; ioctl.&lt;/para&gt;</div><div class='ctx'>   &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/dev-radio.xml b/Documentation/DocBook/media/v4l/dev-radio.xml<br/>index 73aa90b45b34..3e6ac73b36af 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-radio.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-radio.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-radio.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/dev-radio.xml</a></div><div class='hunk'>@@ -47,11 +47,3 @@ depending on the selected frequency. The &amp;VIDIOC-G-TUNER; or</div><div class='ctx'> &amp;VIDIOC-G-MODULATOR; ioctl</div><div class='ctx'> reports the supported frequency range.&lt;/para&gt;</div><div class='ctx'>   &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>- --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/dev-raw-vbi.xml b/Documentation/DocBook/media/v4l/dev-raw-vbi.xml<br/>index c5a70bdfaf27..b788c72c885e 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-raw-vbi.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-raw-vbi.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-raw-vbi.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/dev-raw-vbi.xml</a></div><div class='hunk'>@@ -337,11 +337,3 @@ an &amp;EBUSY; if the required hardware resources are temporarily</div><div class='ctx'> unavailable, for example the device is already in use by another</div><div class='ctx'> process.&lt;/para&gt;</div><div class='ctx'>   &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/dev-rds.xml b/Documentation/DocBook/media/v4l/dev-rds.xml<br/>index 2427f54397e7..38883a419e65 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-rds.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-rds.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-rds.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/dev-rds.xml</a></div><div class='hunk'>@@ -29,10 +29,10 @@ returned by the &amp;VIDIOC-QUERYCAP; ioctl.  Any tuner that supports RDS</div><div class='ctx'> will set the &lt;constant&gt;V4L2_TUNER_CAP_RDS&lt;/constant&gt; flag in</div><div class='ctx'> the &lt;structfield&gt;capability&lt;/structfield&gt; field of &amp;v4l2-tuner;.  If</div><div class='ctx'> the driver only passes RDS blocks without interpreting the data</div><div class='del'>-the &lt;constant&gt;V4L2_TUNER_SUB_RDS_BLOCK_IO&lt;/constant&gt; flag has to be</div><div class='add'>+the &lt;constant&gt;V4L2_TUNER_CAP_RDS_BLOCK_IO&lt;/constant&gt; flag has to be</div><div class='ctx'> set, see &lt;link linkend="reading-rds-data"&gt;Reading RDS data&lt;/link&gt;.</div><div class='ctx'> For future use the</div><div class='del'>-flag &lt;constant&gt;V4L2_TUNER_SUB_RDS_CONTROLS&lt;/constant&gt; has also been</div><div class='add'>+flag &lt;constant&gt;V4L2_TUNER_CAP_RDS_CONTROLS&lt;/constant&gt; has also been</div><div class='ctx'> defined. However, a driver for a radio tuner with this capability does</div><div class='ctx'> not yet exist, so if you are planning to write such a driver you</div><div class='ctx'> should discuss this on the linux-media mailing list: &amp;v4l-ml;.&lt;/para&gt;</div><div class='hunk'>@@ -52,9 +52,9 @@ field of &amp;v4l2-modulator;.</div><div class='ctx'> In order to enable the RDS transmission one must set the &lt;constant&gt;V4L2_TUNER_SUB_RDS&lt;/constant&gt;</div><div class='ctx'> bit in the &lt;structfield&gt;txsubchans&lt;/structfield&gt; field of &amp;v4l2-modulator;.</div><div class='ctx'> If the driver only passes RDS blocks without interpreting the data</div><div class='del'>-the &lt;constant&gt;V4L2_TUNER_SUB_RDS_BLOCK_IO&lt;/constant&gt; flag has to be set. If the</div><div class='add'>+the &lt;constant&gt;V4L2_TUNER_CAP_RDS_BLOCK_IO&lt;/constant&gt; flag has to be set. If the</div><div class='ctx'> tuner is capable of handling RDS entities like program identification codes and radio</div><div class='del'>-text, the flag &lt;constant&gt;V4L2_TUNER_SUB_RDS_CONTROLS&lt;/constant&gt; should be set,</div><div class='add'>+text, the flag &lt;constant&gt;V4L2_TUNER_CAP_RDS_CONTROLS&lt;/constant&gt; should be set,</div><div class='ctx'> see &lt;link linkend="writing-rds-data"&gt;Writing RDS data&lt;/link&gt; and</div><div class='ctx'> &lt;link linkend="fm-tx-controls"&gt;FM Transmitter Control Reference&lt;/link&gt;.&lt;/para&gt;</div><div class='ctx'>   &lt;/section&gt;</div><div class='hunk'>@@ -194,11 +194,3 @@ as follows:&lt;/para&gt;</div><div class='ctx'>       &lt;/tgroup&gt;</div><div class='ctx'>     &lt;/table&gt;</div><div class='ctx'>   &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>- --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/dev-sliced-vbi.xml b/Documentation/DocBook/media/v4l/dev-sliced-vbi.xml<br/>index 69e789fa7f7b..548f8ea28dee 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-sliced-vbi.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-sliced-vbi.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-sliced-vbi.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/dev-sliced-vbi.xml</a></div><div class='hunk'>@@ -697,12 +697,3 @@ Sliced VBI services&lt;/link&gt; for a description of the line payload.&lt;/entry&gt;</div><div class='ctx'> </div><div class='ctx'>   &lt;/section&gt;</div><div class='ctx'>   &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>- --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/dev-teletext.xml b/Documentation/DocBook/media/v4l/dev-teletext.xml<br/>index 414b1cfff9f4..bd21c64d70f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-teletext.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/dev-teletext.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/dev-teletext.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/dev-teletext.xml</a></div><div class='hunk'>@@ -27,11 +27,3 @@ kernel 2.6.37.&lt;/para&gt;</div><div class='ctx'> </div><div class='ctx'>   &lt;para&gt;Modern devices all use the &lt;link linkend="raw-vbi"&gt;raw&lt;/link&gt; or</div><div class='ctx'> &lt;link linkend="sliced"&gt;sliced&lt;/link&gt; VBI API.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/driver.xml b/Documentation/DocBook/media/v4l/driver.xml<br/>index 1f7eea5c4ec3..eacafe312cd2 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/driver.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/driver.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/driver.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/driver.xml</a></div><div class='hunk'>@@ -198,11 +198,3 @@ devices with the videodev module.&lt;/para&gt;</div><div class='ctx'>     &lt;para&gt;to do&lt;/para&gt;</div><div class='ctx'>   &lt;/section&gt;</div><div class='ctx'> --&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/func-close.xml b/Documentation/DocBook/media/v4l/func-close.xml<br/>index dfb41cbbbec3..232920d2f3c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/func-close.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/func-close.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/func-close.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/func-close.xml</a></div><div class='hunk'>@@ -60,11 +60,3 @@ descriptor.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/func-ioctl.xml b/Documentation/DocBook/media/v4l/func-ioctl.xml<br/>index 2de64be706f5..4394184a1a6d 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/func-ioctl.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/func-ioctl.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/func-ioctl.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/func-ioctl.xml</a></div><div class='hunk'>@@ -69,11 +69,3 @@ their respective function and parameters are specified in &lt;xref</div><div class='ctx'>     the parameter remains unmodified.&lt;/para&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/func-mmap.xml b/Documentation/DocBook/media/v4l/func-mmap.xml<br/>index 786732b64bbd..f31ad71bf301 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/func-mmap.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/func-mmap.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/func-mmap.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/func-mmap.xml</a></div><div class='hunk'>@@ -181,11 +181,3 @@ complete the request.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/func-munmap.xml b/Documentation/DocBook/media/v4l/func-munmap.xml<br/>index e2c4190f9bb6..860d49ca54a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/func-munmap.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/func-munmap.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/func-munmap.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/func-munmap.xml</a></div><div class='hunk'>@@ -74,11 +74,3 @@ mapped yet.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/func-open.xml b/Documentation/DocBook/media/v4l/func-open.xml<br/>index 7595d07a8c72..cf64e207c3ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/func-open.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/func-open.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/func-open.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/func-open.xml</a></div><div class='hunk'>@@ -111,11 +111,3 @@ system has been reached.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/func-poll.xml b/Documentation/DocBook/media/v4l/func-poll.xml<br/>index ec3c718f5963..85cad8bff5ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/func-poll.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/func-poll.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/func-poll.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/func-poll.xml</a></div><div class='hunk'>@@ -117,11 +117,3 @@ than &lt;constant&gt;OPEN_MAX&lt;/constant&gt;.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/func-read.xml b/Documentation/DocBook/media/v4l/func-read.xml<br/>index a5089bf8873d..e218bbfbd362 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/func-read.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/func-read.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/func-read.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/func-read.xml</a></div><div class='hunk'>@@ -179,11 +179,3 @@ type of device.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/func-select.xml b/Documentation/DocBook/media/v4l/func-select.xml<br/>index b6713623181f..e12a60d9bd85 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/func-select.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/func-select.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/func-select.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/func-select.xml</a></div><div class='hunk'>@@ -128,11 +128,3 @@ zero or greater than &lt;constant&gt;FD_SETSIZE&lt;/constant&gt;.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/func-write.xml b/Documentation/DocBook/media/v4l/func-write.xml<br/>index 2c09c09371c3..575207885726 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/func-write.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/func-write.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/func-write.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/func-write.xml</a></div><div class='hunk'>@@ -126,11 +126,3 @@ type of device.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/io.xml b/Documentation/DocBook/media/v4l/io.xml<br/>index 3f47df1aa54a..b815929b5bba 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/io.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/io.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/io.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/io.xml</a></div><div class='hunk'>@@ -1282,11 +1282,3 @@ line, top field first. The bottom field is transmitted first.&lt;/entry&gt;</div><div class='ctx'> 	&lt;/mediaobject&gt;</div><div class='ctx'>     &lt;/figure&gt;</div><div class='ctx'>   &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/libv4l.xml b/Documentation/DocBook/media/v4l/libv4l.xml<br/>index 3cb10ec51929..d3b71e20003c 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/libv4l.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/libv4l.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/libv4l.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/libv4l.xml</a></div><div class='hunk'>@@ -158,10 +158,3 @@ still don't use libv4l.&lt;/para&gt;</div><div class='ctx'> 	&lt;/section&gt;</div><div class='ctx'> </div><div class='ctx'> &lt;/section&gt;</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-grey.xml b/Documentation/DocBook/media/v4l/pixfmt-grey.xml<br/>index 3b72bc6b2de7..bee970d3f76d 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-grey.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-grey.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-grey.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-grey.xml</a></div><div class='hunk'>@@ -60,11 +60,3 @@ pixel image&lt;/title&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-m420.xml b/Documentation/DocBook/media/v4l/pixfmt-m420.xml<br/>index ce4bc019e5c0..aadae92c5d04 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-m420.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-m420.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-m420.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-m420.xml</a></div><div class='hunk'>@@ -137,11 +137,3 @@ pixel image&lt;/title&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-nv12.xml b/Documentation/DocBook/media/v4l/pixfmt-nv12.xml<br/>index 873f67035181..84dd4fd7cb80 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-nv12.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-nv12.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-nv12.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-nv12.xml</a></div><div class='hunk'>@@ -141,11 +141,3 @@ pixel image&lt;/title&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-nv12m.xml b/Documentation/DocBook/media/v4l/pixfmt-nv12m.xml<br/>index c9e166d9ded8..3fd3ce5df270 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-nv12m.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-nv12m.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-nv12m.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-nv12m.xml</a></div><div class='hunk'>@@ -144,11 +144,3 @@ CbCr plane has as many pad bytes after its rows.&lt;/para&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml b/Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml<br/>index 7a2855a526c1..2f82b1da8dfe 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml</a></div><div class='hunk'>@@ -64,11 +64,3 @@ layout of macroblocks&lt;/title&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-nv16.xml b/Documentation/DocBook/media/v4l/pixfmt-nv16.xml<br/>index 26094035fc04..8ae1f8a810d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-nv16.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-nv16.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-nv16.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-nv16.xml</a></div><div class='hunk'>@@ -164,11 +164,3 @@ pixel image&lt;/title&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-nv24.xml b/Documentation/DocBook/media/v4l/pixfmt-nv24.xml<br/>new file mode 100644<br/>index 000000000000..fb255f2ca9dd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-nv24.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-nv24.xml</a></div><div class='hunk'>@@ -0,0 +1,121 @@</div><div class='add'>+    &lt;refentry&gt;</div><div class='add'>+      &lt;refmeta&gt;</div><div class='add'>+	&lt;refentrytitle&gt;V4L2_PIX_FMT_NV24 ('NV24'), V4L2_PIX_FMT_NV42 ('NV42')&lt;/refentrytitle&gt;</div><div class='add'>+	&amp;manvol;</div><div class='add'>+      &lt;/refmeta&gt;</div><div class='add'>+      &lt;refnamediv&gt;</div><div class='add'>+	&lt;refname id="V4L2-PIX-FMT-NV24"&gt;&lt;constant&gt;V4L2_PIX_FMT_NV24&lt;/constant&gt;&lt;/refname&gt;</div><div class='add'>+	&lt;refname id="V4L2-PIX-FMT-NV42"&gt;&lt;constant&gt;V4L2_PIX_FMT_NV42&lt;/constant&gt;&lt;/refname&gt;</div><div class='add'>+	&lt;refpurpose&gt;Formats with full horizontal and vertical</div><div class='add'>+chroma resolutions, also known as YUV 4:4:4. One luminance and one</div><div class='add'>+chrominance plane with alternating chroma samples as opposed to</div><div class='add'>+&lt;constant&gt;V4L2_PIX_FMT_YVU420&lt;/constant&gt;&lt;/refpurpose&gt;</div><div class='add'>+      &lt;/refnamediv&gt;</div><div class='add'>+      &lt;refsect1&gt;</div><div class='add'>+	&lt;title&gt;Description&lt;/title&gt;</div><div class='add'>+</div><div class='add'>+	&lt;para&gt;These are two-plane versions of the YUV 4:4:4 format. The three</div><div class='add'>+	components are separated into two sub-images or planes. The Y plane is</div><div class='add'>+	first, with each Y sample stored in one byte per pixel. For</div><div class='add'>+	&lt;constant&gt;V4L2_PIX_FMT_NV24&lt;/constant&gt;, a combined CbCr plane</div><div class='add'>+	immediately follows the Y plane in memory. The CbCr plane has the same</div><div class='add'>+	width and height, in pixels, as the Y plane (and the image). Each line</div><div class='add'>+	contains one CbCr pair per pixel, with each Cb and Cr sample stored in</div><div class='add'>+	one byte. &lt;constant&gt;V4L2_PIX_FMT_NV42&lt;/constant&gt; is the same except that</div><div class='add'>+	the Cb and Cr samples are swapped, the CrCb plane starts with a Cr</div><div class='add'>+	sample.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+	&lt;para&gt;If the Y plane has pad bytes after each row, then the CbCr plane</div><div class='add'>+	has twice as many pad bytes after its rows.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+	&lt;example&gt;</div><div class='add'>+	  &lt;title&gt;&lt;constant&gt;V4L2_PIX_FMT_NV24&lt;/constant&gt; 4 &amp;times; 4</div><div class='add'>+pixel image&lt;/title&gt;</div><div class='add'>+</div><div class='add'>+	  &lt;formalpara&gt;</div><div class='add'>+	    &lt;title&gt;Byte Order.&lt;/title&gt;</div><div class='add'>+	    &lt;para&gt;Each cell is one byte.</div><div class='add'>+		&lt;informaltable frame="none"&gt;</div><div class='add'>+		&lt;tgroup cols="9" align="center"&gt;</div><div class='add'>+		  &lt;colspec align="left" colwidth="2*" /&gt;</div><div class='add'>+		  &lt;tbody valign="top"&gt;</div><div class='add'>+		    &lt;row&gt;</div><div class='add'>+		      &lt;entry&gt;start&amp;nbsp;+&amp;nbsp;0:&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Y'&lt;subscript&gt;00&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Y'&lt;subscript&gt;01&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Y'&lt;subscript&gt;02&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Y'&lt;subscript&gt;03&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		    &lt;/row&gt;</div><div class='add'>+		    &lt;row&gt;</div><div class='add'>+		      &lt;entry&gt;start&amp;nbsp;+&amp;nbsp;4:&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Y'&lt;subscript&gt;10&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Y'&lt;subscript&gt;11&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Y'&lt;subscript&gt;12&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Y'&lt;subscript&gt;13&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		    &lt;/row&gt;</div><div class='add'>+		    &lt;row&gt;</div><div class='add'>+		      &lt;entry&gt;start&amp;nbsp;+&amp;nbsp;8:&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Y'&lt;subscript&gt;20&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Y'&lt;subscript&gt;21&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Y'&lt;subscript&gt;22&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Y'&lt;subscript&gt;23&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		    &lt;/row&gt;</div><div class='add'>+		    &lt;row&gt;</div><div class='add'>+		      &lt;entry&gt;start&amp;nbsp;+&amp;nbsp;12:&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Y'&lt;subscript&gt;30&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Y'&lt;subscript&gt;31&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Y'&lt;subscript&gt;32&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Y'&lt;subscript&gt;33&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		    &lt;/row&gt;</div><div class='add'>+		    &lt;row&gt;</div><div class='add'>+		      &lt;entry&gt;start&amp;nbsp;+&amp;nbsp;16:&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cb&lt;subscript&gt;00&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cr&lt;subscript&gt;00&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cb&lt;subscript&gt;01&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cr&lt;subscript&gt;01&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cb&lt;subscript&gt;02&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cr&lt;subscript&gt;02&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cb&lt;subscript&gt;03&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cr&lt;subscript&gt;03&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		    &lt;/row&gt;</div><div class='add'>+		    &lt;row&gt;</div><div class='add'>+		      &lt;entry&gt;start&amp;nbsp;+&amp;nbsp;24:&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cb&lt;subscript&gt;10&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cr&lt;subscript&gt;10&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cb&lt;subscript&gt;11&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cr&lt;subscript&gt;11&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cb&lt;subscript&gt;12&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cr&lt;subscript&gt;12&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cb&lt;subscript&gt;13&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cr&lt;subscript&gt;13&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		    &lt;/row&gt;</div><div class='add'>+		    &lt;row&gt;</div><div class='add'>+		      &lt;entry&gt;start&amp;nbsp;+&amp;nbsp;32:&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cb&lt;subscript&gt;20&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cr&lt;subscript&gt;20&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cb&lt;subscript&gt;21&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cr&lt;subscript&gt;21&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cb&lt;subscript&gt;22&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cr&lt;subscript&gt;22&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cb&lt;subscript&gt;23&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cr&lt;subscript&gt;23&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		    &lt;/row&gt;</div><div class='add'>+		    &lt;row&gt;</div><div class='add'>+		      &lt;entry&gt;start&amp;nbsp;+&amp;nbsp;40:&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cb&lt;subscript&gt;30&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cr&lt;subscript&gt;30&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cb&lt;subscript&gt;31&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cr&lt;subscript&gt;31&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cb&lt;subscript&gt;32&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cr&lt;subscript&gt;32&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cb&lt;subscript&gt;33&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		      &lt;entry&gt;Cr&lt;subscript&gt;33&lt;/subscript&gt;&lt;/entry&gt;</div><div class='add'>+		    &lt;/row&gt;</div><div class='add'>+		  &lt;/tbody&gt;</div><div class='add'>+		&lt;/tgroup&gt;</div><div class='add'>+		&lt;/informaltable&gt;</div><div class='add'>+	      &lt;/para&gt;</div><div class='add'>+	  &lt;/formalpara&gt;</div><div class='add'>+	&lt;/example&gt;</div><div class='add'>+      &lt;/refsect1&gt;</div><div class='add'>+    &lt;/refentry&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml b/Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml<br/>index 4db272b8a0d3..166c8d65e4f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml</a></div><div class='hunk'>@@ -428,8 +428,11 @@ colorspace &lt;constant&gt;V4L2_COLORSPACE_SRGB&lt;/constant&gt;.&lt;/para&gt;</div><div class='ctx'>     &lt;para&gt;Bit 7 is the most significant bit. The value of a = alpha</div><div class='ctx'> bits is undefined when reading from the driver, ignored when writing</div><div class='ctx'> to the driver, except when alpha blending has been negotiated for a</div><div class='del'>-&lt;link linkend="overlay"&gt;Video Overlay&lt;/link&gt; or &lt;link</div><div class='del'>-linkend="osd"&gt;Video Output Overlay&lt;/link&gt;.&lt;/para&gt;</div><div class='add'>+&lt;link linkend="overlay"&gt;Video Overlay&lt;/link&gt; or &lt;link linkend="osd"&gt;</div><div class='add'>+Video Output Overlay&lt;/link&gt; or when alpha component has been configured</div><div class='add'>+for a &lt;link linkend="capture"&gt;Video Capture&lt;/link&gt; by means of &lt;link</div><div class='add'>+linkend="v4l2-alpha-component"&gt; &lt;constant&gt;V4L2_CID_ALPHA_COMPONENT</div><div class='add'>+&lt;/constant&gt; &lt;/link&gt; control.&lt;/para&gt;</div><div class='ctx'> </div><div class='ctx'>     &lt;example&gt;</div><div class='ctx'>       &lt;title&gt;&lt;constant&gt;V4L2_PIX_FMT_BGR24&lt;/constant&gt; 4 &amp;times; 4 pixel</div><div class='hunk'>@@ -930,11 +933,3 @@ See &amp;v4l-dvb; for access instructions.&lt;/para&gt;</div><div class='ctx'> </div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-packed-yuv.xml b/Documentation/DocBook/media/v4l/pixfmt-packed-yuv.xml<br/>index 3cab5d0ca75d..33fa5a47a865 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-packed-yuv.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-packed-yuv.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-packed-yuv.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-packed-yuv.xml</a></div><div class='hunk'>@@ -234,11 +234,3 @@ linkend="osd"&gt;Video Output Overlay&lt;/link&gt;.&lt;/para&gt;</div><div class='ctx'> </div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-sbggr16.xml b/Documentation/DocBook/media/v4l/pixfmt-sbggr16.xml<br/>index 519a9efbac10..6494b05d84a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-sbggr16.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-sbggr16.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-sbggr16.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-sbggr16.xml</a></div><div class='hunk'>@@ -81,11 +81,3 @@ pixel image&lt;/title&gt;</div><div class='ctx'>     &lt;/example&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-sbggr8.xml b/Documentation/DocBook/media/v4l/pixfmt-sbggr8.xml<br/>index 5fe84ecc2ebe..5eaf2b42d3f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-sbggr8.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-sbggr8.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-sbggr8.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-sbggr8.xml</a></div><div class='hunk'>@@ -65,11 +65,3 @@ pixel image&lt;/title&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-sgbrg8.xml b/Documentation/DocBook/media/v4l/pixfmt-sgbrg8.xml<br/>index d67a472b0880..fee65dca79c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-sgbrg8.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-sgbrg8.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-sgbrg8.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-sgbrg8.xml</a></div><div class='hunk'>@@ -65,11 +65,3 @@ pixel image&lt;/title&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml b/Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml<br/>index 0cdf13b8ac1c..19727ab4c757 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml</a></div><div class='hunk'>@@ -65,11 +65,3 @@ columns and rows.&lt;/para&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-uyvy.xml b/Documentation/DocBook/media/v4l/pixfmt-uyvy.xml<br/>index 816c8d467c16..b1f6801a17ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-uyvy.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-uyvy.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-uyvy.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-uyvy.xml</a></div><div class='hunk'>@@ -118,11 +118,3 @@ pixel image&lt;/title&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-vyuy.xml b/Documentation/DocBook/media/v4l/pixfmt-vyuy.xml<br/>index 61f12a5e68d9..82803408b389 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-vyuy.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-vyuy.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-vyuy.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-vyuy.xml</a></div><div class='hunk'>@@ -118,11 +118,3 @@ pixel image&lt;/title&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-y16.xml b/Documentation/DocBook/media/v4l/pixfmt-y16.xml<br/>index d58404015078..ff4f727d5624 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-y16.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-y16.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-y16.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-y16.xml</a></div><div class='hunk'>@@ -79,11 +79,3 @@ pixel image&lt;/title&gt;</div><div class='ctx'>     &lt;/example&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-y41p.xml b/Documentation/DocBook/media/v4l/pixfmt-y41p.xml<br/>index 73c8536efb05..98dcb91d2917 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-y41p.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-y41p.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-y41p.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-y41p.xml</a></div><div class='hunk'>@@ -147,11 +147,3 @@ pixel image&lt;/title&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-yuv410.xml b/Documentation/DocBook/media/v4l/pixfmt-yuv410.xml<br/>index 8eb4a193d770..0869dce5f92c 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-yuv410.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-yuv410.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-yuv410.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-yuv410.xml</a></div><div class='hunk'>@@ -131,11 +131,3 @@ pixel image&lt;/title&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-yuv411p.xml b/Documentation/DocBook/media/v4l/pixfmt-yuv411p.xml<br/>index 00e0960a9869..086dc731bf02 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-yuv411p.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-yuv411p.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-yuv411p.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-yuv411p.xml</a></div><div class='hunk'>@@ -145,11 +145,3 @@ pixel image&lt;/title&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-yuv420.xml b/Documentation/DocBook/media/v4l/pixfmt-yuv420.xml<br/>index 42d7de5e456d..48649fac1596 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-yuv420.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-yuv420.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-yuv420.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-yuv420.xml</a></div><div class='hunk'>@@ -147,11 +147,3 @@ pixel image&lt;/title&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml b/Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml<br/>index f5d8f57495c8..9957863daf18 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml</a></div><div class='hunk'>@@ -152,11 +152,3 @@ pixel image&lt;/title&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-yuv422p.xml b/Documentation/DocBook/media/v4l/pixfmt-yuv422p.xml<br/>index 4348bd9f0d01..4ce6463fe0a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-yuv422p.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-yuv422p.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-yuv422p.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-yuv422p.xml</a></div><div class='hunk'>@@ -151,11 +151,3 @@ pixel image&lt;/title&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-yuyv.xml b/Documentation/DocBook/media/v4l/pixfmt-yuyv.xml<br/>index bdb2ffacbbcc..58384092251a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-yuyv.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-yuyv.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-yuyv.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-yuyv.xml</a></div><div class='hunk'>@@ -118,11 +118,3 @@ pixel image&lt;/title&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt-yvyu.xml b/Documentation/DocBook/media/v4l/pixfmt-yvyu.xml<br/>index 40d17ae39dde..bfffdc76d3da 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-yvyu.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt-yvyu.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt-yvyu.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt-yvyu.xml</a></div><div class='hunk'>@@ -118,11 +118,3 @@ pixel image&lt;/title&gt;</div><div class='ctx'> 	&lt;/example&gt;</div><div class='ctx'>       &lt;/refsect1&gt;</div><div class='ctx'>     &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "pixfmt.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/pixfmt.xml b/Documentation/DocBook/media/v4l/pixfmt.xml<br/>index 2ff6b7776d7f..31eaae2469f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/pixfmt.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/pixfmt.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/pixfmt.xml</a></div><div class='hunk'>@@ -714,6 +714,7 @@ information.&lt;/para&gt;</div><div class='ctx'>     &amp;sub-nv12m;</div><div class='ctx'>     &amp;sub-nv12mt;</div><div class='ctx'>     &amp;sub-nv16;</div><div class='add'>+    &amp;sub-nv24;</div><div class='ctx'>     &amp;sub-m420;</div><div class='ctx'>   &lt;/section&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -890,6 +891,11 @@ kernel sources in the file &lt;filename&gt;Documentation/video4linux/cx2341x/README.hm</div><div class='ctx'> 	    &lt;entry&gt;'M310'&lt;/entry&gt;</div><div class='ctx'> 	    &lt;entry&gt;Compressed BGGR Bayer format used by the gspca driver.&lt;/entry&gt;</div><div class='ctx'> 	  &lt;/row&gt;</div><div class='add'>+	  &lt;row id="V4L2-PIX-FMT-JL2005BCD"&gt;</div><div class='add'>+	    &lt;entry&gt;&lt;constant&gt;V4L2_PIX_FMT_JL2005BCD&lt;/constant&gt;&lt;/entry&gt;</div><div class='add'>+	    &lt;entry&gt;'JL20'&lt;/entry&gt;</div><div class='add'>+	    &lt;entry&gt;JPEG compressed RGGB Bayer format used by the gspca driver.&lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='ctx'> 	  &lt;row id="V4L2-PIX-FMT-OV511"&gt;</div><div class='ctx'> 	    &lt;entry&gt;&lt;constant&gt;V4L2_PIX_FMT_OV511&lt;/constant&gt;&lt;/entry&gt;</div><div class='ctx'> 	    &lt;entry&gt;'O511'&lt;/entry&gt;</div><div class='hunk'>@@ -997,11 +1003,3 @@ the other bits are set to 0.&lt;/entry&gt;</div><div class='ctx'>       &lt;/tgroup&gt;</div><div class='ctx'>     &lt;/table&gt;</div><div class='ctx'>   &lt;/section&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>-  --&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/selection-api.xml b/Documentation/DocBook/media/v4l/selection-api.xml<br/>new file mode 100644<br/>index 000000000000..2f0bdb4d5551<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/selection-api.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/selection-api.xml</a></div><div class='hunk'>@@ -0,0 +1,321 @@</div><div class='add'>+&lt;section id="selection-api"&gt;</div><div class='add'>+</div><div class='add'>+  &lt;title&gt;Experimental API for cropping, composing and scaling&lt;/title&gt;</div><div class='add'>+</div><div class='add'>+      &lt;note&gt;</div><div class='add'>+	&lt;title&gt;Experimental&lt;/title&gt;</div><div class='add'>+</div><div class='add'>+	&lt;para&gt;This is an &lt;link linkend="experimental"&gt;experimental&lt;/link&gt;</div><div class='add'>+interface and may change in the future.&lt;/para&gt;</div><div class='add'>+      &lt;/note&gt;</div><div class='add'>+</div><div class='add'>+  &lt;section&gt;</div><div class='add'>+    &lt;title&gt;Introduction&lt;/title&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;Some video capture devices can sample a subsection of a picture and</div><div class='add'>+shrink or enlarge it to an image of arbitrary size. Next, the devices can</div><div class='add'>+insert the image into larger one. Some video output devices can crop part of an</div><div class='add'>+input image, scale it up or down and insert it at an arbitrary scan line and</div><div class='add'>+horizontal offset into a video signal. We call these abilities cropping,</div><div class='add'>+scaling and composing.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;On a video &lt;emphasis&gt;capture&lt;/emphasis&gt; device the source is a video</div><div class='add'>+signal, and the cropping target determine the area actually sampled. The sink</div><div class='add'>+is an image stored in a memory buffer.  The composing area specifies which part</div><div class='add'>+of the buffer is actually written to by the hardware. &lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;On a video &lt;emphasis&gt;output&lt;/emphasis&gt; device the source is an image in a</div><div class='add'>+memory buffer, and the cropping target is a part of an image to be shown on a</div><div class='add'>+display. The sink is the display or the graphics screen. The application may</div><div class='add'>+select the part of display where the image should be displayed. The size and</div><div class='add'>+position of such a window is controlled by the compose target.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;Rectangles for all cropping and composing targets are defined even if the</div><div class='add'>+device does supports neither cropping nor composing. Their size and position</div><div class='add'>+will be fixed in such a case. If the device does not support scaling then the</div><div class='add'>+cropping and composing rectangles have the same size.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+  &lt;/section&gt;</div><div class='add'>+</div><div class='add'>+    &lt;section&gt;</div><div class='add'>+      &lt;title&gt;Selection targets&lt;/title&gt;</div><div class='add'>+</div><div class='add'>+      &lt;figure id="sel-targets-capture"&gt;</div><div class='add'>+	&lt;title&gt;Cropping and composing targets&lt;/title&gt;</div><div class='add'>+	&lt;mediaobject&gt;</div><div class='add'>+	  &lt;imageobject&gt;</div><div class='add'>+	    &lt;imagedata fileref="selection.png" format="PNG" /&gt;</div><div class='add'>+	  &lt;/imageobject&gt;</div><div class='add'>+	  &lt;textobject&gt;</div><div class='add'>+	    &lt;phrase&gt;Targets used by a cropping, composing and scaling</div><div class='add'>+            process&lt;/phrase&gt;</div><div class='add'>+	  &lt;/textobject&gt;</div><div class='add'>+	&lt;/mediaobject&gt;</div><div class='add'>+      &lt;/figure&gt;</div><div class='add'>+    &lt;/section&gt;</div><div class='add'>+</div><div class='add'>+  &lt;section&gt;</div><div class='add'>+</div><div class='add'>+  &lt;title&gt;Configuration&lt;/title&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;Applications can use the &lt;link linkend="vidioc-g-selection"&gt;selection</div><div class='add'>+API&lt;/link&gt; to select an area in a video signal or a buffer, and to query for</div><div class='add'>+default settings and hardware limits.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;Video hardware can have various cropping, composing and scaling</div><div class='add'>+limitations. It may only scale up or down, support only discrete scaling</div><div class='add'>+factors, or have different scaling abilities in the horizontal and vertical</div><div class='add'>+directions. Also it may not support scaling at all. At the same time the</div><div class='add'>+cropping/composing rectangles may have to be aligned, and both the source and</div><div class='add'>+the sink may have arbitrary upper and lower size limits. Therefore, as usual,</div><div class='add'>+drivers are expected to adjust the requested parameters and return the actual</div><div class='add'>+values selected. An application can control the rounding behaviour using &lt;link</div><div class='add'>+linkend="v4l2-sel-flags"&gt; constraint flags &lt;/link&gt;.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+   &lt;section&gt;</div><div class='add'>+</div><div class='add'>+   &lt;title&gt;Configuration of video capture&lt;/title&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;See figure &lt;xref linkend="sel-targets-capture" /&gt; for examples of the</div><div class='add'>+selection targets available for a video capture device.  It is recommended to</div><div class='add'>+configure the cropping targets before to the composing targets.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;The range of coordinates of the top left corner, width and height of</div><div class='add'>+areas that can be sampled is given by the &lt;constant&gt; V4L2_SEL_TGT_CROP_BOUNDS</div><div class='add'>+&lt;/constant&gt; target. It is recommended for the driver developers to put the</div><div class='add'>+top/left corner at position &lt;constant&gt; (0,0) &lt;/constant&gt;.  The rectangle's</div><div class='add'>+coordinates are expressed in pixels.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;The top left corner, width and height of the source rectangle, that is</div><div class='add'>+the area actually sampled, is given by the &lt;constant&gt; V4L2_SEL_TGT_CROP_ACTIVE</div><div class='add'>+&lt;/constant&gt; target. It uses the same coordinate system as &lt;constant&gt;</div><div class='add'>+V4L2_SEL_TGT_CROP_BOUNDS &lt;/constant&gt;. The active cropping area must lie</div><div class='add'>+completely inside the capture boundaries. The driver may further adjust the</div><div class='add'>+requested size and/or position according to hardware limitations.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;Each capture device has a default source rectangle, given by the</div><div class='add'>+&lt;constant&gt; V4L2_SEL_TGT_CROP_DEFAULT &lt;/constant&gt; target. This rectangle shall</div><div class='add'>+over what the driver writer considers the complete picture.  Drivers shall set</div><div class='add'>+the active crop rectangle to the default when the driver is first loaded, but</div><div class='add'>+not later.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;The composing targets refer to a memory buffer. The limits of composing</div><div class='add'>+coordinates are obtained using &lt;constant&gt; V4L2_SEL_TGT_COMPOSE_BOUNDS</div><div class='add'>+&lt;/constant&gt;.  All coordinates are expressed in pixels. The rectangle's top/left</div><div class='add'>+corner must be located at position &lt;constant&gt; (0,0) &lt;/constant&gt;. The width and</div><div class='add'>+height are equal to the image size set by &lt;constant&gt; VIDIOC_S_FMT &lt;/constant&gt;.</div><div class='add'>+&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;The part of a buffer into which the image is inserted by the hardware is</div><div class='add'>+controlled by the &lt;constant&gt; V4L2_SEL_TGT_COMPOSE_ACTIVE &lt;/constant&gt; target.</div><div class='add'>+The rectangle's coordinates are also expressed in the same coordinate system as</div><div class='add'>+the bounds rectangle. The composing rectangle must lie completely inside bounds</div><div class='add'>+rectangle. The driver must adjust the composing rectangle to fit to the</div><div class='add'>+bounding limits. Moreover, the driver can perform other adjustments according</div><div class='add'>+to hardware limitations. The application can control rounding behaviour using</div><div class='add'>+&lt;link linkend="v4l2-sel-flags"&gt; constraint flags &lt;/link&gt;.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;For capture devices the default composing rectangle is queried using</div><div class='add'>+&lt;constant&gt; V4L2_SEL_TGT_COMPOSE_DEFAULT &lt;/constant&gt;. It is usually equal to the</div><div class='add'>+bounding rectangle.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;The part of a buffer that is modified by the hardware is given by</div><div class='add'>+&lt;constant&gt; V4L2_SEL_TGT_COMPOSE_PADDED &lt;/constant&gt;. It contains all pixels</div><div class='add'>+defined using &lt;constant&gt; V4L2_SEL_TGT_COMPOSE_ACTIVE &lt;/constant&gt; plus all</div><div class='add'>+padding data modified by hardware during insertion process. All pixels outside</div><div class='add'>+this rectangle &lt;emphasis&gt;must not&lt;/emphasis&gt; be changed by the hardware. The</div><div class='add'>+content of pixels that lie inside the padded area but outside active area is</div><div class='add'>+undefined. The application can use the padded and active rectangles to detect</div><div class='add'>+where the rubbish pixels are located and remove them if needed.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+   &lt;/section&gt;</div><div class='add'>+</div><div class='add'>+   &lt;section&gt;</div><div class='add'>+</div><div class='add'>+   &lt;title&gt;Configuration of video output&lt;/title&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;For output devices targets and ioctls are used similarly to the video</div><div class='add'>+capture case. The &lt;emphasis&gt; composing &lt;/emphasis&gt; rectangle refers to the</div><div class='add'>+insertion of an image into a video signal. The cropping rectangles refer to a</div><div class='add'>+memory buffer. It is recommended to configure the composing targets before to</div><div class='add'>+the cropping targets.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;The cropping targets refer to the memory buffer that contains an image to</div><div class='add'>+be inserted into a video signal or graphical screen. The limits of cropping</div><div class='add'>+coordinates are obtained using &lt;constant&gt; V4L2_SEL_TGT_CROP_BOUNDS &lt;/constant&gt;.</div><div class='add'>+All coordinates are expressed in pixels. The top/left corner is always point</div><div class='add'>+&lt;constant&gt; (0,0) &lt;/constant&gt;.  The width and height is equal to the image size</div><div class='add'>+specified using &lt;constant&gt; VIDIOC_S_FMT &lt;/constant&gt; ioctl.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;The top left corner, width and height of the source rectangle, that is</div><div class='add'>+the area from which image date are processed by the hardware, is given by the</div><div class='add'>+&lt;constant&gt; V4L2_SEL_TGT_CROP_ACTIVE &lt;/constant&gt;. Its coordinates are expressed</div><div class='add'>+in in the same coordinate system as the bounds rectangle. The active cropping</div><div class='add'>+area must lie completely inside the crop boundaries and the driver may further</div><div class='add'>+adjust the requested size and/or position according to hardware</div><div class='add'>+limitations.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;For output devices the default cropping rectangle is queried using</div><div class='add'>+&lt;constant&gt; V4L2_SEL_TGT_CROP_DEFAULT &lt;/constant&gt;. It is usually equal to the</div><div class='add'>+bounding rectangle.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;The part of a video signal or graphics display where the image is</div><div class='add'>+inserted by the hardware is controlled by &lt;constant&gt;</div><div class='add'>+V4L2_SEL_TGT_COMPOSE_ACTIVE &lt;/constant&gt; target.  The rectangle's coordinates</div><div class='add'>+are expressed in pixels. The composing rectangle must lie completely inside the</div><div class='add'>+bounds rectangle.  The driver must adjust the area to fit to the bounding</div><div class='add'>+limits.  Moreover, the driver can perform other adjustments according to</div><div class='add'>+hardware limitations. &lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;The device has a default composing rectangle, given by the &lt;constant&gt;</div><div class='add'>+V4L2_SEL_TGT_COMPOSE_DEFAULT &lt;/constant&gt; target. This rectangle shall cover what</div><div class='add'>+the driver writer considers the complete picture. It is recommended for the</div><div class='add'>+driver developers to put the top/left corner at position &lt;constant&gt; (0,0)</div><div class='add'>+&lt;/constant&gt;. Drivers shall set the active composing rectangle to the default</div><div class='add'>+one when the driver is first loaded.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;The devices may introduce additional content to video signal other than</div><div class='add'>+an image from memory buffers.  It includes borders around an image. However,</div><div class='add'>+such a padded area is driver-dependent feature not covered by this document.</div><div class='add'>+Driver developers are encouraged to keep padded rectangle equal to active one.</div><div class='add'>+The padded target is accessed by the &lt;constant&gt; V4L2_SEL_TGT_COMPOSE_PADDED</div><div class='add'>+&lt;/constant&gt; identifier.  It must contain all pixels from the &lt;constant&gt;</div><div class='add'>+V4L2_SEL_TGT_COMPOSE_ACTIVE &lt;/constant&gt; target.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+   &lt;/section&gt;</div><div class='add'>+</div><div class='add'>+   &lt;section&gt;</div><div class='add'>+</div><div class='add'>+     &lt;title&gt;Scaling control.&lt;/title&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;An application can detect if scaling is performed by comparing the width</div><div class='add'>+and the height of rectangles obtained using &lt;constant&gt; V4L2_SEL_TGT_CROP_ACTIVE</div><div class='add'>+&lt;/constant&gt; and &lt;constant&gt; V4L2_SEL_TGT_COMPOSE_ACTIVE &lt;/constant&gt; targets. If</div><div class='add'>+these are not equal then the scaling is applied. The application can compute</div><div class='add'>+the scaling ratios using these values.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+   &lt;/section&gt;</div><div class='add'>+</div><div class='add'>+  &lt;/section&gt;</div><div class='add'>+</div><div class='add'>+  &lt;section&gt;</div><div class='add'>+</div><div class='add'>+    &lt;title&gt;Comparison with old cropping API.&lt;/title&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt;The selection API was introduced to cope with deficiencies of previous</div><div class='add'>+&lt;link linkend="crop"&gt; API &lt;/link&gt;, that was designed to control simple capture</div><div class='add'>+devices. Later the cropping API was adopted by video output drivers. The ioctls</div><div class='add'>+are used to select a part of the display were the video signal is inserted. It</div><div class='add'>+should be considered as an API abuse because the described operation is</div><div class='add'>+actually the composing.  The selection API makes a clear distinction between</div><div class='add'>+composing and cropping operations by setting the appropriate targets.  The V4L2</div><div class='add'>+API lacks any support for composing to and cropping from an image inside a</div><div class='add'>+memory buffer.  The application could configure a capture device to fill only a</div><div class='add'>+part of an image by abusing V4L2 API.  Cropping a smaller image from a larger</div><div class='add'>+one is achieved by setting the field &lt;structfield&gt;</div><div class='add'>+&amp;v4l2-pix-format;::bytesperline &lt;/structfield&gt;.  Introducing an image offsets</div><div class='add'>+could be done by modifying field &lt;structfield&gt; &amp;v4l2-buffer;::m:userptr</div><div class='add'>+&lt;/structfield&gt; before calling &lt;constant&gt; VIDIOC_QBUF &lt;/constant&gt;. Those</div><div class='add'>+operations should be avoided because they are not portable (endianness), and do</div><div class='add'>+not work for macroblock and Bayer formats and mmap buffers.  The selection API</div><div class='add'>+deals with configuration of buffer cropping/composing in a clear, intuitive and</div><div class='add'>+portable way.  Next, with the selection API the concepts of the padded target</div><div class='add'>+and constraints flags are introduced.  Finally, &lt;structname&gt; &amp;v4l2-crop;</div><div class='add'>+&lt;/structname&gt; and &lt;structname&gt; &amp;v4l2-cropcap; &lt;/structname&gt; have no reserved</div><div class='add'>+fields. Therefore there is no way to extend their functionality.  The new</div><div class='add'>+&lt;structname&gt; &amp;v4l2-selection; &lt;/structname&gt; provides a lot of place for future</div><div class='add'>+extensions.  Driver developers are encouraged to implement only selection API.</div><div class='add'>+The former cropping API would be simulated using the new one. &lt;/para&gt;</div><div class='add'>+</div><div class='add'>+  &lt;/section&gt;</div><div class='add'>+</div><div class='add'>+   &lt;section&gt;</div><div class='add'>+      &lt;title&gt;Examples&lt;/title&gt;</div><div class='add'>+      &lt;example&gt;</div><div class='add'>+	&lt;title&gt;Resetting the cropping parameters&lt;/title&gt;</div><div class='add'>+</div><div class='add'>+	&lt;para&gt;(A video capture device is assumed; change &lt;constant&gt;</div><div class='add'>+V4L2_BUF_TYPE_VIDEO_CAPTURE &lt;/constant&gt; for other devices; change target to</div><div class='add'>+&lt;constant&gt; V4L2_SEL_TGT_COMPOSE_* &lt;/constant&gt; family to configure composing</div><div class='add'>+area)&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+	&lt;programlisting&gt;</div><div class='add'>+</div><div class='add'>+	&amp;v4l2-selection; sel = {</div><div class='add'>+		.type = V4L2_BUF_TYPE_VIDEO_CAPTURE,</div><div class='add'>+		.target = V4L2_SEL_TGT_CROP_DEFAULT,</div><div class='add'>+	};</div><div class='add'>+	ret = ioctl(fd, &amp;VIDIOC-G-SELECTION;, &amp;amp;sel);</div><div class='add'>+	if (ret)</div><div class='add'>+		exit(-1);</div><div class='add'>+	sel.target = V4L2_SEL_TGT_CROP_ACTIVE;</div><div class='add'>+	ret = ioctl(fd, &amp;VIDIOC-S-SELECTION;, &amp;amp;sel);</div><div class='add'>+	if (ret)</div><div class='add'>+		exit(-1);</div><div class='add'>+</div><div class='add'>+        &lt;/programlisting&gt;</div><div class='add'>+      &lt;/example&gt;</div><div class='add'>+</div><div class='add'>+      &lt;example&gt;</div><div class='add'>+	&lt;title&gt;Simple downscaling&lt;/title&gt;</div><div class='add'>+	&lt;para&gt;Setting a composing area on output of size of &lt;emphasis&gt; at most</div><div class='add'>+&lt;/emphasis&gt; half of limit placed at a center of a display.&lt;/para&gt;</div><div class='add'>+	&lt;programlisting&gt;</div><div class='add'>+</div><div class='add'>+	&amp;v4l2-selection; sel = {</div><div class='add'>+		.type = V4L2_BUF_TYPE_VIDEO_OUTPUT,</div><div class='add'>+		.target = V4L2_SEL_TGT_COMPOSE_BOUNDS,</div><div class='add'>+	};</div><div class='add'>+	struct v4l2_rect r;</div><div class='add'>+</div><div class='add'>+	ret = ioctl(fd, &amp;VIDIOC-G-SELECTION;, &amp;amp;sel);</div><div class='add'>+	if (ret)</div><div class='add'>+		exit(-1);</div><div class='add'>+	/* setting smaller compose rectangle */</div><div class='add'>+	r.width = sel.r.width / 2;</div><div class='add'>+	r.height = sel.r.height / 2;</div><div class='add'>+	r.left = sel.r.width / 4;</div><div class='add'>+	r.top = sel.r.height / 4;</div><div class='add'>+	sel.r = r;</div><div class='add'>+	sel.target = V4L2_SEL_TGT_COMPOSE_ACTIVE;</div><div class='add'>+	sel.flags = V4L2_SEL_FLAG_LE;</div><div class='add'>+	ret = ioctl(fd, &amp;VIDIOC-S-SELECTION;, &amp;amp;sel);</div><div class='add'>+	if (ret)</div><div class='add'>+		exit(-1);</div><div class='add'>+</div><div class='add'>+        &lt;/programlisting&gt;</div><div class='add'>+      &lt;/example&gt;</div><div class='add'>+</div><div class='add'>+      &lt;example&gt;</div><div class='add'>+	&lt;title&gt;Querying for scaling factors&lt;/title&gt;</div><div class='add'>+	&lt;para&gt;A video output device is assumed; change &lt;constant&gt;</div><div class='add'>+V4L2_BUF_TYPE_VIDEO_OUTPUT &lt;/constant&gt; for other devices&lt;/para&gt;</div><div class='add'>+	&lt;programlisting&gt;</div><div class='add'>+</div><div class='add'>+	&amp;v4l2-selection; compose = {</div><div class='add'>+		.type = V4L2_BUF_TYPE_VIDEO_OUTPUT,</div><div class='add'>+		.target = V4L2_SEL_TGT_COMPOSE_ACTIVE,</div><div class='add'>+	};</div><div class='add'>+	&amp;v4l2-selection; crop = {</div><div class='add'>+		.type = V4L2_BUF_TYPE_VIDEO_OUTPUT,</div><div class='add'>+		.target = V4L2_SEL_TGT_CROP_ACTIVE,</div><div class='add'>+	};</div><div class='add'>+	double hscale, vscale;</div><div class='add'>+</div><div class='add'>+	ret = ioctl(fd, &amp;VIDIOC-G-SELECTION;, &amp;amp;compose);</div><div class='add'>+	if (ret)</div><div class='add'>+		exit(-1);</div><div class='add'>+	ret = ioctl(fd, &amp;VIDIOC-G-SELECTION;, &amp;amp;crop);</div><div class='add'>+	if (ret)</div><div class='add'>+		exit(-1);</div><div class='add'>+</div><div class='add'>+	/* computing scaling factors */</div><div class='add'>+	hscale = (double)compose.r.width / crop.r.width;</div><div class='add'>+	vscale = (double)compose.r.height / crop.r.height;</div><div class='add'>+</div><div class='add'>+	&lt;/programlisting&gt;</div><div class='add'>+      &lt;/example&gt;</div><div class='add'>+</div><div class='add'>+   &lt;/section&gt;</div><div class='add'>+</div><div class='add'>+&lt;/section&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml<br/>index 2ab365c10fb9..e97c512861bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/v4l2.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/v4l2.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/v4l2.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/v4l2.xml</a></div><div class='hunk'>@@ -501,6 +501,7 @@ and discussions on the V4L mailing list.&lt;/revremark&gt;</div><div class='ctx'>     &amp;sub-g-output;</div><div class='ctx'>     &amp;sub-g-parm;</div><div class='ctx'>     &amp;sub-g-priority;</div><div class='add'>+    &amp;sub-g-selection;</div><div class='ctx'>     &amp;sub-g-sliced-vbi-cap;</div><div class='ctx'>     &amp;sub-g-std;</div><div class='ctx'>     &amp;sub-g-tuner;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml b/Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml<br/>index 1d31427edd1b..0be17c232d3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml</a></div><div class='hunk'>@@ -228,11 +228,3 @@ is out of bounds.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-enum-fmt.xml b/Documentation/DocBook/media/v4l/vidioc-enum-fmt.xml<br/>index 71d373b6d36a..347d142e7431 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-enum-fmt.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-enum-fmt.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-enum-fmt.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-enum-fmt.xml</a></div><div class='hunk'>@@ -156,11 +156,3 @@ bounds.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-enuminput.xml b/Documentation/DocBook/media/v4l/vidioc-enuminput.xml<br/>index 476fe1d2bba0..9b8efcd6e947 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-enuminput.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-enuminput.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-enuminput.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-enuminput.xml</a></div><div class='hunk'>@@ -311,11 +311,3 @@ out of bounds.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-enumoutput.xml b/Documentation/DocBook/media/v4l/vidioc-enumoutput.xml<br/>index a281d26a195f..a64d5ef103fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-enumoutput.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-enumoutput.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-enumoutput.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-enumoutput.xml</a></div><div class='hunk'>@@ -196,11 +196,3 @@ is out of bounds.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-enumstd.xml b/Documentation/DocBook/media/v4l/vidioc-enumstd.xml<br/>index 95803fe2c8e4..3a5fc5405f96 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-enumstd.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-enumstd.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-enumstd.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-enumstd.xml</a></div><div class='hunk'>@@ -381,11 +381,3 @@ is out of bounds.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml b/Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml<br/>index 5146d00782e3..12b1d0503e26 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml</a></div><div class='hunk'>@@ -127,11 +127,3 @@ this control belongs to.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml<br/>index 5122ce87e0b8..b17a7aac6997 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml</a></div><div class='hunk'>@@ -183,7 +183,12 @@ applications must set the array to zero.&lt;/entry&gt;</div><div class='ctx'> 	    &lt;entry&gt;__u32&lt;/entry&gt;</div><div class='ctx'> 	    &lt;entry&gt;&lt;structfield&gt;ctrl_class&lt;/structfield&gt;&lt;/entry&gt;</div><div class='ctx'> 	    &lt;entry&gt;The control class to which all controls belong, see</div><div class='del'>-&lt;xref linkend="ctrl-class" /&gt;.&lt;/entry&gt;</div><div class='add'>+&lt;xref linkend="ctrl-class" /&gt;. Drivers that use a kernel framework for handling</div><div class='add'>+controls will also accept a value of 0 here, meaning that the controls can</div><div class='add'>+belong to any control class. Whether drivers support this can be tested by setting</div><div class='add'>+&lt;structfield&gt;ctrl_class&lt;/structfield&gt; to 0 and calling &lt;constant&gt;VIDIOC_TRY_EXT_CTRLS&lt;/constant&gt;</div><div class='add'>+with a &lt;structfield&gt;count&lt;/structfield&gt; of 0. If that succeeds, then the driver</div><div class='add'>+supports this feature.&lt;/entry&gt;</div><div class='ctx'> 	  &lt;/row&gt;</div><div class='ctx'> 	  &lt;row&gt;</div><div class='ctx'> 	    &lt;entry&gt;__u32&lt;/entry&gt;</div><div class='hunk'>@@ -194,10 +199,13 @@ also be zero.&lt;/entry&gt;</div><div class='ctx'> 	  &lt;row&gt;</div><div class='ctx'> 	    &lt;entry&gt;__u32&lt;/entry&gt;</div><div class='ctx'> 	    &lt;entry&gt;&lt;structfield&gt;error_idx&lt;/structfield&gt;&lt;/entry&gt;</div><div class='del'>-	    &lt;entry&gt;Set by the driver in case of an error. It is the</div><div class='del'>-index of the control causing the error or equal to 'count' when the</div><div class='del'>-error is not associated with a particular control. Undefined when the</div><div class='del'>-ioctl returns 0 (success).&lt;/entry&gt;</div><div class='add'>+	    &lt;entry&gt;Set by the driver in case of an error. If it is equal</div><div class='add'>+to &lt;structfield&gt;count&lt;/structfield&gt;, then no actual changes were made to</div><div class='add'>+controls. In other words, the error was not associated with setting a particular</div><div class='add'>+control. If it is another value, then only the controls up to &lt;structfield&gt;error_idx-1&lt;/structfield&gt;</div><div class='add'>+were modified and control &lt;structfield&gt;error_idx&lt;/structfield&gt; is the one that</div><div class='add'>+caused the error. The &lt;structfield&gt;error_idx&lt;/structfield&gt; value is undefined</div><div class='add'>+if the ioctl returned 0 (success).&lt;/entry&gt;</div><div class='ctx'> 	  &lt;/row&gt;</div><div class='ctx'> 	  &lt;row&gt;</div><div class='ctx'> 	    &lt;entry&gt;__u32&lt;/entry&gt;</div><div class='hunk'>@@ -312,10 +320,3 @@ to store the payload and this error code is returned.&lt;/para&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='ctx'> </div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml b/Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml<br/>index 055718231bc1..7c63815e7afd 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml</a></div><div class='hunk'>@@ -295,7 +295,8 @@ set this field to zero.&lt;/entry&gt;</div><div class='ctx'> 	    &lt;entry&gt;The device is capable of non-destructive overlays.</div><div class='ctx'> When the driver clears this flag, only destructive overlays are</div><div class='ctx'> supported. There are no drivers yet which support both destructive and</div><div class='del'>-non-destructive overlays.&lt;/entry&gt;</div><div class='add'>+non-destructive overlays. Video Output Overlays are in practice always</div><div class='add'>+non-destructive.&lt;/entry&gt;</div><div class='ctx'> 	  &lt;/row&gt;</div><div class='ctx'> 	  &lt;row&gt;</div><div class='ctx'> 	    &lt;entry&gt;&lt;constant&gt;V4L2_FBUF_CAP_CHROMAKEY&lt;/constant&gt;&lt;/entry&gt;</div><div class='hunk'>@@ -339,8 +340,8 @@ blending makes no sense for destructive overlays.&lt;/entry&gt;</div><div class='ctx'> 	  &lt;row&gt;</div><div class='ctx'> 	    &lt;entry&gt;&lt;constant&gt;V4L2_FBUF_CAP_SRC_CHROMAKEY&lt;/constant&gt;&lt;/entry&gt;</div><div class='ctx'> 	    &lt;entry&gt;0x0080&lt;/entry&gt;</div><div class='del'>-	    &lt;entry&gt;The device supports Source Chroma-keying. Framebuffer pixels</div><div class='del'>-with the chroma-key colors are replaced by video pixels, which is exactly opposite of</div><div class='add'>+	    &lt;entry&gt;The device supports Source Chroma-keying. Video pixels</div><div class='add'>+with the chroma-key colors are replaced by framebuffer pixels, which is exactly opposite of</div><div class='ctx'> &lt;constant&gt;V4L2_FBUF_CAP_CHROMAKEY&lt;/constant&gt;&lt;/entry&gt;</div><div class='ctx'> 	  &lt;/row&gt;</div><div class='ctx'> 	&lt;/tbody&gt;</div><div class='hunk'>@@ -356,21 +357,27 @@ with the chroma-key colors are replaced by video pixels, which is exactly opposi</div><div class='ctx'> 	    &lt;entry&gt;&lt;constant&gt;V4L2_FBUF_FLAG_PRIMARY&lt;/constant&gt;&lt;/entry&gt;</div><div class='ctx'> 	    &lt;entry&gt;0x0001&lt;/entry&gt;</div><div class='ctx'> 	    &lt;entry&gt;The framebuffer is the primary graphics surface.</div><div class='del'>-In other words, the overlay is destructive. [?]&lt;/entry&gt;</div><div class='add'>+In other words, the overlay is destructive. This flag is typically set by any</div><div class='add'>+driver that doesn't have the &lt;constant&gt;V4L2_FBUF_CAP_EXTERNOVERLAY&lt;/constant&gt;</div><div class='add'>+capability and it is cleared otherwise.&lt;/entry&gt;</div><div class='ctx'> 	  &lt;/row&gt;</div><div class='ctx'> 	  &lt;row&gt;</div><div class='ctx'> 	    &lt;entry&gt;&lt;constant&gt;V4L2_FBUF_FLAG_OVERLAY&lt;/constant&gt;&lt;/entry&gt;</div><div class='ctx'> 	    &lt;entry&gt;0x0002&lt;/entry&gt;</div><div class='del'>-	    &lt;entry&gt;The frame buffer is an overlay surface the same</div><div class='del'>-size as the capture. [?]&lt;/entry&gt;</div><div class='del'>-	  &lt;/row&gt;</div><div class='del'>-	  &lt;row&gt;</div><div class='del'>-	    &lt;entry spanname="hspan"&gt;The purpose of</div><div class='del'>-&lt;constant&gt;V4L2_FBUF_FLAG_PRIMARY&lt;/constant&gt; and</div><div class='del'>-&lt;constant&gt;V4L2_FBUF_FLAG_OVERLAY&lt;/constant&gt; was never quite clear.</div><div class='del'>-Most drivers seem to ignore these flags. For compatibility with the</div><div class='del'>-&lt;wordasword&gt;bttv&lt;/wordasword&gt; driver applications should set the</div><div class='del'>-&lt;constant&gt;V4L2_FBUF_FLAG_OVERLAY&lt;/constant&gt; flag.&lt;/entry&gt;</div><div class='add'>+	    &lt;entry&gt;If this flag is set for a video capture device, then the</div><div class='add'>+driver will set the initial overlay size to cover the full framebuffer size,</div><div class='add'>+otherwise the existing overlay size (as set by &amp;VIDIOC-S-FMT;) will be used.</div><div class='add'>+</div><div class='add'>+Only one video capture driver (bttv) supports this flag. The use of this flag</div><div class='add'>+for capture devices is deprecated. There is no way to detect which drivers</div><div class='add'>+support this flag, so the only reliable method of setting the overlay size is</div><div class='add'>+through &amp;VIDIOC-S-FMT;.</div><div class='add'>+</div><div class='add'>+If this flag is set for a video output device, then the video output overlay</div><div class='add'>+window is relative to the top-left corner of the framebuffer and restricted</div><div class='add'>+to the size of the framebuffer. If it is cleared, then the video output</div><div class='add'>+overlay window is relative to the video output display.</div><div class='add'>+            &lt;/entry&gt;</div><div class='ctx'> 	  &lt;/row&gt;</div><div class='ctx'> 	  &lt;row&gt;</div><div class='ctx'> 	    &lt;entry&gt;&lt;constant&gt;V4L2_FBUF_FLAG_CHROMAKEY&lt;/constant&gt;&lt;/entry&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml b/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml<br/>index 062d72069090..66e9a5257861 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-frequency.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-g-frequency.xml</a></div><div class='hunk'>@@ -98,8 +98,11 @@ the &amp;v4l2-output; &lt;structfield&gt;modulator&lt;/structfield&gt; field and the</div><div class='ctx'> 	    &lt;entry&gt;&amp;v4l2-tuner-type;&lt;/entry&gt;</div><div class='ctx'> 	    &lt;entry&gt;&lt;structfield&gt;type&lt;/structfield&gt;&lt;/entry&gt;</div><div class='ctx'> 	    &lt;entry&gt;The tuner type. This is the same value as in the</div><div class='del'>-&amp;v4l2-tuner; &lt;structfield&gt;type&lt;/structfield&gt; field. The field is not</div><div class='del'>-applicable to modulators, &amp;ie; ignored by drivers.&lt;/entry&gt;</div><div class='add'>+&amp;v4l2-tuner; &lt;structfield&gt;type&lt;/structfield&gt; field. The type must be set</div><div class='add'>+to &lt;constant&gt;V4L2_TUNER_RADIO&lt;/constant&gt; for &lt;filename&gt;/dev/radioX&lt;/filename&gt;</div><div class='add'>+device nodes, and to &lt;constant&gt;V4L2_TUNER_ANALOG_TV&lt;/constant&gt;</div><div class='add'>+for all others. The field is not applicable to modulators, &amp;ie; ignored</div><div class='add'>+by drivers.&lt;/entry&gt;</div><div class='ctx'> 	  &lt;/row&gt;</div><div class='ctx'> 	  &lt;row&gt;</div><div class='ctx'> 	    &lt;entry&gt;__u32&lt;/entry&gt;</div><div class='hunk'>@@ -135,11 +138,3 @@ wrong.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-g-input.xml b/Documentation/DocBook/media/v4l/vidioc-g-input.xml<br/>index 08ae82f131f2..1d43065090dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-input.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-input.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-input.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-g-input.xml</a></div><div class='hunk'>@@ -61,8 +61,8 @@ desired input in an integer and call the</div><div class='ctx'> &lt;constant&gt;VIDIOC_S_INPUT&lt;/constant&gt; ioctl with a pointer to this</div><div class='ctx'> integer. Side effects are possible. For example inputs may support</div><div class='ctx'> different video standards, so the driver may implicitly switch the</div><div class='del'>-current standard. It is good practice to select an input before</div><div class='del'>-querying or negotiating any other parameters.&lt;/para&gt;</div><div class='add'>+current standard. Because of these possible side effects applications</div><div class='add'>+must select an input before querying or negotiating any other parameters.&lt;/para&gt;</div><div class='ctx'> </div><div class='ctx'>     &lt;para&gt;Information about video inputs is available using the</div><div class='ctx'> &amp;VIDIOC-ENUMINPUT; ioctl.&lt;/para&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-g-modulator.xml b/Documentation/DocBook/media/v4l/vidioc-g-modulator.xml<br/>index 15ce660f0f5a..7f4ac7e41fa8 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-modulator.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-modulator.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-modulator.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-g-modulator.xml</a></div><div class='hunk'>@@ -236,11 +236,3 @@ mode.&lt;/entry&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-g-output.xml b/Documentation/DocBook/media/v4l/vidioc-g-output.xml<br/>index fd45f1c13ccf..4533068ecb8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-output.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-output.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-output.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-g-output.xml</a></div><div class='hunk'>@@ -61,8 +61,9 @@ desired output in an integer and call the</div><div class='ctx'> &lt;constant&gt;VIDIOC_S_OUTPUT&lt;/constant&gt; ioctl with a pointer to this integer.</div><div class='ctx'> Side effects are possible. For example outputs may support different</div><div class='ctx'> video standards, so the driver may implicitly switch the current</div><div class='del'>-standard. It is good practice to select an output before querying or</div><div class='del'>-negotiating any other parameters.&lt;/para&gt;</div><div class='add'>+standard.</div><div class='add'>+standard. Because of these possible side effects applications</div><div class='add'>+must select an output before querying or negotiating any other parameters.&lt;/para&gt;</div><div class='ctx'> </div><div class='ctx'>     &lt;para&gt;Information about video outputs is available using the</div><div class='ctx'> &amp;VIDIOC-ENUMOUTPUT; ioctl.&lt;/para&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-g-priority.xml b/Documentation/DocBook/media/v4l/vidioc-g-priority.xml<br/>index 8f5e3da7002f..6a81b4fe9538 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-priority.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-priority.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-priority.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-g-priority.xml</a></div><div class='hunk'>@@ -133,11 +133,3 @@ priority.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-g-selection.xml b/Documentation/DocBook/media/v4l/vidioc-g-selection.xml<br/>new file mode 100644<br/>index 000000000000..a9d36e0c090e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-selection.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-g-selection.xml</a></div><div class='hunk'>@@ -0,0 +1,304 @@</div><div class='add'>+&lt;refentry id="vidioc-g-selection"&gt;</div><div class='add'>+</div><div class='add'>+  &lt;refmeta&gt;</div><div class='add'>+    &lt;refentrytitle&gt;ioctl VIDIOC_G_SELECTION, VIDIOC_S_SELECTION&lt;/refentrytitle&gt;</div><div class='add'>+    &amp;manvol;</div><div class='add'>+  &lt;/refmeta&gt;</div><div class='add'>+</div><div class='add'>+  &lt;refnamediv&gt;</div><div class='add'>+    &lt;refname&gt;VIDIOC_G_SELECTION&lt;/refname&gt;</div><div class='add'>+    &lt;refname&gt;VIDIOC_S_SELECTION&lt;/refname&gt;</div><div class='add'>+    &lt;refpurpose&gt;Get or set one of the selection rectangles&lt;/refpurpose&gt;</div><div class='add'>+  &lt;/refnamediv&gt;</div><div class='add'>+</div><div class='add'>+  &lt;refsynopsisdiv&gt;</div><div class='add'>+    &lt;funcsynopsis&gt;</div><div class='add'>+      &lt;funcprototype&gt;</div><div class='add'>+	&lt;funcdef&gt;int &lt;function&gt;ioctl&lt;/function&gt;&lt;/funcdef&gt;</div><div class='add'>+	&lt;paramdef&gt;int &lt;parameter&gt;fd&lt;/parameter&gt;&lt;/paramdef&gt;</div><div class='add'>+	&lt;paramdef&gt;int &lt;parameter&gt;request&lt;/parameter&gt;&lt;/paramdef&gt;</div><div class='add'>+	&lt;paramdef&gt;struct v4l2_selection *&lt;parameter&gt;argp&lt;/parameter&gt;&lt;/paramdef&gt;</div><div class='add'>+      &lt;/funcprototype&gt;</div><div class='add'>+    &lt;/funcsynopsis&gt;</div><div class='add'>+  &lt;/refsynopsisdiv&gt;</div><div class='add'>+</div><div class='add'>+  &lt;refsect1&gt;</div><div class='add'>+    &lt;title&gt;Arguments&lt;/title&gt;</div><div class='add'>+</div><div class='add'>+    &lt;variablelist&gt;</div><div class='add'>+      &lt;varlistentry&gt;</div><div class='add'>+	&lt;term&gt;&lt;parameter&gt;fd&lt;/parameter&gt;&lt;/term&gt;</div><div class='add'>+	&lt;listitem&gt;</div><div class='add'>+	  &lt;para&gt;&amp;fd;&lt;/para&gt;</div><div class='add'>+	&lt;/listitem&gt;</div><div class='add'>+      &lt;/varlistentry&gt;</div><div class='add'>+      &lt;varlistentry&gt;</div><div class='add'>+	&lt;term&gt;&lt;parameter&gt;request&lt;/parameter&gt;&lt;/term&gt;</div><div class='add'>+	&lt;listitem&gt;</div><div class='add'>+	  &lt;para&gt;VIDIOC_G_SELECTION, VIDIOC_S_SELECTION&lt;/para&gt;</div><div class='add'>+	&lt;/listitem&gt;</div><div class='add'>+      &lt;/varlistentry&gt;</div><div class='add'>+      &lt;varlistentry&gt;</div><div class='add'>+	&lt;term&gt;&lt;parameter&gt;argp&lt;/parameter&gt;&lt;/term&gt;</div><div class='add'>+	&lt;listitem&gt;</div><div class='add'>+	  &lt;para&gt;&lt;/para&gt;</div><div class='add'>+	&lt;/listitem&gt;</div><div class='add'>+      &lt;/varlistentry&gt;</div><div class='add'>+    &lt;/variablelist&gt;</div><div class='add'>+  &lt;/refsect1&gt;</div><div class='add'>+</div><div class='add'>+  &lt;refsect1&gt;</div><div class='add'>+    &lt;title&gt;Description&lt;/title&gt;</div><div class='add'>+</div><div class='add'>+    &lt;note&gt;</div><div class='add'>+      &lt;title&gt;Experimental&lt;/title&gt;</div><div class='add'>+      &lt;para&gt;This is an &lt;link linkend="experimental"&gt; experimental &lt;/link&gt;</div><div class='add'>+      interface and may change in the future.&lt;/para&gt;</div><div class='add'>+    &lt;/note&gt;</div><div class='add'>+</div><div class='add'>+    &lt;para&gt;The ioctls are used to query and configure selection rectangles.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt; To query the cropping (composing) rectangle set &lt;structfield&gt;</div><div class='add'>+&amp;v4l2-selection;::type &lt;/structfield&gt; to the respective buffer type.  Do not</div><div class='add'>+use multiplanar buffers.  Use &lt;constant&gt; V4L2_BUF_TYPE_VIDEO_CAPTURE</div><div class='add'>+&lt;/constant&gt; instead of &lt;constant&gt; V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE</div><div class='add'>+&lt;/constant&gt;.  Use &lt;constant&gt; V4L2_BUF_TYPE_VIDEO_OUTPUT &lt;/constant&gt; instead of</div><div class='add'>+&lt;constant&gt; V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE &lt;/constant&gt;.  The next step is</div><div class='add'>+setting &lt;structfield&gt; &amp;v4l2-selection;::target &lt;/structfield&gt; to value</div><div class='add'>+&lt;constant&gt; V4L2_SEL_TGT_CROP_ACTIVE &lt;/constant&gt; (&lt;constant&gt;</div><div class='add'>+V4L2_SEL_TGT_COMPOSE_ACTIVE &lt;/constant&gt;).  Please refer to table &lt;xref</div><div class='add'>+linkend="v4l2-sel-target" /&gt; or &lt;xref linkend="selection-api" /&gt; for additional</div><div class='add'>+targets.  Fields &lt;structfield&gt; &amp;v4l2-selection;::flags &lt;/structfield&gt; and</div><div class='add'>+&lt;structfield&gt; &amp;v4l2-selection;::reserved &lt;/structfield&gt; are ignored and they</div><div class='add'>+must be filled with zeros.  The driver fills the rest of the structure or</div><div class='add'>+returns &amp;EINVAL; if incorrect buffer type or target was used. If cropping</div><div class='add'>+(composing) is not supported then the active rectangle is not mutable and it is</div><div class='add'>+always equal to the bounds rectangle.  Finally, structure &lt;structfield&gt;</div><div class='add'>+&amp;v4l2-selection;::r &lt;/structfield&gt; is filled with the current cropping</div><div class='add'>+(composing) coordinates. The coordinates are expressed in driver-dependent</div><div class='add'>+units. The only exception are rectangles for images in raw formats, whose</div><div class='add'>+coordinates are always expressed in pixels.  &lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt; To change the cropping (composing) rectangle set &lt;structfield&gt;</div><div class='add'>+&amp;v4l2-selection;::type &lt;/structfield&gt; to the respective buffer type.  Do not</div><div class='add'>+use multiplanar buffers.  Use &lt;constant&gt; V4L2_BUF_TYPE_VIDEO_CAPTURE</div><div class='add'>+&lt;/constant&gt; instead of &lt;constant&gt; V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE</div><div class='add'>+&lt;/constant&gt;.  Use &lt;constant&gt; V4L2_BUF_TYPE_VIDEO_OUTPUT &lt;/constant&gt; instead of</div><div class='add'>+&lt;constant&gt; V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE &lt;/constant&gt;.  The next step is</div><div class='add'>+setting &lt;structfield&gt; &amp;v4l2-selection;::target &lt;/structfield&gt; to value</div><div class='add'>+&lt;constant&gt; V4L2_SEL_TGT_CROP_ACTIVE &lt;/constant&gt; (&lt;constant&gt;</div><div class='add'>+V4L2_SEL_TGT_COMPOSE_ACTIVE &lt;/constant&gt;). Please refer to table &lt;xref</div><div class='add'>+linkend="v4l2-sel-target" /&gt; or &lt;xref linkend="selection-api" /&gt; for additional</div><div class='add'>+targets.  Set desired active area into the field &lt;structfield&gt;</div><div class='add'>+&amp;v4l2-selection;::r &lt;/structfield&gt;.  Field &lt;structfield&gt;</div><div class='add'>+&amp;v4l2-selection;::reserved &lt;/structfield&gt; is ignored and must be filled with</div><div class='add'>+zeros.  The driver may adjust the rectangle coordinates. An application may</div><div class='add'>+introduce constraints to control rounding behaviour. Set the field</div><div class='add'>+&lt;structfield&gt; &amp;v4l2-selection;::flags &lt;/structfield&gt; to one of values:</div><div class='add'>+</div><div class='add'>+&lt;itemizedlist&gt;</div><div class='add'>+  &lt;listitem&gt;</div><div class='add'>+&lt;para&gt;&lt;constant&gt;0&lt;/constant&gt; - The driver can adjust the rectangle size freely</div><div class='add'>+and shall choose a crop/compose rectangle as close as possible to the requested</div><div class='add'>+one.&lt;/para&gt;</div><div class='add'>+  &lt;/listitem&gt;</div><div class='add'>+  &lt;listitem&gt;</div><div class='add'>+&lt;para&gt;&lt;constant&gt;V4L2_SEL_FLAG_GE&lt;/constant&gt; - The driver is not allowed to</div><div class='add'>+shrink the rectangle.  The original rectangle must lay inside the adjusted</div><div class='add'>+one.&lt;/para&gt;</div><div class='add'>+  &lt;/listitem&gt;</div><div class='add'>+  &lt;listitem&gt;</div><div class='add'>+&lt;para&gt;&lt;constant&gt;V4L2_SEL_FLAG_LE&lt;/constant&gt; - The driver is not allowed to</div><div class='add'>+enlarge the rectangle.  The adjusted rectangle must lay inside the original</div><div class='add'>+one.&lt;/para&gt;</div><div class='add'>+  &lt;/listitem&gt;</div><div class='add'>+  &lt;listitem&gt;</div><div class='add'>+&lt;para&gt;&lt;constant&gt;V4L2_SEL_FLAG_GE | V4L2_SEL_FLAG_LE&lt;/constant&gt; - The driver</div><div class='add'>+must choose the size exactly the same as in the requested rectangle.&lt;/para&gt;</div><div class='add'>+  &lt;/listitem&gt;</div><div class='add'>+&lt;/itemizedlist&gt;</div><div class='add'>+</div><div class='add'>+Please refer to &lt;xref linkend="sel-const-adjust" /&gt;.</div><div class='add'>+</div><div class='add'>+&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+&lt;para&gt; The driver may have to adjusts the requested dimensions against hardware</div><div class='add'>+limits and other parts as the pipeline, i.e. the bounds given by the</div><div class='add'>+capture/output window or TV display. The closest possible values of horizontal</div><div class='add'>+and vertical offset and sizes are chosen according to following priority:</div><div class='add'>+</div><div class='add'>+&lt;orderedlist&gt;</div><div class='add'>+  &lt;listitem&gt;</div><div class='add'>+    &lt;para&gt;Satisfy constraints from &lt;structfield&gt;&amp;v4l2-selection;::flags&lt;/structfield&gt;.&lt;/para&gt;</div><div class='add'>+  &lt;/listitem&gt;</div><div class='add'>+  &lt;listitem&gt;</div><div class='add'>+    &lt;para&gt;Adjust width, height, left, and top to hardware limits and alignments.&lt;/para&gt;</div><div class='add'>+  &lt;/listitem&gt;</div><div class='add'>+  &lt;listitem&gt;</div><div class='add'>+    &lt;para&gt;Keep center of adjusted rectangle as close as possible to the original one.&lt;/para&gt;</div><div class='add'>+  &lt;/listitem&gt;</div><div class='add'>+  &lt;listitem&gt;</div><div class='add'>+    &lt;para&gt;Keep width and height as close as possible to original ones.&lt;/para&gt;</div><div class='add'>+  &lt;/listitem&gt;</div><div class='add'>+  &lt;listitem&gt;</div><div class='add'>+    &lt;para&gt;Keep horizontal and vertical offset as close as possible to original ones.&lt;/para&gt;</div><div class='add'>+  &lt;/listitem&gt;</div><div class='add'>+&lt;/orderedlist&gt;</div><div class='add'>+</div><div class='add'>+On success the field &lt;structfield&gt; &amp;v4l2-selection;::r &lt;/structfield&gt; contains</div><div class='add'>+the adjusted rectangle. When the parameters are unsuitable the application may</div><div class='add'>+modify the cropping (composing) or image parameters and repeat the cycle until</div><div class='add'>+satisfactory parameters have been negotiated. If constraints flags have to be</div><div class='add'>+violated at then ERANGE is returned. The error indicates that &lt;emphasis&gt; there</div><div class='add'>+exist no rectangle &lt;/emphasis&gt; that satisfies the constraints.&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+  &lt;/refsect1&gt;</div><div class='add'>+</div><div class='add'>+  &lt;refsect1&gt;</div><div class='add'>+    &lt;table frame="none" pgwide="1" id="v4l2-sel-target"&gt;</div><div class='add'>+      &lt;title&gt;Selection targets.&lt;/title&gt;</div><div class='add'>+      &lt;tgroup cols="3"&gt;</div><div class='add'>+	&amp;cs-def;</div><div class='add'>+	&lt;tbody valign="top"&gt;</div><div class='add'>+	  &lt;row&gt;</div><div class='add'>+            &lt;entry&gt;&lt;constant&gt;V4L2_SEL_TGT_CROP_ACTIVE&lt;/constant&gt;&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;0&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;area that is currently cropped by hardware&lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='add'>+	  &lt;row&gt;</div><div class='add'>+            &lt;entry&gt;&lt;constant&gt;V4L2_SEL_TGT_CROP_DEFAULT&lt;/constant&gt;&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;1&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;suggested cropping rectangle that covers the "whole picture"&lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='add'>+	  &lt;row&gt;</div><div class='add'>+            &lt;entry&gt;&lt;constant&gt;V4L2_SEL_TGT_CROP_BOUNDS&lt;/constant&gt;&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;2&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;limits for the cropping rectangle&lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='add'>+	  &lt;row&gt;</div><div class='add'>+            &lt;entry&gt;&lt;constant&gt;V4L2_SEL_TGT_COMPOSE_ACTIVE&lt;/constant&gt;&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;256&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;area to which data are composed by hardware&lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='add'>+	  &lt;row&gt;</div><div class='add'>+            &lt;entry&gt;&lt;constant&gt;V4L2_SEL_TGT_COMPOSE_DEFAULT&lt;/constant&gt;&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;257&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;suggested composing rectangle that covers the "whole picture"&lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='add'>+	  &lt;row&gt;</div><div class='add'>+            &lt;entry&gt;&lt;constant&gt;V4L2_SEL_TGT_COMPOSE_BOUNDS&lt;/constant&gt;&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;258&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;limits for the composing rectangle&lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='add'>+	  &lt;row&gt;</div><div class='add'>+            &lt;entry&gt;&lt;constant&gt;V4L2_SEL_TGT_COMPOSE_PADDED&lt;/constant&gt;&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;259&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;the active area and all padding pixels that are inserted or modified by the hardware&lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='add'>+	&lt;/tbody&gt;</div><div class='add'>+      &lt;/tgroup&gt;</div><div class='add'>+    &lt;/table&gt;</div><div class='add'>+  &lt;/refsect1&gt;</div><div class='add'>+</div><div class='add'>+  &lt;refsect1&gt;</div><div class='add'>+    &lt;table frame="none" pgwide="1" id="v4l2-sel-flags"&gt;</div><div class='add'>+      &lt;title&gt;Selection constraint flags&lt;/title&gt;</div><div class='add'>+      &lt;tgroup cols="3"&gt;</div><div class='add'>+	&amp;cs-def;</div><div class='add'>+	&lt;tbody valign="top"&gt;</div><div class='add'>+	  &lt;row&gt;</div><div class='add'>+            &lt;entry&gt;&lt;constant&gt;V4L2_SEL_FLAG_GE&lt;/constant&gt;&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;0x00000001&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;indicate that adjusted rectangle must contain a rectangle from &lt;structfield&gt;&amp;v4l2-selection;::r&lt;/structfield&gt;&lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='add'>+	  &lt;row&gt;</div><div class='add'>+            &lt;entry&gt;&lt;constant&gt;V4L2_SEL_FLAG_LE&lt;/constant&gt;&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;0x00000002&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;indicate that adjusted rectangle must be inside a rectangle from &lt;structfield&gt;&amp;v4l2-selection;::r&lt;/structfield&gt;&lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='add'>+	&lt;/tbody&gt;</div><div class='add'>+      &lt;/tgroup&gt;</div><div class='add'>+    &lt;/table&gt;</div><div class='add'>+  &lt;/refsect1&gt;</div><div class='add'>+</div><div class='add'>+    &lt;section&gt;</div><div class='add'>+      &lt;figure id="sel-const-adjust"&gt;</div><div class='add'>+	&lt;title&gt;Size adjustments with constraint flags.&lt;/title&gt;</div><div class='add'>+	&lt;mediaobject&gt;</div><div class='add'>+	  &lt;imageobject&gt;</div><div class='add'>+	    &lt;imagedata fileref="constraints.png" format="PNG" /&gt;</div><div class='add'>+	  &lt;/imageobject&gt;</div><div class='add'>+	  &lt;textobject&gt;</div><div class='add'>+	    &lt;phrase&gt;Behaviour of rectangle adjustment for different constraint</div><div class='add'>+            flags.&lt;/phrase&gt;</div><div class='add'>+	  &lt;/textobject&gt;</div><div class='add'>+	&lt;/mediaobject&gt;</div><div class='add'>+      &lt;/figure&gt;</div><div class='add'>+    &lt;/section&gt;</div><div class='add'>+</div><div class='add'>+  &lt;refsect1&gt;</div><div class='add'>+    &lt;table pgwide="1" frame="none" id="v4l2-selection"&gt;</div><div class='add'>+      &lt;title&gt;struct &lt;structname&gt;v4l2_selection&lt;/structname&gt;&lt;/title&gt;</div><div class='add'>+      &lt;tgroup cols="3"&gt;</div><div class='add'>+	&amp;cs-str;</div><div class='add'>+	&lt;tbody valign="top"&gt;</div><div class='add'>+	  &lt;row&gt;</div><div class='add'>+	    &lt;entry&gt;__u32&lt;/entry&gt;</div><div class='add'>+	    &lt;entry&gt;&lt;structfield&gt;type&lt;/structfield&gt;&lt;/entry&gt;</div><div class='add'>+	    &lt;entry&gt;Type of the buffer (from &amp;v4l2-buf-type;)&lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='add'>+	  &lt;row&gt;</div><div class='add'>+	    &lt;entry&gt;__u32&lt;/entry&gt;</div><div class='add'>+	    &lt;entry&gt;&lt;structfield&gt;target&lt;/structfield&gt;&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;used to select between &lt;link linkend="v4l2-sel-target"&gt; cropping and composing rectangles &lt;/link&gt;&lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='add'>+	  &lt;row&gt;</div><div class='add'>+	    &lt;entry&gt;__u32&lt;/entry&gt;</div><div class='add'>+	    &lt;entry&gt;&lt;structfield&gt;flags&lt;/structfield&gt;&lt;/entry&gt;</div><div class='add'>+            &lt;entry&gt;control over coordinates adjustments, refer to &lt;link linkend="v4l2-sel-flags"&gt;selection flags&lt;/link&gt;&lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='add'>+	  &lt;row&gt;</div><div class='add'>+	    &lt;entry&gt;&amp;v4l2-rect;&lt;/entry&gt;</div><div class='add'>+	    &lt;entry&gt;&lt;structfield&gt;r&lt;/structfield&gt;&lt;/entry&gt;</div><div class='add'>+	    &lt;entry&gt;selection rectangle&lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='add'>+	  &lt;row&gt;</div><div class='add'>+	    &lt;entry&gt;__u32&lt;/entry&gt;</div><div class='add'>+	    &lt;entry&gt;&lt;structfield&gt;reserved[9]&lt;/structfield&gt;&lt;/entry&gt;</div><div class='add'>+	    &lt;entry&gt;Reserved fields for future use&lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='add'>+	&lt;/tbody&gt;</div><div class='add'>+      &lt;/tgroup&gt;</div><div class='add'>+    &lt;/table&gt;</div><div class='add'>+  &lt;/refsect1&gt;</div><div class='add'>+</div><div class='add'>+  &lt;refsect1&gt;</div><div class='add'>+    &amp;return-value;</div><div class='add'>+    &lt;variablelist&gt;</div><div class='add'>+      &lt;varlistentry&gt;</div><div class='add'>+	&lt;term&gt;&lt;errorcode&gt;EINVAL&lt;/errorcode&gt;&lt;/term&gt;</div><div class='add'>+	&lt;listitem&gt;</div><div class='add'>+	  &lt;para&gt;The buffer &lt;structfield&gt; &amp;v4l2-selection;::type &lt;/structfield&gt;</div><div class='add'>+or &lt;structfield&gt; &amp;v4l2-selection;::target &lt;/structfield&gt; is not supported, or</div><div class='add'>+the &lt;structfield&gt; &amp;v4l2-selection;::flags &lt;/structfield&gt; are invalid.&lt;/para&gt;</div><div class='add'>+	&lt;/listitem&gt;</div><div class='add'>+      &lt;/varlistentry&gt;</div><div class='add'>+      &lt;varlistentry&gt;</div><div class='add'>+	&lt;term&gt;&lt;errorcode&gt;ERANGE&lt;/errorcode&gt;&lt;/term&gt;</div><div class='add'>+	&lt;listitem&gt;</div><div class='add'>+	  &lt;para&gt;it is not possible to adjust a rectangle &lt;structfield&gt;</div><div class='add'>+&amp;v4l2-selection;::r &lt;/structfield&gt; that satisfies all contraints from</div><div class='add'>+&lt;structfield&gt; &amp;v4l2-selection;::flags &lt;/structfield&gt;.&lt;/para&gt;</div><div class='add'>+	&lt;/listitem&gt;</div><div class='add'>+      &lt;/varlistentry&gt;</div><div class='add'>+      &lt;varlistentry&gt;</div><div class='add'>+	&lt;term&gt;&lt;errorcode&gt;EBUSY&lt;/errorcode&gt;&lt;/term&gt;</div><div class='add'>+	&lt;listitem&gt;</div><div class='add'>+	  &lt;para&gt;it is not possible to apply change of selection rectangle at the moment.</div><div class='add'>+Usually because streaming is in progress.&lt;/para&gt;</div><div class='add'>+	&lt;/listitem&gt;</div><div class='add'>+      &lt;/varlistentry&gt;</div><div class='add'>+    &lt;/variablelist&gt;</div><div class='add'>+  &lt;/refsect1&gt;</div><div class='add'>+</div><div class='add'>+&lt;/refentry&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-g-std.xml b/Documentation/DocBook/media/v4l/vidioc-g-std.xml<br/>index 37996f25b5d4..99ff1a016220 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-std.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-std.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-std.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-g-std.xml</a></div><div class='hunk'>@@ -88,11 +88,3 @@ standards.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-g-tuner.xml b/Documentation/DocBook/media/v4l/vidioc-g-tuner.xml<br/>index bd98c734c06b..91ec2fb658f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-tuner.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-g-tuner.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-g-tuner.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-g-tuner.xml</a></div><div class='hunk'>@@ -318,6 +318,16 @@ standard.&lt;/para&gt;&lt;!-- FIXME what if PAL+NTSC and Bi but not SAP? --&gt;&lt;/entry&gt;</div><div class='ctx'> 	&lt;entry&gt;RDS capture is supported. This capability is only valid for</div><div class='ctx'> radio tuners.&lt;/entry&gt;</div><div class='ctx'> 	  &lt;/row&gt;</div><div class='add'>+	  &lt;row&gt;</div><div class='add'>+	&lt;entry&gt;&lt;constant&gt;V4L2_TUNER_CAP_RDS_BLOCK_IO&lt;/constant&gt;&lt;/entry&gt;</div><div class='add'>+	&lt;entry&gt;0x0100&lt;/entry&gt;</div><div class='add'>+	&lt;entry&gt;The RDS data is passed as unparsed RDS blocks.&lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='add'>+	  &lt;row&gt;</div><div class='add'>+	&lt;entry&gt;&lt;constant&gt;V4L2_TUNER_CAP_RDS_CONTROLS&lt;/constant&gt;&lt;/entry&gt;</div><div class='add'>+	&lt;entry&gt;0x0200&lt;/entry&gt;</div><div class='add'>+	&lt;entry&gt;The RDS data is parsed by the hardware and set via controls.&lt;/entry&gt;</div><div class='add'>+	  &lt;/row&gt;</div><div class='ctx'> 	&lt;/tbody&gt;</div><div class='ctx'>       &lt;/tgroup&gt;</div><div class='ctx'>     &lt;/table&gt;</div><div class='hunk'>@@ -525,11 +535,3 @@ out of bounds.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-querybuf.xml b/Documentation/DocBook/media/v4l/vidioc-querybuf.xml<br/>index 5c104d42d31c..6e414d7b6df7 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-querybuf.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-querybuf.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-querybuf.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-querybuf.xml</a></div><div class='hunk'>@@ -100,11 +100,3 @@ supported, or the &lt;structfield&gt;index&lt;/structfield&gt; is out of bounds.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-queryctrl.xml b/Documentation/DocBook/media/v4l/vidioc-queryctrl.xml<br/>index 0ac0057a51c4..36660d311b51 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-queryctrl.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-queryctrl.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-queryctrl.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-queryctrl.xml</a></div><div class='hunk'>@@ -443,11 +443,3 @@ or this particular menu item is not supported by the driver.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml b/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml<br/>index c30dcc4232c0..e013da845b11 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml</a></div><div class='hunk'>@@ -125,11 +125,3 @@ wrong.&lt;/para&gt;</div><div class='ctx'>     &lt;/variablelist&gt;</div><div class='ctx'>   &lt;/refsect1&gt;</div><div class='ctx'> &lt;/refentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local Variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: "v4l2.sgml"</div><div class='del'>-indent-tabs-mode: nil</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/Documentation/DocBook/writing-an-alsa-driver.tmpl b/Documentation/DocBook/writing-an-alsa-driver.tmpl<br/>index 5de23c007078..cab4ec58e46e 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/writing-an-alsa-driver.tmpl?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/DocBook/writing-an-alsa-driver.tmpl</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/writing-an-alsa-driver.tmpl?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/DocBook/writing-an-alsa-driver.tmpl</a></div><div class='hunk'>@@ -404,7 +404,7 @@</div><div class='ctx'>   /* SNDRV_CARDS: maximum number of cards supported by this module */</div><div class='ctx'>   static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='ctx'>   static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-  static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+  static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='ctx'> </div><div class='ctx'>   /* definition of the chip-specific record */</div><div class='ctx'>   struct mychip {</div><div class='head'>diff --git a/Documentation/HOWTO b/Documentation/HOWTO<br/>index 81bc1a9ab9d8..f7ade3b3b40d 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/HOWTO?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/HOWTO</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/HOWTO?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/HOWTO</a></div><div class='hunk'>@@ -275,8 +275,8 @@ versions.</div><div class='ctx'> If no 2.6.x.y kernel is available, then the highest numbered 2.6.x</div><div class='ctx'> kernel is the current stable kernel.</div><div class='ctx'> </div><div class='del'>-2.6.x.y are maintained by the "stable" team &lt;stable@kernel.org&gt;, and are</div><div class='del'>-released as needs dictate.  The normal release period is approximately </div><div class='add'>+2.6.x.y are maintained by the "stable" team &lt;stable@vger.kernel.org&gt;, and</div><div class='add'>+are released as needs dictate.  The normal release period is approximately</div><div class='ctx'> two weeks, but it can be longer if there are no pressing problems.  A</div><div class='ctx'> security-related problem, instead, can cause a release to happen almost</div><div class='ctx'> instantly.</div><div class='head'>diff --git a/Documentation/acpi/apei/einj.txt b/Documentation/acpi/apei/einj.txt<br/>index 5cc699ba5453..e7cc36397217 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/acpi/apei/einj.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/acpi/apei/einj.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/acpi/apei/einj.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/acpi/apei/einj.txt</a></div><div class='hunk'>@@ -47,20 +47,53 @@ directory apei/einj. The following files are provided.</div><div class='ctx'> </div><div class='ctx'> - param1</div><div class='ctx'>   This file is used to set the first error parameter value. Effect of</div><div class='del'>-  parameter depends on error_type specified. For memory error, this is</div><div class='del'>-  physical memory address.  Only available if param_extension module</div><div class='del'>-  parameter is specified.</div><div class='add'>+  parameter depends on error_type specified.</div><div class='ctx'> </div><div class='ctx'> - param2</div><div class='ctx'>   This file is used to set the second error parameter value. Effect of</div><div class='del'>-  parameter depends on error_type specified. For memory error, this is</div><div class='del'>-  physical memory address mask.  Only available if param_extension</div><div class='del'>-  module parameter is specified.</div><div class='add'>+  parameter depends on error_type specified.</div><div class='add'>+</div><div class='add'>+BIOS versions based in the ACPI 4.0 specification have limited options</div><div class='add'>+to control where the errors are injected.  Your BIOS may support an</div><div class='add'>+extension (enabled with the param_extension=1 module parameter, or</div><div class='add'>+boot command line einj.param_extension=1). This allows the address</div><div class='add'>+and mask for memory injections to be specified by the param1 and</div><div class='add'>+param2 files in apei/einj.</div><div class='add'>+</div><div class='add'>+BIOS versions using the ACPI 5.0 specification have more control over</div><div class='add'>+the target of the injection. For processor related errors (type 0x1,</div><div class='add'>+0x2 and 0x4) the APICID of the target should be provided using the</div><div class='add'>+param1 file in apei/einj. For memory errors (type 0x8, 0x10 and 0x20)</div><div class='add'>+the address is set using param1 with a mask in param2 (0x0 is equivalent</div><div class='add'>+to all ones). For PCI express errors (type 0x40, 0x80 and 0x100) the</div><div class='add'>+segment, bus, device and function are specified using param1:</div><div class='add'>+</div><div class='add'>+         31     24 23    16 15    11 10      8  7        0</div><div class='add'>+	+-------------------------------------------------+</div><div class='add'>+	| segment |   bus  | device | function | reserved |</div><div class='add'>+	+-------------------------------------------------+</div><div class='add'>+</div><div class='add'>+An ACPI 5.0 BIOS may also allow vendor specific errors to be injected.</div><div class='add'>+In this case a file named vendor will contain identifying information</div><div class='add'>+from the BIOS that hopefully will allow an application wishing to use</div><div class='add'>+the vendor specific extension to tell that they are running on a BIOS</div><div class='add'>+that supports it. All vendor extensions have the 0x80000000 bit set in</div><div class='add'>+error_type. A file vendor_flags controls the interpretation of param1</div><div class='add'>+and param2 (1 = PROCESSOR, 2 = MEMORY, 4 = PCI). See your BIOS vendor</div><div class='add'>+documentation for details (and expect changes to this API if vendors</div><div class='add'>+creativity in using this feature expands beyond our expectations).</div><div class='add'>+</div><div class='add'>+Example:</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 0xfffffffffffff000 &gt; param2	# Mask - 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'>-Injecting parameter support is a BIOS version specific extension, that</div><div class='del'>-is, it only works on some BIOS version.  If you want to use it, please</div><div class='del'>-make sure your BIOS version has the proper support and specify</div><div class='del'>-"param_extension=y" in module parameter.</div><div class='ctx'> </div><div class='ctx'> For more information about EINJ, please refer to ACPI specification</div><div class='del'>-version 4.0, section 17.5.</div><div class='add'>+version 4.0, section 17.5 and ACPI 5.0, section 18.6.</div><div class='head'>diff --git a/Documentation/arm/memory.txt b/Documentation/arm/memory.txt<br/>index 771d48d3b335..208a2d465b92 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/arm/memory.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/arm/memory.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/arm/memory.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/arm/memory.txt</a></div><div class='hunk'>@@ -51,15 +51,14 @@ ffc00000	ffefffff	DMA memory mapping region.  Memory returned</div><div class='ctx'> ff000000	ffbfffff	Reserved for future expansion of DMA</div><div class='ctx'> 				mapping region.</div><div class='ctx'> </div><div class='del'>-VMALLOC_END	feffffff	Free for platform use, recommended.</div><div class='del'>-				VMALLOC_END must be aligned to a 2MB</div><div class='del'>-				boundary.</div><div class='del'>-</div><div class='ctx'> VMALLOC_START	VMALLOC_END-1	vmalloc() / ioremap() space.</div><div class='ctx'> 				Memory returned by vmalloc/ioremap will</div><div class='ctx'> 				be dynamically placed in this region.</div><div class='del'>-				VMALLOC_START may be based upon the value</div><div class='del'>-				of the high_memory variable.</div><div class='add'>+				Machine specific static mappings are also</div><div class='add'>+				located here through iotable_init().</div><div class='add'>+				VMALLOC_START is based upon the value</div><div class='add'>+				of the high_memory variable, and VMALLOC_END</div><div class='add'>+				is equal to 0xff000000.</div><div class='ctx'> </div><div class='ctx'> PAGE_OFFSET	high_memory-1	Kernel direct-mapped RAM region.</div><div class='ctx'> 				This maps the platforms RAM, and typically</div><div class='head'>diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt<br/>index 9c452ef2328c..a7c96ae5557c 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/cgroups/cgroups.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/cgroups/cgroups.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/cgroups/cgroups.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/cgroups/cgroups.txt</a></div><div class='hunk'>@@ -594,53 +594,44 @@ rmdir() will fail with it. From this behavior, pre_destroy() can be</div><div class='ctx'> called multiple times against a cgroup.</div><div class='ctx'> </div><div class='ctx'> int can_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,</div><div class='del'>-	       struct task_struct *task)</div><div class='add'>+	       struct cgroup_taskset *tset)</div><div class='ctx'> (cgroup_mutex held by caller)</div><div class='ctx'> </div><div class='del'>-Called prior to moving a task into a cgroup; if the subsystem</div><div class='del'>-returns an error, this will abort the attach operation.  If a NULL</div><div class='del'>-task is passed, then a successful result indicates that *any*</div><div class='del'>-unspecified task can be moved into the cgroup. Note that this isn't</div><div class='del'>-called on a fork. If this method returns 0 (success) then this should</div><div class='del'>-remain valid while the caller holds cgroup_mutex and it is ensured that either</div><div class='add'>+Called prior to moving one or more tasks into a cgroup; if the</div><div class='add'>+subsystem returns an error, this will abort the attach operation.</div><div class='add'>+@tset contains the tasks to be attached and is guaranteed to have at</div><div class='add'>+least one task in it.</div><div class='add'>+</div><div class='add'>+If there are multiple tasks in the taskset, then:</div><div class='add'>+  - it's guaranteed that all are from the same thread group</div><div class='add'>+  - @tset contains all tasks from the thread group whether or not</div><div class='add'>+    they're switching cgroups</div><div class='add'>+  - the first task is the leader</div><div class='add'>+</div><div class='add'>+Each @tset entry also contains the task's old cgroup and tasks which</div><div class='add'>+aren't switching cgroup can be skipped easily using the</div><div class='add'>+cgroup_taskset_for_each() iterator. Note that this isn't called on a</div><div class='add'>+fork. If this method returns 0 (success) then this should remain valid</div><div class='add'>+while the caller holds cgroup_mutex and it is ensured that either</div><div class='ctx'> attach() or cancel_attach() will be called in future.</div><div class='ctx'> </div><div class='del'>-int can_attach_task(struct cgroup *cgrp, struct task_struct *tsk);</div><div class='del'>-(cgroup_mutex held by caller)</div><div class='del'>-</div><div class='del'>-As can_attach, but for operations that must be run once per task to be</div><div class='del'>-attached (possibly many when using cgroup_attach_proc). Called after</div><div class='del'>-can_attach.</div><div class='del'>-</div><div class='ctx'> void cancel_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,</div><div class='del'>-	       struct task_struct *task, bool threadgroup)</div><div class='add'>+		   struct cgroup_taskset *tset)</div><div class='ctx'> (cgroup_mutex held by caller)</div><div class='ctx'> </div><div class='ctx'> Called when a task attach operation has failed after can_attach() has succeeded.</div><div class='ctx'> A subsystem whose can_attach() has some side-effects should provide this</div><div class='ctx'> function, so that the subsystem can implement a rollback. If not, not necessary.</div><div class='ctx'> This will be called only about subsystems whose can_attach() operation have</div><div class='del'>-succeeded.</div><div class='del'>-</div><div class='del'>-void pre_attach(struct cgroup *cgrp);</div><div class='del'>-(cgroup_mutex held by caller)</div><div class='del'>-</div><div class='del'>-For any non-per-thread attachment work that needs to happen before</div><div class='del'>-attach_task. Needed by cpuset.</div><div class='add'>+succeeded. The parameters are identical to can_attach().</div><div class='ctx'> </div><div class='ctx'> void attach(struct cgroup_subsys *ss, struct cgroup *cgrp,</div><div class='del'>-	    struct cgroup *old_cgrp, struct task_struct *task)</div><div class='add'>+	    struct cgroup_taskset *tset)</div><div class='ctx'> (cgroup_mutex held by caller)</div><div class='ctx'> </div><div class='ctx'> Called after the task has been attached to the cgroup, to allow any</div><div class='ctx'> post-attachment activity that requires memory allocations or blocking.</div><div class='del'>-</div><div class='del'>-void attach_task(struct cgroup *cgrp, struct task_struct *tsk);</div><div class='del'>-(cgroup_mutex held by caller)</div><div class='del'>-</div><div class='del'>-As attach, but for operations that must be run once per task to be attached,</div><div class='del'>-like can_attach_task. Called before attach. Currently does not support any</div><div class='del'>-subsystem that might need the old_cgrp for every thread in the group.</div><div class='add'>+The parameters are identical to can_attach().</div><div class='ctx'> </div><div class='ctx'> void fork(struct cgroup_subsy *ss, struct task_struct *task)</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt<br/>index cc0ebc5241b3..4c95c0034a4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/cgroups/memory.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/cgroups/memory.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/cgroups/memory.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/cgroups/memory.txt</a></div><div class='hunk'>@@ -44,8 +44,8 @@ Features:</div><div class='ctx'>  - oom-killer disable knob and oom-notifier</div><div class='ctx'>  - Root cgroup has no limit controls.</div><div class='ctx'> </div><div class='del'>- Kernel memory and Hugepages are not under control yet. We just manage</div><div class='del'>- pages on LRU. To add more controls, we have to take care of performance.</div><div class='add'>+ Kernel memory support is work in progress, and the current version provides</div><div class='add'>+ basically functionality. (See Section 2.7)</div><div class='ctx'> </div><div class='ctx'> Brief summary of control files.</div><div class='ctx'> </div><div class='hunk'>@@ -61,7 +61,7 @@ Brief summary of control files.</div><div class='ctx'>  memory.failcnt			 # show the number of memory usage hits limits</div><div class='ctx'>  memory.memsw.failcnt		 # show the number of memory+Swap hits limits</div><div class='ctx'>  memory.max_usage_in_bytes	 # show max memory usage recorded</div><div class='del'>- memory.memsw.usage_in_bytes	 # show max memory+Swap usage recorded</div><div class='add'>+ memory.memsw.max_usage_in_bytes # show max memory+Swap usage recorded</div><div class='ctx'>  memory.soft_limit_in_bytes	 # set/show soft limit of memory usage</div><div class='ctx'>  memory.stat			 # show various statistics</div><div class='ctx'>  memory.use_hierarchy		 # set/show hierarchical account enabled</div><div class='hunk'>@@ -72,6 +72,9 @@ Brief summary of control files.</div><div class='ctx'>  memory.oom_control		 # set/show oom controls.</div><div class='ctx'>  memory.numa_stat		 # show the number of memory usage per numa node</div><div class='ctx'> </div><div class='add'>+ memory.kmem.tcp.limit_in_bytes  # set/show hard limit for tcp buf memory</div><div class='add'>+ memory.kmem.tcp.usage_in_bytes  # show current tcp buf memory allocation</div><div class='add'>+</div><div class='ctx'> 1. History</div><div class='ctx'> </div><div class='ctx'> The memory controller has a long history. A request for comments for the memory</div><div class='hunk'>@@ -255,6 +258,27 @@ When oom event notifier is registered, event will be delivered.</div><div class='ctx'>   per-zone-per-cgroup LRU (cgroup's private LRU) is just guarded by</div><div class='ctx'>   zone-&gt;lru_lock, it has no lock of its own.</div><div class='ctx'> </div><div class='add'>+2.7 Kernel Memory Extension (CONFIG_CGROUP_MEM_RES_CTLR_KMEM)</div><div class='add'>+</div><div class='add'>+With the Kernel memory extension, the Memory Controller is able to limit</div><div class='add'>+the amount of kernel memory used by the system. Kernel memory is fundamentally</div><div class='add'>+different than user memory, since it can't be swapped out, which makes it</div><div class='add'>+possible to DoS the system by consuming too much of this precious resource.</div><div class='add'>+</div><div class='add'>+Kernel memory limits are not imposed for the root cgroup. Usage for the root</div><div class='add'>+cgroup may or may not be accounted.</div><div class='add'>+</div><div class='add'>+Currently no soft limit is implemented for kernel memory. It is future work</div><div class='add'>+to trigger slab reclaim when those limits are reached.</div><div class='add'>+</div><div class='add'>+2.7.1 Current Kernel Memory resources accounted</div><div class='add'>+</div><div class='add'>+* sockets memory pressure: some sockets protocols have memory pressure</div><div class='add'>+thresholds. The Memory Controller allows them to be controlled individually</div><div class='add'>+per cgroup, instead of globally.</div><div class='add'>+</div><div class='add'>+* tcp memory pressure: sockets memory pressure for the tcp protocol.</div><div class='add'>+</div><div class='ctx'> 3. User Interface</div><div class='ctx'> </div><div class='ctx'> 0. Configuration</div><div class='hunk'>@@ -386,8 +410,11 @@ memory.stat file includes following statistics</div><div class='ctx'> cache		- # of bytes of page cache memory.</div><div class='ctx'> rss		- # of bytes of anonymous and swap cache memory.</div><div class='ctx'> mapped_file	- # of bytes of mapped file (includes tmpfs/shmem)</div><div class='del'>-pgpgin		- # of pages paged in (equivalent to # of charging events).</div><div class='del'>-pgpgout		- # of pages paged out (equivalent to # of uncharging events).</div><div class='add'>+pgpgin		- # of charging events to the memory cgroup. The charging</div><div class='add'>+		event happens each time a page is accounted as either mapped</div><div class='add'>+		anon page(RSS) or cache page(Page Cache) to the cgroup.</div><div class='add'>+pgpgout		- # of uncharging events to the memory cgroup. The uncharging</div><div class='add'>+		event happens each time a page is unaccounted from the cgroup.</div><div class='ctx'> swap		- # of bytes of swap usage</div><div class='ctx'> inactive_anon	- # of bytes of anonymous memory and swap cache memory on</div><div class='ctx'> 		LRU list.</div><div class='head'>diff --git a/Documentation/cgroups/net_prio.txt b/Documentation/cgroups/net_prio.txt<br/>new file mode 100644<br/>index 000000000000..01b322635591<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/cgroups/net_prio.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/cgroups/net_prio.txt</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+Network priority cgroup</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+The Network priority cgroup provides an interface to allow an administrator to</div><div class='add'>+dynamically set the priority of network traffic generated by various</div><div class='add'>+applications</div><div class='add'>+</div><div class='add'>+Nominally, an application would set the priority of its traffic via the</div><div class='add'>+SO_PRIORITY socket option.  This however, is not always possible because:</div><div class='add'>+</div><div class='add'>+1) The application may not have been coded to set this value</div><div class='add'>+2) The priority of application traffic is often a site-specific administrative</div><div class='add'>+   decision rather than an application defined one.</div><div class='add'>+</div><div class='add'>+This cgroup allows an administrator to assign a process to a group which defines</div><div class='add'>+the priority of egress traffic on a given interface. Network priority groups can</div><div class='add'>+be created by first mounting the cgroup filesystem.</div><div class='add'>+</div><div class='add'>+# mount -t cgroup -onet_prio none /sys/fs/cgroup/net_prio</div><div class='add'>+</div><div class='add'>+With the above step, the initial group acting as the parent accounting group</div><div class='add'>+becomes visible at '/sys/fs/cgroup/net_prio'.  This group includes all tasks in</div><div class='add'>+the system. '/sys/fs/cgroup/net_prio/tasks' lists the tasks in this cgroup.</div><div class='add'>+</div><div class='add'>+Each net_prio cgroup contains two files that are subsystem specific</div><div class='add'>+</div><div class='add'>+net_prio.prioidx</div><div class='add'>+This file is read-only, and is simply informative.  It contains a unique integer</div><div class='add'>+value that the kernel uses as an internal representation of this cgroup.</div><div class='add'>+</div><div class='add'>+net_prio.ifpriomap</div><div class='add'>+This file contains a map of the priorities assigned to traffic originating from</div><div class='add'>+processes in this group and egressing the system on various interfaces. It</div><div class='add'>+contains a list of tuples in the form &lt;ifname priority&gt;.  Contents of this file</div><div class='add'>+can be modified by echoing a string into the file using the same tuple format.</div><div class='add'>+for example:</div><div class='add'>+</div><div class='add'>+echo "eth0 5" &gt; /sys/fs/cgroups/net_prio/iscsi/net_prio.ifpriomap</div><div class='add'>+</div><div class='add'>+This command would force any traffic originating from processes belonging to the</div><div class='add'>+iscsi net_prio cgroup and egressing on interface eth0 to have the priority of</div><div class='add'>+said traffic set to the value 5. The parent accounting group also has a</div><div class='add'>+writeable 'net_prio.ifpriomap' file that can be used to set a system default</div><div class='add'>+priority.</div><div class='add'>+</div><div class='add'>+Priorities are set immediately prior to queueing a frame to the device</div><div class='add'>+queueing discipline (qdisc) so priorities will be assigned prior to the hardware</div><div class='add'>+queue selection being made.</div><div class='add'>+</div><div class='add'>+One usage for the net_prio cgroup is with mqprio qdisc allowing application</div><div class='add'>+traffic to be steered to hardware/driver based traffic classes. These mappings</div><div class='add'>+can then be managed by administrators or other networking protocols such as</div><div class='add'>+DCBX.</div><div class='head'>diff --git a/Documentation/coccinelle.txt b/Documentation/coccinelle.txt<br/>index 96b690348ba1..cf44eb6499b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/coccinelle.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/coccinelle.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/coccinelle.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/coccinelle.txt</a></div><div class='hunk'>@@ -102,9 +102,15 @@ or</div><div class='ctx'> 	make coccicheck COCCI=&lt;my_SP.cocci&gt; MODE=report</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>- Using Coccinelle on (modified) files</div><div class='del'>-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+ Controlling Which Files are Processed by Coccinelle</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+By default the entire kernel source tree is checked.</div><div class='add'>+</div><div class='add'>+To apply Coccinelle to a specific directory, M= can be used.</div><div class='add'>+For example, to check drivers/net/wireless/ one may write:</div><div class='ctx'> </div><div class='add'>+    make coccicheck M=drivers/net/wireless/</div><div class='add'>+    </div><div class='ctx'> To apply Coccinelle on a file basis, instead of a directory basis, the</div><div class='ctx'> following command may be used:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/cpu-freq/governors.txt b/Documentation/cpu-freq/governors.txt<br/>index d221781dabaa..c7a2eb8450c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/cpu-freq/governors.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/cpu-freq/governors.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/cpu-freq/governors.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/cpu-freq/governors.txt</a></div><div class='hunk'>@@ -127,7 +127,7 @@ in the bash (as said, 1000 is default), do:</div><div class='ctx'> echo `$(($(cat cpuinfo_transition_latency) * 750 / 1000)) \</div><div class='ctx'>     &gt;ondemand/sampling_rate</div><div class='ctx'> </div><div class='del'>-show_sampling_rate_min:</div><div class='add'>+sampling_rate_min:</div><div class='ctx'> The sampling rate is limited by the HW transition latency:</div><div class='ctx'> transition_latency * 100</div><div class='ctx'> Or by kernel restrictions:</div><div class='hunk'>@@ -140,8 +140,6 @@ HZ=100:  min=200000us (200ms)</div><div class='ctx'> The highest value of kernel and HW latency restrictions is shown and</div><div class='ctx'> used as the minimum sampling rate.</div><div class='ctx'> </div><div class='del'>-show_sampling_rate_max: THIS INTERFACE IS DEPRECATED, DON'T USE IT.</div><div class='del'>-</div><div class='ctx'> up_threshold: defines what the average CPU usage between the samplings</div><div class='ctx'> of 'sampling_rate' needs to be for the kernel to make a decision on</div><div class='ctx'> whether it should increase the frequency.  For example when it is set</div><div class='head'>diff --git a/Documentation/development-process/5.Posting b/Documentation/development-process/5.Posting<br/>index 903a2546f138..8a48c9b62864 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/development-process/5.Posting?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/development-process/5.Posting</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/development-process/5.Posting?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/development-process/5.Posting</a></div><div class='hunk'>@@ -271,10 +271,10 @@ copies should go to:</div><div class='ctx'>    the linux-kernel list.</div><div class='ctx'> </div><div class='ctx'>  - If you are fixing a bug, think about whether the fix should go into the</div><div class='del'>-   next stable update.  If so, stable@kernel.org should get a copy of the</div><div class='del'>-   patch.  Also add a "Cc: stable@kernel.org" to the tags within the patch</div><div class='del'>-   itself; that will cause the stable team to get a notification when your</div><div class='del'>-   fix goes into the mainline.</div><div class='add'>+   next stable update.  If so, stable@vger.kernel.org should get a copy of</div><div class='add'>+   the patch.  Also add a "Cc: stable@vger.kernel.org" to the tags within</div><div class='add'>+   the patch itself; that will cause the stable team to get a notification</div><div class='add'>+   when your fix goes into the mainline.</div><div class='ctx'> </div><div class='ctx'> When selecting recipients for a patch, it is good to have an idea of who</div><div class='ctx'> you think will eventually accept the patch and get it merged.  While it</div><div class='head'>diff --git a/Documentation/devices.txt b/Documentation/devices.txt<br/>index eccffe715229..00383186d8fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/devices.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devices.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devices.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devices.txt</a></div><div class='hunk'>@@ -379,7 +379,7 @@ Your cooperation is appreciated.</div><div class='ctx'> 		162 = /dev/smbus	System Management Bus</div><div class='ctx'> 		163 = /dev/lik		Logitech Internet Keyboard</div><div class='ctx'> 		164 = /dev/ipmo		Intel Intelligent Platform Management</div><div class='del'>-		165 = /dev/vmmon	VMWare virtual machine monitor</div><div class='add'>+		165 = /dev/vmmon	VMware virtual machine monitor</div><div class='ctx'> 		166 = /dev/i2o/ctl	I2O configuration manager</div><div class='ctx'> 		167 = /dev/specialix_sxctl Specialix serial control</div><div class='ctx'> 		168 = /dev/tcldrv	Technology Concepts serial control</div><div class='hunk'>@@ -447,6 +447,9 @@ Your cooperation is appreciated.</div><div class='ctx'> 		234 = /dev/btrfs-control	Btrfs control device</div><div class='ctx'> 		235 = /dev/autofs	Autofs control device</div><div class='ctx'> 		236 = /dev/mapper/control	Device-Mapper control device</div><div class='add'>+		237 = /dev/loop-control Loopback control device</div><div class='add'>+		238 = /dev/vhost-net	Host kernel accelerator for virtio net</div><div class='add'>+</div><div class='ctx'> 		240-254			Reserved for local use</div><div class='ctx'> 		255			Reserved for MISC_DYNAMIC_MINOR</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt<br/>index c9848ad0e2e3..54bdddadf1cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/arm/fsl.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/arm/fsl.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/arm/fsl.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/arm/fsl.txt</a></div><div class='hunk'>@@ -21,6 +21,10 @@ i.MX53 Smart Mobile Reference Design Board</div><div class='ctx'> Required root node properties:</div><div class='ctx'>     - compatible = "fsl,imx53-smd", "fsl,imx53";</div><div class='ctx'> </div><div class='del'>-i.MX6 Quad SABRE Automotive Board</div><div class='add'>+i.MX6 Quad Armadillo2 Board</div><div class='ctx'> Required root node properties:</div><div class='del'>-    - compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";</div><div class='add'>+    - compatible = "fsl,imx6q-arm2", "fsl,imx6q";</div><div class='add'>+</div><div class='add'>+i.MX6 Quad SABRE Lite Board</div><div class='add'>+Required root node properties:</div><div class='add'>+    - compatible = "fsl,imx6q-sabrelite", "fsl,imx6q";</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/gic.txt b/Documentation/devicetree/bindings/arm/gic.txt<br/>index 52916b4aa1fe..9b4b82a721b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/arm/gic.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/arm/gic.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/arm/gic.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/arm/gic.txt</a></div><div class='hunk'>@@ -42,6 +42,10 @@ Optional</div><div class='ctx'> - interrupts	: Interrupt source of the parent interrupt controller. Only</div><div class='ctx'>   present on secondary GICs.</div><div class='ctx'> </div><div class='add'>+- cpu-offset	: per-cpu offset within the distributor and cpu interface</div><div class='add'>+  regions, used when the GIC doesn't have banked registers. The offset is</div><div class='add'>+  cpu-offset * cpu-nr.</div><div class='add'>+</div><div class='ctx'> Example:</div><div class='ctx'> </div><div class='ctx'> 	intc: interrupt-controller@fff11000 {</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/insignal-boards.txt b/Documentation/devicetree/bindings/arm/insignal-boards.txt<br/>new file mode 100644<br/>index 000000000000..524c3dc5d808<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/arm/insignal-boards.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/arm/insignal-boards.txt</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+* Insignal's Exynos4210 based Origen evaluation board</div><div class='add'>+</div><div class='add'>+Origen low-cost evaluation board is based on Samsung's Exynos4210 SoC.</div><div class='add'>+</div><div class='add'>+Required root node properties:</div><div class='add'>+    - compatible = should be one or more of the following.</div><div class='add'>+        (a) "samsung,smdkv310" - for Samsung's SMDKV310 eval board.</div><div class='add'>+        (b) "samsung,exynos4210"  - for boards based on Exynos4210 SoC.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/samsung-boards.txt b/Documentation/devicetree/bindings/arm/samsung-boards.txt<br/>new file mode 100644<br/>index 000000000000..0bf68be56fd1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/arm/samsung-boards.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/arm/samsung-boards.txt</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+* Samsung's Exynos4210 based SMDKV310 evaluation board</div><div class='add'>+</div><div class='add'>+SMDKV310 evaluation board is based on Samsung's Exynos4210 SoC.</div><div class='add'>+</div><div class='add'>+Required root node properties:</div><div class='add'>+    - compatible = should be one or more of the following.</div><div class='add'>+        (a) "samsung,smdkv310" - for Samsung's SMDKV310 eval board.</div><div class='add'>+        (b) "samsung,exynos4210"  - for boards based on Exynos4210 SoC.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/tegra.txt b/Documentation/devicetree/bindings/arm/tegra.txt<br/>new file mode 100644<br/>index 000000000000..6e69d2e5e766<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/arm/tegra.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/arm/tegra.txt</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+NVIDIA Tegra device tree bindings</div><div class='add'>+-------------------------------------------</div><div class='add'>+</div><div class='add'>+Boards with the tegra20 SoC shall have the following properties:</div><div class='add'>+</div><div class='add'>+Required root node property:</div><div class='add'>+</div><div class='add'>+compatible = "nvidia,tegra20";</div><div class='add'>+</div><div class='add'>+Boards with the tegra30 SoC shall have the following properties:</div><div class='add'>+</div><div class='add'>+Required root node property:</div><div class='add'>+</div><div class='add'>+compatible = "nvidia,tegra30";</div><div class='head'>diff --git a/Documentation/devicetree/bindings/arm/vic.txt b/Documentation/devicetree/bindings/arm/vic.txt<br/>new file mode 100644<br/>index 000000000000..266716b23437<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/arm/vic.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/arm/vic.txt</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+* ARM Vectored Interrupt Controller</div><div class='add'>+</div><div class='add'>+One or more Vectored Interrupt Controllers (VIC's) can be connected in an ARM</div><div class='add'>+system for interrupt routing.  For multiple controllers they can either be</div><div class='add'>+nested or have the outputs wire-OR'd together.</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'>+	"arm,pl190-vic"</div><div class='add'>+	"arm,pl192-vic"</div><div class='add'>+- interrupt-controller : Identifies the node as an interrupt controller</div><div class='add'>+- #interrupt-cells : The number of cells to define the interrupts.  Must be 1 as</div><div class='add'>+  the VIC has no configuration options for interrupt sources.  The cell is a u32</div><div class='add'>+  and defines the interrupt number.</div><div class='add'>+- reg : The register bank for the VIC.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+- interrupts : Interrupt source for parent controllers if the VIC is nested.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	vic0: interrupt-controller@60000 {</div><div class='add'>+		compatible = "arm,pl192-vic";</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0x60000 0x1000&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/c6x/clocks.txt b/Documentation/devicetree/bindings/c6x/clocks.txt<br/>new file mode 100644<br/>index 000000000000..a04f5fd30122<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/c6x/clocks.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/c6x/clocks.txt</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+C6X PLL Clock Controllers</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+This is a first-cut support for the SoC clock controllers. This is still</div><div class='add'>+under development and will probably change as the common device tree</div><div class='add'>+clock support is added to the kernel.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible: "ti,c64x+pll"</div><div class='add'>+    May also have SoC-specific value to support SoC-specific initialization</div><div class='add'>+    in the driver. One of:</div><div class='add'>+        "ti,c6455-pll"</div><div class='add'>+        "ti,c6457-pll"</div><div class='add'>+        "ti,c6472-pll"</div><div class='add'>+        "ti,c6474-pll"</div><div class='add'>+</div><div class='add'>+- reg: base address and size of register area</div><div class='add'>+- clock-frequency: input clock frequency in hz</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+- ti,c64x+pll-bypass-delay: CPU cycles to delay when entering bypass mode</div><div class='add'>+</div><div class='add'>+- ti,c64x+pll-reset-delay:  CPU cycles to delay after PLL reset</div><div class='add'>+</div><div class='add'>+- ti,c64x+pll-lock-delay:   CPU cycles to delay after PLL frequency change</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	clock-controller@29a0000 {</div><div class='add'>+		compatible = "ti,c6472-pll", "ti,c64x+pll";</div><div class='add'>+		reg = &lt;0x029a0000 0x200&gt;;</div><div class='add'>+		clock-frequency = &lt;25000000&gt;;</div><div class='add'>+</div><div class='add'>+		ti,c64x+pll-bypass-delay = &lt;200&gt;;</div><div class='add'>+		ti,c64x+pll-reset-delay = &lt;12000&gt;;</div><div class='add'>+		ti,c64x+pll-lock-delay = &lt;80000&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/c6x/dscr.txt b/Documentation/devicetree/bindings/c6x/dscr.txt<br/>new file mode 100644<br/>index 000000000000..d847758f2b20<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/c6x/dscr.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/c6x/dscr.txt</a></div><div class='hunk'>@@ -0,0 +1,127 @@</div><div class='add'>+Device State Configuration Registers</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+TI C6X SoCs contain a region of miscellaneous registers which provide various</div><div class='add'>+function for SoC control or status. Details vary considerably among from SoC</div><div class='add'>+to SoC with no two being alike.</div><div class='add'>+</div><div class='add'>+In general, the Device State Configuraion Registers (DSCR) will provide one or</div><div class='add'>+more configuration registers often protected by a lock register where one or</div><div class='add'>+more key values must be written to a lock register in order to unlock the</div><div class='add'>+configuration register for writes. These configuration register may be used to</div><div class='add'>+enable (and disable in some cases) SoC pin drivers, select peripheral clock</div><div class='add'>+sources (internal or pin), etc. In some cases, a configuration register is</div><div class='add'>+write once or the individual bits are write once. In addition to device config,</div><div class='add'>+the DSCR block may provide registers which which are used to reset peripherals,</div><div class='add'>+provide device ID information, provide ethernet MAC addresses, as well as other</div><div class='add'>+miscellaneous functions.</div><div class='add'>+</div><div class='add'>+For device state control (enable/disable), each device control is assigned an</div><div class='add'>+id which is used by individual device drivers to control the state as needed.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible: must be "ti,c64x+dscr"</div><div class='add'>+- reg: register area base and size</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+  NOTE: These are optional in that not all SoCs will have all properties. For</div><div class='add'>+        SoCs which do support a given property, leaving the property out of the</div><div class='add'>+        device tree will result in reduced functionality or possibly driver</div><div class='add'>+        failure.</div><div class='add'>+</div><div class='add'>+- ti,dscr-devstat</div><div class='add'>+    offset of the devstat register</div><div class='add'>+</div><div class='add'>+- ti,dscr-silicon-rev</div><div class='add'>+    offset, start bit, and bitsize of silicon revision field</div><div class='add'>+</div><div class='add'>+- ti,dscr-rmii-resets</div><div class='add'>+    offset and bitmask of RMII reset field. May have multiple tuples if more</div><div class='add'>+    than one ethernet port is available.</div><div class='add'>+</div><div class='add'>+- ti,dscr-locked-regs</div><div class='add'>+    possibly multiple tuples describing registers which are write protected by</div><div class='add'>+    a lock register. Each tuple consists of the register offset, lock register</div><div class='add'>+    offsset, and the key value used to unlock the register.</div><div class='add'>+</div><div class='add'>+- ti,dscr-kick-regs</div><div class='add'>+    offset and key values of two "kick" registers used to write protect other</div><div class='add'>+    registers in DSCR. On SoCs using kick registers, the first key must be</div><div class='add'>+    written to the first kick register and the second key must be written to</div><div class='add'>+    the second register before other registers in the area are write-enabled.</div><div class='add'>+</div><div class='add'>+- ti,dscr-mac-fuse-regs</div><div class='add'>+    MAC addresses are contained in two registers. Each element of a MAC address</div><div class='add'>+    is contained in a single byte. This property has two tuples. Each tuple has</div><div class='add'>+    a register offset and four cells representing bytes in the register from</div><div class='add'>+    most significant to least. The value of these four cells is the MAC byte</div><div class='add'>+    index (1-6) of the byte within the register. A value of 0 means the byte</div><div class='add'>+    is unused in the MAC address.</div><div class='add'>+</div><div class='add'>+- ti,dscr-devstate-ctl-regs</div><div class='add'>+    This property describes the bitfields used to control the state of devices.</div><div class='add'>+    Each tuple describes a range of identical bitfields used to control one or</div><div class='add'>+    more devices (one bitfield per device). The layout of each tuple is:</div><div class='add'>+</div><div class='add'>+        start_id num_ids reg enable disable start_bit nbits</div><div class='add'>+</div><div class='add'>+    Where:</div><div class='add'>+        start_id is device id for the first device control in the range</div><div class='add'>+        num_ids is the number of device controls in the range</div><div class='add'>+        reg is the offset of the register holding the control bits</div><div class='add'>+        enable is the value to enable a device</div><div class='add'>+        disable is the value to disable a device (0xffffffff if cannot disable)</div><div class='add'>+        start_bit is the bit number of the first bit in the range</div><div class='add'>+        nbits is the number of bits per device control</div><div class='add'>+</div><div class='add'>+- ti,dscr-devstate-stat-regs</div><div class='add'>+    This property describes the bitfields used to provide device state status</div><div class='add'>+    for device states controlled by the DSCR. Each tuple describes a range of</div><div class='add'>+    identical bitfields used to provide status for one or more devices (one</div><div class='add'>+    bitfield per device). The layout of each tuple is:</div><div class='add'>+</div><div class='add'>+        start_id num_ids reg enable disable start_bit nbits</div><div class='add'>+</div><div class='add'>+    Where:</div><div class='add'>+        start_id is device id for the first device status in the range</div><div class='add'>+        num_ids is the number of devices covered by the range</div><div class='add'>+        reg is the offset of the register holding the status bits</div><div class='add'>+        enable is the value indicating device is enabled</div><div class='add'>+        disable is the value indicating device is disabled</div><div class='add'>+        start_bit is the bit number of the first bit in the range</div><div class='add'>+        nbits is the number of bits per device status</div><div class='add'>+</div><div class='add'>+- ti,dscr-privperm</div><div class='add'>+    Offset and default value for register used to set access privilege for</div><div class='add'>+    some SoC devices.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	device-state-config-regs@2a80000 {</div><div class='add'>+		compatible = "ti,c64x+dscr";</div><div class='add'>+		reg = &lt;0x02a80000 0x41000&gt;;</div><div class='add'>+</div><div class='add'>+		ti,dscr-devstat = &lt;0&gt;;</div><div class='add'>+		ti,dscr-silicon-rev = &lt;8 28 0xf&gt;;</div><div class='add'>+		ti,dscr-rmii-resets = &lt;0x40020 0x00040000&gt;;</div><div class='add'>+</div><div class='add'>+		ti,dscr-locked-regs = &lt;0x40008 0x40004 0x0f0a0b00&gt;;</div><div class='add'>+		ti,dscr-devstate-ctl-regs =</div><div class='add'>+			 &lt;0 12 0x40008 1 0  0  2</div><div class='add'>+			  12 1 0x40008 3 0 30  2</div><div class='add'>+			  13 2 0x4002c 1 0xffffffff 0 1&gt;;</div><div class='add'>+		ti,dscr-devstate-stat-regs =</div><div class='add'>+			&lt;0 10 0x40014 1 0  0  3</div><div class='add'>+			 10 2 0x40018 1 0  0  3&gt;;</div><div class='add'>+</div><div class='add'>+		ti,dscr-mac-fuse-regs = &lt;0x700 1 2 3 4</div><div class='add'>+					 0x704 5 6 0 0&gt;;</div><div class='add'>+</div><div class='add'>+		ti,dscr-privperm = &lt;0x41c 0xaaaaaaaa&gt;;</div><div class='add'>+</div><div class='add'>+		ti,dscr-kick-regs = &lt;0x38 0x83E70B13</div><div class='add'>+				     0x3c 0x95A4F1E0&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/c6x/emifa.txt b/Documentation/devicetree/bindings/c6x/emifa.txt<br/>new file mode 100644<br/>index 000000000000..0ff6e9b9a13f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/c6x/emifa.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/c6x/emifa.txt</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+External Memory Interface</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+The emifa node describes a simple external bus controller found on some C6X</div><div class='add'>+SoCs. This interface provides external busses with a number of chip selects.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible: must be "ti,c64x+emifa", "simple-bus"</div><div class='add'>+- reg: register area base and size</div><div class='add'>+- #address-cells: must be 2 (chip-select + offset)</div><div class='add'>+- #size-cells: must be 1</div><div class='add'>+- ranges: mapping from EMIFA space to parent space</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+- ti,dscr-dev-enable: Device ID if EMIF is enabled/disabled from DSCR</div><div class='add'>+</div><div class='add'>+- ti,emifa-burst-priority:</div><div class='add'>+      Number of memory transfers after which the EMIF will elevate the priority</div><div class='add'>+      of the oldest command in the command FIFO. Setting this field to 255</div><div class='add'>+      disables this feature, thereby allowing old commands to stay in the FIFO</div><div class='add'>+      indefinitely.</div><div class='add'>+</div><div class='add'>+- ti,emifa-ce-config:</div><div class='add'>+      Configuration values for each of the supported chip selects.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	emifa@70000000 {</div><div class='add'>+		compatible = "ti,c64x+emifa", "simple-bus";</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0x70000000 0x100&gt;;</div><div class='add'>+		ranges = &lt;0x2 0x0 0xa0000000 0x00000008</div><div class='add'>+		          0x3 0x0 0xb0000000 0x00400000</div><div class='add'>+			  0x4 0x0 0xc0000000 0x10000000</div><div class='add'>+			  0x5 0x0 0xD0000000 0x10000000&gt;;</div><div class='add'>+</div><div class='add'>+		ti,dscr-dev-enable = &lt;13&gt;;</div><div class='add'>+		ti,emifa-burst-priority = &lt;255&gt;;</div><div class='add'>+		ti,emifa-ce-config = &lt;0x00240120</div><div class='add'>+				      0x00240120</div><div class='add'>+				      0x00240122</div><div class='add'>+				      0x00240122&gt;;</div><div class='add'>+</div><div class='add'>+		flash@3,0 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "cfi-flash";</div><div class='add'>+			reg = &lt;0x3 0x0 0x400000&gt;;</div><div class='add'>+			bank-width = &lt;1&gt;;</div><div class='add'>+			device-width = &lt;1&gt;;</div><div class='add'>+			partition@0 {</div><div class='add'>+				reg = &lt;0x0 0x400000&gt;;</div><div class='add'>+				label = "NOR";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+This shows a flash chip attached to chip select 3.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/c6x/interrupt.txt b/Documentation/devicetree/bindings/c6x/interrupt.txt<br/>new file mode 100644<br/>index 000000000000..42bb796cc4ad<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/c6x/interrupt.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/c6x/interrupt.txt</a></div><div class='hunk'>@@ -0,0 +1,104 @@</div><div class='add'>+C6X Interrupt Chips</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+* C64X+ Core Interrupt Controller</div><div class='add'>+</div><div class='add'>+  The core interrupt controller provides 16 prioritized interrupts to the</div><div class='add'>+  C64X+ core. Priority 0 and 1 are used for reset and NMI respectively.</div><div class='add'>+  Priority 2 and 3 are reserved. Priority 4-15 are used for interrupt</div><div class='add'>+  sources coming from outside the core.</div><div class='add'>+</div><div class='add'>+  Required properties:</div><div class='add'>+  --------------------</div><div class='add'>+  - compatible: Should be "ti,c64x+core-pic";</div><div class='add'>+  - #interrupt-cells: &lt;1&gt;</div><div class='add'>+</div><div class='add'>+  Interrupt Specifier Definition</div><div class='add'>+  ------------------------------</div><div class='add'>+  Single cell specifying the core interrupt priority level (4-15) where</div><div class='add'>+  4 is highest priority and 15 is lowest priority.</div><div class='add'>+</div><div class='add'>+  Example</div><div class='add'>+  -------</div><div class='add'>+  core_pic: interrupt-controller@0 {</div><div class='add'>+	interrupt-controller;</div><div class='add'>+	#interrupt-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "ti,c64x+core-pic";</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+* C64x+ Megamodule Interrupt Controller</div><div class='add'>+</div><div class='add'>+  The megamodule PIC consists of four interrupt mupliplexers each of which</div><div class='add'>+  combine up to 32 interrupt inputs into a single interrupt output which</div><div class='add'>+  may be cascaded into the core interrupt controller. The megamodule PIC</div><div class='add'>+  has a total of 12 outputs cascading into the core interrupt controller.</div><div class='add'>+  One for each core interrupt priority level. In addition to the combined</div><div class='add'>+  interrupt sources, individual megamodule interrupts may be cascaded to</div><div class='add'>+  the core interrupt controller. When an individual interrupt is cascaded,</div><div class='add'>+  it is no longer handled through a megamodule interrupt combiner and is</div><div class='add'>+  considered to have the core interrupt controller as the parent.</div><div class='add'>+</div><div class='add'>+  Required properties:</div><div class='add'>+  --------------------</div><div class='add'>+  - compatible: "ti,c64x+megamod-pic"</div><div class='add'>+  - interrupt-controller</div><div class='add'>+  - #interrupt-cells: &lt;1&gt;</div><div class='add'>+  - reg: base address and size of register area</div><div class='add'>+  - interrupt-parent: must be core interrupt controller</div><div class='add'>+  - interrupts: This should have four cells; one for each interrupt combiner.</div><div class='add'>+                The cells contain the core priority interrupt to which the</div><div class='add'>+                corresponding combiner output is wired.</div><div class='add'>+</div><div class='add'>+  Optional properties:</div><div class='add'>+  --------------------</div><div class='add'>+  - ti,c64x+megamod-pic-mux: Array of 12 cells correspnding to the 12 core</div><div class='add'>+                             priority interrupts. The first cell corresponds to</div><div class='add'>+                             core priority 4 and the last cell corresponds to</div><div class='add'>+                             core priority 15. The value of each cell is the</div><div class='add'>+                             megamodule interrupt source which is MUXed to</div><div class='add'>+                             the core interrupt corresponding to the cell</div><div class='add'>+                             position. Allowed values are 4 - 127. Mapping for</div><div class='add'>+                             interrupts 0 - 3 (combined interrupt sources) are</div><div class='add'>+                             ignored.</div><div class='add'>+</div><div class='add'>+  Interrupt Specifier Definition</div><div class='add'>+  ------------------------------</div><div class='add'>+  Single cell specifying the megamodule interrupt source (4-127). Note that</div><div class='add'>+  interrupts mapped directly to the core with "ti,c64x+megamod-pic-mux" will</div><div class='add'>+  use the core interrupt controller as their parent and the specifier will</div><div class='add'>+  be the core priority level, not the megamodule interrupt number.</div><div class='add'>+</div><div class='add'>+  Examples</div><div class='add'>+  --------</div><div class='add'>+  megamod_pic: interrupt-controller@1800000 {</div><div class='add'>+	compatible = "ti,c64x+megamod-pic";</div><div class='add'>+	interrupt-controller;</div><div class='add'>+	#interrupt-cells = &lt;1&gt;;</div><div class='add'>+	reg = &lt;0x1800000 0x1000&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;core_pic&gt;;</div><div class='add'>+	interrupts = &lt; 12 13 14 15 &gt;;</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+  This is a minimal example where all individual interrupts go through a</div><div class='add'>+  combiner. Combiner-0 is mapped to core interrupt 12, combiner-1 is mapped</div><div class='add'>+  to interrupt 13, etc.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+  megamod_pic: interrupt-controller@1800000 {</div><div class='add'>+	compatible = "ti,c64x+megamod-pic";</div><div class='add'>+	interrupt-controller;</div><div class='add'>+	#interrupt-cells = &lt;1&gt;;</div><div class='add'>+	reg = &lt;0x1800000 0x1000&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;core_pic&gt;;</div><div class='add'>+	interrupts = &lt; 12 13 14 15 &gt;;</div><div class='add'>+	ti,c64x+megamod-pic-mux = &lt;  0  0  0  0</div><div class='add'>+                                    32  0  0  0</div><div class='add'>+                                     0  0  0  0 &gt;;</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+  This the same as the first example except that megamodule interrupt 32 is</div><div class='add'>+  mapped directly to core priority interrupt 8. The node using this interrupt</div><div class='add'>+  must set the core controller as its interrupt parent and use 8 in the</div><div class='add'>+  interrupt specifier value.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/c6x/soc.txt b/Documentation/devicetree/bindings/c6x/soc.txt<br/>new file mode 100644<br/>index 000000000000..b1e4973b5769<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/c6x/soc.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/c6x/soc.txt</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+C6X System-on-Chip</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible: "simple-bus"</div><div class='add'>+- #address-cells: must be 1</div><div class='add'>+- #size-cells: must be 1</div><div class='add'>+- ranges</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+- model: specific SoC model</div><div class='add'>+</div><div class='add'>+- nodes for IP blocks within SoC</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		model = "tms320c6455";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		...</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/c6x/timer64.txt b/Documentation/devicetree/bindings/c6x/timer64.txt<br/>new file mode 100644<br/>index 000000000000..95911fe70224<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/c6x/timer64.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/c6x/timer64.txt</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+Timer64</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+The timer64 node describes C6X event timers.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible: must be "ti,c64x+timer64"</div><div class='add'>+- reg: base address and size of register region</div><div class='add'>+- interrupt-parent: interrupt controller</div><div class='add'>+- interrupts: interrupt id</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+- ti,dscr-dev-enable: Device ID used to enable timer IP through DSCR interface.</div><div class='add'>+</div><div class='add'>+- ti,core-mask: on multi-core SoCs, bitmask of cores allowed to use this timer.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	timer0: timer@25e0000 {</div><div class='add'>+		compatible = "ti,c64x+timer64";</div><div class='add'>+		ti,core-mask = &lt; 0x01 &gt;;</div><div class='add'>+		reg = &lt;0x25e0000 0x40&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;megamod_pic&gt;;</div><div class='add'>+		interrupts = &lt; 16 &gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/dma/arm-pl330.txt b/Documentation/devicetree/bindings/dma/arm-pl330.txt<br/>new file mode 100644<br/>index 000000000000..a4cd273b2a67<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/dma/arm-pl330.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/dma/arm-pl330.txt</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+* ARM PrimeCell PL330 DMA Controller</div><div class='add'>+</div><div class='add'>+The ARM PrimeCell PL330 DMA controller can move blocks of memory contents</div><div class='add'>+between memory and peripherals or memory to memory.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+  - compatible: should include both "arm,pl330" and "arm,primecell".</div><div class='add'>+  - reg: physical base address of the controller and length of memory mapped</div><div class='add'>+    region.</div><div class='add'>+  - interrupts: interrupt number to the cpu.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	pdma0: pdma@12680000 {</div><div class='add'>+		compatible = "arm,pl330", "arm,primecell";</div><div class='add'>+		reg = &lt;0x12680000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;99&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+Client drivers (device nodes requiring dma transfers from dev-to-mem or</div><div class='add'>+mem-to-dev) should specify the DMA channel numbers using a two-value pair</div><div class='add'>+as shown below.</div><div class='add'>+</div><div class='add'>+  [property name]  = &lt;[phandle of the dma controller] [dma request id]&gt;;</div><div class='add'>+</div><div class='add'>+      where 'dma request id' is the dma request number which is connected</div><div class='add'>+      to the client controller. The 'property name' is recommended to be</div><div class='add'>+      of the form &lt;name&gt;-dma-channel.</div><div class='add'>+</div><div class='add'>+  Example:  tx-dma-channel = &lt;&amp;pdma0 12&gt;;</div><div class='head'>diff --git a/Documentation/devicetree/bindings/dma/atmel-dma.txt b/Documentation/devicetree/bindings/dma/atmel-dma.txt<br/>new file mode 100644<br/>index 000000000000..3c046ee6e8b5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/dma/atmel-dma.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/dma/atmel-dma.txt</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+* Atmel Direct Memory Access Controller (DMA)</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: Should be "atmel,&lt;chip&gt;-dma"</div><div class='add'>+- reg: Should contain DMA registers location and length</div><div class='add'>+- interrupts: Should contain DMA interrupt</div><div class='add'>+</div><div class='add'>+Examples:</div><div class='add'>+</div><div class='add'>+dma@ffffec00 {</div><div class='add'>+	compatible = "atmel,at91sam9g45-dma";</div><div class='add'>+	reg = &lt;0xffffec00 0x200&gt;;</div><div class='add'>+	interrupts = &lt;21&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/gpio/gpio-samsung.txt b/Documentation/devicetree/bindings/gpio/gpio-samsung.txt<br/>new file mode 100644<br/>index 000000000000..8f50fe5e6c42<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/gpio/gpio-samsung.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/gpio/gpio-samsung.txt</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+Samsung Exynos4 GPIO Controller</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: Compatible property value should be "samsung,exynos4-gpio&gt;".</div><div class='add'>+</div><div class='add'>+- reg: Physical base address of the controller and length of memory mapped</div><div class='add'>+  region.</div><div class='add'>+</div><div class='add'>+- #gpio-cells: Should be 4. The syntax of the gpio specifier used by client nodes</div><div class='add'>+  should be the following with values derived from the SoC user manual.</div><div class='add'>+     &lt;[phandle of the gpio controller node]</div><div class='add'>+      [pin number within the gpio controller]</div><div class='add'>+      [mux function]</div><div class='add'>+      [pull up/down]</div><div class='add'>+      [drive strength]&gt;</div><div class='add'>+</div><div class='add'>+  Values for gpio specifier:</div><div class='add'>+  - Pin number: is a value between 0 to 7.</div><div class='add'>+  - Pull Up/Down: 0 - Pull Up/Down Disabled.</div><div class='add'>+                  1 - Pull Down Enabled.</div><div class='add'>+                  3 - Pull Up Enabled.</div><div class='add'>+  - Drive Strength: 0 - 1x,</div><div class='add'>+                    1 - 3x,</div><div class='add'>+                    2 - 2x,</div><div class='add'>+                    3 - 4x</div><div class='add'>+</div><div class='add'>+- gpio-controller: Specifies that the node is a gpio controller.</div><div class='add'>+- #address-cells: should be 1.</div><div class='add'>+- #size-cells: should be 1.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	gpa0: gpio-controller@11400000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "samsung,exynos4-gpio";</div><div class='add'>+		reg = &lt;0x11400000 0x20&gt;;</div><div class='add'>+		#gpio-cells = &lt;4&gt;;</div><div class='add'>+		gpio-controller;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/i2c/i2c-designware.txt b/Documentation/devicetree/bindings/i2c/i2c-designware.txt<br/>new file mode 100644<br/>index 000000000000..e42a2ee233e6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/i2c/i2c-designware.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/i2c/i2c-designware.txt</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+* Synopsys DesignWare I2C</div><div class='add'>+</div><div class='add'>+Required properties :</div><div class='add'>+</div><div class='add'>+ - compatible : should be "snps,designware-i2c"</div><div class='add'>+ - reg : Offset and length of the register set for the device</div><div class='add'>+ - interrupts : &lt;IRQ&gt; where IRQ is the interrupt number.</div><div class='add'>+</div><div class='add'>+Recommended properties :</div><div class='add'>+</div><div class='add'>+ - clock-frequency : desired I2C bus clock frequency in Hz.</div><div class='add'>+</div><div class='add'>+Example :</div><div class='add'>+</div><div class='add'>+	i2c@f0000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "snps,designware-i2c";</div><div class='add'>+		reg = &lt;0xf0000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;11&gt;;</div><div class='add'>+		clock-frequency = &lt;400000&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/i2c/omap-i2c.txt b/Documentation/devicetree/bindings/i2c/omap-i2c.txt<br/>new file mode 100644<br/>index 000000000000..56564aa4b444<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/i2c/omap-i2c.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/i2c/omap-i2c.txt</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+I2C for OMAP platforms</div><div class='add'>+</div><div class='add'>+Required properties :</div><div class='add'>+- compatible : Must be "ti,omap3-i2c" or "ti,omap4-i2c"</div><div class='add'>+- ti,hwmods : Must be "i2c&lt;n&gt;", n being the instance number (1-based)</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'>+Recommended properties :</div><div class='add'>+- clock-frequency : Desired I2C bus clock frequency in Hz. Otherwise</div><div class='add'>+  the default 100 kHz frequency will be used.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- Child nodes conforming to i2c bus binding</div><div class='add'>+</div><div class='add'>+Note: Current implementation will fetch base address, irq and dma</div><div class='add'>+from omap hwmod data base during device registration.</div><div class='add'>+Future plan is to migrate hwmod data base contents into device tree</div><div class='add'>+blob so that, all the required data will be used from device tree dts</div><div class='add'>+file.</div><div class='add'>+</div><div class='add'>+Examples :</div><div class='add'>+</div><div class='add'>+i2c1: i2c@0 {</div><div class='add'>+    compatible = "ti,omap3-i2c";</div><div class='add'>+    #address-cells = &lt;1&gt;;</div><div class='add'>+    #size-cells = &lt;0&gt;;</div><div class='add'>+    ti,hwmods = "i2c1";</div><div class='add'>+    clock-frequency = &lt;400000&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt<br/>new file mode 100644<br/>index 000000000000..1a85f986961b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/i2c/trivial-devices.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/i2c/trivial-devices.txt</a></div><div class='hunk'>@@ -0,0 +1,58 @@</div><div class='add'>+This is a list of trivial i2c devices that have simple device tree</div><div class='add'>+bindings, consisting only of a compatible field, an address and</div><div class='add'>+possibly an interrupt line.</div><div class='add'>+</div><div class='add'>+If a device needs more specific bindings, such as properties to</div><div class='add'>+describe some aspect of it, there needs to be a specific binding</div><div class='add'>+document for it just like any other devices.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Compatible		Vendor / Chip</div><div class='add'>+==========		=============</div><div class='add'>+ad,ad7414		SMBus/I2C Digital Temperature Sensor in 6-Pin SOT with SMBus Alert and Over Temperature Pin</div><div class='add'>+ad,adm9240		ADM9240:  Complete System Hardware Monitor for uProcessor-Based Systems</div><div class='add'>+adi,adt7461		+/-1C TDM Extended Temp Range I.C</div><div class='add'>+adt7461			+/-1C TDM Extended Temp Range I.C</div><div class='add'>+at,24c08		i2c serial eeprom  (24cxx)</div><div class='add'>+atmel,24c02		i2c serial eeprom  (24cxx)</div><div class='add'>+catalyst,24c32		i2c serial eeprom</div><div class='add'>+dallas,ds1307		64 x 8, Serial, I2C Real-Time Clock</div><div class='add'>+dallas,ds1338		I2C RTC with 56-Byte NV RAM</div><div class='add'>+dallas,ds1339		I2C Serial Real-Time Clock</div><div class='add'>+dallas,ds1340		I2C RTC with Trickle Charger</div><div class='add'>+dallas,ds1374		I2C, 32-Bit Binary Counter Watchdog RTC with Trickle Charger and Reset Input/Output</div><div class='add'>+dallas,ds1631		High-Precision Digital Thermometer</div><div class='add'>+dallas,ds1682		Total-Elapsed-Time Recorder with Alarm</div><div class='add'>+dallas,ds1775		Tiny Digital Thermometer and Thermostat</div><div class='add'>+dallas,ds3232		Extremely Accurate I²C RTC with Integrated Crystal and SRAM</div><div class='add'>+dallas,ds4510		CPU Supervisor with Nonvolatile Memory and Programmable I/O</div><div class='add'>+dallas,ds75		Digital Thermometer and Thermostat</div><div class='add'>+dialog,da9053		DA9053: flexible system level PMIC with multicore support</div><div class='add'>+epson,rx8025		High-Stability. I2C-Bus INTERFACE REAL TIME CLOCK MODULE</div><div class='add'>+epson,rx8581		I2C-BUS INTERFACE REAL TIME CLOCK MODULE</div><div class='add'>+fsl,mag3110		MAG3110: Xtrinsic High Accuracy, 3D Magnetometer</div><div class='add'>+fsl,mc13892		MC13892: Power Management Integrated Circuit (PMIC) for i.MX35/51</div><div class='add'>+fsl,mma8450		MMA8450Q: Xtrinsic Low-power, 3-axis Xtrinsic Accelerometer</div><div class='add'>+fsl,mpr121		MPR121: Proximity Capacitive Touch Sensor Controller</div><div class='add'>+fsl,sgtl5000		SGTL5000: Ultra Low-Power Audio Codec</div><div class='add'>+maxim,ds1050		5 Bit Programmable, Pulse-Width Modulator</div><div class='add'>+maxim,max1237		Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs</div><div class='add'>+maxim,max6625		9-Bit/12-Bit Temperature Sensors with I²C-Compatible Serial Interface</div><div class='add'>+mc,rv3029c2		Real Time Clock Module with I2C-Bus</div><div class='add'>+national,lm75		I2C TEMP SENSOR</div><div class='add'>+national,lm80		Serial Interface ACPI-Compatible Microprocessor System Hardware Monitor</div><div class='add'>+national,lm92		±0.33°C Accurate, 12-Bit + Sign Temperature Sensor and Thermal Window Comparator with Two-Wire Interface</div><div class='add'>+nxp,pca9556		Octal SMBus and I2C registered interface</div><div class='add'>+nxp,pca9557		8-bit I2C-bus and SMBus I/O port with reset</div><div class='add'>+nxp,pcf8563		Real-time clock/calendar</div><div class='add'>+ovti,ov5642		OV5642: Color CMOS QSXGA (5-megapixel) Image Sensor with OmniBSI and Embedded TrueFocus</div><div class='add'>+pericom,pt7c4338	Real-time Clock Module</div><div class='add'>+plx,pex8648		48-Lane, 12-Port PCI Express Gen 2 (5.0 GT/s) Switch</div><div class='add'>+ramtron,24c64		i2c serial eeprom  (24cxx)</div><div class='add'>+ricoh,rs5c372a		I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC</div><div class='add'>+samsung,24ad0xd1	S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power)</div><div class='add'>+st-micro,24c256		i2c serial eeprom  (24cxx)</div><div class='add'>+stm,m41t00		Serial Access TIMEKEEPER</div><div class='add'>+stm,m41t62		Serial real-time clock (RTC) with alarm</div><div class='add'>+stm,m41t80		M41T80 - SERIAL ACCESS RTC WITH ALARMS</div><div class='add'>+ti,tsc2003		I2C Touch-Screen Controller</div><div class='head'>diff --git a/Documentation/devicetree/bindings/input/samsung-keypad.txt b/Documentation/devicetree/bindings/input/samsung-keypad.txt<br/>new file mode 100644<br/>index 000000000000..ce3e394c0e64<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/input/samsung-keypad.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/input/samsung-keypad.txt</a></div><div class='hunk'>@@ -0,0 +1,88 @@</div><div class='add'>+* Samsung's Keypad Controller device tree bindings</div><div class='add'>+</div><div class='add'>+Samsung's Keypad controller is used to interface a SoC with a matrix-type</div><div class='add'>+keypad device. The keypad controller supports multiple row and column lines.</div><div class='add'>+A key can be placed at each intersection of a unique row and a unique column.</div><div class='add'>+The keypad controller can sense a key-press and key-release and report the</div><div class='add'>+event using a interrupt to the cpu.</div><div class='add'>+</div><div class='add'>+Required SoC Specific Properties:</div><div class='add'>+- compatible: should be one of the following</div><div class='add'>+  - "samsung,s3c6410-keypad": For controllers compatible with s3c6410 keypad</div><div class='add'>+    controller.</div><div class='add'>+  - "samsung,s5pv210-keypad": For controllers compatible with s5pv210 keypad</div><div class='add'>+    controller.</div><div class='add'>+</div><div class='add'>+- reg: physical base address of the controller and length of memory mapped</div><div class='add'>+  region.</div><div class='add'>+</div><div class='add'>+- interrupts: The interrupt number to the cpu.</div><div class='add'>+</div><div class='add'>+Required Board Specific Properties:</div><div class='add'>+- samsung,keypad-num-rows: Number of row lines connected to the keypad</div><div class='add'>+  controller.</div><div class='add'>+</div><div class='add'>+- samsung,keypad-num-columns: Number of column lines connected to the</div><div class='add'>+  keypad controller.</div><div class='add'>+</div><div class='add'>+- row-gpios: List of gpios used as row lines. The gpio specifier for</div><div class='add'>+  this property depends on the gpio controller to which these row lines</div><div class='add'>+  are connected.</div><div class='add'>+</div><div class='add'>+- col-gpios: List of gpios used as column lines. The gpio specifier for</div><div class='add'>+  this property depends on the gpio controller to which these column</div><div class='add'>+  lines are connected.</div><div class='add'>+</div><div class='add'>+- Keys represented as child nodes: Each key connected to the keypad</div><div class='add'>+  controller is represented as a child node to the keypad controller</div><div class='add'>+  device node and should include the following properties.</div><div class='add'>+  - keypad,row: the row number to which the key is connected.</div><div class='add'>+  - keypad,column: the column number to which the key is connected.</div><div class='add'>+  - linux,code: the key-code to be reported when the key is pressed</div><div class='add'>+    and released.</div><div class='add'>+</div><div class='add'>+Optional Properties specific to linux:</div><div class='add'>+- linux,keypad-no-autorepeat: do no enable autorepeat feature.</div><div class='add'>+- linux,keypad-wakeup: use any event on keypad as wakeup event.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	keypad@100A0000 {</div><div class='add'>+		compatible = "samsung,s5pv210-keypad";</div><div class='add'>+		reg = &lt;0x100A0000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;173&gt;;</div><div class='add'>+		samsung,keypad-num-rows = &lt;2&gt;;</div><div class='add'>+		samsung,keypad-num-columns = &lt;8&gt;;</div><div class='add'>+		linux,input-no-autorepeat;</div><div class='add'>+		linux,input-wakeup;</div><div class='add'>+</div><div class='add'>+		row-gpios = &lt;&amp;gpx2 0 3 3 0</div><div class='add'>+			     &amp;gpx2 1 3 3 0&gt;;</div><div class='add'>+</div><div class='add'>+		col-gpios = &lt;&amp;gpx1 0 3 0 0</div><div class='add'>+			     &amp;gpx1 1 3 0 0</div><div class='add'>+			     &amp;gpx1 2 3 0 0</div><div class='add'>+			     &amp;gpx1 3 3 0 0</div><div class='add'>+			     &amp;gpx1 4 3 0 0</div><div class='add'>+			     &amp;gpx1 5 3 0 0</div><div class='add'>+			     &amp;gpx1 6 3 0 0</div><div class='add'>+			     &amp;gpx1 7 3 0 0&gt;;</div><div class='add'>+</div><div class='add'>+		key_1 {</div><div class='add'>+			keypad,row = &lt;0&gt;;</div><div class='add'>+			keypad,column = &lt;3&gt;;</div><div class='add'>+			linux,code = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		key_2 {</div><div class='add'>+			keypad,row = &lt;0&gt;;</div><div class='add'>+			keypad,column = &lt;4&gt;;</div><div class='add'>+			linux,code = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		key_3 {</div><div class='add'>+			keypad,row = &lt;0&gt;;</div><div class='add'>+			keypad,column = &lt;5&gt;;</div><div class='add'>+			linux,code = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/input/tegra-kbc.txt b/Documentation/devicetree/bindings/input/tegra-kbc.txt<br/>new file mode 100644<br/>index 000000000000..5ecfa99089b4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/input/tegra-kbc.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/input/tegra-kbc.txt</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+* Tegra keyboard controller</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: "nvidia,tegra20-kbc"</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- debounce-delay: delay in milliseconds per row scan for debouncing</div><div class='add'>+- repeat-delay: delay in milliseconds before repeat starts</div><div class='add'>+- ghost-filter: enable ghost filtering for this device</div><div class='add'>+- wakeup-source: configure keyboard as a wakeup source for suspend/resume</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+keyboard: keyboard {</div><div class='add'>+	compatible = "nvidia,tegra20-kbc";</div><div class='add'>+	reg = &lt;0x7000e200 0x100&gt;;</div><div class='add'>+	ghost-filter;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mfd/mc13xxx.txt b/Documentation/devicetree/bindings/mfd/mc13xxx.txt<br/>new file mode 100644<br/>index 000000000000..19f6af47a792<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/mfd/mc13xxx.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/mfd/mc13xxx.txt</a></div><div class='hunk'>@@ -0,0 +1,78 @@</div><div class='add'>+* Freescale MC13783/MC13892 Power Management Integrated Circuit (PMIC)</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : Should be "fsl,mc13783" or "fsl,mc13892"</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- fsl,mc13xxx-uses-adc : Indicate the ADC is being used</div><div class='add'>+- fsl,mc13xxx-uses-codec : Indicate the Audio Codec is being used</div><div class='add'>+- fsl,mc13xxx-uses-rtc : Indicate the RTC is being used</div><div class='add'>+- fsl,mc13xxx-uses-touch : Indicate the touchscreen controller is being used</div><div class='add'>+</div><div class='add'>+Sub-nodes:</div><div class='add'>+- regulators : Contain the regulator nodes.  The MC13892 regulators are</div><div class='add'>+  bound using their names as listed below with their registers and bits</div><div class='add'>+  for enabling.</div><div class='add'>+</div><div class='add'>+    vcoincell : regulator VCOINCELL (register 13, bit 23)</div><div class='add'>+    sw1       : regulator SW1	    (register 24, bit 0)</div><div class='add'>+    sw2       : regulator SW2	    (register 25, bit 0)</div><div class='add'>+    sw3       : regulator SW3	    (register 26, bit 0)</div><div class='add'>+    sw4       : regulator SW4	    (register 27, bit 0)</div><div class='add'>+    swbst     : regulator SWBST	    (register 29, bit 20)</div><div class='add'>+    vgen1     : regulator VGEN1	    (register 32, bit 0)</div><div class='add'>+    viohi     : regulator VIOHI	    (register 32, bit 3)</div><div class='add'>+    vdig      : regulator VDIG	    (register 32, bit 9)</div><div class='add'>+    vgen2     : regulator VGEN2	    (register 32, bit 12)</div><div class='add'>+    vpll      : regulator VPLL	    (register 32, bit 15)</div><div class='add'>+    vusb2     : regulator VUSB2	    (register 32, bit 18)</div><div class='add'>+    vgen3     : regulator VGEN3	    (register 33, bit 0)</div><div class='add'>+    vcam      : regulator VCAM	    (register 33, bit 6)</div><div class='add'>+    vvideo    : regulator VVIDEO    (register 33, bit 12)</div><div class='add'>+    vaudio    : regulator VAUDIO    (register 33, bit 15)</div><div class='add'>+    vsd       : regulator VSD	    (register 33, bit 18)</div><div class='add'>+    gpo1      : regulator GPO1	    (register 34, bit 6)</div><div class='add'>+    gpo2      : regulator GPO2	    (register 34, bit 8)</div><div class='add'>+    gpo3      : regulator GPO3	    (register 34, bit 10)</div><div class='add'>+    gpo4      : regulator GPO4	    (register 34, bit 12)</div><div class='add'>+    pwgt1spi  : regulator PWGT1SPI  (register 34, bit 15)</div><div class='add'>+    pwgt2spi  : regulator PWGT2SPI  (register 34, bit 16)</div><div class='add'>+    vusb      : regulator VUSB	    (register 50, bit 3)</div><div class='add'>+</div><div class='add'>+  The bindings details of individual regulator device can be found in:</div><div class='add'>+  Documentation/devicetree/bindings/regulator/regulator.txt</div><div class='add'>+</div><div class='add'>+Examples:</div><div class='add'>+</div><div class='add'>+ecspi@70010000 { /* ECSPI1 */</div><div class='add'>+	fsl,spi-num-chipselects = &lt;2&gt;;</div><div class='add'>+	cs-gpios = &lt;&amp;gpio3 24 0&gt;, /* GPIO4_24 */</div><div class='add'>+		   &lt;&amp;gpio3 25 0&gt;; /* GPIO4_25 */</div><div class='add'>+	status = "okay";</div><div class='add'>+</div><div class='add'>+	pmic: mc13892@0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "fsl,mc13892";</div><div class='add'>+		spi-max-frequency = &lt;6000000&gt;;</div><div class='add'>+		reg = &lt;0&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;gpio0&gt;;</div><div class='add'>+		interrupts = &lt;8&gt;;</div><div class='add'>+</div><div class='add'>+		regulators {</div><div class='add'>+			sw1_reg: mc13892__sw1 {</div><div class='add'>+				regulator-min-microvolt = &lt;600000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1375000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			sw2_reg: mc13892__sw2 {</div><div class='add'>+				regulator-min-microvolt = &lt;900000&gt;;</div><div class='add'>+				regulator-max-microvolt = &lt;1850000&gt;;</div><div class='add'>+				regulator-boot-on;</div><div class='add'>+				regulator-always-on;</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/mfd/twl-familly.txt b/Documentation/devicetree/bindings/mfd/twl-familly.txt<br/>new file mode 100644<br/>index 000000000000..a66fcf946759<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/mfd/twl-familly.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/mfd/twl-familly.txt</a></div><div class='hunk'>@@ -0,0 +1,47 @@</div><div class='add'>+Texas Instruments TWL family</div><div class='add'>+</div><div class='add'>+The TWLs are Integrated Power Management Chips.</div><div class='add'>+Some version might contain much more analog function like</div><div class='add'>+USB transceiver or Audio amplifier.</div><div class='add'>+These chips are connected to an i2c bus.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : Must be "ti,twl4030";</div><div class='add'>+  For Integrated power-management/audio CODEC device used in OMAP3</div><div class='add'>+  based boards</div><div class='add'>+- compatible : Must be "ti,twl6030";</div><div class='add'>+  For Integrated power-management used in OMAP4 based boards</div><div class='add'>+- interrupts : This i2c device has an IRQ line connected to the main SoC</div><div class='add'>+- interrupt-controller : Since the twl support several interrupts internally,</div><div class='add'>+  it is considered as an interrupt controller cascaded to the SoC one.</div><div class='add'>+- #interrupt-cells = &lt;1&gt;;</div><div class='add'>+- interrupt-parent : The parent interrupt controller.</div><div class='add'>+</div><div class='add'>+Optional node:</div><div class='add'>+- Child nodes contain in the twl. The twl family is made of several variants</div><div class='add'>+  that support a different number of features.</div><div class='add'>+  The children nodes will thus depend of the capability of the variant.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+/*</div><div class='add'>+ * Integrated Power Management Chip</div><div class='add'>+ * http://www.ti.com/lit/ds/symlink/twl6030.pdf</div><div class='add'>+ */</div><div class='add'>+twl@48 {</div><div class='add'>+    compatible = "ti,twl6030";</div><div class='add'>+    reg = &lt;0x48&gt;;</div><div class='add'>+    interrupts = &lt;39&gt;; /* IRQ_SYS_1N cascaded to gic */</div><div class='add'>+    interrupt-controller;</div><div class='add'>+    #interrupt-cells = &lt;1&gt;;</div><div class='add'>+    interrupt-parent = &lt;&amp;gic&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'>+    twl_rtc {</div><div class='add'>+        compatible = "ti,twl_rtc";</div><div class='add'>+        interrupts = &lt;11&gt;;</div><div class='add'>+        reg = &lt;0&gt;;</div><div class='add'>+    };</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/mtd/gpio-control-nand.txt b/Documentation/devicetree/bindings/mtd/gpio-control-nand.txt<br/>new file mode 100644<br/>index 000000000000..719f4dc58df7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/mtd/gpio-control-nand.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/mtd/gpio-control-nand.txt</a></div><div class='hunk'>@@ -0,0 +1,44 @@</div><div class='add'>+GPIO assisted NAND flash</div><div class='add'>+</div><div class='add'>+The GPIO assisted NAND flash uses a memory mapped interface to</div><div class='add'>+read/write the NAND commands and data and GPIO pins for the control</div><div class='add'>+signals.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : "gpio-control-nand"</div><div class='add'>+- reg : should specify localbus chip select and size used for the chip.  The</div><div class='add'>+  resource describes the data bus connected to the NAND flash and all accesses</div><div class='add'>+  are made in native endianness.</div><div class='add'>+- #address-cells, #size-cells : Must be present if the device has sub-nodes</div><div class='add'>+  representing partitions.</div><div class='add'>+- gpios : specifies the gpio pins to control the NAND device.  nwp is an</div><div class='add'>+  optional gpio and may be set to 0 if not present.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- bank-width : Width (in bytes) of the device.  If not present, the width</div><div class='add'>+  defaults to 1 byte.</div><div class='add'>+- chip-delay : chip dependent delay for transferring data from array to</div><div class='add'>+  read registers (tR).  If not present then a default of 20us is used.</div><div class='add'>+- gpio-control-nand,io-sync-reg : A 64-bit physical address for a read</div><div class='add'>+  location used to guard against bus reordering with regards to accesses to</div><div class='add'>+  the GPIO's and the NAND flash data bus.  If present, then after changing</div><div class='add'>+  GPIO state and before and after command byte writes, this register will be</div><div class='add'>+  read to ensure that the GPIO accesses have completed.</div><div class='add'>+</div><div class='add'>+Examples:</div><div class='add'>+</div><div class='add'>+gpio-nand@1,0 {</div><div class='add'>+	compatible = "gpio-control-nand";</div><div class='add'>+	reg = &lt;1 0x0000 0x2&gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	gpios = &lt;&amp;banka 1 0	/* rdy */</div><div class='add'>+		 &amp;banka 2 0 	/* nce */</div><div class='add'>+		 &amp;banka 3 0 	/* ale */</div><div class='add'>+		 &amp;banka 4 0 	/* cle */</div><div class='add'>+		 0		/* nwp */&gt;;</div><div class='add'>+</div><div class='add'>+	partition@0 {</div><div class='add'>+	...</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/calxeda-xgmac.txt b/Documentation/devicetree/bindings/net/calxeda-xgmac.txt<br/>new file mode 100644<br/>index 000000000000..411727a3f82d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/net/calxeda-xgmac.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/net/calxeda-xgmac.txt</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+* Calxeda Highbank 10Gb XGMAC Ethernet</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : Should be "calxeda,hb-xgmac"</div><div class='add'>+- reg : Address and length of the register set for the device</div><div class='add'>+- interrupts : Should contain 3 xgmac interrupts. The 1st is main interrupt.</div><div class='add'>+  The 2nd is pwr mgt interrupt. The 3rd is low power state interrupt.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+ethernet@fff50000 {</div><div class='add'>+        compatible = "calxeda,hb-xgmac";</div><div class='add'>+        reg = &lt;0xfff50000 0x1000&gt;;</div><div class='add'>+        interrupts = &lt;0 77 4  0 78 4  0 79 4&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/can/cc770.txt b/Documentation/devicetree/bindings/net/can/cc770.txt<br/>new file mode 100644<br/>index 000000000000..77027bf6460a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/net/can/cc770.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/net/can/cc770.txt</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+Memory mapped Bosch CC770 and Intel AN82527 CAN controller</div><div class='add'>+</div><div class='add'>+Note: The CC770 is a CAN controller from Bosch, which is 100%</div><div class='add'>+compatible with the old AN82527 from Intel, but with "bugs" being fixed.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+- compatible : should be "bosch,cc770" for the CC770 and "intc,82527"</div><div class='add'>+	for the AN82527.</div><div class='add'>+</div><div class='add'>+- reg : should specify the chip select, address offset and size required</div><div class='add'>+	to map the registers of the controller. The size is usually 0x80.</div><div class='add'>+</div><div class='add'>+- interrupts : property with a value describing the interrupt source</div><div class='add'>+	(number and sensitivity) required for the controller.</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+- bosch,external-clock-frequency : frequency of the external oscillator</div><div class='add'>+	clock in Hz. Note that the internal clock frequency used by the</div><div class='add'>+	controller is half of that value. If not specified, a default</div><div class='add'>+	value of 16000000 (16 MHz) is used.</div><div class='add'>+</div><div class='add'>+- bosch,clock-out-frequency : slock frequency in Hz on the CLKOUT pin.</div><div class='add'>+	If not specified or if the specified value is 0, the CLKOUT pin</div><div class='add'>+	will be disabled.</div><div class='add'>+</div><div class='add'>+- bosch,slew-rate : slew rate of the CLKOUT signal. If not specified,</div><div class='add'>+	a resonable value will be calculated.</div><div class='add'>+</div><div class='add'>+- bosch,disconnect-rx0-input : see data sheet.</div><div class='add'>+</div><div class='add'>+- bosch,disconnect-rx1-input : see data sheet.</div><div class='add'>+</div><div class='add'>+- bosch,disconnect-tx1-output : see data sheet.</div><div class='add'>+</div><div class='add'>+- bosch,polarity-dominant : see data sheet.</div><div class='add'>+</div><div class='add'>+- bosch,divide-memory-clock : see data sheet.</div><div class='add'>+</div><div class='add'>+- bosch,iso-low-speed-mux : see data sheet.</div><div class='add'>+</div><div class='add'>+For further information, please have a look to the CC770 or AN82527.</div><div class='add'>+</div><div class='add'>+Examples:</div><div class='add'>+</div><div class='add'>+can@3,100 {</div><div class='add'>+	compatible = "bosch,cc770";</div><div class='add'>+	reg = &lt;3 0x100 0x80&gt;;</div><div class='add'>+	interrupts = &lt;2 0&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+	bosch,external-clock-frequency = &lt;16000000&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt<br/>new file mode 100644<br/>index 000000000000..44afa0e5057d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/net/macb.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/net/macb.txt</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+* Cadence MACB/GEM Ethernet controller</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: Should be "cdns,[&lt;chip&gt;-]{macb|gem}"</div><div class='add'>+  Use "cdns,at91sam9260-macb" Atmel at91sam9260 and at91sam9263 SoCs.</div><div class='add'>+  Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".</div><div class='add'>+  Use "cnds,pc302-gem" for Picochip picoXcell pc302 and later devices based on</div><div class='add'>+  the Cadence GEM, or the generic form: "cdns,gem".</div><div class='add'>+- reg: Address and length of the register set for the device</div><div class='add'>+- interrupts: Should contain macb interrupt</div><div class='add'>+- phy-mode: String, operation mode of the PHY interface.</div><div class='add'>+  Supported values are: "mii", "rmii", "gmii", "rgmii".</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- local-mac-address: 6 bytes, mac address</div><div class='add'>+</div><div class='add'>+Examples:</div><div class='add'>+</div><div class='add'>+	macb0: ethernet@fffc4000 {</div><div class='add'>+		compatible = "cdns,at32ap7000-macb";</div><div class='add'>+		reg = &lt;0xfffc4000 0x4000&gt;;</div><div class='add'>+		interrupts = &lt;21&gt;;</div><div class='add'>+		phy-mode = "rmii";</div><div class='add'>+		local-mac-address = [3a 0e 03 04 05 06];</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/nvec/nvec_nvidia.txt b/Documentation/devicetree/bindings/nvec/nvec_nvidia.txt<br/>new file mode 100644<br/>index 000000000000..5aeee53ff9f4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/nvec/nvec_nvidia.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/nvec/nvec_nvidia.txt</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+NVIDIA compliant embedded controller</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : should be "nvidia,nvec".</div><div class='add'>+- reg : the iomem of the i2c slave controller</div><div class='add'>+- interrupts : the interrupt line of the i2c slave controller</div><div class='add'>+- clock-frequency : the frequency of the i2c bus</div><div class='add'>+- gpios : the gpio used for ec request</div><div class='add'>+- slave-addr: the i2c address of the slave controller</div><div class='head'>diff --git a/Documentation/devicetree/bindings/power_supply/olpc_battery.txt b/Documentation/devicetree/bindings/power_supply/olpc_battery.txt<br/>new file mode 100644<br/>index 000000000000..c8901b3992d9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/power_supply/olpc_battery.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/power_supply/olpc_battery.txt</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+OLPC battery</div><div class='add'>+~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+  - compatible : "olpc,xo1-battery"</div><div class='head'>diff --git a/Documentation/devicetree/bindings/power_supply/sbs_sbs-battery.txt b/Documentation/devicetree/bindings/power_supply/sbs_sbs-battery.txt<br/>new file mode 100644<br/>index 000000000000..c40e8926facf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/power_supply/sbs_sbs-battery.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/power_supply/sbs_sbs-battery.txt</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+SBS sbs-battery</div><div class='add'>+~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Required properties :</div><div class='add'>+ - compatible : "sbs,sbs-battery"</div><div class='add'>+</div><div class='add'>+Optional properties :</div><div class='add'>+ - sbs,i2c-retry-count : The number of times to retry i2c transactions on i2c</div><div class='add'>+   IO failure.</div><div class='add'>+ - sbs,poll-retry-count : The number of times to try looking for new status</div><div class='add'>+   after an external change notification.</div><div class='add'>+ - sbs,battery-detect-gpios : The gpio which signals battery detection and</div><div class='add'>+   a flag specifying its polarity.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	bq20z75@b {</div><div class='add'>+		compatible = "sbs,sbs-battery";</div><div class='add'>+		reg = &lt; 0xb &gt;;</div><div class='add'>+		sbs,i2c-retry-count = &lt;2&gt;;</div><div class='add'>+		sbs,poll-retry-count = &lt;10&gt;;</div><div class='add'>+		sbs,battery-detect-gpios = &lt;&amp;gpio-controller 122 1&gt;;</div><div class='add'>+	}</div><div class='head'>diff --git a/Documentation/devicetree/bindings/powerpc/fsl/srio-rmu.txt b/Documentation/devicetree/bindings/powerpc/fsl/srio-rmu.txt<br/>new file mode 100644<br/>index 000000000000..b9a8a2bcfae7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/powerpc/fsl/srio-rmu.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/powerpc/fsl/srio-rmu.txt</a></div><div class='hunk'>@@ -0,0 +1,163 @@</div><div class='add'>+Message unit node:</div><div class='add'>+</div><div class='add'>+For SRIO controllers that implement the message unit as part of the controller</div><div class='add'>+this node is required.  For devices with RMAN this node should NOT exist.  The</div><div class='add'>+node is composed of three types of sub-nodes ("fsl-srio-msg-unit",</div><div class='add'>+"fsl-srio-dbell-unit" and "fsl-srio-port-write-unit").</div><div class='add'>+</div><div class='add'>+See srio.txt for more details about generic SRIO controller details.</div><div class='add'>+</div><div class='add'>+   - compatible</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;string&gt;</div><div class='add'>+	Definition: Must include "fsl,srio-rmu-vX.Y", "fsl,srio-rmu".</div><div class='add'>+</div><div class='add'>+	The version X.Y should match the general SRIO controller's IP Block</div><div class='add'>+	revision register's Major(X) and Minor (Y) value.</div><div class='add'>+</div><div class='add'>+   - reg</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+	Definition: A standard property.  Specifies the physical address and</div><div class='add'>+		length of the SRIO configuration registers for message units</div><div class='add'>+		and doorbell units.</div><div class='add'>+</div><div class='add'>+   - fsl,liodn</div><div class='add'>+	Usage: optional-but-recommended (for devices with PAMU)</div><div class='add'>+	Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+	Definition: The logical I/O device number for the PAMU (IOMMU) to be</div><div class='add'>+		correctly configured for SRIO accesses.  The property should</div><div class='add'>+		not exist on devices that do not support PAMU.</div><div class='add'>+</div><div class='add'>+		The LIODN value is associated with all RMU transactions</div><div class='add'>+		(msg-unit, doorbell, port-write).</div><div class='add'>+</div><div class='add'>+Sub-Nodes for RMU:  The RMU node is composed of multiple sub-nodes that</div><div class='add'>+correspond to the actual sub-controllers in the RMU.  The manual for a given</div><div class='add'>+SoC will detail which and how many of these sub-controllers are implemented.</div><div class='add'>+</div><div class='add'>+Message Unit:</div><div class='add'>+</div><div class='add'>+   - compatible</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;string&gt;</div><div class='add'>+	Definition: Must include "fsl,srio-msg-unit-vX.Y", "fsl,srio-msg-unit".</div><div class='add'>+</div><div class='add'>+	The version X.Y should match the general SRIO controller's IP Block</div><div class='add'>+	revision register's Major(X) and Minor (Y) value.</div><div class='add'>+</div><div class='add'>+   - reg</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+	Definition: A standard property.  Specifies the physical address and</div><div class='add'>+		length of the SRIO configuration registers for message units</div><div class='add'>+		and doorbell units.</div><div class='add'>+</div><div class='add'>+   - interrupts</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;prop_encoded-array&gt;</div><div class='add'>+	Definition:  Specifies the interrupts generated by this device.  The</div><div class='add'>+		value of the interrupts property consists of one interrupt</div><div class='add'>+		specifier. The format of the specifier is defined by the</div><div class='add'>+		binding document describing the node's interrupt parent.</div><div class='add'>+</div><div class='add'>+		A pair of IRQs are specified in this property.  The first</div><div class='add'>+		element is associated with the transmit (TX) interrupt and the</div><div class='add'>+		second element is associated with the receive (RX) interrupt.</div><div class='add'>+</div><div class='add'>+Doorbell Unit:</div><div class='add'>+</div><div class='add'>+   - compatible</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;string&gt;</div><div class='add'>+	Definition: Must include:</div><div class='add'>+		"fsl,srio-dbell-unit-vX.Y", "fsl,srio-dbell-unit"</div><div class='add'>+</div><div class='add'>+	The version X.Y should match the general SRIO controller's IP Block</div><div class='add'>+	revision register's Major(X) and Minor (Y) value.</div><div class='add'>+</div><div class='add'>+   - reg</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+	Definition: A standard property.  Specifies the physical address and</div><div class='add'>+		length of the SRIO configuration registers for message units</div><div class='add'>+		and doorbell units.</div><div class='add'>+</div><div class='add'>+   - interrupts</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;prop_encoded-array&gt;</div><div class='add'>+	Definition:  Specifies the interrupts generated by this device.  The</div><div class='add'>+		value of the interrupts property consists of one interrupt</div><div class='add'>+		specifier. The format of the specifier is defined by the</div><div class='add'>+		binding document describing the node's interrupt parent.</div><div class='add'>+</div><div class='add'>+		A pair of IRQs are specified in this property.  The first</div><div class='add'>+		element is associated with the transmit (TX) interrupt and the</div><div class='add'>+		second element is associated with the receive (RX) interrupt.</div><div class='add'>+</div><div class='add'>+Port-Write Unit:</div><div class='add'>+</div><div class='add'>+   - compatible</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;string&gt;</div><div class='add'>+	Definition: Must include:</div><div class='add'>+		 "fsl,srio-port-write-unit-vX.Y", "fsl,srio-port-write-unit"</div><div class='add'>+</div><div class='add'>+	The version X.Y should match the general SRIO controller's IP Block</div><div class='add'>+	revision register's Major(X) and Minor (Y) value.</div><div class='add'>+</div><div class='add'>+   - reg</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+	Definition: A standard property.  Specifies the physical address and</div><div class='add'>+		length of the SRIO configuration registers for message units</div><div class='add'>+		and doorbell units.</div><div class='add'>+</div><div class='add'>+   - interrupts</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;prop_encoded-array&gt;</div><div class='add'>+	Definition:  Specifies the interrupts generated by this device.  The</div><div class='add'>+		value of the interrupts property consists of one interrupt</div><div class='add'>+		specifier. The format of the specifier is defined by the</div><div class='add'>+		binding document describing the node's interrupt parent.</div><div class='add'>+</div><div class='add'>+		A single IRQ that handles port-write conditions is</div><div class='add'>+		specified by this property.  (Typically shared with error).</div><div class='add'>+</div><div class='add'>+   Note: All other standard properties (see the ePAPR) are allowed</div><div class='add'>+   but are optional.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+	rmu: rmu@d3000 {</div><div class='add'>+		compatible = "fsl,srio-rmu";</div><div class='add'>+		reg = &lt;0xd3000 0x400&gt;;</div><div class='add'>+		ranges = &lt;0x0 0xd3000 0x400&gt;;</div><div class='add'>+		fsl,liodn = &lt;0xc8&gt;;</div><div class='add'>+</div><div class='add'>+		message-unit@0 {</div><div class='add'>+			compatible = "fsl,srio-msg-unit";</div><div class='add'>+			reg = &lt;0x0 0x100&gt;;</div><div class='add'>+			interrupts = &lt;</div><div class='add'>+				60 2 0 0  /* msg1_tx_irq */</div><div class='add'>+				61 2 0 0&gt;;/* msg1_rx_irq */</div><div class='add'>+		};</div><div class='add'>+		message-unit@100 {</div><div class='add'>+			compatible = "fsl,srio-msg-unit";</div><div class='add'>+			reg = &lt;0x100 0x100&gt;;</div><div class='add'>+			interrupts = &lt;</div><div class='add'>+				62 2 0 0  /* msg2_tx_irq */</div><div class='add'>+				63 2 0 0&gt;;/* msg2_rx_irq */</div><div class='add'>+		};</div><div class='add'>+		doorbell-unit@400 {</div><div class='add'>+			compatible = "fsl,srio-dbell-unit";</div><div class='add'>+			reg = &lt;0x400 0x80&gt;;</div><div class='add'>+			interrupts = &lt;</div><div class='add'>+				56 2 0 0  /* bell_outb_irq */</div><div class='add'>+				57 2 0 0&gt;;/* bell_inb_irq */</div><div class='add'>+		};</div><div class='add'>+		port-write-unit@4e0 {</div><div class='add'>+			compatible = "fsl,srio-port-write-unit";</div><div class='add'>+			reg = &lt;0x4e0 0x20&gt;;</div><div class='add'>+			interrupts = &lt;16 2 1 11&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/powerpc/fsl/srio.txt b/Documentation/devicetree/bindings/powerpc/fsl/srio.txt<br/>new file mode 100644<br/>index 000000000000..b039bcbee134<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/powerpc/fsl/srio.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/powerpc/fsl/srio.txt</a></div><div class='hunk'>@@ -0,0 +1,103 @@</div><div class='add'>+* Freescale Serial RapidIO (SRIO) Controller</div><div class='add'>+</div><div class='add'>+RapidIO port node:</div><div class='add'>+Properties:</div><div class='add'>+   - compatible</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;string&gt;</div><div class='add'>+	Definition: Must include "fsl,srio" for IP blocks with IP Block</div><div class='add'>+	Revision Register (SRIO IPBRR1) Major ID equal to 0x01c0.</div><div class='add'>+</div><div class='add'>+	Optionally, a compatiable string of "fsl,srio-vX.Y" where X is Major</div><div class='add'>+	version in IP Block Revision Register and Y is Minor version.  If this</div><div class='add'>+	compatiable is provided it should be ordered before "fsl,srio".</div><div class='add'>+</div><div class='add'>+   - reg</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+	Definition: A standard property.  Specifies the physical address and</div><div class='add'>+		length of the SRIO configuration registers.  The size should</div><div class='add'>+		be set to 0x11000.</div><div class='add'>+</div><div class='add'>+   - interrupts</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;prop_encoded-array&gt;</div><div class='add'>+	Definition:  Specifies the interrupts generated by this device.  The</div><div class='add'>+		value of the interrupts property consists of one interrupt</div><div class='add'>+		specifier. The format of the specifier is defined by the</div><div class='add'>+		binding document describing the node's interrupt parent.</div><div class='add'>+</div><div class='add'>+		A single IRQ that handles error conditions is specified by this</div><div class='add'>+		property.  (Typically shared with port-write).</div><div class='add'>+</div><div class='add'>+   - fsl,srio-rmu-handle:</div><div class='add'>+	Usage: required if rmu node is defined</div><div class='add'>+	Value type: &lt;phandle&gt;</div><div class='add'>+	Definition: A single &lt;phandle&gt; value that points to the RMU.</div><div class='add'>+	(See srio-rmu.txt for more details on RMU node binding)</div><div class='add'>+</div><div class='add'>+Port Child Nodes:  There should a port child node for each port that exists in</div><div class='add'>+the controller.  The ports are numbered starting at one (1) and should have</div><div class='add'>+the following properties:</div><div class='add'>+</div><div class='add'>+   - cell-index</div><div class='add'>+	Usage: required</div><div class='add'>+	Value type: &lt;u32&gt;</div><div class='add'>+	Definition: A standard property.  Matches the port id.</div><div class='add'>+</div><div class='add'>+   - ranges</div><div class='add'>+	Usage: required if local access windows preset</div><div class='add'>+	Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+	Definition: A standard property. Utilized to describe the memory mapped</div><div class='add'>+		IO space utilized by the controller.  This corresponds to the</div><div class='add'>+		setting of the local access windows that are targeted to this</div><div class='add'>+		SRIO port.</div><div class='add'>+</div><div class='add'>+   - fsl,liodn</div><div class='add'>+	Usage: optional-but-recommended (for devices with PAMU)</div><div class='add'>+	Value type: &lt;prop-encoded-array&gt;</div><div class='add'>+	Definition: The logical I/O device number for the PAMU (IOMMU) to be</div><div class='add'>+		correctly configured for SRIO accesses.  The property should</div><div class='add'>+		not exist on devices that do not support PAMU.</div><div class='add'>+</div><div class='add'>+		For HW (ie, the P4080) that only supports a LIODN for both</div><div class='add'>+		memory and maintenance transactions then a single LIODN is</div><div class='add'>+		represented in the property for both transactions.</div><div class='add'>+</div><div class='add'>+		For HW (ie, the P304x/P5020, etc) that supports an LIODN for</div><div class='add'>+		memory transactions and a unique LIODN for maintenance</div><div class='add'>+		transactions then a pair of LIODNs are represented in the</div><div class='add'>+		property.  Within the pair, the first element represents the</div><div class='add'>+		LIODN associated with memory transactions and the second element</div><div class='add'>+		represents the LIODN associated with maintenance transactions</div><div class='add'>+		for the port.</div><div class='add'>+</div><div class='add'>+Note: All other standard properties (see ePAPR) are allowed but are optional.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	rapidio: rapidio@ffe0c0000 {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		reg = &lt;0xf 0xfe0c0000 0 0x11000&gt;;</div><div class='add'>+		compatible = "fsl,srio";</div><div class='add'>+		interrupts = &lt;16 2 1 11&gt;; /* err_irq */</div><div class='add'>+		fsl,srio-rmu-handle = &lt;&amp;rmu&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		port1 {</div><div class='add'>+			cell-index = &lt;1&gt;;</div><div class='add'>+			#address-cells = &lt;2&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			fsl,liodn = &lt;34&gt;;</div><div class='add'>+			ranges = &lt;0 0 0xc 0x20000000 0 0x10000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		port2 {</div><div class='add'>+			cell-index = &lt;2&gt;;</div><div class='add'>+			#address-cells = &lt;2&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			fsl,liodn = &lt;48&gt;;</div><div class='add'>+			ranges = &lt;0 0 0xc 0x30000000 0 0x10000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/regulator/fixed-regulator.txt b/Documentation/devicetree/bindings/regulator/fixed-regulator.txt<br/>new file mode 100644<br/>index 000000000000..9cf57fd042d2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/regulator/fixed-regulator.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/regulator/fixed-regulator.txt</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+Fixed Voltage regulators</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: Must be "regulator-fixed";</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- gpio: gpio to use for enable control</div><div class='add'>+- startup-delay-us: startup time in microseconds</div><div class='add'>+- enable-active-high: Polarity of GPIO is Active high</div><div class='add'>+If this property is missing, the default assumed is Active low.</div><div class='add'>+</div><div class='add'>+Any property defined as part of the core regulator</div><div class='add'>+binding, defined in regulator.txt, can also be used.</div><div class='add'>+However a fixed voltage regulator is expected to have the</div><div class='add'>+regulator-min-microvolt and regulator-max-microvolt</div><div class='add'>+to be the same.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	abc: fixedregulator@0 {</div><div class='add'>+		compatible = "regulator-fixed";</div><div class='add'>+		regulator-name = "fixed-supply";</div><div class='add'>+		regulator-min-microvolt = &lt;1800000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;1800000&gt;;</div><div class='add'>+		gpio = &lt;&amp;gpio1 16 0&gt;;</div><div class='add'>+		startup-delay-us = &lt;70000&gt;;</div><div class='add'>+		enable-active-high;</div><div class='add'>+		regulator-boot-on</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt<br/>new file mode 100644<br/>index 000000000000..5b7a408acdaa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/regulator/regulator.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/regulator/regulator.txt</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+Voltage/Current Regulators</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- regulator-name: A string used as a descriptive name for regulator outputs</div><div class='add'>+- regulator-min-microvolt: smallest voltage consumers may set</div><div class='add'>+- regulator-max-microvolt: largest voltage consumers may set</div><div class='add'>+- regulator-microvolt-offset: Offset applied to voltages to compensate for voltage drops</div><div class='add'>+- regulator-min-microamp: smallest current consumers may set</div><div class='add'>+- regulator-max-microamp: largest current consumers may set</div><div class='add'>+- regulator-always-on: boolean, regulator should never be disabled</div><div class='add'>+- regulator-boot-on: bootloader/firmware enabled regulator</div><div class='add'>+- &lt;name&gt;-supply: phandle to the parent supply/regulator node</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	xyzreg: regulator@0 {</div><div class='add'>+		regulator-min-microvolt = &lt;1000000&gt;;</div><div class='add'>+		regulator-max-microvolt = &lt;2500000&gt;;</div><div class='add'>+		regulator-always-on;</div><div class='add'>+		vin-supply = &lt;&amp;vin&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+Regulator Consumers:</div><div class='add'>+Consumer nodes can reference one or more of its supplies/</div><div class='add'>+regulators using the below bindings.</div><div class='add'>+</div><div class='add'>+- &lt;name&gt;-supply: phandle to the regulator node</div><div class='add'>+</div><div class='add'>+These are the same bindings that a regulator in the above</div><div class='add'>+example used to reference its own supply, in which case</div><div class='add'>+its just seen as a special case of a regulator being a</div><div class='add'>+consumer itself.</div><div class='add'>+</div><div class='add'>+Example of a consumer device node (mmc) referencing two</div><div class='add'>+regulators (twl_reg1 and twl_reg2),</div><div class='add'>+</div><div class='add'>+	twl_reg1: regulator@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'>+	twl_reg2: regulator@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'>+	mmc: mmc@0x0 {</div><div class='add'>+		...</div><div class='add'>+		...</div><div class='add'>+		vmmc-supply = &lt;&amp;twl_reg1&gt;;</div><div class='add'>+		vmmcaux-supply = &lt;&amp;twl_reg2&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/resource-names.txt b/Documentation/devicetree/bindings/resource-names.txt<br/>new file mode 100644<br/>index 000000000000..e280fef6f265<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/resource-names.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/resource-names.txt</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+Some properties contain an ordered list of 1 or more datum which are</div><div class='add'>+normally accessed by index.  However, some devices will have multiple</div><div class='add'>+values which are more naturally accessed by name.  Device nodes can</div><div class='add'>+include a supplemental property for assigning names to each of the list</div><div class='add'>+items.  The names property consists of a list of strings in the same</div><div class='add'>+order as the data in the resource property.</div><div class='add'>+</div><div class='add'>+The following supplemental names properties are defined.</div><div class='add'>+</div><div class='add'>+Resource Property	Supplemental Names Property</div><div class='add'>+-----------------	---------------------------</div><div class='add'>+reg			reg-names</div><div class='add'>+clocks			clock-names</div><div class='add'>+interrupts		interrupt-names</div><div class='add'>+</div><div class='add'>+Usage:</div><div class='add'>+</div><div class='add'>+The -names property must be used in conjunction with the normal resource</div><div class='add'>+property. If not it will be ignored.</div><div class='add'>+</div><div class='add'>+Examples:</div><div class='add'>+</div><div class='add'>+l4-abe {</div><div class='add'>+	compatible = "simple-bus";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	ranges = &lt;0 0 0x48000000 0x00001000&gt;, /* MPU path */</div><div class='add'>+		 &lt;1 0 0x49000000 0x00001000&gt;; /* L3 path */</div><div class='add'>+	mcasp {</div><div class='add'>+		compatible = "ti,mcasp";</div><div class='add'>+		reg = &lt;0 0x10 0x10&gt;, &lt;0 0x20 0x10&gt;,</div><div class='add'>+		      &lt;1 0x10 0x10&gt;, &lt;1 0x20 0x10&gt;;</div><div class='add'>+		reg-names = "mpu", "dat",</div><div class='add'>+			    "dma", "dma_dat";</div><div class='add'>+		interrupts = &lt;11&gt;, &lt;12&gt;;</div><div class='add'>+		interrupt-names = "rx", "tx";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	timer {</div><div class='add'>+		compatible = "ti,timer";</div><div class='add'>+		reg = &lt;0 0x40 0x10&gt;, &lt;1 0x40 0x10&gt;;</div><div class='add'>+		reg-names = "mpu", "dma";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+usb {</div><div class='add'>+	compatible = "ti,usb-host";</div><div class='add'>+	reg = &lt;0x4a064000 0x800&gt;, &lt;0x4a064800 0x200&gt;,</div><div class='add'>+	      &lt;0x4a064c00 0x200&gt;;</div><div class='add'>+	reg-names = "config", "ohci", "ehci";</div><div class='add'>+	interrupts = &lt;14&gt;, &lt;15&gt;;</div><div class='add'>+	interrupt-names = "ohci", "ehci";</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/rtc/s3c-rtc.txt b/Documentation/devicetree/bindings/rtc/s3c-rtc.txt<br/>new file mode 100644<br/>index 000000000000..90ec45fd33ec<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/rtc/s3c-rtc.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/rtc/s3c-rtc.txt</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+* Samsung's S3C Real Time Clock controller</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'>+    * "samsung,s3c2410-rtc" - for controllers compatible with s3c2410 rtc.</div><div class='add'>+    * "samsung,s3c6410-rtc" - for controllers compatible with s3c6410 rtc.</div><div class='add'>+- reg: physical base address of the controller and length of memory mapped</div><div class='add'>+  region.</div><div class='add'>+- interrupts: Two interrupt numbers to the cpu should be specified. First</div><div class='add'>+  interrupt number is the rtc alarm interupt and second interrupt number</div><div class='add'>+  is the rtc tick interrupt. The number of cells representing a interrupt</div><div class='add'>+  depends on the parent interrupt controller.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+	rtc@10070000 {</div><div class='add'>+		compatible = "samsung,s3c6410-rtc";</div><div class='add'>+		reg = &lt;0x10070000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;44 0 45 0&gt;;</div><div class='add'>+	};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/rtc/twl-rtc.txt b/Documentation/devicetree/bindings/rtc/twl-rtc.txt<br/>new file mode 100644<br/>index 000000000000..596e0c97be7a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/rtc/twl-rtc.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/rtc/twl-rtc.txt</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+* TI twl RTC</div><div class='add'>+</div><div class='add'>+The TWL family (twl4030/6030) contains a RTC.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : Should be twl4030-rtc</div><div class='add'>+</div><div class='add'>+Examples:</div><div class='add'>+</div><div class='add'>+rtc@0 {</div><div class='add'>+    compatible = "ti,twl4030-rtc";</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/serial/omap_serial.txt b/Documentation/devicetree/bindings/serial/omap_serial.txt<br/>new file mode 100644<br/>index 000000000000..342eedd10050<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/serial/omap_serial.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/serial/omap_serial.txt</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+OMAP UART controller</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : should be "ti,omap2-uart" for OMAP2 controllers</div><div class='add'>+- compatible : should be "ti,omap3-uart" for OMAP3 controllers</div><div class='add'>+- compatible : should be "ti,omap4-uart" for OMAP4 controllers</div><div class='add'>+- ti,hwmods : Must be "uart&lt;n&gt;", n being the instance number (1-based)</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- clock-frequency : frequency of the clock input to the UART</div><div class='head'>diff --git a/Documentation/devicetree/bindings/serial/samsung_uart.txt b/Documentation/devicetree/bindings/serial/samsung_uart.txt<br/>new file mode 100644<br/>index 000000000000..2c8a17cf5cb5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/serial/samsung_uart.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/serial/samsung_uart.txt</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+* Samsung's UART Controller</div><div class='add'>+</div><div class='add'>+The Samsung's UART controller is used for interfacing SoC with serial communicaion</div><div class='add'>+devices.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible: should be</div><div class='add'>+  - "samsung,exynos4210-uart", for UART's compatible with Exynos4210 uart ports.</div><div class='add'>+</div><div class='add'>+- reg: base physical address of the controller and length of memory mapped</div><div class='add'>+  region.</div><div class='add'>+</div><div class='add'>+- interrupts: interrupt number to the cpu. The interrupt specifier format depends</div><div class='add'>+  on the interrupt controller parent.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/tegra-audio-wm8903.txt b/Documentation/devicetree/bindings/sound/tegra-audio-wm8903.txt<br/>new file mode 100644<br/>index 000000000000..d5b0da8bf1d8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/sound/tegra-audio-wm8903.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/sound/tegra-audio-wm8903.txt</a></div><div class='hunk'>@@ -0,0 +1,71 @@</div><div class='add'>+NVIDIA Tegra audio complex</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : "nvidia,tegra-audio-wm8903"</div><div class='add'>+- nvidia,model : The user-visible name of this sound complex.</div><div class='add'>+- nvidia,audio-routing : A list of the connections between audio components.</div><div class='add'>+  Each entry is a pair of strings, the first being the connection's sink,</div><div class='add'>+  the second being the connection's source. Valid names for sources and</div><div class='add'>+  sinks are the WM8903's pins, and the jacks on the board:</div><div class='add'>+</div><div class='add'>+  WM8903 pins:</div><div class='add'>+</div><div class='add'>+  * IN1L</div><div class='add'>+  * IN1R</div><div class='add'>+  * IN2L</div><div class='add'>+  * IN2R</div><div class='add'>+  * IN3L</div><div class='add'>+  * IN3R</div><div class='add'>+  * DMICDAT</div><div class='add'>+  * HPOUTL</div><div class='add'>+  * HPOUTR</div><div class='add'>+  * LINEOUTL</div><div class='add'>+  * LINEOUTR</div><div class='add'>+  * LOP</div><div class='add'>+  * LON</div><div class='add'>+  * ROP</div><div class='add'>+  * RON</div><div class='add'>+  * MICBIAS</div><div class='add'>+</div><div class='add'>+  Board connectors:</div><div class='add'>+</div><div class='add'>+  * Headphone Jack</div><div class='add'>+  * Int Spk</div><div class='add'>+  * Mic Jack</div><div class='add'>+</div><div class='add'>+- nvidia,i2s-controller : The phandle of the Tegra I2S1 controller</div><div class='add'>+- nvidia,audio-codec : The phandle of the WM8903 audio codec</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+- nvidia,spkr-en-gpios : The GPIO that enables the speakers</div><div class='add'>+- nvidia,hp-mute-gpios : The GPIO that mutes the headphones</div><div class='add'>+- nvidia,hp-det-gpios : The GPIO that detect headphones are plugged in</div><div class='add'>+- nvidia,int-mic-en-gpios : The GPIO that enables the internal microphone</div><div class='add'>+- nvidia,ext-mic-en-gpios : The GPIO that enables the external microphone</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+sound {</div><div class='add'>+	compatible = "nvidia,tegra-audio-wm8903-harmony",</div><div class='add'>+		     "nvidia,tegra-audio-wm8903"</div><div class='add'>+	nvidia,model = "tegra-wm8903-harmony";</div><div class='add'>+</div><div class='add'>+	nvidia,audio-routing =</div><div class='add'>+		"Headphone Jack", "HPOUTR",</div><div class='add'>+		"Headphone Jack", "HPOUTL",</div><div class='add'>+		"Int Spk", "ROP",</div><div class='add'>+		"Int Spk", "RON",</div><div class='add'>+		"Int Spk", "LOP",</div><div class='add'>+		"Int Spk", "LON",</div><div class='add'>+		"Mic Jack", "MICBIAS",</div><div class='add'>+		"IN1L", "Mic Jack";</div><div class='add'>+</div><div class='add'>+	nvidia,i2s-controller = &lt;&amp;i2s1&gt;;</div><div class='add'>+	nvidia,audio-codec = &lt;&amp;wm8903&gt;;</div><div class='add'>+</div><div class='add'>+	nvidia,spkr-en-gpios = &lt;&amp;codec 2 0&gt;;</div><div class='add'>+	nvidia,hp-det-gpios = &lt;&amp;gpio 178 0&gt;; /* gpio PW2 */</div><div class='add'>+	nvidia,int-mic-en-gpios = &lt;&amp;gpio 184 0&gt;; /*gpio PX0 */</div><div class='add'>+	nvidia,ext-mic-en-gpios = &lt;&amp;gpio 185 0&gt;; /* gpio PX1 */</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/tegra20-das.txt b/Documentation/devicetree/bindings/sound/tegra20-das.txt<br/>new file mode 100644<br/>index 000000000000..6de3a7ee4efb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/sound/tegra20-das.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/sound/tegra20-das.txt</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+NVIDIA Tegra 20 DAS (Digital Audio Switch) controller</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : "nvidia,tegra20-das"</div><div class='add'>+- reg : Should contain DAS registers location and length</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+das@70000c00 {</div><div class='add'>+	compatible = "nvidia,tegra20-das";</div><div class='add'>+	reg = &lt;0x70000c00 0x80&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/tegra20-i2s.txt b/Documentation/devicetree/bindings/sound/tegra20-i2s.txt<br/>new file mode 100644<br/>index 000000000000..0df2b5c816e3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/sound/tegra20-i2s.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/sound/tegra20-i2s.txt</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+NVIDIA Tegra 20 I2S controller</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+- compatible : "nvidia,tegra20-i2s"</div><div class='add'>+- reg : Should contain I2S registers location and length</div><div class='add'>+- interrupts : Should contain I2S interrupt</div><div class='add'>+- nvidia,dma-request-selector : The Tegra DMA controller's phandle and</div><div class='add'>+  request selector for this I2S controller</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+i2s@70002800 {</div><div class='add'>+	compatible = "nvidia,tegra20-i2s";</div><div class='add'>+	reg = &lt;0x70002800 0x200&gt;;</div><div class='add'>+	interrupts = &lt; 45 &gt;;</div><div class='add'>+	nvidia,dma-request-selector = &lt; &amp;apbdma 2 &gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/wm8903.txt b/Documentation/devicetree/bindings/sound/wm8903.txt<br/>new file mode 100644<br/>index 000000000000..f102cbc42694<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/sound/wm8903.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/sound/wm8903.txt</a></div><div class='hunk'>@@ -0,0 +1,50 @@</div><div class='add'>+WM8903 audio CODEC</div><div class='add'>+</div><div class='add'>+This device supports I2C only.</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+  - compatible : "wlf,wm8903"</div><div class='add'>+</div><div class='add'>+  - reg : the I2C address of the device.</div><div class='add'>+</div><div class='add'>+  - gpio-controller : Indicates this device is a GPIO controller.</div><div class='add'>+</div><div class='add'>+  - #gpio-cells : Should be two. The first cell is the pin number and the</div><div class='add'>+    second cell is used to specify optional parameters (currently unused).</div><div class='add'>+</div><div class='add'>+Optional properties:</div><div class='add'>+</div><div class='add'>+  - interrupts : The interrupt line the codec is connected to.</div><div class='add'>+</div><div class='add'>+  - micdet-cfg : Default register value for R6 (Mic Bias). If absent, the</div><div class='add'>+    default is 0.</div><div class='add'>+</div><div class='add'>+  - micdet-delay : The debounce delay for microphone detection in mS. If</div><div class='add'>+    absent, the default is 100.</div><div class='add'>+</div><div class='add'>+  - gpio-cfg : A list of GPIO configuration register values. The list must</div><div class='add'>+    be 5 entries long. If absent, no configuration of these registers is</div><div class='add'>+    performed. If any entry has the value 0xffffffff, that GPIO's</div><div class='add'>+    configuration will not be modified.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+codec: wm8903@1a {</div><div class='add'>+	compatible = "wlf,wm8903";</div><div class='add'>+	reg = &lt;0x1a&gt;;</div><div class='add'>+	interrupts = &lt; 347 &gt;;</div><div class='add'>+</div><div class='add'>+	gpio-controller;</div><div class='add'>+	#gpio-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	micdet-cfg = &lt;0&gt;;</div><div class='add'>+	micdet-delay = &lt;100&gt;;</div><div class='add'>+	gpio-cfg = &lt;</div><div class='add'>+		0x0600 /* DMIC_LR, output */</div><div class='add'>+		0x0680 /* DMIC_DAT, input */</div><div class='add'>+		0x0000 /* GPIO, output, low */</div><div class='add'>+		0x0200 /* Interrupt, output */</div><div class='add'>+		0x01a0 /* BCLK, input, active high */</div><div class='add'>+	&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/sound/wm8994.txt b/Documentation/devicetree/bindings/sound/wm8994.txt<br/>new file mode 100644<br/>index 000000000000..7a7eb1e7bda6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/sound/wm8994.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/sound/wm8994.txt</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+WM1811/WM8994/WM8958 audio CODEC</div><div class='add'>+</div><div class='add'>+These devices support both I2C and SPI (configured with pin strapping</div><div class='add'>+on the board).</div><div class='add'>+</div><div class='add'>+Required properties:</div><div class='add'>+</div><div class='add'>+  - compatible : "wlf,wm1811", "wlf,wm8994", "wlf,wm8958"</div><div class='add'>+</div><div class='add'>+  - reg : the I2C address of the device for I2C, the chip select</div><div class='add'>+          number for SPI.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+codec: wm8994@1a {</div><div class='add'>+	compatible = "wlf,wm8994";</div><div class='add'>+	reg = &lt;0x1a&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/devicetree/bindings/usb/tegra-usb.txt b/Documentation/devicetree/bindings/usb/tegra-usb.txt<br/>new file mode 100644<br/>index 000000000000..035d63d5646d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/usb/tegra-usb.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/usb/tegra-usb.txt</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+Tegra SOC USB controllers</div><div class='add'>+</div><div class='add'>+The device node for a USB controller that is part of a Tegra</div><div class='add'>+SOC is as described in the document "Open Firmware Recommended</div><div class='add'>+Practice : Universal Serial Bus" with the following modifications</div><div class='add'>+and additions :</div><div class='add'>+</div><div class='add'>+Required properties :</div><div class='add'>+ - compatible : Should be "nvidia,tegra20-ehci" for USB controllers</div><div class='add'>+   used in host mode.</div><div class='add'>+ - phy_type : Should be one of "ulpi" or "utmi".</div><div class='add'>+ - nvidia,vbus-gpio : If present, specifies a gpio that needs to be</div><div class='add'>+   activated for the bus to be powered.</div><div class='head'>diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt<br/>index 874921e97802..ecc6a6cd26c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/vendor-prefixes.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/devicetree/bindings/vendor-prefixes.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devicetree/bindings/vendor-prefixes.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/devicetree/bindings/vendor-prefixes.txt</a></div><div class='hunk'>@@ -8,7 +8,9 @@ amcc	Applied Micro Circuits Corporation (APM, formally AMCC)</div><div class='ctx'> apm	Applied Micro Circuits Corporation (APM)</div><div class='ctx'> arm	ARM Ltd.</div><div class='ctx'> atmel	Atmel Corporation</div><div class='add'>+cavium	Cavium, Inc.</div><div class='ctx'> chrp	Common Hardware Reference Platform</div><div class='add'>+cortina	Cortina Systems, Inc.</div><div class='ctx'> dallas	Maxim Integrated Products (formerly Dallas Semiconductor)</div><div class='ctx'> denx	Denx Software Engineering</div><div class='ctx'> epson	Seiko Epson Corp.</div><div class='hunk'>@@ -32,10 +34,13 @@ powervr	Imagination Technologies</div><div class='ctx'> qcom	Qualcomm, Inc.</div><div class='ctx'> ramtron	Ramtron International</div><div class='ctx'> samsung	Samsung Semiconductor</div><div class='add'>+sbs	Smart Battery System</div><div class='ctx'> schindler	Schindler</div><div class='ctx'> sil	Silicon Image</div><div class='ctx'> simtek</div><div class='ctx'> sirf	SiRF Technology, Inc.</div><div class='add'>+st	STMicroelectronics</div><div class='ctx'> stericsson	ST-Ericsson</div><div class='ctx'> ti	Texas Instruments</div><div class='add'>+wlf	Wolfson Microelectronics</div><div class='ctx'> xlnx	Xilinx</div><div class='head'>diff --git a/Documentation/digsig.txt b/Documentation/digsig.txt<br/>new file mode 100644<br/>index 000000000000..3f682889068b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/digsig.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/digsig.txt</a></div><div class='hunk'>@@ -0,0 +1,96 @@</div><div class='add'>+Digital Signature Verification API</div><div class='add'>+</div><div class='add'>+CONTENTS</div><div class='add'>+</div><div class='add'>+1. Introduction</div><div class='add'>+2. API</div><div class='add'>+3. User-space utilities</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+1. Introduction</div><div class='add'>+</div><div class='add'>+Digital signature verification API provides a method to verify digital signature.</div><div class='add'>+Currently digital signatures are used by the IMA/EVM integrity protection subsystem.</div><div class='add'>+</div><div class='add'>+Digital signature verification is implemented using cut-down kernel port of</div><div class='add'>+GnuPG multi-precision integers (MPI) library. The kernel port provides</div><div class='add'>+memory allocation errors handling, has been refactored according to kernel</div><div class='add'>+coding style, and checkpatch.pl reported errors and warnings have been fixed.</div><div class='add'>+</div><div class='add'>+Public key and signature consist of header and MPIs.</div><div class='add'>+</div><div class='add'>+struct pubkey_hdr {</div><div class='add'>+	uint8_t		version;	/* key format version */</div><div class='add'>+	time_t		timestamp;	/* key made, always 0 for now */</div><div class='add'>+	uint8_t		algo;</div><div class='add'>+	uint8_t		nmpi;</div><div class='add'>+	char		mpi[0];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct signature_hdr {</div><div class='add'>+	uint8_t		version;	/* signature format version */</div><div class='add'>+	time_t		timestamp;	/* signature made */</div><div class='add'>+	uint8_t		algo;</div><div class='add'>+	uint8_t		hash;</div><div class='add'>+	uint8_t		keyid[8];</div><div class='add'>+	uint8_t		nmpi;</div><div class='add'>+	char		mpi[0];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+keyid equals to SHA1[12-19] over the total key content.</div><div class='add'>+Signature header is used as an input to generate a signature.</div><div class='add'>+Such approach insures that key or signature header could not be changed.</div><div class='add'>+It protects timestamp from been changed and can be used for rollback</div><div class='add'>+protection.</div><div class='add'>+</div><div class='add'>+2. API</div><div class='add'>+</div><div class='add'>+API currently includes only 1 function:</div><div class='add'>+</div><div class='add'>+	digsig_verify() - digital signature verification with public key</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * digsig_verify() - digital signature verification with public key</div><div class='add'>+ * @keyring:	keyring to search key in</div><div class='add'>+ * @sig:	digital signature</div><div class='add'>+ * @sigen:	length of the signature</div><div class='add'>+ * @data:	data</div><div class='add'>+ * @datalen:	length of the data</div><div class='add'>+ * @return:	0 on success, -EINVAL otherwise</div><div class='add'>+ *</div><div class='add'>+ * Verifies data integrity against digital signature.</div><div class='add'>+ * Currently only RSA is supported.</div><div class='add'>+ * Normally hash of the content is used as a data for this function.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+int digsig_verify(struct key *keyring, const char *sig, int siglen,</div><div class='add'>+						const char *data, int datalen);</div><div class='add'>+</div><div class='add'>+3. User-space utilities</div><div class='add'>+</div><div class='add'>+The signing and key management utilities evm-utils provide functionality</div><div class='add'>+to generate signatures, to load keys into the kernel keyring.</div><div class='add'>+Keys can be in PEM or converted to the kernel format.</div><div class='add'>+When the key is added to the kernel keyring, the keyid defines the name</div><div class='add'>+of the key: 5D2B05FC633EE3E8 in the example bellow.</div><div class='add'>+</div><div class='add'>+Here is example output of the keyctl utility.</div><div class='add'>+</div><div class='add'>+$ keyctl show</div><div class='add'>+Session Keyring</div><div class='add'>+       -3 --alswrv      0     0  keyring: _ses</div><div class='add'>+603976250 --alswrv      0    -1   \_ keyring: _uid.0</div><div class='add'>+817777377 --alswrv      0     0       \_ user: kmk</div><div class='add'>+891974900 --alswrv      0     0       \_ encrypted: evm-key</div><div class='add'>+170323636 --alswrv      0     0       \_ keyring: _module</div><div class='add'>+548221616 --alswrv      0     0       \_ keyring: _ima</div><div class='add'>+128198054 --alswrv      0     0       \_ keyring: _evm</div><div class='add'>+</div><div class='add'>+$ keyctl list 128198054</div><div class='add'>+1 key in keyring:</div><div class='add'>+620789745: --alswrv     0     0 user: 5D2B05FC633EE3E8</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Dmitry Kasatkin</div><div class='add'>+06.10.2011</div><div class='head'>diff --git a/Documentation/dma-buf-sharing.txt b/Documentation/dma-buf-sharing.txt<br/>new file mode 100644<br/>index 000000000000..225f96d88f55<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/dma-buf-sharing.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/dma-buf-sharing.txt</a></div><div class='hunk'>@@ -0,0 +1,228 @@</div><div class='add'>+                    DMA Buffer Sharing API Guide</div><div class='add'>+                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+                            Sumit Semwal</div><div class='add'>+                &lt;sumit dot semwal at linaro dot org&gt;</div><div class='add'>+                 &lt;sumit dot semwal at ti dot com&gt;</div><div class='add'>+</div><div class='add'>+This document serves as a guide to device-driver writers on what is the dma-buf</div><div class='add'>+buffer sharing API, how to use it for exporting and using shared buffers.</div><div class='add'>+</div><div class='add'>+Any device driver which wishes to be a part of DMA buffer sharing, can do so as</div><div class='add'>+either the 'exporter' of buffers, or the 'user' of buffers.</div><div class='add'>+</div><div class='add'>+Say a driver A wants to use buffers created by driver B, then we call B as the</div><div class='add'>+exporter, and A as buffer-user.</div><div class='add'>+</div><div class='add'>+The exporter</div><div class='add'>+- implements and manages operations[1] for the buffer</div><div class='add'>+- allows other users to share the buffer by using dma_buf sharing APIs,</div><div class='add'>+- manages the details of buffer allocation,</div><div class='add'>+- decides about the actual backing storage where this allocation happens,</div><div class='add'>+- takes care of any migration of scatterlist - for all (shared) users of this</div><div class='add'>+   buffer,</div><div class='add'>+</div><div class='add'>+The buffer-user</div><div class='add'>+- is one of (many) sharing users of the buffer.</div><div class='add'>+- doesn't need to worry about how the buffer is allocated, or where.</div><div class='add'>+- needs a mechanism to get access to the scatterlist that makes up this buffer</div><div class='add'>+   in memory, mapped into its own address space, so it can access the same area</div><div class='add'>+   of memory.</div><div class='add'>+</div><div class='add'>+*IMPORTANT*: [see https://lkml.org/lkml/2011/12/20/211 for more details]</div><div class='add'>+For this first version, A buffer shared using the dma_buf sharing API:</div><div class='add'>+- *may* be exported to user space using "mmap" *ONLY* by exporter, outside of</div><div class='add'>+   this framework.</div><div class='add'>+- may be used *ONLY* by importers that do not need CPU access to the buffer.</div><div class='add'>+</div><div class='add'>+The dma_buf buffer sharing API usage contains the following steps:</div><div class='add'>+</div><div class='add'>+1. Exporter announces that it wishes to export a buffer</div><div class='add'>+2. Userspace gets the file descriptor associated with the exported buffer, and</div><div class='add'>+   passes it around to potential buffer-users based on use case</div><div class='add'>+3. Each buffer-user 'connects' itself to the buffer</div><div class='add'>+4. When needed, buffer-user requests access to the buffer from exporter</div><div class='add'>+5. When finished with its use, the buffer-user notifies end-of-DMA to exporter</div><div class='add'>+6. when buffer-user is done using this buffer completely, it 'disconnects'</div><div class='add'>+   itself from the buffer.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+1. Exporter's announcement of buffer export</div><div class='add'>+</div><div class='add'>+   The buffer exporter announces its wish to export a buffer. In this, it</div><div class='add'>+   connects its own private buffer data, provides implementation for operations</div><div class='add'>+   that can be performed on the exported dma_buf, and flags for the file</div><div class='add'>+   associated with this buffer.</div><div class='add'>+</div><div class='add'>+   Interface:</div><div class='add'>+      struct dma_buf *dma_buf_export(void *priv, struct dma_buf_ops *ops,</div><div class='add'>+				     size_t size, int flags)</div><div class='add'>+</div><div class='add'>+   If this succeeds, dma_buf_export allocates a dma_buf structure, and returns a</div><div class='add'>+   pointer to the same. It also associates an anonymous file with this buffer,</div><div class='add'>+   so it can be exported. On failure to allocate the dma_buf object, it returns</div><div class='add'>+   NULL.</div><div class='add'>+</div><div class='add'>+2. Userspace gets a handle to pass around to potential buffer-users</div><div class='add'>+</div><div class='add'>+   Userspace entity requests for a file-descriptor (fd) which is a handle to the</div><div class='add'>+   anonymous file associated with the buffer. It can then share the fd with other</div><div class='add'>+   drivers and/or processes.</div><div class='add'>+</div><div class='add'>+   Interface:</div><div class='add'>+      int dma_buf_fd(struct dma_buf *dmabuf)</div><div class='add'>+</div><div class='add'>+   This API installs an fd for the anonymous file associated with this buffer;</div><div class='add'>+   returns either 'fd', or error.</div><div class='add'>+</div><div class='add'>+3. Each buffer-user 'connects' itself to the buffer</div><div class='add'>+</div><div class='add'>+   Each buffer-user now gets a reference to the buffer, using the fd passed to</div><div class='add'>+   it.</div><div class='add'>+</div><div class='add'>+   Interface:</div><div class='add'>+      struct dma_buf *dma_buf_get(int fd)</div><div class='add'>+</div><div class='add'>+   This API will return a reference to the dma_buf, and increment refcount for</div><div class='add'>+   it.</div><div class='add'>+</div><div class='add'>+   After this, the buffer-user needs to attach its device with the buffer, which</div><div class='add'>+   helps the exporter to know of device buffer constraints.</div><div class='add'>+</div><div class='add'>+   Interface:</div><div class='add'>+      struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,</div><div class='add'>+                                                struct device *dev)</div><div class='add'>+</div><div class='add'>+   This API returns reference to an attachment structure, which is then used</div><div class='add'>+   for scatterlist operations. It will optionally call the 'attach' dma_buf</div><div class='add'>+   operation, if provided by the exporter.</div><div class='add'>+</div><div class='add'>+   The dma-buf sharing framework does the bookkeeping bits related to managing</div><div class='add'>+   the list of all attachments to a buffer.</div><div class='add'>+</div><div class='add'>+Until this stage, the buffer-exporter has the option to choose not to actually</div><div class='add'>+allocate the backing storage for this buffer, but wait for the first buffer-user</div><div class='add'>+to request use of buffer for allocation.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4. When needed, buffer-user requests access to the buffer</div><div class='add'>+</div><div class='add'>+   Whenever a buffer-user wants to use the buffer for any DMA, it asks for</div><div class='add'>+   access to the buffer using dma_buf_map_attachment API. At least one attach to</div><div class='add'>+   the buffer must have happened before map_dma_buf can be called.</div><div class='add'>+</div><div class='add'>+   Interface:</div><div class='add'>+      struct sg_table * dma_buf_map_attachment(struct dma_buf_attachment *,</div><div class='add'>+                                         enum dma_data_direction);</div><div class='add'>+</div><div class='add'>+   This is a wrapper to dma_buf-&gt;ops-&gt;map_dma_buf operation, which hides the</div><div class='add'>+   "dma_buf-&gt;ops-&gt;" indirection from the users of this interface.</div><div class='add'>+</div><div class='add'>+   In struct dma_buf_ops, map_dma_buf is defined as</div><div class='add'>+      struct sg_table * (*map_dma_buf)(struct dma_buf_attachment *,</div><div class='add'>+                                                enum dma_data_direction);</div><div class='add'>+</div><div class='add'>+   It is one of the buffer operations that must be implemented by the exporter.</div><div class='add'>+   It should return the sg_table containing scatterlist for this buffer, mapped</div><div class='add'>+   into caller's address space.</div><div class='add'>+</div><div class='add'>+   If this is being called for the first time, the exporter can now choose to</div><div class='add'>+   scan through the list of attachments for this buffer, collate the requirements</div><div class='add'>+   of the attached devices, and choose an appropriate backing storage for the</div><div class='add'>+   buffer.</div><div class='add'>+</div><div class='add'>+   Based on enum dma_data_direction, it might be possible to have multiple users</div><div class='add'>+   accessing at the same time (for reading, maybe), or any other kind of sharing</div><div class='add'>+   that the exporter might wish to make available to buffer-users.</div><div class='add'>+</div><div class='add'>+   map_dma_buf() operation can return -EINTR if it is interrupted by a signal.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5. When finished, the buffer-user notifies end-of-DMA to exporter</div><div class='add'>+</div><div class='add'>+   Once the DMA for the current buffer-user is over, it signals 'end-of-DMA' to</div><div class='add'>+   the exporter using the dma_buf_unmap_attachment API.</div><div class='add'>+</div><div class='add'>+   Interface:</div><div class='add'>+      void dma_buf_unmap_attachment(struct dma_buf_attachment *,</div><div class='add'>+                                    struct sg_table *);</div><div class='add'>+</div><div class='add'>+   This is a wrapper to dma_buf-&gt;ops-&gt;unmap_dma_buf() operation, which hides the</div><div class='add'>+   "dma_buf-&gt;ops-&gt;" indirection from the users of this interface.</div><div class='add'>+</div><div class='add'>+   In struct dma_buf_ops, unmap_dma_buf is defined as</div><div class='add'>+      void (*unmap_dma_buf)(struct dma_buf_attachment *, struct sg_table *);</div><div class='add'>+</div><div class='add'>+   unmap_dma_buf signifies the end-of-DMA for the attachment provided. Like</div><div class='add'>+   map_dma_buf, this API also must be implemented by the exporter.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+6. when buffer-user is done using this buffer, it 'disconnects' itself from the</div><div class='add'>+   buffer.</div><div class='add'>+</div><div class='add'>+   After the buffer-user has no more interest in using this buffer, it should</div><div class='add'>+   disconnect itself from the buffer:</div><div class='add'>+</div><div class='add'>+   - it first detaches itself from the buffer.</div><div class='add'>+</div><div class='add'>+   Interface:</div><div class='add'>+      void dma_buf_detach(struct dma_buf *dmabuf,</div><div class='add'>+                          struct dma_buf_attachment *dmabuf_attach);</div><div class='add'>+</div><div class='add'>+   This API removes the attachment from the list in dmabuf, and optionally calls</div><div class='add'>+   dma_buf-&gt;ops-&gt;detach(), if provided by exporter, for any housekeeping bits.</div><div class='add'>+</div><div class='add'>+   - Then, the buffer-user returns the buffer reference to exporter.</div><div class='add'>+</div><div class='add'>+   Interface:</div><div class='add'>+     void dma_buf_put(struct dma_buf *dmabuf);</div><div class='add'>+</div><div class='add'>+   This API then reduces the refcount for this buffer.</div><div class='add'>+</div><div class='add'>+   If, as a result of this call, the refcount becomes 0, the 'release' file</div><div class='add'>+   operation related to this fd is called. It calls the dmabuf-&gt;ops-&gt;release()</div><div class='add'>+   operation in turn, and frees the memory allocated for dmabuf when exported.</div><div class='add'>+</div><div class='add'>+NOTES:</div><div class='add'>+- Importance of attach-detach and {map,unmap}_dma_buf operation pairs</div><div class='add'>+   The attach-detach calls allow the exporter to figure out backing-storage</div><div class='add'>+   constraints for the currently-interested devices. This allows preferential</div><div class='add'>+   allocation, and/or migration of pages across different types of storage</div><div class='add'>+   available, if possible.</div><div class='add'>+</div><div class='add'>+   Bracketing of DMA access with {map,unmap}_dma_buf operations is essential</div><div class='add'>+   to allow just-in-time backing of storage, and migration mid-way through a</div><div class='add'>+   use-case.</div><div class='add'>+</div><div class='add'>+- Migration of backing storage if needed</div><div class='add'>+   If after</div><div class='add'>+   - at least one map_dma_buf has happened,</div><div class='add'>+   - and the backing storage has been allocated for this buffer,</div><div class='add'>+   another new buffer-user intends to attach itself to this buffer, it might</div><div class='add'>+   be allowed, if possible for the exporter.</div><div class='add'>+</div><div class='add'>+   In case it is allowed by the exporter:</div><div class='add'>+    if the new buffer-user has stricter 'backing-storage constraints', and the</div><div class='add'>+    exporter can handle these constraints, the exporter can just stall on the</div><div class='add'>+    map_dma_buf until all outstanding access is completed (as signalled by</div><div class='add'>+    unmap_dma_buf).</div><div class='add'>+    Once all users have finished accessing and have unmapped this buffer, the</div><div class='add'>+    exporter could potentially move the buffer to the stricter backing-storage,</div><div class='add'>+    and then allow further {map,unmap}_dma_buf operations from any buffer-user</div><div class='add'>+    from the migrated backing-storage.</div><div class='add'>+</div><div class='add'>+   If the exporter cannot fulfil the backing-storage constraints of the new</div><div class='add'>+   buffer-user device as requested, dma_buf_attach() would return an error to</div><div class='add'>+   denote non-compatibility of the new buffer-sharing request with the current</div><div class='add'>+   buffer.</div><div class='add'>+</div><div class='add'>+   If the exporter chooses not to allow an attach() operation once a</div><div class='add'>+   map_dma_buf() API has been called, it simply returns an error.</div><div class='add'>+</div><div class='add'>+Miscellaneous notes:</div><div class='add'>+- Any exporters or users of the dma-buf buffer sharing framework must have</div><div class='add'>+  a 'select DMA_SHARED_BUFFER' in their respective Kconfigs.</div><div class='add'>+</div><div class='add'>+References:</div><div class='add'>+[1] struct dma_buf_ops in include/linux/dma-buf.h</div><div class='add'>+[2] All interfaces mentioned above defined in include/linux/dma-buf.h</div><div class='head'>diff --git a/Documentation/dmaengine.txt b/Documentation/dmaengine.txt<br/>index 94b7e0f96b38..bbe6cb3d1856 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/dmaengine.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/dmaengine.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/dmaengine.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/dmaengine.txt</a></div><div class='hunk'>@@ -75,6 +75,10 @@ The slave DMA usage consists of following steps:</div><div class='ctx'>    slave_sg	- DMA a list of scatter gather buffers from/to a peripheral</div><div class='ctx'>    dma_cyclic	- Perform a cyclic DMA operation from/to a peripheral till the</div><div class='ctx'> 		  operation is explicitly stopped.</div><div class='add'>+   interleaved_dma - This is common to Slave as well as M2M clients. For slave</div><div class='add'>+		 address of devices' fifo could be already known to the driver.</div><div class='add'>+		 Various types of operations could be expressed by setting</div><div class='add'>+		 appropriate values to the 'dma_interleaved_template' members.</div><div class='ctx'> </div><div class='ctx'>    A non-NULL return of this transfer API represents a "descriptor" for</div><div class='ctx'>    the given transaction.</div><div class='hunk'>@@ -89,6 +93,10 @@ The slave DMA usage consists of following steps:</div><div class='ctx'> 		struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,</div><div class='ctx'> 		size_t period_len, enum dma_data_direction direction);</div><div class='ctx'> </div><div class='add'>+	struct dma_async_tx_descriptor *(*device_prep_interleaved_dma)(</div><div class='add'>+		struct dma_chan *chan, struct dma_interleaved_template *xt,</div><div class='add'>+		unsigned long flags);</div><div class='add'>+</div><div class='ctx'>    The peripheral driver is expected to have mapped the scatterlist for</div><div class='ctx'>    the DMA operation prior to calling device_prep_slave_sg, and must</div><div class='ctx'>    keep the scatterlist mapped until the DMA operation has completed.</div><div class='head'>diff --git a/Documentation/dontdiff b/Documentation/dontdiff<br/>index dfa6fc6e4b28..0c083c5c2faa 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/dontdiff?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/dontdiff</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/dontdiff?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/dontdiff</a></div><div class='hunk'>@@ -66,7 +66,6 @@ GRTAGS</div><div class='ctx'> GSYMS</div><div class='ctx'> GTAGS</div><div class='ctx'> Image</div><div class='del'>-Kerntypes</div><div class='ctx'> Module.markers</div><div class='ctx'> Module.symvers</div><div class='ctx'> PENDING</div><div class='head'>diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt<br/>index d79aead9418b..10c64c8a13d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/driver-model/devres.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/driver-model/devres.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/driver-model/devres.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/driver-model/devres.txt</a></div><div class='hunk'>@@ -262,6 +262,7 @@ IOMAP</div><div class='ctx'>   devm_ioremap()</div><div class='ctx'>   devm_ioremap_nocache()</div><div class='ctx'>   devm_iounmap()</div><div class='add'>+  devm_request_and_ioremap() : checks resource, requests region, ioremaps</div><div class='ctx'>   pcim_iomap()</div><div class='ctx'>   pcim_iounmap()</div><div class='ctx'>   pcim_iomap_table()	: array of mapped addresses indexed by BAR</div><div class='head'>diff --git a/Documentation/dvb/get_dvb_firmware b/Documentation/dvb/get_dvb_firmware<br/>index e67be7afc78b..d1d4a179a382 100755<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/dvb/get_dvb_firmware?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/dvb/get_dvb_firmware</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/dvb/get_dvb_firmware?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/dvb/get_dvb_firmware</a></div><div class='hunk'>@@ -27,8 +27,8 @@ use IO::Handle;</div><div class='ctx'> 		"or51211", "or51132_qam", "or51132_vsb", "bluebird",</div><div class='ctx'> 		"opera1", "cx231xx", "cx18", "cx23885", "pvrusb2", "mpc718",</div><div class='ctx'> 		"af9015", "ngene", "az6027", "lme2510_lg", "lme2510c_s7395",</div><div class='del'>-		"lme2510c_s7395_old", "drxk", "drxk_terratec_h5", "tda10071",</div><div class='del'>-		"it9135" );</div><div class='add'>+		"lme2510c_s7395_old", "drxk", "drxk_terratec_h5",</div><div class='add'>+		"drxk_hauppauge_hvr930c", "tda10071", "it9135", "it9137");</div><div class='ctx'> </div><div class='ctx'> # Check args</div><div class='ctx'> syntax() if (scalar(@ARGV) != 1);</div><div class='hunk'>@@ -644,6 +644,24 @@ sub drxk {</div><div class='ctx'>     "$fwfile"</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+sub drxk_hauppauge_hvr930c {</div><div class='add'>+    my $url = "http://www.wintvcd.co.uk/drivers/";</div><div class='add'>+    my $zipfile = "HVR-9x0_5_10_325_28153_SIGNED.zip";</div><div class='add'>+    my $hash = "83ab82e7e9480ec8bf1ae0155ca63c88";</div><div class='add'>+    my $tmpdir = tempdir(DIR =&gt; "/tmp", CLEANUP =&gt; 1);</div><div class='add'>+    my $drvfile = "HVR-900/emOEM.sys";</div><div class='add'>+    my $fwfile = "dvb-usb-hauppauge-hvr930c-drxk.fw";</div><div class='add'>+</div><div class='add'>+    checkstandard();</div><div class='add'>+</div><div class='add'>+    wgetfile($zipfile, $url . $zipfile);</div><div class='add'>+    verify($zipfile, $hash);</div><div class='add'>+    unzip($zipfile, $tmpdir);</div><div class='add'>+    extract("$tmpdir/$drvfile", 0x117b0, 42692, "$fwfile");</div><div class='add'>+</div><div class='add'>+    "$fwfile"</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> sub drxk_terratec_h5 {</div><div class='ctx'>     my $url = "http://www.linuxtv.org/downloads/firmware/";</div><div class='ctx'>     my $hash = "19000dada8e2741162ccc50cc91fa7f1";</div><div class='hunk'>@@ -658,6 +676,26 @@ sub drxk_terratec_h5 {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> sub it9135 {</div><div class='add'>+	my $sourcefile = "dvb-usb-it9135.zip";</div><div class='add'>+	my $url = "http://www.ite.com.tw/uploads/firmware/v3.6.0.0/$sourcefile";</div><div class='add'>+	my $hash = "1e55f6c8833f1d0ae067c2bb2953e6a9";</div><div class='add'>+	my $tmpdir = tempdir(DIR =&gt; "/tmp", CLEANUP =&gt; 0);</div><div class='add'>+	my $outfile = "dvb-usb-it9135.fw";</div><div class='add'>+	my $fwfile1 = "dvb-usb-it9135-01.fw";</div><div class='add'>+	my $fwfile2 = "dvb-usb-it9135-02.fw";</div><div class='add'>+</div><div class='add'>+	checkstandard();</div><div class='add'>+</div><div class='add'>+	wgetfile($sourcefile, $url);</div><div class='add'>+	unzip($sourcefile, $tmpdir);</div><div class='add'>+	verify("$tmpdir/$outfile", $hash);</div><div class='add'>+	extract("$tmpdir/$outfile", 64, 8128, "$fwfile1");</div><div class='add'>+	extract("$tmpdir/$outfile", 12866, 5817, "$fwfile2");</div><div class='add'>+</div><div class='add'>+	"$fwfile1 $fwfile2"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+sub it9137 {</div><div class='ctx'>     my $url = "http://kworld.server261.com/kworld/CD/ITE_TiVme/V1.00/";</div><div class='ctx'>     my $zipfile = "Driver_V10.323.1.0412.100412.zip";</div><div class='ctx'>     my $hash = "79b597dc648698ed6820845c0c9d0d37";</div><div class='head'>diff --git a/Documentation/fb/api.txt b/Documentation/fb/api.txt<br/>new file mode 100644<br/>index 000000000000..d4ff7de85700<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/fb/api.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/fb/api.txt</a></div><div class='hunk'>@@ -0,0 +1,306 @@</div><div class='add'>+			The Frame Buffer Device API</div><div class='add'>+			---------------------------</div><div class='add'>+</div><div class='add'>+Last revised: June 21, 2011</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+0. Introduction</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+This document describes the frame buffer API used by applications to interact</div><div class='add'>+with frame buffer devices. In-kernel APIs between device drivers and the frame</div><div class='add'>+buffer core are not described.</div><div class='add'>+</div><div class='add'>+Due to a lack of documentation in the original frame buffer API, drivers</div><div class='add'>+behaviours differ in subtle (and not so subtle) ways. This document describes</div><div class='add'>+the recommended API implementation, but applications should be prepared to</div><div class='add'>+deal with different behaviours.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+1. Capabilities</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+Device and driver capabilities are reported in the fixed screen information</div><div class='add'>+capabilities field.</div><div class='add'>+</div><div class='add'>+struct fb_fix_screeninfo {</div><div class='add'>+	...</div><div class='add'>+	__u16 capabilities;		/* see FB_CAP_*			*/</div><div class='add'>+	...</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+Application should use those capabilities to find out what features they can</div><div class='add'>+expect from the device and driver.</div><div class='add'>+</div><div class='add'>+- FB_CAP_FOURCC</div><div class='add'>+</div><div class='add'>+The driver supports the four character code (FOURCC) based format setting API.</div><div class='add'>+When supported, formats are configured using a FOURCC instead of manually</div><div class='add'>+specifying color components layout.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2. Types and visuals</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+Pixels are stored in memory in hardware-dependent formats. Applications need</div><div class='add'>+to be aware of the pixel storage format in order to write image data to the</div><div class='add'>+frame buffer memory in the format expected by the hardware.</div><div class='add'>+</div><div class='add'>+Formats are described by frame buffer types and visuals. Some visuals require</div><div class='add'>+additional information, which are stored in the variable screen information</div><div class='add'>+bits_per_pixel, grayscale, red, green, blue and transp fields.</div><div class='add'>+</div><div class='add'>+Visuals describe how color information is encoded and assembled to create</div><div class='add'>+macropixels. Types describe how macropixels are stored in memory. The following</div><div class='add'>+types and visuals are supported.</div><div class='add'>+</div><div class='add'>+- FB_TYPE_PACKED_PIXELS</div><div class='add'>+</div><div class='add'>+Macropixels are stored contiguously in a single plane. If the number of bits</div><div class='add'>+per macropixel is not a multiple of 8, whether macropixels are padded to the</div><div class='add'>+next multiple of 8 bits or packed together into bytes depends on the visual.</div><div class='add'>+</div><div class='add'>+Padding at end of lines may be present and is then reported through the fixed</div><div class='add'>+screen information line_length field.</div><div class='add'>+</div><div class='add'>+- FB_TYPE_PLANES</div><div class='add'>+</div><div class='add'>+Macropixels are split across multiple planes. The number of planes is equal to</div><div class='add'>+the number of bits per macropixel, with plane i'th storing i'th bit from all</div><div class='add'>+macropixels.</div><div class='add'>+</div><div class='add'>+Planes are located contiguously in memory.</div><div class='add'>+</div><div class='add'>+- FB_TYPE_INTERLEAVED_PLANES</div><div class='add'>+</div><div class='add'>+Macropixels are split across multiple planes. The number of planes is equal to</div><div class='add'>+the number of bits per macropixel, with plane i'th storing i'th bit from all</div><div class='add'>+macropixels.</div><div class='add'>+</div><div class='add'>+Planes are interleaved in memory. The interleave factor, defined as the</div><div class='add'>+distance in bytes between the beginning of two consecutive interleaved blocks</div><div class='add'>+belonging to different planes, is stored in the fixed screen information</div><div class='add'>+type_aux field.</div><div class='add'>+</div><div class='add'>+- FB_TYPE_FOURCC</div><div class='add'>+</div><div class='add'>+Macropixels are stored in memory as described by the format FOURCC identifier</div><div class='add'>+stored in the variable screen information grayscale field.</div><div class='add'>+</div><div class='add'>+- FB_VISUAL_MONO01</div><div class='add'>+</div><div class='add'>+Pixels are black or white and stored on a number of bits (typically one)</div><div class='add'>+specified by the variable screen information bpp field.</div><div class='add'>+</div><div class='add'>+Black pixels are represented by all bits set to 1 and white pixels by all bits</div><div class='add'>+set to 0. When the number of bits per pixel is smaller than 8, several pixels</div><div class='add'>+are packed together in a byte.</div><div class='add'>+</div><div class='add'>+FB_VISUAL_MONO01 is currently used with FB_TYPE_PACKED_PIXELS only.</div><div class='add'>+</div><div class='add'>+- FB_VISUAL_MONO10</div><div class='add'>+</div><div class='add'>+Pixels are black or white and stored on a number of bits (typically one)</div><div class='add'>+specified by the variable screen information bpp field.</div><div class='add'>+</div><div class='add'>+Black pixels are represented by all bits set to 0 and white pixels by all bits</div><div class='add'>+set to 1. When the number of bits per pixel is smaller than 8, several pixels</div><div class='add'>+are packed together in a byte.</div><div class='add'>+</div><div class='add'>+FB_VISUAL_MONO01 is currently used with FB_TYPE_PACKED_PIXELS only.</div><div class='add'>+</div><div class='add'>+- FB_VISUAL_TRUECOLOR</div><div class='add'>+</div><div class='add'>+Pixels are broken into red, green and blue components, and each component</div><div class='add'>+indexes a read-only lookup table for the corresponding value. Lookup tables</div><div class='add'>+are device-dependent, and provide linear or non-linear ramps.</div><div class='add'>+</div><div class='add'>+Each component is stored in a macropixel according to the variable screen</div><div class='add'>+information red, green, blue and transp fields.</div><div class='add'>+</div><div class='add'>+- FB_VISUAL_PSEUDOCOLOR and FB_VISUAL_STATIC_PSEUDOCOLOR</div><div class='add'>+</div><div class='add'>+Pixel values are encoded as indices into a colormap that stores red, green and</div><div class='add'>+blue components. The colormap is read-only for FB_VISUAL_STATIC_PSEUDOCOLOR</div><div class='add'>+and read-write for FB_VISUAL_PSEUDOCOLOR.</div><div class='add'>+</div><div class='add'>+Each pixel value is stored in the number of bits reported by the variable</div><div class='add'>+screen information bits_per_pixel field.</div><div class='add'>+</div><div class='add'>+- FB_VISUAL_DIRECTCOLOR</div><div class='add'>+</div><div class='add'>+Pixels are broken into red, green and blue components, and each component</div><div class='add'>+indexes a programmable lookup table for the corresponding value.</div><div class='add'>+</div><div class='add'>+Each component is stored in a macropixel according to the variable screen</div><div class='add'>+information red, green, blue and transp fields.</div><div class='add'>+</div><div class='add'>+- FB_VISUAL_FOURCC</div><div class='add'>+</div><div class='add'>+Pixels are encoded and  interpreted as described by the format FOURCC</div><div class='add'>+identifier stored in the variable screen information grayscale field.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3. Screen information</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+Screen information are queried by applications using the FBIOGET_FSCREENINFO</div><div class='add'>+and FBIOGET_VSCREENINFO ioctls. Those ioctls take a pointer to a</div><div class='add'>+fb_fix_screeninfo and fb_var_screeninfo structure respectively.</div><div class='add'>+</div><div class='add'>+struct fb_fix_screeninfo stores device independent unchangeable information</div><div class='add'>+about the frame buffer device and the current format. Those information can't</div><div class='add'>+be directly modified by applications, but can be changed by the driver when an</div><div class='add'>+application modifies the format.</div><div class='add'>+</div><div class='add'>+struct fb_fix_screeninfo {</div><div class='add'>+	char id[16];			/* identification string eg "TT Builtin" */</div><div class='add'>+	unsigned long smem_start;	/* Start of frame buffer mem */</div><div class='add'>+					/* (physical address) */</div><div class='add'>+	__u32 smem_len;			/* Length of frame buffer mem */</div><div class='add'>+	__u32 type;			/* see FB_TYPE_*		*/</div><div class='add'>+	__u32 type_aux;			/* Interleave for interleaved Planes */</div><div class='add'>+	__u32 visual;			/* see FB_VISUAL_*		*/</div><div class='add'>+	__u16 xpanstep;			/* zero if no hardware panning  */</div><div class='add'>+	__u16 ypanstep;			/* zero if no hardware panning  */</div><div class='add'>+	__u16 ywrapstep;		/* zero if no hardware ywrap    */</div><div class='add'>+	__u32 line_length;		/* length of a line in bytes    */</div><div class='add'>+	unsigned long mmio_start;	/* Start of Memory Mapped I/O   */</div><div class='add'>+					/* (physical address) */</div><div class='add'>+	__u32 mmio_len;			/* Length of Memory Mapped I/O  */</div><div class='add'>+	__u32 accel;			/* Indicate to driver which	*/</div><div class='add'>+					/*  specific chip/card we have	*/</div><div class='add'>+	__u16 capabilities;		/* see FB_CAP_*			*/</div><div class='add'>+	__u16 reserved[2];		/* Reserved for future compatibility */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fb_var_screeninfo stores device independent changeable information</div><div class='add'>+about a frame buffer device, its current format and video mode, as well as</div><div class='add'>+other miscellaneous parameters.</div><div class='add'>+</div><div class='add'>+struct fb_var_screeninfo {</div><div class='add'>+	__u32 xres;			/* visible resolution		*/</div><div class='add'>+	__u32 yres;</div><div class='add'>+	__u32 xres_virtual;		/* virtual resolution		*/</div><div class='add'>+	__u32 yres_virtual;</div><div class='add'>+	__u32 xoffset;			/* offset from virtual to visible */</div><div class='add'>+	__u32 yoffset;			/* resolution			*/</div><div class='add'>+</div><div class='add'>+	__u32 bits_per_pixel;		/* guess what			*/</div><div class='add'>+	__u32 grayscale;		/* 0 = color, 1 = grayscale,	*/</div><div class='add'>+					/* &gt;1 = FOURCC			*/</div><div class='add'>+	struct fb_bitfield red;		/* bitfield in fb mem if true color, */</div><div class='add'>+	struct fb_bitfield green;	/* else only length is significant */</div><div class='add'>+	struct fb_bitfield blue;</div><div class='add'>+	struct fb_bitfield transp;	/* transparency			*/</div><div class='add'>+</div><div class='add'>+	__u32 nonstd;			/* != 0 Non standard pixel format */</div><div class='add'>+</div><div class='add'>+	__u32 activate;			/* see FB_ACTIVATE_*		*/</div><div class='add'>+</div><div class='add'>+	__u32 height;			/* height of picture in mm    */</div><div class='add'>+	__u32 width;			/* width of picture in mm     */</div><div class='add'>+</div><div class='add'>+	__u32 accel_flags;		/* (OBSOLETE) see fb_info.flags */</div><div class='add'>+</div><div class='add'>+	/* Timing: All values in pixclocks, except pixclock (of course) */</div><div class='add'>+	__u32 pixclock;			/* pixel clock in ps (pico seconds) */</div><div class='add'>+	__u32 left_margin;		/* time from sync to picture	*/</div><div class='add'>+	__u32 right_margin;		/* time from picture to sync	*/</div><div class='add'>+	__u32 upper_margin;		/* time from sync to picture	*/</div><div class='add'>+	__u32 lower_margin;</div><div class='add'>+	__u32 hsync_len;		/* length of horizontal sync	*/</div><div class='add'>+	__u32 vsync_len;		/* length of vertical sync	*/</div><div class='add'>+	__u32 sync;			/* see FB_SYNC_*		*/</div><div class='add'>+	__u32 vmode;			/* see FB_VMODE_*		*/</div><div class='add'>+	__u32 rotate;			/* angle we rotate counter clockwise */</div><div class='add'>+	__u32 colorspace;		/* colorspace for FOURCC-based modes */</div><div class='add'>+	__u32 reserved[4];		/* Reserved for future compatibility */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+To modify variable information, applications call the FBIOPUT_VSCREENINFO</div><div class='add'>+ioctl with a pointer to a fb_var_screeninfo structure. If the call is</div><div class='add'>+successful, the driver will update the fixed screen information accordingly.</div><div class='add'>+</div><div class='add'>+Instead of filling the complete fb_var_screeninfo structure manually,</div><div class='add'>+applications should call the FBIOGET_VSCREENINFO ioctl and modify only the</div><div class='add'>+fields they care about.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4. Format configuration</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+Frame buffer devices offer two ways to configure the frame buffer format: the</div><div class='add'>+legacy API and the FOURCC-based API.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The legacy API has been the only frame buffer format configuration API for a</div><div class='add'>+long time and is thus widely used by application. It is the recommended API</div><div class='add'>+for applications when using RGB and grayscale formats, as well as legacy</div><div class='add'>+non-standard formats.</div><div class='add'>+</div><div class='add'>+To select a format, applications set the fb_var_screeninfo bits_per_pixel field</div><div class='add'>+to the desired frame buffer depth. Values up to 8 will usually map to</div><div class='add'>+monochrome, grayscale or pseudocolor visuals, although this is not required.</div><div class='add'>+</div><div class='add'>+- For grayscale formats, applications set the grayscale field to one. The red,</div><div class='add'>+  blue, green and transp fields must be set to 0 by applications and ignored by</div><div class='add'>+  drivers. Drivers must fill the red, blue and green offsets to 0 and lengths</div><div class='add'>+  to the bits_per_pixel value.</div><div class='add'>+</div><div class='add'>+- For pseudocolor formats, applications set the grayscale field to zero. The</div><div class='add'>+  red, blue, green and transp fields must be set to 0 by applications and</div><div class='add'>+  ignored by drivers. Drivers must fill the red, blue and green offsets to 0</div><div class='add'>+  and lengths to the bits_per_pixel value.</div><div class='add'>+</div><div class='add'>+- For truecolor and directcolor formats, applications set the grayscale field</div><div class='add'>+  to zero, and the red, blue, green and transp fields to describe the layout of</div><div class='add'>+  color components in memory.</div><div class='add'>+</div><div class='add'>+struct fb_bitfield {</div><div class='add'>+	__u32 offset;			/* beginning of bitfield	*/</div><div class='add'>+	__u32 length;			/* length of bitfield		*/</div><div class='add'>+	__u32 msb_right;		/* != 0 : Most significant bit is */</div><div class='add'>+					/* right */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+  Pixel values are bits_per_pixel wide and are split in non-overlapping red,</div><div class='add'>+  green, blue and alpha (transparency) components. Location and size of each</div><div class='add'>+  component in the pixel value are described by the fb_bitfield offset and</div><div class='add'>+  length fields. Offset are computed from the right.</div><div class='add'>+</div><div class='add'>+  Pixels are always stored in an integer number of bytes. If the number of</div><div class='add'>+  bits per pixel is not a multiple of 8, pixel values are padded to the next</div><div class='add'>+  multiple of 8 bits.</div><div class='add'>+</div><div class='add'>+Upon successful format configuration, drivers update the fb_fix_screeninfo</div><div class='add'>+type, visual and line_length fields depending on the selected format.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The FOURCC-based API replaces format descriptions by four character codes</div><div class='add'>+(FOURCC). FOURCCs are abstract identifiers that uniquely define a format</div><div class='add'>+without explicitly describing it. This is the only API that supports YUV</div><div class='add'>+formats. Drivers are also encouraged to implement the FOURCC-based API for RGB</div><div class='add'>+and grayscale formats.</div><div class='add'>+</div><div class='add'>+Drivers that support the FOURCC-based API report this capability by setting</div><div class='add'>+the FB_CAP_FOURCC bit in the fb_fix_screeninfo capabilities field.</div><div class='add'>+</div><div class='add'>+FOURCC definitions are located in the linux/videodev2.h header. However, and</div><div class='add'>+despite starting with the V4L2_PIX_FMT_prefix, they are not restricted to V4L2</div><div class='add'>+and don't require usage of the V4L2 subsystem. FOURCC documentation is</div><div class='add'>+available in Documentation/DocBook/v4l/pixfmt.xml.</div><div class='add'>+</div><div class='add'>+To select a format, applications set the grayscale field to the desired FOURCC.</div><div class='add'>+For YUV formats, they should also select the appropriate colorspace by setting</div><div class='add'>+the colorspace field to one of the colorspaces listed in linux/videodev2.h and</div><div class='add'>+documented in Documentation/DocBook/v4l/colorspaces.xml.</div><div class='add'>+</div><div class='add'>+The red, green, blue and transp fields are not used with the FOURCC-based API.</div><div class='add'>+For forward compatibility reasons applications must zero those fields, and</div><div class='add'>+drivers must ignore them. Values other than 0 may get a meaning in future</div><div class='add'>+extensions.</div><div class='add'>+</div><div class='add'>+Upon successful format configuration, drivers update the fb_fix_screeninfo</div><div class='add'>+type, visual and line_length fields depending on the selected format. The type</div><div class='add'>+and visual fields are set to FB_TYPE_FOURCC and FB_VISUAL_FOURCC respectively.</div><div class='head'>diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt<br/>index 3d849122b5b1..1bea46a54b1c 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/feature-removal-schedule.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/feature-removal-schedule.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/feature-removal-schedule.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/feature-removal-schedule.txt</a></div><div class='hunk'>@@ -85,17 +85,6 @@ Who:	Robin Getz &lt;rgetz@blackfin.uclinux.org&gt; &amp; Matt Mackall &lt;mpm@selenic.com&gt;</div><div class='ctx'> </div><div class='ctx'> ---------------------------</div><div class='ctx'> </div><div class='del'>-What:	Deprecated snapshot ioctls</div><div class='del'>-When:	2.6.36</div><div class='del'>-</div><div class='del'>-Why:	The ioctls in kernel/power/user.c were marked as deprecated long time</div><div class='del'>-	ago. Now they notify users about that so that they need to replace</div><div class='del'>-	their userspace. After some more time, remove them completely.</div><div class='del'>-</div><div class='del'>-Who:	Jiri Slaby &lt;jirislaby@gmail.com&gt;</div><div class='del'>-</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='ctx'> What:	The ieee80211_regdom module parameter</div><div class='ctx'> When:	March 2010 / desktop catchup</div><div class='ctx'> </div><div class='hunk'>@@ -263,8 +252,7 @@ Who:	Ravikiran Thirumalai &lt;kiran@scalex86.org&gt;</div><div class='ctx'> </div><div class='ctx'> What:	Code that is now under CONFIG_WIRELESS_EXT_SYSFS</div><div class='ctx'> 	(in net/core/net-sysfs.c)</div><div class='del'>-When:	After the only user (hal) has seen a release with the patches</div><div class='del'>-	for enough time, probably some time in 2010.</div><div class='add'>+When:	3.5</div><div class='ctx'> Why:	Over 1K .text/.data size reduction, data is available in other</div><div class='ctx'> 	ways (ioctls)</div><div class='ctx'> Who:	Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='hunk'>@@ -362,15 +350,6 @@ Who: 	anybody or Florian Mickler &lt;florian@mickler.org&gt;</div><div class='ctx'> </div><div class='ctx'> ----------------------------</div><div class='ctx'> </div><div class='del'>-What:	KVM paravirt mmu host support</div><div class='del'>-When:	January 2011</div><div class='del'>-Why:	The paravirt mmu host support is slower than non-paravirt mmu, both</div><div class='del'>-	on newer and older hardware.  It is already not exposed to the guest,</div><div class='del'>-	and kept only for live migration purposes.</div><div class='del'>-Who:	Avi Kivity &lt;avi@redhat.com&gt;</div><div class='del'>-</div><div class='del'>-----------------------------</div><div class='del'>-</div><div class='ctx'> What:	iwlwifi 50XX module parameters</div><div class='ctx'> When:	3.0</div><div class='ctx'> Why:	The "..50" modules parameters were used to configure 5000 series and</div><div class='hunk'>@@ -460,52 +439,6 @@ Who:	Jean Delvare &lt;khali@linux-fr.org&gt;</div><div class='ctx'> </div><div class='ctx'> ----------------------------</div><div class='ctx'> </div><div class='del'>-What:	Support for driver specific ioctls in the pwc driver (everything</div><div class='del'>-	defined in media/pwc-ioctl.h)</div><div class='del'>-When:	3.3</div><div class='del'>-Why:	This stems from the v4l1 era, with v4l2 everything can be done with</div><div class='del'>-	standardized v4l2 API calls</div><div class='del'>-Who:	Hans de Goede &lt;hdegoede@redhat.com&gt;</div><div class='del'>-</div><div class='del'>-----------------------------</div><div class='del'>-</div><div class='del'>-What:	Driver specific sysfs API in the pwc driver</div><div class='del'>-When:	3.3</div><div class='del'>-Why:	Setting pan/tilt should be done with v4l2 controls, like with other</div><div class='del'>-	cams. The button is available as a standard input device</div><div class='del'>-Who:	Hans de Goede &lt;hdegoede@redhat.com&gt;</div><div class='del'>-</div><div class='del'>-----------------------------</div><div class='del'>-</div><div class='del'>-What:	Driver specific use of pixfmt.priv in the pwc driver</div><div class='del'>-When:	3.3</div><div class='del'>-Why:	The .priv field never was intended for this, setting a framerate is</div><div class='del'>-	support using the standardized S_PARM ioctl</div><div class='del'>-Who:	Hans de Goede &lt;hdegoede@redhat.com&gt;</div><div class='del'>-</div><div class='del'>-----------------------------</div><div class='del'>-</div><div class='del'>-What:	Software emulation of arbritary resolutions in the pwc driver</div><div class='del'>-When:	3.3</div><div class='del'>-Why:	The pwc driver claims to support any resolution between 160x120</div><div class='del'>-	and 640x480, but emulates this by simply drawing a black border</div><div class='del'>-	around the image. Userspace can draw its own black border if it</div><div class='del'>-	really wants one.</div><div class='del'>-Who:	Hans de Goede &lt;hdegoede@redhat.com&gt;</div><div class='del'>-</div><div class='del'>-----------------------------</div><div class='del'>-</div><div class='del'>-What:	For VIDIOC_S_FREQUENCY the type field must match the device node's type.</div><div class='del'>-	If not, return -EINVAL.</div><div class='del'>-When:	3.2</div><div class='del'>-Why:	It makes no sense to switch the tuner to radio mode by calling</div><div class='del'>-	VIDIOC_S_FREQUENCY on a video node, or to switch the tuner to tv mode by</div><div class='del'>-	calling VIDIOC_S_FREQUENCY on a radio node. This is the first step of a</div><div class='del'>-	move to more consistent handling of tv and radio tuners.</div><div class='del'>-Who:	Hans Verkuil &lt;hans.verkuil@cisco.com&gt;</div><div class='del'>-</div><div class='del'>-----------------------------</div><div class='del'>-</div><div class='ctx'> What:	Opening a radio device node will no longer automatically switch the</div><div class='ctx'> 	tuner mode from tv to radio.</div><div class='ctx'> When:	3.3</div><div class='hunk'>@@ -535,6 +468,20 @@ Why:    In 3.0, we can now autodetect internal 3G device and already have</div><div class='ctx'> 	information log when acer-wmi initial.</div><div class='ctx'> Who:    Lee, Chun-Yi &lt;jlee@novell.com&gt;</div><div class='ctx'> </div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+What:	/sys/devices/platform/_UDC_/udc/_UDC_/is_dualspeed file and</div><div class='add'>+	is_dualspeed line in /sys/devices/platform/ci13xxx_*/udc/device file.</div><div class='add'>+When:	3.8</div><div class='add'>+Why:	The is_dualspeed file is superseded by maximum_speed in the same</div><div class='add'>+	directory and is_dualspeed line in device file is superseded by</div><div class='add'>+	max_speed line in the same file.</div><div class='add'>+</div><div class='add'>+	The maximum_speed/max_speed specifies maximum speed supported by UDC.</div><div class='add'>+	To check if dualspeeed is supported, check if the value is &gt;= 3.</div><div class='add'>+	Various possible speeds are defined in &lt;linux/usb/ch9.h&gt;.</div><div class='add'>+Who:	Michal Nazarewicz &lt;mina86@mina86.com&gt;</div><div class='add'>+</div><div class='ctx'> ----------------------------</div><div class='ctx'> </div><div class='ctx'> What:	The XFS nodelaylog mount option</div><div class='hunk'>@@ -551,3 +498,15 @@ When:	3.5</div><div class='ctx'> Why:	The iwlagn module has been renamed iwlwifi.  The alias will be around</div><div class='ctx'> 	for backward compatibility for several cycles and then dropped.</div><div class='ctx'> Who:	Don Fry &lt;donald.h.fry@intel.com&gt;</div><div class='add'>+</div><div class='add'>+----------------------------</div><div class='add'>+</div><div class='add'>+What:	pci_scan_bus_parented()</div><div class='add'>+When:	3.5</div><div class='add'>+Why:	The pci_scan_bus_parented() interface creates a new root bus.  The</div><div class='add'>+	bus is created with default resources (ioport_resource and</div><div class='add'>+	iomem_resource) that are always wrong, so we rely on arch code to</div><div class='add'>+	correct them later.  Callers of pci_scan_bus_parented() should</div><div class='add'>+	convert to using pci_scan_root_bus() so they can supply a list of</div><div class='add'>+	bus resources when the bus is created.</div><div class='add'>+Who:	Bjorn Helgaas &lt;bhelgaas@google.com&gt;</div><div class='head'>diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking<br/>index d819ba16a0c7..4fca82e5276e 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/Locking?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/Locking</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/Locking?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/filesystems/Locking</a></div><div class='hunk'>@@ -37,15 +37,15 @@ d_manage:	no		no		yes (ref-walk)	maybe</div><div class='ctx'> </div><div class='ctx'> --------------------------- inode_operations --------------------------- </div><div class='ctx'> prototypes:</div><div class='del'>-	int (*create) (struct inode *,struct dentry *,int, struct nameidata *);</div><div class='add'>+	int (*create) (struct inode *,struct dentry *,umode_t, struct nameidata *);</div><div class='ctx'> 	struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameid</div><div class='ctx'> ata *);</div><div class='ctx'> 	int (*link) (struct dentry *,struct inode *,struct dentry *);</div><div class='ctx'> 	int (*unlink) (struct inode *,struct dentry *);</div><div class='ctx'> 	int (*symlink) (struct inode *,struct dentry *,const char *);</div><div class='del'>-	int (*mkdir) (struct inode *,struct dentry *,int);</div><div class='add'>+	int (*mkdir) (struct inode *,struct dentry *,umode_t);</div><div class='ctx'> 	int (*rmdir) (struct inode *,struct dentry *);</div><div class='del'>-	int (*mknod) (struct inode *,struct dentry *,int,dev_t);</div><div class='add'>+	int (*mknod) (struct inode *,struct dentry *,umode_t,dev_t);</div><div class='ctx'> 	int (*rename) (struct inode *, struct dentry *,</div><div class='ctx'> 			struct inode *, struct dentry *);</div><div class='ctx'> 	int (*readlink) (struct dentry *, char __user *,int);</div><div class='hunk'>@@ -117,7 +117,7 @@ prototypes:</div><div class='ctx'> 	int (*statfs) (struct dentry *, struct kstatfs *);</div><div class='ctx'> 	int (*remount_fs) (struct super_block *, int *, char *);</div><div class='ctx'> 	void (*umount_begin) (struct super_block *);</div><div class='del'>-	int (*show_options)(struct seq_file *, struct vfsmount *);</div><div class='add'>+	int (*show_options)(struct seq_file *, struct dentry *);</div><div class='ctx'> 	ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);</div><div class='ctx'> 	ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);</div><div class='ctx'> 	int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);</div><div class='head'>diff --git a/Documentation/filesystems/ceph.txt b/Documentation/filesystems/ceph.txt<br/>index 763d8ebbbebd..d6030aa33376 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/ceph.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/ceph.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/ceph.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/filesystems/ceph.txt</a></div><div class='hunk'>@@ -119,12 +119,20 @@ Mount Options</div><div class='ctx'> 	must rely on TCP's error correction to detect data corruption</div><div class='ctx'> 	in the data payload.</div><div class='ctx'> </div><div class='del'>-  noasyncreaddir</div><div class='del'>-	Disable client's use its local cache to satisfy	readdir</div><div class='del'>-	requests.  (This does not change correctness; the client uses</div><div class='del'>-	cached metadata only when a lease or capability ensures it is</div><div class='del'>-	valid.)</div><div class='add'>+  dcache</div><div class='add'>+        Use the dcache contents to perform negative lookups and</div><div class='add'>+        readdir when the client has the entire directory contents in</div><div class='add'>+        its cache.  (This does not change correctness; the client uses</div><div class='add'>+        cached metadata only when a lease or capability ensures it is</div><div class='add'>+        valid.)</div><div class='add'>+</div><div class='add'>+  nodcache</div><div class='add'>+        Do not use the dcache as above.  This avoids a significant amount of</div><div class='add'>+        complex code, sacrificing performance without affecting correctness,</div><div class='add'>+        and is useful for tracking down bugs.</div><div class='ctx'> </div><div class='add'>+  noasyncreaddir</div><div class='add'>+	Do not use the dcache as above for readdir.</div><div class='ctx'> </div><div class='ctx'> More Information</div><div class='ctx'> ================</div><div class='head'>diff --git a/Documentation/filesystems/configfs/configfs.txt b/Documentation/filesystems/configfs/configfs.txt<br/>index dd57bb6bb390..b40fec9d3f53 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/configfs/configfs.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/configfs/configfs.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/configfs/configfs.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/filesystems/configfs/configfs.txt</a></div><div class='hunk'>@@ -192,7 +192,7 @@ attribute value uses the store_attribute() method.</div><div class='ctx'> 	struct configfs_attribute {</div><div class='ctx'> 		char                    *ca_name;</div><div class='ctx'> 		struct module           *ca_owner;</div><div class='del'>-		mode_t                  ca_mode;</div><div class='add'>+		umode_t                  ca_mode;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> When a config_item wants an attribute to appear as a file in the item's</div><div class='head'>diff --git a/Documentation/filesystems/debugfs.txt b/Documentation/filesystems/debugfs.txt<br/>index 742cc06e138f..6872c91bce35 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/debugfs.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/debugfs.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/debugfs.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/filesystems/debugfs.txt</a></div><div class='hunk'>@@ -35,7 +35,7 @@ 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='del'>-    struct dentry *debugfs_create_file(const char *name, mode_t mode,</div><div class='add'>+    struct dentry *debugfs_create_file(const char *name, umode_t mode,</div><div class='ctx'> 				       struct dentry *parent, void *data,</div><div class='ctx'> 				       const struct file_operations *fops);</div><div class='ctx'> </div><div class='hunk'>@@ -53,13 +53,13 @@ actually necessary; the debugfs code provides a number of helper functions</div><div class='ctx'> for simple situations.  Files containing a single integer value can be</div><div class='ctx'> created with any of:</div><div class='ctx'> </div><div class='del'>-    struct dentry *debugfs_create_u8(const char *name, mode_t mode,</div><div class='add'>+    struct dentry *debugfs_create_u8(const char *name, umode_t mode,</div><div class='ctx'> 				     struct dentry *parent, u8 *value);</div><div class='del'>-    struct dentry *debugfs_create_u16(const char *name, mode_t mode,</div><div class='add'>+    struct dentry *debugfs_create_u16(const char *name, umode_t mode,</div><div class='ctx'> 				      struct dentry *parent, u16 *value);</div><div class='del'>-    struct dentry *debugfs_create_u32(const char *name, mode_t mode,</div><div class='add'>+    struct dentry *debugfs_create_u32(const char *name, umode_t mode,</div><div class='ctx'> 				      struct dentry *parent, u32 *value);</div><div class='del'>-    struct dentry *debugfs_create_u64(const char *name, mode_t mode,</div><div class='add'>+    struct dentry *debugfs_create_u64(const char *name, umode_t mode,</div><div class='ctx'> 				      struct dentry *parent, u64 *value);</div><div class='ctx'> </div><div class='ctx'> These files support both reading and writing the given value; if a specific</div><div class='hunk'>@@ -67,13 +67,13 @@ file should not be written to, simply set the mode bits accordingly.  The</div><div class='ctx'> values in these files are in decimal; if hexadecimal is more appropriate,</div><div class='ctx'> the following functions can be used instead:</div><div class='ctx'> </div><div class='del'>-    struct dentry *debugfs_create_x8(const char *name, mode_t mode,</div><div class='add'>+    struct dentry *debugfs_create_x8(const char *name, umode_t mode,</div><div class='ctx'> 				     struct dentry *parent, u8 *value);</div><div class='del'>-    struct dentry *debugfs_create_x16(const char *name, mode_t mode,</div><div class='add'>+    struct dentry *debugfs_create_x16(const char *name, umode_t mode,</div><div class='ctx'> 				      struct dentry *parent, u16 *value);</div><div class='del'>-    struct dentry *debugfs_create_x32(const char *name, mode_t mode,</div><div class='add'>+    struct dentry *debugfs_create_x32(const char *name, umode_t mode,</div><div class='ctx'> 				      struct dentry *parent, u32 *value);</div><div class='del'>-    struct dentry *debugfs_create_x64(const char *name, mode_t mode,</div><div class='add'>+    struct dentry *debugfs_create_x64(const char *name, umode_t mode,</div><div class='ctx'> 				      struct dentry *parent, u64 *value);</div><div class='ctx'> </div><div class='ctx'> These functions are useful as long as the developer knows the size of the</div><div class='hunk'>@@ -81,7 +81,7 @@ value to be exported.  Some types can have different widths on different</div><div class='ctx'> architectures, though, complicating the situation somewhat.  There is a</div><div class='ctx'> function meant to help out in one special case:</div><div class='ctx'> </div><div class='del'>-    struct dentry *debugfs_create_size_t(const char *name, mode_t mode,</div><div class='add'>+    struct dentry *debugfs_create_size_t(const char *name, umode_t mode,</div><div class='ctx'> 				         struct dentry *parent, </div><div class='ctx'> 					 size_t *value);</div><div class='ctx'> </div><div class='hunk'>@@ -90,21 +90,22 @@ a variable of type size_t.</div><div class='ctx'> </div><div class='ctx'> Boolean values can be placed in debugfs with:</div><div class='ctx'> </div><div class='del'>-    struct dentry *debugfs_create_bool(const char *name, mode_t mode,</div><div class='add'>+    struct dentry *debugfs_create_bool(const char *name, umode_t mode,</div><div class='ctx'> 				       struct dentry *parent, u32 *value);</div><div class='ctx'> </div><div class='ctx'> A read on the resulting file will yield either Y (for non-zero values) or</div><div class='ctx'> N, followed by a newline.  If written to, it will accept either upper- or</div><div class='ctx'> lower-case values, or 1 or 0.  Any other input will be silently ignored.</div><div class='ctx'> </div><div class='del'>-Finally, a block of arbitrary binary data can be exported with:</div><div class='add'>+Another option is exporting a block of arbitrary binary data, with</div><div class='add'>+this structure and function:</div><div class='ctx'> </div><div class='ctx'>     struct debugfs_blob_wrapper {</div><div class='ctx'> 	void *data;</div><div class='ctx'> 	unsigned long size;</div><div class='ctx'>     };</div><div class='ctx'> </div><div class='del'>-    struct dentry *debugfs_create_blob(const char *name, mode_t mode,</div><div class='add'>+    struct dentry *debugfs_create_blob(const char *name, umode_t mode,</div><div class='ctx'> 				       struct dentry *parent,</div><div class='ctx'> 				       struct debugfs_blob_wrapper *blob);</div><div class='ctx'> </div><div class='hunk'>@@ -115,6 +116,35 @@ can be used to export binary information, but there does not appear to be</div><div class='ctx'> any code which does so in the mainline.  Note that all files created with</div><div class='ctx'> debugfs_create_blob() are read-only.</div><div class='ctx'> </div><div class='add'>+If you want to dump a block of registers (something that happens quite</div><div class='add'>+often during development, even if little such code reaches mainline.</div><div class='add'>+Debugfs offers two functions: one to make a registers-only file, and</div><div class='add'>+another to insert a register block in the middle of another sequential</div><div class='add'>+file.</div><div class='add'>+</div><div class='add'>+    struct debugfs_reg32 {</div><div class='add'>+	char *name;</div><div class='add'>+	unsigned long offset;</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+    struct debugfs_regset32 {</div><div class='add'>+	struct debugfs_reg32 *regs;</div><div class='add'>+	int nregs;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+    struct dentry *debugfs_create_regset32(const char *name, mode_t mode,</div><div class='add'>+				     struct dentry *parent,</div><div class='add'>+				     struct debugfs_regset32 *regset);</div><div class='add'>+</div><div class='add'>+    int debugfs_print_regs32(struct seq_file *s, struct debugfs_reg32 *regs,</div><div class='add'>+			 int nregs, void __iomem *base, char *prefix);</div><div class='add'>+</div><div class='add'>+The "base" argument may be 0, but you may want to build the reg32 array</div><div class='add'>+using __stringify, and a number of register names (macros) are actually</div><div class='add'>+byte offsets over a base for the register block.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> There are a couple of other directory-oriented helper functions:</div><div class='ctx'> </div><div class='ctx'>     struct dentry *debugfs_rename(struct dentry *old_dir, </div><div class='head'>diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt<br/>index 4917cf24a5e0..10ec4639f152 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/ext4.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/ext4.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/ext4.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/filesystems/ext4.txt</a></div><div class='hunk'>@@ -581,6 +581,13 @@ Table of Ext4 specific ioctls</div><div class='ctx'> 			      behaviour may change in the future as it is</div><div class='ctx'> 			      not necessary and has been done this way only</div><div class='ctx'> 			      for sake of simplicity.</div><div class='add'>+</div><div class='add'>+ EXT4_IOC_RESIZE_FS	      Resize the filesystem to a new size.  The number</div><div class='add'>+			      of blocks of resized filesystem is passed in via</div><div class='add'>+			      64 bit integer argument.  The kernel allocates</div><div class='add'>+			      bitmaps and inode table, the userspace tool thus</div><div class='add'>+			      just passes the new number of blocks.</div><div class='add'>+</div><div class='ctx'> ..............................................................................</div><div class='ctx'> </div><div class='ctx'> References</div><div class='head'>diff --git a/Documentation/filesystems/nfs/00-INDEX b/Documentation/filesystems/nfs/00-INDEX<br/>index a57e12411d2a..1716874a651e 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/nfs/00-INDEX?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/nfs/00-INDEX</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/nfs/00-INDEX?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/filesystems/nfs/00-INDEX</a></div><div class='hunk'>@@ -2,6 +2,8 @@</div><div class='ctx'> 	- this file (nfs-related documentation).</div><div class='ctx'> Exporting</div><div class='ctx'> 	- explanation of how to make filesystems exportable.</div><div class='add'>+fault_injection.txt</div><div class='add'>+	- information for using fault injection on the server</div><div class='ctx'> knfsd-stats.txt</div><div class='ctx'> 	- statistics which the NFS server makes available to user space.</div><div class='ctx'> nfs.txt</div><div class='head'>diff --git a/Documentation/filesystems/nfs/fault_injection.txt b/Documentation/filesystems/nfs/fault_injection.txt<br/>new file mode 100644<br/>index 000000000000..426d166089a3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/nfs/fault_injection.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/filesystems/nfs/fault_injection.txt</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+</div><div class='add'>+Fault Injection</div><div class='add'>+===============</div><div class='add'>+Fault injection is a method for forcing errors that may not normally occur, or</div><div class='add'>+may be difficult to reproduce.  Forcing these errors in a controlled environment</div><div class='add'>+can help the developer find and fix bugs before their code is shipped in a</div><div class='add'>+production system.  Injecting an error on the Linux NFS server will allow us to</div><div class='add'>+observe how the client reacts and if it manages to recover its state correctly.</div><div class='add'>+</div><div class='add'>+NFSD_FAULT_INJECTION must be selected when configuring the kernel to use this</div><div class='add'>+feature.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Using Fault Injection</div><div class='add'>+=====================</div><div class='add'>+On the client, mount the fault injection server through NFS v4.0+ and do some</div><div class='add'>+work over NFS (open files, take locks, ...).</div><div class='add'>+</div><div class='add'>+On the server, mount the debugfs filesystem to &lt;debug_dir&gt; and ls</div><div class='add'>+&lt;debug_dir&gt;/nfsd.  This will show a list of files that will be used for</div><div class='add'>+injecting faults on the NFS server.  As root, write a number n to the file</div><div class='add'>+corresponding to the action you want the server to take.  The server will then</div><div class='add'>+process the first n items it finds.  So if you want to forget 5 locks, echo '5'</div><div class='add'>+to &lt;debug_dir&gt;/nfsd/forget_locks.  A value of 0 will tell the server to forget</div><div class='add'>+all corresponding items.  A log message will be created containing the number</div><div class='add'>+of items forgotten (check dmesg).</div><div class='add'>+</div><div class='add'>+Go back to work on the client and check if the client recovered from the error</div><div class='add'>+correctly.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Available Faults</div><div class='add'>+================</div><div class='add'>+forget_clients:</div><div class='add'>+     The NFS server keeps a list of clients that have placed a mount call.  If</div><div class='add'>+     this list is cleared, the server will have no knowledge of who the client</div><div class='add'>+     is, forcing the client to reauthenticate with the server.</div><div class='add'>+</div><div class='add'>+forget_openowners:</div><div class='add'>+     The NFS server keeps a list of what files are currently opened and who</div><div class='add'>+     they were opened by.  Clearing this list will force the client to reopen</div><div class='add'>+     its files.</div><div class='add'>+</div><div class='add'>+forget_locks:</div><div class='add'>+     The NFS server keeps a list of what files are currently locked in the VFS.</div><div class='add'>+     Clearing this list will force the client to reclaim its locks (files are</div><div class='add'>+     unlocked through the VFS as they are cleared from this list).</div><div class='add'>+</div><div class='add'>+forget_delegations:</div><div class='add'>+     A delegation is used to assure the client that a file, or part of a file,</div><div class='add'>+     has not changed since the delegation was awarded.  Clearing this list will</div><div class='add'>+     force the client to reaquire its delegation before accessing the file</div><div class='add'>+     again.</div><div class='add'>+</div><div class='add'>+recall_delegations:</div><div class='add'>+     Delegations can be recalled by the server when another client attempts to</div><div class='add'>+     access a file.  This test will notify the client that its delegation has</div><div class='add'>+     been revoked, forcing the client to reaquire the delegation before using</div><div class='add'>+     the file again.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+tools/nfs/inject_faults.sh script</div><div class='add'>+=================================</div><div class='add'>+This script has been created to ease the fault injection process.  This script</div><div class='add'>+will detect the mounted debugfs directory and write to the files located there</div><div class='add'>+based on the arguments passed by the user.  For example, running</div><div class='add'>+`inject_faults.sh forget_locks 1` as root will instruct the server to forget</div><div class='add'>+one lock.  Running `inject_faults forget_locks` will instruct the server to</div><div class='add'>+forgetall locks.</div><div class='head'>diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt<br/>index 0ec91f03422e..a76a26a1db8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/proc.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/proc.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/proc.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/filesystems/proc.txt</a></div><div class='hunk'>@@ -41,6 +41,8 @@ Table of Contents</div><div class='ctx'>   3.5	/proc/&lt;pid&gt;/mountinfo - Information about mounts</div><div class='ctx'>   3.6	/proc/&lt;pid&gt;/comm  &amp; /proc/&lt;pid&gt;/task/&lt;tid&gt;/comm</div><div class='ctx'> </div><div class='add'>+  4	Configuring procfs</div><div class='add'>+  4.1	Mount options</div><div class='ctx'> </div><div class='ctx'> ------------------------------------------------------------------------------</div><div class='ctx'> Preface</div><div class='hunk'>@@ -305,6 +307,9 @@ Table 1-4: Contents of the stat files (as of 2.6.30-rc7)</div><div class='ctx'>   blkio_ticks   time spent waiting for block IO</div><div class='ctx'>   gtime         guest time of the task in jiffies</div><div class='ctx'>   cgtime        guest time of the task children in jiffies</div><div class='add'>+  start_data    address above which program data+bss is placed</div><div class='add'>+  end_data      address below which program data+bss is placed</div><div class='add'>+  start_brk     address above which program heap can be expanded with brk()</div><div class='ctx'> ..............................................................................</div><div class='ctx'> </div><div class='ctx'> The /proc/PID/maps file containing the currently mapped memory regions and</div><div class='hunk'>@@ -1542,3 +1547,40 @@ a task to set its own or one of its thread siblings comm value. The comm value</div><div class='ctx'> is limited in size compared to the cmdline value, so writing anything longer</div><div class='ctx'> then the kernel's TASK_COMM_LEN (currently 16 chars) will result in a truncated</div><div class='ctx'> comm value.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+------------------------------------------------------------------------------</div><div class='add'>+Configuring procfs</div><div class='add'>+------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+4.1	Mount options</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+The following mount options are supported:</div><div class='add'>+</div><div class='add'>+	hidepid=	Set /proc/&lt;pid&gt;/ access mode.</div><div class='add'>+	gid=		Set the group authorized to learn processes information.</div><div class='add'>+</div><div class='add'>+hidepid=0 means classic mode - everybody may access all /proc/&lt;pid&gt;/ directories</div><div class='add'>+(default).</div><div class='add'>+</div><div class='add'>+hidepid=1 means users may not access any /proc/&lt;pid&gt;/ directories but their</div><div class='add'>+own.  Sensitive files like cmdline, sched*, status are now protected against</div><div class='add'>+other users.  This makes it impossible to learn whether any user runs</div><div class='add'>+specific program (given the program doesn't reveal itself by its behaviour).</div><div class='add'>+As an additional bonus, as /proc/&lt;pid&gt;/cmdline is unaccessible for other users,</div><div class='add'>+poorly written programs passing sensitive information via program arguments are</div><div class='add'>+now protected against local eavesdroppers.</div><div class='add'>+</div><div class='add'>+hidepid=2 means hidepid=1 plus all /proc/&lt;pid&gt;/ will be fully invisible to other</div><div class='add'>+users.  It doesn't mean that it hides a fact whether a process with a specific</div><div class='add'>+pid value exists (it can be learned by other means, e.g. by "kill -0 $PID"),</div><div class='add'>+but it hides process' uid and gid, which may be learned by stat()'ing</div><div class='add'>+/proc/&lt;pid&gt;/ otherwise.  It greatly complicates an intruder's task of gathering</div><div class='add'>+information about running processes, whether some daemon runs with elevated</div><div class='add'>+privileges, whether other user runs some sensitive program, whether other users</div><div class='add'>+run any program at all, etc.</div><div class='add'>+</div><div class='add'>+gid= defines a group authorized to learn processes information otherwise</div><div class='add'>+prohibited by hidepid=.  If you use some daemon like identd which needs to learn</div><div class='add'>+information about processes information, just add identd to this group.</div><div class='head'>diff --git a/Documentation/filesystems/squashfs.txt b/Documentation/filesystems/squashfs.txt<br/>index 7db3ebda5a4c..403c090aca39 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/squashfs.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/squashfs.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/squashfs.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/filesystems/squashfs.txt</a></div><div class='hunk'>@@ -93,8 +93,8 @@ byte alignment:</div><div class='ctx'> </div><div class='ctx'> Compressed data blocks are written to the filesystem as files are read from</div><div class='ctx'> the source directory, and checked for duplicates.  Once all file data has been</div><div class='del'>-written the completed inode, directory, fragment, export and uid/gid lookup</div><div class='del'>-tables are written.</div><div class='add'>+written the completed inode, directory, fragment, export, uid/gid lookup and</div><div class='add'>+xattr tables are written.</div><div class='ctx'> </div><div class='ctx'> 3.1 Compression options</div><div class='ctx'> -----------------------</div><div class='hunk'>@@ -151,7 +151,7 @@ in each metadata block.  Directories are sorted in alphabetical order,</div><div class='ctx'> and at lookup the index is scanned linearly looking for the first filename</div><div class='ctx'> alphabetically larger than the filename being looked up.  At this point the</div><div class='ctx'> location of the metadata block the filename is in has been found.</div><div class='del'>-The general idea of the index is ensure only one metadata block needs to be</div><div class='add'>+The general idea of the index is to ensure only one metadata block needs to be</div><div class='ctx'> decompressed to do a lookup irrespective of the length of the directory.</div><div class='ctx'> This scheme has the advantage that it doesn't require extra memory overhead</div><div class='ctx'> and doesn't require much extra storage on disk.</div><div class='head'>diff --git a/Documentation/filesystems/sysfs.txt b/Documentation/filesystems/sysfs.txt<br/>index 07235caec22c..a6619b7064b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/sysfs.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/sysfs.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/sysfs.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/filesystems/sysfs.txt</a></div><div class='hunk'>@@ -70,7 +70,7 @@ An attribute definition is simply:</div><div class='ctx'> struct attribute {</div><div class='ctx'>         char                    * name;</div><div class='ctx'>         struct module		*owner;</div><div class='del'>-        mode_t                  mode;</div><div class='add'>+        umode_t                 mode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt<br/>index 43cbd0821721..3d9393b845b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/vfs.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/filesystems/vfs.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/vfs.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/filesystems/vfs.txt</a></div><div class='hunk'>@@ -225,7 +225,7 @@ struct super_operations {</div><div class='ctx'>         void (*clear_inode) (struct inode *);</div><div class='ctx'>         void (*umount_begin) (struct super_block *);</div><div class='ctx'> </div><div class='del'>-        int (*show_options)(struct seq_file *, struct vfsmount *);</div><div class='add'>+        int (*show_options)(struct seq_file *, struct dentry *);</div><div class='ctx'> </div><div class='ctx'>         ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);</div><div class='ctx'>         ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);</div><div class='hunk'>@@ -341,14 +341,14 @@ This describes how the VFS can manipulate an inode in your</div><div class='ctx'> filesystem. As of kernel 2.6.22, the following members are defined:</div><div class='ctx'> </div><div class='ctx'> struct inode_operations {</div><div class='del'>-	int (*create) (struct inode *,struct dentry *,int, struct nameidata *);</div><div class='add'>+	int (*create) (struct inode *,struct dentry *, umode_t, struct nameidata *);</div><div class='ctx'> 	struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);</div><div class='ctx'> 	int (*link) (struct dentry *,struct inode *,struct dentry *);</div><div class='ctx'> 	int (*unlink) (struct inode *,struct dentry *);</div><div class='ctx'> 	int (*symlink) (struct inode *,struct dentry *,const char *);</div><div class='del'>-	int (*mkdir) (struct inode *,struct dentry *,int);</div><div class='add'>+	int (*mkdir) (struct inode *,struct dentry *,umode_t);</div><div class='ctx'> 	int (*rmdir) (struct inode *,struct dentry *);</div><div class='del'>-	int (*mknod) (struct inode *,struct dentry *,int,dev_t);</div><div class='add'>+	int (*mknod) (struct inode *,struct dentry *,umode_t,dev_t);</div><div class='ctx'> 	int (*rename) (struct inode *, struct dentry *,</div><div class='ctx'> 			struct inode *, struct dentry *);</div><div class='ctx'> 	int (*readlink) (struct dentry *, char __user *,int);</div><div class='head'>diff --git a/Documentation/hwmon/it87 b/Documentation/hwmon/it87<br/>index 6f496a586732..23b7def21ba8 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/hwmon/it87?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/hwmon/it87</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/it87?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/hwmon/it87</a></div><div class='hunk'>@@ -26,6 +26,10 @@ Supported chips:</div><div class='ctx'>     Prefix: 'it8721'</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='ctx'>     Datasheet: Not publicly available</div><div class='add'>+  * IT8728F</div><div class='add'>+    Prefix: 'it8728'</div><div class='add'>+    Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='add'>+    Datasheet: Not publicly available</div><div class='ctx'>   * SiS950   [clone of IT8705F]</div><div class='ctx'>     Prefix: 'it87'</div><div class='ctx'>     Addresses scanned: from Super I/O config space (8 I/O ports)</div><div class='hunk'>@@ -71,7 +75,7 @@ Description</div><div class='ctx'> -----------</div><div class='ctx'> </div><div class='ctx'> This driver implements support for the IT8705F, IT8712F, IT8716F,</div><div class='del'>-IT8718F, IT8720F, IT8721F, IT8726F, IT8758E and SiS950 chips.</div><div class='add'>+IT8718F, IT8720F, IT8721F, IT8726F, IT8728F, IT8758E and SiS950 chips.</div><div class='ctx'> </div><div class='ctx'> These chips are 'Super I/O chips', supporting floppy disks, infrared ports,</div><div class='ctx'> joysticks and other miscellaneous stuff. For hardware monitoring, they</div><div class='hunk'>@@ -105,6 +109,9 @@ The IT8726F is just bit enhanced IT8716F with additional hardware</div><div class='ctx'> for AMD power sequencing. Therefore the chip will appear as IT8716F</div><div class='ctx'> to userspace applications.</div><div class='ctx'> </div><div class='add'>+The IT8728F is considered compatible with the IT8721F, until a datasheet</div><div class='add'>+becomes available (hopefully.)</div><div class='add'>+</div><div class='ctx'> Temperatures are measured in degrees Celsius. An alarm is triggered once</div><div class='ctx'> when the Overtemperature Shutdown limit is crossed.</div><div class='ctx'> </div><div class='hunk'>@@ -121,8 +128,8 @@ alarm is triggered if the voltage has crossed a programmable minimum or</div><div class='ctx'> maximum limit. Note that minimum in this case always means 'closest to</div><div class='ctx'> zero'; this is important for negative voltage measurements. All voltage</div><div class='ctx'> inputs can measure voltages between 0 and 4.08 volts, with a resolution of</div><div class='del'>-0.016 volt (except IT8721F/IT8758E: 0.012 volt.) The battery voltage in8 does</div><div class='del'>-not have limit registers.</div><div class='add'>+0.016 volt (except IT8721F/IT8758E and IT8728F: 0.012 volt.) The battery</div><div class='add'>+voltage in8 does not have limit registers.</div><div class='ctx'> </div><div class='ctx'> On the IT8721F/IT8758E, some voltage inputs are internal and scaled inside</div><div class='ctx'> the chip (in7, in8 and optionally in3). The driver handles this transparently</div><div class='head'>diff --git a/Documentation/hwmon/lm63 b/Documentation/hwmon/lm63<br/>index b9843eab1afb..4d30d209881a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/hwmon/lm63?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/hwmon/lm63</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/lm63?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/hwmon/lm63</a></div><div class='hunk'>@@ -12,6 +12,11 @@ Supported chips:</div><div class='ctx'>     Addresses scanned: I2C 0x18 and 0x4e</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='ctx'>                http://www.national.com/pf/LM/LM64.html</div><div class='add'>+  * National Semiconductor LM96163</div><div class='add'>+    Prefix: 'lm96163'</div><div class='add'>+    Addresses scanned: I2C 0x4c</div><div class='add'>+    Datasheet: Publicly available at the National Semiconductor website</div><div class='add'>+               http://www.national.com/pf/LM/LM96163.html</div><div class='ctx'> </div><div class='ctx'> Author: Jean Delvare &lt;khali@linux-fr.org&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -49,16 +54,24 @@ value for measuring the speed of the fan. It can measure fan speeds down to</div><div class='ctx'> Note that the pin used for fan monitoring is shared with an alert out</div><div class='ctx'> function. Depending on how the board designer wanted to use the chip, fan</div><div class='ctx'> speed monitoring will or will not be possible. The proper chip configuration</div><div class='del'>-is left to the BIOS, and the driver will blindly trust it.</div><div class='add'>+is left to the BIOS, and the driver will blindly trust it. Only the original</div><div class='add'>+LM63 suffers from this limitation, the LM64 and LM96163 have separate pins</div><div class='add'>+for fan monitoring and alert out. On the LM64, monitoring is always enabled;</div><div class='add'>+on the LM96163 it can be disabled.</div><div class='ctx'> </div><div class='ctx'> A PWM output can be used to control the speed of the fan. The LM63 has two</div><div class='ctx'> PWM modes: manual and automatic. Automatic mode is not fully implemented yet</div><div class='ctx'> (you cannot define your custom PWM/temperature curve), and mode change isn't</div><div class='ctx'> supported either.</div><div class='ctx'> </div><div class='del'>-The lm63 driver will not update its values more frequently than every</div><div class='del'>-second; reading them more often will do no harm, but will return 'old'</div><div class='del'>-values.</div><div class='add'>+The lm63 driver will not update its values more frequently than configured with</div><div class='add'>+the update_interval sysfs attribute; reading them more often will do no harm,</div><div class='add'>+but will return 'old' values. Values in the automatic fan control lookup table</div><div class='add'>+(attributes pwm1_auto_*) have their own independent lifetime of 5 seconds.</div><div class='ctx'> </div><div class='ctx'> The LM64 is effectively an LM63 with GPIO lines. The driver does not</div><div class='ctx'> support these GPIO lines at present.</div><div class='add'>+</div><div class='add'>+The LM96163 is an enhanced version of LM63 with improved temperature accuracy</div><div class='add'>+and better PWM resolution. For LM96163, the external temperature sensor type is</div><div class='add'>+configurable as CPU embedded diode(1) or 3904 transistor(2).</div><div class='head'>diff --git a/Documentation/hwmon/pmbus b/Documentation/hwmon/pmbus<br/>index 15ac911ce51b..d28b591753d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/hwmon/pmbus?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/hwmon/pmbus</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/pmbus?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/hwmon/pmbus</a></div><div class='hunk'>@@ -2,9 +2,8 @@ Kernel driver pmbus</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='ctx'> Supported chips:</div><div class='del'>-  * Ericsson BMR45X series</div><div class='del'>-    DC/DC Converter</div><div class='del'>-    Prefixes: 'bmr450', 'bmr451', 'bmr453', 'bmr454'</div><div class='add'>+  * Ericsson BMR453, BMR454</div><div class='add'>+    Prefixes: 'bmr453', 'bmr454'</div><div class='ctx'>     Addresses scanned: -</div><div class='ctx'>     Datasheet:</div><div class='ctx'>  http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146395</div><div class='head'>diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface<br/>index a4aa8f600e09..1f4dd855a299 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/hwmon/sysfs-interface?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/hwmon/sysfs-interface</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/sysfs-interface?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/hwmon/sysfs-interface</a></div><div class='hunk'>@@ -304,7 +304,7 @@ value (fastest fan speed) wins.</div><div class='ctx'> temp[1-*]_type	Sensor type selection.</div><div class='ctx'> 		Integers 1 to 6</div><div class='ctx'> 		RW</div><div class='del'>-		1: PII/Celeron Diode</div><div class='add'>+		1: CPU embedded diode</div><div class='ctx'> 		2: 3904 transistor</div><div class='ctx'> 		3: thermal diode</div><div class='ctx'> 		4: thermistor</div><div class='head'>diff --git a/Documentation/hwmon/zl6100 b/Documentation/hwmon/zl6100<br/>index 7617798b5c97..51f76a189fee 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/hwmon/zl6100?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/hwmon/zl6100</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/zl6100?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/hwmon/zl6100</a></div><div class='hunk'>@@ -6,6 +6,10 @@ Supported chips:</div><div class='ctx'>     Prefix: 'zl2004'</div><div class='ctx'>     Addresses scanned: -</div><div class='ctx'>     Datasheet: http://www.intersil.com/data/fn/fn6847.pdf</div><div class='add'>+  * Intersil / Zilker Labs ZL2005</div><div class='add'>+    Prefix: 'zl2005'</div><div class='add'>+    Addresses scanned: -</div><div class='add'>+    Datasheet: http://www.intersil.com/data/fn/fn6848.pdf</div><div class='ctx'>   * Intersil / Zilker Labs ZL2006</div><div class='ctx'>     Prefix: 'zl2006'</div><div class='ctx'>     Addresses scanned: -</div><div class='hunk'>@@ -30,6 +34,17 @@ Supported chips:</div><div class='ctx'>     Prefix: 'zl6105'</div><div class='ctx'>     Addresses scanned: -</div><div class='ctx'>     Datasheet: http://www.intersil.com/data/fn/fn6906.pdf</div><div class='add'>+  * Ericsson BMR450, BMR451</div><div class='add'>+    Prefix: 'bmr450', 'bmr451'</div><div class='add'>+    Addresses scanned: -</div><div class='add'>+    Datasheet:</div><div class='add'>+http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146401</div><div class='add'>+  * Ericsson BMR462, BMR463, BMR464</div><div class='add'>+    Prefixes: 'bmr462', 'bmr463', 'bmr464'</div><div class='add'>+    Addresses scanned: -</div><div class='add'>+    Datasheet:</div><div class='add'>+http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146256</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Author: Guenter Roeck &lt;guenter.roeck@ericsson.com&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/input/alps.txt b/Documentation/input/alps.txt<br/>new file mode 100644<br/>index 000000000000..f274c28b5103<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/input/alps.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/input/alps.txt</a></div><div class='hunk'>@@ -0,0 +1,188 @@</div><div class='add'>+ALPS Touchpad Protocol</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'>+Currently the ALPS touchpad driver supports four protocol versions in use by</div><div class='add'>+ALPS touchpads, called versions 1, 2, 3, and 4. Information about the various</div><div class='add'>+protocol versions is contained in the following sections.</div><div class='add'>+</div><div class='add'>+Detection</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+All ALPS touchpads should respond to the "E6 report" command sequence:</div><div class='add'>+E8-E6-E6-E6-E9. An ALPS touchpad should respond with either 00-00-0A or</div><div class='add'>+00-00-64.</div><div class='add'>+</div><div class='add'>+If the E6 report is successful, the touchpad model is identified using the "E7</div><div class='add'>+report" sequence: E8-E7-E7-E7-E9. The response is the model signature and is</div><div class='add'>+matched against known models in the alps_model_data_array.</div><div class='add'>+</div><div class='add'>+With protocol versions 3 and 4, the E7 report model signature is always</div><div class='add'>+73-02-64. To differentiate between these versions, the response from the</div><div class='add'>+"Enter Command Mode" sequence must be inspected as described below.</div><div class='add'>+</div><div class='add'>+Command Mode</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+Protocol versions 3 and 4 have a command mode that is used to read and write</div><div class='add'>+one-byte device registers in a 16-bit address space. The command sequence</div><div class='add'>+EC-EC-EC-E9 places the device in command mode, and the device will respond</div><div class='add'>+with 88-07 followed by a third byte. This third byte can be used to determine</div><div class='add'>+whether the devices uses the version 3 or 4 protocol.</div><div class='add'>+</div><div class='add'>+To exit command mode, PSMOUSE_CMD_SETSTREAM (EA) is sent to the touchpad.</div><div class='add'>+</div><div class='add'>+While in command mode, register addresses can be set by first sending a</div><div class='add'>+specific command, either EC for v3 devices or F5 for v4 devices. Then the</div><div class='add'>+address is sent one nibble at a time, where each nibble is encoded as a</div><div class='add'>+command with optional data. This enoding differs slightly between the v3 and</div><div class='add'>+v4 protocols.</div><div class='add'>+</div><div class='add'>+Once an address has been set, the addressed register can be read by sending</div><div class='add'>+PSMOUSE_CMD_GETINFO (E9). The first two bytes of the response contains the</div><div class='add'>+address of the register being read, and the third contains the value of the</div><div class='add'>+register. Registers are written by writing the value one nibble at a time</div><div class='add'>+using the same encoding used for addresses.</div><div class='add'>+</div><div class='add'>+Packet Format</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+In the following tables, the following notation is used.</div><div class='add'>+</div><div class='add'>+ CAPITALS = stick, miniscules = touchpad</div><div class='add'>+</div><div class='add'>+?'s can have different meanings on different models, such as wheel rotation,</div><div class='add'>+extra buttons, stick buttons on a dualpoint, etc.</div><div class='add'>+</div><div class='add'>+PS/2 packet format</div><div class='add'>+------------------</div><div class='add'>+</div><div class='add'>+ byte 0:  0    0 YSGN XSGN    1    M    R    L</div><div class='add'>+ byte 1: X7   X6   X5   X4   X3   X2   X1   X0</div><div class='add'>+ byte 2: Y7   Y6   Y5   Y4   Y3   Y2   Y1   Y0</div><div class='add'>+</div><div class='add'>+Note that the device never signals overflow condition.</div><div class='add'>+</div><div class='add'>+ALPS Absolute Mode - Protocol Verion 1</div><div class='add'>+--------------------------------------</div><div class='add'>+</div><div class='add'>+ byte 0:  1    0    0    0    1   x9   x8   x7</div><div class='add'>+ byte 1:  0   x6   x5   x4   x3   x2   x1   x0</div><div class='add'>+ byte 2:  0    ?    ?    l    r    ?  fin  ges</div><div class='add'>+ byte 3:  0    ?    ?    ?    ?   y9   y8   y7</div><div class='add'>+ byte 4:  0   y6   y5   y4   y3   y2   y1   y0</div><div class='add'>+ byte 5:  0   z6   z5   z4   z3   z2   z1   z0</div><div class='add'>+</div><div class='add'>+ALPS Absolute Mode - Protocol Version 2</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+ byte 0:  1    ?    ?    ?    1    ?    ?    ?</div><div class='add'>+ byte 1:  0   x6   x5   x4   x3   x2   x1   x0</div><div class='add'>+ byte 2:  0  x10   x9   x8   x7    ?  fin  ges</div><div class='add'>+ byte 3:  0   y9   y8   y7    1    M    R    L</div><div class='add'>+ byte 4:  0   y6   y5   y4   y3   y2   y1   y0</div><div class='add'>+ byte 5:  0   z6   z5   z4   z3   z2   z1   z0</div><div class='add'>+</div><div class='add'>+Dualpoint device -- interleaved packet format</div><div class='add'>+---------------------------------------------</div><div class='add'>+</div><div class='add'>+ byte 0:    1    1    0    0    1    1    1    1</div><div class='add'>+ byte 1:    0   x6   x5   x4   x3   x2   x1   x0</div><div class='add'>+ byte 2:    0  x10   x9   x8   x7    0  fin  ges</div><div class='add'>+ byte 3:    0    0 YSGN XSGN    1    1    1    1</div><div class='add'>+ byte 4:   X7   X6   X5   X4   X3   X2   X1   X0</div><div class='add'>+ byte 5:   Y7   Y6   Y5   Y4   Y3   Y2   Y1   Y0</div><div class='add'>+ byte 6:    0   y9   y8   y7    1    m    r    l</div><div class='add'>+ byte 7:    0   y6   y5   y4   y3   y2   y1   y0</div><div class='add'>+ byte 8:    0   z6   z5   z4   z3   z2   z1   z0</div><div class='add'>+</div><div class='add'>+ALPS Absolute Mode - Protocol Version 3</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+ALPS protocol version 3 has three different packet formats. The first two are</div><div class='add'>+associated with touchpad events, and the third is associatd with trackstick</div><div class='add'>+events.</div><div class='add'>+</div><div class='add'>+The first type is the touchpad position packet.</div><div class='add'>+</div><div class='add'>+ byte 0:    1    ?   x1   x0    1    1    1    1</div><div class='add'>+ byte 1:    0  x10   x9   x8   x7   x6   x5   x4</div><div class='add'>+ byte 2:    0  y10   y9   y8   y7   y6   y5   y4</div><div class='add'>+ byte 3:    0    M    R    L    1    m    r    l</div><div class='add'>+ byte 4:    0   mt   x3   x2   y3   y2   y1   y0</div><div class='add'>+ byte 5:    0   z6   z5   z4   z3   z2   z1   z0</div><div class='add'>+</div><div class='add'>+Note that for some devices the trackstick buttons are reported in this packet,</div><div class='add'>+and on others it is reported in the trackstick packets.</div><div class='add'>+</div><div class='add'>+The second packet type contains bitmaps representing the x and y axes. In the</div><div class='add'>+bitmaps a given bit is set if there is a finger covering that position on the</div><div class='add'>+given axis. Thus the bitmap packet can be used for low-resolution multi-touch</div><div class='add'>+data, although finger tracking is not possible.  This packet also encodes the</div><div class='add'>+number of contacts (f1 and f0 in the table below).</div><div class='add'>+</div><div class='add'>+ byte 0:    1    1   x1   x0    1    1    1    1</div><div class='add'>+ byte 1:    0   x8   x7   x6   x5   x4   x3   x2</div><div class='add'>+ byte 2:    0   y7   y6   y5   y4   y3   y2   y1</div><div class='add'>+ byte 3:    0  y10   y9   y8    1    1    1    1</div><div class='add'>+ byte 4:    0  x14  x13  x12  x11  x10   x9   y0</div><div class='add'>+ byte 5:    0    1    ?    ?    ?    ?   f1   f0</div><div class='add'>+</div><div class='add'>+This packet only appears after a position packet with the mt bit set, and</div><div class='add'>+ususally only appears when there are two or more contacts (although</div><div class='add'>+ocassionally it's seen with only a single contact).</div><div class='add'>+</div><div class='add'>+The final v3 packet type is the trackstick packet.</div><div class='add'>+</div><div class='add'>+ byte 0:    1    1   x7   y7    1    1    1    1</div><div class='add'>+ byte 1:    0   x6   x5   x4   x3   x2   x1   x0</div><div class='add'>+ byte 2:    0   y6   y5   y4   y3   y2   y1   y0</div><div class='add'>+ byte 3:    0    1    0    0    1    0    0    0</div><div class='add'>+ byte 4:    0   z4   z3   z2   z1   z0    ?    ?</div><div class='add'>+ byte 5:    0    0    1    1    1    1    1    1</div><div class='add'>+</div><div class='add'>+ALPS Absolute Mode - Protocol Version 4</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+Protocol version 4 has an 8-byte packet format.</div><div class='add'>+</div><div class='add'>+ byte 0:    1    ?   x1   x0    1    1    1    1</div><div class='add'>+ byte 1:    0  x10   x9   x8   x7   x6   x5   x4</div><div class='add'>+ byte 2:    0  y10   y9   y8   y7   y6   y5   y4</div><div class='add'>+ byte 3:    0    1   x3   x2   y3   y2   y1   y0</div><div class='add'>+ byte 4:    0    ?    ?    ?    1    ?    r    l</div><div class='add'>+ byte 5:    0   z6   z5   z4   z3   z2   z1   z0</div><div class='add'>+ byte 6:    bitmap data (described below)</div><div class='add'>+ byte 7:    bitmap data (described below)</div><div class='add'>+</div><div class='add'>+The last two bytes represent a partial bitmap packet, with 3 full packets</div><div class='add'>+required to construct a complete bitmap packet.  Once assembled, the 6-byte</div><div class='add'>+bitmap packet has the following format:</div><div class='add'>+</div><div class='add'>+ byte 0:    0    1   x7   x6   x5   x4   x3   x2</div><div class='add'>+ byte 1:    0   x1   x0   y4   y3   y2   y1   y0</div><div class='add'>+ byte 2:    0    0    ?  x14  x13  x12  x11  x10</div><div class='add'>+ byte 3:    0   x9   x8   y9   y8   y7   y6   y5</div><div class='add'>+ byte 4:    0    0    0    0    0    0    0    0</div><div class='add'>+ byte 5:    0    0    0    0    0    0    0  y10</div><div class='add'>+</div><div class='add'>+There are several things worth noting here.</div><div class='add'>+</div><div class='add'>+ 1) In the bitmap data, bit 6 of byte 0 serves as a sync byte to</div><div class='add'>+    identify the first fragment of a bitmap packet.</div><div class='add'>+</div><div class='add'>+ 2) The bitmaps represent the same data as in the v3 bitmap packets, although</div><div class='add'>+    the packet layout is different.</div><div class='add'>+</div><div class='add'>+ 3) There doesn't seem to be a count of the contact points anywhere in the v4</div><div class='add'>+    protocol packets. Deriving a count of contact points must be done by</div><div class='add'>+    analyzing the bitmaps.</div><div class='add'>+</div><div class='add'>+ 4) There is a 3 to 1 ratio of position packets to bitmap packets. Therefore</div><div class='add'>+    MT position can only be updated for every third ST position update, and</div><div class='add'>+    the count of contact points can only be updated every third packet as</div><div class='add'>+    well.</div><div class='add'>+</div><div class='add'>+So far no v4 devices with tracksticks have been encountered.</div><div class='head'>diff --git a/Documentation/input/gpio-tilt.txt b/Documentation/input/gpio-tilt.txt<br/>new file mode 100644<br/>index 000000000000..06d60c3ff5e7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/input/gpio-tilt.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/input/gpio-tilt.txt</a></div><div class='hunk'>@@ -0,0 +1,103 @@</div><div class='add'>+Driver for tilt-switches connected via GPIOs</div><div class='add'>+============================================</div><div class='add'>+</div><div class='add'>+Generic driver to read data from tilt switches connected via gpios.</div><div class='add'>+Orientation can be provided by one or more than one tilt switches,</div><div class='add'>+i.e. each tilt switch providing one axis, and the number of axes</div><div class='add'>+is also not limited.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Data structures:</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+The array of struct gpio in the gpios field is used to list the gpios</div><div class='add'>+that represent the current tilt state.</div><div class='add'>+</div><div class='add'>+The array of struct gpio_tilt_axis describes the axes that are reported</div><div class='add'>+to the input system. The values set therein are used for the</div><div class='add'>+input_set_abs_params calls needed to init the axes.</div><div class='add'>+</div><div class='add'>+The array of struct gpio_tilt_state maps gpio states to the corresponding</div><div class='add'>+values to report. The gpio state is represented as a bitfield where the</div><div class='add'>+bit-index corresponds to the index of the gpio in the struct gpio array.</div><div class='add'>+In the same manner the values stored in the axes array correspond to</div><div class='add'>+the elements of the gpio_tilt_axis-array.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+Example configuration for a single TS1003 tilt switch that rotates around</div><div class='add'>+one axis in 4 steps and emitts the current tilt via two GPIOs.</div><div class='add'>+</div><div class='add'>+static int sg060_tilt_enable(struct device *dev) {</div><div class='add'>+	/* code to enable the sensors */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void sg060_tilt_disable(struct device *dev) {</div><div class='add'>+	/* code to disable the sensors */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio sg060_tilt_gpios[] = {</div><div class='add'>+	{ SG060_TILT_GPIO_SENSOR1, GPIOF_IN, "tilt_sensor1" },</div><div class='add'>+	{ SG060_TILT_GPIO_SENSOR2, GPIOF_IN, "tilt_sensor2" },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_tilt_state sg060_tilt_states[] = {</div><div class='add'>+	{</div><div class='add'>+		.gpios = (0 &lt;&lt; 1) | (0 &lt;&lt; 0),</div><div class='add'>+		.axes = (int[]) {</div><div class='add'>+			0,</div><div class='add'>+		},</div><div class='add'>+	}, {</div><div class='add'>+		.gpios = (0 &lt;&lt; 1) | (1 &lt;&lt; 0),</div><div class='add'>+		.axes = (int[]) {</div><div class='add'>+			1, /* 90 degrees */</div><div class='add'>+		},</div><div class='add'>+	}, {</div><div class='add'>+		.gpios = (1 &lt;&lt; 1) | (1 &lt;&lt; 0),</div><div class='add'>+		.axes = (int[]) {</div><div class='add'>+			2, /* 180 degrees */</div><div class='add'>+		},</div><div class='add'>+	}, {</div><div class='add'>+		.gpios = (1 &lt;&lt; 1) | (0 &lt;&lt; 0),</div><div class='add'>+		.axes = (int[]) {</div><div class='add'>+			3, /* 270 degrees */</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_tilt_axis sg060_tilt_axes[] = {</div><div class='add'>+	{</div><div class='add'>+		.axis = ABS_RY,</div><div class='add'>+		.min = 0,</div><div class='add'>+		.max = 3,</div><div class='add'>+		.fuzz = 0,</div><div class='add'>+		.flat = 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_tilt_platform_data sg060_tilt_pdata= {</div><div class='add'>+	.gpios = sg060_tilt_gpios,</div><div class='add'>+	.nr_gpios = ARRAY_SIZE(sg060_tilt_gpios),</div><div class='add'>+</div><div class='add'>+	.axes = sg060_tilt_axes,</div><div class='add'>+	.nr_axes = ARRAY_SIZE(sg060_tilt_axes),</div><div class='add'>+</div><div class='add'>+	.states = sg060_tilt_states,</div><div class='add'>+	.nr_states = ARRAY_SIZE(sg060_tilt_states),</div><div class='add'>+</div><div class='add'>+	.debounce_interval = 100,</div><div class='add'>+</div><div class='add'>+	.poll_interval = 1000,</div><div class='add'>+	.enable = sg060_tilt_enable,</div><div class='add'>+	.disable = sg060_tilt_disable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device sg060_device_tilt = {</div><div class='add'>+	.name = "gpio-tilt-polled",</div><div class='add'>+	.id = -1,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;sg060_tilt_pdata,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/input/sentelic.txt b/Documentation/input/sentelic.txt<br/>index b2ef125b71f8..89251e2a3eba 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/input/sentelic.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/input/sentelic.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/input/sentelic.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/input/sentelic.txt</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-Copyright (C) 2002-2010 Sentelic Corporation.</div><div class='del'>-Last update: Jan-13-2010</div><div class='add'>+Copyright (C) 2002-2011 Sentelic Corporation.</div><div class='add'>+Last update: Dec-07-2011</div><div class='ctx'> </div><div class='ctx'> ==============================================================================</div><div class='ctx'> * Finger Sensing Pad Intellimouse Mode(scrolling wheel, 4th and 5th buttons)</div><div class='hunk'>@@ -140,6 +140,7 @@ BYTE  |---------------|BYTE |---------------|BYTE|---------------|BYTE|---------</div><div class='ctx'> Byte 1: Bit7~Bit6 =&gt; 00, Normal data packet</div><div class='ctx'>                   =&gt; 01, Absolute coordination packet</div><div class='ctx'>                   =&gt; 10, Notify packet</div><div class='add'>+                  =&gt; 11, Normal data packet with on-pad click</div><div class='ctx'>         Bit5 =&gt; Valid bit, 0 means that the coordinate is invalid or finger up.</div><div class='ctx'>                 When both fingers are up, the last two reports have zero valid</div><div class='ctx'>                 bit.</div><div class='hunk'>@@ -164,6 +165,7 @@ BYTE  |---------------|BYTE |---------------|BYTE|---------------|BYTE|---------</div><div class='ctx'> Byte 1: Bit7~Bit6 =&gt; 00, Normal data packet</div><div class='ctx'>                   =&gt; 01, Absolute coordinates packet</div><div class='ctx'>                   =&gt; 10, Notify packet</div><div class='add'>+                  =&gt; 11, Normal data packet with on-pad click</div><div class='ctx'>         Bit5 =&gt; Valid bit, 0 means that the coordinate is invalid or finger up.</div><div class='ctx'>                 When both fingers are up, the last two reports have zero valid</div><div class='ctx'>                 bit.</div><div class='hunk'>@@ -188,6 +190,7 @@ BYTE  |---------------|BYTE |---------------|BYTE|---------------|BYTE|---------</div><div class='ctx'> Byte 1: Bit7~Bit6 =&gt; 00, Normal data packet</div><div class='ctx'>                   =&gt; 01, Absolute coordinates packet</div><div class='ctx'>                   =&gt; 10, Notify packet</div><div class='add'>+                  =&gt; 11, Normal data packet with on-pad click</div><div class='ctx'>         Bit5 =&gt; 1</div><div class='ctx'>         Bit4 =&gt; when in absolute coordinates mode (valid when EN_PKT_GO is 1):</div><div class='ctx'>                 0: left button is generated by the on-pad command</div><div class='hunk'>@@ -205,7 +208,7 @@ Byte 4: Bit7 =&gt; scroll right button</div><div class='ctx'>         Bit6 =&gt; scroll left button</div><div class='ctx'>         Bit5 =&gt; scroll down button</div><div class='ctx'>         Bit4 =&gt; scroll up button</div><div class='del'>-            * Note that if gesture and additional buttoni (Bit4~Bit7)</div><div class='add'>+            * Note that if gesture and additional button (Bit4~Bit7)</div><div class='ctx'>               happen at the same time, the button information will not</div><div class='ctx'>               be sent.</div><div class='ctx'>         Bit3~Bit0 =&gt; Reserved</div><div class='hunk'>@@ -227,6 +230,7 @@ BYTE  |---------------|BYTE |---------------|BYTE|---------------|BYTE|---------</div><div class='ctx'> Byte 1: Bit7~Bit6 =&gt; 00, Normal data packet</div><div class='ctx'>                   =&gt; 01, Absolute coordinates packet</div><div class='ctx'>                   =&gt; 10, Notify packet</div><div class='add'>+                  =&gt; 11, Normal data packet with on-pad click</div><div class='ctx'>         Bit5 =&gt; Valid bit, 0 means that the coordinate is invalid or finger up.</div><div class='ctx'>                 When both fingers are up, the last two reports have zero valid</div><div class='ctx'>                 bit.</div><div class='hunk'>@@ -253,6 +257,7 @@ BYTE  |---------------|BYTE |---------------|BYTE|---------------|BYTE|---------</div><div class='ctx'> Byte 1: Bit7~Bit6 =&gt; 00, Normal data packet</div><div class='ctx'>                   =&gt; 01, Absolute coordination packet</div><div class='ctx'>                   =&gt; 10, Notify packet</div><div class='add'>+                  =&gt; 11, Normal data packet with on-pad click</div><div class='ctx'>         Bit5 =&gt; Valid bit, 0 means that the coordinate is invalid or finger up.</div><div class='ctx'>                 When both fingers are up, the last two reports have zero valid</div><div class='ctx'>                 bit.</div><div class='hunk'>@@ -279,8 +284,9 @@ BYTE  |---------------|BYTE |---------------|BYTE|---------------|BYTE|---------</div><div class='ctx'> Byte 1: Bit7~Bit6 =&gt; 00, Normal data packet</div><div class='ctx'>                   =&gt; 01, Absolute coordination packet</div><div class='ctx'>                   =&gt; 10, Notify packet</div><div class='add'>+                  =&gt; 11, Normal data packet with on-pad click</div><div class='ctx'>         Bit5 =&gt; 1</div><div class='del'>-        Bit4 =&gt; when in absolute coordinate mode (valid when EN_PKT_GO is 1):</div><div class='add'>+        Bit4 =&gt; when in absolute coordinates mode (valid when EN_PKT_GO is 1):</div><div class='ctx'>                 0: left button is generated by the on-pad command</div><div class='ctx'>                 1: left button is generated by the external button</div><div class='ctx'>         Bit3 =&gt; 1</div><div class='hunk'>@@ -307,6 +313,110 @@ Sample sequence of Multi-finger, Multi-coordinate mode:</div><div class='ctx'> 	abs pkt 2, ..., notify packet (valid bit == 0)</div><div class='ctx'> </div><div class='ctx'> ==============================================================================</div><div class='add'>+* Absolute position for STL3888-Cx and STL3888-Dx.</div><div class='add'>+==============================================================================</div><div class='add'>+Single Finger, Absolute Coordinate Mode (SFAC)</div><div class='add'>+   Bit 7 6 5 4 3 2 1 0       7 6 5 4 3 2 1 0      7 6 5 4 3 2 1 0      7 6 5 4 3 2 1 0</div><div class='add'>+BYTE  |---------------|BYTE |---------------|BYTE|---------------|BYTE|---------------|</div><div class='add'>+  1   |0|1|0|P|1|M|R|L|  2  |X|X|X|X|X|X|X|X|  3 |Y|Y|Y|Y|Y|Y|Y|Y|  4 |r|l|B|F|X|X|Y|Y|</div><div class='add'>+      |---------------|     |---------------|    |---------------|    |---------------|</div><div class='add'>+</div><div class='add'>+Byte 1: Bit7~Bit6 =&gt; 00, Normal data packet</div><div class='add'>+                  =&gt; 01, Absolute coordinates packet</div><div class='add'>+                  =&gt; 10, Notify packet</div><div class='add'>+	Bit5 =&gt; Coordinate mode(always 0 in SFAC mode):</div><div class='add'>+		0: single-finger absolute coordinates (SFAC) mode</div><div class='add'>+		1: multi-finger, multiple coordinates (MFMC) mode</div><div class='add'>+	Bit4 =&gt; 0: The LEFT button is generated by on-pad command (OPC)</div><div class='add'>+		1: The LEFT button is generated by external button</div><div class='add'>+		Default is 1 even if the LEFT button is not pressed.</div><div class='add'>+	Bit3 =&gt; Always 1, as specified by PS/2 protocol.</div><div class='add'>+	Bit2 =&gt; Middle Button, 1 is pressed, 0 is not pressed.</div><div class='add'>+	Bit1 =&gt; Right Button, 1 is pressed, 0 is not pressed.</div><div class='add'>+	Bit0 =&gt; Left Button, 1 is pressed, 0 is not pressed.</div><div class='add'>+Byte 2: X coordinate (xpos[9:2])</div><div class='add'>+Byte 3: Y coordinate (ypos[9:2])</div><div class='add'>+Byte 4: Bit1~Bit0 =&gt; Y coordinate (xpos[1:0])</div><div class='add'>+	Bit3~Bit2 =&gt; X coordinate (ypos[1:0])</div><div class='add'>+	Bit4 =&gt; 4th mouse button(forward one page)</div><div class='add'>+	Bit5 =&gt; 5th mouse button(backward one page)</div><div class='add'>+	Bit6 =&gt; scroll left button</div><div class='add'>+	Bit7 =&gt; scroll right button</div><div class='add'>+</div><div class='add'>+Multi Finger, Multiple Coordinates Mode (MFMC):</div><div class='add'>+   Bit 7 6 5 4 3 2 1 0       7 6 5 4 3 2 1 0      7 6 5 4 3 2 1 0      7 6 5 4 3 2 1 0</div><div class='add'>+BYTE  |---------------|BYTE |---------------|BYTE|---------------|BYTE|---------------|</div><div class='add'>+  1   |0|1|1|P|1|F|R|L|  2  |X|X|X|X|X|X|X|X|  3 |Y|Y|Y|Y|Y|Y|Y|Y|  4 |r|l|B|F|X|X|Y|Y|</div><div class='add'>+      |---------------|     |---------------|    |---------------|    |---------------|</div><div class='add'>+</div><div class='add'>+Byte 1: Bit7~Bit6 =&gt; 00, Normal data packet</div><div class='add'>+                  =&gt; 01, Absolute coordination packet</div><div class='add'>+                  =&gt; 10, Notify packet</div><div class='add'>+	Bit5 =&gt; Coordinate mode (always 1 in MFMC mode):</div><div class='add'>+		0: single-finger absolute coordinates (SFAC) mode</div><div class='add'>+		1: multi-finger, multiple coordinates (MFMC) mode</div><div class='add'>+	Bit4 =&gt; 0: The LEFT button is generated by on-pad command (OPC)</div><div class='add'>+		1: The LEFT button is generated by external button</div><div class='add'>+		Default is 1 even if the LEFT button is not pressed.</div><div class='add'>+	Bit3 =&gt; Always 1, as specified by PS/2 protocol.</div><div class='add'>+	Bit2 =&gt; Finger index, 0 is the first finger, 1 is the second finger.</div><div class='add'>+		If bit 1 and 0 are all 1 and bit 4 is 0, the middle external</div><div class='add'>+		button is pressed.</div><div class='add'>+	Bit1 =&gt; Right Button, 1 is pressed, 0 is not pressed.</div><div class='add'>+	Bit0 =&gt; Left Button, 1 is pressed, 0 is not pressed.</div><div class='add'>+Byte 2: X coordinate (xpos[9:2])</div><div class='add'>+Byte 3: Y coordinate (ypos[9:2])</div><div class='add'>+Byte 4: Bit1~Bit0 =&gt; Y coordinate (xpos[1:0])</div><div class='add'>+	Bit3~Bit2 =&gt; X coordinate (ypos[1:0])</div><div class='add'>+	Bit4 =&gt; 4th mouse button(forward one page)</div><div class='add'>+	Bit5 =&gt; 5th mouse button(backward one page)</div><div class='add'>+	Bit6 =&gt; scroll left button</div><div class='add'>+	Bit7 =&gt; scroll right button</div><div class='add'>+</div><div class='add'>+  When one of the two fingers is up, the device will output four consecutive</div><div class='add'>+MFMC#0 report packets with zero X and Y to represent 1st finger is up or</div><div class='add'>+four consecutive MFMC#1 report packets with zero X and Y to represent that</div><div class='add'>+the 2nd finger is up.  On the other hand, if both fingers are up, the device</div><div class='add'>+will output four consecutive single-finger, absolute coordinate(SFAC) packets</div><div class='add'>+with zero X and Y.</div><div class='add'>+</div><div class='add'>+Notify Packet for STL3888-Cx/Dx</div><div class='add'>+   Bit 7 6 5 4 3 2 1 0       7 6 5 4 3 2 1 0      7 6 5 4 3 2 1 0      7 6 5 4 3 2 1 0</div><div class='add'>+BYTE  |---------------|BYTE |---------------|BYTE|---------------|BYTE|---------------|</div><div class='add'>+  1   |1|0|0|P|1|M|R|L|  2  |C|C|C|C|C|C|C|C|  3 |0|0|F|F|0|0|0|i|  4 |r|l|u|d|0|0|0|0|</div><div class='add'>+      |---------------|     |---------------|    |---------------|    |---------------|</div><div class='add'>+</div><div class='add'>+Byte 1: Bit7~Bit6 =&gt; 00, Normal data packet</div><div class='add'>+                  =&gt; 01, Absolute coordinates packet</div><div class='add'>+                  =&gt; 10, Notify packet</div><div class='add'>+	Bit5 =&gt; Always 0</div><div class='add'>+	Bit4 =&gt; 0: The LEFT button is generated by on-pad command(OPC)</div><div class='add'>+		1: The LEFT button is generated by external button</div><div class='add'>+		Default is 1 even if the LEFT button is not pressed.</div><div class='add'>+	Bit3 =&gt; 1</div><div class='add'>+	Bit2 =&gt; Middle Button, 1 is pressed, 0 is not pressed.</div><div class='add'>+	Bit1 =&gt; Right Button, 1 is pressed, 0 is not pressed.</div><div class='add'>+	Bit0 =&gt; Left Button, 1 is pressed, 0 is not pressed.</div><div class='add'>+Byte 2: Message type:</div><div class='add'>+	0xba =&gt; gesture information</div><div class='add'>+	0xc0 =&gt; one finger hold-rotating gesture</div><div class='add'>+Byte 3: The first parameter for the received message:</div><div class='add'>+	0xba =&gt; gesture ID (refer to the 'Gesture ID' section)</div><div class='add'>+	0xc0 =&gt; region ID</div><div class='add'>+Byte 4: The second parameter for the received message:</div><div class='add'>+	0xba =&gt; N/A</div><div class='add'>+	0xc0 =&gt; finger up/down information</div><div class='add'>+</div><div class='add'>+Sample sequence of Multi-finger, Multi-coordinates mode:</div><div class='add'>+</div><div class='add'>+	notify packet (valid bit == 1), MFMC packet 1 (byte 1, bit 2 == 0),</div><div class='add'>+	MFMC packet 2 (byte 1, bit 2 == 1), MFMC packet 1, MFMC packet 2,</div><div class='add'>+	..., notify packet (valid bit == 0)</div><div class='add'>+</div><div class='add'>+	That is, when the device is in MFMC mode, the host will receive</div><div class='add'>+	interleaved absolute coordinate packets for each finger.</div><div class='add'>+</div><div class='add'>+==============================================================================</div><div class='ctx'> * FSP Enable/Disable packet</div><div class='ctx'> ==============================================================================</div><div class='ctx'>    Bit 7 6 5 4 3 2 1 0       7 6 5 4 3 2 1 0      7 6 5 4 3 2 1 0      7 6 5 4 3 2 1 0</div><div class='hunk'>@@ -348,9 +458,10 @@ http://www.computer-engineering.org/ps2mouse/</div><div class='ctx'> ==============================================================================</div><div class='ctx'> 1. Identify FSP by reading device ID(0x00) and version(0x01) register</div><div class='ctx'> </div><div class='del'>-2. Determine number of buttons by reading status2 (0x0b) register</div><div class='add'>+2a. For FSP version &lt; STL3888 Cx, determine number of buttons by reading</div><div class='add'>+    the 'test mode status' (0x20) register:</div><div class='ctx'> </div><div class='del'>-	buttons = reg[0x0b] &amp; 0x30</div><div class='add'>+	buttons = reg[0x20] &amp; 0x30</div><div class='ctx'> </div><div class='ctx'> 	if buttons == 0x30 or buttons == 0x20:</div><div class='ctx'> 		# two/four buttons</div><div class='hunk'>@@ -365,6 +476,10 @@ http://www.computer-engineering.org/ps2mouse/</div><div class='ctx'> 		Refer to 'Finger Sensing Pad PS/2 Mouse Intellimouse'</div><div class='ctx'> 		section A for packet parsing detail</div><div class='ctx'> </div><div class='add'>+2b. For FSP version &gt;= STL3888 Cx:</div><div class='add'>+	Refer to 'Finger Sensing Pad PS/2 Mouse Intellimouse'</div><div class='add'>+	section A for packet parsing detail (ignore byte 4, bit ~ 7)</div><div class='add'>+</div><div class='ctx'> ==============================================================================</div><div class='ctx'> * Programming Sequence for Register Reading/Writing</div><div class='ctx'> ==============================================================================</div><div class='hunk'>@@ -374,7 +489,7 @@ Register inversion requirement:</div><div class='ctx'>   Following values needed to be inverted(the '~' operator in C) before being</div><div class='ctx'> sent to FSP:</div><div class='ctx'> </div><div class='del'>-	0xe9, 0xee, 0xf2 and 0xff.</div><div class='add'>+	0xe8, 0xe9, 0xee, 0xf2, 0xf3 and 0xff.</div><div class='ctx'> </div><div class='ctx'> Register swapping requirement:</div><div class='ctx'> </div><div class='hunk'>@@ -415,7 +530,18 @@ Register reading sequence:</div><div class='ctx'> </div><div class='ctx'> 	8. send 0xe9(status request) PS/2 command to FSP;</div><div class='ctx'> </div><div class='del'>-	9. the response read from FSP should be the requested register value.</div><div class='add'>+	9. the 4th byte of the response read from FSP should be the</div><div class='add'>+	requested register value(?? indicates don't care byte):</div><div class='add'>+</div><div class='add'>+		host: 0xe9</div><div class='add'>+		3888: 0xfa (??) (??) (val)</div><div class='add'>+</div><div class='add'>+	* Note that since the Cx release, the hardware will return 1's</div><div class='add'>+	complement of the register value at the 3rd byte of status request</div><div class='add'>+	result:</div><div class='add'>+</div><div class='add'>+		host: 0xe9</div><div class='add'>+		3888: 0xfa (??) (~val) (val)</div><div class='ctx'> </div><div class='ctx'> Register writing sequence:</div><div class='ctx'> </div><div class='hunk'>@@ -465,71 +591,194 @@ Register writing sequence:</div><div class='ctx'> </div><div class='ctx'> 	9. the register writing sequence is completed.</div><div class='ctx'> </div><div class='add'>+	* Note that since the Cx release, the hardware will return 1's</div><div class='add'>+	complement of the register value at the 3rd byte of status request</div><div class='add'>+	result. Host can optionally send another 0xe9 (status request) PS/2</div><div class='add'>+	command to FSP at the end of register writing to verify that the</div><div class='add'>+	register writing operation is successful (?? indicates don't care</div><div class='add'>+	byte):</div><div class='add'>+</div><div class='add'>+		host: 0xe9</div><div class='add'>+		3888: 0xfa (??) (~val) (val)</div><div class='add'>+</div><div class='add'>+==============================================================================</div><div class='add'>+* Programming Sequence for Page Register Reading/Writing</div><div class='add'>+==============================================================================</div><div class='add'>+</div><div class='add'>+  In order to overcome the limitation of maximum number of registers</div><div class='add'>+supported, the hardware separates register into different groups called</div><div class='add'>+'pages.' Each page is able to include up to 255 registers.</div><div class='add'>+</div><div class='add'>+  The default page after power up is 0x82; therefore, if one has to get</div><div class='add'>+access to register 0x8301, one has to use following sequence to switch</div><div class='add'>+to page 0x83, then start reading/writing from/to offset 0x01 by using</div><div class='add'>+the register read/write sequence described in previous section.</div><div class='add'>+</div><div class='add'>+Page register reading sequence:</div><div class='add'>+</div><div class='add'>+	1. send 0xf3 PS/2 command to FSP;</div><div class='add'>+</div><div class='add'>+	2. send 0x66 PS/2 command to FSP;</div><div class='add'>+</div><div class='add'>+	3. send 0x88 PS/2 command to FSP;</div><div class='add'>+</div><div class='add'>+	4. send 0xf3 PS/2 command to FSP;</div><div class='add'>+</div><div class='add'>+	5. send 0x83 PS/2 command to FSP;</div><div class='add'>+</div><div class='add'>+	6. send 0x88 PS/2 command to FSP;</div><div class='add'>+</div><div class='add'>+	7. send 0xe9(status request) PS/2 command to FSP;</div><div class='add'>+</div><div class='add'>+	8. the response read from FSP should be the requested page value.</div><div class='add'>+</div><div class='add'>+Page register writing sequence:</div><div class='add'>+</div><div class='add'>+	1. send 0xf3 PS/2 command to FSP;</div><div class='add'>+</div><div class='add'>+	2. send 0x38 PS/2 command to FSP;</div><div class='add'>+</div><div class='add'>+	3. send 0x88 PS/2 command to FSP;</div><div class='add'>+</div><div class='add'>+	4. send 0xf3 PS/2 command to FSP;</div><div class='add'>+</div><div class='add'>+	5. if the page address being written is not required to be</div><div class='add'>+	inverted(refer to the 'Register inversion requirement' section),</div><div class='add'>+	goto step 6</div><div class='add'>+</div><div class='add'>+	5a. send 0x47 PS/2 command to FSP;</div><div class='add'>+</div><div class='add'>+	5b. send the inverted page address to FSP and goto step 9;</div><div class='add'>+</div><div class='add'>+	6. if the page address being written is not required to be</div><div class='add'>+	swapped(refer to the 'Register swapping requirement' section),</div><div class='add'>+	goto step 7</div><div class='add'>+</div><div class='add'>+	6a. send 0x44 PS/2 command to FSP;</div><div class='add'>+</div><div class='add'>+	6b. send the swapped page address to FSP and goto step 9;</div><div class='add'>+</div><div class='add'>+	7. send 0x33 PS/2 command to FSP;</div><div class='add'>+</div><div class='add'>+	8. send the page address to FSP;</div><div class='add'>+</div><div class='add'>+	9. the page register writing sequence is completed.</div><div class='add'>+</div><div class='add'>+==============================================================================</div><div class='add'>+* Gesture ID</div><div class='add'>+==============================================================================</div><div class='add'>+</div><div class='add'>+  Unlike other devices which sends multiple fingers' coordinates to host,</div><div class='add'>+FSP processes multiple fingers' coordinates internally and convert them</div><div class='add'>+into a 8 bits integer, namely 'Gesture ID.'  Following is a list of</div><div class='add'>+supported gesture IDs:</div><div class='add'>+</div><div class='add'>+	ID	Description</div><div class='add'>+	0x86	2 finger straight up</div><div class='add'>+	0x82	2 finger straight down</div><div class='add'>+	0x80	2 finger straight right</div><div class='add'>+	0x84	2 finger straight left</div><div class='add'>+	0x8f	2 finger zoom in</div><div class='add'>+	0x8b	2 finger zoom out</div><div class='add'>+	0xc0	2 finger curve, counter clockwise</div><div class='add'>+	0xc4	2 finger curve, clockwise</div><div class='add'>+	0x2e	3 finger straight up</div><div class='add'>+	0x2a	3 finger straight down</div><div class='add'>+	0x28	3 finger straight right</div><div class='add'>+	0x2c	3 finger straight left</div><div class='add'>+	0x38	palm</div><div class='add'>+</div><div class='ctx'> ==============================================================================</div><div class='ctx'> * Register Listing</div><div class='ctx'> ==============================================================================</div><div class='ctx'> </div><div class='add'>+  Registers are represented in 16 bits values. The higher 8 bits represent</div><div class='add'>+the page address and the lower 8 bits represent the relative offset within</div><div class='add'>+that particular page.  Refer to the 'Programming Sequence for Page Register</div><div class='add'>+Reading/Writing' section for instructions on how to change current page</div><div class='add'>+address.</div><div class='add'>+</div><div class='ctx'> offset	width		default	r/w	name</div><div class='del'>-0x00	bit7~bit0	0x01	RO	device ID</div><div class='add'>+0x8200	bit7~bit0	0x01	RO	device ID</div><div class='ctx'> </div><div class='del'>-0x01	bit7~bit0	0xc0	RW	version ID</div><div class='add'>+0x8201	bit7~bit0		RW	version ID</div><div class='add'>+					0xc1: STL3888 Ax</div><div class='add'>+					0xd0 ~ 0xd2: STL3888 Bx</div><div class='add'>+					0xe0 ~ 0xe1: STL3888 Cx</div><div class='add'>+					0xe2 ~ 0xe3: STL3888 Dx</div><div class='ctx'> </div><div class='del'>-0x02	bit7~bit0	0x01	RO	vendor ID</div><div class='add'>+0x8202	bit7~bit0	0x01	RO	vendor ID</div><div class='ctx'> </div><div class='del'>-0x03	bit7~bit0	0x01	RO	product ID</div><div class='add'>+0x8203	bit7~bit0	0x01	RO	product ID</div><div class='ctx'> </div><div class='del'>-0x04	bit3~bit0	0x01	RW	revision ID</div><div class='add'>+0x8204	bit3~bit0	0x01	RW	revision ID</div><div class='ctx'> </div><div class='del'>-0x0b				RO	test mode status 1</div><div class='del'>-	bit3		1	RO	0: rotate 180 degree, 1: no rotation</div><div class='add'>+0x820b					test mode status 1</div><div class='add'>+	bit3		1	RO	0: rotate 180 degree</div><div class='add'>+					1: no rotation</div><div class='add'>+					*only supported by H/W prior to Cx</div><div class='ctx'> </div><div class='del'>-	bit5~bit4		RO	number of buttons</div><div class='del'>-			11 =&gt; 2, lbtn/rbtn</div><div class='del'>-			10 =&gt; 4, lbtn/rbtn/scru/scrd</div><div class='del'>-			01 =&gt; 6, lbtn/rbtn/scru/scrd/scrl/scrr</div><div class='del'>-			00 =&gt; 6, lbtn/rbtn/scru/scrd/fbtn/bbtn</div><div class='add'>+0x820f					register file page control</div><div class='add'>+	bit2		0	RW	1: rotate 180 degree</div><div class='add'>+					0: no rotation</div><div class='add'>+					*supported since Cx</div><div class='ctx'> </div><div class='del'>-0x0f				RW	register file page control</div><div class='ctx'> 	bit0		0	RW	1 to enable page 1 register files</div><div class='add'>+					*only supported by H/W prior to Cx</div><div class='ctx'> </div><div class='del'>-0x10				RW	system control 1</div><div class='add'>+0x8210				RW	system control 1</div><div class='ctx'> 	bit0		1	RW	Reserved, must be 1</div><div class='ctx'> 	bit1		0	RW	Reserved, must be 0</div><div class='del'>-	bit4		1	RW	Reserved, must be 0</div><div class='del'>-	bit5		0	RW	register clock gating enable</div><div class='add'>+	bit4		0	RW	Reserved, must be 0</div><div class='add'>+	bit5		1	RW	register clock gating enable</div><div class='ctx'> 					0: read only, 1: read/write enable</div><div class='ctx'> 	(Note that following registers does not require clock gating being</div><div class='ctx'> 	enabled prior to write: 05 06 07 08 09 0c 0f 10 11 12 16 17 18 23 2e</div><div class='ctx'> 	40 41 42 43.  In addition to that, this bit must be 1 when gesture</div><div class='ctx'> 	mode is enabled)</div><div class='ctx'> </div><div class='del'>-0x31				RW	on-pad command detection</div><div class='add'>+0x8220					test mode status</div><div class='add'>+	bit5~bit4		RO	number of buttons</div><div class='add'>+					11 =&gt; 2, lbtn/rbtn</div><div class='add'>+					10 =&gt; 4, lbtn/rbtn/scru/scrd</div><div class='add'>+					01 =&gt; 6, lbtn/rbtn/scru/scrd/scrl/scrr</div><div class='add'>+					00 =&gt; 6, lbtn/rbtn/scru/scrd/fbtn/bbtn</div><div class='add'>+					*only supported by H/W prior to Cx</div><div class='add'>+</div><div class='add'>+0x8231				RW	on-pad command detection</div><div class='ctx'> 	bit7		0	RW	on-pad command left button down tag</div><div class='ctx'> 					enable</div><div class='ctx'> 					0: disable, 1: enable</div><div class='add'>+					*only supported by H/W prior to Cx</div><div class='ctx'> </div><div class='del'>-0x34				RW	on-pad command control 5</div><div class='add'>+0x8234				RW	on-pad command control 5</div><div class='ctx'> 	bit4~bit0	0x05	RW	XLO in 0s/4/1, so 03h = 0010.1b = 2.5</div><div class='ctx'> 	(Note that position unit is in 0.5 scanline)</div><div class='add'>+					*only supported by H/W prior to Cx</div><div class='ctx'> </div><div class='ctx'> 	bit7		0	RW	on-pad tap zone enable</div><div class='ctx'> 					0: disable, 1: enable</div><div class='add'>+					*only supported by H/W prior to Cx</div><div class='ctx'> </div><div class='del'>-0x35				RW	on-pad command control 6</div><div class='add'>+0x8235				RW	on-pad command control 6</div><div class='ctx'> 	bit4~bit0	0x1d	RW	XHI in 0s/4/1, so 19h = 1100.1b = 12.5</div><div class='ctx'> 	(Note that position unit is in 0.5 scanline)</div><div class='add'>+					*only supported by H/W prior to Cx</div><div class='ctx'> </div><div class='del'>-0x36				RW	on-pad command control 7</div><div class='add'>+0x8236				RW	on-pad command control 7</div><div class='ctx'> 	bit4~bit0	0x04	RW	YLO in 0s/4/1, so 03h = 0010.1b = 2.5</div><div class='ctx'> 	(Note that position unit is in 0.5 scanline)</div><div class='add'>+					*only supported by H/W prior to Cx</div><div class='ctx'> </div><div class='del'>-0x37				RW	on-pad command control 8</div><div class='add'>+0x8237				RW	on-pad command control 8</div><div class='ctx'> 	bit4~bit0	0x13	RW	YHI in 0s/4/1, so 11h = 1000.1b = 8.5</div><div class='ctx'> 	(Note that position unit is in 0.5 scanline)</div><div class='add'>+					*only supported by H/W prior to Cx</div><div class='ctx'> </div><div class='del'>-0x40				RW	system control 5</div><div class='add'>+0x8240				RW	system control 5</div><div class='ctx'> 	bit1		0	RW	FSP Intellimouse mode enable</div><div class='ctx'> 					0: disable, 1: enable</div><div class='add'>+					*only supported by H/W prior to Cx</div><div class='ctx'> </div><div class='ctx'> 	bit2		0	RW	movement + abs. coordinate mode enable</div><div class='ctx'> 					0: disable, 1: enable</div><div class='hunk'>@@ -537,6 +786,7 @@ offset	width		default	r/w	name</div><div class='ctx'> 	bit 1 is not set. However, the format is different from that of bit 1.</div><div class='ctx'> 	In addition, when bit 1 and bit 2 are set at the same time, bit 2 will</div><div class='ctx'> 	override bit 1.)</div><div class='add'>+					*only supported by H/W prior to Cx</div><div class='ctx'> </div><div class='ctx'> 	bit3		0	RW	abs. coordinate only mode enable</div><div class='ctx'> 					0: disable, 1: enable</div><div class='hunk'>@@ -544,9 +794,11 @@ offset	width		default	r/w	name</div><div class='ctx'> 	bit 1 is not set. However, the format is different from that of bit 1.</div><div class='ctx'> 	In addition, when bit 1, bit 2 and bit 3 are set at the same time,</div><div class='ctx'> 	bit 3 will override bit 1 and 2.)</div><div class='add'>+					*only supported by H/W prior to Cx</div><div class='ctx'> </div><div class='ctx'> 	bit5		0	RW	auto switch enable</div><div class='ctx'> 					0: disable, 1: enable</div><div class='add'>+					*only supported by H/W prior to Cx</div><div class='ctx'> </div><div class='ctx'> 	bit6		0	RW	G0 abs. + notify packet format enable</div><div class='ctx'> 					0: disable, 1: enable</div><div class='hunk'>@@ -554,18 +806,68 @@ offset	width		default	r/w	name</div><div class='ctx'> 	bit 2 and 3.  That is, if any of those bit is 1, host will receive</div><div class='ctx'> 	absolute coordinates; otherwise, host only receives packets with</div><div class='ctx'> 	relative coordinate.)</div><div class='add'>+					*only supported by H/W prior to Cx</div><div class='ctx'> </div><div class='ctx'> 	bit7		0	RW	EN_PS2_F2: PS/2 gesture mode 2nd</div><div class='ctx'> 					finger packet enable</div><div class='ctx'> 					0: disable, 1: enable</div><div class='add'>+					*only supported by H/W prior to Cx</div><div class='ctx'> </div><div class='del'>-0x43				RW	on-pad control</div><div class='add'>+0x8243				RW	on-pad control</div><div class='ctx'> 	bit0		0	RW	on-pad control enable</div><div class='ctx'> 					0: disable, 1: enable</div><div class='ctx'> 	(Note that if this bit is cleared, bit 3/5 will be ineffective)</div><div class='add'>+					*only supported by H/W prior to Cx</div><div class='ctx'> </div><div class='ctx'> 	bit3		0	RW	on-pad fix vertical scrolling enable</div><div class='ctx'> 					0: disable, 1: enable</div><div class='add'>+					*only supported by H/W prior to Cx</div><div class='ctx'> </div><div class='ctx'> 	bit5		0	RW	on-pad fix horizontal scrolling enable</div><div class='ctx'> 					0: disable, 1: enable</div><div class='add'>+					*only supported by H/W prior to Cx</div><div class='add'>+</div><div class='add'>+0x8290				RW	software control register 1</div><div class='add'>+	bit0		0	RW	absolute coordination mode</div><div class='add'>+					0: disable, 1: enable</div><div class='add'>+					*supported since Cx</div><div class='add'>+</div><div class='add'>+	bit1		0	RW	gesture ID output</div><div class='add'>+					0: disable, 1: enable</div><div class='add'>+					*supported since Cx</div><div class='add'>+</div><div class='add'>+	bit2		0	RW	two fingers' coordinates output</div><div class='add'>+					0: disable, 1: enable</div><div class='add'>+					*supported since Cx</div><div class='add'>+</div><div class='add'>+	bit3		0	RW	finger up one packet output</div><div class='add'>+					0: disable, 1: enable</div><div class='add'>+					*supported since Cx</div><div class='add'>+</div><div class='add'>+	bit4		0	RW	absolute coordination continuous mode</div><div class='add'>+					0: disable, 1: enable</div><div class='add'>+					*supported since Cx</div><div class='add'>+</div><div class='add'>+	bit6~bit5	00	RW	gesture group selection</div><div class='add'>+					00: basic</div><div class='add'>+					01: suite</div><div class='add'>+					10: suite pro</div><div class='add'>+					11: advanced</div><div class='add'>+					*supported since Cx</div><div class='add'>+</div><div class='add'>+	bit7		0	RW	Bx packet output compatible mode</div><div class='add'>+					0: disable, 1: enable					*supported since Cx</div><div class='add'>+					*supported since Cx</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+0x833d				RW	on-pad command control 1</div><div class='add'>+	bit7		1	RW	on-pad command detection enable</div><div class='add'>+					0: disable, 1: enable</div><div class='add'>+					*supported since Cx</div><div class='add'>+</div><div class='add'>+0x833e				RW	on-pad command detection</div><div class='add'>+	bit7		0	RW	on-pad command left button down tag</div><div class='add'>+					enable. Works only in H/W based PS/2</div><div class='add'>+					data packet mode.</div><div class='add'>+					0: disable, 1: enable</div><div class='add'>+					*supported since Cx</div><div class='head'>diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt<br/>index 54078ed96b37..4840334ea97b 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/ioctl/ioctl-number.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/ioctl/ioctl-number.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ioctl/ioctl-number.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/ioctl/ioctl-number.txt</a></div><div class='hunk'>@@ -149,6 +149,7 @@ Code  Seq#(hex)	Include File		Comments</div><div class='ctx'> 'M'	01-03	drivers/scsi/megaraid/megaraid_sas.h</div><div class='ctx'> 'M'	00-0F	drivers/video/fsl-diu-fb.h	conflict!</div><div class='ctx'> 'N'	00-1F	drivers/usb/scanner.h</div><div class='add'>+'N'	40-7F	drivers/block/nvme.c</div><div class='ctx'> 'O'     00-06   mtd/ubi-user.h		UBI</div><div class='ctx'> 'P'	all	linux/soundcard.h	conflict!</div><div class='ctx'> 'P'	60-6F	sound/sscape_ioctl.h	conflict!</div><div class='head'>diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt<br/>index f47cdefb4d1e..ab0a984530d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/kbuild/makefiles.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/kbuild/makefiles.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/kbuild/makefiles.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/kbuild/makefiles.txt</a></div><div class='hunk'>@@ -33,14 +33,15 @@ This document describes the Linux kernel Makefiles.</div><div class='ctx'> </div><div class='ctx'> 	=== 6 Architecture Makefiles</div><div class='ctx'> 	   --- 6.1 Set variables to tweak the build to the architecture</div><div class='del'>-	   --- 6.2 Add prerequisites to archprepare:</div><div class='del'>-	   --- 6.3 List directories to visit when descending</div><div class='del'>-	   --- 6.4 Architecture-specific boot images</div><div class='del'>-	   --- 6.5 Building non-kbuild targets</div><div class='del'>-	   --- 6.6 Commands useful for building a boot image</div><div class='del'>-	   --- 6.7 Custom kbuild commands</div><div class='del'>-	   --- 6.8 Preprocessing linker scripts</div><div class='del'>-	   --- 6.9 Generic header files</div><div class='add'>+	   --- 6.2 Add prerequisites to archheaders:</div><div class='add'>+	   --- 6.3 Add prerequisites to archprepare:</div><div class='add'>+	   --- 6.4 List directories to visit when descending</div><div class='add'>+	   --- 6.5 Architecture-specific boot images</div><div class='add'>+	   --- 6.6 Building non-kbuild targets</div><div class='add'>+	   --- 6.7 Commands useful for building a boot image</div><div class='add'>+	   --- 6.8 Custom kbuild commands</div><div class='add'>+	   --- 6.9 Preprocessing linker scripts</div><div class='add'>+	   --- 6.10 Generic header files</div><div class='ctx'> </div><div class='ctx'> 	=== 7 Kbuild syntax for exported headers</div><div class='ctx'> 		--- 7.1 header-y</div><div class='hunk'>@@ -252,7 +253,7 @@ more details, with real examples.</div><div class='ctx'> 	This will create a library lib.a based on delay.o. For kbuild to</div><div class='ctx'> 	actually recognize that there is a lib.a being built, the directory</div><div class='ctx'> 	shall be listed in libs-y.</div><div class='del'>-	See also "6.3 List directories to visit when descending".</div><div class='add'>+	See also "6.4 List directories to visit when descending".</div><div class='ctx'> </div><div class='ctx'> 	Use of lib-y is normally restricted to lib/ and arch/*/lib.</div><div class='ctx'> </div><div class='hunk'>@@ -974,7 +975,20 @@ When kbuild executes, the following steps are followed (roughly):</div><div class='ctx'> 	$(KBUILD_ARFLAGS) set by the top level Makefile to "D" (deterministic</div><div class='ctx'> 	mode) if this option is supported by $(AR).</div><div class='ctx'> </div><div class='del'>---- 6.2 Add prerequisites to archprepare:</div><div class='add'>+--- 6.2 Add prerequisites to archheaders:</div><div class='add'>+</div><div class='add'>+	The archheaders: rule is used to generate header files that</div><div class='add'>+	may be installed into user space by "make header_install" or</div><div class='add'>+	"make headers_install_all".  In order to support</div><div class='add'>+	"make headers_install_all", this target has to be able to run</div><div class='add'>+	on an unconfigured tree, or a tree configured for another</div><div class='add'>+	architecture.</div><div class='add'>+</div><div class='add'>+	It is run before "make archprepare" when run on the</div><div class='add'>+	architecture itself.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+--- 6.3 Add prerequisites to archprepare:</div><div class='ctx'> </div><div class='ctx'> 	The archprepare: rule is used to list prerequisites that need to be</div><div class='ctx'> 	built before starting to descend down in the subdirectories.</div><div class='hunk'>@@ -990,7 +1004,7 @@ When kbuild executes, the following steps are followed (roughly):</div><div class='ctx'> 	generating offset header files.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>---- 6.3 List directories to visit when descending</div><div class='add'>+--- 6.4 List directories to visit when descending</div><div class='ctx'> </div><div class='ctx'> 	An arch Makefile cooperates with the top Makefile to define variables</div><div class='ctx'> 	which specify how to build the vmlinux file.  Note that there is no</div><div class='hunk'>@@ -1019,7 +1033,7 @@ When kbuild executes, the following steps are followed (roughly):</div><div class='ctx'> 		drivers-$(CONFIG_OPROFILE)  += arch/sparc64/oprofile/</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>---- 6.4 Architecture-specific boot images</div><div class='add'>+--- 6.5 Architecture-specific boot images</div><div class='ctx'> </div><div class='ctx'> 	An arch Makefile specifies goals that take the vmlinux file, compress</div><div class='ctx'> 	it, wrap it in bootstrapping code, and copy the resulting files</div><div class='hunk'>@@ -1070,7 +1084,7 @@ When kbuild executes, the following steps are followed (roughly):</div><div class='ctx'> </div><div class='ctx'> 	When "make" is executed without arguments, bzImage will be built.</div><div class='ctx'> </div><div class='del'>---- 6.5 Building non-kbuild targets</div><div class='add'>+--- 6.6 Building non-kbuild targets</div><div class='ctx'> </div><div class='ctx'>     extra-y</div><div class='ctx'> </div><div class='hunk'>@@ -1090,7 +1104,7 @@ When kbuild executes, the following steps are followed (roughly):</div><div class='ctx'> 	shall be built, but shall not be linked as part of built-in.o.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>---- 6.6 Commands useful for building a boot image</div><div class='add'>+--- 6.7 Commands useful for building a boot image</div><div class='ctx'> </div><div class='ctx'> 	Kbuild provides a few macros that are useful when building a</div><div class='ctx'> 	boot image.</div><div class='hunk'>@@ -1112,7 +1126,7 @@ When kbuild executes, the following steps are followed (roughly):</div><div class='ctx'> 	always be built.</div><div class='ctx'> 	Assignments to $(targets) are without $(obj)/ prefix.</div><div class='ctx'> 	if_changed may be used in conjunction with custom commands as</div><div class='del'>-	defined in 6.7 "Custom kbuild commands".</div><div class='add'>+	defined in 6.8 "Custom kbuild commands".</div><div class='ctx'> </div><div class='ctx'> 	Note: It is a typical mistake to forget the FORCE prerequisite.</div><div class='ctx'> 	Another common pitfall is that whitespace is sometimes</div><div class='hunk'>@@ -1171,7 +1185,7 @@ When kbuild executes, the following steps are followed (roughly):</div><div class='ctx'> 		$(obj)/%.dtb: $(src)/%.dts</div><div class='ctx'> 			$(call cmd,dtc)</div><div class='ctx'> </div><div class='del'>---- 6.7 Custom kbuild commands</div><div class='add'>+--- 6.8 Custom kbuild commands</div><div class='ctx'> </div><div class='ctx'> 	When kbuild is executing with KBUILD_VERBOSE=0, then only a shorthand</div><div class='ctx'> 	of a command is normally displayed.</div><div class='hunk'>@@ -1198,7 +1212,7 @@ When kbuild executes, the following steps are followed (roughly):</div><div class='ctx'> 	will be displayed with "make KBUILD_VERBOSE=0".</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>---- 6.8 Preprocessing linker scripts</div><div class='add'>+--- 6.9 Preprocessing linker scripts</div><div class='ctx'> </div><div class='ctx'> 	When the vmlinux image is built, the linker script</div><div class='ctx'> 	arch/$(ARCH)/kernel/vmlinux.lds is used.</div><div class='hunk'>@@ -1228,7 +1242,7 @@ When kbuild executes, the following steps are followed (roughly):</div><div class='ctx'> 	The kbuild infrastructure for *lds file are used in several</div><div class='ctx'> 	architecture-specific files.</div><div class='ctx'> </div><div class='del'>---- 6.9 Generic header files</div><div class='add'>+--- 6.10 Generic header files</div><div class='ctx'> </div><div class='ctx'> 	The directory include/asm-generic contains the header files</div><div class='ctx'> 	that may be shared between individual architectures.</div><div class='head'>diff --git a/Documentation/kdump/kdump.txt b/Documentation/kdump/kdump.txt<br/>index 7a9e0b4b2903..506c7390c2b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/kdump/kdump.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/kdump/kdump.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/kdump/kdump.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/kdump/kdump.txt</a></div><div class='hunk'>@@ -17,8 +17,8 @@ You can use common commands, such as cp and scp, to copy the</div><div class='ctx'> memory image to a dump file on the local disk, or across the network to</div><div class='ctx'> a remote system.</div><div class='ctx'> </div><div class='del'>-Kdump and kexec are currently supported on the x86, x86_64, ppc64 and ia64</div><div class='del'>-architectures.</div><div class='add'>+Kdump and kexec are currently supported on the x86, x86_64, ppc64, ia64,</div><div class='add'>+and s390x architectures.</div><div class='ctx'> </div><div class='ctx'> When the system kernel boots, it reserves a small section of memory for</div><div class='ctx'> the dump-capture kernel. This ensures that ongoing Direct Memory Access</div><div class='hunk'>@@ -34,11 +34,18 @@ Similarly on PPC64 machines first 32KB of physical memory is needed for</div><div class='ctx'> booting regardless of where the kernel is loaded and to support 64K page</div><div class='ctx'> size kexec backs up the first 64KB memory.</div><div class='ctx'> </div><div class='add'>+For s390x, when kdump is triggered, the crashkernel region is exchanged</div><div class='add'>+with the region [0, crashkernel region size] and then the kdump kernel</div><div class='add'>+runs in [0, crashkernel region size]. Therefore no relocatable kernel is</div><div class='add'>+needed for s390x.</div><div class='add'>+</div><div class='ctx'> All of the necessary information about the system kernel's core image is</div><div class='ctx'> encoded in the ELF format, and stored in a reserved area of memory</div><div class='ctx'> before a crash. The physical address of the start of the ELF header is</div><div class='ctx'> passed to the dump-capture kernel through the elfcorehdr= boot</div><div class='del'>-parameter.</div><div class='add'>+parameter. Optionally the size of the ELF header can also be passed</div><div class='add'>+when using the elfcorehdr=[size[KMG]@]offset[KMG] syntax.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> With the dump-capture kernel, you can access the memory image, or "old</div><div class='ctx'> memory," in two ways:</div><div class='hunk'>@@ -291,6 +298,10 @@ Boot into System Kernel</div><div class='ctx'>    The region may be automatically placed on ia64, see the</div><div class='ctx'>    dump-capture kernel config option notes above.</div><div class='ctx'> </div><div class='add'>+   On s390x, typically use "crashkernel=xxM". The value of xx is dependent</div><div class='add'>+   on the memory consumption of the kdump system. In general this is not</div><div class='add'>+   dependent on the memory size of the production system.</div><div class='add'>+</div><div class='ctx'> Load the Dump-capture Kernel</div><div class='ctx'> ============================</div><div class='ctx'> </div><div class='hunk'>@@ -308,6 +319,8 @@ For ppc64:</div><div class='ctx'> 	- Use vmlinux</div><div class='ctx'> For ia64:</div><div class='ctx'> 	- Use vmlinux or vmlinuz.gz</div><div class='add'>+For s390x:</div><div class='add'>+	- Use image or bzImage</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> If you are using a uncompressed vmlinux image then use following command</div><div class='hunk'>@@ -337,6 +350,8 @@ For i386, x86_64 and ia64:</div><div class='ctx'> For ppc64:</div><div class='ctx'> 	"1 maxcpus=1 noirqdistrib reset_devices"</div><div class='ctx'> </div><div class='add'>+For s390x:</div><div class='add'>+	"1 maxcpus=1 cgroup_disable=memory"</div><div class='ctx'> </div><div class='ctx'> Notes on loading the dump-capture kernel:</div><div class='ctx'> </div><div class='hunk'>@@ -362,6 +377,20 @@ Notes on loading the dump-capture kernel:</div><div class='ctx'>   dump. Hence generally it is useful either to build a UP dump-capture</div><div class='ctx'>   kernel or specify maxcpus=1 option while loading dump-capture kernel.</div><div class='ctx'> </div><div class='add'>+* For s390x there are two kdump modes: If a ELF header is specified with</div><div class='add'>+  the elfcorehdr= kernel parameter, it is used by the kdump kernel as it</div><div class='add'>+  is done on all other architectures. If no elfcorehdr= kernel parameter is</div><div class='add'>+  specified, the s390x kdump kernel dynamically creates the header. The</div><div class='add'>+  second mode has the advantage that for CPU and memory hotplug, kdump has</div><div class='add'>+  not to be reloaded with kexec_load().</div><div class='add'>+</div><div class='add'>+* For s390x systems with many attached devices the "cio_ignore" kernel</div><div class='add'>+  parameter should be used for the kdump kernel in order to prevent allocation</div><div class='add'>+  of kernel memory for devices that are not relevant for kdump. The same</div><div class='add'>+  applies to systems that use SCSI/FCP devices. In that case the</div><div class='add'>+  "allow_lun_scan" zfcp module parameter should be set to zero before</div><div class='add'>+  setting FCP devices online.</div><div class='add'>+</div><div class='ctx'> Kernel Panic</div><div class='ctx'> ============</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt<br/>index e229769606f2..033d4e69b43b 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/kernel-parameters.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/kernel-parameters.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/kernel-parameters.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/kernel-parameters.txt</a></div><div class='hunk'>@@ -329,6 +329,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 				    is a lot of faster</div><div class='ctx'> 			off	  - do not initialize any AMD IOMMU found in</div><div class='ctx'> 				    the system</div><div class='add'>+			force_isolation - Force device isolation for all</div><div class='add'>+					  devices. The IOMMU driver is not</div><div class='add'>+					  allowed anymore to lift isolation</div><div class='add'>+					  requirements as needed. This option</div><div class='add'>+					  does not override iommu=pt</div><div class='ctx'> </div><div class='ctx'> 	amijoy.map=	[HW,JOY] Amiga joystick support</div><div class='ctx'> 			Map of devices attached to JOY0DAT and JOY1DAT</div><div class='hunk'>@@ -623,6 +628,25 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 	no_debug_objects</div><div class='ctx'> 			[KNL] Disable object debugging</div><div class='ctx'> </div><div class='add'>+	debug_guardpage_minorder=</div><div class='add'>+			[KNL] When CONFIG_DEBUG_PAGEALLOC is set, this</div><div class='add'>+			parameter allows control of the order of pages that will</div><div class='add'>+			be intentionally kept free (and hence protected) by the</div><div class='add'>+			buddy allocator. Bigger value increase the probability</div><div class='add'>+			of catching random memory corruption, but reduce the</div><div class='add'>+			amount of memory for normal system use. The maximum</div><div class='add'>+			possible value is MAX_ORDER/2.  Setting this parameter</div><div class='add'>+			to 1 or 2 should be enough to identify most random</div><div class='add'>+			memory corruption problems caused by bugs in kernel or</div><div class='add'>+			driver code when a CPU writes to (or reads from) a</div><div class='add'>+			random memory location. Note that there exists a class</div><div class='add'>+			of memory corruptions problems caused by buggy H/W or</div><div class='add'>+			F/W or by drivers badly programing DMA (basically when</div><div class='add'>+			memory is written at bus level and the CPU MMU is</div><div class='add'>+			bypassed) which are not detectable by</div><div class='add'>+			CONFIG_DEBUG_PAGEALLOC, hence this option will not help</div><div class='add'>+			tracking down these problems.</div><div class='add'>+</div><div class='ctx'> 	debugpat	[X86] Enable PAT debugging</div><div class='ctx'> </div><div class='ctx'> 	decnet.addr=	[HW,NET]</div><div class='hunk'>@@ -1035,6 +1059,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			By default, super page will be supported if Intel IOMMU</div><div class='ctx'> 			has the capability. With this option, super page will</div><div class='ctx'> 			not be supported.</div><div class='add'>+</div><div class='add'>+	intel_idle.max_cstate=	[KNL,HW,ACPI,X86]</div><div class='add'>+			0	disables intel_idle and fall back on acpi_idle.</div><div class='add'>+			1 to 6	specify maximum depth of C-state.</div><div class='add'>+</div><div class='ctx'> 	intremap=	[X86-64, Intel-IOMMU]</div><div class='ctx'> 			on	enable Interrupt Remapping (default)</div><div class='ctx'> 			off	disable Interrupt Remapping</div><div class='hunk'>@@ -1059,7 +1088,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 		nomerge</div><div class='ctx'> 		forcesac</div><div class='ctx'> 		soft</div><div class='del'>-		pt	[x86, IA-64]</div><div class='add'>+		pt		[x86, IA-64]</div><div class='add'>+		group_mf	[x86, IA-64]</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	io7=		[HW] IO7 for Marvel based alpha systems</div><div class='ctx'> 			See comment before marvel_specify_io7 in</div><div class='hunk'>@@ -1178,9 +1209,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 	kvm.ignore_msrs=[KVM] Ignore guest accesses to unhandled MSRs.</div><div class='ctx'> 			Default is 0 (don't ignore, but inject #GP)</div><div class='ctx'> </div><div class='del'>-	kvm.oos_shadow=	[KVM] Disable out-of-sync shadow paging.</div><div class='del'>-			Default is 1 (enabled)</div><div class='del'>-</div><div class='ctx'> 	kvm.mmu_audit=	[KVM] This is a R/W parameter which allows audit</div><div class='ctx'> 			KVM MMU at runtime.</div><div class='ctx'> 			Default is 0 (off)</div><div class='hunk'>@@ -1630,12 +1658,17 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			The default is to return 64-bit inode numbers.</div><div class='ctx'> </div><div class='ctx'> 	nfs.nfs4_disable_idmapping=</div><div class='del'>-			[NFSv4] When set, this option disables the NFSv4</div><div class='del'>-			idmapper on the client, but only if the mount</div><div class='del'>-			is using the 'sec=sys' security flavour. This may</div><div class='del'>-			make migration from legacy NFSv2/v3 systems easier</div><div class='del'>-			provided that the server has the appropriate support.</div><div class='del'>-			The default is to always enable NFSv4 idmapping.</div><div class='add'>+			[NFSv4] When set to the default of '1', this option</div><div class='add'>+			ensures that both the RPC level authentication</div><div class='add'>+			scheme and the NFS level operations agree to use</div><div class='add'>+			numeric uids/gids if the mount is using the</div><div class='add'>+			'sec=sys' security flavour. In effect it is</div><div class='add'>+			disabling idmapping, which can make migration from</div><div class='add'>+			legacy NFSv2/v3 systems to NFSv4 easier.</div><div class='add'>+			Servers that do not support this mode of operation</div><div class='add'>+			will be autodetected by the client, and it will fall</div><div class='add'>+			back to using the idmapper.</div><div class='add'>+			To turn off this behaviour, set the value to '0'.</div><div class='ctx'> </div><div class='ctx'> 	nmi_debug=	[KNL,AVR32,SH] Specify one or more actions to take</div><div class='ctx'> 			when a NMI is triggered.</div><div class='hunk'>@@ -1796,6 +1829,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 	nomfgpt		[X86-32] Disable Multi-Function General Purpose</div><div class='ctx'> 			Timer usage (for AMD Geode machines).</div><div class='ctx'> </div><div class='add'>+	nonmi_ipi	[X86] Disable using NMI IPIs during panic/reboot to</div><div class='add'>+			shutdown the other cpus.  Instead use the REBOOT_VECTOR</div><div class='add'>+			irq.</div><div class='add'>+</div><div class='ctx'> 	nopat		[X86] Disable PAT (page attribute table extension of</div><div class='ctx'> 			pagetables) support.</div><div class='ctx'> </div><div class='hunk'>@@ -2367,6 +2404,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> </div><div class='ctx'> 	slram=		[HW,MTD]</div><div class='ctx'> </div><div class='add'>+	slab_max_order=	[MM, SLAB]</div><div class='add'>+			Determines the maximum allowed order for slabs.</div><div class='add'>+			A high setting may cause OOMs due to memory</div><div class='add'>+			fragmentation.  Defaults to 1 for systems with</div><div class='add'>+			more than 32MB of RAM, 0 otherwise.</div><div class='add'>+</div><div class='ctx'> 	slub_debug[=options[,slabs]]	[MM, SLUB]</div><div class='ctx'> 			Enabling slub_debug allows one to determine the</div><div class='ctx'> 			culprit if slab objects become corrupted. Enabling</div><div class='hunk'>@@ -2437,6 +2480,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 	stacktrace	[FTRACE]</div><div class='ctx'> 			Enabled the stack tracer on boot up.</div><div class='ctx'> </div><div class='add'>+	stacktrace_filter=[function-list]</div><div class='add'>+			[FTRACE] Limit the functions that the stack tracer</div><div class='add'>+			will trace at boot up. function-list is a comma separated</div><div class='add'>+			list of functions. This list can be changed at run</div><div class='add'>+			time by the stack_trace_filter file in the debugfs</div><div class='add'>+			tracing directory. Note, this enables stack tracing</div><div class='add'>+			and the stacktrace above is not needed.</div><div class='add'>+</div><div class='ctx'> 	sti=		[PARISC,HW]</div><div class='ctx'> 			Format: &lt;num&gt;</div><div class='ctx'> 			Set the STI (builtin display/keyboard on the HP-PARISC</div><div class='hunk'>@@ -2637,6 +2688,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.</div><div class='ctx'> 			[USB] Start with the old device initialization</div><div class='ctx'> 			scheme (default 0 = off).</div><div class='ctx'> </div><div class='add'>+	usbcore.usbfs_memory_mb=</div><div class='add'>+			[USB] Memory limit (in MB) for buffers allocated by</div><div class='add'>+			usbfs (default = 16, 0 = max = 2047).</div><div class='add'>+</div><div class='ctx'> 	usbcore.use_both_schemes=</div><div class='ctx'> 			[USB] Try the other device initialization scheme</div><div class='ctx'> 			if the first one fails (default 1 = enabled).</div><div class='head'>diff --git a/Documentation/kmemleak.txt b/Documentation/kmemleak.txt<br/>index 51063e681ca4..b6e39739a36d 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/kmemleak.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/kmemleak.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/kmemleak.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/kmemleak.txt</a></div><div class='hunk'>@@ -127,7 +127,10 @@ See the include/linux/kmemleak.h header for the functions prototype.</div><div class='ctx'> </div><div class='ctx'> kmemleak_init		 - initialize kmemleak</div><div class='ctx'> kmemleak_alloc		 - notify of a memory block allocation</div><div class='add'>+kmemleak_alloc_percpu	 - notify of a percpu memory block allocation</div><div class='ctx'> kmemleak_free		 - notify of a memory block freeing</div><div class='add'>+kmemleak_free_part	 - notify of a partial memory block freeing</div><div class='add'>+kmemleak_free_percpu	 - notify of a percpu memory block freeing</div><div class='ctx'> kmemleak_not_leak	 - mark an object as not a leak</div><div class='ctx'> kmemleak_ignore		 - do not scan or report an object as leak</div><div class='ctx'> kmemleak_scan_area	 - add scan areas inside a memory block</div><div class='head'>diff --git a/Documentation/md.txt b/Documentation/md.txt<br/>index fc94770f44ab..993fba37b7d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/md.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/md.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/md.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/md.txt</a></div><div class='hunk'>@@ -357,14 +357,14 @@ Each directory contains:</div><div class='ctx'>         written to, that device.</div><div class='ctx'> </div><div class='ctx'>       state</div><div class='del'>-        A file recording the current state of the device in the array</div><div class='add'>+	A file recording the current state of the device in the array</div><div class='ctx'> 	which can be a comma separated list of</div><div class='ctx'> 	      faulty   - device has been kicked from active use due to</div><div class='del'>-                         a detected fault or it has unacknowledged bad</div><div class='del'>-                         blocks</div><div class='add'>+			 a detected fault, or it has unacknowledged bad</div><div class='add'>+			 blocks</div><div class='ctx'> 	      in_sync  - device is a fully in-sync member of the array</div><div class='ctx'> 	      writemostly - device will only be subject to read</div><div class='del'>-		         requests if there are no other options.</div><div class='add'>+			 requests if there are no other options.</div><div class='ctx'> 			 This applies only to raid1 arrays.</div><div class='ctx'> 	      blocked  - device has failed, and the failure hasn't been</div><div class='ctx'> 			 acknowledged yet by the metadata handler.</div><div class='hunk'>@@ -374,6 +374,13 @@ Each directory contains:</div><div class='ctx'> 			 This includes spares that are in the process</div><div class='ctx'> 			 of being recovered to</div><div class='ctx'> 	      write_error - device has ever seen a write error.</div><div class='add'>+	      want_replacement - device is (mostly) working but probably</div><div class='add'>+			 should be replaced, either due to errors or</div><div class='add'>+			 due to user request.</div><div class='add'>+	      replacement - device is a replacement for another active</div><div class='add'>+			 device with same raid_disk.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	This list may grow in future.</div><div class='ctx'> 	This can be written to.</div><div class='ctx'> 	Writing "faulty"  simulates a failure on the device.</div><div class='hunk'>@@ -386,6 +393,13 @@ Each directory contains:</div><div class='ctx'> 	Writing "in_sync" sets the in_sync flag.</div><div class='ctx'> 	Writing "write_error" sets writeerrorseen flag.</div><div class='ctx'> 	Writing "-write_error" clears writeerrorseen flag.</div><div class='add'>+	Writing "want_replacement" is allowed at any time except to a</div><div class='add'>+		replacement device or a spare.  It sets the flag.</div><div class='add'>+	Writing "-want_replacement" is allowed at any time.  It clears</div><div class='add'>+		the flag.</div><div class='add'>+	Writing "replacement" or "-replacement" is only allowed before</div><div class='add'>+		starting the array.  It sets or clears the flag.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	This file responds to select/poll. Any change to 'faulty'</div><div class='ctx'> 	or 'blocked' causes an event.</div><div class='head'>diff --git a/Documentation/mmc/mmc-dev-attrs.txt b/Documentation/mmc/mmc-dev-attrs.txt<br/>index 8898a95b41e5..22ae8441489f 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/mmc/mmc-dev-attrs.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/mmc/mmc-dev-attrs.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/mmc/mmc-dev-attrs.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/mmc/mmc-dev-attrs.txt</a></div><div class='hunk'>@@ -64,3 +64,13 @@ Note on Erase Size and Preferred Erase Size:</div><div class='ctx'> 	size specified by the card.</div><div class='ctx'> </div><div class='ctx'> 	"preferred_erase_size" is in bytes.</div><div class='add'>+</div><div class='add'>+SD/MMC/SDIO Clock Gating Attribute</div><div class='add'>+==================================</div><div class='add'>+</div><div class='add'>+Read and write access is provided to following attribute.</div><div class='add'>+This attribute appears only if CONFIG_MMC_CLKGATE is enabled.</div><div class='add'>+</div><div class='add'>+	clkgate_delay	Tune the clock gating delay with desired value in milliseconds.</div><div class='add'>+</div><div class='add'>+echo &lt;desired delay&gt; &gt; /sys/class/mmc_host/mmcX/clkgate_delay</div><div class='head'>diff --git a/Documentation/mmc/mmc-dev-parts.txt b/Documentation/mmc/mmc-dev-parts.txt<br/>index 2db28b8e662f..f08d078d43cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/mmc/mmc-dev-parts.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/mmc/mmc-dev-parts.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/mmc/mmc-dev-parts.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/mmc/mmc-dev-parts.txt</a></div><div class='hunk'>@@ -25,3 +25,16 @@ echo 0 &gt; /sys/block/mmcblkXbootY/force_ro</div><div class='ctx'> To re-enable read-only access:</div><div class='ctx'> </div><div class='ctx'> echo 1 &gt; /sys/block/mmcblkXbootY/force_ro</div><div class='add'>+</div><div class='add'>+The boot partitions can also be locked read only until the next power on,</div><div class='add'>+with:</div><div class='add'>+</div><div class='add'>+echo 1 &gt; /sys/block/mmcblkXbootY/ro_lock_until_next_power_on</div><div class='add'>+</div><div class='add'>+This is a feature of the card and not of the kernel. If the card does</div><div class='add'>+not support boot partition locking, the file will not exist. If the</div><div class='add'>+feature has been disabled on the card, the file will be read-only.</div><div class='add'>+</div><div class='add'>+The boot partitions can also be locked permanently, but this feature is</div><div class='add'>+not accessible through sysfs in order to avoid accidental or malicious</div><div class='add'>+bricking.</div><div class='head'>diff --git a/Documentation/networking/00-INDEX b/Documentation/networking/00-INDEX<br/>index bbce1215434a..9ad9ddeb384c 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/networking/00-INDEX?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/00-INDEX</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/00-INDEX?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/networking/00-INDEX</a></div><div class='hunk'>@@ -144,6 +144,8 @@ nfc.txt</div><div class='ctx'> 	- The Linux Near Field Communication (NFS) subsystem.</div><div class='ctx'> olympic.txt</div><div class='ctx'> 	- IBM PCI Pit/Pit-Phy/Olympic Token Ring driver info.</div><div class='add'>+openvswitch.txt</div><div class='add'>+	- Open vSwitch developer documentation.</div><div class='ctx'> operstates.txt</div><div class='ctx'> 	- Overview of network interface operational states.</div><div class='ctx'> packet_mmap.txt</div><div class='head'>diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt<br/>index c86d03f18a5b..221ad0cdf11f 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/networking/batman-adv.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/batman-adv.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/batman-adv.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/networking/batman-adv.txt</a></div><div class='hunk'>@@ -200,15 +200,16 @@ abled  during run time. Following log_levels are defined:</div><div class='ctx'> </div><div class='ctx'> 0 - All  debug  output  disabled</div><div class='ctx'> 1 - Enable messages related to routing / flooding / broadcasting</div><div class='del'>-2 - Enable route or tt entry added / changed / deleted</div><div class='del'>-3 - Enable all messages</div><div class='add'>+2 - Enable messages related to route added / changed / deleted</div><div class='add'>+4 - Enable messages related to translation table operations</div><div class='add'>+7 - Enable all messages</div><div class='ctx'> </div><div class='ctx'> The debug output can be changed at runtime  using  the  file</div><div class='ctx'> /sys/class/net/bat0/mesh/log_level. e.g.</div><div class='ctx'> </div><div class='ctx'> # echo 2 &gt; /sys/class/net/bat0/mesh/log_level</div><div class='ctx'> </div><div class='del'>-will enable debug messages for when routes or TTs change.</div><div class='add'>+will enable debug messages for when routes change.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> BATCTL</div><div class='head'>diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt<br/>index 91df678fb7f8..080ad26690ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/networking/bonding.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/bonding.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/bonding.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/networking/bonding.txt</a></div><div class='hunk'>@@ -196,6 +196,23 @@ or, for backwards compatibility, the option value.  E.g.,</div><div class='ctx'> </div><div class='ctx'> 	The parameters are as follows:</div><div class='ctx'> </div><div class='add'>+active_slave</div><div class='add'>+</div><div class='add'>+	Specifies the new active slave for modes that support it</div><div class='add'>+	(active-backup, balance-alb and balance-tlb).  Possible values</div><div class='add'>+	are the name of any currently enslaved interface, or an empty</div><div class='add'>+	string.  If a name is given, the slave and its link must be up in order</div><div class='add'>+	to be selected as the new active slave.  If an empty string is</div><div class='add'>+	specified, the current active slave is cleared, and a new active</div><div class='add'>+	slave is selected automatically.</div><div class='add'>+</div><div class='add'>+	Note that this is only available through the sysfs interface. No module</div><div class='add'>+	parameter by this name exists.</div><div class='add'>+</div><div class='add'>+	The normal value of this option is the name of the currently</div><div class='add'>+	active slave, or the empty string if there is no active slave or</div><div class='add'>+	the current mode does not use an active slave.</div><div class='add'>+</div><div class='ctx'> ad_select</div><div class='ctx'> </div><div class='ctx'> 	Specifies the 802.3ad aggregation selection logic to use.  The</div><div class='head'>diff --git a/Documentation/networking/ieee802154.txt b/Documentation/networking/ieee802154.txt<br/>index f41ea2405220..1dc1c24a7547 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/networking/ieee802154.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/ieee802154.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/ieee802154.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/networking/ieee802154.txt</a></div><div class='hunk'>@@ -78,3 +78,30 @@ in software. This is currently WIP.</div><div class='ctx'> </div><div class='ctx'> See header include/net/mac802154.h and several drivers in drivers/ieee802154/.</div><div class='ctx'> </div><div class='add'>+6LoWPAN Linux implementation</div><div class='add'>+============================</div><div class='add'>+</div><div class='add'>+The IEEE 802.15.4 standard specifies an MTU of 128 bytes, yielding about 80</div><div class='add'>+octets of actual MAC payload once security is turned on, on a wireless link</div><div class='add'>+with a link throughput of 250 kbps or less.  The 6LoWPAN adaptation format</div><div class='add'>+[RFC4944] was specified to carry IPv6 datagrams over such constrained links,</div><div class='add'>+taking into account limited bandwidth, memory, or energy resources that are</div><div class='add'>+expected in applications such as wireless Sensor Networks.  [RFC4944] defines</div><div class='add'>+a Mesh Addressing header to support sub-IP forwarding, a Fragmentation header</div><div class='add'>+to support the IPv6 minimum MTU requirement [RFC2460], and stateless header</div><div class='add'>+compression for IPv6 datagrams (LOWPAN_HC1 and LOWPAN_HC2) to reduce the</div><div class='add'>+relatively large IPv6 and UDP headers down to (in the best case) several bytes.</div><div class='add'>+</div><div class='add'>+In Semptember 2011 the standard update was published - [RFC6282].</div><div class='add'>+It deprecates HC1 and HC2 compression and defines IPHC encoding format which is</div><div class='add'>+used in this Linux implementation.</div><div class='add'>+</div><div class='add'>+All the code related to 6lowpan you may find in files: net/ieee802154/6lowpan.*</div><div class='add'>+</div><div class='add'>+To setup 6lowpan interface you need (busybox release &gt; 1.17.0):</div><div class='add'>+1. Add IEEE802.15.4 interface and initialize PANid;</div><div class='add'>+2. Add 6lowpan interface by command like:</div><div class='add'>+   # ip link add link wpan0 name lowpan0 type lowpan</div><div class='add'>+3. Set MAC (if needs):</div><div class='add'>+   # ip link set lowpan0 address de:ad:be:ef:ca:fe:ba:be</div><div class='add'>+4. Bring up 'lowpan0' interface</div><div class='head'>diff --git a/Documentation/networking/ifenslave.c b/Documentation/networking/ifenslave.c<br/>index 65968fbf1e49..ac5debb2f16c 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/networking/ifenslave.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/ifenslave.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/ifenslave.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/networking/ifenslave.c</a></div><div class='hunk'>@@ -539,12 +539,14 @@ static int if_getconfig(char *ifname)</div><div class='ctx'> 		metric = 0;</div><div class='ctx'> 	} else</div><div class='ctx'> 		metric = ifr.ifr_metric;</div><div class='add'>+	printf("The result of SIOCGIFMETRIC is %d\n", metric);</div><div class='ctx'> </div><div class='ctx'> 	strcpy(ifr.ifr_name, ifname);</div><div class='ctx'> 	if (ioctl(skfd, SIOCGIFMTU, &amp;ifr) &lt; 0)</div><div class='ctx'> 		mtu = 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		mtu = ifr.ifr_mtu;</div><div class='add'>+	printf("The result of SIOCGIFMTU is %d\n", mtu);</div><div class='ctx'> </div><div class='ctx'> 	strcpy(ifr.ifr_name, ifname);</div><div class='ctx'> 	if (ioctl(skfd, SIOCGIFDSTADDR, &amp;ifr) &lt; 0) {</div><div class='head'>diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt<br/>index 589f2da5d545..ad3e80e17b4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/networking/ip-sysctl.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/ip-sysctl.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/ip-sysctl.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/networking/ip-sysctl.txt</a></div><div class='hunk'>@@ -31,6 +31,16 @@ neigh/default/gc_thresh3 - INTEGER</div><div class='ctx'> 	when using large numbers of interfaces and when communicating</div><div class='ctx'> 	with large numbers of directly-connected peers.</div><div class='ctx'> </div><div class='add'>+neigh/default/unres_qlen_bytes - INTEGER</div><div class='add'>+	The maximum number of bytes which may be used by packets</div><div class='add'>+	queued for each	unresolved address by other network layers.</div><div class='add'>+	(added in linux 3.3)</div><div class='add'>+</div><div class='add'>+neigh/default/unres_qlen - INTEGER</div><div class='add'>+	The maximum number of packets which may be queued for each</div><div class='add'>+	unresolved address by other network layers.</div><div class='add'>+	(deprecated in linux 3.3) : use unres_qlen_bytes instead.</div><div class='add'>+</div><div class='ctx'> mtu_expires - INTEGER</div><div class='ctx'> 	Time, in seconds, that cached PMTU information is kept.</div><div class='ctx'> </div><div class='hunk'>@@ -165,6 +175,9 @@ tcp_congestion_control - STRING</div><div class='ctx'> 	connections. The algorithm "reno" is always available, but</div><div class='ctx'> 	additional choices may be available based on kernel configuration.</div><div class='ctx'> 	Default is set as part of kernel configuration.</div><div class='add'>+	For passive connections, the listener congestion control choice</div><div class='add'>+	is inherited.</div><div class='add'>+	[see setsockopt(listenfd, SOL_TCP, TCP_CONGESTION, "name" ...) ]</div><div class='ctx'> </div><div class='ctx'> tcp_cookie_size - INTEGER</div><div class='ctx'> 	Default size of TCP Cookie Transactions (TCPCT) option, that may be</div><div class='head'>diff --git a/Documentation/networking/openvswitch.txt b/Documentation/networking/openvswitch.txt<br/>new file mode 100644<br/>index 000000000000..b8a048b8df3a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/openvswitch.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/networking/openvswitch.txt</a></div><div class='hunk'>@@ -0,0 +1,195 @@</div><div class='add'>+Open vSwitch datapath developer documentation</div><div class='add'>+=============================================</div><div class='add'>+</div><div class='add'>+The Open vSwitch kernel module allows flexible userspace control over</div><div class='add'>+flow-level packet processing on selected network devices.  It can be</div><div class='add'>+used to implement a plain Ethernet switch, network device bonding,</div><div class='add'>+VLAN processing, network access control, flow-based network control,</div><div class='add'>+and so on.</div><div class='add'>+</div><div class='add'>+The kernel module implements multiple "datapaths" (analogous to</div><div class='add'>+bridges), each of which can have multiple "vports" (analogous to ports</div><div class='add'>+within a bridge).  Each datapath also has associated with it a "flow</div><div class='add'>+table" that userspace populates with "flows" that map from keys based</div><div class='add'>+on packet headers and metadata to sets of actions.  The most common</div><div class='add'>+action forwards the packet to another vport; other actions are also</div><div class='add'>+implemented.</div><div class='add'>+</div><div class='add'>+When a packet arrives on a vport, the kernel module processes it by</div><div class='add'>+extracting its flow key and looking it up in the flow table.  If there</div><div class='add'>+is a matching flow, it executes the associated actions.  If there is</div><div class='add'>+no match, it queues the packet to userspace for processing (as part of</div><div class='add'>+its processing, userspace will likely set up a flow to handle further</div><div class='add'>+packets of the same type entirely in-kernel).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Flow key compatibility</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+Network protocols evolve over time.  New protocols become important</div><div class='add'>+and existing protocols lose their prominence.  For the Open vSwitch</div><div class='add'>+kernel module to remain relevant, it must be possible for newer</div><div class='add'>+versions to parse additional protocols as part of the flow key.  It</div><div class='add'>+might even be desirable, someday, to drop support for parsing</div><div class='add'>+protocols that have become obsolete.  Therefore, the Netlink interface</div><div class='add'>+to Open vSwitch is designed to allow carefully written userspace</div><div class='add'>+applications to work with any version of the flow key, past or future.</div><div class='add'>+</div><div class='add'>+To support this forward and backward compatibility, whenever the</div><div class='add'>+kernel module passes a packet to userspace, it also passes along the</div><div class='add'>+flow key that it parsed from the packet.  Userspace then extracts its</div><div class='add'>+own notion of a flow key from the packet and compares it against the</div><div class='add'>+kernel-provided version:</div><div class='add'>+</div><div class='add'>+    - If userspace's notion of the flow key for the packet matches the</div><div class='add'>+      kernel's, then nothing special is necessary.</div><div class='add'>+</div><div class='add'>+    - If the kernel's flow key includes more fields than the userspace</div><div class='add'>+      version of the flow key, for example if the kernel decoded IPv6</div><div class='add'>+      headers but userspace stopped at the Ethernet type (because it</div><div class='add'>+      does not understand IPv6), then again nothing special is</div><div class='add'>+      necessary.  Userspace can still set up a flow in the usual way,</div><div class='add'>+      as long as it uses the kernel-provided flow key to do it.</div><div class='add'>+</div><div class='add'>+    - If the userspace flow key includes more fields than the</div><div class='add'>+      kernel's, for example if userspace decoded an IPv6 header but</div><div class='add'>+      the kernel stopped at the Ethernet type, then userspace can</div><div class='add'>+      forward the packet manually, without setting up a flow in the</div><div class='add'>+      kernel.  This case is bad for performance because every packet</div><div class='add'>+      that the kernel considers part of the flow must go to userspace,</div><div class='add'>+      but the forwarding behavior is correct.  (If userspace can</div><div class='add'>+      determine that the values of the extra fields would not affect</div><div class='add'>+      forwarding behavior, then it could set up a flow anyway.)</div><div class='add'>+</div><div class='add'>+How flow keys evolve over time is important to making this work, so</div><div class='add'>+the following sections go into detail.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Flow key format</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+A flow key is passed over a Netlink socket as a sequence of Netlink</div><div class='add'>+attributes.  Some attributes represent packet metadata, defined as any</div><div class='add'>+information about a packet that cannot be extracted from the packet</div><div class='add'>+itself, e.g. the vport on which the packet was received.  Most</div><div class='add'>+attributes, however, are extracted from headers within the packet,</div><div class='add'>+e.g. source and destination addresses from Ethernet, IP, or TCP</div><div class='add'>+headers.</div><div class='add'>+</div><div class='add'>+The &lt;linux/openvswitch.h&gt; header file defines the exact format of the</div><div class='add'>+flow key attributes.  For informal explanatory purposes here, we write</div><div class='add'>+them as comma-separated strings, with parentheses indicating arguments</div><div class='add'>+and nesting.  For example, the following could represent a flow key</div><div class='add'>+corresponding to a TCP packet that arrived on vport 1:</div><div class='add'>+</div><div class='add'>+    in_port(1), eth(src=e0:91:f5:21:d0:b2, dst=00:02:e3:0f:80:a4),</div><div class='add'>+    eth_type(0x0800), ipv4(src=172.16.0.20, dst=172.18.0.52, proto=17, tos=0,</div><div class='add'>+    frag=no), tcp(src=49163, dst=80)</div><div class='add'>+</div><div class='add'>+Often we ellipsize arguments not important to the discussion, e.g.:</div><div class='add'>+</div><div class='add'>+    in_port(1), eth(...), eth_type(0x0800), ipv4(...), tcp(...)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Basic rule for evolving flow keys</div><div class='add'>+---------------------------------</div><div class='add'>+</div><div class='add'>+Some care is needed to really maintain forward and backward</div><div class='add'>+compatibility for applications that follow the rules listed under</div><div class='add'>+"Flow key compatibility" above.</div><div class='add'>+</div><div class='add'>+The basic rule is obvious:</div><div class='add'>+</div><div class='add'>+    ------------------------------------------------------------------</div><div class='add'>+    New network protocol support must only supplement existing flow</div><div class='add'>+    key attributes.  It must not change the meaning of already defined</div><div class='add'>+    flow key attributes.</div><div class='add'>+    ------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+This rule does have less-obvious consequences so it is worth working</div><div class='add'>+through a few examples.  Suppose, for example, that the kernel module</div><div class='add'>+did not already implement VLAN parsing.  Instead, it just interpreted</div><div class='add'>+the 802.1Q TPID (0x8100) as the Ethertype then stopped parsing the</div><div class='add'>+packet.  The flow key for any packet with an 802.1Q header would look</div><div class='add'>+essentially like this, ignoring metadata:</div><div class='add'>+</div><div class='add'>+    eth(...), eth_type(0x8100)</div><div class='add'>+</div><div class='add'>+Naively, to add VLAN support, it makes sense to add a new "vlan" flow</div><div class='add'>+key attribute to contain the VLAN tag, then continue to decode the</div><div class='add'>+encapsulated headers beyond the VLAN tag using the existing field</div><div class='add'>+definitions.  With this change, an TCP packet in VLAN 10 would have a</div><div class='add'>+flow key much like this:</div><div class='add'>+</div><div class='add'>+    eth(...), vlan(vid=10, pcp=0), eth_type(0x0800), ip(proto=6, ...), tcp(...)</div><div class='add'>+</div><div class='add'>+But this change would negatively affect a userspace application that</div><div class='add'>+has not been updated to understand the new "vlan" flow key attribute.</div><div class='add'>+The application could, following the flow compatibility rules above,</div><div class='add'>+ignore the "vlan" attribute that it does not understand and therefore</div><div class='add'>+assume that the flow contained IP packets.  This is a bad assumption</div><div class='add'>+(the flow only contains IP packets if one parses and skips over the</div><div class='add'>+802.1Q header) and it could cause the application's behavior to change</div><div class='add'>+across kernel versions even though it follows the compatibility rules.</div><div class='add'>+</div><div class='add'>+The solution is to use a set of nested attributes.  This is, for</div><div class='add'>+example, why 802.1Q support uses nested attributes.  A TCP packet in</div><div class='add'>+VLAN 10 is actually expressed as:</div><div class='add'>+</div><div class='add'>+    eth(...), eth_type(0x8100), vlan(vid=10, pcp=0), encap(eth_type(0x0800),</div><div class='add'>+    ip(proto=6, ...), tcp(...)))</div><div class='add'>+</div><div class='add'>+Notice how the "eth_type", "ip", and "tcp" flow key attributes are</div><div class='add'>+nested inside the "encap" attribute.  Thus, an application that does</div><div class='add'>+not understand the "vlan" key will not see either of those attributes</div><div class='add'>+and therefore will not misinterpret them.  (Also, the outer eth_type</div><div class='add'>+is still 0x8100, not changed to 0x0800.)</div><div class='add'>+</div><div class='add'>+Handling malformed packets</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+Don't drop packets in the kernel for malformed protocol headers, bad</div><div class='add'>+checksums, etc.  This would prevent userspace from implementing a</div><div class='add'>+simple Ethernet switch that forwards every packet.</div><div class='add'>+</div><div class='add'>+Instead, in such a case, include an attribute with "empty" content.</div><div class='add'>+It doesn't matter if the empty content could be valid protocol values,</div><div class='add'>+as long as those values are rarely seen in practice, because userspace</div><div class='add'>+can always forward all packets with those values to userspace and</div><div class='add'>+handle them individually.</div><div class='add'>+</div><div class='add'>+For example, consider a packet that contains an IP header that</div><div class='add'>+indicates protocol 6 for TCP, but which is truncated just after the IP</div><div class='add'>+header, so that the TCP header is missing.  The flow key for this</div><div class='add'>+packet would include a tcp attribute with all-zero src and dst, like</div><div class='add'>+this:</div><div class='add'>+</div><div class='add'>+    eth(...), eth_type(0x0800), ip(proto=6, ...), tcp(src=0, dst=0)</div><div class='add'>+</div><div class='add'>+As another example, consider a packet with an Ethernet type of 0x8100,</div><div class='add'>+indicating that a VLAN TCI should follow, but which is truncated just</div><div class='add'>+after the Ethernet type.  The flow key for this packet would include</div><div class='add'>+an all-zero-bits vlan and an empty encap attribute, like this:</div><div class='add'>+</div><div class='add'>+    eth(...), eth_type(0x8100), vlan(0), encap()</div><div class='add'>+</div><div class='add'>+Unlike a TCP packet with source and destination ports 0, an</div><div class='add'>+all-zero-bits VLAN TCI is not that rare, so the CFI bit (aka</div><div class='add'>+VLAN_TAG_PRESENT inside the kernel) is ordinarily set in a vlan</div><div class='add'>+attribute expressly to allow this situation to be distinguished.</div><div class='add'>+Thus, the flow key in this second example unambiguously indicates a</div><div class='add'>+missing or malformed VLAN TCI.</div><div class='add'>+</div><div class='add'>+Other rules</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+The other rules for flow keys are much less subtle:</div><div class='add'>+</div><div class='add'>+    - Duplicate attributes are not allowed at a given nesting level.</div><div class='add'>+</div><div class='add'>+    - Ordering of attributes is not significant.</div><div class='add'>+</div><div class='add'>+    - When the kernel sends a given flow key to userspace, it always</div><div class='add'>+      composes it the same way.  This allows userspace to hash and</div><div class='add'>+      compare entire flow keys that it may not be able to fully</div><div class='add'>+      interpret.</div><div class='head'>diff --git a/Documentation/networking/packet_mmap.txt b/Documentation/networking/packet_mmap.txt<br/>index 4acea6603720..1c08a4b0981f 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/networking/packet_mmap.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/packet_mmap.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/packet_mmap.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/networking/packet_mmap.txt</a></div><div class='hunk'>@@ -155,7 +155,7 @@ As capture, each frame contains two parts:</div><div class='ctx'> </div><div class='ctx'>  /* fill sockaddr_ll struct to prepare binding */</div><div class='ctx'>  my_addr.sll_family = AF_PACKET;</div><div class='del'>- my_addr.sll_protocol = ETH_P_ALL;</div><div class='add'>+ my_addr.sll_protocol = htons(ETH_P_ALL);</div><div class='ctx'>  my_addr.sll_ifindex =  s_ifr.ifr_ifindex;</div><div class='ctx'> </div><div class='ctx'>  /* bind socket to eth0 */</div><div class='head'>diff --git a/Documentation/networking/scaling.txt b/Documentation/networking/scaling.txt<br/>index a177de21d28e..579994afbe06 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/networking/scaling.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/scaling.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/scaling.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/networking/scaling.txt</a></div><div class='hunk'>@@ -208,7 +208,7 @@ The counter in rps_dev_flow_table values records the length of the current</div><div class='ctx'> CPU's backlog when a packet in this flow was last enqueued. Each backlog</div><div class='ctx'> queue has a head counter that is incremented on dequeue. A tail counter</div><div class='ctx'> is computed as head counter + queue length. In other words, the counter</div><div class='del'>-in rps_dev_flow_table[i] records the last element in flow i that has</div><div class='add'>+in rps_dev_flow[i] records the last element in flow i that has</div><div class='ctx'> been enqueued onto the currently designated CPU for flow i (of course,</div><div class='ctx'> entry i is actually selected by hash and multiple flows may hash to the</div><div class='ctx'> same entry i).</div><div class='hunk'>@@ -224,7 +224,7 @@ following is true:</div><div class='ctx'> </div><div class='ctx'> - The current CPU's queue head counter &gt;= the recorded tail counter</div><div class='ctx'>   value in rps_dev_flow[i]</div><div class='del'>-- The current CPU is unset (equal to NR_CPUS)</div><div class='add'>+- The current CPU is unset (equal to RPS_NO_CPU)</div><div class='ctx'> - The current CPU is offline</div><div class='ctx'> </div><div class='ctx'> After this check, the packet is sent to the (possibly updated) current</div><div class='hunk'>@@ -235,7 +235,7 @@ CPU.</div><div class='ctx'> </div><div class='ctx'> ==== RFS Configuration</div><div class='ctx'> </div><div class='del'>-RFS is only available if the kconfig symbol CONFIG_RFS is enabled (on</div><div class='add'>+RFS is only available if the kconfig symbol CONFIG_RPS is enabled (on</div><div class='ctx'> by default for SMP). The functionality remains disabled until explicitly</div><div class='ctx'> configured. The number of entries in the global flow table is set through:</div><div class='ctx'> </div><div class='hunk'>@@ -258,7 +258,7 @@ For a single queue device, the rps_flow_cnt value for the single queue</div><div class='ctx'> would normally be configured to the same value as rps_sock_flow_entries.</div><div class='ctx'> For a multi-queue device, the rps_flow_cnt for each queue might be</div><div class='ctx'> configured as rps_sock_flow_entries / N, where N is the number of</div><div class='del'>-queues. So for instance, if rps_flow_entries is set to 32768 and there</div><div class='add'>+queues. So for instance, if rps_sock_flow_entries is set to 32768 and there</div><div class='ctx'> are 16 configured receive queues, rps_flow_cnt for each queue might be</div><div class='ctx'> configured as 2048.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/networking/stmmac.txt b/Documentation/networking/stmmac.txt<br/>index 8d67980fabe8..d0aeeadd264b 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/networking/stmmac.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/networking/stmmac.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/stmmac.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/networking/stmmac.txt</a></div><div class='hunk'>@@ -4,14 +4,16 @@ Copyright (C) 2007-2010  STMicroelectronics Ltd</div><div class='ctx'> Author: Giuseppe Cavallaro &lt;peppe.cavallaro@st.com&gt;</div><div class='ctx'> </div><div class='ctx'> This is the driver for the MAC 10/100/1000 on-chip Ethernet controllers</div><div class='del'>-(Synopsys IP blocks); it has been fully tested on STLinux platforms.</div><div class='add'>+(Synopsys IP blocks).</div><div class='ctx'> </div><div class='ctx'> Currently this network device driver is for all STM embedded MAC/GMAC</div><div class='del'>-(i.e. 7xxx/5xxx SoCs) and it's known working on other platforms i.e. ARM SPEAr.</div><div class='add'>+(i.e. 7xxx/5xxx SoCs), SPEAr (arm), Loongson1B (mips) and XLINX XC2V3000</div><div class='add'>+FF1152AMT0221 D1215994A VIRTEX FPGA board.</div><div class='ctx'> </div><div class='del'>-DWC Ether MAC 10/100/1000 Universal version 3.41a and DWC Ether MAC 10/100</div><div class='del'>-Universal version 4.0 have been used for developing the first code</div><div class='del'>-implementation.</div><div class='add'>+DWC Ether MAC 10/100/1000 Universal version 3.60a (and older) and DWC Ether MAC 10/100</div><div class='add'>+Universal version 4.0 have been used for developing this driver.</div><div class='add'>+</div><div class='add'>+This driver supports both the platform bus and PCI.</div><div class='ctx'> </div><div class='ctx'> Please, for more information also visit: www.stlinux.com</div><div class='ctx'> </div><div class='hunk'>@@ -277,5 +279,5 @@ In fact, these can generate an huge amount of debug messages.</div><div class='ctx'> </div><div class='ctx'> 6) TODO:</div><div class='ctx'>  o XGMAC is not supported.</div><div class='del'>- o Review the timer optimisation code to use an embedded device that will be</div><div class='del'>-  available in new chip generations.</div><div class='add'>+ o Add the EEE - Energy Efficient Ethernet</div><div class='add'>+ o Add the PTP - precision time protocol</div><div class='head'>diff --git a/Documentation/networking/team.txt b/Documentation/networking/team.txt<br/>new file mode 100644<br/>index 000000000000..5a013686b9ea<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/team.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/networking/team.txt</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+Team devices are driven from userspace via libteam library which is here:</div><div class='add'>+	https://github.com/jpirko/libteam</div><div class='head'>diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt<br/>index b04cb7d45a16..6727b92bc2fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/pinctrl.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/pinctrl.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/pinctrl.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/pinctrl.txt</a></div><div class='hunk'>@@ -7,12 +7,9 @@ This subsystem deals with:</div><div class='ctx'> </div><div class='ctx'> - Multiplexing of pins, pads, fingers (etc) see below for details</div><div class='ctx'> </div><div class='del'>-The intention is to also deal with:</div><div class='del'>-</div><div class='del'>-- Software-controlled biasing and driving mode specific pins, such as</div><div class='del'>-  pull-up/down, open drain etc, load capacitance configuration when controlled</div><div class='del'>-  by software, etc.</div><div class='del'>-</div><div class='add'>+- Configuration of pins, pads, fingers (etc), such as software-controlled</div><div class='add'>+  biasing and driving mode specific pins, such as pull-up/down, open drain,</div><div class='add'>+  load capacitance etc.</div><div class='ctx'> </div><div class='ctx'> Top-level interface</div><div class='ctx'> ===================</div><div class='hunk'>@@ -32,7 +29,7 @@ Definition of PIN:</div><div class='ctx'>   be sparse - i.e. there may be gaps in the space with numbers where no</div><div class='ctx'>   pin exists.</div><div class='ctx'> </div><div class='del'>-When a PIN CONTROLLER is instatiated, it will register a descriptor to the</div><div class='add'>+When a PIN CONTROLLER is instantiated, it will register a descriptor to the</div><div class='ctx'> pin control framework, and this descriptor contains an array of pin descriptors</div><div class='ctx'> describing the pins handled by this specific pin controller.</div><div class='ctx'> </div><div class='hunk'>@@ -61,14 +58,14 @@ this in our driver:</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pinctrl/pinctrl.h&gt;</div><div class='ctx'> </div><div class='del'>-const struct pinctrl_pin_desc __refdata foo_pins[] = {</div><div class='del'>-      PINCTRL_PIN(0, "A1"),</div><div class='del'>-      PINCTRL_PIN(1, "A2"),</div><div class='del'>-      PINCTRL_PIN(2, "A3"),</div><div class='add'>+const struct pinctrl_pin_desc foo_pins[] = {</div><div class='add'>+      PINCTRL_PIN(0, "A8"),</div><div class='add'>+      PINCTRL_PIN(1, "B8"),</div><div class='add'>+      PINCTRL_PIN(2, "C8"),</div><div class='ctx'>       ...</div><div class='del'>-      PINCTRL_PIN(61, "H6"),</div><div class='del'>-      PINCTRL_PIN(62, "H7"),</div><div class='del'>-      PINCTRL_PIN(63, "H8"),</div><div class='add'>+      PINCTRL_PIN(61, "F1"),</div><div class='add'>+      PINCTRL_PIN(62, "G1"),</div><div class='add'>+      PINCTRL_PIN(63, "H1"),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pinctrl_desc foo_desc = {</div><div class='hunk'>@@ -88,11 +85,16 @@ int __init foo_probe(void)</div><div class='ctx'> 		pr_err("could not register foo pin driver\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+To enable the pinctrl subsystem and the subgroups for PINMUX and PINCONF and</div><div class='add'>+selected drivers, you need to select them from your machine's Kconfig entry,</div><div class='add'>+since these are so tightly integrated with the machines they are used on.</div><div class='add'>+See for example arch/arm/mach-u300/Kconfig for an example.</div><div class='add'>+</div><div class='ctx'> Pins usually have fancier names than this. You can find these in the dataheet</div><div class='ctx'> for your chip. Notice that the core pinctrl.h file provides a fancy macro</div><div class='ctx'> called PINCTRL_PIN() to create the struct entries. As you can see I enumerated</div><div class='del'>-the pins from 0 in the upper left corner to 63 in the lower right corner,</div><div class='del'>-this enumeration was arbitrarily chosen, in practice you need to think</div><div class='add'>+the pins from 0 in the upper left corner to 63 in the lower right corner.</div><div class='add'>+This enumeration was arbitrarily chosen, in practice you need to think</div><div class='ctx'> through your numbering system so that it matches the layout of registers</div><div class='ctx'> and such things in your driver, or the code may become complicated. You must</div><div class='ctx'> also consider matching of offsets to the GPIO ranges that may be handled by</div><div class='hunk'>@@ -133,8 +135,8 @@ struct foo_group {</div><div class='ctx'> 	const unsigned num_pins;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int spi0_pins[] = { 0, 8, 16, 24 };</div><div class='del'>-static unsigned int i2c0_pins[] = { 24, 25 };</div><div class='add'>+static const unsigned int spi0_pins[] = { 0, 8, 16, 24 };</div><div class='add'>+static const unsigned int i2c0_pins[] = { 24, 25 };</div><div class='ctx'> </div><div class='ctx'> static const struct foo_group foo_groups[] = {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -193,6 +195,88 @@ structure, for example specific register ranges associated with each group</div><div class='ctx'> and so on.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+Pin configuration</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+Pins can sometimes be software-configured in an various ways, mostly related</div><div class='add'>+to their electronic properties when used as inputs or outputs. For example you</div><div class='add'>+may be able to make an output pin high impedance, or "tristate" meaning it is</div><div class='add'>+effectively disconnected. You may be able to connect an input pin to VDD or GND</div><div class='add'>+using a certain resistor value - pull up and pull down - so that the pin has a</div><div class='add'>+stable value when nothing is driving the rail it is connected to, or when it's</div><div class='add'>+unconnected.</div><div class='add'>+</div><div class='add'>+For example, a platform may do this:</div><div class='add'>+</div><div class='add'>+ret = pin_config_set("foo-dev", "FOO_GPIO_PIN", PLATFORM_X_PULL_UP);</div><div class='add'>+</div><div class='add'>+To pull up a pin to VDD. The pin configuration driver implements callbacks for</div><div class='add'>+changing pin configuration in the pin controller ops like this:</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pinctrl/pinctrl.h&gt;</div><div class='add'>+#include &lt;linux/pinctrl/pinconf.h&gt;</div><div class='add'>+#include "platform_x_pindefs.h"</div><div class='add'>+</div><div class='add'>+static int foo_pin_config_get(struct pinctrl_dev *pctldev,</div><div class='add'>+		    unsigned offset,</div><div class='add'>+		    unsigned long *config)</div><div class='add'>+{</div><div class='add'>+	struct my_conftype conf;</div><div class='add'>+</div><div class='add'>+	... Find setting for pin @ offset ...</div><div class='add'>+</div><div class='add'>+	*config = (unsigned long) conf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int foo_pin_config_set(struct pinctrl_dev *pctldev,</div><div class='add'>+		    unsigned offset,</div><div class='add'>+		    unsigned long config)</div><div class='add'>+{</div><div class='add'>+	struct my_conftype *conf = (struct my_conftype *) config;</div><div class='add'>+</div><div class='add'>+	switch (conf) {</div><div class='add'>+		case PLATFORM_X_PULL_UP:</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 foo_pin_config_group_get (struct pinctrl_dev *pctldev,</div><div class='add'>+		    unsigned selector,</div><div class='add'>+		    unsigned long *config)</div><div class='add'>+{</div><div class='add'>+	...</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int foo_pin_config_group_set (struct pinctrl_dev *pctldev,</div><div class='add'>+		    unsigned selector,</div><div class='add'>+		    unsigned long config)</div><div class='add'>+{</div><div class='add'>+	...</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pinconf_ops foo_pconf_ops = {</div><div class='add'>+	.pin_config_get = foo_pin_config_get,</div><div class='add'>+	.pin_config_set = foo_pin_config_set,</div><div class='add'>+	.pin_config_group_get = foo_pin_config_group_get,</div><div class='add'>+	.pin_config_group_set = foo_pin_config_group_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Pin config operations are handled by some pin controller */</div><div class='add'>+static struct pinctrl_desc foo_desc = {</div><div class='add'>+	...</div><div class='add'>+	.confops = &amp;foo_pconf_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+Since some controllers have special logic for handling entire groups of pins</div><div class='add'>+they can exploit the special whole-group pin control function. The</div><div class='add'>+pin_config_group_set() callback is allowed to return the error code -EAGAIN,</div><div class='add'>+for groups it does not want to handle, or if it just wants to do some</div><div class='add'>+group-level handling and then fall through to iterate over all pins, in which</div><div class='add'>+case each individual pin will be treated by separate pin_config_set() calls as</div><div class='add'>+well.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Interaction with the GPIO subsystem</div><div class='ctx'> ===================================</div><div class='ctx'> </div><div class='hunk'>@@ -214,19 +298,20 @@ static struct pinctrl_gpio_range gpio_range_a = {</div><div class='ctx'> 	.name = "chip a",</div><div class='ctx'> 	.id = 0,</div><div class='ctx'> 	.base = 32,</div><div class='add'>+	.pin_base = 32,</div><div class='ctx'> 	.npins = 16,</div><div class='ctx'> 	.gc = &amp;chip_a;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct pinctrl_gpio_range gpio_range_a = {</div><div class='add'>+static struct pinctrl_gpio_range gpio_range_b = {</div><div class='ctx'> 	.name = "chip b",</div><div class='ctx'> 	.id = 0,</div><div class='ctx'> 	.base = 48,</div><div class='add'>+	.pin_base = 64,</div><div class='ctx'> 	.npins = 8,</div><div class='ctx'> 	.gc = &amp;chip_b;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> {</div><div class='ctx'> 	struct pinctrl_dev *pctl;</div><div class='ctx'> 	...</div><div class='hunk'>@@ -235,42 +320,39 @@ static struct pinctrl_gpio_range gpio_range_a = {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> So this complex system has one pin controller handling two different</div><div class='del'>-GPIO chips. Chip a has 16 pins and chip b has 8 pins. They are mapped in</div><div class='del'>-the global GPIO pin space at:</div><div class='add'>+GPIO chips. "chip a" has 16 pins and "chip b" has 8 pins. The "chip a" and</div><div class='add'>+"chip b" have different .pin_base, which means a start pin number of the</div><div class='add'>+GPIO range.</div><div class='add'>+</div><div class='add'>+The GPIO range of "chip a" starts from the GPIO base of 32 and actual</div><div class='add'>+pin range also starts from 32. However "chip b" has different starting</div><div class='add'>+offset for the GPIO range and pin range. The GPIO range of "chip b" starts</div><div class='add'>+from GPIO number 48, while the pin range of "chip b" starts from 64.</div><div class='add'>+</div><div class='add'>+We can convert a gpio number to actual pin number using this "pin_base".</div><div class='add'>+They are mapped in the global GPIO pin space at:</div><div class='ctx'> </div><div class='del'>-chip a: [32 .. 47]</div><div class='del'>-chip b: [48 .. 55]</div><div class='add'>+chip a:</div><div class='add'>+ - GPIO range : [32 .. 47]</div><div class='add'>+ - pin range  : [32 .. 47]</div><div class='add'>+chip b:</div><div class='add'>+ - GPIO range : [48 .. 55]</div><div class='add'>+ - pin range  : [64 .. 71]</div><div class='ctx'> </div><div class='ctx'> When GPIO-specific functions in the pin control subsystem are called, these</div><div class='del'>-ranges will be used to look up the apropriate pin controller by inspecting</div><div class='add'>+ranges will be used to look up the appropriate pin controller by inspecting</div><div class='ctx'> and matching the pin to the pin ranges across all controllers. When a</div><div class='ctx'> pin controller handling the matching range is found, GPIO-specific functions</div><div class='ctx'> will be called on that specific pin controller.</div><div class='ctx'> </div><div class='ctx'> For all functionalities dealing with pin biasing, pin muxing etc, the pin</div><div class='ctx'> controller subsystem will subtract the range's .base offset from the passed</div><div class='del'>-in gpio pin number, and pass that on to the pin control driver, so the driver</div><div class='del'>-will get an offset into its handled number range. Further it is also passed</div><div class='add'>+in gpio number, and add the ranges's .pin_base offset to retrive a pin number.</div><div class='add'>+After that, the subsystem passes it on to the pin control driver, so the driver</div><div class='add'>+will get an pin number into its handled number range. Further it is also passed</div><div class='ctx'> the range ID value, so that the pin controller knows which range it should</div><div class='ctx'> deal with.</div><div class='ctx'> </div><div class='del'>-For example: if a user issues pinctrl_gpio_set_foo(50), the pin control</div><div class='del'>-subsystem will find that the second range on this pin controller matches,</div><div class='del'>-subtract the base 48 and call the</div><div class='del'>-pinctrl_driver_gpio_set_foo(pinctrl, range, 2) where the latter function has</div><div class='del'>-this signature:</div><div class='del'>-</div><div class='del'>-int pinctrl_driver_gpio_set_foo(struct pinctrl_dev *pctldev,</div><div class='del'>-    struct pinctrl_gpio_range *rangeid,</div><div class='del'>-    unsigned offset);</div><div class='del'>-</div><div class='del'>-Now the driver knows that we want to do some GPIO-specific operation on the</div><div class='del'>-second GPIO range handled by "chip b", at offset 2 in that specific range.</div><div class='del'>-</div><div class='del'>-(If the GPIO subsystem is ever refactored to use a local per-GPIO controller</div><div class='del'>-pin space, this mapping will need to be augmented accordingly.)</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> PINMUX interfaces</div><div class='ctx'> =================</div><div class='ctx'> </div><div class='hunk'>@@ -438,7 +520,7 @@ you. Define enumerators only for the pins you can control if that makes sense.</div><div class='ctx'> </div><div class='ctx'> Assumptions:</div><div class='ctx'> </div><div class='del'>-We assume that the number possible function maps to pin groups is limited by</div><div class='add'>+We assume that the number of possible function maps to pin groups is limited by</div><div class='ctx'> the hardware. I.e. we assume that there is no system where any function can be</div><div class='ctx'> mapped to any pin, like in a phone exchange. So the available pins groups for</div><div class='ctx'> a certain function will be limited to a few choices (say up to eight or so),</div><div class='hunk'>@@ -585,7 +667,7 @@ int foo_list_funcs(struct pinctrl_dev *pctldev, unsigned selector)</div><div class='ctx'> </div><div class='ctx'> const char *foo_get_fname(struct pinctrl_dev *pctldev, unsigned selector)</div><div class='ctx'> {</div><div class='del'>-	return myfuncs[selector].name;</div><div class='add'>+	return foo_functions[selector].name;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int foo_get_groups(struct pinctrl_dev *pctldev, unsigned selector,</div><div class='hunk'>@@ -600,16 +682,16 @@ static int foo_get_groups(struct pinctrl_dev *pctldev, unsigned selector,</div><div class='ctx'> int foo_enable(struct pinctrl_dev *pctldev, unsigned selector,</div><div class='ctx'> 		unsigned group)</div><div class='ctx'> {</div><div class='del'>-	u8 regbit = (1 &lt;&lt; group);</div><div class='add'>+	u8 regbit = (1 &lt;&lt; selector + group);</div><div class='ctx'> </div><div class='ctx'> 	writeb((readb(MUX)|regbit), MUX)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int foo_disable(struct pinctrl_dev *pctldev, unsigned selector,</div><div class='add'>+void foo_disable(struct pinctrl_dev *pctldev, unsigned selector,</div><div class='ctx'> 		unsigned group)</div><div class='ctx'> {</div><div class='del'>-	u8 regbit = (1 &lt;&lt; group);</div><div class='add'>+	u8 regbit = (1 &lt;&lt; selector + group);</div><div class='ctx'> </div><div class='ctx'> 	writeb((readb(MUX) &amp; ~(regbit)), MUX)</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -647,6 +729,17 @@ All the above functions are mandatory to implement for a pinmux driver.</div><div class='ctx'> Pinmux interaction with the GPIO subsystem</div><div class='ctx'> ==========================================</div><div class='ctx'> </div><div class='add'>+The public pinmux API contains two functions named pinmux_request_gpio()</div><div class='add'>+and pinmux_free_gpio(). These two functions shall *ONLY* be called from</div><div class='add'>+gpiolib-based drivers as part of their gpio_request() and</div><div class='add'>+gpio_free() semantics. Likewise the pinmux_gpio_direction_[input|output]</div><div class='add'>+shall only be called from within respective gpio_direction_[input|output]</div><div class='add'>+gpiolib implementation.</div><div class='add'>+</div><div class='add'>+NOTE that platforms and individual drivers shall *NOT* request GPIO pins to be</div><div class='add'>+muxed in. Instead, implement a proper gpiolib driver and have that driver</div><div class='add'>+request proper muxing for its pins.</div><div class='add'>+</div><div class='ctx'> The function list could become long, especially if you can convert every</div><div class='ctx'> individual pin into a GPIO pin independent of any other pins, and then try</div><div class='ctx'> the approach to define every pin as a function.</div><div class='hunk'>@@ -654,19 +747,24 @@ the approach to define every pin as a function.</div><div class='ctx'> In this case, the function array would become 64 entries for each GPIO</div><div class='ctx'> setting and then the device functions.</div><div class='ctx'> </div><div class='del'>-For this reason there is an additional function a pinmux driver can implement</div><div class='del'>-to enable only GPIO on an individual pin: .gpio_request_enable(). The same</div><div class='del'>-.free() function as for other functions is assumed to be usable also for</div><div class='del'>-GPIO pins.</div><div class='add'>+For this reason there are two functions a pinmux driver can implement</div><div class='add'>+to enable only GPIO on an individual pin: .gpio_request_enable() and</div><div class='add'>+.gpio_disable_free().</div><div class='ctx'> </div><div class='ctx'> This function will pass in the affected GPIO range identified by the pin</div><div class='ctx'> controller core, so you know which GPIO pins are being affected by the request</div><div class='ctx'> operation.</div><div class='ctx'> </div><div class='del'>-Alternatively it is fully allowed to use named functions for each GPIO</div><div class='del'>-pin, the pinmux_request_gpio() will attempt to obtain the function "gpioN"</div><div class='del'>-where "N" is the global GPIO pin number if no special GPIO-handler is</div><div class='del'>-registered.</div><div class='add'>+If your driver needs to have an indication from the framework of whether the</div><div class='add'>+GPIO pin shall be used for input or output you can implement the</div><div class='add'>+.gpio_set_direction() function. As described this shall be called from the</div><div class='add'>+gpiolib driver and the affected GPIO range, pin offset and desired direction</div><div class='add'>+will be passed along to this function.</div><div class='add'>+</div><div class='add'>+Alternatively to using these special functions, it is fully allowed to use</div><div class='add'>+named functions for each GPIO pin, the pinmux_request_gpio() will attempt to</div><div class='add'>+obtain the function "gpioN" where "N" is the global GPIO pin number if no</div><div class='add'>+special GPIO-handler is registered.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Pinmux board/machine configuration</div><div class='hunk'>@@ -683,19 +781,19 @@ spi on the second function mapping:</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pinctrl/machine.h&gt;</div><div class='ctx'> </div><div class='del'>-static struct pinmux_map pmx_mapping[] = {</div><div class='add'>+static const struct pinmux_map __initdata pmx_mapping[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.ctrl_dev_name = "pinctrl.0",</div><div class='add'>+		.ctrl_dev_name = "pinctrl-foo",</div><div class='ctx'> 		.function = "spi0",</div><div class='ctx'> 		.dev_name = "foo-spi.0",</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.ctrl_dev_name = "pinctrl.0",</div><div class='add'>+		.ctrl_dev_name = "pinctrl-foo",</div><div class='ctx'> 		.function = "i2c0",</div><div class='ctx'> 		.dev_name = "foo-i2c.0",</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.ctrl_dev_name = "pinctrl.0",</div><div class='add'>+		.ctrl_dev_name = "pinctrl-foo",</div><div class='ctx'> 		.function = "mmc0",</div><div class='ctx'> 		.dev_name = "foo-mmc.0",</div><div class='ctx'> 	},</div><div class='hunk'>@@ -714,14 +812,14 @@ for example if they are not yet instantiated or cumbersome to obtain.</div><div class='ctx'> </div><div class='ctx'> You register this pinmux mapping to the pinmux subsystem by simply:</div><div class='ctx'> </div><div class='del'>-       ret = pinmux_register_mappings(&amp;pmx_mapping, ARRAY_SIZE(pmx_mapping));</div><div class='add'>+       ret = pinmux_register_mappings(pmx_mapping, ARRAY_SIZE(pmx_mapping));</div><div class='ctx'> </div><div class='ctx'> Since the above construct is pretty common there is a helper macro to make</div><div class='del'>-it even more compact which assumes you want to use pinctrl.0 and position</div><div class='add'>+it even more compact which assumes you want to use pinctrl-foo and position</div><div class='ctx'> 0 for mapping, for example:</div><div class='ctx'> </div><div class='del'>-static struct pinmux_map pmx_mapping[] = {</div><div class='del'>-       PINMUX_MAP_PRIMARY("I2CMAP", "i2c0", "foo-i2c.0"),</div><div class='add'>+static struct pinmux_map __initdata pmx_mapping[] = {</div><div class='add'>+       PINMUX_MAP("I2CMAP", "pinctrl-foo", "i2c0", "foo-i2c.0"),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -734,14 +832,14 @@ As it is possible to map a function to different groups of pins an optional</div><div class='ctx'> ...</div><div class='ctx'> {</div><div class='ctx'> 	.name = "spi0-pos-A",</div><div class='del'>-	.ctrl_dev_name = "pinctrl.0",</div><div class='add'>+	.ctrl_dev_name = "pinctrl-foo",</div><div class='ctx'> 	.function = "spi0",</div><div class='ctx'> 	.group = "spi0_0_grp",</div><div class='ctx'> 	.dev_name = "foo-spi.0",</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.name = "spi0-pos-B",</div><div class='del'>-	.ctrl_dev_name = "pinctrl.0",</div><div class='add'>+	.ctrl_dev_name = "pinctrl-foo",</div><div class='ctx'> 	.function = "spi0",</div><div class='ctx'> 	.group = "spi0_1_grp",</div><div class='ctx'> 	.dev_name = "foo-spi.0",</div><div class='hunk'>@@ -760,44 +858,44 @@ case), we define a mapping like this:</div><div class='ctx'> ...</div><div class='ctx'> {</div><div class='ctx'> 	.name "2bit"</div><div class='del'>-	.ctrl_dev_name = "pinctrl.0",</div><div class='add'>+	.ctrl_dev_name = "pinctrl-foo",</div><div class='ctx'> 	.function = "mmc0",</div><div class='del'>-	.group = "mmc0_0_grp",</div><div class='add'>+	.group = "mmc0_1_grp",</div><div class='ctx'> 	.dev_name = "foo-mmc.0",</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.name "4bit"</div><div class='del'>-	.ctrl_dev_name = "pinctrl.0",</div><div class='add'>+	.ctrl_dev_name = "pinctrl-foo",</div><div class='ctx'> 	.function = "mmc0",</div><div class='del'>-	.group = "mmc0_0_grp",</div><div class='add'>+	.group = "mmc0_1_grp",</div><div class='ctx'> 	.dev_name = "foo-mmc.0",</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.name "4bit"</div><div class='del'>-	.ctrl_dev_name = "pinctrl.0",</div><div class='add'>+	.ctrl_dev_name = "pinctrl-foo",</div><div class='ctx'> 	.function = "mmc0",</div><div class='del'>-	.group = "mmc0_1_grp",</div><div class='add'>+	.group = "mmc0_2_grp",</div><div class='ctx'> 	.dev_name = "foo-mmc.0",</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.name "8bit"</div><div class='del'>-	.ctrl_dev_name = "pinctrl.0",</div><div class='add'>+	.ctrl_dev_name = "pinctrl-foo",</div><div class='ctx'> 	.function = "mmc0",</div><div class='del'>-	.group = "mmc0_0_grp",</div><div class='add'>+	.group = "mmc0_1_grp",</div><div class='ctx'> 	.dev_name = "foo-mmc.0",</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.name "8bit"</div><div class='del'>-	.ctrl_dev_name = "pinctrl.0",</div><div class='add'>+	.ctrl_dev_name = "pinctrl-foo",</div><div class='ctx'> 	.function = "mmc0",</div><div class='del'>-	.group = "mmc0_1_grp",</div><div class='add'>+	.group = "mmc0_2_grp",</div><div class='ctx'> 	.dev_name = "foo-mmc.0",</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.name "8bit"</div><div class='del'>-	.ctrl_dev_name = "pinctrl.0",</div><div class='add'>+	.ctrl_dev_name = "pinctrl-foo",</div><div class='ctx'> 	.function = "mmc0",</div><div class='del'>-	.group = "mmc0_2_grp",</div><div class='add'>+	.group = "mmc0_3_grp",</div><div class='ctx'> 	.dev_name = "foo-mmc.0",</div><div class='ctx'> },</div><div class='ctx'> ...</div><div class='hunk'>@@ -898,7 +996,7 @@ like this:</div><div class='ctx'> </div><div class='ctx'> {</div><div class='ctx'> 	.name "POWERMAP"</div><div class='del'>-	.ctrl_dev_name = "pinctrl.0",</div><div class='add'>+	.ctrl_dev_name = "pinctrl-foo",</div><div class='ctx'> 	.function = "power_func",</div><div class='ctx'> 	.hog_on_boot = true,</div><div class='ctx'> },</div><div class='head'>diff --git a/Documentation/power/charger-manager.txt b/Documentation/power/charger-manager.txt<br/>new file mode 100644<br/>index 000000000000..fdcca991df30<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/power/charger-manager.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/power/charger-manager.txt</a></div><div class='hunk'>@@ -0,0 +1,163 @@</div><div class='add'>+Charger Manager</div><div class='add'>+	(C) 2011 MyungJoo Ham &lt;myungjoo.ham@samsung.com&gt;, GPL</div><div class='add'>+</div><div class='add'>+Charger Manager provides in-kernel battery charger management that</div><div class='add'>+requires temperature monitoring during suspend-to-RAM state</div><div class='add'>+and where each battery may have multiple chargers attached and the userland</div><div class='add'>+wants to look at the aggregated information of the multiple chargers.</div><div class='add'>+</div><div class='add'>+Charger Manager is a platform_driver with power-supply-class entries.</div><div class='add'>+An instance of Charger Manager (a platform-device created with Charger-Manager)</div><div class='add'>+represents an independent battery with chargers. If there are multiple</div><div class='add'>+batteries with their own chargers acting independently in a system,</div><div class='add'>+the system may need multiple instances of Charger Manager.</div><div class='add'>+</div><div class='add'>+1. Introduction</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+Charger Manager supports the following:</div><div class='add'>+</div><div class='add'>+* Support for multiple chargers (e.g., a device with USB, AC, and solar panels)</div><div class='add'>+	A system may have multiple chargers (or power sources) and some of</div><div class='add'>+	they may be activated at the same time. Each charger may have its</div><div class='add'>+	own power-supply-class and each power-supply-class can provide</div><div class='add'>+	different information about the battery status. This framework</div><div class='add'>+	aggregates charger-related information from multiple sources and</div><div class='add'>+	shows combined information as a single power-supply-class.</div><div class='add'>+</div><div class='add'>+* Support for in suspend-to-RAM polling (with suspend_again callback)</div><div class='add'>+	While the battery is being charged and the system is in suspend-to-RAM,</div><div class='add'>+	we may need to monitor the battery health by looking at the ambient or</div><div class='add'>+	battery temperature. We can accomplish this by waking up the system</div><div class='add'>+	periodically. However, such a method wakes up devices unncessary for</div><div class='add'>+	monitoring the battery health and tasks, and user processes that are</div><div class='add'>+	supposed to be kept suspended. That, in turn, incurs unnecessary power</div><div class='add'>+	consumption and slow down charging process. Or even, such peak power</div><div class='add'>+	consumption can stop chargers in the middle of charging</div><div class='add'>+	(external power input &lt; device power consumption), which not</div><div class='add'>+	only affects the charging time, but the lifespan of the battery.</div><div class='add'>+</div><div class='add'>+	Charger Manager provides a function "cm_suspend_again" that can be</div><div class='add'>+	used as suspend_again callback of platform_suspend_ops. If the platform</div><div class='add'>+	requires tasks other than cm_suspend_again, it may implement its own</div><div class='add'>+	suspend_again callback that calls cm_suspend_again in the middle.</div><div class='add'>+	Normally, the platform will need to resume and suspend some devices</div><div class='add'>+	that are used by Charger Manager.</div><div class='add'>+</div><div class='add'>+2. Global Charger-Manager Data related with suspend_again</div><div class='add'>+========================================================</div><div class='add'>+In order to setup Charger Manager with suspend-again feature</div><div class='add'>+(in-suspend monitoring), the user should provide charger_global_desc</div><div class='add'>+with setup_charger_manager(struct charger_global_desc *).</div><div class='add'>+This charger_global_desc data for in-suspend monitoring is global</div><div class='add'>+as the name suggests. Thus, the user needs to provide only once even</div><div class='add'>+if there are multiple batteries. If there are multiple batteries, the</div><div class='add'>+multiple instances of Charger Manager share the same charger_global_desc</div><div class='add'>+and it will manage in-suspend monitoring for all instances of Charger Manager.</div><div class='add'>+</div><div class='add'>+The user needs to provide all the two entries properly in order to activate</div><div class='add'>+in-suspend monitoring:</div><div class='add'>+</div><div class='add'>+struct charger_global_desc {</div><div class='add'>+</div><div class='add'>+char *rtc_name;</div><div class='add'>+	: The name of rtc (e.g., "rtc0") used to wakeup the system from</div><div class='add'>+	suspend for Charger Manager. The alarm interrupt (AIE) of the rtc</div><div class='add'>+	should be able to wake up the system from suspend. Charger Manager</div><div class='add'>+	saves and restores the alarm value and use the previously-defined</div><div class='add'>+	alarm if it is going to go off earlier than Charger Manager so that</div><div class='add'>+	Charger Manager does not interfere with previously-defined alarms.</div><div class='add'>+</div><div class='add'>+bool (*rtc_only_wakeup)(void);</div><div class='add'>+	: This callback should let CM know whether</div><div class='add'>+	the wakeup-from-suspend is caused only by the alarm of "rtc" in the</div><div class='add'>+	same struct. If there is any other wakeup source triggered the</div><div class='add'>+	wakeup, it should return false. If the "rtc" is the only wakeup</div><div class='add'>+	reason, it should return true.</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+3. How to setup suspend_again</div><div class='add'>+=============================</div><div class='add'>+Charger Manager provides a function "extern bool cm_suspend_again(void)".</div><div class='add'>+When cm_suspend_again is called, it monitors every battery. The suspend_ops</div><div class='add'>+callback of the system's platform_suspend_ops can call cm_suspend_again</div><div class='add'>+function to know whether Charger Manager wants to suspend again or not.</div><div class='add'>+If there are no other devices or tasks that want to use suspend_again</div><div class='add'>+feature, the platform_suspend_ops may directly refer to cm_suspend_again</div><div class='add'>+for its suspend_again callback.</div><div class='add'>+</div><div class='add'>+The cm_suspend_again() returns true (meaning "I want to suspend again")</div><div class='add'>+if the system was woken up by Charger Manager and the polling</div><div class='add'>+(in-suspend monitoring) results in "normal".</div><div class='add'>+</div><div class='add'>+4. Charger-Manager Data (struct charger_desc)</div><div class='add'>+=============================================</div><div class='add'>+For each battery charged independently from other batteries (if a series of</div><div class='add'>+batteries are charged by a single charger, they are counted as one independent</div><div class='add'>+battery), an instance of Charger Manager is attached to it.</div><div class='add'>+</div><div class='add'>+struct charger_desc {</div><div class='add'>+</div><div class='add'>+char *psy_name;</div><div class='add'>+	: The power-supply-class name of the battery. Default is</div><div class='add'>+	"battery" if psy_name is NULL. Users can access the psy entries</div><div class='add'>+	at "/sys/class/power_supply/[psy_name]/".</div><div class='add'>+</div><div class='add'>+enum polling_modes polling_mode;</div><div class='add'>+	: CM_POLL_DISABLE: do not poll this battery.</div><div class='add'>+	  CM_POLL_ALWAYS: always poll this battery.</div><div class='add'>+	  CM_POLL_EXTERNAL_POWER_ONLY: poll this battery if and only if</div><div class='add'>+				       an external power source is attached.</div><div class='add'>+	  CM_POLL_CHARGING_ONLY: poll this battery if and only if the</div><div class='add'>+				 battery is being charged.</div><div class='add'>+</div><div class='add'>+unsigned int fullbatt_uV;</div><div class='add'>+	: If specified with a non-zero value, Charger Manager assumes</div><div class='add'>+	that the battery is full (capacity = 100) if the battery is not being</div><div class='add'>+	charged and the battery voltage is equal to or greater than</div><div class='add'>+	fullbatt_uV.</div><div class='add'>+</div><div class='add'>+unsigned int polling_interval_ms;</div><div class='add'>+	: Required polling interval in ms. Charger Manager will poll</div><div class='add'>+	this battery every polling_interval_ms or more frequently.</div><div class='add'>+</div><div class='add'>+enum data_source battery_present;</div><div class='add'>+	CM_FUEL_GAUGE: get battery presence information from fuel gauge.</div><div class='add'>+	CM_CHARGER_STAT: get battery presence from chargers.</div><div class='add'>+</div><div class='add'>+char **psy_charger_stat;</div><div class='add'>+	: An array ending with NULL that has power-supply-class names of</div><div class='add'>+	chargers. Each power-supply-class should provide "PRESENT" (if</div><div class='add'>+	battery_present is "CM_CHARGER_STAT"), "ONLINE" (shows whether an</div><div class='add'>+	external power source is attached or not), and "STATUS" (shows whether</div><div class='add'>+	the battery is {"FULL" or not FULL} or {"FULL", "Charging",</div><div class='add'>+	"Discharging", "NotCharging"}).</div><div class='add'>+</div><div class='add'>+int num_charger_regulators;</div><div class='add'>+struct regulator_bulk_data *charger_regulators;</div><div class='add'>+	: Regulators representing the chargers in the form for</div><div class='add'>+	regulator framework's bulk functions.</div><div class='add'>+</div><div class='add'>+char *psy_fuel_gauge;</div><div class='add'>+	: Power-supply-class name of the fuel gauge.</div><div class='add'>+</div><div class='add'>+int (*temperature_out_of_range)(int *mC);</div><div class='add'>+bool measure_battery_temp;</div><div class='add'>+	: This callback returns 0 if the temperature is safe for charging,</div><div class='add'>+	a positive number if it is too hot to charge, and a negative number</div><div class='add'>+	if it is too cold to charge. With the variable mC, the callback returns</div><div class='add'>+	the temperature in 1/1000 of centigrade.</div><div class='add'>+	The source of temperature can be battery or ambient one according to</div><div class='add'>+	the value of measure_battery_temp.</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+5. Other Considerations</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+At the charger/battery-related events such as battery-pulled-out,</div><div class='add'>+charger-pulled-out, charger-inserted, DCIN-over/under-voltage, charger-stopped,</div><div class='add'>+and others critical to chargers, the system should be configured to wake up.</div><div class='add'>+At least the following should wake up the system from a suspend:</div><div class='add'>+a) charger-on/off b) external-power-in/out c) battery-in/out (while charging)</div><div class='add'>+</div><div class='add'>+It is usually accomplished by configuring the PMIC as a wakeup source.</div><div class='head'>diff --git a/Documentation/power/devices.txt b/Documentation/power/devices.txt<br/>index 3139fb505dce..20af7def23c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/power/devices.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/power/devices.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/power/devices.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/power/devices.txt</a></div><div class='hunk'>@@ -126,7 +126,9 @@ The core methods to suspend and resume devices reside in struct dev_pm_ops</div><div class='ctx'> pointed to by the ops member of struct dev_pm_domain, or by the pm member of</div><div class='ctx'> struct bus_type, struct device_type and struct class.  They are mostly of</div><div class='ctx'> interest to the people writing infrastructure for platforms and buses, like PCI</div><div class='del'>-or USB, or device type and device class drivers.</div><div class='add'>+or USB, or device type and device class drivers.  They also are relevant to the</div><div class='add'>+writers of device drivers whose subsystems (PM domains, device types, device</div><div class='add'>+classes and bus types) don't provide all power management methods.</div><div class='ctx'> </div><div class='ctx'> Bus drivers implement these methods as appropriate for the hardware and the</div><div class='ctx'> drivers using it; PCI works differently from USB, and so on.  Not many people</div><div class='hunk'>@@ -268,32 +270,35 @@ various phases always run after tasks have been frozen and before they are</div><div class='ctx'> unfrozen.  Furthermore, the *_noirq phases run at a time when IRQ handlers have</div><div class='ctx'> been disabled (except for those marked with the IRQF_NO_SUSPEND flag).</div><div class='ctx'> </div><div class='del'>-All phases use PM domain, bus, type, or class callbacks (that is, methods</div><div class='del'>-defined in dev-&gt;pm_domain-&gt;ops, dev-&gt;bus-&gt;pm, dev-&gt;type-&gt;pm, or dev-&gt;class-&gt;pm).</div><div class='del'>-These callbacks are regarded by the PM core as mutually exclusive.  Moreover,</div><div class='del'>-PM domain callbacks always take precedence over bus, type and class callbacks,</div><div class='del'>-while type callbacks take precedence over bus and class callbacks, and class</div><div class='del'>-callbacks take precedence over bus callbacks.  To be precise, the following</div><div class='del'>-rules are used to determine which callback to execute in the given phase:</div><div class='add'>+All phases use PM domain, bus, type, class or driver callbacks (that is, methods</div><div class='add'>+defined in dev-&gt;pm_domain-&gt;ops, dev-&gt;bus-&gt;pm, dev-&gt;type-&gt;pm, dev-&gt;class-&gt;pm or</div><div class='add'>+dev-&gt;driver-&gt;pm).  These callbacks are regarded by the PM core as mutually</div><div class='add'>+exclusive.  Moreover, PM domain callbacks always take precedence over all of the</div><div class='add'>+other callbacks and, for example, type callbacks take precedence over bus, class</div><div class='add'>+and driver callbacks.  To be precise, the following rules are used to determine</div><div class='add'>+which callback to execute in the given phase:</div><div class='ctx'> </div><div class='del'>-    1.	If dev-&gt;pm_domain is present, the PM core will attempt to execute the</div><div class='del'>-	callback included in dev-&gt;pm_domain-&gt;ops.  If that callback is not</div><div class='del'>-	present, no action will be carried out for the given device.</div><div class='add'>+    1.	If dev-&gt;pm_domain is present, the PM core will choose the callback</div><div class='add'>+	included in dev-&gt;pm_domain-&gt;ops for execution</div><div class='ctx'> </div><div class='ctx'>     2.	Otherwise, if both dev-&gt;type and dev-&gt;type-&gt;pm are present, the callback</div><div class='del'>-	included in dev-&gt;type-&gt;pm will be executed.</div><div class='add'>+	included in dev-&gt;type-&gt;pm will be chosen for execution.</div><div class='ctx'> </div><div class='ctx'>     3.	Otherwise, if both dev-&gt;class and dev-&gt;class-&gt;pm are present, the</div><div class='del'>-	callback included in dev-&gt;class-&gt;pm will be executed.</div><div class='add'>+	callback included in dev-&gt;class-&gt;pm will be chosen for execution.</div><div class='ctx'> </div><div class='ctx'>     4.	Otherwise, if both dev-&gt;bus and dev-&gt;bus-&gt;pm are present, the callback</div><div class='del'>-	included in dev-&gt;bus-&gt;pm will be executed.</div><div class='add'>+	included in dev-&gt;bus-&gt;pm will be chosen for execution.</div><div class='ctx'> </div><div class='ctx'> This allows PM domains and device types to override callbacks provided by bus</div><div class='ctx'> types or device classes if necessary.</div><div class='ctx'> </div><div class='del'>-These callbacks may in turn invoke device- or driver-specific methods stored in</div><div class='del'>-dev-&gt;driver-&gt;pm, but they don't have to.</div><div class='add'>+The PM domain, type, class and bus callbacks may in turn invoke device- or</div><div class='add'>+driver-specific methods stored in dev-&gt;driver-&gt;pm, but they don't have to do</div><div class='add'>+that.</div><div class='add'>+</div><div class='add'>+If the subsystem callback chosen for execution is not present, the PM core will</div><div class='add'>+execute the corresponding method from dev-&gt;driver-&gt;pm instead if there is one.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Entering System Suspend</div><div class='head'>diff --git a/Documentation/power/freezing-of-tasks.txt b/Documentation/power/freezing-of-tasks.txt<br/>index 316c2ba187f4..6ccb68f68da6 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/power/freezing-of-tasks.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/power/freezing-of-tasks.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/power/freezing-of-tasks.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/power/freezing-of-tasks.txt</a></div><div class='hunk'>@@ -21,7 +21,7 @@ freeze_processes() (defined in kernel/power/process.c) is called.  It executes</div><div class='ctx'> try_to_freeze_tasks() that sets TIF_FREEZE for all of the freezable tasks and</div><div class='ctx'> either wakes them up, if they are kernel threads, or sends fake signals to them,</div><div class='ctx'> if they are user space processes.  A task that has TIF_FREEZE set, should react</div><div class='del'>-to it by calling the function called refrigerator() (defined in</div><div class='add'>+to it by calling the function called __refrigerator() (defined in</div><div class='ctx'> kernel/freezer.c), which sets the task's PF_FROZEN flag, changes its state</div><div class='ctx'> to TASK_UNINTERRUPTIBLE and makes it loop until PF_FROZEN is cleared for it.</div><div class='ctx'> Then, we say that the task is 'frozen' and therefore the set of functions</div><div class='hunk'>@@ -29,10 +29,10 @@ handling this mechanism is referred to as 'the freezer' (these functions are</div><div class='ctx'> defined in kernel/power/process.c, kernel/freezer.c &amp; include/linux/freezer.h).</div><div class='ctx'> User space processes are generally frozen before kernel threads.</div><div class='ctx'> </div><div class='del'>-It is not recommended to call refrigerator() directly.  Instead, it is</div><div class='del'>-recommended to use the try_to_freeze() function (defined in</div><div class='del'>-include/linux/freezer.h), that checks the task's TIF_FREEZE flag and makes the</div><div class='del'>-task enter refrigerator() if the flag is set.</div><div class='add'>+__refrigerator() must not be called directly.  Instead, use the</div><div class='add'>+try_to_freeze() function (defined in include/linux/freezer.h), that checks</div><div class='add'>+the task's TIF_FREEZE flag and makes the task enter __refrigerator() if the</div><div class='add'>+flag is set.</div><div class='ctx'> </div><div class='ctx'> For user space processes try_to_freeze() is called automatically from the</div><div class='ctx'> signal-handling code, but the freezable kernel threads need to call it</div><div class='hunk'>@@ -61,13 +61,13 @@ wait_event_freezable() and wait_event_freezable_timeout() macros.</div><div class='ctx'> After the system memory state has been restored from a hibernation image and</div><div class='ctx'> devices have been reinitialized, the function thaw_processes() is called in</div><div class='ctx'> order to clear the PF_FROZEN flag for each frozen task.  Then, the tasks that</div><div class='del'>-have been frozen leave refrigerator() and continue running.</div><div class='add'>+have been frozen leave __refrigerator() and continue running.</div><div class='ctx'> </div><div class='ctx'> III. Which kernel threads are freezable?</div><div class='ctx'> </div><div class='ctx'> Kernel threads are not freezable by default.  However, a kernel thread may clear</div><div class='ctx'> PF_NOFREEZE for itself by calling set_freezable() (the resetting of PF_NOFREEZE</div><div class='del'>-directly is strongly discouraged).  From this point it is regarded as freezable</div><div class='add'>+directly is not allowed).  From this point it is regarded as freezable</div><div class='ctx'> and must call try_to_freeze() in a suitable place.</div><div class='ctx'> </div><div class='ctx'> IV. Why do we do that?</div><div class='hunk'>@@ -176,3 +176,28 @@ tasks, since it generally exists anyway.</div><div class='ctx'> A driver must have all firmwares it may need in RAM before suspend() is called.</div><div class='ctx'> If keeping them is not practical, for example due to their size, they must be</div><div class='ctx'> requested early enough using the suspend notifier API described in notifiers.txt.</div><div class='add'>+</div><div class='add'>+VI. Are there any precautions to be taken to prevent freezing failures?</div><div class='add'>+</div><div class='add'>+Yes, there are.</div><div class='add'>+</div><div class='add'>+First of all, grabbing the 'pm_mutex' lock to mutually exclude a piece of code</div><div class='add'>+from system-wide sleep such as suspend/hibernation is not encouraged.</div><div class='add'>+If possible, that piece of code must instead hook onto the suspend/hibernation</div><div class='add'>+notifiers to achieve mutual exclusion. Look at the CPU-Hotplug code</div><div class='add'>+(kernel/cpu.c) for an example.</div><div class='add'>+</div><div class='add'>+However, if that is not feasible, and grabbing 'pm_mutex' is deemed necessary,</div><div class='add'>+it is strongly discouraged to directly call mutex_[un]lock(&amp;pm_mutex) since</div><div class='add'>+that could lead to freezing failures, because if the suspend/hibernate code</div><div class='add'>+successfully acquired the 'pm_mutex' lock, and hence that other entity failed</div><div class='add'>+to acquire the lock, then that task would get blocked in TASK_UNINTERRUPTIBLE</div><div class='add'>+state. As a consequence, the freezer would not be able to freeze that task,</div><div class='add'>+leading to freezing failure.</div><div class='add'>+</div><div class='add'>+However, the [un]lock_system_sleep() APIs are safe to use in this scenario,</div><div class='add'>+since they ask the freezer to skip freezing this task, since it is anyway</div><div class='add'>+"frozen enough" as it is blocked on 'pm_mutex', which will be released</div><div class='add'>+only after the entire suspend/hibernation sequence is complete.</div><div class='add'>+So, to summarize, use [un]lock_system_sleep() instead of directly using</div><div class='add'>+mutex_[un]lock(&amp;pm_mutex). That would prevent freezing failures.</div><div class='head'>diff --git a/Documentation/power/regulator/regulator.txt b/Documentation/power/regulator/regulator.txt<br/>index 3f8b528f237e..e272d9909e39 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/power/regulator/regulator.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/power/regulator/regulator.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/power/regulator/regulator.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/power/regulator/regulator.txt</a></div><div class='hunk'>@@ -12,7 +12,7 @@ Drivers can register a regulator by calling :-</div><div class='ctx'> </div><div class='ctx'> struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,</div><div class='ctx'> 	struct device *dev, struct regulator_init_data *init_data,</div><div class='del'>-	void *driver_data);</div><div class='add'>+	void *driver_data, struct device_node *of_node);</div><div class='ctx'> </div><div class='ctx'> This will register the regulators capabilities and operations to the regulator</div><div class='ctx'> core.</div><div class='head'>diff --git a/Documentation/power/runtime_pm.txt b/Documentation/power/runtime_pm.txt<br/>index c2ae8bf77d46..4abe83e1045a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/power/runtime_pm.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/power/runtime_pm.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/power/runtime_pm.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/power/runtime_pm.txt</a></div><div class='hunk'>@@ -57,6 +57,10 @@ the following:</div><div class='ctx'> </div><div class='ctx'>   4. Bus type of the device, if both dev-&gt;bus and dev-&gt;bus-&gt;pm are present.</div><div class='ctx'> </div><div class='add'>+If the subsystem chosen by applying the above rules doesn't provide the relevant</div><div class='add'>+callback, the PM core will invoke the corresponding driver callback stored in</div><div class='add'>+dev-&gt;driver-&gt;pm directly (if present).</div><div class='add'>+</div><div class='ctx'> The PM core always checks which callback to use in the order given above, so the</div><div class='ctx'> priority order of callbacks from high to low is: PM domain, device type, class</div><div class='ctx'> and bus type.  Moreover, the high-priority one will always take precedence over</div><div class='hunk'>@@ -64,86 +68,88 @@ a low-priority one.  The PM domain, bus type, device type and class callbacks</div><div class='ctx'> are referred to as subsystem-level callbacks in what follows.</div><div class='ctx'> </div><div class='ctx'> By default, the callbacks are always invoked in process context with interrupts</div><div class='del'>-enabled.  However, subsystems can use the pm_runtime_irq_safe() helper function</div><div class='del'>-to tell the PM core that their -&gt;runtime_suspend(), -&gt;runtime_resume() and</div><div class='del'>--&gt;runtime_idle() callbacks may be invoked in atomic context with interrupts</div><div class='del'>-disabled for a given device.  This implies that the callback routines in</div><div class='del'>-question must not block or sleep, but it also means that the synchronous helper</div><div class='del'>-functions listed at the end of Section 4 may be used for that device within an</div><div class='del'>-interrupt handler or generally in an atomic context.</div><div class='del'>-</div><div class='del'>-The subsystem-level suspend callback is _entirely_ _responsible_ for handling</div><div class='del'>-the suspend of the device as appropriate, which may, but need not include</div><div class='del'>-executing the device driver's own -&gt;runtime_suspend() callback (from the</div><div class='add'>+enabled.  However, the pm_runtime_irq_safe() helper function can be used to tell</div><div class='add'>+the PM core that it is safe to run the -&gt;runtime_suspend(), -&gt;runtime_resume()</div><div class='add'>+and -&gt;runtime_idle() callbacks for the given device in atomic context with</div><div class='add'>+interrupts disabled.  This implies that the callback routines in question must</div><div class='add'>+not block or sleep, but it also means that the synchronous helper functions</div><div class='add'>+listed at the end of Section 4 may be used for that device within an interrupt</div><div class='add'>+handler or generally in an atomic context.</div><div class='add'>+</div><div class='add'>+The subsystem-level suspend callback, if present, is _entirely_ _responsible_</div><div class='add'>+for handling the suspend of the device as appropriate, which may, but need not</div><div class='add'>+include executing the device driver's own -&gt;runtime_suspend() callback (from the</div><div class='ctx'> PM core's point of view it is not necessary to implement a -&gt;runtime_suspend()</div><div class='ctx'> callback in a device driver as long as the subsystem-level suspend callback</div><div class='ctx'> knows what to do to handle the device).</div><div class='ctx'> </div><div class='del'>-  * Once the subsystem-level suspend callback has completed successfully</div><div class='del'>-    for given device, the PM core regards the device as suspended, which need</div><div class='del'>-    not mean that the device has been put into a low power state.  It is</div><div class='del'>-    supposed to mean, however, that the device will not process data and will</div><div class='del'>-    not communicate with the CPU(s) and RAM until the subsystem-level resume</div><div class='del'>-    callback is executed for it.  The runtime PM status of a device after</div><div class='del'>-    successful execution of the subsystem-level suspend callback is 'suspended'.</div><div class='del'>-</div><div class='del'>-  * If the subsystem-level suspend callback returns -EBUSY or -EAGAIN,</div><div class='del'>-    the device's runtime PM status is 'active', which means that the device</div><div class='del'>-    _must_ be fully operational afterwards.</div><div class='del'>-</div><div class='del'>-  * If the subsystem-level suspend callback returns an error code different</div><div class='del'>-    from -EBUSY or -EAGAIN, the PM core regards this as a fatal error and will</div><div class='del'>-    refuse to run the helper functions described in Section 4 for the device,</div><div class='del'>-    until the status of it is directly set either to 'active', or to 'suspended'</div><div class='del'>-    (the PM core provides special helper functions for this purpose).</div><div class='del'>-</div><div class='del'>-In particular, if the driver requires remote wake-up capability (i.e. hardware</div><div class='add'>+  * Once the subsystem-level suspend callback (or the driver suspend callback,</div><div class='add'>+    if invoked directly) has completed successfully for the given device, the PM</div><div class='add'>+    core regards the device as suspended, which need not mean that it has been</div><div class='add'>+    put into a low power state.  It is supposed to mean, however, that the</div><div class='add'>+    device will not process data and will not communicate with the CPU(s) and</div><div class='add'>+    RAM until the appropriate resume callback is executed for it.  The runtime</div><div class='add'>+    PM status of a device after successful execution of the suspend callback is</div><div class='add'>+    'suspended'.</div><div class='add'>+</div><div class='add'>+  * If the suspend callback returns -EBUSY or -EAGAIN, the device's runtime PM</div><div class='add'>+    status remains 'active', which means that the device _must_ be fully</div><div class='add'>+    operational afterwards.</div><div class='add'>+</div><div class='add'>+  * If the suspend callback returns an error code different from -EBUSY and</div><div class='add'>+    -EAGAIN, the PM core regards this as a fatal error and will refuse to run</div><div class='add'>+    the helper functions described in Section 4 for the device until its status</div><div class='add'>+    is directly set to  either'active', or 'suspended' (the PM core provides</div><div class='add'>+    special helper functions for this purpose).</div><div class='add'>+</div><div class='add'>+In particular, if the driver requires remote wakeup capability (i.e. hardware</div><div class='ctx'> mechanism allowing the device to request a change of its power state, such as</div><div class='ctx'> PCI PME) for proper functioning and device_run_wake() returns 'false' for the</div><div class='ctx'> device, then -&gt;runtime_suspend() should return -EBUSY.  On the other hand, if</div><div class='del'>-device_run_wake() returns 'true' for the device and the device is put into a low</div><div class='del'>-power state during the execution of the subsystem-level suspend callback, it is</div><div class='del'>-expected that remote wake-up will be enabled for the device.  Generally, remote</div><div class='del'>-wake-up should be enabled for all input devices put into a low power state at</div><div class='del'>-run time.</div><div class='del'>-</div><div class='del'>-The subsystem-level resume callback is _entirely_ _responsible_ for handling the</div><div class='del'>-resume of the device as appropriate, which may, but need not include executing</div><div class='del'>-the device driver's own -&gt;runtime_resume() callback (from the PM core's point of</div><div class='del'>-view it is not necessary to implement a -&gt;runtime_resume() callback in a device</div><div class='del'>-driver as long as the subsystem-level resume callback knows what to do to handle</div><div class='del'>-the device).</div><div class='del'>-</div><div class='del'>-  * Once the subsystem-level resume callback has completed successfully, the PM</div><div class='del'>-    core regards the device as fully operational, which means that the device</div><div class='del'>-    _must_ be able to complete I/O operations as needed.  The runtime PM status</div><div class='del'>-    of the device is then 'active'.</div><div class='del'>-</div><div class='del'>-  * If the subsystem-level resume callback returns an error code, the PM core</div><div class='del'>-    regards this as a fatal error and will refuse to run the helper functions</div><div class='del'>-    described in Section 4 for the device, until its status is directly set</div><div class='del'>-    either to 'active' or to 'suspended' (the PM core provides special helper</div><div class='del'>-    functions for this purpose).</div><div class='del'>-</div><div class='del'>-The subsystem-level idle callback is executed by the PM core whenever the device</div><div class='del'>-appears to be idle, which is indicated to the PM core by two counters, the</div><div class='del'>-device's usage counter and the counter of 'active' children of the device.</div><div class='add'>+device_run_wake() returns 'true' for the device and the device is put into a</div><div class='add'>+low-power state during the execution of the suspend callback, it is expected</div><div class='add'>+that remote wakeup will be enabled for the device.  Generally, remote wakeup</div><div class='add'>+should be enabled for all input devices put into low-power states at run time.</div><div class='add'>+</div><div class='add'>+The subsystem-level resume callback, if present, is _entirely_ _responsible_ for</div><div class='add'>+handling the resume of the device as appropriate, which may, but need not</div><div class='add'>+include executing the device driver's own -&gt;runtime_resume() callback (from the</div><div class='add'>+PM core's point of view it is not necessary to implement a -&gt;runtime_resume()</div><div class='add'>+callback in a device driver as long as the subsystem-level resume callback knows</div><div class='add'>+what to do to handle the device).</div><div class='add'>+</div><div class='add'>+  * Once the subsystem-level resume callback (or the driver resume callback, if</div><div class='add'>+    invoked directly) has completed successfully, the PM core regards the device</div><div class='add'>+    as fully operational, which means that the device _must_ be able to complete</div><div class='add'>+    I/O operations as needed.  The runtime PM status of the device is then</div><div class='add'>+    'active'.</div><div class='add'>+</div><div class='add'>+  * If the resume callback returns an error code, the PM core regards this as a</div><div class='add'>+    fatal error and will refuse to run the helper functions described in Section</div><div class='add'>+    4 for the device, until its status is directly set to either 'active', or</div><div class='add'>+    'suspended' (by means of special helper functions provided by the PM core</div><div class='add'>+    for this purpose).</div><div class='add'>+</div><div class='add'>+The idle callback (a subsystem-level one, if present, or the driver one) is</div><div class='add'>+executed by the PM core whenever the device appears to be idle, which is</div><div class='add'>+indicated to the PM core by two counters, the device's usage counter and the</div><div class='add'>+counter of 'active' children of the device.</div><div class='ctx'> </div><div class='ctx'>   * If any of these counters is decreased using a helper function provided by</div><div class='ctx'>     the PM core and it turns out to be equal to zero, the other counter is</div><div class='ctx'>     checked.  If that counter also is equal to zero, the PM core executes the</div><div class='del'>-    subsystem-level idle callback with the device as an argument.</div><div class='add'>+    idle callback with the device as its argument.</div><div class='ctx'> </div><div class='del'>-The action performed by a subsystem-level idle callback is totally dependent on</div><div class='del'>-the subsystem in question, but the expected and recommended action is to check</div><div class='add'>+The action performed by the idle callback is totally dependent on the subsystem</div><div class='add'>+(or driver) in question, but the expected and recommended action is to check</div><div class='ctx'> if the device can be suspended (i.e. if all of the conditions necessary for</div><div class='ctx'> suspending the device are satisfied) and to queue up a suspend request for the</div><div class='ctx'> device in that case.  The value returned by this callback is ignored by the PM</div><div class='ctx'> core.</div><div class='ctx'> </div><div class='ctx'> The helper functions provided by the PM core, described in Section 4, guarantee</div><div class='del'>-that the following constraints are met with respect to the bus type's runtime</div><div class='del'>-PM callbacks:</div><div class='add'>+that the following constraints are met with respect to runtime PM callbacks for</div><div class='add'>+one device:</div><div class='ctx'> </div><div class='ctx'> (1) The callbacks are mutually exclusive (e.g. it is forbidden to execute</div><div class='ctx'>     -&gt;runtime_suspend() in parallel with -&gt;runtime_resume() or with another</div><div class='head'>diff --git a/Documentation/s390/Debugging390.txt b/Documentation/s390/Debugging390.txt<br/>index efe998becc5b..462321c1aeea 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/s390/Debugging390.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/s390/Debugging390.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/s390/Debugging390.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/s390/Debugging390.txt</a></div><div class='hunk'>@@ -41,7 +41,6 @@ ldd</div><div class='ctx'> Debugging modules</div><div class='ctx'> The proc file system</div><div class='ctx'> Starting points for debugging scripting languages etc.</div><div class='del'>-Dumptool &amp; Lcrash</div><div class='ctx'> SysRq</div><div class='ctx'> References</div><div class='ctx'> Special Thanks</div><div class='hunk'>@@ -2455,39 +2454,6 @@ jdb &lt;filename&gt; another fully interactive gdb style debugger.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-Dumptool &amp; Lcrash ( lkcd )</div><div class='del'>-==========================</div><div class='del'>-Michael Holzheu &amp; others here at IBM have a fairly mature port of </div><div class='del'>-SGI's lcrash tool which allows one to look at kernel structures in a</div><div class='del'>-running kernel.</div><div class='del'>-</div><div class='del'>-It also complements a tool called dumptool which dumps all the kernel's</div><div class='del'>-memory pages &amp; registers to either a tape or a disk.</div><div class='del'>-This can be used by tech support or an ambitious end user do</div><div class='del'>-post mortem debugging of a machine like gdb core dumps.</div><div class='del'>-</div><div class='del'>-Going into how to use this tool in detail will be explained</div><div class='del'>-in other documentation supplied by IBM with the patches &amp; the </div><div class='del'>-lcrash homepage http://oss.sgi.com/projects/lkcd/ &amp; the lcrash manpage.</div><div class='del'>-</div><div class='del'>-How they work</div><div class='del'>--------------</div><div class='del'>-Lcrash is a perfectly normal program,however, it requires 2 </div><div class='del'>-additional files, Kerntypes which is built using a patch to the </div><div class='del'>-linux kernel sources in the linux root directory &amp; the System.map.</div><div class='del'>-</div><div class='del'>-Kerntypes is an objectfile whose sole purpose in life</div><div class='del'>-is to provide stabs debug info to lcrash, to do this</div><div class='del'>-Kerntypes is built from kerntypes.c which just includes the most commonly</div><div class='del'>-referenced header files used when debugging, lcrash can then read the</div><div class='del'>-.stabs section of this file.</div><div class='del'>-</div><div class='del'>-Debugging a live system it uses /dev/mem</div><div class='del'>-alternatively for post mortem debugging it uses the data </div><div class='del'>-collected by dumptool.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> SysRq</div><div class='ctx'> =====</div><div class='ctx'> This is now supported by linux for s/390 &amp; z/Architecture.</div><div class='head'>diff --git a/Documentation/scsi/53c700.txt b/Documentation/scsi/53c700.txt<br/>index 0da681d497a2..e31aceb6df15 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/scsi/53c700.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/scsi/53c700.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/scsi/53c700.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/scsi/53c700.txt</a></div><div class='hunk'>@@ -16,32 +16,13 @@ fill in to get the driver working.</div><div class='ctx'> Compile Time Flags</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='del'>-The driver may be either io mapped or memory mapped.  This is</div><div class='del'>-selectable by configuration flags:</div><div class='del'>-</div><div class='del'>-CONFIG_53C700_MEM_MAPPED</div><div class='del'>-</div><div class='del'>-define if the driver is memory mapped.</div><div class='del'>-</div><div class='del'>-CONFIG_53C700_IO_MAPPED</div><div class='del'>-</div><div class='del'>-define if the driver is to be io mapped.</div><div class='del'>-</div><div class='del'>-One or other of the above flags *must* be defined.</div><div class='del'>-</div><div class='del'>-Other flags are:</div><div class='add'>+A compile time flag is:</div><div class='ctx'> </div><div class='ctx'> CONFIG_53C700_LE_ON_BE</div><div class='ctx'> </div><div class='ctx'> define if the chipset must be supported in little endian mode on a big</div><div class='ctx'> endian architecture (used for the 700 on parisc).</div><div class='ctx'> </div><div class='del'>-CONFIG_53C700_USE_CONSISTENT</div><div class='del'>-</div><div class='del'>-allocate consistent memory (should only be used if your architecture</div><div class='del'>-has a mixture of consistent and inconsistent memory).  Fully</div><div class='del'>-consistent or fully inconsistent architectures should not define this.</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> Using the Chip Core Driver</div><div class='ctx'> ==========================</div><div class='head'>diff --git a/Documentation/scsi/ChangeLog.megaraid_sas b/Documentation/scsi/ChangeLog.megaraid_sas<br/>index 64adb98b181c..57566bacb4c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/scsi/ChangeLog.megaraid_sas?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/scsi/ChangeLog.megaraid_sas</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/scsi/ChangeLog.megaraid_sas?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/scsi/ChangeLog.megaraid_sas</a></div><div class='hunk'>@@ -1,3 +1,13 @@</div><div class='add'>+Release Date    : Fri. Jan 6, 2012 17:00:00 PST 2010 -</div><div class='add'>+			(emaild-id:megaraidlinux@lsi.com)</div><div class='add'>+			Adam Radford</div><div class='add'>+Current Version : 00.00.06.14-rc1</div><div class='add'>+Old Version     : 00.00.06.12-rc1</div><div class='add'>+    1. Fix reglockFlags for degraded raid5/6 for MR 9360/9380.</div><div class='add'>+    2. Mask off flags in ioctl path to prevent memory scribble with older</div><div class='add'>+       MegaCLI versions.</div><div class='add'>+    3. Remove poll_mode_io module paramater, sysfs node, and associated code.</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='ctx'> Release Date    : Wed. Oct 5, 2011 17:00:00 PST 2010 -</div><div class='ctx'> 			(emaild-id:megaraidlinux@lsi.com)</div><div class='ctx'> 			Adam Radford</div><div class='head'>diff --git a/Documentation/scsi/LICENSE.qla4xxx b/Documentation/scsi/LICENSE.qla4xxx<br/>index 494980e40491..ab899591ecb7 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/scsi/LICENSE.qla4xxx?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/scsi/LICENSE.qla4xxx</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/scsi/LICENSE.qla4xxx?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/scsi/LICENSE.qla4xxx</a></div><div class='hunk'>@@ -1,32 +1,11 @@</div><div class='ctx'> Copyright (c) 2003-2011 QLogic Corporation</div><div class='del'>-QLogic Linux iSCSI HBA Driver</div><div class='add'>+QLogic Linux iSCSI Driver</div><div class='ctx'> </div><div class='ctx'> This program includes a device driver for Linux 3.x.</div><div class='ctx'> You may modify and redistribute the device driver code under the</div><div class='ctx'> GNU General Public License (a copy of which is attached hereto as</div><div class='ctx'> Exhibit A) published by the Free Software Foundation (version 2).</div><div class='ctx'> </div><div class='del'>-REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE,</div><div class='del'>-THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "AS IS'' AND ANY</div><div class='del'>-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR</div><div class='del'>-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,</div><div class='del'>-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED</div><div class='del'>-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,</div><div class='del'>-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</div><div class='del'>-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY</div><div class='del'>-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE</div><div class='del'>-POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>-</div><div class='del'>-USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT</div><div class='del'>-CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR</div><div class='del'>-OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT,</div><div class='del'>-TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN</div><div class='del'>-ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN</div><div class='del'>-COMBINATION WITH THIS PROGRAM.</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> EXHIBIT A</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/security/00-INDEX b/Documentation/security/00-INDEX<br/>index 19bc49439cac..99b85d39751c 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/security/00-INDEX?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/security/00-INDEX</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/security/00-INDEX?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/security/00-INDEX</a></div><div class='hunk'>@@ -1,5 +1,7 @@</div><div class='ctx'> 00-INDEX</div><div class='ctx'> 	- this file.</div><div class='add'>+LSM.txt</div><div class='add'>+	- description of the Linux Security Module framework.</div><div class='ctx'> SELinux.txt</div><div class='ctx'> 	- how to get started with the SELinux security enhancement.</div><div class='ctx'> Smack.txt</div><div class='head'>diff --git a/Documentation/security/LSM.txt b/Documentation/security/LSM.txt<br/>new file mode 100644<br/>index 000000000000..c335a763a2ed<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/security/LSM.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/security/LSM.txt</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+Linux Security Module framework</div><div class='add'>+-------------------------------</div><div class='add'>+</div><div class='add'>+The Linux Security Module (LSM) framework provides a mechanism for</div><div class='add'>+various security checks to be hooked by new kernel extensions. The name</div><div class='add'>+"module" is a bit of a misnomer since these extensions are not actually</div><div class='add'>+loadable kernel modules. Instead, they are selectable at build-time via</div><div class='add'>+CONFIG_DEFAULT_SECURITY and can be overridden at boot-time via the</div><div class='add'>+"security=..." kernel command line argument, in the case where multiple</div><div class='add'>+LSMs were built into a given kernel.</div><div class='add'>+</div><div class='add'>+The primary users of the LSM interface are Mandatory Access Control</div><div class='add'>+(MAC) extensions which provide a comprehensive security policy. Examples</div><div class='add'>+include SELinux, Smack, Tomoyo, and AppArmor. In addition to the larger</div><div class='add'>+MAC extensions, other extensions can be built using the LSM to provide</div><div class='add'>+specific changes to system operation when these tweaks are not available</div><div class='add'>+in the core functionality of Linux itself.</div><div class='add'>+</div><div class='add'>+Without a specific LSM built into the kernel, the default LSM will be the</div><div class='add'>+Linux capabilities system. Most LSMs choose to extend the capabilities</div><div class='add'>+system, building their checks on top of the defined capability hooks.</div><div class='add'>+For more details on capabilities, see capabilities(7) in the Linux</div><div class='add'>+man-pages project.</div><div class='add'>+</div><div class='add'>+Based on http://kerneltrap.org/Linux/Documenting_Security_Module_Intent,</div><div class='add'>+a new LSM is accepted into the kernel when its intent (a description of</div><div class='add'>+what it tries to protect against and in what cases one would expect to</div><div class='add'>+use it) has been appropriately documented in Documentation/security/.</div><div class='add'>+This allows an LSM's code to be easily compared to its goals, and so</div><div class='add'>+that end users and distros can make a more informed decision about which</div><div class='add'>+LSMs suit their requirements.</div><div class='add'>+</div><div class='add'>+For extensive documentation on the available LSM hook interfaces, please</div><div class='add'>+see include/linux/security.h.</div><div class='head'>diff --git a/Documentation/security/credentials.txt b/Documentation/security/credentials.txt<br/>index fc0366cbd7ce..86257052e31a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/security/credentials.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/security/credentials.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/security/credentials.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/security/credentials.txt</a></div><div class='hunk'>@@ -221,10 +221,10 @@ The Linux kernel supports the following types of credentials:</div><div class='ctx'>  (5) LSM</div><div class='ctx'> </div><div class='ctx'>      The Linux Security Module allows extra controls to be placed over the</div><div class='del'>-     operations that a task may do.  Currently Linux supports two main</div><div class='del'>-     alternate LSM options: SELinux and Smack.</div><div class='add'>+     operations that a task may do.  Currently Linux supports several LSM</div><div class='add'>+     options.</div><div class='ctx'> </div><div class='del'>-     Both work by labelling the objects in a system and then applying sets of</div><div class='add'>+     Some work by labelling the objects in a system and then applying sets of</div><div class='ctx'>      rules (policies) that say what operations a task with one label may do to</div><div class='ctx'>      an object with another label.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/serial/driver b/Documentation/serial/driver<br/>index 77ba0afbe4db..0a25a9191864 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/serial/driver?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/serial/driver</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/serial/driver?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/serial/driver</a></div><div class='hunk'>@@ -101,7 +101,7 @@ hardware.</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='del'>-		- TIOCM_DCD	state of DCD signal</div><div class='add'>+		- 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='head'>diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt<br/>index edad99abec21..c8c54544abc5 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/sound/alsa/HD-Audio-Models.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/sound/alsa/HD-Audio-Models.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/sound/alsa/HD-Audio-Models.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/sound/alsa/HD-Audio-Models.txt</a></div><div class='hunk'>@@ -42,19 +42,7 @@ ALC260</div><div class='ctx'> </div><div class='ctx'> ALC262</div><div class='ctx'> ======</div><div class='del'>-  fujitsu	Fujitsu Laptop</div><div class='del'>-  benq		Benq ED8</div><div class='del'>-  benq-t31	Benq T31</div><div class='del'>-  hippo		Hippo (ATI) with jack detection, Sony UX-90s</div><div class='del'>-  hippo_1	Hippo (Benq) with jack detection</div><div class='del'>-  toshiba-s06	Toshiba S06</div><div class='del'>-  toshiba-rx1	Toshiba RX1</div><div class='del'>-  tyan		Tyan Thunder n6650W (S2915-E)</div><div class='del'>-  ultra		Samsung Q1 Ultra Vista model</div><div class='del'>-  lenovo-3000	Lenovo 3000 y410</div><div class='del'>-  nec		NEC Versa S9100</div><div class='del'>-  basic		fixed pin assignment w/o SPDIF</div><div class='del'>-  auto		auto-config reading BIOS (default)</div><div class='add'>+  N/A</div><div class='ctx'> </div><div class='ctx'> ALC267/268</div><div class='ctx'> ==========</div><div class='hunk'>@@ -350,7 +338,6 @@ STAC92HD83*</div><div class='ctx'>   mic-ref	Reference board with power management for ports</div><div class='ctx'>   dell-s14	Dell laptop</div><div class='ctx'>   dell-vostro-3500	Dell Vostro 3500 laptop</div><div class='del'>-  hp		HP laptops with (inverted) mute-LED</div><div class='ctx'>   hp-dv7-4000	HP dv-7 4000</div><div class='ctx'>   auto		BIOS setup (default)</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/sound/alsa/compress_offload.txt b/Documentation/sound/alsa/compress_offload.txt<br/>new file mode 100644<br/>index 000000000000..c83a835350f0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/sound/alsa/compress_offload.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/sound/alsa/compress_offload.txt</a></div><div class='hunk'>@@ -0,0 +1,188 @@</div><div class='add'>+		compress_offload.txt</div><div class='add'>+		=====================</div><div class='add'>+	Pierre-Louis.Bossart &lt;pierre-louis.bossart@linux.intel.com&gt;</div><div class='add'>+		Vinod Koul &lt;vinod.koul@linux.intel.com&gt;</div><div class='add'>+</div><div class='add'>+Overview</div><div class='add'>+</div><div class='add'>+Since its early days, the ALSA API was defined with PCM support or</div><div class='add'>+constant bitrates payloads such as IEC61937 in mind. Arguments and</div><div class='add'>+returned values in frames are the norm, making it a challenge to</div><div class='add'>+extend the existing API to compressed data streams.</div><div class='add'>+</div><div class='add'>+In recent years, audio digital signal processors (DSP) were integrated</div><div class='add'>+in system-on-chip designs, and DSPs are also integrated in audio</div><div class='add'>+codecs. Processing compressed data on such DSPs results in a dramatic</div><div class='add'>+reduction of power consumption compared to host-based</div><div class='add'>+processing. Support for such hardware has not been very good in Linux,</div><div class='add'>+mostly because of a lack of a generic API available in the mainline</div><div class='add'>+kernel.</div><div class='add'>+</div><div class='add'>+Rather than requiring a compability break with an API change of the</div><div class='add'>+ALSA PCM interface, a new 'Compressed Data' API is introduced to</div><div class='add'>+provide a control and data-streaming interface for audio DSPs.</div><div class='add'>+</div><div class='add'>+The design of this API was inspired by the 2-year experience with the</div><div class='add'>+Intel Moorestown SOC, with many corrections required to upstream the</div><div class='add'>+API in the mainline kernel instead of the staging tree and make it</div><div class='add'>+usable by others.</div><div class='add'>+</div><div class='add'>+Requirements</div><div class='add'>+</div><div class='add'>+The main requirements are:</div><div class='add'>+</div><div class='add'>+- separation between byte counts and time. Compressed formats may have</div><div class='add'>+  a header per file, per frame, or no header at all. The payload size</div><div class='add'>+  may vary from frame-to-frame. As a result, it is not possible to</div><div class='add'>+  estimate reliably the duration of audio buffers when handling</div><div class='add'>+  compressed data. Dedicated mechanisms are required to allow for</div><div class='add'>+  reliable audio-video synchronization, which requires precise</div><div class='add'>+  reporting of the number of samples rendered at any given time.</div><div class='add'>+</div><div class='add'>+- Handling of multiple formats. PCM data only requires a specification</div><div class='add'>+  of the sampling rate, number of channels and bits per sample. In</div><div class='add'>+  contrast, compressed data comes in a variety of formats. Audio DSPs</div><div class='add'>+  may also provide support for a limited number of audio encoders and</div><div class='add'>+  decoders embedded in firmware, or may support more choices through</div><div class='add'>+  dynamic download of libraries.</div><div class='add'>+</div><div class='add'>+- Focus on main formats. This API provides support for the most</div><div class='add'>+  popular formats used for audio and video capture and playback. It is</div><div class='add'>+  likely that as audio compression technology advances, new formats</div><div class='add'>+  will be added.</div><div class='add'>+</div><div class='add'>+- Handling of multiple configurations. Even for a given format like</div><div class='add'>+  AAC, some implementations may support AAC multichannel but HE-AAC</div><div class='add'>+  stereo. Likewise WMA10 level M3 may require too much memory and cpu</div><div class='add'>+  cycles. The new API needs to provide a generic way of listing these</div><div class='add'>+  formats.</div><div class='add'>+</div><div class='add'>+- Rendering/Grabbing only. This API does not provide any means of</div><div class='add'>+  hardware acceleration, where PCM samples are provided back to</div><div class='add'>+  user-space for additional processing. This API focuses instead on</div><div class='add'>+  streaming compressed data to a DSP, with the assumption that the</div><div class='add'>+  decoded samples are routed to a physical output or logical back-end.</div><div class='add'>+</div><div class='add'>+ - Complexity hiding. Existing user-space multimedia frameworks all</div><div class='add'>+  have existing enums/structures for each compressed format. This new</div><div class='add'>+  API assumes the existence of a platform-specific compatibility layer</div><div class='add'>+  to expose, translate and make use of the capabilities of the audio</div><div class='add'>+  DSP, eg. Android HAL or PulseAudio sinks. By construction, regular</div><div class='add'>+  applications are not supposed to make use of this API.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Design</div><div class='add'>+</div><div class='add'>+The new API shares a number of concepts with with the PCM API for flow</div><div class='add'>+control. Start, pause, resume, drain and stop commands have the same</div><div class='add'>+semantics no matter what the content is.</div><div class='add'>+</div><div class='add'>+The concept of memory ring buffer divided in a set of fragments is</div><div class='add'>+borrowed from the ALSA PCM API. However, only sizes in bytes can be</div><div class='add'>+specified.</div><div class='add'>+</div><div class='add'>+Seeks/trick modes are assumed to be handled by the host.</div><div class='add'>+</div><div class='add'>+The notion of rewinds/forwards is not supported. Data committed to the</div><div class='add'>+ring buffer cannot be invalidated, except when dropping all buffers.</div><div class='add'>+</div><div class='add'>+The Compressed Data API does not make any assumptions on how the data</div><div class='add'>+is transmitted to the audio DSP. DMA transfers from main memory to an</div><div class='add'>+embedded audio cluster or to a SPI interface for external DSPs are</div><div class='add'>+possible. As in the ALSA PCM case, a core set of routines is exposed;</div><div class='add'>+each driver implementer will have to write support for a set of</div><div class='add'>+mandatory routines and possibly make use of optional ones.</div><div class='add'>+</div><div class='add'>+The main additions are</div><div class='add'>+</div><div class='add'>+- get_caps</div><div class='add'>+This routine returns the list of audio formats supported. Querying the</div><div class='add'>+codecs on a capture stream will return encoders, decoders will be</div><div class='add'>+listed for playback streams.</div><div class='add'>+</div><div class='add'>+- get_codec_caps For each codec, this routine returns a list of</div><div class='add'>+capabilities. The intent is to make sure all the capabilities</div><div class='add'>+correspond to valid settings, and to minimize the risks of</div><div class='add'>+configuration failures. For example, for a complex codec such as AAC,</div><div class='add'>+the number of channels supported may depend on a specific profile. If</div><div class='add'>+the capabilities were exposed with a single descriptor, it may happen</div><div class='add'>+that a specific combination of profiles/channels/formats may not be</div><div class='add'>+supported. Likewise, embedded DSPs have limited memory and cpu cycles,</div><div class='add'>+it is likely that some implementations make the list of capabilities</div><div class='add'>+dynamic and dependent on existing workloads. In addition to codec</div><div class='add'>+settings, this routine returns the minimum buffer size handled by the</div><div class='add'>+implementation. This information can be a function of the DMA buffer</div><div class='add'>+sizes, the number of bytes required to synchronize, etc, and can be</div><div class='add'>+used by userspace to define how much needs to be written in the ring</div><div class='add'>+buffer before playback can start.</div><div class='add'>+</div><div class='add'>+- set_params</div><div class='add'>+This routine sets the configuration chosen for a specific codec. The</div><div class='add'>+most important field in the parameters is the codec type; in most</div><div class='add'>+cases decoders will ignore other fields, while encoders will strictly</div><div class='add'>+comply to the settings</div><div class='add'>+</div><div class='add'>+- get_params</div><div class='add'>+This routines returns the actual settings used by the DSP. Changes to</div><div class='add'>+the settings should remain the exception.</div><div class='add'>+</div><div class='add'>+- get_timestamp</div><div class='add'>+The timestamp becomes a multiple field structure. It lists the number</div><div class='add'>+of bytes transferred, the number of samples processed and the number</div><div class='add'>+of samples rendered/grabbed. All these values can be used to determine</div><div class='add'>+the avarage bitrate, figure out if the ring buffer needs to be</div><div class='add'>+refilled or the delay due to decoding/encoding/io on the DSP.</div><div class='add'>+</div><div class='add'>+Note that the list of codecs/profiles/modes was derived from the</div><div class='add'>+OpenMAX AL specification instead of reinventing the wheel.</div><div class='add'>+Modifications include:</div><div class='add'>+- Addition of FLAC and IEC formats</div><div class='add'>+- Merge of encoder/decoder capabilities</div><div class='add'>+- Profiles/modes listed as bitmasks to make descriptors more compact</div><div class='add'>+- Addition of set_params for decoders (missing in OpenMAX AL)</div><div class='add'>+- Addition of AMR/AMR-WB encoding modes (missing in OpenMAX AL)</div><div class='add'>+- Addition of format information for WMA</div><div class='add'>+- Addition of encoding options when required (derived from OpenMAX IL)</div><div class='add'>+- Addition of rateControlSupported (missing in OpenMAX AL)</div><div class='add'>+</div><div class='add'>+Not supported:</div><div class='add'>+</div><div class='add'>+- Support for VoIP/circuit-switched calls is not the target of this</div><div class='add'>+  API. Support for dynamic bit-rate changes would require a tight</div><div class='add'>+  coupling between the DSP and the host stack, limiting power savings.</div><div class='add'>+</div><div class='add'>+- Packet-loss concealment is not supported. This would require an</div><div class='add'>+  additional interface to let the decoder synthesize data when frames</div><div class='add'>+  are lost during transmission. This may be added in the future.</div><div class='add'>+</div><div class='add'>+- Volume control/routing is not handled by this API. Devices exposing a</div><div class='add'>+  compressed data interface will be considered as regular ALSA devices;</div><div class='add'>+  volume changes and routing information will be provided with regular</div><div class='add'>+  ALSA kcontrols.</div><div class='add'>+</div><div class='add'>+- Embedded audio effects. Such effects should be enabled in the same</div><div class='add'>+  manner, no matter if the input was PCM or compressed.</div><div class='add'>+</div><div class='add'>+- multichannel IEC encoding. Unclear if this is required.</div><div class='add'>+</div><div class='add'>+- Encoding/decoding acceleration is not supported as mentioned</div><div class='add'>+  above. It is possible to route the output of a decoder to a capture</div><div class='add'>+  stream, or even implement transcoding capabilities. This routing</div><div class='add'>+  would be enabled with ALSA kcontrols.</div><div class='add'>+</div><div class='add'>+- Audio policy/resource management. This API does not provide any</div><div class='add'>+  hooks to query the utilization of the audio DSP, nor any premption</div><div class='add'>+  mechanisms.</div><div class='add'>+</div><div class='add'>+- No notion of underun/overrun. Since the bytes written are compressed</div><div class='add'>+  in nature and data written/read doesn't translate directly to</div><div class='add'>+  rendered output in time, this does not deal with underrun/overun and</div><div class='add'>+  maybe dealt in user-library</div><div class='add'>+</div><div class='add'>+Credits:</div><div class='add'>+- Mark Brown and Liam Girdwood for discussions on the need for this API</div><div class='add'>+- Harsha Priya for her work on intel_sst compressed API</div><div class='add'>+- Rakesh Ughreja for valuable feedback</div><div class='add'>+- Sing Nallasellan, Sikkandar Madar and Prasanna Samaga for</div><div class='add'>+  demonstrating and quantifying the benefits of audio offload on a</div><div class='add'>+  real platform.</div><div class='head'>diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt<br/>index 1f2463671a1a..8c20fbd8b42d 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/sysctl/kernel.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/sysctl/kernel.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/sysctl/kernel.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/sysctl/kernel.txt</a></div><div class='hunk'>@@ -49,6 +49,7 @@ show up in /proc/sys/kernel:</div><div class='ctx'> - panic</div><div class='ctx'> - panic_on_oops</div><div class='ctx'> - panic_on_unrecovered_nmi</div><div class='add'>+- panic_on_stackoverflow</div><div class='ctx'> - pid_max</div><div class='ctx'> - powersave-nap               [ PPC only ]</div><div class='ctx'> - printk</div><div class='hunk'>@@ -393,6 +394,19 @@ Controls the kernel's behaviour when an oops or BUG is encountered.</div><div class='ctx'> </div><div class='ctx'> ==============================================================</div><div class='ctx'> </div><div class='add'>+panic_on_stackoverflow:</div><div class='add'>+</div><div class='add'>+Controls the kernel's behavior when detecting the overflows of</div><div class='add'>+kernel, IRQ and exception stacks except a user stack.</div><div class='add'>+This file shows up if CONFIG_DEBUG_STACKOVERFLOW is enabled.</div><div class='add'>+</div><div class='add'>+0: try to continue operation.</div><div class='add'>+</div><div class='add'>+1: panic immediately.</div><div class='add'>+</div><div class='add'>+==============================================================</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> pid_max:</div><div class='ctx'> </div><div class='ctx'> PID allocation wrap value.  When the kernel's next PID value</div><div class='hunk'>@@ -401,6 +415,14 @@ PIDs of value pid_max or larger are not allocated.</div><div class='ctx'> </div><div class='ctx'> ==============================================================</div><div class='ctx'> </div><div class='add'>+ns_last_pid:</div><div class='add'>+</div><div class='add'>+The last pid allocated in the current (the one task using this sysctl</div><div class='add'>+lives in) pid namespace. When selecting a pid for a next task on fork</div><div class='add'>+kernel tries to allocate a number starting from this one.</div><div class='add'>+</div><div class='add'>+==============================================================</div><div class='add'>+</div><div class='ctx'> powersave-nap: (PPC only)</div><div class='ctx'> </div><div class='ctx'> If set, Linux-PPC will use the 'nap' mode of powersaving,</div><div class='head'>diff --git a/Documentation/target/tcm_mod_builder.py b/Documentation/target/tcm_mod_builder.py<br/>index 7ef9b843d529..6e21b8b52638 100755<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/target/tcm_mod_builder.py?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/target/tcm_mod_builder.py</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/target/tcm_mod_builder.py?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/target/tcm_mod_builder.py</a></div><div class='hunk'>@@ -230,14 +230,9 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):</div><div class='ctx'> 	buf += "#include &lt;linux/ctype.h&gt;\n"</div><div class='ctx'> 	buf += "#include &lt;asm/unaligned.h&gt;\n\n"</div><div class='ctx'> 	buf += "#include &lt;target/target_core_base.h&gt;\n"</div><div class='del'>-	buf += "#include &lt;target/target_core_transport.h&gt;\n"</div><div class='del'>-	buf += "#include &lt;target/target_core_fabric_ops.h&gt;\n"</div><div class='add'>+	buf += "#include &lt;target/target_core_fabric.h&gt;\n"</div><div class='ctx'> 	buf += "#include &lt;target/target_core_fabric_configfs.h&gt;\n"</div><div class='del'>-	buf += "#include &lt;target/target_core_fabric_lib.h&gt;\n"</div><div class='del'>-	buf += "#include &lt;target/target_core_device.h&gt;\n"</div><div class='del'>-	buf += "#include &lt;target/target_core_tpg.h&gt;\n"</div><div class='ctx'> 	buf += "#include &lt;target/target_core_configfs.h&gt;\n"</div><div class='del'>-	buf += "#include &lt;target/target_core_base.h&gt;\n"</div><div class='ctx'> 	buf += "#include &lt;target/configfs_macros.h&gt;\n\n"</div><div class='ctx'> 	buf += "#include \"" + fabric_mod_name + "_base.h\"\n"</div><div class='ctx'> 	buf += "#include \"" + fabric_mod_name + "_fabric.h\"\n\n"</div><div class='hunk'>@@ -260,7 +255,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):</div><div class='ctx'> 	buf += "	/* " + fabric_mod_name + "_parse_wwn(name, &amp;wwpn, 1) &lt; 0)\n"</div><div class='ctx'> 	buf += "		return ERR_PTR(-EINVAL); */\n"</div><div class='ctx'> 	buf += "	se_nacl_new = " + fabric_mod_name + "_alloc_fabric_acl(se_tpg);\n"</div><div class='del'>-	buf += "	if (!(se_nacl_new))\n"</div><div class='add'>+	buf += "	if (!se_nacl_new)\n"</div><div class='ctx'> 	buf += "		return ERR_PTR(-ENOMEM);\n"</div><div class='ctx'> 	buf += "//#warning FIXME: Hardcoded nexus depth in " + fabric_mod_name + "_make_nodeacl()\n"</div><div class='ctx'> 	buf += "	nexus_depth = 1;\n"</div><div class='hunk'>@@ -308,7 +303,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):</div><div class='ctx'> 	buf += "	if (strict_strtoul(name + 5, 10, &amp;tpgt) || tpgt &gt; UINT_MAX)\n"</div><div class='ctx'> 	buf += "		return ERR_PTR(-EINVAL);\n\n"</div><div class='ctx'> 	buf += "	tpg = kzalloc(sizeof(struct " + fabric_mod_name + "_tpg), GFP_KERNEL);\n"</div><div class='del'>-	buf += "	if (!(tpg)) {\n"</div><div class='add'>+	buf += "	if (!tpg) {\n"</div><div class='ctx'> 	buf += "		printk(KERN_ERR \"Unable to allocate struct " + fabric_mod_name + "_tpg\");\n"</div><div class='ctx'> 	buf += "		return ERR_PTR(-ENOMEM);\n"</div><div class='ctx'> 	buf += "	}\n"</div><div class='hunk'>@@ -344,7 +339,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):</div><div class='ctx'> 	buf += "	/* if (" + fabric_mod_name + "_parse_wwn(name, &amp;wwpn, 1) &lt; 0)\n"</div><div class='ctx'> 	buf += "		return ERR_PTR(-EINVAL); */\n\n"</div><div class='ctx'> 	buf += "	" + fabric_mod_port + " = kzalloc(sizeof(struct " + fabric_mod_name + "_" + fabric_mod_port + "), GFP_KERNEL);\n"</div><div class='del'>-	buf += "	if (!(" + fabric_mod_port + ")) {\n"</div><div class='add'>+	buf += "	if (!" + fabric_mod_port + ") {\n"</div><div class='ctx'> 	buf += "		printk(KERN_ERR \"Unable to allocate struct " + fabric_mod_name + "_" + fabric_mod_port + "\");\n"</div><div class='ctx'> 	buf += "		return ERR_PTR(-ENOMEM);\n"</div><div class='ctx'> 	buf += "	}\n"</div><div class='hunk'>@@ -352,7 +347,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):</div><div class='ctx'> 	if proto_ident == "FC" or proto_ident == "SAS":</div><div class='ctx'> 		buf += "	" + fabric_mod_port + "-&gt;" + fabric_mod_port + "_wwpn = wwpn;\n"</div><div class='ctx'> </div><div class='del'>-	buf += "	/* " + fabric_mod_name + "_format_wwn(&amp;" + fabric_mod_port + "-&gt;" + fabric_mod_port + "_name[0], " + fabric_mod_name.upper() + "__NAMELEN, wwpn); */\n\n"</div><div class='add'>+	buf += "	/* " + fabric_mod_name + "_format_wwn(&amp;" + fabric_mod_port + "-&gt;" + fabric_mod_port + "_name[0], " + fabric_mod_name.upper() + "_NAMELEN, wwpn); */\n\n"</div><div class='ctx'> 	buf += "	return &amp;" + fabric_mod_port + "-&gt;" + fabric_mod_port + "_wwn;\n"</div><div class='ctx'> 	buf += "}\n\n"</div><div class='ctx'> 	buf += "static void " + fabric_mod_name + "_drop_" + fabric_mod_port + "(struct se_wwn *wwn)\n"</div><div class='hunk'>@@ -391,8 +386,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):</div><div class='ctx'> 	buf += "	.tpg_alloc_fabric_acl		= " + fabric_mod_name + "_alloc_fabric_acl,\n"</div><div class='ctx'> 	buf += "	.tpg_release_fabric_acl		= " + fabric_mod_name + "_release_fabric_acl,\n"</div><div class='ctx'> 	buf += "	.tpg_get_inst_index		= " + fabric_mod_name + "_tpg_get_inst_index,\n"</div><div class='del'>-	buf += "	.release_cmd_to_pool		= " + fabric_mod_name + "_release_cmd,\n"</div><div class='del'>-	buf += "	.release_cmd_direct		= " + fabric_mod_name + "_release_cmd,\n"</div><div class='add'>+	buf += "	.release_cmd			= " + fabric_mod_name + "_release_cmd,\n"</div><div class='ctx'> 	buf += "	.shutdown_session		= " + fabric_mod_name + "_shutdown_session,\n"</div><div class='ctx'> 	buf += "	.close_session			= " + fabric_mod_name + "_close_session,\n"</div><div class='ctx'> 	buf += "	.stop_session			= " + fabric_mod_name + "_stop_session,\n"</div><div class='hunk'>@@ -405,14 +399,12 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):</div><div class='ctx'> 	buf += "	.set_default_node_attributes	= " + fabric_mod_name + "_set_default_node_attrs,\n"</div><div class='ctx'> 	buf += "	.get_task_tag			= " + fabric_mod_name + "_get_task_tag,\n"</div><div class='ctx'> 	buf += "	.get_cmd_state			= " + fabric_mod_name + "_get_cmd_state,\n"</div><div class='del'>-	buf += "	.new_cmd_failure		= " + fabric_mod_name + "_new_cmd_failure,\n"</div><div class='ctx'> 	buf += "	.queue_data_in			= " + fabric_mod_name + "_queue_data_in,\n"</div><div class='ctx'> 	buf += "	.queue_status			= " + fabric_mod_name + "_queue_status,\n"</div><div class='ctx'> 	buf += "	.queue_tm_rsp			= " + fabric_mod_name + "_queue_tm_rsp,\n"</div><div class='ctx'> 	buf += "	.get_fabric_sense_len		= " + fabric_mod_name + "_get_fabric_sense_len,\n"</div><div class='ctx'> 	buf += "	.set_fabric_sense_len		= " + fabric_mod_name + "_set_fabric_sense_len,\n"</div><div class='ctx'> 	buf += "	.is_state_remove		= " + fabric_mod_name + "_is_state_remove,\n"</div><div class='del'>-	buf += "	.pack_lun			= " + fabric_mod_name + "_pack_lun,\n"</div><div class='ctx'> 	buf += "	/*\n"</div><div class='ctx'> 	buf += "	 * Setup function pointers for generic logic in target_core_fabric_configfs.c\n"</div><div class='ctx'> 	buf += "	 */\n"</div><div class='hunk'>@@ -439,9 +431,9 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):</div><div class='ctx'> 	buf += "	 * Register the top level struct config_item_type with TCM core\n"</div><div class='ctx'> 	buf += "	 */\n"</div><div class='ctx'> 	buf += "	fabric = target_fabric_configfs_init(THIS_MODULE, \"" + fabric_mod_name[4:] + "\");\n"</div><div class='del'>-	buf += "	if (!(fabric)) {\n"</div><div class='add'>+	buf += "	if (IS_ERR(fabric)) {\n"</div><div class='ctx'> 	buf += "		printk(KERN_ERR \"target_fabric_configfs_init() failed\\n\");\n"</div><div class='del'>-	buf += "		return -ENOMEM;\n"</div><div class='add'>+	buf += "		return PTR_ERR(fabric);\n"</div><div class='ctx'> 	buf += "	}\n"</div><div class='ctx'> 	buf += "	/*\n"</div><div class='ctx'> 	buf += "	 * Setup fabric-&gt;tf_ops from our local " + fabric_mod_name + "_ops\n"</div><div class='hunk'>@@ -475,9 +467,9 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):</div><div class='ctx'> 	buf += "	printk(KERN_INFO \"" +  fabric_mod_name.upper() + "[0] - Set fabric -&gt; " + fabric_mod_name + "_fabric_configfs\\n\");\n"</div><div class='ctx'> 	buf += "	return 0;\n"</div><div class='ctx'> 	buf += "};\n\n"</div><div class='del'>-	buf += "static void " + fabric_mod_name + "_deregister_configfs(void)\n"</div><div class='add'>+	buf += "static void __exit " + fabric_mod_name + "_deregister_configfs(void)\n"</div><div class='ctx'> 	buf += "{\n"</div><div class='del'>-	buf += "	if (!(" + fabric_mod_name + "_fabric_configfs))\n"</div><div class='add'>+	buf += "	if (!" + fabric_mod_name + "_fabric_configfs)\n"</div><div class='ctx'> 	buf += "		return;\n\n"</div><div class='ctx'> 	buf += "	target_fabric_configfs_deregister(" + fabric_mod_name + "_fabric_configfs);\n"</div><div class='ctx'> 	buf += "	" + fabric_mod_name + "_fabric_configfs = NULL;\n"</div><div class='hunk'>@@ -492,17 +484,15 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):</div><div class='ctx'> 	buf += "		return ret;\n\n"</div><div class='ctx'> 	buf += "	return 0;\n"</div><div class='ctx'> 	buf += "};\n\n"</div><div class='del'>-	buf += "static void " + fabric_mod_name + "_exit(void)\n"</div><div class='add'>+	buf += "static void __exit " + fabric_mod_name + "_exit(void)\n"</div><div class='ctx'> 	buf += "{\n"</div><div class='ctx'> 	buf += "	" + fabric_mod_name + "_deregister_configfs();\n"</div><div class='ctx'> 	buf += "};\n\n"</div><div class='ctx'> </div><div class='del'>-	buf += "#ifdef MODULE\n"</div><div class='ctx'> 	buf += "MODULE_DESCRIPTION(\"" + fabric_mod_name.upper() + " series fabric driver\");\n"</div><div class='ctx'> 	buf += "MODULE_LICENSE(\"GPL\");\n"</div><div class='ctx'> 	buf += "module_init(" + fabric_mod_name + "_init);\n"</div><div class='ctx'> 	buf += "module_exit(" + fabric_mod_name + "_exit);\n"</div><div class='del'>-	buf += "#endif\n"</div><div class='ctx'> </div><div class='ctx'> 	ret = p.write(buf)</div><div class='ctx'> 	if ret:</div><div class='hunk'>@@ -514,7 +504,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):</div><div class='ctx'> </div><div class='ctx'> def tcm_mod_scan_fabric_ops(tcm_dir):</div><div class='ctx'> </div><div class='del'>-	fabric_ops_api = tcm_dir + "include/target/target_core_fabric_ops.h"</div><div class='add'>+	fabric_ops_api = tcm_dir + "include/target/target_core_fabric.h"</div><div class='ctx'> </div><div class='ctx'> 	print "Using tcm_mod_scan_fabric_ops: " + fabric_ops_api</div><div class='ctx'> 	process_fo = 0;</div><div class='hunk'>@@ -579,11 +569,7 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):</div><div class='ctx'> 	buf += "#include &lt;scsi/scsi_cmnd.h&gt;\n"</div><div class='ctx'> 	buf += "#include &lt;scsi/libfc.h&gt;\n\n"</div><div class='ctx'> 	buf += "#include &lt;target/target_core_base.h&gt;\n"</div><div class='del'>-	buf += "#include &lt;target/target_core_transport.h&gt;\n"</div><div class='del'>-	buf += "#include &lt;target/target_core_fabric_ops.h&gt;\n"</div><div class='del'>-	buf += "#include &lt;target/target_core_fabric_lib.h&gt;\n"</div><div class='del'>-	buf += "#include &lt;target/target_core_device.h&gt;\n"</div><div class='del'>-	buf += "#include &lt;target/target_core_tpg.h&gt;\n"</div><div class='add'>+	buf += "#include &lt;target/target_core_fabric.h&gt;\n"</div><div class='ctx'> 	buf += "#include &lt;target/target_core_configfs.h&gt;\n\n"</div><div class='ctx'> 	buf += "#include \"" + fabric_mod_name + "_base.h\"\n"</div><div class='ctx'> 	buf += "#include \"" + fabric_mod_name + "_fabric.h\"\n\n"</div><div class='hunk'>@@ -788,7 +774,7 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):</div><div class='ctx'> 			buf += "{\n"</div><div class='ctx'> 			buf += "	struct " + fabric_mod_name + "_nacl *nacl;\n\n"</div><div class='ctx'> 			buf += "	nacl = kzalloc(sizeof(struct " + fabric_mod_name + "_nacl), GFP_KERNEL);\n"</div><div class='del'>-			buf += "	if (!(nacl)) {\n"</div><div class='add'>+			buf += "	if (!nacl) {\n"</div><div class='ctx'> 			buf += "		printk(KERN_ERR \"Unable to alocate struct " + fabric_mod_name + "_nacl\\n\");\n"</div><div class='ctx'> 			buf += "		return NULL;\n"</div><div class='ctx'> 			buf += "	}\n\n"</div><div class='hunk'>@@ -815,7 +801,7 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):</div><div class='ctx'> 			buf += "}\n\n"</div><div class='ctx'> 			bufi += "u32 " + fabric_mod_name + "_tpg_get_inst_index(struct se_portal_group *);\n"</div><div class='ctx'> </div><div class='del'>-		if re.search('release_cmd_to_pool', fo):</div><div class='add'>+		if re.search('\*release_cmd\)\(', fo):</div><div class='ctx'> 			buf += "void " + fabric_mod_name + "_release_cmd(struct se_cmd *se_cmd)\n"</div><div class='ctx'> 			buf += "{\n"</div><div class='ctx'> 			buf += "	return;\n"</div><div class='hunk'>@@ -899,13 +885,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):</div><div class='ctx'> 			buf += "}\n\n"</div><div class='ctx'> 			bufi += "int " + fabric_mod_name + "_get_cmd_state(struct se_cmd *);\n"</div><div class='ctx'> </div><div class='del'>-		if re.search('new_cmd_failure\)\(', fo):</div><div class='del'>-			buf += "void " + fabric_mod_name + "_new_cmd_failure(struct se_cmd *se_cmd)\n"</div><div class='del'>-			buf += "{\n"</div><div class='del'>-			buf += "	return;\n"</div><div class='del'>-			buf += "}\n\n"</div><div class='del'>-			bufi += "void " + fabric_mod_name + "_new_cmd_failure(struct se_cmd *);\n"</div><div class='del'>-</div><div class='ctx'> 		if re.search('queue_data_in\)\(', fo):</div><div class='ctx'> 			buf += "int " + fabric_mod_name + "_queue_data_in(struct se_cmd *se_cmd)\n"</div><div class='ctx'> 			buf += "{\n"</div><div class='hunk'>@@ -948,15 +927,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):</div><div class='ctx'> 			buf += "}\n\n"</div><div class='ctx'> 			bufi += "int " + fabric_mod_name + "_is_state_remove(struct se_cmd *);\n"</div><div class='ctx'> </div><div class='del'>-		if re.search('pack_lun\)\(', fo):</div><div class='del'>-			buf += "u64 " + fabric_mod_name + "_pack_lun(unsigned int lun)\n"</div><div class='del'>-			buf += "{\n"</div><div class='del'>-			buf += "	WARN_ON(lun &gt;= 256);\n"</div><div class='del'>-			buf += "	/* Caller wants this byte-swapped */\n"</div><div class='del'>-			buf += "	return cpu_to_le64((lun &amp; 0xff) &lt;&lt; 8);\n"</div><div class='del'>-			buf += "}\n\n"</div><div class='del'>-			bufi += "u64 " + fabric_mod_name + "_pack_lun(unsigned int);\n"</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> 	ret = p.write(buf)</div><div class='ctx'> 	if ret:</div><div class='head'>diff --git a/Documentation/trace/events-kmem.txt b/Documentation/trace/events-kmem.txt<br/>index aa82ee4a5a87..194800410061 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/trace/events-kmem.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/trace/events-kmem.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/trace/events-kmem.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/trace/events-kmem.txt</a></div><div class='hunk'>@@ -40,8 +40,8 @@ but the call_site can usually be used to extrapolate that information.</div><div class='ctx'> ==================</div><div class='ctx'> mm_page_alloc		  page=%p pfn=%lu order=%d migratetype=%d gfp_flags=%s</div><div class='ctx'> mm_page_alloc_zone_locked page=%p pfn=%lu order=%u migratetype=%d cpu=%d percpu_refill=%d</div><div class='del'>-mm_page_free_direct	  page=%p pfn=%lu order=%d</div><div class='del'>-mm_pagevec_free		  page=%p pfn=%lu order=%d cold=%d</div><div class='add'>+mm_page_free		  page=%p pfn=%lu order=%d</div><div class='add'>+mm_page_free_batched	  page=%p pfn=%lu order=%d cold=%d</div><div class='ctx'> </div><div class='ctx'> These four events deal with page allocation and freeing. mm_page_alloc is</div><div class='ctx'> a simple indicator of page allocator activity. Pages may be allocated from</div><div class='hunk'>@@ -53,13 +53,13 @@ amounts of activity imply high activity on the zone-&gt;lock. Taking this lock</div><div class='ctx'> impairs performance by disabling interrupts, dirtying cache lines between</div><div class='ctx'> CPUs and serialising many CPUs.</div><div class='ctx'> </div><div class='del'>-When a page is freed directly by the caller, the mm_page_free_direct event</div><div class='add'>+When a page is freed directly by the caller, the only mm_page_free event</div><div class='ctx'> is triggered. Significant amounts of activity here could indicate that the</div><div class='ctx'> callers should be batching their activities.</div><div class='ctx'> </div><div class='del'>-When pages are freed using a pagevec, the mm_pagevec_free is</div><div class='del'>-triggered. Broadly speaking, pages are taken off the LRU lock in bulk and</div><div class='del'>-freed in batch with a pagevec. Significant amounts of activity here could</div><div class='add'>+When pages are freed in batch, the also mm_page_free_batched is triggered.</div><div class='add'>+Broadly speaking, pages are taken off the LRU lock in bulk and</div><div class='add'>+freed in batch with a page list. Significant amounts of activity here could</div><div class='ctx'> indicate that the system is under memory pressure and can also indicate</div><div class='ctx'> contention on the zone-&gt;lru_lock.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/trace/postprocess/trace-pagealloc-postprocess.pl b/Documentation/trace/postprocess/trace-pagealloc-postprocess.pl<br/>index 7df50e8cf4d9..0a120aae33ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/trace/postprocess/trace-pagealloc-postprocess.pl?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/trace/postprocess/trace-pagealloc-postprocess.pl</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/trace/postprocess/trace-pagealloc-postprocess.pl?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/trace/postprocess/trace-pagealloc-postprocess.pl</a></div><div class='hunk'>@@ -17,8 +17,8 @@ use Getopt::Long;</div><div class='ctx'> </div><div class='ctx'> # Tracepoint events</div><div class='ctx'> use constant MM_PAGE_ALLOC		=&gt; 1;</div><div class='del'>-use constant MM_PAGE_FREE_DIRECT 	=&gt; 2;</div><div class='del'>-use constant MM_PAGEVEC_FREE		=&gt; 3;</div><div class='add'>+use constant MM_PAGE_FREE		=&gt; 2;</div><div class='add'>+use constant MM_PAGE_FREE_BATCHED	=&gt; 3;</div><div class='ctx'> use constant MM_PAGE_PCPU_DRAIN		=&gt; 4;</div><div class='ctx'> use constant MM_PAGE_ALLOC_ZONE_LOCKED	=&gt; 5;</div><div class='ctx'> use constant MM_PAGE_ALLOC_EXTFRAG	=&gt; 6;</div><div class='hunk'>@@ -223,10 +223,10 @@ EVENT_PROCESS:</div><div class='ctx'> 		# Perl Switch() sucks majorly</div><div class='ctx'> 		if ($tracepoint eq "mm_page_alloc") {</div><div class='ctx'> 			$perprocesspid{$process_pid}-&gt;{MM_PAGE_ALLOC}++;</div><div class='del'>-		} elsif ($tracepoint eq "mm_page_free_direct") {</div><div class='del'>-			$perprocesspid{$process_pid}-&gt;{MM_PAGE_FREE_DIRECT}++;</div><div class='del'>-		} elsif ($tracepoint eq "mm_pagevec_free") {</div><div class='del'>-			$perprocesspid{$process_pid}-&gt;{MM_PAGEVEC_FREE}++;</div><div class='add'>+		} elsif ($tracepoint eq "mm_page_free") {</div><div class='add'>+			$perprocesspid{$process_pid}-&gt;{MM_PAGE_FREE}++</div><div class='add'>+		} elsif ($tracepoint eq "mm_page_free_batched") {</div><div class='add'>+			$perprocesspid{$process_pid}-&gt;{MM_PAGE_FREE_BATCHED}++;</div><div class='ctx'> 		} elsif ($tracepoint eq "mm_page_pcpu_drain") {</div><div class='ctx'> 			$perprocesspid{$process_pid}-&gt;{MM_PAGE_PCPU_DRAIN}++;</div><div class='ctx'> 			$perprocesspid{$process_pid}-&gt;{STATE_PCPU_PAGES_DRAINED}++;</div><div class='hunk'>@@ -336,8 +336,8 @@ sub dump_stats {</div><div class='ctx'> 			$process_pid,</div><div class='ctx'> 			$stats{$process_pid}-&gt;{MM_PAGE_ALLOC},</div><div class='ctx'> 			$stats{$process_pid}-&gt;{MM_PAGE_ALLOC_ZONE_LOCKED},</div><div class='del'>-			$stats{$process_pid}-&gt;{MM_PAGE_FREE_DIRECT},</div><div class='del'>-			$stats{$process_pid}-&gt;{MM_PAGEVEC_FREE},</div><div class='add'>+			$stats{$process_pid}-&gt;{MM_PAGE_FREE},</div><div class='add'>+			$stats{$process_pid}-&gt;{MM_PAGE_FREE_BATCHED},</div><div class='ctx'> 			$stats{$process_pid}-&gt;{MM_PAGE_PCPU_DRAIN},</div><div class='ctx'> 			$stats{$process_pid}-&gt;{HIGH_PCPU_DRAINS},</div><div class='ctx'> 			$stats{$process_pid}-&gt;{HIGH_PCPU_REFILLS},</div><div class='hunk'>@@ -364,8 +364,8 @@ sub aggregate_perprocesspid() {</div><div class='ctx'> </div><div class='ctx'> 		$perprocess{$process}-&gt;{MM_PAGE_ALLOC} += $perprocesspid{$process_pid}-&gt;{MM_PAGE_ALLOC};</div><div class='ctx'> 		$perprocess{$process}-&gt;{MM_PAGE_ALLOC_ZONE_LOCKED} += $perprocesspid{$process_pid}-&gt;{MM_PAGE_ALLOC_ZONE_LOCKED};</div><div class='del'>-		$perprocess{$process}-&gt;{MM_PAGE_FREE_DIRECT} += $perprocesspid{$process_pid}-&gt;{MM_PAGE_FREE_DIRECT};</div><div class='del'>-		$perprocess{$process}-&gt;{MM_PAGEVEC_FREE} += $perprocesspid{$process_pid}-&gt;{MM_PAGEVEC_FREE};</div><div class='add'>+		$perprocess{$process}-&gt;{MM_PAGE_FREE} += $perprocesspid{$process_pid}-&gt;{MM_PAGE_FREE};</div><div class='add'>+		$perprocess{$process}-&gt;{MM_PAGE_FREE_BATCHED} += $perprocesspid{$process_pid}-&gt;{MM_PAGE_FREE_BATCHED};</div><div class='ctx'> 		$perprocess{$process}-&gt;{MM_PAGE_PCPU_DRAIN} += $perprocesspid{$process_pid}-&gt;{MM_PAGE_PCPU_DRAIN};</div><div class='ctx'> 		$perprocess{$process}-&gt;{HIGH_PCPU_DRAINS} += $perprocesspid{$process_pid}-&gt;{HIGH_PCPU_DRAINS};</div><div class='ctx'> 		$perprocess{$process}-&gt;{HIGH_PCPU_REFILLS} += $perprocesspid{$process_pid}-&gt;{HIGH_PCPU_REFILLS};</div><div class='head'>diff --git a/Documentation/trace/tracepoint-analysis.txt b/Documentation/trace/tracepoint-analysis.txt<br/>index 87bee3c129ba..058cc6c9dc56 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/trace/tracepoint-analysis.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/trace/tracepoint-analysis.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/trace/tracepoint-analysis.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/trace/tracepoint-analysis.txt</a></div><div class='hunk'>@@ -93,14 +93,14 @@ By specifying the -a switch and analysing sleep, the system-wide events</div><div class='ctx'> for a duration of time can be examined.</div><div class='ctx'> </div><div class='ctx'>  $ perf stat -a \</div><div class='del'>-	-e kmem:mm_page_alloc -e kmem:mm_page_free_direct \</div><div class='del'>-	-e kmem:mm_pagevec_free \</div><div class='add'>+	-e kmem:mm_page_alloc -e kmem:mm_page_free \</div><div class='add'>+	-e kmem:mm_page_free_batched \</div><div class='ctx'> 	sleep 10</div><div class='ctx'>  Performance counter stats for 'sleep 10':</div><div class='ctx'> </div><div class='ctx'>            9630  kmem:mm_page_alloc</div><div class='del'>-           2143  kmem:mm_page_free_direct</div><div class='del'>-           7424  kmem:mm_pagevec_free</div><div class='add'>+           2143  kmem:mm_page_free</div><div class='add'>+           7424  kmem:mm_page_free_batched</div><div class='ctx'> </div><div class='ctx'>    10.002577764  seconds time elapsed</div><div class='ctx'> </div><div class='hunk'>@@ -119,15 +119,15 @@ basis using set_ftrace_pid.</div><div class='ctx'> Events can be activated and tracked for the duration of a process on a local</div><div class='ctx'> basis using PCL such as follows.</div><div class='ctx'> </div><div class='del'>-  $ perf stat -e kmem:mm_page_alloc -e kmem:mm_page_free_direct \</div><div class='del'>-		 -e kmem:mm_pagevec_free ./hackbench 10</div><div class='add'>+  $ perf stat -e kmem:mm_page_alloc -e kmem:mm_page_free \</div><div class='add'>+		 -e kmem:mm_page_free_batched ./hackbench 10</div><div class='ctx'>   Time: 0.909</div><div class='ctx'> </div><div class='ctx'>     Performance counter stats for './hackbench 10':</div><div class='ctx'> </div><div class='ctx'>           17803  kmem:mm_page_alloc</div><div class='del'>-          12398  kmem:mm_page_free_direct</div><div class='del'>-           4827  kmem:mm_pagevec_free</div><div class='add'>+          12398  kmem:mm_page_free</div><div class='add'>+           4827  kmem:mm_page_free_batched</div><div class='ctx'> </div><div class='ctx'>     0.973913387  seconds time elapsed</div><div class='ctx'> </div><div class='hunk'>@@ -146,8 +146,8 @@ to know what the standard deviation is. By and large, this is left to the</div><div class='ctx'> performance analyst to do it by hand. In the event that the discrete event</div><div class='ctx'> occurrences are useful to the performance analyst, then perf can be used.</div><div class='ctx'> </div><div class='del'>-  $ perf stat --repeat 5 -e kmem:mm_page_alloc -e kmem:mm_page_free_direct</div><div class='del'>-			-e kmem:mm_pagevec_free ./hackbench 10</div><div class='add'>+  $ perf stat --repeat 5 -e kmem:mm_page_alloc -e kmem:mm_page_free</div><div class='add'>+			-e kmem:mm_page_free_batched ./hackbench 10</div><div class='ctx'>   Time: 0.890</div><div class='ctx'>   Time: 0.895</div><div class='ctx'>   Time: 0.915</div><div class='hunk'>@@ -157,8 +157,8 @@ occurrences are useful to the performance analyst, then perf can be used.</div><div class='ctx'>    Performance counter stats for './hackbench 10' (5 runs):</div><div class='ctx'> </div><div class='ctx'>           16630  kmem:mm_page_alloc         ( +-   3.542% )</div><div class='del'>-          11486  kmem:mm_page_free_direct   ( +-   4.771% )</div><div class='del'>-           4730  kmem:mm_pagevec_free       ( +-   2.325% )</div><div class='add'>+          11486  kmem:mm_page_free	    ( +-   4.771% )</div><div class='add'>+           4730  kmem:mm_page_free_batched  ( +-   2.325% )</div><div class='ctx'> </div><div class='ctx'>     0.982653002  seconds time elapsed   ( +-   1.448% )</div><div class='ctx'> </div><div class='hunk'>@@ -168,15 +168,15 @@ aggregation of discrete events, then a script would need to be developed.</div><div class='ctx'> Using --repeat, it is also possible to view how events are fluctuating over</div><div class='ctx'> time on a system-wide basis using -a and sleep.</div><div class='ctx'> </div><div class='del'>-  $ perf stat -e kmem:mm_page_alloc -e kmem:mm_page_free_direct \</div><div class='del'>-		-e kmem:mm_pagevec_free \</div><div class='add'>+  $ perf stat -e kmem:mm_page_alloc -e kmem:mm_page_free \</div><div class='add'>+		-e kmem:mm_page_free_batched \</div><div class='ctx'> 		-a --repeat 10 \</div><div class='ctx'> 		sleep 1</div><div class='ctx'>   Performance counter stats for 'sleep 1' (10 runs):</div><div class='ctx'> </div><div class='ctx'>            1066  kmem:mm_page_alloc         ( +-  26.148% )</div><div class='del'>-            182  kmem:mm_page_free_direct   ( +-   5.464% )</div><div class='del'>-            890  kmem:mm_pagevec_free       ( +-  30.079% )</div><div class='add'>+            182  kmem:mm_page_free          ( +-   5.464% )</div><div class='add'>+            890  kmem:mm_page_free_batched  ( +-  30.079% )</div><div class='ctx'> </div><div class='ctx'>     1.002251757  seconds time elapsed   ( +-   0.005% )</div><div class='ctx'> </div><div class='hunk'>@@ -220,8 +220,8 @@ were generating events within the kernel. To begin this sort of analysis, the</div><div class='ctx'> data must be recorded. At the time of writing, this required root:</div><div class='ctx'> </div><div class='ctx'>   $ perf record -c 1 \</div><div class='del'>-	-e kmem:mm_page_alloc -e kmem:mm_page_free_direct \</div><div class='del'>-	-e kmem:mm_pagevec_free \</div><div class='add'>+	-e kmem:mm_page_alloc -e kmem:mm_page_free \</div><div class='add'>+	-e kmem:mm_page_free_batched \</div><div class='ctx'> 	./hackbench 10</div><div class='ctx'>   Time: 0.894</div><div class='ctx'>   [ perf record: Captured and wrote 0.733 MB perf.data (~32010 samples) ]</div><div class='hunk'>@@ -260,8 +260,8 @@ noticed that X was generating an insane amount of page allocations so let's look</div><div class='ctx'> at it:</div><div class='ctx'> </div><div class='ctx'>   $ perf record -c 1 -f \</div><div class='del'>-		-e kmem:mm_page_alloc -e kmem:mm_page_free_direct \</div><div class='del'>-		-e kmem:mm_pagevec_free \</div><div class='add'>+		-e kmem:mm_page_alloc -e kmem:mm_page_free \</div><div class='add'>+		-e kmem:mm_page_free_batched \</div><div class='ctx'> 		-p `pidof X`</div><div class='ctx'> </div><div class='ctx'> This was interrupted after a few seconds and</div><div class='head'>diff --git a/Documentation/usb/usbmon.txt b/Documentation/usb/usbmon.txt<br/>index a4efa0462f05..5335fa8b06eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/usb/usbmon.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/usb/usbmon.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/usb/usbmon.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/usb/usbmon.txt</a></div><div class='hunk'>@@ -47,10 +47,11 @@ 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='ctx'> </div><div class='del'>-Run "cat /proc/bus/usb/devices", and find the T-line which corresponds to</div><div class='del'>-the device. Usually you do it by looking for the vendor string. If you have</div><div class='del'>-many similar devices, unplug one and compare two /proc/bus/usb/devices outputs.</div><div class='del'>-The T-line will have a bus number. Example:</div><div class='add'>+Run "cat /sys/kernel/debug/usb/devices", and find the T-line which corresponds</div><div class='add'>+to the device. Usually you do it by looking for the vendor string. If you have</div><div class='add'>+many similar devices, unplug one and compare the two</div><div class='add'>+/sys/kernel/debug/usb/devices outputs. The T-line will have a bus number.</div><div class='add'>+Example:</div><div class='ctx'> </div><div class='ctx'> T:  Bus=03 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#=  2 Spd=12  MxCh= 0</div><div class='ctx'> D:  Ver= 1.10 Cls=00(&gt;ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs=  1</div><div class='hunk'>@@ -58,7 +59,10 @@ P:  Vendor=0557 ProdID=2004 Rev= 1.00</div><div class='ctx'> S:  Manufacturer=ATEN</div><div class='ctx'> S:  Product=UC100KM V2.00</div><div class='ctx'> </div><div class='del'>-Bus=03 means it's bus 3.</div><div class='add'>+"Bus=03" means it's bus 3. Alternatively, you can look at the output from</div><div class='add'>+"lsusb" and get the bus number from the appropriate line. Example:</div><div class='add'>+</div><div class='add'>+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='ctx'> </div><div class='head'>diff --git a/Documentation/vgaarbiter.txt b/Documentation/vgaarbiter.txt<br/>index b7d401e0eae9..014423e2824c 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/vgaarbiter.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/vgaarbiter.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/vgaarbiter.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/vgaarbiter.txt</a></div><div class='hunk'>@@ -177,7 +177,7 @@ II. Credits</div><div class='ctx'> </div><div class='ctx'> Benjamin Herrenschmidt (IBM?) started this work when he discussed such design</div><div class='ctx'> with the Xorg community in 2005 [1, 2]. In the end of 2007, Paulo Zanoni and</div><div class='del'>-Tiago Vignatti (both of C3SL/Federal University of Paraná) proceeded his work</div><div class='add'>+Tiago Vignatti (both of C3SL/Federal University of Paraná) proceeded his work</div><div class='ctx'> enhancing the kernel code to adapt as a kernel module and also did the</div><div class='ctx'> implementation of the user space side [3]. Now (2009) Tiago Vignatti and Dave</div><div class='ctx'> Airlie finally put this work in shape and queued to Jesse Barnes' PCI tree.</div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.au0828 b/Documentation/video4linux/CARDLIST.au0828<br/>index d5cb4ea287b2..7b59e953c4bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.au0828?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/CARDLIST.au0828</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.au0828?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/video4linux/CARDLIST.au0828</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'>   0 -&gt; Unknown board                            (au0828)</div><div class='del'>-  1 -&gt; Hauppauge HVR950Q                        (au0828)        [2040:7200,2040:7210,2040:7217,2040:721b,2040:721e,2040:721f,2040:7280,0fd9:0008]</div><div class='add'>+  1 -&gt; Hauppauge HVR950Q                        (au0828)        [2040:7200,2040:7210,2040:7217,2040:721b,2040:721e,2040:721f,2040:7280,0fd9:0008,2040:7260,2040:7213]</div><div class='ctx'>   2 -&gt; Hauppauge HVR850                         (au0828)        [2040:7240]</div><div class='ctx'>   3 -&gt; DViCO FusionHDTV USB                     (au0828)        [0fe9:d620]</div><div class='ctx'>   4 -&gt; Hauppauge HVR950Q rev xxF8               (au0828)        [2040:7201,2040:7211,2040:7281]</div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv<br/>index 4739d5684305..b753906c7183 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.bttv?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/CARDLIST.bttv</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.bttv?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/video4linux/CARDLIST.bttv</a></div><div class='hunk'>@@ -71,7 +71,7 @@</div><div class='ctx'>  70 -&gt; Prolink Pixelview PV-BT878P+ (Rev.4C,8E)</div><div class='ctx'>  71 -&gt; Lifeview FlyVideo 98EZ (capture only) LR51          [1851:1851]</div><div class='ctx'>  72 -&gt; Prolink Pixelview PV-BT878P+9B (PlayTV Pro rev.9B FM+NICAM) [1554:4011]</div><div class='del'>- 73 -&gt; Sensoray 311                                        [6000:0311]</div><div class='add'>+ 73 -&gt; Sensoray 311/611                                    [6000:0311,6000:0611]</div><div class='ctx'>  74 -&gt; RemoteVision MX (RV605)</div><div class='ctx'>  75 -&gt; Powercolor MTV878/ MTV878R/ MTV878F</div><div class='ctx'>  76 -&gt; Canopus WinDVR PCI (COMPAQ Presario 3524JP, 5112JP) [0e11:0079]</div><div class='hunk'>@@ -158,3 +158,4 @@</div><div class='ctx'> 157 -&gt; Geovision GV-800(S) (master)                        [800a:763d]</div><div class='ctx'> 158 -&gt; Geovision GV-800(S) (slave)                         [800b:763d,800c:763d,800d:763d]</div><div class='ctx'> 159 -&gt; ProVideo PV183                                      [1830:1540,1831:1540,1832:1540,1833:1540,1834:1540,1835:1540,1836:1540,1837:1540]</div><div class='add'>+160 -&gt; Tongwei Video Technology TD-3116                    [f200:3116]</div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.cx23885 b/Documentation/video4linux/CARDLIST.cx23885<br/>index 8910449d23a8..23584d0c6a75 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.cx23885?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/CARDLIST.cx23885</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.cx23885?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/video4linux/CARDLIST.cx23885</a></div><div class='hunk'>@@ -29,3 +29,6 @@</div><div class='ctx'>  28 -&gt; LEADTEK WinFast PxTV1200                            [107d:6f22]</div><div class='ctx'>  29 -&gt; GoTView X5 3D Hybrid                                [5654:2390]</div><div class='ctx'>  30 -&gt; NetUP Dual DVB-T/C-CI RF                            [1b55:e2e4]</div><div class='add'>+ 31 -&gt; Leadtek Winfast PxDVR3200 H XC4000                  [107d:6f39]</div><div class='add'>+ 32 -&gt; MPX-885</div><div class='add'>+ 33 -&gt; Mygica X8507                                        [14f1:8502]</div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88<br/>index d9c0f119196d..eee18e6962b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.cx88?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/CARDLIST.cx88</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.cx88?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/video4linux/CARDLIST.cx88</a></div><div class='hunk'>@@ -85,3 +85,5 @@</div><div class='ctx'>  84 -&gt; Samsung SMT 7020 DVB-S                              [18ac:dc00,18ac:dccd]</div><div class='ctx'>  85 -&gt; Twinhan VP-1027 DVB-S                               [1822:0023]</div><div class='ctx'>  86 -&gt; TeVii S464 DVB-S/S2                                 [d464:9022]</div><div class='add'>+ 87 -&gt; Leadtek WinFast DTV2000 H PLUS                      [107d:6f42]</div><div class='add'>+ 88 -&gt; Leadtek WinFast DTV1800 H (XC4000)                  [107d:6f38]</div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx<br/>index 4a7b3df6d8bd..e7be3ac49ead 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.em28xx?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/CARDLIST.em28xx</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.em28xx?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/video4linux/CARDLIST.em28xx</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'>  10 -&gt; Hauppauge WinTV HVR 900                  (em2880)        [2040:6500]</div><div class='ctx'>  11 -&gt; Terratec Hybrid XS                       (em2880)</div><div class='ctx'>  12 -&gt; Kworld PVR TV 2800 RF                    (em2820/em2840)</div><div class='del'>- 13 -&gt; Terratec Prodigy XS                      (em2880)        [0ccd:0047]</div><div class='add'>+ 13 -&gt; Terratec Prodigy XS                      (em2880)</div><div class='ctx'>  14 -&gt; SIIG AVTuner-PVR / Pixelview Prolink PlayTV USB 2.0 (em2820/em2840)</div><div class='ctx'>  15 -&gt; V-Gear PocketTV                          (em2800)</div><div class='ctx'>  16 -&gt; Hauppauge WinTV HVR 950                  (em2883)        [2040:6513,2040:6517,2040:651b]</div><div class='hunk'>@@ -40,7 +40,7 @@</div><div class='ctx'>  39 -&gt; KWorld PVRTV 300U                        (em2861)        [eb1a:e300]</div><div class='ctx'>  40 -&gt; Plextor ConvertX PX-TV100U               (em2861)        [093b:a005]</div><div class='ctx'>  41 -&gt; Kworld 350 U DVB-T                       (em2870)        [eb1a:e350]</div><div class='del'>- 42 -&gt; Kworld 355 U DVB-T                       (em2870)        [eb1a:e355,eb1a:e357]</div><div class='add'>+ 42 -&gt; Kworld 355 U DVB-T                       (em2870)        [eb1a:e355,eb1a:e357,eb1a:e359]</div><div class='ctx'>  43 -&gt; Terratec Cinergy T XS                    (em2870)        [0ccd:0043]</div><div class='ctx'>  44 -&gt; Terratec Cinergy T XS (MT2060)           (em2870)</div><div class='ctx'>  45 -&gt; Pinnacle PCTV DVB-T                      (em2870)</div><div class='hunk'>@@ -64,7 +64,7 @@</div><div class='ctx'>  64 -&gt; Easy Cap Capture DC-60                   (em2860)</div><div class='ctx'>  65 -&gt; IO-DATA GV-MVP/SZ                        (em2820/em2840) [04bb:0515]</div><div class='ctx'>  66 -&gt; Empire dual TV                           (em2880)</div><div class='del'>- 67 -&gt; Terratec Grabby                          (em2860)        [0ccd:0096]</div><div class='add'>+ 67 -&gt; Terratec Grabby                          (em2860)        [0ccd:0096,0ccd:10AF]</div><div class='ctx'>  68 -&gt; Terratec AV350                           (em2860)        [0ccd:0084]</div><div class='ctx'>  69 -&gt; KWorld ATSC 315U HDTV TV Box             (em2882)        [eb1a:a313]</div><div class='ctx'>  70 -&gt; Evga inDtube                             (em2882)</div><div class='hunk'>@@ -76,3 +76,7 @@</div><div class='ctx'>  76 -&gt; KWorld PlusTV 340U or UB435-Q (ATSC)     (em2870)        [1b80:a340]</div><div class='ctx'>  77 -&gt; EM2874 Leadership ISDBT                  (em2874)</div><div class='ctx'>  78 -&gt; PCTV nanoStick T2 290e                   (em28174)</div><div class='add'>+ 79 -&gt; Terratec Cinergy H5                      (em2884)        [0ccd:10a2,0ccd:10ad]</div><div class='add'>+ 80 -&gt; PCTV DVB-S2 Stick (460e)                 (em28174)</div><div class='add'>+ 81 -&gt; Hauppauge WinTV HVR 930C                 (em2884)        [2040:1605]</div><div class='add'>+ 82 -&gt; Terratec Cinergy HTC Stick               (em2884)        [0ccd:00b2]</div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134<br/>index 7efae9bd73ed..e7ef38a19859 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.saa7134?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/CARDLIST.saa7134</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.saa7134?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/video4linux/CARDLIST.saa7134</a></div><div class='hunk'>@@ -186,3 +186,4 @@</div><div class='ctx'> 185 -&gt; MagicPro ProHDTV Pro2 DMB-TH/Hybrid      [17de:d136]</div><div class='ctx'> 186 -&gt; Beholder BeholdTV 501                    [5ace:5010]</div><div class='ctx'> 187 -&gt; Beholder BeholdTV 503 FM                 [5ace:5030]</div><div class='add'>+188 -&gt; Sensoray 811/911                         [6000:0811,6000:0911]</div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.saa7164 b/Documentation/video4linux/CARDLIST.saa7164<br/>index 152bd7b781ca..2205e8d55537 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.saa7164?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/CARDLIST.saa7164</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.saa7164?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/video4linux/CARDLIST.saa7164</a></div><div class='hunk'>@@ -7,3 +7,5 @@</div><div class='ctx'>   6 -&gt; Hauppauge WinTV-HVR2200                             [0070:8901]</div><div class='ctx'>   7 -&gt; Hauppauge WinTV-HVR2250                             [0070:8891,0070:8851]</div><div class='ctx'>   8 -&gt; Hauppauge WinTV-HVR2250                             [0070:88A1]</div><div class='add'>+  9 -&gt; Hauppauge WinTV-HVR2200                             [0070:8940]</div><div class='add'>+ 10 -&gt; Hauppauge WinTV-HVR2200                             [0070:8953]</div><div class='head'>diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt<br/>index b15e29f31121..f2060f0dc02c 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/gspca.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/gspca.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/gspca.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/video4linux/gspca.txt</a></div><div class='hunk'>@@ -189,6 +189,7 @@ ov519		05a9:0511	Video Blaster WebCam 3/WebCam Plus, D-Link USB Digital Video Ca</div><div class='ctx'> ov519		05a9:0518	Creative WebCam</div><div class='ctx'> ov519		05a9:0519	OV519 Microphone</div><div class='ctx'> ov519		05a9:0530	OmniVision</div><div class='add'>+ov534_9		05a9:1550	OmniVision VEHO Filmscanner</div><div class='ctx'> ov519		05a9:2800	OmniVision SuperCAM</div><div class='ctx'> ov519		05a9:4519	Webcam Classic</div><div class='ctx'> ov534_9		05a9:8065	OmniVision test kit ov538+ov9712</div><div class='hunk'>@@ -278,6 +279,7 @@ pac7302		093a:2628	Genius iLook 300</div><div class='ctx'> pac7302		093a:2629	Genious iSlim 300</div><div class='ctx'> pac7302		093a:262a	Webcam 300k</div><div class='ctx'> pac7302		093a:262c	Philips SPC 230 NC</div><div class='add'>+jl2005bcd	0979:0227	Various brands, 19 known cameras supported</div><div class='ctx'> jeilinj		0979:0280	Sakar 57379</div><div class='ctx'> jeilinj		0979:0280	Sportscam DV15</div><div class='ctx'> zc3xx		0ac8:0302	Z-star Vimicro zc0302</div><div class='head'>diff --git a/Documentation/video4linux/v4l2-controls.txt b/Documentation/video4linux/v4l2-controls.txt<br/>index 26aa0573933e..e2492a9d1027 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/v4l2-controls.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/v4l2-controls.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/v4l2-controls.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/video4linux/v4l2-controls.txt</a></div><div class='hunk'>@@ -666,27 +666,6 @@ a control of this type whenever the first control belonging to a new control</div><div class='ctx'> class is added.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-Differences from the Spec</div><div class='del'>-=========================</div><div class='del'>-</div><div class='del'>-There are a few places where the framework acts slightly differently from the</div><div class='del'>-V4L2 Specification. Those differences are described in this section. We will</div><div class='del'>-have to see whether we need to adjust the spec or not.</div><div class='del'>-</div><div class='del'>-1) It is no longer required to have all controls contained in a</div><div class='del'>-v4l2_ext_control array be from the same control class. The framework will be</div><div class='del'>-able to handle any type of control in the array. You need to set ctrl_class</div><div class='del'>-to 0 in order to enable this. If ctrl_class is non-zero, then it will still</div><div class='del'>-check that all controls belong to that control class.</div><div class='del'>-</div><div class='del'>-If you set ctrl_class to 0 and count to 0, then it will only return an error</div><div class='del'>-if there are no controls at all.</div><div class='del'>-</div><div class='del'>-2) Clarified the way error_idx works. For get and set it will be equal to</div><div class='del'>-count if nothing was done yet. If it is less than count then only the controls</div><div class='del'>-up to error_idx-1 were successfully applied.</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> Proposals for Extensions</div><div class='ctx'> ========================</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/video4linux/v4l2-framework.txt<br/>index f8dcabf7852c..659b2ba12a4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/v4l2-framework.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/video4linux/v4l2-framework.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/v4l2-framework.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/video4linux/v4l2-framework.txt</a></div><div class='hunk'>@@ -612,6 +612,12 @@ You can set a pointer to a mutex_lock in struct video_device. Usually this</div><div class='ctx'> will be either a top-level mutex or a mutex per device node. If you want</div><div class='ctx'> finer-grained locking then you have to set it to NULL and do you own locking.</div><div class='ctx'> </div><div class='add'>+It is up to the driver developer to decide which method to use. However, if</div><div class='add'>+your driver has high-latency operations (for example, changing the exposure</div><div class='add'>+of a USB webcam might take a long time), then you might be better off with</div><div class='add'>+doing your own locking if you want to allow the user to do other things with</div><div class='add'>+the device while waiting for the high-latency command to finish.</div><div class='add'>+</div><div class='ctx'> If a lock is specified then all file operations will be serialized on that</div><div class='ctx'> lock. If you use videobuf then you must pass the same lock to the videobuf</div><div class='ctx'> queue initialize function: if videobuf has to wait for a frame to arrive, then</div><div class='hunk'>@@ -619,6 +625,11 @@ it will temporarily unlock the lock and relock it afterwards. If your driver</div><div class='ctx'> also waits in the code, then you should do the same to allow other processes</div><div class='ctx'> to access the device node while the first process is waiting for something.</div><div class='ctx'> </div><div class='add'>+In the case of videobuf2 you will need to implement the wait_prepare and</div><div class='add'>+wait_finish callbacks to unlock/lock if applicable. In particular, if you use</div><div class='add'>+the lock in struct video_device then you must unlock/lock this mutex in</div><div class='add'>+wait_prepare and wait_finish.</div><div class='add'>+</div><div class='ctx'> The implementation of a hotplug disconnect should also take the lock before</div><div class='ctx'> calling v4l2_device_disconnect.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt<br/>index e2a4b5287361..e1d94bf4056e 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/virtual/kvm/api.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/virtual/kvm/api.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/virtual/kvm/api.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/virtual/kvm/api.txt</a></div><div class='hunk'>@@ -1466,6 +1466,31 @@ is supported; 2 if the processor requires all virtual machines to have</div><div class='ctx'> an RMA, or 1 if the processor can use an RMA but doesn't require it,</div><div class='ctx'> because it supports the Virtual RMA (VRMA) facility.</div><div class='ctx'> </div><div class='add'>+4.64 KVM_NMI</div><div class='add'>+</div><div class='add'>+Capability: KVM_CAP_USER_NMI</div><div class='add'>+Architectures: x86</div><div class='add'>+Type: vcpu ioctl</div><div class='add'>+Parameters: none</div><div class='add'>+Returns: 0 on success, -1 on error</div><div class='add'>+</div><div class='add'>+Queues an NMI on the thread's vcpu.  Note this is well defined only</div><div class='add'>+when KVM_CREATE_IRQCHIP has not been called, since this is an interface</div><div class='add'>+between the virtual cpu core and virtual local APIC.  After KVM_CREATE_IRQCHIP</div><div class='add'>+has been called, this interface is completely emulated within the kernel.</div><div class='add'>+</div><div class='add'>+To use this to emulate the LINT1 input with KVM_CREATE_IRQCHIP, use the</div><div class='add'>+following algorithm:</div><div class='add'>+</div><div class='add'>+  - pause the vpcu</div><div class='add'>+  - read the local APIC's state (KVM_GET_LAPIC)</div><div class='add'>+  - check whether changing LINT1 will queue an NMI (see the LVT entry for LINT1)</div><div class='add'>+  - if so, issue KVM_NMI</div><div class='add'>+  - resume the vcpu</div><div class='add'>+</div><div class='add'>+Some guests configure the LINT1 NMI input to cause a panic, aiding in</div><div class='add'>+debugging.</div><div class='add'>+</div><div class='ctx'> 5. The kvm_run structure</div><div class='ctx'> </div><div class='ctx'> Application code obtains a pointer to the kvm_run structure by</div><div class='head'>diff --git a/Documentation/vm/slub.txt b/Documentation/vm/slub.txt<br/>index f464f47bc60d..6752870c4970 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/vm/slub.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/vm/slub.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/vm/slub.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/vm/slub.txt</a></div><div class='hunk'>@@ -117,7 +117,7 @@ can be influenced by kernel parameters:</div><div class='ctx'> </div><div class='ctx'> slub_min_objects=x		(default 4)</div><div class='ctx'> slub_min_order=x		(default 0)</div><div class='del'>-slub_max_order=x		(default 1)</div><div class='add'>+slub_max_order=x		(default 3 (PAGE_ALLOC_COSTLY_ORDER))</div><div class='ctx'> </div><div class='ctx'> slub_min_objects allows to specify how many objects must at least fit</div><div class='ctx'> into one slab in order for the allocation order to be acceptable.</div><div class='hunk'>@@ -131,7 +131,10 @@ slub_min_objects.</div><div class='ctx'> slub_max_order specified the order at which slub_min_objects should no</div><div class='ctx'> longer be checked. This is useful to avoid SLUB trying to generate</div><div class='ctx'> super large order pages to fit slub_min_objects of a slab cache with</div><div class='del'>-large object sizes into one high order page.</div><div class='add'>+large object sizes into one high order page. Setting command line</div><div class='add'>+parameter debug_guardpage_minorder=N (N &gt; 0), forces setting</div><div class='add'>+slub_max_order to 0, what cause minimum possible order of slabs</div><div class='add'>+allocation.</div><div class='ctx'> </div><div class='ctx'> SLUB Debug output</div><div class='ctx'> -----------------</div><div class='head'>diff --git a/Documentation/watchdog/00-INDEX b/Documentation/watchdog/00-INDEX<br/>index fc51128071c2..fc9082a1477a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/watchdog/00-INDEX?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/watchdog/00-INDEX</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/watchdog/00-INDEX?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/watchdog/00-INDEX</a></div><div class='hunk'>@@ -1,5 +1,7 @@</div><div class='ctx'> 00-INDEX</div><div class='ctx'> 	- this file.</div><div class='add'>+convert_drivers_to_kernel_api.txt</div><div class='add'>+	- how-to for converting old watchdog drivers to the new kernel API.</div><div class='ctx'> hpwdt.txt</div><div class='ctx'> 	- information on the HP iLO2 NMI watchdog</div><div class='ctx'> pcwd-watchdog.txt</div><div class='head'>diff --git a/Documentation/watchdog/convert_drivers_to_kernel_api.txt b/Documentation/watchdog/convert_drivers_to_kernel_api.txt<br/>index ae1e90036d06..be8119bb15d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/watchdog/convert_drivers_to_kernel_api.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/watchdog/convert_drivers_to_kernel_api.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/watchdog/convert_drivers_to_kernel_api.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/watchdog/convert_drivers_to_kernel_api.txt</a></div><div class='hunk'>@@ -163,6 +163,25 @@ Here is a simple example for a watchdog device:</div><div class='ctx'> +};</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+Handle the 'nowayout' feature</div><div class='add'>+-----------------------------</div><div class='add'>+</div><div class='add'>+A few drivers use nowayout statically, i.e. there is no module parameter for it</div><div class='add'>+and only CONFIG_WATCHDOG_NOWAYOUT determines if the feature is going to be</div><div class='add'>+used. This needs to be converted by initializing the status variable of the</div><div class='add'>+watchdog_device like this:</div><div class='add'>+</div><div class='add'>+        .status = WATCHDOG_NOWAYOUT_INIT_STATUS,</div><div class='add'>+</div><div class='add'>+Most drivers, however, also allow runtime configuration of nowayout, usually</div><div class='add'>+by adding a module parameter. The conversion for this would be something like:</div><div class='add'>+</div><div class='add'>+	watchdog_set_nowayout(&amp;s3c2410_wdd, nowayout);</div><div class='add'>+</div><div class='add'>+The module parameter itself needs to stay, everything else related to nowayout</div><div class='add'>+can go, though. This will likely be some code in open(), close() or write().</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Register the watchdog device</div><div class='ctx'> ----------------------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/watchdog/watchdog-kernel-api.txt b/Documentation/watchdog/watchdog-kernel-api.txt<br/>index 4f7c894244d2..4b93c28e35c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/watchdog/watchdog-kernel-api.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Documentation/watchdog/watchdog-kernel-api.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/watchdog/watchdog-kernel-api.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Documentation/watchdog/watchdog-kernel-api.txt</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> The Linux WatchDog Timer Driver Core kernel API.</div><div class='ctx'> ===============================================</div><div class='del'>-Last reviewed: 22-Jul-2011</div><div class='add'>+Last reviewed: 29-Nov-2011</div><div class='ctx'> </div><div class='ctx'> Wim Van Sebroeck &lt;wim@iguana.be&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -142,6 +142,14 @@ bit-operations. The status bits that are defined are:</div><div class='ctx'> * WDOG_NO_WAY_OUT: this bit stores the nowayout setting for the watchdog.</div><div class='ctx'>   If this bit is set then the watchdog timer will not be able to stop.</div><div class='ctx'> </div><div class='add'>+  To set the WDOG_NO_WAY_OUT status bit (before registering your watchdog</div><div class='add'>+  timer device) you can either:</div><div class='add'>+  * set it statically in your watchdog_device struct with</div><div class='add'>+	.status = WATCHDOG_NOWAYOUT_INIT_STATUS,</div><div class='add'>+    (this will set the value the same as CONFIG_WATCHDOG_NOWAYOUT) or</div><div class='add'>+  * use the following helper function:</div><div class='add'>+  static inline void watchdog_set_nowayout(struct watchdog_device *wdd, int nowayout)</div><div class='add'>+</div><div class='ctx'> Note: The WatchDog Timer Driver Core supports the magic close feature and</div><div class='ctx'> the nowayout feature. To use the magic close feature you must set the</div><div class='ctx'> WDIOF_MAGICCLOSE bit in the options field of the watchdog's info structure.</div><div class='head'>diff --git a/MAINTAINERS b/MAINTAINERS<br/>index 62f1cd357ddf..89b70df91f4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/MAINTAINERS?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>MAINTAINERS</a><br/>+++ b/<a href='/cgit/linux.git/tree/MAINTAINERS?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>MAINTAINERS</a></div><div class='hunk'>@@ -184,11 +184,6 @@ S:	Maintained</div><div class='ctx'> F:	Documentation/filesystems/9p.txt</div><div class='ctx'> F:	fs/9p/</div><div class='ctx'> </div><div class='del'>-A2232 SERIAL BOARD DRIVER</div><div class='del'>-L:	linux-m68k@lists.linux-m68k.org</div><div class='del'>-S:	Orphan</div><div class='del'>-F:	drivers/staging/generic_serial/ser_a2232*</div><div class='del'>-</div><div class='ctx'> AACRAID SCSI RAID DRIVER</div><div class='ctx'> M:	Adaptec OEM Raid Solutions &lt;aacraid@adaptec.com&gt;</div><div class='ctx'> L:	linux-scsi@vger.kernel.org</div><div class='hunk'>@@ -347,7 +342,7 @@ S:	Supported</div><div class='ctx'> F:	drivers/mfd/adp5520.c</div><div class='ctx'> F:	drivers/video/backlight/adp5520_bl.c</div><div class='ctx'> F:	drivers/leds/leds-adp5520.c</div><div class='del'>-F:	drivers/gpio/adp5520-gpio.c</div><div class='add'>+F:	drivers/gpio/gpio-adp5520.c</div><div class='ctx'> F:	drivers/input/keyboard/adp5520-keys.c</div><div class='ctx'> </div><div class='ctx'> ADP5588 QWERTY KEYPAD AND IO EXPANDER DRIVER (ADP5588/ADP5587)</div><div class='hunk'>@@ -356,7 +351,7 @@ L:	device-drivers-devel@blackfin.uclinux.org</div><div class='ctx'> W:	http://wiki.analog.com/ADP5588</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/input/keyboard/adp5588-keys.c</div><div class='del'>-F:	drivers/gpio/adp5588-gpio.c</div><div class='add'>+F:	drivers/gpio/gpio-adp5588.c</div><div class='ctx'> </div><div class='ctx'> ADP8860 BACKLIGHT DRIVER (ADP8860/ADP8861/ADP8863)</div><div class='ctx'> M:	Michael Hennerich &lt;michael.hennerich@analog.com&gt;</div><div class='hunk'>@@ -542,6 +537,7 @@ F:	sound/soc/codecs/adau*</div><div class='ctx'> F:	sound/soc/codecs/adav*</div><div class='ctx'> F:	sound/soc/codecs/ad1*</div><div class='ctx'> F:	sound/soc/codecs/ssm*</div><div class='add'>+F:	sound/soc/codecs/sigmadsp.*</div><div class='ctx'> </div><div class='ctx'> ANALOG DEVICES INC ASOC DRIVERS</div><div class='ctx'> L:	uclinux-dist-devel@blackfin.uclinux.org</div><div class='hunk'>@@ -749,6 +745,7 @@ M:	Barry Song &lt;baohua.song@csr.com&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/arm/mach-prima2/</div><div class='add'>+F:	drivers/dma/sirf-dma*</div><div class='ctx'> </div><div class='ctx'> ARM/EBSA110 MACHINE SUPPORT</div><div class='ctx'> M:	Russell King &lt;linux@arm.linux.org.uk&gt;</div><div class='hunk'>@@ -919,7 +916,6 @@ M:	Lennert Buytenhek &lt;kernel@wantstofly.org&gt;</div><div class='ctx'> M:	Nicolas Pitre &lt;nico@fluxnic.net&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> S:	Odd Fixes</div><div class='del'>-F:	arch/arm/mach-loki/</div><div class='ctx'> F:	arch/arm/mach-kirkwood/</div><div class='ctx'> F:	arch/arm/mach-mv78xx0/</div><div class='ctx'> F:	arch/arm/mach-orion5x/</div><div class='hunk'>@@ -1081,8 +1077,8 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	arch/arm/mach-s5pv210/mach-aquila.c</div><div class='ctx'> F:	arch/arm/mach-s5pv210/mach-goni.c</div><div class='del'>-F:	arch/arm/mach-exynos4/mach-universal_c210.c</div><div class='del'>-F:	arch/arm/mach-exynos4/mach-nuri.c</div><div class='add'>+F:	arch/arm/mach-exynos/mach-universal_c210.c</div><div class='add'>+F:	arch/arm/mach-exynos/mach-nuri.c</div><div class='ctx'> </div><div class='ctx'> ARM/SAMSUNG S5P SERIES FIMC SUPPORT</div><div class='ctx'> M:	Kyungmin Park &lt;kyungmin.park@samsung.com&gt;</div><div class='hunk'>@@ -1110,7 +1106,6 @@ M:	Tomasz Stanislawski &lt;t.stanislaws@samsung.com&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org</div><div class='ctx'> L:	linux-media@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	arch/arm/plat-s5p/dev-tv.c</div><div class='ctx'> F:	drivers/media/video/s5p-tv/</div><div class='ctx'> </div><div class='ctx'> ARM/SHMOBILE ARM ARCHITECTURE</div><div class='hunk'>@@ -1124,13 +1119,6 @@ S:	Supported</div><div class='ctx'> F:	arch/arm/mach-shmobile/</div><div class='ctx'> F:	drivers/sh/</div><div class='ctx'> </div><div class='del'>-ARM/TELECHIPS ARM ARCHITECTURE</div><div class='del'>-M:	"Hans J. Koch" &lt;hjk@hansjkoch.de&gt;</div><div class='del'>-L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='del'>-S:	Maintained</div><div class='del'>-F:	arch/arm/plat-tcc/</div><div class='del'>-F:	arch/arm/mach-tcc8k/</div><div class='del'>-</div><div class='ctx'> ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT</div><div class='ctx'> M:	Lennert Buytenhek &lt;kernel@wantstofly.org&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='hunk'>@@ -1152,14 +1140,13 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> W:	http://www.mcuos.com</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	arch/arm/mach-w90x900/</div><div class='del'>-F:	arch/arm/mach-nuc93x/</div><div class='ctx'> F:	drivers/input/keyboard/w90p910_keypad.c</div><div class='ctx'> F:	drivers/input/touchscreen/w90p910_ts.c</div><div class='ctx'> F:	drivers/watchdog/nuc900_wdt.c</div><div class='ctx'> F:	drivers/net/ethernet/nuvoton/w90p910_ether.c</div><div class='ctx'> F:	drivers/mtd/nand/nuc900_nand.c</div><div class='ctx'> F:	drivers/rtc/rtc-nuc900.c</div><div class='del'>-F:	drivers/spi/spi_nuc900.c</div><div class='add'>+F:	drivers/spi/spi-nuc900.c</div><div class='ctx'> F:	drivers/usb/host/ehci-w90x900.c</div><div class='ctx'> F:	drivers/video/nuc900fb.c</div><div class='ctx'> </div><div class='hunk'>@@ -1184,7 +1171,6 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	arch/arm/mach-ux500/</div><div class='ctx'> F:	drivers/dma/ste_dma40*</div><div class='del'>-F:	drivers/mfd/ab3550*</div><div class='ctx'> F:	drivers/mfd/abx500*</div><div class='ctx'> F:	drivers/mfd/ab8500*</div><div class='ctx'> F:	drivers/mfd/stmpe*</div><div class='hunk'>@@ -1364,7 +1350,7 @@ F:	drivers/net/ethernet/cadence/</div><div class='ctx'> ATMEL SPI DRIVER</div><div class='ctx'> M:	Nicolas Ferre &lt;nicolas.ferre@atmel.com&gt;</div><div class='ctx'> S:	Supported</div><div class='del'>-F:	drivers/spi/atmel_spi.*</div><div class='add'>+F:	drivers/spi/spi-atmel.*</div><div class='ctx'> </div><div class='ctx'> ATMEL USBA UDC DRIVER</div><div class='ctx'> M:	Nicolas Ferre &lt;nicolas.ferre@atmel.com&gt;</div><div class='hunk'>@@ -1426,6 +1412,7 @@ F:	net/ax25/</div><div class='ctx'> B43 WIRELESS DRIVER</div><div class='ctx'> M:	Stefano Brivio &lt;stefano.brivio@polimi.it&gt;</div><div class='ctx'> L:	linux-wireless@vger.kernel.org</div><div class='add'>+L:	b43-dev@lists.infradead.org (moderated for non-subscribers)</div><div class='ctx'> W:	http://linuxwireless.org/en/users/Drivers/b43</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/net/wireless/b43/</div><div class='hunk'>@@ -1503,7 +1490,7 @@ M:	Sonic Zhang &lt;sonic.zhang@analog.com&gt;</div><div class='ctx'> L:	uclinux-dist-devel@blackfin.uclinux.org</div><div class='ctx'> W:	http://blackfin.uclinux.org</div><div class='ctx'> S:	Supported</div><div class='del'>-F:	drivers/tty/serial/bfin_5xx.c</div><div class='add'>+F:	drivers/tty/serial/bfin_uart.c</div><div class='ctx'> </div><div class='ctx'> BLACKFIN WATCHDOG DRIVER</div><div class='ctx'> M:	Mike Frysinger &lt;vapier.adi@gmail.com&gt;</div><div class='hunk'>@@ -1594,7 +1581,7 @@ M:	Franky (Zhenhui) Lin &lt;frankyl@broadcom.com&gt;</div><div class='ctx'> M:	Kan Yan	&lt;kanyan@broadcom.com&gt;</div><div class='ctx'> L:	linux-wireless@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='del'>-F:	drivers/staging/brcm80211/</div><div class='add'>+F:	drivers/net/wireless/brcm80211/</div><div class='ctx'> </div><div class='ctx'> BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER</div><div class='ctx'> M:	Bhanu Prakash Gollapudi &lt;bprakash@broadcom.com&gt;</div><div class='hunk'>@@ -1602,6 +1589,13 @@ L:	linux-scsi@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	drivers/scsi/bnx2fc/</div><div class='ctx'> </div><div class='add'>+BROADCOM SPECIFIC AMBA DRIVER (BCMA)</div><div class='add'>+M:	RafaÅ‚ MiÅ‚ecki &lt;zajec5@gmail.com&gt;</div><div class='add'>+L:	linux-wireless@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/bcma/</div><div class='add'>+F:	include/linux/bcma/</div><div class='add'>+</div><div class='ctx'> BROCADE BFA FC SCSI DRIVER</div><div class='ctx'> M:	Jing Huang &lt;huangj@brocade.com&gt;</div><div class='ctx'> L:	linux-scsi@vger.kernel.org</div><div class='hunk'>@@ -1633,7 +1627,7 @@ BT8XXGPIO DRIVER</div><div class='ctx'> M:	Michael Buesch &lt;m@bues.ch&gt;</div><div class='ctx'> W:	http://bu3sch.de/btgpio.php</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	drivers/gpio/bt8xxgpio.c</div><div class='add'>+F:	drivers/gpio/gpio-bt8xx.c</div><div class='ctx'> </div><div class='ctx'> BTRFS FILE SYSTEM</div><div class='ctx'> M:	Chris Mason &lt;chris.mason@oracle.com&gt;</div><div class='hunk'>@@ -1661,6 +1655,14 @@ T:	git git://git.alsa-project.org/alsa-kernel.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	sound/pci/oxygen/</div><div class='ctx'> </div><div class='add'>+C6X ARCHITECTURE</div><div class='add'>+M:	Mark Salter &lt;msalter@redhat.com&gt;</div><div class='add'>+M:	Aurelien Jacquiot &lt;a-jacquiot@ti.com&gt;</div><div class='add'>+L:	linux-c6x-dev@linux-c6x.org</div><div class='add'>+W:	http://www.linux-c6x.org/wiki/index.php/Main_Page</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	arch/c6x/</div><div class='add'>+</div><div class='ctx'> CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS</div><div class='ctx'> M:	David Howells &lt;dhowells@redhat.com&gt;</div><div class='ctx'> L:	linux-cachefs@redhat.com</div><div class='hunk'>@@ -1674,7 +1676,7 @@ L:	linux-media@vger.kernel.org</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	Documentation/video4linux/cafe_ccic</div><div class='del'>-F:	drivers/media/video/cafe_ccic*</div><div class='add'>+F:	drivers/media/video/marvell-ccic/</div><div class='ctx'> </div><div class='ctx'> CAIF NETWORK LAYER</div><div class='ctx'> M:	Sjur Braendeland &lt;sjur.brandeland@stericsson.com&gt;</div><div class='hunk'>@@ -1898,12 +1900,6 @@ L:	platform-driver-x86@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/platform/x86/compal-laptop.c</div><div class='ctx'> </div><div class='del'>-COMPUTONE INTELLIPORT MULTIPORT CARD</div><div class='del'>-W:	http://www.wittsend.com/computone.html</div><div class='del'>-S:	Orphan</div><div class='del'>-F:	Documentation/serial/computone.txt</div><div class='del'>-F:	drivers/staging/tty/ip2/</div><div class='del'>-</div><div class='ctx'> CONEXANT ACCESSRUNNER USB DRIVER</div><div class='ctx'> M:	Simon Arlott &lt;cxacru@fire.lp0.eu&gt;</div><div class='ctx'> L:	accessrunner-general@lists.sourceforge.net</div><div class='hunk'>@@ -2118,7 +2114,7 @@ DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Orphan</div><div class='ctx'> F:	Documentation/networking/dmfe.txt</div><div class='del'>-F:	drivers/net/ethernet/tulip/dmfe.c</div><div class='add'>+F:	drivers/net/ethernet/dec/tulip/dmfe.c</div><div class='ctx'> </div><div class='ctx'> DC390/AM53C974 SCSI driver</div><div class='ctx'> M:	Kurt Garloff &lt;garloff@suse.de&gt;</div><div class='hunk'>@@ -2191,6 +2187,13 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/usb/dwc3/</div><div class='ctx'> </div><div class='add'>+DEVICE FREQUENCY (DEVFREQ)</div><div class='add'>+M:	MyungJoo Ham &lt;myungjoo.ham@samsung.com&gt;</div><div class='add'>+M:	Kyungmin Park &lt;kyungmin.park@samsung.com&gt;</div><div class='add'>+L:	linux-kernel@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/devfreq/</div><div class='add'>+</div><div class='ctx'> DEVICE NUMBER REGISTRY</div><div class='ctx'> M:	Torben Mathiasen &lt;device@lanana.org&gt;</div><div class='ctx'> W:	http://lanana.org/docs/device-list/index.html</div><div class='hunk'>@@ -2207,15 +2210,6 @@ F:	drivers/md/dm*</div><div class='ctx'> F:	include/linux/device-mapper.h</div><div class='ctx'> F:	include/linux/dm-*.h</div><div class='ctx'> </div><div class='del'>-DIGI INTL. EPCA DRIVER</div><div class='del'>-M:	"Digi International, Inc" &lt;Eng.Linux@digi.com&gt;</div><div class='del'>-L:	Eng.Linux@digi.com</div><div class='del'>-W:	http://www.digi.com</div><div class='del'>-S:	Orphan</div><div class='del'>-F:	Documentation/serial/digiepca.txt</div><div class='del'>-F:	drivers/staging/tty/epca*</div><div class='del'>-F:	drivers/staging/tty/digi*</div><div class='del'>-</div><div class='ctx'> DIOLAN U2C-12 I2C DRIVER</div><div class='ctx'> M:	Guenter Roeck &lt;guenter.roeck@ericsson.com&gt;</div><div class='ctx'> L:	linux-i2c@vger.kernel.org</div><div class='hunk'>@@ -2836,6 +2830,14 @@ L:	platform-driver-x86@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/platform/x86/fujitsu-laptop.c</div><div class='ctx'> </div><div class='add'>+FUJITSU M-5MO LS CAMERA ISP DRIVER</div><div class='add'>+M:	Kyungmin Park &lt;kyungmin.park@samsung.com&gt;</div><div class='add'>+M:	Heungjun Kim &lt;riverful.kim@samsung.com&gt;</div><div class='add'>+L:	linux-media@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/media/video/m5mols/</div><div class='add'>+F:	include/media/m5mols.h</div><div class='add'>+</div><div class='ctx'> FUSE: FILESYSTEM IN USERSPACE</div><div class='ctx'> M:	Miklos Szeredi &lt;miklos@szeredi.hu&gt;</div><div class='ctx'> L:	fuse-devel@lists.sourceforge.net</div><div class='hunk'>@@ -2919,6 +2921,7 @@ F:	include/linux/gigaset_dev.h</div><div class='ctx'> </div><div class='ctx'> GPIO SUBSYSTEM</div><div class='ctx'> M:	Grant Likely &lt;grant.likely@secretlab.ca&gt;</div><div class='add'>+M:	Linus Walleij &lt;linus.walleij@stericsson.com&gt;</div><div class='ctx'> S:	Maintained</div><div class='ctx'> T:	git git://git.secretlab.ca/git/linux-2.6.git</div><div class='ctx'> F:	Documentation/gpio.txt</div><div class='hunk'>@@ -2936,7 +2939,7 @@ GRETH 10/100/1G Ethernet MAC device driver</div><div class='ctx'> M:	Kristoffer Glembo &lt;kristoffer@gaisler.com&gt;</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	drivers/net/greth*</div><div class='add'>+F:	drivers/net/ethernet/aeroflex/</div><div class='ctx'> </div><div class='ctx'> GSPCA FINEPIX SUBDRIVER</div><div class='ctx'> M:	Frank Zago &lt;frank@zago.net&gt;</div><div class='hunk'>@@ -3188,6 +3191,16 @@ M:	William Irwin &lt;wli@holomorphy.com&gt;</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	fs/hugetlbfs/</div><div class='ctx'> </div><div class='add'>+Hyper-V CORE AND DRIVERS</div><div class='add'>+M:	K. Y. Srinivasan &lt;kys@microsoft.com&gt;</div><div class='add'>+M:	Haiyang Zhang &lt;haiyangz@microsoft.com&gt;</div><div class='add'>+L:	devel@linuxdriverproject.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/hv/</div><div class='add'>+F:	drivers/hid/hid-hyperv.c</div><div class='add'>+F:	drivers/net/hyperv/</div><div class='add'>+F:	drivers/staging/hv/</div><div class='add'>+</div><div class='ctx'> I2C/SMBUS STUB DRIVER</div><div class='ctx'> M:	"Mark M. Hoffman" &lt;mhoffman@lightlink.com&gt;</div><div class='ctx'> L:	linux-i2c@vger.kernel.org</div><div class='hunk'>@@ -3197,6 +3210,7 @@ F:	drivers/i2c/busses/i2c-stub.c</div><div class='ctx'> I2C SUBSYSTEM</div><div class='ctx'> M:	"Jean Delvare (PC drivers, core)" &lt;khali@linux-fr.org&gt;</div><div class='ctx'> M:	"Ben Dooks (embedded platforms)" &lt;ben-linux@fluff.org&gt;</div><div class='add'>+M:	"Wolfram Sang (embedded platforms)" &lt;w.sang@pengutronix.de&gt;</div><div class='ctx'> L:	linux-i2c@vger.kernel.org</div><div class='ctx'> W:	http://i2c.wiki.kernel.org/</div><div class='ctx'> T:	quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/</div><div class='hunk'>@@ -3583,8 +3597,7 @@ F:	net/netfilter/ipvs/</div><div class='ctx'> IPWIRELESS DRIVER</div><div class='ctx'> M:	Jiri Kosina &lt;jkosina@suse.cz&gt;</div><div class='ctx'> M:	David Sterba &lt;dsterba@suse.cz&gt;</div><div class='del'>-S:	Maintained</div><div class='del'>-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git</div><div class='add'>+S:	Odd Fixes</div><div class='ctx'> F:	drivers/tty/ipwireless/</div><div class='ctx'> </div><div class='ctx'> IPX NETWORK LAYER</div><div class='hunk'>@@ -3779,7 +3792,6 @@ S:	Odd Fixes</div><div class='ctx'> </div><div class='ctx'> KERNEL NFSD, SUNRPC, AND LOCKD SERVERS</div><div class='ctx'> M:	"J. Bruce Fields" &lt;bfields@fieldses.org&gt;</div><div class='del'>-M:	Neil Brown &lt;neilb@suse.de&gt;</div><div class='ctx'> L:	linux-nfs@vger.kernel.org</div><div class='ctx'> W:	http://nfs.sourceforge.net/</div><div class='ctx'> S:	Supported</div><div class='hunk'>@@ -3877,8 +3889,7 @@ L:	keyrings@linux-nfs.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	Documentation/security/keys-trusted-encrypted.txt</div><div class='ctx'> F:	include/keys/encrypted-type.h</div><div class='del'>-F:	security/keys/encrypted.c</div><div class='del'>-F:	security/keys/encrypted.h</div><div class='add'>+F:	security/keys/encrypted-keys/</div><div class='ctx'> </div><div class='ctx'> KGDB / KDB /debug_core</div><div class='ctx'> M:	Jason Wessel &lt;jason.wessel@windriver.com&gt;</div><div class='hunk'>@@ -4011,7 +4022,7 @@ M:	Josh Boyer &lt;jwboyer@gmail.com&gt;</div><div class='ctx'> M:	Matt Porter &lt;mporter@kernel.crashing.org&gt;</div><div class='ctx'> W:	http://www.penguinppc.org/</div><div class='ctx'> L:	linuxppc-dev@lists.ozlabs.org</div><div class='del'>-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git</div><div class='add'>+T:	git git://git.infradead.org/users/jwboyer/powerpc-4xx.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	arch/powerpc/platforms/40x/</div><div class='ctx'> F:	arch/powerpc/platforms/44x/</div><div class='hunk'>@@ -4689,6 +4700,8 @@ Q:	http://patchwork.kernel.org/project/linux-omap/list/</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	arch/arm/*omap*/</div><div class='add'>+F:	drivers/i2c/busses/i2c-omap.c</div><div class='add'>+F:	include/linux/i2c-omap.h</div><div class='ctx'> </div><div class='ctx'> OMAP CLOCK FRAMEWORK SUPPORT</div><div class='ctx'> M:	Paul Walmsley &lt;paul@pwsan.com&gt;</div><div class='hunk'>@@ -4854,6 +4867,14 @@ S:	Maintained</div><div class='ctx'> T:	git git://openrisc.net/~jonas/linux</div><div class='ctx'> F:	arch/openrisc</div><div class='ctx'> </div><div class='add'>+OPENVSWITCH</div><div class='add'>+M:	Jesse Gross &lt;jesse@nicira.com&gt;</div><div class='add'>+L:	dev@openvswitch.org</div><div class='add'>+W:	http://openvswitch.org</div><div class='add'>+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch.git</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	net/openvswitch/</div><div class='add'>+</div><div class='ctx'> OPL4 DRIVER</div><div class='ctx'> M:	Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='ctx'> L:	alsa-devel@alsa-project.org (moderated for non-subscribers)</div><div class='hunk'>@@ -5120,10 +5141,19 @@ L:	linux-mtd@lists.infradead.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/mtd/devices/phram.c</div><div class='ctx'> </div><div class='add'>+PICOXCELL SUPPORT</div><div class='add'>+M:	Jamie Iles &lt;jamie@jamieiles.com&gt;</div><div class='add'>+L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='add'>+T:	git git://github.com/jamieiles/linux-2.6-ji.git</div><div class='add'>+S:	Supported</div><div class='add'>+F:	arch/arm/mach-picoxcell</div><div class='add'>+F:	drivers/*/picoxcell*</div><div class='add'>+F:	drivers/*/*/picoxcell*</div><div class='add'>+</div><div class='ctx'> PIN CONTROL SUBSYSTEM</div><div class='ctx'> M:	Linus Walleij &lt;linus.walleij@linaro.org&gt;</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	drivers/pinmux/</div><div class='add'>+F:	drivers/pinctrl/</div><div class='ctx'> </div><div class='ctx'> PKTCDVD DRIVER</div><div class='ctx'> M:	Peter Osterlund &lt;petero2@telia.com&gt;</div><div class='hunk'>@@ -5306,35 +5336,27 @@ F:	drivers/media/video/pvrusb2/</div><div class='ctx'> PXA2xx/PXA3xx SUPPORT</div><div class='ctx'> M:	Eric Miao &lt;eric.y.miao@gmail.com&gt;</div><div class='ctx'> M:	Russell King &lt;linux@arm.linux.org.uk&gt;</div><div class='add'>+M:	Haojian Zhuang &lt;haojian.zhuang@marvell.com&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='add'>+T:	git git://github.com/hzhuang1/linux.git</div><div class='add'>+T:	git git://git.linaro.org/people/ycmiao/pxa-linux.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	arch/arm/mach-pxa/</div><div class='ctx'> F:	drivers/pcmcia/pxa2xx*</div><div class='del'>-F:	drivers/spi/pxa2xx*</div><div class='add'>+F:	drivers/spi/spi-pxa2xx*</div><div class='ctx'> F:	drivers/usb/gadget/pxa2*</div><div class='ctx'> F:	include/sound/pxa2xx-lib.h</div><div class='ctx'> F:	sound/arm/pxa*</div><div class='ctx'> F:	sound/soc/pxa</div><div class='ctx'> </div><div class='del'>-PXA168 SUPPORT</div><div class='del'>-M:	Eric Miao &lt;eric.y.miao@gmail.com&gt;</div><div class='del'>-M:	Jason Chagas &lt;jason.chagas@marvell.com&gt;</div><div class='del'>-L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='del'>-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-PXA910 SUPPORT</div><div class='add'>+MMP SUPPORT</div><div class='ctx'> M:	Eric Miao &lt;eric.y.miao@gmail.com&gt;</div><div class='del'>-L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='del'>-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='del'>-MMP2 SUPPORT (aka ARMADA610)</div><div class='ctx'> M:	Haojian Zhuang &lt;haojian.zhuang@marvell.com&gt;</div><div class='del'>-M:	Eric Miao &lt;eric.y.miao@gmail.com&gt;</div><div class='ctx'> L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)</div><div class='del'>-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git</div><div class='add'>+T:	git git://github.com/hzhuang1/linux.git</div><div class='add'>+T:	git git://git.linaro.org/people/ycmiao/pxa-linux.git</div><div class='ctx'> S:	Maintained</div><div class='add'>+F:	arch/arm/mach-mmp/</div><div class='ctx'> </div><div class='ctx'> PXA MMCI DRIVER</div><div class='ctx'> S:	Orphan</div><div class='hunk'>@@ -5373,6 +5395,7 @@ S:	Supported</div><div class='ctx'> F:	drivers/scsi/qla4xxx/</div><div class='ctx'> </div><div class='ctx'> QLOGIC QLA3XXX NETWORK DRIVER</div><div class='add'>+M:	Jitendra Kalsaria &lt;jitendra.kalsaria@qlogic.com&gt;</div><div class='ctx'> M:	Ron Mercer &lt;ron.mercer@qlogic.com&gt;</div><div class='ctx'> M:	linux-driver@qlogic.com</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='hunk'>@@ -5543,11 +5566,6 @@ M:	Maxim Levitsky &lt;maximlevitsky@gmail.com&gt;</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/memstick/host/r592.*</div><div class='ctx'> </div><div class='del'>-RISCOM8 DRIVER</div><div class='del'>-S:	Orphan</div><div class='del'>-F:	Documentation/serial/riscom8.txt</div><div class='del'>-F:	drivers/staging/tty/riscom8*</div><div class='del'>-</div><div class='ctx'> ROCKETPORT DRIVER</div><div class='ctx'> P:	Comtrol Corp.</div><div class='ctx'> W:	http://www.comtrol.com</div><div class='hunk'>@@ -5668,6 +5686,12 @@ L:	alsa-devel@alsa-project.org (moderated for non-subscribers)</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	sound/soc/samsung</div><div class='ctx'> </div><div class='add'>+SAMSUNG FRAMEBUFFER DRIVER</div><div class='add'>+M:	Jingoo Han &lt;jg1.han@samsung.com&gt;</div><div class='add'>+L:	linux-fbdev@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+F:	drivers/video/s3c-fb.c</div><div class='add'>+</div><div class='ctx'> SERIAL DRIVERS</div><div class='ctx'> M:	Alan Cox &lt;alan@linux.intel.com&gt;</div><div class='ctx'> L:	linux-serial@vger.kernel.org</div><div class='hunk'>@@ -5807,13 +5831,14 @@ L:	linux-mmc@vger.kernel.org</div><div class='ctx'> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	drivers/mmc/host/sdhci.*</div><div class='add'>+F:	drivers/mmc/host/sdhci-pltfm.[ch]</div><div class='ctx'> </div><div class='ctx'> SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)</div><div class='ctx'> M:	Anton Vorontsov &lt;avorontsov@ru.mvista.com&gt;</div><div class='ctx'> L:	linuxppc-dev@lists.ozlabs.org</div><div class='ctx'> L:	linux-mmc@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	drivers/mmc/host/sdhci-of.*</div><div class='add'>+F:	drivers/mmc/host/sdhci-pltfm.[ch]</div><div class='ctx'> </div><div class='ctx'> SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER</div><div class='ctx'> M:	Ben Dooks &lt;ben-linux@fluff.org&gt;</div><div class='hunk'>@@ -5830,7 +5855,7 @@ F:	drivers/mmc/host/sdhci-spear.c</div><div class='ctx'> SECURITY SUBSYSTEM</div><div class='ctx'> M:	James Morris &lt;jmorris@namei.org&gt;</div><div class='ctx'> L:	linux-security-module@vger.kernel.org (suggested Cc:)</div><div class='del'>-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git</div><div class='add'>+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git</div><div class='ctx'> W:	http://security.wiki.kernel.org/</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	security/</div><div class='hunk'>@@ -5892,7 +5917,6 @@ F:	drivers/net/ethernet/emulex/benet/</div><div class='ctx'> </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='del'>-M:	Steve Hodgson &lt;shodgson@solarflare.com&gt;</div><div class='ctx'> M:	Ben Hutchings &lt;bhutchings@solarflare.com&gt;</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Supported</div><div class='hunk'>@@ -5957,6 +5981,7 @@ L:	davinci-linux-open-source@linux.davincidsp.com (subscribers-only)</div><div class='ctx'> Q:	http://patchwork.kernel.org/project/linux-davinci/list/</div><div class='ctx'> S:	Supported</div><div class='ctx'> F:	arch/arm/mach-davinci</div><div class='add'>+F:	drivers/i2c/busses/i2c-davinci.c</div><div class='ctx'> </div><div class='ctx'> SIS 190 ETHERNET DRIVER</div><div class='ctx'> M:	Francois Romieu &lt;romieu@fr.zoreil.com&gt;</div><div class='hunk'>@@ -6100,13 +6125,6 @@ S:	Maintained</div><div class='ctx'> F:	drivers/ssb/</div><div class='ctx'> F:	include/linux/ssb/</div><div class='ctx'> </div><div class='del'>-BROADCOM SPECIFIC AMBA DRIVER (BCMA)</div><div class='del'>-M:	RafaÅ‚ MiÅ‚ecki &lt;zajec5@gmail.com&gt;</div><div class='del'>-L:	linux-wireless@vger.kernel.org</div><div class='del'>-S:	Maintained</div><div class='del'>-F:	drivers/bcma/</div><div class='del'>-F:	include/linux/bcma/</div><div class='del'>-</div><div class='ctx'> SONY VAIO CONTROL DEVICE DRIVER</div><div class='ctx'> M:	Mattia Dongili &lt;malattia@linux.it&gt;</div><div class='ctx'> L:	platform-driver-x86@vger.kernel.org</div><div class='hunk'>@@ -6193,9 +6211,7 @@ M:	Viresh Kumar &lt;viresh.kumar@st.com&gt;</div><div class='ctx'> W:	http://www.st.com/spear</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	arch/arm/mach-spear*/clock.c</div><div class='del'>-F:	arch/arm/mach-spear*/include/mach/clkdev.h</div><div class='ctx'> F:	arch/arm/plat-spear/clock.c</div><div class='del'>-F:	arch/arm/plat-spear/include/plat/clkdev.h</div><div class='ctx'> F:	arch/arm/plat-spear/include/plat/clock.h</div><div class='ctx'> </div><div class='ctx'> SPEAR PAD MULTIPLEXING SUPPORT</div><div class='hunk'>@@ -6211,11 +6227,6 @@ F:	arch/arm/mach-spear3xx/spear3*0_evb.c</div><div class='ctx'> F:	arch/arm/mach-spear6xx/spear600.c</div><div class='ctx'> F:	arch/arm/mach-spear6xx/spear600_evb.c</div><div class='ctx'> </div><div class='del'>-SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER</div><div class='del'>-S:	Orphan</div><div class='del'>-F:	Documentation/serial/specialix.txt</div><div class='del'>-F:	drivers/staging/tty/specialix*</div><div class='del'>-</div><div class='ctx'> SPI SUBSYSTEM</div><div class='ctx'> M:	Grant Likely &lt;grant.likely@secretlab.ca&gt;</div><div class='ctx'> L:	spi-devel-general@lists.sourceforge.net</div><div class='hunk'>@@ -6258,7 +6269,7 @@ F:	arch/alpha/kernel/srm_env.c</div><div class='ctx'> </div><div class='ctx'> STABLE BRANCH</div><div class='ctx'> M:	Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='del'>-L:	stable@kernel.org</div><div class='add'>+L:	stable@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> STAGING SUBSYSTEM</div><div class='hunk'>@@ -6293,11 +6304,6 @@ M:	Manu Abraham &lt;abraham.manu@gmail.com&gt;</div><div class='ctx'> S:	Odd Fixes</div><div class='ctx'> F:	drivers/staging/crystalhd/</div><div class='ctx'> </div><div class='del'>-STAGING - CYPRESS WESTBRIDGE SUPPORT</div><div class='del'>-M:	David Cross &lt;david.cross@cypress.com&gt;</div><div class='del'>-S:	Odd Fixes</div><div class='del'>-F:	drivers/staging/westbridge/</div><div class='del'>-</div><div class='ctx'> STAGING - ECHO CANCELLER</div><div class='ctx'> M:	Steve Underwood &lt;steveu@coppice.org&gt;</div><div class='ctx'> M:	David Rowe &lt;david@rowetel.com&gt;</div><div class='hunk'>@@ -6319,12 +6325,6 @@ M:	David Täht &lt;d@teklibre.com&gt;</div><div class='ctx'> S:	Odd Fixes</div><div class='ctx'> F:	drivers/staging/frontier/</div><div class='ctx'> </div><div class='del'>-STAGING - HYPER-V (MICROSOFT)</div><div class='del'>-M:	Hank Janssen &lt;hjanssen@microsoft.com&gt;</div><div class='del'>-M:	Haiyang Zhang &lt;haiyangz@microsoft.com&gt;</div><div class='del'>-S:	Odd Fixes</div><div class='del'>-F:	drivers/staging/hv/</div><div class='del'>-</div><div class='ctx'> STAGING - INDUSTRIAL IO</div><div class='ctx'> M:	Jonathan Cameron &lt;jic23@cam.ac.uk&gt;</div><div class='ctx'> L:	linux-iio@vger.kernel.org</div><div class='hunk'>@@ -6335,7 +6335,7 @@ STAGING - LIRC (LINUX INFRARED REMOTE CONTROL) DRIVERS</div><div class='ctx'> M:	Jarod Wilson &lt;jarod@wilsonet.com&gt;</div><div class='ctx'> W:	http://www.lirc.org/</div><div class='ctx'> S:	Odd Fixes</div><div class='del'>-F:	drivers/staging/lirc/</div><div class='add'>+F:	drivers/staging/media/lirc/</div><div class='ctx'> </div><div class='ctx'> STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)</div><div class='ctx'> M:	Julian Andres Klode &lt;jak@jak-linux.org&gt;</div><div class='hunk'>@@ -6371,7 +6371,7 @@ F:	drivers/staging/sm7xx/</div><div class='ctx'> STAGING - SOFTLOGIC 6x10 MPEG CODEC</div><div class='ctx'> M:	Ben Collins &lt;bcollins@bluecherry.net&gt;</div><div class='ctx'> S:	Odd Fixes</div><div class='del'>-F:	drivers/staging/solo6x10/</div><div class='add'>+F:	drivers/staging/media/solo6x10/</div><div class='ctx'> </div><div class='ctx'> STAGING - SPEAKUP CONSOLE SPEECH DRIVER</div><div class='ctx'> M:	William Hubbs &lt;w.d.hubbs@gmail.com&gt;</div><div class='hunk'>@@ -6409,7 +6409,7 @@ S:	Odd Fixes</div><div class='ctx'> F:	drivers/staging/winbond/</div><div class='ctx'> </div><div class='ctx'> STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER</div><div class='del'>-M:	Arnaud Patard &lt;apatard@mandriva.com&gt;</div><div class='add'>+M:	Arnaud Patard &lt;arnaud.patard@rtp-net.org&gt;</div><div class='ctx'> S:	Odd Fixes</div><div class='ctx'> F:	drivers/staging/xgifb/</div><div class='ctx'> </div><div class='hunk'>@@ -6500,6 +6500,13 @@ W:	http://tcp-lp-mod.sourceforge.net/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> F:	net/ipv4/tcp_lp.c</div><div class='ctx'> </div><div class='add'>+TEAM DRIVER</div><div class='add'>+M:	Jiri Pirko &lt;jpirko@redhat.com&gt;</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+F:	drivers/net/team/</div><div class='add'>+F:	include/linux/if_team.h</div><div class='add'>+</div><div class='ctx'> TEGRA SUPPORT</div><div class='ctx'> M:	Colin Cross &lt;ccross@android.com&gt;</div><div class='ctx'> M:	Olof Johansson &lt;olof@lixom.net&gt;</div><div class='hunk'>@@ -6667,7 +6674,7 @@ TULIP NETWORK DRIVERS</div><div class='ctx'> M:	Grant Grundler &lt;grundler@parisc-linux.org&gt;</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='del'>-F:	drivers/net/ethernet/tulip/</div><div class='add'>+F:	drivers/net/ethernet/dec/tulip/</div><div class='ctx'> </div><div class='ctx'> TUN/TAP driver</div><div class='ctx'> M:	Maxim Krasnyansky &lt;maxk@qualcomm.com&gt;</div><div class='hunk'>@@ -7193,7 +7200,7 @@ S:	Maintained</div><div class='ctx'> F:	drivers/net/vmxnet3/</div><div class='ctx'> </div><div class='ctx'> VMware PVSCSI driver</div><div class='del'>-M:	Alok Kataria &lt;akataria@vmware.com&gt;</div><div class='add'>+M:	Arvind Kumar &lt;arvindkumar@vmware.com&gt;</div><div class='ctx'> M:	VMware PV-Drivers &lt;pv-drivers@vmware.com&gt;</div><div class='ctx'> L:	linux-scsi@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='head'>diff --git a/Makefile b/Makefile<br/>index adddd11c3b3b..156ac69c961e 100644<br/>--- a/<a href='/cgit/linux.git/tree/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>Makefile</a></div><div class='hunk'>@@ -312,7 +312,7 @@ endif</div><div class='ctx'> # If the user is running make -s (silent mode), suppress echoing of</div><div class='ctx'> # commands</div><div class='ctx'> </div><div class='del'>-ifneq ($(findstring s,$(MAKEFLAGS)),)</div><div class='add'>+ifneq ($(filter s% -s%,$(MAKEFLAGS)),)</div><div class='ctx'>   quiet=silent_</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='hunk'>@@ -442,7 +442,7 @@ asm-generic:</div><div class='ctx'> </div><div class='ctx'> no-dot-config-targets := clean mrproper distclean \</div><div class='ctx'> 			 cscope gtags TAGS tags help %docs check% coccicheck \</div><div class='del'>-			 include/linux/version.h headers_% \</div><div class='add'>+			 include/linux/version.h headers_% archheaders \</div><div class='ctx'> 			 kernelversion %src-pkg</div><div class='ctx'> </div><div class='ctx'> config-targets := 0</div><div class='hunk'>@@ -979,7 +979,7 @@ prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \</div><div class='ctx'>                    include/config/auto.conf</div><div class='ctx'> 	$(cmd_crmodverdir)</div><div class='ctx'> </div><div class='del'>-archprepare: prepare1 scripts_basic</div><div class='add'>+archprepare: archheaders prepare1 scripts_basic</div><div class='ctx'> </div><div class='ctx'> prepare0: archprepare FORCE</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=.</div><div class='hunk'>@@ -1046,8 +1046,11 @@ hdr-inst := -rR -f $(srctree)/scripts/Makefile.headersinst obj</div><div class='ctx'> # If we do an all arch process set dst to asm-$(hdr-arch)</div><div class='ctx'> hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm)</div><div class='ctx'> </div><div class='add'>+PHONY += archheaders</div><div class='add'>+archheaders:</div><div class='add'>+</div><div class='ctx'> PHONY += __headers</div><div class='del'>-__headers: include/linux/version.h scripts_basic asm-generic FORCE</div><div class='add'>+__headers: include/linux/version.h scripts_basic asm-generic archheaders FORCE</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=scripts build_unifdef</div><div class='ctx'> </div><div class='ctx'> PHONY += headers_install_all</div><div class='head'>diff --git a/arch/Kconfig b/arch/Kconfig<br/>index 2505740b81d2..4f55c736be11 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/Kconfig</a></div><div class='hunk'>@@ -185,4 +185,18 @@ config HAVE_RCU_TABLE_FREE</div><div class='ctx'> config ARCH_HAVE_NMI_SAFE_CMPXCHG</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+config HAVE_ALIGNED_STRUCT_PAGE</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  This makes sure that struct pages are double word aligned and that</div><div class='add'>+	  e.g. the SLUB allocator can perform double word atomic operations</div><div class='add'>+	  on a struct page for better performance. However selecting this</div><div class='add'>+	  might increase the size of a struct page by a word.</div><div class='add'>+</div><div class='add'>+config HAVE_CMPXCHG_LOCAL</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config HAVE_CMPXCHG_DOUBLE</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> source "kernel/gcov/Kconfig"</div><div class='head'>diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig<br/>index 3d74801a4015..56a4df952fb0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/alpha/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/alpha/Kconfig</a></div><div class='hunk'>@@ -70,10 +70,6 @@ config GENERIC_ISA_DMA</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-config GENERIC_IOMAP</div><div class='del'>-	bool</div><div class='del'>-	default n</div><div class='del'>-</div><div class='ctx'> source "init/Kconfig"</div><div class='ctx'> source "kernel/Kconfig.freezer"</div><div class='ctx'> </div><div class='hunk'>@@ -319,6 +315,7 @@ config ISA_DMA_API</div><div class='ctx'> config PCI</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on !ALPHA_JENSEN</div><div class='add'>+	select GENERIC_PCI_IOMAP</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  Find out whether you have a PCI motherboard. PCI is the name of a</div><div class='head'>diff --git a/arch/alpha/include/asm/ipcbuf.h b/arch/alpha/include/asm/ipcbuf.h<br/>index d9c0e1a50702..84c7e51cb6d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/alpha/include/asm/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/alpha/include/asm/ipcbuf.h</a></div><div class='hunk'>@@ -1,28 +1 @@</div><div class='del'>-#ifndef _ALPHA_IPCBUF_H</div><div class='del'>-#define _ALPHA_IPCBUF_H</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * The ipc64_perm structure for alpha architecture.</div><div class='del'>- * Note extra padding because this structure is passed back and forth</div><div class='del'>- * between kernel and user space.</div><div class='del'>- *</div><div class='del'>- * Pad space is left for:</div><div class='del'>- * - 32-bit seq</div><div class='del'>- * - 2 miscellaneous 64-bit values</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct ipc64_perm</div><div class='del'>-{</div><div class='del'>-	__kernel_key_t	key;</div><div class='del'>-	__kernel_uid_t	uid;</div><div class='del'>-	__kernel_gid_t	gid;</div><div class='del'>-	__kernel_uid_t	cuid;</div><div class='del'>-	__kernel_gid_t	cgid;</div><div class='del'>-	__kernel_mode_t	mode; </div><div class='del'>-	unsigned short	seq;</div><div class='del'>-	unsigned short	__pad1;</div><div class='del'>-	unsigned long	__unused1;</div><div class='del'>-	unsigned long	__unused2;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _ALPHA_IPCBUF_H */</div><div class='add'>+#include &lt;asm-generic/ipcbuf.h&gt;</div><div class='head'>diff --git a/arch/alpha/include/asm/socket.h b/arch/alpha/include/asm/socket.h<br/>index 06edfefc3373..082355f159e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/socket.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/alpha/include/asm/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/alpha/include/asm/socket.h</a></div><div class='hunk'>@@ -69,6 +69,9 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_RXQ_OVFL             40</div><div class='ctx'> </div><div class='add'>+#define SO_WIFI_STATUS		41</div><div class='add'>+#define SCM_WIFI_STATUS		SO_WIFI_STATUS</div><div class='add'>+</div><div class='ctx'> /* O_NONBLOCK clashes with the bits used for socket types.  Therefore we</div><div class='ctx'>  * have to define SOCK_NONBLOCK to a different value here.</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/alpha/include/asm/thread_info.h b/arch/alpha/include/asm/thread_info.h<br/>index ff73db022342..28335bd40e40 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/alpha/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/alpha/include/asm/thread_info.h</a></div><div class='hunk'>@@ -79,7 +79,6 @@ register struct thread_info *__current_thread_info __asm__("$8");</div><div class='ctx'> #define TIF_UAC_SIGBUS		12	/* ! userspace part of 'osf_sysinfo' */</div><div class='ctx'> #define TIF_MEMDIE		13	/* is terminating due to OOM killer */</div><div class='ctx'> #define TIF_RESTORE_SIGMASK	14	/* restore signal mask in do_signal */</div><div class='del'>-#define TIF_FREEZE		16	/* is freezing for suspend */</div><div class='ctx'> </div><div class='ctx'> #define _TIF_SYSCALL_TRACE	(1&lt;&lt;TIF_SYSCALL_TRACE)</div><div class='ctx'> #define _TIF_SIGPENDING		(1&lt;&lt;TIF_SIGPENDING)</div><div class='hunk'>@@ -87,7 +86,6 @@ register struct thread_info *__current_thread_info __asm__("$8");</div><div class='ctx'> #define _TIF_POLLING_NRFLAG	(1&lt;&lt;TIF_POLLING_NRFLAG)</div><div class='ctx'> #define _TIF_RESTORE_SIGMASK	(1&lt;&lt;TIF_RESTORE_SIGMASK)</div><div class='ctx'> #define _TIF_NOTIFY_RESUME	(1&lt;&lt;TIF_NOTIFY_RESUME)</div><div class='del'>-#define _TIF_FREEZE		(1&lt;&lt;TIF_FREEZE)</div><div class='ctx'> </div><div class='ctx'> /* Work to do on interrupt/exception return.  */</div><div class='ctx'> #define _TIF_WORK_MASK		(_TIF_SIGPENDING | _TIF_NEED_RESCHED | \</div><div class='head'>diff --git a/arch/alpha/include/asm/types.h b/arch/alpha/include/asm/types.h<br/>index 881544339c21..0a0579076f4a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/alpha/include/asm/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/alpha/include/asm/types.h</a></div><div class='hunk'>@@ -15,9 +15,4 @@</div><div class='ctx'> #include &lt;asm-generic/int-l64.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-</div><div class='del'>-typedef unsigned int umode_t;</div><div class='del'>-</div><div class='del'>-#endif /* __ASSEMBLY__ */</div><div class='ctx'> #endif /* _ALPHA_TYPES_H */</div><div class='head'>diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c<br/>index 246100ef07c2..04eea4894ef3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/pci-noop.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/alpha/kernel/pci-noop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/pci-noop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/alpha/kernel/pci-noop.c</a></div><div class='hunk'>@@ -185,15 +185,3 @@ struct dma_map_ops alpha_noop_ops = {</div><div class='ctx'> </div><div class='ctx'> struct dma_map_ops *dma_ops = &amp;alpha_noop_ops;</div><div class='ctx'> EXPORT_SYMBOL(dma_ops);</div><div class='del'>-</div><div class='del'>-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void pci_iounmap(struct pci_dev *dev, void __iomem * addr)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(pci_iomap);</div><div class='del'>-EXPORT_SYMBOL(pci_iounmap);</div><div class='head'>diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c<br/>index c9ab94ee1ca8..8c723c1b086a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/alpha/kernel/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/alpha/kernel/pci.c</a></div><div class='hunk'>@@ -281,27 +281,9 @@ pcibios_fixup_device_resources(struct pci_dev *dev, struct pci_bus *bus)</div><div class='ctx'> void __devinit</div><div class='ctx'> pcibios_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> {</div><div class='del'>-	/* Propagate hose info into the subordinate devices.  */</div><div class='del'>-</div><div class='del'>-	struct pci_controller *hose = bus-&gt;sysdata;</div><div class='ctx'> 	struct pci_dev *dev = bus-&gt;self;</div><div class='ctx'> </div><div class='del'>-	if (!dev) {</div><div class='del'>-		/* Root bus. */</div><div class='del'>-		u32 pci_mem_end;</div><div class='del'>-		u32 sg_base = hose-&gt;sg_pci ? hose-&gt;sg_pci-&gt;dma_base : ~0;</div><div class='del'>-		unsigned long end;</div><div class='del'>-</div><div class='del'>-		bus-&gt;resource[0] = hose-&gt;io_space;</div><div class='del'>-		bus-&gt;resource[1] = hose-&gt;mem_space;</div><div class='del'>-</div><div class='del'>-		/* Adjust hose mem_space limit to prevent PCI allocations</div><div class='del'>-		   in the iommu windows. */</div><div class='del'>-		pci_mem_end = min((u32)__direct_map_base, sg_base) - 1;</div><div class='del'>-		end = hose-&gt;mem_space-&gt;start + pci_mem_end;</div><div class='del'>-		if (hose-&gt;mem_space-&gt;end &gt; end)</div><div class='del'>-			hose-&gt;mem_space-&gt;end = end;</div><div class='del'>- 	} else if (pci_probe_only &amp;&amp;</div><div class='add'>+	if (pci_probe_only &amp;&amp; dev &amp;&amp;</div><div class='ctx'>  		   (dev-&gt;class &gt;&gt; 8) == PCI_CLASS_BRIDGE_PCI) {</div><div class='ctx'>  		pci_read_bridge_bases(bus);</div><div class='ctx'>  		pcibios_fixup_device_resources(dev, bus);</div><div class='hunk'>@@ -414,13 +396,31 @@ void __init</div><div class='ctx'> common_init_pci(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_controller *hose;</div><div class='add'>+	struct list_head resources;</div><div class='ctx'> 	struct pci_bus *bus;</div><div class='ctx'> 	int next_busno;</div><div class='ctx'> 	int need_domain_info = 0;</div><div class='add'>+	u32 pci_mem_end;</div><div class='add'>+	u32 sg_base;</div><div class='add'>+	unsigned long end;</div><div class='ctx'> </div><div class='ctx'> 	/* Scan all of the recorded PCI controllers.  */</div><div class='ctx'> 	for (next_busno = 0, hose = hose_head; hose; hose = hose-&gt;next) {</div><div class='del'>-		bus = pci_scan_bus(next_busno, alpha_mv.pci_ops, hose);</div><div class='add'>+		sg_base = hose-&gt;sg_pci ? hose-&gt;sg_pci-&gt;dma_base : ~0;</div><div class='add'>+</div><div class='add'>+		/* Adjust hose mem_space limit to prevent PCI allocations</div><div class='add'>+		   in the iommu windows. */</div><div class='add'>+		pci_mem_end = min((u32)__direct_map_base, sg_base) - 1;</div><div class='add'>+		end = hose-&gt;mem_space-&gt;start + pci_mem_end;</div><div class='add'>+		if (hose-&gt;mem_space-&gt;end &gt; end)</div><div class='add'>+			hose-&gt;mem_space-&gt;end = end;</div><div class='add'>+</div><div class='add'>+		INIT_LIST_HEAD(&amp;resources);</div><div class='add'>+		pci_add_resource(&amp;resources, hose-&gt;io_space);</div><div class='add'>+		pci_add_resource(&amp;resources, hose-&gt;mem_space);</div><div class='add'>+</div><div class='add'>+		bus = pci_scan_root_bus(NULL, next_busno, alpha_mv.pci_ops,</div><div class='add'>+					hose, &amp;resources);</div><div class='ctx'> 		hose-&gt;bus = bus;</div><div class='ctx'> 		hose-&gt;need_domain_info = need_domain_info;</div><div class='ctx'> 		next_busno = bus-&gt;subordinate + 1;</div><div class='hunk'>@@ -508,30 +508,7 @@ sys_pciconfig_iobase(long which, unsigned long bus, unsigned long dfn)</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Create an __iomem token from a PCI BAR.  Copied from lib/iomap.c with</div><div class='del'>-   no changes, since we don't want the other things in that object file.  */</div><div class='del'>-</div><div class='del'>-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)</div><div class='del'>-{</div><div class='del'>-	resource_size_t start = pci_resource_start(dev, bar);</div><div class='del'>-	resource_size_t len = pci_resource_len(dev, bar);</div><div class='del'>-	unsigned long flags = pci_resource_flags(dev, bar);</div><div class='del'>-</div><div class='del'>-	if (!len || !start)</div><div class='del'>-		return NULL;</div><div class='del'>-	if (maxlen &amp;&amp; len &gt; maxlen)</div><div class='del'>-		len = maxlen;</div><div class='del'>-	if (flags &amp; IORESOURCE_IO)</div><div class='del'>-		return ioport_map(start, len);</div><div class='del'>-	if (flags &amp; IORESOURCE_MEM) {</div><div class='del'>-		/* Not checking IORESOURCE_CACHEABLE because alpha does</div><div class='del'>-		   not distinguish between ioremap and ioremap_nocache.  */</div><div class='del'>-		return ioremap(start, len);</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy that token.  Not copied from lib/iomap.c.  */</div><div class='add'>+/* Destroy an __iomem token.  Not copied from lib/iomap.c.  */</div><div class='ctx'> </div><div class='ctx'> void pci_iounmap(struct pci_dev *dev, void __iomem * addr)</div><div class='ctx'> {</div><div class='hunk'>@@ -539,7 +516,6 @@ void pci_iounmap(struct pci_dev *dev, void __iomem * addr)</div><div class='ctx'> 		iounmap(addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(pci_iomap);</div><div class='ctx'> EXPORT_SYMBOL(pci_iounmap);</div><div class='ctx'> </div><div class='ctx'> /* FIXME: Some boxes have multiple ISA bridges! */</div><div class='head'>diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig<br/>index b259c7c644e3..24626b0419ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/Kconfig</a></div><div class='hunk'>@@ -16,6 +16,7 @@ config ARM</div><div class='ctx'> 	select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)</div><div class='ctx'> 	select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL)</div><div class='ctx'> 	select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL)</div><div class='add'>+	select ARCH_BINFMT_ELF_RANDOMIZE_PIE</div><div class='ctx'> 	select HAVE_GENERIC_DMA_COHERENT</div><div class='ctx'> 	select HAVE_KERNEL_GZIP</div><div class='ctx'> 	select HAVE_KERNEL_LZO</div><div class='hunk'>@@ -30,6 +31,7 @@ config ARM</div><div class='ctx'> 	select HAVE_SPARSE_IRQ</div><div class='ctx'> 	select GENERIC_IRQ_SHOW</div><div class='ctx'> 	select CPU_PM if (SUSPEND || CPU_IDLE)</div><div class='add'>+	select GENERIC_PCI_IOMAP</div><div class='ctx'> 	help</div><div class='ctx'> 	  The ARM series is a line of low-power-consumption RISC chip designs</div><div class='ctx'> 	  licensed by ARM Ltd and targeted at embedded applications and</div><div class='hunk'>@@ -258,6 +260,7 @@ config ARCH_INTEGRATOR</div><div class='ctx'> 	select ARCH_HAS_CPUFREQ</div><div class='ctx'> 	select CLKDEV_LOOKUP</div><div class='ctx'> 	select HAVE_MACH_CLKDEV</div><div class='add'>+	select HAVE_TCM</div><div class='ctx'> 	select ICST</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='ctx'> 	select PLAT_VERSATILE</div><div class='hunk'>@@ -341,10 +344,12 @@ config ARCH_HIGHBANK</div><div class='ctx'> 	select ARM_AMBA</div><div class='ctx'> 	select ARM_GIC</div><div class='ctx'> 	select ARM_TIMER_SP804</div><div class='add'>+	select CACHE_L2X0</div><div class='ctx'> 	select CLKDEV_LOOKUP</div><div class='ctx'> 	select CPU_V7</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='ctx'> 	select HAVE_ARM_SCU</div><div class='add'>+	select HAVE_SMP</div><div class='ctx'> 	select USE_OF</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for the Calxeda Highbank SoC based boards.</div><div class='hunk'>@@ -362,6 +367,7 @@ config ARCH_CNS3XXX</div><div class='ctx'> 	select CPU_V6K</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='ctx'> 	select ARM_GIC</div><div class='add'>+	select MIGHT_HAVE_CACHE_L2X0</div><div class='ctx'> 	select MIGHT_HAVE_PCI</div><div class='ctx'> 	select PCI_DOMAINS if PCI</div><div class='ctx'> 	help</div><div class='hunk'>@@ -382,6 +388,7 @@ config ARCH_PRIMA2</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='ctx'> 	select CLKDEV_LOOKUP</div><div class='ctx'> 	select GENERIC_IRQ_CHIP</div><div class='add'>+	select MIGHT_HAVE_CACHE_L2X0</div><div class='ctx'> 	select USE_OF</div><div class='ctx'> 	select ZONE_DMA</div><div class='ctx'> 	help</div><div class='hunk'>@@ -442,6 +449,7 @@ config ARCH_MXS</div><div class='ctx'> 	select ARCH_REQUIRE_GPIOLIB</div><div class='ctx'> 	select CLKDEV_LOOKUP</div><div class='ctx'> 	select CLKSRC_MMIO</div><div class='add'>+	select HAVE_CLK_PREPARE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for Freescale MXS-based family of processors</div><div class='ctx'> </div><div class='hunk'>@@ -592,6 +600,7 @@ config ARCH_MMP</div><div class='ctx'> 	select ARCH_REQUIRE_GPIOLIB</div><div class='ctx'> 	select CLKDEV_LOOKUP</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='add'>+	select GPIO_PXA</div><div class='ctx'> 	select HAVE_SCHED_CLOCK</div><div class='ctx'> 	select TICK_ONESHOT</div><div class='ctx'> 	select PLAT_PXA</div><div class='hunk'>@@ -634,6 +643,8 @@ config ARCH_TEGRA</div><div class='ctx'> 	select GENERIC_GPIO</div><div class='ctx'> 	select HAVE_CLK</div><div class='ctx'> 	select HAVE_SCHED_CLOCK</div><div class='add'>+	select HAVE_SMP</div><div class='add'>+	select MIGHT_HAVE_CACHE_L2X0</div><div class='ctx'> 	select ARCH_HAS_CPUFREQ</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables support for NVIDIA Tegra based systems (Tegra APX,</div><div class='hunk'>@@ -651,6 +662,7 @@ config ARCH_PICOXCELL</div><div class='ctx'> 	select HAVE_SCHED_CLOCK</div><div class='ctx'> 	select HAVE_TCM</div><div class='ctx'> 	select NO_IOPORT</div><div class='add'>+	select SPARSE_IRQ</div><div class='ctx'> 	select USE_OF</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables support for systems based on the Picochip picoXcell</div><div class='hunk'>@@ -674,6 +686,7 @@ config ARCH_PXA</div><div class='ctx'> 	select CLKSRC_MMIO</div><div class='ctx'> 	select ARCH_REQUIRE_GPIOLIB</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='add'>+	select GPIO_PXA</div><div class='ctx'> 	select HAVE_SCHED_CLOCK</div><div class='ctx'> 	select TICK_ONESHOT</div><div class='ctx'> 	select PLAT_PXA</div><div class='hunk'>@@ -703,7 +716,9 @@ config ARCH_SHMOBILE</div><div class='ctx'> 	select HAVE_CLK</div><div class='ctx'> 	select CLKDEV_LOOKUP</div><div class='ctx'> 	select HAVE_MACH_CLKDEV</div><div class='add'>+	select HAVE_SMP</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='add'>+	select MIGHT_HAVE_CACHE_L2X0</div><div class='ctx'> 	select NO_IOPORT</div><div class='ctx'> 	select SPARSE_IRQ</div><div class='ctx'> 	select MULTI_IRQ_HANDLER</div><div class='hunk'>@@ -739,7 +754,7 @@ config ARCH_SA1100</div><div class='ctx'> 	select ARCH_HAS_CPUFREQ</div><div class='ctx'> 	select CPU_FREQ</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='del'>-	select HAVE_CLK</div><div class='add'>+	select CLKDEV_LOOKUP</div><div class='ctx'> 	select HAVE_SCHED_CLOCK</div><div class='ctx'> 	select TICK_ONESHOT</div><div class='ctx'> 	select ARCH_REQUIRE_GPIOLIB</div><div class='hunk'>@@ -868,16 +883,6 @@ config ARCH_SHARK</div><div class='ctx'> 	  Support for the StrongARM based Digital DNARD machine, also known</div><div class='ctx'> 	  as "Shark" (&lt;http://www.shark-linux.de/shark.html&gt;).</div><div class='ctx'> </div><div class='del'>-config ARCH_TCC_926</div><div class='del'>-	bool "Telechips TCC ARM926-based systems"</div><div class='del'>-	select CLKSRC_MMIO</div><div class='del'>-	select CPU_ARM926T</div><div class='del'>-	select HAVE_CLK</div><div class='del'>-	select CLKDEV_LOOKUP</div><div class='del'>-	select GENERIC_CLOCKEVENTS</div><div class='del'>-	help</div><div class='del'>-	  Support for Telechips TCC ARM926-based systems.</div><div class='del'>-</div><div class='ctx'> config ARCH_U300</div><div class='ctx'> 	bool "ST-Ericsson U300 Series"</div><div class='ctx'> 	depends on MMU</div><div class='hunk'>@@ -893,7 +898,6 @@ config ARCH_U300</div><div class='ctx'> 	select HAVE_MACH_CLKDEV</div><div class='ctx'> 	select GENERIC_GPIO</div><div class='ctx'> 	select ARCH_REQUIRE_GPIOLIB</div><div class='del'>-	select NEED_MACH_MEMORY_H</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for ST-Ericsson U300 series mobile platforms.</div><div class='ctx'> </div><div class='hunk'>@@ -905,6 +909,8 @@ config ARCH_U8500</div><div class='ctx'> 	select CLKDEV_LOOKUP</div><div class='ctx'> 	select ARCH_REQUIRE_GPIOLIB</div><div class='ctx'> 	select ARCH_HAS_CPUFREQ</div><div class='add'>+	select HAVE_SMP</div><div class='add'>+	select MIGHT_HAVE_CACHE_L2X0</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for ST-Ericsson's Ux500 architecture</div><div class='ctx'> </div><div class='hunk'>@@ -915,6 +921,7 @@ config ARCH_NOMADIK</div><div class='ctx'> 	select CPU_ARM926T</div><div class='ctx'> 	select CLKDEV_LOOKUP</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='add'>+	select MIGHT_HAVE_CACHE_L2X0</div><div class='ctx'> 	select ARCH_REQUIRE_GPIOLIB</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for the Nomadik platform by ST-Ericsson</div><div class='hunk'>@@ -974,6 +981,7 @@ config ARCH_ZYNQ</div><div class='ctx'> 	select ARM_GIC</div><div class='ctx'> 	select ARM_AMBA</div><div class='ctx'> 	select ICST</div><div class='add'>+	select MIGHT_HAVE_CACHE_L2X0</div><div class='ctx'> 	select USE_OF</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for Xilinx Zynq ARM Cortex A9 Platform</div><div class='hunk'>@@ -1060,8 +1068,6 @@ source "arch/arm/plat-s5p/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "arch/arm/plat-spear/Kconfig"</div><div class='ctx'> </div><div class='del'>-source "arch/arm/plat-tcc/Kconfig"</div><div class='del'>-</div><div class='ctx'> if ARCH_S3C2410</div><div class='ctx'> source "arch/arm/mach-s3c2410/Kconfig"</div><div class='ctx'> source "arch/arm/mach-s3c2412/Kconfig"</div><div class='hunk'>@@ -1126,6 +1132,11 @@ config ARM_TIMER_SP804</div><div class='ctx'> </div><div class='ctx'> source arch/arm/mm/Kconfig</div><div class='ctx'> </div><div class='add'>+config ARM_NR_BANKS</div><div class='add'>+	int</div><div class='add'>+	default 16 if ARCH_EP93XX</div><div class='add'>+	default 8</div><div class='add'>+</div><div class='ctx'> config IWMMXT</div><div class='ctx'> 	bool "Enable iWMMXt support"</div><div class='ctx'> 	depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4</div><div class='hunk'>@@ -1134,10 +1145,9 @@ config IWMMXT</div><div class='ctx'> 	  Enable support for iWMMXt context switching at run time if</div><div class='ctx'> 	  running on a CPU that supports it.</div><div class='ctx'> </div><div class='del'>-#  bool 'Use XScale PMU as timer source' CONFIG_XSCALE_PMU_TIMER</div><div class='ctx'> config XSCALE_PMU</div><div class='ctx'> 	bool</div><div class='del'>-	depends on CPU_XSCALE &amp;&amp; !XSCALE_PMU_TIMER</div><div class='add'>+	depends on CPU_XSCALE</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='ctx'> config CPU_HAS_PMU</div><div class='hunk'>@@ -1435,14 +1445,20 @@ menu "Kernel Features"</div><div class='ctx'> </div><div class='ctx'> source "kernel/time/Kconfig"</div><div class='ctx'> </div><div class='add'>+config HAVE_SMP</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  This option should be selected by machines which have an SMP-</div><div class='add'>+	  capable CPU.</div><div class='add'>+</div><div class='add'>+	  The only effect of this option is to make the SMP-related</div><div class='add'>+	  options available to the user for configuration.</div><div class='add'>+</div><div class='ctx'> config SMP</div><div class='ctx'> 	bool "Symmetric Multi-Processing"</div><div class='ctx'> 	depends on CPU_V6K || CPU_V7</div><div class='ctx'> 	depends on GENERIC_CLOCKEVENTS</div><div class='del'>-	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \</div><div class='del'>-		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \</div><div class='del'>-		 ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \</div><div class='del'>-		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || ARCH_HIGHBANK || SOC_IMX6Q</div><div class='add'>+	depends on HAVE_SMP</div><div class='ctx'> 	depends on MMU</div><div class='ctx'> 	select USE_GENERIC_SMP_HELPERS</div><div class='ctx'> 	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP</div><div class='hunk'>@@ -1560,6 +1576,16 @@ config LOCAL_TIMERS</div><div class='ctx'> 	  accounting to be spread across the timer interval, preventing a</div><div class='ctx'> 	  "thundering herd" at every timer tick.</div><div class='ctx'> </div><div class='add'>+config ARCH_NR_GPIO</div><div class='add'>+	int</div><div class='add'>+	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA</div><div class='add'>+	default 350 if ARCH_U8500</div><div class='add'>+	default 0</div><div class='add'>+	help</div><div class='add'>+	  Maximum number of GPIOs in the system.</div><div class='add'>+</div><div class='add'>+	  If unsure, leave the default value.</div><div class='add'>+</div><div class='ctx'> source kernel/Kconfig.preempt</div><div class='ctx'> </div><div class='ctx'> config HZ</div><div class='hunk'>@@ -1972,7 +1998,7 @@ endchoice</div><div class='ctx'> </div><div class='ctx'> config XIP_KERNEL</div><div class='ctx'> 	bool "Kernel Execute-In-Place from ROM"</div><div class='del'>-	depends on !ZBOOT_ROM</div><div class='add'>+	depends on !ZBOOT_ROM &amp;&amp; !ARM_LPAE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Execute-In-Place allows the kernel to run from non-volatile storage</div><div class='ctx'> 	  directly addressable by the CPU, such as NOR flash. This saves RAM</div><div class='hunk'>@@ -2002,7 +2028,7 @@ config XIP_PHYS_ADDR</div><div class='ctx'> </div><div class='ctx'> config KEXEC</div><div class='ctx'> 	bool "Kexec system call (EXPERIMENTAL)"</div><div class='del'>-	depends on EXPERIMENTAL</div><div class='add'>+	depends on EXPERIMENTAL &amp;&amp; (!SMP || HOTPLUG_CPU)</div><div class='ctx'> 	help</div><div class='ctx'> 	  kexec is a system call that implements the ability to shutdown your</div><div class='ctx'> 	  current kernel, and to start another kernel.  It is like a reboot</div><div class='head'>diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug<br/>index c5213e78606b..e0d236d7ff73 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/Kconfig.debug?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/Kconfig.debug</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/Kconfig.debug?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/Kconfig.debug</a></div><div class='hunk'>@@ -100,6 +100,14 @@ choice</div><div class='ctx'> 		  Note that the system will appear to hang during boot if there</div><div class='ctx'> 		  is nothing connected to read from the DCC.</div><div class='ctx'> </div><div class='add'>+	config AT91_DEBUG_LL_DBGU0</div><div class='add'>+		bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10 and 9rl"</div><div class='add'>+		depends on HAVE_AT91_DBGU0</div><div class='add'>+</div><div class='add'>+	config AT91_DEBUG_LL_DBGU1</div><div class='add'>+		bool "Kernel low-level debugging on 9263, 9g45 and cap9"</div><div class='add'>+		depends on HAVE_AT91_DBGU1</div><div class='add'>+</div><div class='ctx'> 	config DEBUG_FOOTBRIDGE_COM1</div><div class='ctx'> 		bool "Kernel low-level debugging messages via footbridge 8250 at PCI COM1"</div><div class='ctx'> 		depends on FOOTBRIDGE</div><div class='hunk'>@@ -247,6 +255,43 @@ choice</div><div class='ctx'> 		  their output to the standard serial port on the RealView</div><div class='ctx'> 		  PB1176 platform.</div><div class='ctx'> </div><div class='add'>+	config DEBUG_MSM_UART1</div><div class='add'>+		bool "Kernel low-level debugging messages via MSM UART1"</div><div class='add'>+		depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50</div><div class='add'>+		help</div><div class='add'>+		  Say Y here if you want the debug print routines to direct</div><div class='add'>+		  their output to the first serial port on MSM devices.</div><div class='add'>+</div><div class='add'>+	config DEBUG_MSM_UART2</div><div class='add'>+		bool "Kernel low-level debugging messages via MSM UART2"</div><div class='add'>+		depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50</div><div class='add'>+		help</div><div class='add'>+		  Say Y here if you want the debug print routines to direct</div><div class='add'>+		  their output to the second serial port on MSM devices.</div><div class='add'>+</div><div class='add'>+	config DEBUG_MSM_UART3</div><div class='add'>+		bool "Kernel low-level debugging messages via MSM UART3"</div><div class='add'>+		depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50</div><div class='add'>+		help</div><div class='add'>+		  Say Y here if you want the debug print routines to direct</div><div class='add'>+		  their output to the third serial port on MSM devices.</div><div class='add'>+</div><div class='add'>+	config DEBUG_MSM8660_UART</div><div class='add'>+		bool "Kernel low-level debugging messages via MSM 8660 UART"</div><div class='add'>+		depends on ARCH_MSM8X60</div><div class='add'>+		select MSM_HAS_DEBUG_UART_HS</div><div class='add'>+		help</div><div class='add'>+		  Say Y here if you want the debug print routines to direct</div><div class='add'>+		  their output to the serial port on MSM 8660 devices.</div><div class='add'>+</div><div class='add'>+	config DEBUG_MSM8960_UART</div><div class='add'>+		bool "Kernel low-level debugging messages via MSM 8960 UART"</div><div class='add'>+		depends on ARCH_MSM8960</div><div class='add'>+		select MSM_HAS_DEBUG_UART_HS</div><div class='add'>+		help</div><div class='add'>+		  Say Y here if you want the debug print routines to direct</div><div class='add'>+		  their output to the serial port on MSM 8960 devices.</div><div class='add'>+</div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='ctx'> config EARLY_PRINTK</div><div class='head'>diff --git a/arch/arm/Makefile b/arch/arm/Makefile<br/>index dfcf3b033e10..40319d91bb7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/Makefile</a></div><div class='hunk'>@@ -184,7 +184,6 @@ machine-$(CONFIG_ARCH_EXYNOS4)		:= exynos</div><div class='ctx'> machine-$(CONFIG_ARCH_SA1100)		:= sa1100</div><div class='ctx'> machine-$(CONFIG_ARCH_SHARK)		:= shark</div><div class='ctx'> machine-$(CONFIG_ARCH_SHMOBILE) 	:= shmobile</div><div class='del'>-machine-$(CONFIG_ARCH_TCC8K)		:= tcc8k</div><div class='ctx'> machine-$(CONFIG_ARCH_TEGRA)		:= tegra</div><div class='ctx'> machine-$(CONFIG_ARCH_U300)		:= u300</div><div class='ctx'> machine-$(CONFIG_ARCH_U8500)		:= ux500</div><div class='hunk'>@@ -204,7 +203,6 @@ machine-$(CONFIG_ARCH_ZYNQ)		:= zynq</div><div class='ctx'> plat-$(CONFIG_ARCH_MXC)		:= mxc</div><div class='ctx'> plat-$(CONFIG_ARCH_OMAP)	:= omap</div><div class='ctx'> plat-$(CONFIG_ARCH_S3C64XX)	:= samsung</div><div class='del'>-plat-$(CONFIG_ARCH_TCC_926)	:= tcc</div><div class='ctx'> plat-$(CONFIG_ARCH_ZYNQ)	:= versatile</div><div class='ctx'> plat-$(CONFIG_PLAT_IOP)		:= iop</div><div class='ctx'> plat-$(CONFIG_PLAT_NOMADIK)	:= nomadik</div><div class='head'>diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile<br/>index 5df26a9976a2..fc871e719aae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/Makefile</a></div><div class='hunk'>@@ -59,9 +59,11 @@ $(obj)/zImage:	$(obj)/compressed/vmlinux FORCE</div><div class='ctx'> </div><div class='ctx'> endif</div><div class='ctx'> </div><div class='add'>+targets += $(dtb-y)</div><div class='add'>+</div><div class='ctx'> # Rule to build device tree blobs</div><div class='del'>-$(obj)/%.dtb: $(src)/dts/%.dts</div><div class='del'>-	$(call cmd,dtc)</div><div class='add'>+$(obj)/%.dtb: $(src)/dts/%.dts FORCE</div><div class='add'>+	$(call if_changed_dep,dtc)</div><div class='ctx'> </div><div class='ctx'> $(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile<br/>index 21f56ff32797..cf0a64ce4b83 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/compressed/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/compressed/Makefile</a></div><div class='hunk'>@@ -126,7 +126,8 @@ ccflags-y := -fpic -fno-builtin -I$(obj)</div><div class='ctx'> asflags-y := -Wa,-march=all</div><div class='ctx'> </div><div class='ctx'> # Supply kernel BSS size to the decompressor via a linker symbol.</div><div class='del'>-KBSS_SZ = $(shell size $(obj)/../../../../vmlinux | awk 'END{print $$3}')</div><div class='add'>+KBSS_SZ = $(shell $(CROSS_COMPILE)size $(obj)/../../../../vmlinux | \</div><div class='add'>+		awk 'END{print $$3}')</div><div class='ctx'> LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ)</div><div class='ctx'> # Supply ZRELADDR to the decompressor via a linker symbol.</div><div class='ctx'> ifneq ($(CONFIG_AUTO_ZRELADDR),y)</div><div class='head'>diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S<br/>index c2effc917254..c5d60250d43d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/compressed/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/compressed/head.S</a></div><div class='hunk'>@@ -659,6 +659,7 @@ __armv7_mmu_cache_on:</div><div class='ctx'> 		mcrne	p15, 0, r3, c2, c0, 0	@ load page table pointer</div><div class='ctx'> 		mcrne	p15, 0, r1, c3, c0, 0	@ load domain access control</div><div class='ctx'> #endif</div><div class='add'>+		mcr	p15, 0, r0, c7, c5, 4	@ ISB</div><div class='ctx'> 		mcr	p15, 0, r0, c1, c0, 0	@ load control register</div><div class='ctx'> 		mrc	p15, 0, r0, c1, c0, 0	@ and read it back</div><div class='ctx'> 		mov	r0, #0</div><div class='head'>diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi<br/>index aeef04269cf8..07603b8c9503 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/at91sam9g20.dtsi?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/at91sam9g20.dtsi</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/at91sam9g20.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/at91sam9g20.dtsi</a></div><div class='hunk'>@@ -114,6 +114,13 @@</div><div class='ctx'> 				atmel,use-dma-tx;</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='add'>+</div><div class='add'>+			macb0: ethernet@fffc4000 {</div><div class='add'>+				compatible = "cdns,at32ap7000-macb", "cdns,macb";</div><div class='add'>+				reg = &lt;0xfffc4000 0x100&gt;;</div><div class='add'>+				interrupts = &lt;21&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi<br/>index db6a45202f26..fffa005300a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/at91sam9g45.dtsi?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/at91sam9g45.dtsi</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/at91sam9g45.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/at91sam9g45.dtsi</a></div><div class='hunk'>@@ -101,6 +101,13 @@</div><div class='ctx'> 				atmel,use-dma-tx;</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='add'>+</div><div class='add'>+			macb0: ethernet@fffbc000 {</div><div class='add'>+				compatible = "cdns,at32ap7000-macb", "cdns,macb";</div><div class='add'>+				reg = &lt;0xfffbc000 0x100&gt;;</div><div class='add'>+				interrupts = &lt;25&gt;;</div><div class='add'>+				status = "disabled";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts<br/>index 85b34f59cd82..a387e7704ce1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/at91sam9m10g45ek.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/at91sam9m10g45ek.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/at91sam9m10g45ek.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/at91sam9m10g45ek.dts</a></div><div class='hunk'>@@ -30,6 +30,11 @@</div><div class='ctx'> 			usart1: serial@fff90000 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='add'>+</div><div class='add'>+			macb0: ethernet@fffbc000 {</div><div class='add'>+				phy-mode = "rmii";</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts<br/>new file mode 100644<br/>index 000000000000..b8c476384eef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/exynos4210-origen.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/exynos4210-origen.dts</a></div><div class='hunk'>@@ -0,0 +1,137 @@</div><div class='add'>+/*</div><div class='add'>+ * Samsung's Exynos4210 based Origen board device tree source</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ * Copyright (c) 2010-2011 Linaro Ltd.</div><div class='add'>+ *		www.linaro.org</div><div class='add'>+ *</div><div class='add'>+ * Device tree source file for Insignal's Origen board which is based on</div><div class='add'>+ * Samsung's Exynos4210 SoC.</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/include/ "exynos4210.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Insignal Origen evaluation board based on Exynos4210";</div><div class='add'>+	compatible = "insignal,origen", "samsung,exynos4210";</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x40000000 0x40000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@12530000 {</div><div class='add'>+		samsung,sdhci-bus-width = &lt;4&gt;;</div><div class='add'>+		linux,mmc_cap_4_bit_data;</div><div class='add'>+		samsung,sdhci-cd-internal;</div><div class='add'>+		gpio-cd = &lt;&amp;gpk2 2 2 3 3&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpk2 0 2 0 3&gt;,</div><div class='add'>+			&lt;&amp;gpk2 1 2 0 3&gt;,</div><div class='add'>+			&lt;&amp;gpk2 3 2 3 3&gt;,</div><div class='add'>+			&lt;&amp;gpk2 4 2 3 3&gt;,</div><div class='add'>+			&lt;&amp;gpk2 5 2 3 3&gt;,</div><div class='add'>+			&lt;&amp;gpk2 6 2 3 3&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@12510000 {</div><div class='add'>+		samsung,sdhci-bus-width = &lt;4&gt;;</div><div class='add'>+		linux,mmc_cap_4_bit_data;</div><div class='add'>+		samsung,sdhci-cd-internal;</div><div class='add'>+		gpio-cd = &lt;&amp;gpk0 2 2 3 3&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpk0 0 2 0 3&gt;,</div><div class='add'>+			&lt;&amp;gpk0 1 2 0 3&gt;,</div><div class='add'>+			&lt;&amp;gpk0 3 2 3 3&gt;,</div><div class='add'>+			&lt;&amp;gpk0 4 2 3 3&gt;,</div><div class='add'>+			&lt;&amp;gpk0 5 2 3 3&gt;,</div><div class='add'>+			&lt;&amp;gpk0 6 2 3 3&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio_keys {</div><div class='add'>+		compatible = "gpio-keys";</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'>+		up {</div><div class='add'>+			label = "Up";</div><div class='add'>+			gpios = &lt;&amp;gpx2 0 0 0 2&gt;;</div><div class='add'>+			linux,code = &lt;103&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		down {</div><div class='add'>+			label = "Down";</div><div class='add'>+			gpios = &lt;&amp;gpx2 1 0 0 2&gt;;</div><div class='add'>+			linux,code = &lt;108&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		back {</div><div class='add'>+			label = "Back";</div><div class='add'>+			gpios = &lt;&amp;gpx1 7 0 0 2&gt;;</div><div class='add'>+			linux,code = &lt;158&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		home {</div><div class='add'>+			label = "Home";</div><div class='add'>+			gpios = &lt;&amp;gpx1 6 0 0 2&gt;;</div><div class='add'>+			linux,code = &lt;102&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		menu {</div><div class='add'>+			label = "Menu";</div><div class='add'>+			gpios = &lt;&amp;gpx1 5 0 0 2&gt;;</div><div class='add'>+			linux,code = &lt;139&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	keypad@100A0000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@12520000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@12540000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@13860000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@13870000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@13880000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@13890000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@138A0000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@138B0000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@138C0000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@138D0000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts<br/>new file mode 100644<br/>index 000000000000..27afc8e535ca<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/exynos4210-smdkv310.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/exynos4210-smdkv310.dts</a></div><div class='hunk'>@@ -0,0 +1,182 @@</div><div class='add'>+/*</div><div class='add'>+ * Samsung's Exynos4210 based SMDKV310 board device tree source</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ * Copyright (c) 2010-2011 Linaro Ltd.</div><div class='add'>+ *		www.linaro.org</div><div class='add'>+ *</div><div class='add'>+ * Device tree source file for Samsung's SMDKV310 board which is based on</div><div class='add'>+ * Samsung's Exynos4210 SoC.</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/include/ "exynos4210.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Samsung smdkv310 evaluation board based on Exynos4210";</div><div class='add'>+	compatible = "samsung,smdkv310", "samsung,exynos4210";</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x40000000 0x80000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@12530000 {</div><div class='add'>+		samsung,sdhci-bus-width = &lt;4&gt;;</div><div class='add'>+		linux,mmc_cap_4_bit_data;</div><div class='add'>+		samsung,sdhci-cd-internal;</div><div class='add'>+		gpio-cd = &lt;&amp;gpk2 2 2 3 3&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpk2 0 2 0 3&gt;,</div><div class='add'>+			&lt;&amp;gpk2 1 2 0 3&gt;,</div><div class='add'>+			&lt;&amp;gpk2 3 2 3 3&gt;,</div><div class='add'>+			&lt;&amp;gpk2 4 2 3 3&gt;,</div><div class='add'>+			&lt;&amp;gpk2 5 2 3 3&gt;,</div><div class='add'>+			&lt;&amp;gpk2 6 2 3 3&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	keypad@100A0000 {</div><div class='add'>+		samsung,keypad-num-rows = &lt;2&gt;;</div><div class='add'>+		samsung,keypad-num-columns = &lt;8&gt;;</div><div class='add'>+		linux,keypad-no-autorepeat;</div><div class='add'>+		linux,keypad-wakeup;</div><div class='add'>+</div><div class='add'>+		row-gpios = &lt;&amp;gpx2 0 3 3 0&gt;,</div><div class='add'>+			    &lt;&amp;gpx2 1 3 3 0&gt;;</div><div class='add'>+</div><div class='add'>+		col-gpios = &lt;&amp;gpx1 0 3 0 0&gt;,</div><div class='add'>+			    &lt;&amp;gpx1 1 3 0 0&gt;,</div><div class='add'>+			    &lt;&amp;gpx1 2 3 0 0&gt;,</div><div class='add'>+			    &lt;&amp;gpx1 3 3 0 0&gt;,</div><div class='add'>+			    &lt;&amp;gpx1 4 3 0 0&gt;,</div><div class='add'>+			    &lt;&amp;gpx1 5 3 0 0&gt;,</div><div class='add'>+			    &lt;&amp;gpx1 6 3 0 0&gt;,</div><div class='add'>+			    &lt;&amp;gpx1 7 3 0 0&gt;;</div><div class='add'>+</div><div class='add'>+		key_1 {</div><div class='add'>+			keypad,row = &lt;0&gt;;</div><div class='add'>+			keypad,column = &lt;3&gt;;</div><div class='add'>+			linux,code = &lt;2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		key_2 {</div><div class='add'>+			keypad,row = &lt;0&gt;;</div><div class='add'>+			keypad,column = &lt;4&gt;;</div><div class='add'>+			linux,code = &lt;3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		key_3 {</div><div class='add'>+			keypad,row = &lt;0&gt;;</div><div class='add'>+			keypad,column = &lt;5&gt;;</div><div class='add'>+			linux,code = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		key_4 {</div><div class='add'>+			keypad,row = &lt;0&gt;;</div><div class='add'>+			keypad,column = &lt;6&gt;;</div><div class='add'>+			linux,code = &lt;5&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		key_5 {</div><div class='add'>+			keypad,row = &lt;0&gt;;</div><div class='add'>+			keypad,column = &lt;7&gt;;</div><div class='add'>+			linux,code = &lt;6&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		key_a {</div><div class='add'>+			keypad,row = &lt;1&gt;;</div><div class='add'>+			keypad,column = &lt;3&gt;;</div><div class='add'>+			linux,code = &lt;30&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		key_b {</div><div class='add'>+			keypad,row = &lt;1&gt;;</div><div class='add'>+			keypad,column = &lt;4&gt;;</div><div class='add'>+			linux,code = &lt;48&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		key_c {</div><div class='add'>+			keypad,row = &lt;1&gt;;</div><div class='add'>+			keypad,column = &lt;5&gt;;</div><div class='add'>+			linux,code = &lt;46&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		key_d {</div><div class='add'>+			keypad,row = &lt;1&gt;;</div><div class='add'>+			keypad,column = &lt;6&gt;;</div><div class='add'>+			linux,code = &lt;32&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		key_e {</div><div class='add'>+			keypad,row = &lt;1&gt;;</div><div class='add'>+			keypad,column = &lt;7&gt;;</div><div class='add'>+			linux,code = &lt;18&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@13860000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		samsung,i2c-sda-delay = &lt;100&gt;;</div><div class='add'>+		samsung,i2c-max-bus-freq = &lt;20000&gt;;</div><div class='add'>+		gpios = &lt;&amp;gpd1 0 2 3 0&gt;,</div><div class='add'>+			&lt;&amp;gpd1 1 2 3 0&gt;;</div><div class='add'>+</div><div class='add'>+		eeprom@50 {</div><div class='add'>+			compatible = "samsung,24ad0xd1";</div><div class='add'>+			reg = &lt;0x50&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		eeprom@52 {</div><div class='add'>+			compatible = "samsung,24ad0xd1";</div><div class='add'>+			reg = &lt;0x52&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@12510000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@12520000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@12540000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@13870000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@13880000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@13890000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@138A0000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@138B0000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@138C0000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@138D0000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi<br/>new file mode 100644<br/>index 000000000000..63d7578856c1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/exynos4210.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/exynos4210.dtsi</a></div><div class='hunk'>@@ -0,0 +1,397 @@</div><div class='add'>+/*</div><div class='add'>+ * Samsung's Exynos4210 SoC device tree source</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ * Copyright (c) 2010-2011 Linaro Ltd.</div><div class='add'>+ *		www.linaro.org</div><div class='add'>+ *</div><div class='add'>+ * Samsung's Exynos4210 SoC device nodes are listed in this file. Exynos4210</div><div class='add'>+ * based board files can include this file and provide values for board specfic</div><div class='add'>+ * bindings.</div><div class='add'>+ *</div><div class='add'>+ * Note: This file does not include device nodes for all the controllers in</div><div class='add'>+ * Exynos4210 SoC. As device tree coverage for Exynos4210 increases, additional</div><div class='add'>+ * nodes can be added to this file.</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/include/ "skeleton.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "samsung,exynos4210";</div><div class='add'>+	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+</div><div class='add'>+	gic:interrupt-controller@10490000 {</div><div class='add'>+		compatible = "arm,cortex-a9-gic";</div><div class='add'>+		#interrupt-cells = &lt;3&gt;;</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		reg = &lt;0x10490000 0x1000&gt;, &lt;0x10480000 0x100&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	watchdog@10060000 {</div><div class='add'>+		compatible = "samsung,s3c2410-wdt";</div><div class='add'>+		reg = &lt;0x10060000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 43 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rtc@10070000 {</div><div class='add'>+		compatible = "samsung,s3c6410-rtc";</div><div class='add'>+		reg = &lt;0x10070000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 44 0&gt;, &lt;0 45 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	keypad@100A0000 {</div><div class='add'>+		compatible = "samsung,s5pv210-keypad";</div><div class='add'>+		reg = &lt;0x100A0000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 109 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@12510000 {</div><div class='add'>+		compatible = "samsung,exynos4210-sdhci";</div><div class='add'>+		reg = &lt;0x12510000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 73 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@12520000 {</div><div class='add'>+		compatible = "samsung,exynos4210-sdhci";</div><div class='add'>+		reg = &lt;0x12520000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 74 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@12530000 {</div><div class='add'>+		compatible = "samsung,exynos4210-sdhci";</div><div class='add'>+		reg = &lt;0x12530000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 75 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@12540000 {</div><div class='add'>+		compatible = "samsung,exynos4210-sdhci";</div><div class='add'>+		reg = &lt;0x12540000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 76 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@13800000 {</div><div class='add'>+		compatible = "samsung,exynos4210-uart";</div><div class='add'>+		reg = &lt;0x13800000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 52 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@13810000 {</div><div class='add'>+		compatible = "samsung,exynos4210-uart";</div><div class='add'>+		reg = &lt;0x13810000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 53 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@13820000 {</div><div class='add'>+		compatible = "samsung,exynos4210-uart";</div><div class='add'>+		reg = &lt;0x13820000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 54 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@13830000 {</div><div class='add'>+		compatible = "samsung,exynos4210-uart";</div><div class='add'>+		reg = &lt;0x13830000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 55 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@13860000 {</div><div class='add'>+		compatible = "samsung,s3c2440-i2c";</div><div class='add'>+		reg = &lt;0x13860000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 58 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@13870000 {</div><div class='add'>+		compatible = "samsung,s3c2440-i2c";</div><div class='add'>+		reg = &lt;0x13870000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 59 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@13880000 {</div><div class='add'>+		compatible = "samsung,s3c2440-i2c";</div><div class='add'>+		reg = &lt;0x13880000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 60 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@13890000 {</div><div class='add'>+		compatible = "samsung,s3c2440-i2c";</div><div class='add'>+		reg = &lt;0x13890000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 61 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@138A0000 {</div><div class='add'>+		compatible = "samsung,s3c2440-i2c";</div><div class='add'>+		reg = &lt;0x138A0000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 62 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@138B0000 {</div><div class='add'>+		compatible = "samsung,s3c2440-i2c";</div><div class='add'>+		reg = &lt;0x138B0000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 63 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@138C0000 {</div><div class='add'>+		compatible = "samsung,s3c2440-i2c";</div><div class='add'>+		reg = &lt;0x138C0000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 64 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@138D0000 {</div><div class='add'>+		compatible = "samsung,s3c2440-i2c";</div><div class='add'>+		reg = &lt;0x138D0000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 65 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	amba {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "arm,amba-bus";</div><div class='add'>+		interrupt-parent = &lt;&amp;gic&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		pdma0: pdma@12680000 {</div><div class='add'>+			compatible = "arm,pl330", "arm,primecell";</div><div class='add'>+			reg = &lt;0x12680000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;0 35 0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		pdma1: pdma@12690000 {</div><div class='add'>+			compatible = "arm,pl330", "arm,primecell";</div><div class='add'>+			reg = &lt;0x12690000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;0 36 0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-controllers {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		gpio-controller;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		gpa0: gpio-controller@11400000 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11400000 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpa1: gpio-controller@11400020 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11400020 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpb: gpio-controller@11400040 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11400040 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpc0: gpio-controller@11400060 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11400060 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpc1: gpio-controller@11400080 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11400080 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpd0: gpio-controller@114000A0 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x114000A0 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpd1: gpio-controller@114000C0 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x114000C0 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpe0: gpio-controller@114000E0 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x114000E0 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpe1: gpio-controller@11400100 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11400100 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpe2: gpio-controller@11400120 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11400120 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpe3: gpio-controller@11400140 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11400140 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpe4: gpio-controller@11400160 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11400160 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpf0: gpio-controller@11400180 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11400180 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpf1: gpio-controller@114001A0 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x114001A0 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpf2: gpio-controller@114001C0 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x114001C0 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpf3: gpio-controller@114001E0 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x114001E0 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpj0: gpio-controller@11000000 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11000000 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpj1: gpio-controller@11000020 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11000020 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpk0: gpio-controller@11000040 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11000040 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpk1: gpio-controller@11000060 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11000060 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpk2: gpio-controller@11000080 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11000080 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpk3: gpio-controller@110000A0 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x110000A0 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpl0: gpio-controller@110000C0 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x110000C0 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpl1: gpio-controller@110000E0 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x110000E0 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpl2: gpio-controller@11000100 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11000100 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpy0: gpio-controller@11000120 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11000120 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpy1: gpio-controller@11000140 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11000140 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpy2: gpio-controller@11000160 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11000160 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpy3: gpio-controller@11000180 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11000180 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpy4: gpio-controller@110001A0 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x110001A0 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpy5: gpio-controller@110001C0 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x110001C0 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpy6: gpio-controller@110001E0 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x110001E0 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpx0: gpio-controller@11000C00 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11000C00 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpx1: gpio-controller@11000C20 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11000C20 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpx2: gpio-controller@11000C40 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11000C40 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpx3: gpio-controller@11000C60 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x11000C60 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		gpz: gpio-controller@03860000 {</div><div class='add'>+			compatible = "samsung,exynos4-gpio";</div><div class='add'>+			reg = &lt;0x03860000 0x20&gt;;</div><div class='add'>+			#gpio-cells = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/highbank.dts b/arch/arm/boot/dts/highbank.dts<br/>index aeb1a7578fad..305635bd45c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/highbank.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/highbank.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/highbank.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/highbank.dts</a></div><div class='hunk'>@@ -194,5 +194,17 @@</div><div class='ctx'> 			reg = &lt;0xfff3d000 0x1000&gt;;</div><div class='ctx'> 			interrupts = &lt;0 92 4&gt;;</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		ethernet@fff50000 {</div><div class='add'>+			compatible = "calxeda,hb-xgmac";</div><div class='add'>+			reg = &lt;0xfff50000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;0 77 4  0 78 4  0 79 4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ethernet@fff51000 {</div><div class='add'>+			compatible = "calxeda,hb-xgmac";</div><div class='add'>+			reg = &lt;0xfff51000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;0 80 4  0 81 4  0 82 4&gt;;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts<br/>index f8766af11215..564cb8c19f15 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx51-babbage.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx51-babbage.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx51-babbage.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/imx51-babbage.dts</a></div><div class='hunk'>@@ -35,20 +35,19 @@</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='ctx'> 				esdhc@70008000 { /* ESDHC2 */</div><div class='del'>-					cd-gpios = &lt;&amp;gpio0 6 0&gt;; /* GPIO1_6 */</div><div class='del'>-					wp-gpios = &lt;&amp;gpio0 5 0&gt;; /* GPIO1_5 */</div><div class='add'>+					cd-gpios = &lt;&amp;gpio1 6 0&gt;;</div><div class='add'>+					wp-gpios = &lt;&amp;gpio1 5 0&gt;;</div><div class='ctx'> 					status = "okay";</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='del'>-				uart2: uart@7000c000 { /* UART3 */</div><div class='add'>+				uart3: uart@7000c000 {</div><div class='ctx'> 					fsl,uart-has-rtscts;</div><div class='ctx'> 					status = "okay";</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='ctx'> 				ecspi@70010000 { /* ECSPI1 */</div><div class='ctx'> 					fsl,spi-num-chipselects = &lt;2&gt;;</div><div class='del'>-					cs-gpios = &lt;&amp;gpio3 24 0&gt;, /* GPIO4_24 */</div><div class='del'>-						   &lt;&amp;gpio3 25 0&gt;; /* GPIO4_25 */</div><div class='add'>+					cs-gpios = &lt;&amp;gpio4 24 0&gt;, &lt;&amp;gpio4 25 0&gt;;</div><div class='ctx'> 					status = "okay";</div><div class='ctx'> </div><div class='ctx'> 					pmic: mc13892@0 {</div><div class='hunk'>@@ -57,7 +56,7 @@</div><div class='ctx'> 						compatible = "fsl,mc13892";</div><div class='ctx'> 						spi-max-frequency = &lt;6000000&gt;;</div><div class='ctx'> 						reg = &lt;0&gt;;</div><div class='del'>-						mc13xxx-irq-gpios = &lt;&amp;gpio0 8 0&gt;; /* GPIO1_8 */</div><div class='add'>+						mc13xxx-irq-gpios = &lt;&amp;gpio1 8 0&gt;;</div><div class='ctx'> 						fsl,mc13xxx-uses-regulator;</div><div class='ctx'> 					};</div><div class='ctx'> </div><div class='hunk'>@@ -91,12 +90,12 @@</div><div class='ctx'> 				reg = &lt;0x73fa8000 0x4000&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			uart0: uart@73fbc000 {</div><div class='add'>+			uart1: uart@73fbc000 {</div><div class='ctx'> 				fsl,uart-has-rtscts;</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			uart1: uart@73fc0000 {</div><div class='add'>+			uart2: uart@73fc0000 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='hunk'>@@ -127,7 +126,7 @@</div><div class='ctx'> </div><div class='ctx'> 		power {</div><div class='ctx'> 			label = "Power Button";</div><div class='del'>-			gpios = &lt;&amp;gpio1 21 0&gt;;</div><div class='add'>+			gpios = &lt;&amp;gpio2 21 0&gt;;</div><div class='ctx'> 			linux,code = &lt;116&gt;; /* KEY_POWER */</div><div class='ctx'> 			gpio-key,wakeup;</div><div class='ctx'> 		};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi<br/>index 327ab8e3a4c8..6663986fe1c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx51.dtsi?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx51.dtsi</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx51.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/imx51.dtsi</a></div><div class='hunk'>@@ -14,9 +14,9 @@</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	aliases {</div><div class='del'>-		serial0 = &amp;uart0;</div><div class='del'>-		serial1 = &amp;uart1;</div><div class='del'>-		serial2 = &amp;uart2;</div><div class='add'>+		serial0 = &amp;uart1;</div><div class='add'>+		serial1 = &amp;uart2;</div><div class='add'>+		serial2 = &amp;uart3;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	tzic: tz-interrupt-controller@e0000000 {</div><div class='hunk'>@@ -86,7 +86,7 @@</div><div class='ctx'> 					status = "disabled";</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='del'>-				uart2: uart@7000c000 { /* UART3 */</div><div class='add'>+				uart3: uart@7000c000 {</div><div class='ctx'> 					compatible = "fsl,imx51-uart", "fsl,imx21-uart";</div><div class='ctx'> 					reg = &lt;0x7000c000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;33&gt;;</div><div class='hunk'>@@ -117,7 +117,7 @@</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gpio0: gpio@73f84000 { /* GPIO1 */</div><div class='add'>+			gpio1: gpio@73f84000 {</div><div class='ctx'> 				compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";</div><div class='ctx'> 				reg = &lt;0x73f84000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;50 51&gt;;</div><div class='hunk'>@@ -127,7 +127,7 @@</div><div class='ctx'> 				#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gpio1: gpio@73f88000 { /* GPIO2 */</div><div class='add'>+			gpio2: gpio@73f88000 {</div><div class='ctx'> 				compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";</div><div class='ctx'> 				reg = &lt;0x73f88000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;52 53&gt;;</div><div class='hunk'>@@ -137,7 +137,7 @@</div><div class='ctx'> 				#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gpio2: gpio@73f8c000 { /* GPIO3 */</div><div class='add'>+			gpio3: gpio@73f8c000 {</div><div class='ctx'> 				compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";</div><div class='ctx'> 				reg = &lt;0x73f8c000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;54 55&gt;;</div><div class='hunk'>@@ -147,7 +147,7 @@</div><div class='ctx'> 				#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gpio3: gpio@73f90000 { /* GPIO4 */</div><div class='add'>+			gpio4: gpio@73f90000 {</div><div class='ctx'> 				compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";</div><div class='ctx'> 				reg = &lt;0x73f90000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;56 57&gt;;</div><div class='hunk'>@@ -171,14 +171,14 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			uart0: uart@73fbc000 {</div><div class='add'>+			uart1: uart@73fbc000 {</div><div class='ctx'> 				compatible = "fsl,imx51-uart", "fsl,imx21-uart";</div><div class='ctx'> 				reg = &lt;0x73fbc000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;31&gt;;</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			uart1: uart@73fc0000 {</div><div class='add'>+			uart2: uart@73fc0000 {</div><div class='ctx'> 				compatible = "fsl,imx51-uart", "fsl,imx21-uart";</div><div class='ctx'> 				reg = &lt;0x73fc0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;32&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx53-ard.dts b/arch/arm/boot/dts/imx53-ard.dts<br/>index 2ab7f80a0a35..2dccce46ed81 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx53-ard.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx53-ard.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx53-ard.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/imx53-ard.dts</a></div><div class='hunk'>@@ -29,8 +29,8 @@</div><div class='ctx'> 		aips@50000000 { /* AIPS1 */</div><div class='ctx'> 			spba@50000000 {</div><div class='ctx'> 				esdhc@50004000 { /* ESDHC1 */</div><div class='del'>-					cd-gpios = &lt;&amp;gpio0 1 0&gt;; /* GPIO1_1 */</div><div class='del'>-					wp-gpios = &lt;&amp;gpio0 9 0&gt;; /* GPIO1_9 */</div><div class='add'>+					cd-gpios = &lt;&amp;gpio1 1 0&gt;;</div><div class='add'>+					wp-gpios = &lt;&amp;gpio1 9 0&gt;;</div><div class='ctx'> 					status = "okay";</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='hunk'>@@ -44,7 +44,7 @@</div><div class='ctx'> 				reg = &lt;0x53fa8000 0x4000&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			uart0: uart@53fbc000 { /* UART1 */</div><div class='add'>+			uart1: uart@53fbc000 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='hunk'>@@ -67,7 +67,7 @@</div><div class='ctx'> 			compatible = "smsc,lan9220", "smsc,lan9115";</div><div class='ctx'> 			reg = &lt;0xf4000000 0x2000000&gt;;</div><div class='ctx'> 			phy-mode = "mii";</div><div class='del'>-			interrupt-parent = &lt;&amp;gpio1&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;gpio2&gt;;</div><div class='ctx'> 			interrupts = &lt;31&gt;;</div><div class='ctx'> 			reg-io-width = &lt;4&gt;;</div><div class='ctx'> 			smsc,irq-push-pull;</div><div class='hunk'>@@ -79,34 +79,34 @@</div><div class='ctx'> </div><div class='ctx'> 		home {</div><div class='ctx'> 			label = "Home";</div><div class='del'>-			gpios = &lt;&amp;gpio4 10 0&gt;; /* GPIO5_10 */</div><div class='add'>+			gpios = &lt;&amp;gpio5 10 0&gt;;</div><div class='ctx'> 			linux,code = &lt;102&gt;; /* KEY_HOME */</div><div class='ctx'> 			gpio-key,wakeup;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		back {</div><div class='ctx'> 			label = "Back";</div><div class='del'>-			gpios = &lt;&amp;gpio4 11 0&gt;; /* GPIO5_11 */</div><div class='add'>+			gpios = &lt;&amp;gpio5 11 0&gt;;</div><div class='ctx'> 			linux,code = &lt;158&gt;; /* KEY_BACK */</div><div class='ctx'> 			gpio-key,wakeup;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		program {</div><div class='ctx'> 			label = "Program";</div><div class='del'>-			gpios = &lt;&amp;gpio4 12 0&gt;; /* GPIO5_12 */</div><div class='add'>+			gpios = &lt;&amp;gpio5 12 0&gt;;</div><div class='ctx'> 			linux,code = &lt;362&gt;; /* KEY_PROGRAM */</div><div class='ctx'> 			gpio-key,wakeup;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		volume-up {</div><div class='ctx'> 			label = "Volume Up";</div><div class='del'>-			gpios = &lt;&amp;gpio4 13 0&gt;; /* GPIO5_13 */</div><div class='add'>+			gpios = &lt;&amp;gpio5 13 0&gt;;</div><div class='ctx'> 			linux,code = &lt;115&gt;; /* KEY_VOLUMEUP */</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		volume-down {</div><div class='ctx'> 			label = "Volume Down";</div><div class='del'>-			gpios = &lt;&amp;gpio3 0 0&gt;; /* GPIO4_0 */</div><div class='add'>+			gpios = &lt;&amp;gpio4 0 0&gt;;</div><div class='ctx'> 			linux,code = &lt;114&gt;; /* KEY_VOLUMEDOWN */</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx53-evk.dts b/arch/arm/boot/dts/imx53-evk.dts<br/>index 3f3a88185ff8..5bac4aa4800b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx53-evk.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx53-evk.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx53-evk.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/imx53-evk.dts</a></div><div class='hunk'>@@ -29,15 +29,14 @@</div><div class='ctx'> 		aips@50000000 { /* AIPS1 */</div><div class='ctx'> 			spba@50000000 {</div><div class='ctx'> 				esdhc@50004000 { /* ESDHC1 */</div><div class='del'>-					cd-gpios = &lt;&amp;gpio2 13 0&gt;; /* GPIO3_13 */</div><div class='del'>-					wp-gpios = &lt;&amp;gpio2 14 0&gt;; /* GPIO3_14 */</div><div class='add'>+					cd-gpios = &lt;&amp;gpio3 13 0&gt;;</div><div class='add'>+					wp-gpios = &lt;&amp;gpio3 14 0&gt;;</div><div class='ctx'> 					status = "okay";</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='ctx'> 				ecspi@50010000 { /* ECSPI1 */</div><div class='ctx'> 					fsl,spi-num-chipselects = &lt;2&gt;;</div><div class='del'>-					cs-gpios = &lt;&amp;gpio1 30 0&gt;, /* GPIO2_30 */</div><div class='del'>-						   &lt;&amp;gpio2 19 0&gt;; /* GPIO3_19 */</div><div class='add'>+					cs-gpios = &lt;&amp;gpio2 30 0&gt;, &lt;&amp;gpio3 19 0&gt;;</div><div class='ctx'> 					status = "okay";</div><div class='ctx'> </div><div class='ctx'> 					flash: at45db321d@1 {</div><div class='hunk'>@@ -61,8 +60,8 @@</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='ctx'> 				esdhc@50020000 { /* ESDHC3 */</div><div class='del'>-					cd-gpios = &lt;&amp;gpio2 11 0&gt;; /* GPIO3_11 */</div><div class='del'>-					wp-gpios = &lt;&amp;gpio2 12 0&gt;; /* GPIO3_12 */</div><div class='add'>+					cd-gpios = &lt;&amp;gpio3 11 0&gt;;</div><div class='add'>+					wp-gpios = &lt;&amp;gpio3 12 0&gt;;</div><div class='ctx'> 					status = "okay";</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='hunk'>@@ -76,7 +75,7 @@</div><div class='ctx'> 				reg = &lt;0x53fa8000 0x4000&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			uart0: uart@53fbc000 { /* UART1 */</div><div class='add'>+			uart1: uart@53fbc000 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='hunk'>@@ -102,7 +101,7 @@</div><div class='ctx'> </div><div class='ctx'> 			fec@63fec000 {</div><div class='ctx'> 				phy-mode = "rmii";</div><div class='del'>-				phy-reset-gpios = &lt;&amp;gpio6 6 0&gt;; /* GPIO7_6 */</div><div class='add'>+				phy-reset-gpios = &lt;&amp;gpio7 6 0&gt;;</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='hunk'>@@ -113,7 +112,7 @@</div><div class='ctx'> </div><div class='ctx'> 		green {</div><div class='ctx'> 			label = "Heartbeat";</div><div class='del'>-			gpios = &lt;&amp;gpio6 7 0&gt;; /* GPIO7_7 */</div><div class='add'>+			gpios = &lt;&amp;gpio7 7 0&gt;;</div><div class='ctx'> 			linux,default-trigger = "heartbeat";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx53-qsb.dts b/arch/arm/boot/dts/imx53-qsb.dts<br/>index ae6de6d0c3f1..5c57c8672c36 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx53-qsb.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx53-qsb.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx53-qsb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/imx53-qsb.dts</a></div><div class='hunk'>@@ -29,13 +29,13 @@</div><div class='ctx'> 		aips@50000000 { /* AIPS1 */</div><div class='ctx'> 			spba@50000000 {</div><div class='ctx'> 				esdhc@50004000 { /* ESDHC1 */</div><div class='del'>-					cd-gpios = &lt;&amp;gpio2 13 0&gt;; /* GPIO3_13 */</div><div class='add'>+					cd-gpios = &lt;&amp;gpio3 13 0&gt;;</div><div class='ctx'> 					status = "okay";</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='ctx'> 				esdhc@50020000 { /* ESDHC3 */</div><div class='del'>-					cd-gpios = &lt;&amp;gpio2 11 0&gt;; /* GPIO3_11 */</div><div class='del'>-					wp-gpios = &lt;&amp;gpio2 12 0&gt;; /* GPIO3_12 */</div><div class='add'>+					cd-gpios = &lt;&amp;gpio3 11 0&gt;;</div><div class='add'>+					wp-gpios = &lt;&amp;gpio3 12 0&gt;;</div><div class='ctx'> 					status = "okay";</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='hunk'>@@ -49,7 +49,7 @@</div><div class='ctx'> 				reg = &lt;0x53fa8000 0x4000&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			uart0: uart@53fbc000 { /* UART1 */</div><div class='add'>+			uart1: uart@53fbc000 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='hunk'>@@ -84,7 +84,7 @@</div><div class='ctx'> </div><div class='ctx'> 			fec@63fec000 {</div><div class='ctx'> 				phy-mode = "rmii";</div><div class='del'>-				phy-reset-gpios = &lt;&amp;gpio6 6 0&gt;; /* GPIO7_6 */</div><div class='add'>+				phy-reset-gpios = &lt;&amp;gpio7 6 0&gt;;</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='hunk'>@@ -95,20 +95,20 @@</div><div class='ctx'> </div><div class='ctx'> 		power {</div><div class='ctx'> 			label = "Power Button";</div><div class='del'>-			gpios = &lt;&amp;gpio0 8 0&gt;; /* GPIO1_8 */</div><div class='add'>+			gpios = &lt;&amp;gpio1 8 0&gt;;</div><div class='ctx'> 			linux,code = &lt;116&gt;; /* KEY_POWER */</div><div class='ctx'> 			gpio-key,wakeup;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		volume-up {</div><div class='ctx'> 			label = "Volume Up";</div><div class='del'>-			gpios = &lt;&amp;gpio1 14 0&gt;; /* GPIO2_14 */</div><div class='add'>+			gpios = &lt;&amp;gpio2 14 0&gt;;</div><div class='ctx'> 			linux,code = &lt;115&gt;; /* KEY_VOLUMEUP */</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		volume-down {</div><div class='ctx'> 			label = "Volume Down";</div><div class='del'>-			gpios = &lt;&amp;gpio1 15 0&gt;; /* GPIO2_15 */</div><div class='add'>+			gpios = &lt;&amp;gpio2 15 0&gt;;</div><div class='ctx'> 			linux,code = &lt;114&gt;; /* KEY_VOLUMEDOWN */</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='hunk'>@@ -118,7 +118,7 @@</div><div class='ctx'> </div><div class='ctx'> 		user {</div><div class='ctx'> 			label = "Heartbeat";</div><div class='del'>-			gpios = &lt;&amp;gpio6 7 0&gt;; /* GPIO7_7 */</div><div class='add'>+			gpios = &lt;&amp;gpio7 7 0&gt;;</div><div class='ctx'> 			linux,default-trigger = "heartbeat";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts<br/>index b1c062eea715..c7ee86c2dfb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx53-smd.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx53-smd.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx53-smd.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/imx53-smd.dts</a></div><div class='hunk'>@@ -29,8 +29,8 @@</div><div class='ctx'> 		aips@50000000 { /* AIPS1 */</div><div class='ctx'> 			spba@50000000 {</div><div class='ctx'> 				esdhc@50004000 { /* ESDHC1 */</div><div class='del'>-					cd-gpios = &lt;&amp;gpio2 13 0&gt;; /* GPIO3_13 */</div><div class='del'>-					wp-gpios = &lt;&amp;gpio3 11 0&gt;; /* GPIO4_11 */</div><div class='add'>+					cd-gpios = &lt;&amp;gpio3 13 0&gt;;</div><div class='add'>+					wp-gpios = &lt;&amp;gpio4 11 0&gt;;</div><div class='ctx'> 					status = "okay";</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='hunk'>@@ -39,15 +39,14 @@</div><div class='ctx'> 					status = "okay";</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='del'>-				uart2: uart@5000c000 { /* UART3 */</div><div class='add'>+				uart3: uart@5000c000 {</div><div class='ctx'> 					fsl,uart-has-rtscts;</div><div class='ctx'> 					status = "okay";</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='ctx'> 				ecspi@50010000 { /* ECSPI1 */</div><div class='ctx'> 					fsl,spi-num-chipselects = &lt;2&gt;;</div><div class='del'>-					cs-gpios = &lt;&amp;gpio1 30 0&gt;, /* GPIO2_30 */</div><div class='del'>-						   &lt;&amp;gpio2 19 0&gt;; /* GPIO3_19 */</div><div class='add'>+					cs-gpios = &lt;&amp;gpio2 30 0&gt;, &lt;&amp;gpio3 19 0&gt;;</div><div class='ctx'> 					status = "okay";</div><div class='ctx'> </div><div class='ctx'> 					zigbee: mc1323@0 {</div><div class='hunk'>@@ -91,11 +90,11 @@</div><div class='ctx'> 				reg = &lt;0x53fa8000 0x4000&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			uart0: uart@53fbc000 { /* UART1 */</div><div class='add'>+			uart1: uart@53fbc000 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			uart1: uart@53fc0000 { /* UART2 */</div><div class='add'>+			uart2: uart@53fc0000 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='hunk'>@@ -145,7 +144,7 @@</div><div class='ctx'> </div><div class='ctx'> 			fec@63fec000 {</div><div class='ctx'> 				phy-mode = "rmii";</div><div class='del'>-				phy-reset-gpios = &lt;&amp;gpio6 6 0&gt;; /* GPIO7_6 */</div><div class='add'>+				phy-reset-gpios = &lt;&amp;gpio7 6 0&gt;;</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='hunk'>@@ -156,13 +155,13 @@</div><div class='ctx'> </div><div class='ctx'> 		volume-up {</div><div class='ctx'> 			label = "Volume Up";</div><div class='del'>-			gpios = &lt;&amp;gpio1 14 0&gt;; /* GPIO2_14 */</div><div class='add'>+			gpios = &lt;&amp;gpio2 14 0&gt;;</div><div class='ctx'> 			linux,code = &lt;115&gt;; /* KEY_VOLUMEUP */</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		volume-down {</div><div class='ctx'> 			label = "Volume Down";</div><div class='del'>-			gpios = &lt;&amp;gpio1 15 0&gt;; /* GPIO2_15 */</div><div class='add'>+			gpios = &lt;&amp;gpio2 15 0&gt;;</div><div class='ctx'> 			linux,code = &lt;114&gt;; /* KEY_VOLUMEDOWN */</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi<br/>index 099cd84ee372..5dd91b942c91 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx53.dtsi?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx53.dtsi</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx53.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/imx53.dtsi</a></div><div class='hunk'>@@ -14,11 +14,11 @@</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	aliases {</div><div class='del'>-		serial0 = &amp;uart0;</div><div class='del'>-		serial1 = &amp;uart1;</div><div class='del'>-		serial2 = &amp;uart2;</div><div class='del'>-		serial3 = &amp;uart3;</div><div class='del'>-		serial4 = &amp;uart4;</div><div class='add'>+		serial0 = &amp;uart1;</div><div class='add'>+		serial1 = &amp;uart2;</div><div class='add'>+		serial2 = &amp;uart3;</div><div class='add'>+		serial3 = &amp;uart4;</div><div class='add'>+		serial4 = &amp;uart5;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	tzic: tz-interrupt-controller@0fffc000 {</div><div class='hunk'>@@ -88,7 +88,7 @@</div><div class='ctx'> 					status = "disabled";</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='del'>-				uart2: uart@5000c000 { /* UART3 */</div><div class='add'>+				uart3: uart@5000c000 {</div><div class='ctx'> 					compatible = "fsl,imx53-uart", "fsl,imx21-uart";</div><div class='ctx'> 					reg = &lt;0x5000c000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;33&gt;;</div><div class='hunk'>@@ -119,7 +119,7 @@</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gpio0: gpio@53f84000 { /* GPIO1 */</div><div class='add'>+			gpio1: gpio@53f84000 {</div><div class='ctx'> 				compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";</div><div class='ctx'> 				reg = &lt;0x53f84000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;50 51&gt;;</div><div class='hunk'>@@ -129,7 +129,7 @@</div><div class='ctx'> 				#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gpio1: gpio@53f88000 { /* GPIO2 */</div><div class='add'>+			gpio2: gpio@53f88000 {</div><div class='ctx'> 				compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";</div><div class='ctx'> 				reg = &lt;0x53f88000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;52 53&gt;;</div><div class='hunk'>@@ -139,7 +139,7 @@</div><div class='ctx'> 				#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gpio2: gpio@53f8c000 { /* GPIO3 */</div><div class='add'>+			gpio3: gpio@53f8c000 {</div><div class='ctx'> 				compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";</div><div class='ctx'> 				reg = &lt;0x53f8c000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;54 55&gt;;</div><div class='hunk'>@@ -149,7 +149,7 @@</div><div class='ctx'> 				#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gpio3: gpio@53f90000 { /* GPIO4 */</div><div class='add'>+			gpio4: gpio@53f90000 {</div><div class='ctx'> 				compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";</div><div class='ctx'> 				reg = &lt;0x53f90000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;56 57&gt;;</div><div class='hunk'>@@ -173,21 +173,21 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			uart0: uart@53fbc000 { /* UART1 */</div><div class='add'>+			uart1: uart@53fbc000 {</div><div class='ctx'> 				compatible = "fsl,imx53-uart", "fsl,imx21-uart";</div><div class='ctx'> 				reg = &lt;0x53fbc000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;31&gt;;</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			uart1: uart@53fc0000 { /* UART2 */</div><div class='add'>+			uart2: uart@53fc0000 {</div><div class='ctx'> 				compatible = "fsl,imx53-uart", "fsl,imx21-uart";</div><div class='ctx'> 				reg = &lt;0x53fc0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;32&gt;;</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gpio4: gpio@53fdc000 { /* GPIO5 */</div><div class='add'>+			gpio5: gpio@53fdc000 {</div><div class='ctx'> 				compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";</div><div class='ctx'> 				reg = &lt;0x53fdc000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;103 104&gt;;</div><div class='hunk'>@@ -197,7 +197,7 @@</div><div class='ctx'> 				#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gpio5: gpio@53fe0000 { /* GPIO6 */</div><div class='add'>+			gpio6: gpio@53fe0000 {</div><div class='ctx'> 				compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";</div><div class='ctx'> 				reg = &lt;0x53fe0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;105 106&gt;;</div><div class='hunk'>@@ -207,7 +207,7 @@</div><div class='ctx'> 				#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gpio6: gpio@53fe4000 { /* GPIO7 */</div><div class='add'>+			gpio7: gpio@53fe4000 {</div><div class='ctx'> 				compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";</div><div class='ctx'> 				reg = &lt;0x53fe4000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;107 108&gt;;</div><div class='hunk'>@@ -226,7 +226,7 @@</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			uart3: uart@53ff0000 { /* UART4 */</div><div class='add'>+			uart4: uart@53ff0000 {</div><div class='ctx'> 				compatible = "fsl,imx53-uart", "fsl,imx21-uart";</div><div class='ctx'> 				reg = &lt;0x53ff0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;13&gt;;</div><div class='hunk'>@@ -241,7 +241,7 @@</div><div class='ctx'> 			reg = &lt;0x60000000 0x10000000&gt;;</div><div class='ctx'> 			ranges;</div><div class='ctx'> </div><div class='del'>-			uart4: uart@63f90000 { /* UART5 */</div><div class='add'>+			uart5: uart@63f90000 {</div><div class='ctx'> 				compatible = "fsl,imx53-uart", "fsl,imx21-uart";</div><div class='ctx'> 				reg = &lt;0x63f90000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;86&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-sabreauto.dts b/arch/arm/boot/dts/imx6q-arm2.dts<br/>index 072974e443f2..c3977e0478b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx6q-sabreauto.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx6q-sabreauto.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx6q-arm2.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/imx6q-arm2.dts</a></div><div class='hunk'>@@ -14,8 +14,8 @@</div><div class='ctx'> /include/ "imx6q.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='del'>-	model = "Freescale i.MX6 Quad SABRE Automotive Board";</div><div class='del'>-	compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";</div><div class='add'>+	model = "Freescale i.MX6 Quad Armadillo2 Board";</div><div class='add'>+	compatible = "fsl,imx6q-arm2", "fsl,imx6q";</div><div class='ctx'> </div><div class='ctx'> 	chosen {</div><div class='ctx'> 		bootargs = "console=ttymxc0,115200 root=/dev/mmcblk3p3 rootwait";</div><div class='hunk'>@@ -34,8 +34,8 @@</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='ctx'> 			usdhc@02198000 { /* uSDHC3 */</div><div class='del'>-				cd-gpios = &lt;&amp;gpio5 11 0&gt;; /* GPIO6_11 */</div><div class='del'>-				wp-gpios = &lt;&amp;gpio5 14 0&gt;; /* GPIO6_14 */</div><div class='add'>+				cd-gpios = &lt;&amp;gpio6 11 0&gt;;</div><div class='add'>+				wp-gpios = &lt;&amp;gpio6 14 0&gt;;</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='hunk'>@@ -44,7 +44,7 @@</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			uart3: uart@021f0000 { /* UART4 */</div><div class='add'>+			uart4: uart@021f0000 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='hunk'>@@ -55,7 +55,7 @@</div><div class='ctx'> </div><div class='ctx'> 		debug-led {</div><div class='ctx'> 			label = "Heartbeat";</div><div class='del'>-			gpios = &lt;&amp;gpio2 25 0&gt;; /* GPIO3_25 */</div><div class='add'>+			gpios = &lt;&amp;gpio3 25 0&gt;;</div><div class='ctx'> 			linux,default-trigger = "heartbeat";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts<br/>new file mode 100644<br/>index 000000000000..08d920de7286<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx6q-sabrelite.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/imx6q-sabrelite.dts</a></div><div class='hunk'>@@ -0,0 +1,49 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor, Inc.</div><div class='add'>+ * Copyright 2011 Linaro Ltd.</div><div class='add'>+ *</div><div class='add'>+ * The code contained herein is licensed under the GNU General Public</div><div class='add'>+ * License. You may obtain a copy of the GNU General Public License</div><div class='add'>+ * Version 2 or later at the following locations:</div><div class='add'>+ *</div><div class='add'>+ * http://www.opensource.org/licenses/gpl-license.html</div><div class='add'>+ * http://www.gnu.org/copyleft/gpl.html</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/include/ "imx6q.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Freescale i.MX6 Quad SABRE Lite Board";</div><div class='add'>+	compatible = "fsl,imx6q-sabrelite", "fsl,imx6q";</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt;0x10000000 0x40000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		aips-bus@02100000 { /* AIPS2 */</div><div class='add'>+			enet@02188000 {</div><div class='add'>+				phy-mode = "rgmii";</div><div class='add'>+				phy-reset-gpios = &lt;&amp;gpio3 23 0&gt;;</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			usdhc@02198000 { /* uSDHC3 */</div><div class='add'>+				cd-gpios = &lt;&amp;gpio7 0 0&gt;;</div><div class='add'>+				wp-gpios = &lt;&amp;gpio7 1 0&gt;;</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			usdhc@0219c000 { /* uSDHC4 */</div><div class='add'>+				cd-gpios = &lt;&amp;gpio2 6 0&gt;;</div><div class='add'>+				wp-gpios = &lt;&amp;gpio2 7 0&gt;;</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			uart2: uart@021e8000 {</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi<br/>index 7dda599558cc..263e8f3664b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx6q.dtsi?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/imx6q.dtsi</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/imx6q.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/imx6q.dtsi</a></div><div class='hunk'>@@ -14,11 +14,11 @@</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	aliases {</div><div class='del'>-		serial0 = &amp;uart0;</div><div class='del'>-		serial1 = &amp;uart1;</div><div class='del'>-		serial2 = &amp;uart2;</div><div class='del'>-		serial3 = &amp;uart3;</div><div class='del'>-		serial4 = &amp;uart4;</div><div class='add'>+		serial0 = &amp;uart1;</div><div class='add'>+		serial1 = &amp;uart2;</div><div class='add'>+		serial2 = &amp;uart3;</div><div class='add'>+		serial3 = &amp;uart4;</div><div class='add'>+		serial4 = &amp;uart5;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='hunk'>@@ -165,7 +165,7 @@</div><div class='ctx'> 					status = "disabled";</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='del'>-				uart0: uart@02020000 { /* UART1 */</div><div class='add'>+				uart1: uart@02020000 {</div><div class='ctx'> 					compatible = "fsl,imx6q-uart", "fsl,imx21-uart";</div><div class='ctx'> 					reg = &lt;0x02020000 0x4000&gt;;</div><div class='ctx'> 					interrupts = &lt;0 26 0x04&gt;;</div><div class='hunk'>@@ -247,7 +247,7 @@</div><div class='ctx'> 				interrupts = &lt;0 55 0x04&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gpio0: gpio@0209c000 { /* GPIO1 */</div><div class='add'>+			gpio1: gpio@0209c000 {</div><div class='ctx'> 				compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";</div><div class='ctx'> 				reg = &lt;0x0209c000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;0 66 0x04 0 67 0x04&gt;;</div><div class='hunk'>@@ -257,7 +257,7 @@</div><div class='ctx'> 				#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gpio1: gpio@020a0000 { /* GPIO2 */</div><div class='add'>+			gpio2: gpio@020a0000 {</div><div class='ctx'> 				compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";</div><div class='ctx'> 				reg = &lt;0x020a0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;0 68 0x04 0 69 0x04&gt;;</div><div class='hunk'>@@ -267,7 +267,7 @@</div><div class='ctx'> 				#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gpio2: gpio@020a4000 { /* GPIO3 */</div><div class='add'>+			gpio3: gpio@020a4000 {</div><div class='ctx'> 				compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";</div><div class='ctx'> 				reg = &lt;0x020a4000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;0 70 0x04 0 71 0x04&gt;;</div><div class='hunk'>@@ -277,7 +277,7 @@</div><div class='ctx'> 				#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gpio3: gpio@020a8000 { /* GPIO4 */</div><div class='add'>+			gpio4: gpio@020a8000 {</div><div class='ctx'> 				compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";</div><div class='ctx'> 				reg = &lt;0x020a8000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;0 72 0x04 0 73 0x04&gt;;</div><div class='hunk'>@@ -287,7 +287,7 @@</div><div class='ctx'> 				#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gpio4: gpio@020ac000 { /* GPIO5 */</div><div class='add'>+			gpio5: gpio@020ac000 {</div><div class='ctx'> 				compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";</div><div class='ctx'> 				reg = &lt;0x020ac000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;0 74 0x04 0 75 0x04&gt;;</div><div class='hunk'>@@ -297,7 +297,7 @@</div><div class='ctx'> 				#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gpio5: gpio@020b0000 { /* GPIO6 */</div><div class='add'>+			gpio6: gpio@020b0000 {</div><div class='ctx'> 				compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";</div><div class='ctx'> 				reg = &lt;0x020b0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;0 76 0x04 0 77 0x04&gt;;</div><div class='hunk'>@@ -307,7 +307,7 @@</div><div class='ctx'> 				#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			gpio6: gpio@020b4000 { /* GPIO7 */</div><div class='add'>+			gpio7: gpio@020b4000 {</div><div class='ctx'> 				compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";</div><div class='ctx'> 				reg = &lt;0x020b4000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;0 78 0x04 0 79 0x04&gt;;</div><div class='hunk'>@@ -543,28 +543,28 @@</div><div class='ctx'> 				interrupts = &lt;0 18 0x04&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			uart1: uart@021e8000 { /* UART2 */</div><div class='add'>+			uart2: uart@021e8000 {</div><div class='ctx'> 				compatible = "fsl,imx6q-uart", "fsl,imx21-uart";</div><div class='ctx'> 				reg = &lt;0x021e8000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;0 27 0x04&gt;;</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			uart2: uart@021ec000 { /* UART3 */</div><div class='add'>+			uart3: uart@021ec000 {</div><div class='ctx'> 				compatible = "fsl,imx6q-uart", "fsl,imx21-uart";</div><div class='ctx'> 				reg = &lt;0x021ec000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;0 28 0x04&gt;;</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			uart3: uart@021f0000 { /* UART4 */</div><div class='add'>+			uart4: uart@021f0000 {</div><div class='ctx'> 				compatible = "fsl,imx6q-uart", "fsl,imx21-uart";</div><div class='ctx'> 				reg = &lt;0x021f0000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;0 29 0x04&gt;;</div><div class='ctx'> 				status = "disabled";</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-			uart4: uart@021f4000 { /* UART5 */</div><div class='add'>+			uart5: uart@021f4000 {</div><div class='ctx'> 				compatible = "fsl,imx6q-uart", "fsl,imx21-uart";</div><div class='ctx'> 				reg = &lt;0x021f4000 0x4000&gt;;</div><div class='ctx'> 				interrupts = &lt;0 30 0x04&gt;;</div><div class='head'>diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi<br/>new file mode 100644<br/>index 000000000000..f2ab4ea7cc0e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/omap2.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/omap2.dtsi</a></div><div class='hunk'>@@ -0,0 +1,67 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Source for OMAP2 SoC</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public License</div><div class='add'>+ * version 2.  This program is licensed "as is" without any warranty of any</div><div class='add'>+ * kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/include/ "skeleton.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "ti,omap2430", "ti,omap2420", "ti,omap2";</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart1;</div><div class='add'>+		serial1 = &amp;uart2;</div><div class='add'>+		serial2 = &amp;uart3;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</div><div class='add'>+		cpu@0 {</div><div class='add'>+			compatible = "arm,arm1136jf-s";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "ti,omap-infra";</div><div class='add'>+		mpu {</div><div class='add'>+			compatible = "ti,omap2-mpu";</div><div class='add'>+			ti,hwmods = "mpu";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ocp {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+		ti,hwmods = "l3_main";</div><div class='add'>+</div><div class='add'>+		intc: interrupt-controller@1 {</div><div class='add'>+			compatible = "ti,omap2-intc";</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart1: serial@4806a000 {</div><div class='add'>+			compatible = "ti,omap2-uart";</div><div class='add'>+			ti,hwmods = "uart1";</div><div class='add'>+			clock-frequency = &lt;48000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart2: serial@4806c000 {</div><div class='add'>+			compatible = "ti,omap2-uart";</div><div class='add'>+			ti,hwmods = "uart2";</div><div class='add'>+			clock-frequency = &lt;48000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart3: serial@4806e000 {</div><div class='add'>+			compatible = "ti,omap2-uart";</div><div class='add'>+			ti,hwmods = "uart3";</div><div class='add'>+			clock-frequency = &lt;48000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi<br/>index d202bb5ec7ef..216c3317461d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/omap3.dtsi?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/omap3.dtsi</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/omap3.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/omap3.dtsi</a></div><div class='hunk'>@@ -13,6 +13,13 @@</div><div class='ctx'> / {</div><div class='ctx'> 	compatible = "ti,omap3430", "ti,omap3";</div><div class='ctx'> </div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;uart1;</div><div class='add'>+		serial1 = &amp;uart2;</div><div class='add'>+		serial2 = &amp;uart3;</div><div class='add'>+		serial3 = &amp;uart4;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	cpus {</div><div class='ctx'> 		cpu@0 {</div><div class='ctx'> 			compatible = "arm,cortex-a8";</div><div class='hunk'>@@ -59,5 +66,29 @@</div><div class='ctx'> 			interrupt-controller;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		uart1: serial@0x4806a000 {</div><div class='add'>+			compatible = "ti,omap3-uart";</div><div class='add'>+			ti,hwmods = "uart1";</div><div class='add'>+			clock-frequency = &lt;48000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart2: serial@0x4806c000 {</div><div class='add'>+			compatible = "ti,omap3-uart";</div><div class='add'>+			ti,hwmods = "uart2";</div><div class='add'>+			clock-frequency = &lt;48000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart3: serial@0x49020000 {</div><div class='add'>+			compatible = "ti,omap3-uart";</div><div class='add'>+			ti,hwmods = "uart3";</div><div class='add'>+			clock-frequency = &lt;48000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart4: serial@0x49042000 {</div><div class='add'>+			compatible = "ti,omap3-uart";</div><div class='add'>+			ti,hwmods = "uart4";</div><div class='add'>+			clock-frequency = &lt;48000000&gt;;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi<br/>index 4c61c829043a..e8fe75fac7c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/omap4.dtsi?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/omap4.dtsi</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/omap4.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/omap4.dtsi</a></div><div class='hunk'>@@ -21,6 +21,10 @@</div><div class='ctx'> 	interrupt-parent = &lt;&amp;gic&gt;;</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='add'>+		serial0 = &amp;uart1;</div><div class='add'>+		serial1 = &amp;uart2;</div><div class='add'>+		serial2 = &amp;uart3;</div><div class='add'>+		serial3 = &amp;uart4;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='hunk'>@@ -99,5 +103,29 @@</div><div class='ctx'> 			reg = &lt;0x48241000 0x1000&gt;,</div><div class='ctx'> 			      &lt;0x48240100 0x0100&gt;;</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		uart1: serial@0x4806a000 {</div><div class='add'>+			compatible = "ti,omap4-uart";</div><div class='add'>+			ti,hwmods = "uart1";</div><div class='add'>+			clock-frequency = &lt;48000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart2: serial@0x4806c000 {</div><div class='add'>+			compatible = "ti,omap4-uart";</div><div class='add'>+			ti,hwmods = "uart2";</div><div class='add'>+			clock-frequency = &lt;48000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart3: serial@0x48020000 {</div><div class='add'>+			compatible = "ti,omap4-uart";</div><div class='add'>+			ti,hwmods = "uart3";</div><div class='add'>+			clock-frequency = &lt;48000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		uart4: serial@0x4806e000 {</div><div class='add'>+			compatible = "ti,omap4-uart";</div><div class='add'>+			ti,hwmods = "uart4";</div><div class='add'>+			clock-frequency = &lt;48000000&gt;;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/tegra-cardhu.dts b/arch/arm/boot/dts/tegra-cardhu.dts<br/>new file mode 100644<br/>index 000000000000..70c41fc897d7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/tegra-cardhu.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/tegra-cardhu.dts</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+/include/ "tegra30.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "NVIDIA Tegra30 Cardhu evaluation board";</div><div class='add'>+	compatible = "nvidia,cardhu", "nvidia,tegra30";</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		reg = &lt; 0x80000000 0x40000000 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006000 {</div><div class='add'>+		clock-frequency = &lt; 408000000 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000c000 {</div><div class='add'>+		clock-frequency = &lt;100000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000c400 {</div><div class='add'>+		clock-frequency = &lt;100000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000c500 {</div><div class='add'>+		clock-frequency = &lt;100000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000c700 {</div><div class='add'>+		clock-frequency = &lt;100000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000d000 {</div><div class='add'>+		clock-frequency = &lt;100000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts<br/>index 0e225b86b652..80afa1b70b80 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/tegra-harmony.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/tegra-harmony.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/tegra-harmony.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/tegra-harmony.dts</a></div><div class='hunk'>@@ -1,16 +1,11 @@</div><div class='ctx'> /dts-v1/;</div><div class='ctx'> </div><div class='del'>-/memreserve/ 0x1c000000 0x04000000;</div><div class='ctx'> /include/ "tegra20.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "NVIDIA Tegra2 Harmony evaluation board";</div><div class='ctx'> 	compatible = "nvidia,harmony", "nvidia,tegra20";</div><div class='ctx'> </div><div class='del'>-	chosen {</div><div class='del'>-		bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootwait";</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	memory@0 {</div><div class='ctx'> 		reg = &lt; 0x00000000 0x40000000 &gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -52,16 +47,40 @@</div><div class='ctx'> 		ext-mic-en-gpios = &lt;&amp;gpio 185 0&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	serial@70006000 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006040 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006200 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	serial@70006300 {</div><div class='ctx'> 		clock-frequency = &lt; 216000000 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	serial@70006400 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@c8000000 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	sdhci@c8000200 {</div><div class='ctx'> 		cd-gpios = &lt;&amp;gpio 69 0&gt;; /* gpio PI5 */</div><div class='ctx'> 		wp-gpios = &lt;&amp;gpio 57 0&gt;; /* gpio PH1 */</div><div class='ctx'> 		power-gpios = &lt;&amp;gpio 155 0&gt;; /* gpio PT3 */</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	sdhci@c8000400 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	sdhci@c8000600 {</div><div class='ctx'> 		cd-gpios = &lt;&amp;gpio 58 0&gt;; /* gpio PH2 */</div><div class='ctx'> 		wp-gpios = &lt;&amp;gpio 59 0&gt;; /* gpio PH3 */</div><div class='head'>diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts<br/>new file mode 100644<br/>index 000000000000..1a1d7023b69b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/tegra-paz00.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/tegra-paz00.dts</a></div><div class='hunk'>@@ -0,0 +1,77 @@</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+/include/ "tegra20.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Toshiba AC100 / Dynabook AZ";</div><div class='add'>+	compatible = "compal,paz00", "nvidia,tegra20";</div><div class='add'>+</div><div class='add'>+	memory@0 {</div><div class='add'>+		reg = &lt;0x00000000 0x20000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000c000 {</div><div class='add'>+		clock-frequency = &lt;400000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000c400 {</div><div class='add'>+		clock-frequency = &lt;400000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000c500 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	nvec@7000c500 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "nvidia,nvec";</div><div class='add'>+		reg = &lt;0x7000C500 0x100&gt;;</div><div class='add'>+		interrupts = &lt;0 92 0x04&gt;;</div><div class='add'>+		clock-frequency = &lt;80000&gt;;</div><div class='add'>+		request-gpios = &lt;&amp;gpio 170 0&gt;;</div><div class='add'>+		slave-addr = &lt;138&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000d000 {</div><div class='add'>+		clock-frequency = &lt;400000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006000 {</div><div class='add'>+		clock-frequency = &lt;216000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006040 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006200 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006300 {</div><div class='add'>+		clock-frequency = &lt;216000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006400 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@c8000000 {</div><div class='add'>+		cd-gpios = &lt;&amp;gpio 173 0&gt;; /* gpio PV5 */</div><div class='add'>+		wp-gpios = &lt;&amp;gpio 57 0&gt;;  /* gpio PH1 */</div><div class='add'>+		power-gpios = &lt;&amp;gpio 155 0&gt;; /* gpio PT3 */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@c8000200 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@c8000400 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@c8000600 {</div><div class='add'>+		support-8bit;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts<br/>index a72299b8e668..b55a02e34ba7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/tegra-seaboard.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/tegra-seaboard.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/tegra-seaboard.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/tegra-seaboard.dts</a></div><div class='hunk'>@@ -1,25 +1,65 @@</div><div class='ctx'> /dts-v1/;</div><div class='ctx'> </div><div class='del'>-/memreserve/ 0x1c000000 0x04000000;</div><div class='ctx'> /include/ "tegra20.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "NVIDIA Seaboard";</div><div class='ctx'> 	compatible = "nvidia,seaboard", "nvidia,tegra20";</div><div class='ctx'> </div><div class='del'>-	chosen {</div><div class='del'>-		bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk1p3 rw rootwait";</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	memory {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 		reg = &lt; 0x00000000 0x40000000 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	i2c@7000c000 {</div><div class='add'>+		clock-frequency = &lt;400000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000c400 {</div><div class='add'>+		clock-frequency = &lt;400000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000c500 {</div><div class='add'>+		clock-frequency = &lt;400000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000d000 {</div><div class='add'>+		clock-frequency = &lt;400000&gt;;</div><div class='add'>+</div><div class='add'>+		adt7461@4c {</div><div class='add'>+			compatible = "adt7461";</div><div class='add'>+			reg = &lt;0x4c&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006000 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006040 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006200 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	serial@70006300 {</div><div class='ctx'> 		clock-frequency = &lt; 216000000 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	serial@70006400 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@c8000000 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@c8000200 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	sdhci@c8000400 {</div><div class='ctx'> 		cd-gpios = &lt;&amp;gpio 69 0&gt;; /* gpio PI5 */</div><div class='ctx'> 		wp-gpios = &lt;&amp;gpio 57 0&gt;; /* gpio PH1 */</div><div class='hunk'>@@ -29,4 +69,28 @@</div><div class='ctx'> 	sdhci@c8000600 {</div><div class='ctx'> 		support-8bit;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	usb@c5000000 {</div><div class='add'>+		nvidia,vbus-gpio = &lt;&amp;gpio 24 0&gt;; /* PD0 */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio-keys {</div><div class='add'>+		compatible = "gpio-keys";</div><div class='add'>+</div><div class='add'>+		power {</div><div class='add'>+			label = "Power";</div><div class='add'>+			gpios = &lt;&amp;gpio 170 1&gt;; /* gpio PV2, active low */</div><div class='add'>+			linux,code = &lt;116&gt;; /* KEY_POWER */</div><div class='add'>+			gpio-key,wakeup;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		lid {</div><div class='add'>+			label = "Lid";</div><div class='add'>+			gpios = &lt;&amp;gpio 23 0&gt;; /* gpio PC7 */</div><div class='add'>+			linux,input-type = &lt;5&gt;; /* EV_SW */</div><div class='add'>+			linux,code = &lt;0&gt;; /* SW_LID */</div><div class='add'>+			debounce-interval = &lt;1&gt;;</div><div class='add'>+			gpio-key,wakeup;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts<br/>new file mode 100644<br/>index 000000000000..3b3ee7db99f3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/tegra-trimslice.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/tegra-trimslice.dts</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+/include/ "tegra20.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Compulab TrimSlice board";</div><div class='add'>+	compatible = "compulab,trimslice", "nvidia,tegra20";</div><div class='add'>+</div><div class='add'>+	memory@0 {</div><div class='add'>+		reg = &lt; 0x00000000 0x40000000 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000c000 {</div><div class='add'>+		clock-frequency = &lt;400000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000c400 {</div><div class='add'>+		clock-frequency = &lt;400000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000c500 {</div><div class='add'>+		clock-frequency = &lt;400000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000d000 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006000 {</div><div class='add'>+		clock-frequency = &lt; 216000000 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006040 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006200 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006300 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006400 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@c8000000 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@c8000200 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@c8000400 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@c8000600 {</div><div class='add'>+		cd-gpios = &lt;&amp;gpio 121 0&gt;;</div><div class='add'>+		wp-gpios = &lt;&amp;gpio 122 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts<br/>index 3f9abd6b6964..c7d3b87f29df 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/tegra-ventana.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/tegra-ventana.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/tegra-ventana.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/tegra-ventana.dts</a></div><div class='hunk'>@@ -1,24 +1,59 @@</div><div class='ctx'> /dts-v1/;</div><div class='ctx'> </div><div class='del'>-/memreserve/ 0x1c000000 0x04000000;</div><div class='ctx'> /include/ "tegra20.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "NVIDIA Tegra2 Ventana evaluation board";</div><div class='ctx'> 	compatible = "nvidia,ventana", "nvidia,tegra20";</div><div class='ctx'> </div><div class='del'>-	chosen {</div><div class='del'>-		bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/ram rdinit=/sbin/init";</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	memory {</div><div class='ctx'> 		reg = &lt; 0x00000000 0x40000000 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	i2c@7000c000 {</div><div class='add'>+		clock-frequency = &lt;400000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000c400 {</div><div class='add'>+		clock-frequency = &lt;400000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000c500 {</div><div class='add'>+		clock-frequency = &lt;400000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000d000 {</div><div class='add'>+		clock-frequency = &lt;400000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006000 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006040 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006200 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	serial@70006300 {</div><div class='ctx'> 		clock-frequency = &lt; 216000000 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	serial@70006400 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@c8000000 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@c8000200 {</div><div class='add'>+		status = "disable";</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	sdhci@c8000400 {</div><div class='ctx'> 		cd-gpios = &lt;&amp;gpio 69 0&gt;; /* gpio PI5 */</div><div class='ctx'> 		wp-gpios = &lt;&amp;gpio 57 0&gt;; /* gpio PH1 */</div><div class='head'>diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi<br/>index 65d7e6a333eb..3da7afd45322 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/tegra20.dtsi?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/tegra20.dtsi</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/tegra20.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/tegra20.dtsi</a></div><div class='hunk'>@@ -5,9 +5,9 @@</div><div class='ctx'> 	interrupt-parent = &lt;&amp;intc&gt;;</div><div class='ctx'> </div><div class='ctx'> 	intc: interrupt-controller@50041000 {</div><div class='del'>-		compatible = "nvidia,tegra20-gic";</div><div class='add'>+		compatible = "arm,cortex-a9-gic";</div><div class='ctx'> 		interrupt-controller;</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#interrupt-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt; 0x50041000 0x1000 &gt;,</div><div class='ctx'> 		      &lt; 0x50040100 0x0100 &gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		compatible = "nvidia,tegra20-i2c";</div><div class='ctx'> 		reg = &lt;0x7000C000 0x100&gt;;</div><div class='del'>-		interrupts = &lt; 70 &gt;;</div><div class='add'>+		interrupts = &lt; 0 38 0x04 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	i2c@7000c400 {</div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		compatible = "nvidia,tegra20-i2c";</div><div class='ctx'> 		reg = &lt;0x7000C400 0x100&gt;;</div><div class='del'>-		interrupts = &lt; 116 &gt;;</div><div class='add'>+		interrupts = &lt; 0 84 0x04 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	i2c@7000c500 {</div><div class='hunk'>@@ -33,38 +33,32 @@</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		compatible = "nvidia,tegra20-i2c";</div><div class='ctx'> 		reg = &lt;0x7000C500 0x100&gt;;</div><div class='del'>-		interrupts = &lt; 124 &gt;;</div><div class='add'>+		interrupts = &lt; 0 92 0x04 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	i2c@7000d000 {</div><div class='ctx'> 		#address-cells = &lt;1&gt;;</div><div class='ctx'> 		#size-cells = &lt;0&gt;;</div><div class='del'>-		compatible = "nvidia,tegra20-i2c";</div><div class='add'>+		compatible = "nvidia,tegra20-i2c-dvc";</div><div class='ctx'> 		reg = &lt;0x7000D000 0x200&gt;;</div><div class='del'>-		interrupts = &lt; 85 &gt;;</div><div class='add'>+		interrupts = &lt; 0 53 0x04 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	i2s@70002800 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		compatible = "nvidia,tegra20-i2s";</div><div class='ctx'> 		reg = &lt;0x70002800 0x200&gt;;</div><div class='del'>-		interrupts = &lt; 45 &gt;;</div><div class='add'>+		interrupts = &lt; 0 13 0x04 &gt;;</div><div class='ctx'> 		dma-channel = &lt; 2 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	i2s@70002a00 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		compatible = "nvidia,tegra20-i2s";</div><div class='ctx'> 		reg = &lt;0x70002a00 0x200&gt;;</div><div class='del'>-		interrupts = &lt; 35 &gt;;</div><div class='add'>+		interrupts = &lt; 0 3 0x04 &gt;;</div><div class='ctx'> 		dma-channel = &lt; 1 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	das@70000c00 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;0&gt;;</div><div class='ctx'> 		compatible = "nvidia,tegra20-das";</div><div class='ctx'> 		reg = &lt;0x70000c00 0x80&gt;;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -72,7 +66,13 @@</div><div class='ctx'> 	gpio: gpio@6000d000 {</div><div class='ctx'> 		compatible = "nvidia,tegra20-gpio";</div><div class='ctx'> 		reg = &lt; 0x6000d000 0x1000 &gt;;</div><div class='del'>-		interrupts = &lt; 64 65 66 67 87 119 121 &gt;;</div><div class='add'>+		interrupts = &lt; 0 32 0x04</div><div class='add'>+			       0 33 0x04</div><div class='add'>+			       0 34 0x04</div><div class='add'>+			       0 35 0x04</div><div class='add'>+			       0 55 0x04</div><div class='add'>+			       0 87 0x04</div><div class='add'>+			       0 89 0x04 &gt;;</div><div class='ctx'> 		#gpio-cells = &lt;2&gt;;</div><div class='ctx'> 		gpio-controller;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -89,59 +89,80 @@</div><div class='ctx'> 		compatible = "nvidia,tegra20-uart";</div><div class='ctx'> 		reg = &lt;0x70006000 0x40&gt;;</div><div class='ctx'> 		reg-shift = &lt;2&gt;;</div><div class='del'>-		interrupts = &lt; 68 &gt;;</div><div class='add'>+		interrupts = &lt; 0 36 0x04 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	serial@70006040 {</div><div class='ctx'> 		compatible = "nvidia,tegra20-uart";</div><div class='ctx'> 		reg = &lt;0x70006040 0x40&gt;;</div><div class='ctx'> 		reg-shift = &lt;2&gt;;</div><div class='del'>-		interrupts = &lt; 69 &gt;;</div><div class='add'>+		interrupts = &lt; 0 37 0x04 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	serial@70006200 {</div><div class='ctx'> 		compatible = "nvidia,tegra20-uart";</div><div class='ctx'> 		reg = &lt;0x70006200 0x100&gt;;</div><div class='ctx'> 		reg-shift = &lt;2&gt;;</div><div class='del'>-		interrupts = &lt; 78 &gt;;</div><div class='add'>+		interrupts = &lt; 0 46 0x04 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	serial@70006300 {</div><div class='ctx'> 		compatible = "nvidia,tegra20-uart";</div><div class='ctx'> 		reg = &lt;0x70006300 0x100&gt;;</div><div class='ctx'> 		reg-shift = &lt;2&gt;;</div><div class='del'>-		interrupts = &lt; 122 &gt;;</div><div class='add'>+		interrupts = &lt; 0 90 0x04 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	serial@70006400 {</div><div class='ctx'> 		compatible = "nvidia,tegra20-uart";</div><div class='ctx'> 		reg = &lt;0x70006400 0x100&gt;;</div><div class='ctx'> 		reg-shift = &lt;2&gt;;</div><div class='del'>-		interrupts = &lt; 123 &gt;;</div><div class='add'>+		interrupts = &lt; 0 91 0x04 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sdhci@c8000000 {</div><div class='ctx'> 		compatible = "nvidia,tegra20-sdhci";</div><div class='ctx'> 		reg = &lt;0xc8000000 0x200&gt;;</div><div class='del'>-		interrupts = &lt; 46 &gt;;</div><div class='add'>+		interrupts = &lt; 0 14 0x04 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sdhci@c8000200 {</div><div class='ctx'> 		compatible = "nvidia,tegra20-sdhci";</div><div class='ctx'> 		reg = &lt;0xc8000200 0x200&gt;;</div><div class='del'>-		interrupts = &lt; 47 &gt;;</div><div class='add'>+		interrupts = &lt; 0 15 0x04 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sdhci@c8000400 {</div><div class='ctx'> 		compatible = "nvidia,tegra20-sdhci";</div><div class='ctx'> 		reg = &lt;0xc8000400 0x200&gt;;</div><div class='del'>-		interrupts = &lt; 51 &gt;;</div><div class='add'>+		interrupts = &lt; 0 19 0x04 &gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	sdhci@c8000600 {</div><div class='ctx'> 		compatible = "nvidia,tegra20-sdhci";</div><div class='ctx'> 		reg = &lt;0xc8000600 0x200&gt;;</div><div class='del'>-		interrupts = &lt; 63 &gt;;</div><div class='add'>+		interrupts = &lt; 0 31 0x04 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb@c5000000 {</div><div class='add'>+		compatible = "nvidia,tegra20-ehci", "usb-ehci";</div><div class='add'>+		reg = &lt;0xc5000000 0x4000&gt;;</div><div class='add'>+		interrupts = &lt; 0 20 0x04 &gt;;</div><div class='add'>+		phy_type = "utmi";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb@c5004000 {</div><div class='add'>+		compatible = "nvidia,tegra20-ehci", "usb-ehci";</div><div class='add'>+		reg = &lt;0xc5004000 0x4000&gt;;</div><div class='add'>+		interrupts = &lt; 0 21 0x04 &gt;;</div><div class='add'>+		phy_type = "ulpi";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb@c5008000 {</div><div class='add'>+		compatible = "nvidia,tegra20-ehci", "usb-ehci";</div><div class='add'>+		reg = &lt;0xc5008000 0x4000&gt;;</div><div class='add'>+		interrupts = &lt; 0 97 0x04 &gt;;</div><div class='add'>+		phy_type = "utmi";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi<br/>new file mode 100644<br/>index 000000000000..ee7db9892e02<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/tegra30.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/tegra30.dtsi</a></div><div class='hunk'>@@ -0,0 +1,127 @@</div><div class='add'>+/include/ "skeleton.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	compatible = "nvidia,tegra30";</div><div class='add'>+	interrupt-parent = &lt;&amp;intc&gt;;</div><div class='add'>+</div><div class='add'>+	intc: interrupt-controller@50041000 {</div><div class='add'>+		compatible = "arm,cortex-a9-gic";</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		#interrupt-cells = &lt;3&gt;;</div><div class='add'>+		reg = &lt; 0x50041000 0x1000 &gt;,</div><div class='add'>+		      &lt; 0x50040100 0x0100 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000c000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible =  "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";</div><div class='add'>+		reg = &lt;0x7000C000 0x100&gt;;</div><div class='add'>+		interrupts = &lt; 0 38 0x04 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000c400 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";</div><div class='add'>+		reg = &lt;0x7000C400 0x100&gt;;</div><div class='add'>+		interrupts = &lt; 0 84 0x04 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000c500 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";</div><div class='add'>+		reg = &lt;0x7000C500 0x100&gt;;</div><div class='add'>+		interrupts = &lt; 0 92 0x04 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000c700 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";</div><div class='add'>+		reg = &lt;0x7000c700 0x100&gt;;</div><div class='add'>+		interrupts = &lt; 0 120 0x04 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c@7000d000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";</div><div class='add'>+		reg = &lt;0x7000D000 0x100&gt;;</div><div class='add'>+		interrupts = &lt; 0 53 0x04 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	gpio: gpio@6000d000 {</div><div class='add'>+		compatible = "nvidia,tegra30-gpio", "nvidia,tegra20-gpio";</div><div class='add'>+		reg = &lt; 0x6000d000 0x1000 &gt;;</div><div class='add'>+		interrupts = &lt; 0 32 0x04 0 33 0x04 0 34 0x04 0 35 0x04 0 55 0x04 0 87 0x04 0 89 0x04 &gt;;</div><div class='add'>+		#gpio-cells = &lt;2&gt;;</div><div class='add'>+		gpio-controller;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006000 {</div><div class='add'>+		compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart";</div><div class='add'>+		reg = &lt;0x70006000 0x40&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt; 0 36 0x04 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006040 {</div><div class='add'>+		compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart";</div><div class='add'>+		reg = &lt;0x70006040 0x40&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt; 0 37 0x04 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006200 {</div><div class='add'>+		compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart";</div><div class='add'>+		reg = &lt;0x70006200 0x100&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt; 0 46 0x04 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006300 {</div><div class='add'>+		compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart";</div><div class='add'>+		reg = &lt;0x70006300 0x100&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt; 0 90 0x04 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serial@70006400 {</div><div class='add'>+		compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart";</div><div class='add'>+		reg = &lt;0x70006400 0x100&gt;;</div><div class='add'>+		reg-shift = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt; 0 91 0x04 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@78000000 {</div><div class='add'>+		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";</div><div class='add'>+		reg = &lt;0x78000000 0x200&gt;;</div><div class='add'>+		interrupts = &lt; 0 14 0x04 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@78000200 {</div><div class='add'>+		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";</div><div class='add'>+		reg = &lt;0x78000200 0x200&gt;;</div><div class='add'>+		interrupts = &lt; 0 15 0x04 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@78000400 {</div><div class='add'>+		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";</div><div class='add'>+		reg = &lt;0x78000400 0x200&gt;;</div><div class='add'>+		interrupts = &lt; 0 19 0x04 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sdhci@78000600 {</div><div class='add'>+		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";</div><div class='add'>+		reg = &lt;0x78000600 0x200&gt;;</div><div class='add'>+		interrupts = &lt; 0 31 0x04 &gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pinmux: pinmux@70000000 {</div><div class='add'>+		compatible = "nvidia,tegra30-pinmux";</div><div class='add'>+		reg = &lt; 0x70000868 0xd0     /* Pad control registers */</div><div class='add'>+			0x70003000 0x3e0 &gt;; /* Mux registers */</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/testcases/tests-phandle.dtsi b/arch/arm/boot/dts/testcases/tests-phandle.dtsi<br/>new file mode 100644<br/>index 000000000000..ec0c4e6212c9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/testcases/tests-phandle.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/testcases/tests-phandle.dtsi</a></div><div class='hunk'>@@ -0,0 +1,37 @@</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	testcase-data {</div><div class='add'>+		phandle-tests {</div><div class='add'>+			provider0: provider0 {</div><div class='add'>+				#phandle-cells = &lt;0&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			provider1: provider1 {</div><div class='add'>+				#phandle-cells = &lt;1&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			provider2: provider2 {</div><div class='add'>+				#phandle-cells = &lt;2&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			provider3: provider3 {</div><div class='add'>+				#phandle-cells = &lt;3&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			consumer-a {</div><div class='add'>+				phandle-list =	&lt;&amp;provider1 1&gt;,</div><div class='add'>+						&lt;&amp;provider2 2 0&gt;,</div><div class='add'>+						&lt;0&gt;,</div><div class='add'>+						&lt;&amp;provider3 4 4 3&gt;,</div><div class='add'>+						&lt;&amp;provider2 5 100&gt;,</div><div class='add'>+						&lt;&amp;provider0&gt;,</div><div class='add'>+						&lt;&amp;provider1 7&gt;;</div><div class='add'>+				phandle-list-names = "first", "second", "third";</div><div class='add'>+</div><div class='add'>+				phandle-list-bad-phandle = &lt;12345678 0 0&gt;;</div><div class='add'>+				phandle-list-bad-args = &lt;&amp;provider2 1 0&gt;,</div><div class='add'>+							&lt;&amp;provider3 0&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/boot/dts/testcases/tests.dtsi b/arch/arm/boot/dts/testcases/tests.dtsi<br/>new file mode 100644<br/>index 000000000000..a7c5067622e8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/testcases/tests.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/testcases/tests.dtsi</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+/include/ "tests-phandle.dtsi"</div><div class='head'>diff --git a/arch/arm/boot/dts/usb_a9g20.dts b/arch/arm/boot/dts/usb_a9g20.dts<br/>index d66e2c00ac35..f04b535477f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/usb_a9g20.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/usb_a9g20.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/usb_a9g20.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/usb_a9g20.dts</a></div><div class='hunk'>@@ -25,6 +25,11 @@</div><div class='ctx'> 			dbgu: serial@fffff200 {</div><div class='ctx'> 				status = "okay";</div><div class='ctx'> 			};</div><div class='add'>+</div><div class='add'>+			macb0: ethernet@fffc4000 {</div><div class='add'>+				phy-mode = "rmii";</div><div class='add'>+				status = "okay";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/boot/dts/versatile-pb.dts b/arch/arm/boot/dts/versatile-pb.dts<br/>index 8a614e398004..166461073b78 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/versatile-pb.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/boot/dts/versatile-pb.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/dts/versatile-pb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/boot/dts/versatile-pb.dts</a></div><div class='hunk'>@@ -46,3 +46,5 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "testcases/tests.dtsi"</div><div class='head'>diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig<br/>index 74df9ca2be31..81a933eb0903 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/common/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/common/Kconfig</a></div><div class='hunk'>@@ -1,8 +1,14 @@</div><div class='ctx'> config ARM_GIC</div><div class='ctx'> 	select IRQ_DOMAIN</div><div class='add'>+	select MULTI_IRQ_HANDLER</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config GIC_NON_BANKED</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='ctx'> config ARM_VIC</div><div class='add'>+	select IRQ_DOMAIN</div><div class='add'>+	select MULTI_IRQ_HANDLER</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='ctx'> config ARM_VIC_NR</div><div class='head'>diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c<br/>index 410a546060a2..b2dc2dd7f1df 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/gic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/common/gic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/gic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/common/gic.c</a></div><div class='hunk'>@@ -40,13 +40,36 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/exception.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> </div><div class='del'>-static DEFINE_RAW_SPINLOCK(irq_controller_lock);</div><div class='add'>+union gic_base {</div><div class='add'>+	void __iomem *common_base;</div><div class='add'>+	void __percpu __iomem **percpu_base;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-/* Address of GIC 0 CPU interface */</div><div class='del'>-void __iomem *gic_cpu_base_addr __read_mostly;</div><div class='add'>+struct gic_chip_data {</div><div class='add'>+	unsigned int irq_offset;</div><div class='add'>+	union gic_base dist_base;</div><div class='add'>+	union gic_base cpu_base;</div><div class='add'>+#ifdef CONFIG_CPU_PM</div><div class='add'>+	u32 saved_spi_enable[DIV_ROUND_UP(1020, 32)];</div><div class='add'>+	u32 saved_spi_conf[DIV_ROUND_UP(1020, 16)];</div><div class='add'>+	u32 saved_spi_target[DIV_ROUND_UP(1020, 4)];</div><div class='add'>+	u32 __percpu *saved_ppi_enable;</div><div class='add'>+	u32 __percpu *saved_ppi_conf;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_IRQ_DOMAIN</div><div class='add'>+	struct irq_domain domain;</div><div class='add'>+#endif</div><div class='add'>+	unsigned int gic_irqs;</div><div class='add'>+#ifdef CONFIG_GIC_NON_BANKED</div><div class='add'>+	void __iomem *(*get_base)(union gic_base *);</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_RAW_SPINLOCK(irq_controller_lock);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Supported arch specific GIC irq extension.</div><div class='hunk'>@@ -67,16 +90,48 @@ struct irq_chip gic_arch_extn = {</div><div class='ctx'> </div><div class='ctx'> static struct gic_chip_data gic_data[MAX_GIC_NR] __read_mostly;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_GIC_NON_BANKED</div><div class='add'>+static void __iomem *gic_get_percpu_base(union gic_base *base)</div><div class='add'>+{</div><div class='add'>+	return *__this_cpu_ptr(base-&gt;percpu_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __iomem *gic_get_common_base(union gic_base *base)</div><div class='add'>+{</div><div class='add'>+	return base-&gt;common_base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __iomem *gic_data_dist_base(struct gic_chip_data *data)</div><div class='add'>+{</div><div class='add'>+	return data-&gt;get_base(&amp;data-&gt;dist_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __iomem *gic_data_cpu_base(struct gic_chip_data *data)</div><div class='add'>+{</div><div class='add'>+	return data-&gt;get_base(&amp;data-&gt;cpu_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gic_set_base_accessor(struct gic_chip_data *data,</div><div class='add'>+					 void __iomem *(*f)(union gic_base *))</div><div class='add'>+{</div><div class='add'>+	data-&gt;get_base = f;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define gic_data_dist_base(d)	((d)-&gt;dist_base.common_base)</div><div class='add'>+#define gic_data_cpu_base(d)	((d)-&gt;cpu_base.common_base)</div><div class='add'>+#define gic_set_base_accessor(d,f)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline void __iomem *gic_dist_base(struct irq_data *d)</div><div class='ctx'> {</div><div class='ctx'> 	struct gic_chip_data *gic_data = irq_data_get_irq_chip_data(d);</div><div class='del'>-	return gic_data-&gt;dist_base;</div><div class='add'>+	return gic_data_dist_base(gic_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void __iomem *gic_cpu_base(struct irq_data *d)</div><div class='ctx'> {</div><div class='ctx'> 	struct gic_chip_data *gic_data = irq_data_get_irq_chip_data(d);</div><div class='del'>-	return gic_data-&gt;cpu_base;</div><div class='add'>+	return gic_data_cpu_base(gic_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int gic_irq(struct irq_data *d)</div><div class='hunk'>@@ -215,6 +270,32 @@ static int gic_set_wake(struct irq_data *d, unsigned int on)</div><div class='ctx'> #define gic_set_wake	NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	u32 irqstat, irqnr;</div><div class='add'>+	struct gic_chip_data *gic = &amp;gic_data[0];</div><div class='add'>+	void __iomem *cpu_base = gic_data_cpu_base(gic);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		irqstat = readl_relaxed(cpu_base + GIC_CPU_INTACK);</div><div class='add'>+		irqnr = irqstat &amp; ~0x1c00;</div><div class='add'>+</div><div class='add'>+		if (likely(irqnr &gt; 15 &amp;&amp; irqnr &lt; 1021)) {</div><div class='add'>+			irqnr = irq_domain_to_irq(&amp;gic-&gt;domain, irqnr);</div><div class='add'>+			handle_IRQ(irqnr, regs);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (irqnr &lt; 16) {</div><div class='add'>+			writel_relaxed(irqstat, cpu_base + GIC_CPU_EOI);</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+			handle_IPI(irqnr, regs);</div><div class='add'>+#endif</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	} while (1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	struct gic_chip_data *chip_data = irq_get_handler_data(irq);</div><div class='hunk'>@@ -225,7 +306,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 	chained_irq_enter(chip, desc);</div><div class='ctx'> </div><div class='ctx'> 	raw_spin_lock(&amp;irq_controller_lock);</div><div class='del'>-	status = readl_relaxed(chip_data-&gt;cpu_base + GIC_CPU_INTACK);</div><div class='add'>+	status = readl_relaxed(gic_data_cpu_base(chip_data) + GIC_CPU_INTACK);</div><div class='ctx'> 	raw_spin_unlock(&amp;irq_controller_lock);</div><div class='ctx'> </div><div class='ctx'> 	gic_irq = (status &amp; 0x3ff);</div><div class='hunk'>@@ -270,7 +351,7 @@ static void __init gic_dist_init(struct gic_chip_data *gic)</div><div class='ctx'> 	u32 cpumask;</div><div class='ctx'> 	unsigned int gic_irqs = gic-&gt;gic_irqs;</div><div class='ctx'> 	struct irq_domain *domain = &amp;gic-&gt;domain;</div><div class='del'>-	void __iomem *base = gic-&gt;dist_base;</div><div class='add'>+	void __iomem *base = gic_data_dist_base(gic);</div><div class='ctx'> 	u32 cpu = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='hunk'>@@ -330,8 +411,8 @@ static void __init gic_dist_init(struct gic_chip_data *gic)</div><div class='ctx'> </div><div class='ctx'> static void __cpuinit gic_cpu_init(struct gic_chip_data *gic)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *dist_base = gic-&gt;dist_base;</div><div class='del'>-	void __iomem *base = gic-&gt;cpu_base;</div><div class='add'>+	void __iomem *dist_base = gic_data_dist_base(gic);</div><div class='add'>+	void __iomem *base = gic_data_cpu_base(gic);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -368,7 +449,7 @@ static void gic_dist_save(unsigned int gic_nr)</div><div class='ctx'> 		BUG();</div><div class='ctx'> </div><div class='ctx'> 	gic_irqs = gic_data[gic_nr].gic_irqs;</div><div class='del'>-	dist_base = gic_data[gic_nr].dist_base;</div><div class='add'>+	dist_base = gic_data_dist_base(&amp;gic_data[gic_nr]);</div><div class='ctx'> </div><div class='ctx'> 	if (!dist_base)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -403,7 +484,7 @@ static void gic_dist_restore(unsigned int gic_nr)</div><div class='ctx'> 		BUG();</div><div class='ctx'> </div><div class='ctx'> 	gic_irqs = gic_data[gic_nr].gic_irqs;</div><div class='del'>-	dist_base = gic_data[gic_nr].dist_base;</div><div class='add'>+	dist_base = gic_data_dist_base(&amp;gic_data[gic_nr]);</div><div class='ctx'> </div><div class='ctx'> 	if (!dist_base)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -439,8 +520,8 @@ static void gic_cpu_save(unsigned int gic_nr)</div><div class='ctx'> 	if (gic_nr &gt;= MAX_GIC_NR)</div><div class='ctx'> 		BUG();</div><div class='ctx'> </div><div class='del'>-	dist_base = gic_data[gic_nr].dist_base;</div><div class='del'>-	cpu_base = gic_data[gic_nr].cpu_base;</div><div class='add'>+	dist_base = gic_data_dist_base(&amp;gic_data[gic_nr]);</div><div class='add'>+	cpu_base = gic_data_cpu_base(&amp;gic_data[gic_nr]);</div><div class='ctx'> </div><div class='ctx'> 	if (!dist_base || !cpu_base)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -465,8 +546,8 @@ static void gic_cpu_restore(unsigned int gic_nr)</div><div class='ctx'> 	if (gic_nr &gt;= MAX_GIC_NR)</div><div class='ctx'> 		BUG();</div><div class='ctx'> </div><div class='del'>-	dist_base = gic_data[gic_nr].dist_base;</div><div class='del'>-	cpu_base = gic_data[gic_nr].cpu_base;</div><div class='add'>+	dist_base = gic_data_dist_base(&amp;gic_data[gic_nr]);</div><div class='add'>+	cpu_base = gic_data_cpu_base(&amp;gic_data[gic_nr]);</div><div class='ctx'> </div><div class='ctx'> 	if (!dist_base || !cpu_base)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -491,6 +572,11 @@ static int gic_notifier(struct notifier_block *self, unsigned long cmd,	void *v)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MAX_GIC_NR; i++) {</div><div class='add'>+#ifdef CONFIG_GIC_NON_BANKED</div><div class='add'>+		/* Skip over unused GICs */</div><div class='add'>+		if (!gic_data[i].get_base)</div><div class='add'>+			continue;</div><div class='add'>+#endif</div><div class='ctx'> 		switch (cmd) {</div><div class='ctx'> 		case CPU_PM_ENTER:</div><div class='ctx'> 			gic_cpu_save(i);</div><div class='hunk'>@@ -564,8 +650,9 @@ const struct irq_domain_ops gic_irq_domain_ops = {</div><div class='ctx'> #endif</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_bases(unsigned int gic_nr, int irq_start,</div><div class='add'>+			   void __iomem *dist_base, void __iomem *cpu_base,</div><div class='add'>+			   u32 percpu_offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct gic_chip_data *gic;</div><div class='ctx'> 	struct irq_domain *domain;</div><div class='hunk'>@@ -575,8 +662,36 @@ void __init gic_init(unsigned int gic_nr, int irq_start,</div><div class='ctx'> </div><div class='ctx'> 	gic = &amp;gic_data[gic_nr];</div><div class='ctx'> 	domain = &amp;gic-&gt;domain;</div><div class='del'>-	gic-&gt;dist_base = dist_base;</div><div class='del'>-	gic-&gt;cpu_base = cpu_base;</div><div class='add'>+#ifdef CONFIG_GIC_NON_BANKED</div><div class='add'>+	if (percpu_offset) { /* Frankein-GIC without banked registers... */</div><div class='add'>+		unsigned int cpu;</div><div class='add'>+</div><div class='add'>+		gic-&gt;dist_base.percpu_base = alloc_percpu(void __iomem *);</div><div class='add'>+		gic-&gt;cpu_base.percpu_base = alloc_percpu(void __iomem *);</div><div class='add'>+		if (WARN_ON(!gic-&gt;dist_base.percpu_base ||</div><div class='add'>+			    !gic-&gt;cpu_base.percpu_base)) {</div><div class='add'>+			free_percpu(gic-&gt;dist_base.percpu_base);</div><div class='add'>+			free_percpu(gic-&gt;cpu_base.percpu_base);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for_each_possible_cpu(cpu) {</div><div class='add'>+			unsigned long offset = percpu_offset * cpu_logical_map(cpu);</div><div class='add'>+			*per_cpu_ptr(gic-&gt;dist_base.percpu_base, cpu) = dist_base + offset;</div><div class='add'>+			*per_cpu_ptr(gic-&gt;cpu_base.percpu_base, cpu) = cpu_base + offset;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		gic_set_base_accessor(gic, gic_get_percpu_base);</div><div class='add'>+	} else</div><div class='add'>+#endif</div><div class='add'>+	{			/* Normal, sane GIC... */</div><div class='add'>+		WARN(percpu_offset,</div><div class='add'>+		     "GIC_NON_BANKED not enabled, ignoring %08x offset!",</div><div class='add'>+		     percpu_offset);</div><div class='add'>+		gic-&gt;dist_base.common_base = dist_base;</div><div class='add'>+		gic-&gt;cpu_base.common_base = cpu_base;</div><div class='add'>+		gic_set_base_accessor(gic, gic_get_common_base);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For primary GICs, skip over SGIs.</div><div class='hunk'>@@ -584,8 +699,6 @@ void __init gic_init(unsigned int gic_nr, int irq_start,</div><div class='ctx'> 	 */</div><div class='ctx'> 	domain-&gt;hwirq_base = 32;</div><div class='ctx'> 	if (gic_nr == 0) {</div><div class='del'>-		gic_cpu_base_addr = cpu_base;</div><div class='del'>-</div><div class='ctx'> 		if ((irq_start &amp; 31) &gt; 0) {</div><div class='ctx'> 			domain-&gt;hwirq_base = 16;</div><div class='ctx'> 			if (irq_start != -1)</div><div class='hunk'>@@ -597,7 +710,7 @@ void __init gic_init(unsigned int gic_nr, int irq_start,</div><div class='ctx'> 	 * Find out how many interrupts are supported.</div><div class='ctx'> 	 * The GIC only supports up to 1020 interrupt sources.</div><div class='ctx'> 	 */</div><div class='del'>-	gic_irqs = readl_relaxed(dist_base + GIC_DIST_CTR) &amp; 0x1f;</div><div class='add'>+	gic_irqs = readl_relaxed(gic_data_dist_base(gic) + GIC_DIST_CTR) &amp; 0x1f;</div><div class='ctx'> 	gic_irqs = (gic_irqs + 1) * 32;</div><div class='ctx'> 	if (gic_irqs &gt; 1020)</div><div class='ctx'> 		gic_irqs = 1020;</div><div class='hunk'>@@ -645,7 +758,7 @@ void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)</div><div class='ctx'> 	dsb();</div><div class='ctx'> </div><div class='ctx'> 	/* this always happens on GIC0 */</div><div class='del'>-	writel_relaxed(map &lt;&lt; 16 | irq, gic_data[0].dist_base + GIC_DIST_SOFTINT);</div><div class='add'>+	writel_relaxed(map &lt;&lt; 16 | irq, gic_data_dist_base(&amp;gic_data[0]) + GIC_DIST_SOFTINT);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -656,6 +769,7 @@ int __init gic_of_init(struct device_node *node, struct device_node *parent)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *cpu_base;</div><div class='ctx'> 	void __iomem *dist_base;</div><div class='add'>+	u32 percpu_offset;</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	struct irq_domain *domain = &amp;gic_data[gic_cnt].domain;</div><div class='ctx'> </div><div class='hunk'>@@ -668,9 +782,12 @@ int __init gic_of_init(struct device_node *node, struct device_node *parent)</div><div class='ctx'> 	cpu_base = of_iomap(node, 1);</div><div class='ctx'> 	WARN(!cpu_base, "unable to map gic cpu registers\n");</div><div class='ctx'> </div><div class='add'>+	if (of_property_read_u32(node, "cpu-offset", &amp;percpu_offset))</div><div class='add'>+		percpu_offset = 0;</div><div class='add'>+</div><div class='ctx'> 	domain-&gt;of_node = of_node_get(node);</div><div class='ctx'> </div><div class='del'>-	gic_init(gic_cnt, -1, dist_base, cpu_base);</div><div class='add'>+	gic_init_bases(gic_cnt, -1, dist_base, cpu_base, percpu_offset);</div><div class='ctx'> </div><div class='ctx'> 	if (parent) {</div><div class='ctx'> 		irq = irq_of_parse_and_map(node, 0);</div><div class='head'>diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c<br/>index b539ec855e1a..d1bcd7b13ebc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/it8152.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/common/it8152.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/it8152.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/common/it8152.c</a></div><div class='hunk'>@@ -299,8 +299,8 @@ int __init it8152_pci_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 		goto err1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sys-&gt;resource[0] = &amp;it8152_io;</div><div class='del'>-	sys-&gt;resource[1] = &amp;it8152_mem;</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;it8152_io);</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;it8152_mem);</div><div class='ctx'> </div><div class='ctx'> 	if (platform_notify || platform_notify_remove) {</div><div class='ctx'> 		printk(KERN_ERR "PCI: Can't use platform_notify\n");</div><div class='hunk'>@@ -327,6 +327,9 @@ err0:</div><div class='ctx'>  */</div><div class='ctx'> unsigned int pcibios_max_latency = 255;</div><div class='ctx'> </div><div class='add'>+/* ITE bridge requires setting latency timer to avoid early bus access</div><div class='add'>+   termination by PCI bus master devices</div><div class='add'>+*/</div><div class='ctx'> void pcibios_set_master(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u8 lat;</div><div class='hunk'>@@ -352,7 +355,7 @@ void pcibios_set_master(struct pci_dev *dev)</div><div class='ctx'> </div><div class='ctx'> struct pci_bus * __init it8152_pci_scan_bus(int nr, struct pci_sys_data *sys)</div><div class='ctx'> {</div><div class='del'>-	return pci_scan_bus(nr, &amp;it8152_ops, sys);</div><div class='add'>+	return pci_scan_root_bus(NULL, nr, &amp;it8152_ops, sys, &amp;sys-&gt;resources);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(dma_set_coherent_mask);</div><div class='head'>diff --git a/arch/arm/common/pl330.c b/arch/arm/common/pl330.c<br/>index 8d8df744f7a5..d8e44a43047c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/pl330.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/common/pl330.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/pl330.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/common/pl330.c</a></div><div class='hunk'>@@ -1467,13 +1467,19 @@ int pl330_update(const struct pl330_info *pi)</div><div class='ctx'> </div><div class='ctx'> 	/* Now that we are in no hurry, do the callbacks */</div><div class='ctx'> 	while (!list_empty(&amp;pl330-&gt;req_done)) {</div><div class='add'>+		struct pl330_req *r;</div><div class='add'>+</div><div class='ctx'> 		rqdone = container_of(pl330-&gt;req_done.next,</div><div class='ctx'> 					struct _pl330_req, rqd);</div><div class='ctx'> </div><div class='ctx'> 		list_del_init(&amp;rqdone-&gt;rqd);</div><div class='ctx'> </div><div class='add'>+		/* Detach the req */</div><div class='add'>+		r = rqdone-&gt;r;</div><div class='add'>+		rqdone-&gt;r = NULL;</div><div class='add'>+</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;pl330-&gt;lock, flags);</div><div class='del'>-		_callback(rqdone-&gt;r, PL330_ERR_NONE);</div><div class='add'>+		_callback(r, PL330_ERR_NONE);</div><div class='ctx'> 		spin_lock_irqsave(&amp;pl330-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/common/timer-sp.c b/arch/arm/common/timer-sp.c<br/>index 2393b5bc96fa..8794a34eae61 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/timer-sp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/common/timer-sp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/timer-sp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/common/timer-sp.c</a></div><div class='hunk'>@@ -143,7 +143,6 @@ static int sp804_set_next_event(unsigned long next,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct clock_event_device sp804_clockevent = {</div><div class='del'>-	.shift		= 32,</div><div class='ctx'> 	.features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,</div><div class='ctx'> 	.set_mode	= sp804_set_mode,</div><div class='ctx'> 	.set_next_event	= sp804_set_next_event,</div><div class='hunk'>@@ -169,13 +168,9 @@ void __init sp804_clockevents_init(void __iomem *base, unsigned int irq,</div><div class='ctx'> </div><div class='ctx'> 	clkevt_base = base;</div><div class='ctx'> 	clkevt_reload = DIV_ROUND_CLOSEST(rate, HZ);</div><div class='del'>-</div><div class='ctx'> 	evt-&gt;name = name;</div><div class='ctx'> 	evt-&gt;irq = irq;</div><div class='del'>-	evt-&gt;mult = div_sc(rate, NSEC_PER_SEC, evt-&gt;shift);</div><div class='del'>-	evt-&gt;max_delta_ns = clockevent_delta2ns(0xffffffff, evt);</div><div class='del'>-	evt-&gt;min_delta_ns = clockevent_delta2ns(0xf, evt);</div><div class='ctx'> </div><div class='ctx'> 	setup_irq(irq, &amp;sp804_timer_irq);</div><div class='del'>-	clockevents_register_device(evt);</div><div class='add'>+	clockevents_config_and_register(evt, rate, 0xf, 0xffffffff);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/common/via82c505.c b/arch/arm/common/via82c505.c<br/>index 8421d39109b3..67dd2affc57a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/via82c505.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/common/via82c505.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/via82c505.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/common/via82c505.c</a></div><div class='hunk'>@@ -86,7 +86,8 @@ int __init via82c505_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> struct pci_bus * __init via82c505_scan_bus(int nr, struct pci_sys_data *sysdata)</div><div class='ctx'> {</div><div class='ctx'> 	if (nr == 0)</div><div class='del'>-		return pci_scan_bus(0, &amp;via82c505_ops, sysdata);</div><div class='add'>+		return pci_scan_root_bus(NULL, 0, &amp;via82c505_ops, sysdata,</div><div class='add'>+					 &amp;sysdata-&gt;resources);</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c<br/>index 01f18a421b17..dcb004a804c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/vic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/common/vic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/vic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/common/vic.c</a></div><div class='hunk'>@@ -19,17 +19,22 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/irqdomain.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/exception.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> /**</div><div class='ctx'>  * struct vic_device - VIC PM device</div><div class='ctx'>  * @irq: The IRQ number for the base of the VIC.</div><div class='hunk'>@@ -40,6 +45,7 @@</div><div class='ctx'>  * @int_enable: Save for VIC_INT_ENABLE.</div><div class='ctx'>  * @soft_int: Save for VIC_INT_SOFT.</div><div class='ctx'>  * @protect: Save for VIC_PROTECT.</div><div class='add'>+ * @domain: The IRQ domain for the VIC.</div><div class='ctx'>  */</div><div class='ctx'> struct vic_device {</div><div class='ctx'> 	void __iomem	*base;</div><div class='hunk'>@@ -50,13 +56,13 @@ struct vic_device {</div><div class='ctx'> 	u32		int_enable;</div><div class='ctx'> 	u32		soft_int;</div><div class='ctx'> 	u32		protect;</div><div class='add'>+	struct irq_domain domain;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* we cannot allocate memory when VICs are initially registered */</div><div class='ctx'> static struct vic_device vic_devices[CONFIG_ARM_VIC_NR];</div><div class='ctx'> </div><div class='ctx'> static int vic_id;</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * vic_init2 - common initialisation code</div><div class='hunk'>@@ -156,39 +162,50 @@ static int __init vic_pm_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> late_initcall(vic_pm_init);</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * vic_pm_register - Register a VIC for later power management control</div><div class='add'>+ * vic_register() - Register a VIC.</div><div class='ctx'>  * @base: The base address of the VIC.</div><div class='ctx'>  * @irq: The base IRQ for the VIC.</div><div class='ctx'>  * @resume_sources: bitmask of interrupts allowed for resume sources.</div><div class='add'>+ * @node: The device tree node associated with the VIC.</div><div class='ctx'>  *</div><div class='ctx'>  * Register the VIC with the system device tree so that it can be notified</div><div class='ctx'>  * of suspend and resume requests and ensure that the correct actions are</div><div class='ctx'>  * taken to re-instate the settings on resume.</div><div class='add'>+ *</div><div class='add'>+ * This also configures the IRQ domain for the VIC.</div><div class='ctx'>  */</div><div class='del'>-static void __init vic_pm_register(void __iomem *base, unsigned int irq, u32 resume_sources)</div><div class='add'>+static void __init vic_register(void __iomem *base, unsigned int irq,</div><div class='add'>+				u32 resume_sources, struct device_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	struct vic_device *v;</div><div class='ctx'> </div><div class='del'>-	if (vic_id &gt;= ARRAY_SIZE(vic_devices))</div><div class='add'>+	if (vic_id &gt;= ARRAY_SIZE(vic_devices)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: too few VICs, increase CONFIG_ARM_VIC_NR\n", __func__);</div><div class='del'>-	else {</div><div class='del'>-		v = &amp;vic_devices[vic_id];</div><div class='del'>-		v-&gt;base = base;</div><div class='del'>-		v-&gt;resume_sources = resume_sources;</div><div class='del'>-		v-&gt;irq = irq;</div><div class='del'>-		vic_id++;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	v = &amp;vic_devices[vic_id];</div><div class='add'>+	v-&gt;base = base;</div><div class='add'>+	v-&gt;resume_sources = resume_sources;</div><div class='add'>+	v-&gt;irq = irq;</div><div class='add'>+	vic_id++;</div><div class='add'>+</div><div class='add'>+	v-&gt;domain.irq_base = irq;</div><div class='add'>+	v-&gt;domain.nr_irq = 32;</div><div class='add'>+#ifdef CONFIG_OF_IRQ</div><div class='add'>+	v-&gt;domain.of_node = of_node_get(node);</div><div class='add'>+#endif /* CONFIG_OF */</div><div class='add'>+	v-&gt;domain.ops = &amp;irq_domain_simple_ops;</div><div class='add'>+	irq_domain_add(&amp;v-&gt;domain);</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-static inline void vic_pm_register(void __iomem *base, unsigned int irq, u32 arg1) { }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='ctx'> static void vic_ack_irq(struct irq_data *d)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *base = irq_data_get_irq_chip_data(d);</div><div class='del'>-	unsigned int irq = d-&gt;irq &amp; 31;</div><div class='add'>+	unsigned int irq = d-&gt;hwirq;</div><div class='ctx'> 	writel(1 &lt;&lt; irq, base + VIC_INT_ENABLE_CLEAR);</div><div class='ctx'> 	/* moreover, clear the soft-triggered, in case it was the reason */</div><div class='ctx'> 	writel(1 &lt;&lt; irq, base + VIC_INT_SOFT_CLEAR);</div><div class='hunk'>@@ -197,14 +214,14 @@ static void vic_ack_irq(struct irq_data *d)</div><div class='ctx'> static void vic_mask_irq(struct irq_data *d)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *base = irq_data_get_irq_chip_data(d);</div><div class='del'>-	unsigned int irq = d-&gt;irq &amp; 31;</div><div class='add'>+	unsigned int irq = d-&gt;hwirq;</div><div class='ctx'> 	writel(1 &lt;&lt; irq, base + VIC_INT_ENABLE_CLEAR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void vic_unmask_irq(struct irq_data *d)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *base = irq_data_get_irq_chip_data(d);</div><div class='del'>-	unsigned int irq = d-&gt;irq &amp; 31;</div><div class='add'>+	unsigned int irq = d-&gt;hwirq;</div><div class='ctx'> 	writel(1 &lt;&lt; irq, base + VIC_INT_ENABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -226,7 +243,7 @@ static struct vic_device *vic_from_irq(unsigned int irq)</div><div class='ctx'> static int vic_set_wake(struct irq_data *d, unsigned int on)</div><div class='ctx'> {</div><div class='ctx'> 	struct vic_device *v = vic_from_irq(d-&gt;irq);</div><div class='del'>-	unsigned int off = d-&gt;irq &amp; 31;</div><div class='add'>+	unsigned int off = d-&gt;hwirq;</div><div class='ctx'> 	u32 bit = 1 &lt;&lt; off;</div><div class='ctx'> </div><div class='ctx'> 	if (!v)</div><div class='hunk'>@@ -301,7 +318,7 @@ static void __init vic_set_irq_sources(void __iomem *base,</div><div class='ctx'>  *  and 020 within the page. We call this "second block".</div><div class='ctx'>  */</div><div class='ctx'> static void __init vic_init_st(void __iomem *base, unsigned int irq_start,</div><div class='del'>-				u32 vic_sources)</div><div class='add'>+			       u32 vic_sources, struct device_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int vic_2nd_block = ((unsigned long)base &amp; ~PAGE_MASK) != 0;</div><div class='hunk'>@@ -328,17 +345,12 @@ static void __init vic_init_st(void __iomem *base, unsigned int irq_start,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	vic_set_irq_sources(base, irq_start, vic_sources);</div><div class='add'>+	vic_register(base, irq_start, 0, node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * vic_init - initialise a vectored interrupt controller</div><div class='del'>- * @base: iomem base address</div><div class='del'>- * @irq_start: starting interrupt number, must be muliple of 32</div><div class='del'>- * @vic_sources: bitmask of interrupt sources to allow</div><div class='del'>- * @resume_sources: bitmask of interrupt sources to allow for resume</div><div class='del'>- */</div><div class='del'>-void __init vic_init(void __iomem *base, unsigned int irq_start,</div><div class='del'>-		     u32 vic_sources, u32 resume_sources)</div><div class='add'>+static void __init __vic_init(void __iomem *base, unsigned int irq_start,</div><div class='add'>+			      u32 vic_sources, u32 resume_sources,</div><div class='add'>+			      struct device_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	u32 cellid = 0;</div><div class='hunk'>@@ -356,7 +368,7 @@ void __init vic_init(void __iomem *base, unsigned int irq_start,</div><div class='ctx'> </div><div class='ctx'> 	switch(vendor) {</div><div class='ctx'> 	case AMBA_VENDOR_ST:</div><div class='del'>-		vic_init_st(base, irq_start, vic_sources);</div><div class='add'>+		vic_init_st(base, irq_start, vic_sources, node);</div><div class='ctx'> 		return;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_WARNING "VIC: unknown vendor, continuing anyways\n");</div><div class='hunk'>@@ -375,5 +387,81 @@ void __init vic_init(void __iomem *base, unsigned int irq_start,</div><div class='ctx'> </div><div class='ctx'> 	vic_set_irq_sources(base, irq_start, vic_sources);</div><div class='ctx'> </div><div class='del'>-	vic_pm_register(base, irq_start, resume_sources);</div><div class='add'>+	vic_register(base, irq_start, resume_sources, node);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * vic_init() - initialise a vectored interrupt controller</div><div class='add'>+ * @base: iomem base address</div><div class='add'>+ * @irq_start: starting interrupt number, must be muliple of 32</div><div class='add'>+ * @vic_sources: bitmask of interrupt sources to allow</div><div class='add'>+ * @resume_sources: bitmask of interrupt sources to allow for resume</div><div class='add'>+ */</div><div class='add'>+void __init vic_init(void __iomem *base, unsigned int irq_start,</div><div class='add'>+		     u32 vic_sources, u32 resume_sources)</div><div class='add'>+{</div><div class='add'>+	__vic_init(base, irq_start, vic_sources, resume_sources, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+int __init vic_of_init(struct device_node *node, struct device_node *parent)</div><div class='add'>+{</div><div class='add'>+	void __iomem *regs;</div><div class='add'>+	int irq_base;</div><div class='add'>+</div><div class='add'>+	if (WARN(parent, "non-root VICs are not supported"))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	regs = of_iomap(node, 0);</div><div class='add'>+	if (WARN_ON(!regs))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	irq_base = irq_alloc_descs(-1, 0, 32, numa_node_id());</div><div class='add'>+	if (WARN_ON(irq_base &lt; 0))</div><div class='add'>+		goto out_unmap;</div><div class='add'>+</div><div class='add'>+	__vic_init(regs, irq_base, ~0, ~0, node);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ out_unmap:</div><div class='add'>+	iounmap(regs);</div><div class='add'>+</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG OF */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handle each interrupt in a single VIC.  Returns non-zero if we've</div><div class='add'>+ * handled at least one interrupt.  This does a single read of the</div><div class='add'>+ * status register and handles all interrupts in order from LSB first.</div><div class='add'>+ */</div><div class='add'>+static int handle_one_vic(struct vic_device *vic, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	u32 stat, irq;</div><div class='add'>+	int handled = 0;</div><div class='add'>+</div><div class='add'>+	stat = readl_relaxed(vic-&gt;base + VIC_IRQ_STATUS);</div><div class='add'>+	while (stat) {</div><div class='add'>+		irq = ffs(stat) - 1;</div><div class='add'>+		handle_IRQ(irq_domain_to_irq(&amp;vic-&gt;domain, irq), regs);</div><div class='add'>+		stat &amp;= ~(1 &lt;&lt; irq);</div><div class='add'>+		handled = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return handled;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Keep iterating over all registered VIC's until there are no pending</div><div class='add'>+ * interrupts.</div><div class='add'>+ */</div><div class='add'>+asmlinkage void __exception_irq_entry vic_handle_irq(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int i, handled;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		for (i = 0, handled = 0; i &lt; vic_id; ++i)</div><div class='add'>+			handled |= handle_one_vic(&amp;vic_devices[i], regs);</div><div class='add'>+	} while (handled);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/configs/bonito_defconfig b/arch/arm/configs/bonito_defconfig<br/>new file mode 100644<br/>index 000000000000..54571082d920<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/bonito_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/configs/bonito_defconfig</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=16</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_IPC_NS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_PID_NS is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_IOSCHED_DEADLINE is not set</div><div class='add'>+# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+CONFIG_ARCH_SHMOBILE=y</div><div class='add'>+CONFIG_ARCH_R8A7740=y</div><div class='add'>+CONFIG_MACH_BONITO=y</div><div class='add'>+# CONFIG_SH_TIMER_TMU is not set</div><div class='add'>+CONFIG_AEABI=y</div><div class='add'>+# CONFIG_OABI_COMPAT is not set</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=12</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="console=ttySC5,115200 earlyprintk=sh-sci.5,115200 ignore_loglevel"</div><div class='add'>+CONFIG_KEXEC=y</div><div class='add'>+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set</div><div class='add'>+# CONFIG_SUSPEND is not set</div><div class='add'>+CONFIG_PM_RUNTIME=y</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+# CONFIG_FIRMWARE_IN_KERNEL is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+CONFIG_MTD_CFI_ADV_OPTIONS=y</div><div class='add'>+CONFIG_MTD_CFI_INTELEXT=y</div><div class='add'>+CONFIG_MTD_PHYSMAP=y</div><div class='add'>+CONFIG_MTD_ARM_INTEGRATOR=y</div><div class='add'>+CONFIG_MTD_BLOCK2MTD=y</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+# CONFIG_SCSI_LOWLEVEL is not set</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+CONFIG_SERIAL_SH_SCI=y</div><div class='add'>+CONFIG_SERIAL_SH_SCI_NR_UARTS=9</div><div class='add'>+CONFIG_SERIAL_SH_SCI_CONSOLE=y</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_SH_MOBILE=y</div><div class='add'>+CONFIG_GPIO_SYSFS=y</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_MFD_SUPPORT is not set</div><div class='add'>+# CONFIG_HID_SUPPORT is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+CONFIG_UIO=y</div><div class='add'>+CONFIG_UIO_PDRV=y</div><div class='add'>+CONFIG_UIO_PDRV_GENIRQ=y</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='add'>+# CONFIG_INOTIFY_USER is not set</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_MISC_FILESYSTEMS is not set</div><div class='add'>+# CONFIG_ENABLE_WARN_DEPRECATED is not set</div><div class='add'>+# CONFIG_ENABLE_MUST_CHECK is not set</div><div class='add'>+# CONFIG_ARM_UNWIND is not set</div><div class='head'>diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig<br/>index cf497ce41dfe..a22e93079063 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/imx_v4_v5_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/configs/imx_v4_v5_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/imx_v4_v5_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/configs/imx_v4_v5_defconfig</a></div><div class='hunk'>@@ -68,7 +68,6 @@ CONFIG_MTD_CFI=y</div><div class='ctx'> CONFIG_MTD_CFI_ADV_OPTIONS=y</div><div class='ctx'> CONFIG_MTD_CFI_GEOMETRY=y</div><div class='ctx'> # CONFIG_MTD_MAP_BANK_WIDTH_1 is not set</div><div class='del'>-# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set</div><div class='ctx'> # CONFIG_MTD_CFI_I2 is not set</div><div class='ctx'> CONFIG_MTD_CFI_INTELEXT=y</div><div class='ctx'> CONFIG_MTD_PHYSMAP=y</div><div class='head'>diff --git a/arch/arm/configs/kota2_defconfig b/arch/arm/configs/kota2_defconfig<br/>new file mode 100644<br/>index 000000000000..b7735d6347ac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/kota2_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/configs/kota2_defconfig</a></div><div class='hunk'>@@ -0,0 +1,122 @@</div><div class='add'>+# CONFIG_ARM_PATCH_PHYS_VIRT is not set</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=16</div><div class='add'>+CONFIG_CGROUPS=y</div><div class='add'>+CONFIG_CPUSETS=y</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_IPC_NS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_PID_NS is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_IOSCHED_DEADLINE is not set</div><div class='add'>+# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+CONFIG_ARCH_SHMOBILE=y</div><div class='add'>+CONFIG_KEYBOARD_GPIO_POLLED=y</div><div class='add'>+CONFIG_ARCH_SH73A0=y</div><div class='add'>+CONFIG_MACH_KOTA2=y</div><div class='add'>+CONFIG_MEMORY_SIZE=0x1e0000000</div><div class='add'>+# CONFIG_SH_TIMER_TMU is not set</div><div class='add'>+# CONFIG_SWP_EMULATE is not set</div><div class='add'>+CONFIG_CPU_BPREDICT_DISABLE=y</div><div class='add'>+CONFIG_ARM_ERRATA_460075=y</div><div class='add'>+CONFIG_ARM_ERRATA_742230=y</div><div class='add'>+CONFIG_ARM_ERRATA_742231=y</div><div class='add'>+CONFIG_PL310_ERRATA_588369=y</div><div class='add'>+CONFIG_ARM_ERRATA_720789=y</div><div class='add'>+CONFIG_PL310_ERRATA_727915=y</div><div class='add'>+CONFIG_ARM_ERRATA_743622=y</div><div class='add'>+CONFIG_ARM_ERRATA_751472=y</div><div class='add'>+CONFIG_PL310_ERRATA_753970=y</div><div class='add'>+CONFIG_ARM_ERRATA_754322=y</div><div class='add'>+CONFIG_PL310_ERRATA_769419=y</div><div class='add'>+CONFIG_NO_HZ=y</div><div class='add'>+CONFIG_SMP=y</div><div class='add'>+CONFIG_AEABI=y</div><div class='add'>+# CONFIG_OABI_COMPAT is not set</div><div class='add'>+CONFIG_HIGHMEM=y</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel"</div><div class='add'>+CONFIG_CMDLINE_FORCE=y</div><div class='add'>+CONFIG_KEXEC=y</div><div class='add'>+CONFIG_CPU_IDLE=y</div><div class='add'>+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set</div><div class='add'>+CONFIG_PM_RUNTIME=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_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+# CONFIG_INET_DIAG is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+CONFIG_CFG80211=y</div><div class='add'>+CONFIG_WIRELESS_EXT_SYSFS=y</div><div class='add'>+CONFIG_MAC80211=y</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+# CONFIG_BLK_DEV is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NET_VENDOR_BROADCOM is not set</div><div class='add'>+# CONFIG_NET_VENDOR_CHELSIO is not set</div><div class='add'>+# CONFIG_NET_VENDOR_FARADAY is not set</div><div class='add'>+# CONFIG_NET_VENDOR_INTEL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_MARVELL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_MICREL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_NATSEMI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+CONFIG_SMSC911X=y</div><div class='add'>+# CONFIG_NET_VENDOR_STMICRO is not set</div><div class='add'>+CONFIG_B43=y</div><div class='add'>+CONFIG_B43_PHY_N=y</div><div class='add'>+CONFIG_B43_DEBUG=y</div><div class='add'>+CONFIG_INPUT_SPARSEKMAP=y</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+# CONFIG_KEYBOARD_ATKBD is not set</div><div class='add'>+CONFIG_KEYBOARD_GPIO=y</div><div class='add'>+CONFIG_KEYBOARD_SH_KEYSC=y</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+CONFIG_SERIAL_SH_SCI=y</div><div class='add'>+CONFIG_SERIAL_SH_SCI_NR_UARTS=9</div><div class='add'>+CONFIG_SERIAL_SH_SCI_CONSOLE=y</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_I2C_SH_MOBILE=y</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+CONFIG_BCMA=y</div><div class='add'>+CONFIG_BCMA_DEBUG=y</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+CONFIG_FB_SH_MOBILE_LCDC=y</div><div class='add'>+CONFIG_LCD_PLATFORM=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y</div><div class='add'>+# CONFIG_HID_SUPPORT is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+CONFIG_MMC_SDHI=y</div><div class='add'>+CONFIG_MMC_SH_MMCIF=y</div><div class='add'>+CONFIG_NEW_LEDS=y</div><div class='add'>+CONFIG_LEDS_CLASS=y</div><div class='add'>+CONFIG_LEDS_GPIO=y</div><div class='add'>+CONFIG_LEDS_RENESAS_TPU=y</div><div class='add'>+CONFIG_LEDS_TRIGGERS=y</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='add'>+# CONFIG_INOTIFY_USER is not set</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_MISC_FILESYSTEMS is not set</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+CONFIG_DEBUG_INFO=y</div><div class='add'>+CONFIG_DEBUG_INFO_REDUCED=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+CONFIG_DEBUG_USER=y</div><div class='head'>diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig<br/>new file mode 100644<br/>index 000000000000..864f9a5c39dd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/marzen_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/configs/marzen_defconfig</a></div><div class='hunk'>@@ -0,0 +1,87 @@</div><div class='add'>+# CONFIG_ARM_PATCH_PHYS_VIRT is not set</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_KERNEL_LZMA=y</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=16</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_BLOCK is not set</div><div class='add'>+CONFIG_ARCH_SHMOBILE=y</div><div class='add'>+CONFIG_ARCH_R8A7779=y</div><div class='add'>+CONFIG_MACH_MARZEN=y</div><div class='add'>+CONFIG_MEMORY_START=0x60000000</div><div class='add'>+CONFIG_MEMORY_SIZE=0x10000000</div><div class='add'>+CONFIG_SHMOBILE_TIMER_HZ=1024</div><div class='add'>+# CONFIG_SH_TIMER_CMT is not set</div><div class='add'>+# CONFIG_SWP_EMULATE is not set</div><div class='add'>+CONFIG_ARM_ERRATA_430973=y</div><div class='add'>+CONFIG_ARM_ERRATA_458693=y</div><div class='add'>+CONFIG_ARM_ERRATA_460075=y</div><div class='add'>+CONFIG_ARM_ERRATA_743622=y</div><div class='add'>+CONFIG_ARM_ERRATA_754322=y</div><div class='add'>+CONFIG_NO_HZ=y</div><div class='add'>+CONFIG_SMP=y</div><div class='add'>+# CONFIG_ARM_CPU_TOPOLOGY is not set</div><div class='add'>+CONFIG_AEABI=y</div><div class='add'>+# CONFIG_OABI_COMPAT is not set</div><div class='add'>+CONFIG_HIGHMEM=y</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel"</div><div class='add'>+CONFIG_CMDLINE_FORCE=y</div><div class='add'>+CONFIG_KEXEC=y</div><div class='add'>+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set</div><div class='add'>+CONFIG_PM_RUNTIME=y</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_WIRELESS is not set</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_DEVTMPFS=y</div><div class='add'>+CONFIG_DEVTMPFS_MOUNT=y</div><div class='add'>+# CONFIG_STANDALONE is not set</div><div class='add'>+# CONFIG_PREVENT_FIRMWARE_BUILD is not set</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_NET_VENDOR_BROADCOM is not set</div><div class='add'>+# CONFIG_NET_VENDOR_FARADAY is not set</div><div class='add'>+# CONFIG_NET_VENDOR_INTEL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_MICREL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_NATSEMI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+CONFIG_SMC911X=y</div><div class='add'>+CONFIG_SMSC911X=y</div><div class='add'>+# CONFIG_NET_VENDOR_STMICRO is not set</div><div class='add'>+# CONFIG_WLAN is not set</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_DEVKMEM is not set</div><div class='add'>+CONFIG_SERIAL_SH_SCI=y</div><div class='add'>+CONFIG_SERIAL_SH_SCI_NR_UARTS=6</div><div class='add'>+CONFIG_SERIAL_SH_SCI_CONSOLE=y</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_GPIO_SYSFS=y</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+CONFIG_SSB=y</div><div class='add'>+# CONFIG_HID_SUPPORT is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+CONFIG_UIO=y</div><div class='add'>+CONFIG_UIO_PDRV_GENIRQ=y</div><div class='add'>+# CONFIG_IOMMU_SUPPORT is not set</div><div class='add'>+# CONFIG_FILE_LOCKING is not set</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='add'>+# CONFIG_INOTIFY_USER is not set</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_MISC_FILESYSTEMS is not set</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+CONFIG_DEBUG_INFO=y</div><div class='add'>+CONFIG_DEBUG_INFO_REDUCED=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='add'>+CONFIG_DEBUG_USER=y</div><div class='add'>+CONFIG_AVERAGE=y</div><div class='head'>diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig<br/>index 945a34f2a34d..dde2a1af7b39 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/omap1_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/configs/omap1_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/omap1_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/configs/omap1_defconfig</a></div><div class='hunk'>@@ -48,7 +48,6 @@ CONFIG_MACH_SX1=y</div><div class='ctx'> CONFIG_MACH_NOKIA770=y</div><div class='ctx'> CONFIG_MACH_AMS_DELTA=y</div><div class='ctx'> CONFIG_MACH_OMAP_GENERIC=y</div><div class='del'>-CONFIG_OMAP_ARM_182MHZ=y</div><div class='ctx'> # CONFIG_ARM_THUMB is not set</div><div class='ctx'> CONFIG_PCCARD=y</div><div class='ctx'> CONFIG_OMAP_CF=y</div><div class='head'>diff --git a/arch/arm/configs/pcontrol_g20_defconfig b/arch/arm/configs/pcontrol_g20_defconfig<br/>deleted file mode 100644<br/>index c75c9fcede58..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/pcontrol_g20_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/configs/pcontrol_g20_defconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,175 +0,0 @@</div><div class='del'>-CONFIG_EXPERIMENTAL=y</div><div class='del'>-CONFIG_CROSS_COMPILE="/opt/arm-2010q1/bin/arm-none-linux-gnueabi-"</div><div class='del'>-# CONFIG_LOCALVERSION_AUTO is not set</div><div class='del'>-# CONFIG_SWAP is not set</div><div class='del'>-CONFIG_SYSVIPC=y</div><div class='del'>-CONFIG_POSIX_MQUEUE=y</div><div class='del'>-CONFIG_TREE_PREEMPT_RCU=y</div><div class='del'>-CONFIG_IKCONFIG=y</div><div class='del'>-CONFIG_IKCONFIG_PROC=y</div><div class='del'>-CONFIG_LOG_BUF_SHIFT=14</div><div class='del'>-CONFIG_NAMESPACES=y</div><div class='del'>-CONFIG_BLK_DEV_INITRD=y</div><div class='del'>-CONFIG_EXPERT=y</div><div class='del'>-# CONFIG_SYSCTL_SYSCALL is not set</div><div class='del'>-# CONFIG_KALLSYMS is not set</div><div class='del'>-# CONFIG_VM_EVENT_COUNTERS is not set</div><div class='del'>-# CONFIG_COMPAT_BRK is not set</div><div class='del'>-CONFIG_SLAB=y</div><div class='del'>-CONFIG_MODULES=y</div><div class='del'>-CONFIG_MODULE_UNLOAD=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='del'>-# CONFIG_BLK_DEV_BSG is not set</div><div class='del'>-CONFIG_DEFAULT_DEADLINE=y</div><div class='del'>-CONFIG_ARCH_AT91=y</div><div class='del'>-CONFIG_ARCH_AT91SAM9G20=y</div><div class='del'>-CONFIG_MACH_PCONTROL_G20=y</div><div class='del'>-CONFIG_AT91_PROGRAMMABLE_CLOCKS=y</div><div class='del'>-CONFIG_NO_HZ=y</div><div class='del'>-CONFIG_HIGH_RES_TIMERS=y</div><div class='del'>-CONFIG_PREEMPT=y</div><div class='del'>-CONFIG_AEABI=y</div><div class='del'>-# CONFIG_OABI_COMPAT is not set</div><div class='del'>-CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='del'>-CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='del'>-CONFIG_CMDLINE="console=ttyS0,115200 mem=128M mtdparts=atmel_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) root=/dev/mmcblk0p1 rootwait rw"</div><div class='del'>-CONFIG_VFP=y</div><div class='del'>-CONFIG_BINFMT_MISC=y</div><div class='del'>-CONFIG_NET=y</div><div class='del'>-CONFIG_PACKET=y</div><div class='del'>-CONFIG_UNIX=y</div><div class='del'>-CONFIG_INET=y</div><div class='del'>-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='del'>-# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='del'>-# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='del'>-# CONFIG_INET_LRO is not set</div><div class='del'>-# CONFIG_IPV6 is not set</div><div class='del'>-CONFIG_VLAN_8021Q=y</div><div class='del'>-# CONFIG_WIRELESS is not set</div><div class='del'>-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='del'>-# CONFIG_FW_LOADER is not set</div><div class='del'>-CONFIG_MTD=y</div><div class='del'>-CONFIG_MTD_PARTITIONS=y</div><div class='del'>-CONFIG_MTD_CMDLINE_PARTS=y</div><div class='del'>-CONFIG_MTD_CHAR=y</div><div class='del'>-CONFIG_MTD_BLOCK=y</div><div class='del'>-CONFIG_MTD_COMPLEX_MAPPINGS=y</div><div class='del'>-CONFIG_MTD_PHRAM=m</div><div class='del'>-CONFIG_MTD_NAND=y</div><div class='del'>-CONFIG_MTD_NAND_ATMEL=y</div><div class='del'>-CONFIG_BLK_DEV_LOOP=y</div><div class='del'>-CONFIG_BLK_DEV_RAM=y</div><div class='del'>-CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='del'>-CONFIG_ATMEL_TCLIB=y</div><div class='del'>-CONFIG_EEPROM_AT24=m</div><div class='del'>-CONFIG_SCSI=m</div><div class='del'>-# CONFIG_SCSI_PROC_FS is not set</div><div class='del'>-CONFIG_BLK_DEV_SD=m</div><div class='del'>-CONFIG_SCSI_MULTI_LUN=y</div><div class='del'>-# CONFIG_SCSI_LOWLEVEL is not set</div><div class='del'>-CONFIG_NETDEVICES=y</div><div class='del'>-CONFIG_MACVLAN=m</div><div class='del'>-CONFIG_TUN=m</div><div class='del'>-CONFIG_SMSC_PHY=m</div><div class='del'>-CONFIG_BROADCOM_PHY=m</div><div class='del'>-CONFIG_NET_ETHERNET=y</div><div class='del'>-CONFIG_MII=y</div><div class='del'>-CONFIG_MACB=y</div><div class='del'>-CONFIG_SMSC911X=m</div><div class='del'>-# CONFIG_NETDEV_1000 is not set</div><div class='del'>-# CONFIG_NETDEV_10000 is not set</div><div class='del'>-# CONFIG_WLAN is not set</div><div class='del'>-CONFIG_PPP=m</div><div class='del'>-CONFIG_PPP_ASYNC=m</div><div class='del'>-CONFIG_PPP_DEFLATE=m</div><div class='del'>-CONFIG_PPP_MPPE=m</div><div class='del'>-CONFIG_INPUT_POLLDEV=y</div><div class='del'>-CONFIG_INPUT_SPARSEKMAP=y</div><div class='del'>-# CONFIG_INPUT_MOUSEDEV is not set</div><div class='del'>-CONFIG_INPUT_EVDEV=m</div><div class='del'>-CONFIG_INPUT_EVBUG=m</div><div class='del'>-# CONFIG_KEYBOARD_ATKBD is not set</div><div class='del'>-CONFIG_KEYBOARD_GPIO=m</div><div class='del'>-CONFIG_KEYBOARD_MATRIX=m</div><div class='del'>-# CONFIG_INPUT_MOUSE is not set</div><div class='del'>-CONFIG_INPUT_TOUCHSCREEN=y</div><div class='del'>-CONFIG_INPUT_MISC=y</div><div class='del'>-CONFIG_INPUT_UINPUT=m</div><div class='del'>-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m</div><div class='del'>-# CONFIG_SERIO is not set</div><div class='del'>-# CONFIG_DEVKMEM is not set</div><div class='del'>-CONFIG_SERIAL_ATMEL=y</div><div class='del'>-CONFIG_SERIAL_ATMEL_CONSOLE=y</div><div class='del'>-CONFIG_SERIAL_MAX3100=m</div><div class='del'>-# CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_HW_RANDOM is not set</div><div class='del'>-CONFIG_R3964=m</div><div class='del'>-CONFIG_I2C=m</div><div class='del'>-CONFIG_I2C_CHARDEV=m</div><div class='del'>-# CONFIG_I2C_HELPER_AUTO is not set</div><div class='del'>-CONFIG_I2C_GPIO=m</div><div class='del'>-CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_ATMEL=m</div><div class='del'>-CONFIG_SPI_SPIDEV=m</div><div class='del'>-CONFIG_GPIO_SYSFS=y</div><div class='del'>-CONFIG_W1=m</div><div class='del'>-CONFIG_W1_MASTER_GPIO=m</div><div class='del'>-CONFIG_W1_SLAVE_DS2431=m</div><div class='del'>-# CONFIG_HWMON is not set</div><div class='del'>-CONFIG_WATCHDOG=y</div><div class='del'>-CONFIG_AT91SAM9X_WATCHDOG=y</div><div class='del'>-# CONFIG_MFD_SUPPORT is not set</div><div class='del'>-# CONFIG_HID_SUPPORT is not set</div><div class='del'>-CONFIG_USB=y</div><div class='del'>-# CONFIG_USB_DEVICE_CLASS is not set</div><div class='del'>-CONFIG_USB_OHCI_HCD=y</div><div class='del'>-CONFIG_USB_STORAGE=m</div><div class='del'>-CONFIG_USB_LIBUSUAL=y</div><div class='del'>-CONFIG_USB_SERIAL=m</div><div class='del'>-CONFIG_USB_SERIAL_GENERIC=y</div><div class='del'>-CONFIG_USB_SERIAL_FTDI_SIO=m</div><div class='del'>-CONFIG_USB_SERIAL_PL2303=m</div><div class='del'>-CONFIG_USB_GADGET=y</div><div class='del'>-CONFIG_USB_ZERO=m</div><div class='del'>-CONFIG_USB_ETH=m</div><div class='del'>-CONFIG_USB_FILE_STORAGE=m</div><div class='del'>-CONFIG_USB_G_SERIAL=m</div><div class='del'>-CONFIG_USB_G_HID=m</div><div class='del'>-CONFIG_MMC=y</div><div class='del'>-CONFIG_MMC_UNSAFE_RESUME=y</div><div class='del'>-CONFIG_MMC_ATMELMCI=y</div><div class='del'>-CONFIG_NEW_LEDS=y</div><div class='del'>-CONFIG_LEDS_CLASS=y</div><div class='del'>-CONFIG_LEDS_GPIO=y</div><div class='del'>-CONFIG_LEDS_TRIGGERS=y</div><div class='del'>-CONFIG_LEDS_TRIGGER_TIMER=y</div><div class='del'>-CONFIG_LEDS_TRIGGER_HEARTBEAT=y</div><div class='del'>-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y</div><div class='del'>-CONFIG_RTC_CLASS=y</div><div class='del'>-CONFIG_RTC_DRV_AT91SAM9=y</div><div class='del'>-CONFIG_AUXDISPLAY=y</div><div class='del'>-CONFIG_UIO=y</div><div class='del'>-CONFIG_UIO_PDRV=y</div><div class='del'>-CONFIG_STAGING=y</div><div class='del'>-# CONFIG_STAGING_EXCLUDE_BUILD is not set</div><div class='del'>-CONFIG_IIO=y</div><div class='del'>-CONFIG_EXT2_FS=y</div><div class='del'>-CONFIG_EXT3_FS=y</div><div class='del'>-# CONFIG_EXT3_FS_XATTR is not set</div><div class='del'>-CONFIG_VFAT_FS=y</div><div class='del'>-CONFIG_TMPFS=y</div><div class='del'>-CONFIG_JFFS2_FS=y</div><div class='del'>-CONFIG_NFS_FS=y</div><div class='del'>-CONFIG_NFS_V3=y</div><div class='del'>-CONFIG_NFS_V4=y</div><div class='del'>-CONFIG_PARTITION_ADVANCED=y</div><div class='del'>-CONFIG_NLS_CODEPAGE_437=y</div><div class='del'>-CONFIG_NLS_CODEPAGE_850=y</div><div class='del'>-CONFIG_NLS_ISO8859_1=y</div><div class='del'>-CONFIG_NLS_ISO8859_15=y</div><div class='del'>-CONFIG_NLS_UTF8=y</div><div class='del'>-# CONFIG_RCU_CPU_STALL_DETECTOR is not set</div><div class='del'>-CONFIG_CRYPTO=y</div><div class='del'>-CONFIG_CRYPTO_ANSI_CPRNG=y</div><div class='del'>-# CONFIG_CRYPTO_HW is not set</div><div class='del'>-CONFIG_CRC_CCITT=y</div><div class='head'>diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig<br/>index 195729760aeb..fd5d3041d717 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/tegra_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/configs/tegra_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/tegra_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/configs/tegra_defconfig</a></div><div class='hunk'>@@ -9,9 +9,8 @@ CONFIG_RESOURCE_COUNTERS=y</div><div class='ctx'> CONFIG_CGROUP_SCHED=y</div><div class='ctx'> CONFIG_RT_GROUP_SCHED=y</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='del'>-CONFIG_EMBEDDED=y</div><div class='del'>-# CONFIG_SYSCTL_SYSCALL is not set</div><div class='ctx'> # CONFIG_ELF_CORE is not set</div><div class='add'>+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='hunk'>@@ -20,6 +19,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='ctx'> # CONFIG_IOSCHED_DEADLINE is not set</div><div class='ctx'> # CONFIG_IOSCHED_CFQ is not set</div><div class='ctx'> CONFIG_ARCH_TEGRA=y</div><div class='add'>+CONFIG_ARCH_TEGRA_2x_SOC=y</div><div class='add'>+CONFIG_ARCH_TEGRA_3x_SOC=y</div><div class='ctx'> CONFIG_MACH_HARMONY=y</div><div class='ctx'> CONFIG_MACH_KAEN=y</div><div class='ctx'> CONFIG_MACH_PAZ00=y</div><div class='hunk'>@@ -78,14 +79,12 @@ CONFIG_BLK_DEV_SD=y</div><div class='ctx'> # CONFIG_SCSI_LOWLEVEL is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_DUMMY=y</div><div class='del'>-CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_R8169=y</div><div class='del'>-# CONFIG_NETDEV_10000 is not set</div><div class='del'>-# CONFIG_WLAN is not set</div><div class='ctx'> CONFIG_USB_PEGASUS=y</div><div class='ctx'> CONFIG_USB_USBNET=y</div><div class='ctx'> CONFIG_USB_NET_SMSC75XX=y</div><div class='ctx'> CONFIG_USB_NET_SMSC95XX=y</div><div class='add'>+# CONFIG_WLAN is not set</div><div class='ctx'> # CONFIG_INPUT is not set</div><div class='ctx'> # CONFIG_SERIO is not set</div><div class='ctx'> # CONFIG_VT is not set</div><div class='head'>diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h<br/>index 29035e86a59d..b6e65dedfd71 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/assembler.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/assembler.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/assembler.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/assembler.h</a></div><div class='hunk'>@@ -187,6 +187,17 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Instruction barrier</div><div class='add'>+ */</div><div class='add'>+	.macro	instr_sync</div><div class='add'>+#if __LINUX_ARM_ARCH__ &gt;= 7</div><div class='add'>+	isb</div><div class='add'>+#elif __LINUX_ARM_ARCH__ == 6</div><div class='add'>+	mcr	p15, 0, r0, c7, c5, 4</div><div class='add'>+#endif</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * SMP data memory barrier</div><div class='ctx'>  */</div><div class='ctx'> 	.macro	smp_dmb mode</div><div class='head'>diff --git a/arch/arm/include/asm/bug.h b/arch/arm/include/asm/bug.h<br/>index 9abe7a07d5ac..fac79dceb736 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/bug.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/bug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/bug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/bug.h</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> </div><div class='ctx'> #define __BUG(__file, __line, __value)				\</div><div class='ctx'> do {								\</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct bug_entry) != 12);		\</div><div class='ctx'> 	asm volatile("1:\t" BUG_INSTR_TYPE #__value "\n"	\</div><div class='ctx'> 		".pushsection .rodata.str, \"aMS\", %progbits, 1\n" \</div><div class='ctx'> 		"2:\t.asciz " #__file "\n" 			\</div><div class='head'>diff --git a/arch/arm/include/asm/cti.h b/arch/arm/include/asm/cti.h<br/>new file mode 100644<br/>index 000000000000..a0ada3ea4358<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/cti.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/cti.h</a></div><div class='hunk'>@@ -0,0 +1,179 @@</div><div class='add'>+#ifndef __ASMARM_CTI_H</div><div class='add'>+#define __ASMARM_CTI_H</div><div class='add'>+</div><div class='add'>+#include	&lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+/* The registers' definition is from section 3.2 of</div><div class='add'>+ * Embedded Cross Trigger Revision: r0p0</div><div class='add'>+ */</div><div class='add'>+#define		CTICONTROL		0x000</div><div class='add'>+#define		CTISTATUS		0x004</div><div class='add'>+#define		CTILOCK			0x008</div><div class='add'>+#define		CTIPROTECTION		0x00C</div><div class='add'>+#define		CTIINTACK		0x010</div><div class='add'>+#define		CTIAPPSET		0x014</div><div class='add'>+#define		CTIAPPCLEAR		0x018</div><div class='add'>+#define		CTIAPPPULSE		0x01c</div><div class='add'>+#define		CTIINEN			0x020</div><div class='add'>+#define		CTIOUTEN		0x0A0</div><div class='add'>+#define		CTITRIGINSTATUS		0x130</div><div class='add'>+#define		CTITRIGOUTSTATUS	0x134</div><div class='add'>+#define		CTICHINSTATUS		0x138</div><div class='add'>+#define		CTICHOUTSTATUS		0x13c</div><div class='add'>+#define		CTIPERIPHID0		0xFE0</div><div class='add'>+#define		CTIPERIPHID1		0xFE4</div><div class='add'>+#define		CTIPERIPHID2		0xFE8</div><div class='add'>+#define		CTIPERIPHID3		0xFEC</div><div class='add'>+#define		CTIPCELLID0		0xFF0</div><div class='add'>+#define		CTIPCELLID1		0xFF4</div><div class='add'>+#define		CTIPCELLID2		0xFF8</div><div class='add'>+#define		CTIPCELLID3		0xFFC</div><div class='add'>+</div><div class='add'>+/* The below are from section 3.6.4 of</div><div class='add'>+ * CoreSight v1.0 Architecture Specification</div><div class='add'>+ */</div><div class='add'>+#define		LOCKACCESS		0xFB0</div><div class='add'>+#define		LOCKSTATUS		0xFB4</div><div class='add'>+</div><div class='add'>+/* write this value to LOCKACCESS will unlock the module, and</div><div class='add'>+ * other value will lock the module</div><div class='add'>+ */</div><div class='add'>+#define		LOCKCODE		0xC5ACCE55</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct cti - cross trigger interface struct</div><div class='add'>+ * @base: mapped virtual address for the cti base</div><div class='add'>+ * @irq: irq number for the cti</div><div class='add'>+ * @trig_out_for_irq: triger out number which will cause</div><div class='add'>+ *	the @irq happen</div><div class='add'>+ *</div><div class='add'>+ * cti struct used to operate cti registers.</div><div class='add'>+ */</div><div class='add'>+struct cti {</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	int irq;</div><div class='add'>+	int trig_out_for_irq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cti_init - initialize the cti instance</div><div class='add'>+ * @cti: cti instance</div><div class='add'>+ * @base: mapped virtual address for the cti base</div><div class='add'>+ * @irq: irq number for the cti</div><div class='add'>+ * @trig_out: triger out number which will cause</div><div class='add'>+ *	the @irq happen</div><div class='add'>+ *</div><div class='add'>+ * called by machine code to pass the board dependent</div><div class='add'>+ * @base, @irq and @trig_out to cti.</div><div class='add'>+ */</div><div class='add'>+static inline void cti_init(struct cti *cti,</div><div class='add'>+	void __iomem *base, int irq, int trig_out)</div><div class='add'>+{</div><div class='add'>+	cti-&gt;base = base;</div><div class='add'>+	cti-&gt;irq  = irq;</div><div class='add'>+	cti-&gt;trig_out_for_irq = trig_out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cti_map_trigger - use the @chan to map @trig_in to @trig_out</div><div class='add'>+ * @cti: cti instance</div><div class='add'>+ * @trig_in: trigger in number</div><div class='add'>+ * @trig_out: trigger out number</div><div class='add'>+ * @channel: channel number</div><div class='add'>+ *</div><div class='add'>+ * This function maps one trigger in of @trig_in to one trigger</div><div class='add'>+ * out of @trig_out using the channel @chan.</div><div class='add'>+ */</div><div class='add'>+static inline void cti_map_trigger(struct cti *cti,</div><div class='add'>+	int trig_in, int trig_out, int chan)</div><div class='add'>+{</div><div class='add'>+	void __iomem *base = cti-&gt;base;</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	val = __raw_readl(base + CTIINEN + trig_in * 4);</div><div class='add'>+	val |= BIT(chan);</div><div class='add'>+	__raw_writel(val, base + CTIINEN + trig_in * 4);</div><div class='add'>+</div><div class='add'>+	val = __raw_readl(base + CTIOUTEN + trig_out * 4);</div><div class='add'>+	val |= BIT(chan);</div><div class='add'>+	__raw_writel(val, base + CTIOUTEN + trig_out * 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cti_enable - enable the cti module</div><div class='add'>+ * @cti: cti instance</div><div class='add'>+ *</div><div class='add'>+ * enable the cti module</div><div class='add'>+ */</div><div class='add'>+static inline void cti_enable(struct cti *cti)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(0x1, cti-&gt;base + CTICONTROL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cti_disable - disable the cti module</div><div class='add'>+ * @cti: cti instance</div><div class='add'>+ *</div><div class='add'>+ * enable the cti module</div><div class='add'>+ */</div><div class='add'>+static inline void cti_disable(struct cti *cti)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(0, cti-&gt;base + CTICONTROL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cti_irq_ack - clear the cti irq</div><div class='add'>+ * @cti: cti instance</div><div class='add'>+ *</div><div class='add'>+ * clear the cti irq</div><div class='add'>+ */</div><div class='add'>+static inline void cti_irq_ack(struct cti *cti)</div><div class='add'>+{</div><div class='add'>+	void __iomem *base = cti-&gt;base;</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	val = __raw_readl(base + CTIINTACK);</div><div class='add'>+	val |= BIT(cti-&gt;trig_out_for_irq);</div><div class='add'>+	__raw_writel(val, base + CTIINTACK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cti_unlock - unlock cti module</div><div class='add'>+ * @cti: cti instance</div><div class='add'>+ *</div><div class='add'>+ * unlock the cti module, or else any writes to the cti</div><div class='add'>+ * module is not allowed.</div><div class='add'>+ */</div><div class='add'>+static inline void cti_unlock(struct cti *cti)</div><div class='add'>+{</div><div class='add'>+	void __iomem *base = cti-&gt;base;</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	val = __raw_readl(base + LOCKSTATUS);</div><div class='add'>+</div><div class='add'>+	if (val &amp; 1) {</div><div class='add'>+		val = LOCKCODE;</div><div class='add'>+		__raw_writel(val, base + LOCKACCESS);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cti_lock - lock cti module</div><div class='add'>+ * @cti: cti instance</div><div class='add'>+ *</div><div class='add'>+ * lock the cti module, so any writes to the cti</div><div class='add'>+ * module will be not allowed.</div><div class='add'>+ */</div><div class='add'>+static inline void cti_lock(struct cti *cti)</div><div class='add'>+{</div><div class='add'>+	void __iomem *base = cti-&gt;base;</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	val = __raw_readl(base + LOCKSTATUS);</div><div class='add'>+</div><div class='add'>+	if (!(val &amp; 1)) {</div><div class='add'>+		val = ~LOCKCODE;</div><div class='add'>+		__raw_writel(val, base + LOCKACCESS);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/include/asm/edac.h b/arch/arm/include/asm/edac.h<br/>new file mode 100644<br/>index 000000000000..0df7a2c1fc3d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/edac.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/edac.h</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2011 Calxeda, Inc.</div><div class='add'>+ * Based on PPC version Copyright 2007 MontaVista Software, Inc.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='add'>+ */</div><div class='add'>+#ifndef ASM_EDAC_H</div><div class='add'>+#define ASM_EDAC_H</div><div class='add'>+/*</div><div class='add'>+ * ECC atomic, DMA, SMP and interrupt safe scrub function.</div><div class='add'>+ * Implements the per arch atomic_scrub() that EDAC use for software</div><div class='add'>+ * ECC scrubbing.  It reads memory and then writes back the original</div><div class='add'>+ * value, allowing the hardware to detect and correct memory errors.</div><div class='add'>+ */</div><div class='add'>+static inline void atomic_scrub(void *va, u32 size)</div><div class='add'>+{</div><div class='add'>+#if __LINUX_ARM_ARCH__ &gt;= 6</div><div class='add'>+	unsigned int *virt_addr = va;</div><div class='add'>+	unsigned int temp, temp2;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; size / sizeof(*virt_addr); i++, virt_addr++) {</div><div class='add'>+		/* Very carefully read and write to memory atomically</div><div class='add'>+		 * so we are interrupt, DMA and SMP safe.</div><div class='add'>+		 */</div><div class='add'>+		__asm__ __volatile__("\n"</div><div class='add'>+			"1:	ldrex	%0, [%2]\n"</div><div class='add'>+			"	strex	%1, %0, [%2]\n"</div><div class='add'>+			"	teq	%1, #0\n"</div><div class='add'>+			"	bne	1b\n"</div><div class='add'>+			: "=&amp;r"(temp), "=&amp;r"(temp2)</div><div class='add'>+			: "r"(virt_addr)</div><div class='add'>+			: "cc");</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/include/asm/entry-macro-vic2.S b/arch/arm/include/asm/entry-macro-vic2.S<br/>deleted file mode 100644<br/>index 3ceb85e43850..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/entry-macro-vic2.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/entry-macro-vic2.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,57 +0,0 @@</div><div class='del'>-/* arch/arm/include/asm/entry-macro-vic2.S</div><div class='del'>- *</div><div class='del'>- * Originally arch/arm/mach-s3c6400/include/mach/entry-macro.S</div><div class='del'>- *</div><div class='del'>- * Copyright 2008 Openmoko, Inc.</div><div class='del'>- * Copyright 2008 Simtec Electronics</div><div class='del'>- *	http://armlinux.simtec.co.uk/</div><div class='del'>- *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='del'>- *</div><div class='del'>- * Low-level IRQ helper macros for a device with two VICs</div><div class='del'>- *</div><div class='del'>- * This file is licensed under  the terms of the GNU General Public</div><div class='del'>- * License version 2. This program is licensed "as is" without any</div><div class='del'>- * warranty of any kind, whether express or implied.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/* This should be included from &lt;mach/entry-macro.S&gt; with the necessary</div><div class='del'>- * defines for virtual addresses and IRQ bases for the two vics.</div><div class='del'>- *</div><div class='del'>- * The code needs the following defined:</div><div class='del'>- *	IRQ_VIC0_BASE	IRQ number of VIC0's first IRQ</div><div class='del'>- *	IRQ_VIC1_BASE	IRQ number of VIC1's first IRQ</div><div class='del'>- *	VA_VIC0		Virtual address of VIC0</div><div class='del'>- *	VA_VIC1		Virtual address of VIC1</div><div class='del'>- *</div><div class='del'>- * Note, code assumes VIC0's virtual address is an ARM immediate constant</div><div class='del'>- * away from VIC1.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;asm/hardware/vic.h&gt;</div><div class='del'>-</div><div class='del'>-	.macro	disable_fiq</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro	get_irqnr_preamble, base, tmp</div><div class='del'>-	ldr	\base, =VA_VIC0</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro	arch_ret_to_user, tmp1, tmp2</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-</div><div class='del'>-	@ check the vic0</div><div class='del'>-	mov	\irqnr, #IRQ_VIC0_BASE + 31</div><div class='del'>-	ldr	\irqstat, [ \base, # VIC_IRQ_STATUS ]</div><div class='del'>-	teq	\irqstat, #0</div><div class='del'>-</div><div class='del'>-	@ otherwise try vic1</div><div class='del'>-	addeq	\tmp, \base, #(VA_VIC1 - VA_VIC0)</div><div class='del'>-	addeq	\irqnr, \irqnr, #(IRQ_VIC1_BASE - IRQ_VIC0_BASE)</div><div class='del'>-	ldreq	\irqstat, [ \tmp, # VIC_IRQ_STATUS ]</div><div class='del'>-	teqeq	\irqstat, #0</div><div class='del'>-</div><div class='del'>-	clzne	\irqstat, \irqstat</div><div class='del'>-	subne	\irqnr, \irqnr, \irqstat</div><div class='del'>-	.endm</div><div class='head'>diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h<br/>index 11ad0bfbb0ad..c402e9b31f4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/gpio.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/gpio.h</a></div><div class='hunk'>@@ -1,6 +1,10 @@</div><div class='ctx'> #ifndef _ARCH_ARM_GPIO_H</div><div class='ctx'> #define _ARCH_ARM_GPIO_H</div><div class='ctx'> </div><div class='add'>+#if CONFIG_ARCH_NR_GPIO &gt; 0</div><div class='add'>+#define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* not all ARM platforms necessarily support this API ... */</div><div class='ctx'> #include &lt;mach/gpio.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/include/asm/hardirq.h b/arch/arm/include/asm/hardirq.h<br/>index ddf07a92a6c8..436e60b2cf7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardirq.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/hardirq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardirq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/hardirq.h</a></div><div class='hunk'>@@ -27,23 +27,6 @@ u64 smp_irq_stat_cpu(unsigned int cpu);</div><div class='ctx'> </div><div class='ctx'> #define arch_irq_stat_cpu	smp_irq_stat_cpu</div><div class='ctx'> </div><div class='del'>-#if NR_IRQS &gt; 512</div><div class='del'>-#define HARDIRQ_BITS	10</div><div class='del'>-#elif NR_IRQS &gt; 256</div><div class='del'>-#define HARDIRQ_BITS	9</div><div class='del'>-#else</div><div class='del'>-#define HARDIRQ_BITS	8</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The hardirq mask has to be large enough to have space</div><div class='del'>- * for potentially all IRQ sources in the system nesting</div><div class='del'>- * on a single CPU:</div><div class='del'>- */</div><div class='del'>-#if (1 &lt;&lt; HARDIRQ_BITS) &lt; NR_IRQS</div><div class='del'>-# error HARDIRQ_BITS is too low!</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #define __ARCH_IRQ_EXIT_IRQS_DISABLED	1</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_HARDIRQ_H */</div><div class='head'>diff --git a/arch/arm/include/asm/hardware/entry-macro-gic.S b/arch/arm/include/asm/hardware/entry-macro-gic.S<br/>deleted file mode 100644<br/>index 74ebc803904d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/entry-macro-gic.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/hardware/entry-macro-gic.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,60 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/include/asm/hardware/entry-macro-gic.S</div><div class='del'>- *</div><div class='del'>- * Low-level IRQ helper macros for GIC</div><div class='del'>- *</div><div class='del'>- * This file is licensed under  the terms of the GNU General Public</div><div class='del'>- * License version 2. This program is licensed "as is" without any</div><div class='del'>- * warranty of any kind, whether express or implied.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm/hardware/gic.h&gt;</div><div class='del'>-</div><div class='del'>-#ifndef HAVE_GET_IRQNR_PREAMBLE</div><div class='del'>-	.macro	get_irqnr_preamble, base, tmp</div><div class='del'>-	ldr	\base, =gic_cpu_base_addr</div><div class='del'>-	ldr	\base, [\base]</div><div class='del'>-	.endm</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The interrupt numbering scheme is defined in the</div><div class='del'>- * interrupt controller spec.  To wit:</div><div class='del'>- *</div><div class='del'>- * Interrupts 0-15 are IPI</div><div class='del'>- * 16-31 are local.  We allow 30 to be used for the watchdog.</div><div class='del'>- * 32-1020 are global</div><div class='del'>- * 1021-1022 are reserved</div><div class='del'>- * 1023 is "spurious" (no interrupt)</div><div class='del'>- *</div><div class='del'>- * A simple read from the controller will tell us the number of the highest</div><div class='del'>- * priority enabled interrupt.  We then just need to check whether it is in the</div><div class='del'>- * valid range for an IRQ (30-1020 inclusive).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-	.macro  get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-</div><div class='del'>-	ldr     \irqstat, [\base, #GIC_CPU_INTACK]</div><div class='del'>-	/* bits 12-10 = src CPU, 9-0 = int # */</div><div class='del'>-</div><div class='del'>-	ldr	\tmp, =1021</div><div class='del'>-	bic     \irqnr, \irqstat, #0x1c00</div><div class='del'>-	cmp     \irqnr, #15</div><div class='del'>-	cmpcc	\irqnr, \irqnr</div><div class='del'>-	cmpne	\irqnr, \tmp</div><div class='del'>-	cmpcs	\irqnr, \irqnr</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-/* We assume that irqstat (the raw value of the IRQ acknowledge</div><div class='del'>- * register) is preserved from the macro above.</div><div class='del'>- * If there is an IPI, we immediately signal end of interrupt on the</div><div class='del'>- * controller, since this requires the original irqstat value which</div><div class='del'>- * we won't easily be able to recreate later.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-	.macro test_for_ipi, irqnr, irqstat, base, tmp</div><div class='del'>-	bic	\irqnr, \irqstat, #0x1c00</div><div class='del'>-	cmp	\irqnr, #16</div><div class='del'>-	strcc	\irqstat, [\base, #GIC_CPU_EOI]</div><div class='del'>-	cmpcs	\irqnr, \irqnr</div><div class='del'>-	.endm</div><div class='head'>diff --git a/arch/arm/include/asm/hardware/gic.h b/arch/arm/include/asm/hardware/gic.h<br/>index 3e91f22046f5..4bdfe0018696 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/gic.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/hardware/gic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/gic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/hardware/gic.h</a></div><div class='hunk'>@@ -36,30 +36,22 @@</div><div class='ctx'> #include &lt;linux/irqdomain.h&gt;</div><div class='ctx'> struct device_node;</div><div class='ctx'> </div><div class='del'>-extern void __iomem *gic_cpu_base_addr;</div><div class='ctx'> extern struct irq_chip gic_arch_extn;</div><div class='ctx'> </div><div class='del'>-void gic_init(unsigned int, int, void __iomem *, void __iomem *);</div><div class='add'>+void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,</div><div class='add'>+		    u32 offset);</div><div class='ctx'> int gic_of_init(struct device_node *node, struct device_node *parent);</div><div class='ctx'> void gic_secondary_init(unsigned int);</div><div class='add'>+void gic_handle_irq(struct pt_regs *regs);</div><div class='ctx'> void gic_cascade_irq(unsigned int gic_nr, unsigned int irq);</div><div class='ctx'> void gic_raise_softirq(const struct cpumask *mask, unsigned int irq);</div><div class='ctx'> </div><div class='del'>-struct gic_chip_data {</div><div class='del'>-	void __iomem *dist_base;</div><div class='del'>-	void __iomem *cpu_base;</div><div class='del'>-#ifdef CONFIG_CPU_PM</div><div class='del'>-	u32 saved_spi_enable[DIV_ROUND_UP(1020, 32)];</div><div class='del'>-	u32 saved_spi_conf[DIV_ROUND_UP(1020, 16)];</div><div class='del'>-	u32 saved_spi_target[DIV_ROUND_UP(1020, 4)];</div><div class='del'>-	u32 __percpu *saved_ppi_enable;</div><div class='del'>-	u32 __percpu *saved_ppi_conf;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_IRQ_DOMAIN</div><div class='del'>-	struct irq_domain domain;</div><div class='del'>-#endif</div><div class='del'>-	unsigned int gic_irqs;</div><div class='del'>-};</div><div class='add'>+static inline void gic_init(unsigned int nr, int start,</div><div class='add'>+			    void __iomem *dist , void __iomem *cpu)</div><div class='add'>+{</div><div class='add'>+	gic_init_bases(nr, start, dist, cpu, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/include/asm/hardware/iop3xx.h b/arch/arm/include/asm/hardware/iop3xx.h<br/>index 5daea2961d48..077c32326c63 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/iop3xx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/hardware/iop3xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/iop3xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/hardware/iop3xx.h</a></div><div class='hunk'>@@ -234,6 +234,7 @@ extern int iop3xx_get_init_atu(void);</div><div class='ctx'> void iop3xx_map_io(void);</div><div class='ctx'> void iop_init_cp6_handler(void);</div><div class='ctx'> void iop_init_time(unsigned long tickrate);</div><div class='add'>+void iop3xx_restart(char, const char *);</div><div class='ctx'> </div><div class='ctx'> static inline u32 read_tmr0(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/include/asm/hardware/vic.h b/arch/arm/include/asm/hardware/vic.h<br/>index 5d72550a8097..f42ebd619590 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/vic.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/hardware/vic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hardware/vic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/hardware/vic.h</a></div><div class='hunk'>@@ -41,7 +41,15 @@</div><div class='ctx'> #define VIC_PL192_VECT_ADDR		0xF00</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct device_node;</div><div class='add'>+struct pt_regs;</div><div class='add'>+</div><div class='ctx'> void vic_init(void __iomem *base, unsigned int irq_start, u32 vic_sources, u32 resume_sources);</div><div class='del'>-#endif</div><div class='add'>+int vic_of_init(struct device_node *node, struct device_node *parent);</div><div class='add'>+void vic_handle_irq(struct pt_regs *regs);</div><div class='ctx'> </div><div class='add'>+#endif /* __ASSEMBLY__ */</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/include/asm/hwcap.h b/arch/arm/include/asm/hwcap.h<br/>index c93a22a8b924..917626128a1d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hwcap.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/hwcap.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/hwcap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/hwcap.h</a></div><div class='hunk'>@@ -25,7 +25,8 @@</div><div class='ctx'> #define HWCAP_IDIVT	(1 &lt;&lt; 18)</div><div class='ctx'> #define HWCAP_IDIV	(HWCAP_IDIVA | HWCAP_IDIVT)</div><div class='ctx'> </div><div class='del'>-#if defined(__KERNEL__) &amp;&amp; !defined(__ASSEMBLY__)</div><div class='add'>+#if defined(__KERNEL__)</div><div class='add'>+#if !defined(__ASSEMBLY__)</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='hunk'>@@ -33,5 +34,6 @@</div><div class='ctx'> #define ELF_HWCAP	(elf_hwcap)</div><div class='ctx'> extern unsigned int elf_hwcap;</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/include/asm/idmap.h b/arch/arm/include/asm/idmap.h<br/>new file mode 100644<br/>index 000000000000..bf863edb517d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/idmap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/idmap.h</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+#ifndef __ASM_IDMAP_H</div><div class='add'>+#define __ASM_IDMAP_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+</div><div class='add'>+/* Tag a function as requiring to be executed via an identity mapping. */</div><div class='add'>+#define __idmap __section(.idmap.text) noinline notrace</div><div class='add'>+</div><div class='add'>+extern pgd_t *idmap_pgd;</div><div class='add'>+</div><div class='add'>+void setup_mm_for_reboot(void);</div><div class='add'>+</div><div class='add'>+#endif	/* __ASM_IDMAP_H */</div><div class='head'>diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h<br/>index 065d100fa63e..9275828feb3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/io.h</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm-generic/pci_iomap.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ISA I/O bus memory addresses are 1:1 with the physical address.</div><div class='hunk'>@@ -306,7 +307,6 @@ extern void ioport_unmap(void __iomem *addr);</div><div class='ctx'> </div><div class='ctx'> struct pci_dev;</div><div class='ctx'> </div><div class='del'>-extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen);</div><div class='ctx'> extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/include/asm/ipcbuf.h b/arch/arm/include/asm/ipcbuf.h<br/>index 97683975f7df..84c7e51cb6d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/ipcbuf.h</a></div><div class='hunk'>@@ -1,29 +1 @@</div><div class='del'>-#ifndef __ASMARM_IPCBUF_H</div><div class='del'>-#define __ASMARM_IPCBUF_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The ipc64_perm structure for arm architecture.</div><div class='del'>- * Note extra padding because this structure is passed back and forth</div><div class='del'>- * between kernel and user space.</div><div class='del'>- *</div><div class='del'>- * Pad space is left for:</div><div class='del'>- * - 32-bit mode_t and seq</div><div class='del'>- * - 2 miscellaneous 32-bit values</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct ipc64_perm</div><div class='del'>-{</div><div class='del'>-	__kernel_key_t		key;</div><div class='del'>-	__kernel_uid32_t	uid;</div><div class='del'>-	__kernel_gid32_t	gid;</div><div class='del'>-	__kernel_uid32_t	cuid;</div><div class='del'>-	__kernel_gid32_t	cgid;</div><div class='del'>-	__kernel_mode_t		mode;</div><div class='del'>-	unsigned short		__pad1;</div><div class='del'>-	unsigned short		seq;</div><div class='del'>-	unsigned short		__pad2;</div><div class='del'>-	unsigned long		__unused1;</div><div class='del'>-	unsigned long		__unused2;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* __ASMARM_IPCBUF_H */</div><div class='add'>+#include &lt;asm-generic/ipcbuf.h&gt;</div><div class='head'>diff --git a/arch/arm/include/asm/kprobes.h b/arch/arm/include/asm/kprobes.h<br/>index feec86768f9c..f82ec22eeb11 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/kprobes.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/kprobes.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/kprobes.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/kprobes.h</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'> #define MAX_INSN_SIZE			2</div><div class='ctx'> #define MAX_STACK_SIZE			64	/* 32 would probably be OK */</div><div class='ctx'> </div><div class='del'>-#define regs_return_value(regs)		((regs)-&gt;ARM_r0)</div><div class='ctx'> #define flush_insn_slot(p)		do { } while (0)</div><div class='ctx'> #define kretprobe_blacklist_size	0</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h<br/>index 2b0efc3104ac..d7692cafde7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/arch.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/mach/arch.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/arch.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/mach/arch.h</a></div><div class='hunk'>@@ -19,7 +19,7 @@ struct machine_desc {</div><div class='ctx'> 	unsigned int		nr;		/* architecture number	*/</div><div class='ctx'> 	const char		*name;		/* architecture name	*/</div><div class='ctx'> 	unsigned long		atag_offset;	/* tagged list (relative) */</div><div class='del'>-	const char		**dt_compat;	/* array of device tree</div><div class='add'>+	const char *const 	*dt_compat;	/* array of device tree</div><div class='ctx'> 						 * 'compatible' strings	*/</div><div class='ctx'> </div><div class='ctx'> 	unsigned int		nr_irqs;	/* number of IRQs */</div><div class='hunk'>@@ -31,10 +31,10 @@ struct machine_desc {</div><div class='ctx'> 	unsigned int		video_start;	/* start of video RAM	*/</div><div class='ctx'> 	unsigned int		video_end;	/* end of video RAM	*/</div><div class='ctx'> </div><div class='del'>-	unsigned int		reserve_lp0 :1;	/* never has lp0	*/</div><div class='del'>-	unsigned int		reserve_lp1 :1;	/* never has lp1	*/</div><div class='del'>-	unsigned int		reserve_lp2 :1;	/* never has lp2	*/</div><div class='del'>-	unsigned int		soft_reboot :1;	/* soft reboot		*/</div><div class='add'>+	unsigned char		reserve_lp0 :1;	/* never has lp0	*/</div><div class='add'>+	unsigned char		reserve_lp1 :1;	/* never has lp1	*/</div><div class='add'>+	unsigned char		reserve_lp2 :1;	/* never has lp2	*/</div><div class='add'>+	char			restart_mode;	/* default restart mode	*/</div><div class='ctx'> 	void			(*fixup)(struct tag *, char **,</div><div class='ctx'> 					 struct meminfo *);</div><div class='ctx'> 	void			(*reserve)(void);/* reserve mem blocks	*/</div><div class='hunk'>@@ -46,6 +46,7 @@ struct machine_desc {</div><div class='ctx'> #ifdef CONFIG_MULTI_IRQ_HANDLER</div><div class='ctx'> 	void			(*handle_irq)(struct pt_regs *);</div><div class='ctx'> #endif</div><div class='add'>+	void			(*restart)(char, const char *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h<br/>index 186efd4e05c9..d943b7d20f11 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/pci.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/mach/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/mach/pci.h</a></div><div class='hunk'>@@ -40,7 +40,7 @@ struct pci_sys_data {</div><div class='ctx'> 	u64		mem_offset;	/* bus-&gt;cpu memory mapping offset	*/</div><div class='ctx'> 	unsigned long	io_offset;	/* bus-&gt;cpu IO mapping offset		*/</div><div class='ctx'> 	struct pci_bus	*bus;		/* PCI bus				*/</div><div class='del'>-	struct resource *resource[3];	/* Primary PCI bus resources		*/</div><div class='add'>+	struct list_head resources;	/* root bus resources (apertures)       */</div><div class='ctx'> 					/* Bridge swizzling			*/</div><div class='ctx'> 	u8		(*swizzle)(struct pci_dev *, u8 *);</div><div class='ctx'> 					/* IRQ mapping				*/</div><div class='head'>diff --git a/arch/arm/include/asm/mach/time.h b/arch/arm/include/asm/mach/time.h<br/>index d5adaae5ee2c..f73c908b7fa0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/time.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/mach/time.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/mach/time.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/mach/time.h</a></div><div class='hunk'>@@ -10,8 +10,6 @@</div><div class='ctx'> #ifndef __ASM_ARM_MACH_TIME_H</div><div class='ctx'> #define __ASM_ARM_MACH_TIME_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * This is our kernel timer structure.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/include/asm/memblock.h b/arch/arm/include/asm/memblock.h<br/>index b8da2e415e4e..00ca5f92648e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/memblock.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/memblock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/memblock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/memblock.h</a></div><div class='hunk'>@@ -6,4 +6,6 @@ struct machine_desc;</div><div class='ctx'> </div><div class='ctx'> extern void arm_memblock_init(struct meminfo *, struct machine_desc *);</div><div class='ctx'> </div><div class='add'>+phys_addr_t arm_memblock_steal(phys_addr_t size, phys_addr_t align);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/include/asm/opcodes.h b/arch/arm/include/asm/opcodes.h<br/>new file mode 100644<br/>index 000000000000..c0efdd60966f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/opcodes.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/opcodes.h</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+/*</div><div class='add'>+ *  arch/arm/include/asm/opcodes.h</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ASM_ARM_OPCODES_H</div><div class='add'>+#define __ASM_ARM_OPCODES_H</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+extern asmlinkage unsigned int arm_check_condition(u32 opcode, u32 psr);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define ARM_OPCODE_CONDTEST_FAIL   0</div><div class='add'>+#define ARM_OPCODE_CONDTEST_PASS   1</div><div class='add'>+#define ARM_OPCODE_CONDTEST_UNCOND 2</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_ARM_OPCODES_H */</div><div class='head'>diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h<br/>index ca94653f1ecb..97b440c25c58 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/page.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/page.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/page.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/page.h</a></div><div class='hunk'>@@ -151,7 +151,11 @@ extern void __cpu_copy_user_highpage(struct page *to, struct page *from,</div><div class='ctx'> #define clear_page(page)	memset((void *)(page), 0, PAGE_SIZE)</div><div class='ctx'> extern void copy_page(void *to, const void *from);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+#include &lt;asm/pgtable-3level-types.h&gt;</div><div class='add'>+#else</div><div class='ctx'> #include &lt;asm/pgtable-2level-types.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_MMU */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h<br/>index 2b1f245db0c6..da337ba57ffd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pci.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/pci.h</a></div><div class='hunk'>@@ -31,18 +31,6 @@ static inline int pci_proc_domain(struct pci_bus *bus)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PCI_DOMAINS */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI_HOST_ITE8152</div><div class='del'>-/* ITE bridge requires setting latency timer to avoid early bus access</div><div class='del'>-   termination by PIC bus mater devices</div><div class='del'>-*/</div><div class='del'>-extern void pcibios_set_master(struct pci_dev *dev);</div><div class='del'>-#else</div><div class='del'>-static inline void pcibios_set_master(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	/* No special bus mastering setup handling */</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static inline void pcibios_penalize_isa_irq(int irq, int active)</div><div class='ctx'> {</div><div class='ctx'> 	/* We don't do dynamic PCI IRQ allocation */</div><div class='head'>diff --git a/arch/arm/include/asm/perf_event.h b/arch/arm/include/asm/perf_event.h<br/>index 0f8e3827a89b..99cfe3607989 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/perf_event.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/perf_event.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/perf_event.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/perf_event.h</a></div><div class='hunk'>@@ -32,7 +32,4 @@ enum arm_perf_pmu_ids {</div><div class='ctx'> extern enum arm_perf_pmu_ids</div><div class='ctx'> armpmu_get_pmu_id(void);</div><div class='ctx'> </div><div class='del'>-extern int</div><div class='del'>-armpmu_get_max_events(void);</div><div class='del'>-</div><div class='ctx'> #endif /* __ARM_PERF_EVENT_H__ */</div><div class='head'>diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h<br/>index 3e08fd3fbb6b..943504f53f57 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pgalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/pgalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pgalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/pgalloc.h</a></div><div class='hunk'>@@ -25,12 +25,34 @@</div><div class='ctx'> #define _PAGE_USER_TABLE	(PMD_TYPE_TABLE | PMD_BIT4 | PMD_DOMAIN(DOMAIN_USER))</div><div class='ctx'> #define _PAGE_KERNEL_TABLE	(PMD_TYPE_TABLE | PMD_BIT4 | PMD_DOMAIN(DOMAIN_KERNEL))</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+</div><div class='add'>+static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return (pmd_t *)get_zeroed_page(GFP_KERNEL | __GFP_REPEAT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)</div><div class='add'>+{</div><div class='add'>+	BUG_ON((unsigned long)pmd &amp; (PAGE_SIZE-1));</div><div class='add'>+	free_page((unsigned long)pmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)</div><div class='add'>+{</div><div class='add'>+	set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else	/* !CONFIG_ARM_LPAE */</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Since we have only two-level page tables, these are trivial</div><div class='ctx'>  */</div><div class='ctx'> #define pmd_alloc_one(mm,addr)		({ BUG(); ((pmd_t *)2); })</div><div class='ctx'> #define pmd_free(mm, pmd)		do { } while (0)</div><div class='del'>-#define pgd_populate(mm,pmd,pte)	BUG()</div><div class='add'>+#define pud_populate(mm,pmd,pte)	BUG()</div><div class='add'>+</div><div class='add'>+#endif	/* CONFIG_ARM_LPAE */</div><div class='ctx'> </div><div class='ctx'> extern pgd_t *pgd_alloc(struct mm_struct *mm);</div><div class='ctx'> extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);</div><div class='hunk'>@@ -109,7 +131,9 @@ static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,</div><div class='ctx'> {</div><div class='ctx'> 	pmdval_t pmdval = (pte + PTE_HWTABLE_OFF) | prot;</div><div class='ctx'> 	pmdp[0] = __pmd(pmdval);</div><div class='add'>+#ifndef CONFIG_ARM_LPAE</div><div class='ctx'> 	pmdp[1] = __pmd(pmdval + 256 * sizeof(pte_t));</div><div class='add'>+#endif</div><div class='ctx'> 	flush_pmd_entry(pmdp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h<br/>index 470457e1cfc5..2317a71c8f8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pgtable-2level.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/pgtable-2level.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pgtable-2level.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/pgtable-2level.h</a></div><div class='hunk'>@@ -140,4 +140,45 @@</div><div class='ctx'> #define L_PTE_MT_DEV_CACHED	(_AT(pteval_t, 0x0b) &lt;&lt; 2)	/* 1011 */</div><div class='ctx'> #define L_PTE_MT_MASK		(_AT(pteval_t, 0x0f) &lt;&lt; 2)</div><div class='ctx'> </div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The "pud_xxx()" functions here are trivial when the pmd is folded into</div><div class='add'>+ * the pud: the pud entry is never bad, always exists, and can't be set or</div><div class='add'>+ * cleared.</div><div class='add'>+ */</div><div class='add'>+#define pud_none(pud)		(0)</div><div class='add'>+#define pud_bad(pud)		(0)</div><div class='add'>+#define pud_present(pud)	(1)</div><div class='add'>+#define pud_clear(pudp)		do { } while (0)</div><div class='add'>+#define set_pud(pud,pudp)	do { } while (0)</div><div class='add'>+</div><div class='add'>+static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return (pmd_t *)pud;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define pmd_bad(pmd)		(pmd_val(pmd) &amp; 2)</div><div class='add'>+</div><div class='add'>+#define copy_pmd(pmdpd,pmdps)		\</div><div class='add'>+	do {				\</div><div class='add'>+		pmdpd[0] = pmdps[0];	\</div><div class='add'>+		pmdpd[1] = pmdps[1];	\</div><div class='add'>+		flush_pmd_entry(pmdpd);	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define pmd_clear(pmdp)			\</div><div class='add'>+	do {				\</div><div class='add'>+		pmdp[0] = __pmd(0);	\</div><div class='add'>+		pmdp[1] = __pmd(0);	\</div><div class='add'>+		clean_pmd_entry(pmdp);	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+/* we don't need complex calculations here as the pmd is folded into the pgd */</div><div class='add'>+#define pmd_addr_end(addr,end) (end)</div><div class='add'>+</div><div class='add'>+#define set_pte_ext(ptep,pte,ext) cpu_set_pte_ext(ptep,pte,ext)</div><div class='add'>+</div><div class='add'>+#endif /* __ASSEMBLY__ */</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_PGTABLE_2LEVEL_H */</div><div class='head'>diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h<br/>new file mode 100644<br/>index 000000000000..d7952824c5c4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pgtable-3level-hwdef.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/pgtable-3level-hwdef.h</a></div><div class='hunk'>@@ -0,0 +1,77 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/include/asm/pgtable-3level-hwdef.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 ARM Ltd.</div><div class='add'>+ * Author: Catalin Marinas &lt;catalin.marinas@arm.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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_PGTABLE_3LEVEL_HWDEF_H</div><div class='add'>+#define _ASM_PGTABLE_3LEVEL_HWDEF_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Hardware page table definitions.</div><div class='add'>+ *</div><div class='add'>+ * + Level 1/2 descriptor</div><div class='add'>+ *   - common</div><div class='add'>+ */</div><div class='add'>+#define PMD_TYPE_MASK		(_AT(pmdval_t, 3) &lt;&lt; 0)</div><div class='add'>+#define PMD_TYPE_FAULT		(_AT(pmdval_t, 0) &lt;&lt; 0)</div><div class='add'>+#define PMD_TYPE_TABLE		(_AT(pmdval_t, 3) &lt;&lt; 0)</div><div class='add'>+#define PMD_TYPE_SECT		(_AT(pmdval_t, 1) &lt;&lt; 0)</div><div class='add'>+#define PMD_BIT4		(_AT(pmdval_t, 0))</div><div class='add'>+#define PMD_DOMAIN(x)		(_AT(pmdval_t, 0))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *   - section</div><div class='add'>+ */</div><div class='add'>+#define PMD_SECT_BUFFERABLE	(_AT(pmdval_t, 1) &lt;&lt; 2)</div><div class='add'>+#define PMD_SECT_CACHEABLE	(_AT(pmdval_t, 1) &lt;&lt; 3)</div><div class='add'>+#define PMD_SECT_S		(_AT(pmdval_t, 3) &lt;&lt; 8)</div><div class='add'>+#define PMD_SECT_AF		(_AT(pmdval_t, 1) &lt;&lt; 10)</div><div class='add'>+#define PMD_SECT_nG		(_AT(pmdval_t, 1) &lt;&lt; 11)</div><div class='add'>+#define PMD_SECT_XN		(_AT(pmdval_t, 1) &lt;&lt; 54)</div><div class='add'>+#define PMD_SECT_AP_WRITE	(_AT(pmdval_t, 0))</div><div class='add'>+#define PMD_SECT_AP_READ	(_AT(pmdval_t, 0))</div><div class='add'>+#define PMD_SECT_TEX(x)		(_AT(pmdval_t, 0))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AttrIndx[2:0] encoding (mapping attributes defined in the MAIR* registers).</div><div class='add'>+ */</div><div class='add'>+#define PMD_SECT_UNCACHED	(_AT(pmdval_t, 0) &lt;&lt; 2)	/* strongly ordered */</div><div class='add'>+#define PMD_SECT_BUFFERED	(_AT(pmdval_t, 1) &lt;&lt; 2)	/* normal non-cacheable */</div><div class='add'>+#define PMD_SECT_WT		(_AT(pmdval_t, 2) &lt;&lt; 2)	/* normal inner write-through */</div><div class='add'>+#define PMD_SECT_WB		(_AT(pmdval_t, 3) &lt;&lt; 2)	/* normal inner write-back */</div><div class='add'>+#define PMD_SECT_WBWA		(_AT(pmdval_t, 7) &lt;&lt; 2)	/* normal inner write-alloc */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * + Level 3 descriptor (PTE)</div><div class='add'>+ */</div><div class='add'>+#define PTE_TYPE_MASK		(_AT(pteval_t, 3) &lt;&lt; 0)</div><div class='add'>+#define PTE_TYPE_FAULT		(_AT(pteval_t, 0) &lt;&lt; 0)</div><div class='add'>+#define PTE_TYPE_PAGE		(_AT(pteval_t, 3) &lt;&lt; 0)</div><div class='add'>+#define PTE_BUFFERABLE		(_AT(pteval_t, 1) &lt;&lt; 2)		/* AttrIndx[0] */</div><div class='add'>+#define PTE_CACHEABLE		(_AT(pteval_t, 1) &lt;&lt; 3)		/* AttrIndx[1] */</div><div class='add'>+#define PTE_EXT_SHARED		(_AT(pteval_t, 3) &lt;&lt; 8)		/* SH[1:0], inner shareable */</div><div class='add'>+#define PTE_EXT_AF		(_AT(pteval_t, 1) &lt;&lt; 10)	/* Access Flag */</div><div class='add'>+#define PTE_EXT_NG		(_AT(pteval_t, 1) &lt;&lt; 11)	/* nG */</div><div class='add'>+#define PTE_EXT_XN		(_AT(pteval_t, 1) &lt;&lt; 54)	/* XN */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 40-bit physical address supported.</div><div class='add'>+ */</div><div class='add'>+#define PHYS_MASK_SHIFT		(40)</div><div class='add'>+#define PHYS_MASK		((1ULL &lt;&lt; PHYS_MASK_SHIFT) - 1)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/include/asm/pgtable-3level-types.h b/arch/arm/include/asm/pgtable-3level-types.h<br/>new file mode 100644<br/>index 000000000000..921aa30259c4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pgtable-3level-types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/pgtable-3level-types.h</a></div><div class='hunk'>@@ -0,0 +1,70 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/include/asm/pgtable-3level-types.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 ARM Ltd.</div><div class='add'>+ * Author: Catalin Marinas &lt;catalin.marinas@arm.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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_PGTABLE_3LEVEL_TYPES_H</div><div class='add'>+#define _ASM_PGTABLE_3LEVEL_TYPES_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/types.h&gt;</div><div class='add'>+</div><div class='add'>+typedef u64 pteval_t;</div><div class='add'>+typedef u64 pmdval_t;</div><div class='add'>+typedef u64 pgdval_t;</div><div class='add'>+</div><div class='add'>+#undef STRICT_MM_TYPECHECKS</div><div class='add'>+</div><div class='add'>+#ifdef STRICT_MM_TYPECHECKS</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These are used to make use of C type-checking..</div><div class='add'>+ */</div><div class='add'>+typedef struct { pteval_t pte; } pte_t;</div><div class='add'>+typedef struct { pmdval_t pmd; } pmd_t;</div><div class='add'>+typedef struct { pgdval_t pgd; } pgd_t;</div><div class='add'>+typedef struct { pteval_t pgprot; } pgprot_t;</div><div class='add'>+</div><div class='add'>+#define pte_val(x)      ((x).pte)</div><div class='add'>+#define pmd_val(x)      ((x).pmd)</div><div class='add'>+#define pgd_val(x)	((x).pgd)</div><div class='add'>+#define pgprot_val(x)   ((x).pgprot)</div><div class='add'>+</div><div class='add'>+#define __pte(x)        ((pte_t) { (x) } )</div><div class='add'>+#define __pmd(x)        ((pmd_t) { (x) } )</div><div class='add'>+#define __pgd(x)	((pgd_t) { (x) } )</div><div class='add'>+#define __pgprot(x)     ((pgprot_t) { (x) } )</div><div class='add'>+</div><div class='add'>+#else	/* !STRICT_MM_TYPECHECKS */</div><div class='add'>+</div><div class='add'>+typedef pteval_t pte_t;</div><div class='add'>+typedef pmdval_t pmd_t;</div><div class='add'>+typedef pgdval_t pgd_t;</div><div class='add'>+typedef pteval_t pgprot_t;</div><div class='add'>+</div><div class='add'>+#define pte_val(x)	(x)</div><div class='add'>+#define pmd_val(x)	(x)</div><div class='add'>+#define pgd_val(x)	(x)</div><div class='add'>+#define pgprot_val(x)	(x)</div><div class='add'>+</div><div class='add'>+#define __pte(x)	(x)</div><div class='add'>+#define __pmd(x)	(x)</div><div class='add'>+#define __pgd(x)	(x)</div><div class='add'>+#define __pgprot(x)	(x)</div><div class='add'>+</div><div class='add'>+#endif	/* STRICT_MM_TYPECHECKS */</div><div class='add'>+</div><div class='add'>+#endif	/* _ASM_PGTABLE_3LEVEL_TYPES_H */</div><div class='head'>diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h<br/>new file mode 100644<br/>index 000000000000..759af70f9a0a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pgtable-3level.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/pgtable-3level.h</a></div><div class='hunk'>@@ -0,0 +1,155 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/include/asm/pgtable-3level.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 ARM Ltd.</div><div class='add'>+ * Author: Catalin Marinas &lt;catalin.marinas@arm.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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_PGTABLE_3LEVEL_H</div><div class='add'>+#define _ASM_PGTABLE_3LEVEL_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * With LPAE, there are 3 levels of page tables. Each level has 512 entries of</div><div class='add'>+ * 8 bytes each, occupying a 4K page. The first level table covers a range of</div><div class='add'>+ * 512GB, each entry representing 1GB. Since we are limited to 4GB input</div><div class='add'>+ * address range, only 4 entries in the PGD are used.</div><div class='add'>+ *</div><div class='add'>+ * There are enough spare bits in a page table entry for the kernel specific</div><div class='add'>+ * state.</div><div class='add'>+ */</div><div class='add'>+#define PTRS_PER_PTE		512</div><div class='add'>+#define PTRS_PER_PMD		512</div><div class='add'>+#define PTRS_PER_PGD		4</div><div class='add'>+</div><div class='add'>+#define PTE_HWTABLE_PTRS	(PTRS_PER_PTE)</div><div class='add'>+#define PTE_HWTABLE_OFF		(0)</div><div class='add'>+#define PTE_HWTABLE_SIZE	(PTRS_PER_PTE * sizeof(u64))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PGDIR_SHIFT determines the size a top-level page table entry can map.</div><div class='add'>+ */</div><div class='add'>+#define PGDIR_SHIFT		30</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PMD_SHIFT determines the size a middle-level page table entry can map.</div><div class='add'>+ */</div><div class='add'>+#define PMD_SHIFT		21</div><div class='add'>+</div><div class='add'>+#define PMD_SIZE		(1UL &lt;&lt; PMD_SHIFT)</div><div class='add'>+#define PMD_MASK		(~(PMD_SIZE-1))</div><div class='add'>+#define PGDIR_SIZE		(1UL &lt;&lt; PGDIR_SHIFT)</div><div class='add'>+#define PGDIR_MASK		(~(PGDIR_SIZE-1))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * section address mask and size definitions.</div><div class='add'>+ */</div><div class='add'>+#define SECTION_SHIFT		21</div><div class='add'>+#define SECTION_SIZE		(1UL &lt;&lt; SECTION_SHIFT)</div><div class='add'>+#define SECTION_MASK		(~(SECTION_SIZE-1))</div><div class='add'>+</div><div class='add'>+#define USER_PTRS_PER_PGD	(PAGE_OFFSET / PGDIR_SIZE)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * "Linux" PTE definitions for LPAE.</div><div class='add'>+ *</div><div class='add'>+ * These bits overlap with the hardware bits but the naming is preserved for</div><div class='add'>+ * consistency with the classic page table format.</div><div class='add'>+ */</div><div class='add'>+#define L_PTE_PRESENT		(_AT(pteval_t, 3) &lt;&lt; 0)		/* Valid */</div><div class='add'>+#define L_PTE_FILE		(_AT(pteval_t, 1) &lt;&lt; 2)		/* only when !PRESENT */</div><div class='add'>+#define L_PTE_BUFFERABLE	(_AT(pteval_t, 1) &lt;&lt; 2)		/* AttrIndx[0] */</div><div class='add'>+#define L_PTE_CACHEABLE		(_AT(pteval_t, 1) &lt;&lt; 3)		/* AttrIndx[1] */</div><div class='add'>+#define L_PTE_USER		(_AT(pteval_t, 1) &lt;&lt; 6)		/* AP[1] */</div><div class='add'>+#define L_PTE_RDONLY		(_AT(pteval_t, 1) &lt;&lt; 7)		/* AP[2] */</div><div class='add'>+#define L_PTE_SHARED		(_AT(pteval_t, 3) &lt;&lt; 8)		/* SH[1:0], inner shareable */</div><div class='add'>+#define L_PTE_YOUNG		(_AT(pteval_t, 1) &lt;&lt; 10)	/* AF */</div><div class='add'>+#define L_PTE_XN		(_AT(pteval_t, 1) &lt;&lt; 54)	/* XN */</div><div class='add'>+#define L_PTE_DIRTY		(_AT(pteval_t, 1) &lt;&lt; 55)	/* unused */</div><div class='add'>+#define L_PTE_SPECIAL		(_AT(pteval_t, 1) &lt;&lt; 56)	/* unused */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * To be used in assembly code with the upper page attributes.</div><div class='add'>+ */</div><div class='add'>+#define L_PTE_XN_HIGH		(1 &lt;&lt; (54 - 32))</div><div class='add'>+#define L_PTE_DIRTY_HIGH	(1 &lt;&lt; (55 - 32))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AttrIndx[2:0] encoding (mapping attributes defined in the MAIR* registers).</div><div class='add'>+ */</div><div class='add'>+#define L_PTE_MT_UNCACHED	(_AT(pteval_t, 0) &lt;&lt; 2)	/* strongly ordered */</div><div class='add'>+#define L_PTE_MT_BUFFERABLE	(_AT(pteval_t, 1) &lt;&lt; 2)	/* normal non-cacheable */</div><div class='add'>+#define L_PTE_MT_WRITETHROUGH	(_AT(pteval_t, 2) &lt;&lt; 2)	/* normal inner write-through */</div><div class='add'>+#define L_PTE_MT_WRITEBACK	(_AT(pteval_t, 3) &lt;&lt; 2)	/* normal inner write-back */</div><div class='add'>+#define L_PTE_MT_WRITEALLOC	(_AT(pteval_t, 7) &lt;&lt; 2)	/* normal inner write-alloc */</div><div class='add'>+#define L_PTE_MT_DEV_SHARED	(_AT(pteval_t, 4) &lt;&lt; 2)	/* device */</div><div class='add'>+#define L_PTE_MT_DEV_NONSHARED	(_AT(pteval_t, 4) &lt;&lt; 2)	/* device */</div><div class='add'>+#define L_PTE_MT_DEV_WC		(_AT(pteval_t, 1) &lt;&lt; 2)	/* normal non-cacheable */</div><div class='add'>+#define L_PTE_MT_DEV_CACHED	(_AT(pteval_t, 3) &lt;&lt; 2)	/* normal inner write-back */</div><div class='add'>+#define L_PTE_MT_MASK		(_AT(pteval_t, 7) &lt;&lt; 2)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Software PGD flags.</div><div class='add'>+ */</div><div class='add'>+#define L_PGD_SWAPPER		(_AT(pgdval_t, 1) &lt;&lt; 55)	/* swapper_pg_dir entry */</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+#define pud_none(pud)		(!pud_val(pud))</div><div class='add'>+#define pud_bad(pud)		(!(pud_val(pud) &amp; 2))</div><div class='add'>+#define pud_present(pud)	(pud_val(pud))</div><div class='add'>+</div><div class='add'>+#define pud_clear(pudp)			\</div><div class='add'>+	do {				\</div><div class='add'>+		*pudp = __pud(0);	\</div><div class='add'>+		clean_pmd_entry(pudp);	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define set_pud(pudp, pud)		\</div><div class='add'>+	do {				\</div><div class='add'>+		*pudp = pud;		\</div><div class='add'>+		flush_pmd_entry(pudp);	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+static inline pmd_t *pud_page_vaddr(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return __va(pud_val(pud) &amp; PHYS_MASK &amp; (s32)PAGE_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Find an entry in the second-level page table.. */</div><div class='add'>+#define pmd_index(addr)		(((addr) &gt;&gt; PMD_SHIFT) &amp; (PTRS_PER_PMD - 1))</div><div class='add'>+static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return (pmd_t *)pud_page_vaddr(*pud) + pmd_index(addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define pmd_bad(pmd)		(!(pmd_val(pmd) &amp; 2))</div><div class='add'>+</div><div class='add'>+#define copy_pmd(pmdpd,pmdps)		\</div><div class='add'>+	do {				\</div><div class='add'>+		*pmdpd = *pmdps;	\</div><div class='add'>+		flush_pmd_entry(pmdpd);	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define pmd_clear(pmdp)			\</div><div class='add'>+	do {				\</div><div class='add'>+		*pmdp = __pmd(0);	\</div><div class='add'>+		clean_pmd_entry(pmdp);	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define set_pte_ext(ptep,pte,ext) cpu_set_pte_ext(ptep,__pte(pte_val(pte)|(ext)))</div><div class='add'>+</div><div class='add'>+#endif /* __ASSEMBLY__ */</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_PGTABLE_3LEVEL_H */</div><div class='head'>diff --git a/arch/arm/include/asm/pgtable-hwdef.h b/arch/arm/include/asm/pgtable-hwdef.h<br/>index 183111164ce9..8426229ba292 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pgtable-hwdef.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/pgtable-hwdef.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pgtable-hwdef.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/pgtable-hwdef.h</a></div><div class='hunk'>@@ -10,6 +10,10 @@</div><div class='ctx'> #ifndef _ASMARM_PGTABLE_HWDEF_H</div><div class='ctx'> #define _ASMARM_PGTABLE_HWDEF_H</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+#include &lt;asm/pgtable-3level-hwdef.h&gt;</div><div class='add'>+#else</div><div class='ctx'> #include &lt;asm/pgtable-2level-hwdef.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h<br/>index 9451dce3a553..f66626d71e7d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pgtable.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/pgtable.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pgtable.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/pgtable.h</a></div><div class='hunk'>@@ -11,20 +11,24 @@</div><div class='ctx'> #define _ASMARM_PGTABLE_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/const.h&gt;</div><div class='del'>-#include &lt;asm-generic/4level-fixup.h&gt;</div><div class='ctx'> #include &lt;asm/proc-fns.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_MMU</div><div class='ctx'> </div><div class='add'>+#include &lt;asm-generic/4level-fixup.h&gt;</div><div class='ctx'> #include "pgtable-nommu.h"</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='add'>+#include &lt;asm-generic/pgtable-nopud.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='del'>-#include &lt;mach/vmalloc.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+#include &lt;asm/pgtable-3level.h&gt;</div><div class='add'>+#else</div><div class='ctx'> #include &lt;asm/pgtable-2level.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Just any arbitrary offset to the start of the vmalloc VM area: the</div><div class='hunk'>@@ -33,15 +37,10 @@</div><div class='ctx'>  * any out-of-bounds memory accesses will hopefully be caught.</div><div class='ctx'>  * The vmalloc() routines leaves a hole of 4kB between each vmalloced</div><div class='ctx'>  * area for the same reason. ;)</div><div class='del'>- *</div><div class='del'>- * Note that platforms may override VMALLOC_START, but they must provide</div><div class='del'>- * VMALLOC_END.  VMALLOC_END defines the (exclusive) limit of this space,</div><div class='del'>- * which may not overlap IO space.</div><div class='ctx'>  */</div><div class='del'>-#ifndef VMALLOC_START</div><div class='ctx'> #define VMALLOC_OFFSET		(8*1024*1024)</div><div class='ctx'> #define VMALLOC_START		(((unsigned long)high_memory + VMALLOC_OFFSET) &amp; ~(VMALLOC_OFFSET-1))</div><div class='del'>-#endif</div><div class='add'>+#define VMALLOC_END		0xff000000UL</div><div class='ctx'> </div><div class='ctx'> #define LIBRARY_TEXT_START	0x0c000000</div><div class='ctx'> </div><div class='hunk'>@@ -163,39 +162,8 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD];</div><div class='ctx'> /* to find an entry in a kernel page-table-directory */</div><div class='ctx'> #define pgd_offset_k(addr)	pgd_offset(&amp;init_mm, addr)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The "pgd_xxx()" functions here are trivial for a folded two-level</div><div class='del'>- * setup: the pgd is never bad, and a pmd always exists (as it's folded</div><div class='del'>- * into the pgd entry)</div><div class='del'>- */</div><div class='del'>-#define pgd_none(pgd)		(0)</div><div class='del'>-#define pgd_bad(pgd)		(0)</div><div class='del'>-#define pgd_present(pgd)	(1)</div><div class='del'>-#define pgd_clear(pgdp)		do { } while (0)</div><div class='del'>-#define set_pgd(pgd,pgdp)	do { } while (0)</div><div class='del'>-#define set_pud(pud,pudp)	do { } while (0)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Find an entry in the second-level page table.. */</div><div class='del'>-#define pmd_offset(dir, addr)	((pmd_t *)(dir))</div><div class='del'>-</div><div class='ctx'> #define pmd_none(pmd)		(!pmd_val(pmd))</div><div class='ctx'> #define pmd_present(pmd)	(pmd_val(pmd))</div><div class='del'>-#define pmd_bad(pmd)		(pmd_val(pmd) &amp; 2)</div><div class='del'>-</div><div class='del'>-#define copy_pmd(pmdpd,pmdps)		\</div><div class='del'>-	do {				\</div><div class='del'>-		pmdpd[0] = pmdps[0];	\</div><div class='del'>-		pmdpd[1] = pmdps[1];	\</div><div class='del'>-		flush_pmd_entry(pmdpd);	\</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-#define pmd_clear(pmdp)			\</div><div class='del'>-	do {				\</div><div class='del'>-		pmdp[0] = __pmd(0);	\</div><div class='del'>-		pmdp[1] = __pmd(0);	\</div><div class='del'>-		clean_pmd_entry(pmdp);	\</div><div class='del'>-	} while (0)</div><div class='ctx'> </div><div class='ctx'> static inline pte_t *pmd_page_vaddr(pmd_t pmd)</div><div class='ctx'> {</div><div class='hunk'>@@ -204,10 +172,6 @@ static inline pte_t *pmd_page_vaddr(pmd_t pmd)</div><div class='ctx'> </div><div class='ctx'> #define pmd_page(pmd)		pfn_to_page(__phys_to_pfn(pmd_val(pmd) &amp; PHYS_MASK))</div><div class='ctx'> </div><div class='del'>-/* we don't need complex calculations here as the pmd is folded into the pgd */</div><div class='del'>-#define pmd_addr_end(addr,end)	(end)</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #ifndef CONFIG_HIGHPTE</div><div class='ctx'> #define __pte_map(pmd)		pmd_page_vaddr(*(pmd))</div><div class='ctx'> #define __pte_unmap(pte)	do { } while (0)</div><div class='hunk'>@@ -229,7 +193,6 @@ static inline pte_t *pmd_page_vaddr(pmd_t pmd)</div><div class='ctx'> #define pte_page(pte)		pfn_to_page(pte_pfn(pte))</div><div class='ctx'> #define mk_pte(page,prot)	pfn_pte(page_to_pfn(page), prot)</div><div class='ctx'> </div><div class='del'>-#define set_pte_ext(ptep,pte,ext) cpu_set_pte_ext(ptep,pte,ext)</div><div class='ctx'> #define pte_clear(mm,addr,ptep)	set_pte_ext(ptep, __pte(0), 0)</div><div class='ctx'> </div><div class='ctx'> #if __LINUX_ARM_ARCH__ &lt; 6</div><div class='hunk'>@@ -336,6 +299,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)</div><div class='ctx'>  * We provide our own arch_get_unmapped_area to cope with VIPT caches.</div><div class='ctx'>  */</div><div class='ctx'> #define HAVE_ARCH_UNMAPPED_AREA</div><div class='add'>+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * remap a physical page `pfn' of size `size' with page protection `prot'</div><div class='hunk'>@@ -346,9 +310,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)</div><div class='ctx'> </div><div class='ctx'> #define pgtable_cache_init() do { } while (0)</div><div class='ctx'> </div><div class='del'>-void identity_mapping_add(pgd_t *, unsigned long, unsigned long);</div><div class='del'>-void identity_mapping_del(pgd_t *, unsigned long, unsigned long);</div><div class='del'>-</div><div class='ctx'> #endif /* !__ASSEMBLY__ */</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_MMU */</div><div class='head'>diff --git a/arch/arm/include/asm/pmu.h b/arch/arm/include/asm/pmu.h<br/>index 0bda22c094a6..b5a5be2536c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pmu.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/pmu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/pmu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/pmu.h</a></div><div class='hunk'>@@ -27,13 +27,22 @@ enum arm_pmu_type {</div><div class='ctx'> /*</div><div class='ctx'>  * struct arm_pmu_platdata - ARM PMU platform data</div><div class='ctx'>  *</div><div class='del'>- * @handle_irq: an optional handler which will be called from the interrupt and</div><div class='del'>- * passed the address of the low level handler, and can be used to implement</div><div class='del'>- * any platform specific handling before or after calling it.</div><div class='add'>+ * @handle_irq: an optional handler which will be called from the</div><div class='add'>+ *	interrupt and passed the address of the low level handler,</div><div class='add'>+ *	and can be used to implement any platform specific handling</div><div class='add'>+ *	before or after calling it.</div><div class='add'>+ * @enable_irq: an optional handler which will be called after</div><div class='add'>+ *	request_irq and be used to handle some platform specific</div><div class='add'>+ *	irq enablement</div><div class='add'>+ * @disable_irq: an optional handler which will be called before</div><div class='add'>+ *	free_irq and be used to handle some platform specific</div><div class='add'>+ *	irq disablement</div><div class='ctx'>  */</div><div class='ctx'> struct arm_pmu_platdata {</div><div class='ctx'> 	irqreturn_t (*handle_irq)(int irq, void *dev,</div><div class='ctx'> 				  irq_handler_t pmu_handler);</div><div class='add'>+	void (*enable_irq)(int irq);</div><div class='add'>+	void (*disable_irq)(int irq);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_HAS_PMU</div><div class='head'>diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h<br/>index 9e92cb205e65..f3628fb3d2b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/proc-fns.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/proc-fns.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/proc-fns.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/proc-fns.h</a></div><div class='hunk'>@@ -65,7 +65,11 @@ extern struct processor {</div><div class='ctx'> 	 * Set a possibly extended PTE.  Non-extended PTEs should</div><div class='ctx'> 	 * ignore 'ext'.</div><div class='ctx'> 	 */</div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+	void (*set_pte_ext)(pte_t *ptep, pte_t pte);</div><div class='add'>+#else</div><div class='ctx'> 	void (*set_pte_ext)(pte_t *ptep, pte_t pte, unsigned int ext);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Suspend/resume */</div><div class='ctx'> 	unsigned int suspend_size;</div><div class='hunk'>@@ -79,7 +83,11 @@ extern void cpu_proc_fin(void);</div><div class='ctx'> extern int cpu_do_idle(void);</div><div class='ctx'> extern void cpu_dcache_clean_area(void *, int);</div><div class='ctx'> extern void cpu_do_switch_mm(unsigned long pgd_phys, struct mm_struct *mm);</div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+extern void cpu_set_pte_ext(pte_t *ptep, pte_t pte);</div><div class='add'>+#else</div><div class='ctx'> extern void cpu_set_pte_ext(pte_t *ptep, pte_t pte, unsigned int ext);</div><div class='add'>+#endif</div><div class='ctx'> extern void cpu_reset(unsigned long addr) __attribute__((noreturn));</div><div class='ctx'> </div><div class='ctx'> /* These three are private to arch/arm/kernel/suspend.c */</div><div class='hunk'>@@ -107,6 +115,18 @@ extern void cpu_resume(void);</div><div class='ctx'> </div><div class='ctx'> #define cpu_switch_mm(pgd,mm) cpu_do_switch_mm(virt_to_phys(pgd),mm)</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+#define cpu_get_pgd()	\</div><div class='add'>+	({						\</div><div class='add'>+		unsigned long pg, pg2;			\</div><div class='add'>+		__asm__("mrrc	p15, 0, %0, %1, c2"	\</div><div class='add'>+			: "=r" (pg), "=r" (pg2)		\</div><div class='add'>+			:				\</div><div class='add'>+			: "cc");			\</div><div class='add'>+		pg &amp;= ~(PTRS_PER_PGD*sizeof(pgd_t)-1);	\</div><div class='add'>+		(pgd_t *)phys_to_virt(pg);		\</div><div class='add'>+	})</div><div class='add'>+#else</div><div class='ctx'> #define cpu_get_pgd()	\</div><div class='ctx'> 	({						\</div><div class='ctx'> 		unsigned long pg;			\</div><div class='hunk'>@@ -115,6 +135,7 @@ extern void cpu_resume(void);</div><div class='ctx'> 		pg &amp;= ~0x3fff;				\</div><div class='ctx'> 		(pgd_t *)phys_to_virt(pg);		\</div><div class='ctx'> 	})</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h<br/>index b2d9df5667af..ce280b8d613c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/processor.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/processor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/processor.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/processor.h</a></div><div class='hunk'>@@ -123,6 +123,8 @@ static inline void prefetch(const void *ptr)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define HAVE_ARCH_PICK_MMAP_LAYOUT</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_ARM_PROCESSOR_H */</div><div class='head'>diff --git a/arch/arm/include/asm/prom.h b/arch/arm/include/asm/prom.h<br/>index 6f65ca86a5ec..ee0363307918 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/prom.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/prom.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/prom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/prom.h</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_OF</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys);</div><div class='head'>diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h<br/>index 96187ff58c24..451808ba1211 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/ptrace.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/ptrace.h</a></div><div class='hunk'>@@ -189,6 +189,11 @@ static inline int valid_user_regs(struct pt_regs *regs)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline long regs_return_value(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return regs-&gt;ARM_r0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define instruction_pointer(regs)	(regs)-&gt;ARM_pc</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='head'>diff --git a/arch/arm/include/asm/sched_clock.h b/arch/arm/include/asm/sched_clock.h<br/>index c8e6ddf3e860..e3f757263438 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/sched_clock.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/sched_clock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/sched_clock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/sched_clock.h</a></div><div class='hunk'>@@ -8,113 +8,7 @@</div><div class='ctx'> #ifndef ASM_SCHED_CLOCK</div><div class='ctx'> #define ASM_SCHED_CLOCK</div><div class='ctx'> </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'>-struct clock_data {</div><div class='del'>-	u64 epoch_ns;</div><div class='del'>-	u32 epoch_cyc;</div><div class='del'>-	u32 epoch_cyc_copy;</div><div class='del'>-	u32 mult;</div><div class='del'>-	u32 shift;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DEFINE_CLOCK_DATA(name)	struct clock_data name</div><div class='del'>-</div><div class='del'>-static inline u64 cyc_to_ns(u64 cyc, u32 mult, u32 shift)</div><div class='del'>-{</div><div class='del'>-	return (cyc * mult) &gt;&gt; shift;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Atomically update the sched_clock epoch.  Your update callback will</div><div class='del'>- * be called from a timer before the counter wraps - read the current</div><div class='del'>- * counter value, and call this function to safely move the epochs</div><div class='del'>- * forward.  Only use this from the update callback.</div><div class='del'>- */</div><div class='del'>-static inline void update_sched_clock(struct clock_data *cd, u32 cyc, u32 mask)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u64 ns = cd-&gt;epoch_ns +</div><div class='del'>-		cyc_to_ns((cyc - cd-&gt;epoch_cyc) &amp; mask, cd-&gt;mult, cd-&gt;shift);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Write epoch_cyc and epoch_ns in a way that the update is</div><div class='del'>-	 * detectable in cyc_to_fixed_sched_clock().</div><div class='del'>-	 */</div><div class='del'>-	raw_local_irq_save(flags);</div><div class='del'>-	cd-&gt;epoch_cyc = cyc;</div><div class='del'>-	smp_wmb();</div><div class='del'>-	cd-&gt;epoch_ns = ns;</div><div class='del'>-	smp_wmb();</div><div class='del'>-	cd-&gt;epoch_cyc_copy = cyc;</div><div class='del'>-	raw_local_irq_restore(flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If your clock rate is known at compile time, using this will allow</div><div class='del'>- * you to optimize the mult/shift loads away.  This is paired with</div><div class='del'>- * init_fixed_sched_clock() to ensure that your mult/shift are correct.</div><div class='del'>- */</div><div class='del'>-static inline unsigned long long cyc_to_fixed_sched_clock(struct clock_data *cd,</div><div class='del'>-	u32 cyc, u32 mask, u32 mult, u32 shift)</div><div class='del'>-{</div><div class='del'>-	u64 epoch_ns;</div><div class='del'>-	u32 epoch_cyc;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Load the epoch_cyc and epoch_ns atomically.  We do this by</div><div class='del'>-	 * ensuring that we always write epoch_cyc, epoch_ns and</div><div class='del'>-	 * epoch_cyc_copy in strict order, and read them in strict order.</div><div class='del'>-	 * If epoch_cyc and epoch_cyc_copy are not equal, then we're in</div><div class='del'>-	 * the middle of an update, and we should repeat the load.</div><div class='del'>-	 */</div><div class='del'>-	do {</div><div class='del'>-		epoch_cyc = cd-&gt;epoch_cyc;</div><div class='del'>-		smp_rmb();</div><div class='del'>-		epoch_ns = cd-&gt;epoch_ns;</div><div class='del'>-		smp_rmb();</div><div class='del'>-	} while (epoch_cyc != cd-&gt;epoch_cyc_copy);</div><div class='del'>-</div><div class='del'>-	return epoch_ns + cyc_to_ns((cyc - epoch_cyc) &amp; mask, mult, shift);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Otherwise, you need to use this, which will obtain the mult/shift</div><div class='del'>- * from the clock_data structure.  Use init_sched_clock() with this.</div><div class='del'>- */</div><div class='del'>-static inline unsigned long long cyc_to_sched_clock(struct clock_data *cd,</div><div class='del'>-	u32 cyc, u32 mask)</div><div class='del'>-{</div><div class='del'>-	return cyc_to_fixed_sched_clock(cd, cyc, mask, cd-&gt;mult, cd-&gt;shift);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initialize the clock data - calculate the appropriate multiplier</div><div class='del'>- * and shift.  Also setup a timer to ensure that the epoch is refreshed</div><div class='del'>- * at the appropriate time interval, which will call your update</div><div class='del'>- * handler.</div><div class='del'>- */</div><div class='del'>-void init_sched_clock(struct clock_data *, void (*)(void),</div><div class='del'>-	unsigned int, unsigned long);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Use this initialization function rather than init_sched_clock() if</div><div class='del'>- * you're using cyc_to_fixed_sched_clock, which will warn if your</div><div class='del'>- * constants are incorrect.</div><div class='del'>- */</div><div class='del'>-static inline void init_fixed_sched_clock(struct clock_data *cd,</div><div class='del'>-	void (*update)(void), unsigned int bits, unsigned long rate,</div><div class='del'>-	u32 mult, u32 shift)</div><div class='del'>-{</div><div class='del'>-	init_sched_clock(cd, update, bits, rate);</div><div class='del'>-	if (cd-&gt;mult != mult || cd-&gt;shift != shift) {</div><div class='del'>-		pr_crit("sched_clock: wrong multiply/shift: %u&gt;&gt;%u vs calculated %u&gt;&gt;%u\n"</div><div class='del'>-			"sched_clock: fix multiply/shift to avoid scheduler hiccups\n",</div><div class='del'>-			mult, shift, cd-&gt;mult, cd-&gt;shift);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> extern void sched_clock_postinit(void);</div><div class='add'>+extern void setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h<br/>index 915696dd9c7c..23ebc0c82a39 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/setup.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/setup.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/setup.h</a></div><div class='hunk'>@@ -192,11 +192,7 @@ static const struct tagtable __tagtable_##fn __tag = { tag, fn }</div><div class='ctx'> /*</div><div class='ctx'>  * Memory map description</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_ARCH_EP93XX</div><div class='del'>-# define NR_BANKS 16</div><div class='del'>-#else</div><div class='del'>-# define NR_BANKS 8</div><div class='del'>-#endif</div><div class='add'>+#define NR_BANKS	CONFIG_ARM_NR_BANKS</div><div class='ctx'> </div><div class='ctx'> struct membank {</div><div class='ctx'> 	phys_addr_t start;</div><div class='head'>diff --git a/arch/arm/include/asm/socket.h b/arch/arm/include/asm/socket.h<br/>index 90ffd04b8e74..dec6f9afb3cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/socket.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/socket.h</a></div><div class='hunk'>@@ -62,4 +62,7 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_RXQ_OVFL             40</div><div class='ctx'> </div><div class='add'>+#define SO_WIFI_STATUS		41</div><div class='add'>+#define SCM_WIFI_STATUS		SO_WIFI_STATUS</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_SOCKET_H */</div><div class='head'>diff --git a/arch/arm/include/asm/swab.h b/arch/arm/include/asm/swab.h<br/>index 9997ad20eff1..b859d82e30ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/swab.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/swab.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/swab.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/swab.h</a></div><div class='hunk'>@@ -22,14 +22,16 @@</div><div class='ctx'> #  define __SWAB_64_THRU_32__</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(__KERNEL__) &amp;&amp; __LINUX_ARM_ARCH__ &gt;= 6</div><div class='add'>+#if defined(__KERNEL__)</div><div class='add'>+#if __LINUX_ARM_ARCH__ &gt;= 6</div><div class='ctx'> </div><div class='del'>-static inline __attribute_const__ __u16 __arch_swab16(__u16 x)</div><div class='add'>+static inline __attribute_const__ __u32 __arch_swahb32(__u32 x)</div><div class='ctx'> {</div><div class='ctx'> 	__asm__ ("rev16 %0, %1" : "=r" (x) : "r" (x));</div><div class='ctx'> 	return x;</div><div class='ctx'> }</div><div class='del'>-#define __arch_swab16 __arch_swab16</div><div class='add'>+#define __arch_swahb32 __arch_swahb32</div><div class='add'>+#define __arch_swab16(x) ((__u16)__arch_swahb32(x))</div><div class='ctx'> </div><div class='ctx'> static inline __attribute_const__ __u32 __arch_swab32(__u32 x)</div><div class='ctx'> {</div><div class='hunk'>@@ -38,8 +40,10 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x)</div><div class='ctx'> }</div><div class='ctx'> #define __arch_swab32 __arch_swab32</div><div class='ctx'> </div><div class='del'>-#else</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+#if !defined(__KERNEL__) || __LINUX_ARM_ARCH__ &lt; 6</div><div class='ctx'> static inline __attribute_const__ __u32 __arch_swab32(__u32 x)</div><div class='ctx'> {</div><div class='ctx'> 	__u32 t;</div><div class='head'>diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h<br/>index 984014b92647..e4c96cc6ec0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/system.h</a></div><div class='hunk'>@@ -80,6 +80,14 @@ struct siginfo;</div><div class='ctx'> void arm_notify_die(const char *str, struct pt_regs *regs, struct siginfo *info,</div><div class='ctx'> 		unsigned long err, unsigned long trap);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+#define FAULT_CODE_ALIGNMENT	33</div><div class='add'>+#define FAULT_CODE_DEBUG	34</div><div class='add'>+#else</div><div class='add'>+#define FAULT_CODE_ALIGNMENT	1</div><div class='add'>+#define FAULT_CODE_DEBUG	2</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int,</div><div class='ctx'> 				       struct pt_regs *),</div><div class='ctx'> 		     int sig, int code, const char *name);</div><div class='hunk'>@@ -100,7 +108,7 @@ extern void __show_regs(struct pt_regs *);</div><div class='ctx'> extern int __pure cpu_architecture(void);</div><div class='ctx'> extern void cpu_init(void);</div><div class='ctx'> </div><div class='del'>-void arm_machine_restart(char mode, const char *cmd);</div><div class='add'>+void soft_restart(unsigned long);</div><div class='ctx'> extern void (*arm_pm_restart)(char str, const char *cmd);</div><div class='ctx'> </div><div class='ctx'> #define UDBG_UNDEFINED	(1 &lt;&lt; 0)</div><div class='head'>diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h<br/>index 7b5cc8dae06e..d4c24d412a8d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/thread_info.h</a></div><div class='hunk'>@@ -129,6 +129,7 @@ extern void vfp_flush_hwstate(struct thread_info *);</div><div class='ctx'> /*</div><div class='ctx'>  * thread information flags:</div><div class='ctx'>  *  TIF_SYSCALL_TRACE	- syscall trace active</div><div class='add'>+ *  TIF_SYSCAL_AUDIT	- syscall auditing active</div><div class='ctx'>  *  TIF_SIGPENDING	- signal pending</div><div class='ctx'>  *  TIF_NEED_RESCHED	- rescheduling necessary</div><div class='ctx'>  *  TIF_NOTIFY_RESUME	- callback before returning to user</div><div class='hunk'>@@ -139,10 +140,10 @@ extern void vfp_flush_hwstate(struct thread_info *);</div><div class='ctx'> #define TIF_NEED_RESCHED	1</div><div class='ctx'> #define TIF_NOTIFY_RESUME	2	/* callback before returning to user */</div><div class='ctx'> #define TIF_SYSCALL_TRACE	8</div><div class='add'>+#define TIF_SYSCALL_AUDIT	9</div><div class='ctx'> #define TIF_POLLING_NRFLAG	16</div><div class='ctx'> #define TIF_USING_IWMMXT	17</div><div class='ctx'> #define TIF_MEMDIE		18	/* is terminating due to OOM killer */</div><div class='del'>-#define TIF_FREEZE		19</div><div class='ctx'> #define TIF_RESTORE_SIGMASK	20</div><div class='ctx'> #define TIF_SECCOMP		21</div><div class='ctx'> </div><div class='hunk'>@@ -150,12 +151,15 @@ extern void vfp_flush_hwstate(struct thread_info *);</div><div class='ctx'> #define _TIF_NEED_RESCHED	(1 &lt;&lt; TIF_NEED_RESCHED)</div><div class='ctx'> #define _TIF_NOTIFY_RESUME	(1 &lt;&lt; TIF_NOTIFY_RESUME)</div><div class='ctx'> #define _TIF_SYSCALL_TRACE	(1 &lt;&lt; TIF_SYSCALL_TRACE)</div><div class='add'>+#define _TIF_SYSCALL_AUDIT	(1 &lt;&lt; TIF_SYSCALL_AUDIT)</div><div class='ctx'> #define _TIF_POLLING_NRFLAG	(1 &lt;&lt; TIF_POLLING_NRFLAG)</div><div class='ctx'> #define _TIF_USING_IWMMXT	(1 &lt;&lt; TIF_USING_IWMMXT)</div><div class='del'>-#define _TIF_FREEZE		(1 &lt;&lt; TIF_FREEZE)</div><div class='ctx'> #define _TIF_RESTORE_SIGMASK	(1 &lt;&lt; TIF_RESTORE_SIGMASK)</div><div class='ctx'> #define _TIF_SECCOMP		(1 &lt;&lt; TIF_SECCOMP)</div><div class='ctx'> </div><div class='add'>+/* Checks for any syscall work in entry-common.S */</div><div class='add'>+#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Change these and you break ASM code in entry-common.S</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h<br/>index 265f908c4a6e..5d3ed7e38561 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/tlb.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/tlb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/tlb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/tlb.h</a></div><div class='hunk'>@@ -202,8 +202,18 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte,</div><div class='ctx'> 	tlb_remove_page(tlb, pte);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmdp,</div><div class='add'>+				  unsigned long addr)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+	tlb_add_flush(tlb, addr);</div><div class='add'>+	tlb_remove_page(tlb, virt_to_page(pmdp));</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #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)-&gt;mm, pmdp)</div><div class='add'>+#define pmd_free_tlb(tlb, pmdp, addr)	__pmd_free_tlb(tlb, pmdp, addr)</div><div class='add'>+#define pud_free_tlb(tlb, pudp, addr)	pud_free((tlb)-&gt;mm, pudp)</div><div class='ctx'> </div><div class='ctx'> #define tlb_migrate_finish(mm)		do { } while (0)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h<br/>index 48192ac3a23a..28beab917ffc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/types.h</a></div><div class='hunk'>@@ -3,12 +3,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/int-ll64.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-</div><div class='del'>-typedef unsigned short umode_t;</div><div class='del'>-</div><div class='del'>-#endif /* __ASSEMBLY__ */</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * These aren't exported outside the kernel to avoid name space clashes</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/arm/include/asm/unified.h b/arch/arm/include/asm/unified.h<br/>index bc631161e9c6..f5989f46b4d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/unified.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/unified.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/unified.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/unified.h</a></div><div class='hunk'>@@ -37,8 +37,8 @@</div><div class='ctx'> #define THUMB(x...)	x</div><div class='ctx'> #ifdef __ASSEMBLY__</div><div class='ctx'> #define W(instr)	instr.w</div><div class='del'>-#endif</div><div class='ctx'> #define BSYM(sym)	sym + 1</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #else	/* !CONFIG_THUMB2_KERNEL */</div><div class='ctx'> </div><div class='hunk'>@@ -49,8 +49,8 @@</div><div class='ctx'> #define THUMB(x...)</div><div class='ctx'> #ifdef __ASSEMBLY__</div><div class='ctx'> #define W(instr)	instr</div><div class='del'>-#endif</div><div class='ctx'> #define BSYM(sym)	sym</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif	/* CONFIG_THUMB2_KERNEL */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h<br/>index 4a1123783806..512cd1473454 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/include/asm/unistd.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/include/asm/unistd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/include/asm/unistd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/include/asm/unistd.h</a></div><div class='hunk'>@@ -427,7 +427,8 @@</div><div class='ctx'> /*</div><div class='ctx'>  * The following syscalls are obsolete and no longer available for EABI.</div><div class='ctx'>  */</div><div class='del'>-#if defined(__ARM_EABI__) &amp;&amp; !defined(__KERNEL__)</div><div class='add'>+#if !defined(__KERNEL__)</div><div class='add'>+#if defined(__ARM_EABI__)</div><div class='ctx'> #undef __NR_time</div><div class='ctx'> #undef __NR_umount</div><div class='ctx'> #undef __NR_stime</div><div class='hunk'>@@ -441,6 +442,7 @@</div><div class='ctx'> #undef __NR_syscall</div><div class='ctx'> #undef __NR_ipc</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile<br/>index 16eed6aebfa4..43b740d0e374 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/Makefile</a></div><div class='hunk'>@@ -13,7 +13,7 @@ CFLAGS_REMOVE_return_address.o = -pg</div><div class='ctx'> </div><div class='ctx'> # Object file lists.</div><div class='ctx'> </div><div class='del'>-obj-y		:= elf.o entry-armv.o entry-common.o irq.o \</div><div class='add'>+obj-y		:= elf.o entry-armv.o entry-common.o irq.o opcodes.o \</div><div class='ctx'> 		   process.o ptrace.o return_address.o setup.o signal.o \</div><div class='ctx'> 		   sys_arm.o stacktrace.o time.o traps.o</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c<br/>index b530e9116a0c..f58ba3589908 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/bios32.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/bios32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/bios32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/bios32.c</a></div><div class='hunk'>@@ -316,21 +316,6 @@ pdev_fixup_device_resources(struct pci_sys_data *root, struct pci_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit</div><div class='del'>-pbus_assign_bus_resources(struct pci_bus *bus, struct pci_sys_data *root)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *dev = bus-&gt;self;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!dev) {</div><div class='del'>-		/*</div><div class='del'>-		 * Assign root bus resources.</div><div class='del'>-		 */</div><div class='del'>-		for (i = 0; i &lt; 3; i++)</div><div class='del'>-			bus-&gt;resource[i] = root-&gt;resource[i];</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * pcibios_fixup_bus - Called after each bus is probed,</div><div class='ctx'>  * but before its children are examined.</div><div class='hunk'>@@ -341,8 +326,6 @@ void pcibios_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> 	struct pci_dev *dev;</div><div class='ctx'> 	u16 features = PCI_COMMAND_SERR | PCI_COMMAND_PARITY | PCI_COMMAND_FAST_BACK;</div><div class='ctx'> </div><div class='del'>-	pbus_assign_bus_resources(bus, root);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Walk the devices on this bus, working out what we can</div><div class='ctx'> 	 * and can't support.</div><div class='hunk'>@@ -508,12 +491,18 @@ static void __init pcibios_init_hw(struct hw_pci *hw)</div><div class='ctx'> 		sys-&gt;busnr   = busnr;</div><div class='ctx'> 		sys-&gt;swizzle = hw-&gt;swizzle;</div><div class='ctx'> 		sys-&gt;map_irq = hw-&gt;map_irq;</div><div class='del'>-		sys-&gt;resource[0] = &amp;ioport_resource;</div><div class='del'>-		sys-&gt;resource[1] = &amp;iomem_resource;</div><div class='add'>+		INIT_LIST_HEAD(&amp;sys-&gt;resources);</div><div class='ctx'> </div><div class='ctx'> 		ret = hw-&gt;setup(nr, sys);</div><div class='ctx'> </div><div class='ctx'> 		if (ret &gt; 0) {</div><div class='add'>+			if (list_empty(&amp;sys-&gt;resources)) {</div><div class='add'>+				pci_add_resource(&amp;sys-&gt;resources,</div><div class='add'>+						 &amp;ioport_resource);</div><div class='add'>+				pci_add_resource(&amp;sys-&gt;resources,</div><div class='add'>+						 &amp;iomem_resource);</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			sys-&gt;bus = hw-&gt;scan(nr, sys);</div><div class='ctx'> </div><div class='ctx'> 			if (!sys-&gt;bus)</div><div class='hunk'>@@ -571,6 +560,13 @@ void __init pci_common_init(struct hw_pci *hw)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_PCI_HOST_ITE8152</div><div class='add'>+void pcibios_set_master(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	/* No special bus mastering setup handling */</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> char * __init pcibios_setup(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	if (!strcmp(str, "debug")) {</div><div class='head'>diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S<br/>index b145f16c91bc..3a456c6c7005 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/entry-armv.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/entry-armv.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/entry-armv.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/entry-armv.S</a></div><div class='hunk'>@@ -36,12 +36,11 @@</div><div class='ctx'> #ifdef CONFIG_MULTI_IRQ_HANDLER</div><div class='ctx'> 	ldr	r1, =handle_arch_irq</div><div class='ctx'> 	mov	r0, sp</div><div class='del'>-	ldr	r1, [r1]</div><div class='ctx'> 	adr	lr, BSYM(9997f)</div><div class='del'>-	teq	r1, #0</div><div class='del'>-	movne	pc, r1</div><div class='del'>-#endif</div><div class='add'>+	ldr	pc, [r1]</div><div class='add'>+#else</div><div class='ctx'> 	arch_irq_handler_default</div><div class='add'>+#endif</div><div class='ctx'> 9997:</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S<br/>index b2a27b6b0046..520889cf1b5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/entry-common.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/entry-common.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/entry-common.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/entry-common.S</a></div><div class='hunk'>@@ -87,7 +87,7 @@ ENTRY(ret_from_fork)</div><div class='ctx'> 	get_thread_info tsk</div><div class='ctx'> 	ldr	r1, [tsk, #TI_FLAGS]		@ check for syscall tracing</div><div class='ctx'> 	mov	why, #1</div><div class='del'>-	tst	r1, #_TIF_SYSCALL_TRACE		@ are we tracing syscalls?</div><div class='add'>+	tst	r1, #_TIF_SYSCALL_WORK		@ are we tracing syscalls?</div><div class='ctx'> 	beq	ret_slow_syscall</div><div class='ctx'> 	mov	r1, sp</div><div class='ctx'> 	mov	r0, #1				@ trace exit [IP = 1]</div><div class='hunk'>@@ -443,7 +443,7 @@ ENTRY(vector_swi)</div><div class='ctx'> 1:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	tst	r10, #_TIF_SYSCALL_TRACE		@ are we tracing syscalls?</div><div class='add'>+	tst	r10, #_TIF_SYSCALL_WORK		@ are we tracing syscalls?</div><div class='ctx'> 	bne	__sys_trace</div><div class='ctx'> </div><div class='ctx'> 	cmp	scno, #NR_syscalls		@ check upper syscall limit</div><div class='head'>diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S<br/>index 08c82fd844a8..6d5791144066 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/head.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/head.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/head.S</a></div><div class='hunk'>@@ -39,8 +39,14 @@</div><div class='ctx'> #error KERNEL_RAM_VADDR must start at 0xXXXX8000</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+	/* LPAE requires an additional page for the PGD */</div><div class='add'>+#define PG_DIR_SIZE	0x5000</div><div class='add'>+#define PMD_ORDER	3</div><div class='add'>+#else</div><div class='ctx'> #define PG_DIR_SIZE	0x4000</div><div class='ctx'> #define PMD_ORDER	2</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	.globl	swapper_pg_dir</div><div class='ctx'> 	.equ	swapper_pg_dir, KERNEL_RAM_VADDR - PG_DIR_SIZE</div><div class='hunk'>@@ -93,6 +99,14 @@ ENTRY(stext)</div><div class='ctx'>  THUMB( it	eq )		@ force fixup-able long branch encoding</div><div class='ctx'> 	beq	__error_p			@ yes, error 'p'</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+	mrc	p15, 0, r3, c0, c1, 4		@ read ID_MMFR0</div><div class='add'>+	and	r3, r3, #0xf			@ extract VMSA support</div><div class='add'>+	cmp	r3, #5				@ long-descriptor translation table format?</div><div class='add'>+ THUMB( it	lo )				@ force fixup-able long branch encoding</div><div class='add'>+	blo	__error_p			@ only classic page table format</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef CONFIG_XIP_KERNEL</div><div class='ctx'> 	adr	r3, 2f</div><div class='ctx'> 	ldmia	r3, {r4, r8}</div><div class='hunk'>@@ -164,17 +178,36 @@ __create_page_tables:</div><div class='ctx'> 	teq	r0, r6</div><div class='ctx'> 	bne	1b</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+	/*</div><div class='add'>+	 * Build the PGD table (first level) to point to the PMD table. A PGD</div><div class='add'>+	 * entry is 64-bit wide.</div><div class='add'>+	 */</div><div class='add'>+	mov	r0, r4</div><div class='add'>+	add	r3, r4, #0x1000			@ first PMD table address</div><div class='add'>+	orr	r3, r3, #3			@ PGD block type</div><div class='add'>+	mov	r6, #4				@ PTRS_PER_PGD</div><div class='add'>+	mov	r7, #1 &lt;&lt; (55 - 32)		@ L_PGD_SWAPPER</div><div class='add'>+1:	str	r3, [r0], #4			@ set bottom PGD entry bits</div><div class='add'>+	str	r7, [r0], #4			@ set top PGD entry bits</div><div class='add'>+	add	r3, r3, #0x1000			@ next PMD table</div><div class='add'>+	subs	r6, r6, #1</div><div class='add'>+	bne	1b</div><div class='add'>+</div><div class='add'>+	add	r4, r4, #0x1000			@ point to the PMD tables</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	ldr	r7, [r10, #PROCINFO_MM_MMUFLAGS] @ mm_mmuflags</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Create identity mapping to cater for __enable_mmu.</div><div class='ctx'> 	 * This identity mapping will be removed by paging_init().</div><div class='ctx'> 	 */</div><div class='del'>-	adr	r0, __enable_mmu_loc</div><div class='add'>+	adr	r0, __turn_mmu_on_loc</div><div class='ctx'> 	ldmia	r0, {r3, r5, r6}</div><div class='ctx'> 	sub	r0, r0, r3			@ virt-&gt;phys offset</div><div class='del'>-	add	r5, r5, r0			@ phys __enable_mmu</div><div class='del'>-	add	r6, r6, r0			@ phys __enable_mmu_end</div><div class='add'>+	add	r5, r5, r0			@ phys __turn_mmu_on</div><div class='add'>+	add	r6, r6, r0			@ phys __turn_mmu_on_end</div><div class='ctx'> 	mov	r5, r5, lsr #SECTION_SHIFT</div><div class='ctx'> 	mov	r6, r6, lsr #SECTION_SHIFT</div><div class='ctx'> </div><div class='hunk'>@@ -219,8 +252,8 @@ __create_page_tables:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Then map boot params address in r2 or</div><div class='del'>-	 * the first 1MB of ram if boot params address is not specified.</div><div class='add'>+	 * Then map boot params address in r2 or the first 1MB (2MB with LPAE)</div><div class='add'>+	 * of ram if boot params address is not specified.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mov	r0, r2, lsr #SECTION_SHIFT</div><div class='ctx'> 	movs	r0, r0, lsl #SECTION_SHIFT</div><div class='hunk'>@@ -251,7 +284,15 @@ __create_page_tables:</div><div class='ctx'> 	mov	r3, r7, lsr #SECTION_SHIFT</div><div class='ctx'> 	ldr	r7, [r10, #PROCINFO_IO_MMUFLAGS] @ io_mmuflags</div><div class='ctx'> 	orr	r3, r7, r3, lsl #SECTION_SHIFT</div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+	mov	r7, #1 &lt;&lt; (54 - 32)		@ XN</div><div class='add'>+#else</div><div class='add'>+	orr	r3, r3, #PMD_SECT_XN</div><div class='add'>+#endif</div><div class='ctx'> 1:	str	r3, [r0], #4</div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+	str	r7, [r0], #4</div><div class='add'>+#endif</div><div class='ctx'> 	add	r3, r3, #1 &lt;&lt; SECTION_SHIFT</div><div class='ctx'> 	cmp	r0, r6</div><div class='ctx'> 	blo	1b</div><div class='hunk'>@@ -283,14 +324,17 @@ __create_page_tables:</div><div class='ctx'> 	str	r3, [r0]</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+	sub	r4, r4, #0x1000		@ point to the PGD table</div><div class='add'>+#endif</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> ENDPROC(__create_page_tables)</div><div class='ctx'> 	.ltorg</div><div class='ctx'> 	.align</div><div class='del'>-__enable_mmu_loc:</div><div class='add'>+__turn_mmu_on_loc:</div><div class='ctx'> 	.long	.</div><div class='del'>-	.long	__enable_mmu</div><div class='del'>-	.long	__enable_mmu_end</div><div class='add'>+	.long	__turn_mmu_on</div><div class='add'>+	.long	__turn_mmu_on_end</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SMP)</div><div class='ctx'> 	__CPUINIT</div><div class='hunk'>@@ -374,12 +418,17 @@ __enable_mmu:</div><div class='ctx'> #ifdef CONFIG_CPU_ICACHE_DISABLE</div><div class='ctx'> 	bic	r0, r0, #CR_I</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+	mov	r5, #0</div><div class='add'>+	mcrr	p15, 0, r4, r5, c2		@ load TTBR0</div><div class='add'>+#else</div><div class='ctx'> 	mov	r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \</div><div class='ctx'> 		      domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \</div><div class='ctx'> 		      domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \</div><div class='ctx'> 		      domain_val(DOMAIN_IO, DOMAIN_CLIENT))</div><div class='ctx'> 	mcr	p15, 0, r5, c3, c0, 0		@ load domain access register</div><div class='ctx'> 	mcr	p15, 0, r4, c2, c0, 0		@ load page table pointer</div><div class='add'>+#endif</div><div class='ctx'> 	b	__turn_mmu_on</div><div class='ctx'> ENDPROC(__enable_mmu)</div><div class='ctx'> </div><div class='hunk'>@@ -398,15 +447,19 @@ ENDPROC(__enable_mmu)</div><div class='ctx'>  * other registers depend on the function called upon completion</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='del'>-__turn_mmu_on:</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='add'>+ENTRY(__turn_mmu_on)</div><div class='ctx'> 	mov	r0, r0</div><div class='add'>+	instr_sync</div><div class='ctx'> 	mcr	p15, 0, r0, c1, c0, 0		@ write control reg</div><div class='ctx'> 	mrc	p15, 0, r3, c0, c0, 0		@ read id reg</div><div class='add'>+	instr_sync</div><div class='ctx'> 	mov	r3, r3</div><div class='ctx'> 	mov	r3, r13</div><div class='ctx'> 	mov	pc, r3</div><div class='del'>-__enable_mmu_end:</div><div class='add'>+__turn_mmu_on_end:</div><div class='ctx'> ENDPROC(__turn_mmu_on)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP_ON_UP</div><div class='head'>diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c<br/>index 814a52a9dc39..d6a95ef9131d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/hw_breakpoint.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/hw_breakpoint.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/hw_breakpoint.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/hw_breakpoint.c</a></div><div class='hunk'>@@ -1016,10 +1016,10 @@ static int __init arch_hw_breakpoint_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Register debug fault handler. */</div><div class='del'>-	hook_fault_code(2, hw_breakpoint_pending, SIGTRAP, TRAP_HWBKPT,</div><div class='del'>-			"watchpoint debug exception");</div><div class='del'>-	hook_ifault_code(2, hw_breakpoint_pending, SIGTRAP, TRAP_HWBKPT,</div><div class='del'>-			"breakpoint debug exception");</div><div class='add'>+	hook_fault_code(FAULT_CODE_DEBUG, hw_breakpoint_pending, SIGTRAP,</div><div class='add'>+			TRAP_HWBKPT, "watchpoint debug exception");</div><div class='add'>+	hook_ifault_code(FAULT_CODE_DEBUG, hw_breakpoint_pending, SIGTRAP,</div><div class='add'>+			TRAP_HWBKPT, "breakpoint debug exception");</div><div class='ctx'> </div><div class='ctx'> 	/* Register hotplug notifier. */</div><div class='ctx'> 	register_cpu_notifier(&amp;dbg_reset_nb);</div><div class='head'>diff --git a/arch/arm/kernel/kprobes-test.c b/arch/arm/kernel/kprobes-test.c<br/>index e17cdd6d90d8..1862d8f2fd44 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/kprobes-test.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/kprobes-test.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/kprobes-test.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/kprobes-test.c</a></div><div class='hunk'>@@ -202,6 +202,8 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/opcodes.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "kprobes.h"</div><div class='ctx'> #include "kprobes-test.h"</div><div class='ctx'> </div><div class='hunk'>@@ -1050,65 +1052,9 @@ static int test_instance;</div><div class='ctx'> </div><div class='ctx'> static unsigned long test_check_cc(int cc, unsigned long cpsr)</div><div class='ctx'> {</div><div class='del'>-	unsigned long temp;</div><div class='del'>-</div><div class='del'>-	switch (cc) {</div><div class='del'>-	case 0x0: /* eq */</div><div class='del'>-		return cpsr &amp; PSR_Z_BIT;</div><div class='del'>-</div><div class='del'>-	case 0x1: /* ne */</div><div class='del'>-		return (~cpsr) &amp; PSR_Z_BIT;</div><div class='del'>-</div><div class='del'>-	case 0x2: /* cs */</div><div class='del'>-		return cpsr &amp; PSR_C_BIT;</div><div class='del'>-</div><div class='del'>-	case 0x3: /* cc */</div><div class='del'>-		return (~cpsr) &amp; PSR_C_BIT;</div><div class='del'>-</div><div class='del'>-	case 0x4: /* mi */</div><div class='del'>-		return cpsr &amp; PSR_N_BIT;</div><div class='del'>-</div><div class='del'>-	case 0x5: /* pl */</div><div class='del'>-		return (~cpsr) &amp; PSR_N_BIT;</div><div class='del'>-</div><div class='del'>-	case 0x6: /* vs */</div><div class='del'>-		return cpsr &amp; PSR_V_BIT;</div><div class='del'>-</div><div class='del'>-	case 0x7: /* vc */</div><div class='del'>-		return (~cpsr) &amp; PSR_V_BIT;</div><div class='add'>+	int ret = arm_check_condition(cc &lt;&lt; 28, cpsr);</div><div class='ctx'> </div><div class='del'>-	case 0x8: /* hi */</div><div class='del'>-		cpsr &amp;= ~(cpsr &gt;&gt; 1); /* PSR_C_BIT &amp;= ~PSR_Z_BIT */</div><div class='del'>-		return cpsr &amp; PSR_C_BIT;</div><div class='del'>-</div><div class='del'>-	case 0x9: /* ls */</div><div class='del'>-		cpsr &amp;= ~(cpsr &gt;&gt; 1); /* PSR_C_BIT &amp;= ~PSR_Z_BIT */</div><div class='del'>-		return (~cpsr) &amp; PSR_C_BIT;</div><div class='del'>-</div><div class='del'>-	case 0xa: /* ge */</div><div class='del'>-		cpsr ^= (cpsr &lt;&lt; 3); /* PSR_N_BIT ^= PSR_V_BIT */</div><div class='del'>-		return (~cpsr) &amp; PSR_N_BIT;</div><div class='del'>-</div><div class='del'>-	case 0xb: /* lt */</div><div class='del'>-		cpsr ^= (cpsr &lt;&lt; 3); /* PSR_N_BIT ^= PSR_V_BIT */</div><div class='del'>-		return cpsr &amp; PSR_N_BIT;</div><div class='del'>-</div><div class='del'>-	case 0xc: /* gt */</div><div class='del'>-		temp = cpsr ^ (cpsr &lt;&lt; 3); /* PSR_N_BIT ^= PSR_V_BIT */</div><div class='del'>-		temp |= (cpsr &lt;&lt; 1);	   /* PSR_N_BIT |= PSR_Z_BIT */</div><div class='del'>-		return (~temp) &amp; PSR_N_BIT;</div><div class='del'>-</div><div class='del'>-	case 0xd: /* le */</div><div class='del'>-		temp = cpsr ^ (cpsr &lt;&lt; 3); /* PSR_N_BIT ^= PSR_V_BIT */</div><div class='del'>-		temp |= (cpsr &lt;&lt; 1);	   /* PSR_N_BIT |= PSR_Z_BIT */</div><div class='del'>-		return temp &amp; PSR_N_BIT;</div><div class='del'>-</div><div class='del'>-	case 0xe: /* al */</div><div class='del'>-	case 0xf: /* unconditional */</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-	BUG();</div><div class='del'>-	return false;</div><div class='add'>+	return (ret != ARM_OPCODE_CONDTEST_FAIL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int is_last_scenario;</div><div class='hunk'>@@ -1128,7 +1074,9 @@ static unsigned long test_context_cpsr(int scenario)</div><div class='ctx'> </div><div class='ctx'> 	if (!test_case_is_thumb) {</div><div class='ctx'> 		/* Testing ARM code */</div><div class='del'>-		probe_should_run = test_check_cc(current_instruction &gt;&gt; 28, cpsr) != 0;</div><div class='add'>+		int cc = current_instruction &gt;&gt; 28;</div><div class='add'>+</div><div class='add'>+		probe_should_run = test_check_cc(cc, cpsr) != 0;</div><div class='ctx'> 		if (scenario == 15)</div><div class='ctx'> 			is_last_scenario = true;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/leds.c b/arch/arm/kernel/leds.c<br/>index 0bcd38341573..1911dae19e4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/leds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/leds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/leds.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -34,8 +34,8 @@ static const struct leds_evt_name evt_names[] = {</div><div class='ctx'> 	{ "red",   led_red_on,   led_red_off   },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static ssize_t leds_store(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t leds_store(struct device *dev,</div><div class='add'>+			struct device_attribute *attr,</div><div class='ctx'> 			const char *buf, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -EINVAL, len = strcspn(buf, " ");</div><div class='hunk'>@@ -69,15 +69,16 @@ static ssize_t leds_store(struct sys_device *dev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(event, 0200, NULL, leds_store);</div><div class='add'>+static DEVICE_ATTR(event, 0200, NULL, leds_store);</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class leds_sysclass = {</div><div class='add'>+static struct bus_type leds_subsys = {</div><div class='ctx'> 	.name		= "leds",</div><div class='add'>+	.dev_name	= "leds",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sys_device leds_device = {</div><div class='add'>+static struct device leds_device = {</div><div class='ctx'> 	.id		= 0,</div><div class='del'>-	.cls		= &amp;leds_sysclass,</div><div class='add'>+	.bus		= &amp;leds_subsys,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int leds_suspend(void)</div><div class='hunk'>@@ -105,11 +106,11 @@ static struct syscore_ops leds_syscore_ops = {</div><div class='ctx'> static int __init leds_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	ret = sysdev_class_register(&amp;leds_sysclass);</div><div class='add'>+	ret = subsys_system_register(&amp;leds_subsys, NULL);</div><div class='ctx'> 	if (ret == 0)</div><div class='del'>-		ret = sysdev_register(&amp;leds_device);</div><div class='add'>+		ret = device_register(&amp;leds_device);</div><div class='ctx'> 	if (ret == 0)</div><div class='del'>-		ret = sysdev_create_file(&amp;leds_device, &amp;attr_event);</div><div class='add'>+		ret = device_create_file(&amp;leds_device, &amp;dev_attr_event);</div><div class='ctx'> 	if (ret == 0)</div><div class='ctx'> 		register_syscore_ops(&amp;leds_syscore_ops);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c<br/>index e59bbd496c39..764bd456d84f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/machine_kexec.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/machine_kexec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/machine_kexec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/machine_kexec.c</a></div><div class='hunk'>@@ -12,12 +12,11 @@</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'> #include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern const unsigned char relocate_new_kernel[];</div><div class='ctx'> extern const unsigned int relocate_new_kernel_size;</div><div class='ctx'> </div><div class='del'>-extern void setup_mm_for_reboot(char mode);</div><div class='del'>-</div><div class='ctx'> extern unsigned long kexec_start_address;</div><div class='ctx'> extern unsigned long kexec_indirection_page;</div><div class='ctx'> extern unsigned long kexec_mach_type;</div><div class='hunk'>@@ -111,14 +110,6 @@ void machine_kexec(struct kimage *image)</div><div class='ctx'> </div><div class='ctx'> 	if (kexec_reinit)</div><div class='ctx'> 		kexec_reinit();</div><div class='del'>-	local_irq_disable();</div><div class='del'>-	local_fiq_disable();</div><div class='del'>-	setup_mm_for_reboot(0); /* mode is not used, so just pass 0*/</div><div class='del'>-	flush_cache_all();</div><div class='del'>-	outer_flush_all();</div><div class='del'>-	outer_disable();</div><div class='del'>-	cpu_proc_fin();</div><div class='del'>-	outer_inv_all();</div><div class='del'>-	flush_cache_all();</div><div class='del'>-	cpu_reset(reboot_code_buffer_phys);</div><div class='add'>+</div><div class='add'>+	soft_restart(reboot_code_buffer_phys);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/kernel/opcodes.c b/arch/arm/kernel/opcodes.c<br/>new file mode 100644<br/>index 000000000000..f8179c6a817f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/opcodes.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/opcodes.c</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+/*</div><div class='add'>+ *  linux/arch/arm/kernel/opcodes.c</div><div class='add'>+ *</div><div class='add'>+ *  A32 condition code lookup feature moved from nwfpe/fpopcode.c</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;asm/opcodes.h&gt;</div><div class='add'>+</div><div class='add'>+#define ARM_OPCODE_CONDITION_UNCOND 0xf</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * condition code lookup table</div><div class='add'>+ * index into the table is test code: EQ, NE, ... LT, GT, AL, NV</div><div class='add'>+ *</div><div class='add'>+ * bit position in short is condition code: NZCV</div><div class='add'>+ */</div><div class='add'>+static const unsigned short cc_map[16] = {</div><div class='add'>+	0xF0F0,			/* EQ == Z set            */</div><div class='add'>+	0x0F0F,			/* NE                     */</div><div class='add'>+	0xCCCC,			/* CS == C set            */</div><div class='add'>+	0x3333,			/* CC                     */</div><div class='add'>+	0xFF00,			/* MI == N set            */</div><div class='add'>+	0x00FF,			/* PL                     */</div><div class='add'>+	0xAAAA,			/* VS == V set            */</div><div class='add'>+	0x5555,			/* VC                     */</div><div class='add'>+	0x0C0C,			/* HI == C set &amp;&amp; Z clear */</div><div class='add'>+	0xF3F3,			/* LS == C clear || Z set */</div><div class='add'>+	0xAA55,			/* GE == (N==V)           */</div><div class='add'>+	0x55AA,			/* LT == (N!=V)           */</div><div class='add'>+	0x0A05,			/* GT == (!Z &amp;&amp; (N==V))   */</div><div class='add'>+	0xF5FA,			/* LE == (Z || (N!=V))    */</div><div class='add'>+	0xFFFF,			/* AL always              */</div><div class='add'>+	0			/* NV                     */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns:</div><div class='add'>+ * ARM_OPCODE_CONDTEST_FAIL   - if condition fails</div><div class='add'>+ * ARM_OPCODE_CONDTEST_PASS   - if condition passes (including AL)</div><div class='add'>+ * ARM_OPCODE_CONDTEST_UNCOND - if NV condition, or separate unconditional</div><div class='add'>+ *                              opcode space from v5 onwards</div><div class='add'>+ *</div><div class='add'>+ * Code that tests whether a conditional instruction would pass its condition</div><div class='add'>+ * check should check that return value == ARM_OPCODE_CONDTEST_PASS.</div><div class='add'>+ *</div><div class='add'>+ * Code that tests if a condition means that the instruction would be executed</div><div class='add'>+ * (regardless of conditional or unconditional) should instead check that the</div><div class='add'>+ * return value != ARM_OPCODE_CONDTEST_FAIL.</div><div class='add'>+ */</div><div class='add'>+asmlinkage unsigned int arm_check_condition(u32 opcode, u32 psr)</div><div class='add'>+{</div><div class='add'>+	u32 cc_bits  = opcode &gt;&gt; 28;</div><div class='add'>+	u32 psr_cond = psr &gt;&gt; 28;</div><div class='add'>+	unsigned int ret;</div><div class='add'>+</div><div class='add'>+	if (cc_bits != ARM_OPCODE_CONDITION_UNCOND) {</div><div class='add'>+		if ((cc_map[cc_bits] &gt;&gt; (psr_cond)) &amp; 1)</div><div class='add'>+			ret = ARM_OPCODE_CONDTEST_PASS;</div><div class='add'>+		else</div><div class='add'>+			ret = ARM_OPCODE_CONDTEST_FAIL;</div><div class='add'>+	} else {</div><div class='add'>+		ret = ARM_OPCODE_CONDTEST_UNCOND;</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(arm_check_condition);</div><div class='head'>diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c<br/>index 88b0941ce51e..5bb91bf3d47f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/perf_event.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/perf_event.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/perf_event.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/perf_event.c</a></div><div class='hunk'>@@ -59,8 +59,7 @@ armpmu_get_pmu_id(void)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(armpmu_get_pmu_id);</div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-armpmu_get_max_events(void)</div><div class='add'>+int perf_num_counters(void)</div><div class='ctx'> {</div><div class='ctx'> 	int max_events = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -69,12 +68,6 @@ armpmu_get_max_events(void)</div><div class='ctx'> </div><div class='ctx'> 	return max_events;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(armpmu_get_max_events);</div><div class='del'>-</div><div class='del'>-int perf_num_counters(void)</div><div class='del'>-{</div><div class='del'>-	return armpmu_get_max_events();</div><div class='del'>-}</div><div class='ctx'> EXPORT_SYMBOL_GPL(perf_num_counters);</div><div class='ctx'> </div><div class='ctx'> #define HW_OP_UNSUPPORTED		0xFFFF</div><div class='hunk'>@@ -380,6 +373,8 @@ armpmu_release_hardware(struct arm_pmu *armpmu)</div><div class='ctx'> {</div><div class='ctx'> 	int i, irq, irqs;</div><div class='ctx'> 	struct platform_device *pmu_device = armpmu-&gt;plat_device;</div><div class='add'>+	struct arm_pmu_platdata *plat =</div><div class='add'>+		dev_get_platdata(&amp;pmu_device-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	irqs = min(pmu_device-&gt;num_resources, num_possible_cpus());</div><div class='ctx'> </div><div class='hunk'>@@ -387,8 +382,11 @@ armpmu_release_hardware(struct arm_pmu *armpmu)</div><div class='ctx'> 		if (!cpumask_test_and_clear_cpu(i, &amp;armpmu-&gt;active_irqs))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		irq = platform_get_irq(pmu_device, i);</div><div class='del'>-		if (irq &gt;= 0)</div><div class='add'>+		if (irq &gt;= 0) {</div><div class='add'>+			if (plat &amp;&amp; plat-&gt;disable_irq)</div><div class='add'>+				plat-&gt;disable_irq(irq);</div><div class='ctx'> 			free_irq(irq, armpmu);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	release_pmu(armpmu-&gt;type);</div><div class='hunk'>@@ -448,7 +446,8 @@ armpmu_reserve_hardware(struct arm_pmu *armpmu)</div><div class='ctx'> 				irq);</div><div class='ctx'> 			armpmu_release_hardware(armpmu);</div><div class='ctx'> 			return err;</div><div class='del'>-		}</div><div class='add'>+		} else if (plat &amp;&amp; plat-&gt;enable_irq)</div><div class='add'>+			plat-&gt;enable_irq(irq);</div><div class='ctx'> </div><div class='ctx'> 		cpumask_set_cpu(i, &amp;armpmu-&gt;active_irqs);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm/kernel/perf_event_v6.c b/arch/arm/kernel/perf_event_v6.c<br/>index e63d8115c01b..533be9930ec2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/perf_event_v6.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/perf_event_v6.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/perf_event_v6.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/perf_event_v6.c</a></div><div class='hunk'>@@ -65,13 +65,15 @@ enum armv6_counters {</div><div class='ctx'>  * accesses/misses in hardware.</div><div class='ctx'>  */</div><div class='ctx'> static const unsigned armv6_perf_map[PERF_COUNT_HW_MAX] = {</div><div class='del'>-	[PERF_COUNT_HW_CPU_CYCLES]	    = ARMV6_PERFCTR_CPU_CYCLES,</div><div class='del'>-	[PERF_COUNT_HW_INSTRUCTIONS]	    = ARMV6_PERFCTR_INSTR_EXEC,</div><div class='del'>-	[PERF_COUNT_HW_CACHE_REFERENCES]    = HW_OP_UNSUPPORTED,</div><div class='del'>-	[PERF_COUNT_HW_CACHE_MISSES]	    = HW_OP_UNSUPPORTED,</div><div class='del'>-	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = ARMV6_PERFCTR_BR_EXEC,</div><div class='del'>-	[PERF_COUNT_HW_BRANCH_MISSES]	    = ARMV6_PERFCTR_BR_MISPREDICT,</div><div class='del'>-	[PERF_COUNT_HW_BUS_CYCLES]	    = HW_OP_UNSUPPORTED,</div><div class='add'>+	[PERF_COUNT_HW_CPU_CYCLES]		= ARMV6_PERFCTR_CPU_CYCLES,</div><div class='add'>+	[PERF_COUNT_HW_INSTRUCTIONS]		= ARMV6_PERFCTR_INSTR_EXEC,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_REFERENCES]	= HW_OP_UNSUPPORTED,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_MISSES]		= HW_OP_UNSUPPORTED,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS]	= ARMV6_PERFCTR_BR_EXEC,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_MISSES]		= ARMV6_PERFCTR_BR_MISPREDICT,</div><div class='add'>+	[PERF_COUNT_HW_BUS_CYCLES]		= HW_OP_UNSUPPORTED,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND]	= ARMV6_PERFCTR_IBUF_STALL,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_BACKEND]	= ARMV6_PERFCTR_LSU_FULL_STALL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned armv6_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='hunk'>@@ -218,13 +220,15 @@ enum armv6mpcore_perf_types {</div><div class='ctx'>  * accesses/misses in hardware.</div><div class='ctx'>  */</div><div class='ctx'> static const unsigned armv6mpcore_perf_map[PERF_COUNT_HW_MAX] = {</div><div class='del'>-	[PERF_COUNT_HW_CPU_CYCLES]	    = ARMV6MPCORE_PERFCTR_CPU_CYCLES,</div><div class='del'>-	[PERF_COUNT_HW_INSTRUCTIONS]	    = ARMV6MPCORE_PERFCTR_INSTR_EXEC,</div><div class='del'>-	[PERF_COUNT_HW_CACHE_REFERENCES]    = HW_OP_UNSUPPORTED,</div><div class='del'>-	[PERF_COUNT_HW_CACHE_MISSES]	    = HW_OP_UNSUPPORTED,</div><div class='del'>-	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = ARMV6MPCORE_PERFCTR_BR_EXEC,</div><div class='del'>-	[PERF_COUNT_HW_BRANCH_MISSES]	    = ARMV6MPCORE_PERFCTR_BR_MISPREDICT,</div><div class='del'>-	[PERF_COUNT_HW_BUS_CYCLES]	    = HW_OP_UNSUPPORTED,</div><div class='add'>+	[PERF_COUNT_HW_CPU_CYCLES]		= ARMV6MPCORE_PERFCTR_CPU_CYCLES,</div><div class='add'>+	[PERF_COUNT_HW_INSTRUCTIONS]		= ARMV6MPCORE_PERFCTR_INSTR_EXEC,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_REFERENCES]	= HW_OP_UNSUPPORTED,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_MISSES]		= HW_OP_UNSUPPORTED,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS]	= ARMV6MPCORE_PERFCTR_BR_EXEC,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_MISSES]		= ARMV6MPCORE_PERFCTR_BR_MISPREDICT,</div><div class='add'>+	[PERF_COUNT_HW_BUS_CYCLES]		= HW_OP_UNSUPPORTED,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND]	= ARMV6MPCORE_PERFCTR_IBUF_STALL,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_BACKEND]	= ARMV6MPCORE_PERFCTR_LSU_FULL_STALL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned armv6mpcore_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='head'>diff --git a/arch/arm/kernel/perf_event_v7.c b/arch/arm/kernel/perf_event_v7.c<br/>index 1ef6d0034b85..460bbbb6b885 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/perf_event_v7.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/perf_event_v7.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/perf_event_v7.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/perf_event_v7.c</a></div><div class='hunk'>@@ -28,165 +28,87 @@ static struct arm_pmu armv7pmu;</div><div class='ctx'>  * they are not available.</div><div class='ctx'>  */</div><div class='ctx'> enum armv7_perf_types {</div><div class='del'>-	ARMV7_PERFCTR_PMNC_SW_INCR		= 0x00,</div><div class='del'>-	ARMV7_PERFCTR_IFETCH_MISS		= 0x01,</div><div class='del'>-	ARMV7_PERFCTR_ITLB_MISS			= 0x02,</div><div class='del'>-	ARMV7_PERFCTR_DCACHE_REFILL		= 0x03,	/* L1 */</div><div class='del'>-	ARMV7_PERFCTR_DCACHE_ACCESS		= 0x04,	/* L1 */</div><div class='del'>-	ARMV7_PERFCTR_DTLB_REFILL		= 0x05,</div><div class='del'>-	ARMV7_PERFCTR_DREAD			= 0x06,</div><div class='del'>-	ARMV7_PERFCTR_DWRITE			= 0x07,</div><div class='del'>-	ARMV7_PERFCTR_INSTR_EXECUTED		= 0x08,</div><div class='del'>-	ARMV7_PERFCTR_EXC_TAKEN			= 0x09,</div><div class='del'>-	ARMV7_PERFCTR_EXC_EXECUTED		= 0x0A,</div><div class='del'>-	ARMV7_PERFCTR_CID_WRITE			= 0x0B,</div><div class='del'>-	/* ARMV7_PERFCTR_PC_WRITE is equivalent to HW_BRANCH_INSTRUCTIONS.</div><div class='add'>+	ARMV7_PERFCTR_PMNC_SW_INCR			= 0x00,</div><div class='add'>+	ARMV7_PERFCTR_L1_ICACHE_REFILL			= 0x01,</div><div class='add'>+	ARMV7_PERFCTR_ITLB_REFILL			= 0x02,</div><div class='add'>+	ARMV7_PERFCTR_L1_DCACHE_REFILL			= 0x03,</div><div class='add'>+	ARMV7_PERFCTR_L1_DCACHE_ACCESS			= 0x04,</div><div class='add'>+	ARMV7_PERFCTR_DTLB_REFILL			= 0x05,</div><div class='add'>+	ARMV7_PERFCTR_MEM_READ				= 0x06,</div><div class='add'>+	ARMV7_PERFCTR_MEM_WRITE				= 0x07,</div><div class='add'>+	ARMV7_PERFCTR_INSTR_EXECUTED			= 0x08,</div><div class='add'>+	ARMV7_PERFCTR_EXC_TAKEN				= 0x09,</div><div class='add'>+	ARMV7_PERFCTR_EXC_EXECUTED			= 0x0A,</div><div class='add'>+	ARMV7_PERFCTR_CID_WRITE				= 0x0B,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ARMV7_PERFCTR_PC_WRITE is equivalent to HW_BRANCH_INSTRUCTIONS.</div><div class='ctx'> 	 * It counts:</div><div class='del'>-	 *  - all branch instructions,</div><div class='add'>+	 *  - all (taken) branch instructions,</div><div class='ctx'> 	 *  - instructions that explicitly write the PC,</div><div class='ctx'> 	 *  - exception generating instructions.</div><div class='ctx'> 	 */</div><div class='del'>-	ARMV7_PERFCTR_PC_WRITE			= 0x0C,</div><div class='del'>-	ARMV7_PERFCTR_PC_IMM_BRANCH		= 0x0D,</div><div class='del'>-	ARMV7_PERFCTR_PC_PROC_RETURN		= 0x0E,</div><div class='del'>-	ARMV7_PERFCTR_UNALIGNED_ACCESS		= 0x0F,</div><div class='add'>+	ARMV7_PERFCTR_PC_WRITE				= 0x0C,</div><div class='add'>+	ARMV7_PERFCTR_PC_IMM_BRANCH			= 0x0D,</div><div class='add'>+	ARMV7_PERFCTR_PC_PROC_RETURN			= 0x0E,</div><div class='add'>+	ARMV7_PERFCTR_MEM_UNALIGNED_ACCESS		= 0x0F,</div><div class='add'>+	ARMV7_PERFCTR_PC_BRANCH_MIS_PRED		= 0x10,</div><div class='add'>+	ARMV7_PERFCTR_CLOCK_CYCLES			= 0x11,</div><div class='add'>+	ARMV7_PERFCTR_PC_BRANCH_PRED			= 0x12,</div><div class='ctx'> </div><div class='ctx'> 	/* These events are defined by the PMUv2 supplement (ARM DDI 0457A). */</div><div class='del'>-	ARMV7_PERFCTR_PC_BRANCH_MIS_PRED	= 0x10,</div><div class='del'>-	ARMV7_PERFCTR_CLOCK_CYCLES		= 0x11,</div><div class='del'>-	ARMV7_PERFCTR_PC_BRANCH_PRED		= 0x12,</div><div class='del'>-	ARMV7_PERFCTR_MEM_ACCESS		= 0x13,</div><div class='del'>-	ARMV7_PERFCTR_L1_ICACHE_ACCESS		= 0x14,</div><div class='del'>-	ARMV7_PERFCTR_L1_DCACHE_WB		= 0x15,</div><div class='del'>-	ARMV7_PERFCTR_L2_DCACHE_ACCESS		= 0x16,</div><div class='del'>-	ARMV7_PERFCTR_L2_DCACHE_REFILL		= 0x17,</div><div class='del'>-	ARMV7_PERFCTR_L2_DCACHE_WB		= 0x18,</div><div class='del'>-	ARMV7_PERFCTR_BUS_ACCESS		= 0x19,</div><div class='del'>-	ARMV7_PERFCTR_MEMORY_ERROR		= 0x1A,</div><div class='del'>-	ARMV7_PERFCTR_INSTR_SPEC		= 0x1B,</div><div class='del'>-	ARMV7_PERFCTR_TTBR_WRITE		= 0x1C,</div><div class='del'>-	ARMV7_PERFCTR_BUS_CYCLES		= 0x1D,</div><div class='del'>-</div><div class='del'>-	ARMV7_PERFCTR_CPU_CYCLES		= 0xFF</div><div class='add'>+	ARMV7_PERFCTR_MEM_ACCESS			= 0x13,</div><div class='add'>+	ARMV7_PERFCTR_L1_ICACHE_ACCESS			= 0x14,</div><div class='add'>+	ARMV7_PERFCTR_L1_DCACHE_WB			= 0x15,</div><div class='add'>+	ARMV7_PERFCTR_L2_CACHE_ACCESS			= 0x16,</div><div class='add'>+	ARMV7_PERFCTR_L2_CACHE_REFILL			= 0x17,</div><div class='add'>+	ARMV7_PERFCTR_L2_CACHE_WB			= 0x18,</div><div class='add'>+	ARMV7_PERFCTR_BUS_ACCESS			= 0x19,</div><div class='add'>+	ARMV7_PERFCTR_MEM_ERROR				= 0x1A,</div><div class='add'>+	ARMV7_PERFCTR_INSTR_SPEC			= 0x1B,</div><div class='add'>+	ARMV7_PERFCTR_TTBR_WRITE			= 0x1C,</div><div class='add'>+	ARMV7_PERFCTR_BUS_CYCLES			= 0x1D,</div><div class='add'>+</div><div class='add'>+	ARMV7_PERFCTR_CPU_CYCLES			= 0xFF</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ARMv7 Cortex-A8 specific event types */</div><div class='ctx'> enum armv7_a8_perf_types {</div><div class='del'>-	ARMV7_PERFCTR_WRITE_BUFFER_FULL		= 0x40,</div><div class='del'>-	ARMV7_PERFCTR_L2_STORE_MERGED		= 0x41,</div><div class='del'>-	ARMV7_PERFCTR_L2_STORE_BUFF		= 0x42,</div><div class='del'>-	ARMV7_PERFCTR_L2_ACCESS			= 0x43,</div><div class='del'>-	ARMV7_PERFCTR_L2_CACH_MISS		= 0x44,</div><div class='del'>-	ARMV7_PERFCTR_AXI_READ_CYCLES		= 0x45,</div><div class='del'>-	ARMV7_PERFCTR_AXI_WRITE_CYCLES		= 0x46,</div><div class='del'>-	ARMV7_PERFCTR_MEMORY_REPLAY		= 0x47,</div><div class='del'>-	ARMV7_PERFCTR_UNALIGNED_ACCESS_REPLAY	= 0x48,</div><div class='del'>-	ARMV7_PERFCTR_L1_DATA_MISS		= 0x49,</div><div class='del'>-	ARMV7_PERFCTR_L1_INST_MISS		= 0x4A,</div><div class='del'>-	ARMV7_PERFCTR_L1_DATA_COLORING		= 0x4B,</div><div class='del'>-	ARMV7_PERFCTR_L1_NEON_DATA		= 0x4C,</div><div class='del'>-	ARMV7_PERFCTR_L1_NEON_CACH_DATA		= 0x4D,</div><div class='del'>-	ARMV7_PERFCTR_L2_NEON			= 0x4E,</div><div class='del'>-	ARMV7_PERFCTR_L2_NEON_HIT		= 0x4F,</div><div class='del'>-	ARMV7_PERFCTR_L1_INST			= 0x50,</div><div class='del'>-	ARMV7_PERFCTR_PC_RETURN_MIS_PRED	= 0x51,</div><div class='del'>-	ARMV7_PERFCTR_PC_BRANCH_FAILED		= 0x52,</div><div class='del'>-	ARMV7_PERFCTR_PC_BRANCH_TAKEN		= 0x53,</div><div class='del'>-	ARMV7_PERFCTR_PC_BRANCH_EXECUTED	= 0x54,</div><div class='del'>-	ARMV7_PERFCTR_OP_EXECUTED		= 0x55,</div><div class='del'>-	ARMV7_PERFCTR_CYCLES_INST_STALL		= 0x56,</div><div class='del'>-	ARMV7_PERFCTR_CYCLES_INST		= 0x57,</div><div class='del'>-	ARMV7_PERFCTR_CYCLES_NEON_DATA_STALL	= 0x58,</div><div class='del'>-	ARMV7_PERFCTR_CYCLES_NEON_INST_STALL	= 0x59,</div><div class='del'>-	ARMV7_PERFCTR_NEON_CYCLES		= 0x5A,</div><div class='del'>-</div><div class='del'>-	ARMV7_PERFCTR_PMU0_EVENTS		= 0x70,</div><div class='del'>-	ARMV7_PERFCTR_PMU1_EVENTS		= 0x71,</div><div class='del'>-	ARMV7_PERFCTR_PMU_EVENTS		= 0x72,</div><div class='add'>+	ARMV7_A8_PERFCTR_L2_CACHE_ACCESS		= 0x43,</div><div class='add'>+	ARMV7_A8_PERFCTR_L2_CACHE_REFILL		= 0x44,</div><div class='add'>+	ARMV7_A8_PERFCTR_L1_ICACHE_ACCESS		= 0x50,</div><div class='add'>+	ARMV7_A8_PERFCTR_STALL_ISIDE			= 0x56,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ARMv7 Cortex-A9 specific event types */</div><div class='ctx'> enum armv7_a9_perf_types {</div><div class='del'>-	ARMV7_PERFCTR_JAVA_HW_BYTECODE_EXEC	= 0x40,</div><div class='del'>-	ARMV7_PERFCTR_JAVA_SW_BYTECODE_EXEC	= 0x41,</div><div class='del'>-	ARMV7_PERFCTR_JAZELLE_BRANCH_EXEC	= 0x42,</div><div class='del'>-</div><div class='del'>-	ARMV7_PERFCTR_COHERENT_LINE_MISS	= 0x50,</div><div class='del'>-	ARMV7_PERFCTR_COHERENT_LINE_HIT		= 0x51,</div><div class='del'>-</div><div class='del'>-	ARMV7_PERFCTR_ICACHE_DEP_STALL_CYCLES	= 0x60,</div><div class='del'>-	ARMV7_PERFCTR_DCACHE_DEP_STALL_CYCLES	= 0x61,</div><div class='del'>-	ARMV7_PERFCTR_TLB_MISS_DEP_STALL_CYCLES	= 0x62,</div><div class='del'>-	ARMV7_PERFCTR_STREX_EXECUTED_PASSED	= 0x63,</div><div class='del'>-	ARMV7_PERFCTR_STREX_EXECUTED_FAILED	= 0x64,</div><div class='del'>-	ARMV7_PERFCTR_DATA_EVICTION		= 0x65,</div><div class='del'>-	ARMV7_PERFCTR_ISSUE_STAGE_NO_INST	= 0x66,</div><div class='del'>-	ARMV7_PERFCTR_ISSUE_STAGE_EMPTY		= 0x67,</div><div class='del'>-	ARMV7_PERFCTR_INST_OUT_OF_RENAME_STAGE	= 0x68,</div><div class='del'>-</div><div class='del'>-	ARMV7_PERFCTR_PREDICTABLE_FUNCT_RETURNS	= 0x6E,</div><div class='del'>-</div><div class='del'>-	ARMV7_PERFCTR_MAIN_UNIT_EXECUTED_INST	= 0x70,</div><div class='del'>-	ARMV7_PERFCTR_SECOND_UNIT_EXECUTED_INST	= 0x71,</div><div class='del'>-	ARMV7_PERFCTR_LD_ST_UNIT_EXECUTED_INST	= 0x72,</div><div class='del'>-	ARMV7_PERFCTR_FP_EXECUTED_INST		= 0x73,</div><div class='del'>-	ARMV7_PERFCTR_NEON_EXECUTED_INST	= 0x74,</div><div class='del'>-</div><div class='del'>-	ARMV7_PERFCTR_PLD_FULL_DEP_STALL_CYCLES	= 0x80,</div><div class='del'>-	ARMV7_PERFCTR_DATA_WR_DEP_STALL_CYCLES	= 0x81,</div><div class='del'>-	ARMV7_PERFCTR_ITLB_MISS_DEP_STALL_CYCLES	= 0x82,</div><div class='del'>-	ARMV7_PERFCTR_DTLB_MISS_DEP_STALL_CYCLES	= 0x83,</div><div class='del'>-	ARMV7_PERFCTR_MICRO_ITLB_MISS_DEP_STALL_CYCLES	= 0x84,</div><div class='del'>-	ARMV7_PERFCTR_MICRO_DTLB_MISS_DEP_STALL_CYCLES	= 0x85,</div><div class='del'>-	ARMV7_PERFCTR_DMB_DEP_STALL_CYCLES	= 0x86,</div><div class='del'>-</div><div class='del'>-	ARMV7_PERFCTR_INTGR_CLK_ENABLED_CYCLES	= 0x8A,</div><div class='del'>-	ARMV7_PERFCTR_DATA_ENGINE_CLK_EN_CYCLES	= 0x8B,</div><div class='del'>-</div><div class='del'>-	ARMV7_PERFCTR_ISB_INST			= 0x90,</div><div class='del'>-	ARMV7_PERFCTR_DSB_INST			= 0x91,</div><div class='del'>-	ARMV7_PERFCTR_DMB_INST			= 0x92,</div><div class='del'>-	ARMV7_PERFCTR_EXT_INTERRUPTS		= 0x93,</div><div class='del'>-</div><div class='del'>-	ARMV7_PERFCTR_PLE_CACHE_LINE_RQST_COMPLETED	= 0xA0,</div><div class='del'>-	ARMV7_PERFCTR_PLE_CACHE_LINE_RQST_SKIPPED	= 0xA1,</div><div class='del'>-	ARMV7_PERFCTR_PLE_FIFO_FLUSH		= 0xA2,</div><div class='del'>-	ARMV7_PERFCTR_PLE_RQST_COMPLETED	= 0xA3,</div><div class='del'>-	ARMV7_PERFCTR_PLE_FIFO_OVERFLOW		= 0xA4,</div><div class='del'>-	ARMV7_PERFCTR_PLE_RQST_PROG		= 0xA5</div><div class='add'>+	ARMV7_A9_PERFCTR_INSTR_CORE_RENAME		= 0x68,</div><div class='add'>+	ARMV7_A9_PERFCTR_STALL_ICACHE			= 0x60,</div><div class='add'>+	ARMV7_A9_PERFCTR_STALL_DISPATCH			= 0x66,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ARMv7 Cortex-A5 specific event types */</div><div class='ctx'> enum armv7_a5_perf_types {</div><div class='del'>-	ARMV7_PERFCTR_IRQ_TAKEN			= 0x86,</div><div class='del'>-	ARMV7_PERFCTR_FIQ_TAKEN			= 0x87,</div><div class='del'>-</div><div class='del'>-	ARMV7_PERFCTR_EXT_MEM_RQST		= 0xc0,</div><div class='del'>-	ARMV7_PERFCTR_NC_EXT_MEM_RQST		= 0xc1,</div><div class='del'>-	ARMV7_PERFCTR_PREFETCH_LINEFILL		= 0xc2,</div><div class='del'>-	ARMV7_PERFCTR_PREFETCH_LINEFILL_DROP	= 0xc3,</div><div class='del'>-	ARMV7_PERFCTR_ENTER_READ_ALLOC		= 0xc4,</div><div class='del'>-	ARMV7_PERFCTR_READ_ALLOC		= 0xc5,</div><div class='del'>-</div><div class='del'>-	ARMV7_PERFCTR_STALL_SB_FULL		= 0xc9,</div><div class='add'>+	ARMV7_A5_PERFCTR_PREFETCH_LINEFILL		= 0xc2,</div><div class='add'>+	ARMV7_A5_PERFCTR_PREFETCH_LINEFILL_DROP		= 0xc3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ARMv7 Cortex-A15 specific event types */</div><div class='ctx'> enum armv7_a15_perf_types {</div><div class='del'>-	ARMV7_PERFCTR_L1_DCACHE_READ_ACCESS	= 0x40,</div><div class='del'>-	ARMV7_PERFCTR_L1_DCACHE_WRITE_ACCESS	= 0x41,</div><div class='del'>-	ARMV7_PERFCTR_L1_DCACHE_READ_REFILL	= 0x42,</div><div class='del'>-	ARMV7_PERFCTR_L1_DCACHE_WRITE_REFILL	= 0x43,</div><div class='add'>+	ARMV7_A15_PERFCTR_L1_DCACHE_ACCESS_READ		= 0x40,</div><div class='add'>+	ARMV7_A15_PERFCTR_L1_DCACHE_ACCESS_WRITE	= 0x41,</div><div class='add'>+	ARMV7_A15_PERFCTR_L1_DCACHE_REFILL_READ		= 0x42,</div><div class='add'>+	ARMV7_A15_PERFCTR_L1_DCACHE_REFILL_WRITE	= 0x43,</div><div class='ctx'> </div><div class='del'>-	ARMV7_PERFCTR_L1_DTLB_READ_REFILL	= 0x4C,</div><div class='del'>-	ARMV7_PERFCTR_L1_DTLB_WRITE_REFILL	= 0x4D,</div><div class='add'>+	ARMV7_A15_PERFCTR_DTLB_REFILL_L1_READ		= 0x4C,</div><div class='add'>+	ARMV7_A15_PERFCTR_DTLB_REFILL_L1_WRITE		= 0x4D,</div><div class='ctx'> </div><div class='del'>-	ARMV7_PERFCTR_L2_DCACHE_READ_ACCESS	= 0x50,</div><div class='del'>-	ARMV7_PERFCTR_L2_DCACHE_WRITE_ACCESS	= 0x51,</div><div class='del'>-	ARMV7_PERFCTR_L2_DCACHE_READ_REFILL	= 0x52,</div><div class='del'>-	ARMV7_PERFCTR_L2_DCACHE_WRITE_REFILL	= 0x53,</div><div class='add'>+	ARMV7_A15_PERFCTR_L2_CACHE_ACCESS_READ		= 0x50,</div><div class='add'>+	ARMV7_A15_PERFCTR_L2_CACHE_ACCESS_WRITE		= 0x51,</div><div class='add'>+	ARMV7_A15_PERFCTR_L2_CACHE_REFILL_READ		= 0x52,</div><div class='add'>+	ARMV7_A15_PERFCTR_L2_CACHE_REFILL_WRITE		= 0x53,</div><div class='ctx'> </div><div class='del'>-	ARMV7_PERFCTR_SPEC_PC_WRITE		= 0x76,</div><div class='add'>+	ARMV7_A15_PERFCTR_PC_WRITE_SPEC			= 0x76,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -197,13 +119,15 @@ enum armv7_a15_perf_types {</div><div class='ctx'>  * accesses/misses in hardware.</div><div class='ctx'>  */</div><div class='ctx'> static const unsigned armv7_a8_perf_map[PERF_COUNT_HW_MAX] = {</div><div class='del'>-	[PERF_COUNT_HW_CPU_CYCLES]	    = ARMV7_PERFCTR_CPU_CYCLES,</div><div class='del'>-	[PERF_COUNT_HW_INSTRUCTIONS]	    = ARMV7_PERFCTR_INSTR_EXECUTED,</div><div class='del'>-	[PERF_COUNT_HW_CACHE_REFERENCES]    = HW_OP_UNSUPPORTED,</div><div class='del'>-	[PERF_COUNT_HW_CACHE_MISSES]	    = HW_OP_UNSUPPORTED,</div><div class='del'>-	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = ARMV7_PERFCTR_PC_WRITE,</div><div class='del'>-	[PERF_COUNT_HW_BRANCH_MISSES]	    = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='del'>-	[PERF_COUNT_HW_BUS_CYCLES]	    = ARMV7_PERFCTR_CLOCK_CYCLES,</div><div class='add'>+	[PERF_COUNT_HW_CPU_CYCLES]		= ARMV7_PERFCTR_CPU_CYCLES,</div><div class='add'>+	[PERF_COUNT_HW_INSTRUCTIONS]		= ARMV7_PERFCTR_INSTR_EXECUTED,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_REFERENCES]	= ARMV7_PERFCTR_L1_DCACHE_ACCESS,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_MISSES]		= ARMV7_PERFCTR_L1_DCACHE_REFILL,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS]	= ARMV7_PERFCTR_PC_WRITE,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_MISSES]		= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='add'>+	[PERF_COUNT_HW_BUS_CYCLES]		= HW_OP_UNSUPPORTED,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND]	= ARMV7_A8_PERFCTR_STALL_ISIDE,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_BACKEND]	= HW_OP_UNSUPPORTED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned armv7_a8_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='hunk'>@@ -217,12 +141,12 @@ static const unsigned armv7_a8_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 		 * combined.</div><div class='ctx'> 		 */</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_DCACHE_ACCESS,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_DCACHE_REFILL,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_L1_DCACHE_ACCESS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_L1_DCACHE_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_DCACHE_ACCESS,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_DCACHE_REFILL,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_L1_DCACHE_ACCESS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_L1_DCACHE_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='hunk'>@@ -231,12 +155,12 @@ static const unsigned armv7_a8_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 	},</div><div class='ctx'> 	[C(L1I)] = {</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_L1_INST,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_L1_INST_MISS,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_A8_PERFCTR_L1_ICACHE_ACCESS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_L1_ICACHE_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_L1_INST,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_L1_INST_MISS,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_A8_PERFCTR_L1_ICACHE_ACCESS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_L1_ICACHE_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='hunk'>@@ -245,12 +169,12 @@ static const unsigned armv7_a8_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 	},</div><div class='ctx'> 	[C(LL)] = {</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_L2_ACCESS,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_L2_CACH_MISS,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_A8_PERFCTR_L2_CACHE_ACCESS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_A8_PERFCTR_L2_CACHE_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_L2_ACCESS,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_L2_CACH_MISS,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_A8_PERFCTR_L2_CACHE_ACCESS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_A8_PERFCTR_L2_CACHE_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='hunk'>@@ -274,11 +198,11 @@ static const unsigned armv7_a8_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 	[C(ITLB)] = {</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_ITLB_MISS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_ITLB_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_ITLB_MISS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_ITLB_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='hunk'>@@ -287,14 +211,12 @@ static const unsigned armv7_a8_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 	},</div><div class='ctx'> 	[C(BPU)] = {</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_PC_WRITE,</div><div class='del'>-			[C(RESULT_MISS)]</div><div class='del'>-					= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_PC_BRANCH_PRED,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_PC_WRITE,</div><div class='del'>-			[C(RESULT_MISS)]</div><div class='del'>-					= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_PC_BRANCH_PRED,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='hunk'>@@ -321,14 +243,15 @@ static const unsigned armv7_a8_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'>  * Cortex-A9 HW events mapping</div><div class='ctx'>  */</div><div class='ctx'> static const unsigned armv7_a9_perf_map[PERF_COUNT_HW_MAX] = {</div><div class='del'>-	[PERF_COUNT_HW_CPU_CYCLES]	    = ARMV7_PERFCTR_CPU_CYCLES,</div><div class='del'>-	[PERF_COUNT_HW_INSTRUCTIONS]	    =</div><div class='del'>-					ARMV7_PERFCTR_INST_OUT_OF_RENAME_STAGE,</div><div class='del'>-	[PERF_COUNT_HW_CACHE_REFERENCES]    = ARMV7_PERFCTR_DCACHE_ACCESS,</div><div class='del'>-	[PERF_COUNT_HW_CACHE_MISSES]	    = ARMV7_PERFCTR_DCACHE_REFILL,</div><div class='del'>-	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = ARMV7_PERFCTR_PC_WRITE,</div><div class='del'>-	[PERF_COUNT_HW_BRANCH_MISSES]	    = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='del'>-	[PERF_COUNT_HW_BUS_CYCLES]	    = ARMV7_PERFCTR_CLOCK_CYCLES,</div><div class='add'>+	[PERF_COUNT_HW_CPU_CYCLES]		= ARMV7_PERFCTR_CPU_CYCLES,</div><div class='add'>+	[PERF_COUNT_HW_INSTRUCTIONS]		= ARMV7_A9_PERFCTR_INSTR_CORE_RENAME,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_REFERENCES]	= ARMV7_PERFCTR_L1_DCACHE_ACCESS,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_MISSES]		= ARMV7_PERFCTR_L1_DCACHE_REFILL,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS]	= ARMV7_PERFCTR_PC_WRITE,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_MISSES]		= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='add'>+	[PERF_COUNT_HW_BUS_CYCLES]		= HW_OP_UNSUPPORTED,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND]	= ARMV7_A9_PERFCTR_STALL_ICACHE,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_BACKEND]	= ARMV7_A9_PERFCTR_STALL_DISPATCH,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned armv7_a9_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='hunk'>@@ -342,12 +265,12 @@ static const unsigned armv7_a9_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 		 * combined.</div><div class='ctx'> 		 */</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_DCACHE_ACCESS,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_DCACHE_REFILL,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_L1_DCACHE_ACCESS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_L1_DCACHE_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_DCACHE_ACCESS,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_DCACHE_REFILL,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_L1_DCACHE_ACCESS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_L1_DCACHE_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='hunk'>@@ -357,11 +280,11 @@ static const unsigned armv7_a9_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 	[C(L1I)] = {</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_IFETCH_MISS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_L1_ICACHE_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_IFETCH_MISS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_L1_ICACHE_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='hunk'>@@ -399,11 +322,11 @@ static const unsigned armv7_a9_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 	[C(ITLB)] = {</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_ITLB_MISS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_ITLB_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_ITLB_MISS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_ITLB_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='hunk'>@@ -412,14 +335,12 @@ static const unsigned armv7_a9_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 	},</div><div class='ctx'> 	[C(BPU)] = {</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_PC_WRITE,</div><div class='del'>-			[C(RESULT_MISS)]</div><div class='del'>-					= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_PC_BRANCH_PRED,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_PC_WRITE,</div><div class='del'>-			[C(RESULT_MISS)]</div><div class='del'>-					= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_PC_BRANCH_PRED,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='hunk'>@@ -446,13 +367,15 @@ static const unsigned armv7_a9_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'>  * Cortex-A5 HW events mapping</div><div class='ctx'>  */</div><div class='ctx'> static const unsigned armv7_a5_perf_map[PERF_COUNT_HW_MAX] = {</div><div class='del'>-	[PERF_COUNT_HW_CPU_CYCLES]	    = ARMV7_PERFCTR_CPU_CYCLES,</div><div class='del'>-	[PERF_COUNT_HW_INSTRUCTIONS]	    = ARMV7_PERFCTR_INSTR_EXECUTED,</div><div class='del'>-	[PERF_COUNT_HW_CACHE_REFERENCES]    = HW_OP_UNSUPPORTED,</div><div class='del'>-	[PERF_COUNT_HW_CACHE_MISSES]	    = HW_OP_UNSUPPORTED,</div><div class='del'>-	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = ARMV7_PERFCTR_PC_WRITE,</div><div class='del'>-	[PERF_COUNT_HW_BRANCH_MISSES]	    = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='del'>-	[PERF_COUNT_HW_BUS_CYCLES]	    = HW_OP_UNSUPPORTED,</div><div class='add'>+	[PERF_COUNT_HW_CPU_CYCLES]		= ARMV7_PERFCTR_CPU_CYCLES,</div><div class='add'>+	[PERF_COUNT_HW_INSTRUCTIONS]		= ARMV7_PERFCTR_INSTR_EXECUTED,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_REFERENCES]	= ARMV7_PERFCTR_L1_DCACHE_ACCESS,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_MISSES]		= ARMV7_PERFCTR_L1_DCACHE_REFILL,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS]	= ARMV7_PERFCTR_PC_WRITE,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_MISSES]		= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='add'>+	[PERF_COUNT_HW_BUS_CYCLES]		= HW_OP_UNSUPPORTED,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND]	= HW_OP_UNSUPPORTED,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_BACKEND]	= HW_OP_UNSUPPORTED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned armv7_a5_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='hunk'>@@ -460,42 +383,34 @@ static const unsigned armv7_a5_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 					[PERF_COUNT_HW_CACHE_RESULT_MAX] = {</div><div class='ctx'> 	[C(L1D)] = {</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]</div><div class='del'>-					= ARMV7_PERFCTR_DCACHE_ACCESS,</div><div class='del'>-			[C(RESULT_MISS)]</div><div class='del'>-					= ARMV7_PERFCTR_DCACHE_REFILL,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_L1_DCACHE_ACCESS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_L1_DCACHE_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]</div><div class='del'>-					= ARMV7_PERFCTR_DCACHE_ACCESS,</div><div class='del'>-			[C(RESULT_MISS)]</div><div class='del'>-					= ARMV7_PERFCTR_DCACHE_REFILL,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_L1_DCACHE_ACCESS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_L1_DCACHE_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]</div><div class='del'>-					= ARMV7_PERFCTR_PREFETCH_LINEFILL,</div><div class='del'>-			[C(RESULT_MISS)]</div><div class='del'>-					= ARMV7_PERFCTR_PREFETCH_LINEFILL_DROP,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_A5_PERFCTR_PREFETCH_LINEFILL,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_A5_PERFCTR_PREFETCH_LINEFILL_DROP,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	[C(L1I)] = {</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_L1_ICACHE_ACCESS,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_IFETCH_MISS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_L1_ICACHE_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_L1_ICACHE_ACCESS,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_IFETCH_MISS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_L1_ICACHE_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The prefetch counters don't differentiate between the I</div><div class='ctx'> 		 * side and the D side.</div><div class='ctx'> 		 */</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]</div><div class='del'>-					= ARMV7_PERFCTR_PREFETCH_LINEFILL,</div><div class='del'>-			[C(RESULT_MISS)]</div><div class='del'>-					= ARMV7_PERFCTR_PREFETCH_LINEFILL_DROP,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_A5_PERFCTR_PREFETCH_LINEFILL,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_A5_PERFCTR_PREFETCH_LINEFILL_DROP,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	[C(LL)] = {</div><div class='hunk'>@@ -529,11 +444,11 @@ static const unsigned armv7_a5_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 	[C(ITLB)] = {</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_ITLB_MISS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_ITLB_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_ITLB_MISS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_ITLB_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='hunk'>@@ -543,13 +458,11 @@ static const unsigned armv7_a5_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 	[C(BPU)] = {</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_PC_BRANCH_PRED,</div><div class='del'>-			[C(RESULT_MISS)]</div><div class='del'>-					= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_PC_BRANCH_PRED,</div><div class='del'>-			[C(RESULT_MISS)]</div><div class='del'>-					= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='hunk'>@@ -562,13 +475,15 @@ static const unsigned armv7_a5_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'>  * Cortex-A15 HW events mapping</div><div class='ctx'>  */</div><div class='ctx'> static const unsigned armv7_a15_perf_map[PERF_COUNT_HW_MAX] = {</div><div class='del'>-	[PERF_COUNT_HW_CPU_CYCLES]	    = ARMV7_PERFCTR_CPU_CYCLES,</div><div class='del'>-	[PERF_COUNT_HW_INSTRUCTIONS]	    = ARMV7_PERFCTR_INSTR_EXECUTED,</div><div class='del'>-	[PERF_COUNT_HW_CACHE_REFERENCES]    = HW_OP_UNSUPPORTED,</div><div class='del'>-	[PERF_COUNT_HW_CACHE_MISSES]	    = HW_OP_UNSUPPORTED,</div><div class='del'>-	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = ARMV7_PERFCTR_SPEC_PC_WRITE,</div><div class='del'>-	[PERF_COUNT_HW_BRANCH_MISSES]	    = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='del'>-	[PERF_COUNT_HW_BUS_CYCLES]	    = ARMV7_PERFCTR_BUS_CYCLES,</div><div class='add'>+	[PERF_COUNT_HW_CPU_CYCLES]		= ARMV7_PERFCTR_CPU_CYCLES,</div><div class='add'>+	[PERF_COUNT_HW_INSTRUCTIONS]		= ARMV7_PERFCTR_INSTR_EXECUTED,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_REFERENCES]	= ARMV7_PERFCTR_L1_DCACHE_ACCESS,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_MISSES]		= ARMV7_PERFCTR_L1_DCACHE_REFILL,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS]	= ARMV7_A15_PERFCTR_PC_WRITE_SPEC,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_MISSES]		= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='add'>+	[PERF_COUNT_HW_BUS_CYCLES]		= ARMV7_PERFCTR_BUS_CYCLES,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND]	= HW_OP_UNSUPPORTED,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_BACKEND]	= HW_OP_UNSUPPORTED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned armv7_a15_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='hunk'>@@ -576,16 +491,12 @@ static const unsigned armv7_a15_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 					[PERF_COUNT_HW_CACHE_RESULT_MAX] = {</div><div class='ctx'> 	[C(L1D)] = {</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]</div><div class='del'>-					= ARMV7_PERFCTR_L1_DCACHE_READ_ACCESS,</div><div class='del'>-			[C(RESULT_MISS)]</div><div class='del'>-					= ARMV7_PERFCTR_L1_DCACHE_READ_REFILL,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_A15_PERFCTR_L1_DCACHE_ACCESS_READ,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_A15_PERFCTR_L1_DCACHE_REFILL_READ,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]</div><div class='del'>-					= ARMV7_PERFCTR_L1_DCACHE_WRITE_ACCESS,</div><div class='del'>-			[C(RESULT_MISS)]</div><div class='del'>-					= ARMV7_PERFCTR_L1_DCACHE_WRITE_REFILL,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_A15_PERFCTR_L1_DCACHE_ACCESS_WRITE,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_A15_PERFCTR_L1_DCACHE_REFILL_WRITE,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='hunk'>@@ -601,11 +512,11 @@ static const unsigned armv7_a15_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 		 */</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_L1_ICACHE_ACCESS,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_IFETCH_MISS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_L1_ICACHE_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_L1_ICACHE_ACCESS,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_IFETCH_MISS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_L1_ICACHE_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='hunk'>@@ -614,16 +525,12 @@ static const unsigned armv7_a15_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 	},</div><div class='ctx'> 	[C(LL)] = {</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]</div><div class='del'>-					= ARMV7_PERFCTR_L2_DCACHE_READ_ACCESS,</div><div class='del'>-			[C(RESULT_MISS)]</div><div class='del'>-					= ARMV7_PERFCTR_L2_DCACHE_READ_REFILL,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_A15_PERFCTR_L2_CACHE_ACCESS_READ,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_A15_PERFCTR_L2_CACHE_REFILL_READ,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='del'>-			[C(RESULT_ACCESS)]</div><div class='del'>-					= ARMV7_PERFCTR_L2_DCACHE_WRITE_ACCESS,</div><div class='del'>-			[C(RESULT_MISS)]</div><div class='del'>-					= ARMV7_PERFCTR_L2_DCACHE_WRITE_REFILL,</div><div class='add'>+			[C(RESULT_ACCESS)]	= ARMV7_A15_PERFCTR_L2_CACHE_ACCESS_WRITE,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_A15_PERFCTR_L2_CACHE_REFILL_WRITE,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='hunk'>@@ -633,13 +540,11 @@ static const unsigned armv7_a15_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 	[C(DTLB)] = {</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='del'>-			[C(RESULT_MISS)]</div><div class='del'>-					= ARMV7_PERFCTR_L1_DTLB_READ_REFILL,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_A15_PERFCTR_DTLB_REFILL_L1_READ,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='del'>-			[C(RESULT_MISS)]</div><div class='del'>-					= ARMV7_PERFCTR_L1_DTLB_WRITE_REFILL,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_A15_PERFCTR_DTLB_REFILL_L1_WRITE,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='hunk'>@@ -649,11 +554,11 @@ static const unsigned armv7_a15_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 	[C(ITLB)] = {</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_ITLB_MISS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_ITLB_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='del'>-			[C(RESULT_MISS)]	= ARMV7_PERFCTR_ITLB_MISS,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_ITLB_REFILL,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='hunk'>@@ -663,13 +568,11 @@ static const unsigned armv7_a15_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='ctx'> 	[C(BPU)] = {</div><div class='ctx'> 		[C(OP_READ)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_PC_BRANCH_PRED,</div><div class='del'>-			[C(RESULT_MISS)]</div><div class='del'>-					= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_WRITE)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= ARMV7_PERFCTR_PC_BRANCH_PRED,</div><div class='del'>-			[C(RESULT_MISS)]</div><div class='del'>-					= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='add'>+			[C(RESULT_MISS)]	= ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,</div><div class='ctx'> 		},</div><div class='ctx'> 		[C(OP_PREFETCH)] = {</div><div class='ctx'> 			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,</div><div class='head'>diff --git a/arch/arm/kernel/perf_event_xscale.c b/arch/arm/kernel/perf_event_xscale.c<br/>index e0cca10a8411..3b99d8269829 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/perf_event_xscale.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/perf_event_xscale.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/perf_event_xscale.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/perf_event_xscale.c</a></div><div class='hunk'>@@ -48,13 +48,15 @@ enum xscale_counters {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned xscale_perf_map[PERF_COUNT_HW_MAX] = {</div><div class='del'>-	[PERF_COUNT_HW_CPU_CYCLES]	    = XSCALE_PERFCTR_CCNT,</div><div class='del'>-	[PERF_COUNT_HW_INSTRUCTIONS]	    = XSCALE_PERFCTR_INSTRUCTION,</div><div class='del'>-	[PERF_COUNT_HW_CACHE_REFERENCES]    = HW_OP_UNSUPPORTED,</div><div class='del'>-	[PERF_COUNT_HW_CACHE_MISSES]	    = HW_OP_UNSUPPORTED,</div><div class='del'>-	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = XSCALE_PERFCTR_BRANCH,</div><div class='del'>-	[PERF_COUNT_HW_BRANCH_MISSES]	    = XSCALE_PERFCTR_BRANCH_MISS,</div><div class='del'>-	[PERF_COUNT_HW_BUS_CYCLES]	    = HW_OP_UNSUPPORTED,</div><div class='add'>+	[PERF_COUNT_HW_CPU_CYCLES]		= XSCALE_PERFCTR_CCNT,</div><div class='add'>+	[PERF_COUNT_HW_INSTRUCTIONS]		= XSCALE_PERFCTR_INSTRUCTION,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_REFERENCES]	= HW_OP_UNSUPPORTED,</div><div class='add'>+	[PERF_COUNT_HW_CACHE_MISSES]		= HW_OP_UNSUPPORTED,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS]	= XSCALE_PERFCTR_BRANCH,</div><div class='add'>+	[PERF_COUNT_HW_BRANCH_MISSES]		= XSCALE_PERFCTR_BRANCH_MISS,</div><div class='add'>+	[PERF_COUNT_HW_BUS_CYCLES]		= HW_OP_UNSUPPORTED,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND]	= XSCALE_PERFCTR_ICACHE_NO_DELIVER,</div><div class='add'>+	[PERF_COUNT_HW_STALLED_CYCLES_BACKEND]	= HW_OP_UNSUPPORTED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned xscale_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]</div><div class='head'>diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c<br/>index e8e8fe505df1..971d65c253a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/process.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/process.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/process.c</a></div><div class='hunk'>@@ -57,7 +57,7 @@ static const char *isa_modes[] = {</div><div class='ctx'>   "ARM" , "Thumb" , "Jazelle", "ThumbEE"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern void setup_mm_for_reboot(char mode);</div><div class='add'>+extern void setup_mm_for_reboot(void);</div><div class='ctx'> </div><div class='ctx'> static volatile int hlt_counter;</div><div class='ctx'> </div><div class='hunk'>@@ -92,18 +92,24 @@ static int __init hlt_setup(char *__unused)</div><div class='ctx'> __setup("nohlt", nohlt_setup);</div><div class='ctx'> __setup("hlt", hlt_setup);</div><div class='ctx'> </div><div class='del'>-void arm_machine_restart(char mode, const char *cmd)</div><div class='add'>+extern void call_with_stack(void (*fn)(void *), void *arg, void *sp);</div><div class='add'>+typedef void (*phys_reset_t)(unsigned long);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * A temporary stack to use for CPU reset. This is static so that we</div><div class='add'>+ * don't clobber it with the identity mapping. When running with this</div><div class='add'>+ * stack, any references to the current task *will not work* so you</div><div class='add'>+ * should really do as little as possible before jumping to your reset</div><div class='add'>+ * code.</div><div class='add'>+ */</div><div class='add'>+static u64 soft_restart_stack[16];</div><div class='add'>+</div><div class='add'>+static void __soft_restart(void *addr)</div><div class='ctx'> {</div><div class='del'>-	/* Disable interrupts first */</div><div class='del'>-	local_irq_disable();</div><div class='del'>-	local_fiq_disable();</div><div class='add'>+	phys_reset_t phys_reset;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Tell the mm system that we are going to reboot -</div><div class='del'>-	 * we may need it to insert some 1:1 mappings so that</div><div class='del'>-	 * soft boot works.</div><div class='del'>-	 */</div><div class='del'>-	setup_mm_for_reboot(mode);</div><div class='add'>+	/* Take out a flat memory mapping. */</div><div class='add'>+	setup_mm_for_reboot();</div><div class='ctx'> </div><div class='ctx'> 	/* Clean and invalidate caches */</div><div class='ctx'> 	flush_cache_all();</div><div class='hunk'>@@ -114,18 +120,35 @@ void arm_machine_restart(char mode, const char *cmd)</div><div class='ctx'> 	/* Push out any further dirty data, and ensure cache is empty */</div><div class='ctx'> 	flush_cache_all();</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Now call the architecture specific reboot code.</div><div class='del'>-	 */</div><div class='del'>-	arch_reset(mode, cmd);</div><div class='add'>+	/* Switch to the identity mapping. */</div><div class='add'>+	phys_reset = (phys_reset_t)(unsigned long)virt_to_phys(cpu_reset);</div><div class='add'>+	phys_reset((unsigned long)addr);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Whoops - the architecture was unable to reboot.</div><div class='del'>-	 * Tell the user!</div><div class='del'>-	 */</div><div class='del'>-	mdelay(1000);</div><div class='del'>-	printk("Reboot failed -- System halted\n");</div><div class='del'>-	while (1);</div><div class='add'>+	/* Should never get here. */</div><div class='add'>+	BUG();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void soft_restart(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	u64 *stack = soft_restart_stack + ARRAY_SIZE(soft_restart_stack);</div><div class='add'>+</div><div class='add'>+	/* Disable interrupts first */</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	local_fiq_disable();</div><div class='add'>+</div><div class='add'>+	/* Disable the L2 if we're the last man standing. */</div><div class='add'>+	if (num_online_cpus() == 1)</div><div class='add'>+		outer_disable();</div><div class='add'>+</div><div class='add'>+	/* Change to the new stack and continue with the reset. */</div><div class='add'>+	call_with_stack(__soft_restart, (void *)addr, (void *)stack);</div><div class='add'>+</div><div class='add'>+	/* Should never get here. */</div><div class='add'>+	BUG();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void null_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -134,7 +157,7 @@ void arm_machine_restart(char mode, const char *cmd)</div><div class='ctx'> void (*pm_power_off)(void);</div><div class='ctx'> EXPORT_SYMBOL(pm_power_off);</div><div class='ctx'> </div><div class='del'>-void (*arm_pm_restart)(char str, const char *cmd) = arm_machine_restart;</div><div class='add'>+void (*arm_pm_restart)(char str, const char *cmd) = null_restart;</div><div class='ctx'> EXPORT_SYMBOL_GPL(arm_pm_restart);</div><div class='ctx'> </div><div class='ctx'> static void do_nothing(void *unused)</div><div class='hunk'>@@ -255,7 +278,15 @@ void machine_power_off(void)</div><div class='ctx'> void machine_restart(char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	machine_shutdown();</div><div class='add'>+</div><div class='ctx'> 	arm_pm_restart(reboot_mode, cmd);</div><div class='add'>+</div><div class='add'>+	/* Give a grace period for failure to restart of 1s */</div><div class='add'>+	mdelay(1000);</div><div class='add'>+</div><div class='add'>+	/* Whoops - the platform was unable to reboot. Tell the user! */</div><div class='add'>+	printk("Reboot failed -- System halted\n");</div><div class='add'>+	while (1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __show_regs(struct pt_regs *regs)</div><div class='head'>diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c<br/>index 483727ad6892..e1d5e1929fbd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/ptrace.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/ptrace.c</a></div><div class='hunk'>@@ -906,11 +906,6 @@ asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ip;</div><div class='ctx'> </div><div class='del'>-	if (!test_thread_flag(TIF_SYSCALL_TRACE))</div><div class='del'>-		return scno;</div><div class='del'>-	if (!(current-&gt;ptrace &amp; PT_PTRACED))</div><div class='del'>-		return scno;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Save IP.  IP is used to denote syscall entry/exit:</div><div class='ctx'> 	 *  IP = 0 -&gt; entry, = 1 -&gt; exit</div><div class='hunk'>@@ -918,6 +913,17 @@ asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)</div><div class='ctx'> 	ip = regs-&gt;ARM_ip;</div><div class='ctx'> 	regs-&gt;ARM_ip = why;</div><div class='ctx'> </div><div class='add'>+	if (!ip)</div><div class='add'>+		audit_syscall_exit(regs);</div><div class='add'>+	else</div><div class='add'>+		audit_syscall_entry(AUDIT_ARCH_ARMEB, scno, regs-&gt;ARM_r0,</div><div class='add'>+				    regs-&gt;ARM_r1, regs-&gt;ARM_r2, regs-&gt;ARM_r3);</div><div class='add'>+</div><div class='add'>+	if (!test_thread_flag(TIF_SYSCALL_TRACE))</div><div class='add'>+		return scno;</div><div class='add'>+	if (!(current-&gt;ptrace &amp; PT_PTRACED))</div><div class='add'>+		return scno;</div><div class='add'>+</div><div class='ctx'> 	current_thread_info()-&gt;syscall = scno;</div><div class='ctx'> </div><div class='ctx'> 	/* the 0x80 provides a way for the tracing parent to distinguish</div><div class='head'>diff --git a/arch/arm/kernel/sched_clock.c b/arch/arm/kernel/sched_clock.c<br/>index 9a46370fe9da..5416c7c12528 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/sched_clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/sched_clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/sched_clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/sched_clock.c</a></div><div class='hunk'>@@ -14,61 +14,153 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sched_clock.h&gt;</div><div class='ctx'> </div><div class='add'>+struct clock_data {</div><div class='add'>+	u64 epoch_ns;</div><div class='add'>+	u32 epoch_cyc;</div><div class='add'>+	u32 epoch_cyc_copy;</div><div class='add'>+	u32 mult;</div><div class='add'>+	u32 shift;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void sched_clock_poll(unsigned long wrap_ticks);</div><div class='ctx'> static DEFINE_TIMER(sched_clock_timer, sched_clock_poll, 0, 0);</div><div class='del'>-static void (*sched_clock_update_fn)(void);</div><div class='add'>+</div><div class='add'>+static struct clock_data cd = {</div><div class='add'>+	.mult	= NSEC_PER_SEC / HZ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 __read_mostly sched_clock_mask = 0xffffffff;</div><div class='add'>+</div><div class='add'>+static u32 notrace jiffy_sched_clock_read(void)</div><div class='add'>+{</div><div class='add'>+	return (u32)(jiffies - INITIAL_JIFFIES);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 __read_mostly (*read_sched_clock)(void) = jiffy_sched_clock_read;</div><div class='add'>+</div><div class='add'>+static inline u64 cyc_to_ns(u64 cyc, u32 mult, u32 shift)</div><div class='add'>+{</div><div class='add'>+	return (cyc * mult) &gt;&gt; shift;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long long cyc_to_sched_clock(u32 cyc, u32 mask)</div><div class='add'>+{</div><div class='add'>+	u64 epoch_ns;</div><div class='add'>+	u32 epoch_cyc;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Load the epoch_cyc and epoch_ns atomically.  We do this by</div><div class='add'>+	 * ensuring that we always write epoch_cyc, epoch_ns and</div><div class='add'>+	 * epoch_cyc_copy in strict order, and read them in strict order.</div><div class='add'>+	 * If epoch_cyc and epoch_cyc_copy are not equal, then we're in</div><div class='add'>+	 * the middle of an update, and we should repeat the load.</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		epoch_cyc = cd.epoch_cyc;</div><div class='add'>+		smp_rmb();</div><div class='add'>+		epoch_ns = cd.epoch_ns;</div><div class='add'>+		smp_rmb();</div><div class='add'>+	} while (epoch_cyc != cd.epoch_cyc_copy);</div><div class='add'>+</div><div class='add'>+	return epoch_ns + cyc_to_ns((cyc - epoch_cyc) &amp; mask, cd.mult, cd.shift);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Atomically update the sched_clock epoch.</div><div class='add'>+ */</div><div class='add'>+static void notrace update_sched_clock(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 cyc;</div><div class='add'>+	u64 ns;</div><div class='add'>+</div><div class='add'>+	cyc = read_sched_clock();</div><div class='add'>+	ns = cd.epoch_ns +</div><div class='add'>+		cyc_to_ns((cyc - cd.epoch_cyc) &amp; sched_clock_mask,</div><div class='add'>+			  cd.mult, cd.shift);</div><div class='add'>+	/*</div><div class='add'>+	 * Write epoch_cyc and epoch_ns in a way that the update is</div><div class='add'>+	 * detectable in cyc_to_fixed_sched_clock().</div><div class='add'>+	 */</div><div class='add'>+	raw_local_irq_save(flags);</div><div class='add'>+	cd.epoch_cyc = cyc;</div><div class='add'>+	smp_wmb();</div><div class='add'>+	cd.epoch_ns = ns;</div><div class='add'>+	smp_wmb();</div><div class='add'>+	cd.epoch_cyc_copy = cyc;</div><div class='add'>+	raw_local_irq_restore(flags);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void sched_clock_poll(unsigned long wrap_ticks)</div><div class='ctx'> {</div><div class='ctx'> 	mod_timer(&amp;sched_clock_timer, round_jiffies(jiffies + wrap_ticks));</div><div class='del'>-	sched_clock_update_fn();</div><div class='add'>+	update_sched_clock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init init_sched_clock(struct clock_data *cd, void (*update)(void),</div><div class='del'>-	unsigned int clock_bits, unsigned long rate)</div><div class='add'>+void __init setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long r, w;</div><div class='ctx'> 	u64 res, wrap;</div><div class='ctx'> 	char r_unit;</div><div class='ctx'> </div><div class='del'>-	sched_clock_update_fn = update;</div><div class='add'>+	BUG_ON(bits &gt; 32);</div><div class='add'>+	WARN_ON(!irqs_disabled());</div><div class='add'>+	WARN_ON(read_sched_clock != jiffy_sched_clock_read);</div><div class='add'>+	read_sched_clock = read;</div><div class='add'>+	sched_clock_mask = (1 &lt;&lt; bits) - 1;</div><div class='ctx'> </div><div class='ctx'> 	/* calculate the mult/shift to convert counter ticks to ns. */</div><div class='del'>-	clocks_calc_mult_shift(&amp;cd-&gt;mult, &amp;cd-&gt;shift, rate, NSEC_PER_SEC, 0);</div><div class='add'>+	clocks_calc_mult_shift(&amp;cd.mult, &amp;cd.shift, rate, NSEC_PER_SEC, 0);</div><div class='ctx'> </div><div class='ctx'> 	r = rate;</div><div class='ctx'> 	if (r &gt;= 4000000) {</div><div class='ctx'> 		r /= 1000000;</div><div class='ctx'> 		r_unit = 'M';</div><div class='del'>-	} else {</div><div class='add'>+	} else if (r &gt;= 1000) {</div><div class='ctx'> 		r /= 1000;</div><div class='ctx'> 		r_unit = 'k';</div><div class='del'>-	}</div><div class='add'>+	} else</div><div class='add'>+		r_unit = ' ';</div><div class='ctx'> </div><div class='ctx'> 	/* calculate how many ns until we wrap */</div><div class='del'>-	wrap = cyc_to_ns((1ULL &lt;&lt; clock_bits) - 1, cd-&gt;mult, cd-&gt;shift);</div><div class='add'>+	wrap = cyc_to_ns((1ULL &lt;&lt; bits) - 1, cd.mult, cd.shift);</div><div class='ctx'> 	do_div(wrap, NSEC_PER_MSEC);</div><div class='ctx'> 	w = wrap;</div><div class='ctx'> </div><div class='ctx'> 	/* calculate the ns resolution of this counter */</div><div class='del'>-	res = cyc_to_ns(1ULL, cd-&gt;mult, cd-&gt;shift);</div><div class='add'>+	res = cyc_to_ns(1ULL, cd.mult, cd.shift);</div><div class='ctx'> 	pr_info("sched_clock: %u bits at %lu%cHz, resolution %lluns, wraps every %lums\n",</div><div class='del'>-		clock_bits, r, r_unit, res, w);</div><div class='add'>+		bits, r, r_unit, res, w);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Start the timer to keep sched_clock() properly updated and</div><div class='ctx'> 	 * sets the initial epoch.</div><div class='ctx'> 	 */</div><div class='ctx'> 	sched_clock_timer.data = msecs_to_jiffies(w - (w / 10));</div><div class='del'>-	update();</div><div class='add'>+	update_sched_clock();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ensure that sched_clock() starts off at 0ns</div><div class='ctx'> 	 */</div><div class='del'>-	cd-&gt;epoch_ns = 0;</div><div class='add'>+	cd.epoch_ns = 0;</div><div class='add'>+</div><div class='add'>+	pr_debug("Registered %pF as sched_clock source\n", read);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long long notrace sched_clock(void)</div><div class='add'>+{</div><div class='add'>+	u32 cyc = read_sched_clock();</div><div class='add'>+	return cyc_to_sched_clock(cyc, sched_clock_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init sched_clock_postinit(void)</div><div class='ctx'> {</div><div class='add'>+	/*</div><div class='add'>+	 * If no sched_clock function has been provided at that point,</div><div class='add'>+	 * make it the final one one.</div><div class='add'>+	 */</div><div class='add'>+	if (read_sched_clock == jiffy_sched_clock_read)</div><div class='add'>+		setup_sched_clock(jiffy_sched_clock_read, 32, HZ);</div><div class='add'>+</div><div class='ctx'> 	sched_clock_poll(sched_clock_timer.data);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c<br/>index c0b59bff6be6..129fbd55bde8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/setup.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/sort.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/unified.h&gt;</div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='hunk'>@@ -891,6 +892,12 @@ static struct machine_desc * __init setup_machine_tags(unsigned int nr)</div><div class='ctx'> 	return mdesc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __init meminfo_cmp(const void *_a, const void *_b)</div><div class='add'>+{</div><div class='add'>+	const struct membank *a = _a, *b = _b;</div><div class='add'>+	long cmp = bank_pfn_start(a) - bank_pfn_start(b);</div><div class='add'>+	return cmp &lt; 0 ? -1 : cmp &gt; 0 ? 1 : 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> void __init setup_arch(char **cmdline_p)</div><div class='ctx'> {</div><div class='hunk'>@@ -909,8 +916,8 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 		arm_dma_zone_size = mdesc-&gt;dma_zone_size;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	if (mdesc-&gt;soft_reboot)</div><div class='del'>-		reboot_setup("s");</div><div class='add'>+	if (mdesc-&gt;restart_mode)</div><div class='add'>+		reboot_setup(&amp;mdesc-&gt;restart_mode);</div><div class='ctx'> </div><div class='ctx'> 	init_mm.start_code = (unsigned long) _text;</div><div class='ctx'> 	init_mm.end_code   = (unsigned long) _etext;</div><div class='hunk'>@@ -923,12 +930,16 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> </div><div class='ctx'> 	parse_early_param();</div><div class='ctx'> </div><div class='add'>+	sort(&amp;meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), meminfo_cmp, NULL);</div><div class='ctx'> 	sanity_check_meminfo();</div><div class='ctx'> 	arm_memblock_init(&amp;meminfo, mdesc);</div><div class='ctx'> </div><div class='ctx'> 	paging_init(mdesc);</div><div class='ctx'> 	request_standard_resources(mdesc);</div><div class='ctx'> </div><div class='add'>+	if (mdesc-&gt;restart)</div><div class='add'>+		arm_pm_restart = mdesc-&gt;restart;</div><div class='add'>+</div><div class='ctx'> 	unflatten_device_tree();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='head'>diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S<br/>index 020e99c845e7..1f268bda4552 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/sleep.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/sleep.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/sleep.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/sleep.S</a></div><div class='hunk'>@@ -54,14 +54,18 @@ ENDPROC(cpu_suspend_abort)</div><div class='ctx'>  * r0 = control register value</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='add'>+	.pushsection	.idmap.text,"ax"</div><div class='ctx'> ENTRY(cpu_resume_mmu)</div><div class='ctx'> 	ldr	r3, =cpu_resume_after_mmu</div><div class='add'>+	instr_sync</div><div class='ctx'> 	mcr	p15, 0, r0, c1, c0, 0	@ turn on MMU, I-cache, etc</div><div class='ctx'> 	mrc	p15, 0, r0, c0, c0, 0	@ read id reg</div><div class='add'>+	instr_sync</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	mov	pc, r3			@ jump to virtual address</div><div class='ctx'> ENDPROC(cpu_resume_mmu)</div><div class='add'>+	.popsection</div><div class='ctx'> cpu_resume_after_mmu:</div><div class='ctx'> 	bl	cpu_init		@ restore the und/abt/irq banked regs</div><div class='ctx'> 	mov	r0, #0			@ return zero on success</div><div class='head'>diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c<br/>index ef5640b9e218..57db122a4f62 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/smp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/smp.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</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/exception.h&gt;</div><div class='add'>+#include &lt;asm/idmap.h&gt;</div><div class='ctx'> #include &lt;asm/topology.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='hunk'>@@ -61,7 +62,6 @@ int __cpuinit __cpu_up(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpuinfo_arm *ci = &amp;per_cpu(cpu_data, cpu);</div><div class='ctx'> 	struct task_struct *idle = ci-&gt;idle;</div><div class='del'>-	pgd_t *pgd;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -84,29 +84,11 @@ int __cpuinit __cpu_up(unsigned int cpu)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Allocate initial page tables to allow the new CPU to</div><div class='del'>-	 * enable the MMU safely.  This essentially means a set</div><div class='del'>-	 * of our "standard" page tables, with the addition of</div><div class='del'>-	 * a 1:1 mapping for the physical address of the kernel.</div><div class='del'>-	 */</div><div class='del'>-	pgd = pgd_alloc(&amp;init_mm);</div><div class='del'>-	if (!pgd)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (PHYS_OFFSET != PAGE_OFFSET) {</div><div class='del'>-#ifndef CONFIG_HOTPLUG_CPU</div><div class='del'>-		identity_mapping_add(pgd, __pa(__init_begin), __pa(__init_end));</div><div class='del'>-#endif</div><div class='del'>-		identity_mapping_add(pgd, __pa(_stext), __pa(_etext));</div><div class='del'>-		identity_mapping_add(pgd, __pa(_sdata), __pa(_edata));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * We need to tell the secondary core where to find</div><div class='ctx'> 	 * its stack and the page tables.</div><div class='ctx'> 	 */</div><div class='ctx'> 	secondary_data.stack = task_stack_page(idle) + THREAD_START_SP;</div><div class='del'>-	secondary_data.pgdir = virt_to_phys(pgd);</div><div class='add'>+	secondary_data.pgdir = virt_to_phys(idmap_pgd);</div><div class='ctx'> 	secondary_data.swapper_pg_dir = virt_to_phys(swapper_pg_dir);</div><div class='ctx'> 	__cpuc_flush_dcache_area(&amp;secondary_data, sizeof(secondary_data));</div><div class='ctx'> 	outer_clean_range(__pa(&amp;secondary_data), __pa(&amp;secondary_data + 1));</div><div class='hunk'>@@ -142,16 +124,6 @@ int __cpuinit __cpu_up(unsigned int cpu)</div><div class='ctx'> 	secondary_data.stack = NULL;</div><div class='ctx'> 	secondary_data.pgdir = 0;</div><div class='ctx'> </div><div class='del'>-	if (PHYS_OFFSET != PAGE_OFFSET) {</div><div class='del'>-#ifndef CONFIG_HOTPLUG_CPU</div><div class='del'>-		identity_mapping_del(pgd, __pa(__init_begin), __pa(__init_end));</div><div class='del'>-#endif</div><div class='del'>-		identity_mapping_del(pgd, __pa(_stext), __pa(_etext));</div><div class='del'>-		identity_mapping_del(pgd, __pa(_sdata), __pa(_edata));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pgd_free(&amp;init_mm, pgd);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -550,6 +522,10 @@ static void ipi_cpu_stop(unsigned int cpu)</div><div class='ctx'> 	local_fiq_disable();</div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='add'>+	platform_cpu_kill(cpu);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	while (1)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c<br/>index a8a6682d6b52..c8e938553d47 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/smp_twd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/smp_twd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/smp_twd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/smp_twd.c</a></div><div class='hunk'>@@ -10,8 +10,11 @@</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='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/cpufreq.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/err.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='hunk'>@@ -25,6 +28,7 @@</div><div class='ctx'> /* set up by the platform code */</div><div class='ctx'> void __iomem *twd_base;</div><div class='ctx'> </div><div class='add'>+static struct clk *twd_clk;</div><div class='ctx'> static unsigned long twd_timer_rate;</div><div class='ctx'> </div><div class='ctx'> static struct clock_event_device __percpu **twd_evt;</div><div class='hunk'>@@ -89,6 +93,52 @@ void twd_timer_stop(struct clock_event_device *clk)</div><div class='ctx'> 	disable_percpu_irq(clk-&gt;irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CPU_FREQ</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Updates clockevent frequency when the cpu frequency changes.</div><div class='add'>+ * Called on the cpu that is changing frequency with interrupts disabled.</div><div class='add'>+ */</div><div class='add'>+static void twd_update_frequency(void *data)</div><div class='add'>+{</div><div class='add'>+	twd_timer_rate = clk_get_rate(twd_clk);</div><div class='add'>+</div><div class='add'>+	clockevents_update_freq(*__this_cpu_ptr(twd_evt), twd_timer_rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int twd_cpufreq_transition(struct notifier_block *nb,</div><div class='add'>+	unsigned long state, void *data)</div><div class='add'>+{</div><div class='add'>+	struct cpufreq_freqs *freqs = data;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The twd clock events must be reprogrammed to account for the new</div><div class='add'>+	 * frequency.  The timer is local to a cpu, so cross-call to the</div><div class='add'>+	 * changing cpu.</div><div class='add'>+	 */</div><div class='add'>+	if (state == CPUFREQ_POSTCHANGE || state == CPUFREQ_RESUMECHANGE)</div><div class='add'>+		smp_call_function_single(freqs-&gt;cpu, twd_update_frequency,</div><div class='add'>+			NULL, 1);</div><div class='add'>+</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block twd_cpufreq_nb = {</div><div class='add'>+	.notifier_call = twd_cpufreq_transition,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int twd_cpufreq_init(void)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ERR(twd_clk))</div><div class='add'>+		return cpufreq_register_notifier(&amp;twd_cpufreq_nb,</div><div class='add'>+			CPUFREQ_TRANSITION_NOTIFIER);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+core_initcall(twd_cpufreq_init);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void __cpuinit twd_calibrate_rate(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long count;</div><div class='hunk'>@@ -140,6 +190,35 @@ static irqreturn_t twd_handler(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_NONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct clk *twd_get_clock(void)</div><div class='add'>+{</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	clk = clk_get_sys("smp_twd", NULL);</div><div class='add'>+	if (IS_ERR(clk)) {</div><div class='add'>+		pr_err("smp_twd: clock not found: %d\n", (int)PTR_ERR(clk));</div><div class='add'>+		return clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = clk_prepare(clk);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("smp_twd: clock failed to prepare: %d\n", err);</div><div class='add'>+		clk_put(clk);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = clk_enable(clk);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("smp_twd: clock failed to enable: %d\n", err);</div><div class='add'>+		clk_unprepare(clk);</div><div class='add'>+		clk_put(clk);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return clk;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Setup the local clock events for a CPU.</div><div class='ctx'>  */</div><div class='hunk'>@@ -165,7 +244,13 @@ void __cpuinit twd_timer_setup(struct clock_event_device *clk)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	twd_calibrate_rate();</div><div class='add'>+	if (!twd_clk)</div><div class='add'>+		twd_clk = twd_get_clock();</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR_OR_NULL(twd_clk))</div><div class='add'>+		twd_timer_rate = clk_get_rate(twd_clk);</div><div class='add'>+	else</div><div class='add'>+		twd_calibrate_rate();</div><div class='ctx'> </div><div class='ctx'> 	clk-&gt;name = "local_timer";</div><div class='ctx'> 	clk-&gt;features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT |</div><div class='hunk'>@@ -173,15 +258,11 @@ void __cpuinit twd_timer_setup(struct clock_event_device *clk)</div><div class='ctx'> 	clk-&gt;rating = 350;</div><div class='ctx'> 	clk-&gt;set_mode = twd_set_mode;</div><div class='ctx'> 	clk-&gt;set_next_event = twd_set_next_event;</div><div class='del'>-	clk-&gt;shift = 20;</div><div class='del'>-	clk-&gt;mult = div_sc(twd_timer_rate, NSEC_PER_SEC, clk-&gt;shift);</div><div class='del'>-	clk-&gt;max_delta_ns = clockevent_delta2ns(0xffffffff, clk);</div><div class='del'>-	clk-&gt;min_delta_ns = clockevent_delta2ns(0xf, clk);</div><div class='ctx'> </div><div class='ctx'> 	this_cpu_clk = __this_cpu_ptr(twd_evt);</div><div class='ctx'> 	*this_cpu_clk = clk;</div><div class='ctx'> </div><div class='del'>-	clockevents_register_device(clk);</div><div class='del'>-</div><div class='add'>+	clockevents_config_and_register(clk, twd_timer_rate,</div><div class='add'>+					0xf, 0xffffffff);</div><div class='ctx'> 	enable_percpu_irq(clk-&gt;irq, 0);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/kernel/suspend.c b/arch/arm/kernel/suspend.c<br/>index 93a22d282c16..1794cc3b0f18 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/suspend.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/suspend.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/suspend.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/suspend.c</a></div><div class='hunk'>@@ -1,13 +1,12 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/idmap.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/suspend.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> </div><div class='del'>-static pgd_t *suspend_pgd;</div><div class='del'>-</div><div class='ctx'> extern int __cpu_suspend(unsigned long, int (*)(unsigned long));</div><div class='ctx'> extern void cpu_resume_mmu(void);</div><div class='ctx'> </div><div class='hunk'>@@ -21,7 +20,7 @@ void __cpu_suspend_save(u32 *ptr, u32 ptrsz, u32 sp, u32 *save_ptr)</div><div class='ctx'> 	*save_ptr = virt_to_phys(ptr);</div><div class='ctx'> </div><div class='ctx'> 	/* This must correspond to the LDM in cpu_resume() assembly */</div><div class='del'>-	*ptr++ = virt_to_phys(suspend_pgd);</div><div class='add'>+	*ptr++ = virt_to_phys(idmap_pgd);</div><div class='ctx'> 	*ptr++ = sp;</div><div class='ctx'> 	*ptr++ = virt_to_phys(cpu_do_resume);</div><div class='ctx'> </div><div class='hunk'>@@ -42,7 +41,7 @@ int cpu_suspend(unsigned long arg, int (*fn)(unsigned long))</div><div class='ctx'> 	struct mm_struct *mm = current-&gt;active_mm;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!suspend_pgd)</div><div class='add'>+	if (!idmap_pgd)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -59,14 +58,3 @@ int cpu_suspend(unsigned long arg, int (*fn)(unsigned long))</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static int __init cpu_suspend_init(void)</div><div class='del'>-{</div><div class='del'>-	suspend_pgd = pgd_alloc(&amp;init_mm);</div><div class='del'>-	if (suspend_pgd) {</div><div class='del'>-		unsigned long addr = virt_to_phys(cpu_resume_mmu);</div><div class='del'>-		identity_mapping_add(suspend_pgd, addr, addr + SECTION_SIZE);</div><div class='del'>-	}</div><div class='del'>-	return suspend_pgd ? 0 : -ENOMEM;</div><div class='del'>-}</div><div class='del'>-core_initcall(cpu_suspend_init);</div><div class='head'>diff --git a/arch/arm/kernel/swp_emulate.c b/arch/arm/kernel/swp_emulate.c<br/>index 5f452f8fde05..df745188f5de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/swp_emulate.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/swp_emulate.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/swp_emulate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/swp_emulate.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/opcodes.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -185,6 +186,21 @@ static int swp_handler(struct pt_regs *regs, unsigned int instr)</div><div class='ctx'> </div><div class='ctx'> 	perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, regs, regs-&gt;ARM_pc);</div><div class='ctx'> </div><div class='add'>+	res = arm_check_condition(instr, regs-&gt;ARM_cpsr);</div><div class='add'>+	switch (res) {</div><div class='add'>+	case ARM_OPCODE_CONDTEST_PASS:</div><div class='add'>+		break;</div><div class='add'>+	case ARM_OPCODE_CONDTEST_FAIL:</div><div class='add'>+		/* Condition failed - return to next instruction */</div><div class='add'>+		regs-&gt;ARM_pc += 4;</div><div class='add'>+		return 0;</div><div class='add'>+	case ARM_OPCODE_CONDTEST_UNCOND:</div><div class='add'>+		/* If unconditional encoding - not a SWP, undef */</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (current-&gt;pid != previous_pid) {</div><div class='ctx'> 		pr_debug("\"%s\" (%ld) uses deprecated SWP{B} instruction\n",</div><div class='ctx'> 			 current-&gt;comm, (unsigned long)current-&gt;pid);</div><div class='head'>diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c<br/>index 30e302d33e0a..01ec453bb924 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/tcm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/tcm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/tcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/tcm.c</a></div><div class='hunk'>@@ -180,9 +180,9 @@ static int __init setup_tcm_bank(u8 type, u8 bank, u8 banks,</div><div class='ctx'>  */</div><div class='ctx'> void __init tcm_init(void)</div><div class='ctx'> {</div><div class='del'>-	u32 tcm_status = read_cpuid_tcmstatus();</div><div class='del'>-	u8 dtcm_banks = (tcm_status &gt;&gt; 16) &amp; 0x03;</div><div class='del'>-	u8 itcm_banks = (tcm_status &amp; 0x03);</div><div class='add'>+	u32 tcm_status;</div><div class='add'>+	u8 dtcm_banks;</div><div class='add'>+	u8 itcm_banks;</div><div class='ctx'> 	size_t dtcm_code_sz = &amp;__edtcm_data - &amp;__sdtcm_data;</div><div class='ctx'> 	size_t itcm_code_sz = &amp;__eitcm_text - &amp;__sitcm_text;</div><div class='ctx'> 	char *start;</div><div class='hunk'>@@ -191,6 +191,22 @@ void __init tcm_init(void)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Prior to ARMv5 there is no TCM, and trying to read the status</div><div class='add'>+	 * register will hang the processor.</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_architecture() &lt; CPU_ARCH_ARMv5) {</div><div class='add'>+		if (dtcm_code_sz || itcm_code_sz)</div><div class='add'>+			pr_info("CPU TCM: %u bytes of DTCM and %u bytes of "</div><div class='add'>+				"ITCM code compiled in, but no TCM present "</div><div class='add'>+				"in pre-v5 CPU\n", dtcm_code_sz, itcm_code_sz);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tcm_status = read_cpuid_tcmstatus();</div><div class='add'>+	dtcm_banks = (tcm_status &gt;&gt; 16) &amp; 0x03;</div><div class='add'>+	itcm_banks = (tcm_status &amp; 0x03);</div><div class='add'>+</div><div class='ctx'> 	/* Values greater than 2 for D/ITCM banks are "reserved" */</div><div class='ctx'> 	if (dtcm_banks &gt; 2)</div><div class='ctx'> 		dtcm_banks = 0;</div><div class='head'>diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S<br/>index 20b3041e0860..f76e75548670 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/vmlinux.lds.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/vmlinux.lds.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -13,6 +13,12 @@</div><div class='ctx'> 	*(.proc.info.init)						\</div><div class='ctx'> 	VMLINUX_SYMBOL(__proc_info_end) = .;</div><div class='ctx'> </div><div class='add'>+#define IDMAP_TEXT							\</div><div class='add'>+	ALIGN_FUNCTION();						\</div><div class='add'>+	VMLINUX_SYMBOL(__idmap_text_start) = .;				\</div><div class='add'>+	*(.idmap.text)							\</div><div class='add'>+	VMLINUX_SYMBOL(__idmap_text_end) = .;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> #define ARM_CPU_DISCARD(x)</div><div class='ctx'> #define ARM_CPU_KEEP(x)		x</div><div class='hunk'>@@ -92,6 +98,7 @@ SECTIONS</div><div class='ctx'> 			SCHED_TEXT</div><div class='ctx'> 			LOCK_TEXT</div><div class='ctx'> 			KPROBES_TEXT</div><div class='add'>+			IDMAP_TEXT</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> 			*(.fixup)</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile<br/>index cf73a7f742dd..0ade0acc1ed9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/lib/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/lib/Makefile</a></div><div class='hunk'>@@ -13,7 +13,8 @@ lib-y		:= backtrace.o changebit.o csumipv6.o csumpartial.o   \</div><div class='ctx'> 		   testchangebit.o testclearbit.o testsetbit.o        \</div><div class='ctx'> 		   ashldi3.o ashrdi3.o lshrdi3.o muldi3.o             \</div><div class='ctx'> 		   ucmpdi2.o lib1funcs.o div64.o                      \</div><div class='del'>-		   io-readsb.o io-writesb.o io-readsl.o io-writesl.o</div><div class='add'>+		   io-readsb.o io-writesb.o io-readsl.o io-writesl.o  \</div><div class='add'>+		   call_with_stack.o</div><div class='ctx'> </div><div class='ctx'> mmu-y	:= clear_user.o copy_page.o getuser.o putuser.o</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/lib/call_with_stack.S b/arch/arm/lib/call_with_stack.S<br/>new file mode 100644<br/>index 000000000000..916c80f13ae7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/call_with_stack.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/lib/call_with_stack.S</a></div><div class='hunk'>@@ -0,0 +1,44 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/lib/call_with_stack.S</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 ARM Ltd.</div><div class='add'>+ * Written by Will Deacon &lt;will.deacon@arm.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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</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/assembler.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * void call_with_stack(void (*fn)(void *), void *arg, void *sp)</div><div class='add'>+ *</div><div class='add'>+ * Change the stack to that pointed at by sp, then invoke fn(arg) with</div><div class='add'>+ * the new stack.</div><div class='add'>+ */</div><div class='add'>+ENTRY(call_with_stack)</div><div class='add'>+	str	sp, [r2, #-4]!</div><div class='add'>+	str	lr, [r2, #-4]!</div><div class='add'>+</div><div class='add'>+	mov	sp, r2</div><div class='add'>+	mov	r2, r0</div><div class='add'>+	mov	r0, r1</div><div class='add'>+</div><div class='add'>+	adr	lr, BSYM(1f)</div><div class='add'>+	mov	pc, r2</div><div class='add'>+</div><div class='add'>+1:	ldr	lr, [sp]</div><div class='add'>+	ldr	sp, [sp, #4]</div><div class='add'>+	mov	pc, lr</div><div class='add'>+ENDPROC(call_with_stack)</div><div class='head'>diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig<br/>index d111c3e99249..4f991f295284 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/Kconfig</a></div><div class='hunk'>@@ -3,6 +3,12 @@ if ARCH_AT91</div><div class='ctx'> config HAVE_AT91_DATAFLASH_CARD</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+config HAVE_AT91_DBGU0</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config HAVE_AT91_DBGU1</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config HAVE_AT91_USART3</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='hunk'>@@ -21,12 +27,14 @@ config ARCH_AT91RM9200</div><div class='ctx'> 	bool "AT91RM9200"</div><div class='ctx'> 	select CPU_ARM920T</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='add'>+	select HAVE_AT91_DBGU0</div><div class='ctx'> 	select HAVE_AT91_USART3</div><div class='ctx'> </div><div class='ctx'> config ARCH_AT91SAM9260</div><div class='ctx'> 	bool "AT91SAM9260 or AT91SAM9XE"</div><div class='ctx'> 	select CPU_ARM926T</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='add'>+	select HAVE_AT91_DBGU0</div><div class='ctx'> 	select HAVE_AT91_USART3</div><div class='ctx'> 	select HAVE_AT91_USART4</div><div class='ctx'> 	select HAVE_AT91_USART5</div><div class='hunk'>@@ -37,11 +45,13 @@ config ARCH_AT91SAM9261</div><div class='ctx'> 	select CPU_ARM926T</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='ctx'> 	select HAVE_FB_ATMEL</div><div class='add'>+	select HAVE_AT91_DBGU0</div><div class='ctx'> </div><div class='ctx'> config ARCH_AT91SAM9G10</div><div class='ctx'> 	bool "AT91SAM9G10"</div><div class='ctx'> 	select CPU_ARM926T</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='add'>+	select HAVE_AT91_DBGU0</div><div class='ctx'> 	select HAVE_FB_ATMEL</div><div class='ctx'> </div><div class='ctx'> config ARCH_AT91SAM9263</div><div class='hunk'>@@ -50,6 +60,7 @@ config ARCH_AT91SAM9263</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='ctx'> 	select HAVE_FB_ATMEL</div><div class='ctx'> 	select HAVE_NET_MACB</div><div class='add'>+	select HAVE_AT91_DBGU1</div><div class='ctx'> </div><div class='ctx'> config ARCH_AT91SAM9RL</div><div class='ctx'> 	bool "AT91SAM9RL"</div><div class='hunk'>@@ -57,11 +68,13 @@ config ARCH_AT91SAM9RL</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='ctx'> 	select HAVE_AT91_USART3</div><div class='ctx'> 	select HAVE_FB_ATMEL</div><div class='add'>+	select HAVE_AT91_DBGU0</div><div class='ctx'> </div><div class='ctx'> config ARCH_AT91SAM9G20</div><div class='ctx'> 	bool "AT91SAM9G20"</div><div class='ctx'> 	select CPU_ARM926T</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='add'>+	select HAVE_AT91_DBGU0</div><div class='ctx'> 	select HAVE_AT91_USART3</div><div class='ctx'> 	select HAVE_AT91_USART4</div><div class='ctx'> 	select HAVE_AT91_USART5</div><div class='hunk'>@@ -74,6 +87,7 @@ config ARCH_AT91SAM9G45</div><div class='ctx'> 	select HAVE_AT91_USART3</div><div class='ctx'> 	select HAVE_FB_ATMEL</div><div class='ctx'> 	select HAVE_NET_MACB</div><div class='add'>+	select HAVE_AT91_DBGU1</div><div class='ctx'> </div><div class='ctx'> config ARCH_AT91CAP9</div><div class='ctx'> 	bool "AT91CAP9"</div><div class='hunk'>@@ -81,6 +95,7 @@ config ARCH_AT91CAP9</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='ctx'> 	select HAVE_FB_ATMEL</div><div class='ctx'> 	select HAVE_NET_MACB</div><div class='add'>+	select HAVE_AT91_DBGU1</div><div class='ctx'> </div><div class='ctx'> config ARCH_AT91X40</div><div class='ctx'> 	bool "AT91x40"</div><div class='hunk'>@@ -510,8 +525,13 @@ config AT91_TIMER_HZ</div><div class='ctx'> choice</div><div class='ctx'> 	prompt "Select a UART for early kernel messages"</div><div class='ctx'> </div><div class='del'>-config AT91_EARLY_DBGU</div><div class='del'>-	bool "DBGU"</div><div class='add'>+config AT91_EARLY_DBGU0</div><div class='add'>+	bool "DBGU on rm9200, 9260/9g20, 9261/9g10 and 9rl"</div><div class='add'>+	depends on HAVE_AT91_DBGU0</div><div class='add'>+</div><div class='add'>+config AT91_EARLY_DBGU1</div><div class='add'>+	bool "DBGU on 9263, 9g45 and cap9"</div><div class='add'>+	depends on HAVE_AT91_DBGU1</div><div class='ctx'> </div><div class='ctx'> config AT91_EARLY_USART0</div><div class='ctx'> 	bool "USART0"</div><div class='head'>diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c<br/>index ecdd54dd68c6..edb879ac04c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91cap9.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91cap9.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91cap9.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/at91cap9.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</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/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -23,11 +22,11 @@</div><div class='ctx'> #include &lt;mach/at91cap9.h&gt;</div><div class='ctx'> #include &lt;mach/at91_pmc.h&gt;</div><div class='ctx'> #include &lt;mach/at91_rstc.h&gt;</div><div class='del'>-#include &lt;mach/at91_shdwc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "soc.h"</div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "clock.h"</div><div class='add'>+#include "sam9_smc.h"</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='ctx'>  *  Clocks</div><div class='hunk'>@@ -137,7 +136,7 @@ static struct clk pwm_clk = {</div><div class='ctx'> 	.type		= CLK_TYPE_PERIPHERAL,</div><div class='ctx'> };</div><div class='ctx'> static struct clk macb_clk = {</div><div class='del'>-	.name		= "macb_clk",</div><div class='add'>+	.name		= "pclk",</div><div class='ctx'> 	.pmc_mask	= 1 &lt;&lt; AT91CAP9_ID_EMAC,</div><div class='ctx'> 	.type		= CLK_TYPE_PERIPHERAL,</div><div class='ctx'> };</div><div class='hunk'>@@ -210,6 +209,8 @@ static struct clk *periph_clocks[] __initdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk_lookup periph_clocks_lookups[] = {</div><div class='add'>+	/* One additional fake clock for macb_hclk */</div><div class='add'>+	CLKDEV_CON_ID("hclk", &amp;macb_clk),</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc", &amp;utmi_clk),</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc", &amp;udphs_clk),</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.0", &amp;mmc0_clk),</div><div class='hunk'>@@ -221,6 +222,10 @@ static struct clk_lookup periph_clocks_lookups[] = {</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("pclk", "ssc.1", &amp;ssc1_clk),</div><div class='ctx'> 	/* fake hclk clock */</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &amp;ohci_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioA", &amp;pioABCD_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioB", &amp;pioABCD_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioC", &amp;pioABCD_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioD", &amp;pioABCD_clk),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk_lookup usart_clocks_lookups[] = {</div><div class='hunk'>@@ -293,37 +298,27 @@ void __init at91cap9_set_console_clock(int id)</div><div class='ctx'>  *  GPIO</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static struct at91_gpio_bank at91cap9_gpio[] = {</div><div class='add'>+static struct at91_gpio_bank at91cap9_gpio[] __initdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.id		= AT91CAP9_ID_PIOABCD,</div><div class='del'>-		.offset		= AT91_PIOA,</div><div class='del'>-		.clock		= &amp;pioABCD_clk,</div><div class='add'>+		.regbase	= AT91CAP9_BASE_PIOA,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91CAP9_ID_PIOABCD,</div><div class='del'>-		.offset		= AT91_PIOB,</div><div class='del'>-		.clock		= &amp;pioABCD_clk,</div><div class='add'>+		.regbase	= AT91CAP9_BASE_PIOB,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91CAP9_ID_PIOABCD,</div><div class='del'>-		.offset		= AT91_PIOC,</div><div class='del'>-		.clock		= &amp;pioABCD_clk,</div><div class='add'>+		.regbase	= AT91CAP9_BASE_PIOC,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91CAP9_ID_PIOABCD,</div><div class='del'>-		.offset		= AT91_PIOD,</div><div class='del'>-		.clock		= &amp;pioABCD_clk,</div><div class='add'>+		.regbase	= AT91CAP9_BASE_PIOD,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void at91cap9_reset(void)</div><div class='add'>+static void at91cap9_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void at91cap9_poweroff(void)</div><div class='del'>-{</div><div class='del'>-	at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='ctx'>  *  AT91CAP9 processor initialization</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='hunk'>@@ -333,10 +328,16 @@ static void __init at91cap9_map_io(void)</div><div class='ctx'> 	at91_init_sram(0, AT91CAP9_SRAM_BASE, AT91CAP9_SRAM_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init at91cap9_ioremap_registers(void)</div><div class='add'>+{</div><div class='add'>+	at91_ioremap_shdwc(AT91CAP9_BASE_SHDWC);</div><div class='add'>+	at91sam926x_ioremap_pit(AT91CAP9_BASE_PIT);</div><div class='add'>+	at91sam9_ioremap_smc(0, AT91CAP9_BASE_SMC);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init at91cap9_initialize(void)</div><div class='ctx'> {</div><div class='del'>-	at91_arch_reset = at91cap9_reset;</div><div class='del'>-	pm_power_off = at91cap9_poweroff;</div><div class='add'>+	arm_pm_restart = at91cap9_restart;</div><div class='ctx'> 	at91_extern_irq = (1 &lt;&lt; AT91CAP9_ID_IRQ0) | (1 &lt;&lt; AT91CAP9_ID_IRQ1);</div><div class='ctx'> </div><div class='ctx'> 	/* Register GPIO subsystem */</div><div class='hunk'>@@ -394,6 +395,7 @@ static unsigned int at91cap9_default_irq_priority[NR_AIC_IRQS] __initdata = {</div><div class='ctx'> struct at91_init_soc __initdata at91cap9_soc = {</div><div class='ctx'> 	.map_io = at91cap9_map_io,</div><div class='ctx'> 	.default_irq_priority = at91cap9_default_irq_priority,</div><div class='add'>+	.ioremap_registers = at91cap9_ioremap_registers,</div><div class='ctx'> 	.register_clocks = at91cap9_register_clocks,</div><div class='ctx'> 	.init = at91cap9_initialize,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c<br/>index adad70db70eb..d298fb7cb210 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91cap9_devices.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91cap9_devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91cap9_devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/at91cap9_devices.c</a></div><div class='hunk'>@@ -76,7 +76,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)</div><div class='ctx'> </div><div class='ctx'> 	/* Enable VBus control for UHP ports */</div><div class='ctx'> 	for (i = 0; i &lt; data-&gt;ports; i++) {</div><div class='del'>-		if (data-&gt;vbus_pin[i])</div><div class='add'>+		if (gpio_is_valid(data-&gt;vbus_pin[i]))</div><div class='ctx'> 			at91_set_gpio_output(data-&gt;vbus_pin[i], 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -179,7 +179,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)</div><div class='ctx'> 	usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);</div><div class='ctx'> 	memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));</div><div class='ctx'> </div><div class='del'>-	if (data &amp;&amp; data-&gt;vbus_pin &gt; 0) {</div><div class='add'>+	if (data &amp;&amp; gpio_is_valid(data-&gt;vbus_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;vbus_pin, 0);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;vbus_pin, 1);</div><div class='ctx'> 		usba_udc_data.pdata.vbus_pin = data-&gt;vbus_pin;</div><div class='hunk'>@@ -200,7 +200,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data) {}</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE)</div><div class='ctx'> static u64 eth_dmamask = DMA_BIT_MASK(32);</div><div class='del'>-static struct at91_eth_data eth_data;</div><div class='add'>+static struct macb_platform_data eth_data;</div><div class='ctx'> </div><div class='ctx'> static struct resource eth_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='hunk'>@@ -227,12 +227,12 @@ static struct platform_device at91cap9_eth_device = {</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(eth_resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init at91_add_device_eth(struct at91_eth_data *data)</div><div class='add'>+void __init at91_add_device_eth(struct macb_platform_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;phy_irq_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;phy_irq_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;phy_irq_pin, 0);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;phy_irq_pin, 1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -264,7 +264,7 @@ void __init at91_add_device_eth(struct at91_eth_data *data)</div><div class='ctx'> 	platform_device_register(&amp;at91cap9_eth_device);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-void __init at91_add_device_eth(struct at91_eth_data *data) {}</div><div class='add'>+void __init at91_add_device_eth(struct macb_platform_data *data) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -332,13 +332,13 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* input/irq */</div><div class='del'>-	if (data-&gt;det_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;det_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;det_pin, 1);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;det_pin, 1);</div><div class='ctx'> 	}</div><div class='del'>-	if (data-&gt;wp_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;wp_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;wp_pin, 1);</div><div class='del'>-	if (data-&gt;vcc_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;vcc_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;vcc_pin, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (mmc_id == 0) {		/* MCI0 */</div><div class='hunk'>@@ -398,8 +398,8 @@ static struct resource nand_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_ECC,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_ECC + SZ_512 - 1,</div><div class='add'>+		.start	= AT91CAP9_BASE_ECC,</div><div class='add'>+		.end	= AT91CAP9_BASE_ECC + SZ_512 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -425,15 +425,15 @@ void __init at91_add_device_nand(struct atmel_nand_data *data)</div><div class='ctx'> 	at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA);</div><div class='ctx'> </div><div class='ctx'> 	/* enable pin */</div><div class='del'>-	if (data-&gt;enable_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;enable_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;enable_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* ready/busy pin */</div><div class='del'>-	if (data-&gt;rdy_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;rdy_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;rdy_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* card detect pin */</div><div class='del'>-	if (data-&gt;det_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;det_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;det_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	nand_data = *data;</div><div class='hunk'>@@ -670,8 +670,8 @@ static void __init at91_add_device_tc(void) { }</div><div class='ctx'> </div><div class='ctx'> static struct resource rtt_resources[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_RTT,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_RTT + SZ_16 - 1,</div><div class='add'>+		.start	= AT91CAP9_BASE_RTT,</div><div class='add'>+		.end	= AT91CAP9_BASE_RTT + SZ_16 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -694,10 +694,19 @@ static void __init at91_add_device_rtt(void)</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_AT91SAM9X_WATCHDOG) || defined(CONFIG_AT91SAM9X_WATCHDOG_MODULE)</div><div class='add'>+static struct resource wdt_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= AT91CAP9_BASE_WDT,</div><div class='add'>+		.end	= AT91CAP9_BASE_WDT + SZ_16 - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device at91cap9_wdt_device = {</div><div class='ctx'> 	.name		= "at91_wdt",</div><div class='ctx'> 	.id		= -1,</div><div class='del'>-	.num_resources	= 0,</div><div class='add'>+	.resource	= wdt_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(wdt_resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init at91_add_device_watchdog(void)</div><div class='hunk'>@@ -807,7 +816,7 @@ void __init at91_add_device_ac97(struct ac97c_platform_data *data)</div><div class='ctx'> 	at91_set_A_periph(AT91_PIN_PA9, 0);	/* AC97RX */</div><div class='ctx'> </div><div class='ctx'> 	/* reset */</div><div class='del'>-	if (data-&gt;reset_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;reset_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;reset_pin, 0);</div><div class='ctx'> </div><div class='ctx'> 	ac97_data = *data;</div><div class='hunk'>@@ -1021,8 +1030,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}</div><div class='ctx'> #if defined(CONFIG_SERIAL_ATMEL)</div><div class='ctx'> static struct resource dbgu_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_DBGU,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,</div><div class='add'>+		.start	= AT91CAP9_BASE_DBGU,</div><div class='add'>+		.end	= AT91CAP9_BASE_DBGU + SZ_512 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='head'>diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c<br/>index 713d3bdbd284..99c3174e24a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91rm9200.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91rm9200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91rm9200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/at91rm9200.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include "soc.h"</div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "clock.h"</div><div class='add'>+#include "sam9_smc.h"</div><div class='ctx'> </div><div class='ctx'> static struct map_desc at91rm9200_io_desc[] __initdata = {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -195,6 +196,10 @@ static struct clk_lookup periph_clocks_lookups[] = {</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("pclk", "ssc.2", &amp;ssc2_clk),</div><div class='ctx'> 	/* fake hclk clock */</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &amp;ohci_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioA", &amp;pioA_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioB", &amp;pioB_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioC", &amp;pioC_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioD", &amp;pioD_clk),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk_lookup usart_clocks_lookups[] = {</div><div class='hunk'>@@ -268,27 +273,23 @@ void __init at91rm9200_set_console_clock(int id)</div><div class='ctx'>  *  GPIO</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static struct at91_gpio_bank at91rm9200_gpio[] = {</div><div class='add'>+static struct at91_gpio_bank at91rm9200_gpio[] __initdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.id		= AT91RM9200_ID_PIOA,</div><div class='del'>-		.offset		= AT91_PIOA,</div><div class='del'>-		.clock		= &amp;pioA_clk,</div><div class='add'>+		.regbase	= AT91RM9200_BASE_PIOA,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91RM9200_ID_PIOB,</div><div class='del'>-		.offset		= AT91_PIOB,</div><div class='del'>-		.clock		= &amp;pioB_clk,</div><div class='add'>+		.regbase	= AT91RM9200_BASE_PIOB,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91RM9200_ID_PIOC,</div><div class='del'>-		.offset		= AT91_PIOC,</div><div class='del'>-		.clock		= &amp;pioC_clk,</div><div class='add'>+		.regbase	= AT91RM9200_BASE_PIOC,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91RM9200_ID_PIOD,</div><div class='del'>-		.offset		= AT91_PIOD,</div><div class='del'>-		.clock		= &amp;pioD_clk,</div><div class='add'>+		.regbase	= AT91RM9200_BASE_PIOD,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void at91rm9200_reset(void)</div><div class='add'>+static void at91rm9200_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Perform a hardware reset with the use of the Watchdog timer.</div><div class='hunk'>@@ -307,9 +308,13 @@ static void __init at91rm9200_map_io(void)</div><div class='ctx'> 	iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init at91rm9200_ioremap_registers(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init at91rm9200_initialize(void)</div><div class='ctx'> {</div><div class='del'>-	at91_arch_reset = at91rm9200_reset;</div><div class='add'>+	arm_pm_restart = at91rm9200_restart;</div><div class='ctx'> 	at91_extern_irq = (1 &lt;&lt; AT91RM9200_ID_IRQ0) | (1 &lt;&lt; AT91RM9200_ID_IRQ1)</div><div class='ctx'> 			| (1 &lt;&lt; AT91RM9200_ID_IRQ2) | (1 &lt;&lt; AT91RM9200_ID_IRQ3)</div><div class='ctx'> 			| (1 &lt;&lt; AT91RM9200_ID_IRQ4) | (1 &lt;&lt; AT91RM9200_ID_IRQ5)</div><div class='hunk'>@@ -366,6 +371,7 @@ static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {</div><div class='ctx'> struct at91_init_soc __initdata at91rm9200_soc = {</div><div class='ctx'> 	.map_io = at91rm9200_map_io,</div><div class='ctx'> 	.default_irq_priority = at91rm9200_default_irq_priority,</div><div class='add'>+	.ioremap_registers = at91rm9200_ioremap_registers,</div><div class='ctx'> 	.register_clocks = at91rm9200_register_clocks,</div><div class='ctx'> 	.init = at91rm9200_initialize,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c<br/>index ad930688358c..18bacec2b094 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91rm9200_devices.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91rm9200_devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91rm9200_devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/at91rm9200_devices.c</a></div><div class='hunk'>@@ -114,11 +114,11 @@ void __init at91_add_device_udc(struct at91_udc_data *data)</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;vbus_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;vbus_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;vbus_pin, 0);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;vbus_pin, 1);</div><div class='ctx'> 	}</div><div class='del'>-	if (data-&gt;pullup_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;pullup_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;pullup_pin, 0);</div><div class='ctx'> </div><div class='ctx'> 	udc_data = *data;</div><div class='hunk'>@@ -135,7 +135,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {}</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_ARM_AT91_ETHER) || defined(CONFIG_ARM_AT91_ETHER_MODULE)</div><div class='ctx'> static u64 eth_dmamask = DMA_BIT_MASK(32);</div><div class='del'>-static struct at91_eth_data eth_data;</div><div class='add'>+static struct macb_platform_data eth_data;</div><div class='ctx'> </div><div class='ctx'> static struct resource eth_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='hunk'>@@ -162,12 +162,12 @@ static struct platform_device at91rm9200_eth_device = {</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(eth_resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init at91_add_device_eth(struct at91_eth_data *data)</div><div class='add'>+void __init at91_add_device_eth(struct macb_platform_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;phy_irq_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;phy_irq_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;phy_irq_pin, 0);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;phy_irq_pin, 1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -199,7 +199,7 @@ void __init at91_add_device_eth(struct at91_eth_data *data)</div><div class='ctx'> 	platform_device_register(&amp;at91rm9200_eth_device);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-void __init at91_add_device_eth(struct at91_eth_data *data) {}</div><div class='add'>+void __init at91_add_device_eth(struct macb_platform_data *data) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -260,7 +260,7 @@ void __init at91_add_device_cf(struct at91_cf_data *data)</div><div class='ctx'> 	);</div><div class='ctx'> </div><div class='ctx'> 	/* input/irq */</div><div class='del'>-	if (data-&gt;irq_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;irq_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;irq_pin, 1);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;irq_pin, 1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -268,7 +268,7 @@ void __init at91_add_device_cf(struct at91_cf_data *data)</div><div class='ctx'> 	at91_set_deglitch(data-&gt;det_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* outputs, initially off */</div><div class='del'>-	if (data-&gt;vcc_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;vcc_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;vcc_pin, 0);</div><div class='ctx'> 	at91_set_gpio_output(data-&gt;rst_pin, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -328,13 +328,13 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* input/irq */</div><div class='del'>-	if (data-&gt;det_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;det_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;det_pin, 1);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;det_pin, 1);</div><div class='ctx'> 	}</div><div class='del'>-	if (data-&gt;wp_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;wp_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;wp_pin, 1);</div><div class='del'>-	if (data-&gt;vcc_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;vcc_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;vcc_pin, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* CLK */</div><div class='hunk'>@@ -419,15 +419,15 @@ void __init at91_add_device_nand(struct atmel_nand_data *data)</div><div class='ctx'> 	);</div><div class='ctx'> </div><div class='ctx'> 	/* enable pin */</div><div class='del'>-	if (data-&gt;enable_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;enable_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;enable_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* ready/busy pin */</div><div class='del'>-	if (data-&gt;rdy_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;rdy_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;rdy_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* card detect pin */</div><div class='del'>-	if (data-&gt;det_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;det_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;det_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	at91_set_A_periph(AT91_PIN_PC1, 0);		/* SMOE */</div><div class='hunk'>@@ -665,10 +665,24 @@ static void __init at91_add_device_tc(void) { }</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_RTC_DRV_AT91RM9200) || defined(CONFIG_RTC_DRV_AT91RM9200_MODULE)</div><div class='add'>+static struct resource rtc_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AT91RM9200_BASE_RTC,</div><div class='add'>+		.end	= AT91RM9200_BASE_RTC + SZ_256 - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AT91_ID_SYS,</div><div class='add'>+		.end	= AT91_ID_SYS,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device at91rm9200_rtc_device = {</div><div class='ctx'> 	.name		= "at91_rtc",</div><div class='ctx'> 	.id		= -1,</div><div class='del'>-	.num_resources	= 0,</div><div class='add'>+	.resource	= rtc_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(rtc_resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init at91_add_device_rtc(void)</div><div class='hunk'>@@ -877,8 +891,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}</div><div class='ctx'> #if defined(CONFIG_SERIAL_ATMEL)</div><div class='ctx'> static struct resource dbgu_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_DBGU,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,</div><div class='add'>+		.start	= AT91RM9200_BASE_DBGU,</div><div class='add'>+		.end	= AT91RM9200_BASE_DBGU + SZ_512 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='head'>diff --git a/arch/arm/mach-at91/at91rm9200_time.c b/arch/arm/mach-at91/at91rm9200_time.c<br/>index 1dd69c85dfec..a028cdf8f974 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91rm9200_time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91rm9200_time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91rm9200_time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/at91rm9200_time.c</a></div><div class='hunk'>@@ -32,6 +32,8 @@ static unsigned long last_crtr;</div><div class='ctx'> static u32 irqmask;</div><div class='ctx'> static struct clock_event_device clkevt;</div><div class='ctx'> </div><div class='add'>+#define RM9200_TIMER_LATCH	((AT91_SLOW_CLOCK + HZ/2) / HZ)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The ST_CRTR is updated asynchronously to the master clock ... but</div><div class='ctx'>  * the updates as seen by the CPU don't seem to be strictly monotonic.</div><div class='hunk'>@@ -74,8 +76,8 @@ static irqreturn_t at91rm9200_timer_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	if (sr &amp; AT91_ST_PITS) {</div><div class='ctx'> 		u32	crtr = read_CRTR();</div><div class='ctx'> </div><div class='del'>-		while (((crtr - last_crtr) &amp; AT91_ST_CRTV) &gt;= LATCH) {</div><div class='del'>-			last_crtr += LATCH;</div><div class='add'>+		while (((crtr - last_crtr) &amp; AT91_ST_CRTV) &gt;= RM9200_TIMER_LATCH) {</div><div class='add'>+			last_crtr += RM9200_TIMER_LATCH;</div><div class='ctx'> 			clkevt.event_handler(&amp;clkevt);</div><div class='ctx'> 		}</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='hunk'>@@ -116,7 +118,7 @@ clkevt32k_mode(enum clock_event_mode mode, struct clock_event_device *dev)</div><div class='ctx'> 	case CLOCK_EVT_MODE_PERIODIC:</div><div class='ctx'> 		/* PIT for periodic irqs; fixed rate of 1/HZ */</div><div class='ctx'> 		irqmask = AT91_ST_PITS;</div><div class='del'>-		at91_sys_write(AT91_ST_PIMR, LATCH);</div><div class='add'>+		at91_sys_write(AT91_ST_PIMR, RM9200_TIMER_LATCH);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CLOCK_EVT_MODE_ONESHOT:</div><div class='ctx'> 		/* ALM for oneshot irqs, set by next_event()</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c<br/>index 0d20677fbef0..5e46e4a96430 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9260.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9260.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9260.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/at91sam9260.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</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/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -21,11 +20,11 @@</div><div class='ctx'> #include &lt;mach/at91sam9260.h&gt;</div><div class='ctx'> #include &lt;mach/at91_pmc.h&gt;</div><div class='ctx'> #include &lt;mach/at91_rstc.h&gt;</div><div class='del'>-#include &lt;mach/at91_shdwc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "soc.h"</div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "clock.h"</div><div class='add'>+#include "sam9_smc.h"</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='ctx'>  *  Clocks</div><div class='hunk'>@@ -120,7 +119,7 @@ static struct clk ohci_clk = {</div><div class='ctx'> 	.type		= CLK_TYPE_PERIPHERAL,</div><div class='ctx'> };</div><div class='ctx'> static struct clk macb_clk = {</div><div class='del'>-	.name		= "macb_clk",</div><div class='add'>+	.name		= "pclk",</div><div class='ctx'> 	.pmc_mask	= 1 &lt;&lt; AT91SAM9260_ID_EMAC,</div><div class='ctx'> 	.type		= CLK_TYPE_PERIPHERAL,</div><div class='ctx'> };</div><div class='hunk'>@@ -190,6 +189,8 @@ static struct clk *periph_clocks[] __initdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk_lookup periph_clocks_lookups[] = {</div><div class='add'>+	/* One additional fake clock for macb_hclk */</div><div class='add'>+	CLKDEV_CON_ID("hclk", &amp;macb_clk),</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &amp;spi0_clk),</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &amp;spi1_clk),</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &amp;tc0_clk),</div><div class='hunk'>@@ -209,6 +210,9 @@ static struct clk_lookup periph_clocks_lookups[] = {</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("usart", "fffd8000.serial", &amp;usart5_clk),</div><div class='ctx'> 	/* fake hclk clock */</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &amp;ohci_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioA", &amp;pioA_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioB", &amp;pioB_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioC", &amp;pioC_clk),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk_lookup usart_clocks_lookups[] = {</div><div class='hunk'>@@ -270,28 +274,19 @@ void __init at91sam9260_set_console_clock(int id)</div><div class='ctx'>  *  GPIO</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static struct at91_gpio_bank at91sam9260_gpio[] = {</div><div class='add'>+static struct at91_gpio_bank at91sam9260_gpio[] __initdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.id		= AT91SAM9260_ID_PIOA,</div><div class='del'>-		.offset		= AT91_PIOA,</div><div class='del'>-		.clock		= &amp;pioA_clk,</div><div class='add'>+		.regbase	= AT91SAM9260_BASE_PIOA,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91SAM9260_ID_PIOB,</div><div class='del'>-		.offset		= AT91_PIOB,</div><div class='del'>-		.clock		= &amp;pioB_clk,</div><div class='add'>+		.regbase	= AT91SAM9260_BASE_PIOB,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91SAM9260_ID_PIOC,</div><div class='del'>-		.offset		= AT91_PIOC,</div><div class='del'>-		.clock		= &amp;pioC_clk,</div><div class='add'>+		.regbase	= AT91SAM9260_BASE_PIOC,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void at91sam9260_poweroff(void)</div><div class='del'>-{</div><div class='del'>-	at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='ctx'>  *  AT91SAM9260 processor initialization</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='hunk'>@@ -325,10 +320,16 @@ static void __init at91sam9260_map_io(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init at91sam9260_ioremap_registers(void)</div><div class='add'>+{</div><div class='add'>+	at91_ioremap_shdwc(AT91SAM9260_BASE_SHDWC);</div><div class='add'>+	at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT);</div><div class='add'>+	at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init at91sam9260_initialize(void)</div><div class='ctx'> {</div><div class='del'>-	at91_arch_reset = at91sam9_alt_reset;</div><div class='del'>-	pm_power_off = at91sam9260_poweroff;</div><div class='add'>+	arm_pm_restart = at91sam9_alt_restart;</div><div class='ctx'> 	at91_extern_irq = (1 &lt;&lt; AT91SAM9260_ID_IRQ0) | (1 &lt;&lt; AT91SAM9260_ID_IRQ1)</div><div class='ctx'> 			| (1 &lt;&lt; AT91SAM9260_ID_IRQ2);</div><div class='ctx'> </div><div class='hunk'>@@ -381,6 +382,7 @@ static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {</div><div class='ctx'> struct at91_init_soc __initdata at91sam9260_soc = {</div><div class='ctx'> 	.map_io = at91sam9260_map_io,</div><div class='ctx'> 	.default_irq_priority = at91sam9260_default_irq_priority,</div><div class='add'>+	.ioremap_registers = at91sam9260_ioremap_registers,</div><div class='ctx'> 	.register_clocks = at91sam9260_register_clocks,</div><div class='ctx'> 	.init = at91sam9260_initialize,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c<br/>index 629fa9774972..642ccb6d26b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9260_devices.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9260_devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9260_devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/at91sam9260_devices.c</a></div><div class='hunk'>@@ -115,7 +115,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data)</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;vbus_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;vbus_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;vbus_pin, 0);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;vbus_pin, 1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -136,7 +136,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {}</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE)</div><div class='ctx'> static u64 eth_dmamask = DMA_BIT_MASK(32);</div><div class='del'>-static struct at91_eth_data eth_data;</div><div class='add'>+static struct macb_platform_data eth_data;</div><div class='ctx'> </div><div class='ctx'> static struct resource eth_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='hunk'>@@ -163,12 +163,12 @@ static struct platform_device at91sam9260_eth_device = {</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(eth_resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init at91_add_device_eth(struct at91_eth_data *data)</div><div class='add'>+void __init at91_add_device_eth(struct macb_platform_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;phy_irq_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;phy_irq_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;phy_irq_pin, 0);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;phy_irq_pin, 1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -200,7 +200,7 @@ void __init at91_add_device_eth(struct at91_eth_data *data)</div><div class='ctx'> 	platform_device_register(&amp;at91sam9260_eth_device);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-void __init at91_add_device_eth(struct at91_eth_data *data) {}</div><div class='add'>+void __init at91_add_device_eth(struct macb_platform_data *data) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -243,13 +243,13 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* input/irq */</div><div class='del'>-	if (data-&gt;det_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;det_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;det_pin, 1);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;det_pin, 1);</div><div class='ctx'> 	}</div><div class='del'>-	if (data-&gt;wp_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;wp_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;wp_pin, 1);</div><div class='del'>-	if (data-&gt;vcc_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;vcc_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;vcc_pin, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* CLK */</div><div class='hunk'>@@ -330,11 +330,11 @@ void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data)</div><div class='ctx'> 	for (i = 0; i &lt; ATMCI_MAX_NR_SLOTS; i++) {</div><div class='ctx'> 		if (data-&gt;slot[i].bus_width) {</div><div class='ctx'> 			/* input/irq */</div><div class='del'>-			if (data-&gt;slot[i].detect_pin) {</div><div class='add'>+			if (gpio_is_valid(data-&gt;slot[i].detect_pin)) {</div><div class='ctx'> 				at91_set_gpio_input(data-&gt;slot[i].detect_pin, 1);</div><div class='ctx'> 				at91_set_deglitch(data-&gt;slot[i].detect_pin, 1);</div><div class='ctx'> 			}</div><div class='del'>-			if (data-&gt;slot[i].wp_pin)</div><div class='add'>+			if (gpio_is_valid(data-&gt;slot[i].wp_pin))</div><div class='ctx'> 				at91_set_gpio_input(data-&gt;slot[i].wp_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 			switch (i) {</div><div class='hunk'>@@ -399,8 +399,8 @@ static struct resource nand_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_ECC,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_ECC + SZ_512 - 1,</div><div class='add'>+		.start	= AT91SAM9260_BASE_ECC,</div><div class='add'>+		.end	= AT91SAM9260_BASE_ECC + SZ_512 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -426,15 +426,15 @@ void __init at91_add_device_nand(struct atmel_nand_data *data)</div><div class='ctx'> 	at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);</div><div class='ctx'> </div><div class='ctx'> 	/* enable pin */</div><div class='del'>-	if (data-&gt;enable_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;enable_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;enable_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* ready/busy pin */</div><div class='del'>-	if (data-&gt;rdy_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;rdy_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;rdy_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* card detect pin */</div><div class='del'>-	if (data-&gt;det_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;det_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;det_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	nand_data = *data;</div><div class='hunk'>@@ -714,8 +714,8 @@ static void __init at91_add_device_tc(void) { }</div><div class='ctx'> </div><div class='ctx'> static struct resource rtt_resources[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_RTT,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_RTT + SZ_16 - 1,</div><div class='add'>+		.start	= AT91SAM9260_BASE_RTT,</div><div class='add'>+		.end	= AT91SAM9260_BASE_RTT + SZ_16 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -738,10 +738,19 @@ static void __init at91_add_device_rtt(void)</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_AT91SAM9X_WATCHDOG) || defined(CONFIG_AT91SAM9X_WATCHDOG_MODULE)</div><div class='add'>+static struct resource wdt_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= AT91SAM9260_BASE_WDT,</div><div class='add'>+		.end	= AT91SAM9260_BASE_WDT + SZ_16 - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device at91sam9260_wdt_device = {</div><div class='ctx'> 	.name		= "at91_wdt",</div><div class='ctx'> 	.id		= -1,</div><div class='del'>-	.num_resources	= 0,</div><div class='add'>+	.resource	= wdt_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(wdt_resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init at91_add_device_watchdog(void)</div><div class='hunk'>@@ -837,8 +846,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}</div><div class='ctx'> #if defined(CONFIG_SERIAL_ATMEL)</div><div class='ctx'> static struct resource dbgu_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_DBGU,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,</div><div class='add'>+		.start	= AT91SAM9260_BASE_DBGU,</div><div class='add'>+		.end	= AT91SAM9260_BASE_DBGU + SZ_512 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='hunk'>@@ -1281,17 +1290,17 @@ void __init at91_add_device_cf(struct at91_cf_data *data)</div><div class='ctx'> </div><div class='ctx'> 	at91_sys_write(AT91_MATRIX_EBICSA, csa);</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;rst_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;rst_pin)) {</div><div class='ctx'> 		at91_set_multi_drive(data-&gt;rst_pin, 0);</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;rst_pin, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;irq_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;irq_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;irq_pin, 0);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;irq_pin, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;det_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;det_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;det_pin, 0);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;det_pin, 1);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c<br/>index 658a5185abfd..b85b9ea60170 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9261.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9261.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9261.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/at91sam9261.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</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/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -20,11 +19,11 @@</div><div class='ctx'> #include &lt;mach/at91sam9261.h&gt;</div><div class='ctx'> #include &lt;mach/at91_pmc.h&gt;</div><div class='ctx'> #include &lt;mach/at91_rstc.h&gt;</div><div class='del'>-#include &lt;mach/at91_shdwc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "soc.h"</div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "clock.h"</div><div class='add'>+#include "sam9_smc.h"</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='ctx'>  *  Clocks</div><div class='hunk'>@@ -176,6 +175,9 @@ static struct clk_lookup periph_clocks_lookups[] = {</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("pclk", "ssc.1", &amp;ssc1_clk),</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("pclk", "ssc.2", &amp;ssc2_clk),</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &amp;hck0),</div><div class='add'>+	CLKDEV_CON_ID("pioA", &amp;pioA_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioB", &amp;pioB_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioC", &amp;pioC_clk),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk_lookup usart_clocks_lookups[] = {</div><div class='hunk'>@@ -251,28 +253,19 @@ void __init at91sam9261_set_console_clock(int id)</div><div class='ctx'>  *  GPIO</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static struct at91_gpio_bank at91sam9261_gpio[] = {</div><div class='add'>+static struct at91_gpio_bank at91sam9261_gpio[] __initdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.id		= AT91SAM9261_ID_PIOA,</div><div class='del'>-		.offset		= AT91_PIOA,</div><div class='del'>-		.clock		= &amp;pioA_clk,</div><div class='add'>+		.regbase	= AT91SAM9261_BASE_PIOA,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91SAM9261_ID_PIOB,</div><div class='del'>-		.offset		= AT91_PIOB,</div><div class='del'>-		.clock		= &amp;pioB_clk,</div><div class='add'>+		.regbase	= AT91SAM9261_BASE_PIOB,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91SAM9261_ID_PIOC,</div><div class='del'>-		.offset		= AT91_PIOC,</div><div class='del'>-		.clock		= &amp;pioC_clk,</div><div class='add'>+		.regbase	= AT91SAM9261_BASE_PIOC,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void at91sam9261_poweroff(void)</div><div class='del'>-{</div><div class='del'>-	at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='ctx'>  *  AT91SAM9261 processor initialization</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='hunk'>@@ -285,10 +278,16 @@ static void __init at91sam9261_map_io(void)</div><div class='ctx'> 		at91_init_sram(0, AT91SAM9261_SRAM_BASE, AT91SAM9261_SRAM_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init at91sam9261_ioremap_registers(void)</div><div class='add'>+{</div><div class='add'>+	at91_ioremap_shdwc(AT91SAM9261_BASE_SHDWC);</div><div class='add'>+	at91sam926x_ioremap_pit(AT91SAM9261_BASE_PIT);</div><div class='add'>+	at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init at91sam9261_initialize(void)</div><div class='ctx'> {</div><div class='del'>-	at91_arch_reset = at91sam9_alt_reset;</div><div class='del'>-	pm_power_off = at91sam9261_poweroff;</div><div class='add'>+	arm_pm_restart = at91sam9_alt_restart;</div><div class='ctx'> 	at91_extern_irq = (1 &lt;&lt; AT91SAM9261_ID_IRQ0) | (1 &lt;&lt; AT91SAM9261_ID_IRQ1)</div><div class='ctx'> 			| (1 &lt;&lt; AT91SAM9261_ID_IRQ2);</div><div class='ctx'> </div><div class='hunk'>@@ -341,6 +340,7 @@ static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {</div><div class='ctx'> struct at91_init_soc __initdata at91sam9261_soc = {</div><div class='ctx'> 	.map_io = at91sam9261_map_io,</div><div class='ctx'> 	.default_irq_priority = at91sam9261_default_irq_priority,</div><div class='add'>+	.ioremap_registers = at91sam9261_ioremap_registers,</div><div class='ctx'> 	.register_clocks = at91sam9261_register_clocks,</div><div class='ctx'> 	.init = at91sam9261_initialize,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c<br/>index a178b58b0b9c..fc59cbdb0e3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9261_devices.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9261_devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9261_devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/at91sam9261_devices.c</a></div><div class='hunk'>@@ -118,7 +118,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data)</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;vbus_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;vbus_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;vbus_pin, 0);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;vbus_pin, 1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -171,13 +171,13 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* input/irq */</div><div class='del'>-	if (data-&gt;det_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;det_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;det_pin, 1);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;det_pin, 1);</div><div class='ctx'> 	}</div><div class='del'>-	if (data-&gt;wp_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;wp_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;wp_pin, 1);</div><div class='del'>-	if (data-&gt;vcc_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;vcc_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;vcc_pin, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* CLK */</div><div class='hunk'>@@ -240,15 +240,15 @@ void __init at91_add_device_nand(struct atmel_nand_data *data)</div><div class='ctx'> 	at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);</div><div class='ctx'> </div><div class='ctx'> 	/* enable pin */</div><div class='del'>-	if (data-&gt;enable_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;enable_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;enable_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* ready/busy pin */</div><div class='del'>-	if (data-&gt;rdy_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;rdy_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;rdy_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* card detect pin */</div><div class='del'>-	if (data-&gt;det_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;det_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;det_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	at91_set_A_periph(AT91_PIN_PC0, 0);		/* NANDOE */</div><div class='hunk'>@@ -600,8 +600,8 @@ static void __init at91_add_device_tc(void) { }</div><div class='ctx'> </div><div class='ctx'> static struct resource rtt_resources[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_RTT,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_RTT + SZ_16 - 1,</div><div class='add'>+		.start	= AT91SAM9261_BASE_RTT,</div><div class='add'>+		.end	= AT91SAM9261_BASE_RTT + SZ_16 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -624,10 +624,19 @@ static void __init at91_add_device_rtt(void)</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_AT91SAM9X_WATCHDOG) || defined(CONFIG_AT91SAM9X_WATCHDOG_MODULE)</div><div class='add'>+static struct resource wdt_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= AT91SAM9261_BASE_WDT,</div><div class='add'>+		.end	= AT91SAM9261_BASE_WDT + SZ_16 - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device at91sam9261_wdt_device = {</div><div class='ctx'> 	.name		= "at91_wdt",</div><div class='ctx'> 	.id		= -1,</div><div class='del'>-	.num_resources	= 0,</div><div class='add'>+	.resource	= wdt_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(wdt_resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init at91_add_device_watchdog(void)</div><div class='hunk'>@@ -816,8 +825,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}</div><div class='ctx'> #if defined(CONFIG_SERIAL_ATMEL)</div><div class='ctx'> static struct resource dbgu_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_DBGU,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,</div><div class='add'>+		.start	= AT91SAM9261_BASE_DBGU,</div><div class='add'>+		.end	= AT91SAM9261_BASE_DBGU + SZ_512 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c<br/>index f83fbb0ee0c5..79e3669b1117 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9263.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9263.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9263.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/at91sam9263.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</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/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -19,11 +18,11 @@</div><div class='ctx'> #include &lt;mach/at91sam9263.h&gt;</div><div class='ctx'> #include &lt;mach/at91_pmc.h&gt;</div><div class='ctx'> #include &lt;mach/at91_rstc.h&gt;</div><div class='del'>-#include &lt;mach/at91_shdwc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "soc.h"</div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "clock.h"</div><div class='add'>+#include "sam9_smc.h"</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='ctx'>  *  Clocks</div><div class='hunk'>@@ -118,7 +117,7 @@ static struct clk pwm_clk = {</div><div class='ctx'> 	.type		= CLK_TYPE_PERIPHERAL,</div><div class='ctx'> };</div><div class='ctx'> static struct clk macb_clk = {</div><div class='del'>-	.name		= "macb_clk",</div><div class='add'>+	.name		= "pclk",</div><div class='ctx'> 	.pmc_mask	= 1 &lt;&lt; AT91SAM9263_ID_EMAC,</div><div class='ctx'> 	.type		= CLK_TYPE_PERIPHERAL,</div><div class='ctx'> };</div><div class='hunk'>@@ -182,6 +181,8 @@ static struct clk *periph_clocks[] __initdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk_lookup periph_clocks_lookups[] = {</div><div class='add'>+	/* One additional fake clock for macb_hclk */</div><div class='add'>+	CLKDEV_CON_ID("hclk", &amp;macb_clk),</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("pclk", "ssc.0", &amp;ssc0_clk),</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("pclk", "ssc.1", &amp;ssc1_clk),</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.0", &amp;mmc0_clk),</div><div class='hunk'>@@ -191,6 +192,11 @@ static struct clk_lookup periph_clocks_lookups[] = {</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &amp;tcb_clk),</div><div class='ctx'> 	/* fake hclk clock */</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &amp;ohci_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioA", &amp;pioA_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioB", &amp;pioB_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioC", &amp;pioCDE_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioD", &amp;pioCDE_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioE", &amp;pioCDE_clk),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk_lookup usart_clocks_lookups[] = {</div><div class='hunk'>@@ -263,36 +269,25 @@ void __init at91sam9263_set_console_clock(int id)</div><div class='ctx'>  *  GPIO</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static struct at91_gpio_bank at91sam9263_gpio[] = {</div><div class='add'>+static struct at91_gpio_bank at91sam9263_gpio[] __initdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.id		= AT91SAM9263_ID_PIOA,</div><div class='del'>-		.offset		= AT91_PIOA,</div><div class='del'>-		.clock		= &amp;pioA_clk,</div><div class='add'>+		.regbase	= AT91SAM9263_BASE_PIOA,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91SAM9263_ID_PIOB,</div><div class='del'>-		.offset		= AT91_PIOB,</div><div class='del'>-		.clock		= &amp;pioB_clk,</div><div class='add'>+		.regbase	= AT91SAM9263_BASE_PIOB,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91SAM9263_ID_PIOCDE,</div><div class='del'>-		.offset		= AT91_PIOC,</div><div class='del'>-		.clock		= &amp;pioCDE_clk,</div><div class='add'>+		.regbase	= AT91SAM9263_BASE_PIOC,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91SAM9263_ID_PIOCDE,</div><div class='del'>-		.offset		= AT91_PIOD,</div><div class='del'>-		.clock		= &amp;pioCDE_clk,</div><div class='add'>+		.regbase	= AT91SAM9263_BASE_PIOD,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91SAM9263_ID_PIOCDE,</div><div class='del'>-		.offset		= AT91_PIOE,</div><div class='del'>-		.clock		= &amp;pioCDE_clk,</div><div class='add'>+		.regbase	= AT91SAM9263_BASE_PIOE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void at91sam9263_poweroff(void)</div><div class='del'>-{</div><div class='del'>-	at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='ctx'>  *  AT91SAM9263 processor initialization</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='hunk'>@@ -303,10 +298,17 @@ static void __init at91sam9263_map_io(void)</div><div class='ctx'> 	at91_init_sram(1, AT91SAM9263_SRAM1_BASE, AT91SAM9263_SRAM1_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init at91sam9263_ioremap_registers(void)</div><div class='add'>+{</div><div class='add'>+	at91_ioremap_shdwc(AT91SAM9263_BASE_SHDWC);</div><div class='add'>+	at91sam926x_ioremap_pit(AT91SAM9263_BASE_PIT);</div><div class='add'>+	at91sam9_ioremap_smc(0, AT91SAM9263_BASE_SMC0);</div><div class='add'>+	at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init at91sam9263_initialize(void)</div><div class='ctx'> {</div><div class='del'>-	at91_arch_reset = at91sam9_alt_reset;</div><div class='del'>-	pm_power_off = at91sam9263_poweroff;</div><div class='add'>+	arm_pm_restart = at91sam9_alt_restart;</div><div class='ctx'> 	at91_extern_irq = (1 &lt;&lt; AT91SAM9263_ID_IRQ0) | (1 &lt;&lt; AT91SAM9263_ID_IRQ1);</div><div class='ctx'> </div><div class='ctx'> 	/* Register GPIO subsystem */</div><div class='hunk'>@@ -358,6 +360,7 @@ static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = {</div><div class='ctx'> struct at91_init_soc __initdata at91sam9263_soc = {</div><div class='ctx'> 	.map_io = at91sam9263_map_io,</div><div class='ctx'> 	.default_irq_priority = at91sam9263_default_irq_priority,</div><div class='add'>+	.ioremap_registers = at91sam9263_ioremap_registers,</div><div class='ctx'> 	.register_clocks = at91sam9263_register_clocks,</div><div class='ctx'> 	.init = at91sam9263_initialize,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c<br/>index d5fbac9ff4fa..7b46b2787022 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9263_devices.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9263_devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9263_devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/at91sam9263_devices.c</a></div><div class='hunk'>@@ -70,7 +70,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)</div><div class='ctx'> </div><div class='ctx'> 	/* Enable VBus control for UHP ports */</div><div class='ctx'> 	for (i = 0; i &lt; data-&gt;ports; i++) {</div><div class='del'>-		if (data-&gt;vbus_pin[i])</div><div class='add'>+		if (gpio_is_valid(data-&gt;vbus_pin[i]))</div><div class='ctx'> 			at91_set_gpio_output(data-&gt;vbus_pin[i], 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -123,7 +123,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data)</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;vbus_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;vbus_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;vbus_pin, 0);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;vbus_pin, 1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -144,7 +144,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {}</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE)</div><div class='ctx'> static u64 eth_dmamask = DMA_BIT_MASK(32);</div><div class='del'>-static struct at91_eth_data eth_data;</div><div class='add'>+static struct macb_platform_data eth_data;</div><div class='ctx'> </div><div class='ctx'> static struct resource eth_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='hunk'>@@ -171,12 +171,12 @@ static struct platform_device at91sam9263_eth_device = {</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(eth_resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init at91_add_device_eth(struct at91_eth_data *data)</div><div class='add'>+void __init at91_add_device_eth(struct macb_platform_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;phy_irq_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;phy_irq_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;phy_irq_pin, 0);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;phy_irq_pin, 1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -208,7 +208,7 @@ void __init at91_add_device_eth(struct at91_eth_data *data)</div><div class='ctx'> 	platform_device_register(&amp;at91sam9263_eth_device);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-void __init at91_add_device_eth(struct at91_eth_data *data) {}</div><div class='add'>+void __init at91_add_device_eth(struct macb_platform_data *data) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -276,13 +276,13 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* input/irq */</div><div class='del'>-	if (data-&gt;det_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;det_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;det_pin, 1);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;det_pin, 1);</div><div class='ctx'> 	}</div><div class='del'>-	if (data-&gt;wp_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;wp_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;wp_pin, 1);</div><div class='del'>-	if (data-&gt;vcc_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;vcc_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;vcc_pin, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (mmc_id == 0) {		/* MCI0 */</div><div class='hunk'>@@ -430,17 +430,17 @@ void __init at91_add_device_cf(struct at91_cf_data *data)</div><div class='ctx'> 	}</div><div class='ctx'> 	at91_sys_write(AT91_MATRIX_EBI0CSA, ebi0_csa);</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;det_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;det_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;det_pin, 1);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;det_pin, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;irq_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;irq_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;irq_pin, 1);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;irq_pin, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;vcc_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;vcc_pin))</div><div class='ctx'> 		/* initially off */</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;vcc_pin, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -473,8 +473,8 @@ static struct resource nand_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_ECC0,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_ECC0 + SZ_512 - 1,</div><div class='add'>+		.start	= AT91SAM9263_BASE_ECC0,</div><div class='add'>+		.end	= AT91SAM9263_BASE_ECC0 + SZ_512 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -500,15 +500,15 @@ void __init at91_add_device_nand(struct atmel_nand_data *data)</div><div class='ctx'> 	at91_sys_write(AT91_MATRIX_EBI0CSA, csa | AT91_MATRIX_EBI0_CS3A_SMC_SMARTMEDIA);</div><div class='ctx'> </div><div class='ctx'> 	/* enable pin */</div><div class='del'>-	if (data-&gt;enable_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;enable_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;enable_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* ready/busy pin */</div><div class='del'>-	if (data-&gt;rdy_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;rdy_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;rdy_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* card detect pin */</div><div class='del'>-	if (data-&gt;det_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;det_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;det_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	nand_data = *data;</div><div class='hunk'>@@ -749,7 +749,7 @@ void __init at91_add_device_ac97(struct ac97c_platform_data *data)</div><div class='ctx'> 	at91_set_A_periph(AT91_PIN_PB3, 0);	/* AC97RX */</div><div class='ctx'> </div><div class='ctx'> 	/* reset */</div><div class='del'>-	if (data-&gt;reset_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;reset_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;reset_pin, 0);</div><div class='ctx'> </div><div class='ctx'> 	ac97_data = *data;</div><div class='hunk'>@@ -956,8 +956,8 @@ static void __init at91_add_device_tc(void) { }</div><div class='ctx'> </div><div class='ctx'> static struct resource rtt0_resources[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_RTT0,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_RTT0 + SZ_16 - 1,</div><div class='add'>+		.start	= AT91SAM9263_BASE_RTT0,</div><div class='add'>+		.end	= AT91SAM9263_BASE_RTT0 + SZ_16 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -971,8 +971,8 @@ static struct platform_device at91sam9263_rtt0_device = {</div><div class='ctx'> </div><div class='ctx'> static struct resource rtt1_resources[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_RTT1,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_RTT1 + SZ_16 - 1,</div><div class='add'>+		.start	= AT91SAM9263_BASE_RTT1,</div><div class='add'>+		.end	= AT91SAM9263_BASE_RTT1 + SZ_16 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -996,10 +996,19 @@ static void __init at91_add_device_rtt(void)</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_AT91SAM9X_WATCHDOG) || defined(CONFIG_AT91SAM9X_WATCHDOG_MODULE)</div><div class='add'>+static struct resource wdt_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= AT91SAM9263_BASE_WDT,</div><div class='add'>+		.end	= AT91SAM9263_BASE_WDT + SZ_16 - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device at91sam9263_wdt_device = {</div><div class='ctx'> 	.name		= "at91_wdt",</div><div class='ctx'> 	.id		= -1,</div><div class='del'>-	.num_resources	= 0,</div><div class='add'>+	.resource	= wdt_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(wdt_resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init at91_add_device_watchdog(void)</div><div class='hunk'>@@ -1196,8 +1205,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}</div><div class='ctx'> </div><div class='ctx'> static struct resource dbgu_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_DBGU,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,</div><div class='add'>+		.start	= AT91SAM9263_BASE_DBGU,</div><div class='add'>+		.end	= AT91SAM9263_BASE_DBGU + SZ_512 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/arch/arm/mach-at91/at91sam926x_time.c<br/>index 4ba85499fa97..d89ead740a99 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam926x_time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam926x_time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam926x_time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/at91sam926x_time.c</a></div><div class='hunk'>@@ -25,7 +25,17 @@</div><div class='ctx'> </div><div class='ctx'> static u32 pit_cycle;		/* write-once */</div><div class='ctx'> static u32 pit_cnt;		/* access only w/system irq blocked */</div><div class='add'>+static void __iomem *pit_base_addr __read_mostly;</div><div class='ctx'> </div><div class='add'>+static inline unsigned int pit_read(unsigned int reg_offset)</div><div class='add'>+{</div><div class='add'>+	return __raw_readl(pit_base_addr + reg_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void pit_write(unsigned int reg_offset, unsigned long value)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(value, pit_base_addr + reg_offset);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Clocksource:  just a monotonic counter of MCK/16 cycles.</div><div class='hunk'>@@ -39,7 +49,7 @@ static cycle_t read_pit_clk(struct clocksource *cs)</div><div class='ctx'> </div><div class='ctx'> 	raw_local_irq_save(flags);</div><div class='ctx'> 	elapsed = pit_cnt;</div><div class='del'>-	t = at91_sys_read(AT91_PIT_PIIR);</div><div class='add'>+	t = pit_read(AT91_PIT_PIIR);</div><div class='ctx'> 	raw_local_irq_restore(flags);</div><div class='ctx'> </div><div class='ctx'> 	elapsed += PIT_PICNT(t) * pit_cycle;</div><div class='hunk'>@@ -64,8 +74,8 @@ pit_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev)</div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case CLOCK_EVT_MODE_PERIODIC:</div><div class='ctx'> 		/* update clocksource counter */</div><div class='del'>-		pit_cnt += pit_cycle * PIT_PICNT(at91_sys_read(AT91_PIT_PIVR));</div><div class='del'>-		at91_sys_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN</div><div class='add'>+		pit_cnt += pit_cycle * PIT_PICNT(pit_read(AT91_PIT_PIVR));</div><div class='add'>+		pit_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN</div><div class='ctx'> 				| AT91_PIT_PITIEN);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CLOCK_EVT_MODE_ONESHOT:</div><div class='hunk'>@@ -74,7 +84,7 @@ pit_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev)</div><div class='ctx'> 	case CLOCK_EVT_MODE_SHUTDOWN:</div><div class='ctx'> 	case CLOCK_EVT_MODE_UNUSED:</div><div class='ctx'> 		/* disable irq, leaving the clocksource active */</div><div class='del'>-		at91_sys_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN);</div><div class='add'>+		pit_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CLOCK_EVT_MODE_RESUME:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -103,11 +113,11 @@ static irqreturn_t at91sam926x_pit_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	/* The PIT interrupt may be disabled, and is shared */</div><div class='ctx'> 	if ((pit_clkevt.mode == CLOCK_EVT_MODE_PERIODIC)</div><div class='del'>-			&amp;&amp; (at91_sys_read(AT91_PIT_SR) &amp; AT91_PIT_PITS)) {</div><div class='add'>+			&amp;&amp; (pit_read(AT91_PIT_SR) &amp; AT91_PIT_PITS)) {</div><div class='ctx'> 		unsigned nr_ticks;</div><div class='ctx'> </div><div class='ctx'> 		/* Get number of ticks performed before irq, and ack it */</div><div class='del'>-		nr_ticks = PIT_PICNT(at91_sys_read(AT91_PIT_PIVR));</div><div class='add'>+		nr_ticks = PIT_PICNT(pit_read(AT91_PIT_PIVR));</div><div class='ctx'> 		do {</div><div class='ctx'> 			pit_cnt += pit_cycle;</div><div class='ctx'> 			pit_clkevt.event_handler(&amp;pit_clkevt);</div><div class='hunk'>@@ -129,14 +139,14 @@ static struct irqaction at91sam926x_pit_irq = {</div><div class='ctx'> static void at91sam926x_pit_reset(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Disable timer and irqs */</div><div class='del'>-	at91_sys_write(AT91_PIT_MR, 0);</div><div class='add'>+	pit_write(AT91_PIT_MR, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear any pending interrupts, wait for PIT to stop counting */</div><div class='del'>-	while (PIT_CPIV(at91_sys_read(AT91_PIT_PIVR)) != 0)</div><div class='add'>+	while (PIT_CPIV(pit_read(AT91_PIT_PIVR)) != 0)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> </div><div class='ctx'> 	/* Start PIT but don't enable IRQ */</div><div class='del'>-	at91_sys_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN);</div><div class='add'>+	pit_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -178,7 +188,15 @@ static void __init at91sam926x_pit_init(void)</div><div class='ctx'> static void at91sam926x_pit_suspend(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Disable timer */</div><div class='del'>-	at91_sys_write(AT91_PIT_MR, 0);</div><div class='add'>+	pit_write(AT91_PIT_MR, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init at91sam926x_ioremap_pit(u32 addr)</div><div class='add'>+{</div><div class='add'>+	pit_base_addr = ioremap(addr, 16);</div><div class='add'>+</div><div class='add'>+	if (!pit_base_addr)</div><div class='add'>+		panic("Impossible to ioremap PIT\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct sys_timer at91sam926x_timer = {</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9_alt_reset.S b/arch/arm/mach-at91/at91sam9_alt_reset.S<br/>index e0256deb91fb..d3f931c5942e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9_alt_reset.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9_alt_reset.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9_alt_reset.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/at91sam9_alt_reset.S</a></div><div class='hunk'>@@ -14,20 +14,15 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/at91sam9_sdramc.h&gt;</div><div class='ctx'> #include &lt;mach/at91_rstc.h&gt;</div><div class='ctx'> </div><div class='ctx'> 			.arm</div><div class='ctx'> </div><div class='del'>-			.globl	at91sam9_alt_reset</div><div class='add'>+			.globl	at91sam9_alt_restart</div><div class='ctx'> </div><div class='del'>-at91sam9_alt_reset:	mrc	p15, 0, r0, c1, c0, 0</div><div class='del'>-			orr	r0, r0, #CR_I</div><div class='del'>-			mcr	p15, 0, r0, c1, c0, 0		@ enable I-cache</div><div class='del'>-</div><div class='del'>-			ldr	r0, .at91_va_base_sdramc	@ preload constants</div><div class='add'>+at91sam9_alt_restart:	ldr	r0, .at91_va_base_sdramc	@ preload constants</div><div class='ctx'> 			ldr	r1, .at91_va_base_rstc_cr</div><div class='ctx'> </div><div class='ctx'> 			mov	r2, #1</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c<br/>index 318b0407ea04..7032dd32cdf0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9g45.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9g45.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9g45.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/at91sam9g45.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</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/pm.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -20,12 +19,12 @@</div><div class='ctx'> #include &lt;mach/at91sam9g45.h&gt;</div><div class='ctx'> #include &lt;mach/at91_pmc.h&gt;</div><div class='ctx'> #include &lt;mach/at91_rstc.h&gt;</div><div class='del'>-#include &lt;mach/at91_shdwc.h&gt;</div><div class='ctx'> #include &lt;mach/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "soc.h"</div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "clock.h"</div><div class='add'>+#include "sam9_smc.h"</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='ctx'>  *  Clocks</div><div class='hunk'>@@ -150,7 +149,7 @@ static struct clk ac97_clk = {</div><div class='ctx'> 	.type		= CLK_TYPE_PERIPHERAL,</div><div class='ctx'> };</div><div class='ctx'> static struct clk macb_clk = {</div><div class='del'>-	.name		= "macb_clk",</div><div class='add'>+	.name		= "pclk",</div><div class='ctx'> 	.pmc_mask	= 1 &lt;&lt; AT91SAM9G45_ID_EMAC,</div><div class='ctx'> 	.type		= CLK_TYPE_PERIPHERAL,</div><div class='ctx'> };</div><div class='hunk'>@@ -209,6 +208,8 @@ static struct clk *periph_clocks[] __initdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk_lookup periph_clocks_lookups[] = {</div><div class='add'>+	/* One additional fake clock for macb_hclk */</div><div class='add'>+	CLKDEV_CON_ID("hclk", &amp;macb_clk),</div><div class='ctx'> 	/* One additional fake clock for ohci */</div><div class='ctx'> 	CLKDEV_CON_ID("ohci_clk", &amp;uhphs_clk),</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("ehci_clk", "atmel-ehci", &amp;uhphs_clk),</div><div class='hunk'>@@ -231,6 +232,11 @@ static struct clk_lookup periph_clocks_lookups[] = {</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("usart", "fff98000.serial", &amp;usart3_clk),</div><div class='ctx'> 	/* fake hclk clock */</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &amp;uhphs_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioA", &amp;pioA_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioB", &amp;pioB_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioC", &amp;pioC_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioD", &amp;pioDE_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioE", &amp;pioDE_clk),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk_lookup usart_clocks_lookups[] = {</div><div class='hunk'>@@ -293,41 +299,30 @@ void __init at91sam9g45_set_console_clock(int id)</div><div class='ctx'>  *  GPIO</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static struct at91_gpio_bank at91sam9g45_gpio[] = {</div><div class='add'>+static struct at91_gpio_bank at91sam9g45_gpio[] __initdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.id		= AT91SAM9G45_ID_PIOA,</div><div class='del'>-		.offset		= AT91_PIOA,</div><div class='del'>-		.clock		= &amp;pioA_clk,</div><div class='add'>+		.regbase	= AT91SAM9G45_BASE_PIOA,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91SAM9G45_ID_PIOB,</div><div class='del'>-		.offset		= AT91_PIOB,</div><div class='del'>-		.clock		= &amp;pioB_clk,</div><div class='add'>+		.regbase	= AT91SAM9G45_BASE_PIOB,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91SAM9G45_ID_PIOC,</div><div class='del'>-		.offset		= AT91_PIOC,</div><div class='del'>-		.clock		= &amp;pioC_clk,</div><div class='add'>+		.regbase	= AT91SAM9G45_BASE_PIOC,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91SAM9G45_ID_PIODE,</div><div class='del'>-		.offset		= AT91_PIOD,</div><div class='del'>-		.clock		= &amp;pioDE_clk,</div><div class='add'>+		.regbase	= AT91SAM9G45_BASE_PIOD,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91SAM9G45_ID_PIODE,</div><div class='del'>-		.offset		= AT91_PIOE,</div><div class='del'>-		.clock		= &amp;pioDE_clk,</div><div class='add'>+		.regbase	= AT91SAM9G45_BASE_PIOE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void at91sam9g45_reset(void)</div><div class='add'>+static void at91sam9g45_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void at91sam9g45_poweroff(void)</div><div class='del'>-{</div><div class='del'>-	at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='ctx'>  *  AT91SAM9G45 processor initialization</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='hunk'>@@ -338,10 +333,16 @@ static void __init at91sam9g45_map_io(void)</div><div class='ctx'> 	init_consistent_dma_size(SZ_4M);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init at91sam9g45_ioremap_registers(void)</div><div class='add'>+{</div><div class='add'>+	at91_ioremap_shdwc(AT91SAM9G45_BASE_SHDWC);</div><div class='add'>+	at91sam926x_ioremap_pit(AT91SAM9G45_BASE_PIT);</div><div class='add'>+	at91sam9_ioremap_smc(0, AT91SAM9G45_BASE_SMC);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init at91sam9g45_initialize(void)</div><div class='ctx'> {</div><div class='del'>-	at91_arch_reset = at91sam9g45_reset;</div><div class='del'>-	pm_power_off = at91sam9g45_poweroff;</div><div class='add'>+	arm_pm_restart = at91sam9g45_restart;</div><div class='ctx'> 	at91_extern_irq = (1 &lt;&lt; AT91SAM9G45_ID_IRQ0);</div><div class='ctx'> </div><div class='ctx'> 	/* Register GPIO subsystem */</div><div class='hunk'>@@ -393,6 +394,7 @@ static unsigned int at91sam9g45_default_irq_priority[NR_AIC_IRQS] __initdata = {</div><div class='ctx'> struct at91_init_soc __initdata at91sam9g45_soc = {</div><div class='ctx'> 	.map_io = at91sam9g45_map_io,</div><div class='ctx'> 	.default_irq_priority = at91sam9g45_default_irq_priority,</div><div class='add'>+	.ioremap_registers = at91sam9g45_ioremap_registers,</div><div class='ctx'> 	.register_clocks = at91sam9g45_register_clocks,</div><div class='ctx'> 	.init = at91sam9g45_initialize,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c<br/>index 09a16d6bd5cd..b7582dd10dc3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9g45_devices.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9g45_devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9g45_devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/at91sam9g45_devices.c</a></div><div class='hunk'>@@ -44,8 +44,8 @@ static struct at_dma_platform_data atdma_pdata = {</div><div class='ctx'> </div><div class='ctx'> static struct resource hdmac_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_DMA,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_DMA + SZ_512 - 1,</div><div class='add'>+		.start	= AT91SAM9G45_BASE_DMA,</div><div class='add'>+		.end	= AT91SAM9G45_BASE_DMA + SZ_512 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='hunk'>@@ -120,7 +120,7 @@ void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data)</div><div class='ctx'> </div><div class='ctx'> 	/* Enable VBus control for UHP ports */</div><div class='ctx'> 	for (i = 0; i &lt; data-&gt;ports; i++) {</div><div class='del'>-		if (data-&gt;vbus_pin[i])</div><div class='add'>+		if (gpio_is_valid(data-&gt;vbus_pin[i]))</div><div class='ctx'> 			at91_set_gpio_output(data-&gt;vbus_pin[i], 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -181,7 +181,7 @@ void __init at91_add_device_usbh_ehci(struct at91_usbh_data *data)</div><div class='ctx'> </div><div class='ctx'> 	/* Enable VBus control for UHP ports */</div><div class='ctx'> 	for (i = 0; i &lt; data-&gt;ports; i++) {</div><div class='del'>-		if (data-&gt;vbus_pin[i])</div><div class='add'>+		if (gpio_is_valid(data-&gt;vbus_pin[i]))</div><div class='ctx'> 			at91_set_gpio_output(data-&gt;vbus_pin[i], 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -263,7 +263,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)</div><div class='ctx'> 	usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);</div><div class='ctx'> 	memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));</div><div class='ctx'> </div><div class='del'>-	if (data &amp;&amp; data-&gt;vbus_pin &gt; 0) {</div><div class='add'>+	if (data &amp;&amp; gpio_is_valid(data-&gt;vbus_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;vbus_pin, 0);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;vbus_pin, 1);</div><div class='ctx'> 		usba_udc_data.pdata.vbus_pin = data-&gt;vbus_pin;</div><div class='hunk'>@@ -284,7 +284,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data) {}</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE)</div><div class='ctx'> static u64 eth_dmamask = DMA_BIT_MASK(32);</div><div class='del'>-static struct at91_eth_data eth_data;</div><div class='add'>+static struct macb_platform_data eth_data;</div><div class='ctx'> </div><div class='ctx'> static struct resource eth_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='hunk'>@@ -311,12 +311,12 @@ static struct platform_device at91sam9g45_eth_device = {</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(eth_resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init at91_add_device_eth(struct at91_eth_data *data)</div><div class='add'>+void __init at91_add_device_eth(struct macb_platform_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;phy_irq_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;phy_irq_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;phy_irq_pin, 0);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;phy_irq_pin, 1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -348,7 +348,7 @@ void __init at91_add_device_eth(struct at91_eth_data *data)</div><div class='ctx'> 	platform_device_register(&amp;at91sam9g45_eth_device);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-void __init at91_add_device_eth(struct at91_eth_data *data) {}</div><div class='add'>+void __init at91_add_device_eth(struct macb_platform_data *data) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -449,11 +449,11 @@ void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* input/irq */</div><div class='del'>-	if (data-&gt;slot[0].detect_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;slot[0].detect_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;slot[0].detect_pin, 1);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;slot[0].detect_pin, 1);</div><div class='ctx'> 	}</div><div class='del'>-	if (data-&gt;slot[0].wp_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;slot[0].wp_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;slot[0].wp_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (mmc_id == 0) {		/* MCI0 */</div><div class='hunk'>@@ -529,8 +529,8 @@ static struct resource nand_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_ECC,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_ECC + SZ_512 - 1,</div><div class='add'>+		.start	= AT91SAM9G45_BASE_ECC,</div><div class='add'>+		.end	= AT91SAM9G45_BASE_ECC + SZ_512 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -556,15 +556,15 @@ void __init at91_add_device_nand(struct atmel_nand_data *data)</div><div class='ctx'> 	at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA);</div><div class='ctx'> </div><div class='ctx'> 	/* enable pin */</div><div class='del'>-	if (data-&gt;enable_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;enable_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;enable_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* ready/busy pin */</div><div class='del'>-	if (data-&gt;rdy_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;rdy_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;rdy_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* card detect pin */</div><div class='del'>-	if (data-&gt;det_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;det_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;det_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	nand_data = *data;</div><div class='hunk'>@@ -859,7 +859,7 @@ void __init at91_add_device_ac97(struct ac97c_platform_data *data)</div><div class='ctx'> 	at91_set_A_periph(AT91_PIN_PD6, 0);	/* AC97RX */</div><div class='ctx'> </div><div class='ctx'> 	/* reset */</div><div class='del'>-	if (data-&gt;reset_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;reset_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;reset_pin, 0);</div><div class='ctx'> </div><div class='ctx'> 	ac97_data = *data;</div><div class='hunk'>@@ -1009,10 +1009,24 @@ static void __init at91_add_device_tc(void) { }</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_RTC_DRV_AT91RM9200) || defined(CONFIG_RTC_DRV_AT91RM9200_MODULE)</div><div class='add'>+static struct resource rtc_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AT91SAM9G45_BASE_RTC,</div><div class='add'>+		.end	= AT91SAM9G45_BASE_RTC + SZ_256 - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AT91_ID_SYS,</div><div class='add'>+		.end	= AT91_ID_SYS,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device at91sam9g45_rtc_device = {</div><div class='ctx'> 	.name		= "at91_rtc",</div><div class='ctx'> 	.id		= -1,</div><div class='del'>-	.num_resources	= 0,</div><div class='add'>+	.resource	= rtc_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(rtc_resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init at91_add_device_rtc(void)</div><div class='hunk'>@@ -1081,8 +1095,8 @@ void __init at91_add_device_tsadcc(struct at91_tsadcc_data *data) {}</div><div class='ctx'> </div><div class='ctx'> static struct resource rtt_resources[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_RTT,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_RTT + SZ_16 - 1,</div><div class='add'>+		.start	= AT91SAM9G45_BASE_RTT,</div><div class='add'>+		.end	= AT91SAM9G45_BASE_RTT + SZ_16 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -1133,10 +1147,19 @@ static void __init at91_add_device_trng(void) {}</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_AT91SAM9X_WATCHDOG) || defined(CONFIG_AT91SAM9X_WATCHDOG_MODULE)</div><div class='add'>+static struct resource wdt_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= AT91SAM9G45_BASE_WDT,</div><div class='add'>+		.end	= AT91SAM9G45_BASE_WDT + SZ_16 - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device at91sam9g45_wdt_device = {</div><div class='ctx'> 	.name		= "at91_wdt",</div><div class='ctx'> 	.id		= -1,</div><div class='del'>-	.num_resources	= 0,</div><div class='add'>+	.resource	= wdt_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(wdt_resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init at91_add_device_watchdog(void)</div><div class='hunk'>@@ -1332,8 +1355,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}</div><div class='ctx'> #if defined(CONFIG_SERIAL_ATMEL)</div><div class='ctx'> static struct resource dbgu_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_DBGU,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,</div><div class='add'>+		.start	= AT91SAM9G45_BASE_DBGU,</div><div class='add'>+		.end	= AT91SAM9G45_BASE_DBGU + SZ_512 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c<br/>index a238105d2c11..d6bcb1da11df 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9rl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9rl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9rl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/at91sam9rl.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</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/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -20,11 +19,11 @@</div><div class='ctx'> #include &lt;mach/at91sam9rl.h&gt;</div><div class='ctx'> #include &lt;mach/at91_pmc.h&gt;</div><div class='ctx'> #include &lt;mach/at91_rstc.h&gt;</div><div class='del'>-#include &lt;mach/at91_shdwc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "soc.h"</div><div class='ctx'> #include "generic.h"</div><div class='ctx'> #include "clock.h"</div><div class='add'>+#include "sam9_smc.h"</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='ctx'>  *  Clocks</div><div class='hunk'>@@ -184,6 +183,10 @@ static struct clk_lookup periph_clocks_lookups[] = {</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &amp;tc2_clk),</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("pclk", "ssc.0", &amp;ssc0_clk),</div><div class='ctx'> 	CLKDEV_CON_DEV_ID("pclk", "ssc.1", &amp;ssc1_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioA", &amp;pioA_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioB", &amp;pioB_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioC", &amp;pioC_clk),</div><div class='add'>+	CLKDEV_CON_ID("pioD", &amp;pioD_clk),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk_lookup usart_clocks_lookups[] = {</div><div class='hunk'>@@ -243,32 +246,22 @@ void __init at91sam9rl_set_console_clock(int id)</div><div class='ctx'>  *  GPIO</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static struct at91_gpio_bank at91sam9rl_gpio[] = {</div><div class='add'>+static struct at91_gpio_bank at91sam9rl_gpio[] __initdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.id		= AT91SAM9RL_ID_PIOA,</div><div class='del'>-		.offset		= AT91_PIOA,</div><div class='del'>-		.clock		= &amp;pioA_clk,</div><div class='add'>+		.regbase	= AT91SAM9RL_BASE_PIOA,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91SAM9RL_ID_PIOB,</div><div class='del'>-		.offset		= AT91_PIOB,</div><div class='del'>-		.clock		= &amp;pioB_clk,</div><div class='add'>+		.regbase	= AT91SAM9RL_BASE_PIOB,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91SAM9RL_ID_PIOC,</div><div class='del'>-		.offset		= AT91_PIOC,</div><div class='del'>-		.clock		= &amp;pioC_clk,</div><div class='add'>+		.regbase	= AT91SAM9RL_BASE_PIOC,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.id		= AT91SAM9RL_ID_PIOD,</div><div class='del'>-		.offset		= AT91_PIOD,</div><div class='del'>-		.clock		= &amp;pioD_clk,</div><div class='add'>+		.regbase	= AT91SAM9RL_BASE_PIOD,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void at91sam9rl_poweroff(void)</div><div class='del'>-{</div><div class='del'>-	at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='ctx'>  *  AT91SAM9RL processor initialization</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='hunk'>@@ -290,10 +283,16 @@ static void __init at91sam9rl_map_io(void)</div><div class='ctx'> 	at91_init_sram(0, AT91SAM9RL_SRAM_BASE, sram_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init at91sam9rl_ioremap_registers(void)</div><div class='add'>+{</div><div class='add'>+	at91_ioremap_shdwc(AT91SAM9RL_BASE_SHDWC);</div><div class='add'>+	at91sam926x_ioremap_pit(AT91SAM9RL_BASE_PIT);</div><div class='add'>+	at91sam9_ioremap_smc(0, AT91SAM9RL_BASE_SMC);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init at91sam9rl_initialize(void)</div><div class='ctx'> {</div><div class='del'>-	at91_arch_reset = at91sam9_alt_reset;</div><div class='del'>-	pm_power_off = at91sam9rl_poweroff;</div><div class='add'>+	arm_pm_restart = at91sam9_alt_restart;</div><div class='ctx'> 	at91_extern_irq = (1 &lt;&lt; AT91SAM9RL_ID_IRQ0);</div><div class='ctx'> </div><div class='ctx'> 	/* Register GPIO subsystem */</div><div class='hunk'>@@ -345,6 +344,7 @@ static unsigned int at91sam9rl_default_irq_priority[NR_AIC_IRQS] __initdata = {</div><div class='ctx'> struct at91_init_soc __initdata at91sam9rl_soc = {</div><div class='ctx'> 	.map_io = at91sam9rl_map_io,</div><div class='ctx'> 	.default_irq_priority = at91sam9rl_default_irq_priority,</div><div class='add'>+	.ioremap_registers = at91sam9rl_ioremap_registers,</div><div class='ctx'> 	.register_clocks = at91sam9rl_register_clocks,</div><div class='ctx'> 	.init = at91sam9rl_initialize,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c<br/>index 628eb566d60c..61908dce9784 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9rl_devices.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/at91sam9rl_devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/at91sam9rl_devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/at91sam9rl_devices.c</a></div><div class='hunk'>@@ -39,8 +39,8 @@ static struct at_dma_platform_data atdma_pdata = {</div><div class='ctx'> </div><div class='ctx'> static struct resource hdmac_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_DMA,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_DMA + SZ_512 - 1,</div><div class='add'>+		.start	= AT91SAM9RL_BASE_DMA,</div><div class='add'>+		.end	= AT91SAM9RL_BASE_DMA + SZ_512 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[2] = {</div><div class='hunk'>@@ -147,7 +147,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)</div><div class='ctx'> 	usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);</div><div class='ctx'> 	memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));</div><div class='ctx'> </div><div class='del'>-	if (data &amp;&amp; data-&gt;vbus_pin &gt; 0) {</div><div class='add'>+	if (data &amp;&amp; gpio_is_valid(data-&gt;vbus_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;vbus_pin, 0);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;vbus_pin, 1);</div><div class='ctx'> 		usba_udc_data.pdata.vbus_pin = data-&gt;vbus_pin;</div><div class='hunk'>@@ -201,13 +201,13 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* input/irq */</div><div class='del'>-	if (data-&gt;det_pin) {</div><div class='add'>+	if (gpio_is_valid(data-&gt;det_pin)) {</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;det_pin, 1);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;det_pin, 1);</div><div class='ctx'> 	}</div><div class='del'>-	if (data-&gt;wp_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;wp_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;wp_pin, 1);</div><div class='del'>-	if (data-&gt;vcc_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;vcc_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;vcc_pin, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* CLK */</div><div class='hunk'>@@ -248,8 +248,8 @@ static struct resource nand_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_ECC,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_ECC + SZ_512 - 1,</div><div class='add'>+		.start	= AT91SAM9RL_BASE_ECC,</div><div class='add'>+		.end	= AT91SAM9RL_BASE_ECC + SZ_512 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -275,15 +275,15 @@ void __init at91_add_device_nand(struct atmel_nand_data *data)</div><div class='ctx'> 	at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);</div><div class='ctx'> </div><div class='ctx'> 	/* enable pin */</div><div class='del'>-	if (data-&gt;enable_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;enable_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;enable_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* ready/busy pin */</div><div class='del'>-	if (data-&gt;rdy_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;rdy_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;rdy_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* card detect pin */</div><div class='del'>-	if (data-&gt;det_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;det_pin))</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;det_pin, 1);</div><div class='ctx'> </div><div class='ctx'> 	at91_set_A_periph(AT91_PIN_PB4, 0);		/* NANDOE */</div><div class='hunk'>@@ -483,7 +483,7 @@ void __init at91_add_device_ac97(struct ac97c_platform_data *data)</div><div class='ctx'> 	at91_set_A_periph(AT91_PIN_PD4, 0);	/* AC97RX */</div><div class='ctx'> </div><div class='ctx'> 	/* reset */</div><div class='del'>-	if (data-&gt;reset_pin)</div><div class='add'>+	if (gpio_is_valid(data-&gt;reset_pin))</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;reset_pin, 0);</div><div class='ctx'> </div><div class='ctx'> 	ac97_data = *data;</div><div class='hunk'>@@ -685,8 +685,8 @@ static void __init at91_add_device_rtc(void) {}</div><div class='ctx'> </div><div class='ctx'> static struct resource rtt_resources[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_RTT,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_RTT + SZ_16 - 1,</div><div class='add'>+		.start	= AT91SAM9RL_BASE_RTT,</div><div class='add'>+		.end	= AT91SAM9RL_BASE_RTT + SZ_16 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -709,10 +709,19 @@ static void __init at91_add_device_rtt(void)</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_AT91SAM9X_WATCHDOG) || defined(CONFIG_AT91SAM9X_WATCHDOG_MODULE)</div><div class='add'>+static struct resource wdt_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= AT91SAM9RL_BASE_WDT,</div><div class='add'>+		.end	= AT91SAM9RL_BASE_WDT + SZ_16 - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device at91sam9rl_wdt_device = {</div><div class='ctx'> 	.name		= "at91_wdt",</div><div class='ctx'> 	.id		= -1,</div><div class='del'>-	.num_resources	= 0,</div><div class='add'>+	.resource	= wdt_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(wdt_resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init at91_add_device_watchdog(void)</div><div class='hunk'>@@ -908,8 +917,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}</div><div class='ctx'> #if defined(CONFIG_SERIAL_ATMEL)</div><div class='ctx'> static struct resource dbgu_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='del'>-		.start	= AT91_BASE_SYS + AT91_DBGU,</div><div class='del'>-		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,</div><div class='add'>+		.start	= AT91SAM9RL_BASE_DBGU,</div><div class='add'>+		.end	= AT91SAM9RL_BASE_DBGU + SZ_512 - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='head'>diff --git a/arch/arm/mach-at91/board-1arm.c b/arch/arm/mach-at91/board-1arm.c<br/>index 367d5cd5e362..2628384aaae1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-1arm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-1arm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-1arm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-1arm.c</a></div><div class='hunk'>@@ -63,13 +63,15 @@ static void __init onearm_init_early(void)</div><div class='ctx'> 	at91_set_serial_console(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct at91_eth_data __initdata onearm_eth_data = {</div><div class='add'>+static struct macb_platform_data __initdata onearm_eth_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PC4,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_usbh_data __initdata onearm_usbh_data = {</div><div class='ctx'> 	.ports		= 1,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_udc_data __initdata onearm_udc_data = {</div><div class='head'>diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c<br/>index 4282d96dffa8..3bb40694b02d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-afeb-9260v1.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-afeb-9260v1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-afeb-9260v1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-afeb-9260v1.c</a></div><div class='hunk'>@@ -75,6 +75,8 @@ static void __init afeb9260_init_early(void)</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_usbh_data __initdata afeb9260_usbh_data = {</div><div class='ctx'> 	.ports		= 1,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -82,7 +84,7 @@ static struct at91_usbh_data __initdata afeb9260_usbh_data = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_udc_data __initdata afeb9260_udc_data = {</div><div class='ctx'> 	.vbus_pin	= AT91_PIN_PC5,</div><div class='del'>-	.pullup_pin	= 0,		/* pull-up driven by UDC */</div><div class='add'>+	.pullup_pin	= -EINVAL,		/* pull-up driven by UDC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -103,7 +105,7 @@ static struct spi_board_info afeb9260_spi_devices[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * MACB Ethernet device</div><div class='ctx'>  */</div><div class='del'>-static struct at91_eth_data __initdata afeb9260_macb_data = {</div><div class='add'>+static struct macb_platform_data __initdata afeb9260_macb_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PA9,</div><div class='ctx'> 	.is_rmii	= 0,</div><div class='ctx'> };</div><div class='hunk'>@@ -138,6 +140,7 @@ static struct atmel_nand_data __initdata afeb9260_nand_data = {</div><div class='ctx'> 	.bus_width_16	= 0,</div><div class='ctx'> 	.parts		= afeb9260_nand_partition,</div><div class='ctx'> 	.num_parts	= ARRAY_SIZE(afeb9260_nand_partition),</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -149,6 +152,7 @@ static struct at91_mmc_data __initdata afeb9260_mmc_data = {</div><div class='ctx'> 	.wp_pin 	= AT91_PIN_PC4,</div><div class='ctx'> 	.slot_b		= 1,</div><div class='ctx'> 	.wire4		= 1,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -169,6 +173,8 @@ static struct i2c_board_info __initdata afeb9260_i2c_devices[] = {</div><div class='ctx'> static struct at91_cf_data afeb9260_cf_data = {</div><div class='ctx'> 	.chipselect = 4,</div><div class='ctx'> 	.irq_pin    = AT91_PIN_PA6,</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> 	.rst_pin    = AT91_PIN_PA7,</div><div class='ctx'> 	.flags      = AT91_CF_TRUE_IDE,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c<br/>index f90cfb32bad2..8510e9e54988 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-cam60.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-cam60.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-cam60.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-cam60.c</a></div><div class='hunk'>@@ -62,6 +62,8 @@ static void __init cam60_init_early(void)</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_usbh_data __initdata cam60_usbh_data = {</div><div class='ctx'> 	.ports		= 1,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -115,7 +117,7 @@ static struct spi_board_info cam60_spi_devices[] __initdata = {</div><div class='ctx'> /*</div><div class='ctx'>  * MACB Ethernet device</div><div class='ctx'>  */</div><div class='del'>-static struct __initdata at91_eth_data cam60_macb_data = {</div><div class='add'>+static struct __initdata macb_platform_data cam60_macb_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PB5,</div><div class='ctx'> 	.is_rmii	= 0,</div><div class='ctx'> };</div><div class='hunk'>@@ -135,7 +137,7 @@ static struct mtd_partition __initdata cam60_nand_partition[] = {</div><div class='ctx'> static struct atmel_nand_data __initdata cam60_nand_data = {</div><div class='ctx'> 	.ale		= 21,</div><div class='ctx'> 	.cle		= 22,</div><div class='del'>-	// .det_pin	= ... not there</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PA9,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PA7,</div><div class='ctx'> 	.parts		= cam60_nand_partition,</div><div class='hunk'>@@ -163,7 +165,7 @@ static struct sam9_smc_config __initdata cam60_nand_smc_config = {</div><div class='ctx'> static void __init cam60_add_device_nand(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* configure chip-select 3 (NAND) */</div><div class='del'>-	sam9_smc_configure(3, &amp;cam60_nand_smc_config);</div><div class='add'>+	sam9_smc_configure(0, 3, &amp;cam60_nand_smc_config);</div><div class='ctx'> </div><div class='ctx'> 	at91_add_device_nand(&amp;cam60_nand_data);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-at91/board-cap9adk.c b/arch/arm/mach-at91/board-cap9adk.c<br/>index 5dffd3be62d2..ac3de4f7c31d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-cap9adk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-cap9adk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-cap9adk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-cap9adk.c</a></div><div class='hunk'>@@ -70,6 +70,8 @@ static void __init cap9adk_init_early(void)</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_usbh_data __initdata cap9adk_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -144,16 +146,17 @@ static struct spi_board_info cap9adk_spi_devices[] = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_mmc_data __initdata cap9adk_mmc_data = {</div><div class='ctx'> 	.wire4		= 1,</div><div class='del'>-//	.det_pin	= ... not connected</div><div class='del'>-//	.wp_pin		= ... not connected</div><div class='del'>-//	.vcc_pin	= ... not connected</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='add'>+	.wp_pin		= -EINVAL,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * MACB Ethernet device</div><div class='ctx'>  */</div><div class='del'>-static struct at91_eth_data __initdata cap9adk_macb_data = {</div><div class='add'>+static struct macb_platform_data __initdata cap9adk_macb_data = {</div><div class='add'>+	.phy_irq_pin	= -EINVAL,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -172,8 +175,8 @@ static struct mtd_partition __initdata cap9adk_nand_partitions[] = {</div><div class='ctx'> static struct atmel_nand_data __initdata cap9adk_nand_data = {</div><div class='ctx'> 	.ale		= 21,</div><div class='ctx'> 	.cle		= 22,</div><div class='del'>-//	.det_pin	= ... not connected</div><div class='del'>-//	.rdy_pin	= ... not connected</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='add'>+	.rdy_pin	= -EINVAL,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PD15,</div><div class='ctx'> 	.parts		= cap9adk_nand_partitions,</div><div class='ctx'> 	.num_parts	= ARRAY_SIZE(cap9adk_nand_partitions),</div><div class='hunk'>@@ -212,7 +215,7 @@ static void __init cap9adk_add_device_nand(void)</div><div class='ctx'> 		cap9adk_nand_smc_config.mode |= AT91_SMC_DBW_8;</div><div class='ctx'> </div><div class='ctx'> 	/* configure chip-select 3 (NAND) */</div><div class='del'>-	sam9_smc_configure(3, &amp;cap9adk_nand_smc_config);</div><div class='add'>+	sam9_smc_configure(0, 3, &amp;cap9adk_nand_smc_config);</div><div class='ctx'> </div><div class='ctx'> 	at91_add_device_nand(&amp;cap9adk_nand_data);</div><div class='ctx'> }</div><div class='hunk'>@@ -282,7 +285,7 @@ static __init void cap9adk_add_device_nor(void)</div><div class='ctx'> 	at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_VDDIOMSEL_3_3V);</div><div class='ctx'> </div><div class='ctx'> 	/* configure chip-select 0 (NOR) */</div><div class='del'>-	sam9_smc_configure(0, &amp;cap9adk_nor_smc_config);</div><div class='add'>+	sam9_smc_configure(0, 0, &amp;cap9adk_nor_smc_config);</div><div class='ctx'> </div><div class='ctx'> 	platform_device_register(&amp;cap9adk_nor_flash);</div><div class='ctx'> }</div><div class='hunk'>@@ -351,7 +354,7 @@ static struct atmel_lcdfb_info __initdata cap9adk_lcdc_data;</div><div class='ctx'>  * AC97</div><div class='ctx'>  */</div><div class='ctx'> static struct ac97c_platform_data cap9adk_ac97_data = {</div><div class='del'>-//	.reset_pin	= ... not connected</div><div class='add'>+	.reset_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c<br/>index 774c87fcbd5b..59d9cf997537 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-carmeva.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-carmeva.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-carmeva.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-carmeva.c</a></div><div class='hunk'>@@ -57,13 +57,15 @@ static void __init carmeva_init_early(void)</div><div class='ctx'> 	at91_set_serial_console(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct at91_eth_data __initdata carmeva_eth_data = {</div><div class='add'>+static struct macb_platform_data __initdata carmeva_eth_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PC4,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_usbh_data __initdata carmeva_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_udc_data __initdata carmeva_udc_data = {</div><div class='hunk'>@@ -75,8 +77,8 @@ static struct at91_udc_data __initdata carmeva_udc_data = {</div><div class='ctx'> // static struct at91_cf_data __initdata carmeva_cf_data = {</div><div class='ctx'> //	.det_pin	= AT91_PIN_PB0,</div><div class='ctx'> //	.rst_pin	= AT91_PIN_PC5,</div><div class='del'>-	// .irq_pin	= ... not connected</div><div class='del'>-	// .vcc_pin	= ... always powered</div><div class='add'>+	// .irq_pin	= -EINVAL,</div><div class='add'>+	// .vcc_pin	= -EINVAL,</div><div class='ctx'> // };</div><div class='ctx'> </div><div class='ctx'> static struct at91_mmc_data __initdata carmeva_mmc_data = {</div><div class='hunk'>@@ -84,6 +86,7 @@ static struct at91_mmc_data __initdata carmeva_mmc_data = {</div><div class='ctx'> 	.wire4		= 1,</div><div class='ctx'> 	.det_pin	= AT91_PIN_PB10,</div><div class='ctx'> 	.wp_pin		= AT91_PIN_PC14,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct spi_board_info carmeva_spi_devices[] = {</div><div class='head'>diff --git a/arch/arm/mach-at91/board-cpu9krea.c b/arch/arm/mach-at91/board-cpu9krea.c<br/>index fc885a4ce243..9ab3d1ea326d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-cpu9krea.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-cpu9krea.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-cpu9krea.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-cpu9krea.c</a></div><div class='hunk'>@@ -86,6 +86,8 @@ static void __init cpu9krea_init_early(void)</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_usbh_data __initdata cpu9krea_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -93,13 +95,14 @@ static struct at91_usbh_data __initdata cpu9krea_usbh_data = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_udc_data __initdata cpu9krea_udc_data = {</div><div class='ctx'> 	.vbus_pin	= AT91_PIN_PC8,</div><div class='del'>-	.pullup_pin	= 0,		/* pull-up driven by UDC */</div><div class='add'>+	.pullup_pin	= -EINVAL,		/* pull-up driven by UDC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * MACB Ethernet device</div><div class='ctx'>  */</div><div class='del'>-static struct at91_eth_data __initdata cpu9krea_macb_data = {</div><div class='add'>+static struct macb_platform_data __initdata cpu9krea_macb_data = {</div><div class='add'>+	.phy_irq_pin	= -EINVAL,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -112,6 +115,7 @@ static struct atmel_nand_data __initdata cpu9krea_nand_data = {</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PC13,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PC14,</div><div class='ctx'> 	.bus_width_16	= 0,</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACH_CPU9260</div><div class='hunk'>@@ -156,7 +160,7 @@ static struct sam9_smc_config __initdata cpu9krea_nand_smc_config = {</div><div class='ctx'> </div><div class='ctx'> static void __init cpu9krea_add_device_nand(void)</div><div class='ctx'> {</div><div class='del'>-	sam9_smc_configure(3, &amp;cpu9krea_nand_smc_config);</div><div class='add'>+	sam9_smc_configure(0, 3, &amp;cpu9krea_nand_smc_config);</div><div class='ctx'> 	at91_add_device_nand(&amp;cpu9krea_nand_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -238,7 +242,7 @@ static __init void cpu9krea_add_device_nor(void)</div><div class='ctx'> 	at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_VDDIOMSEL_3_3V);</div><div class='ctx'> </div><div class='ctx'> 	/* configure chip-select 0 (NOR) */</div><div class='del'>-	sam9_smc_configure(0, &amp;cpu9krea_nor_smc_config);</div><div class='add'>+	sam9_smc_configure(0, 0, &amp;cpu9krea_nor_smc_config);</div><div class='ctx'> </div><div class='ctx'> 	platform_device_register(&amp;cpu9krea_nor_flash);</div><div class='ctx'> }</div><div class='hunk'>@@ -337,6 +341,8 @@ static struct at91_mmc_data __initdata cpu9krea_mmc_data = {</div><div class='ctx'> 	.slot_b		= 0,</div><div class='ctx'> 	.wire4		= 1,</div><div class='ctx'> 	.det_pin	= AT91_PIN_PA29,</div><div class='add'>+	.wp_pin		= -EINVAL,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init cpu9krea_board_init(void)</div><div class='head'>diff --git a/arch/arm/mach-at91/board-cpuat91.c b/arch/arm/mach-at91/board-cpuat91.c<br/>index d35e65b08ccd..368e1427ad99 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-cpuat91.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-cpuat91.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-cpuat91.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-cpuat91.c</a></div><div class='hunk'>@@ -82,12 +82,15 @@ static void __init cpuat91_init_early(void)</div><div class='ctx'> 	at91_set_serial_console(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct at91_eth_data __initdata cpuat91_eth_data = {</div><div class='add'>+static struct macb_platform_data __initdata cpuat91_eth_data = {</div><div class='add'>+	.phy_irq_pin	= -EINVAL,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_usbh_data __initdata cpuat91_usbh_data = {</div><div class='ctx'> 	.ports		= 1,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_udc_data __initdata cpuat91_udc_data = {</div><div class='hunk'>@@ -98,6 +101,8 @@ static struct at91_udc_data __initdata cpuat91_udc_data = {</div><div class='ctx'> static struct at91_mmc_data __initdata cpuat91_mmc_data = {</div><div class='ctx'> 	.det_pin	= AT91_PIN_PC2,</div><div class='ctx'> 	.wire4		= 1,</div><div class='add'>+	.wp_pin		= -EINVAL,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct physmap_flash_data cpuat91_flash_data = {</div><div class='head'>diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c<br/>index c3936665e645..1a1547b1ce4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-csb337.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-csb337.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-csb337.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-csb337.c</a></div><div class='hunk'>@@ -58,18 +58,20 @@ static void __init csb337_init_early(void)</div><div class='ctx'> 	at91_set_serial_console(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct at91_eth_data __initdata csb337_eth_data = {</div><div class='add'>+static struct macb_platform_data __initdata csb337_eth_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PC2,</div><div class='ctx'> 	.is_rmii	= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_usbh_data __initdata csb337_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_udc_data __initdata csb337_udc_data = {</div><div class='del'>-	// this has no VBUS sensing pin</div><div class='ctx'> 	.pullup_pin	= AT91_PIN_PA24,</div><div class='add'>+	.vbus_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct i2c_board_info __initdata csb337_i2c_devices[] = {</div><div class='hunk'>@@ -98,6 +100,7 @@ static struct at91_mmc_data __initdata csb337_mmc_data = {</div><div class='ctx'> 	.slot_b		= 0,</div><div class='ctx'> 	.wire4		= 1,</div><div class='ctx'> 	.wp_pin		= AT91_PIN_PD6,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct spi_board_info csb337_spi_devices[] = {</div><div class='head'>diff --git a/arch/arm/mach-at91/board-csb637.c b/arch/arm/mach-at91/board-csb637.c<br/>index 586100e2acbb..f650bf39455d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-csb637.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-csb637.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-csb637.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-csb637.c</a></div><div class='hunk'>@@ -52,13 +52,15 @@ static void __init csb637_init_early(void)</div><div class='ctx'> 	at91_set_serial_console(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct at91_eth_data __initdata csb637_eth_data = {</div><div class='add'>+static struct macb_platform_data __initdata csb637_eth_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PC0,</div><div class='ctx'> 	.is_rmii	= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_usbh_data __initdata csb637_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_udc_data __initdata csb637_udc_data = {</div><div class='head'>diff --git a/arch/arm/mach-at91/board-dt.c b/arch/arm/mach-at91/board-dt.c<br/>index 0b7d32778210..bb6b434ec0c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-dt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-dt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-dt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-dt.c</a></div><div class='hunk'>@@ -50,6 +50,7 @@ static void __init ek_init_early(void)</div><div class='ctx'> static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> 	.ale		= 21,</div><div class='ctx'> 	.cle		= 22,</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PC8,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PC14,</div><div class='ctx'> };</div><div class='hunk'>@@ -82,7 +83,7 @@ static void __init ek_add_device_nand(void)</div><div class='ctx'> 		ek_nand_smc_config.mode |= AT91_SMC_DBW_8;</div><div class='ctx'> </div><div class='ctx'> 	/* configure chip-select 3 (NAND) */</div><div class='del'>-	sam9_smc_configure(3, &amp;ek_nand_smc_config);</div><div class='add'>+	sam9_smc_configure(0, 3, &amp;ek_nand_smc_config);</div><div class='ctx'> </div><div class='ctx'> 	at91_add_device_nand(&amp;ek_nand_data);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-at91/board-eb9200.c b/arch/arm/mach-at91/board-eb9200.c<br/>index 45db7a3dbef0..d302ca3eeb64 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-eb9200.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-eb9200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-eb9200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-eb9200.c</a></div><div class='hunk'>@@ -60,13 +60,15 @@ static void __init eb9200_init_early(void)</div><div class='ctx'> 	at91_set_serial_console(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct at91_eth_data __initdata eb9200_eth_data = {</div><div class='add'>+static struct macb_platform_data __initdata eb9200_eth_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PC4,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_usbh_data __initdata eb9200_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_udc_data __initdata eb9200_udc_data = {</div><div class='hunk'>@@ -75,15 +77,18 @@ static struct at91_udc_data __initdata eb9200_udc_data = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_cf_data __initdata eb9200_cf_data = {</div><div class='add'>+	.irq_pin	= -EINVAL,</div><div class='ctx'> 	.det_pin	= AT91_PIN_PB0,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> 	.rst_pin	= AT91_PIN_PC5,</div><div class='del'>-	// .irq_pin	= ... not connected</div><div class='del'>-	// .vcc_pin	= ... always powered</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_mmc_data __initdata eb9200_mmc_data = {</div><div class='ctx'> 	.slot_b		= 0,</div><div class='ctx'> 	.wire4		= 1,</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='add'>+	.wp_pin		= -EINVAL,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct i2c_board_info __initdata eb9200_i2c_devices[] = {</div><div class='head'>diff --git a/arch/arm/mach-at91/board-ecbat91.c b/arch/arm/mach-at91/board-ecbat91.c<br/>index 2f9c16d29212..69966ce4d776 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-ecbat91.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-ecbat91.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-ecbat91.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-ecbat91.c</a></div><div class='hunk'>@@ -64,18 +64,23 @@ static void __init ecb_at91init_early(void)</div><div class='ctx'> 	at91_set_serial_console(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct at91_eth_data __initdata ecb_at91eth_data = {</div><div class='add'>+static struct macb_platform_data __initdata ecb_at91eth_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PC4,</div><div class='ctx'> 	.is_rmii	= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_usbh_data __initdata ecb_at91usbh_data = {</div><div class='ctx'> 	.ports		= 1,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_mmc_data __initdata ecb_at91mmc_data = {</div><div class='ctx'> 	.slot_b		= 0,</div><div class='ctx'> 	.wire4		= 1,</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='add'>+	.wp_pin		= -EINVAL,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-eco920.c b/arch/arm/mach-at91/board-eco920.c<br/>index 8252c722607b..07ef35b0ec2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-eco920.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-eco920.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-eco920.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-eco920.c</a></div><div class='hunk'>@@ -47,13 +47,15 @@ static void __init eco920_init_early(void)</div><div class='ctx'> 	at91_set_serial_console(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct at91_eth_data __initdata eco920_eth_data = {</div><div class='add'>+static struct macb_platform_data __initdata eco920_eth_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PC2,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_usbh_data __initdata eco920_usbh_data = {</div><div class='ctx'> 	.ports		= 1,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_udc_data __initdata eco920_udc_data = {</div><div class='hunk'>@@ -64,6 +66,9 @@ static struct at91_udc_data __initdata eco920_udc_data = {</div><div class='ctx'> static struct at91_mmc_data __initdata eco920_mmc_data = {</div><div class='ctx'> 	.slot_b		= 0,</div><div class='ctx'> 	.wire4		= 0,</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='add'>+	.wp_pin		= -EINVAL,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct physmap_flash_data eco920_flash_data = {</div><div class='head'>diff --git a/arch/arm/mach-at91/board-flexibity.c b/arch/arm/mach-at91/board-flexibity.c<br/>index 4c3f65d9c59b..eec02cd57ced 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-flexibity.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-flexibity.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-flexibity.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-flexibity.c</a></div><div class='hunk'>@@ -52,12 +52,14 @@ static void __init flexibity_init_early(void)</div><div class='ctx'> /* USB Host port */</div><div class='ctx'> static struct at91_usbh_data __initdata flexibity_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* USB Device port */</div><div class='ctx'> static struct at91_udc_data __initdata flexibity_udc_data = {</div><div class='ctx'> 	.vbus_pin	= AT91_PIN_PC5,</div><div class='del'>-	.pullup_pin	= 0,		/* pull-up driven by UDC */</div><div class='add'>+	.pullup_pin	= -EINVAL,		/* pull-up driven by UDC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* SPI devices */</div><div class='hunk'>@@ -76,6 +78,7 @@ static struct at91_mmc_data __initdata flexibity_mmc_data = {</div><div class='ctx'> 	.wire4		= 1,</div><div class='ctx'> 	.det_pin	= AT91_PIN_PC9,</div><div class='ctx'> 	.wp_pin		= AT91_PIN_PC4,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* LEDs */</div><div class='head'>diff --git a/arch/arm/mach-at91/board-foxg20.c b/arch/arm/mach-at91/board-foxg20.c<br/>index f27d1a780cfa..caf017f0f4ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-foxg20.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-foxg20.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-foxg20.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-foxg20.c</a></div><div class='hunk'>@@ -106,6 +106,8 @@ static void __init foxg20_init_early(void)</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_usbh_data __initdata foxg20_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -113,7 +115,7 @@ static struct at91_usbh_data __initdata foxg20_usbh_data = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_udc_data __initdata foxg20_udc_data = {</div><div class='ctx'> 	.vbus_pin	= AT91_PIN_PC6,</div><div class='del'>-	.pullup_pin	= 0,		/* pull-up driven by UDC */</div><div class='add'>+	.pullup_pin	= -EINVAL,		/* pull-up driven by UDC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -135,7 +137,7 @@ static struct spi_board_info foxg20_spi_devices[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * MACB Ethernet device</div><div class='ctx'>  */</div><div class='del'>-static struct at91_eth_data __initdata foxg20_macb_data = {</div><div class='add'>+static struct macb_platform_data __initdata foxg20_macb_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PA7,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='hunk'>@@ -147,6 +149,9 @@ static struct at91_eth_data __initdata foxg20_macb_data = {</div><div class='ctx'> static struct at91_mmc_data __initdata foxg20_mmc_data = {</div><div class='ctx'> 	.slot_b		= 1,</div><div class='ctx'> 	.wire4		= 1,</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='add'>+	.wp_pin		= -EINVAL,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-gsia18s.c b/arch/arm/mach-at91/board-gsia18s.c<br/>index 2e95949737e6..230e71969fb7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-gsia18s.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-gsia18s.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-gsia18s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-gsia18s.c</a></div><div class='hunk'>@@ -80,6 +80,8 @@ static void __init gsia18s_init_early(void)</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_usbh_data __initdata usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -87,13 +89,13 @@ static struct at91_usbh_data __initdata usbh_data = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_udc_data __initdata udc_data = {</div><div class='ctx'> 	.vbus_pin	= AT91_PIN_PA22,</div><div class='del'>-	.pullup_pin	= 0,		/* pull-up driven by UDC */</div><div class='add'>+	.pullup_pin	= -EINVAL,		/* pull-up driven by UDC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * MACB Ethernet device</div><div class='ctx'>  */</div><div class='del'>-static struct at91_eth_data __initdata macb_data = {</div><div class='add'>+static struct macb_platform_data __initdata macb_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PA28,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='hunk'>@@ -530,6 +532,7 @@ static struct i2c_board_info __initdata gsia18s_i2c_devices[] = {</div><div class='ctx'> static struct at91_cf_data __initdata gsia18s_cf1_data = {</div><div class='ctx'> 	.irq_pin	= AT91_PIN_PA27,</div><div class='ctx'> 	.det_pin	= AT91_PIN_PB30,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> 	.rst_pin	= AT91_PIN_PB31,</div><div class='ctx'> 	.chipselect	= 5,</div><div class='ctx'> 	.flags		= AT91_CF_TRUE_IDE,</div><div class='head'>diff --git a/arch/arm/mach-at91/board-kafa.c b/arch/arm/mach-at91/board-kafa.c<br/>index 3bae73e63633..efde1b2327c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-kafa.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-kafa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-kafa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-kafa.c</a></div><div class='hunk'>@@ -61,13 +61,15 @@ static void __init kafa_init_early(void)</div><div class='ctx'> 	at91_set_serial_console(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct at91_eth_data __initdata kafa_eth_data = {</div><div class='add'>+static struct macb_platform_data __initdata kafa_eth_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PC4,</div><div class='ctx'> 	.is_rmii	= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_usbh_data __initdata kafa_usbh_data = {</div><div class='ctx'> 	.ports		= 1,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_udc_data __initdata kafa_udc_data = {</div><div class='head'>diff --git a/arch/arm/mach-at91/board-kb9202.c b/arch/arm/mach-at91/board-kb9202.c<br/>index e61351ffad50..d75a4a2ad9c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-kb9202.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-kb9202.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-kb9202.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-kb9202.c</a></div><div class='hunk'>@@ -69,13 +69,15 @@ static void __init kb9202_init_early(void)</div><div class='ctx'> 	at91_set_serial_console(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct at91_eth_data __initdata kb9202_eth_data = {</div><div class='add'>+static struct macb_platform_data __initdata kb9202_eth_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PB29,</div><div class='ctx'> 	.is_rmii	= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_usbh_data __initdata kb9202_usbh_data = {</div><div class='ctx'> 	.ports		= 1,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_udc_data __initdata kb9202_udc_data = {</div><div class='hunk'>@@ -87,6 +89,8 @@ static struct at91_mmc_data __initdata kb9202_mmc_data = {</div><div class='ctx'> 	.det_pin	= AT91_PIN_PB2,</div><div class='ctx'> 	.slot_b		= 0,</div><div class='ctx'> 	.wire4		= 1,</div><div class='add'>+	.wp_pin		= -EINVAL,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mtd_partition __initdata kb9202_nand_partition[] = {</div><div class='hunk'>@@ -100,7 +104,7 @@ static struct mtd_partition __initdata kb9202_nand_partition[] = {</div><div class='ctx'> static struct atmel_nand_data __initdata kb9202_nand_data = {</div><div class='ctx'> 	.ale		= 22,</div><div class='ctx'> 	.cle		= 21,</div><div class='del'>-	// .det_pin	= ... not there</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PC29,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PC28,</div><div class='ctx'> 	.parts		= kb9202_nand_partition,</div><div class='head'>diff --git a/arch/arm/mach-at91/board-neocore926.c b/arch/arm/mach-at91/board-neocore926.c<br/>index ef816c17dc61..3f8617c0e04e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-neocore926.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-neocore926.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-neocore926.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-neocore926.c</a></div><div class='hunk'>@@ -72,6 +72,7 @@ static void __init neocore926_init_early(void)</div><div class='ctx'> static struct at91_usbh_data __initdata neocore926_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='ctx'> 	.vbus_pin	= { AT91_PIN_PA24, AT91_PIN_PA21 },</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -79,7 +80,7 @@ static struct at91_usbh_data __initdata neocore926_usbh_data = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_udc_data __initdata neocore926_udc_data = {</div><div class='ctx'> 	.vbus_pin	= AT91_PIN_PA25,</div><div class='del'>-	.pullup_pin	= 0,		/* pull-up driven by UDC */</div><div class='add'>+	.pullup_pin	= -EINVAL,		/* pull-up driven by UDC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -149,13 +150,14 @@ static struct at91_mmc_data __initdata neocore926_mmc_data = {</div><div class='ctx'> 	.wire4		= 1,</div><div class='ctx'> 	.det_pin	= AT91_PIN_PE18,</div><div class='ctx'> 	.wp_pin		= AT91_PIN_PE19,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * MACB Ethernet device</div><div class='ctx'>  */</div><div class='del'>-static struct at91_eth_data __initdata neocore926_macb_data = {</div><div class='add'>+static struct macb_platform_data __initdata neocore926_macb_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PE31,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='hunk'>@@ -190,6 +192,7 @@ static struct atmel_nand_data __initdata neocore926_nand_data = {</div><div class='ctx'> 	.enable_pin		= AT91_PIN_PD15,</div><div class='ctx'> 	.parts			= neocore926_nand_partition,</div><div class='ctx'> 	.num_parts		= ARRAY_SIZE(neocore926_nand_partition),</div><div class='add'>+	.det_pin		= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sam9_smc_config __initdata neocore926_nand_smc_config = {</div><div class='hunk'>@@ -213,7 +216,7 @@ static struct sam9_smc_config __initdata neocore926_nand_smc_config = {</div><div class='ctx'> static void __init neocore926_add_device_nand(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* configure chip-select 3 (NAND) */</div><div class='del'>-	sam9_smc_configure(3, &amp;neocore926_nand_smc_config);</div><div class='add'>+	sam9_smc_configure(0, 3, &amp;neocore926_nand_smc_config);</div><div class='ctx'> </div><div class='ctx'> 	at91_add_device_nand(&amp;neocore926_nand_data);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-at91/board-pcontrol-g20.c b/arch/arm/mach-at91/board-pcontrol-g20.c<br/>index 49e3f699b48e..b4a12fc184c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-pcontrol-g20.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-pcontrol-g20.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-pcontrol-g20.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-pcontrol-g20.c</a></div><div class='hunk'>@@ -96,9 +96,9 @@ static struct sam9_smc_config __initdata pcontrol_smc_config[2] = { {</div><div class='ctx'> static void __init add_device_pcontrol(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* configure chip-select 4 (IO compatible to 8051  X4 ) */</div><div class='del'>-	sam9_smc_configure(4, &amp;pcontrol_smc_config[0]);</div><div class='add'>+	sam9_smc_configure(0, 4, &amp;pcontrol_smc_config[0]);</div><div class='ctx'> 	/* configure chip-select 7 (FerroRAM 256KiBx16bit MR2A16A  D4 ) */</div><div class='del'>-	sam9_smc_configure(7, &amp;pcontrol_smc_config[1]);</div><div class='add'>+	sam9_smc_configure(0, 7, &amp;pcontrol_smc_config[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -107,6 +107,8 @@ static void __init add_device_pcontrol(void)</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_usbh_data __initdata usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -122,7 +124,7 @@ static struct at91_udc_data __initdata pcontrol_g20_udc_data = {</div><div class='ctx'> /*</div><div class='ctx'>  * MACB Ethernet device</div><div class='ctx'>  */</div><div class='del'>-static struct at91_eth_data __initdata macb_data = {</div><div class='add'>+static struct macb_platform_data __initdata macb_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PA28,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-at91/board-picotux200.c b/arch/arm/mach-at91/board-picotux200.c<br/>index 0a8fe6a1b7c8..ab024fa11d5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-picotux200.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-picotux200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-picotux200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-picotux200.c</a></div><div class='hunk'>@@ -60,13 +60,15 @@ static void __init picotux200_init_early(void)</div><div class='ctx'> 	at91_set_serial_console(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct at91_eth_data __initdata picotux200_eth_data = {</div><div class='add'>+static struct macb_platform_data __initdata picotux200_eth_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PC4,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_usbh_data __initdata picotux200_usbh_data = {</div><div class='ctx'> 	.ports		= 1,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_mmc_data __initdata picotux200_mmc_data = {</div><div class='hunk'>@@ -74,6 +76,7 @@ static struct at91_mmc_data __initdata picotux200_mmc_data = {</div><div class='ctx'> 	.slot_b		= 0,</div><div class='ctx'> 	.wire4		= 1,</div><div class='ctx'> 	.wp_pin		= AT91_PIN_PA17,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define PICOTUX200_FLASH_BASE	AT91_CHIPSELECT_0</div><div class='head'>diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c<br/>index 07421bdb88ea..e029d220cb84 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-qil-a9260.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-qil-a9260.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-qil-a9260.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-qil-a9260.c</a></div><div class='hunk'>@@ -77,6 +77,8 @@ static void __init ek_init_early(void)</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_usbh_data __initdata ek_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -84,7 +86,7 @@ static struct at91_usbh_data __initdata ek_usbh_data = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_udc_data __initdata ek_udc_data = {</div><div class='ctx'> 	.vbus_pin	= AT91_PIN_PC5,</div><div class='del'>-	.pullup_pin	= 0,		/* pull-up driven by UDC */</div><div class='add'>+	.pullup_pin	= -EINVAL,		/* pull-up driven by UDC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -104,7 +106,7 @@ static struct spi_board_info ek_spi_devices[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * MACB Ethernet device</div><div class='ctx'>  */</div><div class='del'>-static struct at91_eth_data __initdata ek_macb_data = {</div><div class='add'>+static struct macb_platform_data __initdata ek_macb_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PA31,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='hunk'>@@ -133,7 +135,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = {</div><div class='ctx'> static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> 	.ale		= 21,</div><div class='ctx'> 	.cle		= 22,</div><div class='del'>-//	.det_pin	= ... not connected</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PC13,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PC14,</div><div class='ctx'> 	.parts		= ek_nand_partition,</div><div class='hunk'>@@ -161,7 +163,7 @@ static struct sam9_smc_config __initdata ek_nand_smc_config = {</div><div class='ctx'> static void __init ek_add_device_nand(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* configure chip-select 3 (NAND) */</div><div class='del'>-	sam9_smc_configure(3, &amp;ek_nand_smc_config);</div><div class='add'>+	sam9_smc_configure(0, 3, &amp;ek_nand_smc_config);</div><div class='ctx'> </div><div class='ctx'> 	at91_add_device_nand(&amp;ek_nand_data);</div><div class='ctx'> }</div><div class='hunk'>@@ -172,9 +174,9 @@ static void __init ek_add_device_nand(void)</div><div class='ctx'> static struct at91_mmc_data __initdata ek_mmc_data = {</div><div class='ctx'> 	.slot_b		= 0,</div><div class='ctx'> 	.wire4		= 1,</div><div class='del'>-//	.det_pin	= ... not connected</div><div class='del'>-//	.wp_pin		= ... not connected</div><div class='del'>-//	.vcc_pin	= ... not connected</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='add'>+	.wp_pin		= -EINVAL,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -251,7 +253,7 @@ static void __init ek_board_init(void)</div><div class='ctx'> 	/* LEDs */</div><div class='ctx'> 	at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));</div><div class='ctx'> 	/* shutdown controller, wakeup button (5 msec low) */</div><div class='del'>-	at91_sys_write(AT91_SHDW_MR, AT91_SHDW_CPTWK0_(10) | AT91_SHDW_WKMODE0_LOW</div><div class='add'>+	at91_shdwc_write(AT91_SHDW_MR, AT91_SHDW_CPTWK0_(10) | AT91_SHDW_WKMODE0_LOW</div><div class='ctx'> 				| AT91_SHDW_RTTWKEN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c<br/>index 80a8c9c6e922..782f37946af5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-rm9200dk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-rm9200dk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-rm9200dk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-rm9200dk.c</a></div><div class='hunk'>@@ -65,13 +65,15 @@ static void __init dk_init_early(void)</div><div class='ctx'> 	at91_set_serial_console(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct at91_eth_data __initdata dk_eth_data = {</div><div class='add'>+static struct macb_platform_data __initdata dk_eth_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PC4,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_usbh_data __initdata dk_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_udc_data __initdata dk_udc_data = {</div><div class='hunk'>@@ -80,16 +82,19 @@ static struct at91_udc_data __initdata dk_udc_data = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_cf_data __initdata dk_cf_data = {</div><div class='add'>+	.irq_pin	= -EINVAL,</div><div class='ctx'> 	.det_pin	= AT91_PIN_PB0,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> 	.rst_pin	= AT91_PIN_PC5,</div><div class='del'>-	// .irq_pin	= ... not connected</div><div class='del'>-	// .vcc_pin	= ... always powered</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_MTD_AT91_DATAFLASH_CARD</div><div class='ctx'> static struct at91_mmc_data __initdata dk_mmc_data = {</div><div class='ctx'> 	.slot_b		= 0,</div><div class='ctx'> 	.wire4		= 1,</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='add'>+	.wp_pin		= -EINVAL,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -143,7 +148,7 @@ static struct atmel_nand_data __initdata dk_nand_data = {</div><div class='ctx'> 	.cle		= 21,</div><div class='ctx'> 	.det_pin	= AT91_PIN_PB1,</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PC2,</div><div class='del'>-	// .enable_pin	= ... not there</div><div class='add'>+	.enable_pin	= -EINVAL,</div><div class='ctx'> 	.parts		= dk_nand_partition,</div><div class='ctx'> 	.num_parts	= ARRAY_SIZE(dk_nand_partition),</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-at91/board-rm9200ek.c b/arch/arm/mach-at91/board-rm9200ek.c<br/>index 99fd7f8aee0e..ef7c12a92246 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-rm9200ek.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-rm9200ek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-rm9200ek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-rm9200ek.c</a></div><div class='hunk'>@@ -65,13 +65,15 @@ static void __init ek_init_early(void)</div><div class='ctx'> 	at91_set_serial_console(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct at91_eth_data __initdata ek_eth_data = {</div><div class='add'>+static struct macb_platform_data __initdata ek_eth_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PC4,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_usbh_data __initdata ek_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_udc_data __initdata ek_udc_data = {</div><div class='hunk'>@@ -85,6 +87,7 @@ static struct at91_mmc_data __initdata ek_mmc_data = {</div><div class='ctx'> 	.slot_b		= 0,</div><div class='ctx'> 	.wire4		= 1,</div><div class='ctx'> 	.wp_pin		= AT91_PIN_PA17,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-rsi-ews.c b/arch/arm/mach-at91/board-rsi-ews.c<br/>index e927df0175df..af0750fafa29 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-rsi-ews.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-rsi-ews.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-rsi-ews.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-rsi-ews.c</a></div><div class='hunk'>@@ -60,7 +60,7 @@ static void __init rsi_ews_init_early(void)</div><div class='ctx'> /*</div><div class='ctx'>  * Ethernet</div><div class='ctx'>  */</div><div class='del'>-static struct at91_eth_data rsi_ews_eth_data __initdata = {</div><div class='add'>+static struct macb_platform_data rsi_ews_eth_data __initdata = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PC4,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='hunk'>@@ -70,6 +70,8 @@ static struct at91_eth_data rsi_ews_eth_data __initdata = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_usbh_data rsi_ews_usbh_data __initdata = {</div><div class='ctx'> 	.ports		= 1,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c<br/>index 072d53af98d9..84bce587735f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9-l9260.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-sam9-l9260.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9-l9260.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-sam9-l9260.c</a></div><div class='hunk'>@@ -72,6 +72,8 @@ static void __init ek_init_early(void)</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_usbh_data __initdata ek_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -79,7 +81,7 @@ static struct at91_usbh_data __initdata ek_usbh_data = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_udc_data __initdata ek_udc_data = {</div><div class='ctx'> 	.vbus_pin	= AT91_PIN_PC5,</div><div class='del'>-	.pullup_pin	= 0,		/* pull-up driven by UDC */</div><div class='add'>+	.pullup_pin	= -EINVAL,		/* pull-up driven by UDC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -109,7 +111,7 @@ static struct spi_board_info ek_spi_devices[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * MACB Ethernet device</div><div class='ctx'>  */</div><div class='del'>-static struct at91_eth_data __initdata ek_macb_data = {</div><div class='add'>+static struct macb_platform_data __initdata ek_macb_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PA7,</div><div class='ctx'> 	.is_rmii	= 0,</div><div class='ctx'> };</div><div class='hunk'>@@ -134,7 +136,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = {</div><div class='ctx'> static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> 	.ale		= 21,</div><div class='ctx'> 	.cle		= 22,</div><div class='del'>-//	.det_pin	= ... not connected</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PC13,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PC14,</div><div class='ctx'> 	.parts		= ek_nand_partition,</div><div class='hunk'>@@ -162,7 +164,7 @@ static struct sam9_smc_config __initdata ek_nand_smc_config = {</div><div class='ctx'> static void __init ek_add_device_nand(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* configure chip-select 3 (NAND) */</div><div class='del'>-	sam9_smc_configure(3, &amp;ek_nand_smc_config);</div><div class='add'>+	sam9_smc_configure(0, 3, &amp;ek_nand_smc_config);</div><div class='ctx'> </div><div class='ctx'> 	at91_add_device_nand(&amp;ek_nand_data);</div><div class='ctx'> }</div><div class='hunk'>@@ -176,7 +178,7 @@ static struct at91_mmc_data __initdata ek_mmc_data = {</div><div class='ctx'> 	.wire4		= 1,</div><div class='ctx'> 	.det_pin	= AT91_PIN_PC8,</div><div class='ctx'> 	.wp_pin		= AT91_PIN_PC4,</div><div class='del'>-//	.vcc_pin	= ... not connected</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init ek_board_init(void)</div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c<br/>index 4f10181a0782..be8233bcabdc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9260ek.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-sam9260ek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9260ek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-sam9260ek.c</a></div><div class='hunk'>@@ -75,6 +75,8 @@ static void __init ek_init_early(void)</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_usbh_data __initdata ek_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -82,7 +84,7 @@ static struct at91_usbh_data __initdata ek_usbh_data = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_udc_data __initdata ek_udc_data = {</div><div class='ctx'> 	.vbus_pin	= AT91_PIN_PC5,</div><div class='del'>-	.pullup_pin	= 0,		/* pull-up driven by UDC */</div><div class='add'>+	.pullup_pin	= -EINVAL,		/* pull-up driven by UDC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -151,7 +153,7 @@ static struct spi_board_info ek_spi_devices[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * MACB Ethernet device</div><div class='ctx'>  */</div><div class='del'>-static struct at91_eth_data __initdata ek_macb_data = {</div><div class='add'>+static struct macb_platform_data __initdata ek_macb_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PA7,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='hunk'>@@ -176,7 +178,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = {</div><div class='ctx'> static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> 	.ale		= 21,</div><div class='ctx'> 	.cle		= 22,</div><div class='del'>-//	.det_pin	= ... not connected</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PC13,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PC14,</div><div class='ctx'> 	.parts		= ek_nand_partition,</div><div class='hunk'>@@ -211,7 +213,7 @@ static void __init ek_add_device_nand(void)</div><div class='ctx'> 		ek_nand_smc_config.mode |= AT91_SMC_DBW_8;</div><div class='ctx'> </div><div class='ctx'> 	/* configure chip-select 3 (NAND) */</div><div class='del'>-	sam9_smc_configure(3, &amp;ek_nand_smc_config);</div><div class='add'>+	sam9_smc_configure(0, 3, &amp;ek_nand_smc_config);</div><div class='ctx'> </div><div class='ctx'> 	at91_add_device_nand(&amp;ek_nand_data);</div><div class='ctx'> }</div><div class='hunk'>@@ -223,9 +225,9 @@ static void __init ek_add_device_nand(void)</div><div class='ctx'> static struct at91_mmc_data __initdata ek_mmc_data = {</div><div class='ctx'> 	.slot_b		= 1,</div><div class='ctx'> 	.wire4		= 1,</div><div class='del'>-//	.det_pin	= ... not connected</div><div class='del'>-//	.wp_pin		= ... not connected</div><div class='del'>-//	.vcc_pin	= ... not connected</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='add'>+	.wp_pin		= -EINVAL,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c<br/>index b005b738e8ff..40895072a1a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9261ek.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-sam9261ek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9261ek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-sam9261ek.c</a></div><div class='hunk'>@@ -131,7 +131,7 @@ static struct sam9_smc_config __initdata dm9000_smc_config = {</div><div class='ctx'> static void __init ek_add_device_dm9000(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Configure chip-select 2 (DM9000) */</div><div class='del'>-	sam9_smc_configure(2, &amp;dm9000_smc_config);</div><div class='add'>+	sam9_smc_configure(0, 2, &amp;dm9000_smc_config);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure Reset signal as output */</div><div class='ctx'> 	at91_set_gpio_output(AT91_PIN_PC10, 0);</div><div class='hunk'>@@ -151,6 +151,8 @@ static void __init ek_add_device_dm9000(void) {}</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_usbh_data __initdata ek_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -159,7 +161,7 @@ static struct at91_usbh_data __initdata ek_usbh_data = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_udc_data __initdata ek_udc_data = {</div><div class='ctx'> 	.vbus_pin	= AT91_PIN_PB29,</div><div class='del'>-	.pullup_pin	= 0,		/* pull-up driven by UDC */</div><div class='add'>+	.pullup_pin	= -EINVAL,		/* pull-up driven by UDC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -182,7 +184,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = {</div><div class='ctx'> static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> 	.ale		= 22,</div><div class='ctx'> 	.cle		= 21,</div><div class='del'>-//	.det_pin	= ... not connected</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PC15,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PC14,</div><div class='ctx'> 	.parts		= ek_nand_partition,</div><div class='hunk'>@@ -217,7 +219,7 @@ static void __init ek_add_device_nand(void)</div><div class='ctx'> 		ek_nand_smc_config.mode |= AT91_SMC_DBW_8;</div><div class='ctx'> </div><div class='ctx'> 	/* configure chip-select 3 (NAND) */</div><div class='del'>-	sam9_smc_configure(3, &amp;ek_nand_smc_config);</div><div class='add'>+	sam9_smc_configure(0, 3, &amp;ek_nand_smc_config);</div><div class='ctx'> </div><div class='ctx'> 	at91_add_device_nand(&amp;ek_nand_data);</div><div class='ctx'> }</div><div class='hunk'>@@ -345,6 +347,9 @@ static struct spi_board_info ek_spi_devices[] = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_mmc_data __initdata ek_mmc_data = {</div><div class='ctx'> 	.wire4		= 1,</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='add'>+	.wp_pin		= -EINVAL,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_SPI_ATMEL_* */</div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c<br/>index bccdcf23caa1..29f66052fe63 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9263ek.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-sam9263ek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9263ek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-sam9263ek.c</a></div><div class='hunk'>@@ -74,6 +74,7 @@ static void __init ek_init_early(void)</div><div class='ctx'> static struct at91_usbh_data __initdata ek_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='ctx'> 	.vbus_pin	= { AT91_PIN_PA24, AT91_PIN_PA21 },</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -81,7 +82,7 @@ static struct at91_usbh_data __initdata ek_usbh_data = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_udc_data __initdata ek_udc_data = {</div><div class='ctx'> 	.vbus_pin	= AT91_PIN_PA25,</div><div class='del'>-	.pullup_pin	= 0,		/* pull-up driven by UDC */</div><div class='add'>+	.pullup_pin	= -EINVAL,		/* pull-up driven by UDC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -151,14 +152,14 @@ static struct at91_mmc_data __initdata ek_mmc_data = {</div><div class='ctx'> 	.wire4		= 1,</div><div class='ctx'> 	.det_pin	= AT91_PIN_PE18,</div><div class='ctx'> 	.wp_pin		= AT91_PIN_PE19,</div><div class='del'>-//	.vcc_pin	= ... not connected</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * MACB Ethernet device</div><div class='ctx'>  */</div><div class='del'>-static struct at91_eth_data __initdata ek_macb_data = {</div><div class='add'>+static struct macb_platform_data __initdata ek_macb_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PE31,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='hunk'>@@ -183,7 +184,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = {</div><div class='ctx'> static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> 	.ale		= 21,</div><div class='ctx'> 	.cle		= 22,</div><div class='del'>-//	.det_pin	= ... not connected</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PA22,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PD15,</div><div class='ctx'> 	.parts		= ek_nand_partition,</div><div class='hunk'>@@ -218,7 +219,7 @@ static void __init ek_add_device_nand(void)</div><div class='ctx'> 		ek_nand_smc_config.mode |= AT91_SMC_DBW_8;</div><div class='ctx'> </div><div class='ctx'> 	/* configure chip-select 3 (NAND) */</div><div class='del'>-	sam9_smc_configure(3, &amp;ek_nand_smc_config);</div><div class='add'>+	sam9_smc_configure(0, 3, &amp;ek_nand_smc_config);</div><div class='ctx'> </div><div class='ctx'> 	at91_add_device_nand(&amp;ek_nand_data);</div><div class='ctx'> }</div><div class='hunk'>@@ -353,6 +354,7 @@ static void __init ek_add_device_buttons(void) {}</div><div class='ctx'>  * reset_pin is not connected: NRST</div><div class='ctx'>  */</div><div class='ctx'> static struct ac97c_platform_data ek_ac97_data = {</div><div class='add'>+	.reset_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c<br/>index 64fc75c9d0ac..843d6286c6f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9g20ek.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-sam9g20ek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9g20ek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-sam9g20ek.c</a></div><div class='hunk'>@@ -86,6 +86,8 @@ static void __init ek_init_early(void)</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_usbh_data __initdata ek_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -93,7 +95,7 @@ static struct at91_usbh_data __initdata ek_usbh_data = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_udc_data __initdata ek_udc_data = {</div><div class='ctx'> 	.vbus_pin	= AT91_PIN_PC5,</div><div class='del'>-	.pullup_pin	= 0,		/* pull-up driven by UDC */</div><div class='add'>+	.pullup_pin	= -EINVAL,		/* pull-up driven by UDC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -123,7 +125,7 @@ static struct spi_board_info ek_spi_devices[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * MACB Ethernet device</div><div class='ctx'>  */</div><div class='del'>-static struct at91_eth_data __initdata ek_macb_data = {</div><div class='add'>+static struct macb_platform_data __initdata ek_macb_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PA7,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='hunk'>@@ -163,6 +165,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> 	.cle		= 22,</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PC13,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PC14,</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='ctx'> 	.parts		= ek_nand_partition,</div><div class='ctx'> 	.num_parts	= ARRAY_SIZE(ek_nand_partition),</div><div class='ctx'> };</div><div class='hunk'>@@ -195,7 +198,7 @@ static void __init ek_add_device_nand(void)</div><div class='ctx'> 		ek_nand_smc_config.mode |= AT91_SMC_DBW_8;</div><div class='ctx'> </div><div class='ctx'> 	/* configure chip-select 3 (NAND) */</div><div class='del'>-	sam9_smc_configure(3, &amp;ek_nand_smc_config);</div><div class='add'>+	sam9_smc_configure(0, 3, &amp;ek_nand_smc_config);</div><div class='ctx'> </div><div class='ctx'> 	at91_add_device_nand(&amp;ek_nand_data);</div><div class='ctx'> }</div><div class='hunk'>@@ -210,6 +213,7 @@ static struct mci_platform_data __initdata ek_mmc_data = {</div><div class='ctx'> 	.slot[1] = {</div><div class='ctx'> 		.bus_width	= 4,</div><div class='ctx'> 		.detect_pin	= AT91_PIN_PC9,</div><div class='add'>+		.wp_pin		= -EINVAL,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> };</div><div class='hunk'>@@ -218,6 +222,8 @@ static struct at91_mmc_data __initdata ek_mmc_data = {</div><div class='ctx'> 	.slot_b		= 1,	/* Only one slot so use slot B */</div><div class='ctx'> 	.wire4		= 1,</div><div class='ctx'> 	.det_pin	= AT91_PIN_PC9,</div><div class='add'>+	.wp_pin		= -EINVAL,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -227,6 +233,7 @@ static void __init ek_add_device_mmc(void)</div><div class='ctx'> 	if (ek_have_2mmc()) {</div><div class='ctx'> 		ek_mmc_data.slot[0].bus_width = 4;</div><div class='ctx'> 		ek_mmc_data.slot[0].detect_pin = AT91_PIN_PC2;</div><div class='add'>+		ek_mmc_data.slot[0].wp_pin = -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	at91_add_device_mci(0, &amp;ek_mmc_data);</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c<br/>index 92de9127923a..ea0d1b9c2b7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9m10g45ek.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-sam9m10g45ek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9m10g45ek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-sam9m10g45ek.c</a></div><div class='hunk'>@@ -69,6 +69,7 @@ static void __init ek_init_early(void)</div><div class='ctx'> static struct at91_usbh_data __initdata ek_usbh_hs_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='ctx'> 	.vbus_pin	= {AT91_PIN_PD1, AT91_PIN_PD3},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -100,6 +101,7 @@ static struct mci_platform_data __initdata mci0_data = {</div><div class='ctx'> 	.slot[0] = {</div><div class='ctx'> 		.bus_width	= 4,</div><div class='ctx'> 		.detect_pin	= AT91_PIN_PD10,</div><div class='add'>+		.wp_pin		= -EINVAL,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -115,7 +117,7 @@ static struct mci_platform_data __initdata mci1_data = {</div><div class='ctx'> /*</div><div class='ctx'>  * MACB Ethernet device</div><div class='ctx'>  */</div><div class='del'>-static struct at91_eth_data __initdata ek_macb_data = {</div><div class='add'>+static struct macb_platform_data __initdata ek_macb_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PD5,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='hunk'>@@ -143,6 +145,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> 	.cle		= 22,</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PC8,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PC14,</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='ctx'> 	.parts		= ek_nand_partition,</div><div class='ctx'> 	.num_parts	= ARRAY_SIZE(ek_nand_partition),</div><div class='ctx'> };</div><div class='hunk'>@@ -175,7 +178,7 @@ static void __init ek_add_device_nand(void)</div><div class='ctx'> 		ek_nand_smc_config.mode |= AT91_SMC_DBW_8;</div><div class='ctx'> </div><div class='ctx'> 	/* configure chip-select 3 (NAND) */</div><div class='del'>-	sam9_smc_configure(3, &amp;ek_nand_smc_config);</div><div class='add'>+	sam9_smc_configure(0, 3, &amp;ek_nand_smc_config);</div><div class='ctx'> </div><div class='ctx'> 	at91_add_device_nand(&amp;ek_nand_data);</div><div class='ctx'> }</div><div class='hunk'>@@ -330,6 +333,7 @@ static void __init ek_add_device_buttons(void) {}</div><div class='ctx'>  * reset_pin is not connected: NRST</div><div class='ctx'>  */</div><div class='ctx'> static struct ac97c_platform_data ek_ac97_data = {</div><div class='add'>+	.reset_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c<br/>index b2b748239f36..c1366d0032bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9rlek.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-sam9rlek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-sam9rlek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-sam9rlek.c</a></div><div class='hunk'>@@ -67,8 +67,8 @@ static struct usba_platform_data __initdata ek_usba_udc_data = {</div><div class='ctx'> static struct at91_mmc_data __initdata ek_mmc_data = {</div><div class='ctx'> 	.wire4		= 1,</div><div class='ctx'> 	.det_pin	= AT91_PIN_PA15,</div><div class='del'>-//	.wp_pin		= ... not connected</div><div class='del'>-//	.vcc_pin	= ... not connected</div><div class='add'>+	.wp_pin		= -EINVAL,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -91,7 +91,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = {</div><div class='ctx'> static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> 	.ale		= 21,</div><div class='ctx'> 	.cle		= 22,</div><div class='del'>-//	.det_pin	= ... not connected</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PD17,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PB6,</div><div class='ctx'> 	.parts		= ek_nand_partition,</div><div class='hunk'>@@ -119,7 +119,7 @@ static struct sam9_smc_config __initdata ek_nand_smc_config = {</div><div class='ctx'> static void __init ek_add_device_nand(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* configure chip-select 3 (NAND) */</div><div class='del'>-	sam9_smc_configure(3, &amp;ek_nand_smc_config);</div><div class='add'>+	sam9_smc_configure(0, 3, &amp;ek_nand_smc_config);</div><div class='ctx'> </div><div class='ctx'> 	at91_add_device_nand(&amp;ek_nand_data);</div><div class='ctx'> }</div><div class='hunk'>@@ -204,6 +204,7 @@ static struct atmel_lcdfb_info __initdata ek_lcdc_data;</div><div class='ctx'>  * reset_pin is not connected: NRST</div><div class='ctx'>  */</div><div class='ctx'> static struct ac97c_platform_data ek_ac97_data = {</div><div class='add'>+	.reset_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c<br/>index 0df01c6e2d0c..4770db08e5a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-snapper9260.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-snapper9260.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-snapper9260.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-snapper9260.c</a></div><div class='hunk'>@@ -57,15 +57,19 @@ static void __init snapper9260_init_early(void)</div><div class='ctx'> </div><div class='ctx'> static struct at91_usbh_data __initdata snapper9260_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_udc_data __initdata snapper9260_udc_data = {</div><div class='ctx'> 	.vbus_pin		= SNAPPER9260_IO_EXP_GPIO(5),</div><div class='ctx'> 	.vbus_active_low	= 1,</div><div class='ctx'> 	.vbus_polled		= 1,</div><div class='add'>+	.pullup_pin		= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct at91_eth_data snapper9260_macb_data = {</div><div class='add'>+static struct macb_platform_data snapper9260_macb_data = {</div><div class='add'>+	.phy_irq_pin	= -EINVAL,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -104,6 +108,8 @@ static struct atmel_nand_data __initdata snapper9260_nand_data = {</div><div class='ctx'> 	.parts		= snapper9260_nand_partitions,</div><div class='ctx'> 	.num_parts	= ARRAY_SIZE(snapper9260_nand_partitions),</div><div class='ctx'> 	.bus_width_16	= 0,</div><div class='add'>+	.enable_pin	= -EINVAL,</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sam9_smc_config __initdata snapper9260_nand_smc_config = {</div><div class='hunk'>@@ -149,7 +155,7 @@ static struct i2c_board_info __initdata snapper9260_i2c_devices[] = {</div><div class='ctx'> static void __init snapper9260_add_device_nand(void)</div><div class='ctx'> {</div><div class='ctx'> 	at91_set_A_periph(AT91_PIN_PC14, 0);</div><div class='del'>-	sam9_smc_configure(3, &amp;snapper9260_nand_smc_config);</div><div class='add'>+	sam9_smc_configure(0, 3, &amp;snapper9260_nand_smc_config);</div><div class='ctx'> 	at91_add_device_nand(&amp;snapper9260_nand_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/board-stamp9g20.c b/arch/arm/mach-at91/board-stamp9g20.c<br/>index 936e5fd7f406..72eb3b4d9ab6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-stamp9g20.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-stamp9g20.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-stamp9g20.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-stamp9g20.c</a></div><div class='hunk'>@@ -85,6 +85,7 @@ static struct atmel_nand_data __initdata nand_data = {</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PC13,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PC14,</div><div class='ctx'> 	.bus_width_16	= 0,</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sam9_smc_config __initdata nand_smc_config = {</div><div class='hunk'>@@ -108,7 +109,7 @@ static struct sam9_smc_config __initdata nand_smc_config = {</div><div class='ctx'> static void __init add_device_nand(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* configure chip-select 3 (NAND) */</div><div class='del'>-	sam9_smc_configure(3, &amp;nand_smc_config);</div><div class='add'>+	sam9_smc_configure(0, 3, &amp;nand_smc_config);</div><div class='ctx'> </div><div class='ctx'> 	at91_add_device_nand(&amp;nand_data);</div><div class='ctx'> }</div><div class='hunk'>@@ -122,12 +123,17 @@ static void __init add_device_nand(void)</div><div class='ctx'> static struct mci_platform_data __initdata mmc_data = {</div><div class='ctx'> 	.slot[0] = {</div><div class='ctx'> 		.bus_width	= 4,</div><div class='add'>+		.detect_pin	= -1,</div><div class='add'>+		.wp_pin		= -1,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> #else</div><div class='ctx'> static struct at91_mmc_data __initdata mmc_data = {</div><div class='ctx'> 	.slot_b		= 0,</div><div class='ctx'> 	.wire4		= 1,</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='add'>+	.wp_pin		= -EINVAL,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -137,6 +143,8 @@ static struct at91_mmc_data __initdata mmc_data = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_usbh_data __initdata usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -145,19 +153,19 @@ static struct at91_usbh_data __initdata usbh_data = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_udc_data __initdata portuxg20_udc_data = {</div><div class='ctx'> 	.vbus_pin	= AT91_PIN_PC7,</div><div class='del'>-	.pullup_pin	= 0,		/* pull-up driven by UDC */</div><div class='add'>+	.pullup_pin	= -EINVAL,		/* pull-up driven by UDC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct at91_udc_data __initdata stamp9g20evb_udc_data = {</div><div class='ctx'> 	.vbus_pin	= AT91_PIN_PA22,</div><div class='del'>-	.pullup_pin	= 0,		/* pull-up driven by UDC */</div><div class='add'>+	.pullup_pin	= -EINVAL,		/* pull-up driven by UDC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * MACB Ethernet device</div><div class='ctx'>  */</div><div class='del'>-static struct at91_eth_data __initdata macb_data = {</div><div class='add'>+static struct macb_platform_data __initdata macb_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PA28,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-at91/board-usb-a926x.c b/arch/arm/mach-at91/board-usb-a926x.c<br/>index 0a20bab21f99..26c36fc2d1e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-usb-a926x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-usb-a926x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-usb-a926x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-usb-a926x.c</a></div><div class='hunk'>@@ -66,6 +66,8 @@ static void __init ek_init_early(void)</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_usbh_data __initdata ek_usbh_data = {</div><div class='ctx'> 	.ports		= 2,</div><div class='add'>+	.vbus_pin	= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -73,7 +75,7 @@ static struct at91_usbh_data __initdata ek_usbh_data = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_udc_data __initdata ek_udc_data = {</div><div class='ctx'> 	.vbus_pin	= AT91_PIN_PB11,</div><div class='del'>-	.pullup_pin	= 0,		/* pull-up driven by UDC */</div><div class='add'>+	.pullup_pin	= -EINVAL,		/* pull-up driven by UDC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init ek_add_device_udc(void)</div><div class='hunk'>@@ -146,7 +148,7 @@ static void __init ek_add_device_spi(void)</div><div class='ctx'> /*</div><div class='ctx'>  * MACB Ethernet device</div><div class='ctx'>  */</div><div class='del'>-static struct at91_eth_data __initdata ek_macb_data = {</div><div class='add'>+static struct macb_platform_data __initdata ek_macb_data = {</div><div class='ctx'> 	.phy_irq_pin	= AT91_PIN_PE31,</div><div class='ctx'> 	.is_rmii	= 1,</div><div class='ctx'> };</div><div class='hunk'>@@ -193,7 +195,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = {</div><div class='ctx'> static struct atmel_nand_data __initdata ek_nand_data = {</div><div class='ctx'> 	.ale		= 21,</div><div class='ctx'> 	.cle		= 22,</div><div class='del'>-//	.det_pin	= ... not connected</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PA22,</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PD15,</div><div class='ctx'> 	.parts		= ek_nand_partition,</div><div class='hunk'>@@ -245,9 +247,9 @@ static void __init ek_add_device_nand(void)</div><div class='ctx'> </div><div class='ctx'> 	/* configure chip-select 3 (NAND) */</div><div class='ctx'> 	if (machine_is_usb_a9g20())</div><div class='del'>-		sam9_smc_configure(3, &amp;usb_a9g20_nand_smc_config);</div><div class='add'>+		sam9_smc_configure(0, 3, &amp;usb_a9g20_nand_smc_config);</div><div class='ctx'> 	else</div><div class='del'>-		sam9_smc_configure(3, &amp;usb_a9260_nand_smc_config);</div><div class='add'>+		sam9_smc_configure(0, 3, &amp;usb_a9260_nand_smc_config);</div><div class='ctx'> </div><div class='ctx'> 	at91_add_device_nand(&amp;ek_nand_data);</div><div class='ctx'> }</div><div class='hunk'>@@ -344,7 +346,7 @@ static void __init ek_board_init(void)</div><div class='ctx'> 		/* I2C */</div><div class='ctx'> 		at91_add_device_i2c(NULL, 0);</div><div class='ctx'> 		/* shutdown controller, wakeup button (5 msec low) */</div><div class='del'>-		at91_sys_write(AT91_SHDW_MR, AT91_SHDW_CPTWK0_(10)</div><div class='add'>+		at91_shdwc_write(AT91_SHDW_MR, AT91_SHDW_CPTWK0_(10)</div><div class='ctx'> 				| AT91_SHDW_WKMODE0_LOW</div><div class='ctx'> 				| AT91_SHDW_RTTWKEN);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c<br/>index 12a3f955162b..bbd553e1cd93 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-yl-9200.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/board-yl-9200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/board-yl-9200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/board-yl-9200.c</a></div><div class='hunk'>@@ -110,7 +110,7 @@ static struct gpio_led yl9200_leds[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * Ethernet</div><div class='ctx'>  */</div><div class='del'>-static struct at91_eth_data __initdata yl9200_eth_data = {</div><div class='add'>+static struct macb_platform_data __initdata yl9200_eth_data = {</div><div class='ctx'> 	.phy_irq_pin		= AT91_PIN_PB28,</div><div class='ctx'> 	.is_rmii		= 1,</div><div class='ctx'> };</div><div class='hunk'>@@ -120,6 +120,8 @@ static struct at91_eth_data __initdata yl9200_eth_data = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_usbh_data __initdata yl9200_usbh_data = {</div><div class='ctx'> 	.ports			= 1,	/* PQFP version of AT91RM9200 */</div><div class='add'>+	.vbus_pin		= {-EINVAL, -EINVAL},</div><div class='add'>+	.overcurrent_pin= {-EINVAL, -EINVAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -137,8 +139,9 @@ static struct at91_udc_data __initdata yl9200_udc_data = {</div><div class='ctx'>  */</div><div class='ctx'> static struct at91_mmc_data __initdata yl9200_mmc_data = {</div><div class='ctx'> 	.det_pin	= AT91_PIN_PB9,</div><div class='del'>-	// .wp_pin	= ... not connected</div><div class='ctx'> 	.wire4		= 1,</div><div class='add'>+	.wp_pin		= -EINVAL,</div><div class='add'>+	.vcc_pin	= -EINVAL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -175,7 +178,7 @@ static struct mtd_partition __initdata yl9200_nand_partition[] = {</div><div class='ctx'> static struct atmel_nand_data __initdata yl9200_nand_data = {</div><div class='ctx'> 	.ale		= 6,</div><div class='ctx'> 	.cle		= 7,</div><div class='del'>-	// .det_pin	= ... not connected</div><div class='add'>+	.det_pin	= -EINVAL,</div><div class='ctx'> 	.rdy_pin	= AT91_PIN_PC14,	/* R/!B (Sheet10) */</div><div class='ctx'> 	.enable_pin	= AT91_PIN_PC15,	/* !CE  (Sheet10) */</div><div class='ctx'> 	.parts		= yl9200_nand_partition,</div><div class='head'>diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h<br/>index 938b34f57741..4866b8180d66 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/generic.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/generic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/generic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/generic.h</a></div><div class='hunk'>@@ -29,6 +29,7 @@ extern void __init at91_aic_init(unsigned int priority[]);</div><div class='ctx'>  /* Timer */</div><div class='ctx'> struct sys_timer;</div><div class='ctx'> extern struct sys_timer at91rm9200_timer;</div><div class='add'>+extern void at91sam926x_ioremap_pit(u32 addr);</div><div class='ctx'> extern struct sys_timer at91sam926x_timer;</div><div class='ctx'> extern struct sys_timer at91x40_timer;</div><div class='ctx'> </div><div class='hunk'>@@ -57,7 +58,10 @@ extern void at91_irq_suspend(void);</div><div class='ctx'> extern void at91_irq_resume(void);</div><div class='ctx'> </div><div class='ctx'> /* reset */</div><div class='del'>-extern void at91sam9_alt_reset(void);</div><div class='add'>+extern void at91sam9_alt_restart(char, const char *);</div><div class='add'>+</div><div class='add'>+/* shutdown */</div><div class='add'>+extern void at91_ioremap_shdwc(u32 base_addr);</div><div class='ctx'> </div><div class='ctx'>  /* GPIO */</div><div class='ctx'> #define AT91RM9200_PQFP		3	/* AT91RM9200 PQFP package has 3 banks */</div><div class='hunk'>@@ -65,11 +69,9 @@ extern void at91sam9_alt_reset(void);</div><div class='ctx'> </div><div class='ctx'> struct at91_gpio_bank {</div><div class='ctx'> 	unsigned short id;		/* peripheral ID */</div><div class='del'>-	unsigned long offset;		/* offset from system peripheral base */</div><div class='del'>-	struct clk *clock;		/* associated clock */</div><div class='add'>+	unsigned long regbase;		/* offset from system peripheral base */</div><div class='ctx'> };</div><div class='ctx'> extern void __init at91_gpio_init(struct at91_gpio_bank *, int nr_banks);</div><div class='ctx'> extern void __init at91_gpio_irq_setup(void);</div><div class='ctx'> </div><div class='del'>-extern void (*at91_arch_reset)(void);</div><div class='ctx'> extern int at91_extern_irq;</div><div class='head'>diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c<br/>index 224e9e2f8674..74d6783eeabb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/gpio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/gpio.c</a></div><div class='hunk'>@@ -29,8 +29,9 @@</div><div class='ctx'> struct at91_gpio_chip {</div><div class='ctx'> 	struct gpio_chip	chip;</div><div class='ctx'> 	struct at91_gpio_chip	*next;		/* Bank sharing same clock */</div><div class='del'>-	struct at91_gpio_bank	*bank;		/* Bank definition */</div><div class='add'>+	int			id;		/* ID of register bank */</div><div class='ctx'> 	void __iomem		*regbase;	/* Base of register bank */</div><div class='add'>+	struct clk		*clock;		/* associated clock */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define to_at91_gpio_chip(c) container_of(c, struct at91_gpio_chip, chip)</div><div class='hunk'>@@ -58,18 +59,17 @@ static int at91_gpiolib_direction_input(struct gpio_chip *chip,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> static struct at91_gpio_chip gpio_chip[] = {</div><div class='del'>-	AT91_GPIO_CHIP("A", 0x00 + PIN_BASE, 32),</div><div class='del'>-	AT91_GPIO_CHIP("B", 0x20 + PIN_BASE, 32),</div><div class='del'>-	AT91_GPIO_CHIP("C", 0x40 + PIN_BASE, 32),</div><div class='del'>-	AT91_GPIO_CHIP("D", 0x60 + PIN_BASE, 32),</div><div class='del'>-	AT91_GPIO_CHIP("E", 0x80 + PIN_BASE, 32),</div><div class='add'>+	AT91_GPIO_CHIP("pioA", 0x00, 32),</div><div class='add'>+	AT91_GPIO_CHIP("pioB", 0x20, 32),</div><div class='add'>+	AT91_GPIO_CHIP("pioC", 0x40, 32),</div><div class='add'>+	AT91_GPIO_CHIP("pioD", 0x60, 32),</div><div class='add'>+	AT91_GPIO_CHIP("pioE", 0x80, 32),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int gpio_banks;</div><div class='ctx'> </div><div class='ctx'> static inline void __iomem *pin_to_controller(unsigned pin)</div><div class='ctx'> {</div><div class='del'>-	pin -= PIN_BASE;</div><div class='ctx'> 	pin /= 32;</div><div class='ctx'> 	if (likely(pin &lt; gpio_banks))</div><div class='ctx'> 		return gpio_chip[pin].regbase;</div><div class='hunk'>@@ -79,7 +79,6 @@ static inline void __iomem *pin_to_controller(unsigned pin)</div><div class='ctx'> </div><div class='ctx'> static inline unsigned pin_to_mask(unsigned pin)</div><div class='ctx'> {</div><div class='del'>-	pin -= PIN_BASE;</div><div class='ctx'> 	return 1 &lt;&lt; (pin % 32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -274,8 +273,9 @@ static u32 backups[MAX_GPIO_BANKS];</div><div class='ctx'> </div><div class='ctx'> static int gpio_irq_set_wake(struct irq_data *d, unsigned state)</div><div class='ctx'> {</div><div class='del'>-	unsigned	mask = pin_to_mask(d-&gt;irq);</div><div class='del'>-	unsigned	bank = (d-&gt;irq - PIN_BASE) / 32;</div><div class='add'>+	unsigned	pin = irq_to_gpio(d-&gt;irq);</div><div class='add'>+	unsigned	mask = pin_to_mask(pin);</div><div class='add'>+	unsigned	bank = pin / 32;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(bank &gt;= MAX_GPIO_BANKS))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -285,7 +285,7 @@ static int gpio_irq_set_wake(struct irq_data *d, unsigned state)</div><div class='ctx'> 	else</div><div class='ctx'> 		wakeups[bank] &amp;= ~mask;</div><div class='ctx'> </div><div class='del'>-	irq_set_irq_wake(gpio_chip[bank].bank-&gt;id, state);</div><div class='add'>+	irq_set_irq_wake(gpio_chip[bank].id, state);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -302,7 +302,7 @@ void at91_gpio_suspend(void)</div><div class='ctx'> 		__raw_writel(wakeups[i], pio + PIO_IER);</div><div class='ctx'> </div><div class='ctx'> 		if (!wakeups[i])</div><div class='del'>-			clk_disable(gpio_chip[i].bank-&gt;clock);</div><div class='add'>+			clk_disable(gpio_chip[i].clock);</div><div class='ctx'> 		else {</div><div class='ctx'> #ifdef CONFIG_PM_DEBUG</div><div class='ctx'> 			printk(KERN_DEBUG "GPIO-%c may wake for %08x\n", 'A'+i, wakeups[i]);</div><div class='hunk'>@@ -319,7 +319,7 @@ void at91_gpio_resume(void)</div><div class='ctx'> 		void __iomem	*pio = gpio_chip[i].regbase;</div><div class='ctx'> </div><div class='ctx'> 		if (!wakeups[i])</div><div class='del'>-			clk_enable(gpio_chip[i].bank-&gt;clock);</div><div class='add'>+			clk_enable(gpio_chip[i].clock);</div><div class='ctx'> </div><div class='ctx'> 		__raw_writel(wakeups[i], pio + PIO_IDR);</div><div class='ctx'> 		__raw_writel(backups[i], pio + PIO_IER);</div><div class='hunk'>@@ -344,8 +344,9 @@ void at91_gpio_resume(void)</div><div class='ctx'> </div><div class='ctx'> static void gpio_irq_mask(struct irq_data *d)</div><div class='ctx'> {</div><div class='del'>-	void __iomem	*pio = pin_to_controller(d-&gt;irq);</div><div class='del'>-	unsigned	mask = pin_to_mask(d-&gt;irq);</div><div class='add'>+	unsigned	pin = irq_to_gpio(d-&gt;irq);</div><div class='add'>+	void __iomem	*pio = pin_to_controller(pin);</div><div class='add'>+	unsigned	mask = pin_to_mask(pin);</div><div class='ctx'> </div><div class='ctx'> 	if (pio)</div><div class='ctx'> 		__raw_writel(mask, pio + PIO_IDR);</div><div class='hunk'>@@ -353,8 +354,9 @@ static void gpio_irq_mask(struct irq_data *d)</div><div class='ctx'> </div><div class='ctx'> static void gpio_irq_unmask(struct irq_data *d)</div><div class='ctx'> {</div><div class='del'>-	void __iomem	*pio = pin_to_controller(d-&gt;irq);</div><div class='del'>-	unsigned	mask = pin_to_mask(d-&gt;irq);</div><div class='add'>+	unsigned	pin = irq_to_gpio(d-&gt;irq);</div><div class='add'>+	void __iomem	*pio = pin_to_controller(pin);</div><div class='add'>+	unsigned	mask = pin_to_mask(pin);</div><div class='ctx'> </div><div class='ctx'> 	if (pio)</div><div class='ctx'> 		__raw_writel(mask, pio + PIO_IER);</div><div class='hunk'>@@ -382,7 +384,7 @@ static struct irq_chip gpio_irqchip = {</div><div class='ctx'> </div><div class='ctx'> static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	unsigned	pin;</div><div class='add'>+	unsigned	irq_pin;</div><div class='ctx'> 	struct irq_data *idata = irq_desc_get_irq_data(desc);</div><div class='ctx'> 	struct irq_chip *chip = irq_data_get_irq_chip(idata);</div><div class='ctx'> 	struct at91_gpio_chip *at91_gpio = irq_data_get_irq_chip_data(idata);</div><div class='hunk'>@@ -405,12 +407,12 @@ static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pin = at91_gpio-&gt;chip.base;</div><div class='add'>+		irq_pin = gpio_to_irq(at91_gpio-&gt;chip.base);</div><div class='ctx'> </div><div class='ctx'> 		while (isr) {</div><div class='ctx'> 			if (isr &amp; 1)</div><div class='del'>-				generic_handle_irq(pin);</div><div class='del'>-			pin++;</div><div class='add'>+				generic_handle_irq(irq_pin);</div><div class='add'>+			irq_pin++;</div><div class='ctx'> 			isr &gt;&gt;= 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -438,7 +440,7 @@ static int at91_gpio_show(struct seq_file *s, void *unused)</div><div class='ctx'> 		seq_printf(s, "%i:\t", j);</div><div class='ctx'> </div><div class='ctx'> 		for (bank = 0; bank &lt; gpio_banks; bank++) {</div><div class='del'>-			unsigned	pin  = PIN_BASE + (32 * bank) + j;</div><div class='add'>+			unsigned	pin  = (32 * bank) + j;</div><div class='ctx'> 			void __iomem	*pio = pin_to_controller(pin);</div><div class='ctx'> 			unsigned	mask = pin_to_mask(pin);</div><div class='ctx'> </div><div class='hunk'>@@ -491,27 +493,28 @@ static struct lock_class_key gpio_lock_class;</div><div class='ctx'>  */</div><div class='ctx'> void __init at91_gpio_irq_setup(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned		pioc, pin;</div><div class='add'>+	unsigned		pioc, irq = gpio_to_irq(0);</div><div class='ctx'> 	struct at91_gpio_chip	*this, *prev;</div><div class='ctx'> </div><div class='del'>-	for (pioc = 0, pin = PIN_BASE, this = gpio_chip, prev = NULL;</div><div class='add'>+	for (pioc = 0, this = gpio_chip, prev = NULL;</div><div class='ctx'> 			pioc++ &lt; gpio_banks;</div><div class='ctx'> 			prev = this, this++) {</div><div class='del'>-		unsigned	id = this-&gt;bank-&gt;id;</div><div class='add'>+		unsigned	id = this-&gt;id;</div><div class='ctx'> 		unsigned	i;</div><div class='ctx'> </div><div class='ctx'> 		__raw_writel(~0, this-&gt;regbase + PIO_IDR);</div><div class='ctx'> </div><div class='del'>-		for (i = 0, pin = this-&gt;chip.base; i &lt; 32; i++, pin++) {</div><div class='del'>-			irq_set_lockdep_class(pin, &amp;gpio_lock_class);</div><div class='add'>+		for (i = 0, irq = gpio_to_irq(this-&gt;chip.base); i &lt; 32;</div><div class='add'>+		     i++, irq++) {</div><div class='add'>+			irq_set_lockdep_class(irq, &amp;gpio_lock_class);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Can use the "simple" and not "edge" handler since it's</div><div class='ctx'> 			 * shorter, and the AIC handles interrupts sanely.</div><div class='ctx'> 			 */</div><div class='del'>-			irq_set_chip_and_handler(pin, &amp;gpio_irqchip,</div><div class='add'>+			irq_set_chip_and_handler(irq, &amp;gpio_irqchip,</div><div class='ctx'> 						 handle_simple_irq);</div><div class='del'>-			set_irq_flags(pin, IRQF_VALID);</div><div class='add'>+			set_irq_flags(irq, IRQF_VALID);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* The toplevel handler handles one bank of GPIOs, except</div><div class='hunk'>@@ -524,7 +527,7 @@ void __init at91_gpio_irq_setup(void)</div><div class='ctx'> 		irq_set_chip_data(id, this);</div><div class='ctx'> 		irq_set_chained_handler(id, gpio_irq_handler);</div><div class='ctx'> 	}</div><div class='del'>-	pr_info("AT91: %d gpio irqs in %d banks\n", pin - PIN_BASE, gpio_banks);</div><div class='add'>+	pr_info("AT91: %d gpio irqs in %d banks\n", irq - gpio_to_irq(0), gpio_banks);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* gpiolib support */</div><div class='hunk'>@@ -612,16 +615,26 @@ void __init at91_gpio_init(struct at91_gpio_bank *data, int nr_banks)</div><div class='ctx'> 	for (i = 0; i &lt; nr_banks; i++) {</div><div class='ctx'> 		at91_gpio = &amp;gpio_chip[i];</div><div class='ctx'> </div><div class='del'>-		at91_gpio-&gt;bank = &amp;data[i];</div><div class='del'>-		at91_gpio-&gt;chip.base = PIN_BASE + i * 32;</div><div class='del'>-		at91_gpio-&gt;regbase = at91_gpio-&gt;bank-&gt;offset +</div><div class='del'>-			(void __iomem *)AT91_VA_BASE_SYS;</div><div class='add'>+		at91_gpio-&gt;id = data[i].id;</div><div class='add'>+		at91_gpio-&gt;chip.base = i * 32;</div><div class='add'>+</div><div class='add'>+		at91_gpio-&gt;regbase = ioremap(data[i].regbase, 512);</div><div class='add'>+		if (!at91_gpio-&gt;regbase) {</div><div class='add'>+			pr_err("at91_gpio.%d, failed to map registers, ignoring.\n", i);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		at91_gpio-&gt;clock = clk_get_sys(NULL, at91_gpio-&gt;chip.label);</div><div class='add'>+		if (!at91_gpio-&gt;clock) {</div><div class='add'>+			pr_err("at91_gpio.%d, failed to get clock, ignoring.\n", i);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* enable PIO controller's clock */</div><div class='del'>-		clk_enable(at91_gpio-&gt;bank-&gt;clock);</div><div class='add'>+		clk_enable(at91_gpio-&gt;clock);</div><div class='ctx'> </div><div class='ctx'> 		/* AT91SAM9263_ID_PIOCDE groups PIOC, PIOD, PIOE */</div><div class='del'>-		if (last &amp;&amp; last-&gt;bank-&gt;id == at91_gpio-&gt;bank-&gt;id)</div><div class='add'>+		if (last &amp;&amp; last-&gt;id == at91_gpio-&gt;id)</div><div class='ctx'> 			last-&gt;next = at91_gpio;</div><div class='ctx'> 		last = at91_gpio;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91_aic.h b/arch/arm/mach-at91/include/mach/at91_aic.h<br/>index 03566799d3be..3045781c473f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_aic.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91_aic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_aic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/at91_aic.h</a></div><div class='hunk'>@@ -16,7 +16,19 @@</div><div class='ctx'> #ifndef AT91_AIC_H</div><div class='ctx'> #define AT91_AIC_H</div><div class='ctx'> </div><div class='del'>-#define AT91_AIC_SMR(n)		(AT91_AIC + ((n) * 4))	/* Source Mode Registers 0-31 */</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+extern void __iomem *at91_aic_base;</div><div class='add'>+</div><div class='add'>+#define at91_aic_read(field) \</div><div class='add'>+	__raw_readl(at91_aic_base + field)</div><div class='add'>+</div><div class='add'>+#define at91_aic_write(field, value) \</div><div class='add'>+	__raw_writel(value, at91_aic_base + field);</div><div class='add'>+#else</div><div class='add'>+.extern at91_aic_base</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define AT91_AIC_SMR(n)		((n) * 4)		/* Source Mode Registers 0-31 */</div><div class='ctx'> #define		AT91_AIC_PRIOR		(7 &lt;&lt; 0)		/* Priority Level */</div><div class='ctx'> #define		AT91_AIC_SRCTYPE	(3 &lt;&lt; 5)		/* Interrupt Source Type */</div><div class='ctx'> #define			AT91_AIC_SRCTYPE_LOW		(0 &lt;&lt; 5)</div><div class='hunk'>@@ -24,30 +36,30 @@</div><div class='ctx'> #define			AT91_AIC_SRCTYPE_HIGH		(2 &lt;&lt; 5)</div><div class='ctx'> #define			AT91_AIC_SRCTYPE_RISING		(3 &lt;&lt; 5)</div><div class='ctx'> </div><div class='del'>-#define AT91_AIC_SVR(n)		(AT91_AIC + 0x80 + ((n) * 4))	/* Source Vector Registers 0-31 */</div><div class='del'>-#define AT91_AIC_IVR		(AT91_AIC + 0x100)	/* Interrupt Vector Register */</div><div class='del'>-#define AT91_AIC_FVR		(AT91_AIC + 0x104)	/* Fast Interrupt Vector Register */</div><div class='del'>-#define AT91_AIC_ISR		(AT91_AIC + 0x108)	/* Interrupt Status Register */</div><div class='add'>+#define AT91_AIC_SVR(n)		(0x80 + ((n) * 4))	/* Source Vector Registers 0-31 */</div><div class='add'>+#define AT91_AIC_IVR		0x100			/* Interrupt Vector Register */</div><div class='add'>+#define AT91_AIC_FVR		0x104			/* Fast Interrupt Vector Register */</div><div class='add'>+#define AT91_AIC_ISR		0x108			/* Interrupt Status Register */</div><div class='ctx'> #define		AT91_AIC_IRQID		(0x1f &lt;&lt; 0)		/* Current Interrupt Identifier */</div><div class='ctx'> </div><div class='del'>-#define AT91_AIC_IPR		(AT91_AIC + 0x10c)	/* Interrupt Pending Register */</div><div class='del'>-#define AT91_AIC_IMR		(AT91_AIC + 0x110)	/* Interrupt Mask Register */</div><div class='del'>-#define AT91_AIC_CISR		(AT91_AIC + 0x114)	/* Core Interrupt Status Register */</div><div class='add'>+#define AT91_AIC_IPR		0x10c			/* Interrupt Pending Register */</div><div class='add'>+#define AT91_AIC_IMR		0x110			/* Interrupt Mask Register */</div><div class='add'>+#define AT91_AIC_CISR		0x114			/* Core Interrupt Status Register */</div><div class='ctx'> #define		AT91_AIC_NFIQ		(1 &lt;&lt; 0)		/* nFIQ Status */</div><div class='ctx'> #define		AT91_AIC_NIRQ		(1 &lt;&lt; 1)		/* nIRQ Status */</div><div class='ctx'> </div><div class='del'>-#define AT91_AIC_IECR		(AT91_AIC + 0x120)	/* Interrupt Enable Command Register */</div><div class='del'>-#define AT91_AIC_IDCR		(AT91_AIC + 0x124)	/* Interrupt Disable Command Register */</div><div class='del'>-#define AT91_AIC_ICCR		(AT91_AIC + 0x128)	/* Interrupt Clear Command Register */</div><div class='del'>-#define AT91_AIC_ISCR		(AT91_AIC + 0x12c)	/* Interrupt Set Command Register */</div><div class='del'>-#define AT91_AIC_EOICR		(AT91_AIC + 0x130)	/* End of Interrupt Command Register */</div><div class='del'>-#define AT91_AIC_SPU		(AT91_AIC + 0x134)	/* Spurious Interrupt Vector Register */</div><div class='del'>-#define AT91_AIC_DCR		(AT91_AIC + 0x138)	/* Debug Control Register */</div><div class='add'>+#define AT91_AIC_IECR		0x120			/* Interrupt Enable Command Register */</div><div class='add'>+#define AT91_AIC_IDCR		0x124			/* Interrupt Disable Command Register */</div><div class='add'>+#define AT91_AIC_ICCR		0x128			/* Interrupt Clear Command Register */</div><div class='add'>+#define AT91_AIC_ISCR		0x12c			/* Interrupt Set Command Register */</div><div class='add'>+#define AT91_AIC_EOICR		0x130			/* End of Interrupt Command Register */</div><div class='add'>+#define AT91_AIC_SPU		0x134			/* Spurious Interrupt Vector Register */</div><div class='add'>+#define AT91_AIC_DCR		0x138			/* Debug Control Register */</div><div class='ctx'> #define		AT91_AIC_DCR_PROT	(1 &lt;&lt; 0)		/* Protection Mode */</div><div class='ctx'> #define		AT91_AIC_DCR_GMSK	(1 &lt;&lt; 1)		/* General Mask */</div><div class='ctx'> </div><div class='del'>-#define AT91_AIC_FFER		(AT91_AIC + 0x140)	/* Fast Forcing Enable Register [SAM9 only] */</div><div class='del'>-#define AT91_AIC_FFDR		(AT91_AIC + 0x144)	/* Fast Forcing Disable Register [SAM9 only] */</div><div class='del'>-#define AT91_AIC_FFSR		(AT91_AIC + 0x148)	/* Fast Forcing Status Register [SAM9 only] */</div><div class='add'>+#define AT91_AIC_FFER		0x140			/* Fast Forcing Enable Register [SAM9 only] */</div><div class='add'>+#define AT91_AIC_FFDR		0x144			/* Fast Forcing Disable Register [SAM9 only] */</div><div class='add'>+#define AT91_AIC_FFSR		0x148			/* Fast Forcing Status Register [SAM9 only] */</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91_dbgu.h b/arch/arm/mach-at91/include/mach/at91_dbgu.h<br/>index dbfe455a4c41..2aa0c5e13495 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_dbgu.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91_dbgu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_dbgu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/at91_dbgu.h</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #define dbgu_readl(dbgu, field) \</div><div class='ctx'> 	__raw_readl(AT91_VA_BASE_SYS + dbgu + AT91_DBGU_ ## field)</div><div class='ctx'> </div><div class='del'>-#ifdef AT91_DBGU</div><div class='add'>+#if !defined(CONFIG_ARCH_AT91X40)</div><div class='ctx'> #define AT91_DBGU_CR		(0x00)	/* Control Register */</div><div class='ctx'> #define AT91_DBGU_MR		(0x04)	/* Mode Register */</div><div class='ctx'> #define AT91_DBGU_IER		(0x08)	/* Interrupt Enable Register */</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91_pit.h b/arch/arm/mach-at91/include/mach/at91_pit.h<br/>index 974d0bd05b5b..d1f80ad7f4d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_pit.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91_pit.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_pit.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/at91_pit.h</a></div><div class='hunk'>@@ -16,16 +16,16 @@</div><div class='ctx'> #ifndef AT91_PIT_H</div><div class='ctx'> #define AT91_PIT_H</div><div class='ctx'> </div><div class='del'>-#define AT91_PIT_MR		(AT91_PIT + 0x00)	/* Mode Register */</div><div class='add'>+#define AT91_PIT_MR		0x00			/* Mode Register */</div><div class='ctx'> #define		AT91_PIT_PITIEN		(1 &lt;&lt; 25)		/* Timer Interrupt Enable */</div><div class='ctx'> #define		AT91_PIT_PITEN		(1 &lt;&lt; 24)		/* Timer Enabled */</div><div class='ctx'> #define		AT91_PIT_PIV		(0xfffff)		/* Periodic Interval Value */</div><div class='ctx'> </div><div class='del'>-#define AT91_PIT_SR		(AT91_PIT + 0x04)	/* Status Register */</div><div class='add'>+#define AT91_PIT_SR		0x04			/* Status Register */</div><div class='ctx'> #define		AT91_PIT_PITS		(1 &lt;&lt; 0)		/* Timer Status */</div><div class='ctx'> </div><div class='del'>-#define AT91_PIT_PIVR		(AT91_PIT + 0x08)	/* Periodic Interval Value Register */</div><div class='del'>-#define AT91_PIT_PIIR		(AT91_PIT + 0x0c)	/* Periodic Interval Image Register */</div><div class='add'>+#define AT91_PIT_PIVR		0x08			/* Periodic Interval Value Register */</div><div class='add'>+#define AT91_PIT_PIIR		0x0c			/* Periodic Interval Image Register */</div><div class='ctx'> #define		AT91_PIT_PICNT		(0xfff &lt;&lt; 20)		/* Interval Counter */</div><div class='ctx'> #define		AT91_PIT_CPIV		(0xfffff)		/* Inverval Value */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91_rtc.h b/arch/arm/mach-at91/include/mach/at91_rtc.h<br/>index e56f4701a3e5..da1945e5f714 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_rtc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91_rtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_rtc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/at91_rtc.h</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #ifndef AT91_RTC_H</div><div class='ctx'> #define AT91_RTC_H</div><div class='ctx'> </div><div class='del'>-#define	AT91_RTC_CR		(AT91_RTC + 0x00)	/* Control Register */</div><div class='add'>+#define	AT91_RTC_CR		0x00			/* Control Register */</div><div class='ctx'> #define		AT91_RTC_UPDTIM		(1 &lt;&lt;  0)		/* Update Request Time Register */</div><div class='ctx'> #define		AT91_RTC_UPDCAL		(1 &lt;&lt;  1)		/* Update Request Calendar Register */</div><div class='ctx'> #define		AT91_RTC_TIMEVSEL	(3 &lt;&lt;  8)		/* Time Event Selection */</div><div class='hunk'>@@ -29,44 +29,44 @@</div><div class='ctx'> #define			AT91_RTC_CALEVSEL_MONTH		(1 &lt;&lt; 16)</div><div class='ctx'> #define			AT91_RTC_CALEVSEL_YEAR		(2 &lt;&lt; 16)</div><div class='ctx'> </div><div class='del'>-#define	AT91_RTC_MR		(AT91_RTC + 0x04)	/* Mode Register */</div><div class='add'>+#define	AT91_RTC_MR		0x04			/* Mode Register */</div><div class='ctx'> #define			AT91_RTC_HRMOD		(1 &lt;&lt;  0)		/* 12/24 Hour Mode */</div><div class='ctx'> </div><div class='del'>-#define	AT91_RTC_TIMR		(AT91_RTC + 0x08)	/* Time Register */</div><div class='add'>+#define	AT91_RTC_TIMR		0x08			/* Time Register */</div><div class='ctx'> #define		AT91_RTC_SEC		(0x7f &lt;&lt;  0)		/* Current Second */</div><div class='ctx'> #define		AT91_RTC_MIN		(0x7f &lt;&lt;  8)		/* Current Minute */</div><div class='ctx'> #define		AT91_RTC_HOUR		(0x3f &lt;&lt; 16)		/* Current Hour */</div><div class='ctx'> #define		AT91_RTC_AMPM		(1    &lt;&lt; 22)		/* Ante Meridiem Post Meridiem Indicator */</div><div class='ctx'> </div><div class='del'>-#define	AT91_RTC_CALR		(AT91_RTC + 0x0c)	/* Calendar Register */</div><div class='add'>+#define	AT91_RTC_CALR		0x0c			/* Calendar Register */</div><div class='ctx'> #define		AT91_RTC_CENT		(0x7f &lt;&lt;  0)		/* Current Century */</div><div class='ctx'> #define		AT91_RTC_YEAR		(0xff &lt;&lt;  8)		/* Current Year */</div><div class='ctx'> #define		AT91_RTC_MONTH		(0x1f &lt;&lt; 16)		/* Current Month */</div><div class='ctx'> #define		AT91_RTC_DAY		(7    &lt;&lt; 21)		/* Current Day */</div><div class='ctx'> #define		AT91_RTC_DATE		(0x3f &lt;&lt; 24)		/* Current Date */</div><div class='ctx'> </div><div class='del'>-#define	AT91_RTC_TIMALR		(AT91_RTC + 0x10)	/* Time Alarm Register */</div><div class='add'>+#define	AT91_RTC_TIMALR		0x10			/* Time Alarm Register */</div><div class='ctx'> #define		AT91_RTC_SECEN		(1 &lt;&lt;  7)		/* Second Alarm Enable */</div><div class='ctx'> #define		AT91_RTC_MINEN		(1 &lt;&lt; 15)		/* Minute Alarm Enable */</div><div class='ctx'> #define		AT91_RTC_HOUREN		(1 &lt;&lt; 23)		/* Hour Alarm Enable */</div><div class='ctx'> </div><div class='del'>-#define	AT91_RTC_CALALR		(AT91_RTC + 0x14)	/* Calendar Alarm Register */</div><div class='add'>+#define	AT91_RTC_CALALR		0x14			/* Calendar Alarm Register */</div><div class='ctx'> #define		AT91_RTC_MTHEN		(1 &lt;&lt; 23)		/* Month Alarm Enable */</div><div class='ctx'> #define		AT91_RTC_DATEEN		(1 &lt;&lt; 31)		/* Date Alarm Enable */</div><div class='ctx'> </div><div class='del'>-#define	AT91_RTC_SR		(AT91_RTC + 0x18)	/* Status Register */</div><div class='add'>+#define	AT91_RTC_SR		0x18			/* Status Register */</div><div class='ctx'> #define		AT91_RTC_ACKUPD		(1 &lt;&lt;  0)		/* Acknowledge for Update */</div><div class='ctx'> #define		AT91_RTC_ALARM		(1 &lt;&lt;  1)		/* Alarm Flag */</div><div class='ctx'> #define		AT91_RTC_SECEV		(1 &lt;&lt;  2)		/* Second Event */</div><div class='ctx'> #define		AT91_RTC_TIMEV		(1 &lt;&lt;  3)		/* Time Event */</div><div class='ctx'> #define		AT91_RTC_CALEV		(1 &lt;&lt;  4)		/* Calendar Event */</div><div class='ctx'> </div><div class='del'>-#define	AT91_RTC_SCCR		(AT91_RTC + 0x1c)	/* Status Clear Command Register */</div><div class='del'>-#define	AT91_RTC_IER		(AT91_RTC + 0x20)	/* Interrupt Enable Register */</div><div class='del'>-#define	AT91_RTC_IDR		(AT91_RTC + 0x24)	/* Interrupt Disable Register */</div><div class='del'>-#define	AT91_RTC_IMR		(AT91_RTC + 0x28)	/* Interrupt Mask Register */</div><div class='add'>+#define	AT91_RTC_SCCR		0x1c			/* Status Clear Command Register */</div><div class='add'>+#define	AT91_RTC_IER		0x20			/* Interrupt Enable Register */</div><div class='add'>+#define	AT91_RTC_IDR		0x24			/* Interrupt Disable Register */</div><div class='add'>+#define	AT91_RTC_IMR		0x28			/* Interrupt Mask Register */</div><div class='ctx'> </div><div class='del'>-#define	AT91_RTC_VER		(AT91_RTC + 0x2c)	/* Valid Entry Register */</div><div class='add'>+#define	AT91_RTC_VER		0x2c			/* Valid Entry Register */</div><div class='ctx'> #define		AT91_RTC_NVTIM		(1 &lt;&lt;  0)		/* Non valid Time */</div><div class='ctx'> #define		AT91_RTC_NVCAL		(1 &lt;&lt;  1)		/* Non valid Calendar */</div><div class='ctx'> #define		AT91_RTC_NVTIMALR	(1 &lt;&lt;  2)		/* Non valid Time Alarm */</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91_shdwc.h b/arch/arm/mach-at91/include/mach/at91_shdwc.h<br/>index c4ce07e8a8fa..1d4fe822c77a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_shdwc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91_shdwc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91_shdwc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/at91_shdwc.h</a></div><div class='hunk'>@@ -16,11 +16,21 @@</div><div class='ctx'> #ifndef AT91_SHDWC_H</div><div class='ctx'> #define AT91_SHDWC_H</div><div class='ctx'> </div><div class='del'>-#define AT91_SHDW_CR		(AT91_SHDWC + 0x00)	/* Shut Down Control Register */</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+extern void __iomem *at91_shdwc_base;</div><div class='add'>+</div><div class='add'>+#define at91_shdwc_read(field) \</div><div class='add'>+	__raw_readl(at91_shdwc_base + field)</div><div class='add'>+</div><div class='add'>+#define at91_shdwc_write(field, value) \</div><div class='add'>+	__raw_writel(value, at91_shdwc_base + field);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define AT91_SHDW_CR		0x00			/* Shut Down Control Register */</div><div class='ctx'> #define		AT91_SHDW_SHDW		(1    &lt;&lt; 0)		/* Shut Down command */</div><div class='ctx'> #define		AT91_SHDW_KEY		(0xa5 &lt;&lt; 24)		/* KEY Password */</div><div class='ctx'> </div><div class='del'>-#define AT91_SHDW_MR		(AT91_SHDWC + 0x04)	/* Shut Down Mode Register */</div><div class='add'>+#define AT91_SHDW_MR		0x04			/* Shut Down Mode Register */</div><div class='ctx'> #define		AT91_SHDW_WKMODE0	(3 &lt;&lt; 0)		/* Wake-up 0 Mode Selection */</div><div class='ctx'> #define			AT91_SHDW_WKMODE0_NONE		0</div><div class='ctx'> #define			AT91_SHDW_WKMODE0_HIGH		1</div><div class='hunk'>@@ -30,7 +40,7 @@</div><div class='ctx'> #define			AT91_SHDW_CPTWK0_(x)	((x) &lt;&lt; 4)</div><div class='ctx'> #define		AT91_SHDW_RTTWKEN	(1   &lt;&lt; 16)		/* Real Time Timer Wake-up Enable */</div><div class='ctx'> </div><div class='del'>-#define AT91_SHDW_SR		(AT91_SHDWC + 0x08)	/* Shut Down Status Register */</div><div class='add'>+#define AT91_SHDW_SR		0x08			/* Shut Down Status Register */</div><div class='ctx'> #define		AT91_SHDW_WAKEUP0	(1 &lt;&lt;  0)		/* Wake-up 0 Status */</div><div class='ctx'> #define		AT91_SHDW_RTTWK		(1 &lt;&lt; 16)		/* Real-time Timer Wake-up */</div><div class='ctx'> #define		AT91_SHDW_RTCWK		(1 &lt;&lt; 17)		/* Real-time Clock Wake-up [SAM9RL] */</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91cap9.h b/arch/arm/mach-at91/include/mach/at91cap9.h<br/>index c5df1e8f1955..4c0e2f6011d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91cap9.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91cap9.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91cap9.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/at91cap9.h</a></div><div class='hunk'>@@ -79,29 +79,28 @@</div><div class='ctx'> /*</div><div class='ctx'>  * System Peripherals (offset from AT91_BASE_SYS)</div><div class='ctx'>  */</div><div class='del'>-#define AT91_ECC	(0xffffe200 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_BCRAMC	(0xffffe400 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_DDRSDRC0	(0xffffe600 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_SMC	(0xffffe800 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_MATRIX	(0xffffea00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_CCFG	(0xffffeb10 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_DMA	(0xffffec00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_DBGU	(0xffffee00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_AIC	(0xfffff000 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOA	(0xfffff200 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOB	(0xfffff400 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOC	(0xfffff600 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOD	(0xfffff800 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_PMC	(0xfffffc00 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_RSTC	(0xfffffd00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_SHDWC	(0xfffffd10 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_RTT	(0xfffffd20 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIT	(0xfffffd30 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_WDT	(0xfffffd40 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_GPBR	(cpu_is_at91cap9_revB() ?	\</div><div class='ctx'> 			(0xfffffd50 - AT91_BASE_SYS) :	\</div><div class='ctx'> 			(0xfffffd60 - AT91_BASE_SYS))</div><div class='ctx'> </div><div class='add'>+#define AT91CAP9_BASE_ECC	0xffffe200</div><div class='add'>+#define AT91CAP9_BASE_DMA	0xffffec00</div><div class='add'>+#define AT91CAP9_BASE_SMC	0xffffe800</div><div class='add'>+#define AT91CAP9_BASE_DBGU	AT91_BASE_DBGU1</div><div class='add'>+#define AT91CAP9_BASE_PIOA	0xfffff200</div><div class='add'>+#define AT91CAP9_BASE_PIOB	0xfffff400</div><div class='add'>+#define AT91CAP9_BASE_PIOC	0xfffff600</div><div class='add'>+#define AT91CAP9_BASE_PIOD	0xfffff800</div><div class='add'>+#define AT91CAP9_BASE_SHDWC	0xfffffd10</div><div class='add'>+#define AT91CAP9_BASE_RTT	0xfffffd20</div><div class='add'>+#define AT91CAP9_BASE_PIT	0xfffffd30</div><div class='add'>+#define AT91CAP9_BASE_WDT	0xfffffd40</div><div class='add'>+</div><div class='ctx'> #define AT91_USART0	AT91CAP9_BASE_US0</div><div class='ctx'> #define AT91_USART1	AT91CAP9_BASE_US1</div><div class='ctx'> #define AT91_USART2	AT91CAP9_BASE_US2</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91rm9200.h b/arch/arm/mach-at91/include/mach/at91rm9200.h<br/>index e4037b500302..bacb51141819 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91rm9200.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91rm9200.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91rm9200.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/at91rm9200.h</a></div><div class='hunk'>@@ -79,17 +79,17 @@</div><div class='ctx'> /*</div><div class='ctx'>  * System Peripherals (offset from AT91_BASE_SYS)</div><div class='ctx'>  */</div><div class='del'>-#define AT91_AIC	(0xfffff000 - AT91_BASE_SYS)	/* Advanced Interrupt Controller */</div><div class='del'>-#define AT91_DBGU	(0xfffff200 - AT91_BASE_SYS)	/* Debug Unit */</div><div class='del'>-#define AT91_PIOA	(0xfffff400 - AT91_BASE_SYS)	/* PIO Controller A */</div><div class='del'>-#define AT91_PIOB	(0xfffff600 - AT91_BASE_SYS)	/* PIO Controller B */</div><div class='del'>-#define AT91_PIOC	(0xfffff800 - AT91_BASE_SYS)	/* PIO Controller C */</div><div class='del'>-#define AT91_PIOD	(0xfffffa00 - AT91_BASE_SYS)	/* PIO Controller D */</div><div class='ctx'> #define AT91_PMC	(0xfffffc00 - AT91_BASE_SYS)	/* Power Management Controller */</div><div class='ctx'> #define AT91_ST		(0xfffffd00 - AT91_BASE_SYS)	/* System Timer */</div><div class='del'>-#define AT91_RTC	(0xfffffe00 - AT91_BASE_SYS)	/* Real-Time Clock */</div><div class='ctx'> #define AT91_MC		(0xffffff00 - AT91_BASE_SYS)	/* Memory Controllers */</div><div class='ctx'> </div><div class='add'>+#define AT91RM9200_BASE_DBGU	AT91_BASE_DBGU0	/* Debug Unit */</div><div class='add'>+#define AT91RM9200_BASE_PIOA	0xfffff400	/* PIO Controller A */</div><div class='add'>+#define AT91RM9200_BASE_PIOB	0xfffff600	/* PIO Controller B */</div><div class='add'>+#define AT91RM9200_BASE_PIOC	0xfffff800	/* PIO Controller C */</div><div class='add'>+#define AT91RM9200_BASE_PIOD	0xfffffa00	/* PIO Controller D */</div><div class='add'>+#define AT91RM9200_BASE_RTC	0xfffffe00	/* Real-Time Clock */</div><div class='add'>+</div><div class='ctx'> #define AT91_USART0	AT91RM9200_BASE_US0</div><div class='ctx'> #define AT91_USART1	AT91RM9200_BASE_US1</div><div class='ctx'> #define AT91_USART2	AT91RM9200_BASE_US2</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h<br/>index 9a791165913f..f937c476bb67 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9260.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91sam9260.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9260.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/at91sam9260.h</a></div><div class='hunk'>@@ -80,24 +80,23 @@</div><div class='ctx'> /*</div><div class='ctx'>  * System Peripherals (offset from AT91_BASE_SYS)</div><div class='ctx'>  */</div><div class='del'>-#define AT91_ECC	(0xffffe800 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_SDRAMC0	(0xffffea00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_SMC	(0xffffec00 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_MATRIX	(0xffffee00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_CCFG	(0xffffef10 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_AIC	(0xfffff000 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_DBGU	(0xfffff200 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOA	(0xfffff400 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOB	(0xfffff600 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOC	(0xfffff800 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_PMC	(0xfffffc00 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_RSTC	(0xfffffd00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_SHDWC	(0xfffffd10 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_RTT	(0xfffffd20 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIT	(0xfffffd30 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_WDT	(0xfffffd40 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_GPBR	(0xfffffd50 - AT91_BASE_SYS)</div><div class='ctx'> </div><div class='add'>+#define AT91SAM9260_BASE_ECC	0xffffe800</div><div class='add'>+#define AT91SAM9260_BASE_SMC	0xffffec00</div><div class='add'>+#define AT91SAM9260_BASE_DBGU	AT91_BASE_DBGU0</div><div class='add'>+#define AT91SAM9260_BASE_PIOA	0xfffff400</div><div class='add'>+#define AT91SAM9260_BASE_PIOB	0xfffff600</div><div class='add'>+#define AT91SAM9260_BASE_PIOC	0xfffff800</div><div class='add'>+#define AT91SAM9260_BASE_SHDWC	0xfffffd10</div><div class='add'>+#define AT91SAM9260_BASE_RTT	0xfffffd20</div><div class='add'>+#define AT91SAM9260_BASE_PIT	0xfffffd30</div><div class='add'>+#define AT91SAM9260_BASE_WDT	0xfffffd40</div><div class='add'>+</div><div class='ctx'> #define AT91_USART0	AT91SAM9260_BASE_US0</div><div class='ctx'> #define AT91_USART1	AT91SAM9260_BASE_US1</div><div class='ctx'> #define AT91_USART2	AT91SAM9260_BASE_US2</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91sam9261.h b/arch/arm/mach-at91/include/mach/at91sam9261.h<br/>index ce596204cefa..175604e261be 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9261.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91sam9261.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9261.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/at91sam9261.h</a></div><div class='hunk'>@@ -66,21 +66,21 @@</div><div class='ctx'>  * System Peripherals (offset from AT91_BASE_SYS)</div><div class='ctx'>  */</div><div class='ctx'> #define AT91_SDRAMC0	(0xffffea00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_SMC	(0xffffec00 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_MATRIX	(0xffffee00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_AIC	(0xfffff000 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_DBGU	(0xfffff200 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOA	(0xfffff400 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOB	(0xfffff600 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOC	(0xfffff800 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_PMC	(0xfffffc00 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_RSTC	(0xfffffd00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_SHDWC	(0xfffffd10 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_RTT	(0xfffffd20 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIT	(0xfffffd30 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_WDT	(0xfffffd40 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_GPBR	(0xfffffd50 - AT91_BASE_SYS)</div><div class='ctx'> </div><div class='add'>+#define AT91SAM9261_BASE_SMC	0xffffec00</div><div class='add'>+#define AT91SAM9261_BASE_DBGU	AT91_BASE_DBGU0</div><div class='add'>+#define AT91SAM9261_BASE_PIOA	0xfffff400</div><div class='add'>+#define AT91SAM9261_BASE_PIOB	0xfffff600</div><div class='add'>+#define AT91SAM9261_BASE_PIOC	0xfffff800</div><div class='add'>+#define AT91SAM9261_BASE_SHDWC	0xfffffd10</div><div class='add'>+#define AT91SAM9261_BASE_RTT	0xfffffd20</div><div class='add'>+#define AT91SAM9261_BASE_PIT	0xfffffd30</div><div class='add'>+#define AT91SAM9261_BASE_WDT	0xfffffd40</div><div class='add'>+</div><div class='ctx'> #define AT91_USART0	AT91SAM9261_BASE_US0</div><div class='ctx'> #define AT91_USART1	AT91SAM9261_BASE_US1</div><div class='ctx'> #define AT91_USART2	AT91SAM9261_BASE_US2</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h<br/>index f1b92961a2b1..80c915002d83 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9263.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91sam9263.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9263.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/at91sam9263.h</a></div><div class='hunk'>@@ -74,30 +74,29 @@</div><div class='ctx'> /*</div><div class='ctx'>  * System Peripherals (offset from AT91_BASE_SYS)</div><div class='ctx'>  */</div><div class='del'>-#define AT91_ECC0	(0xffffe000 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_SDRAMC0	(0xffffe200 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_SMC0	(0xffffe400 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_ECC1	(0xffffe600 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_SDRAMC1	(0xffffe800 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_SMC1	(0xffffea00 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_MATRIX	(0xffffec00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_CCFG	(0xffffed10 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_DBGU	(0xffffee00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_AIC	(0xfffff000 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOA	(0xfffff200 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOB	(0xfffff400 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOC	(0xfffff600 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOD	(0xfffff800 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOE	(0xfffffa00 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_PMC	(0xfffffc00 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_RSTC	(0xfffffd00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_SHDWC	(0xfffffd10 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_RTT0	(0xfffffd20 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIT	(0xfffffd30 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_WDT	(0xfffffd40 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_RTT1	(0xfffffd50 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_GPBR	(0xfffffd60 - AT91_BASE_SYS)</div><div class='ctx'> </div><div class='add'>+#define AT91SAM9263_BASE_ECC0	0xffffe000</div><div class='add'>+#define AT91SAM9263_BASE_SMC0	0xffffe400</div><div class='add'>+#define AT91SAM9263_BASE_ECC1	0xffffe600</div><div class='add'>+#define AT91SAM9263_BASE_SMC1	0xffffea00</div><div class='add'>+#define AT91SAM9263_BASE_DBGU	AT91_BASE_DBGU1</div><div class='add'>+#define AT91SAM9263_BASE_PIOA	0xfffff200</div><div class='add'>+#define AT91SAM9263_BASE_PIOB	0xfffff400</div><div class='add'>+#define AT91SAM9263_BASE_PIOC	0xfffff600</div><div class='add'>+#define AT91SAM9263_BASE_PIOD	0xfffff800</div><div class='add'>+#define AT91SAM9263_BASE_PIOE	0xfffffa00</div><div class='add'>+#define AT91SAM9263_BASE_SHDWC	0xfffffd10</div><div class='add'>+#define AT91SAM9263_BASE_RTT0	0xfffffd20</div><div class='add'>+#define AT91SAM9263_BASE_PIT	0xfffffd30</div><div class='add'>+#define AT91SAM9263_BASE_WDT	0xfffffd40</div><div class='add'>+#define AT91SAM9263_BASE_RTT1	0xfffffd50</div><div class='add'>+</div><div class='ctx'> #define AT91_USART0	AT91SAM9263_BASE_US0</div><div class='ctx'> #define AT91_USART1	AT91SAM9263_BASE_US1</div><div class='ctx'> #define AT91_USART2	AT91SAM9263_BASE_US2</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91sam9_smc.h b/arch/arm/mach-at91/include/mach/at91sam9_smc.h<br/>index 57de6207e57e..eb18a70fa647 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9_smc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91sam9_smc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9_smc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/at91sam9_smc.h</a></div><div class='hunk'>@@ -16,7 +16,9 @@</div><div class='ctx'> #ifndef AT91SAM9_SMC_H</div><div class='ctx'> #define AT91SAM9_SMC_H</div><div class='ctx'> </div><div class='del'>-#define AT91_SMC_SETUP(n)	(AT91_SMC + 0x00 + ((n)*0x10))	/* Setup Register for CS n */</div><div class='add'>+#include &lt;mach/cpu.h&gt;</div><div class='add'>+</div><div class='add'>+#define AT91_SMC_SETUP		0x00				/* Setup Register for CS n */</div><div class='ctx'> #define		AT91_SMC_NWESETUP	(0x3f &lt;&lt; 0)			/* NWE Setup Length */</div><div class='ctx'> #define			AT91_SMC_NWESETUP_(x)	((x) &lt;&lt; 0)</div><div class='ctx'> #define		AT91_SMC_NCS_WRSETUP	(0x3f &lt;&lt; 8)			/* NCS Setup Length in Write Access */</div><div class='hunk'>@@ -26,7 +28,7 @@</div><div class='ctx'> #define		AT91_SMC_NCS_RDSETUP	(0x3f &lt;&lt; 24)			/* NCS Setup Length in Read Access */</div><div class='ctx'> #define			AT91_SMC_NCS_RDSETUP_(x)	((x) &lt;&lt; 24)</div><div class='ctx'> </div><div class='del'>-#define AT91_SMC_PULSE(n)	(AT91_SMC + 0x04 + ((n)*0x10))	/* Pulse Register for CS n */</div><div class='add'>+#define AT91_SMC_PULSE		0x04				/* Pulse Register for CS n */</div><div class='ctx'> #define		AT91_SMC_NWEPULSE	(0x7f &lt;&lt;  0)			/* NWE Pulse Length */</div><div class='ctx'> #define			AT91_SMC_NWEPULSE_(x)	((x) &lt;&lt; 0)</div><div class='ctx'> #define		AT91_SMC_NCS_WRPULSE	(0x7f &lt;&lt;  8)			/* NCS Pulse Length in Write Access */</div><div class='hunk'>@@ -36,13 +38,13 @@</div><div class='ctx'> #define		AT91_SMC_NCS_RDPULSE	(0x7f &lt;&lt; 24)			/* NCS Pulse Length in Read Access */</div><div class='ctx'> #define			AT91_SMC_NCS_RDPULSE_(x)((x) &lt;&lt; 24)</div><div class='ctx'> </div><div class='del'>-#define AT91_SMC_CYCLE(n)	(AT91_SMC + 0x08 + ((n)*0x10))	/* Cycle Register for CS n */</div><div class='add'>+#define AT91_SMC_CYCLE		0x08				/* Cycle Register for CS n */</div><div class='ctx'> #define		AT91_SMC_NWECYCLE	(0x1ff &lt;&lt; 0 )			/* Total Write Cycle Length */</div><div class='ctx'> #define			AT91_SMC_NWECYCLE_(x)	((x) &lt;&lt; 0)</div><div class='ctx'> #define		AT91_SMC_NRDCYCLE	(0x1ff &lt;&lt; 16)			/* Total Read Cycle Length */</div><div class='ctx'> #define			AT91_SMC_NRDCYCLE_(x)	((x) &lt;&lt; 16)</div><div class='ctx'> </div><div class='del'>-#define AT91_SMC_MODE(n)	(AT91_SMC + 0x0c + ((n)*0x10))	/* Mode Register for CS n */</div><div class='add'>+#define AT91_SMC_MODE		0x0c				/* Mode Register for CS n */</div><div class='ctx'> #define		AT91_SMC_READMODE	(1 &lt;&lt;  0)			/* Read Mode */</div><div class='ctx'> #define		AT91_SMC_WRITEMODE	(1 &lt;&lt;  1)			/* Write Mode */</div><div class='ctx'> #define		AT91_SMC_EXNWMODE	(3 &lt;&lt;  4)			/* NWAIT Mode */</div><div class='hunk'>@@ -66,11 +68,4 @@</div><div class='ctx'> #define			AT91_SMC_PS_16			(2 &lt;&lt; 28)</div><div class='ctx'> #define			AT91_SMC_PS_32			(3 &lt;&lt; 28)</div><div class='ctx'> </div><div class='del'>-#if defined(AT91_SMC1)		/* The AT91SAM9263 has 2 Static Memory contollers */</div><div class='del'>-#define AT91_SMC1_SETUP(n)	(AT91_SMC1 + 0x00 + ((n)*0x10))	/* Setup Register for CS n */</div><div class='del'>-#define AT91_SMC1_PULSE(n)	(AT91_SMC1 + 0x04 + ((n)*0x10))	/* Pulse Register for CS n */</div><div class='del'>-#define AT91_SMC1_CYCLE(n)	(AT91_SMC1 + 0x08 + ((n)*0x10))	/* Cycle Register for CS n */</div><div class='del'>-#define AT91_SMC1_MODE(n)	(AT91_SMC1 + 0x0c + ((n)*0x10))	/* Mode Register for CS n */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45.h b/arch/arm/mach-at91/include/mach/at91sam9g45.h<br/>index 406bb6496805..f0c23c960dec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9g45.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91sam9g45.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9g45.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/at91sam9g45.h</a></div><div class='hunk'>@@ -86,27 +86,27 @@</div><div class='ctx'> /*</div><div class='ctx'>  * System Peripherals (offset from AT91_BASE_SYS)</div><div class='ctx'>  */</div><div class='del'>-#define AT91_ECC	(0xffffe200 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_DDRSDRC1	(0xffffe400 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_DDRSDRC0	(0xffffe600 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_SMC	(0xffffe800 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_MATRIX	(0xffffea00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_DMA	(0xffffec00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_DBGU	(0xffffee00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_AIC	(0xfffff000 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOA	(0xfffff200 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOB	(0xfffff400 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOC	(0xfffff600 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOD	(0xfffff800 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOE	(0xfffffa00 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_PMC	(0xfffffc00 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_RSTC	(0xfffffd00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_SHDWC	(0xfffffd10 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_RTT	(0xfffffd20 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIT	(0xfffffd30 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_WDT	(0xfffffd40 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_GPBR	(0xfffffd60 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_RTC	(0xfffffdb0 - AT91_BASE_SYS)</div><div class='add'>+</div><div class='add'>+#define AT91SAM9G45_BASE_ECC	0xffffe200</div><div class='add'>+#define AT91SAM9G45_BASE_DMA	0xffffec00</div><div class='add'>+#define AT91SAM9G45_BASE_SMC	0xffffe800</div><div class='add'>+#define AT91SAM9G45_BASE_DBGU	AT91_BASE_DBGU1</div><div class='add'>+#define AT91SAM9G45_BASE_PIOA	0xfffff200</div><div class='add'>+#define AT91SAM9G45_BASE_PIOB	0xfffff400</div><div class='add'>+#define AT91SAM9G45_BASE_PIOC	0xfffff600</div><div class='add'>+#define AT91SAM9G45_BASE_PIOD	0xfffff800</div><div class='add'>+#define AT91SAM9G45_BASE_PIOE	0xfffffa00</div><div class='add'>+#define AT91SAM9G45_BASE_SHDWC	0xfffffd10</div><div class='add'>+#define AT91SAM9G45_BASE_RTT	0xfffffd20</div><div class='add'>+#define AT91SAM9G45_BASE_PIT	0xfffffd30</div><div class='add'>+#define AT91SAM9G45_BASE_WDT	0xfffffd40</div><div class='add'>+#define AT91SAM9G45_BASE_RTC	0xfffffdb0</div><div class='ctx'> </div><div class='ctx'> #define AT91_USART0	AT91SAM9G45_BASE_US0</div><div class='ctx'> #define AT91_USART1	AT91SAM9G45_BASE_US1</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91sam9rl.h b/arch/arm/mach-at91/include/mach/at91sam9rl.h<br/>index 1aabacd315d4..2bb359e60b97 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9rl.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91sam9rl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91sam9rl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/at91sam9rl.h</a></div><div class='hunk'>@@ -69,27 +69,26 @@</div><div class='ctx'> /*</div><div class='ctx'>  * System Peripherals (offset from AT91_BASE_SYS)</div><div class='ctx'>  */</div><div class='del'>-#define AT91_DMA	(0xffffe600 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_ECC	(0xffffe800 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_SDRAMC0	(0xffffea00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_SMC	(0xffffec00 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_MATRIX	(0xffffee00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_CCFG	(0xffffef10 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_AIC	(0xfffff000 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_DBGU	(0xfffff200 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOA	(0xfffff400 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOB	(0xfffff600 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOC	(0xfffff800 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIOD	(0xfffffa00 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_PMC	(0xfffffc00 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_RSTC	(0xfffffd00 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_SHDWC	(0xfffffd10 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_RTT	(0xfffffd20 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_PIT	(0xfffffd30 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_WDT	(0xfffffd40 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_SCKCR	(0xfffffd50 - AT91_BASE_SYS)</div><div class='ctx'> #define AT91_GPBR	(0xfffffd60 - AT91_BASE_SYS)</div><div class='del'>-#define AT91_RTC	(0xfffffe00 - AT91_BASE_SYS)</div><div class='add'>+</div><div class='add'>+#define AT91SAM9RL_BASE_DMA	0xffffe600</div><div class='add'>+#define AT91SAM9RL_BASE_ECC	0xffffe800</div><div class='add'>+#define AT91SAM9RL_BASE_SMC	0xffffec00</div><div class='add'>+#define AT91SAM9RL_BASE_DBGU	AT91_BASE_DBGU0</div><div class='add'>+#define AT91SAM9RL_BASE_PIOA	0xfffff400</div><div class='add'>+#define AT91SAM9RL_BASE_PIOB	0xfffff600</div><div class='add'>+#define AT91SAM9RL_BASE_PIOC	0xfffff800</div><div class='add'>+#define AT91SAM9RL_BASE_PIOD	0xfffffa00</div><div class='add'>+#define AT91SAM9RL_BASE_SHDWC	0xfffffd10</div><div class='add'>+#define AT91SAM9RL_BASE_RTT	0xfffffd20</div><div class='add'>+#define AT91SAM9RL_BASE_PIT	0xfffffd30</div><div class='add'>+#define AT91SAM9RL_BASE_WDT	0xfffffd40</div><div class='add'>+#define AT91SAM9RL_BASE_RTC	0xfffffe00</div><div class='ctx'> </div><div class='ctx'> #define AT91_USART0	AT91SAM9RL_BASE_US0</div><div class='ctx'> #define AT91_USART1	AT91SAM9RL_BASE_US1</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/at91x40.h b/arch/arm/mach-at91/include/mach/at91x40.h<br/>index a152ff87e688..a57829f4fd18 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91x40.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/at91x40.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/at91x40.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/at91x40.h</a></div><div class='hunk'>@@ -40,7 +40,6 @@</div><div class='ctx'> #define AT91_PIOA	(0xffff0000 - AT91_BASE_SYS)	/* PIO Controller A */</div><div class='ctx'> #define AT91_PS		(0xffff4000 - AT91_BASE_SYS)	/* Power Save */</div><div class='ctx'> #define AT91_WD		(0xffff8000 - AT91_BASE_SYS)	/* Watchdog Timer */</div><div class='del'>-#define AT91_AIC	(0xfffff000 - AT91_BASE_SYS)	/* Advanced Interrupt Controller */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The AT91x40 series doesn't have a debug unit like the other AT91 parts.</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h<br/>index eac92e995bb5..d0b377b21bd7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/board.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/board.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/board.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/board.h</a></div><div class='hunk'>@@ -40,13 +40,14 @@</div><div class='ctx'> #include &lt;linux/atmel-mci.h&gt;</div><div class='ctx'> #include &lt;sound/atmel-ac97c.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='add'>+#include &lt;linux/platform_data/macb.h&gt;</div><div class='ctx'> </div><div class='ctx'>  /* USB Device */</div><div class='ctx'> struct at91_udc_data {</div><div class='del'>-	u8	vbus_pin;		/* high == host powering us */</div><div class='add'>+	int	vbus_pin;		/* high == host powering us */</div><div class='ctx'> 	u8	vbus_active_low;	/* vbus polarity */</div><div class='ctx'> 	u8	vbus_polled;		/* Use polling, not interrupt */</div><div class='del'>-	u8	pullup_pin;		/* active == D+ pulled up */</div><div class='add'>+	int	pullup_pin;		/* active == D+ pulled up */</div><div class='ctx'> 	u8	pullup_active_low;	/* true == pullup_pin is active low */</div><div class='ctx'> };</div><div class='ctx'> extern void __init at91_add_device_udc(struct at91_udc_data *data);</div><div class='hunk'>@@ -56,10 +57,10 @@ extern void __init at91_add_device_usba(struct usba_platform_data *data);</div><div class='ctx'> </div><div class='ctx'>  /* Compact Flash */</div><div class='ctx'> struct at91_cf_data {</div><div class='del'>-	u8	irq_pin;		/* I/O IRQ */</div><div class='del'>-	u8	det_pin;		/* Card detect */</div><div class='del'>-	u8	vcc_pin;		/* power switching */</div><div class='del'>-	u8	rst_pin;		/* card reset */</div><div class='add'>+	int	irq_pin;		/* I/O IRQ */</div><div class='add'>+	int	det_pin;		/* Card detect */</div><div class='add'>+	int	vcc_pin;		/* power switching */</div><div class='add'>+	int	rst_pin;		/* card reset */</div><div class='ctx'> 	u8	chipselect;		/* EBI Chip Select number */</div><div class='ctx'> 	u8	flags;</div><div class='ctx'> #define AT91_CF_TRUE_IDE	0x01</div><div class='hunk'>@@ -70,37 +71,26 @@ extern void __init at91_add_device_cf(struct at91_cf_data *data);</div><div class='ctx'>  /* MMC / SD */</div><div class='ctx'>   /* at91_mci platform config */</div><div class='ctx'> struct at91_mmc_data {</div><div class='del'>-	u8		det_pin;	/* card detect IRQ */</div><div class='add'>+	int		det_pin;	/* card detect IRQ */</div><div class='ctx'> 	unsigned	slot_b:1;	/* uses Slot B */</div><div class='ctx'> 	unsigned	wire4:1;	/* (SD) supports DAT0..DAT3 */</div><div class='del'>-	u8		wp_pin;		/* (SD) writeprotect detect */</div><div class='del'>-	u8		vcc_pin;	/* power switching (high == on) */</div><div class='add'>+	int		wp_pin;		/* (SD) writeprotect detect */</div><div class='add'>+	int		vcc_pin;	/* power switching (high == on) */</div><div class='ctx'> };</div><div class='ctx'> extern void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data);</div><div class='ctx'> </div><div class='ctx'>   /* atmel-mci platform config */</div><div class='ctx'> extern void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data);</div><div class='ctx'> </div><div class='del'>- /* Ethernet (EMAC &amp; MACB) */</div><div class='del'>-struct at91_eth_data {</div><div class='del'>-	u32		phy_mask;</div><div class='del'>-	u8		phy_irq_pin;	/* PHY IRQ */</div><div class='del'>-	u8		is_rmii;	/* using RMII interface? */</div><div class='del'>-};</div><div class='del'>-extern void __init at91_add_device_eth(struct at91_eth_data *data);</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9263) || defined(CONFIG_ARCH_AT91SAM9G20) || defined(CONFIG_ARCH_AT91CAP9) \</div><div class='del'>-	|| defined(CONFIG_ARCH_AT91SAM9G45)</div><div class='del'>-#define eth_platform_data	at91_eth_data</div><div class='del'>-#endif</div><div class='add'>+extern void __init at91_add_device_eth(struct macb_platform_data *data);</div><div class='ctx'> </div><div class='ctx'>  /* USB Host */</div><div class='ctx'> struct at91_usbh_data {</div><div class='ctx'> 	u8		ports;		/* number of ports on root hub */</div><div class='del'>-	u8		vbus_pin[2];	/* port power-control pin */</div><div class='add'>+	int		vbus_pin[2];	/* port power-control pin */</div><div class='ctx'> 	u8              vbus_pin_inverted;</div><div class='ctx'> 	u8              overcurrent_supported;</div><div class='del'>-	u8              overcurrent_pin[2];</div><div class='add'>+	int             overcurrent_pin[2];</div><div class='ctx'> 	u8              overcurrent_status[2];</div><div class='ctx'> 	u8              overcurrent_changed[2];</div><div class='ctx'> };</div><div class='hunk'>@@ -110,9 +100,9 @@ extern void __init at91_add_device_usbh_ehci(struct at91_usbh_data *data);</div><div class='ctx'> </div><div class='ctx'>  /* NAND / SmartMedia */</div><div class='ctx'> struct atmel_nand_data {</div><div class='del'>-	u8		enable_pin;	/* chip enable */</div><div class='del'>-	u8		det_pin;	/* card detect */</div><div class='del'>-	u8		rdy_pin;	/* ready/busy */</div><div class='add'>+	int		enable_pin;	/* chip enable */</div><div class='add'>+	int		det_pin;	/* card detect */</div><div class='add'>+	int		rdy_pin;	/* ready/busy */</div><div class='ctx'> 	u8              rdy_pin_active_low;     /* rdy_pin value is inverted */</div><div class='ctx'> 	u8		ale;		/* address line number connected to ALE */</div><div class='ctx'> 	u8		cle;		/* address line number connected to CLE */</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/debug-macro.S b/arch/arm/mach-at91/include/mach/debug-macro.S<br/>index 0ed8648c6452..c6bb9e2d9baa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/debug-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/debug-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -14,9 +14,15 @@</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/at91_dbgu.h&gt;</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_AT91_DEBUG_LL_DBGU0)</div><div class='add'>+#define AT91_DBGU AT91_BASE_DBGU0</div><div class='add'>+#else</div><div class='add'>+#define AT91_DBGU AT91_BASE_DBGU1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	.macro	addruart, rp, rv, tmp</div><div class='del'>-	ldr	\rp, =(AT91_BASE_SYS + AT91_DBGU)	@ System peripherals (phys address)</div><div class='del'>-	ldr	\rv, =(AT91_VA_BASE_SYS	+ AT91_DBGU)	@ System peripherals (virt address)</div><div class='add'>+	ldr	\rp, =AT91_DBGU				@ System peripherals (phys address)</div><div class='add'>+	ldr	\rv, =AT91_IO_P2V(AT91_DBGU)		@ System peripherals (virt address)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro	senduart,rd,rx</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/entry-macro.S b/arch/arm/mach-at91/include/mach/entry-macro.S<br/>index 7ab68f972227..423eea0ed74c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -17,16 +17,17 @@</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro  get_irqnr_preamble, base, tmp</div><div class='del'>-	ldr	\base, =(AT91_VA_BASE_SYS + AT91_AIC)		@ base virtual address of AIC peripheral</div><div class='add'>+	ldr	\base, =at91_aic_base		@ base virtual address of AIC peripheral</div><div class='add'>+	ldr	\base, [\base]</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro  arch_ret_to_user, tmp1, tmp2</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-	ldr	\irqnr, [\base, #(AT91_AIC_IVR - AT91_AIC)]	@ read IRQ vector register: de-asserts nIRQ to processor (and clears interrupt)</div><div class='del'>-	ldr	\irqstat, [\base, #(AT91_AIC_ISR - AT91_AIC)]	@ read interrupt source number</div><div class='del'>-	teq	\irqstat, #0					@ ISR is 0 when no current interrupt, or spurious interrupt</div><div class='del'>-	streq	\tmp, [\base, #(AT91_AIC_EOICR - AT91_AIC)]	@ not going to be handled further, then ACK it now.</div><div class='add'>+	ldr	\irqnr, [\base, #AT91_AIC_IVR]		@ read IRQ vector register: de-asserts nIRQ to processor (and clears interrupt)</div><div class='add'>+	ldr	\irqstat, [\base, #AT91_AIC_ISR]	@ read interrupt source number</div><div class='add'>+	teq	\irqstat, #0				@ ISR is 0 when no current interrupt, or spurious interrupt</div><div class='add'>+	streq	\tmp, [\base, #AT91_AIC_EOICR]		@ not going to be handled further, then ACK it now.</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h<br/>index 2b9a1f51210f..e3fd225121c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/gpio.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/gpio.h</a></div><div class='hunk'>@@ -16,177 +16,175 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#define PIN_BASE		NR_AIC_IRQS</div><div class='del'>-</div><div class='ctx'> #define MAX_GPIO_BANKS		5</div><div class='del'>-#define NR_BUILTIN_GPIO		(PIN_BASE + (MAX_GPIO_BANKS * 32))</div><div class='add'>+#define NR_BUILTIN_GPIO		(MAX_GPIO_BANKS * 32)</div><div class='ctx'> </div><div class='ctx'> /* these pin numbers double as IRQ numbers, like AT91xxx_ID_* values */</div><div class='ctx'> </div><div class='del'>-#define	AT91_PIN_PA0	(PIN_BASE + 0x00 + 0)</div><div class='del'>-#define	AT91_PIN_PA1	(PIN_BASE + 0x00 + 1)</div><div class='del'>-#define	AT91_PIN_PA2	(PIN_BASE + 0x00 + 2)</div><div class='del'>-#define	AT91_PIN_PA3	(PIN_BASE + 0x00 + 3)</div><div class='del'>-#define	AT91_PIN_PA4	(PIN_BASE + 0x00 + 4)</div><div class='del'>-#define	AT91_PIN_PA5	(PIN_BASE + 0x00 + 5)</div><div class='del'>-#define	AT91_PIN_PA6	(PIN_BASE + 0x00 + 6)</div><div class='del'>-#define	AT91_PIN_PA7	(PIN_BASE + 0x00 + 7)</div><div class='del'>-#define	AT91_PIN_PA8	(PIN_BASE + 0x00 + 8)</div><div class='del'>-#define	AT91_PIN_PA9	(PIN_BASE + 0x00 + 9)</div><div class='del'>-#define	AT91_PIN_PA10	(PIN_BASE + 0x00 + 10)</div><div class='del'>-#define	AT91_PIN_PA11	(PIN_BASE + 0x00 + 11)</div><div class='del'>-#define	AT91_PIN_PA12	(PIN_BASE + 0x00 + 12)</div><div class='del'>-#define	AT91_PIN_PA13	(PIN_BASE + 0x00 + 13)</div><div class='del'>-#define	AT91_PIN_PA14	(PIN_BASE + 0x00 + 14)</div><div class='del'>-#define	AT91_PIN_PA15	(PIN_BASE + 0x00 + 15)</div><div class='del'>-#define	AT91_PIN_PA16	(PIN_BASE + 0x00 + 16)</div><div class='del'>-#define	AT91_PIN_PA17	(PIN_BASE + 0x00 + 17)</div><div class='del'>-#define	AT91_PIN_PA18	(PIN_BASE + 0x00 + 18)</div><div class='del'>-#define	AT91_PIN_PA19	(PIN_BASE + 0x00 + 19)</div><div class='del'>-#define	AT91_PIN_PA20	(PIN_BASE + 0x00 + 20)</div><div class='del'>-#define	AT91_PIN_PA21	(PIN_BASE + 0x00 + 21)</div><div class='del'>-#define	AT91_PIN_PA22	(PIN_BASE + 0x00 + 22)</div><div class='del'>-#define	AT91_PIN_PA23	(PIN_BASE + 0x00 + 23)</div><div class='del'>-#define	AT91_PIN_PA24	(PIN_BASE + 0x00 + 24)</div><div class='del'>-#define	AT91_PIN_PA25	(PIN_BASE + 0x00 + 25)</div><div class='del'>-#define	AT91_PIN_PA26	(PIN_BASE + 0x00 + 26)</div><div class='del'>-#define	AT91_PIN_PA27	(PIN_BASE + 0x00 + 27)</div><div class='del'>-#define	AT91_PIN_PA28	(PIN_BASE + 0x00 + 28)</div><div class='del'>-#define	AT91_PIN_PA29	(PIN_BASE + 0x00 + 29)</div><div class='del'>-#define	AT91_PIN_PA30	(PIN_BASE + 0x00 + 30)</div><div class='del'>-#define	AT91_PIN_PA31	(PIN_BASE + 0x00 + 31)</div><div class='del'>-</div><div class='del'>-#define	AT91_PIN_PB0	(PIN_BASE + 0x20 + 0)</div><div class='del'>-#define	AT91_PIN_PB1	(PIN_BASE + 0x20 + 1)</div><div class='del'>-#define	AT91_PIN_PB2	(PIN_BASE + 0x20 + 2)</div><div class='del'>-#define	AT91_PIN_PB3	(PIN_BASE + 0x20 + 3)</div><div class='del'>-#define	AT91_PIN_PB4	(PIN_BASE + 0x20 + 4)</div><div class='del'>-#define	AT91_PIN_PB5	(PIN_BASE + 0x20 + 5)</div><div class='del'>-#define	AT91_PIN_PB6	(PIN_BASE + 0x20 + 6)</div><div class='del'>-#define	AT91_PIN_PB7	(PIN_BASE + 0x20 + 7)</div><div class='del'>-#define	AT91_PIN_PB8	(PIN_BASE + 0x20 + 8)</div><div class='del'>-#define	AT91_PIN_PB9	(PIN_BASE + 0x20 + 9)</div><div class='del'>-#define	AT91_PIN_PB10	(PIN_BASE + 0x20 + 10)</div><div class='del'>-#define	AT91_PIN_PB11	(PIN_BASE + 0x20 + 11)</div><div class='del'>-#define	AT91_PIN_PB12	(PIN_BASE + 0x20 + 12)</div><div class='del'>-#define	AT91_PIN_PB13	(PIN_BASE + 0x20 + 13)</div><div class='del'>-#define	AT91_PIN_PB14	(PIN_BASE + 0x20 + 14)</div><div class='del'>-#define	AT91_PIN_PB15	(PIN_BASE + 0x20 + 15)</div><div class='del'>-#define	AT91_PIN_PB16	(PIN_BASE + 0x20 + 16)</div><div class='del'>-#define	AT91_PIN_PB17	(PIN_BASE + 0x20 + 17)</div><div class='del'>-#define	AT91_PIN_PB18	(PIN_BASE + 0x20 + 18)</div><div class='del'>-#define	AT91_PIN_PB19	(PIN_BASE + 0x20 + 19)</div><div class='del'>-#define	AT91_PIN_PB20	(PIN_BASE + 0x20 + 20)</div><div class='del'>-#define	AT91_PIN_PB21	(PIN_BASE + 0x20 + 21)</div><div class='del'>-#define	AT91_PIN_PB22	(PIN_BASE + 0x20 + 22)</div><div class='del'>-#define	AT91_PIN_PB23	(PIN_BASE + 0x20 + 23)</div><div class='del'>-#define	AT91_PIN_PB24	(PIN_BASE + 0x20 + 24)</div><div class='del'>-#define	AT91_PIN_PB25	(PIN_BASE + 0x20 + 25)</div><div class='del'>-#define	AT91_PIN_PB26	(PIN_BASE + 0x20 + 26)</div><div class='del'>-#define	AT91_PIN_PB27	(PIN_BASE + 0x20 + 27)</div><div class='del'>-#define	AT91_PIN_PB28	(PIN_BASE + 0x20 + 28)</div><div class='del'>-#define	AT91_PIN_PB29	(PIN_BASE + 0x20 + 29)</div><div class='del'>-#define	AT91_PIN_PB30	(PIN_BASE + 0x20 + 30)</div><div class='del'>-#define	AT91_PIN_PB31	(PIN_BASE + 0x20 + 31)</div><div class='del'>-</div><div class='del'>-#define	AT91_PIN_PC0	(PIN_BASE + 0x40 + 0)</div><div class='del'>-#define	AT91_PIN_PC1	(PIN_BASE + 0x40 + 1)</div><div class='del'>-#define	AT91_PIN_PC2	(PIN_BASE + 0x40 + 2)</div><div class='del'>-#define	AT91_PIN_PC3	(PIN_BASE + 0x40 + 3)</div><div class='del'>-#define	AT91_PIN_PC4	(PIN_BASE + 0x40 + 4)</div><div class='del'>-#define	AT91_PIN_PC5	(PIN_BASE + 0x40 + 5)</div><div class='del'>-#define	AT91_PIN_PC6	(PIN_BASE + 0x40 + 6)</div><div class='del'>-#define	AT91_PIN_PC7	(PIN_BASE + 0x40 + 7)</div><div class='del'>-#define	AT91_PIN_PC8	(PIN_BASE + 0x40 + 8)</div><div class='del'>-#define	AT91_PIN_PC9	(PIN_BASE + 0x40 + 9)</div><div class='del'>-#define	AT91_PIN_PC10	(PIN_BASE + 0x40 + 10)</div><div class='del'>-#define	AT91_PIN_PC11	(PIN_BASE + 0x40 + 11)</div><div class='del'>-#define	AT91_PIN_PC12	(PIN_BASE + 0x40 + 12)</div><div class='del'>-#define	AT91_PIN_PC13	(PIN_BASE + 0x40 + 13)</div><div class='del'>-#define	AT91_PIN_PC14	(PIN_BASE + 0x40 + 14)</div><div class='del'>-#define	AT91_PIN_PC15	(PIN_BASE + 0x40 + 15)</div><div class='del'>-#define	AT91_PIN_PC16	(PIN_BASE + 0x40 + 16)</div><div class='del'>-#define	AT91_PIN_PC17	(PIN_BASE + 0x40 + 17)</div><div class='del'>-#define	AT91_PIN_PC18	(PIN_BASE + 0x40 + 18)</div><div class='del'>-#define	AT91_PIN_PC19	(PIN_BASE + 0x40 + 19)</div><div class='del'>-#define	AT91_PIN_PC20	(PIN_BASE + 0x40 + 20)</div><div class='del'>-#define	AT91_PIN_PC21	(PIN_BASE + 0x40 + 21)</div><div class='del'>-#define	AT91_PIN_PC22	(PIN_BASE + 0x40 + 22)</div><div class='del'>-#define	AT91_PIN_PC23	(PIN_BASE + 0x40 + 23)</div><div class='del'>-#define	AT91_PIN_PC24	(PIN_BASE + 0x40 + 24)</div><div class='del'>-#define	AT91_PIN_PC25	(PIN_BASE + 0x40 + 25)</div><div class='del'>-#define	AT91_PIN_PC26	(PIN_BASE + 0x40 + 26)</div><div class='del'>-#define	AT91_PIN_PC27	(PIN_BASE + 0x40 + 27)</div><div class='del'>-#define	AT91_PIN_PC28	(PIN_BASE + 0x40 + 28)</div><div class='del'>-#define	AT91_PIN_PC29	(PIN_BASE + 0x40 + 29)</div><div class='del'>-#define	AT91_PIN_PC30	(PIN_BASE + 0x40 + 30)</div><div class='del'>-#define	AT91_PIN_PC31	(PIN_BASE + 0x40 + 31)</div><div class='del'>-</div><div class='del'>-#define	AT91_PIN_PD0	(PIN_BASE + 0x60 + 0)</div><div class='del'>-#define	AT91_PIN_PD1	(PIN_BASE + 0x60 + 1)</div><div class='del'>-#define	AT91_PIN_PD2	(PIN_BASE + 0x60 + 2)</div><div class='del'>-#define	AT91_PIN_PD3	(PIN_BASE + 0x60 + 3)</div><div class='del'>-#define	AT91_PIN_PD4	(PIN_BASE + 0x60 + 4)</div><div class='del'>-#define	AT91_PIN_PD5	(PIN_BASE + 0x60 + 5)</div><div class='del'>-#define	AT91_PIN_PD6	(PIN_BASE + 0x60 + 6)</div><div class='del'>-#define	AT91_PIN_PD7	(PIN_BASE + 0x60 + 7)</div><div class='del'>-#define	AT91_PIN_PD8	(PIN_BASE + 0x60 + 8)</div><div class='del'>-#define	AT91_PIN_PD9	(PIN_BASE + 0x60 + 9)</div><div class='del'>-#define	AT91_PIN_PD10	(PIN_BASE + 0x60 + 10)</div><div class='del'>-#define	AT91_PIN_PD11	(PIN_BASE + 0x60 + 11)</div><div class='del'>-#define	AT91_PIN_PD12	(PIN_BASE + 0x60 + 12)</div><div class='del'>-#define	AT91_PIN_PD13	(PIN_BASE + 0x60 + 13)</div><div class='del'>-#define	AT91_PIN_PD14	(PIN_BASE + 0x60 + 14)</div><div class='del'>-#define	AT91_PIN_PD15	(PIN_BASE + 0x60 + 15)</div><div class='del'>-#define	AT91_PIN_PD16	(PIN_BASE + 0x60 + 16)</div><div class='del'>-#define	AT91_PIN_PD17	(PIN_BASE + 0x60 + 17)</div><div class='del'>-#define	AT91_PIN_PD18	(PIN_BASE + 0x60 + 18)</div><div class='del'>-#define	AT91_PIN_PD19	(PIN_BASE + 0x60 + 19)</div><div class='del'>-#define	AT91_PIN_PD20	(PIN_BASE + 0x60 + 20)</div><div class='del'>-#define	AT91_PIN_PD21	(PIN_BASE + 0x60 + 21)</div><div class='del'>-#define	AT91_PIN_PD22	(PIN_BASE + 0x60 + 22)</div><div class='del'>-#define	AT91_PIN_PD23	(PIN_BASE + 0x60 + 23)</div><div class='del'>-#define	AT91_PIN_PD24	(PIN_BASE + 0x60 + 24)</div><div class='del'>-#define	AT91_PIN_PD25	(PIN_BASE + 0x60 + 25)</div><div class='del'>-#define	AT91_PIN_PD26	(PIN_BASE + 0x60 + 26)</div><div class='del'>-#define	AT91_PIN_PD27	(PIN_BASE + 0x60 + 27)</div><div class='del'>-#define	AT91_PIN_PD28	(PIN_BASE + 0x60 + 28)</div><div class='del'>-#define	AT91_PIN_PD29	(PIN_BASE + 0x60 + 29)</div><div class='del'>-#define	AT91_PIN_PD30	(PIN_BASE + 0x60 + 30)</div><div class='del'>-#define	AT91_PIN_PD31	(PIN_BASE + 0x60 + 31)</div><div class='del'>-</div><div class='del'>-#define	AT91_PIN_PE0	(PIN_BASE + 0x80 + 0)</div><div class='del'>-#define	AT91_PIN_PE1	(PIN_BASE + 0x80 + 1)</div><div class='del'>-#define	AT91_PIN_PE2	(PIN_BASE + 0x80 + 2)</div><div class='del'>-#define	AT91_PIN_PE3	(PIN_BASE + 0x80 + 3)</div><div class='del'>-#define	AT91_PIN_PE4	(PIN_BASE + 0x80 + 4)</div><div class='del'>-#define	AT91_PIN_PE5	(PIN_BASE + 0x80 + 5)</div><div class='del'>-#define	AT91_PIN_PE6	(PIN_BASE + 0x80 + 6)</div><div class='del'>-#define	AT91_PIN_PE7	(PIN_BASE + 0x80 + 7)</div><div class='del'>-#define	AT91_PIN_PE8	(PIN_BASE + 0x80 + 8)</div><div class='del'>-#define	AT91_PIN_PE9	(PIN_BASE + 0x80 + 9)</div><div class='del'>-#define	AT91_PIN_PE10	(PIN_BASE + 0x80 + 10)</div><div class='del'>-#define	AT91_PIN_PE11	(PIN_BASE + 0x80 + 11)</div><div class='del'>-#define	AT91_PIN_PE12	(PIN_BASE + 0x80 + 12)</div><div class='del'>-#define	AT91_PIN_PE13	(PIN_BASE + 0x80 + 13)</div><div class='del'>-#define	AT91_PIN_PE14	(PIN_BASE + 0x80 + 14)</div><div class='del'>-#define	AT91_PIN_PE15	(PIN_BASE + 0x80 + 15)</div><div class='del'>-#define	AT91_PIN_PE16	(PIN_BASE + 0x80 + 16)</div><div class='del'>-#define	AT91_PIN_PE17	(PIN_BASE + 0x80 + 17)</div><div class='del'>-#define	AT91_PIN_PE18	(PIN_BASE + 0x80 + 18)</div><div class='del'>-#define	AT91_PIN_PE19	(PIN_BASE + 0x80 + 19)</div><div class='del'>-#define	AT91_PIN_PE20	(PIN_BASE + 0x80 + 20)</div><div class='del'>-#define	AT91_PIN_PE21	(PIN_BASE + 0x80 + 21)</div><div class='del'>-#define	AT91_PIN_PE22	(PIN_BASE + 0x80 + 22)</div><div class='del'>-#define	AT91_PIN_PE23	(PIN_BASE + 0x80 + 23)</div><div class='del'>-#define	AT91_PIN_PE24	(PIN_BASE + 0x80 + 24)</div><div class='del'>-#define	AT91_PIN_PE25	(PIN_BASE + 0x80 + 25)</div><div class='del'>-#define	AT91_PIN_PE26	(PIN_BASE + 0x80 + 26)</div><div class='del'>-#define	AT91_PIN_PE27	(PIN_BASE + 0x80 + 27)</div><div class='del'>-#define	AT91_PIN_PE28	(PIN_BASE + 0x80 + 28)</div><div class='del'>-#define	AT91_PIN_PE29	(PIN_BASE + 0x80 + 29)</div><div class='del'>-#define	AT91_PIN_PE30	(PIN_BASE + 0x80 + 30)</div><div class='del'>-#define	AT91_PIN_PE31	(PIN_BASE + 0x80 + 31)</div><div class='add'>+#define	AT91_PIN_PA0	(0x00 + 0)</div><div class='add'>+#define	AT91_PIN_PA1	(0x00 + 1)</div><div class='add'>+#define	AT91_PIN_PA2	(0x00 + 2)</div><div class='add'>+#define	AT91_PIN_PA3	(0x00 + 3)</div><div class='add'>+#define	AT91_PIN_PA4	(0x00 + 4)</div><div class='add'>+#define	AT91_PIN_PA5	(0x00 + 5)</div><div class='add'>+#define	AT91_PIN_PA6	(0x00 + 6)</div><div class='add'>+#define	AT91_PIN_PA7	(0x00 + 7)</div><div class='add'>+#define	AT91_PIN_PA8	(0x00 + 8)</div><div class='add'>+#define	AT91_PIN_PA9	(0x00 + 9)</div><div class='add'>+#define	AT91_PIN_PA10	(0x00 + 10)</div><div class='add'>+#define	AT91_PIN_PA11	(0x00 + 11)</div><div class='add'>+#define	AT91_PIN_PA12	(0x00 + 12)</div><div class='add'>+#define	AT91_PIN_PA13	(0x00 + 13)</div><div class='add'>+#define	AT91_PIN_PA14	(0x00 + 14)</div><div class='add'>+#define	AT91_PIN_PA15	(0x00 + 15)</div><div class='add'>+#define	AT91_PIN_PA16	(0x00 + 16)</div><div class='add'>+#define	AT91_PIN_PA17	(0x00 + 17)</div><div class='add'>+#define	AT91_PIN_PA18	(0x00 + 18)</div><div class='add'>+#define	AT91_PIN_PA19	(0x00 + 19)</div><div class='add'>+#define	AT91_PIN_PA20	(0x00 + 20)</div><div class='add'>+#define	AT91_PIN_PA21	(0x00 + 21)</div><div class='add'>+#define	AT91_PIN_PA22	(0x00 + 22)</div><div class='add'>+#define	AT91_PIN_PA23	(0x00 + 23)</div><div class='add'>+#define	AT91_PIN_PA24	(0x00 + 24)</div><div class='add'>+#define	AT91_PIN_PA25	(0x00 + 25)</div><div class='add'>+#define	AT91_PIN_PA26	(0x00 + 26)</div><div class='add'>+#define	AT91_PIN_PA27	(0x00 + 27)</div><div class='add'>+#define	AT91_PIN_PA28	(0x00 + 28)</div><div class='add'>+#define	AT91_PIN_PA29	(0x00 + 29)</div><div class='add'>+#define	AT91_PIN_PA30	(0x00 + 30)</div><div class='add'>+#define	AT91_PIN_PA31	(0x00 + 31)</div><div class='add'>+</div><div class='add'>+#define	AT91_PIN_PB0	(0x20 + 0)</div><div class='add'>+#define	AT91_PIN_PB1	(0x20 + 1)</div><div class='add'>+#define	AT91_PIN_PB2	(0x20 + 2)</div><div class='add'>+#define	AT91_PIN_PB3	(0x20 + 3)</div><div class='add'>+#define	AT91_PIN_PB4	(0x20 + 4)</div><div class='add'>+#define	AT91_PIN_PB5	(0x20 + 5)</div><div class='add'>+#define	AT91_PIN_PB6	(0x20 + 6)</div><div class='add'>+#define	AT91_PIN_PB7	(0x20 + 7)</div><div class='add'>+#define	AT91_PIN_PB8	(0x20 + 8)</div><div class='add'>+#define	AT91_PIN_PB9	(0x20 + 9)</div><div class='add'>+#define	AT91_PIN_PB10	(0x20 + 10)</div><div class='add'>+#define	AT91_PIN_PB11	(0x20 + 11)</div><div class='add'>+#define	AT91_PIN_PB12	(0x20 + 12)</div><div class='add'>+#define	AT91_PIN_PB13	(0x20 + 13)</div><div class='add'>+#define	AT91_PIN_PB14	(0x20 + 14)</div><div class='add'>+#define	AT91_PIN_PB15	(0x20 + 15)</div><div class='add'>+#define	AT91_PIN_PB16	(0x20 + 16)</div><div class='add'>+#define	AT91_PIN_PB17	(0x20 + 17)</div><div class='add'>+#define	AT91_PIN_PB18	(0x20 + 18)</div><div class='add'>+#define	AT91_PIN_PB19	(0x20 + 19)</div><div class='add'>+#define	AT91_PIN_PB20	(0x20 + 20)</div><div class='add'>+#define	AT91_PIN_PB21	(0x20 + 21)</div><div class='add'>+#define	AT91_PIN_PB22	(0x20 + 22)</div><div class='add'>+#define	AT91_PIN_PB23	(0x20 + 23)</div><div class='add'>+#define	AT91_PIN_PB24	(0x20 + 24)</div><div class='add'>+#define	AT91_PIN_PB25	(0x20 + 25)</div><div class='add'>+#define	AT91_PIN_PB26	(0x20 + 26)</div><div class='add'>+#define	AT91_PIN_PB27	(0x20 + 27)</div><div class='add'>+#define	AT91_PIN_PB28	(0x20 + 28)</div><div class='add'>+#define	AT91_PIN_PB29	(0x20 + 29)</div><div class='add'>+#define	AT91_PIN_PB30	(0x20 + 30)</div><div class='add'>+#define	AT91_PIN_PB31	(0x20 + 31)</div><div class='add'>+</div><div class='add'>+#define	AT91_PIN_PC0	(0x40 + 0)</div><div class='add'>+#define	AT91_PIN_PC1	(0x40 + 1)</div><div class='add'>+#define	AT91_PIN_PC2	(0x40 + 2)</div><div class='add'>+#define	AT91_PIN_PC3	(0x40 + 3)</div><div class='add'>+#define	AT91_PIN_PC4	(0x40 + 4)</div><div class='add'>+#define	AT91_PIN_PC5	(0x40 + 5)</div><div class='add'>+#define	AT91_PIN_PC6	(0x40 + 6)</div><div class='add'>+#define	AT91_PIN_PC7	(0x40 + 7)</div><div class='add'>+#define	AT91_PIN_PC8	(0x40 + 8)</div><div class='add'>+#define	AT91_PIN_PC9	(0x40 + 9)</div><div class='add'>+#define	AT91_PIN_PC10	(0x40 + 10)</div><div class='add'>+#define	AT91_PIN_PC11	(0x40 + 11)</div><div class='add'>+#define	AT91_PIN_PC12	(0x40 + 12)</div><div class='add'>+#define	AT91_PIN_PC13	(0x40 + 13)</div><div class='add'>+#define	AT91_PIN_PC14	(0x40 + 14)</div><div class='add'>+#define	AT91_PIN_PC15	(0x40 + 15)</div><div class='add'>+#define	AT91_PIN_PC16	(0x40 + 16)</div><div class='add'>+#define	AT91_PIN_PC17	(0x40 + 17)</div><div class='add'>+#define	AT91_PIN_PC18	(0x40 + 18)</div><div class='add'>+#define	AT91_PIN_PC19	(0x40 + 19)</div><div class='add'>+#define	AT91_PIN_PC20	(0x40 + 20)</div><div class='add'>+#define	AT91_PIN_PC21	(0x40 + 21)</div><div class='add'>+#define	AT91_PIN_PC22	(0x40 + 22)</div><div class='add'>+#define	AT91_PIN_PC23	(0x40 + 23)</div><div class='add'>+#define	AT91_PIN_PC24	(0x40 + 24)</div><div class='add'>+#define	AT91_PIN_PC25	(0x40 + 25)</div><div class='add'>+#define	AT91_PIN_PC26	(0x40 + 26)</div><div class='add'>+#define	AT91_PIN_PC27	(0x40 + 27)</div><div class='add'>+#define	AT91_PIN_PC28	(0x40 + 28)</div><div class='add'>+#define	AT91_PIN_PC29	(0x40 + 29)</div><div class='add'>+#define	AT91_PIN_PC30	(0x40 + 30)</div><div class='add'>+#define	AT91_PIN_PC31	(0x40 + 31)</div><div class='add'>+</div><div class='add'>+#define	AT91_PIN_PD0	(0x60 + 0)</div><div class='add'>+#define	AT91_PIN_PD1	(0x60 + 1)</div><div class='add'>+#define	AT91_PIN_PD2	(0x60 + 2)</div><div class='add'>+#define	AT91_PIN_PD3	(0x60 + 3)</div><div class='add'>+#define	AT91_PIN_PD4	(0x60 + 4)</div><div class='add'>+#define	AT91_PIN_PD5	(0x60 + 5)</div><div class='add'>+#define	AT91_PIN_PD6	(0x60 + 6)</div><div class='add'>+#define	AT91_PIN_PD7	(0x60 + 7)</div><div class='add'>+#define	AT91_PIN_PD8	(0x60 + 8)</div><div class='add'>+#define	AT91_PIN_PD9	(0x60 + 9)</div><div class='add'>+#define	AT91_PIN_PD10	(0x60 + 10)</div><div class='add'>+#define	AT91_PIN_PD11	(0x60 + 11)</div><div class='add'>+#define	AT91_PIN_PD12	(0x60 + 12)</div><div class='add'>+#define	AT91_PIN_PD13	(0x60 + 13)</div><div class='add'>+#define	AT91_PIN_PD14	(0x60 + 14)</div><div class='add'>+#define	AT91_PIN_PD15	(0x60 + 15)</div><div class='add'>+#define	AT91_PIN_PD16	(0x60 + 16)</div><div class='add'>+#define	AT91_PIN_PD17	(0x60 + 17)</div><div class='add'>+#define	AT91_PIN_PD18	(0x60 + 18)</div><div class='add'>+#define	AT91_PIN_PD19	(0x60 + 19)</div><div class='add'>+#define	AT91_PIN_PD20	(0x60 + 20)</div><div class='add'>+#define	AT91_PIN_PD21	(0x60 + 21)</div><div class='add'>+#define	AT91_PIN_PD22	(0x60 + 22)</div><div class='add'>+#define	AT91_PIN_PD23	(0x60 + 23)</div><div class='add'>+#define	AT91_PIN_PD24	(0x60 + 24)</div><div class='add'>+#define	AT91_PIN_PD25	(0x60 + 25)</div><div class='add'>+#define	AT91_PIN_PD26	(0x60 + 26)</div><div class='add'>+#define	AT91_PIN_PD27	(0x60 + 27)</div><div class='add'>+#define	AT91_PIN_PD28	(0x60 + 28)</div><div class='add'>+#define	AT91_PIN_PD29	(0x60 + 29)</div><div class='add'>+#define	AT91_PIN_PD30	(0x60 + 30)</div><div class='add'>+#define	AT91_PIN_PD31	(0x60 + 31)</div><div class='add'>+</div><div class='add'>+#define	AT91_PIN_PE0	(0x80 + 0)</div><div class='add'>+#define	AT91_PIN_PE1	(0x80 + 1)</div><div class='add'>+#define	AT91_PIN_PE2	(0x80 + 2)</div><div class='add'>+#define	AT91_PIN_PE3	(0x80 + 3)</div><div class='add'>+#define	AT91_PIN_PE4	(0x80 + 4)</div><div class='add'>+#define	AT91_PIN_PE5	(0x80 + 5)</div><div class='add'>+#define	AT91_PIN_PE6	(0x80 + 6)</div><div class='add'>+#define	AT91_PIN_PE7	(0x80 + 7)</div><div class='add'>+#define	AT91_PIN_PE8	(0x80 + 8)</div><div class='add'>+#define	AT91_PIN_PE9	(0x80 + 9)</div><div class='add'>+#define	AT91_PIN_PE10	(0x80 + 10)</div><div class='add'>+#define	AT91_PIN_PE11	(0x80 + 11)</div><div class='add'>+#define	AT91_PIN_PE12	(0x80 + 12)</div><div class='add'>+#define	AT91_PIN_PE13	(0x80 + 13)</div><div class='add'>+#define	AT91_PIN_PE14	(0x80 + 14)</div><div class='add'>+#define	AT91_PIN_PE15	(0x80 + 15)</div><div class='add'>+#define	AT91_PIN_PE16	(0x80 + 16)</div><div class='add'>+#define	AT91_PIN_PE17	(0x80 + 17)</div><div class='add'>+#define	AT91_PIN_PE18	(0x80 + 18)</div><div class='add'>+#define	AT91_PIN_PE19	(0x80 + 19)</div><div class='add'>+#define	AT91_PIN_PE20	(0x80 + 20)</div><div class='add'>+#define	AT91_PIN_PE21	(0x80 + 21)</div><div class='add'>+#define	AT91_PIN_PE22	(0x80 + 22)</div><div class='add'>+#define	AT91_PIN_PE23	(0x80 + 23)</div><div class='add'>+#define	AT91_PIN_PE24	(0x80 + 24)</div><div class='add'>+#define	AT91_PIN_PE25	(0x80 + 25)</div><div class='add'>+#define	AT91_PIN_PE26	(0x80 + 26)</div><div class='add'>+#define	AT91_PIN_PE27	(0x80 + 27)</div><div class='add'>+#define	AT91_PIN_PE28	(0x80 + 28)</div><div class='add'>+#define	AT91_PIN_PE29	(0x80 + 29)</div><div class='add'>+#define	AT91_PIN_PE30	(0x80 + 30)</div><div class='add'>+#define	AT91_PIN_PE31	(0x80 + 31)</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> /* setup setup routines, called from board init or driver probe() */</div><div class='hunk'>@@ -215,8 +213,8 @@ extern void at91_gpio_resume(void);</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='ctx'> </div><div class='del'>-#define gpio_to_irq(gpio) (gpio)</div><div class='del'>-#define irq_to_gpio(irq)  (irq)</div><div class='add'>+#define gpio_to_irq(gpio) (gpio + NR_AIC_IRQS)</div><div class='add'>+#define irq_to_gpio(irq)  (irq - NR_AIC_IRQS)</div><div class='ctx'> </div><div class='ctx'> #endif	/* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h<br/>index 483478d8be6b..2d0e4e998566 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/hardware.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/hardware.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/hardware.h</a></div><div class='hunk'>@@ -16,6 +16,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> </div><div class='add'>+/* DBGU base */</div><div class='add'>+/* rm9200, 9260/9g20, 9261/9g10, 9rl */</div><div class='add'>+#define AT91_BASE_DBGU0	0xfffff200</div><div class='add'>+/* 9263, 9g45, cap9 */</div><div class='add'>+#define AT91_BASE_DBGU1	0xffffee00</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_ARCH_AT91RM9200)</div><div class='ctx'> #include &lt;mach/at91rm9200.h&gt;</div><div class='ctx'> #elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20)</div><div class='hunk'>@@ -52,6 +58,12 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * On all at91 have the Advanced Interrupt Controller starts at address</div><div class='add'>+ * 0xfffff000</div><div class='add'>+ */</div><div class='add'>+#define AT91_AIC	0xfffff000</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Peripheral identifiers/interrupts.</div><div class='ctx'>  */</div><div class='ctx'> #define AT91_ID_FIQ		0	/* Advanced Interrupt Controller (FIQ) */</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/io.h b/arch/arm/mach-at91/include/mach/io.h<br/>index 4298e7806c76..4ca09ef7ca29 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/io.h</a></div><div class='hunk'>@@ -30,14 +30,6 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_ARCH_AT91X40</div><div class='del'>-#define __arch_ioremap	at91_ioremap</div><div class='del'>-#define __arch_iounmap	at91_iounmap</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void __iomem *at91_ioremap(unsigned long phys, size_t size, unsigned int type);</div><div class='del'>-void at91_iounmap(volatile void __iomem *addr);</div><div class='del'>-</div><div class='ctx'> static inline unsigned int at91_sys_read(unsigned int reg_offset)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS;</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/irqs.h b/arch/arm/mach-at91/include/mach/irqs.h<br/>index 36bd55f3fc6e..ac8b7dfc85ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/irqs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/irqs.h</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>  * Acknowledge interrupt with AIC after interrupt has been handled.</div><div class='ctx'>  *   (by kernel/irq.c)</div><div class='ctx'>  */</div><div class='del'>-#define irq_finish(irq) do { at91_sys_write(AT91_AIC_EOICR, 0); } while (0)</div><div class='add'>+#define irq_finish(irq) do { at91_aic_write(AT91_AIC_EOICR, 0); } while (0)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/system.h b/arch/arm/mach-at91/include/mach/system.h<br/>index 36af14bc13bb..cbd64f3bcecd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/system.h</a></div><div class='hunk'>@@ -47,13 +47,4 @@ static inline void arch_idle(void)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void (*at91_arch_reset)(void);</div><div class='del'>-</div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	/* call the CPU-specific reset function */</div><div class='del'>-	if (at91_arch_reset)</div><div class='del'>-		(at91_arch_reset)();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/timex.h b/arch/arm/mach-at91/include/mach/timex.h<br/>index 85820ad801cc..5e917a66edd7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/timex.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/timex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/timex.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/timex.h</a></div><div class='hunk'>@@ -23,70 +23,15 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_ARCH_AT91RM9200)</div><div class='add'>+#ifdef CONFIG_ARCH_AT91X40</div><div class='ctx'> </div><div class='del'>-#define CLOCK_TICK_RATE		(AT91_SLOW_CLOCK)</div><div class='del'>-</div><div class='del'>-#elif defined(CONFIG_ARCH_AT91SAM9260)</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_MACH_USB_A9260) || defined(CONFIG_MACH_QIL_A9260)</div><div class='del'>-#define AT91SAM9_MASTER_CLOCK	90000000</div><div class='del'>-#else</div><div class='del'>-#define AT91SAM9_MASTER_CLOCK	99300000</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define CLOCK_TICK_RATE		(AT91SAM9_MASTER_CLOCK/16)</div><div class='del'>-</div><div class='del'>-#elif defined(CONFIG_ARCH_AT91SAM9261)</div><div class='del'>-</div><div class='del'>-#define AT91SAM9_MASTER_CLOCK	99300000</div><div class='del'>-#define CLOCK_TICK_RATE		(AT91SAM9_MASTER_CLOCK/16)</div><div class='del'>-</div><div class='del'>-#elif defined(CONFIG_ARCH_AT91SAM9G10)</div><div class='del'>-</div><div class='del'>-#define AT91SAM9_MASTER_CLOCK	133000000</div><div class='del'>-#define CLOCK_TICK_RATE		(AT91SAM9_MASTER_CLOCK/16)</div><div class='del'>-</div><div class='del'>-#elif defined(CONFIG_ARCH_AT91SAM9263)</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_MACH_USB_A9263)</div><div class='del'>-#define AT91SAM9_MASTER_CLOCK	90000000</div><div class='del'>-#else</div><div class='del'>-#define AT91SAM9_MASTER_CLOCK	99959500</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define CLOCK_TICK_RATE		(AT91SAM9_MASTER_CLOCK/16)</div><div class='del'>-</div><div class='del'>-#elif defined(CONFIG_ARCH_AT91SAM9RL)</div><div class='del'>-</div><div class='del'>-#define AT91SAM9_MASTER_CLOCK	100000000</div><div class='del'>-#define CLOCK_TICK_RATE		(AT91SAM9_MASTER_CLOCK/16)</div><div class='del'>-</div><div class='del'>-#elif defined(CONFIG_ARCH_AT91SAM9G20)</div><div class='add'>+#define AT91X40_MASTER_CLOCK	40000000</div><div class='add'>+#define CLOCK_TICK_RATE		(AT91X40_MASTER_CLOCK)</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_MACH_USB_A9G20)</div><div class='del'>-#define AT91SAM9_MASTER_CLOCK	133000000</div><div class='ctx'> #else</div><div class='del'>-#define AT91SAM9_MASTER_CLOCK	132096000</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define CLOCK_TICK_RATE		(AT91SAM9_MASTER_CLOCK/16)</div><div class='del'>-</div><div class='del'>-#elif defined(CONFIG_ARCH_AT91SAM9G45)</div><div class='ctx'> </div><div class='del'>-#define AT91SAM9_MASTER_CLOCK	133333333</div><div class='del'>-#define CLOCK_TICK_RATE		(AT91SAM9_MASTER_CLOCK/16)</div><div class='del'>-</div><div class='del'>-#elif defined(CONFIG_ARCH_AT91CAP9)</div><div class='del'>-</div><div class='del'>-#define AT91CAP9_MASTER_CLOCK	100000000</div><div class='del'>-#define CLOCK_TICK_RATE		(AT91CAP9_MASTER_CLOCK/16)</div><div class='del'>-</div><div class='del'>-#elif defined(CONFIG_ARCH_AT91X40)</div><div class='del'>-</div><div class='del'>-#define AT91X40_MASTER_CLOCK	40000000</div><div class='del'>-#define CLOCK_TICK_RATE		(AT91X40_MASTER_CLOCK)</div><div class='add'>+#define CLOCK_TICK_RATE		12345678</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+#endif /* __ASM_ARCH_TIMEX_H */</div><div class='head'>diff --git a/arch/arm/mach-at91/include/mach/uncompress.h b/arch/arm/mach-at91/include/mach/uncompress.h<br/>index 18bdcdeb474f..0234fd9d20d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/uncompress.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/include/mach/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/include/mach/uncompress.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/include/mach/uncompress.h</a></div><div class='hunk'>@@ -24,8 +24,10 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/atmel_serial.h&gt;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_AT91_EARLY_DBGU)</div><div class='del'>-#define UART_OFFSET (AT91_DBGU + AT91_BASE_SYS)</div><div class='add'>+#if defined(CONFIG_AT91_EARLY_DBGU0)</div><div class='add'>+#define UART_OFFSET AT91_BASE_DBGU0</div><div class='add'>+#elif defined(CONFIG_AT91_EARLY_DBGU1)</div><div class='add'>+#define UART_OFFSET AT91_BASE_DBGU1</div><div class='ctx'> #elif defined(CONFIG_AT91_EARLY_USART0)</div><div class='ctx'> #define UART_OFFSET AT91_USART0</div><div class='ctx'> #elif defined(CONFIG_AT91_EARLY_USART1)</div><div class='head'>diff --git a/arch/arm/mach-at91/irq.c b/arch/arm/mach-at91/irq.c<br/>index 9665265ec757..be6b639ecd7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/irq.c</a></div><div class='hunk'>@@ -33,17 +33,18 @@</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='add'>+void __iomem *at91_aic_base;</div><div class='ctx'> </div><div class='ctx'> static void at91_aic_mask_irq(struct irq_data *d)</div><div class='ctx'> {</div><div class='ctx'> 	/* Disable interrupt on AIC */</div><div class='del'>-	at91_sys_write(AT91_AIC_IDCR, 1 &lt;&lt; d-&gt;irq);</div><div class='add'>+	at91_aic_write(AT91_AIC_IDCR, 1 &lt;&lt; d-&gt;irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void at91_aic_unmask_irq(struct irq_data *d)</div><div class='ctx'> {</div><div class='ctx'> 	/* Enable interrupt on AIC */</div><div class='del'>-	at91_sys_write(AT91_AIC_IECR, 1 &lt;&lt; d-&gt;irq);</div><div class='add'>+	at91_aic_write(AT91_AIC_IECR, 1 &lt;&lt; d-&gt;irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned int at91_extern_irq;</div><div class='hunk'>@@ -77,8 +78,8 @@ static int at91_aic_set_type(struct irq_data *d, unsigned type)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	smr = at91_sys_read(AT91_AIC_SMR(d-&gt;irq)) &amp; ~AT91_AIC_SRCTYPE;</div><div class='del'>-	at91_sys_write(AT91_AIC_SMR(d-&gt;irq), smr | srctype);</div><div class='add'>+	smr = at91_aic_read(AT91_AIC_SMR(d-&gt;irq)) &amp; ~AT91_AIC_SRCTYPE;</div><div class='add'>+	at91_aic_write(AT91_AIC_SMR(d-&gt;irq), smr | srctype);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -102,15 +103,15 @@ static int at91_aic_set_wake(struct irq_data *d, unsigned value)</div><div class='ctx'> </div><div class='ctx'> void at91_irq_suspend(void)</div><div class='ctx'> {</div><div class='del'>-	backups = at91_sys_read(AT91_AIC_IMR);</div><div class='del'>-	at91_sys_write(AT91_AIC_IDCR, backups);</div><div class='del'>-	at91_sys_write(AT91_AIC_IECR, wakeups);</div><div class='add'>+	backups = at91_aic_read(AT91_AIC_IMR);</div><div class='add'>+	at91_aic_write(AT91_AIC_IDCR, backups);</div><div class='add'>+	at91_aic_write(AT91_AIC_IECR, wakeups);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void at91_irq_resume(void)</div><div class='ctx'> {</div><div class='del'>-	at91_sys_write(AT91_AIC_IDCR, wakeups);</div><div class='del'>-	at91_sys_write(AT91_AIC_IECR, backups);</div><div class='add'>+	at91_aic_write(AT91_AIC_IDCR, wakeups);</div><div class='add'>+	at91_aic_write(AT91_AIC_IECR, backups);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='hunk'>@@ -133,34 +134,39 @@ void __init at91_aic_init(unsigned int priority[NR_AIC_IRQS])</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='add'>+	at91_aic_base = ioremap(AT91_AIC, 512);</div><div class='add'>+</div><div class='add'>+	if (!at91_aic_base)</div><div class='add'>+		panic("Impossible to ioremap AT91_AIC\n");</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The IVR is used by macro get_irqnr_and_base to read and verify.</div><div class='ctx'> 	 * The irq number is NR_AIC_IRQS when a spurious interrupt has occurred.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; NR_AIC_IRQS; i++) {</div><div class='ctx'> 		/* Put irq number in Source Vector Register: */</div><div class='del'>-		at91_sys_write(AT91_AIC_SVR(i), i);</div><div class='add'>+		at91_aic_write(AT91_AIC_SVR(i), i);</div><div class='ctx'> 		/* Active Low interrupt, with the specified priority */</div><div class='del'>-		at91_sys_write(AT91_AIC_SMR(i), AT91_AIC_SRCTYPE_LOW | priority[i]);</div><div class='add'>+		at91_aic_write(AT91_AIC_SMR(i), AT91_AIC_SRCTYPE_LOW | priority[i]);</div><div class='ctx'> </div><div class='ctx'> 		irq_set_chip_and_handler(i, &amp;at91_aic_chip, handle_level_irq);</div><div class='ctx'> 		set_irq_flags(i, IRQF_VALID | IRQF_PROBE);</div><div class='ctx'> </div><div class='ctx'> 		/* Perform 8 End Of Interrupt Command to make sure AIC will not Lock out nIRQ */</div><div class='ctx'> 		if (i &lt; 8)</div><div class='del'>-			at91_sys_write(AT91_AIC_EOICR, 0);</div><div class='add'>+			at91_aic_write(AT91_AIC_EOICR, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Spurious Interrupt ID in Spurious Vector Register is NR_AIC_IRQS</div><div class='ctx'> 	 * When there is no current interrupt, the IRQ Vector Register reads the value stored in AIC_SPU</div><div class='ctx'> 	 */</div><div class='del'>-	at91_sys_write(AT91_AIC_SPU, NR_AIC_IRQS);</div><div class='add'>+	at91_aic_write(AT91_AIC_SPU, NR_AIC_IRQS);</div><div class='ctx'> </div><div class='ctx'> 	/* No debugging in AIC: Debug (Protect) Control Register */</div><div class='del'>-	at91_sys_write(AT91_AIC_DCR, 0);</div><div class='add'>+	at91_aic_write(AT91_AIC_DCR, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable and clear all interrupts initially */</div><div class='del'>-	at91_sys_write(AT91_AIC_IDCR, 0xFFFFFFFF);</div><div class='del'>-	at91_sys_write(AT91_AIC_ICCR, 0xFFFFFFFF);</div><div class='add'>+	at91_aic_write(AT91_AIC_IDCR, 0xFFFFFFFF);</div><div class='add'>+	at91_aic_write(AT91_AIC_ICCR, 0xFFFFFFFF);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c<br/>index 7046158109d7..62ad95556c36 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/pm.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Show the reason for the previous system reset.</div><div class='ctx'>  */</div><div class='del'>-#if defined(AT91_SHDWC)</div><div class='add'>+#if defined(AT91_RSTC)</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/at91_rstc.h&gt;</div><div class='ctx'> #include &lt;mach/at91_shdwc.h&gt;</div><div class='hunk'>@@ -58,8 +58,11 @@ static void __init show_reset_status(void)</div><div class='ctx'> 	char *reason, *r2 = reset;</div><div class='ctx'> 	u32 reset_type, wake_type;</div><div class='ctx'> </div><div class='add'>+	if (!at91_shdwc_base)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	reset_type = at91_sys_read(AT91_RSTC_SR) &amp; AT91_RSTC_RSTTYP;</div><div class='del'>-	wake_type = at91_sys_read(AT91_SHDW_SR);</div><div class='add'>+	wake_type = at91_shdwc_read(AT91_SHDW_SR);</div><div class='ctx'> </div><div class='ctx'> 	switch (reset_type) {</div><div class='ctx'> 	case AT91_RSTC_RSTTYP_GENERAL:</div><div class='hunk'>@@ -215,7 +218,7 @@ static int at91_pm_enter(suspend_state_t state)</div><div class='ctx'> 					| (1 &lt;&lt; AT91_ID_FIQ)</div><div class='ctx'> 					| (1 &lt;&lt; AT91_ID_SYS)</div><div class='ctx'> 					| (at91_extern_irq))</div><div class='del'>-				&amp; at91_sys_read(AT91_AIC_IMR),</div><div class='add'>+				&amp; at91_aic_read(AT91_AIC_IMR),</div><div class='ctx'> 			state);</div><div class='ctx'> </div><div class='ctx'> 	switch (state) {</div><div class='hunk'>@@ -283,7 +286,7 @@ static int at91_pm_enter(suspend_state_t state)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("AT91: PM - wakeup %08x\n",</div><div class='del'>-			at91_sys_read(AT91_AIC_IPR) &amp; at91_sys_read(AT91_AIC_IMR));</div><div class='add'>+			at91_aic_read(AT91_AIC_IPR) &amp; at91_aic_read(AT91_AIC_IMR));</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='ctx'> 	target_state = PM_SUSPEND_ON;</div><div class='head'>diff --git a/arch/arm/mach-at91/sam9_smc.c b/arch/arm/mach-at91/sam9_smc.c<br/>index 5eab6aa621d0..8294783b679d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/sam9_smc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/sam9_smc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/sam9_smc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/sam9_smc.c</a></div><div class='hunk'>@@ -10,38 +10,58 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/at91sam9_smc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sam9_smc.h"</div><div class='ctx'> </div><div class='del'>-void __init sam9_smc_configure(int cs, struct sam9_smc_config* config)</div><div class='add'>+</div><div class='add'>+#define AT91_SMC_CS(id, n)	(smc_base_addr[id] + ((n) * 0x10))</div><div class='add'>+</div><div class='add'>+static void __iomem *smc_base_addr[2];</div><div class='add'>+</div><div class='add'>+static void __init sam9_smc_cs_configure(void __iomem *base, struct sam9_smc_config* config)</div><div class='ctx'> {</div><div class='add'>+</div><div class='ctx'> 	/* Setup register */</div><div class='del'>-	at91_sys_write(AT91_SMC_SETUP(cs),</div><div class='del'>-		  AT91_SMC_NWESETUP_(config-&gt;nwe_setup)</div><div class='del'>-		| AT91_SMC_NCS_WRSETUP_(config-&gt;ncs_write_setup)</div><div class='del'>-		| AT91_SMC_NRDSETUP_(config-&gt;nrd_setup)</div><div class='del'>-		| AT91_SMC_NCS_RDSETUP_(config-&gt;ncs_read_setup)</div><div class='del'>-	);</div><div class='add'>+	__raw_writel(AT91_SMC_NWESETUP_(config-&gt;nwe_setup)</div><div class='add'>+		   | AT91_SMC_NCS_WRSETUP_(config-&gt;ncs_write_setup)</div><div class='add'>+		   | AT91_SMC_NRDSETUP_(config-&gt;nrd_setup)</div><div class='add'>+		   | AT91_SMC_NCS_RDSETUP_(config-&gt;ncs_read_setup),</div><div class='add'>+		   base + AT91_SMC_SETUP);</div><div class='ctx'> </div><div class='ctx'> 	/* Pulse register */</div><div class='del'>-	at91_sys_write(AT91_SMC_PULSE(cs),</div><div class='del'>-		  AT91_SMC_NWEPULSE_(config-&gt;nwe_pulse)</div><div class='del'>-		| AT91_SMC_NCS_WRPULSE_(config-&gt;ncs_write_pulse)</div><div class='del'>-                | AT91_SMC_NRDPULSE_(config-&gt;nrd_pulse)</div><div class='del'>-		| AT91_SMC_NCS_RDPULSE_(config-&gt;ncs_read_pulse)</div><div class='del'>-	);</div><div class='add'>+	__raw_writel(AT91_SMC_NWEPULSE_(config-&gt;nwe_pulse)</div><div class='add'>+		   | AT91_SMC_NCS_WRPULSE_(config-&gt;ncs_write_pulse)</div><div class='add'>+		   | AT91_SMC_NRDPULSE_(config-&gt;nrd_pulse)</div><div class='add'>+		   | AT91_SMC_NCS_RDPULSE_(config-&gt;ncs_read_pulse),</div><div class='add'>+		   base + AT91_SMC_PULSE);</div><div class='ctx'> </div><div class='ctx'> 	/* Cycle register */</div><div class='del'>-	at91_sys_write(AT91_SMC_CYCLE(cs),</div><div class='del'>-		  AT91_SMC_NWECYCLE_(config-&gt;write_cycle)</div><div class='del'>-		| AT91_SMC_NRDCYCLE_(config-&gt;read_cycle)</div><div class='del'>-	);</div><div class='add'>+	__raw_writel(AT91_SMC_NWECYCLE_(config-&gt;write_cycle)</div><div class='add'>+		   | AT91_SMC_NRDCYCLE_(config-&gt;read_cycle),</div><div class='add'>+		   base + AT91_SMC_CYCLE);</div><div class='ctx'> </div><div class='ctx'> 	/* Mode register */</div><div class='del'>-	at91_sys_write(AT91_SMC_MODE(cs),</div><div class='del'>-		  config-&gt;mode</div><div class='del'>-		| AT91_SMC_TDF_(config-&gt;tdf_cycles)</div><div class='del'>-	);</div><div class='add'>+	__raw_writel(config-&gt;mode</div><div class='add'>+		   | AT91_SMC_TDF_(config-&gt;tdf_cycles),</div><div class='add'>+		   base + AT91_SMC_MODE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init sam9_smc_configure(int id, int cs, struct sam9_smc_config* config)</div><div class='add'>+{</div><div class='add'>+	sam9_smc_cs_configure(AT91_SMC_CS(id, cs), config);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init at91sam9_ioremap_smc(int id, u32 addr)</div><div class='add'>+{</div><div class='add'>+	if (id &gt; 1) {</div><div class='add'>+		pr_warn("%s: id &gt; 2\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	smc_base_addr[id] = ioremap(addr, 512);</div><div class='add'>+	if (!smc_base_addr[id])</div><div class='add'>+		pr_warn("Impossible to ioremap smc.%d 0x%x\n", id, addr);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-at91/sam9_smc.h b/arch/arm/mach-at91/sam9_smc.h<br/>index bf72cfb3455b..039c5ce17aec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/sam9_smc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/sam9_smc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/sam9_smc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/sam9_smc.h</a></div><div class='hunk'>@@ -30,4 +30,5 @@ struct sam9_smc_config {</div><div class='ctx'> 	u8 tdf_cycles:4;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern void __init sam9_smc_configure(int cs, struct sam9_smc_config* config);</div><div class='add'>+extern void __init sam9_smc_configure(int id, int cs, struct sam9_smc_config* config);</div><div class='add'>+extern void __init at91sam9_ioremap_smc(int id, u32 addr);</div><div class='head'>diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c<br/>index aa64294c7db3..8bdcc3cb6012 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/setup.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -15,6 +16,7 @@</div><div class='ctx'> #include &lt;mach/cpu.h&gt;</div><div class='ctx'> #include &lt;mach/at91_dbgu.h&gt;</div><div class='ctx'> #include &lt;mach/at91_pmc.h&gt;</div><div class='add'>+#include &lt;mach/at91_shdwc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "soc.h"</div><div class='ctx'> #include "generic.h"</div><div class='hunk'>@@ -73,27 +75,6 @@ static struct map_desc at91_io_desc __initdata = {</div><div class='ctx'> 	.type		= MT_DEVICE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __iomem *at91_ioremap(unsigned long p, size_t size, unsigned int type)</div><div class='del'>-{</div><div class='del'>-	if (p &gt;= AT91_BASE_SYS &amp;&amp; p &lt;= (AT91_BASE_SYS + SZ_16K - 1))</div><div class='del'>-		return (void __iomem *)AT91_IO_P2V(p);</div><div class='del'>-</div><div class='del'>-	return __arm_ioremap_caller(p, size, type, __builtin_return_address(0));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(at91_ioremap);</div><div class='del'>-</div><div class='del'>-void at91_iounmap(volatile void __iomem *addr)</div><div class='del'>-{</div><div class='del'>-	unsigned long virt = (unsigned long)addr;</div><div class='del'>-</div><div class='del'>-	if (virt &gt;= VMALLOC_START &amp;&amp; virt &lt; VMALLOC_END)</div><div class='del'>-		__iounmap(addr);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(at91_iounmap);</div><div class='del'>-</div><div class='del'>-#define AT91_DBGU0	0xfffff200</div><div class='del'>-#define AT91_DBGU1	0xffffee00</div><div class='del'>-</div><div class='ctx'> static void __init soc_detect(u32 dbgu_base)</div><div class='ctx'> {</div><div class='ctx'> 	u32 cidr, socid;</div><div class='hunk'>@@ -266,9 +247,9 @@ void __init at91_map_io(void)</div><div class='ctx'> 	at91_soc_initdata.type = AT91_SOC_NONE;</div><div class='ctx'> 	at91_soc_initdata.subtype = AT91_SOC_SUBTYPE_NONE;</div><div class='ctx'> </div><div class='del'>-	soc_detect(AT91_DBGU0);</div><div class='add'>+	soc_detect(AT91_BASE_DBGU0);</div><div class='ctx'> 	if (!at91_soc_is_detected())</div><div class='del'>-		soc_detect(AT91_DBGU1);</div><div class='add'>+		soc_detect(AT91_BASE_DBGU1);</div><div class='ctx'> </div><div class='ctx'> 	if (!at91_soc_is_detected())</div><div class='ctx'> 		panic("AT91: Impossible to detect the SOC type");</div><div class='hunk'>@@ -285,8 +266,25 @@ void __init at91_map_io(void)</div><div class='ctx'> 		at91_boot_soc.map_io();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __iomem *at91_shdwc_base = NULL;</div><div class='add'>+</div><div class='add'>+static void at91sam9_poweroff(void)</div><div class='add'>+{</div><div class='add'>+	at91_shdwc_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init at91_ioremap_shdwc(u32 base_addr)</div><div class='add'>+{</div><div class='add'>+	at91_shdwc_base = ioremap(base_addr, 16);</div><div class='add'>+	if (!at91_shdwc_base)</div><div class='add'>+		panic("Impossible to ioremap at91_shdwc_base\n");</div><div class='add'>+	pm_power_off = at91sam9_poweroff;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init at91_initialize(unsigned long main_clock)</div><div class='ctx'> {</div><div class='add'>+	at91_boot_soc.ioremap_registers();</div><div class='add'>+</div><div class='ctx'> 	/* Init clock subsystem */</div><div class='ctx'> 	at91_clock_init(main_clock);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91/soc.h b/arch/arm/mach-at91/soc.h<br/>index 21ed8816e6f7..4588ae6f7acd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/soc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-at91/soc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91/soc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-at91/soc.h</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> struct at91_init_soc {</div><div class='ctx'> 	unsigned int *default_irq_priority;</div><div class='ctx'> 	void (*map_io)(void);</div><div class='add'>+	void (*ioremap_registers)(void);</div><div class='ctx'> 	void (*register_clocks)(void);</div><div class='ctx'> 	void (*init)(void);</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-bcmring/arch.c b/arch/arm/mach-bcmring/arch.c<br/>index 31a143592c81..9e5e7552498c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-bcmring/arch.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-bcmring/arch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-bcmring/arch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-bcmring/arch.c</a></div><div class='hunk'>@@ -49,7 +49,29 @@ HW_DECLARE_SPINLOCK(gpio)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* sysctl */</div><div class='del'>-int bcmring_arch_warm_reboot;	/* do a warm reboot on hard reset */</div><div class='add'>+static int bcmring_arch_warm_reboot;	/* do a warm reboot on hard reset */</div><div class='add'>+</div><div class='add'>+static void bcmring_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	printk("arch_reset:%c %x\n", mode, bcmring_arch_warm_reboot);</div><div class='add'>+</div><div class='add'>+	if (mode == 'h') {</div><div class='add'>+		/* Reboot configured in proc entry */</div><div class='add'>+		if (bcmring_arch_warm_reboot) {</div><div class='add'>+			printk("warm reset\n");</div><div class='add'>+			/* Issue Warm reset (do not reset ethernet switch, keep alive) */</div><div class='add'>+			chipcHw_reset(chipcHw_REG_SOFT_RESET_CHIP_WARM);</div><div class='add'>+		} else {</div><div class='add'>+			/* Force reset of everything */</div><div class='add'>+			printk("force reset\n");</div><div class='add'>+			chipcHw_reset(chipcHw_REG_SOFT_RESET_CHIP_SOFT);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Force reset of everything */</div><div class='add'>+		printk("force reset\n");</div><div class='add'>+		chipcHw_reset(chipcHw_REG_SOFT_RESET_CHIP_SOFT);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static struct ctl_table_header *bcmring_sysctl_header;</div><div class='ctx'> </div><div class='hunk'>@@ -173,4 +195,5 @@ MACHINE_START(BCMRING, "BCMRING")</div><div class='ctx'> 	.init_irq = bcmring_init_irq,</div><div class='ctx'> 	.timer = &amp;bcmring_timer,</div><div class='ctx'> 	.init_machine = bcmring_init_machine</div><div class='add'>+	.restart = bcmring_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-bcmring/core.c b/arch/arm/mach-bcmring/core.c<br/>index 430da120a297..6b67b7e8426c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-bcmring/core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-bcmring/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-bcmring/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-bcmring/core.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/clkdev.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-bcmring/dma.c b/arch/arm/mach-bcmring/dma.c<br/>index f4d4d6d174d0..1a1a27dd5654 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-bcmring/dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-bcmring/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-bcmring/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-bcmring/dma.c</a></div><div class='hunk'>@@ -1615,7 +1615,7 @@ DMA_MemType_t dma_mem_type(void *addr)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addrVal = (unsigned long)addr;</div><div class='ctx'> </div><div class='del'>-	if (addrVal &gt;= VMALLOC_END) {</div><div class='add'>+	if (addrVal &gt;= CONSISTENT_BASE) {</div><div class='ctx'> 		/* NOTE: DMA virtual memory space starts at 0xFFxxxxxx */</div><div class='ctx'> </div><div class='ctx'> 		/* dma_alloc_xxx pages are physically and virtually contiguous */</div><div class='head'>diff --git a/arch/arm/mach-bcmring/include/mach/system.h b/arch/arm/mach-bcmring/include/mach/system.h<br/>index 38b37060d426..cb78250db649 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-bcmring/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-bcmring/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-bcmring/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-bcmring/include/mach/system.h</a></div><div class='hunk'>@@ -20,35 +20,9 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/csp/chipcHw_inline.h&gt;</div><div class='del'>-</div><div class='del'>-extern int bcmring_arch_warm_reboot;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	printk("arch_reset:%c %x\n", mode, bcmring_arch_warm_reboot);</div><div class='del'>-</div><div class='del'>-	if (mode == 'h') {</div><div class='del'>-		/* Reboot configured in proc entry */</div><div class='del'>-		if (bcmring_arch_warm_reboot) {</div><div class='del'>-			printk("warm reset\n");</div><div class='del'>-			/* Issue Warm reset (do not reset ethernet switch, keep alive) */</div><div class='del'>-			chipcHw_reset(chipcHw_REG_SOFT_RESET_CHIP_WARM);</div><div class='del'>-		} else {</div><div class='del'>-			/* Force reset of everything */</div><div class='del'>-			printk("force reset\n");</div><div class='del'>-			chipcHw_reset(chipcHw_REG_SOFT_RESET_CHIP_SOFT);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Force reset of everything */</div><div class='del'>-		printk("force reset\n");</div><div class='del'>-		chipcHw_reset(chipcHw_REG_SOFT_RESET_CHIP_SOFT);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-bcmring/include/mach/vmalloc.h b/arch/arm/mach-bcmring/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 7397bd7817d9..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-bcmring/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-bcmring/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,25 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2000 Russell King.</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='del'>-</div><div class='del'>-/*</div><div class='del'>- * Move VMALLOC_END to 0xf0000000 so that the vm space can range from</div><div class='del'>- * 0xe0000000 to 0xefffffff. This gives us 256 MB of vm space and handles</div><div class='del'>- * larger physical memory designs better.</div><div class='del'>- */</div><div class='del'>-#define VMALLOC_END       0xf0000000UL</div><div class='head'>diff --git a/arch/arm/mach-clps711x/Makefile b/arch/arm/mach-clps711x/Makefile<br/>index 4a197315f0cf..f2f0256232e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-clps711x/Makefile</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> # Object file lists.</div><div class='ctx'> </div><div class='del'>-obj-y			:= irq.o mm.o time.o</div><div class='add'>+obj-y			:= common.o</div><div class='ctx'> obj-m			:=</div><div class='ctx'> obj-n			:=</div><div class='ctx'> obj-			:=</div><div class='head'>diff --git a/arch/arm/mach-clps711x/autcpu12.c b/arch/arm/mach-clps711x/autcpu12.c<br/>index 0276091b7f86..3fb79a1d0bde 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/autcpu12.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/autcpu12.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/autcpu12.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-clps711x/autcpu12.c</a></div><div class='hunk'>@@ -68,5 +68,6 @@ MACHINE_START(AUTCPU12, "autronix autcpu12")</div><div class='ctx'> 	.map_io		= autcpu12_map_io,</div><div class='ctx'> 	.init_irq	= clps711x_init_irq,</div><div class='ctx'> 	.timer		= &amp;clps711x_timer,</div><div class='add'>+	.restart	= clps711x_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-clps711x/cdb89712.c b/arch/arm/mach-clps711x/cdb89712.c<br/>index 25b3bfd0e85a..c314f49d6ef6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/cdb89712.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/cdb89712.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/cdb89712.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-clps711x/cdb89712.c</a></div><div class='hunk'>@@ -59,4 +59,5 @@ MACHINE_START(CDB89712, "Cirrus-CDB89712")</div><div class='ctx'> 	.map_io		= cdb89712_map_io,</div><div class='ctx'> 	.init_irq	= clps711x_init_irq,</div><div class='ctx'> 	.timer		= &amp;clps711x_timer,</div><div class='add'>+	.restart	= clps711x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-clps711x/ceiva.c b/arch/arm/mach-clps711x/ceiva.c<br/>index 1df9ec67aa92..a70147e347ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/ceiva.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/ceiva.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/ceiva.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-clps711x/ceiva.c</a></div><div class='hunk'>@@ -60,4 +60,5 @@ MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame")</div><div class='ctx'> 	.map_io		= ceiva_map_io,</div><div class='ctx'> 	.init_irq	= clps711x_init_irq,</div><div class='ctx'> 	.timer		= &amp;clps711x_timer,</div><div class='add'>+	.restart	= clps711x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-clps711x/clep7312.c b/arch/arm/mach-clps711x/clep7312.c<br/>index 80496c09ac59..dbc7842639dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/clep7312.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/clep7312.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/clep7312.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-clps711x/clep7312.c</a></div><div class='hunk'>@@ -41,5 +41,6 @@ MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")</div><div class='ctx'> 	.map_io		= clps711x_map_io,</div><div class='ctx'> 	.init_irq	= clps711x_init_irq,</div><div class='ctx'> 	.timer		= &amp;clps711x_timer,</div><div class='add'>+	.restart	= clps711x_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-clps711x/irq.c b/arch/arm/mach-clps711x/common.c<br/>index c2eceee645e3..ab1711b9b4d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-clps711x/common.c</a></div><div class='hunk'>@@ -1,7 +1,9 @@</div><div class='ctx'> /*</div><div class='del'>- *  linux/arch/arm/mach-clps711x/irq.c</div><div class='add'>+ *  linux/arch/arm/mach-clps711x/core.c</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (C) 2000 Deep Blue Solutions Ltd.</div><div class='add'>+ *  Core support for the CLPS711x-based machines.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2001,2011 Deep Blue Solutions Ltd</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'>@@ -17,16 +19,42 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/timex.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+#include &lt;asm/sizes.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;asm/leds.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/clps7111.h&gt;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This maps the generic CLPS711x registers</div><div class='add'>+ */</div><div class='add'>+static struct map_desc clps711x_io_desc[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.virtual	= CLPS7111_VIRT_BASE,</div><div class='add'>+		.pfn		= __phys_to_pfn(CLPS7111_PHYS_BASE),</div><div class='add'>+		.length		= SZ_1M,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init clps711x_map_io(void)</div><div class='add'>+{</div><div class='add'>+	iotable_init(clps711x_io_desc, ARRAY_SIZE(clps711x_io_desc));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void int1_mask(struct irq_data *d)</div><div class='ctx'> {</div><div class='ctx'> 	u32 intmr1;</div><div class='hunk'>@@ -112,15 +140,15 @@ void __init clps711x_init_irq(void)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NR_IRQS; i++) {</div><div class='ctx'> 	        if (INT1_IRQS &amp; (1 &lt;&lt; i)) {</div><div class='del'>-	        	irq_set_chip_and_handler(i, &amp;int1_chip,</div><div class='add'>+			irq_set_chip_and_handler(i, &amp;int1_chip,</div><div class='ctx'> 						 handle_level_irq);</div><div class='del'>-	        	set_irq_flags(i, IRQF_VALID | IRQF_PROBE);</div><div class='add'>+			set_irq_flags(i, IRQF_VALID | IRQF_PROBE);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (INT2_IRQS &amp; (1 &lt;&lt; i)) {</div><div class='ctx'> 			irq_set_chip_and_handler(i, &amp;int2_chip,</div><div class='ctx'> 						 handle_level_irq);</div><div class='ctx'> 			set_irq_flags(i, IRQF_VALID | IRQF_PROBE);</div><div class='del'>-		}			</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -141,3 +169,59 @@ void __init clps711x_init_irq(void)</div><div class='ctx'> 	clps_writel(0, SYNCIO);</div><div class='ctx'> 	clps_writel(0, KBDEOI);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * gettimeoffset() returns time since last timer tick, in usecs.</div><div class='add'>+ *</div><div class='add'>+ * 'LATCH' is hwclock ticks (see CLOCK_TICK_RATE in timex.h) per jiffy.</div><div class='add'>+ * 'tick' is usecs per jiffy.</div><div class='add'>+ */</div><div class='add'>+static unsigned long clps711x_gettimeoffset(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long hwticks;</div><div class='add'>+	hwticks = LATCH - (clps_readl(TC2D) &amp; 0xffff);	/* since last underflow */</div><div class='add'>+	return (hwticks * (tick_nsec / 1000)) / LATCH;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IRQ handler for the timer</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t p720t_timer_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	timer_tick();</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irqaction clps711x_timer_irq = {</div><div class='add'>+	.name		= "CLPS711x Timer Tick",</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,</div><div class='add'>+	.handler	= p720t_timer_interrupt,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init clps711x_timer_init(void)</div><div class='add'>+{</div><div class='add'>+	struct timespec tv;</div><div class='add'>+	unsigned int syscon;</div><div class='add'>+</div><div class='add'>+	syscon = clps_readl(SYSCON1);</div><div class='add'>+	syscon |= SYSCON1_TC2S | SYSCON1_TC2M;</div><div class='add'>+	clps_writel(syscon, SYSCON1);</div><div class='add'>+</div><div class='add'>+	clps_writel(LATCH-1, TC2D); /* 512kHz / 100Hz - 1 */</div><div class='add'>+</div><div class='add'>+	setup_irq(IRQ_TC2OI, &amp;clps711x_timer_irq);</div><div class='add'>+</div><div class='add'>+	tv.tv_nsec = 0;</div><div class='add'>+	tv.tv_sec = clps_readl(RTCDR);</div><div class='add'>+	do_settimeofday(&amp;tv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sys_timer clps711x_timer = {</div><div class='add'>+	.init		= clps711x_timer_init,</div><div class='add'>+	.offset		= clps711x_gettimeoffset,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void clps711x_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	soft_restart(0);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-clps711x/common.h b/arch/arm/mach-clps711x/common.h<br/>index 2b8b801f1dc3..fc0f0650dcb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-clps711x/common.h</a></div><div class='hunk'>@@ -9,3 +9,4 @@ struct sys_timer;</div><div class='ctx'> extern void clps711x_map_io(void);</div><div class='ctx'> extern void clps711x_init_irq(void);</div><div class='ctx'> extern struct sys_timer clps711x_timer;</div><div class='add'>+extern void clps711x_restart(char mode, const char *cmd);</div><div class='head'>diff --git a/arch/arm/mach-clps711x/edb7211-arch.c b/arch/arm/mach-clps711x/edb7211-arch.c<br/>index 9721f6111dc0..5fad0b4f40ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/edb7211-arch.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/edb7211-arch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/edb7211-arch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-clps711x/edb7211-arch.c</a></div><div class='hunk'>@@ -62,4 +62,5 @@ MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")</div><div class='ctx'> 	.reserve	= edb7211_reserve,</div><div class='ctx'> 	.init_irq	= clps711x_init_irq,</div><div class='ctx'> 	.timer		= &amp;clps711x_timer,</div><div class='add'>+	.restart	= clps711x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c<br/>index d99256687298..3a3f0b702cb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/fortunet.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/fortunet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/fortunet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-clps711x/fortunet.c</a></div><div class='hunk'>@@ -78,4 +78,5 @@ MACHINE_START(FORTUNET, "ARM-FortuNet")</div><div class='ctx'> 	.map_io		= clps711x_map_io,</div><div class='ctx'> 	.init_irq	= clps711x_init_irq,</div><div class='ctx'> 	.timer		= &amp;clps711x_timer,</div><div class='add'>+	.restart	= clps711x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-clps711x/include/mach/system.h b/arch/arm/mach-clps711x/include/mach/system.h<br/>index f916cd7a477d..23d6ef8c84da 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-clps711x/include/mach/system.h</a></div><div class='hunk'>@@ -32,9 +32,4 @@ static inline void arch_idle(void)</div><div class='ctx'> 	mov	r0, r0");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	cpu_reset(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-clps711x/include/mach/vmalloc.h b/arch/arm/mach-clps711x/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 467b96137e47..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  arch/arm/mach-clps711x/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2000 Deep Blue Solutions Ltd.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; 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'>-#define VMALLOC_END       0xd0000000UL</div><div class='head'>diff --git a/arch/arm/mach-clps711x/mm.c b/arch/arm/mach-clps711x/mm.c<br/>deleted file mode 100644<br/>index 986592176767..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/mm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/mm.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,48 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  linux/arch/arm/mach-clps711x/mm.c</div><div class='del'>- *</div><div class='del'>- *  Generic MM setup for the CLPS711x-based machines.</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2001 Deep Blue Solutions Ltd</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; 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'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/sizes.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/hardware/clps7111.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This maps the generic CLPS711x registers</div><div class='del'>- */</div><div class='del'>-static struct map_desc clps711x_io_desc[] __initdata = {</div><div class='del'>-	{</div><div class='del'>-		.virtual	= CLPS7111_VIRT_BASE,</div><div class='del'>-		.pfn		= __phys_to_pfn(CLPS7111_PHYS_BASE),</div><div class='del'>-		.length		= SZ_1M,</div><div class='del'>-		.type		= MT_DEVICE</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __init clps711x_map_io(void)</div><div class='del'>-{</div><div class='del'>-	iotable_init(clps711x_io_desc, ARRAY_SIZE(clps711x_io_desc));</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-clps711x/p720t.c b/arch/arm/mach-clps711x/p720t.c<br/>index 6ecea95f38b2..42ee8f33eafb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/p720t.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/p720t.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/p720t.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-clps711x/p720t.c</a></div><div class='hunk'>@@ -93,6 +93,7 @@ MACHINE_START(P720T, "ARM-Prospector720T")</div><div class='ctx'> 	.map_io		= p720t_map_io,</div><div class='ctx'> 	.init_irq	= clps711x_init_irq,</div><div class='ctx'> 	.timer		= &amp;clps711x_timer,</div><div class='add'>+	.restart	= clps711x_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> static int p720t_hw_init(void)</div><div class='head'>diff --git a/arch/arm/mach-clps711x/time.c b/arch/arm/mach-clps711x/time.c<br/>deleted file mode 100644<br/>index d581ef0bcd24..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-clps711x/time.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,84 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  linux/arch/arm/mach-clps711x/time.c</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2001 Deep Blue Solutions 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='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'>-#include &lt;linux/timex.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/leds.h&gt;</div><div class='del'>-#include &lt;asm/hardware/clps7111.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach/time.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * gettimeoffset() returns time since last timer tick, in usecs.</div><div class='del'>- *</div><div class='del'>- * 'LATCH' is hwclock ticks (see CLOCK_TICK_RATE in timex.h) per jiffy.</div><div class='del'>- * 'tick' is usecs per jiffy.</div><div class='del'>- */</div><div class='del'>-static unsigned long clps711x_gettimeoffset(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long hwticks;</div><div class='del'>-	hwticks = LATCH - (clps_readl(TC2D) &amp; 0xffff);	/* since last underflow */</div><div class='del'>-	return (hwticks * (tick_nsec / 1000)) / LATCH;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * IRQ handler for the timer</div><div class='del'>- */</div><div class='del'>-static irqreturn_t</div><div class='del'>-p720t_timer_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	timer_tick();</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct irqaction clps711x_timer_irq = {</div><div class='del'>-	.name		= "CLPS711x Timer Tick",</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,</div><div class='del'>-	.handler	= p720t_timer_interrupt,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __init clps711x_timer_init(void)</div><div class='del'>-{</div><div class='del'>-	struct timespec tv;</div><div class='del'>-	unsigned int syscon;</div><div class='del'>-</div><div class='del'>-	syscon = clps_readl(SYSCON1);</div><div class='del'>-	syscon |= SYSCON1_TC2S | SYSCON1_TC2M;</div><div class='del'>-	clps_writel(syscon, SYSCON1);</div><div class='del'>-</div><div class='del'>-	clps_writel(LATCH-1, TC2D); /* 512kHz / 100Hz - 1 */</div><div class='del'>-</div><div class='del'>-	setup_irq(IRQ_TC2OI, &amp;clps711x_timer_irq);</div><div class='del'>-</div><div class='del'>-	tv.tv_nsec = 0;</div><div class='del'>-	tv.tv_sec = clps_readl(RTCDR);</div><div class='del'>-	do_settimeofday(&amp;tv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct sys_timer clps711x_timer = {</div><div class='del'>-	.init		= clps711x_timer_init,</div><div class='del'>-	.offset		= clps711x_gettimeoffset,</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/mach-cns3xxx/cns3420vb.c b/arch/arm/mach-cns3xxx/cns3420vb.c<br/>index 55f7b4b08ab9..2c5fb4c7e509 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-cns3xxx/cns3420vb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-cns3xxx/cns3420vb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-cns3xxx/cns3420vb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-cns3xxx/cns3420vb.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='hunk'>@@ -201,5 +202,7 @@ MACHINE_START(CNS3420VB, "Cavium Networks CNS3420 Validation Board")</div><div class='ctx'> 	.map_io		= cns3420_map_io,</div><div class='ctx'> 	.init_irq	= cns3xxx_init_irq,</div><div class='ctx'> 	.timer		= &amp;cns3xxx_timer,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= cns3420_init,</div><div class='add'>+	.restart	= cns3xxx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-cns3xxx/core.h b/arch/arm/mach-cns3xxx/core.h<br/>index fcd225343c61..4894b8c17151 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-cns3xxx/core.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-cns3xxx/core.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-cns3xxx/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-cns3xxx/core.h</a></div><div class='hunk'>@@ -22,5 +22,6 @@ static inline void cns3xxx_l2x0_init(void) {}</div><div class='ctx'> void __init cns3xxx_map_io(void);</div><div class='ctx'> void __init cns3xxx_init_irq(void);</div><div class='ctx'> void cns3xxx_power_off(void);</div><div class='add'>+void cns3xxx_restart(char, const char *);</div><div class='ctx'> </div><div class='ctx'> #endif /* __CNS3XXX_CORE_H */</div><div class='head'>diff --git a/arch/arm/mach-cns3xxx/include/mach/entry-macro.S b/arch/arm/mach-cns3xxx/include/mach/entry-macro.S<br/>index d87bfc397d39..01c57df5f716 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-cns3xxx/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-cns3xxx/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-cns3xxx/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-cns3xxx/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -8,8 +8,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware/entry-macro-gic.S&gt;</div><div class='del'>-</div><div class='ctx'> 		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-cns3xxx/include/mach/system.h b/arch/arm/mach-cns3xxx/include/mach/system.h<br/>index 4f16c9b79f78..9e56b7dc133a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-cns3xxx/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-cns3xxx/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-cns3xxx/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-cns3xxx/include/mach/system.h</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #ifndef __MACH_SYSTEM_H</div><div class='ctx'> #define __MACH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/proc-fns.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_idle(void)</div><div class='hunk'>@@ -23,6 +22,4 @@ static inline void arch_idle(void)</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void arch_reset(char mode, const char *cmd);</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-cns3xxx/include/mach/vmalloc.h b/arch/arm/mach-cns3xxx/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 1dd231d2f772..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-cns3xxx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-cns3xxx/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000 Russell King.</div><div class='del'>- * Copyright 2003 ARM Limited</div><div class='del'>- * Copyright 2008 Cavium Networks</div><div class='del'>- *</div><div class='del'>- * This file 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'>-#define VMALLOC_END		0xd8000000UL</div><div class='head'>diff --git a/arch/arm/mach-cns3xxx/pcie.c b/arch/arm/mach-cns3xxx/pcie.c<br/>index 0f8fca48a5ed..e159d69967c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-cns3xxx/pcie.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-cns3xxx/pcie.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-cns3xxx/pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-cns3xxx/pcie.c</a></div><div class='hunk'>@@ -151,13 +151,12 @@ static int cns3xxx_pci_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	struct cns3xxx_pcie *cnspci = sysdata_to_cnspci(sys);</div><div class='ctx'> 	struct resource *res_io = &amp;cnspci-&gt;res_io;</div><div class='ctx'> 	struct resource *res_mem = &amp;cnspci-&gt;res_mem;</div><div class='del'>-	struct resource **sysres = sys-&gt;resource;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(request_resource(&amp;iomem_resource, res_io) ||</div><div class='ctx'> 	       request_resource(&amp;iomem_resource, res_mem));</div><div class='ctx'> </div><div class='del'>-	sysres[0] = res_io;</div><div class='del'>-	sysres[1] = res_mem;</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, res_io);</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, res_mem);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -169,7 +168,8 @@ static struct pci_ops cns3xxx_pcie_ops = {</div><div class='ctx'> </div><div class='ctx'> static struct pci_bus *cns3xxx_pci_scan_bus(int nr, struct pci_sys_data *sys)</div><div class='ctx'> {</div><div class='del'>-	return pci_scan_bus(sys-&gt;busnr, &amp;cns3xxx_pcie_ops, sys);</div><div class='add'>+	return pci_scan_root_bus(NULL, sys-&gt;busnr, &amp;cns3xxx_pcie_ops, sys,</div><div class='add'>+				 &amp;sys-&gt;resources);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cns3xxx_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)</div><div class='head'>diff --git a/arch/arm/mach-cns3xxx/pm.c b/arch/arm/mach-cns3xxx/pm.c<br/>index 0c04678615ce..36458080332a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-cns3xxx/pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-cns3xxx/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-cns3xxx/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-cns3xxx/pm.c</a></div><div class='hunk'>@@ -11,9 +11,9 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;mach/system.h&gt;</div><div class='ctx'> #include &lt;mach/cns3xxx.h&gt;</div><div class='ctx'> #include &lt;mach/pm.h&gt;</div><div class='add'>+#include "core.h"</div><div class='ctx'> </div><div class='ctx'> void cns3xxx_pwr_clk_en(unsigned int block)</div><div class='ctx'> {</div><div class='hunk'>@@ -89,7 +89,7 @@ void cns3xxx_pwr_soft_rst(unsigned int block)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(cns3xxx_pwr_soft_rst);</div><div class='ctx'> </div><div class='del'>-void arch_reset(char mode, const char *cmd)</div><div class='add'>+void cns3xxx_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * To reset, we hit the on-board reset register</div><div class='head'>diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile<br/>index 495e31306fc0..2db78bd5c835 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/Makefile</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> # Common objects</div><div class='del'>-obj-y 			:= time.o clock.o serial.o io.o psc.o \</div><div class='add'>+obj-y 			:= time.o clock.o serial.o psc.o \</div><div class='ctx'> 			   dma.o usb.o common.o sram.o aemif.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_DAVINCI_MUX)		+= mux.o</div><div class='head'>diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c<br/>index 11c3db985285..dc1afe5be20c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-da830-evm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-da830-evm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-da830-evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/board-da830-evm.c</a></div><div class='hunk'>@@ -682,4 +682,5 @@ MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137/AM17x EVM")</div><div class='ctx'> 	.timer		= &amp;davinci_timer,</div><div class='ctx'> 	.init_machine	= da830_evm_init,</div><div class='ctx'> 	.dma_zone_size	= SZ_128M,</div><div class='add'>+	.restart	= da8xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c<br/>index 6659a90dbcad..6b22b543a83f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-da850-evm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-da850-evm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-da850-evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/board-da850-evm.c</a></div><div class='hunk'>@@ -127,7 +127,7 @@ static void da850_evm_m25p80_notify_add(struct mtd_info *mtd)</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(mtd-&gt;name, "MAC-Address")) {</div><div class='del'>-		mtd-&gt;read(mtd, 0, ETH_ALEN, &amp;retlen, mac_addr);</div><div class='add'>+		mtd_read(mtd, 0, ETH_ALEN, &amp;retlen, mac_addr);</div><div class='ctx'> 		if (retlen == ETH_ALEN)</div><div class='ctx'> 			pr_info("Read MAC addr from SPI Flash: %pM\n",</div><div class='ctx'> 				mac_addr);</div><div class='hunk'>@@ -1411,4 +1411,5 @@ MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM")</div><div class='ctx'> 	.timer		= &amp;davinci_timer,</div><div class='ctx'> 	.init_machine	= da850_evm_init,</div><div class='ctx'> 	.dma_zone_size	= SZ_128M,</div><div class='add'>+	.restart	= da8xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c<br/>index 4e0e707c313d..275341f159fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-dm355-evm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-dm355-evm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-dm355-evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/board-dm355-evm.c</a></div><div class='hunk'>@@ -357,4 +357,5 @@ MACHINE_START(DAVINCI_DM355_EVM, "DaVinci DM355 EVM")</div><div class='ctx'> 	.timer	      = &amp;davinci_timer,</div><div class='ctx'> 	.init_machine = dm355_evm_init,</div><div class='ctx'> 	.dma_zone_size	= SZ_128M,</div><div class='add'>+	.restart	= davinci_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c<br/>index ff2d2413279a..e99db28181ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-dm355-leopard.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-dm355-leopard.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-dm355-leopard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/board-dm355-leopard.c</a></div><div class='hunk'>@@ -276,4 +276,5 @@ MACHINE_START(DM355_LEOPARD, "DaVinci DM355 leopard")</div><div class='ctx'> 	.timer	      = &amp;davinci_timer,</div><div class='ctx'> 	.init_machine = dm355_leopard_init,</div><div class='ctx'> 	.dma_zone_size	= SZ_128M,</div><div class='add'>+	.restart	= davinci_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c<br/>index 46e1f4173b97..346e1de2f5a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-dm365-evm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-dm365-evm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-dm365-evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/board-dm365-evm.c</a></div><div class='hunk'>@@ -618,5 +618,6 @@ MACHINE_START(DAVINCI_DM365_EVM, "DaVinci DM365 EVM")</div><div class='ctx'> 	.timer		= &amp;davinci_timer,</div><div class='ctx'> 	.init_machine	= dm365_evm_init,</div><div class='ctx'> 	.dma_zone_size	= SZ_128M,</div><div class='add'>+	.restart	= davinci_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c<br/>index 0cf8abf78d33..a64b49cfedca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-dm644x-evm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-dm644x-evm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-dm644x-evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/board-dm644x-evm.c</a></div><div class='hunk'>@@ -719,4 +719,5 @@ MACHINE_START(DAVINCI_EVM, "DaVinci DM644x EVM")</div><div class='ctx'> 	.timer	      = &amp;davinci_timer,</div><div class='ctx'> 	.init_machine = davinci_evm_init,</div><div class='ctx'> 	.dma_zone_size	= SZ_128M,</div><div class='add'>+	.restart	= davinci_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c<br/>index 635bf7740157..64017558860b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-dm646x-evm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-dm646x-evm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-dm646x-evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/board-dm646x-evm.c</a></div><div class='hunk'>@@ -799,6 +799,7 @@ MACHINE_START(DAVINCI_DM6467_EVM, "DaVinci DM646x EVM")</div><div class='ctx'> 	.timer        = &amp;davinci_timer,</div><div class='ctx'> 	.init_machine = evm_init,</div><div class='ctx'> 	.dma_zone_size	= SZ_128M,</div><div class='add'>+	.restart	= davinci_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(DAVINCI_DM6467TEVM, "DaVinci DM6467T EVM")</div><div class='hunk'>@@ -808,5 +809,6 @@ MACHINE_START(DAVINCI_DM6467TEVM, "DaVinci DM6467T EVM")</div><div class='ctx'> 	.timer        = &amp;davinci_timer,</div><div class='ctx'> 	.init_machine = evm_init,</div><div class='ctx'> 	.dma_zone_size	= SZ_128M,</div><div class='add'>+	.restart	= davinci_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c<br/>index 3cfff555e8f2..672d820e2aa4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-mityomapl138.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-mityomapl138.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-mityomapl138.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/board-mityomapl138.c</a></div><div class='hunk'>@@ -573,4 +573,5 @@ MACHINE_START(MITYOMAPL138, "MityDSP-L138/MityARM-1808")</div><div class='ctx'> 	.timer		= &amp;davinci_timer,</div><div class='ctx'> 	.init_machine	= mityomapl138_init,</div><div class='ctx'> 	.dma_zone_size	= SZ_128M,</div><div class='add'>+	.restart	= da8xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c<br/>index e5f231aefee4..6c4a16415d47 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-neuros-osd2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-neuros-osd2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-neuros-osd2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/board-neuros-osd2.c</a></div><div class='hunk'>@@ -278,4 +278,5 @@ MACHINE_START(NEUROS_OSD2, "Neuros OSD2")</div><div class='ctx'> 	.timer		= &amp;davinci_timer,</div><div class='ctx'> 	.init_machine = davinci_ntosd2_init,</div><div class='ctx'> 	.dma_zone_size	= SZ_128M,</div><div class='add'>+	.restart	= davinci_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c<br/>index c6701e4a795c..e7c0c7c53493 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-omapl138-hawk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-omapl138-hawk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-omapl138-hawk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/board-omapl138-hawk.c</a></div><div class='hunk'>@@ -344,4 +344,5 @@ MACHINE_START(OMAPL138_HAWKBOARD, "AM18x/OMAP-L138 Hawkboard")</div><div class='ctx'> 	.timer		= &amp;davinci_timer,</div><div class='ctx'> 	.init_machine	= omapl138_hawk_init,</div><div class='ctx'> 	.dma_zone_size	= SZ_128M,</div><div class='add'>+	.restart	= da8xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c<br/>index 5dd4da9d2308..0b136a831c59 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-sffsdr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-sffsdr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-sffsdr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/board-sffsdr.c</a></div><div class='hunk'>@@ -157,4 +157,5 @@ MACHINE_START(SFFSDR, "Lyrtech SFFSDR")</div><div class='ctx'> 	.timer	      = &amp;davinci_timer,</div><div class='ctx'> 	.init_machine = davinci_sffsdr_init,</div><div class='ctx'> 	.dma_zone_size	= SZ_128M,</div><div class='add'>+	.restart	= davinci_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c b/arch/arm/mach-davinci/board-tnetv107x-evm.c<br/>index f69e40a29e02..5f14e30b00d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-tnetv107x-evm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/board-tnetv107x-evm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/board-tnetv107x-evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/board-tnetv107x-evm.c</a></div><div class='hunk'>@@ -283,4 +283,5 @@ MACHINE_START(TNETV107X, "TNETV107X EVM")</div><div class='ctx'> 	.timer		= &amp;davinci_timer,</div><div class='ctx'> 	.init_machine	= tnetv107x_evm_board_init,</div><div class='ctx'> 	.dma_zone_size	= SZ_128M,</div><div class='add'>+	.restart	= tnetv107x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c<br/>index 00861139101d..008772e3b843 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/clock.c</a></div><div class='hunk'>@@ -31,19 +31,12 @@ static LIST_HEAD(clocks);</div><div class='ctx'> static DEFINE_MUTEX(clocks_mutex);</div><div class='ctx'> static DEFINE_SPINLOCK(clockfw_lock);</div><div class='ctx'> </div><div class='del'>-static unsigned psc_domain(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	return (clk-&gt;flags &amp; PSC_DSP)</div><div class='del'>-		? DAVINCI_GPSC_DSPDOMAIN</div><div class='del'>-		: DAVINCI_GPSC_ARMDOMAIN;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __clk_enable(struct clk *clk)</div><div class='ctx'> {</div><div class='ctx'> 	if (clk-&gt;parent)</div><div class='ctx'> 		__clk_enable(clk-&gt;parent);</div><div class='ctx'> 	if (clk-&gt;usecount++ == 0 &amp;&amp; (clk-&gt;flags &amp; CLK_PSC))</div><div class='del'>-		davinci_psc_config(psc_domain(clk), clk-&gt;gpsc, clk-&gt;lpsc,</div><div class='add'>+		davinci_psc_config(clk-&gt;domain, clk-&gt;gpsc, clk-&gt;lpsc,</div><div class='ctx'> 				true, clk-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -53,7 +46,7 @@ static void __clk_disable(struct clk *clk)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (--clk-&gt;usecount == 0 &amp;&amp; !(clk-&gt;flags &amp; CLK_PLL) &amp;&amp;</div><div class='ctx'> 	    (clk-&gt;flags &amp; CLK_PSC))</div><div class='del'>-		davinci_psc_config(psc_domain(clk), clk-&gt;gpsc, clk-&gt;lpsc,</div><div class='add'>+		davinci_psc_config(clk-&gt;domain, clk-&gt;gpsc, clk-&gt;lpsc,</div><div class='ctx'> 				false, clk-&gt;flags);</div><div class='ctx'> 	if (clk-&gt;parent)</div><div class='ctx'> 		__clk_disable(clk-&gt;parent);</div><div class='hunk'>@@ -237,7 +230,7 @@ static int __init clk_disable_unused(void)</div><div class='ctx'> </div><div class='ctx'> 		pr_debug("Clocks: disable unused %s\n", ck-&gt;name);</div><div class='ctx'> </div><div class='del'>-		davinci_psc_config(psc_domain(ck), ck-&gt;gpsc, ck-&gt;lpsc,</div><div class='add'>+		davinci_psc_config(ck-&gt;domain, ck-&gt;gpsc, ck-&gt;lpsc,</div><div class='ctx'> 				false, ck-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irq(&amp;clockfw_lock);</div><div class='head'>diff --git a/arch/arm/mach-davinci/clock.h b/arch/arm/mach-davinci/clock.h<br/>index a705f367a84d..46f0f1bf1a4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/clock.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/clock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/clock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/clock.h</a></div><div class='hunk'>@@ -93,6 +93,7 @@ struct clk {</div><div class='ctx'> 	u8			usecount;</div><div class='ctx'> 	u8			lpsc;</div><div class='ctx'> 	u8			gpsc;</div><div class='add'>+	u8			domain;</div><div class='ctx'> 	u32			flags;</div><div class='ctx'> 	struct clk              *parent;</div><div class='ctx'> 	struct list_head	children; 	/* list of children */</div><div class='hunk'>@@ -107,11 +108,10 @@ struct clk {</div><div class='ctx'> /* Clock flags: SoC-specific flags start at BIT(16) */</div><div class='ctx'> #define ALWAYS_ENABLED		BIT(1)</div><div class='ctx'> #define CLK_PSC			BIT(2)</div><div class='del'>-#define PSC_DSP			BIT(3) /* PSC uses DSP domain, not ARM */</div><div class='del'>-#define CLK_PLL			BIT(4) /* PLL-derived clock */</div><div class='del'>-#define PRE_PLL			BIT(5) /* source is before PLL mult/div */</div><div class='del'>-#define PSC_SWRSTDISABLE	BIT(6) /* Disable state is SwRstDisable */</div><div class='del'>-#define PSC_FORCE		BIT(7) /* Force module state transtition */</div><div class='add'>+#define CLK_PLL			BIT(3) /* PLL-derived clock */</div><div class='add'>+#define PRE_PLL			BIT(4) /* source is before PLL mult/div */</div><div class='add'>+#define PSC_SWRSTDISABLE	BIT(5) /* Disable state is SwRstDisable */</div><div class='add'>+#define PSC_FORCE		BIT(6) /* Force module state transtition */</div><div class='ctx'> </div><div class='ctx'> #define CLK(dev, con, ck) 	\</div><div class='ctx'> 	{			\</div><div class='head'>diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c<br/>index 865ffe5899ac..cb9b2e47510c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/common.c</a></div><div class='hunk'>@@ -97,9 +97,6 @@ void __init davinci_common_init(struct davinci_soc_info *soc_info)</div><div class='ctx'> 	local_flush_tlb_all();</div><div class='ctx'> 	flush_cache_all();</div><div class='ctx'> </div><div class='del'>-	if (!davinci_soc_info.reset)</div><div class='del'>-		davinci_soc_info.reset = davinci_watchdog_reset;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We want to check CPU revision early for cpu_is_xxxx() macros.</div><div class='ctx'> 	 * IO space mapping must be initialized before we can do that.</div><div class='head'>diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c<br/>index a6bf5dcaef13..deee5c2da754 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/da830.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/da830.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/da830.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/da830.c</a></div><div class='hunk'>@@ -1201,7 +1201,6 @@ static struct davinci_soc_info davinci_soc_info_da830 = {</div><div class='ctx'> 	.gpio_irq		= IRQ_DA8XX_GPIO0,</div><div class='ctx'> 	.serial_dev		= &amp;da8xx_serial_device,</div><div class='ctx'> 	.emac_pdata		= &amp;da8xx_emac_pdata,</div><div class='del'>-	.reset_device		= &amp;da8xx_wdt_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init da830_init(void)</div><div class='head'>diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c<br/>index b047f8702278..0ed7fdb64efb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/da850.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/da850.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/da850.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/da850.c</a></div><div class='hunk'>@@ -1121,7 +1121,6 @@ static struct davinci_soc_info davinci_soc_info_da850 = {</div><div class='ctx'> 	.emac_pdata		= &amp;da8xx_emac_pdata,</div><div class='ctx'> 	.sram_dma		= DA8XX_ARM_RAM_BASE,</div><div class='ctx'> 	.sram_len		= SZ_8K,</div><div class='del'>-	.reset_device		= &amp;da8xx_wdt_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init da850_init(void)</div><div class='head'>diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c<br/>index 68def7188868..42dbf3dc11ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/devices-da8xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/devices-da8xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/devices-da8xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/devices-da8xx.c</a></div><div class='hunk'>@@ -363,6 +363,11 @@ struct platform_device da8xx_wdt_device = {</div><div class='ctx'> 	.resource	= da8xx_watchdog_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void da8xx_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	davinci_watchdog_reset(&amp;da8xx_wdt_device);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int __init da8xx_register_watchdog(void)</div><div class='ctx'> {</div><div class='ctx'> 	return platform_device_register(&amp;da8xx_wdt_device);</div><div class='head'>diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c<br/>index 806a2f02b980..50c0156b4262 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/devices.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/devices.c</a></div><div class='hunk'>@@ -291,6 +291,11 @@ struct platform_device davinci_wdt_device = {</div><div class='ctx'> 	.resource	= wdt_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void davinci_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	davinci_watchdog_reset(&amp;davinci_wdt_device);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void davinci_init_wdt(void)</div><div class='ctx'> {</div><div class='ctx'> 	platform_device_register(&amp;davinci_wdt_device);</div><div class='head'>diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c<br/>index fe520d4167a2..19667cfc5de0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/dm355.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/dm355.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/dm355.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/dm355.c</a></div><div class='hunk'>@@ -853,7 +853,6 @@ static struct davinci_soc_info davinci_soc_info_dm355 = {</div><div class='ctx'> 	.serial_dev		= &amp;dm355_serial_device,</div><div class='ctx'> 	.sram_dma		= 0x00010000,</div><div class='ctx'> 	.sram_len		= SZ_32K,</div><div class='del'>-	.reset_device		= &amp;davinci_wdt_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init dm355_init_asp1(u32 evt_enable, struct snd_platform_data *pdata)</div><div class='head'>diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c<br/>index 679e168dce34..f15b435cc655 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/dm365.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/dm365.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/dm365.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/dm365.c</a></div><div class='hunk'>@@ -1083,7 +1083,6 @@ static struct davinci_soc_info davinci_soc_info_dm365 = {</div><div class='ctx'> 	.emac_pdata		= &amp;dm365_emac_pdata,</div><div class='ctx'> 	.sram_dma		= 0x00010000,</div><div class='ctx'> 	.sram_len		= SZ_32K,</div><div class='del'>-	.reset_device		= &amp;davinci_wdt_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init dm365_init_asp(struct snd_platform_data *pdata)</div><div class='head'>diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c<br/>index 3470983aa343..43a48ee1917b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/dm644x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/dm644x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/dm644x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/dm644x.c</a></div><div class='hunk'>@@ -130,7 +130,7 @@ static struct clk dsp_clk = {</div><div class='ctx'> 	.name = "dsp",</div><div class='ctx'> 	.parent = &amp;pll1_sysclk1,</div><div class='ctx'> 	.lpsc = DAVINCI_LPSC_GEM,</div><div class='del'>-	.flags = PSC_DSP,</div><div class='add'>+	.domain = DAVINCI_GPSC_DSPDOMAIN,</div><div class='ctx'> 	.usecount = 1,			/* REVISIT how to disable? */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -145,7 +145,7 @@ static struct clk vicp_clk = {</div><div class='ctx'> 	.name = "vicp",</div><div class='ctx'> 	.parent = &amp;pll1_sysclk2,</div><div class='ctx'> 	.lpsc = DAVINCI_LPSC_IMCOP,</div><div class='del'>-	.flags = PSC_DSP,</div><div class='add'>+	.domain = DAVINCI_GPSC_DSPDOMAIN,</div><div class='ctx'> 	.usecount = 1,			/* REVISIT how to disable? */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -767,7 +767,6 @@ static struct davinci_soc_info davinci_soc_info_dm644x = {</div><div class='ctx'> 	.emac_pdata		= &amp;dm644x_emac_pdata,</div><div class='ctx'> 	.sram_dma		= 0x00008000,</div><div class='ctx'> 	.sram_len		= SZ_16K,</div><div class='del'>-	.reset_device		= &amp;davinci_wdt_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init dm644x_init_asp(struct snd_platform_data *pdata)</div><div class='head'>diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c<br/>index af27c130595f..00f774394b16 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/dm646x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/dm646x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/dm646x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/dm646x.c</a></div><div class='hunk'>@@ -854,7 +854,6 @@ static struct davinci_soc_info davinci_soc_info_dm646x = {</div><div class='ctx'> 	.emac_pdata		= &amp;dm646x_emac_pdata,</div><div class='ctx'> 	.sram_dma		= 0x10010000,</div><div class='ctx'> 	.sram_len		= SZ_32K,</div><div class='del'>-	.reset_device		= &amp;davinci_wdt_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init dm646x_init_mcasp0(struct snd_platform_data *pdata)</div><div class='head'>diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h<br/>index a57cba21e21e..5cd39a4e0c96 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/include/mach/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/include/mach/common.h</a></div><div class='hunk'>@@ -77,14 +77,13 @@ struct davinci_soc_info {</div><div class='ctx'> 	struct emac_platform_data	*emac_pdata;</div><div class='ctx'> 	dma_addr_t			sram_dma;</div><div class='ctx'> 	unsigned			sram_len;</div><div class='del'>-	struct platform_device		*reset_device;</div><div class='del'>-	void				(*reset)(struct platform_device *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct davinci_soc_info davinci_soc_info;</div><div class='ctx'> </div><div class='ctx'> extern void davinci_common_init(struct davinci_soc_info *soc_info);</div><div class='ctx'> extern void davinci_init_ide(void);</div><div class='add'>+void davinci_restart(char mode, const char *cmd);</div><div class='ctx'> </div><div class='ctx'> /* standard place to map on-chip SRAMs; they *may* support DMA */</div><div class='ctx'> #define SRAM_VIRT	0xfffe0000</div><div class='head'>diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h<br/>index eaca7d8b9d68..ee3461d7ec1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/da8xx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/include/mach/da8xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/da8xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/include/mach/da8xx.h</a></div><div class='hunk'>@@ -91,6 +91,7 @@ int da8xx_register_cpuidle(void);</div><div class='ctx'> void __iomem * __init da8xx_get_mem_ctlr(void);</div><div class='ctx'> int da850_register_pm(struct platform_device *pdev);</div><div class='ctx'> int __init da850_register_sata(unsigned long refclkpn);</div><div class='add'>+void da8xx_restart(char mode, const char *cmd);</div><div class='ctx'> </div><div class='ctx'> extern struct platform_device da8xx_serial_device;</div><div class='ctx'> extern struct emac_platform_data da8xx_emac_pdata;</div><div class='head'>diff --git a/arch/arm/mach-davinci/include/mach/dm646x.h b/arch/arm/mach-davinci/include/mach/dm646x.h<br/>index 2a00fe5ac253..a8ee6c9f0bb0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/dm646x.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/include/mach/dm646x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/dm646x.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/include/mach/dm646x.h</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='ctx'> #include &lt;linux/davinci_emac.h&gt;</div><div class='add'>+#include &lt;media/davinci/vpif_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DM646X_EMAC_BASE		(0x01C80000)</div><div class='ctx'> #define DM646X_EMAC_MDIO_BASE		(DM646X_EMAC_BASE + 0x4000)</div><div class='hunk'>@@ -34,58 +35,6 @@ int __init dm646x_init_edma(struct edma_rsv_info *rsv);</div><div class='ctx'> </div><div class='ctx'> void dm646x_video_init(void);</div><div class='ctx'> </div><div class='del'>-enum vpif_if_type {</div><div class='del'>-	VPIF_IF_BT656,</div><div class='del'>-	VPIF_IF_BT1120,</div><div class='del'>-	VPIF_IF_RAW_BAYER</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct vpif_interface {</div><div class='del'>-	enum vpif_if_type if_type;</div><div class='del'>-	unsigned hd_pol:1;</div><div class='del'>-	unsigned vd_pol:1;</div><div class='del'>-	unsigned fid_pol:1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct vpif_subdev_info {</div><div class='del'>-	const char *name;</div><div class='del'>-	struct i2c_board_info board_info;</div><div class='del'>-	u32 input;</div><div class='del'>-	u32 output;</div><div class='del'>-	unsigned can_route:1;</div><div class='del'>-	struct vpif_interface vpif_if;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct vpif_display_config {</div><div class='del'>-	int (*set_clock)(int, int);</div><div class='del'>-	struct vpif_subdev_info *subdevinfo;</div><div class='del'>-	int subdev_count;</div><div class='del'>-	const char **output;</div><div class='del'>-	int output_count;</div><div class='del'>-	const char *card_name;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct vpif_input {</div><div class='del'>-	struct v4l2_input input;</div><div class='del'>-	const char *subdev_name;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define VPIF_CAPTURE_MAX_CHANNELS	2</div><div class='del'>-</div><div class='del'>-struct vpif_capture_chan_config {</div><div class='del'>-	const struct vpif_input *inputs;</div><div class='del'>-	int input_count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct vpif_capture_config {</div><div class='del'>-	int (*setup_input_channel_mode)(int);</div><div class='del'>-	int (*setup_input_path)(int, const char *);</div><div class='del'>-	struct vpif_capture_chan_config chan_config[VPIF_CAPTURE_MAX_CHANNELS];</div><div class='del'>-	struct vpif_subdev_info *subdev_info;</div><div class='del'>-	int subdev_count;</div><div class='del'>-	const char *card_name;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> void dm646x_setup_vpif(struct vpif_display_config *,</div><div class='ctx'> 		       struct vpif_capture_config *);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-davinci/include/mach/io.h b/arch/arm/mach-davinci/include/mach/io.h<br/>index d1b954955c12..b2267d1e1a71 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/include/mach/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/include/mach/io.h</a></div><div class='hunk'>@@ -21,12 +21,4 @@</div><div class='ctx'> #define __mem_pci(a)		(a)</div><div class='ctx'> #define __mem_isa(a)		(a)</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLER__</div><div class='del'>-#define __arch_ioremap		davinci_ioremap</div><div class='del'>-#define __arch_iounmap		davinci_iounmap</div><div class='del'>-</div><div class='del'>-void __iomem *davinci_ioremap(unsigned long phys, size_t size,</div><div class='del'>-			      unsigned int type);</div><div class='del'>-void davinci_iounmap(volatile void __iomem *addr);</div><div class='del'>-#endif</div><div class='ctx'> #endif /* __ASM_ARCH_IO_H */</div><div class='head'>diff --git a/arch/arm/mach-davinci/include/mach/system.h b/arch/arm/mach-davinci/include/mach/system.h<br/>index e65629c20769..fcb7a015aba5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/include/mach/system.h</a></div><div class='hunk'>@@ -18,10 +18,4 @@ static inline void arch_idle(void)</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	if (davinci_soc_info.reset)</div><div class='del'>-		davinci_soc_info.reset(davinci_soc_info.reset_device);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif /* __ASM_ARCH_SYSTEM_H */</div><div class='head'>diff --git a/arch/arm/mach-davinci/include/mach/tnetv107x.h b/arch/arm/mach-davinci/include/mach/tnetv107x.h<br/>index 89c1fdc63c0b..83e5926f3c46 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/tnetv107x.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/include/mach/tnetv107x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/tnetv107x.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/include/mach/tnetv107x.h</a></div><div class='hunk'>@@ -54,6 +54,7 @@ extern struct platform_device tnetv107x_serial_device;</div><div class='ctx'> extern void __init tnetv107x_init(void);</div><div class='ctx'> extern void __init tnetv107x_devices_init(struct tnetv107x_device_info *);</div><div class='ctx'> extern void __init tnetv107x_irq_init(void);</div><div class='add'>+void tnetv107x_restart(char mode, const char *cmd);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-davinci/include/mach/vmalloc.h b/arch/arm/mach-davinci/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index d49646a8e206..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,14 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * DaVinci vmalloc definitions</div><div class='del'>- *</div><div class='del'>- * Author: Kevin Hilman, MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='del'>- *</div><div class='del'>- * 2007 (c) MontaVista Software, Inc. This file is licensed under</div><div class='del'>- * the terms of the GNU General Public License version 2. This program</div><div class='del'>- * is licensed "as is" without any warranty of any kind, whether express</div><div class='del'>- * or implied.</div><div class='del'>- */</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-</div><div class='del'>-/* Allow vmalloc range until the IO virtual range minus a 2M "hole" */</div><div class='del'>-#define VMALLOC_END	  (IO_VIRT - (2&lt;&lt;20))</div><div class='head'>diff --git a/arch/arm/mach-davinci/io.c b/arch/arm/mach-davinci/io.c<br/>deleted file mode 100644<br/>index 8ea60a8b2495..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/io.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/io.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,48 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * DaVinci I/O mapping code</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2005-2006 Texas Instruments</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/tlb.h&gt;</div><div class='del'>-#include &lt;asm/mach/map.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/common.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Intercept ioremap() requests for addresses in our fixed mapping regions.</div><div class='del'>- */</div><div class='del'>-void __iomem *davinci_ioremap(unsigned long p, size_t size, unsigned int type)</div><div class='del'>-{</div><div class='del'>-	struct map_desc *desc = davinci_soc_info.io_desc;</div><div class='del'>-	int desc_num = davinci_soc_info.io_desc_num;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; desc_num; i++, desc++) {</div><div class='del'>-		unsigned long iophys = __pfn_to_phys(desc-&gt;pfn);</div><div class='del'>-		unsigned long iosize = desc-&gt;length;</div><div class='del'>-</div><div class='del'>-		if (p &gt;= iophys &amp;&amp; (p + size) &lt;= (iophys + iosize))</div><div class='del'>-			return __io(desc-&gt;virtual + p - iophys);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return __arm_ioremap_caller(p, size, type,</div><div class='del'>-					__builtin_return_address(0));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(davinci_ioremap);</div><div class='del'>-</div><div class='del'>-void davinci_iounmap(volatile void __iomem *addr)</div><div class='del'>-{</div><div class='del'>-	unsigned long virt = (unsigned long)addr;</div><div class='del'>-</div><div class='del'>-	if (virt &gt;= VMALLOC_START &amp;&amp; virt &lt; VMALLOC_END)</div><div class='del'>-		__iounmap(addr);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(davinci_iounmap);</div><div class='head'>diff --git a/arch/arm/mach-davinci/tnetv107x.c b/arch/arm/mach-davinci/tnetv107x.c<br/>index 409bb869c7c7..dc1a209b9b66 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/tnetv107x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-davinci/tnetv107x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-davinci/tnetv107x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-davinci/tnetv107x.c</a></div><div class='hunk'>@@ -730,6 +730,11 @@ static void tnetv107x_watchdog_reset(struct platform_device *pdev)</div><div class='ctx'> 	__raw_writel(1, &amp;regs-&gt;kick);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void tnetv107x_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	tnetv107x_watchdog_reset(&amp;tnetv107x_wdt_device);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct davinci_soc_info tnetv107x_soc_info = {</div><div class='ctx'> 	.io_desc		= io_desc,</div><div class='ctx'> 	.io_desc_num		= ARRAY_SIZE(io_desc),</div><div class='hunk'>@@ -752,8 +757,6 @@ static struct davinci_soc_info tnetv107x_soc_info = {</div><div class='ctx'> 	.gpio_num		= TNETV107X_N_GPIO,</div><div class='ctx'> 	.timer_info		= &amp;timer_info,</div><div class='ctx'> 	.serial_dev		= &amp;tnetv107x_serial_device,</div><div class='del'>-	.reset			= tnetv107x_watchdog_reset,</div><div class='del'>-	.reset_device		= &amp;tnetv107x_wdt_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init tnetv107x_init(void)</div><div class='head'>diff --git a/arch/arm/mach-dove/addr-map.c b/arch/arm/mach-dove/addr-map.c<br/>index 00be4fc26dd7..98b8c83b09ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-dove/addr-map.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-dove/addr-map.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-dove/addr-map.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-dove/addr-map.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;plat/addr-map.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -34,98 +35,72 @@</div><div class='ctx'> #define ATTR_PCIE_MEM		0xe8</div><div class='ctx'> #define ATTR_SCRATCHPAD		0x0</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * CPU Address Decode Windows registers</div><div class='del'>- */</div><div class='del'>-#define WIN_CTRL(n)	(BRIDGE_VIRT_BASE + ((n) &lt;&lt; 4) + 0x0)</div><div class='del'>-#define WIN_BASE(n)	(BRIDGE_VIRT_BASE + ((n) &lt;&lt; 4) + 0x4)</div><div class='del'>-#define WIN_REMAP_LO(n)	(BRIDGE_VIRT_BASE + ((n) &lt;&lt; 4) + 0x8)</div><div class='del'>-#define WIN_REMAP_HI(n)	(BRIDGE_VIRT_BASE + ((n) &lt;&lt; 4) + 0xc)</div><div class='del'>-</div><div class='del'>-struct mbus_dram_target_info dove_mbus_dram_info;</div><div class='del'>-</div><div class='ctx'> static inline void __iomem *ddr_map_sc(int i)</div><div class='ctx'> {</div><div class='ctx'> 	return (void __iomem *)(DOVE_MC_VIRT_BASE + 0x100 + ((i) &lt;&lt; 4));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cpu_win_can_remap(int win)</div><div class='del'>-{</div><div class='del'>-	if (win &lt; 4)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init setup_cpu_win(int win, u32 base, u32 size,</div><div class='del'>-				 u8 target, u8 attr, int remap)</div><div class='del'>-{</div><div class='del'>-	u32 ctrl;</div><div class='del'>-</div><div class='del'>-	base &amp;= 0xffff0000;</div><div class='del'>-	ctrl = ((size - 1) &amp; 0xffff0000) | (attr &lt;&lt; 8) | (target &lt;&lt; 4) | 1;</div><div class='del'>-</div><div class='del'>-	writel(base, WIN_BASE(win));</div><div class='del'>-	writel(ctrl, WIN_CTRL(win));</div><div class='del'>-	if (cpu_win_can_remap(win)) {</div><div class='del'>-		if (remap &lt; 0)</div><div class='del'>-			remap = base;</div><div class='del'>-		writel(remap &amp; 0xffff0000, WIN_REMAP_LO(win));</div><div class='del'>-		writel(0, WIN_REMAP_HI(win));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init dove_setup_cpu_mbus(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int cs;</div><div class='add'>+/*</div><div class='add'>+ * Description of the windows needed by the platform code</div><div class='add'>+ */</div><div class='add'>+static struct __initdata orion_addr_map_cfg addr_map_cfg = {</div><div class='add'>+	.num_wins = 8,</div><div class='add'>+	.remappable_wins = 4,</div><div class='add'>+	.bridge_virt_base = BRIDGE_VIRT_BASE,</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+static const struct __initdata orion_addr_map_info addr_map_info[] = {</div><div class='ctx'> 	/*</div><div class='del'>-	 * First, disable and clear windows.</div><div class='add'>+	 * Windows for PCIe IO+MEM space.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		writel(0, WIN_BASE(i));</div><div class='del'>-		writel(0, WIN_CTRL(i));</div><div class='del'>-		if (cpu_win_can_remap(i)) {</div><div class='del'>-			writel(0, WIN_REMAP_LO(i));</div><div class='del'>-			writel(0, WIN_REMAP_HI(i));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	{ 0, DOVE_PCIE0_IO_PHYS_BASE, DOVE_PCIE0_IO_SIZE,</div><div class='add'>+	  TARGET_PCIE0, ATTR_PCIE_IO, DOVE_PCIE0_IO_BUS_BASE</div><div class='add'>+	},</div><div class='add'>+	{ 1, DOVE_PCIE1_IO_PHYS_BASE, DOVE_PCIE1_IO_SIZE,</div><div class='add'>+	  TARGET_PCIE1, ATTR_PCIE_IO, DOVE_PCIE1_IO_BUS_BASE</div><div class='add'>+	},</div><div class='add'>+	{ 2, DOVE_PCIE0_MEM_PHYS_BASE, DOVE_PCIE0_MEM_SIZE,</div><div class='add'>+	  TARGET_PCIE0, ATTR_PCIE_MEM, -1</div><div class='add'>+	},</div><div class='add'>+	{ 3, DOVE_PCIE1_MEM_PHYS_BASE, DOVE_PCIE1_MEM_SIZE,</div><div class='add'>+	  TARGET_PCIE1, ATTR_PCIE_MEM, -1</div><div class='add'>+	},</div><div class='ctx'> 	/*</div><div class='del'>-	 * Setup windows for PCIe IO+MEM space.</div><div class='add'>+	 * Window for CESA engine.</div><div class='ctx'> 	 */</div><div class='del'>-	setup_cpu_win(0, DOVE_PCIE0_IO_PHYS_BASE, DOVE_PCIE0_IO_SIZE,</div><div class='del'>-		      TARGET_PCIE0, ATTR_PCIE_IO, DOVE_PCIE0_IO_BUS_BASE);</div><div class='del'>-	setup_cpu_win(1, DOVE_PCIE1_IO_PHYS_BASE, DOVE_PCIE1_IO_SIZE,</div><div class='del'>-		      TARGET_PCIE1, ATTR_PCIE_IO, DOVE_PCIE1_IO_BUS_BASE);</div><div class='del'>-	setup_cpu_win(2, DOVE_PCIE0_MEM_PHYS_BASE, DOVE_PCIE0_MEM_SIZE,</div><div class='del'>-		      TARGET_PCIE0, ATTR_PCIE_MEM, -1);</div><div class='del'>-	setup_cpu_win(3, DOVE_PCIE1_MEM_PHYS_BASE, DOVE_PCIE1_MEM_SIZE,</div><div class='del'>-		      TARGET_PCIE1, ATTR_PCIE_MEM, -1);</div><div class='del'>-</div><div class='add'>+	{ 4, DOVE_CESA_PHYS_BASE, DOVE_CESA_SIZE,</div><div class='add'>+	  TARGET_CESA, ATTR_CESA, -1</div><div class='add'>+	},</div><div class='ctx'> 	/*</div><div class='del'>-	 * Setup window for CESA engine.</div><div class='add'>+	 * Window to the BootROM for Standby and Sleep Resume</div><div class='ctx'> 	 */</div><div class='del'>-	setup_cpu_win(4, DOVE_CESA_PHYS_BASE, DOVE_CESA_SIZE,</div><div class='del'>-		      TARGET_CESA, ATTR_CESA, -1);</div><div class='del'>-</div><div class='add'>+	{ 5, DOVE_BOOTROM_PHYS_BASE, DOVE_BOOTROM_SIZE,</div><div class='add'>+	  TARGET_BOOTROM, ATTR_BOOTROM, -1</div><div class='add'>+	},</div><div class='ctx'> 	/*</div><div class='del'>-	 * Setup the Window to the BootROM for Standby and Sleep Resume</div><div class='add'>+	 * Window to the PMU Scratch Pad space</div><div class='ctx'> 	 */</div><div class='del'>-	setup_cpu_win(5, DOVE_BOOTROM_PHYS_BASE, DOVE_BOOTROM_SIZE,</div><div class='del'>-		      TARGET_BOOTROM, ATTR_BOOTROM, -1);</div><div class='add'>+	{ 6, DOVE_SCRATCHPAD_PHYS_BASE, DOVE_SCRATCHPAD_SIZE,</div><div class='add'>+	  TARGET_SCRATCHPAD, ATTR_SCRATCHPAD, -1</div><div class='add'>+	},</div><div class='add'>+	/* End marker */</div><div class='add'>+	{ -1, 0, 0, 0, 0, 0 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init dove_setup_cpu_mbus(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int cs;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Setup the Window to the PMU Scratch Pad space</div><div class='add'>+	 * Disable, clear and configure windows.</div><div class='ctx'> 	 */</div><div class='del'>-	setup_cpu_win(6, DOVE_SCRATCHPAD_PHYS_BASE, DOVE_SCRATCHPAD_SIZE,</div><div class='del'>-		      TARGET_SCRATCHPAD, ATTR_SCRATCHPAD, -1);</div><div class='add'>+	orion_config_wins(&amp;addr_map_cfg, addr_map_info);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Setup MBUS dram target info.</div><div class='ctx'> 	 */</div><div class='del'>-	dove_mbus_dram_info.mbus_dram_target_id = TARGET_DDR;</div><div class='add'>+	orion_mbus_dram_info.mbus_dram_target_id = TARGET_DDR;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0, cs = 0; i &lt; 2; i++) {</div><div class='ctx'> 		u32 map = readl(ddr_map_sc(i));</div><div class='hunk'>@@ -136,7 +111,7 @@ void __init dove_setup_cpu_mbus(void)</div><div class='ctx'> 		if (map &amp; 1) {</div><div class='ctx'> 			struct mbus_dram_window *w;</div><div class='ctx'> </div><div class='del'>-			w = &amp;dove_mbus_dram_info.cs[cs++];</div><div class='add'>+			w = &amp;orion_mbus_dram_info.cs[cs++];</div><div class='ctx'> 			w-&gt;cs_index = i;</div><div class='ctx'> 			w-&gt;mbus_attr = 0; /* CS address decoding done inside */</div><div class='ctx'> 					  /* the DDR controller, no need to  */</div><div class='hunk'>@@ -145,5 +120,5 @@ void __init dove_setup_cpu_mbus(void)</div><div class='ctx'> 			w-&gt;size = 0x100000 &lt;&lt; (((map &amp; 0x000f0000) &gt;&gt; 16) - 4);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	dove_mbus_dram_info.num_cs = cs;</div><div class='add'>+	orion_mbus_dram_info.num_cs = cs;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-dove/cm-a510.c b/arch/arm/mach-dove/cm-a510.c<br/>index c8a406f7e946..792b4e2e24f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-dove/cm-a510.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-dove/cm-a510.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-dove/cm-a510.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-dove/cm-a510.c</a></div><div class='hunk'>@@ -93,4 +93,5 @@ MACHINE_START(CM_A510, "Compulab CM-A510 Board")</div><div class='ctx'> 	.init_early	= dove_init_early,</div><div class='ctx'> 	.init_irq	= dove_init_irq,</div><div class='ctx'> 	.timer		= &amp;dove_timer,</div><div class='add'>+	.restart	= dove_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c<br/>index a9e0dae86a26..dd1429ae6405 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-dove/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-dove/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-dove/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-dove/common.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -30,6 +29,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;plat/time.h&gt;</div><div class='ctx'> #include &lt;plat/common.h&gt;</div><div class='add'>+#include &lt;plat/addr-map.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> static int get_tclk(void);</div><div class='hunk'>@@ -71,8 +71,7 @@ void __init dove_map_io(void)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> void __init dove_ehci0_init(void)</div><div class='ctx'> {</div><div class='del'>-	orion_ehci_init(&amp;dove_mbus_dram_info,</div><div class='del'>-			DOVE_USB0_PHYS_BASE, IRQ_DOVE_USB0);</div><div class='add'>+	orion_ehci_init(DOVE_USB0_PHYS_BASE, IRQ_DOVE_USB0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='hunk'>@@ -80,8 +79,7 @@ void __init dove_ehci0_init(void)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> void __init dove_ehci1_init(void)</div><div class='ctx'> {</div><div class='del'>-	orion_ehci_1_init(&amp;dove_mbus_dram_info,</div><div class='del'>-			  DOVE_USB1_PHYS_BASE, IRQ_DOVE_USB1);</div><div class='add'>+	orion_ehci_1_init(DOVE_USB1_PHYS_BASE, IRQ_DOVE_USB1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='hunk'>@@ -89,7 +87,7 @@ void __init dove_ehci1_init(void)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> void __init dove_ge00_init(struct mv643xx_eth_platform_data *eth_data)</div><div class='ctx'> {</div><div class='del'>-	orion_ge00_init(eth_data, &amp;dove_mbus_dram_info,</div><div class='add'>+	orion_ge00_init(eth_data,</div><div class='ctx'> 			DOVE_GE00_PHYS_BASE, IRQ_DOVE_GE00_SUM,</div><div class='ctx'> 			0, get_tclk());</div><div class='ctx'> }</div><div class='hunk'>@@ -107,8 +105,7 @@ void __init dove_rtc_init(void)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> void __init dove_sata_init(struct mv_sata_platform_data *sata_data)</div><div class='ctx'> {</div><div class='del'>-	orion_sata_init(sata_data, &amp;dove_mbus_dram_info,</div><div class='del'>-			DOVE_SATA_PHYS_BASE, IRQ_DOVE_SATA);</div><div class='add'>+	orion_sata_init(sata_data, DOVE_SATA_PHYS_BASE, IRQ_DOVE_SATA);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -198,8 +195,7 @@ struct sys_timer dove_timer = {</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> void __init dove_xor0_init(void)</div><div class='ctx'> {</div><div class='del'>-	orion_xor0_init(&amp;dove_mbus_dram_info,</div><div class='del'>-			DOVE_XOR0_PHYS_BASE, DOVE_XOR0_HIGH_PHYS_BASE,</div><div class='add'>+	orion_xor0_init(DOVE_XOR0_PHYS_BASE, DOVE_XOR0_HIGH_PHYS_BASE,</div><div class='ctx'> 			IRQ_DOVE_XOR_00, IRQ_DOVE_XOR_01);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -292,3 +288,19 @@ void __init dove_init(void)</div><div class='ctx'> 	dove_xor0_init();</div><div class='ctx'> 	dove_xor1_init();</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void dove_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Enable soft reset to assert RSTOUTn.</div><div class='add'>+	 */</div><div class='add'>+	writel(SOFT_RESET_OUT_EN, RSTOUTn_MASK);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Assert soft reset.</div><div class='add'>+	 */</div><div class='add'>+	writel(SOFT_RESET, SYSTEM_SOFT_RESET);</div><div class='add'>+</div><div class='add'>+	while (1)</div><div class='add'>+		;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-dove/common.h b/arch/arm/mach-dove/common.h<br/>index 6a2046e44706..6432a3ba864b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-dove/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-dove/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-dove/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-dove/common.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@ struct mv643xx_eth_platform_data;</div><div class='ctx'> struct mv_sata_platform_data;</div><div class='ctx'> </div><div class='ctx'> extern struct sys_timer dove_timer;</div><div class='del'>-extern struct mbus_dram_target_info dove_mbus_dram_info;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Basic Dove init functions used early by machine-setup.</div><div class='hunk'>@@ -39,5 +38,6 @@ void dove_spi1_init(void);</div><div class='ctx'> void dove_i2c_init(void);</div><div class='ctx'> void dove_sdio0_init(void);</div><div class='ctx'> void dove_sdio1_init(void);</div><div class='add'>+void dove_restart(char, const char *);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-dove/dove-db-setup.c b/arch/arm/mach-dove/dove-db-setup.c<br/>index 11ea34e4fc76..ea77ae430b2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-dove/dove-db-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-dove/dove-db-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-dove/dove-db-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-dove/dove-db-setup.c</a></div><div class='hunk'>@@ -100,4 +100,5 @@ MACHINE_START(DOVE_DB, "Marvell DB-MV88AP510-BP Development Board")</div><div class='ctx'> 	.init_early	= dove_init_early,</div><div class='ctx'> 	.init_irq	= dove_init_irq,</div><div class='ctx'> 	.timer		= &amp;dove_timer,</div><div class='add'>+	.restart	= dove_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-dove/include/mach/dove.h b/arch/arm/mach-dove/include/mach/dove.h<br/>index b20ec9af7882..ad1165d488c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-dove/include/mach/dove.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-dove/include/mach/dove.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-dove/include/mach/dove.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-dove/include/mach/dove.h</a></div><div class='hunk'>@@ -11,8 +11,6 @@</div><div class='ctx'> #ifndef __ASM_ARCH_DOVE_H</div><div class='ctx'> #define __ASM_ARCH_DOVE_H</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/vmalloc.h&gt;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Marvell Dove address maps.</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/arm/mach-dove/include/mach/system.h b/arch/arm/mach-dove/include/mach/system.h<br/>index 356afda56853..3027954f6162 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-dove/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-dove/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-dove/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-dove/include/mach/system.h</a></div><div class='hunk'>@@ -9,28 +9,9 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/bridge-regs.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Enable soft reset to assert RSTOUTn.</div><div class='del'>-	 */</div><div class='del'>-	writel(SOFT_RESET_OUT_EN, RSTOUTn_MASK);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Assert soft reset.</div><div class='del'>-	 */</div><div class='del'>-	writel(SOFT_RESET, SYSTEM_SOFT_RESET);</div><div class='del'>-</div><div class='del'>-	while (1)</div><div class='del'>-		;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-dove/include/mach/vmalloc.h b/arch/arm/mach-dove/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index a28792cf761e..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-dove/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-dove/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-dove/include/mach/vmalloc.h</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END	0xfd800000UL</div><div class='head'>diff --git a/arch/arm/mach-dove/pcie.c b/arch/arm/mach-dove/pcie.c<br/>index aa2b3a09a51d..52e96d397ba8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-dove/pcie.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-dove/pcie.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-dove/pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-dove/pcie.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;video/vga.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -19,6 +18,7 @@</div><div class='ctx'> #include &lt;plat/pcie.h&gt;</div><div class='ctx'> #include &lt;mach/irqs.h&gt;</div><div class='ctx'> #include &lt;mach/bridge-regs.h&gt;</div><div class='add'>+#include &lt;plat/addr-map.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> struct pcie_port {</div><div class='hunk'>@@ -50,7 +50,7 @@ static int __init dove_pcie_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	 */</div><div class='ctx'> 	orion_pcie_set_local_bus_nr(pp-&gt;base, sys-&gt;busnr);</div><div class='ctx'> </div><div class='del'>-	orion_pcie_setup(pp-&gt;base, &amp;dove_mbus_dram_info);</div><div class='add'>+	orion_pcie_setup(pp-&gt;base);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * IORESOURCE_IO</div><div class='hunk'>@@ -69,7 +69,7 @@ static int __init dove_pcie_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	pp-&gt;res[0].flags = IORESOURCE_IO;</div><div class='ctx'> 	if (request_resource(&amp;ioport_resource, &amp;pp-&gt;res[0]))</div><div class='ctx'> 		panic("Request PCIe IO resource failed\n");</div><div class='del'>-	sys-&gt;resource[0] = &amp;pp-&gt;res[0];</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;pp-&gt;res[0]);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * IORESOURCE_MEM</div><div class='hunk'>@@ -88,9 +88,7 @@ static int __init dove_pcie_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	pp-&gt;res[1].flags = IORESOURCE_MEM;</div><div class='ctx'> 	if (request_resource(&amp;iomem_resource, &amp;pp-&gt;res[1]))</div><div class='ctx'> 		panic("Request PCIe Memory resource failed\n");</div><div class='del'>-	sys-&gt;resource[1] = &amp;pp-&gt;res[1];</div><div class='del'>-</div><div class='del'>-	sys-&gt;resource[2] = NULL;</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;pp-&gt;res[1]);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -184,7 +182,8 @@ dove_pcie_scan_bus(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	struct pci_bus *bus;</div><div class='ctx'> </div><div class='ctx'> 	if (nr &lt; num_pcie_ports) {</div><div class='del'>-		bus = pci_scan_bus(sys-&gt;busnr, &amp;pcie_ops, sys);</div><div class='add'>+		bus = pci_scan_root_bus(NULL, sys-&gt;busnr, &amp;pcie_ops, sys,</div><div class='add'>+					&amp;sys-&gt;resources);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bus = NULL;</div><div class='ctx'> 		BUG();</div><div class='head'>diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c<br/>index d0ce8abdd4b6..294aad07f7a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ebsa110/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ebsa110/core.c</a></div><div class='hunk'>@@ -278,13 +278,19 @@ static int __init ebsa110_init(void)</div><div class='ctx'> </div><div class='ctx'> arch_initcall(ebsa110_init);</div><div class='ctx'> </div><div class='add'>+static void ebsa110_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	soft_restart(0x80000000);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> MACHINE_START(EBSA110, "EBSA110")</div><div class='ctx'> 	/* Maintainer: Russell King */</div><div class='ctx'> 	.atag_offset	= 0x400,</div><div class='ctx'> 	.reserve_lp0	= 1,</div><div class='ctx'> 	.reserve_lp2	= 1,</div><div class='del'>-	.soft_reboot	= 1,</div><div class='add'>+	.restart_mode	= 's',</div><div class='ctx'> 	.map_io		= ebsa110_map_io,</div><div class='ctx'> 	.init_irq	= ebsa110_init_irq,</div><div class='ctx'> 	.timer		= &amp;ebsa110_timer,</div><div class='add'>+	.restart	= ebsa110_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ebsa110/include/mach/system.h b/arch/arm/mach-ebsa110/include/mach/system.h<br/>index 9a26245bf1fc..2e4af65edb6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ebsa110/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ebsa110/include/mach/system.h</a></div><div class='hunk'>@@ -34,6 +34,4 @@ static inline void arch_idle(void)</div><div class='ctx'> 	asm volatile ("mcr p15, 0, ip, c15, c1, 2" : : : "cc");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define arch_reset(mode, cmd)	cpu_reset(0x80000000)</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-ebsa110/include/mach/vmalloc.h b/arch/arm/mach-ebsa110/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index ea141b7a3e03..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ebsa110/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  arch/arm/mach-ebsa110/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 1998 Russell King</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'>-#define VMALLOC_END       0xdf000000UL</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c<br/>index 0713448206a5..681e939407d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/adssphere.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/adssphere.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/adssphere.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ep93xx/adssphere.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -36,6 +37,8 @@ MACHINE_START(ADSSPHERE, "ADS Sphere board")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= ep93xx_map_io,</div><div class='ctx'> 	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;ep93xx_timer,</div><div class='ctx'> 	.init_machine	= adssphere_init_machine,</div><div class='add'>+	.restart	= ep93xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c<br/>index 2432a6b7dcac..24203f9a6796 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ep93xx/core.c</a></div><div class='hunk'>@@ -906,3 +906,15 @@ void __init ep93xx_init_devices(void)</div><div class='ctx'> 	platform_device_register(&amp;ep93xx_ohci_device);</div><div class='ctx'> 	platform_device_register(&amp;ep93xx_leds);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void ep93xx_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Set then clear the SWRST bit to initiate a software reset</div><div class='add'>+	 */</div><div class='add'>+	ep93xx_devcfg_set_bits(EP93XX_SYSCON_DEVCFG_SWRST);</div><div class='add'>+	ep93xx_devcfg_clear_bits(EP93XX_SYSCON_DEVCFG_SWRST);</div><div class='add'>+</div><div class='add'>+	while (1)</div><div class='add'>+		;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c<br/>index 70ef8c527d27..d115653edca3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/edb93xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/edb93xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/edb93xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ep93xx/edb93xx.c</a></div><div class='hunk'>@@ -39,6 +39,7 @@</div><div class='ctx'> #include &lt;mach/ep93xx_spi.h&gt;</div><div class='ctx'> #include &lt;mach/gpio-ep93xx.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -250,8 +251,10 @@ MACHINE_START(EDB9301, "Cirrus Logic EDB9301 Evaluation Board")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= ep93xx_map_io,</div><div class='ctx'> 	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;ep93xx_timer,</div><div class='ctx'> 	.init_machine	= edb93xx_init_machine,</div><div class='add'>+	.restart	= ep93xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -261,8 +264,10 @@ MACHINE_START(EDB9302, "Cirrus Logic EDB9302 Evaluation Board")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= ep93xx_map_io,</div><div class='ctx'> 	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;ep93xx_timer,</div><div class='ctx'> 	.init_machine	= edb93xx_init_machine,</div><div class='add'>+	.restart	= ep93xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -272,8 +277,10 @@ MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= ep93xx_map_io,</div><div class='ctx'> 	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;ep93xx_timer,</div><div class='ctx'> 	.init_machine	= edb93xx_init_machine,</div><div class='add'>+	.restart	= ep93xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -283,8 +290,10 @@ MACHINE_START(EDB9307, "Cirrus Logic EDB9307 Evaluation Board")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= ep93xx_map_io,</div><div class='ctx'> 	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;ep93xx_timer,</div><div class='ctx'> 	.init_machine	= edb93xx_init_machine,</div><div class='add'>+	.restart	= ep93xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -294,8 +303,10 @@ MACHINE_START(EDB9307A, "Cirrus Logic EDB9307A Evaluation Board")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= ep93xx_map_io,</div><div class='ctx'> 	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;ep93xx_timer,</div><div class='ctx'> 	.init_machine	= edb93xx_init_machine,</div><div class='add'>+	.restart	= ep93xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -305,8 +316,10 @@ MACHINE_START(EDB9312, "Cirrus Logic EDB9312 Evaluation Board")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= ep93xx_map_io,</div><div class='ctx'> 	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;ep93xx_timer,</div><div class='ctx'> 	.init_machine	= edb93xx_init_machine,</div><div class='add'>+	.restart	= ep93xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -316,8 +329,10 @@ MACHINE_START(EDB9315, "Cirrus Logic EDB9315 Evaluation Board")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= ep93xx_map_io,</div><div class='ctx'> 	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;ep93xx_timer,</div><div class='ctx'> 	.init_machine	= edb93xx_init_machine,</div><div class='add'>+	.restart	= ep93xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -327,7 +342,9 @@ MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A Evaluation Board")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= ep93xx_map_io,</div><div class='ctx'> 	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;ep93xx_timer,</div><div class='ctx'> 	.init_machine	= edb93xx_init_machine,</div><div class='add'>+	.restart	= ep93xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c<br/>index 45ee205856f8..af46970dc58e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/gesbc9312.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/gesbc9312.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/gesbc9312.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ep93xx/gesbc9312.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -36,6 +37,8 @@ MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= ep93xx_map_io,</div><div class='ctx'> 	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;ep93xx_timer,</div><div class='ctx'> 	.init_machine	= gesbc9312_init_machine,</div><div class='add'>+	.restart	= ep93xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/include/mach/dma.h b/arch/arm/mach-ep93xx/include/mach/dma.h<br/>index 46d4d876e6fb..e82c642fa53c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/dma.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/include/mach/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/dma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ep93xx/include/mach/dma.h</a></div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'>  */</div><div class='ctx'> struct ep93xx_dma_data {</div><div class='ctx'> 	int				port;</div><div class='del'>-	enum dma_data_direction		direction;</div><div class='add'>+	enum dma_transfer_direction	direction;</div><div class='ctx'> 	const char			*name;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -80,14 +80,14 @@ static inline bool ep93xx_dma_chan_is_m2p(struct dma_chan *chan)</div><div class='ctx'>  * channel supports given DMA direction. Only M2P channels have such</div><div class='ctx'>  * limitation, for M2M channels the direction is configurable.</div><div class='ctx'>  */</div><div class='del'>-static inline enum dma_data_direction</div><div class='add'>+static inline enum dma_transfer_direction</div><div class='ctx'> ep93xx_dma_chan_direction(struct dma_chan *chan)</div><div class='ctx'> {</div><div class='ctx'> 	if (!ep93xx_dma_chan_is_m2p(chan))</div><div class='ctx'> 		return DMA_NONE;</div><div class='ctx'> </div><div class='ctx'> 	/* even channels are for TX, odd for RX */</div><div class='del'>-	return (chan-&gt;chan_id % 2 == 0) ? DMA_TO_DEVICE : DMA_FROM_DEVICE;</div><div class='add'>+	return (chan-&gt;chan_id % 2 == 0) ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_ARCH_DMA_H */</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/include/mach/entry-macro.S b/arch/arm/mach-ep93xx/include/mach/entry-macro.S<br/>index 96b85e2c2c0b..9be6edcf9045 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ep93xx/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -9,51 +9,9 @@</div><div class='ctx'>  * the Free Software Foundation; either version 2 of the License, or (at</div><div class='ctx'>  * your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;mach/ep93xx-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='del'>-		.macro  get_irqnr_preamble, base, tmp</div><div class='del'>-		.endm</div><div class='del'>-</div><div class='ctx'> 		.macro  arch_ret_to_user, tmp1, tmp2</div><div class='ctx'> 		.endm</div><div class='del'>-</div><div class='del'>-		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-		ldr	\base, =(EP93XX_AHB_VIRT_BASE)</div><div class='del'>-		orr	\base, \base, #0x000b0000</div><div class='del'>-		mov	\irqnr, #0</div><div class='del'>-		ldr	\irqstat, [\base]		@ lower 32 interrupts</div><div class='del'>-		cmp	\irqstat, #0</div><div class='del'>-		bne	1001f</div><div class='del'>-</div><div class='del'>-		eor	\base, \base, #0x00070000</div><div class='del'>-		ldr	\irqstat, [\base]		@ upper 32 interrupts</div><div class='del'>-		cmp	\irqstat, #0</div><div class='del'>-		beq	1002f</div><div class='del'>-		mov	\irqnr, #0x20</div><div class='del'>-</div><div class='del'>-1001:</div><div class='del'>-		movs	\tmp, \irqstat, lsl #16</div><div class='del'>-		movne	\irqstat, \tmp</div><div class='del'>-		addeq	\irqnr, \irqnr, #16</div><div class='del'>-</div><div class='del'>-		movs	\tmp, \irqstat, lsl #8</div><div class='del'>-		movne	\irqstat, \tmp</div><div class='del'>-		addeq	\irqnr, \irqnr, #8</div><div class='del'>-</div><div class='del'>-		movs	\tmp, \irqstat, lsl #4</div><div class='del'>-		movne	\irqstat, \tmp</div><div class='del'>-		addeq	\irqnr, \irqnr, #4</div><div class='del'>-</div><div class='del'>-		movs	\tmp, \irqstat, lsl #2</div><div class='del'>-		movne	\irqstat, \tmp</div><div class='del'>-		addeq	\irqnr, \irqnr, #2</div><div class='del'>-</div><div class='del'>-		movs	\tmp, \irqstat, lsl #1</div><div class='del'>-		addeq	\irqnr, \irqnr, #1</div><div class='del'>-		orrs	\base, \base, #1</div><div class='del'>-</div><div class='del'>-1002:</div><div class='del'>-		.endm</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/include/mach/platform.h b/arch/arm/mach-ep93xx/include/mach/platform.h<br/>index 50660455b1d8..d4c934931f9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/platform.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/include/mach/platform.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/platform.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ep93xx/include/mach/platform.h</a></div><div class='hunk'>@@ -66,4 +66,6 @@ void ep93xx_register_ac97(void);</div><div class='ctx'> void ep93xx_init_devices(void);</div><div class='ctx'> extern struct sys_timer ep93xx_timer;</div><div class='ctx'> </div><div class='add'>+void ep93xx_restart(char, const char *);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/include/mach/system.h b/arch/arm/mach-ep93xx/include/mach/system.h<br/>index 6d661fe9d66c..b5bec7cb9b52 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ep93xx/include/mach/system.h</a></div><div class='hunk'>@@ -1,24 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * arch/arm/mach-ep93xx/include/mach/system.h</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	local_irq_disable();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set then clear the SWRST bit to initiate a software reset</div><div class='del'>-	 */</div><div class='del'>-	ep93xx_devcfg_set_bits(EP93XX_SYSCON_DEVCFG_SWRST);</div><div class='del'>-	ep93xx_devcfg_clear_bits(EP93XX_SYSCON_DEVCFG_SWRST);</div><div class='del'>-</div><div class='del'>-	while (1)</div><div class='del'>-		;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/include/mach/vmalloc.h b/arch/arm/mach-ep93xx/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 1b3f25d03d39..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-ep93xx/include/mach/vmalloc.h</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END	0xfe800000UL</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c<br/>index e72f7368876e..7b98084f0c97 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/micro9.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/micro9.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/micro9.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ep93xx/micro9.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -80,8 +81,10 @@ MACHINE_START(MICRO9, "Contec Micro9-High")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= ep93xx_map_io,</div><div class='ctx'> 	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;ep93xx_timer,</div><div class='ctx'> 	.init_machine	= micro9_init_machine,</div><div class='add'>+	.restart	= ep93xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -91,8 +94,10 @@ MACHINE_START(MICRO9M, "Contec Micro9-Mid")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= ep93xx_map_io,</div><div class='ctx'> 	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;ep93xx_timer,</div><div class='ctx'> 	.init_machine	= micro9_init_machine,</div><div class='add'>+	.restart	= ep93xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -102,8 +107,10 @@ MACHINE_START(MICRO9L, "Contec Micro9-Lite")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= ep93xx_map_io,</div><div class='ctx'> 	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;ep93xx_timer,</div><div class='ctx'> 	.init_machine	= micro9_init_machine,</div><div class='add'>+	.restart	= ep93xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -113,7 +120,9 @@ MACHINE_START(MICRO9S, "Contec Micro9-Slim")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= ep93xx_map_io,</div><div class='ctx'> 	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;ep93xx_timer,</div><div class='ctx'> 	.init_machine	= micro9_init_machine,</div><div class='add'>+	.restart	= ep93xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c<br/>index 52e090dc9d27..f4e553eca21c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/simone.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/simone.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/simone.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ep93xx/simone.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;mach/fb.h&gt;</div><div class='ctx'> #include &lt;mach/gpio-ep93xx.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -80,6 +81,8 @@ MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= ep93xx_map_io,</div><div class='ctx'> 	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;ep93xx_timer,</div><div class='ctx'> 	.init_machine	= simone_init_machine,</div><div class='add'>+	.restart	= ep93xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c<br/>index 8121e3aedc0a..fd846331ddff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/snappercl15.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/snappercl15.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/snappercl15.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ep93xx/snappercl15.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;mach/fb.h&gt;</div><div class='ctx'> #include &lt;mach/gpio-ep93xx.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -177,6 +178,8 @@ MACHINE_START(SNAPPER_CL15, "Bluewater Systems Snapper CL15")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= ep93xx_map_io,</div><div class='ctx'> 	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer 		= &amp;ep93xx_timer,</div><div class='ctx'> 	.init_machine	= snappercl15_init_machine,</div><div class='add'>+	.restart	= ep93xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c<br/>index 8b2f1435bcac..79f8ecf07a19 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/ts72xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/ts72xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/ts72xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ep93xx/ts72xx.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/ts72xx.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -247,6 +248,8 @@ MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= ts72xx_map_io,</div><div class='ctx'> 	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;ep93xx_timer,</div><div class='ctx'> 	.init_machine	= ts72xx_init_machine,</div><div class='add'>+	.restart	= ep93xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c<br/>index d96e4dbec6a8..03dd4012043e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/vision_ep9307.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ep93xx/vision_ep9307.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/vision_ep9307.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ep93xx/vision_ep9307.c</a></div><div class='hunk'>@@ -361,4 +361,5 @@ MACHINE_START(VISION_EP9307, "Vision Engraving Systems EP9307")</div><div class='ctx'> 	.init_irq	= ep93xx_init_irq,</div><div class='ctx'> 	.timer		= &amp;ep93xx_timer,</div><div class='ctx'> 	.init_machine	= vision_init_machine,</div><div class='add'>+	.restart	= ep93xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig<br/>index 724ec0f3560d..5d602f68a0e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/Kconfig</a></div><div class='hunk'>@@ -17,6 +17,8 @@ choice</div><div class='ctx'> </div><div class='ctx'> config ARCH_EXYNOS4</div><div class='ctx'> 	bool "SAMSUNG EXYNOS4"</div><div class='add'>+	select HAVE_SMP</div><div class='add'>+	select MIGHT_HAVE_CACHE_L2X0</div><div class='ctx'> 	help</div><div class='ctx'> 	  Samsung EXYNOS4 SoCs based systems</div><div class='ctx'> </div><div class='hunk'>@@ -57,6 +59,11 @@ config EXYNOS4_MCT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Use MCT (Multi Core Timer) as kernel timers</div><div class='ctx'> </div><div class='add'>+config EXYNOS4_DEV_DMA</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  Compile in amba device definitions for DMA controller</div><div class='add'>+</div><div class='ctx'> config EXYNOS4_DEV_AHCI</div><div class='ctx'> 	bool</div><div class='ctx'> 	help</div><div class='hunk'>@@ -82,6 +89,11 @@ config EXYNOS4_DEV_DWMCI</div><div class='ctx'> 	help</div><div class='ctx'> 	  Compile in platform device definitions for DWMCI</div><div class='ctx'> </div><div class='add'>+config EXYNOS4_DEV_USB_OHCI</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  Compile in platform device definition for USB OHCI</div><div class='add'>+</div><div class='ctx'> config EXYNOS4_SETUP_I2C1</div><div class='ctx'> 	bool</div><div class='ctx'> 	help</div><div class='hunk'>@@ -143,6 +155,11 @@ config EXYNOS4_SETUP_USB_PHY</div><div class='ctx'> 	help</div><div class='ctx'> 	  Common setup code for USB PHY controller</div><div class='ctx'> </div><div class='add'>+config EXYNOS4_SETUP_SPI</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  Common setup code for SPI GPIO configurations.</div><div class='add'>+</div><div class='ctx'> # machine support</div><div class='ctx'> </div><div class='ctx'> if ARCH_EXYNOS4</div><div class='hunk'>@@ -177,8 +194,10 @@ config MACH_SMDKV310</div><div class='ctx'> 	select SAMSUNG_DEV_BACKLIGHT</div><div class='ctx'> 	select EXYNOS4_DEV_AHCI</div><div class='ctx'> 	select SAMSUNG_DEV_KEYPAD</div><div class='add'>+	select EXYNOS4_DEV_DMA</div><div class='ctx'> 	select EXYNOS4_DEV_PD</div><div class='ctx'> 	select SAMSUNG_DEV_PWM</div><div class='add'>+	select EXYNOS4_DEV_USB_OHCI</div><div class='ctx'> 	select EXYNOS4_DEV_SYSMMU</div><div class='ctx'> 	select EXYNOS4_SETUP_FIMD0</div><div class='ctx'> 	select EXYNOS4_SETUP_I2C1</div><div class='hunk'>@@ -197,6 +216,7 @@ config MACH_ARMLEX4210</div><div class='ctx'> 	select S3C_DEV_HSMMC2</div><div class='ctx'> 	select S3C_DEV_HSMMC3</div><div class='ctx'> 	select EXYNOS4_DEV_AHCI</div><div class='add'>+	select EXYNOS4_DEV_DMA</div><div class='ctx'> 	select EXYNOS4_DEV_SYSMMU</div><div class='ctx'> 	select EXYNOS4_SETUP_SDHCI</div><div class='ctx'> 	help</div><div class='hunk'>@@ -222,6 +242,7 @@ config MACH_UNIVERSAL_C210</div><div class='ctx'> 	select S5P_DEV_MFC</div><div class='ctx'> 	select S5P_DEV_ONENAND</div><div class='ctx'> 	select S5P_DEV_TV</div><div class='add'>+	select EXYNOS4_DEV_DMA</div><div class='ctx'> 	select EXYNOS4_DEV_PD</div><div class='ctx'> 	select EXYNOS4_SETUP_FIMD0</div><div class='ctx'> 	select EXYNOS4_SETUP_I2C1</div><div class='hunk'>@@ -255,6 +276,7 @@ config MACH_NURI</div><div class='ctx'> 	select S5P_DEV_MFC</div><div class='ctx'> 	select S5P_DEV_USB_EHCI</div><div class='ctx'> 	select S5P_SETUP_MIPIPHY</div><div class='add'>+	select EXYNOS4_DEV_DMA</div><div class='ctx'> 	select EXYNOS4_DEV_PD</div><div class='ctx'> 	select EXYNOS4_SETUP_FIMC</div><div class='ctx'> 	select EXYNOS4_SETUP_FIMD0</div><div class='hunk'>@@ -287,7 +309,9 @@ config MACH_ORIGEN</div><div class='ctx'> 	select S5P_DEV_USB_EHCI</div><div class='ctx'> 	select SAMSUNG_DEV_BACKLIGHT</div><div class='ctx'> 	select SAMSUNG_DEV_PWM</div><div class='add'>+	select EXYNOS4_DEV_DMA</div><div class='ctx'> 	select EXYNOS4_DEV_PD</div><div class='add'>+	select EXYNOS4_DEV_USB_OHCI</div><div class='ctx'> 	select EXYNOS4_SETUP_FIMD0</div><div class='ctx'> 	select EXYNOS4_SETUP_SDHCI</div><div class='ctx'> 	select EXYNOS4_SETUP_USB_PHY</div><div class='hunk'>@@ -327,6 +351,20 @@ config MACH_SMDK4412</div><div class='ctx'> 	  Machine support for Samsung SMDK4412</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='add'>+comment "Flattened Device Tree based board for Exynos4 based SoC"</div><div class='add'>+</div><div class='add'>+config MACH_EXYNOS4_DT</div><div class='add'>+	bool "Samsung Exynos4 Machine using device tree"</div><div class='add'>+	select CPU_EXYNOS4210</div><div class='add'>+	select USE_OF</div><div class='add'>+	select ARM_AMBA</div><div class='add'>+	select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD</div><div class='add'>+	help</div><div class='add'>+	  Machine support for Samsung Exynos4 machine with device tree enabled.</div><div class='add'>+	  Select this if a fdt blob is available for the Exynos4 SoC based board.</div><div class='add'>+	  Note: This is under development and not all peripherals can be supported</div><div class='add'>+	  with this machine file.</div><div class='add'>+</div><div class='ctx'> if ARCH_EXYNOS4</div><div class='ctx'> </div><div class='ctx'> comment "Configuration for HSMMC 8-bit bus width"</div><div class='head'>diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile<br/>index 59069a35e40b..5fc202cdfdb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/Makefile</a></div><div class='hunk'>@@ -10,15 +10,17 @@ obj-m				:=</div><div class='ctx'> obj-n				:=</div><div class='ctx'> obj-				:=</div><div class='ctx'> </div><div class='del'>-# Core support for EXYNOS4 system</div><div class='add'>+# Core</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_ARCH_EXYNOS4)	+= cpu.o init.o clock.o irq-combiner.o setup-i2c0.o</div><div class='del'>-obj-$(CONFIG_ARCH_EXYNOS4)	+= irq-eint.o dma.o pmu.o</div><div class='add'>+obj-$(CONFIG_ARCH_EXYNOS4)	+= common.o clock.o</div><div class='ctx'> obj-$(CONFIG_CPU_EXYNOS4210)	+= clock-exynos4210.o</div><div class='ctx'> obj-$(CONFIG_SOC_EXYNOS4212)	+= clock-exynos4212.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_PM)		+= pm.o</div><div class='ctx'> obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_ARCH_EXYNOS4)	+= pmu.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_EXYNOS4_MCT)	+= mct.o</div><div class='hunk'>@@ -37,6 +39,8 @@ obj-$(CONFIG_MACH_ORIGEN)		+= mach-origen.o</div><div class='ctx'> obj-$(CONFIG_MACH_SMDK4212)		+= mach-smdk4x12.o</div><div class='ctx'> obj-$(CONFIG_MACH_SMDK4412)		+= mach-smdk4x12.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_MACH_EXYNOS4_DT)		+= mach-exynos4-dt.o</div><div class='add'>+</div><div class='ctx'> # device support</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ARCH_EXYNOS4)		+= dev-audio.o</div><div class='hunk'>@@ -44,7 +48,10 @@ obj-$(CONFIG_EXYNOS4_DEV_AHCI)		+= dev-ahci.o</div><div class='ctx'> obj-$(CONFIG_EXYNOS4_DEV_PD)		+= dev-pd.o</div><div class='ctx'> obj-$(CONFIG_EXYNOS4_DEV_SYSMMU)	+= dev-sysmmu.o</div><div class='ctx'> obj-$(CONFIG_EXYNOS4_DEV_DWMCI)		+= dev-dwmci.o</div><div class='add'>+obj-$(CONFIG_EXYNOS4_DEV_DMA)		+= dma.o</div><div class='add'>+obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)	+= dev-ohci.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_ARCH_EXYNOS4)		+= setup-i2c0.o</div><div class='ctx'> obj-$(CONFIG_EXYNOS4_SETUP_FIMC)	+= setup-fimc.o</div><div class='ctx'> obj-$(CONFIG_EXYNOS4_SETUP_FIMD0)	+= setup-fimd0.o</div><div class='ctx'> obj-$(CONFIG_EXYNOS4_SETUP_I2C1)	+= setup-i2c1.o</div><div class='hunk'>@@ -55,6 +62,6 @@ obj-$(CONFIG_EXYNOS4_SETUP_I2C5)	+= setup-i2c5.o</div><div class='ctx'> obj-$(CONFIG_EXYNOS4_SETUP_I2C6)	+= setup-i2c6.o</div><div class='ctx'> obj-$(CONFIG_EXYNOS4_SETUP_I2C7)	+= setup-i2c7.o</div><div class='ctx'> obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD)	+= setup-keypad.o</div><div class='del'>-obj-$(CONFIG_EXYNOS4_SETUP_SDHCI)	+= setup-sdhci.o</div><div class='ctx'> obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o</div><div class='ctx'> obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY)	+= setup-usb-phy.o</div><div class='add'>+obj-$(CONFIG_EXYNOS4_SETUP_SPI)		+= setup-spi.o</div><div class='head'>diff --git a/arch/arm/mach-exynos/clock-exynos4210.c b/arch/arm/mach-exynos/clock-exynos4210.c<br/>index b9d5ef670eb4..a5823a7f249e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/clock-exynos4210.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/clock-exynos4210.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/clock-exynos4210.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/clock-exynos4210.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> #include &lt;plat/pll.h&gt;</div><div class='ctx'> #include &lt;plat/s5p-clock.h&gt;</div><div class='ctx'> #include &lt;plat/clock-clksrc.h&gt;</div><div class='del'>-#include &lt;plat/exynos4.h&gt;</div><div class='ctx'> #include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='hunk'>@@ -31,6 +30,8 @@</div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> #include &lt;mach/exynos4-clock.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> static struct sleep_save exynos4210_clock_save[] = {</div><div class='ctx'> 	SAVE_ITEM(S5P_CLKSRC_IMAGE),</div><div class='ctx'> 	SAVE_ITEM(S5P_CLKSRC_LCD1),</div><div class='head'>diff --git a/arch/arm/mach-exynos/clock-exynos4212.c b/arch/arm/mach-exynos/clock-exynos4212.c<br/>index 77d5decb34fd..26a668b0d101 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/clock-exynos4212.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/clock-exynos4212.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/clock-exynos4212.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/clock-exynos4212.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> #include &lt;plat/pll.h&gt;</div><div class='ctx'> #include &lt;plat/s5p-clock.h&gt;</div><div class='ctx'> #include &lt;plat/clock-clksrc.h&gt;</div><div class='del'>-#include &lt;plat/exynos4.h&gt;</div><div class='ctx'> #include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='hunk'>@@ -31,6 +30,8 @@</div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> #include &lt;mach/exynos4-clock.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> static struct sleep_save exynos4212_clock_save[] = {</div><div class='ctx'> 	SAVE_ITEM(S5P_CLKSRC_IMAGE),</div><div class='ctx'> 	SAVE_ITEM(S5P_CLKDIV_IMAGE),</div><div class='head'>diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c<br/>index 2894f0adef5c..5a8c42e90005 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/clock.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #include &lt;plat/pll.h&gt;</div><div class='ctx'> #include &lt;plat/s5p-clock.h&gt;</div><div class='ctx'> #include &lt;plat/clock-clksrc.h&gt;</div><div class='del'>-#include &lt;plat/exynos4.h&gt;</div><div class='ctx'> #include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='hunk'>@@ -29,6 +28,8 @@</div><div class='ctx'> #include &lt;mach/sysmmu.h&gt;</div><div class='ctx'> #include &lt;mach/exynos4-clock.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> static struct sleep_save exynos4_clock_save[] = {</div><div class='ctx'> 	SAVE_ITEM(S5P_CLKDIV_LEFTBUS),</div><div class='ctx'> 	SAVE_ITEM(S5P_CLKGATE_IP_LEFTBUS),</div><div class='hunk'>@@ -553,16 +554,6 @@ static struct clk init_clocks_off[] = {</div><div class='ctx'> 		.enable		= exynos4_clk_dac_ctrl,</div><div class='ctx'> 		.ctrlbit	= (1 &lt;&lt; 0),</div><div class='ctx'> 	}, {</div><div class='del'>-		.name		= "dma",</div><div class='del'>-		.devname	= "dma-pl330.0",</div><div class='del'>-		.enable		= exynos4_clk_ip_fsys_ctrl,</div><div class='del'>-		.ctrlbit	= (1 &lt;&lt; 0),</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "dma",</div><div class='del'>-		.devname	= "dma-pl330.1",</div><div class='del'>-		.enable		= exynos4_clk_ip_fsys_ctrl,</div><div class='del'>-		.ctrlbit	= (1 &lt;&lt; 1),</div><div class='del'>-	}, {</div><div class='ctx'> 		.name		= "adc",</div><div class='ctx'> 		.enable		= exynos4_clk_ip_peril_ctrl,</div><div class='ctx'> 		.ctrlbit	= (1 &lt;&lt; 15),</div><div class='hunk'>@@ -778,6 +769,20 @@ static struct clk init_clocks[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk clk_pdma0 = {</div><div class='add'>+	.name		= "dma",</div><div class='add'>+	.devname	= "dma-pl330.0",</div><div class='add'>+	.enable		= exynos4_clk_ip_fsys_ctrl,</div><div class='add'>+	.ctrlbit	= (1 &lt;&lt; 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk clk_pdma1 = {</div><div class='add'>+	.name		= "dma",</div><div class='add'>+	.devname	= "dma-pl330.1",</div><div class='add'>+	.enable		= exynos4_clk_ip_fsys_ctrl,</div><div class='add'>+	.ctrlbit	= (1 &lt;&lt; 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct clk *clkset_group_list[] = {</div><div class='ctx'> 	[0] = &amp;clk_ext_xtal_mux,</div><div class='ctx'> 	[1] = &amp;clk_xusbxti,</div><div class='hunk'>@@ -1009,46 +1014,6 @@ static struct clksrc_clk clk_dout_mmc4 = {</div><div class='ctx'> </div><div class='ctx'> static struct clksrc_clk clksrcs[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "uclk1",</div><div class='del'>-			.devname	= "s5pv210-uart.0",</div><div class='del'>-			.enable		= exynos4_clksrc_mask_peril0_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 0),</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group,</div><div class='del'>-		.reg_src = { .reg = S5P_CLKSRC_PERIL0, .shift = 0, .size = 4 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLKDIV_PERIL0, .shift = 0, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='del'>-			.name		= "uclk1",</div><div class='del'>-			.devname	= "s5pv210-uart.1",</div><div class='del'>-			.enable		= exynos4_clksrc_mask_peril0_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 4),</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group,</div><div class='del'>-		.reg_src = { .reg = S5P_CLKSRC_PERIL0, .shift = 4, .size = 4 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLKDIV_PERIL0, .shift = 4, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='del'>-			.name		= "uclk1",</div><div class='del'>-			.devname	= "s5pv210-uart.2",</div><div class='del'>-			.enable		= exynos4_clksrc_mask_peril0_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 8),</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group,</div><div class='del'>-		.reg_src = { .reg = S5P_CLKSRC_PERIL0, .shift = 8, .size = 4 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLKDIV_PERIL0, .shift = 8, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='del'>-			.name		= "uclk1",</div><div class='del'>-			.devname	= "s5pv210-uart.3",</div><div class='del'>-			.enable		= exynos4_clksrc_mask_peril0_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 12),</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group,</div><div class='del'>-		.reg_src = { .reg = S5P_CLKSRC_PERIL0, .shift = 12, .size = 4 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLKDIV_PERIL0, .shift = 12, .size = 4 },</div><div class='del'>-	}, {</div><div class='ctx'> 		.clk		= {</div><div class='ctx'> 			.name		= "sclk_pwm",</div><div class='ctx'> 			.enable		= exynos4_clksrc_mask_peril0_ctrl,</div><div class='hunk'>@@ -1147,36 +1112,6 @@ static struct clksrc_clk clksrcs[] = {</div><div class='ctx'> 		.reg_div = { .reg = S5P_CLKDIV_LCD0, .shift = 0, .size = 4 },</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.clk		= {</div><div class='del'>-			.name		= "sclk_spi",</div><div class='del'>-			.devname	= "s3c64xx-spi.0",</div><div class='del'>-			.enable		= exynos4_clksrc_mask_peril1_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 16),</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group,</div><div class='del'>-		.reg_src = { .reg = S5P_CLKSRC_PERIL1, .shift = 16, .size = 4 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLKDIV_PERIL1, .shift = 0, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='del'>-			.name		= "sclk_spi",</div><div class='del'>-			.devname	= "s3c64xx-spi.1",</div><div class='del'>-			.enable		= exynos4_clksrc_mask_peril1_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 20),</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group,</div><div class='del'>-		.reg_src = { .reg = S5P_CLKSRC_PERIL1, .shift = 20, .size = 4 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLKDIV_PERIL1, .shift = 16, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='del'>-			.name		= "sclk_spi",</div><div class='del'>-			.devname	= "s3c64xx-spi.2",</div><div class='del'>-			.enable		= exynos4_clksrc_mask_peril1_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 24),</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group,</div><div class='del'>-		.reg_src = { .reg = S5P_CLKSRC_PERIL1, .shift = 24, .size = 4 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLKDIV_PERIL2, .shift = 0, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='ctx'> 			.name		= "sclk_fimg2d",</div><div class='ctx'> 		},</div><div class='ctx'> 		.sources = &amp;clkset_mout_g2d,</div><div class='hunk'>@@ -1192,42 +1127,6 @@ static struct clksrc_clk clksrcs[] = {</div><div class='ctx'> 		.reg_div = { .reg = S5P_CLKDIV_MFC, .shift = 0, .size = 4 },</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.clk		= {</div><div class='del'>-			.name		= "sclk_mmc",</div><div class='del'>-			.devname	= "s3c-sdhci.0",</div><div class='del'>-			.parent		= &amp;clk_dout_mmc0.clk,</div><div class='del'>-			.enable		= exynos4_clksrc_mask_fsys_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 0),</div><div class='del'>-		},</div><div class='del'>-		.reg_div = { .reg = S5P_CLKDIV_FSYS1, .shift = 8, .size = 8 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='del'>-			.name		= "sclk_mmc",</div><div class='del'>-			.devname	= "s3c-sdhci.1",</div><div class='del'>-			.parent         = &amp;clk_dout_mmc1.clk,</div><div class='del'>-			.enable		= exynos4_clksrc_mask_fsys_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 4),</div><div class='del'>-		},</div><div class='del'>-		.reg_div = { .reg = S5P_CLKDIV_FSYS1, .shift = 24, .size = 8 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='del'>-			.name		= "sclk_mmc",</div><div class='del'>-			.devname	= "s3c-sdhci.2",</div><div class='del'>-			.parent         = &amp;clk_dout_mmc2.clk,</div><div class='del'>-			.enable		= exynos4_clksrc_mask_fsys_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 8),</div><div class='del'>-		},</div><div class='del'>-		.reg_div = { .reg = S5P_CLKDIV_FSYS2, .shift = 8, .size = 8 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='del'>-			.name		= "sclk_mmc",</div><div class='del'>-			.devname	= "s3c-sdhci.3",</div><div class='del'>-			.parent         = &amp;clk_dout_mmc3.clk,</div><div class='del'>-			.enable		= exynos4_clksrc_mask_fsys_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 12),</div><div class='del'>-		},</div><div class='del'>-		.reg_div = { .reg = S5P_CLKDIV_FSYS2, .shift = 24, .size = 8 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='ctx'> 			.name		= "sclk_dwmmc",</div><div class='ctx'> 			.parent         = &amp;clk_dout_mmc4.clk,</div><div class='ctx'> 			.enable		= exynos4_clksrc_mask_fsys_ctrl,</div><div class='hunk'>@@ -1237,6 +1136,134 @@ static struct clksrc_clk clksrcs[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clksrc_clk clk_sclk_uart0 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "uclk1",</div><div class='add'>+		.devname	= "exynos4210-uart.0",</div><div class='add'>+		.enable		= exynos4_clksrc_mask_peril0_ctrl,</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 0),</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group,</div><div class='add'>+	.reg_src = { .reg = S5P_CLKSRC_PERIL0, .shift = 0, .size = 4 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLKDIV_PERIL0, .shift = 0, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_uart1 = {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "uclk1",</div><div class='add'>+		.devname	= "exynos4210-uart.1",</div><div class='add'>+		.enable		= exynos4_clksrc_mask_peril0_ctrl,</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 4),</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group,</div><div class='add'>+	.reg_src = { .reg = S5P_CLKSRC_PERIL0, .shift = 4, .size = 4 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLKDIV_PERIL0, .shift = 4, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_uart2 = {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "uclk1",</div><div class='add'>+		.devname	= "exynos4210-uart.2",</div><div class='add'>+		.enable		= exynos4_clksrc_mask_peril0_ctrl,</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 8),</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group,</div><div class='add'>+	.reg_src = { .reg = S5P_CLKSRC_PERIL0, .shift = 8, .size = 4 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLKDIV_PERIL0, .shift = 8, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_uart3 = {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "uclk1",</div><div class='add'>+		.devname	= "exynos4210-uart.3",</div><div class='add'>+		.enable		= exynos4_clksrc_mask_peril0_ctrl,</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 12),</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group,</div><div class='add'>+	.reg_src = { .reg = S5P_CLKSRC_PERIL0, .shift = 12, .size = 4 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLKDIV_PERIL0, .shift = 12, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_mmc0 = {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "sclk_mmc",</div><div class='add'>+		.devname	= "s3c-sdhci.0",</div><div class='add'>+		.parent		= &amp;clk_dout_mmc0.clk,</div><div class='add'>+		.enable		= exynos4_clksrc_mask_fsys_ctrl,</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 0),</div><div class='add'>+	},</div><div class='add'>+	.reg_div = { .reg = S5P_CLKDIV_FSYS1, .shift = 8, .size = 8 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_mmc1 = {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "sclk_mmc",</div><div class='add'>+		.devname	= "s3c-sdhci.1",</div><div class='add'>+		.parent         = &amp;clk_dout_mmc1.clk,</div><div class='add'>+		.enable		= exynos4_clksrc_mask_fsys_ctrl,</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 4),</div><div class='add'>+	},</div><div class='add'>+	.reg_div = { .reg = S5P_CLKDIV_FSYS1, .shift = 24, .size = 8 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_mmc2 = {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "sclk_mmc",</div><div class='add'>+		.devname	= "s3c-sdhci.2",</div><div class='add'>+		.parent         = &amp;clk_dout_mmc2.clk,</div><div class='add'>+		.enable		= exynos4_clksrc_mask_fsys_ctrl,</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 8),</div><div class='add'>+	},</div><div class='add'>+	.reg_div = { .reg = S5P_CLKDIV_FSYS2, .shift = 8, .size = 8 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_mmc3 = {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "sclk_mmc",</div><div class='add'>+		.devname	= "s3c-sdhci.3",</div><div class='add'>+		.parent         = &amp;clk_dout_mmc3.clk,</div><div class='add'>+		.enable		= exynos4_clksrc_mask_fsys_ctrl,</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 12),</div><div class='add'>+	},</div><div class='add'>+	.reg_div = { .reg = S5P_CLKDIV_FSYS2, .shift = 24, .size = 8 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_spi0 = {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "sclk_spi",</div><div class='add'>+		.devname		= "s3c64xx-spi.0",</div><div class='add'>+		.enable		= exynos4_clksrc_mask_peril1_ctrl,</div><div class='add'>+		.ctrlbit		= (1 &lt;&lt; 16),</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group,</div><div class='add'>+	.reg_src = { .reg = S5P_CLKSRC_PERIL1, .shift = 16, .size = 4 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLKDIV_PERIL1, .shift = 0, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_spi1 = {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "sclk_spi",</div><div class='add'>+		.devname		= "s3c64xx-spi.1",</div><div class='add'>+		.enable		= exynos4_clksrc_mask_peril1_ctrl,</div><div class='add'>+		.ctrlbit		= (1 &lt;&lt; 20),</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group,</div><div class='add'>+	.reg_src = { .reg = S5P_CLKSRC_PERIL1, .shift = 20, .size = 4 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLKDIV_PERIL1, .shift = 16, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_spi2 = {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "sclk_spi",</div><div class='add'>+		.devname		= "s3c64xx-spi.2",</div><div class='add'>+		.enable		= exynos4_clksrc_mask_peril1_ctrl,</div><div class='add'>+		.ctrlbit		= (1 &lt;&lt; 24),</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group,</div><div class='add'>+	.reg_src = { .reg = S5P_CLKSRC_PERIL1, .shift = 24, .size = 4 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLKDIV_PERIL2, .shift = 0, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Clock initialization code */</div><div class='ctx'> static struct clksrc_clk *sysclks[] = {</div><div class='ctx'> 	&amp;clk_mout_apll,</div><div class='hunk'>@@ -1271,6 +1298,42 @@ static struct clksrc_clk *sysclks[] = {</div><div class='ctx'> 	&amp;clk_mout_mfc1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk *clk_cdev[] = {</div><div class='add'>+	&amp;clk_pdma0,</div><div class='add'>+	&amp;clk_pdma1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk *clksrc_cdev[] = {</div><div class='add'>+	&amp;clk_sclk_uart0,</div><div class='add'>+	&amp;clk_sclk_uart1,</div><div class='add'>+	&amp;clk_sclk_uart2,</div><div class='add'>+	&amp;clk_sclk_uart3,</div><div class='add'>+	&amp;clk_sclk_mmc0,</div><div class='add'>+	&amp;clk_sclk_mmc1,</div><div class='add'>+	&amp;clk_sclk_mmc2,</div><div class='add'>+	&amp;clk_sclk_mmc3,</div><div class='add'>+	&amp;clk_sclk_spi0,</div><div class='add'>+	&amp;clk_sclk_spi1,</div><div class='add'>+	&amp;clk_sclk_spi2,</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_lookup exynos4_clk_lookup[] = {</div><div class='add'>+	CLKDEV_INIT("exynos4210-uart.0", "clk_uart_baud0", &amp;clk_sclk_uart0.clk),</div><div class='add'>+	CLKDEV_INIT("exynos4210-uart.1", "clk_uart_baud0", &amp;clk_sclk_uart1.clk),</div><div class='add'>+	CLKDEV_INIT("exynos4210-uart.2", "clk_uart_baud0", &amp;clk_sclk_uart2.clk),</div><div class='add'>+	CLKDEV_INIT("exynos4210-uart.3", "clk_uart_baud0", &amp;clk_sclk_uart3.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &amp;clk_sclk_mmc0.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &amp;clk_sclk_mmc1.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &amp;clk_sclk_mmc2.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.3", "mmc_busclk.2", &amp;clk_sclk_mmc3.clk),</div><div class='add'>+	CLKDEV_INIT("dma-pl330.0", "apb_pclk", &amp;clk_pdma0),</div><div class='add'>+	CLKDEV_INIT("dma-pl330.1", "apb_pclk", &amp;clk_pdma1),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk0", &amp;clk_sclk_spi0.clk),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.1", "spi_busclk0", &amp;clk_sclk_spi1.clk),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.2", "spi_busclk0", &amp;clk_sclk_spi2.clk),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int xtal_rate;</div><div class='ctx'> </div><div class='ctx'> static unsigned long exynos4_fout_apll_get_rate(struct clk *clk)</div><div class='hunk'>@@ -1478,11 +1541,19 @@ void __init exynos4_register_clocks(void)</div><div class='ctx'> 	for (ptr = 0; ptr &lt; ARRAY_SIZE(sclk_tv); ptr++)</div><div class='ctx'> 		s3c_register_clksrc(sclk_tv[ptr], 1);</div><div class='ctx'> </div><div class='add'>+	for (ptr = 0; ptr &lt; ARRAY_SIZE(clksrc_cdev); ptr++)</div><div class='add'>+		s3c_register_clksrc(clksrc_cdev[ptr], 1);</div><div class='add'>+</div><div class='ctx'> 	s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));</div><div class='ctx'> 	s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));</div><div class='ctx'> </div><div class='add'>+	s3c24xx_register_clocks(clk_cdev, ARRAY_SIZE(clk_cdev));</div><div class='add'>+	for (ptr = 0; ptr &lt; ARRAY_SIZE(clk_cdev); ptr++)</div><div class='add'>+		s3c_disable_clocks(clk_cdev[ptr], 1);</div><div class='add'>+</div><div class='ctx'> 	s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));</div><div class='ctx'> 	s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));</div><div class='add'>+	clkdev_add_table(exynos4_clk_lookup, ARRAY_SIZE(exynos4_clk_lookup));</div><div class='ctx'> </div><div class='ctx'> 	register_syscore_ops(&amp;exynos4_clock_syscore_ops);</div><div class='ctx'> 	s3c24xx_register_clock(&amp;dummy_apb_pclk);</div><div class='head'>diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c<br/>new file mode 100644<br/>index 000000000000..c59e18871006<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/common.c</a></div><div class='hunk'>@@ -0,0 +1,699 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * Common Codes for EXYNOS</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/serial_core.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/proc-fns.h&gt;</div><div class='add'>+#include &lt;asm/exception.h&gt;</div><div class='add'>+#include &lt;asm/hardware/cache-l2x0.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/regs-irq.h&gt;</div><div class='add'>+#include &lt;mach/regs-pmu.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='add'>+#include &lt;plat/sdhci.h&gt;</div><div class='add'>+#include &lt;plat/gpio-cfg.h&gt;</div><div class='add'>+#include &lt;plat/adc-core.h&gt;</div><div class='add'>+#include &lt;plat/fb-core.h&gt;</div><div class='add'>+#include &lt;plat/fimc-core.h&gt;</div><div class='add'>+#include &lt;plat/iic-core.h&gt;</div><div class='add'>+#include &lt;plat/tv-core.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+static const char name_exynos4210[] = "EXYNOS4210";</div><div class='add'>+static const char name_exynos4212[] = "EXYNOS4212";</div><div class='add'>+static const char name_exynos4412[] = "EXYNOS4412";</div><div class='add'>+</div><div class='add'>+static struct cpu_table cpu_ids[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.idcode		= EXYNOS4210_CPU_ID,</div><div class='add'>+		.idmask		= EXYNOS4_CPU_MASK,</div><div class='add'>+		.map_io		= exynos4_map_io,</div><div class='add'>+		.init_clocks	= exynos4_init_clocks,</div><div class='add'>+		.init_uarts	= exynos4_init_uarts,</div><div class='add'>+		.init		= exynos_init,</div><div class='add'>+		.name		= name_exynos4210,</div><div class='add'>+	}, {</div><div class='add'>+		.idcode		= EXYNOS4212_CPU_ID,</div><div class='add'>+		.idmask		= EXYNOS4_CPU_MASK,</div><div class='add'>+		.map_io		= exynos4_map_io,</div><div class='add'>+		.init_clocks	= exynos4_init_clocks,</div><div class='add'>+		.init_uarts	= exynos4_init_uarts,</div><div class='add'>+		.init		= exynos_init,</div><div class='add'>+		.name		= name_exynos4212,</div><div class='add'>+	}, {</div><div class='add'>+		.idcode		= EXYNOS4412_CPU_ID,</div><div class='add'>+		.idmask		= EXYNOS4_CPU_MASK,</div><div class='add'>+		.map_io		= exynos4_map_io,</div><div class='add'>+		.init_clocks	= exynos4_init_clocks,</div><div class='add'>+		.init_uarts	= exynos4_init_uarts,</div><div class='add'>+		.init		= exynos_init,</div><div class='add'>+		.name		= name_exynos4412,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Initial IO mappings */</div><div class='add'>+</div><div class='add'>+static struct map_desc exynos_iodesc[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_CHIPID,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_CHIPID),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_SYS,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_SYSCON),</div><div class='add'>+		.length		= SZ_64K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_TIMER,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_TIMER),</div><div class='add'>+		.length		= SZ_16K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_WATCHDOG,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_WATCHDOG),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_SROMC,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_SROMC),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_SYSTIMER,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_SYSTIMER),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_PMU,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_PMU),</div><div class='add'>+		.length		= SZ_64K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_COMBINER_BASE,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_COMBINER),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_GIC_CPU,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_GIC_CPU),</div><div class='add'>+		.length		= SZ_64K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_GIC_DIST,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_GIC_DIST),</div><div class='add'>+		.length		= SZ_64K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_UART,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_UART),</div><div class='add'>+		.length		= SZ_512K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct map_desc exynos4_iodesc[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_CMU,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_CMU),</div><div class='add'>+		.length		= SZ_128K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_COREPERI_BASE,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_COREPERI),</div><div class='add'>+		.length		= SZ_8K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_L2CC,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_L2CC),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_GPIO1,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_GPIO1),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_GPIO2,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_GPIO2),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_GPIO3,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_GPIO3),</div><div class='add'>+		.length		= SZ_256,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_DMC0,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_DMC0),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_USB_HSPHY,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_HSPHY),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct map_desc exynos4_iodesc0[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_SYSRAM,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_SYSRAM0),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct map_desc exynos4_iodesc1[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_SYSRAM,</div><div class='add'>+		.pfn		= __phys_to_pfn(EXYNOS4_PA_SYSRAM1),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void exynos_idle(void)</div><div class='add'>+{</div><div class='add'>+	if (!need_resched())</div><div class='add'>+		cpu_do_idle();</div><div class='add'>+</div><div class='add'>+	local_irq_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void exynos4_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(0x1, S5P_SWRESET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * exynos_map_io</div><div class='add'>+ *</div><div class='add'>+ * register the standard cpu IO areas</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void __init exynos_init_io(struct map_desc *mach_desc, int size)</div><div class='add'>+{</div><div class='add'>+	/* initialize the io descriptors we need for initialization */</div><div class='add'>+	iotable_init(exynos_iodesc, ARRAY_SIZE(exynos_iodesc));</div><div class='add'>+	if (mach_desc)</div><div class='add'>+		iotable_init(mach_desc, size);</div><div class='add'>+</div><div class='add'>+	/* detect cpu id and rev. */</div><div class='add'>+	s5p_init_cpu(S5P_VA_CHIPID);</div><div class='add'>+</div><div class='add'>+	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init exynos4_map_io(void)</div><div class='add'>+{</div><div class='add'>+	iotable_init(exynos4_iodesc, ARRAY_SIZE(exynos4_iodesc));</div><div class='add'>+</div><div class='add'>+	if (soc_is_exynos4210() &amp;&amp; samsung_rev() == EXYNOS4210_REV_0)</div><div class='add'>+		iotable_init(exynos4_iodesc0, ARRAY_SIZE(exynos4_iodesc0));</div><div class='add'>+	else</div><div class='add'>+		iotable_init(exynos4_iodesc1, ARRAY_SIZE(exynos4_iodesc1));</div><div class='add'>+</div><div class='add'>+	/* initialize device information early */</div><div class='add'>+	exynos4_default_sdhci0();</div><div class='add'>+	exynos4_default_sdhci1();</div><div class='add'>+	exynos4_default_sdhci2();</div><div class='add'>+	exynos4_default_sdhci3();</div><div class='add'>+</div><div class='add'>+	s3c_adc_setname("samsung-adc-v3");</div><div class='add'>+</div><div class='add'>+	s3c_fimc_setname(0, "exynos4-fimc");</div><div class='add'>+	s3c_fimc_setname(1, "exynos4-fimc");</div><div class='add'>+	s3c_fimc_setname(2, "exynos4-fimc");</div><div class='add'>+	s3c_fimc_setname(3, "exynos4-fimc");</div><div class='add'>+</div><div class='add'>+	/* The I2C bus controllers are directly compatible with s3c2440 */</div><div class='add'>+	s3c_i2c0_setname("s3c2440-i2c");</div><div class='add'>+	s3c_i2c1_setname("s3c2440-i2c");</div><div class='add'>+	s3c_i2c2_setname("s3c2440-i2c");</div><div class='add'>+</div><div class='add'>+	s5p_fb_setname(0, "exynos4-fb");</div><div class='add'>+	s5p_hdmi_setname("exynos4-hdmi");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init exynos4_init_clocks(int xtal)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_DEBUG "%s: initializing clocks\n", __func__);</div><div class='add'>+</div><div class='add'>+	s3c24xx_register_baseclocks(xtal);</div><div class='add'>+	s5p_register_clocks(xtal);</div><div class='add'>+</div><div class='add'>+	if (soc_is_exynos4210())</div><div class='add'>+		exynos4210_register_clocks();</div><div class='add'>+	else if (soc_is_exynos4212() || soc_is_exynos4412())</div><div class='add'>+		exynos4212_register_clocks();</div><div class='add'>+</div><div class='add'>+	exynos4_register_clocks();</div><div class='add'>+	exynos4_setup_clocks();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define COMBINER_ENABLE_SET	0x0</div><div class='add'>+#define COMBINER_ENABLE_CLEAR	0x4</div><div class='add'>+#define COMBINER_INT_STATUS	0xC</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(irq_controller_lock);</div><div class='add'>+</div><div class='add'>+struct combiner_chip_data {</div><div class='add'>+	unsigned int irq_offset;</div><div class='add'>+	unsigned int irq_mask;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct combiner_chip_data combiner_data[MAX_COMBINER_NR];</div><div class='add'>+</div><div class='add'>+static inline void __iomem *combiner_base(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	struct combiner_chip_data *combiner_data =</div><div class='add'>+		irq_data_get_irq_chip_data(data);</div><div class='add'>+</div><div class='add'>+	return combiner_data-&gt;base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void combiner_mask_irq(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	u32 mask = 1 &lt;&lt; (data-&gt;irq % 32);</div><div class='add'>+</div><div class='add'>+	__raw_writel(mask, combiner_base(data) + COMBINER_ENABLE_CLEAR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void combiner_unmask_irq(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	u32 mask = 1 &lt;&lt; (data-&gt;irq % 32);</div><div class='add'>+</div><div class='add'>+	__raw_writel(mask, combiner_base(data) + COMBINER_ENABLE_SET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void combiner_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct combiner_chip_data *chip_data = irq_get_handler_data(irq);</div><div class='add'>+	struct irq_chip *chip = irq_get_chip(irq);</div><div class='add'>+	unsigned int cascade_irq, combiner_irq;</div><div class='add'>+	unsigned long status;</div><div class='add'>+</div><div class='add'>+	chained_irq_enter(chip, desc);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;irq_controller_lock);</div><div class='add'>+	status = __raw_readl(chip_data-&gt;base + COMBINER_INT_STATUS);</div><div class='add'>+	spin_unlock(&amp;irq_controller_lock);</div><div class='add'>+	status &amp;= chip_data-&gt;irq_mask;</div><div class='add'>+</div><div class='add'>+	if (status == 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	combiner_irq = __ffs(status);</div><div class='add'>+</div><div class='add'>+	cascade_irq = combiner_irq + (chip_data-&gt;irq_offset &amp; ~31);</div><div class='add'>+	if (unlikely(cascade_irq &gt;= NR_IRQS))</div><div class='add'>+		do_bad_IRQ(cascade_irq, desc);</div><div class='add'>+	else</div><div class='add'>+		generic_handle_irq(cascade_irq);</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	chained_irq_exit(chip, desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip combiner_chip = {</div><div class='add'>+	.name		= "COMBINER",</div><div class='add'>+	.irq_mask	= combiner_mask_irq,</div><div class='add'>+	.irq_unmask	= combiner_unmask_irq,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init combiner_cascade_irq(unsigned int combiner_nr, unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	if (combiner_nr &gt;= MAX_COMBINER_NR)</div><div class='add'>+		BUG();</div><div class='add'>+	if (irq_set_handler_data(irq, &amp;combiner_data[combiner_nr]) != 0)</div><div class='add'>+		BUG();</div><div class='add'>+	irq_set_chained_handler(irq, combiner_handle_cascade_irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init combiner_init(unsigned int combiner_nr, void __iomem *base,</div><div class='add'>+			  unsigned int irq_start)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (combiner_nr &gt;= MAX_COMBINER_NR)</div><div class='add'>+		BUG();</div><div class='add'>+</div><div class='add'>+	combiner_data[combiner_nr].base = base;</div><div class='add'>+	combiner_data[combiner_nr].irq_offset = irq_start;</div><div class='add'>+	combiner_data[combiner_nr].irq_mask = 0xff &lt;&lt; ((combiner_nr % 4) &lt;&lt; 3);</div><div class='add'>+</div><div class='add'>+	/* Disable all interrupts */</div><div class='add'>+</div><div class='add'>+	__raw_writel(combiner_data[combiner_nr].irq_mask,</div><div class='add'>+		     base + COMBINER_ENABLE_CLEAR);</div><div class='add'>+</div><div class='add'>+	/* Setup the Linux IRQ subsystem */</div><div class='add'>+</div><div class='add'>+	for (i = irq_start; i &lt; combiner_data[combiner_nr].irq_offset</div><div class='add'>+				+ MAX_IRQ_IN_COMBINER; i++) {</div><div class='add'>+		irq_set_chip_and_handler(i, &amp;combiner_chip, handle_level_irq);</div><div class='add'>+		irq_set_chip_data(i, &amp;combiner_data[combiner_nr]);</div><div class='add'>+		set_irq_flags(i, IRQF_VALID | IRQF_PROBE);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+static const struct of_device_id exynos4_dt_irq_match[] = {</div><div class='add'>+	{ .compatible = "arm,cortex-a9-gic", .data = gic_of_init, },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void __init exynos4_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	int irq;</div><div class='add'>+	unsigned int gic_bank_offset;</div><div class='add'>+</div><div class='add'>+	gic_bank_offset = soc_is_exynos4412() ? 0x4000 : 0x8000;</div><div class='add'>+</div><div class='add'>+	if (!of_have_populated_dt())</div><div class='add'>+		gic_init_bases(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU, gic_bank_offset);</div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+	else</div><div class='add'>+		of_irq_init(exynos4_dt_irq_match);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (irq = 0; irq &lt; MAX_COMBINER_NR; irq++) {</div><div class='add'>+</div><div class='add'>+		combiner_init(irq, (void __iomem *)S5P_VA_COMBINER(irq),</div><div class='add'>+				COMBINER_IRQ(irq, 0));</div><div class='add'>+		combiner_cascade_irq(irq, IRQ_SPI(irq));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The parameters of s5p_init_irq() are for VIC init.</div><div class='add'>+	 * Theses parameters should be NULL and 0 because EXYNOS4</div><div class='add'>+	 * uses GIC instead of VIC.</div><div class='add'>+	 */</div><div class='add'>+	s5p_init_irq(NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct bus_type exynos4_subsys = {</div><div class='add'>+	.name		= "exynos4-core",</div><div class='add'>+	.dev_name	= "exynos4-core",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct device exynos4_dev = {</div><div class='add'>+	.bus	= &amp;exynos4_subsys,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init exynos4_core_init(void)</div><div class='add'>+{</div><div class='add'>+	return subsys_system_register(&amp;exynos4_subsys, NULL);</div><div class='add'>+}</div><div class='add'>+core_initcall(exynos4_core_init);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CACHE_L2X0</div><div class='add'>+static int __init exynos4_l2x0_cache_init(void)</div><div class='add'>+{</div><div class='add'>+	/* TAG, Data Latency Control: 2cycle */</div><div class='add'>+	__raw_writel(0x110, S5P_VA_L2CC + L2X0_TAG_LATENCY_CTRL);</div><div class='add'>+</div><div class='add'>+	if (soc_is_exynos4210())</div><div class='add'>+		__raw_writel(0x110, S5P_VA_L2CC + L2X0_DATA_LATENCY_CTRL);</div><div class='add'>+	else if (soc_is_exynos4212() || soc_is_exynos4412())</div><div class='add'>+		__raw_writel(0x120, S5P_VA_L2CC + L2X0_DATA_LATENCY_CTRL);</div><div class='add'>+</div><div class='add'>+	/* L2X0 Prefetch Control */</div><div class='add'>+	__raw_writel(0x30000007, S5P_VA_L2CC + L2X0_PREFETCH_CTRL);</div><div class='add'>+</div><div class='add'>+	/* L2X0 Power Control */</div><div class='add'>+	__raw_writel(L2X0_DYNAMIC_CLK_GATING_EN | L2X0_STNDBY_MODE_EN,</div><div class='add'>+		     S5P_VA_L2CC + L2X0_POWER_CTRL);</div><div class='add'>+</div><div class='add'>+	l2x0_init(S5P_VA_L2CC, 0x7C470001, 0xC200ffff);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+early_initcall(exynos4_l2x0_cache_init);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int __init exynos_init(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO "EXYNOS: Initializing architecture\n");</div><div class='add'>+</div><div class='add'>+	/* set idle function */</div><div class='add'>+	pm_idle = exynos_idle;</div><div class='add'>+</div><div class='add'>+	return device_register(&amp;exynos4_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* uart registration process */</div><div class='add'>+</div><div class='add'>+void __init exynos4_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='add'>+{</div><div class='add'>+	struct s3c2410_uartcfg *tcfg = cfg;</div><div class='add'>+	u32 ucnt;</div><div class='add'>+</div><div class='add'>+	for (ucnt = 0; ucnt &lt; no; ucnt++, tcfg++)</div><div class='add'>+		tcfg-&gt;has_fracval = 1;</div><div class='add'>+</div><div class='add'>+	s3c24xx_init_uartdevs("exynos4210-uart", s5p_uart_resources, cfg, no);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(eint_lock);</div><div class='add'>+</div><div class='add'>+static unsigned int eint0_15_data[16];</div><div class='add'>+</div><div class='add'>+static unsigned int exynos4_get_irq_nr(unsigned int number)</div><div class='add'>+{</div><div class='add'>+	u32 ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (number) {</div><div class='add'>+	case 0 ... 3:</div><div class='add'>+		ret = (number + IRQ_EINT0);</div><div class='add'>+		break;</div><div class='add'>+	case 4 ... 7:</div><div class='add'>+		ret = (number + (IRQ_EINT4 - 4));</div><div class='add'>+		break;</div><div class='add'>+	case 8 ... 15:</div><div class='add'>+		ret = (number + (IRQ_EINT8 - 8));</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "number available : %d\n", number);</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 inline void exynos4_irq_eint_mask(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	u32 mask;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;eint_lock);</div><div class='add'>+	mask = __raw_readl(S5P_EINT_MASK(EINT_REG_NR(data-&gt;irq)));</div><div class='add'>+	mask |= eint_irq_to_bit(data-&gt;irq);</div><div class='add'>+	__raw_writel(mask, S5P_EINT_MASK(EINT_REG_NR(data-&gt;irq)));</div><div class='add'>+	spin_unlock(&amp;eint_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void exynos4_irq_eint_unmask(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	u32 mask;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;eint_lock);</div><div class='add'>+	mask = __raw_readl(S5P_EINT_MASK(EINT_REG_NR(data-&gt;irq)));</div><div class='add'>+	mask &amp;= ~(eint_irq_to_bit(data-&gt;irq));</div><div class='add'>+	__raw_writel(mask, S5P_EINT_MASK(EINT_REG_NR(data-&gt;irq)));</div><div class='add'>+	spin_unlock(&amp;eint_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void exynos4_irq_eint_ack(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(eint_irq_to_bit(data-&gt;irq),</div><div class='add'>+		     S5P_EINT_PEND(EINT_REG_NR(data-&gt;irq)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void exynos4_irq_eint_maskack(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	exynos4_irq_eint_mask(data);</div><div class='add'>+	exynos4_irq_eint_ack(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int exynos4_irq_eint_set_type(struct irq_data *data, unsigned int type)</div><div class='add'>+{</div><div class='add'>+	int offs = EINT_OFFSET(data-&gt;irq);</div><div class='add'>+	int shift;</div><div class='add'>+	u32 ctrl, mask;</div><div class='add'>+	u32 newvalue = 0;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case IRQ_TYPE_EDGE_RISING:</div><div class='add'>+		newvalue = S5P_IRQ_TYPE_EDGE_RISING;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IRQ_TYPE_EDGE_FALLING:</div><div class='add'>+		newvalue = S5P_IRQ_TYPE_EDGE_FALLING;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IRQ_TYPE_EDGE_BOTH:</div><div class='add'>+		newvalue = S5P_IRQ_TYPE_EDGE_BOTH;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IRQ_TYPE_LEVEL_LOW:</div><div class='add'>+		newvalue = S5P_IRQ_TYPE_LEVEL_LOW;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IRQ_TYPE_LEVEL_HIGH:</div><div class='add'>+		newvalue = S5P_IRQ_TYPE_LEVEL_HIGH;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "No such irq type %d", type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	shift = (offs &amp; 0x7) * 4;</div><div class='add'>+	mask = 0x7 &lt;&lt; shift;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;eint_lock);</div><div class='add'>+	ctrl = __raw_readl(S5P_EINT_CON(EINT_REG_NR(data-&gt;irq)));</div><div class='add'>+	ctrl &amp;= ~mask;</div><div class='add'>+	ctrl |= newvalue &lt;&lt; shift;</div><div class='add'>+	__raw_writel(ctrl, S5P_EINT_CON(EINT_REG_NR(data-&gt;irq)));</div><div class='add'>+	spin_unlock(&amp;eint_lock);</div><div class='add'>+</div><div class='add'>+	switch (offs) {</div><div class='add'>+	case 0 ... 7:</div><div class='add'>+		s3c_gpio_cfgpin(EINT_GPIO_0(offs &amp; 0x7), EINT_MODE);</div><div class='add'>+		break;</div><div class='add'>+	case 8 ... 15:</div><div class='add'>+		s3c_gpio_cfgpin(EINT_GPIO_1(offs &amp; 0x7), EINT_MODE);</div><div class='add'>+		break;</div><div class='add'>+	case 16 ... 23:</div><div class='add'>+		s3c_gpio_cfgpin(EINT_GPIO_2(offs &amp; 0x7), EINT_MODE);</div><div class='add'>+		break;</div><div class='add'>+	case 24 ... 31:</div><div class='add'>+		s3c_gpio_cfgpin(EINT_GPIO_3(offs &amp; 0x7), EINT_MODE);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "No such irq number %d", offs);</div><div 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 irq_chip exynos4_irq_eint = {</div><div class='add'>+	.name		= "exynos4-eint",</div><div class='add'>+	.irq_mask	= exynos4_irq_eint_mask,</div><div class='add'>+	.irq_unmask	= exynos4_irq_eint_unmask,</div><div class='add'>+	.irq_mask_ack	= exynos4_irq_eint_maskack,</div><div class='add'>+	.irq_ack	= exynos4_irq_eint_ack,</div><div class='add'>+	.irq_set_type	= exynos4_irq_eint_set_type,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.irq_set_wake	= s3c_irqext_wake,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * exynos4_irq_demux_eint</div><div class='add'>+ *</div><div class='add'>+ * This function demuxes the IRQ from from EINTs 16 to 31.</div><div class='add'>+ * It is designed to be inlined into the specific handler</div><div class='add'>+ * s5p_irq_demux_eintX_Y.</div><div class='add'>+ *</div><div class='add'>+ * Each EINT pend/mask registers handle eight of them.</div><div class='add'>+ */</div><div class='add'>+static inline void exynos4_irq_demux_eint(unsigned int start)</div><div class='add'>+{</div><div class='add'>+	unsigned int irq;</div><div class='add'>+</div><div class='add'>+	u32 status = __raw_readl(S5P_EINT_PEND(EINT_REG_NR(start)));</div><div class='add'>+	u32 mask = __raw_readl(S5P_EINT_MASK(EINT_REG_NR(start)));</div><div class='add'>+</div><div class='add'>+	status &amp;= ~mask;</div><div class='add'>+	status &amp;= 0xff;</div><div class='add'>+</div><div class='add'>+	while (status) {</div><div class='add'>+		irq = fls(status) - 1;</div><div class='add'>+		generic_handle_irq(irq + start);</div><div class='add'>+		status &amp;= ~(1 &lt;&lt; irq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void exynos4_irq_demux_eint16_31(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct irq_chip *chip = irq_get_chip(irq);</div><div class='add'>+	chained_irq_enter(chip, desc);</div><div class='add'>+	exynos4_irq_demux_eint(IRQ_EINT(16));</div><div class='add'>+	exynos4_irq_demux_eint(IRQ_EINT(24));</div><div class='add'>+	chained_irq_exit(chip, desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void exynos4_irq_eint0_15(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	u32 *irq_data = irq_get_handler_data(irq);</div><div class='add'>+	struct irq_chip *chip = irq_get_chip(irq);</div><div class='add'>+</div><div class='add'>+	chained_irq_enter(chip, desc);</div><div class='add'>+	chip-&gt;irq_mask(&amp;desc-&gt;irq_data);</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;irq_ack)</div><div class='add'>+		chip-&gt;irq_ack(&amp;desc-&gt;irq_data);</div><div class='add'>+</div><div class='add'>+	generic_handle_irq(*irq_data);</div><div class='add'>+</div><div class='add'>+	chip-&gt;irq_unmask(&amp;desc-&gt;irq_data);</div><div class='add'>+	chained_irq_exit(chip, desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init exynos4_init_irq_eint(void)</div><div class='add'>+{</div><div class='add'>+	int irq;</div><div class='add'>+</div><div class='add'>+	for (irq = 0 ; irq &lt;= 31 ; irq++) {</div><div class='add'>+		irq_set_chip_and_handler(IRQ_EINT(irq), &amp;exynos4_irq_eint,</div><div class='add'>+					 handle_level_irq);</div><div class='add'>+		set_irq_flags(IRQ_EINT(irq), IRQF_VALID);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq_set_chained_handler(IRQ_EINT16_31, exynos4_irq_demux_eint16_31);</div><div class='add'>+</div><div class='add'>+	for (irq = 0 ; irq &lt;= 15 ; irq++) {</div><div class='add'>+		eint0_15_data[irq] = IRQ_EINT(irq);</div><div class='add'>+</div><div class='add'>+		irq_set_handler_data(exynos4_get_irq_nr(irq),</div><div class='add'>+				     &amp;eint0_15_data[irq]);</div><div class='add'>+		irq_set_chained_handler(exynos4_get_irq_nr(irq),</div><div class='add'>+					exynos4_irq_eint0_15);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+arch_initcall(exynos4_init_irq_eint);</div><div class='head'>diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h<br/>new file mode 100644<br/>index 000000000000..1ac49de0f398<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/common.h</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * Common Header for EXYNOS machines</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ARCH_ARM_MACH_EXYNOS_COMMON_H</div><div class='add'>+#define __ARCH_ARM_MACH_EXYNOS_COMMON_H</div><div class='add'>+</div><div class='add'>+void exynos_init_io(struct map_desc *mach_desc, int size);</div><div class='add'>+void exynos4_init_irq(void);</div><div class='add'>+</div><div class='add'>+void exynos4_register_clocks(void);</div><div class='add'>+void exynos4_setup_clocks(void);</div><div class='add'>+</div><div class='add'>+void exynos4210_register_clocks(void);</div><div class='add'>+void exynos4212_register_clocks(void);</div><div class='add'>+</div><div class='add'>+void exynos4_restart(char mode, const char *cmd);</div><div class='add'>+</div><div class='add'>+extern struct sys_timer exynos4_timer;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_EXYNOS</div><div class='add'>+extern  int exynos_init(void);</div><div class='add'>+extern void exynos4_map_io(void);</div><div class='add'>+extern void exynos4_init_clocks(int xtal);</div><div class='add'>+extern void exynos4_init_uarts(struct s3c2410_uartcfg *cfg, int no);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define exynos4_init_clocks NULL</div><div class='add'>+#define exynos4_init_uarts NULL</div><div class='add'>+#define exynos4_map_io NULL</div><div class='add'>+#define exynos_init NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __ARCH_ARM_MACH_EXYNOS_COMMON_H */</div><div class='head'>diff --git a/arch/arm/mach-exynos/cpu.c b/arch/arm/mach-exynos/cpu.c<br/>deleted file mode 100644<br/>index cc8d4bd6d0f7..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/cpu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/cpu.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,293 +0,0 @@</div><div class='del'>-/* linux/arch/arm/mach-exynos/cpu.c</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/mach/irq.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/proc-fns.h&gt;</div><div class='del'>-#include &lt;asm/hardware/cache-l2x0.h&gt;</div><div class='del'>-#include &lt;asm/hardware/gic.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/cpu.h&gt;</div><div class='del'>-#include &lt;plat/clock.h&gt;</div><div class='del'>-#include &lt;plat/devs.h&gt;</div><div class='del'>-#include &lt;plat/exynos4.h&gt;</div><div class='del'>-#include &lt;plat/adc-core.h&gt;</div><div class='del'>-#include &lt;plat/sdhci.h&gt;</div><div class='del'>-#include &lt;plat/fb-core.h&gt;</div><div class='del'>-#include &lt;plat/fimc-core.h&gt;</div><div class='del'>-#include &lt;plat/iic-core.h&gt;</div><div class='del'>-#include &lt;plat/reset.h&gt;</div><div class='del'>-#include &lt;plat/tv-core.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/regs-irq.h&gt;</div><div class='del'>-#include &lt;mach/regs-pmu.h&gt;</div><div class='del'>-</div><div class='del'>-unsigned int gic_bank_offset __read_mostly;</div><div class='del'>-</div><div class='del'>-extern int combiner_init(unsigned int combiner_nr, void __iomem *base,</div><div class='del'>-			 unsigned int irq_start);</div><div class='del'>-extern void combiner_cascade_irq(unsigned int combiner_nr, unsigned int irq);</div><div class='del'>-</div><div class='del'>-/* Initial IO mappings */</div><div class='del'>-static struct map_desc exynos_iodesc[] __initdata = {</div><div class='del'>-	{</div><div class='del'>-		.virtual	= (unsigned long)S5P_VA_SYSTIMER,</div><div class='del'>-		.pfn		= __phys_to_pfn(EXYNOS_PA_SYSTIMER),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S5P_VA_PMU,</div><div class='del'>-		.pfn		= __phys_to_pfn(EXYNOS_PA_PMU),</div><div class='del'>-		.length		= SZ_64K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S5P_VA_COMBINER_BASE,</div><div class='del'>-		.pfn		= __phys_to_pfn(EXYNOS_PA_COMBINER),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S5P_VA_GIC_CPU,</div><div class='del'>-		.pfn		= __phys_to_pfn(EXYNOS_PA_GIC_CPU),</div><div class='del'>-		.length		= SZ_64K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S5P_VA_GIC_DIST,</div><div class='del'>-		.pfn		= __phys_to_pfn(EXYNOS_PA_GIC_DIST),</div><div class='del'>-		.length		= SZ_64K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S3C_VA_UART,</div><div class='del'>-		.pfn		= __phys_to_pfn(S3C_PA_UART),</div><div class='del'>-		.length		= SZ_512K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct map_desc exynos4_iodesc[] __initdata = {</div><div class='del'>-	{</div><div class='del'>-		.virtual	= (unsigned long)S5P_VA_CMU,</div><div class='del'>-		.pfn		= __phys_to_pfn(EXYNOS4_PA_CMU),</div><div class='del'>-		.length		= SZ_128K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S5P_VA_COREPERI_BASE,</div><div class='del'>-		.pfn		= __phys_to_pfn(EXYNOS4_PA_COREPERI),</div><div class='del'>-		.length		= SZ_8K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S5P_VA_L2CC,</div><div class='del'>-		.pfn		= __phys_to_pfn(EXYNOS4_PA_L2CC),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S5P_VA_GPIO1,</div><div class='del'>-		.pfn		= __phys_to_pfn(EXYNOS4_PA_GPIO1),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S5P_VA_GPIO2,</div><div class='del'>-		.pfn		= __phys_to_pfn(EXYNOS4_PA_GPIO2),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S5P_VA_GPIO3,</div><div class='del'>-		.pfn		= __phys_to_pfn(EXYNOS4_PA_GPIO3),</div><div class='del'>-		.length		= SZ_256,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S5P_VA_DMC0,</div><div class='del'>-		.pfn		= __phys_to_pfn(EXYNOS4_PA_DMC0),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S3C_VA_USB_HSPHY,</div><div class='del'>-		.pfn		= __phys_to_pfn(EXYNOS4_PA_HSPHY),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct map_desc exynos4_iodesc0[] __initdata = {</div><div class='del'>-	{</div><div class='del'>-		.virtual	= (unsigned long)S5P_VA_SYSRAM,</div><div class='del'>-		.pfn		= __phys_to_pfn(EXYNOS4_PA_SYSRAM0),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct map_desc exynos4_iodesc1[] __initdata = {</div><div class='del'>-	{</div><div class='del'>-		.virtual	= (unsigned long)S5P_VA_SYSRAM,</div><div class='del'>-		.pfn		= __phys_to_pfn(EXYNOS4_PA_SYSRAM1),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void exynos_idle(void)</div><div class='del'>-{</div><div class='del'>-	if (!need_resched())</div><div class='del'>-		cpu_do_idle();</div><div class='del'>-</div><div class='del'>-	local_irq_enable();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void exynos4_sw_reset(void)</div><div class='del'>-{</div><div class='del'>-	__raw_writel(0x1, S5P_SWRESET);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * exynos_map_io</div><div class='del'>- *</div><div class='del'>- * register the standard cpu IO areas</div><div class='del'>- */</div><div class='del'>-void __init exynos4_map_io(void)</div><div class='del'>-{</div><div class='del'>-	iotable_init(exynos_iodesc, ARRAY_SIZE(exynos_iodesc));</div><div class='del'>-	iotable_init(exynos4_iodesc, ARRAY_SIZE(exynos4_iodesc));</div><div class='del'>-</div><div class='del'>-	if (soc_is_exynos4210() &amp;&amp; samsung_rev() == EXYNOS4210_REV_0)</div><div class='del'>-		iotable_init(exynos4_iodesc0, ARRAY_SIZE(exynos4_iodesc0));</div><div class='del'>-	else</div><div class='del'>-		iotable_init(exynos4_iodesc1, ARRAY_SIZE(exynos4_iodesc1));</div><div class='del'>-</div><div class='del'>-	/* initialize device information early */</div><div class='del'>-	exynos4_default_sdhci0();</div><div class='del'>-	exynos4_default_sdhci1();</div><div class='del'>-	exynos4_default_sdhci2();</div><div class='del'>-	exynos4_default_sdhci3();</div><div class='del'>-</div><div class='del'>-	s3c_adc_setname("samsung-adc-v3");</div><div class='del'>-</div><div class='del'>-	s3c_fimc_setname(0, "exynos4-fimc");</div><div class='del'>-	s3c_fimc_setname(1, "exynos4-fimc");</div><div class='del'>-	s3c_fimc_setname(2, "exynos4-fimc");</div><div class='del'>-	s3c_fimc_setname(3, "exynos4-fimc");</div><div class='del'>-</div><div class='del'>-	/* The I2C bus controllers are directly compatible with s3c2440 */</div><div class='del'>-	s3c_i2c0_setname("s3c2440-i2c");</div><div class='del'>-	s3c_i2c1_setname("s3c2440-i2c");</div><div class='del'>-	s3c_i2c2_setname("s3c2440-i2c");</div><div class='del'>-</div><div class='del'>-	s5p_fb_setname(0, "exynos4-fb");</div><div class='del'>-	s5p_hdmi_setname("exynos4-hdmi");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init exynos4_init_clocks(int xtal)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_DEBUG "%s: initializing clocks\n", __func__);</div><div class='del'>-</div><div class='del'>-	s3c24xx_register_baseclocks(xtal);</div><div class='del'>-	s5p_register_clocks(xtal);</div><div class='del'>-</div><div class='del'>-	if (soc_is_exynos4210())</div><div class='del'>-		exynos4210_register_clocks();</div><div class='del'>-	else if (soc_is_exynos4212() || soc_is_exynos4412())</div><div class='del'>-		exynos4212_register_clocks();</div><div class='del'>-</div><div class='del'>-	exynos4_register_clocks();</div><div class='del'>-	exynos4_setup_clocks();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void exynos4_gic_irq_fix_base(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	struct gic_chip_data *gic_data = irq_data_get_irq_chip_data(d);</div><div class='del'>-</div><div class='del'>-	gic_data-&gt;cpu_base = S5P_VA_GIC_CPU +</div><div class='del'>-			    (gic_bank_offset * smp_processor_id());</div><div class='del'>-</div><div class='del'>-	gic_data-&gt;dist_base = S5P_VA_GIC_DIST +</div><div class='del'>-			    (gic_bank_offset * smp_processor_id());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init exynos4_init_irq(void)</div><div class='del'>-{</div><div class='del'>-	int irq;</div><div class='del'>-</div><div class='del'>-	gic_bank_offset = soc_is_exynos4412() ? 0x4000 : 0x8000;</div><div class='del'>-</div><div class='del'>-	gic_init(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU);</div><div class='del'>-	gic_arch_extn.irq_eoi = exynos4_gic_irq_fix_base;</div><div class='del'>-	gic_arch_extn.irq_unmask = exynos4_gic_irq_fix_base;</div><div class='del'>-	gic_arch_extn.irq_mask = exynos4_gic_irq_fix_base;</div><div class='del'>-</div><div class='del'>-	for (irq = 0; irq &lt; MAX_COMBINER_NR; irq++) {</div><div class='del'>-</div><div class='del'>-		combiner_init(irq, (void __iomem *)S5P_VA_COMBINER(irq),</div><div class='del'>-				COMBINER_IRQ(irq, 0));</div><div class='del'>-		combiner_cascade_irq(irq, IRQ_SPI(irq));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The parameters of s5p_init_irq() are for VIC init.</div><div class='del'>-	 * Theses parameters should be NULL and 0 because EXYNOS4</div><div class='del'>-	 * uses GIC instead of VIC.</div><div class='del'>-	 */</div><div class='del'>-	s5p_init_irq(NULL, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct sysdev_class exynos4_sysclass = {</div><div class='del'>-	.name	= "exynos4-core",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct sys_device exynos4_sysdev = {</div><div class='del'>-	.cls	= &amp;exynos4_sysclass,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init exynos4_core_init(void)</div><div class='del'>-{</div><div class='del'>-	return sysdev_class_register(&amp;exynos4_sysclass);</div><div class='del'>-}</div><div class='del'>-core_initcall(exynos4_core_init);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CACHE_L2X0</div><div class='del'>-static int __init exynos4_l2x0_cache_init(void)</div><div class='del'>-{</div><div class='del'>-	/* TAG, Data Latency Control: 2cycle */</div><div class='del'>-	__raw_writel(0x110, S5P_VA_L2CC + L2X0_TAG_LATENCY_CTRL);</div><div class='del'>-</div><div class='del'>-	if (soc_is_exynos4210())</div><div class='del'>-		__raw_writel(0x110, S5P_VA_L2CC + L2X0_DATA_LATENCY_CTRL);</div><div class='del'>-	else if (soc_is_exynos4212() || soc_is_exynos4412())</div><div class='del'>-		__raw_writel(0x120, S5P_VA_L2CC + L2X0_DATA_LATENCY_CTRL);</div><div class='del'>-</div><div class='del'>-	/* L2X0 Prefetch Control */</div><div class='del'>-	__raw_writel(0x30000007, S5P_VA_L2CC + L2X0_PREFETCH_CTRL);</div><div class='del'>-</div><div class='del'>-	/* L2X0 Power Control */</div><div class='del'>-	__raw_writel(L2X0_DYNAMIC_CLK_GATING_EN | L2X0_STNDBY_MODE_EN,</div><div class='del'>-		     S5P_VA_L2CC + L2X0_POWER_CTRL);</div><div class='del'>-</div><div class='del'>-	l2x0_init(S5P_VA_L2CC, 0x7C470001, 0xC200ffff);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-early_initcall(exynos4_l2x0_cache_init);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int __init exynos_init(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "EXYNOS: Initializing architecture\n");</div><div class='del'>-</div><div class='del'>-	/* set idle function */</div><div class='del'>-	pm_idle = exynos_idle;</div><div class='del'>-</div><div class='del'>-	/* set sw_reset function */</div><div class='del'>-	if (soc_is_exynos4210() || soc_is_exynos4212() || soc_is_exynos4412())</div><div class='del'>-		s5p_reset_hook = exynos4_sw_reset;</div><div class='del'>-</div><div class='del'>-	return sysdev_register(&amp;exynos4_sysdev);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-exynos/dev-ohci.c b/arch/arm/mach-exynos/dev-ohci.c<br/>new file mode 100644<br/>index 000000000000..b8e75300c77d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/dev-ohci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/dev-ohci.c</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+/* linux/arch/arm/mach-exynos/dev-ohci.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * EXYNOS - OHCI support</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='add'>+#include &lt;mach/map.h&gt;</div><div class='add'>+#include &lt;mach/ohci.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/usb-phy.h&gt;</div><div class='add'>+</div><div class='add'>+static struct resource exynos4_ohci_resource[] = {</div><div class='add'>+	[0] = DEFINE_RES_MEM(EXYNOS4_PA_OHCI, SZ_256),</div><div class='add'>+	[1] = DEFINE_RES_IRQ(IRQ_USB_HOST),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 exynos4_ohci_dma_mask = DMA_BIT_MASK(32);</div><div class='add'>+</div><div class='add'>+struct platform_device exynos4_device_ohci = {</div><div class='add'>+	.name		= "exynos-ohci",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(exynos4_ohci_resource),</div><div class='add'>+	.resource	= exynos4_ohci_resource,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.dma_mask		= &amp;exynos4_ohci_dma_mask,</div><div class='add'>+		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init exynos4_ohci_set_platdata(struct exynos4_ohci_platdata *pd)</div><div class='add'>+{</div><div class='add'>+	struct exynos4_ohci_platdata *npd;</div><div class='add'>+</div><div class='add'>+	npd = s3c_set_platdata(pd, sizeof(struct exynos4_ohci_platdata),</div><div class='add'>+			&amp;exynos4_device_ohci);</div><div class='add'>+</div><div class='add'>+	if (!npd-&gt;phy_init)</div><div class='add'>+		npd-&gt;phy_init = s5p_usb_phy_init;</div><div class='add'>+	if (!npd-&gt;phy_exit)</div><div class='add'>+		npd-&gt;phy_exit = s5p_usb_phy_exit;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-exynos/dma.c b/arch/arm/mach-exynos/dma.c<br/>index 9667c61e64fb..b10fcd270f07 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/dma.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/pl330.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='hunk'>@@ -35,95 +36,42 @@</div><div class='ctx'> </div><div class='ctx'> static u64 dma_dmamask = DMA_BIT_MASK(32);</div><div class='ctx'> </div><div class='del'>-struct dma_pl330_peri pdma0_peri[28] = {</div><div class='del'>-	{</div><div class='del'>-		.peri_id = (u8)DMACH_PCM0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM2_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM2_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MSM_REQ0,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MSM_REQ2,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI2_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI2_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0S_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART2_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART2_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART4_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART4_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SLIMBUS0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SLIMBUS0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SLIMBUS2_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SLIMBUS2_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SLIMBUS4_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SLIMBUS4_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_AC97_MICIN,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_AC97_PCMIN,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_AC97_PCMOUT,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	},</div><div class='add'>+u8 pdma0_peri[] = {</div><div class='add'>+	DMACH_PCM0_RX,</div><div class='add'>+	DMACH_PCM0_TX,</div><div class='add'>+	DMACH_PCM2_RX,</div><div class='add'>+	DMACH_PCM2_TX,</div><div class='add'>+	DMACH_MSM_REQ0,</div><div class='add'>+	DMACH_MSM_REQ2,</div><div class='add'>+	DMACH_SPI0_RX,</div><div class='add'>+	DMACH_SPI0_TX,</div><div class='add'>+	DMACH_SPI2_RX,</div><div class='add'>+	DMACH_SPI2_TX,</div><div class='add'>+	DMACH_I2S0S_TX,</div><div class='add'>+	DMACH_I2S0_RX,</div><div class='add'>+	DMACH_I2S0_TX,</div><div class='add'>+	DMACH_I2S2_RX,</div><div class='add'>+	DMACH_I2S2_TX,</div><div class='add'>+	DMACH_UART0_RX,</div><div class='add'>+	DMACH_UART0_TX,</div><div class='add'>+	DMACH_UART2_RX,</div><div class='add'>+	DMACH_UART2_TX,</div><div class='add'>+	DMACH_UART4_RX,</div><div class='add'>+	DMACH_UART4_TX,</div><div class='add'>+	DMACH_SLIMBUS0_RX,</div><div class='add'>+	DMACH_SLIMBUS0_TX,</div><div class='add'>+	DMACH_SLIMBUS2_RX,</div><div class='add'>+	DMACH_SLIMBUS2_TX,</div><div class='add'>+	DMACH_SLIMBUS4_RX,</div><div class='add'>+	DMACH_SLIMBUS4_TX,</div><div class='add'>+	DMACH_AC97_MICIN,</div><div class='add'>+	DMACH_AC97_PCMIN,</div><div class='add'>+	DMACH_AC97_PCMOUT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dma_pl330_platdata exynos4_pdma0_pdata = {</div><div class='ctx'> 	.nr_valid_peri = ARRAY_SIZE(pdma0_peri),</div><div class='del'>-	.peri = pdma0_peri,</div><div class='add'>+	.peri_id = pdma0_peri,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct amba_device exynos4_device_pdma0 = {</div><div class='hunk'>@@ -142,86 +90,37 @@ struct amba_device exynos4_device_pdma0 = {</div><div class='ctx'> 	.periphid = 0x00041330,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dma_pl330_peri pdma1_peri[25] = {</div><div class='del'>-	{</div><div class='del'>-		.peri_id = (u8)DMACH_PCM0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MSM_REQ1,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MSM_REQ3,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0S_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART3_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART3_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SLIMBUS1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SLIMBUS1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SLIMBUS3_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SLIMBUS3_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SLIMBUS5_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SLIMBUS5_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	},</div><div class='add'>+u8 pdma1_peri[] = {</div><div class='add'>+	DMACH_PCM0_RX,</div><div class='add'>+	DMACH_PCM0_TX,</div><div class='add'>+	DMACH_PCM1_RX,</div><div class='add'>+	DMACH_PCM1_TX,</div><div class='add'>+	DMACH_MSM_REQ1,</div><div class='add'>+	DMACH_MSM_REQ3,</div><div class='add'>+	DMACH_SPI1_RX,</div><div class='add'>+	DMACH_SPI1_TX,</div><div class='add'>+	DMACH_I2S0S_TX,</div><div class='add'>+	DMACH_I2S0_RX,</div><div class='add'>+	DMACH_I2S0_TX,</div><div class='add'>+	DMACH_I2S1_RX,</div><div class='add'>+	DMACH_I2S1_TX,</div><div class='add'>+	DMACH_UART0_RX,</div><div class='add'>+	DMACH_UART0_TX,</div><div class='add'>+	DMACH_UART1_RX,</div><div class='add'>+	DMACH_UART1_TX,</div><div class='add'>+	DMACH_UART3_RX,</div><div class='add'>+	DMACH_UART3_TX,</div><div class='add'>+	DMACH_SLIMBUS1_RX,</div><div class='add'>+	DMACH_SLIMBUS1_TX,</div><div class='add'>+	DMACH_SLIMBUS3_RX,</div><div class='add'>+	DMACH_SLIMBUS3_TX,</div><div class='add'>+	DMACH_SLIMBUS5_RX,</div><div class='add'>+	DMACH_SLIMBUS5_TX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dma_pl330_platdata exynos4_pdma1_pdata = {</div><div class='ctx'> 	.nr_valid_peri = ARRAY_SIZE(pdma1_peri),</div><div class='del'>-	.peri = pdma1_peri,</div><div class='add'>+	.peri_id = pdma1_peri,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct amba_device exynos4_device_pdma1 = {</div><div class='hunk'>@@ -242,7 +141,15 @@ struct amba_device exynos4_device_pdma1 = {</div><div class='ctx'> </div><div class='ctx'> static int __init exynos4_dma_init(void)</div><div class='ctx'> {</div><div class='add'>+	if (of_have_populated_dt())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dma_cap_set(DMA_SLAVE, exynos4_pdma0_pdata.cap_mask);</div><div class='add'>+	dma_cap_set(DMA_CYCLIC, exynos4_pdma0_pdata.cap_mask);</div><div class='ctx'> 	amba_device_register(&amp;exynos4_device_pdma0, &amp;iomem_resource);</div><div class='add'>+</div><div class='add'>+	dma_cap_set(DMA_SLAVE, exynos4_pdma1_pdata.cap_mask);</div><div class='add'>+	dma_cap_set(DMA_CYCLIC, exynos4_pdma1_pdata.cap_mask);</div><div class='ctx'> 	amba_device_register(&amp;exynos4_device_pdma1, &amp;iomem_resource);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/arm/mach-exynos/headsmp.S b/arch/arm/mach-exynos/headsmp.S<br/>index 3cdeb3647542..5364d4bfa8bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/headsmp.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/headsmp.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/headsmp.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/headsmp.S</a></div><div class='hunk'>@@ -36,6 +36,8 @@ pen:	ldr	r7, [r6]</div><div class='ctx'> 	 * should now contain the SVC stack for this core</div><div class='ctx'> 	 */</div><div class='ctx'> 	b	secondary_startup</div><div class='add'>+ENDPROC(exynos4_secondary_startup)</div><div class='ctx'> </div><div class='add'>+	.align 2</div><div class='ctx'> 1:	.long	.</div><div class='ctx'> 	.long	pen_release</div><div class='head'>diff --git a/arch/arm/mach-exynos/include/mach/cpufreq.h b/arch/arm/mach-exynos/include/mach/cpufreq.h<br/>new file mode 100644<br/>index 000000000000..3df27f2d5034<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/include/mach/cpufreq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/include/mach/cpufreq.h</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+/* linux/arch/arm/mach-exynos/include/mach/cpufreq.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * EXYNOS - CPUFreq support</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+enum cpufreq_level_index {</div><div class='add'>+	L0, L1, L2, L3, L4,</div><div class='add'>+	L5, L6, L7, L8, L9,</div><div class='add'>+	L10, L11, L12, L13, L14,</div><div class='add'>+	L15, L16, L17, L18, L19,</div><div class='add'>+	L20,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct exynos_dvfs_info {</div><div class='add'>+	unsigned long	mpll_freq_khz;</div><div class='add'>+	unsigned int	pll_safe_idx;</div><div class='add'>+	unsigned int	pm_lock_idx;</div><div class='add'>+	unsigned int	max_support_idx;</div><div class='add'>+	unsigned int	min_support_idx;</div><div class='add'>+	struct clk	*cpu_clk;</div><div class='add'>+	unsigned int	*volt_table;</div><div class='add'>+	struct cpufreq_frequency_table	*freq_table;</div><div class='add'>+	void (*set_freq)(unsigned int, unsigned int);</div><div class='add'>+	bool (*need_apll_change)(unsigned int, unsigned int);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern int exynos4210_cpufreq_init(struct exynos_dvfs_info *);</div><div class='head'>diff --git a/arch/arm/mach-exynos/include/mach/entry-macro.S b/arch/arm/mach-exynos/include/mach/entry-macro.S<br/>index f5e9fd8e37b4..3ba4f547534b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -9,83 +9,8 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='del'>-#include &lt;asm/hardware/gic.h&gt;</div><div class='del'>-</div><div class='ctx'> 		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='del'>-		.macro  get_irqnr_preamble, base, tmp</div><div class='del'>-		mov	\tmp, #0</div><div class='del'>-</div><div class='del'>-		mrc	p15, 0, \base, c0, c0, 5</div><div class='del'>-		and	\base, \base, #3</div><div class='del'>-		cmp	\base, #0</div><div class='del'>-		beq	1f</div><div class='del'>-</div><div class='del'>-		ldr	\tmp, =gic_bank_offset</div><div class='del'>-		ldr	\tmp, [\tmp]</div><div class='del'>-		cmp	\base, #1</div><div class='del'>-		beq	1f</div><div class='del'>-</div><div class='del'>-		cmp	\base, #2</div><div class='del'>-		addeq	\tmp, \tmp, \tmp</div><div class='del'>-		addne	\tmp, \tmp, \tmp, LSL #1</div><div class='del'>-</div><div class='del'>-1:		ldr	\base, =gic_cpu_base_addr</div><div class='del'>-		ldr	\base, [\base]</div><div class='del'>-		add	\base, \base, \tmp</div><div class='del'>-		.endm</div><div class='del'>-</div><div class='ctx'> 		.macro  arch_ret_to_user, tmp1, tmp2</div><div class='ctx'> 		.endm</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * The interrupt numbering scheme is defined in the</div><div class='del'>-		 * interrupt controller spec.  To wit:</div><div class='del'>-		 *</div><div class='del'>-		 * Interrupts 0-15 are IPI</div><div class='del'>-		 * 16-28 are reserved</div><div class='del'>-		 * 29-31 are local.  We allow 30 to be used for the watchdog.</div><div class='del'>-		 * 32-1020 are global</div><div class='del'>-		 * 1021-1022 are reserved</div><div class='del'>-		 * 1023 is "spurious" (no interrupt)</div><div class='del'>-		 *</div><div class='del'>-		 * For now, we ignore all local interrupts so only return an interrupt if it's</div><div class='del'>-		 * between 30 and 1020.  The test_for_ipi routine below will pick up on IPIs.</div><div class='del'>-		 *</div><div class='del'>-		 * A simple read from the controller will tell us the number of the highest</div><div class='del'>-                 * priority enabled interrupt.  We then just need to check whether it is in the</div><div class='del'>-		 * valid range for an IRQ (30-1020 inclusive).</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		.macro  get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-</div><div class='del'>-		ldr     \irqstat, [\base, #GIC_CPU_INTACK] /* bits 12-10 = src CPU, 9-0 = int # */</div><div class='del'>-</div><div class='del'>-		ldr	\tmp, =1021</div><div class='del'>-</div><div class='del'>-		bic     \irqnr, \irqstat, #0x1c00</div><div class='del'>-</div><div class='del'>-		cmp     \irqnr, #15</div><div class='del'>-		cmpcc	\irqnr, \irqnr</div><div class='del'>-		cmpne	\irqnr, \tmp</div><div class='del'>-		cmpcs	\irqnr, \irqnr</div><div class='del'>-		addne	\irqnr, \irqnr, #32</div><div class='del'>-</div><div class='del'>-		.endm</div><div class='del'>-</div><div class='del'>-		/* We assume that irqstat (the raw value of the IRQ acknowledge</div><div class='del'>-		 * register) is preserved from the macro above.</div><div class='del'>-		 * If there is an IPI, we immediately signal end of interrupt on the</div><div class='del'>-		 * controller, since this requires the original irqstat value which</div><div class='del'>-		 * we won't easily be able to recreate later.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		.macro test_for_ipi, irqnr, irqstat, base, tmp</div><div class='del'>-		bic	\irqnr, \irqstat, #0x1c00</div><div class='del'>-		cmp	\irqnr, #16</div><div class='del'>-		strcc	\irqstat, [\base, #GIC_CPU_EOI]</div><div class='del'>-		cmpcs	\irqnr, \irqnr</div><div class='del'>-		.endm</div><div class='head'>diff --git a/arch/arm/mach-exynos/include/mach/irqs.h b/arch/arm/mach-exynos/include/mach/irqs.h<br/>index dfd4b7eecb90..f77bce04789a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/include/mach/irqs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/include/mach/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/include/mach/irqs.h</a></div><div class='hunk'>@@ -17,13 +17,13 @@</div><div class='ctx'> </div><div class='ctx'> /* PPI: Private Peripheral Interrupt */</div><div class='ctx'> </div><div class='del'>-#define IRQ_PPI(x)		S5P_IRQ(x+16)</div><div class='add'>+#define IRQ_PPI(x)		(x+16)</div><div class='ctx'> </div><div class='ctx'> #define IRQ_MCT_LOCALTIMER	IRQ_PPI(12)</div><div class='ctx'> </div><div class='ctx'> /* SPI: Shared Peripheral Interrupt */</div><div class='ctx'> </div><div class='del'>-#define IRQ_SPI(x)		S5P_IRQ(x+32)</div><div class='add'>+#define IRQ_SPI(x)		(x+32)</div><div class='ctx'> </div><div class='ctx'> #define IRQ_EINT0		IRQ_SPI(16)</div><div class='ctx'> #define IRQ_EINT1		IRQ_SPI(17)</div><div class='hunk'>@@ -72,6 +72,9 @@</div><div class='ctx'> #define IRQ_IIC5		IRQ_SPI(63)</div><div class='ctx'> #define IRQ_IIC6		IRQ_SPI(64)</div><div class='ctx'> #define IRQ_IIC7		IRQ_SPI(65)</div><div class='add'>+#define IRQ_SPI0		IRQ_SPI(66)</div><div class='add'>+#define IRQ_SPI1		IRQ_SPI(67)</div><div class='add'>+#define IRQ_SPI2		IRQ_SPI(68)</div><div class='ctx'> </div><div class='ctx'> #define IRQ_USB_HOST		IRQ_SPI(70)</div><div class='ctx'> #define IRQ_USB_HSOTG		IRQ_SPI(71)</div><div class='hunk'>@@ -163,7 +166,9 @@</div><div class='ctx'> #define IRQ_GPIO2_NR_GROUPS	9</div><div class='ctx'> #define IRQ_GPIO_END		(S5P_GPIOINT_BASE + S5P_GPIOINT_COUNT)</div><div class='ctx'> </div><div class='add'>+#define IRQ_TIMER_BASE		(IRQ_GPIO_END + 64)</div><div class='add'>+</div><div class='ctx'> /* Set the default NR_IRQS */</div><div class='del'>-#define NR_IRQS			(IRQ_GPIO_END + 64)</div><div class='add'>+#define NR_IRQS			(IRQ_TIMER_BASE + IRQ_TIMER_COUNT)</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_ARCH_IRQS_H */</div><div class='head'>diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h<br/>index 058541d45af0..c754a22a2bb3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/include/mach/map.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/include/mach/map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/include/mach/map.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/include/mach/map.h</a></div><div class='hunk'>@@ -87,6 +87,10 @@</div><div class='ctx'> #define EXYNOS4_PA_SYSMMU_TV		0x12E20000</div><div class='ctx'> #define EXYNOS4_PA_SYSMMU_MFC_L		0x13620000</div><div class='ctx'> #define EXYNOS4_PA_SYSMMU_MFC_R		0x13630000</div><div class='add'>+#define EXYNOS4_PA_SPI0			0x13920000</div><div class='add'>+#define EXYNOS4_PA_SPI1			0x13930000</div><div class='add'>+#define EXYNOS4_PA_SPI2			0x13940000</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #define EXYNOS4_PA_GPIO1		0x11400000</div><div class='ctx'> #define EXYNOS4_PA_GPIO2		0x11000000</div><div class='hunk'>@@ -107,6 +111,7 @@</div><div class='ctx'> #define EXYNOS4_PA_SROMC		0x12570000</div><div class='ctx'> </div><div class='ctx'> #define EXYNOS4_PA_EHCI			0x12580000</div><div class='add'>+#define EXYNOS4_PA_OHCI			0x12590000</div><div class='ctx'> #define EXYNOS4_PA_HSPHY		0x125B0000</div><div class='ctx'> #define EXYNOS4_PA_MFC			0x13400000</div><div class='ctx'> </div><div class='hunk'>@@ -148,8 +153,10 @@</div><div class='ctx'> #define S3C_PA_RTC			EXYNOS4_PA_RTC</div><div class='ctx'> #define S3C_PA_WDT			EXYNOS4_PA_WATCHDOG</div><div class='ctx'> #define S3C_PA_UART			EXYNOS4_PA_UART</div><div class='add'>+#define S3C_PA_SPI0			EXYNOS4_PA_SPI0</div><div class='add'>+#define S3C_PA_SPI1			EXYNOS4_PA_SPI1</div><div class='add'>+#define S3C_PA_SPI2			EXYNOS4_PA_SPI2</div><div class='ctx'> </div><div class='del'>-#define S5P_PA_CHIPID			EXYNOS4_PA_CHIPID</div><div class='ctx'> #define S5P_PA_EHCI			EXYNOS4_PA_EHCI</div><div class='ctx'> #define S5P_PA_FIMC0			EXYNOS4_PA_FIMC0</div><div class='ctx'> #define S5P_PA_FIMC1			EXYNOS4_PA_FIMC1</div><div class='hunk'>@@ -166,26 +173,17 @@</div><div class='ctx'> #define S5P_PA_ONENAND_DMA		EXYNOS4_PA_ONENAND_DMA</div><div class='ctx'> #define S5P_PA_SDO			EXYNOS4_PA_SDO</div><div class='ctx'> #define S5P_PA_SDRAM			EXYNOS4_PA_SDRAM</div><div class='del'>-#define S5P_PA_SROMC			EXYNOS4_PA_SROMC</div><div class='del'>-#define S5P_PA_SYSCON			EXYNOS4_PA_SYSCON</div><div class='del'>-#define S5P_PA_TIMER			EXYNOS4_PA_TIMER</div><div class='ctx'> #define S5P_PA_VP			EXYNOS4_PA_VP</div><div class='ctx'> </div><div class='ctx'> #define SAMSUNG_PA_ADC			EXYNOS4_PA_ADC</div><div class='ctx'> #define SAMSUNG_PA_ADC1			EXYNOS4_PA_ADC1</div><div class='ctx'> #define SAMSUNG_PA_KEYPAD		EXYNOS4_PA_KEYPAD</div><div class='ctx'> </div><div class='del'>-#define EXYNOS_PA_COMBINER		EXYNOS4_PA_COMBINER</div><div class='del'>-#define EXYNOS_PA_GIC_CPU		EXYNOS4_PA_GIC_CPU</div><div class='del'>-#define EXYNOS_PA_GIC_DIST		EXYNOS4_PA_GIC_DIST</div><div class='del'>-#define EXYNOS_PA_PMU			EXYNOS4_PA_PMU</div><div class='del'>-#define EXYNOS_PA_SYSTIMER		EXYNOS4_PA_SYSTIMER</div><div class='del'>-</div><div class='ctx'> /* Compatibility UART */</div><div class='ctx'> </div><div class='ctx'> #define S3C_VA_UARTx(x)			(S3C_VA_UART + ((x) * S3C_UART_OFFSET))</div><div class='ctx'> </div><div class='del'>-#define S5P_PA_UART(x)			(S3C_PA_UART + ((x) * S3C_UART_OFFSET))</div><div class='add'>+#define S5P_PA_UART(x)			(EXYNOS4_PA_UART + ((x) * S3C_UART_OFFSET))</div><div class='ctx'> #define S5P_PA_UART0			S5P_PA_UART(0)</div><div class='ctx'> #define S5P_PA_UART1			S5P_PA_UART(1)</div><div class='ctx'> #define S5P_PA_UART2			S5P_PA_UART(2)</div><div class='head'>diff --git a/arch/arm/mach-exynos/include/mach/ohci.h b/arch/arm/mach-exynos/include/mach/ohci.h<br/>new file mode 100644<br/>index 000000000000..c256c595be5e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/include/mach/ohci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/include/mach/ohci.h</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2011 Samsung Electronics Co.Ltd</div><div class='add'>+ *		http://www.samsung.com/</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MACH_EXYNOS_OHCI_H</div><div class='add'>+#define __MACH_EXYNOS_OHCI_H</div><div class='add'>+</div><div class='add'>+struct exynos4_ohci_platdata {</div><div class='add'>+	int (*phy_init)(struct platform_device *pdev, int type);</div><div class='add'>+	int (*phy_exit)(struct platform_device *pdev, int type);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern void exynos4_ohci_set_platdata(struct exynos4_ohci_platdata *pd);</div><div class='add'>+</div><div class='add'>+#endif /* __MACH_EXYNOS_OHCI_H */</div><div class='head'>diff --git a/arch/arm/mach-exynos/include/mach/spi-clocks.h b/arch/arm/mach-exynos/include/mach/spi-clocks.h<br/>new file mode 100644<br/>index 000000000000..576efdf6d091<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/include/mach/spi-clocks.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/include/mach/spi-clocks.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+/* linux/arch/arm/mach-exynos4/include/mach/spi-clocks.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Samsung Electronics Co. Ltd.</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ASM_ARCH_SPI_CLKS_H</div><div class='add'>+#define __ASM_ARCH_SPI_CLKS_H __FILE__</div><div class='add'>+</div><div class='add'>+/* Must source from SCLK_SPI */</div><div class='add'>+#define EXYNOS4_SPI_SRCCLK_SCLK		0</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_ARCH_SPI_CLKS_H */</div><div class='head'>diff --git a/arch/arm/mach-exynos/include/mach/system.h b/arch/arm/mach-exynos/include/mach/system.h<br/>index 5e3220c18fc7..0063a6de3dc8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/include/mach/system.h</a></div><div class='hunk'>@@ -13,8 +13,6 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H __FILE__</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/system-reset.h&gt;</div><div class='del'>-</div><div class='ctx'> static void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* nothing here yet */</div><div class='head'>diff --git a/arch/arm/mach-exynos/include/mach/vmalloc.h b/arch/arm/mach-exynos/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 284330e571d2..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-/* linux/arch/arm/mach-exynos4/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com</div><div class='del'>- *</div><div class='del'>- * Copyright 2010 Ben Dooks &lt;ben-linux@fluff.org&gt;</div><div class='del'>- *</div><div class='del'>- * Based on arch/arm/mach-s5p6440/include/mach/vmalloc.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'>- * EXYNOS4 vmalloc definition</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#ifndef __ASM_ARCH_VMALLOC_H</div><div class='del'>-#define __ASM_ARCH_VMALLOC_H __FILE__</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END	0xF6000000UL</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_ARCH_VMALLOC_H */</div><div class='head'>diff --git a/arch/arm/mach-exynos/init.c b/arch/arm/mach-exynos/init.c<br/>deleted file mode 100644<br/>index a8a83e3881a4..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/init.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +0,0 @@</div><div class='del'>-/* linux/arch/arm/mach-exynos4/init.c</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com/</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/serial_core.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/cpu.h&gt;</div><div class='del'>-#include &lt;plat/devs.h&gt;</div><div class='del'>-#include &lt;plat/regs-serial.h&gt;</div><div class='del'>-</div><div class='del'>-static struct s3c24xx_uart_clksrc exynos4_serial_clocks[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.name		= "uclk1",</div><div class='del'>-		.divisor	= 1,</div><div class='del'>-		.min_baud	= 0,</div><div class='del'>-		.max_baud	= 0,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* uart registration process */</div><div class='del'>-void __init exynos4_common_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='del'>-{</div><div class='del'>-	struct s3c2410_uartcfg *tcfg = cfg;</div><div class='del'>-	u32 ucnt;</div><div class='del'>-</div><div class='del'>-	for (ucnt = 0; ucnt &lt; no; ucnt++, tcfg++) {</div><div class='del'>-		if (!tcfg-&gt;clocks) {</div><div class='del'>-			tcfg-&gt;has_fracval = 1;</div><div class='del'>-			tcfg-&gt;clocks = exynos4_serial_clocks;</div><div class='del'>-			tcfg-&gt;clocks_size = ARRAY_SIZE(exynos4_serial_clocks);</div><div class='del'>-		}</div><div class='del'>-		tcfg-&gt;flags |= NO_NEED_CHECK_CLKSRC;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-exynos/irq-combiner.c b/arch/arm/mach-exynos/irq-combiner.c<br/>deleted file mode 100644<br/>index 5a2758ab055e..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/irq-combiner.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/irq-combiner.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,124 +0,0 @@</div><div class='del'>-/* linux/arch/arm/mach-exynos4/irq-combiner.c</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com</div><div class='del'>- *</div><div class='del'>- * Based on arch/arm/common/gic.c</div><div class='del'>- *</div><div class='del'>- * IRQ COMBINER support</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach/irq.h&gt;</div><div class='del'>-</div><div class='del'>-#define COMBINER_ENABLE_SET	0x0</div><div class='del'>-#define COMBINER_ENABLE_CLEAR	0x4</div><div class='del'>-#define COMBINER_INT_STATUS	0xC</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(irq_controller_lock);</div><div class='del'>-</div><div class='del'>-struct combiner_chip_data {</div><div class='del'>-	unsigned int irq_offset;</div><div class='del'>-	unsigned int irq_mask;</div><div class='del'>-	void __iomem *base;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct combiner_chip_data combiner_data[MAX_COMBINER_NR];</div><div class='del'>-</div><div class='del'>-static inline void __iomem *combiner_base(struct irq_data *data)</div><div class='del'>-{</div><div class='del'>-	struct combiner_chip_data *combiner_data =</div><div class='del'>-		irq_data_get_irq_chip_data(data);</div><div class='del'>-</div><div class='del'>-	return combiner_data-&gt;base;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void combiner_mask_irq(struct irq_data *data)</div><div class='del'>-{</div><div class='del'>-	u32 mask = 1 &lt;&lt; (data-&gt;irq % 32);</div><div class='del'>-</div><div class='del'>-	__raw_writel(mask, combiner_base(data) + COMBINER_ENABLE_CLEAR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void combiner_unmask_irq(struct irq_data *data)</div><div class='del'>-{</div><div class='del'>-	u32 mask = 1 &lt;&lt; (data-&gt;irq % 32);</div><div class='del'>-</div><div class='del'>-	__raw_writel(mask, combiner_base(data) + COMBINER_ENABLE_SET);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void combiner_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)</div><div class='del'>-{</div><div class='del'>-	struct combiner_chip_data *chip_data = irq_get_handler_data(irq);</div><div class='del'>-	struct irq_chip *chip = irq_get_chip(irq);</div><div class='del'>-	unsigned int cascade_irq, combiner_irq;</div><div class='del'>-	unsigned long status;</div><div class='del'>-</div><div class='del'>-	chained_irq_enter(chip, desc);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;irq_controller_lock);</div><div class='del'>-	status = __raw_readl(chip_data-&gt;base + COMBINER_INT_STATUS);</div><div class='del'>-	spin_unlock(&amp;irq_controller_lock);</div><div class='del'>-	status &amp;= chip_data-&gt;irq_mask;</div><div class='del'>-</div><div class='del'>-	if (status == 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	combiner_irq = __ffs(status);</div><div class='del'>-</div><div class='del'>-	cascade_irq = combiner_irq + (chip_data-&gt;irq_offset &amp; ~31);</div><div class='del'>-	if (unlikely(cascade_irq &gt;= NR_IRQS))</div><div class='del'>-		do_bad_IRQ(cascade_irq, desc);</div><div class='del'>-	else</div><div class='del'>-		generic_handle_irq(cascade_irq);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	chained_irq_exit(chip, desc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct irq_chip combiner_chip = {</div><div class='del'>-	.name		= "COMBINER",</div><div class='del'>-	.irq_mask	= combiner_mask_irq,</div><div class='del'>-	.irq_unmask	= combiner_unmask_irq,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __init combiner_cascade_irq(unsigned int combiner_nr, unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	if (combiner_nr &gt;= MAX_COMBINER_NR)</div><div class='del'>-		BUG();</div><div class='del'>-	if (irq_set_handler_data(irq, &amp;combiner_data[combiner_nr]) != 0)</div><div class='del'>-		BUG();</div><div class='del'>-	irq_set_chained_handler(irq, combiner_handle_cascade_irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init combiner_init(unsigned int combiner_nr, void __iomem *base,</div><div class='del'>-			  unsigned int irq_start)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	if (combiner_nr &gt;= MAX_COMBINER_NR)</div><div class='del'>-		BUG();</div><div class='del'>-</div><div class='del'>-	combiner_data[combiner_nr].base = base;</div><div class='del'>-	combiner_data[combiner_nr].irq_offset = irq_start;</div><div class='del'>-	combiner_data[combiner_nr].irq_mask = 0xff &lt;&lt; ((combiner_nr % 4) &lt;&lt; 3);</div><div class='del'>-</div><div class='del'>-	/* Disable all interrupts */</div><div class='del'>-</div><div class='del'>-	__raw_writel(combiner_data[combiner_nr].irq_mask,</div><div class='del'>-		     base + COMBINER_ENABLE_CLEAR);</div><div class='del'>-</div><div class='del'>-	/* Setup the Linux IRQ subsystem */</div><div class='del'>-</div><div class='del'>-	for (i = irq_start; i &lt; combiner_data[combiner_nr].irq_offset</div><div class='del'>-				+ MAX_IRQ_IN_COMBINER; i++) {</div><div class='del'>-		irq_set_chip_and_handler(i, &amp;combiner_chip, handle_level_irq);</div><div class='del'>-		irq_set_chip_data(i, &amp;combiner_data[combiner_nr]);</div><div class='del'>-		set_irq_flags(i, IRQF_VALID | IRQF_PROBE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-exynos/irq-eint.c b/arch/arm/mach-exynos/irq-eint.c<br/>deleted file mode 100644<br/>index badb8c66fc9b..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/irq-eint.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/irq-eint.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,237 +0,0 @@</div><div class='del'>-/* linux/arch/arm/mach-exynos4/irq-eint.c</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com</div><div class='del'>- *</div><div class='del'>- * EXYNOS4 - IRQ EINT support</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/pm.h&gt;</div><div class='del'>-#include &lt;plat/cpu.h&gt;</div><div class='del'>-#include &lt;plat/gpio-cfg.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/regs-gpio.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach/irq.h&gt;</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(eint_lock);</div><div class='del'>-</div><div class='del'>-static unsigned int eint0_15_data[16];</div><div class='del'>-</div><div class='del'>-static unsigned int exynos4_get_irq_nr(unsigned int number)</div><div class='del'>-{</div><div class='del'>-	u32 ret = 0;</div><div class='del'>-</div><div class='del'>-	switch (number) {</div><div class='del'>-	case 0 ... 3:</div><div class='del'>-		ret = (number + IRQ_EINT0);</div><div class='del'>-		break;</div><div class='del'>-	case 4 ... 7:</div><div class='del'>-		ret = (number + (IRQ_EINT4 - 4));</div><div class='del'>-		break;</div><div class='del'>-	case 8 ... 15:</div><div class='del'>-		ret = (number + (IRQ_EINT8 - 8));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "number available : %d\n", number);</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 inline void exynos4_irq_eint_mask(struct irq_data *data)</div><div class='del'>-{</div><div class='del'>-	u32 mask;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;eint_lock);</div><div class='del'>-	mask = __raw_readl(S5P_EINT_MASK(EINT_REG_NR(data-&gt;irq)));</div><div class='del'>-	mask |= eint_irq_to_bit(data-&gt;irq);</div><div class='del'>-	__raw_writel(mask, S5P_EINT_MASK(EINT_REG_NR(data-&gt;irq)));</div><div class='del'>-	spin_unlock(&amp;eint_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void exynos4_irq_eint_unmask(struct irq_data *data)</div><div class='del'>-{</div><div class='del'>-	u32 mask;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;eint_lock);</div><div class='del'>-	mask = __raw_readl(S5P_EINT_MASK(EINT_REG_NR(data-&gt;irq)));</div><div class='del'>-	mask &amp;= ~(eint_irq_to_bit(data-&gt;irq));</div><div class='del'>-	__raw_writel(mask, S5P_EINT_MASK(EINT_REG_NR(data-&gt;irq)));</div><div class='del'>-	spin_unlock(&amp;eint_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void exynos4_irq_eint_ack(struct irq_data *data)</div><div class='del'>-{</div><div class='del'>-	__raw_writel(eint_irq_to_bit(data-&gt;irq),</div><div class='del'>-		     S5P_EINT_PEND(EINT_REG_NR(data-&gt;irq)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void exynos4_irq_eint_maskack(struct irq_data *data)</div><div class='del'>-{</div><div class='del'>-	exynos4_irq_eint_mask(data);</div><div class='del'>-	exynos4_irq_eint_ack(data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int exynos4_irq_eint_set_type(struct irq_data *data, unsigned int type)</div><div class='del'>-{</div><div class='del'>-	int offs = EINT_OFFSET(data-&gt;irq);</div><div class='del'>-	int shift;</div><div class='del'>-	u32 ctrl, mask;</div><div class='del'>-	u32 newvalue = 0;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case IRQ_TYPE_EDGE_RISING:</div><div class='del'>-		newvalue = S5P_IRQ_TYPE_EDGE_RISING;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IRQ_TYPE_EDGE_FALLING:</div><div class='del'>-		newvalue = S5P_IRQ_TYPE_EDGE_FALLING;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IRQ_TYPE_EDGE_BOTH:</div><div class='del'>-		newvalue = S5P_IRQ_TYPE_EDGE_BOTH;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IRQ_TYPE_LEVEL_LOW:</div><div class='del'>-		newvalue = S5P_IRQ_TYPE_LEVEL_LOW;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IRQ_TYPE_LEVEL_HIGH:</div><div class='del'>-		newvalue = S5P_IRQ_TYPE_LEVEL_HIGH;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "No such irq type %d", type);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	shift = (offs &amp; 0x7) * 4;</div><div class='del'>-	mask = 0x7 &lt;&lt; shift;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;eint_lock);</div><div class='del'>-	ctrl = __raw_readl(S5P_EINT_CON(EINT_REG_NR(data-&gt;irq)));</div><div class='del'>-	ctrl &amp;= ~mask;</div><div class='del'>-	ctrl |= newvalue &lt;&lt; shift;</div><div class='del'>-	__raw_writel(ctrl, S5P_EINT_CON(EINT_REG_NR(data-&gt;irq)));</div><div class='del'>-	spin_unlock(&amp;eint_lock);</div><div class='del'>-</div><div class='del'>-	switch (offs) {</div><div class='del'>-	case 0 ... 7:</div><div class='del'>-		s3c_gpio_cfgpin(EINT_GPIO_0(offs &amp; 0x7), EINT_MODE);</div><div class='del'>-		break;</div><div class='del'>-	case 8 ... 15:</div><div class='del'>-		s3c_gpio_cfgpin(EINT_GPIO_1(offs &amp; 0x7), EINT_MODE);</div><div class='del'>-		break;</div><div class='del'>-	case 16 ... 23:</div><div class='del'>-		s3c_gpio_cfgpin(EINT_GPIO_2(offs &amp; 0x7), EINT_MODE);</div><div class='del'>-		break;</div><div class='del'>-	case 24 ... 31:</div><div class='del'>-		s3c_gpio_cfgpin(EINT_GPIO_3(offs &amp; 0x7), EINT_MODE);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "No such irq number %d", offs);</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 struct irq_chip exynos4_irq_eint = {</div><div class='del'>-	.name		= "exynos4-eint",</div><div class='del'>-	.irq_mask	= exynos4_irq_eint_mask,</div><div class='del'>-	.irq_unmask	= exynos4_irq_eint_unmask,</div><div class='del'>-	.irq_mask_ack	= exynos4_irq_eint_maskack,</div><div class='del'>-	.irq_ack	= exynos4_irq_eint_ack,</div><div class='del'>-	.irq_set_type	= exynos4_irq_eint_set_type,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.irq_set_wake	= s3c_irqext_wake,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* exynos4_irq_demux_eint</div><div class='del'>- *</div><div class='del'>- * This function demuxes the IRQ from from EINTs 16 to 31.</div><div class='del'>- * It is designed to be inlined into the specific handler</div><div class='del'>- * s5p_irq_demux_eintX_Y.</div><div class='del'>- *</div><div class='del'>- * Each EINT pend/mask registers handle eight of them.</div><div class='del'>- */</div><div class='del'>-static inline void exynos4_irq_demux_eint(unsigned int start)</div><div class='del'>-{</div><div class='del'>-	unsigned int irq;</div><div class='del'>-</div><div class='del'>-	u32 status = __raw_readl(S5P_EINT_PEND(EINT_REG_NR(start)));</div><div class='del'>-	u32 mask = __raw_readl(S5P_EINT_MASK(EINT_REG_NR(start)));</div><div class='del'>-</div><div class='del'>-	status &amp;= ~mask;</div><div class='del'>-	status &amp;= 0xff;</div><div class='del'>-</div><div class='del'>-	while (status) {</div><div class='del'>-		irq = fls(status) - 1;</div><div class='del'>-		generic_handle_irq(irq + start);</div><div class='del'>-		status &amp;= ~(1 &lt;&lt; irq);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void exynos4_irq_demux_eint16_31(unsigned int irq, struct irq_desc *desc)</div><div class='del'>-{</div><div class='del'>-	struct irq_chip *chip = irq_get_chip(irq);</div><div class='del'>-	chained_irq_enter(chip, desc);</div><div class='del'>-	exynos4_irq_demux_eint(IRQ_EINT(16));</div><div class='del'>-	exynos4_irq_demux_eint(IRQ_EINT(24));</div><div class='del'>-	chained_irq_exit(chip, desc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void exynos4_irq_eint0_15(unsigned int irq, struct irq_desc *desc)</div><div class='del'>-{</div><div class='del'>-	u32 *irq_data = irq_get_handler_data(irq);</div><div class='del'>-	struct irq_chip *chip = irq_get_chip(irq);</div><div class='del'>-</div><div class='del'>-	chained_irq_enter(chip, desc);</div><div class='del'>-	chip-&gt;irq_mask(&amp;desc-&gt;irq_data);</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;irq_ack)</div><div class='del'>-		chip-&gt;irq_ack(&amp;desc-&gt;irq_data);</div><div class='del'>-</div><div class='del'>-	generic_handle_irq(*irq_data);</div><div class='del'>-</div><div class='del'>-	chip-&gt;irq_unmask(&amp;desc-&gt;irq_data);</div><div class='del'>-	chained_irq_exit(chip, desc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init exynos4_init_irq_eint(void)</div><div class='del'>-{</div><div class='del'>-	int irq;</div><div class='del'>-</div><div class='del'>-	for (irq = 0 ; irq &lt;= 31 ; irq++) {</div><div class='del'>-		irq_set_chip_and_handler(IRQ_EINT(irq), &amp;exynos4_irq_eint,</div><div class='del'>-					 handle_level_irq);</div><div class='del'>-		set_irq_flags(IRQ_EINT(irq), IRQF_VALID);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	irq_set_chained_handler(IRQ_EINT16_31, exynos4_irq_demux_eint16_31);</div><div class='del'>-</div><div class='del'>-	for (irq = 0 ; irq &lt;= 15 ; irq++) {</div><div class='del'>-		eint0_15_data[irq] = IRQ_EINT(irq);</div><div class='del'>-</div><div class='del'>-		irq_set_handler_data(exynos4_get_irq_nr(irq),</div><div class='del'>-				     &amp;eint0_15_data[irq]);</div><div class='del'>-		irq_set_chained_handler(exynos4_get_irq_nr(irq),</div><div class='del'>-					exynos4_irq_eint0_15);</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'>-arch_initcall(exynos4_init_irq_eint);</div><div class='head'>diff --git a/arch/arm/mach-exynos/mach-armlex4210.c b/arch/arm/mach-exynos/mach-armlex4210.c<br/>index f0ca6c157d29..d726fcd3acf9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/mach-armlex4210.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/mach-armlex4210.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/mach-armlex4210.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/mach-armlex4210.c</a></div><div class='hunk'>@@ -16,11 +16,11 @@</div><div class='ctx'> #include &lt;linux/smsc911x.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='del'>-#include &lt;plat/exynos4.h&gt;</div><div class='ctx'> #include &lt;plat/gpio-cfg.h&gt;</div><div class='ctx'> #include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;plat/regs-srom.h&gt;</div><div class='hunk'>@@ -28,6 +28,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> /* Following are default values for UCON, ULCON and UFCON UART registers */</div><div class='ctx'> #define ARMLEX4210_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\</div><div class='ctx'> 				 S3C2410_UCON_RXILEVEL |	\</div><div class='hunk'>@@ -187,7 +189,7 @@ static void __init armlex4210_smsc911x_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __init armlex4210_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	s5p_init_io(NULL, 0, S5P_VA_CHIPID);</div><div class='add'>+	exynos_init_io(NULL, 0);</div><div class='ctx'> 	s3c24xx_init_clocks(24000000);</div><div class='ctx'> 	s3c24xx_init_uarts(armlex4210_uartcfgs,</div><div class='ctx'> 			   ARRAY_SIZE(armlex4210_uartcfgs));</div><div class='hunk'>@@ -210,6 +212,8 @@ MACHINE_START(ARMLEX4210, "ARMLEX4210")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= exynos4_init_irq,</div><div class='ctx'> 	.map_io		= armlex4210_map_io,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= armlex4210_machine_init,</div><div class='ctx'> 	.timer		= &amp;exynos4_timer,</div><div class='add'>+	.restart	= exynos4_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c<br/>new file mode 100644<br/>index 000000000000..85fa02767d67<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/mach-exynos4-dt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/mach-exynos4-dt.c</a></div><div class='hunk'>@@ -0,0 +1,85 @@</div><div class='add'>+/*</div><div class='add'>+ * Samsung's Exynos4210 flattened device tree enabled machine</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ * Copyright (c) 2010-2011 Linaro Ltd.</div><div class='add'>+ *		www.linaro.org</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/serial_core.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;mach/map.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/exynos4.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The following lookup table is used to override device names when devices</div><div class='add'>+ * are registered from device tree. This is temporarily added to enable</div><div class='add'>+ * device tree support addition for the Exynos4 architecture.</div><div class='add'>+ *</div><div class='add'>+ * For drivers that require platform data to be provided from the machine</div><div class='add'>+ * file, a platform data pointer can also be supplied along with the</div><div class='add'>+ * devices names. Usually, the platform data elements that cannot be parsed</div><div class='add'>+ * from the device tree by the drivers (example: function pointers) are</div><div class='add'>+ * supplied. But it should be noted that this is a temporary mechanism and</div><div class='add'>+ * at some point, the drivers should be capable of parsing all the platform</div><div class='add'>+ * data from the device tree.</div><div class='add'>+ */</div><div class='add'>+static const struct of_dev_auxdata exynos4210_auxdata_lookup[] __initconst = {</div><div class='add'>+	OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART0,</div><div class='add'>+				"exynos4210-uart.0", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART1,</div><div class='add'>+				"exynos4210-uart.1", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART2,</div><div class='add'>+				"exynos4210-uart.2", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART3,</div><div class='add'>+				"exynos4210-uart.3", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(0),</div><div class='add'>+				"exynos4-sdhci.0", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(1),</div><div class='add'>+				"exynos4-sdhci.1", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(2),</div><div class='add'>+				"exynos4-sdhci.2", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(3),</div><div class='add'>+				"exynos4-sdhci.3", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS4_PA_IIC(0),</div><div class='add'>+				"s3c2440-i2c.0", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA0, "dma-pl330.0", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA1, "dma-pl330.1", NULL),</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init exynos4210_dt_map_io(void)</div><div class='add'>+{</div><div class='add'>+	s5p_init_io(NULL, 0, S5P_VA_CHIPID);</div><div class='add'>+	s3c24xx_init_clocks(24000000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init exynos4210_dt_machine_init(void)</div><div class='add'>+{</div><div class='add'>+	of_platform_populate(NULL, of_default_bus_match_table,</div><div class='add'>+				exynos4210_auxdata_lookup, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char const *exynos4210_dt_compat[] __initdata = {</div><div class='add'>+	"samsung,exynos4210",</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)")</div><div class='add'>+	/* Maintainer: Thomas Abraham &lt;thomas.abraham@linaro.org&gt; */</div><div class='add'>+	.init_irq	= exynos4_init_irq,</div><div class='add'>+	.map_io		= exynos4210_dt_map_io,</div><div class='add'>+	.init_machine	= exynos4210_dt_machine_init,</div><div class='add'>+	.timer		= &amp;exynos4_timer,</div><div class='add'>+	.dt_compat	= exynos4210_dt_compat,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c<br/>index 236bbe187163..b895ec031105 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/mach-nuri.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/mach-nuri.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/mach-nuri.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/mach-nuri.c</a></div><div class='hunk'>@@ -32,12 +32,12 @@</div><div class='ctx'> #include &lt;media/v4l2-mediabus.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/adc.h&gt;</div><div class='ctx'> #include &lt;plat/regs-fb-v4.h&gt;</div><div class='ctx'> #include &lt;plat/regs-serial.h&gt;</div><div class='del'>-#include &lt;plat/exynos4.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/fb.h&gt;</div><div class='hunk'>@@ -54,6 +54,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> /* Following are default values for UCON, ULCON and UFCON UART registers */</div><div class='ctx'> #define NURI_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\</div><div class='ctx'> 				 S3C2410_UCON_RXILEVEL |	\</div><div class='hunk'>@@ -247,13 +249,8 @@ static void nuri_lcd_power_on(struct plat_lcd_data *pd, unsigned int power)</div><div class='ctx'> </div><div class='ctx'> static int nuri_bl_init(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	int ret, gpio = EXYNOS4_GPE2(3);</div><div class='del'>-</div><div class='del'>-	ret = gpio_request(gpio, "LCD_LDO_EN");</div><div class='del'>-	if (!ret)</div><div class='del'>-		gpio_direction_output(gpio, 0);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return gpio_request_one(EXYNOS4_GPE2(3), GPIOF_OUT_INIT_LOW,</div><div class='add'>+				"LCD_LD0_EN");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nuri_bl_notify(struct device *dev, int brightness)</div><div class='hunk'>@@ -1283,7 +1280,7 @@ static struct platform_device *nuri_devices[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> static void __init nuri_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	s5p_init_io(NULL, 0, S5P_VA_CHIPID);</div><div class='add'>+	exynos_init_io(NULL, 0);</div><div class='ctx'> 	s3c24xx_init_clocks(24000000);</div><div class='ctx'> 	s3c24xx_init_uarts(nuri_uartcfgs, ARRAY_SIZE(nuri_uartcfgs));</div><div class='ctx'> }</div><div class='hunk'>@@ -1333,7 +1330,9 @@ MACHINE_START(NURI, "NURI")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= exynos4_init_irq,</div><div class='ctx'> 	.map_io		= nuri_map_io,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= nuri_machine_init,</div><div class='ctx'> 	.timer		= &amp;exynos4_timer,</div><div class='ctx'> 	.reserve        = &amp;nuri_reserve,</div><div class='add'>+	.restart	= exynos4_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c<br/>index f80b563f2be7..0679b8ad2d1e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/mach-origen.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/mach-origen.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/mach-origen.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/mach-origen.c</a></div><div class='hunk'>@@ -22,13 +22,13 @@</div><div class='ctx'> #include &lt;linux/lcd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/platform_lcd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;plat/regs-fb-v4.h&gt;</div><div class='del'>-#include &lt;plat/exynos4.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/sdhci.h&gt;</div><div class='hunk'>@@ -41,8 +41,11 @@</div><div class='ctx'> #include &lt;plat/fb.h&gt;</div><div class='ctx'> #include &lt;plat/mfc.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;mach/ohci.h&gt;</div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> /* Following are default values for UCON, ULCON and UFCON UART registers */</div><div class='ctx'> #define ORIGEN_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\</div><div class='ctx'> 				 S3C2410_UCON_RXILEVEL |	\</div><div class='hunk'>@@ -483,6 +486,16 @@ static void __init origen_ehci_init(void)</div><div class='ctx'> 	s5p_ehci_set_platdata(pdata);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* USB OHCI */</div><div class='add'>+static struct exynos4_ohci_platdata origen_ohci_pdata;</div><div class='add'>+</div><div class='add'>+static void __init origen_ohci_init(void)</div><div class='add'>+{</div><div class='add'>+	struct exynos4_ohci_platdata *pdata = &amp;origen_ohci_pdata;</div><div class='add'>+</div><div class='add'>+	exynos4_ohci_set_platdata(pdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct gpio_keys_button origen_gpio_keys_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.code			= KEY_MENU,</div><div class='hunk'>@@ -584,7 +597,8 @@ static struct s3c_fb_pd_win origen_fb_win0 = {</div><div class='ctx'> static struct s3c_fb_platdata origen_lcd_pdata __initdata = {</div><div class='ctx'> 	.win[0]		= &amp;origen_fb_win0,</div><div class='ctx'> 	.vidcon0	= VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,</div><div class='del'>-	.vidcon1	= VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,</div><div class='add'>+	.vidcon1	= VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC |</div><div class='add'>+				VIDCON1_INV_VCLK,</div><div class='ctx'> 	.setup_gpio	= exynos4_fimd0_gpio_setup_24bpp,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -606,6 +620,7 @@ static struct platform_device *origen_devices[] __initdata = {</div><div class='ctx'> 	&amp;s5p_device_mfc_l,</div><div class='ctx'> 	&amp;s5p_device_mfc_r,</div><div class='ctx'> 	&amp;s5p_device_mixer,</div><div class='add'>+	&amp;exynos4_device_ohci,</div><div class='ctx'> 	&amp;exynos4_device_pd[PD_LCD0],</div><div class='ctx'> 	&amp;exynos4_device_pd[PD_TV],</div><div class='ctx'> 	&amp;exynos4_device_pd[PD_G3D],</div><div class='hunk'>@@ -638,7 +653,7 @@ static void s5p_tv_setup(void)</div><div class='ctx'> </div><div class='ctx'> static void __init origen_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	s5p_init_io(NULL, 0, S5P_VA_CHIPID);</div><div class='add'>+	exynos_init_io(NULL, 0);</div><div class='ctx'> 	s3c24xx_init_clocks(24000000);</div><div class='ctx'> 	s3c24xx_init_uarts(origen_uartcfgs, ARRAY_SIZE(origen_uartcfgs));</div><div class='ctx'> }</div><div class='hunk'>@@ -670,6 +685,7 @@ static void __init origen_machine_init(void)</div><div class='ctx'> 	s3c_sdhci0_set_platdata(&amp;origen_hsmmc0_pdata);</div><div class='ctx'> </div><div class='ctx'> 	origen_ehci_init();</div><div class='add'>+	origen_ohci_init();</div><div class='ctx'> 	clk_xusbxti.rate = 24000000;</div><div class='ctx'> </div><div class='ctx'> 	s5p_tv_setup();</div><div class='hunk'>@@ -694,7 +710,9 @@ MACHINE_START(ORIGEN, "ORIGEN")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= exynos4_init_irq,</div><div class='ctx'> 	.map_io		= origen_map_io,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= origen_machine_init,</div><div class='ctx'> 	.timer		= &amp;exynos4_timer,</div><div class='ctx'> 	.reserve	= &amp;origen_reserve,</div><div class='add'>+	.restart	= exynos4_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-exynos/mach-smdk4x12.c b/arch/arm/mach-exynos/mach-smdk4x12.c<br/>index fcf2e0e23d53..d00e4f016a68 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/mach-smdk4x12.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/mach-smdk4x12.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/mach-smdk4x12.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/mach-smdk4x12.c</a></div><div class='hunk'>@@ -21,13 +21,13 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/backlight.h&gt;</div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='del'>-#include &lt;plat/exynos4.h&gt;</div><div class='ctx'> #include &lt;plat/gpio-cfg.h&gt;</div><div class='ctx'> #include &lt;plat/iic.h&gt;</div><div class='ctx'> #include &lt;plat/keypad.h&gt;</div><div class='hunk'>@@ -36,6 +36,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> /* Following are default values for UCON, ULCON and UFCON UART registers */</div><div class='ctx'> #define SMDK4X12_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\</div><div class='ctx'> 				 S3C2410_UCON_RXILEVEL |	\</div><div class='hunk'>@@ -249,7 +251,7 @@ static void __init smdk4x12_map_io(void)</div><div class='ctx'> {</div><div class='ctx'> 	clk_xusbxti.rate = 24000000;</div><div class='ctx'> </div><div class='del'>-	s5p_init_io(NULL, 0, S5P_VA_CHIPID);</div><div class='add'>+	exynos_init_io(NULL, 0);</div><div class='ctx'> 	s3c24xx_init_clocks(clk_xusbxti.rate);</div><div class='ctx'> 	s3c24xx_init_uarts(smdk4x12_uartcfgs, ARRAY_SIZE(smdk4x12_uartcfgs));</div><div class='ctx'> }</div><div class='hunk'>@@ -287,8 +289,10 @@ MACHINE_START(SMDK4212, "SMDK4212")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= exynos4_init_irq,</div><div class='ctx'> 	.map_io		= smdk4x12_map_io,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= smdk4x12_machine_init,</div><div class='ctx'> 	.timer		= &amp;exynos4_timer,</div><div class='add'>+	.restart	= exynos4_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(SMDK4412, "SMDK4412")</div><div class='hunk'>@@ -297,6 +301,8 @@ MACHINE_START(SMDK4412, "SMDK4412")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= exynos4_init_irq,</div><div class='ctx'> 	.map_io		= smdk4x12_map_io,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= smdk4x12_machine_init,</div><div class='ctx'> 	.timer		= &amp;exynos4_timer,</div><div class='add'>+	.restart	= exynos4_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c<br/>index cec2afabe7b4..b2c5557f50e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/mach-smdkv310.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/mach-smdkv310.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/mach-smdkv310.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/mach-smdkv310.c</a></div><div class='hunk'>@@ -21,13 +21,13 @@</div><div class='ctx'> #include &lt;linux/pwm_backlight.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/platform_lcd.h&gt;</div><div class='ctx'> #include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;plat/regs-srom.h&gt;</div><div class='ctx'> #include &lt;plat/regs-fb-v4.h&gt;</div><div class='del'>-#include &lt;plat/exynos4.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/fb.h&gt;</div><div class='hunk'>@@ -42,6 +42,9 @@</div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='add'>+#include &lt;mach/ohci.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> /* Following are default values for UCON, ULCON and UFCON UART registers */</div><div class='ctx'> #define SMDKV310_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\</div><div class='hunk'>@@ -129,9 +132,7 @@ static void lcd_lte480wv_set_power(struct plat_lcd_data *pd,</div><div class='ctx'> 		gpio_free(EXYNOS4_GPD0(1));</div><div class='ctx'> #endif</div><div class='ctx'> 		/* fire nRESET on power up */</div><div class='del'>-		gpio_request(EXYNOS4_GPX0(6), "GPX0");</div><div class='del'>-</div><div class='del'>-		gpio_direction_output(EXYNOS4_GPX0(6), 1);</div><div class='add'>+		gpio_request_one(EXYNOS4_GPX0(6), GPIOF_OUT_INIT_HIGH, "GPX0");</div><div class='ctx'> 		mdelay(100);</div><div class='ctx'> </div><div class='ctx'> 		gpio_set_value(EXYNOS4_GPX0(6), 0);</div><div class='hunk'>@@ -245,6 +246,16 @@ static void __init smdkv310_ehci_init(void)</div><div class='ctx'> 	s5p_ehci_set_platdata(pdata);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* USB OHCI */</div><div class='add'>+static struct exynos4_ohci_platdata smdkv310_ohci_pdata;</div><div class='add'>+</div><div class='add'>+static void __init smdkv310_ohci_init(void)</div><div class='add'>+{</div><div class='add'>+	struct exynos4_ohci_platdata *pdata = &amp;smdkv310_ohci_pdata;</div><div class='add'>+</div><div class='add'>+	exynos4_ohci_set_platdata(pdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct platform_device *smdkv310_devices[] __initdata = {</div><div class='ctx'> 	&amp;s3c_device_hsmmc0,</div><div class='ctx'> 	&amp;s3c_device_hsmmc1,</div><div class='hunk'>@@ -261,6 +272,7 @@ static struct platform_device *smdkv310_devices[] __initdata = {</div><div class='ctx'> 	&amp;s5p_device_fimc3,</div><div class='ctx'> 	&amp;exynos4_device_ac97,</div><div class='ctx'> 	&amp;exynos4_device_i2s0,</div><div class='add'>+	&amp;exynos4_device_ohci,</div><div class='ctx'> 	&amp;samsung_device_keypad,</div><div class='ctx'> 	&amp;s5p_device_mfc,</div><div class='ctx'> 	&amp;s5p_device_mfc_l,</div><div class='hunk'>@@ -332,7 +344,7 @@ static void s5p_tv_setup(void)</div><div class='ctx'> </div><div class='ctx'> static void __init smdkv310_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	s5p_init_io(NULL, 0, S5P_VA_CHIPID);</div><div class='add'>+	exynos_init_io(NULL, 0);</div><div class='ctx'> 	s3c24xx_init_clocks(24000000);</div><div class='ctx'> 	s3c24xx_init_uarts(smdkv310_uartcfgs, ARRAY_SIZE(smdkv310_uartcfgs));</div><div class='ctx'> }</div><div class='hunk'>@@ -363,6 +375,7 @@ static void __init smdkv310_machine_init(void)</div><div class='ctx'> 	s5p_fimd0_set_platdata(&amp;smdkv310_lcd0_pdata);</div><div class='ctx'> </div><div class='ctx'> 	smdkv310_ehci_init();</div><div class='add'>+	smdkv310_ohci_init();</div><div class='ctx'> 	clk_xusbxti.rate = 24000000;</div><div class='ctx'> </div><div class='ctx'> 	platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices));</div><div class='hunk'>@@ -375,9 +388,11 @@ MACHINE_START(SMDKV310, "SMDKV310")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= exynos4_init_irq,</div><div class='ctx'> 	.map_io		= smdkv310_map_io,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= smdkv310_machine_init,</div><div class='ctx'> 	.timer		= &amp;exynos4_timer,</div><div class='ctx'> 	.reserve	= &amp;smdkv310_reserve,</div><div class='add'>+	.restart	= exynos4_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(SMDKC210, "SMDKC210")</div><div class='hunk'>@@ -385,6 +400,8 @@ MACHINE_START(SMDKC210, "SMDKC210")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= exynos4_init_irq,</div><div class='ctx'> 	.map_io		= smdkv310_map_io,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= smdkv310_machine_init,</div><div class='ctx'> 	.timer		= &amp;exynos4_timer,</div><div class='add'>+	.restart	= exynos4_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c<br/>index a2a177ff4b44..37ac93e8d6d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/mach-universal_c210.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/mach-universal_c210.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/mach-universal_c210.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/mach-universal_c210.c</a></div><div class='hunk'>@@ -24,10 +24,10 @@</div><div class='ctx'> #include &lt;linux/i2c/atmel_mxt_ts.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/regs-serial.h&gt;</div><div class='del'>-#include &lt;plat/exynos4.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/iic.h&gt;</div><div class='hunk'>@@ -47,6 +47,8 @@</div><div class='ctx'> #include &lt;media/s5p_fimc.h&gt;</div><div class='ctx'> #include &lt;media/m5mols.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> /* Following are default values for UCON, ULCON and UFCON UART registers */</div><div class='ctx'> #define UNIVERSAL_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\</div><div class='ctx'> 				 S3C2410_UCON_RXILEVEL |	\</div><div class='hunk'>@@ -608,8 +610,7 @@ static void __init universal_tsp_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* TSP_LDO_ON: XMDMADDR_11 */</div><div class='ctx'> 	gpio = EXYNOS4_GPE2(3);</div><div class='del'>-	gpio_request(gpio, "TSP_LDO_ON");</div><div class='del'>-	gpio_direction_output(gpio, 1);</div><div class='add'>+	gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "TSP_LDO_ON");</div><div class='ctx'> 	gpio_export(gpio, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* TSP_INT: XMDMADDR_7 */</div><div class='hunk'>@@ -669,8 +670,7 @@ static void __init universal_touchkey_init(void)</div><div class='ctx'> 	i2c_gpio12_devs[0].irq = gpio_to_irq(gpio);</div><div class='ctx'> </div><div class='ctx'> 	gpio = EXYNOS4_GPE3(3);			/* XMDMDATA_3 */</div><div class='del'>-	gpio_request(gpio, "3_TOUCH_EN");</div><div class='del'>-	gpio_direction_output(gpio, 1);</div><div class='add'>+	gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "3_TOUCH_EN");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct s3c2410_platform_i2c universal_i2c0_platdata __initdata = {</div><div class='hunk'>@@ -992,7 +992,7 @@ static struct platform_device *universal_devices[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> static void __init universal_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	s5p_init_io(NULL, 0, S5P_VA_CHIPID);</div><div class='add'>+	exynos_init_io(NULL, 0);</div><div class='ctx'> 	s3c24xx_init_clocks(24000000);</div><div class='ctx'> 	s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs));</div><div class='ctx'> }</div><div class='hunk'>@@ -1000,9 +1000,7 @@ static void __init universal_map_io(void)</div><div class='ctx'> void s5p_tv_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* direct HPD to HDMI chip */</div><div class='del'>-	gpio_request(EXYNOS4_GPX3(7), "hpd-plug");</div><div class='del'>-</div><div class='del'>-	gpio_direction_input(EXYNOS4_GPX3(7));</div><div class='add'>+	gpio_request_one(EXYNOS4_GPX3(7), GPIOF_IN, "hpd-plug");</div><div class='ctx'> 	s3c_gpio_cfgpin(EXYNOS4_GPX3(7), S3C_GPIO_SFN(0x3));</div><div class='ctx'> 	s3c_gpio_setpull(EXYNOS4_GPX3(7), S3C_GPIO_PULL_NONE);</div><div class='ctx'> </div><div class='hunk'>@@ -1058,7 +1056,9 @@ MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= exynos4_init_irq,</div><div class='ctx'> 	.map_io		= universal_map_io,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= universal_machine_init,</div><div class='ctx'> 	.timer		= &amp;exynos4_timer,</div><div class='ctx'> 	.reserve        = &amp;universal_reserve,</div><div class='add'>+	.restart	= exynos4_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c<br/>index 69ffb2fb3875..683aec786b78 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/platsmp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/platsmp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/platsmp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/platsmp.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/smp_scu.h&gt;</div><div class='del'>-#include &lt;asm/unified.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='hunk'>@@ -32,7 +31,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='del'>-extern unsigned int gic_bank_offset;</div><div class='ctx'> extern void exynos4_secondary_startup(void);</div><div class='ctx'> </div><div class='ctx'> #define CPU1_BOOT_REG		(samsung_rev() == EXYNOS4210_REV_1_1 ? \</div><div class='hunk'>@@ -65,31 +63,6 @@ static void __iomem *scu_base_addr(void)</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(boot_lock);</div><div class='ctx'> </div><div class='del'>-static void __cpuinit exynos4_gic_secondary_init(void)</div><div class='del'>-{</div><div class='del'>-	void __iomem *dist_base = S5P_VA_GIC_DIST +</div><div class='del'>-				(gic_bank_offset * smp_processor_id());</div><div class='del'>-	void __iomem *cpu_base = S5P_VA_GIC_CPU +</div><div class='del'>-				(gic_bank_offset * smp_processor_id());</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Deal with the banked PPI and SGI interrupts - disable all</div><div class='del'>-	 * PPI interrupts, ensure all SGI interrupts are enabled.</div><div class='del'>-	 */</div><div class='del'>-	__raw_writel(0xffff0000, dist_base + GIC_DIST_ENABLE_CLEAR);</div><div class='del'>-	__raw_writel(0x0000ffff, dist_base + GIC_DIST_ENABLE_SET);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set priority on PPI and SGI interrupts</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; 32; i += 4)</div><div class='del'>-		__raw_writel(0xa0a0a0a0, dist_base + GIC_DIST_PRI + i * 4 / 4);</div><div class='del'>-</div><div class='del'>-	__raw_writel(0xf0, cpu_base + GIC_CPU_PRIMASK);</div><div class='del'>-	__raw_writel(1, cpu_base + GIC_CPU_CTRL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __cpuinit platform_secondary_init(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -97,7 +70,7 @@ void __cpuinit platform_secondary_init(unsigned int cpu)</div><div class='ctx'> 	 * core (e.g. timer irq), then they will not have been enabled</div><div class='ctx'> 	 * for us: do so</div><div class='ctx'> 	 */</div><div class='del'>-	exynos4_gic_secondary_init();</div><div class='add'>+	gic_secondary_init(0);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * let the primary processor know we're out of the</div><div class='hunk'>@@ -163,7 +136,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> 	while (time_before(jiffies, timeout)) {</div><div class='ctx'> 		smp_rmb();</div><div class='ctx'> </div><div class='del'>-		__raw_writel(BSYM(virt_to_phys(exynos4_secondary_startup)),</div><div class='add'>+		__raw_writel(virt_to_phys(exynos4_secondary_startup),</div><div class='ctx'> 			CPU1_BOOT_REG);</div><div class='ctx'> 		gic_raise_softirq(cpumask_of(cpu), 1);</div><div class='ctx'> </div><div class='hunk'>@@ -218,6 +191,6 @@ void __init platform_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	 * until it receives a soft interrupt, and then the</div><div class='ctx'> 	 * secondary CPU branches to this address.</div><div class='ctx'> 	 */</div><div class='del'>-	__raw_writel(BSYM(virt_to_phys(exynos4_secondary_startup)),</div><div class='add'>+	__raw_writel(virt_to_phys(exynos4_secondary_startup),</div><div class='ctx'> 			CPU1_BOOT_REG);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c<br/>index 509a435afd4b..a4f61a43c7ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/pm.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/cache-l2x0.h&gt;</div><div class='add'>+#include &lt;asm/smp_scu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/pm.h&gt;</div><div class='hunk'>@@ -205,7 +206,7 @@ static void exynos4_pm_prepare(void)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int exynos4_pm_add(struct sys_device *sysdev)</div><div class='add'>+static int exynos4_pm_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	pm_cpu_prep = exynos4_pm_prepare;</div><div class='ctx'> 	pm_cpu_sleep = exynos4_cpu_suspend;</div><div class='hunk'>@@ -213,27 +214,6 @@ static int exynos4_pm_add(struct sys_device *sysdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* This function copy from linux/arch/arm/kernel/smp_scu.c */</div><div class='del'>-</div><div class='del'>-void exynos4_scu_enable(void __iomem *scu_base)</div><div class='del'>-{</div><div class='del'>-	u32 scu_ctrl;</div><div class='del'>-</div><div class='del'>-	scu_ctrl = __raw_readl(scu_base);</div><div class='del'>-	/* already enabled? */</div><div class='del'>-	if (scu_ctrl &amp; 1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	scu_ctrl |= 1;</div><div class='del'>-	__raw_writel(scu_ctrl, scu_base);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Ensure that the data accessed by CPU0 before the SCU was</div><div class='del'>-	 * initialised is visible to the other CPUs.</div><div class='del'>-	 */</div><div class='del'>-	flush_cache_all();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static unsigned long pll_base_rate;</div><div class='ctx'> </div><div class='ctx'> static void exynos4_restore_pll(void)</div><div class='hunk'>@@ -301,8 +281,10 @@ static void exynos4_restore_pll(void)</div><div class='ctx'> 	} while (epll_wait || vpll_wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver exynos4_pm_driver = {</div><div class='del'>-	.add		= exynos4_pm_add,</div><div class='add'>+static struct subsys_interface exynos4_pm_interface = {</div><div class='add'>+	.name		= "exynos4_pm",</div><div class='add'>+	.subsys		= &amp;exynos4_subsys,</div><div class='add'>+	.add_dev	= exynos4_pm_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __init int exynos4_pm_drvinit(void)</div><div class='hunk'>@@ -325,7 +307,7 @@ static __init int exynos4_pm_drvinit(void)</div><div class='ctx'> 		clk_put(pll_base);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return sysdev_driver_register(&amp;exynos4_sysclass, &amp;exynos4_pm_driver);</div><div class='add'>+	return subsys_interface_register(&amp;exynos4_pm_interface);</div><div class='ctx'> }</div><div class='ctx'> arch_initcall(exynos4_pm_drvinit);</div><div class='ctx'> </div><div class='hunk'>@@ -402,7 +384,7 @@ static void exynos4_pm_resume(void)</div><div class='ctx'> </div><div class='ctx'> 	exynos4_restore_pll();</div><div class='ctx'> </div><div class='del'>-	exynos4_scu_enable(S5P_VA_SCU);</div><div class='add'>+	scu_enable(S5P_VA_SCU);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CACHE_L2X0</div><div class='ctx'> 	s3c_pm_do_restore_core(exynos4_l2cc_save, ARRAY_SIZE(exynos4_l2cc_save));</div><div class='head'>diff --git a/arch/arm/mach-exynos/setup-sdhci.c b/arch/arm/mach-exynos/setup-sdhci.c<br/>deleted file mode 100644<br/>index 92937b410906..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/setup-sdhci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/setup-sdhci.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-/* linux/arch/arm/mach-exynos4/setup-sdhci.c</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com</div><div class='del'>- *</div><div class='del'>- * EXYNOS4 - Helper functions for settign up SDHCI device(s) (HSMMC)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-/* clock sources for the mmc bus clock, order as for the ctrl2[5..4] */</div><div class='del'>-</div><div class='del'>-char *exynos4_hsmmc_clksrcs[4] = {</div><div class='del'>-	[0] = NULL,</div><div class='del'>-	[1] = NULL,</div><div class='del'>-	[2] = "sclk_mmc",	/* mmc_bus */</div><div class='del'>-	[3] = NULL,</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/mach-exynos/setup-spi.c b/arch/arm/mach-exynos/setup-spi.c<br/>new file mode 100644<br/>index 000000000000..833ff40ee0e8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/setup-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/setup-spi.c</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+/* linux/arch/arm/mach-exynos4/setup-spi.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Samsung Electronics Ltd.</div><div class='add'>+ *             http://www.samsung.com/</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;plat/gpio-cfg.h&gt;</div><div class='add'>+#include &lt;plat/s3c64xx-spi.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_S3C64XX_DEV_SPI0</div><div class='add'>+struct s3c64xx_spi_info s3c64xx_spi0_pdata __initdata = {</div><div class='add'>+	.fifo_lvl_mask	= 0x1ff,</div><div class='add'>+	.rx_lvl_offset	= 15,</div><div class='add'>+	.high_speed	= 1,</div><div class='add'>+	.clk_from_cmu	= true,</div><div class='add'>+	.tx_st_done	= 25,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int s3c64xx_spi0_cfg_gpio(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	s3c_gpio_cfgpin(EXYNOS4_GPB(0), S3C_GPIO_SFN(2));</div><div class='add'>+	s3c_gpio_setpull(EXYNOS4_GPB(0), S3C_GPIO_PULL_UP);</div><div class='add'>+	s3c_gpio_cfgall_range(EXYNOS4_GPB(2), 2,</div><div class='add'>+			      S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_S3C64XX_DEV_SPI1</div><div class='add'>+struct s3c64xx_spi_info s3c64xx_spi1_pdata __initdata = {</div><div class='add'>+	.fifo_lvl_mask	= 0x7f,</div><div class='add'>+	.rx_lvl_offset	= 15,</div><div class='add'>+	.high_speed	= 1,</div><div class='add'>+	.clk_from_cmu	= true,</div><div class='add'>+	.tx_st_done	= 25,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int s3c64xx_spi1_cfg_gpio(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	s3c_gpio_cfgpin(EXYNOS4_GPB(4), S3C_GPIO_SFN(2));</div><div class='add'>+	s3c_gpio_setpull(EXYNOS4_GPB(4), S3C_GPIO_PULL_UP);</div><div class='add'>+	s3c_gpio_cfgall_range(EXYNOS4_GPB(6), 2,</div><div class='add'>+			      S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_S3C64XX_DEV_SPI2</div><div class='add'>+struct s3c64xx_spi_info s3c64xx_spi2_pdata __initdata = {</div><div class='add'>+	.fifo_lvl_mask	= 0x7f,</div><div class='add'>+	.rx_lvl_offset	= 15,</div><div class='add'>+	.high_speed	= 1,</div><div class='add'>+	.clk_from_cmu	= true,</div><div class='add'>+	.tx_st_done	= 25,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int s3c64xx_spi2_cfg_gpio(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	s3c_gpio_cfgpin(EXYNOS4_GPC1(1), S3C_GPIO_SFN(5));</div><div class='add'>+	s3c_gpio_setpull(EXYNOS4_GPC1(1), S3C_GPIO_PULL_UP);</div><div class='add'>+	s3c_gpio_cfgall_range(EXYNOS4_GPC1(3), 2,</div><div class='add'>+			      S3C_GPIO_SFN(5), S3C_GPIO_PULL_UP);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-exynos/setup-usb-phy.c b/arch/arm/mach-exynos/setup-usb-phy.c<br/>index 39aca045f660..41743d21e8c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/setup-usb-phy.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-exynos/setup-usb-phy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-exynos/setup-usb-phy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-exynos/setup-usb-phy.c</a></div><div class='hunk'>@@ -19,6 +19,13 @@</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/usb-phy.h&gt;</div><div class='ctx'> </div><div class='add'>+static atomic_t host_usage;</div><div class='add'>+</div><div class='add'>+static int exynos4_usb_host_phy_is_on(void)</div><div class='add'>+{</div><div class='add'>+	return (readl(EXYNOS4_PHYPWR) &amp; PHY1_STD_ANALOG_POWERDOWN) ? 0 : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int exynos4_usb_phy1_init(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk *otg_clk;</div><div class='hunk'>@@ -27,6 +34,8 @@ static int exynos4_usb_phy1_init(struct platform_device *pdev)</div><div class='ctx'> 	u32 rstcon;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	atomic_inc(&amp;host_usage);</div><div class='add'>+</div><div class='ctx'> 	otg_clk = clk_get(&amp;pdev-&gt;dev, "otg");</div><div class='ctx'> 	if (IS_ERR(otg_clk)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Failed to get otg clock\n");</div><div class='hunk'>@@ -39,6 +48,9 @@ static int exynos4_usb_phy1_init(struct platform_device *pdev)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (exynos4_usb_host_phy_is_on())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	writel(readl(S5P_USBHOST_PHY_CONTROL) | S5P_USBHOST_PHY_ENABLE,</div><div class='ctx'> 			S5P_USBHOST_PHY_CONTROL);</div><div class='ctx'> </div><div class='hunk'>@@ -95,6 +107,9 @@ static int exynos4_usb_phy1_exit(struct platform_device *pdev)</div><div class='ctx'> 	struct clk *otg_clk;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	if (atomic_dec_return(&amp;host_usage) &gt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	otg_clk = clk_get(&amp;pdev-&gt;dev, "otg");</div><div class='ctx'> 	if (IS_ERR(otg_clk)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Failed to get otg clock\n");</div><div class='head'>diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c<br/>index d5f178540928..25b453601acc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/cats-hw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-footbridge/cats-hw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/cats-hw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-footbridge/cats-hw.c</a></div><div class='hunk'>@@ -86,9 +86,10 @@ fixup_cats(struct tag *tags, char **cmdline, struct meminfo *mi)</div><div class='ctx'> MACHINE_START(CATS, "Chalice-CATS")</div><div class='ctx'> 	/* Maintainer: Philip Blundell */</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='del'>-	.soft_reboot	= 1,</div><div class='add'>+	.restart_mode	= 's',</div><div class='ctx'> 	.fixup		= fixup_cats,</div><div class='ctx'> 	.map_io		= footbridge_map_io,</div><div class='ctx'> 	.init_irq	= footbridge_init_irq,</div><div class='ctx'> 	.timer		= &amp;isa_timer,</div><div class='add'>+	.restart	= footbridge_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-footbridge/common.c b/arch/arm/mach-footbridge/common.c<br/>index 38a44f9b9da2..41978ee4f9d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-footbridge/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-footbridge/common.c</a></div><div class='hunk'>@@ -199,6 +199,33 @@ void __init footbridge_map_io(void)</div><div class='ctx'> 		iotable_init(ebsa285_host_io_desc, ARRAY_SIZE(ebsa285_host_io_desc));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void footbridge_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	if (mode == 's') {</div><div class='add'>+		/* Jump into the ROM */</div><div class='add'>+		soft_restart(0x41000000);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Force the watchdog to do a CPU reset.</div><div class='add'>+		 *</div><div class='add'>+		 * After making sure that the watchdog is disabled</div><div class='add'>+		 * (so we can change the timer registers) we first</div><div class='add'>+		 * enable the timer to autoreload itself.  Next, the</div><div class='add'>+		 * timer interval is set really short and any</div><div class='add'>+		 * current interrupt request is cleared (so we can</div><div class='add'>+		 * see an edge transition).  Finally, TIMER4 is</div><div class='add'>+		 * enabled as the watchdog.</div><div class='add'>+		 */</div><div class='add'>+		*CSR_SA110_CNTL &amp;= ~(1 &lt;&lt; 13);</div><div class='add'>+		*CSR_TIMER4_CNTL = TIMER_CNTL_ENABLE |</div><div class='add'>+				   TIMER_CNTL_AUTORELOAD |</div><div class='add'>+				   TIMER_CNTL_DIV16;</div><div class='add'>+		*CSR_TIMER4_LOAD = 0x2;</div><div class='add'>+		*CSR_TIMER4_CLR  = 0;</div><div class='add'>+		*CSR_SA110_CNTL |= (1 &lt;&lt; 13);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_FOOTBRIDGE_ADDIN</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long fb_bus_sdram_offset(void)</div><div class='head'>diff --git a/arch/arm/mach-footbridge/common.h b/arch/arm/mach-footbridge/common.h<br/>index b05e662d21ad..c9767b892cb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-footbridge/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-footbridge/common.h</a></div><div class='hunk'>@@ -8,3 +8,4 @@ extern void footbridge_map_io(void);</div><div class='ctx'> extern void footbridge_init_irq(void);</div><div class='ctx'> </div><div class='ctx'> extern void isa_init_irq(unsigned int irq);</div><div class='add'>+extern void footbridge_restart(char, const char *);</div><div class='head'>diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c<br/>index 18c32a5541d9..f685650c25d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/dc21285.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-footbridge/dc21285.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/dc21285.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-footbridge/dc21285.c</a></div><div class='hunk'>@@ -275,9 +275,9 @@ int __init dc21285_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	allocate_resource(&amp;iomem_resource, &amp;res[0], 0x40000000,</div><div class='ctx'> 			  0x80000000, 0xffffffff, 0x40000000, NULL, NULL);</div><div class='ctx'> </div><div class='del'>-	sys-&gt;resource[0] = &amp;ioport_resource;</div><div class='del'>-	sys-&gt;resource[1] = &amp;res[0];</div><div class='del'>-	sys-&gt;resource[2] = &amp;res[1];</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;ioport_resource);</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;res[0]);</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;res[1]);</div><div class='ctx'> 	sys-&gt;mem_offset  = DC21285_PCI_MEM;</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -285,7 +285,7 @@ int __init dc21285_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> </div><div class='ctx'> struct pci_bus * __init dc21285_scan_bus(int nr, struct pci_sys_data *sys)</div><div class='ctx'> {</div><div class='del'>-	return pci_scan_bus(0, &amp;dc21285_ops, sys);</div><div class='add'>+	return pci_scan_root_bus(NULL, 0, &amp;dc21285_ops, sys, &amp;sys-&gt;resources);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define dc21285_request_irq(_a, _b, _c, _d, _e) \</div><div class='head'>diff --git a/arch/arm/mach-footbridge/ebsa285.c b/arch/arm/mach-footbridge/ebsa285.c<br/>index 012210cf7d16..27716a7e5fc1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/ebsa285.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-footbridge/ebsa285.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/ebsa285.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-footbridge/ebsa285.c</a></div><div class='hunk'>@@ -21,5 +21,6 @@ MACHINE_START(EBSA285, "EBSA285")</div><div class='ctx'> 	.map_io		= footbridge_map_io,</div><div class='ctx'> 	.init_irq	= footbridge_init_irq,</div><div class='ctx'> 	.timer		= &amp;footbridge_timer,</div><div class='add'>+	.restart	= footbridge_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-footbridge/include/mach/system.h b/arch/arm/mach-footbridge/include/mach/system.h<br/>index 0b2931566209..a174a5841bc2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-footbridge/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-footbridge/include/mach/system.h</a></div><div class='hunk'>@@ -7,63 +7,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'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware/dec21285.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/leds.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	if (mode == 's') {</div><div class='del'>-		/*</div><div class='del'>-		 * Jump into the ROM</div><div class='del'>-		 */</div><div class='del'>-		cpu_reset(0x41000000);</div><div class='del'>-	} else {</div><div class='del'>-		if (machine_is_netwinder()) {</div><div class='del'>-			/* open up the SuperIO chip</div><div class='del'>-			 */</div><div class='del'>-			outb(0x87, 0x370);</div><div class='del'>-			outb(0x87, 0x370);</div><div class='del'>-</div><div class='del'>-			/* aux function group 1 (logical device 7)</div><div class='del'>-			 */</div><div class='del'>-			outb(0x07, 0x370);</div><div class='del'>-			outb(0x07, 0x371);</div><div class='del'>-</div><div class='del'>-			/* set GP16 for WD-TIMER output</div><div class='del'>-			 */</div><div class='del'>-			outb(0xe6, 0x370);</div><div class='del'>-			outb(0x00, 0x371);</div><div class='del'>-</div><div class='del'>-			/* set a RED LED and toggle WD_TIMER for rebooting</div><div class='del'>-			 */</div><div class='del'>-			outb(0xc4, 0x338);</div><div class='del'>-		} else {</div><div class='del'>-			/* </div><div class='del'>-			 * Force the watchdog to do a CPU reset.</div><div class='del'>-			 *</div><div class='del'>-			 * After making sure that the watchdog is disabled</div><div class='del'>-			 * (so we can change the timer registers) we first</div><div class='del'>-			 * enable the timer to autoreload itself.  Next, the</div><div class='del'>-			 * timer interval is set really short and any</div><div class='del'>-			 * current interrupt request is cleared (so we can</div><div class='del'>-			 * see an edge transition).  Finally, TIMER4 is</div><div class='del'>-			 * enabled as the watchdog.</div><div class='del'>-			 */</div><div class='del'>-			*CSR_SA110_CNTL &amp;= ~(1 &lt;&lt; 13);</div><div class='del'>-			*CSR_TIMER4_CNTL = TIMER_CNTL_ENABLE |</div><div class='del'>-					   TIMER_CNTL_AUTORELOAD |</div><div class='del'>-					   TIMER_CNTL_DIV16;</div><div class='del'>-			*CSR_TIMER4_LOAD = 0x2;</div><div class='del'>-			*CSR_TIMER4_CLR  = 0;</div><div class='del'>-			*CSR_SA110_CNTL |= (1 &lt;&lt; 13);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-footbridge/include/mach/vmalloc.h b/arch/arm/mach-footbridge/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 40ba78e5782b..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-footbridge/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  arch/arm/mach-footbridge/include/mach/vmalloc.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'>-</div><div class='del'>-#define VMALLOC_END       0xf0000000UL</div><div class='head'>diff --git a/arch/arm/mach-footbridge/netwinder-hw.c b/arch/arm/mach-footbridge/netwinder-hw.c<br/>index 0d3846f3b60d..80a1c5cc9071 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/netwinder-hw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-footbridge/netwinder-hw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/netwinder-hw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-footbridge/netwinder-hw.c</a></div><div class='hunk'>@@ -645,6 +645,32 @@ fixup_netwinder(struct tag *tags, char **cmdline, struct meminfo *mi)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void netwinder_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	if (mode == 's') {</div><div class='add'>+		/* Jump into the ROM */</div><div class='add'>+		soft_restart(0x41000000);</div><div class='add'>+	} else {</div><div class='add'>+		local_irq_disable();</div><div class='add'>+		local_fiq_disable();</div><div class='add'>+</div><div class='add'>+		/* open up the SuperIO chip */</div><div class='add'>+		outb(0x87, 0x370);</div><div class='add'>+		outb(0x87, 0x370);</div><div class='add'>+</div><div class='add'>+		/* aux function group 1 (logical device 7) */</div><div class='add'>+		outb(0x07, 0x370);</div><div class='add'>+		outb(0x07, 0x371);</div><div class='add'>+</div><div class='add'>+		/* set GP16 for WD-TIMER output */</div><div class='add'>+		outb(0xe6, 0x370);</div><div class='add'>+		outb(0x00, 0x371);</div><div class='add'>+</div><div class='add'>+		/* set a RED LED and toggle WD_TIMER for rebooting */</div><div class='add'>+		outb(0xc4, 0x338);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> MACHINE_START(NETWINDER, "Rebel-NetWinder")</div><div class='ctx'> 	/* Maintainer: Russell King/Rebel.com */</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='hunk'>@@ -656,4 +682,5 @@ MACHINE_START(NETWINDER, "Rebel-NetWinder")</div><div class='ctx'> 	.map_io		= footbridge_map_io,</div><div class='ctx'> 	.init_irq	= footbridge_init_irq,</div><div class='ctx'> 	.timer		= &amp;isa_timer,</div><div class='add'>+	.restart	= netwinder_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-footbridge/personal.c b/arch/arm/mach-footbridge/personal.c<br/>index f41dba39b327..e1e9990fa957 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/personal.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-footbridge/personal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/personal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-footbridge/personal.c</a></div><div class='hunk'>@@ -19,5 +19,6 @@ MACHINE_START(PERSONAL_SERVER, "Compaq-PersonalServer")</div><div class='ctx'> 	.map_io		= footbridge_map_io,</div><div class='ctx'> 	.init_irq	= footbridge_init_irq,</div><div class='ctx'> 	.timer		= &amp;footbridge_timer,</div><div class='add'>+	.restart	= footbridge_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-gemini/include/mach/vmalloc.h b/arch/arm/mach-gemini/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 45371eb86fcb..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-gemini/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-gemini/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2008-2009 Paulius Zaleckas &lt;paulius.zaleckas@teltonika.lt&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='del'>-#define VMALLOC_END	0xf0000000UL</div><div class='head'>diff --git a/arch/arm/mach-h720x/common.c b/arch/arm/mach-h720x/common.c<br/>index 51d4e44ab973..f8a2f6bb5483 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-h720x/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-h720x/common.c</a></div><div class='hunk'>@@ -242,3 +242,8 @@ void __init h720x_map_io(void)</div><div class='ctx'> {</div><div class='ctx'> 	iotable_init(h720x_io_desc,ARRAY_SIZE(h720x_io_desc));</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void h720x_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	CPU_REG (PMU_BASE, PMU_STAT) |= PMU_WARMRESET;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-h720x/common.h b/arch/arm/mach-h720x/common.h<br/>index 7dd5fa604efc..2489537d33dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-h720x/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-h720x/common.h</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> extern unsigned long h720x_gettimeoffset(void);</div><div class='ctx'> extern void __init h720x_init_irq(void);</div><div class='ctx'> extern void __init h720x_map_io(void);</div><div class='add'>+extern void h720x_restart(char, const char *);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_H7202</div><div class='ctx'> extern struct sys_timer h7202_timer;</div><div class='head'>diff --git a/arch/arm/mach-h720x/h7201-eval.c b/arch/arm/mach-h720x/h7201-eval.c<br/>index 9886f19805f4..5fdb20c855e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/h7201-eval.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-h720x/h7201-eval.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/h7201-eval.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-h720x/h7201-eval.c</a></div><div class='hunk'>@@ -34,4 +34,5 @@ MACHINE_START(H7201, "Hynix GMS30C7201")</div><div class='ctx'> 	.init_irq	= h720x_init_irq,</div><div class='ctx'> 	.timer		= &amp;h7201_timer,</div><div class='ctx'> 	.dma_zone_size	= SZ_256M,</div><div class='add'>+	.restart	= h720x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-h720x/h7202-eval.c b/arch/arm/mach-h720x/h7202-eval.c<br/>index 284a134819e1..169673036c59 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/h7202-eval.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-h720x/h7202-eval.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/h7202-eval.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-h720x/h7202-eval.c</a></div><div class='hunk'>@@ -77,4 +77,5 @@ MACHINE_START(H7202, "Hynix HMS30C7202")</div><div class='ctx'> 	.timer		= &amp;h7202_timer,</div><div class='ctx'> 	.init_machine	= init_eval_h7202,</div><div class='ctx'> 	.dma_zone_size	= SZ_256M,</div><div class='add'>+	.restart	= h720x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-h720x/include/mach/system.h b/arch/arm/mach-h720x/include/mach/system.h<br/>index a708d24ee46d..16ac46e239aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-h720x/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-h720x/include/mach/system.h</a></div><div class='hunk'>@@ -24,10 +24,4 @@ static void arch_idle(void)</div><div class='ctx'> 	nop();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static __inline__ void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	CPU_REG (PMU_BASE, PMU_STAT) |= PMU_WARMRESET;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-h720x/include/mach/vmalloc.h b/arch/arm/mach-h720x/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 8520b4a4d4e6..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-h720x/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-h720x/include/mach/vmalloc.h</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __ARCH_ARM_VMALLOC_H</div><div class='del'>-#define __ARCH_ARM_VMALLOC_H</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END       0xd0000000UL</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-highbank/core.h b/arch/arm/mach-highbank/core.h<br/>index 7e33fc94cd1e..d8e2d0be64ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-highbank/core.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-highbank/core.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-highbank/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-highbank/core.h</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='ctx'> extern void highbank_set_cpu_jump(int cpu, void *jump_addr);</div><div class='ctx'> extern void highbank_clocks_init(void);</div><div class='add'>+extern void highbank_restart(char, const char *);</div><div class='ctx'> extern void __iomem *scu_base_addr;</div><div class='ctx'> #ifdef CONFIG_DEBUG_HIGHBANK_UART</div><div class='ctx'> extern void highbank_lluart_map_io(void);</div><div class='head'>diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c<br/>index 88660d500f5b..7afbe1e55beb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-highbank/highbank.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-highbank/highbank.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-highbank/highbank.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-highbank/highbank.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;asm/unified.h&gt;</div><div class='ctx'> #include &lt;asm/smp_scu.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/arm_timer.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/timer-sp.h&gt;</div><div class='hunk'>@@ -76,7 +75,7 @@ void highbank_set_cpu_jump(int cpu, void *jump_addr)</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	cpu = cpu_logical_map(cpu);</div><div class='ctx'> #endif</div><div class='del'>-	writel(BSYM(virt_to_phys(jump_addr)), HB_JUMP_TABLE_VIRT(cpu));</div><div class='add'>+	writel(virt_to_phys(jump_addr), HB_JUMP_TABLE_VIRT(cpu));</div><div class='ctx'> 	__cpuc_flush_dcache_area(HB_JUMP_TABLE_VIRT(cpu), 16);</div><div class='ctx'> 	outer_clean_range(HB_JUMP_TABLE_PHYS(cpu),</div><div class='ctx'> 			  HB_JUMP_TABLE_PHYS(cpu) + 15);</div><div class='hunk'>@@ -144,6 +143,8 @@ DT_MACHINE_START(HIGHBANK, "Highbank")</div><div class='ctx'> 	.map_io		= highbank_map_io,</div><div class='ctx'> 	.init_irq	= highbank_init_irq,</div><div class='ctx'> 	.timer		= &amp;highbank_timer,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= highbank_init,</div><div class='ctx'> 	.dt_compat	= highbank_match,</div><div class='add'>+	.restart	= highbank_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-highbank/include/mach/entry-macro.S b/arch/arm/mach-highbank/include/mach/entry-macro.S<br/>index 73c11297509e..a14f9e62ca92 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-highbank/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-highbank/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-highbank/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-highbank/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,3 @@</div><div class='del'>-#include &lt;asm/hardware/entry-macro-gic.S&gt;</div><div class='del'>-</div><div class='ctx'> 	.macro	disable_fiq</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-highbank/include/mach/system.h b/arch/arm/mach-highbank/include/mach/system.h<br/>index 7e8192296cae..b1d8b5fbe373 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-highbank/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-highbank/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-highbank/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-highbank/include/mach/system.h</a></div><div class='hunk'>@@ -21,6 +21,4 @@ static inline void arch_idle(void)</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void arch_reset(char mode, const char *cmd);</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-highbank/include/mach/vmalloc.h b/arch/arm/mach-highbank/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 1969e954277a..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-highbank/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-highbank/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-#define VMALLOC_END		0xFEE00000UL</div><div class='head'>diff --git a/arch/arm/mach-highbank/system.c b/arch/arm/mach-highbank/system.c<br/>index 53f0c4c5ef1c..82c27230d4a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-highbank/system.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-highbank/system.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-highbank/system.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-highbank/system.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "sysregs.h"</div><div class='ctx'> </div><div class='del'>-void arch_reset(char mode, const char *cmd)</div><div class='add'>+void highbank_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	if (mode == 'h')</div><div class='ctx'> 		hignbank_set_pwr_hard_reset();</div><div class='head'>diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig<br/>index 0e6f1af260b6..0e6de366c648 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/Kconfig</a></div><div class='hunk'>@@ -98,6 +98,7 @@ config MACH_SCB9328</div><div class='ctx'> config MACH_APF9328</div><div class='ctx'> 	bool "APF9328"</div><div class='ctx'> 	select SOC_IMX1</div><div class='add'>+	select IMX_HAVE_PLATFORM_IMX_I2C</div><div class='ctx'> 	select IMX_HAVE_PLATFORM_IMX_UART</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Yes here if you are using the Armadeus APF9328 development board</div><div class='hunk'>@@ -595,13 +596,14 @@ comment "i.MX6 family:"</div><div class='ctx'> </div><div class='ctx'> config SOC_IMX6Q</div><div class='ctx'> 	bool "i.MX6 Quad support"</div><div class='add'>+	select ARM_CPU_SUSPEND if PM</div><div class='ctx'> 	select ARM_GIC</div><div class='del'>-	select CACHE_L2X0</div><div class='ctx'> 	select CPU_V7</div><div class='ctx'> 	select HAVE_ARM_SCU</div><div class='ctx'> 	select HAVE_IMX_GPC</div><div class='ctx'> 	select HAVE_IMX_MMDC</div><div class='ctx'> 	select HAVE_IMX_SRC</div><div class='add'>+	select HAVE_SMP</div><div class='ctx'> 	select USE_OF</div><div class='ctx'> </div><div class='ctx'> 	help</div><div class='head'>diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile<br/>index d97f409ce98b..f5920c24f7d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/Makefile</a></div><div class='hunk'>@@ -70,4 +70,8 @@ AFLAGS_head-v7.o :=-Wa,-march=armv7-a</div><div class='ctx'> obj-$(CONFIG_SMP) += platsmp.o</div><div class='ctx'> obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o</div><div class='ctx'> obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o</div><div class='del'>-obj-$(CONFIG_SOC_IMX6Q) += clock-imx6q.o mach-imx6q.o pm-imx6q.o</div><div class='add'>+obj-$(CONFIG_SOC_IMX6Q) += clock-imx6q.o mach-imx6q.o</div><div class='add'>+</div><div class='add'>+ifeq ($(CONFIG_PM),y)</div><div class='add'>+obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o</div><div class='add'>+endif</div><div class='head'>diff --git a/arch/arm/mach-imx/Makefile.boot b/arch/arm/mach-imx/Makefile.boot<br/>index cfede5768aa0..5f4d06af4912 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/Makefile.boot?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/Makefile.boot</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/Makefile.boot?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/Makefile.boot</a></div><div class='hunk'>@@ -25,3 +25,6 @@ initrd_phys-$(CONFIG_SOC_IMX35)	:= 0x80800000</div><div class='ctx'> zreladdr-$(CONFIG_SOC_IMX6Q)	+= 0x10008000</div><div class='ctx'> params_phys-$(CONFIG_SOC_IMX6Q)	:= 0x10000100</div><div class='ctx'> initrd_phys-$(CONFIG_SOC_IMX6Q)	:= 0x10800000</div><div class='add'>+</div><div class='add'>+dtb-$(CONFIG_SOC_IMX6Q)	+= imx6q-arm2.dtb \</div><div class='add'>+			   imx6q-sabrelite.dtb</div><div class='head'>diff --git a/arch/arm/mach-imx/clock-imx6q.c b/arch/arm/mach-imx/clock-imx6q.c<br/>index 039a7abb165a..9273c2a24b54 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/clock-imx6q.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/clock-imx6q.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/clock-imx6q.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/clock-imx6q.c</a></div><div class='hunk'>@@ -1931,14 +1931,12 @@ int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode)</div><div class='ctx'> 		val |= 0x1 &lt;&lt; BP_CLPCR_LPM;</div><div class='ctx'> 		val &amp;= ~BM_CLPCR_VSTBY;</div><div class='ctx'> 		val &amp;= ~BM_CLPCR_SBYOS;</div><div class='del'>-		val |= BM_CLPCR_BYP_MMDC_CH1_LPM_HS;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case STOP_POWER_OFF:</div><div class='ctx'> 		val |= 0x2 &lt;&lt; BP_CLPCR_LPM;</div><div class='ctx'> 		val |= 0x3 &lt;&lt; BP_CLPCR_STBY_COUNT;</div><div class='ctx'> 		val |= BM_CLPCR_VSTBY;</div><div class='ctx'> 		val |= BM_CLPCR_SBYOS;</div><div class='del'>-		val |= BM_CLPCR_BYP_MMDC_CH1_LPM_HS;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/arch/arm/mach-imx/head-v7.S b/arch/arm/mach-imx/head-v7.S<br/>index 6229efbc70cb..7e49deb128a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/head-v7.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/head-v7.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/head-v7.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/head-v7.S</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #include &lt;asm/hardware/cache-l2x0.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.section ".text.head", "ax"</div><div class='del'>-	__CPUINIT</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The secondary kernel init calls v7_flush_dcache_all before it enables</div><div class='hunk'>@@ -33,6 +32,7 @@</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(v7_invalidate_l1)</div><div class='ctx'> 	mov	r0, #0</div><div class='add'>+	mcr	p15, 0, r0, c7, c5, 0	@ invalidate I cache</div><div class='ctx'> 	mcr	p15, 2, r0, c0, c0, 0</div><div class='ctx'> 	mrc	p15, 1, r0, c0, c0, 0</div><div class='ctx'> </div><div class='hunk'>@@ -71,6 +71,7 @@ ENTRY(v7_secondary_startup)</div><div class='ctx'> ENDPROC(v7_secondary_startup)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='ctx'> /*</div><div class='ctx'>  * The following code is located into the .data section.  This is to</div><div class='ctx'>  * allow phys_l2x0_saved_regs to be accessed with a relative load</div><div class='hunk'>@@ -79,6 +80,7 @@ ENDPROC(v7_secondary_startup)</div><div class='ctx'> 	.data</div><div class='ctx'> 	.align</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CACHE_L2X0</div><div class='ctx'> 	.macro	pl310_resume</div><div class='ctx'> 	ldr	r2, phys_l2x0_saved_regs</div><div class='ctx'> 	ldr	r0, [r2, #L2X0_R_PHY_BASE]	@ get physical base of l2x0</div><div class='hunk'>@@ -88,12 +90,17 @@ ENDPROC(v7_secondary_startup)</div><div class='ctx'> 	str	r1, [r0, #L2X0_CTRL]		@ re-enable L2</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='add'>+	.globl	phys_l2x0_saved_regs</div><div class='add'>+phys_l2x0_saved_regs:</div><div class='add'>+        .long   0</div><div class='add'>+#else</div><div class='add'>+	.macro	pl310_resume</div><div class='add'>+	.endm</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> ENTRY(v7_cpu_resume)</div><div class='ctx'> 	bl	v7_invalidate_l1</div><div class='ctx'> 	pl310_resume</div><div class='ctx'> 	b	cpu_resume</div><div class='ctx'> ENDPROC(v7_cpu_resume)</div><div class='del'>-</div><div class='del'>-	.globl	phys_l2x0_saved_regs</div><div class='del'>-phys_l2x0_saved_regs:</div><div class='del'>-        .long   0</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-apf9328.c b/arch/arm/mach-imx/mach-apf9328.c<br/>index 1e486e67dabb..f4a63ee9e217 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-apf9328.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-apf9328.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-apf9328.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-apf9328.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/dm9000.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -41,6 +42,9 @@ static const int apf9328_pins[] __initconst = {</div><div class='ctx'> 	PB29_PF_UART2_RTS,</div><div class='ctx'> 	PB30_PF_UART2_TXD,</div><div class='ctx'> 	PB31_PF_UART2_RXD,</div><div class='add'>+	/* I2C */</div><div class='add'>+	PA15_PF_I2C_SDA,</div><div class='add'>+	PA16_PF_I2C_SCL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -103,6 +107,10 @@ static const struct imxuart_platform_data uart1_pdata __initconst = {</div><div class='ctx'> 	.flags = IMXUART_HAVE_RTSCTS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct imxi2c_platform_data apf9328_i2c_data __initconst = {</div><div class='add'>+	.bitrate = 100000,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device *devices[] __initdata = {</div><div class='ctx'> 	&amp;apf9328_flash_device,</div><div class='ctx'> 	&amp;dm9000x_device,</div><div class='hunk'>@@ -119,6 +127,8 @@ static void __init apf9328_init(void)</div><div class='ctx'> 	imx1_add_imx_uart0(NULL);</div><div class='ctx'> 	imx1_add_imx_uart1(&amp;uart1_pdata);</div><div class='ctx'> </div><div class='add'>+	imx1_add_imx_i2c(&amp;apf9328_i2c_data);</div><div class='add'>+</div><div class='ctx'> 	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -139,4 +149,5 @@ MACHINE_START(APF9328, "Armadeus APF9328")</div><div class='ctx'> 	.handle_irq   = imx1_handle_irq,</div><div class='ctx'> 	.timer        = &amp;apf9328_timer,</div><div class='ctx'> 	.init_machine = apf9328_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-armadillo5x0.c b/arch/arm/mach-imx/mach-armadillo5x0.c<br/>index c9a9cf67755e..e4f426a09899 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-armadillo5x0.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-armadillo5x0.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-armadillo5x0.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-armadillo5x0.c</a></div><div class='hunk'>@@ -561,4 +561,5 @@ MACHINE_START(ARMADILLO5X0, "Armadillo-500")</div><div class='ctx'> 	.handle_irq = imx31_handle_irq,</div><div class='ctx'> 	.timer = &amp;armadillo5x0_timer,</div><div class='ctx'> 	.init_machine = armadillo5x0_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-bug.c b/arch/arm/mach-imx/mach-bug.c<br/>index 313f62ddc1ef..9a9897749dd6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-bug.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-bug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-bug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-bug.c</a></div><div class='hunk'>@@ -65,4 +65,5 @@ MACHINE_START(BUG, "BugLabs BUGBase")</div><div class='ctx'> 	.handle_irq = imx31_handle_irq,</div><div class='ctx'> 	.timer = &amp;bug_timer,</div><div class='ctx'> 	.init_machine = bug_board_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c<br/>index edb373052576..d085aea08709 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-cpuimx27.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-cpuimx27.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-cpuimx27.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-cpuimx27.c</a></div><div class='hunk'>@@ -318,4 +318,5 @@ MACHINE_START(EUKREA_CPUIMX27, "EUKREA CPUIMX27")</div><div class='ctx'> 	.handle_irq = imx27_handle_irq,</div><div class='ctx'> 	.timer = &amp;eukrea_cpuimx27_timer,</div><div class='ctx'> 	.init_machine = eukrea_cpuimx27_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-cpuimx35.c b/arch/arm/mach-imx/mach-cpuimx35.c<br/>index 362aae780601..8ecc872b2547 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-cpuimx35.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-cpuimx35.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-cpuimx35.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-cpuimx35.c</a></div><div class='hunk'>@@ -207,4 +207,5 @@ MACHINE_START(EUKREA_CPUIMX35SD, "Eukrea CPUIMX35")</div><div class='ctx'> 	.handle_irq = imx35_handle_irq,</div><div class='ctx'> 	.timer = &amp;eukrea_cpuimx35_timer,</div><div class='ctx'> 	.init_machine = eukrea_cpuimx35_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c<br/>index ab8fbcc472b5..76a97a598b9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-eukrea_cpuimx25.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-eukrea_cpuimx25.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-eukrea_cpuimx25.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-eukrea_cpuimx25.c</a></div><div class='hunk'>@@ -170,4 +170,5 @@ MACHINE_START(EUKREA_CPUIMX25SD, "Eukrea CPUIMX25")</div><div class='ctx'> 	.handle_irq = imx25_handle_irq,</div><div class='ctx'> 	.timer = &amp;eukrea_cpuimx25_timer,</div><div class='ctx'> 	.init_machine = eukrea_cpuimx25_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c<br/>index 38eb9e45110b..c2766ae02b4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-imx27_visstrim_m10.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-imx27_visstrim_m10.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-imx27_visstrim_m10.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-imx27_visstrim_m10.c</a></div><div class='hunk'>@@ -282,4 +282,5 @@ MACHINE_START(IMX27_VISSTRIM_M10, "Vista Silicon Visstrim_M10")</div><div class='ctx'> 	.handle_irq = imx27_handle_irq,</div><div class='ctx'> 	.timer = &amp;visstrim_m10_timer,</div><div class='ctx'> 	.init_machine = visstrim_m10_board_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-imx27ipcam.c b/arch/arm/mach-imx/mach-imx27ipcam.c<br/>index 7052155d0557..c9d350c5dcc8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-imx27ipcam.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-imx27ipcam.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-imx27ipcam.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-imx27ipcam.c</a></div><div class='hunk'>@@ -78,4 +78,5 @@ MACHINE_START(IMX27IPCAM, "Freescale IMX27IPCAM")</div><div class='ctx'> 	.handle_irq = imx27_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx27ipcam_timer,</div><div class='ctx'> 	.init_machine = mx27ipcam_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-imx27lite.c b/arch/arm/mach-imx/mach-imx27lite.c<br/>index 8d6a63521f17..1f45b9189229 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-imx27lite.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-imx27lite.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-imx27lite.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-imx27lite.c</a></div><div class='hunk'>@@ -84,4 +84,5 @@ MACHINE_START(IMX27LITE, "LogicPD i.MX27LITE")</div><div class='ctx'> 	.handle_irq = imx27_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx27lite_timer,</div><div class='ctx'> 	.init_machine = mx27lite_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c<br/>index 8deb012189b5..c25728106917 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-imx6q.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-imx6q.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-imx6q.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-imx6q.c</a></div><div class='hunk'>@@ -10,12 +10,17 @@</div><div class='ctx'>  * http://www.gnu.org/copyleft/gpl.html</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/irqdomain.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/micrel_phy.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/cache-l2x0.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -23,8 +28,57 @@</div><div class='ctx'> #include &lt;mach/common.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='add'>+void imx6q_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	void __iomem *wdog_base;</div><div class='add'>+</div><div class='add'>+	np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-wdt");</div><div class='add'>+	wdog_base = of_iomap(np, 0);</div><div class='add'>+	if (!wdog_base)</div><div class='add'>+		goto soft;</div><div class='add'>+</div><div class='add'>+	imx_src_prepare_restart();</div><div class='add'>+</div><div class='add'>+	/* enable wdog */</div><div class='add'>+	writew_relaxed(1 &lt;&lt; 2, wdog_base);</div><div class='add'>+	/* write twice to ensure the request will not get ignored */</div><div class='add'>+	writew_relaxed(1 &lt;&lt; 2, wdog_base);</div><div class='add'>+</div><div class='add'>+	/* wait for reset to assert ... */</div><div class='add'>+	mdelay(500);</div><div class='add'>+</div><div class='add'>+	pr_err("Watchdog reset failed to assert reset\n");</div><div class='add'>+</div><div class='add'>+	/* delay to allow the serial port to show the message */</div><div class='add'>+	mdelay(50);</div><div class='add'>+</div><div class='add'>+soft:</div><div class='add'>+	/* we'll take a jump through zero as a poor second */</div><div class='add'>+	soft_restart(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* For imx6q sabrelite board: set KSZ9021RN RGMII pad skew */</div><div class='add'>+static int ksz9021rn_phy_fixup(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	/* min rx data delay */</div><div class='add'>+	phy_write(phydev, 0x0b, 0x8105);</div><div class='add'>+	phy_write(phydev, 0x0c, 0x0000);</div><div class='add'>+</div><div class='add'>+	/* max rx/tx clock delay, min rx/tx control delay */</div><div class='add'>+	phy_write(phydev, 0x0b, 0x8104);</div><div class='add'>+	phy_write(phydev, 0x0c, 0xf0f0);</div><div class='add'>+	phy_write(phydev, 0x0b, 0x104);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init imx6q_init_machine(void)</div><div class='ctx'> {</div><div class='add'>+	if (of_machine_is_compatible("fsl,imx6q-sabrelite"))</div><div class='add'>+		phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,</div><div class='add'>+					   ksz9021rn_phy_fixup);</div><div class='add'>+</div><div class='ctx'> 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> 	imx6q_pm_init();</div><div class='hunk'>@@ -72,7 +126,8 @@ static struct sys_timer imx6q_timer = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const char *imx6q_dt_compat[] __initdata = {</div><div class='del'>-	"fsl,imx6q-sabreauto",</div><div class='add'>+	"fsl,imx6q-arm2",</div><div class='add'>+	"fsl,imx6q-sabrelite",</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -83,4 +138,5 @@ DT_MACHINE_START(IMX6Q, "Freescale i.MX6 Quad (Device Tree)")</div><div class='ctx'> 	.timer		= &amp;imx6q_timer,</div><div class='ctx'> 	.init_machine	= imx6q_init_machine,</div><div class='ctx'> 	.dt_compat	= imx6q_dt_compat,</div><div class='add'>+	.restart	= imx6q_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-kzm_arm11_01.c b/arch/arm/mach-imx/mach-kzm_arm11_01.c<br/>index 5f37f89e40fa..fc78e8071cd1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-kzm_arm11_01.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-kzm_arm11_01.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-kzm_arm11_01.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-kzm_arm11_01.c</a></div><div class='hunk'>@@ -279,4 +279,5 @@ MACHINE_START(KZM_ARM11_01, "Kyoto Microcomputer Co., Ltd. KZM-ARM11-01")</div><div class='ctx'> 	.handle_irq = imx31_handle_irq,</div><div class='ctx'> 	.timer = &amp;kzm_timer,</div><div class='ctx'> 	.init_machine = kzm_board_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-mx1ads.c b/arch/arm/mach-imx/mach-mx1ads.c<br/>index fc49785e7340..97046088ff1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx1ads.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx1ads.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx1ads.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-mx1ads.c</a></div><div class='hunk'>@@ -147,6 +147,7 @@ MACHINE_START(MX1ADS, "Freescale MX1ADS")</div><div class='ctx'> 	.handle_irq = imx1_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx1ads_timer,</div><div class='ctx'> 	.init_machine = mx1ads_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(MXLADS, "Freescale MXLADS")</div><div class='hunk'>@@ -157,4 +158,5 @@ MACHINE_START(MXLADS, "Freescale MXLADS")</div><div class='ctx'> 	.handle_irq = imx1_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx1ads_timer,</div><div class='ctx'> 	.init_machine = mx1ads_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-mx21ads.c b/arch/arm/mach-imx/mach-mx21ads.c<br/>index 25f84028d055..8d9f95514b1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx21ads.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx21ads.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx21ads.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-mx21ads.c</a></div><div class='hunk'>@@ -312,4 +312,5 @@ MACHINE_START(MX21ADS, "Freescale i.MX21ADS")</div><div class='ctx'> 	.handle_irq = imx21_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx21ads_timer,</div><div class='ctx'> 	.init_machine = mx21ads_board_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-mx25_3ds.c b/arch/arm/mach-imx/mach-mx25_3ds.c<br/>index 88dccf122243..f26734298aa6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx25_3ds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx25_3ds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx25_3ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-mx25_3ds.c</a></div><div class='hunk'>@@ -270,4 +270,5 @@ MACHINE_START(MX25_3DS, "Freescale MX25PDK (3DS)")</div><div class='ctx'> 	.handle_irq = imx25_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx25pdk_timer,</div><div class='ctx'> 	.init_machine = mx25pdk_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c<br/>index ba232d79fa81..18f35816706a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx27_3ds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx27_3ds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx27_3ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-mx27_3ds.c</a></div><div class='hunk'>@@ -425,4 +425,5 @@ MACHINE_START(MX27_3DS, "Freescale MX27PDK")</div><div class='ctx'> 	.handle_irq = imx27_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx27pdk_timer,</div><div class='ctx'> 	.init_machine = mx27pdk_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-mx27ads.c b/arch/arm/mach-imx/mach-mx27ads.c<br/>index 74dd5731eb61..0228d2e07fe0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx27ads.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx27ads.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx27ads.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-mx27ads.c</a></div><div class='hunk'>@@ -351,4 +351,5 @@ MACHINE_START(MX27ADS, "Freescale i.MX27ADS")</div><div class='ctx'> 	.handle_irq = imx27_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx27ads_timer,</div><div class='ctx'> 	.init_machine = mx27ads_board_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c<br/>index b8c54b840185..4d1aab154400 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx31_3ds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx31_3ds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx31_3ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-mx31_3ds.c</a></div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/memblock.h&gt;</div><div class='ctx'> #include &lt;mach/common.h&gt;</div><div class='ctx'> #include &lt;mach/iomux-mx3.h&gt;</div><div class='ctx'> #include &lt;mach/3ds_debugboard.h&gt;</div><div class='hunk'>@@ -492,7 +493,7 @@ static struct mc13xxx_platform_data mc13783_pdata = {</div><div class='ctx'> 		.regulators = mx31_3ds_regulators,</div><div class='ctx'> 		.num_regulators = ARRAY_SIZE(mx31_3ds_regulators),</div><div class='ctx'> 	},</div><div class='del'>-	.flags  = MC13XXX_USE_TOUCHSCREEN,</div><div class='add'>+	.flags  = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* SPI */</div><div class='hunk'>@@ -754,10 +755,8 @@ static struct sys_timer mx31_3ds_timer = {</div><div class='ctx'> static void __init mx31_3ds_reserve(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* reserve MX31_3DS_CAMERA_BUF_SIZE bytes for mx3-camera */</div><div class='del'>-	mx3_camera_base = memblock_alloc(MX31_3DS_CAMERA_BUF_SIZE,</div><div class='add'>+	mx3_camera_base = arm_memblock_steal(MX31_3DS_CAMERA_BUF_SIZE,</div><div class='ctx'> 					 MX31_3DS_CAMERA_BUF_SIZE);</div><div class='del'>-	memblock_free(mx3_camera_base, MX31_3DS_CAMERA_BUF_SIZE);</div><div class='del'>-	memblock_remove(mx3_camera_base, MX31_3DS_CAMERA_BUF_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)")</div><div class='hunk'>@@ -770,4 +769,5 @@ MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)")</div><div class='ctx'> 	.timer = &amp;mx31_3ds_timer,</div><div class='ctx'> 	.init_machine = mx31_3ds_init,</div><div class='ctx'> 	.reserve = mx31_3ds_reserve,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-mx31ads.c b/arch/arm/mach-imx/mach-mx31ads.c<br/>index 9cc1a49053bb..4917aab0e253 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx31ads.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx31ads.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx31ads.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-mx31ads.c</a></div><div class='hunk'>@@ -542,4 +542,5 @@ MACHINE_START(MX31ADS, "Freescale MX31ADS")</div><div class='ctx'> 	.handle_irq = imx31_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx31ads_timer,</div><div class='ctx'> 	.init_machine = mx31ads_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-mx31lilly.c b/arch/arm/mach-imx/mach-mx31lilly.c<br/>index 102ec99357cc..02401bbd6d53 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx31lilly.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx31lilly.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx31lilly.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-mx31lilly.c</a></div><div class='hunk'>@@ -303,4 +303,5 @@ MACHINE_START(LILLY1131, "INCO startec LILLY-1131")</div><div class='ctx'> 	.handle_irq = imx31_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx31lilly_timer,</div><div class='ctx'> 	.init_machine = mx31lilly_board_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-mx31lite.c b/arch/arm/mach-imx/mach-mx31lite.c<br/>index 5366d2de18fd..ef80751712e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx31lite.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx31lite.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx31lite.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-mx31lite.c</a></div><div class='hunk'>@@ -287,4 +287,5 @@ MACHINE_START(MX31LITE, "LogicPD i.MX31 SOM")</div><div class='ctx'> 	.handle_irq = imx31_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx31lite_timer,</div><div class='ctx'> 	.init_machine = mx31lite_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c<br/>index 93269150309c..f225262b5c38 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx31moboard.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx31moboard.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx31moboard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-mx31moboard.c</a></div><div class='hunk'>@@ -41,6 +41,7 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/memblock.h&gt;</div><div class='ctx'> #include &lt;mach/board-mx31moboard.h&gt;</div><div class='ctx'> #include &lt;mach/common.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='hunk'>@@ -584,10 +585,8 @@ struct sys_timer mx31moboard_timer = {</div><div class='ctx'> static void __init mx31moboard_reserve(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* reserve 4 MiB for mx3-camera */</div><div class='del'>-	mx3_camera_base = memblock_alloc(MX3_CAMERA_BUF_SIZE,</div><div class='add'>+	mx3_camera_base = arm_memblock_steal(MX3_CAMERA_BUF_SIZE,</div><div class='ctx'> 			MX3_CAMERA_BUF_SIZE);</div><div class='del'>-	memblock_free(mx3_camera_base, MX3_CAMERA_BUF_SIZE);</div><div class='del'>-	memblock_remove(mx3_camera_base, MX3_CAMERA_BUF_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard")</div><div class='hunk'>@@ -600,4 +599,5 @@ MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard")</div><div class='ctx'> 	.handle_irq = imx31_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx31moboard_timer,</div><div class='ctx'> 	.init_machine = mx31moboard_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-mx35_3ds.c b/arch/arm/mach-imx/mach-mx35_3ds.c<br/>index 7a462025a0f7..0af6c9c5b3fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx35_3ds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mx35_3ds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mx35_3ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-mx35_3ds.c</a></div><div class='hunk'>@@ -224,4 +224,5 @@ MACHINE_START(MX35_3DS, "Freescale MX35PDK")</div><div class='ctx'> 	.handle_irq = imx35_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx35pdk_timer,</div><div class='ctx'> 	.init_machine = mx35_3ds_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-mxt_td60.c b/arch/arm/mach-imx/mach-mxt_td60.c<br/>index 125c19643b0f..8b3d3f07d894 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mxt_td60.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-mxt_td60.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-mxt_td60.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-mxt_td60.c</a></div><div class='hunk'>@@ -274,4 +274,5 @@ MACHINE_START(MXT_TD60, "Maxtrack i-MXT TD60")</div><div class='ctx'> 	.handle_irq = imx27_handle_irq,</div><div class='ctx'> 	.timer = &amp;mxt_td60_timer,</div><div class='ctx'> 	.init_machine = mxt_td60_board_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c<br/>index 26072f4b02e3..d3b9c6b5edde 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-pca100.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-pca100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-pca100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-pca100.c</a></div><div class='hunk'>@@ -442,4 +442,5 @@ MACHINE_START(PCA100, "phyCARD-i.MX27")</div><div class='ctx'> 	.handle_irq = imx27_handle_irq,</div><div class='ctx'> 	.init_machine = pca100_init,</div><div class='ctx'> 	.timer = &amp;pca100_timer,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-pcm037.c b/arch/arm/mach-imx/mach-pcm037.c<br/>index efd6b536ef6a..e48854b9d990 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-pcm037.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-pcm037.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-pcm037.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-pcm037.c</a></div><div class='hunk'>@@ -39,6 +39,7 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/memblock.h&gt;</div><div class='ctx'> #include &lt;mach/common.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/iomux-mx3.h&gt;</div><div class='hunk'>@@ -680,10 +681,8 @@ struct sys_timer pcm037_timer = {</div><div class='ctx'> static void __init pcm037_reserve(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* reserve 4 MiB for mx3-camera */</div><div class='del'>-	mx3_camera_base = memblock_alloc(MX3_CAMERA_BUF_SIZE,</div><div class='add'>+	mx3_camera_base = arm_memblock_steal(MX3_CAMERA_BUF_SIZE,</div><div class='ctx'> 			MX3_CAMERA_BUF_SIZE);</div><div class='del'>-	memblock_free(mx3_camera_base, MX3_CAMERA_BUF_SIZE);</div><div class='del'>-	memblock_remove(mx3_camera_base, MX3_CAMERA_BUF_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(PCM037, "Phytec Phycore pcm037")</div><div class='hunk'>@@ -696,4 +695,5 @@ MACHINE_START(PCM037, "Phytec Phycore pcm037")</div><div class='ctx'> 	.handle_irq = imx31_handle_irq,</div><div class='ctx'> 	.timer = &amp;pcm037_timer,</div><div class='ctx'> 	.init_machine = pcm037_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c<br/>index a17e9c7dfca0..16f126da9f8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-pcm038.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-pcm038.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-pcm038.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-pcm038.c</a></div><div class='hunk'>@@ -357,4 +357,5 @@ MACHINE_START(PCM038, "phyCORE-i.MX27")</div><div class='ctx'> 	.handle_irq = imx27_handle_irq,</div><div class='ctx'> 	.timer = &amp;pcm038_timer,</div><div class='ctx'> 	.init_machine = pcm038_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-pcm043.c b/arch/arm/mach-imx/mach-pcm043.c<br/>index 7366c2ae3ea5..06dc106519ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-pcm043.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-pcm043.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-pcm043.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-pcm043.c</a></div><div class='hunk'>@@ -425,4 +425,5 @@ MACHINE_START(PCM043, "Phytec Phycore pcm043")</div><div class='ctx'> 	.handle_irq = imx35_handle_irq,</div><div class='ctx'> 	.timer = &amp;pcm043_timer,</div><div class='ctx'> 	.init_machine = pcm043_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-qong.c b/arch/arm/mach-imx/mach-qong.c<br/>index 4ff5faf102a8..260621055b6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-qong.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-qong.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-qong.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-qong.c</a></div><div class='hunk'>@@ -273,4 +273,5 @@ MACHINE_START(QONG, "Dave/DENX QongEVB-LITE")</div><div class='ctx'> 	.handle_irq = imx31_handle_irq,</div><div class='ctx'> 	.timer = &amp;qong_timer,</div><div class='ctx'> 	.init_machine = qong_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-scb9328.c b/arch/arm/mach-imx/mach-scb9328.c<br/>index bb6e5b25d8d0..cb9ceae2f648 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-scb9328.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-scb9328.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-scb9328.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-scb9328.c</a></div><div class='hunk'>@@ -144,4 +144,5 @@ MACHINE_START(SCB9328, "Synertronixx scb9328")</div><div class='ctx'> 	.handle_irq = imx1_handle_irq,</div><div class='ctx'> 	.timer = &amp;scb9328_timer,</div><div class='ctx'> 	.init_machine = scb9328_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/mach-vpr200.c b/arch/arm/mach-imx/mach-vpr200.c<br/>index 69092458f2d9..033257e553ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-vpr200.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/mach-vpr200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/mach-vpr200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/mach-vpr200.c</a></div><div class='hunk'>@@ -322,4 +322,5 @@ MACHINE_START(VPR200, "VPR200")</div><div class='ctx'> 	.handle_irq = imx35_handle_irq,</div><div class='ctx'> 	.timer = &amp;vpr200_timer,</div><div class='ctx'> 	.init_machine = vpr200_board_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-imx/pm-imx6q.c b/arch/arm/mach-imx/pm-imx6q.c<br/>index f20f191d7cca..f7b0c2b1b905 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/pm-imx6q.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/pm-imx6q.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/pm-imx6q.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/pm-imx6q.c</a></div><div class='hunk'>@@ -64,7 +64,9 @@ void __init imx6q_pm_init(void)</div><div class='ctx'> 	 * address of the data structure used by l2x0 core to save registers,</div><div class='ctx'> 	 * and later restore the necessary ones in imx6q resume entry.</div><div class='ctx'> 	 */</div><div class='add'>+#ifdef CONFIG_CACHE_L2X0</div><div class='ctx'> 	phys_l2x0_saved_regs = __pa(&amp;l2x0_saved_regs);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	suspend_set_ops(&amp;imx6q_pm_ops);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-imx/src.c b/arch/arm/mach-imx/src.c<br/>index a8e33681b732..29bd1243781e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/src.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-imx/src.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/src.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-imx/src.c</a></div><div class='hunk'>@@ -15,10 +15,10 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='del'>-#include &lt;asm/unified.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SRC_SCR				0x000</div><div class='ctx'> #define SRC_GPR1			0x020</div><div class='add'>+#define BP_SRC_SCR_WARM_RESET_ENABLE	0</div><div class='ctx'> #define BP_SRC_SCR_CORE1_RST		14</div><div class='ctx'> #define BP_SRC_SCR_CORE1_ENABLE		22</div><div class='ctx'> </div><div class='hunk'>@@ -42,15 +42,37 @@ void imx_enable_cpu(int cpu, bool enable)</div><div class='ctx'> void imx_set_cpu_jump(int cpu, void *jump_addr)</div><div class='ctx'> {</div><div class='ctx'> 	cpu = cpu_logical_map(cpu);</div><div class='del'>-	writel_relaxed(BSYM(virt_to_phys(jump_addr)),</div><div class='add'>+	writel_relaxed(virt_to_phys(jump_addr),</div><div class='ctx'> 		       src_base + SRC_GPR1 + cpu * 8);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void imx_src_prepare_restart(void)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* clear enable bits of secondary cores */</div><div class='add'>+	val = readl_relaxed(src_base + SRC_SCR);</div><div class='add'>+	val &amp;= ~(0x7 &lt;&lt; BP_SRC_SCR_CORE1_ENABLE);</div><div class='add'>+	writel_relaxed(val, src_base + SRC_SCR);</div><div class='add'>+</div><div class='add'>+	/* clear persistent entry register of primary core */</div><div class='add'>+	writel_relaxed(0, src_base + SRC_GPR1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init imx_src_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np;</div><div class='add'>+	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-src");</div><div class='ctx'> 	src_base = of_iomap(np, 0);</div><div class='ctx'> 	WARN_ON(!src_base);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * force warm reset sources to generate cold reset</div><div class='add'>+	 * for a more reliable restart</div><div class='add'>+	 */</div><div class='add'>+	val = readl_relaxed(src_base + SRC_SCR);</div><div class='add'>+	val &amp;= ~(1 &lt;&lt; BP_SRC_SCR_WARM_RESET_ENABLE);</div><div class='add'>+	writel_relaxed(val, src_base + SRC_SCR);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig<br/>index dfd18f3b50e8..350e26636a06 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-integrator/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-integrator/Kconfig</a></div><div class='hunk'>@@ -6,6 +6,8 @@ config ARCH_INTEGRATOR_AP</div><div class='ctx'> 	bool "Support Integrator/AP and Integrator/PP2 platforms"</div><div class='ctx'> 	select CLKSRC_MMIO</div><div class='ctx'> 	select MIGHT_HAVE_PCI</div><div class='add'>+	select SERIAL_AMBA_PL010</div><div class='add'>+	select SERIAL_AMBA_PL010_CONSOLE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Include support for the ARM(R) Integrator/AP and</div><div class='ctx'> 	  Integrator/PP2 platforms.</div><div class='hunk'>@@ -15,6 +17,8 @@ config ARCH_INTEGRATOR_CP</div><div class='ctx'> 	select ARCH_CINTEGRATOR</div><div class='ctx'> 	select ARM_TIMER_SP804</div><div class='ctx'> 	select PLAT_VERSATILE_CLCD</div><div class='add'>+	select SERIAL_AMBA_PL011</div><div class='add'>+	select SERIAL_AMBA_PL011_CONSOLE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Include support for the ARM(R) Integrator CP platform.</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-integrator/common.h b/arch/arm/mach-integrator/common.h<br/>index a08f9b0299df..899561d8db28 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-integrator/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-integrator/common.h</a></div><div class='hunk'>@@ -1,2 +1,3 @@</div><div class='ctx'> void integrator_init_early(void);</div><div class='ctx'> void integrator_reserve(void);</div><div class='add'>+void integrator_restart(char, const char *);</div><div class='head'>diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c<br/>index 4b38e13667ac..019f0ab08f66 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-integrator/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-integrator/core.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include &lt;mach/cm.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -44,7 +45,6 @@ static struct amba_device rtc_device = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	.irq		= { IRQ_RTCINT, NO_IRQ },</div><div class='del'>-	.periphid	= 0x00041030,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct amba_device uart0_device = {</div><div class='hunk'>@@ -58,7 +58,6 @@ static struct amba_device uart0_device = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	.irq		= { IRQ_UARTINT0, NO_IRQ },</div><div class='del'>-	.periphid	= 0x0041010,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct amba_device uart1_device = {</div><div class='hunk'>@@ -72,7 +71,6 @@ static struct amba_device uart1_device = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	.irq		= { IRQ_UARTINT1, NO_IRQ },</div><div class='del'>-	.periphid	= 0x0041010,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct amba_device kmi0_device = {</div><div class='hunk'>@@ -85,7 +83,6 @@ static struct amba_device kmi0_device = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	.irq		= { IRQ_KMIINT0, NO_IRQ },</div><div class='del'>-	.periphid	= 0x00041050,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct amba_device kmi1_device = {</div><div class='hunk'>@@ -98,7 +95,6 @@ static struct amba_device kmi1_device = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	.irq		= { IRQ_KMIINT1, NO_IRQ },</div><div class='del'>-	.periphid	= 0x00041050,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct amba_device *amba_devs[] __initdata = {</div><div class='hunk'>@@ -157,6 +153,19 @@ static int __init integrator_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * The Integrator/AP lacks necessary AMBA PrimeCell IDs, so we need to</div><div class='add'>+	 * hard-code them. The Integator/CP and forward have proper cell IDs.</div><div class='add'>+	 * Else we leave them undefined to the bus driver can autoprobe them.</div><div class='add'>+	 */</div><div class='add'>+	if (machine_is_integrator()) {</div><div class='add'>+		rtc_device.periphid	= 0x00041030;</div><div class='add'>+		uart0_device.periphid	= 0x00041010;</div><div class='add'>+		uart1_device.periphid	= 0x00041010;</div><div class='add'>+		kmi0_device.periphid	= 0x00041050;</div><div class='add'>+		kmi1_device.periphid	= 0x00041050;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(amba_devs); i++) {</div><div class='ctx'> 		struct amba_device *d = amba_devs[i];</div><div class='ctx'> 		amba_device_register(d, &amp;iomem_resource);</div><div class='hunk'>@@ -238,3 +247,11 @@ void __init integrator_reserve(void)</div><div class='ctx'> {</div><div class='ctx'> 	memblock_reserve(PHYS_OFFSET, __pa(swapper_pg_dir) - PHYS_OFFSET);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * To reset, we hit the on-board reset register in the system FPGA</div><div class='add'>+ */</div><div class='add'>+void integrator_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	cm_control(CM_CTRL_RESET, CM_CTRL_RESET);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-integrator/include/mach/system.h b/arch/arm/mach-integrator/include/mach/system.h<br/>index e1551b8dab77..901514eba4a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-integrator/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-integrator/include/mach/system.h</a></div><div class='hunk'>@@ -21,8 +21,6 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/cm.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -32,13 +30,4 @@ static inline void arch_idle(void)</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * To reset, we hit the on-board reset register</div><div class='del'>-	 * in the system FPGA</div><div class='del'>-	 */</div><div class='del'>-	cm_control(CM_CTRL_RESET, CM_CTRL_RESET);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-integrator/include/mach/vmalloc.h b/arch/arm/mach-integrator/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 2f5a2bafb11f..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-integrator/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  arch/arm/mach-integrator/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2000 Russell King.</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='del'>-#define VMALLOC_END       0xd0000000UL</div><div class='head'>diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c<br/>index a1769f35a86e..21a1d6cbef40 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/integrator_ap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-integrator/integrator_ap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/integrator_ap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-integrator/integrator_ap.c</a></div><div class='hunk'>@@ -472,4 +472,5 @@ MACHINE_START(INTEGRATOR, "ARM-Integrator")</div><div class='ctx'> 	.init_irq	= ap_init_irq,</div><div class='ctx'> 	.timer		= &amp;ap_timer,</div><div class='ctx'> 	.init_machine	= ap_init,</div><div class='add'>+	.restart	= integrator_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c<br/>index 5de49c33e4d4..a8b6aa6003f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/integrator_cp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-integrator/integrator_cp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/integrator_cp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-integrator/integrator_cp.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/kmi.h&gt;</div><div class='ctx'> #include &lt;linux/amba/clcd.h&gt;</div><div class='hunk'>@@ -499,4 +499,5 @@ MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP")</div><div class='ctx'> 	.init_irq	= intcp_init_irq,</div><div class='ctx'> 	.timer		= &amp;cp_timer,</div><div class='ctx'> 	.init_machine	= intcp_init,</div><div class='add'>+	.restart	= integrator_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c<br/>index b4d8f8b8a085..3c82566acece 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/pci_v3.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-integrator/pci_v3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/pci_v3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-integrator/pci_v3.c</a></div><div class='hunk'>@@ -359,7 +359,7 @@ static struct resource pre_mem = {</div><div class='ctx'> 	.flags	= IORESOURCE_MEM | IORESOURCE_PREFETCH,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pci_v3_setup_resources(struct resource **resource)</div><div class='add'>+static int __init pci_v3_setup_resources(struct pci_sys_data *sys)</div><div class='ctx'> {</div><div class='ctx'> 	if (request_resource(&amp;iomem_resource, &amp;non_mem)) {</div><div class='ctx'> 		printk(KERN_ERR "PCI: unable to allocate non-prefetchable "</div><div class='hunk'>@@ -374,13 +374,13 @@ static int __init pci_v3_setup_resources(struct resource **resource)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * bus-&gt;resource[0] is the IO resource for this bus</div><div class='del'>-	 * bus-&gt;resource[1] is the mem resource for this bus</div><div class='del'>-	 * bus-&gt;resource[2] is the prefetch mem resource for this bus</div><div class='add'>+	 * the IO resource for this bus</div><div class='add'>+	 * the mem resource for this bus</div><div class='add'>+	 * the prefetch mem resource for this bus</div><div class='ctx'> 	 */</div><div class='del'>-	resource[0] = &amp;ioport_resource;</div><div class='del'>-	resource[1] = &amp;non_mem;</div><div class='del'>-	resource[2] = &amp;pre_mem;</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;ioport_resource);</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;non_mem);</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;pre_mem);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -481,7 +481,7 @@ int __init pci_v3_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> </div><div class='ctx'> 	if (nr == 0) {</div><div class='ctx'> 		sys-&gt;mem_offset = PHYS_PCI_MEM_BASE;</div><div class='del'>-		ret = pci_v3_setup_resources(sys-&gt;resource);</div><div class='add'>+		ret = pci_v3_setup_resources(sys);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -489,7 +489,8 @@ int __init pci_v3_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> </div><div class='ctx'> struct pci_bus * __init pci_v3_scan_bus(int nr, struct pci_sys_data *sys)</div><div class='ctx'> {</div><div class='del'>-	return pci_scan_bus(sys-&gt;busnr, &amp;pci_v3_ops, sys);</div><div class='add'>+	return pci_scan_root_bus(NULL, sys-&gt;busnr, &amp;pci_v3_ops, sys,</div><div class='add'>+				 &amp;sys-&gt;resources);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-iop13xx/include/mach/iop13xx.h b/arch/arm/mach-iop13xx/include/mach/iop13xx.h<br/>index 52b7fab7ef60..07e9ff7adafb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/iop13xx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop13xx/include/mach/iop13xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/iop13xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-iop13xx/include/mach/iop13xx.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@ void iop13xx_map_io(void);</div><div class='ctx'> void iop13xx_platform_init(void);</div><div class='ctx'> void iop13xx_add_tpmi_devices(void);</div><div class='ctx'> void iop13xx_init_irq(void);</div><div class='add'>+void iop13xx_restart(char, const char *);</div><div class='ctx'> </div><div class='ctx'> /* CPUID CP6 R0 Page 0 */</div><div class='ctx'> static inline int iop13xx_cpu_id(void)</div><div class='head'>diff --git a/arch/arm/mach-iop13xx/include/mach/system.h b/arch/arm/mach-iop13xx/include/mach/system.h<br/>index d0c66ef450a7..1f31ed3f8ae2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop13xx/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-iop13xx/include/mach/system.h</a></div><div class='hunk'>@@ -7,21 +7,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'>-#include &lt;mach/iop13xx.h&gt;</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Reset the internal bus (warning both cores are reset)</div><div class='del'>-	 */</div><div class='del'>-	write_wdtcr(IOP_WDTCR_EN_ARM);</div><div class='del'>-	write_wdtcr(IOP_WDTCR_EN);</div><div class='del'>-	write_wdtsr(IOP13XX_WDTSR_WRITE_EN | IOP13XX_WDTCR_IB_RESET);</div><div class='del'>-	write_wdtcr(0x1000);</div><div class='del'>-</div><div class='del'>-	for(;;);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-iop13xx/include/mach/vmalloc.h b/arch/arm/mach-iop13xx/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index c53456740345..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop13xx/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-#ifndef _VMALLOC_H_</div><div class='del'>-#define _VMALLOC_H_</div><div class='del'>-#define VMALLOC_END 	0xfa000000UL</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-iop13xx/iq81340mc.c b/arch/arm/mach-iop13xx/iq81340mc.c<br/>index 4cf2cc477eae..abaee8833588 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/iq81340mc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop13xx/iq81340mc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/iq81340mc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-iop13xx/iq81340mc.c</a></div><div class='hunk'>@@ -96,4 +96,5 @@ MACHINE_START(IQ81340MC, "Intel IQ81340MC")</div><div class='ctx'> 	.init_irq       = iop13xx_init_irq,</div><div class='ctx'> 	.timer          = &amp;iq81340mc_timer,</div><div class='ctx'> 	.init_machine   = iq81340mc_init,</div><div class='add'>+	.restart	= iop13xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-iop13xx/iq81340sc.c b/arch/arm/mach-iop13xx/iq81340sc.c<br/>index cd9e27499a1e..690916a09dc6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/iq81340sc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop13xx/iq81340sc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/iq81340sc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-iop13xx/iq81340sc.c</a></div><div class='hunk'>@@ -98,4 +98,5 @@ MACHINE_START(IQ81340SC, "Intel IQ81340SC")</div><div class='ctx'> 	.init_irq       = iop13xx_init_irq,</div><div class='ctx'> 	.timer          = &amp;iq81340sc_timer,</div><div class='ctx'> 	.init_machine   = iq81340sc_init,</div><div class='add'>+	.restart	= iop13xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-iop13xx/pci.c b/arch/arm/mach-iop13xx/pci.c<br/>index db012fadf88c..b8f5a8736511 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop13xx/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-iop13xx/pci.c</a></div><div class='hunk'>@@ -537,14 +537,14 @@ struct pci_bus *iop13xx_scan_bus(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 			while(time_before(jiffies, atux_trhfa_timeout))</div><div class='ctx'> 				udelay(100);</div><div class='ctx'> </div><div class='del'>-		bus = pci_bus_atux = pci_scan_bus(sys-&gt;busnr,</div><div class='del'>-						  &amp;iop13xx_atux_ops,</div><div class='del'>-						  sys);</div><div class='add'>+		bus = pci_bus_atux = pci_scan_root_bus(NULL, sys-&gt;busnr,</div><div class='add'>+						       &amp;iop13xx_atux_ops,</div><div class='add'>+						       sys, &amp;sys-&gt;resources);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IOP13XX_INIT_ATU_ATUE:</div><div class='del'>-		bus = pci_bus_atue = pci_scan_bus(sys-&gt;busnr,</div><div class='del'>-						  &amp;iop13xx_atue_ops,</div><div class='del'>-						  sys);</div><div class='add'>+		bus = pci_bus_atue = pci_scan_root_bus(NULL, sys-&gt;busnr,</div><div class='add'>+						       &amp;iop13xx_atue_ops,</div><div class='add'>+						       sys, &amp;sys-&gt;resources);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1084,9 +1084,8 @@ int iop13xx_pci_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	request_resource(&amp;ioport_resource, &amp;res[0]);</div><div class='ctx'> 	request_resource(&amp;iomem_resource, &amp;res[1]);</div><div class='ctx'> </div><div class='del'>-	sys-&gt;resource[0] = &amp;res[0];</div><div class='del'>-	sys-&gt;resource[1] = &amp;res[1];</div><div class='del'>-	sys-&gt;resource[2] = NULL;</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;res[0]);</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;res[1]);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</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 a5b989728b9e..daabb1fa6c2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop13xx/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop13xx/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-iop13xx/setup.c</a></div><div class='hunk'>@@ -606,3 +606,14 @@ static int __init iop13xx_init_adma_setup(char *str)</div><div class='ctx'> __setup("iop13xx_init_adma", iop13xx_init_adma_setup);</div><div class='ctx'> __setup("iop13xx_init_uart", iop13xx_init_uart_setup);</div><div class='ctx'> __setup("iop13xx_init_i2c", iop13xx_init_i2c_setup);</div><div class='add'>+</div><div class='add'>+void iop13xx_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Reset the internal bus (warning both cores are reset)</div><div class='add'>+	 */</div><div class='add'>+	write_wdtcr(IOP_WDTCR_EN_ARM);</div><div class='add'>+	write_wdtcr(IOP_WDTCR_EN);</div><div class='add'>+	write_wdtsr(IOP13XX_WDTSR_WRITE_EN | IOP13XX_WDTCR_IB_RESET);</div><div class='add'>+	write_wdtcr(0x1000);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-iop32x/em7210.c b/arch/arm/mach-iop32x/em7210.c<br/>index 4325055d4e19..24069e03fdc1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/em7210.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop32x/em7210.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/em7210.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-iop32x/em7210.c</a></div><div class='hunk'>@@ -208,4 +208,5 @@ MACHINE_START(EM7210, "Lanner EM7210")</div><div class='ctx'> 	.init_irq	= iop32x_init_irq,</div><div class='ctx'> 	.timer		= &amp;em7210_timer,</div><div class='ctx'> 	.init_machine	= em7210_init_machine,</div><div class='add'>+	.restart	= iop3xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-iop32x/glantank.c b/arch/arm/mach-iop32x/glantank.c<br/>index 0edc88020577..204e1d1cd766 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/glantank.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop32x/glantank.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/glantank.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-iop32x/glantank.c</a></div><div class='hunk'>@@ -212,4 +212,5 @@ MACHINE_START(GLANTANK, "GLAN Tank")</div><div class='ctx'> 	.init_irq	= iop32x_init_irq,</div><div class='ctx'> 	.timer		= &amp;glantank_timer,</div><div class='ctx'> 	.init_machine	= glantank_init_machine,</div><div class='add'>+	.restart	= iop3xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-iop32x/include/mach/io.h b/arch/arm/mach-iop32x/include/mach/io.h<br/>index 059c783ce0b2..2d88264b9863 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop32x/include/mach/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-iop32x/include/mach/io.h</a></div><div class='hunk'>@@ -13,15 +13,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/iop3xx.h&gt;</div><div class='ctx'> </div><div class='del'>-extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size,</div><div class='del'>-	unsigned int mtype);</div><div class='del'>-extern void __iop3xx_iounmap(void __iomem *addr);</div><div class='del'>-</div><div class='ctx'> #define IO_SPACE_LIMIT		0xffffffff</div><div class='ctx'> #define __io(p)		((void __iomem *)IOP3XX_PCI_IO_PHYS_TO_VIRT(p))</div><div class='ctx'> #define __mem_pci(a)		(a)</div><div class='ctx'> </div><div class='del'>-#define __arch_ioremap	__iop3xx_ioremap</div><div class='del'>-#define __arch_iounmap	__iop3xx_iounmap</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-iop32x/include/mach/system.h b/arch/arm/mach-iop32x/include/mach/system.h<br/>index a4b808fe0d81..4a88727bca98 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop32x/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-iop32x/include/mach/system.h</a></div><div class='hunk'>@@ -7,28 +7,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'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/hardware/iop3xx.h&gt;</div><div class='del'>-#include &lt;mach/n2100.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	local_irq_disable();</div><div class='del'>-</div><div class='del'>-	if (machine_is_n2100()) {</div><div class='del'>-		gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW);</div><div class='del'>-		gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT);</div><div class='del'>-		while (1)</div><div class='del'>-			;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*IOP3XX_PCSR = 0x30;</div><div class='del'>-</div><div class='del'>-	/* Jump into ROM at address 0 */</div><div class='del'>-	cpu_reset(0);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-iop32x/include/mach/vmalloc.h b/arch/arm/mach-iop32x/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index c4862d48e583..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop32x/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-iop32x/include/mach/vmalloc.h</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END	0xfe000000UL</div><div class='head'>diff --git a/arch/arm/mach-iop32x/iq31244.c b/arch/arm/mach-iop32x/iq31244.c<br/>index 9e7aaccfeba0..3eb642af1cdc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/iq31244.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop32x/iq31244.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/iq31244.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-iop32x/iq31244.c</a></div><div class='hunk'>@@ -318,6 +318,7 @@ MACHINE_START(IQ31244, "Intel IQ31244")</div><div class='ctx'> 	.init_irq	= iop32x_init_irq,</div><div class='ctx'> 	.timer		= &amp;iq31244_timer,</div><div class='ctx'> 	.init_machine	= iq31244_init_machine,</div><div class='add'>+	.restart	= iop3xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> /* There should have been an ep80219 machine identifier from the beginning.</div><div class='hunk'>@@ -332,4 +333,5 @@ MACHINE_START(EP80219, "Intel EP80219")</div><div class='ctx'> 	.init_irq	= iop32x_init_irq,</div><div class='ctx'> 	.timer		= &amp;iq31244_timer,</div><div class='ctx'> 	.init_machine	= iq31244_init_machine,</div><div class='add'>+	.restart	= iop3xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-iop32x/iq80321.c b/arch/arm/mach-iop32x/iq80321.c<br/>index 53ea86f649dd..2ec724b58a2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/iq80321.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop32x/iq80321.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/iq80321.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-iop32x/iq80321.c</a></div><div class='hunk'>@@ -191,4 +191,5 @@ MACHINE_START(IQ80321, "Intel IQ80321")</div><div class='ctx'> 	.init_irq	= iop32x_init_irq,</div><div class='ctx'> 	.timer		= &amp;iq80321_timer,</div><div class='ctx'> 	.init_machine	= iq80321_init_machine,</div><div class='add'>+	.restart	= iop3xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c<br/>index d7269279968c..6b6d55912444 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/n2100.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop32x/n2100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop32x/n2100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-iop32x/n2100.c</a></div><div class='hunk'>@@ -291,6 +291,14 @@ static void n2100_power_off(void)</div><div class='ctx'> 		;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void n2100_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW);</div><div class='add'>+	gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT);</div><div class='add'>+	while (1)</div><div class='add'>+		;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static struct timer_list power_button_poll_timer;</div><div class='ctx'> </div><div class='hunk'>@@ -332,4 +340,5 @@ MACHINE_START(N2100, "Thecus N2100")</div><div class='ctx'> 	.init_irq	= iop32x_init_irq,</div><div class='ctx'> 	.timer		= &amp;n2100_timer,</div><div class='ctx'> 	.init_machine	= n2100_init_machine,</div><div class='add'>+	.restart	= n2100_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-iop33x/include/mach/io.h b/arch/arm/mach-iop33x/include/mach/io.h<br/>index 39e893e97c21..a8a66fc8fbdb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop33x/include/mach/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-iop33x/include/mach/io.h</a></div><div class='hunk'>@@ -13,15 +13,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/iop3xx.h&gt;</div><div class='ctx'> </div><div class='del'>-extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size,</div><div class='del'>-	unsigned int mtype);</div><div class='del'>-extern void __iop3xx_iounmap(void __iomem *addr);</div><div class='del'>-</div><div class='ctx'> #define IO_SPACE_LIMIT		0xffffffff</div><div class='ctx'> #define __io(p)		((void __iomem *)IOP3XX_PCI_IO_PHYS_TO_VIRT(p))</div><div class='ctx'> #define __mem_pci(a)		(a)</div><div class='ctx'> </div><div class='del'>-#define __arch_ioremap	__iop3xx_ioremap</div><div class='del'>-#define __arch_iounmap	__iop3xx_iounmap</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-iop33x/include/mach/system.h b/arch/arm/mach-iop33x/include/mach/system.h<br/>index f192a34be073..4f98e765397c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop33x/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-iop33x/include/mach/system.h</a></div><div class='hunk'>@@ -7,17 +7,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'>-#include &lt;asm/hardware/iop3xx.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	*IOP3XX_PCSR = 0x30;</div><div class='del'>-</div><div class='del'>-	/* Jump into ROM at address 0 */</div><div class='del'>-	cpu_reset(0);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-iop33x/include/mach/vmalloc.h b/arch/arm/mach-iop33x/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 48331dc23704..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop33x/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-iop33x/include/mach/vmalloc.h</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END	0xfe000000UL</div><div class='head'>diff --git a/arch/arm/mach-iop33x/iq80331.c b/arch/arm/mach-iop33x/iq80331.c<br/>index 9e14ccc56f8e..abce934f3816 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/iq80331.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop33x/iq80331.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/iq80331.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-iop33x/iq80331.c</a></div><div class='hunk'>@@ -146,4 +146,5 @@ MACHINE_START(IQ80331, "Intel IQ80331")</div><div class='ctx'> 	.init_irq	= iop33x_init_irq,</div><div class='ctx'> 	.timer		= &amp;iq80331_timer,</div><div class='ctx'> 	.init_machine	= iq80331_init_machine,</div><div class='add'>+	.restart	= iop3xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-iop33x/iq80332.c b/arch/arm/mach-iop33x/iq80332.c<br/>index 09c899a2523f..7513559e25bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/iq80332.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-iop33x/iq80332.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop33x/iq80332.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-iop33x/iq80332.c</a></div><div class='hunk'>@@ -146,4 +146,5 @@ MACHINE_START(IQ80332, "Intel IQ80332")</div><div class='ctx'> 	.init_irq	= iop33x_init_irq,</div><div class='ctx'> 	.timer		= &amp;iq80332_timer,</div><div class='ctx'> 	.init_machine	= iq80332_init_machine,</div><div class='add'>+	.restart	= iop3xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c<br/>index 24f0fe35f4ad..81c45370a4e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp2000/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp2000/core.c</a></div><div class='hunk'>@@ -515,3 +515,7 @@ void __init ixp2000_init_irq(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ixp2000_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	ixp2000_reg_wrb(IXP2000_RESET0, RSTALL);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c<br/>index af9994537e01..e872d238cd0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/enp2611.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp2000/enp2611.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/enp2611.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp2000/enp2611.c</a></div><div class='hunk'>@@ -145,7 +145,8 @@ static struct pci_ops enp2611_pci_ops = {</div><div class='ctx'> static struct pci_bus * __init enp2611_pci_scan_bus(int nr,</div><div class='ctx'> 						struct pci_sys_data *sys)</div><div class='ctx'> {</div><div class='del'>-	return pci_scan_bus(sys-&gt;busnr, &amp;enp2611_pci_ops, sys);</div><div class='add'>+	return pci_scan_root_bus(NULL, sys-&gt;busnr, &amp;enp2611_pci_ops, sys,</div><div class='add'>+				 &amp;sys-&gt;resources);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init enp2611_pci_map_irq(const struct pci_dev *dev, u8 slot,</div><div class='hunk'>@@ -259,6 +260,7 @@ MACHINE_START(ENP2611, "Radisys ENP-2611 PCI network processor board")</div><div class='ctx'> 	.init_irq	= ixp2000_init_irq,</div><div class='ctx'> 	.timer		= &amp;enp2611_timer,</div><div class='ctx'> 	.init_machine	= enp2611_init_machine,</div><div class='add'>+	.restart	= ixp2000_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp2000/include/mach/platform.h b/arch/arm/mach-ixp2000/include/mach/platform.h<br/>index 42182c79ed90..bb0f8dcf9ee1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/platform.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp2000/include/mach/platform.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/platform.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp2000/include/mach/platform.h</a></div><div class='hunk'>@@ -122,6 +122,7 @@ void ixp2000_map_io(void);</div><div class='ctx'> void ixp2000_uart_init(void);</div><div class='ctx'> void ixp2000_init_irq(void);</div><div class='ctx'> void ixp2000_init_time(unsigned long);</div><div class='add'>+void ixp2000_restart(char, const char *);</div><div class='ctx'> unsigned long ixp2000_gettimeoffset(void);</div><div class='ctx'> </div><div class='ctx'> struct pci_sys_data;</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/include/mach/system.h b/arch/arm/mach-ixp2000/include/mach/system.h<br/>index de370992c848..a7fb08b2b8e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp2000/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp2000/include/mach/system.h</a></div><div class='hunk'>@@ -8,42 +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'>-</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	local_irq_disable();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Reset flash banking register so that we are pointing at</div><div class='del'>-	 * RedBoot bank.</div><div class='del'>-	 */</div><div class='del'>-	if (machine_is_ixdp2401()) {</div><div class='del'>-		ixp2000_reg_write(IXDP2X01_CPLD_FLASH_REG,</div><div class='del'>-					((0 &gt;&gt; IXDP2X01_FLASH_WINDOW_BITS)</div><div class='del'>-						| IXDP2X01_CPLD_FLASH_INTERN));</div><div class='del'>-		ixp2000_reg_wrb(IXDP2X01_CPLD_RESET_REG, 0xffffffff);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * On IXDP2801 we need to write this magic sequence to the CPLD</div><div class='del'>-	 * to cause a complete reset of the CPU and all external devices</div><div class='del'>-	 * and move the flash bank register back to 0.</div><div class='del'>-	 */</div><div class='del'>-	if (machine_is_ixdp2801() || machine_is_ixdp28x5()) {</div><div class='del'>-		unsigned long reset_reg = *IXDP2X01_CPLD_RESET_REG;</div><div class='del'>-</div><div class='del'>-		reset_reg = 0x55AA0000 | (reset_reg &amp; 0x0000FFFF);</div><div class='del'>-		ixp2000_reg_write(IXDP2X01_CPLD_RESET_REG, reset_reg);</div><div class='del'>-		ixp2000_reg_wrb(IXDP2X01_CPLD_RESET_REG, 0x80000000);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ixp2000_reg_wrb(IXP2000_RESET0, RSTALL);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/include/mach/vmalloc.h b/arch/arm/mach-ixp2000/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 61c8dae24f95..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp2000/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-ixp2000/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * Author: Naeem Afzal &lt;naeem.m.afzal@intel.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2002 Intel Corp.</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'>- * Just any arbitrary offset to the start of the vmalloc VM area: the</div><div class='del'>- * current 8MB value just means that there will be a 8MB "hole" after the</div><div class='del'>- * physical memory until the kernel virtual memory starts.  That means that</div><div class='del'>- * any out-of-bounds memory accesses will hopefully be caught.</div><div class='del'>- * The vmalloc() routines leaves a hole of 4kB between each vmalloced</div><div class='del'>- * area for the same reason. ;)</div><div class='del'>- */</div><div class='del'>-#define VMALLOC_END	    0xfb000000UL</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c<br/>index f7dfd9700141..f53e911ec94a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2400.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp2000/ixdp2400.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2400.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp2000/ixdp2400.c</a></div><div class='hunk'>@@ -176,5 +176,6 @@ MACHINE_START(IXDP2400, "Intel IXDP2400 Development Platform")</div><div class='ctx'> 	.init_irq	= ixdp2400_init_irq,</div><div class='ctx'> 	.timer		= &amp;ixdp2400_timer,</div><div class='ctx'> 	.init_machine	= ixdp2x00_init_machine,</div><div class='add'>+	.restart	= ixp2000_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c<br/>index d33bcac1ec92..a2e7c393e74f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2800.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp2000/ixdp2800.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2800.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp2000/ixdp2800.c</a></div><div class='hunk'>@@ -291,5 +291,6 @@ MACHINE_START(IXDP2800, "Intel IXDP2800 Development Platform")</div><div class='ctx'> 	.init_irq	= ixdp2800_init_irq,</div><div class='ctx'> 	.timer		= &amp;ixdp2800_timer,</div><div class='ctx'> 	.init_machine	= ixdp2x00_init_machine,</div><div class='add'>+	.restart	= ixp2000_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c<br/>index 61a28676b5be..7632beadabf6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2x01.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp2000/ixdp2x01.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2x01.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp2000/ixdp2x01.c</a></div><div class='hunk'>@@ -413,6 +413,35 @@ static void __init ixdp2x01_init_machine(void)</div><div class='ctx'> 	ixdp2x01_uart_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ixdp2401_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Reset flash banking register so that we are pointing at</div><div class='add'>+	 * RedBoot bank.</div><div class='add'>+	 */</div><div class='add'>+	ixp2000_reg_write(IXDP2X01_CPLD_FLASH_REG,</div><div class='add'>+				((0 &gt;&gt; IXDP2X01_FLASH_WINDOW_BITS)</div><div class='add'>+					| IXDP2X01_CPLD_FLASH_INTERN));</div><div class='add'>+	ixp2000_reg_wrb(IXDP2X01_CPLD_RESET_REG, 0xffffffff);</div><div class='add'>+</div><div class='add'>+	ixp2000_restart(mode, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ixdp280x_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * On IXDP2801 we need to write this magic sequence to the CPLD</div><div class='add'>+	 * to cause a complete reset of the CPU and all external devices</div><div class='add'>+	 * and move the flash bank register back to 0.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long reset_reg = *IXDP2X01_CPLD_RESET_REG;</div><div class='add'>+</div><div class='add'>+	reset_reg = 0x55AA0000 | (reset_reg &amp; 0x0000FFFF);</div><div class='add'>+	ixp2000_reg_write(IXDP2X01_CPLD_RESET_REG, reset_reg);</div><div class='add'>+	ixp2000_reg_wrb(IXDP2X01_CPLD_RESET_REG, 0x80000000);</div><div class='add'>+</div><div class='add'>+	ixp2000_restart(mode, cmd);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_IXDP2401</div><div class='ctx'> MACHINE_START(IXDP2401, "Intel IXDP2401 Development Platform")</div><div class='hunk'>@@ -422,6 +451,7 @@ MACHINE_START(IXDP2401, "Intel IXDP2401 Development Platform")</div><div class='ctx'> 	.init_irq	= ixdp2x01_init_irq,</div><div class='ctx'> 	.timer		= &amp;ixdp2x01_timer,</div><div class='ctx'> 	.init_machine	= ixdp2x01_init_machine,</div><div class='add'>+	.restart	= ixdp2401_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -433,6 +463,7 @@ MACHINE_START(IXDP2801, "Intel IXDP2801 Development Platform")</div><div class='ctx'> 	.init_irq	= ixdp2x01_init_irq,</div><div class='ctx'> 	.timer		= &amp;ixdp2x01_timer,</div><div class='ctx'> 	.init_machine	= ixdp2x01_init_machine,</div><div class='add'>+	.restart	= ixdp280x_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -446,6 +477,7 @@ MACHINE_START(IXDP28X5, "Intel IXDP2805/2855 Development Platform")</div><div class='ctx'> 	.init_irq	= ixdp2x01_init_irq,</div><div class='ctx'> 	.timer		= &amp;ixdp2x01_timer,</div><div class='ctx'> 	.init_machine	= ixdp2x01_init_machine,</div><div class='add'>+	.restart	= ixdp280x_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp2000/pci.c b/arch/arm/mach-ixp2000/pci.c<br/>index f5098b306fd3..626fda435aa9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp2000/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp2000/pci.c</a></div><div class='hunk'>@@ -132,7 +132,8 @@ static struct pci_ops ixp2000_pci_ops = {</div><div class='ctx'> </div><div class='ctx'> struct pci_bus *ixp2000_pci_scan_bus(int nr, struct pci_sys_data *sysdata)</div><div class='ctx'> {</div><div class='del'>-	return pci_scan_bus(sysdata-&gt;busnr, &amp;ixp2000_pci_ops, sysdata);</div><div class='add'>+	return pci_scan_root_bus(NULL, sysdata-&gt;busnr, &amp;ixp2000_pci_ops,</div><div class='add'>+				 sysdata, &amp;sysdata-&gt;resources);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -242,9 +243,8 @@ int ixp2000_pci_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	if (nr &gt;= 1)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	sys-&gt;resource[0] = &amp;ixp2000_pci_io_space;</div><div class='del'>-	sys-&gt;resource[1] = &amp;ixp2000_pci_mem_space;</div><div class='del'>-	sys-&gt;resource[2] = NULL;</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;ixp2000_pci_io_space);</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;ixp2000_pci_mem_space);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c<br/>index a1bee33d183e..0923bb905cc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp23xx/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp23xx/core.c</a></div><div class='hunk'>@@ -444,3 +444,9 @@ void __init ixp23xx_sys_init(void)</div><div class='ctx'> 	*IXP23XX_EXP_UNIT_FUSE |= 0xf;</div><div class='ctx'> 	platform_add_devices(ixp23xx_devices, ARRAY_SIZE(ixp23xx_devices));</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void ixp23xx_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	/* Use on-chip reset capability */</div><div class='add'>+	*IXP23XX_RESET0 |= IXP23XX_RST_ALL;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/espresso.c b/arch/arm/mach-ixp23xx/espresso.c<br/>index 30dd31652e9d..8f2487e1fc4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/espresso.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp23xx/espresso.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/espresso.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp23xx/espresso.c</a></div><div class='hunk'>@@ -90,4 +90,5 @@ MACHINE_START(ESPRESSO, "IP Fabrics Double Espresso")</div><div class='ctx'> 	.timer		= &amp;ixp23xx_timer,</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_machine	= espresso_init,</div><div class='add'>+	.restart	= ixp23xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/include/mach/io.h b/arch/arm/mach-ixp23xx/include/mach/io.h<br/>index a1749d0fd896..4ce4353b9f72 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp23xx/include/mach/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp23xx/include/mach/io.h</a></div><div class='hunk'>@@ -20,33 +20,4 @@</div><div class='ctx'> #define __io(p)		((void __iomem*)((p) + IXP23XX_PCI_IO_VIRT))</div><div class='ctx'> #define __mem_pci(a)	(a)</div><div class='ctx'> </div><div class='del'>-static inline void __iomem *</div><div class='del'>-ixp23xx_ioremap(unsigned long addr, unsigned long size, unsigned int mtype)</div><div class='del'>-{</div><div class='del'>-	if (addr &gt;= IXP23XX_PCI_MEM_START &amp;&amp;</div><div class='del'>-		addr &lt;= IXP23XX_PCI_MEM_START + IXP23XX_PCI_MEM_SIZE) {</div><div class='del'>-		if (addr + size &gt; IXP23XX_PCI_MEM_START + IXP23XX_PCI_MEM_SIZE)</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		return (void __iomem *)</div><div class='del'>- 			((addr - IXP23XX_PCI_MEM_START) + IXP23XX_PCI_MEM_VIRT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return __arm_ioremap(addr, size, mtype);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-ixp23xx_iounmap(void __iomem *addr)</div><div class='del'>-{</div><div class='del'>-	if ((((u32)addr) &gt;= IXP23XX_PCI_MEM_VIRT) &amp;&amp;</div><div class='del'>-	    (((u32)addr) &lt; IXP23XX_PCI_MEM_VIRT + IXP23XX_PCI_MEM_SIZE))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	__iounmap(addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define __arch_ioremap	ixp23xx_ioremap</div><div class='del'>-#define __arch_iounmap	ixp23xx_iounmap</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/include/mach/platform.h b/arch/arm/mach-ixp23xx/include/mach/platform.h<br/>index db9d9416e5e4..50de558e722e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/platform.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp23xx/include/mach/platform.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/platform.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp23xx/include/mach/platform.h</a></div><div class='hunk'>@@ -34,6 +34,7 @@ struct pci_sys_data;</div><div class='ctx'> void ixp23xx_map_io(void);</div><div class='ctx'> void ixp23xx_init_irq(void);</div><div class='ctx'> void ixp23xx_sys_init(void);</div><div class='add'>+void ixp23xx_restart(char, const char *);</div><div class='ctx'> int ixp23xx_pci_setup(int, struct pci_sys_data *);</div><div class='ctx'> void ixp23xx_pci_preinit(void);</div><div class='ctx'> struct pci_bus *ixp23xx_pci_scan_bus(int, struct pci_sys_data*);</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/include/mach/system.h b/arch/arm/mach-ixp23xx/include/mach/system.h<br/>index 8920ff2dff1f..277dda7334b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp23xx/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp23xx/include/mach/system.h</a></div><div class='hunk'>@@ -7,10 +7,6 @@</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'>-</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> #if 0</div><div class='hunk'>@@ -18,16 +14,3 @@ static inline void arch_idle(void)</div><div class='ctx'> 		cpu_do_idle();</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	/* First try machine specific support */</div><div class='del'>-	if (machine_is_ixdp2351()) {</div><div class='del'>-		*IXDP2351_CPLD_RESET1_REG = IXDP2351_CPLD_RESET1_MAGIC;</div><div class='del'>-		(void) *IXDP2351_CPLD_RESET1_REG;</div><div class='del'>-		*IXDP2351_CPLD_RESET1_REG = IXDP2351_CPLD_RESET1_ENABLE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Use on-chip reset capability */</div><div class='del'>-	*IXP23XX_RESET0 |= IXP23XX_RST_ALL;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/include/mach/vmalloc.h b/arch/arm/mach-ixp23xx/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 896c56a1c00e..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp23xx/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-ixp23xx/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2005 MontaVista Software, Inc.</div><div class='del'>- *</div><div class='del'>- * NPU mappings end at 0xf0000000 and we allocate 64MB for board</div><div class='del'>- * specific static I/O.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END	(0xec000000UL)</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/ixdp2351.c b/arch/arm/mach-ixp23xx/ixdp2351.c<br/>index b3a57e0f3419..5d5dd3e8d069 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/ixdp2351.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp23xx/ixdp2351.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/ixdp2351.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp23xx/ixdp2351.c</a></div><div class='hunk'>@@ -326,6 +326,17 @@ static void __init ixdp2351_init(void)</div><div class='ctx'> 	ixp23xx_sys_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ixdp2351_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	/* First try machine specific support */</div><div class='add'>+</div><div class='add'>+	*IXDP2351_CPLD_RESET1_REG = IXDP2351_CPLD_RESET1_MAGIC;</div><div class='add'>+	(void) *IXDP2351_CPLD_RESET1_REG;</div><div class='add'>+	*IXDP2351_CPLD_RESET1_REG = IXDP2351_CPLD_RESET1_ENABLE;</div><div class='add'>+</div><div class='add'>+	ixp23xx_restart(mode, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> MACHINE_START(IXDP2351, "Intel IXDP2351 Development Platform")</div><div class='ctx'> 	/* Maintainer: MontaVista Software, Inc. */</div><div class='ctx'> 	.map_io		= ixdp2351_map_io,</div><div class='hunk'>@@ -333,4 +344,5 @@ MACHINE_START(IXDP2351, "Intel IXDP2351 Development Platform")</div><div class='ctx'> 	.timer		= &amp;ixp23xx_timer,</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_machine	= ixdp2351_init,</div><div class='add'>+	.restart	= ixdp2351_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/pci.c b/arch/arm/mach-ixp23xx/pci.c<br/>index e6be5711c700..25b5c462cea2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp23xx/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp23xx/pci.c</a></div><div class='hunk'>@@ -143,7 +143,8 @@ struct pci_ops ixp23xx_pci_ops = {</div><div class='ctx'> </div><div class='ctx'> struct pci_bus *ixp23xx_pci_scan_bus(int nr, struct pci_sys_data *sysdata)</div><div class='ctx'> {</div><div class='del'>-	return pci_scan_bus(sysdata-&gt;busnr, &amp;ixp23xx_pci_ops, sysdata);</div><div class='add'>+	return pci_scan_root_bus(NULL, sysdata-&gt;busnr, &amp;ixp23xx_pci_ops,</div><div class='add'>+				 sysdata, &amp;sysdata-&gt;resources);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ixp23xx_pci_abort_handler(unsigned long addr, unsigned int fsr, struct pt_regs *regs)</div><div class='hunk'>@@ -280,9 +281,8 @@ int ixp23xx_pci_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	if (nr &gt;= 1)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	sys-&gt;resource[0] = &amp;ixp23xx_pci_io_space;</div><div class='del'>-	sys-&gt;resource[1] = &amp;ixp23xx_pci_mem_space;</div><div class='del'>-	sys-&gt;resource[2] = NULL;</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;ixp23xx_pci_io_space);</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;ixp23xx_pci_mem_space);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/roadrunner.c b/arch/arm/mach-ixp23xx/roadrunner.c<br/>index 8f4dcbba9025..377283fc658c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/roadrunner.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp23xx/roadrunner.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/roadrunner.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp23xx/roadrunner.c</a></div><div class='hunk'>@@ -177,4 +177,5 @@ MACHINE_START(ROADRUNNER, "ADI Engineering RoadRunner Development Platform")</div><div class='ctx'> 	.timer		= &amp;ixp23xx_timer,</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_machine	= roadrunner_init,</div><div class='add'>+	.restart	= ixp23xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/avila-setup.c b/arch/arm/mach-ixp4xx/avila-setup.c<br/>index 37609a22c450..a7277ad470a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/avila-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/avila-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/avila-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp4xx/avila-setup.c</a></div><div class='hunk'>@@ -172,6 +172,7 @@ MACHINE_START(AVILA, "Gateworks Avila Network Platform")</div><div class='ctx'> #if defined(CONFIG_PCI)</div><div class='ctx'> 	.dma_zone_size	= SZ_64M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= ixp4xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'>  /*</div><div class='hunk'>@@ -190,6 +191,7 @@ MACHINE_START(LOFT, "Giant Shoulder Inc Loft board")</div><div class='ctx'> #if defined(CONFIG_PCI)</div><div class='ctx'> 	.dma_zone_size	= SZ_64M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= ixp4xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c<br/>index 8325058ef871..5eff15f24bc2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/common-pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/common-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/common-pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp4xx/common-pci.c</a></div><div class='hunk'>@@ -472,9 +472,8 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	request_resource(&amp;ioport_resource, &amp;res[0]);</div><div class='ctx'> 	request_resource(&amp;iomem_resource, &amp;res[1]);</div><div class='ctx'> </div><div class='del'>-	sys-&gt;resource[0] = &amp;res[0];</div><div class='del'>-	sys-&gt;resource[1] = &amp;res[1];</div><div class='del'>-	sys-&gt;resource[2] = NULL;</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;res[0]);</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;res[1]);</div><div class='ctx'> </div><div class='ctx'> 	platform_notify = ixp4xx_pci_platform_notify;</div><div class='ctx'> 	platform_notify_remove = ixp4xx_pci_platform_notify_remove;</div><div class='hunk'>@@ -484,7 +483,8 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> </div><div class='ctx'> struct pci_bus * __devinit ixp4xx_scan_bus(int nr, struct pci_sys_data *sys)</div><div class='ctx'> {</div><div class='del'>-	return pci_scan_bus(sys-&gt;busnr, &amp;ixp4xx_ops, sys);</div><div class='add'>+	return pci_scan_root_bus(NULL, sys-&gt;busnr, &amp;ixp4xx_ops, sys,</div><div class='add'>+				 &amp;sys-&gt;resources);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int dma_set_coherent_mask(struct device *dev, u64 mask)</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c<br/>index b86a0055ab96..3841ab4146ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp4xx/common.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='hunk'>@@ -403,18 +402,9 @@ void __init ixp4xx_sys_init(void)</div><div class='ctx'> /*</div><div class='ctx'>  * sched_clock()</div><div class='ctx'>  */</div><div class='del'>-static DEFINE_CLOCK_DATA(cd);</div><div class='del'>-</div><div class='del'>-unsigned long long notrace sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	u32 cyc = *IXP4XX_OSTS;</div><div class='del'>-	return cyc_to_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void notrace ixp4xx_update_sched_clock(void)</div><div class='add'>+static u32 notrace ixp4xx_read_sched_clock(void)</div><div class='ctx'> {</div><div class='del'>-	u32 cyc = *IXP4XX_OSTS;</div><div class='del'>-	update_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='add'>+	return *IXP4XX_OSTS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -430,7 +420,7 @@ unsigned long ixp4xx_timer_freq = IXP4XX_TIMER_FREQ;</div><div class='ctx'> EXPORT_SYMBOL(ixp4xx_timer_freq);</div><div class='ctx'> static void __init ixp4xx_clocksource_init(void)</div><div class='ctx'> {</div><div class='del'>-	init_sched_clock(&amp;cd, ixp4xx_update_sched_clock, 32, ixp4xx_timer_freq);</div><div class='add'>+	setup_sched_clock(ixp4xx_read_sched_clock, 32, ixp4xx_timer_freq);</div><div class='ctx'> </div><div class='ctx'> 	clocksource_mmio_init(NULL, "OSTS", ixp4xx_timer_freq, 200, 32,</div><div class='ctx'> 			ixp4xx_clocksource_read);</div><div class='hunk'>@@ -501,3 +491,23 @@ static void __init ixp4xx_clockevent_init(void)</div><div class='ctx'> </div><div class='ctx'> 	clockevents_register_device(&amp;clockevent_ixp4xx);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void ixp4xx_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	if ( 1 &amp;&amp; mode == 's') {</div><div class='add'>+		/* Jump into ROM at address 0 */</div><div class='add'>+		soft_restart(0);</div><div class='add'>+	} else {</div><div class='add'>+		/* Use on-chip reset capability */</div><div class='add'>+</div><div class='add'>+		/* set the "key" register to enable access to</div><div class='add'>+		 * "timer" and "enable" registers</div><div class='add'>+		 */</div><div class='add'>+		*IXP4XX_OSWK = IXP4XX_WDT_KEY;</div><div class='add'>+</div><div class='add'>+		/* write 0 to the timer register for an immediate reset */</div><div class='add'>+		*IXP4XX_OSWT = 0;</div><div class='add'>+</div><div class='add'>+		*IXP4XX_OSWE = IXP4XX_WDT_RESET_ENABLE | IXP4XX_WDT_COUNT_ENABLE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c<br/>index 81dfec31842b..a74f86ce8bcc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/coyote-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/coyote-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/coyote-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp4xx/coyote-setup.c</a></div><div class='hunk'>@@ -117,6 +117,7 @@ MACHINE_START(ADI_COYOTE, "ADI Engineering Coyote")</div><div class='ctx'> #if defined(CONFIG_PCI)</div><div class='ctx'> 	.dma_zone_size	= SZ_64M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= ixp4xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -132,6 +133,7 @@ MACHINE_START(IXDPG425, "Intel IXDPG425")</div><div class='ctx'> 	.timer		= &amp;ixp4xx_timer,</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_machine	= coyote_init,</div><div class='add'>+	.restart	= ixp4xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c<br/>index 8837fbca27ce..67be177b336a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/dsmg600-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/dsmg600-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/dsmg600-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp4xx/dsmg600-setup.c</a></div><div class='hunk'>@@ -286,4 +286,5 @@ MACHINE_START(DSMG600, "D-Link DSM-G600 RevA")</div><div class='ctx'> #if defined(CONFIG_PCI)</div><div class='ctx'> 	.dma_zone_size	= SZ_64M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= ixp4xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c<br/>index 2887c3578c17..6d5818285af8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/fsg-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/fsg-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/fsg-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp4xx/fsg-setup.c</a></div><div class='hunk'>@@ -277,5 +277,6 @@ MACHINE_START(FSG, "Freecom FSG-3")</div><div class='ctx'> #if defined(CONFIG_PCI)</div><div class='ctx'> 	.dma_zone_size	= SZ_64M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= ixp4xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/gateway7001-setup.c b/arch/arm/mach-ixp4xx/gateway7001-setup.c<br/>index d69d1b053bb7..7ecf9b28f1c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/gateway7001-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/gateway7001-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/gateway7001-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp4xx/gateway7001-setup.c</a></div><div class='hunk'>@@ -104,5 +104,6 @@ MACHINE_START(GATEWAY7001, "Gateway 7001 AP")</div><div class='ctx'> #if defined(CONFIG_PCI)</div><div class='ctx'> 	.dma_zone_size	= SZ_64M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= ixp4xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/goramo_mlr.c b/arch/arm/mach-ixp4xx/goramo_mlr.c<br/>index bf6678d1a929..c0e3d69a8aec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/goramo_mlr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/goramo_mlr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/goramo_mlr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp4xx/goramo_mlr.c</a></div><div class='hunk'>@@ -504,4 +504,5 @@ MACHINE_START(GORAMO_MLR, "MultiLink")</div><div class='ctx'> #if defined(CONFIG_PCI)</div><div class='ctx'> 	.dma_zone_size	= SZ_64M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= ixp4xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/gtwx5715-setup.c b/arch/arm/mach-ixp4xx/gtwx5715-setup.c<br/>index aa029fc19140..a23f89391458 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/gtwx5715-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/gtwx5715-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/gtwx5715-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp4xx/gtwx5715-setup.c</a></div><div class='hunk'>@@ -172,6 +172,7 @@ MACHINE_START(GTWX5715, "Gemtek GTWX5715 (Linksys WRV54G)")</div><div class='ctx'> #if defined(CONFIG_PCI)</div><div class='ctx'> 	.dma_zone_size	= SZ_64M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= ixp4xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/include/mach/platform.h b/arch/arm/mach-ixp4xx/include/mach/platform.h<br/>index e824c02c825a..df9250bbf13d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/platform.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/include/mach/platform.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/platform.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp4xx/include/mach/platform.h</a></div><div class='hunk'>@@ -125,6 +125,7 @@ extern void ixp4xx_init_irq(void);</div><div class='ctx'> extern void ixp4xx_sys_init(void);</div><div class='ctx'> extern void ixp4xx_timer_init(void);</div><div class='ctx'> extern struct sys_timer ixp4xx_timer;</div><div class='add'>+extern void ixp4xx_restart(char, const char *);</div><div class='ctx'> extern void ixp4xx_pci_preinit(void);</div><div class='ctx'> struct pci_sys_data;</div><div class='ctx'> extern int ixp4xx_setup(int nr, struct pci_sys_data *sys);</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/include/mach/system.h b/arch/arm/mach-ixp4xx/include/mach/system.h<br/>index 54c0af7fa2d4..140a9bef4466 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp4xx/include/mach/system.h</a></div><div class='hunk'>@@ -8,9 +8,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* ixp4xx does not implement the XScale PWRMODE register,</div><div class='hunk'>@@ -20,25 +17,3 @@ static inline void arch_idle(void)</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	if ( 1 &amp;&amp; mode == 's') {</div><div class='del'>-		/* Jump into ROM at address 0 */</div><div class='del'>-		cpu_reset(0);</div><div class='del'>-	} else {</div><div class='del'>-		/* Use on-chip reset capability */</div><div class='del'>-</div><div class='del'>-		/* set the "key" register to enable access to</div><div class='del'>-		 * "timer" and "enable" registers</div><div class='del'>-		 */</div><div class='del'>-		*IXP4XX_OSWK = IXP4XX_WDT_KEY;</div><div class='del'>-</div><div class='del'>-		/* write 0 to the timer register for an immediate reset */</div><div class='del'>-		*IXP4XX_OSWT = 0;</div><div class='del'>-</div><div class='del'>-		*IXP4XX_OSWE = IXP4XX_WDT_RESET_ENABLE | IXP4XX_WDT_COUNT_ENABLE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/include/mach/vmalloc.h b/arch/arm/mach-ixp4xx/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 9bcd64d59854..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-ixp4xx/include/mach/vmalloc.h</div><div class='del'>- */</div><div class='del'>-#define VMALLOC_END       (0xff000000UL)</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c<br/>index f235f829dfa6..8a38b39999f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/ixdp425-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/ixdp425-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/ixdp425-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp4xx/ixdp425-setup.c</a></div><div class='hunk'>@@ -261,6 +261,7 @@ MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")</div><div class='ctx'> #if defined(CONFIG_PCI)</div><div class='ctx'> 	.dma_zone_size	= SZ_64M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= ixp4xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c<br/>index de716fa1aab6..1010eb7b0083 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/nas100d-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/nas100d-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/nas100d-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp4xx/nas100d-setup.c</a></div><div class='hunk'>@@ -321,4 +321,5 @@ MACHINE_START(NAS100D, "Iomega NAS 100d")</div><div class='ctx'> #if defined(CONFIG_PCI)</div><div class='ctx'> 	.dma_zone_size	= SZ_64M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= ixp4xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c<br/>index ac81ccb26bfe..aa355c360d57 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/nslu2-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/nslu2-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/nslu2-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp4xx/nslu2-setup.c</a></div><div class='hunk'>@@ -307,4 +307,5 @@ MACHINE_START(NSLU2, "Linksys NSLU2")</div><div class='ctx'> #if defined(CONFIG_PCI)</div><div class='ctx'> 	.dma_zone_size	= SZ_64M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= ixp4xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/omixp-setup.c b/arch/arm/mach-ixp4xx/omixp-setup.c<br/>index 3b6a81a696fc..0940869fcfdd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/omixp-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/omixp-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/omixp-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp4xx/omixp-setup.c</a></div><div class='hunk'>@@ -246,6 +246,7 @@ MACHINE_START(DEVIXP, "Omicron DEVIXP")</div><div class='ctx'> 	.init_irq	= ixp4xx_init_irq,</div><div class='ctx'> 	.timer          = &amp;ixp4xx_timer,</div><div class='ctx'> 	.init_machine	= omixp_init,</div><div class='add'>+	.restart	= ixp4xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -259,6 +260,7 @@ MACHINE_START(MICCPT, "Omicron MICCPT")</div><div class='ctx'> #if defined(CONFIG_PCI)</div><div class='ctx'> 	.dma_zone_size	= SZ_64M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= ixp4xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -269,5 +271,6 @@ MACHINE_START(MIC256, "Omicron MIC256")</div><div class='ctx'> 	.init_irq	= ixp4xx_init_irq,</div><div class='ctx'> 	.timer          = &amp;ixp4xx_timer,</div><div class='ctx'> 	.init_machine	= omixp_init,</div><div class='add'>+	.restart	= ixp4xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/vulcan-setup.c b/arch/arm/mach-ixp4xx/vulcan-setup.c<br/>index 27e469ef4523..9dec20683291 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/vulcan-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/vulcan-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/vulcan-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp4xx/vulcan-setup.c</a></div><div class='hunk'>@@ -244,4 +244,5 @@ MACHINE_START(ARCOM_VULCAN, "Arcom/Eurotech Vulcan")</div><div class='ctx'> #if defined(CONFIG_PCI)</div><div class='ctx'> 	.dma_zone_size	= SZ_64M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= ixp4xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/wg302v2-setup.c b/arch/arm/mach-ixp4xx/wg302v2-setup.c<br/>index b14144b967a7..5ac0f0a0fd8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/wg302v2-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ixp4xx/wg302v2-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/wg302v2-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ixp4xx/wg302v2-setup.c</a></div><div class='hunk'>@@ -105,5 +105,6 @@ MACHINE_START(WG302V2, "Netgear WG302 v2 / WAG302 v2")</div><div class='ctx'> #if defined(CONFIG_PCI)</div><div class='ctx'> 	.dma_zone_size	= SZ_64M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= ixp4xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/addr-map.c b/arch/arm/mach-kirkwood/addr-map.c<br/>index 8d03bcef5182..e9a7180863d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/addr-map.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/addr-map.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/addr-map.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/addr-map.c</a></div><div class='hunk'>@@ -13,12 +13,12 @@</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;plat/addr-map.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Generic Address Decode Windows bit settings</div><div class='ctx'>  */</div><div class='del'>-#define TARGET_DDR		0</div><div class='ctx'> #define TARGET_DEV_BUS		1</div><div class='ctx'> #define TARGET_SRAM		3</div><div class='ctx'> #define TARGET_PCIE		4</div><div class='hunk'>@@ -36,118 +36,55 @@</div><div class='ctx'> #define ATTR_SRAM		0x01</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Helpers to get DDR bank info</div><div class='add'>+ * Description of the windows needed by the platform code</div><div class='ctx'>  */</div><div class='del'>-#define DDR_BASE_CS_OFF(n)	(0x0000 + ((n) &lt;&lt; 3))</div><div class='del'>-#define DDR_SIZE_CS_OFF(n)	(0x0004 + ((n) &lt;&lt; 3))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CPU Address Decode Windows registers</div><div class='del'>- */</div><div class='del'>-#define WIN_OFF(n)		(BRIDGE_VIRT_BASE + 0x0000 + ((n) &lt;&lt; 4))</div><div class='del'>-#define WIN_CTRL_OFF		0x0000</div><div class='del'>-#define WIN_BASE_OFF		0x0004</div><div class='del'>-#define WIN_REMAP_LO_OFF	0x0008</div><div class='del'>-#define WIN_REMAP_HI_OFF	0x000c</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct mbus_dram_target_info kirkwood_mbus_dram_info;</div><div class='del'>-</div><div class='del'>-static int __init cpu_win_can_remap(int win)</div><div class='del'>-{</div><div class='del'>-	if (win &lt; 4)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init setup_cpu_win(int win, u32 base, u32 size,</div><div class='del'>-				 u8 target, u8 attr, int remap)</div><div class='del'>-{</div><div class='del'>-	void __iomem *addr = (void __iomem *)WIN_OFF(win);</div><div class='del'>-	u32 ctrl;</div><div class='del'>-</div><div class='del'>-	base &amp;= 0xffff0000;</div><div class='del'>-	ctrl = ((size - 1) &amp; 0xffff0000) | (attr &lt;&lt; 8) | (target &lt;&lt; 4) | 1;</div><div class='del'>-</div><div class='del'>-	writel(base, addr + WIN_BASE_OFF);</div><div class='del'>-	writel(ctrl, addr + WIN_CTRL_OFF);</div><div class='del'>-	if (cpu_win_can_remap(win)) {</div><div class='del'>-		if (remap &lt; 0)</div><div class='del'>-			remap = base;</div><div class='del'>-</div><div class='del'>-		writel(remap &amp; 0xffff0000, addr + WIN_REMAP_LO_OFF);</div><div class='del'>-		writel(0, addr + WIN_REMAP_HI_OFF);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init kirkwood_setup_cpu_mbus(void)</div><div class='del'>-{</div><div class='del'>-	void __iomem *addr;</div><div class='del'>-	int i;</div><div class='del'>-	int cs;</div><div class='add'>+static struct __initdata orion_addr_map_cfg addr_map_cfg = {</div><div class='add'>+	.num_wins = 8,</div><div class='add'>+	.remappable_wins = 4,</div><div class='add'>+	.bridge_virt_base = BRIDGE_VIRT_BASE,</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+static const struct __initdata orion_addr_map_info addr_map_info[] = {</div><div class='ctx'> 	/*</div><div class='del'>-	 * First, disable and clear windows.</div><div class='add'>+	 * Windows for PCIe IO+MEM space.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		addr = (void __iomem *)WIN_OFF(i);</div><div class='del'>-</div><div class='del'>-		writel(0, addr + WIN_BASE_OFF);</div><div class='del'>-		writel(0, addr + WIN_CTRL_OFF);</div><div class='del'>-		if (cpu_win_can_remap(i)) {</div><div class='del'>-			writel(0, addr + WIN_REMAP_LO_OFF);</div><div class='del'>-			writel(0, addr + WIN_REMAP_HI_OFF);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	{ 0, KIRKWOOD_PCIE_IO_PHYS_BASE, KIRKWOOD_PCIE_IO_SIZE,</div><div class='add'>+	  TARGET_PCIE, ATTR_PCIE_IO, KIRKWOOD_PCIE_IO_BUS_BASE</div><div class='add'>+	},</div><div class='add'>+	{ 1, KIRKWOOD_PCIE_MEM_PHYS_BASE, KIRKWOOD_PCIE_MEM_SIZE,</div><div class='add'>+	  TARGET_PCIE, ATTR_PCIE_MEM, KIRKWOOD_PCIE_MEM_BUS_BASE</div><div class='add'>+	},</div><div class='add'>+	{ 2, KIRKWOOD_PCIE1_IO_PHYS_BASE, KIRKWOOD_PCIE1_IO_SIZE,</div><div class='add'>+	  TARGET_PCIE, ATTR_PCIE1_IO, KIRKWOOD_PCIE1_IO_BUS_BASE</div><div class='add'>+	},</div><div class='add'>+	{ 3, KIRKWOOD_PCIE1_MEM_PHYS_BASE, KIRKWOOD_PCIE1_MEM_SIZE,</div><div class='add'>+	  TARGET_PCIE, ATTR_PCIE1_MEM, KIRKWOOD_PCIE1_MEM_BUS_BASE</div><div class='add'>+	},</div><div class='ctx'> 	/*</div><div class='del'>-	 * Setup windows for PCIe IO+MEM space.</div><div class='add'>+	 * Window for NAND controller.</div><div class='ctx'> 	 */</div><div class='del'>-	setup_cpu_win(0, KIRKWOOD_PCIE_IO_PHYS_BASE, KIRKWOOD_PCIE_IO_SIZE,</div><div class='del'>-		      TARGET_PCIE, ATTR_PCIE_IO, KIRKWOOD_PCIE_IO_BUS_BASE);</div><div class='del'>-	setup_cpu_win(1, KIRKWOOD_PCIE_MEM_PHYS_BASE, KIRKWOOD_PCIE_MEM_SIZE,</div><div class='del'>-		      TARGET_PCIE, ATTR_PCIE_MEM, KIRKWOOD_PCIE_MEM_BUS_BASE);</div><div class='del'>-	setup_cpu_win(2, KIRKWOOD_PCIE1_IO_PHYS_BASE, KIRKWOOD_PCIE1_IO_SIZE,</div><div class='del'>-		      TARGET_PCIE, ATTR_PCIE1_IO, KIRKWOOD_PCIE1_IO_BUS_BASE);</div><div class='del'>-	setup_cpu_win(3, KIRKWOOD_PCIE1_MEM_PHYS_BASE, KIRKWOOD_PCIE1_MEM_SIZE,</div><div class='del'>-		      TARGET_PCIE, ATTR_PCIE1_MEM, KIRKWOOD_PCIE1_MEM_BUS_BASE);</div><div class='del'>-</div><div class='add'>+	{ 4, KIRKWOOD_NAND_MEM_PHYS_BASE, KIRKWOOD_NAND_MEM_SIZE,</div><div class='add'>+	  TARGET_DEV_BUS, ATTR_DEV_NAND, -1</div><div class='add'>+	},</div><div class='ctx'> 	/*</div><div class='del'>-	 * Setup window for NAND controller.</div><div class='add'>+	 * Window for SRAM.</div><div class='ctx'> 	 */</div><div class='del'>-	setup_cpu_win(4, KIRKWOOD_NAND_MEM_PHYS_BASE, KIRKWOOD_NAND_MEM_SIZE,</div><div class='del'>-		      TARGET_DEV_BUS, ATTR_DEV_NAND, -1);</div><div class='add'>+	{ 5, KIRKWOOD_SRAM_PHYS_BASE, KIRKWOOD_SRAM_SIZE,</div><div class='add'>+	  TARGET_SRAM, ATTR_SRAM, -1</div><div class='add'>+	},</div><div class='add'>+	/* End marker */</div><div class='add'>+	{ -1, 0, 0, 0, 0, 0 }</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+void __init kirkwood_setup_cpu_mbus(void)</div><div class='add'>+{</div><div class='ctx'> 	/*</div><div class='del'>-	 * Setup window for SRAM.</div><div class='add'>+	 * Disable, clear and configure windows.</div><div class='ctx'> 	 */</div><div class='del'>-	setup_cpu_win(5, KIRKWOOD_SRAM_PHYS_BASE, KIRKWOOD_SRAM_SIZE,</div><div class='del'>-		      TARGET_SRAM, ATTR_SRAM, -1);</div><div class='add'>+	orion_config_wins(&amp;addr_map_cfg, addr_map_info);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Setup MBUS dram target info.</div><div class='ctx'> 	 */</div><div class='del'>-	kirkwood_mbus_dram_info.mbus_dram_target_id = TARGET_DDR;</div><div class='del'>-</div><div class='del'>-	addr = (void __iomem *)DDR_WINDOW_CPU_BASE;</div><div class='del'>-</div><div class='del'>-	for (i = 0, cs = 0; i &lt; 4; i++) {</div><div class='del'>-		u32 base = readl(addr + DDR_BASE_CS_OFF(i));</div><div class='del'>-		u32 size = readl(addr + DDR_SIZE_CS_OFF(i));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Chip select enabled?</div><div class='del'>-		 */</div><div class='del'>-		if (size &amp; 1) {</div><div class='del'>-			struct mbus_dram_window *w;</div><div class='del'>-</div><div class='del'>-			w = &amp;kirkwood_mbus_dram_info.cs[cs++];</div><div class='del'>-			w-&gt;cs_index = i;</div><div class='del'>-			w-&gt;mbus_attr = 0xf &amp; ~(1 &lt;&lt; i);</div><div class='del'>-			w-&gt;base = base &amp; 0xffff0000;</div><div class='del'>-			w-&gt;size = (size | 0x0000ffff) + 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	kirkwood_mbus_dram_info.num_cs = cs;</div><div class='add'>+	orion_setup_cpu_mbus_target(&amp;addr_map_cfg, DDR_WINDOW_CPU_BASE);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c<br/>index f3248cfbe51d..cc15426787b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/common.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='del'>-#include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='hunk'>@@ -30,6 +29,7 @@</div><div class='ctx'> #include &lt;plat/orion_nand.h&gt;</div><div class='ctx'> #include &lt;plat/common.h&gt;</div><div class='ctx'> #include &lt;plat/time.h&gt;</div><div class='add'>+#include &lt;plat/addr-map.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='hunk'>@@ -73,8 +73,7 @@ unsigned int kirkwood_clk_ctrl = CGC_DUNIT | CGC_RESERVED;</div><div class='ctx'> void __init kirkwood_ehci_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	kirkwood_clk_ctrl |= CGC_USB0;</div><div class='del'>-	orion_ehci_init(&amp;kirkwood_mbus_dram_info,</div><div class='del'>-			USB_PHYS_BASE, IRQ_KIRKWOOD_USB);</div><div class='add'>+	orion_ehci_init(USB_PHYS_BASE, IRQ_KIRKWOOD_USB);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -85,7 +84,7 @@ void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data)</div><div class='ctx'> {</div><div class='ctx'> 	kirkwood_clk_ctrl |= CGC_GE0;</div><div class='ctx'> </div><div class='del'>-	orion_ge00_init(eth_data, &amp;kirkwood_mbus_dram_info,</div><div class='add'>+	orion_ge00_init(eth_data,</div><div class='ctx'> 			GE00_PHYS_BASE, IRQ_KIRKWOOD_GE00_SUM,</div><div class='ctx'> 			IRQ_KIRKWOOD_GE00_ERR, kirkwood_tclk);</div><div class='ctx'> }</div><div class='hunk'>@@ -99,7 +98,7 @@ void __init kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data)</div><div class='ctx'> </div><div class='ctx'> 	kirkwood_clk_ctrl |= CGC_GE1;</div><div class='ctx'> </div><div class='del'>-	orion_ge01_init(eth_data, &amp;kirkwood_mbus_dram_info,</div><div class='add'>+	orion_ge01_init(eth_data,</div><div class='ctx'> 			GE01_PHYS_BASE, IRQ_KIRKWOOD_GE01_SUM,</div><div class='ctx'> 			IRQ_KIRKWOOD_GE01_ERR, kirkwood_tclk);</div><div class='ctx'> }</div><div class='hunk'>@@ -178,8 +177,7 @@ void __init kirkwood_sata_init(struct mv_sata_platform_data *sata_data)</div><div class='ctx'> 	if (sata_data-&gt;n_ports &gt; 1)</div><div class='ctx'> 		kirkwood_clk_ctrl |= CGC_SATA1;</div><div class='ctx'> </div><div class='del'>-	orion_sata_init(sata_data, &amp;kirkwood_mbus_dram_info,</div><div class='del'>-			SATA_PHYS_BASE, IRQ_KIRKWOOD_SATA);</div><div class='add'>+	orion_sata_init(sata_data, SATA_PHYS_BASE, IRQ_KIRKWOOD_SATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -221,7 +219,6 @@ void __init kirkwood_sdio_init(struct mvsdio_platform_data *mvsdio_data)</div><div class='ctx'> 		mvsdio_data-&gt;clock = 100000000;</div><div class='ctx'> 	else</div><div class='ctx'> 		mvsdio_data-&gt;clock = 200000000;</div><div class='del'>-	mvsdio_data-&gt;dram = &amp;kirkwood_mbus_dram_info;</div><div class='ctx'> 	kirkwood_clk_ctrl |= CGC_SDIO;</div><div class='ctx'> 	kirkwood_sdio.dev.platform_data = mvsdio_data;</div><div class='ctx'> 	platform_device_register(&amp;kirkwood_sdio);</div><div class='hunk'>@@ -285,8 +282,7 @@ static void __init kirkwood_xor0_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	kirkwood_clk_ctrl |= CGC_XOR0;</div><div class='ctx'> </div><div class='del'>-	orion_xor0_init(&amp;kirkwood_mbus_dram_info,</div><div class='del'>-			XOR0_PHYS_BASE, XOR0_HIGH_PHYS_BASE,</div><div class='add'>+	orion_xor0_init(XOR0_PHYS_BASE, XOR0_HIGH_PHYS_BASE,</div><div class='ctx'> 			IRQ_KIRKWOOD_XOR_00, IRQ_KIRKWOOD_XOR_01);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -364,7 +360,6 @@ static struct resource kirkwood_i2s_resources[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct kirkwood_asoc_platform_data kirkwood_i2s_data = {</div><div class='del'>-	.dram        = &amp;kirkwood_mbus_dram_info,</div><div class='ctx'> 	.burst       = 128,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -430,6 +425,8 @@ static char * __init kirkwood_id(void)</div><div class='ctx'> 	} else if (dev == MV88F6282_DEV_ID) {</div><div class='ctx'> 		if (rev == MV88F6282_REV_A0)</div><div class='ctx'> 			return "MV88F6282-Rev-A0";</div><div class='add'>+		else if (rev == MV88F6282_REV_A1)</div><div class='add'>+			return "MV88F6282-Rev-A1";</div><div class='ctx'> 		else</div><div class='ctx'> 			return "MV88F6282-Rev-Unsupported";</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -534,3 +531,19 @@ static int __init kirkwood_clock_gate(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> late_initcall(kirkwood_clock_gate);</div><div class='add'>+</div><div class='add'>+void kirkwood_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Enable soft reset to assert RSTOUTn.</div><div class='add'>+	 */</div><div class='add'>+	writel(SOFT_RESET_OUT_EN, RSTOUTn_MASK);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Assert soft reset.</div><div class='add'>+	 */</div><div class='add'>+	writel(SOFT_RESET, SYSTEM_SOFT_RESET);</div><div class='add'>+</div><div class='add'>+	while (1)</div><div class='add'>+		;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h<br/>index b9b0f0968a36..9071a397136d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/common.h</a></div><div class='hunk'>@@ -30,7 +30,6 @@ void kirkwood_init(void);</div><div class='ctx'> void kirkwood_init_early(void);</div><div class='ctx'> void kirkwood_init_irq(void);</div><div class='ctx'> </div><div class='del'>-extern struct mbus_dram_target_info kirkwood_mbus_dram_info;</div><div class='ctx'> void kirkwood_setup_cpu_mbus(void);</div><div class='ctx'> </div><div class='ctx'> void kirkwood_enable_pcie(void);</div><div class='hunk'>@@ -50,6 +49,7 @@ void kirkwood_uart1_init(void);</div><div class='ctx'> void kirkwood_nand_init(struct mtd_partition *parts, int nr_parts, int delay);</div><div class='ctx'> void kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts, int (*dev_ready)(struct mtd_info *));</div><div class='ctx'> void kirkwood_audio_init(void);</div><div class='add'>+void kirkwood_restart(char, const char *);</div><div class='ctx'> </div><div class='ctx'> extern int kirkwood_tclk;</div><div class='ctx'> extern struct sys_timer kirkwood_timer;</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/d2net_v2-setup.c b/arch/arm/mach-kirkwood/d2net_v2-setup.c<br/>index f457e07a65f0..6e1bac929ab5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/d2net_v2-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/d2net_v2-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/d2net_v2-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/d2net_v2-setup.c</a></div><div class='hunk'>@@ -227,4 +227,5 @@ MACHINE_START(D2NET_V2, "LaCie d2 Network v2")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c<br/>index ff4c21c1f923..d93359379598 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/db88f6281-bp-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/db88f6281-bp-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/db88f6281-bp-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/db88f6281-bp-setup.c</a></div><div class='hunk'>@@ -103,4 +103,5 @@ MACHINE_START(DB88F6281_BP, "Marvell DB-88F6281-BP Development Board")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c<br/>index e4d199b2b1e8..61d9a552a054 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/dockstar-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/dockstar-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/dockstar-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/dockstar-setup.c</a></div><div class='hunk'>@@ -108,4 +108,5 @@ MACHINE_START(DOCKSTAR, "Seagate FreeAgent DockStar")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c<br/>index 6c40f784b516..bdaed3867d13 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/guruplug-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/guruplug-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/guruplug-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/guruplug-setup.c</a></div><div class='hunk'>@@ -127,4 +127,5 @@ MACHINE_START(GURUPLUG, "Marvell GuruPlug Reference Board")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/include/mach/io.h b/arch/arm/mach-kirkwood/include/mach/io.h<br/>index 1aaddc364f2e..49dd0cb5e166 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/include/mach/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/include/mach/io.h</a></div><div class='hunk'>@@ -19,31 +19,6 @@ static inline void __iomem *__io(unsigned long addr)</div><div class='ctx'> 					+ KIRKWOOD_PCIE_IO_VIRT_BASE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __iomem *</div><div class='del'>-__arch_ioremap(unsigned long paddr, size_t size, unsigned int mtype)</div><div class='del'>-{</div><div class='del'>-	void __iomem *retval;</div><div class='del'>-	unsigned long offs = paddr - KIRKWOOD_REGS_PHYS_BASE;</div><div class='del'>-	if (mtype == MT_DEVICE &amp;&amp; size &amp;&amp; offs &lt; KIRKWOOD_REGS_SIZE &amp;&amp;</div><div class='del'>-	    size &lt;= KIRKWOOD_REGS_SIZE &amp;&amp; offs + size &lt;= KIRKWOOD_REGS_SIZE) {</div><div class='del'>-		retval = (void __iomem *)KIRKWOOD_REGS_VIRT_BASE + offs;</div><div class='del'>-	} else {</div><div class='del'>-		retval = __arm_ioremap(paddr, size, mtype);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-__arch_iounmap(void __iomem *addr)</div><div class='del'>-{</div><div class='del'>-	if (addr &lt; (void __iomem *)KIRKWOOD_REGS_VIRT_BASE ||</div><div class='del'>-	    addr &gt;= (void __iomem *)(KIRKWOOD_REGS_VIRT_BASE + KIRKWOOD_REGS_SIZE))</div><div class='del'>-		__iounmap(addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define __arch_ioremap		__arch_ioremap</div><div class='del'>-#define __arch_iounmap		__arch_iounmap</div><div class='ctx'> #define __io(a)			__io(a)</div><div class='ctx'> #define __mem_pci(a)		(a)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h<br/>index 010bdeb4ac5f..fede3d503efa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/kirkwood.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/include/mach/kirkwood.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/kirkwood.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/include/mach/kirkwood.h</a></div><div class='hunk'>@@ -135,4 +135,5 @@</div><div class='ctx'> </div><div class='ctx'> #define MV88F6282_DEV_ID	0x6282</div><div class='ctx'> #define MV88F6282_REV_A0	0</div><div class='add'>+#define MV88F6282_REV_A1	1</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/include/mach/system.h b/arch/arm/mach-kirkwood/include/mach/system.h<br/>index 7568e95d279b..5fddde002b5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/include/mach/system.h</a></div><div class='hunk'>@@ -9,28 +9,9 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/bridge-regs.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Enable soft reset to assert RSTOUTn.</div><div class='del'>-	 */</div><div class='del'>-	writel(SOFT_RESET_OUT_EN, RSTOUTn_MASK);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Assert soft reset.</div><div class='del'>-	 */</div><div class='del'>-	writel(SOFT_RESET, SYSTEM_SOFT_RESET);</div><div class='del'>-</div><div class='del'>-	while (1)</div><div class='del'>-		;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/include/mach/vmalloc.h b/arch/arm/mach-kirkwood/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index bf162ca3d2c1..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-kirkwood/include/mach/vmalloc.h</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END	0xfe800000UL</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c<br/>index cc431fa22ccb..0c6ad63f10c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/mpp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/mpp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/mpp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/mpp.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #include &lt;linux/gpio.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='del'>-#include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;plat/mpp.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h<br/>index ac787957e2d9..e8fda45c0736 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/mpp.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/mpp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/mpp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/mpp.h</a></div><div class='hunk'>@@ -102,6 +102,7 @@</div><div class='ctx'> #define MPP11_SATA0_ACTn	MPP( 11, 0x5, 0, 1, 0,   1,   1,   1,   1 )</div><div class='ctx'> </div><div class='ctx'> #define MPP12_GPO		MPP( 12, 0x0, 0, 1, 1,   1,   1,   1,   1 )</div><div class='add'>+#define MPP12_GPIO		MPP( 12, 0x0, 1, 1, 0,   0,   0,   1,   0 )</div><div class='ctx'> #define MPP12_SD_CLK		MPP( 12, 0x1, 0, 1, 1,   1,   1,   1,   1 )</div><div class='ctx'> #define MPP12_AU_SPDIF0		MPP( 12, 0xa, 0, 1, 0,   0,   0,   0,   1 )</div><div class='ctx'> #define MPP12_SPI_MOSI		MPP( 12, 0xb, 0, 1, 0,   0,   0,   0,   1 )</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c<br/>index 9a1e917352f7..85f6169c2484 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c</a></div><div class='hunk'>@@ -169,4 +169,5 @@ MACHINE_START(MV88F6281GTW_GE, "Marvell 88F6281 GTW GE Board")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/netspace_v2-setup.c<br/>index 8849bcc7328e..e6bba01bae38 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/netspace_v2-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/netspace_v2-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/netspace_v2-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/netspace_v2-setup.c</a></div><div class='hunk'>@@ -264,6 +264,7 @@ MACHINE_START(NETSPACE_V2, "LaCie Network Space v2")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -275,6 +276,7 @@ MACHINE_START(INETSPACE_V2, "LaCie Internet Space v2")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -286,5 +288,6 @@ MACHINE_START(NETSPACE_MAX_V2, "LaCie Network Space Max v2")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/netxbig_v2-setup.c<br/>index 1ba12c4dff8f..31ae8de34e93 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/netxbig_v2-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/netxbig_v2-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/netxbig_v2-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/netxbig_v2-setup.c</a></div><div class='hunk'>@@ -405,6 +405,7 @@ MACHINE_START(NET2BIG_V2, "LaCie 2Big Network v2")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -416,5 +417,6 @@ MACHINE_START(NET5BIG_V2, "LaCie 5Big Network v2")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c<br/>index 5660ca6c3d88..01f8c8992880 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/openrd-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/openrd-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/openrd-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/openrd-setup.c</a></div><div class='hunk'>@@ -220,6 +220,7 @@ MACHINE_START(OPENRD_BASE, "Marvell OpenRD Base Board")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -232,6 +233,7 @@ MACHINE_START(OPENRD_CLIENT, "Marvell OpenRD Client Board")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -244,5 +246,6 @@ MACHINE_START(OPENRD_ULTIMATE, "Marvell OpenRD Ultimate Board")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c<br/>index 74b992d810ea..a066a6d8d9d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/pcie.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/pcie.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/pcie.c</a></div><div class='hunk'>@@ -11,12 +11,12 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;video/vga.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> #include &lt;plat/pcie.h&gt;</div><div class='ctx'> #include &lt;mach/bridge-regs.h&gt;</div><div class='add'>+#include &lt;plat/addr-map.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> void kirkwood_enable_pcie(void)</div><div class='hunk'>@@ -198,9 +198,8 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	if (request_resource(&amp;iomem_resource, &amp;pp-&gt;res[1]))</div><div class='ctx'> 		panic("Request PCIe%d Memory resource failed\n", index);</div><div class='ctx'> </div><div class='del'>-	sys-&gt;resource[0] = &amp;pp-&gt;res[0];</div><div class='del'>-	sys-&gt;resource[1] = &amp;pp-&gt;res[1];</div><div class='del'>-	sys-&gt;resource[2] = NULL;</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;pp-&gt;res[0]);</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;pp-&gt;res[1]);</div><div class='ctx'> 	sys-&gt;io_offset = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -208,7 +207,7 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	 */</div><div class='ctx'> 	orion_pcie_set_local_bus_nr(pp-&gt;base, sys-&gt;busnr);</div><div class='ctx'> </div><div class='del'>-	orion_pcie_setup(pp-&gt;base, &amp;kirkwood_mbus_dram_info);</div><div class='add'>+	orion_pcie_setup(pp-&gt;base);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -236,7 +235,8 @@ kirkwood_pcie_scan_bus(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	struct pci_bus *bus;</div><div class='ctx'> </div><div class='ctx'> 	if (nr &lt; num_pcie_ports) {</div><div class='del'>-		bus = pci_scan_bus(sys-&gt;busnr, &amp;pcie_ops, sys);</div><div class='add'>+		bus = pci_scan_root_bus(NULL, sys-&gt;busnr, &amp;pcie_ops, sys,</div><div class='add'>+					&amp;sys-&gt;resources);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bus = NULL;</div><div class='ctx'> 		BUG();</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c<br/>index 6663869773ab..fd2c9c8b6831 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/rd88f6192-nas-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/rd88f6192-nas-setup.c</a></div><div class='hunk'>@@ -85,4 +85,5 @@ MACHINE_START(RD88F6192_NAS, "Marvell RD-88F6192-NAS Development Board")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c<br/>index 66b3c05e37a6..ef922079348b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/rd88f6281-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/rd88f6281-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/rd88f6281-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/rd88f6281-setup.c</a></div><div class='hunk'>@@ -121,4 +121,5 @@ MACHINE_START(RD88F6281, "Marvell RD-88F6281 Reference Board")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c<br/>index 8b102d62e82c..4ea70e5f7137 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/sheevaplug-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/sheevaplug-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/sheevaplug-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/sheevaplug-setup.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ static void __init sheevaplug_init(void)</div><div class='ctx'> 	kirkwood_init();</div><div class='ctx'> </div><div class='ctx'> 	/* setup gpio pin select */</div><div class='del'>-	if (machine_is_sheeva_esata())</div><div class='add'>+	if (machine_is_esata_sheevaplug())</div><div class='ctx'> 		kirkwood_mpp_conf(sheeva_esata_mpp_config);</div><div class='ctx'> 	else</div><div class='ctx'> 		kirkwood_mpp_conf(sheevaplug_mpp_config);</div><div class='hunk'>@@ -123,11 +123,11 @@ static void __init sheevaplug_init(void)</div><div class='ctx'> 	kirkwood_ge00_init(&amp;sheevaplug_ge00_data);</div><div class='ctx'> </div><div class='ctx'> 	/* honor lower power consumption for plugs with out eSATA */</div><div class='del'>-	if (machine_is_sheeva_esata())</div><div class='add'>+	if (machine_is_esata_sheevaplug())</div><div class='ctx'> 		kirkwood_sata_init(&amp;sheeva_esata_sata_data);</div><div class='ctx'> </div><div class='ctx'> 	/* enable sd wp and sd cd on plugs with esata */</div><div class='del'>-	if (machine_is_sheeva_esata())</div><div class='add'>+	if (machine_is_esata_sheevaplug())</div><div class='ctx'> 		kirkwood_sdio_init(&amp;sheeva_esata_mvsdio_data);</div><div class='ctx'> 	else</div><div class='ctx'> 		kirkwood_sdio_init(&amp;sheevaplug_mvsdio_data);</div><div class='hunk'>@@ -144,6 +144,7 @@ MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -155,5 +156,6 @@ MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/t5325-setup.c b/arch/arm/mach-kirkwood/t5325-setup.c<br/>index ea104fb5ec3d..966b2b3bb813 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/t5325-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/t5325-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/t5325-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/t5325-setup.c</a></div><div class='hunk'>@@ -207,4 +207,5 @@ MACHINE_START(T5325, "HP t5325 Thin Client")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c<br/>index 262c034836d4..73e2b6ca9564 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/ts219-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/ts219-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/ts219-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/ts219-setup.c</a></div><div class='hunk'>@@ -138,4 +138,5 @@ MACHINE_START(TS219, "QNAP TS-119/TS-219")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-kirkwood/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-setup.c<br/>index b68f5b4a9ec8..5bbca2680442 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/ts41x-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-kirkwood/ts41x-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-kirkwood/ts41x-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-kirkwood/ts41x-setup.c</a></div><div class='hunk'>@@ -182,4 +182,5 @@ MACHINE_START(TS41X, "QNAP TS-41x")</div><div class='ctx'> 	.init_early	= kirkwood_init_early,</div><div class='ctx'> 	.init_irq	= kirkwood_init_irq,</div><div class='ctx'> 	.timer		= &amp;kirkwood_timer,</div><div class='add'>+	.restart	= kirkwood_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ks8695/board-acs5k.c b/arch/arm/mach-ks8695/board-acs5k.c<br/>index a91f99d265aa..255502ddd879 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/board-acs5k.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ks8695/board-acs5k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/board-acs5k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ks8695/board-acs5k.c</a></div><div class='hunk'>@@ -228,4 +228,5 @@ MACHINE_START(ACS5K, "Brivo Systems LLC ACS-5000 Master board")</div><div class='ctx'> 	.init_irq	= ks8695_init_irq,</div><div class='ctx'> 	.init_machine	= acs5k_init,</div><div class='ctx'> 	.timer		= &amp;ks8695_timer,</div><div class='add'>+	.restart	= ks8695_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ks8695/board-dsm320.c b/arch/arm/mach-ks8695/board-dsm320.c<br/>index d24bcef2e2dd..e0d36cef2c56 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/board-dsm320.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ks8695/board-dsm320.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/board-dsm320.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ks8695/board-dsm320.c</a></div><div class='hunk'>@@ -126,4 +126,5 @@ MACHINE_START(DSM320, "D-Link DSM-320 Wireless Media Player")</div><div class='ctx'> 	.init_irq	= ks8695_init_irq,</div><div class='ctx'> 	.init_machine	= dsm320_init,</div><div class='ctx'> 	.timer		= &amp;ks8695_timer,</div><div class='add'>+	.restart	= ks8695_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ks8695/board-micrel.c b/arch/arm/mach-ks8695/board-micrel.c<br/>index 16c95657f8fd..a8270725b76d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/board-micrel.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ks8695/board-micrel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/board-micrel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ks8695/board-micrel.c</a></div><div class='hunk'>@@ -58,4 +58,5 @@ MACHINE_START(KS8695, "KS8695 Centaur Development Board")</div><div class='ctx'> 	.init_irq	= ks8695_init_irq,</div><div class='ctx'> 	.init_machine	= micrel_init,</div><div class='ctx'> 	.timer		= &amp;ks8695_timer,</div><div class='add'>+	.restart	= ks8695_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ks8695/generic.h b/arch/arm/mach-ks8695/generic.h<br/>index 2fbfab8d5fae..f8bdb11a9c33 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/generic.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ks8695/generic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/generic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ks8695/generic.h</a></div><div class='hunk'>@@ -12,4 +12,5 @@</div><div class='ctx'> </div><div class='ctx'> extern __init void ks8695_map_io(void);</div><div class='ctx'> extern __init void ks8695_init_irq(void);</div><div class='add'>+extern void ks8695_restart(char, const char *);</div><div class='ctx'> extern struct sys_timer ks8695_timer;</div><div class='head'>diff --git a/arch/arm/mach-ks8695/include/mach/system.h b/arch/arm/mach-ks8695/include/mach/system.h<br/>index fb1dda9be2d0..59fe992395bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ks8695/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ks8695/include/mach/system.h</a></div><div class='hunk'>@@ -14,9 +14,6 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;mach/regs-timer.h&gt;</div><div class='del'>-</div><div class='ctx'> static void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -27,22 +24,4 @@ static void arch_idle(void)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	unsigned int reg;</div><div class='del'>-</div><div class='del'>-	if (mode == 's')</div><div class='del'>-		cpu_reset(0);</div><div class='del'>-</div><div class='del'>-	/* disable timer0 */</div><div class='del'>-	reg = __raw_readl(KS8695_TMR_VA + KS8695_TMCON);</div><div class='del'>-	__raw_writel(reg &amp; ~TMCON_T0EN, KS8695_TMR_VA + KS8695_TMCON);</div><div class='del'>-</div><div class='del'>-	/* enable watchdog mode */</div><div class='del'>-	__raw_writel((10 &lt;&lt; 8) | T0TC_WATCHDOG, KS8695_TMR_VA + KS8695_T0TC);</div><div class='del'>-</div><div class='del'>-	/* re-enable timer0 */</div><div class='del'>-	__raw_writel(reg | TMCON_T0EN, KS8695_TMR_VA + KS8695_TMCON);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-ks8695/include/mach/vmalloc.h b/arch/arm/mach-ks8695/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 744ac66be3a2..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ks8695/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-ks8695/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2006 Ben Dooks</div><div class='del'>- * Copyright (C) 2006 Simtec Electronics &lt;linux@simtec.co.uk&gt;</div><div class='del'>- *</div><div class='del'>- * KS8695 vmalloc definition</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 __ASM_ARCH_VMALLOC_H</div><div class='del'>-#define __ASM_ARCH_VMALLOC_H</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END	  (KS8695_IO_VA &amp; PGDIR_MASK)</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-ks8695/irq.c b/arch/arm/mach-ks8695/irq.c<br/>index a78092dcd6fb..76802aac0f45 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ks8695/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ks8695/irq.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ks8695/pci.c b/arch/arm/mach-ks8695/pci.c<br/>index c7c9a188d105..b26f992071df 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ks8695/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ks8695/pci.c</a></div><div class='hunk'>@@ -143,7 +143,8 @@ static struct pci_ops ks8695_pci_ops = {</div><div class='ctx'> </div><div class='ctx'> static struct pci_bus* __init ks8695_pci_scan_bus(int nr, struct pci_sys_data *sys)</div><div class='ctx'> {</div><div class='del'>-	return pci_scan_bus(sys-&gt;busnr, &amp;ks8695_pci_ops, sys);</div><div class='add'>+	return pci_scan_root_bus(NULL, sys-&gt;busnr, &amp;ks8695_pci_ops, sys,</div><div class='add'>+				 &amp;sys-&gt;resources);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct resource pci_mem = {</div><div class='hunk'>@@ -168,9 +169,8 @@ static int __init ks8695_pci_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	request_resource(&amp;iomem_resource, &amp;pci_mem);</div><div class='ctx'> 	request_resource(&amp;ioport_resource, &amp;pci_io);</div><div class='ctx'> </div><div class='del'>-	sys-&gt;resource[0] = &amp;pci_io;</div><div class='del'>-	sys-&gt;resource[1] = &amp;pci_mem;</div><div class='del'>-	sys-&gt;resource[2] = NULL;</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;pci_io);</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;pci_mem);</div><div class='ctx'> </div><div class='ctx'> 	/* Assign and enable processor bridge */</div><div class='ctx'> 	ks8695_local_writeconfig(PCI_BASE_ADDRESS_0, KS8695_PCIMEM_PA);</div><div class='head'>diff --git a/arch/arm/mach-ks8695/time.c b/arch/arm/mach-ks8695/time.c<br/>index 69c072c2c0f9..37dfcd5bd2ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ks8695/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ks8695/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ks8695/time.c</a></div><div class='hunk'>@@ -109,3 +109,21 @@ struct sys_timer ks8695_timer = {</div><div class='ctx'> 	.offset		= ks8695_gettimeoffset,</div><div class='ctx'> 	.resume		= ks8695_timer_setup,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+void ks8695_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	unsigned int reg;</div><div class='add'>+</div><div class='add'>+	if (mode == 's')</div><div class='add'>+		soft_restart(0);</div><div class='add'>+</div><div class='add'>+	/* disable timer0 */</div><div class='add'>+	reg = __raw_readl(KS8695_TMR_VA + KS8695_TMCON);</div><div class='add'>+	__raw_writel(reg &amp; ~TMCON_T0EN, KS8695_TMR_VA + KS8695_TMCON);</div><div class='add'>+</div><div class='add'>+	/* enable watchdog mode */</div><div class='add'>+	__raw_writel((10 &lt;&lt; 8) | T0TC_WATCHDOG, KS8695_TMR_VA + KS8695_T0TC);</div><div class='add'>+</div><div class='add'>+	/* re-enable timer0 */</div><div class='add'>+	__raw_writel(reg | TMCON_T0EN, KS8695_TMR_VA + KS8695_TMCON);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-lpc32xx/common.c b/arch/arm/mach-lpc32xx/common.c<br/>index 205b2dbb565b..369b152896cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lpc32xx/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-lpc32xx/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lpc32xx/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-lpc32xx/common.c</a></div><div class='hunk'>@@ -164,7 +164,7 @@ int clk_is_sysclk_mainosc(void)</div><div class='ctx'> /*</div><div class='ctx'>  * System reset via the watchdog timer</div><div class='ctx'>  */</div><div class='del'>-void lpc32xx_watchdog_reset(void)</div><div class='add'>+static void lpc32xx_watchdog_reset(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Make sure WDT clocks are enabled */</div><div class='ctx'> 	__raw_writel(LPC32XX_CLKPWR_PWMCLK_WDOG_EN,</div><div class='hunk'>@@ -311,3 +311,21 @@ void __init lpc32xx_map_io(void)</div><div class='ctx'> {</div><div class='ctx'> 	iotable_init(lpc32xx_io_desc, ARRAY_SIZE(lpc32xx_io_desc));</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void lpc23xx_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case 's':</div><div class='add'>+	case 'h':</div><div class='add'>+		lpc32xx_watchdog_reset();</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		/* Do nothing */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait for watchdog to reset system */</div><div class='add'>+	while (1)</div><div class='add'>+		;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-lpc32xx/common.h b/arch/arm/mach-lpc32xx/common.h<br/>index 5583f52662bd..4b4e700343c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lpc32xx/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-lpc32xx/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lpc32xx/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-lpc32xx/common.h</a></div><div class='hunk'>@@ -39,6 +39,8 @@ extern void __init lpc32xx_init_irq(void);</div><div class='ctx'> extern void __init lpc32xx_map_io(void);</div><div class='ctx'> extern void __init lpc32xx_serial_init(void);</div><div class='ctx'> extern void __init lpc32xx_gpio_init(void);</div><div class='add'>+extern void lpc23xx_restart(char, const char *);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Structure used for setting up and querying the PLLS</div><div class='head'>diff --git a/arch/arm/mach-lpc32xx/include/mach/system.h b/arch/arm/mach-lpc32xx/include/mach/system.h<br/>index df3b0dea4d7b..bf176c991520 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lpc32xx/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-lpc32xx/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lpc32xx/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-lpc32xx/include/mach/system.h</a></div><div class='hunk'>@@ -24,29 +24,4 @@ static void arch_idle(void)</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	extern void lpc32xx_watchdog_reset(void);</div><div class='del'>-</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case 's':</div><div class='del'>-	case 'h':</div><div class='del'>-		printk(KERN_CRIT "RESET: Rebooting system\n");</div><div class='del'>-</div><div class='del'>-		/* Disable interrupts */</div><div class='del'>-		local_irq_disable();</div><div class='del'>-</div><div class='del'>-		lpc32xx_watchdog_reset();</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		/* Do nothing */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Wait for watchdog to reset system */</div><div class='del'>-	while (1)</div><div class='del'>-		;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-lpc32xx/include/mach/vmalloc.h b/arch/arm/mach-lpc32xx/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 720fa43a60bf..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lpc32xx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-lpc32xx/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-lpc32xx/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * Author: Kevin Wells &lt;kevin.wells@nxp.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2010 NXP Semiconductors</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 __ASM_ARCH_VMALLOC_H</div><div class='del'>-#define __ASM_ARCH_VMALLOC_H</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END	0xF0000000UL</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c<br/>index 6d2f0d1b9373..bfee5b455105 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lpc32xx/phy3250.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-lpc32xx/phy3250.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lpc32xx/phy3250.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-lpc32xx/phy3250.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#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='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='hunk'>@@ -388,4 +388,5 @@ MACHINE_START(PHY3250, "Phytec 3250 board with the LPC3250 Microcontroller")</div><div class='ctx'> 	.init_irq	= lpc32xx_init_irq,</div><div class='ctx'> 	.timer		= &amp;lpc32xx_timer,</div><div class='ctx'> 	.init_machine	= phy3250_board_init,</div><div class='add'>+	.restart	= lpc23xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c<br/>index 7a60bbbce7a4..17cb76060125 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/aspenite.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/aspenite.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/aspenite.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/aspenite.c</a></div><div class='hunk'>@@ -120,8 +120,8 @@ static struct resource smc91x_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start	= gpio_to_irq(27),</div><div class='del'>-		.end	= gpio_to_irq(27),</div><div class='add'>+		.start	= MMP_GPIO_TO_IRQ(27),</div><div class='add'>+		.end	= MMP_GPIO_TO_IRQ(27),</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -232,6 +232,7 @@ static void __init common_init(void)</div><div class='ctx'> 	pxa168_add_nand(&amp;aspenite_nand_info);</div><div class='ctx'> 	pxa168_add_fb(&amp;aspenite_lcd_info);</div><div class='ctx'> 	pxa168_add_keypad(&amp;aspenite_keypad_info);</div><div class='add'>+	platform_device_register(&amp;pxa168_device_gpio);</div><div class='ctx'> </div><div class='ctx'> 	/* off-chip devices */</div><div class='ctx'> 	platform_device_register(&amp;smc91x_device);</div><div class='hunk'>@@ -243,6 +244,7 @@ MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform")</div><div class='ctx'> 	.init_irq       = pxa168_init_irq,</div><div class='ctx'> 	.timer          = &amp;pxa168_timer,</div><div class='ctx'> 	.init_machine   = common_init,</div><div class='add'>+	.restart	= pxa168_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(ZYLONITE2, "PXA168-based Zylonite2 Development Platform")</div><div class='hunk'>@@ -251,4 +253,5 @@ MACHINE_START(ZYLONITE2, "PXA168-based Zylonite2 Development Platform")</div><div class='ctx'> 	.init_irq       = pxa168_init_irq,</div><div class='ctx'> 	.timer          = &amp;pxa168_timer,</div><div class='ctx'> 	.init_machine   = common_init,</div><div class='add'>+	.restart	= pxa168_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mmp/avengers_lite.c b/arch/arm/mach-mmp/avengers_lite.c<br/>index 39f0878d64a0..b148a9dc5a44 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/avengers_lite.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/avengers_lite.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/avengers_lite.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/avengers_lite.c</a></div><div class='hunk'>@@ -38,6 +38,7 @@ static void __init avengers_lite_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* on-chip devices */</div><div class='ctx'> 	pxa168_add_uart(2);</div><div class='add'>+	platform_device_register(&amp;pxa168_device_gpio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(AVENGERS_LITE, "PXA168 Avengers lite Development Platform")</div><div class='hunk'>@@ -45,4 +46,5 @@ MACHINE_START(AVENGERS_LITE, "PXA168 Avengers lite Development Platform")</div><div class='ctx'> 	.init_irq       = pxa168_init_irq,</div><div class='ctx'> 	.timer          = &amp;pxa168_timer,</div><div class='ctx'> 	.init_machine   = avengers_lite_init,</div><div class='add'>+	.restart	= pxa168_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mmp/brownstone.c b/arch/arm/mach-mmp/brownstone.c<br/>index 983cfb15fbde..d839fe6421e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/brownstone.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/brownstone.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/brownstone.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/brownstone.c</a></div><div class='hunk'>@@ -202,6 +202,7 @@ static void __init brownstone_init(void)</div><div class='ctx'> 	/* on-chip devices */</div><div class='ctx'> 	mmp2_add_uart(1);</div><div class='ctx'> 	mmp2_add_uart(3);</div><div class='add'>+	platform_device_register(&amp;mmp2_device_gpio);</div><div class='ctx'> 	mmp2_add_twsi(1, NULL, ARRAY_AND_SIZE(brownstone_twsi1_info));</div><div class='ctx'> 	mmp2_add_sdhost(0, &amp;mmp2_sdh_platdata_mmc0); /* SD/MMC */</div><div class='ctx'> 	mmp2_add_sdhost(2, &amp;mmp2_sdh_platdata_mmc2); /* eMMC */</div><div class='hunk'>@@ -219,4 +220,5 @@ MACHINE_START(BROWNSTONE, "Brownstone Development Platform")</div><div class='ctx'> 	.init_irq	= mmp2_init_irq,</div><div class='ctx'> 	.timer		= &amp;mmp2_timer,</div><div class='ctx'> 	.init_machine	= brownstone_init,</div><div class='add'>+	.restart	= mmp_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mmp/common.c b/arch/arm/mach-mmp/common.c<br/>index 5720674739f0..062b5b93c50e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/common.c</a></div><div class='hunk'>@@ -45,3 +45,8 @@ void __init mmp_map_io(void)</div><div class='ctx'> 	/* this is early, initialize mmp_chip_id here */</div><div class='ctx'> 	mmp_chip_id = __raw_readl(MMP_CHIPID);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void mmp_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	soft_restart(0);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-mmp/common.h b/arch/arm/mach-mmp/common.h<br/>index ec8d65ded25c..1c9d6c1ea97a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/common.h</a></div><div class='hunk'>@@ -6,3 +6,4 @@ extern void timer_init(int irq);</div><div class='ctx'> </div><div class='ctx'> extern void __init icu_init_irq(void);</div><div class='ctx'> extern void __init mmp_map_io(void);</div><div class='add'>+extern void mmp_restart(char, const char *);</div><div class='head'>diff --git a/arch/arm/mach-mmp/flint.c b/arch/arm/mach-mmp/flint.c<br/>index c4fd806b15b4..2ee8cd7829dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/flint.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/flint.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/flint.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/flint.c</a></div><div class='hunk'>@@ -87,8 +87,8 @@ static struct resource smc91x_resources[] = {</div><div class='ctx'> 		.flags  = IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start  = gpio_to_irq(155),</div><div class='del'>-		.end    = gpio_to_irq(155),</div><div class='add'>+		.start  = MMP_GPIO_TO_IRQ(155),</div><div class='add'>+		.end    = MMP_GPIO_TO_IRQ(155),</div><div class='ctx'> 		.flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -110,6 +110,7 @@ static void __init flint_init(void)</div><div class='ctx'> 	/* on-chip devices */</div><div class='ctx'> 	mmp2_add_uart(1);</div><div class='ctx'> 	mmp2_add_uart(2);</div><div class='add'>+	platform_device_register(&amp;mmp2_device_gpio);</div><div class='ctx'> </div><div class='ctx'> 	/* off-chip devices */</div><div class='ctx'> 	platform_device_register(&amp;smc91x_device);</div><div class='hunk'>@@ -121,4 +122,5 @@ MACHINE_START(FLINT, "Flint Development Platform")</div><div class='ctx'> 	.init_irq       = mmp2_init_irq,</div><div class='ctx'> 	.timer          = &amp;mmp2_timer,</div><div class='ctx'> 	.init_machine   = flint_init,</div><div class='add'>+	.restart	= mmp_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mmp/gplugd.c b/arch/arm/mach-mmp/gplugd.c<br/>index 4665767a4f79..87765467de63 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/gplugd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/gplugd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/gplugd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/gplugd.c</a></div><div class='hunk'>@@ -184,6 +184,7 @@ static void __init gplugd_init(void)</div><div class='ctx'> 	pxa168_add_uart(3);</div><div class='ctx'> 	pxa168_add_ssp(1);</div><div class='ctx'> 	pxa168_add_twsi(0, NULL, ARRAY_AND_SIZE(gplugd_i2c_board_info));</div><div class='add'>+	platform_device_register(&amp;pxa168_device_gpio);</div><div class='ctx'> </div><div class='ctx'> 	pxa168_add_eth(&amp;gplugd_eth_platform_data);</div><div class='ctx'> }</div><div class='hunk'>@@ -194,4 +195,5 @@ MACHINE_START(GPLUGD, "PXA168-based GuruPlug Display (gplugD) Platform")</div><div class='ctx'> 	.init_irq       = pxa168_init_irq,</div><div class='ctx'> 	.timer          = &amp;pxa168_timer,</div><div class='ctx'> 	.init_machine   = gplugd_init,</div><div class='add'>+	.restart	= pxa168_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mmp/include/mach/gpio-pxa.h b/arch/arm/mach-mmp/include/mach/gpio-pxa.h<br/>index 99b4ce1b6562..0e135a599f3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/include/mach/gpio-pxa.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/include/mach/gpio-pxa.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/include/mach/gpio-pxa.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/include/mach/gpio-pxa.h</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #define __ASM_MACH_GPIO_PXA_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/addr-map.h&gt;</div><div class='add'>+#include &lt;mach/cputype.h&gt;</div><div class='ctx'> #include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define GPIO_REGS_VIRT	(APB_VIRT_BASE + 0x19000)</div><div class='hunk'>@@ -9,8 +10,6 @@</div><div class='ctx'> #define BANK_OFF(n)	(((n) &lt; 3) ? (n) &lt;&lt; 2 : 0x100 + (((n) - 3) &lt;&lt; 2))</div><div class='ctx'> #define GPIO_REG(x)	(*(volatile u32 *)(GPIO_REGS_VIRT + (x)))</div><div class='ctx'> </div><div class='del'>-#define NR_BUILTIN_GPIO		IRQ_GPIO_NUM</div><div class='del'>-</div><div class='ctx'> #define gpio_to_bank(gpio)	((gpio) &gt;&gt; 5)</div><div class='ctx'> </div><div class='ctx'> /* NOTE: these macros are defined here to make optimization of</div><div class='head'>diff --git a/arch/arm/mach-mmp/include/mach/gpio.h b/arch/arm/mach-mmp/include/mach/gpio.h<br/>index 681262359d1c..13219ebf5128 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/include/mach/gpio.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/include/mach/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/include/mach/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/include/mach/gpio.h</a></div><div class='hunk'>@@ -3,11 +3,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#define gpio_to_irq(gpio)	(IRQ_GPIO_START + (gpio))</div><div class='del'>-#define irq_to_gpio(irq)	((irq) - IRQ_GPIO_START)</div><div class='add'>+#include &lt;mach/cputype.h&gt;</div><div class='ctx'> </div><div class='del'>-#define __gpio_is_inverted(gpio)	(0)</div><div class='del'>-#define __gpio_is_occupied(gpio)	(0)</div><div class='del'>-</div><div class='del'>-#include &lt;plat/gpio.h&gt;</div><div class='ctx'> #endif /* __ASM_MACH_GPIO_H */</div><div class='head'>diff --git a/arch/arm/mach-mmp/include/mach/irqs.h b/arch/arm/mach-mmp/include/mach/irqs.h<br/>index a09d328e2ddd..34635a0bbb59 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/include/mach/irqs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/include/mach/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/include/mach/irqs.h</a></div><div class='hunk'>@@ -219,10 +219,10 @@</div><div class='ctx'> #define IRQ_MMP2_MUX_END		(IRQ_MMP2_SSP_BASE + 2)</div><div class='ctx'> </div><div class='ctx'> #define IRQ_GPIO_START			128</div><div class='del'>-#define IRQ_GPIO_NUM			192</div><div class='del'>-#define IRQ_GPIO(x)			(IRQ_GPIO_START + (x))</div><div class='add'>+#define MMP_NR_BUILTIN_GPIO		192</div><div class='add'>+#define MMP_GPIO_TO_IRQ(gpio)		(IRQ_GPIO_START + (gpio))</div><div class='ctx'> </div><div class='del'>-#define IRQ_BOARD_START			(IRQ_GPIO_START + IRQ_GPIO_NUM)</div><div class='add'>+#define IRQ_BOARD_START			(IRQ_GPIO_START + MMP_NR_BUILTIN_GPIO)</div><div class='ctx'> </div><div class='ctx'> #define NR_IRQS				(IRQ_BOARD_START)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mmp/include/mach/mmp2.h b/arch/arm/mach-mmp/include/mach/mmp2.h<br/>index 2f7b2d3c2b18..cba22fed2265 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/include/mach/mmp2.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/include/mach/mmp2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/include/mach/mmp2.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/include/mach/mmp2.h</a></div><div class='hunk'>@@ -32,6 +32,8 @@ extern struct pxa_device_desc mmp2_device_sdh3;</div><div class='ctx'> extern struct pxa_device_desc mmp2_device_asram;</div><div class='ctx'> extern struct pxa_device_desc mmp2_device_isram;</div><div class='ctx'> </div><div class='add'>+extern struct platform_device mmp2_device_gpio;</div><div class='add'>+</div><div class='ctx'> static inline int mmp2_add_uart(int id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pxa_device_desc *d = NULL;</div><div class='head'>diff --git a/arch/arm/mach-mmp/include/mach/pxa168.h b/arch/arm/mach-mmp/include/mach/pxa168.h<br/>index 7fb568d2845b..dc03d580a06d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/include/mach/pxa168.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/include/mach/pxa168.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/include/mach/pxa168.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/include/mach/pxa168.h</a></div><div class='hunk'>@@ -5,6 +5,7 @@ struct sys_timer;</div><div class='ctx'> </div><div class='ctx'> extern struct sys_timer pxa168_timer;</div><div class='ctx'> extern void __init pxa168_init_irq(void);</div><div class='add'>+extern void pxa168_restart(char, const char *);</div><div class='ctx'> extern void pxa168_clear_keypad_wakeup(void);</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='hunk'>@@ -42,6 +43,8 @@ struct pxa168_usb_pdata {</div><div class='ctx'> /* pdata can be NULL */</div><div class='ctx'> int __init pxa168_add_usb_host(struct pxa168_usb_pdata *pdata);</div><div class='ctx'> </div><div class='add'>+extern struct platform_device pxa168_device_gpio;</div><div class='add'>+</div><div class='ctx'> static inline int pxa168_add_uart(int id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pxa_device_desc *d = NULL;</div><div class='head'>diff --git a/arch/arm/mach-mmp/include/mach/pxa910.h b/arch/arm/mach-mmp/include/mach/pxa910.h<br/>index 91be75591398..4de13abef7bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/include/mach/pxa910.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/include/mach/pxa910.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/include/mach/pxa910.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/include/mach/pxa910.h</a></div><div class='hunk'>@@ -21,6 +21,8 @@ extern struct pxa_device_desc pxa910_device_pwm3;</div><div class='ctx'> extern struct pxa_device_desc pxa910_device_pwm4;</div><div class='ctx'> extern struct pxa_device_desc pxa910_device_nand;</div><div class='ctx'> </div><div class='add'>+extern struct platform_device pxa910_device_gpio;</div><div class='add'>+</div><div class='ctx'> static inline int pxa910_add_uart(int id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pxa_device_desc *d = NULL;</div><div class='head'>diff --git a/arch/arm/mach-mmp/include/mach/system.h b/arch/arm/mach-mmp/include/mach/system.h<br/>index 1a8a25edb1b4..1d001eab81e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/include/mach/system.h</a></div><div class='hunk'>@@ -9,18 +9,8 @@</div><div class='ctx'> #ifndef __ASM_MACH_SYSTEM_H</div><div class='ctx'> #define __ASM_MACH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/cputype.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	if (cpu_is_pxa168())</div><div class='del'>-		cpu_reset(0xffff0000);</div><div class='del'>-	else</div><div class='del'>-		cpu_reset(0);</div><div class='del'>-}</div><div class='ctx'> #endif /* __ASM_MACH_SYSTEM_H */</div><div class='head'>diff --git a/arch/arm/mach-mmp/include/mach/vmalloc.h b/arch/arm/mach-mmp/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 1d0bac003ad0..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/arch/arm/mach-mmp/include/mach/vmalloc.h</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END	0xfe000000UL</div><div class='head'>diff --git a/arch/arm/mach-mmp/jasper.c b/arch/arm/mach-mmp/jasper.c<br/>index 8bfac6612623..96cf5c8fe47d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/jasper.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/jasper.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/jasper.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/jasper.c</a></div><div class='hunk'>@@ -175,4 +175,5 @@ MACHINE_START(MARVELL_JASPER, "Jasper Development Platform")</div><div class='ctx'> 	.init_irq       = mmp2_init_irq,</div><div class='ctx'> 	.timer          = &amp;mmp2_timer,</div><div class='ctx'> 	.init_machine   = jasper_init,</div><div class='add'>+	.restart	= mmp_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c<br/>index 5dd1d4a6aeb9..617c60a170a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/mmp2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/mmp2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/mmp2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/mmp2.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</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/io.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/cache-tauros2.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -24,7 +25,6 @@</div><div class='ctx'> #include &lt;mach/irqs.h&gt;</div><div class='ctx'> #include &lt;mach/dma.h&gt;</div><div class='ctx'> #include &lt;mach/mfp.h&gt;</div><div class='del'>-#include &lt;mach/gpio-pxa.h&gt;</div><div class='ctx'> #include &lt;mach/devices.h&gt;</div><div class='ctx'> #include &lt;mach/mmp2.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -33,8 +33,6 @@</div><div class='ctx'> </div><div class='ctx'> #define MFPR_VIRT_BASE	(APB_VIRT_BASE + 0x1e000)</div><div class='ctx'> </div><div class='del'>-#define APMASK(i)	(GPIO_REGS_VIRT + BANK_OFF(i) + 0x9c)</div><div class='del'>-</div><div class='ctx'> static struct mfp_addr_map mmp2_addr_map[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> 	MFP_ADDR_X(GPIO0, GPIO58, 0x54),</div><div class='hunk'>@@ -95,24 +93,9 @@ void mmp2_clear_pmic_int(void)</div><div class='ctx'> 	__raw_writel(data, mfpr_pmic);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init mmp2_init_gpio(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* enable GPIO clock */</div><div class='del'>-	__raw_writel(APBC_APBCLK | APBC_FNCLK, APBC_MMP2_GPIO);</div><div class='del'>-</div><div class='del'>-	/* unmask GPIO edge detection for all 6 banks -- APMASKx */</div><div class='del'>-	for (i = 0; i &lt; 6; i++)</div><div class='del'>-		__raw_writel(0xffffffff, APMASK(i));</div><div class='del'>-</div><div class='del'>-	pxa_init_gpio(IRQ_MMP2_GPIO, 0, 167, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __init mmp2_init_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	mmp2_init_icu();</div><div class='del'>-	mmp2_init_gpio();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sdhc_clk_enable(struct clk *clk)</div><div class='hunk'>@@ -149,6 +132,7 @@ static APBC_CLK(twsi3, MMP2_TWSI3, 0, 26000000);</div><div class='ctx'> static APBC_CLK(twsi4, MMP2_TWSI4, 0, 26000000);</div><div class='ctx'> static APBC_CLK(twsi5, MMP2_TWSI5, 0, 26000000);</div><div class='ctx'> static APBC_CLK(twsi6, MMP2_TWSI6, 0, 26000000);</div><div class='add'>+static APBC_CLK(gpio, MMP2_GPIO, 0, 26000000);</div><div class='ctx'> </div><div class='ctx'> static APMU_CLK(nand, NAND, 0xbf, 100000000);</div><div class='ctx'> static APMU_CLK_OPS(sdh0, SDH0, 0x1b, 200000000, &amp;sdhc_clk_ops);</div><div class='hunk'>@@ -168,6 +152,7 @@ static struct clk_lookup mmp2_clkregs[] = {</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_twsi5, "pxa2xx-i2c.4", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_twsi6, "pxa2xx-i2c.5", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_nand, "pxa3xx-nand", NULL),</div><div class='add'>+	INIT_CLKREG(&amp;clk_gpio, "pxa-gpio", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_sdh0, "sdhci-pxav3.0", "PXA-SDHCLK"),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_sdh1, "sdhci-pxav3.1", "PXA-SDHCLK"),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_sdh2, "sdhci-pxav3.2", "PXA-SDHCLK"),</div><div class='hunk'>@@ -230,3 +215,21 @@ MMP2_DEVICE(asram, "asram", -1, NONE, 0xe0000000, 0x4000);</div><div class='ctx'> /* 0xd1000000 ~ 0xd101ffff is reserved for secure processor */</div><div class='ctx'> MMP2_DEVICE(isram, "isram", -1, NONE, 0xd1020000, 0x18000);</div><div class='ctx'> </div><div class='add'>+struct resource mmp2_resource_gpio[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= 0xd4019000,</div><div class='add'>+		.end	= 0xd4019fff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start	= IRQ_MMP2_GPIO,</div><div class='add'>+		.end	= IRQ_MMP2_GPIO,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct platform_device mmp2_device_gpio = {</div><div class='add'>+	.name		= "pxa-gpio",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(mmp2_resource_gpio),</div><div class='add'>+	.resource	= mmp2_resource_gpio,</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c<br/>index 76ca15c00e45..7bc17eaa12eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/pxa168.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/pxa168.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/pxa168.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/pxa168.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;mach/addr-map.h&gt;</div><div class='hunk'>@@ -20,7 +21,6 @@</div><div class='ctx'> #include &lt;mach/regs-apbc.h&gt;</div><div class='ctx'> #include &lt;mach/regs-apmu.h&gt;</div><div class='ctx'> #include &lt;mach/irqs.h&gt;</div><div class='del'>-#include &lt;mach/gpio-pxa.h&gt;</div><div class='ctx'> #include &lt;mach/dma.h&gt;</div><div class='ctx'> #include &lt;mach/devices.h&gt;</div><div class='ctx'> #include &lt;mach/mfp.h&gt;</div><div class='hunk'>@@ -43,26 +43,9 @@ static struct mfp_addr_map pxa168_mfp_addr_map[] __initdata =</div><div class='ctx'> 	MFP_ADDR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define APMASK(i)	(GPIO_REGS_VIRT + BANK_OFF(i) + 0x09c)</div><div class='del'>-</div><div class='del'>-static void __init pxa168_init_gpio(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* enable GPIO clock */</div><div class='del'>-	__raw_writel(APBC_APBCLK | APBC_FNCLK, APBC_PXA168_GPIO);</div><div class='del'>-</div><div class='del'>-	/* unmask GPIO edge detection for all 4 banks - APMASKx */</div><div class='del'>-	for (i = 0; i &lt; 4; i++)</div><div class='del'>-		__raw_writel(0xffffffff, APMASK(i));</div><div class='del'>-</div><div class='del'>-	pxa_init_gpio(IRQ_PXA168_GPIOX, 0, 127, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __init pxa168_init_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	icu_init_irq();</div><div class='del'>-	pxa168_init_gpio();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* APB peripheral clocks */</div><div class='hunk'>@@ -80,6 +63,7 @@ static APBC_CLK(ssp2, PXA168_SSP2, 4, 0);</div><div class='ctx'> static APBC_CLK(ssp3, PXA168_SSP3, 4, 0);</div><div class='ctx'> static APBC_CLK(ssp4, PXA168_SSP4, 4, 0);</div><div class='ctx'> static APBC_CLK(ssp5, PXA168_SSP5, 4, 0);</div><div class='add'>+static APBC_CLK(gpio, PXA168_GPIO, 0, 13000000);</div><div class='ctx'> static APBC_CLK(keypad, PXA168_KPC, 0, 32000);</div><div class='ctx'> </div><div class='ctx'> static APMU_CLK(nand, NAND, 0x19b, 156000000);</div><div class='hunk'>@@ -105,6 +89,7 @@ static struct clk_lookup pxa168_clkregs[] = {</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_ssp5, "pxa168-ssp.4", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_nand, "pxa3xx-nand", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_lcd, "pxa168-fb", NULL),</div><div class='add'>+	INIT_CLKREG(&amp;clk_gpio, "pxa-gpio", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_keypad, "pxa27x-keypad", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_eth, "pxa168-eth", "MFUCLK"),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_usb, "pxa168-ehci", "PXA168-USBCLK"),</div><div class='hunk'>@@ -174,6 +159,25 @@ PXA168_DEVICE(fb, "pxa168-fb", -1, LCD, 0xd420b000, 0x1c8);</div><div class='ctx'> PXA168_DEVICE(keypad, "pxa27x-keypad", -1, KEYPAD, 0xd4012000, 0x4c);</div><div class='ctx'> PXA168_DEVICE(eth, "pxa168-eth", -1, MFU, 0xc0800000, 0x0fff);</div><div class='ctx'> </div><div class='add'>+struct resource pxa168_resource_gpio[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= 0xd4019000,</div><div class='add'>+		.end	= 0xd4019fff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start	= IRQ_PXA168_GPIOX,</div><div class='add'>+		.end	= IRQ_PXA168_GPIOX,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct platform_device pxa168_device_gpio = {</div><div class='add'>+	.name		= "pxa-gpio",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(pxa168_resource_gpio),</div><div class='add'>+	.resource	= pxa168_resource_gpio,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct resource pxa168_usb_host_resources[] = {</div><div class='ctx'> 	/* USB Host conroller register base */</div><div class='ctx'> 	[0] = {</div><div class='hunk'>@@ -214,3 +218,8 @@ int __init pxa168_add_usb_host(struct pxa168_usb_pdata *pdata)</div><div class='ctx'> 	pxa168_device_usb_host.dev.platform_data = pdata;</div><div class='ctx'> 	return platform_device_register(&amp;pxa168_device_usb_host);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void pxa168_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	soft_restart(0xffff0000);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-mmp/pxa910.c b/arch/arm/mach-mmp/pxa910.c<br/>index 4ebbfbba39fc..3241a25784d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/pxa910.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/pxa910.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/pxa910.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/pxa910.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;mach/addr-map.h&gt;</div><div class='hunk'>@@ -19,7 +20,6 @@</div><div class='ctx'> #include &lt;mach/regs-apmu.h&gt;</div><div class='ctx'> #include &lt;mach/cputype.h&gt;</div><div class='ctx'> #include &lt;mach/irqs.h&gt;</div><div class='del'>-#include &lt;mach/gpio-pxa.h&gt;</div><div class='ctx'> #include &lt;mach/dma.h&gt;</div><div class='ctx'> #include &lt;mach/mfp.h&gt;</div><div class='ctx'> #include &lt;mach/devices.h&gt;</div><div class='hunk'>@@ -77,26 +77,9 @@ static struct mfp_addr_map pxa910_mfp_addr_map[] __initdata =</div><div class='ctx'> 	MFP_ADDR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define APMASK(i)	(GPIO_REGS_VIRT + BANK_OFF(i) + 0x09c)</div><div class='del'>-</div><div class='del'>-static void __init pxa910_init_gpio(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* enable GPIO clock */</div><div class='del'>-	__raw_writel(APBC_APBCLK | APBC_FNCLK, APBC_PXA910_GPIO);</div><div class='del'>-</div><div class='del'>-	/* unmask GPIO edge detection for all 4 banks - APMASKx */</div><div class='del'>-	for (i = 0; i &lt; 4; i++)</div><div class='del'>-		__raw_writel(0xffffffff, APMASK(i));</div><div class='del'>-</div><div class='del'>-	pxa_init_gpio(IRQ_PXA910_AP_GPIO, 0, 127, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __init pxa910_init_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	icu_init_irq();</div><div class='del'>-	pxa910_init_gpio();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* APB peripheral clocks */</div><div class='hunk'>@@ -108,6 +91,7 @@ static APBC_CLK(pwm1, PXA910_PWM1, 1, 13000000);</div><div class='ctx'> static APBC_CLK(pwm2, PXA910_PWM2, 1, 13000000);</div><div class='ctx'> static APBC_CLK(pwm3, PXA910_PWM3, 1, 13000000);</div><div class='ctx'> static APBC_CLK(pwm4, PXA910_PWM4, 1, 13000000);</div><div class='add'>+static APBC_CLK(gpio, PXA910_GPIO, 0, 13000000);</div><div class='ctx'> </div><div class='ctx'> static APMU_CLK(nand, NAND, 0x19b, 156000000);</div><div class='ctx'> static APMU_CLK(u2o, USB, 0x1b, 480000000);</div><div class='hunk'>@@ -123,6 +107,7 @@ static struct clk_lookup pxa910_clkregs[] = {</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pwm3, "pxa910-pwm.2", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pwm4, "pxa910-pwm.3", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_nand, "pxa3xx-nand", NULL),</div><div class='add'>+	INIT_CLKREG(&amp;clk_gpio, "pxa-gpio", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_u2o, "pxa-u2o", "U2OCLK"),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -179,3 +164,22 @@ PXA910_DEVICE(pwm2, "pxa910-pwm", 1, NONE, 0xd401a400, 0x10);</div><div class='ctx'> PXA910_DEVICE(pwm3, "pxa910-pwm", 2, NONE, 0xd401a800, 0x10);</div><div class='ctx'> PXA910_DEVICE(pwm4, "pxa910-pwm", 3, NONE, 0xd401ac00, 0x10);</div><div class='ctx'> PXA910_DEVICE(nand, "pxa3xx-nand", -1, NAND, 0xd4283000, 0x80, 97, 99);</div><div class='add'>+</div><div class='add'>+struct resource pxa910_resource_gpio[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= 0xd4019000,</div><div class='add'>+		.end	= 0xd4019fff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start	= IRQ_PXA910_AP_GPIO,</div><div class='add'>+		.end	= IRQ_PXA910_AP_GPIO,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct platform_device pxa910_device_gpio = {</div><div class='add'>+	.name		= "pxa-gpio",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(pxa910_resource_gpio),</div><div class='add'>+	.resource	= pxa910_resource_gpio,</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/mach-mmp/tavorevb.c b/arch/arm/mach-mmp/tavorevb.c<br/>index eb5be879fd8c..8e3b5af04a57 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/tavorevb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/tavorevb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/tavorevb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/tavorevb.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;mach/addr-map.h&gt;</div><div class='ctx'> #include &lt;mach/mfp-pxa910.h&gt;</div><div class='ctx'> #include &lt;mach/pxa910.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='hunk'>@@ -71,8 +72,8 @@ static struct resource smc91x_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start	= gpio_to_irq(80),</div><div class='del'>-		.end	= gpio_to_irq(80),</div><div class='add'>+		.start	= MMP_GPIO_TO_IRQ(80),</div><div class='add'>+		.end	= MMP_GPIO_TO_IRQ(80),</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -93,6 +94,7 @@ static void __init tavorevb_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* on-chip devices */</div><div class='ctx'> 	pxa910_add_uart(1);</div><div class='add'>+	platform_device_register(&amp;pxa910_device_gpio);</div><div class='ctx'> </div><div class='ctx'> 	/* off-chip devices */</div><div class='ctx'> 	platform_device_register(&amp;smc91x_device);</div><div class='hunk'>@@ -103,4 +105,5 @@ MACHINE_START(TAVOREVB, "PXA910 Evaluation Board (aka TavorEVB)")</div><div class='ctx'> 	.init_irq       = pxa910_init_irq,</div><div class='ctx'> 	.timer          = &amp;pxa910_timer,</div><div class='ctx'> 	.init_machine   = tavorevb_init,</div><div class='add'>+	.restart	= mmp_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mmp/teton_bga.c b/arch/arm/mach-mmp/teton_bga.c<br/>index bbe4727b96cc..0523e422990e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/teton_bga.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/teton_bga.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/teton_bga.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/teton_bga.c</a></div><div class='hunk'>@@ -66,7 +66,7 @@ static struct pxa27x_keypad_platform_data teton_bga_keypad_info __initdata = {</div><div class='ctx'> static struct i2c_board_info teton_bga_i2c_info[] __initdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		I2C_BOARD_INFO("ds1337", 0x68),</div><div class='del'>-		.irq = gpio_to_irq(RTC_INT_GPIO)</div><div class='add'>+		.irq = MMP_GPIO_TO_IRQ(RTC_INT_GPIO)</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -78,6 +78,7 @@ static void __init teton_bga_init(void)</div><div class='ctx'> 	pxa168_add_uart(1);</div><div class='ctx'> 	pxa168_add_keypad(&amp;teton_bga_keypad_info);</div><div class='ctx'> 	pxa168_add_twsi(0, NULL, ARRAY_AND_SIZE(teton_bga_i2c_info));</div><div class='add'>+	platform_device_register(&amp;pxa168_device_gpio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform")</div><div class='hunk'>@@ -86,4 +87,5 @@ MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform")</div><div class='ctx'> 	.init_irq       = pxa168_init_irq,</div><div class='ctx'> 	.timer          = &amp;pxa168_timer,</div><div class='ctx'> 	.init_machine   = teton_bga_init,</div><div class='add'>+	.restart	= pxa168_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c<br/>index 4e91ee6e27c8..71fc4ee4602c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/time.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sched_clock.h&gt;</div><div class='ctx'> #include &lt;mach/addr-map.h&gt;</div><div class='hunk'>@@ -42,8 +41,6 @@</div><div class='ctx'> #define MAX_DELTA		(0xfffffffe)</div><div class='ctx'> #define MIN_DELTA		(16)</div><div class='ctx'> </div><div class='del'>-static DEFINE_CLOCK_DATA(cd);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * FIXME: the timer needs some delay to stablize the counter capture</div><div class='ctx'>  */</div><div class='hunk'>@@ -59,16 +56,9 @@ static inline uint32_t timer_read(void)</div><div class='ctx'> 	return __raw_readl(TIMERS_VIRT_BASE + TMR_CVWR(1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned long long notrace sched_clock(void)</div><div class='add'>+static u32 notrace mmp_read_sched_clock(void)</div><div class='ctx'> {</div><div class='del'>-	u32 cyc = timer_read();</div><div class='del'>-	return cyc_to_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void notrace mmp_update_sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	u32 cyc = timer_read();</div><div class='del'>-	update_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='add'>+	return timer_read();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t timer_interrupt(int irq, void *dev_id)</div><div class='hunk'>@@ -201,7 +191,7 @@ void __init timer_init(int irq)</div><div class='ctx'> {</div><div class='ctx'> 	timer_config();</div><div class='ctx'> </div><div class='del'>-	init_sched_clock(&amp;cd, mmp_update_sched_clock, 32, CLOCK_TICK_RATE);</div><div class='add'>+	setup_sched_clock(mmp_read_sched_clock, 32, CLOCK_TICK_RATE);</div><div class='ctx'> </div><div class='ctx'> 	ckevt.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, ckevt.shift);</div><div class='ctx'> 	ckevt.max_delta_ns = clockevent_delta2ns(MAX_DELTA, &amp;ckevt);</div><div class='head'>diff --git a/arch/arm/mach-mmp/ttc_dkb.c b/arch/arm/mach-mmp/ttc_dkb.c<br/>index 176515a76989..5ac5d5832e45 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/ttc_dkb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mmp/ttc_dkb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mmp/ttc_dkb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mmp/ttc_dkb.c</a></div><div class='hunk'>@@ -24,12 +24,13 @@</div><div class='ctx'> #include &lt;mach/addr-map.h&gt;</div><div class='ctx'> #include &lt;mach/mfp-pxa910.h&gt;</div><div class='ctx'> #include &lt;mach/pxa910.h&gt;</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='del'>-#define TTCDKB_GPIO_EXT0(x)	(NR_BUILTIN_GPIO + ((x &lt; 0) ? 0 :	\</div><div class='add'>+#define TTCDKB_GPIO_EXT0(x)	(MMP_NR_BUILTIN_GPIO + ((x &lt; 0) ? 0 :	\</div><div class='ctx'> 				((x &lt; 16) ? x : 15)))</div><div class='del'>-#define TTCDKB_GPIO_EXT1(x)	(NR_BUILTIN_GPIO + 16 + ((x &lt; 0) ? 0 :	\</div><div class='add'>+#define TTCDKB_GPIO_EXT1(x)	(MMP_NR_BUILTIN_GPIO + 16 + ((x &lt; 0) ? 0 : \</div><div class='ctx'> 				((x &lt; 16) ? x : 15)))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -122,6 +123,7 @@ static struct platform_device ttc_dkb_device_onenand = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *ttc_dkb_devices[] = {</div><div class='add'>+	&amp;pxa910_device_gpio,</div><div class='ctx'> 	&amp;ttc_dkb_device_onenand,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -136,7 +138,7 @@ static struct i2c_board_info ttc_dkb_i2c_info[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.type		= "max7312",</div><div class='ctx'> 		.addr		= 0x23,</div><div class='del'>-		.irq		= IRQ_GPIO(80),</div><div class='add'>+		.irq		= MMP_GPIO_TO_IRQ(80),</div><div class='ctx'> 		.platform_data	= &amp;max7312_data,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -159,4 +161,5 @@ MACHINE_START(TTC_DKB, "PXA910-based TTC_DKB Development Platform")</div><div class='ctx'> 	.init_irq       = pxa910_init_irq,</div><div class='ctx'> 	.timer          = &amp;pxa910_timer,</div><div class='ctx'> 	.init_machine   = ttc_dkb_init,</div><div class='add'>+	.restart	= mmp_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig<br/>index ebde97f5d5f0..1cd40ad301d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/Kconfig</a></div><div class='hunk'>@@ -13,7 +13,6 @@ config ARCH_MSM7X00A</div><div class='ctx'> 	select CPU_V6</div><div class='ctx'> 	select GPIO_MSM_V1</div><div class='ctx'> 	select MSM_PROC_COMM</div><div class='del'>-	select HAS_MSM_DEBUG_UART_PHYS</div><div class='ctx'> </div><div class='ctx'> config ARCH_MSM7X30</div><div class='ctx'> 	bool "MSM7x30"</div><div class='hunk'>@@ -25,7 +24,6 @@ config ARCH_MSM7X30</div><div class='ctx'> 	select MSM_GPIOMUX</div><div class='ctx'> 	select GPIO_MSM_V1</div><div class='ctx'> 	select MSM_PROC_COMM</div><div class='del'>-	select HAS_MSM_DEBUG_UART_PHYS</div><div class='ctx'> </div><div class='ctx'> config ARCH_QSD8X50</div><div class='ctx'> 	bool "QSD8X50"</div><div class='hunk'>@@ -37,7 +35,6 @@ config ARCH_QSD8X50</div><div class='ctx'> 	select MSM_GPIOMUX</div><div class='ctx'> 	select GPIO_MSM_V1</div><div class='ctx'> 	select MSM_PROC_COMM</div><div class='del'>-	select HAS_MSM_DEBUG_UART_PHYS</div><div class='ctx'> </div><div class='ctx'> config ARCH_MSM8X60</div><div class='ctx'> 	bool "MSM8X60"</div><div class='hunk'>@@ -63,19 +60,20 @@ config ARCH_MSM8960</div><div class='ctx'> </div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='add'>+config MSM_HAS_DEBUG_UART_HS</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config MSM_SOC_REV_A</div><div class='ctx'> 	bool</div><div class='ctx'> config  ARCH_MSM_SCORPIONMP</div><div class='ctx'> 	bool</div><div class='add'>+	select HAVE_SMP</div><div class='ctx'> </div><div class='ctx'> config  ARCH_MSM_ARM11</div><div class='ctx'> 	bool</div><div class='ctx'> config  ARCH_MSM_SCORPION</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='del'>-config HAS_MSM_DEBUG_UART_PHYS</div><div class='del'>-	bool</div><div class='del'>-</div><div class='ctx'> config  MSM_VIC</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='hunk'>@@ -152,32 +150,6 @@ config MACH_MSM8960_RUMI3</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='del'>-config MSM_DEBUG_UART</div><div class='del'>-	int</div><div class='del'>-	default 1 if MSM_DEBUG_UART1</div><div class='del'>-	default 2 if MSM_DEBUG_UART2</div><div class='del'>-	default 3 if MSM_DEBUG_UART3</div><div class='del'>-</div><div class='del'>-if HAS_MSM_DEBUG_UART_PHYS</div><div class='del'>-choice</div><div class='del'>-	prompt "Debug UART"</div><div class='del'>-</div><div class='del'>-	default MSM_DEBUG_UART_NONE</div><div class='del'>-</div><div class='del'>-	config MSM_DEBUG_UART_NONE</div><div class='del'>-		bool "None"</div><div class='del'>-</div><div class='del'>-	config MSM_DEBUG_UART1</div><div class='del'>-		bool "UART1"</div><div class='del'>-</div><div class='del'>-	config MSM_DEBUG_UART2</div><div class='del'>-		bool "UART2"</div><div class='del'>-</div><div class='del'>-	config MSM_DEBUG_UART3</div><div class='del'>-		bool "UART3"</div><div class='del'>-endchoice</div><div class='del'>-endif</div><div class='del'>-</div><div class='ctx'> config MSM_SMD_PKG3</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-msm/board-msm8960.c b/arch/arm/mach-msm/board-msm8960.c<br/>index 6dc1cbd2a595..ed3598128530 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/board-msm8960.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/board-msm8960.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/board-msm8960.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/board-msm8960.c</a></div><div class='hunk'>@@ -99,6 +99,7 @@ MACHINE_START(MSM8960_SIM, "QCT MSM8960 SIMULATOR")</div><div class='ctx'> 	.map_io = msm8960_map_io,</div><div class='ctx'> 	.init_irq = msm8960_init_irq,</div><div class='ctx'> 	.timer = &amp;msm_timer,</div><div class='add'>+	.handle_irq = gic_handle_irq,</div><div class='ctx'> 	.init_machine = msm8960_sim_init,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='hunk'>@@ -108,6 +109,7 @@ MACHINE_START(MSM8960_RUMI3, "QCT MSM8960 RUMI3")</div><div class='ctx'> 	.map_io = msm8960_map_io,</div><div class='ctx'> 	.init_irq = msm8960_init_irq,</div><div class='ctx'> 	.timer = &amp;msm_timer,</div><div class='add'>+	.handle_irq = gic_handle_irq,</div><div class='ctx'> 	.init_machine = msm8960_rumi3_init,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c<br/>index 44bf71688373..0a113424632c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/board-msm8x60.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/board-msm8x60.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/board-msm8x60.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/board-msm8x60.c</a></div><div class='hunk'>@@ -108,6 +108,7 @@ MACHINE_START(MSM8X60_RUMI3, "QCT MSM8X60 RUMI3")</div><div class='ctx'> 	.reserve = msm8x60_reserve,</div><div class='ctx'> 	.map_io = msm8x60_map_io,</div><div class='ctx'> 	.init_irq = msm8x60_init_irq,</div><div class='add'>+	.handle_irq = gic_handle_irq,</div><div class='ctx'> 	.init_machine = msm8x60_init,</div><div class='ctx'> 	.timer = &amp;msm_timer,</div><div class='ctx'> MACHINE_END</div><div class='hunk'>@@ -117,6 +118,7 @@ MACHINE_START(MSM8X60_SURF, "QCT MSM8X60 SURF")</div><div class='ctx'> 	.reserve = msm8x60_reserve,</div><div class='ctx'> 	.map_io = msm8x60_map_io,</div><div class='ctx'> 	.init_irq = msm8x60_init_irq,</div><div class='add'>+	.handle_irq = gic_handle_irq,</div><div class='ctx'> 	.init_machine = msm8x60_init,</div><div class='ctx'> 	.timer = &amp;msm_timer,</div><div class='ctx'> MACHINE_END</div><div class='hunk'>@@ -126,6 +128,7 @@ MACHINE_START(MSM8X60_SIM, "QCT MSM8X60 SIMULATOR")</div><div class='ctx'> 	.reserve = msm8x60_reserve,</div><div class='ctx'> 	.map_io = msm8x60_map_io,</div><div class='ctx'> 	.init_irq = msm8x60_init_irq,</div><div class='add'>+	.handle_irq = gic_handle_irq,</div><div class='ctx'> 	.init_machine = msm8x60_init,</div><div class='ctx'> 	.timer = &amp;msm_timer,</div><div class='ctx'> MACHINE_END</div><div class='hunk'>@@ -135,6 +138,7 @@ MACHINE_START(MSM8X60_FFA, "QCT MSM8X60 FFA")</div><div class='ctx'> 	.reserve = msm8x60_reserve,</div><div class='ctx'> 	.map_io = msm8x60_map_io,</div><div class='ctx'> 	.init_irq = msm8x60_init_irq,</div><div class='add'>+	.handle_irq = gic_handle_irq,</div><div class='ctx'> 	.init_machine = msm8x60_init,</div><div class='ctx'> 	.timer = &amp;msm_timer,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-msm/board-sapphire.c b/arch/arm/mach-msm/board-sapphire.c<br/>index 32b465763dbd..97b8191d9d38 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/board-sapphire.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/board-sapphire.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/board-sapphire.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/board-sapphire.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/input.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='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-msm/headsmp.S b/arch/arm/mach-msm/headsmp.S<br/>index 0c631a9f8647..bcd5af223dea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/headsmp.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/headsmp.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/headsmp.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/headsmp.S</a></div><div class='hunk'>@@ -34,6 +34,7 @@ pen:	ldr	r7, [r6]</div><div class='ctx'> 	 * should now contain the SVC stack for this core</div><div class='ctx'> 	 */</div><div class='ctx'> 	b	secondary_startup</div><div class='add'>+ENDPROC(msm_secondary_startup)</div><div class='ctx'> </div><div class='ctx'> 	.align</div><div class='ctx'> 1:	.long	.</div><div class='head'>diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S<br/>index 2dc73ccddb11..3ffd8668c9a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/debug-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/debug-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='del'>-/* arch/arm/mach-msm7200/include/mach/debug-macro.S</div><div class='add'>+/*</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Google, Inc.</div><div class='add'>+ * Copyright (c) 2011, Code Aurora Forum. All rights reserved.</div><div class='ctx'>  * Author: Brian Swetland &lt;swetland@google.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This software is licensed under the terms of the GNU General Public</div><div class='hunk'>@@ -14,40 +15,52 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/msm_iomap.h&gt;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_HAS_MSM_DEBUG_UART_PHYS) &amp;&amp; !defined(CONFIG_MSM_DEBUG_UART_NONE)</div><div class='ctx'> 	.macro	addruart, rp, rv, tmp</div><div class='add'>+#ifdef MSM_DEBUG_UART_PHYS</div><div class='ctx'> 	ldr	\rp, =MSM_DEBUG_UART_PHYS</div><div class='ctx'> 	ldr	\rv, =MSM_DEBUG_UART_BASE</div><div class='add'>+#endif</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro	senduart,rd,rx</div><div class='add'>+	.macro	senduart, rd, rx</div><div class='add'>+#ifdef CONFIG_MSM_HAS_DEBUG_UART_HS</div><div class='add'>+	@ Write the 1 character to UARTDM_TF</div><div class='add'>+	str	\rd, [\rx, #0x70]</div><div class='add'>+#else</div><div class='ctx'> 	teq	\rx, #0</div><div class='ctx'> 	strne	\rd, [\rx, #0x0C]</div><div class='add'>+#endif</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro	waituart,rd,rx</div><div class='add'>+	.macro	waituart, rd, rx</div><div class='add'>+#ifdef CONFIG_MSM_HAS_DEBUG_UART_HS</div><div class='add'>+	@ check for TX_EMT in UARTDM_SR</div><div class='add'>+	ldr	\rd, [\rx, #0x08]</div><div class='add'>+	tst	\rd, #0x08</div><div class='add'>+	bne	1002f</div><div class='add'>+	@ wait for TXREADY in UARTDM_ISR</div><div class='add'>+1001:	ldr	\rd, [\rx, #0x14]</div><div class='add'>+	tst	\rd, #0x80</div><div class='add'>+	beq 	1001b</div><div class='add'>+1002:</div><div class='add'>+	@ Clear TX_READY by writing to the UARTDM_CR register</div><div class='add'>+	mov	\rd, #0x300</div><div class='add'>+	str	\rd, [\rx, #0x10]</div><div class='add'>+	@ Write 0x1 to NCF register</div><div class='add'>+	mov 	\rd, #0x1</div><div class='add'>+	str	\rd, [\rx, #0x40]</div><div class='add'>+	@ UARTDM reg. Read to induce delay</div><div class='add'>+	ldr	\rd, [\rx, #0x08]</div><div class='add'>+#else</div><div class='ctx'> 	@ wait for TX_READY</div><div class='ctx'> 1001:	ldr	\rd, [\rx, #0x08]</div><div class='ctx'> 	tst	\rd, #0x04</div><div class='ctx'> 	beq	1001b</div><div class='del'>-	.endm</div><div class='del'>-#else</div><div class='del'>-	.macro  addruart, rp, rv, tmp</div><div class='del'>-	mov	\rv, #0xff000000</div><div class='del'>-	orr	\rv, \rv, #0x00f00000</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro	senduart,rd,rx</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro	waituart,rd,rx</div><div class='del'>-	.endm</div><div class='ctx'> #endif</div><div class='add'>+	.endm</div><div class='ctx'> </div><div class='del'>-	.macro	busyuart,rd,rx</div><div class='add'>+	.macro	busyuart, rd, rx</div><div class='ctx'> 	.endm</div><div class='head'>diff --git a/arch/arm/mach-msm/include/mach/entry-macro-qgic.S b/arch/arm/mach-msm/include/mach/entry-macro-qgic.S<br/>deleted file mode 100644<br/>index 717076f3ca73..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/entry-macro-qgic.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/entry-macro-qgic.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,17 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Low-level IRQ helper macros</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010, Code Aurora Forum. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This file is licensed under  the terms of the GNU General Public</div><div class='del'>- * License version 2. This program is licensed "as is" without any</div><div class='del'>- * warranty of any kind, whether express or implied.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm/hardware/entry-macro-gic.S&gt;</div><div class='del'>-</div><div class='del'>-	.macro	disable_fiq</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro  arch_ret_to_user, tmp1, tmp2</div><div class='del'>-	.endm</div><div class='head'>diff --git a/arch/arm/mach-msm/include/mach/entry-macro-vic.S b/arch/arm/mach-msm/include/mach/entry-macro-vic.S<br/>deleted file mode 100644<br/>index 70563ed11b36..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/entry-macro-vic.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/entry-macro-vic.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,37 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2007 Google, Inc.</div><div class='del'>- * Author: Brian Swetland &lt;swetland@google.com&gt;</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='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;mach/msm_iomap.h&gt;</div><div class='del'>-</div><div class='del'>-	.macro	disable_fiq</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro	get_irqnr_preamble, base, tmp</div><div class='del'>-	@ enable imprecise aborts</div><div class='del'>-	cpsie	a</div><div class='del'>-	mov	\base, #MSM_VIC_BASE</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro	arch_ret_to_user, tmp1, tmp2</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-	@ 0xD0 has irq# or old irq# if the irq has been handled</div><div class='del'>-	@ 0xD4 has irq# or -1 if none pending *but* if you just</div><div class='del'>-	@ read 0xD4 you never get the first irq for some reason</div><div class='del'>-	ldr	\irqnr, [\base, #0xD0]</div><div class='del'>-	ldr	\irqnr, [\base, #0xD4]</div><div class='del'>-	cmp	\irqnr, #0xffffffff</div><div class='del'>-	.endm</div><div class='head'>diff --git a/arch/arm/mach-msm/include/mach/entry-macro.S b/arch/arm/mach-msm/include/mach/entry-macro.S<br/>index b16f082eeb6f..41f7003ef34f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -16,8 +16,27 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_ARM_GIC)</div><div class='del'>-#include &lt;mach/entry-macro-qgic.S&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;mach/entry-macro-vic.S&gt;</div><div class='add'>+	.macro	disable_fiq</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro	arch_ret_to_user, tmp1, tmp2</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+#if !defined(CONFIG_ARM_GIC)</div><div class='add'>+#include &lt;mach/msm_iomap.h&gt;</div><div class='add'>+</div><div class='add'>+	.macro	get_irqnr_preamble, base, tmp</div><div class='add'>+	@ enable imprecise aborts</div><div class='add'>+	cpsie	a</div><div class='add'>+	mov	\base, #MSM_VIC_BASE</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='add'>+	@ 0xD0 has irq# or old irq# if the irq has been handled</div><div class='add'>+	@ 0xD4 has irq# or -1 if none pending *but* if you just</div><div class='add'>+	@ read 0xD4 you never get the first irq for some reason</div><div class='add'>+	ldr	\irqnr, [\base, #0xD0]</div><div class='add'>+	ldr	\irqnr, [\base, #0xD4]</div><div class='add'>+	cmp	\irqnr, #0xffffffff</div><div class='add'>+	.endm</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h b/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h<br/>index 94fe9fe6feb3..8af46123dab6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/msm_iomap-7x00.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/include/mach/msm_iomap-7x00.h</a></div><div class='hunk'>@@ -78,18 +78,6 @@</div><div class='ctx'> #define MSM_UART3_PHYS        0xA9C00000</div><div class='ctx'> #define MSM_UART3_SIZE        SZ_4K</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MSM_DEBUG_UART</div><div class='del'>-#define MSM_DEBUG_UART_BASE   0xE1000000</div><div class='del'>-#if CONFIG_MSM_DEBUG_UART == 1</div><div class='del'>-#define MSM_DEBUG_UART_PHYS   MSM_UART1_PHYS</div><div class='del'>-#elif CONFIG_MSM_DEBUG_UART == 2</div><div class='del'>-#define MSM_DEBUG_UART_PHYS   MSM_UART2_PHYS</div><div class='del'>-#elif CONFIG_MSM_DEBUG_UART == 3</div><div class='del'>-#define MSM_DEBUG_UART_PHYS   MSM_UART3_PHYS</div><div class='del'>-#endif</div><div class='del'>-#define MSM_DEBUG_UART_SIZE   SZ_4K</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #define MSM_SDC1_PHYS         0xA0400000</div><div class='ctx'> #define MSM_SDC1_SIZE         SZ_4K</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h<br/>index 37694442d1bd..198202c267c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/msm_iomap-7x30.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/include/mach/msm_iomap-7x30.h</a></div><div class='hunk'>@@ -89,18 +89,6 @@</div><div class='ctx'> #define MSM_UART3_PHYS        0xACC00000</div><div class='ctx'> #define MSM_UART3_SIZE        SZ_4K</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MSM_DEBUG_UART</div><div class='del'>-#define MSM_DEBUG_UART_BASE   0xE1000000</div><div class='del'>-#if CONFIG_MSM_DEBUG_UART == 1</div><div class='del'>-#define MSM_DEBUG_UART_PHYS   MSM_UART1_PHYS</div><div class='del'>-#elif CONFIG_MSM_DEBUG_UART == 2</div><div class='del'>-#define MSM_DEBUG_UART_PHYS   MSM_UART2_PHYS</div><div class='del'>-#elif CONFIG_MSM_DEBUG_UART == 3</div><div class='del'>-#define MSM_DEBUG_UART_PHYS   MSM_UART3_PHYS</div><div class='del'>-#endif</div><div class='del'>-#define MSM_DEBUG_UART_SIZE   SZ_4K</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #define MSM_MDC_BASE	      IOMEM(0xE0200000)</div><div class='ctx'> #define MSM_MDC_PHYS	      0xAA500000</div><div class='ctx'> #define MSM_MDC_SIZE	      SZ_1M</div><div class='head'>diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8960.h b/arch/arm/mach-msm/include/mach/msm_iomap-8960.h<br/>index 3c9d9602a318..800b55767e6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/msm_iomap-8960.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/msm_iomap-8960.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/msm_iomap-8960.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/include/mach/msm_iomap-8960.h</a></div><div class='hunk'>@@ -45,4 +45,9 @@</div><div class='ctx'> #define MSM8960_TMR0_PHYS	0x0208A000</div><div class='ctx'> #define MSM8960_TMR0_SIZE	SZ_4K</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_MSM8960_UART</div><div class='add'>+#define MSM_DEBUG_UART_BASE	0xE1040000</div><div class='add'>+#define MSM_DEBUG_UART_PHYS	0x16440000</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h<br/>index d67cd73316f4..0faa894729b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/msm_iomap-8x50.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/include/mach/msm_iomap-8x50.h</a></div><div class='hunk'>@@ -83,18 +83,6 @@</div><div class='ctx'> #define MSM_UART3_PHYS        0xA9C00000</div><div class='ctx'> #define MSM_UART3_SIZE        SZ_4K</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MSM_DEBUG_UART</div><div class='del'>-#define MSM_DEBUG_UART_BASE   0xE1000000</div><div class='del'>-#if CONFIG_MSM_DEBUG_UART == 1</div><div class='del'>-#define MSM_DEBUG_UART_PHYS   MSM_UART1_PHYS</div><div class='del'>-#elif CONFIG_MSM_DEBUG_UART == 2</div><div class='del'>-#define MSM_DEBUG_UART_PHYS   MSM_UART2_PHYS</div><div class='del'>-#elif CONFIG_MSM_DEBUG_UART == 3</div><div class='del'>-#define MSM_DEBUG_UART_PHYS   MSM_UART3_PHYS</div><div class='del'>-#endif</div><div class='del'>-#define MSM_DEBUG_UART_SIZE   SZ_4K</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #define MSM_MDC_BASE	      IOMEM(0xE0200000)</div><div class='ctx'> #define MSM_MDC_PHYS	      0xAA500000</div><div class='ctx'> #define MSM_MDC_SIZE	      SZ_1M</div><div class='head'>diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h<br/>index 3b19b8f244b8..54e12caa8d86 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/msm_iomap-8x60.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/include/mach/msm_iomap-8x60.h</a></div><div class='hunk'>@@ -62,4 +62,9 @@</div><div class='ctx'> #define MSM8X60_TMR0_PHYS	0x02040000</div><div class='ctx'> #define MSM8X60_TMR0_SIZE	SZ_4K</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_MSM8660_UART</div><div class='add'>+#define MSM_DEBUG_UART_BASE	0xE1040000</div><div class='add'>+#define MSM_DEBUG_UART_PHYS	0x19C40000</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h<br/>index 4ded15238b60..90682f4599d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/msm_iomap.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/msm_iomap.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/msm_iomap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/include/mach/msm_iomap.h</a></div><div class='hunk'>@@ -55,6 +55,18 @@</div><div class='ctx'> </div><div class='ctx'> #include "msm_iomap-8960.h"</div><div class='ctx'> </div><div class='add'>+#define MSM_DEBUG_UART_SIZE	SZ_4K</div><div class='add'>+#if defined(CONFIG_DEBUG_MSM_UART1)</div><div class='add'>+#define MSM_DEBUG_UART_BASE	0xE1000000</div><div class='add'>+#define MSM_DEBUG_UART_PHYS	MSM_UART1_PHYS</div><div class='add'>+#elif defined(CONFIG_DEBUG_MSM_UART2)</div><div class='add'>+#define MSM_DEBUG_UART_BASE	0xE1000000</div><div class='add'>+#define MSM_DEBUG_UART_PHYS	MSM_UART2_PHYS</div><div class='add'>+#elif defined(CONFIG_DEBUG_MSM_UART3)</div><div class='add'>+#define MSM_DEBUG_UART_BASE	0xE1000000</div><div class='add'>+#define MSM_DEBUG_UART_PHYS	MSM_UART3_PHYS</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Virtual addresses shared across all MSM targets. */</div><div class='ctx'> #define MSM_CSR_BASE		IOMEM(0xE0001000)</div><div class='ctx'> #define MSM_QGIC_DIST_BASE	IOMEM(0xF0000000)</div><div class='head'>diff --git a/arch/arm/mach-msm/include/mach/system.h b/arch/arm/mach-msm/include/mach/system.h<br/>index d2e83f42ba16..311db2b35da0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/include/mach/system.h</a></div><div class='hunk'>@@ -12,16 +12,8 @@</div><div class='ctx'>  * GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-</div><div class='ctx'> void arch_idle(void);</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	for (;;) ;  /* depends on IPC w/ other core */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* low level hardware reset hook -- for example, hitting the</div><div class='ctx'>  * PSHOLD line on the PMIC to hard reset the system</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/arm/mach-msm/include/mach/uncompress.h b/arch/arm/mach-msm/include/mach/uncompress.h<br/>index d94292c29d8e..169a84007456 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/uncompress.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/uncompress.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/include/mach/uncompress.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='del'>-/* arch/arm/mach-msm/include/mach/uncompress.h</div><div class='del'>- *</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2007 Google, Inc.</div><div class='add'>+ * Copyright (c) 2011, Code Aurora Forum. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2, as published by the Free Software Foundation, and</div><div class='hunk'>@@ -14,17 +14,40 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASM_ARCH_MSM_UNCOMPRESS_H</div><div class='add'>+#define __ASM_ARCH_MSM_UNCOMPRESS_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='add'>+#include &lt;mach/msm_iomap.h&gt;</div><div class='add'>+</div><div class='add'>+#define UART_CSR      (*(volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x08))</div><div class='add'>+#define UART_TF       (*(volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x0c))</div><div class='ctx'> </div><div class='del'>-#include "hardware.h"</div><div class='del'>-#include "linux/io.h"</div><div class='del'>-#include "mach/msm_iomap.h"</div><div class='add'>+#define UART_DM_SR    (*((volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x08)))</div><div class='add'>+#define UART_DM_CR    (*((volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x10)))</div><div class='add'>+#define UART_DM_ISR   (*((volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x14)))</div><div class='add'>+#define UART_DM_NCHAR (*((volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x40)))</div><div class='add'>+#define UART_DM_TF    (*((volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x70)))</div><div class='ctx'> </div><div class='ctx'> static void putc(int c)</div><div class='ctx'> {</div><div class='ctx'> #if defined(MSM_DEBUG_UART_PHYS)</div><div class='del'>-	unsigned base = MSM_DEBUG_UART_PHYS;</div><div class='del'>-	while (!(readl(base + 0x08) &amp; 0x04)) ;</div><div class='del'>-	writel(c, base + 0x0c);</div><div class='add'>+#ifdef CONFIG_MSM_HAS_DEBUG_UART_HS</div><div class='add'>+	/*</div><div class='add'>+	 * Wait for TX_READY to be set; but skip it if we have a</div><div class='add'>+	 * TX underrun.</div><div class='add'>+	 */</div><div class='add'>+	if (UART_DM_SR &amp; 0x08)</div><div class='add'>+		while (!(UART_DM_ISR &amp; 0x80))</div><div class='add'>+			cpu_relax();</div><div class='add'>+</div><div class='add'>+	UART_DM_CR = 0x300;</div><div class='add'>+	UART_DM_NCHAR = 0x1;</div><div class='add'>+	UART_DM_TF = c;</div><div class='add'>+#else</div><div class='add'>+	while (!(UART_CSR &amp; 0x04))</div><div class='add'>+		cpu_relax();</div><div class='add'>+	UART_TF = c;</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c<br/>index 8759ecf7454f..578b04e42deb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/io.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/io.c</a></div><div class='hunk'>@@ -47,7 +47,8 @@ static struct map_desc msm_io_desc[] __initdata = {</div><div class='ctx'> 	MSM_CHIP_DEVICE(GPIO1, MSM7X00),</div><div class='ctx'> 	MSM_CHIP_DEVICE(GPIO2, MSM7X00),</div><div class='ctx'> 	MSM_DEVICE(CLK_CTL),</div><div class='del'>-#ifdef CONFIG_MSM_DEBUG_UART</div><div class='add'>+#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \</div><div class='add'>+	defined(CONFIG_DEBUG_MSM_UART3)</div><div class='ctx'> 	MSM_DEVICE(DEBUG_UART),</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_ARCH_MSM7X30</div><div class='hunk'>@@ -84,7 +85,8 @@ static struct map_desc qsd8x50_io_desc[] __initdata = {</div><div class='ctx'> 	MSM_DEVICE(SCPLL),</div><div class='ctx'> 	MSM_DEVICE(AD5),</div><div class='ctx'> 	MSM_DEVICE(MDC),</div><div class='del'>-#ifdef CONFIG_MSM_DEBUG_UART</div><div class='add'>+#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \</div><div class='add'>+	defined(CONFIG_DEBUG_MSM_UART3)</div><div class='ctx'> 	MSM_DEVICE(DEBUG_UART),</div><div class='ctx'> #endif</div><div class='ctx'> 	{</div><div class='hunk'>@@ -109,6 +111,9 @@ static struct map_desc msm8x60_io_desc[] __initdata = {</div><div class='ctx'> 	MSM_CHIP_DEVICE(TMR0, MSM8X60),</div><div class='ctx'> 	MSM_DEVICE(ACC),</div><div class='ctx'> 	MSM_DEVICE(GCC),</div><div class='add'>+#ifdef CONFIG_DEBUG_MSM8660_UART</div><div class='add'>+	MSM_DEVICE(DEBUG_UART),</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init msm_map_msm8x60_io(void)</div><div class='hunk'>@@ -123,6 +128,9 @@ static struct map_desc msm8960_io_desc[] __initdata = {</div><div class='ctx'> 	MSM_CHIP_DEVICE(QGIC_CPU, MSM8960),</div><div class='ctx'> 	MSM_CHIP_DEVICE(TMR, MSM8960),</div><div class='ctx'> 	MSM_CHIP_DEVICE(TMR0, MSM8960),</div><div class='add'>+#ifdef CONFIG_DEBUG_MSM8960_UART</div><div class='add'>+	MSM_DEVICE(DEBUG_UART),</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init msm_map_msm8960_io(void)</div><div class='hunk'>@@ -146,7 +154,8 @@ static struct map_desc msm7x30_io_desc[] __initdata = {</div><div class='ctx'> 	MSM_DEVICE(SAW),</div><div class='ctx'> 	MSM_DEVICE(GCC),</div><div class='ctx'> 	MSM_DEVICE(TCSR),</div><div class='del'>-#ifdef CONFIG_MSM_DEBUG_UART</div><div class='add'>+#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \</div><div class='add'>+	defined(CONFIG_DEBUG_MSM_UART3)</div><div class='ctx'> 	MSM_DEVICE(DEBUG_UART),</div><div class='ctx'> #endif</div><div class='ctx'> 	{</div><div class='head'>diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c<br/>index fdec58aaa35c..0b3e357c4c8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/platsmp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/platsmp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/platsmp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/platsmp.c</a></div><div class='hunk'>@@ -79,7 +79,7 @@ static __cpuinit void prepare_cold_cpu(unsigned int cpu)</div><div class='ctx'> 	ret = scm_set_boot_addr(virt_to_phys(msm_secondary_startup),</div><div class='ctx'> 				SCM_FLAG_COLDBOOT_CPU1);</div><div class='ctx'> 	if (ret == 0) {</div><div class='del'>-		void *sc1_base_ptr;</div><div class='add'>+		void __iomem *sc1_base_ptr;</div><div class='ctx'> 		sc1_base_ptr = ioremap_nocache(0x00902000, SZ_4K*2);</div><div class='ctx'> 		if (sc1_base_ptr) {</div><div class='ctx'> 			writel(0, sc1_base_ptr + VDD_SC1_ARRAY_CLAMP_GFS_CTL);</div><div class='head'>diff --git a/arch/arm/mach-msm/smd_debug.c b/arch/arm/mach-msm/smd_debug.c<br/>index 8736afff82f3..0c56a5aaf588 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/smd_debug.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/smd_debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/smd_debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/smd_debug.c</a></div><div class='hunk'>@@ -215,7 +215,7 @@ static const struct file_operations debug_ops = {</div><div class='ctx'> 	.llseek = default_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void debug_create(const char *name, mode_t mode,</div><div class='add'>+static void debug_create(const char *name, umode_t mode,</div><div class='ctx'> 			 struct dentry *dent,</div><div class='ctx'> 			 int (*fill)(char *buf, int max))</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c<br/>index afeeca52fc66..11d0d8f2656c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/timer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/timer.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='del'>-/* linux/arch/arm/mach-msm/timer.c</div><div class='add'>+/*</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Google, Inc.</div><div class='add'>+ * Copyright (c) 2009-2011, Code Aurora Forum. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2, as published by the Free Software Foundation, and</div><div class='hunk'>@@ -13,306 +14,207 @@</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='add'>+#include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/time.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='del'>-#include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/clockchips.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/gic.h&gt;</div><div class='add'>+#include &lt;asm/localtimer.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/msm_iomap.h&gt;</div><div class='ctx'> #include &lt;mach/cpu.h&gt;</div><div class='add'>+#include &lt;mach/board.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define TIMER_MATCH_VAL         0x0000</div><div class='ctx'> #define TIMER_COUNT_VAL         0x0004</div><div class='ctx'> #define TIMER_ENABLE            0x0008</div><div class='del'>-#define TIMER_ENABLE_CLR_ON_MATCH_EN    2</div><div class='del'>-#define TIMER_ENABLE_EN                 1</div><div class='add'>+#define TIMER_ENABLE_CLR_ON_MATCH_EN    BIT(1)</div><div class='add'>+#define TIMER_ENABLE_EN                 BIT(0)</div><div class='ctx'> #define TIMER_CLEAR             0x000C</div><div class='ctx'> #define DGT_CLK_CTL             0x0034</div><div class='del'>-enum {</div><div class='del'>-	DGT_CLK_CTL_DIV_1 = 0,</div><div class='del'>-	DGT_CLK_CTL_DIV_2 = 1,</div><div class='del'>-	DGT_CLK_CTL_DIV_3 = 2,</div><div class='del'>-	DGT_CLK_CTL_DIV_4 = 3,</div><div class='del'>-};</div><div class='del'>-#define CSR_PROTECTION          0x0020</div><div class='del'>-#define CSR_PROTECTION_EN               1</div><div class='add'>+#define DGT_CLK_CTL_DIV_4	0x3</div><div class='ctx'> </div><div class='ctx'> #define GPT_HZ 32768</div><div class='ctx'> </div><div class='del'>-enum timer_location {</div><div class='del'>-	LOCAL_TIMER = 0,</div><div class='del'>-	GLOBAL_TIMER = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define MSM_GLOBAL_TIMER MSM_CLOCK_DGT</div><div class='del'>-</div><div class='del'>-/* TODO: Remove these ifdefs */</div><div class='del'>-#if defined(CONFIG_ARCH_QSD8X50)</div><div class='del'>-#define DGT_HZ (19200000 / 4) /* 19.2 MHz / 4 by default */</div><div class='del'>-#define MSM_DGT_SHIFT (0)</div><div class='del'>-#elif defined(CONFIG_ARCH_MSM7X30)</div><div class='del'>-#define DGT_HZ (24576000 / 4) /* 24.576 MHz (LPXO) / 4 by default */</div><div class='del'>-#define MSM_DGT_SHIFT (0)</div><div class='del'>-#elif defined(CONFIG_ARCH_MSM8X60) || defined(CONFIG_ARCH_MSM8960)</div><div class='del'>-#define DGT_HZ (27000000 / 4) /* 27 MHz (PXO) / 4 by default */</div><div class='del'>-#define MSM_DGT_SHIFT (0)</div><div class='del'>-#else</div><div class='del'>-#define DGT_HZ 19200000 /* 19.2 MHz or 600 KHz after shift */</div><div class='del'>-#define MSM_DGT_SHIFT (5)</div><div class='del'>-#endif</div><div class='add'>+#define MSM_DGT_SHIFT 5</div><div class='ctx'> </div><div class='del'>-struct msm_clock {</div><div class='del'>-	struct clock_event_device   clockevent;</div><div class='del'>-	struct clocksource          clocksource;</div><div class='del'>-	unsigned int		    irq;</div><div class='del'>-	void __iomem                *regbase;</div><div class='del'>-	uint32_t                    freq;</div><div class='del'>-	uint32_t                    shift;</div><div class='del'>-	void __iomem                *global_counter;</div><div class='del'>-	void __iomem                *local_counter;</div><div class='del'>-	union {</div><div class='del'>-		struct clock_event_device		*evt;</div><div class='del'>-		struct clock_event_device __percpu	**percpu_evt;</div><div class='del'>-	};		</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	MSM_CLOCK_GPT,</div><div class='del'>-	MSM_CLOCK_DGT,</div><div class='del'>-	NR_TIMERS,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct msm_clock msm_clocks[];</div><div class='add'>+static void __iomem *event_base;</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t msm_timer_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct clock_event_device *evt = *(struct clock_event_device **)dev_id;</div><div class='del'>-	if (evt-&gt;event_handler == NULL)</div><div class='del'>-		return IRQ_HANDLED;</div><div class='add'>+	/* Stop the timer tick */</div><div class='add'>+	if (evt-&gt;mode == CLOCK_EVT_MODE_ONESHOT) {</div><div class='add'>+		u32 ctrl = readl_relaxed(event_base + TIMER_ENABLE);</div><div class='add'>+		ctrl &amp;= ~TIMER_ENABLE_EN;</div><div class='add'>+		writel_relaxed(ctrl, event_base + TIMER_ENABLE);</div><div class='add'>+	}</div><div class='ctx'> 	evt-&gt;event_handler(evt);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static cycle_t msm_read_timer_count(struct clocksource *cs)</div><div class='del'>-{</div><div class='del'>-	struct msm_clock *clk = container_of(cs, struct msm_clock, clocksource);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Shift timer count down by a constant due to unreliable lower bits</div><div class='del'>-	 * on some targets.</div><div class='del'>-	 */</div><div class='del'>-	return readl(clk-&gt;global_counter) &gt;&gt; clk-&gt;shift;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct msm_clock *clockevent_to_clock(struct clock_event_device *evt)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; NR_TIMERS; i++)</div><div class='del'>-		if (evt == &amp;(msm_clocks[i].clockevent))</div><div class='del'>-			return &amp;msm_clocks[i];</div><div class='del'>-	return &amp;msm_clocks[MSM_GLOBAL_TIMER];</div><div class='del'>-#else</div><div class='del'>-	return container_of(evt, struct msm_clock, clockevent);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int msm_timer_set_next_event(unsigned long cycles,</div><div class='ctx'> 				    struct clock_event_device *evt)</div><div class='ctx'> {</div><div class='del'>-	struct msm_clock *clock = clockevent_to_clock(evt);</div><div class='del'>-	uint32_t now = readl(clock-&gt;local_counter);</div><div class='del'>-	uint32_t alarm = now + (cycles &lt;&lt; clock-&gt;shift);</div><div class='add'>+	u32 ctrl = readl_relaxed(event_base + TIMER_ENABLE);</div><div class='ctx'> </div><div class='del'>-	writel(alarm, clock-&gt;regbase + TIMER_MATCH_VAL);</div><div class='add'>+	writel_relaxed(0, event_base + TIMER_CLEAR);</div><div class='add'>+	writel_relaxed(cycles, event_base + TIMER_MATCH_VAL);</div><div class='add'>+	writel_relaxed(ctrl | TIMER_ENABLE_EN, event_base + TIMER_ENABLE);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void msm_timer_set_mode(enum clock_event_mode mode,</div><div class='ctx'> 			      struct clock_event_device *evt)</div><div class='ctx'> {</div><div class='del'>-	struct msm_clock *clock = clockevent_to_clock(evt);</div><div class='add'>+	u32 ctrl;</div><div class='add'>+</div><div class='add'>+	ctrl = readl_relaxed(event_base + TIMER_ENABLE);</div><div class='add'>+	ctrl &amp;= ~(TIMER_ENABLE_EN | TIMER_ENABLE_CLR_ON_MATCH_EN);</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case CLOCK_EVT_MODE_RESUME:</div><div class='ctx'> 	case CLOCK_EVT_MODE_PERIODIC:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CLOCK_EVT_MODE_ONESHOT:</div><div class='del'>-		writel(TIMER_ENABLE_EN, clock-&gt;regbase + TIMER_ENABLE);</div><div class='add'>+		/* Timer is enabled in set_next_event */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CLOCK_EVT_MODE_UNUSED:</div><div class='ctx'> 	case CLOCK_EVT_MODE_SHUTDOWN:</div><div class='del'>-		writel(0, clock-&gt;regbase + TIMER_ENABLE);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	writel_relaxed(ctrl, event_base + TIMER_ENABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct msm_clock msm_clocks[] = {</div><div class='del'>-	[MSM_CLOCK_GPT] = {</div><div class='del'>-		.clockevent = {</div><div class='del'>-			.name           = "gp_timer",</div><div class='del'>-			.features       = CLOCK_EVT_FEAT_ONESHOT,</div><div class='del'>-			.shift          = 32,</div><div class='del'>-			.rating         = 200,</div><div class='del'>-			.set_next_event = msm_timer_set_next_event,</div><div class='del'>-			.set_mode       = msm_timer_set_mode,</div><div class='del'>-		},</div><div class='del'>-		.clocksource = {</div><div class='del'>-			.name           = "gp_timer",</div><div class='del'>-			.rating         = 200,</div><div class='del'>-			.read           = msm_read_timer_count,</div><div class='del'>-			.mask           = CLOCKSOURCE_MASK(32),</div><div class='del'>-			.flags          = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='del'>-		},</div><div class='del'>-		.irq = INT_GP_TIMER_EXP,</div><div class='del'>-		.freq = GPT_HZ,</div><div class='del'>-	},</div><div class='del'>-	[MSM_CLOCK_DGT] = {</div><div class='del'>-		.clockevent = {</div><div class='del'>-			.name           = "dg_timer",</div><div class='del'>-			.features       = CLOCK_EVT_FEAT_ONESHOT,</div><div class='del'>-			.shift          = 32 + MSM_DGT_SHIFT,</div><div class='del'>-			.rating         = 300,</div><div class='del'>-			.set_next_event = msm_timer_set_next_event,</div><div class='del'>-			.set_mode       = msm_timer_set_mode,</div><div class='del'>-		},</div><div class='del'>-		.clocksource = {</div><div class='del'>-			.name           = "dg_timer",</div><div class='del'>-			.rating         = 300,</div><div class='del'>-			.read           = msm_read_timer_count,</div><div class='del'>-			.mask           = CLOCKSOURCE_MASK((32 - MSM_DGT_SHIFT)),</div><div class='del'>-			.flags          = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='del'>-		},</div><div class='del'>-		.irq = INT_DEBUG_TIMER_EXP,</div><div class='del'>-		.freq = DGT_HZ &gt;&gt; MSM_DGT_SHIFT,</div><div class='del'>-		.shift = MSM_DGT_SHIFT,</div><div class='del'>-	}</div><div class='add'>+static struct clock_event_device msm_clockevent = {</div><div class='add'>+	.name		= "gp_timer",</div><div class='add'>+	.features	= CLOCK_EVT_FEAT_ONESHOT,</div><div class='add'>+	.rating		= 200,</div><div class='add'>+	.set_next_event	= msm_timer_set_next_event,</div><div class='add'>+	.set_mode	= msm_timer_set_mode,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static union {</div><div class='add'>+	struct clock_event_device *evt;</div><div class='add'>+	struct clock_event_device __percpu **percpu_evt;</div><div class='add'>+} msm_evt;</div><div class='add'>+</div><div class='add'>+static void __iomem *source_base;</div><div class='add'>+</div><div class='add'>+static cycle_t msm_read_timer_count(struct clocksource *cs)</div><div class='add'>+{</div><div class='add'>+	return readl_relaxed(source_base + TIMER_COUNT_VAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static cycle_t msm_read_timer_count_shift(struct clocksource *cs)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Shift timer count down by a constant due to unreliable lower bits</div><div class='add'>+	 * on some targets.</div><div class='add'>+	 */</div><div class='add'>+	return msm_read_timer_count(cs) &gt;&gt; MSM_DGT_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clocksource msm_clocksource = {</div><div class='add'>+	.name	= "dg_timer",</div><div class='add'>+	.rating	= 300,</div><div class='add'>+	.read	= msm_read_timer_count,</div><div class='add'>+	.mask	= CLOCKSOURCE_MASK(32),</div><div class='add'>+	.flags	= CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init msm_timer_init(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	struct clock_event_device *ce = &amp;msm_clockevent;</div><div class='add'>+	struct clocksource *cs = &amp;msm_clocksource;</div><div class='ctx'> 	int res;</div><div class='del'>-	int global_offset = 0;</div><div class='add'>+	u32 dgt_hz;</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_is_msm7x01()) {</div><div class='del'>-		msm_clocks[MSM_CLOCK_GPT].regbase = MSM_CSR_BASE;</div><div class='del'>-		msm_clocks[MSM_CLOCK_DGT].regbase = MSM_CSR_BASE + 0x10;</div><div class='add'>+		event_base = MSM_CSR_BASE;</div><div class='add'>+		source_base = MSM_CSR_BASE + 0x10;</div><div class='add'>+		dgt_hz = 19200000 &gt;&gt; MSM_DGT_SHIFT; /* 600 KHz */</div><div class='add'>+		cs-&gt;read = msm_read_timer_count_shift;</div><div class='add'>+		cs-&gt;mask = CLOCKSOURCE_MASK((32 - MSM_DGT_SHIFT));</div><div class='ctx'> 	} else if (cpu_is_msm7x30()) {</div><div class='del'>-		msm_clocks[MSM_CLOCK_GPT].regbase = MSM_CSR_BASE + 0x04;</div><div class='del'>-		msm_clocks[MSM_CLOCK_DGT].regbase = MSM_CSR_BASE + 0x24;</div><div class='add'>+		event_base = MSM_CSR_BASE + 0x04;</div><div class='add'>+		source_base = MSM_CSR_BASE + 0x24;</div><div class='add'>+		dgt_hz = 24576000 / 4;</div><div class='ctx'> 	} else if (cpu_is_qsd8x50()) {</div><div class='del'>-		msm_clocks[MSM_CLOCK_GPT].regbase = MSM_CSR_BASE;</div><div class='del'>-		msm_clocks[MSM_CLOCK_DGT].regbase = MSM_CSR_BASE + 0x10;</div><div class='add'>+		event_base = MSM_CSR_BASE;</div><div class='add'>+		source_base = MSM_CSR_BASE + 0x10;</div><div class='add'>+		dgt_hz = 19200000 / 4;</div><div class='ctx'> 	} else if (cpu_is_msm8x60() || cpu_is_msm8960()) {</div><div class='del'>-		msm_clocks[MSM_CLOCK_GPT].regbase = MSM_TMR_BASE + 0x04;</div><div class='del'>-		msm_clocks[MSM_CLOCK_DGT].regbase = MSM_TMR_BASE + 0x24;</div><div class='del'>-</div><div class='del'>-		/* Use CPU0's timer as the global timer. */</div><div class='del'>-		global_offset = MSM_TMR0_BASE - MSM_TMR_BASE;</div><div class='add'>+		event_base = MSM_TMR_BASE + 0x04;</div><div class='add'>+		/* Use CPU0's timer as the global clock source. */</div><div class='add'>+		source_base = MSM_TMR0_BASE + 0x24;</div><div class='add'>+		dgt_hz = 27000000 / 4;</div><div class='add'>+		writel_relaxed(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL);</div><div class='ctx'> 	} else</div><div class='ctx'> 		BUG();</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARCH_MSM_SCORPIONMP</div><div class='del'>-	writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(msm_clocks); i++) {</div><div class='del'>-		struct msm_clock *clock = &amp;msm_clocks[i];</div><div class='del'>-		struct clock_event_device *ce = &amp;clock-&gt;clockevent;</div><div class='del'>-		struct clocksource *cs = &amp;clock-&gt;clocksource;</div><div class='del'>-</div><div class='del'>-		clock-&gt;local_counter = clock-&gt;regbase + TIMER_COUNT_VAL;</div><div class='del'>-		clock-&gt;global_counter = clock-&gt;local_counter + global_offset;</div><div class='del'>-</div><div class='del'>-		writel(0, clock-&gt;regbase + TIMER_ENABLE);</div><div class='del'>-		writel(0, clock-&gt;regbase + TIMER_CLEAR);</div><div class='del'>-		writel(~0, clock-&gt;regbase + TIMER_MATCH_VAL);</div><div class='del'>-</div><div class='del'>-		ce-&gt;mult = div_sc(clock-&gt;freq, NSEC_PER_SEC, ce-&gt;shift);</div><div class='del'>-		/* allow at least 10 seconds to notice that the timer wrapped */</div><div class='del'>-		ce-&gt;max_delta_ns =</div><div class='del'>-			clockevent_delta2ns(0xf0000000 &gt;&gt; clock-&gt;shift, ce);</div><div class='del'>-		/* 4 gets rounded down to 3 */</div><div class='del'>-		ce-&gt;min_delta_ns = clockevent_delta2ns(4, ce);</div><div class='del'>-		ce-&gt;cpumask = cpumask_of(0);</div><div class='del'>-</div><div class='del'>-		res = clocksource_register_hz(cs, clock-&gt;freq);</div><div class='del'>-		if (res)</div><div class='del'>-			printk(KERN_ERR "msm_timer_init: clocksource_register "</div><div class='del'>-			       "failed for %s\n", cs-&gt;name);</div><div class='del'>-</div><div class='del'>-		ce-&gt;irq = clock-&gt;irq;</div><div class='del'>-		if (cpu_is_msm8x60() || cpu_is_msm8960()) {</div><div class='del'>-			clock-&gt;percpu_evt = alloc_percpu(struct clock_event_device *);</div><div class='del'>-			if (!clock-&gt;percpu_evt) {</div><div class='del'>-				pr_err("msm_timer_init: memory allocation "</div><div class='del'>-				       "failed for %s\n", ce-&gt;name);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			*__this_cpu_ptr(clock-&gt;percpu_evt) = ce;</div><div class='del'>-			res = request_percpu_irq(ce-&gt;irq, msm_timer_interrupt,</div><div class='del'>-						 ce-&gt;name, clock-&gt;percpu_evt);</div><div class='del'>-			if (!res)</div><div class='del'>-				enable_percpu_irq(ce-&gt;irq, 0);</div><div class='del'>-		} else {</div><div class='del'>-			clock-&gt;evt = ce;</div><div class='del'>-			res = request_irq(ce-&gt;irq, msm_timer_interrupt,</div><div class='del'>-					  IRQF_TIMER | IRQF_NOBALANCING | IRQF_TRIGGER_RISING,</div><div class='del'>-					  ce-&gt;name, &amp;clock-&gt;evt);</div><div class='add'>+	writel_relaxed(0, event_base + TIMER_ENABLE);</div><div class='add'>+	writel_relaxed(0, event_base + TIMER_CLEAR);</div><div class='add'>+	writel_relaxed(~0, event_base + TIMER_MATCH_VAL);</div><div class='add'>+	ce-&gt;cpumask = cpumask_of(0);</div><div class='add'>+</div><div class='add'>+	ce-&gt;irq = INT_GP_TIMER_EXP;</div><div class='add'>+	clockevents_config_and_register(ce, GPT_HZ, 4, 0xffffffff);</div><div class='add'>+	if (cpu_is_msm8x60() || cpu_is_msm8960()) {</div><div class='add'>+		msm_evt.percpu_evt = alloc_percpu(struct clock_event_device *);</div><div class='add'>+		if (!msm_evt.percpu_evt) {</div><div class='add'>+			pr_err("memory allocation failed for %s\n", ce-&gt;name);</div><div class='add'>+			goto err;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		if (res)</div><div class='del'>-			pr_err("msm_timer_init: request_irq failed for %s\n",</div><div class='del'>-			       ce-&gt;name);</div><div class='del'>-</div><div class='del'>-		clockevents_register_device(ce);</div><div class='add'>+		*__this_cpu_ptr(msm_evt.percpu_evt) = ce;</div><div class='add'>+		res = request_percpu_irq(ce-&gt;irq, msm_timer_interrupt,</div><div class='add'>+					 ce-&gt;name, msm_evt.percpu_evt);</div><div class='add'>+		if (!res)</div><div class='add'>+			enable_percpu_irq(ce-&gt;irq, 0);</div><div class='add'>+	} else {</div><div class='add'>+		msm_evt.evt = ce;</div><div class='add'>+		res = request_irq(ce-&gt;irq, msm_timer_interrupt,</div><div class='add'>+				  IRQF_TIMER | IRQF_NOBALANCING |</div><div class='add'>+				  IRQF_TRIGGER_RISING, ce-&gt;name, &amp;msm_evt.evt);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (res)</div><div class='add'>+		pr_err("request_irq failed for %s\n", ce-&gt;name);</div><div class='add'>+err:</div><div class='add'>+	writel_relaxed(TIMER_ENABLE_EN, source_base + TIMER_ENABLE);</div><div class='add'>+	res = clocksource_register_hz(cs, dgt_hz);</div><div class='add'>+	if (res)</div><div class='add'>+		pr_err("clocksource_register failed\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='add'>+#ifdef CONFIG_LOCAL_TIMERS</div><div class='ctx'> int __cpuinit local_timer_setup(struct clock_event_device *evt)</div><div class='ctx'> {</div><div class='del'>-	static bool local_timer_inited;</div><div class='del'>-	struct msm_clock *clock = &amp;msm_clocks[MSM_GLOBAL_TIMER];</div><div class='del'>-</div><div class='ctx'> 	/* Use existing clock_event for cpu 0 */</div><div class='ctx'> 	if (!smp_processor_id())</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL);</div><div class='del'>-</div><div class='del'>-	if (!local_timer_inited) {</div><div class='del'>-		writel(0, clock-&gt;regbase  + TIMER_ENABLE);</div><div class='del'>-		writel(0, clock-&gt;regbase + TIMER_CLEAR);</div><div class='del'>-		writel(~0, clock-&gt;regbase + TIMER_MATCH_VAL);</div><div class='del'>-		local_timer_inited = true;</div><div class='del'>-	}</div><div class='del'>-	evt-&gt;irq = clock-&gt;irq;</div><div class='add'>+	writel_relaxed(0, event_base + TIMER_ENABLE);</div><div class='add'>+	writel_relaxed(0, event_base + TIMER_CLEAR);</div><div class='add'>+	writel_relaxed(~0, event_base + TIMER_MATCH_VAL);</div><div class='add'>+	evt-&gt;irq = msm_clockevent.irq;</div><div class='ctx'> 	evt-&gt;name = "local_timer";</div><div class='del'>-	evt-&gt;features = CLOCK_EVT_FEAT_ONESHOT;</div><div class='del'>-	evt-&gt;rating = clock-&gt;clockevent.rating;</div><div class='add'>+	evt-&gt;features = msm_clockevent.features;</div><div class='add'>+	evt-&gt;rating = msm_clockevent.rating;</div><div class='ctx'> 	evt-&gt;set_mode = msm_timer_set_mode;</div><div class='ctx'> 	evt-&gt;set_next_event = msm_timer_set_next_event;</div><div class='del'>-	evt-&gt;shift = clock-&gt;clockevent.shift;</div><div class='del'>-	evt-&gt;mult = div_sc(clock-&gt;freq, NSEC_PER_SEC, evt-&gt;shift);</div><div class='del'>-	evt-&gt;max_delta_ns =</div><div class='del'>-		clockevent_delta2ns(0xf0000000 &gt;&gt; clock-&gt;shift, evt);</div><div class='add'>+	evt-&gt;shift = msm_clockevent.shift;</div><div class='add'>+	evt-&gt;mult = div_sc(GPT_HZ, NSEC_PER_SEC, evt-&gt;shift);</div><div class='add'>+	evt-&gt;max_delta_ns = clockevent_delta2ns(0xf0000000, evt);</div><div class='ctx'> 	evt-&gt;min_delta_ns = clockevent_delta2ns(4, evt);</div><div class='ctx'> </div><div class='del'>-	*__this_cpu_ptr(clock-&gt;percpu_evt) = evt;</div><div class='del'>-	enable_percpu_irq(evt-&gt;irq, 0);</div><div class='del'>-</div><div class='add'>+	*__this_cpu_ptr(msm_evt.percpu_evt) = evt;</div><div class='ctx'> 	clockevents_register_device(evt);</div><div class='add'>+	enable_percpu_irq(evt-&gt;irq, 0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -321,8 +223,7 @@ void local_timer_stop(struct clock_event_device *evt)</div><div class='ctx'> 	evt-&gt;set_mode(CLOCK_EVT_MODE_UNUSED, evt);</div><div class='ctx'> 	disable_percpu_irq(evt-&gt;irq);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#endif</div><div class='add'>+#endif /* CONFIG_LOCAL_TIMERS */</div><div class='ctx'> </div><div class='ctx'> struct sys_timer msm_timer = {</div><div class='ctx'> 	.init = msm_timer_init</div><div class='head'>diff --git a/arch/arm/mach-msm/vreg.c b/arch/arm/mach-msm/vreg.c<br/>index a9103bc6615f..bd66ed04d6dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/vreg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/vreg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/vreg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-msm/vreg.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/init.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;mach/vreg.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/addr-map.c b/arch/arm/mach-mv78xx0/addr-map.c<br/>index 311d5b0e9bc7..62b53d710efd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/addr-map.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/addr-map.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/addr-map.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mv78xx0/addr-map.c</a></div><div class='hunk'>@@ -12,12 +12,12 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;plat/addr-map.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Generic Address Decode Windows bit settings</div><div class='ctx'>  */</div><div class='del'>-#define TARGET_DDR		0</div><div class='ctx'> #define TARGET_DEV_BUS		1</div><div class='ctx'> #define TARGET_PCIE0		4</div><div class='ctx'> #define TARGET_PCIE1		8</div><div class='hunk'>@@ -32,23 +32,10 @@</div><div class='ctx'> #define ATTR_PCIE_MEM(l)	(0xf8 &amp; ~(0x10 &lt;&lt; (l)))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Helpers to get DDR bank info</div><div class='del'>- */</div><div class='del'>-#define DDR_BASE_CS_OFF(n)	(0x0000 + ((n) &lt;&lt; 3))</div><div class='del'>-#define DDR_SIZE_CS_OFF(n)	(0x0004 + ((n) &lt;&lt; 3))</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * CPU Address Decode Windows registers</div><div class='ctx'>  */</div><div class='ctx'> #define WIN0_OFF(n)		(BRIDGE_VIRT_BASE + 0x0000 + ((n) &lt;&lt; 4))</div><div class='ctx'> #define WIN8_OFF(n)		(BRIDGE_VIRT_BASE + 0x0900 + (((n) - 8) &lt;&lt; 4))</div><div class='del'>-#define WIN_CTRL_OFF		0x0000</div><div class='del'>-#define WIN_BASE_OFF		0x0004</div><div class='del'>-#define WIN_REMAP_LO_OFF	0x0008</div><div class='del'>-#define WIN_REMAP_HI_OFF	0x000c</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct mbus_dram_target_info mv78xx0_mbus_dram_info;</div><div class='ctx'> </div><div class='ctx'> static void __init __iomem *win_cfg_base(int win)</div><div class='ctx'> {</div><div class='hunk'>@@ -63,94 +50,43 @@ static void __init __iomem *win_cfg_base(int win)</div><div class='ctx'> 	return (void __iomem *)((win &lt; 8) ? WIN0_OFF(win) : WIN8_OFF(win));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init cpu_win_can_remap(int win)</div><div class='del'>-{</div><div class='del'>-	if (win &lt; 8)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init setup_cpu_win(int win, u32 base, u32 size,</div><div class='del'>-				 u8 target, u8 attr, int remap)</div><div class='del'>-{</div><div class='del'>-	void __iomem *addr = win_cfg_base(win);</div><div class='del'>-	u32 ctrl;</div><div class='del'>-</div><div class='del'>-	base &amp;= 0xffff0000;</div><div class='del'>-	ctrl = ((size - 1) &amp; 0xffff0000) | (attr &lt;&lt; 8) | (target &lt;&lt; 4) | 1;</div><div class='del'>-</div><div class='del'>-	writel(base, addr + WIN_BASE_OFF);</div><div class='del'>-	writel(ctrl, addr + WIN_CTRL_OFF);</div><div class='del'>-	if (cpu_win_can_remap(win)) {</div><div class='del'>-		if (remap &lt; 0)</div><div class='del'>-			remap = base;</div><div class='del'>-</div><div class='del'>-		writel(remap &amp; 0xffff0000, addr + WIN_REMAP_LO_OFF);</div><div class='del'>-		writel(0, addr + WIN_REMAP_HI_OFF);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+/*</div><div class='add'>+ * Description of the windows needed by the platform code</div><div class='add'>+ */</div><div class='add'>+static struct __initdata orion_addr_map_cfg addr_map_cfg = {</div><div class='add'>+	.num_wins = 14,</div><div class='add'>+	.remappable_wins = 8,</div><div class='add'>+	.win_cfg_base = win_cfg_base,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> void __init mv78xx0_setup_cpu_mbus(void)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *addr;</div><div class='del'>-	int i;</div><div class='del'>-	int cs;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='del'>-	 * First, disable and clear windows.</div><div class='add'>+	 * Disable, clear and configure windows.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; 14; i++) {</div><div class='del'>-		addr = win_cfg_base(i);</div><div class='del'>-</div><div class='del'>-		writel(0, addr + WIN_BASE_OFF);</div><div class='del'>-		writel(0, addr + WIN_CTRL_OFF);</div><div class='del'>-		if (cpu_win_can_remap(i)) {</div><div class='del'>-			writel(0, addr + WIN_REMAP_LO_OFF);</div><div class='del'>-			writel(0, addr + WIN_REMAP_HI_OFF);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	orion_config_wins(&amp;addr_map_cfg, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Setup MBUS dram target info.</div><div class='ctx'> 	 */</div><div class='del'>-	mv78xx0_mbus_dram_info.mbus_dram_target_id = TARGET_DDR;</div><div class='del'>-</div><div class='ctx'> 	if (mv78xx0_core_index() == 0)</div><div class='del'>-		addr = (void __iomem *)DDR_WINDOW_CPU0_BASE;</div><div class='add'>+		orion_setup_cpu_mbus_target(&amp;addr_map_cfg,</div><div class='add'>+					    DDR_WINDOW_CPU0_BASE);</div><div class='ctx'> 	else</div><div class='del'>-		addr = (void __iomem *)DDR_WINDOW_CPU1_BASE;</div><div class='del'>-</div><div class='del'>-	for (i = 0, cs = 0; i &lt; 4; i++) {</div><div class='del'>-		u32 base = readl(addr + DDR_BASE_CS_OFF(i));</div><div class='del'>-		u32 size = readl(addr + DDR_SIZE_CS_OFF(i));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Chip select enabled?</div><div class='del'>-		 */</div><div class='del'>-		if (size &amp; 1) {</div><div class='del'>-			struct mbus_dram_window *w;</div><div class='del'>-</div><div class='del'>-			w = &amp;mv78xx0_mbus_dram_info.cs[cs++];</div><div class='del'>-			w-&gt;cs_index = i;</div><div class='del'>-			w-&gt;mbus_attr = 0xf &amp; ~(1 &lt;&lt; i);</div><div class='del'>-			w-&gt;base = base &amp; 0xffff0000;</div><div class='del'>-			w-&gt;size = (size | 0x0000ffff) + 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mv78xx0_mbus_dram_info.num_cs = cs;</div><div class='add'>+		orion_setup_cpu_mbus_target(&amp;addr_map_cfg,</div><div class='add'>+					    DDR_WINDOW_CPU1_BASE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init mv78xx0_setup_pcie_io_win(int window, u32 base, u32 size,</div><div class='ctx'> 				      int maj, int min)</div><div class='ctx'> {</div><div class='del'>-	setup_cpu_win(window, base, size, TARGET_PCIE(maj),</div><div class='del'>-		      ATTR_PCIE_IO(min), -1);</div><div class='add'>+	orion_setup_cpu_win(&amp;addr_map_cfg, window, base, size,</div><div class='add'>+			    TARGET_PCIE(maj), ATTR_PCIE_IO(min), -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init mv78xx0_setup_pcie_mem_win(int window, u32 base, u32 size,</div><div class='ctx'> 				       int maj, int min)</div><div class='ctx'> {</div><div class='del'>-	setup_cpu_win(window, base, size, TARGET_PCIE(maj),</div><div class='del'>-		      ATTR_PCIE_MEM(min), -1);</div><div class='add'>+	orion_setup_cpu_win(&amp;addr_map_cfg, window, base, size,</div><div class='add'>+			    TARGET_PCIE(maj), ATTR_PCIE_MEM(min), -1);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c b/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c<br/>index 0e94268d6e6f..ee74ec97c141 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/buffalo-wxl-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mv78xx0/buffalo-wxl-setup.c</a></div><div class='hunk'>@@ -151,4 +151,5 @@ MACHINE_START(TERASTATION_WXL, "Buffalo Nas WXL")</div><div class='ctx'> 	.init_early	= mv78xx0_init_early,</div><div class='ctx'> 	.init_irq	= mv78xx0_init_irq,</div><div class='ctx'> 	.timer		= &amp;mv78xx0_timer,</div><div class='add'>+	.restart	= mv78xx0_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c<br/>index 23d3980ef59d..0cdd41004ad0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mv78xx0/common.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='del'>-#include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -23,6 +22,7 @@</div><div class='ctx'> #include &lt;plat/orion_nand.h&gt;</div><div class='ctx'> #include &lt;plat/time.h&gt;</div><div class='ctx'> #include &lt;plat/common.h&gt;</div><div class='add'>+#include &lt;plat/addr-map.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> static int get_tclk(void);</div><div class='hunk'>@@ -169,8 +169,7 @@ void __init mv78xx0_map_io(void)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> void __init mv78xx0_ehci0_init(void)</div><div class='ctx'> {</div><div class='del'>-	orion_ehci_init(&amp;mv78xx0_mbus_dram_info,</div><div class='del'>-			USB0_PHYS_BASE, IRQ_MV78XX0_USB_0);</div><div class='add'>+	orion_ehci_init(USB0_PHYS_BASE, IRQ_MV78XX0_USB_0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -179,8 +178,7 @@ void __init mv78xx0_ehci0_init(void)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> void __init mv78xx0_ehci1_init(void)</div><div class='ctx'> {</div><div class='del'>-	orion_ehci_1_init(&amp;mv78xx0_mbus_dram_info,</div><div class='del'>-			  USB1_PHYS_BASE, IRQ_MV78XX0_USB_1);</div><div class='add'>+	orion_ehci_1_init(USB1_PHYS_BASE, IRQ_MV78XX0_USB_1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -189,8 +187,7 @@ void __init mv78xx0_ehci1_init(void)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> void __init mv78xx0_ehci2_init(void)</div><div class='ctx'> {</div><div class='del'>-	orion_ehci_2_init(&amp;mv78xx0_mbus_dram_info,</div><div class='del'>-			  USB2_PHYS_BASE, IRQ_MV78XX0_USB_2);</div><div class='add'>+	orion_ehci_2_init(USB2_PHYS_BASE, IRQ_MV78XX0_USB_2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -199,7 +196,7 @@ void __init mv78xx0_ehci2_init(void)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data)</div><div class='ctx'> {</div><div class='del'>-	orion_ge00_init(eth_data, &amp;mv78xx0_mbus_dram_info,</div><div class='add'>+	orion_ge00_init(eth_data,</div><div class='ctx'> 			GE00_PHYS_BASE, IRQ_MV78XX0_GE00_SUM,</div><div class='ctx'> 			IRQ_MV78XX0_GE_ERR, get_tclk());</div><div class='ctx'> }</div><div class='hunk'>@@ -210,7 +207,7 @@ void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data)</div><div class='ctx'> {</div><div class='del'>-	orion_ge01_init(eth_data, &amp;mv78xx0_mbus_dram_info,</div><div class='add'>+	orion_ge01_init(eth_data,</div><div class='ctx'> 			GE01_PHYS_BASE, IRQ_MV78XX0_GE01_SUM,</div><div class='ctx'> 			NO_IRQ, get_tclk());</div><div class='ctx'> }</div><div class='hunk'>@@ -234,7 +231,7 @@ void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data)</div><div class='ctx'> 		eth_data-&gt;duplex = DUPLEX_FULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	orion_ge10_init(eth_data, &amp;mv78xx0_mbus_dram_info,</div><div class='add'>+	orion_ge10_init(eth_data,</div><div class='ctx'> 			GE10_PHYS_BASE, IRQ_MV78XX0_GE10_SUM,</div><div class='ctx'> 			NO_IRQ, get_tclk());</div><div class='ctx'> }</div><div class='hunk'>@@ -258,7 +255,7 @@ void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data)</div><div class='ctx'> 		eth_data-&gt;duplex = DUPLEX_FULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	orion_ge11_init(eth_data, &amp;mv78xx0_mbus_dram_info,</div><div class='add'>+	orion_ge11_init(eth_data,</div><div class='ctx'> 			GE11_PHYS_BASE, IRQ_MV78XX0_GE11_SUM,</div><div class='ctx'> 			NO_IRQ, get_tclk());</div><div class='ctx'> }</div><div class='hunk'>@@ -277,8 +274,7 @@ void __init mv78xx0_i2c_init(void)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> void __init mv78xx0_sata_init(struct mv_sata_platform_data *sata_data)</div><div class='ctx'> {</div><div class='del'>-	orion_sata_init(sata_data, &amp;mv78xx0_mbus_dram_info,</div><div class='del'>-			SATA_PHYS_BASE, IRQ_MV78XX0_SATA);</div><div class='add'>+	orion_sata_init(sata_data, SATA_PHYS_BASE, IRQ_MV78XX0_SATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -401,3 +397,19 @@ void __init mv78xx0_init(void)</div><div class='ctx'> 	feroceon_l2_init(is_l2_writethrough());</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void mv78xx0_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Enable soft reset to assert RSTOUTn.</div><div class='add'>+	 */</div><div class='add'>+	writel(SOFT_RESET_OUT_EN, RSTOUTn_MASK);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Assert soft reset.</div><div class='add'>+	 */</div><div class='add'>+	writel(SOFT_RESET, SYSTEM_SOFT_RESET);</div><div class='add'>+</div><div class='add'>+	while (1)</div><div class='add'>+		;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/common.h b/arch/arm/mach-mv78xx0/common.h<br/>index 632e63d65e7a..507c767d49e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mv78xx0/common.h</a></div><div class='hunk'>@@ -23,7 +23,6 @@ void mv78xx0_init(void);</div><div class='ctx'> void mv78xx0_init_early(void);</div><div class='ctx'> void mv78xx0_init_irq(void);</div><div class='ctx'> </div><div class='del'>-extern struct mbus_dram_target_info mv78xx0_mbus_dram_info;</div><div class='ctx'> void mv78xx0_setup_cpu_mbus(void);</div><div class='ctx'> void mv78xx0_setup_pcie_io_win(int window, u32 base, u32 size,</div><div class='ctx'> 			       int maj, int min);</div><div class='hunk'>@@ -46,6 +45,7 @@ void mv78xx0_uart1_init(void);</div><div class='ctx'> void mv78xx0_uart2_init(void);</div><div class='ctx'> void mv78xx0_uart3_init(void);</div><div class='ctx'> void mv78xx0_i2c_init(void);</div><div class='add'>+void mv78xx0_restart(char, const char *);</div><div class='ctx'> </div><div class='ctx'> extern struct sys_timer mv78xx0_timer;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/db78x00-bp-setup.c b/arch/arm/mach-mv78xx0/db78x00-bp-setup.c<br/>index 50b85ae2da52..4d6d48bf51ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/db78x00-bp-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/db78x00-bp-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/db78x00-bp-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mv78xx0/db78x00-bp-setup.c</a></div><div class='hunk'>@@ -99,4 +99,5 @@ MACHINE_START(DB78X00_BP, "Marvell DB-78x00-BP Development Board")</div><div class='ctx'> 	.init_early	= mv78xx0_init_early,</div><div class='ctx'> 	.init_irq	= mv78xx0_init_irq,</div><div class='ctx'> 	.timer		= &amp;mv78xx0_timer,</div><div class='add'>+	.restart	= mv78xx0_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/include/mach/system.h b/arch/arm/mach-mv78xx0/include/mach/system.h<br/>index 66e7ce4e90bd..8c3a5387cec7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mv78xx0/include/mach/system.h</a></div><div class='hunk'>@@ -9,28 +9,9 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/bridge-regs.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Enable soft reset to assert RSTOUTn.</div><div class='del'>-	 */</div><div class='del'>-	writel(SOFT_RESET_OUT_EN, RSTOUTn_MASK);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Assert soft reset.</div><div class='del'>-	 */</div><div class='del'>-	writel(SOFT_RESET, SYSTEM_SOFT_RESET);</div><div class='del'>-</div><div class='del'>-	while (1)</div><div class='del'>-		;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/include/mach/vmalloc.h b/arch/arm/mach-mv78xx0/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index ba26fe98e640..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-mv78xx0/include/mach/vmalloc.h</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END	0xfe000000UL</div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/mpp.c b/arch/arm/mach-mv78xx0/mpp.c<br/>index cf4e494d44bf..df50342179e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/mpp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/mpp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/mpp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mv78xx0/mpp.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #include &lt;linux/gpio.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='del'>-#include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;plat/mpp.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c<br/>index c51af1cac300..8459f6d7d8ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/pcie.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/pcie.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mv78xx0/pcie.c</a></div><div class='hunk'>@@ -10,11 +10,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;video/vga.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> #include &lt;plat/pcie.h&gt;</div><div class='add'>+#include &lt;plat/addr-map.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> struct pcie_port {</div><div class='hunk'>@@ -153,11 +153,10 @@ static int __init mv78xx0_pcie_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	 * Generic PCIe unit setup.</div><div class='ctx'> 	 */</div><div class='ctx'> 	orion_pcie_set_local_bus_nr(pp-&gt;base, sys-&gt;busnr);</div><div class='del'>-	orion_pcie_setup(pp-&gt;base, &amp;mv78xx0_mbus_dram_info);</div><div class='add'>+	orion_pcie_setup(pp-&gt;base);</div><div class='ctx'> </div><div class='del'>-	sys-&gt;resource[0] = &amp;pp-&gt;res[0];</div><div class='del'>-	sys-&gt;resource[1] = &amp;pp-&gt;res[1];</div><div class='del'>-	sys-&gt;resource[2] = NULL;</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;pp-&gt;res[0]);</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;pp-&gt;res[1]);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -251,7 +250,8 @@ mv78xx0_pcie_scan_bus(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	struct pci_bus *bus;</div><div class='ctx'> </div><div class='ctx'> 	if (nr &lt; num_pcie_ports) {</div><div class='del'>-		bus = pci_scan_bus(sys-&gt;busnr, &amp;pcie_ops, sys);</div><div class='add'>+		bus = pci_scan_root_bus(NULL, sys-&gt;busnr, &amp;pcie_ops, sys,</div><div class='add'>+					&amp;sys-&gt;resources);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bus = NULL;</div><div class='ctx'> 		BUG();</div><div class='head'>diff --git a/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c b/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c<br/>index e85222e53578..9a882706e138 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mv78xx0/rd78x00-masa-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mv78xx0/rd78x00-masa-setup.c</a></div><div class='hunk'>@@ -84,4 +84,5 @@ MACHINE_START(RD78X00_MASA, "Marvell RD-78x00-MASA Development Board")</div><div class='ctx'> 	.init_early	= mv78xx0_init_early,</div><div class='ctx'> 	.init_irq	= mv78xx0_init_irq,</div><div class='ctx'> 	.timer		= &amp;mv78xx0_timer,</div><div class='add'>+	.restart	= mv78xx0_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mx5/board-cpuimx51.c b/arch/arm/mach-mx5/board-cpuimx51.c<br/>index 1fc110348040..944025da8333 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-cpuimx51.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-cpuimx51.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-cpuimx51.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mx5/board-cpuimx51.c</a></div><div class='hunk'>@@ -297,4 +297,5 @@ MACHINE_START(EUKREA_CPUIMX51, "Eukrea CPUIMX51 Module")</div><div class='ctx'> 	.handle_irq = imx51_handle_irq,</div><div class='ctx'> 	.timer = &amp;mxc_timer,</div><div class='ctx'> 	.init_machine = eukrea_cpuimx51_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mx5/board-cpuimx51sd.c b/arch/arm/mach-mx5/board-cpuimx51sd.c<br/>index 52a11c1898e6..9fbe923c8b08 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-cpuimx51sd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-cpuimx51sd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-cpuimx51sd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mx5/board-cpuimx51sd.c</a></div><div class='hunk'>@@ -335,4 +335,5 @@ MACHINE_START(EUKREA_CPUIMX51SD, "Eukrea CPUIMX51SD")</div><div class='ctx'> 	.handle_irq = imx51_handle_irq,</div><div class='ctx'> 	.timer = &amp;mxc_timer,</div><div class='ctx'> 	.init_machine = eukrea_cpuimx51sd_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mx5/board-mx50_rdp.c b/arch/arm/mach-mx5/board-mx50_rdp.c<br/>index fc3621d90bde..42b66e8d9615 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-mx50_rdp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-mx50_rdp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-mx50_rdp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mx5/board-mx50_rdp.c</a></div><div class='hunk'>@@ -222,4 +222,5 @@ MACHINE_START(MX50_RDP, "Freescale MX50 Reference Design Platform")</div><div class='ctx'> 	.handle_irq = imx50_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx50_rdp_timer,</div><div class='ctx'> 	.init_machine = mx50_rdp_board_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mx5/board-mx51_3ds.c b/arch/arm/mach-mx5/board-mx51_3ds.c<br/>index 05783906db2b..83eab4176ca4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-mx51_3ds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-mx51_3ds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-mx51_3ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mx5/board-mx51_3ds.c</a></div><div class='hunk'>@@ -175,4 +175,5 @@ MACHINE_START(MX51_3DS, "Freescale MX51 3-Stack Board")</div><div class='ctx'> 	.handle_irq = imx51_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx51_3ds_timer,</div><div class='ctx'> 	.init_machine = mx51_3ds_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mx5/board-mx51_babbage.c b/arch/arm/mach-mx5/board-mx51_babbage.c<br/>index 24994bb52147..e4b822e9f719 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-mx51_babbage.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-mx51_babbage.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-mx51_babbage.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mx5/board-mx51_babbage.c</a></div><div class='hunk'>@@ -426,4 +426,5 @@ MACHINE_START(MX51_BABBAGE, "Freescale MX51 Babbage Board")</div><div class='ctx'> 	.handle_irq = imx51_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx51_babbage_timer,</div><div class='ctx'> 	.init_machine = mx51_babbage_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mx5/board-mx51_efikamx.c b/arch/arm/mach-mx5/board-mx51_efikamx.c<br/>index a9e48662cf75..3a5ed2dd885a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-mx51_efikamx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-mx51_efikamx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-mx51_efikamx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mx5/board-mx51_efikamx.c</a></div><div class='hunk'>@@ -182,7 +182,7 @@ static const struct gpio_keys_platform_data mx51_efikamx_powerkey_data __initcon</div><div class='ctx'> 	.nbuttons = ARRAY_SIZE(mx51_efikamx_powerkey),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void mx51_efikamx_reset(void)</div><div class='add'>+static void mx51_efikamx_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	if (system_rev == 0x11)</div><div class='ctx'> 		gpio_direction_output(EFIKAMX_RESET1_1, 0);</div><div class='hunk'>@@ -292,4 +292,5 @@ MACHINE_START(MX51_EFIKAMX, "Genesi EfikaMX nettop")</div><div class='ctx'> 	.handle_irq = imx51_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx51_efikamx_timer,</div><div class='ctx'> 	.init_machine = mx51_efikamx_init,</div><div class='add'>+	.restart = mx51_efikamx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mx5/board-mx51_efikasb.c b/arch/arm/mach-mx5/board-mx51_efikasb.c<br/>index 38c4a3e28d3c..ea5f65b0381a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-mx51_efikasb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-mx51_efikasb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-mx51_efikasb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mx5/board-mx51_efikasb.c</a></div><div class='hunk'>@@ -287,4 +287,5 @@ MACHINE_START(MX51_EFIKASB, "Genesi Efika Smartbook")</div><div class='ctx'> 	.handle_irq = imx51_handle_irq,</div><div class='ctx'> 	.init_machine =  efikasb_board_init,</div><div class='ctx'> 	.timer = &amp;mx51_efikasb_timer,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mx5/board-mx53_ard.c b/arch/arm/mach-mx5/board-mx53_ard.c<br/>index 0d7f0fffb23a..5f224f1c3eb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-mx53_ard.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-mx53_ard.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-mx53_ard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mx5/board-mx53_ard.c</a></div><div class='hunk'>@@ -257,4 +257,5 @@ MACHINE_START(MX53_ARD, "Freescale MX53 ARD Board")</div><div class='ctx'> 	.handle_irq = imx53_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx53_ard_timer,</div><div class='ctx'> 	.init_machine = mx53_ard_board_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mx5/board-mx53_evk.c b/arch/arm/mach-mx5/board-mx53_evk.c<br/>index 64bbfcea6f35..d6ce137896d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-mx53_evk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-mx53_evk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-mx53_evk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mx5/board-mx53_evk.c</a></div><div class='hunk'>@@ -175,4 +175,5 @@ MACHINE_START(MX53_EVK, "Freescale MX53 EVK Board")</div><div class='ctx'> 	.handle_irq = imx53_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx53_evk_timer,</div><div class='ctx'> 	.init_machine = mx53_evk_board_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mx5/board-mx53_loco.c b/arch/arm/mach-mx5/board-mx53_loco.c<br/>index 237bdecd9331..fd8b524e1c58 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-mx53_loco.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-mx53_loco.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-mx53_loco.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mx5/board-mx53_loco.c</a></div><div class='hunk'>@@ -317,4 +317,5 @@ MACHINE_START(MX53_LOCO, "Freescale MX53 LOCO Board")</div><div class='ctx'> 	.handle_irq = imx53_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx53_loco_timer,</div><div class='ctx'> 	.init_machine = mx53_loco_board_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mx5/board-mx53_smd.c b/arch/arm/mach-mx5/board-mx53_smd.c<br/>index d42132a80e8f..22c53c9b18aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-mx53_smd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/board-mx53_smd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/board-mx53_smd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mx5/board-mx53_smd.c</a></div><div class='hunk'>@@ -164,4 +164,5 @@ MACHINE_START(MX53_SMD, "Freescale MX53 SMD Board")</div><div class='ctx'> 	.handle_irq = imx53_handle_irq,</div><div class='ctx'> 	.timer = &amp;mx53_smd_timer,</div><div class='ctx'> 	.init_machine = mx53_smd_board_init,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mx5/imx51-dt.c b/arch/arm/mach-mx5/imx51-dt.c<br/>index 596edd967dbf..e6bad17b908c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/imx51-dt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/imx51-dt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/imx51-dt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mx5/imx51-dt.c</a></div><div class='hunk'>@@ -115,4 +115,5 @@ DT_MACHINE_START(IMX51_DT, "Freescale i.MX51 (Device Tree Support)")</div><div class='ctx'> 	.timer		= &amp;imx51_timer,</div><div class='ctx'> 	.init_machine	= imx51_dt_init,</div><div class='ctx'> 	.dt_compat	= imx51_dt_board_compat,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mx5/imx53-dt.c b/arch/arm/mach-mx5/imx53-dt.c<br/>index 85bfd5ff21b0..05ebb3e68679 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/imx53-dt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/imx53-dt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/imx53-dt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mx5/imx53-dt.c</a></div><div class='hunk'>@@ -125,4 +125,5 @@ DT_MACHINE_START(IMX53_DT, "Freescale i.MX53 (Device Tree Support)")</div><div class='ctx'> 	.timer		= &amp;imx53_timer,</div><div class='ctx'> 	.init_machine	= imx53_dt_init,</div><div class='ctx'> 	.dt_compat	= imx53_dt_board_compat,</div><div class='add'>+	.restart	= mxc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mx5/mm.c b/arch/arm/mach-mx5/mm.c<br/>index df4a508f240a..bc17dfea3817 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/mm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/mm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/mm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mx5/mm.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -21,10 +22,26 @@</div><div class='ctx'> #include &lt;mach/devices-common.h&gt;</div><div class='ctx'> #include &lt;mach/iomux-v3.h&gt;</div><div class='ctx'> </div><div class='add'>+static struct clk *gpc_dvfs_clk;</div><div class='add'>+</div><div class='ctx'> static void imx5_idle(void)</div><div class='ctx'> {</div><div class='del'>-	if (!need_resched())</div><div class='add'>+	if (!need_resched()) {</div><div class='add'>+		/* gpc clock is needed for SRPG */</div><div class='add'>+		if (gpc_dvfs_clk == NULL) {</div><div class='add'>+			gpc_dvfs_clk = clk_get(NULL, "gpc_dvfs");</div><div class='add'>+			if (IS_ERR(gpc_dvfs_clk))</div><div class='add'>+				goto err0;</div><div class='add'>+		}</div><div class='add'>+		clk_enable(gpc_dvfs_clk);</div><div class='ctx'> 		mx5_cpu_lp_set(WAIT_UNCLOCKED_POWER_OFF);</div><div class='add'>+		if (tzic_enable_wake())</div><div class='add'>+			goto err1;</div><div class='add'>+		cpu_do_idle();</div><div class='add'>+err1:</div><div class='add'>+		clk_disable(gpc_dvfs_clk);</div><div class='add'>+	}</div><div class='add'>+err0:</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mx5/system.c b/arch/arm/mach-mx5/system.c<br/>index 144ebebc4a61..5eebfaad1226 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/system.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mx5/system.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mx5/system.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mx5/system.c</a></div><div class='hunk'>@@ -55,9 +55,6 @@ void mx5_cpu_lp_set(enum mxc_cpu_pwr_mode mode)</div><div class='ctx'> 			stop_mode = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		arm_srpgcr |= MXC_SRPGCR_PCR;</div><div class='del'>-</div><div class='del'>-		if (tzic_enable_wake(1) != 0)</div><div class='del'>-			return;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case STOP_POWER_ON:</div><div class='ctx'> 		ccm_clpcr |= 0x2 &lt;&lt; MXC_CCM_CLPCR_LPM_OFFSET;</div><div class='head'>diff --git a/arch/arm/mach-mxs/clock-mx23.c b/arch/arm/mach-mxs/clock-mx23.c<br/>index 0163b6d83773..e12e11231dc7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/clock-mx23.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/clock-mx23.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/clock-mx23.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mxs/clock-mx23.c</a></div><div class='hunk'>@@ -545,11 +545,11 @@ int __init mx23_clocks_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	clk_set_parent(&amp;ssp_clk, &amp;ref_io_clk);</div><div class='ctx'> </div><div class='del'>-	clk_enable(&amp;cpu_clk);</div><div class='del'>-	clk_enable(&amp;hbus_clk);</div><div class='del'>-	clk_enable(&amp;xbus_clk);</div><div class='del'>-	clk_enable(&amp;emi_clk);</div><div class='del'>-	clk_enable(&amp;uart_clk);</div><div class='add'>+	clk_prepare_enable(&amp;cpu_clk);</div><div class='add'>+	clk_prepare_enable(&amp;hbus_clk);</div><div class='add'>+	clk_prepare_enable(&amp;xbus_clk);</div><div class='add'>+	clk_prepare_enable(&amp;emi_clk);</div><div class='add'>+	clk_prepare_enable(&amp;uart_clk);</div><div class='ctx'> </div><div class='ctx'> 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c<br/>index da6e4aad177c..5d68e4152220 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/clock-mx28.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/clock-mx28.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/clock-mx28.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mxs/clock-mx28.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/clkdev.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/clkdev.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='hunk'>@@ -29,6 +30,7 @@</div><div class='ctx'> #include &lt;mach/mx28.h&gt;</div><div class='ctx'> #include &lt;mach/common.h&gt;</div><div class='ctx'> #include &lt;mach/clock.h&gt;</div><div class='add'>+#include &lt;mach/digctl.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "regs-clkctrl-mx28.h"</div><div class='ctx'> </div><div class='hunk'>@@ -43,6 +45,33 @@ static struct clk emi_clk;</div><div class='ctx'> static struct clk saif0_clk;</div><div class='ctx'> static struct clk saif1_clk;</div><div class='ctx'> static struct clk clk32k_clk;</div><div class='add'>+static DEFINE_SPINLOCK(clkmux_lock);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HW_SAIF_CLKMUX_SEL:</div><div class='add'>+ *  DIRECT(0x0): SAIF0 clock pins selected for SAIF0 input clocks, and SAIF1</div><div class='add'>+ *		clock pins selected for SAIF1 input clocks.</div><div class='add'>+ *  CROSSINPUT(0x1): SAIF1 clock inputs selected for SAIF0 input clocks, and</div><div class='add'>+ *		SAIF0 clock inputs selected for SAIF1 input clocks.</div><div class='add'>+ *  EXTMSTR0(0x2): SAIF0 clock pin selected for both SAIF0 and SAIF1 input</div><div class='add'>+ *		clocks.</div><div class='add'>+ *  EXTMSTR1(0x3): SAIF1 clock pin selected for both SAIF0 and SAIF1 input</div><div class='add'>+ *		clocks.</div><div class='add'>+ */</div><div class='add'>+int mxs_saif_clkmux_select(unsigned int clkmux)</div><div class='add'>+{</div><div class='add'>+	if (clkmux &gt; 0x3)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;clkmux_lock);</div><div class='add'>+	__raw_writel(BM_DIGCTL_CTRL_SAIF_CLKMUX,</div><div class='add'>+			DIGCTRL_BASE_ADDR + HW_DIGCTL_CTRL + MXS_CLR_ADDR);</div><div class='add'>+	__raw_writel(clkmux &lt;&lt; BP_DIGCTL_CTRL_SAIF_CLKMUX,</div><div class='add'>+			DIGCTRL_BASE_ADDR + HW_DIGCTL_CTRL + MXS_SET_ADDR);</div><div class='add'>+	spin_unlock(&amp;clkmux_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int _raw_clk_enable(struct clk *clk)</div><div class='ctx'> {</div><div class='hunk'>@@ -775,16 +804,25 @@ int __init mx28_clocks_init(void)</div><div class='ctx'> 	clk_set_parent(&amp;ssp0_clk, &amp;ref_io0_clk);</div><div class='ctx'> 	clk_set_parent(&amp;ssp1_clk, &amp;ref_io0_clk);</div><div class='ctx'> </div><div class='del'>-	clk_enable(&amp;cpu_clk);</div><div class='del'>-	clk_enable(&amp;hbus_clk);</div><div class='del'>-	clk_enable(&amp;xbus_clk);</div><div class='del'>-	clk_enable(&amp;emi_clk);</div><div class='del'>-	clk_enable(&amp;uart_clk);</div><div class='add'>+	clk_prepare_enable(&amp;cpu_clk);</div><div class='add'>+	clk_prepare_enable(&amp;hbus_clk);</div><div class='add'>+	clk_prepare_enable(&amp;xbus_clk);</div><div class='add'>+	clk_prepare_enable(&amp;emi_clk);</div><div class='add'>+	clk_prepare_enable(&amp;uart_clk);</div><div class='ctx'> </div><div class='ctx'> 	clk_set_parent(&amp;lcdif_clk, &amp;ref_pix_clk);</div><div class='ctx'> 	clk_set_parent(&amp;saif0_clk, &amp;pll0_clk);</div><div class='ctx'> 	clk_set_parent(&amp;saif1_clk, &amp;pll0_clk);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Set an initial clock rate for the saif internal logic to work</div><div class='add'>+	 * properly. This is important when working in EXTMASTER mode that</div><div class='add'>+	 * uses the other saif's BITCLK&amp;LRCLK but it still needs a basic</div><div class='add'>+	 * clock which should be fast enough for the internal logic.</div><div class='add'>+	 */</div><div class='add'>+	clk_set_rate(&amp;saif0_clk, 24000000);</div><div class='add'>+	clk_set_rate(&amp;saif1_clk, 24000000);</div><div class='add'>+</div><div class='ctx'> 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));</div><div class='ctx'> </div><div class='ctx'> 	mxs_timer_init(&amp;clk32k_clk, MX28_INT_TIMER0);</div><div class='head'>diff --git a/arch/arm/mach-mxs/clock.c b/arch/arm/mach-mxs/clock.c<br/>index a7093c88e6a6..97a6f4acc6cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mxs/clock.c</a></div><div class='hunk'>@@ -74,10 +74,15 @@ static int __clk_enable(struct clk *clk)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* This function increments the reference count on the clock and enables the</div><div class='del'>- * clock if not already enabled. The parent clock tree is recursively enabled</div><div class='add'>+/*</div><div class='add'>+ * The clk_enable/clk_disable could be called by drivers in atomic context,</div><div class='add'>+ * so they should not really hold mutex.  Instead, clk_prepare/clk_unprepare</div><div class='add'>+ * can hold a mutex, as the pair will only be called in non-atomic context.</div><div class='add'>+ * Before migrating to common clk framework, we can have __clk_enable and</div><div class='add'>+ * __clk_disable called in clk_prepare/clk_unprepare with mutex held and</div><div class='add'>+ * leave clk_enable/clk_disable as the dummy functions.</div><div class='ctx'>  */</div><div class='del'>-int clk_enable(struct clk *clk)</div><div class='add'>+int clk_prepare(struct clk *clk)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -90,13 +95,9 @@ int clk_enable(struct clk *clk)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(clk_enable);</div><div class='add'>+EXPORT_SYMBOL(clk_prepare);</div><div class='ctx'> </div><div class='del'>-/* This function decrements the reference count on the clock and disables</div><div class='del'>- * the clock when reference count is 0. The parent clock tree is</div><div class='del'>- * recursively disabled</div><div class='del'>- */</div><div class='del'>-void clk_disable(struct clk *clk)</div><div class='add'>+void clk_unprepare(struct clk *clk)</div><div class='ctx'> {</div><div class='ctx'> 	if (clk == NULL || IS_ERR(clk))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -105,6 +106,18 @@ void clk_disable(struct clk *clk)</div><div class='ctx'> 	__clk_disable(clk);</div><div class='ctx'> 	mutex_unlock(&amp;clocks_mutex);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(clk_unprepare);</div><div class='add'>+</div><div class='add'>+int clk_enable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_enable);</div><div class='add'>+</div><div class='add'>+void clk_disable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	/* nothing to do */</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(clk_disable);</div><div class='ctx'> </div><div class='ctx'> /* Retrieve the *current* clock rate. If the clock itself</div><div class='hunk'>@@ -166,7 +179,7 @@ int clk_set_parent(struct clk *clk, struct clk *parent)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (clk-&gt;usecount)</div><div class='del'>-		clk_enable(parent);</div><div class='add'>+		clk_prepare_enable(parent);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;clocks_mutex);</div><div class='ctx'> 	ret = clk-&gt;set_parent(clk, parent);</div><div class='head'>diff --git a/arch/arm/mach-mxs/devices-mx28.h b/arch/arm/mach-mxs/devices-mx28.h<br/>index c8887103f0e3..4f50094e293d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/devices-mx28.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/devices-mx28.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/devices-mx28.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mxs/devices-mx28.h</a></div><div class='hunk'>@@ -47,6 +47,7 @@ struct platform_device *__init mx28_add_mxsfb(</div><div class='ctx'> 		const struct mxsfb_platform_data *pdata);</div><div class='ctx'> </div><div class='ctx'> extern const struct mxs_saif_data mx28_saif_data[] __initconst;</div><div class='del'>-#define mx28_add_saif(id)              mxs_add_saif(&amp;mx28_saif_data[id])</div><div class='add'>+#define mx28_add_saif(id, pdata) \</div><div class='add'>+	mxs_add_saif(&amp;mx28_saif_data[id], pdata)</div><div class='ctx'> </div><div class='ctx'> struct platform_device *__init mx28_add_rtc_stmp3xxx(void);</div><div class='head'>diff --git a/arch/arm/mach-mxs/devices/platform-mxs-saif.c b/arch/arm/mach-mxs/devices/platform-mxs-saif.c<br/>index 1ec965e9fe92..f6e3a60b4201 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/devices/platform-mxs-saif.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/devices/platform-mxs-saif.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/devices/platform-mxs-saif.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mxs/devices/platform-mxs-saif.c</a></div><div class='hunk'>@@ -32,7 +32,8 @@ const struct mxs_saif_data mx28_saif_data[] __initconst = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-struct platform_device *__init mxs_add_saif(const struct mxs_saif_data *data)</div><div class='add'>+struct platform_device *__init mxs_add_saif(const struct mxs_saif_data *data,</div><div class='add'>+				const struct mxs_saif_platform_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource res[] = {</div><div class='ctx'> 		{</div><div class='hunk'>@@ -56,5 +57,5 @@ struct platform_device *__init mxs_add_saif(const struct mxs_saif_data *data)</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	return mxs_add_platform_device("mxs-saif", data-&gt;id, res,</div><div class='del'>-					ARRAY_SIZE(res), NULL, 0);</div><div class='add'>+				ARRAY_SIZE(res), pdata, sizeof(*pdata));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-mxs/include/mach/common.h b/arch/arm/mach-mxs/include/mach/common.h<br/>index 635bb5d9a20a..e1237ab25862 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/include/mach/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/include/mach/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/include/mach/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mxs/include/mach/common.h</a></div><div class='hunk'>@@ -16,6 +16,8 @@ struct clk;</div><div class='ctx'> extern const u32 *mxs_get_ocotp(void);</div><div class='ctx'> extern int mxs_reset_block(void __iomem *);</div><div class='ctx'> extern void mxs_timer_init(struct clk *, int);</div><div class='add'>+extern void mxs_restart(char, const char *);</div><div class='add'>+extern int mxs_saif_clkmux_select(unsigned int clkmux);</div><div class='ctx'> </div><div class='ctx'> extern int mx23_register_gpios(void);</div><div class='ctx'> extern int mx23_clocks_init(void);</div><div class='head'>diff --git a/arch/arm/mach-mxs/include/mach/devices-common.h b/arch/arm/mach-mxs/include/mach/devices-common.h<br/>index a8080f44c03d..dc369c1239fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/include/mach/devices-common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/include/mach/devices-common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/include/mach/devices-common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mxs/include/mach/devices-common.h</a></div><div class='hunk'>@@ -94,6 +94,7 @@ struct platform_device *__init mxs_add_mxs_pwm(</div><div class='ctx'> 		resource_size_t iobase, int id);</div><div class='ctx'> </div><div class='ctx'> /* saif */</div><div class='add'>+#include &lt;sound/saif.h&gt;</div><div class='ctx'> struct mxs_saif_data {</div><div class='ctx'> 	int id;</div><div class='ctx'> 	resource_size_t iobase;</div><div class='hunk'>@@ -103,4 +104,5 @@ struct mxs_saif_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct platform_device *__init mxs_add_saif(</div><div class='del'>-		const struct mxs_saif_data *data);</div><div class='add'>+		const struct mxs_saif_data *data,</div><div class='add'>+		const struct mxs_saif_platform_data *pdata);</div><div class='head'>diff --git a/arch/arm/mach-mxs/include/mach/digctl.h b/arch/arm/mach-mxs/include/mach/digctl.h<br/>new file mode 100644<br/>index 000000000000..49a888c65d6d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/include/mach/digctl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mxs/include/mach/digctl.h</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MACH_DIGCTL_H__</div><div class='add'>+#define __MACH_DIGCTL_H__</div><div class='add'>+</div><div class='add'>+/* MXS DIGCTL SAIF CLKMUX */</div><div class='add'>+#define MXS_DIGCTL_SAIF_CLKMUX_DIRECT		0x0</div><div class='add'>+#define MXS_DIGCTL_SAIF_CLKMUX_CROSSINPUT	0x1</div><div class='add'>+#define MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0		0x2</div><div class='add'>+#define MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR1		0x3</div><div class='add'>+</div><div class='add'>+#define HW_DIGCTL_CTRL			0x0</div><div class='add'>+#define  BP_DIGCTL_CTRL_SAIF_CLKMUX	10</div><div class='add'>+#define  BM_DIGCTL_CTRL_SAIF_CLKMUX	(0x3 &lt;&lt; 10)</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-mxs/include/mach/system.h b/arch/arm/mach-mxs/include/mach/system.h<br/>index 0e428239b433..e7ad1bb29423 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mxs/include/mach/system.h</a></div><div class='hunk'>@@ -22,6 +22,4 @@ static inline void arch_idle(void)</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void arch_reset(char mode, const char *cmd);</div><div class='del'>-</div><div class='ctx'> #endif /* __MACH_MXS_SYSTEM_H__ */</div><div class='head'>diff --git a/arch/arm/mach-mxs/include/mach/vmalloc.h b/arch/arm/mach-mxs/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 103b0165ed0b..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Russell King.</div><div class='del'>- *  Copyright 2004-2007 Freescale Semiconductor, Inc. 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 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 __MACH_MXS_VMALLOC_H__</div><div class='del'>-#define __MACH_MXS_VMALLOC_H__</div><div class='del'>-</div><div class='del'>-/* vmalloc ending address */</div><div class='del'>-#define VMALLOC_END       0xf4000000UL</div><div class='del'>-</div><div class='del'>-#endif /* __MACH_MXS_VMALLOC_H__ */</div><div class='head'>diff --git a/arch/arm/mach-mxs/mach-m28evk.c b/arch/arm/mach-mxs/mach-m28evk.c<br/>index 6b00577b7025..2f2758230edf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/mach-m28evk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/mach-m28evk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/mach-m28evk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mxs/mach-m28evk.c</a></div><div class='hunk'>@@ -363,4 +363,5 @@ MACHINE_START(M28EVK, "DENX M28 EVK")</div><div class='ctx'> 	.init_irq	= mx28_init_irq,</div><div class='ctx'> 	.timer		= &amp;m28evk_timer,</div><div class='ctx'> 	.init_machine	= m28evk_init,</div><div class='add'>+	.restart	= mxs_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mxs/mach-mx23evk.c b/arch/arm/mach-mxs/mach-mx23evk.c<br/>index c325fbe4e4c6..5ea1c57d2606 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/mach-mx23evk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/mach-mx23evk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/mach-mx23evk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mxs/mach-mx23evk.c</a></div><div class='hunk'>@@ -184,4 +184,5 @@ MACHINE_START(MX23EVK, "Freescale MX23 EVK")</div><div class='ctx'> 	.init_irq	= mx23_init_irq,</div><div class='ctx'> 	.timer		= &amp;mx23evk_timer,</div><div class='ctx'> 	.init_machine	= mx23evk_init,</div><div class='add'>+	.restart	= mxs_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c<br/>index 064ec5abaa55..fdb0a5664dd6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/mach-mx28evk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/mach-mx28evk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/mach-mx28evk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mxs/mach-mx28evk.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/common.h&gt;</div><div class='ctx'> #include &lt;mach/iomux-mx28.h&gt;</div><div class='add'>+#include &lt;mach/digctl.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "devices-mx28.h"</div><div class='ctx'> </div><div class='hunk'>@@ -228,7 +229,7 @@ static void __init mx28evk_fec_reset(void)</div><div class='ctx'> 	/* Enable fec phy clock */</div><div class='ctx'> 	clk = clk_get_sys("pll2", NULL);</div><div class='ctx'> 	if (!IS_ERR(clk))</div><div class='del'>-		clk_enable(clk);</div><div class='add'>+		clk_prepare_enable(clk);</div><div class='ctx'> </div><div class='ctx'> 	/* Power up fec phy */</div><div class='ctx'> 	ret = gpio_request(MX28EVK_FEC_PHY_POWER, "fec-phy-power");</div><div class='hunk'>@@ -421,6 +422,18 @@ static struct gpio mx28evk_lcd_gpios[] = {</div><div class='ctx'> 	{ MX28EVK_BL_ENABLE, GPIOF_OUT_INIT_HIGH, "bl-enable" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct mxs_saif_platform_data</div><div class='add'>+			mx28evk_mxs_saif_pdata[] __initconst = {</div><div class='add'>+	/* working on EXTMSTR0 mode (saif0 master, saif1 slave) */</div><div class='add'>+	{</div><div class='add'>+		.master_mode = 1,</div><div class='add'>+		.master_id = 0,</div><div class='add'>+	}, {</div><div class='add'>+		.master_mode = 0,</div><div class='add'>+		.master_id = 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init mx28evk_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -454,8 +467,9 @@ static void __init mx28evk_init(void)</div><div class='ctx'> 	else</div><div class='ctx'> 		mx28_add_mxsfb(&amp;mx28evk_mxsfb_pdata);</div><div class='ctx'> </div><div class='del'>-	mx28_add_saif(0);</div><div class='del'>-	mx28_add_saif(1);</div><div class='add'>+	mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);</div><div class='add'>+	mx28_add_saif(0, &amp;mx28evk_mxs_saif_pdata[0]);</div><div class='add'>+	mx28_add_saif(1, &amp;mx28evk_mxs_saif_pdata[1]);</div><div class='ctx'> </div><div class='ctx'> 	mx28_add_mxs_i2c(0);</div><div class='ctx'> 	i2c_register_board_info(0, mxs_i2c0_board_info,</div><div class='hunk'>@@ -501,4 +515,5 @@ MACHINE_START(MX28EVK, "Freescale MX28 EVK")</div><div class='ctx'> 	.init_irq	= mx28_init_irq,</div><div class='ctx'> 	.timer		= &amp;mx28evk_timer,</div><div class='ctx'> 	.init_machine	= mx28evk_init,</div><div class='add'>+	.restart	= mxs_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mxs/mach-stmp378x_devb.c b/arch/arm/mach-mxs/mach-stmp378x_devb.c<br/>index 6834dea38c04..a626c07b8713 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/mach-stmp378x_devb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/mach-stmp378x_devb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/mach-stmp378x_devb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mxs/mach-stmp378x_devb.c</a></div><div class='hunk'>@@ -117,4 +117,5 @@ MACHINE_START(STMP378X, "STMP378X")</div><div class='ctx'> 	.init_irq	= mx23_init_irq,</div><div class='ctx'> 	.timer		= &amp;stmp378x_dvb_timer,</div><div class='ctx'> 	.init_machine	= stmp378x_dvb_init,</div><div class='add'>+	.restart	= mxs_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mxs/mach-tx28.c b/arch/arm/mach-mxs/mach-tx28.c<br/>index 9a1f0e7a338e..2c0862e655ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/mach-tx28.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/mach-tx28.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/mach-tx28.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mxs/mach-tx28.c</a></div><div class='hunk'>@@ -178,4 +178,5 @@ MACHINE_START(TX28, "Ka-Ro electronics TX28 module")</div><div class='ctx'> 	.init_irq = mx28_init_irq,</div><div class='ctx'> 	.timer = &amp;tx28_timer,</div><div class='ctx'> 	.init_machine = tx28_stk5v3_init,</div><div class='add'>+	.restart	= mxs_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-mxs/system.c b/arch/arm/mach-mxs/system.c<br/>index 20ec3bddf7cd..54f91ad1c965 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/system.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/system.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/system.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mxs/system.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@ static void __iomem *mxs_clkctrl_reset_addr;</div><div class='ctx'> /*</div><div class='ctx'>  * Reset the system. It is called by machine_restart().</div><div class='ctx'>  */</div><div class='del'>-void arch_reset(char mode, const char *cmd)</div><div class='add'>+void mxs_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	/* reset the chip */</div><div class='ctx'> 	__mxs_setl(MXS_CLKCTRL_RESET_CHIP, mxs_clkctrl_reset_addr);</div><div class='hunk'>@@ -53,7 +53,7 @@ void arch_reset(char mode, const char *cmd)</div><div class='ctx'> 	mdelay(50);</div><div class='ctx'> </div><div class='ctx'> 	/* We'll take a jump through zero as a poor second */</div><div class='del'>-	cpu_reset(0);</div><div class='add'>+	soft_restart(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init mxs_arch_reset_init(void)</div><div class='hunk'>@@ -66,7 +66,7 @@ static int __init mxs_arch_reset_init(void)</div><div class='ctx'> </div><div class='ctx'> 	clk = clk_get_sys("rtc", NULL);</div><div class='ctx'> 	if (!IS_ERR(clk))</div><div class='del'>-		clk_enable(clk);</div><div class='add'>+		clk_prepare_enable(clk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c<br/>index cace0d2e5a55..564a63279f18 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/timer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-mxs/timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-mxs/timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-mxs/timer.c</a></div><div class='hunk'>@@ -245,7 +245,7 @@ static int __init mxs_clocksource_init(struct clk *timer_clk)</div><div class='ctx'> </div><div class='ctx'> void __init mxs_timer_init(struct clk *timer_clk, int irq)</div><div class='ctx'> {</div><div class='del'>-	clk_enable(timer_clk);</div><div class='add'>+	clk_prepare_enable(timer_clk);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize timers to a known state</div><div class='head'>diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c<br/>index 00023b5cf12b..59e67979f197 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/generic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-netx/generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-netx/generic.c</a></div><div class='hunk'>@@ -187,3 +187,8 @@ static int __init netx_init(void)</div><div class='ctx'> </div><div class='ctx'> subsys_initcall(netx_init);</div><div class='ctx'> </div><div class='add'>+void netx_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	writel(NETX_SYSTEM_RES_CR_FIRMW_RES_EN | NETX_SYSTEM_RES_CR_FIRMW_RES,</div><div class='add'>+	       NETX_SYSTEM_RES_CR);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-netx/generic.h b/arch/arm/mach-netx/generic.h<br/>index ede2d35341c3..9b915119b8d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/generic.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-netx/generic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/generic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-netx/generic.h</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> extern void __init netx_map_io(void);</div><div class='ctx'> extern void __init netx_init_irq(void);</div><div class='add'>+extern void netx_restart(char, const char *);</div><div class='ctx'> </div><div class='ctx'> struct sys_timer;</div><div class='ctx'> extern struct sys_timer netx_timer;</div><div class='head'>diff --git a/arch/arm/mach-netx/include/mach/entry-macro.S b/arch/arm/mach-netx/include/mach/entry-macro.S<br/>index 844f1f9acbdf..6e9f1cbe1634 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-netx/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-netx/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -18,22 +18,9 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro  disable_fiq</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='del'>-		.macro  get_irqnr_preamble, base, tmp</div><div class='del'>-		ldr	\base, =io_p2v(0x001ff000)</div><div class='del'>-		.endm</div><div class='del'>-</div><div class='ctx'> 		.macro  arch_ret_to_user, tmp1, tmp2</div><div class='ctx'> 		.endm</div><div class='del'>-</div><div class='del'>-		.macro  get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-		ldr	\irqstat, [\base, #0]</div><div class='del'>-		clz	\irqnr, \irqstat</div><div class='del'>-		rsb     \irqnr, \irqnr, #31</div><div class='del'>-		cmp	\irqstat, #0</div><div class='del'>-		.endm</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-netx/include/mach/system.h b/arch/arm/mach-netx/include/mach/system.h<br/>index dc7b4bc003c5..b38fa36d58c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-netx/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-netx/include/mach/system.h</a></div><div class='hunk'>@@ -19,20 +19,10 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include "netx-regs.h"</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	writel(NETX_SYSTEM_RES_CR_FIRMW_RES_EN | NETX_SYSTEM_RES_CR_FIRMW_RES,</div><div class='del'>-	       NETX_SYSTEM_RES_CR);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-netx/nxdb500.c b/arch/arm/mach-netx/nxdb500.c<br/>index 90903dd44cbc..180ea899a48a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/nxdb500.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-netx/nxdb500.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/nxdb500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-netx/nxdb500.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;mach/netx-regs.h&gt;</div><div class='ctx'> #include &lt;mach/eth.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -203,6 +204,8 @@ MACHINE_START(NXDB500, "Hilscher nxdb500")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= netx_map_io,</div><div class='ctx'> 	.init_irq	= netx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;netx_timer,</div><div class='ctx'> 	.init_machine	= nxdb500_init,</div><div class='add'>+	.restart	= netx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-netx/nxdkn.c b/arch/arm/mach-netx/nxdkn.c<br/>index c63384aba500..58009e29b20e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/nxdkn.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-netx/nxdkn.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/nxdkn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-netx/nxdkn.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;mach/netx-regs.h&gt;</div><div class='ctx'> #include &lt;mach/eth.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -96,6 +97,8 @@ MACHINE_START(NXDKN, "Hilscher nxdkn")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= netx_map_io,</div><div class='ctx'> 	.init_irq	= netx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;netx_timer,</div><div class='ctx'> 	.init_machine	= nxdkn_init,</div><div class='add'>+	.restart	= netx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-netx/nxeb500hmi.c b/arch/arm/mach-netx/nxeb500hmi.c<br/>index 8f548ec83ad2..122e99826ef6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/nxeb500hmi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-netx/nxeb500hmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/nxeb500hmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-netx/nxeb500hmi.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;mach/netx-regs.h&gt;</div><div class='ctx'> #include &lt;mach/eth.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -180,6 +181,8 @@ MACHINE_START(NXEB500HMI, "Hilscher nxeb500hmi")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= netx_map_io,</div><div class='ctx'> 	.init_irq	= netx_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;netx_timer,</div><div class='ctx'> 	.init_machine	= nxeb500hmi_init,</div><div class='add'>+	.restart	= netx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c<br/>index 0cbb74c96ef7..7c878bf00340 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-nomadik/board-nhk8815.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-nomadik/board-nhk8815.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-nomadik/board-nhk8815.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-nomadik/board-nhk8815.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/mtd/onenand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -34,6 +35,8 @@</div><div class='ctx'> #include &lt;mach/nand.h&gt;</div><div class='ctx'> #include &lt;mach/fsmc.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "cpu-8815.h"</div><div class='add'>+</div><div class='ctx'> /* Initial value for SRC control register: all timers use MXTAL/8 source */</div><div class='ctx'> #define SRC_CR_INIT_MASK	0x00007fff</div><div class='ctx'> #define SRC_CR_INIT_VAL		0x2aaa8000</div><div class='hunk'>@@ -280,6 +283,8 @@ MACHINE_START(NOMADIK, "NHK8815")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= cpu8815_map_io,</div><div class='ctx'> 	.init_irq	= cpu8815_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;nomadik_timer,</div><div class='ctx'> 	.init_machine	= nhk8815_platform_init,</div><div class='add'>+	.restart	= cpu8815_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c<br/>index dc67717db6f0..65df7b4fdd3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-nomadik/cpu-8815.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-nomadik/cpu-8815.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-nomadik/cpu-8815.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-nomadik/cpu-8815.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/gpio-nomadik.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='hunk'>@@ -32,6 +33,7 @@</div><div class='ctx'> #include &lt;asm/hardware/cache-l2x0.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "clock.h"</div><div class='add'>+#include "cpu-8815.h"</div><div class='ctx'> </div><div class='ctx'> #define __MEM_4K_RESOURCE(x) \</div><div class='ctx'> 	.res = {.start = (x), .end = (x) + SZ_4K - 1, .flags = IORESOURCE_MEM}</div><div class='hunk'>@@ -164,3 +166,13 @@ void __init cpu8815_init_irq(void)</div><div class='ctx'> #endif</div><div class='ctx'> 	 return;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void cpu8815_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	void __iomem *src_rstsr = io_p2v(NOMADIK_SRC_BASE + 0x18);</div><div class='add'>+</div><div class='add'>+	/* FIXME: use egpio when implemented */</div><div class='add'>+</div><div class='add'>+	/* Write anything to Reset status register */</div><div class='add'>+	writel(1, src_rstsr);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-nomadik/cpu-8815.h b/arch/arm/mach-nomadik/cpu-8815.h<br/>new file mode 100644<br/>index 000000000000..71c21e8a11dc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-nomadik/cpu-8815.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-nomadik/cpu-8815.h</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+extern void cpu8815_map_io(void);</div><div class='add'>+extern void cpu8815_platform_init(void);</div><div class='add'>+extern void cpu8815_init_irq(void);</div><div class='add'>+extern void cpu8815_restart(char, const char *);</div><div class='head'>diff --git a/arch/arm/mach-nomadik/include/mach/entry-macro.S b/arch/arm/mach-nomadik/include/mach/entry-macro.S<br/>index 49f1aa3bb420..98ea1c1fbbab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-nomadik/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-nomadik/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-nomadik/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-nomadik/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -6,38 +6,8 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/irqs.h&gt;</div><div class='del'>-</div><div class='ctx'> 	.macro	disable_fiq</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro	get_irqnr_preamble, base, tmp</div><div class='del'>-	ldr	\base, =IO_ADDRESS(NOMADIK_IC_BASE)</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='ctx'> 	.macro	arch_ret_to_user, tmp1, tmp2</div><div class='ctx'> 	.endm</div><div class='del'>-</div><div class='del'>-	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-</div><div class='del'>-	/* This stanza gets the irq mask from one of two status registers */</div><div class='del'>-	mov	\irqnr, #0</div><div class='del'>-	ldr	\irqstat, [\base, #VIC_REG_IRQSR0]	@ get masked status</div><div class='del'>-	cmp	\irqstat, #0</div><div class='del'>-	bne	1001f</div><div class='del'>-	add	\irqnr, \irqnr, #32</div><div class='del'>-	ldr	\irqstat, [\base, #VIC_REG_IRQSR1]	@ get masked status</div><div class='del'>-</div><div class='del'>-1001:	tst	\irqstat, #15</div><div class='del'>-	bne	1002f</div><div class='del'>-	add	\irqnr, \irqnr, #4</div><div class='del'>-	movs	\irqstat, \irqstat, lsr #4</div><div class='del'>-	bne	1001b</div><div class='del'>-1002:	tst	\irqstat, #1</div><div class='del'>-	bne	1003f</div><div class='del'>-	add	\irqnr, \irqnr, #1</div><div class='del'>-	movs	\irqstat, \irqstat, lsr #1</div><div class='del'>-	bne	1002b</div><div class='del'>-1003:	/* EQ will be set if no irqs pending */</div><div class='del'>-	.endm</div><div class='head'>diff --git a/arch/arm/mach-nomadik/include/mach/setup.h b/arch/arm/mach-nomadik/include/mach/setup.h<br/>index b7897edf1f35..bcaeaf41c053 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-nomadik/include/mach/setup.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-nomadik/include/mach/setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-nomadik/include/mach/setup.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-nomadik/include/mach/setup.h</a></div><div class='hunk'>@@ -12,9 +12,6 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NOMADIK_8815</div><div class='ctx'> </div><div class='del'>-extern void cpu8815_map_io(void);</div><div class='del'>-extern void cpu8815_platform_init(void);</div><div class='del'>-extern void cpu8815_init_irq(void);</div><div class='ctx'> extern void nmdk_timer_init(void);</div><div class='ctx'> </div><div class='ctx'> #endif /* NOMADIK_8815 */</div><div class='head'>diff --git a/arch/arm/mach-nomadik/include/mach/system.h b/arch/arm/mach-nomadik/include/mach/system.h<br/>index 7119f688116e..25e198b8976c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-nomadik/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-nomadik/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-nomadik/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-nomadik/include/mach/system.h</a></div><div class='hunk'>@@ -20,9 +20,6 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -32,14 +29,4 @@ static inline void arch_idle(void)</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	void __iomem *src_rstsr = io_p2v(NOMADIK_SRC_BASE + 0x18);</div><div class='del'>-</div><div class='del'>-	/* FIXME: use egpio when implemented */</div><div class='del'>-</div><div class='del'>-	/* Write anything to Reset status register */</div><div class='del'>-	writel(1, src_rstsr);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-nomadik/include/mach/vmalloc.h b/arch/arm/mach-nomadik/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index f83d574d9445..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-nomadik/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-nomadik/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END       0xe8000000UL</div><div class='head'>diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig<br/>index 73f287d6429b..4f8d66f044e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/Kconfig</a></div><div class='hunk'>@@ -168,70 +168,6 @@ config MACH_OMAP_GENERIC</div><div class='ctx'>           custom OMAP boards. Say Y here if you have a custom</div><div class='ctx'>           board.</div><div class='ctx'> </div><div class='del'>-comment "OMAP CPU Speed"</div><div class='del'>-	depends on ARCH_OMAP1</div><div class='del'>-</div><div class='del'>-config OMAP_ARM_216MHZ</div><div class='del'>-	bool "OMAP ARM 216 MHz CPU (1710 only)"</div><div class='del'>-        depends on ARCH_OMAP1 &amp;&amp; ARCH_OMAP16XX</div><div class='del'>-        help</div><div class='del'>-          Enable 216 MHz clock for OMAP1710 CPU. If unsure, say N.</div><div class='del'>-</div><div class='del'>-config OMAP_ARM_195MHZ</div><div class='del'>-	bool "OMAP ARM 195 MHz CPU"</div><div class='del'>-	depends on ARCH_OMAP1 &amp;&amp; (ARCH_OMAP730 || ARCH_OMAP850)</div><div class='del'>-	help</div><div class='del'>-          Enable 195MHz clock for OMAP CPU. If unsure, say N.</div><div class='del'>-</div><div class='del'>-config OMAP_ARM_192MHZ</div><div class='del'>-	bool "OMAP ARM 192 MHz CPU"</div><div class='del'>-	depends on ARCH_OMAP1 &amp;&amp; ARCH_OMAP16XX</div><div class='del'>-	help</div><div class='del'>-          Enable 192MHz clock for OMAP CPU. If unsure, say N.</div><div class='del'>-</div><div class='del'>-config OMAP_ARM_182MHZ</div><div class='del'>-	bool "OMAP ARM 182 MHz CPU"</div><div class='del'>-	depends on ARCH_OMAP1 &amp;&amp; (ARCH_OMAP730 || ARCH_OMAP850)</div><div class='del'>-	help</div><div class='del'>-          Enable 182MHz clock for OMAP CPU. If unsure, say N.</div><div class='del'>-</div><div class='del'>-config OMAP_ARM_168MHZ</div><div class='del'>-	bool "OMAP ARM 168 MHz CPU"</div><div class='del'>-	depends on ARCH_OMAP1 &amp;&amp; (ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_OMAP850)</div><div class='del'>-	help</div><div class='del'>-          Enable 168MHz clock for OMAP CPU. If unsure, say N.</div><div class='del'>-</div><div class='del'>-config OMAP_ARM_150MHZ</div><div class='del'>-	bool "OMAP ARM 150 MHz CPU"</div><div class='del'>-	depends on ARCH_OMAP1 &amp;&amp; ARCH_OMAP15XX</div><div class='del'>-	help</div><div class='del'>-	  Enable 150MHz clock for OMAP CPU. If unsure, say N.</div><div class='del'>-</div><div class='del'>-config OMAP_ARM_120MHZ</div><div class='del'>-	bool "OMAP ARM 120 MHz CPU"</div><div class='del'>-	depends on ARCH_OMAP1 &amp;&amp; (ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_OMAP850)</div><div class='del'>-	help</div><div class='del'>-          Enable 120MHz clock for OMAP CPU. If unsure, say N.</div><div class='del'>-</div><div class='del'>-config OMAP_ARM_96MHZ</div><div class='del'>-	bool "OMAP ARM 96 MHz CPU"</div><div class='del'>-	depends on ARCH_OMAP1 &amp;&amp; (ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_OMAP850)</div><div class='del'>-	help</div><div class='del'>-          Enable 96MHz clock for OMAP CPU. If unsure, say N.</div><div class='del'>-</div><div class='del'>-config OMAP_ARM_60MHZ</div><div class='del'>-	bool "OMAP ARM 60 MHz CPU"</div><div class='del'>-	depends on ARCH_OMAP1 &amp;&amp; (ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_OMAP850)</div><div class='del'>-        default y</div><div class='del'>-	help</div><div class='del'>-          Enable 60MHz clock for OMAP CPU. If unsure, say Y.</div><div class='del'>-</div><div class='del'>-config OMAP_ARM_30MHZ</div><div class='del'>-	bool "OMAP ARM 30 MHz CPU"</div><div class='del'>-	depends on ARCH_OMAP1 &amp;&amp; (ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_OMAP850)</div><div class='del'>-	help</div><div class='del'>-          Enable 30MHz clock for OMAP CPU. If unsure, say N.</div><div class='del'>-</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> endif</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 b0f15d234a12..88909cc0b254 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-ams-delta.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-ams-delta.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-ams-delta.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/board-ams-delta.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include &lt;plat/mux.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;mach/camera.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/ams-delta-fiq.h&gt;</div><div class='hunk'>@@ -386,6 +386,7 @@ MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)")</div><div class='ctx'> 	.init_irq	= omap1_init_irq,</div><div class='ctx'> 	.init_machine	= ams_delta_init,</div><div class='ctx'> 	.timer		= &amp;omap1_timer,</div><div class='add'>+	.restart	= omap1_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(ams_delta_latch1_write);</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c<br/>index 23178275f96b..0b9464b41212 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-fsample.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-fsample.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-fsample.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/board-fsample.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #include &lt;plat/flash.h&gt;</div><div class='ctx'> #include &lt;plat/fpga.h&gt;</div><div class='ctx'> #include &lt;plat/keypad.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* fsample is pretty close to p2-sample */</div><div class='hunk'>@@ -390,4 +390,5 @@ MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample")</div><div class='ctx'> 	.init_irq	= omap1_init_irq,</div><div class='ctx'> 	.init_machine	= omap_fsample_init,</div><div class='ctx'> 	.timer		= &amp;omap1_timer,</div><div class='add'>+	.restart	= omap1_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c<br/>index dc5b75de531c..9a5fe581bc1c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-generic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/board-generic.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;plat/mux.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> /* assume no Mini-AB port */</div><div class='ctx'> </div><div class='hunk'>@@ -89,4 +89,5 @@ MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")</div><div class='ctx'> 	.init_irq	= omap1_init_irq,</div><div class='ctx'> 	.init_machine	= omap_generic_init,</div><div class='ctx'> 	.timer		= &amp;omap1_timer,</div><div class='add'>+	.restart	= omap1_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c<br/>index b334b1481678..00ad6b22d60a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-h2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-h2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-h2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/board-h2.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'> #include &lt;plat/irda.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> #include &lt;plat/keypad.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/flash.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "board-h2.h"</div><div class='hunk'>@@ -456,4 +456,5 @@ MACHINE_START(OMAP_H2, "TI-H2")</div><div class='ctx'> 	.init_irq	= omap1_init_irq,</div><div class='ctx'> 	.init_machine	= h2_init,</div><div class='ctx'> 	.timer		= &amp;omap1_timer,</div><div class='add'>+	.restart	= omap1_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c<br/>index 74ebe72c9848..4a7f25149703 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-h3.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-h3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-h3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/board-h3.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> #include &lt;plat/keypad.h&gt;</div><div class='ctx'> #include &lt;plat/dma.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/flash.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "board-h3.h"</div><div class='hunk'>@@ -444,4 +444,5 @@ MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")</div><div class='ctx'> 	.init_irq	= omap1_init_irq,</div><div class='ctx'> 	.init_machine	= h3_init,</div><div class='ctx'> 	.timer		= &amp;omap1_timer,</div><div class='add'>+	.restart	= omap1_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c<br/>index 3e91baab1a89..731cc3db7ab3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-htcherald.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-htcherald.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-htcherald.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/board-htcherald.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/omap7xx.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='ctx'> #include &lt;plat/keypad.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='hunk'>@@ -610,4 +610,5 @@ MACHINE_START(HERALD, "HTC Herald")</div><div class='ctx'> 	.init_irq       = omap1_init_irq,</div><div class='ctx'> 	.init_machine   = htcherald_init,</div><div class='ctx'> 	.timer          = &amp;omap1_timer,</div><div class='add'>+	.restart	= omap1_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c<br/>index 273153dba15b..309369ea6978 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-innovator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-innovator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-innovator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/board-innovator.c</a></div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'> #include &lt;plat/tc.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> #include &lt;plat/keypad.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/mmc.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */</div><div class='hunk'>@@ -460,4 +460,5 @@ MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")</div><div class='ctx'> 	.init_irq	= omap1_init_irq,</div><div class='ctx'> 	.init_machine	= innovator_init,</div><div class='ctx'> 	.timer		= &amp;omap1_timer,</div><div class='add'>+	.restart	= omap1_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c<br/>index 6798b8488315..f9efc036ba96 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-nokia770.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-nokia770.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-nokia770.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/board-nokia770.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='ctx'> #include &lt;plat/keypad.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/hwa742.h&gt;</div><div class='ctx'> #include &lt;plat/lcd_mipid.h&gt;</div><div class='ctx'> #include &lt;plat/mmc.h&gt;</div><div class='hunk'>@@ -259,4 +259,5 @@ MACHINE_START(NOKIA770, "Nokia 770")</div><div class='ctx'> 	.init_irq	= omap1_init_irq,</div><div class='ctx'> 	.init_machine	= omap_nokia770_init,</div><div class='ctx'> 	.timer		= &amp;omap1_timer,</div><div class='add'>+	.restart	= omap1_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c<br/>index c3859278d257..675de06557aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-osk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-osk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-osk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/board-osk.c</a></div><div class='hunk'>@@ -51,7 +51,7 @@</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> #include &lt;plat/mux.h&gt;</div><div class='ctx'> #include &lt;plat/tc.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> /* At OMAP5912 OSK the Ethernet is directly connected to CS1 */</div><div class='ctx'> #define OMAP_OSK_ETHR_START		0x04800300</div><div class='hunk'>@@ -578,4 +578,5 @@ MACHINE_START(OMAP_OSK, "TI-OSK")</div><div class='ctx'> 	.init_irq	= omap1_init_irq,</div><div class='ctx'> 	.init_machine	= osk_init,</div><div class='ctx'> 	.timer		= &amp;omap1_timer,</div><div class='add'>+	.restart	= omap1_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c<br/>index f9c44cb15b47..81fa27f88369 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-palmte.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-palmte.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-palmte.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/board-palmte.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='ctx'> #include &lt;plat/irda.h&gt;</div><div class='ctx'> #include &lt;plat/keypad.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #define PALMTE_USBDETECT_GPIO	0</div><div class='ctx'> #define PALMTE_USB_OR_DC_GPIO	1</div><div class='hunk'>@@ -270,4 +270,5 @@ MACHINE_START(OMAP_PALMTE, "OMAP310 based Palm Tungsten E")</div><div class='ctx'> 	.init_irq	= omap1_init_irq,</div><div class='ctx'> 	.init_machine	= omap_palmte_init,</div><div class='ctx'> 	.timer		= &amp;omap1_timer,</div><div class='add'>+	.restart	= omap1_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c<br/>index 11a98539f7bb..81cb82178388 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-palmtt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-palmtt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-palmtt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/board-palmtt.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='ctx'> #include &lt;plat/irda.h&gt;</div><div class='ctx'> #include &lt;plat/keypad.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/spi/ads7846.h&gt;</div><div class='hunk'>@@ -317,4 +317,5 @@ MACHINE_START(OMAP_PALMTT, "OMAP1510 based Palm Tungsten|T")</div><div class='ctx'> 	.init_irq	= omap1_init_irq,</div><div class='ctx'> 	.init_machine	= omap_palmtt_init,</div><div class='ctx'> 	.timer		= &amp;omap1_timer,</div><div class='add'>+	.restart	= omap1_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c<br/>index 42061573e380..e881945ce8ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-palmz71.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-palmz71.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-palmz71.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/board-palmz71.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='ctx'> #include &lt;plat/irda.h&gt;</div><div class='ctx'> #include &lt;plat/keypad.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/spi/ads7846.h&gt;</div><div class='hunk'>@@ -334,4 +334,5 @@ MACHINE_START(OMAP_PALMZ71, "OMAP310 based Palm Zire71")</div><div class='ctx'> 	.init_irq	= omap1_init_irq,</div><div class='ctx'> 	.init_machine	= omap_palmz71_init,</div><div class='ctx'> 	.timer		= &amp;omap1_timer,</div><div class='add'>+	.restart	= omap1_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c<br/>index 203ae07550db..c000bed76276 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-perseus2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-perseus2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-perseus2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/board-perseus2.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #include &lt;plat/fpga.h&gt;</div><div class='ctx'> #include &lt;plat/flash.h&gt;</div><div class='ctx'> #include &lt;plat/keypad.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='ctx'> </div><div class='ctx'> static const unsigned int p2_keymap[] = {</div><div class='hunk'>@@ -352,4 +352,5 @@ MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")</div><div class='ctx'> 	.init_irq	= omap1_init_irq,</div><div class='ctx'> 	.init_machine	= omap_perseus2_init,</div><div class='ctx'> 	.timer		= &amp;omap1_timer,</div><div class='add'>+	.restart	= omap1_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c<br/>index 092a4c046407..7bcd82ab0fd0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-sx1.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-sx1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-sx1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/board-sx1.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> #include &lt;plat/tc.h&gt;</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/keypad.h&gt;</div><div class='ctx'> #include &lt;plat/board-sx1.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -416,4 +416,5 @@ MACHINE_START(SX1, "OMAP310 based Siemens SX1")</div><div class='ctx'> 	.init_irq	= omap1_init_irq,</div><div class='ctx'> 	.init_machine	= omap_sx1_init,</div><div class='ctx'> 	.timer		= &amp;omap1_timer,</div><div class='add'>+	.restart	= omap1_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c<br/>index 61ed6cdab2bd..f83a502dc93c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-voiceblue.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/board-voiceblue.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-voiceblue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/board-voiceblue.c</a></div><div class='hunk'>@@ -28,13 +28,12 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/system.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/board-voiceblue.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/flash.h&gt;</div><div class='ctx'> #include &lt;plat/mux.h&gt;</div><div class='ctx'> #include &lt;plat/tc.h&gt;</div><div class='hunk'>@@ -221,7 +220,7 @@ void voiceblue_wdt_ping(void)</div><div class='ctx'> 	gpio_set_value(0, wdt_gpio_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void voiceblue_reset(char mode, const char *cmd)</div><div class='add'>+static void voiceblue_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Workaround for 5912/1611b bug mentioned in sprz209d.pdf p. 28</div><div class='hunk'>@@ -285,8 +284,6 @@ static void __init voiceblue_init(void)</div><div class='ctx'> 	 * (it is connected through invertor) */</div><div class='ctx'> 	omap_writeb(0x00, OMAP_LPG1_LCR);</div><div class='ctx'> 	omap_writeb(0x00, OMAP_LPG1_PMR);	/* Disable clock */</div><div class='del'>-</div><div class='del'>-	arch_reset = voiceblue_reset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(VOICEBLUE, "VoiceBlue OMAP5910")</div><div class='hunk'>@@ -298,4 +295,5 @@ MACHINE_START(VOICEBLUE, "VoiceBlue OMAP5910")</div><div class='ctx'> 	.init_irq	= omap1_init_irq,</div><div class='ctx'> 	.init_machine	= voiceblue_init,</div><div class='ctx'> 	.timer		= &amp;omap1_timer,</div><div class='add'>+	.restart	= voiceblue_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c<br/>index 84ef70476b51..0c50df05d135 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/clock.c</a></div><div class='hunk'>@@ -197,11 +197,10 @@ int omap1_select_table_rate(struct clk *clk, unsigned long rate)</div><div class='ctx'> 	ref_rate = ck_ref_p-&gt;rate;</div><div class='ctx'> </div><div class='ctx'> 	for (ptr = omap1_rate_table; ptr-&gt;rate; ptr++) {</div><div class='del'>-		if (ptr-&gt;xtal != ref_rate)</div><div class='add'>+		if (!(ptr-&gt;flags &amp; cpu_mask))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		/* DPLL1 cannot be reprogrammed without risking system crash */</div><div class='del'>-		if (likely(dpll1_rate != 0) &amp;&amp; ptr-&gt;pll_rate != dpll1_rate)</div><div class='add'>+		if (ptr-&gt;xtal != ref_rate)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Can check only after xtal frequency check */</div><div class='hunk'>@@ -215,12 +214,8 @@ int omap1_select_table_rate(struct clk *clk, unsigned long rate)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In most cases we should not need to reprogram DPLL.</div><div class='ctx'> 	 * Reprogramming the DPLL is tricky, it must be done from SRAM.</div><div class='del'>-	 * (on 730, bit 13 must always be 1)</div><div class='ctx'> 	 */</div><div class='del'>-	if (cpu_is_omap7xx())</div><div class='del'>-		omap_sram_reprogram_clock(ptr-&gt;dpllctl_val, ptr-&gt;ckctl_val | 0x2000);</div><div class='del'>-	else</div><div class='del'>-		omap_sram_reprogram_clock(ptr-&gt;dpllctl_val, ptr-&gt;ckctl_val);</div><div class='add'>+	omap_sram_reprogram_clock(ptr-&gt;dpllctl_val, ptr-&gt;ckctl_val);</div><div class='ctx'> </div><div class='ctx'> 	/* XXX Do we need to recalculate the tree below DPLL1 at this point? */</div><div class='ctx'> 	ck_dpll1_p-&gt;rate = ptr-&gt;pll_rate;</div><div class='hunk'>@@ -290,6 +285,9 @@ long omap1_round_to_table_rate(struct clk *clk, unsigned long rate)</div><div class='ctx'> 	highest_rate = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	for (ptr = omap1_rate_table; ptr-&gt;rate; ptr++) {</div><div class='add'>+		if (!(ptr-&gt;flags &amp; cpu_mask))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		if (ptr-&gt;xtal != ref_rate)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h<br/>index 16b1423b454a..3d04f4f67676 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/clock.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/clock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/clock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/clock.h</a></div><div class='hunk'>@@ -111,4 +111,7 @@ extern const struct clkops clkops_dummy;</div><div class='ctx'> extern const struct clkops clkops_uart_16xx;</div><div class='ctx'> extern const struct clkops clkops_generic;</div><div class='ctx'> </div><div class='add'>+/* used for passing SoC type to omap1_{select,round_to}_table_rate() */</div><div class='add'>+extern u32 cpu_mask;</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c<br/>index 9ff90a744a21..94699a82a734 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/clock_data.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/clock_data.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/clock_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/clock_data.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/clkdev_omap.h&gt;</div><div class='add'>+#include &lt;plat/sram.h&gt;	/* for omap_sram_reprogram_clock() */</div><div class='ctx'> #include &lt;plat/usb.h&gt;   /* for OTG_BASE */</div><div class='ctx'> </div><div class='ctx'> #include "clock.h"</div><div class='hunk'>@@ -778,12 +779,14 @@ static void __init omap1_show_rates(void)</div><div class='ctx'> 		arm_ck.rate / 1000000, (arm_ck.rate / 100000) % 10);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u32 cpu_mask;</div><div class='add'>+</div><div class='ctx'> int __init omap1_clk_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct omap_clk *c;</div><div class='ctx'> 	const struct omap_clock_config *info;</div><div class='ctx'> 	int crystal_type = 0; /* Default 12 MHz */</div><div class='del'>-	u32 reg, cpu_mask;</div><div class='add'>+	u32 reg;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_LL</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -808,6 +811,8 @@ int __init omap1_clk_init(void)</div><div class='ctx'> 		clk_preinit(c-&gt;lk.clk);</div><div class='ctx'> </div><div class='ctx'> 	cpu_mask = 0;</div><div class='add'>+	if (cpu_is_omap1710())</div><div class='add'>+		cpu_mask |= CK_1710;</div><div class='ctx'> 	if (cpu_is_omap16xx())</div><div class='ctx'> 		cpu_mask |= CK_16XX;</div><div class='ctx'> 	if (cpu_is_omap1510())</div><div class='hunk'>@@ -931,17 +936,13 @@ void __init omap1_clk_late_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long rate = ck_dpll1.rate;</div><div class='ctx'> </div><div class='del'>-	if (rate &gt;= OMAP1_DPLL1_SANE_VALUE)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* System booting at unusable rate, force reprogramming of DPLL1 */</div><div class='del'>-	ck_dpll1_p-&gt;rate = 0;</div><div class='del'>-</div><div class='ctx'> 	/* Find the highest supported frequency and enable it */</div><div class='ctx'> 	if (omap1_select_table_rate(&amp;virtual_ck_mpu, ~0)) {</div><div class='ctx'> 		pr_err("System frequencies not set, using default. Check your config.\n");</div><div class='del'>-		omap_writew(0x2290, DPLL_CTL);</div><div class='del'>-		omap_writew(cpu_is_omap7xx() ? 0x2005 : 0x0005, ARM_CKCTL);</div><div class='add'>+		/*</div><div class='add'>+		 * Reprogramming the DPLL is tricky, it must be done from SRAM.</div><div class='add'>+		 */</div><div class='add'>+		omap_sram_reprogram_clock(0x2290, 0x0005);</div><div class='ctx'> 		ck_dpll1.rate = OMAP1_DPLL1_SANE_VALUE;</div><div class='ctx'> 	}</div><div class='ctx'> 	propagate_rate(&amp;ck_dpll1);</div><div class='head'>diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h<br/>new file mode 100644<br/>index 000000000000..a9a5146dd2d4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/common.h</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * Header for code common to all OMAP1 machines.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; either version 2 of the License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED</div><div class='add'>+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN</div><div class='add'>+ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,</div><div class='add'>+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='add'>+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF</div><div class='add'>+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='add'>+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='add'>+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the  GNU General Public License along</div><div class='add'>+ * with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='add'>+ * 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ARCH_ARM_MACH_OMAP1_COMMON_H</div><div class='add'>+#define __ARCH_ARM_MACH_OMAP1_COMMON_H</div><div class='add'>+</div><div class='add'>+#include &lt;plat/common.h&gt;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)</div><div class='add'>+void omap7xx_map_io(void);</div><div class='add'>+#else</div><div class='add'>+static inline void omap7xx_map_io(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP15XX</div><div class='add'>+void omap15xx_map_io(void);</div><div class='add'>+#else</div><div class='add'>+static inline void omap15xx_map_io(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP16XX</div><div class='add'>+void omap16xx_map_io(void);</div><div class='add'>+#else</div><div class='add'>+static inline void omap16xx_map_io(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void omap1_init_early(void);</div><div class='add'>+void omap1_init_irq(void);</div><div class='add'>+void omap1_restart(char, const char *);</div><div class='add'>+</div><div class='add'>+extern struct sys_timer omap1_timer;</div><div class='add'>+extern bool omap_32k_timer_init(void);</div><div class='add'>+</div><div class='add'>+#endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */</div><div class='head'>diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c<br/>index 475cb2f50d87..1d76a63c0983 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/devices.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/devices.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/tc.h&gt;</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='ctx'> #include &lt;plat/mux.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap1/include/mach/vmalloc.h b/arch/arm/mach-omap1/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 22ec4a479577..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  arch/arm/mach-omap1/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2000 Russell King.</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='del'>-#define VMALLOC_END	0xd8000000UL</div><div class='head'>diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c<br/>index 7969cfda4454..8e55b6fb3478 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/io.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/io.c</a></div><div class='hunk'>@@ -121,7 +121,6 @@ void __init omap16xx_map_io(void)</div><div class='ctx'> void omap1_init_early(void)</div><div class='ctx'> {</div><div class='ctx'> 	omap_check_revision();</div><div class='del'>-	omap_ioremap_init();</div><div class='ctx'> </div><div class='ctx'> 	/* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort</div><div class='ctx'> 	 * on a Posted Write in the TIPB Bridge".</div><div class='head'>diff --git a/arch/arm/mach-omap1/opp.h b/arch/arm/mach-omap1/opp.h<br/>index 07074d79adce..79a683864a5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/opp.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/opp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/opp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/opp.h</a></div><div class='hunk'>@@ -21,6 +21,7 @@ struct mpu_rate {</div><div class='ctx'> 	unsigned long		pll_rate;</div><div class='ctx'> 	__u16			ckctl_val;</div><div class='ctx'> 	__u16			dpllctl_val;</div><div class='add'>+	u32			flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct mpu_rate omap1_rate_table[];</div><div class='head'>diff --git a/arch/arm/mach-omap1/opp_data.c b/arch/arm/mach-omap1/opp_data.c<br/>index 75a546514994..9cd4ddb51397 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/opp_data.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/opp_data.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/opp_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/opp_data.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;plat/clkdev_omap.h&gt;</div><div class='ctx'> #include "opp.h"</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------</div><div class='hunk'>@@ -20,40 +21,34 @@ struct mpu_rate omap1_rate_table[] = {</div><div class='ctx'> 	 * NOTE: Comment order here is different from bits in CKCTL value:</div><div class='ctx'> 	 * armdiv, dspdiv, dspmmu, tcdiv, perdiv, lcddiv</div><div class='ctx'> 	 */</div><div class='del'>-#if defined(CONFIG_OMAP_ARM_216MHZ)</div><div class='del'>-	{ 216000000, 12000000, 216000000, 0x050d, 0x2910 }, /* 1/1/2/2/2/8 */</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_OMAP_ARM_195MHZ)</div><div class='del'>-	{ 195000000, 13000000, 195000000, 0x050e, 0x2790 }, /* 1/1/2/2/4/8 */</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_OMAP_ARM_192MHZ)</div><div class='del'>-	{ 192000000, 19200000, 192000000, 0x050f, 0x2510 }, /* 1/1/2/2/8/8 */</div><div class='del'>-	{ 192000000, 12000000, 192000000, 0x050f, 0x2810 }, /* 1/1/2/2/8/8 */</div><div class='del'>-	{  96000000, 12000000, 192000000, 0x055f, 0x2810 }, /* 2/2/2/2/8/8 */</div><div class='del'>-	{  48000000, 12000000, 192000000, 0x0baf, 0x2810 }, /* 4/4/4/8/8/8 */</div><div class='del'>-	{  24000000, 12000000, 192000000, 0x0fff, 0x2810 }, /* 8/8/8/8/8/8 */</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_OMAP_ARM_182MHZ)</div><div class='del'>-	{ 182000000, 13000000, 182000000, 0x050e, 0x2710 }, /* 1/1/2/2/4/8 */</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_OMAP_ARM_168MHZ)</div><div class='del'>-	{ 168000000, 12000000, 168000000, 0x010f, 0x2710 }, /* 1/1/1/2/8/8 */</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_OMAP_ARM_150MHZ)</div><div class='del'>-	{ 150000000, 12000000, 150000000, 0x010a, 0x2cb0 }, /* 1/1/1/2/4/4 */</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_OMAP_ARM_120MHZ)</div><div class='del'>-	{ 120000000, 12000000, 120000000, 0x010a, 0x2510 }, /* 1/1/1/2/4/4 */</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_OMAP_ARM_96MHZ)</div><div class='del'>-	{  96000000, 12000000,  96000000, 0x0005, 0x2410 }, /* 1/1/1/1/2/2 */</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_OMAP_ARM_60MHZ)</div><div class='del'>-	{  60000000, 12000000,  60000000, 0x0005, 0x2290 }, /* 1/1/1/1/2/2 */</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_OMAP_ARM_30MHZ)</div><div class='del'>-	{  30000000, 12000000,  60000000, 0x0555, 0x2290 }, /* 2/2/2/2/2/2 */</div><div class='del'>-#endif</div><div class='add'>+	{ 216000000, 12000000, 216000000, 0x050d, 0x2910, /* 1/1/2/2/2/8 */</div><div class='add'>+			CK_1710 },</div><div class='add'>+	{ 195000000, 13000000, 195000000, 0x050e, 0x2790, /* 1/1/2/2/4/8 */</div><div class='add'>+			CK_7XX },</div><div class='add'>+	{ 192000000, 19200000, 192000000, 0x050f, 0x2510, /* 1/1/2/2/8/8 */</div><div class='add'>+			CK_16XX },</div><div class='add'>+	{ 192000000, 12000000, 192000000, 0x050f, 0x2810, /* 1/1/2/2/8/8 */</div><div class='add'>+			CK_16XX },</div><div class='add'>+	{  96000000, 12000000, 192000000, 0x055f, 0x2810, /* 2/2/2/2/8/8 */</div><div class='add'>+			CK_16XX },</div><div class='add'>+	{  48000000, 12000000, 192000000, 0x0baf, 0x2810, /* 4/4/4/8/8/8 */</div><div class='add'>+			CK_16XX },</div><div class='add'>+	{  24000000, 12000000, 192000000, 0x0fff, 0x2810, /* 8/8/8/8/8/8 */</div><div class='add'>+			CK_16XX },</div><div class='add'>+	{ 182000000, 13000000, 182000000, 0x050e, 0x2710, /* 1/1/2/2/4/8 */</div><div class='add'>+			CK_7XX },</div><div class='add'>+	{ 168000000, 12000000, 168000000, 0x010f, 0x2710, /* 1/1/1/2/8/8 */</div><div class='add'>+			CK_16XX|CK_7XX },</div><div class='add'>+	{ 150000000, 12000000, 150000000, 0x010a, 0x2cb0, /* 1/1/1/2/4/4 */</div><div class='add'>+			CK_1510 },</div><div class='add'>+	{ 120000000, 12000000, 120000000, 0x010a, 0x2510, /* 1/1/1/2/4/4 */</div><div class='add'>+			CK_16XX|CK_1510|CK_310|CK_7XX },</div><div class='add'>+	{  96000000, 12000000,  96000000, 0x0005, 0x2410, /* 1/1/1/1/2/2 */</div><div class='add'>+			CK_16XX|CK_1510|CK_310|CK_7XX },</div><div class='add'>+	{  60000000, 12000000,  60000000, 0x0005, 0x2290, /* 1/1/1/1/2/2 */</div><div class='add'>+			CK_16XX|CK_1510|CK_310|CK_7XX },</div><div class='add'>+	{  30000000, 12000000,  60000000, 0x0555, 0x2290, /* 2/2/2/2/2/2 */</div><div class='add'>+			CK_16XX|CK_1510|CK_310|CK_7XX },</div><div class='ctx'> 	{ 0, 0, 0, 0, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/reset.c b/arch/arm/mach-omap1/reset.c<br/>index ad951ee69205..91d199b64979 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/reset.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/reset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/reset.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/reset.c</a></div><div class='hunk'>@@ -5,10 +5,9 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/system.h&gt;</div><div class='ctx'> #include &lt;plat/prcm.h&gt;</div><div class='ctx'> </div><div class='del'>-void omap1_arch_reset(char mode, const char *cmd)</div><div class='add'>+void omap1_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Workaround for 5912/1611b bug mentioned in sprz209d.pdf p. 28</div><div class='hunk'>@@ -21,5 +20,3 @@ void omap1_arch_reset(char mode, const char *cmd)</div><div class='ctx'> </div><div class='ctx'> 	omap_writew(1, ARM_RSTCT1);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-void (*arch_reset)(char, const char *) = omap1_arch_reset;</div><div class='head'>diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c<br/>index a1837771e031..b8faffa44f9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/time.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</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/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='hunk'>@@ -54,7 +53,7 @@</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_OMAP_MPU_TIMER</div><div class='ctx'> </div><div class='hunk'>@@ -190,30 +189,9 @@ static __init void omap_init_mpu_timer(unsigned long rate)</div><div class='ctx'>  * ---------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static DEFINE_CLOCK_DATA(cd);</div><div class='del'>-</div><div class='del'>-static inline unsigned long long notrace _omap_mpu_sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	u32 cyc = ~omap_mpu_timer_read(1);</div><div class='del'>-	return cyc_to_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_OMAP_32K_TIMER</div><div class='del'>-unsigned long long notrace sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	return _omap_mpu_sched_clock();</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static unsigned long long notrace omap_mpu_sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	return _omap_mpu_sched_clock();</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void notrace mpu_update_sched_clock(void)</div><div class='add'>+static u32 notrace omap_mpu_read_sched_clock(void)</div><div class='ctx'> {</div><div class='del'>-	u32 cyc = ~omap_mpu_timer_read(1);</div><div class='del'>-	update_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='add'>+	return ~omap_mpu_timer_read(1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init omap_init_clocksource(unsigned long rate)</div><div class='hunk'>@@ -223,7 +201,7 @@ static void __init omap_init_clocksource(unsigned long rate)</div><div class='ctx'> 			"%s: can't register clocksource!\n";</div><div class='ctx'> </div><div class='ctx'> 	omap_mpu_timer_start(1, ~0, 1);</div><div class='del'>-	init_sched_clock(&amp;cd, mpu_update_sched_clock, 32, rate);</div><div class='add'>+	setup_sched_clock(omap_mpu_read_sched_clock, 32, rate);</div><div class='ctx'> </div><div class='ctx'> 	if (clocksource_mmio_init(&amp;timer-&gt;read_tim, "mpu_timer2", rate,</div><div class='ctx'> 			300, 32, clocksource_mmio_readl_down))</div><div class='hunk'>@@ -254,30 +232,6 @@ static inline void omap_mpu_timer_init(void)</div><div class='ctx'> }</div><div class='ctx'> #endif	/* CONFIG_OMAP_MPU_TIMER */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_OMAP_MPU_TIMER) &amp;&amp; defined(CONFIG_OMAP_32K_TIMER)</div><div class='del'>-static unsigned long long (*preferred_sched_clock)(void);</div><div class='del'>-</div><div class='del'>-unsigned long long notrace sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	if (!preferred_sched_clock)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return preferred_sched_clock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void preferred_sched_clock_init(bool use_32k_sched_clock)</div><div class='del'>-{</div><div class='del'>-	if (use_32k_sched_clock)</div><div class='del'>-		preferred_sched_clock = omap_32k_sched_clock;</div><div class='del'>-	else</div><div class='del'>-		preferred_sched_clock = omap_mpu_sched_clock;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void preferred_sched_clock_init(bool use_32k_sched_clcok)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static inline int omap_32k_timer_usable(void)</div><div class='ctx'> {</div><div class='ctx'> 	int res = false;</div><div class='hunk'>@@ -299,12 +253,8 @@ static inline int omap_32k_timer_usable(void)</div><div class='ctx'>  */</div><div class='ctx'> static void __init omap1_timer_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (omap_32k_timer_usable()) {</div><div class='del'>-		preferred_sched_clock_init(1);</div><div class='del'>-	} else {</div><div class='add'>+	if (!omap_32k_timer_usable())</div><div class='ctx'> 		omap_mpu_timer_init();</div><div class='del'>-		preferred_sched_clock_init(0);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct sys_timer omap1_timer = {</div><div class='head'>diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c<br/>index 96604a50c4fe..9a54ef4dcf5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/timer32k.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap1/timer32k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/timer32k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap1/timer32k.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/dmtimer.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig<br/>index e1293aa513d3..a8ba7b96dcd1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/Kconfig</a></div><div class='hunk'>@@ -25,6 +25,7 @@ config ARCH_OMAP2</div><div class='ctx'> 	depends on ARCH_OMAP2PLUS</div><div class='ctx'> 	default y</div><div class='ctx'> 	select CPU_V6</div><div class='add'>+	select MULTI_IRQ_HANDLER</div><div class='ctx'> </div><div class='ctx'> config ARCH_OMAP3</div><div class='ctx'> 	bool "TI OMAP3"</div><div class='hunk'>@@ -36,13 +37,16 @@ config ARCH_OMAP3</div><div class='ctx'> 	select ARCH_HAS_OPP</div><div class='ctx'> 	select PM_OPP if PM</div><div class='ctx'> 	select ARM_CPU_SUSPEND if PM</div><div class='add'>+	select MULTI_IRQ_HANDLER</div><div class='ctx'> </div><div class='ctx'> config ARCH_OMAP4</div><div class='ctx'> 	bool "TI OMAP4"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on ARCH_OMAP2PLUS</div><div class='add'>+	select CACHE_L2X0</div><div class='ctx'> 	select CPU_V7</div><div class='ctx'> 	select ARM_GIC</div><div class='add'>+	select HAVE_SMP</div><div class='ctx'> 	select LOCAL_TIMERS if SMP</div><div class='ctx'> 	select PL310_ERRATA_588369</div><div class='ctx'> 	select PL310_ERRATA_727915</div><div class='hunk'>@@ -74,8 +78,13 @@ config SOC_OMAP3430</div><div class='ctx'> 	default y</div><div class='ctx'> 	select ARCH_OMAP_OTG</div><div class='ctx'> </div><div class='del'>-config SOC_OMAPTI816X</div><div class='del'>-	bool "TI816X support"</div><div class='add'>+config SOC_OMAPTI81XX</div><div class='add'>+	bool "TI81XX support"</div><div class='add'>+	depends on ARCH_OMAP3</div><div class='add'>+	default y</div><div class='add'>+</div><div class='add'>+config SOC_OMAPAM33XX</div><div class='add'>+	bool "AM33XX support"</div><div class='ctx'> 	depends on ARCH_OMAP3</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='hunk'>@@ -312,7 +321,12 @@ config MACH_OMAP_3630SDP</div><div class='ctx'> </div><div class='ctx'> config MACH_TI8168EVM</div><div class='ctx'> 	bool "TI8168 Evaluation Module"</div><div class='del'>-	depends on SOC_OMAPTI816X</div><div class='add'>+	depends on SOC_OMAPTI81XX</div><div class='add'>+	default y</div><div class='add'>+</div><div class='add'>+config MACH_TI8148EVM</div><div class='add'>+	bool "TI8148 Evaluation Module"</div><div class='add'>+	depends on SOC_OMAPTI81XX</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='ctx'> config MACH_OMAP_4430SDP</div><div class='hunk'>@@ -351,6 +365,27 @@ config OMAP3_SDRC_AC_TIMING</div><div class='ctx'> 	  wish to say no.  Selecting yes without understanding what is</div><div class='ctx'> 	  going on could result in system crashes;</div><div class='ctx'> </div><div class='add'>+config OMAP4_ERRATA_I688</div><div class='add'>+	bool "OMAP4 errata: Async Bridge Corruption (BROKEN)"</div><div class='add'>+	depends on ARCH_OMAP4 &amp;&amp; BROKEN</div><div class='add'>+	select ARCH_HAS_BARRIERS</div><div class='add'>+	help</div><div class='add'>+	  If a data is stalled inside asynchronous bridge because of back</div><div class='add'>+	  pressure, it may be accepted multiple times, creating pointer</div><div class='add'>+	  misalignment that will corrupt next transfers on that data path</div><div class='add'>+	  until next reset of the system (No recovery procedure once the</div><div class='add'>+	  issue is hit, the path remains consistently broken). Async bridge</div><div class='add'>+	  can be found on path between MPU to EMIF and MPU to L3 interconnect.</div><div class='add'>+	  This situation can happen only when the idle is initiated by a</div><div class='add'>+	  Master Request Disconnection (which is trigged by software when</div><div class='add'>+	  executing WFI on CPU).</div><div class='add'>+	  The work-around for this errata needs all the initiators connected</div><div class='add'>+	  through async bridge must ensure that data path is properly drained</div><div class='add'>+	  before issuing WFI. This condition will be met if one Strongly ordered</div><div class='add'>+	  access is performed to the target right before executing the WFI.</div><div class='add'>+	  In MPU case, L3 T2ASYNC FIFO and DDR T2ASYNC FIFO needs to be drained.</div><div class='add'>+	  IO barrier ensure that there is no synchronisation loss on initiators</div><div class='add'>+	  operating on both interconnect port simultaneously.</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile<br/>index b009f17dee56..fc9b238cbc19 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/Makefile</a></div><div class='hunk'>@@ -11,10 +11,11 @@ hwmod-common				= omap_hwmod.o \</div><div class='ctx'> 					  omap_hwmod_common_data.o</div><div class='ctx'> clock-common				= clock.o clock_common_data.o \</div><div class='ctx'> 					  clkt_dpll.o clkt_clksel.o</div><div class='add'>+secure-common                          = omap-smc.o omap-secure.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)</div><div class='del'>-obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common)</div><div class='del'>-obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common)</div><div class='add'>+obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) $(secure-common)</div><div class='add'>+obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)</div><div class='add'>+obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common) $(secure-common)</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o</div><div class='ctx'> </div><div class='hunk'>@@ -24,11 +25,13 @@ obj-$(CONFIG_TWL4030_CORE) += omap_twl.o</div><div class='ctx'> obj-$(CONFIG_SMP)			+= omap-smp.o omap-headsmp.o</div><div class='ctx'> obj-$(CONFIG_LOCAL_TIMERS)		+= timer-mpu.o</div><div class='ctx'> obj-$(CONFIG_HOTPLUG_CPU)		+= omap-hotplug.o</div><div class='del'>-obj-$(CONFIG_ARCH_OMAP4)		+= omap44xx-smc.o omap4-common.o</div><div class='add'>+obj-$(CONFIG_ARCH_OMAP4)		+= omap4-common.o omap-wakeupgen.o \</div><div class='add'>+					   sleep44xx.o</div><div class='ctx'> </div><div class='ctx'> plus_sec := $(call as-instr,.arch_extension sec,+sec)</div><div class='ctx'> AFLAGS_omap-headsmp.o			:=-Wa,-march=armv7-a$(plus_sec)</div><div class='del'>-AFLAGS_omap44xx-smc.o			:=-Wa,-march=armv7-a$(plus_sec)</div><div class='add'>+AFLAGS_omap-smc.o			:=-Wa,-march=armv7-a$(plus_sec)</div><div class='add'>+AFLAGS_sleep44xx.o			:=-Wa,-march=armv7-a$(plus_sec)</div><div class='ctx'> </div><div class='ctx'> # Functions loaded to SRAM</div><div class='ctx'> obj-$(CONFIG_SOC_OMAP2420)		+= sram242x.o</div><div class='hunk'>@@ -62,7 +65,8 @@ obj-$(CONFIG_ARCH_OMAP2)		+= pm24xx.o</div><div class='ctx'> obj-$(CONFIG_ARCH_OMAP2)		+= sleep24xx.o</div><div class='ctx'> obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o \</div><div class='ctx'> 					   cpuidle34xx.o</div><div class='del'>-obj-$(CONFIG_ARCH_OMAP4)		+= pm44xx.o</div><div class='add'>+obj-$(CONFIG_ARCH_OMAP4)		+= pm44xx.o omap-mpuss-lowpower.o \</div><div class='add'>+					   cpuidle44xx.o</div><div class='ctx'> obj-$(CONFIG_PM_DEBUG)			+= pm-debug.o</div><div class='ctx'> obj-$(CONFIG_OMAP_SMARTREFLEX)          += sr_device.o smartreflex.o</div><div class='ctx'> obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3)	+= smartreflex-class3.o</div><div class='hunk'>@@ -77,6 +81,7 @@ endif</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> # PRCM</div><div class='add'>+obj-y					+= prm_common.o</div><div class='ctx'> obj-$(CONFIG_ARCH_OMAP2)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o</div><div class='ctx'> obj-$(CONFIG_ARCH_OMAP3)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o \</div><div class='ctx'> 					   vc3xxx_data.o vp3xxx_data.o</div><div class='hunk'>@@ -86,7 +91,7 @@ obj-$(CONFIG_ARCH_OMAP3)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o \</div><div class='ctx'> obj-$(CONFIG_ARCH_OMAP4)		+= prcm.o cm2xxx_3xxx.o cminst44xx.o \</div><div class='ctx'> 					   cm44xx.o prcm_mpu44xx.o \</div><div class='ctx'> 					   prminst44xx.o vc44xx_data.o \</div><div class='del'>-					   vp44xx_data.o</div><div class='add'>+					   vp44xx_data.o prm44xx.o</div><div class='ctx'> </div><div class='ctx'> # OMAP voltage domains</div><div class='ctx'> voltagedomain-common			:= voltage.o vc.o vp.o</div><div class='hunk'>@@ -232,6 +237,7 @@ obj-$(CONFIG_MACH_CRANEBOARD)		+= board-am3517crane.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MACH_SBC3530)		+= board-omap3stalker.o</div><div class='ctx'> obj-$(CONFIG_MACH_TI8168EVM)		+= board-ti8168evm.o</div><div class='add'>+obj-$(CONFIG_MACH_TI8148EVM)		+= board-ti8168evm.o</div><div class='ctx'> </div><div class='ctx'> # Platform specific device init code</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c<br/>index d704f0ac328d..7370983f809f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-2430sdp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-2430sdp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-2430sdp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-2430sdp.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/gpmc.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> #include &lt;plat/gpmc-smc91x.h&gt;</div><div class='hunk'>@@ -301,6 +301,8 @@ MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board")</div><div class='ctx'> 	.map_io		= omap243x_map_io,</div><div class='ctx'> 	.init_early	= omap2430_init_early,</div><div class='ctx'> 	.init_irq	= omap2_init_irq,</div><div class='add'>+	.handle_irq	= omap2_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= omap_2430sdp_init,</div><div class='ctx'> 	.timer		= &amp;omap2_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c<br/>index 77142c13fa13..383717ba63b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-3430sdp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-3430sdp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-3430sdp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-3430sdp.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include &lt;plat/mcspi.h&gt;</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/dma.h&gt;</div><div class='ctx'> #include &lt;plat/gpmc.h&gt;</div><div class='ctx'> #include &lt;video/omapdss.h&gt;</div><div class='hunk'>@@ -475,106 +475,8 @@ static const struct usbhs_omap_board_data usbhs_bdata __initconst = {</div><div class='ctx'> static struct omap_board_mux board_mux[] __initdata = {</div><div class='ctx'> 	{ .reg_offset = OMAP_MUX_TERMINATOR },</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static struct omap_device_pad serial1_pads[] __initdata = {</div><div class='del'>-	/*</div><div class='del'>-	 * Note that off output enable is an active low</div><div class='del'>-	 * signal. So setting this means pin is a</div><div class='del'>-	 * input enabled in off mode</div><div class='del'>-	 */</div><div class='del'>-	OMAP_MUX_STATIC("uart1_cts.uart1_cts",</div><div class='del'>-			 OMAP_PIN_INPUT |</div><div class='del'>-			 OMAP_PIN_OFF_INPUT_PULLDOWN |</div><div class='del'>-			 OMAP_OFFOUT_EN |</div><div class='del'>-			 OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart1_rts.uart1_rts",</div><div class='del'>-			 OMAP_PIN_OUTPUT |</div><div class='del'>-			 OMAP_OFF_EN |</div><div class='del'>-			 OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart1_rx.uart1_rx",</div><div class='del'>-			 OMAP_PIN_INPUT |</div><div class='del'>-			 OMAP_PIN_OFF_INPUT_PULLDOWN |</div><div class='del'>-			 OMAP_OFFOUT_EN |</div><div class='del'>-			 OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart1_tx.uart1_tx",</div><div class='del'>-			 OMAP_PIN_OUTPUT |</div><div class='del'>-			 OMAP_OFF_EN |</div><div class='del'>-			 OMAP_MUX_MODE0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_device_pad serial2_pads[] __initdata = {</div><div class='del'>-	OMAP_MUX_STATIC("uart2_cts.uart2_cts",</div><div class='del'>-			 OMAP_PIN_INPUT_PULLUP |</div><div class='del'>-			 OMAP_PIN_OFF_INPUT_PULLDOWN |</div><div class='del'>-			 OMAP_OFFOUT_EN |</div><div class='del'>-			 OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart2_rts.uart2_rts",</div><div class='del'>-			 OMAP_PIN_OUTPUT |</div><div class='del'>-			 OMAP_OFF_EN |</div><div class='del'>-			 OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart2_rx.uart2_rx",</div><div class='del'>-			 OMAP_PIN_INPUT |</div><div class='del'>-			 OMAP_PIN_OFF_INPUT_PULLDOWN |</div><div class='del'>-			 OMAP_OFFOUT_EN |</div><div class='del'>-			 OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart2_tx.uart2_tx",</div><div class='del'>-			 OMAP_PIN_OUTPUT |</div><div class='del'>-			 OMAP_OFF_EN |</div><div class='del'>-			 OMAP_MUX_MODE0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_device_pad serial3_pads[] __initdata = {</div><div class='del'>-	OMAP_MUX_STATIC("uart3_cts_rctx.uart3_cts_rctx",</div><div class='del'>-			 OMAP_PIN_INPUT_PULLDOWN |</div><div class='del'>-			 OMAP_PIN_OFF_INPUT_PULLDOWN |</div><div class='del'>-			 OMAP_OFFOUT_EN |</div><div class='del'>-			 OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart3_rts_sd.uart3_rts_sd",</div><div class='del'>-			 OMAP_PIN_OUTPUT |</div><div class='del'>-			 OMAP_OFF_EN |</div><div class='del'>-			 OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart3_rx_irrx.uart3_rx_irrx",</div><div class='del'>-			 OMAP_PIN_INPUT |</div><div class='del'>-			 OMAP_PIN_OFF_INPUT_PULLDOWN |</div><div class='del'>-			 OMAP_OFFOUT_EN |</div><div class='del'>-			 OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart3_tx_irtx.uart3_tx_irtx",</div><div class='del'>-			 OMAP_PIN_OUTPUT |</div><div class='del'>-			 OMAP_OFF_EN |</div><div class='del'>-			 OMAP_MUX_MODE0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_board_data serial1_data __initdata = {</div><div class='del'>-	.id		= 0,</div><div class='del'>-	.pads		= serial1_pads,</div><div class='del'>-	.pads_cnt	= ARRAY_SIZE(serial1_pads),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_board_data serial2_data __initdata = {</div><div class='del'>-	.id		= 1,</div><div class='del'>-	.pads		= serial2_pads,</div><div class='del'>-	.pads_cnt	= ARRAY_SIZE(serial2_pads),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_board_data serial3_data __initdata = {</div><div class='del'>-	.id		= 2,</div><div class='del'>-	.pads		= serial3_pads,</div><div class='del'>-	.pads_cnt	= ARRAY_SIZE(serial3_pads),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void board_serial_init(void)</div><div class='del'>-{</div><div class='del'>-	omap_serial_init_port(&amp;serial1_data);</div><div class='del'>-	omap_serial_init_port(&amp;serial2_data);</div><div class='del'>-	omap_serial_init_port(&amp;serial3_data);</div><div class='del'>-}</div><div class='ctx'> #else</div><div class='ctx'> #define board_mux	NULL</div><div class='del'>-</div><div class='del'>-static inline void board_serial_init(void)</div><div class='del'>-{</div><div class='del'>-	omap_serial_init();</div><div class='del'>-}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -711,7 +613,7 @@ static void __init omap_3430sdp_init(void)</div><div class='ctx'> 	else</div><div class='ctx'> 		gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV1;</div><div class='ctx'> 	omap_ads7846_init(1, gpio_pendown, 310, NULL);</div><div class='del'>-	board_serial_init();</div><div class='add'>+	omap_serial_init();</div><div class='ctx'> 	omap_sdrc_init(hyb18m512160af6_sdrc_params, NULL);</div><div class='ctx'> 	usb_musb_init(NULL);</div><div class='ctx'> 	board_smc91x_init();</div><div class='hunk'>@@ -728,6 +630,8 @@ MACHINE_START(OMAP_3430SDP, "OMAP3430 3430SDP board")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= omap3430_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= omap_3430sdp_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c<br/>index f552305162fc..6ef350d1ae4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-3630sdp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-3630sdp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-3630sdp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-3630sdp.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='ctx'> #include &lt;plat/gpmc-smc91x.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='hunk'>@@ -215,6 +215,8 @@ MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= omap3630_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= omap_sdp_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c<br/>index 515646886b59..39fba9df17fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-4430sdp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-4430sdp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-4430sdp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-4430sdp.c</a></div><div class='hunk'>@@ -27,13 +27,13 @@</div><div class='ctx'> #include &lt;linux/leds_pwm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/omap4-common.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> #include &lt;plat/mmc.h&gt;</div><div class='ctx'> #include &lt;plat/omap4-keypad.h&gt;</div><div class='hunk'>@@ -372,11 +372,17 @@ static struct platform_device sdp4430_vbat = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct platform_device sdp4430_dmic_codec = {</div><div class='add'>+	.name	= "dmic-codec",</div><div class='add'>+	.id	= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device *sdp4430_devices[] __initdata = {</div><div class='ctx'> 	&amp;sdp4430_gpio_keys_device,</div><div class='ctx'> 	&amp;sdp4430_leds_gpio,</div><div class='ctx'> 	&amp;sdp4430_leds_pwm,</div><div class='ctx'> 	&amp;sdp4430_vbat,</div><div class='add'>+	&amp;sdp4430_dmic_codec,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct omap_musb_board_data musb_board_data = {</div><div class='hunk'>@@ -404,6 +410,7 @@ static struct omap2_hsmmc_info mmc[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.mmc		= 5,</div><div class='ctx'> 		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_POWER_OFF_CARD,</div><div class='add'>+		.pm_caps	= MMC_PM_KEEP_POWER,</div><div class='ctx'> 		.gpio_cd	= -EINVAL,</div><div class='ctx'> 		.gpio_wp	= -EINVAL,</div><div class='ctx'> 		.ocr_mask	= MMC_VDD_165_195,</div><div class='hunk'>@@ -595,20 +602,6 @@ static void __init omap_sfh7741prox_init(void)</div><div class='ctx'> 			__func__, OMAP4_SFH7741_ENABLE_GPIO, error);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sdp4430_hdmi_mux_init(void)</div><div class='del'>-{</div><div class='del'>-	/* PAD0_HDMI_HPD_PAD1_HDMI_CEC */</div><div class='del'>-	omap_mux_init_signal("hdmi_hpd",</div><div class='del'>-			OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-	omap_mux_init_signal("hdmi_cec",</div><div class='del'>-			OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-	/* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */</div><div class='del'>-	omap_mux_init_signal("hdmi_ddc_scl",</div><div class='del'>-			OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-	omap_mux_init_signal("hdmi_ddc_sda",</div><div class='del'>-			OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct gpio sdp4430_hdmi_gpios[] = {</div><div class='ctx'> 	{ HDMI_GPIO_HPD,	GPIOF_OUT_INIT_HIGH,	"hdmi_gpio_hpd"   },</div><div class='ctx'> 	{ HDMI_GPIO_LS_OE,	GPIOF_OUT_INIT_HIGH,	"hdmi_gpio_ls_oe" },</div><div class='hunk'>@@ -826,9 +819,16 @@ static void omap_4430sdp_display_init(void)</div><div class='ctx'> 		pr_err("%s: Could not get display_sel GPIO\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	sdp4430_lcd_init();</div><div class='del'>-	sdp4430_hdmi_mux_init();</div><div class='ctx'> 	sdp4430_picodlp_init();</div><div class='ctx'> 	omap_display_init(&amp;sdp4430_dss_data);</div><div class='add'>+	/*</div><div class='add'>+	 * OMAP4460SDP/Blaze and OMAP4430 ES2.3 SDP/Blaze boards and</div><div class='add'>+	 * later have external pull up on the HDMI I2C lines</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_is_omap446x() || omap_rev() &gt; OMAP4430_REV_ES2_2)</div><div class='add'>+		omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP);</div><div class='add'>+	else</div><div class='add'>+		omap_hdmi_init(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_OMAP_MUX</div><div class='hunk'>@@ -837,74 +837,8 @@ static struct omap_board_mux board_mux[] __initdata = {</div><div class='ctx'> 	{ .reg_offset = OMAP_MUX_TERMINATOR },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_device_pad serial2_pads[] __initdata = {</div><div class='del'>-	OMAP_MUX_STATIC("uart2_cts.uart2_cts",</div><div class='del'>-			 OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart2_rts.uart2_rts",</div><div class='del'>-			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart2_rx.uart2_rx",</div><div class='del'>-			 OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart2_tx.uart2_tx",</div><div class='del'>-			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_device_pad serial3_pads[] __initdata = {</div><div class='del'>-	OMAP_MUX_STATIC("uart3_cts_rctx.uart3_cts_rctx",</div><div class='del'>-			 OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart3_rts_sd.uart3_rts_sd",</div><div class='del'>-			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart3_rx_irrx.uart3_rx_irrx",</div><div class='del'>-			 OMAP_PIN_INPUT | OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart3_tx_irtx.uart3_tx_irtx",</div><div class='del'>-			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_device_pad serial4_pads[] __initdata = {</div><div class='del'>-	OMAP_MUX_STATIC("uart4_rx.uart4_rx",</div><div class='del'>-			 OMAP_PIN_INPUT | OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart4_tx.uart4_tx",</div><div class='del'>-			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_board_data serial2_data __initdata = {</div><div class='del'>-	.id		= 1,</div><div class='del'>-	.pads		= serial2_pads,</div><div class='del'>-	.pads_cnt	= ARRAY_SIZE(serial2_pads),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_board_data serial3_data __initdata = {</div><div class='del'>-	.id		= 2,</div><div class='del'>-	.pads		= serial3_pads,</div><div class='del'>-	.pads_cnt	= ARRAY_SIZE(serial3_pads),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_board_data serial4_data __initdata = {</div><div class='del'>-	.id		= 3,</div><div class='del'>-	.pads		= serial4_pads,</div><div class='del'>-	.pads_cnt	= ARRAY_SIZE(serial4_pads),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void board_serial_init(void)</div><div class='del'>-{</div><div class='del'>-	struct omap_board_data bdata;</div><div class='del'>-	bdata.flags	= 0;</div><div class='del'>-	bdata.pads	= NULL;</div><div class='del'>-	bdata.pads_cnt	= 0;</div><div class='del'>-	bdata.id	= 0;</div><div class='del'>-	/* pass dummy data for UART1 */</div><div class='del'>-	omap_serial_init_port(&amp;bdata);</div><div class='del'>-</div><div class='del'>-	omap_serial_init_port(&amp;serial2_data);</div><div class='del'>-	omap_serial_init_port(&amp;serial3_data);</div><div class='del'>-	omap_serial_init_port(&amp;serial4_data);</div><div class='del'>-}</div><div class='ctx'> #else</div><div class='ctx'> #define board_mux	NULL</div><div class='del'>-</div><div class='del'>-static inline void board_serial_init(void)</div><div class='del'>-{</div><div class='del'>-	omap_serial_init();</div><div class='del'>-}</div><div class='ctx'>  #endif</div><div class='ctx'> </div><div class='ctx'> static void omap4_sdp4430_wifi_mux_init(void)</div><div class='hunk'>@@ -954,7 +888,7 @@ static void __init omap_4430sdp_init(void)</div><div class='ctx'> 	omap4_i2c_init();</div><div class='ctx'> 	omap_sfh7741prox_init();</div><div class='ctx'> 	platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices));</div><div class='del'>-	board_serial_init();</div><div class='add'>+	omap_serial_init();</div><div class='ctx'> 	omap_sdrc_init(NULL, NULL);</div><div class='ctx'> 	omap4_sdp4430_wifi_init();</div><div class='ctx'> 	omap4_twl6030_hsmmc_init(mmc);</div><div class='hunk'>@@ -984,6 +918,8 @@ MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board")</div><div class='ctx'> 	.map_io		= omap4_map_io,</div><div class='ctx'> 	.init_early	= omap4430_init_early,</div><div class='ctx'> 	.init_irq	= gic_init_irq,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= omap_4430sdp_init,</div><div class='ctx'> 	.timer		= &amp;omap4_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-am3517crane.c b/arch/arm/mach-omap2/board-am3517crane.c<br/>index 7834536ab416..c3851e8de28b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-am3517crane.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-am3517crane.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-am3517crane.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-am3517crane.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mux.h"</div><div class='hunk'>@@ -98,6 +98,8 @@ MACHINE_START(CRANEBOARD, "AM3517/05 CRANEBOARD")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= am35xx_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= am3517_crane_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c<br/>index d314f033c9df..4b1cfe32e6ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-am3517evm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-am3517evm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-am3517evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-am3517evm.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/i2c/pca953x.h&gt;</div><div class='ctx'> #include &lt;linux/can/platform/ti_hecc.h&gt;</div><div class='ctx'> #include &lt;linux/davinci_emac.h&gt;</div><div class='add'>+#include &lt;linux/mmc/host.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/am35xx.h&gt;</div><div class='hunk'>@@ -32,7 +33,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> #include &lt;video/omapdss.h&gt;</div><div class='ctx'> #include &lt;video/omap-panel-generic-dpi.h&gt;</div><div class='hunk'>@@ -40,6 +41,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "mux.h"</div><div class='ctx'> #include "control.h"</div><div class='add'>+#include "hsmmc.h"</div><div class='ctx'> </div><div class='ctx'> #define AM35XX_EVM_MDIO_FREQUENCY	(1000000)</div><div class='ctx'> </div><div class='hunk'>@@ -455,6 +457,23 @@ static void am3517_evm_hecc_init(struct ti_hecc_platform_data *pdata)</div><div class='ctx'> static struct omap_board_config_kernel am3517_evm_config[] __initdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct omap2_hsmmc_info mmc[] = {</div><div class='add'>+	{</div><div class='add'>+		.mmc		= 1,</div><div class='add'>+		.caps		= MMC_CAP_4_BIT_DATA,</div><div class='add'>+		.gpio_cd	= 127,</div><div class='add'>+		.gpio_wp	= 126,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.mmc		= 2,</div><div class='add'>+		.caps		= MMC_CAP_4_BIT_DATA,</div><div class='add'>+		.gpio_cd	= 128,</div><div class='add'>+		.gpio_wp	= 129,</div><div class='add'>+	},</div><div class='add'>+	{}      /* Terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static void __init am3517_evm_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	omap_board_config = am3517_evm_config;</div><div class='hunk'>@@ -483,6 +502,9 @@ static void __init am3517_evm_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* MUSB */</div><div class='ctx'> 	am3517_evm_musb_init();</div><div class='add'>+</div><div class='add'>+	/* MMC init function */</div><div class='add'>+	omap2_hsmmc_init(mmc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM")</div><div class='hunk'>@@ -491,6 +513,8 @@ MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= am35xx_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= am3517_evm_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c<br/>index de8134b7f580..ac773829941f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-apollon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-apollon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-apollon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-apollon.c</a></div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'> #include &lt;plat/led.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/gpmc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/omapdss.h&gt;</div><div class='hunk'>@@ -354,6 +354,8 @@ MACHINE_START(OMAP_APOLLON, "OMAP24xx Apollon")</div><div class='ctx'> 	.map_io		= omap242x_map_io,</div><div class='ctx'> 	.init_early	= omap2420_init_early,</div><div class='ctx'> 	.init_irq	= omap2_init_irq,</div><div class='add'>+	.handle_irq	= omap2_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= omap_apollon_init,</div><div class='ctx'> 	.timer		= &amp;omap2_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c<br/>index bd1bcacb40f9..e921e3be24a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-cm-t35.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-cm-t35.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-cm-t35.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-cm-t35.c</a></div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/nand.h&gt;</div><div class='ctx'> #include &lt;plat/gpmc.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='hunk'>@@ -53,7 +53,8 @@</div><div class='ctx'> #include "hsmmc.h"</div><div class='ctx'> #include "common-board-devices.h"</div><div class='ctx'> </div><div class='del'>-#define CM_T35_GPIO_PENDOWN	57</div><div class='add'>+#define CM_T35_GPIO_PENDOWN		57</div><div class='add'>+#define SB_T35_USB_HUB_RESET_GPIO	167</div><div class='ctx'> </div><div class='ctx'> #define CM_T35_SMSC911X_CS	5</div><div class='ctx'> #define CM_T35_SMSC911X_GPIO	163</div><div class='hunk'>@@ -339,8 +340,10 @@ static struct regulator_consumer_supply cm_t35_vsim_supply[] = {</div><div class='ctx'> 	REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regulator_consumer_supply cm_t35_vdvi_supply[] = {</div><div class='del'>-	REGULATOR_SUPPLY("vdvi", "omapdss"),</div><div class='add'>+static struct regulator_consumer_supply cm_t35_vio_supplies[] = {</div><div class='add'>+	REGULATOR_SUPPLY("vcc", "spi1.0"),</div><div class='add'>+	REGULATOR_SUPPLY("vdds_dsi", "omapdss"),</div><div class='add'>+	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */</div><div class='hunk'>@@ -373,6 +376,19 @@ static struct regulator_init_data cm_t35_vsim = {</div><div class='ctx'> 	.consumer_supplies	= cm_t35_vsim_supply,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct regulator_init_data cm_t35_vio = {</div><div class='add'>+	.constraints = {</div><div class='add'>+		.min_uV			= 1800000,</div><div class='add'>+		.max_uV			= 1800000,</div><div class='add'>+		.apply_uV		= true,</div><div class='add'>+		.valid_modes_mask	= REGULATOR_MODE_NORMAL</div><div class='add'>+					| REGULATOR_MODE_STANDBY,</div><div class='add'>+		.valid_ops_mask		= REGULATOR_CHANGE_MODE,</div><div class='add'>+	},</div><div class='add'>+	.num_consumer_supplies	= ARRAY_SIZE(cm_t35_vio_supplies),</div><div class='add'>+	.consumer_supplies	= cm_t35_vio_supplies,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static uint32_t cm_t35_keymap[] = {</div><div class='ctx'> 	KEY(0, 0, KEY_A),	KEY(0, 1, KEY_B),	KEY(0, 2, KEY_LEFT),</div><div class='ctx'> 	KEY(1, 0, KEY_UP),	KEY(1, 1, KEY_ENTER),	KEY(1, 2, KEY_DOWN),</div><div class='hunk'>@@ -421,6 +437,23 @@ static struct usbhs_omap_board_data usbhs_bdata __initdata = {</div><div class='ctx'> 	.reset_gpio_port[2]  = -EINVAL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void cm_t35_init_usbh(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = gpio_request_one(SB_T35_USB_HUB_RESET_GPIO,</div><div class='add'>+			       GPIOF_OUT_INIT_LOW, "usb hub rst");</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("SB-T35: usb hub rst gpio request failed: %d\n", err);</div><div class='add'>+	} else {</div><div class='add'>+		udelay(10);</div><div class='add'>+		gpio_set_value(SB_T35_USB_HUB_RESET_GPIO, 1);</div><div class='add'>+		msleep(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usbhs_init(&amp;usbhs_bdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio,</div><div class='ctx'> 				 unsigned ngpio)</div><div class='ctx'> {</div><div class='hunk'>@@ -456,17 +489,14 @@ static struct twl4030_platform_data cm_t35_twldata = {</div><div class='ctx'> 	.gpio		= &amp;cm_t35_gpio_data,</div><div class='ctx'> 	.vmmc1		= &amp;cm_t35_vmmc1,</div><div class='ctx'> 	.vsim		= &amp;cm_t35_vsim,</div><div class='add'>+	.vio		= &amp;cm_t35_vio,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init cm_t35_init_i2c(void)</div><div class='ctx'> {</div><div class='ctx'> 	omap3_pmic_get_config(&amp;cm_t35_twldata, TWL_COMMON_PDATA_USB,</div><div class='del'>-			TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);</div><div class='del'>-</div><div class='del'>-	cm_t35_twldata.vpll2-&gt;constraints.name = "VDVI";</div><div class='del'>-	cm_t35_twldata.vpll2-&gt;num_consumer_supplies =</div><div class='del'>-						ARRAY_SIZE(cm_t35_vdvi_supply);</div><div class='del'>-	cm_t35_twldata.vpll2-&gt;consumer_supplies = cm_t35_vdvi_supply;</div><div class='add'>+			      TWL_COMMON_REGULATOR_VDAC |</div><div class='add'>+			      TWL_COMMON_PDATA_AUDIO);</div><div class='ctx'> </div><div class='ctx'> 	omap3_pmic_init("tps65930", &amp;cm_t35_twldata);</div><div class='ctx'> }</div><div class='hunk'>@@ -570,24 +600,28 @@ static void __init cm_t3x_common_dss_mux_init(int mux_mode)</div><div class='ctx'> </div><div class='ctx'> static void __init cm_t35_init_mux(void)</div><div class='ctx'> {</div><div class='del'>-	omap_mux_init_signal("gpio_70", OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);</div><div class='del'>-	omap_mux_init_signal("gpio_71", OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);</div><div class='del'>-	omap_mux_init_signal("gpio_72", OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);</div><div class='del'>-	omap_mux_init_signal("gpio_73", OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);</div><div class='del'>-	omap_mux_init_signal("gpio_74", OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);</div><div class='del'>-	omap_mux_init_signal("gpio_75", OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);</div><div class='del'>-	cm_t3x_common_dss_mux_init(OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);</div><div class='add'>+	int mux_mode = OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT;</div><div class='add'>+</div><div class='add'>+	omap_mux_init_signal("dss_data0.dss_data0", mux_mode);</div><div class='add'>+	omap_mux_init_signal("dss_data1.dss_data1", mux_mode);</div><div class='add'>+	omap_mux_init_signal("dss_data2.dss_data2", mux_mode);</div><div class='add'>+	omap_mux_init_signal("dss_data3.dss_data3", mux_mode);</div><div class='add'>+	omap_mux_init_signal("dss_data4.dss_data4", mux_mode);</div><div class='add'>+	omap_mux_init_signal("dss_data5.dss_data5", mux_mode);</div><div class='add'>+	cm_t3x_common_dss_mux_init(mux_mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init cm_t3730_init_mux(void)</div><div class='ctx'> {</div><div class='del'>-	omap_mux_init_signal("sys_boot0", OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);</div><div class='del'>-	omap_mux_init_signal("sys_boot1", OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);</div><div class='del'>-	omap_mux_init_signal("sys_boot3", OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);</div><div class='del'>-	omap_mux_init_signal("sys_boot4", OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);</div><div class='del'>-	omap_mux_init_signal("sys_boot5", OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);</div><div class='del'>-	omap_mux_init_signal("sys_boot6", OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);</div><div class='del'>-	cm_t3x_common_dss_mux_init(OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);</div><div class='add'>+	int mux_mode = OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT;</div><div class='add'>+</div><div class='add'>+	omap_mux_init_signal("sys_boot0", mux_mode);</div><div class='add'>+	omap_mux_init_signal("sys_boot1", mux_mode);</div><div class='add'>+	omap_mux_init_signal("sys_boot3", mux_mode);</div><div class='add'>+	omap_mux_init_signal("sys_boot4", mux_mode);</div><div class='add'>+	omap_mux_init_signal("sys_boot5", mux_mode);</div><div class='add'>+	omap_mux_init_signal("sys_boot6", mux_mode);</div><div class='add'>+	cm_t3x_common_dss_mux_init(mux_mode);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static inline void cm_t35_init_mux(void) {}</div><div class='hunk'>@@ -612,7 +646,7 @@ static void __init cm_t3x_common_init(void)</div><div class='ctx'> 	cm_t35_init_display();</div><div class='ctx'> </div><div class='ctx'> 	usb_musb_init(NULL);</div><div class='del'>-	usbhs_init(&amp;usbhs_bdata);</div><div class='add'>+	cm_t35_init_usbh();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init cm_t35_init(void)</div><div class='hunk'>@@ -634,8 +668,10 @@ MACHINE_START(CM_T35, "Compulab CM-T35")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= omap35xx_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= cm_t35_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(CM_T3730, "Compulab CM-T3730")</div><div class='hunk'>@@ -644,6 +680,8 @@ MACHINE_START(CM_T3730, "Compulab CM-T3730")</div><div class='ctx'> 	.map_io         = omap3_map_io,</div><div class='ctx'> 	.init_early     = omap3630_init_early,</div><div class='ctx'> 	.init_irq       = omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine   = cm_t3730_init,</div><div class='ctx'> 	.timer          = &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-cm-t3517.c b/arch/arm/mach-omap2/board-cm-t3517.c<br/>index 3f4dc6626845..f36d694d2159 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-cm-t3517.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-cm-t3517.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-cm-t3517.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-cm-t3517.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> #include &lt;plat/nand.h&gt;</div><div class='ctx'> #include &lt;plat/gpmc.h&gt;</div><div class='hunk'>@@ -299,6 +299,8 @@ MACHINE_START(CM_T3517, "Compulab CM-T3517")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= am35xx_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= cm_t3517_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c<br/>index 90154e411da0..e873063f4fda 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-devkit8000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-devkit8000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-devkit8000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-devkit8000.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/gpmc.h&gt;</div><div class='ctx'> #include &lt;plat/nand.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='hunk'>@@ -660,6 +660,8 @@ MACHINE_START(DEVKIT8000, "OMAP3 Devkit8000")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= omap35xx_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= devkit8000_init,</div><div class='ctx'> 	.timer		= &amp;omap3_secure_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c<br/>index fb55fa3dad5a..d58756060483 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-generic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-generic.c</a></div><div class='hunk'>@@ -20,8 +20,7 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='del'>-#include &lt;mach/omap4-common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include "common-board-devices.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -70,7 +69,6 @@ static void __init omap_generic_init(void)</div><div class='ctx'> 	if (node)</div><div class='ctx'> 		irq_domain_add_simple(node, 0);</div><div class='ctx'> </div><div class='del'>-	omap_serial_init();</div><div class='ctx'> 	omap_sdrc_init(NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> 	of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);</div><div class='hunk'>@@ -107,6 +105,7 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)")</div><div class='ctx'> 	.init_machine	= omap_generic_init,</div><div class='ctx'> 	.timer		= &amp;omap2_timer,</div><div class='ctx'> 	.dt_compat	= omap242x_boards_compat,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -122,9 +121,11 @@ DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)")</div><div class='ctx'> 	.map_io		= omap243x_map_io,</div><div class='ctx'> 	.init_early	= omap2430_init_early,</div><div class='ctx'> 	.init_irq	= omap2_init_irq,</div><div class='add'>+	.handle_irq	= omap2_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= omap_generic_init,</div><div class='ctx'> 	.timer		= &amp;omap2_timer,</div><div class='ctx'> 	.dt_compat	= omap243x_boards_compat,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -143,6 +144,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")</div><div class='ctx'> 	.init_machine	= omap3_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='ctx'> 	.dt_compat	= omap3_boards_compat,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -161,5 +163,6 @@ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)")</div><div class='ctx'> 	.init_machine	= omap4_init,</div><div class='ctx'> 	.timer		= &amp;omap4_timer,</div><div class='ctx'> 	.dt_compat	= omap4_boards_compat,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c<br/>index 8b351d92a1cc..54af800d143c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-h4.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-h4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-h4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-h4.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/menelaus.h&gt;</div><div class='ctx'> #include &lt;plat/dma.h&gt;</div><div class='ctx'> #include &lt;plat/gpmc.h&gt;</div><div class='hunk'>@@ -396,6 +396,8 @@ MACHINE_START(OMAP_H4, "OMAP2420 H4 board")</div><div class='ctx'> 	.map_io		= omap242x_map_io,</div><div class='ctx'> 	.init_early	= omap2420_init_early,</div><div class='ctx'> 	.init_irq	= omap2_init_irq,</div><div class='add'>+	.handle_irq	= omap2_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= omap_h4_init,</div><div class='ctx'> 	.timer		= &amp;omap2_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c<br/>index d0a3f78a9b69..a59ace0ed560 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-igep0020.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-igep0020.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-igep0020.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-igep0020.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/gpmc.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> #include &lt;video/omapdss.h&gt;</div><div class='hunk'>@@ -672,8 +672,10 @@ MACHINE_START(IGEP0020, "IGEP v2 board")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= omap35xx_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= igep_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(IGEP0030, "IGEP OMAP3 module")</div><div class='hunk'>@@ -682,6 +684,8 @@ MACHINE_START(IGEP0030, "IGEP OMAP3 module")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= omap35xx_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= igep_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c<br/>index e179da0c4da5..2d2a61f7dcbf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-ldp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-ldp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-ldp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-ldp.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/mcspi.h&gt;</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/gpmc.h&gt;</div><div class='ctx'> #include &lt;mach/board-zoom.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -434,6 +434,8 @@ MACHINE_START(OMAP_LDP, "OMAP LDP board")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= omap3430_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= omap_ldp_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c<br/>index e9d5f4a3d064..42a4d11fad23 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-n8x0.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-n8x0.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-n8x0.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-n8x0.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/menelaus.h&gt;</div><div class='ctx'> #include &lt;mach/irqs.h&gt;</div><div class='ctx'> #include &lt;plat/mcspi.h&gt;</div><div class='hunk'>@@ -46,7 +46,7 @@ static struct device *mmc_device;</div><div class='ctx'> #define TUSB6010_GPIO_ENABLE	0</div><div class='ctx'> #define TUSB6010_DMACHAN	0x3f</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_USB_MUSB_TUSB6010</div><div class='add'>+#if defined(CONFIG_USB_MUSB_TUSB6010) || defined(CONFIG_USB_MUSB_TUSB6010_MODULE)</div><div class='ctx'> /*</div><div class='ctx'>  * Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and</div><div class='ctx'>  * 1.5 V voltage regulators of PM companion chip. Companion chip will then</div><div class='hunk'>@@ -644,15 +644,15 @@ static inline void board_serial_init(void)</div><div class='ctx'> 	bdata.pads_cnt = 0;</div><div class='ctx'> </div><div class='ctx'> 	bdata.id = 0;</div><div class='del'>-	omap_serial_init_port(&amp;bdata);</div><div class='add'>+	omap_serial_init_port(&amp;bdata, NULL);</div><div class='ctx'> </div><div class='ctx'> 	bdata.id = 1;</div><div class='del'>-	omap_serial_init_port(&amp;bdata);</div><div class='add'>+	omap_serial_init_port(&amp;bdata, NULL);</div><div class='ctx'> </div><div class='ctx'> 	bdata.id = 2;</div><div class='ctx'> 	bdata.pads = serial2_pads;</div><div class='ctx'> 	bdata.pads_cnt = ARRAY_SIZE(serial2_pads);</div><div class='del'>-	omap_serial_init_port(&amp;bdata);</div><div class='add'>+	omap_serial_init_port(&amp;bdata, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='hunk'>@@ -689,8 +689,10 @@ MACHINE_START(NOKIA_N800, "Nokia N800")</div><div class='ctx'> 	.map_io		= omap242x_map_io,</div><div class='ctx'> 	.init_early	= omap2420_init_early,</div><div class='ctx'> 	.init_irq	= omap2_init_irq,</div><div class='add'>+	.handle_irq	= omap2_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= n8x0_init_machine,</div><div class='ctx'> 	.timer		= &amp;omap2_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(NOKIA_N810, "Nokia N810")</div><div class='hunk'>@@ -699,8 +701,10 @@ MACHINE_START(NOKIA_N810, "Nokia N810")</div><div class='ctx'> 	.map_io		= omap242x_map_io,</div><div class='ctx'> 	.init_early	= omap2420_init_early,</div><div class='ctx'> 	.init_irq	= omap2_init_irq,</div><div class='add'>+	.handle_irq	= omap2_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= n8x0_init_machine,</div><div class='ctx'> 	.timer		= &amp;omap2_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(NOKIA_N810_WIMAX, "Nokia N810 WiMAX")</div><div class='hunk'>@@ -709,6 +713,8 @@ MACHINE_START(NOKIA_N810_WIMAX, "Nokia N810 WiMAX")</div><div class='ctx'> 	.map_io		= omap242x_map_io,</div><div class='ctx'> 	.init_early	= omap2420_init_early,</div><div class='ctx'> 	.init_irq	= omap2_init_irq,</div><div class='add'>+	.handle_irq	= omap2_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= n8x0_init_machine,</div><div class='ctx'> 	.timer		= &amp;omap2_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c<br/>index 4a71cb7e42d4..7ffcd2839e7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-omap3beagle.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-omap3beagle.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-omap3beagle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-omap3beagle.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;video/omapdss.h&gt;</div><div class='ctx'> #include &lt;video/omap-panel-dvi.h&gt;</div><div class='ctx'> #include &lt;plat/gpmc.h&gt;</div><div class='hunk'>@@ -559,6 +559,8 @@ MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= omap3_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= omap3_beagle_init,</div><div class='ctx'> 	.timer		= &amp;omap3_secure_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c<br/>index ec00b2ec7022..003fe34c9343 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-omap3evm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-omap3evm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-omap3evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-omap3evm.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/mcspi.h&gt;</div><div class='ctx'> #include &lt;video/omapdss.h&gt;</div><div class='ctx'> #include &lt;video/omap-panel-dvi.h&gt;</div><div class='hunk'>@@ -681,6 +681,8 @@ MACHINE_START(OMAP3EVM, "OMAP3 EVM")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= omap35xx_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= omap3_evm_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c<br/>index 7c0f193f246d..4198dd017d8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-omap3logic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-omap3logic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-omap3logic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-omap3logic.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/mux.h&gt;</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/gpmc-smsc911x.h&gt;</div><div class='ctx'> #include &lt;plat/gpmc.h&gt;</div><div class='ctx'> #include &lt;plat/sdrc.h&gt;</div><div class='hunk'>@@ -208,8 +208,10 @@ MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= omap35xx_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= omap3logic_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board")</div><div class='hunk'>@@ -217,6 +219,8 @@ MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= omap35xx_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= omap3logic_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c<br/>index f7811f4cfc3d..1644b73017fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-omap3pandora.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-omap3pandora.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-omap3pandora.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-omap3pandora.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;plat/mcspi.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='hunk'>@@ -606,6 +606,8 @@ MACHINE_START(OMAP3_PANDORA, "Pandora Handheld Console")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= omap35xx_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= omap3pandora_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c<br/>index ddb7d6663c6d..cb089a46f62f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-omap3stalker.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-omap3stalker.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-omap3stalker.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-omap3stalker.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/gpmc.h&gt;</div><div class='ctx'> #include &lt;plat/nand.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='hunk'>@@ -454,6 +454,8 @@ MACHINE_START(SBC3530, "OMAP3 STALKER")</div><div class='ctx'> 	.map_io			= omap3_map_io,</div><div class='ctx'> 	.init_early		= omap35xx_init_early,</div><div class='ctx'> 	.init_irq		= omap3_init_irq,</div><div class='add'>+	.handle_irq		= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine		= omap3_stalker_init,</div><div class='ctx'> 	.timer			= &amp;omap3_secure_timer,</div><div class='add'>+	.restart		= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c<br/>index a2d0d1971e27..a0b851aafcca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-omap3touchbook.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-omap3touchbook.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-omap3touchbook.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-omap3touchbook.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/gpmc.h&gt;</div><div class='ctx'> #include &lt;plat/nand.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='hunk'>@@ -381,6 +381,8 @@ MACHINE_START(TOUCHBOOK, "OMAP3 touchbook Board")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= omap3430_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= omap3_touchbook_init,</div><div class='ctx'> 	.timer		= &amp;omap3_secure_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c<br/>index a8c2c4263e38..30ad40db2cf3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-omap4panda.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-omap4panda.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-omap4panda.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-omap4panda.c</a></div><div class='hunk'>@@ -30,14 +30,14 @@</div><div class='ctx'> #include &lt;linux/wl12xx.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/omap4-common.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;video/omapdss.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> #include &lt;plat/mmc.h&gt;</div><div class='ctx'> #include &lt;video/omap-panel-dvi.h&gt;</div><div class='hunk'>@@ -364,74 +364,8 @@ static struct omap_board_mux board_mux[] __initdata = {</div><div class='ctx'> 	{ .reg_offset = OMAP_MUX_TERMINATOR },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_device_pad serial2_pads[] __initdata = {</div><div class='del'>-	OMAP_MUX_STATIC("uart2_cts.uart2_cts",</div><div class='del'>-			 OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart2_rts.uart2_rts",</div><div class='del'>-			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart2_rx.uart2_rx",</div><div class='del'>-			 OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart2_tx.uart2_tx",</div><div class='del'>-			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_device_pad serial3_pads[] __initdata = {</div><div class='del'>-	OMAP_MUX_STATIC("uart3_cts_rctx.uart3_cts_rctx",</div><div class='del'>-			 OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart3_rts_sd.uart3_rts_sd",</div><div class='del'>-			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart3_rx_irrx.uart3_rx_irrx",</div><div class='del'>-			 OMAP_PIN_INPUT | OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart3_tx_irtx.uart3_tx_irtx",</div><div class='del'>-			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_device_pad serial4_pads[] __initdata = {</div><div class='del'>-	OMAP_MUX_STATIC("uart4_rx.uart4_rx",</div><div class='del'>-			 OMAP_PIN_INPUT | OMAP_MUX_MODE0),</div><div class='del'>-	OMAP_MUX_STATIC("uart4_tx.uart4_tx",</div><div class='del'>-			 OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_board_data serial2_data __initdata = {</div><div class='del'>-	.id             = 1,</div><div class='del'>-	.pads           = serial2_pads,</div><div class='del'>-	.pads_cnt       = ARRAY_SIZE(serial2_pads),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_board_data serial3_data __initdata = {</div><div class='del'>-	.id             = 2,</div><div class='del'>-	.pads           = serial3_pads,</div><div class='del'>-	.pads_cnt       = ARRAY_SIZE(serial3_pads),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_board_data serial4_data __initdata = {</div><div class='del'>-	.id             = 3,</div><div class='del'>-	.pads           = serial4_pads,</div><div class='del'>-	.pads_cnt       = ARRAY_SIZE(serial4_pads),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void board_serial_init(void)</div><div class='del'>-{</div><div class='del'>-	struct omap_board_data bdata;</div><div class='del'>-	bdata.flags     = 0;</div><div class='del'>-	bdata.pads      = NULL;</div><div class='del'>-	bdata.pads_cnt  = 0;</div><div class='del'>-	bdata.id        = 0;</div><div class='del'>-	/* pass dummy data for UART1 */</div><div class='del'>-	omap_serial_init_port(&amp;bdata);</div><div class='del'>-</div><div class='del'>-	omap_serial_init_port(&amp;serial2_data);</div><div class='del'>-	omap_serial_init_port(&amp;serial3_data);</div><div class='del'>-	omap_serial_init_port(&amp;serial4_data);</div><div class='del'>-}</div><div class='ctx'> #else</div><div class='ctx'> #define board_mux	NULL</div><div class='del'>-</div><div class='del'>-static inline void board_serial_init(void)</div><div class='del'>-{</div><div class='del'>-	omap_serial_init();</div><div class='del'>-}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Display DVI */</div><div class='hunk'>@@ -478,21 +412,6 @@ int __init omap4_panda_dvi_init(void)</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static void omap4_panda_hdmi_mux_init(void)</div><div class='del'>-{</div><div class='del'>-	/* PAD0_HDMI_HPD_PAD1_HDMI_CEC */</div><div class='del'>-	omap_mux_init_signal("hdmi_hpd",</div><div class='del'>-			OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-	omap_mux_init_signal("hdmi_cec",</div><div class='del'>-			OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-	/* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */</div><div class='del'>-	omap_mux_init_signal("hdmi_ddc_scl",</div><div class='del'>-			OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-	omap_mux_init_signal("hdmi_ddc_sda",</div><div class='del'>-			OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct gpio panda_hdmi_gpios[] = {</div><div class='ctx'> 	{ HDMI_GPIO_HPD,	GPIOF_OUT_INIT_HIGH, "hdmi_gpio_hpd"   },</div><div class='ctx'> 	{ HDMI_GPIO_LS_OE,	GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },</div><div class='hunk'>@@ -544,8 +463,16 @@ void omap4_panda_display_init(void)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		pr_err("error initializing panda DVI\n");</div><div class='ctx'> </div><div class='del'>-	omap4_panda_hdmi_mux_init();</div><div class='ctx'> 	omap_display_init(&amp;omap4_panda_dss_data);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * OMAP4460SDP/Blaze and OMAP4430 ES2.3 SDP/Blaze boards and</div><div class='add'>+	 * later have external pull up on the HDMI I2C lines</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_is_omap446x() || omap_rev() &gt; OMAP4430_REV_ES2_2)</div><div class='add'>+		omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP);</div><div class='add'>+	else</div><div class='add'>+		omap_hdmi_init(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init omap4_panda_init(void)</div><div class='hunk'>@@ -562,7 +489,7 @@ static void __init omap4_panda_init(void)</div><div class='ctx'> 	omap4_panda_i2c_init();</div><div class='ctx'> 	platform_add_devices(panda_devices, ARRAY_SIZE(panda_devices));</div><div class='ctx'> 	platform_device_register(&amp;omap_vwlan_device);</div><div class='del'>-	board_serial_init();</div><div class='add'>+	omap_serial_init();</div><div class='ctx'> 	omap_sdrc_init(NULL, NULL);</div><div class='ctx'> 	omap4_twl6030_hsmmc_init(mmc);</div><div class='ctx'> 	omap4_ehci_init();</div><div class='hunk'>@@ -577,6 +504,8 @@ MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board")</div><div class='ctx'> 	.map_io		= omap4_map_io,</div><div class='ctx'> 	.init_early	= omap4430_init_early,</div><div class='ctx'> 	.init_irq	= gic_init_irq,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= omap4_panda_init,</div><div class='ctx'> 	.timer		= &amp;omap4_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c<br/>index 4cf7aeabab86..52c0cef77165 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-overo.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-overo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-overo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-overo.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;video/omapdss.h&gt;</div><div class='ctx'> #include &lt;video/omap-panel-generic-dpi.h&gt;</div><div class='ctx'> #include &lt;video/omap-panel-dvi.h&gt;</div><div class='hunk'>@@ -562,6 +562,8 @@ MACHINE_START(OVERO, "Gumstix Overo")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= omap35xx_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= overo_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c<br/>index 616fb39763b0..8678b386c6a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-rm680.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-rm680.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-rm680.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-rm680.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;plat/mmc.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> #include &lt;plat/gpmc.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/onenand.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mux.h"</div><div class='hunk'>@@ -149,6 +149,8 @@ MACHINE_START(NOKIA_RM680, "Nokia RM-680 board")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= omap3630_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= rm680_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c<br/>index c15c5c9c9085..acb4e77b39ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-rx51-peripherals.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-rx51-peripherals.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-rx51-peripherals.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-rx51-peripherals.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/input/matrix_keypad.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/wl12xx.h&gt;</div><div class='add'>+#include &lt;linux/spi/tsc2005.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/i2c/twl.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='hunk'>@@ -27,7 +28,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/mcspi.h&gt;</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/dma.h&gt;</div><div class='ctx'> #include &lt;plat/gpmc.h&gt;</div><div class='ctx'> #include &lt;plat/onenand.h&gt;</div><div class='hunk'>@@ -58,6 +59,9 @@</div><div class='ctx'> </div><div class='ctx'> #define RX51_USB_TRANSCEIVER_RST_GPIO	67</div><div class='ctx'> </div><div class='add'>+#define RX51_TSC2005_RESET_GPIO         104</div><div class='add'>+#define RX51_TSC2005_IRQ_GPIO           100</div><div class='add'>+</div><div class='ctx'> /* list all spi devices here */</div><div class='ctx'> enum {</div><div class='ctx'> 	RX51_SPI_WL1251,</div><div class='hunk'>@@ -66,6 +70,7 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct wl12xx_platform_data wl1251_pdata;</div><div class='add'>+static struct tsc2005_platform_data tsc2005_pdata;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SENSORS_TSL2563) || defined(CONFIG_SENSORS_TSL2563_MODULE)</div><div class='ctx'> static struct tsl2563_platform_data rx51_tsl2563_platform_data = {</div><div class='hunk'>@@ -167,10 +172,10 @@ static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = {</div><div class='ctx'> 		.modalias		= "tsc2005",</div><div class='ctx'> 		.bus_num		= 1,</div><div class='ctx'> 		.chip_select		= 0,</div><div class='del'>-		/* .irq = OMAP_GPIO_IRQ(RX51_TSC2005_IRQ_GPIO),*/</div><div class='add'>+		.irq			= OMAP_GPIO_IRQ(RX51_TSC2005_IRQ_GPIO),</div><div class='ctx'> 		.max_speed_hz		= 6000000,</div><div class='ctx'> 		.controller_data	= &amp;tsc2005_mcspi_config,</div><div class='del'>-		/* .platform_data = &amp;tsc2005_config,*/</div><div class='add'>+		.platform_data		= &amp;tsc2005_pdata,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -940,6 +945,9 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = {</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='ctx'> 	{</div><div class='add'>+		I2C_BOARD_INFO("bq27200", 0x55),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		I2C_BOARD_INFO("tpa6130a2", 0x60),</div><div class='ctx'> 		.platform_data = &amp;rx51_tpa6130a2_data,</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1086,6 +1094,42 @@ error:</div><div class='ctx'> 	 */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct tsc2005_platform_data tsc2005_pdata = {</div><div class='add'>+	.ts_pressure_max	= 2048,</div><div class='add'>+	.ts_pressure_fudge	= 2,</div><div class='add'>+	.ts_x_max		= 4096,</div><div class='add'>+	.ts_x_fudge		= 4,</div><div class='add'>+	.ts_y_max		= 4096,</div><div class='add'>+	.ts_y_fudge		= 7,</div><div class='add'>+	.ts_x_plate_ohm		= 280,</div><div class='add'>+	.esd_timeout_ms		= 8000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void rx51_tsc2005_set_reset(bool enable)</div><div class='add'>+{</div><div class='add'>+	gpio_set_value(RX51_TSC2005_RESET_GPIO, enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init rx51_init_tsc2005(void)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = gpio_request_one(RX51_TSC2005_IRQ_GPIO, GPIOF_IN, "tsc2005 IRQ");</div><div class='add'>+	if (r &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "unable to get %s GPIO\n", "tsc2005 IRQ");</div><div class='add'>+		rx51_peripherals_spi_board_info[RX51_SPI_TSC2005].irq = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = gpio_request_one(RX51_TSC2005_RESET_GPIO, GPIOF_OUT_INIT_HIGH,</div><div class='add'>+		"tsc2005 reset");</div><div class='add'>+	if (r &gt;= 0) {</div><div class='add'>+		tsc2005_pdata.set_reset = rx51_tsc2005_set_reset;</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_ERR "unable to get %s GPIO\n", "tsc2005 reset");</div><div class='add'>+		tsc2005_pdata.esd_timeout_ms = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init rx51_peripherals_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	rx51_i2c_init();</div><div class='hunk'>@@ -1094,6 +1138,7 @@ void __init rx51_peripherals_init(void)</div><div class='ctx'> 	board_smc91x_init();</div><div class='ctx'> 	rx51_add_gpio_keys();</div><div class='ctx'> 	rx51_init_wl1251();</div><div class='add'>+	rx51_init_tsc2005();</div><div class='ctx'> 	rx51_init_si4713();</div><div class='ctx'> 	spi_register_board_info(rx51_peripherals_spi_board_info,</div><div class='ctx'> 				ARRAY_SIZE(rx51_peripherals_spi_board_info));</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c<br/>index 4af7c4b2881a..27f01f051dff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-rx51.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-rx51.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-rx51.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-rx51.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/mcspi.h&gt;</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/dma.h&gt;</div><div class='ctx'> #include &lt;plat/gpmc.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='hunk'>@@ -127,6 +127,8 @@ MACHINE_START(NOKIA_RX51, "Nokia RX-51 board")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= omap3430_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= rx51_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-ti8168evm.c b/arch/arm/mach-omap2/board-ti8168evm.c<br/>index e6ee8842285c..ab9a7a9e9d64 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-ti8168evm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-ti8168evm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-ti8168evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-ti8168evm.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Code for TI8168 EVM.</div><div class='add'>+ * Code for TI8168/TI8148 EVM.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2010 Texas Instruments, Inc. - http://www.ti.com/</div><div class='ctx'>  *</div><div class='hunk'>@@ -22,30 +22,46 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/irqs.h&gt;</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='add'>+#include &lt;plat/usb.h&gt;</div><div class='ctx'> </div><div class='del'>-static struct omap_board_config_kernel ti8168_evm_config[] __initdata = {</div><div class='add'>+static struct omap_musb_board_data musb_board_data = {</div><div class='add'>+	.set_phy_power	= ti81xx_musb_phy_power,</div><div class='add'>+	.interface_type	= MUSB_INTERFACE_ULPI,</div><div class='add'>+	.mode           = MUSB_OTG,</div><div class='add'>+	.power		= 500,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __init ti8168_evm_init(void)</div><div class='add'>+static struct omap_board_config_kernel ti81xx_evm_config[] __initdata = {</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init ti81xx_evm_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	omap_serial_init();</div><div class='ctx'> 	omap_sdrc_init(NULL, NULL);</div><div class='del'>-	omap_board_config = ti8168_evm_config;</div><div class='del'>-	omap_board_config_size = ARRAY_SIZE(ti8168_evm_config);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init ti8168_evm_map_io(void)</div><div class='del'>-{</div><div class='del'>-	omapti816x_map_common_io();</div><div class='add'>+	omap_board_config = ti81xx_evm_config;</div><div class='add'>+	omap_board_config_size = ARRAY_SIZE(ti81xx_evm_config);</div><div class='add'>+	usb_musb_init(&amp;musb_board_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(TI8168EVM, "ti8168evm")</div><div class='ctx'> 	/* Maintainer: Texas Instruments */</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='del'>-	.map_io		= ti8168_evm_map_io,</div><div class='del'>-	.init_early	= ti816x_init_early,</div><div class='del'>-	.init_irq	= ti816x_init_irq,</div><div class='add'>+	.map_io		= ti81xx_map_io,</div><div class='add'>+	.init_early	= ti81xx_init_early,</div><div class='add'>+	.init_irq	= ti81xx_init_irq,</div><div class='add'>+	.timer		= &amp;omap3_timer,</div><div class='add'>+	.init_machine	= ti81xx_evm_init,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='add'>+MACHINE_END</div><div class='add'>+</div><div class='add'>+MACHINE_START(TI8148EVM, "ti8148evm")</div><div class='add'>+	/* Maintainer: Texas Instruments */</div><div class='add'>+	.atag_offset	= 0x100,</div><div class='add'>+	.map_io		= ti81xx_map_io,</div><div class='add'>+	.init_early	= ti81xx_init_early,</div><div class='add'>+	.init_irq	= ti81xx_init_irq,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='del'>-	.init_machine	= ti8168_evm_init,</div><div class='add'>+	.init_machine	= ti81xx_evm_init,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c<br/>index 6d0aa4fcb7c3..8d7ce11cfeaf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-zoom-peripherals.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-zoom-peripherals.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-zoom-peripherals.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-zoom-peripherals.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/board-zoom.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c<br/>index be6684dc4f55..5c20bcc57f2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-zoom.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/board-zoom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-zoom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/board-zoom.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -135,8 +135,10 @@ MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= omap3430_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= omap_zoom_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")</div><div class='hunk'>@@ -145,6 +147,8 @@ MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")</div><div class='ctx'> 	.map_io		= omap3_map_io,</div><div class='ctx'> 	.init_early	= omap3630_init_early,</div><div class='ctx'> 	.init_irq	= omap3_init_irq,</div><div class='add'>+	.handle_irq	= omap3_intc_handle_irq,</div><div class='ctx'> 	.init_machine	= omap_zoom_init,</div><div class='ctx'> 	.timer		= &amp;omap3_timer,</div><div class='add'>+	.restart	= omap_prcm_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c<br/>index 1f3481f8d695..f57ed5baeccf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/clock.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include "cm-regbits-24xx.h"</div><div class='ctx'> #include "cm-regbits-34xx.h"</div><div class='ctx'> </div><div class='del'>-u8 cpu_mask;</div><div class='add'>+u16 cpu_mask;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * clkdm_control: if true, then when a clock is enabled in the</div><div class='head'>diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h<br/>index 2311bc217226..b8c2a686481c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/clock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/clock.h</a></div><div class='hunk'>@@ -132,7 +132,7 @@ void omap2_clk_print_new_rates(const char *hfclkin_ck_name,</div><div class='ctx'> 			       const char *core_ck_name,</div><div class='ctx'> 			       const char *mpu_ck_name);</div><div class='ctx'> </div><div class='del'>-extern u8 cpu_mask;</div><div class='add'>+extern u16 cpu_mask;</div><div class='ctx'> </div><div class='ctx'> extern const struct clkops clkops_omap2_dflt_wait;</div><div class='ctx'> extern const struct clkops clkops_dummy;</div><div class='head'>diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c<br/>index 5d0064a4fb5a..d75e5f6b8a01 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock3xxx_data.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/clock3xxx_data.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock3xxx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/clock3xxx_data.c</a></div><div class='hunk'>@@ -2480,6 +2480,16 @@ static struct clk uart4_fck = {</div><div class='ctx'> 	.recalc		= &amp;followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk uart4_fck_am35xx = {</div><div class='add'>+	.name           = "uart4_fck",</div><div class='add'>+	.ops            = &amp;clkops_omap2_dflt_wait,</div><div class='add'>+	.parent         = &amp;per_48m_fck,</div><div class='add'>+	.enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),</div><div class='add'>+	.enable_bit     = OMAP3430_EN_UART4_SHIFT,</div><div class='add'>+	.clkdm_name     = "core_l4_clkdm",</div><div class='add'>+	.recalc         = &amp;followparent_recalc,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk gpt2_fck = {</div><div class='ctx'> 	.name		= "gpt2_fck",</div><div class='ctx'> 	.ops		= &amp;clkops_omap2_dflt_wait,</div><div class='hunk'>@@ -3287,7 +3297,7 @@ static struct omap_clk omap3xxx_clks[] = {</div><div class='ctx'> 	CLK(NULL,	"cpefuse_fck",	&amp;cpefuse_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),</div><div class='ctx'> 	CLK(NULL,	"ts_fck",	&amp;ts_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),</div><div class='ctx'> 	CLK(NULL,	"usbtll_fck",	&amp;usbtll_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),</div><div class='del'>-	CLK("usbhs-omap.0",	"usbtll_fck",	&amp;usbtll_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),</div><div class='add'>+	CLK("usbhs_omap",	"usbtll_fck",	&amp;usbtll_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),</div><div class='ctx'> 	CLK("omap-mcbsp.1",	"prcm_fck",	&amp;core_96m_fck,	CK_3XXX),</div><div class='ctx'> 	CLK("omap-mcbsp.5",	"prcm_fck",	&amp;core_96m_fck,	CK_3XXX),</div><div class='ctx'> 	CLK(NULL,	"core_96m_fck",	&amp;core_96m_fck,	CK_3XXX),</div><div class='hunk'>@@ -3323,7 +3333,7 @@ static struct omap_clk omap3xxx_clks[] = {</div><div class='ctx'> 	CLK(NULL,	"pka_ick",	&amp;pka_ick,	CK_34XX | CK_36XX),</div><div class='ctx'> 	CLK(NULL,	"core_l4_ick",	&amp;core_l4_ick,	CK_3XXX),</div><div class='ctx'> 	CLK(NULL,	"usbtll_ick",	&amp;usbtll_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),</div><div class='del'>-	CLK("usbhs-omap.0",	"usbtll_ick",	&amp;usbtll_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),</div><div class='add'>+	CLK("usbhs_omap",	"usbtll_ick",	&amp;usbtll_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),</div><div class='ctx'> 	CLK("omap_hsmmc.2",	"ick",	&amp;mmchs3_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),</div><div class='ctx'> 	CLK(NULL,	"icr_ick",	&amp;icr_ick,	CK_34XX | CK_36XX),</div><div class='ctx'> 	CLK("omap-aes",	"ick",	&amp;aes2_ick,	CK_34XX | CK_36XX),</div><div class='hunk'>@@ -3369,20 +3379,18 @@ static struct omap_clk omap3xxx_clks[] = {</div><div class='ctx'> 	CLK(NULL,	"cam_ick",	&amp;cam_ick,	CK_34XX | CK_36XX),</div><div class='ctx'> 	CLK(NULL,	"csi2_96m_fck",	&amp;csi2_96m_fck,	CK_34XX | CK_36XX),</div><div class='ctx'> 	CLK(NULL,	"usbhost_120m_fck", &amp;usbhost_120m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),</div><div class='del'>-	CLK("usbhs-omap.0",	"hs_fck", &amp;usbhost_120m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),</div><div class='ctx'> 	CLK(NULL,	"usbhost_48m_fck", &amp;usbhost_48m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),</div><div class='del'>-	CLK("usbhs-omap.0",	"fs_fck", &amp;usbhost_48m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),</div><div class='ctx'> 	CLK(NULL,	"usbhost_ick",	&amp;usbhost_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),</div><div class='del'>-	CLK("usbhs-omap.0",	"usbhost_ick",	&amp;usbhost_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),</div><div class='del'>-	CLK("usbhs-omap.0",	"utmi_p1_gfclk",	&amp;dummy_ck,	CK_3XXX),</div><div class='del'>-	CLK("usbhs-omap.0",	"utmi_p2_gfclk",	&amp;dummy_ck,	CK_3XXX),</div><div class='del'>-	CLK("usbhs-omap.0",	"xclk60mhsp1_ck",	&amp;dummy_ck,	CK_3XXX),</div><div class='del'>-	CLK("usbhs-omap.0",	"xclk60mhsp2_ck",	&amp;dummy_ck,	CK_3XXX),</div><div class='del'>-	CLK("usbhs-omap.0",	"usb_host_hs_utmi_p1_clk",	&amp;dummy_ck,	CK_3XXX),</div><div class='del'>-	CLK("usbhs-omap.0",	"usb_host_hs_utmi_p2_clk",	&amp;dummy_ck,	CK_3XXX),</div><div class='del'>-	CLK("usbhs-omap.0",	"usb_tll_hs_usb_ch0_clk",	&amp;dummy_ck,	CK_3XXX),</div><div class='del'>-	CLK("usbhs-omap.0",	"usb_tll_hs_usb_ch1_clk",	&amp;dummy_ck,	CK_3XXX),</div><div class='del'>-	CLK("usbhs-omap.0",	"init_60m_fclk",	&amp;dummy_ck,	CK_3XXX),</div><div class='add'>+	CLK("usbhs_omap",	"usbhost_ick",	&amp;usbhost_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),</div><div class='add'>+	CLK("usbhs_omap",	"utmi_p1_gfclk",	&amp;dummy_ck,	CK_3XXX),</div><div class='add'>+	CLK("usbhs_omap",	"utmi_p2_gfclk",	&amp;dummy_ck,	CK_3XXX),</div><div class='add'>+	CLK("usbhs_omap",	"xclk60mhsp1_ck",	&amp;dummy_ck,	CK_3XXX),</div><div class='add'>+	CLK("usbhs_omap",	"xclk60mhsp2_ck",	&amp;dummy_ck,	CK_3XXX),</div><div class='add'>+	CLK("usbhs_omap",	"usb_host_hs_utmi_p1_clk",	&amp;dummy_ck,	CK_3XXX),</div><div class='add'>+	CLK("usbhs_omap",	"usb_host_hs_utmi_p2_clk",	&amp;dummy_ck,	CK_3XXX),</div><div class='add'>+	CLK("usbhs_omap",	"usb_tll_hs_usb_ch0_clk",	&amp;dummy_ck,	CK_3XXX),</div><div class='add'>+	CLK("usbhs_omap",	"usb_tll_hs_usb_ch1_clk",	&amp;dummy_ck,	CK_3XXX),</div><div class='add'>+	CLK("usbhs_omap",	"init_60m_fclk",	&amp;dummy_ck,	CK_3XXX),</div><div class='ctx'> 	CLK(NULL,	"usim_fck",	&amp;usim_fck,	CK_3430ES2PLUS | CK_36XX),</div><div class='ctx'> 	CLK(NULL,	"gpt1_fck",	&amp;gpt1_fck,	CK_3XXX),</div><div class='ctx'> 	CLK(NULL,	"wkup_32k_fck",	&amp;wkup_32k_fck,	CK_3XXX),</div><div class='hunk'>@@ -3403,6 +3411,7 @@ static struct omap_clk omap3xxx_clks[] = {</div><div class='ctx'> 	CLK(NULL,	"per_48m_fck",	&amp;per_48m_fck,	CK_3XXX),</div><div class='ctx'> 	CLK(NULL,	"uart3_fck",	&amp;uart3_fck,	CK_3XXX),</div><div class='ctx'> 	CLK(NULL,	"uart4_fck",	&amp;uart4_fck,	CK_36XX),</div><div class='add'>+	CLK(NULL,	"uart4_fck",	&amp;uart4_fck_am35xx, CK_3505 | CK_3517),</div><div class='ctx'> 	CLK(NULL,	"gpt2_fck",	&amp;gpt2_fck,	CK_3XXX),</div><div class='ctx'> 	CLK(NULL,	"gpt3_fck",	&amp;gpt3_fck,	CK_3XXX),</div><div class='ctx'> 	CLK(NULL,	"gpt4_fck",	&amp;gpt4_fck,	CK_3XXX),</div><div class='hunk'>@@ -3517,6 +3526,10 @@ int __init omap3xxx_clk_init(void)</div><div class='ctx'> 	} else if (cpu_is_ti816x()) {</div><div class='ctx'> 		cpu_mask = RATE_IN_TI816X;</div><div class='ctx'> 		cpu_clkflg = CK_TI816X;</div><div class='add'>+	} else if (cpu_is_am33xx()) {</div><div class='add'>+		cpu_mask = RATE_IN_AM33XX;</div><div class='add'>+	} else if (cpu_is_ti814x()) {</div><div class='add'>+		cpu_mask = RATE_IN_TI814X;</div><div class='ctx'> 	} else if (cpu_is_omap34xx()) {</div><div class='ctx'> 		if (omap_rev() == OMAP3430_REV_ES1_0) {</div><div class='ctx'> 			cpu_mask = RATE_IN_3430ES1;</div><div class='hunk'>@@ -3600,7 +3613,7 @@ int __init omap3xxx_clk_init(void)</div><div class='ctx'> 	 * Lock DPLL5 -- here only until other device init code can</div><div class='ctx'> 	 * handle this</div><div class='ctx'> 	 */</div><div class='del'>-	if (!cpu_is_ti816x() &amp;&amp; (omap_rev() &gt;= OMAP3430_REV_ES2_0))</div><div class='add'>+	if (!cpu_is_ti81xx() &amp;&amp; (omap_rev() &gt;= OMAP3430_REV_ES2_0))</div><div class='ctx'> 		omap3_clk_lock_dpll5();</div><div class='ctx'> </div><div class='ctx'> 	/* Avoid sleeping during omap3_core_dpll_m2_set_rate() */</div><div class='head'>diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c<br/>index 0798a802497a..08e86d793a1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock44xx_data.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/clock44xx_data.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock44xx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/clock44xx_data.c</a></div><div class='hunk'>@@ -1206,6 +1206,14 @@ static const struct clksel ocp_abe_iclk_div[] = {</div><div class='ctx'> 	{ .parent = NULL },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk mpu_periphclk = {</div><div class='add'>+	.name		= "mpu_periphclk",</div><div class='add'>+	.parent		= &amp;dpll_mpu_ck,</div><div class='add'>+	.ops		= &amp;clkops_null,</div><div class='add'>+	.fixed_div	= 2,</div><div class='add'>+	.recalc		= &amp;omap_fixed_divisor_recalc,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk ocp_abe_iclk = {</div><div class='ctx'> 	.name		= "ocp_abe_iclk",</div><div class='ctx'> 	.parent		= &amp;aess_fclk,</div><div class='hunk'>@@ -3189,6 +3197,7 @@ static struct omap_clk omap44xx_clks[] = {</div><div class='ctx'> 	CLK(NULL,	"l4_div_ck",			&amp;l4_div_ck,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"lp_clk_div_ck",		&amp;lp_clk_div_ck,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"l4_wkup_clk_mux_ck",		&amp;l4_wkup_clk_mux_ck,	CK_443X),</div><div class='add'>+	CLK("smp_twd",	NULL,				&amp;mpu_periphclk,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"ocp_abe_iclk",			&amp;ocp_abe_iclk,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"per_abe_24m_fclk",		&amp;per_abe_24m_fclk,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"per_abe_nc_fclk",		&amp;per_abe_nc_fclk,	CK_443X),</div><div class='hunk'>@@ -3295,7 +3304,7 @@ static struct omap_clk omap44xx_clks[] = {</div><div class='ctx'> 	CLK(NULL,	"uart2_fck",			&amp;uart2_fck,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"uart3_fck",			&amp;uart3_fck,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"uart4_fck",			&amp;uart4_fck,	CK_443X),</div><div class='del'>-	CLK("usbhs-omap.0",	"fs_fck",		&amp;usb_host_fs_fck,	CK_443X),</div><div class='add'>+	CLK("usbhs_omap",	"fs_fck",		&amp;usb_host_fs_fck,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"utmi_p1_gfclk",		&amp;utmi_p1_gfclk,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"usb_host_hs_utmi_p1_clk",	&amp;usb_host_hs_utmi_p1_clk,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"utmi_p2_gfclk",		&amp;utmi_p2_gfclk,	CK_443X),</div><div class='hunk'>@@ -3306,7 +3315,7 @@ static struct omap_clk omap44xx_clks[] = {</div><div class='ctx'> 	CLK(NULL,	"usb_host_hs_hsic60m_p2_clk",	&amp;usb_host_hs_hsic60m_p2_clk,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"usb_host_hs_hsic480m_p2_clk",	&amp;usb_host_hs_hsic480m_p2_clk,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"usb_host_hs_func48mclk",	&amp;usb_host_hs_func48mclk,	CK_443X),</div><div class='del'>-	CLK("usbhs-omap.0",	"hs_fck",		&amp;usb_host_hs_fck,	CK_443X),</div><div class='add'>+	CLK("usbhs_omap",	"hs_fck",		&amp;usb_host_hs_fck,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"otg_60m_gfclk",		&amp;otg_60m_gfclk,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"usb_otg_hs_xclk",		&amp;usb_otg_hs_xclk,	CK_443X),</div><div class='ctx'> 	CLK("musb-omap2430",	"ick",				&amp;usb_otg_hs_ick,	CK_443X),</div><div class='hunk'>@@ -3314,7 +3323,7 @@ static struct omap_clk omap44xx_clks[] = {</div><div class='ctx'> 	CLK(NULL,	"usb_tll_hs_usb_ch2_clk",	&amp;usb_tll_hs_usb_ch2_clk,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"usb_tll_hs_usb_ch0_clk",	&amp;usb_tll_hs_usb_ch0_clk,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"usb_tll_hs_usb_ch1_clk",	&amp;usb_tll_hs_usb_ch1_clk,	CK_443X),</div><div class='del'>-	CLK("usbhs-omap.0",	"usbtll_ick",		&amp;usb_tll_hs_ick,	CK_443X),</div><div class='add'>+	CLK("usbhs_omap",	"usbtll_ick",		&amp;usb_tll_hs_ick,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"usim_ck",			&amp;usim_ck,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"usim_fclk",			&amp;usim_fclk,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"usim_fck",			&amp;usim_fck,	CK_443X),</div><div class='hunk'>@@ -3374,8 +3383,8 @@ static struct omap_clk omap44xx_clks[] = {</div><div class='ctx'> 	CLK(NULL,	"uart2_ick",			&amp;dummy_ck,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"uart3_ick",			&amp;dummy_ck,	CK_443X),</div><div class='ctx'> 	CLK(NULL,	"uart4_ick",			&amp;dummy_ck,	CK_443X),</div><div class='del'>-	CLK("usbhs-omap.0",	"usbhost_ick",		&amp;dummy_ck,		CK_443X),</div><div class='del'>-	CLK("usbhs-omap.0",	"usbtll_fck",		&amp;dummy_ck,	CK_443X),</div><div class='add'>+	CLK("usbhs_omap",	"usbhost_ick",		&amp;dummy_ck,		CK_443X),</div><div class='add'>+	CLK("usbhs_omap",	"usbtll_fck",		&amp;dummy_ck,	CK_443X),</div><div class='ctx'> 	CLK("omap_wdt",	"ick",				&amp;dummy_ck,	CK_443X),</div><div class='ctx'> 	CLK("omap_timer.1",	"32k_ck",	&amp;sys_32k_ck,	CK_443X),</div><div class='ctx'> 	CLK("omap_timer.2",	"32k_ck",	&amp;sys_32k_ck,	CK_443X),</div><div class='head'>diff --git a/arch/arm/mach-omap2/cm2xxx_3xxx.c b/arch/arm/mach-omap2/cm2xxx_3xxx.c<br/>index 38830d8d4783..04d39cdd2112 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/cm2xxx_3xxx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/cm2xxx_3xxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/cm2xxx_3xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/cm2xxx_3xxx.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #include "cm.h"</div><div class='ctx'> #include "cm2xxx_3xxx.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/cm44xx.c b/arch/arm/mach-omap2/cm44xx.c<br/>index e96f53ea01a1..6a836303252c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/cm44xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/cm44xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/cm44xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/cm44xx.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #include "cm.h"</div><div class='ctx'> #include "cm1_44xx.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/cminst44xx.c b/arch/arm/mach-omap2/cminst44xx.c<br/>index eb2a472bbf46..6204deaf85b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/cminst44xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/cminst44xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/cminst44xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/cminst44xx.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #include "cm.h"</div><div class='ctx'> #include "cm1_44xx.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c<br/>index 110e5b9db145..aaf421178c91 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/common.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='ctx'> #include &lt;plat/mux.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -110,23 +110,49 @@ void __init omap3_map_io(void)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Adjust TAP register base such that omap3_check_revision accesses the correct</div><div class='del'>- * TI816X register for checking device ID (it adds 0x204 to tap base while</div><div class='del'>- * TI816X DEVICE ID register is at offset 0x600 from control base).</div><div class='add'>+ * TI81XX register for checking device ID (it adds 0x204 to tap base while</div><div class='add'>+ * TI81XX DEVICE ID register is at offset 0x600 from control base).</div><div class='ctx'>  */</div><div class='del'>-#define TI816X_TAP_BASE		(TI816X_CTRL_BASE + \</div><div class='del'>-				TI816X_CONTROL_DEVICE_ID - 0x204)</div><div class='add'>+#define TI81XX_TAP_BASE		(TI81XX_CTRL_BASE + \</div><div class='add'>+				TI81XX_CONTROL_DEVICE_ID - 0x204)</div><div class='ctx'> </div><div class='del'>-static struct omap_globals ti816x_globals = {</div><div class='add'>+static struct omap_globals ti81xx_globals = {</div><div class='ctx'> 	.class  = OMAP343X_CLASS,</div><div class='del'>-	.tap    = OMAP2_L4_IO_ADDRESS(TI816X_TAP_BASE),</div><div class='del'>-	.ctrl   = OMAP2_L4_IO_ADDRESS(TI816X_CTRL_BASE),</div><div class='del'>-	.prm    = OMAP2_L4_IO_ADDRESS(TI816X_PRCM_BASE),</div><div class='del'>-	.cm     = OMAP2_L4_IO_ADDRESS(TI816X_PRCM_BASE),</div><div class='add'>+	.tap    = OMAP2_L4_IO_ADDRESS(TI81XX_TAP_BASE),</div><div class='add'>+	.ctrl   = OMAP2_L4_IO_ADDRESS(TI81XX_CTRL_BASE),</div><div class='add'>+	.prm    = OMAP2_L4_IO_ADDRESS(TI81XX_PRCM_BASE),</div><div class='add'>+	.cm     = OMAP2_L4_IO_ADDRESS(TI81XX_PRCM_BASE),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init omap2_set_globals_ti816x(void)</div><div class='add'>+void __init omap2_set_globals_ti81xx(void)</div><div class='ctx'> {</div><div class='del'>-	__omap2_set_globals(&amp;ti816x_globals);</div><div class='add'>+	__omap2_set_globals(&amp;ti81xx_globals);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init ti81xx_map_io(void)</div><div class='add'>+{</div><div class='add'>+	omapti81xx_map_common_io();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define AM33XX_TAP_BASE		(AM33XX_CTRL_BASE + \</div><div class='add'>+				TI81XX_CONTROL_DEVICE_ID - 0x204)</div><div class='add'>+</div><div class='add'>+static struct omap_globals am33xx_globals = {</div><div class='add'>+	.class  = AM335X_CLASS,</div><div class='add'>+	.tap    = AM33XX_L4_WK_IO_ADDRESS(AM33XX_TAP_BASE),</div><div class='add'>+	.ctrl   = AM33XX_L4_WK_IO_ADDRESS(AM33XX_CTRL_BASE),</div><div class='add'>+	.prm    = AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE),</div><div class='add'>+	.cm     = AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init omap2_set_globals_am33xx(void)</div><div class='add'>+{</div><div class='add'>+	__omap2_set_globals(&amp;am33xx_globals);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init am33xx_map_io(void)</div><div class='add'>+{</div><div class='add'>+	omapam33xx_map_common_io();</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h<br/>new file mode 100644<br/>index 000000000000..febffde2ff10<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/common.h</a></div><div class='hunk'>@@ -0,0 +1,239 @@</div><div class='add'>+/*</div><div class='add'>+ * Header for code common to all OMAP2+ machines.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; either version 2 of the License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED</div><div class='add'>+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN</div><div class='add'>+ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,</div><div class='add'>+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='add'>+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF</div><div class='add'>+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='add'>+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='add'>+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the  GNU General Public License along</div><div class='add'>+ * with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='add'>+ * 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H</div><div class='add'>+#define __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H</div><div class='add'>+#ifndef __ASSEMBLER__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;plat/common.h&gt;</div><div class='add'>+#include &lt;asm/proc-fns.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SOC_OMAP2420</div><div class='add'>+extern void omap242x_map_common_io(void);</div><div class='add'>+#else</div><div class='add'>+static inline void omap242x_map_common_io(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SOC_OMAP2430</div><div class='add'>+extern void omap243x_map_common_io(void);</div><div class='add'>+#else</div><div class='add'>+static inline void omap243x_map_common_io(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP3</div><div class='add'>+extern void omap34xx_map_common_io(void);</div><div class='add'>+#else</div><div class='add'>+static inline void omap34xx_map_common_io(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SOC_OMAPTI81XX</div><div class='add'>+extern void omapti81xx_map_common_io(void);</div><div class='add'>+#else</div><div class='add'>+static inline void omapti81xx_map_common_io(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SOC_OMAPAM33XX</div><div class='add'>+extern void omapam33xx_map_common_io(void);</div><div class='add'>+#else</div><div class='add'>+static inline void omapam33xx_map_common_io(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP4</div><div class='add'>+extern void omap44xx_map_common_io(void);</div><div class='add'>+#else</div><div class='add'>+static inline void omap44xx_map_common_io(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+extern void omap2_init_common_infrastructure(void);</div><div class='add'>+</div><div class='add'>+extern struct sys_timer omap2_timer;</div><div class='add'>+extern struct sys_timer omap3_timer;</div><div class='add'>+extern struct sys_timer omap3_secure_timer;</div><div class='add'>+extern struct sys_timer omap4_timer;</div><div class='add'>+</div><div class='add'>+void omap2420_init_early(void);</div><div class='add'>+void omap2430_init_early(void);</div><div class='add'>+void omap3430_init_early(void);</div><div class='add'>+void omap35xx_init_early(void);</div><div class='add'>+void omap3630_init_early(void);</div><div class='add'>+void omap3_init_early(void);	/* Do not use this one */</div><div class='add'>+void am35xx_init_early(void);</div><div class='add'>+void ti81xx_init_early(void);</div><div class='add'>+void omap4430_init_early(void);</div><div class='add'>+void omap_prcm_restart(char, const char *);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IO bases for various OMAP processors</div><div class='add'>+ * Except the tap base, rest all the io bases</div><div class='add'>+ * listed are physical addresses.</div><div class='add'>+ */</div><div class='add'>+struct omap_globals {</div><div class='add'>+	u32		class;		/* OMAP class to detect */</div><div class='add'>+	void __iomem	*tap;		/* Control module ID code */</div><div class='add'>+	void __iomem	*sdrc;           /* SDRAM Controller */</div><div class='add'>+	void __iomem	*sms;            /* SDRAM Memory Scheduler */</div><div class='add'>+	void __iomem	*ctrl;           /* System Control Module */</div><div class='add'>+	void __iomem	*ctrl_pad;	/* PAD Control Module */</div><div class='add'>+	void __iomem	*prm;            /* Power and Reset Management */</div><div class='add'>+	void __iomem	*cm;             /* Clock Management */</div><div class='add'>+	void __iomem	*cm2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void omap2_set_globals_242x(void);</div><div class='add'>+void omap2_set_globals_243x(void);</div><div class='add'>+void omap2_set_globals_3xxx(void);</div><div class='add'>+void omap2_set_globals_443x(void);</div><div class='add'>+void omap2_set_globals_ti81xx(void);</div><div class='add'>+void omap2_set_globals_am33xx(void);</div><div class='add'>+</div><div class='add'>+/* These get called from omap2_set_globals_xxxx(), do not call these */</div><div class='add'>+void omap2_set_globals_tap(struct omap_globals *);</div><div class='add'>+void omap2_set_globals_sdrc(struct omap_globals *);</div><div class='add'>+void omap2_set_globals_control(struct omap_globals *);</div><div class='add'>+void omap2_set_globals_prcm(struct omap_globals *);</div><div class='add'>+</div><div class='add'>+void omap242x_map_io(void);</div><div class='add'>+void omap243x_map_io(void);</div><div class='add'>+void omap3_map_io(void);</div><div class='add'>+void am33xx_map_io(void);</div><div class='add'>+void omap4_map_io(void);</div><div class='add'>+void ti81xx_map_io(void);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap_test_timeout - busy-loop, testing a condition</div><div class='add'>+ * @cond: condition to test until it evaluates to true</div><div class='add'>+ * @timeout: maximum number of microseconds in the timeout</div><div class='add'>+ * @index: loop index (integer)</div><div class='add'>+ *</div><div class='add'>+ * Loop waiting for @cond to become true or until at least @timeout</div><div class='add'>+ * microseconds have passed.  To use, define some integer @index in the</div><div class='add'>+ * calling code.  After running, if @index == @timeout, then the loop has</div><div class='add'>+ * timed out.</div><div class='add'>+ */</div><div class='add'>+#define omap_test_timeout(cond, timeout, index)			\</div><div class='add'>+({								\</div><div class='add'>+	for (index = 0; index &lt; timeout; index++) {		\</div><div class='add'>+		if (cond)					\</div><div class='add'>+			break;					\</div><div class='add'>+		udelay(1);					\</div><div class='add'>+	}							\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+extern struct device *omap2_get_mpuss_device(void);</div><div class='add'>+extern struct device *omap2_get_iva_device(void);</div><div class='add'>+extern struct device *omap2_get_l3_device(void);</div><div class='add'>+extern struct device *omap4_get_dsp_device(void);</div><div class='add'>+</div><div class='add'>+void omap2_init_irq(void);</div><div class='add'>+void omap3_init_irq(void);</div><div class='add'>+void ti81xx_init_irq(void);</div><div class='add'>+extern int omap_irq_pending(void);</div><div class='add'>+void omap_intc_save_context(void);</div><div class='add'>+void omap_intc_restore_context(void);</div><div class='add'>+void omap3_intc_suspend(void);</div><div class='add'>+void omap3_intc_prepare_idle(void);</div><div class='add'>+void omap3_intc_resume_idle(void);</div><div class='add'>+void omap2_intc_handle_irq(struct pt_regs *regs);</div><div class='add'>+void omap3_intc_handle_irq(struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CACHE_L2X0</div><div class='add'>+extern void __iomem *omap4_get_l2cache_base(void);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+extern void __iomem *omap4_get_scu_base(void);</div><div class='add'>+#else</div><div class='add'>+static inline void __iomem *omap4_get_scu_base(void)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+extern void __init gic_init_irq(void);</div><div class='add'>+extern void omap_smc1(u32 fn, u32 arg);</div><div class='add'>+extern void __iomem *omap4_get_sar_ram_base(void);</div><div class='add'>+extern void omap_do_wfi(void);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+/* Needed for secondary core boot */</div><div class='add'>+extern void omap_secondary_startup(void);</div><div class='add'>+extern u32 omap_modify_auxcoreboot0(u32 set_mask, u32 clear_mask);</div><div class='add'>+extern void omap_auxcoreboot_addr(u32 cpu_addr);</div><div class='add'>+extern u32 omap_read_auxcoreboot0(void);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SMP) &amp;&amp; defined(CONFIG_PM)</div><div class='add'>+extern int omap4_mpuss_init(void);</div><div class='add'>+extern int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state);</div><div class='add'>+extern int omap4_finish_suspend(unsigned long cpu_state);</div><div class='add'>+extern void omap4_cpu_resume(void);</div><div class='add'>+extern int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state);</div><div class='add'>+extern u32 omap4_mpuss_read_prev_context_state(void);</div><div class='add'>+#else</div><div class='add'>+static inline int omap4_enter_lowpower(unsigned int cpu,</div><div class='add'>+					unsigned int power_state)</div><div class='add'>+{</div><div class='add'>+	cpu_do_idle();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state)</div><div class='add'>+{</div><div class='add'>+	cpu_do_idle();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int omap4_mpuss_init(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int omap4_finish_suspend(unsigned long cpu_state)</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 omap4_cpu_resume(void)</div><div class='add'>+{}</div><div class='add'>+</div><div class='add'>+static inline u32 omap4_mpuss_read_prev_context_state(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+#endif /* __ASSEMBLER__ */</div><div class='add'>+#endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */</div><div class='head'>diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c<br/>index e34d27f8c49c..114c037e433c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/control.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/control.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/control.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/control.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/sdrc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cm-regbits-34xx.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h<br/>index d4ef75d5a382..0ba68d3764bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/control.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/control.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/control.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/control.h</a></div><div class='hunk'>@@ -52,8 +52,8 @@</div><div class='ctx'> #define OMAP343X_CONTROL_PADCONFS_WKUP	0xa00</div><div class='ctx'> #define OMAP343X_CONTROL_GENERAL_WKUP	0xa60</div><div class='ctx'> </div><div class='del'>-/* TI816X spefic control submodules */</div><div class='del'>-#define TI816X_CONTROL_DEVCONF		0x600</div><div class='add'>+/* TI81XX spefic control submodules */</div><div class='add'>+#define TI81XX_CONTROL_DEVCONF		0x600</div><div class='ctx'> </div><div class='ctx'> /* Control register offsets - read/write with omap_ctrl_{read,write}{bwl}() */</div><div class='ctx'> </div><div class='hunk'>@@ -244,8 +244,8 @@</div><div class='ctx'> #define OMAP3_PADCONF_SAD2D_MSTANDBY   0x250</div><div class='ctx'> #define OMAP3_PADCONF_SAD2D_IDLEACK    0x254</div><div class='ctx'> </div><div class='del'>-/* TI816X CONTROL_DEVCONF register offsets */</div><div class='del'>-#define TI816X_CONTROL_DEVICE_ID	(TI816X_CONTROL_DEVCONF + 0x000)</div><div class='add'>+/* TI81XX CONTROL_DEVCONF register offsets */</div><div class='add'>+#define TI81XX_CONTROL_DEVICE_ID	(TI81XX_CONTROL_DEVCONF + 0x000)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * REVISIT: This list of registers is not comprehensive - there are more</div><div class='head'>diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c<br/>index 942bb4f19f9f..464cffde58fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/cpuidle34xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/cpuidle34xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/cpuidle34xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/cpuidle34xx.c</a></div><div class='hunk'>@@ -25,15 +25,16 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/cpuidle.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/cpu_pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/prcm.h&gt;</div><div class='ctx'> #include &lt;plat/irqs.h&gt;</div><div class='ctx'> #include "powerdomain.h"</div><div class='ctx'> #include "clockdomain.h"</div><div class='del'>-#include &lt;plat/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pm.h"</div><div class='ctx'> #include "control.h"</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_IDLE</div><div class='ctx'> </div><div class='hunk'>@@ -123,9 +124,23 @@ static int omap3_enter_idle(struct cpuidle_device *dev,</div><div class='ctx'> 		pwrdm_for_each_clkdm(core_pd, _cpuidle_deny_idle);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Call idle CPU PM enter notifier chain so that</div><div class='add'>+	 * VFP context is saved.</div><div class='add'>+	 */</div><div class='add'>+	if (mpu_state == PWRDM_POWER_OFF)</div><div class='add'>+		cpu_pm_enter();</div><div class='add'>+</div><div class='ctx'> 	/* Execute ARM wfi */</div><div class='ctx'> 	omap_sram_idle();</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Call idle CPU PM enter notifier chain to restore</div><div class='add'>+	 * VFP context.</div><div class='add'>+	 */</div><div class='add'>+	if (pwrdm_read_prev_pwrst(mpu_pd) == PWRDM_POWER_OFF)</div><div class='add'>+		cpu_pm_exit();</div><div class='add'>+</div><div class='ctx'> 	/* Re-allow idle for C1 */</div><div class='ctx'> 	if (index == 0) {</div><div class='ctx'> 		pwrdm_for_each_clkdm(mpu_pd, _cpuidle_allow_idle);</div><div class='hunk'>@@ -244,11 +259,6 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev,</div><div class='ctx'> 	struct omap3_idle_statedata *cx;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!omap3_can_sleep()) {</div><div class='del'>-		new_state_idx = drv-&gt;safe_state_index;</div><div class='del'>-		goto select_state;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Prevent idle completely if CAM is active.</div><div class='ctx'> 	 * CAM does not have wakeup capability in OMAP3.</div><div class='head'>diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c<br/>new file mode 100644<br/>index 000000000000..cfdbb86bc84e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/cpuidle44xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/cpuidle44xx.c</a></div><div class='hunk'>@@ -0,0 +1,245 @@</div><div class='add'>+/*</div><div class='add'>+ * OMAP4 CPU idle Routines</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments, Inc.</div><div class='add'>+ * Santosh Shilimkar &lt;santosh.shilimkar@ti.com&gt;</div><div class='add'>+ * Rajendra Nayak &lt;rnayak@ti.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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/cpuidle.h&gt;</div><div class='add'>+#include &lt;linux/cpu_pm.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/clockchips.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/proc-fns.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "pm.h"</div><div class='add'>+#include "prm.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_IDLE</div><div class='add'>+</div><div class='add'>+/* Machine specific information to be recorded in the C-state driver_data */</div><div class='add'>+struct omap4_idle_statedata {</div><div class='add'>+	u32 cpu_state;</div><div class='add'>+	u32 mpu_logic_state;</div><div class='add'>+	u32 mpu_state;</div><div class='add'>+	u8 valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cpuidle_params cpuidle_params_table[] = {</div><div class='add'>+	/* C1 - CPU0 ON + CPU1 ON + MPU ON */</div><div class='add'>+	{.exit_latency = 2 + 2 , .target_residency = 5, .valid = 1},</div><div class='add'>+	/* C2- CPU0 OFF + CPU1 OFF + MPU CSWR */</div><div class='add'>+	{.exit_latency = 328 + 440 , .target_residency = 960, .valid = 1},</div><div class='add'>+	/* C3 - CPU0 OFF + CPU1 OFF + MPU OSWR */</div><div class='add'>+	{.exit_latency = 460 + 518 , .target_residency = 1100, .valid = 1},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define OMAP4_NUM_STATES ARRAY_SIZE(cpuidle_params_table)</div><div class='add'>+</div><div class='add'>+struct omap4_idle_statedata omap4_idle_data[OMAP4_NUM_STATES];</div><div class='add'>+static struct powerdomain *mpu_pd, *cpu0_pd, *cpu1_pd;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap4_enter_idle - Programs OMAP4 to enter the specified state</div><div class='add'>+ * @dev: cpuidle device</div><div class='add'>+ * @drv: cpuidle driver</div><div class='add'>+ * @index: the index of state to be entered</div><div class='add'>+ *</div><div class='add'>+ * Called from the CPUidle framework to program the device to the</div><div class='add'>+ * specified low power state selected by the governor.</div><div class='add'>+ * Returns the amount of time spent in the low power state.</div><div class='add'>+ */</div><div class='add'>+static int omap4_enter_idle(struct cpuidle_device *dev,</div><div class='add'>+			struct cpuidle_driver *drv,</div><div class='add'>+			int index)</div><div class='add'>+{</div><div class='add'>+	struct omap4_idle_statedata *cx =</div><div class='add'>+			cpuidle_get_statedata(&amp;dev-&gt;states_usage[index]);</div><div class='add'>+	struct timespec ts_preidle, ts_postidle, ts_idle;</div><div class='add'>+	u32 cpu1_state;</div><div class='add'>+	int idle_time;</div><div class='add'>+	int new_state_idx;</div><div class='add'>+	int cpu_id = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	/* Used to keep track of the total time in idle */</div><div class='add'>+	getnstimeofday(&amp;ts_preidle);</div><div class='add'>+</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	local_fiq_disable();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * CPU0 has to stay ON (i.e in C1) until CPU1 is OFF state.</div><div class='add'>+	 * This is necessary to honour hardware recommondation</div><div class='add'>+	 * of triggeing all the possible low power modes once CPU1 is</div><div class='add'>+	 * out of coherency and in OFF mode.</div><div class='add'>+	 * Update dev-&gt;last_state so that governor stats reflects right</div><div class='add'>+	 * data.</div><div class='add'>+	 */</div><div class='add'>+	cpu1_state = pwrdm_read_pwrst(cpu1_pd);</div><div class='add'>+	if (cpu1_state != PWRDM_POWER_OFF) {</div><div class='add'>+		new_state_idx = drv-&gt;safe_state_index;</div><div class='add'>+		cx = cpuidle_get_statedata(&amp;dev-&gt;states_usage[new_state_idx]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (index &gt; 0)</div><div class='add'>+		clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &amp;cpu_id);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Call idle CPU PM enter notifier chain so that</div><div class='add'>+	 * VFP and per CPU interrupt context is saved.</div><div class='add'>+	 */</div><div class='add'>+	if (cx-&gt;cpu_state == PWRDM_POWER_OFF)</div><div class='add'>+		cpu_pm_enter();</div><div class='add'>+</div><div class='add'>+	pwrdm_set_logic_retst(mpu_pd, cx-&gt;mpu_logic_state);</div><div class='add'>+	omap_set_pwrdm_state(mpu_pd, cx-&gt;mpu_state);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Call idle CPU cluster PM enter notifier chain</div><div class='add'>+	 * to save GIC and wakeupgen context.</div><div class='add'>+	 */</div><div class='add'>+	if ((cx-&gt;mpu_state == PWRDM_POWER_RET) &amp;&amp;</div><div class='add'>+		(cx-&gt;mpu_logic_state == PWRDM_POWER_OFF))</div><div class='add'>+			cpu_cluster_pm_enter();</div><div class='add'>+</div><div class='add'>+	omap4_enter_lowpower(dev-&gt;cpu, cx-&gt;cpu_state);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Call idle CPU PM exit notifier chain to restore</div><div class='add'>+	 * VFP and per CPU IRQ context. Only CPU0 state is</div><div class='add'>+	 * considered since CPU1 is managed by CPU hotplug.</div><div class='add'>+	 */</div><div class='add'>+	if (pwrdm_read_prev_pwrst(cpu0_pd) == PWRDM_POWER_OFF)</div><div class='add'>+		cpu_pm_exit();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Call idle CPU cluster PM exit notifier chain</div><div class='add'>+	 * to restore GIC and wakeupgen context.</div><div class='add'>+	 */</div><div class='add'>+	if (omap4_mpuss_read_prev_context_state())</div><div class='add'>+		cpu_cluster_pm_exit();</div><div class='add'>+</div><div class='add'>+	if (index &gt; 0)</div><div class='add'>+		clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &amp;cpu_id);</div><div class='add'>+</div><div class='add'>+	getnstimeofday(&amp;ts_postidle);</div><div class='add'>+	ts_idle = timespec_sub(ts_postidle, ts_preidle);</div><div class='add'>+</div><div class='add'>+	local_irq_enable();</div><div class='add'>+	local_fiq_enable();</div><div class='add'>+</div><div class='add'>+	idle_time = ts_idle.tv_nsec / NSEC_PER_USEC + ts_idle.tv_sec * \</div><div class='add'>+								USEC_PER_SEC;</div><div class='add'>+</div><div class='add'>+	/* Update cpuidle counters */</div><div class='add'>+	dev-&gt;last_residency = idle_time;</div><div class='add'>+</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_PER_CPU(struct cpuidle_device, omap4_idle_dev);</div><div class='add'>+</div><div class='add'>+struct cpuidle_driver omap4_idle_driver = {</div><div class='add'>+	.name =		"omap4_idle",</div><div class='add'>+	.owner =	THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void _fill_cstate(struct cpuidle_driver *drv,</div><div class='add'>+					int idx, const char *descr)</div><div class='add'>+{</div><div class='add'>+	struct cpuidle_state *state = &amp;drv-&gt;states[idx];</div><div class='add'>+</div><div class='add'>+	state-&gt;exit_latency	= cpuidle_params_table[idx].exit_latency;</div><div class='add'>+	state-&gt;target_residency	= cpuidle_params_table[idx].target_residency;</div><div class='add'>+	state-&gt;flags		= CPUIDLE_FLAG_TIME_VALID;</div><div class='add'>+	state-&gt;enter		= omap4_enter_idle;</div><div class='add'>+	sprintf(state-&gt;name, "C%d", idx + 1);</div><div class='add'>+	strncpy(state-&gt;desc, descr, CPUIDLE_DESC_LEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct omap4_idle_statedata *_fill_cstate_usage(</div><div class='add'>+					struct cpuidle_device *dev,</div><div class='add'>+					int idx)</div><div class='add'>+{</div><div class='add'>+	struct omap4_idle_statedata *cx = &amp;omap4_idle_data[idx];</div><div class='add'>+	struct cpuidle_state_usage *state_usage = &amp;dev-&gt;states_usage[idx];</div><div class='add'>+</div><div class='add'>+	cx-&gt;valid		= cpuidle_params_table[idx].valid;</div><div class='add'>+	cpuidle_set_statedata(state_usage, cx);</div><div class='add'>+</div><div class='add'>+	return cx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap4_idle_init - Init routine for OMAP4 idle</div><div class='add'>+ *</div><div class='add'>+ * Registers the OMAP4 specific cpuidle driver to the cpuidle</div><div class='add'>+ * framework with the valid set of states.</div><div class='add'>+ */</div><div class='add'>+int __init omap4_idle_init(void)</div><div class='add'>+{</div><div class='add'>+	struct omap4_idle_statedata *cx;</div><div class='add'>+	struct cpuidle_device *dev;</div><div class='add'>+	struct cpuidle_driver *drv = &amp;omap4_idle_driver;</div><div class='add'>+	unsigned int cpu_id = 0;</div><div class='add'>+</div><div class='add'>+	mpu_pd = pwrdm_lookup("mpu_pwrdm");</div><div class='add'>+	cpu0_pd = pwrdm_lookup("cpu0_pwrdm");</div><div class='add'>+	cpu1_pd = pwrdm_lookup("cpu1_pwrdm");</div><div class='add'>+	if ((!mpu_pd) || (!cpu0_pd) || (!cpu1_pd))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	drv-&gt;safe_state_index = -1;</div><div class='add'>+	dev = &amp;per_cpu(omap4_idle_dev, cpu_id);</div><div class='add'>+	dev-&gt;cpu = cpu_id;</div><div class='add'>+</div><div class='add'>+	/* C1 - CPU0 ON + CPU1 ON + MPU ON */</div><div class='add'>+	_fill_cstate(drv, 0, "MPUSS ON");</div><div class='add'>+	drv-&gt;safe_state_index = 0;</div><div class='add'>+	cx = _fill_cstate_usage(dev, 0);</div><div class='add'>+	cx-&gt;valid = 1;	/* C1 is always valid */</div><div class='add'>+	cx-&gt;cpu_state = PWRDM_POWER_ON;</div><div class='add'>+	cx-&gt;mpu_state = PWRDM_POWER_ON;</div><div class='add'>+	cx-&gt;mpu_logic_state = PWRDM_POWER_RET;</div><div class='add'>+</div><div class='add'>+	/* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */</div><div class='add'>+	_fill_cstate(drv, 1, "MPUSS CSWR");</div><div class='add'>+	cx = _fill_cstate_usage(dev, 1);</div><div class='add'>+	cx-&gt;cpu_state = PWRDM_POWER_OFF;</div><div class='add'>+	cx-&gt;mpu_state = PWRDM_POWER_RET;</div><div class='add'>+	cx-&gt;mpu_logic_state = PWRDM_POWER_RET;</div><div class='add'>+</div><div class='add'>+	/* C3 - CPU0 OFF + CPU1 OFF + MPU OSWR */</div><div class='add'>+	_fill_cstate(drv, 2, "MPUSS OSWR");</div><div class='add'>+	cx = _fill_cstate_usage(dev, 2);</div><div class='add'>+	cx-&gt;cpu_state = PWRDM_POWER_OFF;</div><div class='add'>+	cx-&gt;mpu_state = PWRDM_POWER_RET;</div><div class='add'>+	cx-&gt;mpu_logic_state = PWRDM_POWER_OFF;</div><div class='add'>+</div><div class='add'>+	drv-&gt;state_count = OMAP4_NUM_STATES;</div><div class='add'>+	cpuidle_register_driver(&amp;omap4_idle_driver);</div><div class='add'>+</div><div class='add'>+	dev-&gt;state_count = OMAP4_NUM_STATES;</div><div class='add'>+	if (cpuidle_register_device(dev)) {</div><div class='add'>+		pr_err("%s: CPUidle register device failed\n", __func__);</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'>+#else</div><div class='add'>+int __init omap4_idle_init(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_CPU_IDLE */</div><div class='head'>diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c<br/>index c15cfada5f13..0b510ad01a00 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/devices.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/devices.c</a></div><div class='hunk'>@@ -127,6 +127,10 @@ static struct platform_device omap2cam_device = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_IOMMU_API)</div><div class='add'>+</div><div class='add'>+#include &lt;plat/iommu.h&gt;</div><div class='add'>+</div><div class='ctx'> static struct resource omap3isp_resources[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.start		= OMAP3430_ISP_BASE,</div><div class='hunk'>@@ -211,12 +215,27 @@ static struct platform_device omap3isp_device = {</div><div class='ctx'> 	.resource	= omap3isp_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct omap_iommu_arch_data omap3_isp_iommu = {</div><div class='add'>+	.name = "isp",</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int omap3_init_camera(struct isp_platform_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	omap3isp_device.dev.platform_data = pdata;</div><div class='add'>+	omap3isp_device.dev.archdata.iommu = &amp;omap3_isp_iommu;</div><div class='add'>+</div><div class='ctx'> 	return platform_device_register(&amp;omap3isp_device);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#else /* !CONFIG_IOMMU_API */</div><div class='add'>+</div><div class='add'>+int omap3_init_camera(struct isp_platform_data *pdata)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline void omap_init_camera(void)</div><div class='ctx'> {</div><div class='ctx'> #if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)</div><div class='hunk'>@@ -336,6 +355,27 @@ static void omap_init_mcpdm(void)</div><div class='ctx'> static inline void omap_init_mcpdm(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_SND_OMAP_SOC_DMIC) || \</div><div class='add'>+		defined(CONFIG_SND_OMAP_SOC_DMIC_MODULE)</div><div class='add'>+</div><div class='add'>+static void omap_init_dmic(void)</div><div class='add'>+{</div><div class='add'>+	struct omap_hwmod *oh;</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+</div><div class='add'>+	oh = omap_hwmod_lookup("dmic");</div><div class='add'>+	if (!oh) {</div><div class='add'>+		printk(KERN_ERR "Could not look up mcpdm hw_mod\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdev = omap_device_build("omap-dmic", -1, oh, NULL, 0, NULL, 0, 0);</div><div class='add'>+	WARN(IS_ERR(pdev), "Can't build omap_device for omap-dmic.\n");</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void omap_init_dmic(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/mcspi.h&gt;</div><div class='hunk'>@@ -681,6 +721,7 @@ static int __init omap2_init_devices(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	omap_init_audio();</div><div class='ctx'> 	omap_init_mcpdm();</div><div class='add'>+	omap_init_dmic();</div><div class='ctx'> 	omap_init_camera();</div><div class='ctx'> 	omap_init_mbox();</div><div class='ctx'> 	omap_init_mcspi();</div><div class='head'>diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c<br/>index dce9905d64bb..3c446d1a1781 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/display.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/display.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/display.c</a></div><div class='hunk'>@@ -22,13 +22,15 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/omapdss.h&gt;</div><div class='ctx'> #include &lt;plat/omap_hwmod.h&gt;</div><div class='ctx'> #include &lt;plat/omap_device.h&gt;</div><div class='ctx'> #include &lt;plat/omap-pm.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='add'>+#include "mux.h"</div><div class='ctx'> #include "control.h"</div><div class='ctx'> #include "display.h"</div><div class='ctx'> </div><div class='hunk'>@@ -96,6 +98,36 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = {</div><div class='ctx'> 	{ "dss_hdmi", "omapdss_hdmi", -1 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void omap4_hdmi_mux_pads(enum omap_hdmi_flags flags)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+	u16 control_i2c_1;</div><div class='add'>+</div><div class='add'>+	/* PAD0_HDMI_HPD_PAD1_HDMI_CEC */</div><div class='add'>+	omap_mux_init_signal("hdmi_hpd",</div><div class='add'>+			OMAP_PIN_INPUT_PULLUP);</div><div class='add'>+	omap_mux_init_signal("hdmi_cec",</div><div class='add'>+			OMAP_PIN_INPUT_PULLUP);</div><div class='add'>+	/* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */</div><div class='add'>+	omap_mux_init_signal("hdmi_ddc_scl",</div><div class='add'>+			OMAP_PIN_INPUT_PULLUP);</div><div class='add'>+	omap_mux_init_signal("hdmi_ddc_sda",</div><div class='add'>+			OMAP_PIN_INPUT_PULLUP);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * CONTROL_I2C_1: HDMI_DDC_SDA_PULLUPRESX (bit 28) and</div><div class='add'>+	 * HDMI_DDC_SCL_PULLUPRESX (bit 24) are set to disable</div><div class='add'>+	 * internal pull up resistor.</div><div class='add'>+	 */</div><div class='add'>+	if (flags &amp; OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP) {</div><div class='add'>+		control_i2c_1 = OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_I2C_1;</div><div class='add'>+		reg = omap4_ctrl_pad_readl(control_i2c_1);</div><div class='add'>+		reg |= (OMAP4_HDMI_DDC_SDA_PULLUPRESX_MASK |</div><div class='add'>+			OMAP4_HDMI_DDC_SCL_PULLUPRESX_MASK);</div><div class='add'>+			omap4_ctrl_pad_writel(reg, control_i2c_1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes)</div><div class='ctx'> {</div><div class='ctx'> 	u32 enable_mask, enable_shift;</div><div class='hunk'>@@ -129,6 +161,14 @@ static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int omap_hdmi_init(enum omap_hdmi_flags flags)</div><div class='add'>+{</div><div class='add'>+	if (cpu_is_omap44xx())</div><div class='add'>+		omap4_hdmi_mux_pads(flags);</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_dsi_enable_pads(int dsi_id, unsigned lane_mask)</div><div class='ctx'> {</div><div class='ctx'> 	if (cpu_is_omap44xx())</div><div class='head'>diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c<br/>index f4a1020559a7..bd844af13af5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/hsmmc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/hsmmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/hsmmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/hsmmc.c</a></div><div class='hunk'>@@ -171,6 +171,17 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void hsmmc2_select_input_clk_src(struct omap_mmc_platform_data *mmc)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	if (mmc-&gt;slots[0].internal_clock) {</div><div class='add'>+		reg = omap_ctrl_readl(control_devconf1_offset);</div><div class='add'>+		reg |= OMAP2_MMCSDIO2ADPCLKISEL;</div><div class='add'>+		omap_ctrl_writel(reg, control_devconf1_offset);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void hsmmc23_before_set_reg(struct device *dev, int slot,</div><div class='ctx'> 				   int power_on, int vdd)</div><div class='ctx'> {</div><div class='hunk'>@@ -179,16 +190,19 @@ static void hsmmc23_before_set_reg(struct device *dev, int slot,</div><div class='ctx'> 	if (mmc-&gt;slots[0].remux)</div><div class='ctx'> 		mmc-&gt;slots[0].remux(dev, slot, power_on);</div><div class='ctx'> </div><div class='del'>-	if (power_on) {</div><div class='del'>-		/* Only MMC2 supports a CLKIN */</div><div class='del'>-		if (mmc-&gt;slots[0].internal_clock) {</div><div class='del'>-			u32 reg;</div><div class='add'>+	if (power_on)</div><div class='add'>+		hsmmc2_select_input_clk_src(mmc);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			reg = omap_ctrl_readl(control_devconf1_offset);</div><div class='del'>-			reg |= OMAP2_MMCSDIO2ADPCLKISEL;</div><div class='del'>-			omap_ctrl_writel(reg, control_devconf1_offset);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+static int am35x_hsmmc2_set_power(struct device *dev, int slot,</div><div class='add'>+				  int power_on, int vdd)</div><div class='add'>+{</div><div class='add'>+	struct omap_mmc_platform_data *mmc = dev-&gt;platform_data;</div><div class='add'>+</div><div class='add'>+	if (power_on)</div><div class='add'>+		hsmmc2_select_input_clk_src(mmc);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nop_mmc_set_power(struct device *dev, int slot, int power_on,</div><div class='hunk'>@@ -200,10 +214,12 @@ static int nop_mmc_set_power(struct device *dev, int slot, int power_on,</div><div class='ctx'> static inline void omap_hsmmc_mux(struct omap_mmc_platform_data *mmc_controller,</div><div class='ctx'> 			int controller_nr)</div><div class='ctx'> {</div><div class='del'>-	if (gpio_is_valid(mmc_controller-&gt;slots[0].switch_pin))</div><div class='add'>+	if (gpio_is_valid(mmc_controller-&gt;slots[0].switch_pin) &amp;&amp;</div><div class='add'>+		(mmc_controller-&gt;slots[0].switch_pin &lt; OMAP_MAX_GPIO_LINES))</div><div class='ctx'> 		omap_mux_init_gpio(mmc_controller-&gt;slots[0].switch_pin,</div><div class='ctx'> 					OMAP_PIN_INPUT_PULLUP);</div><div class='del'>-	if (gpio_is_valid(mmc_controller-&gt;slots[0].gpio_wp))</div><div class='add'>+	if (gpio_is_valid(mmc_controller-&gt;slots[0].gpio_wp) &amp;&amp;</div><div class='add'>+		(mmc_controller-&gt;slots[0].gpio_wp &lt; OMAP_MAX_GPIO_LINES))</div><div class='ctx'> 		omap_mux_init_gpio(mmc_controller-&gt;slots[0].gpio_wp,</div><div class='ctx'> 					OMAP_PIN_INPUT_PULLUP);</div><div class='ctx'> 	if (cpu_is_omap34xx()) {</div><div class='hunk'>@@ -296,6 +312,7 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,</div><div class='ctx'> 	mmc-&gt;slots[0].name = hc_name;</div><div class='ctx'> 	mmc-&gt;nr_slots = 1;</div><div class='ctx'> 	mmc-&gt;slots[0].caps = c-&gt;caps;</div><div class='add'>+	mmc-&gt;slots[0].pm_caps = c-&gt;pm_caps;</div><div class='ctx'> 	mmc-&gt;slots[0].internal_clock = !c-&gt;ext_clock;</div><div class='ctx'> 	mmc-&gt;dma_mask = 0xffffffff;</div><div class='ctx'> 	if (cpu_is_omap44xx())</div><div class='hunk'>@@ -336,11 +353,17 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * temporary HACK: ocr_mask instead of fixed supply</div><div class='ctx'> 	 */</div><div class='del'>-	mmc-&gt;slots[0].ocr_mask = c-&gt;ocr_mask;</div><div class='del'>-</div><div class='del'>-	if (cpu_is_omap3517() || cpu_is_omap3505())</div><div class='del'>-		mmc-&gt;slots[0].set_power = nop_mmc_set_power;</div><div class='add'>+	if (cpu_is_omap3505() || cpu_is_omap3517())</div><div class='add'>+		mmc-&gt;slots[0].ocr_mask = MMC_VDD_165_195 |</div><div class='add'>+					 MMC_VDD_26_27 |</div><div class='add'>+					 MMC_VDD_27_28 |</div><div class='add'>+					 MMC_VDD_29_30 |</div><div class='add'>+					 MMC_VDD_30_31 |</div><div class='add'>+					 MMC_VDD_31_32;</div><div class='ctx'> 	else</div><div class='add'>+		mmc-&gt;slots[0].ocr_mask = c-&gt;ocr_mask;</div><div class='add'>+</div><div class='add'>+	if (!cpu_is_omap3517() &amp;&amp; !cpu_is_omap3505())</div><div class='ctx'> 		mmc-&gt;slots[0].features |= HSMMC_HAS_PBIAS;</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_is_omap44xx() &amp;&amp; (omap_rev() &gt; OMAP4430_REV_ES1_0))</div><div class='hunk'>@@ -363,6 +386,9 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (cpu_is_omap3517() || cpu_is_omap3505())</div><div class='add'>+			mmc-&gt;slots[0].set_power = nop_mmc_set_power;</div><div class='add'>+</div><div class='ctx'> 		/* OMAP3630 HSMMC1 supports only 4-bit */</div><div class='ctx'> 		if (cpu_is_omap3630() &amp;&amp;</div><div class='ctx'> 				(c-&gt;caps &amp; MMC_CAP_8_BIT_DATA)) {</div><div class='hunk'>@@ -372,6 +398,9 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='add'>+		if (cpu_is_omap3517() || cpu_is_omap3505())</div><div class='add'>+			mmc-&gt;slots[0].set_power = am35x_hsmmc2_set_power;</div><div class='add'>+</div><div class='ctx'> 		if (c-&gt;ext_clock)</div><div class='ctx'> 			c-&gt;transceiver = 1;</div><div class='ctx'> 		if (c-&gt;transceiver &amp;&amp; (c-&gt;caps &amp; MMC_CAP_8_BIT_DATA)) {</div><div class='head'>diff --git a/arch/arm/mach-omap2/hsmmc.h b/arch/arm/mach-omap2/hsmmc.h<br/>index f757e78d4d4f..c4409730c4bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/hsmmc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/hsmmc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/hsmmc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/hsmmc.h</a></div><div class='hunk'>@@ -12,6 +12,7 @@ struct omap2_hsmmc_info {</div><div class='ctx'> 	u8	mmc;		/* controller 1/2/3 */</div><div class='ctx'> 	u32	caps;		/* 4/8 wires and any additional host</div><div class='ctx'> 				 * capabilities OR'd (ref. linux/mmc/host.h) */</div><div class='add'>+	u32	pm_caps;	/* PM capabilities */</div><div class='ctx'> 	bool	transceiver;	/* MMC-2 option */</div><div class='ctx'> 	bool	ext_clock;	/* use external pin for input clock */</div><div class='ctx'> 	bool	cover_only;	/* No card detect - just cover switch */</div><div class='head'>diff --git a/arch/arm/mach-omap2/i2c.c b/arch/arm/mach-omap2/i2c.c<br/>index ace99944e96f..a12e224eb97d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/i2c.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/i2c.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/omap_hwmod.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mux.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c<br/>index 7f47092a193f..6c5826605eae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/id.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/id.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/id.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/id.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cputype.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/id.h&gt;</div><div class='hunk'>@@ -226,7 +226,7 @@ static void __init omap4_check_features(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init ti816x_check_features(void)</div><div class='add'>+static void __init ti81xx_check_features(void)</div><div class='ctx'> {</div><div class='ctx'> 	omap_features = OMAP3_HAS_NEON;</div><div class='ctx'> }</div><div class='hunk'>@@ -340,6 +340,29 @@ static void __init omap3_check_revision(const char **cpu_rev)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case 0xb944:</div><div class='add'>+		omap_revision = AM335X_REV_ES1_0;</div><div class='add'>+		*cpu_rev = "1.0";</div><div class='add'>+	case 0xb8f2:</div><div class='add'>+		switch (rev) {</div><div class='add'>+		case 0:</div><div class='add'>+		/* FALLTHROUGH */</div><div class='add'>+		case 1:</div><div class='add'>+			omap_revision = TI8148_REV_ES1_0;</div><div class='add'>+			*cpu_rev = "1.0";</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			omap_revision = TI8148_REV_ES2_0;</div><div class='add'>+			*cpu_rev = "2.0";</div><div class='add'>+			break;</div><div class='add'>+		case 3:</div><div class='add'>+		/* FALLTHROUGH */</div><div class='add'>+		default:</div><div class='add'>+			omap_revision = TI8148_REV_ES2_1;</div><div class='add'>+			*cpu_rev = "2.1";</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Unknown default to latest silicon rev as default */</div><div class='ctx'> 		omap_revision = OMAP3630_REV_ES1_2;</div><div class='hunk'>@@ -367,7 +390,7 @@ static void __init omap4_check_revision(void)</div><div class='ctx'> 	 * Few initial 4430 ES2.0 samples IDCODE is same as ES1.0</div><div class='ctx'> 	 * Use ARM register to detect the correct ES version</div><div class='ctx'> 	 */</div><div class='del'>-	if (!rev &amp;&amp; (hawkeye != 0xb94e)) {</div><div class='add'>+	if (!rev &amp;&amp; (hawkeye != 0xb94e) &amp;&amp; (hawkeye != 0xb975)) {</div><div class='ctx'> 		idcode = read_cpuid(CPUID_ID);</div><div class='ctx'> 		rev = (idcode &amp; 0xf) - 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -389,8 +412,11 @@ static void __init omap4_check_revision(void)</div><div class='ctx'> 			omap_revision = OMAP4430_REV_ES2_1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 4:</div><div class='del'>-		default:</div><div class='ctx'> 			omap_revision = OMAP4430_REV_ES2_2;</div><div class='add'>+			break;</div><div class='add'>+		case 6:</div><div class='add'>+		default:</div><div class='add'>+			omap_revision = OMAP4430_REV_ES2_3;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0xb94e:</div><div class='hunk'>@@ -401,9 +427,17 @@ static void __init omap4_check_revision(void)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case 0xb975:</div><div class='add'>+		switch (rev) {</div><div class='add'>+		case 0:</div><div class='add'>+		default:</div><div class='add'>+			omap_revision = OMAP4470_REV_ES1_0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Unknown default to latest silicon rev as default */</div><div class='del'>-		omap_revision = OMAP4430_REV_ES2_2;</div><div class='add'>+		omap_revision = OMAP4430_REV_ES2_3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pr_info("OMAP%04x ES%d.%d\n", omap_rev() &gt;&gt; 16,</div><div class='hunk'>@@ -432,6 +466,10 @@ static void __init omap3_cpuinfo(const char *cpu_rev)</div><div class='ctx'> 		cpu_name = (omap3_has_sgx()) ? "AM3517" : "AM3505";</div><div class='ctx'> 	} else if (cpu_is_ti816x()) {</div><div class='ctx'> 		cpu_name = "TI816X";</div><div class='add'>+	} else if (cpu_is_am335x()) {</div><div class='add'>+		cpu_name =  "AM335X";</div><div class='add'>+	} else if (cpu_is_ti814x()) {</div><div class='add'>+		cpu_name = "TI814X";</div><div class='ctx'> 	} else if (omap3_has_iva() &amp;&amp; omap3_has_sgx()) {</div><div class='ctx'> 		/* OMAP3430, OMAP3525, OMAP3515, OMAP3503 devices */</div><div class='ctx'> 		cpu_name = "OMAP3430/3530";</div><div class='hunk'>@@ -472,11 +510,11 @@ void __init omap2_check_revision(void)</div><div class='ctx'> 	} else if (cpu_is_omap34xx()) {</div><div class='ctx'> 		omap3_check_revision(&amp;cpu_rev);</div><div class='ctx'> </div><div class='del'>-		/* TI816X doesn't have feature register */</div><div class='del'>-		if (!cpu_is_ti816x())</div><div class='add'>+		/* TI81XX doesn't have feature register */</div><div class='add'>+		if (!cpu_is_ti81xx())</div><div class='ctx'> 			omap3_check_features();</div><div class='ctx'> 		else</div><div class='del'>-			ti816x_check_features();</div><div class='add'>+			ti81xx_check_features();</div><div class='ctx'> </div><div class='ctx'> 		omap3_cpuinfo(cpu_rev);</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/arch/arm/mach-netx/include/mach/vmalloc.h b/arch/arm/mach-omap2/include/mach/barriers.h<br/>index 871f1ef7bff5..4fa72c7cc7cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-netx/include/mach/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/include/mach/barriers.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/include/mach/barriers.h</a></div><div class='hunk'>@@ -1,11 +1,13 @@</div><div class='ctx'> /*</div><div class='del'>- *  arch/arm/mach-netx/include/mach/vmalloc.h</div><div class='add'>+ * OMAP memory barrier header.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments, Inc.</div><div class='add'>+ *  Santosh Shilimkar &lt;santosh.shilimkar@ti.com&gt;</div><div class='add'>+ *  Richard Woodruff &lt;r-woodruff2@ti.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * 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='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is distributed in the hope that it will be useful,</div><div class='ctx'>  * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='hunk'>@@ -14,6 +16,16 @@</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, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='ctx'>  */</div><div class='del'>-#define VMALLOC_END       0xd0000000UL</div><div class='add'>+</div><div class='add'>+#ifndef __MACH_BARRIERS_H</div><div class='add'>+#define __MACH_BARRIERS_H</div><div class='add'>+</div><div class='add'>+extern void omap_bus_sync(void);</div><div class='add'>+</div><div class='add'>+#define rmb()		dsb()</div><div class='add'>+#define wmb()		do { dsb(); outer_sync(); omap_bus_sync(); } while (0)</div><div class='add'>+#define mb()		wmb()</div><div class='add'>+</div><div class='add'>+#endif	/* __MACH_BARRIERS_H */</div><div class='head'>diff --git a/arch/arm/mach-omap2/include/mach/debug-macro.S b/arch/arm/mach-omap2/include/mach/debug-macro.S<br/>index 13f98e59cfef..cdfc2a1f0e75 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/include/mach/debug-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/include/mach/debug-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/include/mach/debug-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/include/mach/debug-macro.S</a></div><div class='hunk'>@@ -66,11 +66,11 @@ omap_uart_lsr:	.word	0</div><div class='ctx'> 		beq	34f			@ configure OMAP3UART4</div><div class='ctx'> 		cmp	\rp, #OMAP4UART4	@ only on 44xx</div><div class='ctx'> 		beq	44f			@ configure OMAP4UART4</div><div class='del'>-		cmp	\rp, #TI816XUART1	@ ti816x UART offsets different</div><div class='add'>+		cmp	\rp, #TI81XXUART1	@ ti81Xx UART offsets different</div><div class='ctx'> 		beq	81f			@ configure UART1</div><div class='del'>-		cmp	\rp, #TI816XUART2	@ ti816x UART offsets different</div><div class='add'>+		cmp	\rp, #TI81XXUART2	@ ti81Xx UART offsets different</div><div class='ctx'> 		beq	82f			@ configure UART2</div><div class='del'>-		cmp	\rp, #TI816XUART3	@ ti816x UART offsets different</div><div class='add'>+		cmp	\rp, #TI81XXUART3	@ ti81Xx UART offsets different</div><div class='ctx'> 		beq	83f			@ configure UART3</div><div class='ctx'> 		cmp	\rp, #ZOOM_UART		@ only on zoom2/3</div><div class='ctx'> 		beq	95f			@ configure ZOOM_UART</div><div class='hunk'>@@ -94,11 +94,11 @@ omap_uart_lsr:	.word	0</div><div class='ctx'> 		b	98f</div><div class='ctx'> 44:		mov	\rp, #UART_OFFSET(OMAP4_UART4_BASE)</div><div class='ctx'> 		b	98f</div><div class='del'>-81:		mov	\rp, #UART_OFFSET(TI816X_UART1_BASE)</div><div class='add'>+81:		mov	\rp, #UART_OFFSET(TI81XX_UART1_BASE)</div><div class='ctx'> 		b	98f</div><div class='del'>-82:		mov	\rp, #UART_OFFSET(TI816X_UART2_BASE)</div><div class='add'>+82:		mov	\rp, #UART_OFFSET(TI81XX_UART2_BASE)</div><div class='ctx'> 		b	98f</div><div class='del'>-83:		mov	\rp, #UART_OFFSET(TI816X_UART3_BASE)</div><div class='add'>+83:		mov	\rp, #UART_OFFSET(TI81XX_UART3_BASE)</div><div class='ctx'> 		b	98f</div><div class='ctx'> </div><div class='ctx'> 95:		ldr	\rp, =ZOOM_UART_BASE</div><div class='head'>diff --git a/arch/arm/mach-omap2/include/mach/entry-macro.S b/arch/arm/mach-omap2/include/mach/entry-macro.S<br/>index feb90a10945a..56964a0c4c7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -10,146 +10,9 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/io.h&gt;</div><div class='del'>-#include &lt;mach/irqs.h&gt;</div><div class='del'>-#include &lt;asm/hardware/gic.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/omap24xx.h&gt;</div><div class='del'>-#include &lt;plat/omap34xx.h&gt;</div><div class='del'>-#include &lt;plat/omap44xx.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/multi.h&gt;</div><div class='del'>-</div><div class='del'>-#define OMAP2_IRQ_BASE		OMAP2_L4_IO_ADDRESS(OMAP24XX_IC_BASE)</div><div class='del'>-#define OMAP3_IRQ_BASE		OMAP2_L4_IO_ADDRESS(OMAP34XX_IC_BASE)</div><div class='del'>-#define OMAP4_IRQ_BASE		OMAP2_L4_IO_ADDRESS(OMAP44XX_GIC_CPU_BASE)</div><div class='del'>-#define INTCPS_SIR_IRQ_OFFSET	0x0040	/* omap2/3 active interrupt offset */</div><div class='del'>-#define	ACTIVEIRQ_MASK		0x7f	/* omap2/3 active interrupt bits */</div><div class='ctx'> </div><div class='ctx'> 		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='ctx'> 		.macro  arch_ret_to_user, tmp1, tmp2</div><div class='ctx'> 		.endm</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Unoptimized irq functions for multi-omap2, 3 and 4</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef MULTI_OMAP2</div><div class='del'>-		/*</div><div class='del'>-		 * Configure the interrupt base on the first interrupt.</div><div class='del'>-		 * See also omap_irq_base_init for setting omap_irq_base.</div><div class='del'>-		 */</div><div class='del'>-		.macro  get_irqnr_preamble, base, tmp</div><div class='del'>-		ldr	\base, =omap_irq_base	@ irq base address</div><div class='del'>-		ldr	\base, [\base, #0]	@ irq base value</div><div class='del'>-		.endm</div><div class='del'>-</div><div class='del'>-		/* Check the pending interrupts. Note that base already set */</div><div class='del'>-		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-		tst	\base, #0x100		@ gic address?</div><div class='del'>-		bne	4401f			@ found gic</div><div class='del'>-</div><div class='del'>-		/* Handle omap2 and omap3 */</div><div class='del'>-		ldr	\irqnr, [\base, #0x98] /* IRQ pending reg 1 */</div><div class='del'>-		cmp	\irqnr, #0x0</div><div class='del'>-		bne	9998f</div><div class='del'>-		ldr	\irqnr, [\base, #0xb8] /* IRQ pending reg 2 */</div><div class='del'>-		cmp	\irqnr, #0x0</div><div class='del'>-		bne	9998f</div><div class='del'>-		ldr	\irqnr, [\base, #0xd8] /* IRQ pending reg 3 */</div><div class='del'>-		cmp	\irqnr, #0x0</div><div class='del'>-		bne	9998f</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * ti816x has additional IRQ pending register. Checking this</div><div class='del'>-		 * register on omap2 &amp; omap3 has no effect (read as 0).</div><div class='del'>-		 */</div><div class='del'>-		ldr	\irqnr, [\base, #0xf8] /* IRQ pending reg 4 */</div><div class='del'>-		cmp	\irqnr, #0x0</div><div class='del'>-9998:</div><div class='del'>-		ldrne	\irqnr, [\base, #INTCPS_SIR_IRQ_OFFSET]</div><div class='del'>-		and	\irqnr, \irqnr, #ACTIVEIRQ_MASK /* Clear spurious bits */</div><div class='del'>-		b	9999f</div><div class='del'>-</div><div class='del'>-		/* Handle omap4 */</div><div class='del'>-4401:		ldr     \irqstat, [\base, #GIC_CPU_INTACK]</div><div class='del'>-		ldr     \tmp, =1021</div><div class='del'>-		bic     \irqnr, \irqstat, #0x1c00</div><div class='del'>-		cmp     \irqnr, #15</div><div class='del'>-		cmpcc   \irqnr, \irqnr</div><div class='del'>-		cmpne   \irqnr, \tmp</div><div class='del'>-		cmpcs   \irqnr, \irqnr</div><div class='del'>-9999:</div><div class='del'>-		.endm</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-		/* We assume that irqstat (the raw value of the IRQ acknowledge</div><div class='del'>-		 * register) is preserved from the macro above.</div><div class='del'>-		 * If there is an IPI, we immediately signal end of interrupt</div><div class='del'>-		 * on the controller, since this requires the original irqstat</div><div class='del'>-		 * value which we won't easily be able to recreate later.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		.macro test_for_ipi, irqnr, irqstat, base, tmp</div><div class='del'>-		bic	\irqnr, \irqstat, #0x1c00</div><div class='del'>-		cmp	\irqnr, #16</div><div class='del'>-		it	cc</div><div class='del'>-		strcc	\irqstat, [\base, #GIC_CPU_EOI]</div><div class='del'>-		it	cs</div><div class='del'>-		cmpcs	\irqnr, \irqnr</div><div class='del'>-		.endm</div><div class='del'>-#endif	/* CONFIG_SMP */</div><div class='del'>-</div><div class='del'>-#else	/* MULTI_OMAP2 */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Optimized irq functions for omap2, 3 and 4</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)</div><div class='del'>-		.macro  get_irqnr_preamble, base, tmp</div><div class='del'>-#ifdef CONFIG_ARCH_OMAP2</div><div class='del'>-		ldr	\base, =OMAP2_IRQ_BASE</div><div class='del'>-#else</div><div class='del'>-		ldr	\base, =OMAP3_IRQ_BASE</div><div class='del'>-#endif</div><div class='del'>-		.endm</div><div class='del'>-</div><div class='del'>-		/* Check the pending interrupts. Note that base already set */</div><div class='del'>-		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-		ldr	\irqnr, [\base, #0x98] /* IRQ pending reg 1 */</div><div class='del'>-		cmp	\irqnr, #0x0</div><div class='del'>-		bne	9999f</div><div class='del'>-		ldr	\irqnr, [\base, #0xb8] /* IRQ pending reg 2 */</div><div class='del'>-		cmp	\irqnr, #0x0</div><div class='del'>-		bne	9999f</div><div class='del'>-		ldr	\irqnr, [\base, #0xd8] /* IRQ pending reg 3 */</div><div class='del'>-		cmp	\irqnr, #0x0</div><div class='del'>-#ifdef CONFIG_SOC_OMAPTI816X</div><div class='del'>-		bne	9999f</div><div class='del'>-		ldr	\irqnr, [\base, #0xf8] /* IRQ pending reg 4 */</div><div class='del'>-		cmp	\irqnr, #0x0</div><div class='del'>-#endif</div><div class='del'>-9999:</div><div class='del'>-		ldrne	\irqnr, [\base, #INTCPS_SIR_IRQ_OFFSET]</div><div class='del'>-		and	\irqnr, \irqnr, #ACTIVEIRQ_MASK /* Clear spurious bits */</div><div class='del'>-</div><div class='del'>-		.endm</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_OMAP4</div><div class='del'>-#define HAVE_GET_IRQNR_PREAMBLE</div><div class='del'>-#include &lt;asm/hardware/entry-macro-gic.S&gt;</div><div class='del'>-</div><div class='del'>-		.macro  get_irqnr_preamble, base, tmp</div><div class='del'>-		ldr     \base, =OMAP4_IRQ_BASE</div><div class='del'>-		.endm</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif	/* MULTI_OMAP2 */</div><div class='head'>diff --git a/arch/arm/mach-omap2/include/mach/omap-secure.h b/arch/arm/mach-omap2/include/mach/omap-secure.h<br/>new file mode 100644<br/>index 000000000000..c90a43589abe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/include/mach/omap-secure.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/include/mach/omap-secure.h</a></div><div class='hunk'>@@ -0,0 +1,57 @@</div><div class='add'>+/*</div><div class='add'>+ * omap-secure.h: OMAP Secure infrastructure header.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments, Inc.</div><div class='add'>+ *	Santosh Shilimkar &lt;santosh.shilimkar@ti.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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef OMAP_ARCH_OMAP_SECURE_H</div><div class='add'>+#define OMAP_ARCH_OMAP_SECURE_H</div><div class='add'>+</div><div class='add'>+/* Monitor error code */</div><div class='add'>+#define  API_HAL_RET_VALUE_NS2S_CONVERSION_ERROR	0xFFFFFFFE</div><div class='add'>+#define  API_HAL_RET_VALUE_SERVICE_UNKNWON		0xFFFFFFFF</div><div class='add'>+</div><div class='add'>+/* HAL API error codes */</div><div class='add'>+#define  API_HAL_RET_VALUE_OK		0x00</div><div class='add'>+#define  API_HAL_RET_VALUE_FAIL		0x01</div><div class='add'>+</div><div class='add'>+/* Secure HAL API flags */</div><div class='add'>+#define FLAG_START_CRITICAL		0x4</div><div class='add'>+#define FLAG_IRQFIQ_MASK		0x3</div><div class='add'>+#define FLAG_IRQ_ENABLE			0x2</div><div class='add'>+#define FLAG_FIQ_ENABLE			0x1</div><div class='add'>+#define NO_FLAG				0x0</div><div class='add'>+</div><div class='add'>+/* Maximum Secure memory storage size */</div><div class='add'>+#define OMAP_SECURE_RAM_STORAGE	(88 * SZ_1K)</div><div class='add'>+</div><div class='add'>+/* Secure low power HAL API index */</div><div class='add'>+#define OMAP4_HAL_SAVESECURERAM_INDEX	0x1a</div><div class='add'>+#define OMAP4_HAL_SAVEHW_INDEX		0x1b</div><div class='add'>+#define OMAP4_HAL_SAVEALL_INDEX		0x1c</div><div class='add'>+#define OMAP4_HAL_SAVEGIC_INDEX		0x1d</div><div class='add'>+</div><div class='add'>+/* Secure Monitor mode APIs */</div><div class='add'>+#define OMAP4_MON_SCU_PWR_INDEX		0x108</div><div class='add'>+#define OMAP4_MON_L2X0_DBG_CTRL_INDEX	0x100</div><div class='add'>+#define OMAP4_MON_L2X0_CTRL_INDEX	0x102</div><div class='add'>+#define OMAP4_MON_L2X0_AUXCTRL_INDEX	0x109</div><div class='add'>+#define OMAP4_MON_L2X0_PREFETCH_INDEX	0x113</div><div class='add'>+</div><div class='add'>+/* Secure PPA(Primary Protected Application) APIs */</div><div class='add'>+#define OMAP4_PPA_L2_POR_INDEX		0x23</div><div class='add'>+#define OMAP4_PPA_CPU_ACTRL_SMP_INDEX	0x25</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLER__</div><div class='add'>+</div><div class='add'>+extern u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs,</div><div class='add'>+				u32 arg1, u32 arg2, u32 arg3, u32 arg4);</div><div class='add'>+extern u32 omap_smc2(u32 id, u32 falg, u32 pargs);</div><div class='add'>+extern phys_addr_t omap_secure_ram_mempool_base(void);</div><div class='add'>+</div><div class='add'>+#endif /* __ASSEMBLER__ */</div><div class='add'>+#endif /* OMAP_ARCH_OMAP_SECURE_H */</div><div class='head'>diff --git a/arch/arm/mach-omap2/include/mach/omap-wakeupgen.h b/arch/arm/mach-omap2/include/mach/omap-wakeupgen.h<br/>new file mode 100644<br/>index 000000000000..d79321b0f2a2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/include/mach/omap-wakeupgen.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/include/mach/omap-wakeupgen.h</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+/*</div><div class='add'>+ * OMAP WakeupGen header file</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments, Inc.</div><div class='add'>+ *	Santosh Shilimkar &lt;santosh.shilimkar@ti.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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef OMAP_ARCH_WAKEUPGEN_H</div><div class='add'>+#define OMAP_ARCH_WAKEUPGEN_H</div><div class='add'>+</div><div class='add'>+#define OMAP_WKG_CONTROL_0			0x00</div><div class='add'>+#define OMAP_WKG_ENB_A_0			0x10</div><div class='add'>+#define OMAP_WKG_ENB_B_0			0x14</div><div class='add'>+#define OMAP_WKG_ENB_C_0			0x18</div><div class='add'>+#define OMAP_WKG_ENB_D_0			0x1c</div><div class='add'>+#define OMAP_WKG_ENB_SECURE_A_0			0x20</div><div class='add'>+#define OMAP_WKG_ENB_SECURE_B_0			0x24</div><div class='add'>+#define OMAP_WKG_ENB_SECURE_C_0			0x28</div><div class='add'>+#define OMAP_WKG_ENB_SECURE_D_0			0x2c</div><div class='add'>+#define OMAP_WKG_ENB_A_1			0x410</div><div class='add'>+#define OMAP_WKG_ENB_B_1			0x414</div><div class='add'>+#define OMAP_WKG_ENB_C_1			0x418</div><div class='add'>+#define OMAP_WKG_ENB_D_1			0x41c</div><div class='add'>+#define OMAP_WKG_ENB_SECURE_A_1			0x420</div><div class='add'>+#define OMAP_WKG_ENB_SECURE_B_1			0x424</div><div class='add'>+#define OMAP_WKG_ENB_SECURE_C_1			0x428</div><div class='add'>+#define OMAP_WKG_ENB_SECURE_D_1			0x42c</div><div class='add'>+#define OMAP_AUX_CORE_BOOT_0			0x800</div><div class='add'>+#define OMAP_AUX_CORE_BOOT_1			0x804</div><div class='add'>+#define OMAP_PTMSYNCREQ_MASK			0xc00</div><div class='add'>+#define OMAP_PTMSYNCREQ_EN			0xc04</div><div class='add'>+#define OMAP_TIMESTAMPCYCLELO			0xc08</div><div class='add'>+#define OMAP_TIMESTAMPCYCLEHI			0xc0c</div><div class='add'>+</div><div class='add'>+extern int __init omap_wakeupgen_init(void);</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/include/mach/omap4-common.h b/arch/arm/mach-omap2/include/mach/omap4-common.h<br/>deleted file mode 100644<br/>index e4bd87619734..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/include/mach/omap4-common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/include/mach/omap4-common.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * omap4-common.h: OMAP4 specific common header file</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2010 Texas Instruments, Inc.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *	Santosh Shilimkar &lt;santosh.shilimkar@ti.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'>-#ifndef OMAP_ARCH_OMAP4_COMMON_H</div><div class='del'>-#define OMAP_ARCH_OMAP4_COMMON_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * wfi used in low power code. Directly opcode is used instead</div><div class='del'>- * of instruction to avoid mulit-omap build break</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_THUMB2_KERNEL</div><div class='del'>-#define do_wfi() __asm__ __volatile__ ("wfi" : : : "memory")</div><div class='del'>-#else</div><div class='del'>-#define do_wfi()			\</div><div class='del'>-		__asm__ __volatile__ (".word	0xe320f003" : : : "memory")</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CACHE_L2X0</div><div class='del'>-extern void __iomem *l2cache_base;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-extern void __iomem *gic_dist_base_addr;</div><div class='del'>-</div><div class='del'>-extern void __init gic_init_irq(void);</div><div class='del'>-extern void omap_smc1(u32 fn, u32 arg);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-/* Needed for secondary core boot */</div><div class='del'>-extern void omap_secondary_startup(void);</div><div class='del'>-extern u32 omap_modify_auxcoreboot0(u32 set_mask, u32 clear_mask);</div><div class='del'>-extern void omap_auxcoreboot_addr(u32 cpu_addr);</div><div class='del'>-extern u32 omap_read_auxcoreboot0(void);</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/include/mach/vmalloc.h b/arch/arm/mach-omap2/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 866319947760..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  arch/arm/plat-omap/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2000 Russell King.</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='del'>-#define VMALLOC_END	  0xf8000000UL</div><div class='head'>diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c<br/>index 25d20ced03e1..3f174d51f67f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/io.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/io.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include "clock3xxx.h"</div><div class='ctx'> #include "clock44xx.h"</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/omap-pm.h&gt;</div><div class='ctx'> #include "voltage.h"</div><div class='ctx'> #include "powerdomain.h"</div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'> #include "clockdomain.h"</div><div class='ctx'> #include &lt;plat/omap_hwmod.h&gt;</div><div class='ctx'> #include &lt;plat/multi.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The machine specific code may provide the extra mapping besides the</div><div class='hunk'>@@ -176,14 +176,31 @@ static struct map_desc omap34xx_io_desc[] __initdata = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SOC_OMAPTI816X</div><div class='del'>-static struct map_desc omapti816x_io_desc[] __initdata = {</div><div class='add'>+#ifdef CONFIG_SOC_OMAPTI81XX</div><div class='add'>+static struct map_desc omapti81xx_io_desc[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.virtual	= L4_34XX_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(L4_34XX_PHYS),</div><div class='add'>+		.length		= L4_34XX_SIZE,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SOC_OMAPAM33XX</div><div class='add'>+static struct map_desc omapam33xx_io_desc[] __initdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.virtual	= L4_34XX_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(L4_34XX_PHYS),</div><div class='ctx'> 		.length		= L4_34XX_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.virtual	= L4_WK_AM33XX_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(L4_WK_AM33XX_PHYS),</div><div class='add'>+		.length		= L4_WK_AM33XX_SIZE,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -237,6 +254,15 @@ static struct map_desc omap44xx_io_desc[] __initdata = {</div><div class='ctx'> 		.length		= L4_EMU_44XX_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE,</div><div class='ctx'> 	},</div><div class='add'>+#ifdef CONFIG_OMAP4_ERRATA_I688</div><div class='add'>+	{</div><div class='add'>+		.virtual	= OMAP4_SRAM_VA,</div><div class='add'>+		.pfn		= __phys_to_pfn(OMAP4_SRAM_PA),</div><div class='add'>+		.length		= PAGE_SIZE,</div><div class='add'>+		.type		= MT_MEMORY_SO,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -263,10 +289,17 @@ void __init omap34xx_map_common_io(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SOC_OMAPTI816X</div><div class='del'>-void __init omapti816x_map_common_io(void)</div><div class='add'>+#ifdef CONFIG_SOC_OMAPTI81XX</div><div class='add'>+void __init omapti81xx_map_common_io(void)</div><div class='ctx'> {</div><div class='del'>-	iotable_init(omapti816x_io_desc, ARRAY_SIZE(omapti816x_io_desc));</div><div class='add'>+	iotable_init(omapti81xx_io_desc, ARRAY_SIZE(omapti81xx_io_desc));</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SOC_OMAPAM33XX</div><div class='add'>+void __init omapam33xx_map_common_io(void)</div><div class='add'>+{</div><div class='add'>+	iotable_init(omapam33xx_io_desc, ARRAY_SIZE(omapam33xx_io_desc));</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -316,13 +349,9 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data)</div><div class='ctx'> 	return omap_hwmod_set_postsetup_state(oh, *(u8 *)data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* See irq.c, omap4-common.c and entry-macro.S */</div><div class='del'>-void __iomem *omap_irq_base;</div><div class='del'>-</div><div class='ctx'> static void __init omap_common_init_early(void)</div><div class='ctx'> {</div><div class='ctx'> 	omap2_check_revision();</div><div class='del'>-	omap_ioremap_init();</div><div class='ctx'> 	omap_init_consistent_dma_size();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -422,9 +451,9 @@ void __init am35xx_init_early(void)</div><div class='ctx'> 	omap3_init_early();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init ti816x_init_early(void)</div><div class='add'>+void __init ti81xx_init_early(void)</div><div class='ctx'> {</div><div class='del'>-	omap2_set_globals_ti816x();</div><div class='add'>+	omap2_set_globals_ti81xx();</div><div class='ctx'> 	omap_common_init_early();</div><div class='ctx'> 	omap3xxx_voltagedomains_init();</div><div class='ctx'> 	omap3xxx_powerdomains_init();</div><div class='head'>diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c<br/>index 65f1be6a182c..1fef061f7927 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/irq.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</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;mach/hardware.h&gt;</div><div class='add'>+#include &lt;asm/exception.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -35,6 +36,11 @@</div><div class='ctx'> /* Number of IRQ state bits in each MIR register */</div><div class='ctx'> #define IRQ_BITS_PER_REG	32</div><div class='ctx'> </div><div class='add'>+#define OMAP2_IRQ_BASE		OMAP2_L4_IO_ADDRESS(OMAP24XX_IC_BASE)</div><div class='add'>+#define OMAP3_IRQ_BASE		OMAP2_L4_IO_ADDRESS(OMAP34XX_IC_BASE)</div><div class='add'>+#define INTCPS_SIR_IRQ_OFFSET	0x0040	/* omap2/3 active interrupt offset */</div><div class='add'>+#define ACTIVEIRQ_MASK		0x7f	/* omap2/3 active interrupt bits */</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * OMAP2 has a number of different interrupt controllers, each interrupt</div><div class='ctx'>  * controller is identified as its own "bank". Register definitions are</div><div class='hunk'>@@ -143,6 +149,7 @@ omap_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num)</div><div class='ctx'> </div><div class='ctx'> static void __init omap_init_irq(u32 base, int nr_irqs)</div><div class='ctx'> {</div><div class='add'>+	void __iomem *omap_irq_base;</div><div class='ctx'> 	unsigned long nr_of_irqs = 0;</div><div class='ctx'> 	unsigned int nr_banks = 0;</div><div class='ctx'> 	int i, j;</div><div class='hunk'>@@ -186,11 +193,49 @@ void __init omap3_init_irq(void)</div><div class='ctx'> 	omap_init_irq(OMAP34XX_IC_BASE, 96);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init ti816x_init_irq(void)</div><div class='add'>+void __init ti81xx_init_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	omap_init_irq(OMAP34XX_IC_BASE, 128);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void omap_intc_handle_irq(void __iomem *base_addr, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	u32 irqnr;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		irqnr = readl_relaxed(base_addr + 0x98);</div><div class='add'>+		if (irqnr)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		irqnr = readl_relaxed(base_addr + 0xb8);</div><div class='add'>+		if (irqnr)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		irqnr = readl_relaxed(base_addr + 0xd8);</div><div class='add'>+#ifdef CONFIG_SOC_OMAPTI816X</div><div class='add'>+		if (irqnr)</div><div class='add'>+			goto out;</div><div class='add'>+		irqnr = readl_relaxed(base_addr + 0xf8);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+		if (!irqnr)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		irqnr = readl_relaxed(base_addr + INTCPS_SIR_IRQ_OFFSET);</div><div class='add'>+		irqnr &amp;= ACTIVEIRQ_MASK;</div><div class='add'>+</div><div class='add'>+		if (irqnr)</div><div class='add'>+			handle_IRQ(irqnr, regs);</div><div class='add'>+	} while (irqnr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+asmlinkage void __exception_irq_entry omap2_intc_handle_irq(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	void __iomem *base_addr = OMAP2_IRQ_BASE;</div><div class='add'>+	omap_intc_handle_irq(base_addr, regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP3</div><div class='ctx'> static struct omap3_intc_regs intc_context[ARRAY_SIZE(irq_banks)];</div><div class='ctx'> </div><div class='hunk'>@@ -263,4 +308,10 @@ void omap3_intc_resume_idle(void)</div><div class='ctx'> 	/* Re-enable autoidle */</div><div class='ctx'> 	intc_bank_write_reg(1, &amp;irq_banks[0], INTC_SYSCONFIG);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+asmlinkage void __exception_irq_entry omap3_intc_handle_irq(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	void __iomem *base_addr = OMAP3_IRQ_BASE;</div><div class='add'>+	omap_intc_handle_irq(base_addr, regs);</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_ARCH_OMAP3 */</div><div class='head'>diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c<br/>index 28fcb27005d2..fb4bcf81a183 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/mcbsp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/mcbsp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/mcbsp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/mcbsp.c</a></div><div class='hunk'>@@ -156,6 +156,9 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused)</div><div class='ctx'> 		else</div><div class='ctx'> 			/* The FIFO has 128 locations */</div><div class='ctx'> 			pdata-&gt;buffer_size = 0x80;</div><div class='add'>+	} else if (oh-&gt;class-&gt;rev == MCBSP_CONFIG_TYPE4) {</div><div class='add'>+		/* The FIFO has 128 locations for all instances */</div><div class='add'>+		pdata-&gt;buffer_size = 0x80;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (oh-&gt;class-&gt;rev &gt;= MCBSP_CONFIG_TYPE3)</div><div class='head'>diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c<br/>index 655e9480eb98..e1cc75d1a57a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/mux.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/mux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/mux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/mux.c</a></div><div class='hunk'>@@ -32,6 +32,8 @@</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -39,6 +41,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "control.h"</div><div class='ctx'> #include "mux.h"</div><div class='add'>+#include "prm.h"</div><div class='ctx'> </div><div class='ctx'> #define OMAP_MUX_BASE_OFFSET		0x30	/* Offset from CTRL_BASE */</div><div class='ctx'> #define OMAP_MUX_BASE_SZ		0x5ca</div><div class='hunk'>@@ -306,7 +309,8 @@ omap_hwmod_mux_init(struct omap_device_pad *bpads, int nr_pads)</div><div class='ctx'> 		pad-&gt;idle = bpad-&gt;idle;</div><div class='ctx'> 		pad-&gt;off = bpad-&gt;off;</div><div class='ctx'> </div><div class='del'>-		if (pad-&gt;flags &amp; OMAP_DEVICE_PAD_REMUX)</div><div class='add'>+		if (pad-&gt;flags &amp;</div><div class='add'>+		    (OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP))</div><div class='ctx'> 			nr_pads_dynamic++;</div><div class='ctx'> </div><div class='ctx'> 		pr_debug("%s: Initialized %s\n", __func__, pad-&gt;name);</div><div class='hunk'>@@ -331,7 +335,8 @@ omap_hwmod_mux_init(struct omap_device_pad *bpads, int nr_pads)</div><div class='ctx'> 	for (i = 0; i &lt; hmux-&gt;nr_pads; i++) {</div><div class='ctx'> 		struct omap_device_pad *pad = &amp;hmux-&gt;pads[i];</div><div class='ctx'> </div><div class='del'>-		if (pad-&gt;flags &amp; OMAP_DEVICE_PAD_REMUX) {</div><div class='add'>+		if (pad-&gt;flags &amp;</div><div class='add'>+		    (OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP)) {</div><div class='ctx'> 			pr_debug("%s: pad %s tagged dynamic\n",</div><div class='ctx'> 					__func__, pad-&gt;name);</div><div class='ctx'> 			hmux-&gt;pads_dynamic[nr_pads_dynamic] = pad;</div><div class='hunk'>@@ -351,6 +356,78 @@ err1:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * omap_hwmod_mux_scan_wakeups - omap hwmod scan wakeup pads</div><div class='add'>+ * @hmux: Pads for a hwmod</div><div class='add'>+ * @mpu_irqs: MPU irq array for a hwmod</div><div class='add'>+ *</div><div class='add'>+ * Scans the wakeup status of pads for a single hwmod.  If an irq</div><div class='add'>+ * array is defined for this mux, the parser will call the registered</div><div class='add'>+ * ISRs for corresponding pads, otherwise the parser will stop at the</div><div class='add'>+ * first wakeup active pad and return.  Returns true if there is a</div><div class='add'>+ * pending and non-served wakeup event for the mux, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static bool omap_hwmod_mux_scan_wakeups(struct omap_hwmod_mux_info *hmux,</div><div class='add'>+		struct omap_hwmod_irq_info *mpu_irqs)</div><div class='add'>+{</div><div class='add'>+	int i, irq;</div><div class='add'>+	unsigned int val;</div><div class='add'>+	u32 handled_irqs = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; hmux-&gt;nr_pads_dynamic; i++) {</div><div class='add'>+		struct omap_device_pad *pad = hmux-&gt;pads_dynamic[i];</div><div class='add'>+</div><div class='add'>+		if (!(pad-&gt;flags &amp; OMAP_DEVICE_PAD_WAKEUP) ||</div><div class='add'>+		    !(pad-&gt;idle &amp; OMAP_WAKEUP_EN))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		val = omap_mux_read(pad-&gt;partition, pad-&gt;mux-&gt;reg_offset);</div><div class='add'>+		if (!(val &amp; OMAP_WAKEUP_EVENT))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!hmux-&gt;irqs)</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		irq = hmux-&gt;irqs[i];</div><div class='add'>+		/* make sure we only handle each irq once */</div><div class='add'>+		if (handled_irqs &amp; 1 &lt;&lt; irq)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		handled_irqs |= 1 &lt;&lt; irq;</div><div class='add'>+</div><div class='add'>+		generic_handle_irq(mpu_irqs[irq].irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * _omap_hwmod_mux_handle_irq - Process wakeup events for a single hwmod</div><div class='add'>+ *</div><div class='add'>+ * Checks a single hwmod for every wakeup capable pad to see if there is an</div><div class='add'>+ * active wakeup event. If this is the case, call the corresponding ISR.</div><div class='add'>+ */</div><div class='add'>+static int _omap_hwmod_mux_handle_irq(struct omap_hwmod *oh, void *data)</div><div class='add'>+{</div><div class='add'>+	if (!oh-&gt;mux || !oh-&gt;mux-&gt;enabled)</div><div class='add'>+		return 0;</div><div class='add'>+	if (omap_hwmod_mux_scan_wakeups(oh-&gt;mux, oh-&gt;mpu_irqs))</div><div class='add'>+		generic_handle_irq(oh-&gt;mpu_irqs[0].irq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap_hwmod_mux_handle_irq - Process pad wakeup irqs.</div><div class='add'>+ *</div><div class='add'>+ * Calls a function for each registered omap_hwmod to check</div><div class='add'>+ * pad wakeup statuses.</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t omap_hwmod_mux_handle_irq(int irq, void *unused)</div><div class='add'>+{</div><div class='add'>+	omap_hwmod_for_each(_omap_hwmod_mux_handle_irq, NULL);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Assumes the calling function takes care of locking */</div><div class='ctx'> void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state)</div><div class='ctx'> {</div><div class='hunk'>@@ -715,6 +792,7 @@ static void __init omap_mux_free_names(struct omap_mux *m)</div><div class='ctx'> static int __init omap_mux_late_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct omap_mux_partition *partition;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(partition, &amp;mux_partitions, node) {</div><div class='ctx'> 		struct omap_mux_entry *e, *tmp;</div><div class='hunk'>@@ -735,6 +813,13 @@ static int __init omap_mux_late_init(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = request_irq(omap_prcm_event_to_irq("io"),</div><div class='add'>+		omap_hwmod_mux_handle_irq, IRQF_SHARED | IRQF_NO_SUSPEND,</div><div class='add'>+			"hwmod_io", omap_mux_late_init);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_warning("mux: Failed to setup hwmod io irq %d\n", ret);</div><div class='add'>+</div><div class='ctx'> 	omap_mux_dbg_init();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap-headsmp.S b/arch/arm/mach-omap2/omap-headsmp.S<br/>index 4ee6aeca885a..b13ef7ef5ef4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap-headsmp.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap-headsmp.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap-headsmp.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/omap-headsmp.S</a></div><div class='hunk'>@@ -18,11 +18,6 @@</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'>-/* Physical address needed since MMU not enabled yet on secondary core */</div><div class='del'>-#define OMAP4_AUX_CORE_BOOT1_PA			0x48281804</div><div class='del'>-</div><div class='del'>-	__INIT</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * OMAP4 specific entry point for secondary CPU to jump from ROM</div><div class='ctx'>  * code.  This routine also provides a holding flag into which</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap-hotplug.c b/arch/arm/mach-omap2/omap-hotplug.c<br/>index 4976b9393e49..adbe4d8c7caf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap-hotplug.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap-hotplug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap-hotplug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/omap-hotplug.c</a></div><div class='hunk'>@@ -19,7 +19,10 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='del'>-#include &lt;mach/omap4-common.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+#include "powerdomain.h"</div><div class='ctx'> </div><div class='ctx'> int platform_cpu_kill(unsigned int cpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -32,6 +35,8 @@ int platform_cpu_kill(unsigned int cpu)</div><div class='ctx'>  */</div><div class='ctx'> void platform_cpu_die(unsigned int cpu)</div><div class='ctx'> {</div><div class='add'>+	unsigned int this_cpu;</div><div class='add'>+</div><div class='ctx'> 	flush_cache_all();</div><div class='ctx'> 	dsb();</div><div class='ctx'> </div><div class='hunk'>@@ -39,15 +44,15 @@ void platform_cpu_die(unsigned int cpu)</div><div class='ctx'> 	 * we're ready for shutdown now, so do it</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (omap_modify_auxcoreboot0(0x0, 0x200) != 0x0)</div><div class='del'>-		printk(KERN_CRIT "Secure clear status failed\n");</div><div class='add'>+		pr_err("Secure clear status failed\n");</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Execute WFI</div><div class='add'>+		 * Enter into low power state</div><div class='ctx'> 		 */</div><div class='del'>-		do_wfi();</div><div class='del'>-</div><div class='del'>-		if (omap_read_auxcoreboot0() == cpu) {</div><div class='add'>+		omap4_hotplug_cpu(cpu, PWRDM_POWER_OFF);</div><div class='add'>+		this_cpu = smp_processor_id();</div><div class='add'>+		if (omap_read_auxcoreboot0() == this_cpu) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * OK, proper wakeup, we're done</div><div class='ctx'> 			 */</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c<br/>new file mode 100644<br/>index 000000000000..1d5d01056558<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap-mpuss-lowpower.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/omap-mpuss-lowpower.c</a></div><div class='hunk'>@@ -0,0 +1,398 @@</div><div class='add'>+/*</div><div class='add'>+ * OMAP MPUSS low power code</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments, Inc.</div><div class='add'>+ *	Santosh Shilimkar &lt;santosh.shilimkar@ti.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * OMAP4430 MPUSS mainly consists of dual Cortex-A9 with per-CPU</div><div class='add'>+ * Local timer and Watchdog, GIC, SCU, PL310 L2 cache controller,</div><div class='add'>+ * CPU0 and CPU1 LPRM modules.</div><div class='add'>+ * CPU0, CPU1 and MPUSS each have there own power domain and</div><div class='add'>+ * hence multiple low power combinations of MPUSS are possible.</div><div class='add'>+ *</div><div class='add'>+ * The CPU0 and CPU1 can't support Closed switch Retention (CSWR)</div><div class='add'>+ * because the mode is not supported by hw constraints of dormant</div><div class='add'>+ * mode. While waking up from the dormant mode, a reset  signal</div><div class='add'>+ * to the Cortex-A9 processor must be asserted by the external</div><div class='add'>+ * power controller.</div><div class='add'>+ *</div><div class='add'>+ * With architectural inputs and hardware recommendations, only</div><div class='add'>+ * below modes are supported from power gain vs latency point of view.</div><div class='add'>+ *</div><div class='add'>+ *	CPU0		CPU1		MPUSS</div><div class='add'>+ *	----------------------------------------------</div><div class='add'>+ *	ON		ON		ON</div><div class='add'>+ *	ON(Inactive)	OFF		ON(Inactive)</div><div class='add'>+ *	OFF		OFF		CSWR</div><div class='add'>+ *	OFF		OFF		OSWR</div><div class='add'>+ *	OFF		OFF		OFF(Device OFF *TBD)</div><div class='add'>+ *	----------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * Note: CPU0 is the master core and it is the last CPU to go down</div><div class='add'>+ * and first to wake-up when MPUSS low power states are excercised</div><div class='add'>+ *</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/tlbflush.h&gt;</div><div class='add'>+#include &lt;asm/smp_scu.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/pgalloc.h&gt;</div><div class='add'>+#include &lt;asm/suspend.h&gt;</div><div class='add'>+#include &lt;asm/hardware/cache-l2x0.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;plat/omap44xx.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "omap4-sar-layout.h"</div><div class='add'>+#include "pm.h"</div><div class='add'>+#include "prcm_mpu44xx.h"</div><div class='add'>+#include "prminst44xx.h"</div><div class='add'>+#include "prcm44xx.h"</div><div class='add'>+#include "prm44xx.h"</div><div class='add'>+#include "prm-regbits-44xx.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+</div><div class='add'>+struct omap4_cpu_pm_info {</div><div class='add'>+	struct powerdomain *pwrdm;</div><div class='add'>+	void __iomem *scu_sar_addr;</div><div class='add'>+	void __iomem *wkup_sar_addr;</div><div class='add'>+	void __iomem *l2x0_sar_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);</div><div class='add'>+static struct powerdomain *mpuss_pd;</div><div class='add'>+static void __iomem *sar_base;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Program the wakeup routine address for the CPU0 and CPU1</div><div class='add'>+ * used for OFF or DORMANT wakeup.</div><div class='add'>+ */</div><div class='add'>+static inline void set_cpu_wakeup_addr(unsigned int cpu_id, u32 addr)</div><div class='add'>+{</div><div class='add'>+	struct omap4_cpu_pm_info *pm_info = &amp;per_cpu(omap4_pm_info, cpu_id);</div><div class='add'>+</div><div class='add'>+	__raw_writel(addr, pm_info-&gt;wkup_sar_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set the CPUx powerdomain's previous power state</div><div class='add'>+ */</div><div class='add'>+static inline void set_cpu_next_pwrst(unsigned int cpu_id,</div><div class='add'>+				unsigned int power_state)</div><div class='add'>+{</div><div class='add'>+	struct omap4_cpu_pm_info *pm_info = &amp;per_cpu(omap4_pm_info, cpu_id);</div><div class='add'>+</div><div class='add'>+	pwrdm_set_next_pwrst(pm_info-&gt;pwrdm, power_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read CPU's previous power state</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int read_cpu_prev_pwrst(unsigned int cpu_id)</div><div class='add'>+{</div><div class='add'>+	struct omap4_cpu_pm_info *pm_info = &amp;per_cpu(omap4_pm_info, cpu_id);</div><div class='add'>+</div><div class='add'>+	return pwrdm_read_prev_pwrst(pm_info-&gt;pwrdm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clear the CPUx powerdomain's previous power state</div><div class='add'>+ */</div><div class='add'>+static inline void clear_cpu_prev_pwrst(unsigned int cpu_id)</div><div class='add'>+{</div><div class='add'>+	struct omap4_cpu_pm_info *pm_info = &amp;per_cpu(omap4_pm_info, cpu_id);</div><div class='add'>+</div><div class='add'>+	pwrdm_clear_all_prev_pwrst(pm_info-&gt;pwrdm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Store the SCU power status value to scratchpad memory</div><div class='add'>+ */</div><div class='add'>+static void scu_pwrst_prepare(unsigned int cpu_id, unsigned int cpu_state)</div><div class='add'>+{</div><div class='add'>+	struct omap4_cpu_pm_info *pm_info = &amp;per_cpu(omap4_pm_info, cpu_id);</div><div class='add'>+	u32 scu_pwr_st;</div><div class='add'>+</div><div class='add'>+	switch (cpu_state) {</div><div class='add'>+	case PWRDM_POWER_RET:</div><div class='add'>+		scu_pwr_st = SCU_PM_DORMANT;</div><div class='add'>+		break;</div><div class='add'>+	case PWRDM_POWER_OFF:</div><div class='add'>+		scu_pwr_st = SCU_PM_POWEROFF;</div><div class='add'>+		break;</div><div class='add'>+	case PWRDM_POWER_ON:</div><div class='add'>+	case PWRDM_POWER_INACTIVE:</div><div class='add'>+	default:</div><div class='add'>+		scu_pwr_st = SCU_PM_NORMAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__raw_writel(scu_pwr_st, pm_info-&gt;scu_sar_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Helper functions for MPUSS OSWR */</div><div class='add'>+static inline void mpuss_clear_prev_logic_pwrst(void)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	reg = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION,</div><div class='add'>+		OMAP4430_PRM_MPU_INST, OMAP4_RM_MPU_MPU_CONTEXT_OFFSET);</div><div class='add'>+	omap4_prminst_write_inst_reg(reg, OMAP4430_PRM_PARTITION,</div><div class='add'>+		OMAP4430_PRM_MPU_INST, OMAP4_RM_MPU_MPU_CONTEXT_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cpu_clear_prev_logic_pwrst(unsigned int cpu_id)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	if (cpu_id) {</div><div class='add'>+		reg = omap4_prcm_mpu_read_inst_reg(OMAP4430_PRCM_MPU_CPU1_INST,</div><div class='add'>+					OMAP4_RM_CPU1_CPU1_CONTEXT_OFFSET);</div><div class='add'>+		omap4_prcm_mpu_write_inst_reg(reg, OMAP4430_PRCM_MPU_CPU1_INST,</div><div class='add'>+					OMAP4_RM_CPU1_CPU1_CONTEXT_OFFSET);</div><div class='add'>+	} else {</div><div class='add'>+		reg = omap4_prcm_mpu_read_inst_reg(OMAP4430_PRCM_MPU_CPU0_INST,</div><div class='add'>+					OMAP4_RM_CPU0_CPU0_CONTEXT_OFFSET);</div><div class='add'>+		omap4_prcm_mpu_write_inst_reg(reg, OMAP4430_PRCM_MPU_CPU0_INST,</div><div class='add'>+					OMAP4_RM_CPU0_CPU0_CONTEXT_OFFSET);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap4_mpuss_read_prev_context_state:</div><div class='add'>+ * Function returns the MPUSS previous context state</div><div class='add'>+ */</div><div class='add'>+u32 omap4_mpuss_read_prev_context_state(void)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	reg = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION,</div><div class='add'>+		OMAP4430_PRM_MPU_INST, OMAP4_RM_MPU_MPU_CONTEXT_OFFSET);</div><div class='add'>+	reg &amp;= OMAP4430_LOSTCONTEXT_DFF_MASK;</div><div class='add'>+	return reg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Store the CPU cluster state for L2X0 low power operations.</div><div class='add'>+ */</div><div class='add'>+static void l2x0_pwrst_prepare(unsigned int cpu_id, unsigned int save_state)</div><div class='add'>+{</div><div class='add'>+	struct omap4_cpu_pm_info *pm_info = &amp;per_cpu(omap4_pm_info, cpu_id);</div><div class='add'>+</div><div class='add'>+	__raw_writel(save_state, pm_info-&gt;l2x0_sar_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Save the L2X0 AUXCTRL and POR value to SAR memory. Its used to</div><div class='add'>+ * in every restore MPUSS OFF path.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_CACHE_L2X0</div><div class='add'>+static void save_l2x0_context(void)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	void __iomem *l2x0_base = omap4_get_l2cache_base();</div><div class='add'>+</div><div class='add'>+	val = __raw_readl(l2x0_base + L2X0_AUX_CTRL);</div><div class='add'>+	__raw_writel(val, sar_base + L2X0_AUXCTRL_OFFSET);</div><div class='add'>+	val = __raw_readl(l2x0_base + L2X0_PREFETCH_CTRL);</div><div class='add'>+	__raw_writel(val, sar_base + L2X0_PREFETCH_CTRL_OFFSET);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void save_l2x0_context(void)</div><div class='add'>+{}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap4_enter_lowpower: OMAP4 MPUSS Low Power Entry Function</div><div class='add'>+ * The purpose of this function is to manage low power programming</div><div class='add'>+ * of OMAP4 MPUSS subsystem</div><div class='add'>+ * @cpu : CPU ID</div><div class='add'>+ * @power_state: Low power state.</div><div class='add'>+ *</div><div class='add'>+ * MPUSS states for the context save:</div><div class='add'>+ * save_state =</div><div class='add'>+ *	0 - Nothing lost and no need to save: MPUSS INACTIVE</div><div class='add'>+ *	1 - CPUx L1 and logic lost: MPUSS CSWR</div><div class='add'>+ *	2 - CPUx L1 and logic lost + GIC lost: MPUSS OSWR</div><div class='add'>+ *	3 - CPUx L1 and logic lost + GIC + L2 lost: DEVICE OFF</div><div class='add'>+ */</div><div class='add'>+int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state)</div><div class='add'>+{</div><div class='add'>+	unsigned int save_state = 0;</div><div class='add'>+	unsigned int wakeup_cpu;</div><div class='add'>+</div><div class='add'>+	if (omap_rev() == OMAP4430_REV_ES1_0)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	switch (power_state) {</div><div class='add'>+	case PWRDM_POWER_ON:</div><div class='add'>+	case PWRDM_POWER_INACTIVE:</div><div class='add'>+		save_state = 0;</div><div class='add'>+		break;</div><div class='add'>+	case PWRDM_POWER_OFF:</div><div class='add'>+		save_state = 1;</div><div class='add'>+		break;</div><div class='add'>+	case PWRDM_POWER_RET:</div><div class='add'>+	default:</div><div class='add'>+		/*</div><div class='add'>+		 * CPUx CSWR is invalid hardware state. Also CPUx OSWR</div><div class='add'>+		 * doesn't make much scense, since logic is lost and $L1</div><div class='add'>+		 * needs to be cleaned because of coherency. This makes</div><div class='add'>+		 * CPUx OSWR equivalent to CPUX OFF and hence not supported</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pwrdm_pre_transition();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check MPUSS next state and save interrupt controller if needed.</div><div class='add'>+	 * In MPUSS OSWR or device OFF, interrupt controller  contest is lost.</div><div class='add'>+	 */</div><div class='add'>+	mpuss_clear_prev_logic_pwrst();</div><div class='add'>+	pwrdm_clear_all_prev_pwrst(mpuss_pd);</div><div class='add'>+	if ((pwrdm_read_next_pwrst(mpuss_pd) == PWRDM_POWER_RET) &amp;&amp;</div><div class='add'>+		(pwrdm_read_logic_retst(mpuss_pd) == PWRDM_POWER_OFF))</div><div class='add'>+		save_state = 2;</div><div class='add'>+</div><div class='add'>+	clear_cpu_prev_pwrst(cpu);</div><div class='add'>+	cpu_clear_prev_logic_pwrst(cpu);</div><div class='add'>+	set_cpu_next_pwrst(cpu, power_state);</div><div class='add'>+	set_cpu_wakeup_addr(cpu, virt_to_phys(omap4_cpu_resume));</div><div class='add'>+	scu_pwrst_prepare(cpu, power_state);</div><div class='add'>+	l2x0_pwrst_prepare(cpu, save_state);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Call low level function  with targeted low power state.</div><div class='add'>+	 */</div><div class='add'>+	cpu_suspend(save_state, omap4_finish_suspend);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Restore the CPUx power state to ON otherwise CPUx</div><div class='add'>+	 * power domain can transitions to programmed low power</div><div class='add'>+	 * state while doing WFI outside the low powe code. On</div><div class='add'>+	 * secure devices, CPUx does WFI which can result in</div><div class='add'>+	 * domain transition</div><div class='add'>+	 */</div><div class='add'>+	wakeup_cpu = smp_processor_id();</div><div class='add'>+	set_cpu_next_pwrst(wakeup_cpu, PWRDM_POWER_ON);</div><div class='add'>+</div><div class='add'>+	pwrdm_post_transition();</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'>+ * omap4_hotplug_cpu: OMAP4 CPU hotplug entry</div><div class='add'>+ * @cpu : CPU ID</div><div class='add'>+ * @power_state: CPU low power state.</div><div class='add'>+ */</div><div class='add'>+int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state)</div><div class='add'>+{</div><div class='add'>+	unsigned int cpu_state = 0;</div><div class='add'>+</div><div class='add'>+	if (omap_rev() == OMAP4430_REV_ES1_0)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	if (power_state == PWRDM_POWER_OFF)</div><div class='add'>+		cpu_state = 1;</div><div class='add'>+</div><div class='add'>+	clear_cpu_prev_pwrst(cpu);</div><div class='add'>+	set_cpu_next_pwrst(cpu, power_state);</div><div class='add'>+	set_cpu_wakeup_addr(cpu, virt_to_phys(omap_secondary_startup));</div><div class='add'>+	scu_pwrst_prepare(cpu, power_state);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * CPU never retuns back if targetted power state is OFF mode.</div><div class='add'>+	 * CPU ONLINE follows normal CPU ONLINE ptah via</div><div class='add'>+	 * omap_secondary_startup().</div><div class='add'>+	 */</div><div class='add'>+	omap4_finish_suspend(cpu_state);</div><div class='add'>+</div><div class='add'>+	set_cpu_next_pwrst(cpu, PWRDM_POWER_ON);</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'>+ * Initialise OMAP4 MPUSS</div><div class='add'>+ */</div><div class='add'>+int __init omap4_mpuss_init(void)</div><div class='add'>+{</div><div class='add'>+	struct omap4_cpu_pm_info *pm_info;</div><div class='add'>+</div><div class='add'>+	if (omap_rev() == OMAP4430_REV_ES1_0) {</div><div class='add'>+		WARN(1, "Power Management not supported on OMAP4430 ES1.0\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sar_base = omap4_get_sar_ram_base();</div><div class='add'>+</div><div class='add'>+	/* Initilaise per CPU PM information */</div><div class='add'>+	pm_info = &amp;per_cpu(omap4_pm_info, 0x0);</div><div class='add'>+	pm_info-&gt;scu_sar_addr = sar_base + SCU_OFFSET0;</div><div class='add'>+	pm_info-&gt;wkup_sar_addr = sar_base + CPU0_WAKEUP_NS_PA_ADDR_OFFSET;</div><div class='add'>+	pm_info-&gt;l2x0_sar_addr = sar_base + L2X0_SAVE_OFFSET0;</div><div class='add'>+	pm_info-&gt;pwrdm = pwrdm_lookup("cpu0_pwrdm");</div><div class='add'>+	if (!pm_info-&gt;pwrdm) {</div><div class='add'>+		pr_err("Lookup failed for CPU0 pwrdm\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear CPU previous power domain state */</div><div class='add'>+	pwrdm_clear_all_prev_pwrst(pm_info-&gt;pwrdm);</div><div class='add'>+	cpu_clear_prev_logic_pwrst(0);</div><div class='add'>+</div><div class='add'>+	/* Initialise CPU0 power domain state to ON */</div><div class='add'>+	pwrdm_set_next_pwrst(pm_info-&gt;pwrdm, PWRDM_POWER_ON);</div><div class='add'>+</div><div class='add'>+	pm_info = &amp;per_cpu(omap4_pm_info, 0x1);</div><div class='add'>+	pm_info-&gt;scu_sar_addr = sar_base + SCU_OFFSET1;</div><div class='add'>+	pm_info-&gt;wkup_sar_addr = sar_base + CPU1_WAKEUP_NS_PA_ADDR_OFFSET;</div><div class='add'>+	pm_info-&gt;l2x0_sar_addr = sar_base + L2X0_SAVE_OFFSET1;</div><div class='add'>+	pm_info-&gt;pwrdm = pwrdm_lookup("cpu1_pwrdm");</div><div class='add'>+	if (!pm_info-&gt;pwrdm) {</div><div class='add'>+		pr_err("Lookup failed for CPU1 pwrdm\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear CPU previous power domain state */</div><div class='add'>+	pwrdm_clear_all_prev_pwrst(pm_info-&gt;pwrdm);</div><div class='add'>+	cpu_clear_prev_logic_pwrst(1);</div><div class='add'>+</div><div class='add'>+	/* Initialise CPU1 power domain state to ON */</div><div class='add'>+	pwrdm_set_next_pwrst(pm_info-&gt;pwrdm, PWRDM_POWER_ON);</div><div class='add'>+</div><div class='add'>+	mpuss_pd = pwrdm_lookup("mpu_pwrdm");</div><div class='add'>+	if (!mpuss_pd) {</div><div class='add'>+		pr_err("Failed to lookup MPUSS power domain\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	pwrdm_clear_all_prev_pwrst(mpuss_pd);</div><div class='add'>+	mpuss_clear_prev_logic_pwrst();</div><div class='add'>+</div><div class='add'>+	/* Save device type on scratchpad for low level code to use */</div><div class='add'>+	if (omap_type() != OMAP2_DEVICE_TYPE_GP)</div><div class='add'>+		__raw_writel(1, sar_base + OMAP_TYPE_OFFSET);</div><div class='add'>+	else</div><div class='add'>+		__raw_writel(0, sar_base + OMAP_TYPE_OFFSET);</div><div class='add'>+</div><div class='add'>+	save_l2x0_context();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap-secure.c b/arch/arm/mach-omap2/omap-secure.c<br/>new file mode 100644<br/>index 000000000000..d8f8ef40290f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap-secure.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/omap-secure.c</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+/*</div><div class='add'>+ * OMAP Secure API infrastructure.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments, Inc.</div><div class='add'>+ *	Santosh Shilimkar &lt;santosh.shilimkar@ti.com&gt;</div><div class='add'>+ *</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/memblock.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/memblock.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/omap-secure.h&gt;</div><div class='add'>+</div><div class='add'>+static phys_addr_t omap_secure_memblock_base;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap_sec_dispatcher: Routine to dispatch low power secure</div><div class='add'>+ * service routines</div><div class='add'>+ * @idx: The HAL API index</div><div class='add'>+ * @flag: The flag indicating criticality of operation</div><div class='add'>+ * @nargs: Number of valid arguments out of four.</div><div class='add'>+ * @arg1, arg2, arg3 args4: Parameters passed to secure API</div><div class='add'>+ *</div><div class='add'>+ * Return the non-zero error value on failure.</div><div class='add'>+ */</div><div class='add'>+u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs, u32 arg1, u32 arg2,</div><div class='add'>+							 u32 arg3, u32 arg4)</div><div class='add'>+{</div><div class='add'>+	u32 ret;</div><div class='add'>+	u32 param[5];</div><div class='add'>+</div><div class='add'>+	param[0] = nargs;</div><div class='add'>+	param[1] = arg1;</div><div class='add'>+	param[2] = arg2;</div><div class='add'>+	param[3] = arg3;</div><div class='add'>+	param[4] = arg4;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Secure API needs physical address</div><div class='add'>+	 * pointer for the parameters</div><div class='add'>+	 */</div><div class='add'>+	flush_cache_all();</div><div class='add'>+	outer_clean_range(__pa(param), __pa(param + 5));</div><div class='add'>+	ret = omap_smc2(idx, flag, __pa(param));</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Allocate the memory to save secure ram */</div><div class='add'>+int __init omap_secure_ram_reserve_memblock(void)</div><div class='add'>+{</div><div class='add'>+	u32 size = OMAP_SECURE_RAM_STORAGE;</div><div class='add'>+</div><div class='add'>+	size = ALIGN(size, SZ_1M);</div><div class='add'>+	omap_secure_memblock_base = arm_memblock_steal(size, SZ_1M);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+phys_addr_t omap_secure_ram_mempool_base(void)</div><div class='add'>+{</div><div class='add'>+	return omap_secure_memblock_base;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap44xx-smc.S b/arch/arm/mach-omap2/omap-smc.S<br/>index e69d37d95204..f6441c13cd8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap44xx-smc.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap44xx-smc.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap-smc.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/omap-smc.S</a></div><div class='hunk'>@@ -31,6 +31,29 @@ ENTRY(omap_smc1)</div><div class='ctx'> 	ldmfd   sp!, {r2-r12, pc}</div><div class='ctx'> ENDPROC(omap_smc1)</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * u32 omap_smc2(u32 id, u32 falg, u32 pargs)</div><div class='add'>+ * Low level common routine for secure HAL and PPA APIs.</div><div class='add'>+ * @id: Application ID of HAL APIs</div><div class='add'>+ * @flag: Flag to indicate the criticality of operation</div><div class='add'>+ * @pargs: Physical address of parameter list starting</div><div class='add'>+ *	    with number of parametrs</div><div class='add'>+ */</div><div class='add'>+ENTRY(omap_smc2)</div><div class='add'>+	stmfd   sp!, {r4-r12, lr}</div><div class='add'>+	mov	r3, r2</div><div class='add'>+	mov	r2, r1</div><div class='add'>+	mov	r1, #0x0	@ Process ID</div><div class='add'>+	mov	r6, #0xff</div><div class='add'>+	mov	r12, #0x00	@ Secure Service ID</div><div class='add'>+	mov	r7, #0</div><div class='add'>+	mcr	p15, 0, r7, c7, c5, 6</div><div class='add'>+	dsb</div><div class='add'>+	dmb</div><div class='add'>+	smc	#0</div><div class='add'>+	ldmfd   sp!, {r4-r12, pc}</div><div class='add'>+ENDPROC(omap_smc2)</div><div class='add'>+</div><div class='ctx'> ENTRY(omap_modify_auxcoreboot0)</div><div class='ctx'> 	stmfd   sp!, {r1-r12, lr}</div><div class='ctx'> 	ldr	r12, =0x104</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c<br/>index 4412ddb7b3f6..c1bf3ef0ba02 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap-smp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap-smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap-smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/omap-smp.c</a></div><div class='hunk'>@@ -24,16 +24,37 @@</div><div class='ctx'> #include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/smp_scu.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/omap4-common.h&gt;</div><div class='add'>+#include &lt;mach/omap-secure.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+#include "clockdomain.h"</div><div class='ctx'> </div><div class='ctx'> /* SCU base address */</div><div class='ctx'> static void __iomem *scu_base;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(boot_lock);</div><div class='ctx'> </div><div class='add'>+void __iomem *omap4_get_scu_base(void)</div><div class='add'>+{</div><div class='add'>+	return scu_base;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __cpuinit platform_secondary_init(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='add'>+	 * Configure ACTRL and enable NS SMP bit access on CPU1 on HS device.</div><div class='add'>+	 * OMAP44XX EMU/HS devices - CPU0 SMP bit access is enabled in PPA</div><div class='add'>+	 * init and for CPU1, a secure PPA API provided. CPU0 must be ON</div><div class='add'>+	 * while executing NS_SMP API on CPU1 and PPA version must be 1.4.0+.</div><div class='add'>+	 * OMAP443X GP devices- SMP bit isn't accessible.</div><div class='add'>+	 * OMAP446X GP devices - SMP bit access is enabled on both CPUs.</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_is_omap443x() &amp;&amp; (omap_type() != OMAP2_DEVICE_TYPE_GP))</div><div class='add'>+		omap_secure_dispatcher(OMAP4_PPA_CPU_ACTRL_SMP_INDEX,</div><div class='add'>+							4, 0, 0, 0, 0, 0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * If any interrupts are already enabled for the primary</div><div class='ctx'> 	 * core (e.g. timer irq), then they will not have been enabled</div><div class='ctx'> 	 * for us: do so</div><div class='hunk'>@@ -49,6 +70,8 @@ void __cpuinit platform_secondary_init(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> {</div><div class='add'>+	static struct clockdomain *cpu1_clkdm;</div><div class='add'>+	static bool booted;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set synchronisation state between this boot processor</div><div class='ctx'> 	 * and the secondary one</div><div class='hunk'>@@ -64,6 +87,29 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> 	omap_modify_auxcoreboot0(0x200, 0xfffffdff);</div><div class='ctx'> 	flush_cache_all();</div><div class='ctx'> 	smp_wmb();</div><div class='add'>+</div><div class='add'>+	if (!cpu1_clkdm)</div><div class='add'>+		cpu1_clkdm = clkdm_lookup("mpu1_clkdm");</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The SGI(Software Generated Interrupts) are not wakeup capable</div><div class='add'>+	 * from low power states. This is known limitation on OMAP4 and</div><div class='add'>+	 * needs to be worked around by using software forced clockdomain</div><div class='add'>+	 * wake-up. To wakeup CPU1, CPU0 forces the CPU1 clockdomain to</div><div class='add'>+	 * software force wakeup. The clockdomain is then put back to</div><div class='add'>+	 * hardware supervised mode.</div><div class='add'>+	 * More details can be found in OMAP4430 TRM - Version J</div><div class='add'>+	 * Section :</div><div class='add'>+	 *	4.3.4.2 Power States of CPU0 and CPU1</div><div class='add'>+	 */</div><div class='add'>+	if (booted) {</div><div class='add'>+		clkdm_wakeup(cpu1_clkdm);</div><div class='add'>+		clkdm_allow_idle(cpu1_clkdm);</div><div class='add'>+	} else {</div><div class='add'>+		dsb_sev();</div><div class='add'>+		booted = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	gic_raise_softirq(cpumask_of(cpu), 1);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c<br/>new file mode 100644<br/>index 000000000000..d3d8971d7f30<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap-wakeupgen.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/omap-wakeupgen.c</a></div><div class='hunk'>@@ -0,0 +1,389 @@</div><div class='add'>+/*</div><div class='add'>+ * OMAP WakeupGen Source file</div><div class='add'>+ *</div><div class='add'>+ * OMAP WakeupGen is the interrupt controller extension used along</div><div class='add'>+ * with ARM GIC to wake the CPU out from low power states on</div><div class='add'>+ * external interrupts. It is responsible for generating wakeup</div><div class='add'>+ * event from the incoming interrupts and enable bits. It is</div><div class='add'>+ * implemented in MPU always ON power domain. During normal operation,</div><div class='add'>+ * WakeupGen delivers external interrupts directly to the GIC.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments, Inc.</div><div class='add'>+ *	Santosh Shilimkar &lt;santosh.shilimkar@ti.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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/cpu_pm.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/omap-wakeupgen.h&gt;</div><div class='add'>+#include &lt;mach/omap-secure.h&gt;</div><div class='add'>+</div><div class='add'>+#include "omap4-sar-layout.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+#define NR_REG_BANKS		4</div><div class='add'>+#define MAX_IRQS		128</div><div class='add'>+#define WKG_MASK_ALL		0x00000000</div><div class='add'>+#define WKG_UNMASK_ALL		0xffffffff</div><div class='add'>+#define CPU_ENA_OFFSET		0x400</div><div class='add'>+#define CPU0_ID			0x0</div><div class='add'>+#define CPU1_ID			0x1</div><div class='add'>+</div><div class='add'>+static void __iomem *wakeupgen_base;</div><div class='add'>+static void __iomem *sar_base;</div><div class='add'>+static DEFINE_PER_CPU(u32 [NR_REG_BANKS], irqmasks);</div><div class='add'>+static DEFINE_SPINLOCK(wakeupgen_lock);</div><div class='add'>+static unsigned int irq_target_cpu[NR_IRQS];</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Static helper functions.</div><div class='add'>+ */</div><div class='add'>+static inline u32 wakeupgen_readl(u8 idx, u32 cpu)</div><div class='add'>+{</div><div class='add'>+	return __raw_readl(wakeupgen_base + OMAP_WKG_ENB_A_0 +</div><div class='add'>+				(cpu * CPU_ENA_OFFSET) + (idx * 4));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void wakeupgen_writel(u32 val, u8 idx, u32 cpu)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(val, wakeupgen_base + OMAP_WKG_ENB_A_0 +</div><div class='add'>+				(cpu * CPU_ENA_OFFSET) + (idx * 4));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void sar_writel(u32 val, u32 offset, u8 idx)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(val, sar_base + offset + (idx * 4));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void _wakeupgen_set_all(unsigned int cpu, unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NR_REG_BANKS; i++)</div><div class='add'>+		wakeupgen_writel(reg, i, cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int _wakeupgen_get_irq_info(u32 irq, u32 *bit_posn, u8 *reg_index)</div><div class='add'>+{</div><div class='add'>+	unsigned int spi_irq;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * PPIs and SGIs are not supported.</div><div class='add'>+	 */</div><div class='add'>+	if (irq &lt; OMAP44XX_IRQ_GIC_START)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Subtract the GIC offset.</div><div class='add'>+	 */</div><div class='add'>+	spi_irq = irq - OMAP44XX_IRQ_GIC_START;</div><div class='add'>+	if (spi_irq &gt; MAX_IRQS) {</div><div class='add'>+		pr_err("omap wakeupGen: Invalid IRQ%d\n", irq);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Each WakeupGen register controls 32 interrupt.</div><div class='add'>+	 * i.e. 1 bit per SPI IRQ</div><div class='add'>+	 */</div><div class='add'>+	*reg_index = spi_irq &gt;&gt; 5;</div><div class='add'>+	*bit_posn = spi_irq %= 32;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void _wakeupgen_clear(unsigned int irq, unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	u32 val, bit_number;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (_wakeupgen_get_irq_info(irq, &amp;bit_number, &amp;i))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	val = wakeupgen_readl(i, cpu);</div><div class='add'>+	val &amp;= ~BIT(bit_number);</div><div class='add'>+	wakeupgen_writel(val, i, cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void _wakeupgen_set(unsigned int irq, unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	u32 val, bit_number;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (_wakeupgen_get_irq_info(irq, &amp;bit_number, &amp;i))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	val = wakeupgen_readl(i, cpu);</div><div class='add'>+	val |= BIT(bit_number);</div><div class='add'>+	wakeupgen_writel(val, i, cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void _wakeupgen_save_masks(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NR_REG_BANKS; i++)</div><div class='add'>+		per_cpu(irqmasks, cpu)[i] = wakeupgen_readl(i, cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void _wakeupgen_restore_masks(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NR_REG_BANKS; i++)</div><div class='add'>+		wakeupgen_writel(per_cpu(irqmasks, cpu)[i], i, cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Architecture specific Mask extension</div><div class='add'>+ */</div><div class='add'>+static void wakeupgen_mask(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;wakeupgen_lock, flags);</div><div class='add'>+	_wakeupgen_clear(d-&gt;irq, irq_target_cpu[d-&gt;irq]);</div><div class='add'>+	spin_unlock_irqrestore(&amp;wakeupgen_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Architecture specific Unmask extension</div><div class='add'>+ */</div><div class='add'>+static void wakeupgen_unmask(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;wakeupgen_lock, flags);</div><div class='add'>+	_wakeupgen_set(d-&gt;irq, irq_target_cpu[d-&gt;irq]);</div><div class='add'>+	spin_unlock_irqrestore(&amp;wakeupgen_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mask or unmask all interrupts on given CPU.</div><div class='add'>+ *	0 = Mask all interrupts on the 'cpu'</div><div class='add'>+ *	1 = Unmask all interrupts on the 'cpu'</div><div class='add'>+ * Ensure that the initial mask is maintained. This is faster than</div><div class='add'>+ * iterating through GIC registers to arrive at the correct masks.</div><div class='add'>+ */</div><div class='add'>+static void wakeupgen_irqmask_all(unsigned int cpu, unsigned int set)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;wakeupgen_lock, flags);</div><div class='add'>+	if (set) {</div><div class='add'>+		_wakeupgen_save_masks(cpu);</div><div class='add'>+		_wakeupgen_set_all(cpu, WKG_MASK_ALL);</div><div class='add'>+	} else {</div><div class='add'>+		_wakeupgen_set_all(cpu, WKG_UNMASK_ALL);</div><div class='add'>+		_wakeupgen_restore_masks(cpu);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;wakeupgen_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_PM</div><div class='add'>+/*</div><div class='add'>+ * Save WakeupGen interrupt context in SAR BANK3. Restore is done by</div><div class='add'>+ * ROM code. WakeupGen IP is integrated along with GIC to manage the</div><div class='add'>+ * interrupt wakeups from CPU low power states. It manages</div><div class='add'>+ * masking/unmasking of Shared peripheral interrupts(SPI). So the</div><div class='add'>+ * interrupt enable/disable control should be in sync and consistent</div><div class='add'>+ * at WakeupGen and GIC so that interrupts are not lost.</div><div class='add'>+ */</div><div class='add'>+static void irq_save_context(void)</div><div class='add'>+{</div><div class='add'>+	u32 i, val;</div><div class='add'>+</div><div class='add'>+	if (omap_rev() == OMAP4430_REV_ES1_0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!sar_base)</div><div class='add'>+		sar_base = omap4_get_sar_ram_base();</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NR_REG_BANKS; i++) {</div><div class='add'>+		/* Save the CPUx interrupt mask for IRQ 0 to 127 */</div><div class='add'>+		val = wakeupgen_readl(i, 0);</div><div class='add'>+		sar_writel(val, WAKEUPGENENB_OFFSET_CPU0, i);</div><div class='add'>+		val = wakeupgen_readl(i, 1);</div><div class='add'>+		sar_writel(val, WAKEUPGENENB_OFFSET_CPU1, i);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Disable the secure interrupts for CPUx. The restore</div><div class='add'>+		 * code blindly restores secure and non-secure interrupt</div><div class='add'>+		 * masks from SAR RAM. Secure interrupts are not suppose</div><div class='add'>+		 * to be enabled from HLOS. So overwrite the SAR location</div><div class='add'>+		 * so that the secure interrupt remains disabled.</div><div class='add'>+		 */</div><div class='add'>+		sar_writel(0x0, WAKEUPGENENB_SECURE_OFFSET_CPU0, i);</div><div class='add'>+		sar_writel(0x0, WAKEUPGENENB_SECURE_OFFSET_CPU1, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Save AuxBoot* registers */</div><div class='add'>+	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);</div><div class='add'>+	__raw_writel(val, sar_base + AUXCOREBOOT0_OFFSET);</div><div class='add'>+	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);</div><div class='add'>+	__raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* Save SyncReq generation logic */</div><div class='add'>+	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);</div><div class='add'>+	__raw_writel(val, sar_base + AUXCOREBOOT0_OFFSET);</div><div class='add'>+	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);</div><div class='add'>+	__raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* Save SyncReq generation logic */</div><div class='add'>+	val = __raw_readl(wakeupgen_base + OMAP_PTMSYNCREQ_MASK);</div><div class='add'>+	__raw_writel(val, sar_base + PTMSYNCREQ_MASK_OFFSET);</div><div class='add'>+	val = __raw_readl(wakeupgen_base + OMAP_PTMSYNCREQ_EN);</div><div class='add'>+	__raw_writel(val, sar_base + PTMSYNCREQ_EN_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* Set the Backup Bit Mask status */</div><div class='add'>+	val = __raw_readl(sar_base + SAR_BACKUP_STATUS_OFFSET);</div><div class='add'>+	val |= SAR_BACKUP_STATUS_WAKEUPGEN;</div><div class='add'>+	__raw_writel(val, sar_base + SAR_BACKUP_STATUS_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clear WakeupGen SAR backup status.</div><div class='add'>+ */</div><div class='add'>+void irq_sar_clear(void)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	val = __raw_readl(sar_base + SAR_BACKUP_STATUS_OFFSET);</div><div class='add'>+	val &amp;= ~SAR_BACKUP_STATUS_WAKEUPGEN;</div><div class='add'>+	__raw_writel(val, sar_base + SAR_BACKUP_STATUS_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Save GIC and Wakeupgen interrupt context using secure API</div><div class='add'>+ * for HS/EMU devices.</div><div class='add'>+ */</div><div class='add'>+static void irq_save_secure_context(void)</div><div class='add'>+{</div><div class='add'>+	u32 ret;</div><div class='add'>+	ret = omap_secure_dispatcher(OMAP4_HAL_SAVEGIC_INDEX,</div><div class='add'>+				FLAG_START_CRITICAL,</div><div class='add'>+				0, 0, 0, 0, 0);</div><div class='add'>+	if (ret != API_HAL_RET_VALUE_OK)</div><div class='add'>+		pr_err("GIC and Wakeupgen context save failed\n");</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='add'>+static int __cpuinit irq_cpu_hotplug_notify(struct notifier_block *self,</div><div class='add'>+					 unsigned long action, void *hcpu)</div><div class='add'>+{</div><div class='add'>+	unsigned int cpu = (unsigned int)hcpu;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case CPU_ONLINE:</div><div class='add'>+		wakeupgen_irqmask_all(cpu, 0);</div><div class='add'>+		break;</div><div class='add'>+	case CPU_DEAD:</div><div class='add'>+		wakeupgen_irqmask_all(cpu, 1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block __refdata irq_hotplug_notifier = {</div><div class='add'>+	.notifier_call = irq_cpu_hotplug_notify,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init irq_hotplug_init(void)</div><div class='add'>+{</div><div class='add'>+	register_hotcpu_notifier(&amp;irq_hotplug_notifier);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void __init irq_hotplug_init(void)</div><div class='add'>+{}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_PM</div><div class='add'>+static int irq_notifier(struct notifier_block *self, unsigned long cmd,	void *v)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case CPU_CLUSTER_PM_ENTER:</div><div class='add'>+		if (omap_type() == OMAP2_DEVICE_TYPE_GP)</div><div class='add'>+			irq_save_context();</div><div class='add'>+		else</div><div class='add'>+			irq_save_secure_context();</div><div class='add'>+		break;</div><div class='add'>+	case CPU_CLUSTER_PM_EXIT:</div><div class='add'>+		if (omap_type() == OMAP2_DEVICE_TYPE_GP)</div><div class='add'>+			irq_sar_clear();</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block irq_notifier_block = {</div><div class='add'>+	.notifier_call = irq_notifier,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init irq_pm_init(void)</div><div class='add'>+{</div><div class='add'>+	cpu_pm_register_notifier(&amp;irq_notifier_block);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void __init irq_pm_init(void)</div><div class='add'>+{}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialise the wakeupgen module.</div><div class='add'>+ */</div><div class='add'>+int __init omap_wakeupgen_init(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned int boot_cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	/* Not supported on OMAP4 ES1.0 silicon */</div><div class='add'>+	if (omap_rev() == OMAP4430_REV_ES1_0) {</div><div class='add'>+		WARN(1, "WakeupGen: Not supported on OMAP4430 ES1.0\n");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Static mapping, never released */</div><div class='add'>+	wakeupgen_base = ioremap(OMAP44XX_WKUPGEN_BASE, SZ_4K);</div><div class='add'>+	if (WARN_ON(!wakeupgen_base))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Clear all IRQ bitmasks at wakeupGen level */</div><div class='add'>+	for (i = 0; i &lt; NR_REG_BANKS; i++) {</div><div class='add'>+		wakeupgen_writel(0, i, CPU0_ID);</div><div class='add'>+		wakeupgen_writel(0, i, CPU1_ID);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Override GIC architecture specific functions to add</div><div class='add'>+	 * OMAP WakeupGen interrupt controller along with GIC</div><div class='add'>+	 */</div><div class='add'>+	gic_arch_extn.irq_mask = wakeupgen_mask;</div><div class='add'>+	gic_arch_extn.irq_unmask = wakeupgen_unmask;</div><div class='add'>+	gic_arch_extn.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * FIXME: Add support to set_smp_affinity() once the core</div><div class='add'>+	 * GIC code has necessary hooks in place.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Associate all the IRQs to boot CPU like GIC init does. */</div><div class='add'>+	for (i = 0; i &lt; NR_IRQS; i++)</div><div class='add'>+		irq_target_cpu[i] = boot_cpu;</div><div class='add'>+</div><div class='add'>+	irq_hotplug_init();</div><div class='add'>+	irq_pm_init();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c<br/>index 35ac3e5f6e94..40a8fbc07e4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap4-common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap4-common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap4-common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/omap4-common.c</a></div><div class='hunk'>@@ -15,24 +15,76 @@</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_device.h&gt;</div><div class='add'>+#include &lt;linux/memblock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/cache-l2x0.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/memblock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/irqs.h&gt;</div><div class='add'>+#include &lt;plat/sram.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/omap4-common.h&gt;</div><div class='add'>+#include &lt;mach/omap-wakeupgen.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "omap4-sar-layout.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CACHE_L2X0</div><div class='del'>-void __iomem *l2cache_base;</div><div class='add'>+static void __iomem *l2cache_base;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-void __iomem *gic_dist_base_addr;</div><div class='add'>+static void __iomem *sar_ram_base;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_OMAP4_ERRATA_I688</div><div class='add'>+/* Used to implement memory barrier on DRAM path */</div><div class='add'>+#define OMAP4_DRAM_BARRIER_VA			0xfe600000</div><div class='add'>+</div><div class='add'>+void __iomem *dram_sync, *sram_sync;</div><div class='add'>+</div><div class='add'>+void omap_bus_sync(void)</div><div class='add'>+{</div><div class='add'>+	if (dram_sync &amp;&amp; sram_sync) {</div><div class='add'>+		writel_relaxed(readl_relaxed(dram_sync), dram_sync);</div><div class='add'>+		writel_relaxed(readl_relaxed(sram_sync), sram_sync);</div><div class='add'>+		isb();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init omap_barriers_init(void)</div><div class='add'>+{</div><div class='add'>+	struct map_desc dram_io_desc[1];</div><div class='add'>+	phys_addr_t paddr;</div><div class='add'>+	u32 size;</div><div class='add'>+</div><div class='add'>+	if (!cpu_is_omap44xx())</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	size = ALIGN(PAGE_SIZE, SZ_1M);</div><div class='add'>+	paddr = arm_memblock_steal(size, SZ_1M);</div><div class='add'>+</div><div class='add'>+	dram_io_desc[0].virtual = OMAP4_DRAM_BARRIER_VA;</div><div class='add'>+	dram_io_desc[0].pfn = __phys_to_pfn(paddr);</div><div class='add'>+	dram_io_desc[0].length = size;</div><div class='add'>+	dram_io_desc[0].type = MT_MEMORY_SO;</div><div class='add'>+	iotable_init(dram_io_desc, ARRAY_SIZE(dram_io_desc));</div><div class='add'>+	dram_sync = (void __iomem *) dram_io_desc[0].virtual;</div><div class='add'>+	sram_sync = (void __iomem *) OMAP4_SRAM_VA;</div><div class='add'>+</div><div class='add'>+	pr_info("OMAP4: Map 0x%08llx to 0x%08lx for dram barrier\n",</div><div class='add'>+		(long long) paddr, dram_io_desc[0].virtual);</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+core_initcall(omap_barriers_init);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> void __init gic_init_irq(void)</div><div class='ctx'> {</div><div class='add'>+	void __iomem *omap_irq_base;</div><div class='add'>+	void __iomem *gic_dist_base_addr;</div><div class='add'>+</div><div class='ctx'> 	/* Static mapping, never released */</div><div class='ctx'> 	gic_dist_base_addr = ioremap(OMAP44XX_GIC_DIST_BASE, SZ_4K);</div><div class='ctx'> 	BUG_ON(!gic_dist_base_addr);</div><div class='hunk'>@@ -41,11 +93,18 @@ void __init gic_init_irq(void)</div><div class='ctx'> 	omap_irq_base = ioremap(OMAP44XX_GIC_CPU_BASE, SZ_512);</div><div class='ctx'> 	BUG_ON(!omap_irq_base);</div><div class='ctx'> </div><div class='add'>+	omap_wakeupgen_init();</div><div class='add'>+</div><div class='ctx'> 	gic_init(0, 29, gic_dist_base_addr, omap_irq_base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CACHE_L2X0</div><div class='ctx'> </div><div class='add'>+void __iomem *omap4_get_l2cache_base(void)</div><div class='add'>+{</div><div class='add'>+	return l2cache_base;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void omap4_l2x0_disable(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Disable PL310 L2 Cache controller */</div><div class='hunk'>@@ -71,7 +130,8 @@ static int __init omap_l2_cache_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Static mapping, never released */</div><div class='ctx'> 	l2cache_base = ioremap(OMAP44XX_L2CACHE_BASE, SZ_4K);</div><div class='del'>-	BUG_ON(!l2cache_base);</div><div class='add'>+	if (WARN_ON(!l2cache_base))</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * 16-way associativity, parity disabled</div><div class='hunk'>@@ -111,3 +171,30 @@ static int __init omap_l2_cache_init(void)</div><div class='ctx'> }</div><div class='ctx'> early_initcall(omap_l2_cache_init);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+void __iomem *omap4_get_sar_ram_base(void)</div><div class='add'>+{</div><div class='add'>+	return sar_ram_base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SAR RAM used to save and restore the HW</div><div class='add'>+ * context in low power modes</div><div class='add'>+ */</div><div class='add'>+static int __init omap4_sar_ram_init(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * To avoid code running on other OMAPs in</div><div class='add'>+	 * multi-omap builds</div><div class='add'>+	 */</div><div class='add'>+	if (!cpu_is_omap44xx())</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Static mapping, never released */</div><div class='add'>+	sar_ram_base = ioremap(OMAP44XX_SAR_RAM_BASE, SZ_16K);</div><div class='add'>+	if (WARN_ON(!sar_ram_base))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_initcall(omap4_sar_ram_init);</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap4-sar-layout.h b/arch/arm/mach-omap2/omap4-sar-layout.h<br/>new file mode 100644<br/>index 000000000000..fe5b545ad443<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap4-sar-layout.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/omap4-sar-layout.h</a></div><div class='hunk'>@@ -0,0 +1,50 @@</div><div class='add'>+/*</div><div class='add'>+ * omap4-sar-layout.h: OMAP4 SAR RAM layout header file</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments, Inc.</div><div class='add'>+ *	Santosh Shilimkar &lt;santosh.shilimkar@ti.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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef OMAP_ARCH_OMAP4_SAR_LAYOUT_H</div><div class='add'>+#define OMAP_ARCH_OMAP4_SAR_LAYOUT_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SAR BANK offsets from base address OMAP44XX_SAR_RAM_BASE</div><div class='add'>+ */</div><div class='add'>+#define SAR_BANK1_OFFSET		0x0000</div><div class='add'>+#define SAR_BANK2_OFFSET		0x1000</div><div class='add'>+#define SAR_BANK3_OFFSET		0x2000</div><div class='add'>+#define SAR_BANK4_OFFSET		0x3000</div><div class='add'>+</div><div class='add'>+/* Scratch pad memory offsets from SAR_BANK1 */</div><div class='add'>+#define SCU_OFFSET0				0xd00</div><div class='add'>+#define SCU_OFFSET1				0xd04</div><div class='add'>+#define OMAP_TYPE_OFFSET			0xd10</div><div class='add'>+#define L2X0_SAVE_OFFSET0			0xd14</div><div class='add'>+#define L2X0_SAVE_OFFSET1			0xd18</div><div class='add'>+#define L2X0_AUXCTRL_OFFSET			0xd1c</div><div class='add'>+#define L2X0_PREFETCH_CTRL_OFFSET		0xd20</div><div class='add'>+</div><div class='add'>+/* CPUx Wakeup Non-Secure Physical Address offsets in SAR_BANK3 */</div><div class='add'>+#define CPU0_WAKEUP_NS_PA_ADDR_OFFSET		0xa04</div><div class='add'>+#define CPU1_WAKEUP_NS_PA_ADDR_OFFSET		0xa08</div><div class='add'>+</div><div class='add'>+#define SAR_BACKUP_STATUS_OFFSET		(SAR_BANK3_OFFSET + 0x500)</div><div class='add'>+#define SAR_SECURE_RAM_SIZE_OFFSET		(SAR_BANK3_OFFSET + 0x504)</div><div class='add'>+#define SAR_SECRAM_SAVED_AT_OFFSET		(SAR_BANK3_OFFSET + 0x508)</div><div class='add'>+</div><div class='add'>+/* WakeUpGen save restore offset from OMAP44XX_SAR_RAM_BASE */</div><div class='add'>+#define WAKEUPGENENB_OFFSET_CPU0		(SAR_BANK3_OFFSET + 0x684)</div><div class='add'>+#define WAKEUPGENENB_SECURE_OFFSET_CPU0		(SAR_BANK3_OFFSET + 0x694)</div><div class='add'>+#define WAKEUPGENENB_OFFSET_CPU1		(SAR_BANK3_OFFSET + 0x6a4)</div><div class='add'>+#define WAKEUPGENENB_SECURE_OFFSET_CPU1		(SAR_BANK3_OFFSET + 0x6b4)</div><div class='add'>+#define AUXCOREBOOT0_OFFSET			(SAR_BANK3_OFFSET + 0x6c4)</div><div class='add'>+#define AUXCOREBOOT1_OFFSET			(SAR_BANK3_OFFSET + 0x6c8)</div><div class='add'>+#define PTMSYNCREQ_MASK_OFFSET			(SAR_BANK3_OFFSET + 0x6cc)</div><div class='add'>+#define PTMSYNCREQ_EN_OFFSET			(SAR_BANK3_OFFSET + 0x6d0)</div><div class='add'>+#define SAR_BACKUP_STATUS_WAKEUPGEN		0x10</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c<br/>index 207a2ff9a8c4..5192cabb40ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap_hwmod.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap_hwmod.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap_hwmod.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/omap_hwmod.c</a></div><div class='hunk'>@@ -136,8 +136,9 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include "clockdomain.h"</div><div class='ctx'> #include "powerdomain.h"</div><div class='hunk'>@@ -381,6 +382,51 @@ static int _set_module_autoidle(struct omap_hwmod *oh, u8 autoidle,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * _set_idle_ioring_wakeup - enable/disable IO pad wakeup on hwmod idle for mux</div><div class='add'>+ * @oh: struct omap_hwmod *</div><div class='add'>+ * @set_wake: bool value indicating to set (true) or clear (false) wakeup enable</div><div class='add'>+ *</div><div class='add'>+ * Set or clear the I/O pad wakeup flag in the mux entries for the</div><div class='add'>+ * hwmod @oh.  This function changes the @oh-&gt;mux-&gt;pads_dynamic array</div><div class='add'>+ * in memory.  If the hwmod is currently idled, and the new idle</div><div class='add'>+ * values don't match the previous ones, this function will also</div><div class='add'>+ * update the SCM PADCTRL registers.  Otherwise, if the hwmod is not</div><div class='add'>+ * currently idled, this function won't touch the hardware: the new</div><div class='add'>+ * mux settings are written to the SCM PADCTRL registers when the</div><div class='add'>+ * hwmod is idled.  No return value.</div><div class='add'>+ */</div><div class='add'>+static void _set_idle_ioring_wakeup(struct omap_hwmod *oh, bool set_wake)</div><div class='add'>+{</div><div class='add'>+	struct omap_device_pad *pad;</div><div class='add'>+	bool change = false;</div><div class='add'>+	u16 prev_idle;</div><div class='add'>+	int j;</div><div class='add'>+</div><div class='add'>+	if (!oh-&gt;mux || !oh-&gt;mux-&gt;enabled)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; oh-&gt;mux-&gt;nr_pads_dynamic; j++) {</div><div class='add'>+		pad = oh-&gt;mux-&gt;pads_dynamic[j];</div><div class='add'>+</div><div class='add'>+		if (!(pad-&gt;flags &amp; OMAP_DEVICE_PAD_WAKEUP))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		prev_idle = pad-&gt;idle;</div><div class='add'>+</div><div class='add'>+		if (set_wake)</div><div class='add'>+			pad-&gt;idle |= OMAP_WAKEUP_EN;</div><div class='add'>+		else</div><div class='add'>+			pad-&gt;idle &amp;= ~OMAP_WAKEUP_EN;</div><div class='add'>+</div><div class='add'>+		if (prev_idle != pad-&gt;idle)</div><div class='add'>+			change = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (change &amp;&amp; oh-&gt;_state == _HWMOD_STATE_IDLE)</div><div class='add'>+		omap_hwmod_mux(oh-&gt;mux, _HWMOD_STATE_IDLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * _enable_wakeup: set OCP_SYSCONFIG.ENAWAKEUP bit in the hardware</div><div class='ctx'>  * @oh: struct omap_hwmod *</div><div class='ctx'>  *</div><div class='hunk'>@@ -706,27 +752,65 @@ static void _enable_module(struct omap_hwmod *oh)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * _disable_module - enable CLKCTRL modulemode on OMAP4</div><div class='add'>+ * _omap4_wait_target_disable - wait for a module to be disabled on OMAP4</div><div class='add'>+ * @oh: struct omap_hwmod *</div><div class='add'>+ *</div><div class='add'>+ * Wait for a module @oh to enter slave idle.  Returns 0 if the module</div><div class='add'>+ * does not have an IDLEST bit or if the module successfully enters</div><div class='add'>+ * slave idle; otherwise, pass along the return value of the</div><div class='add'>+ * appropriate *_cm*_wait_module_idle() function.</div><div class='add'>+ */</div><div class='add'>+static int _omap4_wait_target_disable(struct omap_hwmod *oh)</div><div class='add'>+{</div><div class='add'>+	if (!cpu_is_omap44xx())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!oh)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (oh-&gt;_int_flags &amp; _HWMOD_NO_MPU_PORT)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (oh-&gt;flags &amp; HWMOD_NO_IDLEST)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return omap4_cminst_wait_module_idle(oh-&gt;clkdm-&gt;prcm_partition,</div><div class='add'>+					     oh-&gt;clkdm-&gt;cm_inst,</div><div class='add'>+					     oh-&gt;clkdm-&gt;clkdm_offs,</div><div class='add'>+					     oh-&gt;prcm.omap4.clkctrl_offs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * _omap4_disable_module - enable CLKCTRL modulemode on OMAP4</div><div class='ctx'>  * @oh: struct omap_hwmod *</div><div class='ctx'>  *</div><div class='ctx'>  * Disable the PRCM module mode related to the hwmod @oh.</div><div class='del'>- * No return value.</div><div class='add'>+ * Return EINVAL if the modulemode is not supported and 0 in case of success.</div><div class='ctx'>  */</div><div class='del'>-static void _disable_module(struct omap_hwmod *oh)</div><div class='add'>+static int _omap4_disable_module(struct omap_hwmod *oh)</div><div class='ctx'> {</div><div class='add'>+	int v;</div><div class='add'>+</div><div class='ctx'> 	/* The module mode does not exist prior OMAP4 */</div><div class='del'>-	if (cpu_is_omap24xx() || cpu_is_omap34xx())</div><div class='del'>-		return;</div><div class='add'>+	if (!cpu_is_omap44xx())</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!oh-&gt;clkdm || !oh-&gt;prcm.omap4.modulemode)</div><div class='del'>-		return;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	pr_debug("omap_hwmod: %s: _disable_module\n", oh-&gt;name);</div><div class='add'>+	pr_debug("omap_hwmod: %s: %s\n", oh-&gt;name, __func__);</div><div class='ctx'> </div><div class='ctx'> 	omap4_cminst_module_disable(oh-&gt;clkdm-&gt;prcm_partition,</div><div class='ctx'> 				    oh-&gt;clkdm-&gt;cm_inst,</div><div class='ctx'> 				    oh-&gt;clkdm-&gt;clkdm_offs,</div><div class='ctx'> 				    oh-&gt;prcm.omap4.clkctrl_offs);</div><div class='add'>+</div><div class='add'>+	v = _omap4_wait_target_disable(oh);</div><div class='add'>+	if (v)</div><div class='add'>+		pr_warn("omap_hwmod: %s: _wait_target_disable failed\n",</div><div class='add'>+			oh-&gt;name);</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'>@@ -1153,36 +1237,6 @@ static int _wait_target_ready(struct omap_hwmod *oh)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * _wait_target_disable - wait for a module to be disabled</div><div class='del'>- * @oh: struct omap_hwmod *</div><div class='del'>- *</div><div class='del'>- * Wait for a module @oh to enter slave idle.  Returns 0 if the module</div><div class='del'>- * does not have an IDLEST bit or if the module successfully enters</div><div class='del'>- * slave idle; otherwise, pass along the return value of the</div><div class='del'>- * appropriate *_cm*_wait_module_idle() function.</div><div class='del'>- */</div><div class='del'>-static int _wait_target_disable(struct omap_hwmod *oh)</div><div class='del'>-{</div><div class='del'>-	/* TODO: For now just handle OMAP4+ */</div><div class='del'>-	if (cpu_is_omap24xx() || cpu_is_omap34xx())</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!oh)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (oh-&gt;_int_flags &amp; _HWMOD_NO_MPU_PORT)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (oh-&gt;flags &amp; HWMOD_NO_IDLEST)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return omap4_cminst_wait_module_idle(oh-&gt;clkdm-&gt;prcm_partition,</div><div class='del'>-					     oh-&gt;clkdm-&gt;cm_inst,</div><div class='del'>-					     oh-&gt;clkdm-&gt;clkdm_offs,</div><div class='del'>-					     oh-&gt;prcm.omap4.clkctrl_offs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * _lookup_hardreset - fill register bit info for this hwmod/reset line</div><div class='ctx'>  * @oh: struct omap_hwmod *</div><div class='ctx'>  * @name: name of the reset line in the context of this hwmod</div><div class='hunk'>@@ -1441,6 +1495,25 @@ static int _enable(struct omap_hwmod *oh)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("omap_hwmod: %s: enabling\n", oh-&gt;name);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * hwmods with HWMOD_INIT_NO_IDLE flag set are left</div><div class='add'>+	 * in enabled state at init.</div><div class='add'>+	 * Now that someone is really trying to enable them,</div><div class='add'>+	 * just ensure that the hwmod mux is set.</div><div class='add'>+	 */</div><div class='add'>+	if (oh-&gt;_int_flags &amp; _HWMOD_SKIP_ENABLE) {</div><div class='add'>+		/*</div><div class='add'>+		 * If the caller has mux data populated, do the mux'ing</div><div class='add'>+		 * which wouldn't have been done as part of the _enable()</div><div class='add'>+		 * done during setup.</div><div class='add'>+		 */</div><div class='add'>+		if (oh-&gt;mux)</div><div class='add'>+			omap_hwmod_mux(oh-&gt;mux, _HWMOD_STATE_ENABLED);</div><div class='add'>+</div><div class='add'>+		oh-&gt;_int_flags &amp;= ~_HWMOD_SKIP_ENABLE;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (oh-&gt;_state != _HWMOD_STATE_INITIALIZED &amp;&amp;</div><div class='ctx'> 	    oh-&gt;_state != _HWMOD_STATE_IDLE &amp;&amp;</div><div class='ctx'> 	    oh-&gt;_state != _HWMOD_STATE_DISABLED) {</div><div class='hunk'>@@ -1524,8 +1597,6 @@ static int _enable(struct omap_hwmod *oh)</div><div class='ctx'>  */</div><div class='ctx'> static int _idle(struct omap_hwmod *oh)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	pr_debug("omap_hwmod: %s: idling\n", oh-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	if (oh-&gt;_state != _HWMOD_STATE_ENABLED) {</div><div class='hunk'>@@ -1537,11 +1608,9 @@ static int _idle(struct omap_hwmod *oh)</div><div class='ctx'> 	if (oh-&gt;class-&gt;sysc)</div><div class='ctx'> 		_idle_sysc(oh);</div><div class='ctx'> 	_del_initiator_dep(oh, mpu_oh);</div><div class='del'>-	_disable_module(oh);</div><div class='del'>-	ret = _wait_target_disable(oh);</div><div class='del'>-	if (ret)</div><div class='del'>-		pr_warn("omap_hwmod: %s: _wait_target_disable failed\n",</div><div class='del'>-			oh-&gt;name);</div><div class='add'>+</div><div class='add'>+	_omap4_disable_module(oh);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The module must be in idle mode before disabling any parents</div><div class='ctx'> 	 * clocks. Otherwise, the parent clock might be disabled before</div><div class='hunk'>@@ -1642,11 +1711,7 @@ static int _shutdown(struct omap_hwmod *oh)</div><div class='ctx'> 	if (oh-&gt;_state == _HWMOD_STATE_ENABLED) {</div><div class='ctx'> 		_del_initiator_dep(oh, mpu_oh);</div><div class='ctx'> 		/* XXX what about the other system initiators here? dma, dsp */</div><div class='del'>-		_disable_module(oh);</div><div class='del'>-		ret = _wait_target_disable(oh);</div><div class='del'>-		if (ret)</div><div class='del'>-			pr_warn("omap_hwmod: %s: _wait_target_disable failed\n",</div><div class='del'>-				oh-&gt;name);</div><div class='add'>+		_omap4_disable_module(oh);</div><div class='ctx'> 		_disable_clocks(oh);</div><div class='ctx'> 		if (oh-&gt;clkdm)</div><div class='ctx'> 			clkdm_hwmod_disable(oh-&gt;clkdm, oh);</div><div class='hunk'>@@ -1744,8 +1809,10 @@ static int _setup(struct omap_hwmod *oh, void *data)</div><div class='ctx'> 	 * it should be set by the core code as a runtime flag during startup</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((oh-&gt;flags &amp; HWMOD_INIT_NO_IDLE) &amp;&amp;</div><div class='del'>-	    (postsetup_state == _HWMOD_STATE_IDLE))</div><div class='add'>+	    (postsetup_state == _HWMOD_STATE_IDLE)) {</div><div class='add'>+		oh-&gt;_int_flags |= _HWMOD_SKIP_ENABLE;</div><div class='ctx'> 		postsetup_state = _HWMOD_STATE_ENABLED;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (postsetup_state == _HWMOD_STATE_IDLE)</div><div class='ctx'> 		_idle(oh);</div><div class='hunk'>@@ -2416,6 +2483,7 @@ int omap_hwmod_enable_wakeup(struct omap_hwmod *oh)</div><div class='ctx'> 	v = oh-&gt;_sysc_cache;</div><div class='ctx'> 	_enable_wakeup(oh, &amp;v);</div><div class='ctx'> 	_write_sysconfig(v, oh);</div><div class='add'>+	_set_idle_ioring_wakeup(oh, true);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;oh-&gt;_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2446,6 +2514,7 @@ int omap_hwmod_disable_wakeup(struct omap_hwmod *oh)</div><div class='ctx'> 	v = oh-&gt;_sysc_cache;</div><div class='ctx'> 	_disable_wakeup(oh, &amp;v);</div><div class='ctx'> 	_write_sysconfig(v, oh);</div><div class='add'>+	_set_idle_ioring_wakeup(oh, false);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;oh-&gt;_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2662,3 +2731,57 @@ int omap_hwmod_no_setup_reset(struct omap_hwmod *oh)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap_hwmod_pad_route_irq - route an I/O pad wakeup to a particular MPU IRQ</div><div class='add'>+ * @oh: struct omap_hwmod * containing hwmod mux entries</div><div class='add'>+ * @pad_idx: array index in oh-&gt;mux of the hwmod mux entry to route wakeup</div><div class='add'>+ * @irq_idx: the hwmod mpu_irqs array index of the IRQ to trigger on wakeup</div><div class='add'>+ *</div><div class='add'>+ * When an I/O pad wakeup arrives for the dynamic or wakeup hwmod mux</div><div class='add'>+ * entry number @pad_idx for the hwmod @oh, trigger the interrupt</div><div class='add'>+ * service routine for the hwmod's mpu_irqs array index @irq_idx.  If</div><div class='add'>+ * this function is not called for a given pad_idx, then the ISR</div><div class='add'>+ * associated with @oh's first MPU IRQ will be triggered when an I/O</div><div class='add'>+ * pad wakeup occurs on that pad.  Note that @pad_idx is the index of</div><div class='add'>+ * the _dynamic or wakeup_ entry: if there are other entries not</div><div class='add'>+ * marked with OMAP_DEVICE_PAD_WAKEUP or OMAP_DEVICE_PAD_REMUX, these</div><div class='add'>+ * entries are NOT COUNTED in the dynamic pad index.  This function</div><div class='add'>+ * must be called separately for each pad that requires its interrupt</div><div class='add'>+ * to be re-routed this way.  Returns -EINVAL if there is an argument</div><div class='add'>+ * problem or if @oh does not have hwmod mux entries or MPU IRQs;</div><div class='add'>+ * returns -ENOMEM if memory cannot be allocated; or 0 upon success.</div><div class='add'>+ *</div><div class='add'>+ * XXX This function interface is fragile.  Rather than using array</div><div class='add'>+ * indexes, which are subject to unpredictable change, it should be</div><div class='add'>+ * using hwmod IRQ names, and some other stable key for the hwmod mux</div><div class='add'>+ * pad records.</div><div class='add'>+ */</div><div class='add'>+int omap_hwmod_pad_route_irq(struct omap_hwmod *oh, int pad_idx, int irq_idx)</div><div class='add'>+{</div><div class='add'>+	int nr_irqs;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	if (!oh || !oh-&gt;mux || !oh-&gt;mpu_irqs || pad_idx &lt; 0 ||</div><div class='add'>+	    pad_idx &gt;= oh-&gt;mux-&gt;nr_pads_dynamic)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Check the number of available mpu_irqs */</div><div class='add'>+	for (nr_irqs = 0; oh-&gt;mpu_irqs[nr_irqs].irq &gt;= 0; nr_irqs++)</div><div class='add'>+		;</div><div class='add'>+</div><div class='add'>+	if (irq_idx &gt;= nr_irqs)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!oh-&gt;mux-&gt;irqs) {</div><div class='add'>+		/* XXX What frees this? */</div><div class='add'>+		oh-&gt;mux-&gt;irqs = kzalloc(sizeof(int) * oh-&gt;mux-&gt;nr_pads_dynamic,</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+		if (!oh-&gt;mux-&gt;irqs)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	oh-&gt;mux-&gt;irqs[pad_idx] = irq_idx;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c<br/>index eef43e2e163e..5324e8d93bc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap_hwmod_3xxx_data.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/omap_hwmod_3xxx_data.c</a></div><div class='hunk'>@@ -84,6 +84,8 @@ static struct omap_hwmod omap3xxx_mcbsp4_hwmod;</div><div class='ctx'> static struct omap_hwmod omap3xxx_mcbsp5_hwmod;</div><div class='ctx'> static struct omap_hwmod omap3xxx_mcbsp2_sidetone_hwmod;</div><div class='ctx'> static struct omap_hwmod omap3xxx_mcbsp3_sidetone_hwmod;</div><div class='add'>+static struct omap_hwmod omap3xxx_usb_host_hs_hwmod;</div><div class='add'>+static struct omap_hwmod omap3xxx_usb_tll_hs_hwmod;</div><div class='ctx'> </div><div class='ctx'> /* L3 -&gt; L4_CORE interface */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3xxx_l3_main__l4_core = {</div><div class='hunk'>@@ -164,6 +166,7 @@ static struct omap_hwmod omap3xxx_uart1_hwmod;</div><div class='ctx'> static struct omap_hwmod omap3xxx_uart2_hwmod;</div><div class='ctx'> static struct omap_hwmod omap3xxx_uart3_hwmod;</div><div class='ctx'> static struct omap_hwmod omap3xxx_uart4_hwmod;</div><div class='add'>+static struct omap_hwmod am35xx_uart4_hwmod;</div><div class='ctx'> static struct omap_hwmod omap3xxx_usbhsotg_hwmod;</div><div class='ctx'> </div><div class='ctx'> /* l3_core -&gt; usbhsotg interface */</div><div class='hunk'>@@ -299,6 +302,23 @@ static struct omap_hwmod_ocp_if omap3_l4_per__uart4 = {</div><div class='ctx'> 	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* AM35xx: L4 CORE -&gt; UART4 interface */</div><div class='add'>+static struct omap_hwmod_addr_space am35xx_uart4_addr_space[] = {</div><div class='add'>+	{</div><div class='add'>+		.pa_start       = OMAP3_UART4_AM35XX_BASE,</div><div class='add'>+		.pa_end         = OMAP3_UART4_AM35XX_BASE + SZ_1K - 1,</div><div class='add'>+		.flags          = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_ocp_if am35xx_l4_core__uart4 = {</div><div class='add'>+	.master         = &amp;omap3xxx_l4_core_hwmod,</div><div class='add'>+	.slave          = &amp;am35xx_uart4_hwmod,</div><div class='add'>+	.clk            = "uart4_ick",</div><div class='add'>+	.addr           = am35xx_uart4_addr_space,</div><div class='add'>+	.user           = OCP_USER_MPU | OCP_USER_SDMA,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* L4 CORE -&gt; I2C1 interface */</div><div class='ctx'> static struct omap_hwmod_ocp_if omap3_l4_core__i2c1 = {</div><div class='ctx'> 	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='hunk'>@@ -1162,6 +1182,7 @@ static struct omap_hwmod_class_sysconfig i2c_sysc = {</div><div class='ctx'> 			   SYSC_HAS_ENAWAKEUP | SYSC_HAS_SOFTRESET |</div><div class='ctx'> 			   SYSC_HAS_AUTOIDLE | SYSS_HAS_RESET_STATUS),</div><div class='ctx'> 	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),</div><div class='add'>+	.clockact	= CLOCKACT_TEST_ICLK,</div><div class='ctx'> 	.sysc_fields    = &amp;omap_hwmod_sysc_type1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1309,6 +1330,39 @@ static struct omap_hwmod omap3xxx_uart4_hwmod = {</div><div class='ctx'> 	.class		= &amp;omap2_uart_class,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct omap_hwmod_irq_info am35xx_uart4_mpu_irqs[] = {</div><div class='add'>+	{ .irq = INT_35XX_UART4_IRQ, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_dma_info am35xx_uart4_sdma_reqs[] = {</div><div class='add'>+	{ .name = "rx", .dma_req = AM35XX_DMA_UART4_RX, },</div><div class='add'>+	{ .name = "tx", .dma_req = AM35XX_DMA_UART4_TX, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_ocp_if *am35xx_uart4_slaves[] = {</div><div class='add'>+	&amp;am35xx_l4_core__uart4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod am35xx_uart4_hwmod = {</div><div class='add'>+	.name           = "uart4",</div><div class='add'>+	.mpu_irqs       = am35xx_uart4_mpu_irqs,</div><div class='add'>+	.sdma_reqs      = am35xx_uart4_sdma_reqs,</div><div class='add'>+	.main_clk       = "uart4_fck",</div><div class='add'>+	.prcm           = {</div><div class='add'>+		.omap2 = {</div><div class='add'>+			.module_offs = CORE_MOD,</div><div class='add'>+			.prcm_reg_id = 1,</div><div class='add'>+			.module_bit = OMAP3430_EN_UART4_SHIFT,</div><div class='add'>+			.idlest_reg_id = 1,</div><div class='add'>+			.idlest_idle_bit = OMAP3430_EN_UART4_SHIFT,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.slaves         = am35xx_uart4_slaves,</div><div class='add'>+	.slaves_cnt     = ARRAY_SIZE(am35xx_uart4_slaves),</div><div class='add'>+	.class          = &amp;omap2_uart_class,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static struct omap_hwmod_class i2c_class = {</div><div class='ctx'> 	.name	= "i2c",</div><div class='ctx'> 	.sysc	= &amp;i2c_sysc,</div><div class='hunk'>@@ -1636,7 +1690,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_i2c1_slaves[] = {</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_i2c1_hwmod = {</div><div class='ctx'> 	.name		= "i2c1",</div><div class='del'>-	.flags		= HWMOD_16BIT_REG,</div><div class='add'>+	.flags		= HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,</div><div class='ctx'> 	.mpu_irqs	= omap2_i2c1_mpu_irqs,</div><div class='ctx'> 	.sdma_reqs	= omap2_i2c1_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "i2c1_fck",</div><div class='hunk'>@@ -1670,7 +1724,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_i2c2_slaves[] = {</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_i2c2_hwmod = {</div><div class='ctx'> 	.name		= "i2c2",</div><div class='del'>-	.flags		= HWMOD_16BIT_REG,</div><div class='add'>+	.flags		= HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,</div><div class='ctx'> 	.mpu_irqs	= omap2_i2c2_mpu_irqs,</div><div class='ctx'> 	.sdma_reqs	= omap2_i2c2_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "i2c2_fck",</div><div class='hunk'>@@ -1715,7 +1769,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_i2c3_slaves[] = {</div><div class='ctx'> </div><div class='ctx'> static struct omap_hwmod omap3xxx_i2c3_hwmod = {</div><div class='ctx'> 	.name		= "i2c3",</div><div class='del'>-	.flags		= HWMOD_16BIT_REG,</div><div class='add'>+	.flags		= HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,</div><div class='ctx'> 	.mpu_irqs	= i2c3_mpu_irqs,</div><div class='ctx'> 	.sdma_reqs	= i2c3_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "i2c3_fck",</div><div class='hunk'>@@ -3072,7 +3126,35 @@ static struct omap_mmc_dev_attr mmc1_dev_attr = {</div><div class='ctx'> 	.flags = OMAP_HSMMC_SUPPORTS_DUAL_VOLT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod omap3xxx_mmc1_hwmod = {</div><div class='add'>+/* See 35xx errata 2.1.1.128 in SPRZ278F */</div><div class='add'>+static struct omap_mmc_dev_attr mmc1_pre_es3_dev_attr = {</div><div class='add'>+	.flags = (OMAP_HSMMC_SUPPORTS_DUAL_VOLT |</div><div class='add'>+		  OMAP_HSMMC_BROKEN_MULTIBLOCK_READ),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod omap3xxx_pre_es3_mmc1_hwmod = {</div><div class='add'>+	.name		= "mmc1",</div><div class='add'>+	.mpu_irqs	= omap34xx_mmc1_mpu_irqs,</div><div class='add'>+	.sdma_reqs	= omap34xx_mmc1_sdma_reqs,</div><div class='add'>+	.opt_clks	= omap34xx_mmc1_opt_clks,</div><div class='add'>+	.opt_clks_cnt	= ARRAY_SIZE(omap34xx_mmc1_opt_clks),</div><div class='add'>+	.main_clk	= "mmchs1_fck",</div><div class='add'>+	.prcm		= {</div><div class='add'>+		.omap2 = {</div><div class='add'>+			.module_offs = CORE_MOD,</div><div class='add'>+			.prcm_reg_id = 1,</div><div class='add'>+			.module_bit = OMAP3430_EN_MMC1_SHIFT,</div><div class='add'>+			.idlest_reg_id = 1,</div><div class='add'>+			.idlest_idle_bit = OMAP3430_ST_MMC1_SHIFT,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.dev_attr	= &amp;mmc1_pre_es3_dev_attr,</div><div class='add'>+	.slaves		= omap3xxx_mmc1_slaves,</div><div class='add'>+	.slaves_cnt	= ARRAY_SIZE(omap3xxx_mmc1_slaves),</div><div class='add'>+	.class		= &amp;omap34xx_mmc_class,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod omap3xxx_es3plus_mmc1_hwmod = {</div><div class='ctx'> 	.name		= "mmc1",</div><div class='ctx'> 	.mpu_irqs	= omap34xx_mmc1_mpu_irqs,</div><div class='ctx'> 	.sdma_reqs	= omap34xx_mmc1_sdma_reqs,</div><div class='hunk'>@@ -3115,7 +3197,34 @@ static struct omap_hwmod_ocp_if *omap3xxx_mmc2_slaves[] = {</div><div class='ctx'> 	&amp;omap3xxx_l4_core__mmc2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct omap_hwmod omap3xxx_mmc2_hwmod = {</div><div class='add'>+/* See 35xx errata 2.1.1.128 in SPRZ278F */</div><div class='add'>+static struct omap_mmc_dev_attr mmc2_pre_es3_dev_attr = {</div><div class='add'>+	.flags = OMAP_HSMMC_BROKEN_MULTIBLOCK_READ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod omap3xxx_pre_es3_mmc2_hwmod = {</div><div class='add'>+	.name		= "mmc2",</div><div class='add'>+	.mpu_irqs	= omap34xx_mmc2_mpu_irqs,</div><div class='add'>+	.sdma_reqs	= omap34xx_mmc2_sdma_reqs,</div><div class='add'>+	.opt_clks	= omap34xx_mmc2_opt_clks,</div><div class='add'>+	.opt_clks_cnt	= ARRAY_SIZE(omap34xx_mmc2_opt_clks),</div><div class='add'>+	.main_clk	= "mmchs2_fck",</div><div class='add'>+	.prcm		= {</div><div class='add'>+		.omap2 = {</div><div class='add'>+			.module_offs = CORE_MOD,</div><div class='add'>+			.prcm_reg_id = 1,</div><div class='add'>+			.module_bit = OMAP3430_EN_MMC2_SHIFT,</div><div class='add'>+			.idlest_reg_id = 1,</div><div class='add'>+			.idlest_idle_bit = OMAP3430_ST_MMC2_SHIFT,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.dev_attr	= &amp;mmc2_pre_es3_dev_attr,</div><div class='add'>+	.slaves		= omap3xxx_mmc2_slaves,</div><div class='add'>+	.slaves_cnt	= ARRAY_SIZE(omap3xxx_mmc2_slaves),</div><div class='add'>+	.class		= &amp;omap34xx_mmc_class,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod omap3xxx_es3plus_mmc2_hwmod = {</div><div class='ctx'> 	.name		= "mmc2",</div><div class='ctx'> 	.mpu_irqs	= omap34xx_mmc2_mpu_irqs,</div><div class='ctx'> 	.sdma_reqs	= omap34xx_mmc2_sdma_reqs,</div><div class='hunk'>@@ -3177,13 +3286,223 @@ static struct omap_hwmod omap3xxx_mmc3_hwmod = {</div><div class='ctx'> 	.class		= &amp;omap34xx_mmc_class,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * 'usb_host_hs' class</div><div class='add'>+ * high-speed multi-port usb host controller</div><div class='add'>+ */</div><div class='add'>+static struct omap_hwmod_ocp_if omap3xxx_usb_host_hs__l3_main_2 = {</div><div class='add'>+	.master		= &amp;omap3xxx_usb_host_hs_hwmod,</div><div class='add'>+	.slave		= &amp;omap3xxx_l3_main_hwmod,</div><div class='add'>+	.clk		= "core_l3_ick",</div><div class='add'>+	.user		= OCP_USER_MPU,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_class_sysconfig omap3xxx_usb_host_hs_sysc = {</div><div class='add'>+	.rev_offs	= 0x0000,</div><div class='add'>+	.sysc_offs	= 0x0010,</div><div class='add'>+	.syss_offs	= 0x0014,</div><div class='add'>+	.sysc_flags	= (SYSC_HAS_MIDLEMODE | SYSC_HAS_CLOCKACTIVITY |</div><div class='add'>+			   SYSC_HAS_SIDLEMODE | SYSC_HAS_ENAWAKEUP |</div><div class='add'>+			   SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE),</div><div class='add'>+	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |</div><div class='add'>+			   MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),</div><div class='add'>+	.sysc_fields	= &amp;omap_hwmod_sysc_type1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_class omap3xxx_usb_host_hs_hwmod_class = {</div><div class='add'>+	.name = "usb_host_hs",</div><div class='add'>+	.sysc = &amp;omap3xxx_usb_host_hs_sysc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_ocp_if *omap3xxx_usb_host_hs_masters[] = {</div><div class='add'>+	&amp;omap3xxx_usb_host_hs__l3_main_2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_addr_space omap3xxx_usb_host_hs_addrs[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "uhh",</div><div class='add'>+		.pa_start	= 0x48064000,</div><div class='add'>+		.pa_end		= 0x480643ff,</div><div class='add'>+		.flags		= ADDR_TYPE_RT</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "ohci",</div><div class='add'>+		.pa_start	= 0x48064400,</div><div class='add'>+		.pa_end		= 0x480647ff,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "ehci",</div><div class='add'>+		.pa_start	= 0x48064800,</div><div class='add'>+		.pa_end		= 0x48064cff,</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_ocp_if omap3xxx_l4_core__usb_host_hs = {</div><div class='add'>+	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='add'>+	.slave		= &amp;omap3xxx_usb_host_hs_hwmod,</div><div class='add'>+	.clk		= "usbhost_ick",</div><div class='add'>+	.addr		= omap3xxx_usb_host_hs_addrs,</div><div class='add'>+	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_ocp_if *omap3xxx_usb_host_hs_slaves[] = {</div><div class='add'>+	&amp;omap3xxx_l4_core__usb_host_hs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_opt_clk omap3xxx_usb_host_hs_opt_clks[] = {</div><div class='add'>+	  { .role = "ehci_logic_fck", .clk = "usbhost_120m_fck", },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_irq_info omap3xxx_usb_host_hs_irqs[] = {</div><div class='add'>+	{ .name = "ohci-irq", .irq = 76 },</div><div class='add'>+	{ .name = "ehci-irq", .irq = 77 },</div><div class='add'>+	{ .irq = -1 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = {</div><div class='add'>+	.name		= "usb_host_hs",</div><div class='add'>+	.class		= &amp;omap3xxx_usb_host_hs_hwmod_class,</div><div class='add'>+	.clkdm_name	= "l3_init_clkdm",</div><div class='add'>+	.mpu_irqs	= omap3xxx_usb_host_hs_irqs,</div><div class='add'>+	.main_clk	= "usbhost_48m_fck",</div><div class='add'>+	.prcm = {</div><div class='add'>+		.omap2 = {</div><div class='add'>+			.module_offs = OMAP3430ES2_USBHOST_MOD,</div><div class='add'>+			.prcm_reg_id = 1,</div><div class='add'>+			.module_bit = OMAP3430ES2_EN_USBHOST1_SHIFT,</div><div class='add'>+			.idlest_reg_id = 1,</div><div class='add'>+			.idlest_idle_bit = OMAP3430ES2_ST_USBHOST_IDLE_SHIFT,</div><div class='add'>+			.idlest_stdby_bit = OMAP3430ES2_ST_USBHOST_STDBY_SHIFT,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.opt_clks	= omap3xxx_usb_host_hs_opt_clks,</div><div class='add'>+	.opt_clks_cnt	= ARRAY_SIZE(omap3xxx_usb_host_hs_opt_clks),</div><div class='add'>+	.slaves		= omap3xxx_usb_host_hs_slaves,</div><div class='add'>+	.slaves_cnt	= ARRAY_SIZE(omap3xxx_usb_host_hs_slaves),</div><div class='add'>+	.masters	= omap3xxx_usb_host_hs_masters,</div><div class='add'>+	.masters_cnt	= ARRAY_SIZE(omap3xxx_usb_host_hs_masters),</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Errata: USBHOST Configured In Smart-Idle Can Lead To a Deadlock</div><div class='add'>+	 * id: i660</div><div class='add'>+	 *</div><div class='add'>+	 * Description:</div><div class='add'>+	 * In the following configuration :</div><div class='add'>+	 * - USBHOST module is set to smart-idle mode</div><div class='add'>+	 * - PRCM asserts idle_req to the USBHOST module ( This typically</div><div class='add'>+	 *   happens when the system is going to a low power mode : all ports</div><div class='add'>+	 *   have been suspended, the master part of the USBHOST module has</div><div class='add'>+	 *   entered the standby state, and SW has cut the functional clocks)</div><div class='add'>+	 * - an USBHOST interrupt occurs before the module is able to answer</div><div class='add'>+	 *   idle_ack, typically a remote wakeup IRQ.</div><div class='add'>+	 * Then the USB HOST module will enter a deadlock situation where it</div><div class='add'>+	 * is no more accessible nor functional.</div><div class='add'>+	 *</div><div class='add'>+	 * Workaround:</div><div class='add'>+	 * Don't use smart idle; use only force idle, hence HWMOD_SWSUP_SIDLE</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Errata: USB host EHCI may stall when entering smart-standby mode</div><div class='add'>+	 * Id: i571</div><div class='add'>+	 *</div><div class='add'>+	 * Description:</div><div class='add'>+	 * When the USBHOST module is set to smart-standby mode, and when it is</div><div class='add'>+	 * ready to enter the standby state (i.e. all ports are suspended and</div><div class='add'>+	 * all attached devices are in suspend mode), then it can wrongly assert</div><div class='add'>+	 * the Mstandby signal too early while there are still some residual OCP</div><div class='add'>+	 * transactions ongoing. If this condition occurs, the internal state</div><div class='add'>+	 * machine may go to an undefined state and the USB link may be stuck</div><div class='add'>+	 * upon the next resume.</div><div class='add'>+	 *</div><div class='add'>+	 * Workaround:</div><div class='add'>+	 * Don't use smart standby; use only force standby,</div><div class='add'>+	 * hence HWMOD_SWSUP_MSTANDBY</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * During system boot; If the hwmod framework resets the module</div><div class='add'>+	 * the module will have smart idle settings; which can lead to deadlock</div><div class='add'>+	 * (above Errata Id:i660); so, dont reset the module during boot;</div><div class='add'>+	 * Use HWMOD_INIT_NO_RESET.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	.flags		= HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY |</div><div class='add'>+			  HWMOD_INIT_NO_RESET,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 'usb_tll_hs' class</div><div class='add'>+ * usb_tll_hs module is the adapter on the usb_host_hs ports</div><div class='add'>+ */</div><div class='add'>+static struct omap_hwmod_class_sysconfig omap3xxx_usb_tll_hs_sysc = {</div><div class='add'>+	.rev_offs	= 0x0000,</div><div class='add'>+	.sysc_offs	= 0x0010,</div><div class='add'>+	.syss_offs	= 0x0014,</div><div class='add'>+	.sysc_flags	= (SYSC_HAS_CLOCKACTIVITY | SYSC_HAS_SIDLEMODE |</div><div class='add'>+			   SYSC_HAS_ENAWAKEUP | SYSC_HAS_SOFTRESET |</div><div class='add'>+			   SYSC_HAS_AUTOIDLE),</div><div class='add'>+	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),</div><div class='add'>+	.sysc_fields	= &amp;omap_hwmod_sysc_type1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_class omap3xxx_usb_tll_hs_hwmod_class = {</div><div class='add'>+	.name = "usb_tll_hs",</div><div class='add'>+	.sysc = &amp;omap3xxx_usb_tll_hs_sysc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_irq_info omap3xxx_usb_tll_hs_irqs[] = {</div><div class='add'>+	{ .name = "tll-irq", .irq = 78 },</div><div class='add'>+	{ .irq = -1 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_addr_space omap3xxx_usb_tll_hs_addrs[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "tll",</div><div class='add'>+		.pa_start	= 0x48062000,</div><div class='add'>+		.pa_end		= 0x48062fff,</div><div class='add'>+		.flags		= ADDR_TYPE_RT</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_ocp_if omap3xxx_l4_core__usb_tll_hs = {</div><div class='add'>+	.master		= &amp;omap3xxx_l4_core_hwmod,</div><div class='add'>+	.slave		= &amp;omap3xxx_usb_tll_hs_hwmod,</div><div class='add'>+	.clk		= "usbtll_ick",</div><div class='add'>+	.addr		= omap3xxx_usb_tll_hs_addrs,</div><div class='add'>+	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_ocp_if *omap3xxx_usb_tll_hs_slaves[] = {</div><div class='add'>+	&amp;omap3xxx_l4_core__usb_tll_hs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod omap3xxx_usb_tll_hs_hwmod = {</div><div class='add'>+	.name		= "usb_tll_hs",</div><div class='add'>+	.class		= &amp;omap3xxx_usb_tll_hs_hwmod_class,</div><div class='add'>+	.clkdm_name	= "l3_init_clkdm",</div><div class='add'>+	.mpu_irqs	= omap3xxx_usb_tll_hs_irqs,</div><div class='add'>+	.main_clk	= "usbtll_fck",</div><div class='add'>+	.prcm = {</div><div class='add'>+		.omap2 = {</div><div class='add'>+			.module_offs = CORE_MOD,</div><div class='add'>+			.prcm_reg_id = 3,</div><div class='add'>+			.module_bit = OMAP3430ES2_EN_USBTLL_SHIFT,</div><div class='add'>+			.idlest_reg_id = 3,</div><div class='add'>+			.idlest_idle_bit = OMAP3430ES2_ST_USBTLL_SHIFT,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.slaves		= omap3xxx_usb_tll_hs_slaves,</div><div class='add'>+	.slaves_cnt	= ARRAY_SIZE(omap3xxx_usb_tll_hs_slaves),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {</div><div class='ctx'> 	&amp;omap3xxx_l3_main_hwmod,</div><div class='ctx'> 	&amp;omap3xxx_l4_core_hwmod,</div><div class='ctx'> 	&amp;omap3xxx_l4_per_hwmod,</div><div class='ctx'> 	&amp;omap3xxx_l4_wkup_hwmod,</div><div class='del'>-	&amp;omap3xxx_mmc1_hwmod,</div><div class='del'>-	&amp;omap3xxx_mmc2_hwmod,</div><div class='ctx'> 	&amp;omap3xxx_mmc3_hwmod,</div><div class='ctx'> 	&amp;omap3xxx_mpu_hwmod,</div><div class='ctx'> </div><div class='hunk'>@@ -3198,12 +3517,12 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {</div><div class='ctx'> 	&amp;omap3xxx_timer9_hwmod,</div><div class='ctx'> 	&amp;omap3xxx_timer10_hwmod,</div><div class='ctx'> 	&amp;omap3xxx_timer11_hwmod,</div><div class='del'>-	&amp;omap3xxx_timer12_hwmod,</div><div class='ctx'> </div><div class='ctx'> 	&amp;omap3xxx_wd_timer2_hwmod,</div><div class='ctx'> 	&amp;omap3xxx_uart1_hwmod,</div><div class='ctx'> 	&amp;omap3xxx_uart2_hwmod,</div><div class='ctx'> 	&amp;omap3xxx_uart3_hwmod,</div><div class='add'>+</div><div class='ctx'> 	/* dss class */</div><div class='ctx'> 	&amp;omap3xxx_dss_dispc_hwmod,</div><div class='ctx'> 	&amp;omap3xxx_dss_dsi1_hwmod,</div><div class='hunk'>@@ -3245,6 +3564,12 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* GP-only hwmods */</div><div class='add'>+static __initdata struct omap_hwmod *omap3xxx_gp_hwmods[] = {</div><div class='add'>+	&amp;omap3xxx_timer12_hwmod,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* 3430ES1-only hwmods */</div><div class='ctx'> static __initdata struct omap_hwmod *omap3430es1_hwmods[] = {</div><div class='ctx'> 	&amp;omap3430es1_dss_core_hwmod,</div><div class='hunk'>@@ -3255,6 +3580,22 @@ static __initdata struct omap_hwmod *omap3430es1_hwmods[] = {</div><div class='ctx'> static __initdata struct omap_hwmod *omap3430es2plus_hwmods[] = {</div><div class='ctx'> 	&amp;omap3xxx_dss_core_hwmod,</div><div class='ctx'> 	&amp;omap3xxx_usbhsotg_hwmod,</div><div class='add'>+	&amp;omap3xxx_usb_host_hs_hwmod,</div><div class='add'>+	&amp;omap3xxx_usb_tll_hs_hwmod,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* &lt;= 3430ES3-only hwmods */</div><div class='add'>+static struct omap_hwmod *omap3430_pre_es3_hwmods[] __initdata = {</div><div class='add'>+	&amp;omap3xxx_pre_es3_mmc1_hwmod,</div><div class='add'>+	&amp;omap3xxx_pre_es3_mmc2_hwmod,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 3430ES3+-only hwmods */</div><div class='add'>+static struct omap_hwmod *omap3430_es3plus_hwmods[] __initdata = {</div><div class='add'>+	&amp;omap3xxx_es3plus_mmc1_hwmod,</div><div class='add'>+	&amp;omap3xxx_es3plus_mmc2_hwmod,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3276,12 +3617,21 @@ static __initdata struct omap_hwmod *omap36xx_hwmods[] = {</div><div class='ctx'> 	&amp;omap36xx_sr2_hwmod,</div><div class='ctx'> 	&amp;omap3xxx_usbhsotg_hwmod,</div><div class='ctx'> 	&amp;omap3xxx_mailbox_hwmod,</div><div class='add'>+	&amp;omap3xxx_usb_host_hs_hwmod,</div><div class='add'>+	&amp;omap3xxx_usb_tll_hs_hwmod,</div><div class='add'>+	&amp;omap3xxx_es3plus_mmc1_hwmod,</div><div class='add'>+	&amp;omap3xxx_es3plus_mmc2_hwmod,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __initdata struct omap_hwmod *am35xx_hwmods[] = {</div><div class='ctx'> 	&amp;omap3xxx_dss_core_hwmod, /* XXX ??? */</div><div class='ctx'> 	&amp;am35xx_usbhsotg_hwmod,</div><div class='add'>+	&amp;am35xx_uart4_hwmod,</div><div class='add'>+	&amp;omap3xxx_usb_host_hs_hwmod,</div><div class='add'>+	&amp;omap3xxx_usb_tll_hs_hwmod,</div><div class='add'>+	&amp;omap3xxx_es3plus_mmc1_hwmod,</div><div class='add'>+	&amp;omap3xxx_es3plus_mmc2_hwmod,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3296,6 +3646,13 @@ int __init omap3xxx_hwmod_init(void)</div><div class='ctx'> 	if (r &lt; 0)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	/* Register GP-only hwmods. */</div><div class='add'>+	if (omap_type() == OMAP2_DEVICE_TYPE_GP) {</div><div class='add'>+		r = omap_hwmod_register(omap3xxx_gp_hwmods);</div><div class='add'>+		if (r &lt; 0)</div><div class='add'>+			return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rev = omap_rev();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3334,6 +3691,21 @@ int __init omap3xxx_hwmod_init(void)</div><div class='ctx'> 		h = omap3430es2plus_hwmods;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	if (h) {</div><div class='add'>+		r = omap_hwmod_register(h);</div><div class='add'>+		if (r &lt; 0)</div><div class='add'>+			return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	h = NULL;</div><div class='add'>+	if (rev == OMAP3430_REV_ES1_0 || rev == OMAP3430_REV_ES2_0 ||</div><div class='add'>+	    rev == OMAP3430_REV_ES2_1) {</div><div class='add'>+		h = omap3430_pre_es3_hwmods;</div><div class='add'>+	} else if (rev == OMAP3430_REV_ES3_0 || rev == OMAP3430_REV_ES3_1 ||</div><div class='add'>+		   rev == OMAP3430_REV_ES3_1_2) {</div><div class='add'>+		h = omap3430_es3plus_hwmods;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	if (h)</div><div class='ctx'> 		r = omap_hwmod_register(h);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c<br/>index daaf165af696..f9f151081760 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap_hwmod_44xx_data.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap_hwmod_44xx_data.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap_hwmod_44xx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/omap_hwmod_44xx_data.c</a></div><div class='hunk'>@@ -70,6 +70,8 @@ static struct omap_hwmod omap44xx_mmc2_hwmod;</div><div class='ctx'> static struct omap_hwmod omap44xx_mpu_hwmod;</div><div class='ctx'> static struct omap_hwmod omap44xx_mpu_private_hwmod;</div><div class='ctx'> static struct omap_hwmod omap44xx_usb_otg_hs_hwmod;</div><div class='add'>+static struct omap_hwmod omap44xx_usb_host_hs_hwmod;</div><div class='add'>+static struct omap_hwmod omap44xx_usb_tll_hs_hwmod;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Interconnects omap_hwmod structures</div><div class='hunk'>@@ -2246,6 +2248,7 @@ static struct omap_hwmod_class_sysconfig omap44xx_i2c_sysc = {</div><div class='ctx'> 			   SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),</div><div class='ctx'> 	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |</div><div class='ctx'> 			   SIDLE_SMART_WKUP),</div><div class='add'>+	.clockact	= CLOCKACT_TEST_ICLK,</div><div class='ctx'> 	.sysc_fields	= &amp;omap_hwmod_sysc_type1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2300,7 +2303,7 @@ static struct omap_hwmod omap44xx_i2c1_hwmod = {</div><div class='ctx'> 	.name		= "i2c1",</div><div class='ctx'> 	.class		= &amp;omap44xx_i2c_hwmod_class,</div><div class='ctx'> 	.clkdm_name	= "l4_per_clkdm",</div><div class='del'>-	.flags		= HWMOD_16BIT_REG,</div><div class='add'>+	.flags		= HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,</div><div class='ctx'> 	.mpu_irqs	= omap44xx_i2c1_irqs,</div><div class='ctx'> 	.sdma_reqs	= omap44xx_i2c1_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "i2c1_fck",</div><div class='hunk'>@@ -2356,7 +2359,7 @@ static struct omap_hwmod omap44xx_i2c2_hwmod = {</div><div class='ctx'> 	.name		= "i2c2",</div><div class='ctx'> 	.class		= &amp;omap44xx_i2c_hwmod_class,</div><div class='ctx'> 	.clkdm_name	= "l4_per_clkdm",</div><div class='del'>-	.flags		= HWMOD_16BIT_REG,</div><div class='add'>+	.flags		= HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,</div><div class='ctx'> 	.mpu_irqs	= omap44xx_i2c2_irqs,</div><div class='ctx'> 	.sdma_reqs	= omap44xx_i2c2_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "i2c2_fck",</div><div class='hunk'>@@ -2412,7 +2415,7 @@ static struct omap_hwmod omap44xx_i2c3_hwmod = {</div><div class='ctx'> 	.name		= "i2c3",</div><div class='ctx'> 	.class		= &amp;omap44xx_i2c_hwmod_class,</div><div class='ctx'> 	.clkdm_name	= "l4_per_clkdm",</div><div class='del'>-	.flags		= HWMOD_16BIT_REG,</div><div class='add'>+	.flags		= HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,</div><div class='ctx'> 	.mpu_irqs	= omap44xx_i2c3_irqs,</div><div class='ctx'> 	.sdma_reqs	= omap44xx_i2c3_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "i2c3_fck",</div><div class='hunk'>@@ -2468,7 +2471,7 @@ static struct omap_hwmod omap44xx_i2c4_hwmod = {</div><div class='ctx'> 	.name		= "i2c4",</div><div class='ctx'> 	.class		= &amp;omap44xx_i2c_hwmod_class,</div><div class='ctx'> 	.clkdm_name	= "l4_per_clkdm",</div><div class='del'>-	.flags		= HWMOD_16BIT_REG,</div><div class='add'>+	.flags		= HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,</div><div class='ctx'> 	.mpu_irqs	= omap44xx_i2c4_irqs,</div><div class='ctx'> 	.sdma_reqs	= omap44xx_i2c4_sdma_reqs,</div><div class='ctx'> 	.main_clk	= "i2c4_fck",</div><div class='hunk'>@@ -5276,6 +5279,207 @@ static struct omap_hwmod omap44xx_wd_timer3_hwmod = {</div><div class='ctx'> 	.slaves_cnt	= ARRAY_SIZE(omap44xx_wd_timer3_slaves),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * 'usb_host_hs' class</div><div class='add'>+ * high-speed multi-port usb host controller</div><div class='add'>+ */</div><div class='add'>+static struct omap_hwmod_ocp_if omap44xx_usb_host_hs__l3_main_2 = {</div><div class='add'>+	.master		= &amp;omap44xx_usb_host_hs_hwmod,</div><div class='add'>+	.slave		= &amp;omap44xx_l3_main_2_hwmod,</div><div class='add'>+	.clk		= "l3_div_ck",</div><div class='add'>+	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_class_sysconfig omap44xx_usb_host_hs_sysc = {</div><div class='add'>+	.rev_offs	= 0x0000,</div><div class='add'>+	.sysc_offs	= 0x0010,</div><div class='add'>+	.syss_offs	= 0x0014,</div><div class='add'>+	.sysc_flags	= (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE |</div><div class='add'>+			   SYSC_HAS_SOFTRESET),</div><div class='add'>+	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |</div><div class='add'>+			   SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO |</div><div class='add'>+			   MSTANDBY_SMART | MSTANDBY_SMART_WKUP),</div><div class='add'>+	.sysc_fields	= &amp;omap_hwmod_sysc_type2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_class omap44xx_usb_host_hs_hwmod_class = {</div><div class='add'>+	.name = "usb_host_hs",</div><div class='add'>+	.sysc = &amp;omap44xx_usb_host_hs_sysc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_ocp_if *omap44xx_usb_host_hs_masters[] = {</div><div class='add'>+	&amp;omap44xx_usb_host_hs__l3_main_2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_addr_space omap44xx_usb_host_hs_addrs[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "uhh",</div><div class='add'>+		.pa_start	= 0x4a064000,</div><div class='add'>+		.pa_end		= 0x4a0647ff,</div><div class='add'>+		.flags		= ADDR_TYPE_RT</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "ohci",</div><div class='add'>+		.pa_start	= 0x4a064800,</div><div class='add'>+		.pa_end		= 0x4a064bff,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "ehci",</div><div class='add'>+		.pa_start	= 0x4a064c00,</div><div class='add'>+		.pa_end		= 0x4a064fff,</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_irq_info omap44xx_usb_host_hs_irqs[] = {</div><div class='add'>+	{ .name = "ohci-irq", .irq = 76 + OMAP44XX_IRQ_GIC_START },</div><div class='add'>+	{ .name = "ehci-irq", .irq = 77 + OMAP44XX_IRQ_GIC_START },</div><div class='add'>+	{ .irq = -1 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_ocp_if omap44xx_l4_cfg__usb_host_hs = {</div><div class='add'>+	.master		= &amp;omap44xx_l4_cfg_hwmod,</div><div class='add'>+	.slave		= &amp;omap44xx_usb_host_hs_hwmod,</div><div class='add'>+	.clk		= "l4_div_ck",</div><div class='add'>+	.addr		= omap44xx_usb_host_hs_addrs,</div><div class='add'>+	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_ocp_if *omap44xx_usb_host_hs_slaves[] = {</div><div class='add'>+	&amp;omap44xx_l4_cfg__usb_host_hs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod omap44xx_usb_host_hs_hwmod = {</div><div class='add'>+	.name		= "usb_host_hs",</div><div class='add'>+	.class		= &amp;omap44xx_usb_host_hs_hwmod_class,</div><div class='add'>+	.clkdm_name	= "l3_init_clkdm",</div><div class='add'>+	.main_clk	= "usb_host_hs_fck",</div><div class='add'>+	.prcm = {</div><div class='add'>+		.omap4 = {</div><div class='add'>+			.clkctrl_offs = OMAP4_CM_L3INIT_USB_HOST_CLKCTRL_OFFSET,</div><div class='add'>+			.context_offs = OMAP4_RM_L3INIT_USB_HOST_CONTEXT_OFFSET,</div><div class='add'>+			.modulemode   = MODULEMODE_SWCTRL,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.mpu_irqs	= omap44xx_usb_host_hs_irqs,</div><div class='add'>+	.slaves		= omap44xx_usb_host_hs_slaves,</div><div class='add'>+	.slaves_cnt	= ARRAY_SIZE(omap44xx_usb_host_hs_slaves),</div><div class='add'>+	.masters	= omap44xx_usb_host_hs_masters,</div><div class='add'>+	.masters_cnt	= ARRAY_SIZE(omap44xx_usb_host_hs_masters),</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Errata: USBHOST Configured In Smart-Idle Can Lead To a Deadlock</div><div class='add'>+	 * id: i660</div><div class='add'>+	 *</div><div class='add'>+	 * Description:</div><div class='add'>+	 * In the following configuration :</div><div class='add'>+	 * - USBHOST module is set to smart-idle mode</div><div class='add'>+	 * - PRCM asserts idle_req to the USBHOST module ( This typically</div><div class='add'>+	 *   happens when the system is going to a low power mode : all ports</div><div class='add'>+	 *   have been suspended, the master part of the USBHOST module has</div><div class='add'>+	 *   entered the standby state, and SW has cut the functional clocks)</div><div class='add'>+	 * - an USBHOST interrupt occurs before the module is able to answer</div><div class='add'>+	 *   idle_ack, typically a remote wakeup IRQ.</div><div class='add'>+	 * Then the USB HOST module will enter a deadlock situation where it</div><div class='add'>+	 * is no more accessible nor functional.</div><div class='add'>+	 *</div><div class='add'>+	 * Workaround:</div><div class='add'>+	 * Don't use smart idle; use only force idle, hence HWMOD_SWSUP_SIDLE</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Errata: USB host EHCI may stall when entering smart-standby mode</div><div class='add'>+	 * Id: i571</div><div class='add'>+	 *</div><div class='add'>+	 * Description:</div><div class='add'>+	 * When the USBHOST module is set to smart-standby mode, and when it is</div><div class='add'>+	 * ready to enter the standby state (i.e. all ports are suspended and</div><div class='add'>+	 * all attached devices are in suspend mode), then it can wrongly assert</div><div class='add'>+	 * the Mstandby signal too early while there are still some residual OCP</div><div class='add'>+	 * transactions ongoing. If this condition occurs, the internal state</div><div class='add'>+	 * machine may go to an undefined state and the USB link may be stuck</div><div class='add'>+	 * upon the next resume.</div><div class='add'>+	 *</div><div class='add'>+	 * Workaround:</div><div class='add'>+	 * Don't use smart standby; use only force standby,</div><div class='add'>+	 * hence HWMOD_SWSUP_MSTANDBY</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * During system boot; If the hwmod framework resets the module</div><div class='add'>+	 * the module will have smart idle settings; which can lead to deadlock</div><div class='add'>+	 * (above Errata Id:i660); so, dont reset the module during boot;</div><div class='add'>+	 * Use HWMOD_INIT_NO_RESET.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	.flags		= HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY |</div><div class='add'>+			  HWMOD_INIT_NO_RESET,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 'usb_tll_hs' class</div><div class='add'>+ * usb_tll_hs module is the adapter on the usb_host_hs ports</div><div class='add'>+ */</div><div class='add'>+static struct omap_hwmod_class_sysconfig omap44xx_usb_tll_hs_sysc = {</div><div class='add'>+	.rev_offs	= 0x0000,</div><div class='add'>+	.sysc_offs	= 0x0010,</div><div class='add'>+	.syss_offs	= 0x0014,</div><div class='add'>+	.sysc_flags	= (SYSC_HAS_CLOCKACTIVITY | SYSC_HAS_SIDLEMODE |</div><div class='add'>+			   SYSC_HAS_ENAWAKEUP | SYSC_HAS_SOFTRESET |</div><div class='add'>+			   SYSC_HAS_AUTOIDLE),</div><div class='add'>+	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),</div><div class='add'>+	.sysc_fields	= &amp;omap_hwmod_sysc_type1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_class omap44xx_usb_tll_hs_hwmod_class = {</div><div class='add'>+	.name = "usb_tll_hs",</div><div class='add'>+	.sysc = &amp;omap44xx_usb_tll_hs_sysc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_irq_info omap44xx_usb_tll_hs_irqs[] = {</div><div class='add'>+	{ .name = "tll-irq", .irq = 78 + OMAP44XX_IRQ_GIC_START },</div><div class='add'>+	{ .irq = -1 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_addr_space omap44xx_usb_tll_hs_addrs[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "tll",</div><div class='add'>+		.pa_start	= 0x4a062000,</div><div class='add'>+		.pa_end		= 0x4a063fff,</div><div class='add'>+		.flags		= ADDR_TYPE_RT</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_ocp_if omap44xx_l4_cfg__usb_tll_hs = {</div><div class='add'>+	.master		= &amp;omap44xx_l4_cfg_hwmod,</div><div class='add'>+	.slave		= &amp;omap44xx_usb_tll_hs_hwmod,</div><div class='add'>+	.clk		= "l4_div_ck",</div><div class='add'>+	.addr		= omap44xx_usb_tll_hs_addrs,</div><div class='add'>+	.user		= OCP_USER_MPU | OCP_USER_SDMA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod_ocp_if *omap44xx_usb_tll_hs_slaves[] = {</div><div class='add'>+	&amp;omap44xx_l4_cfg__usb_tll_hs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_hwmod omap44xx_usb_tll_hs_hwmod = {</div><div class='add'>+	.name		= "usb_tll_hs",</div><div class='add'>+	.class		= &amp;omap44xx_usb_tll_hs_hwmod_class,</div><div class='add'>+	.clkdm_name	= "l3_init_clkdm",</div><div class='add'>+	.main_clk	= "usb_tll_hs_ick",</div><div class='add'>+	.prcm = {</div><div class='add'>+		.omap4 = {</div><div class='add'>+			.clkctrl_offs = OMAP4_CM_L3INIT_USB_TLL_CLKCTRL_OFFSET,</div><div class='add'>+			.context_offs = OMAP4_RM_L3INIT_USB_TLL_CONTEXT_OFFSET,</div><div class='add'>+			.modulemode   = MODULEMODE_HWCTRL,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.mpu_irqs	= omap44xx_usb_tll_hs_irqs,</div><div class='add'>+	.slaves		= omap44xx_usb_tll_hs_slaves,</div><div class='add'>+	.slaves_cnt	= ARRAY_SIZE(omap44xx_usb_tll_hs_slaves),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static __initdata struct omap_hwmod *omap44xx_hwmods[] = {</div><div class='ctx'> </div><div class='ctx'> 	/* dmm class */</div><div class='hunk'>@@ -5415,13 +5619,16 @@ static __initdata struct omap_hwmod *omap44xx_hwmods[] = {</div><div class='ctx'> 	&amp;omap44xx_uart3_hwmod,</div><div class='ctx'> 	&amp;omap44xx_uart4_hwmod,</div><div class='ctx'> </div><div class='add'>+	/* usb host class */</div><div class='add'>+	&amp;omap44xx_usb_host_hs_hwmod,</div><div class='add'>+	&amp;omap44xx_usb_tll_hs_hwmod,</div><div class='add'>+</div><div class='ctx'> 	/* usb_otg_hs class */</div><div class='ctx'> 	&amp;omap44xx_usb_otg_hs_hwmod,</div><div class='ctx'> </div><div class='ctx'> 	/* wd_timer class */</div><div class='ctx'> 	&amp;omap44xx_wd_timer2_hwmod,</div><div class='ctx'> 	&amp;omap44xx_wd_timer3_hwmod,</div><div class='del'>-</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c<br/>index 58775e3c8476..4c90477e6f82 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap_phy_internal.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/omap_phy_internal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/omap_phy_internal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/omap_phy_internal.c</a></div><div class='hunk'>@@ -260,3 +260,38 @@ void am35x_set_mode(u8 musb_mode)</div><div class='ctx'> </div><div class='ctx'> 	omap_ctrl_writel(devconf2, AM35XX_CONTROL_DEVCONF2);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void ti81xx_musb_phy_power(u8 on)</div><div class='add'>+{</div><div class='add'>+	void __iomem *scm_base = NULL;</div><div class='add'>+	u32 usbphycfg;</div><div class='add'>+</div><div class='add'>+	scm_base = ioremap(TI81XX_SCM_BASE, SZ_2K);</div><div class='add'>+	if (!scm_base) {</div><div class='add'>+		pr_err("system control module ioremap failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usbphycfg = __raw_readl(scm_base + USBCTRL0);</div><div class='add'>+</div><div class='add'>+	if (on) {</div><div class='add'>+		if (cpu_is_ti816x()) {</div><div class='add'>+			usbphycfg |= TI816X_USBPHY0_NORMAL_MODE;</div><div class='add'>+			usbphycfg &amp;= ~TI816X_USBPHY_REFCLK_OSC;</div><div class='add'>+		} else if (cpu_is_ti814x()) {</div><div class='add'>+			usbphycfg &amp;= ~(USBPHY_CM_PWRDN | USBPHY_OTG_PWRDN</div><div class='add'>+				| USBPHY_DPINPUT | USBPHY_DMINPUT);</div><div class='add'>+			usbphycfg |= (USBPHY_OTGVDET_EN | USBPHY_OTGSESSEND_EN</div><div class='add'>+				| USBPHY_DPOPBUFCTL | USBPHY_DMOPBUFCTL);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (cpu_is_ti816x())</div><div class='add'>+			usbphycfg &amp;= ~TI816X_USBPHY0_NORMAL_MODE;</div><div class='add'>+		else if (cpu_is_ti814x())</div><div class='add'>+			usbphycfg |= USBPHY_CM_PWRDN | USBPHY_OTG_PWRDN;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	__raw_writel(usbphycfg, scm_base + USBCTRL0);</div><div class='add'>+</div><div class='add'>+	iounmap(scm_base);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-omap2/opp2xxx.h b/arch/arm/mach-omap2/opp2xxx.h<br/>index 8affc66a92c2..8fae534eb157 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/opp2xxx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/opp2xxx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/opp2xxx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/opp2xxx.h</a></div><div class='hunk'>@@ -51,7 +51,7 @@ struct prcm_config {</div><div class='ctx'> 	unsigned long cm_clksel2_pll;	/* dpllx1 or x2 out */</div><div class='ctx'> 	unsigned long cm_clksel_mdm;	/* modem dividers 2430 only */</div><div class='ctx'> 	unsigned long base_sdrc_rfr;	/* base refresh timing for a set */</div><div class='del'>-	unsigned char flags;</div><div class='add'>+	unsigned short flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c<br/>index 00bff46ca48b..1881fe915149 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/pm.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/omap-pm.h&gt;</div><div class='ctx'> #include &lt;plat/omap_device.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #include "voltage.h"</div><div class='ctx'> #include "powerdomain.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h<br/>index 4e166add2f35..b737b11e4499 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/pm.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/pm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/pm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/pm.h</a></div><div class='hunk'>@@ -21,6 +21,7 @@ extern void omap_sram_idle(void);</div><div class='ctx'> extern int omap3_can_sleep(void);</div><div class='ctx'> extern int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state);</div><div class='ctx'> extern int omap3_idle_init(void);</div><div class='add'>+extern int omap4_idle_init(void);</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_PM_OPP)</div><div class='ctx'> extern int omap3_opp_init(void);</div><div class='head'>diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c<br/>index cf0c216132ab..b8822f8b2891 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/pm24xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/pm24xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/pm24xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/pm24xx.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/console.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='hunk'>@@ -42,6 +41,7 @@</div><div class='ctx'> #include &lt;plat/dma.h&gt;</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='ctx'> #include "prm2xxx_3xxx.h"</div><div class='ctx'> #include "prm-regbits-24xx.h"</div><div class='ctx'> #include "cm2xxx_3xxx.h"</div><div class='hunk'>@@ -126,27 +126,11 @@ static void omap2_enter_full_retention(void)</div><div class='ctx'> 	if (omap_irq_pending())</div><div class='ctx'> 		goto no_sleep;</div><div class='ctx'> </div><div class='del'>-	/* Block console output in case it is on one of the OMAP UARTs */</div><div class='del'>-	if (!is_suspending())</div><div class='del'>-		if (!console_trylock())</div><div class='del'>-			goto no_sleep;</div><div class='del'>-</div><div class='del'>-	omap_uart_prepare_idle(0);</div><div class='del'>-	omap_uart_prepare_idle(1);</div><div class='del'>-	omap_uart_prepare_idle(2);</div><div class='del'>-</div><div class='ctx'> 	/* Jump to SRAM suspend code */</div><div class='ctx'> 	omap2_sram_suspend(sdrc_read_reg(SDRC_DLLA_CTRL),</div><div class='ctx'> 			   OMAP_SDRC_REGADDR(SDRC_DLLA_CTRL),</div><div class='ctx'> 			   OMAP_SDRC_REGADDR(SDRC_POWER));</div><div class='ctx'> </div><div class='del'>-	omap_uart_resume_idle(2);</div><div class='del'>-	omap_uart_resume_idle(1);</div><div class='del'>-	omap_uart_resume_idle(0);</div><div class='del'>-</div><div class='del'>-	if (!is_suspending())</div><div class='del'>-		console_unlock();</div><div class='del'>-</div><div class='ctx'> no_sleep:</div><div class='ctx'> 	omap2_gpio_resume_after_idle();</div><div class='ctx'> </div><div class='hunk'>@@ -238,8 +222,6 @@ static int omap2_can_sleep(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (omap2_fclks_active())</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (!omap_uart_can_sleep())</div><div class='del'>-		return 0;</div><div class='ctx'> 	if (osc_ck-&gt;usecount &gt; 1)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (omap_dma_running())</div><div class='hunk'>@@ -290,7 +272,6 @@ static int omap2_pm_suspend(void)</div><div class='ctx'> 	mir1 = omap_readl(0x480fe0a4);</div><div class='ctx'> 	omap_writel(1 &lt;&lt; 5, 0x480fe0ac);</div><div class='ctx'> </div><div class='del'>-	omap_uart_prepare_suspend();</div><div class='ctx'> 	omap2_enter_full_retention();</div><div class='ctx'> </div><div class='ctx'> 	omap_writel(mir1, 0x480fe0a4);</div><div class='head'>diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c<br/>index efa66494c1e3..fc6987578920 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/pm34xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/pm34xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/pm34xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/pm34xx.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;trace/events/power.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/suspend.h&gt;</div><div class='hunk'>@@ -36,12 +35,12 @@</div><div class='ctx'> #include &lt;plat/sram.h&gt;</div><div class='ctx'> #include "clockdomain.h"</div><div class='ctx'> #include "powerdomain.h"</div><div class='del'>-#include &lt;plat/serial.h&gt;</div><div class='ctx'> #include &lt;plat/sdrc.h&gt;</div><div class='ctx'> #include &lt;plat/prcm.h&gt;</div><div class='ctx'> #include &lt;plat/gpmc.h&gt;</div><div class='ctx'> #include &lt;plat/dma.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='ctx'> #include "cm2xxx_3xxx.h"</div><div class='ctx'> #include "cm-regbits-34xx.h"</div><div class='ctx'> #include "prm-regbits-34xx.h"</div><div class='hunk'>@@ -53,15 +52,6 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SUSPEND</div><div class='ctx'> static suspend_state_t suspend_state = PM_SUSPEND_ON;</div><div class='del'>-static inline bool is_suspending(void)</div><div class='del'>-{</div><div class='del'>-	return (suspend_state != PM_SUSPEND_ON) &amp;&amp; console_suspend_enabled;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline bool is_suspending(void)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* pm34xx errata defined in pm.h */</div><div class='hunk'>@@ -194,7 +184,7 @@ static void omap3_save_secure_ram_context(void)</div><div class='ctx'>  * that any peripheral wake-up events occurring while attempting to</div><div class='ctx'>  * clear the PM_WKST_x are detected and cleared.</div><div class='ctx'>  */</div><div class='del'>-static int prcm_clear_mod_irqs(s16 module, u8 regs)</div><div class='add'>+static int prcm_clear_mod_irqs(s16 module, u8 regs, u32 ignore_bits)</div><div class='ctx'> {</div><div class='ctx'> 	u32 wkst, fclk, iclk, clken;</div><div class='ctx'> 	u16 wkst_off = (regs == 3) ? OMAP3430ES2_PM_WKST3 : PM_WKST1;</div><div class='hunk'>@@ -206,6 +196,7 @@ static int prcm_clear_mod_irqs(s16 module, u8 regs)</div><div class='ctx'> </div><div class='ctx'> 	wkst = omap2_prm_read_mod_reg(module, wkst_off);</div><div class='ctx'> 	wkst &amp;= omap2_prm_read_mod_reg(module, grpsel_off);</div><div class='add'>+	wkst &amp;= ~ignore_bits;</div><div class='ctx'> 	if (wkst) {</div><div class='ctx'> 		iclk = omap2_cm_read_mod_reg(module, iclk_off);</div><div class='ctx'> 		fclk = omap2_cm_read_mod_reg(module, fclk_off);</div><div class='hunk'>@@ -221,6 +212,7 @@ static int prcm_clear_mod_irqs(s16 module, u8 regs)</div><div class='ctx'> 			omap2_cm_set_mod_reg_bits(clken, module, fclk_off);</div><div class='ctx'> 			omap2_prm_write_mod_reg(wkst, module, wkst_off);</div><div class='ctx'> 			wkst = omap2_prm_read_mod_reg(module, wkst_off);</div><div class='add'>+			wkst &amp;= ~ignore_bits;</div><div class='ctx'> 			c++;</div><div class='ctx'> 		}</div><div class='ctx'> 		omap2_cm_write_mod_reg(iclk, module, iclk_off);</div><div class='hunk'>@@ -230,76 +222,35 @@ static int prcm_clear_mod_irqs(s16 module, u8 regs)</div><div class='ctx'> 	return c;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int _prcm_int_handle_wakeup(void)</div><div class='add'>+static irqreturn_t _prcm_int_handle_io(int irq, void *unused)</div><div class='ctx'> {</div><div class='ctx'> 	int c;</div><div class='ctx'> </div><div class='del'>-	c = prcm_clear_mod_irqs(WKUP_MOD, 1);</div><div class='del'>-	c += prcm_clear_mod_irqs(CORE_MOD, 1);</div><div class='del'>-	c += prcm_clear_mod_irqs(OMAP3430_PER_MOD, 1);</div><div class='del'>-	if (omap_rev() &gt; OMAP3430_REV_ES1_0) {</div><div class='del'>-		c += prcm_clear_mod_irqs(CORE_MOD, 3);</div><div class='del'>-		c += prcm_clear_mod_irqs(OMAP3430ES2_USBHOST_MOD, 1);</div><div class='del'>-	}</div><div class='add'>+	c = prcm_clear_mod_irqs(WKUP_MOD, 1,</div><div class='add'>+		~(OMAP3430_ST_IO_MASK | OMAP3430_ST_IO_CHAIN_MASK));</div><div class='ctx'> </div><div class='del'>-	return c;</div><div class='add'>+	return c ? IRQ_HANDLED : IRQ_NONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * PRCM Interrupt Handler</div><div class='del'>- *</div><div class='del'>- * The PRM_IRQSTATUS_MPU register indicates if there are any pending</div><div class='del'>- * interrupts from the PRCM for the MPU. These bits must be cleared in</div><div class='del'>- * order to clear the PRCM interrupt. The PRCM interrupt handler is</div><div class='del'>- * implemented to simply clear the PRM_IRQSTATUS_MPU in order to clear</div><div class='del'>- * the PRCM interrupt. Please note that bit 0 of the PRM_IRQSTATUS_MPU</div><div class='del'>- * register indicates that a wake-up event is pending for the MPU and</div><div class='del'>- * this bit can only be cleared if the all the wake-up events latched</div><div class='del'>- * in the various PM_WKST_x registers have been cleared. The interrupt</div><div class='del'>- * handler is implemented using a do-while loop so that if a wake-up</div><div class='del'>- * event occurred during the processing of the prcm interrupt handler</div><div class='del'>- * (setting a bit in the corresponding PM_WKST_x register and thus</div><div class='del'>- * preventing us from clearing bit 0 of the PRM_IRQSTATUS_MPU register)</div><div class='del'>- * this would be handled.</div><div class='del'>- */</div><div class='del'>-static irqreturn_t prcm_interrupt_handler (int irq, void *dev_id)</div><div class='add'>+static irqreturn_t _prcm_int_handle_wakeup(int irq, void *unused)</div><div class='ctx'> {</div><div class='del'>-	u32 irqenable_mpu, irqstatus_mpu;</div><div class='del'>-	int c = 0;</div><div class='del'>-</div><div class='del'>-	irqenable_mpu = omap2_prm_read_mod_reg(OCP_MOD,</div><div class='del'>-					 OMAP3_PRM_IRQENABLE_MPU_OFFSET);</div><div class='del'>-	irqstatus_mpu = omap2_prm_read_mod_reg(OCP_MOD,</div><div class='del'>-					 OMAP3_PRM_IRQSTATUS_MPU_OFFSET);</div><div class='del'>-	irqstatus_mpu &amp;= irqenable_mpu;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		if (irqstatus_mpu &amp; (OMAP3430_WKUP_ST_MASK |</div><div class='del'>-				     OMAP3430_IO_ST_MASK)) {</div><div class='del'>-			c = _prcm_int_handle_wakeup();</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Is the MPU PRCM interrupt handler racing with the</div><div class='del'>-			 * IVA2 PRCM interrupt handler ?</div><div class='del'>-			 */</div><div class='del'>-			WARN(c == 0, "prcm: WARNING: PRCM indicated MPU wakeup "</div><div class='del'>-			     "but no wakeup sources are marked\n");</div><div class='del'>-		} else {</div><div class='del'>-			/* XXX we need to expand our PRCM interrupt handler */</div><div class='del'>-			WARN(1, "prcm: WARNING: PRCM interrupt received, but "</div><div class='del'>-			     "no code to handle it (%08x)\n", irqstatus_mpu);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		omap2_prm_write_mod_reg(irqstatus_mpu, OCP_MOD,</div><div class='del'>-					OMAP3_PRM_IRQSTATUS_MPU_OFFSET);</div><div class='del'>-</div><div class='del'>-		irqstatus_mpu = omap2_prm_read_mod_reg(OCP_MOD,</div><div class='del'>-					OMAP3_PRM_IRQSTATUS_MPU_OFFSET);</div><div class='del'>-		irqstatus_mpu &amp;= irqenable_mpu;</div><div class='add'>+	int c;</div><div class='ctx'> </div><div class='del'>-	} while (irqstatus_mpu);</div><div class='add'>+	/*</div><div class='add'>+	 * Clear all except ST_IO and ST_IO_CHAIN for wkup module,</div><div class='add'>+	 * these are handled in a separate handler to avoid acking</div><div class='add'>+	 * IO events before parsing in mux code</div><div class='add'>+	 */</div><div class='add'>+	c = prcm_clear_mod_irqs(WKUP_MOD, 1,</div><div class='add'>+		OMAP3430_ST_IO_MASK | OMAP3430_ST_IO_CHAIN_MASK);</div><div class='add'>+	c += prcm_clear_mod_irqs(CORE_MOD, 1, 0);</div><div class='add'>+	c += prcm_clear_mod_irqs(OMAP3430_PER_MOD, 1, 0);</div><div class='add'>+	if (omap_rev() &gt; OMAP3430_REV_ES1_0) {</div><div class='add'>+		c += prcm_clear_mod_irqs(CORE_MOD, 3, 0);</div><div class='add'>+		c += prcm_clear_mod_irqs(OMAP3430ES2_USBHOST_MOD, 1, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return IRQ_HANDLED;</div><div class='add'>+	return c ? IRQ_HANDLED : IRQ_NONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void omap34xx_save_context(u32 *save)</div><div class='hunk'>@@ -375,20 +326,11 @@ void omap_sram_idle(void)</div><div class='ctx'> 			omap3_enable_io_chain();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Block console output in case it is on one of the OMAP UARTs */</div><div class='del'>-	if (!is_suspending())</div><div class='del'>-		if (per_next_state &lt; PWRDM_POWER_ON ||</div><div class='del'>-		    core_next_state &lt; PWRDM_POWER_ON)</div><div class='del'>-			if (!console_trylock())</div><div class='del'>-				goto console_still_active;</div><div class='del'>-</div><div class='ctx'> 	pwrdm_pre_transition();</div><div class='ctx'> </div><div class='ctx'> 	/* PER */</div><div class='ctx'> 	if (per_next_state &lt; PWRDM_POWER_ON) {</div><div class='ctx'> 		per_going_off = (per_next_state == PWRDM_POWER_OFF) ? 1 : 0;</div><div class='del'>-		omap_uart_prepare_idle(2);</div><div class='del'>-		omap_uart_prepare_idle(3);</div><div class='ctx'> 		omap2_gpio_prepare_for_idle(per_going_off);</div><div class='ctx'> 		if (per_next_state == PWRDM_POWER_OFF)</div><div class='ctx'> 				omap3_per_save_context();</div><div class='hunk'>@@ -396,8 +338,6 @@ void omap_sram_idle(void)</div><div class='ctx'> </div><div class='ctx'> 	/* CORE */</div><div class='ctx'> 	if (core_next_state &lt; PWRDM_POWER_ON) {</div><div class='del'>-		omap_uart_prepare_idle(0);</div><div class='del'>-		omap_uart_prepare_idle(1);</div><div class='ctx'> 		if (core_next_state == PWRDM_POWER_OFF) {</div><div class='ctx'> 			omap3_core_save_context();</div><div class='ctx'> 			omap3_cm_save_context();</div><div class='hunk'>@@ -446,8 +386,6 @@ void omap_sram_idle(void)</div><div class='ctx'> 			omap3_sram_restore_context();</div><div class='ctx'> 			omap2_sms_restore_context();</div><div class='ctx'> 		}</div><div class='del'>-		omap_uart_resume_idle(0);</div><div class='del'>-		omap_uart_resume_idle(1);</div><div class='ctx'> 		if (core_next_state == PWRDM_POWER_OFF)</div><div class='ctx'> 			omap2_prm_clear_mod_reg_bits(OMAP3430_AUTO_OFF_MASK,</div><div class='ctx'> 					       OMAP3430_GR_MOD,</div><div class='hunk'>@@ -463,14 +401,8 @@ void omap_sram_idle(void)</div><div class='ctx'> 		omap2_gpio_resume_after_idle();</div><div class='ctx'> 		if (per_prev_state == PWRDM_POWER_OFF)</div><div class='ctx'> 			omap3_per_restore_context();</div><div class='del'>-		omap_uart_resume_idle(2);</div><div class='del'>-		omap_uart_resume_idle(3);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!is_suspending())</div><div class='del'>-		console_unlock();</div><div class='del'>-</div><div class='del'>-console_still_active:</div><div class='ctx'> 	/* Disable IO-PAD and IO-CHAIN wakeup */</div><div class='ctx'> 	if (omap3_has_io_wakeup() &amp;&amp;</div><div class='ctx'> 	    (per_next_state &lt; PWRDM_POWER_ON ||</div><div class='hunk'>@@ -484,21 +416,11 @@ console_still_active:</div><div class='ctx'> 	clkdm_allow_idle(mpu_pwrdm-&gt;pwrdm_clkdms[0]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int omap3_can_sleep(void)</div><div class='del'>-{</div><div class='del'>-	if (!omap_uart_can_sleep())</div><div class='del'>-		return 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void omap3_pm_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> 	local_fiq_disable();</div><div class='ctx'> </div><div class='del'>-	if (!omap3_can_sleep())</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	if (omap_irq_pending() || need_resched())</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -532,7 +454,6 @@ static int omap3_pm_suspend(void)</div><div class='ctx'> 			goto restore;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	omap_uart_prepare_suspend();</div><div class='ctx'> 	omap3_intc_suspend();</div><div class='ctx'> </div><div class='ctx'> 	omap_sram_idle();</div><div class='hunk'>@@ -579,22 +500,27 @@ static int omap3_pm_begin(suspend_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	disable_hlt();</div><div class='ctx'> 	suspend_state = state;</div><div class='del'>-	omap_uart_enable_irqs(0);</div><div class='add'>+	omap_prcm_irq_prepare();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void omap3_pm_end(void)</div><div class='ctx'> {</div><div class='ctx'> 	suspend_state = PM_SUSPEND_ON;</div><div class='del'>-	omap_uart_enable_irqs(1);</div><div class='ctx'> 	enable_hlt();</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void omap3_pm_finish(void)</div><div class='add'>+{</div><div class='add'>+	omap_prcm_irq_complete();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct platform_suspend_ops omap_pm_ops = {</div><div class='ctx'> 	.begin		= omap3_pm_begin,</div><div class='ctx'> 	.end		= omap3_pm_end,</div><div class='ctx'> 	.enter		= omap3_pm_enter,</div><div class='add'>+	.finish		= omap3_pm_finish,</div><div class='ctx'> 	.valid		= suspend_valid_only_mem,</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_SUSPEND */</div><div class='hunk'>@@ -700,10 +626,6 @@ static void __init prcm_setup_regs(void)</div><div class='ctx'> 			  OMAP3430_GRPSEL_GPT1_MASK |</div><div class='ctx'> 			  OMAP3430_GRPSEL_GPT12_MASK,</div><div class='ctx'> 			  WKUP_MOD, OMAP3430_PM_MPUGRPSEL);</div><div class='del'>-	/* For some reason IO doesn't generate wakeup event even if</div><div class='del'>-	 * it is selected to mpu wakeup goup */</div><div class='del'>-	omap2_prm_write_mod_reg(OMAP3430_IO_EN_MASK | OMAP3430_WKUP_EN_MASK,</div><div class='del'>-			  OCP_MOD, OMAP3_PRM_IRQENABLE_MPU_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable PM_WKEN to support DSS LPR */</div><div class='ctx'> 	omap2_prm_write_mod_reg(OMAP3430_PM_WKEN_DSS_EN_DSS_MASK,</div><div class='hunk'>@@ -880,12 +802,21 @@ static int __init omap3_pm_init(void)</div><div class='ctx'> 	 * supervised mode for powerdomains */</div><div class='ctx'> 	prcm_setup_regs();</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(INT_34XX_PRCM_MPU_IRQ,</div><div class='del'>-			  (irq_handler_t)prcm_interrupt_handler,</div><div class='del'>-			  IRQF_DISABLED, "prcm", NULL);</div><div class='add'>+	ret = request_irq(omap_prcm_event_to_irq("wkup"),</div><div class='add'>+		_prcm_int_handle_wakeup, IRQF_NO_SUSPEND, "pm_wkup", NULL);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("pm: Failed to request pm_wkup irq\n");</div><div class='add'>+		goto err1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* IO interrupt is shared with mux code */</div><div class='add'>+	ret = request_irq(omap_prcm_event_to_irq("io"),</div><div class='add'>+		_prcm_int_handle_io, IRQF_SHARED | IRQF_NO_SUSPEND, "pm_io",</div><div class='add'>+		omap3_pm_init);</div><div class='add'>+</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		printk(KERN_ERR "request_irq failed to register for 0x%x\n",</div><div class='del'>-		       INT_34XX_PRCM_MPU_IRQ);</div><div class='add'>+		pr_err("pm: Failed to request pm_io irq\n");</div><div class='ctx'> 		goto err1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c<br/>index 59a870be8390..c264ef7219c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/pm44xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/pm44xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/pm44xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/pm44xx.c</a></div><div class='hunk'>@@ -1,8 +1,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * OMAP4 Power Management Routines</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2010 Texas Instruments, Inc.</div><div class='add'>+ * Copyright (C) 2010-2011 Texas Instruments, Inc.</div><div class='ctx'>  * Rajendra Nayak &lt;rnayak@ti.com&gt;</div><div class='add'>+ * Santosh Shilimkar &lt;santosh.shilimkar@ti.com&gt;</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 version 2 as</div><div class='hunk'>@@ -16,14 +17,17 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+#include "clockdomain.h"</div><div class='ctx'> #include "powerdomain.h"</div><div class='del'>-#include &lt;mach/omap4-common.h&gt;</div><div class='add'>+#include "pm.h"</div><div class='ctx'> </div><div class='ctx'> struct power_state {</div><div class='ctx'> 	struct powerdomain *pwrdm;</div><div class='ctx'> 	u32 next_state;</div><div class='ctx'> #ifdef CONFIG_SUSPEND</div><div class='ctx'> 	u32 saved_state;</div><div class='add'>+	u32 saved_logic_state;</div><div class='ctx'> #endif</div><div class='ctx'> 	struct list_head node;</div><div class='ctx'> };</div><div class='hunk'>@@ -33,7 +37,50 @@ static LIST_HEAD(pwrst_list);</div><div class='ctx'> #ifdef CONFIG_SUSPEND</div><div class='ctx'> static int omap4_pm_suspend(void)</div><div class='ctx'> {</div><div class='del'>-	do_wfi();</div><div class='add'>+	struct power_state *pwrst;</div><div class='add'>+	int state, ret = 0;</div><div class='add'>+	u32 cpu_id = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	/* Save current powerdomain state */</div><div class='add'>+	list_for_each_entry(pwrst, &amp;pwrst_list, node) {</div><div class='add'>+		pwrst-&gt;saved_state = pwrdm_read_next_pwrst(pwrst-&gt;pwrdm);</div><div class='add'>+		pwrst-&gt;saved_logic_state = pwrdm_read_logic_retst(pwrst-&gt;pwrdm);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set targeted power domain states by suspend */</div><div class='add'>+	list_for_each_entry(pwrst, &amp;pwrst_list, node) {</div><div class='add'>+		omap_set_pwrdm_state(pwrst-&gt;pwrdm, pwrst-&gt;next_state);</div><div class='add'>+		pwrdm_set_logic_retst(pwrst-&gt;pwrdm, PWRDM_POWER_OFF);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For MPUSS to hit power domain retention(CSWR or OSWR),</div><div class='add'>+	 * CPU0 and CPU1 power domains need to be in OFF or DORMANT state,</div><div class='add'>+	 * since CPU power domain CSWR is not supported by hardware</div><div class='add'>+	 * Only master CPU follows suspend path. All other CPUs follow</div><div class='add'>+	 * CPU hotplug path in system wide suspend. On OMAP4, CPU power</div><div class='add'>+	 * domain CSWR is not supported by hardware.</div><div class='add'>+	 * More details can be found in OMAP4430 TRM section 4.3.4.2.</div><div class='add'>+	 */</div><div class='add'>+	omap4_enter_lowpower(cpu_id, PWRDM_POWER_OFF);</div><div class='add'>+</div><div class='add'>+	/* Restore next powerdomain state */</div><div class='add'>+	list_for_each_entry(pwrst, &amp;pwrst_list, node) {</div><div class='add'>+		state = pwrdm_read_prev_pwrst(pwrst-&gt;pwrdm);</div><div class='add'>+		if (state &gt; pwrst-&gt;next_state) {</div><div class='add'>+			pr_info("Powerdomain (%s) didn't enter "</div><div class='add'>+			       "target state %d\n",</div><div class='add'>+			       pwrst-&gt;pwrdm-&gt;name, pwrst-&gt;next_state);</div><div class='add'>+			ret = -1;</div><div class='add'>+		}</div><div class='add'>+		omap_set_pwrdm_state(pwrst-&gt;pwrdm, pwrst-&gt;saved_state);</div><div class='add'>+		pwrdm_set_logic_retst(pwrst-&gt;pwrdm, pwrst-&gt;saved_logic_state);</div><div class='add'>+	}</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_crit("Could not enter target state in pm_suspend\n");</div><div class='add'>+	else</div><div class='add'>+		pr_info("Successfully put all powerdomains to target state\n");</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -73,6 +120,22 @@ static const struct platform_suspend_ops omap_pm_ops = {</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_SUSPEND */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Enable hardware supervised mode for all clockdomains if it's</div><div class='add'>+ * supported. Initiate sleep transition for other clockdomains, if</div><div class='add'>+ * they are not used</div><div class='add'>+ */</div><div class='add'>+static int __init clkdms_setup(struct clockdomain *clkdm, void *unused)</div><div class='add'>+{</div><div class='add'>+	if (clkdm-&gt;flags &amp; CLKDM_CAN_ENABLE_AUTO)</div><div class='add'>+		clkdm_allow_idle(clkdm);</div><div class='add'>+	else if (clkdm-&gt;flags &amp; CLKDM_CAN_FORCE_SLEEP &amp;&amp;</div><div class='add'>+			atomic_read(&amp;clkdm-&gt;usecount) == 0)</div><div class='add'>+		clkdm_sleep(clkdm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)</div><div class='ctx'> {</div><div class='ctx'> 	struct power_state *pwrst;</div><div class='hunk'>@@ -80,14 +143,48 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)</div><div class='ctx'> 	if (!pwrdm-&gt;pwrsts)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Skip CPU0 and CPU1 power domains. CPU1 is programmed</div><div class='add'>+	 * through hotplug path and CPU0 explicitly programmed</div><div class='add'>+	 * further down in the code path</div><div class='add'>+	 */</div><div class='add'>+	if (!strncmp(pwrdm-&gt;name, "cpu", 3))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * FIXME: Remove this check when core retention is supported</div><div class='add'>+	 * Only MPUSS power domain is added in the list.</div><div class='add'>+	 */</div><div class='add'>+	if (strcmp(pwrdm-&gt;name, "mpu_pwrdm"))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	pwrst = kmalloc(sizeof(struct power_state), GFP_ATOMIC);</div><div class='ctx'> 	if (!pwrst)</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	pwrst-&gt;pwrdm = pwrdm;</div><div class='del'>-	pwrst-&gt;next_state = PWRDM_POWER_ON;</div><div class='add'>+	pwrst-&gt;next_state = PWRDM_POWER_RET;</div><div class='ctx'> 	list_add(&amp;pwrst-&gt;node, &amp;pwrst_list);</div><div class='ctx'> </div><div class='del'>-	return pwrdm_set_next_pwrst(pwrst-&gt;pwrdm, pwrst-&gt;next_state);</div><div class='add'>+	return omap_set_pwrdm_state(pwrst-&gt;pwrdm, pwrst-&gt;next_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap_default_idle - OMAP4 default ilde routine.'</div><div class='add'>+ *</div><div class='add'>+ * Implements OMAP4 memory, IO ordering requirements which can't be addressed</div><div class='add'>+ * with default arch_idle() hook. Used by all CPUs with !CONFIG_CPUIDLE and</div><div class='add'>+ * by secondary CPU with CONFIG_CPUIDLE.</div><div class='add'>+ */</div><div class='add'>+static void omap_default_idle(void)</div><div class='add'>+{</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	local_fiq_disable();</div><div class='add'>+</div><div class='add'>+	omap_do_wfi();</div><div class='add'>+</div><div class='add'>+	local_fiq_enable();</div><div class='add'>+	local_irq_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -99,10 +196,17 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)</div><div class='ctx'> static int __init omap4_pm_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	struct clockdomain *emif_clkdm, *mpuss_clkdm, *l3_1_clkdm;</div><div class='add'>+	struct clockdomain *ducati_clkdm, *l3_2_clkdm, *l4_per_clkdm;</div><div class='ctx'> </div><div class='ctx'> 	if (!cpu_is_omap44xx())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='add'>+	if (omap_rev() == OMAP4430_REV_ES1_0) {</div><div class='add'>+		WARN(1, "Power Management not supported on OMAP4430 ES1.0\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	pr_err("Power Management for TI OMAP4.\n");</div><div class='ctx'> </div><div class='ctx'> 	ret = pwrdm_for_each(pwrdms_setup, NULL);</div><div class='hunk'>@@ -111,10 +215,51 @@ static int __init omap4_pm_init(void)</div><div class='ctx'> 		goto err2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * The dynamic dependency between MPUSS -&gt; MEMIF and</div><div class='add'>+	 * MPUSS -&gt; L4_PER/L3_* and DUCATI -&gt; L3_* doesn't work as</div><div class='add'>+	 * expected. The hardware recommendation is to enable static</div><div class='add'>+	 * dependencies for these to avoid system lock ups or random crashes.</div><div class='add'>+	 */</div><div class='add'>+	mpuss_clkdm = clkdm_lookup("mpuss_clkdm");</div><div class='add'>+	emif_clkdm = clkdm_lookup("l3_emif_clkdm");</div><div class='add'>+	l3_1_clkdm = clkdm_lookup("l3_1_clkdm");</div><div class='add'>+	l3_2_clkdm = clkdm_lookup("l3_2_clkdm");</div><div class='add'>+	l4_per_clkdm = clkdm_lookup("l4_per_clkdm");</div><div class='add'>+	ducati_clkdm = clkdm_lookup("ducati_clkdm");</div><div class='add'>+	if ((!mpuss_clkdm) || (!emif_clkdm) || (!l3_1_clkdm) ||</div><div class='add'>+		(!l3_2_clkdm) || (!ducati_clkdm) || (!l4_per_clkdm))</div><div class='add'>+		goto err2;</div><div class='add'>+</div><div class='add'>+	ret = clkdm_add_wkdep(mpuss_clkdm, emif_clkdm);</div><div class='add'>+	ret |= clkdm_add_wkdep(mpuss_clkdm, l3_1_clkdm);</div><div class='add'>+	ret |= clkdm_add_wkdep(mpuss_clkdm, l3_2_clkdm);</div><div class='add'>+	ret |= clkdm_add_wkdep(mpuss_clkdm, l4_per_clkdm);</div><div class='add'>+	ret |= clkdm_add_wkdep(ducati_clkdm, l3_1_clkdm);</div><div class='add'>+	ret |= clkdm_add_wkdep(ducati_clkdm, l3_2_clkdm);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Failed to add MPUSS -&gt; L3/EMIF/L4PER, DUCATI -&gt; L3 "</div><div class='add'>+				"wakeup dependency\n");</div><div class='add'>+		goto err2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = omap4_mpuss_init();</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Failed to initialise OMAP4 MPUSS\n");</div><div class='add'>+		goto err2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	(void) clkdm_for_each(clkdms_setup, NULL);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SUSPEND</div><div class='ctx'> 	suspend_set_ops(&amp;omap_pm_ops);</div><div class='ctx'> #endif /* CONFIG_SUSPEND */</div><div class='ctx'> </div><div class='add'>+	/* Overwrite the default arch_idle() */</div><div class='add'>+	pm_idle = omap_default_idle;</div><div class='add'>+</div><div class='add'>+	omap4_idle_init();</div><div class='add'>+</div><div class='ctx'> err2:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-omap2/prcm-common.h b/arch/arm/mach-omap2/prcm-common.h<br/>index 0363dcb0ef93..5aa5435e3ff1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prcm-common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/prcm-common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prcm-common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/prcm-common.h</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * OMAP2/3 PRCM base and module definitions</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2007-2009 Texas Instruments, Inc.</div><div class='add'>+ * Copyright (C) 2007-2009, 2011 Texas Instruments, Inc.</div><div class='ctx'>  * Copyright (C) 2007-2009 Nokia Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * Written by Paul Walmsley</div><div class='hunk'>@@ -201,6 +201,8 @@</div><div class='ctx'> #define OMAP3430_EN_MMC2_SHIFT				25</div><div class='ctx'> #define OMAP3430_EN_MMC1_MASK				(1 &lt;&lt; 24)</div><div class='ctx'> #define OMAP3430_EN_MMC1_SHIFT				24</div><div class='add'>+#define OMAP3430_EN_UART4_MASK				(1 &lt;&lt; 23)</div><div class='add'>+#define OMAP3430_EN_UART4_SHIFT				23</div><div class='ctx'> #define OMAP3430_EN_MCSPI4_MASK				(1 &lt;&lt; 21)</div><div class='ctx'> #define OMAP3430_EN_MCSPI4_SHIFT			21</div><div class='ctx'> #define OMAP3430_EN_MCSPI3_MASK				(1 &lt;&lt; 20)</div><div class='hunk'>@@ -408,6 +410,79 @@</div><div class='ctx'> extern void __iomem *prm_base;</div><div class='ctx'> extern void __iomem *cm_base;</div><div class='ctx'> extern void __iomem *cm2_base;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct omap_prcm_irq - describes a PRCM interrupt bit</div><div class='add'>+ * @name: a short name describing the interrupt type, e.g. "wkup" or "io"</div><div class='add'>+ * @offset: the bit shift of the interrupt inside the IRQ{ENABLE,STATUS} regs</div><div class='add'>+ * @priority: should this interrupt be handled before @priority=false IRQs?</div><div class='add'>+ *</div><div class='add'>+ * Describes interrupt bits inside the PRM_IRQ{ENABLE,STATUS}_MPU* registers.</div><div class='add'>+ * On systems with multiple PRM MPU IRQ registers, the bitfields read from</div><div class='add'>+ * the registers are concatenated, so @offset could be &gt; 31 on these systems -</div><div class='add'>+ * see omap_prm_irq_handler() for more details.  I/O ring interrupts should</div><div class='add'>+ * have @priority set to true.</div><div class='add'>+ */</div><div class='add'>+struct omap_prcm_irq {</div><div class='add'>+	const char *name;</div><div class='add'>+	unsigned int offset;</div><div class='add'>+	bool priority;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct omap_prcm_irq_setup - PRCM interrupt controller details</div><div class='add'>+ * @ack: PRM register offset for the first PRM_IRQSTATUS_MPU register</div><div class='add'>+ * @mask: PRM register offset for the first PRM_IRQENABLE_MPU register</div><div class='add'>+ * @nr_regs: number of PRM_IRQ{STATUS,ENABLE}_MPU* registers</div><div class='add'>+ * @nr_irqs: number of entries in the @irqs array</div><div class='add'>+ * @irqs: ptr to an array of PRCM interrupt bits (see @nr_irqs)</div><div class='add'>+ * @irq: MPU IRQ asserted when a PRCM interrupt arrives</div><div class='add'>+ * @read_pending_irqs: fn ptr to determine if any PRCM IRQs are pending</div><div class='add'>+ * @ocp_barrier: fn ptr to force buffered PRM writes to complete</div><div class='add'>+ * @save_and_clear_irqen: fn ptr to save and clear IRQENABLE regs</div><div class='add'>+ * @restore_irqen: fn ptr to save and clear IRQENABLE regs</div><div class='add'>+ * @saved_mask: IRQENABLE regs are saved here during suspend</div><div class='add'>+ * @priority_mask: 1 bit per IRQ, set to 1 if omap_prcm_irq.priority = true</div><div class='add'>+ * @base_irq: base dynamic IRQ number, returned from irq_alloc_descs() in init</div><div class='add'>+ * @suspended: set to true after Linux suspend code has called our -&gt;prepare()</div><div class='add'>+ * @suspend_save_flag: set to true after IRQ masks have been saved and disabled</div><div class='add'>+ *</div><div class='add'>+ * @saved_mask, @priority_mask, @base_irq, @suspended, and</div><div class='add'>+ * @suspend_save_flag are populated dynamically, and are not to be</div><div class='add'>+ * specified in static initializers.</div><div class='add'>+ */</div><div class='add'>+struct omap_prcm_irq_setup {</div><div class='add'>+	u16 ack;</div><div class='add'>+	u16 mask;</div><div class='add'>+	u8 nr_regs;</div><div class='add'>+	u8 nr_irqs;</div><div class='add'>+	const struct omap_prcm_irq *irqs;</div><div class='add'>+	int irq;</div><div class='add'>+	void (*read_pending_irqs)(unsigned long *events);</div><div class='add'>+	void (*ocp_barrier)(void);</div><div class='add'>+	void (*save_and_clear_irqen)(u32 *saved_mask);</div><div class='add'>+	void (*restore_irqen)(u32 *saved_mask);</div><div class='add'>+	u32 *saved_mask;</div><div class='add'>+	u32 *priority_mask;</div><div class='add'>+	int base_irq;</div><div class='add'>+	bool suspended;</div><div class='add'>+	bool suspend_save_flag;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* OMAP_PRCM_IRQ: convenience macro for creating struct omap_prcm_irq records */</div><div class='add'>+#define OMAP_PRCM_IRQ(_name, _offset, _priority) {	\</div><div class='add'>+	.name = _name,					\</div><div class='add'>+	.offset = _offset,				\</div><div class='add'>+	.priority = _priority				\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+extern void omap_prcm_irq_cleanup(void);</div><div class='add'>+extern int omap_prcm_register_chain_handler(</div><div class='add'>+	struct omap_prcm_irq_setup *irq_setup);</div><div class='add'>+extern int omap_prcm_event_to_irq(const char *event);</div><div class='add'>+extern void omap_prcm_irq_prepare(void);</div><div class='add'>+extern void omap_prcm_irq_complete(void);</div><div class='add'>+</div><div class='ctx'> # endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c<br/>index 597e2da831b3..626acfad7190 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prcm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/prcm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prcm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/prcm.c</a></div><div class='hunk'>@@ -25,8 +25,7 @@</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='del'>-#include &lt;mach/system.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/prcm.h&gt;</div><div class='ctx'> #include &lt;plat/irqs.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -59,7 +58,7 @@ u32 omap_prcm_get_reset_sources(void)</div><div class='ctx'> EXPORT_SYMBOL(omap_prcm_get_reset_sources);</div><div class='ctx'> </div><div class='ctx'> /* Resets clock rates and reboots the system. Only called from system.h */</div><div class='del'>-static void omap_prcm_arch_reset(char mode, const char *cmd)</div><div class='add'>+void omap_prcm_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	s16 prcm_offs = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -110,8 +109,6 @@ static void omap_prcm_arch_reset(char mode, const char *cmd)</div><div class='ctx'> 	omap2_prm_read_mod_reg(prcm_offs, OMAP2_RM_RSTCTRL); /* OCP barrier */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void (*arch_reset)(char, const char *) = omap_prcm_arch_reset;</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * omap2_cm_wait_idlest - wait for IDLEST bit to indicate module readiness</div><div class='ctx'>  * @reg: physical address of module IDLEST register</div><div class='head'>diff --git a/arch/arm/mach-omap2/prcm_mpu44xx.c b/arch/arm/mach-omap2/prcm_mpu44xx.c<br/>index 171fe171a749..ca669b50f390 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prcm_mpu44xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/prcm_mpu44xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prcm_mpu44xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/prcm_mpu44xx.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #include "prcm_mpu44xx.h"</div><div class='ctx'> #include "cm-regbits-44xx.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.c b/arch/arm/mach-omap2/prm2xxx_3xxx.c<br/>index f02d87f68e54..c1c4d86a79a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prm2xxx_3xxx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/prm2xxx_3xxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prm2xxx_3xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/prm2xxx_3xxx.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * OMAP2/3 PRM module functions</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2010 Texas Instruments, Inc.</div><div class='add'>+ * Copyright (C) 2010-2011 Texas Instruments, Inc.</div><div class='ctx'>  * Copyright (C) 2010 Nokia Corporation</div><div class='ctx'>  * Benoît Cousson</div><div class='ctx'>  * Paul Walmsley</div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/prcm.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -27,6 +27,24 @@</div><div class='ctx'> #include "prm-regbits-24xx.h"</div><div class='ctx'> #include "prm-regbits-34xx.h"</div><div class='ctx'> </div><div class='add'>+static const struct omap_prcm_irq omap3_prcm_irqs[] = {</div><div class='add'>+	OMAP_PRCM_IRQ("wkup",	0,	0),</div><div class='add'>+	OMAP_PRCM_IRQ("io",	9,	1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_prcm_irq_setup omap3_prcm_irq_setup = {</div><div class='add'>+	.ack			= OMAP3_PRM_IRQSTATUS_MPU_OFFSET,</div><div class='add'>+	.mask			= OMAP3_PRM_IRQENABLE_MPU_OFFSET,</div><div class='add'>+	.nr_regs		= 1,</div><div class='add'>+	.irqs			= omap3_prcm_irqs,</div><div class='add'>+	.nr_irqs		= ARRAY_SIZE(omap3_prcm_irqs),</div><div class='add'>+	.irq			= INT_34XX_PRCM_MPU_IRQ,</div><div class='add'>+	.read_pending_irqs	= &amp;omap3xxx_prm_read_pending_irqs,</div><div class='add'>+	.ocp_barrier		= &amp;omap3xxx_prm_ocp_barrier,</div><div class='add'>+	.save_and_clear_irqen	= &amp;omap3xxx_prm_save_and_clear_irqen,</div><div class='add'>+	.restore_irqen		= &amp;omap3xxx_prm_restore_irqen,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> u32 omap2_prm_read_mod_reg(s16 module, u16 idx)</div><div class='ctx'> {</div><div class='ctx'> 	return __raw_readl(prm_base + module + idx);</div><div class='hunk'>@@ -212,3 +230,80 @@ u32 omap3_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset)</div><div class='ctx'> {</div><div class='ctx'> 	return omap2_prm_rmw_mod_reg_bits(mask, bits, OMAP3430_GR_MOD, offset);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap3xxx_prm_read_pending_irqs - read pending PRM MPU IRQs into @events</div><div class='add'>+ * @events: ptr to a u32, preallocated by caller</div><div class='add'>+ *</div><div class='add'>+ * Read PRM_IRQSTATUS_MPU bits, AND'ed with the currently-enabled PRM</div><div class='add'>+ * MPU IRQs, and store the result into the u32 pointed to by @events.</div><div class='add'>+ * No return value.</div><div class='add'>+ */</div><div class='add'>+void omap3xxx_prm_read_pending_irqs(unsigned long *events)</div><div class='add'>+{</div><div class='add'>+	u32 mask, st;</div><div class='add'>+</div><div class='add'>+	/* XXX Can the mask read be avoided (e.g., can it come from RAM?) */</div><div class='add'>+	mask = omap2_prm_read_mod_reg(OCP_MOD, OMAP3_PRM_IRQENABLE_MPU_OFFSET);</div><div class='add'>+	st = omap2_prm_read_mod_reg(OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET);</div><div class='add'>+</div><div class='add'>+	events[0] = mask &amp; st;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap3xxx_prm_ocp_barrier - force buffered MPU writes to the PRM to complete</div><div class='add'>+ *</div><div class='add'>+ * Force any buffered writes to the PRM IP block to complete.  Needed</div><div class='add'>+ * by the PRM IRQ handler, which reads and writes directly to the IP</div><div class='add'>+ * block, to avoid race conditions after acknowledging or clearing IRQ</div><div class='add'>+ * bits.  No return value.</div><div class='add'>+ */</div><div class='add'>+void omap3xxx_prm_ocp_barrier(void)</div><div class='add'>+{</div><div class='add'>+	omap2_prm_read_mod_reg(OCP_MOD, OMAP3_PRM_REVISION_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap3xxx_prm_save_and_clear_irqen - save/clear PRM_IRQENABLE_MPU reg</div><div class='add'>+ * @saved_mask: ptr to a u32 array to save IRQENABLE bits</div><div class='add'>+ *</div><div class='add'>+ * Save the PRM_IRQENABLE_MPU register to @saved_mask.  @saved_mask</div><div class='add'>+ * must be allocated by the caller.  Intended to be used in the PRM</div><div class='add'>+ * interrupt handler suspend callback.  The OCP barrier is needed to</div><div class='add'>+ * ensure the write to disable PRM interrupts reaches the PRM before</div><div class='add'>+ * returning; otherwise, spurious interrupts might occur.  No return</div><div class='add'>+ * value.</div><div class='add'>+ */</div><div class='add'>+void omap3xxx_prm_save_and_clear_irqen(u32 *saved_mask)</div><div class='add'>+{</div><div class='add'>+	saved_mask[0] = omap2_prm_read_mod_reg(OCP_MOD,</div><div class='add'>+					       OMAP3_PRM_IRQENABLE_MPU_OFFSET);</div><div class='add'>+	omap2_prm_write_mod_reg(0, OCP_MOD, OMAP3_PRM_IRQENABLE_MPU_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* OCP barrier */</div><div class='add'>+	omap2_prm_read_mod_reg(OCP_MOD, OMAP3_PRM_REVISION_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap3xxx_prm_restore_irqen - set PRM_IRQENABLE_MPU register from args</div><div class='add'>+ * @saved_mask: ptr to a u32 array of IRQENABLE bits saved previously</div><div class='add'>+ *</div><div class='add'>+ * Restore the PRM_IRQENABLE_MPU register from @saved_mask.  Intended</div><div class='add'>+ * to be used in the PRM interrupt handler resume callback to restore</div><div class='add'>+ * values saved by omap3xxx_prm_save_and_clear_irqen().  No OCP</div><div class='add'>+ * barrier should be needed here; any pending PRM interrupts will fire</div><div class='add'>+ * once the writes reach the PRM.  No return value.</div><div class='add'>+ */</div><div class='add'>+void omap3xxx_prm_restore_irqen(u32 *saved_mask)</div><div class='add'>+{</div><div class='add'>+	omap2_prm_write_mod_reg(saved_mask[0], OCP_MOD,</div><div class='add'>+				OMAP3_PRM_IRQENABLE_MPU_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init omap3xxx_prcm_init(void)</div><div class='add'>+{</div><div class='add'>+	if (cpu_is_omap34xx())</div><div class='add'>+		return omap_prcm_register_chain_handler(&amp;omap3_prcm_irq_setup);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+subsys_initcall(omap3xxx_prcm_init);</div><div class='head'>diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.h b/arch/arm/mach-omap2/prm2xxx_3xxx.h<br/>index cef533df0861..70ac2a19dc5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prm2xxx_3xxx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/prm2xxx_3xxx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prm2xxx_3xxx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/prm2xxx_3xxx.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * OMAP2/3 Power/Reset Management (PRM) register definitions</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2007-2009 Texas Instruments, Inc.</div><div class='add'>+ * Copyright (C) 2007-2009, 2011 Texas Instruments, Inc.</div><div class='ctx'>  * Copyright (C) 2008-2010 Nokia Corporation</div><div class='ctx'>  * Paul Walmsley</div><div class='ctx'>  *</div><div class='hunk'>@@ -314,6 +314,13 @@ void omap3_prm_vp_clear_txdone(u8 vp_id);</div><div class='ctx'> extern u32 omap3_prm_vcvp_read(u8 offset);</div><div class='ctx'> extern void omap3_prm_vcvp_write(u32 val, u8 offset);</div><div class='ctx'> extern u32 omap3_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset);</div><div class='add'>+</div><div class='add'>+/* PRM interrupt-related functions */</div><div class='add'>+extern void omap3xxx_prm_read_pending_irqs(unsigned long *events);</div><div class='add'>+extern void omap3xxx_prm_ocp_barrier(void);</div><div class='add'>+extern void omap3xxx_prm_save_and_clear_irqen(u32 *saved_mask);</div><div class='add'>+extern void omap3xxx_prm_restore_irqen(u32 *saved_mask);</div><div class='add'>+</div><div class='ctx'> #endif	/* CONFIG_ARCH_OMAP4 */</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c<br/>index 495a31a7e8a7..33dd655e6aab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prm44xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/prm44xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prm44xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/prm44xx.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/prcm.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -27,6 +27,24 @@</div><div class='ctx'> #include "prcm44xx.h"</div><div class='ctx'> #include "prminst44xx.h"</div><div class='ctx'> </div><div class='add'>+static const struct omap_prcm_irq omap4_prcm_irqs[] = {</div><div class='add'>+	OMAP_PRCM_IRQ("wkup",   0,      0),</div><div class='add'>+	OMAP_PRCM_IRQ("io",     9,      1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_prcm_irq_setup omap4_prcm_irq_setup = {</div><div class='add'>+	.ack			= OMAP4_PRM_IRQSTATUS_MPU_OFFSET,</div><div class='add'>+	.mask			= OMAP4_PRM_IRQENABLE_MPU_OFFSET,</div><div class='add'>+	.nr_regs		= 2,</div><div class='add'>+	.irqs			= omap4_prcm_irqs,</div><div class='add'>+	.nr_irqs		= ARRAY_SIZE(omap4_prcm_irqs),</div><div class='add'>+	.irq			= OMAP44XX_IRQ_PRCM,</div><div class='add'>+	.read_pending_irqs	= &amp;omap44xx_prm_read_pending_irqs,</div><div class='add'>+	.ocp_barrier		= &amp;omap44xx_prm_ocp_barrier,</div><div class='add'>+	.save_and_clear_irqen	= &amp;omap44xx_prm_save_and_clear_irqen,</div><div class='add'>+	.restore_irqen		= &amp;omap44xx_prm_restore_irqen,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* PRM low-level functions */</div><div class='ctx'> </div><div class='ctx'> /* Read a register in a CM/PRM instance in the PRM module */</div><div class='hunk'>@@ -121,3 +139,101 @@ u32 omap4_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset)</div><div class='ctx'> 					       OMAP4430_PRM_DEVICE_INST,</div><div class='ctx'> 					       offset);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline u32 _read_pending_irq_reg(u16 irqen_offs, u16 irqst_offs)</div><div class='add'>+{</div><div class='add'>+	u32 mask, st;</div><div class='add'>+</div><div class='add'>+	/* XXX read mask from RAM? */</div><div class='add'>+	mask = omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST, irqen_offs);</div><div class='add'>+	st = omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST, irqst_offs);</div><div class='add'>+</div><div class='add'>+	return mask &amp; st;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap44xx_prm_read_pending_irqs - read pending PRM MPU IRQs into @events</div><div class='add'>+ * @events: ptr to two consecutive u32s, preallocated by caller</div><div class='add'>+ *</div><div class='add'>+ * Read PRM_IRQSTATUS_MPU* bits, AND'ed with the currently-enabled PRM</div><div class='add'>+ * MPU IRQs, and store the result into the two u32s pointed to by @events.</div><div class='add'>+ * No return value.</div><div class='add'>+ */</div><div class='add'>+void omap44xx_prm_read_pending_irqs(unsigned long *events)</div><div class='add'>+{</div><div class='add'>+	events[0] = _read_pending_irq_reg(OMAP4_PRM_IRQENABLE_MPU_OFFSET,</div><div class='add'>+					  OMAP4_PRM_IRQSTATUS_MPU_OFFSET);</div><div class='add'>+</div><div class='add'>+	events[1] = _read_pending_irq_reg(OMAP4_PRM_IRQENABLE_MPU_2_OFFSET,</div><div class='add'>+					  OMAP4_PRM_IRQSTATUS_MPU_2_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap44xx_prm_ocp_barrier - force buffered MPU writes to the PRM to complete</div><div class='add'>+ *</div><div class='add'>+ * Force any buffered writes to the PRM IP block to complete.  Needed</div><div class='add'>+ * by the PRM IRQ handler, which reads and writes directly to the IP</div><div class='add'>+ * block, to avoid race conditions after acknowledging or clearing IRQ</div><div class='add'>+ * bits.  No return value.</div><div class='add'>+ */</div><div class='add'>+void omap44xx_prm_ocp_barrier(void)</div><div class='add'>+{</div><div class='add'>+	omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST,</div><div class='add'>+				OMAP4_REVISION_PRM_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap44xx_prm_save_and_clear_irqen - save/clear PRM_IRQENABLE_MPU* regs</div><div class='add'>+ * @saved_mask: ptr to a u32 array to save IRQENABLE bits</div><div class='add'>+ *</div><div class='add'>+ * Save the PRM_IRQENABLE_MPU and PRM_IRQENABLE_MPU_2 registers to</div><div class='add'>+ * @saved_mask.  @saved_mask must be allocated by the caller.</div><div class='add'>+ * Intended to be used in the PRM interrupt handler suspend callback.</div><div class='add'>+ * The OCP barrier is needed to ensure the write to disable PRM</div><div class='add'>+ * interrupts reaches the PRM before returning; otherwise, spurious</div><div class='add'>+ * interrupts might occur.  No return value.</div><div class='add'>+ */</div><div class='add'>+void omap44xx_prm_save_and_clear_irqen(u32 *saved_mask)</div><div class='add'>+{</div><div class='add'>+	saved_mask[0] =</div><div class='add'>+		omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST,</div><div class='add'>+					OMAP4_PRM_IRQSTATUS_MPU_OFFSET);</div><div class='add'>+	saved_mask[1] =</div><div class='add'>+		omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST,</div><div class='add'>+					OMAP4_PRM_IRQSTATUS_MPU_2_OFFSET);</div><div class='add'>+</div><div class='add'>+	omap4_prm_write_inst_reg(0, OMAP4430_PRM_DEVICE_INST,</div><div class='add'>+				 OMAP4_PRM_IRQENABLE_MPU_OFFSET);</div><div class='add'>+	omap4_prm_write_inst_reg(0, OMAP4430_PRM_DEVICE_INST,</div><div class='add'>+				 OMAP4_PRM_IRQENABLE_MPU_2_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* OCP barrier */</div><div class='add'>+	omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST,</div><div class='add'>+				OMAP4_REVISION_PRM_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap44xx_prm_restore_irqen - set PRM_IRQENABLE_MPU* registers from args</div><div class='add'>+ * @saved_mask: ptr to a u32 array of IRQENABLE bits saved previously</div><div class='add'>+ *</div><div class='add'>+ * Restore the PRM_IRQENABLE_MPU and PRM_IRQENABLE_MPU_2 registers from</div><div class='add'>+ * @saved_mask.  Intended to be used in the PRM interrupt handler resume</div><div class='add'>+ * callback to restore values saved by omap44xx_prm_save_and_clear_irqen().</div><div class='add'>+ * No OCP barrier should be needed here; any pending PRM interrupts will fire</div><div class='add'>+ * once the writes reach the PRM.  No return value.</div><div class='add'>+ */</div><div class='add'>+void omap44xx_prm_restore_irqen(u32 *saved_mask)</div><div class='add'>+{</div><div class='add'>+	omap4_prm_write_inst_reg(saved_mask[0], OMAP4430_PRM_DEVICE_INST,</div><div class='add'>+				 OMAP4_PRM_IRQENABLE_MPU_OFFSET);</div><div class='add'>+	omap4_prm_write_inst_reg(saved_mask[1], OMAP4430_PRM_DEVICE_INST,</div><div class='add'>+				 OMAP4_PRM_IRQENABLE_MPU_2_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init omap4xxx_prcm_init(void)</div><div class='add'>+{</div><div class='add'>+	if (cpu_is_omap44xx())</div><div class='add'>+		return omap_prcm_register_chain_handler(&amp;omap4_prcm_irq_setup);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+subsys_initcall(omap4xxx_prcm_init);</div><div class='head'>diff --git a/arch/arm/mach-omap2/prm44xx.h b/arch/arm/mach-omap2/prm44xx.h<br/>index 3d66ccd849d2..7978092946db 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prm44xx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/prm44xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prm44xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/prm44xx.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * OMAP44xx PRM instance offset macros</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2009-2010 Texas Instruments, Inc.</div><div class='add'>+ * Copyright (C) 2009-2011 Texas Instruments, Inc.</div><div class='ctx'>  * Copyright (C) 2009-2010 Nokia Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * Paul Walmsley (paul@pwsan.com)</div><div class='hunk'>@@ -763,6 +763,12 @@ extern u32 omap4_prm_vcvp_read(u8 offset);</div><div class='ctx'> extern void omap4_prm_vcvp_write(u32 val, u8 offset);</div><div class='ctx'> extern u32 omap4_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset);</div><div class='ctx'> </div><div class='add'>+/* PRM interrupt-related functions */</div><div class='add'>+extern void omap44xx_prm_read_pending_irqs(unsigned long *events);</div><div class='add'>+extern void omap44xx_prm_ocp_barrier(void);</div><div class='add'>+extern void omap44xx_prm_save_and_clear_irqen(u32 *saved_mask);</div><div class='add'>+extern void omap44xx_prm_restore_irqen(u32 *saved_mask);</div><div class='add'>+</div><div class='ctx'> # endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c<br/>new file mode 100644<br/>index 000000000000..860118ab43e2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prm_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/prm_common.c</a></div><div class='hunk'>@@ -0,0 +1,320 @@</div><div class='add'>+/*</div><div class='add'>+ * OMAP2+ common Power &amp; Reset Management (PRM) IP block functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments, Inc.</div><div class='add'>+ * Tero Kristo &lt;t-kristo@ti.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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * For historical purposes, the API used to configure the PRM</div><div class='add'>+ * interrupt handler refers to it as the "PRCM interrupt."  The</div><div class='add'>+ * underlying registers are located in the PRM on OMAP3/4.</div><div class='add'>+ *</div><div class='add'>+ * XXX This code should eventually be moved to a PRM driver.</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/io.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/system.h&gt;</div><div class='add'>+#include &lt;plat/common.h&gt;</div><div class='add'>+#include &lt;plat/prcm.h&gt;</div><div class='add'>+#include &lt;plat/irqs.h&gt;</div><div class='add'>+</div><div class='add'>+#include "prm2xxx_3xxx.h"</div><div class='add'>+#include "prm44xx.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * OMAP_PRCM_MAX_NR_PENDING_REG: maximum number of PRM_IRQ*_MPU regs</div><div class='add'>+ * XXX this is technically not needed, since</div><div class='add'>+ * omap_prcm_register_chain_handler() could allocate this based on the</div><div class='add'>+ * actual amount of memory needed for the SoC</div><div class='add'>+ */</div><div class='add'>+#define OMAP_PRCM_MAX_NR_PENDING_REG		2</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * prcm_irq_chips: an array of all of the "generic IRQ chips" in use</div><div class='add'>+ * by the PRCM interrupt handler code.  There will be one 'chip' per</div><div class='add'>+ * PRM_{IRQSTATUS,IRQENABLE}_MPU register pair.  (So OMAP3 will have</div><div class='add'>+ * one "chip" and OMAP4 will have two.)</div><div class='add'>+ */</div><div class='add'>+static struct irq_chip_generic **prcm_irq_chips;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * prcm_irq_setup: the PRCM IRQ parameters for the hardware the code</div><div class='add'>+ * is currently running on.  Defined and passed by initialization code</div><div class='add'>+ * that calls omap_prcm_register_chain_handler().</div><div class='add'>+ */</div><div class='add'>+static struct omap_prcm_irq_setup *prcm_irq_setup;</div><div class='add'>+</div><div class='add'>+/* Private functions */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Move priority events from events to priority_events array</div><div class='add'>+ */</div><div class='add'>+static void omap_prcm_events_filter_priority(unsigned long *events,</div><div class='add'>+	unsigned long *priority_events)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; prcm_irq_setup-&gt;nr_regs; i++) {</div><div class='add'>+		priority_events[i] =</div><div class='add'>+			events[i] &amp; prcm_irq_setup-&gt;priority_mask[i];</div><div class='add'>+		events[i] ^= priority_events[i];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PRCM Interrupt Handler</div><div class='add'>+ *</div><div class='add'>+ * This is a common handler for the OMAP PRCM interrupts. Pending</div><div class='add'>+ * interrupts are detected by a call to prcm_pending_events and</div><div class='add'>+ * dispatched accordingly. Clearing of the wakeup events should be</div><div class='add'>+ * done by the SoC specific individual handlers.</div><div class='add'>+ */</div><div class='add'>+static void omap_prcm_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	unsigned long pending[OMAP_PRCM_MAX_NR_PENDING_REG];</div><div class='add'>+	unsigned long priority_pending[OMAP_PRCM_MAX_NR_PENDING_REG];</div><div class='add'>+	struct irq_chip *chip = irq_desc_get_chip(desc);</div><div class='add'>+	unsigned int virtirq;</div><div class='add'>+	int nr_irqs = prcm_irq_setup-&gt;nr_regs * 32;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we are suspended, mask all interrupts from PRCM level,</div><div class='add'>+	 * this does not ack them, and they will be pending until we</div><div class='add'>+	 * re-enable the interrupts, at which point the</div><div class='add'>+	 * omap_prcm_irq_handler will be executed again.  The</div><div class='add'>+	 * _save_and_clear_irqen() function must ensure that the PRM</div><div class='add'>+	 * write to disable all IRQs has reached the PRM before</div><div class='add'>+	 * returning, or spurious PRCM interrupts may occur during</div><div class='add'>+	 * suspend.</div><div class='add'>+	 */</div><div class='add'>+	if (prcm_irq_setup-&gt;suspended) {</div><div class='add'>+		prcm_irq_setup-&gt;save_and_clear_irqen(prcm_irq_setup-&gt;saved_mask);</div><div class='add'>+		prcm_irq_setup-&gt;suspend_save_flag = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Loop until all pending irqs are handled, since</div><div class='add'>+	 * generic_handle_irq() can cause new irqs to come</div><div class='add'>+	 */</div><div class='add'>+	while (!prcm_irq_setup-&gt;suspended) {</div><div class='add'>+		prcm_irq_setup-&gt;read_pending_irqs(pending);</div><div class='add'>+</div><div class='add'>+		/* No bit set, then all IRQs are handled */</div><div class='add'>+		if (find_first_bit(pending, nr_irqs) &gt;= nr_irqs)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		omap_prcm_events_filter_priority(pending, priority_pending);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Loop on all currently pending irqs so that new irqs</div><div class='add'>+		 * cannot starve previously pending irqs</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		/* Serve priority events first */</div><div class='add'>+		for_each_set_bit(virtirq, priority_pending, nr_irqs)</div><div class='add'>+			generic_handle_irq(prcm_irq_setup-&gt;base_irq + virtirq);</div><div class='add'>+</div><div class='add'>+		/* Serve normal events next */</div><div class='add'>+		for_each_set_bit(virtirq, pending, nr_irqs)</div><div class='add'>+			generic_handle_irq(prcm_irq_setup-&gt;base_irq + virtirq);</div><div class='add'>+	}</div><div class='add'>+	if (chip-&gt;irq_ack)</div><div class='add'>+		chip-&gt;irq_ack(&amp;desc-&gt;irq_data);</div><div class='add'>+	if (chip-&gt;irq_eoi)</div><div class='add'>+		chip-&gt;irq_eoi(&amp;desc-&gt;irq_data);</div><div class='add'>+	chip-&gt;irq_unmask(&amp;desc-&gt;irq_data);</div><div class='add'>+</div><div class='add'>+	prcm_irq_setup-&gt;ocp_barrier(); /* avoid spurious IRQs */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Public functions */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap_prcm_event_to_irq - given a PRCM event name, returns the</div><div class='add'>+ * corresponding IRQ on which the handler should be registered</div><div class='add'>+ * @name: name of the PRCM interrupt bit to look up - see struct omap_prcm_irq</div><div class='add'>+ *</div><div class='add'>+ * Returns the Linux internal IRQ ID corresponding to @name upon success,</div><div class='add'>+ * or -ENOENT upon failure.</div><div class='add'>+ */</div><div class='add'>+int omap_prcm_event_to_irq(const char *name)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!prcm_irq_setup || !name)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; prcm_irq_setup-&gt;nr_irqs; i++)</div><div class='add'>+		if (!strcmp(prcm_irq_setup-&gt;irqs[i].name, name))</div><div class='add'>+			return prcm_irq_setup-&gt;base_irq +</div><div class='add'>+				prcm_irq_setup-&gt;irqs[i].offset;</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap_prcm_irq_cleanup - reverses memory allocated and other steps</div><div class='add'>+ * done by omap_prcm_register_chain_handler()</div><div class='add'>+ *</div><div class='add'>+ * No return value.</div><div class='add'>+ */</div><div class='add'>+void omap_prcm_irq_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!prcm_irq_setup) {</div><div class='add'>+		pr_err("PRCM: IRQ handler not initialized; cannot cleanup\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (prcm_irq_chips) {</div><div class='add'>+		for (i = 0; i &lt; prcm_irq_setup-&gt;nr_regs; i++) {</div><div class='add'>+			if (prcm_irq_chips[i])</div><div class='add'>+				irq_remove_generic_chip(prcm_irq_chips[i],</div><div class='add'>+					0xffffffff, 0, 0);</div><div class='add'>+			prcm_irq_chips[i] = NULL;</div><div class='add'>+		}</div><div class='add'>+		kfree(prcm_irq_chips);</div><div class='add'>+		prcm_irq_chips = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(prcm_irq_setup-&gt;saved_mask);</div><div class='add'>+	prcm_irq_setup-&gt;saved_mask = NULL;</div><div class='add'>+</div><div class='add'>+	kfree(prcm_irq_setup-&gt;priority_mask);</div><div class='add'>+	prcm_irq_setup-&gt;priority_mask = NULL;</div><div class='add'>+</div><div class='add'>+	irq_set_chained_handler(prcm_irq_setup-&gt;irq, NULL);</div><div class='add'>+</div><div class='add'>+	if (prcm_irq_setup-&gt;base_irq &gt; 0)</div><div class='add'>+		irq_free_descs(prcm_irq_setup-&gt;base_irq,</div><div class='add'>+			prcm_irq_setup-&gt;nr_regs * 32);</div><div class='add'>+	prcm_irq_setup-&gt;base_irq = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void omap_prcm_irq_prepare(void)</div><div class='add'>+{</div><div class='add'>+	prcm_irq_setup-&gt;suspended = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void omap_prcm_irq_complete(void)</div><div class='add'>+{</div><div class='add'>+	prcm_irq_setup-&gt;suspended = false;</div><div class='add'>+</div><div class='add'>+	/* If we have not saved the masks, do not attempt to restore */</div><div class='add'>+	if (!prcm_irq_setup-&gt;suspend_save_flag)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	prcm_irq_setup-&gt;suspend_save_flag = false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Re-enable all masked PRCM irq sources, this causes the PRCM</div><div class='add'>+	 * interrupt to fire immediately if the events were masked</div><div class='add'>+	 * previously in the chain handler</div><div class='add'>+	 */</div><div class='add'>+	prcm_irq_setup-&gt;restore_irqen(prcm_irq_setup-&gt;saved_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap_prcm_register_chain_handler - initializes the prcm chained interrupt</div><div class='add'>+ * handler based on provided parameters</div><div class='add'>+ * @irq_setup: hardware data about the underlying PRM/PRCM</div><div class='add'>+ *</div><div class='add'>+ * Set up the PRCM chained interrupt handler on the PRCM IRQ.  Sets up</div><div class='add'>+ * one generic IRQ chip per PRM interrupt status/enable register pair.</div><div class='add'>+ * Returns 0 upon success, -EINVAL if called twice or if invalid</div><div class='add'>+ * arguments are passed, or -ENOMEM on any other error.</div><div class='add'>+ */</div><div class='add'>+int omap_prcm_register_chain_handler(struct omap_prcm_irq_setup *irq_setup)</div><div class='add'>+{</div><div class='add'>+	int nr_regs = irq_setup-&gt;nr_regs;</div><div class='add'>+	u32 mask[OMAP_PRCM_MAX_NR_PENDING_REG];</div><div class='add'>+	int offset, i;</div><div class='add'>+	struct irq_chip_generic *gc;</div><div class='add'>+	struct irq_chip_type *ct;</div><div class='add'>+</div><div class='add'>+	if (!irq_setup)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (prcm_irq_setup) {</div><div class='add'>+		pr_err("PRCM: already initialized; won't reinitialize\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nr_regs &gt; OMAP_PRCM_MAX_NR_PENDING_REG) {</div><div class='add'>+		pr_err("PRCM: nr_regs too large\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prcm_irq_setup = irq_setup;</div><div class='add'>+</div><div class='add'>+	prcm_irq_chips = kzalloc(sizeof(void *) * nr_regs, GFP_KERNEL);</div><div class='add'>+	prcm_irq_setup-&gt;saved_mask = kzalloc(sizeof(u32) * nr_regs, GFP_KERNEL);</div><div class='add'>+	prcm_irq_setup-&gt;priority_mask = kzalloc(sizeof(u32) * nr_regs,</div><div class='add'>+		GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!prcm_irq_chips || !prcm_irq_setup-&gt;saved_mask ||</div><div class='add'>+	    !prcm_irq_setup-&gt;priority_mask) {</div><div class='add'>+		pr_err("PRCM: kzalloc failed\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(mask, 0, sizeof(mask));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; irq_setup-&gt;nr_irqs; i++) {</div><div class='add'>+		offset = irq_setup-&gt;irqs[i].offset;</div><div class='add'>+		mask[offset &gt;&gt; 5] |= 1 &lt;&lt; (offset &amp; 0x1f);</div><div class='add'>+		if (irq_setup-&gt;irqs[i].priority)</div><div class='add'>+			irq_setup-&gt;priority_mask[offset &gt;&gt; 5] |=</div><div class='add'>+				1 &lt;&lt; (offset &amp; 0x1f);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq_set_chained_handler(irq_setup-&gt;irq, omap_prcm_irq_handler);</div><div class='add'>+</div><div class='add'>+	irq_setup-&gt;base_irq = irq_alloc_descs(-1, 0, irq_setup-&gt;nr_regs * 32,</div><div class='add'>+		0);</div><div class='add'>+</div><div class='add'>+	if (irq_setup-&gt;base_irq &lt; 0) {</div><div class='add'>+		pr_err("PRCM: failed to allocate irq descs: %d\n",</div><div class='add'>+			irq_setup-&gt;base_irq);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= irq_setup-&gt;nr_regs; i++) {</div><div class='add'>+		gc = irq_alloc_generic_chip("PRCM", 1,</div><div class='add'>+			irq_setup-&gt;base_irq + i * 32, prm_base,</div><div class='add'>+			handle_level_irq);</div><div class='add'>+</div><div class='add'>+		if (!gc) {</div><div class='add'>+			pr_err("PRCM: failed to allocate generic chip\n");</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		ct = gc-&gt;chip_types;</div><div class='add'>+		ct-&gt;chip.irq_ack = irq_gc_ack_set_bit;</div><div class='add'>+		ct-&gt;chip.irq_mask = irq_gc_mask_clr_bit;</div><div class='add'>+		ct-&gt;chip.irq_unmask = irq_gc_mask_set_bit;</div><div class='add'>+</div><div class='add'>+		ct-&gt;regs.ack = irq_setup-&gt;ack + i * 4;</div><div class='add'>+		ct-&gt;regs.mask = irq_setup-&gt;mask + i * 4;</div><div class='add'>+</div><div class='add'>+		irq_setup_generic_chip(gc, mask[i], 0, IRQ_NOREQUEST, 0);</div><div class='add'>+		prcm_irq_chips[i] = gc;</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'>+	omap_prcm_irq_cleanup();</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-omap2/prminst44xx.c b/arch/arm/mach-omap2/prminst44xx.c<br/>index 3a7bab16edd5..f6de5bc6b12a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prminst44xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/prminst44xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prminst44xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/prminst44xx.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #include "prm44xx.h"</div><div class='ctx'> #include "prminst44xx.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/sdram-nokia.c b/arch/arm/mach-omap2/sdram-nokia.c<br/>index 14caa228bc0d..7479d7ea1379 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sdram-nokia.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/sdram-nokia.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sdram-nokia.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/sdram-nokia.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * SDRC register values for Nokia boards</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2008, 2010 Nokia Corporation</div><div class='add'>+ * Copyright (C) 2008, 2010-2011 Nokia Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * Lauri Leukkunen &lt;lauri.leukkunen@nokia.com&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/io.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='ctx'> #include &lt;plat/sdrc.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -107,14 +107,37 @@ static const struct sdram_timings nokia_195dot2mhz_timings[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct sdram_timings nokia_200mhz_timings[] = {</div><div class='add'>+	{</div><div class='add'>+		.casl = 3,</div><div class='add'>+		.tDAL = 30000,</div><div class='add'>+		.tDPL = 15000,</div><div class='add'>+		.tRRD = 10000,</div><div class='add'>+		.tRCD = 20000,</div><div class='add'>+		.tRP = 15000,</div><div class='add'>+		.tRAS = 40000,</div><div class='add'>+		.tRC = 55000,</div><div class='add'>+		.tRFC = 140000,</div><div class='add'>+		.tXSR = 200000,</div><div class='add'>+</div><div class='add'>+		.tREF = 7800,</div><div class='add'>+</div><div class='add'>+		.tXP = 2,</div><div class='add'>+		.tCKE = 4,</div><div class='add'>+		.tWTR = 2</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct {</div><div class='ctx'> 	long rate;</div><div class='ctx'> 	struct sdram_timings const *data;</div><div class='ctx'> } nokia_timings[] = {</div><div class='ctx'> 	{ 83000000, nokia_166mhz_timings },</div><div class='ctx'> 	{ 97600000, nokia_97dot6mhz_timings },</div><div class='add'>+	{ 100000000, nokia_200mhz_timings },</div><div class='ctx'> 	{ 166000000, nokia_166mhz_timings },</div><div class='ctx'> 	{ 195200000, nokia_195dot2mhz_timings },</div><div class='add'>+	{ 200000000, nokia_200mhz_timings },</div><div class='ctx'> };</div><div class='ctx'> static struct omap_sdrc_params nokia_sdrc_params[ARRAY_SIZE(nokia_timings) + 1];</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/sdrc.c b/arch/arm/mach-omap2/sdrc.c<br/>index 8f2782874771..e3d345f46409 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sdrc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/sdrc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sdrc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/sdrc.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='ctx'> #include &lt;plat/sram.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/sdrc2xxx.c b/arch/arm/mach-omap2/sdrc2xxx.c<br/>index ccdb010f169d..791a63cdceb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sdrc2xxx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/sdrc2xxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sdrc2xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/sdrc2xxx.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='ctx'> #include &lt;plat/sram.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c<br/>index 9992dbfdfdb3..247d89478f24 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/serial.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/serial.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/serial.c</a></div><div class='hunk'>@@ -19,26 +19,21 @@</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='del'>-#include &lt;linux/serial_reg.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.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/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SERIAL_OMAP</div><div class='ctx'> #include &lt;plat/omap-serial.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='del'>-#include &lt;plat/clock.h&gt;</div><div class='ctx'> #include &lt;plat/dma.h&gt;</div><div class='ctx'> #include &lt;plat/omap_hwmod.h&gt;</div><div class='ctx'> #include &lt;plat/omap_device.h&gt;</div><div class='add'>+#include &lt;plat/omap-pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "prm2xxx_3xxx.h"</div><div class='ctx'> #include "pm.h"</div><div class='hunk'>@@ -47,603 +42,226 @@</div><div class='ctx'> #include "control.h"</div><div class='ctx'> #include "mux.h"</div><div class='ctx'> </div><div class='del'>-#define UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV	0x52</div><div class='del'>-#define UART_OMAP_WER		0x17	/* Wake-up enable register */</div><div class='del'>-</div><div class='del'>-#define UART_ERRATA_FIFO_FULL_ABORT	(0x1 &lt;&lt; 0)</div><div class='del'>-#define UART_ERRATA_i202_MDR1_ACCESS	(0x1 &lt;&lt; 1)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * NOTE: By default the serial timeout is disabled as it causes lost characters</div><div class='del'>- * over the serial ports. This means that the UART clocks will stay on until</div><div class='del'>- * disabled via sysfs. This also causes that any deeper omap sleep states are</div><div class='del'>- * blocked. </div><div class='add'>+ * NOTE: By default the serial auto_suspend timeout is disabled as it causes</div><div class='add'>+ * lost characters over the serial ports. This means that the UART clocks will</div><div class='add'>+ * stay on until power/autosuspend_delay is set for the uart from sysfs.</div><div class='add'>+ * This also causes that any deeper omap sleep states are blocked.</div><div class='ctx'>  */</div><div class='del'>-#define DEFAULT_TIMEOUT 0</div><div class='add'>+#define DEFAULT_AUTOSUSPEND_DELAY	-1</div><div class='ctx'> </div><div class='ctx'> #define MAX_UART_HWMOD_NAME_LEN		16</div><div class='ctx'> </div><div class='ctx'> struct omap_uart_state {</div><div class='ctx'> 	int num;</div><div class='ctx'> 	int can_sleep;</div><div class='del'>-	struct timer_list timer;</div><div class='del'>-	u32 timeout;</div><div class='del'>-</div><div class='del'>-	void __iomem *wk_st;</div><div class='del'>-	void __iomem *wk_en;</div><div class='del'>-	u32 wk_mask;</div><div class='del'>-	u32 padconf;</div><div class='del'>-	u32 dma_enabled;</div><div class='del'>-</div><div class='del'>-	struct clk *ick;</div><div class='del'>-	struct clk *fck;</div><div class='del'>-	int clocked;</div><div class='del'>-</div><div class='del'>-	int irq;</div><div class='del'>-	int regshift;</div><div class='del'>-	int irqflags;</div><div class='del'>-	void __iomem *membase;</div><div class='del'>-	resource_size_t mapbase;</div><div class='ctx'> </div><div class='ctx'> 	struct list_head node;</div><div class='ctx'> 	struct omap_hwmod *oh;</div><div class='ctx'> 	struct platform_device *pdev;</div><div class='del'>-</div><div class='del'>-	u32 errata;</div><div class='del'>-#if defined(CONFIG_ARCH_OMAP3) &amp;&amp; defined(CONFIG_PM)</div><div class='del'>-	int context_valid;</div><div class='del'>-</div><div class='del'>-	/* Registers to be saved/restored for OFF-mode */</div><div class='del'>-	u16 dll;</div><div class='del'>-	u16 dlh;</div><div class='del'>-	u16 ier;</div><div class='del'>-	u16 sysc;</div><div class='del'>-	u16 scr;</div><div class='del'>-	u16 wer;</div><div class='del'>-	u16 mcr;</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(uart_list);</div><div class='ctx'> static u8 num_uarts;</div><div class='add'>+static u8 console_uart_id = -1;</div><div class='add'>+static u8 no_console_suspend;</div><div class='add'>+static u8 uart_debug;</div><div class='add'>+</div><div class='add'>+#define DEFAULT_RXDMA_POLLRATE		1	/* RX DMA polling rate (us) */</div><div class='add'>+#define DEFAULT_RXDMA_BUFSIZE		4096	/* RX DMA buffer size */</div><div class='add'>+#define DEFAULT_RXDMA_TIMEOUT		(3 * HZ)/* RX DMA timeout (jiffies) */</div><div class='add'>+</div><div class='add'>+static struct omap_uart_port_info omap_serial_default_info[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.dma_enabled	= false,</div><div class='add'>+		.dma_rx_buf_size = DEFAULT_RXDMA_BUFSIZE,</div><div class='add'>+		.dma_rx_poll_rate = DEFAULT_RXDMA_POLLRATE,</div><div class='add'>+		.dma_rx_timeout = DEFAULT_RXDMA_TIMEOUT,</div><div class='add'>+		.autosuspend_timeout = DEFAULT_AUTOSUSPEND_DELAY,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static inline unsigned int __serial_read_reg(struct uart_port *up,</div><div class='del'>-					     int offset)</div><div class='del'>-{</div><div class='del'>-	offset &lt;&lt;= up-&gt;regshift;</div><div class='del'>-	return (unsigned int)__raw_readb(up-&gt;membase + offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned int serial_read_reg(struct omap_uart_state *uart,</div><div class='del'>-					   int offset)</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static void omap_uart_enable_wakeup(struct platform_device *pdev, bool enable)</div><div class='ctx'> {</div><div class='del'>-	offset &lt;&lt;= uart-&gt;regshift;</div><div class='del'>-	return (unsigned int)__raw_readb(uart-&gt;membase + offset);</div><div class='del'>-}</div><div class='add'>+	struct omap_device *od = to_omap_device(pdev);</div><div class='ctx'> </div><div class='del'>-static inline void __serial_write_reg(struct uart_port *up, int offset,</div><div class='del'>-		int value)</div><div class='del'>-{</div><div class='del'>-	offset &lt;&lt;= up-&gt;regshift;</div><div class='del'>-	__raw_writeb(value, up-&gt;membase + offset);</div><div class='del'>-}</div><div class='add'>+	if (!od)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-static inline void serial_write_reg(struct omap_uart_state *uart, int offset,</div><div class='del'>-				    int value)</div><div class='del'>-{</div><div class='del'>-	offset &lt;&lt;= uart-&gt;regshift;</div><div class='del'>-	__raw_writeb(value, uart-&gt;membase + offset);</div><div class='add'>+	if (enable)</div><div class='add'>+		omap_hwmod_enable_wakeup(od-&gt;hwmods[0]);</div><div class='add'>+	else</div><div class='add'>+		omap_hwmod_disable_wakeup(od-&gt;hwmods[0]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Internal UARTs need to be initialized for the 8250 autoconfig to work</div><div class='del'>- * properly. Note that the TX watermark initialization may not be needed</div><div class='del'>- * once the 8250.c watermark handling code is merged.</div><div class='add'>+ * Errata i291: [UART]:Cannot Acknowledge Idle Requests</div><div class='add'>+ * in Smartidle Mode When Configured for DMA Operations.</div><div class='add'>+ * WA: configure uart in force idle mode.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-static inline void __init omap_uart_reset(struct omap_uart_state *uart)</div><div class='add'>+static void omap_uart_set_noidle(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	serial_write_reg(uart, UART_OMAP_MDR1, UART_OMAP_MDR1_DISABLE);</div><div class='del'>-	serial_write_reg(uart, UART_OMAP_SCR, 0x08);</div><div class='del'>-	serial_write_reg(uart, UART_OMAP_MDR1, UART_OMAP_MDR1_16X_MODE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_PM) &amp;&amp; defined(CONFIG_ARCH_OMAP3)</div><div class='add'>+	struct omap_device *od = to_omap_device(pdev);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Work Around for Errata i202 (3430 - 1.12, 3630 - 1.6)</div><div class='del'>- * The access to uart register after MDR1 Access</div><div class='del'>- * causes UART to corrupt data.</div><div class='del'>- *</div><div class='del'>- * Need a delay =</div><div class='del'>- * 5 L4 clock cycles + 5 UART functional clock cycle (@48MHz = ~0.2uS)</div><div class='del'>- * give 10 times as much</div><div class='del'>- */</div><div class='del'>-static void omap_uart_mdr1_errataset(struct omap_uart_state *uart, u8 mdr1_val,</div><div class='del'>-		u8 fcr_val)</div><div class='del'>-{</div><div class='del'>-	u8 timeout = 255;</div><div class='del'>-</div><div class='del'>-	serial_write_reg(uart, UART_OMAP_MDR1, mdr1_val);</div><div class='del'>-	udelay(2);</div><div class='del'>-	serial_write_reg(uart, UART_FCR, fcr_val | UART_FCR_CLEAR_XMIT |</div><div class='del'>-			UART_FCR_CLEAR_RCVR);</div><div class='del'>-	/*</div><div class='del'>-	 * Wait for FIFO to empty: when empty, RX_FIFO_E bit is 0 and</div><div class='del'>-	 * TX_FIFO_E bit is 1.</div><div class='del'>-	 */</div><div class='del'>-	while (UART_LSR_THRE != (serial_read_reg(uart, UART_LSR) &amp;</div><div class='del'>-				(UART_LSR_THRE | UART_LSR_DR))) {</div><div class='del'>-		timeout--;</div><div class='del'>-		if (!timeout) {</div><div class='del'>-			/* Should *never* happen. we warn and carry on */</div><div class='del'>-			dev_crit(&amp;uart-&gt;pdev-&gt;dev, "Errata i202: timedout %x\n",</div><div class='del'>-			serial_read_reg(uart, UART_LSR));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		udelay(1);</div><div class='del'>-	}</div><div class='add'>+	omap_hwmod_set_slave_idlemode(od-&gt;hwmods[0], HWMOD_IDLEMODE_NO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void omap_uart_save_context(struct omap_uart_state *uart)</div><div class='add'>+static void omap_uart_set_forceidle(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	u16 lcr = 0;</div><div class='add'>+	struct omap_device *od = to_omap_device(pdev);</div><div class='ctx'> </div><div class='del'>-	if (!enable_off_mode)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	lcr = serial_read_reg(uart, UART_LCR);</div><div class='del'>-	serial_write_reg(uart, UART_LCR, UART_LCR_CONF_MODE_B);</div><div class='del'>-	uart-&gt;dll = serial_read_reg(uart, UART_DLL);</div><div class='del'>-	uart-&gt;dlh = serial_read_reg(uart, UART_DLM);</div><div class='del'>-	serial_write_reg(uart, UART_LCR, lcr);</div><div class='del'>-	uart-&gt;ier = serial_read_reg(uart, UART_IER);</div><div class='del'>-	uart-&gt;sysc = serial_read_reg(uart, UART_OMAP_SYSC);</div><div class='del'>-	uart-&gt;scr = serial_read_reg(uart, UART_OMAP_SCR);</div><div class='del'>-	uart-&gt;wer = serial_read_reg(uart, UART_OMAP_WER);</div><div class='del'>-	serial_write_reg(uart, UART_LCR, UART_LCR_CONF_MODE_A);</div><div class='del'>-	uart-&gt;mcr = serial_read_reg(uart, UART_MCR);</div><div class='del'>-	serial_write_reg(uart, UART_LCR, lcr);</div><div class='del'>-</div><div class='del'>-	uart-&gt;context_valid = 1;</div><div class='add'>+	omap_hwmod_set_slave_idlemode(od-&gt;hwmods[0], HWMOD_IDLEMODE_FORCE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void omap_uart_restore_context(struct omap_uart_state *uart)</div><div class='del'>-{</div><div class='del'>-	u16 efr = 0;</div><div class='del'>-</div><div class='del'>-	if (!enable_off_mode)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!uart-&gt;context_valid)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	uart-&gt;context_valid = 0;</div><div class='del'>-</div><div class='del'>-	if (uart-&gt;errata &amp; UART_ERRATA_i202_MDR1_ACCESS)</div><div class='del'>-		omap_uart_mdr1_errataset(uart, UART_OMAP_MDR1_DISABLE, 0xA0);</div><div class='del'>-	else</div><div class='del'>-		serial_write_reg(uart, UART_OMAP_MDR1, UART_OMAP_MDR1_DISABLE);</div><div class='del'>-</div><div class='del'>-	serial_write_reg(uart, UART_LCR, UART_LCR_CONF_MODE_B);</div><div class='del'>-	efr = serial_read_reg(uart, UART_EFR);</div><div class='del'>-	serial_write_reg(uart, UART_EFR, UART_EFR_ECB);</div><div class='del'>-	serial_write_reg(uart, UART_LCR, 0x0); /* Operational mode */</div><div class='del'>-	serial_write_reg(uart, UART_IER, 0x0);</div><div class='del'>-	serial_write_reg(uart, UART_LCR, UART_LCR_CONF_MODE_B);</div><div class='del'>-	serial_write_reg(uart, UART_DLL, uart-&gt;dll);</div><div class='del'>-	serial_write_reg(uart, UART_DLM, uart-&gt;dlh);</div><div class='del'>-	serial_write_reg(uart, UART_LCR, 0x0); /* Operational mode */</div><div class='del'>-	serial_write_reg(uart, UART_IER, uart-&gt;ier);</div><div class='del'>-	serial_write_reg(uart, UART_LCR, UART_LCR_CONF_MODE_A);</div><div class='del'>-	serial_write_reg(uart, UART_MCR, uart-&gt;mcr);</div><div class='del'>-	serial_write_reg(uart, UART_LCR, UART_LCR_CONF_MODE_B);</div><div class='del'>-	serial_write_reg(uart, UART_EFR, efr);</div><div class='del'>-	serial_write_reg(uart, UART_LCR, UART_LCR_WLEN8);</div><div class='del'>-	serial_write_reg(uart, UART_OMAP_SCR, uart-&gt;scr);</div><div class='del'>-	serial_write_reg(uart, UART_OMAP_WER, uart-&gt;wer);</div><div class='del'>-	serial_write_reg(uart, UART_OMAP_SYSC, uart-&gt;sysc);</div><div class='del'>-</div><div class='del'>-	if (uart-&gt;errata &amp; UART_ERRATA_i202_MDR1_ACCESS)</div><div class='del'>-		omap_uart_mdr1_errataset(uart, UART_OMAP_MDR1_16X_MODE, 0xA1);</div><div class='del'>-	else</div><div class='del'>-		/* UART 16x mode */</div><div class='del'>-		serial_write_reg(uart, UART_OMAP_MDR1,</div><div class='del'>-				UART_OMAP_MDR1_16X_MODE);</div><div class='del'>-}</div><div class='ctx'> #else</div><div class='del'>-static inline void omap_uart_save_context(struct omap_uart_state *uart) {}</div><div class='del'>-static inline void omap_uart_restore_context(struct omap_uart_state *uart) {}</div><div class='del'>-#endif /* CONFIG_PM &amp;&amp; CONFIG_ARCH_OMAP3 */</div><div class='del'>-</div><div class='del'>-static inline void omap_uart_enable_clocks(struct omap_uart_state *uart)</div><div class='del'>-{</div><div class='del'>-	if (uart-&gt;clocked)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	omap_device_enable(uart-&gt;pdev);</div><div class='del'>-	uart-&gt;clocked = 1;</div><div class='del'>-	omap_uart_restore_context(uart);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-</div><div class='del'>-static inline void omap_uart_disable_clocks(struct omap_uart_state *uart)</div><div class='del'>-{</div><div class='del'>-	if (!uart-&gt;clocked)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	omap_uart_save_context(uart);</div><div class='del'>-	uart-&gt;clocked = 0;</div><div class='del'>-	omap_device_idle(uart-&gt;pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void omap_uart_enable_wakeup(struct omap_uart_state *uart)</div><div class='del'>-{</div><div class='del'>-	/* Set wake-enable bit */</div><div class='del'>-	if (uart-&gt;wk_en &amp;&amp; uart-&gt;wk_mask) {</div><div class='del'>-		u32 v = __raw_readl(uart-&gt;wk_en);</div><div class='del'>-		v |= uart-&gt;wk_mask;</div><div class='del'>-		__raw_writel(v, uart-&gt;wk_en);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Ensure IOPAD wake-enables are set */</div><div class='del'>-	if (cpu_is_omap34xx() &amp;&amp; uart-&gt;padconf) {</div><div class='del'>-		u16 v = omap_ctrl_readw(uart-&gt;padconf);</div><div class='del'>-		v |= OMAP3_PADCONF_WAKEUPENABLE0;</div><div class='del'>-		omap_ctrl_writew(v, uart-&gt;padconf);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void omap_uart_disable_wakeup(struct omap_uart_state *uart)</div><div class='del'>-{</div><div class='del'>-	/* Clear wake-enable bit */</div><div class='del'>-	if (uart-&gt;wk_en &amp;&amp; uart-&gt;wk_mask) {</div><div class='del'>-		u32 v = __raw_readl(uart-&gt;wk_en);</div><div class='del'>-		v &amp;= ~uart-&gt;wk_mask;</div><div class='del'>-		__raw_writel(v, uart-&gt;wk_en);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Ensure IOPAD wake-enables are cleared */</div><div class='del'>-	if (cpu_is_omap34xx() &amp;&amp; uart-&gt;padconf) {</div><div class='del'>-		u16 v = omap_ctrl_readw(uart-&gt;padconf);</div><div class='del'>-		v &amp;= ~OMAP3_PADCONF_WAKEUPENABLE0;</div><div class='del'>-		omap_ctrl_writew(v, uart-&gt;padconf);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void omap_uart_smart_idle_enable(struct omap_uart_state *uart,</div><div class='del'>-					       int enable)</div><div class='del'>-{</div><div class='del'>-	u8 idlemode;</div><div class='del'>-</div><div class='del'>-	if (enable) {</div><div class='del'>-		/**</div><div class='del'>-		 * Errata 2.15: [UART]:Cannot Acknowledge Idle Requests</div><div class='del'>-		 * in Smartidle Mode When Configured for DMA Operations.</div><div class='del'>-		 */</div><div class='del'>-		if (uart-&gt;dma_enabled)</div><div class='del'>-			idlemode = HWMOD_IDLEMODE_FORCE;</div><div class='del'>-		else</div><div class='del'>-			idlemode = HWMOD_IDLEMODE_SMART;</div><div class='del'>-	} else {</div><div class='del'>-		idlemode = HWMOD_IDLEMODE_NO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omap_hwmod_set_slave_idlemode(uart-&gt;oh, idlemode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void omap_uart_block_sleep(struct omap_uart_state *uart)</div><div class='del'>-{</div><div class='del'>-	omap_uart_enable_clocks(uart);</div><div class='del'>-</div><div class='del'>-	omap_uart_smart_idle_enable(uart, 0);</div><div class='del'>-	uart-&gt;can_sleep = 0;</div><div class='del'>-	if (uart-&gt;timeout)</div><div class='del'>-		mod_timer(&amp;uart-&gt;timer, jiffies + uart-&gt;timeout);</div><div class='del'>-	else</div><div class='del'>-		del_timer(&amp;uart-&gt;timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void omap_uart_allow_sleep(struct omap_uart_state *uart)</div><div class='del'>-{</div><div class='del'>-	if (device_may_wakeup(&amp;uart-&gt;pdev-&gt;dev))</div><div class='del'>-		omap_uart_enable_wakeup(uart);</div><div class='del'>-	else</div><div class='del'>-		omap_uart_disable_wakeup(uart);</div><div class='del'>-</div><div class='del'>-	if (!uart-&gt;clocked)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	omap_uart_smart_idle_enable(uart, 1);</div><div class='del'>-	uart-&gt;can_sleep = 1;</div><div class='del'>-	del_timer(&amp;uart-&gt;timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void omap_uart_idle_timer(unsigned long data)</div><div class='del'>-{</div><div class='del'>-	struct omap_uart_state *uart = (struct omap_uart_state *)data;</div><div class='del'>-</div><div class='del'>-	omap_uart_allow_sleep(uart);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void omap_uart_prepare_idle(int num)</div><div class='del'>-{</div><div class='del'>-	struct omap_uart_state *uart;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(uart, &amp;uart_list, node) {</div><div class='del'>-		if (num == uart-&gt;num &amp;&amp; uart-&gt;can_sleep) {</div><div class='del'>-			omap_uart_disable_clocks(uart);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void omap_uart_resume_idle(int num)</div><div class='del'>-{</div><div class='del'>-	struct omap_uart_state *uart;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(uart, &amp;uart_list, node) {</div><div class='del'>-		if (num == uart-&gt;num &amp;&amp; uart-&gt;can_sleep) {</div><div class='del'>-			omap_uart_enable_clocks(uart);</div><div class='del'>-</div><div class='del'>-			/* Check for IO pad wakeup */</div><div class='del'>-			if (cpu_is_omap34xx() &amp;&amp; uart-&gt;padconf) {</div><div class='del'>-				u16 p = omap_ctrl_readw(uart-&gt;padconf);</div><div class='del'>-</div><div class='del'>-				if (p &amp; OMAP3_PADCONF_WAKEUPEVENT0)</div><div class='del'>-					omap_uart_block_sleep(uart);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Check for normal UART wakeup */</div><div class='del'>-			if (__raw_readl(uart-&gt;wk_st) &amp; uart-&gt;wk_mask)</div><div class='del'>-				omap_uart_block_sleep(uart);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void omap_uart_prepare_suspend(void)</div><div class='del'>-{</div><div class='del'>-	struct omap_uart_state *uart;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(uart, &amp;uart_list, node) {</div><div class='del'>-		omap_uart_allow_sleep(uart);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int omap_uart_can_sleep(void)</div><div class='del'>-{</div><div class='del'>-	struct omap_uart_state *uart;</div><div class='del'>-	int can_sleep = 1;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(uart, &amp;uart_list, node) {</div><div class='del'>-		if (!uart-&gt;clocked)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!uart-&gt;can_sleep) {</div><div class='del'>-			can_sleep = 0;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* This UART can now safely sleep. */</div><div class='del'>-		omap_uart_allow_sleep(uart);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return can_sleep;</div><div class='del'>-}</div><div class='add'>+static void omap_uart_enable_wakeup(struct platform_device *pdev, bool enable)</div><div class='add'>+{}</div><div class='add'>+static void omap_uart_set_noidle(struct platform_device *pdev) {}</div><div class='add'>+static void omap_uart_set_forceidle(struct platform_device *pdev) {}</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * omap_uart_interrupt()</div><div class='del'>- *</div><div class='del'>- * This handler is used only to detect that *any* UART interrupt has</div><div class='del'>- * occurred.  It does _nothing_ to handle the interrupt.  Rather,</div><div class='del'>- * any UART interrupt will trigger the inactivity timer so the</div><div class='del'>- * UART will not idle or sleep for its timeout period.</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-/* static int first_interrupt; */</div><div class='del'>-static irqreturn_t omap_uart_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct omap_uart_state *uart = dev_id;</div><div class='add'>+#ifdef CONFIG_OMAP_MUX</div><div class='add'>+static struct omap_device_pad default_uart1_pads[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.name	= "uart1_cts.uart1_cts",</div><div class='add'>+		.enable	= OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "uart1_rts.uart1_rts",</div><div class='add'>+		.enable	= OMAP_PIN_OUTPUT | OMAP_MUX_MODE0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "uart1_tx.uart1_tx",</div><div class='add'>+		.enable	= OMAP_PIN_OUTPUT | OMAP_MUX_MODE0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "uart1_rx.uart1_rx",</div><div class='add'>+		.flags	= OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,</div><div class='add'>+		.enable	= OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0,</div><div class='add'>+		.idle	= OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	omap_uart_block_sleep(uart);</div><div class='add'>+static struct omap_device_pad default_uart2_pads[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.name	= "uart2_cts.uart2_cts",</div><div class='add'>+		.enable	= OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "uart2_rts.uart2_rts",</div><div class='add'>+		.enable	= OMAP_PIN_OUTPUT | OMAP_MUX_MODE0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "uart2_tx.uart2_tx",</div><div class='add'>+		.enable	= OMAP_PIN_OUTPUT | OMAP_MUX_MODE0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "uart2_rx.uart2_rx",</div><div class='add'>+		.flags	= OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,</div><div class='add'>+		.enable	= OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0,</div><div class='add'>+		.idle	= OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	return IRQ_NONE;</div><div class='del'>-}</div><div class='add'>+static struct omap_device_pad default_uart3_pads[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.name	= "uart3_cts_rctx.uart3_cts_rctx",</div><div class='add'>+		.enable	= OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "uart3_rts_sd.uart3_rts_sd",</div><div class='add'>+		.enable	= OMAP_PIN_OUTPUT | OMAP_MUX_MODE0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "uart3_tx_irtx.uart3_tx_irtx",</div><div class='add'>+		.enable	= OMAP_PIN_OUTPUT | OMAP_MUX_MODE0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "uart3_rx_irrx.uart3_rx_irrx",</div><div class='add'>+		.flags	= OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,</div><div class='add'>+		.enable	= OMAP_PIN_INPUT | OMAP_MUX_MODE0,</div><div class='add'>+		.idle	= OMAP_PIN_INPUT | OMAP_MUX_MODE0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static void omap_uart_idle_init(struct omap_uart_state *uart)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	uart-&gt;can_sleep = 0;</div><div class='del'>-	uart-&gt;timeout = DEFAULT_TIMEOUT;</div><div class='del'>-	setup_timer(&amp;uart-&gt;timer, omap_uart_idle_timer,</div><div class='del'>-		    (unsigned long) uart);</div><div class='del'>-	if (uart-&gt;timeout)</div><div class='del'>-		mod_timer(&amp;uart-&gt;timer, jiffies + uart-&gt;timeout);</div><div class='del'>-	omap_uart_smart_idle_enable(uart, 0);</div><div class='del'>-</div><div class='del'>-	if (cpu_is_omap34xx() &amp;&amp; !cpu_is_ti816x()) {</div><div class='del'>-		u32 mod = (uart-&gt;num &gt; 1) ? OMAP3430_PER_MOD : CORE_MOD;</div><div class='del'>-		u32 wk_mask = 0;</div><div class='del'>-		u32 padconf = 0;</div><div class='del'>-</div><div class='del'>-		/* XXX These PRM accesses do not belong here */</div><div class='del'>-		uart-&gt;wk_en = OMAP34XX_PRM_REGADDR(mod, PM_WKEN1);</div><div class='del'>-		uart-&gt;wk_st = OMAP34XX_PRM_REGADDR(mod, PM_WKST1);</div><div class='del'>-		switch (uart-&gt;num) {</div><div class='del'>-		case 0:</div><div class='del'>-			wk_mask = OMAP3430_ST_UART1_MASK;</div><div class='del'>-			padconf = 0x182;</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			wk_mask = OMAP3430_ST_UART2_MASK;</div><div class='del'>-			padconf = 0x17a;</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			wk_mask = OMAP3430_ST_UART3_MASK;</div><div class='del'>-			padconf = 0x19e;</div><div class='del'>-			break;</div><div class='del'>-		case 3:</div><div class='del'>-			wk_mask = OMAP3630_ST_UART4_MASK;</div><div class='del'>-			padconf = 0x0d2;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		uart-&gt;wk_mask = wk_mask;</div><div class='del'>-		uart-&gt;padconf = padconf;</div><div class='del'>-	} else if (cpu_is_omap24xx()) {</div><div class='del'>-		u32 wk_mask = 0;</div><div class='del'>-		u32 wk_en = PM_WKEN1, wk_st = PM_WKST1;</div><div class='del'>-</div><div class='del'>-		switch (uart-&gt;num) {</div><div class='del'>-		case 0:</div><div class='del'>-			wk_mask = OMAP24XX_ST_UART1_MASK;</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			wk_mask = OMAP24XX_ST_UART2_MASK;</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			wk_en = OMAP24XX_PM_WKEN2;</div><div class='del'>-			wk_st = OMAP24XX_PM_WKST2;</div><div class='del'>-			wk_mask = OMAP24XX_ST_UART3_MASK;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		uart-&gt;wk_mask = wk_mask;</div><div class='del'>-		if (cpu_is_omap2430()) {</div><div class='del'>-			uart-&gt;wk_en = OMAP2430_PRM_REGADDR(CORE_MOD, wk_en);</div><div class='del'>-			uart-&gt;wk_st = OMAP2430_PRM_REGADDR(CORE_MOD, wk_st);</div><div class='del'>-		} else if (cpu_is_omap2420()) {</div><div class='del'>-			uart-&gt;wk_en = OMAP2420_PRM_REGADDR(CORE_MOD, wk_en);</div><div class='del'>-			uart-&gt;wk_st = OMAP2420_PRM_REGADDR(CORE_MOD, wk_st);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		uart-&gt;wk_en = NULL;</div><div class='del'>-		uart-&gt;wk_st = NULL;</div><div class='del'>-		uart-&gt;wk_mask = 0;</div><div class='del'>-		uart-&gt;padconf = 0;</div><div class='del'>-	}</div><div class='add'>+static struct omap_device_pad default_omap36xx_uart4_pads[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.name   = "gpmc_wait2.uart4_tx",</div><div class='add'>+		.enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "gpmc_wait3.uart4_rx",</div><div class='add'>+		.flags	= OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,</div><div class='add'>+		.enable	= OMAP_PIN_INPUT | OMAP_MUX_MODE2,</div><div class='add'>+		.idle	= OMAP_PIN_INPUT | OMAP_MUX_MODE2,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	uart-&gt;irqflags |= IRQF_SHARED;</div><div class='del'>-	ret = request_threaded_irq(uart-&gt;irq, NULL, omap_uart_interrupt,</div><div class='del'>-				   IRQF_SHARED, "serial idle", (void *)uart);</div><div class='del'>-	WARN_ON(ret);</div><div class='del'>-}</div><div class='add'>+static struct omap_device_pad default_omap4_uart4_pads[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.name	= "uart4_tx.uart4_tx",</div><div class='add'>+		.enable	= OMAP_PIN_OUTPUT | OMAP_MUX_MODE0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "uart4_rx.uart4_rx",</div><div class='add'>+		.flags	= OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,</div><div class='add'>+		.enable	= OMAP_PIN_INPUT | OMAP_MUX_MODE0,</div><div class='add'>+		.idle	= OMAP_PIN_INPUT | OMAP_MUX_MODE0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-void omap_uart_enable_irqs(int enable)</div><div class='add'>+static void omap_serial_fill_default_pads(struct omap_board_data *bdata)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	struct omap_uart_state *uart;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(uart, &amp;uart_list, node) {</div><div class='del'>-		if (enable) {</div><div class='del'>-			pm_runtime_put_sync(&amp;uart-&gt;pdev-&gt;dev);</div><div class='del'>-			ret = request_threaded_irq(uart-&gt;irq, NULL,</div><div class='del'>-						   omap_uart_interrupt,</div><div class='del'>-						   IRQF_SHARED,</div><div class='del'>-						   "serial idle",</div><div class='del'>-						   (void *)uart);</div><div class='del'>-		} else {</div><div class='del'>-			pm_runtime_get_noresume(&amp;uart-&gt;pdev-&gt;dev);</div><div class='del'>-			free_irq(uart-&gt;irq, (void *)uart);</div><div class='add'>+	switch (bdata-&gt;id) {</div><div class='add'>+	case 0:</div><div class='add'>+		bdata-&gt;pads = default_uart1_pads;</div><div class='add'>+		bdata-&gt;pads_cnt = ARRAY_SIZE(default_uart1_pads);</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		bdata-&gt;pads = default_uart2_pads;</div><div class='add'>+		bdata-&gt;pads_cnt = ARRAY_SIZE(default_uart2_pads);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		bdata-&gt;pads = default_uart3_pads;</div><div class='add'>+		bdata-&gt;pads_cnt = ARRAY_SIZE(default_uart3_pads);</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		if (cpu_is_omap44xx()) {</div><div class='add'>+			bdata-&gt;pads = default_omap4_uart4_pads;</div><div class='add'>+			bdata-&gt;pads_cnt =</div><div class='add'>+				ARRAY_SIZE(default_omap4_uart4_pads);</div><div class='add'>+		} else if (cpu_is_omap3630()) {</div><div class='add'>+			bdata-&gt;pads = default_omap36xx_uart4_pads;</div><div class='add'>+			bdata-&gt;pads_cnt =</div><div class='add'>+				ARRAY_SIZE(default_omap36xx_uart4_pads);</div><div class='ctx'> 		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static ssize_t sleep_timeout_show(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'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct omap_device *odev = to_omap_device(pdev);</div><div class='del'>-	struct omap_uart_state *uart = odev-&gt;hwmods[0]-&gt;dev_attr;</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "%u\n", uart-&gt;timeout / HZ);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t sleep_timeout_store(struct device *dev,</div><div class='del'>-				   struct device_attribute *attr,</div><div class='del'>-				   const char *buf, size_t n)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct omap_device *odev = to_omap_device(pdev);</div><div class='del'>-	struct omap_uart_state *uart = odev-&gt;hwmods[0]-&gt;dev_attr;</div><div class='del'>-	unsigned int value;</div><div class='del'>-</div><div class='del'>-	if (sscanf(buf, "%u", &amp;value) != 1) {</div><div class='del'>-		dev_err(dev, "sleep_timeout_store: Invalid value\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	uart-&gt;timeout = value * HZ;</div><div class='del'>-	if (uart-&gt;timeout)</div><div class='del'>-		mod_timer(&amp;uart-&gt;timer, jiffies + uart-&gt;timeout);</div><div class='del'>-	else</div><div class='del'>-		/* A zero value means disable timeout feature */</div><div class='del'>-		omap_uart_block_sleep(uart);</div><div class='del'>-</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEVICE_ATTR(sleep_timeout, 0644, sleep_timeout_show,</div><div class='del'>-		sleep_timeout_store);</div><div class='del'>-#define DEV_CREATE_FILE(dev, attr) WARN_ON(device_create_file(dev, attr))</div><div class='ctx'> #else</div><div class='del'>-static inline void omap_uart_idle_init(struct omap_uart_state *uart) {}</div><div class='del'>-static void omap_uart_block_sleep(struct omap_uart_state *uart)</div><div class='del'>-{</div><div class='del'>-	/* Needed to enable UART clocks when built without CONFIG_PM */</div><div class='del'>-	omap_uart_enable_clocks(uart);</div><div class='del'>-}</div><div class='del'>-#define DEV_CREATE_FILE(dev, attr)</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_SERIAL_OMAP</div><div class='del'>-/*</div><div class='del'>- * Override the default 8250 read handler: mem_serial_in()</div><div class='del'>- * Empty RX fifo read causes an abort on omap3630 and omap4</div><div class='del'>- * This function makes sure that an empty rx fifo is not read on these silicons</div><div class='del'>- * (OMAP1/2/3430 are not affected)</div><div class='del'>- */</div><div class='del'>-static unsigned int serial_in_override(struct uart_port *up, int offset)</div><div class='del'>-{</div><div class='del'>-	if (UART_RX == offset) {</div><div class='del'>-		unsigned int lsr;</div><div class='del'>-		lsr = __serial_read_reg(up, UART_LSR);</div><div class='del'>-		if (!(lsr &amp; UART_LSR_DR))</div><div class='del'>-			return -EPERM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return __serial_read_reg(up, offset);</div><div class='del'>-}</div><div class='add'>+static void omap_serial_fill_default_pads(struct omap_board_data *bdata) {}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-static void serial_out_override(struct uart_port *up, int offset, int value)</div><div class='add'>+char *cmdline_find_option(char *str)</div><div class='ctx'> {</div><div class='del'>-	unsigned int status, tmout = 10000;</div><div class='add'>+	extern char *saved_command_line;</div><div class='ctx'> </div><div class='del'>-	status = __serial_read_reg(up, UART_LSR);</div><div class='del'>-	while (!(status &amp; UART_LSR_THRE)) {</div><div class='del'>-		/* Wait up to 10ms for the character(s) to be sent. */</div><div class='del'>-		if (--tmout == 0)</div><div class='del'>-			break;</div><div class='del'>-		udelay(1);</div><div class='del'>-		status = __serial_read_reg(up, UART_LSR);</div><div class='del'>-	}</div><div class='del'>-	__serial_write_reg(up, offset, value);</div><div class='add'>+	return strstr(saved_command_line, str);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static int __init omap_serial_early_init(void)</div><div class='ctx'> {</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='ctx'> 	do {</div><div class='ctx'> 		char oh_name[MAX_UART_HWMOD_NAME_LEN];</div><div class='ctx'> 		struct omap_hwmod *oh;</div><div class='ctx'> 		struct omap_uart_state *uart;</div><div class='add'>+		char uart_name[MAX_UART_HWMOD_NAME_LEN];</div><div class='ctx'> </div><div class='ctx'> 		snprintf(oh_name, MAX_UART_HWMOD_NAME_LEN,</div><div class='del'>-			 "uart%d", i + 1);</div><div class='add'>+			 "uart%d", num_uarts + 1);</div><div class='ctx'> 		oh = omap_hwmod_lookup(oh_name);</div><div class='ctx'> 		if (!oh)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -653,21 +271,35 @@ static int __init omap_serial_early_init(void)</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 		uart-&gt;oh = oh;</div><div class='del'>-		uart-&gt;num = i++;</div><div class='add'>+		uart-&gt;num = num_uarts++;</div><div class='ctx'> 		list_add_tail(&amp;uart-&gt;node, &amp;uart_list);</div><div class='del'>-		num_uarts++;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * NOTE: omap_hwmod_setup*() has not yet been called,</div><div class='del'>-		 *       so no hwmod functions will work yet.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * During UART early init, device need to be probed</div><div class='del'>-		 * to determine SoC specific init before omap_device</div><div class='del'>-		 * is ready.  Therefore, don't allow idle here</div><div class='del'>-		 */</div><div class='del'>-		uart-&gt;oh-&gt;flags |= HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET;</div><div class='add'>+		snprintf(uart_name, MAX_UART_HWMOD_NAME_LEN,</div><div class='add'>+				"%s%d", OMAP_SERIAL_NAME, uart-&gt;num);</div><div class='add'>+</div><div class='add'>+		if (cmdline_find_option(uart_name)) {</div><div class='add'>+			console_uart_id = uart-&gt;num;</div><div class='add'>+</div><div class='add'>+			if (console_loglevel &gt;= 10) {</div><div class='add'>+				uart_debug = true;</div><div class='add'>+				pr_info("%s used as console in debug mode"</div><div class='add'>+						" uart%d clocks will not be"</div><div class='add'>+						" gated", uart_name, uart-&gt;num);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (cmdline_find_option("no_console_suspend"))</div><div class='add'>+				no_console_suspend = true;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * omap-uart can be used for earlyprintk logs</div><div class='add'>+			 * So if omap-uart is used as console then prevent</div><div class='add'>+			 * uart reset and idle to get logs from omap-uart</div><div class='add'>+			 * until uart console driver is available to take</div><div class='add'>+			 * care for console messages.</div><div class='add'>+			 * Idling or resetting omap-uart while printing logs</div><div class='add'>+			 * early boot logs can stall the boot-up.</div><div class='add'>+			 */</div><div class='add'>+			oh-&gt;flags |= HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET;</div><div class='add'>+		}</div><div class='ctx'> 	} while (1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -677,6 +309,7 @@ core_initcall(omap_serial_early_init);</div><div class='ctx'> /**</div><div class='ctx'>  * omap_serial_init_port() - initialize single serial port</div><div class='ctx'>  * @bdata: port specific board data pointer</div><div class='add'>+ * @info: platform specific data pointer</div><div class='ctx'>  *</div><div class='ctx'>  * This function initialies serial driver for given port only.</div><div class='ctx'>  * Platforms can call this function instead of omap_serial_init()</div><div class='hunk'>@@ -685,7 +318,8 @@ core_initcall(omap_serial_early_init);</div><div class='ctx'>  * Don't mix calls to omap_serial_init_port() and omap_serial_init(),</div><div class='ctx'>  * use only one of the two.</div><div class='ctx'>  */</div><div class='del'>-void __init omap_serial_init_port(struct omap_board_data *bdata)</div><div class='add'>+void __init omap_serial_init_port(struct omap_board_data *bdata,</div><div class='add'>+			struct omap_uart_port_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct omap_uart_state *uart;</div><div class='ctx'> 	struct omap_hwmod *oh;</div><div class='hunk'>@@ -693,15 +327,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata)</div><div class='ctx'> 	void *pdata = NULL;</div><div class='ctx'> 	u32 pdata_size = 0;</div><div class='ctx'> 	char *name;</div><div class='del'>-#ifndef CONFIG_SERIAL_OMAP</div><div class='del'>-	struct plat_serial8250_port ports[2] = {</div><div class='del'>-		{},</div><div class='del'>-		{.flags = 0},</div><div class='del'>-	};</div><div class='del'>-	struct plat_serial8250_port *p = &amp;ports[0];</div><div class='del'>-#else</div><div class='ctx'> 	struct omap_uart_port_info omap_up;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(!bdata))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -713,66 +339,34 @@ void __init omap_serial_init_port(struct omap_board_data *bdata)</div><div class='ctx'> 	list_for_each_entry(uart, &amp;uart_list, node)</div><div class='ctx'> 		if (bdata-&gt;id == uart-&gt;num)</div><div class='ctx'> 			break;</div><div class='add'>+	if (!info)</div><div class='add'>+		info = omap_serial_default_info;</div><div class='ctx'> </div><div class='ctx'> 	oh = uart-&gt;oh;</div><div class='del'>-	uart-&gt;dma_enabled = 0;</div><div class='del'>-#ifndef CONFIG_SERIAL_OMAP</div><div class='del'>-	name = "serial8250";</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * !! 8250 driver does not use standard IORESOURCE* It</div><div class='del'>-	 * has it's own custom pdata that can be taken from</div><div class='del'>-	 * the hwmod resource data.  But, this needs to be</div><div class='del'>-	 * done after the build.</div><div class='del'>-	 *</div><div class='del'>-	 * ?? does it have to be done before the register ??</div><div class='del'>-	 * YES, because platform_device_data_add() copies</div><div class='del'>-	 * pdata, it does not use a pointer.</div><div class='del'>-	 */</div><div class='del'>-	p-&gt;flags = UPF_BOOT_AUTOCONF;</div><div class='del'>-	p-&gt;iotype = UPIO_MEM;</div><div class='del'>-	p-&gt;regshift = 2;</div><div class='del'>-	p-&gt;uartclk = OMAP24XX_BASE_BAUD * 16;</div><div class='del'>-	p-&gt;irq = oh-&gt;mpu_irqs[0].irq;</div><div class='del'>-	p-&gt;mapbase = oh-&gt;slaves[0]-&gt;addr-&gt;pa_start;</div><div class='del'>-	p-&gt;membase = omap_hwmod_get_mpu_rt_va(oh);</div><div class='del'>-	p-&gt;irqflags = IRQF_SHARED;</div><div class='del'>-	p-&gt;private_data = uart;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * omap44xx, ti816x: Never read empty UART fifo</div><div class='del'>-	 * omap3xxx: Never read empty UART fifo on UARTs</div><div class='del'>-	 * with IP rev &gt;=0x52</div><div class='del'>-	 */</div><div class='del'>-	uart-&gt;regshift = p-&gt;regshift;</div><div class='del'>-	uart-&gt;membase = p-&gt;membase;</div><div class='del'>-	if (cpu_is_omap44xx() || cpu_is_ti816x())</div><div class='del'>-		uart-&gt;errata |= UART_ERRATA_FIFO_FULL_ABORT;</div><div class='del'>-	else if ((serial_read_reg(uart, UART_OMAP_MVER) &amp; 0xFF)</div><div class='del'>-			&gt;= UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV)</div><div class='del'>-		uart-&gt;errata |= UART_ERRATA_FIFO_FULL_ABORT;</div><div class='del'>-</div><div class='del'>-	if (uart-&gt;errata &amp; UART_ERRATA_FIFO_FULL_ABORT) {</div><div class='del'>-		p-&gt;serial_in = serial_in_override;</div><div class='del'>-		p-&gt;serial_out = serial_out_override;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pdata = &amp;ports[0];</div><div class='del'>-	pdata_size = 2 * sizeof(struct plat_serial8250_port);</div><div class='del'>-#else</div><div class='del'>-</div><div class='ctx'> 	name = DRIVER_NAME;</div><div class='ctx'> </div><div class='del'>-	omap_up.dma_enabled = uart-&gt;dma_enabled;</div><div class='add'>+	omap_up.dma_enabled = info-&gt;dma_enabled;</div><div class='ctx'> 	omap_up.uartclk = OMAP24XX_BASE_BAUD * 16;</div><div class='del'>-	omap_up.mapbase = oh-&gt;slaves[0]-&gt;addr-&gt;pa_start;</div><div class='del'>-	omap_up.membase = omap_hwmod_get_mpu_rt_va(oh);</div><div class='del'>-	omap_up.irqflags = IRQF_SHARED;</div><div class='del'>-	omap_up.flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;</div><div class='add'>+	omap_up.flags = UPF_BOOT_AUTOCONF;</div><div class='add'>+	omap_up.get_context_loss_count = omap_pm_get_dev_context_loss_count;</div><div class='add'>+	omap_up.set_forceidle = omap_uart_set_forceidle;</div><div class='add'>+	omap_up.set_noidle = omap_uart_set_noidle;</div><div class='add'>+	omap_up.enable_wakeup = omap_uart_enable_wakeup;</div><div class='add'>+	omap_up.dma_rx_buf_size = info-&gt;dma_rx_buf_size;</div><div class='add'>+	omap_up.dma_rx_timeout = info-&gt;dma_rx_timeout;</div><div class='add'>+	omap_up.dma_rx_poll_rate = info-&gt;dma_rx_poll_rate;</div><div class='add'>+	omap_up.autosuspend_timeout = info-&gt;autosuspend_timeout;</div><div class='add'>+</div><div class='add'>+	/* Enable the MDR1 Errata i202 for OMAP2430/3xxx/44xx */</div><div class='add'>+	if (!cpu_is_omap2420() &amp;&amp; !cpu_is_ti816x())</div><div class='add'>+		omap_up.errata |= UART_ERRATA_i202_MDR1_ACCESS;</div><div class='add'>+</div><div class='add'>+	/* Enable DMA Mode Force Idle Errata i291 for omap34xx/3630 */</div><div class='add'>+	if (cpu_is_omap34xx() || cpu_is_omap3630())</div><div class='add'>+		omap_up.errata |= UART_ERRATA_i291_DMA_FORCEIDLE;</div><div class='ctx'> </div><div class='ctx'> 	pdata = &amp;omap_up;</div><div class='ctx'> 	pdata_size = sizeof(struct omap_uart_port_info);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(!oh))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -782,64 +376,29 @@ void __init omap_serial_init_port(struct omap_board_data *bdata)</div><div class='ctx'> 	WARN(IS_ERR(pdev), "Could not build omap_device for %s: %s.\n",</div><div class='ctx'> 	     name, oh-&gt;name);</div><div class='ctx'> </div><div class='del'>-	omap_device_disable_idle_on_suspend(pdev);</div><div class='add'>+	if ((console_uart_id == bdata-&gt;id) &amp;&amp; no_console_suspend)</div><div class='add'>+		omap_device_disable_idle_on_suspend(pdev);</div><div class='add'>+</div><div class='ctx'> 	oh-&gt;mux = omap_hwmod_mux_init(bdata-&gt;pads, bdata-&gt;pads_cnt);</div><div class='ctx'> </div><div class='del'>-	uart-&gt;irq = oh-&gt;mpu_irqs[0].irq;</div><div class='del'>-	uart-&gt;regshift = 2;</div><div class='del'>-	uart-&gt;mapbase = oh-&gt;slaves[0]-&gt;addr-&gt;pa_start;</div><div class='del'>-	uart-&gt;membase = omap_hwmod_get_mpu_rt_va(oh);</div><div class='ctx'> 	uart-&gt;pdev = pdev;</div><div class='ctx'> </div><div class='ctx'> 	oh-&gt;dev_attr = uart;</div><div class='ctx'> </div><div class='del'>-	console_lock(); /* in case the earlycon is on the UART */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Because of early UART probing, UART did not get idled</div><div class='del'>-	 * on init.  Now that omap_device is ready, ensure full idle</div><div class='del'>-	 * before doing omap_device_enable().</div><div class='del'>-	 */</div><div class='del'>-	omap_hwmod_idle(uart-&gt;oh);</div><div class='del'>-</div><div class='del'>-	omap_device_enable(uart-&gt;pdev);</div><div class='del'>-	omap_uart_idle_init(uart);</div><div class='del'>-	omap_uart_reset(uart);</div><div class='del'>-	omap_hwmod_enable_wakeup(uart-&gt;oh);</div><div class='del'>-	omap_device_idle(uart-&gt;pdev);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Need to block sleep long enough for interrupt driven</div><div class='del'>-	 * driver to start.  Console driver is in polling mode</div><div class='del'>-	 * so device needs to be kept enabled while polling driver</div><div class='del'>-	 * is in use.</div><div class='del'>-	 */</div><div class='del'>-	if (uart-&gt;timeout)</div><div class='del'>-		uart-&gt;timeout = (30 * HZ);</div><div class='del'>-	omap_uart_block_sleep(uart);</div><div class='del'>-	uart-&gt;timeout = DEFAULT_TIMEOUT;</div><div class='del'>-</div><div class='del'>-	console_unlock();</div><div class='del'>-</div><div class='del'>-	if ((cpu_is_omap34xx() &amp;&amp; uart-&gt;padconf) ||</div><div class='del'>-	    (uart-&gt;wk_en &amp;&amp; uart-&gt;wk_mask)) {</div><div class='add'>+	if (((cpu_is_omap34xx() || cpu_is_omap44xx()) &amp;&amp; bdata-&gt;pads)</div><div class='add'>+			&amp;&amp; !uart_debug)</div><div class='ctx'> 		device_init_wakeup(&amp;pdev-&gt;dev, true);</div><div class='del'>-		DEV_CREATE_FILE(&amp;pdev-&gt;dev, &amp;dev_attr_sleep_timeout);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Enable the MDR1 errata for OMAP3 */</div><div class='del'>-	if (cpu_is_omap34xx() &amp;&amp; !cpu_is_ti816x())</div><div class='del'>-		uart-&gt;errata |= UART_ERRATA_i202_MDR1_ACCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * omap_serial_init() - initialize all supported serial ports</div><div class='add'>+ * omap_serial_board_init() - initialize all supported serial ports</div><div class='add'>+ * @info: platform specific data pointer</div><div class='ctx'>  *</div><div class='ctx'>  * Initializes all available UARTs as serial ports. Platforms</div><div class='ctx'>  * can call this function when they want to have default behaviour</div><div class='ctx'>  * for serial ports (e.g initialize them all as serial ports).</div><div class='ctx'>  */</div><div class='del'>-void __init omap_serial_init(void)</div><div class='add'>+void __init omap_serial_board_init(struct omap_uart_port_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct omap_uart_state *uart;</div><div class='ctx'> 	struct omap_board_data bdata;</div><div class='hunk'>@@ -849,7 +408,25 @@ void __init omap_serial_init(void)</div><div class='ctx'> 		bdata.flags = 0;</div><div class='ctx'> 		bdata.pads = NULL;</div><div class='ctx'> 		bdata.pads_cnt = 0;</div><div class='del'>-		omap_serial_init_port(&amp;bdata);</div><div class='ctx'> </div><div class='add'>+		if (cpu_is_omap44xx() || cpu_is_omap34xx())</div><div class='add'>+			omap_serial_fill_default_pads(&amp;bdata);</div><div class='add'>+</div><div class='add'>+		if (!info)</div><div class='add'>+			omap_serial_init_port(&amp;bdata, NULL);</div><div class='add'>+		else</div><div class='add'>+			omap_serial_init_port(&amp;bdata, &amp;info[uart-&gt;num]);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * omap_serial_init() - initialize all supported serial ports</div><div class='add'>+ *</div><div class='add'>+ * Initializes all available UARTs.</div><div class='add'>+ * Platforms can call this function when they want to have default behaviour</div><div class='add'>+ * for serial ports (e.g initialize them all as serial ports).</div><div class='add'>+ */</div><div class='add'>+void __init omap_serial_init(void)</div><div class='add'>+{</div><div class='add'>+	omap_serial_board_init(NULL);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep44xx.S<br/>new file mode 100644<br/>index 000000000000..abd283400490<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sleep44xx.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/sleep44xx.S</a></div><div class='hunk'>@@ -0,0 +1,379 @@</div><div class='add'>+/*</div><div class='add'>+ * OMAP44xx sleep code.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments, Inc.</div><div class='add'>+ * 	Santosh Shilimkar &lt;santosh.shilimkar@ti.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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</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/system.h&gt;</div><div class='add'>+#include &lt;asm/smp_scu.h&gt;</div><div class='add'>+#include &lt;asm/memory.h&gt;</div><div class='add'>+#include &lt;asm/hardware/cache-l2x0.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;plat/omap44xx.h&gt;</div><div class='add'>+#include &lt;mach/omap-secure.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "omap4-sar-layout.h"</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SMP) &amp;&amp; defined(CONFIG_PM)</div><div class='add'>+</div><div class='add'>+.macro	DO_SMC</div><div class='add'>+	dsb</div><div class='add'>+	smc	#0</div><div class='add'>+	dsb</div><div class='add'>+.endm</div><div class='add'>+</div><div class='add'>+ppa_zero_params:</div><div class='add'>+	.word		0x0</div><div class='add'>+</div><div class='add'>+ppa_por_params:</div><div class='add'>+	.word		1, 0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * =============================</div><div class='add'>+ * == CPU suspend finisher ==</div><div class='add'>+ * =============================</div><div class='add'>+ *</div><div class='add'>+ * void omap4_finish_suspend(unsigned long cpu_state)</div><div class='add'>+ *</div><div class='add'>+ * This function code saves the CPU context and performs the CPU</div><div class='add'>+ * power down sequence. Calling WFI effectively changes the CPU</div><div class='add'>+ * power domains states to the desired target power state.</div><div class='add'>+ *</div><div class='add'>+ * @cpu_state : contains context save state (r0)</div><div class='add'>+ *	0 - No context lost</div><div class='add'>+ * 	1 - CPUx L1 and logic lost: MPUSS CSWR</div><div class='add'>+ * 	2 - CPUx L1 and logic lost + GIC lost: MPUSS OSWR</div><div class='add'>+ *	3 - CPUx L1 and logic lost + GIC + L2 lost: MPUSS OFF</div><div class='add'>+ * @return: This function never returns for CPU OFF and DORMANT power states.</div><div class='add'>+ * Post WFI, CPU transitions to DORMANT or OFF power state and on wake-up</div><div class='add'>+ * from this follows a full CPU reset path via ROM code to CPU restore code.</div><div class='add'>+ * The restore function pointer is stored at CPUx_WAKEUP_NS_PA_ADDR_OFFSET.</div><div class='add'>+ * It returns to the caller for CPU INACTIVE and ON power states or in case</div><div class='add'>+ * CPU failed to transition to targeted OFF/DORMANT state.</div><div class='add'>+ */</div><div class='add'>+ENTRY(omap4_finish_suspend)</div><div class='add'>+	stmfd	sp!, {lr}</div><div class='add'>+	cmp	r0, #0x0</div><div class='add'>+	beq	do_WFI				@ No lowpower state, jump to WFI</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Flush all data from the L1 data cache before disabling</div><div class='add'>+	 * SCTLR.C bit.</div><div class='add'>+	 */</div><div class='add'>+	bl	omap4_get_sar_ram_base</div><div class='add'>+	ldr	r9, [r0, #OMAP_TYPE_OFFSET]</div><div class='add'>+	cmp	r9, #0x1			@ Check for HS device</div><div class='add'>+	bne	skip_secure_l1_clean</div><div class='add'>+	mov	r0, #SCU_PM_NORMAL</div><div class='add'>+	mov	r1, #0xFF			@ clean seucre L1</div><div class='add'>+	stmfd   r13!, {r4-r12, r14}</div><div class='add'>+	ldr	r12, =OMAP4_MON_SCU_PWR_INDEX</div><div class='add'>+	DO_SMC</div><div class='add'>+	ldmfd   r13!, {r4-r12, r14}</div><div class='add'>+skip_secure_l1_clean:</div><div class='add'>+	bl	v7_flush_dcache_all</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clear the SCTLR.C bit to prevent further data cache</div><div class='add'>+	 * allocation. Clearing SCTLR.C would make all the data accesses</div><div class='add'>+	 * strongly ordered and would not hit the cache.</div><div class='add'>+	 */</div><div class='add'>+	mrc	p15, 0, r0, c1, c0, 0</div><div class='add'>+	bic	r0, r0, #(1 &lt;&lt; 2)		@ Disable the C bit</div><div class='add'>+	mcr	p15, 0, r0, c1, c0, 0</div><div class='add'>+	isb</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Invalidate L1 data cache. Even though only invalidate is</div><div class='add'>+	 * necessary exported flush API is used here. Doing clean</div><div class='add'>+	 * on already clean cache would be almost NOP.</div><div class='add'>+	 */</div><div class='add'>+	bl	v7_flush_dcache_all</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Switch the CPU from Symmetric Multiprocessing (SMP) mode</div><div class='add'>+	 * to AsymmetricMultiprocessing (AMP) mode by programming</div><div class='add'>+	 * the SCU power status to DORMANT or OFF mode.</div><div class='add'>+	 * This enables the CPU to be taken out of coherency by</div><div class='add'>+	 * preventing the CPU from receiving cache, TLB, or BTB</div><div class='add'>+	 * maintenance operations broadcast by other CPUs in the cluster.</div><div class='add'>+	 */</div><div class='add'>+	bl	omap4_get_sar_ram_base</div><div class='add'>+	mov	r8, r0</div><div class='add'>+	ldr	r9, [r8, #OMAP_TYPE_OFFSET]</div><div class='add'>+	cmp	r9, #0x1			@ Check for HS device</div><div class='add'>+	bne	scu_gp_set</div><div class='add'>+	mrc	p15, 0, r0, c0, c0, 5		@ Read MPIDR</div><div class='add'>+	ands	r0, r0, #0x0f</div><div class='add'>+	ldreq	r0, [r8, #SCU_OFFSET0]</div><div class='add'>+	ldrne	r0, [r8, #SCU_OFFSET1]</div><div class='add'>+	mov	r1, #0x00</div><div class='add'>+	stmfd   r13!, {r4-r12, r14}</div><div class='add'>+	ldr	r12, =OMAP4_MON_SCU_PWR_INDEX</div><div class='add'>+	DO_SMC</div><div class='add'>+	ldmfd   r13!, {r4-r12, r14}</div><div class='add'>+	b	skip_scu_gp_set</div><div class='add'>+scu_gp_set:</div><div class='add'>+	mrc	p15, 0, r0, c0, c0, 5		@ Read MPIDR</div><div class='add'>+	ands	r0, r0, #0x0f</div><div class='add'>+	ldreq	r1, [r8, #SCU_OFFSET0]</div><div class='add'>+	ldrne	r1, [r8, #SCU_OFFSET1]</div><div class='add'>+	bl	omap4_get_scu_base</div><div class='add'>+	bl	scu_power_mode</div><div class='add'>+skip_scu_gp_set:</div><div class='add'>+	mrc	p15, 0, r0, c1, c1, 2		@ Read NSACR data</div><div class='add'>+	tst	r0, #(1 &lt;&lt; 18)</div><div class='add'>+	mrcne	p15, 0, r0, c1, c0, 1</div><div class='add'>+	bicne	r0, r0, #(1 &lt;&lt; 6)		@ Disable SMP bit</div><div class='add'>+	mcrne	p15, 0, r0, c1, c0, 1</div><div class='add'>+	isb</div><div class='add'>+	dsb</div><div class='add'>+#ifdef CONFIG_CACHE_L2X0</div><div class='add'>+	/*</div><div class='add'>+	 * Clean and invalidate the L2 cache.</div><div class='add'>+	 * Common cache-l2x0.c functions can't be used here since it</div><div class='add'>+	 * uses spinlocks. We are out of coherency here with data cache</div><div class='add'>+	 * disabled. The spinlock implementation uses exclusive load/store</div><div class='add'>+	 * instruction which can fail without data cache being enabled.</div><div class='add'>+	 * OMAP4 hardware doesn't support exclusive monitor which can</div><div class='add'>+	 * overcome exclusive access issue. Because of this, CPU can</div><div class='add'>+	 * lead to deadlock.</div><div class='add'>+	 */</div><div class='add'>+	bl	omap4_get_sar_ram_base</div><div class='add'>+	mov	r8, r0</div><div class='add'>+	mrc	p15, 0, r5, c0, c0, 5		@ Read MPIDR</div><div class='add'>+	ands	r5, r5, #0x0f</div><div class='add'>+	ldreq	r0, [r8, #L2X0_SAVE_OFFSET0]	@ Retrieve L2 state from SAR</div><div class='add'>+	ldrne	r0, [r8, #L2X0_SAVE_OFFSET1]	@ memory.</div><div class='add'>+	cmp	r0, #3</div><div class='add'>+	bne	do_WFI</div><div class='add'>+#ifdef CONFIG_PL310_ERRATA_727915</div><div class='add'>+	mov	r0, #0x03</div><div class='add'>+	mov	r12, #OMAP4_MON_L2X0_DBG_CTRL_INDEX</div><div class='add'>+	DO_SMC</div><div class='add'>+#endif</div><div class='add'>+	bl	omap4_get_l2cache_base</div><div class='add'>+	mov	r2, r0</div><div class='add'>+	ldr	r0, =0xffff</div><div class='add'>+	str	r0, [r2, #L2X0_CLEAN_INV_WAY]</div><div class='add'>+wait:</div><div class='add'>+	ldr	r0, [r2, #L2X0_CLEAN_INV_WAY]</div><div class='add'>+	ldr	r1, =0xffff</div><div class='add'>+	ands	r0, r0, r1</div><div class='add'>+	bne	wait</div><div class='add'>+#ifdef CONFIG_PL310_ERRATA_727915</div><div class='add'>+	mov	r0, #0x00</div><div class='add'>+	mov	r12, #OMAP4_MON_L2X0_DBG_CTRL_INDEX</div><div class='add'>+	DO_SMC</div><div class='add'>+#endif</div><div class='add'>+l2x_sync:</div><div class='add'>+	bl	omap4_get_l2cache_base</div><div class='add'>+	mov	r2, r0</div><div class='add'>+	mov	r0, #0x0</div><div class='add'>+	str	r0, [r2, #L2X0_CACHE_SYNC]</div><div class='add'>+sync:</div><div class='add'>+	ldr	r0, [r2, #L2X0_CACHE_SYNC]</div><div class='add'>+	ands	r0, r0, #0x1</div><div class='add'>+	bne	sync</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+do_WFI:</div><div class='add'>+	bl	omap_do_wfi</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * CPU is here when it failed to enter OFF/DORMANT or</div><div class='add'>+	 * no low power state was attempted.</div><div class='add'>+	 */</div><div class='add'>+	mrc	p15, 0, r0, c1, c0, 0</div><div class='add'>+	tst	r0, #(1 &lt;&lt; 2)			@ Check C bit enabled?</div><div class='add'>+	orreq	r0, r0, #(1 &lt;&lt; 2)		@ Enable the C bit</div><div class='add'>+	mcreq	p15, 0, r0, c1, c0, 0</div><div class='add'>+	isb</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure the CPU power state is set to NORMAL in</div><div class='add'>+	 * SCU power state so that CPU is back in coherency.</div><div class='add'>+	 * In non-coherent mode CPU can lock-up and lead to</div><div class='add'>+	 * system deadlock.</div><div class='add'>+	 */</div><div class='add'>+	mrc	p15, 0, r0, c1, c0, 1</div><div class='add'>+	tst	r0, #(1 &lt;&lt; 6)			@ Check SMP bit enabled?</div><div class='add'>+	orreq	r0, r0, #(1 &lt;&lt; 6)</div><div class='add'>+	mcreq	p15, 0, r0, c1, c0, 1</div><div class='add'>+	isb</div><div class='add'>+	bl	omap4_get_sar_ram_base</div><div class='add'>+	mov	r8, r0</div><div class='add'>+	ldr	r9, [r8, #OMAP_TYPE_OFFSET]</div><div class='add'>+	cmp	r9, #0x1			@ Check for HS device</div><div class='add'>+	bne	scu_gp_clear</div><div class='add'>+	mov	r0, #SCU_PM_NORMAL</div><div class='add'>+	mov	r1, #0x00</div><div class='add'>+	stmfd   r13!, {r4-r12, r14}</div><div class='add'>+	ldr	r12, =OMAP4_MON_SCU_PWR_INDEX</div><div class='add'>+	DO_SMC</div><div class='add'>+	ldmfd   r13!, {r4-r12, r14}</div><div class='add'>+	b	skip_scu_gp_clear</div><div class='add'>+scu_gp_clear:</div><div class='add'>+	bl	omap4_get_scu_base</div><div class='add'>+	mov	r1, #SCU_PM_NORMAL</div><div class='add'>+	bl	scu_power_mode</div><div class='add'>+skip_scu_gp_clear:</div><div class='add'>+	isb</div><div class='add'>+	dsb</div><div class='add'>+	ldmfd	sp!, {pc}</div><div class='add'>+ENDPROC(omap4_finish_suspend)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ============================</div><div class='add'>+ * == CPU resume entry point ==</div><div class='add'>+ * ============================</div><div class='add'>+ *</div><div class='add'>+ * void omap4_cpu_resume(void)</div><div class='add'>+ *</div><div class='add'>+ * ROM code jumps to this function while waking up from CPU</div><div class='add'>+ * OFF or DORMANT state. Physical address of the function is</div><div class='add'>+ * stored in the SAR RAM while entering to OFF or DORMANT mode.</div><div class='add'>+ * The restore function pointer is stored at CPUx_WAKEUP_NS_PA_ADDR_OFFSET.</div><div class='add'>+ */</div><div class='add'>+ENTRY(omap4_cpu_resume)</div><div class='add'>+	/*</div><div class='add'>+	 * Configure ACTRL and enable NS SMP bit access on CPU1 on HS device.</div><div class='add'>+	 * OMAP44XX EMU/HS devices - CPU0 SMP bit access is enabled in PPA</div><div class='add'>+	 * init and for CPU1, a secure PPA API provided. CPU0 must be ON</div><div class='add'>+	 * while executing NS_SMP API on CPU1 and PPA version must be 1.4.0+.</div><div class='add'>+	 * OMAP443X GP devices- SMP bit isn't accessible.</div><div class='add'>+	 * OMAP446X GP devices - SMP bit access is enabled on both CPUs.</div><div class='add'>+	 */</div><div class='add'>+	ldr	r8, =OMAP44XX_SAR_RAM_BASE</div><div class='add'>+	ldr	r9, [r8, #OMAP_TYPE_OFFSET]</div><div class='add'>+	cmp	r9, #0x1			@ Skip if GP device</div><div class='add'>+	bne	skip_ns_smp_enable</div><div class='add'>+	mrc     p15, 0, r0, c0, c0, 5</div><div class='add'>+	ands    r0, r0, #0x0f</div><div class='add'>+	beq	skip_ns_smp_enable</div><div class='add'>+ppa_actrl_retry:</div><div class='add'>+	mov     r0, #OMAP4_PPA_CPU_ACTRL_SMP_INDEX</div><div class='add'>+	adr	r3, ppa_zero_params		@ Pointer to parameters</div><div class='add'>+	mov	r1, #0x0			@ Process ID</div><div class='add'>+	mov	r2, #0x4			@ Flag</div><div class='add'>+	mov	r6, #0xff</div><div class='add'>+	mov	r12, #0x00			@ Secure Service ID</div><div class='add'>+	DO_SMC</div><div class='add'>+	cmp	r0, #0x0			@ API returns 0 on success.</div><div class='add'>+	beq	enable_smp_bit</div><div class='add'>+	b	ppa_actrl_retry</div><div class='add'>+enable_smp_bit:</div><div class='add'>+	mrc	p15, 0, r0, c1, c0, 1</div><div class='add'>+	tst	r0, #(1 &lt;&lt; 6)			@ Check SMP bit enabled?</div><div class='add'>+	orreq	r0, r0, #(1 &lt;&lt; 6)</div><div class='add'>+	mcreq	p15, 0, r0, c1, c0, 1</div><div class='add'>+	isb</div><div class='add'>+skip_ns_smp_enable:</div><div class='add'>+#ifdef CONFIG_CACHE_L2X0</div><div class='add'>+	/*</div><div class='add'>+	 * Restore the L2 AUXCTRL and enable the L2 cache.</div><div class='add'>+	 * OMAP4_MON_L2X0_AUXCTRL_INDEX =  Program the L2X0 AUXCTRL</div><div class='add'>+	 * OMAP4_MON_L2X0_CTRL_INDEX =  Enable the L2 using L2X0 CTRL</div><div class='add'>+	 * register r0 contains value to be programmed.</div><div class='add'>+	 * L2 cache is already invalidate by ROM code as part</div><div class='add'>+	 * of MPUSS OFF wakeup path.</div><div class='add'>+	 */</div><div class='add'>+	ldr	r2, =OMAP44XX_L2CACHE_BASE</div><div class='add'>+	ldr	r0, [r2, #L2X0_CTRL]</div><div class='add'>+	and	r0, #0x0f</div><div class='add'>+	cmp	r0, #1</div><div class='add'>+	beq	skip_l2en			@ Skip if already enabled</div><div class='add'>+	ldr	r3, =OMAP44XX_SAR_RAM_BASE</div><div class='add'>+	ldr	r1, [r3, #OMAP_TYPE_OFFSET]</div><div class='add'>+	cmp	r1, #0x1			@ Check for HS device</div><div class='add'>+	bne     set_gp_por</div><div class='add'>+	ldr     r0, =OMAP4_PPA_L2_POR_INDEX</div><div class='add'>+	ldr     r1, =OMAP44XX_SAR_RAM_BASE</div><div class='add'>+	ldr     r4, [r1, #L2X0_PREFETCH_CTRL_OFFSET]</div><div class='add'>+	adr     r3, ppa_por_params</div><div class='add'>+	str     r4, [r3, #0x04]</div><div class='add'>+	mov	r1, #0x0			@ Process ID</div><div class='add'>+	mov	r2, #0x4			@ Flag</div><div class='add'>+	mov	r6, #0xff</div><div class='add'>+	mov	r12, #0x00			@ Secure Service ID</div><div class='add'>+	DO_SMC</div><div class='add'>+	b	set_aux_ctrl</div><div class='add'>+set_gp_por:</div><div class='add'>+	ldr     r1, =OMAP44XX_SAR_RAM_BASE</div><div class='add'>+	ldr     r0, [r1, #L2X0_PREFETCH_CTRL_OFFSET]</div><div class='add'>+	ldr	r12, =OMAP4_MON_L2X0_PREFETCH_INDEX	@ Setup L2 PREFETCH</div><div class='add'>+	DO_SMC</div><div class='add'>+set_aux_ctrl:</div><div class='add'>+	ldr     r1, =OMAP44XX_SAR_RAM_BASE</div><div class='add'>+	ldr	r0, [r1, #L2X0_AUXCTRL_OFFSET]</div><div class='add'>+	ldr	r12, =OMAP4_MON_L2X0_AUXCTRL_INDEX	@ Setup L2 AUXCTRL</div><div class='add'>+	DO_SMC</div><div class='add'>+	mov	r0, #0x1</div><div class='add'>+	ldr	r12, =OMAP4_MON_L2X0_CTRL_INDEX		@ Enable L2 cache</div><div class='add'>+	DO_SMC</div><div class='add'>+skip_l2en:</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	b	cpu_resume			@ Jump to generic resume</div><div class='add'>+ENDPROC(omap4_cpu_resume)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_OMAP4_ERRATA_I688</div><div class='add'>+ENTRY(omap_bus_sync)</div><div class='add'>+	mov	pc, lr</div><div class='add'>+ENDPROC(omap_bus_sync)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+ENTRY(omap_do_wfi)</div><div class='add'>+	stmfd	sp!, {lr}</div><div class='add'>+	/* Drain interconnect write buffers. */</div><div class='add'>+	bl omap_bus_sync</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Execute an ISB instruction to ensure that all of the</div><div class='add'>+	 * CP15 register changes have been committed.</div><div class='add'>+	 */</div><div class='add'>+	isb</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Execute a barrier instruction to ensure that all cache,</div><div class='add'>+	 * TLB and branch predictor maintenance operations issued</div><div class='add'>+	 * by any CPU in the cluster have completed.</div><div class='add'>+	 */</div><div class='add'>+	dsb</div><div class='add'>+	dmb</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Execute a WFI instruction and wait until the</div><div class='add'>+	 * STANDBYWFI output is asserted to indicate that the</div><div class='add'>+	 * CPU is in idle and low power state. CPU can specualatively</div><div class='add'>+	 * prefetch the instructions so add NOPs after WFI. Sixteen</div><div class='add'>+	 * NOPs as per Cortex-A9 pipeline.</div><div class='add'>+	 */</div><div class='add'>+	wfi					@ Wait For Interrupt</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+</div><div class='add'>+	ldmfd	sp!, {pc}</div><div class='add'>+ENDPROC(omap_do_wfi)</div><div class='head'>diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c<br/>index cf246b39bac7..9dd93453e563 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/smartreflex.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/smartreflex.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/smartreflex.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/smartreflex.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #include "pm.h"</div><div class='ctx'> #include "smartreflex.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c<br/>index 037b0d7d4e05..6eeff0e0ae01 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/timer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/timer.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> #include &lt;plat/dmtimer.h&gt;</div><div class='ctx'> #include &lt;asm/localtimer.h&gt;</div><div class='ctx'> #include &lt;asm/sched_clock.h&gt;</div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/omap_hwmod.h&gt;</div><div class='ctx'> #include &lt;plat/omap_device.h&gt;</div><div class='ctx'> #include &lt;plat/omap-pm.h&gt;</div><div class='hunk'>@@ -254,7 +254,6 @@ static struct omap_dm_timer clksrc;</div><div class='ctx'> /*</div><div class='ctx'>  * clocksource</div><div class='ctx'>  */</div><div class='del'>-static DEFINE_CLOCK_DATA(cd);</div><div class='ctx'> static cycle_t clocksource_read_cycles(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	return (cycle_t)__omap_dm_timer_read_counter(&amp;clksrc, 1);</div><div class='hunk'>@@ -268,23 +267,12 @@ static struct clocksource clocksource_gpt = {</div><div class='ctx'> 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void notrace dmtimer_update_sched_clock(void)</div><div class='add'>+static u32 notrace dmtimer_read_sched_clock(void)</div><div class='ctx'> {</div><div class='del'>-	u32 cyc;</div><div class='del'>-</div><div class='del'>-	cyc = __omap_dm_timer_read_counter(&amp;clksrc, 1);</div><div class='del'>-</div><div class='del'>-	update_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned long long notrace sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	u32 cyc = 0;</div><div class='del'>-</div><div class='ctx'> 	if (clksrc.reserved)</div><div class='del'>-		cyc = __omap_dm_timer_read_counter(&amp;clksrc, 1);</div><div class='add'>+		return __omap_dm_timer_read_counter(clksrc.io_base, 1);</div><div class='ctx'> </div><div class='del'>-	return cyc_to_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Setup free-running counter for clocksource */</div><div class='hunk'>@@ -301,7 +289,7 @@ static void __init omap2_gp_clocksource_init(int gptimer_id,</div><div class='ctx'> </div><div class='ctx'> 	__omap_dm_timer_load_start(&amp;clksrc,</div><div class='ctx'> 			OMAP_TIMER_CTRL_ST | OMAP_TIMER_CTRL_AR, 0, 1);</div><div class='del'>-	init_sched_clock(&amp;cd, dmtimer_update_sched_clock, 32, clksrc.rate);</div><div class='add'>+	setup_sched_clock(dmtimer_read_sched_clock, 32, clksrc.rate);</div><div class='ctx'> </div><div class='ctx'> 	if (clocksource_register_hz(&amp;clocksource_gpt, clksrc.rate))</div><div class='ctx'> 		pr_err("Could not register clocksource %s\n",</div><div class='head'>diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c<br/>index 89ae29847c59..771dc781b746 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/usb-host.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/usb-host.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/usb-host.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/usb-host.c</a></div><div class='hunk'>@@ -28,51 +28,28 @@</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/irqs.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='add'>+#include &lt;plat/omap_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mux.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MFD_OMAP_USB_HOST</div><div class='ctx'> </div><div class='del'>-#define OMAP_USBHS_DEVICE	"usbhs-omap"</div><div class='del'>-</div><div class='del'>-static struct resource usbhs_resources[] = {</div><div class='del'>-	{</div><div class='del'>-		.name	= "uhh",</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.name	= "tll",</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.name	= "ehci",</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.name	= "ehci-irq",</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.name	= "ohci",</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.name	= "ohci-irq",</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device usbhs_device = {</div><div class='del'>-	.name		= OMAP_USBHS_DEVICE,</div><div class='del'>-	.id		= 0,</div><div class='del'>-	.num_resources	= ARRAY_SIZE(usbhs_resources),</div><div class='del'>-	.resource	= usbhs_resources,</div><div class='del'>-};</div><div class='add'>+#define OMAP_USBHS_DEVICE	"usbhs_omap"</div><div class='add'>+#define	USBHS_UHH_HWMODNAME	"usb_host_hs"</div><div class='add'>+#define USBHS_TLL_HWMODNAME	"usb_tll_hs"</div><div class='ctx'> </div><div class='ctx'> static struct usbhs_omap_platform_data		usbhs_data;</div><div class='ctx'> static struct ehci_hcd_omap_platform_data	ehci_data;</div><div class='ctx'> static struct ohci_hcd_omap_platform_data	ohci_data;</div><div class='ctx'> </div><div class='add'>+static struct omap_device_pm_latency omap_uhhtll_latency[] = {</div><div class='add'>+	  {</div><div class='add'>+		.deactivate_func = omap_device_idle_hwmods,</div><div class='add'>+		.activate_func	 = omap_device_enable_hwmods,</div><div class='add'>+		.flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,</div><div class='add'>+	  },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* MUX settings for EHCI pins */</div><div class='ctx'> /*</div><div class='ctx'>  * setup_ehci_io_mux - initialize IO pad mux for USBHOST</div><div class='hunk'>@@ -508,7 +485,10 @@ static void setup_4430ohci_io_mux(const enum usbhs_omap_port_mode *port_mode)</div><div class='ctx'> </div><div class='ctx'> void __init usbhs_init(const struct usbhs_omap_board_data *pdata)</div><div class='ctx'> {</div><div class='del'>-	int	i;</div><div class='add'>+	struct omap_hwmod	*oh[2];</div><div class='add'>+	struct omap_device	*od;</div><div class='add'>+	int			bus_id = -1;</div><div class='add'>+	int			i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; OMAP3_HS_USB_PORTS; i++) {</div><div class='ctx'> 		usbhs_data.port_mode[i] = pdata-&gt;port_mode[i];</div><div class='hunk'>@@ -523,44 +503,34 @@ void __init usbhs_init(const struct usbhs_omap_board_data *pdata)</div><div class='ctx'> 	usbhs_data.ohci_data = &amp;ohci_data;</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_is_omap34xx()) {</div><div class='del'>-		usbhs_resources[0].start = OMAP34XX_UHH_CONFIG_BASE;</div><div class='del'>-		usbhs_resources[0].end = OMAP34XX_UHH_CONFIG_BASE + SZ_1K - 1;</div><div class='del'>-		usbhs_resources[1].start = OMAP34XX_USBTLL_BASE;</div><div class='del'>-		usbhs_resources[1].end = OMAP34XX_USBTLL_BASE + SZ_4K - 1;</div><div class='del'>-		usbhs_resources[2].start	= OMAP34XX_EHCI_BASE;</div><div class='del'>-		usbhs_resources[2].end	= OMAP34XX_EHCI_BASE + SZ_1K - 1;</div><div class='del'>-		usbhs_resources[3].start = INT_34XX_EHCI_IRQ;</div><div class='del'>-		usbhs_resources[4].start	= OMAP34XX_OHCI_BASE;</div><div class='del'>-		usbhs_resources[4].end	= OMAP34XX_OHCI_BASE + SZ_1K - 1;</div><div class='del'>-		usbhs_resources[5].start = INT_34XX_OHCI_IRQ;</div><div class='ctx'> 		setup_ehci_io_mux(pdata-&gt;port_mode);</div><div class='ctx'> 		setup_ohci_io_mux(pdata-&gt;port_mode);</div><div class='ctx'> 	} else if (cpu_is_omap44xx()) {</div><div class='del'>-		usbhs_resources[0].start = OMAP44XX_UHH_CONFIG_BASE;</div><div class='del'>-		usbhs_resources[0].end = OMAP44XX_UHH_CONFIG_BASE + SZ_1K - 1;</div><div class='del'>-		usbhs_resources[1].start = OMAP44XX_USBTLL_BASE;</div><div class='del'>-		usbhs_resources[1].end = OMAP44XX_USBTLL_BASE + SZ_4K - 1;</div><div class='del'>-		usbhs_resources[2].start = OMAP44XX_HSUSB_EHCI_BASE;</div><div class='del'>-		usbhs_resources[2].end = OMAP44XX_HSUSB_EHCI_BASE + SZ_1K - 1;</div><div class='del'>-		usbhs_resources[3].start = OMAP44XX_IRQ_EHCI;</div><div class='del'>-		usbhs_resources[4].start = OMAP44XX_HSUSB_OHCI_BASE;</div><div class='del'>-		usbhs_resources[4].end = OMAP44XX_HSUSB_OHCI_BASE + SZ_1K - 1;</div><div class='del'>-		usbhs_resources[5].start = OMAP44XX_IRQ_OHCI;</div><div class='ctx'> 		setup_4430ehci_io_mux(pdata-&gt;port_mode);</div><div class='ctx'> 		setup_4430ohci_io_mux(pdata-&gt;port_mode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (platform_device_add_data(&amp;usbhs_device,</div><div class='del'>-				&amp;usbhs_data, sizeof(usbhs_data)) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "USBHS platform_device_add_data failed\n");</div><div class='del'>-		goto init_end;</div><div class='add'>+	oh[0] = omap_hwmod_lookup(USBHS_UHH_HWMODNAME);</div><div class='add'>+	if (!oh[0]) {</div><div class='add'>+		pr_err("Could not look up %s\n", USBHS_UHH_HWMODNAME);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (platform_device_register(&amp;usbhs_device) &lt; 0)</div><div class='del'>-		printk(KERN_ERR "USBHS platform_device_register failed\n");</div><div class='add'>+	oh[1] = omap_hwmod_lookup(USBHS_TLL_HWMODNAME);</div><div class='add'>+	if (!oh[1]) {</div><div class='add'>+		pr_err("Could not look up %s\n", USBHS_TLL_HWMODNAME);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-init_end:</div><div class='del'>-	return;</div><div class='add'>+	od = omap_device_build_ss(OMAP_USBHS_DEVICE, bus_id, oh, 2,</div><div class='add'>+				(void *)&amp;usbhs_data, sizeof(usbhs_data),</div><div class='add'>+				omap_uhhtll_latency,</div><div class='add'>+				ARRAY_SIZE(omap_uhhtll_latency), false);</div><div class='add'>+	if (IS_ERR(od)) {</div><div class='add'>+		pr_err("Could not build hwmod devices %s,%s\n",</div><div class='add'>+			USBHS_UHH_HWMODNAME, USBHS_TLL_HWMODNAME);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='hunk'>@@ -570,5 +540,3 @@ void __init usbhs_init(const struct usbhs_omap_board_data *pdata)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c<br/>index 267975086a7b..8d5ed775dd56 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/usb-musb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/usb-musb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/usb-musb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/usb-musb.c</a></div><div class='hunk'>@@ -93,6 +93,9 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data)</div><div class='ctx'> 	if (cpu_is_omap3517() || cpu_is_omap3505()) {</div><div class='ctx'> 		oh_name = "am35x_otg_hs";</div><div class='ctx'> 		name = "musb-am35x";</div><div class='add'>+	} else if (cpu_is_ti81xx()) {</div><div class='add'>+		oh_name = "usb_otg_hs";</div><div class='add'>+		name = "musb-ti81xx";</div><div class='ctx'> 	} else {</div><div class='ctx'> 		oh_name = "usb_otg_hs";</div><div class='ctx'> 		name = "musb-omap2430";</div><div class='head'>diff --git a/arch/arm/mach-omap2/vc3xxx_data.c b/arch/arm/mach-omap2/vc3xxx_data.c<br/>index cfe348e1af0e..a5ec7f8f2ea8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/vc3xxx_data.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/vc3xxx_data.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/vc3xxx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/vc3xxx_data.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #include "prm-regbits-34xx.h"</div><div class='ctx'> #include "voltage.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/vc44xx_data.c b/arch/arm/mach-omap2/vc44xx_data.c<br/>index 2740a968145e..d70b930f2739 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/vc44xx_data.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/vc44xx_data.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/vc44xx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/vc44xx_data.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #include "prm44xx.h"</div><div class='ctx'> #include "prm-regbits-44xx.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c<br/>index 1f8fdf736e63..8a36342e60d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/voltage.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/voltage.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/voltage.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/voltage.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #include "prm-regbits-34xx.h"</div><div class='ctx'> #include "prm-regbits-44xx.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c b/arch/arm/mach-omap2/voltagedomains3xxx_data.c<br/>index 071101debbbc..c005e2f5e383 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/voltagedomains3xxx_data.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/voltagedomains3xxx_data.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/voltagedomains3xxx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/voltagedomains3xxx_data.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "prm-regbits-34xx.h"</div><div class='hunk'>@@ -31,6 +31,14 @@</div><div class='ctx'>  * VDD data</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/* OMAP3-common voltagedomain data */</div><div class='add'>+</div><div class='add'>+static struct voltagedomain omap3_voltdm_wkup = {</div><div class='add'>+	.name = "wakeup",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 34xx/36xx voltagedomain data */</div><div class='add'>+</div><div class='ctx'> static const struct omap_vfsm_instance omap3_vdd1_vfsm = {</div><div class='ctx'> 	.voltsetup_reg = OMAP3_PRM_VOLTSETUP1_OFFSET,</div><div class='ctx'> 	.voltsetup_mask = OMAP3430_SETUP_TIME1_MASK,</div><div class='hunk'>@@ -63,10 +71,6 @@ static struct voltagedomain omap3_voltdm_core = {</div><div class='ctx'> 	.vp = &amp;omap3_vp_core,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct voltagedomain omap3_voltdm_wkup = {</div><div class='del'>-	.name = "wakeup",</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct voltagedomain *voltagedomains_omap3[] __initdata = {</div><div class='ctx'> 	&amp;omap3_voltdm_mpu,</div><div class='ctx'> 	&amp;omap3_voltdm_core,</div><div class='hunk'>@@ -74,11 +78,30 @@ static struct voltagedomain *voltagedomains_omap3[] __initdata = {</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* AM35xx voltagedomain data */</div><div class='add'>+</div><div class='add'>+static struct voltagedomain am35xx_voltdm_mpu = {</div><div class='add'>+	.name = "mpu_iva",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct voltagedomain am35xx_voltdm_core = {</div><div class='add'>+	.name = "core",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct voltagedomain *voltagedomains_am35xx[] __initdata = {</div><div class='add'>+	&amp;am35xx_voltdm_mpu,</div><div class='add'>+	&amp;am35xx_voltdm_core,</div><div class='add'>+	&amp;omap3_voltdm_wkup,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static const char *sys_clk_name __initdata = "sys_ck";</div><div class='ctx'> </div><div class='ctx'> void __init omap3xxx_voltagedomains_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct voltagedomain *voltdm;</div><div class='add'>+	struct voltagedomain **voltdms;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -93,8 +116,13 @@ void __init omap3xxx_voltagedomains_init(void)</div><div class='ctx'> 		omap3_voltdm_core.volt_data = omap34xx_vddcore_volt_data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; voltdm = voltagedomains_omap3[i], voltdm; i++)</div><div class='add'>+	if (cpu_is_omap3517() || cpu_is_omap3505())</div><div class='add'>+		voltdms = voltagedomains_am35xx;</div><div class='add'>+	else</div><div class='add'>+		voltdms = voltagedomains_omap3;</div><div class='add'>+</div><div class='add'>+	for (i = 0; voltdm = voltdms[i], voltdm; i++)</div><div class='ctx'> 		voltdm-&gt;sys_clk.name = sys_clk_name;</div><div class='ctx'> </div><div class='del'>-	voltdm_init(voltagedomains_omap3);</div><div class='add'>+	voltdm_init(voltdms);</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-omap2/voltagedomains44xx_data.c b/arch/arm/mach-omap2/voltagedomains44xx_data.c<br/>index c4584e9ac717..4e11d022595d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/voltagedomains44xx_data.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/voltagedomains44xx_data.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/voltagedomains44xx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/voltagedomains44xx_data.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #include "prm-regbits-44xx.h"</div><div class='ctx'> #include "prm44xx.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/vp.c b/arch/arm/mach-omap2/vp.c<br/>index 66bd700a2b98..807391d84a9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/vp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/vp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/vp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/vp.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #include "voltage.h"</div><div class='ctx'> #include "vp.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/vp3xxx_data.c b/arch/arm/mach-omap2/vp3xxx_data.c<br/>index 260c554b1547..bd89f80089f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/vp3xxx_data.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/vp3xxx_data.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/vp3xxx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/vp3xxx_data.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #include "prm-regbits-34xx.h"</div><div class='ctx'> #include "voltage.h"</div><div class='head'>diff --git a/arch/arm/mach-omap2/vp44xx_data.c b/arch/arm/mach-omap2/vp44xx_data.c<br/>index b4e77044891e..8c031d16879e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/vp44xx_data.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-omap2/vp44xx_data.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/vp44xx_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-omap2/vp44xx_data.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/common.h&gt;</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #include "prm44xx.h"</div><div class='ctx'> #include "prm-regbits-44xx.h"</div><div class='head'>diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c<br/>index 5ceafdccc456..3638e5c12b7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/addr-map.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/addr-map.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/addr-map.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/addr-map.c</a></div><div class='hunk'>@@ -14,8 +14,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;plat/addr-map.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -41,7 +41,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Generic Address Decode Windows bit settings</div><div class='ctx'>  */</div><div class='del'>-#define TARGET_DDR		0</div><div class='ctx'> #define TARGET_DEV_BUS		1</div><div class='ctx'> #define TARGET_PCI		3</div><div class='ctx'> #define TARGET_PCIE		4</div><div class='hunk'>@@ -57,27 +56,10 @@</div><div class='ctx'> #define ATTR_DEV_BOOT		0xf</div><div class='ctx'> #define ATTR_SRAM		0x0</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Helpers to get DDR bank info</div><div class='del'>- */</div><div class='del'>-#define ORION5X_DDR_REG(x)	(ORION5X_DDR_VIRT_BASE | (x))</div><div class='del'>-#define DDR_BASE_CS(n)		ORION5X_DDR_REG(0x1500 + ((n) &lt;&lt; 3))</div><div class='del'>-#define DDR_SIZE_CS(n)		ORION5X_DDR_REG(0x1504 + ((n) &lt;&lt; 3))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CPU Address Decode Windows registers</div><div class='del'>- */</div><div class='del'>-#define ORION5X_BRIDGE_REG(x)	(ORION5X_BRIDGE_VIRT_BASE | (x))</div><div class='del'>-#define CPU_WIN_CTRL(n)		ORION5X_BRIDGE_REG(0x000 | ((n) &lt;&lt; 4))</div><div class='del'>-#define CPU_WIN_BASE(n)		ORION5X_BRIDGE_REG(0x004 | ((n) &lt;&lt; 4))</div><div class='del'>-#define CPU_WIN_REMAP_LO(n)	ORION5X_BRIDGE_REG(0x008 | ((n) &lt;&lt; 4))</div><div class='del'>-#define CPU_WIN_REMAP_HI(n)	ORION5X_BRIDGE_REG(0x00c | ((n) &lt;&lt; 4))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct mbus_dram_target_info orion5x_mbus_dram_info;</div><div class='ctx'> static int __initdata win_alloc_count;</div><div class='ctx'> </div><div class='del'>-static int __init orion5x_cpu_win_can_remap(int win)</div><div class='add'>+static int __init cpu_win_can_remap(const struct orion_addr_map_cfg *cfg,</div><div class='add'>+		  const int win)</div><div class='ctx'> {</div><div class='ctx'> 	u32 dev, rev;</div><div class='ctx'> </div><div class='hunk'>@@ -91,116 +73,82 @@ static int __init orion5x_cpu_win_can_remap(int win)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init setup_cpu_win(int win, u32 base, u32 size,</div><div class='del'>-				 u8 target, u8 attr, int remap)</div><div class='del'>-{</div><div class='del'>-	if (win &gt;= 8) {</div><div class='del'>-		printk(KERN_ERR "setup_cpu_win: trying to allocate "</div><div class='del'>-				"window %d\n", win);</div><div class='del'>-		return -ENOSPC;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	writel(base &amp; 0xffff0000, CPU_WIN_BASE(win));</div><div class='del'>-	writel(((size - 1) &amp; 0xffff0000) | (attr &lt;&lt; 8) | (target &lt;&lt; 4) | 1,</div><div class='del'>-		CPU_WIN_CTRL(win));</div><div class='del'>-</div><div class='del'>-	if (orion5x_cpu_win_can_remap(win)) {</div><div class='del'>-		if (remap &lt; 0)</div><div class='del'>-			remap = base;</div><div class='del'>-</div><div class='del'>-		writel(remap &amp; 0xffff0000, CPU_WIN_REMAP_LO(win));</div><div class='del'>-		writel(0, CPU_WIN_REMAP_HI(win));</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init orion5x_setup_cpu_mbus_bridge(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int cs;</div><div class='add'>+/*</div><div class='add'>+ * Description of the windows needed by the platform code</div><div class='add'>+ */</div><div class='add'>+static struct __initdata orion_addr_map_cfg addr_map_cfg = {</div><div class='add'>+	.num_wins = 8,</div><div class='add'>+	.cpu_win_can_remap = cpu_win_can_remap,</div><div class='add'>+	.bridge_virt_base = ORION5X_BRIDGE_VIRT_BASE,</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+static const struct __initdata orion_addr_map_info addr_map_info[] = {</div><div class='ctx'> 	/*</div><div class='del'>-	 * First, disable and clear windows.</div><div class='add'>+	 * Setup windows for PCI+PCIe IO+MEM space.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		writel(0, CPU_WIN_BASE(i));</div><div class='del'>-		writel(0, CPU_WIN_CTRL(i));</div><div class='del'>-		if (orion5x_cpu_win_can_remap(i)) {</div><div class='del'>-			writel(0, CPU_WIN_REMAP_LO(i));</div><div class='del'>-			writel(0, CPU_WIN_REMAP_HI(i));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	{ 0, ORION5X_PCIE_IO_PHYS_BASE, ORION5X_PCIE_IO_SIZE,</div><div class='add'>+	  TARGET_PCIE, ATTR_PCIE_IO, ORION5X_PCIE_IO_BUS_BASE</div><div class='add'>+	},</div><div class='add'>+	{ 1, ORION5X_PCI_IO_PHYS_BASE, ORION5X_PCI_IO_SIZE,</div><div class='add'>+	  TARGET_PCI, ATTR_PCI_IO, ORION5X_PCI_IO_BUS_BASE</div><div class='add'>+	},</div><div class='add'>+	{ 2, ORION5X_PCIE_MEM_PHYS_BASE, ORION5X_PCIE_MEM_SIZE,</div><div class='add'>+	  TARGET_PCIE, ATTR_PCIE_MEM, -1</div><div class='add'>+	},</div><div class='add'>+	{ 3, ORION5X_PCI_MEM_PHYS_BASE, ORION5X_PCI_MEM_SIZE,</div><div class='add'>+	  TARGET_PCI, ATTR_PCI_MEM, -1</div><div class='add'>+	},</div><div class='add'>+	/* End marker */</div><div class='add'>+	{ -1, 0, 0, 0, 0, 0 }</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+void __init orion5x_setup_cpu_mbus_bridge(void)</div><div class='add'>+{</div><div class='ctx'> 	/*</div><div class='del'>-	 * Setup windows for PCI+PCIe IO+MEM space.</div><div class='add'>+	 * Disable, clear and configure windows.</div><div class='ctx'> 	 */</div><div class='del'>-	setup_cpu_win(0, ORION5X_PCIE_IO_PHYS_BASE, ORION5X_PCIE_IO_SIZE,</div><div class='del'>-		TARGET_PCIE, ATTR_PCIE_IO, ORION5X_PCIE_IO_BUS_BASE);</div><div class='del'>-	setup_cpu_win(1, ORION5X_PCI_IO_PHYS_BASE, ORION5X_PCI_IO_SIZE,</div><div class='del'>-		TARGET_PCI, ATTR_PCI_IO, ORION5X_PCI_IO_BUS_BASE);</div><div class='del'>-	setup_cpu_win(2, ORION5X_PCIE_MEM_PHYS_BASE, ORION5X_PCIE_MEM_SIZE,</div><div class='del'>-		TARGET_PCIE, ATTR_PCIE_MEM, -1);</div><div class='del'>-	setup_cpu_win(3, ORION5X_PCI_MEM_PHYS_BASE, ORION5X_PCI_MEM_SIZE,</div><div class='del'>-		TARGET_PCI, ATTR_PCI_MEM, -1);</div><div class='add'>+	orion_config_wins(&amp;addr_map_cfg, addr_map_info);</div><div class='ctx'> 	win_alloc_count = 4;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Setup MBUS dram target info.</div><div class='ctx'> 	 */</div><div class='del'>-	orion5x_mbus_dram_info.mbus_dram_target_id = TARGET_DDR;</div><div class='del'>-</div><div class='del'>-	for (i = 0, cs = 0; i &lt; 4; i++) {</div><div class='del'>-		u32 base = readl(DDR_BASE_CS(i));</div><div class='del'>-		u32 size = readl(DDR_SIZE_CS(i));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Chip select enabled?</div><div class='del'>-		 */</div><div class='del'>-		if (size &amp; 1) {</div><div class='del'>-			struct mbus_dram_window *w;</div><div class='del'>-</div><div class='del'>-			w = &amp;orion5x_mbus_dram_info.cs[cs++];</div><div class='del'>-			w-&gt;cs_index = i;</div><div class='del'>-			w-&gt;mbus_attr = 0xf &amp; ~(1 &lt;&lt; i);</div><div class='del'>-			w-&gt;base = base &amp; 0xffff0000;</div><div class='del'>-			w-&gt;size = (size | 0x0000ffff) + 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	orion5x_mbus_dram_info.num_cs = cs;</div><div class='add'>+	orion_setup_cpu_mbus_target(&amp;addr_map_cfg, ORION5X_DDR_WINDOW_CPU_BASE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init orion5x_setup_dev_boot_win(u32 base, u32 size)</div><div class='ctx'> {</div><div class='del'>-	setup_cpu_win(win_alloc_count++, base, size,</div><div class='del'>-		      TARGET_DEV_BUS, ATTR_DEV_BOOT, -1);</div><div class='add'>+	orion_setup_cpu_win(&amp;addr_map_cfg, win_alloc_count++, base, size,</div><div class='add'>+			    TARGET_DEV_BUS, ATTR_DEV_BOOT, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init orion5x_setup_dev0_win(u32 base, u32 size)</div><div class='ctx'> {</div><div class='del'>-	setup_cpu_win(win_alloc_count++, base, size,</div><div class='del'>-		      TARGET_DEV_BUS, ATTR_DEV_CS0, -1);</div><div class='add'>+	orion_setup_cpu_win(&amp;addr_map_cfg, win_alloc_count++, base, size,</div><div class='add'>+			    TARGET_DEV_BUS, ATTR_DEV_CS0, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init orion5x_setup_dev1_win(u32 base, u32 size)</div><div class='ctx'> {</div><div class='del'>-	setup_cpu_win(win_alloc_count++, base, size,</div><div class='del'>-		      TARGET_DEV_BUS, ATTR_DEV_CS1, -1);</div><div class='add'>+	orion_setup_cpu_win(&amp;addr_map_cfg, win_alloc_count++, base, size,</div><div class='add'>+			    TARGET_DEV_BUS, ATTR_DEV_CS1, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init orion5x_setup_dev2_win(u32 base, u32 size)</div><div class='ctx'> {</div><div class='del'>-	setup_cpu_win(win_alloc_count++, base, size,</div><div class='del'>-		      TARGET_DEV_BUS, ATTR_DEV_CS2, -1);</div><div class='add'>+	orion_setup_cpu_win(&amp;addr_map_cfg, win_alloc_count++, base, size,</div><div class='add'>+			    TARGET_DEV_BUS, ATTR_DEV_CS2, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init orion5x_setup_pcie_wa_win(u32 base, u32 size)</div><div class='ctx'> {</div><div class='del'>-	setup_cpu_win(win_alloc_count++, base, size,</div><div class='del'>-		      TARGET_PCIE, ATTR_PCIE_WA, -1);</div><div class='add'>+	orion_setup_cpu_win(&amp;addr_map_cfg, win_alloc_count++, base, size,</div><div class='add'>+			    TARGET_PCIE, ATTR_PCIE_WA, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init orion5x_setup_sram_win(void)</div><div class='add'>+void __init orion5x_setup_sram_win(void)</div><div class='ctx'> {</div><div class='del'>-	return setup_cpu_win(win_alloc_count++, ORION5X_SRAM_PHYS_BASE,</div><div class='del'>-			ORION5X_SRAM_SIZE, TARGET_SRAM, ATTR_SRAM, -1);</div><div class='add'>+	orion_setup_cpu_win(&amp;addr_map_cfg, win_alloc_count++,</div><div class='add'>+			    ORION5X_SRAM_PHYS_BASE, ORION5X_SRAM_SIZE,</div><div class='add'>+			    TARGET_SRAM, ATTR_SRAM, -1);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c<br/>index 22ace0bf2f92..0e28bae20bd4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/common.c</a></div><div class='hunk'>@@ -15,9 +15,9 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='del'>-#include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;linux/mv643xx_i2c.h&gt;</div><div class='ctx'> #include &lt;linux/ata_platform.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;net/dsa.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;plat/orion_nand.h&gt;</div><div class='ctx'> #include &lt;plat/time.h&gt;</div><div class='ctx'> #include &lt;plat/common.h&gt;</div><div class='add'>+#include &lt;plat/addr-map.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='hunk'>@@ -71,8 +72,7 @@ void __init orion5x_map_io(void)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> void __init orion5x_ehci0_init(void)</div><div class='ctx'> {</div><div class='del'>-	orion_ehci_init(&amp;orion5x_mbus_dram_info,</div><div class='del'>-			ORION5X_USB0_PHYS_BASE, IRQ_ORION5X_USB0_CTRL);</div><div class='add'>+	orion_ehci_init(ORION5X_USB0_PHYS_BASE, IRQ_ORION5X_USB0_CTRL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -81,8 +81,7 @@ void __init orion5x_ehci0_init(void)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> void __init orion5x_ehci1_init(void)</div><div class='ctx'> {</div><div class='del'>-	orion_ehci_1_init(&amp;orion5x_mbus_dram_info,</div><div class='del'>-			  ORION5X_USB1_PHYS_BASE, IRQ_ORION5X_USB1_CTRL);</div><div class='add'>+	orion_ehci_1_init(ORION5X_USB1_PHYS_BASE, IRQ_ORION5X_USB1_CTRL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -91,7 +90,7 @@ void __init orion5x_ehci1_init(void)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data)</div><div class='ctx'> {</div><div class='del'>-	orion_ge00_init(eth_data, &amp;orion5x_mbus_dram_info,</div><div class='add'>+	orion_ge00_init(eth_data,</div><div class='ctx'> 			ORION5X_ETH_PHYS_BASE, IRQ_ORION5X_ETH_SUM,</div><div class='ctx'> 			IRQ_ORION5X_ETH_ERR, orion5x_tclk);</div><div class='ctx'> }</div><div class='hunk'>@@ -121,8 +120,7 @@ void __init orion5x_i2c_init(void)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> void __init orion5x_sata_init(struct mv_sata_platform_data *sata_data)</div><div class='ctx'> {</div><div class='del'>-	orion_sata_init(sata_data, &amp;orion5x_mbus_dram_info,</div><div class='del'>-			ORION5X_SATA_PHYS_BASE, IRQ_ORION5X_SATA);</div><div class='add'>+	orion_sata_init(sata_data, ORION5X_SATA_PHYS_BASE, IRQ_ORION5X_SATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -158,8 +156,7 @@ void __init orion5x_uart1_init(void)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> void __init orion5x_xor_init(void)</div><div class='ctx'> {</div><div class='del'>-	orion_xor0_init(&amp;orion5x_mbus_dram_info,</div><div class='del'>-			ORION5X_XOR_PHYS_BASE,</div><div class='add'>+	orion_xor0_init(ORION5X_XOR_PHYS_BASE,</div><div class='ctx'> 			ORION5X_XOR_PHYS_BASE + 0x200,</div><div class='ctx'> 			IRQ_ORION5X_XOR0, IRQ_ORION5X_XOR1);</div><div class='ctx'> }</div><div class='hunk'>@@ -169,12 +166,7 @@ void __init orion5x_xor_init(void)</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> static void __init orion5x_crypto_init(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = orion5x_setup_sram_win();</div><div class='del'>-	if (ret)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='add'>+	orion5x_setup_sram_win();</div><div class='ctx'> 	orion_crypto_init(ORION5X_CRYPTO_PHYS_BASE, ORION5X_SRAM_PHYS_BASE,</div><div class='ctx'> 			  SZ_8K, IRQ_ORION5X_CESA);</div><div class='ctx'> }</div><div class='hunk'>@@ -304,6 +296,17 @@ void __init orion5x_init(void)</div><div class='ctx'> 	orion5x_wdt_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void orion5x_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Enable and issue soft reset</div><div class='add'>+	 */</div><div class='add'>+	orion5x_setbits(RSTOUTn_MASK, (1 &lt;&lt; 2));</div><div class='add'>+	orion5x_setbits(CPU_SOFT_RESET, 1);</div><div class='add'>+	mdelay(200);</div><div class='add'>+	orion5x_clrbits(CPU_SOFT_RESET, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Many orion-based systems have buggy bootloader implementations.</div><div class='ctx'>  * This is a common fixup for bogus memory tags.</div><div class='head'>diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h<br/>index 909489f4d23e..d2513ac79ff5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/common.h</a></div><div class='hunk'>@@ -20,14 +20,13 @@ extern struct sys_timer orion5x_timer;</div><div class='ctx'>  * functions to map its interfaces and by the machine-setup to map its on-</div><div class='ctx'>  * board devices. Details in /mach-orion/addr-map.c</div><div class='ctx'>  */</div><div class='del'>-extern struct mbus_dram_target_info orion5x_mbus_dram_info;</div><div class='ctx'> void orion5x_setup_cpu_mbus_bridge(void);</div><div class='ctx'> void orion5x_setup_dev_boot_win(u32 base, u32 size);</div><div class='ctx'> void orion5x_setup_dev0_win(u32 base, u32 size);</div><div class='ctx'> void orion5x_setup_dev1_win(u32 base, u32 size);</div><div class='ctx'> void orion5x_setup_dev2_win(u32 base, u32 size);</div><div class='ctx'> void orion5x_setup_pcie_wa_win(u32 base, u32 size);</div><div class='del'>-int orion5x_setup_sram_win(void);</div><div class='add'>+void orion5x_setup_sram_win(void);</div><div class='ctx'> </div><div class='ctx'> void orion5x_ehci0_init(void);</div><div class='ctx'> void orion5x_ehci1_init(void);</div><div class='hunk'>@@ -39,6 +38,7 @@ void orion5x_spi_init(void);</div><div class='ctx'> void orion5x_uart0_init(void);</div><div class='ctx'> void orion5x_uart1_init(void);</div><div class='ctx'> void orion5x_xor_init(void);</div><div class='add'>+void orion5x_restart(char, const char *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PCIe/PCI functions.</div><div class='head'>diff --git a/arch/arm/mach-orion5x/d2net-setup.c b/arch/arm/mach-orion5x/d2net-setup.c<br/>index 8c8300951f46..d75dcfa0f01c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/d2net-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/d2net-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/d2net-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/d2net-setup.c</a></div><div class='hunk'>@@ -343,6 +343,7 @@ MACHINE_START(D2NET, "LaCie d2 Network")</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='ctx'> 	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -355,6 +356,7 @@ MACHINE_START(BIGDISK, "LaCie Big Disk Network")</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='ctx'> 	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c<br/>index 4b79a80d5e1f..a104d5a80e11 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/db88f5281-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/db88f5281-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/db88f5281-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/db88f5281-setup.c</a></div><div class='hunk'>@@ -364,4 +364,5 @@ MACHINE_START(DB88F5281, "Marvell Orion-2 Development Board")</div><div class='ctx'> 	.init_early	= orion5x_init_early,</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c<br/>index 343f60e9639f..91b0f4788597 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/dns323-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/dns323-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/dns323-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/dns323-setup.c</a></div><div class='hunk'>@@ -736,4 +736,5 @@ MACHINE_START(DNS323, "D-Link DNS-323")</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='ctx'> 	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/edmini_v2-setup.c b/arch/arm/mach-orion5x/edmini_v2-setup.c<br/>index 70a4e9265f06..355e962137c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/edmini_v2-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/edmini_v2-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/edmini_v2-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/edmini_v2-setup.c</a></div><div class='hunk'>@@ -258,4 +258,5 @@ MACHINE_START(EDMINI_V2, "LaCie Ethernet Disk mini V2")</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='ctx'> 	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/include/mach/io.h b/arch/arm/mach-orion5x/include/mach/io.h<br/>index c5196101a237..e9d9afdc2659 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/include/mach/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/include/mach/io.h</a></div><div class='hunk'>@@ -15,31 +15,6 @@</div><div class='ctx'> </div><div class='ctx'> #define IO_SPACE_LIMIT		0xffffffff</div><div class='ctx'> </div><div class='del'>-static inline void __iomem *</div><div class='del'>-__arch_ioremap(unsigned long paddr, size_t size, unsigned int mtype)</div><div class='del'>-{</div><div class='del'>-	void __iomem *retval;</div><div class='del'>-	unsigned long offs = paddr - ORION5X_REGS_PHYS_BASE;</div><div class='del'>-	if (mtype == MT_DEVICE &amp;&amp; size &amp;&amp; offs &lt; ORION5X_REGS_SIZE &amp;&amp;</div><div class='del'>-	    size &lt;= ORION5X_REGS_SIZE &amp;&amp; offs + size &lt;= ORION5X_REGS_SIZE) {</div><div class='del'>-		retval = (void __iomem *)ORION5X_REGS_VIRT_BASE + offs;</div><div class='del'>-	} else {</div><div class='del'>-		retval = __arm_ioremap(paddr, size, mtype);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-__arch_iounmap(void __iomem *addr)</div><div class='del'>-{</div><div class='del'>-	if (addr &lt; (void __iomem *)ORION5X_REGS_VIRT_BASE ||</div><div class='del'>-	    addr &gt;= (void __iomem *)(ORION5X_REGS_VIRT_BASE + ORION5X_REGS_SIZE))</div><div class='del'>-		__iounmap(addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define __arch_ioremap		__arch_ioremap</div><div class='del'>-#define __arch_iounmap		__arch_iounmap</div><div class='ctx'> #define __io(a)			__typesafe_io(a)</div><div class='ctx'> #define __mem_pci(a)		(a)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-orion5x/include/mach/orion5x.h b/arch/arm/mach-orion5x/include/mach/orion5x.h<br/>index 0a28bbc76891..2745f5d95b3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/orion5x.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/include/mach/orion5x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/orion5x.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/include/mach/orion5x.h</a></div><div class='hunk'>@@ -69,7 +69,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #define ORION5X_DDR_VIRT_BASE		(ORION5X_REGS_VIRT_BASE | 0x00000)</div><div class='del'>-</div><div class='add'>+#define  ORION5X_DDR_WINDOW_CPU_BASE    (ORION5X_DDR_VIRT_BASE | 0x1500)</div><div class='ctx'> #define ORION5X_DEV_BUS_PHYS_BASE	(ORION5X_REGS_PHYS_BASE | 0x10000)</div><div class='ctx'> #define ORION5X_DEV_BUS_VIRT_BASE	(ORION5X_REGS_VIRT_BASE | 0x10000)</div><div class='ctx'> #define ORION5X_DEV_BUS_REG(x)		(ORION5X_DEV_BUS_VIRT_BASE | (x))</div><div class='head'>diff --git a/arch/arm/mach-orion5x/include/mach/system.h b/arch/arm/mach-orion5x/include/mach/system.h<br/>index a1d6e46ab035..825a2650cefa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/include/mach/system.h</a></div><div class='hunk'>@@ -11,23 +11,9 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/bridge-regs.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Enable and issue soft reset</div><div class='del'>-	 */</div><div class='del'>-	orion5x_setbits(RSTOUTn_MASK, (1 &lt;&lt; 2));</div><div class='del'>-	orion5x_setbits(CPU_SOFT_RESET, 1);</div><div class='del'>-	mdelay(200);</div><div class='del'>-	orion5x_clrbits(CPU_SOFT_RESET, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-orion5x/include/mach/vmalloc.h b/arch/arm/mach-orion5x/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 06b50aeff7b9..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-orion5x/include/mach/vmalloc.h</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END       0xfd800000UL</div><div class='head'>diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c<br/>index d3cd3f63258a..47587b832842 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/kurobox_pro-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/kurobox_pro-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/kurobox_pro-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/kurobox_pro-setup.c</a></div><div class='hunk'>@@ -386,6 +386,7 @@ MACHINE_START(KUROBOX_PRO, "Buffalo/Revogear Kurobox Pro")</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='ctx'> 	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -399,5 +400,6 @@ MACHINE_START(LINKSTATION_PRO, "Buffalo Linkstation Pro/Live")</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='ctx'> 	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-orion5x/ls-chl-setup.c b/arch/arm/mach-orion5x/ls-chl-setup.c<br/>index 9503fff404e3..527213169db0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/ls-chl-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/ls-chl-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/ls-chl-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/ls-chl-setup.c</a></div><div class='hunk'>@@ -140,7 +140,7 @@ static struct mv_sata_platform_data lschl_sata_data = {</div><div class='ctx'> </div><div class='ctx'> static void lschl_power_off(void)</div><div class='ctx'> {</div><div class='del'>-	arm_machine_restart('h', NULL);</div><div class='add'>+	orion5x_restart('h', NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='hunk'>@@ -325,4 +325,5 @@ MACHINE_START(LINKSTATION_LSCHL, "Buffalo Linkstation LiveV3 (LS-CHL)")</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='ctx'> 	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/ls_hgl-setup.c b/arch/arm/mach-orion5x/ls_hgl-setup.c<br/>index ed6d772f4a24..9a8697b97dd7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/ls_hgl-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/ls_hgl-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/ls_hgl-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/ls_hgl-setup.c</a></div><div class='hunk'>@@ -186,7 +186,7 @@ static struct mv_sata_platform_data ls_hgl_sata_data = {</div><div class='ctx'> </div><div class='ctx'> static void ls_hgl_power_off(void)</div><div class='ctx'> {</div><div class='del'>-	arm_machine_restart('h', NULL);</div><div class='add'>+	orion5x_restart('h', NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -272,4 +272,5 @@ MACHINE_START(LINKSTATION_LS_HGL, "Buffalo Linkstation LS-HGL")</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='ctx'> 	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/lsmini-setup.c b/arch/arm/mach-orion5x/lsmini-setup.c<br/>index 743f7f1db181..09c73659f467 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/lsmini-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/lsmini-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/lsmini-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/lsmini-setup.c</a></div><div class='hunk'>@@ -186,7 +186,7 @@ static struct mv_sata_platform_data lsmini_sata_data = {</div><div class='ctx'> </div><div class='ctx'> static void lsmini_power_off(void)</div><div class='ctx'> {</div><div class='del'>-	arm_machine_restart('h', NULL);</div><div class='add'>+	orion5x_restart('h', NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -274,5 +274,6 @@ MACHINE_START(LINKSTATION_MINI, "Buffalo Linkstation Mini")</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='ctx'> 	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-orion5x/mpp.c b/arch/arm/mach-orion5x/mpp.c<br/>index b6ddd7a5db6a..5b70026f478c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/mpp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/mpp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/mpp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/mpp.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</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='del'>-#include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;plat/mpp.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-orion5x/mss2-setup.c b/arch/arm/mach-orion5x/mss2-setup.c<br/>index 6020e26b1c71..65faaa34de61 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/mss2-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/mss2-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/mss2-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/mss2-setup.c</a></div><div class='hunk'>@@ -267,5 +267,6 @@ MACHINE_START(MSS2, "Maxtor Shared Storage II")</div><div class='ctx'> 	.init_early	= orion5x_init_early,</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='del'>-	.fixup		= tag_fixup_mem32</div><div class='add'>+	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/mv2120-setup.c b/arch/arm/mach-orion5x/mv2120-setup.c<br/>index 201ae3676289..c87fde4deeca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/mv2120-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/mv2120-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/mv2120-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/mv2120-setup.c</a></div><div class='hunk'>@@ -234,5 +234,6 @@ MACHINE_START(MV2120, "HP Media Vault mv2120")</div><div class='ctx'> 	.init_early	= orion5x_init_early,</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='del'>-	.fixup		= tag_fixup_mem32</div><div class='add'>+	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/net2big-setup.c b/arch/arm/mach-orion5x/net2big-setup.c<br/>index 6197c79a2ecb..0180c393c711 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/net2big-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/net2big-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/net2big-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/net2big-setup.c</a></div><div class='hunk'>@@ -426,5 +426,6 @@ MACHINE_START(NET2BIG, "LaCie 2Big Network")</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='ctx'> 	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c<br/>index bc4a920e26ee..09a045f0c406 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/pci.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> #include &lt;plat/pcie.h&gt;</div><div class='add'>+#include &lt;plat/addr-map.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='hunk'>@@ -145,7 +146,7 @@ static int __init pcie_setup(struct pci_sys_data *sys)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Generic PCIe unit setup.</div><div class='ctx'> 	 */</div><div class='del'>-	orion_pcie_setup(PCIE_BASE, &amp;orion5x_mbus_dram_info);</div><div class='add'>+	orion_pcie_setup(PCIE_BASE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check whether to apply Orion-1/Orion-NAS PCIe config</div><div class='hunk'>@@ -176,7 +177,7 @@ static int __init pcie_setup(struct pci_sys_data *sys)</div><div class='ctx'> 	res[0].end = res[0].start + ORION5X_PCIE_IO_SIZE - 1;</div><div class='ctx'> 	if (request_resource(&amp;ioport_resource, &amp;res[0]))</div><div class='ctx'> 		panic("Request PCIe IO resource failed\n");</div><div class='del'>-	sys-&gt;resource[0] = &amp;res[0];</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;res[0]);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * IORESOURCE_MEM</div><div class='hunk'>@@ -187,9 +188,8 @@ static int __init pcie_setup(struct pci_sys_data *sys)</div><div class='ctx'> 	res[1].end = res[1].start + ORION5X_PCIE_MEM_SIZE - 1;</div><div class='ctx'> 	if (request_resource(&amp;iomem_resource, &amp;res[1]))</div><div class='ctx'> 		panic("Request PCIe Memory resource failed\n");</div><div class='del'>-	sys-&gt;resource[1] = &amp;res[1];</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;res[1]);</div><div class='ctx'> </div><div class='del'>-	sys-&gt;resource[2] = NULL;</div><div class='ctx'> 	sys-&gt;io_offset = 0;</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -477,7 +477,7 @@ static int __init pci_setup(struct pci_sys_data *sys)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Point PCI unit MBUS decode windows to DRAM space.</div><div class='ctx'> 	 */</div><div class='del'>-	orion5x_setup_pci_wins(&amp;orion5x_mbus_dram_info);</div><div class='add'>+	orion5x_setup_pci_wins(&amp;orion_mbus_dram_info);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Master + Slave enable</div><div class='hunk'>@@ -505,7 +505,7 @@ static int __init pci_setup(struct pci_sys_data *sys)</div><div class='ctx'> 	res[0].end = res[0].start + ORION5X_PCI_IO_SIZE - 1;</div><div class='ctx'> 	if (request_resource(&amp;ioport_resource, &amp;res[0]))</div><div class='ctx'> 		panic("Request PCI IO resource failed\n");</div><div class='del'>-	sys-&gt;resource[0] = &amp;res[0];</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;res[0]);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * IORESOURCE_MEM</div><div class='hunk'>@@ -516,9 +516,8 @@ static int __init pci_setup(struct pci_sys_data *sys)</div><div class='ctx'> 	res[1].end = res[1].start + ORION5X_PCI_MEM_SIZE - 1;</div><div class='ctx'> 	if (request_resource(&amp;iomem_resource, &amp;res[1]))</div><div class='ctx'> 		panic("Request PCI Memory resource failed\n");</div><div class='del'>-	sys-&gt;resource[1] = &amp;res[1];</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;res[1]);</div><div class='ctx'> </div><div class='del'>-	sys-&gt;resource[2] = NULL;</div><div class='ctx'> 	sys-&gt;io_offset = 0;</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -579,9 +578,11 @@ struct pci_bus __init *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys</div><div class='ctx'> 	struct pci_bus *bus;</div><div class='ctx'> </div><div class='ctx'> 	if (nr == 0) {</div><div class='del'>-		bus = pci_scan_bus(sys-&gt;busnr, &amp;pcie_ops, sys);</div><div class='add'>+		bus = pci_scan_root_bus(NULL, sys-&gt;busnr, &amp;pcie_ops, sys,</div><div class='add'>+					&amp;sys-&gt;resources);</div><div class='ctx'> 	} else if (nr == 1 &amp;&amp; !orion5x_pci_disabled) {</div><div class='del'>-		bus = pci_scan_bus(sys-&gt;busnr, &amp;pci_ops, sys);</div><div class='add'>+		bus = pci_scan_root_bus(NULL, sys-&gt;busnr, &amp;pci_ops, sys,</div><div class='add'>+					&amp;sys-&gt;resources);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bus = NULL;</div><div class='ctx'> 		BUG();</div><div class='head'>diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c<br/>index ebd6767d8e88..292038fc59fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c</a></div><div class='hunk'>@@ -175,4 +175,5 @@ MACHINE_START(RD88F5181L_FXO, "Marvell Orion-VoIP FXO Reference Design")</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='ctx'> 	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c<br/>index 05db2d336b08..c44eabaabc16 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/rd88f5181l-ge-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/rd88f5181l-ge-setup.c</a></div><div class='hunk'>@@ -187,4 +187,5 @@ MACHINE_START(RD88F5181L_GE, "Marvell Orion-VoIP GE Reference Design")</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='ctx'> 	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c<br/>index e47fa0578ae3..96438b6b2022 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/rd88f5182-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/rd88f5182-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/rd88f5182-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/rd88f5182-setup.c</a></div><div class='hunk'>@@ -311,4 +311,5 @@ MACHINE_START(RD88F5182, "Marvell Orion-NAS Reference Design")</div><div class='ctx'> 	.init_early	= orion5x_init_early,</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c<br/>index 64317251ec00..2c5fab00d205 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c</a></div><div class='hunk'>@@ -128,4 +128,5 @@ MACHINE_START(RD88F6183AP_GE, "Marvell Orion-1-90 AP GE Reference Design")</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='ctx'> 	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/terastation_pro2-setup.c b/arch/arm/mach-orion5x/terastation_pro2-setup.c<br/>index 29f1526f7b70..632a861ef82b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/terastation_pro2-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/terastation_pro2-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/terastation_pro2-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/terastation_pro2-setup.c</a></div><div class='hunk'>@@ -364,4 +364,5 @@ MACHINE_START(TERASTATION_PRO2, "Buffalo Terastation Pro II/Live")</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='ctx'> 	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c<br/>index 31e51f9b4b64..5d6408745582 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/ts209-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/ts209-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/ts209-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/ts209-setup.c</a></div><div class='hunk'>@@ -178,7 +178,7 @@ static struct hw_pci qnap_ts209_pci __initdata = {</div><div class='ctx'> </div><div class='ctx'> static int __init qnap_ts209_pci_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (machine_is_ts_x09())</div><div class='add'>+	if (machine_is_ts209())</div><div class='ctx'> 		pci_common_init(&amp;qnap_ts209_pci);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -329,4 +329,5 @@ MACHINE_START(TS209, "QNAP TS-109/TS-209")</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='ctx'> 	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c<br/>index 0fbcc14e09d7..4e6ff759cd32 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/ts409-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/ts409-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/ts409-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/ts409-setup.c</a></div><div class='hunk'>@@ -318,4 +318,5 @@ MACHINE_START(TS409, "QNAP TS-409")</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='ctx'> 	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c<br/>index b35e2005a348..c96f37472eda 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/ts78xx-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/ts78xx-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/ts78xx-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/ts78xx-setup.c</a></div><div class='hunk'>@@ -627,4 +627,5 @@ MACHINE_START(TS78XX, "Technologic Systems TS-78xx SBC")</div><div class='ctx'> 	.init_early	= orion5x_init_early,</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/wnr854t-setup.c b/arch/arm/mach-orion5x/wnr854t-setup.c<br/>index b8be7d8d0cf4..078c03f7cd52 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/wnr854t-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/wnr854t-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/wnr854t-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/wnr854t-setup.c</a></div><div class='hunk'>@@ -179,4 +179,5 @@ MACHINE_START(WNR854T, "Netgear WNR854T")</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='ctx'> 	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c<br/>index faf81a039360..46a9778171ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/wrt350n-v2-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-orion5x/wrt350n-v2-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-orion5x/wrt350n-v2-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-orion5x/wrt350n-v2-setup.c</a></div><div class='hunk'>@@ -267,4 +267,5 @@ MACHINE_START(WRT350N_V2, "Linksys WRT350N v2")</div><div class='ctx'> 	.init_irq	= orion5x_init_irq,</div><div class='ctx'> 	.timer		= &amp;orion5x_timer,</div><div class='ctx'> 	.fixup		= tag_fixup_mem32,</div><div class='add'>+	.restart	= orion5x_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-picoxcell/Makefile b/arch/arm/mach-picoxcell/Makefile<br/>index c550b6363488..e5ec4a8d9bcb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-picoxcell/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-picoxcell/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-picoxcell/Makefile</a></div><div class='hunk'>@@ -1,3 +1,2 @@</div><div class='ctx'> obj-y	:= common.o</div><div class='ctx'> obj-y	+= time.o</div><div class='del'>-obj-y	+= io.o</div><div class='head'>diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c<br/>index 34d08347be5f..a2e8ae8b5821 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-picoxcell/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-picoxcell/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-picoxcell/common.c</a></div><div class='hunk'>@@ -7,23 +7,59 @@</div><div class='ctx'>  *</div><div class='ctx'>  * All enquiries to support@picochip.com</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/irqdomain.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/vic.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='ctx'> #include &lt;mach/picoxcell_soc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='add'>+#define WDT_CTRL_REG_EN_MASK	(1 &lt;&lt; 0)</div><div class='add'>+#define WDT_CTRL_REG_OFFS	(0x00)</div><div class='add'>+#define WDT_TIMEOUT_REG_OFFS	(0x04)</div><div class='add'>+static void __iomem *wdt_regs;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The machine restart method can be called from an atomic context so we won't</div><div class='add'>+ * be able to ioremap the regs then.</div><div class='add'>+ */</div><div class='add'>+static void picoxcell_setup_restart(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = of_find_compatible_node(NULL, NULL,</div><div class='add'>+							 "snps,dw-apb-wdg");</div><div class='add'>+	if (WARN(!np, "unable to setup watchdog restart"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	wdt_regs = of_iomap(np, 0);</div><div class='add'>+	WARN(!wdt_regs, "failed to remap watchdog regs");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct map_desc io_map __initdata = {</div><div class='add'>+	.virtual	= PHYS_TO_IO(PICOXCELL_PERIPH_BASE),</div><div class='add'>+	.pfn		= __phys_to_pfn(PICOXCELL_PERIPH_BASE),</div><div class='add'>+	.length		= PICOXCELL_PERIPH_LENGTH,</div><div class='add'>+	.type		= MT_DEVICE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init picoxcell_map_io(void)</div><div class='add'>+{</div><div class='add'>+	iotable_init(&amp;io_map, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init picoxcell_init_machine(void)</div><div class='ctx'> {</div><div class='ctx'> 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);</div><div class='add'>+	picoxcell_setup_restart();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const char *picoxcell_dt_match[] = {</div><div class='hunk'>@@ -33,23 +69,36 @@ static const char *picoxcell_dt_match[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id vic_of_match[] __initconst = {</div><div class='del'>-	{ .compatible = "arm,pl192-vic" },</div><div class='add'>+	{ .compatible = "arm,pl192-vic", .data = vic_of_init, },</div><div class='ctx'> 	{ /* Sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init picoxcell_init_irq(void)</div><div class='ctx'> {</div><div class='del'>-	vic_init(IO_ADDRESS(PICOXCELL_VIC0_BASE), 0, ~0, 0);</div><div class='del'>-	vic_init(IO_ADDRESS(PICOXCELL_VIC1_BASE), 32, ~0, 0);</div><div class='del'>-	irq_domain_generate_simple(vic_of_match, PICOXCELL_VIC0_BASE, 0);</div><div class='del'>-	irq_domain_generate_simple(vic_of_match, PICOXCELL_VIC1_BASE, 32);</div><div class='add'>+	of_irq_init(vic_of_match);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void picoxcell_wdt_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Configure the watchdog to reset with the shortest possible timeout</div><div class='add'>+	 * and give it chance to do the reset.</div><div class='add'>+	 */</div><div class='add'>+	if (wdt_regs) {</div><div class='add'>+		writel_relaxed(WDT_CTRL_REG_EN_MASK, wdt_regs + WDT_CTRL_REG_OFFS);</div><div class='add'>+		writel_relaxed(0, wdt_regs + WDT_TIMEOUT_REG_OFFS);</div><div class='add'>+		/* No sleeping, possibly atomic. */</div><div class='add'>+		mdelay(500);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> DT_MACHINE_START(PICOXCELL, "Picochip picoXcell")</div><div class='ctx'> 	.map_io		= picoxcell_map_io,</div><div class='del'>-	.nr_irqs	= ARCH_NR_IRQS,</div><div class='add'>+	.nr_irqs	= NR_IRQS_LEGACY,</div><div class='ctx'> 	.init_irq	= picoxcell_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;picoxcell_timer,</div><div class='ctx'> 	.init_machine	= picoxcell_init_machine,</div><div class='ctx'> 	.dt_compat	= picoxcell_dt_match,</div><div class='add'>+	.restart	= picoxcell_wdt_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-picoxcell/common.h b/arch/arm/mach-picoxcell/common.h<br/>index 5263f0fa095c..83d55ab956a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-picoxcell/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-picoxcell/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-picoxcell/common.h</a></div><div class='hunk'>@@ -13,6 +13,5 @@</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern struct sys_timer picoxcell_timer;</div><div class='del'>-extern void picoxcell_map_io(void);</div><div class='ctx'> </div><div class='ctx'> #endif /* __PICOXCELL_COMMON_H__ */</div><div class='head'>diff --git a/arch/arm/mach-picoxcell/include/mach/entry-macro.S b/arch/arm/mach-picoxcell/include/mach/entry-macro.S<br/>index a6b09f75d9df..9b505ac00be9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-picoxcell/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-picoxcell/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-picoxcell/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -9,11 +9,8 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/irqs.h&gt;</div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='add'>+	.macro  disable_fiq</div><div class='add'>+	.endm</div><div class='ctx'> </div><div class='del'>-#define VA_VIC0		IO_ADDRESS(PICOXCELL_VIC0_BASE)</div><div class='del'>-#define VA_VIC1		IO_ADDRESS(PICOXCELL_VIC1_BASE)</div><div class='del'>-</div><div class='del'>-#include &lt;asm/entry-macro-vic2.S&gt;</div><div class='add'>+	.macro  arch_ret_to_user, tmp1, tmp2</div><div class='add'>+	.endm</div><div class='head'>diff --git a/arch/arm/mach-picoxcell/include/mach/irqs.h b/arch/arm/mach-picoxcell/include/mach/irqs.h<br/>index 4d13ed970919..59eac1ee2820 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-picoxcell/include/mach/irqs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/include/mach/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-picoxcell/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-picoxcell/include/mach/irqs.h</a></div><div class='hunk'>@@ -1,8 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2011 Picochip Ltd., Jamie Iles</div><div class='ctx'>  *</div><div class='del'>- * This file contains the hardware definitions of the picoXcell SoC devices.</div><div class='del'>- *</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='ctx'>  * the Free Software Foundation; either version 2 of the License, or</div><div class='hunk'>@@ -16,10 +14,7 @@</div><div class='ctx'> #ifndef __MACH_IRQS_H</div><div class='ctx'> #define __MACH_IRQS_H</div><div class='ctx'> </div><div class='del'>-#define ARCH_NR_IRQS			64</div><div class='del'>-#define NR_IRQS				(128 + ARCH_NR_IRQS)</div><div class='del'>-</div><div class='del'>-#define IRQ_VIC0_BASE			0</div><div class='del'>-#define IRQ_VIC1_BASE			32</div><div class='add'>+/* We dynamically allocate our irq_desc's. */</div><div class='add'>+#define NR_IRQS				0</div><div class='ctx'> </div><div class='ctx'> #endif /* __MACH_IRQS_H */</div><div class='head'>diff --git a/arch/arm/mach-picoxcell/include/mach/memory.h b/arch/arm/mach-picoxcell/include/mach/memory.h<br/>deleted file mode 100644<br/>index 40a8c178f10d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-picoxcell/include/mach/memory.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/include/mach/memory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-/* empty */</div><div class='head'>diff --git a/arch/arm/mach-picoxcell/include/mach/system.h b/arch/arm/mach-picoxcell/include/mach/system.h<br/>index 67c589b0c1bc..1a5d8cb57df4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-picoxcell/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-picoxcell/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-picoxcell/include/mach/system.h</a></div><div class='hunk'>@@ -23,9 +23,4 @@ static inline void arch_idle(void)</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(int mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	/* Watchdog reset to go here. */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif /* __ASM_ARCH_SYSTEM_H */</div><div class='head'>diff --git a/arch/arm/mach-picoxcell/include/mach/vmalloc.h b/arch/arm/mach-picoxcell/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 0216cc4b1f0b..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-picoxcell/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,14 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2011 Picochip Ltd., Jamie Iles</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'>-#define VMALLOC_END	0xfe000000UL</div><div class='head'>diff --git a/arch/arm/mach-picoxcell/io.c b/arch/arm/mach-picoxcell/io.c<br/>deleted file mode 100644<br/>index 39e9b9e8cc37..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-picoxcell/io.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/io.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2011 Picochip Ltd., Jamie Iles</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'>- * All enquiries to support@picochip.com</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach/map.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='del'>-#include &lt;mach/picoxcell_soc.h&gt;</div><div class='del'>-</div><div class='del'>-#include "common.h"</div><div class='del'>-</div><div class='del'>-void __init picoxcell_map_io(void)</div><div class='del'>-{</div><div class='del'>-	struct map_desc io_map = {</div><div class='del'>-		.virtual	= PHYS_TO_IO(PICOXCELL_PERIPH_BASE),</div><div class='del'>-		.pfn		= __phys_to_pfn(PICOXCELL_PERIPH_BASE),</div><div class='del'>-		.length		= PICOXCELL_PERIPH_LENGTH,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	iotable_init(&amp;io_map, 1);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-picoxcell/time.c b/arch/arm/mach-picoxcell/time.c<br/>index 90a554ff4499..2ecba6743b8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-picoxcell/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-picoxcell/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-picoxcell/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-picoxcell/time.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/sched_clock.h&gt;</div><div class='hunk'>@@ -66,21 +65,11 @@ static void picoxcell_add_clocksource(struct device_node *source_timer)</div><div class='ctx'> 	dw_apb_clocksource_register(cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEFINE_CLOCK_DATA(cd);</div><div class='ctx'> static void __iomem *sched_io_base;</div><div class='ctx'> </div><div class='del'>-unsigned long long notrace sched_clock(void)</div><div class='add'>+static u32 picoxcell_read_sched_clock(void)</div><div class='ctx'> {</div><div class='del'>-	cycle_t cyc = sched_io_base ? __raw_readl(sched_io_base) : 0;</div><div class='del'>-</div><div class='del'>-	return cyc_to_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void notrace picoxcell_update_sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	cycle_t cyc = sched_io_base ? __raw_readl(sched_io_base) : 0;</div><div class='del'>-</div><div class='del'>-	update_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='add'>+	return __raw_readl(sched_io_base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id picoxcell_rtc_ids[] __initconst = {</div><div class='hunk'>@@ -100,7 +89,7 @@ static void picoxcell_init_sched_clock(void)</div><div class='ctx'> 	timer_get_base_and_rate(sched_timer, &amp;sched_io_base, &amp;rate);</div><div class='ctx'> 	of_node_put(sched_timer);</div><div class='ctx'> </div><div class='del'>-	init_sched_clock(&amp;cd, picoxcell_update_sched_clock, 32, rate);</div><div class='add'>+	setup_sched_clock(picoxcell_read_sched_clock, 32, rate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id picoxcell_timer_ids[] __initconst = {</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/core.c b/arch/arm/mach-pnx4008/core.c<br/>index cdb95e726f5c..4cfb40b2ec19 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pnx4008/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pnx4008/core.c</a></div><div class='hunk'>@@ -260,6 +260,11 @@ void __init pnx4008_map_io(void)</div><div class='ctx'> 	iotable_init(pnx4008_io_desc, ARRAY_SIZE(pnx4008_io_desc));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void pnx4008_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	soft_restart(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern struct sys_timer pnx4008_timer;</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(PNX4008, "Philips PNX4008")</div><div class='hunk'>@@ -269,4 +274,5 @@ MACHINE_START(PNX4008, "Philips PNX4008")</div><div class='ctx'> 	.init_irq 		= pnx4008_init_irq,</div><div class='ctx'> 	.init_machine 		= pnx4008_init,</div><div class='ctx'> 	.timer 			= &amp;pnx4008_timer,</div><div class='add'>+	.restart		= pnx4008_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/include/mach/system.h b/arch/arm/mach-pnx4008/include/mach/system.h<br/>index 5dda2bb55f8d..60cfe7188091 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pnx4008/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pnx4008/include/mach/system.h</a></div><div class='hunk'>@@ -21,18 +21,9 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/platform.h&gt;</div><div class='del'>-</div><div class='ctx'> static void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	cpu_reset(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/include/mach/vmalloc.h b/arch/arm/mach-pnx4008/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 184913c71141..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pnx4008/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-pnx4008/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * Author: Vitaly Wool &lt;source@mvista.com&gt;</div><div class='del'>- *</div><div class='del'>- * 2006 (c) MontaVista Software, Inc. This file is licensed under</div><div class='del'>- * the terms of the GNU General Public License version 2. This program</div><div class='del'>- * is licensed "as is" without any warranty of any kind, whether express</div><div class='del'>- * or implied.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Just any arbitrary offset to the start of the vmalloc VM area: the</div><div class='del'>- * current 8MB value just means that there will be a 8MB "hole" after the</div><div class='del'>- * physical memory until the kernel virtual memory starts.  That means that</div><div class='del'>- * any out-of-bounds memory accesses will hopefully be caught.</div><div class='del'>- * The vmalloc() routines leaves a hole of 4kB between each vmalloced</div><div class='del'>- * area for the same reason. ;)</div><div class='del'>- */</div><div class='del'>-#define VMALLOC_END       0xd0000000UL</div><div class='head'>diff --git a/arch/arm/mach-prima2/common.h b/arch/arm/mach-prima2/common.h<br/>index 83e5d2128118..b28a930d4f8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-prima2/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-prima2/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-prima2/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-prima2/common.h</a></div><div class='hunk'>@@ -16,6 +16,7 @@ extern struct sys_timer sirfsoc_timer;</div><div class='ctx'> </div><div class='ctx'> extern void __init sirfsoc_of_irq_init(void);</div><div class='ctx'> extern void __init sirfsoc_of_clk_init(void);</div><div class='add'>+extern void sirfsoc_restart(char, const char *);</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_DEBUG_LL</div><div class='ctx'> static inline void sirfsoc_map_lluart(void)  {}</div><div class='head'>diff --git a/arch/arm/mach-prima2/include/mach/map.h b/arch/arm/mach-prima2/include/mach/map.h<br/>index 66b1ae2e553f..6f243532570c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-prima2/include/mach/map.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-prima2/include/mach/map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-prima2/include/mach/map.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-prima2/include/mach/map.h</a></div><div class='hunk'>@@ -9,8 +9,10 @@</div><div class='ctx'> #ifndef __MACH_PRIMA2_MAP_H__</div><div class='ctx'> #define __MACH_PRIMA2_MAP_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/const.h&gt;</div><div class='ctx'> </div><div class='del'>-#define SIRFSOC_VA(x)			(VMALLOC_END + ((x) &amp; 0x00FFF000))</div><div class='add'>+#define SIRFSOC_VA_BASE		_AC(0xFEC00000, UL)</div><div class='add'>+</div><div class='add'>+#define SIRFSOC_VA(x)		(SIRFSOC_VA_BASE + ((x) &amp; 0x00FFF000))</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-prima2/include/mach/system.h b/arch/arm/mach-prima2/include/mach/system.h<br/>index 0dbd257ad16d..2c7d2a9d0c92 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-prima2/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-prima2/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-prima2/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-prima2/include/mach/system.h</a></div><div class='hunk'>@@ -9,21 +9,9 @@</div><div class='ctx'> #ifndef __MACH_SYSTEM_H__</div><div class='ctx'> #define __MACH_SYSTEM_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-</div><div class='del'>-#define SIRFSOC_SYS_RST_BIT  BIT(31)</div><div class='del'>-</div><div class='del'>-extern void __iomem *sirfsoc_rstc_base;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	writel(SIRFSOC_SYS_RST_BIT, sirfsoc_rstc_base);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-prima2/include/mach/vmalloc.h b/arch/arm/mach-prima2/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index c9f90fec78e3..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-prima2/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-prima2/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,16 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/ach-prima2/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010 – 2011 Cambridge Silicon Radio Limited, a CSR plc group company.</div><div class='del'>- *</div><div class='del'>- * Licensed under GPLv2 or later.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __MACH_VMALLOC_H</div><div class='del'>-#define __MACH_VMALLOC_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/const.h&gt;</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END    _AC(0xFEC00000, UL)</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-prima2/prima2.c b/arch/arm/mach-prima2/prima2.c<br/>index a12b689a8702..02b9c05ff990 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-prima2/prima2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-prima2/prima2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-prima2/prima2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-prima2/prima2.c</a></div><div class='hunk'>@@ -40,4 +40,5 @@ MACHINE_START(PRIMA2_EVB, "prima2cb")</div><div class='ctx'> 	.dma_zone_size	= SZ_256M,</div><div class='ctx'> 	.init_machine	= sirfsoc_mach_init,</div><div class='ctx'> 	.dt_compat      = prima2cb_dt_match,</div><div class='add'>+	.restart	= sirfsoc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-prima2/rstc.c b/arch/arm/mach-prima2/rstc.c<br/>index 492cfa8d2610..762adb73ab7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-prima2/rstc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-prima2/rstc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-prima2/rstc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-prima2/rstc.c</a></div><div class='hunk'>@@ -68,3 +68,10 @@ int sirfsoc_reset_device(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#define SIRFSOC_SYS_RST_BIT  BIT(31)</div><div class='add'>+</div><div class='add'>+void sirfsoc_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	writel(SIRFSOC_SYS_RST_BIT, sirfsoc_rstc_base);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-pxa/am200epd.c b/arch/arm/mach-pxa/am200epd.c<br/>index 4cb069fd9af2..ccdac4b6a469 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/am200epd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/am200epd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/am200epd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/am200epd.c</a></div><div class='hunk'>@@ -138,7 +138,7 @@ static void am200_cleanup(struct metronomefb_par *par)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	free_irq(IRQ_GPIO(RDY_GPIO_PIN), par);</div><div class='add'>+	free_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), par);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(gpios); i++)</div><div class='ctx'> 		gpio_free(gpios[i]);</div><div class='hunk'>@@ -292,7 +292,7 @@ static int am200_setup_irq(struct fb_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am200_handle_irq,</div><div class='add'>+	ret = request_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), am200_handle_irq,</div><div class='ctx'> 				IRQF_DISABLED|IRQF_TRIGGER_FALLING,</div><div class='ctx'> 				"AM200", info-&gt;par);</div><div class='ctx'> 	if (ret)</div><div class='head'>diff --git a/arch/arm/mach-pxa/am300epd.c b/arch/arm/mach-pxa/am300epd.c<br/>index fa8bad235d9f..76c4b9494031 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/am300epd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/am300epd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/am300epd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/am300epd.c</a></div><div class='hunk'>@@ -176,7 +176,7 @@ static void am300_cleanup(struct broadsheetfb_par *par)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	free_irq(IRQ_GPIO(RDY_GPIO_PIN), par);</div><div class='add'>+	free_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), par);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(gpios); i++)</div><div class='ctx'> 		gpio_free(gpios[i]);</div><div class='hunk'>@@ -240,7 +240,7 @@ static int am300_setup_irq(struct fb_info *info)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct broadsheetfb_par *par = info-&gt;par;</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am300_handle_irq,</div><div class='add'>+	ret = request_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), am300_handle_irq,</div><div class='ctx'> 				IRQF_DISABLED|IRQF_TRIGGER_RISING,</div><div class='ctx'> 				"AM300", par);</div><div class='ctx'> 	if (ret)</div><div class='head'>diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c<br/>index 4b81f59a4cba..c35456f02acb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/balloon3.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/balloon3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/balloon3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/balloon3.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'>  *  published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -179,7 +180,7 @@ static unsigned long balloon3_ac97_pin_config[] __initdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ucb1400_pdata vpac270_ucb1400_pdata = {</div><div class='del'>-	.irq		= IRQ_GPIO(BALLOON3_GPIO_CODEC_IRQ),</div><div class='add'>+	.irq		= PXA_GPIO_TO_IRQ(BALLOON3_GPIO_CODEC_IRQ),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -829,4 +830,5 @@ MACHINE_START(BALLOON3, "Balloon3")</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= balloon3_init,</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/capc7117.c b/arch/arm/mach-pxa/capc7117.c<br/>index 4efc16d39c79..c91727d1fe09 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/capc7117.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/capc7117.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/capc7117.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/capc7117.c</a></div><div class='hunk'>@@ -50,8 +50,8 @@ static struct resource capc7117_ide_resources[] = {</div><div class='ctx'> 	       .flags = IORESOURCE_MEM</div><div class='ctx'> 	},</div><div class='ctx'> 	[2] = {</div><div class='del'>-	       .start = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO76)),</div><div class='del'>-	       .end = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO76)),</div><div class='add'>+	       .start = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO76)),</div><div class='add'>+	       .end = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO76)),</div><div class='ctx'> 	       .flags = IORESOURCE_IRQ | IRQF_TRIGGER_RISING</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -80,7 +80,7 @@ static void __init capc7117_ide_init(void)</div><div class='ctx'> static struct plat_serial8250_port ti16c752_platform_data[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 	       .mapbase = 0x14000000,</div><div class='del'>-	       .irq = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO78)),</div><div class='add'>+	       .irq = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO78)),</div><div class='ctx'> 	       .irqflags = IRQF_TRIGGER_RISING,</div><div class='ctx'> 	       .flags = TI16C752_FLAGS,</div><div class='ctx'> 	       .iotype = UPIO_MEM,</div><div class='hunk'>@@ -89,7 +89,7 @@ static struct plat_serial8250_port ti16c752_platform_data[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='ctx'> 	       .mapbase = 0x14000040,</div><div class='del'>-	       .irq = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO79)),</div><div class='add'>+	       .irq = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO79)),</div><div class='ctx'> 	       .irqflags = IRQF_TRIGGER_RISING,</div><div class='ctx'> 	       .flags = TI16C752_FLAGS,</div><div class='ctx'> 	       .iotype = UPIO_MEM,</div><div class='hunk'>@@ -98,7 +98,7 @@ static struct plat_serial8250_port ti16c752_platform_data[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	[2] = {</div><div class='ctx'> 	       .mapbase = 0x14000080,</div><div class='del'>-	       .irq = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO80)),</div><div class='add'>+	       .irq = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO80)),</div><div class='ctx'> 	       .irqflags = IRQF_TRIGGER_RISING,</div><div class='ctx'> 	       .flags = TI16C752_FLAGS,</div><div class='ctx'> 	       .iotype = UPIO_MEM,</div><div class='hunk'>@@ -107,7 +107,7 @@ static struct plat_serial8250_port ti16c752_platform_data[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	[3] = {</div><div class='ctx'> 	       .mapbase = 0x140000c0,</div><div class='del'>-	       .irq = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO81)),</div><div class='add'>+	       .irq = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO81)),</div><div class='ctx'> 	       .irqflags = IRQF_TRIGGER_RISING,</div><div class='ctx'> 	       .flags = TI16C752_FLAGS,</div><div class='ctx'> 	       .iotype = UPIO_MEM,</div><div class='hunk'>@@ -153,5 +153,6 @@ MACHINE_START(CAPC7117,</div><div class='ctx'> 	.init_irq = pxa3xx_init_irq,</div><div class='ctx'> 	.handle_irq = pxa3xx_handle_irq,</div><div class='ctx'> 	.timer = &amp;pxa_timer,</div><div class='del'>-	.init_machine = capc7117_init</div><div class='add'>+	.init_machine = capc7117_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c<br/>index 13518a705399..431ef56700c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/cm-x270.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/cm-x270.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/cm-x270.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/cm-x270.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> /* GPIO IRQ usage */</div><div class='ctx'> #define GPIO83_MMC_IRQ		(83)</div><div class='ctx'> </div><div class='del'>-#define CMX270_MMC_IRQ		IRQ_GPIO(GPIO83_MMC_IRQ)</div><div class='add'>+#define CMX270_MMC_IRQ		PXA_GPIO_TO_IRQ(GPIO83_MMC_IRQ)</div><div class='ctx'> </div><div class='ctx'> /* MMC power enable */</div><div class='ctx'> #define GPIO105_MMC_POWER	(105)</div><div class='hunk'>@@ -380,7 +380,7 @@ static struct spi_board_info cm_x270_spi_devices[] __initdata = {</div><div class='ctx'> 		.modalias		= "libertas_spi",</div><div class='ctx'> 		.max_speed_hz		= 13000000,</div><div class='ctx'> 		.bus_num		= 2,</div><div class='del'>-		.irq			= gpio_to_irq(95),</div><div class='add'>+		.irq			= PXA_GPIO_TO_IRQ(95),</div><div class='ctx'> 		.chip_select		= 0,</div><div class='ctx'> 		.controller_data	= &amp;cm_x270_libertas_chip,</div><div class='ctx'> 		.platform_data		= &amp;cm_x270_libertas_pdata,</div><div class='head'>diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c<br/>index f2e4190080cb..8fa4ad27edf3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/cm-x2xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/cm-x2xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/cm-x2xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/cm-x2xx.c</a></div><div class='hunk'>@@ -58,8 +58,8 @@ extern void cmx270_init(void);</div><div class='ctx'> #define CMX255_GPIO_IT8152_IRQ	(0)</div><div class='ctx'> #define CMX270_GPIO_IT8152_IRQ	(22)</div><div class='ctx'> </div><div class='del'>-#define CMX255_ETHIRQ		IRQ_GPIO(GPIO22_ETHIRQ)</div><div class='del'>-#define CMX270_ETHIRQ		IRQ_GPIO(GPIO10_ETHIRQ)</div><div class='add'>+#define CMX255_ETHIRQ		PXA_GPIO_TO_IRQ(GPIO22_ETHIRQ)</div><div class='add'>+#define CMX270_ETHIRQ		PXA_GPIO_TO_IRQ(GPIO10_ETHIRQ)</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)</div><div class='ctx'> static struct resource cmx255_dm9000_resource[] = {</div><div class='hunk'>@@ -524,4 +524,5 @@ MACHINE_START(ARMCORE, "Compulab CM-X2XX")</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> 	.dma_zone_size	= SZ_64M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c<br/>index e096bba8fd57..4b981b82d2a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/cm-x300.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/cm-x300.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/cm-x300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/cm-x300.c</a></div><div class='hunk'>@@ -64,7 +64,7 @@</div><div class='ctx'> #define GPIO82_MMC_IRQ		(82)</div><div class='ctx'> #define GPIO85_MMC_WP		(85)</div><div class='ctx'> </div><div class='del'>-#define	CM_X300_MMC_IRQ		IRQ_GPIO(GPIO82_MMC_IRQ)</div><div class='add'>+#define	CM_X300_MMC_IRQ		PXA_GPIO_TO_IRQ(GPIO82_MMC_IRQ)</div><div class='ctx'> </div><div class='ctx'> #define GPIO95_RTC_CS		(95)</div><div class='ctx'> #define GPIO96_RTC_WR		(96)</div><div class='hunk'>@@ -229,8 +229,8 @@ static struct resource dm9000_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[2] = {</div><div class='del'>-		.start	= IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO99)),</div><div class='del'>-		.end	= IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO99)),</div><div class='add'>+		.start	= PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO99)),</div><div class='add'>+		.end	= PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO99)),</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -858,4 +858,5 @@ MACHINE_START(CM_X300, "CM-X300 module")</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= cm_x300_init,</div><div class='ctx'> 	.fixup		= cm_x300_fixup,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/colibri-pxa270-income.c b/arch/arm/mach-pxa/colibri-pxa270-income.c<br/>index 80538b8806ed..248804bb2c9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/colibri-pxa270-income.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/colibri-pxa270-income.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/colibri-pxa270-income.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/colibri-pxa270-income.c</a></div><div class='hunk'>@@ -183,7 +183,7 @@ static inline void income_lcd_init(void) {}</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * Backlight</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-#if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM__MODULE)</div><div class='add'>+#if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM_MODULE)</div><div class='ctx'> static struct platform_pwm_backlight_data income_backlight_data = {</div><div class='ctx'> 	.pwm_id		= 0,</div><div class='ctx'> 	.max_brightness	= 0x3ff,</div><div class='head'>diff --git a/arch/arm/mach-pxa/colibri-pxa270.c b/arch/arm/mach-pxa/colibri-pxa270.c<br/>index 05bfa1b1c001..29d5d541f602 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/colibri-pxa270.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/colibri-pxa270.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/colibri-pxa270.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/colibri-pxa270.c</a></div><div class='hunk'>@@ -218,8 +218,8 @@ static struct resource colibri_pxa270_dm9000_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.start	= gpio_to_irq(GPIO114_COLIBRI_PXA270_ETH_IRQ),</div><div class='del'>-		.end	= gpio_to_irq(GPIO114_COLIBRI_PXA270_ETH_IRQ),</div><div class='add'>+		.start	= PXA_GPIO_TO_IRQ(GPIO114_COLIBRI_PXA270_ETH_IRQ),</div><div class='add'>+		.end	= PXA_GPIO_TO_IRQ(GPIO114_COLIBRI_PXA270_ETH_IRQ),</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ | IRQF_TRIGGER_RISING,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -249,7 +249,7 @@ static pxa2xx_audio_ops_t colibri_pxa270_ac97_pdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ucb1400_pdata colibri_pxa270_ucb1400_pdata = {</div><div class='del'>-	.irq		= gpio_to_irq(GPIO113_COLIBRI_PXA270_TS_IRQ),</div><div class='add'>+	.irq		= PXA_GPIO_TO_IRQ(GPIO113_COLIBRI_PXA270_TS_IRQ),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device colibri_pxa270_ucb1400_device = {</div><div class='hunk'>@@ -313,6 +313,7 @@ MACHINE_START(COLIBRI, "Toradex Colibri PXA270")</div><div class='ctx'> 	.init_irq	= pxa27x_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(INCOME, "Income s.r.o. SH-Dmaster PXA270 SBC")</div><div class='hunk'>@@ -322,5 +323,6 @@ MACHINE_START(INCOME, "Income s.r.o. SH-Dmaster PXA270 SBC")</div><div class='ctx'> 	.init_irq	= pxa27x_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/colibri-pxa300.c b/arch/arm/mach-pxa/colibri-pxa300.c<br/>index c825e8bf2db1..0846d210cb05 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/colibri-pxa300.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/colibri-pxa300.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/colibri-pxa300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/colibri-pxa300.c</a></div><div class='hunk'>@@ -78,8 +78,8 @@ static struct resource colibri_asix_resource[] = {</div><div class='ctx'> 		.flags = IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start = gpio_to_irq(COLIBRI_ETH_IRQ_GPIO),</div><div class='del'>-		.end   = gpio_to_irq(COLIBRI_ETH_IRQ_GPIO),</div><div class='add'>+		.start = PXA_GPIO_TO_IRQ(COLIBRI_ETH_IRQ_GPIO),</div><div class='add'>+		.end   = PXA_GPIO_TO_IRQ(COLIBRI_ETH_IRQ_GPIO),</div><div class='ctx'> 		.flags = IORESOURCE_IRQ | IRQF_TRIGGER_FALLING,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -189,5 +189,6 @@ MACHINE_START(COLIBRI300, "Toradex Colibri PXA300")</div><div class='ctx'> 	.init_irq	= pxa3xx_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa3xx_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/colibri-pxa320.c b/arch/arm/mach-pxa/colibri-pxa320.c<br/>index d23b92b80488..6ad3359063af 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/colibri-pxa320.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/colibri-pxa320.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/colibri-pxa320.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/colibri-pxa320.c</a></div><div class='hunk'>@@ -115,8 +115,8 @@ static struct resource colibri_asix_resource[] = {</div><div class='ctx'> 		.flags = IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start = gpio_to_irq(COLIBRI_ETH_IRQ_GPIO),</div><div class='del'>-		.end   = gpio_to_irq(COLIBRI_ETH_IRQ_GPIO),</div><div class='add'>+		.start = PXA_GPIO_TO_IRQ(COLIBRI_ETH_IRQ_GPIO),</div><div class='add'>+		.end   = PXA_GPIO_TO_IRQ(COLIBRI_ETH_IRQ_GPIO),</div><div class='ctx'> 		.flags = IORESOURCE_IRQ | IRQF_TRIGGER_FALLING,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -259,5 +259,6 @@ MACHINE_START(COLIBRI320, "Toradex Colibri PXA320")</div><div class='ctx'> 	.init_irq	= pxa3xx_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa3xx_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c<br/>index 549468d088b9..11f1e735966e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/corgi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/corgi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/corgi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/corgi.c</a></div><div class='hunk'>@@ -436,6 +436,14 @@ static struct platform_device corgiled_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Corgi Audio</div><div class='add'>+ */</div><div class='add'>+static struct platform_device corgi_audio_device = {</div><div class='add'>+	.name	= "corgi-audio",</div><div class='add'>+	.id	= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * MMC/SD Device</div><div class='ctx'>  *</div><div class='ctx'>  * The card detect interrupt isn't debounced so we delay it by 250ms</div><div class='hunk'>@@ -531,7 +539,7 @@ static struct spi_board_info corgi_spi_devices[] = {</div><div class='ctx'> 		.chip_select	= 0,</div><div class='ctx'> 		.platform_data	= &amp;corgi_ads7846_info,</div><div class='ctx'> 		.controller_data= &amp;corgi_ads7846_chip,</div><div class='del'>-		.irq		= gpio_to_irq(CORGI_GPIO_TP_INT),</div><div class='add'>+		.irq		= PXA_GPIO_TO_IRQ(CORGI_GPIO_TP_INT),</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.modalias	= "corgi-lcd",</div><div class='ctx'> 		.max_speed_hz	= 50000,</div><div class='hunk'>@@ -641,6 +649,7 @@ static struct platform_device *devices[] __initdata = {</div><div class='ctx'> 	&amp;corgifb_device,</div><div class='ctx'> 	&amp;corgikbd_device,</div><div class='ctx'> 	&amp;corgiled_device,</div><div class='add'>+	&amp;corgi_audio_device,</div><div class='ctx'> 	&amp;sharpsl_nand_device,</div><div class='ctx'> 	&amp;sharpsl_rom_device,</div><div class='ctx'> };</div><div class='hunk'>@@ -655,7 +664,7 @@ static void corgi_poweroff(void)</div><div class='ctx'> 		/* Green LED off tells the bootloader to halt */</div><div class='ctx'> 		gpio_set_value(CORGI_GPIO_LED_GREEN, 0);</div><div class='ctx'> </div><div class='del'>-	arm_machine_restart('h', NULL);</div><div class='add'>+	pxa_restart('h', NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void corgi_restart(char mode, const char *cmd)</div><div class='hunk'>@@ -664,13 +673,12 @@ static void corgi_restart(char mode, const char *cmd)</div><div class='ctx'> 		/* Green LED on tells the bootloader to reboot */</div><div class='ctx'> 		gpio_set_value(CORGI_GPIO_LED_GREEN, 1);</div><div class='ctx'> </div><div class='del'>-	arm_machine_restart('h', cmd);</div><div class='add'>+	pxa_restart('h', cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init corgi_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	pm_power_off = corgi_poweroff;</div><div class='del'>-	arm_pm_restart = corgi_restart;</div><div class='ctx'> </div><div class='ctx'> 	/* Stop 3.6MHz and drive HIGH to PCMCIA and CS */</div><div class='ctx'> 	PCFR |= PCFR_OPDE;</div><div class='hunk'>@@ -726,6 +734,7 @@ MACHINE_START(CORGI, "SHARP Corgi")</div><div class='ctx'> 	.handle_irq	= pxa25x_handle_irq,</div><div class='ctx'> 	.init_machine	= corgi_init,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= corgi_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -737,6 +746,7 @@ MACHINE_START(SHEPHERD, "SHARP Shepherd")</div><div class='ctx'> 	.handle_irq	= pxa25x_handle_irq,</div><div class='ctx'> 	.init_machine	= corgi_init,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= corgi_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -748,6 +758,7 @@ MACHINE_START(HUSKY, "SHARP Husky")</div><div class='ctx'> 	.handle_irq	= pxa25x_handle_irq,</div><div class='ctx'> 	.init_machine	= corgi_init,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= corgi_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c<br/>index 29034778bfda..39e265cfc86d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/corgi_pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/corgi_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/corgi_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/corgi_pm.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/gpio-pxa.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;linux/apm-emulation.h&gt;</div><div class='hunk'>@@ -40,7 +41,9 @@ static struct gpio charger_gpios[] = {</div><div class='ctx'> 	{ CORGI_GPIO_ADC_TEMP_ON, GPIOF_OUT_INIT_LOW, "ADC Temp On" },</div><div class='ctx'> 	{ CORGI_GPIO_CHRG_ON,	  GPIOF_OUT_INIT_LOW, "Charger On" },</div><div class='ctx'> 	{ CORGI_GPIO_CHRG_UKN,	  GPIOF_OUT_INIT_LOW, "Charger Unknown" },</div><div class='add'>+	{ CORGI_GPIO_AC_IN,	  GPIOF_IN, "Charger Detection" },</div><div class='ctx'> 	{ CORGI_GPIO_KEY_INT,	  GPIOF_IN, "Key Interrupt" },</div><div class='add'>+	{ CORGI_GPIO_WAKEUP,	  GPIOF_IN, "System wakeup notification" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void corgi_charger_init(void)</div><div class='hunk'>@@ -90,7 +93,12 @@ static int corgi_should_wakeup(unsigned int resume_on_alarm)</div><div class='ctx'> {</div><div class='ctx'> 	int is_resume = 0;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(sharpsl_pm.dev, "GPLR0 = %x,%x\n", GPLR0, PEDR);</div><div class='add'>+	dev_dbg(sharpsl_pm.dev, "PEDR = %x, GPIO_AC_IN = %d, "</div><div class='add'>+		"GPIO_CHRG_FULL = %d, GPIO_KEY_INT = %d, GPIO_WAKEUP = %d\n",</div><div class='add'>+		PEDR, gpio_get_value(CORGI_GPIO_AC_IN),</div><div class='add'>+		gpio_get_value(CORGI_GPIO_CHRG_FULL),</div><div class='add'>+		gpio_get_value(CORGI_GPIO_KEY_INT),</div><div class='add'>+		gpio_get_value(CORGI_GPIO_WAKEUP));</div><div class='ctx'> </div><div class='ctx'> 	if ((PEDR &amp; GPIO_bit(CORGI_GPIO_AC_IN))) {</div><div class='ctx'> 		if (sharpsl_pm.machinfo-&gt;read_devdata(SHARPSL_STATUS_ACIN)) {</div><div class='hunk'>@@ -124,14 +132,21 @@ static int corgi_should_wakeup(unsigned int resume_on_alarm)</div><div class='ctx'> </div><div class='ctx'> static unsigned long corgi_charger_wakeup(void)</div><div class='ctx'> {</div><div class='del'>-	return ~GPLR0 &amp; ( GPIO_bit(CORGI_GPIO_AC_IN) | GPIO_bit(CORGI_GPIO_KEY_INT) | GPIO_bit(CORGI_GPIO_WAKEUP) );</div><div class='add'>+	unsigned long ret;</div><div class='add'>+</div><div class='add'>+	ret = (!gpio_get_value(CORGI_GPIO_AC_IN) &lt;&lt; GPIO_bit(CORGI_GPIO_AC_IN))</div><div class='add'>+		| (!gpio_get_value(CORGI_GPIO_KEY_INT)</div><div class='add'>+		&lt;&lt; GPIO_bit(CORGI_GPIO_KEY_INT))</div><div class='add'>+		| (!gpio_get_value(CORGI_GPIO_WAKEUP)</div><div class='add'>+		&lt;&lt; GPIO_bit(CORGI_GPIO_WAKEUP));</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned long corgipm_read_devdata(int type)</div><div class='ctx'> {</div><div class='ctx'> 	switch(type) {</div><div class='ctx'> 	case SHARPSL_STATUS_ACIN:</div><div class='del'>-		return ((GPLR(CORGI_GPIO_AC_IN) &amp; GPIO_bit(CORGI_GPIO_AC_IN)) != 0);</div><div class='add'>+		return !gpio_get_value(CORGI_GPIO_AC_IN);</div><div class='ctx'> 	case SHARPSL_STATUS_LOCK:</div><div class='ctx'> 		return gpio_get_value(sharpsl_pm.machinfo-&gt;gpio_batlock);</div><div class='ctx'> 	case SHARPSL_STATUS_CHRGFULL:</div><div class='head'>diff --git a/arch/arm/mach-pxa/csb726.c b/arch/arm/mach-pxa/csb726.c<br/>index 5e2cf39e9e4c..fb5a51d834e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/csb726.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/csb726.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/csb726.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/csb726.c</a></div><div class='hunk'>@@ -278,4 +278,5 @@ MACHINE_START(CSB726, "Cogent CSB726")</div><div class='ctx'> 	.handle_irq       = pxa27x_handle_irq,</div><div class='ctx'> 	.init_machine   = csb726_init,</div><div class='ctx'> 	.timer          = &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c<br/>index 2e0425404de5..18fd177073f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/devices.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/devices.c</a></div><div class='hunk'>@@ -415,9 +415,29 @@ static struct resource pxa_rtc_resources[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct resource sa1100_rtc_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start  = 0x40900000,</div><div class='add'>+		.end	= 0x409000ff,</div><div class='add'>+		.flags  = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start  = IRQ_RTC1Hz,</div><div class='add'>+		.end    = IRQ_RTC1Hz,</div><div class='add'>+		.flags  = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start  = IRQ_RTCAlrm,</div><div class='add'>+		.end    = IRQ_RTCAlrm,</div><div class='add'>+		.flags  = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct platform_device sa1100_device_rtc = {</div><div class='ctx'> 	.name		= "sa1100-rtc",</div><div class='ctx'> 	.id		= -1,</div><div class='add'>+	.num_resources  = ARRAY_SIZE(sa1100_rtc_resources),</div><div class='add'>+	.resource       = sa1100_rtc_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct platform_device pxa_device_rtc = {</div><div class='hunk'>@@ -1051,6 +1071,36 @@ struct platform_device pxa3xx_device_ssp4 = {</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_PXA3xx || CONFIG_PXA95x */</div><div class='ctx'> </div><div class='add'>+struct resource pxa_resource_gpio[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= 0x40e00000,</div><div class='add'>+		.end	= 0x40e0ffff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start	= IRQ_GPIO0,</div><div class='add'>+		.end	= IRQ_GPIO0,</div><div class='add'>+		.name	= "gpio0",</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	}, {</div><div class='add'>+		.start	= IRQ_GPIO1,</div><div class='add'>+		.end	= IRQ_GPIO1,</div><div class='add'>+		.name	= "gpio1",</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	}, {</div><div class='add'>+		.start	= IRQ_GPIO_2_x,</div><div class='add'>+		.end	= IRQ_GPIO_2_x,</div><div class='add'>+		.name	= "gpio_mux",</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct platform_device pxa_device_gpio = {</div><div class='add'>+	.name		= "pxa-gpio",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(pxa_resource_gpio),</div><div class='add'>+	.resource	= pxa_resource_gpio,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* pxa2xx-spi platform-device ID equals respective SSP platform-device ID + 1.</div><div class='ctx'>  * See comment in arch/arm/mach-pxa/ssp.c::ssp_probe() */</div><div class='ctx'> void __init pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_master *info)</div><div class='head'>diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h<br/>index 2fd5a8b35757..1475db107254 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/devices.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/devices.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/devices.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/devices.h</a></div><div class='hunk'>@@ -16,6 +16,7 @@ extern struct platform_device pxa_device_ficp;</div><div class='ctx'> extern struct platform_device sa1100_device_rtc;</div><div class='ctx'> extern struct platform_device pxa_device_rtc;</div><div class='ctx'> extern struct platform_device pxa_device_ac97;</div><div class='add'>+extern struct platform_device pxa_device_gpio;</div><div class='ctx'> </div><div class='ctx'> extern struct platform_device pxa27x_device_i2c_power;</div><div class='ctx'> extern struct platform_device pxa27x_device_ohci;</div><div class='head'>diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c<br/>index 94acc0b01dd6..d80c0ba9a095 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/em-x270.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/em-x270.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/em-x270.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/em-x270.c</a></div><div class='hunk'>@@ -70,7 +70,7 @@</div><div class='ctx'> /* common  GPIOs */</div><div class='ctx'> #define GPIO11_NAND_CS		(11)</div><div class='ctx'> #define GPIO41_ETHIRQ		(41)</div><div class='del'>-#define EM_X270_ETHIRQ		IRQ_GPIO(GPIO41_ETHIRQ)</div><div class='add'>+#define EM_X270_ETHIRQ		PXA_GPIO_TO_IRQ(GPIO41_ETHIRQ)</div><div class='ctx'> #define GPIO115_WLAN_PWEN	(115)</div><div class='ctx'> #define GPIO19_WLAN_STRAP	(19)</div><div class='ctx'> #define GPIO9_USB_VBUS_EN	(9)</div><div class='hunk'>@@ -805,7 +805,7 @@ static struct spi_board_info em_x270_spi_devices[] __initdata = {</div><div class='ctx'> 		.modalias		= "libertas_spi",</div><div class='ctx'> 		.max_speed_hz		= 13000000,</div><div class='ctx'> 		.bus_num		= 2,</div><div class='del'>-		.irq			= IRQ_GPIO(116),</div><div class='add'>+		.irq			= PXA_GPIO_TO_IRQ(116),</div><div class='ctx'> 		.chip_select		= 0,</div><div class='ctx'> 		.controller_data	= &amp;em_x270_libertas_chip,</div><div class='ctx'> 		.platform_data		= &amp;em_x270_libertas_pdata,</div><div class='hunk'>@@ -1203,7 +1203,7 @@ static struct da903x_platform_data em_x270_da9030_info = {</div><div class='ctx'> </div><div class='ctx'> static struct i2c_board_info em_x270_i2c_pmic_info = {</div><div class='ctx'> 	I2C_BOARD_INFO("da9030", 0x49),</div><div class='del'>-	.irq = IRQ_GPIO(0),</div><div class='add'>+	.irq = PXA_GPIO_TO_IRQ(0),</div><div class='ctx'> 	.platform_data = &amp;em_x270_da9030_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1305,6 +1305,7 @@ MACHINE_START(EM_X270, "Compulab EM-X270")</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= em_x270_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(EXEDA, "Compulab eXeda")</div><div class='hunk'>@@ -1314,4 +1315,5 @@ MACHINE_START(EXEDA, "Compulab eXeda")</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= em_x270_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c<br/>index d82b7aa3c096..4cb2391a782e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/eseries.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/eseries.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/eseries.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/eseries.c</a></div><div class='hunk'>@@ -119,8 +119,8 @@ struct resource eseries_tmio_resources[] = {</div><div class='ctx'> 		.flags  = IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start  = IRQ_GPIO(GPIO_ESERIES_TMIO_IRQ),</div><div class='del'>-		.end    = IRQ_GPIO(GPIO_ESERIES_TMIO_IRQ),</div><div class='add'>+		.start  = PXA_GPIO_TO_IRQ(GPIO_ESERIES_TMIO_IRQ),</div><div class='add'>+		.end    = PXA_GPIO_TO_IRQ(GPIO_ESERIES_TMIO_IRQ),</div><div class='ctx'> 		.flags  = IORESOURCE_IRQ,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -196,6 +196,7 @@ MACHINE_START(E330, "Toshiba e330")</div><div class='ctx'> 	.fixup		= eseries_fixup,</div><div class='ctx'> 	.init_machine	= e330_init,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -246,6 +247,7 @@ MACHINE_START(E350, "Toshiba e350")</div><div class='ctx'> 	.fixup		= eseries_fixup,</div><div class='ctx'> 	.init_machine	= e350_init,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -369,6 +371,7 @@ MACHINE_START(E400, "Toshiba e400")</div><div class='ctx'> 	.fixup		= eseries_fixup,</div><div class='ctx'> 	.init_machine	= e400_init,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -525,12 +528,18 @@ static struct platform_device e740_t7l66xb_device = {</div><div class='ctx'> 	.resource      = eseries_tmio_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct platform_device e740_audio_device = {</div><div class='add'>+	.name		= "e740-audio",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *e740_devices[] __initdata = {</div><div class='ctx'> 	&amp;e740_fb_device,</div><div class='ctx'> 	&amp;e740_t7l66xb_device,</div><div class='ctx'> 	&amp;e7xx_gpio_vbus,</div><div class='add'>+	&amp;e740_audio_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init e740_init(void)</div><div class='hunk'>@@ -558,6 +567,7 @@ MACHINE_START(E740, "Toshiba e740")</div><div class='ctx'> 	.fixup		= eseries_fixup,</div><div class='ctx'> 	.init_machine	= e740_init,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -718,12 +728,18 @@ static struct platform_device e750_tc6393xb_device = {</div><div class='ctx'> 	.resource      = eseries_tmio_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct platform_device e750_audio_device = {</div><div class='add'>+	.name		= "e750-audio",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* ------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *e750_devices[] __initdata = {</div><div class='ctx'> 	&amp;e750_fb_device,</div><div class='ctx'> 	&amp;e750_tc6393xb_device,</div><div class='ctx'> 	&amp;e7xx_gpio_vbus,</div><div class='add'>+	&amp;e750_audio_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init e750_init(void)</div><div class='hunk'>@@ -750,6 +766,7 @@ MACHINE_START(E750, "Toshiba e750")</div><div class='ctx'> 	.fixup		= eseries_fixup,</div><div class='ctx'> 	.init_machine	= e750_init,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -924,12 +941,18 @@ static struct platform_device e800_tc6393xb_device = {</div><div class='ctx'> 	.resource      = eseries_tmio_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct platform_device e800_audio_device = {</div><div class='add'>+	.name		= "e800-audio",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *e800_devices[] __initdata = {</div><div class='ctx'> 	&amp;e800_fb_device,</div><div class='ctx'> 	&amp;e800_tc6393xb_device,</div><div class='ctx'> 	&amp;e800_gpio_vbus,</div><div class='add'>+	&amp;e800_audio_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init e800_init(void)</div><div class='hunk'>@@ -955,5 +978,6 @@ MACHINE_START(E800, "Toshiba e800")</div><div class='ctx'> 	.fixup		= eseries_fixup,</div><div class='ctx'> 	.init_machine	= e800_init,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c<br/>index 8308eee5a924..15ab2533667d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/ezx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/ezx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/ezx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/ezx.c</a></div><div class='hunk'>@@ -804,6 +804,7 @@ MACHINE_START(EZX_A780, "Motorola EZX A780")</div><div class='ctx'> 	.handle_irq       = pxa27x_handle_irq,</div><div class='ctx'> 	.timer          = &amp;pxa_timer,</div><div class='ctx'> 	.init_machine   = a780_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -870,6 +871,7 @@ MACHINE_START(EZX_E680, "Motorola EZX E680")</div><div class='ctx'> 	.handle_irq       = pxa27x_handle_irq,</div><div class='ctx'> 	.timer          = &amp;pxa_timer,</div><div class='ctx'> 	.init_machine   = e680_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -936,6 +938,7 @@ MACHINE_START(EZX_A1200, "Motorola EZX A1200")</div><div class='ctx'> 	.handle_irq       = pxa27x_handle_irq,</div><div class='ctx'> 	.timer          = &amp;pxa_timer,</div><div class='ctx'> 	.init_machine   = a1200_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1127,6 +1130,7 @@ MACHINE_START(EZX_A910, "Motorola EZX A910")</div><div class='ctx'> 	.handle_irq       = pxa27x_handle_irq,</div><div class='ctx'> 	.timer          = &amp;pxa_timer,</div><div class='ctx'> 	.init_machine   = a910_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1193,6 +1197,7 @@ MACHINE_START(EZX_E6, "Motorola EZX E6")</div><div class='ctx'> 	.handle_irq       = pxa27x_handle_irq,</div><div class='ctx'> 	.timer          = &amp;pxa_timer,</div><div class='ctx'> 	.init_machine   = e6_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1233,5 +1238,6 @@ MACHINE_START(EZX_E2, "Motorola EZX E2")</div><div class='ctx'> 	.handle_irq       = pxa27x_handle_irq,</div><div class='ctx'> 	.timer          = &amp;pxa_timer,</div><div class='ctx'> 	.init_machine   = e2_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h<br/>index 92a2e85ab02c..0d729e6619df 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/generic.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/generic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/generic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/generic.h</a></div><div class='hunk'>@@ -57,3 +57,5 @@ void __init pxa_set_ffuart_info(void *info);</div><div class='ctx'> void __init pxa_set_btuart_info(void *info);</div><div class='ctx'> void __init pxa_set_stuart_info(void *info);</div><div class='ctx'> void __init pxa_set_hwuart_info(void *info);</div><div class='add'>+</div><div class='add'>+void pxa_restart(char, const char *);</div><div class='head'>diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c<br/>index ffdd70dad327..ac3b1cef4751 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/gumstix.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/gumstix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/gumstix.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/gumstix.c</a></div><div class='hunk'>@@ -239,4 +239,5 @@ MACHINE_START(GUMSTIX, "Gumstix")</div><div class='ctx'> 	.handle_irq	= pxa25x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= gumstix_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/h5000.c b/arch/arm/mach-pxa/h5000.c<br/>index 4b5e110640b1..fde6b4c873c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/h5000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/h5000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/h5000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/h5000.c</a></div><div class='hunk'>@@ -209,4 +209,5 @@ MACHINE_START(H5400, "HP iPAQ H5000")</div><div class='ctx'> 	.handle_irq = pxa25x_handle_irq,</div><div class='ctx'> 	.timer = &amp;pxa_timer,</div><div class='ctx'> 	.init_machine = h5000_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/himalaya.c b/arch/arm/mach-pxa/himalaya.c<br/>index f2c324570844..26d069a9f900 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/himalaya.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/himalaya.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/himalaya.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/himalaya.c</a></div><div class='hunk'>@@ -164,4 +164,5 @@ MACHINE_START(HIMALAYA, "HTC Himalaya")</div><div class='ctx'> 	.handle_irq = pxa25x_handle_irq,</div><div class='ctx'> 	.init_machine = himalaya_init,</div><div class='ctx'> 	.timer = &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c<br/>index 6f6368ece9bd..fb9b62dcf4ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/hx4700.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/hx4700.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/hx4700.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/hx4700.c</a></div><div class='hunk'>@@ -252,8 +252,8 @@ static struct resource asic3_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start	= gpio_to_irq(GPIO12_HX4700_ASIC3_IRQ),</div><div class='del'>-		.end	= gpio_to_irq(GPIO12_HX4700_ASIC3_IRQ),</div><div class='add'>+		.start	= PXA_GPIO_TO_IRQ(GPIO12_HX4700_ASIC3_IRQ),</div><div class='add'>+		.end	= PXA_GPIO_TO_IRQ(GPIO12_HX4700_ASIC3_IRQ),</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ,</div><div class='ctx'> 	},</div><div class='ctx'> 	/* SD part */</div><div class='hunk'>@@ -263,8 +263,8 @@ static struct resource asic3_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[3] = {</div><div class='del'>-		.start	= gpio_to_irq(GPIO66_HX4700_ASIC3_nSDIO_IRQ),</div><div class='del'>-		.end	= gpio_to_irq(GPIO66_HX4700_ASIC3_nSDIO_IRQ),</div><div class='add'>+		.start	= PXA_GPIO_TO_IRQ(GPIO66_HX4700_ASIC3_nSDIO_IRQ),</div><div class='add'>+		.end	= PXA_GPIO_TO_IRQ(GPIO66_HX4700_ASIC3_nSDIO_IRQ),</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -587,7 +587,7 @@ static struct spi_board_info tsc2046_board_info[] __initdata = {</div><div class='ctx'> 		.modalias        = "ads7846",</div><div class='ctx'> 		.bus_num         = 2,</div><div class='ctx'> 		.max_speed_hz    = 2600000, /* 100 kHz sample rate */</div><div class='del'>-		.irq             = gpio_to_irq(GPIO58_HX4700_TSC2046_nPENIRQ),</div><div class='add'>+		.irq             = PXA_GPIO_TO_IRQ(GPIO58_HX4700_TSC2046_nPENIRQ),</div><div class='ctx'> 		.platform_data   = &amp;tsc2046_info,</div><div class='ctx'> 		.controller_data = &amp;tsc2046_chip,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -635,15 +635,15 @@ static struct resource power_supply_resources[] = {</div><div class='ctx'> 		.name  = "ac",</div><div class='ctx'> 		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE |</div><div class='ctx'> 		         IORESOURCE_IRQ_LOWEDGE,</div><div class='del'>-		.start = gpio_to_irq(GPIOD9_nAC_IN),</div><div class='del'>-		.end   = gpio_to_irq(GPIOD9_nAC_IN),</div><div class='add'>+		.start = PXA_GPIO_TO_IRQ(GPIOD9_nAC_IN),</div><div class='add'>+		.end   = PXA_GPIO_TO_IRQ(GPIOD9_nAC_IN),</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='ctx'> 		.name  = "usb",</div><div class='ctx'> 		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE |</div><div class='ctx'> 		         IORESOURCE_IRQ_LOWEDGE,</div><div class='del'>-		.start = gpio_to_irq(GPIOD14_nUSBC_DETECT),</div><div class='del'>-		.end   = gpio_to_irq(GPIOD14_nUSBC_DETECT),</div><div class='add'>+		.start = PXA_GPIO_TO_IRQ(GPIOD14_nUSBC_DETECT),</div><div class='add'>+		.end   = PXA_GPIO_TO_IRQ(GPIOD14_nUSBC_DETECT),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -845,4 +845,5 @@ MACHINE_START(H4700, "HP iPAQ HX4700")</div><div class='ctx'> 	.handle_irq     = pxa27x_handle_irq,</div><div class='ctx'> 	.init_machine = hx4700_init,</div><div class='ctx'> 	.timer        = &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c<br/>index f78d5db758da..67400192ed3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/icontrol.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/icontrol.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/icontrol.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/icontrol.c</a></div><div class='hunk'>@@ -86,7 +86,7 @@ static struct spi_board_info mcp251x_board_info[] = {</div><div class='ctx'> 		.chip_select     = 0,</div><div class='ctx'> 		.platform_data   = &amp;mcp251x_info,</div><div class='ctx'> 		.controller_data = &amp;mcp251x_chip_info1,</div><div class='del'>-		.irq             = gpio_to_irq(ICONTROL_MCP251x_nIRQ1)</div><div class='add'>+		.irq             = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ1)</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.modalias        = "mcp2515",</div><div class='hunk'>@@ -95,7 +95,7 @@ static struct spi_board_info mcp251x_board_info[] = {</div><div class='ctx'> 		.chip_select     = 1,</div><div class='ctx'> 		.platform_data   = &amp;mcp251x_info,</div><div class='ctx'> 		.controller_data = &amp;mcp251x_chip_info2,</div><div class='del'>-		.irq             = gpio_to_irq(ICONTROL_MCP251x_nIRQ2)</div><div class='add'>+		.irq             = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ2)</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.modalias        = "mcp2515",</div><div class='hunk'>@@ -104,7 +104,7 @@ static struct spi_board_info mcp251x_board_info[] = {</div><div class='ctx'> 		.chip_select     = 0,</div><div class='ctx'> 		.platform_data   = &amp;mcp251x_info,</div><div class='ctx'> 		.controller_data = &amp;mcp251x_chip_info3,</div><div class='del'>-		.irq             = gpio_to_irq(ICONTROL_MCP251x_nIRQ3)</div><div class='add'>+		.irq             = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ3)</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.modalias        = "mcp2515",</div><div class='hunk'>@@ -113,7 +113,7 @@ static struct spi_board_info mcp251x_board_info[] = {</div><div class='ctx'> 		.chip_select     = 1,</div><div class='ctx'> 		.platform_data   = &amp;mcp251x_info,</div><div class='ctx'> 		.controller_data = &amp;mcp251x_chip_info4,</div><div class='del'>-		.irq             = gpio_to_irq(ICONTROL_MCP251x_nIRQ4)</div><div class='add'>+		.irq             = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ4)</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -196,5 +196,6 @@ MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM")</div><div class='ctx'> 	.init_irq	= pxa3xx_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa3xx_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='del'>-	.init_machine	= icontrol_init</div><div class='add'>+	.init_machine	= icontrol_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c<br/>index ddf20e5c376e..8af1840e12cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/idp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/idp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/idp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/idp.c</a></div><div class='hunk'>@@ -75,8 +75,8 @@ static struct resource smc91x_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start	= IRQ_GPIO(4),</div><div class='del'>-		.end	= IRQ_GPIO(4),</div><div class='add'>+		.start	= PXA_GPIO_TO_IRQ(4),</div><div class='add'>+		.end	= PXA_GPIO_TO_IRQ(4),</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -199,4 +199,5 @@ MACHINE_START(PXA_IDP, "Vibren PXA255 IDP")</div><div class='ctx'> 	.handle_irq	= pxa25x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= idp_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/balloon3.h b/arch/arm/mach-pxa/include/mach/balloon3.h<br/>index 6d7eab3d0867..f02fa1e6ba86 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/balloon3.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/balloon3.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/balloon3.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/balloon3.h</a></div><div class='hunk'>@@ -172,9 +172,9 @@ enum balloon3_features {</div><div class='ctx'> /* Balloon3 Interrupts */</div><div class='ctx'> #define BALLOON3_IRQ(x)		(IRQ_BOARD_START + (x))</div><div class='ctx'> </div><div class='del'>-#define BALLOON3_AUX_NIRQ	IRQ_GPIO(BALLOON3_GPIO_AUX_NIRQ)</div><div class='del'>-#define BALLOON3_CODEC_IRQ	IRQ_GPIO(BALLOON3_GPIO_CODEC_IRQ)</div><div class='del'>-#define BALLOON3_S0_CD_IRQ	IRQ_GPIO(BALLOON3_GPIO_S0_CD)</div><div class='add'>+#define BALLOON3_AUX_NIRQ	PXA_GPIO_TO_IRQ(BALLOON3_GPIO_AUX_NIRQ)</div><div class='add'>+#define BALLOON3_CODEC_IRQ	PXA_GPIO_TO_IRQ(BALLOON3_GPIO_CODEC_IRQ)</div><div class='add'>+#define BALLOON3_S0_CD_IRQ	PXA_GPIO_TO_IRQ(BALLOON3_GPIO_S0_CD)</div><div class='ctx'> </div><div class='ctx'> #define BALLOON3_NR_IRQS	(IRQ_BOARD_START + 16)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/corgi.h b/arch/arm/mach-pxa/include/mach/corgi.h<br/>index 5dfd1195a5a7..f3c3493b468d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/corgi.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/corgi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/corgi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/corgi.h</a></div><div class='hunk'>@@ -66,18 +66,18 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Corgi Interrupts</div><div class='ctx'>  */</div><div class='del'>-#define CORGI_IRQ_GPIO_KEY_INT		IRQ_GPIO(0)</div><div class='del'>-#define CORGI_IRQ_GPIO_AC_IN		IRQ_GPIO(1)</div><div class='del'>-#define CORGI_IRQ_GPIO_WAKEUP		IRQ_GPIO(3)</div><div class='del'>-#define CORGI_IRQ_GPIO_AK_INT		IRQ_GPIO(4)</div><div class='del'>-#define CORGI_IRQ_GPIO_TP_INT		IRQ_GPIO(5)</div><div class='del'>-#define CORGI_IRQ_GPIO_nSD_DETECT	IRQ_GPIO(9)</div><div class='del'>-#define CORGI_IRQ_GPIO_nSD_INT		IRQ_GPIO(10)</div><div class='del'>-#define CORGI_IRQ_GPIO_MAIN_BAT_LOW	IRQ_GPIO(11)</div><div class='del'>-#define CORGI_IRQ_GPIO_CF_CD		IRQ_GPIO(14)</div><div class='del'>-#define CORGI_IRQ_GPIO_CHRG_FULL	IRQ_GPIO(16)	/* Battery fully charged */</div><div class='del'>-#define CORGI_IRQ_GPIO_CF_IRQ		IRQ_GPIO(17)</div><div class='del'>-#define CORGI_IRQ_GPIO_KEY_SENSE(a)	IRQ_GPIO(58+(a))	/* Keyboard Sense lines */</div><div class='add'>+#define CORGI_IRQ_GPIO_KEY_INT		PXA_GPIO_TO_IRQ(0)</div><div class='add'>+#define CORGI_IRQ_GPIO_AC_IN		PXA_GPIO_TO_IRQ(1)</div><div class='add'>+#define CORGI_IRQ_GPIO_WAKEUP		PXA_GPIO_TO_IRQ(3)</div><div class='add'>+#define CORGI_IRQ_GPIO_AK_INT		PXA_GPIO_TO_IRQ(4)</div><div class='add'>+#define CORGI_IRQ_GPIO_TP_INT		PXA_GPIO_TO_IRQ(5)</div><div class='add'>+#define CORGI_IRQ_GPIO_nSD_DETECT	PXA_GPIO_TO_IRQ(9)</div><div class='add'>+#define CORGI_IRQ_GPIO_nSD_INT		PXA_GPIO_TO_IRQ(10)</div><div class='add'>+#define CORGI_IRQ_GPIO_MAIN_BAT_LOW	PXA_GPIO_TO_IRQ(11)</div><div class='add'>+#define CORGI_IRQ_GPIO_CF_CD		PXA_GPIO_TO_IRQ(14)</div><div class='add'>+#define CORGI_IRQ_GPIO_CHRG_FULL	PXA_GPIO_TO_IRQ(16)	/* Battery fully charged */</div><div class='add'>+#define CORGI_IRQ_GPIO_CF_IRQ		PXA_GPIO_TO_IRQ(17)</div><div class='add'>+#define CORGI_IRQ_GPIO_KEY_SENSE(a)	PXA_GPIO_TO_IRQ(58+(a))	/* Keyboard Sense lines */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -98,7 +98,7 @@</div><div class='ctx'> 			CORGI_SCP_MIC_BIAS )</div><div class='ctx'> #define CORGI_SCOOP_IO_OUT	( CORGI_SCP_MUTE_L | CORGI_SCP_MUTE_R )</div><div class='ctx'> </div><div class='del'>-#define CORGI_SCOOP_GPIO_BASE		(NR_BUILTIN_GPIO)</div><div class='add'>+#define CORGI_SCOOP_GPIO_BASE		(PXA_NR_BUILTIN_GPIO)</div><div class='ctx'> #define CORGI_GPIO_LED_GREEN		(CORGI_SCOOP_GPIO_BASE + 0)</div><div class='ctx'> #define CORGI_GPIO_SWA			(CORGI_SCOOP_GPIO_BASE + 1)  /* Hinge Switch A */</div><div class='ctx'> #define CORGI_GPIO_SWB			(CORGI_SCOOP_GPIO_BASE + 2)  /* Hinge Switch B */</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/csb726.h b/arch/arm/mach-pxa/include/mach/csb726.h<br/>index 747ab1a71f2f..2628e7b72116 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/csb726.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/csb726.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/csb726.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/csb726.h</a></div><div class='hunk'>@@ -19,8 +19,8 @@</div><div class='ctx'> #define CSB726_FLASH_SIZE	(64 * 1024 * 1024)</div><div class='ctx'> #define CSB726_FLASH_uMON	(8 * 1024 * 1024)</div><div class='ctx'> </div><div class='del'>-#define CSB726_IRQ_LAN		gpio_to_irq(CSB726_GPIO_IRQ_LAN)</div><div class='del'>-#define CSB726_IRQ_SM501	gpio_to_irq(CSB726_GPIO_IRQ_SM501)</div><div class='add'>+#define CSB726_IRQ_LAN		PXA_GPIO_TO_IRQ(CSB726_GPIO_IRQ_LAN)</div><div class='add'>+#define CSB726_IRQ_SM501	PXA_GPIO_TO_IRQ(CSB726_GPIO_IRQ_SM501)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/entry-macro.S b/arch/arm/mach-pxa/include/mach/entry-macro.S<br/>index a73bc86a3c26..260c0c17692a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -7,45 +7,9 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='del'>-		.macro  get_irqnr_preamble, base, tmp</div><div class='del'>-		.endm</div><div class='del'>-</div><div class='ctx'> 		.macro  arch_ret_to_user, tmp1, tmp2</div><div class='ctx'> 		.endm</div><div class='del'>-</div><div class='del'>-		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-		mrc	p15, 0, \tmp, c0, c0, 0		@ CPUID</div><div class='del'>-		mov	\tmp, \tmp, lsr #13</div><div class='del'>-		and	\tmp, \tmp, #0x7		@ Core G</div><div class='del'>-		cmp	\tmp, #1</div><div class='del'>-		bhi	1002f</div><div class='del'>-</div><div class='del'>-		@ Core Generation 1 (PXA25x)</div><div class='del'>-		mov	\base, #io_p2v(0x40000000)	@ IIR Ctl = 0x40d00000</div><div class='del'>-		add	\base, \base, #0x00d00000</div><div class='del'>-		ldr	\irqstat, [\base, #0]		@ ICIP</div><div class='del'>-		ldr	\irqnr, [\base, #4]		@ ICMR</div><div class='del'>-</div><div class='del'>-		ands	\irqnr, \irqstat, \irqnr</div><div class='del'>-		beq	1001f</div><div class='del'>-		rsb	\irqstat, \irqnr, #0</div><div class='del'>-		and	\irqstat, \irqstat, \irqnr</div><div class='del'>-		clz	\irqnr, \irqstat</div><div class='del'>-		rsb	\irqnr, \irqnr, #(31 + PXA_IRQ(0))</div><div class='del'>-		b	1001f</div><div class='del'>-1002:</div><div class='del'>-		@ Core Generation 2 (PXA27x) or Core Generation 3 (PXA3xx)</div><div class='del'>-		mrc	p6, 0, \irqstat, c5, c0, 0	@ ICHP</div><div class='del'>-		tst	\irqstat, #0x80000000</div><div class='del'>-		beq	1001f</div><div class='del'>-		bic	\irqstat, \irqstat, #0x80000000</div><div class='del'>-		mov	\irqnr, \irqstat, lsr #16</div><div class='del'>-		add	\irqnr, \irqnr, #(PXA_IRQ(0))</div><div class='del'>-1001:</div><div class='del'>-		.endm</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/gpio-pxa.h b/arch/arm/mach-pxa/include/mach/gpio-pxa.h<br/>deleted file mode 100644<br/>index 41b4c93a96c2..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/gpio-pxa.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/gpio-pxa.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,133 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Written by Philipp Zabel &lt;philipp.zabel@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 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='del'>-#ifndef __MACH_PXA_GPIO_PXA_H</div><div class='del'>-#define __MACH_PXA_GPIO_PXA_H</div><div class='del'>-</div><div class='del'>-#include &lt;mach/irqs.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-</div><div class='del'>-#define GPIO_REGS_VIRT	io_p2v(0x40E00000)</div><div class='del'>-</div><div class='del'>-#define BANK_OFF(n)	(((n) &lt; 3) ? (n) &lt;&lt; 2 : 0x100 + (((n) - 3) &lt;&lt; 2))</div><div class='del'>-#define GPIO_REG(x)	(*(volatile u32 *)(GPIO_REGS_VIRT + (x)))</div><div class='del'>-</div><div class='del'>-/* GPIO Pin Level Registers */</div><div class='del'>-#define GPLR0		GPIO_REG(BANK_OFF(0) + 0x00)</div><div class='del'>-#define GPLR1		GPIO_REG(BANK_OFF(1) + 0x00)</div><div class='del'>-#define GPLR2		GPIO_REG(BANK_OFF(2) + 0x00)</div><div class='del'>-#define GPLR3		GPIO_REG(BANK_OFF(3) + 0x00)</div><div class='del'>-</div><div class='del'>-/* GPIO Pin Direction Registers */</div><div class='del'>-#define GPDR0		GPIO_REG(BANK_OFF(0) + 0x0c)</div><div class='del'>-#define GPDR1		GPIO_REG(BANK_OFF(1) + 0x0c)</div><div class='del'>-#define GPDR2		GPIO_REG(BANK_OFF(2) + 0x0c)</div><div class='del'>-#define GPDR3		GPIO_REG(BANK_OFF(3) + 0x0c)</div><div class='del'>-</div><div class='del'>-/* GPIO Pin Output Set Registers */</div><div class='del'>-#define GPSR0		GPIO_REG(BANK_OFF(0) + 0x18)</div><div class='del'>-#define GPSR1		GPIO_REG(BANK_OFF(1) + 0x18)</div><div class='del'>-#define GPSR2		GPIO_REG(BANK_OFF(2) + 0x18)</div><div class='del'>-#define GPSR3		GPIO_REG(BANK_OFF(3) + 0x18)</div><div class='del'>-</div><div class='del'>-/* GPIO Pin Output Clear Registers */</div><div class='del'>-#define GPCR0		GPIO_REG(BANK_OFF(0) + 0x24)</div><div class='del'>-#define GPCR1		GPIO_REG(BANK_OFF(1) + 0x24)</div><div class='del'>-#define GPCR2		GPIO_REG(BANK_OFF(2) + 0x24)</div><div class='del'>-#define GPCR3		GPIO_REG(BANK_OFF(3) + 0x24)</div><div class='del'>-</div><div class='del'>-/* GPIO Rising Edge Detect Registers */</div><div class='del'>-#define GRER0		GPIO_REG(BANK_OFF(0) + 0x30)</div><div class='del'>-#define GRER1		GPIO_REG(BANK_OFF(1) + 0x30)</div><div class='del'>-#define GRER2		GPIO_REG(BANK_OFF(2) + 0x30)</div><div class='del'>-#define GRER3		GPIO_REG(BANK_OFF(3) + 0x30)</div><div class='del'>-</div><div class='del'>-/* GPIO Falling Edge Detect Registers */</div><div class='del'>-#define GFER0		GPIO_REG(BANK_OFF(0) + 0x3c)</div><div class='del'>-#define GFER1		GPIO_REG(BANK_OFF(1) + 0x3c)</div><div class='del'>-#define GFER2		GPIO_REG(BANK_OFF(2) + 0x3c)</div><div class='del'>-#define GFER3		GPIO_REG(BANK_OFF(3) + 0x3c)</div><div class='del'>-</div><div class='del'>-/* GPIO Edge Detect Status Registers */</div><div class='del'>-#define GEDR0		GPIO_REG(BANK_OFF(0) + 0x48)</div><div class='del'>-#define GEDR1		GPIO_REG(BANK_OFF(1) + 0x48)</div><div class='del'>-#define GEDR2		GPIO_REG(BANK_OFF(2) + 0x48)</div><div class='del'>-#define GEDR3		GPIO_REG(BANK_OFF(3) + 0x48)</div><div class='del'>-</div><div class='del'>-/* GPIO Alternate Function Select Registers */</div><div class='del'>-#define GAFR0_L		GPIO_REG(0x0054)</div><div class='del'>-#define GAFR0_U		GPIO_REG(0x0058)</div><div class='del'>-#define GAFR1_L		GPIO_REG(0x005C)</div><div class='del'>-#define GAFR1_U		GPIO_REG(0x0060)</div><div class='del'>-#define GAFR2_L		GPIO_REG(0x0064)</div><div class='del'>-#define GAFR2_U		GPIO_REG(0x0068)</div><div class='del'>-#define GAFR3_L		GPIO_REG(0x006C)</div><div class='del'>-#define GAFR3_U		GPIO_REG(0x0070)</div><div class='del'>-</div><div class='del'>-/* More handy macros.  The argument is a literal GPIO number. */</div><div class='del'>-</div><div class='del'>-#define GPIO_bit(x)	(1 &lt;&lt; ((x) &amp; 0x1f))</div><div class='del'>-</div><div class='del'>-#define GPLR(x)		GPIO_REG(BANK_OFF((x) &gt;&gt; 5) + 0x00)</div><div class='del'>-#define GPDR(x)		GPIO_REG(BANK_OFF((x) &gt;&gt; 5) + 0x0c)</div><div class='del'>-#define GPSR(x)		GPIO_REG(BANK_OFF((x) &gt;&gt; 5) + 0x18)</div><div class='del'>-#define GPCR(x)		GPIO_REG(BANK_OFF((x) &gt;&gt; 5) + 0x24)</div><div class='del'>-#define GRER(x)		GPIO_REG(BANK_OFF((x) &gt;&gt; 5) + 0x30)</div><div class='del'>-#define GFER(x)		GPIO_REG(BANK_OFF((x) &gt;&gt; 5) + 0x3c)</div><div class='del'>-#define GEDR(x)		GPIO_REG(BANK_OFF((x) &gt;&gt; 5) + 0x48)</div><div class='del'>-#define GAFR(x)		GPIO_REG(0x54 + (((x) &amp; 0x70) &gt;&gt; 2))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define NR_BUILTIN_GPIO		PXA_GPIO_IRQ_NUM</div><div class='del'>-</div><div class='del'>-#define gpio_to_bank(gpio)	((gpio) &gt;&gt; 5)</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CPU_PXA26x</div><div class='del'>-/* GPIO86/87/88/89 on PXA26x have their direction bits in GPDR2 inverted,</div><div class='del'>- * as well as their Alternate Function value being '1' for GPIO in GAFRx.</div><div class='del'>- */</div><div class='del'>-static inline int __gpio_is_inverted(unsigned gpio)</div><div class='del'>-{</div><div class='del'>-	return cpu_is_pxa25x() &amp;&amp; gpio &gt; 85;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline int __gpio_is_inverted(unsigned gpio) { return 0; }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * On PXA25x and PXA27x, GAFRx and GPDRx together decide the alternate</div><div class='del'>- * function of a GPIO, and GPDRx cannot be altered once configured. It</div><div class='del'>- * is attributed as "occupied" here (I know this terminology isn't</div><div class='del'>- * accurate, you are welcome to propose a better one :-)</div><div class='del'>- */</div><div class='del'>-static inline int __gpio_is_occupied(unsigned gpio)</div><div class='del'>-{</div><div class='del'>-	if (cpu_is_pxa27x() || cpu_is_pxa25x()) {</div><div class='del'>-		int af = (GAFR(gpio) &gt;&gt; ((gpio &amp; 0xf) * 2)) &amp; 0x3;</div><div class='del'>-		int dir = GPDR(gpio) &amp; GPIO_bit(gpio);</div><div class='del'>-</div><div class='del'>-		if (__gpio_is_inverted(gpio))</div><div class='del'>-			return af != 1 || dir == 0;</div><div class='del'>-		else</div><div class='del'>-			return af != 0 || dir != 0;</div><div class='del'>-	} else</div><div class='del'>-		return GPDR(gpio) &amp; GPIO_bit(gpio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#include &lt;plat/gpio-pxa.h&gt;</div><div class='del'>-#endif /* __MACH_PXA_GPIO_PXA_H */</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/gpio.h b/arch/arm/mach-pxa/include/mach/gpio.h<br/>index 004cade7bb13..0248e433bc98 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/gpio.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/gpio.h</a></div><div class='hunk'>@@ -25,24 +25,8 @@</div><div class='ctx'> #define __ASM_ARCH_PXA_GPIO_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/gpio.h&gt;</div><div class='del'>-/* The defines for the driver are needed for the accelerated accessors */</div><div class='del'>-#include "gpio-pxa.h"</div><div class='ctx'> </div><div class='del'>-#define gpio_to_irq(gpio)	IRQ_GPIO(gpio)</div><div class='add'>+#include &lt;mach/irqs.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='del'>-static inline int irq_to_gpio(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	int gpio;</div><div class='del'>-</div><div class='del'>-	if (irq == IRQ_GPIO0 || irq == IRQ_GPIO1)</div><div class='del'>-		return irq - IRQ_GPIO0;</div><div class='del'>-</div><div class='del'>-	gpio = irq - PXA_GPIO_IRQ_BASE;</div><div class='del'>-	if (gpio &gt;= 2 &amp;&amp; gpio &lt; NR_BUILTIN_GPIO)</div><div class='del'>-		return gpio;</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#include &lt;plat/gpio.h&gt;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/gumstix.h b/arch/arm/mach-pxa/include/mach/gumstix.h<br/>index 9b898680b206..dba14b6503ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/gumstix.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/gumstix.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/gumstix.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/gumstix.h</a></div><div class='hunk'>@@ -24,7 +24,7 @@ has detected a cable insertion; driven low otherwise. */</div><div class='ctx'> #define GPIO_GUMSTIX_USB_GPIOx		41</div><div class='ctx'> </div><div class='ctx'> /* usb state change */</div><div class='del'>-#define GUMSTIX_USB_INTR_IRQ		IRQ_GPIO(GPIO_GUMSTIX_USB_GPIOn)</div><div class='add'>+#define GUMSTIX_USB_INTR_IRQ		PXA_GPIO_TO_IRQ(GPIO_GUMSTIX_USB_GPIOn)</div><div class='ctx'> </div><div class='ctx'> #define GPIO_GUMSTIX_USB_GPIOn_MD	(GPIO_GUMSTIX_USB_GPIOn | GPIO_IN)</div><div class='ctx'> #define GPIO_GUMSTIX_USB_GPIOx_CON_MD	(GPIO_GUMSTIX_USB_GPIOx | GPIO_OUT)</div><div class='hunk'>@@ -35,7 +35,7 @@ has detected a cable insertion; driven low otherwise. */</div><div class='ctx'>  */</div><div class='ctx'> #define GUMSTIX_GPIO_nSD_WP		22 /* SD Write Protect */</div><div class='ctx'> #define GUMSTIX_GPIO_nSD_DETECT		11 /* MMC/SD Card Detect */</div><div class='del'>-#define GUMSTIX_IRQ_GPIO_nSD_DETECT	IRQ_GPIO(GUMSTIX_GPIO_nSD_DETECT)</div><div class='add'>+#define GUMSTIX_IRQ_GPIO_nSD_DETECT	PXA_GPIO_TO_IRQ(GUMSTIX_GPIO_nSD_DETECT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * SMC Ethernet definitions</div><div class='hunk'>@@ -49,10 +49,10 @@ has detected a cable insertion; driven low otherwise. */</div><div class='ctx'> </div><div class='ctx'> #define GPIO_GUMSTIX_ETH0		36</div><div class='ctx'> #define GPIO_GUMSTIX_ETH0_MD		(GPIO_GUMSTIX_ETH0 | GPIO_IN)</div><div class='del'>-#define GUMSTIX_ETH0_IRQ		IRQ_GPIO(GPIO_GUMSTIX_ETH0)</div><div class='add'>+#define GUMSTIX_ETH0_IRQ		PXA_GPIO_TO_IRQ(GPIO_GUMSTIX_ETH0)</div><div class='ctx'> #define GPIO_GUMSTIX_ETH1		27</div><div class='ctx'> #define GPIO_GUMSTIX_ETH1_MD		(GPIO_GUMSTIX_ETH1 | GPIO_IN)</div><div class='del'>-#define GUMSTIX_ETH1_IRQ		IRQ_GPIO(GPIO_GUMSTIX_ETH1)</div><div class='add'>+#define GUMSTIX_ETH1_IRQ		PXA_GPIO_TO_IRQ(GPIO_GUMSTIX_ETH1)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* CF reset line */</div><div class='hunk'>@@ -63,18 +63,18 @@ has detected a cable insertion; driven low otherwise. */</div><div class='ctx'> #define GPIO4_nSTSCHG			GPIO4_nBVD1</div><div class='ctx'> #define GPIO11_nCD			11</div><div class='ctx'> #define GPIO26_PRDY_nBSY		26</div><div class='del'>-#define GUMSTIX_S0_nSTSCHG_IRQ		IRQ_GPIO(GPIO4_nSTSCHG)</div><div class='del'>-#define GUMSTIX_S0_nCD_IRQ		IRQ_GPIO(GPIO11_nCD)</div><div class='del'>-#define GUMSTIX_S0_PRDY_nBSY_IRQ	IRQ_GPIO(GPIO26_PRDY_nBSY)</div><div class='add'>+#define GUMSTIX_S0_nSTSCHG_IRQ		PXA_GPIO_TO_IRQ(GPIO4_nSTSCHG)</div><div class='add'>+#define GUMSTIX_S0_nCD_IRQ		PXA_GPIO_TO_IRQ(GPIO11_nCD)</div><div class='add'>+#define GUMSTIX_S0_PRDY_nBSY_IRQ	PXA_GPIO_TO_IRQ(GPIO26_PRDY_nBSY)</div><div class='ctx'> </div><div class='ctx'> /* CF slot 1 */</div><div class='ctx'> #define GPIO18_nBVD1			18</div><div class='ctx'> #define GPIO18_nSTSCHG			GPIO18_nBVD1</div><div class='ctx'> #define GPIO36_nCD			36</div><div class='ctx'> #define GPIO27_PRDY_nBSY		27</div><div class='del'>-#define GUMSTIX_S1_nSTSCHG_IRQ		IRQ_GPIO(GPIO18_nSTSCHG)</div><div class='del'>-#define GUMSTIX_S1_nCD_IRQ		IRQ_GPIO(GPIO36_nCD)</div><div class='del'>-#define GUMSTIX_S1_PRDY_nBSY_IRQ	IRQ_GPIO(GPIO27_PRDY_nBSY)</div><div class='add'>+#define GUMSTIX_S1_nSTSCHG_IRQ		PXA_GPIO_TO_IRQ(GPIO18_nSTSCHG)</div><div class='add'>+#define GUMSTIX_S1_nCD_IRQ		PXA_GPIO_TO_IRQ(GPIO36_nCD)</div><div class='add'>+#define GUMSTIX_S1_PRDY_nBSY_IRQ	PXA_GPIO_TO_IRQ(GPIO27_PRDY_nBSY)</div><div class='ctx'> </div><div class='ctx'> /* CF GPIO line modes */</div><div class='ctx'> #define GPIO4_nSTSCHG_MD		(GPIO4_nSTSCHG | GPIO_IN)</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/hx4700.h b/arch/arm/mach-pxa/include/mach/hx4700.h<br/>index 37408449ec25..8bc02913517c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/hx4700.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/hx4700.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/hx4700.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/hx4700.h</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/asic3.h&gt;</div><div class='ctx'> </div><div class='del'>-#define HX4700_ASIC3_GPIO_BASE	NR_BUILTIN_GPIO</div><div class='add'>+#define HX4700_ASIC3_GPIO_BASE	PXA_NR_BUILTIN_GPIO</div><div class='ctx'> #define HX4700_EGPIO_BASE	(HX4700_ASIC3_GPIO_BASE + ASIC3_NUM_GPIOS)</div><div class='ctx'> #define HX4700_NR_IRQS		(IRQ_BOARD_START + 70)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/idp.h b/arch/arm/mach-pxa/include/mach/idp.h<br/>index 5eff96fcc944..22a96f87232b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/idp.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/idp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/idp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/idp.h</a></div><div class='hunk'>@@ -131,28 +131,26 @@</div><div class='ctx'> #define PCC_VS2		(1 &lt;&lt; 1)</div><div class='ctx'> #define PCC_VS1		(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='del'>-#define PCC_DETECT(x)	(GPLR(7 + (x)) &amp; GPIO_bit(7 + (x)))</div><div class='del'>-</div><div class='ctx'> /* A listing of interrupts used by external hardware devices */</div><div class='ctx'> </div><div class='del'>-#define TOUCH_PANEL_IRQ			IRQ_GPIO(5)</div><div class='del'>-#define IDE_IRQ				IRQ_GPIO(21)</div><div class='add'>+#define TOUCH_PANEL_IRQ			PXA_GPIO_TO_IRQ(5)</div><div class='add'>+#define IDE_IRQ				PXA_GPIO_TO_IRQ(21)</div><div class='ctx'> </div><div class='ctx'> #define TOUCH_PANEL_IRQ_EDGE		IRQ_TYPE_EDGE_FALLING</div><div class='ctx'> </div><div class='del'>-#define ETHERNET_IRQ			IRQ_GPIO(4)</div><div class='add'>+#define ETHERNET_IRQ			PXA_GPIO_TO_IRQ(4)</div><div class='ctx'> #define ETHERNET_IRQ_EDGE		IRQ_TYPE_EDGE_RISING</div><div class='ctx'> </div><div class='ctx'> #define IDE_IRQ_EDGE			IRQ_TYPE_EDGE_RISING</div><div class='ctx'> </div><div class='del'>-#define PCMCIA_S0_CD_VALID		IRQ_GPIO(7)</div><div class='add'>+#define PCMCIA_S0_CD_VALID		PXA_GPIO_TO_IRQ(7)</div><div class='ctx'> #define PCMCIA_S0_CD_VALID_EDGE		IRQ_TYPE_EDGE_BOTH</div><div class='ctx'> </div><div class='del'>-#define PCMCIA_S1_CD_VALID		IRQ_GPIO(8)</div><div class='add'>+#define PCMCIA_S1_CD_VALID		PXA_GPIO_TO_IRQ(8)</div><div class='ctx'> #define PCMCIA_S1_CD_VALID_EDGE		IRQ_TYPE_EDGE_BOTH</div><div class='ctx'> </div><div class='del'>-#define PCMCIA_S0_RDYINT		IRQ_GPIO(19)</div><div class='del'>-#define PCMCIA_S1_RDYINT		IRQ_GPIO(22)</div><div class='add'>+#define PCMCIA_S0_RDYINT		PXA_GPIO_TO_IRQ(19)</div><div class='add'>+#define PCMCIA_S1_RDYINT		PXA_GPIO_TO_IRQ(22)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h<br/>index 7cc5a781e99e..32975adf3ca4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/irqs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/irqs.h</a></div><div class='hunk'>@@ -88,10 +88,8 @@</div><div class='ctx'> #define IRQ_U2P		PXA_IRQ(93)	/* USB PHY D+/D- Lines (PXA935) */</div><div class='ctx'> </div><div class='ctx'> #define PXA_GPIO_IRQ_BASE	PXA_IRQ(96)</div><div class='del'>-#define PXA_GPIO_IRQ_NUM	(192)</div><div class='del'>-</div><div class='del'>-#define GPIO_2_x_TO_IRQ(x)	(PXA_GPIO_IRQ_BASE + (x))</div><div class='del'>-#define IRQ_GPIO(x)	(((x) &lt; 2) ? (IRQ_GPIO0 + (x)) : GPIO_2_x_TO_IRQ(x))</div><div class='add'>+#define PXA_NR_BUILTIN_GPIO	(192)</div><div class='add'>+#define PXA_GPIO_TO_IRQ(x)	(PXA_GPIO_IRQ_BASE + (x))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The following interrupts are for board specific purposes. Since</div><div class='hunk'>@@ -100,7 +98,7 @@</div><div class='ctx'>  * By default, no board IRQ is reserved. It should be finished in</div><div class='ctx'>  * custom board since sparse IRQ is already enabled.</div><div class='ctx'>  */</div><div class='del'>-#define IRQ_BOARD_START		(PXA_GPIO_IRQ_BASE + PXA_GPIO_IRQ_NUM)</div><div class='add'>+#define IRQ_BOARD_START		(PXA_GPIO_IRQ_BASE + PXA_NR_BUILTIN_GPIO)</div><div class='ctx'> </div><div class='ctx'> #define NR_IRQS			(IRQ_BOARD_START)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/littleton.h b/arch/arm/mach-pxa/include/mach/littleton.h<br/>index b6238cbd8aea..8066be54e9f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/littleton.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/littleton.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/littleton.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/littleton.h</a></div><div class='hunk'>@@ -1,13 +1,11 @@</div><div class='ctx'> #ifndef __ASM_ARCH_LITTLETON_H</div><div class='ctx'> #define __ASM_ARCH_LITTLETON_H</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/gpio-pxa.h&gt;</div><div class='del'>-</div><div class='ctx'> #define LITTLETON_ETH_PHYS	0x30000000</div><div class='ctx'> </div><div class='ctx'> #define LITTLETON_GPIO_LCD_CS	(17)</div><div class='ctx'> </div><div class='del'>-#define EXT0_GPIO_BASE	(NR_BUILTIN_GPIO)</div><div class='add'>+#define EXT0_GPIO_BASE	(PXA_NR_BUILTIN_GPIO)</div><div class='ctx'> #define EXT0_GPIO(x)	(EXT0_GPIO_BASE + (x))</div><div class='ctx'> </div><div class='ctx'> #define LITTLETON_NR_IRQS	(IRQ_BOARD_START + 8)</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/magician.h b/arch/arm/mach-pxa/include/mach/magician.h<br/>index 7cbfc5d3f9df..ba6a6e1d29e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/magician.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/magician.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/magician.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/magician.h</a></div><div class='hunk'>@@ -78,7 +78,7 @@</div><div class='ctx'>  * CPLD EGPIOs</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define MAGICIAN_EGPIO_BASE			NR_BUILTIN_GPIO</div><div class='add'>+#define MAGICIAN_EGPIO_BASE			PXA_NR_BUILTIN_GPIO</div><div class='ctx'> #define MAGICIAN_EGPIO(reg,bit) \</div><div class='ctx'> 	(MAGICIAN_EGPIO_BASE + 8*reg + bit)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/palmld.h b/arch/arm/mach-pxa/include/mach/palmld.h<br/>index ae536e86d8e8..2c4471336570 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/palmld.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/palmld.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/palmld.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/palmld.h</a></div><div class='hunk'>@@ -68,10 +68,10 @@</div><div class='ctx'> /* 20, 53 and 86 are usb related too */</div><div class='ctx'> </div><div class='ctx'> /* INTERRUPTS */</div><div class='del'>-#define IRQ_GPIO_PALMLD_GPIO_RESET	IRQ_GPIO(GPIO_NR_PALMLD_GPIO_RESET)</div><div class='del'>-#define IRQ_GPIO_PALMLD_SD_DETECT_N	IRQ_GPIO(GPIO_NR_PALMLD_SD_DETECT_N)</div><div class='del'>-#define IRQ_GPIO_PALMLD_WM9712_IRQ	IRQ_GPIO(GPIO_NR_PALMLD_WM9712_IRQ)</div><div class='del'>-#define IRQ_GPIO_PALMLD_IDE_IRQ		IRQ_GPIO(GPIO_NR_PALMLD_IDE_IRQ)</div><div class='add'>+#define IRQ_GPIO_PALMLD_GPIO_RESET	PXA_GPIO_TO_IRQ(GPIO_NR_PALMLD_GPIO_RESET)</div><div class='add'>+#define IRQ_GPIO_PALMLD_SD_DETECT_N	PXA_GPIO_TO_IRQ(GPIO_NR_PALMLD_SD_DETECT_N)</div><div class='add'>+#define IRQ_GPIO_PALMLD_WM9712_IRQ	PXA_GPIO_TO_IRQ(GPIO_NR_PALMLD_WM9712_IRQ)</div><div class='add'>+#define IRQ_GPIO_PALMLD_IDE_IRQ		PXA_GPIO_TO_IRQ(GPIO_NR_PALMLD_IDE_IRQ)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /** HERE ARE INIT VALUES **/</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/palmt5.h b/arch/arm/mach-pxa/include/mach/palmt5.h<br/>index 6baf7469d4ec..0bd4f036c72f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/palmt5.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/palmt5.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/palmt5.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/palmt5.h</a></div><div class='hunk'>@@ -48,10 +48,10 @@</div><div class='ctx'> #define GPIO_NR_PALMT5_BT_RESET			83</div><div class='ctx'> </div><div class='ctx'> /* INTERRUPTS */</div><div class='del'>-#define IRQ_GPIO_PALMT5_SD_DETECT_N	IRQ_GPIO(GPIO_NR_PALMT5_SD_DETECT_N)</div><div class='del'>-#define IRQ_GPIO_PALMT5_WM9712_IRQ	IRQ_GPIO(GPIO_NR_PALMT5_WM9712_IRQ)</div><div class='del'>-#define IRQ_GPIO_PALMT5_USB_DETECT	IRQ_GPIO(GPIO_NR_PALMT5_USB_DETECT)</div><div class='del'>-#define IRQ_GPIO_PALMT5_GPIO_RESET	IRQ_GPIO(GPIO_NR_PALMT5_GPIO_RESET)</div><div class='add'>+#define IRQ_GPIO_PALMT5_SD_DETECT_N	PXA_GPIO_TO_IRQ(GPIO_NR_PALMT5_SD_DETECT_N)</div><div class='add'>+#define IRQ_GPIO_PALMT5_WM9712_IRQ	PXA_GPIO_TO_IRQ(GPIO_NR_PALMT5_WM9712_IRQ)</div><div class='add'>+#define IRQ_GPIO_PALMT5_USB_DETECT	PXA_GPIO_TO_IRQ(GPIO_NR_PALMT5_USB_DETECT)</div><div class='add'>+#define IRQ_GPIO_PALMT5_GPIO_RESET	PXA_GPIO_TO_IRQ(GPIO_NR_PALMT5_GPIO_RESET)</div><div class='ctx'> </div><div class='ctx'> /** HERE ARE INIT VALUES **/</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/palmtc.h b/arch/arm/mach-pxa/include/mach/palmtc.h<br/>index 3f9dd3fd4638..c383a21680b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/palmtc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/palmtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/palmtc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/palmtc.h</a></div><div class='hunk'>@@ -52,8 +52,8 @@</div><div class='ctx'> #define GPIO_NR_PALMTC_IR_DISABLE	45</div><div class='ctx'> </div><div class='ctx'> /* IRQs */</div><div class='del'>-#define IRQ_GPIO_PALMTC_SD_DETECT_N	IRQ_GPIO(GPIO_NR_PALMTC_SD_DETECT_N)</div><div class='del'>-#define IRQ_GPIO_PALMTC_WLAN_READY	IRQ_GPIO(GPIO_NR_PALMTC_WLAN_READY)</div><div class='add'>+#define IRQ_GPIO_PALMTC_SD_DETECT_N	PXA_GPIO_TO_IRQ(GPIO_NR_PALMTC_SD_DETECT_N)</div><div class='add'>+#define IRQ_GPIO_PALMTC_WLAN_READY	PXA_GPIO_TO_IRQ(GPIO_NR_PALMTC_WLAN_READY)</div><div class='ctx'> </div><div class='ctx'> /* UCB1400 GPIOs */</div><div class='ctx'> #define GPIO_NR_PALMTC_POWER_DETECT	(0x80 | 0x00)</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/palmtx.h b/arch/arm/mach-pxa/include/mach/palmtx.h<br/>index 7074a6ed46c6..f2e530380253 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/palmtx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/palmtx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/palmtx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/palmtx.h</a></div><div class='hunk'>@@ -62,10 +62,10 @@</div><div class='ctx'> #define GPIO_NR_PALMTX_NAND_BUFFER_DIR		79</div><div class='ctx'> </div><div class='ctx'> /* INTERRUPTS */</div><div class='del'>-#define IRQ_GPIO_PALMTX_SD_DETECT_N	IRQ_GPIO(GPIO_NR_PALMTX_SD_DETECT_N)</div><div class='del'>-#define IRQ_GPIO_PALMTX_WM9712_IRQ	IRQ_GPIO(GPIO_NR_PALMTX_WM9712_IRQ)</div><div class='del'>-#define IRQ_GPIO_PALMTX_USB_DETECT	IRQ_GPIO(GPIO_NR_PALMTX_USB_DETECT)</div><div class='del'>-#define IRQ_GPIO_PALMTX_GPIO_RESET	IRQ_GPIO(GPIO_NR_PALMTX_GPIO_RESET)</div><div class='add'>+#define IRQ_GPIO_PALMTX_SD_DETECT_N	PXA_GPIO_TO_IRQ(GPIO_NR_PALMTX_SD_DETECT_N)</div><div class='add'>+#define IRQ_GPIO_PALMTX_WM9712_IRQ	PXA_GPIO_TO_IRQ(GPIO_NR_PALMTX_WM9712_IRQ)</div><div class='add'>+#define IRQ_GPIO_PALMTX_USB_DETECT	PXA_GPIO_TO_IRQ(GPIO_NR_PALMTX_USB_DETECT)</div><div class='add'>+#define IRQ_GPIO_PALMTX_GPIO_RESET	PXA_GPIO_TO_IRQ(GPIO_NR_PALMTX_GPIO_RESET)</div><div class='ctx'> </div><div class='ctx'> /** HERE ARE INIT VALUES **/</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/pcm027.h b/arch/arm/mach-pxa/include/mach/pcm027.h<br/>index 4bac588478a8..6bf28de228bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/pcm027.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/pcm027.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/pcm027.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/pcm027.h</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> </div><div class='ctx'> /* I2C RTC */</div><div class='ctx'> #define PCM027_RTC_IRQ_GPIO	0</div><div class='del'>-#define PCM027_RTC_IRQ		IRQ_GPIO(PCM027_RTC_IRQ_GPIO)</div><div class='add'>+#define PCM027_RTC_IRQ		PXA_GPIO_TO_IRQ(PCM027_RTC_IRQ_GPIO)</div><div class='ctx'> #define PCM027_RTC_IRQ_EDGE	IRQ_TYPE_EDGE_FALLING</div><div class='ctx'> #define ADR_PCM027_RTC		0x51	/* I2C address */</div><div class='ctx'> </div><div class='hunk'>@@ -43,21 +43,21 @@</div><div class='ctx'> </div><div class='ctx'> /* Ethernet chip (SMSC91C111) */</div><div class='ctx'> #define PCM027_ETH_IRQ_GPIO	52</div><div class='del'>-#define PCM027_ETH_IRQ		IRQ_GPIO(PCM027_ETH_IRQ_GPIO)</div><div class='add'>+#define PCM027_ETH_IRQ		PXA_GPIO_TO_IRQ(PCM027_ETH_IRQ_GPIO)</div><div class='ctx'> #define PCM027_ETH_IRQ_EDGE	IRQ_TYPE_EDGE_RISING</div><div class='ctx'> #define PCM027_ETH_PHYS		PXA_CS5_PHYS</div><div class='ctx'> #define PCM027_ETH_SIZE		(1*1024*1024)</div><div class='ctx'> </div><div class='ctx'> /* CAN controller SJA1000 (unsupported yet) */</div><div class='ctx'> #define PCM027_CAN_IRQ_GPIO	114</div><div class='del'>-#define PCM027_CAN_IRQ		IRQ_GPIO(PCM027_CAN_IRQ_GPIO)</div><div class='add'>+#define PCM027_CAN_IRQ		PXA_GPIO_TO_IRQ(PCM027_CAN_IRQ_GPIO)</div><div class='ctx'> #define PCM027_CAN_IRQ_EDGE	IRQ_TYPE_EDGE_FALLING</div><div class='ctx'> #define PCM027_CAN_PHYS		0x22000000</div><div class='ctx'> #define PCM027_CAN_SIZE		0x100</div><div class='ctx'> </div><div class='ctx'> /* SPI GPIO expander (unsupported yet) */</div><div class='ctx'> #define PCM027_EGPIO_IRQ_GPIO	27</div><div class='del'>-#define PCM027_EGPIO_IRQ	IRQ_GPIO(PCM027_EGPIO_IRQ_GPIO)</div><div class='add'>+#define PCM027_EGPIO_IRQ	PXA_GPIO_TO_IRQ(PCM027_EGPIO_IRQ_GPIO)</div><div class='ctx'> #define PCM027_EGPIO_IRQ_EDGE	IRQ_TYPE_EDGE_FALLING</div><div class='ctx'> #define PCM027_EGPIO_CS		24</div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h b/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h<br/>index 8a4383b776d7..d72791695b26 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/pcm990_baseboard.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/pcm990_baseboard.h</a></div><div class='hunk'>@@ -28,14 +28,14 @@</div><div class='ctx'> </div><div class='ctx'> /* CPLD's interrupt controller is connected to PCM-027 GPIO 9 */</div><div class='ctx'> #define PCM990_CTRL_INT_IRQ_GPIO	9</div><div class='del'>-#define PCM990_CTRL_INT_IRQ		IRQ_GPIO(PCM990_CTRL_INT_IRQ_GPIO)</div><div class='add'>+#define PCM990_CTRL_INT_IRQ		PXA_GPIO_TO_IRQ(PCM990_CTRL_INT_IRQ_GPIO)</div><div class='ctx'> #define PCM990_CTRL_INT_IRQ_EDGE	IRQ_TYPE_EDGE_RISING</div><div class='ctx'> #define PCM990_CTRL_PHYS		PXA_CS1_PHYS	/* 16-Bit */</div><div class='ctx'> #define PCM990_CTRL_BASE		0xea000000</div><div class='ctx'> #define PCM990_CTRL_SIZE		(1*1024*1024)</div><div class='ctx'> </div><div class='ctx'> #define PCM990_CTRL_PWR_IRQ_GPIO	14</div><div class='del'>-#define PCM990_CTRL_PWR_IRQ		IRQ_GPIO(PCM990_CTRL_PWR_IRQ_GPIO)</div><div class='add'>+#define PCM990_CTRL_PWR_IRQ		PXA_GPIO_TO_IRQ(PCM990_CTRL_PWR_IRQ_GPIO)</div><div class='ctx'> #define PCM990_CTRL_PWR_IRQ_EDGE	IRQ_TYPE_EDGE_RISING</div><div class='ctx'> </div><div class='ctx'> /* visible CPLD (U7) registers */</div><div class='hunk'>@@ -132,7 +132,7 @@</div><div class='ctx'>  * IDE</div><div class='ctx'>  */</div><div class='ctx'> #define PCM990_IDE_IRQ_GPIO	13</div><div class='del'>-#define PCM990_IDE_IRQ		IRQ_GPIO(PCM990_IDE_IRQ_GPIO)</div><div class='add'>+#define PCM990_IDE_IRQ		PXA_GPIO_TO_IRQ(PCM990_IDE_IRQ_GPIO)</div><div class='ctx'> #define PCM990_IDE_IRQ_EDGE	IRQ_TYPE_EDGE_RISING</div><div class='ctx'> #define PCM990_IDE_PLD_PHYS	0x20000000	/* 16 bit wide */</div><div class='ctx'> #define PCM990_IDE_PLD_BASE	0xee000000</div><div class='hunk'>@@ -188,11 +188,11 @@</div><div class='ctx'>  * Compact Flash</div><div class='ctx'>  */</div><div class='ctx'> #define PCM990_CF_IRQ_GPIO	11</div><div class='del'>-#define PCM990_CF_IRQ		IRQ_GPIO(PCM990_CF_IRQ_GPIO)</div><div class='add'>+#define PCM990_CF_IRQ		PXA_GPIO_TO_IRQ(PCM990_CF_IRQ_GPIO)</div><div class='ctx'> #define PCM990_CF_IRQ_EDGE	IRQ_TYPE_EDGE_RISING</div><div class='ctx'> </div><div class='ctx'> #define PCM990_CF_CD_GPIO	12</div><div class='del'>-#define PCM990_CF_CD		IRQ_GPIO(PCM990_CF_CD_GPIO)</div><div class='add'>+#define PCM990_CF_CD		PXA_GPIO_TO_IRQ(PCM990_CF_CD_GPIO)</div><div class='ctx'> #define PCM990_CF_CD_EDGE	IRQ_TYPE_EDGE_RISING</div><div class='ctx'> </div><div class='ctx'> #define PCM990_CF_PLD_PHYS	0x30000000	/* 16 bit wide */</div><div class='hunk'>@@ -258,14 +258,14 @@</div><div class='ctx'>  * Wolfson AC97 Touch</div><div class='ctx'>  */</div><div class='ctx'> #define PCM990_AC97_IRQ_GPIO	10</div><div class='del'>-#define PCM990_AC97_IRQ		IRQ_GPIO(PCM990_AC97_IRQ_GPIO)</div><div class='add'>+#define PCM990_AC97_IRQ		PXA_GPIO_TO_IRQ(PCM990_AC97_IRQ_GPIO)</div><div class='ctx'> #define PCM990_AC97_IRQ_EDGE	IRQ_TYPE_EDGE_RISING</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * MMC phyCORE</div><div class='ctx'>  */</div><div class='ctx'> #define PCM990_MMC0_IRQ_GPIO	9</div><div class='del'>-#define PCM990_MMC0_IRQ		IRQ_GPIO(PCM990_MMC0_IRQ_GPIO)</div><div class='add'>+#define PCM990_MMC0_IRQ		PXA_GPIO_TO_IRQ(PCM990_MMC0_IRQ_GPIO)</div><div class='ctx'> #define PCM990_MMC0_IRQ_EDGE	IRQ_TYPE_EDGE_FALLING</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/poodle.h b/arch/arm/mach-pxa/include/mach/poodle.h<br/>index 83d1cfd00fc9..f32ff75dcca8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/poodle.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/poodle.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/poodle.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/poodle.h</a></div><div class='hunk'>@@ -47,18 +47,18 @@</div><div class='ctx'> #define POODLE_GPIO_DISCHARGE_ON        (42) /* Enable battery discharge */</div><div class='ctx'> </div><div class='ctx'> /* PXA GPIOs */</div><div class='del'>-#define POODLE_IRQ_GPIO_ON_KEY		IRQ_GPIO(0)</div><div class='del'>-#define POODLE_IRQ_GPIO_AC_IN		IRQ_GPIO(1)</div><div class='del'>-#define POODLE_IRQ_GPIO_HP_IN		IRQ_GPIO(4)</div><div class='del'>-#define POODLE_IRQ_GPIO_CO		IRQ_GPIO(16)</div><div class='del'>-#define POODLE_IRQ_GPIO_TP_INT		IRQ_GPIO(5)</div><div class='del'>-#define POODLE_IRQ_GPIO_WAKEUP		IRQ_GPIO(11)</div><div class='del'>-#define POODLE_IRQ_GPIO_GA_INT		IRQ_GPIO(10)</div><div class='del'>-#define POODLE_IRQ_GPIO_CF_IRQ		IRQ_GPIO(17)</div><div class='del'>-#define POODLE_IRQ_GPIO_CF_CD		IRQ_GPIO(14)</div><div class='del'>-#define POODLE_IRQ_GPIO_nSD_INT		IRQ_GPIO(8)</div><div class='del'>-#define POODLE_IRQ_GPIO_nSD_DETECT	IRQ_GPIO(9)</div><div class='del'>-#define POODLE_IRQ_GPIO_MAIN_BAT_LOW	IRQ_GPIO(13)</div><div class='add'>+#define POODLE_IRQ_GPIO_ON_KEY		PXA_GPIO_TO_IRQ(0)</div><div class='add'>+#define POODLE_IRQ_GPIO_AC_IN		PXA_GPIO_TO_IRQ(1)</div><div class='add'>+#define POODLE_IRQ_GPIO_HP_IN		PXA_GPIO_TO_IRQ(4)</div><div class='add'>+#define POODLE_IRQ_GPIO_CO		PXA_GPIO_TO_IRQ(16)</div><div class='add'>+#define POODLE_IRQ_GPIO_TP_INT		PXA_GPIO_TO_IRQ(5)</div><div class='add'>+#define POODLE_IRQ_GPIO_WAKEUP		PXA_GPIO_TO_IRQ(11)</div><div class='add'>+#define POODLE_IRQ_GPIO_GA_INT		PXA_GPIO_TO_IRQ(10)</div><div class='add'>+#define POODLE_IRQ_GPIO_CF_IRQ		PXA_GPIO_TO_IRQ(17)</div><div class='add'>+#define POODLE_IRQ_GPIO_CF_CD		PXA_GPIO_TO_IRQ(14)</div><div class='add'>+#define POODLE_IRQ_GPIO_nSD_INT		PXA_GPIO_TO_IRQ(8)</div><div class='add'>+#define POODLE_IRQ_GPIO_nSD_DETECT	PXA_GPIO_TO_IRQ(9)</div><div class='add'>+#define POODLE_IRQ_GPIO_MAIN_BAT_LOW	PXA_GPIO_TO_IRQ(13)</div><div class='ctx'> </div><div class='ctx'> /* SCOOP GPIOs */</div><div class='ctx'> #define POODLE_SCOOP_CHARGE_ON	SCOOP_GPCR_PA11</div><div class='hunk'>@@ -71,7 +71,7 @@</div><div class='ctx'> #define POODLE_SCOOP_IO_DIR	( POODLE_SCOOP_VPEN | POODLE_SCOOP_HS_OUT )</div><div class='ctx'> #define POODLE_SCOOP_IO_OUT	( 0 )</div><div class='ctx'> </div><div class='del'>-#define POODLE_SCOOP_GPIO_BASE	(NR_BUILTIN_GPIO)</div><div class='add'>+#define POODLE_SCOOP_GPIO_BASE	(PXA_NR_BUILTIN_GPIO)</div><div class='ctx'> #define POODLE_GPIO_CHARGE_ON	(POODLE_SCOOP_GPIO_BASE + 0)</div><div class='ctx'> #define POODLE_GPIO_CP401	(POODLE_SCOOP_GPIO_BASE + 2)</div><div class='ctx'> #define POODLE_GPIO_VPEN	(POODLE_SCOOP_GPIO_BASE + 7)</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/spitz.h b/arch/arm/mach-pxa/include/mach/spitz.h<br/>index 685749a51c42..0bfe6507c95d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/spitz.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/spitz.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/spitz.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/spitz.h</a></div><div class='hunk'>@@ -108,7 +108,7 @@</div><div class='ctx'> #define SPITZ_SCP_SUS_CLR     (SPITZ_SCP_MUTE_L | SPITZ_SCP_MUTE_R | SPITZ_SCP_JK_A | SPITZ_SCP_ADC_TEMP_ON)</div><div class='ctx'> #define SPITZ_SCP_SUS_SET     0</div><div class='ctx'> </div><div class='del'>-#define SPITZ_SCP_GPIO_BASE	(NR_BUILTIN_GPIO)</div><div class='add'>+#define SPITZ_SCP_GPIO_BASE	(PXA_NR_BUILTIN_GPIO)</div><div class='ctx'> #define SPITZ_GPIO_LED_GREEN	(SPITZ_SCP_GPIO_BASE + 0)</div><div class='ctx'> #define SPITZ_GPIO_JK_B		(SPITZ_SCP_GPIO_BASE + 1)</div><div class='ctx'> #define SPITZ_GPIO_CHRG_ON	(SPITZ_SCP_GPIO_BASE + 2)</div><div class='hunk'>@@ -140,7 +140,7 @@</div><div class='ctx'>                              SPITZ_SCP2_BACKLIGHT_CONT | SPITZ_SCP2_BACKLIGHT_ON | SPITZ_SCP2_MIC_BIAS)</div><div class='ctx'> #define SPITZ_SCP2_SUS_SET  (SPITZ_SCP2_IR_ON | SPITZ_SCP2_RESERVED_1)</div><div class='ctx'> </div><div class='del'>-#define SPITZ_SCP2_GPIO_BASE		(NR_BUILTIN_GPIO + 12)</div><div class='add'>+#define SPITZ_SCP2_GPIO_BASE		(PXA_NR_BUILTIN_GPIO + 12)</div><div class='ctx'> #define SPITZ_GPIO_IR_ON		(SPITZ_SCP2_GPIO_BASE + 0)</div><div class='ctx'> #define SPITZ_GPIO_AKIN_PULLUP		(SPITZ_SCP2_GPIO_BASE + 1)</div><div class='ctx'> #define SPITZ_GPIO_RESERVED_1		(SPITZ_SCP2_GPIO_BASE + 2)</div><div class='hunk'>@@ -152,7 +152,7 @@</div><div class='ctx'> #define SPITZ_GPIO_MIC_BIAS		(SPITZ_SCP2_GPIO_BASE + 8)</div><div class='ctx'> </div><div class='ctx'> /* Akita IO Expander GPIOs */</div><div class='del'>-#define AKITA_IOEXP_GPIO_BASE		(NR_BUILTIN_GPIO + 12)</div><div class='add'>+#define AKITA_IOEXP_GPIO_BASE		(PXA_NR_BUILTIN_GPIO + 12)</div><div class='ctx'> #define AKITA_GPIO_RESERVED_0		(AKITA_IOEXP_GPIO_BASE + 0)</div><div class='ctx'> #define AKITA_GPIO_RESERVED_1		(AKITA_IOEXP_GPIO_BASE + 1)</div><div class='ctx'> #define AKITA_GPIO_MIC_BIAS		(AKITA_IOEXP_GPIO_BASE + 2)</div><div class='hunk'>@@ -164,23 +164,23 @@</div><div class='ctx'> </div><div class='ctx'> /* Spitz IRQ Definitions */</div><div class='ctx'> </div><div class='del'>-#define SPITZ_IRQ_GPIO_KEY_INT        IRQ_GPIO(SPITZ_GPIO_KEY_INT)</div><div class='del'>-#define SPITZ_IRQ_GPIO_AC_IN          IRQ_GPIO(SPITZ_GPIO_AC_IN)</div><div class='del'>-#define SPITZ_IRQ_GPIO_AK_INT         IRQ_GPIO(SPITZ_GPIO_AK_INT)</div><div class='del'>-#define SPITZ_IRQ_GPIO_HP_IN          IRQ_GPIO(SPITZ_GPIO_HP_IN)</div><div class='del'>-#define SPITZ_IRQ_GPIO_TP_INT         IRQ_GPIO(SPITZ_GPIO_TP_INT)</div><div class='del'>-#define SPITZ_IRQ_GPIO_SYNC           IRQ_GPIO(SPITZ_GPIO_SYNC)</div><div class='del'>-#define SPITZ_IRQ_GPIO_ON_KEY         IRQ_GPIO(SPITZ_GPIO_ON_KEY)</div><div class='del'>-#define SPITZ_IRQ_GPIO_SWA            IRQ_GPIO(SPITZ_GPIO_SWA)</div><div class='del'>-#define SPITZ_IRQ_GPIO_SWB            IRQ_GPIO(SPITZ_GPIO_SWB)</div><div class='del'>-#define SPITZ_IRQ_GPIO_BAT_COVER      IRQ_GPIO(SPITZ_GPIO_BAT_COVER)</div><div class='del'>-#define SPITZ_IRQ_GPIO_FATAL_BAT      IRQ_GPIO(SPITZ_GPIO_FATAL_BAT)</div><div class='del'>-#define SPITZ_IRQ_GPIO_CO             IRQ_GPIO(SPITZ_GPIO_CO)</div><div class='del'>-#define SPITZ_IRQ_GPIO_CF_IRQ         IRQ_GPIO(SPITZ_GPIO_CF_IRQ)</div><div class='del'>-#define SPITZ_IRQ_GPIO_CF_CD          IRQ_GPIO(SPITZ_GPIO_CF_CD)</div><div class='del'>-#define SPITZ_IRQ_GPIO_CF2_IRQ        IRQ_GPIO(SPITZ_GPIO_CF2_IRQ)</div><div class='del'>-#define SPITZ_IRQ_GPIO_nSD_INT        IRQ_GPIO(SPITZ_GPIO_nSD_INT)</div><div class='del'>-#define SPITZ_IRQ_GPIO_nSD_DETECT     IRQ_GPIO(SPITZ_GPIO_nSD_DETECT)</div><div class='add'>+#define SPITZ_IRQ_GPIO_KEY_INT        PXA_GPIO_TO_IRQ(SPITZ_GPIO_KEY_INT)</div><div class='add'>+#define SPITZ_IRQ_GPIO_AC_IN          PXA_GPIO_TO_IRQ(SPITZ_GPIO_AC_IN)</div><div class='add'>+#define SPITZ_IRQ_GPIO_AK_INT         PXA_GPIO_TO_IRQ(SPITZ_GPIO_AK_INT)</div><div class='add'>+#define SPITZ_IRQ_GPIO_HP_IN          PXA_GPIO_TO_IRQ(SPITZ_GPIO_HP_IN)</div><div class='add'>+#define SPITZ_IRQ_GPIO_TP_INT         PXA_GPIO_TO_IRQ(SPITZ_GPIO_TP_INT)</div><div class='add'>+#define SPITZ_IRQ_GPIO_SYNC           PXA_GPIO_TO_IRQ(SPITZ_GPIO_SYNC)</div><div class='add'>+#define SPITZ_IRQ_GPIO_ON_KEY         PXA_GPIO_TO_IRQ(SPITZ_GPIO_ON_KEY)</div><div class='add'>+#define SPITZ_IRQ_GPIO_SWA            PXA_GPIO_TO_IRQ(SPITZ_GPIO_SWA)</div><div class='add'>+#define SPITZ_IRQ_GPIO_SWB            PXA_GPIO_TO_IRQ(SPITZ_GPIO_SWB)</div><div class='add'>+#define SPITZ_IRQ_GPIO_BAT_COVER      PXA_GPIO_TO_IRQ(SPITZ_GPIO_BAT_COVER)</div><div class='add'>+#define SPITZ_IRQ_GPIO_FATAL_BAT      PXA_GPIO_TO_IRQ(SPITZ_GPIO_FATAL_BAT)</div><div class='add'>+#define SPITZ_IRQ_GPIO_CO             PXA_GPIO_TO_IRQ(SPITZ_GPIO_CO)</div><div class='add'>+#define SPITZ_IRQ_GPIO_CF_IRQ         PXA_GPIO_TO_IRQ(SPITZ_GPIO_CF_IRQ)</div><div class='add'>+#define SPITZ_IRQ_GPIO_CF_CD          PXA_GPIO_TO_IRQ(SPITZ_GPIO_CF_CD)</div><div class='add'>+#define SPITZ_IRQ_GPIO_CF2_IRQ        PXA_GPIO_TO_IRQ(SPITZ_GPIO_CF2_IRQ)</div><div class='add'>+#define SPITZ_IRQ_GPIO_nSD_INT        PXA_GPIO_TO_IRQ(SPITZ_GPIO_nSD_INT)</div><div class='add'>+#define SPITZ_IRQ_GPIO_nSD_DETECT     PXA_GPIO_TO_IRQ(SPITZ_GPIO_nSD_DETECT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Shared data structures</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/system.h b/arch/arm/mach-pxa/include/mach/system.h<br/>index d1fce8b6d105..c5afacd3cc0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/system.h</a></div><div class='hunk'>@@ -9,15 +9,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'>-</div><div class='del'>-#include &lt;asm/proc-fns.h&gt;</div><div class='del'>-#include "hardware.h"</div><div class='del'>-#include "pxa2xx-regs.h"</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void arch_reset(char mode, const char *cmd);</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/tosa.h b/arch/arm/mach-pxa/include/mach/tosa.h<br/>index 1272c4b56ceb..2bb0e862598c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/tosa.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/tosa.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/tosa.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/tosa.h</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * SCOOP2 internal GPIOs</div><div class='ctx'>  */</div><div class='del'>-#define TOSA_SCOOP_GPIO_BASE		NR_BUILTIN_GPIO</div><div class='add'>+#define TOSA_SCOOP_GPIO_BASE		PXA_NR_BUILTIN_GPIO</div><div class='ctx'> #define TOSA_SCOOP_PXA_VCORE1		SCOOP_GPCR_PA11</div><div class='ctx'> #define TOSA_GPIO_TC6393XB_REST_IN	(TOSA_SCOOP_GPIO_BASE + 1)</div><div class='ctx'> #define TOSA_GPIO_IR_POWERDWN		(TOSA_SCOOP_GPIO_BASE + 2)</div><div class='hunk'>@@ -42,7 +42,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * SCOOP2 jacket GPIOs</div><div class='ctx'>  */</div><div class='del'>-#define TOSA_SCOOP_JC_GPIO_BASE		(NR_BUILTIN_GPIO + 12)</div><div class='add'>+#define TOSA_SCOOP_JC_GPIO_BASE		(PXA_NR_BUILTIN_GPIO + 12)</div><div class='ctx'> #define TOSA_GPIO_BT_LED		(TOSA_SCOOP_JC_GPIO_BASE + 0)</div><div class='ctx'> #define TOSA_GPIO_NOTE_LED		(TOSA_SCOOP_JC_GPIO_BASE + 1)</div><div class='ctx'> #define TOSA_GPIO_CHRG_ERR_LED		(TOSA_SCOOP_JC_GPIO_BASE + 2)</div><div class='hunk'>@@ -59,7 +59,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * TC6393XB GPIOs</div><div class='ctx'>  */</div><div class='del'>-#define TOSA_TC6393XB_GPIO_BASE		(NR_BUILTIN_GPIO + 2 * 12)</div><div class='add'>+#define TOSA_TC6393XB_GPIO_BASE		(PXA_NR_BUILTIN_GPIO + 2 * 12)</div><div class='ctx'> </div><div class='ctx'> #define TOSA_GPIO_TG_ON			(TOSA_TC6393XB_GPIO_BASE + 0)</div><div class='ctx'> #define TOSA_GPIO_L_MUTE		(TOSA_TC6393XB_GPIO_BASE + 1)</div><div class='hunk'>@@ -141,30 +141,30 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Interrupts</div><div class='ctx'>  */</div><div class='del'>-#define TOSA_IRQ_GPIO_WAKEUP        	IRQ_GPIO(TOSA_GPIO_WAKEUP)</div><div class='del'>-#define TOSA_IRQ_GPIO_AC_IN         	IRQ_GPIO(TOSA_GPIO_AC_IN)</div><div class='del'>-#define TOSA_IRQ_GPIO_RECORD_BTN    	IRQ_GPIO(TOSA_GPIO_RECORD_BTN)</div><div class='del'>-#define TOSA_IRQ_GPIO_SYNC          	IRQ_GPIO(TOSA_GPIO_SYNC)</div><div class='del'>-#define TOSA_IRQ_GPIO_USB_IN        	IRQ_GPIO(TOSA_GPIO_USB_IN)</div><div class='del'>-#define TOSA_IRQ_GPIO_JACKET_DETECT 	IRQ_GPIO(TOSA_GPIO_JACKET_DETECT)</div><div class='del'>-#define TOSA_IRQ_GPIO_nSD_INT       	IRQ_GPIO(TOSA_GPIO_nSD_INT)</div><div class='del'>-#define TOSA_IRQ_GPIO_nSD_DETECT    	IRQ_GPIO(TOSA_GPIO_nSD_DETECT)</div><div class='del'>-#define TOSA_IRQ_GPIO_BAT1_CRG      	IRQ_GPIO(TOSA_GPIO_BAT1_CRG)</div><div class='del'>-#define TOSA_IRQ_GPIO_CF_CD         	IRQ_GPIO(TOSA_GPIO_CF_CD)</div><div class='del'>-#define TOSA_IRQ_GPIO_BAT0_CRG      	IRQ_GPIO(TOSA_GPIO_BAT0_CRG)</div><div class='del'>-#define TOSA_IRQ_GPIO_TC6393XB_INT    	IRQ_GPIO(TOSA_GPIO_TC6393XB_INT)</div><div class='del'>-#define TOSA_IRQ_GPIO_BAT0_LOW      	IRQ_GPIO(TOSA_GPIO_BAT0_LOW)</div><div class='del'>-#define TOSA_IRQ_GPIO_EAR_IN        	IRQ_GPIO(TOSA_GPIO_EAR_IN)</div><div class='del'>-#define TOSA_IRQ_GPIO_CF_IRQ        	IRQ_GPIO(TOSA_GPIO_CF_IRQ)</div><div class='del'>-#define TOSA_IRQ_GPIO_ON_KEY        	IRQ_GPIO(TOSA_GPIO_ON_KEY)</div><div class='del'>-#define TOSA_IRQ_GPIO_VGA_LINE      	IRQ_GPIO(TOSA_GPIO_VGA_LINE)</div><div class='del'>-#define TOSA_IRQ_GPIO_TP_INT        	IRQ_GPIO(TOSA_GPIO_TP_INT)</div><div class='del'>-#define TOSA_IRQ_GPIO_JC_CF_IRQ     	IRQ_GPIO(TOSA_GPIO_JC_CF_IRQ)</div><div class='del'>-#define TOSA_IRQ_GPIO_BAT_LOCKED    	IRQ_GPIO(TOSA_GPIO_BAT_LOCKED)</div><div class='del'>-#define TOSA_IRQ_GPIO_BAT1_LOW      	IRQ_GPIO(TOSA_GPIO_BAT1_LOW)</div><div class='del'>-#define TOSA_IRQ_GPIO_KEY_SENSE(a)  	IRQ_GPIO(69+(a))</div><div class='del'>-</div><div class='del'>-#define TOSA_IRQ_GPIO_MAIN_BAT_LOW 	IRQ_GPIO(TOSA_GPIO_MAIN_BAT_LOW)</div><div class='add'>+#define TOSA_IRQ_GPIO_WAKEUP        	PXA_GPIO_TO_IRQ(TOSA_GPIO_WAKEUP)</div><div class='add'>+#define TOSA_IRQ_GPIO_AC_IN         	PXA_GPIO_TO_IRQ(TOSA_GPIO_AC_IN)</div><div class='add'>+#define TOSA_IRQ_GPIO_RECORD_BTN    	PXA_GPIO_TO_IRQ(TOSA_GPIO_RECORD_BTN)</div><div class='add'>+#define TOSA_IRQ_GPIO_SYNC          	PXA_GPIO_TO_IRQ(TOSA_GPIO_SYNC)</div><div class='add'>+#define TOSA_IRQ_GPIO_USB_IN        	PXA_GPIO_TO_IRQ(TOSA_GPIO_USB_IN)</div><div class='add'>+#define TOSA_IRQ_GPIO_JACKET_DETECT 	PXA_GPIO_TO_IRQ(TOSA_GPIO_JACKET_DETECT)</div><div class='add'>+#define TOSA_IRQ_GPIO_nSD_INT       	PXA_GPIO_TO_IRQ(TOSA_GPIO_nSD_INT)</div><div class='add'>+#define TOSA_IRQ_GPIO_nSD_DETECT    	PXA_GPIO_TO_IRQ(TOSA_GPIO_nSD_DETECT)</div><div class='add'>+#define TOSA_IRQ_GPIO_BAT1_CRG      	PXA_GPIO_TO_IRQ(TOSA_GPIO_BAT1_CRG)</div><div class='add'>+#define TOSA_IRQ_GPIO_CF_CD         	PXA_GPIO_TO_IRQ(TOSA_GPIO_CF_CD)</div><div class='add'>+#define TOSA_IRQ_GPIO_BAT0_CRG      	PXA_GPIO_TO_IRQ(TOSA_GPIO_BAT0_CRG)</div><div class='add'>+#define TOSA_IRQ_GPIO_TC6393XB_INT    	PXA_GPIO_TO_IRQ(TOSA_GPIO_TC6393XB_INT)</div><div class='add'>+#define TOSA_IRQ_GPIO_BAT0_LOW      	PXA_GPIO_TO_IRQ(TOSA_GPIO_BAT0_LOW)</div><div class='add'>+#define TOSA_IRQ_GPIO_EAR_IN        	PXA_GPIO_TO_IRQ(TOSA_GPIO_EAR_IN)</div><div class='add'>+#define TOSA_IRQ_GPIO_CF_IRQ        	PXA_GPIO_TO_IRQ(TOSA_GPIO_CF_IRQ)</div><div class='add'>+#define TOSA_IRQ_GPIO_ON_KEY        	PXA_GPIO_TO_IRQ(TOSA_GPIO_ON_KEY)</div><div class='add'>+#define TOSA_IRQ_GPIO_VGA_LINE      	PXA_GPIO_TO_IRQ(TOSA_GPIO_VGA_LINE)</div><div class='add'>+#define TOSA_IRQ_GPIO_TP_INT        	PXA_GPIO_TO_IRQ(TOSA_GPIO_TP_INT)</div><div class='add'>+#define TOSA_IRQ_GPIO_JC_CF_IRQ     	PXA_GPIO_TO_IRQ(TOSA_GPIO_JC_CF_IRQ)</div><div class='add'>+#define TOSA_IRQ_GPIO_BAT_LOCKED    	PXA_GPIO_TO_IRQ(TOSA_GPIO_BAT_LOCKED)</div><div class='add'>+#define TOSA_IRQ_GPIO_BAT1_LOW      	PXA_GPIO_TO_IRQ(TOSA_GPIO_BAT1_LOW)</div><div class='add'>+#define TOSA_IRQ_GPIO_KEY_SENSE(a)  	PXA_GPIO_TO_IRQ(69+(a))</div><div class='add'>+</div><div class='add'>+#define TOSA_IRQ_GPIO_MAIN_BAT_LOW 	PXA_GPIO_TO_IRQ(TOSA_GPIO_MAIN_BAT_LOW)</div><div class='ctx'> </div><div class='ctx'> #define TOSA_KEY_SYNC		KEY_102ND /* ??? */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/trizeps4.h b/arch/arm/mach-pxa/include/mach/trizeps4.h<br/>index 903e1a2e6641..d2ca01053f69 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/trizeps4.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/trizeps4.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/trizeps4.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/include/mach/trizeps4.h</a></div><div class='hunk'>@@ -43,30 +43,30 @@</div><div class='ctx'> </div><div class='ctx'> /* Ethernet Controller Davicom DM9000 */</div><div class='ctx'> #define GPIO_DM9000		101</div><div class='del'>-#define TRIZEPS4_ETH_IRQ	IRQ_GPIO(GPIO_DM9000)</div><div class='add'>+#define TRIZEPS4_ETH_IRQ	PXA_GPIO_TO_IRQ(GPIO_DM9000)</div><div class='ctx'> </div><div class='ctx'> /* UCB1400 audio / TS-controller */</div><div class='ctx'> #define GPIO_UCB1400		1</div><div class='del'>-#define TRIZEPS4_UCB1400_IRQ	IRQ_GPIO(GPIO_UCB1400)</div><div class='add'>+#define TRIZEPS4_UCB1400_IRQ	PXA_GPIO_TO_IRQ(GPIO_UCB1400)</div><div class='ctx'> </div><div class='ctx'> /* PCMCIA socket Compact Flash */</div><div class='ctx'> #define GPIO_PCD		11		/* PCMCIA Card Detect */</div><div class='del'>-#define TRIZEPS4_CD_IRQ		IRQ_GPIO(GPIO_PCD)</div><div class='add'>+#define TRIZEPS4_CD_IRQ		PXA_GPIO_TO_IRQ(GPIO_PCD)</div><div class='ctx'> #define GPIO_PRDY		13		/* READY / nINT */</div><div class='del'>-#define TRIZEPS4_READY_NINT	IRQ_GPIO(GPIO_PRDY)</div><div class='add'>+#define TRIZEPS4_READY_NINT	PXA_GPIO_TO_IRQ(GPIO_PRDY)</div><div class='ctx'> </div><div class='ctx'> /* MMC socket */</div><div class='ctx'> #define GPIO_MMC_DET		12</div><div class='del'>-#define TRIZEPS4_MMC_IRQ	IRQ_GPIO(GPIO_MMC_DET)</div><div class='add'>+#define TRIZEPS4_MMC_IRQ	PXA_GPIO_TO_IRQ(GPIO_MMC_DET)</div><div class='ctx'> </div><div class='ctx'> /* DOC NAND chip */</div><div class='ctx'> #define GPIO_DOC_LOCK           94</div><div class='ctx'> #define GPIO_DOC_IRQ            93</div><div class='del'>-#define TRIZEPS4_DOC_IRQ        IRQ_GPIO(GPIO_DOC_IRQ)</div><div class='add'>+#define TRIZEPS4_DOC_IRQ        PXA_GPIO_TO_IRQ(GPIO_DOC_IRQ)</div><div class='ctx'> </div><div class='ctx'> /* SPI interface */</div><div class='ctx'> #define GPIO_SPI                53</div><div class='del'>-#define TRIZEPS4_SPI_IRQ        IRQ_GPIO(GPIO_SPI)</div><div class='add'>+#define TRIZEPS4_SPI_IRQ        PXA_GPIO_TO_IRQ(GPIO_SPI)</div><div class='ctx'> </div><div class='ctx'> /* LEDS using tx2 / rx2 */</div><div class='ctx'> #define GPIO_SYS_BUSY_LED	46</div><div class='hunk'>@@ -74,7 +74,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Off-module PIC on ConXS board */</div><div class='ctx'> #define GPIO_PIC		0</div><div class='del'>-#define TRIZEPS4_PIC_IRQ	IRQ_GPIO(GPIO_PIC)</div><div class='add'>+#define TRIZEPS4_PIC_IRQ	PXA_GPIO_TO_IRQ(GPIO_PIC)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACH_TRIZEPS_CONXS</div><div class='ctx'> /* for CONXS base board define these registers */</div><div class='head'>diff --git a/arch/arm/mach-pxa/include/mach/vmalloc.h b/arch/arm/mach-pxa/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index bfecfbf5f460..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-pxa/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * Author:	Nicolas Pitre</div><div class='del'>- * Copyright:	(C) 2001 MontaVista Software 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='del'>-#define VMALLOC_END       (0xe8000000UL)</div><div class='head'>diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c<br/>index 532c5d3a97d2..5dae15ea6718 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/irq.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/irqs.h&gt;</div><div class='del'>-#include &lt;mach/gpio-pxa.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -92,44 +91,6 @@ static struct irq_chip pxa_internal_irq_chip = {</div><div class='ctx'> 	.irq_unmask	= pxa_unmask_irq,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * GPIO IRQs for GPIO 0 and 1</div><div class='del'>- */</div><div class='del'>-static int pxa_set_low_gpio_type(struct irq_data *d, unsigned int type)</div><div class='del'>-{</div><div class='del'>-	int gpio = d-&gt;irq - IRQ_GPIO0;</div><div class='del'>-</div><div class='del'>-	if (__gpio_is_occupied(gpio)) {</div><div class='del'>-		pr_err("%s failed: GPIO is configured\n", __func__);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (type &amp; IRQ_TYPE_EDGE_RISING)</div><div class='del'>-		GRER0 |= GPIO_bit(gpio);</div><div class='del'>-	else</div><div class='del'>-		GRER0 &amp;= ~GPIO_bit(gpio);</div><div class='del'>-</div><div class='del'>-	if (type &amp; IRQ_TYPE_EDGE_FALLING)</div><div class='del'>-		GFER0 |= GPIO_bit(gpio);</div><div class='del'>-	else</div><div class='del'>-		GFER0 &amp;= ~GPIO_bit(gpio);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pxa_ack_low_gpio(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	GEDR0 = (1 &lt;&lt; (d-&gt;irq - IRQ_GPIO0));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct irq_chip pxa_low_gpio_chip = {</div><div class='del'>-	.name		= "GPIO-l",</div><div class='del'>-	.irq_ack	= pxa_ack_low_gpio,</div><div class='del'>-	.irq_mask	= pxa_mask_irq,</div><div class='del'>-	.irq_unmask	= pxa_unmask_irq,</div><div class='del'>-	.irq_set_type	= pxa_set_low_gpio_type,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> asmlinkage void __exception_irq_entry icip_handle_irq(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t icip, icmr, mask;</div><div class='hunk'>@@ -160,26 +121,7 @@ asmlinkage void __exception_irq_entry ichp_handle_irq(struct pt_regs *regs)</div><div class='ctx'> 	} while (1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init pxa_init_low_gpio_irq(set_wake_t fn)</div><div class='del'>-{</div><div class='del'>-	int irq;</div><div class='del'>-</div><div class='del'>-	/* clear edge detection on GPIO 0 and 1 */</div><div class='del'>-	GFER0 &amp;= ~0x3;</div><div class='del'>-	GRER0 &amp;= ~0x3;</div><div class='del'>-	GEDR0 = 0x3;</div><div class='del'>-</div><div class='del'>-	for (irq = IRQ_GPIO0; irq &lt;= IRQ_GPIO1; irq++) {</div><div class='del'>-		irq_set_chip_and_handler(irq, &amp;pxa_low_gpio_chip,</div><div class='del'>-					 handle_edge_irq);</div><div class='del'>-		irq_set_chip_data(irq, irq_base(0));</div><div class='del'>-		set_irq_flags(irq, IRQF_VALID);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pxa_low_gpio_chip.irq_set_wake = fn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init pxa_init_irq(int irq_nr, set_wake_t fn)</div><div class='add'>+void __init pxa_init_irq(int irq_nr, int (*fn)(struct irq_data *, unsigned int))</div><div class='ctx'> {</div><div class='ctx'> 	int irq, i, n;</div><div class='ctx'> </div><div class='hunk'>@@ -209,7 +151,6 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn)</div><div class='ctx'> 	__raw_writel(1, irq_base(0) + ICCR);</div><div class='ctx'> </div><div class='ctx'> 	pxa_internal_irq_chip.irq_set_wake = fn;</div><div class='del'>-	pxa_init_low_gpio_irq(fn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='head'>diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c<br/>index 7b324ec6449f..1fb86edb857c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/littleton.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/littleton.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/littleton.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/littleton.c</a></div><div class='hunk'>@@ -124,8 +124,8 @@ static struct resource smc91x_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start	= IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO90)),</div><div class='del'>-		.end	= IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO90)),</div><div class='add'>+		.start	= PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO90)),</div><div class='add'>+		.end	= PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO90)),</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -396,7 +396,7 @@ static struct i2c_board_info littleton_i2c_info[] = {</div><div class='ctx'> 		.type		= "da9034",</div><div class='ctx'> 		.addr		= 0x34,</div><div class='ctx'> 		.platform_data	= &amp;littleton_da9034_info,</div><div class='del'>-		.irq		= gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO18)),</div><div class='add'>+		.irq		= PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO18)),</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='ctx'> 		.type		= "max7320",</div><div class='hunk'>@@ -445,4 +445,5 @@ MACHINE_START(LITTLETON, "Marvell Form Factor Development Platform (aka Littleto</div><div class='ctx'> 	.handle_irq	= pxa3xx_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= littleton_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c<br/>index 1dd530279e0b..cee9ce2fc0b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/lpd270.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/lpd270.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/lpd270.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/lpd270.c</a></div><div class='hunk'>@@ -152,8 +152,8 @@ static void __init lpd270_init_irq(void)</div><div class='ctx'> 					 handle_level_irq);</div><div class='ctx'> 		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);</div><div class='ctx'> 	}</div><div class='del'>-	irq_set_chained_handler(IRQ_GPIO(0), lpd270_irq_handler);</div><div class='del'>-	irq_set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING);</div><div class='add'>+	irq_set_chained_handler(PXA_GPIO_TO_IRQ(0), lpd270_irq_handler);</div><div class='add'>+	irq_set_irq_type(PXA_GPIO_TO_IRQ(0), IRQ_TYPE_EDGE_FALLING);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -505,4 +505,5 @@ MACHINE_START(LOGICPD_PXA270, "LogicPD PXA270 Card Engine")</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= lpd270_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c<br/>index c48ce6da9184..6ebd276aebeb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/lubbock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/lubbock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/lubbock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/lubbock.c</a></div><div class='hunk'>@@ -170,8 +170,8 @@ static void __init lubbock_init_irq(void)</div><div class='ctx'> 		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	irq_set_chained_handler(IRQ_GPIO(0), lubbock_irq_handler);</div><div class='del'>-	irq_set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING);</div><div class='add'>+	irq_set_chained_handler(PXA_GPIO_TO_IRQ(0), lubbock_irq_handler);</div><div class='add'>+	irq_set_irq_type(PXA_GPIO_TO_IRQ(0), IRQ_TYPE_EDGE_FALLING);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -556,4 +556,5 @@ MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)")</div><div class='ctx'> 	.handle_irq	= pxa25x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= lubbock_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c<br/>index 4b796c37af3e..3d6baf91396c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/magician.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/magician.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/magician.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/magician.c</a></div><div class='hunk'>@@ -184,8 +184,8 @@ static struct resource egpio_resources[] = {</div><div class='ctx'> 		.flags = IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start = gpio_to_irq(GPIO13_MAGICIAN_CPLD_IRQ),</div><div class='del'>-		.end   = gpio_to_irq(GPIO13_MAGICIAN_CPLD_IRQ),</div><div class='add'>+		.start = PXA_GPIO_TO_IRQ(GPIO13_MAGICIAN_CPLD_IRQ),</div><div class='add'>+		.end   = PXA_GPIO_TO_IRQ(GPIO13_MAGICIAN_CPLD_IRQ),</div><div class='ctx'> 		.flags = IORESOURCE_IRQ,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -468,8 +468,8 @@ static struct resource pasic3_resources[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	/* No IRQ handler in the PASIC3, DS1WM needs an external IRQ */</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start  = gpio_to_irq(GPIO107_MAGICIAN_DS1WM_IRQ),</div><div class='del'>-		.end    = gpio_to_irq(GPIO107_MAGICIAN_DS1WM_IRQ),</div><div class='add'>+		.start  = PXA_GPIO_TO_IRQ(GPIO107_MAGICIAN_DS1WM_IRQ),</div><div class='add'>+		.end    = PXA_GPIO_TO_IRQ(GPIO107_MAGICIAN_DS1WM_IRQ),</div><div class='ctx'> 		.flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -760,4 +760,5 @@ MACHINE_START(MAGICIAN, "HTC Magician")</div><div class='ctx'> 	.handle_irq = pxa27x_handle_irq,</div><div class='ctx'> 	.init_machine = magician_init,</div><div class='ctx'> 	.timer = &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c<br/>index 0567d3965fda..1aebaf719462 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/mainstone.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/mainstone.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/mainstone.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/mainstone.c</a></div><div class='hunk'>@@ -178,8 +178,8 @@ static void __init mainstone_init_irq(void)</div><div class='ctx'> 	MST_INTMSKENA = 0;</div><div class='ctx'> 	MST_INTSETCLR = 0;</div><div class='ctx'> </div><div class='del'>-	irq_set_chained_handler(IRQ_GPIO(0), mainstone_irq_handler);</div><div class='del'>-	irq_set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING);</div><div class='add'>+	irq_set_chained_handler(PXA_GPIO_TO_IRQ(0), mainstone_irq_handler);</div><div class='add'>+	irq_set_irq_type(PXA_GPIO_TO_IRQ(0), IRQ_TYPE_EDGE_FALLING);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -622,4 +622,5 @@ MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)")</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= mainstone_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c<br/>index 43a5f6861ca3..f14775536b83 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/mfp-pxa2xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/mfp-pxa2xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/mfp-pxa2xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/mfp-pxa2xx.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'>  *  published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/gpio-pxa.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -20,7 +21,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/pxa2xx-regs.h&gt;</div><div class='ctx'> #include &lt;mach/mfp-pxa2xx.h&gt;</div><div class='del'>-#include &lt;mach/gpio-pxa.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -29,6 +29,10 @@</div><div class='ctx'> #define GAFR_L(x)	__GAFR(0, x)</div><div class='ctx'> #define GAFR_U(x)	__GAFR(1, x)</div><div class='ctx'> </div><div class='add'>+#define BANK_OFF(n)	(((n) &lt; 3) ? (n) &lt;&lt; 2 : 0x100 + (((n) - 3) &lt;&lt; 2))</div><div class='add'>+#define GPLR(x)		__REG2(0x40E00000, BANK_OFF((x) &gt;&gt; 5))</div><div class='add'>+#define GPDR(x)		__REG2(0x40E00000, BANK_OFF((x) &gt;&gt; 5) + 0x0c)</div><div class='add'>+</div><div class='ctx'> #define PWER_WE35	(1 &lt;&lt; 24)</div><div class='ctx'> </div><div class='ctx'> struct gpio_desc {</div><div class='head'>diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c<br/>index b938fc2c316a..e80a3db735c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/mioa701.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/mioa701.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/mioa701.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/mioa701.c</a></div><div class='hunk'>@@ -53,6 +53,7 @@</div><div class='ctx'> #include &lt;mach/pxa27x-udc.h&gt;</div><div class='ctx'> #include &lt;mach/camera.h&gt;</div><div class='ctx'> #include &lt;mach/audio.h&gt;</div><div class='add'>+#include &lt;mach/smemc.h&gt;</div><div class='ctx'> #include &lt;media/soc_camera.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/mioa701.h&gt;</div><div class='hunk'>@@ -390,24 +391,19 @@ static struct pxamci_platform_data mioa701_mci_info = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* FlashRAM */</div><div class='del'>-static struct resource strataflash_resource = {</div><div class='add'>+static struct resource docg3_resource = {</div><div class='ctx'> 	.start = PXA_CS0_PHYS,</div><div class='del'>-	.end   = PXA_CS0_PHYS + SZ_64M - 1,</div><div class='add'>+	.end   = PXA_CS0_PHYS + SZ_8K - 1,</div><div class='ctx'> 	.flags = IORESOURCE_MEM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct physmap_flash_data strataflash_data = {</div><div class='del'>-	.width = 2,</div><div class='del'>-	/* .set_vpp = mioa701_set_vpp, */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device strataflash = {</div><div class='del'>-	.name	       = "physmap-flash",</div><div class='add'>+static struct platform_device docg3 = {</div><div class='add'>+	.name	       = "docg3",</div><div class='ctx'> 	.id	       = -1,</div><div class='del'>-	.resource      = &amp;strataflash_resource,</div><div class='add'>+	.resource      = &amp;docg3_resource,</div><div class='ctx'> 	.num_resources = 1,</div><div class='ctx'> 	.dev = {</div><div class='del'>-		.platform_data = &amp;strataflash_data,</div><div class='add'>+		.platform_data = NULL,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -541,15 +537,15 @@ static struct pda_power_pdata power_pdata = {</div><div class='ctx'> static struct resource power_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.name	= "ac",</div><div class='del'>-		.start	= gpio_to_irq(GPIO96_AC_DETECT),</div><div class='del'>-		.end	= gpio_to_irq(GPIO96_AC_DETECT),</div><div class='add'>+		.start	= PXA_GPIO_TO_IRQ(GPIO96_AC_DETECT),</div><div class='add'>+		.end	= PXA_GPIO_TO_IRQ(GPIO96_AC_DETECT),</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE |</div><div class='ctx'> 		IORESOURCE_IRQ_LOWEDGE,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='ctx'> 		.name	= "usb",</div><div class='del'>-		.start	= gpio_to_irq(GPIO13_nUSB_DETECT),</div><div class='del'>-		.end	= gpio_to_irq(GPIO13_nUSB_DETECT),</div><div class='add'>+		.start	= PXA_GPIO_TO_IRQ(GPIO13_nUSB_DETECT),</div><div class='add'>+		.end	= PXA_GPIO_TO_IRQ(GPIO13_nUSB_DETECT),</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE |</div><div class='ctx'> 		IORESOURCE_IRQ_LOWEDGE,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -685,7 +681,7 @@ static struct platform_device *devices[] __initdata = {</div><div class='ctx'> 	&amp;pxa2xx_pcm,</div><div class='ctx'> 	&amp;mioa701_sound,</div><div class='ctx'> 	&amp;power_dev,</div><div class='del'>-	&amp;strataflash,</div><div class='add'>+	&amp;docg3,</div><div class='ctx'> 	&amp;gpio_vbus,</div><div class='ctx'> 	&amp;mioa701_camera,</div><div class='ctx'> 	&amp;mioa701_board,</div><div class='hunk'>@@ -696,13 +692,13 @@ static void mioa701_machine_exit(void);</div><div class='ctx'> static void mioa701_poweroff(void)</div><div class='ctx'> {</div><div class='ctx'> 	mioa701_machine_exit();</div><div class='del'>-	arm_machine_restart('s', NULL);</div><div class='add'>+	pxa_restart('s', NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mioa701_restart(char c, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	mioa701_machine_exit();</div><div class='del'>-	arm_machine_restart('s', cmd);</div><div class='add'>+	pxa_restart('s', cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct gpio global_gpios[] = {</div><div class='hunk'>@@ -720,6 +716,15 @@ static void __init mioa701_machine_init(void)</div><div class='ctx'> 	RTTR = 32768 - 1; /* Reset crazy WinCE value */</div><div class='ctx'> 	UP2OCR = UP2OCR_HXOE;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Set up the flash memory : DiskOnChip G3 on first static memory bank</div><div class='add'>+	 */</div><div class='add'>+	__raw_writel(0x7ff02dd8, MSC0);</div><div class='add'>+	__raw_writel(0x0001c391, MCMEM0);</div><div class='add'>+	__raw_writel(0x0001c391, MCATT0);</div><div class='add'>+	__raw_writel(0x0001c391, MCIO0);</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	pxa2xx_mfp_config(ARRAY_AND_SIZE(mioa701_pin_config));</div><div class='ctx'> 	pxa_set_ffuart_info(NULL);</div><div class='ctx'> 	pxa_set_btuart_info(NULL);</div><div class='hunk'>@@ -734,7 +739,6 @@ static void __init mioa701_machine_init(void)</div><div class='ctx'> 	pxa_set_udc_info(&amp;mioa701_udc_info);</div><div class='ctx'> 	pxa_set_ac97_info(&amp;mioa701_ac97_info);</div><div class='ctx'> 	pm_power_off = mioa701_poweroff;</div><div class='del'>-	arm_pm_restart = mioa701_restart;</div><div class='ctx'> 	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='ctx'> 	gsm_init();</div><div class='ctx'> </div><div class='hunk'>@@ -752,9 +756,11 @@ static void mioa701_machine_exit(void)</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(MIOA701, "MIO A701")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='add'>+	.restart_mode	= 's',</div><div class='ctx'> 	.map_io		= &amp;pxa27x_map_io,</div><div class='ctx'> 	.init_irq	= &amp;pxa27x_init_irq,</div><div class='ctx'> 	.handle_irq	= &amp;pxa27x_handle_irq,</div><div class='ctx'> 	.init_machine	= mioa701_machine_init,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= mioa701_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/mp900.c b/arch/arm/mach-pxa/mp900.c<br/>index 4af5d513c380..169bf8f97af0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/mp900.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/mp900.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/mp900.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/mp900.c</a></div><div class='hunk'>@@ -98,5 +98,6 @@ MACHINE_START(NEC_MP900, "MobilePro900/C")</div><div class='ctx'> 	.init_irq	= pxa25x_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa25x_handle_irq,</div><div class='ctx'> 	.init_machine	= mp900c_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/mxm8x10.c b/arch/arm/mach-pxa/mxm8x10.c<br/>index 90928d6e1a5b..83570a79e7d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/mxm8x10.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/mxm8x10.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/mxm8x10.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/mxm8x10.c</a></div><div class='hunk'>@@ -417,8 +417,8 @@ static struct resource dm9k_resources[] = {</div><div class='ctx'> 	       .flags = IORESOURCE_MEM</div><div class='ctx'> 	},</div><div class='ctx'> 	[2] = {</div><div class='del'>-	       .start = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO9)),</div><div class='del'>-	       .end = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO9)),</div><div class='add'>+	       .start = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO9)),</div><div class='add'>+	       .end = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO9)),</div><div class='ctx'> 	       .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c<br/>index 3d4a2819cae1..1fa80f4f80c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/palmld.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/palmld.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/palmld.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/palmld.c</a></div><div class='hunk'>@@ -347,5 +347,6 @@ MACHINE_START(PALMLD, "Palm LifeDrive")</div><div class='ctx'> 	.init_irq	= pxa27x_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='del'>-	.init_machine	= palmld_init</div><div class='add'>+	.init_machine	= palmld_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c<br/>index 99d6bcf1f974..5ba14316bd9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/palmt5.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/palmt5.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/palmt5.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/palmt5.c</a></div><div class='hunk'>@@ -208,5 +208,6 @@ MACHINE_START(PALMT5, "Palm Tungsten|T5")</div><div class='ctx'> 	.init_irq	= pxa27x_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='del'>-	.init_machine	= palmt5_init</div><div class='add'>+	.init_machine	= palmt5_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/palmtc.c b/arch/arm/mach-pxa/palmtc.c<br/>index 2c24c67fd92b..29b51b40f09d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/palmtc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/palmtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/palmtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/palmtc.c</a></div><div class='hunk'>@@ -542,5 +542,6 @@ MACHINE_START(PALMTC, "Palm Tungsten|C")</div><div class='ctx'> 	.init_irq	= pxa25x_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa25x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='del'>-	.init_machine	= palmtc_init</div><div class='add'>+	.init_machine	= palmtc_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/palmte2.c b/arch/arm/mach-pxa/palmte2.c<br/>index 9376da06404c..5ebf49acb827 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/palmte2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/palmte2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/palmte2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/palmte2.c</a></div><div class='hunk'>@@ -361,5 +361,6 @@ MACHINE_START(PALMTE2, "Palm Tungsten|E2")</div><div class='ctx'> 	.init_irq	= pxa25x_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa25x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='del'>-	.init_machine	= palmte2_init</div><div class='add'>+	.init_machine	= palmte2_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/palmtreo.c b/arch/arm/mach-pxa/palmtreo.c<br/>index 94e9708b349d..ec8249156c08 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/palmtreo.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/palmtreo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/palmtreo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/palmtreo.c</a></div><div class='hunk'>@@ -452,6 +452,7 @@ MACHINE_START(TREO680, "Palm Treo 680")</div><div class='ctx'> 	.handle_irq       = pxa27x_handle_irq,</div><div class='ctx'> 	.timer          = &amp;pxa_timer,</div><div class='ctx'> 	.init_machine   = treo680_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -464,5 +465,6 @@ MACHINE_START(CENTRO, "Palm Centro 685")</div><div class='ctx'> 	.handle_irq       = pxa27x_handle_irq,</div><div class='ctx'> 	.timer          = &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= centro_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c<br/>index 4e3e45927e95..6170d76dfba8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/palmtx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/palmtx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/palmtx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/palmtx.c</a></div><div class='hunk'>@@ -369,5 +369,6 @@ MACHINE_START(PALMTX, "Palm T|X")</div><div class='ctx'> 	.init_irq	= pxa27x_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='del'>-	.init_machine	= palmtx_init</div><div class='add'>+	.init_machine	= palmtx_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/palmz72.c b/arch/arm/mach-pxa/palmz72.c<br/>index 68e18baf8e07..b2dff9d415eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/palmz72.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/palmz72.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/palmz72.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/palmz72.c</a></div><div class='hunk'>@@ -404,5 +404,6 @@ MACHINE_START(PALMZ72, "Palm Zire72")</div><div class='ctx'> 	.init_irq	= pxa27x_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='del'>-	.init_machine	= palmz72_init</div><div class='add'>+	.init_machine	= palmz72_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/pcm027.c b/arch/arm/mach-pxa/pcm027.c<br/>index 0b825a353537..fe9054435b6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pcm027.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/pcm027.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pcm027.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/pcm027.c</a></div><div class='hunk'>@@ -265,4 +265,5 @@ MACHINE_START(PCM027, "Phytec Messtechnik GmbH phyCORE-PXA270")</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= pcm027_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c<br/>index 6d38c6548b3d..abab4e2b122c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pcm990-baseboard.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/pcm990-baseboard.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pcm990-baseboard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/pcm990-baseboard.c</a></div><div class='hunk'>@@ -378,7 +378,7 @@ struct pxacamera_platform_data pcm990_pxacamera_platform_data = {</div><div class='ctx'> #include &lt;linux/i2c/pca953x.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct pca953x_platform_data pca9536_data = {</div><div class='del'>-	.gpio_base	= NR_BUILTIN_GPIO,</div><div class='add'>+	.gpio_base	= PXA_NR_BUILTIN_GPIO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int gpio_bus_switch = -EINVAL;</div><div class='hunk'>@@ -406,9 +406,9 @@ static unsigned long pcm990_camera_query_bus_param(struct soc_camera_link *link)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (gpio_bus_switch &lt; 0) {</div><div class='del'>-		ret = gpio_request(NR_BUILTIN_GPIO, "camera");</div><div class='add'>+		ret = gpio_request(PXA_NR_BUILTIN_GPIO, "camera");</div><div class='ctx'> 		if (!ret) {</div><div class='del'>-			gpio_bus_switch = NR_BUILTIN_GPIO;</div><div class='add'>+			gpio_bus_switch = PXA_NR_BUILTIN_GPIO;</div><div class='ctx'> 			gpio_direction_output(gpio_bus_switch, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c<br/>index 50c833177866..744baee12c0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/poodle.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/poodle.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/poodle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/poodle.c</a></div><div class='hunk'>@@ -158,6 +158,11 @@ static struct scoop_pcmcia_config poodle_pcmcia_config = {</div><div class='ctx'> EXPORT_SYMBOL(poodle_scoop_device);</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+static struct platform_device poodle_audio_device = {</div><div class='add'>+	.name	= "poodle-audio",</div><div class='add'>+	.id	= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* LoCoMo device */</div><div class='ctx'> static struct resource locomo_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='hunk'>@@ -166,8 +171,8 @@ static struct resource locomo_resources[] = {</div><div class='ctx'> 		.flags		= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start		= IRQ_GPIO(10),</div><div class='del'>-		.end		= IRQ_GPIO(10),</div><div class='add'>+		.start		= PXA_GPIO_TO_IRQ(10),</div><div class='add'>+		.end		= PXA_GPIO_TO_IRQ(10),</div><div class='ctx'> 		.flags		= IORESOURCE_IRQ,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -212,7 +217,7 @@ static struct spi_board_info poodle_spi_devices[] = {</div><div class='ctx'> 		.bus_num	= 1,</div><div class='ctx'> 		.platform_data	= &amp;poodle_ads7846_info,</div><div class='ctx'> 		.controller_data= &amp;poodle_ads7846_chip,</div><div class='del'>-		.irq		= gpio_to_irq(POODLE_GPIO_TP_INT),</div><div class='add'>+		.irq		= PXA_GPIO_TO_IRQ(POODLE_GPIO_TP_INT),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -407,6 +412,7 @@ static struct platform_device sharpsl_rom_device = {</div><div class='ctx'> static struct platform_device *devices[] __initdata = {</div><div class='ctx'> 	&amp;poodle_locomo_device,</div><div class='ctx'> 	&amp;poodle_scoop_device,</div><div class='add'>+	&amp;poodle_audio_device,</div><div class='ctx'> 	&amp;sharpsl_nand_device,</div><div class='ctx'> 	&amp;sharpsl_rom_device,</div><div class='ctx'> };</div><div class='hunk'>@@ -417,12 +423,7 @@ static struct i2c_board_info __initdata poodle_i2c_devices[] = {</div><div class='ctx'> </div><div class='ctx'> static void poodle_poweroff(void)</div><div class='ctx'> {</div><div class='del'>-	arm_machine_restart('h', NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void poodle_restart(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	arm_machine_restart('h', cmd);</div><div class='add'>+	pxa_restart('h', NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init poodle_init(void)</div><div class='hunk'>@@ -430,7 +431,6 @@ static void __init poodle_init(void)</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	pm_power_off = poodle_poweroff;</div><div class='del'>-	arm_pm_restart = poodle_restart;</div><div class='ctx'> </div><div class='ctx'> 	PCFR |= PCFR_OPDE;</div><div class='ctx'> </div><div class='hunk'>@@ -472,4 +472,5 @@ MACHINE_START(POODLE, "SHARP Poodle")</div><div class='ctx'> 	.handle_irq	= pxa25x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= poodle_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c<br/>index f05f9486b0cb..adf058fa97ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa25x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/pxa25x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa25x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/pxa25x.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'>  * need be.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/gpio-pxa.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -208,6 +209,8 @@ static struct clk_lookup pxa25x_clkregs[] = {</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa25x_gpio11, NULL, "GPIO11_CLK"),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa25x_gpio12, NULL, "GPIO12_CLK"),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa25x_mem, "pxa2xx-pcmcia", NULL),</div><div class='add'>+	INIT_CLKREG(&amp;clk_dummy, "pxa-gpio", NULL),</div><div class='add'>+	INIT_CLKREG(&amp;clk_dummy, "sa1100-rtc", NULL),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk_lookup pxa25x_hwuart_clkreg =</div><div class='hunk'>@@ -287,7 +290,7 @@ static inline void pxa25x_init_pm(void) {}</div><div class='ctx'> </div><div class='ctx'> static int pxa25x_set_wake(struct irq_data *d, unsigned int on)</div><div class='ctx'> {</div><div class='del'>-	int gpio = irq_to_gpio(d-&gt;irq);</div><div class='add'>+	int gpio = pxa_irq_to_gpio(d-&gt;irq);</div><div class='ctx'> 	uint32_t mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (gpio &gt;= 0 &amp;&amp; gpio &lt; 85)</div><div class='hunk'>@@ -312,14 +315,12 @@ set_pwer:</div><div class='ctx'> void __init pxa25x_init_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	pxa_init_irq(32, pxa25x_set_wake);</div><div class='del'>-	pxa_init_gpio(IRQ_GPIO_2_x, 2, 84, pxa25x_set_wake);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_PXA26x</div><div class='ctx'> void __init pxa26x_init_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	pxa_init_irq(32, pxa25x_set_wake);</div><div class='del'>-	pxa_init_gpio(IRQ_GPIO_2_x, 2, 89, pxa25x_set_wake);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c<br/>index bc5a98ebaa72..180bd8675d4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa27x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/pxa27x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa27x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/pxa27x.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/gpio-pxa.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -229,6 +230,8 @@ static struct clk_lookup pxa27x_clkregs[] = {</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa27x_im, NULL, "IMCLK"),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa27x_memc, NULL, "MEMCLK"),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa27x_mem, "pxa2xx-pcmcia", NULL),</div><div class='add'>+	INIT_CLKREG(&amp;clk_dummy, "pxa-gpio", NULL),</div><div class='add'>+	INIT_CLKREG(&amp;clk_dummy, "sa1100-rtc", NULL),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -355,7 +358,7 @@ static inline void pxa27x_init_pm(void) {}</div><div class='ctx'>  */</div><div class='ctx'> static int pxa27x_set_wake(struct irq_data *d, unsigned int on)</div><div class='ctx'> {</div><div class='del'>-	int gpio = irq_to_gpio(d-&gt;irq);</div><div class='add'>+	int gpio = pxa_irq_to_gpio(d-&gt;irq);</div><div class='ctx'> 	uint32_t mask;</div><div class='ctx'> </div><div class='ctx'> 	if (gpio &gt;= 0 &amp;&amp; gpio &lt; 128)</div><div class='hunk'>@@ -386,7 +389,6 @@ static int pxa27x_set_wake(struct irq_data *d, unsigned int on)</div><div class='ctx'> void __init pxa27x_init_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	pxa_init_irq(34, pxa27x_set_wake);</div><div class='del'>-	pxa_init_gpio(IRQ_GPIO_2_x, 2, 120, pxa27x_set_wake);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct map_desc pxa27x_io_desc[] __initdata = {</div><div class='hunk'>@@ -422,6 +424,7 @@ void __init pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *devices[] __initdata = {</div><div class='add'>+	&amp;pxa_device_gpio,</div><div class='ctx'> 	&amp;pxa27x_device_udc,</div><div class='ctx'> 	&amp;pxa_device_pmu,</div><div class='ctx'> 	&amp;pxa_device_i2s,</div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c<br/>index 40bb16501d86..0388eda7878a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa300.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/pxa300.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/pxa300.c</a></div><div class='hunk'>@@ -89,6 +89,7 @@ static DEFINE_PXA3_CKEN(gcu, PXA300_GCU, 0, 0);</div><div class='ctx'> static struct clk_lookup common_clkregs[] = {</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_common_nand, "pxa3xx-nand", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_gcu, "pxa3xx-gcu", NULL),</div><div class='add'>+	INIT_CLKREG(&amp;clk_dummy, "sa1100-rtc", NULL),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0);</div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa320.c b/arch/arm/mach-pxa/pxa320.c<br/>index 8d614ecd8e99..d487e1ff4c9a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa320.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/pxa320.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa320.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/pxa320.c</a></div><div class='hunk'>@@ -83,6 +83,7 @@ static DEFINE_PXA3_CKEN(gcu, PXA320_GCU, 0, 0);</div><div class='ctx'> static struct clk_lookup pxa320_clkregs[] = {</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa320_nand, "pxa3xx-nand", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_gcu, "pxa3xx-gcu", NULL),</div><div class='add'>+	INIT_CLKREG(&amp;clk_dummy, "sa1100-rtc", NULL),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init pxa320_init(void)</div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c<br/>index 0737c59b88ae..f107c71c7589 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa3xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/pxa3xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa3xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/pxa3xx.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/suspend.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/gpio-pxa.h&gt;</div><div class='ctx'> #include &lt;mach/pxa3xx-regs.h&gt;</div><div class='ctx'> #include &lt;mach/reset.h&gt;</div><div class='ctx'> #include &lt;mach/ohci.h&gt;</div><div class='hunk'>@@ -56,6 +55,7 @@ static DEFINE_PXA3_CKEN(pxa3xx_pwm0, PWM0, 13000000, 0);</div><div class='ctx'> static DEFINE_PXA3_CKEN(pxa3xx_pwm1, PWM1, 13000000, 0);</div><div class='ctx'> static DEFINE_PXA3_CKEN(pxa3xx_mmc1, MMC1, 19500000, 0);</div><div class='ctx'> static DEFINE_PXA3_CKEN(pxa3xx_mmc2, MMC2, 19500000, 0);</div><div class='add'>+static DEFINE_PXA3_CKEN(pxa3xx_gpio, GPIO, 13000000, 0);</div><div class='ctx'> </div><div class='ctx'> static DEFINE_CK(pxa3xx_lcd, LCD, &amp;clk_pxa3xx_hsio_ops);</div><div class='ctx'> static DEFINE_CK(pxa3xx_smemc, SMC, &amp;clk_pxa3xx_smemc_ops);</div><div class='hunk'>@@ -67,6 +67,7 @@ static struct clk_lookup pxa3xx_clkregs[] = {</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa3xx_pout, NULL, "CLK_POUT"),</div><div class='ctx'> 	/* Power I2C clock is always on */</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_dummy, "pxa3xx-pwri2c.1", NULL),</div><div class='add'>+	INIT_CLKREG(&amp;clk_dummy, "sa1100-rtc", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa3xx_lcd, "pxa2xx-fb", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa3xx_camera, NULL, "CAMCLK"),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa3xx_ac97, NULL, "AC97CLK"),</div><div class='hunk'>@@ -88,6 +89,7 @@ static struct clk_lookup pxa3xx_clkregs[] = {</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa3xx_mmc1, "pxa2xx-mci.0", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa3xx_mmc2, "pxa2xx-mci.1", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa3xx_smemc, "pxa2xx-pcmcia", NULL),</div><div class='add'>+	INIT_CLKREG(&amp;clk_pxa3xx_gpio, "pxa-gpio", NULL),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -365,7 +367,8 @@ static struct irq_chip pxa_ext_wakeup_chip = {</div><div class='ctx'> 	.irq_set_type	= pxa_set_ext_wakeup_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __init pxa_init_ext_wakeup_irq(set_wake_t fn)</div><div class='add'>+static void __init pxa_init_ext_wakeup_irq(int (*fn)(struct irq_data *,</div><div class='add'>+					   unsigned int))</div><div class='ctx'> {</div><div class='ctx'> 	int irq;</div><div class='ctx'> </div><div class='hunk'>@@ -388,7 +391,6 @@ void __init pxa3xx_init_irq(void)</div><div class='ctx'> </div><div class='ctx'> 	pxa_init_irq(56, pxa3xx_set_wake);</div><div class='ctx'> 	pxa_init_ext_wakeup_irq(pxa3xx_set_wake);</div><div class='del'>-	pxa_init_gpio(IRQ_GPIO_2_x, 2, 127, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct map_desc pxa3xx_io_desc[] __initdata = {</div><div class='hunk'>@@ -417,6 +419,7 @@ void __init pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *devices[] __initdata = {</div><div class='add'>+	&amp;pxa_device_gpio,</div><div class='ctx'> 	&amp;pxa27x_device_udc,</div><div class='ctx'> 	&amp;pxa_device_pmu,</div><div class='ctx'> 	&amp;pxa_device_i2s,</div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa95x.c b/arch/arm/mach-pxa/pxa95x.c<br/>index 51371b39d2a3..fccc644702e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa95x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/pxa95x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa95x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/pxa95x.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/gpio-pxa.h&gt;</div><div class='ctx'> #include &lt;mach/pxa3xx-regs.h&gt;</div><div class='ctx'> #include &lt;mach/pxa930.h&gt;</div><div class='ctx'> #include &lt;mach/reset.h&gt;</div><div class='hunk'>@@ -212,11 +211,13 @@ static DEFINE_PXA3_CKEN(pxa95x_ssp3, SSP3, 13000000, 0);</div><div class='ctx'> static DEFINE_PXA3_CKEN(pxa95x_ssp4, SSP4, 13000000, 0);</div><div class='ctx'> static DEFINE_PXA3_CKEN(pxa95x_pwm0, PWM0, 13000000, 0);</div><div class='ctx'> static DEFINE_PXA3_CKEN(pxa95x_pwm1, PWM1, 13000000, 0);</div><div class='add'>+static DEFINE_PXA3_CKEN(pxa95x_gpio, GPIO, 13000000, 0);</div><div class='ctx'> </div><div class='ctx'> static struct clk_lookup pxa95x_clkregs[] = {</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa95x_pout, NULL, "CLK_POUT"),</div><div class='ctx'> 	/* Power I2C clock is always on */</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_dummy, "pxa3xx-pwri2c.1", NULL),</div><div class='add'>+	INIT_CLKREG(&amp;clk_dummy, "sa1100-rtc", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa95x_lcd, "pxa2xx-fb", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa95x_ffuart, "pxa2xx-uart.0", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa95x_btuart, "pxa2xx-uart.1", NULL),</div><div class='hunk'>@@ -230,12 +231,12 @@ static struct clk_lookup pxa95x_clkregs[] = {</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa95x_ssp4, "pxa27x-ssp.3", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa95x_pwm0, "pxa27x-pwm.0", NULL),</div><div class='ctx'> 	INIT_CLKREG(&amp;clk_pxa95x_pwm1, "pxa27x-pwm.1", NULL),</div><div class='add'>+	INIT_CLKREG(&amp;clk_pxa95x_gpio, "pxa-gpio", NULL),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init pxa95x_init_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	pxa_init_irq(96, NULL);</div><div class='del'>-	pxa_init_gpio(IRQ_GPIO_2_x, 2, 127, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -248,6 +249,7 @@ void __init pxa95x_set_i2c_power_info(struct i2c_pxa_platform_data *info)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *devices[] __initdata = {</div><div class='add'>+	&amp;pxa_device_gpio,</div><div class='ctx'> 	&amp;sa1100_device_rtc,</div><div class='ctx'> 	&amp;pxa_device_rtc,</div><div class='ctx'> 	&amp;pxa27x_device_ssp1,</div><div class='head'>diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c<br/>index f0c05f4d12ed..22818c7694a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/raumfeld.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/raumfeld.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/raumfeld.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/raumfeld.c</a></div><div class='hunk'>@@ -292,8 +292,8 @@ static struct resource smc91x_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.start	= gpio_to_irq(GPIO_ETH_IRQ),</div><div class='del'>-		.end	= gpio_to_irq(GPIO_ETH_IRQ),</div><div class='add'>+		.start	= PXA_GPIO_TO_IRQ(GPIO_ETH_IRQ),</div><div class='add'>+		.end	= PXA_GPIO_TO_IRQ(GPIO_ETH_IRQ),</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ | IRQF_TRIGGER_FALLING,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -672,7 +672,7 @@ static struct lis3lv02d_platform_data lis3_pdata = {</div><div class='ctx'> 	.chip_select	= 1,			\</div><div class='ctx'> 	.controller_data = (void *) GPIO_ACCEL_CS,	\</div><div class='ctx'> 	.platform_data	= &amp;lis3_pdata,		\</div><div class='del'>-	.irq		= gpio_to_irq(GPIO_ACCEL_IRQ),	\</div><div class='add'>+	.irq		= PXA_GPIO_TO_IRQ(GPIO_ACCEL_IRQ),	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define SPI_DAC7512	\</div><div class='hunk'>@@ -956,7 +956,7 @@ static struct eeti_ts_platform_data eeti_ts_pdata = {</div><div class='ctx'> static struct i2c_board_info raumfeld_controller_i2c_board_info __initdata = {</div><div class='ctx'> 	.type	= "eeti_ts",</div><div class='ctx'> 	.addr	= 0x0a,</div><div class='del'>-	.irq	= gpio_to_irq(GPIO_TOUCH_IRQ),</div><div class='add'>+	.irq	= PXA_GPIO_TO_IRQ(GPIO_TOUCH_IRQ),</div><div class='ctx'> 	.platform_data = &amp;eeti_ts_pdata,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1093,6 +1093,7 @@ MACHINE_START(RAUMFELD_RC, "Raumfeld Controller")</div><div class='ctx'> 	.init_irq	= pxa3xx_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa3xx_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1104,6 +1105,7 @@ MACHINE_START(RAUMFELD_CONNECTOR, "Raumfeld Connector")</div><div class='ctx'> 	.init_irq	= pxa3xx_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa3xx_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1115,5 +1117,6 @@ MACHINE_START(RAUMFELD_SPEAKER, "Raumfeld Speaker")</div><div class='ctx'> 	.init_irq	= pxa3xx_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa3xx_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c<br/>index 01e9d643394a..c8497b00cdfe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/reset.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/reset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/reset.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/reset.c</a></div><div class='hunk'>@@ -81,14 +81,17 @@ static void do_hw_reset(void)</div><div class='ctx'> 	OSMR3 = OSCR + 368640;	/* ... in 100 ms */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void arch_reset(char mode, const char *cmd)</div><div class='add'>+void pxa_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	local_fiq_disable();</div><div class='add'>+</div><div class='ctx'> 	clear_reset_status(RESET_STATUS_ALL);</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case 's':</div><div class='ctx'> 		/* Jump into ROM at address 0 */</div><div class='del'>-		cpu_reset(0);</div><div class='add'>+		soft_restart(0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 'g':</div><div class='ctx'> 		do_gpio_reset();</div><div class='head'>diff --git a/arch/arm/mach-pxa/saar.c b/arch/arm/mach-pxa/saar.c<br/>index fc2c1e05af9c..0fe354efb931 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/saar.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/saar.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/saar.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/saar.c</a></div><div class='hunk'>@@ -96,8 +96,8 @@ static struct resource smc91x_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start	= gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO97)),</div><div class='del'>-		.end	= gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO97)),</div><div class='add'>+		.start	= PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO97)),</div><div class='add'>+		.end	= PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO97)),</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -502,7 +502,7 @@ static struct i2c_board_info saar_i2c_info[] = {</div><div class='ctx'> 		.type		= "da9034",</div><div class='ctx'> 		.addr		= 0x34,</div><div class='ctx'> 		.platform_data	= &amp;saar_da9034_info,</div><div class='del'>-		.irq		= gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO83)),</div><div class='add'>+		.irq		= PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO83)),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -602,4 +602,5 @@ MACHINE_START(SAAR, "PXA930 Handheld Platform (aka SAAR)")</div><div class='ctx'> 	.handle_irq       = pxa3xx_handle_irq,</div><div class='ctx'> 	.timer          = &amp;pxa_timer,</div><div class='ctx'> 	.init_machine   = saar_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/saarb.c b/arch/arm/mach-pxa/saarb.c<br/>index 3e999e308a2d..febc809ed5a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/saarb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/saarb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/saarb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/saarb.c</a></div><div class='hunk'>@@ -92,7 +92,7 @@ static struct i2c_board_info saarb_i2c_info[] = {</div><div class='ctx'> 		.type		= "88PM860x",</div><div class='ctx'> 		.addr		= 0x34,</div><div class='ctx'> 		.platform_data	= &amp;saarb_pm8607_info,</div><div class='del'>-		.irq		= gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO83)),</div><div class='add'>+		.irq		= PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO83)),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -111,5 +111,6 @@ MACHINE_START(SAARB, "PXA955 Handheld Platform (aka SAARB)")</div><div class='ctx'> 	.handle_irq	= pxa3xx_handle_irq,</div><div class='ctx'> 	.timer          = &amp;pxa_timer,</div><div class='ctx'> 	.init_machine   = saarb_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c<br/>index 785880f67b60..8d5168d253a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/sharpsl_pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/sharpsl_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/sharpsl_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/sharpsl_pm.c</a></div><div class='hunk'>@@ -907,24 +907,24 @@ static int __devinit sharpsl_pm_probe(struct platform_device *pdev)</div><div class='ctx'> 	gpio_direction_input(sharpsl_pm.machinfo-&gt;gpio_batlock);</div><div class='ctx'> </div><div class='ctx'> 	/* Register interrupt handlers */</div><div class='del'>-	if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_acin), sharpsl_ac_isr, IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, "AC Input Detect", sharpsl_ac_isr)) {</div><div class='del'>-		dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_acin));</div><div class='add'>+	if (request_irq(PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo-&gt;gpio_acin), sharpsl_ac_isr, IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, "AC Input Detect", sharpsl_ac_isr)) {</div><div class='add'>+		dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo-&gt;gpio_acin));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_batlock), sharpsl_fatal_isr, IRQF_DISABLED | IRQF_TRIGGER_FALLING, "Battery Cover", sharpsl_fatal_isr)) {</div><div class='del'>-		dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_batlock));</div><div class='add'>+	if (request_irq(PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo-&gt;gpio_batlock), sharpsl_fatal_isr, IRQF_DISABLED | IRQF_TRIGGER_FALLING, "Battery Cover", sharpsl_fatal_isr)) {</div><div class='add'>+		dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo-&gt;gpio_batlock));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sharpsl_pm.machinfo-&gt;gpio_fatal) {</div><div class='del'>-		if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_fatal), sharpsl_fatal_isr, IRQF_DISABLED | IRQF_TRIGGER_FALLING, "Fatal Battery", sharpsl_fatal_isr)) {</div><div class='del'>-			dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_fatal));</div><div class='add'>+		if (request_irq(PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo-&gt;gpio_fatal), sharpsl_fatal_isr, IRQF_DISABLED | IRQF_TRIGGER_FALLING, "Fatal Battery", sharpsl_fatal_isr)) {</div><div class='add'>+			dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo-&gt;gpio_fatal));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sharpsl_pm.machinfo-&gt;batfull_irq) {</div><div class='ctx'> 		/* Register interrupt handler. */</div><div class='del'>-		if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_batfull), sharpsl_chrg_full_isr, IRQF_DISABLED | IRQF_TRIGGER_RISING, "CO", sharpsl_chrg_full_isr)) {</div><div class='del'>-			dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_batfull));</div><div class='add'>+		if (request_irq(PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo-&gt;gpio_batfull), sharpsl_chrg_full_isr, IRQF_DISABLED | IRQF_TRIGGER_RISING, "CO", sharpsl_chrg_full_isr)) {</div><div class='add'>+			dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo-&gt;gpio_batfull));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -953,14 +953,14 @@ static int sharpsl_pm_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	led_trigger_unregister_simple(sharpsl_charge_led_trigger);</div><div class='ctx'> </div><div class='del'>-	free_irq(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_acin), sharpsl_ac_isr);</div><div class='del'>-	free_irq(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_batlock), sharpsl_fatal_isr);</div><div class='add'>+	free_irq(PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo-&gt;gpio_acin), sharpsl_ac_isr);</div><div class='add'>+	free_irq(PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo-&gt;gpio_batlock), sharpsl_fatal_isr);</div><div class='ctx'> </div><div class='ctx'> 	if (sharpsl_pm.machinfo-&gt;gpio_fatal)</div><div class='del'>-		free_irq(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_fatal), sharpsl_fatal_isr);</div><div class='add'>+		free_irq(PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo-&gt;gpio_fatal), sharpsl_fatal_isr);</div><div class='ctx'> </div><div class='ctx'> 	if (sharpsl_pm.machinfo-&gt;batfull_irq)</div><div class='del'>-		free_irq(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_batfull), sharpsl_chrg_full_isr);</div><div class='add'>+		free_irq(PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo-&gt;gpio_batfull), sharpsl_chrg_full_isr);</div><div class='ctx'> </div><div class='ctx'> 	gpio_free(sharpsl_pm.machinfo-&gt;gpio_batlock);</div><div class='ctx'> 	gpio_free(sharpsl_pm.machinfo-&gt;gpio_batfull);</div><div class='head'>diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c<br/>index 953a9195f9e5..abf355d0c92f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/spitz.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/spitz.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/spitz.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/spitz.c</a></div><div class='hunk'>@@ -552,7 +552,7 @@ static struct spi_board_info spitz_spi_devices[] = {</div><div class='ctx'> 		.chip_select		= 0,</div><div class='ctx'> 		.platform_data		= &amp;spitz_ads7846_info,</div><div class='ctx'> 		.controller_data	= &amp;spitz_ads7846_chip,</div><div class='del'>-		.irq			= gpio_to_irq(SPITZ_GPIO_TP_INT),</div><div class='add'>+		.irq			= PXA_GPIO_TO_IRQ(SPITZ_GPIO_TP_INT),</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.modalias		= "corgi-lcd",</div><div class='ctx'> 		.max_speed_hz		= 50000,</div><div class='hunk'>@@ -926,7 +926,7 @@ static inline void spitz_i2c_init(void) {}</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> static void spitz_poweroff(void)</div><div class='ctx'> {</div><div class='del'>-	arm_machine_restart('g', NULL);</div><div class='add'>+	pxa_restart('g', NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void spitz_restart(char mode, const char *cmd)</div><div class='hunk'>@@ -943,7 +943,6 @@ static void __init spitz_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	init_gpio_reset(SPITZ_GPIO_ON_RESET, 1, 0);</div><div class='ctx'> 	pm_power_off = spitz_poweroff;</div><div class='del'>-	arm_pm_restart = spitz_restart;</div><div class='ctx'> </div><div class='ctx'> 	PMCR = 0x00;</div><div class='ctx'> </div><div class='hunk'>@@ -982,33 +981,39 @@ static void __init spitz_fixup(struct tag *tags, char **cmdline,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACH_SPITZ</div><div class='ctx'> MACHINE_START(SPITZ, "SHARP Spitz")</div><div class='add'>+	.restart_mode	= 'g',</div><div class='ctx'> 	.fixup		= spitz_fixup,</div><div class='ctx'> 	.map_io		= pxa27x_map_io,</div><div class='ctx'> 	.init_irq	= pxa27x_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.init_machine	= spitz_init,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= spitz_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACH_BORZOI</div><div class='ctx'> MACHINE_START(BORZOI, "SHARP Borzoi")</div><div class='add'>+	.restart_mode	= 'g',</div><div class='ctx'> 	.fixup		= spitz_fixup,</div><div class='ctx'> 	.map_io		= pxa27x_map_io,</div><div class='ctx'> 	.init_irq	= pxa27x_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.init_machine	= spitz_init,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= spitz_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACH_AKITA</div><div class='ctx'> MACHINE_START(AKITA, "SHARP Akita")</div><div class='add'>+	.restart_mode	= 'g',</div><div class='ctx'> 	.fixup		= spitz_fixup,</div><div class='ctx'> 	.map_io		= pxa27x_map_io,</div><div class='ctx'> 	.init_irq	= pxa27x_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.init_machine	= spitz_init,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= spitz_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c<br/>index 094279aefe9c..34cbdac51525 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/spitz_pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/spitz_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/spitz_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/spitz_pm.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/gpio-pxa.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;linux/apm-emulation.h&gt;</div><div class='hunk'>@@ -41,6 +42,7 @@ static int spitz_last_ac_status;</div><div class='ctx'> static struct gpio spitz_charger_gpios[] = {</div><div class='ctx'> 	{ SPITZ_GPIO_KEY_INT,	GPIOF_IN, "Keyboard Interrupt" },</div><div class='ctx'> 	{ SPITZ_GPIO_SYNC,	GPIOF_IN, "Sync" },</div><div class='add'>+	{ SPITZ_GPIO_AC_IN,     GPIOF_IN, "Charger Detection" },</div><div class='ctx'> 	{ SPITZ_GPIO_ADC_TEMP_ON, GPIOF_OUT_INIT_LOW, "ADC Temp On" },</div><div class='ctx'> 	{ SPITZ_GPIO_JK_B,	  GPIOF_OUT_INIT_LOW, "JK B" },</div><div class='ctx'> 	{ SPITZ_GPIO_CHRG_ON,	  GPIOF_OUT_INIT_LOW, "Charger On" },</div><div class='hunk'>@@ -169,14 +171,19 @@ static int spitz_should_wakeup(unsigned int resume_on_alarm)</div><div class='ctx'> </div><div class='ctx'> static unsigned long spitz_charger_wakeup(void)</div><div class='ctx'> {</div><div class='del'>-	return (~GPLR0 &amp; GPIO_bit(SPITZ_GPIO_KEY_INT)) | (GPLR0 &amp; GPIO_bit(SPITZ_GPIO_SYNC));</div><div class='add'>+	unsigned long ret;</div><div class='add'>+	ret = (!gpio_get_value(SPITZ_GPIO_KEY_INT)</div><div class='add'>+		&lt;&lt; GPIO_bit(SPITZ_GPIO_KEY_INT))</div><div class='add'>+		| (!gpio_get_value(SPITZ_GPIO_SYNC)</div><div class='add'>+		&lt;&lt; GPIO_bit(SPITZ_GPIO_SYNC));</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned long spitzpm_read_devdata(int type)</div><div class='ctx'> {</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case SHARPSL_STATUS_ACIN:</div><div class='del'>-		return (((~GPLR(SPITZ_GPIO_AC_IN)) &amp; GPIO_bit(SPITZ_GPIO_AC_IN)) != 0);</div><div class='add'>+		return !gpio_get_value(SPITZ_GPIO_AC_IN);</div><div class='ctx'> 	case SHARPSL_STATUS_LOCK:</div><div class='ctx'> 		return gpio_get_value(sharpsl_pm.machinfo-&gt;gpio_batlock);</div><div class='ctx'> 	case SHARPSL_STATUS_CHRGFULL:</div><div class='head'>diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c<br/>index 4c9a48bef569..b0656e158d90 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/stargate2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/stargate2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/stargate2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/stargate2.c</a></div><div class='hunk'>@@ -376,7 +376,7 @@ static struct spi_board_info spi_board_info[] __initdata = {</div><div class='ctx'> 		.bus_num = 1,</div><div class='ctx'> 		.chip_select = 0,</div><div class='ctx'> 		.controller_data = &amp;staccel_chip_info,</div><div class='del'>-		.irq = IRQ_GPIO(96),</div><div class='add'>+		.irq = PXA_GPIO_TO_IRQ(96),</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.modalias = "cc2420",</div><div class='ctx'> 		.max_speed_hz = 6500000,</div><div class='hunk'>@@ -546,7 +546,7 @@ static struct i2c_board_info __initdata imote2_pwr_i2c_board_info[] = {</div><div class='ctx'> 		.type = "da9030",</div><div class='ctx'> 		.addr = 0x49,</div><div class='ctx'> 		.platform_data = &amp;imote2_da9030_pdata,</div><div class='del'>-		.irq = gpio_to_irq(1),</div><div class='add'>+		.irq = PXA_GPIO_TO_IRQ(1),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -560,18 +560,18 @@ static struct i2c_board_info __initdata imote2_i2c_board_info[] = {</div><div class='ctx'> 		/* Through a nand gate - Also beware, on V2 sensor board the</div><div class='ctx'> 		 * pull up resistors are missing.</div><div class='ctx'> 		 */</div><div class='del'>-		.irq = IRQ_GPIO(99),</div><div class='add'>+		.irq = PXA_GPIO_TO_IRQ(99),</div><div class='ctx'> 	}, { /* ITS400 Sensor board only */</div><div class='ctx'> 		.type = "tsl2561",</div><div class='ctx'> 		.addr = 0x49,</div><div class='ctx'> 		/* Through a nand gate - Also beware, on V2 sensor board the</div><div class='ctx'> 		 * pull up resistors are missing.</div><div class='ctx'> 		 */</div><div class='del'>-		.irq = IRQ_GPIO(99),</div><div class='add'>+		.irq = PXA_GPIO_TO_IRQ(99),</div><div class='ctx'> 	}, { /* ITS400 Sensor board only */</div><div class='ctx'> 		.type = "tmp175",</div><div class='ctx'> 		.addr = 0x4A,</div><div class='del'>-		.irq = IRQ_GPIO(96),</div><div class='add'>+		.irq = PXA_GPIO_TO_IRQ(96),</div><div class='ctx'> 	}, { /* IMB400 Multimedia board */</div><div class='ctx'> 		.type = "wm8940",</div><div class='ctx'> 		.addr = 0x1A,</div><div class='hunk'>@@ -593,10 +593,16 @@ static struct pxa2xx_udc_mach_info imote2_udc_info __initdata = {</div><div class='ctx'> 	.udc_command		= sg2_udc_command,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct platform_device imote2_audio_device = {</div><div class='add'>+	.name = "imote2-audio",</div><div class='add'>+	.id   = -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device *imote2_devices[] = {</div><div class='ctx'> 	&amp;stargate2_flash_device,</div><div class='ctx'> 	&amp;imote2_leds,</div><div class='ctx'> 	&amp;sht15,</div><div class='add'>+	&amp;imote2_audio_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init imote2_init(void)</div><div class='hunk'>@@ -661,8 +667,8 @@ static struct resource smc91x_resources[] = {</div><div class='ctx'> 		.flags = IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start = IRQ_GPIO(40),</div><div class='del'>-		.end = IRQ_GPIO(40),</div><div class='add'>+		.start = PXA_GPIO_TO_IRQ(40),</div><div class='add'>+		.end = PXA_GPIO_TO_IRQ(40),</div><div class='ctx'> 		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -707,7 +713,7 @@ static int stargate2_mci_init(struct device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	gpio_direction_input(SG2_GPIO_nSD_DETECT);</div><div class='ctx'> </div><div class='del'>-	err = request_irq(IRQ_GPIO(SG2_GPIO_nSD_DETECT),</div><div class='add'>+	err = request_irq(PXA_GPIO_TO_IRQ(SG2_GPIO_nSD_DETECT),</div><div class='ctx'> 			  stargate2_detect_int,</div><div class='ctx'> 			  IRQ_TYPE_EDGE_BOTH,</div><div class='ctx'> 			  "MMC card detect",</div><div class='hunk'>@@ -738,7 +744,7 @@ static void stargate2_mci_setpower(struct device *dev, unsigned int vdd)</div><div class='ctx'> </div><div class='ctx'> static void stargate2_mci_exit(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='del'>-	free_irq(IRQ_GPIO(SG2_GPIO_nSD_DETECT), data);</div><div class='add'>+	free_irq(PXA_GPIO_TO_IRQ(SG2_GPIO_nSD_DETECT), data);</div><div class='ctx'> 	gpio_free(SG2_SD_POWER_ENABLE);</div><div class='ctx'> 	gpio_free(SG2_GPIO_nSD_DETECT);</div><div class='ctx'> }</div><div class='hunk'>@@ -913,7 +919,7 @@ static struct i2c_board_info __initdata stargate2_pwr_i2c_board_info[] = {</div><div class='ctx'> 		.type = "da9030",</div><div class='ctx'> 		.addr = 0x49,</div><div class='ctx'> 		.platform_data = &amp;stargate2_da9030_pdata,</div><div class='del'>-		.irq = gpio_to_irq(1),</div><div class='add'>+		.irq = PXA_GPIO_TO_IRQ(1),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -938,18 +944,18 @@ static struct i2c_board_info __initdata stargate2_i2c_board_info[] = {</div><div class='ctx'> 		/* Through a nand gate - Also beware, on V2 sensor board the</div><div class='ctx'> 		 * pull up resistors are missing.</div><div class='ctx'> 		 */</div><div class='del'>-		.irq = IRQ_GPIO(99),</div><div class='add'>+		.irq = PXA_GPIO_TO_IRQ(99),</div><div class='ctx'> 	}, { /* ITS400 Sensor board only */</div><div class='ctx'> 		.type = "tsl2561",</div><div class='ctx'> 		.addr = 0x49,</div><div class='ctx'> 		/* Through a nand gate - Also beware, on V2 sensor board the</div><div class='ctx'> 		 * pull up resistors are missing.</div><div class='ctx'> 		 */</div><div class='del'>-		.irq = IRQ_GPIO(99),</div><div class='add'>+		.irq = PXA_GPIO_TO_IRQ(99),</div><div class='ctx'> 	}, { /* ITS400 Sensor board only */</div><div class='ctx'> 		.type = "tmp175",</div><div class='ctx'> 		.addr = 0x4A,</div><div class='del'>-		.irq = IRQ_GPIO(96),</div><div class='add'>+		.irq = PXA_GPIO_TO_IRQ(96),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1005,6 +1011,7 @@ MACHINE_START(INTELMOTE2, "IMOTE 2")</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= imote2_init,</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1017,5 +1024,6 @@ MACHINE_START(STARGATE2, "Stargate 2")</div><div class='ctx'> 	.timer = &amp;pxa_timer,</div><div class='ctx'> 	.init_machine = stargate2_init,</div><div class='ctx'> 	.atag_offset = 0x100,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-pxa/tavorevb.c b/arch/arm/mach-pxa/tavorevb.c<br/>index ad47bb98f30d..9fb38e80e076 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/tavorevb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/tavorevb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/tavorevb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/tavorevb.c</a></div><div class='hunk'>@@ -85,8 +85,8 @@ static struct resource smc91x_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start	= gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO47)),</div><div class='del'>-		.end	= gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO47)),</div><div class='add'>+		.start	= PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO47)),</div><div class='add'>+		.end	= PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO47)),</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -495,4 +495,5 @@ MACHINE_START(TAVOREVB, "PXA930 Evaluation Board (aka TavorEVB)")</div><div class='ctx'> 	.handle_irq       = pxa3xx_handle_irq,</div><div class='ctx'> 	.timer          = &amp;pxa_timer,</div><div class='ctx'> 	.init_machine   = tavorevb_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/tavorevb3.c b/arch/arm/mach-pxa/tavorevb3.c<br/>index fd569167302a..f7d9305cfd77 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/tavorevb3.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/tavorevb3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/tavorevb3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/tavorevb3.c</a></div><div class='hunk'>@@ -101,7 +101,7 @@ static struct i2c_board_info evb3_i2c_info[] = {</div><div class='ctx'> 		.type		= "88PM860x",</div><div class='ctx'> 		.addr		= 0x34,</div><div class='ctx'> 		.platform_data	= &amp;evb3_pm8607_info,</div><div class='del'>-		.irq		= gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO83)),</div><div class='add'>+		.irq		= PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO83)),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -132,4 +132,5 @@ MACHINE_START(TAVOREVB3, "PXA950 Evaluation Board (aka TavorEVB3)")</div><div class='ctx'> 	.handle_irq       = pxa3xx_handle_irq,</div><div class='ctx'> 	.timer          = &amp;pxa_timer,</div><div class='ctx'> 	.init_machine   = evb3_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c<br/>index de684701449c..b503049d6d26 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/time.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='hunk'>@@ -32,18 +31,10 @@</div><div class='ctx'>  * long as there is always less than 582 seconds between successive</div><div class='ctx'>  * calls to sched_clock() which should always be the case in practice.</div><div class='ctx'>  */</div><div class='del'>-static DEFINE_CLOCK_DATA(cd);</div><div class='ctx'> </div><div class='del'>-unsigned long long notrace sched_clock(void)</div><div class='add'>+static u32 notrace pxa_read_sched_clock(void)</div><div class='ctx'> {</div><div class='del'>-	u32 cyc = OSCR;</div><div class='del'>-	return cyc_to_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void notrace pxa_update_sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	u32 cyc = OSCR;</div><div class='del'>-	update_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='add'>+	return OSCR;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -119,7 +110,7 @@ static void __init pxa_timer_init(void)</div><div class='ctx'> 	OIER = 0;</div><div class='ctx'> 	OSSR = OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3;</div><div class='ctx'> </div><div class='del'>-	init_sched_clock(&amp;cd, pxa_update_sched_clock, 32, clock_tick_rate);</div><div class='add'>+	setup_sched_clock(pxa_read_sched_clock, 32, clock_tick_rate);</div><div class='ctx'> </div><div class='ctx'> 	clockevents_calc_mult_shift(&amp;ckevt_pxa_osmr0, clock_tick_rate, 4);</div><div class='ctx'> 	ckevt_pxa_osmr0.max_delta_ns =</div><div class='head'>diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c<br/>index 402b0c96613b..4d4eb60bad1e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/tosa.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/tosa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/tosa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/tosa.c</a></div><div class='hunk'>@@ -404,8 +404,8 @@ static struct pda_power_pdata tosa_power_data = {</div><div class='ctx'> static struct resource tosa_power_resource[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name		= "ac",</div><div class='del'>-		.start		= gpio_to_irq(TOSA_GPIO_AC_IN),</div><div class='del'>-		.end		= gpio_to_irq(TOSA_GPIO_AC_IN),</div><div class='add'>+		.start		= PXA_GPIO_TO_IRQ(TOSA_GPIO_AC_IN),</div><div class='add'>+		.end		= PXA_GPIO_TO_IRQ(TOSA_GPIO_AC_IN),</div><div class='ctx'> 		.flags		= IORESOURCE_IRQ |</div><div class='ctx'> 				  IORESOURCE_IRQ_HIGHEDGE |</div><div class='ctx'> 				  IORESOURCE_IRQ_LOWEDGE,</div><div class='hunk'>@@ -889,6 +889,11 @@ static struct platform_device wm9712_device = {</div><div class='ctx'> 	.id	= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct platform_device tosa_audio_device = {</div><div class='add'>+	.name	= "tosa-audio",</div><div class='add'>+	.id	= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device *devices[] __initdata = {</div><div class='ctx'> 	&amp;tosascoop_device,</div><div class='ctx'> 	&amp;tosascoop_jc_device,</div><div class='hunk'>@@ -901,11 +906,12 @@ static struct platform_device *devices[] __initdata = {</div><div class='ctx'> 	&amp;sharpsl_rom_device,</div><div class='ctx'> 	&amp;wm9712_device,</div><div class='ctx'> 	&amp;tosa_gpio_vbus,</div><div class='add'>+	&amp;tosa_audio_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void tosa_poweroff(void)</div><div class='ctx'> {</div><div class='del'>-	arm_machine_restart('g', NULL);</div><div class='add'>+	pxa_restart('g', NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tosa_restart(char mode, const char *cmd)</div><div class='hunk'>@@ -935,7 +941,6 @@ static void __init tosa_init(void)</div><div class='ctx'> 	init_gpio_reset(TOSA_GPIO_ON_RESET, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	pm_power_off = tosa_poweroff;</div><div class='del'>-	arm_pm_restart = tosa_restart;</div><div class='ctx'> </div><div class='ctx'> 	PCFR |= PCFR_OPDE;</div><div class='ctx'> </div><div class='hunk'>@@ -970,6 +975,7 @@ static void __init fixup_tosa(struct tag *tags, char **cmdline,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(TOSA, "SHARP Tosa")</div><div class='add'>+	.restart_mode	= 'g',</div><div class='ctx'> 	.fixup          = fixup_tosa,</div><div class='ctx'> 	.map_io         = pxa25x_map_io,</div><div class='ctx'> 	.nr_irqs	= TOSA_NR_IRQS,</div><div class='hunk'>@@ -977,4 +983,5 @@ MACHINE_START(TOSA, "SHARP Tosa")</div><div class='ctx'> 	.handle_irq       = pxa25x_handle_irq,</div><div class='ctx'> 	.init_machine   = tosa_init,</div><div class='ctx'> 	.timer          = &amp;pxa_timer,</div><div class='add'>+	.restart	= tosa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c<br/>index 1aaed2b17e10..0f30af617d8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/trizeps4.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/trizeps4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/trizeps4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/trizeps4.c</a></div><div class='hunk'>@@ -561,6 +561,7 @@ MACHINE_START(TRIZEPS4, "Keith und Koep Trizeps IV module")</div><div class='ctx'> 	.init_irq	= pxa27x_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(TRIZEPS4WL, "Keith und Koep Trizeps IV-WL module")</div><div class='hunk'>@@ -571,4 +572,5 @@ MACHINE_START(TRIZEPS4WL, "Keith und Koep Trizeps IV-WL module")</div><div class='ctx'> 	.init_irq	= pxa27x_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c<br/>index 242ddae332d3..023d6ca789de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/viper.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/viper.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/viper.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/viper.c</a></div><div class='hunk'>@@ -422,8 +422,8 @@ static struct resource smc91x_resources[] = {</div><div class='ctx'> 		.flags  = IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start  = gpio_to_irq(VIPER_ETH_GPIO),</div><div class='del'>-		.end    = gpio_to_irq(VIPER_ETH_GPIO),</div><div class='add'>+		.start  = PXA_GPIO_TO_IRQ(VIPER_ETH_GPIO),</div><div class='add'>+		.end    = PXA_GPIO_TO_IRQ(VIPER_ETH_GPIO),</div><div class='ctx'> 		.flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='ctx'> 	},</div><div class='ctx'> 	[2] = {</div><div class='hunk'>@@ -546,7 +546,7 @@ static struct plat_serial8250_port serial_platform_data[] = {</div><div class='ctx'> 	/* External UARTs */</div><div class='ctx'> 	{</div><div class='ctx'> 		.mapbase	= VIPER_UARTA_PHYS,</div><div class='del'>-		.irq		= gpio_to_irq(VIPER_UARTA_GPIO),</div><div class='add'>+		.irq		= PXA_GPIO_TO_IRQ(VIPER_UARTA_GPIO),</div><div class='ctx'> 		.irqflags	= IRQF_TRIGGER_RISING,</div><div class='ctx'> 		.uartclk	= 1843200,</div><div class='ctx'> 		.regshift	= 1,</div><div class='hunk'>@@ -556,7 +556,7 @@ static struct plat_serial8250_port serial_platform_data[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.mapbase	= VIPER_UARTB_PHYS,</div><div class='del'>-		.irq		= gpio_to_irq(VIPER_UARTB_GPIO),</div><div class='add'>+		.irq		= PXA_GPIO_TO_IRQ(VIPER_UARTB_GPIO),</div><div class='ctx'> 		.irqflags	= IRQF_TRIGGER_RISING,</div><div class='ctx'> 		.uartclk	= 1843200,</div><div class='ctx'> 		.regshift	= 1,</div><div class='hunk'>@@ -596,8 +596,8 @@ static struct resource isp116x_resources[] = {</div><div class='ctx'> 		.flags  = IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[2] = {</div><div class='del'>-		.start  = gpio_to_irq(VIPER_USB_GPIO),</div><div class='del'>-		.end    = gpio_to_irq(VIPER_USB_GPIO),</div><div class='add'>+		.start  = PXA_GPIO_TO_IRQ(VIPER_USB_GPIO),</div><div class='add'>+		.end    = PXA_GPIO_TO_IRQ(VIPER_USB_GPIO),</div><div class='ctx'> 		.flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -998,4 +998,5 @@ MACHINE_START(VIPER, "Arcom/Eurotech VIPER SBC")</div><div class='ctx'> 	.handle_irq	= pxa25x_handle_irq,</div><div class='ctx'> 	.timer          = &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= viper_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c<br/>index ca0c6615028c..1f5cfa96f6d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/vpac270.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/vpac270.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/vpac270.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/vpac270.c</a></div><div class='hunk'>@@ -395,8 +395,8 @@ static struct resource vpac270_dm9000_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[2] = {</div><div class='del'>-		.start	= IRQ_GPIO(GPIO114_VPAC270_ETH_IRQ),</div><div class='del'>-		.end	= IRQ_GPIO(GPIO114_VPAC270_ETH_IRQ),</div><div class='add'>+		.start	= PXA_GPIO_TO_IRQ(GPIO114_VPAC270_ETH_IRQ),</div><div class='add'>+		.end	= PXA_GPIO_TO_IRQ(GPIO114_VPAC270_ETH_IRQ),</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -433,7 +433,7 @@ static pxa2xx_audio_ops_t vpac270_ac97_pdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ucb1400_pdata vpac270_ucb1400_pdata = {</div><div class='del'>-	.irq		= IRQ_GPIO(GPIO113_VPAC270_TS_IRQ),</div><div class='add'>+	.irq		= PXA_GPIO_TO_IRQ(GPIO113_VPAC270_TS_IRQ),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device vpac270_ucb1400_device = {</div><div class='hunk'>@@ -610,8 +610,8 @@ static struct resource vpac270_ide_resources[] = {</div><div class='ctx'> 	       .flags	= IORESOURCE_DMA</div><div class='ctx'> 	},</div><div class='ctx'> 	[3] = {	/* IDE IRQ pin */</div><div class='del'>-	       .start	= gpio_to_irq(GPIO36_VPAC270_IDE_IRQ),</div><div class='del'>-	       .end	= gpio_to_irq(GPIO36_VPAC270_IDE_IRQ),</div><div class='add'>+	       .start	= PXA_GPIO_TO_IRQ(GPIO36_VPAC270_IDE_IRQ),</div><div class='add'>+	       .end	= PXA_GPIO_TO_IRQ(GPIO36_VPAC270_IDE_IRQ),</div><div class='ctx'> 	       .flags	= IORESOURCE_IRQ</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='hunk'>@@ -721,5 +721,6 @@ MACHINE_START(VPAC270, "Voipac PXA270")</div><div class='ctx'> 	.init_irq	= pxa27x_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='del'>-	.init_machine	= vpac270_init</div><div class='add'>+	.init_machine	= vpac270_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/xcep.c b/arch/arm/mach-pxa/xcep.c<br/>index 70e1730ef282..4bbe9a36fe74 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/xcep.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/xcep.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/xcep.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/xcep.c</a></div><div class='hunk'>@@ -185,5 +185,6 @@ MACHINE_START(XCEP, "Iskratel XCEP")</div><div class='ctx'> 	.init_irq	= pxa25x_init_irq,</div><div class='ctx'> 	.handle_irq	= pxa25x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c<br/>index ead32c90fec1..b6476848b561 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/z2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/z2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/z2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/z2.c</a></div><div class='hunk'>@@ -573,7 +573,7 @@ static struct spi_board_info spi_board_info[] __initdata = {</div><div class='ctx'> 	.modalias		= "libertas_spi",</div><div class='ctx'> 	.platform_data		= &amp;z2_lbs_pdata,</div><div class='ctx'> 	.controller_data	= &amp;z2_lbs_chip_info,</div><div class='del'>-	.irq			= gpio_to_irq(GPIO36_ZIPITZ2_WIFI_IRQ),</div><div class='add'>+	.irq			= PXA_GPIO_TO_IRQ(GPIO36_ZIPITZ2_WIFI_IRQ),</div><div class='ctx'> 	.max_speed_hz		= 13000000,</div><div class='ctx'> 	.bus_num		= 1,</div><div class='ctx'> 	.chip_select		= 0,</div><div class='hunk'>@@ -725,4 +725,5 @@ MACHINE_START(ZIPIT2, "Zipit Z2")</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= z2_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c<br/>index 498b83b089f3..a4dd1c347050 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/zeus.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/zeus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/zeus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/zeus.c</a></div><div class='hunk'>@@ -233,7 +233,7 @@ static struct plat_serial8250_port serial_platform_data[] = {</div><div class='ctx'> 	/* FIXME: Shared IRQs on COM1-COM4 will not work properly on v1i1 hardware. */</div><div class='ctx'> 	{ /* COM1 */</div><div class='ctx'> 		.mapbase	= 0x10000000,</div><div class='del'>-		.irq		= gpio_to_irq(ZEUS_UARTA_GPIO),</div><div class='add'>+		.irq		= PXA_GPIO_TO_IRQ(ZEUS_UARTA_GPIO),</div><div class='ctx'> 		.irqflags	= IRQF_TRIGGER_RISING,</div><div class='ctx'> 		.uartclk	= 14745600,</div><div class='ctx'> 		.regshift	= 1,</div><div class='hunk'>@@ -242,7 +242,7 @@ static struct plat_serial8250_port serial_platform_data[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{ /* COM2 */</div><div class='ctx'> 		.mapbase	= 0x10800000,</div><div class='del'>-		.irq		= gpio_to_irq(ZEUS_UARTB_GPIO),</div><div class='add'>+		.irq		= PXA_GPIO_TO_IRQ(ZEUS_UARTB_GPIO),</div><div class='ctx'> 		.irqflags	= IRQF_TRIGGER_RISING,</div><div class='ctx'> 		.uartclk	= 14745600,</div><div class='ctx'> 		.regshift	= 1,</div><div class='hunk'>@@ -251,7 +251,7 @@ static struct plat_serial8250_port serial_platform_data[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{ /* COM3 */</div><div class='ctx'> 		.mapbase	= 0x11000000,</div><div class='del'>-		.irq		= gpio_to_irq(ZEUS_UARTC_GPIO),</div><div class='add'>+		.irq		= PXA_GPIO_TO_IRQ(ZEUS_UARTC_GPIO),</div><div class='ctx'> 		.irqflags	= IRQF_TRIGGER_RISING,</div><div class='ctx'> 		.uartclk	= 14745600,</div><div class='ctx'> 		.regshift	= 1,</div><div class='hunk'>@@ -260,7 +260,7 @@ static struct plat_serial8250_port serial_platform_data[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{ /* COM4 */</div><div class='ctx'> 		.mapbase	= 0x11800000,</div><div class='del'>-		.irq		= gpio_to_irq(ZEUS_UARTD_GPIO),</div><div class='add'>+		.irq		= PXA_GPIO_TO_IRQ(ZEUS_UARTD_GPIO),</div><div class='ctx'> 		.irqflags	= IRQF_TRIGGER_RISING,</div><div class='ctx'> 		.uartclk	= 14745600,</div><div class='ctx'> 		.regshift	= 1,</div><div class='hunk'>@@ -321,8 +321,8 @@ static struct resource zeus_dm9k0_resource[] = {</div><div class='ctx'> 		.flags = IORESOURCE_MEM</div><div class='ctx'> 	},</div><div class='ctx'> 	[2] = {</div><div class='del'>-		.start = gpio_to_irq(ZEUS_ETH0_GPIO),</div><div class='del'>-		.end   = gpio_to_irq(ZEUS_ETH0_GPIO),</div><div class='add'>+		.start = PXA_GPIO_TO_IRQ(ZEUS_ETH0_GPIO),</div><div class='add'>+		.end   = PXA_GPIO_TO_IRQ(ZEUS_ETH0_GPIO),</div><div class='ctx'> 		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -339,8 +339,8 @@ static struct resource zeus_dm9k1_resource[] = {</div><div class='ctx'> 		.flags = IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[2] = {</div><div class='del'>-		.start = gpio_to_irq(ZEUS_ETH1_GPIO),</div><div class='del'>-		.end   = gpio_to_irq(ZEUS_ETH1_GPIO),</div><div class='add'>+		.start = PXA_GPIO_TO_IRQ(ZEUS_ETH1_GPIO),</div><div class='add'>+		.end   = PXA_GPIO_TO_IRQ(ZEUS_ETH1_GPIO),</div><div class='ctx'> 		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -423,7 +423,7 @@ static struct spi_board_info zeus_spi_board_info[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.modalias	= "mcp2515",</div><div class='ctx'> 		.platform_data	= &amp;zeus_mcp2515_pdata,</div><div class='del'>-		.irq		= gpio_to_irq(ZEUS_CAN_GPIO),</div><div class='add'>+		.irq		= PXA_GPIO_TO_IRQ(ZEUS_CAN_GPIO),</div><div class='ctx'> 		.max_speed_hz	= 1*1000*1000,</div><div class='ctx'> 		.bus_num	= 3,</div><div class='ctx'> 		.mode		= SPI_MODE_0,</div><div class='hunk'>@@ -753,7 +753,7 @@ static struct i2c_board_info __initdata zeus_i2c_devices[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		I2C_BOARD_INFO("pca9535",	0x20),</div><div class='ctx'> 		.platform_data	= &amp;zeus_pca953x_pdata[2],</div><div class='del'>-		.irq		= gpio_to_irq(ZEUS_EXTGPIO_GPIO),</div><div class='add'>+		.irq		= PXA_GPIO_TO_IRQ(ZEUS_EXTGPIO_GPIO),</div><div class='ctx'> 	},</div><div class='ctx'> 	{ I2C_BOARD_INFO("lm75a",	0x48) },</div><div class='ctx'> 	{ I2C_BOARD_INFO("24c01",	0x50) },</div><div class='hunk'>@@ -911,5 +911,6 @@ MACHINE_START(ARCOM_ZEUS, "Arcom/Eurotech ZEUS")</div><div class='ctx'> 	.handle_irq	= pxa27x_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= zeus_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c<br/>index 6c39c3328418..98eec80623e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/zylonite.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/zylonite.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/zylonite.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/zylonite.c</a></div><div class='hunk'>@@ -408,8 +408,8 @@ static void __init zylonite_init(void)</div><div class='ctx'> 	 * Note: We depend that the bootloader set</div><div class='ctx'> 	 * the correct value to MSC register for SMC91x.</div><div class='ctx'> 	 */</div><div class='del'>-	smc91x_resources[1].start = gpio_to_irq(gpio_eth_irq);</div><div class='del'>-	smc91x_resources[1].end   = gpio_to_irq(gpio_eth_irq);</div><div class='add'>+	smc91x_resources[1].start = PXA_GPIO_TO_IRQ(gpio_eth_irq);</div><div class='add'>+	smc91x_resources[1].end   = PXA_GPIO_TO_IRQ(gpio_eth_irq);</div><div class='ctx'> 	platform_device_register(&amp;smc91x_device);</div><div class='ctx'> </div><div class='ctx'> 	pxa_set_ac97_info(NULL);</div><div class='hunk'>@@ -430,4 +430,5 @@ MACHINE_START(ZYLONITE, "PXA3xx Platform Development Kit (aka Zylonite)")</div><div class='ctx'> 	.handle_irq	= pxa3xx_handle_irq,</div><div class='ctx'> 	.timer		= &amp;pxa_timer,</div><div class='ctx'> 	.init_machine	= zylonite_init,</div><div class='add'>+	.restart	= pxa_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c<br/>index 93c64d8d7de9..86e59c043de2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/zylonite_pxa300.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-pxa/zylonite_pxa300.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/zylonite_pxa300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-pxa/zylonite_pxa300.c</a></div><div class='hunk'>@@ -231,12 +231,12 @@ static struct i2c_board_info zylonite_i2c_board_info[] = {</div><div class='ctx'> 		.type		= "pca9539",</div><div class='ctx'> 		.addr		= 0x74,</div><div class='ctx'> 		.platform_data	= &amp;gpio_exp[0],</div><div class='del'>-		.irq		= IRQ_GPIO(18),</div><div class='add'>+		.irq		= PXA_GPIO_TO_IRQ(18),</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.type		= "pca9539",</div><div class='ctx'> 		.addr		= 0x75,</div><div class='ctx'> 		.platform_data	= &amp;gpio_exp[1],</div><div class='del'>-		.irq		= IRQ_GPIO(19),</div><div class='add'>+		.irq		= PXA_GPIO_TO_IRQ(19),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig<br/>index dba6d0c1fc17..c593be428b8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-realview/Kconfig</a></div><div class='hunk'>@@ -12,6 +12,8 @@ config REALVIEW_EB_A9MP</div><div class='ctx'> 	bool "Support Multicore Cortex-A9 Tile"</div><div class='ctx'> 	depends on MACH_REALVIEW_EB</div><div class='ctx'> 	select CPU_V7</div><div class='add'>+	select HAVE_SMP</div><div class='add'>+	select MIGHT_HAVE_CACHE_L2X0</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable support for the Cortex-A9MPCore tile fitted to the</div><div class='ctx'> 	  Realview(R) Emulation Baseboard platform.</div><div class='hunk'>@@ -21,6 +23,8 @@ config REALVIEW_EB_ARM11MP</div><div class='ctx'> 	depends on MACH_REALVIEW_EB</div><div class='ctx'> 	select CPU_V6K</div><div class='ctx'> 	select ARCH_HAS_BARRIERS if SMP</div><div class='add'>+	select HAVE_SMP</div><div class='add'>+	select MIGHT_HAVE_CACHE_L2X0</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable support for the ARM11MPCore tile fitted to the Realview(R)</div><div class='ctx'> 	  Emulation Baseboard platform.</div><div class='hunk'>@@ -39,6 +43,8 @@ config MACH_REALVIEW_PB11MP</div><div class='ctx'> 	select CPU_V6K</div><div class='ctx'> 	select ARM_GIC</div><div class='ctx'> 	select HAVE_PATA_PLATFORM</div><div class='add'>+	select HAVE_SMP</div><div class='add'>+	select MIGHT_HAVE_CACHE_L2X0</div><div class='ctx'> 	select ARCH_HAS_BARRIERS if SMP</div><div class='ctx'> 	help</div><div class='ctx'> 	  Include support for the ARM(R) RealView(R) Platform Baseboard for</div><div class='hunk'>@@ -51,6 +57,7 @@ config MACH_REALVIEW_PB1176</div><div class='ctx'> 	select CPU_V6</div><div class='ctx'> 	select ARM_GIC</div><div class='ctx'> 	select HAVE_TCM</div><div class='add'>+	select MIGHT_HAVE_CACHE_L2X0</div><div class='ctx'> 	help</div><div class='ctx'> 	  Include support for the ARM(R) RealView(R) Platform Baseboard for</div><div class='ctx'> 	  ARM1176JZF-S.</div><div class='hunk'>@@ -78,6 +85,8 @@ config MACH_REALVIEW_PBX</div><div class='ctx'> 	bool "Support RealView(R) Platform Baseboard Explore"</div><div class='ctx'> 	select ARM_GIC</div><div class='ctx'> 	select HAVE_PATA_PLATFORM</div><div class='add'>+	select HAVE_SMP</div><div class='add'>+	select MIGHT_HAVE_CACHE_L2X0</div><div class='ctx'> 	select ARCH_SPARSEMEM_ENABLE if CPU_V7 &amp;&amp; !REALVIEW_HIGH_PHYS_OFFSET</div><div class='ctx'> 	select ZONE_DMA if SPARSEMEM</div><div class='ctx'> 	help</div><div class='head'>diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c<br/>index d5ed5d4f77d6..acd329afc3ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-realview/core.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/clcd.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h<br/>index 47259c89a75e..735b57aaf2d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/core.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/core.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-realview/core.h</a></div><div class='hunk'>@@ -65,6 +65,5 @@ extern int realview_usb_register(struct resource *res);</div><div class='ctx'> extern void realview_init_early(void);</div><div class='ctx'> extern void realview_fixup(struct tag *tags, char **from,</div><div class='ctx'> 			   struct meminfo *meminfo);</div><div class='del'>-extern void (*realview_reset)(char);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-realview/include/mach/entry-macro.S b/arch/arm/mach-realview/include/mach/entry-macro.S<br/>index 4071164aebaa..e8a5179c2653 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-realview/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -7,8 +7,6 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/hardware/entry-macro-gic.S&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='head'>diff --git a/arch/arm/mach-realview/include/mach/system.h b/arch/arm/mach-realview/include/mach/system.h<br/>index 6657ff231161..471b671159ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-realview/include/mach/system.h</a></div><div class='hunk'>@@ -21,12 +21,6 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/platform.h&gt;</div><div class='del'>-</div><div class='del'>-void (*realview_reset)(char mode);</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -36,15 +30,4 @@ static inline void arch_idle(void)</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * To reset, we hit the on-board reset register</div><div class='del'>-	 * in the system FPGA</div><div class='del'>-	 */</div><div class='del'>-	if (realview_reset)</div><div class='del'>-		realview_reset(mode);</div><div class='del'>-	dsb();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-realview/include/mach/vmalloc.h b/arch/arm/mach-realview/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index a2a4c6861407..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  arch/arm/mach-realview/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2003 ARM Limited</div><div class='del'>- *  Copyright (C) 2000 Russell King.</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='del'>-#define VMALLOC_END		0xf8000000UL</div><div class='head'>diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c<br/>index e83c654a58d0..17c878ddbc70 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/platsmp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/platsmp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/platsmp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-realview/platsmp.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/smp_scu.h&gt;</div><div class='del'>-#include &lt;asm/unified.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/board-eb.h&gt;</div><div class='ctx'> #include &lt;mach/board-pb11mp.h&gt;</div><div class='hunk'>@@ -75,6 +74,6 @@ void __init platform_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	 * until it receives a soft interrupt, and then the</div><div class='ctx'> 	 * secondary CPU branches to this address.</div><div class='ctx'> 	 */</div><div class='del'>-	__raw_writel(BSYM(virt_to_phys(versatile_secondary_startup)),</div><div class='add'>+	__raw_writel(virt_to_phys(versatile_secondary_startup),</div><div class='ctx'> 		     __io_address(REALVIEW_SYS_FLAGSSET));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c<br/>index 026c66ad7ec2..e62962117763 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/realview_eb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/realview_eb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/realview_eb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-realview/realview_eb.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/pl061.h&gt;</div><div class='ctx'> #include &lt;linux/amba/mmci.h&gt;</div><div class='hunk'>@@ -91,8 +91,8 @@ static struct map_desc realview_eb_io_desc[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> static struct map_desc realview_eb11mp_io_desc[] __initdata = {</div><div class='ctx'> 	{</div><div class='del'>-		.virtual	= IO_ADDRESS(REALVIEW_EB11MP_GIC_CPU_BASE),</div><div class='del'>-		.pfn		= __phys_to_pfn(REALVIEW_EB11MP_GIC_CPU_BASE),</div><div class='add'>+		.virtual	= IO_ADDRESS(REALVIEW_EB11MP_SCU_BASE),</div><div class='add'>+		.pfn		= __phys_to_pfn(REALVIEW_EB11MP_SCU_BASE),</div><div class='ctx'> 		.length		= SZ_4K,</div><div class='ctx'> 		.type		= MT_DEVICE,</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -117,17 +117,14 @@ static void __init realview_eb_map_io(void)</div><div class='ctx'> </div><div class='ctx'> static struct pl061_platform_data gpio0_plat_data = {</div><div class='ctx'> 	.gpio_base	= 0,</div><div class='del'>-	.irq_base	= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pl061_platform_data gpio1_plat_data = {</div><div class='ctx'> 	.gpio_base	= 8,</div><div class='del'>-	.irq_base	= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pl061_platform_data gpio2_plat_data = {</div><div class='ctx'> 	.gpio_base	= 16,</div><div class='del'>-	.irq_base	= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pl022_ssp_controller ssp0_plat_data = {</div><div class='hunk'>@@ -415,7 +412,7 @@ static struct sys_timer realview_eb_timer = {</div><div class='ctx'> 	.init		= realview_eb_timer_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void realview_eb_reset(char mode)</div><div class='add'>+static void realview_eb_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL);</div><div class='ctx'> 	void __iomem *lock_ctrl = __io_address(REALVIEW_SYS_LOCK);</div><div class='hunk'>@@ -427,6 +424,7 @@ static void realview_eb_reset(char mode)</div><div class='ctx'> 	__raw_writel(REALVIEW_SYS_LOCK_VAL, lock_ctrl);</div><div class='ctx'> 	if (core_tile_eb11mp())</div><div class='ctx'> 		__raw_writel(0x0008, reset_ctrl);</div><div class='add'>+	dsb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init realview_eb_init(void)</div><div class='hunk'>@@ -458,7 +456,6 @@ static void __init realview_eb_init(void)</div><div class='ctx'> #ifdef CONFIG_LEDS</div><div class='ctx'> 	leds_event = realview_leds_event;</div><div class='ctx'> #endif</div><div class='del'>-	realview_reset = realview_eb_reset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(REALVIEW_EB, "ARM-RealView EB")</div><div class='hunk'>@@ -469,8 +466,10 @@ MACHINE_START(REALVIEW_EB, "ARM-RealView EB")</div><div class='ctx'> 	.init_early	= realview_init_early,</div><div class='ctx'> 	.init_irq	= gic_init_irq,</div><div class='ctx'> 	.timer		= &amp;realview_eb_timer,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= realview_eb_init,</div><div class='ctx'> #ifdef CONFIG_ZONE_DMA</div><div class='ctx'> 	.dma_zone_size	= SZ_256M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= realview_eb_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c<br/>index c057540ec776..e4abe94fb11a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/realview_pb1176.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/realview_pb1176.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/realview_pb1176.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-realview/realview_pb1176.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/pl061.h&gt;</div><div class='ctx'> #include &lt;linux/amba/mmci.h&gt;</div><div class='hunk'>@@ -113,17 +113,14 @@ static void __init realview_pb1176_map_io(void)</div><div class='ctx'> </div><div class='ctx'> static struct pl061_platform_data gpio0_plat_data = {</div><div class='ctx'> 	.gpio_base	= 0,</div><div class='del'>-	.irq_base	= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pl061_platform_data gpio1_plat_data = {</div><div class='ctx'> 	.gpio_base	= 8,</div><div class='del'>-	.irq_base	= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pl061_platform_data gpio2_plat_data = {</div><div class='ctx'> 	.gpio_base	= 16,</div><div class='del'>-	.irq_base	= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pl022_ssp_controller ssp0_plat_data = {</div><div class='hunk'>@@ -336,12 +333,13 @@ static struct sys_timer realview_pb1176_timer = {</div><div class='ctx'> 	.init		= realview_pb1176_timer_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void realview_pb1176_reset(char mode)</div><div class='add'>+static void realview_pb1176_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL);</div><div class='ctx'> 	void __iomem *lock_ctrl = __io_address(REALVIEW_SYS_LOCK);</div><div class='ctx'> 	__raw_writel(REALVIEW_SYS_LOCK_VAL, lock_ctrl);</div><div class='ctx'> 	__raw_writel(REALVIEW_PB1176_SYS_SOFT_RESET, reset_ctrl);</div><div class='add'>+	dsb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void realview_pb1176_fixup(struct tag *tags, char **from,</div><div class='hunk'>@@ -381,7 +379,6 @@ static void __init realview_pb1176_init(void)</div><div class='ctx'> #ifdef CONFIG_LEDS</div><div class='ctx'> 	leds_event = realview_leds_event;</div><div class='ctx'> #endif</div><div class='del'>-	realview_reset = realview_pb1176_reset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(REALVIEW_PB1176, "ARM-RealView PB1176")</div><div class='hunk'>@@ -392,8 +389,10 @@ MACHINE_START(REALVIEW_PB1176, "ARM-RealView PB1176")</div><div class='ctx'> 	.init_early	= realview_init_early,</div><div class='ctx'> 	.init_irq	= gic_init_irq,</div><div class='ctx'> 	.timer		= &amp;realview_pb1176_timer,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= realview_pb1176_init,</div><div class='ctx'> #ifdef CONFIG_ZONE_DMA</div><div class='ctx'> 	.dma_zone_size	= SZ_256M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= realview_pb1176_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c<br/>index 671ad6d6ff00..127a3fd42ab1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/realview_pb11mp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/realview_pb11mp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/realview_pb11mp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-realview/realview_pb11mp.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/pl061.h&gt;</div><div class='ctx'> #include &lt;linux/amba/mmci.h&gt;</div><div class='hunk'>@@ -112,17 +112,14 @@ static void __init realview_pb11mp_map_io(void)</div><div class='ctx'> </div><div class='ctx'> static struct pl061_platform_data gpio0_plat_data = {</div><div class='ctx'> 	.gpio_base	= 0,</div><div class='del'>-	.irq_base	= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pl061_platform_data gpio1_plat_data = {</div><div class='ctx'> 	.gpio_base	= 8,</div><div class='del'>-	.irq_base	= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pl061_platform_data gpio2_plat_data = {</div><div class='ctx'> 	.gpio_base	= 16,</div><div class='del'>-	.irq_base	= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pl022_ssp_controller ssp0_plat_data = {</div><div class='hunk'>@@ -315,7 +312,7 @@ static struct sys_timer realview_pb11mp_timer = {</div><div class='ctx'> 	.init		= realview_pb11mp_timer_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void realview_pb11mp_reset(char mode)</div><div class='add'>+static void realview_pb11mp_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL);</div><div class='ctx'> 	void __iomem *lock_ctrl = __io_address(REALVIEW_SYS_LOCK);</div><div class='hunk'>@@ -327,6 +324,7 @@ static void realview_pb11mp_reset(char mode)</div><div class='ctx'> 	__raw_writel(REALVIEW_SYS_LOCK_VAL, lock_ctrl);</div><div class='ctx'> 	__raw_writel(0x0000, reset_ctrl);</div><div class='ctx'> 	__raw_writel(0x0004, reset_ctrl);</div><div class='add'>+	dsb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init realview_pb11mp_init(void)</div><div class='hunk'>@@ -355,7 +353,6 @@ static void __init realview_pb11mp_init(void)</div><div class='ctx'> #ifdef CONFIG_LEDS</div><div class='ctx'> 	leds_event = realview_leds_event;</div><div class='ctx'> #endif</div><div class='del'>-	realview_reset = realview_pb11mp_reset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(REALVIEW_PB11MP, "ARM-RealView PB11MPCore")</div><div class='hunk'>@@ -366,8 +363,10 @@ MACHINE_START(REALVIEW_PB11MP, "ARM-RealView PB11MPCore")</div><div class='ctx'> 	.init_early	= realview_init_early,</div><div class='ctx'> 	.init_irq	= gic_init_irq,</div><div class='ctx'> 	.timer		= &amp;realview_pb11mp_timer,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= realview_pb11mp_init,</div><div class='ctx'> #ifdef CONFIG_ZONE_DMA</div><div class='ctx'> 	.dma_zone_size	= SZ_256M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= realview_pb11mp_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c<br/>index cbf22df4ad5b..25b2e59296f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/realview_pba8.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/realview_pba8.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/realview_pba8.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-realview/realview_pba8.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/pl061.h&gt;</div><div class='ctx'> #include &lt;linux/amba/mmci.h&gt;</div><div class='hunk'>@@ -102,17 +102,14 @@ static void __init realview_pba8_map_io(void)</div><div class='ctx'> </div><div class='ctx'> static struct pl061_platform_data gpio0_plat_data = {</div><div class='ctx'> 	.gpio_base	= 0,</div><div class='del'>-	.irq_base	= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pl061_platform_data gpio1_plat_data = {</div><div class='ctx'> 	.gpio_base	= 8,</div><div class='del'>-	.irq_base	= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pl061_platform_data gpio2_plat_data = {</div><div class='ctx'> 	.gpio_base	= 16,</div><div class='del'>-	.irq_base	= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pl022_ssp_controller ssp0_plat_data = {</div><div class='hunk'>@@ -271,7 +268,7 @@ static struct sys_timer realview_pba8_timer = {</div><div class='ctx'> 	.init		= realview_pba8_timer_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void realview_pba8_reset(char mode)</div><div class='add'>+static void realview_pba8_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL);</div><div class='ctx'> 	void __iomem *lock_ctrl = __io_address(REALVIEW_SYS_LOCK);</div><div class='hunk'>@@ -283,6 +280,7 @@ static void realview_pba8_reset(char mode)</div><div class='ctx'> 	__raw_writel(REALVIEW_SYS_LOCK_VAL, lock_ctrl);</div><div class='ctx'> 	__raw_writel(0x0000, reset_ctrl);</div><div class='ctx'> 	__raw_writel(0x0004, reset_ctrl);</div><div class='add'>+	dsb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init realview_pba8_init(void)</div><div class='hunk'>@@ -305,7 +303,6 @@ static void __init realview_pba8_init(void)</div><div class='ctx'> #ifdef CONFIG_LEDS</div><div class='ctx'> 	leds_event = realview_leds_event;</div><div class='ctx'> #endif</div><div class='del'>-	realview_reset = realview_pba8_reset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8")</div><div class='hunk'>@@ -316,8 +313,10 @@ MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8")</div><div class='ctx'> 	.init_early	= realview_init_early,</div><div class='ctx'> 	.init_irq	= gic_init_irq,</div><div class='ctx'> 	.timer		= &amp;realview_pba8_timer,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= realview_pba8_init,</div><div class='ctx'> #ifdef CONFIG_ZONE_DMA</div><div class='ctx'> 	.dma_zone_size	= SZ_256M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= realview_pba8_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c<br/>index 63c4114afae9..ac715645b860 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/realview_pbx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-realview/realview_pbx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/realview_pbx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-realview/realview_pbx.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/pl061.h&gt;</div><div class='ctx'> #include &lt;linux/amba/mmci.h&gt;</div><div class='hunk'>@@ -98,8 +98,8 @@ static struct map_desc realview_pbx_io_desc[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> static struct map_desc realview_local_io_desc[] __initdata = {</div><div class='ctx'> 	{</div><div class='del'>-		.virtual        = IO_ADDRESS(REALVIEW_PBX_TILE_GIC_CPU_BASE),</div><div class='del'>-		.pfn            = __phys_to_pfn(REALVIEW_PBX_TILE_GIC_CPU_BASE),</div><div class='add'>+		.virtual        = IO_ADDRESS(REALVIEW_PBX_TILE_SCU_BASE),</div><div class='add'>+		.pfn            = __phys_to_pfn(REALVIEW_PBX_TILE_SCU_BASE),</div><div class='ctx'> 		.length         = SZ_4K,</div><div class='ctx'> 		.type           = MT_DEVICE,</div><div class='ctx'> 	}, {</div><div class='hunk'>@@ -124,17 +124,14 @@ static void __init realview_pbx_map_io(void)</div><div class='ctx'> </div><div class='ctx'> static struct pl061_platform_data gpio0_plat_data = {</div><div class='ctx'> 	.gpio_base	= 0,</div><div class='del'>-	.irq_base	= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pl061_platform_data gpio1_plat_data = {</div><div class='ctx'> 	.gpio_base	= 8,</div><div class='del'>-	.irq_base	= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pl061_platform_data gpio2_plat_data = {</div><div class='ctx'> 	.gpio_base	= 16,</div><div class='del'>-	.irq_base	= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pl022_ssp_controller ssp0_plat_data = {</div><div class='hunk'>@@ -339,7 +336,7 @@ static void realview_pbx_fixup(struct tag *tags, char **from,</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void realview_pbx_reset(char mode)</div><div class='add'>+static void realview_pbx_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL);</div><div class='ctx'> 	void __iomem *lock_ctrl = __io_address(REALVIEW_SYS_LOCK);</div><div class='hunk'>@@ -351,6 +348,7 @@ static void realview_pbx_reset(char mode)</div><div class='ctx'> 	__raw_writel(REALVIEW_SYS_LOCK_VAL, lock_ctrl);</div><div class='ctx'> 	__raw_writel(0x00F0, reset_ctrl);</div><div class='ctx'> 	__raw_writel(0x00F4, reset_ctrl);</div><div class='add'>+	dsb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init realview_pbx_init(void)</div><div class='hunk'>@@ -388,7 +386,6 @@ static void __init realview_pbx_init(void)</div><div class='ctx'> #ifdef CONFIG_LEDS</div><div class='ctx'> 	leds_event = realview_leds_event;</div><div class='ctx'> #endif</div><div class='del'>-	realview_reset = realview_pbx_reset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(REALVIEW_PBX, "ARM-RealView PBX")</div><div class='hunk'>@@ -399,8 +396,10 @@ MACHINE_START(REALVIEW_PBX, "ARM-RealView PBX")</div><div class='ctx'> 	.init_early	= realview_init_early,</div><div class='ctx'> 	.init_irq	= gic_init_irq,</div><div class='ctx'> 	.timer		= &amp;realview_pbx_timer,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= realview_pbx_init,</div><div class='ctx'> #ifdef CONFIG_ZONE_DMA</div><div class='ctx'> 	.dma_zone_size	= SZ_256M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= realview_pbx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-rpc/include/mach/system.h b/arch/arm/mach-rpc/include/mach/system.h<br/>index 45c7b935dc45..359bab94b6af 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-rpc/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-rpc/include/mach/system.h</a></div><div class='hunk'>@@ -7,21 +7,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'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/hardware/iomd.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	iomd_writeb(0, IOMD_ROMCR0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Jump into the ROM</div><div class='del'>-	 */</div><div class='del'>-	cpu_reset(0);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-rpc/include/mach/vmalloc.h b/arch/arm/mach-rpc/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index fb700228637a..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-rpc/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  arch/arm/mach-rpc/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 1997 Russell King</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'>-#define VMALLOC_END       0xdc000000UL</div><div class='head'>diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c<br/>index 8559598ab767..3d44a59fc0df 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/riscpc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-rpc/riscpc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/riscpc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-rpc/riscpc.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;asm/elf.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;asm/hardware/iomd.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/domain.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -214,6 +215,16 @@ static int __init rpc_init(void)</div><div class='ctx'> </div><div class='ctx'> arch_initcall(rpc_init);</div><div class='ctx'> </div><div class='add'>+static void rpc_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	iomd_writeb(0, IOMD_ROMCR0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Jump into the ROM</div><div class='add'>+	 */</div><div class='add'>+	soft_restart(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern struct sys_timer ioc_timer;</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(RISCPC, "Acorn-RiscPC")</div><div class='hunk'>@@ -224,4 +235,5 @@ MACHINE_START(RISCPC, "Acorn-RiscPC")</div><div class='ctx'> 	.map_io		= rpc_map_io,</div><div class='ctx'> 	.init_irq	= rpc_init_irq,</div><div class='ctx'> 	.timer		= &amp;ioc_timer,</div><div class='add'>+	.restart	= rpc_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/bast-irq.c b/arch/arm/mach-s3c2410/bast-irq.c<br/>index bc53d2d16d1a..ac7b2ad5c405 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/bast-irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/bast-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/bast-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2410/bast-irq.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</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/ioport.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/common.h b/arch/arm/mach-s3c2410/common.h<br/>new file mode 100644<br/>index 000000000000..f65dc8062961<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2410/common.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * Common Header for S3C2410 machines</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ARCH_ARM_MACH_S3C2410_COMMON_H</div><div class='add'>+#define __ARCH_ARM_MACH_S3C2410_COMMON_H</div><div class='add'>+</div><div class='add'>+void s3c2410_restart(char mode, const char *cmd);</div><div class='add'>+</div><div class='add'>+#endif /* __ARCH_ARM_MACH_S3C2410_COMMON_H */</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/cpu-freq.c b/arch/arm/mach-s3c2410/cpu-freq.c<br/>index 75189df995ae..7dc6c46b5e2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/cpu-freq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/cpu-freq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/cpu-freq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2410/cpu-freq.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='hunk'>@@ -115,24 +115,25 @@ static struct s3c_cpufreq_info s3c2410_cpufreq_info = {</div><div class='ctx'> 	.debug_io_show	= s3c_cpufreq_debugfs_call(s3c2410_iotiming_debugfs),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int s3c2410_cpufreq_add(struct sys_device *sysdev)</div><div class='add'>+static int s3c2410_cpufreq_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return s3c_cpufreq_register(&amp;s3c2410_cpufreq_info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2410_cpufreq_driver = {</div><div class='del'>-	.add		= s3c2410_cpufreq_add,</div><div class='add'>+static struct subsys_interface s3c2410_cpufreq_interface = {</div><div class='add'>+	.name		= "s3c2410_cpufreq",</div><div class='add'>+	.subsys		= &amp;s3c2410_subsys,</div><div class='add'>+	.add_dev	= s3c2410_cpufreq_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2410_cpufreq_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2410_sysclass,</div><div class='del'>-				      &amp;s3c2410_cpufreq_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2410_cpufreq_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2410_cpufreq_init);</div><div class='ctx'> </div><div class='del'>-static int s3c2410a_cpufreq_add(struct sys_device *sysdev)</div><div class='add'>+static int s3c2410a_cpufreq_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* alter the maximum freq settings for S3C2410A. If a board knows</div><div class='ctx'> 	 * it only has a maximum of 200, then it should register its own</div><div class='hunk'>@@ -143,17 +144,18 @@ static int s3c2410a_cpufreq_add(struct sys_device *sysdev)</div><div class='ctx'> 	s3c2410_cpufreq_info.max.pclk =  66500000;</div><div class='ctx'> 	s3c2410_cpufreq_info.name = "s3c2410a";</div><div class='ctx'> </div><div class='del'>-	return s3c2410_cpufreq_add(sysdev);</div><div class='add'>+	return s3c2410_cpufreq_add(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2410a_cpufreq_driver = {</div><div class='del'>-	.add		= s3c2410a_cpufreq_add,</div><div class='add'>+static struct subsys_interface s3c2410a_cpufreq_interface = {</div><div class='add'>+	.name		= "s3c2410a_cpufreq",</div><div class='add'>+	.subsys		= &amp;s3c2410a_subsys,</div><div class='add'>+	.add_dev	= s3c2410a_cpufreq_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2410a_cpufreq_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2410a_sysclass,</div><div class='del'>-				      &amp;s3c2410a_cpufreq_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2410a_cpufreq_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2410a_cpufreq_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c<br/>index dbe43df8cfec..2afd00014a77 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2410/dma.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</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='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='hunk'>@@ -132,7 +132,7 @@ static struct s3c24xx_dma_order __initdata s3c2410_dma_order = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init s3c2410_dma_add(struct sys_device *sysdev)</div><div class='add'>+static int __init s3c2410_dma_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	s3c2410_dma_init();</div><div class='ctx'> 	s3c24xx_dma_order_set(&amp;s3c2410_dma_order);</div><div class='hunk'>@@ -140,24 +140,28 @@ static int __init s3c2410_dma_add(struct sys_device *sysdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_CPU_S3C2410)</div><div class='del'>-static struct sysdev_driver s3c2410_dma_driver = {</div><div class='del'>-	.add	= s3c2410_dma_add,</div><div class='add'>+static struct subsys_interface s3c2410_dma_interface = {</div><div class='add'>+	.name		= "s3c2410_dma",</div><div class='add'>+	.subsys		= &amp;s3c2410_subsys,</div><div class='add'>+	.add_dev	= s3c2410_dma_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2410_dma_drvinit(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2410_sysclass, &amp;s3c2410_dma_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2410_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2410_dma_drvinit);</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2410a_dma_driver = {</div><div class='del'>-	.add	= s3c2410_dma_add,</div><div class='add'>+static struct subsys_interface s3c2410a_dma_interface = {</div><div class='add'>+	.name		= "s3c2410a_dma",</div><div class='add'>+	.subsys		= &amp;s3c2410a_subsys,</div><div class='add'>+	.add_dev	= s3c2410_dma_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2410a_dma_drvinit(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2410a_sysclass, &amp;s3c2410a_dma_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2410a_dma_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2410a_dma_drvinit);</div><div class='hunk'>@@ -165,13 +169,15 @@ arch_initcall(s3c2410a_dma_drvinit);</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_CPU_S3C2442)</div><div class='ctx'> /* S3C2442 DMA contains the same selection table as the S3C2410 */</div><div class='del'>-static struct sysdev_driver s3c2442_dma_driver = {</div><div class='del'>-	.add	= s3c2410_dma_add,</div><div class='add'>+static struct subsys_interface s3c2442_dma_interface = {</div><div class='add'>+	.name		= "s3c2442_dma",</div><div class='add'>+	.subsys		= &amp;s3c2442_subsys,</div><div class='add'>+	.add_dev	= s3c2410_dma_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2442_dma_drvinit(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2442_sysclass, &amp;s3c2442_dma_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2442_dma_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2442_dma_drvinit);</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/include/mach/dma.h b/arch/arm/mach-s3c2410/include/mach/dma.h<br/>index ae8e482b6427..acbdfecd4186 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/dma.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/include/mach/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/dma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2410/include/mach/dma.h</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #ifndef __ASM_ARCH_DMA_H</div><div class='ctx'> #define __ASM_ARCH_DMA_H __FILE__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MAX_DMA_TRANSFER_SIZE   0x100000 /* Data Unit is half word  */</div><div class='ctx'> </div><div class='hunk'>@@ -202,7 +202,7 @@ struct s3c2410_dma_chan {</div><div class='ctx'> 	struct s3c2410_dma_buf	*end;		/* end of queue */</div><div class='ctx'> </div><div class='ctx'> 	/* system device */</div><div class='del'>-	struct sys_device	dev;</div><div class='add'>+	struct device	dev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> typedef unsigned long dma_device_t;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/include/mach/reset.h b/arch/arm/mach-s3c2410/include/mach/reset.h<br/>deleted file mode 100644<br/>index f8c9387b049d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/reset.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/include/mach/reset.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-/* arch/arm/mach-s3c2410/include/mach/reset.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2007 Simtec Electronics</div><div class='del'>- *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='del'>- *	http://armlinux.simtec.co.uk/</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'>- * S3C2410 CPU reset controls</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#ifndef __ASM_ARCH_RESET_H</div><div class='del'>-#define __ASM_ARCH_RESET_H __FILE__</div><div class='del'>-</div><div class='del'>-/* This allows the over-ride of the default reset code</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-extern void (*s3c24xx_reset_hook)(void);</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_ARCH_RESET_H */</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/include/mach/system-reset.h b/arch/arm/mach-s3c2410/include/mach/system-reset.h<br/>deleted file mode 100644<br/>index 6faadcee7729..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/system-reset.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/include/mach/system-reset.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/* arch/arm/mach-s3c2410/include/mach/system-reset.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2008 Simtec Electronics</div><div class='del'>- *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='del'>- *</div><div class='del'>- * S3C2410 - System define for arch_reset() function</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;plat/watchdog-reset.h&gt;</div><div class='del'>-</div><div class='del'>-extern void (*s3c24xx_reset_hook)(void);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	if (mode == 's') {</div><div class='del'>-		cpu_reset(0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (s3c24xx_reset_hook)</div><div class='del'>-		s3c24xx_reset_hook();</div><div class='del'>-</div><div class='del'>-	arch_wdt_reset();</div><div class='del'>-</div><div class='del'>-	/* we'll take a jump through zero as a poor second */</div><div class='del'>-	cpu_reset(0);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/include/mach/system.h b/arch/arm/mach-s3c2410/include/mach/system.h<br/>index a8cbca6701e5..5e215c1a5c8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2410/include/mach/system.h</a></div><div class='hunk'>@@ -15,12 +15,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='ctx'> #include &lt;mach/idle.h&gt;</div><div class='del'>-#include &lt;mach/reset.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> void (*s3c24xx_idle)(void);</div><div class='del'>-void (*s3c24xx_reset_hook)(void);</div><div class='ctx'> </div><div class='ctx'> void s3c24xx_default_idle(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -54,5 +52,3 @@ static void arch_idle(void)</div><div class='ctx'> 	else</div><div class='ctx'> 		s3c24xx_default_idle();</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#include &lt;mach/system-reset.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/include/mach/vmalloc.h b/arch/arm/mach-s3c2410/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 7a311e8dddba..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-/* arch/arm/mach-s3c2410/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * from arch/arm/mach-iop3xx/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2003 Simtec Electronics &lt;linux@simtec.co.uk&gt;</div><div class='del'>- *		      http://www.simtec.co.uk/products/SWLINUX/</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'>- * S3C2410 vmalloc definition</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#ifndef __ASM_ARCH_VMALLOC_H</div><div class='del'>-#define __ASM_ARCH_VMALLOC_H</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END	0xF6000000UL</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_ARCH_VMALLOC_H */</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c<br/>index 79838942b0ac..4220cc60de3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-amlm5900.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/mach-amlm5900.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-amlm5900.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2410/mach-amlm5900.c</a></div><div class='hunk'>@@ -63,6 +63,8 @@</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> static struct resource amlm5900_nor_resource = {</div><div class='ctx'> 		.start = 0x00000000,</div><div class='ctx'> 		.end   = 0x01000000 - 1,</div><div class='hunk'>@@ -241,4 +243,5 @@ MACHINE_START(AML_M5900, "AML_M5900")</div><div class='ctx'> 	.init_irq	= s3c24xx_init_irq,</div><div class='ctx'> 	.init_machine	= amlm5900_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2410_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c<br/>index a20ae1ad4062..feeaf73933dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-bast.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/mach-bast.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-bast.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2410/mach-bast.c</a></div><div class='hunk'>@@ -66,6 +66,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "usb-simtec.h"</div><div class='ctx'> #include "nor-simtec.h"</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #define COPYRIGHT ", Copyright 2004-2008 Simtec Electronics"</div><div class='ctx'> </div><div class='hunk'>@@ -164,22 +165,6 @@ static struct map_desc bast_iodesc[] __initdata = {</div><div class='ctx'> #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB</div><div class='ctx'> #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE</div><div class='ctx'> </div><div class='del'>-static struct s3c24xx_uart_clksrc bast_serial_clocks[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.name		= "uclk",</div><div class='del'>-		.divisor	= 1,</div><div class='del'>-		.min_baud	= 0,</div><div class='del'>-		.max_baud	= 0,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.name		= "pclk",</div><div class='del'>-		.divisor	= 1,</div><div class='del'>-		.min_baud	= 0,</div><div class='del'>-		.max_baud	= 0,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.hwport	     = 0,</div><div class='hunk'>@@ -187,8 +172,6 @@ static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = {</div><div class='ctx'> 		.ucon	     = UCON,</div><div class='ctx'> 		.ulcon	     = ULCON,</div><div class='ctx'> 		.ufcon	     = UFCON,</div><div class='del'>-		.clocks	     = bast_serial_clocks,</div><div class='del'>-		.clocks_size = ARRAY_SIZE(bast_serial_clocks),</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='ctx'> 		.hwport	     = 1,</div><div class='hunk'>@@ -196,8 +179,6 @@ static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = {</div><div class='ctx'> 		.ucon	     = UCON,</div><div class='ctx'> 		.ulcon	     = ULCON,</div><div class='ctx'> 		.ufcon	     = UFCON,</div><div class='del'>-		.clocks	     = bast_serial_clocks,</div><div class='del'>-		.clocks_size = ARRAY_SIZE(bast_serial_clocks),</div><div class='ctx'> 	},</div><div class='ctx'> 	/* port 2 is not actually used */</div><div class='ctx'> 	[2] = {</div><div class='hunk'>@@ -206,8 +187,6 @@ static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = {</div><div class='ctx'> 		.ucon	     = UCON,</div><div class='ctx'> 		.ulcon	     = ULCON,</div><div class='ctx'> 		.ufcon	     = UFCON,</div><div class='del'>-		.clocks	     = bast_serial_clocks,</div><div class='del'>-		.clocks_size = ARRAY_SIZE(bast_serial_clocks),</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -662,4 +641,5 @@ MACHINE_START(BAST, "Simtec-BAST")</div><div class='ctx'> 	.init_irq	= s3c24xx_init_irq,</div><div class='ctx'> 	.init_machine	= bast_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2410_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c<br/>index 05a7d16e59f5..41245a603981 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-h1940.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/mach-h1940.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-h1940.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2410/mach-h1940.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.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'>@@ -70,6 +70,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/uda1380.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> #define H1940_LATCH		((void __force __iomem *)0xF8000000)</div><div class='ctx'> </div><div class='ctx'> #define H1940_PA_LATCH		S3C2410_CS2</div><div class='hunk'>@@ -751,4 +753,5 @@ MACHINE_START(H1940, "IPAQ-H1940")</div><div class='ctx'> 	.init_irq	= h1940_init_irq,</div><div class='ctx'> 	.init_machine	= h1940_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2410_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c<br/>index 1dc3e3234417..383d00ca8f60 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-n30.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/mach-n30.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-n30.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2410/mach-n30.c</a></div><div class='hunk'>@@ -51,6 +51,8 @@</div><div class='ctx'> #include &lt;plat/s3c2410.h&gt;</div><div class='ctx'> #include &lt;plat/udc.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> static struct map_desc n30_iodesc[] __initdata = {</div><div class='ctx'> 	/* nothing here yet */</div><div class='ctx'> };</div><div class='hunk'>@@ -591,6 +593,7 @@ MACHINE_START(N30, "Acer-N30")</div><div class='ctx'> 	.init_machine	= n30_init,</div><div class='ctx'> 	.init_irq	= s3c24xx_init_irq,</div><div class='ctx'> 	.map_io		= n30_map_io,</div><div class='add'>+	.restart	= s3c2410_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(N35, "Acer-N35")</div><div class='hunk'>@@ -601,4 +604,5 @@ MACHINE_START(N35, "Acer-N35")</div><div class='ctx'> 	.init_machine	= n30_init,</div><div class='ctx'> 	.init_irq	= s3c24xx_init_irq,</div><div class='ctx'> 	.map_io		= n30_map_io,</div><div class='add'>+	.restart	= s3c2410_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-otom.c b/arch/arm/mach-s3c2410/mach-otom.c<br/>index f03f3fd9cec9..5f1e0eeb38a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-otom.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/mach-otom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-otom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2410/mach-otom.c</a></div><div class='hunk'>@@ -38,6 +38,8 @@</div><div class='ctx'> #include &lt;plat/iic.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> static struct map_desc otom11_iodesc[] __initdata = {</div><div class='ctx'>   /* Device area */</div><div class='ctx'> 	{ (u32)OTOM_VA_CS8900A_BASE, OTOM_PA_CS8900A_BASE, SZ_16M, MT_DEVICE },</div><div class='hunk'>@@ -121,4 +123,5 @@ MACHINE_START(OTOM, "Nex Vision - Otom 1.1")</div><div class='ctx'> 	.init_machine	= otom11_init,</div><div class='ctx'> 	.init_irq	= s3c24xx_init_irq,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2410_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c<br/>index 451852156254..91c16d9d2459 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-qt2410.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/mach-qt2410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-qt2410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2410/mach-qt2410.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='hunk'>@@ -62,6 +62,8 @@</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> static struct map_desc qt2410_iodesc[] __initdata = {</div><div class='ctx'> 	{ 0xe0000000, __phys_to_pfn(S3C2410_CS3+0x01000000), SZ_1M, MT_DEVICE }</div><div class='ctx'> };</div><div class='hunk'>@@ -350,6 +352,5 @@ MACHINE_START(QT2410, "QT2410")</div><div class='ctx'> 	.init_irq	= s3c24xx_init_irq,</div><div class='ctx'> 	.init_machine	= qt2410_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2410_restart,</div><div class='ctx'> MACHINE_END</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-smdk2410.c b/arch/arm/mach-s3c2410/mach-smdk2410.c<br/>index 99c9dfdb71c7..bdc27e772876 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-smdk2410.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/mach-smdk2410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-smdk2410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2410/mach-smdk2410.c</a></div><div class='hunk'>@@ -54,6 +54,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/common-smdk.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> static struct map_desc smdk2410_iodesc[] __initdata = {</div><div class='ctx'>   /* nothing here yet */</div><div class='ctx'> };</div><div class='hunk'>@@ -116,6 +118,5 @@ MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switc</div><div class='ctx'> 	.init_irq	= s3c24xx_init_irq,</div><div class='ctx'> 	.init_machine	= smdk2410_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2410_restart,</div><div class='ctx'> MACHINE_END</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-tct_hammer.c b/arch/arm/mach-s3c2410/mach-tct_hammer.c<br/>index e0d0b6fb2800..1114666f0efb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-tct_hammer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/mach-tct_hammer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-tct_hammer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2410/mach-tct_hammer.c</a></div><div class='hunk'>@@ -54,6 +54,8 @@</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> static struct resource tct_hammer_nor_resource = {</div><div class='ctx'> 		.start = 0x00000000,</div><div class='ctx'> 		.end   = 0x01000000 - 1,</div><div class='hunk'>@@ -151,4 +153,5 @@ MACHINE_START(TCT_HAMMER, "TCT_HAMMER")</div><div class='ctx'> 	.init_irq	= s3c24xx_init_irq,</div><div class='ctx'> 	.init_machine	= tct_hammer_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2410_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c<br/>index df47e8e90065..dbe668a803ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-vr1000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/mach-vr1000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-vr1000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2410/mach-vr1000.c</a></div><div class='hunk'>@@ -53,6 +53,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "usb-simtec.h"</div><div class='ctx'> #include "nor-simtec.h"</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> /* macros for virtual address mods for the io space entries */</div><div class='ctx'> #define VA_C5(item) ((unsigned long)(item) + BAST_VAM_CS5)</div><div class='hunk'>@@ -109,23 +110,6 @@ static struct map_desc vr1000_iodesc[] __initdata = {</div><div class='ctx'> #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB</div><div class='ctx'> #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE</div><div class='ctx'> </div><div class='del'>-/* uart clock source(s) */</div><div class='del'>-</div><div class='del'>-static struct s3c24xx_uart_clksrc vr1000_serial_clocks[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.name		= "uclk",</div><div class='del'>-		.divisor	= 1,</div><div class='del'>-		.min_baud	= 0,</div><div class='del'>-		.max_baud	= 0,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.name		= "pclk",</div><div class='del'>-		.divisor	= 1,</div><div class='del'>-		.min_baud	= 0,</div><div class='del'>-		.max_baud	= 0.</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct s3c2410_uartcfg vr1000_uartcfgs[] __initdata = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.hwport	     = 0,</div><div class='hunk'>@@ -133,8 +117,6 @@ static struct s3c2410_uartcfg vr1000_uartcfgs[] __initdata = {</div><div class='ctx'> 		.ucon	     = UCON,</div><div class='ctx'> 		.ulcon	     = ULCON,</div><div class='ctx'> 		.ufcon	     = UFCON,</div><div class='del'>-		.clocks	     = vr1000_serial_clocks,</div><div class='del'>-		.clocks_size = ARRAY_SIZE(vr1000_serial_clocks),</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='ctx'> 		.hwport	     = 1,</div><div class='hunk'>@@ -142,8 +124,6 @@ static struct s3c2410_uartcfg vr1000_uartcfgs[] __initdata = {</div><div class='ctx'> 		.ucon	     = UCON,</div><div class='ctx'> 		.ulcon	     = ULCON,</div><div class='ctx'> 		.ufcon	     = UFCON,</div><div class='del'>-		.clocks	     = vr1000_serial_clocks,</div><div class='del'>-		.clocks_size = ARRAY_SIZE(vr1000_serial_clocks),</div><div class='ctx'> 	},</div><div class='ctx'> 	/* port 2 is not actually used */</div><div class='ctx'> 	[2] = {</div><div class='hunk'>@@ -152,9 +132,6 @@ static struct s3c2410_uartcfg vr1000_uartcfgs[] __initdata = {</div><div class='ctx'> 		.ucon	     = UCON,</div><div class='ctx'> 		.ulcon	     = ULCON,</div><div class='ctx'> 		.ufcon	     = UFCON,</div><div class='del'>-		.clocks	     = vr1000_serial_clocks,</div><div class='del'>-		.clocks_size = ARRAY_SIZE(vr1000_serial_clocks),</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -405,4 +382,5 @@ MACHINE_START(VR1000, "Thorcom-VR1000")</div><div class='ctx'> 	.init_machine	= vr1000_init,</div><div class='ctx'> 	.init_irq	= s3c24xx_init_irq,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2410_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/pll.c b/arch/arm/mach-s3c2410/pll.c<br/>index 8338865e11c0..c07438bfc99f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/pll.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/pll.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/pll.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2410/pll.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</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/module.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='hunk'>@@ -66,30 +66,34 @@ static struct cpufreq_frequency_table pll_vals_12MHz[] = {</div><div class='ctx'>     { .frequency = 270000000, .index = PLLVAL(127, 1, 1),  },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int s3c2410_plls_add(struct sys_device *dev)</div><div class='add'>+static int s3c2410_plls_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return s3c_plltab_register(pll_vals_12MHz, ARRAY_SIZE(pll_vals_12MHz));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2410_plls_drv = {</div><div class='del'>-	.add	= s3c2410_plls_add,</div><div class='add'>+static struct subsys_interface s3c2410_plls_interface = {</div><div class='add'>+	.name		= "s3c2410_plls",</div><div class='add'>+	.subsys		= &amp;s3c2410_subsys,</div><div class='add'>+	.add_dev	= s3c2410_plls_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2410_pll_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2410_sysclass, &amp;s3c2410_plls_drv);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2410_plls_interface);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2410_pll_init);</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2410a_plls_drv = {</div><div class='del'>-	.add	= s3c2410_plls_add,</div><div class='add'>+static struct subsys_interface s3c2410a_plls_interface = {</div><div class='add'>+	.name		= "s3c2410a_plls",</div><div class='add'>+	.subsys		= &amp;s3c2410a_subsys,</div><div class='add'>+	.add_dev	= s3c2410_plls_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2410a_pll_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2410a_sysclass, &amp;s3c2410a_plls_drv);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2410a_plls_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2410a_pll_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c<br/>index 4728f9aa7df1..fda5385deff6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2410/pm.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='hunk'>@@ -111,7 +111,7 @@ struct syscore_ops s3c2410_pm_syscore_ops = {</div><div class='ctx'> 	.resume		= s3c2410_pm_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int s3c2410_pm_add(struct sys_device *dev)</div><div class='add'>+static int s3c2410_pm_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	pm_cpu_prep = s3c2410_pm_prepare;</div><div class='ctx'> 	pm_cpu_sleep = s3c2410_cpu_suspend;</div><div class='hunk'>@@ -120,52 +120,60 @@ static int s3c2410_pm_add(struct sys_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_CPU_S3C2410)</div><div class='del'>-static struct sysdev_driver s3c2410_pm_driver = {</div><div class='del'>-	.add		= s3c2410_pm_add,</div><div class='add'>+static struct subsys_interface s3c2410_pm_interface = {</div><div class='add'>+	.name		= "s3c2410_pm",</div><div class='add'>+	.subsys		= &amp;s3c2410_subsys,</div><div class='add'>+	.add_dev	= s3c2410_pm_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* register ourselves */</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2410_pm_drvinit(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2410_sysclass, &amp;s3c2410_pm_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2410_pm_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2410_pm_drvinit);</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2410a_pm_driver = {</div><div class='del'>-	.add		= s3c2410_pm_add,</div><div class='add'>+static struct subsys_interface s3c2410a_pm_interface = {</div><div class='add'>+	.name		= "s3c2410a_pm",</div><div class='add'>+	.subsys		= &amp;s3c2410a_subsys,</div><div class='add'>+	.add_dev	= s3c2410_pm_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2410a_pm_drvinit(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2410a_sysclass, &amp;s3c2410a_pm_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2410a_pm_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2410a_pm_drvinit);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_CPU_S3C2440)</div><div class='del'>-static struct sysdev_driver s3c2440_pm_driver = {</div><div class='del'>-	.add		= s3c2410_pm_add,</div><div class='add'>+static struct subsys_interface s3c2440_pm_interface = {</div><div class='add'>+	.name		= "s3c2440_pm",</div><div class='add'>+	.subsys		= &amp;s3c2440_subsys,</div><div class='add'>+	.add_dev	= s3c2410_pm_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2440_pm_drvinit(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2440_sysclass, &amp;s3c2440_pm_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2440_pm_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2440_pm_drvinit);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_CPU_S3C2442)</div><div class='del'>-static struct sysdev_driver s3c2442_pm_driver = {</div><div class='del'>-	.add		= s3c2410_pm_add,</div><div class='add'>+static struct subsys_interface s3c2442_pm_interface = {</div><div class='add'>+	.name		= "s3c2442_pm",</div><div class='add'>+	.subsys		= &amp;s3c2442_subsys,</div><div class='add'>+	.add_dev	= s3c2410_pm_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2442_pm_drvinit(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2442_sysclass, &amp;s3c2442_pm_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2442_pm_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2442_pm_drvinit);</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c<br/>index 3d7ebc557a72..061b6bb1a557 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2410.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2410/s3c2410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2410/s3c2410.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='hunk'>@@ -42,6 +42,7 @@</div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='ctx'> #include &lt;plat/pll.h&gt;</div><div class='ctx'> #include &lt;plat/pm.h&gt;</div><div class='add'>+#include &lt;plat/watchdog-reset.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/gpio-core.h&gt;</div><div class='ctx'> #include &lt;plat/gpio-cfg.h&gt;</div><div class='hunk'>@@ -123,30 +124,38 @@ static struct clk s3c2410_armclk = {</div><div class='ctx'> 	.id	= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk_lookup s3c2410_clk_lookup[] = {</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud0", &amp;clk_p),</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud1", &amp;s3c24xx_uclk),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void __init s3c2410_init_clocks(int xtal)</div><div class='ctx'> {</div><div class='ctx'> 	s3c24xx_register_baseclocks(xtal);</div><div class='ctx'> 	s3c2410_setup_clocks();</div><div class='ctx'> 	s3c2410_baseclk_add();</div><div class='ctx'> 	s3c24xx_register_clock(&amp;s3c2410_armclk);</div><div class='add'>+	clkdev_add_table(s3c2410_clk_lookup, ARRAY_SIZE(s3c2410_clk_lookup));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sysdev_class s3c2410_sysclass = {</div><div class='add'>+struct bus_type s3c2410_subsys = {</div><div class='ctx'> 	.name = "s3c2410-core",</div><div class='add'>+	.dev_name = "s3c2410-core",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Note, we would have liked to name this s3c2410-core, but we cannot</div><div class='del'>- * register two sysdev_class with the same name.</div><div class='add'>+ * register two subsystems with the same name.</div><div class='ctx'>  */</div><div class='del'>-struct sysdev_class s3c2410a_sysclass = {</div><div class='add'>+struct bus_type s3c2410a_subsys = {</div><div class='ctx'> 	.name = "s3c2410a-core",</div><div class='add'>+	.dev_name = "s3c2410a-core",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sys_device s3c2410_sysdev = {</div><div class='del'>-	.cls		= &amp;s3c2410_sysclass,</div><div class='add'>+static struct device s3c2410_dev = {</div><div class='add'>+	.bus		= &amp;s3c2410_subsys,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* need to register class before we actually register the device, and</div><div class='add'>+/* need to register the subsystem before we actually register the device, and</div><div class='ctx'>  * we also need to ensure that it has been initialised before any of the</div><div class='ctx'>  * drivers even try to use it (even if not on an s3c2410 based system)</div><div class='ctx'>  * as a driver which may support both 2410 and 2440 may try and use it.</div><div class='hunk'>@@ -154,14 +163,14 @@ static struct sys_device s3c2410_sysdev = {</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2410_core_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_class_register(&amp;s3c2410_sysclass);</div><div class='add'>+	return subsys_system_register(&amp;s3c2410_subsys, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> core_initcall(s3c2410_core_init);</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2410a_core_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_class_register(&amp;s3c2410a_sysclass);</div><div class='add'>+	return subsys_system_register(&amp;s3c2410a_subsys, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> core_initcall(s3c2410a_core_init);</div><div class='hunk'>@@ -175,11 +184,23 @@ int __init s3c2410_init(void)</div><div class='ctx'> #endif</div><div class='ctx'> 	register_syscore_ops(&amp;s3c24xx_irq_syscore_ops);</div><div class='ctx'> </div><div class='del'>-	return sysdev_register(&amp;s3c2410_sysdev);</div><div class='add'>+	return device_register(&amp;s3c2410_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __init s3c2410a_init(void)</div><div class='ctx'> {</div><div class='del'>-	s3c2410_sysdev.cls = &amp;s3c2410a_sysclass;</div><div class='add'>+	s3c2410_dev.bus = &amp;s3c2410a_subsys;</div><div class='ctx'> 	return s3c2410_init();</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void s3c2410_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	if (mode == 's') {</div><div class='add'>+		soft_restart(0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arch_wdt_reset();</div><div class='add'>+</div><div class='add'>+	/* we'll take a jump through zero as a poor second */</div><div class='add'>+	soft_restart(0);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/clock.c b/arch/arm/mach-s3c2412/clock.c<br/>index 140711db6c89..d10b695a9066 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2412/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2412/clock.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -659,6 +659,12 @@ static struct clk *clks[] __initdata = {</div><div class='ctx'> 	&amp;clk_armclk,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk_lookup s3c2412_clk_lookup[] = {</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud1", &amp;s3c24xx_uclk),</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud2", &amp;clk_p),</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud3", &amp;clk_usysclk),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int __init s3c2412_baseclk_add(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long clkcon  = __raw_readl(S3C2410_CLKCON);</div><div class='hunk'>@@ -751,6 +757,7 @@ int __init s3c2412_baseclk_add(void)</div><div class='ctx'> 		s3c2412_clkcon_enable(clkp, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	clkdev_add_table(s3c2412_clk_lookup, ARRAY_SIZE(s3c2412_clk_lookup));</div><div class='ctx'> 	s3c_pwmclk_init();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/cpu-freq.c b/arch/arm/mach-s3c2412/cpu-freq.c<br/>index eb3ea1721335..d8664b7652ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/cpu-freq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2412/cpu-freq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/cpu-freq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2412/cpu-freq.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='hunk'>@@ -194,7 +194,7 @@ static struct s3c_cpufreq_info s3c2412_cpufreq_info = {</div><div class='ctx'> 	.debug_io_show  = s3c_cpufreq_debugfs_call(s3c2412_iotiming_debugfs),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int s3c2412_cpufreq_add(struct sys_device *sysdev)</div><div class='add'>+static int s3c2412_cpufreq_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long fclk_rate;</div><div class='ctx'> </div><div class='hunk'>@@ -244,14 +244,15 @@ err_fclk:</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2412_cpufreq_driver = {</div><div class='del'>-	.add		= s3c2412_cpufreq_add,</div><div class='add'>+static struct subsys_interface s3c2412_cpufreq_interface = {</div><div class='add'>+	.name		= "s3c2412_cpufreq",</div><div class='add'>+	.subsys		= &amp;s3c2412_subsys,</div><div class='add'>+	.add_dev	= s3c2412_cpufreq_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int s3c2412_cpufreq_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2412_sysclass,</div><div class='del'>-				      &amp;s3c2412_cpufreq_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2412_cpufreq_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2412_cpufreq_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/dma.c b/arch/arm/mach-s3c2412/dma.c<br/>index d2a7d5ef3e67..142acd3b5e15 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2412/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2412/dma.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</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='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -159,19 +159,21 @@ static struct s3c24xx_dma_selection __initdata s3c2412_dma_sel = {</div><div class='ctx'> 	.map_size	= ARRAY_SIZE(s3c2412_dma_mappings),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init s3c2412_dma_add(struct sys_device *sysdev)</div><div class='add'>+static int __init s3c2412_dma_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	s3c2410_dma_init();</div><div class='ctx'> 	return s3c24xx_dma_init_map(&amp;s3c2412_dma_sel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2412_dma_driver = {</div><div class='del'>-	.add	= s3c2412_dma_add,</div><div class='add'>+static struct subsys_interface s3c2412_dma_interface = {</div><div class='add'>+	.name		= "s3c2412_dma",</div><div class='add'>+	.subsys		= &amp;s3c2412_subsys,</div><div class='add'>+	.add_dev	= s3c2412_dma_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2412_dma_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2412_sysclass, &amp;s3c2412_dma_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2412_dma_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2412_dma_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/irq.c b/arch/arm/mach-s3c2412/irq.c<br/>index 1a1aa220972b..a8a46c1644f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2412/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2412/irq.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='hunk'>@@ -170,7 +170,7 @@ static int s3c2412_irq_rtc_wake(struct irq_data *data, unsigned int state)</div><div class='ctx'> </div><div class='ctx'> static struct irq_chip s3c2412_irq_rtc_chip;</div><div class='ctx'> </div><div class='del'>-static int s3c2412_irq_add(struct sys_device *sysdev)</div><div class='add'>+static int s3c2412_irq_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int irqno;</div><div class='ctx'> </div><div class='hunk'>@@ -200,13 +200,15 @@ static int s3c2412_irq_add(struct sys_device *sysdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2412_irq_driver = {</div><div class='del'>-	.add		= s3c2412_irq_add,</div><div class='add'>+static struct subsys_interface s3c2412_irq_interface = {</div><div class='add'>+	.name		= "s3c2412_irq",</div><div class='add'>+	.subsys		= &amp;s3c2412_subsys,</div><div class='add'>+	.add_dev	= s3c2412_irq_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int s3c2412_irq_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2412_sysclass, &amp;s3c2412_irq_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2412_irq_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2412_irq_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c<br/>index 286ef1738c61..ae73ba34ecc6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/mach-jive.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2412/mach-jive.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/mach-jive.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2412/mach-jive.c</a></div><div class='hunk'>@@ -48,6 +48,7 @@</div><div class='ctx'> #include &lt;linux/mtd/nand_ecc.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;plat/s3c2412.h&gt;</div><div class='ctx'> #include &lt;plat/gpio-cfg.h&gt;</div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='hunk'>@@ -661,4 +662,5 @@ MACHINE_START(JIVE, "JIVE")</div><div class='ctx'> 	.map_io		= jive_map_io,</div><div class='ctx'> 	.init_machine	= jive_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2412_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/mach-smdk2413.c b/arch/arm/mach-s3c2412/mach-smdk2413.c<br/>index f1eec1b54932..b11451b853d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/mach-smdk2413.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2412/mach-smdk2413.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/mach-smdk2413.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2412/mach-smdk2413.c</a></div><div class='hunk'>@@ -134,6 +134,7 @@ MACHINE_START(S3C2413, "S3C2413")</div><div class='ctx'> 	.map_io		= smdk2413_map_io,</div><div class='ctx'> 	.init_machine	= smdk2413_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2412_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(SMDK2412, "SMDK2412")</div><div class='hunk'>@@ -145,6 +146,7 @@ MACHINE_START(SMDK2412, "SMDK2412")</div><div class='ctx'> 	.map_io		= smdk2413_map_io,</div><div class='ctx'> 	.init_machine	= smdk2413_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2412_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(SMDK2413, "SMDK2413")</div><div class='hunk'>@@ -156,4 +158,5 @@ MACHINE_START(SMDK2413, "SMDK2413")</div><div class='ctx'> 	.map_io		= smdk2413_map_io,</div><div class='ctx'> 	.init_machine	= smdk2413_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2412_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/mach-vstms.c b/arch/arm/mach-s3c2412/mach-vstms.c<br/>index 1bbb1ef5f4ff..94bfaa1fb148 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/mach-vstms.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2412/mach-vstms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/mach-vstms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2412/mach-vstms.c</a></div><div class='hunk'>@@ -162,4 +162,5 @@ MACHINE_START(VSTMS, "VSTMS")</div><div class='ctx'> 	.init_machine	= vstms_init,</div><div class='ctx'> 	.map_io		= vstms_map_io,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2412_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/pm.c b/arch/arm/mach-s3c2412/pm.c<br/>index f4077efa51fa..d1adfa65f66d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2412/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2412/pm.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.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'>@@ -56,7 +56,7 @@ static void s3c2412_pm_prepare(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s3c2412_pm_add(struct sys_device *sysdev)</div><div class='add'>+static int s3c2412_pm_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	pm_cpu_prep = s3c2412_pm_prepare;</div><div class='ctx'> 	pm_cpu_sleep = s3c2412_cpu_suspend;</div><div class='hunk'>@@ -87,13 +87,15 @@ static struct sleep_save s3c2412_sleep[] = {</div><div class='ctx'> 	SAVE_ITEM(S3C2413_GPJSLPCON),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2412_pm_driver = {</div><div class='del'>-	.add		= s3c2412_pm_add,</div><div class='add'>+static struct subsys_interface s3c2412_pm_interface = {</div><div class='add'>+	.name		= "s3c2412_pm",</div><div class='add'>+	.subsys		= &amp;s3c2412_subsys,</div><div class='add'>+	.add_dev	= s3c2412_pm_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __init int s3c2412_pm_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2412_sysclass, &amp;s3c2412_pm_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2412_pm_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2412_pm_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c<br/>index 57a1e01e4e50..aff6e85a97c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/s3c2412.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2412/s3c2412.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2412/s3c2412.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2412/s3c2412.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> #include &lt;asm/proc-fns.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/reset.h&gt;</div><div class='ctx'> #include &lt;mach/idle.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/cpu-freq.h&gt;</div><div class='hunk'>@@ -131,8 +130,11 @@ static void s3c2412_idle(void)</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void s3c2412_hard_reset(void)</div><div class='add'>+void s3c2412_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='add'>+	if (mode == 's')</div><div class='add'>+		soft_restart(0);</div><div class='add'>+</div><div class='ctx'> 	/* errata "Watch-dog/Software Reset Problem" specifies that</div><div class='ctx'> 	 * this reset must be done with the SYSCLK sourced from</div><div class='ctx'> 	 * EXTCLK instead of FOUT to avoid a glitch in the reset</div><div class='hunk'>@@ -164,10 +166,6 @@ void __init s3c2412_map_io(void)</div><div class='ctx'> </div><div class='ctx'> 	s3c24xx_idle = s3c2412_idle;</div><div class='ctx'> </div><div class='del'>-	/* set custom reset hook */</div><div class='del'>-</div><div class='del'>-	s3c24xx_reset_hook = s3c2412_hard_reset;</div><div class='del'>-</div><div class='ctx'> 	/* register our io-tables */</div><div class='ctx'> </div><div class='ctx'> 	iotable_init(s3c2412_iodesc, ARRAY_SIZE(s3c2412_iodesc));</div><div class='hunk'>@@ -220,25 +218,26 @@ void __init s3c2412_init_clocks(int xtal)</div><div class='ctx'> 	s3c2412_baseclk_add();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* need to register class before we actually register the device, and</div><div class='add'>+/* need to register the subsystem before we actually register the device, and</div><div class='ctx'>  * we also need to ensure that it has been initialised before any of the</div><div class='ctx'>  * drivers even try to use it (even if not on an s3c2412 based system)</div><div class='ctx'>  * as a driver which may support both 2410 and 2440 may try and use it.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-struct sysdev_class s3c2412_sysclass = {</div><div class='add'>+struct bus_type s3c2412_subsys = {</div><div class='ctx'> 	.name = "s3c2412-core",</div><div class='add'>+	.dev_name = "s3c2412-core",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2412_core_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_class_register(&amp;s3c2412_sysclass);</div><div class='add'>+	return subsys_system_register(&amp;s3c2412_subsys, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> core_initcall(s3c2412_core_init);</div><div class='ctx'> </div><div class='del'>-static struct sys_device s3c2412_sysdev = {</div><div class='del'>-	.cls		= &amp;s3c2412_sysclass,</div><div class='add'>+static struct device s3c2412_dev = {</div><div class='add'>+	.bus		= &amp;s3c2412_subsys,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int __init s3c2412_init(void)</div><div class='hunk'>@@ -250,5 +249,5 @@ int __init s3c2412_init(void)</div><div class='ctx'> #endif</div><div class='ctx'> 	register_syscore_ops(&amp;s3c24xx_irq_syscore_ops);</div><div class='ctx'> </div><div class='del'>-	return sysdev_register(&amp;s3c2412_sysdev);</div><div class='add'>+	return device_register(&amp;s3c2412_dev);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-s3c2416/Makefile b/arch/arm/mach-s3c2416/Makefile<br/>index 7b805b279caf..ca0cd227f873 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2416/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2416/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2416/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2416/Makefile</a></div><div class='hunk'>@@ -15,7 +15,6 @@ obj-$(CONFIG_S3C2416_PM)	+= pm.o</div><div class='ctx'> #obj-$(CONFIG_S3C2416_DMA)	+= dma.o</div><div class='ctx'> </div><div class='ctx'> # Device setup</div><div class='del'>-obj-$(CONFIG_S3C2416_SETUP_SDHCI) += setup-sdhci.o</div><div class='ctx'> obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o</div><div class='ctx'> </div><div class='ctx'> # Machine support</div><div class='head'>diff --git a/arch/arm/mach-s3c2416/clock.c b/arch/arm/mach-s3c2416/clock.c<br/>index afbbe8bc21d1..59f54d1d7f8b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2416/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2416/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2416/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2416/clock.c</a></div><div class='hunk'>@@ -90,39 +90,38 @@ static struct clksrc_clk hsmmc_div[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct clksrc_clk hsmmc_mux[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name	= "hsmmc-if",</div><div class='del'>-			.devname	= "s3c-sdhci.0",</div><div class='del'>-			.ctrlbit = (1 &lt;&lt; 6),</div><div class='del'>-			.enable = s3c2443_clkcon_enable_s,</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;(struct clksrc_sources) {</div><div class='del'>-			.nr_sources = 2,</div><div class='del'>-			.sources = (struct clk *[]) {</div><div class='del'>-				[0] = &amp;hsmmc_div[0].clk,</div><div class='del'>-				[1] = NULL, /* to fix */</div><div class='del'>-			},</div><div class='del'>-		},</div><div class='del'>-		.reg_src = { .reg = S3C2443_CLKSRC, .size = 1, .shift = 16 },</div><div class='add'>+static struct clksrc_clk hsmmc_mux0 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "hsmmc-if",</div><div class='add'>+		.devname	= "s3c-sdhci.0",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 6),</div><div class='add'>+		.enable		= s3c2443_clkcon_enable_s,</div><div class='ctx'> 	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name	= "hsmmc-if",</div><div class='del'>-			.devname	= "s3c-sdhci.1",</div><div class='del'>-			.ctrlbit = (1 &lt;&lt; 12),</div><div class='del'>-			.enable = s3c2443_clkcon_enable_s,</div><div class='add'>+	.sources	= &amp;(struct clksrc_sources) {</div><div class='add'>+		.nr_sources	= 2,</div><div class='add'>+		.sources	= (struct clk * []) {</div><div class='add'>+			[0]	= &amp;hsmmc_div[0].clk,</div><div class='add'>+			[1]	= NULL, /* to fix */</div><div class='ctx'> 		},</div><div class='del'>-		.sources = &amp;(struct clksrc_sources) {</div><div class='del'>-			.nr_sources = 2,</div><div class='del'>-			.sources = (struct clk *[]) {</div><div class='del'>-				[0] = &amp;hsmmc_div[1].clk,</div><div class='del'>-				[1] = NULL, /* to fix */</div><div class='del'>-			},</div><div class='add'>+	},</div><div class='add'>+	.reg_src = { .reg = S3C2443_CLKSRC, .size = 1, .shift = 16 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk hsmmc_mux1 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "hsmmc-if",</div><div class='add'>+		.devname	= "s3c-sdhci.1",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 12),</div><div class='add'>+		.enable		= s3c2443_clkcon_enable_s,</div><div class='add'>+	},</div><div class='add'>+	.sources	= &amp;(struct clksrc_sources) {</div><div class='add'>+		.nr_sources	= 2,</div><div class='add'>+		.sources	= (struct clk * []) {</div><div class='add'>+			[0]	= &amp;hsmmc_div[1].clk,</div><div class='add'>+			[1]	= NULL, /* to fix */</div><div class='ctx'> 		},</div><div class='del'>-		.reg_src = { .reg = S3C2443_CLKSRC, .size = 1, .shift = 17 },</div><div class='ctx'> 	},</div><div class='add'>+	.reg_src = { .reg = S3C2443_CLKSRC, .size = 1, .shift = 17 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk hsmmc0_clk = {</div><div class='hunk'>@@ -144,8 +143,14 @@ static struct clksrc_clk *clksrcs[] __initdata = {</div><div class='ctx'> 	&amp;hsspi_mux,</div><div class='ctx'> 	&amp;hsmmc_div[0],</div><div class='ctx'> 	&amp;hsmmc_div[1],</div><div class='del'>-	&amp;hsmmc_mux[0],</div><div class='del'>-	&amp;hsmmc_mux[1],</div><div class='add'>+	&amp;hsmmc_mux0,</div><div class='add'>+	&amp;hsmmc_mux1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_lookup s3c2416_clk_lookup[] = {</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.0", &amp;hsmmc0_clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &amp;hsmmc_mux0.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &amp;hsmmc_mux1.clk),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init s3c2416_init_clocks(int xtal)</div><div class='hunk'>@@ -167,6 +172,7 @@ void __init s3c2416_init_clocks(int xtal)</div><div class='ctx'> 		s3c_register_clksrc(clksrcs[ptr], 1);</div><div class='ctx'> </div><div class='ctx'> 	s3c24xx_register_clock(&amp;hsmmc0_clk);</div><div class='add'>+	clkdev_add_table(s3c2416_clk_lookup, ARRAY_SIZE(s3c2416_clk_lookup));</div><div class='ctx'> </div><div class='ctx'> 	s3c_pwmclk_init();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2416/irq.c b/arch/arm/mach-s3c2416/irq.c<br/>index 28ad20d42445..36df761061de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2416/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2416/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2416/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2416/irq.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='hunk'>@@ -213,7 +213,7 @@ static int __init s3c2416_add_sub(unsigned int base,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init s3c2416_irq_add(struct sys_device *sysdev)</div><div class='add'>+static int __init s3c2416_irq_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO "S3C2416: IRQ Support\n");</div><div class='ctx'> </div><div class='hunk'>@@ -234,13 +234,15 @@ static int __init s3c2416_irq_add(struct sys_device *sysdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2416_irq_driver = {</div><div class='del'>-	.add		= s3c2416_irq_add,</div><div class='add'>+static struct subsys_interface s3c2416_irq_interface = {</div><div class='add'>+	.name		= "s3c2416_irq",</div><div class='add'>+	.subsys		= &amp;s3c2416_subsys,</div><div class='add'>+	.add_dev	= s3c2416_irq_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2416_irq_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2416_sysclass, &amp;s3c2416_irq_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2416_irq_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2416_irq_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2416/mach-smdk2416.c b/arch/arm/mach-s3c2416/mach-smdk2416.c<br/>index a9eee531ca76..eebe1e72b93e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2416/mach-smdk2416.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2416/mach-smdk2416.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2416/mach-smdk2416.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2416/mach-smdk2416.c</a></div><div class='hunk'>@@ -50,6 +50,7 @@</div><div class='ctx'> #include &lt;plat/nand.h&gt;</div><div class='ctx'> #include &lt;plat/sdhci.h&gt;</div><div class='ctx'> #include &lt;plat/udc.h&gt;</div><div class='add'>+#include &lt;linux/platform_data/s3c-hsudc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/regs-fb-v4.h&gt;</div><div class='ctx'> #include &lt;plat/fb.h&gt;</div><div class='hunk'>@@ -251,4 +252,5 @@ MACHINE_START(SMDK2416, "SMDK2416")</div><div class='ctx'> 	.map_io		= smdk2416_map_io,</div><div class='ctx'> 	.init_machine	= smdk2416_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2416_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2416/pm.c b/arch/arm/mach-s3c2416/pm.c<br/>index 9ec54f1d8e75..3bdb15a0d419 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2416/pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2416/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2416/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2416/pm.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -48,7 +48,7 @@ static void s3c2416_pm_prepare(void)</div><div class='ctx'> 	__raw_writel(virt_to_phys(s3c_cpu_resume), S3C2412_INFORM1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s3c2416_pm_add(struct sys_device *sysdev)</div><div class='add'>+static int s3c2416_pm_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	pm_cpu_prep = s3c2416_pm_prepare;</div><div class='ctx'> 	pm_cpu_sleep = s3c2416_cpu_suspend;</div><div class='hunk'>@@ -56,13 +56,15 @@ static int s3c2416_pm_add(struct sys_device *sysdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2416_pm_driver = {</div><div class='del'>-	.add		= s3c2416_pm_add,</div><div class='add'>+static struct subsys_interface s3c2416_pm_interface = {</div><div class='add'>+	.name		= "s3c2416_pm",</div><div class='add'>+	.subsys		= &amp;s3c2416_subsys,</div><div class='add'>+	.add_dev	= s3c2416_pm_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __init int s3c2416_pm_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2416_sysclass, &amp;s3c2416_pm_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2416_pm_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2416_pm_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2416/s3c2416.c b/arch/arm/mach-s3c2416/s3c2416.c<br/>index ee214bc83c83..5287d2808d3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2416/s3c2416.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2416/s3c2416.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2416/s3c2416.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2416/s3c2416.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='hunk'>@@ -44,7 +44,6 @@</div><div class='ctx'> #include &lt;asm/proc-fns.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/reset.h&gt;</div><div class='ctx'> #include &lt;mach/idle.h&gt;</div><div class='ctx'> #include &lt;mach/regs-s3c2443-clock.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -68,16 +67,20 @@ static struct map_desc s3c2416_iodesc[] __initdata = {</div><div class='ctx'> 	IODESC_ENT(TIMER),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct sysdev_class s3c2416_sysclass = {</div><div class='add'>+struct bus_type s3c2416_subsys = {</div><div class='ctx'> 	.name = "s3c2416-core",</div><div class='add'>+	.dev_name = "s3c2416-core",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sys_device s3c2416_sysdev = {</div><div class='del'>-	.cls		= &amp;s3c2416_sysclass,</div><div class='add'>+static struct device s3c2416_dev = {</div><div class='add'>+	.bus		= &amp;s3c2416_subsys,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void s3c2416_hard_reset(void)</div><div class='add'>+void s3c2416_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='add'>+	if (mode == 's')</div><div class='add'>+		soft_restart(0);</div><div class='add'>+</div><div class='ctx'> 	__raw_writel(S3C2443_SWRST_RESET, S3C2443_SWRST);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -85,7 +88,6 @@ int __init s3c2416_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO "S3C2416: Initializing architecture\n");</div><div class='ctx'> </div><div class='del'>-	s3c24xx_reset_hook = s3c2416_hard_reset;</div><div class='ctx'> 	/* s3c24xx_idle = s3c2416_idle;	*/</div><div class='ctx'> </div><div class='ctx'> 	/* change WDT IRQ number */</div><div class='hunk'>@@ -105,7 +107,7 @@ int __init s3c2416_init(void)</div><div class='ctx'> #endif</div><div class='ctx'> 	register_syscore_ops(&amp;s3c24xx_irq_syscore_ops);</div><div class='ctx'> </div><div class='del'>-	return sysdev_register(&amp;s3c2416_sysdev);</div><div class='add'>+	return device_register(&amp;s3c2416_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init s3c2416_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='hunk'>@@ -133,7 +135,7 @@ void __init s3c2416_map_io(void)</div><div class='ctx'> 	iotable_init(s3c2416_iodesc, ARRAY_SIZE(s3c2416_iodesc));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* need to register class before we actually register the device, and</div><div class='add'>+/* need to register the subsystem before we actually register the device, and</div><div class='ctx'>  * we also need to ensure that it has been initialised before any of the</div><div class='ctx'>  * drivers even try to use it (even if not on an s3c2416 based system)</div><div class='ctx'>  * as a driver which may support both 2443 and 2440 may try and use it.</div><div class='hunk'>@@ -141,7 +143,7 @@ void __init s3c2416_map_io(void)</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2416_core_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_class_register(&amp;s3c2416_sysclass);</div><div class='add'>+	return subsys_system_register(&amp;s3c2416_subsys, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> core_initcall(s3c2416_core_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2416/setup-sdhci.c b/arch/arm/mach-s3c2416/setup-sdhci.c<br/>deleted file mode 100644<br/>index cee53955eb02..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2416/setup-sdhci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2416/setup-sdhci.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-/* linux/arch/arm/mach-s3c2416/setup-sdhci.c</div><div class='del'>- *</div><div class='del'>- * Copyright 2010 Promwad Innovation Company</div><div class='del'>- *	Yauhen Kharuzhy &lt;yauhen.kharuzhy@promwad.com&gt;</div><div class='del'>- *</div><div class='del'>- * S3C2416 - Helper functions for settign up SDHCI device(s) (HSMMC)</div><div class='del'>- *</div><div class='del'>- * Based on mach-s3c64xx/setup-sdhci.c</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-/* clock sources for the mmc bus clock, order as for the ctrl2[5..4] */</div><div class='del'>-</div><div class='del'>-char *s3c2416_hsmmc_clksrcs[4] = {</div><div class='del'>-	[0] = "hsmmc",</div><div class='del'>-	[1] = "hsmmc",</div><div class='del'>-	[2] = "hsmmc-if",</div><div class='del'>-	/* [3] = "48m", - note not successfully used yet */</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/clock.c b/arch/arm/mach-s3c2440/clock.c<br/>index f9e6bdaf41d2..bedbc87a3426 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/clock.c</a></div><div class='hunk'>@@ -28,12 +28,12 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/serial_core.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='hunk'>@@ -43,6 +43,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* S3C2440 extended clock support */</div><div class='ctx'> </div><div class='hunk'>@@ -108,7 +109,47 @@ static struct clk s3c2440_clk_ac97 = {</div><div class='ctx'> 	.ctrlbit	= S3C2440_CLKCON_CAMERA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int s3c2440_clk_add(struct sys_device *sysdev)</div><div class='add'>+static unsigned long  s3c2440_fclk_n_getrate(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	unsigned long ucon0, ucon1, ucon2, divisor;</div><div class='add'>+</div><div class='add'>+	/* the fun of calculating the uart divisors on the s3c2440 */</div><div class='add'>+	ucon0 = __raw_readl(S3C24XX_VA_UART0 + S3C2410_UCON);</div><div class='add'>+	ucon1 = __raw_readl(S3C24XX_VA_UART1 + S3C2410_UCON);</div><div class='add'>+	ucon2 = __raw_readl(S3C24XX_VA_UART2 + S3C2410_UCON);</div><div class='add'>+</div><div class='add'>+	ucon0 &amp;= S3C2440_UCON0_DIVMASK;</div><div class='add'>+	ucon1 &amp;= S3C2440_UCON1_DIVMASK;</div><div class='add'>+	ucon2 &amp;= S3C2440_UCON2_DIVMASK;</div><div class='add'>+</div><div class='add'>+	if (ucon0 != 0)</div><div class='add'>+		divisor = (ucon0 &gt;&gt; S3C2440_UCON_DIVSHIFT) + 6;</div><div class='add'>+	else if (ucon1 != 0)</div><div class='add'>+		divisor = (ucon1 &gt;&gt; S3C2440_UCON_DIVSHIFT) + 21;</div><div class='add'>+	else if (ucon2 != 0)</div><div class='add'>+		divisor = (ucon2 &gt;&gt; S3C2440_UCON_DIVSHIFT) + 36;</div><div class='add'>+	else</div><div class='add'>+		/* manual calims 44, seems to be 9 */</div><div class='add'>+		divisor = 9;</div><div class='add'>+</div><div class='add'>+	return clk_get_rate(clk-&gt;parent) / divisor;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk s3c2440_clk_fclk_n = {</div><div class='add'>+	.name		= "fclk_n",</div><div class='add'>+	.parent		= &amp;clk_f,</div><div class='add'>+	.ops		= &amp;(struct clk_ops) {</div><div class='add'>+		.get_rate	= s3c2440_fclk_n_getrate,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_lookup s3c2440_clk_lookup[] = {</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud1", &amp;s3c24xx_uclk),</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud2", &amp;clk_p),</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud3", &amp;s3c2440_clk_fclk_n),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int s3c2440_clk_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk *clock_upll;</div><div class='ctx'> 	struct clk *clock_h;</div><div class='hunk'>@@ -126,10 +167,12 @@ static int s3c2440_clk_add(struct sys_device *sysdev)</div><div class='ctx'> 	s3c2440_clk_cam.parent = clock_h;</div><div class='ctx'> 	s3c2440_clk_ac97.parent = clock_p;</div><div class='ctx'> 	s3c2440_clk_cam_upll.parent = clock_upll;</div><div class='add'>+	s3c24xx_register_clock(&amp;s3c2440_clk_fclk_n);</div><div class='ctx'> </div><div class='ctx'> 	s3c24xx_register_clock(&amp;s3c2440_clk_ac97);</div><div class='ctx'> 	s3c24xx_register_clock(&amp;s3c2440_clk_cam);</div><div class='ctx'> 	s3c24xx_register_clock(&amp;s3c2440_clk_cam_upll);</div><div class='add'>+	clkdev_add_table(s3c2440_clk_lookup, ARRAY_SIZE(s3c2440_clk_lookup));</div><div class='ctx'> </div><div class='ctx'> 	clk_disable(&amp;s3c2440_clk_ac97);</div><div class='ctx'> 	clk_disable(&amp;s3c2440_clk_cam);</div><div class='hunk'>@@ -137,13 +180,15 @@ static int s3c2440_clk_add(struct sys_device *sysdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2440_clk_driver = {</div><div class='del'>-	.add	= s3c2440_clk_add,</div><div class='add'>+static struct subsys_interface s3c2440_clk_interface = {</div><div class='add'>+	.name		= "s3c2440_clk",</div><div class='add'>+	.subsys		= &amp;s3c2440_subsys,</div><div class='add'>+	.add_dev	= s3c2440_clk_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static __init int s3c24xx_clk_driver(void)</div><div class='add'>+static __init int s3c24xx_clk_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2440_sysclass, &amp;s3c2440_clk_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2440_clk_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-arch_initcall(s3c24xx_clk_driver);</div><div class='add'>+arch_initcall(s3c24xx_clk_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/common.h b/arch/arm/mach-s3c2440/common.h<br/>new file mode 100644<br/>index 000000000000..db8a98ac68c5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/common.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * Common Header for S3C2440 machines</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ARCH_ARM_MACH_S3C2440_COMMON_H</div><div class='add'>+#define __ARCH_ARM_MACH_S3C2440_COMMON_H</div><div class='add'>+</div><div class='add'>+void s3c2440_restart(char mode, const char *cmd);</div><div class='add'>+</div><div class='add'>+#endif /* __ARCH_ARM_MACH_S3C2440_COMMON_H */</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/dma.c b/arch/arm/mach-s3c2440/dma.c<br/>index 0e73f8f9d132..15b1ddf8f626 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/dma.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</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='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='hunk'>@@ -174,20 +174,22 @@ static struct s3c24xx_dma_order __initdata s3c2440_dma_order = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init s3c2440_dma_add(struct sys_device *sysdev)</div><div class='add'>+static int __init s3c2440_dma_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	s3c2410_dma_init();</div><div class='ctx'> 	s3c24xx_dma_order_set(&amp;s3c2440_dma_order);</div><div class='ctx'> 	return s3c24xx_dma_init_map(&amp;s3c2440_dma_sel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2440_dma_driver = {</div><div class='del'>-	.add	= s3c2440_dma_add,</div><div class='add'>+static struct subsys_interface s3c2440_dma_interface = {</div><div class='add'>+	.name		= "s3c2440_dma",</div><div class='add'>+	.subsys		= &amp;s3c2440_subsys,</div><div class='add'>+	.add_dev	= s3c2440_dma_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2440_dma_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2440_sysclass, &amp;s3c2440_dma_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2440_dma_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2440_dma_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/irq.c b/arch/arm/mach-s3c2440/irq.c<br/>index eb1cc0f0705e..4fee9bc6bcb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/irq.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='hunk'>@@ -92,7 +92,7 @@ static struct irq_chip s3c_irq_wdtac97 = {</div><div class='ctx'> 	.irq_ack	= s3c_irq_wdtac97_ack,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int s3c2440_irq_add(struct sys_device *sysdev)</div><div class='add'>+static int s3c2440_irq_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int irqno;</div><div class='ctx'> </div><div class='hunk'>@@ -113,13 +113,15 @@ static int s3c2440_irq_add(struct sys_device *sysdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2440_irq_driver = {</div><div class='del'>-	.add		= s3c2440_irq_add,</div><div class='add'>+static struct subsys_interface s3c2440_irq_interface = {</div><div class='add'>+	.name		= "s3c2440_irq",</div><div class='add'>+	.subsys		= &amp;s3c2440_subsys,</div><div class='add'>+	.add_dev	= s3c2440_irq_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int s3c2440_irq_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2440_sysclass, &amp;s3c2440_irq_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2440_irq_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2440_irq_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c<br/>index 74f92fc3fd04..24569550de1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-anubis.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/mach-anubis.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-anubis.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/mach-anubis.c</a></div><div class='hunk'>@@ -55,6 +55,8 @@</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/audio-simtec.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> #define COPYRIGHT ", Copyright 2005-2009 Simtec Electronics"</div><div class='ctx'> </div><div class='ctx'> static struct map_desc anubis_iodesc[] __initdata = {</div><div class='hunk'>@@ -96,22 +98,6 @@ static struct map_desc anubis_iodesc[] __initdata = {</div><div class='ctx'> #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB</div><div class='ctx'> #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE</div><div class='ctx'> </div><div class='del'>-static struct s3c24xx_uart_clksrc anubis_serial_clocks[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.name		= "uclk",</div><div class='del'>-		.divisor	= 1,</div><div class='del'>-		.min_baud	= 0,</div><div class='del'>-		.max_baud	= 0,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.name		= "pclk",</div><div class='del'>-		.divisor	= 1,</div><div class='del'>-		.min_baud	= 0,</div><div class='del'>-		.max_baud	= 0,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.hwport	     = 0,</div><div class='hunk'>@@ -119,8 +105,7 @@ static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = {</div><div class='ctx'> 		.ucon	     = UCON,</div><div class='ctx'> 		.ulcon	     = ULCON,</div><div class='ctx'> 		.ufcon	     = UFCON,</div><div class='del'>-		.clocks	     = anubis_serial_clocks,</div><div class='del'>-		.clocks_size = ARRAY_SIZE(anubis_serial_clocks),</div><div class='add'>+		.clk_sel	= S3C2410_UCON_CLKSEL1 | S3C2410_UCON_CLKSEL2,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='ctx'> 		.hwport	     = 2,</div><div class='hunk'>@@ -128,8 +113,7 @@ static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = {</div><div class='ctx'> 		.ucon	     = UCON,</div><div class='ctx'> 		.ulcon	     = ULCON,</div><div class='ctx'> 		.ufcon	     = UFCON,</div><div class='del'>-		.clocks	     = anubis_serial_clocks,</div><div class='del'>-		.clocks_size = ARRAY_SIZE(anubis_serial_clocks),</div><div class='add'>+		.clk_sel	= S3C2410_UCON_CLKSEL1 | S3C2410_UCON_CLKSEL2,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -503,4 +487,5 @@ MACHINE_START(ANUBIS, "Simtec-Anubis")</div><div class='ctx'> 	.init_machine	= anubis_init,</div><div class='ctx'> 	.init_irq	= s3c24xx_init_irq,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2440_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c<br/>index 38887ee0c784..d6a9763110cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-at2440evb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/mach-at2440evb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-at2440evb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/mach-at2440evb.c</a></div><div class='hunk'>@@ -49,6 +49,8 @@</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/mci.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> static struct map_desc at2440evb_iodesc[] __initdata = {</div><div class='ctx'> 	/* Nothing here */</div><div class='ctx'> };</div><div class='hunk'>@@ -57,22 +59,6 @@ static struct map_desc at2440evb_iodesc[] __initdata = {</div><div class='ctx'> #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE)</div><div class='ctx'> #define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)</div><div class='ctx'> </div><div class='del'>-static struct s3c24xx_uart_clksrc at2440evb_serial_clocks[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.name		= "uclk",</div><div class='del'>-		.divisor	= 1,</div><div class='del'>-		.min_baud	= 0,</div><div class='del'>-		.max_baud	= 0,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.name		= "pclk",</div><div class='del'>-		.divisor	= 1,</div><div class='del'>-		.min_baud	= 0,</div><div class='del'>-		.max_baud	= 0,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static struct s3c2410_uartcfg at2440evb_uartcfgs[] __initdata = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.hwport	     = 0,</div><div class='hunk'>@@ -80,8 +66,7 @@ static struct s3c2410_uartcfg at2440evb_uartcfgs[] __initdata = {</div><div class='ctx'> 		.ucon	     = UCON,</div><div class='ctx'> 		.ulcon	     = ULCON,</div><div class='ctx'> 		.ufcon	     = UFCON,</div><div class='del'>-		.clocks	     = at2440evb_serial_clocks,</div><div class='del'>-		.clocks_size = ARRAY_SIZE(at2440evb_serial_clocks),</div><div class='add'>+		.clk_sel	= S3C2410_UCON_CLKSEL1 | S3C2410_UCON_CLKSEL2,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='ctx'> 		.hwport	     = 1,</div><div class='hunk'>@@ -89,8 +74,7 @@ static struct s3c2410_uartcfg at2440evb_uartcfgs[] __initdata = {</div><div class='ctx'> 		.ucon	     = UCON,</div><div class='ctx'> 		.ulcon	     = ULCON,</div><div class='ctx'> 		.ufcon	     = UFCON,</div><div class='del'>-		.clocks	     = at2440evb_serial_clocks,</div><div class='del'>-		.clocks_size = ARRAY_SIZE(at2440evb_serial_clocks),</div><div class='add'>+		.clk_sel	= S3C2410_UCON_CLKSEL1 | S3C2410_UCON_CLKSEL2,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -238,4 +222,5 @@ MACHINE_START(AT2440EVB, "AT2440EVB")</div><div class='ctx'> 	.init_machine	= at2440evb_init,</div><div class='ctx'> 	.init_irq	= s3c24xx_init_irq,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2440_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c<br/>index de1e0ff46cec..5859e609d28c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-gta02.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/mach-gta02.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-gta02.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/mach-gta02.c</a></div><div class='hunk'>@@ -90,6 +90,7 @@</div><div class='ctx'> #include &lt;plat/iic.h&gt;</div><div class='ctx'> #include &lt;plat/ts.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> static struct pcf50633 *gta02_pcf;</div><div class='ctx'> </div><div class='hunk'>@@ -600,4 +601,5 @@ MACHINE_START(NEO1973_GTA02, "GTA02")</div><div class='ctx'> 	.init_irq	= s3c24xx_init_irq,</div><div class='ctx'> 	.init_machine	= gta02_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2440_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-mini2440.c b/arch/arm/mach-s3c2440/mach-mini2440.c<br/>index 91fe0b4c95f1..adbbb85bc4cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-mini2440.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/mach-mini2440.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-mini2440.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/mach-mini2440.c</a></div><div class='hunk'>@@ -60,6 +60,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/s3c24xx_uda134x.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> #define MACH_MINI2440_DM9K_BASE (S3C2410_CS4 + 0x300)</div><div class='ctx'> </div><div class='ctx'> static struct map_desc mini2440_iodesc[] __initdata = {</div><div class='hunk'>@@ -167,6 +169,24 @@ static struct s3c2410fb_display mini2440_lcd_cfg[] __initdata = {</div><div class='ctx'> 		.lcdcon5	= (S3C2410_LCDCON5_FRM565 |</div><div class='ctx'> 				   S3C2410_LCDCON5_HWSWP),</div><div class='ctx'> 	},</div><div class='add'>+	/* mini2440 + 3.5" TFT (LCD-W35i, LQ035Q1DG06 type) + touchscreen*/</div><div class='add'>+	[3] = {</div><div class='add'>+		_LCD_DECLARE(</div><div class='add'>+			/* clock */</div><div class='add'>+			7,</div><div class='add'>+			/* xres, margin_right, margin_left, hsync */</div><div class='add'>+			320, 68, 66, 4,</div><div class='add'>+			/* yres, margin_top, margin_bottom, vsync */</div><div class='add'>+			240, 4, 4, 9,</div><div class='add'>+			/* refresh rate */</div><div class='add'>+			60),</div><div class='add'>+		.lcdcon5	= (S3C2410_LCDCON5_FRM565 |</div><div class='add'>+				   S3C2410_LCDCON5_INVVDEN |</div><div class='add'>+				   S3C2410_LCDCON5_INVVFRAME |</div><div class='add'>+				   S3C2410_LCDCON5_INVVLINE |</div><div class='add'>+				   S3C2410_LCDCON5_INVVCLK |</div><div class='add'>+				   S3C2410_LCDCON5_HWSWP),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* todo - put into gpio header */</div><div class='hunk'>@@ -681,4 +701,5 @@ MACHINE_START(MINI2440, "MINI2440")</div><div class='ctx'> 	.init_machine	= mini2440_init,</div><div class='ctx'> 	.init_irq	= s3c24xx_init_irq,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2440_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-nexcoder.c b/arch/arm/mach-s3c2440/mach-nexcoder.c<br/>index 61c0bf148165..40eaf844bc1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-nexcoder.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/mach-nexcoder.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-nexcoder.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/mach-nexcoder.c</a></div><div class='hunk'>@@ -47,6 +47,8 @@</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> static struct map_desc nexcoder_iodesc[] __initdata = {</div><div class='ctx'> 	/* nothing here yet */</div><div class='ctx'> };</div><div class='hunk'>@@ -156,4 +158,5 @@ MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440")</div><div class='ctx'> 	.init_machine	= nexcoder_init,</div><div class='ctx'> 	.init_irq	= s3c24xx_init_irq,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2440_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c<br/>index dc142ebf8cba..4c480ef734f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-osiris.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/mach-osiris.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-osiris.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/mach-osiris.c</a></div><div class='hunk'>@@ -54,6 +54,8 @@</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> /* onboard perihperal map */</div><div class='ctx'> </div><div class='ctx'> static struct map_desc osiris_iodesc[] __initdata = {</div><div class='hunk'>@@ -100,21 +102,6 @@ static struct map_desc osiris_iodesc[] __initdata = {</div><div class='ctx'> #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB</div><div class='ctx'> #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE</div><div class='ctx'> </div><div class='del'>-static struct s3c24xx_uart_clksrc osiris_serial_clocks[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.name		= "uclk",</div><div class='del'>-		.divisor	= 1,</div><div class='del'>-		.min_baud	= 0,</div><div class='del'>-		.max_baud	= 0,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.name		= "pclk",</div><div class='del'>-		.divisor	= 1,</div><div class='del'>-		.min_baud	= 0,</div><div class='del'>-		.max_baud	= 0,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.hwport	     = 0,</div><div class='hunk'>@@ -122,8 +109,7 @@ static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = {</div><div class='ctx'> 		.ucon	     = UCON,</div><div class='ctx'> 		.ulcon	     = ULCON,</div><div class='ctx'> 		.ufcon	     = UFCON,</div><div class='del'>-		.clocks	     = osiris_serial_clocks,</div><div class='del'>-		.clocks_size = ARRAY_SIZE(osiris_serial_clocks),</div><div class='add'>+		.clk_sel	= S3C2410_UCON_CLKSEL1 | S3C2410_UCON_CLKSEL2,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='ctx'> 		.hwport	     = 1,</div><div class='hunk'>@@ -131,8 +117,7 @@ static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = {</div><div class='ctx'> 		.ucon	     = UCON,</div><div class='ctx'> 		.ulcon	     = ULCON,</div><div class='ctx'> 		.ufcon	     = UFCON,</div><div class='del'>-		.clocks	     = osiris_serial_clocks,</div><div class='del'>-		.clocks_size = ARRAY_SIZE(osiris_serial_clocks),</div><div class='add'>+		.clk_sel	= S3C2410_UCON_CLKSEL1 | S3C2410_UCON_CLKSEL2,</div><div class='ctx'> 	},</div><div class='ctx'> 	[2] = {</div><div class='ctx'> 		.hwport	     = 2,</div><div class='hunk'>@@ -140,8 +125,7 @@ static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = {</div><div class='ctx'> 		.ucon	     = UCON,</div><div class='ctx'> 		.ulcon	     = ULCON,</div><div class='ctx'> 		.ufcon	     = UFCON,</div><div class='del'>-		.clocks	     = osiris_serial_clocks,</div><div class='del'>-		.clocks_size = ARRAY_SIZE(osiris_serial_clocks),</div><div class='add'>+		.clk_sel	= S3C2410_UCON_CLKSEL1 | S3C2410_UCON_CLKSEL2,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -452,4 +436,5 @@ MACHINE_START(OSIRIS, "Simtec-OSIRIS")</div><div class='ctx'> 	.init_irq	= s3c24xx_init_irq,</div><div class='ctx'> 	.init_machine	= osiris_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2440_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-rx1950.c b/arch/arm/mach-s3c2440/mach-rx1950.c<br/>index 0d3453bf567c..80077f6472ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-rx1950.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/mach-rx1950.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-rx1950.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/mach-rx1950.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/gpio_keys.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/pda_power.h&gt;</div><div class='ctx'> #include &lt;linux/pwm_backlight.h&gt;</div><div class='ctx'> #include &lt;linux/pwm.h&gt;</div><div class='hunk'>@@ -62,21 +62,14 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/uda1380.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> #define LCD_PWM_PERIOD 192960</div><div class='ctx'> #define LCD_PWM_DUTY 127353</div><div class='ctx'> </div><div class='ctx'> static struct map_desc rx1950_iodesc[] __initdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct s3c24xx_uart_clksrc rx1950_serial_clocks[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-	       .name = "fclk",</div><div class='del'>-	       .divisor = 0x0a,</div><div class='del'>-	       .min_baud = 0,</div><div class='del'>-	       .max_baud = 0,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct s3c2410_uartcfg rx1950_uartcfgs[] __initdata = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 	       .hwport = 0,</div><div class='hunk'>@@ -84,8 +77,7 @@ static struct s3c2410_uartcfg rx1950_uartcfgs[] __initdata = {</div><div class='ctx'> 	       .ucon = 0x3c5,</div><div class='ctx'> 	       .ulcon = 0x03,</div><div class='ctx'> 	       .ufcon = 0x51,</div><div class='del'>-	       .clocks = rx1950_serial_clocks,</div><div class='del'>-	       .clocks_size = ARRAY_SIZE(rx1950_serial_clocks),</div><div class='add'>+		.clk_sel = S3C2410_UCON_CLKSEL3,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='ctx'> 	       .hwport = 1,</div><div class='hunk'>@@ -93,8 +85,7 @@ static struct s3c2410_uartcfg rx1950_uartcfgs[] __initdata = {</div><div class='ctx'> 	       .ucon = 0x3c5,</div><div class='ctx'> 	       .ulcon = 0x03,</div><div class='ctx'> 	       .ufcon = 0x51,</div><div class='del'>-	       .clocks = rx1950_serial_clocks,</div><div class='del'>-	       .clocks_size = ARRAY_SIZE(rx1950_serial_clocks),</div><div class='add'>+		.clk_sel = S3C2410_UCON_CLKSEL3,</div><div class='ctx'> 	},</div><div class='ctx'> 	/* IR port */</div><div class='ctx'> 	[2] = {</div><div class='hunk'>@@ -103,8 +94,7 @@ static struct s3c2410_uartcfg rx1950_uartcfgs[] __initdata = {</div><div class='ctx'> 	       .ucon = 0x3c5,</div><div class='ctx'> 	       .ulcon = 0x43,</div><div class='ctx'> 	       .ufcon = 0xf1,</div><div class='del'>-	       .clocks = rx1950_serial_clocks,</div><div class='del'>-	       .clocks_size = ARRAY_SIZE(rx1950_serial_clocks),</div><div class='add'>+		.clk_sel = S3C2410_UCON_CLKSEL3,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -832,4 +822,5 @@ MACHINE_START(RX1950, "HP iPAQ RX1950")</div><div class='ctx'> 	.init_irq = s3c24xx_init_irq,</div><div class='ctx'> 	.init_machine = rx1950_init_machine,</div><div class='ctx'> 	.timer = &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2440_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c<br/>index e19499c2f909..20103bafbd4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-rx3715.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/mach-rx3715.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-rx3715.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/mach-rx3715.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='hunk'>@@ -51,6 +51,8 @@</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> static struct map_desc rx3715_iodesc[] __initdata = {</div><div class='ctx'> 	/* dump ISA space somewhere unused */</div><div class='ctx'> </div><div class='hunk'>@@ -67,16 +69,6 @@ static struct map_desc rx3715_iodesc[] __initdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static struct s3c24xx_uart_clksrc rx3715_serial_clocks[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.name		= "fclk",</div><div class='del'>-		.divisor	= 0,</div><div class='del'>-		.min_baud	= 0,</div><div class='del'>-		.max_baud	= 0,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct s3c2410_uartcfg rx3715_uartcfgs[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.hwport	     = 0,</div><div class='hunk'>@@ -84,8 +76,7 @@ static struct s3c2410_uartcfg rx3715_uartcfgs[] = {</div><div class='ctx'> 		.ucon	     = 0x3c5,</div><div class='ctx'> 		.ulcon	     = 0x03,</div><div class='ctx'> 		.ufcon	     = 0x51,</div><div class='del'>-		.clocks	     = rx3715_serial_clocks,</div><div class='del'>-		.clocks_size = ARRAY_SIZE(rx3715_serial_clocks),</div><div class='add'>+		.clk_sel	= S3C2410_UCON_CLKSEL3,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='ctx'> 		.hwport	     = 1,</div><div class='hunk'>@@ -93,8 +84,7 @@ static struct s3c2410_uartcfg rx3715_uartcfgs[] = {</div><div class='ctx'> 		.ucon	     = 0x3c5,</div><div class='ctx'> 		.ulcon	     = 0x03,</div><div class='ctx'> 		.ufcon	     = 0x00,</div><div class='del'>-		.clocks	     = rx3715_serial_clocks,</div><div class='del'>-		.clocks_size = ARRAY_SIZE(rx3715_serial_clocks),</div><div class='add'>+		.clk_sel	= S3C2410_UCON_CLKSEL3,</div><div class='ctx'> 	},</div><div class='ctx'> 	/* IR port */</div><div class='ctx'> 	[2] = {</div><div class='hunk'>@@ -103,8 +93,7 @@ static struct s3c2410_uartcfg rx3715_uartcfgs[] = {</div><div class='ctx'> 		.ucon	     = 0x3c5,</div><div class='ctx'> 		.ulcon	     = 0x43,</div><div class='ctx'> 		.ufcon	     = 0x51,</div><div class='del'>-		.clocks	     = rx3715_serial_clocks,</div><div class='del'>-		.clocks_size = ARRAY_SIZE(rx3715_serial_clocks),</div><div class='add'>+		.clk_sel	= S3C2410_UCON_CLKSEL3,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -224,4 +213,5 @@ MACHINE_START(RX3715, "IPAQ-RX3715")</div><div class='ctx'> 	.init_irq	= rx3715_init_irq,</div><div class='ctx'> 	.init_machine	= rx3715_init_machine,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2440_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c<br/>index 36eeb4197a84..1deb60d12a60 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-smdk2440.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/mach-smdk2440.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/mach-smdk2440.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/mach-smdk2440.c</a></div><div class='hunk'>@@ -47,6 +47,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/common-smdk.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> static struct map_desc smdk2440_iodesc[] __initdata = {</div><div class='ctx'> 	/* ISA IO Space map (memory space selected by A24) */</div><div class='ctx'> </div><div class='hunk'>@@ -181,4 +183,5 @@ MACHINE_START(S3C2440, "SMDK2440")</div><div class='ctx'> 	.map_io		= smdk2440_map_io,</div><div class='ctx'> 	.init_machine	= smdk2440_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2440_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/s3c2440-cpufreq.c b/arch/arm/mach-s3c2440/s3c2440-cpufreq.c<br/>index 976002fb1b8f..cf7596694efe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/s3c2440-cpufreq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/s3c2440-cpufreq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/s3c2440-cpufreq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/s3c2440-cpufreq.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='hunk'>@@ -270,7 +270,7 @@ struct s3c_cpufreq_info s3c2440_cpufreq_info = {</div><div class='ctx'> 	.debug_io_show  = s3c_cpufreq_debugfs_call(s3c2410_iotiming_debugfs),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int s3c2440_cpufreq_add(struct sys_device *sysdev)</div><div class='add'>+static int s3c2440_cpufreq_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	xtal = s3c_cpufreq_clk_get(NULL, "xtal");</div><div class='ctx'> 	hclk = s3c_cpufreq_clk_get(NULL, "hclk");</div><div class='hunk'>@@ -285,27 +285,29 @@ static int s3c2440_cpufreq_add(struct sys_device *sysdev)</div><div class='ctx'> 	return s3c_cpufreq_register(&amp;s3c2440_cpufreq_info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2440_cpufreq_driver = {</div><div class='del'>-	.add		= s3c2440_cpufreq_add,</div><div class='add'>+static struct subsys_interface s3c2440_cpufreq_interface = {</div><div class='add'>+	.name		= "s3c2440_cpufreq",</div><div class='add'>+	.subsys		= &amp;s3c2440_subsys,</div><div class='add'>+	.add_dev	= s3c2440_cpufreq_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int s3c2440_cpufreq_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2440_sysclass,</div><div class='del'>-				      &amp;s3c2440_cpufreq_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2440_cpufreq_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* arch_initcall adds the clocks we need, so use subsys_initcall. */</div><div class='ctx'> subsys_initcall(s3c2440_cpufreq_init);</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2442_cpufreq_driver = {</div><div class='del'>-	.add		= s3c2440_cpufreq_add,</div><div class='add'>+static struct subsys_interface s3c2442_cpufreq_interface = {</div><div class='add'>+	.name		= "s3c2442_cpufreq",</div><div class='add'>+	.subsys		= &amp;s3c2442_subsys,</div><div class='add'>+	.add_dev	= s3c2440_cpufreq_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int s3c2442_cpufreq_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2442_sysclass,</div><div class='del'>-				      &amp;s3c2442_cpufreq_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2442_cpufreq_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> subsys_initcall(s3c2442_cpufreq_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/s3c2440-pll-12000000.c b/arch/arm/mach-s3c2440/s3c2440-pll-12000000.c<br/>index f105d5e8c477..b5368ae8d7fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/s3c2440-pll-12000000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/s3c2440-pll-12000000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/s3c2440-pll-12000000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/s3c2440-pll-12000000.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -51,7 +51,7 @@ static struct cpufreq_frequency_table s3c2440_plls_12[] __initdata = {</div><div class='ctx'> 	{ .frequency = 400000000,	.index = PLLVAL(0x5c, 1, 1),  }, 	/* FVco 800.000000 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int s3c2440_plls12_add(struct sys_device *dev)</div><div class='add'>+static int s3c2440_plls12_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk *xtal_clk;</div><div class='ctx'> 	unsigned long xtal;</div><div class='hunk'>@@ -72,25 +72,29 @@ static int s3c2440_plls12_add(struct sys_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2440_plls12_drv = {</div><div class='del'>-	.add	= s3c2440_plls12_add,</div><div class='add'>+static struct subsys_interface s3c2440_plls12_interface = {</div><div class='add'>+	.name		= "s3c2440_plls12",</div><div class='add'>+	.subsys		= &amp;s3c2440_subsys,</div><div class='add'>+	.add_dev	= s3c2440_plls12_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2440_pll_12mhz(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2440_sysclass, &amp;s3c2440_plls12_drv);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2440_plls12_interface);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2440_pll_12mhz);</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2442_plls12_drv = {</div><div class='del'>-	.add	= s3c2440_plls12_add,</div><div class='add'>+static struct subsys_interface s3c2442_plls12_interface = {</div><div class='add'>+	.name		= "s3c2442_plls12",</div><div class='add'>+	.subsys		= &amp;s3c2442_subsys,</div><div class='add'>+	.add_dev	= s3c2440_plls12_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2442_pll_12mhz(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2442_sysclass, &amp;s3c2442_plls12_drv);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2442_plls12_interface);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2440/s3c2440-pll-16934400.c b/arch/arm/mach-s3c2440/s3c2440-pll-16934400.c<br/>index c8a8f90ef382..42f2b5cd2399 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/s3c2440-pll-16934400.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/s3c2440-pll-16934400.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/s3c2440-pll-16934400.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/s3c2440-pll-16934400.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -79,7 +79,7 @@ static struct cpufreq_frequency_table s3c2440_plls_169344[] __initdata = {</div><div class='ctx'> 	{ .frequency = 402192000,	.index = PLLVAL(87, 2, 1), 	}, 	/* FVco 804.384000 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int s3c2440_plls169344_add(struct sys_device *dev)</div><div class='add'>+static int s3c2440_plls169344_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk *xtal_clk;</div><div class='ctx'> 	unsigned long xtal;</div><div class='hunk'>@@ -100,28 +100,28 @@ static int s3c2440_plls169344_add(struct sys_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2440_plls169344_drv = {</div><div class='del'>-	.add	= s3c2440_plls169344_add,</div><div class='add'>+static struct subsys_interface s3c2440_plls169344_interface = {</div><div class='add'>+	.name		= "s3c2440_plls169344",</div><div class='add'>+	.subsys		= &amp;s3c2440_subsys,</div><div class='add'>+	.add_dev	= s3c2440_plls169344_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2440_pll_16934400(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2440_sysclass,</div><div class='del'>-				      &amp;s3c2440_plls169344_drv);</div><div class='del'>-</div><div class='add'>+	return subsys_interface_register(&amp;s3c2440_plls169344_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2440_pll_16934400);</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2442_plls169344_drv = {</div><div class='del'>-	.add	= s3c2440_plls169344_add,</div><div class='add'>+static struct subsys_interface s3c2442_plls169344_interface = {</div><div class='add'>+	.name		= "s3c2442_plls169344",</div><div class='add'>+	.subsys		= &amp;s3c2442_subsys,</div><div class='add'>+	.add_dev	= s3c2440_plls169344_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2442_pll_16934400(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2442_sysclass,</div><div class='del'>-				      &amp;s3c2442_plls169344_drv);</div><div class='del'>-</div><div class='add'>+	return subsys_interface_register(&amp;s3c2442_plls169344_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2442_pll_16934400);</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/s3c2440.c b/arch/arm/mach-s3c2440/s3c2440.c<br/>index 37f8cc6aabd4..517623a09fc5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/s3c2440.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/s3c2440.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/s3c2440.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/s3c2440.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='hunk'>@@ -35,13 +35,14 @@</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/s3c244x.h&gt;</div><div class='ctx'> #include &lt;plat/pm.h&gt;</div><div class='add'>+#include &lt;plat/watchdog-reset.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/gpio-core.h&gt;</div><div class='ctx'> #include &lt;plat/gpio-cfg.h&gt;</div><div class='ctx'> #include &lt;plat/gpio-cfg-helpers.h&gt;</div><div class='ctx'> </div><div class='del'>-static struct sys_device s3c2440_sysdev = {</div><div class='del'>-	.cls		= &amp;s3c2440_sysclass,</div><div class='add'>+static struct device s3c2440_dev = {</div><div class='add'>+	.bus		= &amp;s3c2440_subsys,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int __init s3c2440_init(void)</div><div class='hunk'>@@ -63,7 +64,7 @@ int __init s3c2440_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* register our system device for everything else */</div><div class='ctx'> </div><div class='del'>-	return sysdev_register(&amp;s3c2440_sysdev);</div><div class='add'>+	return device_register(&amp;s3c2440_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init s3c2440_map_io(void)</div><div class='hunk'>@@ -73,3 +74,15 @@ void __init s3c2440_map_io(void)</div><div class='ctx'> 	s3c24xx_gpiocfg_default.set_pull = s3c24xx_gpio_setpull_1up;</div><div class='ctx'> 	s3c24xx_gpiocfg_default.get_pull = s3c24xx_gpio_getpull_1up;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void s3c2440_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	if (mode == 's') {</div><div class='add'>+		soft_restart(0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arch_wdt_reset();</div><div class='add'>+</div><div class='add'>+	/* we'll take a jump through zero as a poor second */</div><div class='add'>+	soft_restart(0);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/s3c2442.c b/arch/arm/mach-s3c2440/s3c2442.c<br/>index 2c822e09392f..8004e0497bf4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/s3c2442.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/s3c2442.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/s3c2442.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/s3c2442.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -123,7 +122,7 @@ static struct clk s3c2442_clk_cam_upll = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int s3c2442_clk_add(struct sys_device *sysdev)</div><div class='add'>+static int s3c2442_clk_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk *clock_upll;</div><div class='ctx'> 	struct clk *clock_h;</div><div class='hunk'>@@ -149,20 +148,22 @@ static int s3c2442_clk_add(struct sys_device *sysdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2442_clk_driver = {</div><div class='del'>-	.add	= s3c2442_clk_add,</div><div class='add'>+static struct subsys_interface s3c2442_clk_interface = {</div><div class='add'>+	.name		= "s3c2442_clk",</div><div class='add'>+	.subsys		= &amp;s3c2442_subsys,</div><div class='add'>+	.add_dev	= s3c2442_clk_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __init int s3c2442_clk_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2442_sysclass, &amp;s3c2442_clk_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2442_clk_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2442_clk_init);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct sys_device s3c2442_sysdev = {</div><div class='del'>-	.cls		= &amp;s3c2442_sysclass,</div><div class='add'>+static struct device s3c2442_dev = {</div><div class='add'>+	.bus		= &amp;s3c2442_subsys,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int __init s3c2442_init(void)</div><div class='hunk'>@@ -175,7 +176,7 @@ int __init s3c2442_init(void)</div><div class='ctx'> 	register_syscore_ops(&amp;s3c244x_pm_syscore_ops);</div><div class='ctx'> 	register_syscore_ops(&amp;s3c24xx_irq_syscore_ops);</div><div class='ctx'> </div><div class='del'>-	return sysdev_register(&amp;s3c2442_sysdev);</div><div class='add'>+	return device_register(&amp;s3c2442_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init s3c2442_map_io(void)</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/s3c244x-clock.c b/arch/arm/mach-s3c2440/s3c244x-clock.c<br/>index 7f5ea0a169a5..b3fdbdda3d5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/s3c244x-clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/s3c244x-clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/s3c244x-clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/s3c244x-clock.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='hunk'>@@ -73,7 +72,7 @@ static struct clk clk_arm = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int s3c244x_clk_add(struct sys_device *sysdev)</div><div class='add'>+static int s3c244x_clk_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long camdivn = __raw_readl(S3C2440_CAMDIVN);</div><div class='ctx'> 	unsigned long clkdivn;</div><div class='hunk'>@@ -115,24 +114,28 @@ static int s3c244x_clk_add(struct sys_device *sysdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2440_clk_driver = {</div><div class='del'>-	.add		= s3c244x_clk_add,</div><div class='add'>+static struct subsys_interface s3c2440_clk_interface = {</div><div class='add'>+	.name		= "s3c2440_clk",</div><div class='add'>+	.subsys		= &amp;s3c2440_subsys,</div><div class='add'>+	.add_dev	= s3c244x_clk_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int s3c2440_clk_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2440_sysclass, &amp;s3c2440_clk_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2440_clk_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2440_clk_init);</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2442_clk_driver = {</div><div class='del'>-	.add		= s3c244x_clk_add,</div><div class='add'>+static struct subsys_interface s3c2442_clk_interface = {</div><div class='add'>+	.name		= "s3c2442_clk",</div><div class='add'>+	.subsys		= &amp;s3c2442_subsys,</div><div class='add'>+	.add_dev	= s3c244x_clk_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int s3c2442_clk_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2442_sysclass, &amp;s3c2442_clk_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2442_clk_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2442_clk_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/s3c244x-irq.c b/arch/arm/mach-s3c2440/s3c244x-irq.c<br/>index c63e8f26d901..74d3dcf46a48 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/s3c244x-irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/s3c244x-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/s3c244x-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/s3c244x-irq.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='hunk'>@@ -91,7 +91,7 @@ static struct irq_chip s3c_irq_cam = {</div><div class='ctx'> 	.irq_ack	= s3c_irq_cam_ack,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int s3c244x_irq_add(struct sys_device *sysdev)</div><div class='add'>+static int s3c244x_irq_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int irqno;</div><div class='ctx'> </div><div class='hunk'>@@ -114,25 +114,29 @@ static int s3c244x_irq_add(struct sys_device *sysdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2440_irq_driver = {</div><div class='del'>-	.add		= s3c244x_irq_add,</div><div class='add'>+static struct subsys_interface s3c2440_irq_interface = {</div><div class='add'>+	.name		= "s3c2440_irq",</div><div class='add'>+	.subsys		= &amp;s3c2440_subsys,</div><div class='add'>+	.add_dev	= s3c244x_irq_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int s3c2440_irq_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2440_sysclass, &amp;s3c2440_irq_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2440_irq_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2440_irq_init);</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2442_irq_driver = {</div><div class='del'>-	.add		= s3c244x_irq_add,</div><div class='add'>+static struct subsys_interface s3c2442_irq_interface = {</div><div class='add'>+	.name		= "s3c2442_irq",</div><div class='add'>+	.subsys		= &amp;s3c2442_subsys,</div><div class='add'>+	.add_dev	= s3c244x_irq_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int s3c2442_irq_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2442_sysclass, &amp;s3c2442_irq_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2442_irq_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2442_irq_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2440/s3c244x.c b/arch/arm/mach-s3c2440/s3c244x.c<br/>index 7e8a23d2098a..36bc60f61d0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/s3c244x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2440/s3c244x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2440/s3c244x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2440/s3c244x.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='hunk'>@@ -135,17 +135,19 @@ void __init s3c244x_init_clocks(int xtal)</div><div class='ctx'> 	s3c2410_baseclk_add();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Since the S3C2442 and S3C2440 share  items, put both sysclasses here */</div><div class='add'>+/* Since the S3C2442 and S3C2440 share items, put both subsystems here */</div><div class='ctx'> </div><div class='del'>-struct sysdev_class s3c2440_sysclass = {</div><div class='add'>+struct bus_type s3c2440_subsys = {</div><div class='ctx'> 	.name		= "s3c2440-core",</div><div class='add'>+	.dev_name	= "s3c2440-core",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct sysdev_class s3c2442_sysclass = {</div><div class='add'>+struct bus_type s3c2442_subsys = {</div><div class='ctx'> 	.name		= "s3c2442-core",</div><div class='add'>+	.dev_name	= "s3c2442-core",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* need to register class before we actually register the device, and</div><div class='add'>+/* need to register the subsystem before we actually register the device, and</div><div class='ctx'>  * we also need to ensure that it has been initialised before any of the</div><div class='ctx'>  * drivers even try to use it (even if not on an s3c2440 based system)</div><div class='ctx'>  * as a driver which may support both 2410 and 2440 may try and use it.</div><div class='hunk'>@@ -153,14 +155,14 @@ struct sysdev_class s3c2442_sysclass = {</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2440_core_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_class_register(&amp;s3c2440_sysclass);</div><div class='add'>+	return subsys_system_register(&amp;s3c2440_subsys, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> core_initcall(s3c2440_core_init);</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2442_core_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_class_register(&amp;s3c2442_sysclass);</div><div class='add'>+	return subsys_system_register(&amp;s3c2442_subsys, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> core_initcall(s3c2442_core_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c<br/>index 1c2c088aa2e8..6dde2696f8f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2443/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2443/clock.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-s3c2443/dma.c b/arch/arm/mach-s3c2443/dma.c<br/>index fe52151d2e84..de6b4a23c9ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2443/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2443/dma.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</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='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -135,19 +135,21 @@ static struct s3c24xx_dma_selection __initdata s3c2443_dma_sel = {</div><div class='ctx'> 	.map_size	= ARRAY_SIZE(s3c2443_dma_mappings),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init s3c2443_dma_add(struct sys_device *sysdev)</div><div class='add'>+static int __init s3c2443_dma_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	s3c24xx_dma_init(6, IRQ_S3C2443_DMA0, 0x100);</div><div class='ctx'> 	return s3c24xx_dma_init_map(&amp;s3c2443_dma_sel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2443_dma_driver = {</div><div class='del'>-	.add	= s3c2443_dma_add,</div><div class='add'>+static struct subsys_interface s3c2443_dma_interface = {</div><div class='add'>+	.name		= "s3c2443_dma",</div><div class='add'>+	.subsys		= &amp;s3c2443_subsys,</div><div class='add'>+	.add_dev	= s3c2443_dma_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2443_dma_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2443_sysclass, &amp;s3c2443_dma_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2443_dma_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2443_dma_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2443/irq.c b/arch/arm/mach-s3c2443/irq.c<br/>index 83ecb1173fb1..35e4ff24fb43 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2443/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2443/irq.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='hunk'>@@ -241,7 +241,7 @@ static int __init s3c2443_add_sub(unsigned int base,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init s3c2443_irq_add(struct sys_device *sysdev)</div><div class='add'>+static int __init s3c2443_irq_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	printk("S3C2443: IRQ Support\n");</div><div class='ctx'> </div><div class='hunk'>@@ -265,13 +265,15 @@ static int __init s3c2443_irq_add(struct sys_device *sysdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s3c2443_irq_driver = {</div><div class='del'>-	.add		= s3c2443_irq_add,</div><div class='add'>+static struct subsys_interface s3c2443_irq_interface = {</div><div class='add'>+	.name		= "s3c2443_irq",</div><div class='add'>+	.subsys		= &amp;s3c2443_subsys,</div><div class='add'>+	.add_dev	= s3c2443_irq_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2443_irq_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s3c2443_sysclass, &amp;s3c2443_irq_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s3c2443_irq_interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(s3c2443_irq_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2443/mach-smdk2443.c b/arch/arm/mach-s3c2443/mach-smdk2443.c<br/>index bec107e00441..209236956222 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/mach-smdk2443.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2443/mach-smdk2443.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/mach-smdk2443.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2443/mach-smdk2443.c</a></div><div class='hunk'>@@ -145,4 +145,5 @@ MACHINE_START(SMDK2443, "SMDK2443")</div><div class='ctx'> 	.map_io		= smdk2443_map_io,</div><div class='ctx'> 	.init_machine	= smdk2443_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c2443_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2443/s3c2443.c b/arch/arm/mach-s3c2443/s3c2443.c<br/>index a22b771b0f36..b9deaeb0dfff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/s3c2443.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c2443/s3c2443.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2443/s3c2443.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c2443/s3c2443.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-s3c2443-clock.h&gt;</div><div class='del'>-#include &lt;mach/reset.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/gpio-core.h&gt;</div><div class='ctx'> #include &lt;plat/gpio-cfg.h&gt;</div><div class='hunk'>@@ -49,16 +48,20 @@ static struct map_desc s3c2443_iodesc[] __initdata = {</div><div class='ctx'> 	IODESC_ENT(TIMER),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct sysdev_class s3c2443_sysclass = {</div><div class='add'>+struct bus_type s3c2443_subsys = {</div><div class='ctx'> 	.name = "s3c2443-core",</div><div class='add'>+	.dev_name = "s3c2443-core",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sys_device s3c2443_sysdev = {</div><div class='del'>-	.cls		= &amp;s3c2443_sysclass,</div><div class='add'>+static struct device s3c2443_dev = {</div><div class='add'>+	.bus		= &amp;s3c2443_subsys,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void s3c2443_hard_reset(void)</div><div class='add'>+void s3c2443_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='add'>+	if (mode == 's')</div><div class='add'>+		soft_restart(0);</div><div class='add'>+</div><div class='ctx'> 	__raw_writel(S3C2443_SWRST_RESET, S3C2443_SWRST);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -66,8 +69,6 @@ int __init s3c2443_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk("S3C2443: Initialising architecture\n");</div><div class='ctx'> </div><div class='del'>-	s3c24xx_reset_hook = s3c2443_hard_reset;</div><div class='del'>-</div><div class='ctx'> 	s3c_nand_setname("s3c2412-nand");</div><div class='ctx'> 	s3c_fb_setname("s3c2443-fb");</div><div class='ctx'> </div><div class='hunk'>@@ -77,7 +78,7 @@ int __init s3c2443_init(void)</div><div class='ctx'> 	s3c_device_wdt.resource[1].start = IRQ_S3C2443_WDT;</div><div class='ctx'> 	s3c_device_wdt.resource[1].end   = IRQ_S3C2443_WDT;</div><div class='ctx'> </div><div class='del'>-	return sysdev_register(&amp;s3c2443_sysdev);</div><div class='add'>+	return device_register(&amp;s3c2443_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init s3c2443_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='hunk'>@@ -99,7 +100,7 @@ void __init s3c2443_map_io(void)</div><div class='ctx'> 	iotable_init(s3c2443_iodesc, ARRAY_SIZE(s3c2443_iodesc));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* need to register class before we actually register the device, and</div><div class='add'>+/* need to register the subsystem before we actually register the device, and</div><div class='ctx'>  * we also need to ensure that it has been initialised before any of the</div><div class='ctx'>  * drivers even try to use it (even if not on an s3c2443 based system)</div><div class='ctx'>  * as a driver which may support both 2443 and 2440 may try and use it.</div><div class='hunk'>@@ -107,7 +108,7 @@ void __init s3c2443_map_io(void)</div><div class='ctx'> </div><div class='ctx'> static int __init s3c2443_core_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_class_register(&amp;s3c2443_sysclass);</div><div class='add'>+	return subsys_system_register(&amp;s3c2443_subsys, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> core_initcall(s3c2443_core_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig<br/>index 5552e048c2be..dd20c66cd700 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/Kconfig</a></div><div class='hunk'>@@ -8,6 +8,7 @@ config PLAT_S3C64XX</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on ARCH_S3C64XX</div><div class='ctx'> 	select SAMSUNG_WAKEMASK</div><div class='add'>+	select PM_GENERIC_DOMAINS</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  Base platform code for any Samsung S3C64XX device</div><div class='hunk'>@@ -77,6 +78,11 @@ config S3C64XX_SETUP_SDHCI_GPIO</div><div class='ctx'> 	help</div><div class='ctx'> 	  Common setup code for S3C64XX SDHCI GPIO configurations</div><div class='ctx'> </div><div class='add'>+config S3C64XX_SETUP_SPI</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	 Common setup code for SPI GPIO configurations</div><div class='add'>+</div><div class='ctx'> # S36400 Macchine support</div><div class='ctx'> </div><div class='ctx'> config MACH_SMDK6400</div><div class='hunk'>@@ -188,7 +194,7 @@ config SMDK6410_WM1190_EV1</div><div class='ctx'> 	depends on MACH_SMDK6410</div><div class='ctx'> 	select REGULATOR</div><div class='ctx'> 	select REGULATOR_WM8350</div><div class='del'>-	select S3C24XX_GPIO_EXTRA64</div><div class='add'>+	select SAMSUNG_GPIO_EXTRA64</div><div class='ctx'> 	select MFD_WM8350_I2C</div><div class='ctx'> 	select MFD_WM8350_CONFIG_MODE_0</div><div class='ctx'> 	select MFD_WM8350_CONFIG_MODE_3</div><div class='hunk'>@@ -206,7 +212,7 @@ config SMDK6410_WM1192_EV1</div><div class='ctx'> 	depends on MACH_SMDK6410</div><div class='ctx'> 	select REGULATOR</div><div class='ctx'> 	select REGULATOR_WM831X</div><div class='del'>-	select S3C24XX_GPIO_EXTRA64</div><div class='add'>+	select SAMSUNG_GPIO_EXTRA64</div><div class='ctx'> 	select MFD_WM831X</div><div class='ctx'> 	select MFD_WM831X_I2C</div><div class='ctx'> 	help</div><div class='hunk'>@@ -276,6 +282,7 @@ config MACH_WLF_CRAGG_6410</div><div class='ctx'> 	select S3C64XX_SETUP_IDE</div><div class='ctx'> 	select S3C64XX_SETUP_FB_24BPP</div><div class='ctx'> 	select S3C64XX_SETUP_KEYPAD</div><div class='add'>+	select S3C64XX_SETUP_SPI</div><div class='ctx'> 	select SAMSUNG_DEV_ADC</div><div class='ctx'> 	select SAMSUNG_DEV_KEYPAD</div><div class='ctx'> 	select S3C_DEV_USB_HOST</div><div class='hunk'>@@ -286,8 +293,8 @@ config MACH_WLF_CRAGG_6410</div><div class='ctx'> 	select S3C_DEV_I2C1</div><div class='ctx'> 	select S3C_DEV_WDT</div><div class='ctx'> 	select S3C_DEV_RTC</div><div class='del'>-	select S3C64XX_DEV_SPI</div><div class='del'>-	select S3C24XX_GPIO_EXTRA128</div><div class='add'>+	select S3C64XX_DEV_SPI0</div><div class='add'>+	select SAMSUNG_GPIO_EXTRA128</div><div class='ctx'> 	select I2C</div><div class='ctx'> 	help</div><div class='ctx'> 	  Machine support for the Wolfson Cragganmore S3C6410 variant.</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile<br/>index cfc0b9941808..1822ac2eba31 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/Makefile</a></div><div class='hunk'>@@ -10,54 +10,49 @@ obj-m				:=</div><div class='ctx'> obj-n				:=</div><div class='ctx'> obj-				:=</div><div class='ctx'> </div><div class='del'>-# Core files</div><div class='del'>-obj-y				+= cpu.o</div><div class='del'>-obj-y				+= clock.o</div><div class='add'>+# Core</div><div class='ctx'> </div><div class='del'>-# Core support for S3C6400 system</div><div class='add'>+obj-y				+= common.o clock.o</div><div class='add'>+</div><div class='add'>+# Core support</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_CPU_S3C6400)	+= s3c6400.o</div><div class='ctx'> obj-$(CONFIG_CPU_S3C6410)	+= s3c6410.o</div><div class='ctx'> </div><div class='del'>-obj-y				+= irq.o</div><div class='del'>-obj-y				+= irq-eint.o</div><div class='add'>+# PM</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_PM)		+= pm.o irq-pm.o sleep.o</div><div class='ctx'> </div><div class='ctx'> # DMA support</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_S3C64XX_DMA)	+= dma.o</div><div class='ctx'> </div><div class='del'>-# Device setup</div><div class='add'>+# Device support</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o</div><div class='del'>-obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o</div><div class='del'>-obj-$(CONFIG_S3C64XX_SETUP_IDE) += setup-ide.o</div><div class='del'>-obj-$(CONFIG_S3C64XX_SETUP_KEYPAD) += setup-keypad.o</div><div class='del'>-obj-$(CONFIG_S3C64XX_SETUP_SDHCI) += setup-sdhci.o</div><div class='del'>-obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o</div><div class='del'>-obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o</div><div class='add'>+obj-y				+= dev-uart.o</div><div class='add'>+obj-y				+= dev-audio.o</div><div class='add'>+obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o</div><div class='ctx'> </div><div class='del'>-# PM</div><div class='add'>+# Device setup</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_PM)		+= pm.o</div><div class='del'>-obj-$(CONFIG_PM)		+= sleep.o</div><div class='del'>-obj-$(CONFIG_PM)		+= irq-pm.o</div><div class='add'>+obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP)	+= setup-fb-24bpp.o</div><div class='add'>+obj-$(CONFIG_S3C64XX_SETUP_I2C0)	+= setup-i2c0.o</div><div class='add'>+obj-$(CONFIG_S3C64XX_SETUP_I2C1)	+= setup-i2c1.o</div><div class='add'>+obj-$(CONFIG_S3C64XX_SETUP_IDE)		+= setup-ide.o</div><div class='add'>+obj-$(CONFIG_S3C64XX_SETUP_KEYPAD)	+= setup-keypad.o</div><div class='add'>+obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o</div><div class='add'>+obj-$(CONFIG_S3C64XX_SETUP_SPI)		+= setup-spi.o</div><div class='ctx'> </div><div class='ctx'> # Machine support</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_MACH_ANW6410)	+= mach-anw6410.o</div><div class='del'>-obj-$(CONFIG_MACH_SMDK6400)	+= mach-smdk6400.o</div><div class='del'>-obj-$(CONFIG_MACH_SMDK6410)	+= mach-smdk6410.o</div><div class='del'>-obj-$(CONFIG_MACH_REAL6410)     += mach-real6410.o</div><div class='del'>-obj-$(CONFIG_MACH_MINI6410)     += mach-mini6410.o</div><div class='del'>-obj-$(CONFIG_MACH_NCP)		+= mach-ncp.o</div><div class='del'>-obj-$(CONFIG_MACH_HMT)		+= mach-hmt.o</div><div class='del'>-obj-$(CONFIG_MACH_SMARTQ)	+= mach-smartq.o</div><div class='del'>-obj-$(CONFIG_MACH_SMARTQ5)	+= mach-smartq5.o</div><div class='del'>-obj-$(CONFIG_MACH_SMARTQ7)	+= mach-smartq7.o</div><div class='del'>-obj-$(CONFIG_MACH_WLF_CRAGG_6410) += mach-crag6410.o mach-crag6410-module.o</div><div class='del'>-</div><div class='del'>-# device support</div><div class='del'>-</div><div class='del'>-obj-y				+= dev-uart.o</div><div class='del'>-obj-y				+= dev-audio.o</div><div class='del'>-obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o</div><div class='add'>+obj-$(CONFIG_MACH_ANW6410)		+= mach-anw6410.o</div><div class='add'>+obj-$(CONFIG_MACH_HMT)			+= mach-hmt.o</div><div class='add'>+obj-$(CONFIG_MACH_MINI6410)		+= mach-mini6410.o</div><div class='add'>+obj-$(CONFIG_MACH_NCP)			+= mach-ncp.o</div><div class='add'>+obj-$(CONFIG_MACH_REAL6410)		+= mach-real6410.o</div><div class='add'>+obj-$(CONFIG_MACH_SMARTQ)		+= mach-smartq.o</div><div class='add'>+obj-$(CONFIG_MACH_SMARTQ5)		+= mach-smartq5.o</div><div class='add'>+obj-$(CONFIG_MACH_SMARTQ7)		+= mach-smartq7.o</div><div class='add'>+obj-$(CONFIG_MACH_SMDK6400)		+= mach-smdk6400.o</div><div class='add'>+obj-$(CONFIG_MACH_SMDK6410)		+= mach-smdk6410.o</div><div class='add'>+obj-$(CONFIG_MACH_WLF_CRAGG_6410)	+= mach-crag6410.o mach-crag6410-module.o</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c<br/>index 39c238d7a3dc..31bb27dc4aeb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/clock.c</a></div><div class='hunk'>@@ -184,18 +184,6 @@ static struct clk init_clocks_off[] = {</div><div class='ctx'> 		.enable		= s3c64xx_pclk_ctrl,</div><div class='ctx'> 		.ctrlbit	= S3C_CLKCON_PCLK_SPI1,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name		= "spi_48m",</div><div class='del'>-		.devname	= "s3c64xx-spi.0",</div><div class='del'>-		.parent		= &amp;clk_48m,</div><div class='del'>-		.enable		= s3c64xx_sclk_ctrl,</div><div class='del'>-		.ctrlbit	= S3C_CLKCON_SCLK_SPI0_48,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "spi_48m",</div><div class='del'>-		.devname	= "s3c64xx-spi.1",</div><div class='del'>-		.parent		= &amp;clk_48m,</div><div class='del'>-		.enable		= s3c64xx_sclk_ctrl,</div><div class='del'>-		.ctrlbit	= S3C_CLKCON_SCLK_SPI1_48,</div><div class='del'>-	}, {</div><div class='ctx'> 		.name		= "48m",</div><div class='ctx'> 		.devname	= "s3c-sdhci.0",</div><div class='ctx'> 		.parent		= &amp;clk_48m,</div><div class='hunk'>@@ -226,6 +214,22 @@ static struct clk init_clocks_off[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk clk_48m_spi0 = {</div><div class='add'>+	.name		= "spi_48m",</div><div class='add'>+	.devname	= "s3c64xx-spi.0",</div><div class='add'>+	.parent		= &amp;clk_48m,</div><div class='add'>+	.enable		= s3c64xx_sclk_ctrl,</div><div class='add'>+	.ctrlbit	= S3C_CLKCON_SCLK_SPI0_48,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk clk_48m_spi1 = {</div><div class='add'>+	.name		= "spi_48m",</div><div class='add'>+	.devname	= "s3c64xx-spi.1",</div><div class='add'>+	.parent		= &amp;clk_48m,</div><div class='add'>+	.enable		= s3c64xx_sclk_ctrl,</div><div class='add'>+	.ctrlbit	= S3C_CLKCON_SCLK_SPI1_48,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk init_clocks[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name		= "lcd",</div><div class='hunk'>@@ -243,24 +247,6 @@ static struct clk init_clocks[] = {</div><div class='ctx'> 		.enable		= s3c64xx_hclk_ctrl,</div><div class='ctx'> 		.ctrlbit	= S3C_CLKCON_HCLK_UHOST,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name		= "hsmmc",</div><div class='del'>-		.devname	= "s3c-sdhci.0",</div><div class='del'>-		.parent		= &amp;clk_h,</div><div class='del'>-		.enable		= s3c64xx_hclk_ctrl,</div><div class='del'>-		.ctrlbit	= S3C_CLKCON_HCLK_HSMMC0,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "hsmmc",</div><div class='del'>-		.devname	= "s3c-sdhci.1",</div><div class='del'>-		.parent		= &amp;clk_h,</div><div class='del'>-		.enable		= s3c64xx_hclk_ctrl,</div><div class='del'>-		.ctrlbit	= S3C_CLKCON_HCLK_HSMMC1,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "hsmmc",</div><div class='del'>-		.devname	= "s3c-sdhci.2",</div><div class='del'>-		.parent		= &amp;clk_h,</div><div class='del'>-		.enable		= s3c64xx_hclk_ctrl,</div><div class='del'>-		.ctrlbit	= S3C_CLKCON_HCLK_HSMMC2,</div><div class='del'>-	}, {</div><div class='ctx'> 		.name		= "otg",</div><div class='ctx'> 		.parent		= &amp;clk_h,</div><div class='ctx'> 		.enable		= s3c64xx_hclk_ctrl,</div><div class='hunk'>@@ -310,6 +296,29 @@ static struct clk init_clocks[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk clk_hsmmc0 = {</div><div class='add'>+	.name		= "hsmmc",</div><div class='add'>+	.devname	= "s3c-sdhci.0",</div><div class='add'>+	.parent		= &amp;clk_h,</div><div class='add'>+	.enable		= s3c64xx_hclk_ctrl,</div><div class='add'>+	.ctrlbit	= S3C_CLKCON_HCLK_HSMMC0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk clk_hsmmc1 = {</div><div class='add'>+	.name		= "hsmmc",</div><div class='add'>+	.devname	= "s3c-sdhci.1",</div><div class='add'>+	.parent		= &amp;clk_h,</div><div class='add'>+	.enable		= s3c64xx_hclk_ctrl,</div><div class='add'>+	.ctrlbit	= S3C_CLKCON_HCLK_HSMMC1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk clk_hsmmc2 = {</div><div class='add'>+	.name		= "hsmmc",</div><div class='add'>+	.devname	= "s3c-sdhci.2",</div><div class='add'>+	.parent		= &amp;clk_h,</div><div class='add'>+	.enable		= s3c64xx_hclk_ctrl,</div><div class='add'>+	.ctrlbit	= S3C_CLKCON_HCLK_HSMMC2,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static struct clk clk_fout_apll = {</div><div class='ctx'> 	.name		= "fout_apll",</div><div class='hunk'>@@ -578,36 +587,6 @@ static struct clksrc_sources clkset_camif = {</div><div class='ctx'> static struct clksrc_clk clksrcs[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.clk	= {</div><div class='del'>-			.name		= "mmc_bus",</div><div class='del'>-			.devname	= "s3c-sdhci.0",</div><div class='del'>-			.ctrlbit        = S3C_CLKCON_SCLK_MMC0,</div><div class='del'>-			.enable		= s3c64xx_sclk_ctrl,</div><div class='del'>-		},</div><div class='del'>-		.reg_src	= { .reg = S3C_CLK_SRC, .shift = 18, .size = 2  },</div><div class='del'>-		.reg_div	= { .reg = S3C_CLK_DIV1, .shift = 0, .size = 4  },</div><div class='del'>-		.sources	= &amp;clkset_spi_mmc,</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "mmc_bus",</div><div class='del'>-			.devname	= "s3c-sdhci.1",</div><div class='del'>-			.ctrlbit        = S3C_CLKCON_SCLK_MMC1,</div><div class='del'>-			.enable		= s3c64xx_sclk_ctrl,</div><div class='del'>-		},</div><div class='del'>-		.reg_src	= { .reg = S3C_CLK_SRC, .shift = 20, .size = 2  },</div><div class='del'>-		.reg_div	= { .reg = S3C_CLK_DIV1, .shift = 4, .size = 4  },</div><div class='del'>-		.sources	= &amp;clkset_spi_mmc,</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "mmc_bus",</div><div class='del'>-			.devname	= "s3c-sdhci.2",</div><div class='del'>-			.ctrlbit        = S3C_CLKCON_SCLK_MMC2,</div><div class='del'>-			.enable		= s3c64xx_sclk_ctrl,</div><div class='del'>-		},</div><div class='del'>-		.reg_src	= { .reg = S3C_CLK_SRC, .shift = 22, .size = 2  },</div><div class='del'>-		.reg_div 	= { .reg = S3C_CLK_DIV1, .shift = 8, .size = 4  },</div><div class='del'>-		.sources	= &amp;clkset_spi_mmc,</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='ctx'> 			.name		= "usb-bus-host",</div><div class='ctx'> 			.ctrlbit        = S3C_CLKCON_SCLK_UHOST,</div><div class='ctx'> 			.enable		= s3c64xx_sclk_ctrl,</div><div class='hunk'>@@ -617,35 +596,6 @@ static struct clksrc_clk clksrcs[] = {</div><div class='ctx'> 		.sources	= &amp;clkset_uhost,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.clk	= {</div><div class='del'>-			.name		= "uclk1",</div><div class='del'>-			.ctrlbit        = S3C_CLKCON_SCLK_UART,</div><div class='del'>-			.enable		= s3c64xx_sclk_ctrl,</div><div class='del'>-		},</div><div class='del'>-		.reg_src	= { .reg = S3C_CLK_SRC, .shift = 13, .size = 1  },</div><div class='del'>-		.reg_div	= { .reg = S3C_CLK_DIV2, .shift = 16, .size = 4  },</div><div class='del'>-		.sources	= &amp;clkset_uart,</div><div class='del'>-	}, {</div><div class='del'>-/* Where does UCLK0 come from? */</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "spi-bus",</div><div class='del'>-			.devname	= "s3c64xx-spi.0",</div><div class='del'>-			.ctrlbit        = S3C_CLKCON_SCLK_SPI0,</div><div class='del'>-			.enable		= s3c64xx_sclk_ctrl,</div><div class='del'>-		},</div><div class='del'>-		.reg_src	= { .reg = S3C_CLK_SRC, .shift = 14, .size = 2  },</div><div class='del'>-		.reg_div	= { .reg = S3C_CLK_DIV2, .shift = 0, .size = 4  },</div><div class='del'>-		.sources	= &amp;clkset_spi_mmc,</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "spi-bus",</div><div class='del'>-			.devname	= "s3c64xx-spi.1",</div><div class='del'>-			.enable		= s3c64xx_sclk_ctrl,</div><div class='del'>-		},</div><div class='del'>-		.reg_src	= { .reg = S3C_CLK_SRC, .shift = 16, .size = 2  },</div><div class='del'>-		.reg_div	= { .reg = S3C_CLK_DIV2, .shift = 4, .size = 4  },</div><div class='del'>-		.sources	= &amp;clkset_spi_mmc,</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='ctx'> 			.name		= "audio-bus",</div><div class='ctx'> 			.devname	= "samsung-i2s.0",</div><div class='ctx'> 			.ctrlbit        = S3C_CLKCON_SCLK_AUDIO0,</div><div class='hunk'>@@ -695,6 +645,78 @@ static struct clksrc_clk clksrcs[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Where does UCLK0 come from? */</div><div class='add'>+static struct clksrc_clk clk_sclk_uclk = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "uclk1",</div><div class='add'>+		.ctrlbit        = S3C_CLKCON_SCLK_UART,</div><div class='add'>+		.enable		= s3c64xx_sclk_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.reg_src	= { .reg = S3C_CLK_SRC, .shift = 13, .size = 1  },</div><div class='add'>+	.reg_div	= { .reg = S3C_CLK_DIV2, .shift = 16, .size = 4  },</div><div class='add'>+	.sources	= &amp;clkset_uart,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_mmc0 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "mmc_bus",</div><div class='add'>+		.devname	= "s3c-sdhci.0",</div><div class='add'>+		.ctrlbit        = S3C_CLKCON_SCLK_MMC0,</div><div class='add'>+		.enable		= s3c64xx_sclk_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.reg_src	= { .reg = S3C_CLK_SRC, .shift = 18, .size = 2  },</div><div class='add'>+	.reg_div	= { .reg = S3C_CLK_DIV1, .shift = 0, .size = 4  },</div><div class='add'>+	.sources	= &amp;clkset_spi_mmc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_mmc1 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "mmc_bus",</div><div class='add'>+		.devname	= "s3c-sdhci.1",</div><div class='add'>+		.ctrlbit        = S3C_CLKCON_SCLK_MMC1,</div><div class='add'>+		.enable		= s3c64xx_sclk_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.reg_src	= { .reg = S3C_CLK_SRC, .shift = 20, .size = 2  },</div><div class='add'>+	.reg_div	= { .reg = S3C_CLK_DIV1, .shift = 4, .size = 4  },</div><div class='add'>+	.sources	= &amp;clkset_spi_mmc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_mmc2 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "mmc_bus",</div><div class='add'>+		.devname	= "s3c-sdhci.2",</div><div class='add'>+		.ctrlbit        = S3C_CLKCON_SCLK_MMC2,</div><div class='add'>+		.enable		= s3c64xx_sclk_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.reg_src	= { .reg = S3C_CLK_SRC, .shift = 22, .size = 2  },</div><div class='add'>+	.reg_div	= { .reg = S3C_CLK_DIV1, .shift = 8, .size = 4  },</div><div class='add'>+	.sources	= &amp;clkset_spi_mmc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_spi0 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "spi-bus",</div><div class='add'>+		.devname	= "s3c64xx-spi.0",</div><div class='add'>+		.ctrlbit	= S3C_CLKCON_SCLK_SPI0,</div><div class='add'>+		.enable		= s3c64xx_sclk_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.reg_src = { .reg = S3C_CLK_SRC, .shift = 14, .size = 2 },</div><div class='add'>+	.reg_div = { .reg = S3C_CLK_DIV2, .shift = 0, .size = 4 },</div><div class='add'>+	.sources = &amp;clkset_spi_mmc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_spi1 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "spi-bus",</div><div class='add'>+		.devname	= "s3c64xx-spi.1",</div><div class='add'>+		.ctrlbit	= S3C_CLKCON_SCLK_SPI1,</div><div class='add'>+		.enable		= s3c64xx_sclk_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.reg_src = { .reg = S3C_CLK_SRC, .shift = 16, .size = 2 },</div><div class='add'>+	.reg_div = { .reg = S3C_CLK_DIV2, .shift = 4, .size = 4 },</div><div class='add'>+	.sources = &amp;clkset_spi_mmc,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Clock initialisation code */</div><div class='ctx'> </div><div class='ctx'> static struct clksrc_clk *init_parents[] = {</div><div class='hunk'>@@ -703,9 +725,42 @@ static struct clksrc_clk *init_parents[] = {</div><div class='ctx'> 	&amp;clk_mout_mpll,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clksrc_clk *clksrc_cdev[] = {</div><div class='add'>+	&amp;clk_sclk_uclk,</div><div class='add'>+	&amp;clk_sclk_mmc0,</div><div class='add'>+	&amp;clk_sclk_mmc1,</div><div class='add'>+	&amp;clk_sclk_mmc2,</div><div class='add'>+	&amp;clk_sclk_spi0,</div><div class='add'>+	&amp;clk_sclk_spi1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk *clk_cdev[] = {</div><div class='add'>+	&amp;clk_hsmmc0,</div><div class='add'>+	&amp;clk_hsmmc1,</div><div class='add'>+	&amp;clk_hsmmc2,</div><div class='add'>+	&amp;clk_48m_spi0,</div><div class='add'>+	&amp;clk_48m_spi1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_lookup s3c64xx_clk_lookup[] = {</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud2", &amp;clk_p),</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud3", &amp;clk_sclk_uclk.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.0", &amp;clk_hsmmc0),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.0", &amp;clk_hsmmc1),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.0", &amp;clk_hsmmc2),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &amp;clk_sclk_mmc0.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &amp;clk_sclk_mmc1.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &amp;clk_sclk_mmc2.clk),</div><div class='add'>+	CLKDEV_INIT(NULL, "spi_busclk0", &amp;clk_p),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk1", &amp;clk_sclk_spi0.clk),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk2", &amp;clk_48m_spi0),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.1", "spi_busclk1", &amp;clk_sclk_spi1.clk),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.1", "spi_busclk2", &amp;clk_48m_spi1),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define GET_DIV(clk, field) ((((clk) &amp; field##_MASK) &gt;&gt; field##_SHIFT) + 1)</div><div class='ctx'> </div><div class='del'>-void __init_or_cpufreq s3c6400_setup_clocks(void)</div><div class='add'>+void __init_or_cpufreq s3c64xx_setup_clocks(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk *xtal_clk;</div><div class='ctx'> 	unsigned long xtal;</div><div class='hunk'>@@ -804,13 +859,15 @@ static struct clk *clks[] __initdata = {</div><div class='ctx'>  * as ARMCLK as well as the necessary parent clocks.</div><div class='ctx'>  *</div><div class='ctx'>  * This call does not setup the clocks, which is left to the</div><div class='del'>- * s3c6400_setup_clocks() call which may be needed by the cpufreq</div><div class='add'>+ * s3c64xx_setup_clocks() call which may be needed by the cpufreq</div><div class='ctx'>  * or resume code to re-set the clocks if the bootloader has changed</div><div class='ctx'>  * them.</div><div class='ctx'>  */</div><div class='ctx'> void __init s3c64xx_register_clocks(unsigned long xtal, </div><div class='ctx'> 				    unsigned armclk_divlimit)</div><div class='ctx'> {</div><div class='add'>+	unsigned int cnt;</div><div class='add'>+</div><div class='ctx'> 	armclk_mask = armclk_divlimit;</div><div class='ctx'> </div><div class='ctx'> 	s3c24xx_register_baseclocks(xtal);</div><div class='hunk'>@@ -821,7 +878,15 @@ void __init s3c64xx_register_clocks(unsigned long xtal,</div><div class='ctx'> 	s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));</div><div class='ctx'> 	s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));</div><div class='ctx'> </div><div class='add'>+	s3c24xx_register_clocks(clk_cdev, ARRAY_SIZE(clk_cdev));</div><div class='add'>+	for (cnt = 0; cnt &lt; ARRAY_SIZE(clk_cdev); cnt++)</div><div class='add'>+		s3c_disable_clocks(clk_cdev[cnt], 1);</div><div class='add'>+</div><div class='ctx'> 	s3c24xx_register_clocks(clks1, ARRAY_SIZE(clks1));</div><div class='ctx'> 	s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));</div><div class='add'>+	for (cnt = 0; cnt &lt; ARRAY_SIZE(clksrc_cdev); cnt++)</div><div class='add'>+		s3c_register_clksrc(clksrc_cdev[cnt], 1);</div><div class='add'>+	clkdev_add_table(s3c64xx_clk_lookup, ARRAY_SIZE(s3c64xx_clk_lookup));</div><div class='add'>+</div><div class='ctx'> 	s3c_pwmclk_init();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c<br/>new file mode 100644<br/>index 000000000000..4a7394d4bd9e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/common.c</a></div><div class='hunk'>@@ -0,0 +1,385 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 Openmoko, Inc.</div><div class='add'>+ * Copyright 2008 Simtec Electronics</div><div class='add'>+ *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='add'>+ *	http://armlinux.simtec.co.uk/</div><div class='add'>+ *</div><div class='add'>+ * Common Codes for S3C64XX machines</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/serial_core.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/map.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='add'>+#include &lt;plat/gpio-cfg.h&gt;</div><div class='add'>+#include &lt;plat/irq-uart.h&gt;</div><div class='add'>+#include &lt;plat/irq-vic-timer.h&gt;</div><div class='add'>+#include &lt;plat/regs-irqtype.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/watchdog-reset.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+/* uart registration process */</div><div class='add'>+</div><div class='add'>+void __init s3c64xx_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='add'>+{</div><div class='add'>+	s3c24xx_init_uartdevs("s3c6400-uart", s3c64xx_uart_resources, cfg, no);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* table of supported CPUs */</div><div class='add'>+</div><div class='add'>+static const char name_s3c6400[] = "S3C6400";</div><div class='add'>+static const char name_s3c6410[] = "S3C6410";</div><div class='add'>+</div><div class='add'>+static struct cpu_table cpu_ids[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.idcode		= S3C6400_CPU_ID,</div><div class='add'>+		.idmask		= S3C64XX_CPU_MASK,</div><div class='add'>+		.map_io		= s3c6400_map_io,</div><div class='add'>+		.init_clocks	= s3c6400_init_clocks,</div><div class='add'>+		.init_uarts	= s3c64xx_init_uarts,</div><div class='add'>+		.init		= s3c6400_init,</div><div class='add'>+		.name		= name_s3c6400,</div><div class='add'>+	}, {</div><div class='add'>+		.idcode		= S3C6410_CPU_ID,</div><div class='add'>+		.idmask		= S3C64XX_CPU_MASK,</div><div class='add'>+		.map_io		= s3c6410_map_io,</div><div class='add'>+		.init_clocks	= s3c6410_init_clocks,</div><div class='add'>+		.init_uarts	= s3c64xx_init_uarts,</div><div class='add'>+		.init		= s3c6410_init,</div><div class='add'>+		.name		= name_s3c6410,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* minimal IO mapping */</div><div class='add'>+</div><div class='add'>+/* see notes on uart map in arch/arm/mach-s3c64xx/include/mach/debug-macro.S */</div><div class='add'>+#define UART_OFFS (S3C_PA_UART &amp; 0xfffff)</div><div class='add'>+</div><div class='add'>+static struct map_desc s3c_iodesc[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_SYS,</div><div class='add'>+		.pfn		= __phys_to_pfn(S3C64XX_PA_SYSCON),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_MEM,</div><div class='add'>+		.pfn		= __phys_to_pfn(S3C64XX_PA_SROM),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)(S3C_VA_UART + UART_OFFS),</div><div class='add'>+		.pfn		= __phys_to_pfn(S3C_PA_UART),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)VA_VIC0,</div><div class='add'>+		.pfn		= __phys_to_pfn(S3C64XX_PA_VIC0),</div><div class='add'>+		.length		= SZ_16K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)VA_VIC1,</div><div class='add'>+		.pfn		= __phys_to_pfn(S3C64XX_PA_VIC1),</div><div class='add'>+		.length		= SZ_16K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_TIMER,</div><div class='add'>+		.pfn		= __phys_to_pfn(S3C_PA_TIMER),</div><div class='add'>+		.length		= SZ_16K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C64XX_VA_GPIO,</div><div class='add'>+		.pfn		= __phys_to_pfn(S3C64XX_PA_GPIO),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C64XX_VA_MODEM,</div><div class='add'>+		.pfn		= __phys_to_pfn(S3C64XX_PA_MODEM),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_WATCHDOG,</div><div class='add'>+		.pfn		= __phys_to_pfn(S3C64XX_PA_WATCHDOG),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_USB_HSPHY,</div><div class='add'>+		.pfn		= __phys_to_pfn(S3C64XX_PA_USB_HSPHY),</div><div class='add'>+		.length		= SZ_1K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bus_type s3c64xx_subsys = {</div><div class='add'>+	.name		= "s3c64xx-core",</div><div class='add'>+	.dev_name	= "s3c64xx-core",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct device s3c64xx_dev = {</div><div class='add'>+	.bus	= &amp;s3c64xx_subsys,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* read cpu identification code */</div><div class='add'>+</div><div class='add'>+void __init s3c64xx_init_io(struct map_desc *mach_desc, int size)</div><div class='add'>+{</div><div class='add'>+	/* initialise the io descriptors we need for initialisation */</div><div class='add'>+	iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc));</div><div class='add'>+	iotable_init(mach_desc, size);</div><div class='add'>+	init_consistent_dma_size(SZ_8M);</div><div class='add'>+</div><div class='add'>+	/* detect cpu id */</div><div class='add'>+	s3c64xx_init_cpu();</div><div class='add'>+</div><div class='add'>+	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init int s3c64xx_dev_init(void)</div><div class='add'>+{</div><div class='add'>+	subsys_system_register(&amp;s3c64xx_subsys, NULL);</div><div class='add'>+	return device_register(&amp;s3c64xx_dev);</div><div class='add'>+}</div><div class='add'>+core_initcall(s3c64xx_dev_init);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * setup the sources the vic should advertise resume</div><div class='add'>+ * for, even though it is not doing the wake</div><div class='add'>+ * (set_irq_wake needs to be valid)</div><div class='add'>+ */</div><div class='add'>+#define IRQ_VIC0_RESUME (1 &lt;&lt; (IRQ_RTC_TIC - IRQ_VIC0_BASE))</div><div class='add'>+#define IRQ_VIC1_RESUME (1 &lt;&lt; (IRQ_RTC_ALARM - IRQ_VIC1_BASE) |	\</div><div class='add'>+			 1 &lt;&lt; (IRQ_PENDN - IRQ_VIC1_BASE) |	\</div><div class='add'>+			 1 &lt;&lt; (IRQ_HSMMC0 - IRQ_VIC1_BASE) |	\</div><div class='add'>+			 1 &lt;&lt; (IRQ_HSMMC1 - IRQ_VIC1_BASE) |	\</div><div class='add'>+			 1 &lt;&lt; (IRQ_HSMMC2 - IRQ_VIC1_BASE))</div><div class='add'>+</div><div class='add'>+void __init s3c64xx_init_irq(u32 vic0_valid, u32 vic1_valid)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_DEBUG "%s: initialising interrupts\n", __func__);</div><div class='add'>+</div><div class='add'>+	/* initialise the pair of VICs */</div><div class='add'>+	vic_init(VA_VIC0, IRQ_VIC0_BASE, vic0_valid, IRQ_VIC0_RESUME);</div><div class='add'>+	vic_init(VA_VIC1, IRQ_VIC1_BASE, vic1_valid, IRQ_VIC1_RESUME);</div><div class='add'>+</div><div class='add'>+	/* add the timer sub-irqs */</div><div class='add'>+	s3c_init_vic_timer_irq(5, IRQ_TIMER0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define eint_offset(irq)	((irq) - IRQ_EINT(0))</div><div class='add'>+#define eint_irq_to_bit(irq)	((u32)(1 &lt;&lt; eint_offset(irq)))</div><div class='add'>+</div><div class='add'>+static inline void s3c_irq_eint_mask(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	u32 mask;</div><div class='add'>+</div><div class='add'>+	mask = __raw_readl(S3C64XX_EINT0MASK);</div><div class='add'>+	mask |= (u32)data-&gt;chip_data;</div><div class='add'>+	__raw_writel(mask, S3C64XX_EINT0MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s3c_irq_eint_unmask(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	u32 mask;</div><div class='add'>+</div><div class='add'>+	mask = __raw_readl(S3C64XX_EINT0MASK);</div><div class='add'>+	mask &amp;= ~((u32)data-&gt;chip_data);</div><div class='add'>+	__raw_writel(mask, S3C64XX_EINT0MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void s3c_irq_eint_ack(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	__raw_writel((u32)data-&gt;chip_data, S3C64XX_EINT0PEND);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s3c_irq_eint_maskack(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	/* compiler should in-line these */</div><div class='add'>+	s3c_irq_eint_mask(data);</div><div class='add'>+	s3c_irq_eint_ack(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c_irq_eint_set_type(struct irq_data *data, unsigned int type)</div><div class='add'>+{</div><div class='add'>+	int offs = eint_offset(data-&gt;irq);</div><div class='add'>+	int pin, pin_val;</div><div class='add'>+	int shift;</div><div class='add'>+	u32 ctrl, mask;</div><div class='add'>+	u32 newvalue = 0;</div><div class='add'>+	void __iomem *reg;</div><div class='add'>+</div><div class='add'>+	if (offs &gt; 27)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (offs &lt;= 15)</div><div class='add'>+		reg = S3C64XX_EINT0CON0;</div><div class='add'>+	else</div><div class='add'>+		reg = S3C64XX_EINT0CON1;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case IRQ_TYPE_NONE:</div><div class='add'>+		printk(KERN_WARNING "No edge setting!\n");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IRQ_TYPE_EDGE_RISING:</div><div class='add'>+		newvalue = S3C2410_EXTINT_RISEEDGE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IRQ_TYPE_EDGE_FALLING:</div><div class='add'>+		newvalue = S3C2410_EXTINT_FALLEDGE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IRQ_TYPE_EDGE_BOTH:</div><div class='add'>+		newvalue = S3C2410_EXTINT_BOTHEDGE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IRQ_TYPE_LEVEL_LOW:</div><div class='add'>+		newvalue = S3C2410_EXTINT_LOWLEV;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IRQ_TYPE_LEVEL_HIGH:</div><div class='add'>+		newvalue = S3C2410_EXTINT_HILEV;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "No such irq type %d", type);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (offs &lt;= 15)</div><div class='add'>+		shift = (offs / 2) * 4;</div><div class='add'>+	else</div><div class='add'>+		shift = ((offs - 16) / 2) * 4;</div><div class='add'>+	mask = 0x7 &lt;&lt; shift;</div><div class='add'>+</div><div class='add'>+	ctrl = __raw_readl(reg);</div><div class='add'>+	ctrl &amp;= ~mask;</div><div class='add'>+	ctrl |= newvalue &lt;&lt; shift;</div><div class='add'>+	__raw_writel(ctrl, reg);</div><div class='add'>+</div><div class='add'>+	/* set the GPIO pin appropriately */</div><div class='add'>+</div><div class='add'>+	if (offs &lt; 16) {</div><div class='add'>+		pin = S3C64XX_GPN(offs);</div><div class='add'>+		pin_val = S3C_GPIO_SFN(2);</div><div class='add'>+	} else if (offs &lt; 23) {</div><div class='add'>+		pin = S3C64XX_GPL(offs + 8 - 16);</div><div class='add'>+		pin_val = S3C_GPIO_SFN(3);</div><div class='add'>+	} else {</div><div class='add'>+		pin = S3C64XX_GPM(offs - 23);</div><div class='add'>+		pin_val = S3C_GPIO_SFN(3);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s3c_gpio_cfgpin(pin, pin_val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip s3c_irq_eint = {</div><div class='add'>+	.name		= "s3c-eint",</div><div class='add'>+	.irq_mask	= s3c_irq_eint_mask,</div><div class='add'>+	.irq_unmask	= s3c_irq_eint_unmask,</div><div class='add'>+	.irq_mask_ack	= s3c_irq_eint_maskack,</div><div class='add'>+	.irq_ack	= s3c_irq_eint_ack,</div><div class='add'>+	.irq_set_type	= s3c_irq_eint_set_type,</div><div class='add'>+	.irq_set_wake	= s3c_irqext_wake,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* s3c_irq_demux_eint</div><div class='add'>+ *</div><div class='add'>+ * This function demuxes the IRQ from the group0 external interrupts,</div><div class='add'>+ * from IRQ_EINT(0) to IRQ_EINT(27). It is designed to be inlined into</div><div class='add'>+ * the specific handlers s3c_irq_demux_eintX_Y.</div><div class='add'>+ */</div><div class='add'>+static inline void s3c_irq_demux_eint(unsigned int start, unsigned int end)</div><div class='add'>+{</div><div class='add'>+	u32 status = __raw_readl(S3C64XX_EINT0PEND);</div><div class='add'>+	u32 mask = __raw_readl(S3C64XX_EINT0MASK);</div><div class='add'>+	unsigned int irq;</div><div class='add'>+</div><div class='add'>+	status &amp;= ~mask;</div><div class='add'>+	status &gt;&gt;= start;</div><div class='add'>+	status &amp;= (1 &lt;&lt; (end - start + 1)) - 1;</div><div class='add'>+</div><div class='add'>+	for (irq = IRQ_EINT(start); irq &lt;= IRQ_EINT(end); irq++) {</div><div class='add'>+		if (status &amp; 1)</div><div class='add'>+			generic_handle_irq(irq);</div><div class='add'>+</div><div class='add'>+		status &gt;&gt;= 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s3c_irq_demux_eint0_3(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	s3c_irq_demux_eint(0, 3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s3c_irq_demux_eint4_11(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	s3c_irq_demux_eint(4, 11);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s3c_irq_demux_eint12_19(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	s3c_irq_demux_eint(12, 19);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s3c_irq_demux_eint20_27(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	s3c_irq_demux_eint(20, 27);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init s3c64xx_init_irq_eint(void)</div><div class='add'>+{</div><div class='add'>+	int irq;</div><div class='add'>+</div><div class='add'>+	for (irq = IRQ_EINT(0); irq &lt;= IRQ_EINT(27); irq++) {</div><div class='add'>+		irq_set_chip_and_handler(irq, &amp;s3c_irq_eint, handle_level_irq);</div><div class='add'>+		irq_set_chip_data(irq, (void *)eint_irq_to_bit(irq));</div><div class='add'>+		set_irq_flags(irq, IRQF_VALID);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq_set_chained_handler(IRQ_EINT0_3, s3c_irq_demux_eint0_3);</div><div class='add'>+	irq_set_chained_handler(IRQ_EINT4_11, s3c_irq_demux_eint4_11);</div><div class='add'>+	irq_set_chained_handler(IRQ_EINT12_19, s3c_irq_demux_eint12_19);</div><div class='add'>+	irq_set_chained_handler(IRQ_EINT20_27, s3c_irq_demux_eint20_27);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+arch_initcall(s3c64xx_init_irq_eint);</div><div class='add'>+</div><div class='add'>+void s3c64xx_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	if (mode != 's')</div><div class='add'>+		arch_wdt_reset();</div><div class='add'>+</div><div class='add'>+	/* if all else fails, or mode was for soft, jump to 0 */</div><div class='add'>+	soft_restart(0);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/common.h b/arch/arm/mach-s3c64xx/common.h<br/>new file mode 100644<br/>index 000000000000..5eb9c9a7d73b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/common.h</a></div><div class='hunk'>@@ -0,0 +1,56 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 Openmoko, Inc.</div><div class='add'>+ * Copyright 2008 Simtec Electronics</div><div class='add'>+ *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='add'>+ *	http://armlinux.simtec.co.uk/</div><div class='add'>+ *</div><div class='add'>+ * Common Header for S3C64XX machines</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ARCH_ARM_MACH_S3C64XX_COMMON_H</div><div class='add'>+#define __ARCH_ARM_MACH_S3C64XX_COMMON_H</div><div class='add'>+</div><div class='add'>+void s3c64xx_init_irq(u32 vic0, u32 vic1);</div><div class='add'>+void s3c64xx_init_io(struct map_desc *mach_desc, int size);</div><div class='add'>+</div><div class='add'>+void s3c64xx_register_clocks(unsigned long xtal, unsigned armclk_limit);</div><div class='add'>+void s3c64xx_setup_clocks(void);</div><div class='add'>+</div><div class='add'>+void s3c64xx_restart(char mode, const char *cmd);</div><div class='add'>+</div><div class='add'>+extern struct syscore_ops s3c64xx_irq_syscore_ops;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_S3C6400</div><div class='add'>+</div><div class='add'>+extern  int s3c6400_init(void);</div><div class='add'>+extern void s3c6400_init_irq(void);</div><div class='add'>+extern void s3c6400_map_io(void);</div><div class='add'>+extern void s3c6400_init_clocks(int xtal);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define s3c6400_init_clocks NULL</div><div class='add'>+#define s3c6400_map_io NULL</div><div class='add'>+#define s3c6400_init NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_S3C6410</div><div class='add'>+</div><div class='add'>+extern  int s3c6410_init(void);</div><div class='add'>+extern void s3c6410_init_irq(void);</div><div class='add'>+extern void s3c6410_map_io(void);</div><div class='add'>+extern void s3c6410_init_clocks(int xtal);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define s3c6410_init_clocks NULL</div><div class='add'>+#define s3c6410_map_io NULL</div><div class='add'>+#define s3c6410_init NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __ARCH_ARM_MACH_S3C64XX_COMMON_H */</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/cpu.c b/arch/arm/mach-s3c64xx/cpu.c<br/>deleted file mode 100644<br/>index de085b798aa4..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/cpu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/cpu.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,161 +0,0 @@</div><div class='del'>-/* linux/arch/arm/plat-s3c64xx/cpu.c</div><div class='del'>- *</div><div class='del'>- * Copyright 2008 Openmoko, Inc.</div><div class='del'>- * Copyright 2008 Simtec Electronics</div><div class='del'>- *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='del'>- *	http://armlinux.simtec.co.uk/</div><div class='del'>- *</div><div class='del'>- * S3C64XX CPU Support</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='del'>-#include &lt;linux/serial_core.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/mach/map.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/regs-serial.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/cpu.h&gt;</div><div class='del'>-#include &lt;plat/devs.h&gt;</div><div class='del'>-#include &lt;plat/clock.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/s3c6400.h&gt;</div><div class='del'>-#include &lt;plat/s3c6410.h&gt;</div><div class='del'>-</div><div class='del'>-/* table of supported CPUs */</div><div class='del'>-</div><div class='del'>-static const char name_s3c6400[] = "S3C6400";</div><div class='del'>-static const char name_s3c6410[] = "S3C6410";</div><div class='del'>-</div><div class='del'>-static struct cpu_table cpu_ids[] __initdata = {</div><div class='del'>-	{</div><div class='del'>-		.idcode		= S3C6400_CPU_ID,</div><div class='del'>-		.idmask		= S3C64XX_CPU_MASK,</div><div class='del'>-		.map_io		= s3c6400_map_io,</div><div class='del'>-		.init_clocks	= s3c6400_init_clocks,</div><div class='del'>-		.init_uarts	= s3c6400_init_uarts,</div><div class='del'>-		.init		= s3c6400_init,</div><div class='del'>-		.name		= name_s3c6400,</div><div class='del'>-	}, {</div><div class='del'>-		.idcode		= S3C6410_CPU_ID,</div><div class='del'>-		.idmask		= S3C64XX_CPU_MASK,</div><div class='del'>-		.map_io		= s3c6410_map_io,</div><div class='del'>-		.init_clocks	= s3c6410_init_clocks,</div><div class='del'>-		.init_uarts	= s3c6410_init_uarts,</div><div class='del'>-		.init		= s3c6410_init,</div><div class='del'>-		.name		= name_s3c6410,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* minimal IO mapping */</div><div class='del'>-</div><div class='del'>-/* see notes on uart map in arch/arm/mach-s3c6400/include/mach/debug-macro.S */</div><div class='del'>-#define UART_OFFS (S3C_PA_UART &amp; 0xfffff)</div><div class='del'>-</div><div class='del'>-static struct map_desc s3c_iodesc[] __initdata = {</div><div class='del'>-	{</div><div class='del'>-		.virtual	= (unsigned long)S3C_VA_SYS,</div><div class='del'>-		.pfn		= __phys_to_pfn(S3C64XX_PA_SYSCON),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S3C_VA_MEM,</div><div class='del'>-		.pfn		= __phys_to_pfn(S3C64XX_PA_SROM),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)(S3C_VA_UART + UART_OFFS),</div><div class='del'>-		.pfn		= __phys_to_pfn(S3C_PA_UART),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)VA_VIC0,</div><div class='del'>-		.pfn		= __phys_to_pfn(S3C64XX_PA_VIC0),</div><div class='del'>-		.length		= SZ_16K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)VA_VIC1,</div><div class='del'>-		.pfn		= __phys_to_pfn(S3C64XX_PA_VIC1),</div><div class='del'>-		.length		= SZ_16K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S3C_VA_TIMER,</div><div class='del'>-		.pfn		= __phys_to_pfn(S3C_PA_TIMER),</div><div class='del'>-		.length		= SZ_16K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S3C64XX_VA_GPIO,</div><div class='del'>-		.pfn		= __phys_to_pfn(S3C64XX_PA_GPIO),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S3C64XX_VA_MODEM,</div><div class='del'>-		.pfn		= __phys_to_pfn(S3C64XX_PA_MODEM),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S3C_VA_WATCHDOG,</div><div class='del'>-		.pfn		= __phys_to_pfn(S3C64XX_PA_WATCHDOG),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S3C_VA_USB_HSPHY,</div><div class='del'>-		.pfn		= __phys_to_pfn(S3C64XX_PA_USB_HSPHY),</div><div class='del'>-		.length		= SZ_1K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct sysdev_class s3c64xx_sysclass = {</div><div class='del'>-	.name	= "s3c64xx-core",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct sys_device s3c64xx_sysdev = {</div><div class='del'>-	.cls	= &amp;s3c64xx_sysclass,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* uart registration process */</div><div class='del'>-</div><div class='del'>-void __init s3c6400_common_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='del'>-{</div><div class='del'>-	s3c24xx_init_uartdevs("s3c6400-uart", s3c64xx_uart_resources, cfg, no);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* read cpu identification code */</div><div class='del'>-</div><div class='del'>-void __init s3c64xx_init_io(struct map_desc *mach_desc, int size)</div><div class='del'>-{</div><div class='del'>-	/* initialise the io descriptors we need for initialisation */</div><div class='del'>-	iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc));</div><div class='del'>-	iotable_init(mach_desc, size);</div><div class='del'>-	init_consistent_dma_size(SZ_8M);</div><div class='del'>-</div><div class='del'>-	/* detect cpu id */</div><div class='del'>-	s3c64xx_init_cpu();</div><div class='del'>-</div><div class='del'>-	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __init int s3c64xx_sysdev_init(void)</div><div class='del'>-{</div><div class='del'>-	sysdev_class_register(&amp;s3c64xx_sysclass);</div><div class='del'>-	return sysdev_register(&amp;s3c64xx_sysdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-core_initcall(s3c64xx_sysdev_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/dev-spi.c b/arch/arm/mach-s3c64xx/dev-spi.c<br/>deleted file mode 100644<br/>index 3341fd118723..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/dev-spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/dev-spi.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,180 +0,0 @@</div><div class='del'>-/* linux/arch/arm/plat-s3c64xx/dev-spi.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 Samsung Electronics Ltd.</div><div class='del'>- *	Jaswinder Singh &lt;jassi.brar@samsung.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'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/dma.h&gt;</div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='del'>-#include &lt;mach/spi-clocks.h&gt;</div><div class='del'>-#include &lt;mach/irqs.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/s3c64xx-spi.h&gt;</div><div class='del'>-#include &lt;plat/gpio-cfg.h&gt;</div><div class='del'>-#include &lt;plat/devs.h&gt;</div><div class='del'>-</div><div class='del'>-static char *spi_src_clks[] = {</div><div class='del'>-	[S3C64XX_SPI_SRCCLK_PCLK] = "pclk",</div><div class='del'>-	[S3C64XX_SPI_SRCCLK_SPIBUS] = "spi-bus",</div><div class='del'>-	[S3C64XX_SPI_SRCCLK_48M] = "spi_48m",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* SPI Controller platform_devices */</div><div class='del'>-</div><div class='del'>-/* Since we emulate multi-cs capability, we do not touch the GPC-3,7.</div><div class='del'>- * The emulated CS is toggled by board specific mechanism, as it can</div><div class='del'>- * be either some immediate GPIO or some signal out of some other</div><div class='del'>- * chip in between ... or some yet another way.</div><div class='del'>- * We simply do not assume anything about CS.</div><div class='del'>- */</div><div class='del'>-static int s3c64xx_spi_cfg_gpio(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	unsigned int base;</div><div class='del'>-</div><div class='del'>-	switch (pdev-&gt;id) {</div><div class='del'>-	case 0:</div><div class='del'>-		base = S3C64XX_GPC(0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 1:</div><div class='del'>-		base = S3C64XX_GPC(4);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Invalid SPI Controller number!");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s3c_gpio_cfgall_range(base, 3,</div><div class='del'>-			      S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct resource s3c64xx_spi0_resource[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start = S3C64XX_PA_SPI0,</div><div class='del'>-		.end   = S3C64XX_PA_SPI0 + 0x100 - 1,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start = DMACH_SPI0_TX,</div><div class='del'>-		.end   = DMACH_SPI0_TX,</div><div class='del'>-		.flags = IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.start = DMACH_SPI0_RX,</div><div class='del'>-		.end   = DMACH_SPI0_RX,</div><div class='del'>-		.flags = IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[3] = {</div><div class='del'>-		.start = IRQ_SPI0,</div><div class='del'>-		.end   = IRQ_SPI0,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct s3c64xx_spi_info s3c64xx_spi0_pdata = {</div><div class='del'>-	.cfg_gpio = s3c64xx_spi_cfg_gpio,</div><div class='del'>-	.fifo_lvl_mask = 0x7f,</div><div class='del'>-	.rx_lvl_offset = 13,</div><div class='del'>-	.tx_st_done = 21,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u64 spi_dmamask = DMA_BIT_MASK(32);</div><div class='del'>-</div><div class='del'>-struct platform_device s3c64xx_device_spi0 = {</div><div class='del'>-	.name		  = "s3c64xx-spi",</div><div class='del'>-	.id		  = 0,</div><div class='del'>-	.num_resources	  = ARRAY_SIZE(s3c64xx_spi0_resource),</div><div class='del'>-	.resource	  = s3c64xx_spi0_resource,</div><div class='del'>-	.dev = {</div><div class='del'>-		.dma_mask		= &amp;spi_dmamask,</div><div class='del'>-		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-		.platform_data = &amp;s3c64xx_spi0_pdata,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-EXPORT_SYMBOL(s3c64xx_device_spi0);</div><div class='del'>-</div><div class='del'>-static struct resource s3c64xx_spi1_resource[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start = S3C64XX_PA_SPI1,</div><div class='del'>-		.end   = S3C64XX_PA_SPI1 + 0x100 - 1,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start = DMACH_SPI1_TX,</div><div class='del'>-		.end   = DMACH_SPI1_TX,</div><div class='del'>-		.flags = IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.start = DMACH_SPI1_RX,</div><div class='del'>-		.end   = DMACH_SPI1_RX,</div><div class='del'>-		.flags = IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[3] = {</div><div class='del'>-		.start = IRQ_SPI1,</div><div class='del'>-		.end   = IRQ_SPI1,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct s3c64xx_spi_info s3c64xx_spi1_pdata = {</div><div class='del'>-	.cfg_gpio = s3c64xx_spi_cfg_gpio,</div><div class='del'>-	.fifo_lvl_mask = 0x7f,</div><div class='del'>-	.rx_lvl_offset = 13,</div><div class='del'>-	.tx_st_done = 21,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct platform_device s3c64xx_device_spi1 = {</div><div class='del'>-	.name		  = "s3c64xx-spi",</div><div class='del'>-	.id		  = 1,</div><div class='del'>-	.num_resources	  = ARRAY_SIZE(s3c64xx_spi1_resource),</div><div class='del'>-	.resource	  = s3c64xx_spi1_resource,</div><div class='del'>-	.dev = {</div><div class='del'>-		.dma_mask		= &amp;spi_dmamask,</div><div class='del'>-		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-		.platform_data = &amp;s3c64xx_spi1_pdata,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-EXPORT_SYMBOL(s3c64xx_device_spi1);</div><div class='del'>-</div><div class='del'>-void __init s3c64xx_spi_set_info(int cntrlr, int src_clk_nr, int num_cs)</div><div class='del'>-{</div><div class='del'>-	struct s3c64xx_spi_info *pd;</div><div class='del'>-</div><div class='del'>-	/* Reject invalid configuration */</div><div class='del'>-	if (!num_cs || src_clk_nr &lt; 0</div><div class='del'>-			|| src_clk_nr &gt; S3C64XX_SPI_SRCCLK_48M) {</div><div class='del'>-		printk(KERN_ERR "%s: Invalid SPI configuration\n", __func__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (cntrlr) {</div><div class='del'>-	case 0:</div><div class='del'>-		pd = &amp;s3c64xx_spi0_pdata;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		pd = &amp;s3c64xx_spi1_pdata;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "%s: Invalid SPI controller(%d)\n",</div><div class='del'>-							__func__, cntrlr);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pd-&gt;num_cs = num_cs;</div><div class='del'>-	pd-&gt;src_clk_nr = src_clk_nr;</div><div class='del'>-	pd-&gt;src_clk_name = spi_src_clks[src_clk_nr];</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c<br/>index 17d62f4f8204..f2a7a1725596 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/dma.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/dmapool.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> /* dma channel state information */</div><div class='ctx'> </div><div class='ctx'> struct s3c64xx_dmac {</div><div class='del'>-	struct sys_device	 sysdev;</div><div class='add'>+	struct device		dev;</div><div class='ctx'> 	struct clk		*clk;</div><div class='ctx'> 	void __iomem		*regs;</div><div class='ctx'> 	struct s3c2410_dma_chan *channels;</div><div class='hunk'>@@ -631,8 +631,9 @@ static irqreturn_t s3c64xx_dma_irq(int irq, void *pw)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class dma_sysclass = {</div><div class='add'>+static struct bus_type dma_subsys = {</div><div class='ctx'> 	.name		= "s3c64xx-dma",</div><div class='add'>+	.dev_name	= "s3c64xx-dma",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int s3c64xx_dma_init1(int chno, enum dma_ch chbase,</div><div class='hunk'>@@ -651,12 +652,12 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dmac-&gt;sysdev.id = chno / 8;</div><div class='del'>-	dmac-&gt;sysdev.cls = &amp;dma_sysclass;</div><div class='add'>+	dmac-&gt;dev.id = chno / 8;</div><div class='add'>+	dmac-&gt;dev.bus = &amp;dma_subsys;</div><div class='ctx'> </div><div class='del'>-	err = sysdev_register(&amp;dmac-&gt;sysdev);</div><div class='add'>+	err = device_register(&amp;dmac-&gt;dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: failed to register sysdevice\n", __func__);</div><div class='add'>+		printk(KERN_ERR "%s: failed to register device\n", __func__);</div><div class='ctx'> 		goto err_alloc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -667,7 +668,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase,</div><div class='ctx'> 		goto err_dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snprintf(clkname, sizeof(clkname), "dma%d", dmac-&gt;sysdev.id);</div><div class='add'>+	snprintf(clkname, sizeof(clkname), "dma%d", dmac-&gt;dev.id);</div><div class='ctx'> </div><div class='ctx'> 	dmac-&gt;clk = clk_get(NULL, clkname);</div><div class='ctx'> 	if (IS_ERR(dmac-&gt;clk)) {</div><div class='hunk'>@@ -715,7 +716,7 @@ err_clk:</div><div class='ctx'> err_map:</div><div class='ctx'> 	iounmap(regs);</div><div class='ctx'> err_dev:</div><div class='del'>-	sysdev_unregister(&amp;dmac-&gt;sysdev);</div><div class='add'>+	device_unregister(&amp;dmac-&gt;dev);</div><div class='ctx'> err_alloc:</div><div class='ctx'> 	kfree(dmac);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -733,9 +734,9 @@ static int __init s3c64xx_dma_init(void)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = sysdev_class_register(&amp;dma_sysclass);</div><div class='add'>+	ret = subsys_system_register(&amp;dma_subsys, NULL);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		printk(KERN_ERR "%s: failed to create sysclass\n", __func__);</div><div class='add'>+		printk(KERN_ERR "%s: failed to create subsys\n", __func__);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/include/mach/crag6410.h b/arch/arm/mach-s3c64xx/include/mach/crag6410.h<br/>index be9074e17dfd..4cb2f951f1e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/include/mach/crag6410.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/include/mach/crag6410.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/include/mach/crag6410.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/include/mach/crag6410.h</a></div><div class='hunk'>@@ -15,9 +15,12 @@</div><div class='ctx'> </div><div class='ctx'> #define BANFF_PMIC_IRQ_BASE		IRQ_BOARD_START</div><div class='ctx'> #define GLENFARCLAS_PMIC_IRQ_BASE	(IRQ_BOARD_START + 64)</div><div class='add'>+#define CODEC_IRQ_BASE			(IRQ_BOARD_START + 128)</div><div class='ctx'> </div><div class='ctx'> #define PCA935X_GPIO_BASE		GPIO_BOARD_START</div><div class='del'>-#define CODEC_GPIO_BASE		(GPIO_BOARD_START + 8)</div><div class='del'>-#define GLENFARCLAS_PMIC_GPIO_BASE	(GPIO_BOARD_START + 16)</div><div class='add'>+#define CODEC_GPIO_BASE			(GPIO_BOARD_START + 8)</div><div class='add'>+#define GLENFARCLAS_PMIC_GPIO_BASE	(GPIO_BOARD_START + 32)</div><div class='add'>+#define BANFF_PMIC_GPIO_BASE		(GPIO_BOARD_START + 64)</div><div class='add'>+#define MMGPIO_GPIO_BASE		(GPIO_BOARD_START + 96)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/include/mach/entry-macro.S b/arch/arm/mach-s3c64xx/include/mach/entry-macro.S<br/>index dd362604dcce..dc2bc15142ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -12,7 +12,8 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='del'>-#include &lt;mach/irqs.h&gt;</div><div class='add'>+		.macro  disable_fiq</div><div class='add'>+		.endm</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/entry-macro-vic2.S&gt;</div><div class='add'>+		.macro  arch_ret_to_user, tmp1, tmp2</div><div class='add'>+		.endm</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio.h b/arch/arm/mach-s3c64xx/include/mach/gpio.h<br/>index 6e34c2f6e670..8b540c42d5dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/include/mach/gpio.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/include/mach/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/include/mach/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/include/mach/gpio.h</a></div><div class='hunk'>@@ -88,6 +88,6 @@ enum s3c_gpio_number {</div><div class='ctx'> /* define the number of gpios we need to the one after the GPQ() range */</div><div class='ctx'> #define GPIO_BOARD_START (S3C64XX_GPQ(S3C64XX_GPIO_Q_NR) + 1)</div><div class='ctx'> </div><div class='del'>-#define BOARD_NR_GPIOS 16</div><div class='add'>+#define BOARD_NR_GPIOS	(16 + CONFIG_SAMSUNG_GPIO_EXTRA)</div><div class='ctx'> </div><div class='ctx'> #define ARCH_NR_GPIOS	(GPIO_BOARD_START + BOARD_NR_GPIOS)</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/include/mach/irqs.h b/arch/arm/mach-s3c64xx/include/mach/irqs.h<br/>index 443f85b3c203..96d60e0d9372 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/include/mach/irqs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/include/mach/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/include/mach/irqs.h</a></div><div class='hunk'>@@ -169,7 +169,7 @@</div><div class='ctx'> #define IRQ_BOARD_START (IRQ_EINT_GROUP9_BASE + IRQ_EINT_GROUP9_NR + 1)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACH_WLF_CRAGG_6410</div><div class='del'>-#define IRQ_BOARD_NR 128</div><div class='add'>+#define IRQ_BOARD_NR 160</div><div class='ctx'> #elif defined(CONFIG_SMDK6410_WM1190_EV1)</div><div class='ctx'> #define IRQ_BOARD_NR 64</div><div class='ctx'> #elif defined(CONFIG_SMDK6410_WM1192_EV1)</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/include/mach/map.h b/arch/arm/mach-s3c64xx/include/mach/map.h<br/>index 23a1d71e4d53..8e2097bb208a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/include/mach/map.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/include/mach/map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/include/mach/map.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/include/mach/map.h</a></div><div class='hunk'>@@ -115,6 +115,8 @@</div><div class='ctx'> #define S3C_PA_USB_HSOTG	S3C64XX_PA_USB_HSOTG</div><div class='ctx'> #define S3C_PA_RTC		S3C64XX_PA_RTC</div><div class='ctx'> #define S3C_PA_WDT		S3C64XX_PA_WATCHDOG</div><div class='add'>+#define S3C_PA_SPI0		S3C64XX_PA_SPI0</div><div class='add'>+#define S3C_PA_SPI1		S3C64XX_PA_SPI1</div><div class='ctx'> </div><div class='ctx'> #define SAMSUNG_PA_ADC		S3C64XX_PA_ADC</div><div class='ctx'> #define SAMSUNG_PA_CFCON	S3C64XX_PA_CFCON</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/include/mach/system.h b/arch/arm/mach-s3c64xx/include/mach/system.h<br/>index 2e58cb7a7147..353ed4389ae7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/include/mach/system.h</a></div><div class='hunk'>@@ -11,20 +11,9 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H __FILE__</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/watchdog-reset.h&gt;</div><div class='del'>-</div><div class='ctx'> static void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* nothing here yet */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	if (mode != 's')</div><div class='del'>-		arch_wdt_reset();</div><div class='del'>-</div><div class='del'>-	/* if all else fails, or mode was for soft, jump to 0 */</div><div class='del'>-	cpu_reset(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif /* __ASM_ARCH_IRQ_H */</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/include/mach/vmalloc.h b/arch/arm/mach-s3c64xx/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 23f75e556a30..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-/* arch/arm/mach-s3c64xx/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * from arch/arm/mach-iop3xx/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2003 Simtec Electronics &lt;linux@simtec.co.uk&gt;</div><div class='del'>- *		      http://www.simtec.co.uk/products/SWLINUX/</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'>- * S3C6400 vmalloc definition</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#ifndef __ASM_ARCH_VMALLOC_H</div><div class='del'>-#define __ASM_ARCH_VMALLOC_H</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END	0xF6000000UL</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_ARCH_VMALLOC_H */</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/irq-eint.c b/arch/arm/mach-s3c64xx/irq-eint.c<br/>deleted file mode 100644<br/>index 4d203be1f4c3..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/irq-eint.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/irq-eint.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,213 +0,0 @@</div><div class='del'>-/* arch/arm/plat-s3c64xx/irq-eint.c</div><div class='del'>- *</div><div class='del'>- * Copyright 2008 Openmoko, Inc.</div><div class='del'>- * Copyright 2008 Simtec Electronics</div><div class='del'>- *      Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='del'>- *      http://armlinux.simtec.co.uk/</div><div class='del'>- *</div><div class='del'>- * S3C64XX - Interrupt handling for IRQ_EINT(x)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/hardware/vic.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/regs-irqtype.h&gt;</div><div class='del'>-#include &lt;mach/regs-gpio.h&gt;</div><div class='del'>-#include &lt;plat/gpio-cfg.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='del'>-#include &lt;plat/cpu.h&gt;</div><div class='del'>-#include &lt;plat/pm.h&gt;</div><div class='del'>-</div><div class='del'>-#define eint_offset(irq)	((irq) - IRQ_EINT(0))</div><div class='del'>-#define eint_irq_to_bit(irq)	((u32)(1 &lt;&lt; eint_offset(irq)))</div><div class='del'>-</div><div class='del'>-static inline void s3c_irq_eint_mask(struct irq_data *data)</div><div class='del'>-{</div><div class='del'>-	u32 mask;</div><div class='del'>-</div><div class='del'>-	mask = __raw_readl(S3C64XX_EINT0MASK);</div><div class='del'>-	mask |= (u32)data-&gt;chip_data;</div><div class='del'>-	__raw_writel(mask, S3C64XX_EINT0MASK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void s3c_irq_eint_unmask(struct irq_data *data)</div><div class='del'>-{</div><div class='del'>-	u32 mask;</div><div class='del'>-</div><div class='del'>-	mask = __raw_readl(S3C64XX_EINT0MASK);</div><div class='del'>-	mask &amp;= ~((u32)data-&gt;chip_data);</div><div class='del'>-	__raw_writel(mask, S3C64XX_EINT0MASK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void s3c_irq_eint_ack(struct irq_data *data)</div><div class='del'>-{</div><div class='del'>-	__raw_writel((u32)data-&gt;chip_data, S3C64XX_EINT0PEND);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void s3c_irq_eint_maskack(struct irq_data *data)</div><div class='del'>-{</div><div class='del'>-	/* compiler should in-line these */</div><div class='del'>-	s3c_irq_eint_mask(data);</div><div class='del'>-	s3c_irq_eint_ack(data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int s3c_irq_eint_set_type(struct irq_data *data, unsigned int type)</div><div class='del'>-{</div><div class='del'>-	int offs = eint_offset(data-&gt;irq);</div><div class='del'>-	int pin, pin_val;</div><div class='del'>-	int shift;</div><div class='del'>-	u32 ctrl, mask;</div><div class='del'>-	u32 newvalue = 0;</div><div class='del'>-	void __iomem *reg;</div><div class='del'>-</div><div class='del'>-	if (offs &gt; 27)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (offs &lt;= 15)</div><div class='del'>-		reg = S3C64XX_EINT0CON0;</div><div class='del'>-	else</div><div class='del'>-		reg = S3C64XX_EINT0CON1;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case IRQ_TYPE_NONE:</div><div class='del'>-		printk(KERN_WARNING "No edge setting!\n");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IRQ_TYPE_EDGE_RISING:</div><div class='del'>-		newvalue = S3C2410_EXTINT_RISEEDGE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IRQ_TYPE_EDGE_FALLING:</div><div class='del'>-		newvalue = S3C2410_EXTINT_FALLEDGE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IRQ_TYPE_EDGE_BOTH:</div><div class='del'>-		newvalue = S3C2410_EXTINT_BOTHEDGE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IRQ_TYPE_LEVEL_LOW:</div><div class='del'>-		newvalue = S3C2410_EXTINT_LOWLEV;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IRQ_TYPE_LEVEL_HIGH:</div><div class='del'>-		newvalue = S3C2410_EXTINT_HILEV;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "No such irq type %d", type);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (offs &lt;= 15)</div><div class='del'>-		shift = (offs / 2) * 4;</div><div class='del'>-	else</div><div class='del'>-		shift = ((offs - 16) / 2) * 4;</div><div class='del'>-	mask = 0x7 &lt;&lt; shift;</div><div class='del'>-</div><div class='del'>-	ctrl = __raw_readl(reg);</div><div class='del'>-	ctrl &amp;= ~mask;</div><div class='del'>-	ctrl |= newvalue &lt;&lt; shift;</div><div class='del'>-	__raw_writel(ctrl, reg);</div><div class='del'>-</div><div class='del'>-	/* set the GPIO pin appropriately */</div><div class='del'>-</div><div class='del'>-	if (offs &lt; 16) {</div><div class='del'>-		pin = S3C64XX_GPN(offs);</div><div class='del'>-		pin_val = S3C_GPIO_SFN(2);</div><div class='del'>-	} else if (offs &lt; 23) {</div><div class='del'>-		pin = S3C64XX_GPL(offs + 8 - 16);</div><div class='del'>-		pin_val = S3C_GPIO_SFN(3);</div><div class='del'>-	} else {</div><div class='del'>-		pin = S3C64XX_GPM(offs - 23);</div><div class='del'>-		pin_val = S3C_GPIO_SFN(3);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s3c_gpio_cfgpin(pin, pin_val);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct irq_chip s3c_irq_eint = {</div><div class='del'>-	.name		= "s3c-eint",</div><div class='del'>-	.irq_mask	= s3c_irq_eint_mask,</div><div class='del'>-	.irq_unmask	= s3c_irq_eint_unmask,</div><div class='del'>-	.irq_mask_ack	= s3c_irq_eint_maskack,</div><div class='del'>-	.irq_ack	= s3c_irq_eint_ack,</div><div class='del'>-	.irq_set_type	= s3c_irq_eint_set_type,</div><div class='del'>-	.irq_set_wake	= s3c_irqext_wake,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* s3c_irq_demux_eint</div><div class='del'>- *</div><div class='del'>- * This function demuxes the IRQ from the group0 external interrupts,</div><div class='del'>- * from IRQ_EINT(0) to IRQ_EINT(27). It is designed to be inlined into</div><div class='del'>- * the specific handlers s3c_irq_demux_eintX_Y.</div><div class='del'>- */</div><div class='del'>-static inline void s3c_irq_demux_eint(unsigned int start, unsigned int end)</div><div class='del'>-{</div><div class='del'>-	u32 status = __raw_readl(S3C64XX_EINT0PEND);</div><div class='del'>-	u32 mask = __raw_readl(S3C64XX_EINT0MASK);</div><div class='del'>-	unsigned int irq;</div><div class='del'>-</div><div class='del'>-	status &amp;= ~mask;</div><div class='del'>-	status &gt;&gt;= start;</div><div class='del'>-	status &amp;= (1 &lt;&lt; (end - start + 1)) - 1;</div><div class='del'>-</div><div class='del'>-	for (irq = IRQ_EINT(start); irq &lt;= IRQ_EINT(end); irq++) {</div><div class='del'>-		if (status &amp; 1)</div><div class='del'>-			generic_handle_irq(irq);</div><div class='del'>-</div><div class='del'>-		status &gt;&gt;= 1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void s3c_irq_demux_eint0_3(unsigned int irq, struct irq_desc *desc)</div><div class='del'>-{</div><div class='del'>-	s3c_irq_demux_eint(0, 3);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void s3c_irq_demux_eint4_11(unsigned int irq, struct irq_desc *desc)</div><div class='del'>-{</div><div class='del'>-	s3c_irq_demux_eint(4, 11);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void s3c_irq_demux_eint12_19(unsigned int irq, struct irq_desc *desc)</div><div class='del'>-{</div><div class='del'>-	s3c_irq_demux_eint(12, 19);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void s3c_irq_demux_eint20_27(unsigned int irq, struct irq_desc *desc)</div><div class='del'>-{</div><div class='del'>-	s3c_irq_demux_eint(20, 27);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init s3c64xx_init_irq_eint(void)</div><div class='del'>-{</div><div class='del'>-	int irq;</div><div class='del'>-</div><div class='del'>-	for (irq = IRQ_EINT(0); irq &lt;= IRQ_EINT(27); irq++) {</div><div class='del'>-		irq_set_chip_and_handler(irq, &amp;s3c_irq_eint, handle_level_irq);</div><div class='del'>-		irq_set_chip_data(irq, (void *)eint_irq_to_bit(irq));</div><div class='del'>-		set_irq_flags(irq, IRQF_VALID);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	irq_set_chained_handler(IRQ_EINT0_3, s3c_irq_demux_eint0_3);</div><div class='del'>-	irq_set_chained_handler(IRQ_EINT4_11, s3c_irq_demux_eint4_11);</div><div class='del'>-	irq_set_chained_handler(IRQ_EINT12_19, s3c_irq_demux_eint12_19);</div><div class='del'>-	irq_set_chained_handler(IRQ_EINT20_27, s3c_irq_demux_eint20_27);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-arch_initcall(s3c64xx_init_irq_eint);</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/irq.c b/arch/arm/mach-s3c64xx/irq.c<br/>deleted file mode 100644<br/>index b07357e94958..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/irq.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,47 +0,0 @@</div><div class='del'>-/* arch/arm/plat-s3c64xx/irq.c</div><div class='del'>- *</div><div class='del'>- * Copyright 2008 Openmoko, Inc.</div><div class='del'>- * Copyright 2008 Simtec Electronics</div><div class='del'>- *      Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='del'>- *      http://armlinux.simtec.co.uk/</div><div class='del'>- *</div><div class='del'>- * S3C64XX - Interrupt handling</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/serial_core.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/hardware/vic.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='del'>-#include &lt;plat/irq-vic-timer.h&gt;</div><div class='del'>-#include &lt;plat/irq-uart.h&gt;</div><div class='del'>-#include &lt;plat/cpu.h&gt;</div><div class='del'>-</div><div class='del'>-/* setup the sources the vic should advertise resume for, even though it</div><div class='del'>- * is not doing the wake (set_irq_wake needs to be valid) */</div><div class='del'>-#define IRQ_VIC0_RESUME (1 &lt;&lt; (IRQ_RTC_TIC - IRQ_VIC0_BASE))</div><div class='del'>-#define IRQ_VIC1_RESUME (1 &lt;&lt; (IRQ_RTC_ALARM - IRQ_VIC1_BASE) |	\</div><div class='del'>-			 1 &lt;&lt; (IRQ_PENDN - IRQ_VIC1_BASE) |	\</div><div class='del'>-			 1 &lt;&lt; (IRQ_HSMMC0 - IRQ_VIC1_BASE) |	\</div><div class='del'>-			 1 &lt;&lt; (IRQ_HSMMC1 - IRQ_VIC1_BASE) |	\</div><div class='del'>-			 1 &lt;&lt; (IRQ_HSMMC2 - IRQ_VIC1_BASE))</div><div class='del'>-</div><div class='del'>-void __init s3c64xx_init_irq(u32 vic0_valid, u32 vic1_valid)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_DEBUG "%s: initialising interrupts\n", __func__);</div><div class='del'>-</div><div class='del'>-	/* initialise the pair of VICs */</div><div class='del'>-	vic_init(VA_VIC0, IRQ_VIC0_BASE, vic0_valid, IRQ_VIC0_RESUME);</div><div class='del'>-	vic_init(VA_VIC1, IRQ_VIC1_BASE, vic1_valid, IRQ_VIC1_RESUME);</div><div class='del'>-</div><div class='del'>-	/* add the timer sub-irqs */</div><div class='del'>-	s3c_init_vic_timer_irq(5, IRQ_TIMER0);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c<br/>index 8eba88e7209e..b86f2779e4e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-anw6410.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-anw6410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-anw6410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/mach-anw6410.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/platform_lcd.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='hunk'>@@ -45,13 +46,14 @@</div><div class='ctx'> #include &lt;plat/fb.h&gt;</div><div class='ctx'> #include &lt;plat/regs-fb-v4.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/s3c6410.h&gt;</div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;mach/regs-modem.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> /* DM9000 */</div><div class='ctx'> #define ANW6410_PA_DM9000	(0x18000000)</div><div class='ctx'> </div><div class='hunk'>@@ -236,7 +238,9 @@ MACHINE_START(ANW6410, "A&amp;W6410")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> </div><div class='ctx'> 	.init_irq	= s3c6410_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.map_io		= anw6410_map_io,</div><div class='ctx'> 	.init_machine	= anw6410_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c64xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c<br/>index f208154b1382..cd3c97e2ee75 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-crag6410-module.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-crag6410-module.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-crag6410-module.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/mach-crag6410-module.c</a></div><div class='hunk'>@@ -14,13 +14,43 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mfd/wm831x/irq.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/wm831x/gpio.h&gt;</div><div class='add'>+#include &lt;linux/mfd/wm8994/pdata.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;sound/wm5100.h&gt;</div><div class='ctx'> #include &lt;sound/wm8996.h&gt;</div><div class='ctx'> #include &lt;sound/wm8962.h&gt;</div><div class='ctx'> #include &lt;sound/wm9081.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/crag6410.h&gt;</div><div class='ctx'> </div><div class='add'>+static struct wm5100_pdata wm5100_pdata = {</div><div class='add'>+	.ldo_ena = S3C64XX_GPN(7),</div><div class='add'>+	.irq_flags = IRQF_TRIGGER_HIGH,</div><div class='add'>+	.gpio_base = CODEC_GPIO_BASE,</div><div class='add'>+</div><div class='add'>+	.in_mode = {</div><div class='add'>+		WM5100_IN_DIFF,</div><div class='add'>+		WM5100_IN_DIFF,</div><div class='add'>+		WM5100_IN_DIFF,</div><div class='add'>+		WM5100_IN_SE,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.hp_pol = CODEC_GPIO_BASE + 3,</div><div class='add'>+	.jack_modes = {</div><div class='add'>+		{ WM5100_MICDET_MICBIAS3, 0, 0 },</div><div class='add'>+		{ WM5100_MICDET_MICBIAS2, 1, 1 },</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.gpio_defaults = {</div><div class='add'>+		0,</div><div class='add'>+		0,</div><div class='add'>+		0,</div><div class='add'>+		0,</div><div class='add'>+		0x2, /* IRQ: CMOS output */</div><div class='add'>+		0x3, /* CLKOUT: CMOS output */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct wm8996_retune_mobile_config wm8996_retune[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "Sub LPF",</div><div class='hunk'>@@ -72,7 +102,6 @@ static struct wm8962_pdata wm8962_pdata __initdata = {</div><div class='ctx'> 		0x8000 | WM8962_GPIO_FN_DMICDAT,</div><div class='ctx'> 		WM8962_GPIO_FN_IRQ,    /* Open drain mode */</div><div class='ctx'> 	},</div><div class='del'>-	.irq_active_low = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct wm9081_pdata wm9081_pdata __initdata = {</div><div class='hunk'>@@ -91,6 +120,7 @@ static const struct i2c_board_info wm1254_devs[] = {</div><div class='ctx'> </div><div class='ctx'> static const struct i2c_board_info wm1255_devs[] = {</div><div class='ctx'> 	{ I2C_BOARD_INFO("wm5100", 0x1a),</div><div class='add'>+	  .platform_data = &amp;wm5100_pdata,</div><div class='ctx'> 	  .irq = GLENFARCLAS_PMIC_IRQ_BASE + WM831X_IRQ_GPIO_2,</div><div class='ctx'> 	},</div><div class='ctx'> 	{ I2C_BOARD_INFO("wm9081", 0x6c),</div><div class='hunk'>@@ -104,6 +134,24 @@ static const struct i2c_board_info wm1259_devs[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct wm8994_pdata wm8994_pdata = {</div><div class='add'>+	.gpio_base = CODEC_GPIO_BASE,</div><div class='add'>+	.gpio_defaults = {</div><div class='add'>+		0x3,          /* IRQ out, active high, CMOS */</div><div class='add'>+	},</div><div class='add'>+	.irq_base = CODEC_IRQ_BASE,</div><div class='add'>+	.ldo = {</div><div class='add'>+		{ .supply = "WALLVDD" },</div><div class='add'>+		{ .supply = "WALLVDD" },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct i2c_board_info wm1277_devs[] = {</div><div class='add'>+	{ I2C_BOARD_INFO("wm8958", 0x1a),  /* WM8958 is the superset */</div><div class='add'>+	  .platform_data = &amp;wm8994_pdata,</div><div class='add'>+	  .irq = GLENFARCLAS_PMIC_IRQ_BASE + WM831X_IRQ_GPIO_2,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static __devinitdata const struct {</div><div class='ctx'> 	u8 id;</div><div class='hunk'>@@ -125,6 +173,8 @@ static __devinitdata const struct {</div><div class='ctx'> 	{ .id = 0x3b, .name = "1255-EV1 Kilchoman",</div><div class='ctx'> 	  .i2c_devs = wm1255_devs, .num_i2c_devs = ARRAY_SIZE(wm1255_devs) },</div><div class='ctx'> 	{ .id = 0x3c, .name = "1273-EV1 Longmorn" },</div><div class='add'>+	{ .id = 0x3d, .name = "1277-EV1 Littlemill",</div><div class='add'>+	  .i2c_devs = wm1277_devs, .num_i2c_devs = ARRAY_SIZE(wm1277_devs) },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __devinit int wlf_gf_module_probe(struct i2c_client *i2c,</div><div class='hunk'>@@ -154,8 +204,8 @@ static __devinit int wlf_gf_module_probe(struct i2c_client *i2c,</div><div class='ctx'> 					"Failed to register dev: %d\n", ret);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		dev_warn(&amp;i2c-&gt;dev, "Unknown module ID %d revision %d\n",</div><div class='del'>-			 id, rev);</div><div class='add'>+		dev_warn(&amp;i2c-&gt;dev, "Unknown module ID 0x%x revision %d\n",</div><div class='add'>+			 id, rev + 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c<br/>index d04b65448510..8077f650eb0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-crag6410.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-crag6410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-crag6410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/mach-crag6410.c</a></div><div class='hunk'>@@ -37,6 +37,9 @@</div><div class='ctx'> #include &lt;linux/mfd/wm831x/irq.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/wm831x/gpio.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;sound/wm1250-ev1.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -50,7 +53,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/regs-gpio-memport.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/s3c6410.h&gt;</div><div class='ctx'> #include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;plat/regs-fb-v4.h&gt;</div><div class='ctx'> #include &lt;plat/fb.h&gt;</div><div class='hunk'>@@ -66,6 +68,8 @@</div><div class='ctx'> #include &lt;plat/iic.h&gt;</div><div class='ctx'> #include &lt;plat/pm.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> /* serial port setup */</div><div class='ctx'> </div><div class='ctx'> #define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK)</div><div class='hunk'>@@ -256,6 +260,7 @@ static struct platform_device crag6410_dm9k_device = {</div><div class='ctx'> </div><div class='ctx'> static struct resource crag6410_mmgpio_resource[] = {</div><div class='ctx'> 	[0] = {</div><div class='add'>+		.name	= "dat",</div><div class='ctx'> 		.start	= S3C64XX_PA_XM0CSN4 + 1,</div><div class='ctx'> 		.end	= S3C64XX_PA_XM0CSN4 + 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='hunk'>@@ -268,7 +273,7 @@ static struct platform_device crag6410_mmgpio = {</div><div class='ctx'> 	.resource	= crag6410_mmgpio_resource,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(crag6410_mmgpio_resource),</div><div class='ctx'> 	.dev.platform_data = &amp;(struct bgpio_pdata) {</div><div class='del'>-		.base	= -1,</div><div class='add'>+		.base	= MMGPIO_GPIO_BASE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -282,8 +287,13 @@ static struct platform_device lowland_device = {</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device speyside_wm8962_device = {</div><div class='del'>-	.name		= "speyside-wm8962",</div><div class='add'>+static struct platform_device tobermory_device = {</div><div class='add'>+	.name		= "tobermory",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device littlemill_device = {</div><div class='add'>+	.name		= "littlemill",</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -319,7 +329,6 @@ static struct platform_device wallvdd_device = {</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *crag6410_devices[] __initdata = {</div><div class='ctx'> 	&amp;s3c_device_hsmmc0,</div><div class='del'>-	&amp;s3c_device_hsmmc1,</div><div class='ctx'> 	&amp;s3c_device_hsmmc2,</div><div class='ctx'> 	&amp;s3c_device_i2c0,</div><div class='ctx'> 	&amp;s3c_device_i2c1,</div><div class='hunk'>@@ -338,14 +347,15 @@ static struct platform_device *crag6410_devices[] __initdata = {</div><div class='ctx'> 	&amp;crag6410_lcd_powerdev,</div><div class='ctx'> 	&amp;crag6410_backlight_device,</div><div class='ctx'> 	&amp;speyside_device,</div><div class='del'>-	&amp;speyside_wm8962_device,</div><div class='add'>+	&amp;tobermory_device,</div><div class='add'>+	&amp;littlemill_device,</div><div class='ctx'> 	&amp;lowland_device,</div><div class='ctx'> 	&amp;wallvdd_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pca953x_platform_data crag6410_pca_data = {</div><div class='ctx'> 	.gpio_base	= PCA935X_GPIO_BASE,</div><div class='del'>-	.irq_base	= 0,</div><div class='add'>+	.irq_base	= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* VDDARM is controlled by DVS1 connected to GPK(0) */</div><div class='hunk'>@@ -372,6 +382,10 @@ static struct regulator_init_data vddarm __initdata = {</div><div class='ctx'> 	.driver_data = &amp;vddarm_pdata,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct regulator_consumer_supply vddint_consumers[] __initdata = {</div><div class='add'>+	REGULATOR_SUPPLY("vddint", NULL),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct regulator_init_data vddint __initdata = {</div><div class='ctx'> 	.constraints = {</div><div class='ctx'> 		.name = "VDDINT",</div><div class='hunk'>@@ -380,6 +394,9 @@ static struct regulator_init_data vddint __initdata = {</div><div class='ctx'> 		.always_on = 1,</div><div class='ctx'> 		.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,</div><div class='ctx'> 	},</div><div class='add'>+	.num_consumer_supplies = ARRAY_SIZE(vddint_consumers),</div><div class='add'>+	.consumer_supplies = vddint_consumers,</div><div class='add'>+	.supply_regulator = "WALLVDD",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct regulator_init_data vddmem __initdata = {</div><div class='hunk'>@@ -500,7 +517,8 @@ static struct wm831x_touch_pdata touch_pdata __initdata = {</div><div class='ctx'> static struct wm831x_pdata crag_pmic_pdata __initdata = {</div><div class='ctx'> 	.wm831x_num = 1,</div><div class='ctx'> 	.irq_base = BANFF_PMIC_IRQ_BASE,</div><div class='del'>-	.gpio_base = GPIO_BOARD_START + 8,</div><div class='add'>+	.gpio_base = BANFF_PMIC_GPIO_BASE,</div><div class='add'>+	.soft_shutdown = true,</div><div class='ctx'> </div><div class='ctx'> 	.backup = &amp;banff_backup_pdata,</div><div class='ctx'> </div><div class='hunk'>@@ -605,6 +623,7 @@ static struct wm831x_pdata glenfarclas_pmic_pdata __initdata = {</div><div class='ctx'> 	.wm831x_num = 2,</div><div class='ctx'> 	.irq_base = GLENFARCLAS_PMIC_IRQ_BASE,</div><div class='ctx'> 	.gpio_base = GLENFARCLAS_PMIC_GPIO_BASE,</div><div class='add'>+	.soft_shutdown = true,</div><div class='ctx'> </div><div class='ctx'> 	.gpio_defaults = {</div><div class='ctx'> 		/* GPIO1-3: IRQ inputs, rising edge triggered, CMOS */</div><div class='hunk'>@@ -622,6 +641,16 @@ static struct wm831x_pdata glenfarclas_pmic_pdata __initdata = {</div><div class='ctx'> 	.disable_touch = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct wm1250_ev1_pdata wm1250_ev1_pdata = {</div><div class='add'>+	.gpios = {</div><div class='add'>+		[WM1250_EV1_GPIO_CLK_ENA] = S3C64XX_GPN(12),</div><div class='add'>+		[WM1250_EV1_GPIO_CLK_SEL0] = S3C64XX_GPL(12),</div><div class='add'>+		[WM1250_EV1_GPIO_CLK_SEL1] = S3C64XX_GPL(13),</div><div class='add'>+		[WM1250_EV1_GPIO_OSR] = S3C64XX_GPL(14),</div><div class='add'>+		[WM1250_EV1_GPIO_MASTER] = S3C64XX_GPL(8),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct i2c_board_info i2c_devs1[] __initdata = {</div><div class='ctx'> 	{ I2C_BOARD_INFO("wm8311", 0x34),</div><div class='ctx'> 	  .irq = S3C_EINT(0),</div><div class='hunk'>@@ -631,7 +660,13 @@ static struct i2c_board_info i2c_devs1[] __initdata = {</div><div class='ctx'> 	{ I2C_BOARD_INFO("wlf-gf-module", 0x25) },</div><div class='ctx'> 	{ I2C_BOARD_INFO("wlf-gf-module", 0x26) },</div><div class='ctx'> </div><div class='del'>-	{ I2C_BOARD_INFO("wm1250-ev1", 0x27) },</div><div class='add'>+	{ I2C_BOARD_INFO("wm1250-ev1", 0x27),</div><div class='add'>+	  .platform_data = &amp;wm1250_ev1_pdata },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c2410_platform_i2c i2c1_pdata = {</div><div class='add'>+	.frequency = 400000,</div><div class='add'>+	.bus_num = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init crag6410_map_io(void)</div><div class='hunk'>@@ -648,12 +683,6 @@ static struct s3c_sdhci_platdata crag6410_hsmmc2_pdata = {</div><div class='ctx'> 	.cd_type		= S3C_SDHCI_CD_PERMANENT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct s3c_sdhci_platdata crag6410_hsmmc1_pdata = {</div><div class='del'>-	.max_width		= 4,</div><div class='del'>-	.cd_type		= S3C_SDHCI_CD_GPIO,</div><div class='del'>-	.ext_cd_gpio		= S3C64XX_GPF(11),</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void crag6410_cfg_sdhci0(struct platform_device *dev, int width)</div><div class='ctx'> {</div><div class='ctx'> 	/* Set all the necessary GPG pins to special-function 2 */</div><div class='hunk'>@@ -688,11 +717,10 @@ static void __init crag6410_machine_init(void)</div><div class='ctx'> 	gpio_direction_output(S3C64XX_GPF(10), 1);</div><div class='ctx'> </div><div class='ctx'> 	s3c_sdhci0_set_platdata(&amp;crag6410_hsmmc0_pdata);</div><div class='del'>-	s3c_sdhci1_set_platdata(&amp;crag6410_hsmmc1_pdata);</div><div class='ctx'> 	s3c_sdhci2_set_platdata(&amp;crag6410_hsmmc2_pdata);</div><div class='ctx'> </div><div class='ctx'> 	s3c_i2c0_set_platdata(&amp;i2c0_pdata);</div><div class='del'>-	s3c_i2c1_set_platdata(NULL);</div><div class='add'>+	s3c_i2c1_set_platdata(&amp;i2c1_pdata);</div><div class='ctx'> 	s3c_fb_set_platdata(&amp;crag6410_lcd_pdata);</div><div class='ctx'> </div><div class='ctx'> 	i2c_register_board_info(0, i2c_devs0, ARRAY_SIZE(i2c_devs0));</div><div class='hunk'>@@ -704,14 +732,16 @@ static void __init crag6410_machine_init(void)</div><div class='ctx'> </div><div class='ctx'> 	regulator_has_full_constraints();</div><div class='ctx'> </div><div class='del'>-	s3c_pm_init();</div><div class='add'>+	s3c64xx_pm_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410")</div><div class='ctx'> 	/* Maintainer: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt; */</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= s3c6410_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.map_io		= crag6410_map_io,</div><div class='ctx'> 	.init_machine	= crag6410_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c64xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c<br/>index 952f75ff5deb..521e07b8501b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-hmt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-hmt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-hmt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/mach-hmt.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -37,12 +38,13 @@</div><div class='ctx'> #include &lt;plat/fb.h&gt;</div><div class='ctx'> #include &lt;plat/nand.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/s3c6410.h&gt;</div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/regs-fb-v4.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> #define UCON S3C2410_UCON_DEFAULT</div><div class='ctx'> #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE)</div><div class='ctx'> #define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)</div><div class='hunk'>@@ -267,7 +269,9 @@ MACHINE_START(HMT, "Airgoo-HMT")</div><div class='ctx'> 	/* Maintainer: Peter Korsgaard &lt;jacmet@sunsite.dk&gt; */</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= s3c6410_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.map_io		= hmt_map_io,</div><div class='ctx'> 	.init_machine	= hmt_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c64xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c<br/>index 1bc85c359498..c34c2ab22ead 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-mini6410.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-mini6410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-mini6410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/mach-mini6410.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -33,7 +34,6 @@</div><div class='ctx'> #include &lt;mach/regs-modem.h&gt;</div><div class='ctx'> #include &lt;mach/regs-srom.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/s3c6410.h&gt;</div><div class='ctx'> #include &lt;plat/adc.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='hunk'>@@ -45,6 +45,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/platform_lcd.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> #define UCON S3C2410_UCON_DEFAULT</div><div class='ctx'> #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB)</div><div class='ctx'> #define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)</div><div class='hunk'>@@ -345,7 +347,9 @@ MACHINE_START(MINI6410, "MINI6410")</div><div class='ctx'> 	/* Maintainer: Darius Augulis &lt;augulis.darius@gmail.com&gt; */</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= s3c6410_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.map_io		= mini6410_map_io,</div><div class='ctx'> 	.init_machine	= mini6410_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c64xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/mach-ncp.c b/arch/arm/mach-s3c64xx/mach-ncp.c<br/>index cb13cba98b3d..0efa2ba783b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-ncp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-ncp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-ncp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/mach-ncp.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/platform_lcd.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='hunk'>@@ -39,12 +40,13 @@</div><div class='ctx'> #include &lt;plat/iic.h&gt;</div><div class='ctx'> #include &lt;plat/fb.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/s3c6410.h&gt;</div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/regs-fb-v4.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> #define UCON S3C2410_UCON_DEFAULT</div><div class='ctx'> #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE</div><div class='ctx'> #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE</div><div class='hunk'>@@ -99,7 +101,9 @@ MACHINE_START(NCP, "NCP")</div><div class='ctx'> 	/* Maintainer: Samsung Electronics */</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= s3c6410_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.map_io		= ncp_map_io,</div><div class='ctx'> 	.init_machine	= ncp_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c64xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c<br/>index 87281e4b8471..be2a9a22ab74 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-real6410.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-real6410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-real6410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/mach-real6410.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -34,7 +35,6 @@</div><div class='ctx'> #include &lt;mach/regs-modem.h&gt;</div><div class='ctx'> #include &lt;mach/regs-srom.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/s3c6410.h&gt;</div><div class='ctx'> #include &lt;plat/adc.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='hunk'>@@ -46,6 +46,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/platform_lcd.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> #define UCON S3C2410_UCON_DEFAULT</div><div class='ctx'> #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB)</div><div class='ctx'> #define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)</div><div class='hunk'>@@ -326,7 +328,9 @@ MACHINE_START(REAL6410, "REAL6410")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> </div><div class='ctx'> 	.init_irq	= s3c6410_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.map_io		= real6410_map_io,</div><div class='ctx'> 	.init_machine	= real6410_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c64xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/mach-smartq.c b/arch/arm/mach-s3c64xx/mach-smartq.c<br/>index cb1ebeb08763..ce31db136231 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-smartq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-smartq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-smartq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/mach-smartq.c</a></div><div class='hunk'>@@ -40,6 +40,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/platform_lcd.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> #define UCON S3C2410_UCON_DEFAULT</div><div class='ctx'> #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE)</div><div class='ctx'> #define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/mach-smartq5.c b/arch/arm/mach-s3c64xx/mach-smartq5.c<br/>index 94c831d88365..3f42431d4dda 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-smartq5.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-smartq5.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-smartq5.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/mach-smartq5.c</a></div><div class='hunk'>@@ -17,19 +17,20 @@</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/s3c6410.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/fb.h&gt;</div><div class='ctx'> #include &lt;plat/gpio-cfg.h&gt;</div><div class='ctx'> #include &lt;plat/regs-fb-v4.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='ctx'> #include "mach-smartq.h"</div><div class='ctx'> </div><div class='ctx'> static struct gpio_led smartq5_leds[] = {</div><div class='hunk'>@@ -148,7 +149,9 @@ MACHINE_START(SMARTQ5, "SmartQ 5")</div><div class='ctx'> 	/* Maintainer: Maurus Cuelenaere &lt;mcuelenaere AT gmail DOT com&gt; */</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= s3c6410_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.map_io		= smartq_map_io,</div><div class='ctx'> 	.init_machine	= smartq5_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c64xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/mach-smartq7.c b/arch/arm/mach-s3c64xx/mach-smartq7.c<br/>index f112547ce80a..e5c09b6db967 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-smartq7.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-smartq7.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-smartq7.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/mach-smartq7.c</a></div><div class='hunk'>@@ -17,19 +17,20 @@</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/s3c6410.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/fb.h&gt;</div><div class='ctx'> #include &lt;plat/gpio-cfg.h&gt;</div><div class='ctx'> #include &lt;plat/regs-fb-v4.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='ctx'> #include "mach-smartq.h"</div><div class='ctx'> </div><div class='ctx'> static struct gpio_led smartq7_leds[] = {</div><div class='hunk'>@@ -164,7 +165,9 @@ MACHINE_START(SMARTQ7, "SmartQ 7")</div><div class='ctx'> 	/* Maintainer: Maurus Cuelenaere &lt;mcuelenaere AT gmail DOT com&gt; */</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= s3c6410_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.map_io		= smartq_map_io,</div><div class='ctx'> 	.init_machine	= smartq7_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c64xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/mach-smdk6400.c b/arch/arm/mach-s3c64xx/mach-smdk6400.c<br/>index 73450c2b530a..5f096534f4c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-smdk6400.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-smdk6400.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-smdk6400.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/mach-smdk6400.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='hunk'>@@ -31,12 +32,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/s3c6400.h&gt;</div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/iic.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK</div><div class='ctx'> #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB</div><div class='ctx'> #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE</div><div class='hunk'>@@ -88,7 +90,9 @@ MACHINE_START(SMDK6400, "SMDK6400")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> </div><div class='ctx'> 	.init_irq	= s3c6400_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.map_io		= smdk6400_map_io,</div><div class='ctx'> 	.init_machine	= smdk6400_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c64xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c<br/>index 8bc8edd85e5a..ca6fc204f0ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-smdk6410.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/mach-smdk6410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/mach-smdk6410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/mach-smdk6410.c</a></div><div class='hunk'>@@ -43,6 +43,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/platform_lcd.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='hunk'>@@ -63,7 +64,6 @@</div><div class='ctx'> #include &lt;plat/fb.h&gt;</div><div class='ctx'> #include &lt;plat/gpio-cfg.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/s3c6410.h&gt;</div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='hunk'>@@ -73,6 +73,8 @@</div><div class='ctx'> #include &lt;plat/backlight.h&gt;</div><div class='ctx'> #include &lt;plat/regs-fb-v4.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK</div><div class='ctx'> #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB</div><div class='ctx'> #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE</div><div class='hunk'>@@ -700,7 +702,9 @@ MACHINE_START(SMDK6410, "SMDK6410")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> </div><div class='ctx'> 	.init_irq	= s3c6410_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.map_io		= smdk6410_map_io,</div><div class='ctx'> 	.init_machine	= smdk6410_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s3c64xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c<br/>index b375cd5c47cb..7d3e81b9dd06 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/pm.c</a></div><div class='hunk'>@@ -17,10 +17,12 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/pm_domain.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='ctx'> #include &lt;mach/irqs.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/pm.h&gt;</div><div class='ctx'> #include &lt;plat/wakeup-mask.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -31,6 +33,148 @@</div><div class='ctx'> #include &lt;mach/regs-gpio-memport.h&gt;</div><div class='ctx'> #include &lt;mach/regs-modem.h&gt;</div><div class='ctx'> </div><div class='add'>+struct s3c64xx_pm_domain {</div><div class='add'>+	char *const name;</div><div class='add'>+	u32 ena;</div><div class='add'>+	u32 pwr_stat;</div><div class='add'>+	struct generic_pm_domain pd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int s3c64xx_pd_off(struct generic_pm_domain *domain)</div><div class='add'>+{</div><div class='add'>+	struct s3c64xx_pm_domain *pd;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	pd = container_of(domain, struct s3c64xx_pm_domain, pd);</div><div class='add'>+</div><div class='add'>+	val = __raw_readl(S3C64XX_NORMAL_CFG);</div><div class='add'>+	val &amp;= ~(pd-&gt;ena);</div><div class='add'>+	__raw_writel(val, S3C64XX_NORMAL_CFG);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c64xx_pd_on(struct generic_pm_domain *domain)</div><div class='add'>+{</div><div class='add'>+	struct s3c64xx_pm_domain *pd;</div><div class='add'>+	u32 val;</div><div class='add'>+	long retry = 1000000L;</div><div class='add'>+</div><div class='add'>+	pd = container_of(domain, struct s3c64xx_pm_domain, pd);</div><div class='add'>+</div><div class='add'>+	val = __raw_readl(S3C64XX_NORMAL_CFG);</div><div class='add'>+	val |= pd-&gt;ena;</div><div class='add'>+	__raw_writel(val, S3C64XX_NORMAL_CFG);</div><div class='add'>+</div><div class='add'>+	/* Not all domains provide power status readback */</div><div class='add'>+	if (pd-&gt;pwr_stat) {</div><div class='add'>+		do {</div><div class='add'>+			cpu_relax();</div><div class='add'>+			if (__raw_readl(S3C64XX_BLK_PWR_STAT) &amp; pd-&gt;pwr_stat)</div><div class='add'>+				break;</div><div class='add'>+		} while (retry--);</div><div class='add'>+</div><div class='add'>+		if (!retry) {</div><div class='add'>+			pr_err("Failed to start domain %s\n", pd-&gt;name);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct s3c64xx_pm_domain s3c64xx_pm_irom = {</div><div class='add'>+	.name = "IROM",</div><div class='add'>+	.ena = S3C64XX_NORMALCFG_IROM_ON,</div><div class='add'>+	.pd = {</div><div class='add'>+		.power_off = s3c64xx_pd_off,</div><div class='add'>+		.power_on = s3c64xx_pd_on,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c64xx_pm_domain s3c64xx_pm_etm = {</div><div class='add'>+	.name = "ETM",</div><div class='add'>+	.ena = S3C64XX_NORMALCFG_DOMAIN_ETM_ON,</div><div class='add'>+	.pwr_stat = S3C64XX_BLKPWRSTAT_ETM,</div><div class='add'>+	.pd = {</div><div class='add'>+		.power_off = s3c64xx_pd_off,</div><div class='add'>+		.power_on = s3c64xx_pd_on,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c64xx_pm_domain s3c64xx_pm_s = {</div><div class='add'>+	.name = "S",</div><div class='add'>+	.ena = S3C64XX_NORMALCFG_DOMAIN_S_ON,</div><div class='add'>+	.pwr_stat = S3C64XX_BLKPWRSTAT_S,</div><div class='add'>+	.pd = {</div><div class='add'>+		.power_off = s3c64xx_pd_off,</div><div class='add'>+		.power_on = s3c64xx_pd_on,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c64xx_pm_domain s3c64xx_pm_f = {</div><div class='add'>+	.name = "F",</div><div class='add'>+	.ena = S3C64XX_NORMALCFG_DOMAIN_F_ON,</div><div class='add'>+	.pwr_stat = S3C64XX_BLKPWRSTAT_F,</div><div class='add'>+	.pd = {</div><div class='add'>+		.power_off = s3c64xx_pd_off,</div><div class='add'>+		.power_on = s3c64xx_pd_on,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c64xx_pm_domain s3c64xx_pm_p = {</div><div class='add'>+	.name = "P",</div><div class='add'>+	.ena = S3C64XX_NORMALCFG_DOMAIN_P_ON,</div><div class='add'>+	.pwr_stat = S3C64XX_BLKPWRSTAT_P,</div><div class='add'>+	.pd = {</div><div class='add'>+		.power_off = s3c64xx_pd_off,</div><div class='add'>+		.power_on = s3c64xx_pd_on,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c64xx_pm_domain s3c64xx_pm_i = {</div><div class='add'>+	.name = "I",</div><div class='add'>+	.ena = S3C64XX_NORMALCFG_DOMAIN_I_ON,</div><div class='add'>+	.pwr_stat = S3C64XX_BLKPWRSTAT_I,</div><div class='add'>+	.pd = {</div><div class='add'>+		.power_off = s3c64xx_pd_off,</div><div class='add'>+		.power_on = s3c64xx_pd_on,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c64xx_pm_domain s3c64xx_pm_g = {</div><div class='add'>+	.name = "G",</div><div class='add'>+	.ena = S3C64XX_NORMALCFG_DOMAIN_G_ON,</div><div class='add'>+	.pd = {</div><div class='add'>+		.power_off = s3c64xx_pd_off,</div><div class='add'>+		.power_on = s3c64xx_pd_on,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c64xx_pm_domain s3c64xx_pm_v = {</div><div class='add'>+	.name = "V",</div><div class='add'>+	.ena = S3C64XX_NORMALCFG_DOMAIN_V_ON,</div><div class='add'>+	.pwr_stat = S3C64XX_BLKPWRSTAT_V,</div><div class='add'>+	.pd = {</div><div class='add'>+		.power_off = s3c64xx_pd_off,</div><div class='add'>+		.power_on = s3c64xx_pd_on,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c64xx_pm_domain *s3c64xx_always_on_pm_domains[] = {</div><div class='add'>+	&amp;s3c64xx_pm_irom,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c64xx_pm_domain *s3c64xx_pm_domains[] = {</div><div class='add'>+	&amp;s3c64xx_pm_etm,</div><div class='add'>+	&amp;s3c64xx_pm_g,</div><div class='add'>+	&amp;s3c64xx_pm_v,</div><div class='add'>+	&amp;s3c64xx_pm_i,</div><div class='add'>+	&amp;s3c64xx_pm_p,</div><div class='add'>+	&amp;s3c64xx_pm_s,</div><div class='add'>+	&amp;s3c64xx_pm_f,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_S3C_PM_DEBUG_LED_SMDK</div><div class='ctx'> void s3c_pm_debug_smdkled(u32 set, u32 clear)</div><div class='ctx'> {</div><div class='hunk'>@@ -89,6 +233,8 @@ static struct sleep_save misc_save[] = {</div><div class='ctx'> </div><div class='ctx'> 	SAVE_ITEM(S3C64XX_SDMA_SEL),</div><div class='ctx'> 	SAVE_ITEM(S3C64XX_MODEM_MIFPCON),</div><div class='add'>+</div><div class='add'>+	SAVE_ITEM(S3C64XX_NORMAL_CFG),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void s3c_pm_configure_extint(void)</div><div class='hunk'>@@ -179,7 +325,26 @@ static void s3c64xx_pm_prepare(void)</div><div class='ctx'> 	__raw_writel(__raw_readl(S3C64XX_WAKEUP_STAT), S3C64XX_WAKEUP_STAT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s3c64xx_pm_init(void)</div><div class='add'>+int __init s3c64xx_pm_init(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	s3c_pm_init();</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(s3c64xx_always_on_pm_domains); i++)</div><div class='add'>+		pm_genpd_init(&amp;s3c64xx_always_on_pm_domains[i]-&gt;pd,</div><div class='add'>+			      &amp;pm_domain_always_on_gov, false);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(s3c64xx_pm_domains); i++)</div><div class='add'>+		pm_genpd_init(&amp;s3c64xx_pm_domains[i]-&gt;pd, NULL, false);</div><div class='add'>+</div><div class='add'>+	if (dev_get_platdata(&amp;s3c_device_fb.dev))</div><div class='add'>+		pm_genpd_add_device(&amp;s3c64xx_pm_f.pd, &amp;s3c_device_fb.dev);</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 s3c64xx_pm_initcall(void)</div><div class='ctx'> {</div><div class='ctx'> 	pm_cpu_prep = s3c64xx_pm_prepare;</div><div class='ctx'> 	pm_cpu_sleep = s3c64xx_cpu_suspend;</div><div class='hunk'>@@ -198,5 +363,12 @@ static int s3c64xx_pm_init(void)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+arch_initcall(s3c64xx_pm_initcall);</div><div class='add'>+</div><div class='add'>+static __init int s3c64xx_pm_late_initcall(void)</div><div class='add'>+{</div><div class='add'>+	pm_genpd_poweroff_unused();</div><div class='ctx'> </div><div class='del'>-arch_initcall(s3c64xx_pm_init);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+late_initcall(s3c64xx_pm_late_initcall);</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/s3c6400.c b/arch/arm/mach-s3c64xx/s3c6400.c<br/>index 51c00f2453c6..4869714c6f1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/s3c6400.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/s3c6400.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/s3c6400.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/s3c6400.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -38,7 +38,8 @@</div><div class='ctx'> #include &lt;plat/sdhci.h&gt;</div><div class='ctx'> #include &lt;plat/iic-core.h&gt;</div><div class='ctx'> #include &lt;plat/onenand-core.h&gt;</div><div class='del'>-#include &lt;plat/s3c6400.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> void __init s3c6400_map_io(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -60,7 +61,7 @@ void __init s3c6400_map_io(void)</div><div class='ctx'> void __init s3c6400_init_clocks(int xtal)</div><div class='ctx'> {</div><div class='ctx'> 	s3c64xx_register_clocks(xtal, S3C6400_CLKDIV0_ARM_MASK);</div><div class='del'>-	s3c6400_setup_clocks();</div><div class='add'>+	s3c64xx_setup_clocks();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init s3c6400_init_irq(void)</div><div class='hunk'>@@ -70,17 +71,18 @@ void __init s3c6400_init_irq(void)</div><div class='ctx'> 	s3c64xx_init_irq(~0 &amp; ~(0xf &lt;&lt; 5), ~0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class s3c6400_sysclass = {</div><div class='del'>-	.name	= "s3c6400-core",</div><div class='add'>+static struct bus_type s3c6400_subsys = {</div><div class='add'>+	.name		= "s3c6400-core",</div><div class='add'>+	.dev_name	= "s3c6400-core",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sys_device s3c6400_sysdev = {</div><div class='del'>-	.cls	= &amp;s3c6400_sysclass,</div><div class='add'>+static struct device s3c6400_dev = {</div><div class='add'>+	.bus	= &amp;s3c6400_subsys,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c6400_core_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_class_register(&amp;s3c6400_sysclass);</div><div class='add'>+	return subsys_system_register(&amp;s3c6400_subsys, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> core_initcall(s3c6400_core_init);</div><div class='hunk'>@@ -89,5 +91,5 @@ int __init s3c6400_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk("S3C6400: Initialising architecture\n");</div><div class='ctx'> </div><div class='del'>-	return sysdev_register(&amp;s3c6400_sysdev);</div><div class='add'>+	return device_register(&amp;s3c6400_dev);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/s3c6410.c b/arch/arm/mach-s3c64xx/s3c6410.c<br/>index 4117003464ad..31c29fdf1800 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/s3c6410.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/s3c6410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/s3c6410.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/s3c6410.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -41,8 +41,8 @@</div><div class='ctx'> #include &lt;plat/adc-core.h&gt;</div><div class='ctx'> #include &lt;plat/iic-core.h&gt;</div><div class='ctx'> #include &lt;plat/onenand-core.h&gt;</div><div class='del'>-#include &lt;plat/s3c6400.h&gt;</div><div class='del'>-#include &lt;plat/s3c6410.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> void __init s3c6410_map_io(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -66,7 +66,7 @@ void __init s3c6410_init_clocks(int xtal)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_DEBUG "%s: initialising clocks\n", __func__);</div><div class='ctx'> 	s3c64xx_register_clocks(xtal, S3C6410_CLKDIV0_ARM_MASK);</div><div class='del'>-	s3c6400_setup_clocks();</div><div class='add'>+	s3c64xx_setup_clocks();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init s3c6410_init_irq(void)</div><div class='hunk'>@@ -75,17 +75,18 @@ void __init s3c6410_init_irq(void)</div><div class='ctx'> 	s3c64xx_init_irq(~0 &amp; ~(1 &lt;&lt; 7), ~0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sysdev_class s3c6410_sysclass = {</div><div class='del'>-	.name	= "s3c6410-core",</div><div class='add'>+struct bus_type s3c6410_subsys = {</div><div class='add'>+	.name		= "s3c6410-core",</div><div class='add'>+	.dev_name	= "s3c6410-core",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sys_device s3c6410_sysdev = {</div><div class='del'>-	.cls	= &amp;s3c6410_sysclass,</div><div class='add'>+static struct device s3c6410_dev = {</div><div class='add'>+	.bus	= &amp;s3c6410_subsys,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s3c6410_core_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_class_register(&amp;s3c6410_sysclass);</div><div class='add'>+	return subsys_system_register(&amp;s3c6410_subsys, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> core_initcall(s3c6410_core_init);</div><div class='hunk'>@@ -94,5 +95,5 @@ int __init s3c6410_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk("S3C6410: Initialising architecture\n");</div><div class='ctx'> </div><div class='del'>-	return sysdev_register(&amp;s3c6410_sysdev);</div><div class='add'>+	return device_register(&amp;s3c6410_dev);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/setup-sdhci.c b/arch/arm/mach-s3c64xx/setup-sdhci.c<br/>deleted file mode 100644<br/>index c75a71b21165..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/setup-sdhci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s3c64xx/setup-sdhci.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-/* linux/arch/arm/mach-s3c64xx/setup-sdhci.c</div><div class='del'>- *</div><div class='del'>- * Copyright 2008 Simtec Electronics</div><div class='del'>- * Copyright 2008 Simtec Electronics</div><div class='del'>- *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='del'>- *	http://armlinux.simtec.co.uk/</div><div class='del'>- *</div><div class='del'>- * S3C6400/S3C6410 - Helper functions for settign up SDHCI device(s) (HSMMC)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-/* clock sources for the mmc bus clock, order as for the ctrl2[5..4] */</div><div class='del'>-</div><div class='del'>-char *s3c64xx_hsmmc_clksrcs[4] = {</div><div class='del'>-	[0] = "hsmmc",</div><div class='del'>-	[1] = "hsmmc",</div><div class='del'>-	[2] = "mmc_bus",</div><div class='del'>-	/* [3] = "48m", - note not successfully used yet */</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/mach-s3c64xx/setup-spi.c b/arch/arm/mach-s3c64xx/setup-spi.c<br/>new file mode 100644<br/>index 000000000000..d9592ad7a825<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c64xx/setup-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s3c64xx/setup-spi.c</a></div><div class='hunk'>@@ -0,0 +1,45 @@</div><div class='add'>+/* linux/arch/arm/mach-s3c64xx/setup-spi.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Samsung Electronics Ltd.</div><div class='add'>+ *		http://www.samsung.com/</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;plat/gpio-cfg.h&gt;</div><div class='add'>+#include &lt;plat/s3c64xx-spi.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_S3C64XX_DEV_SPI0</div><div class='add'>+struct s3c64xx_spi_info s3c64xx_spi0_pdata __initdata = {</div><div class='add'>+	.fifo_lvl_mask	= 0x7f,</div><div class='add'>+	.rx_lvl_offset	= 13,</div><div class='add'>+	.tx_st_done	= 21,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int s3c64xx_spi0_cfg_gpio(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	s3c_gpio_cfgall_range(S3C64XX_GPC(0), 3,</div><div class='add'>+				S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_S3C64XX_DEV_SPI1</div><div class='add'>+struct s3c64xx_spi_info s3c64xx_spi1_pdata __initdata = {</div><div class='add'>+	.fifo_lvl_mask	= 0x7f,</div><div class='add'>+	.rx_lvl_offset	= 13,</div><div class='add'>+	.tx_st_done	= 21,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int s3c64xx_spi1_cfg_gpio(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	s3c_gpio_cfgall_range(S3C64XX_GPC(4), 3,</div><div class='add'>+				S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/Kconfig b/arch/arm/mach-s5p64x0/Kconfig<br/>index 18690c5f99e6..c87f6108eeb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5p64x0/Kconfig</a></div><div class='hunk'>@@ -36,6 +36,16 @@ config S5P64X0_SETUP_I2C1</div><div class='ctx'> 	help</div><div class='ctx'> 	  Common setup code for i2c bus 1.</div><div class='ctx'> </div><div class='add'>+config S5P64X0_SETUP_SPI</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  Common setup code for SPI GPIO configurations</div><div class='add'>+</div><div class='add'>+config S5P64X0_SETUP_SDHCI_GPIO</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  Common setup code for SDHCI gpio.</div><div class='add'>+</div><div class='ctx'> # machine support</div><div class='ctx'> </div><div class='ctx'> config MACH_SMDK6440</div><div class='hunk'>@@ -45,13 +55,16 @@ config MACH_SMDK6440</div><div class='ctx'> 	select S3C_DEV_I2C1</div><div class='ctx'> 	select S3C_DEV_RTC</div><div class='ctx'> 	select S3C_DEV_WDT</div><div class='del'>-	select S3C64XX_DEV_SPI</div><div class='add'>+	select S3C_DEV_HSMMC</div><div class='add'>+	select S3C_DEV_HSMMC1</div><div class='add'>+	select S3C_DEV_HSMMC2</div><div class='ctx'> 	select SAMSUNG_DEV_ADC</div><div class='ctx'> 	select SAMSUNG_DEV_BACKLIGHT</div><div class='ctx'> 	select SAMSUNG_DEV_PWM</div><div class='ctx'> 	select SAMSUNG_DEV_TS</div><div class='ctx'> 	select S5P64X0_SETUP_FB_24BPP</div><div class='ctx'> 	select S5P64X0_SETUP_I2C1</div><div class='add'>+	select S5P64X0_SETUP_SDHCI_GPIO</div><div class='ctx'> 	help</div><div class='ctx'> 	  Machine support for the Samsung SMDK6440</div><div class='ctx'> </div><div class='hunk'>@@ -62,14 +75,28 @@ config MACH_SMDK6450</div><div class='ctx'> 	select S3C_DEV_I2C1</div><div class='ctx'> 	select S3C_DEV_RTC</div><div class='ctx'> 	select S3C_DEV_WDT</div><div class='del'>-	select S3C64XX_DEV_SPI</div><div class='add'>+	select S3C_DEV_HSMMC</div><div class='add'>+	select S3C_DEV_HSMMC1</div><div class='add'>+	select S3C_DEV_HSMMC2</div><div class='ctx'> 	select SAMSUNG_DEV_ADC</div><div class='ctx'> 	select SAMSUNG_DEV_BACKLIGHT</div><div class='ctx'> 	select SAMSUNG_DEV_PWM</div><div class='ctx'> 	select SAMSUNG_DEV_TS</div><div class='ctx'> 	select S5P64X0_SETUP_FB_24BPP</div><div class='ctx'> 	select S5P64X0_SETUP_I2C1</div><div class='add'>+	select S5P64X0_SETUP_SDHCI_GPIO</div><div class='ctx'> 	help</div><div class='ctx'> 	  Machine support for the Samsung SMDK6450</div><div class='ctx'> </div><div class='add'>+menu "Use 8-bit SDHCI bus width"</div><div class='add'>+</div><div class='add'>+config S5P64X0_SD_CH1_8BIT</div><div class='add'>+	bool "SDHCI Channel 1 (Slot 1)"</div><div class='add'>+	depends on MACH_SMDK6450 || MACH_SMDK6440</div><div class='add'>+	help</div><div class='add'>+	  Support SDHCI Channel 1 8-bit bus.</div><div class='add'>+	  If selected, Channel 2 is disabled.</div><div class='add'>+</div><div class='add'>+endmenu</div><div class='add'>+</div><div class='ctx'> endif</div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/Makefile b/arch/arm/mach-s5p64x0/Makefile<br/>index a1324d8dc4e0..12bb951187a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5p64x0/Makefile</a></div><div class='hunk'>@@ -10,14 +10,16 @@ obj-m				:=</div><div class='ctx'> obj-n				:=</div><div class='ctx'> obj-				:=</div><div class='ctx'> </div><div class='del'>-# Core support for S5P64X0 system</div><div class='add'>+# Core</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_ARCH_S5P64X0)	+= cpu.o init.o clock.o dma.o</div><div class='del'>-obj-$(CONFIG_ARCH_S5P64X0)	+= setup-i2c0.o irq-eint.o</div><div class='add'>+obj-y				+= common.o clock.o</div><div class='ctx'> obj-$(CONFIG_CPU_S5P6440)	+= clock-s5p6440.o</div><div class='ctx'> obj-$(CONFIG_CPU_S5P6450)	+= clock-s5p6450.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_PM)		+= pm.o irq-pm.o</div><div class='ctx'> </div><div class='add'>+obj-y				+= dma.o</div><div class='add'>+</div><div class='ctx'> # machine support</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MACH_SMDK6440)	+= mach-smdk6440.o</div><div class='hunk'>@@ -26,7 +28,9 @@ obj-$(CONFIG_MACH_SMDK6450)	+= mach-smdk6450.o</div><div class='ctx'> # device support</div><div class='ctx'> </div><div class='ctx'> obj-y				+= dev-audio.o</div><div class='del'>-obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o</div><div class='ctx'> </div><div class='add'>+obj-y					+= setup-i2c0.o</div><div class='ctx'> obj-$(CONFIG_S5P64X0_SETUP_I2C1)	+= setup-i2c1.o</div><div class='ctx'> obj-$(CONFIG_S5P64X0_SETUP_FB_24BPP)	+= setup-fb-24bpp.o</div><div class='add'>+obj-$(CONFIG_S5P64X0_SETUP_SPI)		+= setup-spi.o</div><div class='add'>+obj-$(CONFIG_S5P64X0_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o</div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/clock-s5p6440.c b/arch/arm/mach-s5p64x0/clock-s5p6440.c<br/>index c54c65d511f0..ee1e8e7f5631 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/clock-s5p6440.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/clock-s5p6440.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/clock-s5p6440.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5p64x0/clock-s5p6440.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='hunk'>@@ -31,7 +31,8 @@</div><div class='ctx'> #include &lt;plat/pll.h&gt;</div><div class='ctx'> #include &lt;plat/s5p-clock.h&gt;</div><div class='ctx'> #include &lt;plat/clock-clksrc.h&gt;</div><div class='del'>-#include &lt;plat/s5p6440.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> static u32 epll_div[][5] = {</div><div class='ctx'> 	{ 36000000,	0,	48, 1, 4 },</div><div class='hunk'>@@ -268,18 +269,6 @@ static struct clk init_clocks_off[] = {</div><div class='ctx'> 		.enable		= s5p64x0_pclk_ctrl,</div><div class='ctx'> 		.ctrlbit	= (1 &lt;&lt; 31),</div><div class='ctx'> 	}, {</div><div class='del'>-		.name		= "sclk_spi_48",</div><div class='del'>-		.devname	= "s3c64xx-spi.0",</div><div class='del'>-		.parent		= &amp;clk_48m,</div><div class='del'>-		.enable		= s5p64x0_sclk_ctrl,</div><div class='del'>-		.ctrlbit	= (1 &lt;&lt; 22),</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "sclk_spi_48",</div><div class='del'>-		.devname	= "s3c64xx-spi.1",</div><div class='del'>-		.parent		= &amp;clk_48m,</div><div class='del'>-		.enable		= s5p64x0_sclk_ctrl,</div><div class='del'>-		.ctrlbit	= (1 &lt;&lt; 23),</div><div class='del'>-	}, {</div><div class='ctx'> 		.name		= "mmc_48m",</div><div class='ctx'> 		.devname	= "s3c-sdhci.0",</div><div class='ctx'> 		.parent		= &amp;clk_48m,</div><div class='hunk'>@@ -391,65 +380,6 @@ static struct clksrc_sources clkset_audio = {</div><div class='ctx'> static struct clksrc_clk clksrcs[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.clk	= {</div><div class='del'>-			.name		= "sclk_mmc",</div><div class='del'>-			.devname	= "s3c-sdhci.0",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 24),</div><div class='del'>-			.enable		= s5p64x0_sclk_ctrl,</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group1,</div><div class='del'>-		.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 18, .size = 2 },</div><div class='del'>-		.reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 0, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "sclk_mmc",</div><div class='del'>-			.devname	= "s3c-sdhci.1",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 25),</div><div class='del'>-			.enable		= s5p64x0_sclk_ctrl,</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group1,</div><div class='del'>-		.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 20, .size = 2 },</div><div class='del'>-		.reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 4, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "sclk_mmc",</div><div class='del'>-			.devname	= "s3c-sdhci.2",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 26),</div><div class='del'>-			.enable		= s5p64x0_sclk_ctrl,</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group1,</div><div class='del'>-		.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 22, .size = 2 },</div><div class='del'>-		.reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 8, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "uclk1",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 5),</div><div class='del'>-			.enable		= s5p64x0_sclk_ctrl,</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_uart,</div><div class='del'>-		.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 13, .size = 1 },</div><div class='del'>-		.reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 16, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "sclk_spi",</div><div class='del'>-			.devname	= "s3c64xx-spi.0",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 20),</div><div class='del'>-			.enable		= s5p64x0_sclk_ctrl,</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group1,</div><div class='del'>-		.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 14, .size = 2 },</div><div class='del'>-		.reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 0, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "sclk_spi",</div><div class='del'>-			.devname	= "s3c64xx-spi.1",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 21),</div><div class='del'>-			.enable		= s5p64x0_sclk_ctrl,</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group1,</div><div class='del'>-		.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 16, .size = 2 },</div><div class='del'>-		.reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 4, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='ctx'> 			.name		= "sclk_post",</div><div class='ctx'> 			.ctrlbit	= (1 &lt;&lt; 10),</div><div class='ctx'> 			.enable		= s5p64x0_sclk_ctrl,</div><div class='hunk'>@@ -487,6 +417,77 @@ static struct clksrc_clk clksrcs[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clksrc_clk clk_sclk_mmc0 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "sclk_mmc",</div><div class='add'>+		.devname	= "s3c-sdhci.0",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 24),</div><div class='add'>+		.enable		= s5p64x0_sclk_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group1,</div><div class='add'>+	.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 18, .size = 2 },</div><div class='add'>+	.reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 0, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_mmc1 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "sclk_mmc",</div><div class='add'>+		.devname	= "s3c-sdhci.1",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 25),</div><div class='add'>+		.enable		= s5p64x0_sclk_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group1,</div><div class='add'>+	.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 20, .size = 2 },</div><div class='add'>+	.reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 4, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_mmc2 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "sclk_mmc",</div><div class='add'>+		.devname	= "s3c-sdhci.2",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 26),</div><div class='add'>+		.enable		= s5p64x0_sclk_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group1,</div><div class='add'>+	.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 22, .size = 2 },</div><div class='add'>+	.reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 8, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_uclk = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "uclk1",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 5),</div><div class='add'>+		.enable		= s5p64x0_sclk_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_uart,</div><div class='add'>+	.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 13, .size = 1 },</div><div class='add'>+	.reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 16, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_spi0 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "sclk_spi",</div><div class='add'>+		.devname	= "s3c64xx-spi.0",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 20),</div><div class='add'>+		.enable		= s5p64x0_sclk_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group1,</div><div class='add'>+	.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 14, .size = 2 },</div><div class='add'>+	.reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 0, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_spi1 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "sclk_spi",</div><div class='add'>+		.devname	= "s3c64xx-spi.1",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 21),</div><div class='add'>+		.enable		= s5p64x0_sclk_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group1,</div><div class='add'>+	.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 16, .size = 2 },</div><div class='add'>+	.reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 4, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Clock initialization code */</div><div class='ctx'> static struct clksrc_clk *sysclks[] = {</div><div class='ctx'> 	&amp;clk_mout_apll,</div><div class='hunk'>@@ -505,6 +506,26 @@ static struct clk dummy_apb_pclk = {</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clksrc_clk *clksrc_cdev[] = {</div><div class='add'>+	&amp;clk_sclk_uclk,</div><div class='add'>+	&amp;clk_sclk_spi0,</div><div class='add'>+	&amp;clk_sclk_spi1,</div><div class='add'>+	&amp;clk_sclk_mmc0,</div><div class='add'>+	&amp;clk_sclk_mmc1,</div><div class='add'>+	&amp;clk_sclk_mmc2</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_lookup s5p6440_clk_lookup[] = {</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud2", &amp;clk_pclk_low.clk),</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud3", &amp;clk_sclk_uclk.clk),</div><div class='add'>+	CLKDEV_INIT(NULL, "spi_busclk0", &amp;clk_p),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk1", &amp;clk_sclk_spi0.clk),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.1", "spi_busclk1", &amp;clk_sclk_spi1.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &amp;clk_sclk_mmc0.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &amp;clk_sclk_mmc1.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &amp;clk_sclk_mmc2.clk),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void __init_or_cpufreq s5p6440_setup_clocks(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk *xtal_clk;</div><div class='hunk'>@@ -583,9 +604,12 @@ void __init s5p6440_register_clocks(void)</div><div class='ctx'> </div><div class='ctx'> 	s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));</div><div class='ctx'> 	s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));</div><div class='add'>+	for (ptr = 0; ptr &lt; ARRAY_SIZE(clksrc_cdev); ptr++)</div><div class='add'>+		s3c_register_clksrc(clksrc_cdev[ptr], 1);</div><div class='ctx'> </div><div class='ctx'> 	s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));</div><div class='ctx'> 	s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));</div><div class='add'>+	clkdev_add_table(s5p6440_clk_lookup, ARRAY_SIZE(s5p6440_clk_lookup));</div><div class='ctx'> </div><div class='ctx'> 	s3c24xx_register_clock(&amp;dummy_apb_pclk);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/clock-s5p6450.c b/arch/arm/mach-s5p64x0/clock-s5p6450.c<br/>index 2d04abfba12e..dae6a13f43bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/clock-s5p6450.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/clock-s5p6450.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/clock-s5p6450.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5p64x0/clock-s5p6450.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='hunk'>@@ -31,7 +31,8 @@</div><div class='ctx'> #include &lt;plat/pll.h&gt;</div><div class='ctx'> #include &lt;plat/s5p-clock.h&gt;</div><div class='ctx'> #include &lt;plat/clock-clksrc.h&gt;</div><div class='del'>-#include &lt;plat/s5p6450.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> static struct clksrc_clk clk_mout_dpll = {</div><div class='ctx'> 	.clk	= {</div><div class='hunk'>@@ -413,65 +414,6 @@ static struct clksrc_clk clk_sclk_audio0 = {</div><div class='ctx'> static struct clksrc_clk clksrcs[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.clk	= {</div><div class='del'>-			.name		= "sclk_mmc",</div><div class='del'>-			.devname	= "s3c-sdhci.0",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 24),</div><div class='del'>-			.enable		= s5p64x0_sclk_ctrl,</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group2,</div><div class='del'>-		.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 18, .size = 2 },</div><div class='del'>-		.reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 0, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "sclk_mmc",</div><div class='del'>-			.devname	= "s3c-sdhci.1",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 25),</div><div class='del'>-			.enable		= s5p64x0_sclk_ctrl,</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group2,</div><div class='del'>-		.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 20, .size = 2 },</div><div class='del'>-		.reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 4, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "sclk_mmc",</div><div class='del'>-			.devname	= "s3c-sdhci.2",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 26),</div><div class='del'>-			.enable		= s5p64x0_sclk_ctrl,</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group2,</div><div class='del'>-		.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 22, .size = 2 },</div><div class='del'>-		.reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 8, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "uclk1",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 5),</div><div class='del'>-			.enable		= s5p64x0_sclk_ctrl,</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_uart,</div><div class='del'>-		.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 13, .size = 1 },</div><div class='del'>-		.reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 16, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "sclk_spi",</div><div class='del'>-			.devname	= "s3c64xx-spi.0",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 20),</div><div class='del'>-			.enable		= s5p64x0_sclk_ctrl,</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group2,</div><div class='del'>-		.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 14, .size = 2 },</div><div class='del'>-		.reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 0, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "sclk_spi",</div><div class='del'>-			.devname	= "s3c64xx-spi.1",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 21),</div><div class='del'>-			.enable		= s5p64x0_sclk_ctrl,</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group2,</div><div class='del'>-		.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 16, .size = 2 },</div><div class='del'>-		.reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 4, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='ctx'> 			.name		= "sclk_fimc",</div><div class='ctx'> 			.ctrlbit	= (1 &lt;&lt; 10),</div><div class='ctx'> 			.enable		= s5p64x0_sclk_ctrl,</div><div class='hunk'>@@ -536,6 +478,97 @@ static struct clksrc_clk clksrcs[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clksrc_clk clk_sclk_mmc0 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "sclk_mmc",</div><div class='add'>+		.devname	= "s3c-sdhci.0",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 24),</div><div class='add'>+		.enable		= s5p64x0_sclk_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group2,</div><div class='add'>+	.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 18, .size = 2 },</div><div class='add'>+	.reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 0, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_mmc1 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "sclk_mmc",</div><div class='add'>+		.devname	= "s3c-sdhci.1",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 25),</div><div class='add'>+		.enable		= s5p64x0_sclk_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group2,</div><div class='add'>+	.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 20, .size = 2 },</div><div class='add'>+	.reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 4, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_mmc2 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "sclk_mmc",</div><div class='add'>+		.devname	= "s3c-sdhci.2",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 26),</div><div class='add'>+		.enable		= s5p64x0_sclk_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group2,</div><div class='add'>+	.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 22, .size = 2 },</div><div class='add'>+	.reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 8, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_uclk = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "uclk1",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 5),</div><div class='add'>+		.enable		= s5p64x0_sclk_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_uart,</div><div class='add'>+	.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 13, .size = 1 },</div><div class='add'>+	.reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 16, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_spi0 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "sclk_spi",</div><div class='add'>+		.devname	= "s3c64xx-spi.0",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 20),</div><div class='add'>+		.enable		= s5p64x0_sclk_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group2,</div><div class='add'>+	.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 14, .size = 2 },</div><div class='add'>+	.reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 0, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_spi1 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "sclk_spi",</div><div class='add'>+		.devname	= "s3c64xx-spi.1",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 21),</div><div class='add'>+		.enable		= s5p64x0_sclk_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group2,</div><div class='add'>+	.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 16, .size = 2 },</div><div class='add'>+	.reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 4, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk *clksrc_cdev[] = {</div><div class='add'>+	&amp;clk_sclk_uclk,</div><div class='add'>+	&amp;clk_sclk_spi0,</div><div class='add'>+	&amp;clk_sclk_spi1,</div><div class='add'>+	&amp;clk_sclk_mmc0,</div><div class='add'>+	&amp;clk_sclk_mmc1,</div><div class='add'>+	&amp;clk_sclk_mmc2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_lookup s5p6450_clk_lookup[] = {</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud2", &amp;clk_pclk_low.clk),</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud3", &amp;clk_sclk_uclk.clk),</div><div class='add'>+	CLKDEV_INIT(NULL, "spi_busclk0", &amp;clk_p),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk1", &amp;clk_sclk_spi0.clk),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.1", "spi_busclk1", &amp;clk_sclk_spi1.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &amp;clk_sclk_mmc0.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &amp;clk_sclk_mmc1.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &amp;clk_sclk_mmc2.clk),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Clock initialization code */</div><div class='ctx'> static struct clksrc_clk *sysclks[] = {</div><div class='ctx'> 	&amp;clk_mout_apll,</div><div class='hunk'>@@ -634,9 +667,12 @@ void __init s5p6450_register_clocks(void)</div><div class='ctx'> </div><div class='ctx'> 	s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));</div><div class='ctx'> 	s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));</div><div class='add'>+	for (ptr = 0; ptr &lt; ARRAY_SIZE(clksrc_cdev); ptr++)</div><div class='add'>+		s3c_register_clksrc(clksrc_cdev[ptr], 1);</div><div class='ctx'> </div><div class='ctx'> 	s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));</div><div class='ctx'> 	s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));</div><div class='add'>+	clkdev_add_table(s5p6450_clk_lookup, ARRAY_SIZE(s5p6450_clk_lookup));</div><div class='ctx'> </div><div class='ctx'> 	s3c24xx_register_clock(&amp;dummy_apb_pclk);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/clock.c b/arch/arm/mach-s5p64x0/clock.c<br/>index b52c6e2f37a6..241d0e645c85 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5p64x0/clock.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='hunk'>@@ -30,8 +30,8 @@</div><div class='ctx'> #include &lt;plat/pll.h&gt;</div><div class='ctx'> #include &lt;plat/s5p-clock.h&gt;</div><div class='ctx'> #include &lt;plat/clock-clksrc.h&gt;</div><div class='del'>-#include &lt;plat/s5p6440.h&gt;</div><div class='del'>-#include &lt;plat/s5p6450.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> struct clksrc_clk clk_mout_apll = {</div><div class='ctx'> 	.clk	= {</div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/common.c b/arch/arm/mach-s5p64x0/common.c<br/>new file mode 100644<br/>index 000000000000..52b89a376447<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5p64x0/common.c</a></div><div class='hunk'>@@ -0,0 +1,447 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2009-2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * Common Codes for S5P64X0 machines</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/init.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/device.h&gt;</div><div class='add'>+#include &lt;linux/serial_core.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/proc-fns.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/map.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/pm.h&gt;</div><div class='add'>+#include &lt;plat/sdhci.h&gt;</div><div class='add'>+#include &lt;plat/adc-core.h&gt;</div><div class='add'>+#include &lt;plat/fb-core.h&gt;</div><div class='add'>+#include &lt;plat/gpio-cfg.h&gt;</div><div class='add'>+#include &lt;plat/regs-irqtype.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/watchdog-reset.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+static const char name_s5p6440[] = "S5P6440";</div><div class='add'>+static const char name_s5p6450[] = "S5P6450";</div><div class='add'>+</div><div class='add'>+static struct cpu_table cpu_ids[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.idcode		= S5P6440_CPU_ID,</div><div class='add'>+		.idmask		= S5P64XX_CPU_MASK,</div><div class='add'>+		.map_io		= s5p6440_map_io,</div><div class='add'>+		.init_clocks	= s5p6440_init_clocks,</div><div class='add'>+		.init_uarts	= s5p6440_init_uarts,</div><div class='add'>+		.init		= s5p64x0_init,</div><div class='add'>+		.name		= name_s5p6440,</div><div class='add'>+	}, {</div><div class='add'>+		.idcode		= S5P6450_CPU_ID,</div><div class='add'>+		.idmask		= S5P64XX_CPU_MASK,</div><div class='add'>+		.map_io		= s5p6450_map_io,</div><div class='add'>+		.init_clocks	= s5p6450_init_clocks,</div><div class='add'>+		.init_uarts	= s5p6450_init_uarts,</div><div class='add'>+		.init		= s5p64x0_init,</div><div class='add'>+		.name		= name_s5p6450,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Initial IO mappings */</div><div class='add'>+</div><div class='add'>+static struct map_desc s5p64x0_iodesc[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_CHIPID,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5P64X0_PA_CHIPID),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_SYS,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5P64X0_PA_SYSCON),</div><div class='add'>+		.length		= SZ_64K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_TIMER,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5P64X0_PA_TIMER),</div><div class='add'>+		.length		= SZ_16K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_WATCHDOG,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5P64X0_PA_WDT),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_SROMC,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5P64X0_PA_SROMC),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_GPIO,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5P64X0_PA_GPIO),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)VA_VIC0,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5P64X0_PA_VIC0),</div><div class='add'>+		.length		= SZ_16K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)VA_VIC1,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5P64X0_PA_VIC1),</div><div class='add'>+		.length		= SZ_16K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct map_desc s5p6440_iodesc[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_UART,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5P6440_PA_UART(0)),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct map_desc s5p6450_iodesc[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_UART,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5P6450_PA_UART(0)),</div><div class='add'>+		.length		= SZ_512K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_UART + SZ_512K,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5P6450_PA_UART(5)),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void s5p64x0_idle(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	if (!need_resched()) {</div><div class='add'>+		val = __raw_readl(S5P64X0_PWR_CFG);</div><div class='add'>+		val &amp;= ~(0x3 &lt;&lt; 5);</div><div class='add'>+		val |= (0x1 &lt;&lt; 5);</div><div class='add'>+		__raw_writel(val, S5P64X0_PWR_CFG);</div><div class='add'>+</div><div class='add'>+		cpu_do_idle();</div><div class='add'>+	}</div><div class='add'>+	local_irq_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * s5p64x0_map_io</div><div class='add'>+ *</div><div class='add'>+ * register the standard CPU IO areas</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void __init s5p64x0_init_io(struct map_desc *mach_desc, int size)</div><div class='add'>+{</div><div class='add'>+	/* initialize the io descriptors we need for initialization */</div><div class='add'>+	iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc));</div><div class='add'>+	if (mach_desc)</div><div class='add'>+		iotable_init(mach_desc, size);</div><div class='add'>+</div><div class='add'>+	/* detect cpu id and rev. */</div><div class='add'>+	s5p_init_cpu(S5P64X0_SYS_ID);</div><div class='add'>+</div><div class='add'>+	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init s5p6440_map_io(void)</div><div class='add'>+{</div><div class='add'>+	/* initialize any device information early */</div><div class='add'>+	s3c_adc_setname("s3c64xx-adc");</div><div class='add'>+	s3c_fb_setname("s5p64x0-fb");</div><div class='add'>+</div><div class='add'>+	s5p64x0_default_sdhci0();</div><div class='add'>+	s5p64x0_default_sdhci1();</div><div class='add'>+	s5p6440_default_sdhci2();</div><div class='add'>+</div><div class='add'>+	iotable_init(s5p6440_iodesc, ARRAY_SIZE(s5p6440_iodesc));</div><div class='add'>+	init_consistent_dma_size(SZ_8M);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init s5p6450_map_io(void)</div><div class='add'>+{</div><div class='add'>+	/* initialize any device information early */</div><div class='add'>+	s3c_adc_setname("s3c64xx-adc");</div><div class='add'>+	s3c_fb_setname("s5p64x0-fb");</div><div class='add'>+</div><div class='add'>+	s5p64x0_default_sdhci0();</div><div class='add'>+	s5p64x0_default_sdhci1();</div><div class='add'>+	s5p6450_default_sdhci2();</div><div class='add'>+</div><div class='add'>+	iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p6450_iodesc));</div><div class='add'>+	init_consistent_dma_size(SZ_8M);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * s5p64x0_init_clocks</div><div class='add'>+ *</div><div class='add'>+ * register and setup the CPU clocks</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void __init s5p6440_init_clocks(int xtal)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_DEBUG "%s: initializing clocks\n", __func__);</div><div class='add'>+</div><div class='add'>+	s3c24xx_register_baseclocks(xtal);</div><div class='add'>+	s5p_register_clocks(xtal);</div><div class='add'>+	s5p6440_register_clocks();</div><div class='add'>+	s5p6440_setup_clocks();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init s5p6450_init_clocks(int xtal)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_DEBUG "%s: initializing clocks\n", __func__);</div><div class='add'>+</div><div class='add'>+	s3c24xx_register_baseclocks(xtal);</div><div class='add'>+	s5p_register_clocks(xtal);</div><div class='add'>+	s5p6450_register_clocks();</div><div class='add'>+	s5p6450_setup_clocks();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * s5p64x0_init_irq</div><div class='add'>+ *</div><div class='add'>+ * register the CPU interrupts</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void __init s5p6440_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	/* S5P6440 supports 2 VIC */</div><div class='add'>+	u32 vic[2];</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * VIC0 is missing IRQ_VIC0[3, 4, 8, 10, (12-22)]</div><div class='add'>+	 * VIC1 is missing IRQ VIC1[1, 3, 4, 10, 11, 12, 14, 15, 22]</div><div class='add'>+	 */</div><div class='add'>+	vic[0] = 0xff800ae7;</div><div class='add'>+	vic[1] = 0xffbf23e5;</div><div class='add'>+</div><div class='add'>+	s5p_init_irq(vic, ARRAY_SIZE(vic));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init s5p6450_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	/* S5P6450 supports only 2 VIC */</div><div class='add'>+	u32 vic[2];</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * VIC0 is missing IRQ_VIC0[(13-15), (21-22)]</div><div class='add'>+	 * VIC1 is missing IRQ VIC1[12, 14, 23]</div><div class='add'>+	 */</div><div class='add'>+	vic[0] = 0xff9f1fff;</div><div class='add'>+	vic[1] = 0xff7fafff;</div><div class='add'>+</div><div class='add'>+	s5p_init_irq(vic, ARRAY_SIZE(vic));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct bus_type s5p64x0_subsys = {</div><div class='add'>+	.name		= "s5p64x0-core",</div><div class='add'>+	.dev_name	= "s5p64x0-core",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct device s5p64x0_dev = {</div><div class='add'>+	.bus	= &amp;s5p64x0_subsys,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init s5p64x0_core_init(void)</div><div class='add'>+{</div><div class='add'>+	return subsys_system_register(&amp;s5p64x0_subsys, NULL);</div><div class='add'>+}</div><div class='add'>+core_initcall(s5p64x0_core_init);</div><div class='add'>+</div><div class='add'>+int __init s5p64x0_init(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO "S5P64X0(S5P6440/S5P6450): Initializing architecture\n");</div><div class='add'>+</div><div class='add'>+	/* set idle function */</div><div class='add'>+	pm_idle = s5p64x0_idle;</div><div class='add'>+</div><div class='add'>+	return device_register(&amp;s5p64x0_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* uart registration process */</div><div class='add'>+void __init s5p6440_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='add'>+{</div><div class='add'>+	int uart;</div><div class='add'>+</div><div class='add'>+	for (uart = 0; uart &lt; no; uart++) {</div><div class='add'>+		s5p_uart_resources[uart].resources-&gt;start = S5P6440_PA_UART(uart);</div><div class='add'>+		s5p_uart_resources[uart].resources-&gt;end = S5P6440_PA_UART(uart) + S5P_SZ_UART;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init s5p6450_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='add'>+{</div><div class='add'>+	s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define eint_offset(irq)	((irq) - IRQ_EINT(0))</div><div class='add'>+</div><div class='add'>+static int s5p64x0_irq_eint_set_type(struct irq_data *data, unsigned int type)</div><div class='add'>+{</div><div class='add'>+	int offs = eint_offset(data-&gt;irq);</div><div class='add'>+	int shift;</div><div class='add'>+	u32 ctrl, mask;</div><div class='add'>+	u32 newvalue = 0;</div><div class='add'>+</div><div class='add'>+	if (offs &gt; 15)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case IRQ_TYPE_NONE:</div><div class='add'>+		printk(KERN_WARNING "No edge setting!\n");</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_TYPE_EDGE_RISING:</div><div class='add'>+		newvalue = S3C2410_EXTINT_RISEEDGE;</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_TYPE_EDGE_FALLING:</div><div class='add'>+		newvalue = S3C2410_EXTINT_FALLEDGE;</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_TYPE_EDGE_BOTH:</div><div class='add'>+		newvalue = S3C2410_EXTINT_BOTHEDGE;</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_TYPE_LEVEL_LOW:</div><div class='add'>+		newvalue = S3C2410_EXTINT_LOWLEV;</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_TYPE_LEVEL_HIGH:</div><div class='add'>+		newvalue = S3C2410_EXTINT_HILEV;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "No such irq type %d", type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	shift = (offs / 2) * 4;</div><div class='add'>+	mask = 0x7 &lt;&lt; shift;</div><div class='add'>+</div><div class='add'>+	ctrl = __raw_readl(S5P64X0_EINT0CON0) &amp; ~mask;</div><div class='add'>+	ctrl |= newvalue &lt;&lt; shift;</div><div class='add'>+	__raw_writel(ctrl, S5P64X0_EINT0CON0);</div><div class='add'>+</div><div class='add'>+	/* Configure the GPIO pin for 6450 or 6440 based on CPU ID */</div><div class='add'>+	if (soc_is_s5p6450())</div><div class='add'>+		s3c_gpio_cfgpin(S5P6450_GPN(offs), S3C_GPIO_SFN(2));</div><div class='add'>+	else</div><div class='add'>+		s3c_gpio_cfgpin(S5P6440_GPN(offs), S3C_GPIO_SFN(2));</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'>+ * s5p64x0_irq_demux_eint</div><div class='add'>+ *</div><div class='add'>+ * This function demuxes the IRQ from the group0 external interrupts,</div><div class='add'>+ * from IRQ_EINT(0) to IRQ_EINT(15). It is designed to be inlined into</div><div class='add'>+ * the specific handlers s5p64x0_irq_demux_eintX_Y.</div><div class='add'>+ */</div><div class='add'>+static inline void s5p64x0_irq_demux_eint(unsigned int start, unsigned int end)</div><div class='add'>+{</div><div class='add'>+	u32 status = __raw_readl(S5P64X0_EINT0PEND);</div><div class='add'>+	u32 mask = __raw_readl(S5P64X0_EINT0MASK);</div><div class='add'>+	unsigned int irq;</div><div class='add'>+</div><div class='add'>+	status &amp;= ~mask;</div><div class='add'>+	status &gt;&gt;= start;</div><div class='add'>+	status &amp;= (1 &lt;&lt; (end - start + 1)) - 1;</div><div class='add'>+</div><div class='add'>+	for (irq = IRQ_EINT(start); irq &lt;= IRQ_EINT(end); irq++) {</div><div class='add'>+		if (status &amp; 1)</div><div class='add'>+			generic_handle_irq(irq);</div><div class='add'>+		status &gt;&gt;= 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s5p64x0_irq_demux_eint0_3(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	s5p64x0_irq_demux_eint(0, 3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s5p64x0_irq_demux_eint4_11(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	s5p64x0_irq_demux_eint(4, 11);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s5p64x0_irq_demux_eint12_15(unsigned int irq,</div><div class='add'>+					struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	s5p64x0_irq_demux_eint(12, 15);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p64x0_alloc_gc(void)</div><div class='add'>+{</div><div class='add'>+	struct irq_chip_generic *gc;</div><div class='add'>+	struct irq_chip_type *ct;</div><div class='add'>+</div><div class='add'>+	gc = irq_alloc_generic_chip("s5p64x0-eint", 1, S5P_IRQ_EINT_BASE,</div><div class='add'>+				    S5P_VA_GPIO, handle_level_irq);</div><div class='add'>+	if (!gc) {</div><div class='add'>+		printk(KERN_ERR "%s: irq_alloc_generic_chip for group 0"</div><div class='add'>+			"external interrupts failed\n", __func__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ct = gc-&gt;chip_types;</div><div class='add'>+	ct-&gt;chip.irq_ack = irq_gc_ack_set_bit;</div><div class='add'>+	ct-&gt;chip.irq_mask = irq_gc_mask_set_bit;</div><div class='add'>+	ct-&gt;chip.irq_unmask = irq_gc_mask_clr_bit;</div><div class='add'>+	ct-&gt;chip.irq_set_type = s5p64x0_irq_eint_set_type;</div><div class='add'>+	ct-&gt;chip.irq_set_wake = s3c_irqext_wake;</div><div class='add'>+	ct-&gt;regs.ack = EINT0PEND_OFFSET;</div><div class='add'>+	ct-&gt;regs.mask = EINT0MASK_OFFSET;</div><div class='add'>+	irq_setup_generic_chip(gc, IRQ_MSK(16), IRQ_GC_INIT_MASK_CACHE,</div><div class='add'>+			       IRQ_NOREQUEST | IRQ_NOPROBE, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init s5p64x0_init_irq_eint(void)</div><div class='add'>+{</div><div class='add'>+	int ret = s5p64x0_alloc_gc();</div><div class='add'>+	irq_set_chained_handler(IRQ_EINT0_3, s5p64x0_irq_demux_eint0_3);</div><div class='add'>+	irq_set_chained_handler(IRQ_EINT4_11, s5p64x0_irq_demux_eint4_11);</div><div class='add'>+	irq_set_chained_handler(IRQ_EINT12_15, s5p64x0_irq_demux_eint12_15);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+arch_initcall(s5p64x0_init_irq_eint);</div><div class='add'>+</div><div class='add'>+void s5p64x0_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	if (mode != 's')</div><div class='add'>+		arch_wdt_reset();</div><div class='add'>+</div><div class='add'>+	soft_restart(0);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/common.h b/arch/arm/mach-s5p64x0/common.h<br/>new file mode 100644<br/>index 000000000000..f8a60fdc5884<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5p64x0/common.h</a></div><div class='hunk'>@@ -0,0 +1,57 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * Common Header for S5P64X0 machines</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ARCH_ARM_MACH_S5P64X0_COMMON_H</div><div class='add'>+#define __ARCH_ARM_MACH_S5P64X0_COMMON_H</div><div class='add'>+</div><div class='add'>+void s5p6440_init_irq(void);</div><div class='add'>+void s5p6450_init_irq(void);</div><div class='add'>+void s5p64x0_init_io(struct map_desc *mach_desc, int size);</div><div class='add'>+</div><div class='add'>+void s5p6440_register_clocks(void);</div><div class='add'>+void s5p6440_setup_clocks(void);</div><div class='add'>+</div><div class='add'>+void s5p6450_register_clocks(void);</div><div class='add'>+void s5p6450_setup_clocks(void);</div><div class='add'>+</div><div class='add'>+void s5p64x0_restart(char mode, const char *cmd);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_S5P6440</div><div class='add'>+</div><div class='add'>+extern  int s5p64x0_init(void);</div><div class='add'>+extern void s5p6440_map_io(void);</div><div class='add'>+extern void s5p6440_init_clocks(int xtal);</div><div class='add'>+</div><div class='add'>+extern void s5p6440_init_uarts(struct s3c2410_uartcfg *cfg, int no);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define s5p6440_init_clocks NULL</div><div class='add'>+#define s5p6440_init_uarts NULL</div><div class='add'>+#define s5p6440_map_io NULL</div><div class='add'>+#define s5p64x0_init NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_S5P6450</div><div class='add'>+</div><div class='add'>+extern  int s5p64x0_init(void);</div><div class='add'>+extern void s5p6450_map_io(void);</div><div class='add'>+extern void s5p6450_init_clocks(int xtal);</div><div class='add'>+</div><div class='add'>+extern void s5p6450_init_uarts(struct s3c2410_uartcfg *cfg, int no);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define s5p6450_init_clocks NULL</div><div class='add'>+#define s5p6450_init_uarts NULL</div><div class='add'>+#define s5p6450_map_io NULL</div><div class='add'>+#define s5p64x0_init NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __ARCH_ARM_MACH_S5P64X0_COMMON_H */</div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/cpu.c b/arch/arm/mach-s5p64x0/cpu.c<br/>deleted file mode 100644<br/>index ecab40cf19ab..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/cpu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/cpu.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,215 +0,0 @@</div><div class='del'>-/* linux/arch/arm/mach-s5p64x0/cpu.c</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='del'>-#include &lt;linux/serial_core.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/mach/irq.h&gt;</div><div class='del'>-#include &lt;asm/proc-fns.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='del'>-#include &lt;mach/regs-clock.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/regs-serial.h&gt;</div><div class='del'>-#include &lt;plat/cpu.h&gt;</div><div class='del'>-#include &lt;plat/devs.h&gt;</div><div class='del'>-#include &lt;plat/clock.h&gt;</div><div class='del'>-#include &lt;plat/s5p6440.h&gt;</div><div class='del'>-#include &lt;plat/s5p6450.h&gt;</div><div class='del'>-#include &lt;plat/adc-core.h&gt;</div><div class='del'>-#include &lt;plat/fb-core.h&gt;</div><div class='del'>-</div><div class='del'>-/* Initial IO mappings */</div><div class='del'>-</div><div class='del'>-static struct map_desc s5p64x0_iodesc[] __initdata = {</div><div class='del'>-	{</div><div class='del'>-		.virtual	= (unsigned long)S5P_VA_GPIO,</div><div class='del'>-		.pfn		= __phys_to_pfn(S5P64X0_PA_GPIO),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)VA_VIC0,</div><div class='del'>-		.pfn		= __phys_to_pfn(S5P64X0_PA_VIC0),</div><div class='del'>-		.length		= SZ_16K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)VA_VIC1,</div><div class='del'>-		.pfn		= __phys_to_pfn(S5P64X0_PA_VIC1),</div><div class='del'>-		.length		= SZ_16K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct map_desc s5p6440_iodesc[] __initdata = {</div><div class='del'>-	{</div><div class='del'>-		.virtual	= (unsigned long)S3C_VA_UART,</div><div class='del'>-		.pfn		= __phys_to_pfn(S5P6440_PA_UART(0)),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct map_desc s5p6450_iodesc[] __initdata = {</div><div class='del'>-	{</div><div class='del'>-		.virtual	= (unsigned long)S3C_VA_UART,</div><div class='del'>-		.pfn		= __phys_to_pfn(S5P6450_PA_UART(0)),</div><div class='del'>-		.length		= SZ_512K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S3C_VA_UART + SZ_512K,</div><div class='del'>-		.pfn		= __phys_to_pfn(S5P6450_PA_UART(5)),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void s5p64x0_idle(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long val;</div><div class='del'>-</div><div class='del'>-	if (!need_resched()) {</div><div class='del'>-		val = __raw_readl(S5P64X0_PWR_CFG);</div><div class='del'>-		val &amp;= ~(0x3 &lt;&lt; 5);</div><div class='del'>-		val |= (0x1 &lt;&lt; 5);</div><div class='del'>-		__raw_writel(val, S5P64X0_PWR_CFG);</div><div class='del'>-</div><div class='del'>-		cpu_do_idle();</div><div class='del'>-	}</div><div class='del'>-	local_irq_enable();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * s5p64x0_map_io</div><div class='del'>- *</div><div class='del'>- * register the standard CPU IO areas</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void __init s5p6440_map_io(void)</div><div class='del'>-{</div><div class='del'>-	/* initialize any device information early */</div><div class='del'>-	s3c_adc_setname("s3c64xx-adc");</div><div class='del'>-	s3c_fb_setname("s5p64x0-fb");</div><div class='del'>-</div><div class='del'>-	iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc));</div><div class='del'>-	iotable_init(s5p6440_iodesc, ARRAY_SIZE(s5p6440_iodesc));</div><div class='del'>-	init_consistent_dma_size(SZ_8M);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init s5p6450_map_io(void)</div><div class='del'>-{</div><div class='del'>-	/* initialize any device information early */</div><div class='del'>-	s3c_adc_setname("s3c64xx-adc");</div><div class='del'>-	s3c_fb_setname("s5p64x0-fb");</div><div class='del'>-</div><div class='del'>-	iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc));</div><div class='del'>-	iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p6450_iodesc));</div><div class='del'>-	init_consistent_dma_size(SZ_8M);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * s5p64x0_init_clocks</div><div class='del'>- *</div><div class='del'>- * register and setup the CPU clocks</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void __init s5p6440_init_clocks(int xtal)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_DEBUG "%s: initializing clocks\n", __func__);</div><div class='del'>-</div><div class='del'>-	s3c24xx_register_baseclocks(xtal);</div><div class='del'>-	s5p_register_clocks(xtal);</div><div class='del'>-	s5p6440_register_clocks();</div><div class='del'>-	s5p6440_setup_clocks();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init s5p6450_init_clocks(int xtal)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_DEBUG "%s: initializing clocks\n", __func__);</div><div class='del'>-</div><div class='del'>-	s3c24xx_register_baseclocks(xtal);</div><div class='del'>-	s5p_register_clocks(xtal);</div><div class='del'>-	s5p6450_register_clocks();</div><div class='del'>-	s5p6450_setup_clocks();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * s5p64x0_init_irq</div><div class='del'>- *</div><div class='del'>- * register the CPU interrupts</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void __init s5p6440_init_irq(void)</div><div class='del'>-{</div><div class='del'>-	/* S5P6440 supports 2 VIC */</div><div class='del'>-	u32 vic[2];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * VIC0 is missing IRQ_VIC0[3, 4, 8, 10, (12-22)]</div><div class='del'>-	 * VIC1 is missing IRQ VIC1[1, 3, 4, 10, 11, 12, 14, 15, 22]</div><div class='del'>-	 */</div><div class='del'>-	vic[0] = 0xff800ae7;</div><div class='del'>-	vic[1] = 0xffbf23e5;</div><div class='del'>-</div><div class='del'>-	s5p_init_irq(vic, ARRAY_SIZE(vic));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init s5p6450_init_irq(void)</div><div class='del'>-{</div><div class='del'>-	/* S5P6450 supports only 2 VIC */</div><div class='del'>-	u32 vic[2];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * VIC0 is missing IRQ_VIC0[(13-15), (21-22)]</div><div class='del'>-	 * VIC1 is missing IRQ VIC1[12, 14, 23]</div><div class='del'>-	 */</div><div class='del'>-	vic[0] = 0xff9f1fff;</div><div class='del'>-	vic[1] = 0xff7fafff;</div><div class='del'>-</div><div class='del'>-	s5p_init_irq(vic, ARRAY_SIZE(vic));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct sysdev_class s5p64x0_sysclass = {</div><div class='del'>-	.name	= "s5p64x0-core",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct sys_device s5p64x0_sysdev = {</div><div class='del'>-	.cls	= &amp;s5p64x0_sysclass,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init s5p64x0_core_init(void)</div><div class='del'>-{</div><div class='del'>-	return sysdev_class_register(&amp;s5p64x0_sysclass);</div><div class='del'>-}</div><div class='del'>-core_initcall(s5p64x0_core_init);</div><div class='del'>-</div><div class='del'>-int __init s5p64x0_init(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "S5P64X0(S5P6440/S5P6450): Initializing architecture\n");</div><div class='del'>-</div><div class='del'>-	/* set idle function */</div><div class='del'>-	pm_idle = s5p64x0_idle;</div><div class='del'>-</div><div class='del'>-	return sysdev_register(&amp;s5p64x0_sysdev);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/dev-spi.c b/arch/arm/mach-s5p64x0/dev-spi.c<br/>deleted file mode 100644<br/>index 1fd9c79c7dbc..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/dev-spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/dev-spi.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,224 +0,0 @@</div><div class='del'>-/* linux/arch/arm/mach-s5p64x0/dev-spi.c</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2010 Samsung Electronics Co. Ltd.</div><div class='del'>- *	Jaswinder Singh &lt;jassi.brar@samsung.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'>-</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/dma.h&gt;</div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='del'>-#include &lt;mach/irqs.h&gt;</div><div class='del'>-#include &lt;mach/regs-clock.h&gt;</div><div class='del'>-#include &lt;mach/spi-clocks.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/cpu.h&gt;</div><div class='del'>-#include &lt;plat/s3c64xx-spi.h&gt;</div><div class='del'>-#include &lt;plat/gpio-cfg.h&gt;</div><div class='del'>-</div><div class='del'>-static char *s5p64x0_spi_src_clks[] = {</div><div class='del'>-	[S5P64X0_SPI_SRCCLK_PCLK] = "pclk",</div><div class='del'>-	[S5P64X0_SPI_SRCCLK_SCLK] = "sclk_spi",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* SPI Controller platform_devices */</div><div class='del'>-</div><div class='del'>-/* Since we emulate multi-cs capability, we do not touch the CS.</div><div class='del'>- * The emulated CS is toggled by board specific mechanism, as it can</div><div class='del'>- * be either some immediate GPIO or some signal out of some other</div><div class='del'>- * chip in between ... or some yet another way.</div><div class='del'>- * We simply do not assume anything about CS.</div><div class='del'>- */</div><div class='del'>-static int s5p6440_spi_cfg_gpio(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	unsigned int base;</div><div class='del'>-</div><div class='del'>-	switch (pdev-&gt;id) {</div><div class='del'>-	case 0:</div><div class='del'>-		base = S5P6440_GPC(0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 1:</div><div class='del'>-		base = S5P6440_GPC(4);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Invalid SPI Controller number!");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s3c_gpio_cfgall_range(base, 3,</div><div class='del'>-			      S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int s5p6450_spi_cfg_gpio(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	unsigned int base;</div><div class='del'>-</div><div class='del'>-	switch (pdev-&gt;id) {</div><div class='del'>-	case 0:</div><div class='del'>-		base = S5P6450_GPC(0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 1:</div><div class='del'>-		base = S5P6450_GPC(4);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Invalid SPI Controller number!");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s3c_gpio_cfgall_range(base, 3,</div><div class='del'>-			      S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct resource s5p64x0_spi0_resource[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start	= S5P64X0_PA_SPI0,</div><div class='del'>-		.end	= S5P64X0_PA_SPI0 + 0x100 - 1,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start	= DMACH_SPI0_TX,</div><div class='del'>-		.end	= DMACH_SPI0_TX,</div><div class='del'>-		.flags	= IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.start	= DMACH_SPI0_RX,</div><div class='del'>-		.end	= DMACH_SPI0_RX,</div><div class='del'>-		.flags	= IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[3] = {</div><div class='del'>-		.start	= IRQ_SPI0,</div><div class='del'>-		.end	= IRQ_SPI0,</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct s3c64xx_spi_info s5p6440_spi0_pdata = {</div><div class='del'>-	.cfg_gpio	= s5p6440_spi_cfg_gpio,</div><div class='del'>-	.fifo_lvl_mask	= 0x1ff,</div><div class='del'>-	.rx_lvl_offset	= 15,</div><div class='del'>-	.tx_st_done	= 25,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct s3c64xx_spi_info s5p6450_spi0_pdata = {</div><div class='del'>-	.cfg_gpio	= s5p6450_spi_cfg_gpio,</div><div class='del'>-	.fifo_lvl_mask	= 0x1ff,</div><div class='del'>-	.rx_lvl_offset	= 15,</div><div class='del'>-	.tx_st_done	= 25,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u64 spi_dmamask = DMA_BIT_MASK(32);</div><div class='del'>-</div><div class='del'>-struct platform_device s5p64x0_device_spi0 = {</div><div class='del'>-	.name		= "s3c64xx-spi",</div><div class='del'>-	.id		= 0,</div><div class='del'>-	.num_resources	= ARRAY_SIZE(s5p64x0_spi0_resource),</div><div class='del'>-	.resource	= s5p64x0_spi0_resource,</div><div class='del'>-	.dev = {</div><div class='del'>-		.dma_mask		= &amp;spi_dmamask,</div><div class='del'>-		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource s5p64x0_spi1_resource[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start	= S5P64X0_PA_SPI1,</div><div class='del'>-		.end	= S5P64X0_PA_SPI1 + 0x100 - 1,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start	= DMACH_SPI1_TX,</div><div class='del'>-		.end	= DMACH_SPI1_TX,</div><div class='del'>-		.flags	= IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.start	= DMACH_SPI1_RX,</div><div class='del'>-		.end	= DMACH_SPI1_RX,</div><div class='del'>-		.flags	= IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[3] = {</div><div class='del'>-		.start	= IRQ_SPI1,</div><div class='del'>-		.end	= IRQ_SPI1,</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct s3c64xx_spi_info s5p6440_spi1_pdata = {</div><div class='del'>-	.cfg_gpio	= s5p6440_spi_cfg_gpio,</div><div class='del'>-	.fifo_lvl_mask	= 0x7f,</div><div class='del'>-	.rx_lvl_offset	= 15,</div><div class='del'>-	.tx_st_done	= 25,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct s3c64xx_spi_info s5p6450_spi1_pdata = {</div><div class='del'>-	.cfg_gpio	= s5p6450_spi_cfg_gpio,</div><div class='del'>-	.fifo_lvl_mask	= 0x7f,</div><div class='del'>-	.rx_lvl_offset	= 15,</div><div class='del'>-	.tx_st_done	= 25,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct platform_device s5p64x0_device_spi1 = {</div><div class='del'>-	.name		= "s3c64xx-spi",</div><div class='del'>-	.id		= 1,</div><div class='del'>-	.num_resources	= ARRAY_SIZE(s5p64x0_spi1_resource),</div><div class='del'>-	.resource	= s5p64x0_spi1_resource,</div><div class='del'>-	.dev = {</div><div class='del'>-		.dma_mask		= &amp;spi_dmamask,</div><div class='del'>-		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __init s5p64x0_spi_set_info(int cntrlr, int src_clk_nr, int num_cs)</div><div class='del'>-{</div><div class='del'>-	struct s3c64xx_spi_info *pd;</div><div class='del'>-</div><div class='del'>-	/* Reject invalid configuration */</div><div class='del'>-	if (!num_cs || src_clk_nr &lt; 0</div><div class='del'>-			|| src_clk_nr &gt; S5P64X0_SPI_SRCCLK_SCLK) {</div><div class='del'>-		printk(KERN_ERR "%s: Invalid SPI configuration\n", __func__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (cntrlr) {</div><div class='del'>-	case 0:</div><div class='del'>-		if (soc_is_s5p6450())</div><div class='del'>-			pd = &amp;s5p6450_spi0_pdata;</div><div class='del'>-		else</div><div class='del'>-			pd = &amp;s5p6440_spi0_pdata;</div><div class='del'>-</div><div class='del'>-		s5p64x0_device_spi0.dev.platform_data = pd;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		if (soc_is_s5p6450())</div><div class='del'>-			pd = &amp;s5p6450_spi1_pdata;</div><div class='del'>-		else</div><div class='del'>-			pd = &amp;s5p6440_spi1_pdata;</div><div class='del'>-</div><div class='del'>-		s5p64x0_device_spi1.dev.platform_data = pd;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "%s: Invalid SPI controller(%d)\n",</div><div class='del'>-							__func__, cntrlr);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pd-&gt;num_cs = num_cs;</div><div class='del'>-	pd-&gt;src_clk_nr = src_clk_nr;</div><div class='del'>-	pd-&gt;src_clk_name = s5p64x0_spi_src_clks[src_clk_nr];</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/dma.c b/arch/arm/mach-s5p64x0/dma.c<br/>index 442dd4ad12da..f820c0744405 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5p64x0/dma.c</a></div><div class='hunk'>@@ -38,176 +38,74 @@</div><div class='ctx'> </div><div class='ctx'> static u64 dma_dmamask = DMA_BIT_MASK(32);</div><div class='ctx'> </div><div class='del'>-struct dma_pl330_peri s5p6440_pdma_peri[22] = {</div><div class='del'>-	{</div><div class='del'>-		.peri_id = (u8)DMACH_UART0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART2_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART2_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART3_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART3_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = DMACH_MAX,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = DMACH_MAX,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MAX,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MAX,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MAX,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MAX,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	},</div><div class='add'>+u8 s5p6440_pdma_peri[] = {</div><div class='add'>+	DMACH_UART0_RX,</div><div class='add'>+	DMACH_UART0_TX,</div><div class='add'>+	DMACH_UART1_RX,</div><div class='add'>+	DMACH_UART1_TX,</div><div class='add'>+	DMACH_UART2_RX,</div><div class='add'>+	DMACH_UART2_TX,</div><div class='add'>+	DMACH_UART3_RX,</div><div class='add'>+	DMACH_UART3_TX,</div><div class='add'>+	DMACH_MAX,</div><div class='add'>+	DMACH_MAX,</div><div class='add'>+	DMACH_PCM0_TX,</div><div class='add'>+	DMACH_PCM0_RX,</div><div class='add'>+	DMACH_I2S0_TX,</div><div class='add'>+	DMACH_I2S0_RX,</div><div class='add'>+	DMACH_SPI0_TX,</div><div class='add'>+	DMACH_SPI0_RX,</div><div class='add'>+	DMACH_MAX,</div><div class='add'>+	DMACH_MAX,</div><div class='add'>+	DMACH_MAX,</div><div class='add'>+	DMACH_MAX,</div><div class='add'>+	DMACH_SPI1_TX,</div><div class='add'>+	DMACH_SPI1_RX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dma_pl330_platdata s5p6440_pdma_pdata = {</div><div class='ctx'> 	.nr_valid_peri = ARRAY_SIZE(s5p6440_pdma_peri),</div><div class='del'>-	.peri = s5p6440_pdma_peri,</div><div class='add'>+	.peri_id = s5p6440_pdma_peri,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dma_pl330_peri s5p6450_pdma_peri[32] = {</div><div class='del'>-	{</div><div class='del'>-		.peri_id = (u8)DMACH_UART0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART2_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART2_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART3_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART3_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART4_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART4_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM2_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM2_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_USI_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_USI_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MAX,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S2_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S2_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PWM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART5_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART5_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	},</div><div class='add'>+u8 s5p6450_pdma_peri[] = {</div><div class='add'>+	DMACH_UART0_RX,</div><div class='add'>+	DMACH_UART0_TX,</div><div class='add'>+	DMACH_UART1_RX,</div><div class='add'>+	DMACH_UART1_TX,</div><div class='add'>+	DMACH_UART2_RX,</div><div class='add'>+	DMACH_UART2_TX,</div><div class='add'>+	DMACH_UART3_RX,</div><div class='add'>+	DMACH_UART3_TX,</div><div class='add'>+	DMACH_UART4_RX,</div><div class='add'>+	DMACH_UART4_TX,</div><div class='add'>+	DMACH_PCM0_TX,</div><div class='add'>+	DMACH_PCM0_RX,</div><div class='add'>+	DMACH_I2S0_TX,</div><div class='add'>+	DMACH_I2S0_RX,</div><div class='add'>+	DMACH_SPI0_TX,</div><div class='add'>+	DMACH_SPI0_RX,</div><div class='add'>+	DMACH_PCM1_TX,</div><div class='add'>+	DMACH_PCM1_RX,</div><div class='add'>+	DMACH_PCM2_TX,</div><div class='add'>+	DMACH_PCM2_RX,</div><div class='add'>+	DMACH_SPI1_TX,</div><div class='add'>+	DMACH_SPI1_RX,</div><div class='add'>+	DMACH_USI_TX,</div><div class='add'>+	DMACH_USI_RX,</div><div class='add'>+	DMACH_MAX,</div><div class='add'>+	DMACH_I2S1_TX,</div><div class='add'>+	DMACH_I2S1_RX,</div><div class='add'>+	DMACH_I2S2_TX,</div><div class='add'>+	DMACH_I2S2_RX,</div><div class='add'>+	DMACH_PWM,</div><div class='add'>+	DMACH_UART5_RX,</div><div class='add'>+	DMACH_UART5_TX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dma_pl330_platdata s5p6450_pdma_pdata = {</div><div class='ctx'> 	.nr_valid_peri = ARRAY_SIZE(s5p6450_pdma_peri),</div><div class='del'>-	.peri = s5p6450_pdma_peri,</div><div class='add'>+	.peri_id = s5p6450_pdma_peri,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct amba_device s5p64x0_device_pdma = {</div><div class='hunk'>@@ -227,10 +125,15 @@ struct amba_device s5p64x0_device_pdma = {</div><div class='ctx'> </div><div class='ctx'> static int __init s5p64x0_dma_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (soc_is_s5p6450())</div><div class='add'>+	if (soc_is_s5p6450()) {</div><div class='add'>+		dma_cap_set(DMA_SLAVE, s5p6450_pdma_pdata.cap_mask);</div><div class='add'>+		dma_cap_set(DMA_CYCLIC, s5p6450_pdma_pdata.cap_mask);</div><div class='ctx'> 		s5p64x0_device_pdma.dev.platform_data = &amp;s5p6450_pdma_pdata;</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='add'>+		dma_cap_set(DMA_SLAVE, s5p6440_pdma_pdata.cap_mask);</div><div class='add'>+		dma_cap_set(DMA_CYCLIC, s5p6440_pdma_pdata.cap_mask);</div><div class='ctx'> 		s5p64x0_device_pdma.dev.platform_data = &amp;s5p6440_pdma_pdata;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	amba_device_register(&amp;s5p64x0_device_pdma, &amp;iomem_resource);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/include/mach/entry-macro.S b/arch/arm/mach-s5p64x0/include/mach/entry-macro.S<br/>index 10b62b4f8211..fbb246d0a3df 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5p64x0/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -10,7 +10,8 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='del'>-#include &lt;plat/irqs.h&gt;</div><div class='add'>+		.macro  disable_fiq</div><div class='add'>+		.endm</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/entry-macro-vic2.S&gt;</div><div class='add'>+		.macro  arch_ret_to_user, tmp1, tmp2</div><div class='add'>+		.endm</div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/include/mach/irqs.h b/arch/arm/mach-s5p64x0/include/mach/irqs.h<br/>index 53982db9d259..5b845e849b30 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/include/mach/irqs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/include/mach/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5p64x0/include/mach/irqs.h</a></div><div class='hunk'>@@ -141,6 +141,8 @@</div><div class='ctx'> </div><div class='ctx'> #define IRQ_EINT_GROUP(grp, x)	(IRQ_EINT_GROUP##grp##_BASE + (x))</div><div class='ctx'> </div><div class='add'>+#define IRQ_TIMER_BASE		(11)</div><div class='add'>+</div><div class='ctx'> /* Set the default NR_IRQS */</div><div class='ctx'> </div><div class='ctx'> #define NR_IRQS			(IRQ_EINT_GROUP8_BASE + IRQ_EINT_GROUP8_NR + 1)</div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/include/mach/map.h b/arch/arm/mach-s5p64x0/include/mach/map.h<br/>index 4d3ac8a3709d..0c0175dbfa34 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/include/mach/map.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/include/mach/map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/include/mach/map.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5p64x0/include/mach/map.h</a></div><div class='hunk'>@@ -67,6 +67,8 @@</div><div class='ctx'> #define S3C_PA_RTC		S5P64X0_PA_RTC</div><div class='ctx'> #define S3C_PA_WDT		S5P64X0_PA_WDT</div><div class='ctx'> #define S3C_PA_FB		S5P64X0_PA_FB</div><div class='add'>+#define S3C_PA_SPI0		S5P64X0_PA_SPI0</div><div class='add'>+#define S3C_PA_SPI1		S5P64X0_PA_SPI1</div><div class='ctx'> </div><div class='ctx'> #define S5P_PA_CHIPID		S5P64X0_PA_CHIPID</div><div class='ctx'> #define S5P_PA_SROMC		S5P64X0_PA_SROMC</div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/include/mach/system.h b/arch/arm/mach-s5p64x0/include/mach/system.h<br/>index 60f57532c970..cf26e0954a2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5p64x0/include/mach/system.h</a></div><div class='hunk'>@@ -13,8 +13,6 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H __FILE__</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/system-reset.h&gt;</div><div class='del'>-</div><div class='ctx'> static void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* nothing here yet */</div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/include/mach/vmalloc.h b/arch/arm/mach-s5p64x0/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 38dcc71a03cc..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-/* linux/arch/arm/mach-s5p64x0/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com</div><div class='del'>- *</div><div class='del'>- * Copyright 2010 Ben Dooks &lt;ben-linux@fluff.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='del'>- * S3C6400 vmalloc definition</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#ifndef __ASM_ARCH_VMALLOC_H</div><div class='del'>-#define __ASM_ARCH_VMALLOC_H</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END	0xF6000000UL</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_ARCH_VMALLOC_H */</div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/init.c b/arch/arm/mach-s5p64x0/init.c<br/>deleted file mode 100644<br/>index 79833caf8165..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/init.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-/* linux/arch/arm/mach-s5p64x0/init.c</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com</div><div class='del'>- *</div><div class='del'>- * S5P64X0 - Init support</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/serial_core.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/cpu.h&gt;</div><div class='del'>-#include &lt;plat/devs.h&gt;</div><div class='del'>-#include &lt;plat/s5p6440.h&gt;</div><div class='del'>-#include &lt;plat/s5p6450.h&gt;</div><div class='del'>-#include &lt;plat/regs-serial.h&gt;</div><div class='del'>-</div><div class='del'>-static struct s3c24xx_uart_clksrc s5p64x0_serial_clocks[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.name		= "pclk_low",</div><div class='del'>-		.divisor	= 1,</div><div class='del'>-		.min_baud	= 0,</div><div class='del'>-		.max_baud	= 0,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.name		= "uclk1",</div><div class='del'>-		.divisor	= 1,</div><div class='del'>-		.min_baud	= 0,</div><div class='del'>-		.max_baud	= 0,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* uart registration process */</div><div class='del'>-</div><div class='del'>-void __init s5p64x0_common_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='del'>-{</div><div class='del'>-	struct s3c2410_uartcfg *tcfg = cfg;</div><div class='del'>-	u32 ucnt;</div><div class='del'>-</div><div class='del'>-	for (ucnt = 0; ucnt &lt; no; ucnt++, tcfg++) {</div><div class='del'>-		if (!tcfg-&gt;clocks) {</div><div class='del'>-			tcfg-&gt;clocks = s5p64x0_serial_clocks;</div><div class='del'>-			tcfg-&gt;clocks_size = ARRAY_SIZE(s5p64x0_serial_clocks);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init s5p6440_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='del'>-{</div><div class='del'>-	int uart;</div><div class='del'>-</div><div class='del'>-	for (uart = 0; uart &lt; no; uart++) {</div><div class='del'>-		s5p_uart_resources[uart].resources-&gt;start = S5P6440_PA_UART(uart);</div><div class='del'>-		s5p_uart_resources[uart].resources-&gt;end = S5P6440_PA_UART(uart) + S5P_SZ_UART;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s5p64x0_common_init_uarts(cfg, no);</div><div class='del'>-	s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init s5p6450_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='del'>-{</div><div class='del'>-	s5p64x0_common_init_uarts(cfg, no);</div><div class='del'>-	s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/irq-eint.c b/arch/arm/mach-s5p64x0/irq-eint.c<br/>deleted file mode 100644<br/>index 275dc74f4a7b..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/irq-eint.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/irq-eint.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,155 +0,0 @@</div><div class='del'>-/* arch/arm/mach-s5p64x0/irq-eint.c</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2011 Samsung Electronics Co., Ltd</div><div class='del'>- *		http://www.samsung.com/</div><div class='del'>- *</div><div class='del'>- * Based on linux/arch/arm/mach-s3c64xx/irq-eint.c</div><div class='del'>- *</div><div class='del'>- * S5P64X0 - Interrupt handling for External Interrupts.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/cpu.h&gt;</div><div class='del'>-#include &lt;plat/regs-irqtype.h&gt;</div><div class='del'>-#include &lt;plat/gpio-cfg.h&gt;</div><div class='del'>-#include &lt;plat/pm.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/regs-gpio.h&gt;</div><div class='del'>-#include &lt;mach/regs-clock.h&gt;</div><div class='del'>-</div><div class='del'>-#define eint_offset(irq)	((irq) - IRQ_EINT(0))</div><div class='del'>-</div><div class='del'>-static int s5p64x0_irq_eint_set_type(struct irq_data *data, unsigned int type)</div><div class='del'>-{</div><div class='del'>-	int offs = eint_offset(data-&gt;irq);</div><div class='del'>-	int shift;</div><div class='del'>-	u32 ctrl, mask;</div><div class='del'>-	u32 newvalue = 0;</div><div class='del'>-</div><div class='del'>-	if (offs &gt; 15)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case IRQ_TYPE_NONE:</div><div class='del'>-		printk(KERN_WARNING "No edge setting!\n");</div><div class='del'>-		break;</div><div class='del'>-	case IRQ_TYPE_EDGE_RISING:</div><div class='del'>-		newvalue = S3C2410_EXTINT_RISEEDGE;</div><div class='del'>-		break;</div><div class='del'>-	case IRQ_TYPE_EDGE_FALLING:</div><div class='del'>-		newvalue = S3C2410_EXTINT_FALLEDGE;</div><div class='del'>-		break;</div><div class='del'>-	case IRQ_TYPE_EDGE_BOTH:</div><div class='del'>-		newvalue = S3C2410_EXTINT_BOTHEDGE;</div><div class='del'>-		break;</div><div class='del'>-	case IRQ_TYPE_LEVEL_LOW:</div><div class='del'>-		newvalue = S3C2410_EXTINT_LOWLEV;</div><div class='del'>-		break;</div><div class='del'>-	case IRQ_TYPE_LEVEL_HIGH:</div><div class='del'>-		newvalue = S3C2410_EXTINT_HILEV;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "No such irq type %d", type);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	shift = (offs / 2) * 4;</div><div class='del'>-	mask = 0x7 &lt;&lt; shift;</div><div class='del'>-</div><div class='del'>-	ctrl = __raw_readl(S5P64X0_EINT0CON0) &amp; ~mask;</div><div class='del'>-	ctrl |= newvalue &lt;&lt; shift;</div><div class='del'>-	__raw_writel(ctrl, S5P64X0_EINT0CON0);</div><div class='del'>-</div><div class='del'>-	/* Configure the GPIO pin for 6450 or 6440 based on CPU ID */</div><div class='del'>-	if (soc_is_s5p6450())</div><div class='del'>-		s3c_gpio_cfgpin(S5P6450_GPN(offs), S3C_GPIO_SFN(2));</div><div class='del'>-	else</div><div class='del'>-		s3c_gpio_cfgpin(S5P6440_GPN(offs), S3C_GPIO_SFN(2));</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'>- * s5p64x0_irq_demux_eint</div><div class='del'>- *</div><div class='del'>- * This function demuxes the IRQ from the group0 external interrupts,</div><div class='del'>- * from IRQ_EINT(0) to IRQ_EINT(15). It is designed to be inlined into</div><div class='del'>- * the specific handlers s5p64x0_irq_demux_eintX_Y.</div><div class='del'>- */</div><div class='del'>-static inline void s5p64x0_irq_demux_eint(unsigned int start, unsigned int end)</div><div class='del'>-{</div><div class='del'>-	u32 status = __raw_readl(S5P64X0_EINT0PEND);</div><div class='del'>-	u32 mask = __raw_readl(S5P64X0_EINT0MASK);</div><div class='del'>-	unsigned int irq;</div><div class='del'>-</div><div class='del'>-	status &amp;= ~mask;</div><div class='del'>-	status &gt;&gt;= start;</div><div class='del'>-	status &amp;= (1 &lt;&lt; (end - start + 1)) - 1;</div><div class='del'>-</div><div class='del'>-	for (irq = IRQ_EINT(start); irq &lt;= IRQ_EINT(end); irq++) {</div><div class='del'>-		if (status &amp; 1)</div><div class='del'>-			generic_handle_irq(irq);</div><div class='del'>-		status &gt;&gt;= 1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void s5p64x0_irq_demux_eint0_3(unsigned int irq, struct irq_desc *desc)</div><div class='del'>-{</div><div class='del'>-	s5p64x0_irq_demux_eint(0, 3);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void s5p64x0_irq_demux_eint4_11(unsigned int irq, struct irq_desc *desc)</div><div class='del'>-{</div><div class='del'>-	s5p64x0_irq_demux_eint(4, 11);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void s5p64x0_irq_demux_eint12_15(unsigned int irq,</div><div class='del'>-					struct irq_desc *desc)</div><div class='del'>-{</div><div class='del'>-	s5p64x0_irq_demux_eint(12, 15);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int s5p64x0_alloc_gc(void)</div><div class='del'>-{</div><div class='del'>-	struct irq_chip_generic *gc;</div><div class='del'>-	struct irq_chip_type *ct;</div><div class='del'>-</div><div class='del'>-	gc = irq_alloc_generic_chip("s5p64x0-eint", 1, S5P_IRQ_EINT_BASE,</div><div class='del'>-				    S5P_VA_GPIO, handle_level_irq);</div><div class='del'>-	if (!gc) {</div><div class='del'>-		printk(KERN_ERR "%s: irq_alloc_generic_chip for group 0"</div><div class='del'>-			"external interrupts failed\n", __func__);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ct = gc-&gt;chip_types;</div><div class='del'>-	ct-&gt;chip.irq_ack = irq_gc_ack_set_bit;</div><div class='del'>-	ct-&gt;chip.irq_mask = irq_gc_mask_set_bit;</div><div class='del'>-	ct-&gt;chip.irq_unmask = irq_gc_mask_clr_bit;</div><div class='del'>-	ct-&gt;chip.irq_set_type = s5p64x0_irq_eint_set_type;</div><div class='del'>-	ct-&gt;chip.irq_set_wake = s3c_irqext_wake;</div><div class='del'>-	ct-&gt;regs.ack = EINT0PEND_OFFSET;</div><div class='del'>-	ct-&gt;regs.mask = EINT0MASK_OFFSET;</div><div class='del'>-	irq_setup_generic_chip(gc, IRQ_MSK(16), IRQ_GC_INIT_MASK_CACHE,</div><div class='del'>-			       IRQ_NOREQUEST | IRQ_NOPROBE, 0);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init s5p64x0_init_irq_eint(void)</div><div class='del'>-{</div><div class='del'>-	int ret = s5p64x0_alloc_gc();</div><div class='del'>-	irq_set_chained_handler(IRQ_EINT0_3, s5p64x0_irq_demux_eint0_3);</div><div class='del'>-	irq_set_chained_handler(IRQ_EINT4_11, s5p64x0_irq_demux_eint4_11);</div><div class='del'>-	irq_set_chained_handler(IRQ_EINT12_15, s5p64x0_irq_demux_eint12_15);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-arch_initcall(s5p64x0_init_irq_eint);</div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-s5p64x0/mach-smdk6440.c<br/>index 4a1250cd1356..a40e325d62c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/mach-smdk6440.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/mach-smdk6440.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/mach-smdk6440.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5p64x0/mach-smdk6440.c</a></div><div class='hunk'>@@ -24,9 +24,11 @@</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/pwm_backlight.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/mmc/host.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/platform_lcd.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -40,7 +42,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;plat/gpio-cfg.h&gt;</div><div class='del'>-#include &lt;plat/s5p6440.h&gt;</div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='hunk'>@@ -52,6 +53,9 @@</div><div class='ctx'> #include &lt;plat/backlight.h&gt;</div><div class='ctx'> #include &lt;plat/fb.h&gt;</div><div class='ctx'> #include &lt;plat/regs-fb.h&gt;</div><div class='add'>+#include &lt;plat/sdhci.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #define SMDK6440_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\</div><div class='ctx'> 				S3C2410_UCON_RXILEVEL |		\</div><div class='hunk'>@@ -161,6 +165,25 @@ static struct platform_device *smdk6440_devices[] __initdata = {</div><div class='ctx'> 	&amp;s5p6440_device_iis,</div><div class='ctx'> 	&amp;s3c_device_fb,</div><div class='ctx'> 	&amp;smdk6440_lcd_lte480wv,</div><div class='add'>+	&amp;s3c_device_hsmmc0,</div><div class='add'>+	&amp;s3c_device_hsmmc1,</div><div class='add'>+	&amp;s3c_device_hsmmc2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c_sdhci_platdata smdk6440_hsmmc0_pdata __initdata = {</div><div class='add'>+	.cd_type	= S3C_SDHCI_CD_NONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c_sdhci_platdata smdk6440_hsmmc1_pdata __initdata = {</div><div class='add'>+	.cd_type	= S3C_SDHCI_CD_INTERNAL,</div><div class='add'>+#if defined(CONFIG_S5P64X0_SD_CH1_8BIT)</div><div class='add'>+	.max_width	= 8,</div><div class='add'>+	.host_caps	= MMC_CAP_8_BIT_DATA,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c_sdhci_platdata smdk6440_hsmmc2_pdata __initdata = {</div><div class='add'>+	.cd_type	= S3C_SDHCI_CD_NONE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct s3c2410_platform_i2c s5p6440_i2c0_data __initdata = {</div><div class='hunk'>@@ -201,7 +224,7 @@ static struct platform_pwm_backlight_data smdk6440_bl_data = {</div><div class='ctx'> </div><div class='ctx'> static void __init smdk6440_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	s5p_init_io(NULL, 0, S5P64X0_SYS_ID);</div><div class='add'>+	s5p64x0_init_io(NULL, 0);</div><div class='ctx'> 	s3c24xx_init_clocks(12000000);</div><div class='ctx'> 	s3c24xx_init_uarts(smdk6440_uartcfgs, ARRAY_SIZE(smdk6440_uartcfgs));</div><div class='ctx'> 	s5p_set_timer_source(S5P_PWM3, S5P_PWM4);</div><div class='hunk'>@@ -234,6 +257,10 @@ static void __init smdk6440_machine_init(void)</div><div class='ctx'> 	s5p6440_set_lcd_interface();</div><div class='ctx'> 	s3c_fb_set_platdata(&amp;smdk6440_lcd_pdata);</div><div class='ctx'> </div><div class='add'>+	s3c_sdhci0_set_platdata(&amp;smdk6440_hsmmc0_pdata);</div><div class='add'>+	s3c_sdhci1_set_platdata(&amp;smdk6440_hsmmc1_pdata);</div><div class='add'>+	s3c_sdhci2_set_platdata(&amp;smdk6440_hsmmc2_pdata);</div><div class='add'>+</div><div class='ctx'> 	platform_add_devices(smdk6440_devices, ARRAY_SIZE(smdk6440_devices));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -242,7 +269,9 @@ MACHINE_START(SMDK6440, "SMDK6440")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> </div><div class='ctx'> 	.init_irq	= s5p6440_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.map_io		= smdk6440_map_io,</div><div class='ctx'> 	.init_machine	= smdk6440_machine_init,</div><div class='ctx'> 	.timer		= &amp;s5p_timer,</div><div class='add'>+	.restart	= s5p64x0_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c<br/>index 0ab129ecf009..efb69e2f2afe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/mach-smdk6450.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/mach-smdk6450.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/mach-smdk6450.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5p64x0/mach-smdk6450.c</a></div><div class='hunk'>@@ -24,9 +24,11 @@</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/pwm_backlight.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/mmc/host.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/platform_lcd.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -40,7 +42,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;plat/gpio-cfg.h&gt;</div><div class='del'>-#include &lt;plat/s5p6450.h&gt;</div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='hunk'>@@ -52,6 +53,9 @@</div><div class='ctx'> #include &lt;plat/backlight.h&gt;</div><div class='ctx'> #include &lt;plat/fb.h&gt;</div><div class='ctx'> #include &lt;plat/regs-fb.h&gt;</div><div class='add'>+#include &lt;plat/sdhci.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> #define SMDK6450_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\</div><div class='ctx'> 				S3C2410_UCON_RXILEVEL |		\</div><div class='hunk'>@@ -179,10 +183,28 @@ static struct platform_device *smdk6450_devices[] __initdata = {</div><div class='ctx'> 	&amp;s5p6450_device_iis0,</div><div class='ctx'> 	&amp;s3c_device_fb,</div><div class='ctx'> 	&amp;smdk6450_lcd_lte480wv,</div><div class='del'>-</div><div class='add'>+	&amp;s3c_device_hsmmc0,</div><div class='add'>+	&amp;s3c_device_hsmmc1,</div><div class='add'>+	&amp;s3c_device_hsmmc2,</div><div class='ctx'> 	/* s5p6450_device_spi0 will be added */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct s3c_sdhci_platdata smdk6450_hsmmc0_pdata __initdata = {</div><div class='add'>+	.cd_type	= S3C_SDHCI_CD_NONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c_sdhci_platdata smdk6450_hsmmc1_pdata __initdata = {</div><div class='add'>+	.cd_type	= S3C_SDHCI_CD_NONE,</div><div class='add'>+#if defined(CONFIG_S5P64X0_SD_CH1_8BIT)</div><div class='add'>+	.max_width	= 8,</div><div class='add'>+	.host_caps	= MMC_CAP_8_BIT_DATA,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c_sdhci_platdata smdk6450_hsmmc2_pdata __initdata = {</div><div class='add'>+	.cd_type	= S3C_SDHCI_CD_NONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct s3c2410_platform_i2c s5p6450_i2c0_data __initdata = {</div><div class='ctx'> 	.flags		= 0,</div><div class='ctx'> 	.slave_addr	= 0x10,</div><div class='hunk'>@@ -221,7 +243,7 @@ static struct platform_pwm_backlight_data smdk6450_bl_data = {</div><div class='ctx'> </div><div class='ctx'> static void __init smdk6450_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	s5p_init_io(NULL, 0, S5P64X0_SYS_ID);</div><div class='add'>+	s5p64x0_init_io(NULL, 0);</div><div class='ctx'> 	s3c24xx_init_clocks(19200000);</div><div class='ctx'> 	s3c24xx_init_uarts(smdk6450_uartcfgs, ARRAY_SIZE(smdk6450_uartcfgs));</div><div class='ctx'> 	s5p_set_timer_source(S5P_PWM3, S5P_PWM4);</div><div class='hunk'>@@ -254,6 +276,10 @@ static void __init smdk6450_machine_init(void)</div><div class='ctx'> 	s5p6450_set_lcd_interface();</div><div class='ctx'> 	s3c_fb_set_platdata(&amp;smdk6450_lcd_pdata);</div><div class='ctx'> </div><div class='add'>+	s3c_sdhci0_set_platdata(&amp;smdk6450_hsmmc0_pdata);</div><div class='add'>+	s3c_sdhci1_set_platdata(&amp;smdk6450_hsmmc1_pdata);</div><div class='add'>+	s3c_sdhci2_set_platdata(&amp;smdk6450_hsmmc2_pdata);</div><div class='add'>+</div><div class='ctx'> 	platform_add_devices(smdk6450_devices, ARRAY_SIZE(smdk6450_devices));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -262,7 +288,9 @@ MACHINE_START(SMDK6450, "SMDK6450")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> </div><div class='ctx'> 	.init_irq	= s5p6450_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.map_io		= smdk6450_map_io,</div><div class='ctx'> 	.init_machine	= smdk6450_machine_init,</div><div class='ctx'> 	.timer		= &amp;s5p_timer,</div><div class='add'>+	.restart	= s5p64x0_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/pm.c b/arch/arm/mach-s5p64x0/pm.c<br/>index 69927243d25f..23f9b22439c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5p64x0/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5p64x0/pm.c</a></div><div class='hunk'>@@ -160,7 +160,7 @@ static void s5p64x0_pm_prepare(void)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5p64x0_pm_add(struct sys_device *sysdev)</div><div class='add'>+static int s5p64x0_pm_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	pm_cpu_prep = s5p64x0_pm_prepare;</div><div class='ctx'> 	pm_cpu_sleep = s5p64x0_cpu_suspend;</div><div class='hunk'>@@ -169,15 +169,17 @@ static int s5p64x0_pm_add(struct sys_device *sysdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s5p64x0_pm_driver = {</div><div class='del'>-	.add		= s5p64x0_pm_add,</div><div class='add'>+static struct subsys_interface s5p64x0_pm_interface = {</div><div class='add'>+	.name		= "s5p64x0_pm",</div><div class='add'>+	.subsys		= &amp;s5p64x0_subsys,</div><div class='add'>+	.add_dev	= s5p64x0_pm_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __init int s5p64x0_pm_drvinit(void)</div><div class='ctx'> {</div><div class='ctx'> 	s3c_pm_init();</div><div class='ctx'> </div><div class='del'>-	return sysdev_driver_register(&amp;s5p64x0_sysclass, &amp;s5p64x0_pm_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s5p64x0_pm_interface);</div><div class='ctx'> }</div><div class='ctx'> arch_initcall(s5p64x0_pm_drvinit);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/setup-sdhci-gpio.c b/arch/arm/mach-s5p64x0/setup-sdhci-gpio.c<br/>new file mode 100644<br/>index 000000000000..8410af0d12bf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/setup-sdhci-gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5p64x0/setup-sdhci-gpio.c</a></div><div class='hunk'>@@ -0,0 +1,104 @@</div><div class='add'>+/* linux/arch/arm/mach-s5p64x0/setup-sdhci-gpio.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com/</div><div class='add'>+ *</div><div class='add'>+ * S5P64X0 - Helper functions for setting up SDHCI device(s) GPIO (HSMMC)</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/regs-gpio.h&gt;</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;plat/gpio-cfg.h&gt;</div><div class='add'>+#include &lt;plat/sdhci.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+</div><div class='add'>+void s5p64x0_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)</div><div class='add'>+{</div><div class='add'>+	struct s3c_sdhci_platdata *pdata = dev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	/* Set all the necessary GPG pins to special-function 2 */</div><div class='add'>+	if (soc_is_s5p6450())</div><div class='add'>+		s3c_gpio_cfgrange_nopull(S5P6450_GPG(0), 2 + width,</div><div class='add'>+					 S3C_GPIO_SFN(2));</div><div class='add'>+	else</div><div class='add'>+		s3c_gpio_cfgrange_nopull(S5P6440_GPG(0), 2 + width,</div><div class='add'>+					 S3C_GPIO_SFN(2));</div><div class='add'>+</div><div class='add'>+	/* Set GPG[6] pin to special-function 2 - MMC0 CDn */</div><div class='add'>+	if (pdata-&gt;cd_type == S3C_SDHCI_CD_INTERNAL) {</div><div class='add'>+		if (soc_is_s5p6450()) {</div><div class='add'>+			s3c_gpio_setpull(S5P6450_GPG(6), S3C_GPIO_PULL_UP);</div><div class='add'>+			s3c_gpio_cfgpin(S5P6450_GPG(6), S3C_GPIO_SFN(2));</div><div class='add'>+		} else {</div><div class='add'>+			s3c_gpio_setpull(S5P6440_GPG(6), S3C_GPIO_PULL_UP);</div><div class='add'>+			s3c_gpio_cfgpin(S5P6440_GPG(6), S3C_GPIO_SFN(2));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void s5p64x0_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)</div><div class='add'>+{</div><div class='add'>+	struct s3c_sdhci_platdata *pdata = dev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	/* Set GPH[0:1] pins to special-function 2 - CLK and CMD */</div><div class='add'>+	if (soc_is_s5p6450())</div><div class='add'>+		s3c_gpio_cfgrange_nopull(S5P6450_GPH(0), 2, S3C_GPIO_SFN(2));</div><div class='add'>+	else</div><div class='add'>+		s3c_gpio_cfgrange_nopull(S5P6440_GPH(0), 2 , S3C_GPIO_SFN(2));</div><div class='add'>+</div><div class='add'>+	switch (width) {</div><div class='add'>+	case 8:</div><div class='add'>+		/* Set data pins GPH[6:9] special-function 2 */</div><div class='add'>+		if (soc_is_s5p6450())</div><div class='add'>+			s3c_gpio_cfgrange_nopull(S5P6450_GPH(6), 4,</div><div class='add'>+						 S3C_GPIO_SFN(2));</div><div class='add'>+		else</div><div class='add'>+			s3c_gpio_cfgrange_nopull(S5P6440_GPH(6), 4,</div><div class='add'>+						 S3C_GPIO_SFN(2));</div><div class='add'>+	case 4:</div><div class='add'>+		/* set data pins GPH[2:5] special-function 2 */</div><div class='add'>+		if (soc_is_s5p6450())</div><div class='add'>+			s3c_gpio_cfgrange_nopull(S5P6450_GPH(2), 4,</div><div class='add'>+						 S3C_GPIO_SFN(2));</div><div class='add'>+		else</div><div class='add'>+			s3c_gpio_cfgrange_nopull(S5P6440_GPH(2), 4,</div><div class='add'>+						 S3C_GPIO_SFN(2));</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set GPG[6] pin to special-funtion 3 : MMC1 CDn */</div><div class='add'>+	if (pdata-&gt;cd_type == S3C_SDHCI_CD_INTERNAL) {</div><div class='add'>+		if (soc_is_s5p6450()) {</div><div class='add'>+			s3c_gpio_setpull(S5P6450_GPG(6), S3C_GPIO_PULL_UP);</div><div class='add'>+			s3c_gpio_cfgpin(S5P6450_GPG(6), S3C_GPIO_SFN(3));</div><div class='add'>+		} else {</div><div class='add'>+			s3c_gpio_setpull(S5P6440_GPG(6), S3C_GPIO_PULL_UP);</div><div class='add'>+			s3c_gpio_cfgpin(S5P6440_GPG(6), S3C_GPIO_SFN(3));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void s5p6440_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)</div><div class='add'>+{</div><div class='add'>+	/* Set GPC[4:5] pins to special-function 3 - CLK and CMD */</div><div class='add'>+	s3c_gpio_cfgrange_nopull(S5P6440_GPC(4), 2, S3C_GPIO_SFN(3));</div><div class='add'>+</div><div class='add'>+	/* Set data pins GPH[6:9] pins to special-function 3 */</div><div class='add'>+	s3c_gpio_cfgrange_nopull(S5P6440_GPH(6), 4, S3C_GPIO_SFN(3));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void s5p6450_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)</div><div class='add'>+{</div><div class='add'>+	/* Set all the necessary GPG pins to special-function 3 */</div><div class='add'>+	s3c_gpio_cfgrange_nopull(S5P6450_GPG(7), 2 + width, S3C_GPIO_SFN(3));</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-s5p64x0/setup-spi.c b/arch/arm/mach-s5p64x0/setup-spi.c<br/>new file mode 100644<br/>index 000000000000..e9b841240352<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5p64x0/setup-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5p64x0/setup-spi.c</a></div><div class='hunk'>@@ -0,0 +1,55 @@</div><div class='add'>+/* linux/arch/arm/mach-s5p64x0/setup-spi.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Samsung Electronics Ltd.</div><div class='add'>+ *		http://www.samsung.com/</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;plat/gpio-cfg.h&gt;</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+#include &lt;plat/s3c64xx-spi.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_S3C64XX_DEV_SPI0</div><div class='add'>+struct s3c64xx_spi_info s3c64xx_spi0_pdata __initdata = {</div><div class='add'>+	.fifo_lvl_mask	= 0x1ff,</div><div class='add'>+	.rx_lvl_offset	= 15,</div><div class='add'>+	.tx_st_done	= 25,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int s3c64xx_spi0_cfg_gpio(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (soc_is_s5p6450())</div><div class='add'>+		s3c_gpio_cfgall_range(S5P6450_GPC(0), 3,</div><div class='add'>+					S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);</div><div class='add'>+	else</div><div class='add'>+		s3c_gpio_cfgall_range(S5P6440_GPC(0), 3,</div><div class='add'>+					S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_S3C64XX_DEV_SPI1</div><div class='add'>+struct s3c64xx_spi_info s3c64xx_spi1_pdata __initdata = {</div><div class='add'>+	.fifo_lvl_mask	= 0x7f,</div><div class='add'>+	.rx_lvl_offset	= 15,</div><div class='add'>+	.tx_st_done	= 25,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int s3c64xx_spi1_cfg_gpio(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (soc_is_s5p6450())</div><div class='add'>+		s3c_gpio_cfgall_range(S5P6450_GPC(4), 3,</div><div class='add'>+					S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);</div><div class='add'>+	else</div><div class='add'>+		s3c_gpio_cfgall_range(S5P6440_GPC(4), 3,</div><div class='add'>+					S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-s5pc100/Kconfig b/arch/arm/mach-s5pc100/Kconfig<br/>index e538a4c67e9c..75a26eaf2633 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pc100/Kconfig</a></div><div class='hunk'>@@ -45,6 +45,11 @@ config S5PC100_SETUP_SDHCI_GPIO</div><div class='ctx'> 	help</div><div class='ctx'> 	  Common setup code for SDHCI gpio.</div><div class='ctx'> </div><div class='add'>+config S5PC100_SETUP_SPI</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  Common setup code for SPI GPIO configurations.</div><div class='add'>+</div><div class='ctx'> config MACH_SMDKC100</div><div class='ctx'> 	bool "SMDKC100"</div><div class='ctx'> 	select CPU_S5PC100</div><div class='head'>diff --git a/arch/arm/mach-s5pc100/Makefile b/arch/arm/mach-s5pc100/Makefile<br/>index a5e6e608b498..118c711f74e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pc100/Makefile</a></div><div class='hunk'>@@ -9,28 +9,24 @@ obj-m				:=</div><div class='ctx'> obj-n				:=</div><div class='ctx'> obj-				:=</div><div class='ctx'> </div><div class='del'>-# Core support for S5PC100 system</div><div class='add'>+# Core</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_CPU_S5PC100)	+= cpu.o init.o clock.o</div><div class='del'>-obj-$(CONFIG_CPU_S5PC100)	+= setup-i2c0.o</div><div class='del'>-obj-$(CONFIG_CPU_S5PC100)	+= dma.o</div><div class='add'>+obj-y				+= common.o clock.o</div><div class='ctx'> </div><div class='del'>-# Helper and device support</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_S5PC100_SETUP_FB_24BPP)	+= setup-fb-24bpp.o</div><div class='del'>-obj-$(CONFIG_S5PC100_SETUP_I2C1)	+= setup-i2c1.o</div><div class='del'>-obj-$(CONFIG_S5PC100_SETUP_IDE)		+= setup-ide.o</div><div class='del'>-obj-$(CONFIG_S5PC100_SETUP_KEYPAD)	+= setup-keypad.o</div><div class='del'>-obj-$(CONFIG_S5PC100_SETUP_SDHCI)	+= setup-sdhci.o</div><div class='del'>-obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o</div><div class='del'>-</div><div class='del'>-# device support</div><div class='del'>-obj-y				+= dev-audio.o</div><div class='del'>-obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o</div><div class='add'>+obj-y				+= dma.o</div><div class='ctx'> </div><div class='ctx'> # machine support</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MACH_SMDKC100)	+= mach-smdkc100.o</div><div class='ctx'> </div><div class='ctx'> # device support</div><div class='add'>+</div><div class='ctx'> obj-y				+= dev-audio.o</div><div class='add'>+</div><div class='add'>+obj-y					+= setup-i2c0.o</div><div class='add'>+obj-$(CONFIG_S5PC100_SETUP_FB_24BPP)	+= setup-fb-24bpp.o</div><div class='add'>+obj-$(CONFIG_S5PC100_SETUP_I2C1)	+= setup-i2c1.o</div><div class='add'>+obj-$(CONFIG_S5PC100_SETUP_IDE)		+= setup-ide.o</div><div class='add'>+obj-$(CONFIG_S5PC100_SETUP_KEYPAD)	+= setup-keypad.o</div><div class='add'>+obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o</div><div class='add'>+obj-$(CONFIG_S5PC100_SETUP_SPI)		+= setup-spi.o</div><div class='head'>diff --git a/arch/arm/mach-s5pc100/clock.c b/arch/arm/mach-s5pc100/clock.c<br/>index 8d47709da713..247194dd366c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pc100/clock.c</a></div><div class='hunk'>@@ -27,7 +27,8 @@</div><div class='ctx'> #include &lt;plat/pll.h&gt;</div><div class='ctx'> #include &lt;plat/s5p-clock.h&gt;</div><div class='ctx'> #include &lt;plat/clock-clksrc.h&gt;</div><div class='del'>-#include &lt;plat/s5pc100.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> static struct clk s5p_clk_otgphy = {</div><div class='ctx'> 	.name		= "otg_phy",</div><div class='hunk'>@@ -426,24 +427,6 @@ static struct clk init_clocks_off[] = {</div><div class='ctx'> 		.enable		= s5pc100_d0_2_ctrl,</div><div class='ctx'> 		.ctrlbit	= (1 &lt;&lt; 1),</div><div class='ctx'> 	}, {</div><div class='del'>-		.name		= "hsmmc",</div><div class='del'>-		.devname	= "s3c-sdhci.2",</div><div class='del'>-		.parent		= &amp;clk_div_d1_bus.clk,</div><div class='del'>-		.enable		= s5pc100_d1_0_ctrl,</div><div class='del'>-		.ctrlbit	= (1 &lt;&lt; 7),</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "hsmmc",</div><div class='del'>-		.devname	= "s3c-sdhci.1",</div><div class='del'>-		.parent		= &amp;clk_div_d1_bus.clk,</div><div class='del'>-		.enable		= s5pc100_d1_0_ctrl,</div><div class='del'>-		.ctrlbit	= (1 &lt;&lt; 6),</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "hsmmc",</div><div class='del'>-		.devname	= "s3c-sdhci.0",</div><div class='del'>-		.parent		= &amp;clk_div_d1_bus.clk,</div><div class='del'>-		.enable		= s5pc100_d1_0_ctrl,</div><div class='del'>-		.ctrlbit	= (1 &lt;&lt; 5),</div><div class='del'>-	}, {</div><div class='ctx'> 		.name		= "modemif",</div><div class='ctx'> 		.parent		= &amp;clk_div_d1_bus.clk,</div><div class='ctx'> 		.enable		= s5pc100_d1_0_ctrl,</div><div class='hunk'>@@ -673,24 +656,6 @@ static struct clk init_clocks_off[] = {</div><div class='ctx'> 		.enable		= s5pc100_d1_5_ctrl,</div><div class='ctx'> 		.ctrlbit	= (1 &lt;&lt; 8),</div><div class='ctx'> 	}, {</div><div class='del'>-		.name		= "spi_48m",</div><div class='del'>-		.devname	= "s3c64xx-spi.0",</div><div class='del'>-		.parent		= &amp;clk_mout_48m.clk,</div><div class='del'>-		.enable		= s5pc100_sclk0_ctrl,</div><div class='del'>-		.ctrlbit	= (1 &lt;&lt; 7),</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "spi_48m",</div><div class='del'>-		.devname	= "s3c64xx-spi.1",</div><div class='del'>-		.parent		= &amp;clk_mout_48m.clk,</div><div class='del'>-		.enable		= s5pc100_sclk0_ctrl,</div><div class='del'>-		.ctrlbit	= (1 &lt;&lt; 8),</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "spi_48m",</div><div class='del'>-		.devname	= "s3c64xx-spi.2",</div><div class='del'>-		.parent		= &amp;clk_mout_48m.clk,</div><div class='del'>-		.enable		= s5pc100_sclk0_ctrl,</div><div class='del'>-		.ctrlbit	= (1 &lt;&lt; 9),</div><div class='del'>-	}, {</div><div class='ctx'> 		.name		= "mmc_48m",</div><div class='ctx'> 		.devname	= "s3c-sdhci.0",</div><div class='ctx'> 		.parent		= &amp;clk_mout_48m.clk,</div><div class='hunk'>@@ -711,6 +676,54 @@ static struct clk init_clocks_off[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk clk_hsmmc2 = {</div><div class='add'>+	.name		= "hsmmc",</div><div class='add'>+	.devname	= "s3c-sdhci.2",</div><div class='add'>+	.parent		= &amp;clk_div_d1_bus.clk,</div><div class='add'>+	.enable		= s5pc100_d1_0_ctrl,</div><div class='add'>+	.ctrlbit	= (1 &lt;&lt; 7),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk clk_hsmmc1 = {</div><div class='add'>+	.name		= "hsmmc",</div><div class='add'>+	.devname	= "s3c-sdhci.1",</div><div class='add'>+	.parent		= &amp;clk_div_d1_bus.clk,</div><div class='add'>+	.enable		= s5pc100_d1_0_ctrl,</div><div class='add'>+	.ctrlbit	= (1 &lt;&lt; 6),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk clk_hsmmc0 = {</div><div class='add'>+	.name		= "hsmmc",</div><div class='add'>+	.devname	= "s3c-sdhci.0",</div><div class='add'>+	.parent		= &amp;clk_div_d1_bus.clk,</div><div class='add'>+	.enable		= s5pc100_d1_0_ctrl,</div><div class='add'>+	.ctrlbit	= (1 &lt;&lt; 5),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk clk_48m_spi0 = {</div><div class='add'>+	.name		= "spi_48m",</div><div class='add'>+	.devname	= "s3c64xx-spi.0",</div><div class='add'>+	.parent		= &amp;clk_mout_48m.clk,</div><div class='add'>+	.enable		= s5pc100_sclk0_ctrl,</div><div class='add'>+	.ctrlbit	= (1 &lt;&lt; 7),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk clk_48m_spi1 = {</div><div class='add'>+	.name		= "spi_48m",</div><div class='add'>+	.devname	= "s3c64xx-spi.1",</div><div class='add'>+	.parent		= &amp;clk_mout_48m.clk,</div><div class='add'>+	.enable		= s5pc100_sclk0_ctrl,</div><div class='add'>+	.ctrlbit	= (1 &lt;&lt; 8),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk clk_48m_spi2 = {</div><div class='add'>+	.name		= "spi_48m",</div><div class='add'>+	.devname	= "s3c64xx-spi.2",</div><div class='add'>+	.parent		= &amp;clk_mout_48m.clk,</div><div class='add'>+	.enable		= s5pc100_sclk0_ctrl,</div><div class='add'>+	.ctrlbit	= (1 &lt;&lt; 9),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk clk_vclk54m = {</div><div class='ctx'> 	.name		= "vclk_54m",</div><div class='ctx'> 	.rate		= 54000000,</div><div class='hunk'>@@ -929,49 +942,6 @@ static struct clksrc_clk clk_sclk_spdif = {</div><div class='ctx'> static struct clksrc_clk clksrcs[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.clk	= {</div><div class='del'>-			.name		= "sclk_spi",</div><div class='del'>-			.devname	= "s3c64xx-spi.0",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 4),</div><div class='del'>-			.enable		= s5pc100_sclk0_ctrl,</div><div class='del'>-</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clk_src_group1,</div><div class='del'>-		.reg_src = { .reg = S5P_CLK_SRC1, .shift = 4, .size = 2 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLK_DIV2, .shift = 4, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "sclk_spi",</div><div class='del'>-			.devname	= "s3c64xx-spi.1",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 5),</div><div class='del'>-			.enable		= s5pc100_sclk0_ctrl,</div><div class='del'>-</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clk_src_group1,</div><div class='del'>-		.reg_src = { .reg = S5P_CLK_SRC1, .shift = 8, .size = 2 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLK_DIV2, .shift = 8, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "sclk_spi",</div><div class='del'>-			.devname	= "s3c64xx-spi.2",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 6),</div><div class='del'>-			.enable		= s5pc100_sclk0_ctrl,</div><div class='del'>-</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clk_src_group1,</div><div class='del'>-		.reg_src = { .reg = S5P_CLK_SRC1, .shift = 12, .size = 2 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLK_DIV2, .shift = 12, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "uclk1",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 3),</div><div class='del'>-			.enable		= s5pc100_sclk0_ctrl,</div><div class='del'>-</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clk_src_group2,</div><div class='del'>-		.reg_src = { .reg = S5P_CLK_SRC1, .shift = 0, .size = 1 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLK_DIV2, .shift = 0, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='ctx'> 			.name		= "sclk_mixer",</div><div class='ctx'> 			.ctrlbit	= (1 &lt;&lt; 6),</div><div class='ctx'> 			.enable		= s5pc100_sclk0_ctrl,</div><div class='hunk'>@@ -1024,39 +994,6 @@ static struct clksrc_clk clksrcs[] = {</div><div class='ctx'> 		.reg_div = { .reg = S5P_CLK_DIV3, .shift = 24, .size = 4 },</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.clk	= {</div><div class='del'>-			.name		= "sclk_mmc",</div><div class='del'>-			.devname	= "s3c-sdhci.0",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 12),</div><div class='del'>-			.enable		= s5pc100_sclk1_ctrl,</div><div class='del'>-</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clk_src_mmc0,</div><div class='del'>-		.reg_src = { .reg = S5P_CLK_SRC2, .shift = 0, .size = 2 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLK_DIV3, .shift = 0, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "sclk_mmc",</div><div class='del'>-			.devname	= "s3c-sdhci.1",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 13),</div><div class='del'>-			.enable		= s5pc100_sclk1_ctrl,</div><div class='del'>-</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clk_src_mmc12,</div><div class='del'>-		.reg_src = { .reg = S5P_CLK_SRC2, .shift = 4, .size = 2 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLK_DIV3, .shift = 4, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "sclk_mmc",</div><div class='del'>-			.devname	= "s3c-sdhci.2",</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 14),</div><div class='del'>-			.enable		= s5pc100_sclk1_ctrl,</div><div class='del'>-</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clk_src_mmc12,</div><div class='del'>-		.reg_src = { .reg = S5P_CLK_SRC2, .shift = 8, .size = 2 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLK_DIV3, .shift = 8, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='ctx'> 			.name		= "sclk_irda",</div><div class='ctx'> 			.ctrlbit	= (1 &lt;&lt; 10),</div><div class='ctx'> 			.enable		= s5pc100_sclk0_ctrl,</div><div class='hunk'>@@ -1098,6 +1035,89 @@ static struct clksrc_clk clksrcs[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clksrc_clk clk_sclk_uart = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "uclk1",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 3),</div><div class='add'>+		.enable		= s5pc100_sclk0_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clk_src_group2,</div><div class='add'>+	.reg_src = { .reg = S5P_CLK_SRC1, .shift = 0, .size = 1 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLK_DIV2, .shift = 0, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_mmc0 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "sclk_mmc",</div><div class='add'>+		.devname	= "s3c-sdhci.0",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 12),</div><div class='add'>+		.enable		= s5pc100_sclk1_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clk_src_mmc0,</div><div class='add'>+	.reg_src = { .reg = S5P_CLK_SRC2, .shift = 0, .size = 2 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLK_DIV3, .shift = 0, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_mmc1 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "sclk_mmc",</div><div class='add'>+		.devname	= "s3c-sdhci.1",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 13),</div><div class='add'>+		.enable		= s5pc100_sclk1_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clk_src_mmc12,</div><div class='add'>+	.reg_src = { .reg = S5P_CLK_SRC2, .shift = 4, .size = 2 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLK_DIV3, .shift = 4, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_mmc2 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "sclk_mmc",</div><div class='add'>+		.devname	= "s3c-sdhci.2",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 14),</div><div class='add'>+		.enable		= s5pc100_sclk1_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clk_src_mmc12,</div><div class='add'>+	.reg_src = { .reg = S5P_CLK_SRC2, .shift = 8, .size = 2 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLK_DIV3, .shift = 8, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_spi0 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "sclk_spi",</div><div class='add'>+		.devname	= "s3c64xx-spi.0",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 4),</div><div class='add'>+		.enable		= s5pc100_sclk0_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clk_src_group1,</div><div class='add'>+	.reg_src = { .reg = S5P_CLK_SRC1, .shift = 4, .size = 2 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLK_DIV2, .shift = 4, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_spi1 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "sclk_spi",</div><div class='add'>+		.devname	= "s3c64xx-spi.1",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 5),</div><div class='add'>+		.enable		= s5pc100_sclk0_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clk_src_group1,</div><div class='add'>+	.reg_src = { .reg = S5P_CLK_SRC1, .shift = 8, .size = 2 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLK_DIV2, .shift = 8, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_spi2 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "sclk_spi",</div><div class='add'>+		.devname	= "s3c64xx-spi.2",</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 6),</div><div class='add'>+		.enable		= s5pc100_sclk0_ctrl,</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clk_src_group1,</div><div class='add'>+	.reg_src = { .reg = S5P_CLK_SRC1, .shift = 12, .size = 2 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLK_DIV2, .shift = 12, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Clock initialisation code */</div><div class='ctx'> static struct clksrc_clk *sysclks[] = {</div><div class='ctx'> 	&amp;clk_mout_apll,</div><div class='hunk'>@@ -1127,6 +1147,25 @@ static struct clksrc_clk *sysclks[] = {</div><div class='ctx'> 	&amp;clk_sclk_spdif,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk *clk_cdev[] = {</div><div class='add'>+	&amp;clk_hsmmc0,</div><div class='add'>+	&amp;clk_hsmmc1,</div><div class='add'>+	&amp;clk_hsmmc2,</div><div class='add'>+	&amp;clk_48m_spi0,</div><div class='add'>+	&amp;clk_48m_spi1,</div><div class='add'>+	&amp;clk_48m_spi2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk *clksrc_cdev[] = {</div><div class='add'>+	&amp;clk_sclk_uart,</div><div class='add'>+	&amp;clk_sclk_mmc0,</div><div class='add'>+	&amp;clk_sclk_mmc1,</div><div class='add'>+	&amp;clk_sclk_mmc2,</div><div class='add'>+	&amp;clk_sclk_spi0,</div><div class='add'>+	&amp;clk_sclk_spi1,</div><div class='add'>+	&amp;clk_sclk_spi2,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void __init_or_cpufreq s5pc100_setup_clocks(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long xtal;</div><div class='hunk'>@@ -1266,6 +1305,24 @@ static struct clk *clks[] __initdata = {</div><div class='ctx'> 	&amp;clk_pcmcdclk1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk_lookup s5pc100_clk_lookup[] = {</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud2", &amp;clk_p),</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud3", &amp;clk_sclk_uart.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.0", &amp;clk_hsmmc0),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.0", &amp;clk_hsmmc1),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.0", &amp;clk_hsmmc2),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &amp;clk_sclk_mmc0.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &amp;clk_sclk_mmc1.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &amp;clk_sclk_mmc2.clk),</div><div class='add'>+	CLKDEV_INIT(NULL, "spi_busclk0", &amp;clk_p),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk1", &amp;clk_48m_spi0),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk2", &amp;clk_sclk_spi0.clk),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.1", "spi_busclk1", &amp;clk_48m_spi1),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.1", "spi_busclk2", &amp;clk_sclk_spi1.clk),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.2", "spi_busclk1", &amp;clk_48m_spi2),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.2", "spi_busclk2", &amp;clk_sclk_spi2.clk),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void __init s5pc100_register_clocks(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ptr;</div><div class='hunk'>@@ -1277,9 +1334,16 @@ void __init s5pc100_register_clocks(void)</div><div class='ctx'> </div><div class='ctx'> 	s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));</div><div class='ctx'> 	s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));</div><div class='add'>+	for (ptr = 0; ptr &lt; ARRAY_SIZE(clksrc_cdev); ptr++)</div><div class='add'>+		s3c_register_clksrc(clksrc_cdev[ptr], 1);</div><div class='ctx'> </div><div class='ctx'> 	s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));</div><div class='ctx'> 	s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));</div><div class='add'>+	clkdev_add_table(s5pc100_clk_lookup, ARRAY_SIZE(s5pc100_clk_lookup));</div><div class='add'>+</div><div class='add'>+	s3c24xx_register_clocks(clk_cdev, ARRAY_SIZE(clk_cdev));</div><div class='add'>+	for (ptr = 0; ptr &lt; ARRAY_SIZE(clk_cdev); ptr++)</div><div class='add'>+		s3c_disable_clocks(clk_cdev[ptr], 1);</div><div class='ctx'> </div><div class='ctx'> 	s3c24xx_register_clock(&amp;dummy_apb_pclk);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s5pc100/cpu.c b/arch/arm/mach-s5pc100/common.c<br/>index fd2708e7d8a9..c9095730a7f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/cpu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/cpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pc100/common.c</a></div><div class='hunk'>@@ -1,17 +1,16 @@</div><div class='del'>-/* linux/arch/arm/mach-s5pc100/cpu.c</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010 Samsung Electronics Co., Ltd.</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.</div><div class='ctx'>  *		http://www.samsung.com</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2009 Samsung Electronics Co.</div><div class='ctx'>  *	Byungho Min &lt;bhmin@samsung.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * Based on mach-s3c6410/cpu.c</div><div class='add'>+ * Common Codes for S5PC100</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 version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -21,40 +20,78 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</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'> </div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/proc-fns.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/proc-fns.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/regs-serial.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='del'>-#include &lt;plat/ata-core.h&gt;</div><div class='del'>-#include &lt;plat/iic-core.h&gt;</div><div class='ctx'> #include &lt;plat/sdhci.h&gt;</div><div class='ctx'> #include &lt;plat/adc-core.h&gt;</div><div class='del'>-#include &lt;plat/onenand-core.h&gt;</div><div class='add'>+#include &lt;plat/ata-core.h&gt;</div><div class='ctx'> #include &lt;plat/fb-core.h&gt;</div><div class='add'>+#include &lt;plat/iic-core.h&gt;</div><div class='add'>+#include &lt;plat/onenand-core.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='add'>+#include &lt;plat/watchdog-reset.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+static const char name_s5pc100[] = "S5PC100";</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/s5pc100.h&gt;</div><div class='add'>+static struct cpu_table cpu_ids[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.idcode		= S5PC100_CPU_ID,</div><div class='add'>+		.idmask		= S5PC100_CPU_MASK,</div><div class='add'>+		.map_io		= s5pc100_map_io,</div><div class='add'>+		.init_clocks	= s5pc100_init_clocks,</div><div class='add'>+		.init_uarts	= s5pc100_init_uarts,</div><div class='add'>+		.init		= s5pc100_init,</div><div class='add'>+		.name		= name_s5pc100,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* Initial IO mappings */</div><div class='ctx'> </div><div class='ctx'> static struct map_desc s5pc100_iodesc[] __initdata = {</div><div class='ctx'> 	{</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_CHIPID,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5PC100_PA_CHIPID),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_SYS,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5PC100_PA_SYSCON),</div><div class='add'>+		.length		= SZ_64K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_TIMER,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5PC100_PA_TIMER),</div><div class='add'>+		.length		= SZ_16K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_WATCHDOG,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5PC100_PA_WATCHDOG),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_SROMC,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5PC100_PA_SROMC),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='ctx'> 		.virtual	= (unsigned long)S5P_VA_SYSTIMER,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(S5PC100_PA_SYSTIMER),</div><div class='ctx'> 		.length		= SZ_16K,</div><div class='hunk'>@@ -100,15 +137,27 @@ static void s5pc100_idle(void)</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* s5pc100_map_io</div><div class='add'>+/*</div><div class='add'>+ * s5pc100_map_io</div><div class='ctx'>  *</div><div class='del'>- * register the standard cpu IO areas</div><div class='del'>-*/</div><div class='add'>+ * register the standard CPU IO areas</div><div class='add'>+ */</div><div class='ctx'> </div><div class='del'>-void __init s5pc100_map_io(void)</div><div class='add'>+void __init s5pc100_init_io(struct map_desc *mach_desc, int size)</div><div class='ctx'> {</div><div class='add'>+	/* initialize the io descriptors we need for initialization */</div><div class='ctx'> 	iotable_init(s5pc100_iodesc, ARRAY_SIZE(s5pc100_iodesc));</div><div class='add'>+	if (mach_desc)</div><div class='add'>+		iotable_init(mach_desc, size);</div><div class='add'>+</div><div class='add'>+	/* detect cpu id and rev. */</div><div class='add'>+	s5p_init_cpu(S5P_VA_CHIPID);</div><div class='ctx'> </div><div class='add'>+	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init s5pc100_map_io(void)</div><div class='add'>+{</div><div class='ctx'> 	/* initialise device information early */</div><div class='ctx'> 	s5pc100_default_sdhci0();</div><div class='ctx'> 	s5pc100_default_sdhci1();</div><div class='hunk'>@@ -143,19 +192,19 @@ void __init s5pc100_init_irq(void)</div><div class='ctx'> 	s5p_init_irq(vic, ARRAY_SIZE(vic));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class s5pc100_sysclass = {</div><div class='del'>-	.name	= "s5pc100-core",</div><div class='add'>+static struct bus_type s5pc100_subsys = {</div><div class='add'>+	.name		= "s5pc100-core",</div><div class='add'>+	.dev_name	= "s5pc100-core",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sys_device s5pc100_sysdev = {</div><div class='del'>-	.cls	= &amp;s5pc100_sysclass,</div><div class='add'>+static struct device s5pc100_dev = {</div><div class='add'>+	.bus	= &amp;s5pc100_subsys,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s5pc100_core_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_class_register(&amp;s5pc100_sysclass);</div><div class='add'>+	return subsys_system_register(&amp;s5pc100_subsys, NULL);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> core_initcall(s5pc100_core_init);</div><div class='ctx'> </div><div class='ctx'> int __init s5pc100_init(void)</div><div class='hunk'>@@ -165,5 +214,20 @@ int __init s5pc100_init(void)</div><div class='ctx'> 	/* set idle function */</div><div class='ctx'> 	pm_idle = s5pc100_idle;</div><div class='ctx'> </div><div class='del'>-	return sysdev_register(&amp;s5pc100_sysdev);</div><div class='add'>+	return device_register(&amp;s5pc100_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* uart registration process */</div><div class='add'>+</div><div class='add'>+void __init s5pc100_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='add'>+{</div><div class='add'>+	s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void s5pc100_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	if (mode != 's')</div><div class='add'>+		arch_wdt_reset();</div><div class='add'>+</div><div class='add'>+	soft_restart(0);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-s5pc100/common.h b/arch/arm/mach-s5pc100/common.h<br/>new file mode 100644<br/>index 000000000000..9fbd3ae2b401<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pc100/common.h</a></div><div class='hunk'>@@ -0,0 +1,37 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * Common Header for S5PC100 machines</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ARCH_ARM_MACH_S5PC100_COMMON_H</div><div class='add'>+#define __ARCH_ARM_MACH_S5PC100_COMMON_H</div><div class='add'>+</div><div class='add'>+void s5pc100_init_io(struct map_desc *mach_desc, int size);</div><div class='add'>+void s5pc100_init_irq(void);</div><div class='add'>+</div><div class='add'>+void s5pc100_register_clocks(void);</div><div class='add'>+void s5pc100_setup_clocks(void);</div><div class='add'>+</div><div class='add'>+void s5pc100_restart(char mode, const char *cmd);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_S5PC100</div><div class='add'>+</div><div class='add'>+extern  int s5pc100_init(void);</div><div class='add'>+extern void s5pc100_map_io(void);</div><div class='add'>+extern void s5pc100_init_clocks(int xtal);</div><div class='add'>+extern void s5pc100_init_uarts(struct s3c2410_uartcfg *cfg, int no);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define s5pc100_init_clocks NULL</div><div class='add'>+#define s5pc100_init_uarts NULL</div><div class='add'>+#define s5pc100_map_io NULL</div><div class='add'>+#define s5pc100_init NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __ARCH_ARM_MACH_S5PC100_COMMON_H */</div><div class='head'>diff --git a/arch/arm/mach-s5pc100/dev-spi.c b/arch/arm/mach-s5pc100/dev-spi.c<br/>deleted file mode 100644<br/>index e5d6c4dceb56..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/dev-spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/dev-spi.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,227 +0,0 @@</div><div class='del'>-/* linux/arch/arm/mach-s5pc100/dev-spi.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2010 Samsung Electronics Co. Ltd.</div><div class='del'>- *	Jaswinder Singh &lt;jassi.brar@samsung.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'>-</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/dma.h&gt;</div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='del'>-#include &lt;mach/spi-clocks.h&gt;</div><div class='del'>-#include &lt;mach/irqs.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/s3c64xx-spi.h&gt;</div><div class='del'>-#include &lt;plat/gpio-cfg.h&gt;</div><div class='del'>-#include &lt;plat/irqs.h&gt;</div><div class='del'>-</div><div class='del'>-static char *spi_src_clks[] = {</div><div class='del'>-	[S5PC100_SPI_SRCCLK_PCLK] = "pclk",</div><div class='del'>-	[S5PC100_SPI_SRCCLK_48M] = "spi_48m",</div><div class='del'>-	[S5PC100_SPI_SRCCLK_SPIBUS] = "spi_bus",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* SPI Controller platform_devices */</div><div class='del'>-</div><div class='del'>-/* Since we emulate multi-cs capability, we do not touch the CS.</div><div class='del'>- * The emulated CS is toggled by board specific mechanism, as it can</div><div class='del'>- * be either some immediate GPIO or some signal out of some other</div><div class='del'>- * chip in between ... or some yet another way.</div><div class='del'>- * We simply do not assume anything about CS.</div><div class='del'>- */</div><div class='del'>-static int s5pc100_spi_cfg_gpio(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	switch (pdev-&gt;id) {</div><div class='del'>-	case 0:</div><div class='del'>-		s3c_gpio_cfgall_range(S5PC100_GPB(0), 3,</div><div class='del'>-				      S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 1:</div><div class='del'>-		s3c_gpio_cfgall_range(S5PC100_GPB(4), 3,</div><div class='del'>-				      S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 2:</div><div class='del'>-		s3c_gpio_cfgpin(S5PC100_GPG3(0), S3C_GPIO_SFN(3));</div><div class='del'>-		s3c_gpio_setpull(S5PC100_GPG3(0), S3C_GPIO_PULL_UP);</div><div class='del'>-		s3c_gpio_cfgall_range(S5PC100_GPB(2), 2,</div><div class='del'>-				      S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Invalid SPI Controller number!");</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 struct resource s5pc100_spi0_resource[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start = S5PC100_PA_SPI0,</div><div class='del'>-		.end   = S5PC100_PA_SPI0 + 0x100 - 1,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start = DMACH_SPI0_TX,</div><div class='del'>-		.end   = DMACH_SPI0_TX,</div><div class='del'>-		.flags = IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.start = DMACH_SPI0_RX,</div><div class='del'>-		.end   = DMACH_SPI0_RX,</div><div class='del'>-		.flags = IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[3] = {</div><div class='del'>-		.start = IRQ_SPI0,</div><div class='del'>-		.end   = IRQ_SPI0,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct s3c64xx_spi_info s5pc100_spi0_pdata = {</div><div class='del'>-	.cfg_gpio = s5pc100_spi_cfg_gpio,</div><div class='del'>-	.fifo_lvl_mask = 0x7f,</div><div class='del'>-	.rx_lvl_offset = 13,</div><div class='del'>-	.high_speed = 1,</div><div class='del'>-	.tx_st_done = 21,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u64 spi_dmamask = DMA_BIT_MASK(32);</div><div class='del'>-</div><div class='del'>-struct platform_device s5pc100_device_spi0 = {</div><div class='del'>-	.name		  = "s3c64xx-spi",</div><div class='del'>-	.id		  = 0,</div><div class='del'>-	.num_resources	  = ARRAY_SIZE(s5pc100_spi0_resource),</div><div class='del'>-	.resource	  = s5pc100_spi0_resource,</div><div class='del'>-	.dev = {</div><div class='del'>-		.dma_mask		= &amp;spi_dmamask,</div><div class='del'>-		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-		.platform_data = &amp;s5pc100_spi0_pdata,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource s5pc100_spi1_resource[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start = S5PC100_PA_SPI1,</div><div class='del'>-		.end   = S5PC100_PA_SPI1 + 0x100 - 1,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start = DMACH_SPI1_TX,</div><div class='del'>-		.end   = DMACH_SPI1_TX,</div><div class='del'>-		.flags = IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.start = DMACH_SPI1_RX,</div><div class='del'>-		.end   = DMACH_SPI1_RX,</div><div class='del'>-		.flags = IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[3] = {</div><div class='del'>-		.start = IRQ_SPI1,</div><div class='del'>-		.end   = IRQ_SPI1,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct s3c64xx_spi_info s5pc100_spi1_pdata = {</div><div class='del'>-	.cfg_gpio = s5pc100_spi_cfg_gpio,</div><div class='del'>-	.fifo_lvl_mask = 0x7f,</div><div class='del'>-	.rx_lvl_offset = 13,</div><div class='del'>-	.high_speed = 1,</div><div class='del'>-	.tx_st_done = 21,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct platform_device s5pc100_device_spi1 = {</div><div class='del'>-	.name		  = "s3c64xx-spi",</div><div class='del'>-	.id		  = 1,</div><div class='del'>-	.num_resources	  = ARRAY_SIZE(s5pc100_spi1_resource),</div><div class='del'>-	.resource	  = s5pc100_spi1_resource,</div><div class='del'>-	.dev = {</div><div class='del'>-		.dma_mask		= &amp;spi_dmamask,</div><div class='del'>-		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-		.platform_data = &amp;s5pc100_spi1_pdata,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource s5pc100_spi2_resource[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start = S5PC100_PA_SPI2,</div><div class='del'>-		.end   = S5PC100_PA_SPI2 + 0x100 - 1,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start = DMACH_SPI2_TX,</div><div class='del'>-		.end   = DMACH_SPI2_TX,</div><div class='del'>-		.flags = IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.start = DMACH_SPI2_RX,</div><div class='del'>-		.end   = DMACH_SPI2_RX,</div><div class='del'>-		.flags = IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[3] = {</div><div class='del'>-		.start = IRQ_SPI2,</div><div class='del'>-		.end   = IRQ_SPI2,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct s3c64xx_spi_info s5pc100_spi2_pdata = {</div><div class='del'>-	.cfg_gpio = s5pc100_spi_cfg_gpio,</div><div class='del'>-	.fifo_lvl_mask = 0x7f,</div><div class='del'>-	.rx_lvl_offset = 13,</div><div class='del'>-	.high_speed = 1,</div><div class='del'>-	.tx_st_done = 21,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct platform_device s5pc100_device_spi2 = {</div><div class='del'>-	.name		  = "s3c64xx-spi",</div><div class='del'>-	.id		  = 2,</div><div class='del'>-	.num_resources	  = ARRAY_SIZE(s5pc100_spi2_resource),</div><div class='del'>-	.resource	  = s5pc100_spi2_resource,</div><div class='del'>-	.dev = {</div><div class='del'>-		.dma_mask		= &amp;spi_dmamask,</div><div class='del'>-		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-		.platform_data = &amp;s5pc100_spi2_pdata,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __init s5pc100_spi_set_info(int cntrlr, int src_clk_nr, int num_cs)</div><div class='del'>-{</div><div class='del'>-	struct s3c64xx_spi_info *pd;</div><div class='del'>-</div><div class='del'>-	/* Reject invalid configuration */</div><div class='del'>-	if (!num_cs || src_clk_nr &lt; 0</div><div class='del'>-			|| src_clk_nr &gt; S5PC100_SPI_SRCCLK_SPIBUS) {</div><div class='del'>-		printk(KERN_ERR "%s: Invalid SPI configuration\n", __func__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (cntrlr) {</div><div class='del'>-	case 0:</div><div class='del'>-		pd = &amp;s5pc100_spi0_pdata;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		pd = &amp;s5pc100_spi1_pdata;</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		pd = &amp;s5pc100_spi2_pdata;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "%s: Invalid SPI controller(%d)\n",</div><div class='del'>-							__func__, cntrlr);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pd-&gt;num_cs = num_cs;</div><div class='del'>-	pd-&gt;src_clk_nr = src_clk_nr;</div><div class='del'>-	pd-&gt;src_clk_name = spi_src_clks[src_clk_nr];</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-s5pc100/dma.c b/arch/arm/mach-s5pc100/dma.c<br/>index 065a087f5a8b..c841f4d313f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pc100/dma.c</a></div><div class='hunk'>@@ -35,100 +35,42 @@</div><div class='ctx'> </div><div class='ctx'> static u64 dma_dmamask = DMA_BIT_MASK(32);</div><div class='ctx'> </div><div class='del'>-struct dma_pl330_peri pdma0_peri[30] = {</div><div class='del'>-	{</div><div class='del'>-		.peri_id = (u8)DMACH_UART0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART2_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART2_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART3_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART3_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = DMACH_IRDA,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0S_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S2_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S2_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI2_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI2_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_AC97_MICIN,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_AC97_PCMIN,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_AC97_PCMOUT,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_EXTERNAL,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PWM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPDIF,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_HSI_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_HSI_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	},</div><div class='add'>+u8 pdma0_peri[] = {</div><div class='add'>+	DMACH_UART0_RX,</div><div class='add'>+	DMACH_UART0_TX,</div><div class='add'>+	DMACH_UART1_RX,</div><div class='add'>+	DMACH_UART1_TX,</div><div class='add'>+	DMACH_UART2_RX,</div><div class='add'>+	DMACH_UART2_TX,</div><div class='add'>+	DMACH_UART3_RX,</div><div class='add'>+	DMACH_UART3_TX,</div><div class='add'>+	DMACH_IRDA,</div><div class='add'>+	DMACH_I2S0_RX,</div><div class='add'>+	DMACH_I2S0_TX,</div><div class='add'>+	DMACH_I2S0S_TX,</div><div class='add'>+	DMACH_I2S1_RX,</div><div class='add'>+	DMACH_I2S1_TX,</div><div class='add'>+	DMACH_I2S2_RX,</div><div class='add'>+	DMACH_I2S2_TX,</div><div class='add'>+	DMACH_SPI0_RX,</div><div class='add'>+	DMACH_SPI0_TX,</div><div class='add'>+	DMACH_SPI1_RX,</div><div class='add'>+	DMACH_SPI1_TX,</div><div class='add'>+	DMACH_SPI2_RX,</div><div class='add'>+	DMACH_SPI2_TX,</div><div class='add'>+	DMACH_AC97_MICIN,</div><div class='add'>+	DMACH_AC97_PCMIN,</div><div class='add'>+	DMACH_AC97_PCMOUT,</div><div class='add'>+	DMACH_EXTERNAL,</div><div class='add'>+	DMACH_PWM,</div><div class='add'>+	DMACH_SPDIF,</div><div class='add'>+	DMACH_HSI_RX,</div><div class='add'>+	DMACH_HSI_TX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dma_pl330_platdata s5pc100_pdma0_pdata = {</div><div class='ctx'> 	.nr_valid_peri = ARRAY_SIZE(pdma0_peri),</div><div class='del'>-	.peri = pdma0_peri,</div><div class='add'>+	.peri_id = pdma0_peri,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct amba_device s5pc100_device_pdma0 = {</div><div class='hunk'>@@ -147,98 +89,42 @@ struct amba_device s5pc100_device_pdma0 = {</div><div class='ctx'> 	.periphid = 0x00041330,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dma_pl330_peri pdma1_peri[30] = {</div><div class='del'>-	{</div><div class='del'>-		.peri_id = (u8)DMACH_UART0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART2_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART2_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART3_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART3_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = DMACH_IRDA,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0S_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S2_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S2_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI2_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI2_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MSM_REQ0,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MSM_REQ1,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MSM_REQ2,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MSM_REQ3,</div><div class='del'>-	},</div><div class='add'>+u8 pdma1_peri[] = {</div><div class='add'>+	DMACH_UART0_RX,</div><div class='add'>+	DMACH_UART0_TX,</div><div class='add'>+	DMACH_UART1_RX,</div><div class='add'>+	DMACH_UART1_TX,</div><div class='add'>+	DMACH_UART2_RX,</div><div class='add'>+	DMACH_UART2_TX,</div><div class='add'>+	DMACH_UART3_RX,</div><div class='add'>+	DMACH_UART3_TX,</div><div class='add'>+	DMACH_IRDA,</div><div class='add'>+	DMACH_I2S0_RX,</div><div class='add'>+	DMACH_I2S0_TX,</div><div class='add'>+	DMACH_I2S0S_TX,</div><div class='add'>+	DMACH_I2S1_RX,</div><div class='add'>+	DMACH_I2S1_TX,</div><div class='add'>+	DMACH_I2S2_RX,</div><div class='add'>+	DMACH_I2S2_TX,</div><div class='add'>+	DMACH_SPI0_RX,</div><div class='add'>+	DMACH_SPI0_TX,</div><div class='add'>+	DMACH_SPI1_RX,</div><div class='add'>+	DMACH_SPI1_TX,</div><div class='add'>+	DMACH_SPI2_RX,</div><div class='add'>+	DMACH_SPI2_TX,</div><div class='add'>+	DMACH_PCM0_RX,</div><div class='add'>+	DMACH_PCM0_TX,</div><div class='add'>+	DMACH_PCM1_RX,</div><div class='add'>+	DMACH_PCM1_TX,</div><div class='add'>+	DMACH_MSM_REQ0,</div><div class='add'>+	DMACH_MSM_REQ1,</div><div class='add'>+	DMACH_MSM_REQ2,</div><div class='add'>+	DMACH_MSM_REQ3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dma_pl330_platdata s5pc100_pdma1_pdata = {</div><div class='ctx'> 	.nr_valid_peri = ARRAY_SIZE(pdma1_peri),</div><div class='del'>-	.peri = pdma1_peri,</div><div class='add'>+	.peri_id = pdma1_peri,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct amba_device s5pc100_device_pdma1 = {</div><div class='hunk'>@@ -259,7 +145,12 @@ struct amba_device s5pc100_device_pdma1 = {</div><div class='ctx'> </div><div class='ctx'> static int __init s5pc100_dma_init(void)</div><div class='ctx'> {</div><div class='add'>+	dma_cap_set(DMA_SLAVE, s5pc100_pdma0_pdata.cap_mask);</div><div class='add'>+	dma_cap_set(DMA_CYCLIC, s5pc100_pdma0_pdata.cap_mask);</div><div class='ctx'> 	amba_device_register(&amp;s5pc100_device_pdma0, &amp;iomem_resource);</div><div class='add'>+</div><div class='add'>+	dma_cap_set(DMA_SLAVE, s5pc100_pdma1_pdata.cap_mask);</div><div class='add'>+	dma_cap_set(DMA_CYCLIC, s5pc100_pdma1_pdata.cap_mask);</div><div class='ctx'> 	amba_device_register(&amp;s5pc100_device_pdma1, &amp;iomem_resource);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/arm/mach-s5pc100/include/mach/entry-macro.S b/arch/arm/mach-s5pc100/include/mach/entry-macro.S<br/>index ba76af052c81..b8c242edfa22 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pc100/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -12,39 +12,14 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware/vic.h&gt;</div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='del'>-#include &lt;plat/irqs.h&gt;</div><div class='del'>-</div><div class='ctx'> 	.macro	disable_fiq</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro	get_irqnr_preamble, base, tmp</div><div class='del'>-	ldr	\base, =VA_VIC0</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro	arch_ret_to_user, tmp1, tmp2</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-</div><div class='del'>-	@ check the vic0</div><div class='del'>-	mov	\irqnr, # S5P_IRQ_OFFSET + 31</div><div class='del'>-	ldr	\irqstat, [ \base, # VIC_IRQ_STATUS ]</div><div class='del'>-	teq	\irqstat, #0</div><div class='del'>-</div><div class='del'>-	@ otherwise try vic1</div><div class='del'>-	addeq	\tmp, \base, #(VA_VIC1 - VA_VIC0)</div><div class='del'>-	addeq	\irqnr, \irqnr, #32</div><div class='del'>-	ldreq	\irqstat, [ \tmp, # VIC_IRQ_STATUS ]</div><div class='del'>-	teqeq	\irqstat, #0</div><div class='del'>-</div><div class='del'>-	@ otherwise try vic2</div><div class='del'>-	addeq	\tmp, \base, #(VA_VIC2 - VA_VIC0)</div><div class='del'>-	addeq	\irqnr, \irqnr, #32</div><div class='del'>-	ldreq	\irqstat, [ \tmp, # VIC_IRQ_STATUS ]</div><div class='del'>-	teqeq	\irqstat, #0</div><div class='del'>-</div><div class='del'>-	clzne	\irqstat, \irqstat</div><div class='del'>-	subne	\irqnr, \irqnr, \irqstat</div><div class='ctx'> 	.endm</div><div class='head'>diff --git a/arch/arm/mach-s5pc100/include/mach/irqs.h b/arch/arm/mach-s5pc100/include/mach/irqs.h<br/>index d2eb4757381f..2870f12c7926 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/include/mach/irqs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/include/mach/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pc100/include/mach/irqs.h</a></div><div class='hunk'>@@ -97,6 +97,8 @@</div><div class='ctx'> #define IRQ_SDMFIQ		S5P_IRQ_VIC2(31)</div><div class='ctx'> #define IRQ_VIC_END		S5P_IRQ_VIC2(31)</div><div class='ctx'> </div><div class='add'>+#define IRQ_TIMER_BASE		(11)</div><div class='add'>+</div><div class='ctx'> #define S5P_EINT_BASE1		(S5P_IRQ_VIC0(0))</div><div class='ctx'> #define S5P_EINT_BASE2		(IRQ_VIC_END + 1)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h<br/>index ccbe6b767f7d..54bc4f82e17a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/include/mach/map.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/include/mach/map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/include/mach/map.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pc100/include/mach/map.h</a></div><div class='hunk'>@@ -100,6 +100,9 @@</div><div class='ctx'> #define S3C_PA_USB_HSOTG		S5PC100_PA_USB_HSOTG</div><div class='ctx'> #define S3C_PA_USB_HSPHY		S5PC100_PA_USB_HSPHY</div><div class='ctx'> #define S3C_PA_WDT			S5PC100_PA_WATCHDOG</div><div class='add'>+#define S3C_PA_SPI0			S5PC100_PA_SPI0</div><div class='add'>+#define S3C_PA_SPI1			S5PC100_PA_SPI1</div><div class='add'>+#define S3C_PA_SPI2			S5PC100_PA_SPI2</div><div class='ctx'> </div><div class='ctx'> #define S5P_PA_CHIPID			S5PC100_PA_CHIPID</div><div class='ctx'> #define S5P_PA_FIMC0			S5PC100_PA_FIMC0</div><div class='head'>diff --git a/arch/arm/mach-s5pc100/include/mach/system.h b/arch/arm/mach-s5pc100/include/mach/system.h<br/>index a9ea57c06600..afc96c298518 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pc100/include/mach/system.h</a></div><div class='hunk'>@@ -11,8 +11,6 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H __FILE__</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/system-reset.h&gt;</div><div class='del'>-</div><div class='ctx'> static void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* nothing here yet */</div><div class='head'>diff --git a/arch/arm/mach-s5pc100/include/mach/vmalloc.h b/arch/arm/mach-s5pc100/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 44c8e5726d9d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,17 +0,0 @@</div><div class='del'>-/* arch/arm/mach-s5pc100/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * Copyright 2010 Ben Dooks &lt;ben-linux@fluff.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='del'>- * S3C6400 vmalloc definition</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#ifndef __ASM_ARCH_VMALLOC_H</div><div class='del'>-#define __ASM_ARCH_VMALLOC_H</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END	0xF6000000UL</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_ARCH_VMALLOC_H */</div><div class='head'>diff --git a/arch/arm/mach-s5pc100/init.c b/arch/arm/mach-s5pc100/init.c<br/>deleted file mode 100644<br/>index 19d7b523c137..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/init.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-/* linux/arch/arm/plat-s5pc100/s5pc100-init.c</div><div class='del'>- *</div><div class='del'>- * Copyright 2009 Samsung Electronics Co.</div><div class='del'>- *      Byungho Min &lt;bhmin@samsung.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 version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/cpu.h&gt;</div><div class='del'>-#include &lt;plat/devs.h&gt;</div><div class='del'>-#include &lt;plat/s5pc100.h&gt;</div><div class='del'>-</div><div class='del'>-/* uart registration process */</div><div class='del'>-void __init s5pc100_common_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='del'>-{</div><div class='del'>-	s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c<br/>index 26f5c91c9427..674d22992f3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/mach-smdkc100.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/mach-smdkc100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/mach-smdkc100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pc100/mach-smdkc100.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/pwm_backlight.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -42,7 +43,6 @@</div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='del'>-#include &lt;plat/s5pc100.h&gt;</div><div class='ctx'> #include &lt;plat/fb.h&gt;</div><div class='ctx'> #include &lt;plat/iic.h&gt;</div><div class='ctx'> #include &lt;plat/ata.h&gt;</div><div class='hunk'>@@ -53,6 +53,8 @@</div><div class='ctx'> #include &lt;plat/backlight.h&gt;</div><div class='ctx'> #include &lt;plat/regs-fb-v4.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> /* Following are default values for UCON, ULCON and UFCON UART registers */</div><div class='ctx'> #define SMDKC100_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\</div><div class='ctx'> 				 S3C2410_UCON_RXILEVEL |	\</div><div class='hunk'>@@ -215,7 +217,7 @@ static struct platform_pwm_backlight_data smdkc100_bl_data = {</div><div class='ctx'> </div><div class='ctx'> static void __init smdkc100_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	s5p_init_io(NULL, 0, S5P_VA_CHIPID);</div><div class='add'>+	s5pc100_init_io(NULL, 0);</div><div class='ctx'> 	s3c24xx_init_clocks(12000000);</div><div class='ctx'> 	s3c24xx_init_uarts(smdkc100_uartcfgs, ARRAY_SIZE(smdkc100_uartcfgs));</div><div class='ctx'> }</div><div class='hunk'>@@ -250,7 +252,9 @@ MACHINE_START(SMDKC100, "SMDKC100")</div><div class='ctx'> 	/* Maintainer: Byungho Min &lt;bhmin@samsung.com&gt; */</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= s5pc100_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.map_io		= smdkc100_map_io,</div><div class='ctx'> 	.init_machine	= smdkc100_machine_init,</div><div class='ctx'> 	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+	.restart	= s5pc100_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s5pc100/setup-sdhci.c b/arch/arm/mach-s5pc100/setup-sdhci.c<br/>deleted file mode 100644<br/>index 6418c6e8a7b7..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/setup-sdhci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pc100/setup-sdhci.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,23 +0,0 @@</div><div class='del'>-/* linux/arch/arm/mach-s5pc100/setup-sdhci.c</div><div class='del'>- *</div><div class='del'>- * Copyright 2008 Samsung Electronics</div><div class='del'>- *</div><div class='del'>- * S5PC100 - Helper functions for settign up SDHCI device(s) (HSMMC)</div><div class='del'>- *</div><div class='del'>- * Based on mach-s3c6410/setup-sdhci.c</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-/* clock sources for the mmc bus clock, order as for the ctrl2[5..4] */</div><div class='del'>-</div><div class='del'>-char *s5pc100_hsmmc_clksrcs[4] = {</div><div class='del'>-	[0] = "hsmmc",		/* HCLK */</div><div class='del'>-	/* [1] = "hsmmc",	- duplicate HCLK entry */</div><div class='del'>-	[2] = "sclk_mmc",	/* mmc_bus */</div><div class='del'>-	/* [3] = "48m",		- note not successfully used yet */</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/mach-s5pc100/setup-spi.c b/arch/arm/mach-s5pc100/setup-spi.c<br/>new file mode 100644<br/>index 000000000000..431a6f747caa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pc100/setup-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pc100/setup-spi.c</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+/* linux/arch/arm/mach-s5pc100/setup-spi.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Samsung Electronics Ltd.</div><div class='add'>+ *		http://www.samsung.com/</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;plat/gpio-cfg.h&gt;</div><div class='add'>+#include &lt;plat/s3c64xx-spi.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_S3C64XX_DEV_SPI0</div><div class='add'>+struct s3c64xx_spi_info s3c64xx_spi0_pdata __initdata = {</div><div class='add'>+	.fifo_lvl_mask	= 0x7f,</div><div class='add'>+	.rx_lvl_offset	= 13,</div><div class='add'>+	.high_speed	= 1,</div><div class='add'>+	.tx_st_done	= 21,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int s3c64xx_spi0_cfg_gpio(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	s3c_gpio_cfgall_range(S5PC100_GPB(0), 3,</div><div class='add'>+				S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_S3C64XX_DEV_SPI1</div><div class='add'>+struct s3c64xx_spi_info s3c64xx_spi1_pdata __initdata = {</div><div class='add'>+	.fifo_lvl_mask	= 0x7f,</div><div class='add'>+	.rx_lvl_offset	= 13,</div><div class='add'>+	.high_speed	= 1,</div><div class='add'>+	.tx_st_done	= 21,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int s3c64xx_spi1_cfg_gpio(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	s3c_gpio_cfgall_range(S5PC100_GPB(4), 3,</div><div class='add'>+				S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_S3C64XX_DEV_SPI2</div><div class='add'>+struct s3c64xx_spi_info s3c64xx_spi2_pdata __initdata = {</div><div class='add'>+	.fifo_lvl_mask	= 0x7f,</div><div class='add'>+	.rx_lvl_offset	= 13,</div><div class='add'>+	.high_speed	= 1,</div><div class='add'>+	.tx_st_done	= 21,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int s3c64xx_spi2_cfg_gpio(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	s3c_gpio_cfgpin(S5PC100_GPG3(0), S3C_GPIO_SFN(3));</div><div class='add'>+	s3c_gpio_setpull(S5PC100_GPG3(0), S3C_GPIO_PULL_UP);</div><div class='add'>+	s3c_gpio_cfgall_range(S5PC100_GPB(2), 2,</div><div class='add'>+				S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig<br/>index 646057ab2e4c..2cdc42e838b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pv210/Kconfig</a></div><div class='hunk'>@@ -60,6 +60,11 @@ config S5PV210_SETUP_FIMC</div><div class='ctx'> 	help</div><div class='ctx'> 	  Common setup code for the camera interfaces.</div><div class='ctx'> </div><div class='add'>+config S5PV210_SETUP_SPI</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  Common setup code for SPI GPIO configurations.</div><div class='add'>+</div><div class='ctx'> menu "S5PC110 Machines"</div><div class='ctx'> </div><div class='ctx'> config MACH_AQUILA</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile<br/>index 009fbe53df96..76a121dd52b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pv210/Makefile</a></div><div class='hunk'>@@ -10,30 +10,32 @@ obj-m				:=</div><div class='ctx'> obj-n				:=</div><div class='ctx'> obj-				:=</div><div class='ctx'> </div><div class='del'>-# Core support for S5PV210 system</div><div class='add'>+# Core</div><div class='add'>+</div><div class='add'>+obj-y				+= common.o clock.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_CPU_S5PV210)	+= cpu.o init.o clock.o dma.o</div><div class='del'>-obj-$(CONFIG_CPU_S5PV210)	+= setup-i2c0.o</div><div class='ctx'> obj-$(CONFIG_PM)		+= pm.o</div><div class='ctx'> </div><div class='add'>+obj-y				+= dma.o</div><div class='add'>+</div><div class='ctx'> # machine support</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MACH_AQUILA)	+= mach-aquila.o</div><div class='del'>-obj-$(CONFIG_MACH_SMDKV210)	+= mach-smdkv210.o</div><div class='del'>-obj-$(CONFIG_MACH_SMDKC110)	+= mach-smdkc110.o</div><div class='ctx'> obj-$(CONFIG_MACH_GONI)		+= mach-goni.o</div><div class='add'>+obj-$(CONFIG_MACH_SMDKC110)	+= mach-smdkc110.o</div><div class='add'>+obj-$(CONFIG_MACH_SMDKV210)	+= mach-smdkv210.o</div><div class='ctx'> obj-$(CONFIG_MACH_TORBRECK)	+= mach-torbreck.o</div><div class='ctx'> </div><div class='ctx'> # device support</div><div class='ctx'> </div><div class='ctx'> obj-y				+= dev-audio.o</div><div class='del'>-obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o</div><div class='ctx'> </div><div class='add'>+obj-y					+= setup-i2c0.o</div><div class='ctx'> obj-$(CONFIG_S5PV210_SETUP_FB_24BPP)	+= setup-fb-24bpp.o</div><div class='ctx'> obj-$(CONFIG_S5PV210_SETUP_FIMC)	+= setup-fimc.o</div><div class='del'>-obj-$(CONFIG_S5PV210_SETUP_I2C1) 	+= setup-i2c1.o</div><div class='del'>-obj-$(CONFIG_S5PV210_SETUP_I2C2) 	+= setup-i2c2.o</div><div class='add'>+obj-$(CONFIG_S5PV210_SETUP_I2C1)	+= setup-i2c1.o</div><div class='add'>+obj-$(CONFIG_S5PV210_SETUP_I2C2)	+= setup-i2c2.o</div><div class='ctx'> obj-$(CONFIG_S5PV210_SETUP_IDE)		+= setup-ide.o</div><div class='ctx'> obj-$(CONFIG_S5PV210_SETUP_KEYPAD)	+= setup-keypad.o</div><div class='del'>-obj-$(CONFIG_S5PV210_SETUP_SDHCI)       += setup-sdhci.o</div><div class='ctx'> obj-$(CONFIG_S5PV210_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o</div><div class='add'>+obj-$(CONFIG_S5PV210_SETUP_SPI)		+= setup-spi.o</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c<br/>index 4c5ac7a69e9e..c78dfddd77fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pv210/clock.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='hunk'>@@ -29,7 +29,8 @@</div><div class='ctx'> #include &lt;plat/pll.h&gt;</div><div class='ctx'> #include &lt;plat/s5p-clock.h&gt;</div><div class='ctx'> #include &lt;plat/clock-clksrc.h&gt;</div><div class='del'>-#include &lt;plat/s5pv210.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='ctx'> </div><div class='ctx'> static unsigned long xtal;</div><div class='ctx'> </div><div class='hunk'>@@ -399,30 +400,6 @@ static struct clk init_clocks_off[] = {</div><div class='ctx'> 		.enable		= s5pv210_clk_ip1_ctrl,</div><div class='ctx'> 		.ctrlbit	= (1&lt;&lt;25),</div><div class='ctx'> 	}, {</div><div class='del'>-		.name		= "hsmmc",</div><div class='del'>-		.devname	= "s3c-sdhci.0",</div><div class='del'>-		.parent		= &amp;clk_hclk_psys.clk,</div><div class='del'>-		.enable		= s5pv210_clk_ip2_ctrl,</div><div class='del'>-		.ctrlbit	= (1&lt;&lt;16),</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "hsmmc",</div><div class='del'>-		.devname	= "s3c-sdhci.1",</div><div class='del'>-		.parent		= &amp;clk_hclk_psys.clk,</div><div class='del'>-		.enable		= s5pv210_clk_ip2_ctrl,</div><div class='del'>-		.ctrlbit	= (1&lt;&lt;17),</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "hsmmc",</div><div class='del'>-		.devname	= "s3c-sdhci.2",</div><div class='del'>-		.parent		= &amp;clk_hclk_psys.clk,</div><div class='del'>-		.enable		= s5pv210_clk_ip2_ctrl,</div><div class='del'>-		.ctrlbit	= (1&lt;&lt;18),</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "hsmmc",</div><div class='del'>-		.devname	= "s3c-sdhci.3",</div><div class='del'>-		.parent		= &amp;clk_hclk_psys.clk,</div><div class='del'>-		.enable		= s5pv210_clk_ip2_ctrl,</div><div class='del'>-		.ctrlbit	= (1&lt;&lt;19),</div><div class='del'>-	}, {</div><div class='ctx'> 		.name		= "systimer",</div><div class='ctx'> 		.parent		= &amp;clk_pclk_psys.clk,</div><div class='ctx'> 		.enable		= s5pv210_clk_ip3_ctrl,</div><div class='hunk'>@@ -559,6 +536,38 @@ static struct clk init_clocks[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk clk_hsmmc0 = {</div><div class='add'>+	.name		= "hsmmc",</div><div class='add'>+	.devname	= "s3c-sdhci.0",</div><div class='add'>+	.parent		= &amp;clk_hclk_psys.clk,</div><div class='add'>+	.enable		= s5pv210_clk_ip2_ctrl,</div><div class='add'>+	.ctrlbit	= (1&lt;&lt;16),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk clk_hsmmc1 = {</div><div class='add'>+	.name		= "hsmmc",</div><div class='add'>+	.devname	= "s3c-sdhci.1",</div><div class='add'>+	.parent		= &amp;clk_hclk_psys.clk,</div><div class='add'>+	.enable		= s5pv210_clk_ip2_ctrl,</div><div class='add'>+	.ctrlbit	= (1&lt;&lt;17),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk clk_hsmmc2 = {</div><div class='add'>+	.name		= "hsmmc",</div><div class='add'>+	.devname	= "s3c-sdhci.2",</div><div class='add'>+	.parent		= &amp;clk_hclk_psys.clk,</div><div class='add'>+	.enable		= s5pv210_clk_ip2_ctrl,</div><div class='add'>+	.ctrlbit	= (1&lt;&lt;18),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk clk_hsmmc3 = {</div><div class='add'>+	.name		= "hsmmc",</div><div class='add'>+	.devname	= "s3c-sdhci.3",</div><div class='add'>+	.parent		= &amp;clk_hclk_psys.clk,</div><div class='add'>+	.enable		= s5pv210_clk_ip2_ctrl,</div><div class='add'>+	.ctrlbit	= (1&lt;&lt;19),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk *clkset_uart_list[] = {</div><div class='ctx'> 	[6] = &amp;clk_mout_mpll.clk,</div><div class='ctx'> 	[7] = &amp;clk_mout_epll.clk,</div><div class='hunk'>@@ -809,46 +818,6 @@ static struct clksrc_clk clksrcs[] = {</div><div class='ctx'> 		.reg_div = { .reg = S5P_CLK_DIV6, .shift = 12, .size = 3 },</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.clk	= {</div><div class='del'>-			.name		= "uclk1",</div><div class='del'>-			.devname	= "s5pv210-uart.0",</div><div class='del'>-			.enable		= s5pv210_clk_mask0_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 12),</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_uart,</div><div class='del'>-		.reg_src = { .reg = S5P_CLK_SRC4, .shift = 16, .size = 4 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLK_DIV4, .shift = 16, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='del'>-			.name		= "uclk1",</div><div class='del'>-			.devname	= "s5pv210-uart.1",</div><div class='del'>-			.enable		= s5pv210_clk_mask0_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 13),</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_uart,</div><div class='del'>-		.reg_src = { .reg = S5P_CLK_SRC4, .shift = 20, .size = 4 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLK_DIV4, .shift = 20, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='del'>-			.name		= "uclk1",</div><div class='del'>-			.devname	= "s5pv210-uart.2",</div><div class='del'>-			.enable		= s5pv210_clk_mask0_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 14),</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_uart,</div><div class='del'>-		.reg_src = { .reg = S5P_CLK_SRC4, .shift = 24, .size = 4 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLK_DIV4, .shift = 24, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='del'>-			.name		= "uclk1",</div><div class='del'>-			.devname	= "s5pv210-uart.3",</div><div class='del'>-			.enable		= s5pv210_clk_mask0_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 15),</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_uart,</div><div class='del'>-		.reg_src = { .reg = S5P_CLK_SRC4, .shift = 28, .size = 4 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLK_DIV4, .shift = 28, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk	= {</div><div class='ctx'> 			.name		= "sclk_fimc",</div><div class='ctx'> 			.devname	= "s5pv210-fimc.0",</div><div class='ctx'> 			.enable		= s5pv210_clk_mask1_ctrl,</div><div class='hunk'>@@ -906,46 +875,6 @@ static struct clksrc_clk clksrcs[] = {</div><div class='ctx'> 		.reg_div = { .reg = S5P_CLK_DIV1, .shift = 20, .size = 4 },</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.clk		= {</div><div class='del'>-			.name		= "sclk_mmc",</div><div class='del'>-			.devname	= "s3c-sdhci.0",</div><div class='del'>-			.enable		= s5pv210_clk_mask0_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 8),</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group2,</div><div class='del'>-		.reg_src = { .reg = S5P_CLK_SRC4, .shift = 0, .size = 4 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLK_DIV4, .shift = 0, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='del'>-			.name		= "sclk_mmc",</div><div class='del'>-			.devname	= "s3c-sdhci.1",</div><div class='del'>-			.enable		= s5pv210_clk_mask0_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 9),</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group2,</div><div class='del'>-		.reg_src = { .reg = S5P_CLK_SRC4, .shift = 4, .size = 4 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLK_DIV4, .shift = 4, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='del'>-			.name		= "sclk_mmc",</div><div class='del'>-			.devname	= "s3c-sdhci.2",</div><div class='del'>-			.enable		= s5pv210_clk_mask0_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 10),</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group2,</div><div class='del'>-		.reg_src = { .reg = S5P_CLK_SRC4, .shift = 8, .size = 4 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLK_DIV4, .shift = 8, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='del'>-			.name		= "sclk_mmc",</div><div class='del'>-			.devname	= "s3c-sdhci.3",</div><div class='del'>-			.enable		= s5pv210_clk_mask0_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 11),</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group2,</div><div class='del'>-		.reg_src = { .reg = S5P_CLK_SRC4, .shift = 12, .size = 4 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLK_DIV4, .shift = 12, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='ctx'> 			.name		= "sclk_mfc",</div><div class='ctx'> 			.devname	= "s5p-mfc",</div><div class='ctx'> 			.enable		= s5pv210_clk_ip0_ctrl,</div><div class='hunk'>@@ -983,26 +912,6 @@ static struct clksrc_clk clksrcs[] = {</div><div class='ctx'> 		.reg_div = { .reg = S5P_CLK_DIV1, .shift = 28, .size = 4 },</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.clk		= {</div><div class='del'>-			.name		= "sclk_spi",</div><div class='del'>-			.devname	= "s3c64xx-spi.0",</div><div class='del'>-			.enable		= s5pv210_clk_mask0_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 16),</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group2,</div><div class='del'>-		.reg_src = { .reg = S5P_CLK_SRC5, .shift = 0, .size = 4 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLK_DIV5, .shift = 0, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='del'>-			.name		= "sclk_spi",</div><div class='del'>-			.devname	= "s3c64xx-spi.1",</div><div class='del'>-			.enable		= s5pv210_clk_mask0_ctrl,</div><div class='del'>-			.ctrlbit	= (1 &lt;&lt; 17),</div><div class='del'>-		},</div><div class='del'>-		.sources = &amp;clkset_group2,</div><div class='del'>-		.reg_src = { .reg = S5P_CLK_SRC5, .shift = 4, .size = 4 },</div><div class='del'>-		.reg_div = { .reg = S5P_CLK_DIV5, .shift = 4, .size = 4 },</div><div class='del'>-	}, {</div><div class='del'>-		.clk		= {</div><div class='ctx'> 			.name		= "sclk_pwi",</div><div class='ctx'> 			.enable		= s5pv210_clk_mask0_ctrl,</div><div class='ctx'> 			.ctrlbit	= (1 &lt;&lt; 29),</div><div class='hunk'>@@ -1022,6 +931,147 @@ static struct clksrc_clk clksrcs[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clksrc_clk clk_sclk_uart0 = {</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "uclk1",</div><div class='add'>+		.devname	= "s5pv210-uart.0",</div><div class='add'>+		.enable		= s5pv210_clk_mask0_ctrl,</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 12),</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_uart,</div><div class='add'>+	.reg_src = { .reg = S5P_CLK_SRC4, .shift = 16, .size = 4 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLK_DIV4, .shift = 16, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_uart1 = {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "uclk1",</div><div class='add'>+		.devname	= "s5pv210-uart.1",</div><div class='add'>+		.enable		= s5pv210_clk_mask0_ctrl,</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 13),</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_uart,</div><div class='add'>+	.reg_src = { .reg = S5P_CLK_SRC4, .shift = 20, .size = 4 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLK_DIV4, .shift = 20, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_uart2 = {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "uclk1",</div><div class='add'>+		.devname	= "s5pv210-uart.2",</div><div class='add'>+		.enable		= s5pv210_clk_mask0_ctrl,</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 14),</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_uart,</div><div class='add'>+	.reg_src = { .reg = S5P_CLK_SRC4, .shift = 24, .size = 4 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLK_DIV4, .shift = 24, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_uart3	= {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "uclk1",</div><div class='add'>+		.devname	= "s5pv210-uart.3",</div><div class='add'>+		.enable		= s5pv210_clk_mask0_ctrl,</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 15),</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_uart,</div><div class='add'>+	.reg_src = { .reg = S5P_CLK_SRC4, .shift = 28, .size = 4 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLK_DIV4, .shift = 28, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_mmc0 = {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "sclk_mmc",</div><div class='add'>+		.devname	= "s3c-sdhci.0",</div><div class='add'>+		.enable		= s5pv210_clk_mask0_ctrl,</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 8),</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group2,</div><div class='add'>+	.reg_src = { .reg = S5P_CLK_SRC4, .shift = 0, .size = 4 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLK_DIV4, .shift = 0, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_mmc1 = {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "sclk_mmc",</div><div class='add'>+		.devname	= "s3c-sdhci.1",</div><div class='add'>+		.enable		= s5pv210_clk_mask0_ctrl,</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 9),</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group2,</div><div class='add'>+	.reg_src = { .reg = S5P_CLK_SRC4, .shift = 4, .size = 4 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLK_DIV4, .shift = 4, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_mmc2 = {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "sclk_mmc",</div><div class='add'>+		.devname	= "s3c-sdhci.2",</div><div class='add'>+		.enable		= s5pv210_clk_mask0_ctrl,</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 10),</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group2,</div><div class='add'>+	.reg_src = { .reg = S5P_CLK_SRC4, .shift = 8, .size = 4 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLK_DIV4, .shift = 8, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_mmc3 = {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "sclk_mmc",</div><div class='add'>+		.devname	= "s3c-sdhci.3",</div><div class='add'>+		.enable		= s5pv210_clk_mask0_ctrl,</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 11),</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group2,</div><div class='add'>+	.reg_src = { .reg = S5P_CLK_SRC4, .shift = 12, .size = 4 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLK_DIV4, .shift = 12, .size = 4 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_spi0 = {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "sclk_spi",</div><div class='add'>+		.devname	= "s3c64xx-spi.0",</div><div class='add'>+		.enable		= s5pv210_clk_mask0_ctrl,</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 16),</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group2,</div><div class='add'>+	.reg_src = { .reg = S5P_CLK_SRC5, .shift = 0, .size = 4 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLK_DIV5, .shift = 0, .size = 4 },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk clk_sclk_spi1 = {</div><div class='add'>+	.clk		= {</div><div class='add'>+		.name		= "sclk_spi",</div><div class='add'>+		.devname	= "s3c64xx-spi.1",</div><div class='add'>+		.enable		= s5pv210_clk_mask0_ctrl,</div><div class='add'>+		.ctrlbit	= (1 &lt;&lt; 17),</div><div class='add'>+	},</div><div class='add'>+	.sources = &amp;clkset_group2,</div><div class='add'>+	.reg_src = { .reg = S5P_CLK_SRC5, .shift = 4, .size = 4 },</div><div class='add'>+	.reg_div = { .reg = S5P_CLK_DIV5, .shift = 4, .size = 4 },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct clksrc_clk *clksrc_cdev[] = {</div><div class='add'>+	&amp;clk_sclk_uart0,</div><div class='add'>+	&amp;clk_sclk_uart1,</div><div class='add'>+	&amp;clk_sclk_uart2,</div><div class='add'>+	&amp;clk_sclk_uart3,</div><div class='add'>+	&amp;clk_sclk_mmc0,</div><div class='add'>+	&amp;clk_sclk_mmc1,</div><div class='add'>+	&amp;clk_sclk_mmc2,</div><div class='add'>+	&amp;clk_sclk_mmc3,</div><div class='add'>+	&amp;clk_sclk_spi0,</div><div class='add'>+	&amp;clk_sclk_spi1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk *clk_cdev[] = {</div><div class='add'>+	&amp;clk_hsmmc0,</div><div class='add'>+	&amp;clk_hsmmc1,</div><div class='add'>+	&amp;clk_hsmmc2,</div><div class='add'>+	&amp;clk_hsmmc3,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Clock initialisation code */</div><div class='ctx'> static struct clksrc_clk *sysclks[] = {</div><div class='ctx'> 	&amp;clk_mout_apll,</div><div class='hunk'>@@ -1261,6 +1311,25 @@ static struct clk *clks[] __initdata = {</div><div class='ctx'> 	&amp;clk_pcmcdclk2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk_lookup s5pv210_clk_lookup[] = {</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud0", &amp;clk_p),</div><div class='add'>+	CLKDEV_INIT("s5pv210-uart.0", "clk_uart_baud1", &amp;clk_sclk_uart0.clk),</div><div class='add'>+	CLKDEV_INIT("s5pv210-uart.1", "clk_uart_baud1", &amp;clk_sclk_uart1.clk),</div><div class='add'>+	CLKDEV_INIT("s5pv210-uart.2", "clk_uart_baud1", &amp;clk_sclk_uart2.clk),</div><div class='add'>+	CLKDEV_INIT("s5pv210-uart.3", "clk_uart_baud1", &amp;clk_sclk_uart3.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.0", &amp;clk_hsmmc0),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.0", &amp;clk_hsmmc1),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.0", &amp;clk_hsmmc2),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.3", "mmc_busclk.0", &amp;clk_hsmmc3),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &amp;clk_sclk_mmc0.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &amp;clk_sclk_mmc1.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &amp;clk_sclk_mmc2.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.3", "mmc_busclk.2", &amp;clk_sclk_mmc3.clk),</div><div class='add'>+	CLKDEV_INIT(NULL, "spi_busclk0", &amp;clk_p),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk1", &amp;clk_sclk_spi0.clk),</div><div class='add'>+	CLKDEV_INIT("s3c64xx-spi.1", "spi_busclk1", &amp;clk_sclk_spi1.clk),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void __init s5pv210_register_clocks(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ptr;</div><div class='hunk'>@@ -1273,11 +1342,19 @@ void __init s5pv210_register_clocks(void)</div><div class='ctx'> 	for (ptr = 0; ptr &lt; ARRAY_SIZE(sclk_tv); ptr++)</div><div class='ctx'> 		s3c_register_clksrc(sclk_tv[ptr], 1);</div><div class='ctx'> </div><div class='add'>+	for (ptr = 0; ptr &lt; ARRAY_SIZE(clksrc_cdev); ptr++)</div><div class='add'>+		s3c_register_clksrc(clksrc_cdev[ptr], 1);</div><div class='add'>+</div><div class='ctx'> 	s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));</div><div class='ctx'> 	s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));</div><div class='ctx'> </div><div class='ctx'> 	s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));</div><div class='ctx'> 	s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));</div><div class='add'>+	clkdev_add_table(s5pv210_clk_lookup, ARRAY_SIZE(s5pv210_clk_lookup));</div><div class='add'>+</div><div class='add'>+	s3c24xx_register_clocks(clk_cdev, ARRAY_SIZE(clk_cdev));</div><div class='add'>+	for (ptr = 0; ptr &lt; ARRAY_SIZE(clk_cdev); ptr++)</div><div class='add'>+		s3c_disable_clocks(clk_cdev[ptr], 1);</div><div class='ctx'> </div><div class='ctx'> 	s3c24xx_register_clock(&amp;dummy_apb_pclk);</div><div class='ctx'> 	s3c_pwmclk_init();</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/common.c<br/>index 84ec74633232..9c1bcdcc12c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/cpu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/cpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pv210/common.c</a></div><div class='hunk'>@@ -1,12 +1,13 @@</div><div class='del'>-/* linux/arch/arm/mach-s5pv210/cpu.c</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010 Samsung Electronics Co., Ltd.</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2009-2011 Samsung Electronics Co., Ltd.</div><div class='ctx'>  *		http://www.samsung.com</div><div class='ctx'>  *</div><div class='add'>+ * Common Codes for S5PV210</div><div class='add'>+ *</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 version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -17,37 +18,78 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</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/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/serial_core.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/proc-fns.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/proc-fns.h&gt;</div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='del'>-#include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='del'>-#include &lt;plat/fb-core.h&gt;</div><div class='del'>-#include &lt;plat/s5pv210.h&gt;</div><div class='add'>+#include &lt;plat/devs.h&gt;</div><div class='add'>+#include &lt;plat/sdhci.h&gt;</div><div class='ctx'> #include &lt;plat/adc-core.h&gt;</div><div class='ctx'> #include &lt;plat/ata-core.h&gt;</div><div class='add'>+#include &lt;plat/fb-core.h&gt;</div><div class='ctx'> #include &lt;plat/fimc-core.h&gt;</div><div class='ctx'> #include &lt;plat/iic-core.h&gt;</div><div class='ctx'> #include &lt;plat/keypad-core.h&gt;</div><div class='del'>-#include &lt;plat/sdhci.h&gt;</div><div class='del'>-#include &lt;plat/reset.h&gt;</div><div class='ctx'> #include &lt;plat/tv-core.h&gt;</div><div class='add'>+#include &lt;plat/regs-serial.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+static const char name_s5pv210[] = "S5PV210/S5PC110";</div><div class='add'>+</div><div class='add'>+static struct cpu_table cpu_ids[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.idcode		= S5PV210_CPU_ID,</div><div class='add'>+		.idmask		= S5PV210_CPU_MASK,</div><div class='add'>+		.map_io		= s5pv210_map_io,</div><div class='add'>+		.init_clocks	= s5pv210_init_clocks,</div><div class='add'>+		.init_uarts	= s5pv210_init_uarts,</div><div class='add'>+		.init		= s5pv210_init,</div><div class='add'>+		.name		= name_s5pv210,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* Initial IO mappings */</div><div class='ctx'> </div><div class='ctx'> static struct map_desc s5pv210_iodesc[] __initdata = {</div><div class='ctx'> 	{</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_CHIPID,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5PV210_PA_CHIPID),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_SYS,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5PV210_PA_SYSCON),</div><div class='add'>+		.length		= SZ_64K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_TIMER,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5PV210_PA_TIMER),</div><div class='add'>+		.length		= SZ_16K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S3C_VA_WATCHDOG,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5PV210_PA_WATCHDOG),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= (unsigned long)S5P_VA_SROMC,</div><div class='add'>+		.pfn		= __phys_to_pfn(S5PV210_PA_SROMC),</div><div class='add'>+		.length		= SZ_4K,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='ctx'> 		.virtual	= (unsigned long)S5P_VA_SYSTIMER,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(S5PV210_PA_SYSTIMER),</div><div class='ctx'> 		.length		= SZ_4K,</div><div class='hunk'>@@ -108,19 +150,32 @@ static void s5pv210_idle(void)</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void s5pv210_sw_reset(void)</div><div class='add'>+void s5pv210_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	__raw_writel(0x1, S5P_SWRESET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* s5pv210_map_io</div><div class='add'>+/*</div><div class='add'>+ * s5pv210_map_io</div><div class='ctx'>  *</div><div class='ctx'>  * register the standard cpu IO areas</div><div class='del'>-*/</div><div class='add'>+ */</div><div class='ctx'> </div><div class='del'>-void __init s5pv210_map_io(void)</div><div class='add'>+void __init s5pv210_init_io(struct map_desc *mach_desc, int size)</div><div class='ctx'> {</div><div class='add'>+	/* initialize the io descriptors we need for initialization */</div><div class='ctx'> 	iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc));</div><div class='add'>+	if (mach_desc)</div><div class='add'>+		iotable_init(mach_desc, size);</div><div class='add'>+</div><div class='add'>+	/* detect cpu id and rev. */</div><div class='add'>+	s5p_init_cpu(S5P_VA_CHIPID);</div><div class='add'>+</div><div class='add'>+	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init s5pv210_map_io(void)</div><div class='add'>+{</div><div class='ctx'> 	init_consistent_dma_size(14 &lt;&lt; 20);</div><div class='ctx'> </div><div class='ctx'> 	/* initialise device information early */</div><div class='hunk'>@@ -174,19 +229,19 @@ void __init s5pv210_init_irq(void)</div><div class='ctx'> 	s5p_init_irq(vic, ARRAY_SIZE(vic));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sysdev_class s5pv210_sysclass = {</div><div class='del'>-	.name	= "s5pv210-core",</div><div class='add'>+struct bus_type s5pv210_subsys = {</div><div class='add'>+	.name		= "s5pv210-core",</div><div class='add'>+	.dev_name	= "s5pv210-core",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sys_device s5pv210_sysdev = {</div><div class='del'>-	.cls	= &amp;s5pv210_sysclass,</div><div class='add'>+static struct device s5pv210_dev = {</div><div class='add'>+	.bus	= &amp;s5pv210_subsys,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init s5pv210_core_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_class_register(&amp;s5pv210_sysclass);</div><div class='add'>+	return subsys_system_register(&amp;s5pv210_subsys, NULL);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> core_initcall(s5pv210_core_init);</div><div class='ctx'> </div><div class='ctx'> int __init s5pv210_init(void)</div><div class='hunk'>@@ -196,8 +251,12 @@ int __init s5pv210_init(void)</div><div class='ctx'> 	/* set idle function */</div><div class='ctx'> 	pm_idle = s5pv210_idle;</div><div class='ctx'> </div><div class='del'>-	/* set sw_reset function */</div><div class='del'>-	s5p_reset_hook = s5pv210_sw_reset;</div><div class='add'>+	return device_register(&amp;s5pv210_dev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return sysdev_register(&amp;s5pv210_sysdev);</div><div class='add'>+/* uart registration process */</div><div class='add'>+</div><div class='add'>+void __init s5pv210_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='add'>+{</div><div class='add'>+	s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/common.h b/arch/arm/mach-s5pv210/common.h<br/>new file mode 100644<br/>index 000000000000..6ed2af5c7518<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pv210/common.h</a></div><div class='hunk'>@@ -0,0 +1,37 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * Common Header for S5PV210 machines</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ARCH_ARM_MACH_S5PV210_COMMON_H</div><div class='add'>+#define __ARCH_ARM_MACH_S5PV210_COMMON_H</div><div class='add'>+</div><div class='add'>+void s5pv210_init_io(struct map_desc *mach_desc, int size);</div><div class='add'>+void s5pv210_init_irq(void);</div><div class='add'>+</div><div class='add'>+void s5pv210_register_clocks(void);</div><div class='add'>+void s5pv210_setup_clocks(void);</div><div class='add'>+</div><div class='add'>+void s5pv210_restart(char mode, const char *cmd);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_S5PV210</div><div class='add'>+</div><div class='add'>+extern  int s5pv210_init(void);</div><div class='add'>+extern void s5pv210_map_io(void);</div><div class='add'>+extern void s5pv210_init_clocks(int xtal);</div><div class='add'>+extern void s5pv210_init_uarts(struct s3c2410_uartcfg *cfg, int no);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define s5pv210_init_clocks NULL</div><div class='add'>+#define s5pv210_init_uarts NULL</div><div class='add'>+#define s5pv210_map_io NULL</div><div class='add'>+#define s5pv210_init NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __ARCH_ARM_MACH_S5PV210_COMMON_H */</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/dev-spi.c b/arch/arm/mach-s5pv210/dev-spi.c<br/>deleted file mode 100644<br/>index eaf9a7bff7a0..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/dev-spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/dev-spi.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,175 +0,0 @@</div><div class='del'>-/* linux/arch/arm/mach-s5pv210/dev-spi.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2010 Samsung Electronics Co. Ltd.</div><div class='del'>- *	Jaswinder Singh &lt;jassi.brar@samsung.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'>-</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/dma.h&gt;</div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='del'>-#include &lt;mach/irqs.h&gt;</div><div class='del'>-#include &lt;mach/spi-clocks.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/s3c64xx-spi.h&gt;</div><div class='del'>-#include &lt;plat/gpio-cfg.h&gt;</div><div class='del'>-</div><div class='del'>-static char *spi_src_clks[] = {</div><div class='del'>-	[S5PV210_SPI_SRCCLK_PCLK] = "pclk",</div><div class='del'>-	[S5PV210_SPI_SRCCLK_SCLK] = "sclk_spi",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* SPI Controller platform_devices */</div><div class='del'>-</div><div class='del'>-/* Since we emulate multi-cs capability, we do not touch the CS.</div><div class='del'>- * The emulated CS is toggled by board specific mechanism, as it can</div><div class='del'>- * be either some immediate GPIO or some signal out of some other</div><div class='del'>- * chip in between ... or some yet another way.</div><div class='del'>- * We simply do not assume anything about CS.</div><div class='del'>- */</div><div class='del'>-static int s5pv210_spi_cfg_gpio(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	unsigned int base;</div><div class='del'>-</div><div class='del'>-	switch (pdev-&gt;id) {</div><div class='del'>-	case 0:</div><div class='del'>-		base = S5PV210_GPB(0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 1:</div><div class='del'>-		base = S5PV210_GPB(4);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Invalid SPI Controller number!");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s3c_gpio_cfgall_range(base, 3,</div><div class='del'>-			      S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct resource s5pv210_spi0_resource[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start = S5PV210_PA_SPI0,</div><div class='del'>-		.end   = S5PV210_PA_SPI0 + 0x100 - 1,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start = DMACH_SPI0_TX,</div><div class='del'>-		.end   = DMACH_SPI0_TX,</div><div class='del'>-		.flags = IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.start = DMACH_SPI0_RX,</div><div class='del'>-		.end   = DMACH_SPI0_RX,</div><div class='del'>-		.flags = IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[3] = {</div><div class='del'>-		.start = IRQ_SPI0,</div><div class='del'>-		.end   = IRQ_SPI0,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct s3c64xx_spi_info s5pv210_spi0_pdata = {</div><div class='del'>-	.cfg_gpio = s5pv210_spi_cfg_gpio,</div><div class='del'>-	.fifo_lvl_mask = 0x1ff,</div><div class='del'>-	.rx_lvl_offset = 15,</div><div class='del'>-	.high_speed = 1,</div><div class='del'>-	.tx_st_done = 25,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u64 spi_dmamask = DMA_BIT_MASK(32);</div><div class='del'>-</div><div class='del'>-struct platform_device s5pv210_device_spi0 = {</div><div class='del'>-	.name		  = "s3c64xx-spi",</div><div class='del'>-	.id		  = 0,</div><div class='del'>-	.num_resources	  = ARRAY_SIZE(s5pv210_spi0_resource),</div><div class='del'>-	.resource	  = s5pv210_spi0_resource,</div><div class='del'>-	.dev = {</div><div class='del'>-		.dma_mask		= &amp;spi_dmamask,</div><div class='del'>-		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-		.platform_data = &amp;s5pv210_spi0_pdata,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource s5pv210_spi1_resource[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start = S5PV210_PA_SPI1,</div><div class='del'>-		.end   = S5PV210_PA_SPI1 + 0x100 - 1,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start = DMACH_SPI1_TX,</div><div class='del'>-		.end   = DMACH_SPI1_TX,</div><div class='del'>-		.flags = IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.start = DMACH_SPI1_RX,</div><div class='del'>-		.end   = DMACH_SPI1_RX,</div><div class='del'>-		.flags = IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[3] = {</div><div class='del'>-		.start = IRQ_SPI1,</div><div class='del'>-		.end   = IRQ_SPI1,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct s3c64xx_spi_info s5pv210_spi1_pdata = {</div><div class='del'>-	.cfg_gpio = s5pv210_spi_cfg_gpio,</div><div class='del'>-	.fifo_lvl_mask = 0x7f,</div><div class='del'>-	.rx_lvl_offset = 15,</div><div class='del'>-	.high_speed = 1,</div><div class='del'>-	.tx_st_done = 25,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct platform_device s5pv210_device_spi1 = {</div><div class='del'>-	.name		  = "s3c64xx-spi",</div><div class='del'>-	.id		  = 1,</div><div class='del'>-	.num_resources	  = ARRAY_SIZE(s5pv210_spi1_resource),</div><div class='del'>-	.resource	  = s5pv210_spi1_resource,</div><div class='del'>-	.dev = {</div><div class='del'>-		.dma_mask		= &amp;spi_dmamask,</div><div class='del'>-		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-		.platform_data = &amp;s5pv210_spi1_pdata,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __init s5pv210_spi_set_info(int cntrlr, int src_clk_nr, int num_cs)</div><div class='del'>-{</div><div class='del'>-	struct s3c64xx_spi_info *pd;</div><div class='del'>-</div><div class='del'>-	/* Reject invalid configuration */</div><div class='del'>-	if (!num_cs || src_clk_nr &lt; 0</div><div class='del'>-			|| src_clk_nr &gt; S5PV210_SPI_SRCCLK_SCLK) {</div><div class='del'>-		printk(KERN_ERR "%s: Invalid SPI configuration\n", __func__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (cntrlr) {</div><div class='del'>-	case 0:</div><div class='del'>-		pd = &amp;s5pv210_spi0_pdata;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		pd = &amp;s5pv210_spi1_pdata;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "%s: Invalid SPI controller(%d)\n",</div><div class='del'>-							__func__, cntrlr);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pd-&gt;num_cs = num_cs;</div><div class='del'>-	pd-&gt;src_clk_nr = src_clk_nr;</div><div class='del'>-	pd-&gt;src_clk_name = spi_src_clks[src_clk_nr];</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/dma.c b/arch/arm/mach-s5pv210/dma.c<br/>index 86b749c18b77..a6113e0267f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pv210/dma.c</a></div><div class='hunk'>@@ -35,90 +35,40 @@</div><div class='ctx'> </div><div class='ctx'> static u64 dma_dmamask = DMA_BIT_MASK(32);</div><div class='ctx'> </div><div class='del'>-struct dma_pl330_peri pdma0_peri[28] = {</div><div class='del'>-	{</div><div class='del'>-		.peri_id = (u8)DMACH_UART0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART2_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART2_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART3_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART3_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = DMACH_MAX,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0S_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MAX,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MAX,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MAX,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MAX,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_AC97_MICIN,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_AC97_PCMIN,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_AC97_PCMOUT,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MAX,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PWM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPDIF,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	},</div><div class='add'>+u8 pdma0_peri[] = {</div><div class='add'>+	DMACH_UART0_RX,</div><div class='add'>+	DMACH_UART0_TX,</div><div class='add'>+	DMACH_UART1_RX,</div><div class='add'>+	DMACH_UART1_TX,</div><div class='add'>+	DMACH_UART2_RX,</div><div class='add'>+	DMACH_UART2_TX,</div><div class='add'>+	DMACH_UART3_RX,</div><div class='add'>+	DMACH_UART3_TX,</div><div class='add'>+	DMACH_MAX,</div><div class='add'>+	DMACH_I2S0_RX,</div><div class='add'>+	DMACH_I2S0_TX,</div><div class='add'>+	DMACH_I2S0S_TX,</div><div class='add'>+	DMACH_I2S1_RX,</div><div class='add'>+	DMACH_I2S1_TX,</div><div class='add'>+	DMACH_MAX,</div><div class='add'>+	DMACH_MAX,</div><div class='add'>+	DMACH_SPI0_RX,</div><div class='add'>+	DMACH_SPI0_TX,</div><div class='add'>+	DMACH_SPI1_RX,</div><div class='add'>+	DMACH_SPI1_TX,</div><div class='add'>+	DMACH_MAX,</div><div class='add'>+	DMACH_MAX,</div><div class='add'>+	DMACH_AC97_MICIN,</div><div class='add'>+	DMACH_AC97_PCMIN,</div><div class='add'>+	DMACH_AC97_PCMOUT,</div><div class='add'>+	DMACH_MAX,</div><div class='add'>+	DMACH_PWM,</div><div class='add'>+	DMACH_SPDIF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dma_pl330_platdata s5pv210_pdma0_pdata = {</div><div class='ctx'> 	.nr_valid_peri = ARRAY_SIZE(pdma0_peri),</div><div class='del'>-	.peri = pdma0_peri,</div><div class='add'>+	.peri_id = pdma0_peri,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct amba_device s5pv210_device_pdma0 = {</div><div class='hunk'>@@ -137,102 +87,44 @@ struct amba_device s5pv210_device_pdma0 = {</div><div class='ctx'> 	.periphid = 0x00041330,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dma_pl330_peri pdma1_peri[32] = {</div><div class='del'>-	{</div><div class='del'>-		.peri_id = (u8)DMACH_UART0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART2_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART2_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART3_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_UART3_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = DMACH_MAX,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S0S_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S2_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_I2S2_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_SPI1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MAX,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MAX,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM0_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM0_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM1_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM1_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MSM_REQ0,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MSM_REQ1,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MSM_REQ2,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_MSM_REQ3,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM2_RX,</div><div class='del'>-		.rqtype = DEVTOMEM,</div><div class='del'>-	}, {</div><div class='del'>-		.peri_id = (u8)DMACH_PCM2_TX,</div><div class='del'>-		.rqtype = MEMTODEV,</div><div class='del'>-	},</div><div class='add'>+u8 pdma1_peri[] = {</div><div class='add'>+	DMACH_UART0_RX,</div><div class='add'>+	DMACH_UART0_TX,</div><div class='add'>+	DMACH_UART1_RX,</div><div class='add'>+	DMACH_UART1_TX,</div><div class='add'>+	DMACH_UART2_RX,</div><div class='add'>+	DMACH_UART2_TX,</div><div class='add'>+	DMACH_UART3_RX,</div><div class='add'>+	DMACH_UART3_TX,</div><div class='add'>+	DMACH_MAX,</div><div class='add'>+	DMACH_I2S0_RX,</div><div class='add'>+	DMACH_I2S0_TX,</div><div class='add'>+	DMACH_I2S0S_TX,</div><div class='add'>+	DMACH_I2S1_RX,</div><div class='add'>+	DMACH_I2S1_TX,</div><div class='add'>+	DMACH_I2S2_RX,</div><div class='add'>+	DMACH_I2S2_TX,</div><div class='add'>+	DMACH_SPI0_RX,</div><div class='add'>+	DMACH_SPI0_TX,</div><div class='add'>+	DMACH_SPI1_RX,</div><div class='add'>+	DMACH_SPI1_TX,</div><div class='add'>+	DMACH_MAX,</div><div class='add'>+	DMACH_MAX,</div><div class='add'>+	DMACH_PCM0_RX,</div><div class='add'>+	DMACH_PCM0_TX,</div><div class='add'>+	DMACH_PCM1_RX,</div><div class='add'>+	DMACH_PCM1_TX,</div><div class='add'>+	DMACH_MSM_REQ0,</div><div class='add'>+	DMACH_MSM_REQ1,</div><div class='add'>+	DMACH_MSM_REQ2,</div><div class='add'>+	DMACH_MSM_REQ3,</div><div class='add'>+	DMACH_PCM2_RX,</div><div class='add'>+	DMACH_PCM2_TX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dma_pl330_platdata s5pv210_pdma1_pdata = {</div><div class='ctx'> 	.nr_valid_peri = ARRAY_SIZE(pdma1_peri),</div><div class='del'>-	.peri = pdma1_peri,</div><div class='add'>+	.peri_id = pdma1_peri,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct amba_device s5pv210_device_pdma1 = {</div><div class='hunk'>@@ -253,7 +145,12 @@ struct amba_device s5pv210_device_pdma1 = {</div><div class='ctx'> </div><div class='ctx'> static int __init s5pv210_dma_init(void)</div><div class='ctx'> {</div><div class='add'>+	dma_cap_set(DMA_SLAVE, s5pv210_pdma0_pdata.cap_mask);</div><div class='add'>+	dma_cap_set(DMA_CYCLIC, s5pv210_pdma0_pdata.cap_mask);</div><div class='ctx'> 	amba_device_register(&amp;s5pv210_device_pdma0, &amp;iomem_resource);</div><div class='add'>+</div><div class='add'>+	dma_cap_set(DMA_SLAVE, s5pv210_pdma1_pdata.cap_mask);</div><div class='add'>+	dma_cap_set(DMA_CYCLIC, s5pv210_pdma1_pdata.cap_mask);</div><div class='ctx'> 	amba_device_register(&amp;s5pv210_device_pdma1, &amp;iomem_resource);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/include/mach/entry-macro.S b/arch/arm/mach-s5pv210/include/mach/entry-macro.S<br/>index 3aa41ac59f07..bebca1b5d0b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pv210/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -10,45 +10,8 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware/vic.h&gt;</div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='del'>-#include &lt;plat/irqs.h&gt;</div><div class='del'>-</div><div class='ctx'> 	.macro	disable_fiq</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro	get_irqnr_preamble, base, tmp</div><div class='del'>-	ldr	\base, =VA_VIC0</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='ctx'> 	.macro	arch_ret_to_user, tmp1, tmp2</div><div class='ctx'> 	.endm</div><div class='del'>-</div><div class='del'>-	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-</div><div class='del'>-	@ check the vic0</div><div class='del'>-	mov	\irqnr, # S5P_IRQ_OFFSET + 31</div><div class='del'>-	ldr	\irqstat, [ \base, # VIC_IRQ_STATUS ]</div><div class='del'>-	teq	\irqstat, #0</div><div class='del'>-</div><div class='del'>-	@ otherwise try vic1</div><div class='del'>-	addeq	\tmp, \base, #(VA_VIC1 - VA_VIC0)</div><div class='del'>-	addeq	\irqnr, \irqnr, #32</div><div class='del'>-	ldreq	\irqstat, [ \tmp, # VIC_IRQ_STATUS ]</div><div class='del'>-	teqeq	\irqstat, #0</div><div class='del'>-</div><div class='del'>-	@ otherwise try vic2</div><div class='del'>-	addeq	\tmp, \base, #(VA_VIC2 - VA_VIC0)</div><div class='del'>-	addeq	\irqnr, \irqnr, #32</div><div class='del'>-	ldreq	\irqstat, [ \tmp, # VIC_IRQ_STATUS ]</div><div class='del'>-	teqeq	\irqstat, #0</div><div class='del'>-</div><div class='del'>-	@ otherwise try vic3</div><div class='del'>-	addeq	\tmp, \base, #(VA_VIC3 - VA_VIC0)</div><div class='del'>-	addeq	\irqnr, \irqnr, #32</div><div class='del'>-	ldreq	\irqstat, [ \tmp, # VIC_IRQ_STATUS ]</div><div class='del'>-	teqeq	\irqstat, #0</div><div class='del'>-</div><div class='del'>-	clzne	\irqstat, \irqstat</div><div class='del'>-	subne	\irqnr, \irqnr, \irqstat</div><div class='del'>-	.endm</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/include/mach/irqs.h b/arch/arm/mach-s5pv210/include/mach/irqs.h<br/>index 5e0de3a31f3d..e777e010ed2e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/include/mach/irqs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/include/mach/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pv210/include/mach/irqs.h</a></div><div class='hunk'>@@ -118,6 +118,8 @@</div><div class='ctx'> #define IRQ_MDNIE3		S5P_IRQ_VIC3(8)</div><div class='ctx'> #define IRQ_VIC_END		S5P_IRQ_VIC3(31)</div><div class='ctx'> </div><div class='add'>+#define IRQ_TIMER_BASE		(11)</div><div class='add'>+</div><div class='ctx'> #define S5P_EINT_BASE1		(S5P_IRQ_VIC0(0))</div><div class='ctx'> #define S5P_EINT_BASE2		(IRQ_VIC_END + 1)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h<br/>index 7ff609f1568b..89c34b8f73bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/include/mach/map.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/include/mach/map.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/include/mach/map.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pv210/include/mach/map.h</a></div><div class='hunk'>@@ -109,6 +109,8 @@</div><div class='ctx'> #define S3C_PA_RTC			S5PV210_PA_RTC</div><div class='ctx'> #define S3C_PA_USB_HSOTG		S5PV210_PA_HSOTG</div><div class='ctx'> #define S3C_PA_WDT			S5PV210_PA_WATCHDOG</div><div class='add'>+#define S3C_PA_SPI0			S5PV210_PA_SPI0</div><div class='add'>+#define S3C_PA_SPI1			S5PV210_PA_SPI1</div><div class='ctx'> </div><div class='ctx'> #define S5P_PA_CHIPID			S5PV210_PA_CHIPID</div><div class='ctx'> #define S5P_PA_FIMC0			S5PV210_PA_FIMC0</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/include/mach/system.h b/arch/arm/mach-s5pv210/include/mach/system.h<br/>index af8a200b2135..bf288ced860a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pv210/include/mach/system.h</a></div><div class='hunk'>@@ -13,8 +13,6 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H __FILE__</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/system-reset.h&gt;</div><div class='del'>-</div><div class='ctx'> static void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* nothing here yet */</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/include/mach/vmalloc.h b/arch/arm/mach-s5pv210/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index a6c659d68a5d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-/* linux/arch/arm/mach-s5p6442/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * Copyright 2010 Ben Dooks &lt;ben-linux@fluff.org&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com/</div><div class='del'>- *</div><div class='del'>- * Based on arch/arm/mach-s5p6442/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * S5PV210 vmalloc definition</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 __ASM_ARCH_VMALLOC_H</div><div class='del'>-#define __ASM_ARCH_VMALLOC_H __FILE__</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END	0xF6000000UL</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_ARCH_VMALLOC_H */</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/init.c b/arch/arm/mach-s5pv210/init.c<br/>deleted file mode 100644<br/>index 4865ae2c475a..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/init.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,44 +0,0 @@</div><div class='del'>-/* linux/arch/arm/mach-s5pv210/init.c</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com/</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/serial_core.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/cpu.h&gt;</div><div class='del'>-#include &lt;plat/devs.h&gt;</div><div class='del'>-#include &lt;plat/s5pv210.h&gt;</div><div class='del'>-#include &lt;plat/regs-serial.h&gt;</div><div class='del'>-</div><div class='del'>-static struct s3c24xx_uart_clksrc s5pv210_serial_clocks[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.name		= "pclk",</div><div class='del'>-		.divisor	= 1,</div><div class='del'>-		.min_baud	= 0,</div><div class='del'>-		.max_baud	= 0,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* uart registration process */</div><div class='del'>-void __init s5pv210_common_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='del'>-{</div><div class='del'>-	struct s3c2410_uartcfg *tcfg = cfg;</div><div class='del'>-	u32 ucnt;</div><div class='del'>-</div><div class='del'>-	for (ucnt = 0; ucnt &lt; no; ucnt++, tcfg++) {</div><div class='del'>-		if (!tcfg-&gt;clocks) {</div><div class='del'>-			tcfg-&gt;clocks = s5pv210_serial_clocks;</div><div class='del'>-			tcfg-&gt;clocks_size = ARRAY_SIZE(s5pv210_serial_clocks);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c<br/>index 5811a96125f0..5e734d025a6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/mach-aquila.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/mach-aquila.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/mach-aquila.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pv210/mach-aquila.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -32,7 +33,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/gpio-cfg.h&gt;</div><div class='ctx'> #include &lt;plat/regs-serial.h&gt;</div><div class='del'>-#include &lt;plat/s5pv210.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/fb.h&gt;</div><div class='hunk'>@@ -41,6 +41,8 @@</div><div class='ctx'> #include &lt;plat/s5p-time.h&gt;</div><div class='ctx'> #include &lt;plat/regs-fb-v4.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> /* Following are default values for UCON, ULCON and UFCON UART registers */</div><div class='ctx'> #define AQUILA_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\</div><div class='ctx'> 				 S3C2410_UCON_RXILEVEL |	\</div><div class='hunk'>@@ -595,8 +597,7 @@ static struct s3c_sdhci_platdata aquila_hsmmc2_data __initdata = {</div><div class='ctx'> </div><div class='ctx'> static void aquila_setup_sdhci(void)</div><div class='ctx'> {</div><div class='del'>-	gpio_request(AQUILA_EXT_FLASH_EN, "FLASH_EN");</div><div class='del'>-	gpio_direction_output(AQUILA_EXT_FLASH_EN, 1);</div><div class='add'>+	gpio_request_one(AQUILA_EXT_FLASH_EN, GPIOF_OUT_INIT_HIGH, "FLASH_EN");</div><div class='ctx'> </div><div class='ctx'> 	s3c_sdhci0_set_platdata(&amp;aquila_hsmmc0_data);</div><div class='ctx'> 	s3c_sdhci1_set_platdata(&amp;aquila_hsmmc1_data);</div><div class='hunk'>@@ -644,7 +645,7 @@ static void __init aquila_sound_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __init aquila_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	s5p_init_io(NULL, 0, S5P_VA_CHIPID);</div><div class='add'>+	s5pv210_init_io(NULL, 0);</div><div class='ctx'> 	s3c24xx_init_clocks(24000000);</div><div class='ctx'> 	s3c24xx_init_uarts(aquila_uartcfgs, ARRAY_SIZE(aquila_uartcfgs));</div><div class='ctx'> 	s5p_set_timer_source(S5P_PWM3, S5P_PWM4);</div><div class='hunk'>@@ -680,7 +681,9 @@ MACHINE_START(AQUILA, "Aquila")</div><div class='ctx'> 	   Kyungmin Park &lt;kyungmin.park@samsung.com&gt; */</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= s5pv210_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.map_io		= aquila_map_io,</div><div class='ctx'> 	.init_machine	= aquila_machine_init,</div><div class='ctx'> 	.timer		= &amp;s5p_timer,</div><div class='add'>+	.restart	= s5pv210_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c<br/>index 15edcae448b9..ff9152610439 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/mach-goni.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/mach-goni.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/mach-goni.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pv210/mach-goni.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -37,7 +38,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/gpio-cfg.h&gt;</div><div class='ctx'> #include &lt;plat/regs-serial.h&gt;</div><div class='del'>-#include &lt;plat/s5pv210.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/fb.h&gt;</div><div class='hunk'>@@ -54,6 +54,8 @@</div><div class='ctx'> #include &lt;media/s5p_fimc.h&gt;</div><div class='ctx'> #include &lt;media/noon010pc30.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> /* Following are default values for UCON, ULCON and UFCON UART registers */</div><div class='ctx'> #define GONI_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\</div><div class='ctx'> 				 S3C2410_UCON_RXILEVEL |	\</div><div class='hunk'>@@ -227,8 +229,7 @@ static void __init goni_radio_init(void)</div><div class='ctx'> 	i2c1_devs[0].irq = gpio_to_irq(gpio);</div><div class='ctx'> </div><div class='ctx'> 	gpio = S5PV210_GPJ2(5);			/* XMSMDATA_5 */</div><div class='del'>-	gpio_request(gpio, "FM_RST");</div><div class='del'>-	gpio_direction_output(gpio, 1);</div><div class='add'>+	gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "FM_RST");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* TSP */</div><div class='hunk'>@@ -264,8 +265,7 @@ static void __init goni_tsp_init(void)</div><div class='ctx'> 	int gpio;</div><div class='ctx'> </div><div class='ctx'> 	gpio = S5PV210_GPJ1(3);		/* XMSMADDR_11 */</div><div class='del'>-	gpio_request(gpio, "TSP_LDO_ON");</div><div class='del'>-	gpio_direction_output(gpio, 1);</div><div class='add'>+	gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "TSP_LDO_ON");</div><div class='ctx'> 	gpio_export(gpio, 0);</div><div class='ctx'> </div><div class='ctx'> 	gpio = S5PV210_GPJ0(5);		/* XMSMADDR_5 */</div><div class='hunk'>@@ -890,7 +890,7 @@ static void __init goni_sound_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __init goni_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	s5p_init_io(NULL, 0, S5P_VA_CHIPID);</div><div class='add'>+	s5pv210_init_io(NULL, 0);</div><div class='ctx'> 	s3c24xx_init_clocks(24000000);</div><div class='ctx'> 	s3c24xx_init_uarts(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs));</div><div class='ctx'> 	s5p_set_timer_source(S5P_PWM3, S5P_PWM4);</div><div class='hunk'>@@ -956,8 +956,10 @@ MACHINE_START(GONI, "GONI")</div><div class='ctx'> 	/* Maintainers: Kyungmin Park &lt;kyungmin.park@samsung.com&gt; */</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= s5pv210_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.map_io		= goni_map_io,</div><div class='ctx'> 	.init_machine	= goni_machine_init,</div><div class='ctx'> 	.timer		= &amp;s5p_timer,</div><div class='ctx'> 	.reserve	= &amp;goni_reserve,</div><div class='add'>+	.restart	= s5pv210_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c<br/>index f7266bb0cac8..b323983b2c54 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/mach-smdkc110.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/mach-smdkc110.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/mach-smdkc110.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pv210/mach-smdkc110.c</a></div><div class='hunk'>@@ -13,8 +13,9 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -24,7 +25,6 @@</div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/regs-serial.h&gt;</div><div class='del'>-#include &lt;plat/s5pv210.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/ata.h&gt;</div><div class='hunk'>@@ -32,6 +32,8 @@</div><div class='ctx'> #include &lt;plat/pm.h&gt;</div><div class='ctx'> #include &lt;plat/s5p-time.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> /* Following are default values for UCON, ULCON and UFCON UART registers */</div><div class='ctx'> #define SMDKC110_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\</div><div class='ctx'> 				 S3C2410_UCON_RXILEVEL |	\</div><div class='hunk'>@@ -109,7 +111,7 @@ static struct i2c_board_info smdkc110_i2c_devs2[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> static void __init smdkc110_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	s5p_init_io(NULL, 0, S5P_VA_CHIPID);</div><div class='add'>+	s5pv210_init_io(NULL, 0);</div><div class='ctx'> 	s3c24xx_init_clocks(24000000);</div><div class='ctx'> 	s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs));</div><div class='ctx'> 	s5p_set_timer_source(S5P_PWM3, S5P_PWM4);</div><div class='hunk'>@@ -138,7 +140,9 @@ MACHINE_START(SMDKC110, "SMDKC110")</div><div class='ctx'> 	/* Maintainer: Kukjin Kim &lt;kgene.kim@samsung.com&gt; */</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= s5pv210_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.map_io		= smdkc110_map_io,</div><div class='ctx'> 	.init_machine	= smdkc110_machine_init,</div><div class='ctx'> 	.timer		= &amp;s5p_timer,</div><div class='add'>+	.restart	= s5pv210_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c<br/>index 8662ef6e5681..dff9ea7b5bba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/mach-smdkv210.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/mach-smdkv210.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/mach-smdkv210.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pv210/mach-smdkv210.c</a></div><div class='hunk'>@@ -13,13 +13,14 @@</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/serial_core.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/dm9000.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/pwm_backlight.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -33,7 +34,6 @@</div><div class='ctx'> #include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;plat/regs-srom.h&gt;</div><div class='ctx'> #include &lt;plat/gpio-cfg.h&gt;</div><div class='del'>-#include &lt;plat/s5pv210.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/adc.h&gt;</div><div class='hunk'>@@ -47,6 +47,8 @@</div><div class='ctx'> #include &lt;plat/backlight.h&gt;</div><div class='ctx'> #include &lt;plat/regs-fb-v4.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> /* Following are default values for UCON, ULCON and UFCON UART registers */</div><div class='ctx'> #define SMDKV210_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\</div><div class='ctx'> 				 S3C2410_UCON_RXILEVEL |	\</div><div class='hunk'>@@ -153,15 +155,12 @@ static void smdkv210_lte480wv_set_power(struct plat_lcd_data *pd,</div><div class='ctx'> {</div><div class='ctx'> 	if (power) {</div><div class='ctx'> #if !defined(CONFIG_BACKLIGHT_PWM)</div><div class='del'>-		gpio_request(S5PV210_GPD0(3), "GPD0");</div><div class='del'>-		gpio_direction_output(S5PV210_GPD0(3), 1);</div><div class='add'>+		gpio_request_one(S5PV210_GPD0(3), GPIOF_OUT_INIT_HIGH, "GPD0");</div><div class='ctx'> 		gpio_free(S5PV210_GPD0(3));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 		/* fire nRESET on power up */</div><div class='del'>-		gpio_request(S5PV210_GPH0(6), "GPH0");</div><div class='del'>-</div><div class='del'>-		gpio_direction_output(S5PV210_GPH0(6), 1);</div><div class='add'>+		gpio_request_one(S5PV210_GPH0(6), GPIOF_OUT_INIT_HIGH, "GPH0");</div><div class='ctx'> </div><div class='ctx'> 		gpio_set_value(S5PV210_GPH0(6), 0);</div><div class='ctx'> 		mdelay(10);</div><div class='hunk'>@@ -172,8 +171,7 @@ static void smdkv210_lte480wv_set_power(struct plat_lcd_data *pd,</div><div class='ctx'> 		gpio_free(S5PV210_GPH0(6));</div><div class='ctx'> 	} else {</div><div class='ctx'> #if !defined(CONFIG_BACKLIGHT_PWM)</div><div class='del'>-		gpio_request(S5PV210_GPD0(3), "GPD0");</div><div class='del'>-		gpio_direction_output(S5PV210_GPD0(3), 0);</div><div class='add'>+		gpio_request_one(S5PV210_GPD0(3), GPIOF_OUT_INIT_LOW, "GPD0");</div><div class='ctx'> 		gpio_free(S5PV210_GPD0(3));</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='hunk'>@@ -278,7 +276,7 @@ static struct platform_pwm_backlight_data smdkv210_bl_data = {</div><div class='ctx'> </div><div class='ctx'> static void __init smdkv210_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	s5p_init_io(NULL, 0, S5P_VA_CHIPID);</div><div class='add'>+	s5pv210_init_io(NULL, 0);</div><div class='ctx'> 	s3c24xx_init_clocks(24000000);</div><div class='ctx'> 	s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs));</div><div class='ctx'> 	s5p_set_timer_source(S5P_PWM2, S5P_PWM4);</div><div class='hunk'>@@ -316,7 +314,9 @@ MACHINE_START(SMDKV210, "SMDKV210")</div><div class='ctx'> 	/* Maintainer: Kukjin Kim &lt;kgene.kim@samsung.com&gt; */</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= s5pv210_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.map_io		= smdkv210_map_io,</div><div class='ctx'> 	.init_machine	= smdkv210_machine_init,</div><div class='ctx'> 	.timer		= &amp;s5p_timer,</div><div class='add'>+	.restart	= s5pv210_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/mach-torbreck.c b/arch/arm/mach-s5pv210/mach-torbreck.c<br/>index 97cc066c5369..74e99bc0dc9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/mach-torbreck.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/mach-torbreck.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/mach-torbreck.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pv210/mach-torbreck.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -23,12 +24,13 @@</div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/regs-serial.h&gt;</div><div class='del'>-#include &lt;plat/s5pv210.h&gt;</div><div class='ctx'> #include &lt;plat/devs.h&gt;</div><div class='ctx'> #include &lt;plat/cpu.h&gt;</div><div class='ctx'> #include &lt;plat/iic.h&gt;</div><div class='ctx'> #include &lt;plat/s5p-time.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='ctx'> /* Following are default values for UCON, ULCON and UFCON UART registers */</div><div class='ctx'> #define TORBRECK_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\</div><div class='ctx'> 				 S3C2410_UCON_RXILEVEL |	\</div><div class='hunk'>@@ -102,7 +104,7 @@ static struct i2c_board_info torbreck_i2c_devs2[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> static void __init torbreck_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	s5p_init_io(NULL, 0, S5P_VA_CHIPID);</div><div class='add'>+	s5pv210_init_io(NULL, 0);</div><div class='ctx'> 	s3c24xx_init_clocks(24000000);</div><div class='ctx'> 	s3c24xx_init_uarts(torbreck_uartcfgs, ARRAY_SIZE(torbreck_uartcfgs));</div><div class='ctx'> 	s5p_set_timer_source(S5P_PWM3, S5P_PWM4);</div><div class='hunk'>@@ -127,7 +129,9 @@ MACHINE_START(TORBRECK, "TORBRECK")</div><div class='ctx'> 	/* Maintainer: Hyunchul Ko &lt;ghcstop@gmail.com&gt; */</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.init_irq	= s5pv210_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.map_io		= torbreck_map_io,</div><div class='ctx'> 	.init_machine	= torbreck_machine_init,</div><div class='ctx'> 	.timer		= &amp;s5p_timer,</div><div class='add'>+	.restart	= s5pv210_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/pm.c b/arch/arm/mach-s5pv210/pm.c<br/>index f149d278377b..677c71c41e50 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pv210/pm.c</a></div><div class='hunk'>@@ -133,7 +133,7 @@ static void s5pv210_pm_prepare(void)</div><div class='ctx'> 	s3c_pm_do_save(s5pv210_core_save, ARRAY_SIZE(s5pv210_core_save));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5pv210_pm_add(struct sys_device *sysdev)</div><div class='add'>+static int s5pv210_pm_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	pm_cpu_prep = s5pv210_pm_prepare;</div><div class='ctx'> 	pm_cpu_sleep = s5pv210_cpu_suspend;</div><div class='hunk'>@@ -141,13 +141,15 @@ static int s5pv210_pm_add(struct sys_device *sysdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver s5pv210_pm_driver = {</div><div class='del'>-	.add		= s5pv210_pm_add,</div><div class='add'>+static struct subsys_interface s5pv210_pm_interface = {</div><div class='add'>+	.name		= "s5pv210_pm",</div><div class='add'>+	.subsys		= &amp;s5pv210_subsys,</div><div class='add'>+	.add_dev	= s5pv210_pm_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __init int s5pv210_pm_drvinit(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_driver_register(&amp;s5pv210_sysclass, &amp;s5pv210_pm_driver);</div><div class='add'>+	return subsys_interface_register(&amp;s5pv210_pm_interface);</div><div class='ctx'> }</div><div class='ctx'> arch_initcall(s5pv210_pm_drvinit);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s5pv210/setup-sdhci.c b/arch/arm/mach-s5pv210/setup-sdhci.c<br/>deleted file mode 100644<br/>index 6b8ccc4d35fd..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/setup-sdhci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-s5pv210/setup-sdhci.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-/* linux/arch/arm/mach-s5pv210/setup-sdhci.c</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com/</div><div class='del'>- *</div><div class='del'>- * S5PV210 - Helper functions for settign up SDHCI device(s) (HSMMC)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-/* clock sources for the mmc bus clock, order as for the ctrl2[5..4] */</div><div class='del'>-</div><div class='del'>-char *s5pv210_hsmmc_clksrcs[4] = {</div><div class='del'>-	[0] = "hsmmc",		/* HCLK */</div><div class='del'>-	/* [1] = "hsmmc",	- duplicate HCLK entry */</div><div class='del'>-	[2] = "sclk_mmc",	/* mmc_bus */</div><div class='del'>-	/* [3] = NULL,		- reserved */</div><div class='del'>-};</div><div class='head'>diff --git a/arch/arm/mach-s5pv210/setup-spi.c b/arch/arm/mach-s5pv210/setup-spi.c<br/>new file mode 100644<br/>index 000000000000..f43c5048a37d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s5pv210/setup-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-s5pv210/setup-spi.c</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+/* linux/arch/arm/mach-s5pv210/setup-spi.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Samsung Electronics Ltd.</div><div class='add'>+ *		http://www.samsung.com/</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;plat/gpio-cfg.h&gt;</div><div class='add'>+#include &lt;plat/s3c64xx-spi.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_S3C64XX_DEV_SPI0</div><div class='add'>+struct s3c64xx_spi_info s3c64xx_spi0_pdata = {</div><div class='add'>+	.fifo_lvl_mask	= 0x1ff,</div><div class='add'>+	.rx_lvl_offset	= 15,</div><div class='add'>+	.high_speed	= 1,</div><div class='add'>+	.tx_st_done	= 25,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int s3c64xx_spi0_cfg_gpio(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	s3c_gpio_cfgpin(S5PV210_GPB(0), S3C_GPIO_SFN(2));</div><div class='add'>+	s3c_gpio_setpull(S5PV210_GPB(0), S3C_GPIO_PULL_UP);</div><div class='add'>+	s3c_gpio_cfgall_range(S5PV210_GPB(2), 2,</div><div class='add'>+				S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_S3C64XX_DEV_SPI1</div><div class='add'>+struct s3c64xx_spi_info s3c64xx_spi1_pdata = {</div><div class='add'>+	.fifo_lvl_mask	= 0x7f,</div><div class='add'>+	.rx_lvl_offset	= 15,</div><div class='add'>+	.high_speed	= 1,</div><div class='add'>+	.tx_st_done	= 25,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int s3c64xx_spi1_cfg_gpio(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	s3c_gpio_cfgpin(S5PV210_GPB(4), S3C_GPIO_SFN(2));</div><div class='add'>+	s3c_gpio_setpull(S5PV210_GPB(4), S3C_GPIO_PULL_UP);</div><div class='add'>+	s3c_gpio_cfgall_range(S5PV210_GPB(6), 2,</div><div class='add'>+				S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c<br/>index 3dd133f18415..ebafe8aa8956 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/assabet.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/assabet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/assabet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/assabet.c</a></div><div class='hunk'>@@ -202,6 +202,7 @@ static struct irda_platform_data assabet_irda_data = {</div><div class='ctx'> static struct mcp_plat_data assabet_mcp_data = {</div><div class='ctx'> 	.mccr0		= MCCR0_ADM,</div><div class='ctx'> 	.sclk_rate	= 11981000,</div><div class='add'>+	.codec		= "ucb1x00",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init assabet_init(void)</div><div class='hunk'>@@ -252,6 +253,17 @@ static void __init assabet_init(void)</div><div class='ctx'> 	sa11x0_register_mtd(&amp;assabet_flash_data, assabet_flash_resources,</div><div class='ctx'> 			    ARRAY_SIZE(assabet_flash_resources));</div><div class='ctx'> 	sa11x0_register_irda(&amp;assabet_irda_data);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup the PPC unit correctly.</div><div class='add'>+	 */</div><div class='add'>+	PPDR &amp;= ~PPC_RXD4;</div><div class='add'>+	PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;</div><div class='add'>+	PSDR |= PPC_RXD4;</div><div class='add'>+	PSDR &amp;= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);</div><div class='add'>+	PPSR &amp;= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);</div><div class='add'>+</div><div class='add'>+	ASSABET_BCR_set(ASSABET_BCR_CODEC_RST);</div><div class='ctx'> 	sa11x0_register_mcp(&amp;assabet_mcp_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -268,7 +280,7 @@ static void __init map_sa1100_gpio_regs( void )</div><div class='ctx'> 	int prot = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_DOMAIN(DOMAIN_IO);</div><div class='ctx'> 	pmd_t *pmd;</div><div class='ctx'> </div><div class='del'>-	pmd = pmd_offset(pgd_offset_k(virt), virt);</div><div class='add'>+	pmd = pmd_offset(pud_offset(pgd_offset_k(virt), virt), virt);</div><div class='ctx'> 	*pmd = __pmd(phys | prot);</div><div class='ctx'> 	flush_pmd_entry(pmd);</div><div class='ctx'> }</div><div class='hunk'>@@ -455,4 +467,5 @@ MACHINE_START(ASSABET, "Intel-Assabet")</div><div class='ctx'> #ifdef CONFIG_SA1111</div><div class='ctx'> 	.dma_zone_size	= SZ_1M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= sa11x0_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c<br/>index bda83e1ab078..b07a2c024cb7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/badge4.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/badge4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/badge4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/badge4.c</a></div><div class='hunk'>@@ -309,4 +309,5 @@ MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4")</div><div class='ctx'> #ifdef CONFIG_SA1111</div><div class='ctx'> 	.dma_zone_size	= SZ_1M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= sa11x0_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c<br/>index 7f3da4b11ec9..d12d0f48b1dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/cerf.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/cerf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/cerf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/cerf.c</a></div><div class='hunk'>@@ -124,12 +124,23 @@ static void __init cerf_map_io(void)</div><div class='ctx'> static struct mcp_plat_data cerf_mcp_data = {</div><div class='ctx'> 	.mccr0		= MCCR0_ADM,</div><div class='ctx'> 	.sclk_rate	= 11981000,</div><div class='add'>+	.codec		= "ucb1x00",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init cerf_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	platform_add_devices(cerf_devices, ARRAY_SIZE(cerf_devices));</div><div class='ctx'> 	sa11x0_register_mtd(&amp;cerf_flash_data, &amp;cerf_flash_resource, 1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup the PPC unit correctly.</div><div class='add'>+	 */</div><div class='add'>+	PPDR &amp;= ~PPC_RXD4;</div><div class='add'>+	PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;</div><div class='add'>+	PSDR |= PPC_RXD4;</div><div class='add'>+	PSDR &amp;= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);</div><div class='add'>+	PPSR &amp;= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);</div><div class='add'>+</div><div class='ctx'> 	sa11x0_register_mcp(&amp;cerf_mcp_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -139,4 +150,5 @@ MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube")</div><div class='ctx'> 	.init_irq	= cerf_init_irq,</div><div class='ctx'> 	.timer		= &amp;sa1100_timer,</div><div class='ctx'> 	.init_machine	= cerf_init,</div><div class='add'>+	.restart	= sa11x0_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-sa1100/clock.c b/arch/arm/mach-sa1100/clock.c<br/>index dab3c6347a8f..d6df9f6c9f7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/clock.c</a></div><div class='hunk'>@@ -11,17 +11,39 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/clkdev.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Very simple clock implementation - we only have one clock to deal with.</div><div class='del'>- */</div><div class='add'>+struct clkops {</div><div class='add'>+	void			(*enable)(struct clk *);</div><div class='add'>+	void			(*disable)(struct clk *);</div><div class='add'>+	unsigned long		(*getrate)(struct clk *);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct clk {</div><div class='add'>+	const struct clkops	*ops;</div><div class='add'>+	unsigned long		rate;</div><div class='ctx'> 	unsigned int		enabled;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void clk_gpio27_enable(void)</div><div class='add'>+#define INIT_CLKREG(_clk, _devname, _conname)		\</div><div class='add'>+	{						\</div><div class='add'>+		.clk		= _clk,			\</div><div class='add'>+		.dev_id		= _devname,		\</div><div class='add'>+		.con_id		= _conname,		\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define DEFINE_CLK(_name, _ops, _rate)			\</div><div class='add'>+struct clk clk_##_name = {				\</div><div class='add'>+		.ops	= _ops,				\</div><div class='add'>+		.rate	= _rate,			\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(clocks_lock);</div><div class='add'>+</div><div class='add'>+static void clk_gpio27_enable(struct clk *clk)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * First, set up the 3.6864MHz clock on GPIO 27 for the SA-1111:</div><div class='hunk'>@@ -32,38 +54,22 @@ static void clk_gpio27_enable(void)</div><div class='ctx'> 	TUCR = TUCR_3_6864MHz;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void clk_gpio27_disable(void)</div><div class='add'>+static void clk_gpio27_disable(struct clk *clk)</div><div class='ctx'> {</div><div class='ctx'> 	TUCR = 0;</div><div class='ctx'> 	GPDR &amp;= ~GPIO_32_768kHz;</div><div class='ctx'> 	GAFR &amp;= ~GPIO_32_768kHz;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct clk clk_gpio27;</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(clocks_lock);</div><div class='del'>-</div><div class='del'>-struct clk *clk_get(struct device *dev, const char *id)</div><div class='del'>-{</div><div class='del'>-	const char *devname = dev_name(dev);</div><div class='del'>-</div><div class='del'>-	return strcmp(devname, "sa1111.0") ? ERR_PTR(-ENOENT) : &amp;clk_gpio27;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(clk_get);</div><div class='del'>-</div><div class='del'>-void clk_put(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(clk_put);</div><div class='del'>-</div><div class='ctx'> int clk_enable(struct clk *clk)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;clocks_lock, flags);</div><div class='ctx'> 	if (clk-&gt;enabled++ == 0)</div><div class='del'>-		clk_gpio27_enable();</div><div class='add'>+		clk-&gt;ops-&gt;enable(clk);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;clocks_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(clk_enable);</div><div class='hunk'>@@ -76,13 +82,48 @@ void clk_disable(struct clk *clk)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;clocks_lock, flags);</div><div class='ctx'> 	if (--clk-&gt;enabled == 0)</div><div class='del'>-		clk_gpio27_disable();</div><div class='add'>+		clk-&gt;ops-&gt;disable(clk);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;clocks_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(clk_disable);</div><div class='ctx'> </div><div class='ctx'> unsigned long clk_get_rate(struct clk *clk)</div><div class='ctx'> {</div><div class='del'>-	return 3686400;</div><div class='add'>+	unsigned long rate;</div><div class='add'>+</div><div class='add'>+	rate = clk-&gt;rate;</div><div class='add'>+	if (clk-&gt;ops-&gt;getrate)</div><div class='add'>+		rate = clk-&gt;ops-&gt;getrate(clk);</div><div class='add'>+</div><div class='add'>+	return rate;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(clk_get_rate);</div><div class='add'>+</div><div class='add'>+const struct clkops clk_gpio27_ops = {</div><div class='add'>+	.enable		= clk_gpio27_enable,</div><div class='add'>+	.disable	= clk_gpio27_disable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void clk_dummy_enable(struct clk *clk) { }</div><div class='add'>+static void clk_dummy_disable(struct clk *clk) { }</div><div class='add'>+</div><div class='add'>+const struct clkops clk_dummy_ops = {</div><div class='add'>+	.enable		= clk_dummy_enable,</div><div class='add'>+	.disable	= clk_dummy_disable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_CLK(gpio27, &amp;clk_gpio27_ops, 3686400);</div><div class='add'>+static DEFINE_CLK(dummy, &amp;clk_dummy_ops, 0);</div><div class='add'>+</div><div class='add'>+static struct clk_lookup sa11xx_clkregs[] = {</div><div class='add'>+	INIT_CLKREG(&amp;clk_gpio27, "sa1111.0", NULL),</div><div class='add'>+	INIT_CLKREG(&amp;clk_dummy, "sa1100-rtc", NULL),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init sa11xx_clk_init(void)</div><div class='add'>+{</div><div class='add'>+	clkdev_add_table(sa11xx_clkregs, ARRAY_SIZE(sa11xx_clkregs));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+postcore_initcall(sa11xx_clk_init);</div><div class='head'>diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c<br/>index 2965cc9d424e..c483912d08af 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/collie.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/collie.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/collie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/collie.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/pda_power.h&gt;</div><div class='add'>+#include &lt;linux/mfd/ucb1x00.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='hunk'>@@ -85,10 +86,15 @@ static struct scoop_pcmcia_config collie_pcmcia_config = {</div><div class='ctx'> 	.num_devs	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct ucb1x00_plat_data collie_ucb1x00_data = {</div><div class='add'>+	.gpio_base	= COLLIE_TC35143_GPIO_BASE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct mcp_plat_data collie_mcp_data = {</div><div class='ctx'> 	.mccr0		= MCCR0_ADM | MCCR0_ExtClk,</div><div class='ctx'> 	.sclk_rate	= 9216000,</div><div class='del'>-	.gpio_base	= COLLIE_TC35143_GPIO_BASE,</div><div class='add'>+	.codec		= "ucb1x00",</div><div class='add'>+	.codec_pdata	= &amp;collie_ucb1x00_data,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -351,6 +357,16 @@ static void __init collie_init(void)</div><div class='ctx'> </div><div class='ctx'> 	sa11x0_register_mtd(&amp;collie_flash_data, collie_flash_resources,</div><div class='ctx'> 			    ARRAY_SIZE(collie_flash_resources));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup the PPC unit correctly.</div><div class='add'>+	 */</div><div class='add'>+	PPDR &amp;= ~PPC_RXD4;</div><div class='add'>+	PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;</div><div class='add'>+	PSDR |= PPC_RXD4;</div><div class='add'>+	PSDR &amp;= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);</div><div class='add'>+	PPSR &amp;= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);</div><div class='add'>+</div><div class='ctx'> 	sa11x0_register_mcp(&amp;collie_mcp_data);</div><div class='ctx'> </div><div class='ctx'> 	sharpsl_save_param();</div><div class='hunk'>@@ -387,4 +403,5 @@ MACHINE_START(COLLIE, "Sharp-Collie")</div><div class='ctx'> 	.init_irq	= sa1100_init_irq,</div><div class='ctx'> 	.timer		= &amp;sa1100_timer,</div><div class='ctx'> 	.init_machine	= collie_init,</div><div class='add'>+	.restart	= sa11x0_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c<br/>index 5fa5ae1f39e1..e3a28ca2a7b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/generic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/generic.c</a></div><div class='hunk'>@@ -126,6 +126,17 @@ static void sa1100_power_off(void)</div><div class='ctx'> 	PMCR = PMCR_SF;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void sa11x0_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	if (mode == 's') {</div><div class='add'>+		/* Jump into ROM at address 0 */</div><div class='add'>+		soft_restart(0);</div><div class='add'>+	} else {</div><div class='add'>+		/* Use on-chip reset capability */</div><div class='add'>+		RSRR = RSRR_SWR;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void sa11x0_register_device(struct platform_device *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -206,10 +217,15 @@ static struct platform_device sa11x0uart3_device = {</div><div class='ctx'> static struct resource sa11x0mcp_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.start	= __PREG(Ser4MCCR0),</div><div class='del'>-		.end	= __PREG(Ser4MCCR0) + 0xffff,</div><div class='add'>+		.end	= __PREG(Ser4MCCR0) + 0x1C - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='add'>+		.start	= __PREG(Ser4MCCR1),</div><div class='add'>+		.end	= __PREG(Ser4MCCR1) + 0x4 - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='ctx'> 		.start	= IRQ_Ser4MCP,</div><div class='ctx'> 		.end	= IRQ_Ser4MCP,</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ,</div><div class='hunk'>@@ -334,9 +350,29 @@ void sa11x0_register_irda(struct irda_platform_data *irda)</div><div class='ctx'> 	sa11x0_register_device(&amp;sa11x0ir_device, irda);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct resource sa11x0rtc_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= 0x90010000,</div><div class='add'>+		.end	= 0x900100ff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= IRQ_RTC1Hz,</div><div class='add'>+		.end	= IRQ_RTC1Hz,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start	= IRQ_RTCAlrm,</div><div class='add'>+		.end	= IRQ_RTCAlrm,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device sa11x0rtc_device = {</div><div class='ctx'> 	.name		= "sa1100-rtc",</div><div class='ctx'> 	.id		= -1,</div><div class='add'>+	.resource	= sa11x0rtc_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(sa11x0rtc_resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *sa11x0_devices[] __initdata = {</div><div class='head'>diff --git a/arch/arm/mach-sa1100/generic.h b/arch/arm/mach-sa1100/generic.h<br/>index b7a9a601c2d1..33268cf6be36 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/generic.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/generic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/generic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/generic.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@ extern struct sys_timer sa1100_timer;</div><div class='ctx'> extern void __init sa1100_map_io(void);</div><div class='ctx'> extern void __init sa1100_init_irq(void);</div><div class='ctx'> extern void __init sa1100_init_gpio(void);</div><div class='add'>+extern void sa11x0_restart(char, const char *);</div><div class='ctx'> </div><div class='ctx'> #define SET_BANK(__nr,__start,__size) \</div><div class='ctx'> 	mi-&gt;bank[__nr].start = (__start), \</div><div class='head'>diff --git a/arch/arm/mach-sa1100/h3100.c b/arch/arm/mach-sa1100/h3100.c<br/>index b30733a2b82e..1e6b3c105ba6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/h3100.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/h3100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/h3100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/h3100.c</a></div><div class='hunk'>@@ -89,5 +89,6 @@ MACHINE_START(H3100, "Compaq iPAQ H3100")</div><div class='ctx'> 	.init_irq	= sa1100_init_irq,</div><div class='ctx'> 	.timer		= &amp;sa1100_timer,</div><div class='ctx'> 	.init_machine	= h3100_mach_init,</div><div class='add'>+	.restart	= sa11x0_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c<br/>index 6fd324d92389..6b58e7460ecf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/h3600.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/h3600.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/h3600.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/h3600.c</a></div><div class='hunk'>@@ -130,5 +130,6 @@ MACHINE_START(H3600, "Compaq iPAQ H3600")</div><div class='ctx'> 	.init_irq	= sa1100_init_irq,</div><div class='ctx'> 	.timer		= &amp;sa1100_timer,</div><div class='ctx'> 	.init_machine	= h3600_mach_init,</div><div class='add'>+	.restart	= sa11x0_restart,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/hackkit.c b/arch/arm/mach-sa1100/hackkit.c<br/>index 30f4a551b8e5..c01bb36db940 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/hackkit.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/hackkit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/hackkit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/hackkit.c</a></div><div class='hunk'>@@ -200,4 +200,5 @@ MACHINE_START(HACKKIT, "HackKit Cpu Board")</div><div class='ctx'> 	.init_irq	= sa1100_init_irq,</div><div class='ctx'> 	.timer		= &amp;sa1100_timer,</div><div class='ctx'> 	.init_machine	= hackkit_init,</div><div class='add'>+	.restart	= sa11x0_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-sa1100/include/mach/gpio.h b/arch/arm/mach-sa1100/include/mach/gpio.h<br/>index 703631887c94..a38fc4f54241 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/gpio.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/include/mach/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/include/mach/gpio.h</a></div><div class='hunk'>@@ -51,7 +51,4 @@ static inline void gpio_set_value(unsigned gpio, int value)</div><div class='ctx'> </div><div class='ctx'> #define gpio_cansleep	__gpio_cansleep</div><div class='ctx'> </div><div class='del'>-#define gpio_to_irq(gpio)	((gpio &lt; 11) ? (IRQ_GPIO0 + gpio) : \</div><div class='del'>-					(IRQ_GPIO11 - 11 + gpio))</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-sa1100/include/mach/mcp.h b/arch/arm/mach-sa1100/include/mach/mcp.h<br/>index ed1a331508a7..586cec898b35 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/mcp.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/include/mach/mcp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/mcp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/include/mach/mcp.h</a></div><div class='hunk'>@@ -17,6 +17,8 @@ struct mcp_plat_data {</div><div class='ctx'> 	u32 mccr1;</div><div class='ctx'> 	unsigned int sclk_rate;</div><div class='ctx'> 	int gpio_base;</div><div class='add'>+	const char *codec;</div><div class='add'>+	void *codec_pdata;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-sa1100/include/mach/system.h b/arch/arm/mach-sa1100/include/mach/system.h<br/>index ba9da9f7f183..e17b208f76d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/include/mach/system.h</a></div><div class='hunk'>@@ -3,20 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 1999 Nicolas Pitre &lt;nico@fluxnic.net&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	if (mode == 's') {</div><div class='del'>-		/* Jump into ROM at address 0 */</div><div class='del'>-		cpu_reset(0);</div><div class='del'>-	} else {</div><div class='del'>-		/* Use on-chip reset capability */</div><div class='del'>-		RSRR = RSRR_SWR;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-sa1100/include/mach/vmalloc.h b/arch/arm/mach-sa1100/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index b3d002398480..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-sa1100/include/mach/vmalloc.h</div><div class='del'>- */</div><div class='del'>-#define VMALLOC_END       (0xe8000000UL)</div><div class='head'>diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c<br/>index 77198fe02bc5..ee121d6f0480 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/jornada720.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/jornada720.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/jornada720.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/jornada720.c</a></div><div class='hunk'>@@ -373,4 +373,5 @@ MACHINE_START(JORNADA720, "HP Jornada 720")</div><div class='ctx'> #ifdef CONFIG_SA1111</div><div class='ctx'> 	.dma_zone_size	= SZ_1M,</div><div class='ctx'> #endif</div><div class='add'>+	.restart	= sa11x0_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-sa1100/lart.c b/arch/arm/mach-sa1100/lart.c<br/>index 5bc59d0947ba..d117ceab6215 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/lart.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/lart.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/lart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/lart.c</a></div><div class='hunk'>@@ -24,10 +24,20 @@</div><div class='ctx'> static struct mcp_plat_data lart_mcp_data = {</div><div class='ctx'> 	.mccr0		= MCCR0_ADM,</div><div class='ctx'> 	.sclk_rate	= 11981000,</div><div class='add'>+	.codec		= "ucb1x00",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init lart_init(void)</div><div class='ctx'> {</div><div class='add'>+	/*</div><div class='add'>+	 * Setup the PPC unit correctly.</div><div class='add'>+	 */</div><div class='add'>+	PPDR &amp;= ~PPC_RXD4;</div><div class='add'>+	PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;</div><div class='add'>+	PSDR |= PPC_RXD4;</div><div class='add'>+	PSDR &amp;= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);</div><div class='add'>+	PPSR &amp;= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);</div><div class='add'>+</div><div class='ctx'> 	sa11x0_register_mcp(&amp;lart_mcp_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -66,4 +76,5 @@ MACHINE_START(LART, "LART")</div><div class='ctx'> 	.init_irq	= sa1100_init_irq,</div><div class='ctx'> 	.init_machine	= lart_init,</div><div class='ctx'> 	.timer		= &amp;sa1100_timer,</div><div class='add'>+	.restart	= sa11x0_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-sa1100/nanoengine.c b/arch/arm/mach-sa1100/nanoengine.c<br/>index 032f3881d145..85f6ee672225 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/nanoengine.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/nanoengine.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/nanoengine.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/nanoengine.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='hunk'>@@ -116,4 +117,5 @@ MACHINE_START(NANOENGINE, "BSE nanoEngine")</div><div class='ctx'> 	.init_irq	= sa1100_init_irq,</div><div class='ctx'> 	.timer		= &amp;sa1100_timer,</div><div class='ctx'> 	.init_machine	= nanoengine_init,</div><div class='add'>+	.restart	= sa11x0_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-sa1100/pci-nanoengine.c b/arch/arm/mach-sa1100/pci-nanoengine.c<br/>index dd39fee59549..0d01ca788922 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/pci-nanoengine.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/pci-nanoengine.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/pci-nanoengine.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/pci-nanoengine.c</a></div><div class='hunk'>@@ -131,7 +131,8 @@ static int __init pci_nanoengine_map_irq(const struct pci_dev *dev, u8 slot,</div><div class='ctx'> </div><div class='ctx'> struct pci_bus * __init pci_nanoengine_scan_bus(int nr, struct pci_sys_data *sys)</div><div class='ctx'> {</div><div class='del'>-	return pci_scan_bus(sys-&gt;busnr, &amp;pci_nano_ops, sys);</div><div class='add'>+	return pci_scan_root_bus(NULL, sys-&gt;busnr, &amp;pci_nano_ops, sys,</div><div class='add'>+				 &amp;sys-&gt;resources);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct resource pci_io_ports = {</div><div class='hunk'>@@ -226,7 +227,7 @@ static struct resource pci_prefetchable_memory = {</div><div class='ctx'> 	.flags	= IORESOURCE_MEM  | IORESOURCE_PREFETCH,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pci_nanoengine_setup_resources(struct resource **resource)</div><div class='add'>+static int __init pci_nanoengine_setup_resources(struct pci_sys_data *sys)</div><div class='ctx'> {</div><div class='ctx'> 	if (request_resource(&amp;ioport_resource, &amp;pci_io_ports)) {</div><div class='ctx'> 		printk(KERN_ERR "PCI: unable to allocate io port region\n");</div><div class='hunk'>@@ -243,9 +244,9 @@ static int __init pci_nanoengine_setup_resources(struct resource **resource)</div><div class='ctx'> 		printk(KERN_ERR "PCI: unable to allocate prefetchable\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	resource[0] = &amp;pci_io_ports;</div><div class='del'>-	resource[1] = &amp;pci_non_prefetchable_memory;</div><div class='del'>-	resource[2] = &amp;pci_prefetchable_memory;</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;pci_io_ports);</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;pci_non_prefetchable_memory);</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;pci_prefetchable_memory);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -260,7 +261,7 @@ int __init pci_nanoengine_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	if (nr == 0) {</div><div class='ctx'> 		sys-&gt;mem_offset = NANO_PCI_MEM_RW_PHYS;</div><div class='ctx'> 		sys-&gt;io_offset = 0x400;</div><div class='del'>-		ret = pci_nanoengine_setup_resources(sys-&gt;resource);</div><div class='add'>+		ret = pci_nanoengine_setup_resources(sys);</div><div class='ctx'> 		/* Enable alternate memory bus master mode, see</div><div class='ctx'> 		 * "Intel StrongARM SA1110 Developer's Manual",</div><div class='ctx'> 		 * section 10.8, "Alternate Memory Bus Master Mode". */</div><div class='head'>diff --git a/arch/arm/mach-sa1100/pleb.c b/arch/arm/mach-sa1100/pleb.c<br/>index 65161f2bea29..9307df053533 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/pleb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/pleb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/pleb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/pleb.c</a></div><div class='hunk'>@@ -150,4 +150,5 @@ MACHINE_START(PLEB, "PLEB")</div><div class='ctx'> 	.init_irq	= sa1100_init_irq,</div><div class='ctx'> 	.timer		= &amp;sa1100_timer,</div><div class='ctx'> 	.init_machine   = pleb_init,</div><div class='add'>+	.restart	= sa11x0_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c<br/>index 1cccbf5b9e9a..748d34435b3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/shannon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/shannon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/shannon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/shannon.c</a></div><div class='hunk'>@@ -55,11 +55,22 @@ static struct resource shannon_flash_resource = {</div><div class='ctx'> static struct mcp_plat_data shannon_mcp_data = {</div><div class='ctx'> 	.mccr0		= MCCR0_ADM,</div><div class='ctx'> 	.sclk_rate	= 11981000,</div><div class='add'>+	.codec		= "ucb1x00",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init shannon_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	sa11x0_register_mtd(&amp;shannon_flash_data, &amp;shannon_flash_resource, 1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup the PPC unit correctly.</div><div class='add'>+	 */</div><div class='add'>+	PPDR &amp;= ~PPC_RXD4;</div><div class='add'>+	PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;</div><div class='add'>+	PSDR |= PPC_RXD4;</div><div class='add'>+	PSDR &amp;= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);</div><div class='add'>+	PPSR &amp;= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);</div><div class='add'>+</div><div class='ctx'> 	sa11x0_register_mcp(&amp;shannon_mcp_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -87,4 +98,5 @@ MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)")</div><div class='ctx'> 	.init_irq	= sa1100_init_irq,</div><div class='ctx'> 	.timer		= &amp;sa1100_timer,</div><div class='ctx'> 	.init_machine	= shannon_init,</div><div class='add'>+	.restart	= sa11x0_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c<br/>index 4790f3f3d008..458ececefa58 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/simpad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/simpad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/simpad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/simpad.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/mfd/ucb1x00.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='hunk'>@@ -187,10 +188,15 @@ static struct resource simpad_flash_resources [] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct ucb1x00_plat_data simpad_ucb1x00_data = {</div><div class='add'>+	.gpio_base	= SIMPAD_UCB1X00_GPIO_BASE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct mcp_plat_data simpad_mcp_data = {</div><div class='ctx'> 	.mccr0		= MCCR0_ADM,</div><div class='ctx'> 	.sclk_rate	= 11981000,</div><div class='del'>-	.gpio_base	= SIMPAD_UCB1X00_GPIO_BASE,</div><div class='add'>+	.codec		= "ucb1300",</div><div class='add'>+	.codec_pdata	= &amp;simpad_ucb1x00_data,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -378,6 +384,16 @@ static int __init simpad_init(void)</div><div class='ctx'> </div><div class='ctx'> 	sa11x0_register_mtd(&amp;simpad_flash_data, simpad_flash_resources,</div><div class='ctx'> 			      ARRAY_SIZE(simpad_flash_resources));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup the PPC unit correctly.</div><div class='add'>+	 */</div><div class='add'>+	PPDR &amp;= ~PPC_RXD4;</div><div class='add'>+	PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;</div><div class='add'>+	PSDR |= PPC_RXD4;</div><div class='add'>+	PSDR &amp;= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);</div><div class='add'>+	PPSR &amp;= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);</div><div class='add'>+</div><div class='ctx'> 	sa11x0_register_mcp(&amp;simpad_mcp_data);</div><div class='ctx'> </div><div class='ctx'> 	ret = platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='hunk'>@@ -396,4 +412,5 @@ MACHINE_START(SIMPAD, "Simpad")</div><div class='ctx'> 	.map_io		= simpad_map_io,</div><div class='ctx'> 	.init_irq	= sa1100_init_irq,</div><div class='ctx'> 	.timer		= &amp;sa1100_timer,</div><div class='add'>+	.restart	= sa11x0_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c<br/>index fa6602491d54..69e33535dee6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-sa1100/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-sa1100/time.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> #include &lt;linux/errno.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='del'>-#include &lt;linux/sched.h&gt;	/* just for sched_clock() - funny that */</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -20,29 +19,9 @@</div><div class='ctx'> #include &lt;asm/sched_clock.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This is the SA11x0 sched_clock implementation.</div><div class='del'>- */</div><div class='del'>-static DEFINE_CLOCK_DATA(cd);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Constants generated by clocks_calc_mult_shift(m, s, 3.6864MHz,</div><div class='del'>- * NSEC_PER_SEC, 60).</div><div class='del'>- * This gives a resolution of about 271ns and a wrap period of about 19min.</div><div class='del'>- */</div><div class='del'>-#define SC_MULT		2275555556u</div><div class='del'>-#define SC_SHIFT	23</div><div class='del'>-</div><div class='del'>-unsigned long long notrace sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	u32 cyc = OSCR;</div><div class='del'>-	return cyc_to_fixed_sched_clock(&amp;cd, cyc, (u32)~0, SC_MULT, SC_SHIFT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void notrace sa1100_update_sched_clock(void)</div><div class='add'>+static u32 notrace sa1100_read_sched_clock(void)</div><div class='ctx'> {</div><div class='del'>-	u32 cyc = OSCR;</div><div class='del'>-	update_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='add'>+	return OSCR;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define MIN_OSCR_DELTA 2</div><div class='hunk'>@@ -109,8 +88,7 @@ static void __init sa1100_timer_init(void)</div><div class='ctx'> 	OIER = 0;</div><div class='ctx'> 	OSSR = OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3;</div><div class='ctx'> </div><div class='del'>-	init_fixed_sched_clock(&amp;cd, sa1100_update_sched_clock, 32,</div><div class='del'>-			       3686400, SC_MULT, SC_SHIFT);</div><div class='add'>+	setup_sched_clock(sa1100_read_sched_clock, 32, 3686400);</div><div class='ctx'> </div><div class='ctx'> 	clockevents_calc_mult_shift(&amp;ckevt_sa1100_osmr0, 3686400, 4);</div><div class='ctx'> 	ckevt_sa1100_osmr0.max_delta_ns =</div><div class='head'>diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c<br/>index feda3ca7fc95..a851c254ad6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shark/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shark/core.c</a></div><div class='hunk'>@@ -26,10 +26,9 @@</div><div class='ctx'> #define ROMCARD_SIZE            0x08000000</div><div class='ctx'> #define ROMCARD_START           0x10000000</div><div class='ctx'> </div><div class='del'>-void arch_reset(char mode, const char *cmd)</div><div class='add'>+static void shark_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'>         short temp;</div><div class='del'>-        local_irq_disable();</div><div class='ctx'>         /* Reset the Machine via pc[3] of the sequoia chipset */</div><div class='ctx'>         outw(0x09,0x24);</div><div class='ctx'>         temp=inw(0x26);</div><div class='hunk'>@@ -157,4 +156,5 @@ MACHINE_START(SHARK, "Shark")</div><div class='ctx'> 	.init_irq	= shark_init_irq,</div><div class='ctx'> 	.timer		= &amp;shark_timer,</div><div class='ctx'> 	.dma_zone_size	= SZ_4M,</div><div class='add'>+	.restart	= shark_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-shark/include/mach/system.h b/arch/arm/mach-shark/include/mach/system.h<br/>index 21c373b30bbc..1b2f2c5050a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shark/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shark/include/mach/system.h</a></div><div class='hunk'>@@ -6,9 +6,6 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-/* Found in arch/mach-shark/core.c */</div><div class='del'>-extern void arch_reset(char mode, const char *cmd);</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-shark/include/mach/vmalloc.h b/arch/arm/mach-shark/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index b10df988526d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shark/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-shark/include/mach/vmalloc.h</div><div class='del'>- */</div><div class='del'>-#define VMALLOC_END       0xd0000000UL</div><div class='head'>diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig<br/>index 0828fab2b65c..060e5644c49c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/Kconfig</a></div><div class='hunk'>@@ -28,6 +28,19 @@ config ARCH_SH73A0</div><div class='ctx'> 	select ARM_GIC</div><div class='ctx'> 	select I2C</div><div class='ctx'> </div><div class='add'>+config ARCH_R8A7740</div><div class='add'>+	bool "R-Mobile A1 (R8A77400)"</div><div class='add'>+	select CPU_V7</div><div class='add'>+	select SH_CLK_CPG</div><div class='add'>+	select ARCH_WANT_OPTIONAL_GPIOLIB</div><div class='add'>+</div><div class='add'>+config ARCH_R8A7779</div><div class='add'>+	bool "R-Car H1 (R8A77790)"</div><div class='add'>+	select CPU_V7</div><div class='add'>+	select SH_CLK_CPG</div><div class='add'>+	select ARM_GIC</div><div class='add'>+	select ARCH_WANT_OPTIONAL_GPIOLIB</div><div class='add'>+</div><div class='ctx'> comment "SH-Mobile Board Type"</div><div class='ctx'> </div><div class='ctx'> config MACH_G3EVM</div><div class='hunk'>@@ -75,6 +88,16 @@ config MACH_KOTA2</div><div class='ctx'> 	select ARCH_REQUIRE_GPIOLIB</div><div class='ctx'> 	depends on ARCH_SH73A0</div><div class='ctx'> </div><div class='add'>+config MACH_BONITO</div><div class='add'>+	bool "bonito board"</div><div class='add'>+	select ARCH_REQUIRE_GPIOLIB</div><div class='add'>+	depends on ARCH_R8A7740</div><div class='add'>+</div><div class='add'>+config MACH_MARZEN</div><div class='add'>+	bool "MARZEN board"</div><div class='add'>+	depends on ARCH_R8A7779</div><div class='add'>+	select ARCH_REQUIRE_GPIOLIB</div><div class='add'>+</div><div class='ctx'> comment "SH-Mobile System Configuration"</div><div class='ctx'> </div><div class='ctx'> menu "Memory configuration"</div><div class='hunk'>@@ -83,7 +106,7 @@ config MEMORY_START</div><div class='ctx'> 	hex "Physical memory start address"</div><div class='ctx'> 	default "0x50000000" if MACH_G3EVM</div><div class='ctx'> 	default "0x40000000" if MACH_G4EVM || MACH_AP4EVB || MACH_AG5EVM || \</div><div class='del'>-				MACH_MACKEREL</div><div class='add'>+				MACH_MACKEREL || MACH_BONITO</div><div class='ctx'> 	default "0x41000000" if MACH_KOTA2</div><div class='ctx'> 	default "0x00000000"</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -95,7 +118,7 @@ config MEMORY_SIZE</div><div class='ctx'> 	hex "Physical memory size"</div><div class='ctx'> 	default "0x08000000" if MACH_G3EVM</div><div class='ctx'> 	default "0x08000000" if MACH_G4EVM</div><div class='del'>-	default "0x20000000" if MACH_AG5EVM</div><div class='add'>+	default "0x20000000" if MACH_AG5EVM || MACH_BONITO</div><div class='ctx'> 	default "0x1e000000" if MACH_KOTA2</div><div class='ctx'> 	default "0x10000000" if MACH_AP4EVB || MACH_MACKEREL</div><div class='ctx'> 	default "0x04000000"</div><div class='head'>diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile<br/>index 737bdc631b0d..7ad6954c46cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/Makefile</a></div><div class='hunk'>@@ -10,12 +10,15 @@ obj-$(CONFIG_ARCH_SH7367)	+= setup-sh7367.o clock-sh7367.o intc-sh7367.o</div><div class='ctx'> obj-$(CONFIG_ARCH_SH7377)	+= setup-sh7377.o clock-sh7377.o intc-sh7377.o</div><div class='ctx'> obj-$(CONFIG_ARCH_SH7372)	+= setup-sh7372.o clock-sh7372.o intc-sh7372.o</div><div class='ctx'> obj-$(CONFIG_ARCH_SH73A0)	+= setup-sh73a0.o clock-sh73a0.o intc-sh73a0.o</div><div class='add'>+obj-$(CONFIG_ARCH_R8A7740)	+= setup-r8a7740.o clock-r8a7740.o intc-r8a7740.o</div><div class='add'>+obj-$(CONFIG_ARCH_R8A7779)	+= setup-r8a7779.o clock-r8a7779.o intc-r8a7779.o</div><div class='ctx'> </div><div class='ctx'> # SMP objects</div><div class='ctx'> smp-y				:= platsmp.o headsmp.o</div><div class='ctx'> smp-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o</div><div class='ctx'> smp-$(CONFIG_LOCAL_TIMERS)	+= localtimer.o</div><div class='ctx'> smp-$(CONFIG_ARCH_SH73A0)	+= smp-sh73a0.o</div><div class='add'>+smp-$(CONFIG_ARCH_R8A7779)	+= smp-r8a7779.o</div><div class='ctx'> </div><div class='ctx'> # Pinmux setup</div><div class='ctx'> pfc-y				:=</div><div class='hunk'>@@ -23,17 +26,20 @@ pfc-$(CONFIG_ARCH_SH7367)	+= pfc-sh7367.o</div><div class='ctx'> pfc-$(CONFIG_ARCH_SH7377)	+= pfc-sh7377.o</div><div class='ctx'> pfc-$(CONFIG_ARCH_SH7372)	+= pfc-sh7372.o</div><div class='ctx'> pfc-$(CONFIG_ARCH_SH73A0)	+= pfc-sh73a0.o</div><div class='add'>+pfc-$(CONFIG_ARCH_R8A7740)	+= pfc-r8a7740.o</div><div class='add'>+pfc-$(CONFIG_ARCH_R8A7779)	+= pfc-r8a7779.o</div><div class='ctx'> </div><div class='ctx'> # IRQ objects</div><div class='ctx'> obj-$(CONFIG_ARCH_SH7367)	+= entry-intc.o</div><div class='ctx'> obj-$(CONFIG_ARCH_SH7377)	+= entry-intc.o</div><div class='ctx'> obj-$(CONFIG_ARCH_SH7372)	+= entry-intc.o</div><div class='del'>-obj-$(CONFIG_ARCH_SH73A0)	+= entry-gic.o</div><div class='add'>+obj-$(CONFIG_ARCH_R8A7740)	+= entry-intc.o</div><div class='ctx'> </div><div class='ctx'> # PM objects</div><div class='ctx'> obj-$(CONFIG_SUSPEND)		+= suspend.o</div><div class='ctx'> obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o</div><div class='ctx'> obj-$(CONFIG_ARCH_SH7372)	+= pm-sh7372.o sleep-sh7372.o</div><div class='add'>+obj-$(CONFIG_ARCH_R8A7779)	+= pm-r8a7779.o</div><div class='ctx'> </div><div class='ctx'> # Board objects</div><div class='ctx'> obj-$(CONFIG_MACH_G3EVM)	+= board-g3evm.o</div><div class='hunk'>@@ -42,6 +48,8 @@ obj-$(CONFIG_MACH_AP4EVB)	+= board-ap4evb.o</div><div class='ctx'> obj-$(CONFIG_MACH_AG5EVM)	+= board-ag5evm.o</div><div class='ctx'> obj-$(CONFIG_MACH_MACKEREL)	+= board-mackerel.o</div><div class='ctx'> obj-$(CONFIG_MACH_KOTA2)	+= board-kota2.o</div><div class='add'>+obj-$(CONFIG_MACH_BONITO)	+= board-bonito.o</div><div class='add'>+obj-$(CONFIG_MACH_MARZEN)	+= board-marzen.o</div><div class='ctx'> </div><div class='ctx'> # Framework support</div><div class='ctx'> obj-$(CONFIG_SMP)		+= $(smp-y)</div><div class='head'>diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c<br/>index 7119b87cbfa0..eff8a96c75ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/board-ag5evm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/board-ag5evm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/board-ag5evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/board-ag5evm.c</a></div><div class='hunk'>@@ -271,7 +271,7 @@ static struct sh_mobile_lcdc_info lcdc0_info = {</div><div class='ctx'> 		.flags = LCDC_FLAGS_DWPOL,</div><div class='ctx'> 		.lcd_size_cfg.width = 44,</div><div class='ctx'> 		.lcd_size_cfg.height = 79,</div><div class='del'>-		.bpp = 16,</div><div class='add'>+		.fourcc = V4L2_PIX_FMT_RGB565,</div><div class='ctx'> 		.lcd_cfg = lcdc0_modes,</div><div class='ctx'> 		.num_cfg = ARRAY_SIZE(lcdc0_modes),</div><div class='ctx'> 		.board_cfg = {</div><div class='hunk'>@@ -321,12 +321,46 @@ static struct resource mipidsi0_resources[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define DSI0PHYCR	0xe615006c</div><div class='add'>+static int sh_mipi_set_dot_clock(struct platform_device *pdev,</div><div class='add'>+				 void __iomem *base,</div><div class='add'>+				 int enable)</div><div class='add'>+{</div><div class='add'>+	struct clk *pck;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	pck = clk_get(&amp;pdev-&gt;dev, "dsip_clk");</div><div class='add'>+	if (IS_ERR(pck)) {</div><div class='add'>+		ret = PTR_ERR(pck);</div><div class='add'>+		goto sh_mipi_set_dot_clock_pck_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		clk_set_rate(pck, clk_round_rate(pck,  24000000));</div><div class='add'>+		__raw_writel(0x2a809010, DSI0PHYCR);</div><div class='add'>+		clk_enable(pck);</div><div class='add'>+	} else {</div><div class='add'>+		clk_disable(pck);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+	clk_put(pck);</div><div class='add'>+</div><div class='add'>+sh_mipi_set_dot_clock_pck_err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sh_mipi_dsi_info mipidsi0_info = {</div><div class='ctx'> 	.data_format	= MIPI_RGB888,</div><div class='ctx'> 	.lcd_chan	= &amp;lcdc0_info.ch[0],</div><div class='add'>+	.lane		= 2,</div><div class='ctx'> 	.vsynw_offset	= 20,</div><div class='ctx'> 	.clksrc		= 1,</div><div class='del'>-	.flags		= SH_MIPI_DSI_HSABM,</div><div class='add'>+	.flags		= SH_MIPI_DSI_HSABM		|</div><div class='add'>+			  SH_MIPI_DSI_SYNC_PULSES_MODE	|</div><div class='add'>+			  SH_MIPI_DSI_HSbyteCLK,</div><div class='add'>+	.set_dot_clock	= sh_mipi_set_dot_clock,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device mipidsi0_device = {</div><div class='hunk'>@@ -466,16 +500,12 @@ static struct map_desc ag5evm_io_desc[] __initdata = {</div><div class='ctx'> static void __init ag5evm_map_io(void)</div><div class='ctx'> {</div><div class='ctx'> 	iotable_init(ag5evm_io_desc, ARRAY_SIZE(ag5evm_io_desc));</div><div class='del'>-	/* DMA memory at 0xf6000000 - 0xffdfffff */</div><div class='del'>-	init_consistent_dma_size(158 &lt;&lt; 20);</div><div class='ctx'> </div><div class='ctx'> 	/* setup early devices and console here as well */</div><div class='ctx'> 	sh73a0_add_early_devices();</div><div class='ctx'> 	shmobile_setup_console();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define DSI0PHYCR	0xe615006c</div><div class='del'>-</div><div class='ctx'> static void __init ag5evm_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	sh73a0_pinmux_init();</div><div class='hunk'>@@ -556,9 +586,6 @@ static void __init ag5evm_init(void)</div><div class='ctx'> 	gpio_direction_output(GPIO_PORT235, 0);</div><div class='ctx'> 	lcd_backlight_reset();</div><div class='ctx'> </div><div class='del'>-	/* MIPI-DSI clock setup */</div><div class='del'>-	__raw_writel(0x2a809010, DSI0PHYCR);</div><div class='del'>-</div><div class='ctx'> 	/* enable SDHI0 on CN15 [SD I/F] */</div><div class='ctx'> 	gpio_request(GPIO_FN_SDHICD0, NULL);</div><div class='ctx'> 	gpio_request(GPIO_FN_SDHIWP0, NULL);</div><div class='hunk'>@@ -609,7 +636,7 @@ MACHINE_START(AG5EVM, "ag5evm")</div><div class='ctx'> 	.map_io		= ag5evm_map_io,</div><div class='ctx'> 	.nr_irqs	= NR_IRQS_LEGACY,</div><div class='ctx'> 	.init_irq	= sh73a0_init_irq,</div><div class='del'>-	.handle_irq	= shmobile_handle_irq_gic,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= ag5evm_init,</div><div class='ctx'> 	.timer		= &amp;ag5evm_timer,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c<br/>index 4c865ece9ac4..aab0a349f759 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/board-ap4evb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/board-ap4evb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/board-ap4evb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/board-ap4evb.c</a></div><div class='hunk'>@@ -491,7 +491,7 @@ static struct sh_mobile_lcdc_info lcdc_info = {</div><div class='ctx'> 	.meram_dev = &amp;meram_info,</div><div class='ctx'> 	.ch[0] = {</div><div class='ctx'> 		.chan = LCDC_CHAN_MAINLCD,</div><div class='del'>-		.bpp = 16,</div><div class='add'>+		.fourcc = V4L2_PIX_FMT_RGB565,</div><div class='ctx'> 		.lcd_cfg = ap4evb_lcdc_modes,</div><div class='ctx'> 		.num_cfg = ARRAY_SIZE(ap4evb_lcdc_modes),</div><div class='ctx'> 		.meram_cfg = &amp;lcd_meram_cfg,</div><div class='hunk'>@@ -564,6 +564,30 @@ static struct platform_device keysc_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* MIPI-DSI */</div><div class='add'>+#define PHYCTRL		0x0070</div><div class='add'>+static int sh_mipi_set_dot_clock(struct platform_device *pdev,</div><div class='add'>+				 void __iomem *base,</div><div class='add'>+				 int enable)</div><div class='add'>+{</div><div class='add'>+	struct clk *pck = clk_get(&amp;pdev-&gt;dev, "dsip_clk");</div><div class='add'>+	void __iomem *phy =  base + PHYCTRL;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(pck))</div><div class='add'>+		return PTR_ERR(pck);</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		clk_set_rate(pck, clk_round_rate(pck, 24000000));</div><div class='add'>+		iowrite32(ioread32(phy) | (0xb &lt;&lt; 8), phy);</div><div class='add'>+		clk_enable(pck);</div><div class='add'>+	} else {</div><div class='add'>+		clk_disable(pck);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clk_put(pck);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct resource mipidsi0_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.start  = 0xffc60000,</div><div class='hunk'>@@ -580,7 +604,11 @@ static struct resource mipidsi0_resources[] = {</div><div class='ctx'> static struct sh_mipi_dsi_info mipidsi0_info = {</div><div class='ctx'> 	.data_format	= MIPI_RGB888,</div><div class='ctx'> 	.lcd_chan	= &amp;lcdc_info.ch[0],</div><div class='add'>+	.lane		= 2,</div><div class='ctx'> 	.vsynw_offset	= 17,</div><div class='add'>+	.flags		= SH_MIPI_DSI_SYNC_PULSES_MODE |</div><div class='add'>+			  SH_MIPI_DSI_HSbyteCLK,</div><div class='add'>+	.set_dot_clock	= sh_mipi_set_dot_clock,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device mipidsi0_device = {</div><div class='hunk'>@@ -762,9 +790,22 @@ static struct platform_device fsi_device = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct fsi_ak4642_info fsi2_ak4643_info = {</div><div class='add'>+	.name		= "AK4643",</div><div class='add'>+	.card		= "FSI2A-AK4643",</div><div class='add'>+	.cpu_dai	= "fsia-dai",</div><div class='add'>+	.codec		= "ak4642-codec.0-0013",</div><div class='add'>+	.platform	= "sh_fsi2",</div><div class='add'>+	.id		= FSI_PORT_A,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device fsi_ak4643_device = {</div><div class='del'>-	.name		= "sh_fsi2_a_ak4643",</div><div class='add'>+	.name	= "fsi-ak4642-audio",</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data	= &amp;fsi_info,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> static struct sh_mobile_meram_cfg hdmi_meram_cfg = {</div><div class='ctx'> 	.icb[0] = {</div><div class='ctx'> 		.marker_icb     = 30,</div><div class='hunk'>@@ -785,7 +826,7 @@ static struct sh_mobile_lcdc_info sh_mobile_lcdc1_info = {</div><div class='ctx'> 	.meram_dev = &amp;meram_info,</div><div class='ctx'> 	.ch[0] = {</div><div class='ctx'> 		.chan = LCDC_CHAN_MAINLCD,</div><div class='del'>-		.bpp = 16,</div><div class='add'>+		.fourcc = V4L2_PIX_FMT_RGB565,</div><div class='ctx'> 		.interface_type = RGB24,</div><div class='ctx'> 		.clock_divider = 1,</div><div class='ctx'> 		.flags = LCDC_FLAGS_DWPOL,</div><div class='hunk'>@@ -1172,8 +1213,6 @@ static struct map_desc ap4evb_io_desc[] __initdata = {</div><div class='ctx'> static void __init ap4evb_map_io(void)</div><div class='ctx'> {</div><div class='ctx'> 	iotable_init(ap4evb_io_desc, ARRAY_SIZE(ap4evb_io_desc));</div><div class='del'>-	/* DMA memory at 0xf6000000 - 0xffdfffff */</div><div class='del'>-	init_consistent_dma_size(158 &lt;&lt; 20);</div><div class='ctx'> </div><div class='ctx'> 	/* setup early devices and console here as well */</div><div class='ctx'> 	sh7372_add_early_devices();</div><div class='head'>diff --git a/arch/arm/mach-shmobile/board-bonito.c b/arch/arm/mach-shmobile/board-bonito.c<br/>new file mode 100644<br/>index 000000000000..4d2201622323<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/board-bonito.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/board-bonito.c</a></div><div class='hunk'>@@ -0,0 +1,522 @@</div><div class='add'>+/*</div><div class='add'>+ * bonito board support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Renesas Solutions Corp.</div><div class='add'>+ * Copyright (C) 2011 Kuninori Morimoto &lt;kuninori.morimoto.gx@renesas.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; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='add'>+ *</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/i2c.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/irq.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/smsc911x.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/time.h&gt;</div><div class='add'>+#include &lt;asm/hardware/cache-l2x0.h&gt;</div><div class='add'>+#include &lt;mach/r8a7740.h&gt;</div><div class='add'>+#include &lt;video/sh_mobile_lcdc.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CS	Address		device			note</div><div class='add'>+ *----------------------------------------------------------------</div><div class='add'>+ * 0	0x0000_0000	NOR Flash (64MB)	SW12 : bit3 = OFF</div><div class='add'>+ * 2	0x0800_0000	ExtNOR (64MB)		SW12 : bit3 = OFF</div><div class='add'>+ * 4			-</div><div class='add'>+ * 5A			-</div><div class='add'>+ * 5B	0x1600_0000	SRAM (8MB)</div><div class='add'>+ * 6	0x1800_0000	FPGA (64K)</div><div class='add'>+ *	0x1801_0000	Ether (4KB)</div><div class='add'>+ *	0x1801_1000	USB (4KB)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SW12</div><div class='add'>+ *</div><div class='add'>+ *	bit1			bit2			bit3</div><div class='add'>+ *----------------------------------------------------------------------------</div><div class='add'>+ * ON	NOR WriteProtect	NAND WriteProtect	CS0 ExtNOR / CS2 NOR</div><div class='add'>+ * OFF	NOR Not WriteProtect	NAND Not WriteProtect	CS0 NOR    / CS2 ExtNOR</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SCIFA5 (CN42)</div><div class='add'>+ *</div><div class='add'>+ * S38.3 = ON</div><div class='add'>+ * S39.6 = ON</div><div class='add'>+ * S43.1 = ON</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * LCDC0 (CN3/CN4/CN7)</div><div class='add'>+ *</div><div class='add'>+ * S38.1 = OFF</div><div class='add'>+ * S38.2 = OFF</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FPGA</div><div class='add'>+ */</div><div class='add'>+#define IRQSR0		0x0020</div><div class='add'>+#define IRQSR1		0x0022</div><div class='add'>+#define IRQMR0		0x0030</div><div class='add'>+#define IRQMR1		0x0032</div><div class='add'>+#define BUSSWMR1	0x0070</div><div class='add'>+#define BUSSWMR2	0x0072</div><div class='add'>+#define BUSSWMR3	0x0074</div><div class='add'>+#define BUSSWMR4	0x0076</div><div class='add'>+</div><div class='add'>+#define LCDCR		0x10B4</div><div class='add'>+#define DEVRSTCR1	0x10D0</div><div class='add'>+#define DEVRSTCR2	0x10D2</div><div class='add'>+#define A1MDSR		0x10E0</div><div class='add'>+#define BVERR		0x1100</div><div class='add'>+</div><div class='add'>+/* FPGA IRQ */</div><div class='add'>+#define FPGA_IRQ_BASE		(512)</div><div class='add'>+#define FPGA_IRQ0		(FPGA_IRQ_BASE)</div><div class='add'>+#define FPGA_IRQ1		(FPGA_IRQ_BASE + 16)</div><div class='add'>+#define FPGA_ETH_IRQ		(FPGA_IRQ0 + 15)</div><div class='add'>+static u16 bonito_fpga_read(u32 offset)</div><div class='add'>+{</div><div class='add'>+	return __raw_readw(0xf0003000 + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bonito_fpga_write(u32 offset, u16 val)</div><div class='add'>+{</div><div class='add'>+	__raw_writew(val, 0xf0003000 + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bonito_fpga_irq_disable(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int irq = data-&gt;irq;</div><div class='add'>+	u32 addr = (irq &lt; 1016) ? IRQMR0 : IRQMR1;</div><div class='add'>+	int shift = irq % 16;</div><div class='add'>+</div><div class='add'>+	bonito_fpga_write(addr, bonito_fpga_read(addr) | (1 &lt;&lt; shift));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bonito_fpga_irq_enable(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int irq = data-&gt;irq;</div><div class='add'>+	u32 addr = (irq &lt; 1016) ? IRQMR0 : IRQMR1;</div><div class='add'>+	int shift = irq % 16;</div><div class='add'>+</div><div class='add'>+	bonito_fpga_write(addr, bonito_fpga_read(addr) &amp; ~(1 &lt;&lt; shift));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip bonito_fpga_irq_chip __read_mostly = {</div><div class='add'>+	.name		= "bonito FPGA",</div><div class='add'>+	.irq_mask	= bonito_fpga_irq_disable,</div><div class='add'>+	.irq_unmask	= bonito_fpga_irq_enable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void bonito_fpga_irq_demux(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	u32 val =  bonito_fpga_read(IRQSR1) &lt;&lt; 16 |</div><div class='add'>+		   bonito_fpga_read(IRQSR0);</div><div class='add'>+	u32 mask = bonito_fpga_read(IRQMR1) &lt;&lt; 16 |</div><div class='add'>+		   bonito_fpga_read(IRQMR0);</div><div class='add'>+</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	val &amp;= ~mask;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 32; i++) {</div><div class='add'>+		if (!(val &amp; (1 &lt;&lt; i)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		generic_handle_irq(FPGA_IRQ_BASE + i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bonito_fpga_init(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bonito_fpga_write(IRQMR0, 0xffff); /* mask all */</div><div class='add'>+	bonito_fpga_write(IRQMR1, 0xffff); /* mask all */</div><div class='add'>+</div><div class='add'>+	/* Device reset */</div><div class='add'>+	bonito_fpga_write(DEVRSTCR1,</div><div class='add'>+		   (1 &lt;&lt; 2));	/* Eth */</div><div class='add'>+</div><div class='add'>+	/* FPGA irq require special handling */</div><div class='add'>+	for (i = FPGA_IRQ_BASE; i &lt; FPGA_IRQ_BASE + 32; i++) {</div><div class='add'>+		irq_set_chip_and_handler_name(i, &amp;bonito_fpga_irq_chip,</div><div class='add'>+					      handle_level_irq, "level");</div><div class='add'>+		set_irq_flags(i, IRQF_VALID); /* yuck */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq_set_chained_handler(evt2irq(0x0340), bonito_fpga_irq_demux);</div><div class='add'>+	irq_set_irq_type(evt2irq(0x0340), IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+* PMIC settings</div><div class='add'>+*</div><div class='add'>+* FIXME</div><div class='add'>+*</div><div class='add'>+* bonito board needs some settings by pmic which use i2c access.</div><div class='add'>+* pmic settings use device_initcall() here for use it.</div><div class='add'>+*/</div><div class='add'>+static __u8 *pmic_settings = NULL;</div><div class='add'>+static __u8 pmic_do_2A[] = {</div><div class='add'>+	0x1C, 0x09,</div><div class='add'>+	0x1A, 0x80,</div><div class='add'>+	0xff, 0xff,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init pmic_init(void)</div><div class='add'>+{</div><div class='add'>+	struct i2c_adapter *a = i2c_get_adapter(0);</div><div class='add'>+	struct i2c_msg msg;</div><div class='add'>+	__u8 buf[2];</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	if (!pmic_settings)</div><div class='add'>+		return 0;</div><div class='add'>+	if (!a)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	msg.addr	= 0x46;</div><div class='add'>+	msg.buf		= buf;</div><div class='add'>+	msg.len		= 2;</div><div class='add'>+	msg.flags	= 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; ; i += 2) {</div><div class='add'>+		buf[0] = pmic_settings[i + 0];</div><div class='add'>+		buf[1] = pmic_settings[i + 1];</div><div class='add'>+</div><div class='add'>+		if ((0xff == buf[0]) &amp;&amp; (0xff == buf[1]))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ret = i2c_transfer(a, &amp;msg, 1);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			pr_err("i2c transfer fail\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+device_initcall(pmic_init);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * LCDC0</div><div class='add'>+ */</div><div class='add'>+static const struct fb_videomode lcdc0_mode = {</div><div class='add'>+	.name		= "WVGA Panel",</div><div class='add'>+	.xres		= 800,</div><div class='add'>+	.yres		= 480,</div><div class='add'>+	.left_margin	= 88,</div><div class='add'>+	.right_margin	= 40,</div><div class='add'>+	.hsync_len	= 128,</div><div class='add'>+	.upper_margin	= 20,</div><div class='add'>+	.lower_margin	= 5,</div><div class='add'>+	.vsync_len	= 5,</div><div class='add'>+	.sync		= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sh_mobile_lcdc_info lcdc0_info = {</div><div class='add'>+	.clock_source	= LCDC_CLK_BUS,</div><div class='add'>+	.ch[0] = {</div><div class='add'>+		.chan			= LCDC_CHAN_MAINLCD,</div><div class='add'>+		.bpp			= 16,</div><div class='add'>+		.interface_type		= RGB24,</div><div class='add'>+		.clock_divider		= 5,</div><div class='add'>+		.flags			= 0,</div><div class='add'>+		.lcd_cfg		= &amp;lcdc0_mode,</div><div class='add'>+		.num_cfg		= 1,</div><div class='add'>+		.lcd_size_cfg = {</div><div class='add'>+			.width	= 152,</div><div class='add'>+			.height = 91,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource lcdc0_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.name	= "LCDC0",</div><div class='add'>+		.start	= 0xfe940000,</div><div class='add'>+		.end	= 0xfe943fff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= intcs_evt2irq(0x0580),</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device lcdc0_device = {</div><div class='add'>+	.name		= "sh_mobile_lcdc_fb",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.resource	= lcdc0_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(lcdc0_resources),</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data	= &amp;lcdc0_info,</div><div class='add'>+		.coherent_dma_mask = ~0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SMSC 9221</div><div class='add'>+ */</div><div class='add'>+static struct resource smsc_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start		= 0x18010000,</div><div class='add'>+		.end		= 0x18011000 - 1,</div><div class='add'>+		.flags		= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start		= FPGA_ETH_IRQ,</div><div class='add'>+		.flags		= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct smsc911x_platform_config smsc_platdata = {</div><div class='add'>+	.flags		= SMSC911X_USE_16BIT,</div><div class='add'>+	.phy_interface	= PHY_INTERFACE_MODE_MII,</div><div class='add'>+	.irq_polarity	= SMSC911X_IRQ_POLARITY_ACTIVE_LOW,</div><div class='add'>+	.irq_type	= SMSC911X_IRQ_TYPE_PUSH_PULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device smsc_device = {</div><div class='add'>+	.name		= "smsc911x",</div><div class='add'>+	.dev  = {</div><div class='add'>+		.platform_data = &amp;smsc_platdata,</div><div class='add'>+	},</div><div class='add'>+	.resource	= smsc_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(smsc_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * core board devices</div><div class='add'>+ */</div><div class='add'>+static struct platform_device *bonito_core_devices[] __initdata = {</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * base board devices</div><div class='add'>+ */</div><div class='add'>+static struct platform_device *bonito_base_devices[] __initdata = {</div><div class='add'>+	&amp;lcdc0_device,</div><div class='add'>+	&amp;smsc_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * map I/O</div><div class='add'>+ */</div><div class='add'>+static struct map_desc bonito_io_desc[] __initdata = {</div><div class='add'>+	 /*</div><div class='add'>+	  * for CPGA/INTC/PFC</div><div class='add'>+	  * 0xe6000000-0xefffffff -&gt; 0xe6000000-0xefffffff</div><div class='add'>+	  */</div><div class='add'>+	{</div><div class='add'>+		.virtual	= 0xe6000000,</div><div class='add'>+		.pfn		= __phys_to_pfn(0xe6000000),</div><div class='add'>+		.length		= 160 &lt;&lt; 20,</div><div class='add'>+		.type		= MT_DEVICE_NONSHARED</div><div class='add'>+	},</div><div class='add'>+#ifdef CONFIG_CACHE_L2X0</div><div class='add'>+	/*</div><div class='add'>+	 * for l2x0_init()</div><div class='add'>+	 * 0xf0100000-0xf0101000 -&gt; 0xf0002000-0xf0003000</div><div class='add'>+	 */</div><div class='add'>+	{</div><div class='add'>+		.virtual	= 0xf0002000,</div><div class='add'>+		.pfn		= __phys_to_pfn(0xf0100000),</div><div class='add'>+		.length		= PAGE_SIZE,</div><div class='add'>+		.type		= MT_DEVICE_NONSHARED</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+	/*</div><div class='add'>+	 * for FPGA (0x1800000-0x19ffffff)</div><div class='add'>+	 * 0x18000000-0x18002000 -&gt; 0xf0003000-0xf0005000</div><div class='add'>+	 */</div><div class='add'>+	{</div><div class='add'>+		.virtual	= 0xf0003000,</div><div class='add'>+		.pfn		= __phys_to_pfn(0x18000000),</div><div class='add'>+		.length		= PAGE_SIZE * 2,</div><div class='add'>+		.type		= MT_DEVICE_NONSHARED</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init bonito_map_io(void)</div><div class='add'>+{</div><div class='add'>+	iotable_init(bonito_io_desc, ARRAY_SIZE(bonito_io_desc));</div><div class='add'>+</div><div class='add'>+	/* setup early devices and console here as well */</div><div class='add'>+	r8a7740_add_early_devices();</div><div class='add'>+	shmobile_setup_console();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * board init</div><div class='add'>+ */</div><div class='add'>+#define BIT_ON(sw, bit)		(sw &amp; (1 &lt;&lt; bit))</div><div class='add'>+#define BIT_OFF(sw, bit)	(!(sw &amp; (1 &lt;&lt; bit)))</div><div class='add'>+</div><div class='add'>+#define VCCQ1CR		0xE6058140</div><div class='add'>+#define VCCQ1LCDCR	0xE6058186</div><div class='add'>+</div><div class='add'>+static void __init bonito_init(void)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	r8a7740_pinmux_init();</div><div class='add'>+	bonito_fpga_init();</div><div class='add'>+</div><div class='add'>+	pmic_settings = pmic_do_2A;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * core board settings</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CACHE_L2X0</div><div class='add'>+	/* Early BRESP enable, Shared attribute override enable, 32K*8way */</div><div class='add'>+	l2x0_init(__io(0xf0002000), 0x40440000, 0x82000fff);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	r8a7740_add_standard_devices();</div><div class='add'>+</div><div class='add'>+	platform_add_devices(bonito_core_devices,</div><div class='add'>+			     ARRAY_SIZE(bonito_core_devices));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * base board settings</div><div class='add'>+	 */</div><div class='add'>+	gpio_request(GPIO_PORT176, NULL);</div><div class='add'>+	gpio_direction_input(GPIO_PORT176);</div><div class='add'>+	if (!gpio_get_value(GPIO_PORT176)) {</div><div class='add'>+		u16 bsw2;</div><div class='add'>+		u16 bsw3;</div><div class='add'>+		u16 bsw4;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * FPGA</div><div class='add'>+		 */</div><div class='add'>+		gpio_request(GPIO_FN_CS5B,		NULL);</div><div class='add'>+		gpio_request(GPIO_FN_CS6A,		NULL);</div><div class='add'>+		gpio_request(GPIO_FN_CS5A_PORT105,	NULL);</div><div class='add'>+		gpio_request(GPIO_FN_IRQ10,		NULL);</div><div class='add'>+</div><div class='add'>+		val = bonito_fpga_read(BVERR);</div><div class='add'>+		pr_info("bonito version: cpu %02x, base %02x\n",</div><div class='add'>+			((val &gt;&gt; 8) &amp; 0xFF),</div><div class='add'>+			((val &gt;&gt; 0) &amp; 0xFF));</div><div class='add'>+</div><div class='add'>+		bsw2 = bonito_fpga_read(BUSSWMR2);</div><div class='add'>+		bsw3 = bonito_fpga_read(BUSSWMR3);</div><div class='add'>+		bsw4 = bonito_fpga_read(BUSSWMR4);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * SCIFA5 (CN42)</div><div class='add'>+		 */</div><div class='add'>+		if (BIT_OFF(bsw2, 1) &amp;&amp;	/* S38.3 = ON */</div><div class='add'>+		    BIT_OFF(bsw3, 9) &amp;&amp;	/* S39.6 = ON */</div><div class='add'>+		    BIT_OFF(bsw4, 4)) {	/* S43.1 = ON */</div><div class='add'>+			gpio_request(GPIO_FN_SCIFA5_TXD_PORT91,	NULL);</div><div class='add'>+			gpio_request(GPIO_FN_SCIFA5_RXD_PORT92,	NULL);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * LCDC0 (CN3)</div><div class='add'>+		 */</div><div class='add'>+		if (BIT_ON(bsw2, 3) &amp;&amp;	/* S38.1 = OFF */</div><div class='add'>+		    BIT_ON(bsw2, 2)) {	/* S38.2 = OFF */</div><div class='add'>+			gpio_request(GPIO_FN_LCDC0_SELECT,	NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D0,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D1,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D2,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D3,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D4,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D5,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D6,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D7,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D8,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D9,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D10,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D11,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D12,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D13,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D14,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D15,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D16,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D17,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D18_PORT163,	NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D19_PORT162,	NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D20_PORT161,	NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D21_PORT158,	NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D22_PORT160,	NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_D23_PORT159,	NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_DCK,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_VSYN,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_HSYN,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_DISP,		NULL);</div><div class='add'>+			gpio_request(GPIO_FN_LCD0_LCLK_PORT165,	NULL);</div><div class='add'>+</div><div class='add'>+			gpio_request(GPIO_PORT61, NULL); /* LCDDON */</div><div class='add'>+			gpio_direction_output(GPIO_PORT61, 1);</div><div class='add'>+</div><div class='add'>+			/* backlight on */</div><div class='add'>+			bonito_fpga_write(LCDCR, 1);</div><div class='add'>+</div><div class='add'>+			/*  drivability Max */</div><div class='add'>+			__raw_writew(0x00FF , VCCQ1LCDCR);</div><div class='add'>+			__raw_writew(0xFFFF , VCCQ1CR);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		platform_add_devices(bonito_base_devices,</div><div class='add'>+				     ARRAY_SIZE(bonito_base_devices));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init bonito_timer_init(void)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+	u8 md_ck = 0;</div><div class='add'>+</div><div class='add'>+	/* read MD_CK value */</div><div class='add'>+	val = bonito_fpga_read(A1MDSR);</div><div class='add'>+	if (val &amp; (1 &lt;&lt; 10))</div><div class='add'>+		md_ck |= MD_CK2;</div><div class='add'>+	if (val &amp; (1 &lt;&lt; 9))</div><div class='add'>+		md_ck |= MD_CK1;</div><div class='add'>+	if (val &amp; (1 &lt;&lt; 8))</div><div class='add'>+		md_ck |= MD_CK0;</div><div class='add'>+</div><div class='add'>+	r8a7740_clock_init(md_ck);</div><div class='add'>+	shmobile_timer.init();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sys_timer bonito_timer = {</div><div class='add'>+	.init	= bonito_timer_init,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MACHINE_START(BONITO, "bonito")</div><div class='add'>+	.map_io		= bonito_map_io,</div><div class='add'>+	.init_irq	= r8a7740_init_irq,</div><div class='add'>+	.handle_irq	= shmobile_handle_irq_intc,</div><div class='add'>+	.init_machine	= bonito_init,</div><div class='add'>+	.timer		= &amp;bonito_timer,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-shmobile/board-g3evm.c b/arch/arm/mach-shmobile/board-g3evm.c<br/>index 8b620bf06221..72d557281b1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/board-g3evm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/board-g3evm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/board-g3evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/board-g3evm.c</a></div><div class='hunk'>@@ -261,8 +261,6 @@ static struct map_desc g3evm_io_desc[] __initdata = {</div><div class='ctx'> static void __init g3evm_map_io(void)</div><div class='ctx'> {</div><div class='ctx'> 	iotable_init(g3evm_io_desc, ARRAY_SIZE(g3evm_io_desc));</div><div class='del'>-	/* DMA memory at 0xf6000000 - 0xffdfffff */</div><div class='del'>-	init_consistent_dma_size(158 &lt;&lt; 20);</div><div class='ctx'> </div><div class='ctx'> 	/* setup early devices and console here as well */</div><div class='ctx'> 	sh7367_add_early_devices();</div><div class='head'>diff --git a/arch/arm/mach-shmobile/board-g4evm.c b/arch/arm/mach-shmobile/board-g4evm.c<br/>index 7719ddc5f591..2220b885cff5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/board-g4evm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/board-g4evm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/board-g4evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/board-g4evm.c</a></div><div class='hunk'>@@ -275,8 +275,6 @@ static struct map_desc g4evm_io_desc[] __initdata = {</div><div class='ctx'> static void __init g4evm_map_io(void)</div><div class='ctx'> {</div><div class='ctx'> 	iotable_init(g4evm_io_desc, ARRAY_SIZE(g4evm_io_desc));</div><div class='del'>-	/* DMA memory at 0xf6000000 - 0xffdfffff */</div><div class='del'>-	init_consistent_dma_size(158 &lt;&lt; 20);</div><div class='ctx'> </div><div class='ctx'> 	/* setup early devices and console here as well */</div><div class='ctx'> 	sh7377_add_early_devices();</div><div class='head'>diff --git a/arch/arm/mach-shmobile/board-kota2.c b/arch/arm/mach-shmobile/board-kota2.c<br/>index f44150b5ae46..857ceeec1bb0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/board-kota2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/board-kota2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/board-kota2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/board-kota2.c</a></div><div class='hunk'>@@ -551,7 +551,7 @@ MACHINE_START(KOTA2, "kota2")</div><div class='ctx'> 	.map_io		= kota2_map_io,</div><div class='ctx'> 	.nr_irqs	= NR_IRQS_LEGACY,</div><div class='ctx'> 	.init_irq	= sh73a0_init_irq,</div><div class='del'>-	.handle_irq	= shmobile_handle_irq_gic,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= kota2_init,</div><div class='ctx'> 	.timer		= &amp;kota2_timer,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c<br/>index 9c5e598e0e3d..9b42fbd10f8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/board-mackerel.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/board-mackerel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/board-mackerel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/board-mackerel.c</a></div><div class='hunk'>@@ -388,7 +388,7 @@ static struct sh_mobile_lcdc_info lcdc_info = {</div><div class='ctx'> 	.clock_source = LCDC_CLK_BUS,</div><div class='ctx'> 	.ch[0] = {</div><div class='ctx'> 		.chan = LCDC_CHAN_MAINLCD,</div><div class='del'>-		.bpp = 16,</div><div class='add'>+		.fourcc = V4L2_PIX_FMT_RGB565,</div><div class='ctx'> 		.lcd_cfg = mackerel_lcdc_modes,</div><div class='ctx'> 		.num_cfg = ARRAY_SIZE(mackerel_lcdc_modes),</div><div class='ctx'> 		.interface_type		= RGB24,</div><div class='hunk'>@@ -451,7 +451,7 @@ static struct sh_mobile_lcdc_info hdmi_lcdc_info = {</div><div class='ctx'> 	.clock_source = LCDC_CLK_EXTERNAL,</div><div class='ctx'> 	.ch[0] = {</div><div class='ctx'> 		.chan = LCDC_CHAN_MAINLCD,</div><div class='del'>-		.bpp = 16,</div><div class='add'>+		.fourcc = V4L2_PIX_FMT_RGB565,</div><div class='ctx'> 		.interface_type = RGB24,</div><div class='ctx'> 		.clock_divider = 1,</div><div class='ctx'> 		.flags = LCDC_FLAGS_DWPOL,</div><div class='hunk'>@@ -990,8 +990,20 @@ static struct platform_device fsi_device = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct fsi_ak4642_info fsi2_ak4643_info = {</div><div class='add'>+	.name		= "AK4643",</div><div class='add'>+	.card		= "FSI2A-AK4643",</div><div class='add'>+	.cpu_dai	= "fsia-dai",</div><div class='add'>+	.codec		= "ak4642-codec.0-0013",</div><div class='add'>+	.platform	= "sh_fsi2",</div><div class='add'>+	.id		= FSI_PORT_A,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device fsi_ak4643_device = {</div><div class='del'>-	.name		= "sh_fsi2_a_ak4643",</div><div class='add'>+	.name	= "fsi-ak4642-audio",</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data	= &amp;fsi2_ak4643_info,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1390,8 +1402,6 @@ static struct map_desc mackerel_io_desc[] __initdata = {</div><div class='ctx'> static void __init mackerel_map_io(void)</div><div class='ctx'> {</div><div class='ctx'> 	iotable_init(mackerel_io_desc, ARRAY_SIZE(mackerel_io_desc));</div><div class='del'>-	/* DMA memory at 0xf6000000 - 0xffdfffff */</div><div class='del'>-	init_consistent_dma_size(158 &lt;&lt; 20);</div><div class='ctx'> </div><div class='ctx'> 	/* setup early devices and console here as well */</div><div class='ctx'> 	sh7372_add_early_devices();</div><div class='head'>diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c<br/>new file mode 100644<br/>index 000000000000..f0e02c0ce99f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/board-marzen.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/board-marzen.c</a></div><div class='hunk'>@@ -0,0 +1,157 @@</div><div class='add'>+/*</div><div class='add'>+ * marzen board support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011  Renesas Solutions Corp.</div><div class='add'>+ * Copyright (C) 2011  Magnus Damm</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; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</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/irq.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.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/gpio.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/smsc911x.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/r8a7779.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/time.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='add'>+#include &lt;asm/traps.h&gt;</div><div class='add'>+</div><div class='add'>+/* SMSC LAN89218 */</div><div class='add'>+static struct resource smsc911x_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start		= 0x18000000, /* ExCS0 */</div><div class='add'>+		.end		= 0x180000ff, /* A1-&gt;A7 */</div><div class='add'>+		.flags		= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start		= gic_spi(28), /* IRQ 1 */</div><div class='add'>+		.flags		= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct smsc911x_platform_config smsc911x_platdata = {</div><div class='add'>+	.flags		= SMSC911X_USE_32BIT, /* 32-bit SW on 16-bit HW bus */</div><div class='add'>+	.phy_interface	= PHY_INTERFACE_MODE_MII,</div><div class='add'>+	.irq_polarity	= SMSC911X_IRQ_POLARITY_ACTIVE_LOW,</div><div class='add'>+	.irq_type	= SMSC911X_IRQ_TYPE_PUSH_PULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device eth_device = {</div><div class='add'>+	.name		= "smsc911x",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev  = {</div><div class='add'>+		.platform_data = &amp;smsc911x_platdata,</div><div class='add'>+	},</div><div class='add'>+	.resource	= smsc911x_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(smsc911x_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *marzen_devices[] __initdata = {</div><div class='add'>+	&amp;eth_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct map_desc marzen_io_desc[] __initdata = {</div><div class='add'>+	/* 2M entity map for 0xf0000000 (MPCORE) */</div><div class='add'>+	{</div><div class='add'>+		.virtual	= 0xf0000000,</div><div class='add'>+		.pfn		= __phys_to_pfn(0xf0000000),</div><div class='add'>+		.length		= SZ_2M,</div><div class='add'>+		.type		= MT_DEVICE_NONSHARED</div><div class='add'>+	},</div><div class='add'>+	/* 16M entity map for 0xfexxxxxx (DMAC-S/HPBREG/INTC2/LRAM/DBSC) */</div><div class='add'>+	{</div><div class='add'>+		.virtual	= 0xfe000000,</div><div class='add'>+		.pfn		= __phys_to_pfn(0xfe000000),</div><div class='add'>+		.length		= SZ_16M,</div><div class='add'>+		.type		= MT_DEVICE_NONSHARED</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init marzen_map_io(void)</div><div class='add'>+{</div><div class='add'>+	iotable_init(marzen_io_desc, ARRAY_SIZE(marzen_io_desc));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init marzen_init_early(void)</div><div class='add'>+{</div><div class='add'>+	r8a7779_add_early_devices();</div><div class='add'>+</div><div class='add'>+	/* Early serial console setup is not included here due to</div><div class='add'>+	 * memory map collisions. The SCIF serial ports in r8a7779</div><div class='add'>+	 * are difficult to entity map 1:1 due to collision with the</div><div class='add'>+	 * virtual memory range used by the coherent DMA code on ARM.</div><div class='add'>+	 *</div><div class='add'>+	 * Anyone wanting to debug early can remove UPF_IOREMAP from</div><div class='add'>+	 * the sh-sci serial console platform data, adjust mapbase</div><div class='add'>+	 * to a static M:N virt:phys mapping that needs to be added to</div><div class='add'>+	 * the mappings passed with iotable_init() above.</div><div class='add'>+	 *</div><div class='add'>+	 * Then add a call to shmobile_setup_console() from this function.</div><div class='add'>+	 *</div><div class='add'>+	 * As a final step pass earlyprint=sh-sci.2,115200 on the kernel</div><div class='add'>+	 * command line.</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init marzen_init(void)</div><div class='add'>+{</div><div class='add'>+	r8a7779_pinmux_init();</div><div class='add'>+</div><div class='add'>+	/* SCIF2 (CN18: DEBUG0) */</div><div class='add'>+	gpio_request(GPIO_FN_TX2_C, NULL);</div><div class='add'>+	gpio_request(GPIO_FN_RX2_C, NULL);</div><div class='add'>+</div><div class='add'>+	/* SCIF4 (CN19: DEBUG1) */</div><div class='add'>+	gpio_request(GPIO_FN_TX4, NULL);</div><div class='add'>+	gpio_request(GPIO_FN_RX4, NULL);</div><div class='add'>+</div><div class='add'>+	/* LAN89218 */</div><div class='add'>+	gpio_request(GPIO_FN_EX_CS0, NULL); /* nCS */</div><div class='add'>+	gpio_request(GPIO_FN_IRQ1_B, NULL); /* IRQ + PME */</div><div class='add'>+</div><div class='add'>+	r8a7779_add_standard_devices();</div><div class='add'>+	platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init marzen_timer_init(void)</div><div class='add'>+{</div><div class='add'>+	r8a7779_clock_init();</div><div class='add'>+	shmobile_timer.init();</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sys_timer marzen_timer = {</div><div class='add'>+	.init	= marzen_timer_init,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MACHINE_START(MARZEN, "marzen")</div><div class='add'>+	.map_io		= marzen_map_io,</div><div class='add'>+	.init_early	= marzen_init_early,</div><div class='add'>+	.nr_irqs	= NR_IRQS_LEGACY,</div><div class='add'>+	.init_irq	= r8a7779_init_irq,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='add'>+	.init_machine	= marzen_init,</div><div class='add'>+	.timer		= &amp;marzen_timer,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c<br/>new file mode 100644<br/>index 000000000000..3b35b9afc001<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/clock-r8a7740.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/clock-r8a7740.c</a></div><div class='hunk'>@@ -0,0 +1,382 @@</div><div class='add'>+/*</div><div class='add'>+ * R8A7740 processor support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011  Renesas Solutions Corp.</div><div class='add'>+ * Copyright (C) 2011  Kuninori Morimoto &lt;kuninori.morimoto.gx@renesas.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</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</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/io.h&gt;</div><div class='add'>+#include &lt;linux/sh_clk.h&gt;</div><div class='add'>+#include &lt;linux/clkdev.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/r8a7740.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *        |  MDx  |  XTAL1/EXTAL1   |  System   | EXTALR |</div><div class='add'>+ *  Clock |-------+-----------------+  clock    | 32.768 |   RCLK</div><div class='add'>+ *  Mode  | 2/1/0 | src         MHz |  source   |  KHz   |  source</div><div class='add'>+ * -------+-------+-----------------+-----------+--------+----------</div><div class='add'>+ *    0   | 0 0 0 | External  20~50 | XTAL1     |    O   |  EXTALR</div><div class='add'>+ *    1   | 0 0 1 | Crystal   20~30 | XTAL1     |    O   |  EXTALR</div><div class='add'>+ *    2   | 0 1 0 | External  40~50 | XTAL1 / 2 |    O   |  EXTALR</div><div class='add'>+ *    3   | 0 1 1 | Crystal   40~50 | XTAL1 / 2 |    O   |  EXTALR</div><div class='add'>+ *    4   | 1 0 0 | External  20~50 | XTAL1     |    x   |  XTAL1 / 1024</div><div class='add'>+ *    5   | 1 0 1 | Crystal   20~30 | XTAL1     |    x   |  XTAL1 / 1024</div><div class='add'>+ *    6   | 1 1 0 | External  40~50 | XTAL1 / 2 |    x   |  XTAL1 / 2048</div><div class='add'>+ *    7   | 1 1 1 | Crystal   40~50 | XTAL1 / 2 |    x   |  XTAL1 / 2048</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* CPG registers */</div><div class='add'>+#define FRQCRA		0xe6150000</div><div class='add'>+#define FRQCRB		0xe6150004</div><div class='add'>+#define FRQCRC		0xe61500e0</div><div class='add'>+#define PLLC01CR	0xe6150028</div><div class='add'>+</div><div class='add'>+#define SUBCKCR		0xe6150080</div><div class='add'>+</div><div class='add'>+#define MSTPSR0		0xe6150030</div><div class='add'>+#define MSTPSR1		0xe6150038</div><div class='add'>+#define MSTPSR2		0xe6150040</div><div class='add'>+#define MSTPSR3		0xe6150048</div><div class='add'>+#define MSTPSR4		0xe615004c</div><div class='add'>+#define SMSTPCR0	0xe6150130</div><div class='add'>+#define SMSTPCR1	0xe6150134</div><div class='add'>+#define SMSTPCR2	0xe6150138</div><div class='add'>+#define SMSTPCR3	0xe615013c</div><div class='add'>+#define SMSTPCR4	0xe6150140</div><div class='add'>+</div><div class='add'>+/* Fixed 32 KHz root clock from EXTALR pin */</div><div class='add'>+static struct clk extalr_clk = {</div><div class='add'>+	.rate	= 32768,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 25MHz default rate for the EXTAL1 root input clock.</div><div class='add'>+ * If needed, reset this with clk_set_rate() from the platform code.</div><div class='add'>+ */</div><div class='add'>+static struct clk extal1_clk = {</div><div class='add'>+	.rate	= 25000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 48MHz default rate for the EXTAL2 root input clock.</div><div class='add'>+ * If needed, reset this with clk_set_rate() from the platform code.</div><div class='add'>+ */</div><div class='add'>+static struct clk extal2_clk = {</div><div class='add'>+	.rate	= 48000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 27MHz default rate for the DV_CLKI root input clock.</div><div class='add'>+ * If needed, reset this with clk_set_rate() from the platform code.</div><div class='add'>+ */</div><div class='add'>+static struct clk dv_clk = {</div><div class='add'>+	.rate	= 27000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned long div_recalc(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	return clk-&gt;parent-&gt;rate / (int)(clk-&gt;priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk_ops div_clk_ops = {</div><div class='add'>+	.recalc	= div_recalc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* extal1 / 2 */</div><div class='add'>+static struct clk extal1_div2_clk = {</div><div class='add'>+	.ops	= &amp;div_clk_ops,</div><div class='add'>+	.priv	= (void *)2,</div><div class='add'>+	.parent	= &amp;extal1_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* extal1 / 1024 */</div><div class='add'>+static struct clk extal1_div1024_clk = {</div><div class='add'>+	.ops	= &amp;div_clk_ops,</div><div class='add'>+	.priv	= (void *)1024,</div><div class='add'>+	.parent	= &amp;extal1_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* extal1 / 2 / 1024 */</div><div class='add'>+static struct clk extal1_div2048_clk = {</div><div class='add'>+	.ops	= &amp;div_clk_ops,</div><div class='add'>+	.priv	= (void *)1024,</div><div class='add'>+	.parent	= &amp;extal1_div2_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* extal2 / 2 */</div><div class='add'>+static struct clk extal2_div2_clk = {</div><div class='add'>+	.ops	= &amp;div_clk_ops,</div><div class='add'>+	.priv	= (void *)2,</div><div class='add'>+	.parent	= &amp;extal2_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_ops followparent_clk_ops = {</div><div class='add'>+	.recalc	= followparent_recalc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Main clock */</div><div class='add'>+static struct clk system_clk = {</div><div class='add'>+	.ops	= &amp;followparent_clk_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk system_div2_clk = {</div><div class='add'>+	.ops	= &amp;div_clk_ops,</div><div class='add'>+	.priv	= (void *)2,</div><div class='add'>+	.parent	= &amp;system_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* r_clk */</div><div class='add'>+static struct clk r_clk = {</div><div class='add'>+	.ops	= &amp;followparent_clk_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* PLLC0/PLLC1 */</div><div class='add'>+static unsigned long pllc01_recalc(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	unsigned long mult = 1;</div><div class='add'>+</div><div class='add'>+	if (__raw_readl(PLLC01CR) &amp; (1 &lt;&lt; 14))</div><div class='add'>+		mult = ((__raw_readl(clk-&gt;enable_reg) &gt;&gt; 24) &amp; 0x7f) + 1;</div><div class='add'>+</div><div class='add'>+	return clk-&gt;parent-&gt;rate * mult;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk_ops pllc01_clk_ops = {</div><div class='add'>+	.recalc		= pllc01_recalc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk pllc0_clk = {</div><div class='add'>+	.ops		= &amp;pllc01_clk_ops,</div><div class='add'>+	.flags		= CLK_ENABLE_ON_INIT,</div><div class='add'>+	.parent		= &amp;system_clk,</div><div class='add'>+	.enable_reg	= (void __iomem *)FRQCRC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk pllc1_clk = {</div><div class='add'>+	.ops		= &amp;pllc01_clk_ops,</div><div class='add'>+	.flags		= CLK_ENABLE_ON_INIT,</div><div class='add'>+	.parent		= &amp;system_div2_clk,</div><div class='add'>+	.enable_reg	= (void __iomem *)FRQCRA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* PLLC1 / 2 */</div><div class='add'>+static struct clk pllc1_div2_clk = {</div><div class='add'>+	.ops		= &amp;div_clk_ops,</div><div class='add'>+	.priv		= (void *)2,</div><div class='add'>+	.parent		= &amp;pllc1_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clk *main_clks[] = {</div><div class='add'>+	&amp;extalr_clk,</div><div class='add'>+	&amp;extal1_clk,</div><div class='add'>+	&amp;extal2_clk,</div><div class='add'>+	&amp;extal1_div2_clk,</div><div class='add'>+	&amp;extal1_div1024_clk,</div><div class='add'>+	&amp;extal1_div2048_clk,</div><div class='add'>+	&amp;extal2_div2_clk,</div><div class='add'>+	&amp;dv_clk,</div><div class='add'>+	&amp;system_clk,</div><div class='add'>+	&amp;system_div2_clk,</div><div class='add'>+	&amp;r_clk,</div><div class='add'>+	&amp;pllc0_clk,</div><div class='add'>+	&amp;pllc1_clk,</div><div class='add'>+	&amp;pllc1_div2_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void div4_kick(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	unsigned long value;</div><div class='add'>+</div><div class='add'>+	/* set KICK bit in FRQCRB to update hardware setting */</div><div class='add'>+	value = __raw_readl(FRQCRB);</div><div class='add'>+	value |= (1 &lt;&lt; 31);</div><div class='add'>+	__raw_writel(value, FRQCRB);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int divisors[] = { 2, 3, 4, 6, 8, 12, 16, 18,</div><div class='add'>+			  24, 32, 36, 48, 0, 72, 96, 0 };</div><div class='add'>+</div><div class='add'>+static struct clk_div_mult_table div4_div_mult_table = {</div><div class='add'>+	.divisors = divisors,</div><div class='add'>+	.nr_divisors = ARRAY_SIZE(divisors),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_div4_table div4_table = {</div><div class='add'>+	.div_mult_table = &amp;div4_div_mult_table,</div><div class='add'>+	.kick = div4_kick,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	DIV4_I, DIV4_ZG, DIV4_B, DIV4_M1, DIV4_HP,</div><div class='add'>+	DIV4_HPP, DIV4_S, DIV4_ZB, DIV4_M3, DIV4_CP,</div><div class='add'>+	DIV4_NR</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clk div4_clks[DIV4_NR] = {</div><div class='add'>+	[DIV4_I]	= SH_CLK_DIV4(&amp;pllc1_clk, FRQCRA, 20, 0x6fff, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[DIV4_ZG]	= SH_CLK_DIV4(&amp;pllc1_clk, FRQCRA, 16, 0x6fff, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[DIV4_B]	= SH_CLK_DIV4(&amp;pllc1_clk, FRQCRA,  8, 0x6fff, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[DIV4_M1]	= SH_CLK_DIV4(&amp;pllc1_clk, FRQCRA,  4, 0x6fff, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[DIV4_HP]	= SH_CLK_DIV4(&amp;pllc1_clk, FRQCRB,  4, 0x6fff, 0),</div><div class='add'>+	[DIV4_HPP]	= SH_CLK_DIV4(&amp;pllc1_clk, FRQCRC, 20, 0x6fff, 0),</div><div class='add'>+	[DIV4_S]	= SH_CLK_DIV4(&amp;pllc1_clk, FRQCRC, 12, 0x6fff, 0),</div><div class='add'>+	[DIV4_ZB]	= SH_CLK_DIV4(&amp;pllc1_clk, FRQCRC,  8, 0x6fff, 0),</div><div class='add'>+	[DIV4_M3]	= SH_CLK_DIV4(&amp;pllc1_clk, FRQCRC,  4, 0x6fff, 0),</div><div class='add'>+	[DIV4_CP]	= SH_CLK_DIV4(&amp;pllc1_clk, FRQCRC,  0, 0x6fff, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	DIV6_SUB,</div><div class='add'>+	DIV6_NR</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk div6_clks[DIV6_NR] = {</div><div class='add'>+	[DIV6_SUB]	= SH_CLK_DIV6(&amp;pllc1_div2_clk, SUBCKCR, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MSTP125,</div><div class='add'>+	MSTP116, MSTP111, MSTP100, MSTP117,</div><div class='add'>+</div><div class='add'>+	MSTP230,</div><div class='add'>+	MSTP222,</div><div class='add'>+	MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200,</div><div class='add'>+</div><div class='add'>+	MSTP329, MSTP323,</div><div class='add'>+</div><div class='add'>+	MSTP_NR</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk mstp_clks[MSTP_NR] = {</div><div class='add'>+	[MSTP125] = SH_CLK_MSTP32(&amp;div6_clks[DIV6_SUB],	SMSTPCR1, 25, 0), /* TMU0 */</div><div class='add'>+	[MSTP117] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],	SMSTPCR1, 17, 0), /* LCDC1 */</div><div class='add'>+	[MSTP116] = SH_CLK_MSTP32(&amp;div6_clks[DIV6_SUB],	SMSTPCR1, 16, 0), /* IIC0 */</div><div class='add'>+	[MSTP111] = SH_CLK_MSTP32(&amp;div6_clks[DIV6_SUB],	SMSTPCR1, 11, 0), /* TMU1 */</div><div class='add'>+	[MSTP100] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],	SMSTPCR1,  0, 0), /* LCDC0 */</div><div class='add'>+</div><div class='add'>+	[MSTP230] = SH_CLK_MSTP32(&amp;div6_clks[DIV6_SUB],	SMSTPCR2, 30, 0), /* SCIFA6 */</div><div class='add'>+	[MSTP222] = SH_CLK_MSTP32(&amp;div6_clks[DIV6_SUB],	SMSTPCR2, 22, 0), /* SCIFA7 */</div><div class='add'>+	[MSTP207] = SH_CLK_MSTP32(&amp;div6_clks[DIV6_SUB],	SMSTPCR2,  7, 0), /* SCIFA5 */</div><div class='add'>+	[MSTP206] = SH_CLK_MSTP32(&amp;div6_clks[DIV6_SUB],	SMSTPCR2,  6, 0), /* SCIFB */</div><div class='add'>+	[MSTP204] = SH_CLK_MSTP32(&amp;div6_clks[DIV6_SUB],	SMSTPCR2,  4, 0), /* SCIFA0 */</div><div class='add'>+	[MSTP203] = SH_CLK_MSTP32(&amp;div6_clks[DIV6_SUB],	SMSTPCR2,  3, 0), /* SCIFA1 */</div><div class='add'>+	[MSTP202] = SH_CLK_MSTP32(&amp;div6_clks[DIV6_SUB],	SMSTPCR2,  2, 0), /* SCIFA2 */</div><div class='add'>+	[MSTP201] = SH_CLK_MSTP32(&amp;div6_clks[DIV6_SUB],	SMSTPCR2,  1, 0), /* SCIFA3 */</div><div class='add'>+	[MSTP200] = SH_CLK_MSTP32(&amp;div6_clks[DIV6_SUB],	SMSTPCR2,  0, 0), /* SCIFA4 */</div><div class='add'>+</div><div class='add'>+	[MSTP329] = SH_CLK_MSTP32(&amp;r_clk,		SMSTPCR3, 29, 0), /* CMT10 */</div><div class='add'>+	[MSTP323] = SH_CLK_MSTP32(&amp;div6_clks[DIV6_SUB],	SMSTPCR3, 23, 0), /* IIC1 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_lookup lookups[] = {</div><div class='add'>+	/* main clocks */</div><div class='add'>+	CLKDEV_CON_ID("extalr",			&amp;extalr_clk),</div><div class='add'>+	CLKDEV_CON_ID("extal1",			&amp;extal1_clk),</div><div class='add'>+	CLKDEV_CON_ID("extal2",			&amp;extal2_clk),</div><div class='add'>+	CLKDEV_CON_ID("extal1_div2",		&amp;extal1_div2_clk),</div><div class='add'>+	CLKDEV_CON_ID("extal1_div1024",		&amp;extal1_div1024_clk),</div><div class='add'>+	CLKDEV_CON_ID("extal1_div2048",		&amp;extal1_div2048_clk),</div><div class='add'>+	CLKDEV_CON_ID("extal2_div2",		&amp;extal2_div2_clk),</div><div class='add'>+	CLKDEV_CON_ID("dv_clk",			&amp;dv_clk),</div><div class='add'>+	CLKDEV_CON_ID("system_clk",		&amp;system_clk),</div><div class='add'>+	CLKDEV_CON_ID("system_div2_clk",	&amp;system_div2_clk),</div><div class='add'>+	CLKDEV_CON_ID("r_clk",			&amp;r_clk),</div><div class='add'>+	CLKDEV_CON_ID("pllc0_clk",		&amp;pllc0_clk),</div><div class='add'>+	CLKDEV_CON_ID("pllc1_clk",		&amp;pllc1_clk),</div><div class='add'>+	CLKDEV_CON_ID("pllc1_div2_clk",		&amp;pllc1_div2_clk),</div><div class='add'>+</div><div class='add'>+	/* DIV4 clocks */</div><div class='add'>+	CLKDEV_CON_ID("i_clk",			&amp;div4_clks[DIV4_I]),</div><div class='add'>+	CLKDEV_CON_ID("zg_clk",			&amp;div4_clks[DIV4_ZG]),</div><div class='add'>+	CLKDEV_CON_ID("b_clk",			&amp;div4_clks[DIV4_B]),</div><div class='add'>+	CLKDEV_CON_ID("m1_clk",			&amp;div4_clks[DIV4_M1]),</div><div class='add'>+	CLKDEV_CON_ID("hp_clk",			&amp;div4_clks[DIV4_HP]),</div><div class='add'>+	CLKDEV_CON_ID("hpp_clk",		&amp;div4_clks[DIV4_HPP]),</div><div class='add'>+	CLKDEV_CON_ID("s_clk",			&amp;div4_clks[DIV4_S]),</div><div class='add'>+	CLKDEV_CON_ID("zb_clk",			&amp;div4_clks[DIV4_ZB]),</div><div class='add'>+	CLKDEV_CON_ID("m3_clk",			&amp;div4_clks[DIV4_M3]),</div><div class='add'>+	CLKDEV_CON_ID("cp_clk",			&amp;div4_clks[DIV4_CP]),</div><div class='add'>+</div><div class='add'>+	/* DIV6 clocks */</div><div class='add'>+	CLKDEV_CON_ID("sub_clk",		&amp;div6_clks[DIV6_SUB]),</div><div class='add'>+</div><div class='add'>+	/* MSTP32 clocks */</div><div class='add'>+	CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0",	&amp;mstp_clks[MSTP100]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_tmu.1",		&amp;mstp_clks[MSTP111]),</div><div class='add'>+	CLKDEV_DEV_ID("i2c-sh_mobile.0",	&amp;mstp_clks[MSTP116]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_mobile_lcdc_fb.1",	&amp;mstp_clks[MSTP117]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_tmu.0",		&amp;mstp_clks[MSTP125]),</div><div class='add'>+</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.4",		&amp;mstp_clks[MSTP200]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.3",		&amp;mstp_clks[MSTP201]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.2",		&amp;mstp_clks[MSTP202]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.1",		&amp;mstp_clks[MSTP203]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.0",		&amp;mstp_clks[MSTP204]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.8",		&amp;mstp_clks[MSTP206]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.5",		&amp;mstp_clks[MSTP207]),</div><div class='add'>+</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.7",		&amp;mstp_clks[MSTP222]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.6",		&amp;mstp_clks[MSTP230]),</div><div class='add'>+</div><div class='add'>+	CLKDEV_DEV_ID("sh_cmt.10",		&amp;mstp_clks[MSTP329]),</div><div class='add'>+	CLKDEV_DEV_ID("i2c-sh_mobile.1",	&amp;mstp_clks[MSTP323]),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init r8a7740_clock_init(u8 md_ck)</div><div class='add'>+{</div><div class='add'>+	int k, ret = 0;</div><div class='add'>+</div><div class='add'>+	/* detect system clock parent */</div><div class='add'>+	if (md_ck &amp; MD_CK1)</div><div class='add'>+		system_clk.parent = &amp;extal1_div2_clk;</div><div class='add'>+	else</div><div class='add'>+		system_clk.parent = &amp;extal1_clk;</div><div class='add'>+</div><div class='add'>+	/* detect RCLK parent */</div><div class='add'>+	switch (md_ck &amp; (MD_CK2 | MD_CK1)) {</div><div class='add'>+	case MD_CK2 | MD_CK1:</div><div class='add'>+		r_clk.parent = &amp;extal1_div2048_clk;</div><div class='add'>+		break;</div><div class='add'>+	case MD_CK2:</div><div class='add'>+		r_clk.parent = &amp;extal1_div1024_clk;</div><div class='add'>+		break;</div><div class='add'>+	case MD_CK1:</div><div class='add'>+	default:</div><div class='add'>+		r_clk.parent = &amp;extalr_clk;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (k = 0; !ret &amp;&amp; (k &lt; ARRAY_SIZE(main_clks)); k++)</div><div class='add'>+		ret = clk_register(main_clks[k]);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = sh_clk_div4_register(div4_clks, DIV4_NR, &amp;div4_table);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = sh_clk_div6_register(div6_clks, DIV6_NR);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);</div><div class='add'>+</div><div class='add'>+	clkdev_add_table(lookups, ARRAY_SIZE(lookups));</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		clk_init();</div><div class='add'>+	else</div><div class='add'>+		panic("failed to setup r8a7740 clocks\n");</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c<br/>new file mode 100644<br/>index 000000000000..b4b0e8cd096d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/clock-r8a7779.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/clock-r8a7779.c</a></div><div class='hunk'>@@ -0,0 +1,176 @@</div><div class='add'>+/*</div><div class='add'>+ * r8a7779 clock framework support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011  Renesas Solutions Corp.</div><div class='add'>+ * Copyright (C) 2011  Magnus Damm</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</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</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/io.h&gt;</div><div class='add'>+#include &lt;linux/sh_clk.h&gt;</div><div class='add'>+#include &lt;linux/clkdev.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+</div><div class='add'>+#define FRQMR   0xffc80014</div><div class='add'>+#define MSTPCR0 0xffc80030</div><div class='add'>+#define MSTPCR1 0xffc80034</div><div class='add'>+#define MSTPCR3 0xffc8003c</div><div class='add'>+#define MSTPSR1 0xffc80044</div><div class='add'>+#define MSTPSR4 0xffc80048</div><div class='add'>+#define MSTPSR6 0xffc8004c</div><div class='add'>+#define MSTPCR4 0xffc80050</div><div class='add'>+#define MSTPCR5 0xffc80054</div><div class='add'>+#define MSTPCR6 0xffc80058</div><div class='add'>+#define MSTPCR7 0xffc80040</div><div class='add'>+</div><div class='add'>+/* ioremap() through clock mapping mandatory to avoid</div><div class='add'>+ * collision with ARM coherent DMA virtual memory range.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct clk_mapping cpg_mapping = {</div><div class='add'>+	.phys	= 0xffc80000,</div><div class='add'>+	.len	= 0x80,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Default rate for the root input clock, reset this with clk_set_rate()</div><div class='add'>+ * from the platform code.</div><div class='add'>+ */</div><div class='add'>+static struct clk plla_clk = {</div><div class='add'>+	.rate		= 1500000000,</div><div class='add'>+	.mapping	= &amp;cpg_mapping,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk *main_clks[] = {</div><div class='add'>+	&amp;plla_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int divisors[] = { 0, 0, 0, 6, 8, 12, 16, 0, 24, 32, 36, 0, 0, 0, 0, 0 };</div><div class='add'>+</div><div class='add'>+static struct clk_div_mult_table div4_div_mult_table = {</div><div class='add'>+	.divisors = divisors,</div><div class='add'>+	.nr_divisors = ARRAY_SIZE(divisors),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_div4_table div4_table = {</div><div class='add'>+	.div_mult_table = &amp;div4_div_mult_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum { DIV4_S, DIV4_OUT, DIV4_S4, DIV4_S3, DIV4_S1, DIV4_P, DIV4_NR };</div><div class='add'>+</div><div class='add'>+static struct clk div4_clks[DIV4_NR] = {</div><div class='add'>+	[DIV4_S]	= SH_CLK_DIV4(&amp;plla_clk, FRQMR, 20,</div><div class='add'>+				      0x0018, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[DIV4_OUT]	= SH_CLK_DIV4(&amp;plla_clk, FRQMR, 16,</div><div class='add'>+				      0x0700, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[DIV4_S4]	= SH_CLK_DIV4(&amp;plla_clk, FRQMR, 12,</div><div class='add'>+				      0x0040, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[DIV4_S3]	= SH_CLK_DIV4(&amp;plla_clk, FRQMR, 8,</div><div class='add'>+				      0x0010, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[DIV4_S1]	= SH_CLK_DIV4(&amp;plla_clk, FRQMR, 4,</div><div class='add'>+				      0x0060, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[DIV4_P]	= SH_CLK_DIV4(&amp;plla_clk, FRQMR, 0,</div><div class='add'>+				      0x0300, CLK_ENABLE_ON_INIT),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum { MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021,</div><div class='add'>+	MSTP016, MSTP015, MSTP014,</div><div class='add'>+	MSTP_NR };</div><div class='add'>+</div><div class='add'>+static struct clk mstp_clks[MSTP_NR] = {</div><div class='add'>+	[MSTP026] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P], MSTPCR0, 26, 0), /* SCIF0 */</div><div class='add'>+	[MSTP025] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P], MSTPCR0, 25, 0), /* SCIF1 */</div><div class='add'>+	[MSTP024] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P], MSTPCR0, 24, 0), /* SCIF2 */</div><div class='add'>+	[MSTP023] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P], MSTPCR0, 23, 0), /* SCIF3 */</div><div class='add'>+	[MSTP022] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P], MSTPCR0, 22, 0), /* SCIF4 */</div><div class='add'>+	[MSTP021] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P], MSTPCR0, 21, 0), /* SCIF5 */</div><div class='add'>+	[MSTP016] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P], MSTPCR0, 16, 0), /* TMU0 */</div><div class='add'>+	[MSTP015] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P], MSTPCR0, 15, 0), /* TMU1 */</div><div class='add'>+	[MSTP014] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P], MSTPCR0, 14, 0), /* TMU2 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned long mul4_recalc(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	return clk-&gt;parent-&gt;rate * 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk_ops mul4_clk_ops = {</div><div class='add'>+	.recalc		= mul4_recalc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clk clkz_clk = {</div><div class='add'>+	.ops		= &amp;mul4_clk_ops,</div><div class='add'>+	.parent		= &amp;div4_clks[DIV4_S],</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clk clkzs_clk = {</div><div class='add'>+	/* clks x 4 / 4 = clks */</div><div class='add'>+	.parent		= &amp;div4_clks[DIV4_S],</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk *late_main_clks[] = {</div><div class='add'>+	&amp;clkz_clk,</div><div class='add'>+	&amp;clkzs_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk_lookup lookups[] = {</div><div class='add'>+	/* main clocks */</div><div class='add'>+	CLKDEV_CON_ID("plla_clk", &amp;plla_clk),</div><div class='add'>+	CLKDEV_CON_ID("clkz_clk", &amp;clkz_clk),</div><div class='add'>+	CLKDEV_CON_ID("clkzs_clk", &amp;clkzs_clk),</div><div class='add'>+</div><div class='add'>+	/* DIV4 clocks */</div><div class='add'>+	CLKDEV_CON_ID("shyway_clk",	&amp;div4_clks[DIV4_S]),</div><div class='add'>+	CLKDEV_CON_ID("bus_clk",	&amp;div4_clks[DIV4_OUT]),</div><div class='add'>+	CLKDEV_CON_ID("shyway4_clk",	&amp;div4_clks[DIV4_S4]),</div><div class='add'>+	CLKDEV_CON_ID("shyway3_clk",	&amp;div4_clks[DIV4_S3]),</div><div class='add'>+	CLKDEV_CON_ID("shyway1_clk",	&amp;div4_clks[DIV4_S1]),</div><div class='add'>+	CLKDEV_CON_ID("peripheral_clk",	&amp;div4_clks[DIV4_P]),</div><div class='add'>+</div><div class='add'>+	/* MSTP32 clocks */</div><div class='add'>+	CLKDEV_DEV_ID("sh_tmu.0", &amp;mstp_clks[MSTP016]), /* TMU00 */</div><div class='add'>+	CLKDEV_DEV_ID("sh_tmu.1", &amp;mstp_clks[MSTP016]), /* TMU01 */</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.0", &amp;mstp_clks[MSTP026]), /* SCIF0 */</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.1", &amp;mstp_clks[MSTP025]), /* SCIF1 */</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.2", &amp;mstp_clks[MSTP024]), /* SCIF2 */</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.3", &amp;mstp_clks[MSTP023]), /* SCIF3 */</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.4", &amp;mstp_clks[MSTP022]), /* SCIF4 */</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.5", &amp;mstp_clks[MSTP021]), /* SCIF6 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init r8a7779_clock_init(void)</div><div class='add'>+{</div><div class='add'>+	int k, ret = 0;</div><div class='add'>+</div><div class='add'>+	for (k = 0; !ret &amp;&amp; (k &lt; ARRAY_SIZE(main_clks)); k++)</div><div class='add'>+		ret = clk_register(main_clks[k]);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = sh_clk_div4_register(div4_clks, DIV4_NR, &amp;div4_table);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);</div><div class='add'>+</div><div class='add'>+	for (k = 0; !ret &amp;&amp; (k &lt; ARRAY_SIZE(late_main_clks)); k++)</div><div class='add'>+		ret = clk_register(late_main_clks[k]);</div><div class='add'>+</div><div class='add'>+	clkdev_add_table(lookups, ARRAY_SIZE(lookups));</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		clk_init();</div><div class='add'>+	else</div><div class='add'>+		panic("failed to setup r8a7779 clocks\n");</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c<br/>index 995a9c3aec8f..293456d8dcfd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/clock-sh7372.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/clock-sh7372.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/clock-sh7372.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/clock-sh7372.c</a></div><div class='hunk'>@@ -411,11 +411,11 @@ static struct clk *fsibckcr_parent[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk div6_reparent_clks[DIV6_REPARENT_NR] = {</div><div class='del'>-	[DIV6_HDMI] = SH_CLK_DIV6_EXT(&amp;pllc1_div2_clk, HDMICKCR, 0,</div><div class='add'>+	[DIV6_HDMI] = SH_CLK_DIV6_EXT(HDMICKCR, 0,</div><div class='ctx'> 				      hdmi_parent, ARRAY_SIZE(hdmi_parent), 6, 2),</div><div class='del'>-	[DIV6_FSIA] = SH_CLK_DIV6_EXT(&amp;pllc1_div2_clk, FSIACKCR, 0,</div><div class='add'>+	[DIV6_FSIA] = SH_CLK_DIV6_EXT(FSIACKCR, 0,</div><div class='ctx'> 				      fsiackcr_parent, ARRAY_SIZE(fsiackcr_parent), 6, 2),</div><div class='del'>-	[DIV6_FSIB] = SH_CLK_DIV6_EXT(&amp;pllc1_div2_clk, FSIBCKCR, 0,</div><div class='add'>+	[DIV6_FSIB] = SH_CLK_DIV6_EXT(FSIBCKCR, 0,</div><div class='ctx'> 				      fsibckcr_parent, ARRAY_SIZE(fsibckcr_parent), 6, 2),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -612,8 +612,8 @@ static struct clk_lookup lookups[] = {</div><div class='ctx'> 	CLKDEV_CON_ID("hdmi_clk", &amp;div6_reparent_clks[DIV6_HDMI]),</div><div class='ctx'> 	CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.0", &amp;div6_clks[DIV6_DSIT]),</div><div class='ctx'> 	CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.1", &amp;div6_clks[DIV6_DSIT]),</div><div class='del'>-	CLKDEV_ICK_ID("dsi0p_clk", "sh-mipi-dsi.0", &amp;div6_clks[DIV6_DSI0P]),</div><div class='del'>-	CLKDEV_ICK_ID("dsi1p_clk", "sh-mipi-dsi.1", &amp;div6_clks[DIV6_DSI1P]),</div><div class='add'>+	CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.0", &amp;div6_clks[DIV6_DSI0P]),</div><div class='add'>+	CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.1", &amp;div6_clks[DIV6_DSI1P]),</div><div class='ctx'> </div><div class='ctx'> 	/* MSTP32 clocks */</div><div class='ctx'> 	CLKDEV_DEV_ID("i2c-sh_mobile.2", &amp;mstp_clks[MSTP001]), /* IIC2 */</div><div class='head'>diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c<br/>index 1370a89ca358..afbead6a6e17 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/clock-sh73a0.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/clock-sh73a0.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/clock-sh73a0.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/clock-sh73a0.c</a></div><div class='hunk'>@@ -92,6 +92,24 @@ static struct clk_ops div2_clk_ops = {</div><div class='ctx'> 	.recalc		= div2_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static unsigned long div7_recalc(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	return clk-&gt;parent-&gt;rate / 7;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk_ops div7_clk_ops = {</div><div class='add'>+	.recalc		= div7_recalc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned long div13_recalc(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	return clk-&gt;parent-&gt;rate / 13;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk_ops div13_clk_ops = {</div><div class='add'>+	.recalc		= div13_recalc,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Divide extal1 by two */</div><div class='ctx'> static struct clk extal1_div2_clk = {</div><div class='ctx'> 	.ops		= &amp;div2_clk_ops,</div><div class='hunk'>@@ -174,12 +192,29 @@ static struct clk pll3_clk = {</div><div class='ctx'> 	.enable_bit	= 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Divide PLL1 by two */</div><div class='add'>+/* Divide PLL */</div><div class='ctx'> static struct clk pll1_div2_clk = {</div><div class='ctx'> 	.ops		= &amp;div2_clk_ops,</div><div class='ctx'> 	.parent		= &amp;pll1_clk,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk pll1_div7_clk = {</div><div class='add'>+	.ops		= &amp;div7_clk_ops,</div><div class='add'>+	.parent		= &amp;pll1_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk pll1_div13_clk = {</div><div class='add'>+	.ops		= &amp;div13_clk_ops,</div><div class='add'>+	.parent		= &amp;pll1_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* External input clock */</div><div class='add'>+struct clk sh73a0_extcki_clk = {</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clk sh73a0_extalr_clk = {</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk *main_clks[] = {</div><div class='ctx'> 	&amp;r_clk,</div><div class='ctx'> 	&amp;sh73a0_extal1_clk,</div><div class='hunk'>@@ -193,6 +228,10 @@ static struct clk *main_clks[] = {</div><div class='ctx'> 	&amp;pll2_clk,</div><div class='ctx'> 	&amp;pll3_clk,</div><div class='ctx'> 	&amp;pll1_div2_clk,</div><div class='add'>+	&amp;pll1_div7_clk,</div><div class='add'>+	&amp;pll1_div13_clk,</div><div class='add'>+	&amp;sh73a0_extcki_clk,</div><div class='add'>+	&amp;sh73a0_extalr_clk,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void div4_kick(struct clk *clk)</div><div class='hunk'>@@ -246,27 +285,84 @@ enum { DIV6_VCK1, DIV6_VCK2, DIV6_VCK3, DIV6_ZB1,</div><div class='ctx'> 	DIV6_DSIT, DIV6_DSI0P, DIV6_DSI1P,</div><div class='ctx'> 	DIV6_NR };</div><div class='ctx'> </div><div class='add'>+static struct clk *vck_parent[8] = {</div><div class='add'>+	[0] = &amp;pll1_div2_clk,</div><div class='add'>+	[1] = &amp;pll2_clk,</div><div class='add'>+	[2] = &amp;sh73a0_extcki_clk,</div><div class='add'>+	[3] = &amp;sh73a0_extal2_clk,</div><div class='add'>+	[4] = &amp;main_div2_clk,</div><div class='add'>+	[5] = &amp;sh73a0_extalr_clk,</div><div class='add'>+	[6] = &amp;main_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk *pll_parent[4] = {</div><div class='add'>+	[0] = &amp;pll1_div2_clk,</div><div class='add'>+	[1] = &amp;pll2_clk,</div><div class='add'>+	[2] = &amp;pll1_div13_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk *hsi_parent[4] = {</div><div class='add'>+	[0] = &amp;pll1_div2_clk,</div><div class='add'>+	[1] = &amp;pll2_clk,</div><div class='add'>+	[2] = &amp;pll1_div7_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk *pll_extal2_parent[] = {</div><div class='add'>+	[0] = &amp;pll1_div2_clk,</div><div class='add'>+	[1] = &amp;pll2_clk,</div><div class='add'>+	[2] = &amp;sh73a0_extal2_clk,</div><div class='add'>+	[3] = &amp;sh73a0_extal2_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk *dsi_parent[8] = {</div><div class='add'>+	[0] = &amp;pll1_div2_clk,</div><div class='add'>+	[1] = &amp;pll2_clk,</div><div class='add'>+	[2] = &amp;main_clk,</div><div class='add'>+	[3] = &amp;sh73a0_extal2_clk,</div><div class='add'>+	[4] = &amp;sh73a0_extcki_clk,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk div6_clks[DIV6_NR] = {</div><div class='del'>-	[DIV6_VCK1] = SH_CLK_DIV6(&amp;pll1_div2_clk, VCLKCR1, 0),</div><div class='del'>-	[DIV6_VCK2] = SH_CLK_DIV6(&amp;pll1_div2_clk, VCLKCR2, 0),</div><div class='del'>-	[DIV6_VCK3] = SH_CLK_DIV6(&amp;pll1_div2_clk, VCLKCR3, 0),</div><div class='del'>-	[DIV6_ZB1] = SH_CLK_DIV6(&amp;pll1_div2_clk, ZBCKCR, CLK_ENABLE_ON_INIT),</div><div class='del'>-	[DIV6_FLCTL] = SH_CLK_DIV6(&amp;pll1_div2_clk, FLCKCR, 0),</div><div class='del'>-	[DIV6_SDHI0] = SH_CLK_DIV6(&amp;pll1_div2_clk, SD0CKCR, 0),</div><div class='del'>-	[DIV6_SDHI1] = SH_CLK_DIV6(&amp;pll1_div2_clk, SD1CKCR, 0),</div><div class='del'>-	[DIV6_SDHI2] = SH_CLK_DIV6(&amp;pll1_div2_clk, SD2CKCR, 0),</div><div class='del'>-	[DIV6_FSIA] = SH_CLK_DIV6(&amp;pll1_div2_clk, FSIACKCR, 0),</div><div class='del'>-	[DIV6_FSIB] = SH_CLK_DIV6(&amp;pll1_div2_clk, FSIBCKCR, 0),</div><div class='del'>-	[DIV6_SUB] = SH_CLK_DIV6(&amp;sh73a0_extal2_clk, SUBCKCR, 0),</div><div class='del'>-	[DIV6_SPUA] = SH_CLK_DIV6(&amp;pll1_div2_clk, SPUACKCR, 0),</div><div class='del'>-	[DIV6_SPUV] = SH_CLK_DIV6(&amp;pll1_div2_clk, SPUVCKCR, 0),</div><div class='del'>-	[DIV6_MSU] = SH_CLK_DIV6(&amp;pll1_div2_clk, MSUCKCR, 0),</div><div class='del'>-	[DIV6_HSI] = SH_CLK_DIV6(&amp;pll1_div2_clk, HSICKCR, 0),</div><div class='del'>-	[DIV6_MFG1] = SH_CLK_DIV6(&amp;pll1_div2_clk, MFCK1CR, 0),</div><div class='del'>-	[DIV6_MFG2] = SH_CLK_DIV6(&amp;pll1_div2_clk, MFCK2CR, 0),</div><div class='del'>-	[DIV6_DSIT] = SH_CLK_DIV6(&amp;pll1_div2_clk, DSITCKCR, 0),</div><div class='del'>-	[DIV6_DSI0P] = SH_CLK_DIV6(&amp;pll1_div2_clk, DSI0PCKCR, 0),</div><div class='del'>-	[DIV6_DSI1P] = SH_CLK_DIV6(&amp;pll1_div2_clk, DSI1PCKCR, 0),</div><div class='add'>+	[DIV6_VCK1] = SH_CLK_DIV6_EXT(VCLKCR1, 0,</div><div class='add'>+			vck_parent, ARRAY_SIZE(vck_parent), 12, 3),</div><div class='add'>+	[DIV6_VCK2] = SH_CLK_DIV6_EXT(VCLKCR2, 0,</div><div class='add'>+			vck_parent, ARRAY_SIZE(vck_parent), 12, 3),</div><div class='add'>+	[DIV6_VCK3] = SH_CLK_DIV6_EXT(VCLKCR3, 0,</div><div class='add'>+			vck_parent, ARRAY_SIZE(vck_parent), 12, 3),</div><div class='add'>+	[DIV6_ZB1] = SH_CLK_DIV6_EXT(ZBCKCR, CLK_ENABLE_ON_INIT,</div><div class='add'>+			pll_parent, ARRAY_SIZE(pll_parent), 7, 1),</div><div class='add'>+	[DIV6_FLCTL] = SH_CLK_DIV6_EXT(FLCKCR, 0,</div><div class='add'>+			pll_parent, ARRAY_SIZE(pll_parent), 7, 1),</div><div class='add'>+	[DIV6_SDHI0] = SH_CLK_DIV6_EXT(SD0CKCR, 0,</div><div class='add'>+			pll_parent, ARRAY_SIZE(pll_parent), 6, 2),</div><div class='add'>+	[DIV6_SDHI1] = SH_CLK_DIV6_EXT(SD1CKCR, 0,</div><div class='add'>+			pll_parent, ARRAY_SIZE(pll_parent), 6, 2),</div><div class='add'>+	[DIV6_SDHI2] = SH_CLK_DIV6_EXT(SD2CKCR, 0,</div><div class='add'>+			pll_parent, ARRAY_SIZE(pll_parent), 6, 2),</div><div class='add'>+	[DIV6_FSIA] = SH_CLK_DIV6_EXT(FSIACKCR, 0,</div><div class='add'>+			pll_parent, ARRAY_SIZE(pll_parent), 6, 1),</div><div class='add'>+	[DIV6_FSIB] = SH_CLK_DIV6_EXT(FSIBCKCR, 0,</div><div class='add'>+			pll_parent, ARRAY_SIZE(pll_parent), 6, 1),</div><div class='add'>+	[DIV6_SUB] = SH_CLK_DIV6_EXT(SUBCKCR, 0,</div><div class='add'>+			pll_extal2_parent, ARRAY_SIZE(pll_extal2_parent), 6, 2),</div><div class='add'>+	[DIV6_SPUA] = SH_CLK_DIV6_EXT(SPUACKCR, 0,</div><div class='add'>+			pll_extal2_parent, ARRAY_SIZE(pll_extal2_parent), 6, 2),</div><div class='add'>+	[DIV6_SPUV] = SH_CLK_DIV6_EXT(SPUVCKCR, 0,</div><div class='add'>+			pll_extal2_parent, ARRAY_SIZE(pll_extal2_parent), 6, 2),</div><div class='add'>+	[DIV6_MSU] = SH_CLK_DIV6_EXT(MSUCKCR, 0,</div><div class='add'>+			pll_parent, ARRAY_SIZE(pll_parent), 7, 1),</div><div class='add'>+	[DIV6_HSI] = SH_CLK_DIV6_EXT(HSICKCR, 0,</div><div class='add'>+			hsi_parent, ARRAY_SIZE(hsi_parent), 6, 2),</div><div class='add'>+	[DIV6_MFG1] = SH_CLK_DIV6_EXT(MFCK1CR, 0,</div><div class='add'>+			pll_parent, ARRAY_SIZE(pll_parent), 7, 1),</div><div class='add'>+	[DIV6_MFG2] = SH_CLK_DIV6_EXT(MFCK2CR, 0,</div><div class='add'>+			pll_parent, ARRAY_SIZE(pll_parent), 7, 1),</div><div class='add'>+	[DIV6_DSIT] = SH_CLK_DIV6_EXT(DSITCKCR, 0,</div><div class='add'>+			pll_parent, ARRAY_SIZE(pll_parent), 7, 1),</div><div class='add'>+	[DIV6_DSI0P] = SH_CLK_DIV6_EXT(DSI0PCKCR, 0,</div><div class='add'>+			dsi_parent, ARRAY_SIZE(dsi_parent), 12, 3),</div><div class='add'>+	[DIV6_DSI1P] = SH_CLK_DIV6_EXT(DSI1PCKCR, 0,</div><div class='add'>+			dsi_parent, ARRAY_SIZE(dsi_parent), 12, 3),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum { MSTP001,</div><div class='hunk'>@@ -331,8 +427,8 @@ static struct clk_lookup lookups[] = {</div><div class='ctx'> 	CLKDEV_CON_ID("sdhi2_clk", &amp;div6_clks[DIV6_SDHI2]),</div><div class='ctx'> 	CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.0", &amp;div6_clks[DIV6_DSIT]),</div><div class='ctx'> 	CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.1", &amp;div6_clks[DIV6_DSIT]),</div><div class='del'>-	CLKDEV_ICK_ID("dsi0p_clk", "sh-mipi-dsi.0", &amp;div6_clks[DIV6_DSI0P]),</div><div class='del'>-	CLKDEV_ICK_ID("dsi1p_clk", "sh-mipi-dsi.1", &amp;div6_clks[DIV6_DSI1P]),</div><div class='add'>+	CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.0", &amp;div6_clks[DIV6_DSI0P]),</div><div class='add'>+	CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.1", &amp;div6_clks[DIV6_DSI1P]),</div><div class='ctx'> </div><div class='ctx'> 	/* MSTP32 clocks */</div><div class='ctx'> 	CLKDEV_DEV_ID("i2c-sh_mobile.2", &amp;mstp_clks[MSTP001]), /* I2C2 */</div><div class='hunk'>@@ -403,7 +499,7 @@ void __init sh73a0_clock_init(void)</div><div class='ctx'> 		ret = sh_clk_div4_register(div4_clks, DIV4_NR, &amp;div4_table);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = sh_clk_div6_register(div6_clks, DIV6_NR);</div><div class='add'>+		ret = sh_clk_div6_reparent_register(div6_clks, DIV6_NR);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);</div><div class='head'>diff --git a/arch/arm/mach-shmobile/entry-gic.S b/arch/arm/mach-shmobile/entry-gic.S<br/>deleted file mode 100644<br/>index e20239b08c83..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/entry-gic.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/entry-gic.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,18 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * ARM Interrupt demux handler using GIC</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2010 Magnus Damm</div><div class='del'>- * Copyright (C) 2011 Paul Mundt</div><div class='del'>- * Copyright (C) 2010 - 2011 Renesas Solutions Corp.</div><div class='del'>- *</div><div class='del'>- * This file is licensed under  the terms of the GNU General Public</div><div class='del'>- * License version 2. This program is licensed "as is" without any</div><div class='del'>- * warranty of any kind, whether express or implied.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;asm/entry-macro-multi.S&gt;</div><div class='del'>-#include &lt;asm/hardware/gic.h&gt;</div><div class='del'>-#include &lt;asm/hardware/entry-macro-gic.S&gt;</div><div class='del'>-</div><div class='del'>-	arch_irq_handler shmobile_handle_irq_gic</div><div class='head'>diff --git a/arch/arm/mach-shmobile/headsmp.S b/arch/arm/mach-shmobile/headsmp.S<br/>index 26079d933d91..6ac015c89206 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/headsmp.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/headsmp.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/headsmp.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/headsmp.S</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> </div><div class='del'>-	__INIT</div><div class='add'>+	__CPUINIT</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Reset vector for secondary CPUs.</div><div class='head'>diff --git a/arch/arm/mach-shmobile/hotplug.c b/arch/arm/mach-shmobile/hotplug.c<br/>index 238a0d97d2d5..828d22f3af57 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/hotplug.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/hotplug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/hotplug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/hotplug.c</a></div><div class='hunk'>@@ -12,14 +12,43 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+</div><div class='add'>+static cpumask_t dead_cpus;</div><div class='ctx'> </div><div class='ctx'> int platform_cpu_kill(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	return 1;</div><div class='add'>+	int k;</div><div class='add'>+</div><div class='add'>+	/* this function is running on another CPU than the offline target,</div><div class='add'>+	 * here we need wait for shutdown code in platform_cpu_die() to</div><div class='add'>+	 * finish before asking SoC-specific code to power off the CPU core.</div><div class='add'>+	 */</div><div class='add'>+	for (k = 0; k &lt; 1000; k++) {</div><div class='add'>+		if (cpumask_test_cpu(cpu, &amp;dead_cpus))</div><div class='add'>+			return shmobile_platform_cpu_kill(cpu);</div><div class='add'>+</div><div class='add'>+		mdelay(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void platform_cpu_die(unsigned int cpu)</div><div class='ctx'> {</div><div class='add'>+	/* hardware shutdown code running on the CPU that is being offlined */</div><div class='add'>+	flush_cache_all();</div><div class='add'>+	dsb();</div><div class='add'>+</div><div class='add'>+	/* notify platform_cpu_kill() that hardware shutdown is finished */</div><div class='add'>+	cpumask_set_cpu(cpu, &amp;dead_cpus);</div><div class='add'>+</div><div class='add'>+	/* wait for SoC code in platform_cpu_kill() to shut off CPU core</div><div class='add'>+	 * power. CPU bring up starts from the reset vector.</div><div class='add'>+	 */</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * here's the WFI</div><div class='hunk'>@@ -33,6 +62,7 @@ void platform_cpu_die(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> int platform_cpu_disable(unsigned int cpu)</div><div class='ctx'> {</div><div class='add'>+	cpumask_clear_cpu(cpu, &amp;dead_cpus);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * we don't allow CPU 0 to be shutdown (it is still too special</div><div class='ctx'> 	 * e.g. clock tick interrupts)</div><div class='head'>diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h<br/>index 834bd6cd508f..e4b945e271e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/include/mach/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/include/mach/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/include/mach/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/include/mach/common.h</a></div><div class='hunk'>@@ -4,10 +4,10 @@</div><div class='ctx'> extern struct sys_timer shmobile_timer;</div><div class='ctx'> extern void shmobile_setup_console(void);</div><div class='ctx'> extern void shmobile_secondary_vector(void);</div><div class='add'>+extern int shmobile_platform_cpu_kill(unsigned int cpu);</div><div class='ctx'> struct clk;</div><div class='ctx'> extern int clk_init(void);</div><div class='ctx'> extern void shmobile_handle_irq_intc(struct pt_regs *);</div><div class='del'>-extern void shmobile_handle_irq_gic(struct pt_regs *);</div><div class='ctx'> extern struct platform_suspend_ops shmobile_suspend_ops;</div><div class='ctx'> struct cpuidle_driver;</div><div class='ctx'> extern void (*shmobile_cpuidle_modes[])(void);</div><div class='hunk'>@@ -35,8 +35,8 @@ extern void sh7372_add_standard_devices(void);</div><div class='ctx'> extern void sh7372_clock_init(void);</div><div class='ctx'> extern void sh7372_pinmux_init(void);</div><div class='ctx'> extern void sh7372_pm_init(void);</div><div class='del'>-extern void sh7372_resume_core_standby_a3sm(void);</div><div class='del'>-extern int sh7372_do_idle_a3sm(unsigned long unused);</div><div class='add'>+extern void sh7372_resume_core_standby_sysc(void);</div><div class='add'>+extern int sh7372_do_idle_sysc(unsigned long sleep_mode);</div><div class='ctx'> extern struct clk sh7372_extal1_clk;</div><div class='ctx'> extern struct clk sh7372_extal2_clk;</div><div class='ctx'> </div><div class='hunk'>@@ -47,10 +47,31 @@ extern void sh73a0_clock_init(void);</div><div class='ctx'> extern void sh73a0_pinmux_init(void);</div><div class='ctx'> extern struct clk sh73a0_extal1_clk;</div><div class='ctx'> extern struct clk sh73a0_extal2_clk;</div><div class='add'>+extern struct clk sh73a0_extcki_clk;</div><div class='add'>+extern struct clk sh73a0_extalr_clk;</div><div class='ctx'> </div><div class='ctx'> extern unsigned int sh73a0_get_core_count(void);</div><div class='ctx'> extern void sh73a0_secondary_init(unsigned int cpu);</div><div class='ctx'> extern int sh73a0_boot_secondary(unsigned int cpu);</div><div class='ctx'> extern void sh73a0_smp_prepare_cpus(void);</div><div class='ctx'> </div><div class='add'>+extern void r8a7740_init_irq(void);</div><div class='add'>+extern void r8a7740_add_early_devices(void);</div><div class='add'>+extern void r8a7740_add_standard_devices(void);</div><div class='add'>+extern void r8a7740_clock_init(u8 md_ck);</div><div class='add'>+extern void r8a7740_pinmux_init(void);</div><div class='add'>+</div><div class='add'>+extern void r8a7779_init_irq(void);</div><div class='add'>+extern void r8a7779_add_early_devices(void);</div><div class='add'>+extern void r8a7779_add_standard_devices(void);</div><div class='add'>+extern void r8a7779_clock_init(void);</div><div class='add'>+extern void r8a7779_pinmux_init(void);</div><div class='add'>+extern void r8a7779_pm_init(void);</div><div class='add'>+</div><div class='add'>+extern unsigned int r8a7779_get_core_count(void);</div><div class='add'>+extern int r8a7779_platform_cpu_kill(unsigned int cpu);</div><div class='add'>+extern void r8a7779_secondary_init(unsigned int cpu);</div><div class='add'>+extern int r8a7779_boot_secondary(unsigned int cpu);</div><div class='add'>+extern void r8a7779_smp_prepare_cpus(void);</div><div class='add'>+</div><div class='ctx'> #endif /* __ARCH_MACH_COMMON_H */</div><div class='head'>diff --git a/arch/arm/mach-shmobile/include/mach/entry-macro.S b/arch/arm/mach-shmobile/include/mach/entry-macro.S<br/>index 8d4a416d4285..2a57b2964ee9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -18,14 +18,5 @@</div><div class='ctx'> 	.macro  disable_fiq</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro  get_irqnr_preamble, base, tmp</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro  get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro  test_for_ipi, irqnr, irqstat, base, tmp</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='ctx'> 	.macro  arch_ret_to_user, tmp1, tmp2</div><div class='ctx'> 	.endm</div><div class='head'>diff --git a/arch/arm/mach-shmobile/include/mach/gpio.h b/arch/arm/mach-shmobile/include/mach/gpio.h<br/>index 7bf0890e16ba..de795b42232a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/include/mach/gpio.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/include/mach/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/include/mach/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/include/mach/gpio.h</a></div><div class='hunk'>@@ -12,8 +12,6 @@</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='del'>-</div><div class='del'>-#define ARCH_NR_GPIOS 1024</div><div class='ctx'> #include &lt;linux/sh_pfc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_GPIOLIB</div><div class='head'>diff --git a/arch/arm/mach-shmobile/include/mach/r8a7740.h b/arch/arm/mach-shmobile/include/mach/r8a7740.h<br/>new file mode 100644<br/>index 000000000000..9d447abb969c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/include/mach/r8a7740.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/include/mach/r8a7740.h</a></div><div class='hunk'>@@ -0,0 +1,584 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2011  Renesas Solutions Corp.</div><div class='add'>+ * Copyright (C) 2011  Kuninori Morimoto &lt;kuninori.morimoto.gx@renesas.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; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ASM_R8A7740_H__</div><div class='add'>+#define __ASM_R8A7740_H__</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MD_CKx pin</div><div class='add'>+ */</div><div class='add'>+#define MD_CK2	(1 &lt;&lt; 2)</div><div class='add'>+#define MD_CK1	(1 &lt;&lt; 1)</div><div class='add'>+#define MD_CK0	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Pin Function Controller:</div><div class='add'>+ *	GPIO_FN_xx - GPIO used to select pin function</div><div class='add'>+ *	GPIO_PORTxx - GPIO mapped to real I/O pin on CPU</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	/* PORT */</div><div class='add'>+	GPIO_PORT0, GPIO_PORT1, GPIO_PORT2, GPIO_PORT3, GPIO_PORT4,</div><div class='add'>+	GPIO_PORT5, GPIO_PORT6, GPIO_PORT7, GPIO_PORT8, GPIO_PORT9,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT10, GPIO_PORT11, GPIO_PORT12, GPIO_PORT13, GPIO_PORT14,</div><div class='add'>+	GPIO_PORT15, GPIO_PORT16, GPIO_PORT17, GPIO_PORT18, GPIO_PORT19,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT20, GPIO_PORT21, GPIO_PORT22, GPIO_PORT23, GPIO_PORT24,</div><div class='add'>+	GPIO_PORT25, GPIO_PORT26, GPIO_PORT27, GPIO_PORT28, GPIO_PORT29,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT30, GPIO_PORT31, GPIO_PORT32, GPIO_PORT33, GPIO_PORT34,</div><div class='add'>+	GPIO_PORT35, GPIO_PORT36, GPIO_PORT37, GPIO_PORT38, GPIO_PORT39,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT40, GPIO_PORT41, GPIO_PORT42, GPIO_PORT43, GPIO_PORT44,</div><div class='add'>+	GPIO_PORT45, GPIO_PORT46, GPIO_PORT47, GPIO_PORT48, GPIO_PORT49,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT50, GPIO_PORT51, GPIO_PORT52, GPIO_PORT53, GPIO_PORT54,</div><div class='add'>+	GPIO_PORT55, GPIO_PORT56, GPIO_PORT57, GPIO_PORT58, GPIO_PORT59,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT60, GPIO_PORT61, GPIO_PORT62, GPIO_PORT63, GPIO_PORT64,</div><div class='add'>+	GPIO_PORT65, GPIO_PORT66, GPIO_PORT67, GPIO_PORT68, GPIO_PORT69,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT70, GPIO_PORT71, GPIO_PORT72, GPIO_PORT73, GPIO_PORT74,</div><div class='add'>+	GPIO_PORT75, GPIO_PORT76, GPIO_PORT77, GPIO_PORT78, GPIO_PORT79,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT80, GPIO_PORT81, GPIO_PORT82, GPIO_PORT83, GPIO_PORT84,</div><div class='add'>+	GPIO_PORT85, GPIO_PORT86, GPIO_PORT87, GPIO_PORT88, GPIO_PORT89,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT90, GPIO_PORT91, GPIO_PORT92, GPIO_PORT93, GPIO_PORT94,</div><div class='add'>+	GPIO_PORT95, GPIO_PORT96, GPIO_PORT97, GPIO_PORT98, GPIO_PORT99,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT100, GPIO_PORT101, GPIO_PORT102, GPIO_PORT103, GPIO_PORT104,</div><div class='add'>+	GPIO_PORT105, GPIO_PORT106, GPIO_PORT107, GPIO_PORT108, GPIO_PORT109,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT110, GPIO_PORT111, GPIO_PORT112, GPIO_PORT113, GPIO_PORT114,</div><div class='add'>+	GPIO_PORT115, GPIO_PORT116, GPIO_PORT117, GPIO_PORT118, GPIO_PORT119,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT120, GPIO_PORT121, GPIO_PORT122, GPIO_PORT123, GPIO_PORT124,</div><div class='add'>+	GPIO_PORT125, GPIO_PORT126, GPIO_PORT127, GPIO_PORT128, GPIO_PORT129,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT130, GPIO_PORT131, GPIO_PORT132, GPIO_PORT133, GPIO_PORT134,</div><div class='add'>+	GPIO_PORT135, GPIO_PORT136, GPIO_PORT137, GPIO_PORT138, GPIO_PORT139,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT140, GPIO_PORT141, GPIO_PORT142, GPIO_PORT143, GPIO_PORT144,</div><div class='add'>+	GPIO_PORT145, GPIO_PORT146, GPIO_PORT147, GPIO_PORT148, GPIO_PORT149,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT150, GPIO_PORT151, GPIO_PORT152, GPIO_PORT153, GPIO_PORT154,</div><div class='add'>+	GPIO_PORT155, GPIO_PORT156, GPIO_PORT157, GPIO_PORT158, GPIO_PORT159,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT160, GPIO_PORT161, GPIO_PORT162, GPIO_PORT163, GPIO_PORT164,</div><div class='add'>+	GPIO_PORT165, GPIO_PORT166, GPIO_PORT167, GPIO_PORT168, GPIO_PORT169,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT170, GPIO_PORT171, GPIO_PORT172, GPIO_PORT173, GPIO_PORT174,</div><div class='add'>+	GPIO_PORT175, GPIO_PORT176, GPIO_PORT177, GPIO_PORT178, GPIO_PORT179,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT180, GPIO_PORT181, GPIO_PORT182, GPIO_PORT183, GPIO_PORT184,</div><div class='add'>+	GPIO_PORT185, GPIO_PORT186, GPIO_PORT187, GPIO_PORT188, GPIO_PORT189,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT190, GPIO_PORT191, GPIO_PORT192, GPIO_PORT193, GPIO_PORT194,</div><div class='add'>+	GPIO_PORT195, GPIO_PORT196, GPIO_PORT197, GPIO_PORT198, GPIO_PORT199,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT200, GPIO_PORT201, GPIO_PORT202, GPIO_PORT203, GPIO_PORT204,</div><div class='add'>+	GPIO_PORT205, GPIO_PORT206, GPIO_PORT207, GPIO_PORT208, GPIO_PORT209,</div><div class='add'>+</div><div class='add'>+	GPIO_PORT210, GPIO_PORT211,</div><div class='add'>+</div><div class='add'>+	/* IRQ */</div><div class='add'>+	GPIO_FN_IRQ0_PORT2,	GPIO_FN_IRQ0_PORT13,</div><div class='add'>+	GPIO_FN_IRQ1,</div><div class='add'>+	GPIO_FN_IRQ2_PORT11,	GPIO_FN_IRQ2_PORT12,</div><div class='add'>+	GPIO_FN_IRQ3_PORT10,	GPIO_FN_IRQ3_PORT14,</div><div class='add'>+	GPIO_FN_IRQ4_PORT15,	GPIO_FN_IRQ4_PORT172,</div><div class='add'>+	GPIO_FN_IRQ5_PORT0,	GPIO_FN_IRQ5_PORT1,</div><div class='add'>+	GPIO_FN_IRQ6_PORT121,	GPIO_FN_IRQ6_PORT173,</div><div class='add'>+	GPIO_FN_IRQ7_PORT120,	GPIO_FN_IRQ7_PORT209,</div><div class='add'>+	GPIO_FN_IRQ8,</div><div class='add'>+	GPIO_FN_IRQ9_PORT118,	GPIO_FN_IRQ9_PORT210,</div><div class='add'>+	GPIO_FN_IRQ10,</div><div class='add'>+	GPIO_FN_IRQ11,</div><div class='add'>+	GPIO_FN_IRQ12_PORT42,	GPIO_FN_IRQ12_PORT97,</div><div class='add'>+	GPIO_FN_IRQ13_PORT64,	GPIO_FN_IRQ13_PORT98,</div><div class='add'>+	GPIO_FN_IRQ14_PORT63,	GPIO_FN_IRQ14_PORT99,</div><div class='add'>+	GPIO_FN_IRQ15_PORT62,	GPIO_FN_IRQ15_PORT100,</div><div class='add'>+	GPIO_FN_IRQ16_PORT68,	GPIO_FN_IRQ16_PORT211,</div><div class='add'>+	GPIO_FN_IRQ17,</div><div class='add'>+	GPIO_FN_IRQ18,</div><div class='add'>+	GPIO_FN_IRQ19,</div><div class='add'>+	GPIO_FN_IRQ20,</div><div class='add'>+	GPIO_FN_IRQ21,</div><div class='add'>+	GPIO_FN_IRQ22,</div><div class='add'>+	GPIO_FN_IRQ23,</div><div class='add'>+	GPIO_FN_IRQ24,</div><div class='add'>+	GPIO_FN_IRQ25,</div><div class='add'>+	GPIO_FN_IRQ26_PORT58,	GPIO_FN_IRQ26_PORT81,</div><div class='add'>+	GPIO_FN_IRQ27_PORT57,	GPIO_FN_IRQ27_PORT168,</div><div class='add'>+	GPIO_FN_IRQ28_PORT56,	GPIO_FN_IRQ28_PORT169,</div><div class='add'>+	GPIO_FN_IRQ29_PORT50,	GPIO_FN_IRQ29_PORT170,</div><div class='add'>+	GPIO_FN_IRQ30_PORT49,	GPIO_FN_IRQ30_PORT171,</div><div class='add'>+	GPIO_FN_IRQ31_PORT41,	GPIO_FN_IRQ31_PORT167,</div><div class='add'>+</div><div class='add'>+	/* Function */</div><div class='add'>+</div><div class='add'>+	/* DBGT */</div><div class='add'>+	GPIO_FN_DBGMDT2,	GPIO_FN_DBGMDT1,	GPIO_FN_DBGMDT0,</div><div class='add'>+	GPIO_FN_DBGMD10,	GPIO_FN_DBGMD11,	GPIO_FN_DBGMD20,</div><div class='add'>+	GPIO_FN_DBGMD21,</div><div class='add'>+</div><div class='add'>+	/* FSI */</div><div class='add'>+	GPIO_FN_FSIAISLD_PORT0,		/* FSIAISLD Port 0/5 */</div><div class='add'>+	GPIO_FN_FSIAISLD_PORT5,</div><div class='add'>+	GPIO_FN_FSIASPDIF_PORT9,	/* FSIASPDIF Port 9/18 */</div><div class='add'>+	GPIO_FN_FSIASPDIF_PORT18,</div><div class='add'>+	GPIO_FN_FSIAOSLD1,	GPIO_FN_FSIAOSLD2,</div><div class='add'>+	GPIO_FN_FSIAOLR,	GPIO_FN_FSIAOBT,</div><div class='add'>+	GPIO_FN_FSIAOSLD,	GPIO_FN_FSIAOMC,</div><div class='add'>+	GPIO_FN_FSIACK,		GPIO_FN_FSIAILR,</div><div class='add'>+	GPIO_FN_FSIAIBT,</div><div class='add'>+</div><div class='add'>+	/* FMSI */</div><div class='add'>+	GPIO_FN_FMSISLD_PORT1, /* FMSISLD Port 1/6 */</div><div class='add'>+	GPIO_FN_FMSISLD_PORT6,</div><div class='add'>+	GPIO_FN_FMSIILR,	GPIO_FN_FMSIIBT,</div><div class='add'>+	GPIO_FN_FMSIOLR,	GPIO_FN_FMSIOBT,</div><div class='add'>+	GPIO_FN_FMSICK,		GPIO_FN_FMSOILR,</div><div class='add'>+	GPIO_FN_FMSOIBT,	GPIO_FN_FMSOOLR,</div><div class='add'>+	GPIO_FN_FMSOOBT,	GPIO_FN_FMSOSLD,</div><div class='add'>+	GPIO_FN_FMSOCK,</div><div class='add'>+</div><div class='add'>+	/* SCIFA0 */</div><div class='add'>+	GPIO_FN_SCIFA0_SCK,	GPIO_FN_SCIFA0_CTS,</div><div class='add'>+	GPIO_FN_SCIFA0_RTS,	GPIO_FN_SCIFA0_RXD,</div><div class='add'>+	GPIO_FN_SCIFA0_TXD,</div><div class='add'>+</div><div class='add'>+	/* SCIFA1 */</div><div class='add'>+	GPIO_FN_SCIFA1_CTS,	GPIO_FN_SCIFA1_SCK,</div><div class='add'>+	GPIO_FN_SCIFA1_RXD,	GPIO_FN_SCIFA1_TXD,</div><div class='add'>+	GPIO_FN_SCIFA1_RTS,</div><div class='add'>+</div><div class='add'>+	/* SCIFA2 */</div><div class='add'>+	GPIO_FN_SCIFA2_SCK_PORT22, /* SCIFA2_SCK Port 22/199 */</div><div class='add'>+	GPIO_FN_SCIFA2_SCK_PORT199,</div><div class='add'>+	GPIO_FN_SCIFA2_RXD,	GPIO_FN_SCIFA2_TXD,</div><div class='add'>+	GPIO_FN_SCIFA2_CTS,	GPIO_FN_SCIFA2_RTS,</div><div class='add'>+</div><div class='add'>+	/* SCIFA3 */</div><div class='add'>+	GPIO_FN_SCIFA3_RTS_PORT105, /* MSEL5CR_8_0 */</div><div class='add'>+	GPIO_FN_SCIFA3_SCK_PORT116,</div><div class='add'>+	GPIO_FN_SCIFA3_CTS_PORT117,</div><div class='add'>+	GPIO_FN_SCIFA3_RXD_PORT174,</div><div class='add'>+	GPIO_FN_SCIFA3_TXD_PORT175,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_SCIFA3_RTS_PORT161, /* MSEL5CR_8_1 */</div><div class='add'>+	GPIO_FN_SCIFA3_SCK_PORT158,</div><div class='add'>+	GPIO_FN_SCIFA3_CTS_PORT162,</div><div class='add'>+	GPIO_FN_SCIFA3_RXD_PORT159,</div><div class='add'>+	GPIO_FN_SCIFA3_TXD_PORT160,</div><div class='add'>+</div><div class='add'>+	/* SCIFA4 */</div><div class='add'>+	GPIO_FN_SCIFA4_RXD_PORT12, /* MSEL5CR[12:11] = 00 */</div><div class='add'>+	GPIO_FN_SCIFA4_TXD_PORT13,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_SCIFA4_RXD_PORT204, /* MSEL5CR[12:11] = 01 */</div><div class='add'>+	GPIO_FN_SCIFA4_TXD_PORT203,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_SCIFA4_RXD_PORT94, /* MSEL5CR[12:11] = 10 */</div><div class='add'>+	GPIO_FN_SCIFA4_TXD_PORT93,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_SCIFA4_SCK_PORT21, /* SCIFA4_SCK Port 21/205 */</div><div class='add'>+	GPIO_FN_SCIFA4_SCK_PORT205,</div><div class='add'>+</div><div class='add'>+	/* SCIFA5 */</div><div class='add'>+	GPIO_FN_SCIFA5_TXD_PORT20, /* MSEL5CR[15:14] = 00 */</div><div class='add'>+	GPIO_FN_SCIFA5_RXD_PORT10,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_SCIFA5_RXD_PORT207, /* MSEL5CR[15:14] = 01 */</div><div class='add'>+	GPIO_FN_SCIFA5_TXD_PORT208,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_SCIFA5_TXD_PORT91, /* MSEL5CR[15:14] = 10 */</div><div class='add'>+	GPIO_FN_SCIFA5_RXD_PORT92,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_SCIFA5_SCK_PORT23, /* SCIFA5_SCK Port 23/206 */</div><div class='add'>+	GPIO_FN_SCIFA5_SCK_PORT206,</div><div class='add'>+</div><div class='add'>+	/* SCIFA6 */</div><div class='add'>+	GPIO_FN_SCIFA6_SCK,	GPIO_FN_SCIFA6_RXD,	GPIO_FN_SCIFA6_TXD,</div><div class='add'>+</div><div class='add'>+	/* SCIFA7 */</div><div class='add'>+	GPIO_FN_SCIFA7_TXD,	GPIO_FN_SCIFA7_RXD,</div><div class='add'>+</div><div class='add'>+	/* SCIFAB */</div><div class='add'>+	GPIO_FN_SCIFB_SCK_PORT190, /* MSEL5CR_17_0 */</div><div class='add'>+	GPIO_FN_SCIFB_RXD_PORT191,</div><div class='add'>+	GPIO_FN_SCIFB_TXD_PORT192,</div><div class='add'>+	GPIO_FN_SCIFB_RTS_PORT186,</div><div class='add'>+	GPIO_FN_SCIFB_CTS_PORT187,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_SCIFB_SCK_PORT2, /* MSEL5CR_17_1 */</div><div class='add'>+	GPIO_FN_SCIFB_RXD_PORT3,</div><div class='add'>+	GPIO_FN_SCIFB_TXD_PORT4,</div><div class='add'>+	GPIO_FN_SCIFB_RTS_PORT172,</div><div class='add'>+	GPIO_FN_SCIFB_CTS_PORT173,</div><div class='add'>+</div><div class='add'>+	/* LCD0 */</div><div class='add'>+	GPIO_FN_LCDC0_SELECT,</div><div class='add'>+	GPIO_FN_LCD0_D0,	GPIO_FN_LCD0_D1,	GPIO_FN_LCD0_D2,</div><div class='add'>+	GPIO_FN_LCD0_D3,	GPIO_FN_LCD0_D4,	GPIO_FN_LCD0_D5,</div><div class='add'>+	GPIO_FN_LCD0_D6,	GPIO_FN_LCD0_D7,	GPIO_FN_LCD0_D8,</div><div class='add'>+	GPIO_FN_LCD0_D9,	GPIO_FN_LCD0_D10,	GPIO_FN_LCD0_D11,</div><div class='add'>+	GPIO_FN_LCD0_D12,	GPIO_FN_LCD0_D13,	GPIO_FN_LCD0_D14,</div><div class='add'>+	GPIO_FN_LCD0_D15,	GPIO_FN_LCD0_D16,	GPIO_FN_LCD0_D17,</div><div class='add'>+	GPIO_FN_LCD0_DON,	GPIO_FN_LCD0_VCPWC,	GPIO_FN_LCD0_VEPWC,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_LCD0_DCK,	GPIO_FN_LCD0_VSYN, /* for RGB */</div><div class='add'>+	GPIO_FN_LCD0_HSYN,	GPIO_FN_LCD0_DISP, /* for RGB */</div><div class='add'>+</div><div class='add'>+	GPIO_FN_LCD0_WR,	GPIO_FN_LCD0_RD, /* for SYS */</div><div class='add'>+	GPIO_FN_LCD0_CS,	GPIO_FN_LCD0_RS, /* for SYS */</div><div class='add'>+</div><div class='add'>+	GPIO_FN_LCD0_D18_PORT163,	GPIO_FN_LCD0_D19_PORT162,</div><div class='add'>+	GPIO_FN_LCD0_D20_PORT161,	GPIO_FN_LCD0_D21_PORT158,</div><div class='add'>+	GPIO_FN_LCD0_D22_PORT160,	GPIO_FN_LCD0_D23_PORT159,</div><div class='add'>+	GPIO_FN_LCD0_LCLK_PORT165,	 /* MSEL5CR_6_1 */</div><div class='add'>+</div><div class='add'>+	GPIO_FN_LCD0_D18_PORT40,	GPIO_FN_LCD0_D19_PORT4,</div><div class='add'>+	GPIO_FN_LCD0_D20_PORT3,		GPIO_FN_LCD0_D21_PORT2,</div><div class='add'>+	GPIO_FN_LCD0_D22_PORT0,		GPIO_FN_LCD0_D23_PORT1,</div><div class='add'>+	GPIO_FN_LCD0_LCLK_PORT102,	/* MSEL5CR_6_0 */</div><div class='add'>+</div><div class='add'>+	/* LCD1 */</div><div class='add'>+	GPIO_FN_LCDC1_SELECT,</div><div class='add'>+	GPIO_FN_LCD1_D0,	GPIO_FN_LCD1_D1,	GPIO_FN_LCD1_D2,</div><div class='add'>+	GPIO_FN_LCD1_D3,	GPIO_FN_LCD1_D4,	GPIO_FN_LCD1_D5,</div><div class='add'>+	GPIO_FN_LCD1_D6,	GPIO_FN_LCD1_D7,	GPIO_FN_LCD1_D8,</div><div class='add'>+	GPIO_FN_LCD1_D9,	GPIO_FN_LCD1_D10,	GPIO_FN_LCD1_D11,</div><div class='add'>+	GPIO_FN_LCD1_D12,	GPIO_FN_LCD1_D13,	GPIO_FN_LCD1_D14,</div><div class='add'>+	GPIO_FN_LCD1_D15,	GPIO_FN_LCD1_D16,	GPIO_FN_LCD1_D17,</div><div class='add'>+	GPIO_FN_LCD1_D18,	GPIO_FN_LCD1_D19,	GPIO_FN_LCD1_D20,</div><div class='add'>+	GPIO_FN_LCD1_D21,	GPIO_FN_LCD1_D22,	GPIO_FN_LCD1_D23,</div><div class='add'>+	GPIO_FN_LCD1_DON,	GPIO_FN_LCD1_VCPWC,</div><div class='add'>+	GPIO_FN_LCD1_LCLK,	GPIO_FN_LCD1_VEPWC,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_LCD1_DCK,	GPIO_FN_LCD1_VSYN, /* for RGB */</div><div class='add'>+	GPIO_FN_LCD1_HSYN,	GPIO_FN_LCD1_DISP, /* for RGB */</div><div class='add'>+</div><div class='add'>+	GPIO_FN_LCD1_WR,	GPIO_FN_LCD1_RD, /* for SYS */</div><div class='add'>+	GPIO_FN_LCD1_CS,	GPIO_FN_LCD1_RS, /* for SYS */</div><div class='add'>+</div><div class='add'>+	/* RSPI */</div><div class='add'>+	GPIO_FN_RSPI_SSL0_A,	GPIO_FN_RSPI_SSL1_A,</div><div class='add'>+	GPIO_FN_RSPI_SSL2_A,	GPIO_FN_RSPI_SSL3_A,</div><div class='add'>+	GPIO_FN_RSPI_MOSI_A,	GPIO_FN_RSPI_MISO_A,</div><div class='add'>+	GPIO_FN_RSPI_CK_A,</div><div class='add'>+</div><div class='add'>+	/* VIO CKO */</div><div class='add'>+	GPIO_FN_VIO_CKO1,</div><div class='add'>+	GPIO_FN_VIO_CKO2,</div><div class='add'>+	GPIO_FN_VIO_CKO_1,</div><div class='add'>+	GPIO_FN_VIO_CKO,</div><div class='add'>+</div><div class='add'>+	/* VIO0 */</div><div class='add'>+	GPIO_FN_VIO0_D0,	GPIO_FN_VIO0_D1,	GPIO_FN_VIO0_D2,</div><div class='add'>+	GPIO_FN_VIO0_D3,	GPIO_FN_VIO0_D4,	GPIO_FN_VIO0_D5,</div><div class='add'>+	GPIO_FN_VIO0_D6,	GPIO_FN_VIO0_D7,	GPIO_FN_VIO0_D8,</div><div class='add'>+	GPIO_FN_VIO0_D9,	GPIO_FN_VIO0_D10,	GPIO_FN_VIO0_D11,</div><div class='add'>+	GPIO_FN_VIO0_D12,	GPIO_FN_VIO0_VD,	GPIO_FN_VIO0_HD,</div><div class='add'>+	GPIO_FN_VIO0_CLK,	GPIO_FN_VIO0_FIELD,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_VIO0_D13_PORT26, /* MSEL5CR_27_0 */</div><div class='add'>+	GPIO_FN_VIO0_D14_PORT25,</div><div class='add'>+	GPIO_FN_VIO0_D15_PORT24,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_VIO0_D13_PORT22, /* MSEL5CR_27_1 */</div><div class='add'>+	GPIO_FN_VIO0_D14_PORT95,</div><div class='add'>+	GPIO_FN_VIO0_D15_PORT96,</div><div class='add'>+</div><div class='add'>+	/* VIO1 */</div><div class='add'>+	GPIO_FN_VIO1_D0,	GPIO_FN_VIO1_D1,	GPIO_FN_VIO1_D2,</div><div class='add'>+	GPIO_FN_VIO1_D3,	GPIO_FN_VIO1_D4,	GPIO_FN_VIO1_D5,</div><div class='add'>+	GPIO_FN_VIO1_D6,	GPIO_FN_VIO1_D7,	GPIO_FN_VIO1_VD,</div><div class='add'>+	GPIO_FN_VIO1_HD,	GPIO_FN_VIO1_CLK,	GPIO_FN_VIO1_FIELD,</div><div class='add'>+</div><div class='add'>+	/* TPU0 */</div><div class='add'>+	GPIO_FN_TPU0TO0,	GPIO_FN_TPU0TO1,</div><div class='add'>+	GPIO_FN_TPU0TO3,</div><div class='add'>+	GPIO_FN_TPU0TO2_PORT66, /* TPU0TO2 Port 66/202 */</div><div class='add'>+	GPIO_FN_TPU0TO2_PORT202,</div><div class='add'>+</div><div class='add'>+	/* SSP1 0 */</div><div class='add'>+	GPIO_FN_STP0_IPD0,	GPIO_FN_STP0_IPD1,	GPIO_FN_STP0_IPD2,</div><div class='add'>+	GPIO_FN_STP0_IPD3,	GPIO_FN_STP0_IPD4,	GPIO_FN_STP0_IPD5,</div><div class='add'>+	GPIO_FN_STP0_IPD6,	GPIO_FN_STP0_IPD7,	GPIO_FN_STP0_IPEN,</div><div class='add'>+	GPIO_FN_STP0_IPCLK,	GPIO_FN_STP0_IPSYNC,</div><div class='add'>+</div><div class='add'>+	/* SSP1 1 */</div><div class='add'>+	GPIO_FN_STP1_IPD1,	GPIO_FN_STP1_IPD2,	GPIO_FN_STP1_IPD3,</div><div class='add'>+	GPIO_FN_STP1_IPD4,	GPIO_FN_STP1_IPD5,	GPIO_FN_STP1_IPD6,</div><div class='add'>+	GPIO_FN_STP1_IPD7,	GPIO_FN_STP1_IPCLK,	GPIO_FN_STP1_IPSYNC,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_STP1_IPD0_PORT186, /* MSEL5CR_23_0 */</div><div class='add'>+	GPIO_FN_STP1_IPEN_PORT187,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_STP1_IPD0_PORT194, /* MSEL5CR_23_1 */</div><div class='add'>+	GPIO_FN_STP1_IPEN_PORT193,</div><div class='add'>+</div><div class='add'>+	/* SIM */</div><div class='add'>+	GPIO_FN_SIM_RST,	GPIO_FN_SIM_CLK,</div><div class='add'>+	GPIO_FN_SIM_D_PORT22, /* SIM_D  Port 22/199 */</div><div class='add'>+	GPIO_FN_SIM_D_PORT199,</div><div class='add'>+</div><div class='add'>+	/* SDHI0 */</div><div class='add'>+	GPIO_FN_SDHI0_D0,	GPIO_FN_SDHI0_D1,	GPIO_FN_SDHI0_D2,</div><div class='add'>+	GPIO_FN_SDHI0_D3,	GPIO_FN_SDHI0_CD,	GPIO_FN_SDHI0_WP,</div><div class='add'>+	GPIO_FN_SDHI0_CMD,	GPIO_FN_SDHI0_CLK,</div><div class='add'>+</div><div class='add'>+	/* SDHI1 */</div><div class='add'>+	GPIO_FN_SDHI1_D0,	GPIO_FN_SDHI1_D1,	GPIO_FN_SDHI1_D2,</div><div class='add'>+	GPIO_FN_SDHI1_D3,	GPIO_FN_SDHI1_CD,	GPIO_FN_SDHI1_WP,</div><div class='add'>+	GPIO_FN_SDHI1_CMD,	GPIO_FN_SDHI1_CLK,</div><div class='add'>+</div><div class='add'>+	/* SDHI2 */</div><div class='add'>+	GPIO_FN_SDHI2_D0,	GPIO_FN_SDHI2_D1,	GPIO_FN_SDHI2_D2,</div><div class='add'>+	GPIO_FN_SDHI2_D3,	GPIO_FN_SDHI2_CLK,	GPIO_FN_SDHI2_CMD,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_SDHI2_CD_PORT24, /* MSEL5CR_19_0 */</div><div class='add'>+	GPIO_FN_SDHI2_WP_PORT25,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_SDHI2_WP_PORT177, /* MSEL5CR_19_1 */</div><div class='add'>+	GPIO_FN_SDHI2_CD_PORT202,</div><div class='add'>+</div><div class='add'>+	/* MSIOF2 */</div><div class='add'>+	GPIO_FN_MSIOF2_TXD,	GPIO_FN_MSIOF2_RXD,	GPIO_FN_MSIOF2_TSCK,</div><div class='add'>+	GPIO_FN_MSIOF2_SS2,	GPIO_FN_MSIOF2_TSYNC,	GPIO_FN_MSIOF2_SS1,</div><div class='add'>+	GPIO_FN_MSIOF2_MCK1,	GPIO_FN_MSIOF2_MCK0,	GPIO_FN_MSIOF2_RSYNC,</div><div class='add'>+	GPIO_FN_MSIOF2_RSCK,</div><div class='add'>+</div><div class='add'>+	/* KEYSC */</div><div class='add'>+	GPIO_FN_KEYIN4,		GPIO_FN_KEYIN5,</div><div class='add'>+	GPIO_FN_KEYIN6,		GPIO_FN_KEYIN7,</div><div class='add'>+	GPIO_FN_KEYOUT0,	GPIO_FN_KEYOUT1,	GPIO_FN_KEYOUT2,</div><div class='add'>+	GPIO_FN_KEYOUT3,	GPIO_FN_KEYOUT4,	GPIO_FN_KEYOUT5,</div><div class='add'>+	GPIO_FN_KEYOUT6,	GPIO_FN_KEYOUT7,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_KEYIN0_PORT43, /* MSEL4CR_18_0 */</div><div class='add'>+	GPIO_FN_KEYIN1_PORT44,</div><div class='add'>+	GPIO_FN_KEYIN2_PORT45,</div><div class='add'>+	GPIO_FN_KEYIN3_PORT46,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_KEYIN0_PORT58, /* MSEL4CR_18_1 */</div><div class='add'>+	GPIO_FN_KEYIN1_PORT57,</div><div class='add'>+	GPIO_FN_KEYIN2_PORT56,</div><div class='add'>+	GPIO_FN_KEYIN3_PORT55,</div><div class='add'>+</div><div class='add'>+	/* VOU */</div><div class='add'>+	GPIO_FN_DV_D0,	GPIO_FN_DV_D1,	GPIO_FN_DV_D2,	GPIO_FN_DV_D3,</div><div class='add'>+	GPIO_FN_DV_D4,	GPIO_FN_DV_D5,	GPIO_FN_DV_D6,	GPIO_FN_DV_D7,</div><div class='add'>+	GPIO_FN_DV_D8,	GPIO_FN_DV_D9,	GPIO_FN_DV_D10,	GPIO_FN_DV_D11,</div><div class='add'>+	GPIO_FN_DV_D12,	GPIO_FN_DV_D13,	GPIO_FN_DV_D14,	GPIO_FN_DV_D15,</div><div class='add'>+	GPIO_FN_DV_CLK,</div><div class='add'>+	GPIO_FN_DV_VSYNC,</div><div class='add'>+	GPIO_FN_DV_HSYNC,</div><div class='add'>+</div><div class='add'>+	/* MEMC */</div><div class='add'>+	GPIO_FN_MEMC_AD0,	GPIO_FN_MEMC_AD1,	GPIO_FN_MEMC_AD2,</div><div class='add'>+	GPIO_FN_MEMC_AD3,	GPIO_FN_MEMC_AD4,	GPIO_FN_MEMC_AD5,</div><div class='add'>+	GPIO_FN_MEMC_AD6,	GPIO_FN_MEMC_AD7,	GPIO_FN_MEMC_AD8,</div><div class='add'>+	GPIO_FN_MEMC_AD9,	GPIO_FN_MEMC_AD10,	GPIO_FN_MEMC_AD11,</div><div class='add'>+	GPIO_FN_MEMC_AD12,	GPIO_FN_MEMC_AD13,	GPIO_FN_MEMC_AD14,</div><div class='add'>+	GPIO_FN_MEMC_AD15,	GPIO_FN_MEMC_CS0,	GPIO_FN_MEMC_INT,</div><div class='add'>+	GPIO_FN_MEMC_NWE,	GPIO_FN_MEMC_NOE,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_MEMC_CS1, /* MSEL4CR_6_0 */</div><div class='add'>+	GPIO_FN_MEMC_ADV,</div><div class='add'>+	GPIO_FN_MEMC_WAIT,</div><div class='add'>+	GPIO_FN_MEMC_BUSCLK,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_MEMC_A1, /* MSEL4CR_6_1 */</div><div class='add'>+	GPIO_FN_MEMC_DREQ0,</div><div class='add'>+	GPIO_FN_MEMC_DREQ1,</div><div class='add'>+	GPIO_FN_MEMC_A0,</div><div class='add'>+</div><div class='add'>+	/* MMC */</div><div class='add'>+	GPIO_FN_MMC0_D0_PORT68,		GPIO_FN_MMC0_D1_PORT69,</div><div class='add'>+	GPIO_FN_MMC0_D2_PORT70,		GPIO_FN_MMC0_D3_PORT71,</div><div class='add'>+	GPIO_FN_MMC0_D4_PORT72,		GPIO_FN_MMC0_D5_PORT73,</div><div class='add'>+	GPIO_FN_MMC0_D6_PORT74,		GPIO_FN_MMC0_D7_PORT75,</div><div class='add'>+	GPIO_FN_MMC0_CLK_PORT66,</div><div class='add'>+	GPIO_FN_MMC0_CMD_PORT67,	/* MSEL4CR_15_0 */</div><div class='add'>+</div><div class='add'>+	GPIO_FN_MMC1_D0_PORT149,	GPIO_FN_MMC1_D1_PORT148,</div><div class='add'>+	GPIO_FN_MMC1_D2_PORT147,	GPIO_FN_MMC1_D3_PORT146,</div><div class='add'>+	GPIO_FN_MMC1_D4_PORT145,	GPIO_FN_MMC1_D5_PORT144,</div><div class='add'>+	GPIO_FN_MMC1_D6_PORT143,	GPIO_FN_MMC1_D7_PORT142,</div><div class='add'>+	GPIO_FN_MMC1_CLK_PORT103,</div><div class='add'>+	GPIO_FN_MMC1_CMD_PORT104,	/* MSEL4CR_15_1 */</div><div class='add'>+</div><div class='add'>+	/* MSIOF0 */</div><div class='add'>+	GPIO_FN_MSIOF0_SS1,	GPIO_FN_MSIOF0_SS2,</div><div class='add'>+	GPIO_FN_MSIOF0_RXD,	GPIO_FN_MSIOF0_TXD,</div><div class='add'>+	GPIO_FN_MSIOF0_MCK0,	GPIO_FN_MSIOF0_MCK1,</div><div class='add'>+	GPIO_FN_MSIOF0_RSYNC,	GPIO_FN_MSIOF0_RSCK,</div><div class='add'>+	GPIO_FN_MSIOF0_TSCK,	GPIO_FN_MSIOF0_TSYNC,</div><div class='add'>+</div><div class='add'>+	/* MSIOF1 */</div><div class='add'>+	GPIO_FN_MSIOF1_RSCK,	GPIO_FN_MSIOF1_RSYNC,</div><div class='add'>+	GPIO_FN_MSIOF1_MCK0,	GPIO_FN_MSIOF1_MCK1,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_MSIOF1_SS2_PORT116,	GPIO_FN_MSIOF1_SS1_PORT117,</div><div class='add'>+	GPIO_FN_MSIOF1_RXD_PORT118,	GPIO_FN_MSIOF1_TXD_PORT119,</div><div class='add'>+	GPIO_FN_MSIOF1_TSYNC_PORT120,</div><div class='add'>+	GPIO_FN_MSIOF1_TSCK_PORT121,	/* MSEL4CR_10_0 */</div><div class='add'>+</div><div class='add'>+	GPIO_FN_MSIOF1_SS1_PORT67,	GPIO_FN_MSIOF1_TSCK_PORT72,</div><div class='add'>+	GPIO_FN_MSIOF1_TSYNC_PORT73,	GPIO_FN_MSIOF1_TXD_PORT74,</div><div class='add'>+	GPIO_FN_MSIOF1_RXD_PORT75,</div><div class='add'>+	GPIO_FN_MSIOF1_SS2_PORT202,	/* MSEL4CR_10_1 */</div><div class='add'>+</div><div class='add'>+	/* GPIO */</div><div class='add'>+	GPIO_FN_GPO0,	GPIO_FN_GPI0,</div><div class='add'>+	GPIO_FN_GPO1,	GPIO_FN_GPI1,</div><div class='add'>+</div><div class='add'>+	/* USB0 */</div><div class='add'>+	GPIO_FN_USB0_OCI,	GPIO_FN_USB0_PPON,	GPIO_FN_VBUS,</div><div class='add'>+</div><div class='add'>+	/* USB1 */</div><div class='add'>+	GPIO_FN_USB1_OCI,	GPIO_FN_USB1_PPON,</div><div class='add'>+</div><div class='add'>+	/* BBIF1 */</div><div class='add'>+	GPIO_FN_BBIF1_RXD,	GPIO_FN_BBIF1_TXD,	GPIO_FN_BBIF1_TSYNC,</div><div class='add'>+	GPIO_FN_BBIF1_TSCK,	GPIO_FN_BBIF1_RSCK,	GPIO_FN_BBIF1_RSYNC,</div><div class='add'>+	GPIO_FN_BBIF1_FLOW,	GPIO_FN_BBIF1_RX_FLOW_N,</div><div class='add'>+</div><div class='add'>+	/* BBIF2 */</div><div class='add'>+	GPIO_FN_BBIF2_TXD2_PORT5, /* MSEL5CR_0_0 */</div><div class='add'>+	GPIO_FN_BBIF2_RXD2_PORT60,</div><div class='add'>+	GPIO_FN_BBIF2_TSYNC2_PORT6,</div><div class='add'>+	GPIO_FN_BBIF2_TSCK2_PORT59,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_BBIF2_RXD2_PORT90, /* MSEL5CR_0_1 */</div><div class='add'>+	GPIO_FN_BBIF2_TXD2_PORT183,</div><div class='add'>+	GPIO_FN_BBIF2_TSCK2_PORT89,</div><div class='add'>+	GPIO_FN_BBIF2_TSYNC2_PORT184,</div><div class='add'>+</div><div class='add'>+	/* BSC / FLCTL / PCMCIA */</div><div class='add'>+	GPIO_FN_CS0,	GPIO_FN_CS2,	GPIO_FN_CS4,</div><div class='add'>+	GPIO_FN_CS5B,	GPIO_FN_CS6A,</div><div class='add'>+	GPIO_FN_CS5A_PORT105, /* CS5A PORT 19/105 */</div><div class='add'>+	GPIO_FN_CS5A_PORT19,</div><div class='add'>+	GPIO_FN_IOIS16, /* ? */</div><div class='add'>+</div><div class='add'>+	GPIO_FN_A0,	GPIO_FN_A1,	GPIO_FN_A2,	GPIO_FN_A3,</div><div class='add'>+	GPIO_FN_A4_FOE,		/* share with FLCTL */</div><div class='add'>+	GPIO_FN_A5_FCDE,	/* share with FLCTL */</div><div class='add'>+	GPIO_FN_A6,	GPIO_FN_A7,	GPIO_FN_A8,	GPIO_FN_A9,</div><div class='add'>+	GPIO_FN_A10,	GPIO_FN_A11,	GPIO_FN_A12,	GPIO_FN_A13,</div><div class='add'>+	GPIO_FN_A14,	GPIO_FN_A15,	GPIO_FN_A16,	GPIO_FN_A17,</div><div class='add'>+	GPIO_FN_A18,	GPIO_FN_A19,	GPIO_FN_A20,	GPIO_FN_A21,</div><div class='add'>+	GPIO_FN_A22,	GPIO_FN_A23,	GPIO_FN_A24,	GPIO_FN_A25,</div><div class='add'>+	GPIO_FN_A26,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_D0_NAF0,	GPIO_FN_D1_NAF1,	/* share with FLCTL */</div><div class='add'>+	GPIO_FN_D2_NAF2,	GPIO_FN_D3_NAF3,	/* share with FLCTL */</div><div class='add'>+	GPIO_FN_D4_NAF4,	GPIO_FN_D5_NAF5,	/* share with FLCTL */</div><div class='add'>+	GPIO_FN_D6_NAF6,	GPIO_FN_D7_NAF7,	/* share with FLCTL */</div><div class='add'>+	GPIO_FN_D8_NAF8,	GPIO_FN_D9_NAF9,	/* share with FLCTL */</div><div class='add'>+	GPIO_FN_D10_NAF10,	GPIO_FN_D11_NAF11,	/* share with FLCTL */</div><div class='add'>+	GPIO_FN_D12_NAF12,	GPIO_FN_D13_NAF13,	/* share with FLCTL */</div><div class='add'>+	GPIO_FN_D14_NAF14,	GPIO_FN_D15_NAF15,	/* share with FLCTL */</div><div class='add'>+</div><div class='add'>+	GPIO_FN_D16,	GPIO_FN_D17,	GPIO_FN_D18,	GPIO_FN_D19,</div><div class='add'>+	GPIO_FN_D20,	GPIO_FN_D21,	GPIO_FN_D22,	GPIO_FN_D23,</div><div class='add'>+	GPIO_FN_D24,	GPIO_FN_D25,	GPIO_FN_D26,	GPIO_FN_D27,</div><div class='add'>+	GPIO_FN_D28,	GPIO_FN_D29,	GPIO_FN_D30,	GPIO_FN_D31,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_WE0_FWE,	/* share with FLCTL */</div><div class='add'>+	GPIO_FN_WE1,</div><div class='add'>+	GPIO_FN_WE2_ICIORD,	/* share with PCMCIA */</div><div class='add'>+	GPIO_FN_WE3_ICIOWR,	/* share with PCMCIA */</div><div class='add'>+	GPIO_FN_CKO,	GPIO_FN_BS,	GPIO_FN_RDWR,</div><div class='add'>+	GPIO_FN_RD_FSC,		/* share with FLCTL */</div><div class='add'>+	GPIO_FN_WAIT_PORT177,	/* WAIT Port 90/177 */</div><div class='add'>+	GPIO_FN_WAIT_PORT90,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_FCE0,	GPIO_FN_FCE1,	GPIO_FN_FRB, /* FLCTL */</div><div class='add'>+</div><div class='add'>+	/* IRDA */</div><div class='add'>+	GPIO_FN_IRDA_FIRSEL,	GPIO_FN_IRDA_IN,	GPIO_FN_IRDA_OUT,</div><div class='add'>+</div><div class='add'>+	/* ATAPI */</div><div class='add'>+	GPIO_FN_IDE_D0,		GPIO_FN_IDE_D1,		GPIO_FN_IDE_D2,</div><div class='add'>+	GPIO_FN_IDE_D3,		GPIO_FN_IDE_D4,		GPIO_FN_IDE_D5,</div><div class='add'>+	GPIO_FN_IDE_D6,		GPIO_FN_IDE_D7,		GPIO_FN_IDE_D8,</div><div class='add'>+	GPIO_FN_IDE_D9,		GPIO_FN_IDE_D10,	GPIO_FN_IDE_D11,</div><div class='add'>+	GPIO_FN_IDE_D12,	GPIO_FN_IDE_D13,	GPIO_FN_IDE_D14,</div><div class='add'>+	GPIO_FN_IDE_D15,	GPIO_FN_IDE_A0,		GPIO_FN_IDE_A1,</div><div class='add'>+	GPIO_FN_IDE_A2,		GPIO_FN_IDE_CS0,	GPIO_FN_IDE_CS1,</div><div class='add'>+	GPIO_FN_IDE_IOWR,	GPIO_FN_IDE_IORD,	GPIO_FN_IDE_IORDY,</div><div class='add'>+	GPIO_FN_IDE_INT,	GPIO_FN_IDE_RST,	GPIO_FN_IDE_DIRECTION,</div><div class='add'>+	GPIO_FN_IDE_EXBUF_ENB,	GPIO_FN_IDE_IODACK,	GPIO_FN_IDE_IODREQ,</div><div class='add'>+</div><div class='add'>+	/* RMII */</div><div class='add'>+	GPIO_FN_RMII_CRS_DV,	GPIO_FN_RMII_RX_ER,	GPIO_FN_RMII_RXD0,</div><div class='add'>+	GPIO_FN_RMII_RXD1,	GPIO_FN_RMII_TX_EN,	GPIO_FN_RMII_TXD0,</div><div class='add'>+	GPIO_FN_RMII_MDC,	GPIO_FN_RMII_TXD1,	GPIO_FN_RMII_MDIO,</div><div class='add'>+	GPIO_FN_RMII_REF50CK,	/* for RMII */</div><div class='add'>+	GPIO_FN_RMII_REF125CK,	/* for GMII */</div><div class='add'>+</div><div class='add'>+	/* GEther */</div><div class='add'>+	GPIO_FN_ET_TX_CLK,	GPIO_FN_ET_TX_EN,	GPIO_FN_ET_ETXD0,</div><div class='add'>+	GPIO_FN_ET_ETXD1,	GPIO_FN_ET_ETXD2,	GPIO_FN_ET_ETXD3,</div><div class='add'>+	GPIO_FN_ET_ETXD4,	GPIO_FN_ET_ETXD5, /* for GEther */</div><div class='add'>+	GPIO_FN_ET_ETXD6,	GPIO_FN_ET_ETXD7, /* for GEther */</div><div class='add'>+	GPIO_FN_ET_COL,		GPIO_FN_ET_TX_ER,</div><div class='add'>+	GPIO_FN_ET_RX_CLK,	GPIO_FN_ET_RX_DV,</div><div class='add'>+	GPIO_FN_ET_ERXD0,	GPIO_FN_ET_ERXD1,</div><div class='add'>+	GPIO_FN_ET_ERXD2,	GPIO_FN_ET_ERXD3,</div><div class='add'>+	GPIO_FN_ET_ERXD4,	GPIO_FN_ET_ERXD5, /* for GEther */</div><div class='add'>+	GPIO_FN_ET_ERXD6,	GPIO_FN_ET_ERXD7, /* for GEther */</div><div class='add'>+	GPIO_FN_ET_RX_ER,	GPIO_FN_ET_CRS,</div><div class='add'>+	GPIO_FN_ET_MDC,		GPIO_FN_ET_MDIO,</div><div class='add'>+	GPIO_FN_ET_LINK,	GPIO_FN_ET_PHY_INT,</div><div class='add'>+	GPIO_FN_ET_WOL,		GPIO_FN_ET_GTX_CLK,</div><div class='add'>+</div><div class='add'>+	/* DMA0 */</div><div class='add'>+	GPIO_FN_DREQ0,		GPIO_FN_DACK0,</div><div class='add'>+</div><div class='add'>+	/* DMA1 */</div><div class='add'>+	GPIO_FN_DREQ1,		GPIO_FN_DACK1,</div><div class='add'>+</div><div class='add'>+	/* SYSC */</div><div class='add'>+	GPIO_FN_RESETOUTS,</div><div class='add'>+	GPIO_FN_RESETP_PULLUP,</div><div class='add'>+	GPIO_FN_RESETP_PLAIN,</div><div class='add'>+</div><div class='add'>+	/* SDENC */</div><div class='add'>+	GPIO_FN_SDENC_CPG,</div><div class='add'>+	GPIO_FN_SDENC_DV_CLKI,</div><div class='add'>+</div><div class='add'>+	/* IRREM */</div><div class='add'>+	GPIO_FN_IROUT,</div><div class='add'>+</div><div class='add'>+	/* DEBUG */</div><div class='add'>+	GPIO_FN_EDEBGREQ_PULLDOWN,</div><div class='add'>+	GPIO_FN_EDEBGREQ_PULLUP,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_TRACEAUD_FROM_VIO,</div><div class='add'>+	GPIO_FN_TRACEAUD_FROM_LCDC0,</div><div class='add'>+	GPIO_FN_TRACEAUD_FROM_MEMC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_R8A7740_H__ */</div><div class='head'>diff --git a/arch/arm/mach-shmobile/include/mach/r8a7779.h b/arch/arm/mach-shmobile/include/mach/r8a7779.h<br/>new file mode 100644<br/>index 000000000000..b07ad318eb2e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/include/mach/r8a7779.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/include/mach/r8a7779.h</a></div><div class='hunk'>@@ -0,0 +1,363 @@</div><div class='add'>+#ifndef __ASM_R8A7779_H__</div><div class='add'>+#define __ASM_R8A7779_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sh_clk.h&gt;</div><div class='add'>+#include &lt;linux/pm_domain.h&gt;</div><div class='add'>+</div><div class='add'>+/* Pin Function Controller:</div><div class='add'>+ * GPIO_FN_xx - GPIO used to select pin function</div><div class='add'>+ * GPIO_GP_x_x - GPIO mapped to real I/O pin on CPU</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	GPIO_GP_0_0, GPIO_GP_0_1, GPIO_GP_0_2, GPIO_GP_0_3,</div><div class='add'>+	GPIO_GP_0_4, GPIO_GP_0_5, GPIO_GP_0_6, GPIO_GP_0_7,</div><div class='add'>+	GPIO_GP_0_8, GPIO_GP_0_9, GPIO_GP_0_10, GPIO_GP_0_11,</div><div class='add'>+	GPIO_GP_0_12, GPIO_GP_0_13, GPIO_GP_0_14, GPIO_GP_0_15,</div><div class='add'>+	GPIO_GP_0_16, GPIO_GP_0_17, GPIO_GP_0_18, GPIO_GP_0_19,</div><div class='add'>+	GPIO_GP_0_20, GPIO_GP_0_21, GPIO_GP_0_22, GPIO_GP_0_23,</div><div class='add'>+	GPIO_GP_0_24, GPIO_GP_0_25, GPIO_GP_0_26, GPIO_GP_0_27,</div><div class='add'>+	GPIO_GP_0_28, GPIO_GP_0_29, GPIO_GP_0_30, GPIO_GP_0_31,</div><div class='add'>+</div><div class='add'>+	GPIO_GP_1_0, GPIO_GP_1_1, GPIO_GP_1_2, GPIO_GP_1_3,</div><div class='add'>+	GPIO_GP_1_4, GPIO_GP_1_5, GPIO_GP_1_6, GPIO_GP_1_7,</div><div class='add'>+	GPIO_GP_1_8, GPIO_GP_1_9, GPIO_GP_1_10, GPIO_GP_1_11,</div><div class='add'>+	GPIO_GP_1_12, GPIO_GP_1_13, GPIO_GP_1_14, GPIO_GP_1_15,</div><div class='add'>+	GPIO_GP_1_16, GPIO_GP_1_17, GPIO_GP_1_18, GPIO_GP_1_19,</div><div class='add'>+	GPIO_GP_1_20, GPIO_GP_1_21, GPIO_GP_1_22, GPIO_GP_1_23,</div><div class='add'>+	GPIO_GP_1_24, GPIO_GP_1_25, GPIO_GP_1_26, GPIO_GP_1_27,</div><div class='add'>+	GPIO_GP_1_28, GPIO_GP_1_29, GPIO_GP_1_30, GPIO_GP_1_31,</div><div class='add'>+</div><div class='add'>+	GPIO_GP_2_0, GPIO_GP_2_1, GPIO_GP_2_2, GPIO_GP_2_3,</div><div class='add'>+	GPIO_GP_2_4, GPIO_GP_2_5, GPIO_GP_2_6, GPIO_GP_2_7,</div><div class='add'>+	GPIO_GP_2_8, GPIO_GP_2_9, GPIO_GP_2_10, GPIO_GP_2_11,</div><div class='add'>+	GPIO_GP_2_12, GPIO_GP_2_13, GPIO_GP_2_14, GPIO_GP_2_15,</div><div class='add'>+	GPIO_GP_2_16, GPIO_GP_2_17, GPIO_GP_2_18, GPIO_GP_2_19,</div><div class='add'>+	GPIO_GP_2_20, GPIO_GP_2_21, GPIO_GP_2_22, GPIO_GP_2_23,</div><div class='add'>+	GPIO_GP_2_24, GPIO_GP_2_25, GPIO_GP_2_26, GPIO_GP_2_27,</div><div class='add'>+	GPIO_GP_2_28, GPIO_GP_2_29, GPIO_GP_2_30, GPIO_GP_2_31,</div><div class='add'>+</div><div class='add'>+	GPIO_GP_3_0, GPIO_GP_3_1, GPIO_GP_3_2, GPIO_GP_3_3,</div><div class='add'>+	GPIO_GP_3_4, GPIO_GP_3_5, GPIO_GP_3_6, GPIO_GP_3_7,</div><div class='add'>+	GPIO_GP_3_8, GPIO_GP_3_9, GPIO_GP_3_10, GPIO_GP_3_11,</div><div class='add'>+	GPIO_GP_3_12, GPIO_GP_3_13, GPIO_GP_3_14, GPIO_GP_3_15,</div><div class='add'>+	GPIO_GP_3_16, GPIO_GP_3_17, GPIO_GP_3_18, GPIO_GP_3_19,</div><div class='add'>+	GPIO_GP_3_20, GPIO_GP_3_21, GPIO_GP_3_22, GPIO_GP_3_23,</div><div class='add'>+	GPIO_GP_3_24, GPIO_GP_3_25, GPIO_GP_3_26, GPIO_GP_3_27,</div><div class='add'>+	GPIO_GP_3_28, GPIO_GP_3_29, GPIO_GP_3_30, GPIO_GP_3_31,</div><div class='add'>+</div><div class='add'>+	GPIO_GP_4_0, GPIO_GP_4_1, GPIO_GP_4_2, GPIO_GP_4_3,</div><div class='add'>+	GPIO_GP_4_4, GPIO_GP_4_5, GPIO_GP_4_6, GPIO_GP_4_7,</div><div class='add'>+	GPIO_GP_4_8, GPIO_GP_4_9, GPIO_GP_4_10, GPIO_GP_4_11,</div><div class='add'>+	GPIO_GP_4_12, GPIO_GP_4_13, GPIO_GP_4_14, GPIO_GP_4_15,</div><div class='add'>+	GPIO_GP_4_16, GPIO_GP_4_17, GPIO_GP_4_18, GPIO_GP_4_19,</div><div class='add'>+	GPIO_GP_4_20, GPIO_GP_4_21, GPIO_GP_4_22, GPIO_GP_4_23,</div><div class='add'>+	GPIO_GP_4_24, GPIO_GP_4_25, GPIO_GP_4_26, GPIO_GP_4_27,</div><div class='add'>+	GPIO_GP_4_28, GPIO_GP_4_29, GPIO_GP_4_30, GPIO_GP_4_31,</div><div class='add'>+</div><div class='add'>+	GPIO_GP_5_0, GPIO_GP_5_1, GPIO_GP_5_2, GPIO_GP_5_3,</div><div class='add'>+	GPIO_GP_5_4, GPIO_GP_5_5, GPIO_GP_5_6, GPIO_GP_5_7,</div><div class='add'>+	GPIO_GP_5_8, GPIO_GP_5_9, GPIO_GP_5_10, GPIO_GP_5_11,</div><div class='add'>+	GPIO_GP_5_12, GPIO_GP_5_13, GPIO_GP_5_14, GPIO_GP_5_15,</div><div class='add'>+	GPIO_GP_5_16, GPIO_GP_5_17, GPIO_GP_5_18, GPIO_GP_5_19,</div><div class='add'>+	GPIO_GP_5_20, GPIO_GP_5_21, GPIO_GP_5_22, GPIO_GP_5_23,</div><div class='add'>+	GPIO_GP_5_24, GPIO_GP_5_25, GPIO_GP_5_26, GPIO_GP_5_27,</div><div class='add'>+	GPIO_GP_5_28, GPIO_GP_5_29, GPIO_GP_5_30, GPIO_GP_5_31,</div><div class='add'>+</div><div class='add'>+	GPIO_GP_6_0, GPIO_GP_6_1, GPIO_GP_6_2, GPIO_GP_6_3,</div><div class='add'>+	GPIO_GP_6_4, GPIO_GP_6_5, GPIO_GP_6_6, GPIO_GP_6_7,</div><div class='add'>+	GPIO_GP_6_8,</div><div class='add'>+</div><div class='add'>+	GPIO_FN_AVS1, GPIO_FN_AVS2, GPIO_FN_A17, GPIO_FN_A18,</div><div class='add'>+	GPIO_FN_A19,</div><div class='add'>+</div><div class='add'>+	/* IPSR0 */</div><div class='add'>+	GPIO_FN_PENC2, GPIO_FN_SCK0, GPIO_FN_PWM1, GPIO_FN_PWMFSW0,</div><div class='add'>+	GPIO_FN_SCIF_CLK, GPIO_FN_TCLK0_C, GPIO_FN_BS, GPIO_FN_SD1_DAT2,</div><div class='add'>+	GPIO_FN_MMC0_D2, GPIO_FN_FD2, GPIO_FN_ATADIR0, GPIO_FN_SDSELF,</div><div class='add'>+	GPIO_FN_HCTS1, GPIO_FN_TX4_C, GPIO_FN_A0, GPIO_FN_SD1_DAT3,</div><div class='add'>+	GPIO_FN_MMC0_D3, GPIO_FN_FD3, GPIO_FN_A20, GPIO_FN_TX5_D,</div><div class='add'>+	GPIO_FN_HSPI_TX2_B, GPIO_FN_A21, GPIO_FN_SCK5_D, GPIO_FN_HSPI_CLK2_B,</div><div class='add'>+	GPIO_FN_A22, GPIO_FN_RX5_D, GPIO_FN_HSPI_RX2_B, GPIO_FN_VI1_R0,</div><div class='add'>+	GPIO_FN_A23, GPIO_FN_FCLE, GPIO_FN_HSPI_CLK2, GPIO_FN_VI1_R1,</div><div class='add'>+	GPIO_FN_A24, GPIO_FN_SD1_CD, GPIO_FN_MMC0_D4, GPIO_FN_FD4,</div><div class='add'>+	GPIO_FN_HSPI_CS2, GPIO_FN_VI1_R2, GPIO_FN_SSI_WS78_B, GPIO_FN_A25,</div><div class='add'>+	GPIO_FN_SD1_WP, GPIO_FN_MMC0_D5, GPIO_FN_FD5, GPIO_FN_HSPI_RX2,</div><div class='add'>+	GPIO_FN_VI1_R3, GPIO_FN_TX5_B, GPIO_FN_SSI_SDATA7_B, GPIO_FN_CTS0_B,</div><div class='add'>+	GPIO_FN_CLKOUT, GPIO_FN_TX3C_IRDA_TX_C, GPIO_FN_PWM0_B, GPIO_FN_CS0,</div><div class='add'>+	GPIO_FN_HSPI_CS2_B, GPIO_FN_CS1_A26, GPIO_FN_HSPI_TX2,</div><div class='add'>+	GPIO_FN_SDSELF_B, GPIO_FN_RD_WR, GPIO_FN_FWE, GPIO_FN_ATAG0,</div><div class='add'>+	GPIO_FN_VI1_R7, GPIO_FN_HRTS1, GPIO_FN_RX4_C,</div><div class='add'>+</div><div class='add'>+	/* IPSR1 */</div><div class='add'>+	GPIO_FN_EX_CS0, GPIO_FN_RX3_C_IRDA_RX_C, GPIO_FN_MMC0_D6,</div><div class='add'>+	GPIO_FN_FD6, GPIO_FN_EX_CS1, GPIO_FN_MMC0_D7, GPIO_FN_FD7,</div><div class='add'>+	GPIO_FN_EX_CS2, GPIO_FN_SD1_CLK, GPIO_FN_MMC0_CLK, GPIO_FN_FALE,</div><div class='add'>+	GPIO_FN_ATACS00, GPIO_FN_EX_CS3, GPIO_FN_SD1_CMD, GPIO_FN_MMC0_CMD,</div><div class='add'>+	GPIO_FN_FRE, GPIO_FN_ATACS10, GPIO_FN_VI1_R4, GPIO_FN_RX5_B,</div><div class='add'>+	GPIO_FN_HSCK1, GPIO_FN_SSI_SDATA8_B, GPIO_FN_RTS0_B_TANS_B,</div><div class='add'>+	GPIO_FN_SSI_SDATA9, GPIO_FN_EX_CS4, GPIO_FN_SD1_DAT0, GPIO_FN_MMC0_D0,</div><div class='add'>+	GPIO_FN_FD0, GPIO_FN_ATARD0, GPIO_FN_VI1_R5, GPIO_FN_SCK5_B,</div><div class='add'>+	GPIO_FN_HTX1, GPIO_FN_TX2_E, GPIO_FN_TX0_B, GPIO_FN_SSI_SCK9,</div><div class='add'>+	GPIO_FN_EX_CS5, GPIO_FN_SD1_DAT1, GPIO_FN_MMC0_D1, GPIO_FN_FD1,</div><div class='add'>+	GPIO_FN_ATAWR0, GPIO_FN_VI1_R6, GPIO_FN_HRX1, GPIO_FN_RX2_E,</div><div class='add'>+	GPIO_FN_RX0_B, GPIO_FN_SSI_WS9, GPIO_FN_MLB_CLK, GPIO_FN_PWM2,</div><div class='add'>+	GPIO_FN_SCK4, GPIO_FN_MLB_SIG, GPIO_FN_PWM3, GPIO_FN_TX4,</div><div class='add'>+	GPIO_FN_MLB_DAT, GPIO_FN_PWM4, GPIO_FN_RX4, GPIO_FN_HTX0,</div><div class='add'>+	GPIO_FN_TX1, GPIO_FN_SDATA, GPIO_FN_CTS0_C, GPIO_FN_SUB_TCK,</div><div class='add'>+	GPIO_FN_CC5_STATE2, GPIO_FN_CC5_STATE10, GPIO_FN_CC5_STATE18,</div><div class='add'>+	GPIO_FN_CC5_STATE26, GPIO_FN_CC5_STATE34,</div><div class='add'>+</div><div class='add'>+	/* IPSR2 */</div><div class='add'>+	GPIO_FN_HRX0, GPIO_FN_RX1, GPIO_FN_SCKZ, GPIO_FN_RTS0_C_TANS_C,</div><div class='add'>+	GPIO_FN_SUB_TDI, GPIO_FN_CC5_STATE3, GPIO_FN_CC5_STATE11,</div><div class='add'>+	GPIO_FN_CC5_STATE19, GPIO_FN_CC5_STATE27, GPIO_FN_CC5_STATE35,</div><div class='add'>+	GPIO_FN_HSCK0, GPIO_FN_SCK1, GPIO_FN_MTS, GPIO_FN_PWM5,</div><div class='add'>+	GPIO_FN_SCK0_C, GPIO_FN_SSI_SDATA9_B, GPIO_FN_SUB_TDO,</div><div class='add'>+	GPIO_FN_CC5_STATE0, GPIO_FN_CC5_STATE8, GPIO_FN_CC5_STATE16,</div><div class='add'>+	GPIO_FN_CC5_STATE24, GPIO_FN_CC5_STATE32, GPIO_FN_HCTS0, GPIO_FN_CTS1,</div><div class='add'>+	GPIO_FN_STM, GPIO_FN_PWM0_D, GPIO_FN_RX0_C, GPIO_FN_SCIF_CLK_C,</div><div class='add'>+	GPIO_FN_SUB_TRST, GPIO_FN_TCLK1_B, GPIO_FN_CC5_OSCOUT, GPIO_FN_HRTS0,</div><div class='add'>+	GPIO_FN_RTS1_TANS, GPIO_FN_MDATA, GPIO_FN_TX0_C, GPIO_FN_SUB_TMS,</div><div class='add'>+	GPIO_FN_CC5_STATE1, GPIO_FN_CC5_STATE9, GPIO_FN_CC5_STATE17,</div><div class='add'>+	GPIO_FN_CC5_STATE25, GPIO_FN_CC5_STATE33, GPIO_FN_DU0_DR0,</div><div class='add'>+	GPIO_FN_LCDOUT0, GPIO_FN_DREQ0, GPIO_FN_GPS_CLK_B, GPIO_FN_AUDATA0,</div><div class='add'>+	GPIO_FN_TX5_C, GPIO_FN_DU0_DR1,	GPIO_FN_LCDOUT1, GPIO_FN_DACK0,</div><div class='add'>+	GPIO_FN_DRACK0, GPIO_FN_GPS_SIGN_B, GPIO_FN_AUDATA1, GPIO_FN_RX5_C,</div><div class='add'>+	GPIO_FN_DU0_DR2, GPIO_FN_LCDOUT2, GPIO_FN_DU0_DR3, GPIO_FN_LCDOUT3,</div><div class='add'>+	GPIO_FN_DU0_DR4, GPIO_FN_LCDOUT4, GPIO_FN_DU0_DR5, GPIO_FN_LCDOUT5,</div><div class='add'>+	GPIO_FN_DU0_DR6, GPIO_FN_LCDOUT6, GPIO_FN_DU0_DR7, GPIO_FN_LCDOUT7,</div><div class='add'>+	GPIO_FN_DU0_DG0, GPIO_FN_LCDOUT8, GPIO_FN_DREQ1, GPIO_FN_SCL2,</div><div class='add'>+	GPIO_FN_AUDATA2,</div><div class='add'>+</div><div class='add'>+	/* IPSR3 */</div><div class='add'>+	GPIO_FN_DU0_DG1, GPIO_FN_LCDOUT9, GPIO_FN_DACK1, GPIO_FN_SDA2,</div><div class='add'>+	GPIO_FN_AUDATA3, GPIO_FN_DU0_DG2, GPIO_FN_LCDOUT10, GPIO_FN_DU0_DG3,</div><div class='add'>+	GPIO_FN_LCDOUT11, GPIO_FN_DU0_DG4, GPIO_FN_LCDOUT12, GPIO_FN_DU0_DG5,</div><div class='add'>+	GPIO_FN_LCDOUT13, GPIO_FN_DU0_DG6, GPIO_FN_LCDOUT14, GPIO_FN_DU0_DG7,</div><div class='add'>+	GPIO_FN_LCDOUT15, GPIO_FN_DU0_DB0, GPIO_FN_LCDOUT16, GPIO_FN_EX_WAIT1,</div><div class='add'>+	GPIO_FN_SCL1, GPIO_FN_TCLK1, GPIO_FN_AUDATA4, GPIO_FN_DU0_DB1,</div><div class='add'>+	GPIO_FN_LCDOUT17, GPIO_FN_EX_WAIT2, GPIO_FN_SDA1, GPIO_FN_GPS_MAG_B,</div><div class='add'>+	GPIO_FN_AUDATA5, GPIO_FN_SCK5_C, GPIO_FN_DU0_DB2, GPIO_FN_LCDOUT18,</div><div class='add'>+	GPIO_FN_DU0_DB3, GPIO_FN_LCDOUT19, GPIO_FN_DU0_DB4, GPIO_FN_LCDOUT20,</div><div class='add'>+	GPIO_FN_DU0_DB5, GPIO_FN_LCDOUT21, GPIO_FN_DU0_DB6, GPIO_FN_LCDOUT22,</div><div class='add'>+	GPIO_FN_DU0_DB7, GPIO_FN_LCDOUT23, GPIO_FN_DU0_DOTCLKIN,</div><div class='add'>+	GPIO_FN_QSTVA_QVS, GPIO_FN_TX3_D_IRDA_TX_D, GPIO_FN_SCL3_B,</div><div class='add'>+	GPIO_FN_DU0_DOTCLKOUT0, GPIO_FN_QCLK, GPIO_FN_DU0_DOTCLKOUT1,</div><div class='add'>+	GPIO_FN_QSTVB_QVE, GPIO_FN_RX3_D_IRDA_RX_D, GPIO_FN_SDA3_B,</div><div class='add'>+	GPIO_FN_SDA2_C, GPIO_FN_DACK0_B, GPIO_FN_DRACK0_B,</div><div class='add'>+	GPIO_FN_DU0_EXHSYNC_DU0_HSYNC, GPIO_FN_QSTH_QHS,</div><div class='add'>+	GPIO_FN_DU0_EXVSYNC_DU0_VSYNC, GPIO_FN_QSTB_QHE,</div><div class='add'>+	GPIO_FN_DU0_EXODDF_DU0_ODDF_DISP_CDE, GPIO_FN_QCPV_QDE,</div><div class='add'>+	GPIO_FN_CAN1_TX, GPIO_FN_TX2_C, GPIO_FN_SCL2_C, GPIO_FN_REMOCON,</div><div class='add'>+</div><div class='add'>+	/* IPSR4 */</div><div class='add'>+	GPIO_FN_DU0_DISP, GPIO_FN_QPOLA, GPIO_FN_CAN_CLK_C, GPIO_FN_SCK2_C,</div><div class='add'>+	GPIO_FN_DU0_CDE, GPIO_FN_QPOLB, GPIO_FN_CAN1_RX, GPIO_FN_RX2_C,</div><div class='add'>+	GPIO_FN_DREQ0_B, GPIO_FN_SSI_SCK78_B, GPIO_FN_SCK0_B, GPIO_FN_DU1_DR0,</div><div class='add'>+	GPIO_FN_VI2_DATA0_VI2_B0, GPIO_FN_PWM6, GPIO_FN_SD3_CLK,</div><div class='add'>+	GPIO_FN_TX3_E_IRDA_TX_E, GPIO_FN_AUDCK, GPIO_FN_PWMFSW0_B,</div><div class='add'>+	GPIO_FN_DU1_DR1, GPIO_FN_VI2_DATA1_VI2_B1, GPIO_FN_PWM0,</div><div class='add'>+	GPIO_FN_SD3_CMD, GPIO_FN_RX3_E_IRDA_RX_E, GPIO_FN_AUDSYNC,</div><div class='add'>+	GPIO_FN_CTS0_D, GPIO_FN_DU1_DR2, GPIO_FN_VI2_G0, GPIO_FN_DU1_DR3,</div><div class='add'>+	GPIO_FN_VI2_G1, GPIO_FN_DU1_DR4, GPIO_FN_VI2_G2, GPIO_FN_DU1_DR5,</div><div class='add'>+	GPIO_FN_VI2_G3, GPIO_FN_DU1_DR6, GPIO_FN_VI2_G4, GPIO_FN_DU1_DR7,</div><div class='add'>+	GPIO_FN_VI2_G5, GPIO_FN_DU1_DG0, GPIO_FN_VI2_DATA2_VI2_B2,</div><div class='add'>+	GPIO_FN_SCL1_B, GPIO_FN_SD3_DAT2, GPIO_FN_SCK3_E, GPIO_FN_AUDATA6,</div><div class='add'>+	GPIO_FN_TX0_D, GPIO_FN_DU1_DG1, GPIO_FN_VI2_DATA3_VI2_B3,</div><div class='add'>+	GPIO_FN_SDA1_B, GPIO_FN_SD3_DAT3, GPIO_FN_SCK5, GPIO_FN_AUDATA7,</div><div class='add'>+	GPIO_FN_RX0_D, GPIO_FN_DU1_DG2,	GPIO_FN_VI2_G6, GPIO_FN_DU1_DG3,</div><div class='add'>+	GPIO_FN_VI2_G7, GPIO_FN_DU1_DG4, GPIO_FN_VI2_R0, GPIO_FN_DU1_DG5,</div><div class='add'>+	GPIO_FN_VI2_R1, GPIO_FN_DU1_DG6, GPIO_FN_VI2_R2, GPIO_FN_DU1_DG7,</div><div class='add'>+	GPIO_FN_VI2_R3, GPIO_FN_DU1_DB0, GPIO_FN_VI2_DATA4_VI2_B4,</div><div class='add'>+	GPIO_FN_SCL2_B, GPIO_FN_SD3_DAT0, GPIO_FN_TX5, GPIO_FN_SCK0_D,</div><div class='add'>+</div><div class='add'>+	/* IPSR5 */</div><div class='add'>+	GPIO_FN_DU1_DB1, GPIO_FN_VI2_DATA5_VI2_B5, GPIO_FN_SDA2_B,</div><div class='add'>+	GPIO_FN_SD3_DAT1, GPIO_FN_RX5, GPIO_FN_RTS0_D_TANS_D,</div><div class='add'>+	GPIO_FN_DU1_DB2, GPIO_FN_VI2_R4, GPIO_FN_DU1_DB3, GPIO_FN_VI2_R5,</div><div class='add'>+	GPIO_FN_DU1_DB4, GPIO_FN_VI2_R6, GPIO_FN_DU1_DB5, GPIO_FN_VI2_R7,</div><div class='add'>+	GPIO_FN_DU1_DB6, GPIO_FN_SCL2_D, GPIO_FN_DU1_DB7, GPIO_FN_SDA2_D,</div><div class='add'>+	GPIO_FN_DU1_DOTCLKIN, GPIO_FN_VI2_CLKENB, GPIO_FN_HSPI_CS1,</div><div class='add'>+	GPIO_FN_SCL1_D, GPIO_FN_DU1_DOTCLKOUT, GPIO_FN_VI2_FIELD,</div><div class='add'>+	GPIO_FN_SDA1_D, GPIO_FN_DU1_EXHSYNC_DU1_HSYNC, GPIO_FN_VI2_HSYNC,</div><div class='add'>+	GPIO_FN_VI3_HSYNC, GPIO_FN_DU1_EXVSYNC_DU1_VSYNC, GPIO_FN_VI2_VSYNC,</div><div class='add'>+	GPIO_FN_VI3_VSYNC, GPIO_FN_DU1_EXODDF_DU1_ODDF_DISP_CDE,</div><div class='add'>+	GPIO_FN_VI2_CLK, GPIO_FN_TX3_B_IRDA_TX_B, GPIO_FN_SD3_CD,</div><div class='add'>+	GPIO_FN_HSPI_TX1, GPIO_FN_VI1_CLKENB, GPIO_FN_VI3_CLKENB,</div><div class='add'>+	GPIO_FN_AUDIO_CLKC, GPIO_FN_TX2_D, GPIO_FN_SPEEDIN,</div><div class='add'>+	GPIO_FN_GPS_SIGN_D, GPIO_FN_DU1_DISP, GPIO_FN_VI2_DATA6_VI2_B6,</div><div class='add'>+	GPIO_FN_TCLK0, GPIO_FN_QSTVA_B_QVS_B, GPIO_FN_HSPI_CLK1,</div><div class='add'>+	GPIO_FN_SCK2_D, GPIO_FN_AUDIO_CLKOUT_B, GPIO_FN_GPS_MAG_D,</div><div class='add'>+	GPIO_FN_DU1_CDE, GPIO_FN_VI2_DATA7_VI2_B7, GPIO_FN_RX3_B_IRDA_RX_B,</div><div class='add'>+	GPIO_FN_SD3_WP, GPIO_FN_HSPI_RX1, GPIO_FN_VI1_FIELD, GPIO_FN_VI3_FIELD,</div><div class='add'>+	GPIO_FN_AUDIO_CLKOUT, GPIO_FN_RX2_D, GPIO_FN_GPS_CLK_C,</div><div class='add'>+	GPIO_FN_GPS_CLK_D, GPIO_FN_AUDIO_CLKA, GPIO_FN_CAN_TXCLK,</div><div class='add'>+	GPIO_FN_AUDIO_CLKB, GPIO_FN_USB_OVC2, GPIO_FN_CAN_DEBUGOUT0,</div><div class='add'>+	GPIO_FN_MOUT0,</div><div class='add'>+</div><div class='add'>+	/* IPSR6 */</div><div class='add'>+	GPIO_FN_SSI_SCK0129, GPIO_FN_CAN_DEBUGOUT1, GPIO_FN_MOUT1,</div><div class='add'>+	GPIO_FN_SSI_WS0129, GPIO_FN_CAN_DEBUGOUT2, GPIO_FN_MOUT2,</div><div class='add'>+	GPIO_FN_SSI_SDATA0, GPIO_FN_CAN_DEBUGOUT3, GPIO_FN_MOUT5,</div><div class='add'>+	GPIO_FN_SSI_SDATA1, GPIO_FN_CAN_DEBUGOUT4, GPIO_FN_MOUT6,</div><div class='add'>+	GPIO_FN_SSI_SDATA2, GPIO_FN_CAN_DEBUGOUT5, GPIO_FN_SSI_SCK34,</div><div class='add'>+	GPIO_FN_CAN_DEBUGOUT6, GPIO_FN_CAN0_TX_B, GPIO_FN_IERX,</div><div class='add'>+	GPIO_FN_SSI_SCK9_C, GPIO_FN_SSI_WS34, GPIO_FN_CAN_DEBUGOUT7,</div><div class='add'>+	GPIO_FN_CAN0_RX_B, GPIO_FN_IETX, GPIO_FN_SSI_WS9_C,</div><div class='add'>+	GPIO_FN_SSI_SDATA3, GPIO_FN_PWM0_C, GPIO_FN_CAN_DEBUGOUT8,</div><div class='add'>+	GPIO_FN_CAN_CLK_B, GPIO_FN_IECLK, GPIO_FN_SCIF_CLK_B, GPIO_FN_TCLK0_B,</div><div class='add'>+	GPIO_FN_SSI_SDATA4, GPIO_FN_CAN_DEBUGOUT9, GPIO_FN_SSI_SDATA9_C,</div><div class='add'>+	GPIO_FN_SSI_SCK5, GPIO_FN_ADICLK, GPIO_FN_CAN_DEBUGOUT10,</div><div class='add'>+	GPIO_FN_SCK3, GPIO_FN_TCLK0_D, GPIO_FN_SSI_WS5, GPIO_FN_ADICS_SAMP,</div><div class='add'>+	GPIO_FN_CAN_DEBUGOUT11, GPIO_FN_TX3_IRDA_TX, GPIO_FN_SSI_SDATA5,</div><div class='add'>+	GPIO_FN_ADIDATA, GPIO_FN_CAN_DEBUGOUT12, GPIO_FN_RX3_IRDA_RX,</div><div class='add'>+	GPIO_FN_SSI_SCK6, GPIO_FN_ADICHS0, GPIO_FN_CAN0_TX, GPIO_FN_IERX_B,</div><div class='add'>+</div><div class='add'>+	/* IPSR7 */</div><div class='add'>+	GPIO_FN_SSI_WS6, GPIO_FN_ADICHS1, GPIO_FN_CAN0_RX, GPIO_FN_IETX_B,</div><div class='add'>+	GPIO_FN_SSI_SDATA6, GPIO_FN_ADICHS2, GPIO_FN_CAN_CLK, GPIO_FN_IECLK_B,</div><div class='add'>+	GPIO_FN_SSI_SCK78, GPIO_FN_CAN_DEBUGOUT13, GPIO_FN_IRQ0_B,</div><div class='add'>+	GPIO_FN_SSI_SCK9_B, GPIO_FN_HSPI_CLK1_C, GPIO_FN_SSI_WS78,</div><div class='add'>+	GPIO_FN_CAN_DEBUGOUT14, GPIO_FN_IRQ1_B, GPIO_FN_SSI_WS9_B,</div><div class='add'>+	GPIO_FN_HSPI_CS1_C, GPIO_FN_SSI_SDATA7, GPIO_FN_CAN_DEBUGOUT15,</div><div class='add'>+	GPIO_FN_IRQ2_B, GPIO_FN_TCLK1_C, GPIO_FN_HSPI_TX1_C,</div><div class='add'>+	GPIO_FN_SSI_SDATA8, GPIO_FN_VSP, GPIO_FN_IRQ3_B, GPIO_FN_HSPI_RX1_C,</div><div class='add'>+	GPIO_FN_SD0_CLK, GPIO_FN_ATACS01, GPIO_FN_SCK1_B, GPIO_FN_SD0_CMD,</div><div class='add'>+	GPIO_FN_ATACS11, GPIO_FN_TX1_B, GPIO_FN_CC5_TDO, GPIO_FN_SD0_DAT0,</div><div class='add'>+	GPIO_FN_ATADIR1, GPIO_FN_RX1_B, GPIO_FN_CC5_TRST, GPIO_FN_SD0_DAT1,</div><div class='add'>+	GPIO_FN_ATAG1, GPIO_FN_SCK2_B, GPIO_FN_CC5_TMS, GPIO_FN_SD0_DAT2,</div><div class='add'>+	GPIO_FN_ATARD1,	GPIO_FN_TX2_B, GPIO_FN_CC5_TCK, GPIO_FN_SD0_DAT3,</div><div class='add'>+	GPIO_FN_ATAWR1,	GPIO_FN_RX2_B, GPIO_FN_CC5_TDI, GPIO_FN_SD0_CD,</div><div class='add'>+	GPIO_FN_DREQ2,	GPIO_FN_RTS1_B_TANS_B, GPIO_FN_SD0_WP, GPIO_FN_DACK2,</div><div class='add'>+	GPIO_FN_CTS1_B,</div><div class='add'>+</div><div class='add'>+	/* IPSR8 */</div><div class='add'>+	GPIO_FN_HSPI_CLK0, GPIO_FN_CTS0, GPIO_FN_USB_OVC0, GPIO_FN_AD_CLK,</div><div class='add'>+	GPIO_FN_CC5_STATE4, GPIO_FN_CC5_STATE12, GPIO_FN_CC5_STATE20,</div><div class='add'>+	GPIO_FN_CC5_STATE28, GPIO_FN_CC5_STATE36, GPIO_FN_HSPI_CS0,</div><div class='add'>+	GPIO_FN_RTS0_TANS, GPIO_FN_USB_OVC1, GPIO_FN_AD_DI,</div><div class='add'>+	GPIO_FN_CC5_STATE5, GPIO_FN_CC5_STATE13, GPIO_FN_CC5_STATE21,</div><div class='add'>+	GPIO_FN_CC5_STATE29, GPIO_FN_CC5_STATE37, GPIO_FN_HSPI_TX0,</div><div class='add'>+	GPIO_FN_TX0, GPIO_FN_CAN_DEBUG_HW_TRIGGER, GPIO_FN_AD_DO,</div><div class='add'>+	GPIO_FN_CC5_STATE6, GPIO_FN_CC5_STATE14, GPIO_FN_CC5_STATE22,</div><div class='add'>+	GPIO_FN_CC5_STATE30, GPIO_FN_CC5_STATE38, GPIO_FN_HSPI_RX0,</div><div class='add'>+	GPIO_FN_RX0, GPIO_FN_CAN_STEP0, GPIO_FN_AD_NCS, GPIO_FN_CC5_STATE7,</div><div class='add'>+	GPIO_FN_CC5_STATE15, GPIO_FN_CC5_STATE23, GPIO_FN_CC5_STATE31,</div><div class='add'>+	GPIO_FN_CC5_STATE39, GPIO_FN_FMCLK, GPIO_FN_RDS_CLK, GPIO_FN_PCMOE,</div><div class='add'>+	GPIO_FN_BPFCLK, GPIO_FN_PCMWE, GPIO_FN_FMIN, GPIO_FN_RDS_DATA,</div><div class='add'>+	GPIO_FN_VI0_CLK, GPIO_FN_MMC1_CLK, GPIO_FN_VI0_CLKENB, GPIO_FN_TX1_C,</div><div class='add'>+	GPIO_FN_HTX1_B, GPIO_FN_MT1_SYNC, GPIO_FN_VI0_FIELD, GPIO_FN_RX1_C,</div><div class='add'>+	GPIO_FN_HRX1_B, GPIO_FN_VI0_HSYNC, GPIO_FN_VI0_DATA0_B_VI0_B0_B,</div><div class='add'>+	GPIO_FN_CTS1_C, GPIO_FN_TX4_D, GPIO_FN_MMC1_CMD, GPIO_FN_HSCK1_B,</div><div class='add'>+	GPIO_FN_VI0_VSYNC, GPIO_FN_VI0_DATA1_B_VI0_B1_B,</div><div class='add'>+	GPIO_FN_RTS1_C_TANS_C, GPIO_FN_RX4_D, GPIO_FN_PWMFSW0_C,</div><div class='add'>+</div><div class='add'>+	/* IPSR9 */</div><div class='add'>+	GPIO_FN_VI0_DATA0_VI0_B0, GPIO_FN_HRTS1_B, GPIO_FN_MT1_VCXO,</div><div class='add'>+	GPIO_FN_VI0_DATA1_VI0_B1, GPIO_FN_HCTS1_B, GPIO_FN_MT1_PWM,</div><div class='add'>+	GPIO_FN_VI0_DATA2_VI0_B2, GPIO_FN_MMC1_D0, GPIO_FN_VI0_DATA3_VI0_B3,</div><div class='add'>+	GPIO_FN_MMC1_D1, GPIO_FN_VI0_DATA4_VI0_B4, GPIO_FN_MMC1_D2,</div><div class='add'>+	GPIO_FN_VI0_DATA5_VI0_B5, GPIO_FN_MMC1_D3, GPIO_FN_VI0_DATA6_VI0_B6,</div><div class='add'>+	GPIO_FN_MMC1_D4, GPIO_FN_ARM_TRACEDATA_0, GPIO_FN_VI0_DATA7_VI0_B7,</div><div class='add'>+	GPIO_FN_MMC1_D5, GPIO_FN_ARM_TRACEDATA_1, GPIO_FN_VI0_G0,</div><div class='add'>+	GPIO_FN_SSI_SCK78_C, GPIO_FN_IRQ0, GPIO_FN_ARM_TRACEDATA_2,</div><div class='add'>+	GPIO_FN_VI0_G1, GPIO_FN_SSI_WS78_C, GPIO_FN_IRQ1,</div><div class='add'>+	GPIO_FN_ARM_TRACEDATA_3, GPIO_FN_VI0_G2, GPIO_FN_ETH_TXD1,</div><div class='add'>+	GPIO_FN_MMC1_D6, GPIO_FN_ARM_TRACEDATA_4, GPIO_FN_TS_SPSYNC0,</div><div class='add'>+	GPIO_FN_VI0_G3, GPIO_FN_ETH_CRS_DV, GPIO_FN_MMC1_D7,</div><div class='add'>+	GPIO_FN_ARM_TRACEDATA_5, GPIO_FN_TS_SDAT0, GPIO_FN_VI0_G4,</div><div class='add'>+	GPIO_FN_ETH_TX_EN, GPIO_FN_SD2_DAT0_B, GPIO_FN_ARM_TRACEDATA_6,</div><div class='add'>+	GPIO_FN_VI0_G5,	GPIO_FN_ETH_RX_ER, GPIO_FN_SD2_DAT1_B,</div><div class='add'>+	GPIO_FN_ARM_TRACEDATA_7, GPIO_FN_VI0_G6, GPIO_FN_ETH_RXD0,</div><div class='add'>+	GPIO_FN_SD2_DAT2_B, GPIO_FN_ARM_TRACEDATA_8, GPIO_FN_VI0_G7,</div><div class='add'>+	GPIO_FN_ETH_RXD1, GPIO_FN_SD2_DAT3_B, GPIO_FN_ARM_TRACEDATA_9,</div><div class='add'>+</div><div class='add'>+	/* IPSR10 */</div><div class='add'>+	GPIO_FN_VI0_R0, GPIO_FN_SSI_SDATA7_C, GPIO_FN_SCK1_C, GPIO_FN_DREQ1_B,</div><div class='add'>+	GPIO_FN_ARM_TRACEDATA_10, GPIO_FN_DREQ0_C, GPIO_FN_VI0_R1,</div><div class='add'>+	GPIO_FN_SSI_SDATA8_C, GPIO_FN_DACK1_B, GPIO_FN_ARM_TRACEDATA_11,</div><div class='add'>+	GPIO_FN_DACK0_C, GPIO_FN_DRACK0_C, GPIO_FN_VI0_R2, GPIO_FN_ETH_LINK,</div><div class='add'>+	GPIO_FN_SD2_CLK_B, GPIO_FN_IRQ2, GPIO_FN_ARM_TRACEDATA_12,</div><div class='add'>+	GPIO_FN_VI0_R3, GPIO_FN_ETH_MAGIC, GPIO_FN_SD2_CMD_B, GPIO_FN_IRQ3,</div><div class='add'>+	GPIO_FN_ARM_TRACEDATA_13, GPIO_FN_VI0_R4, GPIO_FN_ETH_REFCLK,</div><div class='add'>+	GPIO_FN_SD2_CD_B, GPIO_FN_HSPI_CLK1_B, GPIO_FN_ARM_TRACEDATA_14,</div><div class='add'>+	GPIO_FN_MT1_CLK, GPIO_FN_TS_SCK0, GPIO_FN_VI0_R5, GPIO_FN_ETH_TXD0,</div><div class='add'>+	GPIO_FN_SD2_WP_B, GPIO_FN_HSPI_CS1_B, GPIO_FN_ARM_TRACEDATA_15,</div><div class='add'>+	GPIO_FN_MT1_D, GPIO_FN_TS_SDEN0, GPIO_FN_VI0_R6, GPIO_FN_ETH_MDC,</div><div class='add'>+	GPIO_FN_DREQ2_C, GPIO_FN_HSPI_TX1_B, GPIO_FN_TRACECLK,</div><div class='add'>+	GPIO_FN_MT1_BEN, GPIO_FN_PWMFSW0_D, GPIO_FN_VI0_R7, GPIO_FN_ETH_MDIO,</div><div class='add'>+	GPIO_FN_DACK2_C, GPIO_FN_HSPI_RX1_B, GPIO_FN_SCIF_CLK_D,</div><div class='add'>+	GPIO_FN_TRACECTL, GPIO_FN_MT1_PEN, GPIO_FN_VI1_CLK, GPIO_FN_SIM_D,</div><div class='add'>+	GPIO_FN_SDA3, GPIO_FN_VI1_HSYNC, GPIO_FN_VI3_CLK, GPIO_FN_SSI_SCK4,</div><div class='add'>+	GPIO_FN_GPS_SIGN_C, GPIO_FN_PWMFSW0_E, GPIO_FN_VI1_VSYNC,</div><div class='add'>+	GPIO_FN_AUDIO_CLKOUT_C, GPIO_FN_SSI_WS4, GPIO_FN_SIM_CLK,</div><div class='add'>+	GPIO_FN_GPS_MAG_C, GPIO_FN_SPV_TRST, GPIO_FN_SCL3,</div><div class='add'>+</div><div class='add'>+	/* IPSR11 */</div><div class='add'>+	GPIO_FN_VI1_DATA0_VI1_B0, GPIO_FN_SD2_DAT0, GPIO_FN_SIM_RST,</div><div class='add'>+	GPIO_FN_SPV_TCK, GPIO_FN_ADICLK_B, GPIO_FN_VI1_DATA1_VI1_B1,</div><div class='add'>+	GPIO_FN_SD2_DAT1, GPIO_FN_MT0_CLK, GPIO_FN_SPV_TMS,</div><div class='add'>+	GPIO_FN_ADICS_B_SAMP_B, GPIO_FN_VI1_DATA2_VI1_B2, GPIO_FN_SD2_DAT2,</div><div class='add'>+	GPIO_FN_MT0_D, GPIO_FN_SPVTDI, GPIO_FN_ADIDATA_B,</div><div class='add'>+	GPIO_FN_VI1_DATA3_VI1_B3, GPIO_FN_SD2_DAT3, GPIO_FN_MT0_BEN,</div><div class='add'>+	GPIO_FN_SPV_TDO, GPIO_FN_ADICHS0_B, GPIO_FN_VI1_DATA4_VI1_B4,</div><div class='add'>+	GPIO_FN_SD2_CLK, GPIO_FN_MT0_PEN, GPIO_FN_SPA_TRST,</div><div class='add'>+	GPIO_FN_HSPI_CLK1_D, GPIO_FN_ADICHS1_B, GPIO_FN_VI1_DATA5_VI1_B5,</div><div class='add'>+	GPIO_FN_SD2_CMD, GPIO_FN_MT0_SYNC, GPIO_FN_SPA_TCK,</div><div class='add'>+	GPIO_FN_HSPI_CS1_D, GPIO_FN_ADICHS2_B, GPIO_FN_VI1_DATA6_VI1_B6,</div><div class='add'>+	GPIO_FN_SD2_CD, GPIO_FN_MT0_VCXO, GPIO_FN_SPA_TMS, GPIO_FN_HSPI_TX1_D,</div><div class='add'>+	GPIO_FN_VI1_DATA7_VI1_B7, GPIO_FN_SD2_WP, GPIO_FN_MT0_PWM,</div><div class='add'>+	GPIO_FN_SPA_TDI, GPIO_FN_HSPI_RX1_D, GPIO_FN_VI1_G0, GPIO_FN_VI3_DATA0,</div><div class='add'>+	GPIO_FN_DU1_DOTCLKOUT1, GPIO_FN_TS_SCK1, GPIO_FN_DREQ2_B, GPIO_FN_TX2,</div><div class='add'>+	GPIO_FN_SPA_TDO, GPIO_FN_HCTS0_B, GPIO_FN_VI1_G1, GPIO_FN_VI3_DATA1,</div><div class='add'>+	GPIO_FN_SSI_SCK1, GPIO_FN_TS_SDEN1, GPIO_FN_DACK2_B, GPIO_FN_RX2,</div><div class='add'>+	GPIO_FN_HRTS0_B,</div><div class='add'>+</div><div class='add'>+	/* IPSR12 */</div><div class='add'>+	GPIO_FN_VI1_G2, GPIO_FN_VI3_DATA2, GPIO_FN_SSI_WS1, GPIO_FN_TS_SPSYNC1,</div><div class='add'>+	GPIO_FN_SCK2, GPIO_FN_HSCK0_B, GPIO_FN_VI1_G3, GPIO_FN_VI3_DATA3,</div><div class='add'>+	GPIO_FN_SSI_SCK2, GPIO_FN_TS_SDAT1, GPIO_FN_SCL1_C, GPIO_FN_HTX0_B,</div><div class='add'>+	GPIO_FN_VI1_G4, GPIO_FN_VI3_DATA4, GPIO_FN_SSI_WS2, GPIO_FN_SDA1_C,</div><div class='add'>+	GPIO_FN_SIM_RST_B, GPIO_FN_HRX0_B, GPIO_FN_VI1_G5, GPIO_FN_VI3_DATA5,</div><div class='add'>+	GPIO_FN_GPS_CLK, GPIO_FN_FSE, GPIO_FN_TX4_B, GPIO_FN_SIM_D_B,</div><div class='add'>+	GPIO_FN_VI1_G6, GPIO_FN_VI3_DATA6, GPIO_FN_GPS_SIGN, GPIO_FN_FRB,</div><div class='add'>+	GPIO_FN_RX4_B, GPIO_FN_SIM_CLK_B, GPIO_FN_VI1_G7, GPIO_FN_VI3_DATA7,</div><div class='add'>+	GPIO_FN_GPS_MAG, GPIO_FN_FCE, GPIO_FN_SCK4_B,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct platform_device;</div><div class='add'>+</div><div class='add'>+struct r8a7779_pm_ch {</div><div class='add'>+	unsigned long chan_offs;</div><div class='add'>+	unsigned int chan_bit;</div><div class='add'>+	unsigned int isr_bit;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct r8a7779_pm_domain {</div><div class='add'>+	struct generic_pm_domain genpd;</div><div class='add'>+	struct r8a7779_pm_ch ch;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct r8a7779_pm_ch *to_r8a7779_ch(struct generic_pm_domain *d)</div><div class='add'>+{</div><div class='add'>+	return &amp;container_of(d, struct r8a7779_pm_domain, genpd)-&gt;ch;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern int r8a7779_sysc_power_down(struct r8a7779_pm_ch *r8a7779_ch);</div><div class='add'>+extern int r8a7779_sysc_power_up(struct r8a7779_pm_ch *r8a7779_ch);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+extern struct r8a7779_pm_domain r8a7779_sh4a;</div><div class='add'>+extern struct r8a7779_pm_domain r8a7779_sgx;</div><div class='add'>+extern struct r8a7779_pm_domain r8a7779_vdp1;</div><div class='add'>+extern struct r8a7779_pm_domain r8a7779_impx3;</div><div class='add'>+</div><div class='add'>+extern void r8a7779_init_pm_domain(struct r8a7779_pm_domain *r8a7779_pd);</div><div class='add'>+extern void r8a7779_add_device_to_domain(struct r8a7779_pm_domain *r8a7779_pd,</div><div class='add'>+					struct platform_device *pdev);</div><div class='add'>+#else</div><div class='add'>+#define r8a7779_init_pm_domain(pd) do { } while (0)</div><div class='add'>+#define r8a7779_add_device_to_domain(pd, pdev) do { } while (0)</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_R8A7779_H__ */</div><div class='head'>diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/include/mach/sh7372.h<br/>index 84532f9629b2..8254ab86f6cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/include/mach/sh7372.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/include/mach/sh7372.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/include/mach/sh7372.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/include/mach/sh7372.h</a></div><div class='hunk'>@@ -480,11 +480,10 @@ struct platform_device;</div><div class='ctx'> struct sh7372_pm_domain {</div><div class='ctx'> 	struct generic_pm_domain genpd;</div><div class='ctx'> 	struct dev_power_governor *gov;</div><div class='del'>-	void (*suspend)(void);</div><div class='add'>+	int (*suspend)(void);</div><div class='ctx'> 	void (*resume)(void);</div><div class='ctx'> 	unsigned int bit_shift;</div><div class='ctx'> 	bool no_debug;</div><div class='del'>-	bool stay_on;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct sh7372_pm_domain *to_sh7372_pd(struct generic_pm_domain *d)</div><div class='hunk'>@@ -499,6 +498,7 @@ extern struct sh7372_pm_domain sh7372_d4;</div><div class='ctx'> extern struct sh7372_pm_domain sh7372_a4r;</div><div class='ctx'> extern struct sh7372_pm_domain sh7372_a3rv;</div><div class='ctx'> extern struct sh7372_pm_domain sh7372_a3ri;</div><div class='add'>+extern struct sh7372_pm_domain sh7372_a4s;</div><div class='ctx'> extern struct sh7372_pm_domain sh7372_a3sp;</div><div class='ctx'> extern struct sh7372_pm_domain sh7372_a3sg;</div><div class='ctx'> </div><div class='hunk'>@@ -515,5 +515,7 @@ extern void sh7372_pm_add_subdomain(struct sh7372_pm_domain *sh7372_pd,</div><div class='ctx'> </div><div class='ctx'> extern void sh7372_intcs_suspend(void);</div><div class='ctx'> extern void sh7372_intcs_resume(void);</div><div class='add'>+extern void sh7372_intca_suspend(void);</div><div class='add'>+extern void sh7372_intca_resume(void);</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_SH7372_H__ */</div><div class='head'>diff --git a/arch/arm/mach-shmobile/include/mach/system.h b/arch/arm/mach-shmobile/include/mach/system.h<br/>index 76a687eeaa22..956ac18ddbf9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/include/mach/system.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@ static inline void arch_idle(void)</div><div class='ctx'> </div><div class='ctx'> static inline void arch_reset(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='del'>-	cpu_reset(0);</div><div class='add'>+	soft_restart(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-shmobile/include/mach/vmalloc.h b/arch/arm/mach-shmobile/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 2b8fd8b942fe..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-#ifndef __ASM_MACH_VMALLOC_H</div><div class='del'>-#define __ASM_MACH_VMALLOC_H</div><div class='del'>-</div><div class='del'>-/* Vmalloc at ... - 0xe5ffffff */</div><div class='del'>-#define VMALLOC_END 0xe6000000UL</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_MACH_VMALLOC_H */</div><div class='head'>diff --git a/arch/arm/mach-shmobile/intc-r8a7740.c b/arch/arm/mach-shmobile/intc-r8a7740.c<br/>new file mode 100644<br/>index 000000000000..272c84c20c83<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/intc-r8a7740.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/intc-r8a7740.c</a></div><div class='hunk'>@@ -0,0 +1,631 @@</div><div class='add'>+/*</div><div class='add'>+ * R8A7740 processor support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011  Renesas Solutions Corp.</div><div class='add'>+ * Copyright (C) 2011  Kuninori Morimoto &lt;kuninori.morimoto.gx@renesas.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; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</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/irq.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/sh_intc.h&gt;</div><div class='add'>+#include &lt;mach/intc.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *		INTCA</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	UNUSED_INTCA = 0,</div><div class='add'>+</div><div class='add'>+	/* interrupt sources INTCA */</div><div class='add'>+	DIRC,</div><div class='add'>+	ATAPI,</div><div class='add'>+	IIC1_ALI, IIC1_TACKI, IIC1_WAITI, IIC1_DTEI,</div><div class='add'>+	AP_ARM_COMMTX, AP_ARM_COMMRX,</div><div class='add'>+	MFI, MFIS,</div><div class='add'>+	BBIF1, BBIF2,</div><div class='add'>+	USBHSDMAC,</div><div class='add'>+	USBF_OUL_SOF, USBF_IXL_INT,</div><div class='add'>+	SGX540,</div><div class='add'>+	CMT1_0, CMT1_1, CMT1_2, CMT1_3,</div><div class='add'>+	CMT2,</div><div class='add'>+	CMT3,</div><div class='add'>+	KEYSC,</div><div class='add'>+	SCIFA0, SCIFA1, SCIFA2, SCIFA3,</div><div class='add'>+	MSIOF2, MSIOF1,</div><div class='add'>+	SCIFA4, SCIFA5, SCIFB,</div><div class='add'>+	FLCTL_FLSTEI, FLCTL_FLTENDI, FLCTL_FLTREQ0I, FLCTL_FLTREQ1I,</div><div class='add'>+	SDHI0_0, SDHI0_1, SDHI0_2, SDHI0_3,</div><div class='add'>+	SDHI1_0, SDHI1_1, SDHI1_2, SDHI1_3,</div><div class='add'>+	AP_ARM_L2CINT,</div><div class='add'>+	IRDA,</div><div class='add'>+	TPU0,</div><div class='add'>+	SCIFA6, SCIFA7,</div><div class='add'>+	GbEther,</div><div class='add'>+	ICBS0,</div><div class='add'>+	DDM,</div><div class='add'>+	SDHI2_0, SDHI2_1, SDHI2_2, SDHI2_3,</div><div class='add'>+	RWDT0,</div><div class='add'>+	DMAC1_1_DEI0, DMAC1_1_DEI1, DMAC1_1_DEI2, DMAC1_1_DEI3,</div><div class='add'>+	DMAC1_2_DEI4, DMAC1_2_DEI5, DMAC1_2_DADERR,</div><div class='add'>+	DMAC2_1_DEI0, DMAC2_1_DEI1, DMAC2_1_DEI2, DMAC2_1_DEI3,</div><div class='add'>+	DMAC2_2_DEI4, DMAC2_2_DEI5, DMAC2_2_DADERR,</div><div class='add'>+	DMAC3_1_DEI0, DMAC3_1_DEI1, DMAC3_1_DEI2, DMAC3_1_DEI3,</div><div class='add'>+	DMAC3_2_DEI4, DMAC3_2_DEI5, DMAC3_2_DADERR,</div><div class='add'>+	SHWYSTAT_RT, SHWYSTAT_HS, SHWYSTAT_COM,</div><div class='add'>+	USBH_INT, USBH_OHCI, USBH_EHCI, USBH_PME, USBH_BIND,</div><div class='add'>+	RSPI_OVRF, RSPI_SPTEF, RSPI_SPRF,</div><div class='add'>+	SPU2_0, SPU2_1,</div><div class='add'>+	FSI, FMSI,</div><div class='add'>+	IPMMU,</div><div class='add'>+	AP_ARM_CTIIRQ, AP_ARM_PMURQ,</div><div class='add'>+	MFIS2,</div><div class='add'>+	CPORTR2S,</div><div class='add'>+	CMT14, CMT15,</div><div class='add'>+	MMCIF_0, MMCIF_1, MMCIF_2,</div><div class='add'>+	SIM_ERI, SIM_RXI, SIM_TXI, SIM_TEI,</div><div class='add'>+	STPRO_0, STPRO_1, STPRO_2, STPRO_3, STPRO_4,</div><div class='add'>+</div><div class='add'>+	/* interrupt groups INTCA */</div><div class='add'>+	DMAC1_1, DMAC1_2,</div><div class='add'>+	DMAC2_1, DMAC2_2,</div><div class='add'>+	DMAC3_1, DMAC3_2,</div><div class='add'>+	AP_ARM1, AP_ARM2,</div><div class='add'>+	SDHI0, SDHI1, SDHI2,</div><div class='add'>+	SHWYSTAT,</div><div class='add'>+	USBF, USBH1, USBH2,</div><div class='add'>+	RSPI, SPU2, FLCTL, IIC1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct intc_vect intca_vectors[] __initdata = {</div><div class='add'>+	INTC_VECT(DIRC,			0x0560),</div><div class='add'>+	INTC_VECT(ATAPI,		0x05E0),</div><div class='add'>+	INTC_VECT(IIC1_ALI,		0x0780),</div><div class='add'>+	INTC_VECT(IIC1_TACKI,		0x07A0),</div><div class='add'>+	INTC_VECT(IIC1_WAITI,		0x07C0),</div><div class='add'>+	INTC_VECT(IIC1_DTEI,		0x07E0),</div><div class='add'>+	INTC_VECT(AP_ARM_COMMTX,	0x0840),</div><div class='add'>+	INTC_VECT(AP_ARM_COMMRX,	0x0860),</div><div class='add'>+	INTC_VECT(MFI,			0x0900),</div><div class='add'>+	INTC_VECT(MFIS,			0x0920),</div><div class='add'>+	INTC_VECT(BBIF1,		0x0940),</div><div class='add'>+	INTC_VECT(BBIF2,		0x0960),</div><div class='add'>+	INTC_VECT(USBHSDMAC,		0x0A00),</div><div class='add'>+	INTC_VECT(USBF_OUL_SOF,		0x0A20),</div><div class='add'>+	INTC_VECT(USBF_IXL_INT,		0x0A40),</div><div class='add'>+	INTC_VECT(SGX540,		0x0A60),</div><div class='add'>+	INTC_VECT(CMT1_0,		0x0B00),</div><div class='add'>+	INTC_VECT(CMT1_1,		0x0B20),</div><div class='add'>+	INTC_VECT(CMT1_2,		0x0B40),</div><div class='add'>+	INTC_VECT(CMT1_3,		0x0B60),</div><div class='add'>+	INTC_VECT(CMT2,			0x0B80),</div><div class='add'>+	INTC_VECT(CMT3,			0x0BA0),</div><div class='add'>+	INTC_VECT(KEYSC,		0x0BE0),</div><div class='add'>+	INTC_VECT(SCIFA0,		0x0C00),</div><div class='add'>+	INTC_VECT(SCIFA1,		0x0C20),</div><div class='add'>+	INTC_VECT(SCIFA2,		0x0C40),</div><div class='add'>+	INTC_VECT(SCIFA3,		0x0C60),</div><div class='add'>+	INTC_VECT(MSIOF2,		0x0C80),</div><div class='add'>+	INTC_VECT(MSIOF1,		0x0D00),</div><div class='add'>+	INTC_VECT(SCIFA4,		0x0D20),</div><div class='add'>+	INTC_VECT(SCIFA5,		0x0D40),</div><div class='add'>+	INTC_VECT(SCIFB,		0x0D60),</div><div class='add'>+	INTC_VECT(FLCTL_FLSTEI,		0x0D80),</div><div class='add'>+	INTC_VECT(FLCTL_FLTENDI,	0x0DA0),</div><div class='add'>+	INTC_VECT(FLCTL_FLTREQ0I,	0x0DC0),</div><div class='add'>+	INTC_VECT(FLCTL_FLTREQ1I,	0x0DE0),</div><div class='add'>+	INTC_VECT(SDHI0_0,		0x0E00),</div><div class='add'>+	INTC_VECT(SDHI0_1,		0x0E20),</div><div class='add'>+	INTC_VECT(SDHI0_2,		0x0E40),</div><div class='add'>+	INTC_VECT(SDHI0_3,		0x0E60),</div><div class='add'>+	INTC_VECT(SDHI1_0,		0x0E80),</div><div class='add'>+	INTC_VECT(SDHI1_1,		0x0EA0),</div><div class='add'>+	INTC_VECT(SDHI1_2,		0x0EC0),</div><div class='add'>+	INTC_VECT(SDHI1_3,		0x0EE0),</div><div class='add'>+	INTC_VECT(AP_ARM_L2CINT,	0x0FA0),</div><div class='add'>+	INTC_VECT(IRDA,			0x0480),</div><div class='add'>+	INTC_VECT(TPU0,			0x04A0),</div><div class='add'>+	INTC_VECT(SCIFA6,		0x04C0),</div><div class='add'>+	INTC_VECT(SCIFA7,		0x04E0),</div><div class='add'>+	INTC_VECT(GbEther,		0x0500),</div><div class='add'>+	INTC_VECT(ICBS0,		0x0540),</div><div class='add'>+	INTC_VECT(DDM,			0x1140),</div><div class='add'>+	INTC_VECT(SDHI2_0,		0x1200),</div><div class='add'>+	INTC_VECT(SDHI2_1,		0x1220),</div><div class='add'>+	INTC_VECT(SDHI2_2,		0x1240),</div><div class='add'>+	INTC_VECT(SDHI2_3,		0x1260),</div><div class='add'>+	INTC_VECT(RWDT0,		0x1280),</div><div class='add'>+	INTC_VECT(DMAC1_1_DEI0,		0x2000),</div><div class='add'>+	INTC_VECT(DMAC1_1_DEI1,		0x2020),</div><div class='add'>+	INTC_VECT(DMAC1_1_DEI2,		0x2040),</div><div class='add'>+	INTC_VECT(DMAC1_1_DEI3,		0x2060),</div><div class='add'>+	INTC_VECT(DMAC1_2_DEI4,		0x2080),</div><div class='add'>+	INTC_VECT(DMAC1_2_DEI5,		0x20A0),</div><div class='add'>+	INTC_VECT(DMAC1_2_DADERR,	0x20C0),</div><div class='add'>+	INTC_VECT(DMAC2_1_DEI0,		0x2100),</div><div class='add'>+	INTC_VECT(DMAC2_1_DEI1,		0x2120),</div><div class='add'>+	INTC_VECT(DMAC2_1_DEI2,		0x2140),</div><div class='add'>+	INTC_VECT(DMAC2_1_DEI3,		0x2160),</div><div class='add'>+	INTC_VECT(DMAC2_2_DEI4,		0x2180),</div><div class='add'>+	INTC_VECT(DMAC2_2_DEI5,		0x21A0),</div><div class='add'>+	INTC_VECT(DMAC2_2_DADERR,	0x21C0),</div><div class='add'>+	INTC_VECT(DMAC3_1_DEI0,		0x2200),</div><div class='add'>+	INTC_VECT(DMAC3_1_DEI1,		0x2220),</div><div class='add'>+	INTC_VECT(DMAC3_1_DEI2,		0x2240),</div><div class='add'>+	INTC_VECT(DMAC3_1_DEI3,		0x2260),</div><div class='add'>+	INTC_VECT(DMAC3_2_DEI4,		0x2280),</div><div class='add'>+	INTC_VECT(DMAC3_2_DEI5,		0x22A0),</div><div class='add'>+	INTC_VECT(DMAC3_2_DADERR,	0x22C0),</div><div class='add'>+	INTC_VECT(SHWYSTAT_RT,		0x1300),</div><div class='add'>+	INTC_VECT(SHWYSTAT_HS,		0x1320),</div><div class='add'>+	INTC_VECT(SHWYSTAT_COM,		0x1340),</div><div class='add'>+	INTC_VECT(USBH_INT,		0x1540),</div><div class='add'>+	INTC_VECT(USBH_OHCI,		0x1560),</div><div class='add'>+	INTC_VECT(USBH_EHCI,		0x1580),</div><div class='add'>+	INTC_VECT(USBH_PME,		0x15A0),</div><div class='add'>+	INTC_VECT(USBH_BIND,		0x15C0),</div><div class='add'>+	INTC_VECT(RSPI_OVRF,		0x1780),</div><div class='add'>+	INTC_VECT(RSPI_SPTEF,		0x17A0),</div><div class='add'>+	INTC_VECT(RSPI_SPRF,		0x17C0),</div><div class='add'>+	INTC_VECT(SPU2_0,		0x1800),</div><div class='add'>+	INTC_VECT(SPU2_1,		0x1820),</div><div class='add'>+	INTC_VECT(FSI,			0x1840),</div><div class='add'>+	INTC_VECT(FMSI,			0x1860),</div><div class='add'>+	INTC_VECT(IPMMU,		0x1920),</div><div class='add'>+	INTC_VECT(AP_ARM_CTIIRQ,	0x1980),</div><div class='add'>+	INTC_VECT(AP_ARM_PMURQ,		0x19A0),</div><div class='add'>+	INTC_VECT(MFIS2,		0x1A00),</div><div class='add'>+	INTC_VECT(CPORTR2S,		0x1A20),</div><div class='add'>+	INTC_VECT(CMT14,		0x1A40),</div><div class='add'>+	INTC_VECT(CMT15,		0x1A60),</div><div class='add'>+	INTC_VECT(MMCIF_0,		0x1AA0),</div><div class='add'>+	INTC_VECT(MMCIF_1,		0x1AC0),</div><div class='add'>+	INTC_VECT(MMCIF_2,		0x1AE0),</div><div class='add'>+	INTC_VECT(SIM_ERI,		0x1C00),</div><div class='add'>+	INTC_VECT(SIM_RXI,		0x1C20),</div><div class='add'>+	INTC_VECT(SIM_TXI,		0x1C40),</div><div class='add'>+	INTC_VECT(SIM_TEI,		0x1C60),</div><div class='add'>+	INTC_VECT(STPRO_0,		0x1C80),</div><div class='add'>+	INTC_VECT(STPRO_1,		0x1CA0),</div><div class='add'>+	INTC_VECT(STPRO_2,		0x1CC0),</div><div class='add'>+	INTC_VECT(STPRO_3,		0x1CE0),</div><div class='add'>+	INTC_VECT(STPRO_4,		0x1D00),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct intc_group intca_groups[] __initdata = {</div><div class='add'>+	INTC_GROUP(DMAC1_1,</div><div class='add'>+		   DMAC1_1_DEI0, DMAC1_1_DEI1, DMAC1_1_DEI2, DMAC1_1_DEI3),</div><div class='add'>+	INTC_GROUP(DMAC1_2,</div><div class='add'>+		   DMAC1_2_DEI4, DMAC1_2_DEI5, DMAC1_2_DADERR),</div><div class='add'>+	INTC_GROUP(DMAC2_1,</div><div class='add'>+		   DMAC2_1_DEI0, DMAC2_1_DEI1, DMAC2_1_DEI2, DMAC2_1_DEI3),</div><div class='add'>+	INTC_GROUP(DMAC2_2,</div><div class='add'>+		   DMAC2_2_DEI4, DMAC2_2_DEI5, DMAC2_2_DADERR),</div><div class='add'>+	INTC_GROUP(DMAC3_1,</div><div class='add'>+		   DMAC3_1_DEI0, DMAC3_1_DEI1, DMAC3_1_DEI2, DMAC3_1_DEI3),</div><div class='add'>+	INTC_GROUP(DMAC3_2,</div><div class='add'>+		   DMAC3_2_DEI4, DMAC3_2_DEI5, DMAC3_2_DADERR),</div><div class='add'>+	INTC_GROUP(AP_ARM1,</div><div class='add'>+		   AP_ARM_COMMTX, AP_ARM_COMMRX),</div><div class='add'>+	INTC_GROUP(AP_ARM2,</div><div class='add'>+		   AP_ARM_CTIIRQ, AP_ARM_PMURQ),</div><div class='add'>+	INTC_GROUP(USBF,</div><div class='add'>+		   USBF_OUL_SOF, USBF_IXL_INT),</div><div class='add'>+	INTC_GROUP(SDHI0,</div><div class='add'>+		   SDHI0_0, SDHI0_1, SDHI0_2, SDHI0_3),</div><div class='add'>+	INTC_GROUP(SDHI1,</div><div class='add'>+		   SDHI1_0, SDHI1_1, SDHI1_2, SDHI1_3),</div><div class='add'>+	INTC_GROUP(SDHI2,</div><div class='add'>+		   SDHI2_0, SDHI2_1, SDHI2_2, SDHI2_3),</div><div class='add'>+	INTC_GROUP(SHWYSTAT,</div><div class='add'>+		   SHWYSTAT_RT, SHWYSTAT_HS, SHWYSTAT_COM),</div><div class='add'>+	INTC_GROUP(USBH1, /* FIXME */</div><div class='add'>+		   USBH_INT, USBH_OHCI),</div><div class='add'>+	INTC_GROUP(USBH2, /* FIXME */</div><div class='add'>+		   USBH_EHCI,</div><div class='add'>+		   USBH_PME, USBH_BIND),</div><div class='add'>+	INTC_GROUP(RSPI,</div><div class='add'>+		   RSPI_OVRF, RSPI_SPTEF, RSPI_SPRF),</div><div class='add'>+	INTC_GROUP(SPU2,</div><div class='add'>+		   SPU2_0, SPU2_1),</div><div class='add'>+	INTC_GROUP(FLCTL,</div><div class='add'>+		   FLCTL_FLSTEI, FLCTL_FLTENDI, FLCTL_FLTREQ0I, FLCTL_FLTREQ1I),</div><div class='add'>+	INTC_GROUP(IIC1,</div><div class='add'>+		   IIC1_ALI, IIC1_TACKI, IIC1_WAITI, IIC1_DTEI),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct intc_mask_reg intca_mask_registers[] __initdata = {</div><div class='add'>+	{ /* IMR0A / IMCR0A */ 0xe6940080, 0xe69400c0, 8,</div><div class='add'>+	  { DMAC2_1_DEI3, DMAC2_1_DEI2, DMAC2_1_DEI1, DMAC2_1_DEI0,</div><div class='add'>+	    0, 0, AP_ARM_COMMTX, AP_ARM_COMMRX } },</div><div class='add'>+	{ /* IMR1A / IMCR1A */ 0xe6940084, 0xe69400c4, 8,</div><div class='add'>+	  { ATAPI, 0, DIRC, 0,</div><div class='add'>+	    DMAC1_1_DEI3, DMAC1_1_DEI2, DMAC1_1_DEI1, DMAC1_1_DEI0 } },</div><div class='add'>+	{ /* IMR2A / IMCR2A */ 0xe6940088, 0xe69400c8, 8,</div><div class='add'>+	  { 0, 0, 0, 0,</div><div class='add'>+	    BBIF1, BBIF2, MFIS, MFI } },</div><div class='add'>+	{ /* IMR3A / IMCR3A */ 0xe694008c, 0xe69400cc, 8,</div><div class='add'>+	  { DMAC3_1_DEI3, DMAC3_1_DEI2, DMAC3_1_DEI1, DMAC3_1_DEI0,</div><div class='add'>+	    DMAC3_2_DADERR, DMAC3_2_DEI5, DMAC3_2_DEI4, IRDA } },</div><div class='add'>+	{ /* IMR4A / IMCR4A */ 0xe6940090, 0xe69400d0, 8,</div><div class='add'>+	  { DDM, 0, 0, 0,</div><div class='add'>+	    0, 0, 0, 0 } },</div><div class='add'>+	{ /* IMR5A / IMCR5A */ 0xe6940094, 0xe69400d4, 8,</div><div class='add'>+	  { KEYSC, DMAC1_2_DADERR, DMAC1_2_DEI5, DMAC1_2_DEI4,</div><div class='add'>+	    SCIFA3, SCIFA2, SCIFA1, SCIFA0 } },</div><div class='add'>+	{ /* IMR6A / IMCR6A */ 0xe6940098, 0xe69400d8, 8,</div><div class='add'>+	  { SCIFB, SCIFA5, SCIFA4, MSIOF1,</div><div class='add'>+	    0, 0, MSIOF2, 0 } },</div><div class='add'>+	{ /* IMR7A / IMCR7A */ 0xe694009c, 0xe69400dc, 8,</div><div class='add'>+	  { SDHI0_3, SDHI0_2, SDHI0_1, SDHI0_0,</div><div class='add'>+	    FLCTL_FLTREQ1I, FLCTL_FLTREQ0I, FLCTL_FLTENDI, FLCTL_FLSTEI } },</div><div class='add'>+	{ /* IMR8A / IMCR8A */ 0xe69400a0, 0xe69400e0, 8,</div><div class='add'>+	  { SDHI1_3, SDHI1_2, SDHI1_1, SDHI1_0,</div><div class='add'>+	    0, USBHSDMAC, 0, AP_ARM_L2CINT } },</div><div class='add'>+	{ /* IMR9A / IMCR9A */ 0xe69400a4, 0xe69400e4, 8,</div><div class='add'>+	  { CMT1_3, CMT1_2, CMT1_1, CMT1_0,</div><div class='add'>+	    CMT2, USBF_IXL_INT, USBF_OUL_SOF, SGX540 } },</div><div class='add'>+	{ /* IMR10A / IMCR10A */ 0xe69400a8, 0xe69400e8, 8,</div><div class='add'>+	  { 0, DMAC2_2_DADERR, DMAC2_2_DEI5, DMAC2_2_DEI4,</div><div class='add'>+	    0, 0, 0, 0 } },</div><div class='add'>+	{ /* IMR11A / IMCR11A */ 0xe69400ac, 0xe69400ec, 8,</div><div class='add'>+	  { IIC1_DTEI, IIC1_WAITI, IIC1_TACKI, IIC1_ALI,</div><div class='add'>+	    ICBS0, 0, 0, 0 } },</div><div class='add'>+	{ /* IMR12A / IMCR12A */ 0xe69400b0, 0xe69400f0, 8,</div><div class='add'>+	  { 0, 0, TPU0, SCIFA6,</div><div class='add'>+	    SCIFA7, GbEther, 0, 0 } },</div><div class='add'>+	{ /* IMR13A / IMCR13A */ 0xe69400b4, 0xe69400f4, 8,</div><div class='add'>+	  { SDHI2_3, SDHI2_2, SDHI2_1, SDHI2_0,</div><div class='add'>+	    0, CMT3, 0, RWDT0 } },</div><div class='add'>+	{ /* IMR0A3 / IMCR0A3 */ 0xe6950080, 0xe69500c0, 8,</div><div class='add'>+	  { SHWYSTAT_RT, SHWYSTAT_HS, SHWYSTAT_COM, 0,</div><div class='add'>+	    0, 0, 0, 0 } },</div><div class='add'>+	  /* IMR1A3 / IMCR1A3 */</div><div class='add'>+	{ /* IMR2A3 / IMCR2A3 */ 0xe6950088, 0xe69500c8, 8,</div><div class='add'>+	  { 0, 0, USBH_INT, USBH_OHCI,</div><div class='add'>+	    USBH_EHCI, USBH_PME, USBH_BIND, 0 } },</div><div class='add'>+	  /* IMR3A3 / IMCR3A3 */</div><div class='add'>+	{ /* IMR4A3 / IMCR4A3 */ 0xe6950090, 0xe69500d0, 8,</div><div class='add'>+	  { 0, 0, 0, 0,</div><div class='add'>+	    RSPI_OVRF, RSPI_SPTEF, RSPI_SPRF, 0 } },</div><div class='add'>+	{ /* IMR5A3 / IMCR5A3 */ 0xe6950094, 0xe69500d4, 8,</div><div class='add'>+	  { SPU2_0, SPU2_1, FSI, FMSI,</div><div class='add'>+	    0, 0, 0, 0 } },</div><div class='add'>+	{ /* IMR6A3 / IMCR6A3 */ 0xe6950098, 0xe69500d8, 8,</div><div class='add'>+	  { 0, IPMMU, 0, 0,</div><div class='add'>+	    AP_ARM_CTIIRQ, AP_ARM_PMURQ, 0, 0 } },</div><div class='add'>+	{ /* IMR7A3 / IMCR7A3 */ 0xe695009c, 0xe69500dc, 8,</div><div class='add'>+	  { MFIS2, CPORTR2S, CMT14, CMT15,</div><div class='add'>+	    0, MMCIF_0, MMCIF_1, MMCIF_2 } },</div><div class='add'>+	  /* IMR8A3 / IMCR8A3 */</div><div class='add'>+	{ /* IMR9A3 / IMCR9A3 */ 0xe69500a4, 0xe69500e4, 8,</div><div class='add'>+	  { SIM_ERI, SIM_RXI, SIM_TXI, SIM_TEI,</div><div class='add'>+	    STPRO_0, STPRO_1, STPRO_2, STPRO_3 } },</div><div class='add'>+	{ /* IMR10A3 / IMCR10A3 */ 0xe69500a8, 0xe69500e8, 8,</div><div class='add'>+	  { STPRO_4, 0, 0, 0,</div><div class='add'>+	    0, 0, 0, 0 } },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct intc_prio_reg intca_prio_registers[] __initdata = {</div><div class='add'>+	{ 0xe6940000, 0, 16, 4, /* IPRAA */ { DMAC3_1, DMAC3_2, CMT2, ICBS0 } },</div><div class='add'>+	{ 0xe6940004, 0, 16, 4, /* IPRBA */ { IRDA, 0, BBIF1, BBIF2 } },</div><div class='add'>+	{ 0xe6940008, 0, 16, 4, /* IPRCA */ { ATAPI, 0, CMT1_1, AP_ARM1 } },</div><div class='add'>+	{ 0xe694000c, 0, 16, 4, /* IPRDA */ { 0, 0, CMT1_2, 0 } },</div><div class='add'>+	{ 0xe6940010, 0, 16, 4, /* IPREA */ { DMAC1_1, MFIS, MFI, USBF } },</div><div class='add'>+	{ 0xe6940014, 0, 16, 4, /* IPRFA */ { KEYSC, DMAC1_2,</div><div class='add'>+					      SGX540, CMT1_0 } },</div><div class='add'>+	{ 0xe6940018, 0, 16, 4, /* IPRGA */ { SCIFA0, SCIFA1,</div><div class='add'>+					      SCIFA2, SCIFA3 } },</div><div class='add'>+	{ 0xe694001c, 0, 16, 4, /* IPRGH */ { MSIOF2, USBHSDMAC,</div><div class='add'>+					      FLCTL, SDHI0 } },</div><div class='add'>+	{ 0xe6940020, 0, 16, 4, /* IPRIA */ { MSIOF1, SCIFA4, 0, IIC1 } },</div><div class='add'>+	{ 0xe6940024, 0, 16, 4, /* IPRJA */ { DMAC2_1, DMAC2_2,</div><div class='add'>+					      AP_ARM_L2CINT, 0 } },</div><div class='add'>+	{ 0xe6940028, 0, 16, 4, /* IPRKA */ { 0, CMT1_3, 0, SDHI1 } },</div><div class='add'>+	{ 0xe694002c, 0, 16, 4, /* IPRLA */ { TPU0, SCIFA6,</div><div class='add'>+					      SCIFA7, GbEther } },</div><div class='add'>+	{ 0xe6940030, 0, 16, 4, /* IPRMA */ { 0, CMT3, 0, RWDT0 } },</div><div class='add'>+	{ 0xe6940034, 0, 16, 4, /* IPRNA */ { SCIFB, SCIFA5, 0, DDM } },</div><div class='add'>+	{ 0xe6940038, 0, 16, 4, /* IPROA */ { 0, 0, DIRC, SDHI2 } },</div><div class='add'>+	{ 0xe6950000, 0, 16, 4, /* IPRAA3 */ { SHWYSTAT, 0, 0, 0 } },</div><div class='add'>+				/* IPRBA3 */</div><div class='add'>+				/* IPRCA3 */</div><div class='add'>+				/* IPRDA3 */</div><div class='add'>+	{ 0xe6950010, 0, 16, 4, /* IPREA3 */ { USBH1, 0, 0, 0 } },</div><div class='add'>+	{ 0xe6950014, 0, 16, 4, /* IPRFA3 */ { USBH2, 0, 0, 0 } },</div><div class='add'>+				/* IPRGA3 */</div><div class='add'>+				/* IPRHA3 */</div><div class='add'>+				/* IPRIA3 */</div><div class='add'>+	{ 0xe6950024, 0, 16, 4, /* IPRJA3 */ { RSPI, 0, 0, 0 } },</div><div class='add'>+	{ 0xe6950028, 0, 16, 4, /* IPRKA3 */ { SPU2, 0, FSI, FMSI } },</div><div class='add'>+				/* IPRLA3 */</div><div class='add'>+	{ 0xe6950030, 0, 16, 4, /* IPRMA3 */ { IPMMU, 0, 0, 0 } },</div><div class='add'>+	{ 0xe6950034, 0, 16, 4, /* IPRNA3 */ { AP_ARM2, 0, 0, 0 } },</div><div class='add'>+	{ 0xe6950038, 0, 16, 4, /* IPROA3 */ { MFIS2, CPORTR2S,</div><div class='add'>+					       CMT14, CMT15 } },</div><div class='add'>+	{ 0xe695003c, 0, 16, 4, /* IPRPA3 */ { 0, MMCIF_0, MMCIF_1, MMCIF_2 } },</div><div class='add'>+				/* IPRQA3 */</div><div class='add'>+				/* IPRRA3 */</div><div class='add'>+	{ 0xe6950048, 0, 16, 4, /* IPRSA3 */ { SIM_ERI, SIM_RXI,</div><div class='add'>+					       SIM_TXI, SIM_TEI } },</div><div class='add'>+	{ 0xe695004c, 0, 16, 4, /* IPRTA3 */ { STPRO_0, STPRO_1,</div><div class='add'>+					       STPRO_2, STPRO_3 } },</div><div class='add'>+	{ 0xe6950050, 0, 16, 4, /* IPRUA3 */ { STPRO_4, 0, 0, 0 } },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DECLARE_INTC_DESC(intca_desc, "r8a7740-intca",</div><div class='add'>+			 intca_vectors, intca_groups,</div><div class='add'>+			 intca_mask_registers, intca_prio_registers,</div><div class='add'>+			 NULL);</div><div class='add'>+</div><div class='add'>+INTC_IRQ_PINS_32(intca_irq_pins, 0xe6900000,</div><div class='add'>+		 INTC_VECT, "r8a7740-intca-irq-pins");</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *		INTCS</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	UNUSED_INTCS = 0,</div><div class='add'>+</div><div class='add'>+	INTCS,</div><div class='add'>+</div><div class='add'>+	/* interrupt sources INTCS */</div><div class='add'>+</div><div class='add'>+	/* HUDI */</div><div class='add'>+	/* STPRO */</div><div class='add'>+	/* RTDMAC(1) */</div><div class='add'>+	VPU5HA2,</div><div class='add'>+	_2DG_TRAP, _2DG_GPM_INT, _2DG_CER_INT,</div><div class='add'>+	/* MFI */</div><div class='add'>+	/* BBIF2 */</div><div class='add'>+	VPU5F,</div><div class='add'>+	_2DG_BRK_INT,</div><div class='add'>+	/* SGX540 */</div><div class='add'>+	/* 2DDMAC */</div><div class='add'>+	/* IPMMU */</div><div class='add'>+	/* RTDMAC 2 */</div><div class='add'>+	/* KEYSC */</div><div class='add'>+	/* MSIOF */</div><div class='add'>+	IIC0_ALI, IIC0_TACKI, IIC0_WAITI, IIC0_DTEI,</div><div class='add'>+	TMU0_0, TMU0_1, TMU0_2,</div><div class='add'>+	CMT0,</div><div class='add'>+	/* CMT2 */</div><div class='add'>+	LMB,</div><div class='add'>+	CTI,</div><div class='add'>+	VOU,</div><div class='add'>+	/* RWDT0 */</div><div class='add'>+	ICB,</div><div class='add'>+	VIO6C,</div><div class='add'>+	CEU20, CEU21,</div><div class='add'>+	JPU,</div><div class='add'>+	LCDC0,</div><div class='add'>+	LCRC,</div><div class='add'>+	/* RTDMAC2(1) */</div><div class='add'>+	/* RTDMAC2(2) */</div><div class='add'>+	LCDC1,</div><div class='add'>+	/* SPU2 */</div><div class='add'>+	/* FSI */</div><div class='add'>+	/* FMSI */</div><div class='add'>+	TMU1_0, TMU1_1, TMU1_2,</div><div class='add'>+	CMT4,</div><div class='add'>+	DISP,</div><div class='add'>+	DSRV,</div><div class='add'>+	/* MFIS2 */</div><div class='add'>+	CPORTS2R,</div><div class='add'>+</div><div class='add'>+	/* interrupt groups INTCS */</div><div class='add'>+	_2DG1,</div><div class='add'>+	IIC0, TMU1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct intc_vect intcs_vectors[] = {</div><div class='add'>+	/* HUDI */</div><div class='add'>+	/* STPRO */</div><div class='add'>+	/* RTDMAC(1) */</div><div class='add'>+	INTCS_VECT(VPU5HA2,		0x0880),</div><div class='add'>+	INTCS_VECT(_2DG_TRAP,		0x08A0),</div><div class='add'>+	INTCS_VECT(_2DG_GPM_INT,	0x08C0),</div><div class='add'>+	INTCS_VECT(_2DG_CER_INT,	0x08E0),</div><div class='add'>+	/* MFI */</div><div class='add'>+	/* BBIF2 */</div><div class='add'>+	INTCS_VECT(VPU5F,		0x0980),</div><div class='add'>+	INTCS_VECT(_2DG_BRK_INT,	0x09A0),</div><div class='add'>+	/* SGX540 */</div><div class='add'>+	/* 2DDMAC */</div><div class='add'>+	/* IPMMU */</div><div class='add'>+	/* RTDMAC(2) */</div><div class='add'>+	/* KEYSC */</div><div class='add'>+	/* MSIOF */</div><div class='add'>+	INTCS_VECT(IIC0_ALI,		0x0E00),</div><div class='add'>+	INTCS_VECT(IIC0_TACKI,		0x0E20),</div><div class='add'>+	INTCS_VECT(IIC0_WAITI,		0x0E40),</div><div class='add'>+	INTCS_VECT(IIC0_DTEI,		0x0E60),</div><div class='add'>+	INTCS_VECT(TMU0_0,		0x0E80),</div><div class='add'>+	INTCS_VECT(TMU0_1,		0x0EA0),</div><div class='add'>+	INTCS_VECT(TMU0_2,		0x0EC0),</div><div class='add'>+	INTCS_VECT(CMT0,		0x0F00),</div><div class='add'>+	/* CMT2 */</div><div class='add'>+	INTCS_VECT(LMB,			0x0F60),</div><div class='add'>+	INTCS_VECT(CTI,			0x0400),</div><div class='add'>+	INTCS_VECT(VOU,			0x0420),</div><div class='add'>+	/* RWDT0 */</div><div class='add'>+	INTCS_VECT(ICB,			0x0480),</div><div class='add'>+	INTCS_VECT(VIO6C,		0x04E0),</div><div class='add'>+	INTCS_VECT(CEU20,		0x0500),</div><div class='add'>+	INTCS_VECT(CEU21,		0x0520),</div><div class='add'>+	INTCS_VECT(JPU,			0x0560),</div><div class='add'>+	INTCS_VECT(LCDC0,		0x0580),</div><div class='add'>+	INTCS_VECT(LCRC,		0x05A0),</div><div class='add'>+	/* RTDMAC2(1) */</div><div class='add'>+	/* RTDMAC2(2) */</div><div class='add'>+	INTCS_VECT(LCDC1,		0x1780),</div><div class='add'>+	/* SPU2 */</div><div class='add'>+	/* FSI */</div><div class='add'>+	/* FMSI */</div><div class='add'>+	INTCS_VECT(TMU1_0,		0x1900),</div><div class='add'>+	INTCS_VECT(TMU1_1,		0x1920),</div><div class='add'>+	INTCS_VECT(TMU1_2,		0x1940),</div><div class='add'>+	INTCS_VECT(CMT4,		0x1980),</div><div class='add'>+	INTCS_VECT(DISP,		0x19A0),</div><div class='add'>+	INTCS_VECT(DSRV,		0x19C0),</div><div class='add'>+	/* MFIS2 */</div><div class='add'>+	INTCS_VECT(CPORTS2R,		0x1A20),</div><div class='add'>+</div><div class='add'>+	INTC_VECT(INTCS,		0xf80),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct intc_group intcs_groups[] __initdata = {</div><div class='add'>+	INTC_GROUP(_2DG1, /*FIXME*/</div><div class='add'>+		   _2DG_CER_INT, _2DG_GPM_INT, _2DG_TRAP),</div><div class='add'>+	INTC_GROUP(IIC0,</div><div class='add'>+		   IIC0_DTEI, IIC0_WAITI, IIC0_TACKI, IIC0_ALI),</div><div class='add'>+	INTC_GROUP(TMU1,</div><div class='add'>+		   TMU1_0, TMU1_1, TMU1_2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct intc_mask_reg intcs_mask_registers[] = {</div><div class='add'>+	  /* IMR0SA / IMCR0SA */ /* all 0 */</div><div class='add'>+	{ /* IMR1SA / IMCR1SA */ 0xffd20184, 0xffd201c4, 8,</div><div class='add'>+	  { _2DG_CER_INT, _2DG_GPM_INT, _2DG_TRAP, VPU5HA2,</div><div class='add'>+	    0, 0, 0, 0 /*STPRO*/ } },</div><div class='add'>+	{ /* IMR2SA / IMCR2SA */ 0xffd20188, 0xffd201c8, 8,</div><div class='add'>+	  { 0/*STPRO*/, 0, CEU21, VPU5F,</div><div class='add'>+	    0/*BBIF2*/, 0, 0, 0/*MFI*/ } },</div><div class='add'>+	{ /* IMR3SA / IMCR3SA */ 0xffd2018c, 0xffd201cc, 8,</div><div class='add'>+	  { 0, 0, 0, 0, /*2DDMAC*/</div><div class='add'>+	    VIO6C, 0, 0, ICB } },</div><div class='add'>+	{ /* IMR4SA / IMCR4SA */ 0xffd20190, 0xffd201d0, 8,</div><div class='add'>+	  { 0, 0, VOU, CTI,</div><div class='add'>+	    JPU, 0, LCRC, LCDC0 } },</div><div class='add'>+	  /* IMR5SA / IMCR5SA */ /*KEYSC/RTDMAC2/RTDMAC1*/</div><div class='add'>+	  /* IMR6SA / IMCR6SA */ /*MSIOF/SGX540*/</div><div class='add'>+	{ /* IMR7SA / IMCR7SA */ 0xffd2019c, 0xffd201dc, 8,</div><div class='add'>+	  { 0, TMU0_2, TMU0_1, TMU0_0,</div><div class='add'>+	    0, 0, 0, 0 } },</div><div class='add'>+	{ /* IMR8SA / IMCR8SA */ 0xffd201a0, 0xffd201e0, 8,</div><div class='add'>+	  { 0, 0, 0, 0,</div><div class='add'>+	    CEU20, 0, 0, 0 } },</div><div class='add'>+	{ /* IMR9SA / IMCR9SA */ 0xffd201a4, 0xffd201e4, 8,</div><div class='add'>+	  { 0, 0/*RWDT0*/, 0/*CMT2*/, CMT0,</div><div class='add'>+	    0, 0, 0, 0 } },</div><div class='add'>+	  /* IMR10SA / IMCR10SA */ /*IPMMU*/</div><div class='add'>+	{ /* IMR11SA / IMCR11SA */ 0xffd201ac, 0xffd201ec, 8,</div><div class='add'>+	  { IIC0_DTEI, IIC0_WAITI, IIC0_TACKI, IIC0_ALI,</div><div class='add'>+	    0, _2DG_BRK_INT, LMB, 0 } },</div><div class='add'>+	  /* IMR12SA / IMCR12SA */</div><div class='add'>+	  /* IMR13SA / IMCR13SA */</div><div class='add'>+	  /* IMR0SA3 / IMCR0SA3 */ /*RTDMAC2(1)/RTDMAC2(2)*/</div><div class='add'>+	  /* IMR1SA3 / IMCR1SA3 */</div><div class='add'>+	  /* IMR2SA3 / IMCR2SA3 */</div><div class='add'>+	  /* IMR3SA3 / IMCR3SA3 */</div><div class='add'>+	{ /* IMR4SA3 / IMCR4SA3 */ 0xffd50190, 0xffd501d0, 8,</div><div class='add'>+	  { 0, 0, 0, 0,</div><div class='add'>+	    LCDC1, 0, 0, 0 } },</div><div class='add'>+	  /* IMR5SA3 / IMCR5SA3 */ /* SPU2/FSI/FMSI */</div><div class='add'>+	{ /* IMR6SA3 / IMCR6SA3 */ 0xffd50198, 0xffd501d8, 8,</div><div class='add'>+	  { TMU1_0, TMU1_1, TMU1_2, 0,</div><div class='add'>+	    CMT4, DISP, DSRV, 0 } },</div><div class='add'>+	{ /* IMR7SA3 / IMCR7SA3 */ 0xffd5019c, 0xffd501dc, 8,</div><div class='add'>+	  { 0/*MFIS2*/, CPORTS2R, 0, 0,</div><div class='add'>+	    0, 0, 0, 0 } },</div><div class='add'>+	{ /* INTAMASK */ 0xffd20104, 0, 16,</div><div class='add'>+	  { 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	    0, 0, 0, 0, 0, 0, 0, INTCS } },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Priority is needed for INTCA to receive the INTCS interrupt */</div><div class='add'>+static struct intc_prio_reg intcs_prio_registers[] = {</div><div class='add'>+	{ 0xffd20000, 0, 16, 4, /* IPRAS */ { CTI, VOU, 0/*2DDMAC*/, ICB } },</div><div class='add'>+	{ 0xffd20004, 0, 16, 4, /* IPRBS */ { JPU, LCDC0, 0, LCRC } },</div><div class='add'>+				/* IPRCS */ /*BBIF2*/</div><div class='add'>+				/* IPRDS */</div><div class='add'>+	{ 0xffd20010, 0, 16, 4, /* IPRES */ { 0/*RTDMAC(1)*/, VPU5HA2,</div><div class='add'>+					      0/*MFI*/, VPU5F } },</div><div class='add'>+	{ 0xffd20014, 0, 16, 4, /* IPRFS */ { 0/*KEYSC*/, 0/*RTDMAC(2)*/,</div><div class='add'>+					      0/*CMT2*/, CMT0 } },</div><div class='add'>+	{ 0xffd20018, 0, 16, 4, /* IPRGS */ { TMU0_0, TMU0_1,</div><div class='add'>+					      TMU0_2, _2DG1 } },</div><div class='add'>+	{ 0xffd2001c, 0, 16, 4, /* IPRHS */ { 0, 0/*STPRO*/, 0/*STPRO*/,</div><div class='add'>+					      _2DG_BRK_INT/*FIXME*/ } },</div><div class='add'>+	{ 0xffd20020, 0, 16, 4, /* IPRIS */ { 0, 0/*MSIOF*/, 0, IIC0 } },</div><div class='add'>+	{ 0xffd20024, 0, 16, 4, /* IPRJS */ { CEU20, 0/*SGX540*/, 0, 0 } },</div><div class='add'>+	{ 0xffd20028, 0, 16, 4, /* IPRKS */ { VIO6C, 0, LMB, 0 } },</div><div class='add'>+	{ 0xffd2002c, 0, 16, 4, /* IPRLS */ { 0/*IPMMU*/, 0, CEU21, 0 } },</div><div class='add'>+				/* IPRMS */ /*RWDT0*/</div><div class='add'>+				/* IPRAS3 */ /*RTDMAC2(1)*/</div><div class='add'>+				/* IPRBS3 */ /*RTDMAC2(2)*/</div><div class='add'>+				/* IPRCS3 */</div><div class='add'>+				/* IPRDS3 */</div><div class='add'>+				/* IPRES3 */</div><div class='add'>+				/* IPRFS3 */</div><div class='add'>+				/* IPRGS3 */</div><div class='add'>+				/* IPRHS3 */</div><div class='add'>+				/* IPRIS3 */</div><div class='add'>+	{ 0xffd50024, 0, 16, 4, /* IPRJS3 */ { LCDC1, 0, 0, 0 } },</div><div class='add'>+				/* IPRKS3 */ /*SPU2/FSI/FMSi*/</div><div class='add'>+				/* IPRLS3 */</div><div class='add'>+	{ 0xffd50030, 0, 16, 4, /* IPRMS3 */ { TMU1, 0, 0, 0 } },</div><div class='add'>+	{ 0xffd50034, 0, 16, 4, /* IPRNS3 */ { CMT4, DISP, DSRV, 0 } },</div><div class='add'>+	{ 0xffd50038, 0, 16, 4, /* IPROS3 */ { 0/*MFIS2*/, CPORTS2R, 0, 0 } },</div><div class='add'>+				/* IPRPS3 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource intcs_resources[] __initdata = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= 0xffd20000,</div><div class='add'>+		.end	= 0xffd201ff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= 0xffd50000,</div><div class='add'>+		.end	= 0xffd501ff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct intc_desc intcs_desc __initdata = {</div><div class='add'>+	.name = "r8a7740-intcs",</div><div class='add'>+	.resource = intcs_resources,</div><div class='add'>+	.num_resources = ARRAY_SIZE(intcs_resources),</div><div class='add'>+	.hw = INTC_HW_DESC(intcs_vectors, intcs_groups, intcs_mask_registers,</div><div class='add'>+			   intcs_prio_registers, NULL, NULL),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void intcs_demux(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	void __iomem *reg = (void *)irq_get_handler_data(irq);</div><div class='add'>+	unsigned int evtcodeas = ioread32(reg);</div><div class='add'>+</div><div class='add'>+	generic_handle_irq(intcs_evt2irq(evtcodeas));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init r8a7740_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	void __iomem *intevtsa = ioremap_nocache(0xffd20100, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	register_intc_controller(&amp;intca_desc);</div><div class='add'>+	register_intc_controller(&amp;intca_irq_pins_desc);</div><div class='add'>+	register_intc_controller(&amp;intcs_desc);</div><div class='add'>+</div><div class='add'>+	/* demux using INTEVTSA */</div><div class='add'>+	irq_set_handler_data(evt2irq(0xf80), (void *)intevtsa);</div><div class='add'>+	irq_set_chained_handler(evt2irq(0xf80), intcs_demux);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-shmobile/intc-r8a7779.c b/arch/arm/mach-shmobile/intc-r8a7779.c<br/>new file mode 100644<br/>index 000000000000..5d92fcde2bc3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/intc-r8a7779.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/intc-r8a7779.c</a></div><div class='hunk'>@@ -0,0 +1,58 @@</div><div class='add'>+/*</div><div class='add'>+ * r8a7779 processor support - INTC hardware block</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011  Renesas Solutions Corp.</div><div class='add'>+ * Copyright (C) 2011  Magnus Damm</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; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</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/irq.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/intc.h&gt;</div><div class='add'>+#include &lt;mach/r8a7779.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+</div><div class='add'>+#define INT2SMSKCR0 0xfe7822a0</div><div class='add'>+#define INT2SMSKCR1 0xfe7822a4</div><div class='add'>+#define INT2SMSKCR2 0xfe7822a8</div><div class='add'>+#define INT2SMSKCR3 0xfe7822ac</div><div class='add'>+#define INT2SMSKCR4 0xfe7822b0</div><div class='add'>+</div><div class='add'>+static int r8a7779_set_wake(struct irq_data *data, unsigned int on)</div><div class='add'>+{</div><div class='add'>+	return 0; /* always allow wakeup */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init r8a7779_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	void __iomem *gic_dist_base = __io(0xf0001000);</div><div class='add'>+	void __iomem *gic_cpu_base = __io(0xf0000100);</div><div class='add'>+</div><div class='add'>+	/* use GIC to handle interrupts */</div><div class='add'>+	gic_init(0, 29, gic_dist_base, gic_cpu_base);</div><div class='add'>+	gic_arch_extn.irq_set_wake = r8a7779_set_wake;</div><div class='add'>+</div><div class='add'>+	/* unmask all known interrupts in INTCS2 */</div><div class='add'>+	__raw_writel(0xfffffff0, INT2SMSKCR0);</div><div class='add'>+	__raw_writel(0xfff7ffff, INT2SMSKCR1);</div><div class='add'>+	__raw_writel(0xfffbffdf, INT2SMSKCR2);</div><div class='add'>+	__raw_writel(0xbffffffc, INT2SMSKCR3);</div><div class='add'>+	__raw_writel(0x003fee3f, INT2SMSKCR4);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-shmobile/intc-sh7372.c b/arch/arm/mach-shmobile/intc-sh7372.c<br/>index 2d8856df80e2..89afcaba99a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/intc-sh7372.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/intc-sh7372.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/intc-sh7372.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/intc-sh7372.c</a></div><div class='hunk'>@@ -535,6 +535,7 @@ static struct resource intcs_resources[] __initdata = {</div><div class='ctx'> static struct intc_desc intcs_desc __initdata = {</div><div class='ctx'> 	.name = "sh7372-intcs",</div><div class='ctx'> 	.force_enable = ENABLED_INTCS,</div><div class='add'>+	.skip_syscore_suspend = true,</div><div class='ctx'> 	.resource = intcs_resources,</div><div class='ctx'> 	.num_resources = ARRAY_SIZE(intcs_resources),</div><div class='ctx'> 	.hw = INTC_HW_DESC(intcs_vectors, intcs_groups, intcs_mask_registers,</div><div class='hunk'>@@ -611,3 +612,52 @@ void sh7372_intcs_resume(void)</div><div class='ctx'> 	for (k = 0x80; k &lt;= 0x9c; k += 4)</div><div class='ctx'> 		__raw_writeb(ffd5[k], intcs_ffd5 + k);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static unsigned short e694[0x200];</div><div class='add'>+static unsigned short e695[0x200];</div><div class='add'>+</div><div class='add'>+void sh7372_intca_suspend(void)</div><div class='add'>+{</div><div class='add'>+	int k;</div><div class='add'>+</div><div class='add'>+	for (k = 0x00; k &lt;= 0x38; k += 4)</div><div class='add'>+		e694[k] = __raw_readw(0xe6940000 + k);</div><div class='add'>+</div><div class='add'>+	for (k = 0x80; k &lt;= 0xb4; k += 4)</div><div class='add'>+		e694[k] = __raw_readb(0xe6940000 + k);</div><div class='add'>+</div><div class='add'>+	for (k = 0x180; k &lt;= 0x1b4; k += 4)</div><div class='add'>+		e694[k] = __raw_readb(0xe6940000 + k);</div><div class='add'>+</div><div class='add'>+	for (k = 0x00; k &lt;= 0x50; k += 4)</div><div class='add'>+		e695[k] = __raw_readw(0xe6950000 + k);</div><div class='add'>+</div><div class='add'>+	for (k = 0x80; k &lt;= 0xa8; k += 4)</div><div class='add'>+		e695[k] = __raw_readb(0xe6950000 + k);</div><div class='add'>+</div><div class='add'>+	for (k = 0x180; k &lt;= 0x1a8; k += 4)</div><div class='add'>+		e695[k] = __raw_readb(0xe6950000 + k);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sh7372_intca_resume(void)</div><div class='add'>+{</div><div class='add'>+	int k;</div><div class='add'>+</div><div class='add'>+	for (k = 0x00; k &lt;= 0x38; k += 4)</div><div class='add'>+		__raw_writew(e694[k], 0xe6940000 + k);</div><div class='add'>+</div><div class='add'>+	for (k = 0x80; k &lt;= 0xb4; k += 4)</div><div class='add'>+		__raw_writeb(e694[k], 0xe6940000 + k);</div><div class='add'>+</div><div class='add'>+	for (k = 0x180; k &lt;= 0x1b4; k += 4)</div><div class='add'>+		__raw_writeb(e694[k], 0xe6940000 + k);</div><div class='add'>+</div><div class='add'>+	for (k = 0x00; k &lt;= 0x50; k += 4)</div><div class='add'>+		__raw_writew(e695[k], 0xe6950000 + k);</div><div class='add'>+</div><div class='add'>+	for (k = 0x80; k &lt;= 0xa8; k += 4)</div><div class='add'>+		__raw_writeb(e695[k], 0xe6950000 + k);</div><div class='add'>+</div><div class='add'>+	for (k = 0x180; k &lt;= 0x1a8; k += 4)</div><div class='add'>+		__raw_writeb(e695[k], 0xe6950000 + k);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-shmobile/pfc-r8a7740.c b/arch/arm/mach-shmobile/pfc-r8a7740.c<br/>new file mode 100644<br/>index 000000000000..a4fff6950b03<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/pfc-r8a7740.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/pfc-r8a7740.c</a></div><div class='hunk'>@@ -0,0 +1,2562 @@</div><div class='add'>+/*</div><div class='add'>+ * R8A7740 processor support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011  Renesas Solutions Corp.</div><div class='add'>+ * Copyright (C) 2011  Kuninori Morimoto &lt;kuninori.morimoto.gx@renesas.com&gt;</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 of the</div><div class='add'>+ * License.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='add'>+ */</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/gpio.h&gt;</div><div class='add'>+#include &lt;mach/r8a7740.h&gt;</div><div class='add'>+</div><div class='add'>+#define CPU_ALL_PORT(fn, pfx, sfx)					\</div><div class='add'>+	PORT_10(fn, pfx, sfx),		PORT_90(fn, pfx, sfx),		\</div><div class='add'>+	PORT_10(fn, pfx##10, sfx),	PORT_90(fn, pfx##1, sfx),	\</div><div class='add'>+	PORT_10(fn, pfx##20, sfx),					\</div><div class='add'>+	PORT_1(fn, pfx##210, sfx),	PORT_1(fn, pfx##211, sfx)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	PINMUX_RESERVED = 0,</div><div class='add'>+</div><div class='add'>+	/* PORT0_DATA -&gt; PORT211_DATA */</div><div class='add'>+	PINMUX_DATA_BEGIN,</div><div class='add'>+	PORT_ALL(DATA),</div><div class='add'>+	PINMUX_DATA_END,</div><div class='add'>+</div><div class='add'>+	/* PORT0_IN -&gt; PORT211_IN */</div><div class='add'>+	PINMUX_INPUT_BEGIN,</div><div class='add'>+	PORT_ALL(IN),</div><div class='add'>+	PINMUX_INPUT_END,</div><div class='add'>+</div><div class='add'>+	/* PORT0_IN_PU -&gt; PORT211_IN_PU */</div><div class='add'>+	PINMUX_INPUT_PULLUP_BEGIN,</div><div class='add'>+	PORT_ALL(IN_PU),</div><div class='add'>+	PINMUX_INPUT_PULLUP_END,</div><div class='add'>+</div><div class='add'>+	/* PORT0_IN_PD -&gt; PORT211_IN_PD */</div><div class='add'>+	PINMUX_INPUT_PULLDOWN_BEGIN,</div><div class='add'>+	PORT_ALL(IN_PD),</div><div class='add'>+	PINMUX_INPUT_PULLDOWN_END,</div><div class='add'>+</div><div class='add'>+	/* PORT0_OUT -&gt; PORT211_OUT */</div><div class='add'>+	PINMUX_OUTPUT_BEGIN,</div><div class='add'>+	PORT_ALL(OUT),</div><div class='add'>+	PINMUX_OUTPUT_END,</div><div class='add'>+</div><div class='add'>+	PINMUX_FUNCTION_BEGIN,</div><div class='add'>+	PORT_ALL(FN_IN),	/* PORT0_FN_IN -&gt; PORT211_FN_IN */</div><div class='add'>+	PORT_ALL(FN_OUT),	/* PORT0_FN_OUT -&gt; PORT211_FN_OUT */</div><div class='add'>+	PORT_ALL(FN0),		/* PORT0_FN0 -&gt; PORT211_FN0 */</div><div class='add'>+	PORT_ALL(FN1),		/* PORT0_FN1 -&gt; PORT211_FN1 */</div><div class='add'>+	PORT_ALL(FN2),		/* PORT0_FN2 -&gt; PORT211_FN2 */</div><div class='add'>+	PORT_ALL(FN3),		/* PORT0_FN3 -&gt; PORT211_FN3 */</div><div class='add'>+	PORT_ALL(FN4),		/* PORT0_FN4 -&gt; PORT211_FN4 */</div><div class='add'>+	PORT_ALL(FN5),		/* PORT0_FN5 -&gt; PORT211_FN5 */</div><div class='add'>+	PORT_ALL(FN6),		/* PORT0_FN6 -&gt; PORT211_FN6 */</div><div class='add'>+	PORT_ALL(FN7),		/* PORT0_FN7 -&gt; PORT211_FN7 */</div><div class='add'>+</div><div class='add'>+	MSEL1CR_31_0,	MSEL1CR_31_1,</div><div class='add'>+	MSEL1CR_30_0,	MSEL1CR_30_1,</div><div class='add'>+	MSEL1CR_29_0,	MSEL1CR_29_1,</div><div class='add'>+	MSEL1CR_28_0,	MSEL1CR_28_1,</div><div class='add'>+	MSEL1CR_27_0,	MSEL1CR_27_1,</div><div class='add'>+	MSEL1CR_26_0,	MSEL1CR_26_1,</div><div class='add'>+	MSEL1CR_16_0,	MSEL1CR_16_1,</div><div class='add'>+	MSEL1CR_15_0,	MSEL1CR_15_1,</div><div class='add'>+	MSEL1CR_14_0,	MSEL1CR_14_1,</div><div class='add'>+	MSEL1CR_13_0,	MSEL1CR_13_1,</div><div class='add'>+	MSEL1CR_12_0,	MSEL1CR_12_1,</div><div class='add'>+	MSEL1CR_9_0,	MSEL1CR_9_1,</div><div class='add'>+	MSEL1CR_7_0,	MSEL1CR_7_1,</div><div class='add'>+	MSEL1CR_6_0,	MSEL1CR_6_1,</div><div class='add'>+	MSEL1CR_5_0,	MSEL1CR_5_1,</div><div class='add'>+	MSEL1CR_4_0,	MSEL1CR_4_1,</div><div class='add'>+	MSEL1CR_3_0,	MSEL1CR_3_1,</div><div class='add'>+	MSEL1CR_2_0,	MSEL1CR_2_1,</div><div class='add'>+	MSEL1CR_0_0,	MSEL1CR_0_1,</div><div class='add'>+</div><div class='add'>+	MSEL3CR_15_0,	MSEL3CR_15_1, /* Trace / Debug ? */</div><div class='add'>+	MSEL3CR_6_0,	MSEL3CR_6_1,</div><div class='add'>+</div><div class='add'>+	MSEL4CR_19_0,	MSEL4CR_19_1,</div><div class='add'>+	MSEL4CR_18_0,	MSEL4CR_18_1,</div><div class='add'>+	MSEL4CR_15_0,	MSEL4CR_15_1,</div><div class='add'>+	MSEL4CR_10_0,	MSEL4CR_10_1,</div><div class='add'>+	MSEL4CR_6_0,	MSEL4CR_6_1,</div><div class='add'>+	MSEL4CR_4_0,	MSEL4CR_4_1,</div><div class='add'>+	MSEL4CR_1_0,	MSEL4CR_1_1,</div><div class='add'>+</div><div class='add'>+	MSEL5CR_31_0,	MSEL5CR_31_1, /* irq/fiq output */</div><div class='add'>+	MSEL5CR_30_0,	MSEL5CR_30_1,</div><div class='add'>+	MSEL5CR_29_0,	MSEL5CR_29_1,</div><div class='add'>+	MSEL5CR_27_0,	MSEL5CR_27_1,</div><div class='add'>+	MSEL5CR_25_0,	MSEL5CR_25_1,</div><div class='add'>+	MSEL5CR_23_0,	MSEL5CR_23_1,</div><div class='add'>+	MSEL5CR_21_0,	MSEL5CR_21_1,</div><div class='add'>+	MSEL5CR_19_0,	MSEL5CR_19_1,</div><div class='add'>+	MSEL5CR_17_0,	MSEL5CR_17_1,</div><div class='add'>+	MSEL5CR_15_0,	MSEL5CR_15_1,</div><div class='add'>+	MSEL5CR_14_0,	MSEL5CR_14_1,</div><div class='add'>+	MSEL5CR_13_0,	MSEL5CR_13_1,</div><div class='add'>+	MSEL5CR_12_0,	MSEL5CR_12_1,</div><div class='add'>+	MSEL5CR_11_0,	MSEL5CR_11_1,</div><div class='add'>+	MSEL5CR_10_0,	MSEL5CR_10_1,</div><div class='add'>+	MSEL5CR_8_0,	MSEL5CR_8_1,</div><div class='add'>+	MSEL5CR_7_0,	MSEL5CR_7_1,</div><div class='add'>+	MSEL5CR_6_0,	MSEL5CR_6_1,</div><div class='add'>+	MSEL5CR_5_0,	MSEL5CR_5_1,</div><div class='add'>+	MSEL5CR_4_0,	MSEL5CR_4_1,</div><div class='add'>+	MSEL5CR_3_0,	MSEL5CR_3_1,</div><div class='add'>+	MSEL5CR_2_0,	MSEL5CR_2_1,</div><div class='add'>+	MSEL5CR_0_0,	MSEL5CR_0_1,</div><div class='add'>+	PINMUX_FUNCTION_END,</div><div class='add'>+</div><div class='add'>+	PINMUX_MARK_BEGIN,</div><div class='add'>+</div><div class='add'>+	/* IRQ */</div><div class='add'>+	IRQ0_PORT2_MARK,	IRQ0_PORT13_MARK,</div><div class='add'>+	IRQ1_MARK,</div><div class='add'>+	IRQ2_PORT11_MARK,	IRQ2_PORT12_MARK,</div><div class='add'>+	IRQ3_PORT10_MARK,	IRQ3_PORT14_MARK,</div><div class='add'>+	IRQ4_PORT15_MARK,	IRQ4_PORT172_MARK,</div><div class='add'>+	IRQ5_PORT0_MARK,	IRQ5_PORT1_MARK,</div><div class='add'>+	IRQ6_PORT121_MARK,	IRQ6_PORT173_MARK,</div><div class='add'>+	IRQ7_PORT120_MARK,	IRQ7_PORT209_MARK,</div><div class='add'>+	IRQ8_MARK,</div><div class='add'>+	IRQ9_PORT118_MARK,	IRQ9_PORT210_MARK,</div><div class='add'>+	IRQ10_MARK,</div><div class='add'>+	IRQ11_MARK,</div><div class='add'>+	IRQ12_PORT42_MARK,	IRQ12_PORT97_MARK,</div><div class='add'>+	IRQ13_PORT64_MARK,	IRQ13_PORT98_MARK,</div><div class='add'>+	IRQ14_PORT63_MARK,	IRQ14_PORT99_MARK,</div><div class='add'>+	IRQ15_PORT62_MARK,	IRQ15_PORT100_MARK,</div><div class='add'>+	IRQ16_PORT68_MARK,	IRQ16_PORT211_MARK,</div><div class='add'>+	IRQ17_MARK,</div><div class='add'>+	IRQ18_MARK,</div><div class='add'>+	IRQ19_MARK,</div><div class='add'>+	IRQ20_MARK,</div><div class='add'>+	IRQ21_MARK,</div><div class='add'>+	IRQ22_MARK,</div><div class='add'>+	IRQ23_MARK,</div><div class='add'>+	IRQ24_MARK,</div><div class='add'>+	IRQ25_MARK,</div><div class='add'>+	IRQ26_PORT58_MARK,	IRQ26_PORT81_MARK,</div><div class='add'>+	IRQ27_PORT57_MARK,	IRQ27_PORT168_MARK,</div><div class='add'>+	IRQ28_PORT56_MARK,	IRQ28_PORT169_MARK,</div><div class='add'>+	IRQ29_PORT50_MARK,	IRQ29_PORT170_MARK,</div><div class='add'>+	IRQ30_PORT49_MARK,	IRQ30_PORT171_MARK,</div><div class='add'>+	IRQ31_PORT41_MARK,	IRQ31_PORT167_MARK,</div><div class='add'>+</div><div class='add'>+	/* Function */</div><div class='add'>+</div><div class='add'>+	/* DBGT */</div><div class='add'>+	DBGMDT2_MARK,	DBGMDT1_MARK,	DBGMDT0_MARK,</div><div class='add'>+	DBGMD10_MARK,	DBGMD11_MARK,	DBGMD20_MARK,</div><div class='add'>+	DBGMD21_MARK,</div><div class='add'>+</div><div class='add'>+	/* FSI */</div><div class='add'>+	FSIAISLD_PORT0_MARK,	/* FSIAISLD Port 0/5 */</div><div class='add'>+	FSIAISLD_PORT5_MARK,</div><div class='add'>+	FSIASPDIF_PORT9_MARK,	/* FSIASPDIF Port 9/18 */</div><div class='add'>+	FSIASPDIF_PORT18_MARK,</div><div class='add'>+	FSIAOSLD1_MARK,	FSIAOSLD2_MARK,	FSIAOLR_MARK,</div><div class='add'>+	FSIAOBT_MARK,	FSIAOSLD_MARK,	FSIAOMC_MARK,</div><div class='add'>+	FSIACK_MARK,	FSIAILR_MARK,	FSIAIBT_MARK,</div><div class='add'>+</div><div class='add'>+	/* FMSI */</div><div class='add'>+	FMSISLD_PORT1_MARK, /* FMSISLD Port 1/6 */</div><div class='add'>+	FMSISLD_PORT6_MARK,</div><div class='add'>+	FMSIILR_MARK,	FMSIIBT_MARK,	FMSIOLR_MARK,	FMSIOBT_MARK,</div><div class='add'>+	FMSICK_MARK,	FMSOILR_MARK,	FMSOIBT_MARK,	FMSOOLR_MARK,</div><div class='add'>+	FMSOOBT_MARK,	FMSOSLD_MARK,	FMSOCK_MARK,</div><div class='add'>+</div><div class='add'>+	/* SCIFA0 */</div><div class='add'>+	SCIFA0_SCK_MARK,	SCIFA0_CTS_MARK,	SCIFA0_RTS_MARK,</div><div class='add'>+	SCIFA0_RXD_MARK,	SCIFA0_TXD_MARK,</div><div class='add'>+</div><div class='add'>+	/* SCIFA1 */</div><div class='add'>+	SCIFA1_CTS_MARK,	SCIFA1_SCK_MARK,	SCIFA1_RXD_MARK,</div><div class='add'>+	SCIFA1_TXD_MARK,	SCIFA1_RTS_MARK,</div><div class='add'>+</div><div class='add'>+	/* SCIFA2 */</div><div class='add'>+	SCIFA2_SCK_PORT22_MARK, /* SCIFA2_SCK Port 22/199 */</div><div class='add'>+	SCIFA2_SCK_PORT199_MARK,</div><div class='add'>+	SCIFA2_RXD_MARK,	SCIFA2_TXD_MARK,</div><div class='add'>+	SCIFA2_CTS_MARK,	SCIFA2_RTS_MARK,</div><div class='add'>+</div><div class='add'>+	/* SCIFA3 */</div><div class='add'>+	SCIFA3_RTS_PORT105_MARK, /* MSEL5CR_8_0 */</div><div class='add'>+	SCIFA3_SCK_PORT116_MARK,</div><div class='add'>+	SCIFA3_CTS_PORT117_MARK,</div><div class='add'>+	SCIFA3_RXD_PORT174_MARK,</div><div class='add'>+	SCIFA3_TXD_PORT175_MARK,</div><div class='add'>+</div><div class='add'>+	SCIFA3_RTS_PORT161_MARK, /* MSEL5CR_8_1 */</div><div class='add'>+	SCIFA3_SCK_PORT158_MARK,</div><div class='add'>+	SCIFA3_CTS_PORT162_MARK,</div><div class='add'>+	SCIFA3_RXD_PORT159_MARK,</div><div class='add'>+	SCIFA3_TXD_PORT160_MARK,</div><div class='add'>+</div><div class='add'>+	/* SCIFA4 */</div><div class='add'>+	SCIFA4_RXD_PORT12_MARK, /* MSEL5CR[12:11] = 00 */</div><div class='add'>+	SCIFA4_TXD_PORT13_MARK,</div><div class='add'>+</div><div class='add'>+	SCIFA4_RXD_PORT204_MARK, /* MSEL5CR[12:11] = 01 */</div><div class='add'>+	SCIFA4_TXD_PORT203_MARK,</div><div class='add'>+</div><div class='add'>+	SCIFA4_RXD_PORT94_MARK, /* MSEL5CR[12:11] = 10 */</div><div class='add'>+	SCIFA4_TXD_PORT93_MARK,</div><div class='add'>+</div><div class='add'>+	SCIFA4_SCK_PORT21_MARK, /* SCIFA4_SCK Port 21/205 */</div><div class='add'>+	SCIFA4_SCK_PORT205_MARK,</div><div class='add'>+</div><div class='add'>+	/* SCIFA5 */</div><div class='add'>+	SCIFA5_TXD_PORT20_MARK, /* MSEL5CR[15:14] = 00 */</div><div class='add'>+	SCIFA5_RXD_PORT10_MARK,</div><div class='add'>+</div><div class='add'>+	SCIFA5_RXD_PORT207_MARK, /* MSEL5CR[15:14] = 01 */</div><div class='add'>+	SCIFA5_TXD_PORT208_MARK,</div><div class='add'>+</div><div class='add'>+	SCIFA5_TXD_PORT91_MARK, /* MSEL5CR[15:14] = 10 */</div><div class='add'>+	SCIFA5_RXD_PORT92_MARK,</div><div class='add'>+</div><div class='add'>+	SCIFA5_SCK_PORT23_MARK, /* SCIFA5_SCK Port 23/206 */</div><div class='add'>+	SCIFA5_SCK_PORT206_MARK,</div><div class='add'>+</div><div class='add'>+	/* SCIFA6 */</div><div class='add'>+	SCIFA6_SCK_MARK,	SCIFA6_RXD_MARK,	SCIFA6_TXD_MARK,</div><div class='add'>+</div><div class='add'>+	/* SCIFA7 */</div><div class='add'>+	SCIFA7_TXD_MARK,	SCIFA7_RXD_MARK,</div><div class='add'>+</div><div class='add'>+	/* SCIFAB */</div><div class='add'>+	SCIFB_SCK_PORT190_MARK, /* MSEL5CR_17_0 */</div><div class='add'>+	SCIFB_RXD_PORT191_MARK,</div><div class='add'>+	SCIFB_TXD_PORT192_MARK,</div><div class='add'>+	SCIFB_RTS_PORT186_MARK,</div><div class='add'>+	SCIFB_CTS_PORT187_MARK,</div><div class='add'>+</div><div class='add'>+	SCIFB_SCK_PORT2_MARK, /* MSEL5CR_17_1 */</div><div class='add'>+	SCIFB_RXD_PORT3_MARK,</div><div class='add'>+	SCIFB_TXD_PORT4_MARK,</div><div class='add'>+	SCIFB_RTS_PORT172_MARK,</div><div class='add'>+	SCIFB_CTS_PORT173_MARK,</div><div class='add'>+</div><div class='add'>+	/* LCD0 */</div><div class='add'>+	LCDC0_SELECT_MARK,</div><div class='add'>+</div><div class='add'>+	LCD0_D0_MARK,	LCD0_D1_MARK,	LCD0_D2_MARK,	LCD0_D3_MARK,</div><div class='add'>+	LCD0_D4_MARK,	LCD0_D5_MARK,	LCD0_D6_MARK,	LCD0_D7_MARK,</div><div class='add'>+	LCD0_D8_MARK,	LCD0_D9_MARK,	LCD0_D10_MARK,	LCD0_D11_MARK,</div><div class='add'>+	LCD0_D12_MARK,	LCD0_D13_MARK,	LCD0_D14_MARK,	LCD0_D15_MARK,</div><div class='add'>+	LCD0_D16_MARK,	LCD0_D17_MARK,</div><div class='add'>+	LCD0_DON_MARK,	LCD0_VCPWC_MARK,	LCD0_VEPWC_MARK,</div><div class='add'>+	LCD0_DCK_MARK,	LCD0_VSYN_MARK,	/* for RGB */</div><div class='add'>+	LCD0_HSYN_MARK,	LCD0_DISP_MARK,	/* for RGB */</div><div class='add'>+	LCD0_WR_MARK,	LCD0_RD_MARK,	/* for SYS */</div><div class='add'>+	LCD0_CS_MARK,	LCD0_RS_MARK,	/* for SYS */</div><div class='add'>+</div><div class='add'>+	LCD0_D21_PORT158_MARK,	LCD0_D23_PORT159_MARK, /* MSEL5CR_6_1 */</div><div class='add'>+	LCD0_D22_PORT160_MARK,	LCD0_D20_PORT161_MARK,</div><div class='add'>+	LCD0_D19_PORT162_MARK,	LCD0_D18_PORT163_MARK,</div><div class='add'>+	LCD0_LCLK_PORT165_MARK,</div><div class='add'>+</div><div class='add'>+	LCD0_D18_PORT40_MARK,	LCD0_D22_PORT0_MARK, /* MSEL5CR_6_0 */</div><div class='add'>+	LCD0_D23_PORT1_MARK,	LCD0_D21_PORT2_MARK,</div><div class='add'>+	LCD0_D20_PORT3_MARK,	LCD0_D19_PORT4_MARK,</div><div class='add'>+	LCD0_LCLK_PORT102_MARK,</div><div class='add'>+</div><div class='add'>+	/* LCD1 */</div><div class='add'>+	LCDC1_SELECT_MARK,</div><div class='add'>+</div><div class='add'>+	LCD1_D0_MARK,	LCD1_D1_MARK,	LCD1_D2_MARK,	LCD1_D3_MARK,</div><div class='add'>+	LCD1_D4_MARK,	LCD1_D5_MARK,	LCD1_D6_MARK,	LCD1_D7_MARK,</div><div class='add'>+	LCD1_D8_MARK,	LCD1_D9_MARK,	LCD1_D10_MARK,	LCD1_D11_MARK,</div><div class='add'>+	LCD1_D12_MARK,	LCD1_D13_MARK,	LCD1_D14_MARK,	LCD1_D15_MARK,</div><div class='add'>+	LCD1_D16_MARK,	LCD1_D17_MARK,	LCD1_D18_MARK,	LCD1_D19_MARK,</div><div class='add'>+	LCD1_D20_MARK,	LCD1_D21_MARK,	LCD1_D22_MARK,	LCD1_D23_MARK,</div><div class='add'>+	LCD1_DON_MARK,	LCD1_VCPWC_MARK,</div><div class='add'>+	LCD1_LCLK_MARK,	LCD1_VEPWC_MARK,</div><div class='add'>+</div><div class='add'>+	LCD1_DCK_MARK,	LCD1_VSYN_MARK,	/* for RGB */</div><div class='add'>+	LCD1_HSYN_MARK,	LCD1_DISP_MARK,	/* for RGB */</div><div class='add'>+	LCD1_RS_MARK,	LCD1_CS_MARK,	/* for SYS */</div><div class='add'>+	LCD1_RD_MARK,	LCD1_WR_MARK,	/* for SYS */</div><div class='add'>+</div><div class='add'>+	/* RSPI */</div><div class='add'>+	RSPI_SSL0_A_MARK,	RSPI_SSL1_A_MARK,	RSPI_SSL2_A_MARK,</div><div class='add'>+	RSPI_SSL3_A_MARK,	RSPI_CK_A_MARK,		RSPI_MOSI_A_MARK,</div><div class='add'>+	RSPI_MISO_A_MARK,</div><div class='add'>+</div><div class='add'>+	/* VIO CKO */</div><div class='add'>+	VIO_CKO1_MARK, /* needs fixup */</div><div class='add'>+	VIO_CKO2_MARK,</div><div class='add'>+	VIO_CKO_1_MARK,</div><div class='add'>+	VIO_CKO_MARK,</div><div class='add'>+</div><div class='add'>+	/* VIO0 */</div><div class='add'>+	VIO0_D0_MARK,	VIO0_D1_MARK,	VIO0_D2_MARK,	VIO0_D3_MARK,</div><div class='add'>+	VIO0_D4_MARK,	VIO0_D5_MARK,	VIO0_D6_MARK,	VIO0_D7_MARK,</div><div class='add'>+	VIO0_D8_MARK,	VIO0_D9_MARK,	VIO0_D10_MARK,	VIO0_D11_MARK,</div><div class='add'>+	VIO0_D12_MARK,	VIO0_VD_MARK,	VIO0_HD_MARK,	VIO0_CLK_MARK,</div><div class='add'>+	VIO0_FIELD_MARK,</div><div class='add'>+</div><div class='add'>+	VIO0_D13_PORT26_MARK, /* MSEL5CR_27_0 */</div><div class='add'>+	VIO0_D14_PORT25_MARK,</div><div class='add'>+	VIO0_D15_PORT24_MARK,</div><div class='add'>+</div><div class='add'>+	VIO0_D13_PORT22_MARK, /* MSEL5CR_27_1 */</div><div class='add'>+	VIO0_D14_PORT95_MARK,</div><div class='add'>+	VIO0_D15_PORT96_MARK,</div><div class='add'>+</div><div class='add'>+	/* VIO1 */</div><div class='add'>+	VIO1_D0_MARK,	VIO1_D1_MARK,	VIO1_D2_MARK,	VIO1_D3_MARK,</div><div class='add'>+	VIO1_D4_MARK,	VIO1_D5_MARK,	VIO1_D6_MARK,	VIO1_D7_MARK,</div><div class='add'>+	VIO1_VD_MARK,	VIO1_HD_MARK,	VIO1_CLK_MARK,	VIO1_FIELD_MARK,</div><div class='add'>+</div><div class='add'>+	/* TPU0 */</div><div class='add'>+	TPU0TO0_MARK,	TPU0TO1_MARK,	TPU0TO3_MARK,</div><div class='add'>+	TPU0TO2_PORT66_MARK, /* TPU0TO2 Port 66/202 */</div><div class='add'>+	TPU0TO2_PORT202_MARK,</div><div class='add'>+</div><div class='add'>+	/* SSP1 0 */</div><div class='add'>+	STP0_IPD0_MARK,	STP0_IPD1_MARK,	STP0_IPD2_MARK,	STP0_IPD3_MARK,</div><div class='add'>+	STP0_IPD4_MARK,	STP0_IPD5_MARK,	STP0_IPD6_MARK,	STP0_IPD7_MARK,</div><div class='add'>+	STP0_IPEN_MARK,	STP0_IPCLK_MARK,	STP0_IPSYNC_MARK,</div><div class='add'>+</div><div class='add'>+	/* SSP1 1 */</div><div class='add'>+	STP1_IPD1_MARK,	STP1_IPD2_MARK,	STP1_IPD3_MARK,	STP1_IPD4_MARK,</div><div class='add'>+	STP1_IPD5_MARK,	STP1_IPD6_MARK,	STP1_IPD7_MARK,	STP1_IPCLK_MARK,</div><div class='add'>+	STP1_IPSYNC_MARK,</div><div class='add'>+</div><div class='add'>+	STP1_IPD0_PORT186_MARK, /* MSEL5CR_23_0 */</div><div class='add'>+	STP1_IPEN_PORT187_MARK,</div><div class='add'>+</div><div class='add'>+	STP1_IPD0_PORT194_MARK, /* MSEL5CR_23_1 */</div><div class='add'>+	STP1_IPEN_PORT193_MARK,</div><div class='add'>+</div><div class='add'>+	/* SIM */</div><div class='add'>+	SIM_RST_MARK,	SIM_CLK_MARK,</div><div class='add'>+	SIM_D_PORT22_MARK, /* SIM_D  Port 22/199 */</div><div class='add'>+	SIM_D_PORT199_MARK,</div><div class='add'>+</div><div class='add'>+	/* SDHI0 */</div><div class='add'>+	SDHI0_D0_MARK,	SDHI0_D1_MARK,	SDHI0_D2_MARK,	SDHI0_D3_MARK,</div><div class='add'>+	SDHI0_CD_MARK,	SDHI0_WP_MARK,	SDHI0_CMD_MARK,	SDHI0_CLK_MARK,</div><div class='add'>+</div><div class='add'>+	/* SDHI1 */</div><div class='add'>+	SDHI1_D0_MARK,	SDHI1_D1_MARK,	SDHI1_D2_MARK,	SDHI1_D3_MARK,</div><div class='add'>+	SDHI1_CD_MARK,	SDHI1_WP_MARK,	SDHI1_CMD_MARK,	SDHI1_CLK_MARK,</div><div class='add'>+</div><div class='add'>+	/* SDHI2 */</div><div class='add'>+	SDHI2_D0_MARK,	SDHI2_D1_MARK,	SDHI2_D2_MARK,	SDHI2_D3_MARK,</div><div class='add'>+	SDHI2_CLK_MARK,	SDHI2_CMD_MARK,</div><div class='add'>+</div><div class='add'>+	SDHI2_CD_PORT24_MARK, /* MSEL5CR_19_0 */</div><div class='add'>+	SDHI2_WP_PORT25_MARK,</div><div class='add'>+</div><div class='add'>+	SDHI2_WP_PORT177_MARK, /* MSEL5CR_19_1 */</div><div class='add'>+	SDHI2_CD_PORT202_MARK,</div><div class='add'>+</div><div class='add'>+	/* MSIOF2 */</div><div class='add'>+	MSIOF2_TXD_MARK,	MSIOF2_RXD_MARK,	MSIOF2_TSCK_MARK,</div><div class='add'>+	MSIOF2_SS2_MARK,	MSIOF2_TSYNC_MARK,	MSIOF2_SS1_MARK,</div><div class='add'>+	MSIOF2_MCK1_MARK,	MSIOF2_MCK0_MARK,	MSIOF2_RSYNC_MARK,</div><div class='add'>+	MSIOF2_RSCK_MARK,</div><div class='add'>+</div><div class='add'>+	/* KEYSC */</div><div class='add'>+	KEYIN4_MARK,	KEYIN5_MARK,	KEYIN6_MARK,	KEYIN7_MARK,</div><div class='add'>+	KEYOUT0_MARK,	KEYOUT1_MARK,	KEYOUT2_MARK,	KEYOUT3_MARK,</div><div class='add'>+	KEYOUT4_MARK,	KEYOUT5_MARK,	KEYOUT6_MARK,	KEYOUT7_MARK,</div><div class='add'>+</div><div class='add'>+	KEYIN0_PORT43_MARK, /* MSEL4CR_18_0 */</div><div class='add'>+	KEYIN1_PORT44_MARK,</div><div class='add'>+	KEYIN2_PORT45_MARK,</div><div class='add'>+	KEYIN3_PORT46_MARK,</div><div class='add'>+</div><div class='add'>+	KEYIN0_PORT58_MARK, /* MSEL4CR_18_1 */</div><div class='add'>+	KEYIN1_PORT57_MARK,</div><div class='add'>+	KEYIN2_PORT56_MARK,</div><div class='add'>+	KEYIN3_PORT55_MARK,</div><div class='add'>+</div><div class='add'>+	/* VOU */</div><div class='add'>+	DV_D0_MARK,	DV_D1_MARK,	DV_D2_MARK,	DV_D3_MARK,</div><div class='add'>+	DV_D4_MARK,	DV_D5_MARK,	DV_D6_MARK,	DV_D7_MARK,</div><div class='add'>+	DV_D8_MARK,	DV_D9_MARK,	DV_D10_MARK,	DV_D11_MARK,</div><div class='add'>+	DV_D12_MARK,	DV_D13_MARK,	DV_D14_MARK,	DV_D15_MARK,</div><div class='add'>+	DV_CLK_MARK,	DV_VSYNC_MARK,	DV_HSYNC_MARK,</div><div class='add'>+</div><div class='add'>+	/* MEMC */</div><div class='add'>+	MEMC_AD0_MARK,	MEMC_AD1_MARK,	MEMC_AD2_MARK,	MEMC_AD3_MARK,</div><div class='add'>+	MEMC_AD4_MARK,	MEMC_AD5_MARK,	MEMC_AD6_MARK,	MEMC_AD7_MARK,</div><div class='add'>+	MEMC_AD8_MARK,	MEMC_AD9_MARK,	MEMC_AD10_MARK,	MEMC_AD11_MARK,</div><div class='add'>+	MEMC_AD12_MARK,	MEMC_AD13_MARK,	MEMC_AD14_MARK,	MEMC_AD15_MARK,</div><div class='add'>+	MEMC_CS0_MARK,	MEMC_INT_MARK,	MEMC_NWE_MARK,	MEMC_NOE_MARK,</div><div class='add'>+</div><div class='add'>+	MEMC_CS1_MARK, /* MSEL4CR_6_0 */</div><div class='add'>+	MEMC_ADV_MARK,</div><div class='add'>+	MEMC_WAIT_MARK,</div><div class='add'>+	MEMC_BUSCLK_MARK,</div><div class='add'>+</div><div class='add'>+	MEMC_A1_MARK, /* MSEL4CR_6_1 */</div><div class='add'>+	MEMC_DREQ0_MARK,</div><div class='add'>+	MEMC_DREQ1_MARK,</div><div class='add'>+	MEMC_A0_MARK,</div><div class='add'>+</div><div class='add'>+	/* MMC */</div><div class='add'>+	MMC0_D0_PORT68_MARK,	MMC0_D1_PORT69_MARK,	MMC0_D2_PORT70_MARK,</div><div class='add'>+	MMC0_D3_PORT71_MARK,	MMC0_D4_PORT72_MARK,	MMC0_D5_PORT73_MARK,</div><div class='add'>+	MMC0_D6_PORT74_MARK,	MMC0_D7_PORT75_MARK,	MMC0_CLK_PORT66_MARK,</div><div class='add'>+	MMC0_CMD_PORT67_MARK,	/* MSEL4CR_15_0 */</div><div class='add'>+</div><div class='add'>+	MMC1_D0_PORT149_MARK,	MMC1_D1_PORT148_MARK,	MMC1_D2_PORT147_MARK,</div><div class='add'>+	MMC1_D3_PORT146_MARK,	MMC1_D4_PORT145_MARK,	MMC1_D5_PORT144_MARK,</div><div class='add'>+	MMC1_D6_PORT143_MARK,	MMC1_D7_PORT142_MARK,	MMC1_CLK_PORT103_MARK,</div><div class='add'>+	MMC1_CMD_PORT104_MARK,	/* MSEL4CR_15_1 */</div><div class='add'>+</div><div class='add'>+	/* MSIOF0 */</div><div class='add'>+	MSIOF0_SS1_MARK,	MSIOF0_SS2_MARK,	MSIOF0_RXD_MARK,</div><div class='add'>+	MSIOF0_TXD_MARK,	MSIOF0_MCK0_MARK,	MSIOF0_MCK1_MARK,</div><div class='add'>+	MSIOF0_RSYNC_MARK,	MSIOF0_RSCK_MARK,	MSIOF0_TSCK_MARK,</div><div class='add'>+	MSIOF0_TSYNC_MARK,</div><div class='add'>+</div><div class='add'>+	/* MSIOF1 */</div><div class='add'>+	MSIOF1_RSCK_MARK,	MSIOF1_RSYNC_MARK,</div><div class='add'>+	MSIOF1_MCK0_MARK,	MSIOF1_MCK1_MARK,</div><div class='add'>+</div><div class='add'>+	MSIOF1_SS2_PORT116_MARK,	MSIOF1_SS1_PORT117_MARK,</div><div class='add'>+	MSIOF1_RXD_PORT118_MARK,	MSIOF1_TXD_PORT119_MARK,</div><div class='add'>+	MSIOF1_TSYNC_PORT120_MARK,</div><div class='add'>+	MSIOF1_TSCK_PORT121_MARK,	/* MSEL4CR_10_0 */</div><div class='add'>+</div><div class='add'>+	MSIOF1_SS1_PORT67_MARK,		MSIOF1_TSCK_PORT72_MARK,</div><div class='add'>+	MSIOF1_TSYNC_PORT73_MARK,	MSIOF1_TXD_PORT74_MARK,</div><div class='add'>+	MSIOF1_RXD_PORT75_MARK,</div><div class='add'>+	MSIOF1_SS2_PORT202_MARK,	/* MSEL4CR_10_1 */</div><div class='add'>+</div><div class='add'>+	/* GPIO */</div><div class='add'>+	GPO0_MARK,	GPI0_MARK,	GPO1_MARK,	GPI1_MARK,</div><div class='add'>+</div><div class='add'>+	/* USB0 */</div><div class='add'>+	USB0_OCI_MARK,	USB0_PPON_MARK,	VBUS_MARK,</div><div class='add'>+</div><div class='add'>+	/* USB1 */</div><div class='add'>+	USB1_OCI_MARK,	USB1_PPON_MARK,</div><div class='add'>+</div><div class='add'>+	/* BBIF1 */</div><div class='add'>+	BBIF1_RXD_MARK,		BBIF1_TXD_MARK,		BBIF1_TSYNC_MARK,</div><div class='add'>+	BBIF1_TSCK_MARK,	BBIF1_RSCK_MARK,	BBIF1_RSYNC_MARK,</div><div class='add'>+	BBIF1_FLOW_MARK,	BBIF1_RX_FLOW_N_MARK,</div><div class='add'>+</div><div class='add'>+	/* BBIF2 */</div><div class='add'>+	BBIF2_TXD2_PORT5_MARK, /* MSEL5CR_0_0 */</div><div class='add'>+	BBIF2_RXD2_PORT60_MARK,</div><div class='add'>+	BBIF2_TSYNC2_PORT6_MARK,</div><div class='add'>+	BBIF2_TSCK2_PORT59_MARK,</div><div class='add'>+</div><div class='add'>+	BBIF2_RXD2_PORT90_MARK, /* MSEL5CR_0_1 */</div><div class='add'>+	BBIF2_TXD2_PORT183_MARK,</div><div class='add'>+	BBIF2_TSCK2_PORT89_MARK,</div><div class='add'>+	BBIF2_TSYNC2_PORT184_MARK,</div><div class='add'>+</div><div class='add'>+	/* BSC / FLCTL / PCMCIA */</div><div class='add'>+	CS0_MARK,	CS2_MARK,	CS4_MARK,</div><div class='add'>+	CS5B_MARK,	CS6A_MARK,</div><div class='add'>+	CS5A_PORT105_MARK, /* CS5A PORT 19/105 */</div><div class='add'>+	CS5A_PORT19_MARK,</div><div class='add'>+	IOIS16_MARK, /* ? */</div><div class='add'>+</div><div class='add'>+	A0_MARK,	A1_MARK,	A2_MARK,	A3_MARK,</div><div class='add'>+	A4_FOE_MARK,	/* share with FLCTL */</div><div class='add'>+	A5_FCDE_MARK,	/* share with FLCTL */</div><div class='add'>+	A6_MARK,	A7_MARK,	A8_MARK,	A9_MARK,</div><div class='add'>+	A10_MARK,	A11_MARK,	A12_MARK,	A13_MARK,</div><div class='add'>+	A14_MARK,	A15_MARK,	A16_MARK,	A17_MARK,</div><div class='add'>+	A18_MARK,	A19_MARK,	A20_MARK,	A21_MARK,</div><div class='add'>+	A22_MARK,	A23_MARK,	A24_MARK,	A25_MARK,</div><div class='add'>+	A26_MARK,</div><div class='add'>+</div><div class='add'>+	D0_NAF0_MARK,	D1_NAF1_MARK,	D2_NAF2_MARK,	/* share with FLCTL */</div><div class='add'>+	D3_NAF3_MARK,	D4_NAF4_MARK,	D5_NAF5_MARK,	/* share with FLCTL */</div><div class='add'>+	D6_NAF6_MARK,	D7_NAF7_MARK,	D8_NAF8_MARK,	/* share with FLCTL */</div><div class='add'>+	D9_NAF9_MARK,	D10_NAF10_MARK,	D11_NAF11_MARK,	/* share with FLCTL */</div><div class='add'>+	D12_NAF12_MARK,	D13_NAF13_MARK,	D14_NAF14_MARK,	/* share with FLCTL */</div><div class='add'>+	D15_NAF15_MARK,					/* share with FLCTL */</div><div class='add'>+	D16_MARK,	D17_MARK,	D18_MARK,	D19_MARK,</div><div class='add'>+	D20_MARK,	D21_MARK,	D22_MARK,	D23_MARK,</div><div class='add'>+	D24_MARK,	D25_MARK,	D26_MARK,	D27_MARK,</div><div class='add'>+	D28_MARK,	D29_MARK,	D30_MARK,	D31_MARK,</div><div class='add'>+</div><div class='add'>+	WE0_FWE_MARK,	/* share with FLCTL */</div><div class='add'>+	WE1_MARK,</div><div class='add'>+	WE2_ICIORD_MARK,	/* share with PCMCIA */</div><div class='add'>+	WE3_ICIOWR_MARK,	/* share with PCMCIA */</div><div class='add'>+	CKO_MARK,	BS_MARK,	RDWR_MARK,</div><div class='add'>+	RD_FSC_MARK,	/* share with FLCTL */</div><div class='add'>+	WAIT_PORT177_MARK, /* WAIT Port 90/177 */</div><div class='add'>+	WAIT_PORT90_MARK,</div><div class='add'>+</div><div class='add'>+	FCE0_MARK,	FCE1_MARK,	FRB_MARK, /* FLCTL */</div><div class='add'>+</div><div class='add'>+	/* IRDA */</div><div class='add'>+	IRDA_FIRSEL_MARK,	IRDA_IN_MARK,	IRDA_OUT_MARK,</div><div class='add'>+</div><div class='add'>+	/* ATAPI */</div><div class='add'>+	IDE_D0_MARK,	IDE_D1_MARK,	IDE_D2_MARK,	IDE_D3_MARK,</div><div class='add'>+	IDE_D4_MARK,	IDE_D5_MARK,	IDE_D6_MARK,	IDE_D7_MARK,</div><div class='add'>+	IDE_D8_MARK,	IDE_D9_MARK,	IDE_D10_MARK,	IDE_D11_MARK,</div><div class='add'>+	IDE_D12_MARK,	IDE_D13_MARK,	IDE_D14_MARK,	IDE_D15_MARK,</div><div class='add'>+	IDE_A0_MARK,	IDE_A1_MARK,	IDE_A2_MARK,	IDE_CS0_MARK,</div><div class='add'>+	IDE_CS1_MARK,	IDE_IOWR_MARK,	IDE_IORD_MARK,	IDE_IORDY_MARK,</div><div class='add'>+	IDE_INT_MARK,		IDE_RST_MARK,		IDE_DIRECTION_MARK,</div><div class='add'>+	IDE_EXBUF_ENB_MARK,	IDE_IODACK_MARK,	IDE_IODREQ_MARK,</div><div class='add'>+</div><div class='add'>+	/* RMII */</div><div class='add'>+	RMII_CRS_DV_MARK,	RMII_RX_ER_MARK,	RMII_RXD0_MARK,</div><div class='add'>+	RMII_RXD1_MARK,		RMII_TX_EN_MARK,	RMII_TXD0_MARK,</div><div class='add'>+	RMII_MDC_MARK,		RMII_TXD1_MARK,		RMII_MDIO_MARK,</div><div class='add'>+	RMII_REF50CK_MARK,	/* for RMII */</div><div class='add'>+	RMII_REF125CK_MARK,	/* for GMII */</div><div class='add'>+</div><div class='add'>+	/* GEther */</div><div class='add'>+	ET_TX_CLK_MARK,	ET_TX_EN_MARK,	ET_ETXD0_MARK,	ET_ETXD1_MARK,</div><div class='add'>+	ET_ETXD2_MARK,	ET_ETXD3_MARK,</div><div class='add'>+	ET_ETXD4_MARK,	ET_ETXD5_MARK, /* for GEther */</div><div class='add'>+	ET_ETXD6_MARK,	ET_ETXD7_MARK, /* for GEther */</div><div class='add'>+	ET_COL_MARK,	ET_TX_ER_MARK,	ET_RX_CLK_MARK,	ET_RX_DV_MARK,</div><div class='add'>+	ET_ERXD0_MARK,	ET_ERXD1_MARK,	ET_ERXD2_MARK,	ET_ERXD3_MARK,</div><div class='add'>+	ET_ERXD4_MARK,	ET_ERXD5_MARK, /* for GEther */</div><div class='add'>+	ET_ERXD6_MARK,	ET_ERXD7_MARK, /* for GEther */</div><div class='add'>+	ET_RX_ER_MARK,	ET_CRS_MARK,		ET_MDC_MARK,	ET_MDIO_MARK,</div><div class='add'>+	ET_LINK_MARK,	ET_PHY_INT_MARK,	ET_WOL_MARK,	ET_GTX_CLK_MARK,</div><div class='add'>+</div><div class='add'>+	/* DMA0 */</div><div class='add'>+	DREQ0_MARK,	DACK0_MARK,</div><div class='add'>+</div><div class='add'>+	/* DMA1 */</div><div class='add'>+	DREQ1_MARK,	DACK1_MARK,</div><div class='add'>+</div><div class='add'>+	/* SYSC */</div><div class='add'>+	RESETOUTS_MARK,		RESETP_PULLUP_MARK,	RESETP_PLAIN_MARK,</div><div class='add'>+</div><div class='add'>+	/* IRREM */</div><div class='add'>+	IROUT_MARK,</div><div class='add'>+</div><div class='add'>+	/* SDENC */</div><div class='add'>+	SDENC_CPG_MARK,		SDENC_DV_CLKI_MARK,</div><div class='add'>+</div><div class='add'>+	/* DEBUG */</div><div class='add'>+	EDEBGREQ_PULLUP_MARK,	/* for JTAG */</div><div class='add'>+	EDEBGREQ_PULLDOWN_MARK,</div><div class='add'>+</div><div class='add'>+	TRACEAUD_FROM_VIO_MARK,	/* for TRACE/AUD */</div><div class='add'>+	TRACEAUD_FROM_LCDC0_MARK,</div><div class='add'>+	TRACEAUD_FROM_MEMC_MARK,</div><div class='add'>+</div><div class='add'>+	PINMUX_MARK_END,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static pinmux_enum_t pinmux_data[] = {</div><div class='add'>+	/* specify valid pin states for each pin in GPIO mode */</div><div class='add'>+</div><div class='add'>+	/* I/O and Pull U/D */</div><div class='add'>+	PORT_DATA_IO_PD(0),		PORT_DATA_IO_PD(1),</div><div class='add'>+	PORT_DATA_IO_PD(2),		PORT_DATA_IO_PD(3),</div><div class='add'>+	PORT_DATA_IO_PD(4),		PORT_DATA_IO_PD(5),</div><div class='add'>+	PORT_DATA_IO_PD(6),		PORT_DATA_IO(7),</div><div class='add'>+	PORT_DATA_IO(8),		PORT_DATA_IO(9),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO_PD(10),		PORT_DATA_IO_PD(11),</div><div class='add'>+	PORT_DATA_IO_PD(12),		PORT_DATA_IO_PU_PD(13),</div><div class='add'>+	PORT_DATA_IO_PD(14),		PORT_DATA_IO_PD(15),</div><div class='add'>+	PORT_DATA_IO_PD(16),		PORT_DATA_IO_PD(17),</div><div class='add'>+	PORT_DATA_IO(18),		PORT_DATA_IO_PU(19),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO_PU_PD(20),		PORT_DATA_IO_PD(21),</div><div class='add'>+	PORT_DATA_IO_PU_PD(22),		PORT_DATA_IO(23),</div><div class='add'>+	PORT_DATA_IO_PU(24),		PORT_DATA_IO_PU(25),</div><div class='add'>+	PORT_DATA_IO_PU(26),		PORT_DATA_IO_PU(27),</div><div class='add'>+	PORT_DATA_IO_PU(28),		PORT_DATA_IO_PU(29),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO_PU(30),		PORT_DATA_IO_PD(31),</div><div class='add'>+	PORT_DATA_IO_PD(32),		PORT_DATA_IO_PD(33),</div><div class='add'>+	PORT_DATA_IO_PD(34),		PORT_DATA_IO_PU(35),</div><div class='add'>+	PORT_DATA_IO_PU(36),		PORT_DATA_IO_PD(37),</div><div class='add'>+	PORT_DATA_IO_PU(38),		PORT_DATA_IO_PD(39),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO_PU_PD(40),		PORT_DATA_IO_PD(41),</div><div class='add'>+	PORT_DATA_IO_PD(42),		PORT_DATA_IO_PU_PD(43),</div><div class='add'>+	PORT_DATA_IO_PU_PD(44),		PORT_DATA_IO_PU_PD(45),</div><div class='add'>+	PORT_DATA_IO_PU_PD(46),		PORT_DATA_IO_PU_PD(47),</div><div class='add'>+	PORT_DATA_IO_PU_PD(48),		PORT_DATA_IO_PU_PD(49),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO_PU_PD(50),		PORT_DATA_IO_PD(51),</div><div class='add'>+	PORT_DATA_IO_PD(52),		PORT_DATA_IO_PD(53),</div><div class='add'>+	PORT_DATA_IO_PD(54),		PORT_DATA_IO_PU_PD(55),</div><div class='add'>+	PORT_DATA_IO_PU_PD(56),		PORT_DATA_IO_PU_PD(57),</div><div class='add'>+	PORT_DATA_IO_PU_PD(58),		PORT_DATA_IO_PU_PD(59),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO_PU_PD(60),		PORT_DATA_IO_PD(61),</div><div class='add'>+	PORT_DATA_IO_PD(62),		PORT_DATA_IO_PD(63),</div><div class='add'>+	PORT_DATA_IO_PD(64),		PORT_DATA_IO_PD(65),</div><div class='add'>+	PORT_DATA_IO_PU_PD(66),		PORT_DATA_IO_PU_PD(67),</div><div class='add'>+	PORT_DATA_IO_PU_PD(68),		PORT_DATA_IO_PU_PD(69),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO_PU_PD(70),		PORT_DATA_IO_PU_PD(71),</div><div class='add'>+	PORT_DATA_IO_PU_PD(72),		PORT_DATA_IO_PU_PD(73),</div><div class='add'>+	PORT_DATA_IO_PU_PD(74),		PORT_DATA_IO_PU_PD(75),</div><div class='add'>+	PORT_DATA_IO_PU_PD(76),		PORT_DATA_IO_PU_PD(77),</div><div class='add'>+	PORT_DATA_IO_PU_PD(78),		PORT_DATA_IO_PU_PD(79),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO_PU_PD(80),		PORT_DATA_IO_PU_PD(81),</div><div class='add'>+	PORT_DATA_IO(82),		PORT_DATA_IO_PU_PD(83),</div><div class='add'>+	PORT_DATA_IO(84),		PORT_DATA_IO_PD(85),</div><div class='add'>+	PORT_DATA_IO_PD(86),		PORT_DATA_IO_PD(87),</div><div class='add'>+	PORT_DATA_IO_PD(88),		PORT_DATA_IO_PD(89),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO_PD(90),		PORT_DATA_IO_PU_PD(91),</div><div class='add'>+	PORT_DATA_IO_PU_PD(92),		PORT_DATA_IO_PU_PD(93),</div><div class='add'>+	PORT_DATA_IO_PU_PD(94),		PORT_DATA_IO_PU_PD(95),</div><div class='add'>+	PORT_DATA_IO_PU_PD(96),		PORT_DATA_IO_PU_PD(97),</div><div class='add'>+	PORT_DATA_IO_PU_PD(98),		PORT_DATA_IO_PU_PD(99),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO_PU_PD(100),	PORT_DATA_IO(101),</div><div class='add'>+	PORT_DATA_IO_PU(102),		PORT_DATA_IO_PU_PD(103),</div><div class='add'>+	PORT_DATA_IO_PU(104),		PORT_DATA_IO_PU(105),</div><div class='add'>+	PORT_DATA_IO_PU_PD(106),	PORT_DATA_IO(107),</div><div class='add'>+	PORT_DATA_IO(108),		PORT_DATA_IO(109),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO(110),		PORT_DATA_IO(111),</div><div class='add'>+	PORT_DATA_IO(112),		PORT_DATA_IO(113),</div><div class='add'>+	PORT_DATA_IO_PU_PD(114),	PORT_DATA_IO(115),</div><div class='add'>+	PORT_DATA_IO_PD(116),		PORT_DATA_IO_PD(117),</div><div class='add'>+	PORT_DATA_IO_PD(118),		PORT_DATA_IO_PD(119),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO_PD(120),		PORT_DATA_IO_PD(121),</div><div class='add'>+	PORT_DATA_IO_PD(122),		PORT_DATA_IO_PD(123),</div><div class='add'>+	PORT_DATA_IO_PD(124),		PORT_DATA_IO(125),</div><div class='add'>+	PORT_DATA_IO(126),		PORT_DATA_IO(127),</div><div class='add'>+	PORT_DATA_IO(128),		PORT_DATA_IO(129),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO(130),		PORT_DATA_IO(131),</div><div class='add'>+	PORT_DATA_IO(132),		PORT_DATA_IO(133),</div><div class='add'>+	PORT_DATA_IO(134),		PORT_DATA_IO(135),</div><div class='add'>+	PORT_DATA_IO(136),		PORT_DATA_IO(137),</div><div class='add'>+	PORT_DATA_IO(138),		PORT_DATA_IO(139),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO(140),		PORT_DATA_IO(141),</div><div class='add'>+	PORT_DATA_IO_PU(142),		PORT_DATA_IO_PU(143),</div><div class='add'>+	PORT_DATA_IO_PU(144),		PORT_DATA_IO_PU(145),</div><div class='add'>+	PORT_DATA_IO_PU(146),		PORT_DATA_IO_PU(147),</div><div class='add'>+	PORT_DATA_IO_PU(148),		PORT_DATA_IO_PU(149),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO_PU(150),		PORT_DATA_IO_PU(151),</div><div class='add'>+	PORT_DATA_IO_PU(152),		PORT_DATA_IO_PU(153),</div><div class='add'>+	PORT_DATA_IO_PU(154),		PORT_DATA_IO_PU(155),</div><div class='add'>+	PORT_DATA_IO_PU(156),		PORT_DATA_IO_PU(157),</div><div class='add'>+	PORT_DATA_IO_PD(158),		PORT_DATA_IO_PD(159),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO_PU_PD(160),	PORT_DATA_IO_PD(161),</div><div class='add'>+	PORT_DATA_IO_PD(162),		PORT_DATA_IO_PD(163),</div><div class='add'>+	PORT_DATA_IO_PD(164),		PORT_DATA_IO_PD(165),</div><div class='add'>+	PORT_DATA_IO_PU(166),		PORT_DATA_IO_PU(167),</div><div class='add'>+	PORT_DATA_IO_PU(168),		PORT_DATA_IO_PU(169),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO_PU(170),		PORT_DATA_IO_PU(171),</div><div class='add'>+	PORT_DATA_IO_PD(172),		PORT_DATA_IO_PD(173),</div><div class='add'>+	PORT_DATA_IO_PD(174),		PORT_DATA_IO_PD(175),</div><div class='add'>+	PORT_DATA_IO_PU(176),		PORT_DATA_IO_PU_PD(177),</div><div class='add'>+	PORT_DATA_IO_PU(178),		PORT_DATA_IO_PD(179),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO_PD(180),		PORT_DATA_IO_PU(181),</div><div class='add'>+	PORT_DATA_IO_PU(182),		PORT_DATA_IO(183),</div><div class='add'>+	PORT_DATA_IO_PD(184),		PORT_DATA_IO_PD(185),</div><div class='add'>+	PORT_DATA_IO_PD(186),		PORT_DATA_IO_PD(187),</div><div class='add'>+	PORT_DATA_IO_PD(188),		PORT_DATA_IO_PD(189),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO_PD(190),		PORT_DATA_IO_PD(191),</div><div class='add'>+	PORT_DATA_IO_PD(192),		PORT_DATA_IO_PU_PD(193),</div><div class='add'>+	PORT_DATA_IO_PU_PD(194),	PORT_DATA_IO_PD(195),</div><div class='add'>+	PORT_DATA_IO_PU_PD(196),	PORT_DATA_IO_PD(197),</div><div class='add'>+	PORT_DATA_IO_PU_PD(198),	PORT_DATA_IO_PU_PD(199),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO_PU_PD(200),	PORT_DATA_IO_PU(201),</div><div class='add'>+	PORT_DATA_IO_PU_PD(202),	PORT_DATA_IO(203),</div><div class='add'>+	PORT_DATA_IO_PU_PD(204),	PORT_DATA_IO_PU_PD(205),</div><div class='add'>+	PORT_DATA_IO_PU_PD(206),	PORT_DATA_IO_PU_PD(207),</div><div class='add'>+	PORT_DATA_IO_PU_PD(208),	PORT_DATA_IO_PD(209),</div><div class='add'>+</div><div class='add'>+	PORT_DATA_IO_PD(210),		PORT_DATA_IO_PD(211),</div><div class='add'>+</div><div class='add'>+	/* Port0 */</div><div class='add'>+	PINMUX_DATA(DBGMDT2_MARK,		PORT0_FN1),</div><div class='add'>+	PINMUX_DATA(FSIAISLD_PORT0_MARK,	PORT0_FN2,	MSEL5CR_3_0),</div><div class='add'>+	PINMUX_DATA(FSIAOSLD1_MARK,		PORT0_FN3),</div><div class='add'>+	PINMUX_DATA(LCD0_D22_PORT0_MARK,	PORT0_FN4,	MSEL5CR_6_0),</div><div class='add'>+	PINMUX_DATA(SCIFA7_RXD_MARK,		PORT0_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_D4_MARK,		PORT0_FN7),</div><div class='add'>+	PINMUX_DATA(IRQ5_PORT0_MARK,		PORT0_FN0,	MSEL1CR_5_0),</div><div class='add'>+</div><div class='add'>+	/* Port1 */</div><div class='add'>+	PINMUX_DATA(DBGMDT1_MARK,		PORT1_FN1),</div><div class='add'>+	PINMUX_DATA(FMSISLD_PORT1_MARK,		PORT1_FN2,	MSEL5CR_5_0),</div><div class='add'>+	PINMUX_DATA(FSIAOSLD2_MARK,		PORT1_FN3),</div><div class='add'>+	PINMUX_DATA(LCD0_D23_PORT1_MARK,	PORT1_FN4,	MSEL5CR_6_0),</div><div class='add'>+	PINMUX_DATA(SCIFA7_TXD_MARK,		PORT1_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_D3_MARK,		PORT1_FN7),</div><div class='add'>+	PINMUX_DATA(IRQ5_PORT1_MARK,		PORT1_FN0,	MSEL1CR_5_1),</div><div class='add'>+</div><div class='add'>+	/* Port2 */</div><div class='add'>+	PINMUX_DATA(DBGMDT0_MARK,		PORT2_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFB_SCK_PORT2_MARK,	PORT2_FN2,	MSEL5CR_17_1),</div><div class='add'>+	PINMUX_DATA(LCD0_D21_PORT2_MARK,	PORT2_FN4,	MSEL5CR_6_0),</div><div class='add'>+	PINMUX_DATA(LCD1_D2_MARK,		PORT2_FN7),</div><div class='add'>+	PINMUX_DATA(IRQ0_PORT2_MARK,		PORT2_FN0,	MSEL1CR_0_1),</div><div class='add'>+</div><div class='add'>+	/* Port3 */</div><div class='add'>+	PINMUX_DATA(DBGMD21_MARK,		PORT3_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFB_RXD_PORT3_MARK,	PORT3_FN2,	MSEL5CR_17_1),</div><div class='add'>+	PINMUX_DATA(LCD0_D20_PORT3_MARK,	PORT3_FN4,	MSEL5CR_6_0),</div><div class='add'>+	PINMUX_DATA(LCD1_D1_MARK,		PORT3_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port4 */</div><div class='add'>+	PINMUX_DATA(DBGMD20_MARK,		PORT4_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFB_TXD_PORT4_MARK,	PORT4_FN2,	MSEL5CR_17_1),</div><div class='add'>+	PINMUX_DATA(LCD0_D19_PORT4_MARK,	PORT4_FN4,	MSEL5CR_6_0),</div><div class='add'>+	PINMUX_DATA(LCD1_D0_MARK,		PORT4_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port5 */</div><div class='add'>+	PINMUX_DATA(DBGMD11_MARK,		PORT5_FN1),</div><div class='add'>+	PINMUX_DATA(BBIF2_TXD2_PORT5_MARK,	PORT5_FN2,	MSEL5CR_0_0),</div><div class='add'>+	PINMUX_DATA(FSIAISLD_PORT5_MARK,	PORT5_FN4,	MSEL5CR_3_1),</div><div class='add'>+	PINMUX_DATA(RSPI_SSL0_A_MARK,		PORT5_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_VCPWC_MARK,		PORT5_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port6 */</div><div class='add'>+	PINMUX_DATA(DBGMD10_MARK,		PORT6_FN1),</div><div class='add'>+	PINMUX_DATA(BBIF2_TSYNC2_PORT6_MARK,	PORT6_FN2,	MSEL5CR_0_0),</div><div class='add'>+	PINMUX_DATA(FMSISLD_PORT6_MARK,		PORT6_FN4,	MSEL5CR_5_1),</div><div class='add'>+	PINMUX_DATA(RSPI_SSL1_A_MARK,		PORT6_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_VEPWC_MARK,		PORT6_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port7 */</div><div class='add'>+	PINMUX_DATA(FSIAOLR_MARK,		PORT7_FN1),</div><div class='add'>+</div><div class='add'>+	/* Port8 */</div><div class='add'>+	PINMUX_DATA(FSIAOBT_MARK,		PORT8_FN1),</div><div class='add'>+</div><div class='add'>+	/* Port9 */</div><div class='add'>+	PINMUX_DATA(FSIAOSLD_MARK,		PORT9_FN1),</div><div class='add'>+	PINMUX_DATA(FSIASPDIF_PORT9_MARK,	PORT9_FN2,	MSEL5CR_4_0),</div><div class='add'>+</div><div class='add'>+	/* Port10 */</div><div class='add'>+	PINMUX_DATA(FSIAOMC_MARK,		PORT10_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFA5_RXD_PORT10_MARK,	PORT10_FN3,	MSEL5CR_14_0,	MSEL5CR_15_0),</div><div class='add'>+	PINMUX_DATA(IRQ3_PORT10_MARK,		PORT10_FN0,	MSEL1CR_3_0),</div><div class='add'>+</div><div class='add'>+	/* Port11 */</div><div class='add'>+	PINMUX_DATA(FSIACK_MARK,		PORT11_FN1),</div><div class='add'>+	PINMUX_DATA(IRQ2_PORT11_MARK,		PORT11_FN0,	MSEL1CR_2_0),</div><div class='add'>+</div><div class='add'>+	/* Port12 */</div><div class='add'>+	PINMUX_DATA(FSIAILR_MARK,		PORT12_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFA4_RXD_PORT12_MARK,	PORT12_FN2,	MSEL5CR_12_0,	MSEL5CR_11_0),</div><div class='add'>+	PINMUX_DATA(LCD1_RS_MARK,		PORT12_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_DISP_MARK,		PORT12_FN7),</div><div class='add'>+	PINMUX_DATA(IRQ2_PORT12_MARK,		PORT12_FN0,	MSEL1CR_2_1),</div><div class='add'>+</div><div class='add'>+	/* Port13 */</div><div class='add'>+	PINMUX_DATA(FSIAIBT_MARK,		PORT13_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFA4_TXD_PORT13_MARK,	PORT13_FN2,	MSEL5CR_12_0,	MSEL5CR_11_0),</div><div class='add'>+	PINMUX_DATA(LCD1_RD_MARK,		PORT13_FN7),</div><div class='add'>+	PINMUX_DATA(IRQ0_PORT13_MARK,		PORT13_FN0,	MSEL1CR_0_0),</div><div class='add'>+</div><div class='add'>+	/* Port14 */</div><div class='add'>+	PINMUX_DATA(FMSOILR_MARK,		PORT14_FN1),</div><div class='add'>+	PINMUX_DATA(FMSIILR_MARK,		PORT14_FN2),</div><div class='add'>+	PINMUX_DATA(VIO_CKO1_MARK,		PORT14_FN3),</div><div class='add'>+	PINMUX_DATA(LCD1_D23_MARK,		PORT14_FN7),</div><div class='add'>+	PINMUX_DATA(IRQ3_PORT14_MARK,		PORT14_FN0,	MSEL1CR_3_1),</div><div class='add'>+</div><div class='add'>+	/* Port15 */</div><div class='add'>+	PINMUX_DATA(FMSOIBT_MARK,		PORT15_FN1),</div><div class='add'>+	PINMUX_DATA(FMSIIBT_MARK,		PORT15_FN2),</div><div class='add'>+	PINMUX_DATA(VIO_CKO2_MARK,		PORT15_FN3),</div><div class='add'>+	PINMUX_DATA(LCD1_D22_MARK,		PORT15_FN7),</div><div class='add'>+	PINMUX_DATA(IRQ4_PORT15_MARK,		PORT15_FN0,	MSEL1CR_4_0),</div><div class='add'>+</div><div class='add'>+	/* Port16 */</div><div class='add'>+	PINMUX_DATA(FMSOOLR_MARK,		PORT16_FN1),</div><div class='add'>+	PINMUX_DATA(FMSIOLR_MARK,		PORT16_FN2),</div><div class='add'>+</div><div class='add'>+	/* Port17 */</div><div class='add'>+	PINMUX_DATA(FMSOOBT_MARK,		PORT17_FN1),</div><div class='add'>+	PINMUX_DATA(FMSIOBT_MARK,		PORT17_FN2),</div><div class='add'>+</div><div class='add'>+	/* Port18 */</div><div class='add'>+	PINMUX_DATA(FMSOSLD_MARK,		PORT18_FN1),</div><div class='add'>+	PINMUX_DATA(FSIASPDIF_PORT18_MARK,	PORT18_FN2,	MSEL5CR_4_1),</div><div class='add'>+</div><div class='add'>+	/* Port19 */</div><div class='add'>+	PINMUX_DATA(FMSICK_MARK,		PORT19_FN1),</div><div class='add'>+	PINMUX_DATA(CS5A_PORT19_MARK,		PORT19_FN7,	MSEL5CR_2_1),</div><div class='add'>+	PINMUX_DATA(IRQ10_MARK,			PORT19_FN0),</div><div class='add'>+</div><div class='add'>+	/* Port20 */</div><div class='add'>+	PINMUX_DATA(FMSOCK_MARK,		PORT20_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFA5_TXD_PORT20_MARK,	PORT20_FN3,	MSEL5CR_15_0,	MSEL5CR_14_0),</div><div class='add'>+	PINMUX_DATA(IRQ1_MARK,			PORT20_FN0),</div><div class='add'>+</div><div class='add'>+	/* Port21 */</div><div class='add'>+	PINMUX_DATA(SCIFA1_CTS_MARK,		PORT21_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFA4_SCK_PORT21_MARK,	PORT21_FN2,	MSEL5CR_10_0),</div><div class='add'>+	PINMUX_DATA(TPU0TO1_MARK,		PORT21_FN4),</div><div class='add'>+	PINMUX_DATA(VIO1_FIELD_MARK,		PORT21_FN5),</div><div class='add'>+	PINMUX_DATA(STP0_IPD5_MARK,		PORT21_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_D10_MARK,		PORT21_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port22 */</div><div class='add'>+	PINMUX_DATA(SCIFA2_SCK_PORT22_MARK,	PORT22_FN1,	MSEL5CR_7_0),</div><div class='add'>+	PINMUX_DATA(SIM_D_PORT22_MARK,		PORT22_FN4,	MSEL5CR_21_0),</div><div class='add'>+	PINMUX_DATA(VIO0_D13_PORT22_MARK,	PORT22_FN7,	MSEL5CR_27_1),</div><div class='add'>+</div><div class='add'>+	/* Port23 */</div><div class='add'>+	PINMUX_DATA(SCIFA1_RTS_MARK,		PORT23_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFA5_SCK_PORT23_MARK,	PORT23_FN3,	MSEL5CR_13_0),</div><div class='add'>+	PINMUX_DATA(TPU0TO0_MARK,		PORT23_FN4),</div><div class='add'>+	PINMUX_DATA(VIO_CKO_1_MARK,		PORT23_FN5),</div><div class='add'>+	PINMUX_DATA(STP0_IPD2_MARK,		PORT23_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_D7_MARK,		PORT23_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port24 */</div><div class='add'>+	PINMUX_DATA(VIO0_D15_PORT24_MARK,	PORT24_FN1,	MSEL5CR_27_0),</div><div class='add'>+	PINMUX_DATA(VIO1_D7_MARK,		PORT24_FN5),</div><div class='add'>+	PINMUX_DATA(SCIFA6_SCK_MARK,		PORT24_FN6),</div><div class='add'>+	PINMUX_DATA(SDHI2_CD_PORT24_MARK,	PORT24_FN7,	MSEL5CR_19_0),</div><div class='add'>+</div><div class='add'>+	/* Port25 */</div><div class='add'>+	PINMUX_DATA(VIO0_D14_PORT25_MARK,	PORT25_FN1,	MSEL5CR_27_0),</div><div class='add'>+	PINMUX_DATA(VIO1_D6_MARK,		PORT25_FN5),</div><div class='add'>+	PINMUX_DATA(SCIFA6_RXD_MARK,		PORT25_FN6),</div><div class='add'>+	PINMUX_DATA(SDHI2_WP_PORT25_MARK,	PORT25_FN7,	MSEL5CR_19_0),</div><div class='add'>+</div><div class='add'>+	/* Port26 */</div><div class='add'>+	PINMUX_DATA(VIO0_D13_PORT26_MARK,	PORT26_FN1,	MSEL5CR_27_0),</div><div class='add'>+	PINMUX_DATA(VIO1_D5_MARK,		PORT26_FN5),</div><div class='add'>+	PINMUX_DATA(SCIFA6_TXD_MARK,		PORT26_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port27 - Port39 Function */</div><div class='add'>+	PINMUX_DATA(VIO0_D7_MARK,		PORT27_FN1),</div><div class='add'>+	PINMUX_DATA(VIO0_D6_MARK,		PORT28_FN1),</div><div class='add'>+	PINMUX_DATA(VIO0_D5_MARK,		PORT29_FN1),</div><div class='add'>+	PINMUX_DATA(VIO0_D4_MARK,		PORT30_FN1),</div><div class='add'>+	PINMUX_DATA(VIO0_D3_MARK,		PORT31_FN1),</div><div class='add'>+	PINMUX_DATA(VIO0_D2_MARK,		PORT32_FN1),</div><div class='add'>+	PINMUX_DATA(VIO0_D1_MARK,		PORT33_FN1),</div><div class='add'>+	PINMUX_DATA(VIO0_D0_MARK,		PORT34_FN1),</div><div class='add'>+	PINMUX_DATA(VIO0_CLK_MARK,		PORT35_FN1),</div><div class='add'>+	PINMUX_DATA(VIO_CKO_MARK,		PORT36_FN1),</div><div class='add'>+	PINMUX_DATA(VIO0_HD_MARK,		PORT37_FN1),</div><div class='add'>+	PINMUX_DATA(VIO0_FIELD_MARK,		PORT38_FN1),</div><div class='add'>+	PINMUX_DATA(VIO0_VD_MARK,		PORT39_FN1),</div><div class='add'>+</div><div class='add'>+	/* Port38 IRQ */</div><div class='add'>+	PINMUX_DATA(IRQ25_MARK,			PORT38_FN0),</div><div class='add'>+</div><div class='add'>+	/* Port40 */</div><div class='add'>+	PINMUX_DATA(LCD0_D18_PORT40_MARK,	PORT40_FN4,	MSEL5CR_6_0),</div><div class='add'>+	PINMUX_DATA(RSPI_CK_A_MARK,		PORT40_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_LCLK_MARK,		PORT40_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port41 */</div><div class='add'>+	PINMUX_DATA(LCD0_D17_MARK,		PORT41_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF2_SS1_MARK,		PORT41_FN2),</div><div class='add'>+	PINMUX_DATA(IRQ31_PORT41_MARK,		PORT41_FN0,	MSEL1CR_31_1),</div><div class='add'>+</div><div class='add'>+	/* Port42 */</div><div class='add'>+	PINMUX_DATA(LCD0_D16_MARK,		PORT42_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF2_MCK1_MARK,		PORT42_FN2),</div><div class='add'>+	PINMUX_DATA(IRQ12_PORT42_MARK,		PORT42_FN0,	MSEL1CR_12_1),</div><div class='add'>+</div><div class='add'>+	/* Port43 */</div><div class='add'>+	PINMUX_DATA(LCD0_D15_MARK,		PORT43_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF2_MCK0_MARK,		PORT43_FN2),</div><div class='add'>+	PINMUX_DATA(KEYIN0_PORT43_MARK,		PORT43_FN3,	MSEL4CR_18_0),</div><div class='add'>+	PINMUX_DATA(DV_D15_MARK,		PORT43_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port44 */</div><div class='add'>+	PINMUX_DATA(LCD0_D14_MARK,		PORT44_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF2_RSYNC_MARK,		PORT44_FN2),</div><div class='add'>+	PINMUX_DATA(KEYIN1_PORT44_MARK,		PORT44_FN3,	MSEL4CR_18_0),</div><div class='add'>+	PINMUX_DATA(DV_D14_MARK,		PORT44_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port45 */</div><div class='add'>+	PINMUX_DATA(LCD0_D13_MARK,		PORT45_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF2_RSCK_MARK,		PORT45_FN2),</div><div class='add'>+	PINMUX_DATA(KEYIN2_PORT45_MARK,		PORT45_FN3,	MSEL4CR_18_0),</div><div class='add'>+	PINMUX_DATA(DV_D13_MARK,		PORT45_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port46 */</div><div class='add'>+	PINMUX_DATA(LCD0_D12_MARK,		PORT46_FN1),</div><div class='add'>+	PINMUX_DATA(KEYIN3_PORT46_MARK,		PORT46_FN3,	MSEL4CR_18_0),</div><div class='add'>+	PINMUX_DATA(DV_D12_MARK,		PORT46_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port47 */</div><div class='add'>+	PINMUX_DATA(LCD0_D11_MARK,		PORT47_FN1),</div><div class='add'>+	PINMUX_DATA(KEYIN4_MARK,		PORT47_FN3),</div><div class='add'>+	PINMUX_DATA(DV_D11_MARK,		PORT47_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port48 */</div><div class='add'>+	PINMUX_DATA(LCD0_D10_MARK,		PORT48_FN1),</div><div class='add'>+	PINMUX_DATA(KEYIN5_MARK,		PORT48_FN3),</div><div class='add'>+	PINMUX_DATA(DV_D10_MARK,		PORT48_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port49 */</div><div class='add'>+	PINMUX_DATA(LCD0_D9_MARK,		PORT49_FN1),</div><div class='add'>+	PINMUX_DATA(KEYIN6_MARK,		PORT49_FN3),</div><div class='add'>+	PINMUX_DATA(DV_D9_MARK,			PORT49_FN6),</div><div class='add'>+	PINMUX_DATA(IRQ30_PORT49_MARK,		PORT49_FN0,	MSEL1CR_30_1),</div><div class='add'>+</div><div class='add'>+	/* Port50 */</div><div class='add'>+	PINMUX_DATA(LCD0_D8_MARK,		PORT50_FN1),</div><div class='add'>+	PINMUX_DATA(KEYIN7_MARK,		PORT50_FN3),</div><div class='add'>+	PINMUX_DATA(DV_D8_MARK,			PORT50_FN6),</div><div class='add'>+	PINMUX_DATA(IRQ29_PORT50_MARK,		PORT50_FN0,	MSEL1CR_29_1),</div><div class='add'>+</div><div class='add'>+	/* Port51 */</div><div class='add'>+	PINMUX_DATA(LCD0_D7_MARK,		PORT51_FN1),</div><div class='add'>+	PINMUX_DATA(KEYOUT0_MARK,		PORT51_FN3),</div><div class='add'>+	PINMUX_DATA(DV_D7_MARK,			PORT51_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port52 */</div><div class='add'>+	PINMUX_DATA(LCD0_D6_MARK,		PORT52_FN1),</div><div class='add'>+	PINMUX_DATA(KEYOUT1_MARK,		PORT52_FN3),</div><div class='add'>+	PINMUX_DATA(DV_D6_MARK,			PORT52_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port53 */</div><div class='add'>+	PINMUX_DATA(LCD0_D5_MARK,		PORT53_FN1),</div><div class='add'>+	PINMUX_DATA(KEYOUT2_MARK,		PORT53_FN3),</div><div class='add'>+	PINMUX_DATA(DV_D5_MARK,			PORT53_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port54 */</div><div class='add'>+	PINMUX_DATA(LCD0_D4_MARK,		PORT54_FN1),</div><div class='add'>+	PINMUX_DATA(KEYOUT3_MARK,		PORT54_FN3),</div><div class='add'>+	PINMUX_DATA(DV_D4_MARK,			PORT54_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port55 */</div><div class='add'>+	PINMUX_DATA(LCD0_D3_MARK,		PORT55_FN1),</div><div class='add'>+	PINMUX_DATA(KEYOUT4_MARK,		PORT55_FN3),</div><div class='add'>+	PINMUX_DATA(KEYIN3_PORT55_MARK,		PORT55_FN4,	MSEL4CR_18_1),</div><div class='add'>+	PINMUX_DATA(DV_D3_MARK,			PORT55_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port56 */</div><div class='add'>+	PINMUX_DATA(LCD0_D2_MARK,		PORT56_FN1),</div><div class='add'>+	PINMUX_DATA(KEYOUT5_MARK,		PORT56_FN3),</div><div class='add'>+	PINMUX_DATA(KEYIN2_PORT56_MARK,		PORT56_FN4,	MSEL4CR_18_1),</div><div class='add'>+	PINMUX_DATA(DV_D2_MARK,			PORT56_FN6),</div><div class='add'>+	PINMUX_DATA(IRQ28_PORT56_MARK,		PORT56_FN0,	MSEL1CR_28_1),</div><div class='add'>+</div><div class='add'>+	/* Port57 */</div><div class='add'>+	PINMUX_DATA(LCD0_D1_MARK,		PORT57_FN1),</div><div class='add'>+	PINMUX_DATA(KEYOUT6_MARK,		PORT57_FN3),</div><div class='add'>+	PINMUX_DATA(KEYIN1_PORT57_MARK,		PORT57_FN4,	MSEL4CR_18_1),</div><div class='add'>+	PINMUX_DATA(DV_D1_MARK,			PORT57_FN6),</div><div class='add'>+	PINMUX_DATA(IRQ27_PORT57_MARK,		PORT57_FN0,	MSEL1CR_27_1),</div><div class='add'>+</div><div class='add'>+	/* Port58 */</div><div class='add'>+	PINMUX_DATA(LCD0_D0_MARK,		PORT58_FN1),</div><div class='add'>+	PINMUX_DATA(KEYOUT7_MARK,		PORT58_FN3),</div><div class='add'>+	PINMUX_DATA(KEYIN0_PORT58_MARK,		PORT58_FN4,	MSEL4CR_18_1),</div><div class='add'>+	PINMUX_DATA(DV_D0_MARK,			PORT58_FN6),</div><div class='add'>+	PINMUX_DATA(IRQ26_PORT58_MARK,		PORT58_FN0,	MSEL1CR_26_1),</div><div class='add'>+</div><div class='add'>+	/* Port59 */</div><div class='add'>+	PINMUX_DATA(LCD0_VCPWC_MARK,		PORT59_FN1),</div><div class='add'>+	PINMUX_DATA(BBIF2_TSCK2_PORT59_MARK,	PORT59_FN2,	MSEL5CR_0_0),</div><div class='add'>+	PINMUX_DATA(RSPI_MOSI_A_MARK,		PORT59_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port60 */</div><div class='add'>+	PINMUX_DATA(LCD0_VEPWC_MARK,		PORT60_FN1),</div><div class='add'>+	PINMUX_DATA(BBIF2_RXD2_PORT60_MARK,	PORT60_FN2,	MSEL5CR_0_0),</div><div class='add'>+	PINMUX_DATA(RSPI_MISO_A_MARK,		PORT60_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port61 */</div><div class='add'>+	PINMUX_DATA(LCD0_DON_MARK,		PORT61_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF2_TXD_MARK,		PORT61_FN2),</div><div class='add'>+</div><div class='add'>+	/* Port62 */</div><div class='add'>+	PINMUX_DATA(LCD0_DCK_MARK,		PORT62_FN1),</div><div class='add'>+	PINMUX_DATA(LCD0_WR_MARK,		PORT62_FN4),</div><div class='add'>+	PINMUX_DATA(DV_CLK_MARK,		PORT62_FN6),</div><div class='add'>+	PINMUX_DATA(IRQ15_PORT62_MARK,		PORT62_FN0,	MSEL1CR_15_1),</div><div class='add'>+</div><div class='add'>+	/* Port63 */</div><div class='add'>+	PINMUX_DATA(LCD0_VSYN_MARK,		PORT63_FN1),</div><div class='add'>+	PINMUX_DATA(DV_VSYNC_MARK,		PORT63_FN6),</div><div class='add'>+	PINMUX_DATA(IRQ14_PORT63_MARK,		PORT63_FN0,	MSEL1CR_14_1),</div><div class='add'>+</div><div class='add'>+	/* Port64 */</div><div class='add'>+	PINMUX_DATA(LCD0_HSYN_MARK,		PORT64_FN1),</div><div class='add'>+	PINMUX_DATA(LCD0_CS_MARK,		PORT64_FN4),</div><div class='add'>+	PINMUX_DATA(DV_HSYNC_MARK,		PORT64_FN6),</div><div class='add'>+	PINMUX_DATA(IRQ13_PORT64_MARK,		PORT64_FN0,	MSEL1CR_13_1),</div><div class='add'>+</div><div class='add'>+	/* Port65 */</div><div class='add'>+	PINMUX_DATA(LCD0_DISP_MARK,		PORT65_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF2_TSCK_MARK,		PORT65_FN2),</div><div class='add'>+	PINMUX_DATA(LCD0_RS_MARK,		PORT65_FN4),</div><div class='add'>+</div><div class='add'>+	/* Port66 */</div><div class='add'>+	PINMUX_DATA(MEMC_INT_MARK,		PORT66_FN1),</div><div class='add'>+	PINMUX_DATA(TPU0TO2_PORT66_MARK,	PORT66_FN3,	MSEL5CR_25_0),</div><div class='add'>+	PINMUX_DATA(MMC0_CLK_PORT66_MARK,	PORT66_FN4,	MSEL4CR_15_0),</div><div class='add'>+	PINMUX_DATA(SDHI1_CLK_MARK,		PORT66_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port67 - Port73 Function1 */</div><div class='add'>+	PINMUX_DATA(MEMC_CS0_MARK,		PORT67_FN1),</div><div class='add'>+	PINMUX_DATA(MEMC_AD8_MARK,		PORT68_FN1),</div><div class='add'>+	PINMUX_DATA(MEMC_AD9_MARK,		PORT69_FN1),</div><div class='add'>+	PINMUX_DATA(MEMC_AD10_MARK,		PORT70_FN1),</div><div class='add'>+	PINMUX_DATA(MEMC_AD11_MARK,		PORT71_FN1),</div><div class='add'>+	PINMUX_DATA(MEMC_AD12_MARK,		PORT72_FN1),</div><div class='add'>+	PINMUX_DATA(MEMC_AD13_MARK,		PORT73_FN1),</div><div class='add'>+</div><div class='add'>+	/* Port67 - Port73 Function2 */</div><div class='add'>+	PINMUX_DATA(MSIOF1_SS1_PORT67_MARK,	PORT67_FN2,	MSEL4CR_10_1),</div><div class='add'>+	PINMUX_DATA(MSIOF1_RSCK_MARK,		PORT68_FN2),</div><div class='add'>+	PINMUX_DATA(MSIOF1_RSYNC_MARK,		PORT69_FN2),</div><div class='add'>+	PINMUX_DATA(MSIOF1_MCK0_MARK,		PORT70_FN2),</div><div class='add'>+	PINMUX_DATA(MSIOF1_MCK1_MARK,		PORT71_FN2),</div><div class='add'>+	PINMUX_DATA(MSIOF1_TSCK_PORT72_MARK,	PORT72_FN2,	MSEL4CR_10_1),</div><div class='add'>+	PINMUX_DATA(MSIOF1_TSYNC_PORT73_MARK,	PORT73_FN2,	MSEL4CR_10_1),</div><div class='add'>+</div><div class='add'>+	/* Port67 - Port73 Function4 */</div><div class='add'>+	PINMUX_DATA(MMC0_CMD_PORT67_MARK,	PORT67_FN4,	MSEL4CR_15_0),</div><div class='add'>+	PINMUX_DATA(MMC0_D0_PORT68_MARK,	PORT68_FN4,	MSEL4CR_15_0),</div><div class='add'>+	PINMUX_DATA(MMC0_D1_PORT69_MARK,	PORT69_FN4,	MSEL4CR_15_0),</div><div class='add'>+	PINMUX_DATA(MMC0_D2_PORT70_MARK,	PORT70_FN4,	MSEL4CR_15_0),</div><div class='add'>+	PINMUX_DATA(MMC0_D3_PORT71_MARK,	PORT71_FN4,	MSEL4CR_15_0),</div><div class='add'>+	PINMUX_DATA(MMC0_D4_PORT72_MARK,	PORT72_FN4,	MSEL4CR_15_0),</div><div class='add'>+	PINMUX_DATA(MMC0_D5_PORT73_MARK,	PORT73_FN4,	MSEL4CR_15_0),</div><div class='add'>+</div><div class='add'>+	/* Port67 - Port73 Function6 */</div><div class='add'>+	PINMUX_DATA(SDHI1_CMD_MARK,		PORT67_FN6),</div><div class='add'>+	PINMUX_DATA(SDHI1_D0_MARK,		PORT68_FN6),</div><div class='add'>+	PINMUX_DATA(SDHI1_D1_MARK,		PORT69_FN6),</div><div class='add'>+	PINMUX_DATA(SDHI1_D2_MARK,		PORT70_FN6),</div><div class='add'>+	PINMUX_DATA(SDHI1_D3_MARK,		PORT71_FN6),</div><div class='add'>+	PINMUX_DATA(SDHI1_CD_MARK,		PORT72_FN6),</div><div class='add'>+	PINMUX_DATA(SDHI1_WP_MARK,		PORT73_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port67 - Port71 IRQ */</div><div class='add'>+	PINMUX_DATA(IRQ20_MARK,			PORT67_FN0),</div><div class='add'>+	PINMUX_DATA(IRQ16_PORT68_MARK,		PORT68_FN0,	MSEL1CR_16_0),</div><div class='add'>+	PINMUX_DATA(IRQ17_MARK,			PORT69_FN0),</div><div class='add'>+	PINMUX_DATA(IRQ18_MARK,			PORT70_FN0),</div><div class='add'>+	PINMUX_DATA(IRQ19_MARK,			PORT71_FN0),</div><div class='add'>+</div><div class='add'>+	/* Port74 */</div><div class='add'>+	PINMUX_DATA(MEMC_AD14_MARK,		PORT74_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF1_TXD_PORT74_MARK,	PORT74_FN2,	MSEL4CR_10_1),</div><div class='add'>+	PINMUX_DATA(MMC0_D6_PORT74_MARK,	PORT74_FN4,	MSEL4CR_15_0),</div><div class='add'>+	PINMUX_DATA(STP1_IPD7_MARK,		PORT74_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_D21_MARK,		PORT74_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port75 */</div><div class='add'>+	PINMUX_DATA(MEMC_AD15_MARK,		PORT75_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF1_RXD_PORT75_MARK,	PORT75_FN2,	MSEL4CR_10_1),</div><div class='add'>+	PINMUX_DATA(MMC0_D7_PORT75_MARK,	PORT75_FN4,	MSEL4CR_15_0),</div><div class='add'>+	PINMUX_DATA(STP1_IPD6_MARK,		PORT75_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_D20_MARK,		PORT75_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port76 - Port80 Function */</div><div class='add'>+	PINMUX_DATA(SDHI0_CMD_MARK,		PORT76_FN1),</div><div class='add'>+	PINMUX_DATA(SDHI0_D0_MARK,		PORT77_FN1),</div><div class='add'>+	PINMUX_DATA(SDHI0_D1_MARK,		PORT78_FN1),</div><div class='add'>+	PINMUX_DATA(SDHI0_D2_MARK,		PORT79_FN1),</div><div class='add'>+	PINMUX_DATA(SDHI0_D3_MARK,		PORT80_FN1),</div><div class='add'>+</div><div class='add'>+	/* Port81 */</div><div class='add'>+	PINMUX_DATA(SDHI0_CD_MARK,		PORT81_FN1),</div><div class='add'>+	PINMUX_DATA(IRQ26_PORT81_MARK,		PORT81_FN0,	MSEL1CR_26_0),</div><div class='add'>+</div><div class='add'>+	/* Port82 - Port88 Function */</div><div class='add'>+	PINMUX_DATA(SDHI0_CLK_MARK,		PORT82_FN1),</div><div class='add'>+	PINMUX_DATA(SDHI0_WP_MARK,		PORT83_FN1),</div><div class='add'>+	PINMUX_DATA(RESETOUTS_MARK,		PORT84_FN1),</div><div class='add'>+	PINMUX_DATA(USB0_PPON_MARK,		PORT85_FN1),</div><div class='add'>+	PINMUX_DATA(USB0_OCI_MARK,		PORT86_FN1),</div><div class='add'>+	PINMUX_DATA(USB1_PPON_MARK,		PORT87_FN1),</div><div class='add'>+	PINMUX_DATA(USB1_OCI_MARK,		PORT88_FN1),</div><div class='add'>+</div><div class='add'>+	/* Port89 */</div><div class='add'>+	PINMUX_DATA(DREQ0_MARK,			PORT89_FN1),</div><div class='add'>+	PINMUX_DATA(BBIF2_TSCK2_PORT89_MARK,	PORT89_FN2,	MSEL5CR_0_1),</div><div class='add'>+	PINMUX_DATA(RSPI_SSL3_A_MARK,		PORT89_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port90 */</div><div class='add'>+	PINMUX_DATA(DACK0_MARK,			PORT90_FN1),</div><div class='add'>+	PINMUX_DATA(BBIF2_RXD2_PORT90_MARK,	PORT90_FN2,	MSEL5CR_0_1),</div><div class='add'>+	PINMUX_DATA(RSPI_SSL2_A_MARK,		PORT90_FN6),</div><div class='add'>+	PINMUX_DATA(WAIT_PORT90_MARK,		PORT90_FN7,	MSEL5CR_2_1),</div><div class='add'>+</div><div class='add'>+	/* Port91 */</div><div class='add'>+	PINMUX_DATA(MEMC_AD0_MARK,		PORT91_FN1),</div><div class='add'>+	PINMUX_DATA(BBIF1_RXD_MARK,		PORT91_FN2),</div><div class='add'>+	PINMUX_DATA(SCIFA5_TXD_PORT91_MARK,	PORT91_FN3,	MSEL5CR_15_1,	MSEL5CR_14_0),</div><div class='add'>+	PINMUX_DATA(LCD1_D5_MARK,		PORT91_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port92 */</div><div class='add'>+	PINMUX_DATA(MEMC_AD1_MARK,		PORT92_FN1),</div><div class='add'>+	PINMUX_DATA(BBIF1_TSYNC_MARK,		PORT92_FN2),</div><div class='add'>+	PINMUX_DATA(SCIFA5_RXD_PORT92_MARK,	PORT92_FN3,	MSEL5CR_15_1,	MSEL5CR_14_0),</div><div class='add'>+	PINMUX_DATA(STP0_IPD1_MARK,		PORT92_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_D6_MARK,		PORT92_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port93 */</div><div class='add'>+	PINMUX_DATA(MEMC_AD2_MARK,		PORT93_FN1),</div><div class='add'>+	PINMUX_DATA(BBIF1_TSCK_MARK,		PORT93_FN2),</div><div class='add'>+	PINMUX_DATA(SCIFA4_TXD_PORT93_MARK,	PORT93_FN3,	MSEL5CR_12_1,	MSEL5CR_11_0),</div><div class='add'>+	PINMUX_DATA(STP0_IPD3_MARK,		PORT93_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_D8_MARK,		PORT93_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port94 */</div><div class='add'>+	PINMUX_DATA(MEMC_AD3_MARK,		PORT94_FN1),</div><div class='add'>+	PINMUX_DATA(BBIF1_TXD_MARK,		PORT94_FN2),</div><div class='add'>+	PINMUX_DATA(SCIFA4_RXD_PORT94_MARK,	PORT94_FN3,	MSEL5CR_12_1,	MSEL5CR_11_0),</div><div class='add'>+	PINMUX_DATA(STP0_IPD4_MARK,		PORT94_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_D9_MARK,		PORT94_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port95 */</div><div class='add'>+	PINMUX_DATA(MEMC_CS1_MARK,		PORT95_FN1,	MSEL4CR_6_0),</div><div class='add'>+	PINMUX_DATA(MEMC_A1_MARK,		PORT95_FN1,	MSEL4CR_6_1),</div><div class='add'>+</div><div class='add'>+	PINMUX_DATA(SCIFA2_CTS_MARK,		PORT95_FN2),</div><div class='add'>+	PINMUX_DATA(SIM_RST_MARK,		PORT95_FN4),</div><div class='add'>+	PINMUX_DATA(VIO0_D14_PORT95_MARK,	PORT95_FN7,	MSEL5CR_27_1),</div><div class='add'>+	PINMUX_DATA(IRQ22_MARK,			PORT95_FN0),</div><div class='add'>+</div><div class='add'>+	/* Port96 */</div><div class='add'>+	PINMUX_DATA(MEMC_ADV_MARK,		PORT96_FN1,	MSEL4CR_6_0),</div><div class='add'>+	PINMUX_DATA(MEMC_DREQ0_MARK,		PORT96_FN1,	MSEL4CR_6_1),</div><div class='add'>+</div><div class='add'>+	PINMUX_DATA(SCIFA2_RTS_MARK,		PORT96_FN2),</div><div class='add'>+	PINMUX_DATA(SIM_CLK_MARK,		PORT96_FN4),</div><div class='add'>+	PINMUX_DATA(VIO0_D15_PORT96_MARK,	PORT96_FN7,	MSEL5CR_27_1),</div><div class='add'>+	PINMUX_DATA(IRQ23_MARK,			PORT96_FN0),</div><div class='add'>+</div><div class='add'>+	/* Port97 */</div><div class='add'>+	PINMUX_DATA(MEMC_AD4_MARK,		PORT97_FN1),</div><div class='add'>+	PINMUX_DATA(BBIF1_RSCK_MARK,		PORT97_FN2),</div><div class='add'>+	PINMUX_DATA(LCD1_CS_MARK,		PORT97_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_HSYN_MARK,		PORT97_FN7),</div><div class='add'>+	PINMUX_DATA(IRQ12_PORT97_MARK,		PORT97_FN0,	MSEL1CR_12_0),</div><div class='add'>+</div><div class='add'>+	/* Port98 */</div><div class='add'>+	PINMUX_DATA(MEMC_AD5_MARK,		PORT98_FN1),</div><div class='add'>+	PINMUX_DATA(BBIF1_RSYNC_MARK,		PORT98_FN2),</div><div class='add'>+	PINMUX_DATA(LCD1_VSYN_MARK,		PORT98_FN7),</div><div class='add'>+	PINMUX_DATA(IRQ13_PORT98_MARK,		PORT98_FN0,	MSEL1CR_13_0),</div><div class='add'>+</div><div class='add'>+	/* Port99 */</div><div class='add'>+	PINMUX_DATA(MEMC_AD6_MARK,		PORT99_FN1),</div><div class='add'>+	PINMUX_DATA(BBIF1_FLOW_MARK,		PORT99_FN2),</div><div class='add'>+	PINMUX_DATA(LCD1_WR_MARK,		PORT99_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_DCK_MARK,		PORT99_FN7),</div><div class='add'>+	PINMUX_DATA(IRQ14_PORT99_MARK,		PORT99_FN0,	MSEL1CR_14_0),</div><div class='add'>+</div><div class='add'>+	/* Port100 */</div><div class='add'>+	PINMUX_DATA(MEMC_AD7_MARK,		PORT100_FN1),</div><div class='add'>+	PINMUX_DATA(BBIF1_RX_FLOW_N_MARK,	PORT100_FN2),</div><div class='add'>+	PINMUX_DATA(LCD1_DON_MARK,		PORT100_FN7),</div><div class='add'>+	PINMUX_DATA(IRQ15_PORT100_MARK,		PORT100_FN0,	MSEL1CR_15_0),</div><div class='add'>+</div><div class='add'>+	/* Port101 */</div><div class='add'>+	PINMUX_DATA(FCE0_MARK,			PORT101_FN1),</div><div class='add'>+</div><div class='add'>+	/* Port102 */</div><div class='add'>+	PINMUX_DATA(FRB_MARK,			PORT102_FN1),</div><div class='add'>+	PINMUX_DATA(LCD0_LCLK_PORT102_MARK,	PORT102_FN4,	MSEL5CR_6_0),</div><div class='add'>+</div><div class='add'>+	/* Port103 */</div><div class='add'>+	PINMUX_DATA(CS5B_MARK,			PORT103_FN1),</div><div class='add'>+	PINMUX_DATA(FCE1_MARK,			PORT103_FN2),</div><div class='add'>+	PINMUX_DATA(MMC1_CLK_PORT103_MARK,	PORT103_FN3,	MSEL4CR_15_1),</div><div class='add'>+</div><div class='add'>+	/* Port104 */</div><div class='add'>+	PINMUX_DATA(CS6A_MARK,			PORT104_FN1),</div><div class='add'>+	PINMUX_DATA(MMC1_CMD_PORT104_MARK,	PORT104_FN3,	MSEL4CR_15_1),</div><div class='add'>+	PINMUX_DATA(IRQ11_MARK,			PORT104_FN0),</div><div class='add'>+</div><div class='add'>+	/* Port105 */</div><div class='add'>+	PINMUX_DATA(CS5A_PORT105_MARK,		PORT105_FN1,	MSEL5CR_2_0),</div><div class='add'>+	PINMUX_DATA(SCIFA3_RTS_PORT105_MARK,	PORT105_FN4,	MSEL5CR_8_0),</div><div class='add'>+</div><div class='add'>+	/* Port106 */</div><div class='add'>+	PINMUX_DATA(IOIS16_MARK,		PORT106_FN1),</div><div class='add'>+	PINMUX_DATA(IDE_EXBUF_ENB_MARK,		PORT106_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port107 - Port115 Function */</div><div class='add'>+	PINMUX_DATA(WE3_ICIOWR_MARK,		PORT107_FN1),</div><div class='add'>+	PINMUX_DATA(WE2_ICIORD_MARK,		PORT108_FN1),</div><div class='add'>+	PINMUX_DATA(CS0_MARK,			PORT109_FN1),</div><div class='add'>+	PINMUX_DATA(CS2_MARK,			PORT110_FN1),</div><div class='add'>+	PINMUX_DATA(CS4_MARK,			PORT111_FN1),</div><div class='add'>+	PINMUX_DATA(WE1_MARK,			PORT112_FN1),</div><div class='add'>+	PINMUX_DATA(WE0_FWE_MARK,		PORT113_FN1),</div><div class='add'>+	PINMUX_DATA(RDWR_MARK,			PORT114_FN1),</div><div class='add'>+	PINMUX_DATA(RD_FSC_MARK,		PORT115_FN1),</div><div class='add'>+</div><div class='add'>+	/* Port116 */</div><div class='add'>+	PINMUX_DATA(A25_MARK,			PORT116_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF0_SS2_MARK,		PORT116_FN2),</div><div class='add'>+	PINMUX_DATA(MSIOF1_SS2_PORT116_MARK,	PORT116_FN3,	MSEL4CR_10_0),</div><div class='add'>+	PINMUX_DATA(SCIFA3_SCK_PORT116_MARK,	PORT116_FN4,	MSEL5CR_8_0),</div><div class='add'>+	PINMUX_DATA(GPO1_MARK,			PORT116_FN5),</div><div class='add'>+</div><div class='add'>+	/* Port117 */</div><div class='add'>+	PINMUX_DATA(A24_MARK,			PORT117_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF0_SS1_MARK,		PORT117_FN2),</div><div class='add'>+	PINMUX_DATA(MSIOF1_SS1_PORT117_MARK,	PORT117_FN3,	MSEL4CR_10_0),</div><div class='add'>+	PINMUX_DATA(SCIFA3_CTS_PORT117_MARK,	PORT117_FN4,	MSEL5CR_8_0),</div><div class='add'>+	PINMUX_DATA(GPO0_MARK,			PORT117_FN5),</div><div class='add'>+</div><div class='add'>+	/* Port118 */</div><div class='add'>+	PINMUX_DATA(A23_MARK,			PORT118_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF0_MCK1_MARK,		PORT118_FN2),</div><div class='add'>+	PINMUX_DATA(MSIOF1_RXD_PORT118_MARK,	PORT118_FN3,	MSEL4CR_10_0),</div><div class='add'>+	PINMUX_DATA(GPI1_MARK,			PORT118_FN5),</div><div class='add'>+	PINMUX_DATA(IRQ9_PORT118_MARK,		PORT118_FN0,	MSEL1CR_9_0),</div><div class='add'>+</div><div class='add'>+	/* Port119 */</div><div class='add'>+	PINMUX_DATA(A22_MARK,			PORT119_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF0_MCK0_MARK,		PORT119_FN2),</div><div class='add'>+	PINMUX_DATA(MSIOF1_TXD_PORT119_MARK,	PORT119_FN3,	MSEL4CR_10_0),</div><div class='add'>+	PINMUX_DATA(GPI0_MARK,			PORT119_FN5),</div><div class='add'>+	PINMUX_DATA(IRQ8_MARK,			PORT119_FN0),</div><div class='add'>+</div><div class='add'>+	/* Port120 */</div><div class='add'>+	PINMUX_DATA(A21_MARK,			PORT120_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF0_RSYNC_MARK,		PORT120_FN2),</div><div class='add'>+	PINMUX_DATA(MSIOF1_TSYNC_PORT120_MARK,	PORT120_FN3,	MSEL4CR_10_0),</div><div class='add'>+	PINMUX_DATA(IRQ7_PORT120_MARK,		PORT120_FN0,	MSEL1CR_7_0),</div><div class='add'>+</div><div class='add'>+	/* Port121 */</div><div class='add'>+	PINMUX_DATA(A20_MARK,			PORT121_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF0_RSCK_MARK,		PORT121_FN2),</div><div class='add'>+	PINMUX_DATA(MSIOF1_TSCK_PORT121_MARK,	PORT121_FN3,	MSEL4CR_10_0),</div><div class='add'>+	PINMUX_DATA(IRQ6_PORT121_MARK,		PORT121_FN0,	MSEL1CR_6_0),</div><div class='add'>+</div><div class='add'>+	/* Port122 */</div><div class='add'>+	PINMUX_DATA(A19_MARK,			PORT122_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF0_RXD_MARK,		PORT122_FN2),</div><div class='add'>+</div><div class='add'>+	/* Port123 */</div><div class='add'>+	PINMUX_DATA(A18_MARK,			PORT123_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF0_TSCK_MARK,		PORT123_FN2),</div><div class='add'>+</div><div class='add'>+	/* Port124 */</div><div class='add'>+	PINMUX_DATA(A17_MARK,			PORT124_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF0_TSYNC_MARK,		PORT124_FN2),</div><div class='add'>+</div><div class='add'>+	/* Port125 - Port141 Function */</div><div class='add'>+	PINMUX_DATA(A16_MARK,			PORT125_FN1),</div><div class='add'>+	PINMUX_DATA(A15_MARK,			PORT126_FN1),</div><div class='add'>+	PINMUX_DATA(A14_MARK,			PORT127_FN1),</div><div class='add'>+	PINMUX_DATA(A13_MARK,			PORT128_FN1),</div><div class='add'>+	PINMUX_DATA(A12_MARK,			PORT129_FN1),</div><div class='add'>+	PINMUX_DATA(A11_MARK,			PORT130_FN1),</div><div class='add'>+	PINMUX_DATA(A10_MARK,			PORT131_FN1),</div><div class='add'>+	PINMUX_DATA(A9_MARK,			PORT132_FN1),</div><div class='add'>+	PINMUX_DATA(A8_MARK,			PORT133_FN1),</div><div class='add'>+	PINMUX_DATA(A7_MARK,			PORT134_FN1),</div><div class='add'>+	PINMUX_DATA(A6_MARK,			PORT135_FN1),</div><div class='add'>+	PINMUX_DATA(A5_FCDE_MARK,		PORT136_FN1),</div><div class='add'>+	PINMUX_DATA(A4_FOE_MARK,		PORT137_FN1),</div><div class='add'>+	PINMUX_DATA(A3_MARK,			PORT138_FN1),</div><div class='add'>+	PINMUX_DATA(A2_MARK,			PORT139_FN1),</div><div class='add'>+	PINMUX_DATA(A1_MARK,			PORT140_FN1),</div><div class='add'>+	PINMUX_DATA(CKO_MARK,			PORT141_FN1),</div><div class='add'>+</div><div class='add'>+	/* Port142 - Port157 Function1 */</div><div class='add'>+	PINMUX_DATA(D15_NAF15_MARK,		PORT142_FN1),</div><div class='add'>+	PINMUX_DATA(D14_NAF14_MARK,		PORT143_FN1),</div><div class='add'>+	PINMUX_DATA(D13_NAF13_MARK,		PORT144_FN1),</div><div class='add'>+	PINMUX_DATA(D12_NAF12_MARK,		PORT145_FN1),</div><div class='add'>+	PINMUX_DATA(D11_NAF11_MARK,		PORT146_FN1),</div><div class='add'>+	PINMUX_DATA(D10_NAF10_MARK,		PORT147_FN1),</div><div class='add'>+	PINMUX_DATA(D9_NAF9_MARK,		PORT148_FN1),</div><div class='add'>+	PINMUX_DATA(D8_NAF8_MARK,		PORT149_FN1),</div><div class='add'>+	PINMUX_DATA(D7_NAF7_MARK,		PORT150_FN1),</div><div class='add'>+	PINMUX_DATA(D6_NAF6_MARK,		PORT151_FN1),</div><div class='add'>+	PINMUX_DATA(D5_NAF5_MARK,		PORT152_FN1),</div><div class='add'>+	PINMUX_DATA(D4_NAF4_MARK,		PORT153_FN1),</div><div class='add'>+	PINMUX_DATA(D3_NAF3_MARK,		PORT154_FN1),</div><div class='add'>+	PINMUX_DATA(D2_NAF2_MARK,		PORT155_FN1),</div><div class='add'>+	PINMUX_DATA(D1_NAF1_MARK,		PORT156_FN1),</div><div class='add'>+	PINMUX_DATA(D0_NAF0_MARK,		PORT157_FN1),</div><div class='add'>+</div><div class='add'>+	/* Port142 - Port149 Function3 */</div><div class='add'>+	PINMUX_DATA(MMC1_D7_PORT142_MARK,	PORT142_FN3,	MSEL4CR_15_1),</div><div class='add'>+	PINMUX_DATA(MMC1_D6_PORT143_MARK,	PORT143_FN3,	MSEL4CR_15_1),</div><div class='add'>+	PINMUX_DATA(MMC1_D5_PORT144_MARK,	PORT144_FN3,	MSEL4CR_15_1),</div><div class='add'>+	PINMUX_DATA(MMC1_D4_PORT145_MARK,	PORT145_FN3,	MSEL4CR_15_1),</div><div class='add'>+	PINMUX_DATA(MMC1_D3_PORT146_MARK,	PORT146_FN3,	MSEL4CR_15_1),</div><div class='add'>+	PINMUX_DATA(MMC1_D2_PORT147_MARK,	PORT147_FN3,	MSEL4CR_15_1),</div><div class='add'>+	PINMUX_DATA(MMC1_D1_PORT148_MARK,	PORT148_FN3,	MSEL4CR_15_1),</div><div class='add'>+	PINMUX_DATA(MMC1_D0_PORT149_MARK,	PORT149_FN3,	MSEL4CR_15_1),</div><div class='add'>+</div><div class='add'>+	/* Port158 */</div><div class='add'>+	PINMUX_DATA(D31_MARK,			PORT158_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFA3_SCK_PORT158_MARK,	PORT158_FN2,	MSEL5CR_8_1),</div><div class='add'>+	PINMUX_DATA(RMII_REF125CK_MARK,		PORT158_FN3),</div><div class='add'>+	PINMUX_DATA(LCD0_D21_PORT158_MARK,	PORT158_FN4,	MSEL5CR_6_1),</div><div class='add'>+	PINMUX_DATA(IRDA_FIRSEL_MARK,		PORT158_FN5),</div><div class='add'>+	PINMUX_DATA(IDE_D15_MARK,		PORT158_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port159 */</div><div class='add'>+	PINMUX_DATA(D30_MARK,			PORT159_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFA3_RXD_PORT159_MARK,	PORT159_FN2,	MSEL5CR_8_1),</div><div class='add'>+	PINMUX_DATA(RMII_REF50CK_MARK,		PORT159_FN3),</div><div class='add'>+	PINMUX_DATA(LCD0_D23_PORT159_MARK,	PORT159_FN4,	MSEL5CR_6_1),</div><div class='add'>+	PINMUX_DATA(IDE_D14_MARK,		PORT159_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port160 */</div><div class='add'>+	PINMUX_DATA(D29_MARK,			PORT160_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFA3_TXD_PORT160_MARK,	PORT160_FN2,	MSEL5CR_8_1),</div><div class='add'>+	PINMUX_DATA(LCD0_D22_PORT160_MARK,	PORT160_FN4,	MSEL5CR_6_1),</div><div class='add'>+	PINMUX_DATA(VIO1_HD_MARK,		PORT160_FN5),</div><div class='add'>+	PINMUX_DATA(IDE_D13_MARK,		PORT160_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port161 */</div><div class='add'>+	PINMUX_DATA(D28_MARK,			PORT161_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFA3_RTS_PORT161_MARK,	PORT161_FN2,	MSEL5CR_8_1),</div><div class='add'>+	PINMUX_DATA(ET_RX_DV_MARK,		PORT161_FN3),</div><div class='add'>+	PINMUX_DATA(LCD0_D20_PORT161_MARK,	PORT161_FN4,	MSEL5CR_6_1),</div><div class='add'>+	PINMUX_DATA(IRDA_IN_MARK,		PORT161_FN5),</div><div class='add'>+	PINMUX_DATA(IDE_D12_MARK,		PORT161_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port162 */</div><div class='add'>+	PINMUX_DATA(D27_MARK,			PORT162_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFA3_CTS_PORT162_MARK,	PORT162_FN2,	MSEL5CR_8_1),</div><div class='add'>+	PINMUX_DATA(LCD0_D19_PORT162_MARK,	PORT162_FN4,	MSEL5CR_6_1),</div><div class='add'>+	PINMUX_DATA(IRDA_OUT_MARK,		PORT162_FN5),</div><div class='add'>+	PINMUX_DATA(IDE_D11_MARK,		PORT162_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port163 */</div><div class='add'>+	PINMUX_DATA(D26_MARK,			PORT163_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF2_SS2_MARK,		PORT163_FN2),</div><div class='add'>+	PINMUX_DATA(ET_COL_MARK,		PORT163_FN3),</div><div class='add'>+	PINMUX_DATA(LCD0_D18_PORT163_MARK,	PORT163_FN4,	MSEL5CR_6_1),</div><div class='add'>+	PINMUX_DATA(IROUT_MARK,			PORT163_FN5),</div><div class='add'>+	PINMUX_DATA(IDE_D10_MARK,		PORT163_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port164 */</div><div class='add'>+	PINMUX_DATA(D25_MARK,			PORT164_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF2_TSYNC_MARK,		PORT164_FN2),</div><div class='add'>+	PINMUX_DATA(ET_PHY_INT_MARK,		PORT164_FN3),</div><div class='add'>+	PINMUX_DATA(LCD0_RD_MARK,		PORT164_FN4),</div><div class='add'>+	PINMUX_DATA(IDE_D9_MARK,		PORT164_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port165 */</div><div class='add'>+	PINMUX_DATA(D24_MARK,			PORT165_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF2_RXD_MARK,		PORT165_FN2),</div><div class='add'>+	PINMUX_DATA(LCD0_LCLK_PORT165_MARK,	PORT165_FN4,	MSEL5CR_6_1),</div><div class='add'>+	PINMUX_DATA(IDE_D8_MARK,		PORT165_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port166 - Port171 Function1 */</div><div class='add'>+	PINMUX_DATA(D21_MARK,			PORT166_FN1),</div><div class='add'>+	PINMUX_DATA(D20_MARK,			PORT167_FN1),</div><div class='add'>+	PINMUX_DATA(D19_MARK,			PORT168_FN1),</div><div class='add'>+	PINMUX_DATA(D18_MARK,			PORT169_FN1),</div><div class='add'>+	PINMUX_DATA(D17_MARK,			PORT170_FN1),</div><div class='add'>+	PINMUX_DATA(D16_MARK,			PORT171_FN1),</div><div class='add'>+</div><div class='add'>+	/* Port166 - Port171 Function3 */</div><div class='add'>+	PINMUX_DATA(ET_ETXD5_MARK,		PORT166_FN3),</div><div class='add'>+	PINMUX_DATA(ET_ETXD4_MARK,		PORT167_FN3),</div><div class='add'>+	PINMUX_DATA(ET_ETXD3_MARK,		PORT168_FN3),</div><div class='add'>+	PINMUX_DATA(ET_ETXD2_MARK,		PORT169_FN3),</div><div class='add'>+	PINMUX_DATA(ET_ETXD1_MARK,		PORT170_FN3),</div><div class='add'>+	PINMUX_DATA(ET_ETXD0_MARK,		PORT171_FN3),</div><div class='add'>+</div><div class='add'>+	/* Port166 - Port171 Function6 */</div><div class='add'>+	PINMUX_DATA(IDE_D5_MARK,		PORT166_FN6),</div><div class='add'>+	PINMUX_DATA(IDE_D4_MARK,		PORT167_FN6),</div><div class='add'>+	PINMUX_DATA(IDE_D3_MARK,		PORT168_FN6),</div><div class='add'>+	PINMUX_DATA(IDE_D2_MARK,		PORT169_FN6),</div><div class='add'>+	PINMUX_DATA(IDE_D1_MARK,		PORT170_FN6),</div><div class='add'>+	PINMUX_DATA(IDE_D0_MARK,		PORT171_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port167 - Port171 IRQ */</div><div class='add'>+	PINMUX_DATA(IRQ31_PORT167_MARK,		PORT167_FN0,	MSEL1CR_31_0),</div><div class='add'>+	PINMUX_DATA(IRQ27_PORT168_MARK,		PORT168_FN0,	MSEL1CR_27_0),</div><div class='add'>+	PINMUX_DATA(IRQ28_PORT169_MARK,		PORT169_FN0,	MSEL1CR_28_0),</div><div class='add'>+	PINMUX_DATA(IRQ29_PORT170_MARK,		PORT170_FN0,	MSEL1CR_29_0),</div><div class='add'>+	PINMUX_DATA(IRQ30_PORT171_MARK,		PORT171_FN0,	MSEL1CR_30_0),</div><div class='add'>+</div><div class='add'>+	/* Port172 */</div><div class='add'>+	PINMUX_DATA(D23_MARK,			PORT172_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFB_RTS_PORT172_MARK,	PORT172_FN2,	MSEL5CR_17_1),</div><div class='add'>+	PINMUX_DATA(ET_ETXD7_MARK,		PORT172_FN3),</div><div class='add'>+	PINMUX_DATA(IDE_D7_MARK,		PORT172_FN6),</div><div class='add'>+	PINMUX_DATA(IRQ4_PORT172_MARK,		PORT172_FN0,	MSEL1CR_4_1),</div><div class='add'>+</div><div class='add'>+	/* Port173 */</div><div class='add'>+	PINMUX_DATA(D22_MARK,			PORT173_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFB_CTS_PORT173_MARK,	PORT173_FN2,	MSEL5CR_17_1),</div><div class='add'>+	PINMUX_DATA(ET_ETXD6_MARK,		PORT173_FN3),</div><div class='add'>+	PINMUX_DATA(IDE_D6_MARK,		PORT173_FN6),</div><div class='add'>+	PINMUX_DATA(IRQ6_PORT173_MARK,		PORT173_FN0,	MSEL1CR_6_1),</div><div class='add'>+</div><div class='add'>+	/* Port174 */</div><div class='add'>+	PINMUX_DATA(A26_MARK,			PORT174_FN1),</div><div class='add'>+	PINMUX_DATA(MSIOF0_TXD_MARK,		PORT174_FN2),</div><div class='add'>+	PINMUX_DATA(ET_RX_CLK_MARK,		PORT174_FN3),</div><div class='add'>+	PINMUX_DATA(SCIFA3_RXD_PORT174_MARK,	PORT174_FN4,	MSEL5CR_8_0),</div><div class='add'>+</div><div class='add'>+	/* Port175 */</div><div class='add'>+	PINMUX_DATA(A0_MARK,			PORT175_FN1),</div><div class='add'>+	PINMUX_DATA(BS_MARK,			PORT175_FN2),</div><div class='add'>+	PINMUX_DATA(ET_WOL_MARK,		PORT175_FN3),</div><div class='add'>+	PINMUX_DATA(SCIFA3_TXD_PORT175_MARK,	PORT175_FN4,	MSEL5CR_8_0),</div><div class='add'>+</div><div class='add'>+	/* Port176 */</div><div class='add'>+	PINMUX_DATA(ET_GTX_CLK_MARK,		PORT176_FN3),</div><div class='add'>+</div><div class='add'>+	/* Port177 */</div><div class='add'>+	PINMUX_DATA(WAIT_PORT177_MARK,		PORT177_FN1,	MSEL5CR_2_0),</div><div class='add'>+	PINMUX_DATA(ET_LINK_MARK,		PORT177_FN3),</div><div class='add'>+	PINMUX_DATA(IDE_IOWR_MARK,		PORT177_FN6),</div><div class='add'>+	PINMUX_DATA(SDHI2_WP_PORT177_MARK,	PORT177_FN7,	MSEL5CR_19_1),</div><div class='add'>+</div><div class='add'>+	/* Port178 */</div><div class='add'>+	PINMUX_DATA(VIO0_D12_MARK,		PORT178_FN1),</div><div class='add'>+	PINMUX_DATA(VIO1_D4_MARK,		PORT178_FN5),</div><div class='add'>+	PINMUX_DATA(IDE_IORD_MARK,		PORT178_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port179 */</div><div class='add'>+	PINMUX_DATA(VIO0_D11_MARK,		PORT179_FN1),</div><div class='add'>+	PINMUX_DATA(VIO1_D3_MARK,		PORT179_FN5),</div><div class='add'>+	PINMUX_DATA(IDE_IORDY_MARK,		PORT179_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port180 */</div><div class='add'>+	PINMUX_DATA(VIO0_D10_MARK,		PORT180_FN1),</div><div class='add'>+	PINMUX_DATA(TPU0TO3_MARK,		PORT180_FN4),</div><div class='add'>+	PINMUX_DATA(VIO1_D2_MARK,		PORT180_FN5),</div><div class='add'>+	PINMUX_DATA(IDE_INT_MARK,		PORT180_FN6),</div><div class='add'>+	PINMUX_DATA(IRQ24_MARK,			PORT180_FN0),</div><div class='add'>+</div><div class='add'>+	/* Port181 */</div><div class='add'>+	PINMUX_DATA(VIO0_D9_MARK,		PORT181_FN1),</div><div class='add'>+	PINMUX_DATA(VIO1_D1_MARK,		PORT181_FN5),</div><div class='add'>+	PINMUX_DATA(IDE_RST_MARK,		PORT181_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port182 */</div><div class='add'>+	PINMUX_DATA(VIO0_D8_MARK,		PORT182_FN1),</div><div class='add'>+	PINMUX_DATA(VIO1_D0_MARK,		PORT182_FN5),</div><div class='add'>+	PINMUX_DATA(IDE_DIRECTION_MARK,		PORT182_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port183 */</div><div class='add'>+	PINMUX_DATA(DREQ1_MARK,			PORT183_FN1),</div><div class='add'>+	PINMUX_DATA(BBIF2_TXD2_PORT183_MARK,	PORT183_FN2,	MSEL5CR_0_1),</div><div class='add'>+	PINMUX_DATA(ET_TX_EN_MARK,		PORT183_FN3),</div><div class='add'>+</div><div class='add'>+	/* Port184 */</div><div class='add'>+	PINMUX_DATA(DACK1_MARK,			PORT184_FN1),</div><div class='add'>+	PINMUX_DATA(BBIF2_TSYNC2_PORT184_MARK,	PORT184_FN2,	MSEL5CR_0_1),</div><div class='add'>+	PINMUX_DATA(ET_TX_CLK_MARK,		PORT184_FN3),</div><div class='add'>+</div><div class='add'>+	/* Port185 - Port192 Function1 */</div><div class='add'>+	PINMUX_DATA(SCIFA1_SCK_MARK,		PORT185_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFB_RTS_PORT186_MARK,	PORT186_FN1,	MSEL5CR_17_0),</div><div class='add'>+	PINMUX_DATA(SCIFB_CTS_PORT187_MARK,	PORT187_FN1,	MSEL5CR_17_0),</div><div class='add'>+	PINMUX_DATA(SCIFA0_SCK_MARK,		PORT188_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFB_SCK_PORT190_MARK,	PORT190_FN1,	MSEL5CR_17_0),</div><div class='add'>+	PINMUX_DATA(SCIFB_RXD_PORT191_MARK,	PORT191_FN1,	MSEL5CR_17_0),</div><div class='add'>+	PINMUX_DATA(SCIFB_TXD_PORT192_MARK,	PORT192_FN1,	MSEL5CR_17_0),</div><div class='add'>+</div><div class='add'>+	/* Port185 - Port192 Function3 */</div><div class='add'>+	PINMUX_DATA(ET_ERXD0_MARK,		PORT185_FN3),</div><div class='add'>+	PINMUX_DATA(ET_ERXD1_MARK,		PORT186_FN3),</div><div class='add'>+	PINMUX_DATA(ET_ERXD2_MARK,		PORT187_FN3),</div><div class='add'>+	PINMUX_DATA(ET_ERXD3_MARK,		PORT188_FN3),</div><div class='add'>+	PINMUX_DATA(ET_ERXD4_MARK,		PORT189_FN3),</div><div class='add'>+	PINMUX_DATA(ET_ERXD5_MARK,		PORT190_FN3),</div><div class='add'>+	PINMUX_DATA(ET_ERXD6_MARK,		PORT191_FN3),</div><div class='add'>+	PINMUX_DATA(ET_ERXD7_MARK,		PORT192_FN3),</div><div class='add'>+</div><div class='add'>+	/* Port185 - Port192 Function6 */</div><div class='add'>+	PINMUX_DATA(STP1_IPCLK_MARK,		PORT185_FN6),</div><div class='add'>+	PINMUX_DATA(STP1_IPD0_PORT186_MARK,	PORT186_FN6,	MSEL5CR_23_0),</div><div class='add'>+	PINMUX_DATA(STP1_IPEN_PORT187_MARK,	PORT187_FN6,	MSEL5CR_23_0),</div><div class='add'>+	PINMUX_DATA(STP1_IPSYNC_MARK,		PORT188_FN6),</div><div class='add'>+	PINMUX_DATA(STP0_IPCLK_MARK,		PORT189_FN6),</div><div class='add'>+	PINMUX_DATA(STP0_IPD0_MARK,		PORT190_FN6),</div><div class='add'>+	PINMUX_DATA(STP0_IPEN_MARK,		PORT191_FN6),</div><div class='add'>+	PINMUX_DATA(STP0_IPSYNC_MARK,		PORT192_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port193 */</div><div class='add'>+	PINMUX_DATA(SCIFA0_CTS_MARK,		PORT193_FN1),</div><div class='add'>+	PINMUX_DATA(RMII_CRS_DV_MARK,		PORT193_FN3),</div><div class='add'>+	PINMUX_DATA(STP1_IPEN_PORT193_MARK,	PORT193_FN6,	MSEL5CR_23_1), /* ? */</div><div class='add'>+	PINMUX_DATA(LCD1_D17_MARK,		PORT193_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port194 */</div><div class='add'>+	PINMUX_DATA(SCIFA0_RTS_MARK,		PORT194_FN1),</div><div class='add'>+	PINMUX_DATA(RMII_RX_ER_MARK,		PORT194_FN3),</div><div class='add'>+	PINMUX_DATA(STP1_IPD0_PORT194_MARK,	PORT194_FN6,	MSEL5CR_23_1), /* ? */</div><div class='add'>+	PINMUX_DATA(LCD1_D16_MARK,		PORT194_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port195 */</div><div class='add'>+	PINMUX_DATA(SCIFA1_RXD_MARK,		PORT195_FN1),</div><div class='add'>+	PINMUX_DATA(RMII_RXD0_MARK,		PORT195_FN3),</div><div class='add'>+	PINMUX_DATA(STP1_IPD3_MARK,		PORT195_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_D15_MARK,		PORT195_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port196 */</div><div class='add'>+	PINMUX_DATA(SCIFA1_TXD_MARK,		PORT196_FN1),</div><div class='add'>+	PINMUX_DATA(RMII_RXD1_MARK,		PORT196_FN3),</div><div class='add'>+	PINMUX_DATA(STP1_IPD2_MARK,		PORT196_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_D14_MARK,		PORT196_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port197 */</div><div class='add'>+	PINMUX_DATA(SCIFA0_RXD_MARK,		PORT197_FN1),</div><div class='add'>+	PINMUX_DATA(VIO1_CLK_MARK,		PORT197_FN5),</div><div class='add'>+	PINMUX_DATA(STP1_IPD5_MARK,		PORT197_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_D19_MARK,		PORT197_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port198 */</div><div class='add'>+	PINMUX_DATA(SCIFA0_TXD_MARK,		PORT198_FN1),</div><div class='add'>+	PINMUX_DATA(VIO1_VD_MARK,		PORT198_FN5),</div><div class='add'>+	PINMUX_DATA(STP1_IPD4_MARK,		PORT198_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_D18_MARK,		PORT198_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port199 */</div><div class='add'>+	PINMUX_DATA(MEMC_NWE_MARK,		PORT199_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFA2_SCK_PORT199_MARK,	PORT199_FN2,	MSEL5CR_7_1),</div><div class='add'>+	PINMUX_DATA(RMII_TX_EN_MARK,		PORT199_FN3),</div><div class='add'>+	PINMUX_DATA(SIM_D_PORT199_MARK,		PORT199_FN4,	MSEL5CR_21_1),</div><div class='add'>+	PINMUX_DATA(STP1_IPD1_MARK,		PORT199_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_D13_MARK,		PORT199_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port200 */</div><div class='add'>+	PINMUX_DATA(MEMC_NOE_MARK,		PORT200_FN1),</div><div class='add'>+	PINMUX_DATA(SCIFA2_RXD_MARK,		PORT200_FN2),</div><div class='add'>+	PINMUX_DATA(RMII_TXD0_MARK,		PORT200_FN3),</div><div class='add'>+	PINMUX_DATA(STP0_IPD7_MARK,		PORT200_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_D12_MARK,		PORT200_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port201 */</div><div class='add'>+	PINMUX_DATA(MEMC_WAIT_MARK,		PORT201_FN1,	MSEL4CR_6_0),</div><div class='add'>+	PINMUX_DATA(MEMC_DREQ1_MARK,		PORT201_FN1,	MSEL4CR_6_1),</div><div class='add'>+</div><div class='add'>+	PINMUX_DATA(SCIFA2_TXD_MARK,		PORT201_FN2),</div><div class='add'>+	PINMUX_DATA(RMII_TXD1_MARK,		PORT201_FN3),</div><div class='add'>+	PINMUX_DATA(STP0_IPD6_MARK,		PORT201_FN6),</div><div class='add'>+	PINMUX_DATA(LCD1_D11_MARK,		PORT201_FN7),</div><div class='add'>+</div><div class='add'>+	/* Port202 */</div><div class='add'>+	PINMUX_DATA(MEMC_BUSCLK_MARK,		PORT202_FN1,	MSEL4CR_6_0),</div><div class='add'>+	PINMUX_DATA(MEMC_A0_MARK,		PORT202_FN1,	MSEL4CR_6_1),</div><div class='add'>+</div><div class='add'>+	PINMUX_DATA(MSIOF1_SS2_PORT202_MARK,	PORT202_FN2,	MSEL4CR_10_1),</div><div class='add'>+	PINMUX_DATA(RMII_MDC_MARK,		PORT202_FN3),</div><div class='add'>+	PINMUX_DATA(TPU0TO2_PORT202_MARK,	PORT202_FN4,	MSEL5CR_25_1),</div><div class='add'>+	PINMUX_DATA(IDE_CS0_MARK,		PORT202_FN6),</div><div class='add'>+	PINMUX_DATA(SDHI2_CD_PORT202_MARK,	PORT202_FN7,	MSEL5CR_19_1),</div><div class='add'>+	PINMUX_DATA(IRQ21_MARK,			PORT202_FN0),</div><div class='add'>+</div><div class='add'>+	/* Port203 - Port208 Function1 */</div><div class='add'>+	PINMUX_DATA(SDHI2_CLK_MARK,		PORT203_FN1),</div><div class='add'>+	PINMUX_DATA(SDHI2_CMD_MARK,		PORT204_FN1),</div><div class='add'>+	PINMUX_DATA(SDHI2_D0_MARK,		PORT205_FN1),</div><div class='add'>+	PINMUX_DATA(SDHI2_D1_MARK,		PORT206_FN1),</div><div class='add'>+	PINMUX_DATA(SDHI2_D2_MARK,		PORT207_FN1),</div><div class='add'>+	PINMUX_DATA(SDHI2_D3_MARK,		PORT208_FN1),</div><div class='add'>+</div><div class='add'>+	/* Port203 - Port208 Function3 */</div><div class='add'>+	PINMUX_DATA(ET_TX_ER_MARK,		PORT203_FN3),</div><div class='add'>+	PINMUX_DATA(ET_RX_ER_MARK,		PORT204_FN3),</div><div class='add'>+	PINMUX_DATA(ET_CRS_MARK,		PORT205_FN3),</div><div class='add'>+	PINMUX_DATA(ET_MDC_MARK,		PORT206_FN3),</div><div class='add'>+	PINMUX_DATA(ET_MDIO_MARK,		PORT207_FN3),</div><div class='add'>+	PINMUX_DATA(RMII_MDIO_MARK,		PORT208_FN3),</div><div class='add'>+</div><div class='add'>+	/* Port203 - Port208 Function6 */</div><div class='add'>+	PINMUX_DATA(IDE_A2_MARK,		PORT203_FN6),</div><div class='add'>+	PINMUX_DATA(IDE_A1_MARK,		PORT204_FN6),</div><div class='add'>+	PINMUX_DATA(IDE_A0_MARK,		PORT205_FN6),</div><div class='add'>+	PINMUX_DATA(IDE_IODACK_MARK,		PORT206_FN6),</div><div class='add'>+	PINMUX_DATA(IDE_IODREQ_MARK,		PORT207_FN6),</div><div class='add'>+	PINMUX_DATA(IDE_CS1_MARK,		PORT208_FN6),</div><div class='add'>+</div><div class='add'>+	/* Port203 - Port208 Function7 */</div><div class='add'>+	PINMUX_DATA(SCIFA4_TXD_PORT203_MARK,	PORT203_FN7,	MSEL5CR_12_0,	MSEL5CR_11_1),</div><div class='add'>+	PINMUX_DATA(SCIFA4_RXD_PORT204_MARK,	PORT204_FN7,	MSEL5CR_12_0,	MSEL5CR_11_1),</div><div class='add'>+	PINMUX_DATA(SCIFA4_SCK_PORT205_MARK,	PORT205_FN7,	MSEL5CR_10_1),</div><div class='add'>+	PINMUX_DATA(SCIFA5_SCK_PORT206_MARK,	PORT206_FN7,	MSEL5CR_13_1),</div><div class='add'>+	PINMUX_DATA(SCIFA5_RXD_PORT207_MARK,	PORT207_FN7,	MSEL5CR_15_0,	MSEL5CR_14_1),</div><div class='add'>+	PINMUX_DATA(SCIFA5_TXD_PORT208_MARK,	PORT208_FN7,	MSEL5CR_15_0,	MSEL5CR_14_1),</div><div class='add'>+</div><div class='add'>+	/* Port209 */</div><div class='add'>+	PINMUX_DATA(VBUS_MARK,			PORT209_FN1),</div><div class='add'>+	PINMUX_DATA(IRQ7_PORT209_MARK,		PORT209_FN0,	MSEL1CR_7_1),</div><div class='add'>+</div><div class='add'>+	/* Port210 */</div><div class='add'>+	PINMUX_DATA(IRQ9_PORT210_MARK,		PORT210_FN0,	MSEL1CR_9_1),</div><div class='add'>+</div><div class='add'>+	/* Port211 */</div><div class='add'>+	PINMUX_DATA(IRQ16_PORT211_MARK,		PORT211_FN0,	MSEL1CR_16_1),</div><div class='add'>+</div><div class='add'>+	/* LCDC select */</div><div class='add'>+	PINMUX_DATA(LCDC0_SELECT_MARK,				MSEL3CR_6_0),</div><div class='add'>+	PINMUX_DATA(LCDC1_SELECT_MARK,				MSEL3CR_6_1),</div><div class='add'>+</div><div class='add'>+	/* SDENC */</div><div class='add'>+	PINMUX_DATA(SDENC_CPG_MARK,				MSEL4CR_19_0),</div><div class='add'>+	PINMUX_DATA(SDENC_DV_CLKI_MARK,				MSEL4CR_19_1),</div><div class='add'>+</div><div class='add'>+	/* SYSC */</div><div class='add'>+	PINMUX_DATA(RESETP_PULLUP_MARK,				MSEL4CR_4_0),</div><div class='add'>+	PINMUX_DATA(RESETP_PLAIN_MARK,				MSEL4CR_4_1),</div><div class='add'>+</div><div class='add'>+	/* DEBUG */</div><div class='add'>+	PINMUX_DATA(EDEBGREQ_PULLDOWN_MARK,			MSEL4CR_1_0),</div><div class='add'>+	PINMUX_DATA(EDEBGREQ_PULLUP_MARK,			MSEL4CR_1_1),</div><div class='add'>+</div><div class='add'>+	PINMUX_DATA(TRACEAUD_FROM_VIO_MARK,			MSEL5CR_30_0,	MSEL5CR_29_0),</div><div class='add'>+	PINMUX_DATA(TRACEAUD_FROM_LCDC0_MARK,			MSEL5CR_30_0,	MSEL5CR_29_1),</div><div class='add'>+	PINMUX_DATA(TRACEAUD_FROM_MEMC_MARK,			MSEL5CR_30_1,	MSEL5CR_29_0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pinmux_gpio pinmux_gpios[] = {</div><div class='add'>+</div><div class='add'>+	/* PORT */</div><div class='add'>+	GPIO_PORT_ALL(),</div><div class='add'>+</div><div class='add'>+	/* IRQ */</div><div class='add'>+	GPIO_FN(IRQ0_PORT2),	GPIO_FN(IRQ0_PORT13),</div><div class='add'>+	GPIO_FN(IRQ1),</div><div class='add'>+	GPIO_FN(IRQ2_PORT11),	GPIO_FN(IRQ2_PORT12),</div><div class='add'>+	GPIO_FN(IRQ3_PORT10),	GPIO_FN(IRQ3_PORT14),</div><div class='add'>+	GPIO_FN(IRQ4_PORT15),	GPIO_FN(IRQ4_PORT172),</div><div class='add'>+	GPIO_FN(IRQ5_PORT0),	GPIO_FN(IRQ5_PORT1),</div><div class='add'>+	GPIO_FN(IRQ6_PORT121),	GPIO_FN(IRQ6_PORT173),</div><div class='add'>+	GPIO_FN(IRQ7_PORT120),	GPIO_FN(IRQ7_PORT209),</div><div class='add'>+	GPIO_FN(IRQ8),</div><div class='add'>+	GPIO_FN(IRQ9_PORT118),	GPIO_FN(IRQ9_PORT210),</div><div class='add'>+	GPIO_FN(IRQ10),</div><div class='add'>+	GPIO_FN(IRQ11),</div><div class='add'>+	GPIO_FN(IRQ12_PORT42),	GPIO_FN(IRQ12_PORT97),</div><div class='add'>+	GPIO_FN(IRQ13_PORT64),	GPIO_FN(IRQ13_PORT98),</div><div class='add'>+	GPIO_FN(IRQ14_PORT63),	GPIO_FN(IRQ14_PORT99),</div><div class='add'>+	GPIO_FN(IRQ15_PORT62),	GPIO_FN(IRQ15_PORT100),</div><div class='add'>+	GPIO_FN(IRQ16_PORT68),	GPIO_FN(IRQ16_PORT211),</div><div class='add'>+	GPIO_FN(IRQ17),</div><div class='add'>+	GPIO_FN(IRQ18),</div><div class='add'>+	GPIO_FN(IRQ19),</div><div class='add'>+	GPIO_FN(IRQ20),</div><div class='add'>+	GPIO_FN(IRQ21),</div><div class='add'>+	GPIO_FN(IRQ22),</div><div class='add'>+	GPIO_FN(IRQ23),</div><div class='add'>+	GPIO_FN(IRQ24),</div><div class='add'>+	GPIO_FN(IRQ25),</div><div class='add'>+	GPIO_FN(IRQ26_PORT58),	GPIO_FN(IRQ26_PORT81),</div><div class='add'>+	GPIO_FN(IRQ27_PORT57),	GPIO_FN(IRQ27_PORT168),</div><div class='add'>+	GPIO_FN(IRQ28_PORT56),	GPIO_FN(IRQ28_PORT169),</div><div class='add'>+	GPIO_FN(IRQ29_PORT50),	GPIO_FN(IRQ29_PORT170),</div><div class='add'>+	GPIO_FN(IRQ30_PORT49),	GPIO_FN(IRQ30_PORT171),</div><div class='add'>+	GPIO_FN(IRQ31_PORT41),	GPIO_FN(IRQ31_PORT167),</div><div class='add'>+</div><div class='add'>+	/* Function */</div><div class='add'>+</div><div class='add'>+	/* DBGT */</div><div class='add'>+	GPIO_FN(DBGMDT2),	GPIO_FN(DBGMDT1),	GPIO_FN(DBGMDT0),</div><div class='add'>+	GPIO_FN(DBGMD10),	GPIO_FN(DBGMD11),	GPIO_FN(DBGMD20),</div><div class='add'>+	GPIO_FN(DBGMD21),</div><div class='add'>+</div><div class='add'>+	/* FSI */</div><div class='add'>+	GPIO_FN(FSIAISLD_PORT0),	/* FSIAISLD Port 0/5 */</div><div class='add'>+	GPIO_FN(FSIAISLD_PORT5),</div><div class='add'>+	GPIO_FN(FSIASPDIF_PORT9),	/* FSIASPDIF Port 9/18 */</div><div class='add'>+	GPIO_FN(FSIASPDIF_PORT18),</div><div class='add'>+	GPIO_FN(FSIAOSLD1),	GPIO_FN(FSIAOSLD2),	GPIO_FN(FSIAOLR),</div><div class='add'>+	GPIO_FN(FSIAOBT),	GPIO_FN(FSIAOSLD),	GPIO_FN(FSIAOMC),</div><div class='add'>+	GPIO_FN(FSIACK),	GPIO_FN(FSIAILR),	GPIO_FN(FSIAIBT),</div><div class='add'>+</div><div class='add'>+	/* FMSI */</div><div class='add'>+	GPIO_FN(FMSISLD_PORT1), /* FMSISLD Port 1/6 */</div><div class='add'>+	GPIO_FN(FMSISLD_PORT6),</div><div class='add'>+	GPIO_FN(FMSIILR),	GPIO_FN(FMSIIBT),	GPIO_FN(FMSIOLR),</div><div class='add'>+	GPIO_FN(FMSIOBT),	GPIO_FN(FMSICK),	GPIO_FN(FMSOILR),</div><div class='add'>+	GPIO_FN(FMSOIBT),	GPIO_FN(FMSOOLR),	GPIO_FN(FMSOOBT),</div><div class='add'>+	GPIO_FN(FMSOSLD),	GPIO_FN(FMSOCK),</div><div class='add'>+</div><div class='add'>+	/* SCIFA0 */</div><div class='add'>+	GPIO_FN(SCIFA0_SCK),	GPIO_FN(SCIFA0_CTS),	GPIO_FN(SCIFA0_RTS),</div><div class='add'>+	GPIO_FN(SCIFA0_RXD),	GPIO_FN(SCIFA0_TXD),</div><div class='add'>+</div><div class='add'>+	/* SCIFA1 */</div><div class='add'>+	GPIO_FN(SCIFA1_CTS),	GPIO_FN(SCIFA1_SCK),</div><div class='add'>+	GPIO_FN(SCIFA1_RXD),	GPIO_FN(SCIFA1_TXD),	GPIO_FN(SCIFA1_RTS),</div><div class='add'>+</div><div class='add'>+	/* SCIFA2 */</div><div class='add'>+	GPIO_FN(SCIFA2_SCK_PORT22), /* SCIFA2_SCK Port 22/199 */</div><div class='add'>+	GPIO_FN(SCIFA2_SCK_PORT199),</div><div class='add'>+	GPIO_FN(SCIFA2_RXD),	GPIO_FN(SCIFA2_TXD),</div><div class='add'>+	GPIO_FN(SCIFA2_CTS),	GPIO_FN(SCIFA2_RTS),</div><div class='add'>+</div><div class='add'>+	/* SCIFA3 */</div><div class='add'>+	GPIO_FN(SCIFA3_RTS_PORT105), /* MSEL5CR_8_0 */</div><div class='add'>+	GPIO_FN(SCIFA3_SCK_PORT116),</div><div class='add'>+	GPIO_FN(SCIFA3_CTS_PORT117),</div><div class='add'>+	GPIO_FN(SCIFA3_RXD_PORT174),</div><div class='add'>+	GPIO_FN(SCIFA3_TXD_PORT175),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(SCIFA3_RTS_PORT161), /* MSEL5CR_8_1 */</div><div class='add'>+	GPIO_FN(SCIFA3_SCK_PORT158),</div><div class='add'>+	GPIO_FN(SCIFA3_CTS_PORT162),</div><div class='add'>+	GPIO_FN(SCIFA3_RXD_PORT159),</div><div class='add'>+	GPIO_FN(SCIFA3_TXD_PORT160),</div><div class='add'>+</div><div class='add'>+	/* SCIFA4 */</div><div class='add'>+	GPIO_FN(SCIFA4_RXD_PORT12), /* MSEL5CR[12:11] = 00 */</div><div class='add'>+	GPIO_FN(SCIFA4_TXD_PORT13),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(SCIFA4_RXD_PORT204), /* MSEL5CR[12:11] = 01 */</div><div class='add'>+	GPIO_FN(SCIFA4_TXD_PORT203),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(SCIFA4_RXD_PORT94), /* MSEL5CR[12:11] = 10 */</div><div class='add'>+	GPIO_FN(SCIFA4_TXD_PORT93),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(SCIFA4_SCK_PORT21), /* SCIFA4_SCK Port 21/205 */</div><div class='add'>+	GPIO_FN(SCIFA4_SCK_PORT205),</div><div class='add'>+</div><div class='add'>+	/* SCIFA5 */</div><div class='add'>+	GPIO_FN(SCIFA5_TXD_PORT20), /* MSEL5CR[15:14] = 00 */</div><div class='add'>+	GPIO_FN(SCIFA5_RXD_PORT10),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(SCIFA5_RXD_PORT207), /* MSEL5CR[15:14] = 01 */</div><div class='add'>+	GPIO_FN(SCIFA5_TXD_PORT208),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(SCIFA5_TXD_PORT91), /* MSEL5CR[15:14] = 10 */</div><div class='add'>+	GPIO_FN(SCIFA5_RXD_PORT92),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(SCIFA5_SCK_PORT23), /* SCIFA5_SCK Port 23/206 */</div><div class='add'>+	GPIO_FN(SCIFA5_SCK_PORT206),</div><div class='add'>+</div><div class='add'>+	/* SCIFA6 */</div><div class='add'>+	GPIO_FN(SCIFA6_SCK),	GPIO_FN(SCIFA6_RXD),	GPIO_FN(SCIFA6_TXD),</div><div class='add'>+</div><div class='add'>+	/* SCIFA7 */</div><div class='add'>+	GPIO_FN(SCIFA7_TXD),	GPIO_FN(SCIFA7_RXD),</div><div class='add'>+</div><div class='add'>+	/* SCIFAB */</div><div class='add'>+	GPIO_FN(SCIFB_SCK_PORT190), /* MSEL5CR_17_0 */</div><div class='add'>+	GPIO_FN(SCIFB_RXD_PORT191),</div><div class='add'>+	GPIO_FN(SCIFB_TXD_PORT192),</div><div class='add'>+	GPIO_FN(SCIFB_RTS_PORT186),</div><div class='add'>+	GPIO_FN(SCIFB_CTS_PORT187),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(SCIFB_SCK_PORT2), /* MSEL5CR_17_1 */</div><div class='add'>+	GPIO_FN(SCIFB_RXD_PORT3),</div><div class='add'>+	GPIO_FN(SCIFB_TXD_PORT4),</div><div class='add'>+	GPIO_FN(SCIFB_RTS_PORT172),</div><div class='add'>+	GPIO_FN(SCIFB_CTS_PORT173),</div><div class='add'>+</div><div class='add'>+	/* LCD0 */</div><div class='add'>+	GPIO_FN(LCD0_D0),	GPIO_FN(LCD0_D1),	GPIO_FN(LCD0_D2),</div><div class='add'>+	GPIO_FN(LCD0_D3),	GPIO_FN(LCD0_D4),	GPIO_FN(LCD0_D5),</div><div class='add'>+	GPIO_FN(LCD0_D6),	GPIO_FN(LCD0_D7),	GPIO_FN(LCD0_D8),</div><div class='add'>+	GPIO_FN(LCD0_D9),	GPIO_FN(LCD0_D10),	GPIO_FN(LCD0_D11),</div><div class='add'>+	GPIO_FN(LCD0_D12),	GPIO_FN(LCD0_D13),	GPIO_FN(LCD0_D14),</div><div class='add'>+	GPIO_FN(LCD0_D15),	GPIO_FN(LCD0_D16),	GPIO_FN(LCD0_D17),</div><div class='add'>+	GPIO_FN(LCD0_DON),	GPIO_FN(LCD0_VCPWC),	GPIO_FN(LCD0_VEPWC),</div><div class='add'>+	GPIO_FN(LCD0_DCK),	GPIO_FN(LCD0_VSYN),</div><div class='add'>+	GPIO_FN(LCD0_HSYN),	GPIO_FN(LCD0_DISP),</div><div class='add'>+	GPIO_FN(LCD0_WR),	GPIO_FN(LCD0_RD),</div><div class='add'>+	GPIO_FN(LCD0_CS),	GPIO_FN(LCD0_RS),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(LCD0_D18_PORT163),	GPIO_FN(LCD0_D19_PORT162),</div><div class='add'>+	GPIO_FN(LCD0_D20_PORT161),	GPIO_FN(LCD0_D21_PORT158),</div><div class='add'>+	GPIO_FN(LCD0_D22_PORT160),	GPIO_FN(LCD0_D23_PORT159),</div><div class='add'>+	GPIO_FN(LCD0_LCLK_PORT165),	/* MSEL5CR_6_1 */</div><div class='add'>+</div><div class='add'>+	GPIO_FN(LCD0_D18_PORT40),	GPIO_FN(LCD0_D19_PORT4),</div><div class='add'>+	GPIO_FN(LCD0_D20_PORT3),	GPIO_FN(LCD0_D21_PORT2),</div><div class='add'>+	GPIO_FN(LCD0_D22_PORT0),	GPIO_FN(LCD0_D23_PORT1),</div><div class='add'>+	GPIO_FN(LCD0_LCLK_PORT102),	/* MSEL5CR_6_0 */</div><div class='add'>+</div><div class='add'>+	/* LCD1 */</div><div class='add'>+	GPIO_FN(LCD1_D0),	GPIO_FN(LCD1_D1),	GPIO_FN(LCD1_D2),</div><div class='add'>+	GPIO_FN(LCD1_D3),	GPIO_FN(LCD1_D4),	GPIO_FN(LCD1_D5),</div><div class='add'>+	GPIO_FN(LCD1_D6),	GPIO_FN(LCD1_D7),	GPIO_FN(LCD1_D8),</div><div class='add'>+	GPIO_FN(LCD1_D9),	GPIO_FN(LCD1_D10),	GPIO_FN(LCD1_D11),</div><div class='add'>+	GPIO_FN(LCD1_D12),	GPIO_FN(LCD1_D13),	GPIO_FN(LCD1_D14),</div><div class='add'>+	GPIO_FN(LCD1_D15),	GPIO_FN(LCD1_D16),	GPIO_FN(LCD1_D17),</div><div class='add'>+	GPIO_FN(LCD1_D18),	GPIO_FN(LCD1_D19),	GPIO_FN(LCD1_D20),</div><div class='add'>+	GPIO_FN(LCD1_D21),	GPIO_FN(LCD1_D22),	GPIO_FN(LCD1_D23),</div><div class='add'>+	GPIO_FN(LCD1_RS),	GPIO_FN(LCD1_RD),	GPIO_FN(LCD1_CS),</div><div class='add'>+	GPIO_FN(LCD1_WR),	GPIO_FN(LCD1_DCK),	GPIO_FN(LCD1_DON),</div><div class='add'>+	GPIO_FN(LCD1_VCPWC),	GPIO_FN(LCD1_LCLK),	GPIO_FN(LCD1_HSYN),</div><div class='add'>+	GPIO_FN(LCD1_VSYN),	GPIO_FN(LCD1_VEPWC),	GPIO_FN(LCD1_DISP),</div><div class='add'>+</div><div class='add'>+	/* RSPI */</div><div class='add'>+	GPIO_FN(RSPI_SSL0_A),	GPIO_FN(RSPI_SSL1_A),	GPIO_FN(RSPI_SSL2_A),</div><div class='add'>+	GPIO_FN(RSPI_SSL3_A),	GPIO_FN(RSPI_CK_A),	GPIO_FN(RSPI_MOSI_A),</div><div class='add'>+	GPIO_FN(RSPI_MISO_A),</div><div class='add'>+</div><div class='add'>+	/* VIO CKO */</div><div class='add'>+	GPIO_FN(VIO_CKO1),</div><div class='add'>+	GPIO_FN(VIO_CKO2),</div><div class='add'>+	GPIO_FN(VIO_CKO_1),</div><div class='add'>+	GPIO_FN(VIO_CKO),</div><div class='add'>+</div><div class='add'>+	/* VIO0 */</div><div class='add'>+	GPIO_FN(VIO0_D0),	GPIO_FN(VIO0_D1),	GPIO_FN(VIO0_D2),</div><div class='add'>+	GPIO_FN(VIO0_D3),	GPIO_FN(VIO0_D4),	GPIO_FN(VIO0_D5),</div><div class='add'>+	GPIO_FN(VIO0_D6),	GPIO_FN(VIO0_D7),	GPIO_FN(VIO0_D8),</div><div class='add'>+	GPIO_FN(VIO0_D9),	GPIO_FN(VIO0_D10),	GPIO_FN(VIO0_D11),</div><div class='add'>+	GPIO_FN(VIO0_D12),	GPIO_FN(VIO0_VD),	GPIO_FN(VIO0_HD),</div><div class='add'>+	GPIO_FN(VIO0_CLK),	GPIO_FN(VIO0_FIELD),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(VIO0_D13_PORT26), /* MSEL5CR_27_0 */</div><div class='add'>+	GPIO_FN(VIO0_D14_PORT25),</div><div class='add'>+	GPIO_FN(VIO0_D15_PORT24),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(VIO0_D13_PORT22), /* MSEL5CR_27_1 */</div><div class='add'>+	GPIO_FN(VIO0_D14_PORT95),</div><div class='add'>+	GPIO_FN(VIO0_D15_PORT96),</div><div class='add'>+</div><div class='add'>+	/* VIO1 */</div><div class='add'>+	GPIO_FN(VIO1_D0),	GPIO_FN(VIO1_D1),	GPIO_FN(VIO1_D2),</div><div class='add'>+	GPIO_FN(VIO1_D3),	GPIO_FN(VIO1_D4),	GPIO_FN(VIO1_D5),</div><div class='add'>+	GPIO_FN(VIO1_D6),	GPIO_FN(VIO1_D7),	GPIO_FN(VIO1_VD),</div><div class='add'>+	GPIO_FN(VIO1_HD),	GPIO_FN(VIO1_CLK),	GPIO_FN(VIO1_FIELD),</div><div class='add'>+</div><div class='add'>+	/* TPU0 */</div><div class='add'>+	GPIO_FN(TPU0TO0),	GPIO_FN(TPU0TO1),	GPIO_FN(TPU0TO3),</div><div class='add'>+	GPIO_FN(TPU0TO2_PORT66), /* TPU0TO2 Port 66/202 */</div><div class='add'>+	GPIO_FN(TPU0TO2_PORT202),</div><div class='add'>+</div><div class='add'>+	/* SSP1 0 */</div><div class='add'>+	GPIO_FN(STP0_IPD0),	GPIO_FN(STP0_IPD1),	GPIO_FN(STP0_IPD2),</div><div class='add'>+	GPIO_FN(STP0_IPD3),	GPIO_FN(STP0_IPD4),	GPIO_FN(STP0_IPD5),</div><div class='add'>+	GPIO_FN(STP0_IPD6),	GPIO_FN(STP0_IPD7),	GPIO_FN(STP0_IPEN),</div><div class='add'>+	GPIO_FN(STP0_IPCLK),	GPIO_FN(STP0_IPSYNC),</div><div class='add'>+</div><div class='add'>+	/* SSP1 1 */</div><div class='add'>+	GPIO_FN(STP1_IPD1),	GPIO_FN(STP1_IPD2),	GPIO_FN(STP1_IPD3),</div><div class='add'>+	GPIO_FN(STP1_IPD4),	GPIO_FN(STP1_IPD5),	GPIO_FN(STP1_IPD6),</div><div class='add'>+	GPIO_FN(STP1_IPD7),	GPIO_FN(STP1_IPCLK),	GPIO_FN(STP1_IPSYNC),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(STP1_IPD0_PORT186), /* MSEL5CR_23_0 */</div><div class='add'>+	GPIO_FN(STP1_IPEN_PORT187),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(STP1_IPD0_PORT194), /* MSEL5CR_23_1 */</div><div class='add'>+	GPIO_FN(STP1_IPEN_PORT193),</div><div class='add'>+</div><div class='add'>+	/* SIM */</div><div class='add'>+	GPIO_FN(SIM_RST),	GPIO_FN(SIM_CLK),</div><div class='add'>+	GPIO_FN(SIM_D_PORT22), /* SIM_D  Port 22/199 */</div><div class='add'>+	GPIO_FN(SIM_D_PORT199),</div><div class='add'>+</div><div class='add'>+	/* SDHI0 */</div><div class='add'>+	GPIO_FN(SDHI0_D0),	GPIO_FN(SDHI0_D1),	GPIO_FN(SDHI0_D2),</div><div class='add'>+	GPIO_FN(SDHI0_D3),	GPIO_FN(SDHI0_CD),	GPIO_FN(SDHI0_WP),</div><div class='add'>+	GPIO_FN(SDHI0_CMD),	GPIO_FN(SDHI0_CLK),</div><div class='add'>+</div><div class='add'>+	/* SDHI1 */</div><div class='add'>+	GPIO_FN(SDHI1_D0),	GPIO_FN(SDHI1_D1),	GPIO_FN(SDHI1_D2),</div><div class='add'>+	GPIO_FN(SDHI1_D3),	GPIO_FN(SDHI1_CD),	GPIO_FN(SDHI1_WP),</div><div class='add'>+	GPIO_FN(SDHI1_CMD),	GPIO_FN(SDHI1_CLK),</div><div class='add'>+</div><div class='add'>+	/* SDHI2 */</div><div class='add'>+	GPIO_FN(SDHI2_D0),	GPIO_FN(SDHI2_D1),	GPIO_FN(SDHI2_D2),</div><div class='add'>+	GPIO_FN(SDHI2_D3),	GPIO_FN(SDHI2_CLK),	GPIO_FN(SDHI2_CMD),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(SDHI2_CD_PORT24), /* MSEL5CR_19_0 */</div><div class='add'>+	GPIO_FN(SDHI2_WP_PORT25),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(SDHI2_WP_PORT177), /* MSEL5CR_19_1 */</div><div class='add'>+	GPIO_FN(SDHI2_CD_PORT202),</div><div class='add'>+</div><div class='add'>+	/* MSIOF2 */</div><div class='add'>+	GPIO_FN(MSIOF2_TXD),	GPIO_FN(MSIOF2_RXD),	GPIO_FN(MSIOF2_TSCK),</div><div class='add'>+	GPIO_FN(MSIOF2_SS2),	GPIO_FN(MSIOF2_TSYNC),	GPIO_FN(MSIOF2_SS1),</div><div class='add'>+	GPIO_FN(MSIOF2_MCK1),	GPIO_FN(MSIOF2_MCK0),	GPIO_FN(MSIOF2_RSYNC),</div><div class='add'>+	GPIO_FN(MSIOF2_RSCK),</div><div class='add'>+</div><div class='add'>+	/* KEYSC */</div><div class='add'>+	GPIO_FN(KEYIN4),	GPIO_FN(KEYIN5),</div><div class='add'>+	GPIO_FN(KEYIN6),	GPIO_FN(KEYIN7),</div><div class='add'>+	GPIO_FN(KEYOUT0),	GPIO_FN(KEYOUT1),	GPIO_FN(KEYOUT2),</div><div class='add'>+	GPIO_FN(KEYOUT3),	GPIO_FN(KEYOUT4),	GPIO_FN(KEYOUT5),</div><div class='add'>+	GPIO_FN(KEYOUT6),	GPIO_FN(KEYOUT7),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(KEYIN0_PORT43), /* MSEL4CR_18_0 */</div><div class='add'>+	GPIO_FN(KEYIN1_PORT44),</div><div class='add'>+	GPIO_FN(KEYIN2_PORT45),</div><div class='add'>+	GPIO_FN(KEYIN3_PORT46),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(KEYIN0_PORT58), /* MSEL4CR_18_1 */</div><div class='add'>+	GPIO_FN(KEYIN1_PORT57),</div><div class='add'>+	GPIO_FN(KEYIN2_PORT56),</div><div class='add'>+	GPIO_FN(KEYIN3_PORT55),</div><div class='add'>+</div><div class='add'>+	/* VOU */</div><div class='add'>+	GPIO_FN(DV_D0),		GPIO_FN(DV_D1),		GPIO_FN(DV_D2),</div><div class='add'>+	GPIO_FN(DV_D3),		GPIO_FN(DV_D4),		GPIO_FN(DV_D5),</div><div class='add'>+	GPIO_FN(DV_D6),		GPIO_FN(DV_D7),		GPIO_FN(DV_D8),</div><div class='add'>+	GPIO_FN(DV_D9),		GPIO_FN(DV_D10),	GPIO_FN(DV_D11),</div><div class='add'>+	GPIO_FN(DV_D12),	GPIO_FN(DV_D13),	GPIO_FN(DV_D14),</div><div class='add'>+	GPIO_FN(DV_D15),	GPIO_FN(DV_CLK),</div><div class='add'>+	GPIO_FN(DV_VSYNC),	GPIO_FN(DV_HSYNC),</div><div class='add'>+</div><div class='add'>+	/* MEMC */</div><div class='add'>+	GPIO_FN(MEMC_AD0),	GPIO_FN(MEMC_AD1),	GPIO_FN(MEMC_AD2),</div><div class='add'>+	GPIO_FN(MEMC_AD3),	GPIO_FN(MEMC_AD4),	GPIO_FN(MEMC_AD5),</div><div class='add'>+	GPIO_FN(MEMC_AD6),	GPIO_FN(MEMC_AD7),	GPIO_FN(MEMC_AD8),</div><div class='add'>+	GPIO_FN(MEMC_AD9),	GPIO_FN(MEMC_AD10),	GPIO_FN(MEMC_AD11),</div><div class='add'>+	GPIO_FN(MEMC_AD12),	GPIO_FN(MEMC_AD13),	GPIO_FN(MEMC_AD14),</div><div class='add'>+	GPIO_FN(MEMC_AD15),	GPIO_FN(MEMC_CS0),	GPIO_FN(MEMC_INT),</div><div class='add'>+	GPIO_FN(MEMC_NWE),	GPIO_FN(MEMC_NOE),	GPIO_FN(MEMC_CS1),</div><div class='add'>+	GPIO_FN(MEMC_A1),	GPIO_FN(MEMC_ADV),	GPIO_FN(MEMC_DREQ0),</div><div class='add'>+	GPIO_FN(MEMC_WAIT),	GPIO_FN(MEMC_DREQ1),	GPIO_FN(MEMC_BUSCLK),</div><div class='add'>+	GPIO_FN(MEMC_A0),</div><div class='add'>+</div><div class='add'>+	/* MMC */</div><div class='add'>+	GPIO_FN(MMC0_D0_PORT68),	GPIO_FN(MMC0_D1_PORT69),</div><div class='add'>+	GPIO_FN(MMC0_D2_PORT70),	GPIO_FN(MMC0_D3_PORT71),</div><div class='add'>+	GPIO_FN(MMC0_D4_PORT72),	GPIO_FN(MMC0_D5_PORT73),</div><div class='add'>+	GPIO_FN(MMC0_D6_PORT74),	GPIO_FN(MMC0_D7_PORT75),</div><div class='add'>+	GPIO_FN(MMC0_CLK_PORT66),</div><div class='add'>+	GPIO_FN(MMC0_CMD_PORT67),	/* MSEL4CR_15_0 */</div><div class='add'>+</div><div class='add'>+	GPIO_FN(MMC1_D0_PORT149),	GPIO_FN(MMC1_D1_PORT148),</div><div class='add'>+	GPIO_FN(MMC1_D2_PORT147),	GPIO_FN(MMC1_D3_PORT146),</div><div class='add'>+	GPIO_FN(MMC1_D4_PORT145),	GPIO_FN(MMC1_D5_PORT144),</div><div class='add'>+	GPIO_FN(MMC1_D6_PORT143),	GPIO_FN(MMC1_D7_PORT142),</div><div class='add'>+	GPIO_FN(MMC1_CLK_PORT103),</div><div class='add'>+	GPIO_FN(MMC1_CMD_PORT104),	/* MSEL4CR_15_1 */</div><div class='add'>+</div><div class='add'>+	/* MSIOF0 */</div><div class='add'>+	GPIO_FN(MSIOF0_SS1),	GPIO_FN(MSIOF0_SS2),	GPIO_FN(MSIOF0_RXD),</div><div class='add'>+	GPIO_FN(MSIOF0_TXD),	GPIO_FN(MSIOF0_MCK0),	GPIO_FN(MSIOF0_MCK1),</div><div class='add'>+	GPIO_FN(MSIOF0_RSYNC),	GPIO_FN(MSIOF0_RSCK),	GPIO_FN(MSIOF0_TSCK),</div><div class='add'>+	GPIO_FN(MSIOF0_TSYNC),</div><div class='add'>+</div><div class='add'>+	/* MSIOF1 */</div><div class='add'>+	GPIO_FN(MSIOF1_RSCK),	GPIO_FN(MSIOF1_RSYNC),</div><div class='add'>+	GPIO_FN(MSIOF1_MCK0),	GPIO_FN(MSIOF1_MCK1),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(MSIOF1_SS2_PORT116),	GPIO_FN(MSIOF1_SS1_PORT117),</div><div class='add'>+	GPIO_FN(MSIOF1_RXD_PORT118),	GPIO_FN(MSIOF1_TXD_PORT119),</div><div class='add'>+	GPIO_FN(MSIOF1_TSYNC_PORT120),</div><div class='add'>+	GPIO_FN(MSIOF1_TSCK_PORT121),	/* MSEL4CR_10_0 */</div><div class='add'>+</div><div class='add'>+	GPIO_FN(MSIOF1_SS1_PORT67),	GPIO_FN(MSIOF1_TSCK_PORT72),</div><div class='add'>+	GPIO_FN(MSIOF1_TSYNC_PORT73),	GPIO_FN(MSIOF1_TXD_PORT74),</div><div class='add'>+	GPIO_FN(MSIOF1_RXD_PORT75),</div><div class='add'>+	GPIO_FN(MSIOF1_SS2_PORT202),	/* MSEL4CR_10_1 */</div><div class='add'>+</div><div class='add'>+	/* GPIO */</div><div class='add'>+	GPIO_FN(GPO0),	GPIO_FN(GPI0),</div><div class='add'>+	GPIO_FN(GPO1),	GPIO_FN(GPI1),</div><div class='add'>+</div><div class='add'>+	/* USB0 */</div><div class='add'>+	GPIO_FN(USB0_OCI),	GPIO_FN(USB0_PPON),	GPIO_FN(VBUS),</div><div class='add'>+</div><div class='add'>+	/* USB1 */</div><div class='add'>+	GPIO_FN(USB1_OCI),	GPIO_FN(USB1_PPON),</div><div class='add'>+</div><div class='add'>+	/* BBIF1 */</div><div class='add'>+	GPIO_FN(BBIF1_RXD),	GPIO_FN(BBIF1_TXD),	GPIO_FN(BBIF1_TSYNC),</div><div class='add'>+	GPIO_FN(BBIF1_TSCK),	GPIO_FN(BBIF1_RSCK),	GPIO_FN(BBIF1_RSYNC),</div><div class='add'>+	GPIO_FN(BBIF1_FLOW),	GPIO_FN(BBIF1_RX_FLOW_N),</div><div class='add'>+</div><div class='add'>+	/* BBIF2 */</div><div class='add'>+	GPIO_FN(BBIF2_TXD2_PORT5), /* MSEL5CR_0_0 */</div><div class='add'>+	GPIO_FN(BBIF2_RXD2_PORT60),</div><div class='add'>+	GPIO_FN(BBIF2_TSYNC2_PORT6),</div><div class='add'>+	GPIO_FN(BBIF2_TSCK2_PORT59),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(BBIF2_RXD2_PORT90), /* MSEL5CR_0_1 */</div><div class='add'>+	GPIO_FN(BBIF2_TXD2_PORT183),</div><div class='add'>+	GPIO_FN(BBIF2_TSCK2_PORT89),</div><div class='add'>+	GPIO_FN(BBIF2_TSYNC2_PORT184),</div><div class='add'>+</div><div class='add'>+	/* BSC / FLCTL / PCMCIA */</div><div class='add'>+	GPIO_FN(CS0),	GPIO_FN(CS2),	GPIO_FN(CS4),</div><div class='add'>+	GPIO_FN(CS5B),	GPIO_FN(CS6A),</div><div class='add'>+	GPIO_FN(CS5A_PORT105), /* CS5A PORT 19/105 */</div><div class='add'>+	GPIO_FN(CS5A_PORT19),</div><div class='add'>+	GPIO_FN(IOIS16), /* ? */</div><div class='add'>+</div><div class='add'>+	GPIO_FN(A0),	GPIO_FN(A1),	GPIO_FN(A2),	GPIO_FN(A3),</div><div class='add'>+	GPIO_FN(A4_FOE),	GPIO_FN(A5_FCDE),	/* share with FLCTL */</div><div class='add'>+	GPIO_FN(A6),	GPIO_FN(A7),	GPIO_FN(A8),	GPIO_FN(A9),</div><div class='add'>+	GPIO_FN(A10),	GPIO_FN(A11),	GPIO_FN(A12),	GPIO_FN(A13),</div><div class='add'>+	GPIO_FN(A14),	GPIO_FN(A15),	GPIO_FN(A16),	GPIO_FN(A17),</div><div class='add'>+	GPIO_FN(A18),	GPIO_FN(A19),	GPIO_FN(A20),	GPIO_FN(A21),</div><div class='add'>+	GPIO_FN(A22),	GPIO_FN(A23),	GPIO_FN(A24),	GPIO_FN(A25),</div><div class='add'>+	GPIO_FN(A26),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(D0_NAF0),	GPIO_FN(D1_NAF1),	/* share with FLCTL */</div><div class='add'>+	GPIO_FN(D2_NAF2),	GPIO_FN(D3_NAF3),	/* share with FLCTL */</div><div class='add'>+	GPIO_FN(D4_NAF4),	GPIO_FN(D5_NAF5),	/* share with FLCTL */</div><div class='add'>+	GPIO_FN(D6_NAF6),	GPIO_FN(D7_NAF7),	/* share with FLCTL */</div><div class='add'>+	GPIO_FN(D8_NAF8),	GPIO_FN(D9_NAF9),	/* share with FLCTL */</div><div class='add'>+	GPIO_FN(D10_NAF10),	GPIO_FN(D11_NAF11),	/* share with FLCTL */</div><div class='add'>+	GPIO_FN(D12_NAF12),	GPIO_FN(D13_NAF13),	/* share with FLCTL */</div><div class='add'>+	GPIO_FN(D14_NAF14),	GPIO_FN(D15_NAF15),	/* share with FLCTL */</div><div class='add'>+	GPIO_FN(D16),	GPIO_FN(D17),	GPIO_FN(D18),	GPIO_FN(D19),</div><div class='add'>+	GPIO_FN(D20),	GPIO_FN(D21),	GPIO_FN(D22),	GPIO_FN(D23),</div><div class='add'>+	GPIO_FN(D24),	GPIO_FN(D25),	GPIO_FN(D26),	GPIO_FN(D27),</div><div class='add'>+	GPIO_FN(D28),	GPIO_FN(D29),	GPIO_FN(D30),	GPIO_FN(D31),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(WE0_FWE),	/* share with FLCTL */</div><div class='add'>+	GPIO_FN(WE1),</div><div class='add'>+	GPIO_FN(WE2_ICIORD),	/* share with PCMCIA */</div><div class='add'>+	GPIO_FN(WE3_ICIOWR),	/* share with PCMCIA */</div><div class='add'>+	GPIO_FN(CKO),	GPIO_FN(BS),	GPIO_FN(RDWR),</div><div class='add'>+	GPIO_FN(RD_FSC),	/* share with FLCTL */</div><div class='add'>+	GPIO_FN(WAIT_PORT177), /* WAIT Port 90/177 */</div><div class='add'>+	GPIO_FN(WAIT_PORT90),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(FCE0),	GPIO_FN(FCE1),	GPIO_FN(FRB), /* FLCTL */</div><div class='add'>+</div><div class='add'>+	/* IRDA */</div><div class='add'>+	GPIO_FN(IRDA_FIRSEL),	GPIO_FN(IRDA_IN),	GPIO_FN(IRDA_OUT),</div><div class='add'>+</div><div class='add'>+	/* ATAPI */</div><div class='add'>+	GPIO_FN(IDE_D0),	GPIO_FN(IDE_D1),	GPIO_FN(IDE_D2),</div><div class='add'>+	GPIO_FN(IDE_D3),	GPIO_FN(IDE_D4),	GPIO_FN(IDE_D5),</div><div class='add'>+	GPIO_FN(IDE_D6),	GPIO_FN(IDE_D7),	GPIO_FN(IDE_D8),</div><div class='add'>+	GPIO_FN(IDE_D9),	GPIO_FN(IDE_D10),	GPIO_FN(IDE_D11),</div><div class='add'>+	GPIO_FN(IDE_D12),	GPIO_FN(IDE_D13),	GPIO_FN(IDE_D14),</div><div class='add'>+	GPIO_FN(IDE_D15),	GPIO_FN(IDE_A0),	GPIO_FN(IDE_A1),</div><div class='add'>+	GPIO_FN(IDE_A2),	GPIO_FN(IDE_CS0),	GPIO_FN(IDE_CS1),</div><div class='add'>+	GPIO_FN(IDE_IOWR),	GPIO_FN(IDE_IORD),	GPIO_FN(IDE_IORDY),</div><div class='add'>+	GPIO_FN(IDE_INT),	GPIO_FN(IDE_RST),	GPIO_FN(IDE_DIRECTION),</div><div class='add'>+	GPIO_FN(IDE_EXBUF_ENB),	GPIO_FN(IDE_IODACK),	GPIO_FN(IDE_IODREQ),</div><div class='add'>+</div><div class='add'>+	/* RMII */</div><div class='add'>+	GPIO_FN(RMII_CRS_DV),	GPIO_FN(RMII_RX_ER),	GPIO_FN(RMII_RXD0),</div><div class='add'>+	GPIO_FN(RMII_RXD1),	GPIO_FN(RMII_TX_EN),	GPIO_FN(RMII_TXD0),</div><div class='add'>+	GPIO_FN(RMII_MDC),	GPIO_FN(RMII_TXD1),	GPIO_FN(RMII_MDIO),</div><div class='add'>+	GPIO_FN(RMII_REF50CK),	GPIO_FN(RMII_REF125CK),	/* for GMII */</div><div class='add'>+</div><div class='add'>+	/* GEther */</div><div class='add'>+	GPIO_FN(ET_TX_CLK),	GPIO_FN(ET_TX_EN),	GPIO_FN(ET_ETXD0),</div><div class='add'>+	GPIO_FN(ET_ETXD1),	GPIO_FN(ET_ETXD2),	GPIO_FN(ET_ETXD3),</div><div class='add'>+	GPIO_FN(ET_ETXD4),	GPIO_FN(ET_ETXD5), /* for GEther */</div><div class='add'>+	GPIO_FN(ET_ETXD6),	GPIO_FN(ET_ETXD7), /* for GEther */</div><div class='add'>+	GPIO_FN(ET_COL),	GPIO_FN(ET_TX_ER),	GPIO_FN(ET_RX_CLK),</div><div class='add'>+	GPIO_FN(ET_RX_DV),	GPIO_FN(ET_ERXD0),	GPIO_FN(ET_ERXD1),</div><div class='add'>+	GPIO_FN(ET_ERXD2),	GPIO_FN(ET_ERXD3),</div><div class='add'>+	GPIO_FN(ET_ERXD4),	GPIO_FN(ET_ERXD5), /* for GEther */</div><div class='add'>+	GPIO_FN(ET_ERXD6),	GPIO_FN(ET_ERXD7), /* for GEther */</div><div class='add'>+	GPIO_FN(ET_RX_ER),	GPIO_FN(ET_CRS),	GPIO_FN(ET_MDC),</div><div class='add'>+	GPIO_FN(ET_MDIO),	GPIO_FN(ET_LINK),	GPIO_FN(ET_PHY_INT),</div><div class='add'>+	GPIO_FN(ET_WOL),	GPIO_FN(ET_GTX_CLK),</div><div class='add'>+</div><div class='add'>+	/* DMA0 */</div><div class='add'>+	GPIO_FN(DREQ0),	GPIO_FN(DACK0),</div><div class='add'>+</div><div class='add'>+	/* DMA1 */</div><div class='add'>+	GPIO_FN(DREQ1),	GPIO_FN(DACK1),</div><div class='add'>+</div><div class='add'>+	/* SYSC */</div><div class='add'>+	GPIO_FN(RESETOUTS),</div><div class='add'>+</div><div class='add'>+	/* IRREM */</div><div class='add'>+	GPIO_FN(IROUT),</div><div class='add'>+</div><div class='add'>+	/* LCDC */</div><div class='add'>+	GPIO_FN(LCDC0_SELECT),</div><div class='add'>+	GPIO_FN(LCDC1_SELECT),</div><div class='add'>+</div><div class='add'>+	/* SDENC */</div><div class='add'>+	GPIO_FN(SDENC_CPG),</div><div class='add'>+	GPIO_FN(SDENC_DV_CLKI),</div><div class='add'>+</div><div class='add'>+	/* SYSC */</div><div class='add'>+	GPIO_FN(RESETP_PULLUP),</div><div class='add'>+	GPIO_FN(RESETP_PLAIN),</div><div class='add'>+</div><div class='add'>+	/* DEBUG */</div><div class='add'>+	GPIO_FN(EDEBGREQ_PULLDOWN),</div><div class='add'>+	GPIO_FN(EDEBGREQ_PULLUP),</div><div class='add'>+</div><div class='add'>+	GPIO_FN(TRACEAUD_FROM_VIO),</div><div class='add'>+	GPIO_FN(TRACEAUD_FROM_LCDC0),</div><div class='add'>+	GPIO_FN(TRACEAUD_FROM_MEMC),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='add'>+	PORTCR(0,	0xe6050000), /* PORT0CR */</div><div class='add'>+	PORTCR(1,	0xe6050001), /* PORT1CR */</div><div class='add'>+	PORTCR(2,	0xe6050002), /* PORT2CR */</div><div class='add'>+	PORTCR(3,	0xe6050003), /* PORT3CR */</div><div class='add'>+	PORTCR(4,	0xe6050004), /* PORT4CR */</div><div class='add'>+	PORTCR(5,	0xe6050005), /* PORT5CR */</div><div class='add'>+	PORTCR(6,	0xe6050006), /* PORT6CR */</div><div class='add'>+	PORTCR(7,	0xe6050007), /* PORT7CR */</div><div class='add'>+	PORTCR(8,	0xe6050008), /* PORT8CR */</div><div class='add'>+	PORTCR(9,	0xe6050009), /* PORT9CR */</div><div class='add'>+	PORTCR(10,	0xe605000a), /* PORT10CR */</div><div class='add'>+	PORTCR(11,	0xe605000b), /* PORT11CR */</div><div class='add'>+	PORTCR(12,	0xe605000c), /* PORT12CR */</div><div class='add'>+	PORTCR(13,	0xe605000d), /* PORT13CR */</div><div class='add'>+	PORTCR(14,	0xe605000e), /* PORT14CR */</div><div class='add'>+	PORTCR(15,	0xe605000f), /* PORT15CR */</div><div class='add'>+	PORTCR(16,	0xe6050010), /* PORT16CR */</div><div class='add'>+	PORTCR(17,	0xe6050011), /* PORT17CR */</div><div class='add'>+	PORTCR(18,	0xe6050012), /* PORT18CR */</div><div class='add'>+	PORTCR(19,	0xe6050013), /* PORT19CR */</div><div class='add'>+	PORTCR(20,	0xe6050014), /* PORT20CR */</div><div class='add'>+	PORTCR(21,	0xe6050015), /* PORT21CR */</div><div class='add'>+	PORTCR(22,	0xe6050016), /* PORT22CR */</div><div class='add'>+	PORTCR(23,	0xe6050017), /* PORT23CR */</div><div class='add'>+	PORTCR(24,	0xe6050018), /* PORT24CR */</div><div class='add'>+	PORTCR(25,	0xe6050019), /* PORT25CR */</div><div class='add'>+	PORTCR(26,	0xe605001a), /* PORT26CR */</div><div class='add'>+	PORTCR(27,	0xe605001b), /* PORT27CR */</div><div class='add'>+	PORTCR(28,	0xe605001c), /* PORT28CR */</div><div class='add'>+	PORTCR(29,	0xe605001d), /* PORT29CR */</div><div class='add'>+	PORTCR(30,	0xe605001e), /* PORT30CR */</div><div class='add'>+	PORTCR(31,	0xe605001f), /* PORT31CR */</div><div class='add'>+	PORTCR(32,	0xe6050020), /* PORT32CR */</div><div class='add'>+	PORTCR(33,	0xe6050021), /* PORT33CR */</div><div class='add'>+	PORTCR(34,	0xe6050022), /* PORT34CR */</div><div class='add'>+	PORTCR(35,	0xe6050023), /* PORT35CR */</div><div class='add'>+	PORTCR(36,	0xe6050024), /* PORT36CR */</div><div class='add'>+	PORTCR(37,	0xe6050025), /* PORT37CR */</div><div class='add'>+	PORTCR(38,	0xe6050026), /* PORT38CR */</div><div class='add'>+	PORTCR(39,	0xe6050027), /* PORT39CR */</div><div class='add'>+	PORTCR(40,	0xe6050028), /* PORT40CR */</div><div class='add'>+	PORTCR(41,	0xe6050029), /* PORT41CR */</div><div class='add'>+	PORTCR(42,	0xe605002a), /* PORT42CR */</div><div class='add'>+	PORTCR(43,	0xe605002b), /* PORT43CR */</div><div class='add'>+	PORTCR(44,	0xe605002c), /* PORT44CR */</div><div class='add'>+	PORTCR(45,	0xe605002d), /* PORT45CR */</div><div class='add'>+	PORTCR(46,	0xe605002e), /* PORT46CR */</div><div class='add'>+	PORTCR(47,	0xe605002f), /* PORT47CR */</div><div class='add'>+	PORTCR(48,	0xe6050030), /* PORT48CR */</div><div class='add'>+	PORTCR(49,	0xe6050031), /* PORT49CR */</div><div class='add'>+	PORTCR(50,	0xe6050032), /* PORT50CR */</div><div class='add'>+	PORTCR(51,	0xe6050033), /* PORT51CR */</div><div class='add'>+	PORTCR(52,	0xe6050034), /* PORT52CR */</div><div class='add'>+	PORTCR(53,	0xe6050035), /* PORT53CR */</div><div class='add'>+	PORTCR(54,	0xe6050036), /* PORT54CR */</div><div class='add'>+	PORTCR(55,	0xe6050037), /* PORT55CR */</div><div class='add'>+	PORTCR(56,	0xe6050038), /* PORT56CR */</div><div class='add'>+	PORTCR(57,	0xe6050039), /* PORT57CR */</div><div class='add'>+	PORTCR(58,	0xe605003a), /* PORT58CR */</div><div class='add'>+	PORTCR(59,	0xe605003b), /* PORT59CR */</div><div class='add'>+	PORTCR(60,	0xe605003c), /* PORT60CR */</div><div class='add'>+	PORTCR(61,	0xe605003d), /* PORT61CR */</div><div class='add'>+	PORTCR(62,	0xe605003e), /* PORT62CR */</div><div class='add'>+	PORTCR(63,	0xe605003f), /* PORT63CR */</div><div class='add'>+	PORTCR(64,	0xe6050040), /* PORT64CR */</div><div class='add'>+	PORTCR(65,	0xe6050041), /* PORT65CR */</div><div class='add'>+	PORTCR(66,	0xe6050042), /* PORT66CR */</div><div class='add'>+	PORTCR(67,	0xe6050043), /* PORT67CR */</div><div class='add'>+	PORTCR(68,	0xe6050044), /* PORT68CR */</div><div class='add'>+	PORTCR(69,	0xe6050045), /* PORT69CR */</div><div class='add'>+	PORTCR(70,	0xe6050046), /* PORT70CR */</div><div class='add'>+	PORTCR(71,	0xe6050047), /* PORT71CR */</div><div class='add'>+	PORTCR(72,	0xe6050048), /* PORT72CR */</div><div class='add'>+	PORTCR(73,	0xe6050049), /* PORT73CR */</div><div class='add'>+	PORTCR(74,	0xe605004a), /* PORT74CR */</div><div class='add'>+	PORTCR(75,	0xe605004b), /* PORT75CR */</div><div class='add'>+	PORTCR(76,	0xe605004c), /* PORT76CR */</div><div class='add'>+	PORTCR(77,	0xe605004d), /* PORT77CR */</div><div class='add'>+	PORTCR(78,	0xe605004e), /* PORT78CR */</div><div class='add'>+	PORTCR(79,	0xe605004f), /* PORT79CR */</div><div class='add'>+	PORTCR(80,	0xe6050050), /* PORT80CR */</div><div class='add'>+	PORTCR(81,	0xe6050051), /* PORT81CR */</div><div class='add'>+	PORTCR(82,	0xe6050052), /* PORT82CR */</div><div class='add'>+	PORTCR(83,	0xe6050053), /* PORT83CR */</div><div class='add'>+</div><div class='add'>+	PORTCR(84,	0xe6051054), /* PORT84CR */</div><div class='add'>+	PORTCR(85,	0xe6051055), /* PORT85CR */</div><div class='add'>+	PORTCR(86,	0xe6051056), /* PORT86CR */</div><div class='add'>+	PORTCR(87,	0xe6051057), /* PORT87CR */</div><div class='add'>+	PORTCR(88,	0xe6051058), /* PORT88CR */</div><div class='add'>+	PORTCR(89,	0xe6051059), /* PORT89CR */</div><div class='add'>+	PORTCR(90,	0xe605105a), /* PORT90CR */</div><div class='add'>+	PORTCR(91,	0xe605105b), /* PORT91CR */</div><div class='add'>+	PORTCR(92,	0xe605105c), /* PORT92CR */</div><div class='add'>+	PORTCR(93,	0xe605105d), /* PORT93CR */</div><div class='add'>+	PORTCR(94,	0xe605105e), /* PORT94CR */</div><div class='add'>+	PORTCR(95,	0xe605105f), /* PORT95CR */</div><div class='add'>+	PORTCR(96,	0xe6051060), /* PORT96CR */</div><div class='add'>+	PORTCR(97,	0xe6051061), /* PORT97CR */</div><div class='add'>+	PORTCR(98,	0xe6051062), /* PORT98CR */</div><div class='add'>+	PORTCR(99,	0xe6051063), /* PORT99CR */</div><div class='add'>+	PORTCR(100,	0xe6051064), /* PORT100CR */</div><div class='add'>+	PORTCR(101,	0xe6051065), /* PORT101CR */</div><div class='add'>+	PORTCR(102,	0xe6051066), /* PORT102CR */</div><div class='add'>+	PORTCR(103,	0xe6051067), /* PORT103CR */</div><div class='add'>+	PORTCR(104,	0xe6051068), /* PORT104CR */</div><div class='add'>+	PORTCR(105,	0xe6051069), /* PORT105CR */</div><div class='add'>+	PORTCR(106,	0xe605106a), /* PORT106CR */</div><div class='add'>+	PORTCR(107,	0xe605106b), /* PORT107CR */</div><div class='add'>+	PORTCR(108,	0xe605106c), /* PORT108CR */</div><div class='add'>+	PORTCR(109,	0xe605106d), /* PORT109CR */</div><div class='add'>+	PORTCR(110,	0xe605106e), /* PORT110CR */</div><div class='add'>+	PORTCR(111,	0xe605106f), /* PORT111CR */</div><div class='add'>+	PORTCR(112,	0xe6051070), /* PORT112CR */</div><div class='add'>+	PORTCR(113,	0xe6051071), /* PORT113CR */</div><div class='add'>+	PORTCR(114,	0xe6051072), /* PORT114CR */</div><div class='add'>+</div><div class='add'>+	PORTCR(115,	0xe6052073), /* PORT115CR */</div><div class='add'>+	PORTCR(116,	0xe6052074), /* PORT116CR */</div><div class='add'>+	PORTCR(117,	0xe6052075), /* PORT117CR */</div><div class='add'>+	PORTCR(118,	0xe6052076), /* PORT118CR */</div><div class='add'>+	PORTCR(119,	0xe6052077), /* PORT119CR */</div><div class='add'>+	PORTCR(120,	0xe6052078), /* PORT120CR */</div><div class='add'>+	PORTCR(121,	0xe6052079), /* PORT121CR */</div><div class='add'>+	PORTCR(122,	0xe605207a), /* PORT122CR */</div><div class='add'>+	PORTCR(123,	0xe605207b), /* PORT123CR */</div><div class='add'>+	PORTCR(124,	0xe605207c), /* PORT124CR */</div><div class='add'>+	PORTCR(125,	0xe605207d), /* PORT125CR */</div><div class='add'>+	PORTCR(126,	0xe605207e), /* PORT126CR */</div><div class='add'>+	PORTCR(127,	0xe605207f), /* PORT127CR */</div><div class='add'>+	PORTCR(128,	0xe6052080), /* PORT128CR */</div><div class='add'>+	PORTCR(129,	0xe6052081), /* PORT129CR */</div><div class='add'>+	PORTCR(130,	0xe6052082), /* PORT130CR */</div><div class='add'>+	PORTCR(131,	0xe6052083), /* PORT131CR */</div><div class='add'>+	PORTCR(132,	0xe6052084), /* PORT132CR */</div><div class='add'>+	PORTCR(133,	0xe6052085), /* PORT133CR */</div><div class='add'>+	PORTCR(134,	0xe6052086), /* PORT134CR */</div><div class='add'>+	PORTCR(135,	0xe6052087), /* PORT135CR */</div><div class='add'>+	PORTCR(136,	0xe6052088), /* PORT136CR */</div><div class='add'>+	PORTCR(137,	0xe6052089), /* PORT137CR */</div><div class='add'>+	PORTCR(138,	0xe605208a), /* PORT138CR */</div><div class='add'>+	PORTCR(139,	0xe605208b), /* PORT139CR */</div><div class='add'>+	PORTCR(140,	0xe605208c), /* PORT140CR */</div><div class='add'>+	PORTCR(141,	0xe605208d), /* PORT141CR */</div><div class='add'>+	PORTCR(142,	0xe605208e), /* PORT142CR */</div><div class='add'>+	PORTCR(143,	0xe605208f), /* PORT143CR */</div><div class='add'>+	PORTCR(144,	0xe6052090), /* PORT144CR */</div><div class='add'>+	PORTCR(145,	0xe6052091), /* PORT145CR */</div><div class='add'>+	PORTCR(146,	0xe6052092), /* PORT146CR */</div><div class='add'>+	PORTCR(147,	0xe6052093), /* PORT147CR */</div><div class='add'>+	PORTCR(148,	0xe6052094), /* PORT148CR */</div><div class='add'>+	PORTCR(149,	0xe6052095), /* PORT149CR */</div><div class='add'>+	PORTCR(150,	0xe6052096), /* PORT150CR */</div><div class='add'>+	PORTCR(151,	0xe6052097), /* PORT151CR */</div><div class='add'>+	PORTCR(152,	0xe6052098), /* PORT152CR */</div><div class='add'>+	PORTCR(153,	0xe6052099), /* PORT153CR */</div><div class='add'>+	PORTCR(154,	0xe605209a), /* PORT154CR */</div><div class='add'>+	PORTCR(155,	0xe605209b), /* PORT155CR */</div><div class='add'>+	PORTCR(156,	0xe605209c), /* PORT156CR */</div><div class='add'>+	PORTCR(157,	0xe605209d), /* PORT157CR */</div><div class='add'>+	PORTCR(158,	0xe605209e), /* PORT158CR */</div><div class='add'>+	PORTCR(159,	0xe605209f), /* PORT159CR */</div><div class='add'>+	PORTCR(160,	0xe60520a0), /* PORT160CR */</div><div class='add'>+	PORTCR(161,	0xe60520a1), /* PORT161CR */</div><div class='add'>+	PORTCR(162,	0xe60520a2), /* PORT162CR */</div><div class='add'>+	PORTCR(163,	0xe60520a3), /* PORT163CR */</div><div class='add'>+	PORTCR(164,	0xe60520a4), /* PORT164CR */</div><div class='add'>+	PORTCR(165,	0xe60520a5), /* PORT165CR */</div><div class='add'>+	PORTCR(166,	0xe60520a6), /* PORT166CR */</div><div class='add'>+	PORTCR(167,	0xe60520a7), /* PORT167CR */</div><div class='add'>+	PORTCR(168,	0xe60520a8), /* PORT168CR */</div><div class='add'>+	PORTCR(169,	0xe60520a9), /* PORT169CR */</div><div class='add'>+	PORTCR(170,	0xe60520aa), /* PORT170CR */</div><div class='add'>+	PORTCR(171,	0xe60520ab), /* PORT171CR */</div><div class='add'>+	PORTCR(172,	0xe60520ac), /* PORT172CR */</div><div class='add'>+	PORTCR(173,	0xe60520ad), /* PORT173CR */</div><div class='add'>+	PORTCR(174,	0xe60520ae), /* PORT174CR */</div><div class='add'>+	PORTCR(175,	0xe60520af), /* PORT175CR */</div><div class='add'>+	PORTCR(176,	0xe60520b0), /* PORT176CR */</div><div class='add'>+	PORTCR(177,	0xe60520b1), /* PORT177CR */</div><div class='add'>+	PORTCR(178,	0xe60520b2), /* PORT178CR */</div><div class='add'>+	PORTCR(179,	0xe60520b3), /* PORT179CR */</div><div class='add'>+	PORTCR(180,	0xe60520b4), /* PORT180CR */</div><div class='add'>+	PORTCR(181,	0xe60520b5), /* PORT181CR */</div><div class='add'>+	PORTCR(182,	0xe60520b6), /* PORT182CR */</div><div class='add'>+	PORTCR(183,	0xe60520b7), /* PORT183CR */</div><div class='add'>+	PORTCR(184,	0xe60520b8), /* PORT184CR */</div><div class='add'>+	PORTCR(185,	0xe60520b9), /* PORT185CR */</div><div class='add'>+	PORTCR(186,	0xe60520ba), /* PORT186CR */</div><div class='add'>+	PORTCR(187,	0xe60520bb), /* PORT187CR */</div><div class='add'>+	PORTCR(188,	0xe60520bc), /* PORT188CR */</div><div class='add'>+	PORTCR(189,	0xe60520bd), /* PORT189CR */</div><div class='add'>+	PORTCR(190,	0xe60520be), /* PORT190CR */</div><div class='add'>+	PORTCR(191,	0xe60520bf), /* PORT191CR */</div><div class='add'>+	PORTCR(192,	0xe60520c0), /* PORT192CR */</div><div class='add'>+	PORTCR(193,	0xe60520c1), /* PORT193CR */</div><div class='add'>+	PORTCR(194,	0xe60520c2), /* PORT194CR */</div><div class='add'>+	PORTCR(195,	0xe60520c3), /* PORT195CR */</div><div class='add'>+	PORTCR(196,	0xe60520c4), /* PORT196CR */</div><div class='add'>+	PORTCR(197,	0xe60520c5), /* PORT197CR */</div><div class='add'>+	PORTCR(198,	0xe60520c6), /* PORT198CR */</div><div class='add'>+	PORTCR(199,	0xe60520c7), /* PORT199CR */</div><div class='add'>+	PORTCR(200,	0xe60520c8), /* PORT200CR */</div><div class='add'>+	PORTCR(201,	0xe60520c9), /* PORT201CR */</div><div class='add'>+	PORTCR(202,	0xe60520ca), /* PORT202CR */</div><div class='add'>+	PORTCR(203,	0xe60520cb), /* PORT203CR */</div><div class='add'>+	PORTCR(204,	0xe60520cc), /* PORT204CR */</div><div class='add'>+	PORTCR(205,	0xe60520cd), /* PORT205CR */</div><div class='add'>+	PORTCR(206,	0xe60520ce), /* PORT206CR */</div><div class='add'>+	PORTCR(207,	0xe60520cf), /* PORT207CR */</div><div class='add'>+	PORTCR(208,	0xe60520d0), /* PORT208CR */</div><div class='add'>+	PORTCR(209,	0xe60520d1), /* PORT209CR */</div><div class='add'>+</div><div class='add'>+	PORTCR(210,	0xe60530d2), /* PORT210CR */</div><div class='add'>+	PORTCR(211,	0xe60530d3), /* PORT211CR */</div><div class='add'>+</div><div class='add'>+	{ PINMUX_CFG_REG("MSEL1CR", 0xe605800c, 32, 1) {</div><div class='add'>+			MSEL1CR_31_0,	MSEL1CR_31_1,</div><div class='add'>+			MSEL1CR_30_0,	MSEL1CR_30_1,</div><div class='add'>+			MSEL1CR_29_0,	MSEL1CR_29_1,</div><div class='add'>+			MSEL1CR_28_0,	MSEL1CR_28_1,</div><div class='add'>+			MSEL1CR_27_0,	MSEL1CR_27_1,</div><div class='add'>+			MSEL1CR_26_0,	MSEL1CR_26_1,</div><div class='add'>+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+			MSEL1CR_16_0,	MSEL1CR_16_1,</div><div class='add'>+			MSEL1CR_15_0,	MSEL1CR_15_1,</div><div class='add'>+			MSEL1CR_14_0,	MSEL1CR_14_1,</div><div class='add'>+			MSEL1CR_13_0,	MSEL1CR_13_1,</div><div class='add'>+			MSEL1CR_12_0,	MSEL1CR_12_1,</div><div class='add'>+			0, 0, 0, 0,</div><div class='add'>+			MSEL1CR_9_0,	MSEL1CR_9_1,</div><div class='add'>+			0, 0,</div><div class='add'>+			MSEL1CR_7_0,	MSEL1CR_7_1,</div><div class='add'>+			MSEL1CR_6_0,	MSEL1CR_6_1,</div><div class='add'>+			MSEL1CR_5_0,	MSEL1CR_5_1,</div><div class='add'>+			MSEL1CR_4_0,	MSEL1CR_4_1,</div><div class='add'>+			MSEL1CR_3_0,	MSEL1CR_3_1,</div><div class='add'>+			MSEL1CR_2_0,	MSEL1CR_2_1,</div><div class='add'>+			0, 0,</div><div class='add'>+			MSEL1CR_0_0,	MSEL1CR_0_1,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG("MSEL3CR", 0xE6058020, 32, 1) {</div><div class='add'>+			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+			MSEL3CR_15_0,	MSEL3CR_15_1,</div><div class='add'>+			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+			MSEL3CR_6_0,	MSEL3CR_6_1,</div><div class='add'>+			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+			0, 0, 0, 0,</div><div class='add'>+			}</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG("MSEL4CR", 0xE6058024, 32, 1) {</div><div class='add'>+			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+			MSEL4CR_19_0,	MSEL4CR_19_1,</div><div class='add'>+			MSEL4CR_18_0,	MSEL4CR_18_1,</div><div class='add'>+			0, 0, 0, 0,</div><div class='add'>+			MSEL4CR_15_0,	MSEL4CR_15_1,</div><div class='add'>+			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+			MSEL4CR_10_0,	MSEL4CR_10_1,</div><div class='add'>+			0, 0, 0, 0, 0, 0,</div><div class='add'>+			MSEL4CR_6_0,	MSEL4CR_6_1,</div><div class='add'>+			0, 0,</div><div class='add'>+			MSEL4CR_4_0,	MSEL4CR_4_1,</div><div class='add'>+			0, 0, 0, 0,</div><div class='add'>+			MSEL4CR_1_0,	MSEL4CR_1_1,</div><div class='add'>+			0, 0,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG("MSEL5CR", 0xE6058028, 32, 1) {</div><div class='add'>+			MSEL5CR_31_0,	MSEL5CR_31_1,</div><div class='add'>+			MSEL5CR_30_0,	MSEL5CR_30_1,</div><div class='add'>+			MSEL5CR_29_0,	MSEL5CR_29_1,</div><div class='add'>+			0, 0,</div><div class='add'>+			MSEL5CR_27_0,	MSEL5CR_27_1,</div><div class='add'>+			0, 0,</div><div class='add'>+			MSEL5CR_25_0,	MSEL5CR_25_1,</div><div class='add'>+			0, 0,</div><div class='add'>+			MSEL5CR_23_0,	MSEL5CR_23_1,</div><div class='add'>+			0, 0,</div><div class='add'>+			MSEL5CR_21_0,	MSEL5CR_21_1,</div><div class='add'>+			0, 0,</div><div class='add'>+			MSEL5CR_19_0,	MSEL5CR_19_1,</div><div class='add'>+			0, 0,</div><div class='add'>+			MSEL5CR_17_0,	MSEL5CR_17_1,</div><div class='add'>+			0, 0,</div><div class='add'>+			MSEL5CR_15_0,	MSEL5CR_15_1,</div><div class='add'>+			MSEL5CR_14_0,	MSEL5CR_14_1,</div><div class='add'>+			MSEL5CR_13_0,	MSEL5CR_13_1,</div><div class='add'>+			MSEL5CR_12_0,	MSEL5CR_12_1,</div><div class='add'>+			MSEL5CR_11_0,	MSEL5CR_11_1,</div><div class='add'>+			MSEL5CR_10_0,	MSEL5CR_10_1,</div><div class='add'>+			0, 0,</div><div class='add'>+			MSEL5CR_8_0,	MSEL5CR_8_1,</div><div class='add'>+			MSEL5CR_7_0,	MSEL5CR_7_1,</div><div class='add'>+			MSEL5CR_6_0,	MSEL5CR_6_1,</div><div class='add'>+			MSEL5CR_5_0,	MSEL5CR_5_1,</div><div class='add'>+			MSEL5CR_4_0,	MSEL5CR_4_1,</div><div class='add'>+			MSEL5CR_3_0,	MSEL5CR_3_1,</div><div class='add'>+			MSEL5CR_2_0,	MSEL5CR_2_1,</div><div class='add'>+			0, 0,</div><div class='add'>+			MSEL5CR_0_0,	MSEL5CR_0_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'>+static struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='add'>+	{ PINMUX_DATA_REG("PORTL031_000DR", 0xe6054800, 32) {</div><div class='add'>+		PORT31_DATA,	PORT30_DATA,	PORT29_DATA,	PORT28_DATA,</div><div class='add'>+		PORT27_DATA,	PORT26_DATA,	PORT25_DATA,	PORT24_DATA,</div><div class='add'>+		PORT23_DATA,	PORT22_DATA,	PORT21_DATA,	PORT20_DATA,</div><div class='add'>+		PORT19_DATA,	PORT18_DATA,	PORT17_DATA,	PORT16_DATA,</div><div class='add'>+		PORT15_DATA,	PORT14_DATA,	PORT13_DATA,	PORT12_DATA,</div><div class='add'>+		PORT11_DATA,	PORT10_DATA,	PORT9_DATA,	PORT8_DATA,</div><div class='add'>+		PORT7_DATA,	PORT6_DATA,	PORT5_DATA,	PORT4_DATA,</div><div class='add'>+		PORT3_DATA,	PORT2_DATA,	PORT1_DATA,	PORT0_DATA }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_DATA_REG("PORTL063_032DR", 0xe6054804, 32) {</div><div class='add'>+		PORT63_DATA,	PORT62_DATA,	PORT61_DATA,	PORT60_DATA,</div><div class='add'>+		PORT59_DATA,	PORT58_DATA,	PORT57_DATA,	PORT56_DATA,</div><div class='add'>+		PORT55_DATA,	PORT54_DATA,	PORT53_DATA,	PORT52_DATA,</div><div class='add'>+		PORT51_DATA,	PORT50_DATA,	PORT49_DATA,	PORT48_DATA,</div><div class='add'>+		PORT47_DATA,	PORT46_DATA,	PORT45_DATA,	PORT44_DATA,</div><div class='add'>+		PORT43_DATA,	PORT42_DATA,	PORT41_DATA,	PORT40_DATA,</div><div class='add'>+		PORT39_DATA,	PORT38_DATA,	PORT37_DATA,	PORT36_DATA,</div><div class='add'>+		PORT35_DATA,	PORT34_DATA,	PORT33_DATA,	PORT32_DATA }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_DATA_REG("PORTL095_064DR", 0xe6054808, 32) {</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		PORT83_DATA,	PORT82_DATA,	PORT81_DATA,	PORT80_DATA,</div><div class='add'>+		PORT79_DATA,	PORT78_DATA,	PORT77_DATA,	PORT76_DATA,</div><div class='add'>+		PORT75_DATA,	PORT74_DATA,	PORT73_DATA,	PORT72_DATA,</div><div class='add'>+		PORT71_DATA,	PORT70_DATA,	PORT69_DATA,	PORT68_DATA,</div><div class='add'>+		PORT67_DATA,	PORT66_DATA,	PORT65_DATA,	PORT64_DATA }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_DATA_REG("PORTD095_064DR", 0xe6055808, 32) {</div><div class='add'>+		PORT95_DATA,	PORT94_DATA,	PORT93_DATA,	PORT92_DATA,</div><div class='add'>+		PORT91_DATA,	PORT90_DATA,	PORT89_DATA,	PORT88_DATA,</div><div class='add'>+		PORT87_DATA,	PORT86_DATA,	PORT85_DATA,	PORT84_DATA,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_DATA_REG("PORTD127_096DR", 0xe605580c, 32) {</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0,		PORT114_DATA,	PORT113_DATA,	PORT112_DATA,</div><div class='add'>+		PORT111_DATA,	PORT110_DATA,	PORT109_DATA,	PORT108_DATA,</div><div class='add'>+		PORT107_DATA,	PORT106_DATA,	PORT105_DATA,	PORT104_DATA,</div><div class='add'>+		PORT103_DATA,	PORT102_DATA,	PORT101_DATA,	PORT100_DATA,</div><div class='add'>+		PORT99_DATA,	PORT98_DATA,	PORT97_DATA,	PORT96_DATA }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_DATA_REG("PORTR127_096DR", 0xe605680C, 32) {</div><div class='add'>+		PORT127_DATA,	PORT126_DATA,	PORT125_DATA,	PORT124_DATA,</div><div class='add'>+		PORT123_DATA,	PORT122_DATA,	PORT121_DATA,	PORT120_DATA,</div><div class='add'>+		PORT119_DATA,	PORT118_DATA,	PORT117_DATA,	PORT116_DATA,</div><div class='add'>+		PORT115_DATA,	0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_DATA_REG("PORTR159_128DR", 0xe6056810, 32) {</div><div class='add'>+		PORT159_DATA,	PORT158_DATA,	PORT157_DATA,	PORT156_DATA,</div><div class='add'>+		PORT155_DATA,	PORT154_DATA,	PORT153_DATA,	PORT152_DATA,</div><div class='add'>+		PORT151_DATA,	PORT150_DATA,	PORT149_DATA,	PORT148_DATA,</div><div class='add'>+		PORT147_DATA,	PORT146_DATA,	PORT145_DATA,	PORT144_DATA,</div><div class='add'>+		PORT143_DATA,	PORT142_DATA,	PORT141_DATA,	PORT140_DATA,</div><div class='add'>+		PORT139_DATA,	PORT138_DATA,	PORT137_DATA,	PORT136_DATA,</div><div class='add'>+		PORT135_DATA,	PORT134_DATA,	PORT133_DATA,	PORT132_DATA,</div><div class='add'>+		PORT131_DATA,	PORT130_DATA,	PORT129_DATA,	PORT128_DATA }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_DATA_REG("PORTR191_160DR", 0xe6056814, 32) {</div><div class='add'>+		PORT191_DATA,	PORT190_DATA,	PORT189_DATA,	PORT188_DATA,</div><div class='add'>+		PORT187_DATA,	PORT186_DATA,	PORT185_DATA,	PORT184_DATA,</div><div class='add'>+		PORT183_DATA,	PORT182_DATA,	PORT181_DATA,	PORT180_DATA,</div><div class='add'>+		PORT179_DATA,	PORT178_DATA,	PORT177_DATA,	PORT176_DATA,</div><div class='add'>+		PORT175_DATA,	PORT174_DATA,	PORT173_DATA,	PORT172_DATA,</div><div class='add'>+		PORT171_DATA,	PORT170_DATA,	PORT169_DATA,	PORT168_DATA,</div><div class='add'>+		PORT167_DATA,	PORT166_DATA,	PORT165_DATA,	PORT164_DATA,</div><div class='add'>+		PORT163_DATA,	PORT162_DATA,	PORT161_DATA,	PORT160_DATA }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_DATA_REG("PORTR223_192DR", 0xe6056818, 32) {</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0,				PORT209_DATA,	PORT208_DATA,</div><div class='add'>+		PORT207_DATA,	PORT206_DATA,	PORT205_DATA,	PORT204_DATA,</div><div class='add'>+		PORT203_DATA,	PORT202_DATA,	PORT201_DATA,	PORT200_DATA,</div><div class='add'>+		PORT199_DATA,	PORT198_DATA,	PORT197_DATA,	PORT196_DATA,</div><div class='add'>+		PORT195_DATA,	PORT194_DATA,	PORT193_DATA,	PORT192_DATA }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_DATA_REG("PORTU223_192DR", 0xe6057818, 32) {</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		PORT211_DATA,	PORT210_DATA, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0 }</div><div class='add'>+	},</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pinmux_info r8a7740_pinmux_info = {</div><div class='add'>+	.name		= "r8a7740_pfc",</div><div class='add'>+	.reserved_id	= PINMUX_RESERVED,</div><div class='add'>+	.data		= { PINMUX_DATA_BEGIN,</div><div class='add'>+			    PINMUX_DATA_END },</div><div class='add'>+	.input		= { PINMUX_INPUT_BEGIN,</div><div class='add'>+			    PINMUX_INPUT_END },</div><div class='add'>+	.input_pu	= { PINMUX_INPUT_PULLUP_BEGIN,</div><div class='add'>+			    PINMUX_INPUT_PULLUP_END },</div><div class='add'>+	.input_pd	= { PINMUX_INPUT_PULLDOWN_BEGIN,</div><div class='add'>+			    PINMUX_INPUT_PULLDOWN_END },</div><div class='add'>+	.output		= { PINMUX_OUTPUT_BEGIN,</div><div class='add'>+			    PINMUX_OUTPUT_END },</div><div class='add'>+	.mark		= { PINMUX_MARK_BEGIN,</div><div class='add'>+			    PINMUX_MARK_END },</div><div class='add'>+	.function	= { PINMUX_FUNCTION_BEGIN,</div><div class='add'>+			    PINMUX_FUNCTION_END },</div><div class='add'>+</div><div class='add'>+	.first_gpio	= GPIO_PORT0,</div><div class='add'>+	.last_gpio	= GPIO_FN_TRACEAUD_FROM_MEMC,</div><div class='add'>+</div><div class='add'>+	.gpios		= pinmux_gpios,</div><div class='add'>+	.cfg_regs	= pinmux_config_regs,</div><div class='add'>+	.data_regs	= pinmux_data_regs,</div><div class='add'>+</div><div class='add'>+	.gpio_data	= pinmux_data,</div><div class='add'>+	.gpio_data_size	= ARRAY_SIZE(pinmux_data),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void r8a7740_pinmux_init(void)</div><div class='add'>+{</div><div class='add'>+	register_pinmux(&amp;r8a7740_pinmux_info);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-shmobile/pfc-r8a7779.c b/arch/arm/mach-shmobile/pfc-r8a7779.c<br/>new file mode 100644<br/>index 000000000000..963532f2b2c4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/pfc-r8a7779.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/pfc-r8a7779.c</a></div><div class='hunk'>@@ -0,0 +1,2645 @@</div><div class='add'>+/*</div><div class='add'>+ * r8a7779 processor support - PFC hardware block</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011  Renesas Solutions Corp.</div><div class='add'>+ * Copyright (C) 2011  Magnus Damm</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; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='add'>+ */</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/gpio.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;mach/r8a7779.h&gt;</div><div class='add'>+</div><div class='add'>+#define CPU_32_PORT(fn, pfx, sfx)				\</div><div class='add'>+	PORT_10(fn, pfx, sfx), PORT_10(fn, pfx##1, sfx),	\</div><div class='add'>+	PORT_10(fn, pfx##2, sfx), PORT_1(fn, pfx##30, sfx),	\</div><div class='add'>+	PORT_1(fn, pfx##31, sfx)</div><div class='add'>+</div><div class='add'>+#define CPU_32_PORT6(fn, pfx, sfx)				\</div><div class='add'>+	PORT_1(fn, pfx##0, sfx), PORT_1(fn, pfx##1, sfx),	\</div><div class='add'>+	PORT_1(fn, pfx##2, sfx), PORT_1(fn, pfx##3, sfx),	\</div><div class='add'>+	PORT_1(fn, pfx##4, sfx), PORT_1(fn, pfx##5, sfx),	\</div><div class='add'>+	PORT_1(fn, pfx##6, sfx), PORT_1(fn, pfx##7, sfx),	\</div><div class='add'>+	PORT_1(fn, pfx##8, sfx)</div><div class='add'>+</div><div class='add'>+#define CPU_ALL_PORT(fn, pfx, sfx)				\</div><div class='add'>+	CPU_32_PORT(fn, pfx##_0_, sfx),				\</div><div class='add'>+	CPU_32_PORT(fn, pfx##_1_, sfx),				\</div><div class='add'>+	CPU_32_PORT(fn, pfx##_2_, sfx),				\</div><div class='add'>+	CPU_32_PORT(fn, pfx##_3_, sfx),				\</div><div class='add'>+	CPU_32_PORT(fn, pfx##_4_, sfx),				\</div><div class='add'>+	CPU_32_PORT(fn, pfx##_5_, sfx),				\</div><div class='add'>+	CPU_32_PORT6(fn, pfx##_6_, sfx)</div><div class='add'>+</div><div class='add'>+#define _GP_GPIO(pfx, sfx) PINMUX_GPIO(GPIO_GP##pfx, GP##pfx##_DATA)</div><div class='add'>+#define _GP_DATA(pfx, sfx) PINMUX_DATA(GP##pfx##_DATA, GP##pfx##_FN,	\</div><div class='add'>+				       GP##pfx##_IN, GP##pfx##_OUT)</div><div class='add'>+</div><div class='add'>+#define _GP_INOUTSEL(pfx, sfx) GP##pfx##_IN, GP##pfx##_OUT</div><div class='add'>+#define _GP_INDT(pfx, sfx) GP##pfx##_DATA</div><div class='add'>+</div><div class='add'>+#define GP_ALL(str)	CPU_ALL_PORT(_PORT_ALL, GP, str)</div><div class='add'>+#define PINMUX_GPIO_GP_ALL()	CPU_ALL_PORT(_GP_GPIO, , unused)</div><div class='add'>+#define PINMUX_DATA_GP_ALL()	CPU_ALL_PORT(_GP_DATA, , unused)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define PORT_10_REV(fn, pfx, sfx)				\</div><div class='add'>+	PORT_1(fn, pfx##9, sfx), PORT_1(fn, pfx##8, sfx),	\</div><div class='add'>+	PORT_1(fn, pfx##7, sfx), PORT_1(fn, pfx##6, sfx),	\</div><div class='add'>+	PORT_1(fn, pfx##5, sfx), PORT_1(fn, pfx##4, sfx),	\</div><div class='add'>+	PORT_1(fn, pfx##3, sfx), PORT_1(fn, pfx##2, sfx),	\</div><div class='add'>+	PORT_1(fn, pfx##1, sfx), PORT_1(fn, pfx##0, sfx)</div><div class='add'>+</div><div class='add'>+#define CPU_32_PORT_REV(fn, pfx, sfx)					\</div><div class='add'>+	PORT_1(fn, pfx##31, sfx), PORT_1(fn, pfx##30, sfx),		\</div><div class='add'>+	PORT_10_REV(fn, pfx##2, sfx), PORT_10_REV(fn, pfx##1, sfx),	\</div><div class='add'>+	PORT_10_REV(fn, pfx, sfx)</div><div class='add'>+</div><div class='add'>+#define GP_INOUTSEL(bank) CPU_32_PORT_REV(_GP_INOUTSEL, _##bank##_, unused)</div><div class='add'>+#define GP_INDT(bank) CPU_32_PORT_REV(_GP_INDT, _##bank##_, unused)</div><div class='add'>+</div><div class='add'>+#define PINMUX_IPSR_DATA(ipsr, fn) PINMUX_DATA(fn##_MARK, FN_##ipsr, FN_##fn)</div><div class='add'>+#define PINMUX_IPSR_MODSEL_DATA(ipsr, fn, ms) PINMUX_DATA(fn##_MARK, FN_##ms, \</div><div class='add'>+							  FN_##ipsr, FN_##fn)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	PINMUX_RESERVED = 0,</div><div class='add'>+</div><div class='add'>+	PINMUX_DATA_BEGIN,</div><div class='add'>+	GP_ALL(DATA), /* GP_0_0_DATA -&gt; GP_6_8_DATA */</div><div class='add'>+	PINMUX_DATA_END,</div><div class='add'>+</div><div class='add'>+	PINMUX_INPUT_BEGIN,</div><div class='add'>+	GP_ALL(IN), /* GP_0_0_IN -&gt; GP_6_8_IN */</div><div class='add'>+	PINMUX_INPUT_END,</div><div class='add'>+</div><div class='add'>+	PINMUX_OUTPUT_BEGIN,</div><div class='add'>+	GP_ALL(OUT), /* GP_0_0_OUT -&gt; GP_6_8_OUT */</div><div class='add'>+	PINMUX_OUTPUT_END,</div><div class='add'>+</div><div class='add'>+	PINMUX_FUNCTION_BEGIN,</div><div class='add'>+	GP_ALL(FN), /* GP_0_0_FN -&gt; GP_6_8_FN */</div><div class='add'>+</div><div class='add'>+	/* GPSR0 */</div><div class='add'>+	FN_AVS1, FN_AVS2, FN_IP0_7_6, FN_A17,</div><div class='add'>+	FN_A18, FN_A19, FN_IP0_9_8, FN_IP0_11_10,</div><div class='add'>+	FN_IP0_13_12, FN_IP0_15_14, FN_IP0_18_16, FN_IP0_22_19,</div><div class='add'>+	FN_IP0_24_23, FN_IP0_25, FN_IP0_27_26, FN_IP1_1_0,</div><div class='add'>+	FN_IP1_3_2, FN_IP1_6_4, FN_IP1_10_7, FN_IP1_14_11,</div><div class='add'>+	FN_IP1_18_15, FN_IP0_5_3, FN_IP0_30_28, FN_IP2_18_16,</div><div class='add'>+	FN_IP2_21_19, FN_IP2_30_28, FN_IP3_2_0, FN_IP3_11_9,</div><div class='add'>+	FN_IP3_14_12, FN_IP3_22_21, FN_IP3_26_24, FN_IP3_31_29,</div><div class='add'>+</div><div class='add'>+	/* GPSR1 */</div><div class='add'>+	FN_IP4_1_0, FN_IP4_4_2, FN_IP4_7_5, FN_IP4_10_8,</div><div class='add'>+	FN_IP4_11, FN_IP4_12, FN_IP4_13, FN_IP4_14,</div><div class='add'>+	FN_IP4_15, FN_IP4_16, FN_IP4_19_17, FN_IP4_22_20,</div><div class='add'>+	FN_IP4_23, FN_IP4_24, FN_IP4_25, FN_IP4_26,</div><div class='add'>+	FN_IP4_27, FN_IP4_28, FN_IP4_31_29, FN_IP5_2_0,</div><div class='add'>+	FN_IP5_3, FN_IP5_4, FN_IP5_5, FN_IP5_6,</div><div class='add'>+	FN_IP5_7, FN_IP5_8, FN_IP5_10_9, FN_IP5_12_11,</div><div class='add'>+	FN_IP5_14_13, FN_IP5_16_15, FN_IP5_20_17, FN_IP5_23_21,</div><div class='add'>+</div><div class='add'>+	/* GPSR2 */</div><div class='add'>+	FN_IP5_27_24, FN_IP8_20, FN_IP8_22_21, FN_IP8_24_23,</div><div class='add'>+	FN_IP8_27_25, FN_IP8_30_28, FN_IP9_1_0, FN_IP9_3_2,</div><div class='add'>+	FN_IP9_4, FN_IP9_5, FN_IP9_6, FN_IP9_7,</div><div class='add'>+	FN_IP9_9_8, FN_IP9_11_10, FN_IP9_13_12, FN_IP9_15_14,</div><div class='add'>+	FN_IP9_18_16, FN_IP9_21_19, FN_IP9_23_22, FN_IP9_25_24,</div><div class='add'>+	FN_IP9_27_26, FN_IP9_29_28, FN_IP10_2_0, FN_IP10_5_3,</div><div class='add'>+	FN_IP10_8_6, FN_IP10_11_9, FN_IP10_14_12, FN_IP10_17_15,</div><div class='add'>+	FN_IP10_20_18, FN_IP10_23_21, FN_IP10_25_24, FN_IP10_28_26,</div><div class='add'>+</div><div class='add'>+	/* GPSR3 */</div><div class='add'>+	FN_IP10_31_29, FN_IP11_2_0, FN_IP11_5_3, FN_IP11_8_6,</div><div class='add'>+	FN_IP11_11_9, FN_IP11_14_12, FN_IP11_17_15, FN_IP11_20_18,</div><div class='add'>+	FN_IP11_23_21, FN_IP11_26_24, FN_IP11_29_27, FN_IP12_2_0,</div><div class='add'>+	FN_IP12_5_3, FN_IP12_8_6, FN_IP12_11_9, FN_IP12_14_12,</div><div class='add'>+	FN_IP12_17_15, FN_IP7_16_15, FN_IP7_18_17, FN_IP7_28_27,</div><div class='add'>+	FN_IP7_30_29, FN_IP7_20_19, FN_IP7_22_21, FN_IP7_24_23,</div><div class='add'>+	FN_IP7_26_25, FN_IP1_20_19, FN_IP1_22_21, FN_IP1_24_23,</div><div class='add'>+	FN_IP5_28, FN_IP5_30_29, FN_IP6_1_0, FN_IP6_3_2,</div><div class='add'>+</div><div class='add'>+	/* GPSR4 */</div><div class='add'>+	FN_IP6_5_4, FN_IP6_7_6, FN_IP6_8, FN_IP6_11_9,</div><div class='add'>+	FN_IP6_14_12, FN_IP6_17_15, FN_IP6_19_18, FN_IP6_22_20,</div><div class='add'>+	FN_IP6_24_23, FN_IP6_26_25, FN_IP6_30_29, FN_IP7_1_0,</div><div class='add'>+	FN_IP7_3_2, FN_IP7_6_4, FN_IP7_9_7, FN_IP7_12_10,</div><div class='add'>+	FN_IP7_14_13, FN_IP2_7_4, FN_IP2_11_8, FN_IP2_15_12,</div><div class='add'>+	FN_IP1_28_25, FN_IP2_3_0, FN_IP8_3_0, FN_IP8_7_4,</div><div class='add'>+	FN_IP8_11_8, FN_IP8_15_12, FN_PENC0, FN_PENC1,</div><div class='add'>+	FN_IP0_2_0, FN_IP8_17_16, FN_IP8_18, FN_IP8_19,</div><div class='add'>+</div><div class='add'>+	/* GPSR5 */</div><div class='add'>+	FN_A1, FN_A2, FN_A3, FN_A4,</div><div class='add'>+	FN_A5, FN_A6, FN_A7, FN_A8,</div><div class='add'>+	FN_A9, FN_A10, FN_A11, FN_A12,</div><div class='add'>+	FN_A13, FN_A14, FN_A15, FN_A16,</div><div class='add'>+	FN_RD, FN_WE0, FN_WE1, FN_EX_WAIT0,</div><div class='add'>+	FN_IP3_23, FN_IP3_27, FN_IP3_28, FN_IP2_22,</div><div class='add'>+	FN_IP2_23, FN_IP2_24, FN_IP2_25, FN_IP2_26,</div><div class='add'>+	FN_IP2_27, FN_IP3_3, FN_IP3_4, FN_IP3_5,</div><div class='add'>+</div><div class='add'>+	/* GPSR6 */</div><div class='add'>+	FN_IP3_6, FN_IP3_7, FN_IP3_8, FN_IP3_15,</div><div class='add'>+	FN_IP3_16, FN_IP3_17, FN_IP3_18, FN_IP3_19,</div><div class='add'>+	FN_IP3_20,</div><div class='add'>+</div><div class='add'>+	/* IPSR0 */</div><div class='add'>+	FN_RD_WR, FN_FWE, FN_ATAG0, FN_VI1_R7,</div><div class='add'>+	FN_HRTS1, FN_RX4_C,</div><div class='add'>+	FN_CS1_A26, FN_HSPI_TX2, FN_SDSELF_B,</div><div class='add'>+	FN_CS0, FN_HSPI_CS2_B,</div><div class='add'>+	FN_CLKOUT, FN_TX3C_IRDA_TX_C, FN_PWM0_B,</div><div class='add'>+	FN_A25, FN_SD1_WP, FN_MMC0_D5, FN_FD5,</div><div class='add'>+	FN_HSPI_RX2, FN_VI1_R3, FN_TX5_B, FN_SSI_SDATA7_B,</div><div class='add'>+	FN_CTS0_B,</div><div class='add'>+	FN_A24, FN_SD1_CD, FN_MMC0_D4, FN_FD4,</div><div class='add'>+	FN_HSPI_CS2, FN_VI1_R2, FN_SSI_WS78_B,</div><div class='add'>+	FN_A23, FN_FCLE, FN_HSPI_CLK2, FN_VI1_R1,</div><div class='add'>+	FN_A22, FN_RX5_D, FN_HSPI_RX2_B, FN_VI1_R0,</div><div class='add'>+	FN_A21, FN_SCK5_D, FN_HSPI_CLK2_B,</div><div class='add'>+	FN_A20, FN_TX5_D, FN_HSPI_TX2_B,</div><div class='add'>+	FN_A0, FN_SD1_DAT3, FN_MMC0_D3, FN_FD3,</div><div class='add'>+	FN_BS, FN_SD1_DAT2, FN_MMC0_D2, FN_FD2,</div><div class='add'>+	FN_ATADIR0, FN_SDSELF, FN_HCTS1, FN_TX4_C,</div><div class='add'>+	FN_PENC2, FN_SCK0, FN_PWM1, FN_PWMFSW0,</div><div class='add'>+	FN_SCIF_CLK, FN_TCLK0_C,</div><div class='add'>+</div><div class='add'>+	/* IPSR1 */</div><div class='add'>+	FN_EX_CS0, FN_RX3_C_IRDA_RX_C, FN_MMC0_D6,</div><div class='add'>+	FN_FD6, FN_EX_CS1, FN_MMC0_D7, FN_FD7,</div><div class='add'>+	FN_EX_CS2, FN_SD1_CLK, FN_MMC0_CLK, FN_FALE,</div><div class='add'>+	FN_ATACS00, FN_EX_CS3, FN_SD1_CMD, FN_MMC0_CMD,</div><div class='add'>+	FN_FRE, FN_ATACS10, FN_VI1_R4, FN_RX5_B,</div><div class='add'>+	FN_HSCK1, FN_SSI_SDATA8_B, FN_RTS0_B_TANS_B, FN_SSI_SDATA9,</div><div class='add'>+	FN_EX_CS4, FN_SD1_DAT0, FN_MMC0_D0, FN_FD0,</div><div class='add'>+	FN_ATARD0, FN_VI1_R5, FN_SCK5_B, FN_HTX1,</div><div class='add'>+	FN_TX2_E, FN_TX0_B, FN_SSI_SCK9, FN_EX_CS5,</div><div class='add'>+	FN_SD1_DAT1, FN_MMC0_D1, FN_FD1, FN_ATAWR0,</div><div class='add'>+	FN_VI1_R6, FN_HRX1, FN_RX2_E, FN_RX0_B,</div><div class='add'>+	FN_SSI_WS9, FN_MLB_CLK, FN_PWM2, FN_SCK4,</div><div class='add'>+	FN_MLB_SIG, FN_PWM3, FN_TX4, FN_MLB_DAT,</div><div class='add'>+	FN_PWM4, FN_RX4, FN_HTX0, FN_TX1,</div><div class='add'>+	FN_SDATA, FN_CTS0_C, FN_SUB_TCK, FN_CC5_STATE2,</div><div class='add'>+	FN_CC5_STATE10, FN_CC5_STATE18, FN_CC5_STATE26, FN_CC5_STATE34,</div><div class='add'>+</div><div class='add'>+	/* IPSR2 */</div><div class='add'>+	FN_HRX0, FN_RX1, FN_SCKZ, FN_RTS0_C_TANS_C,</div><div class='add'>+	FN_SUB_TDI, FN_CC5_STATE3, FN_CC5_STATE11, FN_CC5_STATE19,</div><div class='add'>+	FN_CC5_STATE27, FN_CC5_STATE35, FN_HSCK0, FN_SCK1,</div><div class='add'>+	FN_MTS, FN_PWM5, FN_SCK0_C, FN_SSI_SDATA9_B,</div><div class='add'>+	FN_SUB_TDO, FN_CC5_STATE0, FN_CC5_STATE8, FN_CC5_STATE16,</div><div class='add'>+	FN_CC5_STATE24, FN_CC5_STATE32, FN_HCTS0, FN_CTS1,</div><div class='add'>+	FN_STM, FN_PWM0_D, FN_RX0_C, FN_SCIF_CLK_C,</div><div class='add'>+	FN_SUB_TRST, FN_TCLK1_B, FN_CC5_OSCOUT, FN_HRTS0,</div><div class='add'>+	FN_RTS1_TANS, FN_MDATA, FN_TX0_C, FN_SUB_TMS,</div><div class='add'>+	FN_CC5_STATE1, FN_CC5_STATE9, FN_CC5_STATE17, FN_CC5_STATE25,</div><div class='add'>+	FN_CC5_STATE33, FN_DU0_DR0, FN_LCDOUT0, FN_DREQ0,</div><div class='add'>+	FN_GPS_CLK_B, FN_AUDATA0, FN_TX5_C, FN_DU0_DR1,</div><div class='add'>+	FN_LCDOUT1, FN_DACK0, FN_DRACK0, FN_GPS_SIGN_B,</div><div class='add'>+	FN_AUDATA1, FN_RX5_C, FN_DU0_DR2, FN_LCDOUT2,</div><div class='add'>+	FN_DU0_DR3, FN_LCDOUT3, FN_DU0_DR4, FN_LCDOUT4,</div><div class='add'>+	FN_DU0_DR5, FN_LCDOUT5, FN_DU0_DR6, FN_LCDOUT6,</div><div class='add'>+	FN_DU0_DR7, FN_LCDOUT7, FN_DU0_DG0, FN_LCDOUT8,</div><div class='add'>+	FN_DREQ1, FN_SCL2, FN_AUDATA2,</div><div class='add'>+</div><div class='add'>+	/* IPSR3 */</div><div class='add'>+	FN_DU0_DG1, FN_LCDOUT9, FN_DACK1, FN_SDA2,</div><div class='add'>+	FN_AUDATA3, FN_DU0_DG2, FN_LCDOUT10, FN_DU0_DG3,</div><div class='add'>+	FN_LCDOUT11, FN_DU0_DG4, FN_LCDOUT12, FN_DU0_DG5,</div><div class='add'>+	FN_LCDOUT13, FN_DU0_DG6, FN_LCDOUT14, FN_DU0_DG7,</div><div class='add'>+	FN_LCDOUT15, FN_DU0_DB0, FN_LCDOUT16, FN_EX_WAIT1,</div><div class='add'>+	FN_SCL1, FN_TCLK1, FN_AUDATA4, FN_DU0_DB1,</div><div class='add'>+	FN_LCDOUT17, FN_EX_WAIT2, FN_SDA1, FN_GPS_MAG_B,</div><div class='add'>+	FN_AUDATA5, FN_SCK5_C, FN_DU0_DB2, FN_LCDOUT18,</div><div class='add'>+	FN_DU0_DB3, FN_LCDOUT19, FN_DU0_DB4, FN_LCDOUT20,</div><div class='add'>+	FN_DU0_DB5, FN_LCDOUT21, FN_DU0_DB6, FN_LCDOUT22,</div><div class='add'>+	FN_DU0_DB7, FN_LCDOUT23, FN_DU0_DOTCLKIN, FN_QSTVA_QVS,</div><div class='add'>+	FN_TX3_D_IRDA_TX_D, FN_SCL3_B, FN_DU0_DOTCLKOUT0, FN_QCLK,</div><div class='add'>+	FN_DU0_DOTCLKOUT1, FN_QSTVB_QVE, FN_RX3_D_IRDA_RX_D, FN_SDA3_B,</div><div class='add'>+	FN_SDA2_C, FN_DACK0_B, FN_DRACK0_B, FN_DU0_EXHSYNC_DU0_HSYNC,</div><div class='add'>+	FN_QSTH_QHS, FN_DU0_EXVSYNC_DU0_VSYNC, FN_QSTB_QHE,</div><div class='add'>+	FN_DU0_EXODDF_DU0_ODDF_DISP_CDE, FN_QCPV_QDE, FN_CAN1_TX,</div><div class='add'>+	FN_TX2_C, FN_SCL2_C, FN_REMOCON,</div><div class='add'>+</div><div class='add'>+	/* IPSR4 */</div><div class='add'>+	FN_DU0_DISP, FN_QPOLA, FN_CAN_CLK_C, FN_SCK2_C,</div><div class='add'>+	FN_DU0_CDE, FN_QPOLB, FN_CAN1_RX, FN_RX2_C,</div><div class='add'>+	FN_DREQ0_B, FN_SSI_SCK78_B, FN_SCK0_B, FN_DU1_DR0,</div><div class='add'>+	FN_VI2_DATA0_VI2_B0, FN_PWM6, FN_SD3_CLK, FN_TX3_E_IRDA_TX_E,</div><div class='add'>+	FN_AUDCK, FN_PWMFSW0_B, FN_DU1_DR1, FN_VI2_DATA1_VI2_B1,</div><div class='add'>+	FN_PWM0, FN_SD3_CMD, FN_RX3_E_IRDA_RX_E, FN_AUDSYNC,</div><div class='add'>+	FN_CTS0_D, FN_DU1_DR2, FN_VI2_G0, FN_DU1_DR3,</div><div class='add'>+	FN_VI2_G1, FN_DU1_DR4, FN_VI2_G2, FN_DU1_DR5,</div><div class='add'>+	FN_VI2_G3, FN_DU1_DR6, FN_VI2_G4, FN_DU1_DR7,</div><div class='add'>+	FN_VI2_G5, FN_DU1_DG0, FN_VI2_DATA2_VI2_B2, FN_SCL1_B,</div><div class='add'>+	FN_SD3_DAT2, FN_SCK3_E, FN_AUDATA6, FN_TX0_D,</div><div class='add'>+	FN_DU1_DG1, FN_VI2_DATA3_VI2_B3, FN_SDA1_B, FN_SD3_DAT3,</div><div class='add'>+	FN_SCK5, FN_AUDATA7, FN_RX0_D, FN_DU1_DG2,</div><div class='add'>+	FN_VI2_G6, FN_DU1_DG3, FN_VI2_G7, FN_DU1_DG4,</div><div class='add'>+	FN_VI2_R0, FN_DU1_DG5, FN_VI2_R1, FN_DU1_DG6,</div><div class='add'>+	FN_VI2_R2, FN_DU1_DG7, FN_VI2_R3, FN_DU1_DB0,</div><div class='add'>+	FN_VI2_DATA4_VI2_B4, FN_SCL2_B, FN_SD3_DAT0, FN_TX5,</div><div class='add'>+	FN_SCK0_D,</div><div class='add'>+</div><div class='add'>+	/* IPSR5 */</div><div class='add'>+	FN_DU1_DB1, FN_VI2_DATA5_VI2_B5, FN_SDA2_B, FN_SD3_DAT1,</div><div class='add'>+	FN_RX5, FN_RTS0_D_TANS_D, FN_DU1_DB2, FN_VI2_R4,</div><div class='add'>+	FN_DU1_DB3, FN_VI2_R5, FN_DU1_DB4, FN_VI2_R6,</div><div class='add'>+	FN_DU1_DB5, FN_VI2_R7, FN_DU1_DB6, FN_SCL2_D,</div><div class='add'>+	FN_DU1_DB7, FN_SDA2_D, FN_DU1_DOTCLKIN, FN_VI2_CLKENB,</div><div class='add'>+	FN_HSPI_CS1, FN_SCL1_D, FN_DU1_DOTCLKOUT, FN_VI2_FIELD,</div><div class='add'>+	FN_SDA1_D, FN_DU1_EXHSYNC_DU1_HSYNC, FN_VI2_HSYNC,</div><div class='add'>+	FN_VI3_HSYNC, FN_DU1_EXVSYNC_DU1_VSYNC, FN_VI2_VSYNC, FN_VI3_VSYNC,</div><div class='add'>+	FN_DU1_EXODDF_DU1_ODDF_DISP_CDE, FN_VI2_CLK, FN_TX3_B_IRDA_TX_B,</div><div class='add'>+	FN_SD3_CD, FN_HSPI_TX1, FN_VI1_CLKENB, FN_VI3_CLKENB,</div><div class='add'>+	FN_AUDIO_CLKC, FN_TX2_D, FN_SPEEDIN, FN_GPS_SIGN_D,</div><div class='add'>+	FN_DU1_DISP, FN_VI2_DATA6_VI2_B6, FN_TCLK0, FN_QSTVA_B_QVS_B,</div><div class='add'>+	FN_HSPI_CLK1, FN_SCK2_D, FN_AUDIO_CLKOUT_B, FN_GPS_MAG_D,</div><div class='add'>+	FN_DU1_CDE, FN_VI2_DATA7_VI2_B7, FN_RX3_B_IRDA_RX_B,</div><div class='add'>+	FN_SD3_WP, FN_HSPI_RX1, FN_VI1_FIELD, FN_VI3_FIELD,</div><div class='add'>+	FN_AUDIO_CLKOUT, FN_RX2_D, FN_GPS_CLK_C, FN_GPS_CLK_D,</div><div class='add'>+	FN_AUDIO_CLKA, FN_CAN_TXCLK, FN_AUDIO_CLKB, FN_USB_OVC2,</div><div class='add'>+	FN_CAN_DEBUGOUT0, FN_MOUT0,</div><div class='add'>+</div><div class='add'>+	/* IPSR6 */</div><div class='add'>+	FN_SSI_SCK0129, FN_CAN_DEBUGOUT1, FN_MOUT1, FN_SSI_WS0129,</div><div class='add'>+	FN_CAN_DEBUGOUT2, FN_MOUT2, FN_SSI_SDATA0, FN_CAN_DEBUGOUT3,</div><div class='add'>+	FN_MOUT5, FN_SSI_SDATA1, FN_CAN_DEBUGOUT4, FN_MOUT6,</div><div class='add'>+	FN_SSI_SDATA2, FN_CAN_DEBUGOUT5, FN_SSI_SCK34, FN_CAN_DEBUGOUT6,</div><div class='add'>+	FN_CAN0_TX_B, FN_IERX, FN_SSI_SCK9_C, FN_SSI_WS34,</div><div class='add'>+	FN_CAN_DEBUGOUT7, FN_CAN0_RX_B, FN_IETX, FN_SSI_WS9_C,</div><div class='add'>+	FN_SSI_SDATA3, FN_PWM0_C, FN_CAN_DEBUGOUT8, FN_CAN_CLK_B,</div><div class='add'>+	FN_IECLK, FN_SCIF_CLK_B, FN_TCLK0_B, FN_SSI_SDATA4,</div><div class='add'>+	FN_CAN_DEBUGOUT9, FN_SSI_SDATA9_C, FN_SSI_SCK5, FN_ADICLK,</div><div class='add'>+	FN_CAN_DEBUGOUT10, FN_SCK3, FN_TCLK0_D, FN_SSI_WS5,</div><div class='add'>+	FN_ADICS_SAMP, FN_CAN_DEBUGOUT11, FN_TX3_IRDA_TX, FN_SSI_SDATA5,</div><div class='add'>+	FN_ADIDATA, FN_CAN_DEBUGOUT12, FN_RX3_IRDA_RX, FN_SSI_SCK6,</div><div class='add'>+	FN_ADICHS0, FN_CAN0_TX, FN_IERX_B,</div><div class='add'>+</div><div class='add'>+	/* IPSR7 */</div><div class='add'>+	FN_SSI_WS6, FN_ADICHS1, FN_CAN0_RX, FN_IETX_B,</div><div class='add'>+	FN_SSI_SDATA6, FN_ADICHS2, FN_CAN_CLK, FN_IECLK_B,</div><div class='add'>+	FN_SSI_SCK78, FN_CAN_DEBUGOUT13, FN_IRQ0_B, FN_SSI_SCK9_B,</div><div class='add'>+	FN_HSPI_CLK1_C, FN_SSI_WS78, FN_CAN_DEBUGOUT14, FN_IRQ1_B,</div><div class='add'>+	FN_SSI_WS9_B, FN_HSPI_CS1_C, FN_SSI_SDATA7, FN_CAN_DEBUGOUT15,</div><div class='add'>+	FN_IRQ2_B, FN_TCLK1_C, FN_HSPI_TX1_C, FN_SSI_SDATA8,</div><div class='add'>+	FN_VSP, FN_IRQ3_B, FN_HSPI_RX1_C, FN_SD0_CLK,</div><div class='add'>+	FN_ATACS01, FN_SCK1_B, FN_SD0_CMD, FN_ATACS11,</div><div class='add'>+	FN_TX1_B, FN_CC5_TDO, FN_SD0_DAT0, FN_ATADIR1,</div><div class='add'>+	FN_RX1_B, FN_CC5_TRST, FN_SD0_DAT1, FN_ATAG1,</div><div class='add'>+	FN_SCK2_B, FN_CC5_TMS, FN_SD0_DAT2, FN_ATARD1,</div><div class='add'>+	FN_TX2_B, FN_CC5_TCK, FN_SD0_DAT3, FN_ATAWR1,</div><div class='add'>+	FN_RX2_B, FN_CC5_TDI, FN_SD0_CD, FN_DREQ2,</div><div class='add'>+	FN_RTS1_B_TANS_B, FN_SD0_WP, FN_DACK2, FN_CTS1_B,</div><div class='add'>+</div><div class='add'>+	/* IPSR8 */</div><div class='add'>+	FN_HSPI_CLK0, FN_CTS0, FN_USB_OVC0, FN_AD_CLK,</div><div class='add'>+	FN_CC5_STATE4, FN_CC5_STATE12, FN_CC5_STATE20, FN_CC5_STATE28,</div><div class='add'>+	FN_CC5_STATE36, FN_HSPI_CS0, FN_RTS0_TANS, FN_USB_OVC1,</div><div class='add'>+	FN_AD_DI, FN_CC5_STATE5, FN_CC5_STATE13, FN_CC5_STATE21,</div><div class='add'>+	FN_CC5_STATE29, FN_CC5_STATE37, FN_HSPI_TX0, FN_TX0,</div><div class='add'>+	FN_CAN_DEBUG_HW_TRIGGER, FN_AD_DO, FN_CC5_STATE6, FN_CC5_STATE14,</div><div class='add'>+	FN_CC5_STATE22, FN_CC5_STATE30, FN_CC5_STATE38, FN_HSPI_RX0,</div><div class='add'>+	FN_RX0, FN_CAN_STEP0, FN_AD_NCS, FN_CC5_STATE7,</div><div class='add'>+	FN_CC5_STATE15, FN_CC5_STATE23, FN_CC5_STATE31, FN_CC5_STATE39,</div><div class='add'>+	FN_FMCLK, FN_RDS_CLK, FN_PCMOE, FN_BPFCLK,</div><div class='add'>+	FN_PCMWE, FN_FMIN, FN_RDS_DATA, FN_VI0_CLK,</div><div class='add'>+	FN_MMC1_CLK, FN_VI0_CLKENB, FN_TX1_C, FN_HTX1_B,</div><div class='add'>+	FN_MT1_SYNC, FN_VI0_FIELD, FN_RX1_C, FN_HRX1_B,</div><div class='add'>+	FN_VI0_HSYNC, FN_VI0_DATA0_B_VI0_B0_B, FN_CTS1_C, FN_TX4_D,</div><div class='add'>+	FN_MMC1_CMD, FN_HSCK1_B, FN_VI0_VSYNC, FN_VI0_DATA1_B_VI0_B1_B,</div><div class='add'>+	FN_RTS1_C_TANS_C, FN_RX4_D, FN_PWMFSW0_C,</div><div class='add'>+</div><div class='add'>+	/* IPSR9 */</div><div class='add'>+	FN_VI0_DATA0_VI0_B0, FN_HRTS1_B, FN_MT1_VCXO, FN_VI0_DATA1_VI0_B1,</div><div class='add'>+	FN_HCTS1_B, FN_MT1_PWM, FN_VI0_DATA2_VI0_B2, FN_MMC1_D0,</div><div class='add'>+	FN_VI0_DATA3_VI0_B3, FN_MMC1_D1, FN_VI0_DATA4_VI0_B4, FN_MMC1_D2,</div><div class='add'>+	FN_VI0_DATA5_VI0_B5, FN_MMC1_D3, FN_VI0_DATA6_VI0_B6, FN_MMC1_D4,</div><div class='add'>+	FN_ARM_TRACEDATA_0, FN_VI0_DATA7_VI0_B7, FN_MMC1_D5,</div><div class='add'>+	FN_ARM_TRACEDATA_1, FN_VI0_G0, FN_SSI_SCK78_C, FN_IRQ0,</div><div class='add'>+	FN_ARM_TRACEDATA_2, FN_VI0_G1, FN_SSI_WS78_C, FN_IRQ1,</div><div class='add'>+	FN_ARM_TRACEDATA_3, FN_VI0_G2, FN_ETH_TXD1, FN_MMC1_D6,</div><div class='add'>+	FN_ARM_TRACEDATA_4, FN_TS_SPSYNC0, FN_VI0_G3, FN_ETH_CRS_DV,</div><div class='add'>+	FN_MMC1_D7, FN_ARM_TRACEDATA_5, FN_TS_SDAT0, FN_VI0_G4,</div><div class='add'>+	FN_ETH_TX_EN, FN_SD2_DAT0_B, FN_ARM_TRACEDATA_6, FN_VI0_G5,</div><div class='add'>+	FN_ETH_RX_ER, FN_SD2_DAT1_B, FN_ARM_TRACEDATA_7, FN_VI0_G6,</div><div class='add'>+	FN_ETH_RXD0, FN_SD2_DAT2_B, FN_ARM_TRACEDATA_8, FN_VI0_G7,</div><div class='add'>+	FN_ETH_RXD1, FN_SD2_DAT3_B, FN_ARM_TRACEDATA_9,</div><div class='add'>+</div><div class='add'>+	/* IPSR10 */</div><div class='add'>+	FN_VI0_R0, FN_SSI_SDATA7_C, FN_SCK1_C, FN_DREQ1_B,</div><div class='add'>+	FN_ARM_TRACEDATA_10, FN_DREQ0_C, FN_VI0_R1, FN_SSI_SDATA8_C,</div><div class='add'>+	FN_DACK1_B, FN_ARM_TRACEDATA_11, FN_DACK0_C, FN_DRACK0_C,</div><div class='add'>+	FN_VI0_R2, FN_ETH_LINK, FN_SD2_CLK_B, FN_IRQ2,</div><div class='add'>+	FN_ARM_TRACEDATA_12, FN_VI0_R3, FN_ETH_MAGIC, FN_SD2_CMD_B,</div><div class='add'>+	FN_IRQ3, FN_ARM_TRACEDATA_13, FN_VI0_R4, FN_ETH_REFCLK,</div><div class='add'>+	FN_SD2_CD_B, FN_HSPI_CLK1_B, FN_ARM_TRACEDATA_14, FN_MT1_CLK,</div><div class='add'>+	FN_TS_SCK0, FN_VI0_R5, FN_ETH_TXD0, FN_SD2_WP_B, FN_HSPI_CS1_B,</div><div class='add'>+	FN_ARM_TRACEDATA_15, FN_MT1_D, FN_TS_SDEN0, FN_VI0_R6,</div><div class='add'>+	FN_ETH_MDC, FN_DREQ2_C, FN_HSPI_TX1_B, FN_TRACECLK,</div><div class='add'>+	FN_MT1_BEN, FN_PWMFSW0_D, FN_VI0_R7, FN_ETH_MDIO,</div><div class='add'>+	FN_DACK2_C, FN_HSPI_RX1_B, FN_SCIF_CLK_D, FN_TRACECTL,</div><div class='add'>+	FN_MT1_PEN, FN_VI1_CLK, FN_SIM_D, FN_SDA3,</div><div class='add'>+	FN_VI1_HSYNC, FN_VI3_CLK, FN_SSI_SCK4, FN_GPS_SIGN_C,</div><div class='add'>+	FN_PWMFSW0_E, FN_VI1_VSYNC, FN_AUDIO_CLKOUT_C, FN_SSI_WS4,</div><div class='add'>+	FN_SIM_CLK, FN_GPS_MAG_C, FN_SPV_TRST, FN_SCL3,</div><div class='add'>+</div><div class='add'>+	/* IPSR11 */</div><div class='add'>+	FN_VI1_DATA0_VI1_B0, FN_SD2_DAT0, FN_SIM_RST, FN_SPV_TCK,</div><div class='add'>+	FN_ADICLK_B, FN_VI1_DATA1_VI1_B1, FN_SD2_DAT1, FN_MT0_CLK,</div><div class='add'>+	FN_SPV_TMS, FN_ADICS_B_SAMP_B, FN_VI1_DATA2_VI1_B2, FN_SD2_DAT2,</div><div class='add'>+	FN_MT0_D, FN_SPVTDI, FN_ADIDATA_B, FN_VI1_DATA3_VI1_B3,</div><div class='add'>+	FN_SD2_DAT3, FN_MT0_BEN, FN_SPV_TDO, FN_ADICHS0_B,</div><div class='add'>+	FN_VI1_DATA4_VI1_B4, FN_SD2_CLK, FN_MT0_PEN, FN_SPA_TRST,</div><div class='add'>+	FN_HSPI_CLK1_D, FN_ADICHS1_B, FN_VI1_DATA5_VI1_B5, FN_SD2_CMD,</div><div class='add'>+	FN_MT0_SYNC, FN_SPA_TCK, FN_HSPI_CS1_D, FN_ADICHS2_B,</div><div class='add'>+	FN_VI1_DATA6_VI1_B6, FN_SD2_CD, FN_MT0_VCXO, FN_SPA_TMS,</div><div class='add'>+	FN_HSPI_TX1_D, FN_VI1_DATA7_VI1_B7, FN_SD2_WP, FN_MT0_PWM,</div><div class='add'>+	FN_SPA_TDI, FN_HSPI_RX1_D, FN_VI1_G0, FN_VI3_DATA0,</div><div class='add'>+	FN_DU1_DOTCLKOUT1, FN_TS_SCK1, FN_DREQ2_B, FN_TX2,</div><div class='add'>+	FN_SPA_TDO, FN_HCTS0_B, FN_VI1_G1, FN_VI3_DATA1,</div><div class='add'>+	FN_SSI_SCK1, FN_TS_SDEN1, FN_DACK2_B, FN_RX2, FN_HRTS0_B,</div><div class='add'>+</div><div class='add'>+	/* IPSR12 */</div><div class='add'>+	FN_VI1_G2, FN_VI3_DATA2, FN_SSI_WS1, FN_TS_SPSYNC1,</div><div class='add'>+	FN_SCK2, FN_HSCK0_B, FN_VI1_G3, FN_VI3_DATA3,</div><div class='add'>+	FN_SSI_SCK2, FN_TS_SDAT1, FN_SCL1_C, FN_HTX0_B,</div><div class='add'>+	FN_VI1_G4, FN_VI3_DATA4, FN_SSI_WS2, FN_SDA1_C,</div><div class='add'>+	FN_SIM_RST_B, FN_HRX0_B, FN_VI1_G5, FN_VI3_DATA5,</div><div class='add'>+	FN_GPS_CLK, FN_FSE, FN_TX4_B, FN_SIM_D_B,</div><div class='add'>+	FN_VI1_G6, FN_VI3_DATA6, FN_GPS_SIGN, FN_FRB,</div><div class='add'>+	FN_RX4_B, FN_SIM_CLK_B, FN_VI1_G7, FN_VI3_DATA7,</div><div class='add'>+	FN_GPS_MAG, FN_FCE, FN_SCK4_B,</div><div class='add'>+</div><div class='add'>+	FN_SEL_SCIF5_0, FN_SEL_SCIF5_1, FN_SEL_SCIF5_2, FN_SEL_SCIF5_3,</div><div class='add'>+	FN_SEL_SCIF4_0, FN_SEL_SCIF4_1, FN_SEL_SCIF4_2, FN_SEL_SCIF4_3,</div><div class='add'>+	FN_SEL_SCIF3_0, FN_SEL_SCIF3_1, FN_SEL_SCIF3_2,</div><div class='add'>+	FN_SEL_SCIF3_3, FN_SEL_SCIF3_4,</div><div class='add'>+	FN_SEL_SCIF2_0, FN_SEL_SCIF2_1, FN_SEL_SCIF2_2,</div><div class='add'>+	FN_SEL_SCIF2_3, FN_SEL_SCIF2_4,</div><div class='add'>+	FN_SEL_SCIF1_0, FN_SEL_SCIF1_1, FN_SEL_SCIF1_2,</div><div class='add'>+	FN_SEL_SCIF0_0, FN_SEL_SCIF0_1, FN_SEL_SCIF0_2, FN_SEL_SCIF0_3,</div><div class='add'>+	FN_SEL_SSI9_0, FN_SEL_SSI9_1, FN_SEL_SSI9_2,</div><div class='add'>+	FN_SEL_SSI8_0, FN_SEL_SSI8_1, FN_SEL_SSI8_2,</div><div class='add'>+	FN_SEL_SSI7_0, FN_SEL_SSI7_1, FN_SEL_SSI7_2,</div><div class='add'>+	FN_SEL_VI0_0, FN_SEL_VI0_1,</div><div class='add'>+	FN_SEL_SD2_0, FN_SEL_SD2_1,</div><div class='add'>+	FN_SEL_INT3_0, FN_SEL_INT3_1,</div><div class='add'>+	FN_SEL_INT2_0, FN_SEL_INT2_1,</div><div class='add'>+	FN_SEL_INT1_0, FN_SEL_INT1_1,</div><div class='add'>+	FN_SEL_INT0_0, FN_SEL_INT0_1,</div><div class='add'>+	FN_SEL_IE_0, FN_SEL_IE_1,</div><div class='add'>+	FN_SEL_EXBUS2_0, FN_SEL_EXBUS2_1, FN_SEL_EXBUS2_2,</div><div class='add'>+	FN_SEL_EXBUS1_0, FN_SEL_EXBUS1_1,</div><div class='add'>+	FN_SEL_EXBUS0_0, FN_SEL_EXBUS0_1, FN_SEL_EXBUS0_2,</div><div class='add'>+</div><div class='add'>+	FN_SEL_TMU1_0, FN_SEL_TMU1_1, FN_SEL_TMU1_2,</div><div class='add'>+	FN_SEL_TMU0_0, FN_SEL_TMU0_1, FN_SEL_TMU0_2, FN_SEL_TMU0_3,</div><div class='add'>+	FN_SEL_SCIF_0, FN_SEL_SCIF_1, FN_SEL_SCIF_2, FN_SEL_SCIF_3,</div><div class='add'>+	FN_SEL_CANCLK_0, FN_SEL_CANCLK_1, FN_SEL_CANCLK_2,</div><div class='add'>+	FN_SEL_CAN0_0, FN_SEL_CAN0_1,</div><div class='add'>+	FN_SEL_HSCIF1_0, FN_SEL_HSCIF1_1,</div><div class='add'>+	FN_SEL_HSCIF0_0, FN_SEL_HSCIF0_1,</div><div class='add'>+	FN_SEL_PWMFSW_0, FN_SEL_PWMFSW_1, FN_SEL_PWMFSW_2,</div><div class='add'>+	FN_SEL_PWMFSW_3, FN_SEL_PWMFSW_4,</div><div class='add'>+	FN_SEL_ADI_0, FN_SEL_ADI_1,</div><div class='add'>+	FN_SEL_GPS_0, FN_SEL_GPS_1, FN_SEL_GPS_2, FN_SEL_GPS_3,</div><div class='add'>+	FN_SEL_SIM_0, FN_SEL_SIM_1,</div><div class='add'>+	FN_SEL_HSPI2_0, FN_SEL_HSPI2_1,</div><div class='add'>+	FN_SEL_HSPI1_0, FN_SEL_HSPI1_1, FN_SEL_HSPI1_2, FN_SEL_HSPI1_3,</div><div class='add'>+	FN_SEL_I2C3_0, FN_SEL_I2C3_1,</div><div class='add'>+	FN_SEL_I2C2_0, FN_SEL_I2C2_1, FN_SEL_I2C2_2, FN_SEL_I2C2_3,</div><div class='add'>+	FN_SEL_I2C1_0, FN_SEL_I2C1_1, FN_SEL_I2C1_2, FN_SEL_I2C1_3,</div><div class='add'>+	PINMUX_FUNCTION_END,</div><div class='add'>+</div><div class='add'>+	PINMUX_MARK_BEGIN,</div><div class='add'>+	AVS1_MARK, AVS2_MARK, A17_MARK, A18_MARK,</div><div class='add'>+	A19_MARK,</div><div class='add'>+</div><div class='add'>+	RD_WR_MARK, FWE_MARK, ATAG0_MARK, VI1_R7_MARK,</div><div class='add'>+	HRTS1_MARK, RX4_C_MARK,</div><div class='add'>+	CS1_A26_MARK, HSPI_TX2_MARK, SDSELF_B_MARK,</div><div class='add'>+	CS0_MARK, HSPI_CS2_B_MARK,</div><div class='add'>+	CLKOUT_MARK, TX3C_IRDA_TX_C_MARK, PWM0_B_MARK,</div><div class='add'>+	A25_MARK, SD1_WP_MARK, MMC0_D5_MARK, FD5_MARK,</div><div class='add'>+	HSPI_RX2_MARK, VI1_R3_MARK, TX5_B_MARK, SSI_SDATA7_B_MARK, CTS0_B_MARK,</div><div class='add'>+	A24_MARK, SD1_CD_MARK, MMC0_D4_MARK, FD4_MARK,</div><div class='add'>+	HSPI_CS2_MARK, VI1_R2_MARK, SSI_WS78_B_MARK,</div><div class='add'>+	A23_MARK, FCLE_MARK, HSPI_CLK2_MARK, VI1_R1_MARK,</div><div class='add'>+	A22_MARK, RX5_D_MARK, HSPI_RX2_B_MARK, VI1_R0_MARK,</div><div class='add'>+	A21_MARK, SCK5_D_MARK, HSPI_CLK2_B_MARK,</div><div class='add'>+	A20_MARK, TX5_D_MARK, HSPI_TX2_B_MARK,</div><div class='add'>+	A0_MARK, SD1_DAT3_MARK, MMC0_D3_MARK, FD3_MARK,</div><div class='add'>+	BS_MARK, SD1_DAT2_MARK, MMC0_D2_MARK, FD2_MARK,</div><div class='add'>+	ATADIR0_MARK, SDSELF_MARK, HCTS1_MARK, TX4_C_MARK,</div><div class='add'>+	PENC2_MARK, SCK0_MARK, PWM1_MARK, PWMFSW0_MARK,</div><div class='add'>+	SCIF_CLK_MARK, TCLK0_C_MARK,</div><div class='add'>+</div><div class='add'>+	EX_CS0_MARK, RX3_C_IRDA_RX_C_MARK, MMC0_D6_MARK,</div><div class='add'>+	FD6_MARK, EX_CS1_MARK, MMC0_D7_MARK, FD7_MARK,</div><div class='add'>+	EX_CS2_MARK, SD1_CLK_MARK, MMC0_CLK_MARK, FALE_MARK,</div><div class='add'>+	ATACS00_MARK, EX_CS3_MARK, SD1_CMD_MARK, MMC0_CMD_MARK,</div><div class='add'>+	FRE_MARK, ATACS10_MARK, VI1_R4_MARK, RX5_B_MARK,</div><div class='add'>+	HSCK1_MARK, SSI_SDATA8_B_MARK, RTS0_B_TANS_B_MARK, SSI_SDATA9_MARK,</div><div class='add'>+	EX_CS4_MARK, SD1_DAT0_MARK, MMC0_D0_MARK, FD0_MARK,</div><div class='add'>+	ATARD0_MARK, VI1_R5_MARK, SCK5_B_MARK, HTX1_MARK,</div><div class='add'>+	TX2_E_MARK, TX0_B_MARK, SSI_SCK9_MARK, EX_CS5_MARK,</div><div class='add'>+	SD1_DAT1_MARK, MMC0_D1_MARK, FD1_MARK, ATAWR0_MARK,</div><div class='add'>+	VI1_R6_MARK, HRX1_MARK, RX2_E_MARK, RX0_B_MARK,</div><div class='add'>+	SSI_WS9_MARK, MLB_CLK_MARK, PWM2_MARK, SCK4_MARK,</div><div class='add'>+	MLB_SIG_MARK, PWM3_MARK, TX4_MARK, MLB_DAT_MARK,</div><div class='add'>+	PWM4_MARK, RX4_MARK, HTX0_MARK, TX1_MARK,</div><div class='add'>+	SDATA_MARK, CTS0_C_MARK, SUB_TCK_MARK, CC5_STATE2_MARK,</div><div class='add'>+	CC5_STATE10_MARK, CC5_STATE18_MARK, CC5_STATE26_MARK, CC5_STATE34_MARK,</div><div class='add'>+</div><div class='add'>+	HRX0_MARK, RX1_MARK, SCKZ_MARK, RTS0_C_TANS_C_MARK,</div><div class='add'>+	SUB_TDI_MARK, CC5_STATE3_MARK, CC5_STATE11_MARK, CC5_STATE19_MARK,</div><div class='add'>+	CC5_STATE27_MARK, CC5_STATE35_MARK, HSCK0_MARK, SCK1_MARK,</div><div class='add'>+	MTS_MARK, PWM5_MARK, SCK0_C_MARK, SSI_SDATA9_B_MARK,</div><div class='add'>+	SUB_TDO_MARK, CC5_STATE0_MARK, CC5_STATE8_MARK, CC5_STATE16_MARK,</div><div class='add'>+	CC5_STATE24_MARK, CC5_STATE32_MARK, HCTS0_MARK, CTS1_MARK,</div><div class='add'>+	STM_MARK, PWM0_D_MARK, RX0_C_MARK, SCIF_CLK_C_MARK,</div><div class='add'>+	SUB_TRST_MARK, TCLK1_B_MARK, CC5_OSCOUT_MARK, HRTS0_MARK,</div><div class='add'>+	RTS1_TANS_MARK, MDATA_MARK, TX0_C_MARK, SUB_TMS_MARK,</div><div class='add'>+	CC5_STATE1_MARK, CC5_STATE9_MARK, CC5_STATE17_MARK, CC5_STATE25_MARK,</div><div class='add'>+	CC5_STATE33_MARK, DU0_DR0_MARK, LCDOUT0_MARK, DREQ0_MARK,</div><div class='add'>+	GPS_CLK_B_MARK, AUDATA0_MARK, TX5_C_MARK, DU0_DR1_MARK,</div><div class='add'>+	LCDOUT1_MARK, DACK0_MARK, DRACK0_MARK, GPS_SIGN_B_MARK,</div><div class='add'>+	AUDATA1_MARK, RX5_C_MARK, DU0_DR2_MARK, LCDOUT2_MARK,</div><div class='add'>+	DU0_DR3_MARK, LCDOUT3_MARK, DU0_DR4_MARK, LCDOUT4_MARK,</div><div class='add'>+	DU0_DR5_MARK, LCDOUT5_MARK, DU0_DR6_MARK, LCDOUT6_MARK,</div><div class='add'>+	DU0_DR7_MARK, LCDOUT7_MARK, DU0_DG0_MARK, LCDOUT8_MARK,</div><div class='add'>+	DREQ1_MARK, SCL2_MARK, AUDATA2_MARK,</div><div class='add'>+</div><div class='add'>+	DU0_DG1_MARK, LCDOUT9_MARK, DACK1_MARK, SDA2_MARK,</div><div class='add'>+	AUDATA3_MARK, DU0_DG2_MARK, LCDOUT10_MARK, DU0_DG3_MARK,</div><div class='add'>+	LCDOUT11_MARK, DU0_DG4_MARK, LCDOUT12_MARK, DU0_DG5_MARK,</div><div class='add'>+	LCDOUT13_MARK, DU0_DG6_MARK, LCDOUT14_MARK, DU0_DG7_MARK,</div><div class='add'>+	LCDOUT15_MARK, DU0_DB0_MARK, LCDOUT16_MARK, EX_WAIT1_MARK,</div><div class='add'>+	SCL1_MARK, TCLK1_MARK, AUDATA4_MARK, DU0_DB1_MARK,</div><div class='add'>+	LCDOUT17_MARK, EX_WAIT2_MARK, SDA1_MARK, GPS_MAG_B_MARK,</div><div class='add'>+	AUDATA5_MARK, SCK5_C_MARK, DU0_DB2_MARK, LCDOUT18_MARK,</div><div class='add'>+	DU0_DB3_MARK, LCDOUT19_MARK, DU0_DB4_MARK, LCDOUT20_MARK,</div><div class='add'>+	DU0_DB5_MARK, LCDOUT21_MARK, DU0_DB6_MARK, LCDOUT22_MARK,</div><div class='add'>+	DU0_DB7_MARK, LCDOUT23_MARK, DU0_DOTCLKIN_MARK, QSTVA_QVS_MARK,</div><div class='add'>+	TX3_D_IRDA_TX_D_MARK, SCL3_B_MARK, DU0_DOTCLKOUT0_MARK, QCLK_MARK,</div><div class='add'>+	DU0_DOTCLKOUT1_MARK, QSTVB_QVE_MARK, RX3_D_IRDA_RX_D_MARK, SDA3_B_MARK,</div><div class='add'>+	SDA2_C_MARK, DACK0_B_MARK, DRACK0_B_MARK, DU0_EXHSYNC_DU0_HSYNC_MARK,</div><div class='add'>+	QSTH_QHS_MARK, DU0_EXVSYNC_DU0_VSYNC_MARK, QSTB_QHE_MARK,</div><div class='add'>+	DU0_EXODDF_DU0_ODDF_DISP_CDE_MARK, QCPV_QDE_MARK, CAN1_TX_MARK,</div><div class='add'>+	TX2_C_MARK, SCL2_C_MARK, REMOCON_MARK,</div><div class='add'>+</div><div class='add'>+	DU0_DISP_MARK, QPOLA_MARK, CAN_CLK_C_MARK, SCK2_C_MARK,</div><div class='add'>+	DU0_CDE_MARK, QPOLB_MARK, CAN1_RX_MARK, RX2_C_MARK,</div><div class='add'>+	DREQ0_B_MARK, SSI_SCK78_B_MARK, SCK0_B_MARK, DU1_DR0_MARK,</div><div class='add'>+	VI2_DATA0_VI2_B0_MARK, PWM6_MARK, SD3_CLK_MARK, TX3_E_IRDA_TX_E_MARK,</div><div class='add'>+	AUDCK_MARK, PWMFSW0_B_MARK, DU1_DR1_MARK, VI2_DATA1_VI2_B1_MARK,</div><div class='add'>+	PWM0_MARK, SD3_CMD_MARK, RX3_E_IRDA_RX_E_MARK, AUDSYNC_MARK,</div><div class='add'>+	CTS0_D_MARK, DU1_DR2_MARK, VI2_G0_MARK, DU1_DR3_MARK,</div><div class='add'>+	VI2_G1_MARK, DU1_DR4_MARK, VI2_G2_MARK, DU1_DR5_MARK,</div><div class='add'>+	VI2_G3_MARK, DU1_DR6_MARK, VI2_G4_MARK, DU1_DR7_MARK,</div><div class='add'>+	VI2_G5_MARK, DU1_DG0_MARK, VI2_DATA2_VI2_B2_MARK, SCL1_B_MARK,</div><div class='add'>+	SD3_DAT2_MARK, SCK3_E_MARK, AUDATA6_MARK, TX0_D_MARK,</div><div class='add'>+	DU1_DG1_MARK, VI2_DATA3_VI2_B3_MARK, SDA1_B_MARK, SD3_DAT3_MARK,</div><div class='add'>+	SCK5_MARK, AUDATA7_MARK, RX0_D_MARK, DU1_DG2_MARK,</div><div class='add'>+	VI2_G6_MARK, DU1_DG3_MARK, VI2_G7_MARK, DU1_DG4_MARK,</div><div class='add'>+	VI2_R0_MARK, DU1_DG5_MARK, VI2_R1_MARK, DU1_DG6_MARK,</div><div class='add'>+	VI2_R2_MARK, DU1_DG7_MARK, VI2_R3_MARK, DU1_DB0_MARK,</div><div class='add'>+	VI2_DATA4_VI2_B4_MARK, SCL2_B_MARK, SD3_DAT0_MARK, TX5_MARK,</div><div class='add'>+	SCK0_D_MARK,</div><div class='add'>+</div><div class='add'>+	DU1_DB1_MARK, VI2_DATA5_VI2_B5_MARK, SDA2_B_MARK, SD3_DAT1_MARK,</div><div class='add'>+	RX5_MARK, RTS0_D_TANS_D_MARK, DU1_DB2_MARK, VI2_R4_MARK,</div><div class='add'>+	DU1_DB3_MARK, VI2_R5_MARK, DU1_DB4_MARK, VI2_R6_MARK,</div><div class='add'>+	DU1_DB5_MARK, VI2_R7_MARK, DU1_DB6_MARK, SCL2_D_MARK,</div><div class='add'>+	DU1_DB7_MARK, SDA2_D_MARK, DU1_DOTCLKIN_MARK, VI2_CLKENB_MARK,</div><div class='add'>+	HSPI_CS1_MARK, SCL1_D_MARK, DU1_DOTCLKOUT_MARK, VI2_FIELD_MARK,</div><div class='add'>+	SDA1_D_MARK, DU1_EXHSYNC_DU1_HSYNC_MARK, VI2_HSYNC_MARK,</div><div class='add'>+	VI3_HSYNC_MARK, DU1_EXVSYNC_DU1_VSYNC_MARK, VI2_VSYNC_MARK,</div><div class='add'>+	VI3_VSYNC_MARK, DU1_EXODDF_DU1_ODDF_DISP_CDE_MARK, VI2_CLK_MARK,</div><div class='add'>+	TX3_B_IRDA_TX_B_MARK, SD3_CD_MARK, HSPI_TX1_MARK, VI1_CLKENB_MARK,</div><div class='add'>+	VI3_CLKENB_MARK, AUDIO_CLKC_MARK, TX2_D_MARK, SPEEDIN_MARK,</div><div class='add'>+	GPS_SIGN_D_MARK, DU1_DISP_MARK, VI2_DATA6_VI2_B6_MARK, TCLK0_MARK,</div><div class='add'>+	QSTVA_B_QVS_B_MARK, HSPI_CLK1_MARK, SCK2_D_MARK, AUDIO_CLKOUT_B_MARK,</div><div class='add'>+	GPS_MAG_D_MARK, DU1_CDE_MARK, VI2_DATA7_VI2_B7_MARK,</div><div class='add'>+	RX3_B_IRDA_RX_B_MARK, SD3_WP_MARK, HSPI_RX1_MARK, VI1_FIELD_MARK,</div><div class='add'>+	VI3_FIELD_MARK, AUDIO_CLKOUT_MARK, RX2_D_MARK, GPS_CLK_C_MARK,</div><div class='add'>+	GPS_CLK_D_MARK, AUDIO_CLKA_MARK, CAN_TXCLK_MARK, AUDIO_CLKB_MARK,</div><div class='add'>+	USB_OVC2_MARK, CAN_DEBUGOUT0_MARK, MOUT0_MARK,</div><div class='add'>+</div><div class='add'>+	SSI_SCK0129_MARK, CAN_DEBUGOUT1_MARK, MOUT1_MARK, SSI_WS0129_MARK,</div><div class='add'>+	CAN_DEBUGOUT2_MARK, MOUT2_MARK, SSI_SDATA0_MARK, CAN_DEBUGOUT3_MARK,</div><div class='add'>+	MOUT5_MARK, SSI_SDATA1_MARK, CAN_DEBUGOUT4_MARK, MOUT6_MARK,</div><div class='add'>+	SSI_SDATA2_MARK, CAN_DEBUGOUT5_MARK, SSI_SCK34_MARK,</div><div class='add'>+	CAN_DEBUGOUT6_MARK, CAN0_TX_B_MARK, IERX_MARK, SSI_SCK9_C_MARK,</div><div class='add'>+	SSI_WS34_MARK, CAN_DEBUGOUT7_MARK, CAN0_RX_B_MARK, IETX_MARK,</div><div class='add'>+	SSI_WS9_C_MARK,	SSI_SDATA3_MARK, PWM0_C_MARK, CAN_DEBUGOUT8_MARK,</div><div class='add'>+	CAN_CLK_B_MARK,	IECLK_MARK, SCIF_CLK_B_MARK, TCLK0_B_MARK,</div><div class='add'>+	SSI_SDATA4_MARK, CAN_DEBUGOUT9_MARK, SSI_SDATA9_C_MARK, SSI_SCK5_MARK,</div><div class='add'>+	ADICLK_MARK, CAN_DEBUGOUT10_MARK, SCK3_MARK, TCLK0_D_MARK,</div><div class='add'>+	SSI_WS5_MARK, ADICS_SAMP_MARK, CAN_DEBUGOUT11_MARK, TX3_IRDA_TX_MARK,</div><div class='add'>+	SSI_SDATA5_MARK, ADIDATA_MARK, CAN_DEBUGOUT12_MARK, RX3_IRDA_RX_MARK,</div><div class='add'>+	SSI_SCK6_MARK, ADICHS0_MARK, CAN0_TX_MARK, IERX_B_MARK,</div><div class='add'>+</div><div class='add'>+	SSI_WS6_MARK, ADICHS1_MARK, CAN0_RX_MARK, IETX_B_MARK,</div><div class='add'>+	SSI_SDATA6_MARK, ADICHS2_MARK, CAN_CLK_MARK, IECLK_B_MARK,</div><div class='add'>+	SSI_SCK78_MARK, CAN_DEBUGOUT13_MARK, IRQ0_B_MARK, SSI_SCK9_B_MARK,</div><div class='add'>+	HSPI_CLK1_C_MARK, SSI_WS78_MARK, CAN_DEBUGOUT14_MARK, IRQ1_B_MARK,</div><div class='add'>+	SSI_WS9_B_MARK, HSPI_CS1_C_MARK, SSI_SDATA7_MARK, CAN_DEBUGOUT15_MARK,</div><div class='add'>+	IRQ2_B_MARK, TCLK1_C_MARK, HSPI_TX1_C_MARK, SSI_SDATA8_MARK,</div><div class='add'>+	VSP_MARK, IRQ3_B_MARK, HSPI_RX1_C_MARK, SD0_CLK_MARK,</div><div class='add'>+	ATACS01_MARK, SCK1_B_MARK, SD0_CMD_MARK, ATACS11_MARK,</div><div class='add'>+	TX1_B_MARK, CC5_TDO_MARK, SD0_DAT0_MARK, ATADIR1_MARK,</div><div class='add'>+	RX1_B_MARK, CC5_TRST_MARK, SD0_DAT1_MARK, ATAG1_MARK,</div><div class='add'>+	SCK2_B_MARK, CC5_TMS_MARK, SD0_DAT2_MARK, ATARD1_MARK,</div><div class='add'>+	TX2_B_MARK, CC5_TCK_MARK, SD0_DAT3_MARK, ATAWR1_MARK,</div><div class='add'>+	RX2_B_MARK, CC5_TDI_MARK, SD0_CD_MARK, DREQ2_MARK,</div><div class='add'>+	RTS1_B_TANS_B_MARK, SD0_WP_MARK, DACK2_MARK, CTS1_B_MARK,</div><div class='add'>+</div><div class='add'>+	HSPI_CLK0_MARK, CTS0_MARK, USB_OVC0_MARK, AD_CLK_MARK,</div><div class='add'>+	CC5_STATE4_MARK, CC5_STATE12_MARK, CC5_STATE20_MARK, CC5_STATE28_MARK,</div><div class='add'>+	CC5_STATE36_MARK, HSPI_CS0_MARK, RTS0_TANS_MARK, USB_OVC1_MARK,</div><div class='add'>+	AD_DI_MARK, CC5_STATE5_MARK, CC5_STATE13_MARK, CC5_STATE21_MARK,</div><div class='add'>+	CC5_STATE29_MARK, CC5_STATE37_MARK, HSPI_TX0_MARK, TX0_MARK,</div><div class='add'>+	CAN_DEBUG_HW_TRIGGER_MARK, AD_DO_MARK, CC5_STATE6_MARK,</div><div class='add'>+	CC5_STATE14_MARK, CC5_STATE22_MARK, CC5_STATE30_MARK,</div><div class='add'>+	CC5_STATE38_MARK, HSPI_RX0_MARK, RX0_MARK, CAN_STEP0_MARK,</div><div class='add'>+	AD_NCS_MARK, CC5_STATE7_MARK, CC5_STATE15_MARK, CC5_STATE23_MARK,</div><div class='add'>+	CC5_STATE31_MARK, CC5_STATE39_MARK, FMCLK_MARK, RDS_CLK_MARK,</div><div class='add'>+	PCMOE_MARK, BPFCLK_MARK, PCMWE_MARK, FMIN_MARK, RDS_DATA_MARK,</div><div class='add'>+	VI0_CLK_MARK, MMC1_CLK_MARK, VI0_CLKENB_MARK, TX1_C_MARK, HTX1_B_MARK,</div><div class='add'>+	MT1_SYNC_MARK, VI0_FIELD_MARK, RX1_C_MARK, HRX1_B_MARK,</div><div class='add'>+	VI0_HSYNC_MARK, VI0_DATA0_B_VI0_B0_B_MARK, CTS1_C_MARK, TX4_D_MARK,</div><div class='add'>+	MMC1_CMD_MARK, HSCK1_B_MARK, VI0_VSYNC_MARK, VI0_DATA1_B_VI0_B1_B_MARK,</div><div class='add'>+	RTS1_C_TANS_C_MARK, RX4_D_MARK, PWMFSW0_C_MARK,</div><div class='add'>+</div><div class='add'>+	VI0_DATA0_VI0_B0_MARK, HRTS1_B_MARK, MT1_VCXO_MARK,</div><div class='add'>+	VI0_DATA1_VI0_B1_MARK, HCTS1_B_MARK, MT1_PWM_MARK,</div><div class='add'>+	VI0_DATA2_VI0_B2_MARK, MMC1_D0_MARK, VI0_DATA3_VI0_B3_MARK,</div><div class='add'>+	MMC1_D1_MARK, VI0_DATA4_VI0_B4_MARK, MMC1_D2_MARK,</div><div class='add'>+	VI0_DATA5_VI0_B5_MARK, MMC1_D3_MARK, VI0_DATA6_VI0_B6_MARK,</div><div class='add'>+	MMC1_D4_MARK, ARM_TRACEDATA_0_MARK, VI0_DATA7_VI0_B7_MARK,</div><div class='add'>+	MMC1_D5_MARK, ARM_TRACEDATA_1_MARK, VI0_G0_MARK, SSI_SCK78_C_MARK,</div><div class='add'>+	IRQ0_MARK, ARM_TRACEDATA_2_MARK, VI0_G1_MARK, SSI_WS78_C_MARK,</div><div class='add'>+	IRQ1_MARK, ARM_TRACEDATA_3_MARK, VI0_G2_MARK, ETH_TXD1_MARK,</div><div class='add'>+	MMC1_D6_MARK, ARM_TRACEDATA_4_MARK, TS_SPSYNC0_MARK, VI0_G3_MARK,</div><div class='add'>+	ETH_CRS_DV_MARK, MMC1_D7_MARK, ARM_TRACEDATA_5_MARK, TS_SDAT0_MARK,</div><div class='add'>+	VI0_G4_MARK, ETH_TX_EN_MARK, SD2_DAT0_B_MARK, ARM_TRACEDATA_6_MARK,</div><div class='add'>+	VI0_G5_MARK, ETH_RX_ER_MARK, SD2_DAT1_B_MARK, ARM_TRACEDATA_7_MARK,</div><div class='add'>+	VI0_G6_MARK, ETH_RXD0_MARK, SD2_DAT2_B_MARK, ARM_TRACEDATA_8_MARK,</div><div class='add'>+	VI0_G7_MARK, ETH_RXD1_MARK, SD2_DAT3_B_MARK, ARM_TRACEDATA_9_MARK,</div><div class='add'>+</div><div class='add'>+	VI0_R0_MARK, SSI_SDATA7_C_MARK, SCK1_C_MARK, DREQ1_B_MARK,</div><div class='add'>+	ARM_TRACEDATA_10_MARK, DREQ0_C_MARK, VI0_R1_MARK, SSI_SDATA8_C_MARK,</div><div class='add'>+	DACK1_B_MARK, ARM_TRACEDATA_11_MARK, DACK0_C_MARK, DRACK0_C_MARK,</div><div class='add'>+	VI0_R2_MARK, ETH_LINK_MARK, SD2_CLK_B_MARK, IRQ2_MARK,</div><div class='add'>+	ARM_TRACEDATA_12_MARK, VI0_R3_MARK, ETH_MAGIC_MARK, SD2_CMD_B_MARK,</div><div class='add'>+	IRQ3_MARK, ARM_TRACEDATA_13_MARK, VI0_R4_MARK, ETH_REFCLK_MARK,</div><div class='add'>+	SD2_CD_B_MARK, HSPI_CLK1_B_MARK, ARM_TRACEDATA_14_MARK, MT1_CLK_MARK,</div><div class='add'>+	TS_SCK0_MARK, VI0_R5_MARK, ETH_TXD0_MARK, SD2_WP_B_MARK,</div><div class='add'>+	HSPI_CS1_B_MARK, ARM_TRACEDATA_15_MARK, MT1_D_MARK, TS_SDEN0_MARK,</div><div class='add'>+	VI0_R6_MARK, ETH_MDC_MARK, DREQ2_C_MARK, HSPI_TX1_B_MARK,</div><div class='add'>+	TRACECLK_MARK, MT1_BEN_MARK, PWMFSW0_D_MARK, VI0_R7_MARK,</div><div class='add'>+	ETH_MDIO_MARK, DACK2_C_MARK, HSPI_RX1_B_MARK, SCIF_CLK_D_MARK,</div><div class='add'>+	TRACECTL_MARK, MT1_PEN_MARK, VI1_CLK_MARK, SIM_D_MARK, SDA3_MARK,</div><div class='add'>+	VI1_HSYNC_MARK, VI3_CLK_MARK, SSI_SCK4_MARK, GPS_SIGN_C_MARK,</div><div class='add'>+	PWMFSW0_E_MARK, VI1_VSYNC_MARK, AUDIO_CLKOUT_C_MARK, SSI_WS4_MARK,</div><div class='add'>+	SIM_CLK_MARK, GPS_MAG_C_MARK, SPV_TRST_MARK, SCL3_MARK,</div><div class='add'>+</div><div class='add'>+	VI1_DATA0_VI1_B0_MARK, SD2_DAT0_MARK, SIM_RST_MARK, SPV_TCK_MARK,</div><div class='add'>+	ADICLK_B_MARK, VI1_DATA1_VI1_B1_MARK, SD2_DAT1_MARK, MT0_CLK_MARK,</div><div class='add'>+	SPV_TMS_MARK, ADICS_B_SAMP_B_MARK, VI1_DATA2_VI1_B2_MARK,</div><div class='add'>+	SD2_DAT2_MARK, MT0_D_MARK, SPVTDI_MARK, ADIDATA_B_MARK,</div><div class='add'>+	VI1_DATA3_VI1_B3_MARK, SD2_DAT3_MARK, MT0_BEN_MARK, SPV_TDO_MARK,</div><div class='add'>+	ADICHS0_B_MARK,	VI1_DATA4_VI1_B4_MARK, SD2_CLK_MARK, MT0_PEN_MARK,</div><div class='add'>+	SPA_TRST_MARK, HSPI_CLK1_D_MARK, ADICHS1_B_MARK,</div><div class='add'>+	VI1_DATA5_VI1_B5_MARK, SD2_CMD_MARK, MT0_SYNC_MARK, SPA_TCK_MARK,</div><div class='add'>+	HSPI_CS1_D_MARK, ADICHS2_B_MARK, VI1_DATA6_VI1_B6_MARK, SD2_CD_MARK,</div><div class='add'>+	MT0_VCXO_MARK, SPA_TMS_MARK, HSPI_TX1_D_MARK, VI1_DATA7_VI1_B7_MARK,</div><div class='add'>+	SD2_WP_MARK, MT0_PWM_MARK, SPA_TDI_MARK, HSPI_RX1_D_MARK,</div><div class='add'>+	VI1_G0_MARK, VI3_DATA0_MARK, DU1_DOTCLKOUT1_MARK, TS_SCK1_MARK,</div><div class='add'>+	DREQ2_B_MARK, TX2_MARK,	SPA_TDO_MARK, HCTS0_B_MARK,</div><div class='add'>+	VI1_G1_MARK, VI3_DATA1_MARK, SSI_SCK1_MARK, TS_SDEN1_MARK,</div><div class='add'>+	DACK2_B_MARK, RX2_MARK, HRTS0_B_MARK,</div><div class='add'>+</div><div class='add'>+	VI1_G2_MARK, VI3_DATA2_MARK, SSI_WS1_MARK, TS_SPSYNC1_MARK,</div><div class='add'>+	SCK2_MARK, HSCK0_B_MARK, VI1_G3_MARK, VI3_DATA3_MARK,</div><div class='add'>+	SSI_SCK2_MARK, TS_SDAT1_MARK, SCL1_C_MARK, HTX0_B_MARK,</div><div class='add'>+	VI1_G4_MARK, VI3_DATA4_MARK, SSI_WS2_MARK, SDA1_C_MARK,</div><div class='add'>+	SIM_RST_B_MARK, HRX0_B_MARK, VI1_G5_MARK, VI3_DATA5_MARK,</div><div class='add'>+	GPS_CLK_MARK, FSE_MARK, TX4_B_MARK, SIM_D_B_MARK,</div><div class='add'>+	VI1_G6_MARK, VI3_DATA6_MARK, GPS_SIGN_MARK, FRB_MARK,</div><div class='add'>+	RX4_B_MARK, SIM_CLK_B_MARK, VI1_G7_MARK, VI3_DATA7_MARK,</div><div class='add'>+	GPS_MAG_MARK, FCE_MARK, SCK4_B_MARK,</div><div class='add'>+	PINMUX_MARK_END,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static pinmux_enum_t pinmux_data[] = {</div><div class='add'>+	PINMUX_DATA_GP_ALL(), /* PINMUX_DATA(GP_M_N_DATA, GP_M_N_FN...), */</div><div class='add'>+</div><div class='add'>+	PINMUX_DATA(AVS1_MARK, FN_AVS1),</div><div class='add'>+	PINMUX_DATA(AVS1_MARK, FN_AVS1),</div><div class='add'>+	PINMUX_DATA(A17_MARK, FN_A17),</div><div class='add'>+	PINMUX_DATA(A18_MARK, FN_A18),</div><div class='add'>+	PINMUX_DATA(A19_MARK, FN_A19),</div><div class='add'>+</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_2_0, PENC2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP0_2_0, SCK0, SEL_SCIF0_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_2_0, PWM1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP0_2_0, PWMFSW0, SEL_PWMFSW_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP0_2_0, SCIF_CLK, SEL_SCIF_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP0_2_0, TCLK0_C, SEL_TMU0_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_5_3, BS),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_5_3, SD1_DAT2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_5_3, MMC0_D2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_5_3, FD2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_5_3, ATADIR0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_5_3, SDSELF),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP0_5_3, HCTS1, SEL_HSCIF1_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_5_3, TX4_C),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_7_6, A0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_7_6, SD1_DAT3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_7_6, MMC0_D3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_7_6, FD3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_9_8, A20),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_9_8, TX5_D),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_9_8, HSPI_TX2_B),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_11_10, A21),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP0_11_10, SCK5_D, SEL_SCIF5_3),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP0_11_10, HSPI_CLK2_B, SEL_HSPI2_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_13_12, A22),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP0_13_12, RX5_D, SEL_SCIF5_3),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP0_13_12, HSPI_RX2_B, SEL_HSPI2_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_13_12, VI1_R0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_15_14, A23),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_15_14, FCLE),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP0_15_14, HSPI_CLK2, SEL_HSPI2_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_15_14, VI1_R1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_18_16, A24),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_18_16, SD1_CD),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_18_16, MMC0_D4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_18_16, FD4),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP0_18_16, HSPI_CS2, SEL_HSPI2_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_18_16, VI1_R2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP0_18_16, SSI_WS78_B, SEL_SSI7_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_22_19, A25),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_22_19, SD1_WP),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_22_19, MMC0_D5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_22_19, FD5),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP0_22_19, HSPI_RX2, SEL_HSPI2_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_22_19, VI1_R3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_22_19, TX5_B),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP0_22_19, SSI_SDATA7_B, SEL_SSI7_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP0_22_19, CTS0_B, SEL_SCIF0_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_24_23, CLKOUT),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_24_23, TX3C_IRDA_TX_C),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_24_23, PWM0_B),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_25, CS0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP0_25, HSPI_CS2_B, SEL_HSPI2_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_27_26, CS1_A26),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_27_26, HSPI_TX2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_27_26, SDSELF_B),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_30_28, RD_WR),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_30_28, FWE),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_30_28, ATAG0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP0_30_28, VI1_R7),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP0_30_28, HRTS1, SEL_HSCIF1_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP0_30_28, RX4_C, SEL_SCIF4_2),</div><div class='add'>+</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_1_0, EX_CS0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP1_1_0, RX3_C_IRDA_RX_C, SEL_SCIF3_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_1_0, MMC0_D6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_1_0, FD6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_3_2, EX_CS1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_3_2, MMC0_D7),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_3_2, FD7),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_6_4, EX_CS2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_6_4, SD1_CLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_6_4, MMC0_CLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_6_4, FALE),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_6_4, ATACS00),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_10_7, EX_CS3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_10_7, SD1_CMD),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_10_7, MMC0_CMD),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_10_7, FRE),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_10_7, ATACS10),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_10_7, VI1_R4),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP1_10_7, RX5_B, SEL_SCIF5_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP1_10_7, HSCK1, SEL_HSCIF1_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP1_10_7, SSI_SDATA8_B, SEL_SSI8_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP1_10_7, RTS0_B_TANS_B, SEL_SCIF0_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP1_10_7, SSI_SDATA9, SEL_SSI9_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_14_11, EX_CS4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_14_11, SD1_DAT0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_14_11, MMC0_D0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_14_11, FD0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_14_11, ATARD0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_14_11, VI1_R5),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP1_14_11, SCK5_B, SEL_SCIF5_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_14_11, HTX1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_14_11, TX2_E),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_14_11, TX0_B),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP1_14_11, SSI_SCK9, SEL_SSI9_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_18_15, EX_CS5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_18_15, SD1_DAT1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_18_15, MMC0_D1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_18_15, FD1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_18_15, ATAWR0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_18_15, VI1_R6),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP1_18_15, HRX1, SEL_HSCIF1_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP1_18_15, RX2_E, SEL_SCIF2_4),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP1_18_15, RX0_B, SEL_SCIF0_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP1_18_15, SSI_WS9, SEL_SSI9_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_20_19, MLB_CLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_20_19, PWM2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP1_20_19, SCK4, SEL_SCIF4_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_22_21, MLB_SIG),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_22_21, PWM3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_22_21, TX4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_24_23, MLB_DAT),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_24_23, PWM4),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP1_24_23, RX4, SEL_SCIF4_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_28_25, HTX0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_28_25, TX1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_28_25, SDATA),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP1_28_25, CTS0_C, SEL_SCIF0_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_28_25, SUB_TCK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_28_25, CC5_STATE2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_28_25, CC5_STATE10),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_28_25, CC5_STATE18),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_28_25, CC5_STATE26),</div><div class='add'>+	PINMUX_IPSR_DATA(IP1_28_25, CC5_STATE34),</div><div class='add'>+</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_3_0, HRX0, SEL_HSCIF0_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_3_0, RX1, SEL_SCIF1_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_3_0, SCKZ),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_3_0, RTS0_C_TANS_C, SEL_SCIF0_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_3_0, SUB_TDI),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_3_0, CC5_STATE3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_3_0, CC5_STATE11),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_3_0, CC5_STATE19),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_3_0, CC5_STATE27),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_3_0, CC5_STATE35),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_7_4, HSCK0, SEL_HSCIF0_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_7_4, SCK1, SEL_SCIF1_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_7_4, MTS),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_7_4, PWM5),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_7_4, SCK0_C, SEL_SCIF0_2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_7_4, SSI_SDATA9_B, SEL_SSI9_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_7_4, SUB_TDO),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_7_4, CC5_STATE0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_7_4, CC5_STATE8),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_7_4, CC5_STATE16),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_7_4, CC5_STATE24),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_7_4, CC5_STATE32),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_11_8, HCTS0, SEL_HSCIF0_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_11_8, CTS1, SEL_SCIF1_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_11_8, STM),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_11_8, PWM0_D),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_11_8, RX0_C, SEL_SCIF0_2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_11_8, SCIF_CLK_C, SEL_SCIF_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_11_8, SUB_TRST),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_11_8, TCLK1_B, SEL_TMU1_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_11_8, CC5_OSCOUT),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_15_12, HRTS0, SEL_HSCIF0_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_15_12, RTS1_TANS, SEL_SCIF1_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_15_12, MDATA),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_15_12, TX0_C),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_15_12, SUB_TMS),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_15_12, CC5_STATE1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_15_12, CC5_STATE9),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_15_12, CC5_STATE17),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_15_12, CC5_STATE25),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_15_12, CC5_STATE33),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_18_16, DU0_DR0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_18_16, LCDOUT0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_18_16, DREQ0, SEL_EXBUS0_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_18_16, GPS_CLK_B, SEL_GPS_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_18_16, AUDATA0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_18_16, TX5_C),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_21_19, DU0_DR1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_21_19, LCDOUT1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_21_19, DACK0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_21_19, DRACK0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_21_19, GPS_SIGN_B, SEL_GPS_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_21_19, AUDATA1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_21_19, RX5_C, SEL_SCIF5_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_22, DU0_DR2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_22, LCDOUT2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_23, DU0_DR3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_23, LCDOUT3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_24, DU0_DR4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_24, LCDOUT4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_25, DU0_DR5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_25, LCDOUT5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_26, DU0_DR6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_26, LCDOUT6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_27, DU0_DR7),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_27, LCDOUT7),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_30_28, DU0_DG0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_30_28, LCDOUT8),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_30_28, DREQ1, SEL_EXBUS1_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP2_30_28, SCL2, SEL_I2C2_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP2_30_28, AUDATA2),</div><div class='add'>+</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_2_0, DU0_DG1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_2_0, LCDOUT9),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_2_0, DACK1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP3_2_0, SDA2, SEL_I2C2_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_2_0, AUDATA3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_3, DU0_DG2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_3, LCDOUT10),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_4, DU0_DG3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_4, LCDOUT11),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_5, DU0_DG4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_5, LCDOUT12),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_6, DU0_DG5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_6, LCDOUT13),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_7, DU0_DG6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_7, LCDOUT14),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_8, DU0_DG7),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_8, LCDOUT15),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_11_9, DU0_DB0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_11_9, LCDOUT16),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_11_9, EX_WAIT1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP3_11_9, SCL1, SEL_I2C1_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP3_11_9, TCLK1, SEL_TMU1_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_11_9, AUDATA4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_14_12, DU0_DB1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_14_12, LCDOUT17),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_14_12, EX_WAIT2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP3_14_12, SDA1, SEL_I2C1_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP3_14_12, GPS_MAG_B, SEL_GPS_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_14_12, AUDATA5),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP3_14_12, SCK5_C, SEL_SCIF5_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_15, DU0_DB2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_15, LCDOUT18),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_16, DU0_DB3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_16, LCDOUT19),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_17, DU0_DB4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_17, LCDOUT20),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_18, DU0_DB5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_18, LCDOUT21),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_19, DU0_DB6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_19, LCDOUT22),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_20, DU0_DB7),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_20, LCDOUT23),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_22_21, DU0_DOTCLKIN),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_22_21, QSTVA_QVS),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_22_21, TX3_D_IRDA_TX_D),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP3_22_21, SCL3_B, SEL_I2C3_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_23, DU0_DOTCLKOUT0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_23, QCLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_26_24, DU0_DOTCLKOUT1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_26_24, QSTVB_QVE),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP3_26_24, RX3_D_IRDA_RX_D, SEL_SCIF3_3),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP3_26_24, SDA3_B, SEL_I2C3_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP3_26_24, SDA2_C, SEL_I2C2_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_26_24, DACK0_B),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_26_24, DRACK0_B),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_27, DU0_EXHSYNC_DU0_HSYNC),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_27, QSTH_QHS),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_28, DU0_EXVSYNC_DU0_VSYNC),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_28, QSTB_QHE),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_31_29, DU0_EXODDF_DU0_ODDF_DISP_CDE),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_31_29, QCPV_QDE),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_31_29, CAN1_TX),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_31_29, TX2_C),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP3_31_29, SCL2_C, SEL_I2C2_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP3_31_29, REMOCON),</div><div class='add'>+</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_1_0, DU0_DISP),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_1_0, QPOLA),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP4_1_0, CAN_CLK_C, SEL_CANCLK_2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP4_1_0, SCK2_C, SEL_SCIF2_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_4_2, DU0_CDE),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_4_2, QPOLB),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_4_2, CAN1_RX),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP4_4_2, RX2_C, SEL_SCIF2_2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP4_4_2, DREQ0_B, SEL_EXBUS0_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP4_4_2, SSI_SCK78_B, SEL_SSI7_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP4_4_2, SCK0_B, SEL_SCIF0_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_7_5, DU1_DR0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_7_5, VI2_DATA0_VI2_B0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_7_5, PWM6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_7_5, SD3_CLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_7_5, TX3_E_IRDA_TX_E),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_7_5, AUDCK),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP4_7_5, PWMFSW0_B, SEL_PWMFSW_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_10_8, DU1_DR1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_10_8, VI2_DATA1_VI2_B1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_10_8, PWM0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_10_8, SD3_CMD),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP4_10_8, RX3_E_IRDA_RX_E, SEL_SCIF3_4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_10_8, AUDSYNC),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP4_10_8, CTS0_D, SEL_SCIF0_3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_11, DU1_DR2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_11, VI2_G0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_12, DU1_DR3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_12, VI2_G1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_13, DU1_DR4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_13, VI2_G2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_14, DU1_DR5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_14, VI2_G3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_15, DU1_DR6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_15, VI2_G4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_16, DU1_DR7),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_16, VI2_G5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_19_17, DU1_DG0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_19_17, VI2_DATA2_VI2_B2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP4_19_17, SCL1_B, SEL_I2C1_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_19_17, SD3_DAT2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP4_19_17, SCK3_E, SEL_SCIF3_4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_19_17, AUDATA6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_19_17, TX0_D),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_22_20, DU1_DG1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_22_20, VI2_DATA3_VI2_B3),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP4_22_20, SDA1_B, SEL_I2C1_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_22_20, SD3_DAT3),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP4_22_20, SCK5, SEL_SCIF5_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_22_20, AUDATA7),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP4_22_20, RX0_D, SEL_SCIF0_3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_23, DU1_DG2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_23, VI2_G6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_24, DU1_DG3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_24, VI2_G7),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_25, DU1_DG4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_25, VI2_R0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_26, DU1_DG5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_26, VI2_R1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_27, DU1_DG6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_27, VI2_R2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_28, DU1_DG7),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_28, VI2_R3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_31_29, DU1_DB0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_31_29, VI2_DATA4_VI2_B4),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP4_31_29, SCL2_B, SEL_I2C2_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_31_29, SD3_DAT0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP4_31_29, TX5),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP4_31_29, SCK0_D, SEL_SCIF0_3),</div><div class='add'>+</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_2_0, DU1_DB1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_2_0, VI2_DATA5_VI2_B5),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP5_2_0, SDA2_B, SEL_I2C2_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_2_0, SD3_DAT1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP5_2_0, RX5, SEL_SCIF5_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP5_2_0, RTS0_D_TANS_D, SEL_SCIF0_3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_3, DU1_DB2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_3, VI2_R4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_4, DU1_DB3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_4, VI2_R5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_5, DU1_DB4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_5, VI2_R6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_6, DU1_DB5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_6, VI2_R7),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_7, DU1_DB6),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP5_7, SCL2_D, SEL_I2C2_3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_8, DU1_DB7),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP5_8, SDA2_D, SEL_I2C2_3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_10_9, DU1_DOTCLKIN),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_10_9, VI2_CLKENB),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP5_10_9, HSPI_CS1, SEL_HSPI1_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP5_10_9, SCL1_D, SEL_I2C1_3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_12_11, DU1_DOTCLKOUT),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_12_11, VI2_FIELD),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP5_12_11, SDA1_D, SEL_I2C1_3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_14_13, DU1_EXHSYNC_DU1_HSYNC),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_14_13, VI2_HSYNC),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_14_13, VI3_HSYNC),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_16_15, DU1_EXVSYNC_DU1_VSYNC),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_16_15, VI2_VSYNC),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_16_15, VI3_VSYNC),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_20_17, DU1_EXODDF_DU1_ODDF_DISP_CDE),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_20_17, VI2_CLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_20_17, TX3_B_IRDA_TX_B),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_20_17, SD3_CD),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_20_17, HSPI_TX1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_20_17, VI1_CLKENB),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_20_17, VI3_CLKENB),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_20_17, AUDIO_CLKC),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_20_17, TX2_D),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_20_17, SPEEDIN),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP5_20_17, GPS_SIGN_D, SEL_GPS_3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_23_21, DU1_DISP),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_23_21, VI2_DATA6_VI2_B6),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP5_23_21, TCLK0, SEL_TMU0_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_23_21, QSTVA_B_QVS_B),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP5_23_21, HSPI_CLK1, SEL_HSPI1_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP5_23_21, SCK2_D, SEL_SCIF2_3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_23_21, AUDIO_CLKOUT_B),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP5_23_21, GPS_MAG_D, SEL_GPS_3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_27_24, DU1_CDE),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_27_24, VI2_DATA7_VI2_B7),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP5_27_24, RX3_B_IRDA_RX_B, SEL_SCIF3_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_27_24, SD3_WP),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP5_27_24, HSPI_RX1, SEL_HSPI1_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_27_24, VI1_FIELD),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_27_24, VI3_FIELD),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_27_24, AUDIO_CLKOUT),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP5_27_24, RX2_D, SEL_SCIF2_3),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP5_27_24, GPS_CLK_C, SEL_GPS_2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP5_27_24, GPS_CLK_D, SEL_GPS_3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_28, AUDIO_CLKA),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_28, CAN_TXCLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_30_29, AUDIO_CLKB),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_30_29, USB_OVC2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_30_29, CAN_DEBUGOUT0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP5_30_29, MOUT0),</div><div class='add'>+</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_1_0, SSI_SCK0129),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_1_0, CAN_DEBUGOUT1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_1_0, MOUT1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_3_2, SSI_WS0129),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_3_2, CAN_DEBUGOUT2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_3_2, MOUT2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_5_4, SSI_SDATA0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_5_4, CAN_DEBUGOUT3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_5_4, MOUT5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_7_6, SSI_SDATA1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_7_6, CAN_DEBUGOUT4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_7_6, MOUT6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_8, SSI_SDATA2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_8, CAN_DEBUGOUT5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_11_9, SSI_SCK34),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_11_9, CAN_DEBUGOUT6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_11_9, CAN0_TX_B),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP6_11_9, IERX, SEL_IE_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP6_11_9, SSI_SCK9_C, SEL_SSI9_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_14_12, SSI_WS34),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_14_12, CAN_DEBUGOUT7),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP6_14_12, CAN0_RX_B, SEL_CAN0_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_14_12, IETX),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP6_14_12, SSI_WS9_C, SEL_SSI9_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_17_15, SSI_SDATA3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_17_15, PWM0_C),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_17_15, CAN_DEBUGOUT8),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP6_17_15, CAN_CLK_B, SEL_CANCLK_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP6_17_15, IECLK, SEL_IE_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP6_17_15, SCIF_CLK_B, SEL_SCIF_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP6_17_15, TCLK0_B, SEL_TMU0_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_19_18, SSI_SDATA4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_19_18, CAN_DEBUGOUT9),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP6_19_18, SSI_SDATA9_C, SEL_SSI9_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_22_20, SSI_SCK5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_22_20, ADICLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_22_20, CAN_DEBUGOUT10),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP6_22_20, SCK3, SEL_SCIF3_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP6_22_20, TCLK0_D, SEL_TMU0_3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_24_23, SSI_WS5),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP6_24_23, ADICS_SAMP, SEL_ADI_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_24_23, CAN_DEBUGOUT11),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_24_23, TX3_IRDA_TX),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_26_25, SSI_SDATA5),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP6_26_25, ADIDATA, SEL_ADI_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_26_25, CAN_DEBUGOUT12),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP6_26_25, RX3_IRDA_RX, SEL_SCIF3_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_30_29, SSI_SCK6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_30_29, ADICHS0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP6_30_29, CAN0_TX),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP6_30_29, IERX_B, SEL_IE_1),</div><div class='add'>+</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_1_0, SSI_WS6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_1_0, ADICHS1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_1_0, CAN0_RX, SEL_CAN0_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_1_0, IETX_B),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_3_2, SSI_SDATA6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_3_2, ADICHS2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_3_2, CAN_CLK, SEL_CANCLK_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_3_2, IECLK_B, SEL_IE_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_6_4, SSI_SCK78, SEL_SSI7_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_6_4, CAN_DEBUGOUT13),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_6_4, IRQ0_B, SEL_INT0_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_6_4, SSI_SCK9_B, SEL_SSI9_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_6_4, HSPI_CLK1_C, SEL_HSPI1_2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_9_7, SSI_WS78, SEL_SSI7_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_9_7, CAN_DEBUGOUT14),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_9_7, IRQ1_B, SEL_INT1_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_9_7, SSI_WS9_B, SEL_SSI9_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_9_7, HSPI_CS1_C, SEL_HSPI1_2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_12_10, SSI_SDATA7, SEL_SSI7_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_12_10, CAN_DEBUGOUT15),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_12_10, IRQ2_B, SEL_INT2_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_12_10, TCLK1_C, SEL_TMU1_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_12_10, HSPI_TX1_C),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_14_13, SSI_SDATA8, SEL_SSI8_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_14_13, VSP),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_14_13, IRQ3_B, SEL_INT3_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_14_13, HSPI_RX1_C, SEL_HSPI1_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_16_15, SD0_CLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_16_15, ATACS01),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_16_15, SCK1_B, SEL_SCIF1_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_18_17, SD0_CMD),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_18_17, ATACS11),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_18_17, TX1_B),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_18_17, CC5_TDO),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_20_19, SD0_DAT0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_20_19, ATADIR1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_20_19, RX1_B, SEL_SCIF1_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_20_19, CC5_TRST),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_22_21, SD0_DAT1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_22_21, ATAG1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_22_21, SCK2_B, SEL_SCIF2_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_22_21, CC5_TMS),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_24_23, SD0_DAT2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_24_23, ATARD1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_24_23, TX2_B),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_24_23, CC5_TCK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_26_25, SD0_DAT3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_26_25, ATAWR1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_26_25, RX2_B, SEL_SCIF2_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_26_25, CC5_TDI),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_28_27, SD0_CD),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_28_27, DREQ2, SEL_EXBUS2_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_28_27, RTS1_B_TANS_B, SEL_SCIF1_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_30_29, SD0_WP),</div><div class='add'>+	PINMUX_IPSR_DATA(IP7_30_29, DACK2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP7_30_29, CTS1_B, SEL_SCIF1_1),</div><div class='add'>+</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_3_0, HSPI_CLK0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP8_3_0, CTS0, SEL_SCIF0_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_3_0, USB_OVC0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_3_0, AD_CLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_3_0, CC5_STATE4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_3_0, CC5_STATE12),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_3_0, CC5_STATE20),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_3_0, CC5_STATE28),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_3_0, CC5_STATE36),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_7_4, HSPI_CS0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP8_7_4, RTS0_TANS, SEL_SCIF0_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_7_4, USB_OVC1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_7_4, AD_DI),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_7_4, CC5_STATE5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_7_4, CC5_STATE13),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_7_4, CC5_STATE21),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_7_4, CC5_STATE29),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_7_4, CC5_STATE37),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_11_8, HSPI_TX0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_11_8, TX0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_11_8, CAN_DEBUG_HW_TRIGGER),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_11_8, AD_DO),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_11_8, CC5_STATE6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_11_8, CC5_STATE14),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_11_8, CC5_STATE22),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_11_8, CC5_STATE30),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_11_8, CC5_STATE38),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_15_12, HSPI_RX0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP8_15_12, RX0, SEL_SCIF0_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_15_12, CAN_STEP0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_15_12, AD_NCS),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_15_12, CC5_STATE7),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_15_12, CC5_STATE15),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_15_12, CC5_STATE23),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_15_12, CC5_STATE31),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_15_12, CC5_STATE39),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_17_16, FMCLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_17_16, RDS_CLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_17_16, PCMOE),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_18, BPFCLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_18, PCMWE),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_19, FMIN),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_19, RDS_DATA),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_20, VI0_CLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_20, MMC1_CLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_22_21, VI0_CLKENB),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_22_21, TX1_C),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_22_21, HTX1_B),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_22_21, MT1_SYNC),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_24_23, VI0_FIELD),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP8_24_23, RX1_C, SEL_SCIF1_2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP8_24_23, HRX1_B, SEL_HSCIF1_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_27_25, VI0_HSYNC),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP8_27_25, VI0_DATA0_B_VI0_B0_B, SEL_VI0_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP8_27_25, CTS1_C, SEL_SCIF1_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_27_25, TX4_D),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_27_25, MMC1_CMD),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP8_27_25, HSCK1_B, SEL_HSCIF1_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP8_30_28, VI0_VSYNC),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP8_30_28, VI0_DATA1_B_VI0_B1_B, SEL_VI0_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP8_30_28, RTS1_C_TANS_C, SEL_SCIF1_2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP8_30_28, RX4_D, SEL_SCIF4_3),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP8_30_28, PWMFSW0_C, SEL_PWMFSW_2),</div><div class='add'>+</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP9_1_0, VI0_DATA0_VI0_B0, SEL_VI0_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP9_1_0, HRTS1_B, SEL_HSCIF1_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_1_0, MT1_VCXO),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP9_3_2, VI0_DATA1_VI0_B1, SEL_VI0_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP9_3_2, HCTS1_B, SEL_HSCIF1_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_3_2, MT1_PWM),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_4, VI0_DATA2_VI0_B2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_4, MMC1_D0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_5, VI0_DATA3_VI0_B3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_5, MMC1_D1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_6, VI0_DATA4_VI0_B4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_6, MMC1_D2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_7, VI0_DATA5_VI0_B5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_7, MMC1_D3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_9_8, VI0_DATA6_VI0_B6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_9_8, MMC1_D4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_9_8, ARM_TRACEDATA_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_11_10, VI0_DATA7_VI0_B7),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_11_10, MMC1_D5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_11_10, ARM_TRACEDATA_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_13_12, VI0_G0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP9_13_12, SSI_SCK78_C, SEL_SSI7_2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP9_13_12, IRQ0, SEL_INT0_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_13_12, ARM_TRACEDATA_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_15_14, VI0_G1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP9_15_14, SSI_WS78_C, SEL_SSI7_2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP9_15_14, IRQ1, SEL_INT1_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_15_14, ARM_TRACEDATA_3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_18_16, VI0_G2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_18_16, ETH_TXD1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_18_16, MMC1_D6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_18_16, ARM_TRACEDATA_4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_18_16, TS_SPSYNC0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_21_19, VI0_G3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_21_19, ETH_CRS_DV),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_21_19, MMC1_D7),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_21_19, ARM_TRACEDATA_5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_21_19, TS_SDAT0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_23_22, VI0_G4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_23_22, ETH_TX_EN),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP9_23_22, SD2_DAT0_B, SEL_SD2_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_23_22, ARM_TRACEDATA_6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_25_24, VI0_G5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_25_24, ETH_RX_ER),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP9_25_24, SD2_DAT1_B, SEL_SD2_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_25_24, ARM_TRACEDATA_7),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_27_26, VI0_G6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_27_26, ETH_RXD0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP9_27_26, SD2_DAT2_B, SEL_SD2_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_27_26, ARM_TRACEDATA_8),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_29_28, VI0_G7),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_29_28, ETH_RXD1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP9_29_28, SD2_DAT3_B, SEL_SD2_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP9_29_28, ARM_TRACEDATA_9),</div><div class='add'>+</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_2_0, VI0_R0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_2_0, SSI_SDATA7_C, SEL_SSI7_2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_2_0, SCK1_C, SEL_SCIF1_2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_2_0, DREQ1_B, SEL_EXBUS1_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_2_0, ARM_TRACEDATA_10),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_2_0, DREQ0_C, SEL_EXBUS0_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_5_3, VI0_R1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_5_3, SSI_SDATA8_C, SEL_SSI8_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_5_3, DACK1_B),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_5_3, ARM_TRACEDATA_11),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_5_3, DACK0_C),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_5_3, DRACK0_C),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_8_6, VI0_R2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_8_6, ETH_LINK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_8_6, SD2_CLK_B),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_8_6, IRQ2, SEL_INT2_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_8_6, ARM_TRACEDATA_12),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_11_9, VI0_R3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_11_9, ETH_MAGIC),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_11_9, SD2_CMD_B, SEL_SD2_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_11_9, IRQ3, SEL_INT3_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_11_9, ARM_TRACEDATA_13),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_14_12, VI0_R4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_14_12, ETH_REFCLK),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_14_12, SD2_CD_B, SEL_SD2_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_14_12, HSPI_CLK1_B, SEL_HSPI1_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_14_12, ARM_TRACEDATA_14),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_14_12, MT1_CLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_14_12, TS_SCK0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_17_15, VI0_R5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_17_15, ETH_TXD0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_17_15, SD2_WP_B, SEL_SD2_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_17_15, HSPI_CS1_B, SEL_HSPI1_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_17_15, ARM_TRACEDATA_15),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_17_15, MT1_D),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_17_15, TS_SDEN0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_20_18, VI0_R6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_20_18, ETH_MDC),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_20_18, DREQ2_C, SEL_EXBUS2_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_20_18, HSPI_TX1_B),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_20_18, TRACECLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_20_18, MT1_BEN),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_20_18, PWMFSW0_D, SEL_PWMFSW_3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_23_21, VI0_R7),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_23_21, ETH_MDIO),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_23_21, DACK2_C),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_23_21, HSPI_RX1_B, SEL_HSPI1_1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_23_21, SCIF_CLK_D, SEL_SCIF_3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_23_21, TRACECTL),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_23_21, MT1_PEN),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_25_24, VI1_CLK),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_25_24, SIM_D, SEL_SIM_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_25_24, SDA3, SEL_I2C3_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_28_26, VI1_HSYNC),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_28_26, VI3_CLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_28_26, SSI_SCK4),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_28_26, GPS_SIGN_C, SEL_GPS_2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_28_26, PWMFSW0_E, SEL_PWMFSW_4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_31_29, VI1_VSYNC),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_31_29, AUDIO_CLKOUT_C),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_31_29, SSI_WS4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_31_29, SIM_CLK),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_31_29, GPS_MAG_C, SEL_GPS_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP10_31_29, SPV_TRST),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP10_31_29, SCL3, SEL_I2C3_0),</div><div class='add'>+</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_2_0, VI1_DATA0_VI1_B0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP11_2_0, SD2_DAT0, SEL_SD2_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_2_0, SIM_RST),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_2_0, SPV_TCK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_2_0, ADICLK_B),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_5_3, VI1_DATA1_VI1_B1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP11_5_3, SD2_DAT1, SEL_SD2_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_5_3, MT0_CLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_5_3, SPV_TMS),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP11_5_3, ADICS_B_SAMP_B, SEL_ADI_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_8_6, VI1_DATA2_VI1_B2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP11_8_6, SD2_DAT2, SEL_SD2_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_8_6, MT0_D),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_8_6, SPVTDI),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP11_8_6, ADIDATA_B, SEL_ADI_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_11_9, VI1_DATA3_VI1_B3),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP11_11_9, SD2_DAT3, SEL_SD2_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_11_9, MT0_BEN),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_11_9, SPV_TDO),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_11_9, ADICHS0_B),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_14_12, VI1_DATA4_VI1_B4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_14_12, SD2_CLK),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_14_12, MT0_PEN),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_14_12, SPA_TRST),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP11_14_12, HSPI_CLK1_D, SEL_HSPI1_3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_14_12, ADICHS1_B),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_17_15, VI1_DATA5_VI1_B5),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP11_17_15, SD2_CMD, SEL_SD2_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_17_15, MT0_SYNC),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_17_15, SPA_TCK),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP11_17_15, HSPI_CS1_D, SEL_HSPI1_3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_17_15, ADICHS2_B),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_20_18, VI1_DATA6_VI1_B6),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP11_20_18, SD2_CD, SEL_SD2_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_20_18, MT0_VCXO),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_20_18, SPA_TMS),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_20_18, HSPI_TX1_D),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_23_21, VI1_DATA7_VI1_B7),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP11_23_21, SD2_WP, SEL_SD2_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_23_21, MT0_PWM),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_23_21, SPA_TDI),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP11_23_21, HSPI_RX1_D, SEL_HSPI1_3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_26_24, VI1_G0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_26_24, VI3_DATA0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_26_24, DU1_DOTCLKOUT1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_26_24, TS_SCK1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP11_26_24, DREQ2_B, SEL_EXBUS2_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_26_24, TX2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_26_24, SPA_TDO),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP11_26_24, HCTS0_B, SEL_HSCIF0_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_29_27, VI1_G1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_29_27, VI3_DATA1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_29_27, SSI_SCK1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_29_27, TS_SDEN1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP11_29_27, DACK2_B),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP11_29_27, RX2, SEL_SCIF2_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP11_29_27, HRTS0_B, SEL_HSCIF0_1),</div><div class='add'>+</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_2_0, VI1_G2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_2_0, VI3_DATA2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_2_0, SSI_WS1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_2_0, TS_SPSYNC1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP12_2_0, SCK2, SEL_SCIF2_0),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP12_2_0, HSCK0_B, SEL_HSCIF0_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_5_3, VI1_G3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_5_3, VI3_DATA3),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_5_3, SSI_SCK2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_5_3, TS_SDAT1),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP12_5_3, SCL1_C, SEL_I2C1_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_5_3, HTX0_B),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_8_6, VI1_G4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_8_6, VI3_DATA4),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_8_6, SSI_WS2),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP12_8_6, SDA1_C, SEL_I2C1_2),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_8_6, SIM_RST_B),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP12_8_6, HRX0_B, SEL_HSCIF0_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_11_9, VI1_G5),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_11_9, VI3_DATA5),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP12_11_9, GPS_CLK, SEL_GPS_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_11_9, FSE),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_11_9, TX4_B),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP12_11_9, SIM_D_B, SEL_SIM_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_14_12, VI1_G6),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_14_12, VI3_DATA6),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP12_14_12, GPS_SIGN, SEL_GPS_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_14_12, FRB),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP12_14_12, RX4_B, SEL_SCIF4_1),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_14_12, SIM_CLK_B),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_17_15, VI1_G7),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_17_15, VI3_DATA7),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP12_17_15, GPS_MAG, SEL_GPS_0),</div><div class='add'>+	PINMUX_IPSR_DATA(IP12_17_15, FCE),</div><div class='add'>+	PINMUX_IPSR_MODSEL_DATA(IP12_17_15, SCK4_B, SEL_SCIF4_1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pinmux_gpio pinmux_gpios[] = {</div><div class='add'>+	PINMUX_GPIO_GP_ALL(),</div><div class='add'>+	GPIO_FN(AVS1), GPIO_FN(AVS2), GPIO_FN(A17), GPIO_FN(A18),</div><div class='add'>+	GPIO_FN(A19),</div><div class='add'>+</div><div class='add'>+	/* IPSR0 */</div><div class='add'>+	GPIO_FN(PENC2), GPIO_FN(SCK0), GPIO_FN(PWM1), GPIO_FN(PWMFSW0),</div><div class='add'>+	GPIO_FN(SCIF_CLK), GPIO_FN(TCLK0_C), GPIO_FN(BS), GPIO_FN(SD1_DAT2),</div><div class='add'>+	GPIO_FN(MMC0_D2), GPIO_FN(FD2), GPIO_FN(ATADIR0), GPIO_FN(SDSELF),</div><div class='add'>+	GPIO_FN(HCTS1), GPIO_FN(TX4_C), GPIO_FN(A0), GPIO_FN(SD1_DAT3),</div><div class='add'>+	GPIO_FN(MMC0_D3), GPIO_FN(FD3), GPIO_FN(A20), GPIO_FN(TX5_D),</div><div class='add'>+	GPIO_FN(HSPI_TX2_B), GPIO_FN(A21), GPIO_FN(SCK5_D),</div><div class='add'>+	GPIO_FN(HSPI_CLK2_B), GPIO_FN(A22), GPIO_FN(RX5_D),</div><div class='add'>+	GPIO_FN(HSPI_RX2_B), GPIO_FN(VI1_R0), GPIO_FN(A23), GPIO_FN(FCLE),</div><div class='add'>+	GPIO_FN(HSPI_CLK2), GPIO_FN(VI1_R1), GPIO_FN(A24), GPIO_FN(SD1_CD),</div><div class='add'>+	GPIO_FN(MMC0_D4), GPIO_FN(FD4),	GPIO_FN(HSPI_CS2), GPIO_FN(VI1_R2),</div><div class='add'>+	GPIO_FN(SSI_WS78_B), GPIO_FN(A25), GPIO_FN(SD1_WP), GPIO_FN(MMC0_D5),</div><div class='add'>+	GPIO_FN(FD5), GPIO_FN(HSPI_RX2), GPIO_FN(VI1_R3), GPIO_FN(TX5_B),</div><div class='add'>+	GPIO_FN(SSI_SDATA7_B), GPIO_FN(CTS0_B), GPIO_FN(CLKOUT),</div><div class='add'>+	GPIO_FN(TX3C_IRDA_TX_C), GPIO_FN(PWM0_B), GPIO_FN(CS0),</div><div class='add'>+	GPIO_FN(HSPI_CS2_B), GPIO_FN(CS1_A26), GPIO_FN(HSPI_TX2),</div><div class='add'>+	GPIO_FN(SDSELF_B), GPIO_FN(RD_WR), GPIO_FN(FWE), GPIO_FN(ATAG0),</div><div class='add'>+	GPIO_FN(VI1_R7), GPIO_FN(HRTS1), GPIO_FN(RX4_C),</div><div class='add'>+</div><div class='add'>+	/* IPSR1 */</div><div class='add'>+	GPIO_FN(EX_CS0), GPIO_FN(RX3_C_IRDA_RX_C), GPIO_FN(MMC0_D6),</div><div class='add'>+	GPIO_FN(FD6), GPIO_FN(EX_CS1), GPIO_FN(MMC0_D7), GPIO_FN(FD7),</div><div class='add'>+	GPIO_FN(EX_CS2), GPIO_FN(SD1_CLK), GPIO_FN(MMC0_CLK), GPIO_FN(FALE),</div><div class='add'>+	GPIO_FN(ATACS00), GPIO_FN(EX_CS3), GPIO_FN(SD1_CMD), GPIO_FN(MMC0_CMD),</div><div class='add'>+	GPIO_FN(FRE), GPIO_FN(ATACS10), GPIO_FN(VI1_R4), GPIO_FN(RX5_B),</div><div class='add'>+	GPIO_FN(HSCK1), GPIO_FN(SSI_SDATA8_B), GPIO_FN(RTS0_B_TANS_B),</div><div class='add'>+	GPIO_FN(SSI_SDATA9), GPIO_FN(EX_CS4), GPIO_FN(SD1_DAT0),</div><div class='add'>+	GPIO_FN(MMC0_D0), GPIO_FN(FD0), GPIO_FN(ATARD0), GPIO_FN(VI1_R5),</div><div class='add'>+	GPIO_FN(SCK5_B), GPIO_FN(HTX1), GPIO_FN(TX2_E), GPIO_FN(TX0_B),</div><div class='add'>+	GPIO_FN(SSI_SCK9), GPIO_FN(EX_CS5), GPIO_FN(SD1_DAT1),</div><div class='add'>+	GPIO_FN(MMC0_D1), GPIO_FN(FD1),	GPIO_FN(ATAWR0), GPIO_FN(VI1_R6),</div><div class='add'>+	GPIO_FN(HRX1), GPIO_FN(RX2_E), GPIO_FN(RX0_B), GPIO_FN(SSI_WS9),</div><div class='add'>+	GPIO_FN(MLB_CLK), GPIO_FN(PWM2), GPIO_FN(SCK4), GPIO_FN(MLB_SIG),</div><div class='add'>+	GPIO_FN(PWM3), GPIO_FN(TX4), GPIO_FN(MLB_DAT), GPIO_FN(PWM4),</div><div class='add'>+	GPIO_FN(RX4), GPIO_FN(HTX0), GPIO_FN(TX1), GPIO_FN(SDATA),</div><div class='add'>+	GPIO_FN(CTS0_C), GPIO_FN(SUB_TCK), GPIO_FN(CC5_STATE2),</div><div class='add'>+	GPIO_FN(CC5_STATE10), GPIO_FN(CC5_STATE18), GPIO_FN(CC5_STATE26),</div><div class='add'>+	GPIO_FN(CC5_STATE34),</div><div class='add'>+</div><div class='add'>+	/* IPSR2 */</div><div class='add'>+	GPIO_FN(HRX0), GPIO_FN(RX1), GPIO_FN(SCKZ), GPIO_FN(RTS0_C_TANS_C),</div><div class='add'>+	GPIO_FN(SUB_TDI), GPIO_FN(CC5_STATE3), GPIO_FN(CC5_STATE11),</div><div class='add'>+	GPIO_FN(CC5_STATE19), GPIO_FN(CC5_STATE27), GPIO_FN(CC5_STATE35),</div><div class='add'>+	GPIO_FN(HSCK0), GPIO_FN(SCK1), GPIO_FN(MTS), GPIO_FN(PWM5),</div><div class='add'>+	GPIO_FN(SCK0_C), GPIO_FN(SSI_SDATA9_B), GPIO_FN(SUB_TDO),</div><div class='add'>+	GPIO_FN(CC5_STATE0), GPIO_FN(CC5_STATE8), GPIO_FN(CC5_STATE16),</div><div class='add'>+	GPIO_FN(CC5_STATE24), GPIO_FN(CC5_STATE32), GPIO_FN(HCTS0),</div><div class='add'>+	GPIO_FN(CTS1), GPIO_FN(STM), GPIO_FN(PWM0_D), GPIO_FN(RX0_C),</div><div class='add'>+	GPIO_FN(SCIF_CLK_C), GPIO_FN(SUB_TRST), GPIO_FN(TCLK1_B),</div><div class='add'>+	GPIO_FN(CC5_OSCOUT), GPIO_FN(HRTS0), GPIO_FN(RTS1_TANS),</div><div class='add'>+	GPIO_FN(MDATA), GPIO_FN(TX0_C), GPIO_FN(SUB_TMS), GPIO_FN(CC5_STATE1),</div><div class='add'>+	GPIO_FN(CC5_STATE9), GPIO_FN(CC5_STATE17), GPIO_FN(CC5_STATE25),</div><div class='add'>+	GPIO_FN(CC5_STATE33), GPIO_FN(DU0_DR0), GPIO_FN(LCDOUT0),</div><div class='add'>+	GPIO_FN(DREQ0), GPIO_FN(GPS_CLK_B), GPIO_FN(AUDATA0),</div><div class='add'>+	GPIO_FN(TX5_C), GPIO_FN(DU0_DR1), GPIO_FN(LCDOUT1), GPIO_FN(DACK0),</div><div class='add'>+	GPIO_FN(DRACK0), GPIO_FN(GPS_SIGN_B), GPIO_FN(AUDATA1), GPIO_FN(RX5_C),</div><div class='add'>+	GPIO_FN(DU0_DR2), GPIO_FN(LCDOUT2), GPIO_FN(DU0_DR3), GPIO_FN(LCDOUT3),</div><div class='add'>+	GPIO_FN(DU0_DR4), GPIO_FN(LCDOUT4), GPIO_FN(DU0_DR5), GPIO_FN(LCDOUT5),</div><div class='add'>+	GPIO_FN(DU0_DR6), GPIO_FN(LCDOUT6), GPIO_FN(DU0_DR7), GPIO_FN(LCDOUT7),</div><div class='add'>+	GPIO_FN(DU0_DG0), GPIO_FN(LCDOUT8), GPIO_FN(DREQ1), GPIO_FN(SCL2),</div><div class='add'>+	GPIO_FN(AUDATA2),</div><div class='add'>+</div><div class='add'>+	/* IPSR3 */</div><div class='add'>+	GPIO_FN(DU0_DG1), GPIO_FN(LCDOUT9), GPIO_FN(DACK1), GPIO_FN(SDA2),</div><div class='add'>+	GPIO_FN(AUDATA3), GPIO_FN(DU0_DG2), GPIO_FN(LCDOUT10),</div><div class='add'>+	GPIO_FN(DU0_DG3), GPIO_FN(LCDOUT11), GPIO_FN(DU0_DG4),</div><div class='add'>+	GPIO_FN(LCDOUT12), GPIO_FN(DU0_DG5), GPIO_FN(LCDOUT13),</div><div class='add'>+	GPIO_FN(DU0_DG6), GPIO_FN(LCDOUT14), GPIO_FN(DU0_DG7),</div><div class='add'>+	GPIO_FN(LCDOUT15), GPIO_FN(DU0_DB0), GPIO_FN(LCDOUT16),</div><div class='add'>+	GPIO_FN(EX_WAIT1), GPIO_FN(SCL1), GPIO_FN(TCLK1), GPIO_FN(AUDATA4),</div><div class='add'>+	GPIO_FN(DU0_DB1), GPIO_FN(LCDOUT17), GPIO_FN(EX_WAIT2), GPIO_FN(SDA1),</div><div class='add'>+	GPIO_FN(GPS_MAG_B), GPIO_FN(AUDATA5), GPIO_FN(SCK5_C),</div><div class='add'>+	GPIO_FN(DU0_DB2), GPIO_FN(LCDOUT18), GPIO_FN(DU0_DB3),</div><div class='add'>+	GPIO_FN(LCDOUT19), GPIO_FN(DU0_DB4), GPIO_FN(LCDOUT20),</div><div class='add'>+	GPIO_FN(DU0_DB5), GPIO_FN(LCDOUT21), GPIO_FN(DU0_DB6),</div><div class='add'>+	GPIO_FN(LCDOUT22), GPIO_FN(DU0_DB7), GPIO_FN(LCDOUT23),</div><div class='add'>+	GPIO_FN(DU0_DOTCLKIN), GPIO_FN(QSTVA_QVS), GPIO_FN(TX3_D_IRDA_TX_D),</div><div class='add'>+	GPIO_FN(SCL3_B), GPIO_FN(DU0_DOTCLKOUT0), GPIO_FN(QCLK),</div><div class='add'>+	GPIO_FN(DU0_DOTCLKOUT1), GPIO_FN(QSTVB_QVE), GPIO_FN(RX3_D_IRDA_RX_D),</div><div class='add'>+	GPIO_FN(SDA3_B), GPIO_FN(SDA2_C), GPIO_FN(DACK0_B), GPIO_FN(DRACK0_B),</div><div class='add'>+	GPIO_FN(DU0_EXHSYNC_DU0_HSYNC), GPIO_FN(QSTH_QHS),</div><div class='add'>+	GPIO_FN(DU0_EXVSYNC_DU0_VSYNC), GPIO_FN(QSTB_QHE),</div><div class='add'>+	GPIO_FN(DU0_EXODDF_DU0_ODDF_DISP_CDE), GPIO_FN(QCPV_QDE),</div><div class='add'>+	GPIO_FN(CAN1_TX), GPIO_FN(TX2_C), GPIO_FN(SCL2_C), GPIO_FN(REMOCON),</div><div class='add'>+</div><div class='add'>+	/* IPSR4 */</div><div class='add'>+	GPIO_FN(DU0_DISP), GPIO_FN(QPOLA), GPIO_FN(CAN_CLK_C), GPIO_FN(SCK2_C),</div><div class='add'>+	GPIO_FN(DU0_CDE), GPIO_FN(QPOLB), GPIO_FN(CAN1_RX), GPIO_FN(RX2_C),</div><div class='add'>+	GPIO_FN(DREQ0_B), GPIO_FN(SSI_SCK78_B), GPIO_FN(SCK0_B),</div><div class='add'>+	GPIO_FN(DU1_DR0), GPIO_FN(VI2_DATA0_VI2_B0), GPIO_FN(PWM6),</div><div class='add'>+	GPIO_FN(SD3_CLK), GPIO_FN(TX3_E_IRDA_TX_E), GPIO_FN(AUDCK),</div><div class='add'>+	GPIO_FN(PWMFSW0_B), GPIO_FN(DU1_DR1), GPIO_FN(VI2_DATA1_VI2_B1),</div><div class='add'>+	GPIO_FN(PWM0), GPIO_FN(SD3_CMD), GPIO_FN(RX3_E_IRDA_RX_E),</div><div class='add'>+	GPIO_FN(AUDSYNC), GPIO_FN(CTS0_D), GPIO_FN(DU1_DR2), GPIO_FN(VI2_G0),</div><div class='add'>+	GPIO_FN(DU1_DR3), GPIO_FN(VI2_G1), GPIO_FN(DU1_DR4), GPIO_FN(VI2_G2),</div><div class='add'>+	GPIO_FN(DU1_DR5), GPIO_FN(VI2_G3), GPIO_FN(DU1_DR6), GPIO_FN(VI2_G4),</div><div class='add'>+	GPIO_FN(DU1_DR7), GPIO_FN(VI2_G5), GPIO_FN(DU1_DG0),</div><div class='add'>+	GPIO_FN(VI2_DATA2_VI2_B2), GPIO_FN(SCL1_B), GPIO_FN(SD3_DAT2),</div><div class='add'>+	GPIO_FN(SCK3_E), GPIO_FN(AUDATA6), GPIO_FN(TX0_D), GPIO_FN(DU1_DG1),</div><div class='add'>+	GPIO_FN(VI2_DATA3_VI2_B3), GPIO_FN(SDA1_B), GPIO_FN(SD3_DAT3),</div><div class='add'>+	GPIO_FN(SCK5), GPIO_FN(AUDATA7), GPIO_FN(RX0_D), GPIO_FN(DU1_DG2),</div><div class='add'>+	GPIO_FN(VI2_G6), GPIO_FN(DU1_DG3), GPIO_FN(VI2_G7), GPIO_FN(DU1_DG4),</div><div class='add'>+	GPIO_FN(VI2_R0), GPIO_FN(DU1_DG5), GPIO_FN(VI2_R1), GPIO_FN(DU1_DG6),</div><div class='add'>+	GPIO_FN(VI2_R2), GPIO_FN(DU1_DG7), GPIO_FN(VI2_R3), GPIO_FN(DU1_DB0),</div><div class='add'>+	GPIO_FN(VI2_DATA4_VI2_B4), GPIO_FN(SCL2_B), GPIO_FN(SD3_DAT0),</div><div class='add'>+	GPIO_FN(TX5), GPIO_FN(SCK0_D),</div><div class='add'>+</div><div class='add'>+	/* IPSR5 */</div><div class='add'>+	GPIO_FN(DU1_DB1), GPIO_FN(VI2_DATA5_VI2_B5), GPIO_FN(SDA2_B),</div><div class='add'>+	GPIO_FN(SD3_DAT1), GPIO_FN(RX5), GPIO_FN(RTS0_D_TANS_D),</div><div class='add'>+	GPIO_FN(DU1_DB2), GPIO_FN(VI2_R4), GPIO_FN(DU1_DB3), GPIO_FN(VI2_R5),</div><div class='add'>+	GPIO_FN(DU1_DB4), GPIO_FN(VI2_R6), GPIO_FN(DU1_DB5), GPIO_FN(VI2_R7),</div><div class='add'>+	GPIO_FN(DU1_DB6), GPIO_FN(SCL2_D), GPIO_FN(DU1_DB7), GPIO_FN(SDA2_D),</div><div class='add'>+	GPIO_FN(DU1_DOTCLKIN), GPIO_FN(VI2_CLKENB), GPIO_FN(HSPI_CS1),</div><div class='add'>+	GPIO_FN(SCL1_D), GPIO_FN(DU1_DOTCLKOUT), GPIO_FN(VI2_FIELD),</div><div class='add'>+	GPIO_FN(SDA1_D), GPIO_FN(DU1_EXHSYNC_DU1_HSYNC), GPIO_FN(VI2_HSYNC),</div><div class='add'>+	GPIO_FN(VI3_HSYNC), GPIO_FN(DU1_EXVSYNC_DU1_VSYNC), GPIO_FN(VI2_VSYNC),</div><div class='add'>+	GPIO_FN(VI3_VSYNC), GPIO_FN(DU1_EXODDF_DU1_ODDF_DISP_CDE),</div><div class='add'>+	GPIO_FN(VI2_CLK), GPIO_FN(TX3_B_IRDA_TX_B), GPIO_FN(SD3_CD),</div><div class='add'>+	GPIO_FN(HSPI_TX1), GPIO_FN(VI1_CLKENB), GPIO_FN(VI3_CLKENB),</div><div class='add'>+	GPIO_FN(AUDIO_CLKC), GPIO_FN(TX2_D), GPIO_FN(SPEEDIN),</div><div class='add'>+	GPIO_FN(GPS_SIGN_D), GPIO_FN(DU1_DISP), GPIO_FN(VI2_DATA6_VI2_B6),</div><div class='add'>+	GPIO_FN(TCLK0), GPIO_FN(QSTVA_B_QVS_B), GPIO_FN(HSPI_CLK1),</div><div class='add'>+	GPIO_FN(SCK2_D), GPIO_FN(AUDIO_CLKOUT_B), GPIO_FN(GPS_MAG_D),</div><div class='add'>+	GPIO_FN(DU1_CDE), GPIO_FN(VI2_DATA7_VI2_B7), GPIO_FN(RX3_B_IRDA_RX_B),</div><div class='add'>+	GPIO_FN(SD3_WP), GPIO_FN(HSPI_RX1), GPIO_FN(VI1_FIELD),</div><div class='add'>+	GPIO_FN(VI3_FIELD), GPIO_FN(AUDIO_CLKOUT), GPIO_FN(RX2_D),</div><div class='add'>+	GPIO_FN(GPS_CLK_C), GPIO_FN(GPS_CLK_D), GPIO_FN(AUDIO_CLKA),</div><div class='add'>+	GPIO_FN(CAN_TXCLK), GPIO_FN(AUDIO_CLKB), GPIO_FN(USB_OVC2),</div><div class='add'>+	GPIO_FN(CAN_DEBUGOUT0), GPIO_FN(MOUT0),</div><div class='add'>+</div><div class='add'>+	/* IPSR6 */</div><div class='add'>+	GPIO_FN(SSI_SCK0129), GPIO_FN(CAN_DEBUGOUT1), GPIO_FN(MOUT1),</div><div class='add'>+	GPIO_FN(SSI_WS0129), GPIO_FN(CAN_DEBUGOUT2), GPIO_FN(MOUT2),</div><div class='add'>+	GPIO_FN(SSI_SDATA0), GPIO_FN(CAN_DEBUGOUT3), GPIO_FN(MOUT5),</div><div class='add'>+	GPIO_FN(SSI_SDATA1), GPIO_FN(CAN_DEBUGOUT4), GPIO_FN(MOUT6),</div><div class='add'>+	GPIO_FN(SSI_SDATA2), GPIO_FN(CAN_DEBUGOUT5), GPIO_FN(SSI_SCK34),</div><div class='add'>+	GPIO_FN(CAN_DEBUGOUT6), GPIO_FN(CAN0_TX_B), GPIO_FN(IERX),</div><div class='add'>+	GPIO_FN(SSI_SCK9_C), GPIO_FN(SSI_WS34), GPIO_FN(CAN_DEBUGOUT7),</div><div class='add'>+	GPIO_FN(CAN0_RX_B), GPIO_FN(IETX), GPIO_FN(SSI_WS9_C),</div><div class='add'>+	GPIO_FN(SSI_SDATA3), GPIO_FN(PWM0_C), GPIO_FN(CAN_DEBUGOUT8),</div><div class='add'>+	GPIO_FN(CAN_CLK_B), GPIO_FN(IECLK), GPIO_FN(SCIF_CLK_B),</div><div class='add'>+	GPIO_FN(TCLK0_B), GPIO_FN(SSI_SDATA4), GPIO_FN(CAN_DEBUGOUT9),</div><div class='add'>+	GPIO_FN(SSI_SDATA9_C), GPIO_FN(SSI_SCK5), GPIO_FN(ADICLK),</div><div class='add'>+	GPIO_FN(CAN_DEBUGOUT10), GPIO_FN(SCK3), GPIO_FN(TCLK0_D),</div><div class='add'>+	GPIO_FN(SSI_WS5), GPIO_FN(ADICS_SAMP), GPIO_FN(CAN_DEBUGOUT11),</div><div class='add'>+	GPIO_FN(TX3_IRDA_TX), GPIO_FN(SSI_SDATA5), GPIO_FN(ADIDATA),</div><div class='add'>+	GPIO_FN(CAN_DEBUGOUT12), GPIO_FN(RX3_IRDA_RX), GPIO_FN(SSI_SCK6),</div><div class='add'>+	GPIO_FN(ADICHS0), GPIO_FN(CAN0_TX), GPIO_FN(IERX_B),</div><div class='add'>+</div><div class='add'>+	/* IPSR7 */</div><div class='add'>+	GPIO_FN(SSI_WS6), GPIO_FN(ADICHS1), GPIO_FN(CAN0_RX), GPIO_FN(IETX_B),</div><div class='add'>+	GPIO_FN(SSI_SDATA6), GPIO_FN(ADICHS2), GPIO_FN(CAN_CLK),</div><div class='add'>+	GPIO_FN(IECLK_B), GPIO_FN(SSI_SCK78), GPIO_FN(CAN_DEBUGOUT13),</div><div class='add'>+	GPIO_FN(IRQ0_B), GPIO_FN(SSI_SCK9_B), GPIO_FN(HSPI_CLK1_C),</div><div class='add'>+	GPIO_FN(SSI_WS78), GPIO_FN(CAN_DEBUGOUT14), GPIO_FN(IRQ1_B),</div><div class='add'>+	GPIO_FN(SSI_WS9_B), GPIO_FN(HSPI_CS1_C), GPIO_FN(SSI_SDATA7),</div><div class='add'>+	GPIO_FN(CAN_DEBUGOUT15), GPIO_FN(IRQ2_B), GPIO_FN(TCLK1_C),</div><div class='add'>+	GPIO_FN(HSPI_TX1_C), GPIO_FN(SSI_SDATA8), GPIO_FN(VSP),</div><div class='add'>+	GPIO_FN(IRQ3_B), GPIO_FN(HSPI_RX1_C), GPIO_FN(SD0_CLK),</div><div class='add'>+	GPIO_FN(ATACS01), GPIO_FN(SCK1_B), GPIO_FN(SD0_CMD), GPIO_FN(ATACS11),</div><div class='add'>+	GPIO_FN(TX1_B), GPIO_FN(CC5_TDO), GPIO_FN(SD0_DAT0), GPIO_FN(ATADIR1),</div><div class='add'>+	GPIO_FN(RX1_B), GPIO_FN(CC5_TRST), GPIO_FN(SD0_DAT1), GPIO_FN(ATAG1),</div><div class='add'>+	GPIO_FN(SCK2_B), GPIO_FN(CC5_TMS), GPIO_FN(SD0_DAT2), GPIO_FN(ATARD1),</div><div class='add'>+	GPIO_FN(TX2_B), GPIO_FN(CC5_TCK), GPIO_FN(SD0_DAT3), GPIO_FN(ATAWR1),</div><div class='add'>+	GPIO_FN(RX2_B), GPIO_FN(CC5_TDI), GPIO_FN(SD0_CD), GPIO_FN(DREQ2),</div><div class='add'>+	GPIO_FN(RTS1_B_TANS_B), GPIO_FN(SD0_WP), GPIO_FN(DACK2),</div><div class='add'>+	GPIO_FN(CTS1_B),</div><div class='add'>+</div><div class='add'>+	/* IPSR8 */</div><div class='add'>+	GPIO_FN(HSPI_CLK0), GPIO_FN(CTS0), GPIO_FN(USB_OVC0), GPIO_FN(AD_CLK),</div><div class='add'>+	GPIO_FN(CC5_STATE4), GPIO_FN(CC5_STATE12), GPIO_FN(CC5_STATE20),</div><div class='add'>+	GPIO_FN(CC5_STATE28), GPIO_FN(CC5_STATE36), GPIO_FN(HSPI_CS0),</div><div class='add'>+	GPIO_FN(RTS0_TANS), GPIO_FN(USB_OVC1), GPIO_FN(AD_DI),</div><div class='add'>+	GPIO_FN(CC5_STATE5), GPIO_FN(CC5_STATE13), GPIO_FN(CC5_STATE21),</div><div class='add'>+	GPIO_FN(CC5_STATE29), GPIO_FN(CC5_STATE37), GPIO_FN(HSPI_TX0),</div><div class='add'>+	GPIO_FN(TX0), GPIO_FN(CAN_DEBUG_HW_TRIGGER), GPIO_FN(AD_DO),</div><div class='add'>+	GPIO_FN(CC5_STATE6), GPIO_FN(CC5_STATE14), GPIO_FN(CC5_STATE22),</div><div class='add'>+	GPIO_FN(CC5_STATE30), GPIO_FN(CC5_STATE38), GPIO_FN(HSPI_RX0),</div><div class='add'>+	GPIO_FN(RX0), GPIO_FN(CAN_STEP0), GPIO_FN(AD_NCS), GPIO_FN(CC5_STATE7),</div><div class='add'>+	GPIO_FN(CC5_STATE15), GPIO_FN(CC5_STATE23), GPIO_FN(CC5_STATE31),</div><div class='add'>+	GPIO_FN(CC5_STATE39), GPIO_FN(FMCLK), GPIO_FN(RDS_CLK), GPIO_FN(PCMOE),</div><div class='add'>+	GPIO_FN(BPFCLK), GPIO_FN(PCMWE), GPIO_FN(FMIN), GPIO_FN(RDS_DATA),</div><div class='add'>+	GPIO_FN(VI0_CLK), GPIO_FN(MMC1_CLK), GPIO_FN(VI0_CLKENB),</div><div class='add'>+	GPIO_FN(TX1_C), GPIO_FN(HTX1_B), GPIO_FN(MT1_SYNC),</div><div class='add'>+	GPIO_FN(VI0_FIELD), GPIO_FN(RX1_C), GPIO_FN(HRX1_B),</div><div class='add'>+	GPIO_FN(VI0_HSYNC), GPIO_FN(VI0_DATA0_B_VI0_B0_B), GPIO_FN(CTS1_C),</div><div class='add'>+	GPIO_FN(TX4_D), GPIO_FN(MMC1_CMD), GPIO_FN(HSCK1_B),</div><div class='add'>+	GPIO_FN(VI0_VSYNC), GPIO_FN(VI0_DATA1_B_VI0_B1_B),</div><div class='add'>+	GPIO_FN(RTS1_C_TANS_C), GPIO_FN(RX4_D), GPIO_FN(PWMFSW0_C),</div><div class='add'>+</div><div class='add'>+	/* IPSR9 */</div><div class='add'>+	GPIO_FN(VI0_DATA0_VI0_B0), GPIO_FN(HRTS1_B), GPIO_FN(MT1_VCXO),</div><div class='add'>+	GPIO_FN(VI0_DATA1_VI0_B1), GPIO_FN(HCTS1_B), GPIO_FN(MT1_PWM),</div><div class='add'>+	GPIO_FN(VI0_DATA2_VI0_B2), GPIO_FN(MMC1_D0), GPIO_FN(VI0_DATA3_VI0_B3),</div><div class='add'>+	GPIO_FN(MMC1_D1), GPIO_FN(VI0_DATA4_VI0_B4), GPIO_FN(MMC1_D2),</div><div class='add'>+	GPIO_FN(VI0_DATA5_VI0_B5), GPIO_FN(MMC1_D3), GPIO_FN(VI0_DATA6_VI0_B6),</div><div class='add'>+	GPIO_FN(MMC1_D4), GPIO_FN(ARM_TRACEDATA_0), GPIO_FN(VI0_DATA7_VI0_B7),</div><div class='add'>+	GPIO_FN(MMC1_D5), GPIO_FN(ARM_TRACEDATA_1), GPIO_FN(VI0_G0),</div><div class='add'>+	GPIO_FN(SSI_SCK78_C), GPIO_FN(IRQ0), GPIO_FN(ARM_TRACEDATA_2),</div><div class='add'>+	GPIO_FN(VI0_G1), GPIO_FN(SSI_WS78_C), GPIO_FN(IRQ1),</div><div class='add'>+	GPIO_FN(ARM_TRACEDATA_3), GPIO_FN(VI0_G2), GPIO_FN(ETH_TXD1),</div><div class='add'>+	GPIO_FN(MMC1_D6), GPIO_FN(ARM_TRACEDATA_4), GPIO_FN(TS_SPSYNC0),</div><div class='add'>+	GPIO_FN(VI0_G3), GPIO_FN(ETH_CRS_DV), GPIO_FN(MMC1_D7),</div><div class='add'>+	GPIO_FN(ARM_TRACEDATA_5), GPIO_FN(TS_SDAT0), GPIO_FN(VI0_G4),</div><div class='add'>+	GPIO_FN(ETH_TX_EN), GPIO_FN(SD2_DAT0_B), GPIO_FN(ARM_TRACEDATA_6),</div><div class='add'>+	GPIO_FN(VI0_G5), GPIO_FN(ETH_RX_ER), GPIO_FN(SD2_DAT1_B),</div><div class='add'>+	GPIO_FN(ARM_TRACEDATA_7), GPIO_FN(VI0_G6), GPIO_FN(ETH_RXD0),</div><div class='add'>+	GPIO_FN(SD2_DAT2_B), GPIO_FN(ARM_TRACEDATA_8), GPIO_FN(VI0_G7),</div><div class='add'>+	GPIO_FN(ETH_RXD1), GPIO_FN(SD2_DAT3_B), GPIO_FN(ARM_TRACEDATA_9),</div><div class='add'>+</div><div class='add'>+	/* IPSR10 */</div><div class='add'>+	GPIO_FN(VI0_R0), GPIO_FN(SSI_SDATA7_C), GPIO_FN(SCK1_C),</div><div class='add'>+	GPIO_FN(DREQ1_B), GPIO_FN(ARM_TRACEDATA_10), GPIO_FN(DREQ0_C),</div><div class='add'>+	GPIO_FN(VI0_R1), GPIO_FN(SSI_SDATA8_C), GPIO_FN(DACK1_B),</div><div class='add'>+	GPIO_FN(ARM_TRACEDATA_11), GPIO_FN(DACK0_C), GPIO_FN(DRACK0_C),</div><div class='add'>+	GPIO_FN(VI0_R2), GPIO_FN(ETH_LINK), GPIO_FN(SD2_CLK_B), GPIO_FN(IRQ2),</div><div class='add'>+	GPIO_FN(ARM_TRACEDATA_12), GPIO_FN(VI0_R3), GPIO_FN(ETH_MAGIC),</div><div class='add'>+	GPIO_FN(SD2_CMD_B), GPIO_FN(IRQ3), GPIO_FN(ARM_TRACEDATA_13),</div><div class='add'>+	GPIO_FN(VI0_R4), GPIO_FN(ETH_REFCLK), GPIO_FN(SD2_CD_B),</div><div class='add'>+	GPIO_FN(HSPI_CLK1_B), GPIO_FN(ARM_TRACEDATA_14), GPIO_FN(MT1_CLK),</div><div class='add'>+	GPIO_FN(TS_SCK0), GPIO_FN(VI0_R5), GPIO_FN(ETH_TXD0),</div><div class='add'>+	GPIO_FN(SD2_WP_B), GPIO_FN(HSPI_CS1_B), GPIO_FN(ARM_TRACEDATA_15),</div><div class='add'>+	GPIO_FN(MT1_D), GPIO_FN(TS_SDEN0), GPIO_FN(VI0_R6), GPIO_FN(ETH_MDC),</div><div class='add'>+	GPIO_FN(DREQ2_C), GPIO_FN(HSPI_TX1_B), GPIO_FN(TRACECLK),</div><div class='add'>+	GPIO_FN(MT1_BEN), GPIO_FN(PWMFSW0_D), GPIO_FN(VI0_R7),</div><div class='add'>+	GPIO_FN(ETH_MDIO), GPIO_FN(DACK2_C), GPIO_FN(HSPI_RX1_B),</div><div class='add'>+	GPIO_FN(SCIF_CLK_D), GPIO_FN(TRACECTL), GPIO_FN(MT1_PEN),</div><div class='add'>+	GPIO_FN(VI1_CLK), GPIO_FN(SIM_D), GPIO_FN(SDA3), GPIO_FN(VI1_HSYNC),</div><div class='add'>+	GPIO_FN(VI3_CLK), GPIO_FN(SSI_SCK4), GPIO_FN(GPS_SIGN_C),</div><div class='add'>+	GPIO_FN(PWMFSW0_E), GPIO_FN(VI1_VSYNC), GPIO_FN(AUDIO_CLKOUT_C),</div><div class='add'>+	GPIO_FN(SSI_WS4), GPIO_FN(SIM_CLK), GPIO_FN(GPS_MAG_C),</div><div class='add'>+	GPIO_FN(SPV_TRST), GPIO_FN(SCL3),</div><div class='add'>+</div><div class='add'>+	/* IPSR11 */</div><div class='add'>+	GPIO_FN(VI1_DATA0_VI1_B0), GPIO_FN(SD2_DAT0), GPIO_FN(SIM_RST),</div><div class='add'>+	GPIO_FN(SPV_TCK), GPIO_FN(ADICLK_B), GPIO_FN(VI1_DATA1_VI1_B1),</div><div class='add'>+	GPIO_FN(SD2_DAT1), GPIO_FN(MT0_CLK), GPIO_FN(SPV_TMS),</div><div class='add'>+	GPIO_FN(ADICS_B_SAMP_B), GPIO_FN(VI1_DATA2_VI1_B2), GPIO_FN(SD2_DAT2),</div><div class='add'>+	GPIO_FN(MT0_D), GPIO_FN(SPVTDI), GPIO_FN(ADIDATA_B),</div><div class='add'>+	GPIO_FN(VI1_DATA3_VI1_B3), GPIO_FN(SD2_DAT3), GPIO_FN(MT0_BEN),</div><div class='add'>+	GPIO_FN(SPV_TDO), GPIO_FN(ADICHS0_B), GPIO_FN(VI1_DATA4_VI1_B4),</div><div class='add'>+	GPIO_FN(SD2_CLK), GPIO_FN(MT0_PEN), GPIO_FN(SPA_TRST),</div><div class='add'>+	GPIO_FN(HSPI_CLK1_D), GPIO_FN(ADICHS1_B), GPIO_FN(VI1_DATA5_VI1_B5),</div><div class='add'>+	GPIO_FN(SD2_CMD), GPIO_FN(MT0_SYNC), GPIO_FN(SPA_TCK),</div><div class='add'>+	GPIO_FN(HSPI_CS1_D), GPIO_FN(ADICHS2_B), GPIO_FN(VI1_DATA6_VI1_B6),</div><div class='add'>+	GPIO_FN(SD2_CD), GPIO_FN(MT0_VCXO), GPIO_FN(SPA_TMS),</div><div class='add'>+	GPIO_FN(HSPI_TX1_D), GPIO_FN(VI1_DATA7_VI1_B7), GPIO_FN(SD2_WP),</div><div class='add'>+	GPIO_FN(MT0_PWM), GPIO_FN(SPA_TDI), GPIO_FN(HSPI_RX1_D),</div><div class='add'>+	GPIO_FN(VI1_G0), GPIO_FN(VI3_DATA0), GPIO_FN(DU1_DOTCLKOUT1),</div><div class='add'>+	GPIO_FN(TS_SCK1), GPIO_FN(DREQ2_B), GPIO_FN(TX2), GPIO_FN(SPA_TDO),</div><div class='add'>+	GPIO_FN(HCTS0_B), GPIO_FN(VI1_G1), GPIO_FN(VI3_DATA1),</div><div class='add'>+	GPIO_FN(SSI_SCK1), GPIO_FN(TS_SDEN1), GPIO_FN(DACK2_B), GPIO_FN(RX2),</div><div class='add'>+	GPIO_FN(HRTS0_B),</div><div class='add'>+</div><div class='add'>+	/* IPSR12 */</div><div class='add'>+	GPIO_FN(VI1_G2), GPIO_FN(VI3_DATA2), GPIO_FN(SSI_WS1),</div><div class='add'>+	GPIO_FN(TS_SPSYNC1), GPIO_FN(SCK2), GPIO_FN(HSCK0_B), GPIO_FN(VI1_G3),</div><div class='add'>+	GPIO_FN(VI3_DATA3), GPIO_FN(SSI_SCK2), GPIO_FN(TS_SDAT1),</div><div class='add'>+	GPIO_FN(SCL1_C), GPIO_FN(HTX0_B), GPIO_FN(VI1_G4), GPIO_FN(VI3_DATA4),</div><div class='add'>+	GPIO_FN(SSI_WS2), GPIO_FN(SDA1_C), GPIO_FN(SIM_RST_B),</div><div class='add'>+	GPIO_FN(HRX0_B), GPIO_FN(VI1_G5), GPIO_FN(VI3_DATA5),</div><div class='add'>+	GPIO_FN(GPS_CLK), GPIO_FN(FSE), GPIO_FN(TX4_B), GPIO_FN(SIM_D_B),</div><div class='add'>+	GPIO_FN(VI1_G6), GPIO_FN(VI3_DATA6), GPIO_FN(GPS_SIGN), GPIO_FN(FRB),</div><div class='add'>+	GPIO_FN(RX4_B), GPIO_FN(SIM_CLK_B), GPIO_FN(VI1_G7),</div><div class='add'>+	GPIO_FN(VI3_DATA7), GPIO_FN(GPS_MAG), GPIO_FN(FCE), GPIO_FN(SCK4_B),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pinmux_cfg_reg pinmux_config_regs[] = {</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR0", 0xfffc0004, 32, 1) {</div><div class='add'>+		GP_0_31_FN, FN_IP3_31_29,</div><div class='add'>+		GP_0_30_FN, FN_IP3_26_24,</div><div class='add'>+		GP_0_29_FN, FN_IP3_22_21,</div><div class='add'>+		GP_0_28_FN, FN_IP3_14_12,</div><div class='add'>+		GP_0_27_FN, FN_IP3_11_9,</div><div class='add'>+		GP_0_26_FN, FN_IP3_2_0,</div><div class='add'>+		GP_0_25_FN, FN_IP2_30_28,</div><div class='add'>+		GP_0_24_FN, FN_IP2_21_19,</div><div class='add'>+		GP_0_23_FN, FN_IP2_18_16,</div><div class='add'>+		GP_0_22_FN, FN_IP0_30_28,</div><div class='add'>+		GP_0_21_FN, FN_IP0_5_3,</div><div class='add'>+		GP_0_20_FN, FN_IP1_18_15,</div><div class='add'>+		GP_0_19_FN, FN_IP1_14_11,</div><div class='add'>+		GP_0_18_FN, FN_IP1_10_7,</div><div class='add'>+		GP_0_17_FN, FN_IP1_6_4,</div><div class='add'>+		GP_0_16_FN, FN_IP1_3_2,</div><div class='add'>+		GP_0_15_FN, FN_IP1_1_0,</div><div class='add'>+		GP_0_14_FN, FN_IP0_27_26,</div><div class='add'>+		GP_0_13_FN, FN_IP0_25,</div><div class='add'>+		GP_0_12_FN, FN_IP0_24_23,</div><div class='add'>+		GP_0_11_FN, FN_IP0_22_19,</div><div class='add'>+		GP_0_10_FN, FN_IP0_18_16,</div><div class='add'>+		GP_0_9_FN, FN_IP0_15_14,</div><div class='add'>+		GP_0_8_FN, FN_IP0_13_12,</div><div class='add'>+		GP_0_7_FN, FN_IP0_11_10,</div><div class='add'>+		GP_0_6_FN, FN_IP0_9_8,</div><div class='add'>+		GP_0_5_FN, FN_A19,</div><div class='add'>+		GP_0_4_FN, FN_A18,</div><div class='add'>+		GP_0_3_FN, FN_A17,</div><div class='add'>+		GP_0_2_FN, FN_IP0_7_6,</div><div class='add'>+		GP_0_1_FN, FN_AVS2,</div><div class='add'>+		GP_0_0_FN, FN_AVS1 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR1", 0xfffc0008, 32, 1) {</div><div class='add'>+		GP_1_31_FN, FN_IP5_23_21,</div><div class='add'>+		GP_1_30_FN, FN_IP5_20_17,</div><div class='add'>+		GP_1_29_FN, FN_IP5_16_15,</div><div class='add'>+		GP_1_28_FN, FN_IP5_14_13,</div><div class='add'>+		GP_1_27_FN, FN_IP5_12_11,</div><div class='add'>+		GP_1_26_FN, FN_IP5_10_9,</div><div class='add'>+		GP_1_25_FN, FN_IP5_8,</div><div class='add'>+		GP_1_24_FN, FN_IP5_7,</div><div class='add'>+		GP_1_23_FN, FN_IP5_6,</div><div class='add'>+		GP_1_22_FN, FN_IP5_5,</div><div class='add'>+		GP_1_21_FN, FN_IP5_4,</div><div class='add'>+		GP_1_20_FN, FN_IP5_3,</div><div class='add'>+		GP_1_19_FN, FN_IP5_2_0,</div><div class='add'>+		GP_1_18_FN, FN_IP4_31_29,</div><div class='add'>+		GP_1_17_FN, FN_IP4_28,</div><div class='add'>+		GP_1_16_FN, FN_IP4_27,</div><div class='add'>+		GP_1_15_FN, FN_IP4_26,</div><div class='add'>+		GP_1_14_FN, FN_IP4_25,</div><div class='add'>+		GP_1_13_FN, FN_IP4_24,</div><div class='add'>+		GP_1_12_FN, FN_IP4_23,</div><div class='add'>+		GP_1_11_FN, FN_IP4_22_20,</div><div class='add'>+		GP_1_10_FN, FN_IP4_19_17,</div><div class='add'>+		GP_1_9_FN, FN_IP4_16,</div><div class='add'>+		GP_1_8_FN, FN_IP4_15,</div><div class='add'>+		GP_1_7_FN, FN_IP4_14,</div><div class='add'>+		GP_1_6_FN, FN_IP4_13,</div><div class='add'>+		GP_1_5_FN, FN_IP4_12,</div><div class='add'>+		GP_1_4_FN, FN_IP4_11,</div><div class='add'>+		GP_1_3_FN, FN_IP4_10_8,</div><div class='add'>+		GP_1_2_FN, FN_IP4_7_5,</div><div class='add'>+		GP_1_1_FN, FN_IP4_4_2,</div><div class='add'>+		GP_1_0_FN, FN_IP4_1_0 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR2", 0xfffc000c, 32, 1) {</div><div class='add'>+		GP_2_31_FN, FN_IP10_28_26,</div><div class='add'>+		GP_2_30_FN, FN_IP10_25_24,</div><div class='add'>+		GP_2_29_FN, FN_IP10_23_21,</div><div class='add'>+		GP_2_28_FN, FN_IP10_20_18,</div><div class='add'>+		GP_2_27_FN, FN_IP10_17_15,</div><div class='add'>+		GP_2_26_FN, FN_IP10_14_12,</div><div class='add'>+		GP_2_25_FN, FN_IP10_11_9,</div><div class='add'>+		GP_2_24_FN, FN_IP10_8_6,</div><div class='add'>+		GP_2_23_FN, FN_IP10_5_3,</div><div class='add'>+		GP_2_22_FN, FN_IP10_2_0,</div><div class='add'>+		GP_2_21_FN, FN_IP9_29_28,</div><div class='add'>+		GP_2_20_FN, FN_IP9_27_26,</div><div class='add'>+		GP_2_19_FN, FN_IP9_25_24,</div><div class='add'>+		GP_2_18_FN, FN_IP9_23_22,</div><div class='add'>+		GP_2_17_FN, FN_IP9_21_19,</div><div class='add'>+		GP_2_16_FN, FN_IP9_18_16,</div><div class='add'>+		GP_2_15_FN, FN_IP9_15_14,</div><div class='add'>+		GP_2_14_FN, FN_IP9_13_12,</div><div class='add'>+		GP_2_13_FN, FN_IP9_11_10,</div><div class='add'>+		GP_2_12_FN, FN_IP9_9_8,</div><div class='add'>+		GP_2_11_FN, FN_IP9_7,</div><div class='add'>+		GP_2_10_FN, FN_IP9_6,</div><div class='add'>+		GP_2_9_FN, FN_IP9_5,</div><div class='add'>+		GP_2_8_FN, FN_IP9_4,</div><div class='add'>+		GP_2_7_FN, FN_IP9_3_2,</div><div class='add'>+		GP_2_6_FN, FN_IP9_1_0,</div><div class='add'>+		GP_2_5_FN, FN_IP8_30_28,</div><div class='add'>+		GP_2_4_FN, FN_IP8_27_25,</div><div class='add'>+		GP_2_3_FN, FN_IP8_24_23,</div><div class='add'>+		GP_2_2_FN, FN_IP8_22_21,</div><div class='add'>+		GP_2_1_FN, FN_IP8_20,</div><div class='add'>+		GP_2_0_FN, FN_IP5_27_24 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR3", 0xfffc0010, 32, 1) {</div><div class='add'>+		GP_3_31_FN, FN_IP6_3_2,</div><div class='add'>+		GP_3_30_FN, FN_IP6_1_0,</div><div class='add'>+		GP_3_29_FN, FN_IP5_30_29,</div><div class='add'>+		GP_3_28_FN, FN_IP5_28,</div><div class='add'>+		GP_3_27_FN, FN_IP1_24_23,</div><div class='add'>+		GP_3_26_FN, FN_IP1_22_21,</div><div class='add'>+		GP_3_25_FN, FN_IP1_20_19,</div><div class='add'>+		GP_3_24_FN, FN_IP7_26_25,</div><div class='add'>+		GP_3_23_FN, FN_IP7_24_23,</div><div class='add'>+		GP_3_22_FN, FN_IP7_22_21,</div><div class='add'>+		GP_3_21_FN, FN_IP7_20_19,</div><div class='add'>+		GP_3_20_FN, FN_IP7_30_29,</div><div class='add'>+		GP_3_19_FN, FN_IP7_28_27,</div><div class='add'>+		GP_3_18_FN, FN_IP7_18_17,</div><div class='add'>+		GP_3_17_FN, FN_IP7_16_15,</div><div class='add'>+		GP_3_16_FN, FN_IP12_17_15,</div><div class='add'>+		GP_3_15_FN, FN_IP12_14_12,</div><div class='add'>+		GP_3_14_FN, FN_IP12_11_9,</div><div class='add'>+		GP_3_13_FN, FN_IP12_8_6,</div><div class='add'>+		GP_3_12_FN, FN_IP12_5_3,</div><div class='add'>+		GP_3_11_FN, FN_IP12_2_0,</div><div class='add'>+		GP_3_10_FN, FN_IP11_29_27,</div><div class='add'>+		GP_3_9_FN, FN_IP11_26_24,</div><div class='add'>+		GP_3_8_FN, FN_IP11_23_21,</div><div class='add'>+		GP_3_7_FN, FN_IP11_20_18,</div><div class='add'>+		GP_3_6_FN, FN_IP11_17_15,</div><div class='add'>+		GP_3_5_FN, FN_IP11_14_12,</div><div class='add'>+		GP_3_4_FN, FN_IP11_11_9,</div><div class='add'>+		GP_3_3_FN, FN_IP11_8_6,</div><div class='add'>+		GP_3_2_FN, FN_IP11_5_3,</div><div class='add'>+		GP_3_1_FN, FN_IP11_2_0,</div><div class='add'>+		GP_3_0_FN, FN_IP10_31_29 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR4", 0xfffc0014, 32, 1) {</div><div class='add'>+		GP_4_31_FN, FN_IP8_19,</div><div class='add'>+		GP_4_30_FN, FN_IP8_18,</div><div class='add'>+		GP_4_29_FN, FN_IP8_17_16,</div><div class='add'>+		GP_4_28_FN, FN_IP0_2_0,</div><div class='add'>+		GP_4_27_FN, FN_PENC1,</div><div class='add'>+		GP_4_26_FN, FN_PENC0,</div><div class='add'>+		GP_4_25_FN, FN_IP8_15_12,</div><div class='add'>+		GP_4_24_FN, FN_IP8_11_8,</div><div class='add'>+		GP_4_23_FN, FN_IP8_7_4,</div><div class='add'>+		GP_4_22_FN, FN_IP8_3_0,</div><div class='add'>+		GP_4_21_FN, FN_IP2_3_0,</div><div class='add'>+		GP_4_20_FN, FN_IP1_28_25,</div><div class='add'>+		GP_4_19_FN, FN_IP2_15_12,</div><div class='add'>+		GP_4_18_FN, FN_IP2_11_8,</div><div class='add'>+		GP_4_17_FN, FN_IP2_7_4,</div><div class='add'>+		GP_4_16_FN, FN_IP7_14_13,</div><div class='add'>+		GP_4_15_FN, FN_IP7_12_10,</div><div class='add'>+		GP_4_14_FN, FN_IP7_9_7,</div><div class='add'>+		GP_4_13_FN, FN_IP7_6_4,</div><div class='add'>+		GP_4_12_FN, FN_IP7_3_2,</div><div class='add'>+		GP_4_11_FN, FN_IP7_1_0,</div><div class='add'>+		GP_4_10_FN, FN_IP6_30_29,</div><div class='add'>+		GP_4_9_FN, FN_IP6_26_25,</div><div class='add'>+		GP_4_8_FN, FN_IP6_24_23,</div><div class='add'>+		GP_4_7_FN, FN_IP6_22_20,</div><div class='add'>+		GP_4_6_FN, FN_IP6_19_18,</div><div class='add'>+		GP_4_5_FN, FN_IP6_17_15,</div><div class='add'>+		GP_4_4_FN, FN_IP6_14_12,</div><div class='add'>+		GP_4_3_FN, FN_IP6_11_9,</div><div class='add'>+		GP_4_2_FN, FN_IP6_8,</div><div class='add'>+		GP_4_1_FN, FN_IP6_7_6,</div><div class='add'>+		GP_4_0_FN, FN_IP6_5_4 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR5", 0xfffc0018, 32, 1) {</div><div class='add'>+		GP_5_31_FN, FN_IP3_5,</div><div class='add'>+		GP_5_30_FN, FN_IP3_4,</div><div class='add'>+		GP_5_29_FN, FN_IP3_3,</div><div class='add'>+		GP_5_28_FN, FN_IP2_27,</div><div class='add'>+		GP_5_27_FN, FN_IP2_26,</div><div class='add'>+		GP_5_26_FN, FN_IP2_25,</div><div class='add'>+		GP_5_25_FN, FN_IP2_24,</div><div class='add'>+		GP_5_24_FN, FN_IP2_23,</div><div class='add'>+		GP_5_23_FN, FN_IP2_22,</div><div class='add'>+		GP_5_22_FN, FN_IP3_28,</div><div class='add'>+		GP_5_21_FN, FN_IP3_27,</div><div class='add'>+		GP_5_20_FN, FN_IP3_23,</div><div class='add'>+		GP_5_19_FN, FN_EX_WAIT0,</div><div class='add'>+		GP_5_18_FN, FN_WE1,</div><div class='add'>+		GP_5_17_FN, FN_WE0,</div><div class='add'>+		GP_5_16_FN, FN_RD,</div><div class='add'>+		GP_5_15_FN, FN_A16,</div><div class='add'>+		GP_5_14_FN, FN_A15,</div><div class='add'>+		GP_5_13_FN, FN_A14,</div><div class='add'>+		GP_5_12_FN, FN_A13,</div><div class='add'>+		GP_5_11_FN, FN_A12,</div><div class='add'>+		GP_5_10_FN, FN_A11,</div><div class='add'>+		GP_5_9_FN, FN_A10,</div><div class='add'>+		GP_5_8_FN, FN_A9,</div><div class='add'>+		GP_5_7_FN, FN_A8,</div><div class='add'>+		GP_5_6_FN, FN_A7,</div><div class='add'>+		GP_5_5_FN, FN_A6,</div><div class='add'>+		GP_5_4_FN, FN_A5,</div><div class='add'>+		GP_5_3_FN, FN_A4,</div><div class='add'>+		GP_5_2_FN, FN_A3,</div><div class='add'>+		GP_5_1_FN, FN_A2,</div><div class='add'>+		GP_5_0_FN, FN_A1 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG("GPSR6", 0xfffc001c, 32, 1) {</div><div class='add'>+		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='add'>+		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+		0, 0,</div><div class='add'>+		0, 0,</div><div class='add'>+		0, 0,</div><div class='add'>+		GP_6_8_FN, FN_IP3_20,</div><div class='add'>+		GP_6_7_FN, FN_IP3_19,</div><div class='add'>+		GP_6_6_FN, FN_IP3_18,</div><div class='add'>+		GP_6_5_FN, FN_IP3_17,</div><div class='add'>+		GP_6_4_FN, FN_IP3_16,</div><div class='add'>+		GP_6_3_FN, FN_IP3_15,</div><div class='add'>+		GP_6_2_FN, FN_IP3_8,</div><div class='add'>+		GP_6_1_FN, FN_IP3_7,</div><div class='add'>+		GP_6_0_FN, FN_IP3_6 }</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{ PINMUX_CFG_REG_VAR("IPSR0", 0xfffc0020, 32,</div><div class='add'>+			     1, 3, 2, 1, 2, 4, 3, 2, 2, 2, 2, 2, 3, 3) {</div><div class='add'>+		/* IP0_31 [1] */</div><div class='add'>+		0, 0,</div><div class='add'>+		/* IP0_30_28 [3] */</div><div class='add'>+		FN_RD_WR, FN_FWE, FN_ATAG0, FN_VI1_R7,</div><div class='add'>+		FN_HRTS1, FN_RX4_C, 0, 0,</div><div class='add'>+		/* IP0_27_26 [2] */</div><div class='add'>+		FN_CS1_A26, FN_HSPI_TX2, FN_SDSELF_B, 0,</div><div class='add'>+		/* IP0_25 [1] */</div><div class='add'>+		FN_CS0, FN_HSPI_CS2_B,</div><div class='add'>+		/* IP0_24_23 [2] */</div><div class='add'>+		FN_CLKOUT, FN_TX3C_IRDA_TX_C, FN_PWM0_B, 0,</div><div class='add'>+		/* IP0_22_19 [4] */</div><div class='add'>+		FN_A25, FN_SD1_WP, FN_MMC0_D5, FN_FD5,</div><div class='add'>+		FN_HSPI_RX2, FN_VI1_R3, FN_TX5_B, FN_SSI_SDATA7_B,</div><div class='add'>+		FN_CTS0_B, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		/* IP0_18_16 [3] */</div><div class='add'>+		FN_A24, FN_SD1_CD, FN_MMC0_D4, FN_FD4,</div><div class='add'>+		FN_HSPI_CS2, FN_VI1_R2, FN_SSI_WS78_B, 0,</div><div class='add'>+		/* IP0_15_14 [2] */</div><div class='add'>+		FN_A23, FN_FCLE, FN_HSPI_CLK2, FN_VI1_R1,</div><div class='add'>+		/* IP0_13_12 [2] */</div><div class='add'>+		FN_A22, FN_RX5_D, FN_HSPI_RX2_B, FN_VI1_R0,</div><div class='add'>+		/* IP0_11_10 [2] */</div><div class='add'>+		FN_A21, FN_SCK5_D, FN_HSPI_CLK2_B, 0,</div><div class='add'>+		/* IP0_9_8 [2] */</div><div class='add'>+		FN_A20, FN_TX5_D, FN_HSPI_TX2_B, 0,</div><div class='add'>+		/* IP0_7_6 [2] */</div><div class='add'>+		FN_A0, FN_SD1_DAT3, FN_MMC0_D3, FN_FD3,</div><div class='add'>+		/* IP0_5_3 [3] */</div><div class='add'>+		FN_BS, FN_SD1_DAT2, FN_MMC0_D2, FN_FD2,</div><div class='add'>+		FN_ATADIR0, FN_SDSELF, FN_HCTS1, FN_TX4_C,</div><div class='add'>+		/* IP0_2_0 [3] */</div><div class='add'>+		FN_PENC2, FN_SCK0, FN_PWM1, FN_PWMFSW0,</div><div class='add'>+		FN_SCIF_CLK, FN_TCLK0_C, 0, 0 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG_VAR("IPSR1", 0xfffc0024, 32,</div><div class='add'>+			     3, 4, 2, 2, 2, 4, 4, 4, 3, 2, 2) {</div><div class='add'>+		/* IP1_31_29 [3] */</div><div class='add'>+		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+		/* IP1_28_25 [4] */</div><div class='add'>+		FN_HTX0, FN_TX1, FN_SDATA, FN_CTS0_C,</div><div class='add'>+		FN_SUB_TCK, FN_CC5_STATE2, FN_CC5_STATE10, FN_CC5_STATE18,</div><div class='add'>+		FN_CC5_STATE26, FN_CC5_STATE34, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		/* IP1_24_23 [2] */</div><div class='add'>+		FN_MLB_DAT, FN_PWM4, FN_RX4, 0,</div><div class='add'>+		/* IP1_22_21 [2] */</div><div class='add'>+		FN_MLB_SIG, FN_PWM3, FN_TX4, 0,</div><div class='add'>+		/* IP1_20_19 [2] */</div><div class='add'>+		FN_MLB_CLK, FN_PWM2, FN_SCK4, 0,</div><div class='add'>+		/* IP1_18_15 [4] */</div><div class='add'>+		FN_EX_CS5, FN_SD1_DAT1, FN_MMC0_D1, FN_FD1,</div><div class='add'>+		FN_ATAWR0, FN_VI1_R6, FN_HRX1, FN_RX2_E,</div><div class='add'>+		FN_RX0_B, FN_SSI_WS9, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		/* IP1_14_11 [4] */</div><div class='add'>+		FN_EX_CS4, FN_SD1_DAT0, FN_MMC0_D0, FN_FD0,</div><div class='add'>+		FN_ATARD0, FN_VI1_R5, FN_SCK5_B, FN_HTX1,</div><div class='add'>+		FN_TX2_E, FN_TX0_B, FN_SSI_SCK9, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		/* IP1_10_7 [4] */</div><div class='add'>+		FN_EX_CS3, FN_SD1_CMD, FN_MMC0_CMD, FN_FRE,</div><div class='add'>+		FN_ATACS10, FN_VI1_R4, FN_RX5_B, FN_HSCK1,</div><div class='add'>+		FN_SSI_SDATA8_B, FN_RTS0_B_TANS_B, FN_SSI_SDATA9, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		/* IP1_6_4 [3] */</div><div class='add'>+		FN_EX_CS2, FN_SD1_CLK, FN_MMC0_CLK, FN_FALE,</div><div class='add'>+		FN_ATACS00, 0, 0, 0,</div><div class='add'>+		/* IP1_3_2 [2] */</div><div class='add'>+		FN_EX_CS1, FN_MMC0_D7, FN_FD7, 0,</div><div class='add'>+		/* IP1_1_0 [2] */</div><div class='add'>+		FN_EX_CS0, FN_RX3_C_IRDA_RX_C, FN_MMC0_D6, FN_FD6 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG_VAR("IPSR2", 0xfffc0028, 32,</div><div class='add'>+			     1, 3, 1, 1, 1, 1, 1, 1, 3, 3, 4, 4, 4, 4) {</div><div class='add'>+		/* IP2_31 [1] */</div><div class='add'>+		0, 0,</div><div class='add'>+		/* IP2_30_28 [3] */</div><div class='add'>+		FN_DU0_DG0, FN_LCDOUT8, FN_DREQ1, FN_SCL2,</div><div class='add'>+		FN_AUDATA2, 0, 0, 0,</div><div class='add'>+		/* IP2_27 [1] */</div><div class='add'>+		FN_DU0_DR7, FN_LCDOUT7,</div><div class='add'>+		/* IP2_26 [1] */</div><div class='add'>+		FN_DU0_DR6, FN_LCDOUT6,</div><div class='add'>+		/* IP2_25 [1] */</div><div class='add'>+		FN_DU0_DR5, FN_LCDOUT5,</div><div class='add'>+		/* IP2_24 [1] */</div><div class='add'>+		FN_DU0_DR4, FN_LCDOUT4,</div><div class='add'>+		/* IP2_23 [1] */</div><div class='add'>+		FN_DU0_DR3, FN_LCDOUT3,</div><div class='add'>+		/* IP2_22 [1] */</div><div class='add'>+		FN_DU0_DR2, FN_LCDOUT2,</div><div class='add'>+		/* IP2_21_19 [3] */</div><div class='add'>+		FN_DU0_DR1, FN_LCDOUT1, FN_DACK0, FN_DRACK0,</div><div class='add'>+		FN_GPS_SIGN_B, FN_AUDATA1, FN_RX5_C, 0,</div><div class='add'>+		/* IP2_18_16 [3] */</div><div class='add'>+		FN_DU0_DR0, FN_LCDOUT0, FN_DREQ0, FN_GPS_CLK_B,</div><div class='add'>+		FN_AUDATA0, FN_TX5_C, 0, 0,</div><div class='add'>+		/* IP2_15_12 [4] */</div><div class='add'>+		FN_HRTS0, FN_RTS1_TANS, FN_MDATA, FN_TX0_C,</div><div class='add'>+		FN_SUB_TMS, FN_CC5_STATE1, FN_CC5_STATE9, FN_CC5_STATE17,</div><div class='add'>+		FN_CC5_STATE25, FN_CC5_STATE33, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		/* IP2_11_8 [4] */</div><div class='add'>+		FN_HCTS0, FN_CTS1, FN_STM, FN_PWM0_D,</div><div class='add'>+		FN_RX0_C, FN_SCIF_CLK_C, FN_SUB_TRST, FN_TCLK1_B,</div><div class='add'>+		FN_CC5_OSCOUT, 0, 0, 0,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		/* IP2_7_4 [4] */</div><div class='add'>+		FN_HSCK0, FN_SCK1, FN_MTS, FN_PWM5,</div><div class='add'>+		FN_SCK0_C, FN_SSI_SDATA9_B, FN_SUB_TDO, FN_CC5_STATE0,</div><div class='add'>+		FN_CC5_STATE8, FN_CC5_STATE16, FN_CC5_STATE24, FN_CC5_STATE32,</div><div class='add'>+		0, 0, 0, 0,</div><div class='add'>+		/* IP2_3_0 [4] */</div><div class='add'>+		FN_HRX0, FN_RX1, FN_SCKZ, FN_RTS0_C_TANS_C,</div><div class='add'>+		FN_SUB_TDI, FN_CC5_STATE3, FN_CC5_STATE11, FN_CC5_STATE19,</div><div class='add'>+		FN_CC5_STATE27, FN_CC5_STATE35, 0, 0,</div><div class='add'>+		0, 0, 0, 0 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG_VAR("IPSR3", 0xfffc002c, 32,</div><div class='add'>+			     3, 1, 1, 3, 1, 2, 1, 1, 1, 1, 1,</div><div class='add'>+			     1, 3, 3, 1, 1, 1, 1, 1, 1, 3) {</div><div class='add'>+	    /* IP3_31_29 [3] */</div><div class='add'>+	    FN_DU0_EXODDF_DU0_ODDF_DISP_CDE, FN_QCPV_QDE, FN_CAN1_TX, FN_TX2_C,</div><div class='add'>+	    FN_SCL2_C, FN_REMOCON, 0, 0,</div><div class='add'>+	    /* IP3_28 [1] */</div><div class='add'>+	    FN_DU0_EXVSYNC_DU0_VSYNC, FN_QSTB_QHE,</div><div class='add'>+	    /* IP3_27 [1] */</div><div class='add'>+	    FN_DU0_EXHSYNC_DU0_HSYNC, FN_QSTH_QHS,</div><div class='add'>+	    /* IP3_26_24 [3] */</div><div class='add'>+	    FN_DU0_DOTCLKOUT1, FN_QSTVB_QVE, FN_RX3_D_IRDA_RX_D, FN_SDA3_B,</div><div class='add'>+	    FN_SDA2_C, FN_DACK0_B, FN_DRACK0_B, 0,</div><div class='add'>+	    /* IP3_23 [1] */</div><div class='add'>+	    FN_DU0_DOTCLKOUT0, FN_QCLK,</div><div class='add'>+	    /* IP3_22_21 [2] */</div><div class='add'>+	    FN_DU0_DOTCLKIN, FN_QSTVA_QVS, FN_TX3_D_IRDA_TX_D, FN_SCL3_B,</div><div class='add'>+	    /* IP3_20 [1] */</div><div class='add'>+	    FN_DU0_DB7, FN_LCDOUT23,</div><div class='add'>+	    /* IP3_19 [1] */</div><div class='add'>+	    FN_DU0_DB6, FN_LCDOUT22,</div><div class='add'>+	    /* IP3_18 [1] */</div><div class='add'>+	    FN_DU0_DB5, FN_LCDOUT21,</div><div class='add'>+	    /* IP3_17 [1] */</div><div class='add'>+	    FN_DU0_DB4, FN_LCDOUT20,</div><div class='add'>+	    /* IP3_16 [1] */</div><div class='add'>+	    FN_DU0_DB3, FN_LCDOUT19,</div><div class='add'>+	    /* IP3_15 [1] */</div><div class='add'>+	    FN_DU0_DB2, FN_LCDOUT18,</div><div class='add'>+	    /* IP3_14_12 [3] */</div><div class='add'>+	    FN_DU0_DB1, FN_LCDOUT17, FN_EX_WAIT2, FN_SDA1,</div><div class='add'>+	    FN_GPS_MAG_B, FN_AUDATA5, FN_SCK5_C, 0,</div><div class='add'>+	    /* IP3_11_9 [3] */</div><div class='add'>+	    FN_DU0_DB0, FN_LCDOUT16, FN_EX_WAIT1, FN_SCL1,</div><div class='add'>+	    FN_TCLK1, FN_AUDATA4, 0, 0,</div><div class='add'>+	    /* IP3_8 [1] */</div><div class='add'>+	    FN_DU0_DG7, FN_LCDOUT15,</div><div class='add'>+	    /* IP3_7 [1] */</div><div class='add'>+	    FN_DU0_DG6, FN_LCDOUT14,</div><div class='add'>+	    /* IP3_6 [1] */</div><div class='add'>+	    FN_DU0_DG5, FN_LCDOUT13,</div><div class='add'>+	    /* IP3_5 [1] */</div><div class='add'>+	    FN_DU0_DG4, FN_LCDOUT12,</div><div class='add'>+	    /* IP3_4 [1] */</div><div class='add'>+	    FN_DU0_DG3, FN_LCDOUT11,</div><div class='add'>+	    /* IP3_3 [1] */</div><div class='add'>+	    FN_DU0_DG2, FN_LCDOUT10,</div><div class='add'>+	    /* IP3_2_0 [3] */</div><div class='add'>+	    FN_DU0_DG1, FN_LCDOUT9, FN_DACK1, FN_SDA2,</div><div class='add'>+	    FN_AUDATA3, 0, 0, 0 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG_VAR("IPSR4", 0xfffc0030, 32,</div><div class='add'>+			     3, 1, 1, 1, 1, 1, 1, 3, 3, 1,</div><div class='add'>+			     1, 1, 1, 1, 1, 1, 3, 3, 3, 2) {</div><div class='add'>+	    /* IP4_31_29 [3] */</div><div class='add'>+	    FN_DU1_DB0, FN_VI2_DATA4_VI2_B4, FN_SCL2_B, FN_SD3_DAT0,</div><div class='add'>+	    FN_TX5, FN_SCK0_D, 0, 0,</div><div class='add'>+	    /* IP4_28 [1] */</div><div class='add'>+	    FN_DU1_DG7, FN_VI2_R3,</div><div class='add'>+	    /* IP4_27 [1] */</div><div class='add'>+	    FN_DU1_DG6, FN_VI2_R2,</div><div class='add'>+	    /* IP4_26 [1] */</div><div class='add'>+	    FN_DU1_DG5, FN_VI2_R1,</div><div class='add'>+	    /* IP4_25 [1] */</div><div class='add'>+	    FN_DU1_DG4, FN_VI2_R0,</div><div class='add'>+	    /* IP4_24 [1] */</div><div class='add'>+	    FN_DU1_DG3, FN_VI2_G7,</div><div class='add'>+	    /* IP4_23 [1] */</div><div class='add'>+	    FN_DU1_DG2, FN_VI2_G6,</div><div class='add'>+	    /* IP4_22_20 [3] */</div><div class='add'>+	    FN_DU1_DG1, FN_VI2_DATA3_VI2_B3, FN_SDA1_B, FN_SD3_DAT3,</div><div class='add'>+	    FN_SCK5, FN_AUDATA7, FN_RX0_D, 0,</div><div class='add'>+	    /* IP4_19_17 [3] */</div><div class='add'>+	    FN_DU1_DG0, FN_VI2_DATA2_VI2_B2, FN_SCL1_B, FN_SD3_DAT2,</div><div class='add'>+	    FN_SCK3_E, FN_AUDATA6, FN_TX0_D, 0,</div><div class='add'>+	    /* IP4_16 [1] */</div><div class='add'>+	    FN_DU1_DR7, FN_VI2_G5,</div><div class='add'>+	    /* IP4_15 [1] */</div><div class='add'>+	    FN_DU1_DR6, FN_VI2_G4,</div><div class='add'>+	    /* IP4_14 [1] */</div><div class='add'>+	    FN_DU1_DR5, FN_VI2_G3,</div><div class='add'>+	    /* IP4_13 [1] */</div><div class='add'>+	    FN_DU1_DR4, FN_VI2_G2,</div><div class='add'>+	    /* IP4_12 [1] */</div><div class='add'>+	    FN_DU1_DR3, FN_VI2_G1,</div><div class='add'>+	    /* IP4_11 [1] */</div><div class='add'>+	    FN_DU1_DR2, FN_VI2_G0,</div><div class='add'>+	    /* IP4_10_8 [3] */</div><div class='add'>+	    FN_DU1_DR1, FN_VI2_DATA1_VI2_B1, FN_PWM0, FN_SD3_CMD,</div><div class='add'>+	    FN_RX3_E_IRDA_RX_E, FN_AUDSYNC, FN_CTS0_D, 0,</div><div class='add'>+	    /* IP4_7_5 [3] */</div><div class='add'>+	    FN_DU1_DR0, FN_VI2_DATA0_VI2_B0, FN_PWM6, FN_SD3_CLK,</div><div class='add'>+	    FN_TX3_E_IRDA_TX_E, FN_AUDCK, FN_PWMFSW0_B, 0,</div><div class='add'>+	    /* IP4_4_2 [3] */</div><div class='add'>+	    FN_DU0_CDE, FN_QPOLB, FN_CAN1_RX, FN_RX2_C,</div><div class='add'>+	    FN_DREQ0_B, FN_SSI_SCK78_B, FN_SCK0_B, 0,</div><div class='add'>+	    /* IP4_1_0 [2] */</div><div class='add'>+	    FN_DU0_DISP, FN_QPOLA, FN_CAN_CLK_C, FN_SCK2_C }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG_VAR("IPSR5", 0xfffc0034, 32,</div><div class='add'>+			     1, 2, 1, 4, 3, 4, 2, 2,</div><div class='add'>+			     2, 2, 1, 1, 1, 1, 1, 1, 3) {</div><div class='add'>+	    /* IP5_31 [1] */</div><div class='add'>+	    0, 0,</div><div class='add'>+	    /* IP5_30_29 [2] */</div><div class='add'>+	    FN_AUDIO_CLKB, FN_USB_OVC2, FN_CAN_DEBUGOUT0, FN_MOUT0,</div><div class='add'>+	    /* IP5_28 [1] */</div><div class='add'>+	    FN_AUDIO_CLKA, FN_CAN_TXCLK,</div><div class='add'>+	    /* IP5_27_24 [4] */</div><div class='add'>+	    FN_DU1_CDE, FN_VI2_DATA7_VI2_B7, FN_RX3_B_IRDA_RX_B, FN_SD3_WP,</div><div class='add'>+	    FN_HSPI_RX1, FN_VI1_FIELD, FN_VI3_FIELD, FN_AUDIO_CLKOUT,</div><div class='add'>+	    FN_RX2_D, FN_GPS_CLK_C, FN_GPS_CLK_D, 0,</div><div class='add'>+	    0, 0, 0, 0,</div><div class='add'>+	    /* IP5_23_21 [3] */</div><div class='add'>+	    FN_DU1_DISP, FN_VI2_DATA6_VI2_B6, FN_TCLK0, FN_QSTVA_B_QVS_B,</div><div class='add'>+	    FN_HSPI_CLK1, FN_SCK2_D, FN_AUDIO_CLKOUT_B, FN_GPS_MAG_D,</div><div class='add'>+	    /* IP5_20_17 [4] */</div><div class='add'>+	    FN_DU1_EXODDF_DU1_ODDF_DISP_CDE, FN_VI2_CLK, FN_TX3_B_IRDA_TX_B,</div><div class='add'>+	    FN_SD3_CD, FN_HSPI_TX1, FN_VI1_CLKENB, FN_VI3_CLKENB,</div><div class='add'>+	    FN_AUDIO_CLKC, FN_TX2_D, FN_SPEEDIN, FN_GPS_SIGN_D, 0,</div><div class='add'>+	    0, 0, 0, 0,</div><div class='add'>+	    /* IP5_16_15 [2] */</div><div class='add'>+	    FN_DU1_EXVSYNC_DU1_VSYNC, FN_VI2_VSYNC, FN_VI3_VSYNC, 0,</div><div class='add'>+	    /* IP5_14_13 [2] */</div><div class='add'>+	    FN_DU1_EXHSYNC_DU1_HSYNC, FN_VI2_HSYNC, FN_VI3_HSYNC, 0,</div><div class='add'>+	    /* IP5_12_11 [2] */</div><div class='add'>+	    FN_DU1_DOTCLKOUT, FN_VI2_FIELD, FN_SDA1_D, 0,</div><div class='add'>+	    /* IP5_10_9 [2] */</div><div class='add'>+	    FN_DU1_DOTCLKIN, FN_VI2_CLKENB, FN_HSPI_CS1, FN_SCL1_D,</div><div class='add'>+	    /* IP5_8 [1] */</div><div class='add'>+	    FN_DU1_DB7, FN_SDA2_D,</div><div class='add'>+	    /* IP5_7 [1] */</div><div class='add'>+	    FN_DU1_DB6, FN_SCL2_D,</div><div class='add'>+	    /* IP5_6 [1] */</div><div class='add'>+	    FN_DU1_DB5, FN_VI2_R7,</div><div class='add'>+	    /* IP5_5 [1] */</div><div class='add'>+	    FN_DU1_DB4, FN_VI2_R6,</div><div class='add'>+	    /* IP5_4 [1] */</div><div class='add'>+	    FN_DU1_DB3, FN_VI2_R5,</div><div class='add'>+	    /* IP5_3 [1] */</div><div class='add'>+	    FN_DU1_DB2, FN_VI2_R4,</div><div class='add'>+	    /* IP5_2_0 [3] */</div><div class='add'>+	    FN_DU1_DB1, FN_VI2_DATA5_VI2_B5, FN_SDA2_B, FN_SD3_DAT1,</div><div class='add'>+	    FN_RX5, FN_RTS0_D_TANS_D, 0, 0 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG_VAR("IPSR6", 0xfffc0038, 32,</div><div class='add'>+			     1, 2, 2, 2, 2, 3, 2, 3, 3, 3, 1, 2, 2, 2, 2) {</div><div class='add'>+	    /* IP6_31 [1] */</div><div class='add'>+	    0, 0,</div><div class='add'>+	    /* IP6_30_29 [2] */</div><div class='add'>+	    FN_SSI_SCK6, FN_ADICHS0, FN_CAN0_TX, FN_IERX_B,</div><div class='add'>+	    /* IP_28_27 [2] */</div><div class='add'>+	    0, 0, 0, 0,</div><div class='add'>+	    /* IP6_26_25 [2] */</div><div class='add'>+	    FN_SSI_SDATA5, FN_ADIDATA, FN_CAN_DEBUGOUT12, FN_RX3_IRDA_RX,</div><div class='add'>+	    /* IP6_24_23 [2] */</div><div class='add'>+	    FN_SSI_WS5, FN_ADICS_SAMP, FN_CAN_DEBUGOUT11, FN_TX3_IRDA_TX,</div><div class='add'>+	    /* IP6_22_20 [3] */</div><div class='add'>+	    FN_SSI_SCK5, FN_ADICLK, FN_CAN_DEBUGOUT10, FN_SCK3,</div><div class='add'>+	    FN_TCLK0_D, 0, 0, 0,</div><div class='add'>+	    /* IP6_19_18 [2] */</div><div class='add'>+	    FN_SSI_SDATA4, FN_CAN_DEBUGOUT9, FN_SSI_SDATA9_C, 0,</div><div class='add'>+	    /* IP6_17_15 [3] */</div><div class='add'>+	    FN_SSI_SDATA3, FN_PWM0_C, FN_CAN_DEBUGOUT8, FN_CAN_CLK_B,</div><div class='add'>+	    FN_IECLK, FN_SCIF_CLK_B, FN_TCLK0_B, 0,</div><div class='add'>+	    /* IP6_14_12 [3] */</div><div class='add'>+	    FN_SSI_WS34, FN_CAN_DEBUGOUT7, FN_CAN0_RX_B, FN_IETX,</div><div class='add'>+	    FN_SSI_WS9_C, 0, 0, 0,</div><div class='add'>+	    /* IP6_11_9 [3] */</div><div class='add'>+	    FN_SSI_SCK34, FN_CAN_DEBUGOUT6, FN_CAN0_TX_B, FN_IERX,</div><div class='add'>+	    FN_SSI_SCK9_C, 0, 0, 0,</div><div class='add'>+	    /* IP6_8 [1] */</div><div class='add'>+	    FN_SSI_SDATA2, FN_CAN_DEBUGOUT5,</div><div class='add'>+	    /* IP6_7_6 [2] */</div><div class='add'>+	    FN_SSI_SDATA1, FN_CAN_DEBUGOUT4, FN_MOUT6, 0,</div><div class='add'>+	    /* IP6_5_4 [2] */</div><div class='add'>+	    FN_SSI_SDATA0, FN_CAN_DEBUGOUT3, FN_MOUT5, 0,</div><div class='add'>+	    /* IP6_3_2 [2] */</div><div class='add'>+	    FN_SSI_WS0129, FN_CAN_DEBUGOUT2, FN_MOUT2, 0,</div><div class='add'>+	    /* IP6_1_0 [2] */</div><div class='add'>+	    FN_SSI_SCK0129, FN_CAN_DEBUGOUT1, FN_MOUT1, 0 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG_VAR("IPSR7", 0xfffc003c, 32,</div><div class='add'>+			     1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 2, 2) {</div><div class='add'>+	    /* IP7_31 [1] */</div><div class='add'>+	    0, 0,</div><div class='add'>+	    /* IP7_30_29 [2] */</div><div class='add'>+	    FN_SD0_WP, FN_DACK2, FN_CTS1_B, 0,</div><div class='add'>+	    /* IP7_28_27 [2] */</div><div class='add'>+	    FN_SD0_CD, FN_DREQ2, FN_RTS1_B_TANS_B, 0,</div><div class='add'>+	    /* IP7_26_25 [2] */</div><div class='add'>+	    FN_SD0_DAT3, FN_ATAWR1, FN_RX2_B, FN_CC5_TDI,</div><div class='add'>+	    /* IP7_24_23 [2] */</div><div class='add'>+	    FN_SD0_DAT2, FN_ATARD1, FN_TX2_B, FN_CC5_TCK,</div><div class='add'>+	    /* IP7_22_21 [2] */</div><div class='add'>+	    FN_SD0_DAT1, FN_ATAG1, FN_SCK2_B, FN_CC5_TMS,</div><div class='add'>+	    /* IP7_20_19 [2] */</div><div class='add'>+	    FN_SD0_DAT0, FN_ATADIR1, FN_RX1_B, FN_CC5_TRST,</div><div class='add'>+	    /* IP7_18_17 [2] */</div><div class='add'>+	    FN_SD0_CMD, FN_ATACS11, FN_TX1_B, FN_CC5_TDO,</div><div class='add'>+	    /* IP7_16_15 [2] */</div><div class='add'>+	    FN_SD0_CLK, FN_ATACS01, FN_SCK1_B, 0,</div><div class='add'>+	    /* IP7_14_13 [2] */</div><div class='add'>+	    FN_SSI_SDATA8, FN_VSP, FN_IRQ3_B, FN_HSPI_RX1_C,</div><div class='add'>+	    /* IP7_12_10 [3] */</div><div class='add'>+	    FN_SSI_SDATA7, FN_CAN_DEBUGOUT15, FN_IRQ2_B, FN_TCLK1_C,</div><div class='add'>+	    FN_HSPI_TX1_C, 0, 0, 0,</div><div class='add'>+	    /* IP7_9_7 [3] */</div><div class='add'>+	    FN_SSI_WS78, FN_CAN_DEBUGOUT14, FN_IRQ1_B, FN_SSI_WS9_B,</div><div class='add'>+	    FN_HSPI_CS1_C, 0, 0, 0,</div><div class='add'>+	    /* IP7_6_4 [3] */</div><div class='add'>+	    FN_SSI_SCK78, FN_CAN_DEBUGOUT13, FN_IRQ0_B, FN_SSI_SCK9_B,</div><div class='add'>+	    FN_HSPI_CLK1_C, 0, 0, 0,</div><div class='add'>+	    /* IP7_3_2 [2] */</div><div class='add'>+	    FN_SSI_SDATA6, FN_ADICHS2, FN_CAN_CLK, FN_IECLK_B,</div><div class='add'>+	    /* IP7_1_0 [2] */</div><div class='add'>+	    FN_SSI_WS6, FN_ADICHS1, FN_CAN0_RX, FN_IETX_B }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG_VAR("IPSR8", 0xfffc0040, 32,</div><div class='add'>+			     1, 3, 3, 2, 2, 1, 1, 1, 2, 4, 4, 4, 4) {</div><div class='add'>+	    /* IP8_31 [1] */</div><div class='add'>+	    0, 0,</div><div class='add'>+	    /* IP8_30_28 [3] */</div><div class='add'>+	    FN_VI0_VSYNC, FN_VI0_DATA1_B_VI0_B1_B, FN_RTS1_C_TANS_C, FN_RX4_D,</div><div class='add'>+	    FN_PWMFSW0_C, 0, 0, 0,</div><div class='add'>+	    /* IP8_27_25 [3] */</div><div class='add'>+	    FN_VI0_HSYNC, FN_VI0_DATA0_B_VI0_B0_B, FN_CTS1_C, FN_TX4_D,</div><div class='add'>+	    FN_MMC1_CMD, FN_HSCK1_B, 0, 0,</div><div class='add'>+	    /* IP8_24_23 [2] */</div><div class='add'>+	    FN_VI0_FIELD, FN_RX1_C, FN_HRX1_B, 0,</div><div class='add'>+	    /* IP8_22_21 [2] */</div><div class='add'>+	    FN_VI0_CLKENB, FN_TX1_C, FN_HTX1_B, FN_MT1_SYNC,</div><div class='add'>+	    /* IP8_20 [1] */</div><div class='add'>+	    FN_VI0_CLK, FN_MMC1_CLK,</div><div class='add'>+	    /* IP8_19 [1] */</div><div class='add'>+	    FN_FMIN, FN_RDS_DATA,</div><div class='add'>+	    /* IP8_18 [1] */</div><div class='add'>+	    FN_BPFCLK, FN_PCMWE,</div><div class='add'>+	    /* IP8_17_16 [2] */</div><div class='add'>+	    FN_FMCLK, FN_RDS_CLK, FN_PCMOE, 0,</div><div class='add'>+	    /* IP8_15_12 [4] */</div><div class='add'>+	    FN_HSPI_RX0, FN_RX0, FN_CAN_STEP0, FN_AD_NCS,</div><div class='add'>+	    FN_CC5_STATE7, FN_CC5_STATE15, FN_CC5_STATE23, FN_CC5_STATE31,</div><div class='add'>+	    FN_CC5_STATE39, 0, 0, 0,</div><div class='add'>+	    0, 0, 0, 0,</div><div class='add'>+	    /* IP8_11_8 [4] */</div><div class='add'>+	    FN_HSPI_TX0, FN_TX0, FN_CAN_DEBUG_HW_TRIGGER, FN_AD_DO,</div><div class='add'>+	    FN_CC5_STATE6, FN_CC5_STATE14, FN_CC5_STATE22, FN_CC5_STATE30,</div><div class='add'>+	    FN_CC5_STATE38, 0, 0, 0,</div><div class='add'>+	    0, 0, 0, 0,</div><div class='add'>+	    /* IP8_7_4 [4] */</div><div class='add'>+	    FN_HSPI_CS0, FN_RTS0_TANS, FN_USB_OVC1, FN_AD_DI,</div><div class='add'>+	    FN_CC5_STATE5, FN_CC5_STATE13, FN_CC5_STATE21, FN_CC5_STATE29,</div><div class='add'>+	    FN_CC5_STATE37, 0, 0, 0,</div><div class='add'>+	    0, 0, 0, 0,</div><div class='add'>+	    /* IP8_3_0 [4] */</div><div class='add'>+	    FN_HSPI_CLK0, FN_CTS0, FN_USB_OVC0, FN_AD_CLK,</div><div class='add'>+	    FN_CC5_STATE4, FN_CC5_STATE12, FN_CC5_STATE20, FN_CC5_STATE28,</div><div class='add'>+	    FN_CC5_STATE36, 0, 0, 0,</div><div class='add'>+	    0, 0, 0, 0 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG_VAR("IPSR9", 0xfffc0044, 32,</div><div class='add'>+			     2, 2, 2, 2, 2, 3, 3, 2, 2,</div><div class='add'>+			     2, 2, 1, 1, 1, 1, 2, 2) {</div><div class='add'>+	    /* IP9_31_30 [2] */</div><div class='add'>+	    0, 0, 0, 0,</div><div class='add'>+	    /* IP9_29_28 [2] */</div><div class='add'>+	    FN_VI0_G7, FN_ETH_RXD1, FN_SD2_DAT3_B, FN_ARM_TRACEDATA_9,</div><div class='add'>+	    /* IP9_27_26 [2] */</div><div class='add'>+	    FN_VI0_G6, FN_ETH_RXD0, FN_SD2_DAT2_B, FN_ARM_TRACEDATA_8,</div><div class='add'>+	    /* IP9_25_24 [2] */</div><div class='add'>+	    FN_VI0_G5, FN_ETH_RX_ER, FN_SD2_DAT1_B, FN_ARM_TRACEDATA_7,</div><div class='add'>+	    /* IP9_23_22 [2] */</div><div class='add'>+	    FN_VI0_G4, FN_ETH_TX_EN, FN_SD2_DAT0_B, FN_ARM_TRACEDATA_6,</div><div class='add'>+	    /* IP9_21_19 [3] */</div><div class='add'>+	    FN_VI0_G3, FN_ETH_CRS_DV, FN_MMC1_D7, FN_ARM_TRACEDATA_5,</div><div class='add'>+	    FN_TS_SDAT0, 0, 0, 0,</div><div class='add'>+	    /* IP9_18_16 [3] */</div><div class='add'>+	    FN_VI0_G2, FN_ETH_TXD1, FN_MMC1_D6, FN_ARM_TRACEDATA_4,</div><div class='add'>+	    FN_TS_SPSYNC0, 0, 0, 0,</div><div class='add'>+	    /* IP9_15_14 [2] */</div><div class='add'>+	    FN_VI0_G1, FN_SSI_WS78_C, FN_IRQ1, FN_ARM_TRACEDATA_3,</div><div class='add'>+	    /* IP9_13_12 [2] */</div><div class='add'>+	    FN_VI0_G0, FN_SSI_SCK78_C, FN_IRQ0, FN_ARM_TRACEDATA_2,</div><div class='add'>+	    /* IP9_11_10 [2] */</div><div class='add'>+	    FN_VI0_DATA7_VI0_B7, FN_MMC1_D5, FN_ARM_TRACEDATA_1, 0,</div><div class='add'>+	    /* IP9_9_8 [2] */</div><div class='add'>+	    FN_VI0_DATA6_VI0_B6, FN_MMC1_D4, FN_ARM_TRACEDATA_0, 0,</div><div class='add'>+	    /* IP9_7 [1] */</div><div class='add'>+	    FN_VI0_DATA5_VI0_B5, FN_MMC1_D3,</div><div class='add'>+	    /* IP9_6 [1] */</div><div class='add'>+	    FN_VI0_DATA4_VI0_B4, FN_MMC1_D2,</div><div class='add'>+	    /* IP9_5 [1] */</div><div class='add'>+	    FN_VI0_DATA3_VI0_B3, FN_MMC1_D1,</div><div class='add'>+	    /* IP9_4 [1] */</div><div class='add'>+	    FN_VI0_DATA2_VI0_B2, FN_MMC1_D0,</div><div class='add'>+	    /* IP9_3_2 [2] */</div><div class='add'>+	    FN_VI0_DATA1_VI0_B1, FN_HCTS1_B, FN_MT1_PWM, 0,</div><div class='add'>+	    /* IP9_1_0 [2] */</div><div class='add'>+	    FN_VI0_DATA0_VI0_B0, FN_HRTS1_B, FN_MT1_VCXO, 0 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG_VAR("IPSR10", 0xfffc0048, 32,</div><div class='add'>+			     3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3) {</div><div class='add'>+	    /* IP10_31_29 [3] */</div><div class='add'>+	    FN_VI1_VSYNC, FN_AUDIO_CLKOUT_C, FN_SSI_WS4, FN_SIM_CLK,</div><div class='add'>+	    FN_GPS_MAG_C, FN_SPV_TRST, FN_SCL3, 0,</div><div class='add'>+	    /* IP10_28_26 [3] */</div><div class='add'>+	    FN_VI1_HSYNC, FN_VI3_CLK, FN_SSI_SCK4, FN_GPS_SIGN_C,</div><div class='add'>+	    FN_PWMFSW0_E, 0, 0, 0,</div><div class='add'>+	    /* IP10_25_24 [2] */</div><div class='add'>+	    FN_VI1_CLK, FN_SIM_D, FN_SDA3, 0,</div><div class='add'>+	    /* IP10_23_21 [3] */</div><div class='add'>+	    FN_VI0_R7, FN_ETH_MDIO, FN_DACK2_C, FN_HSPI_RX1_B,</div><div class='add'>+	    FN_SCIF_CLK_D, FN_TRACECTL, FN_MT1_PEN, 0,</div><div class='add'>+	    /* IP10_20_18 [3] */</div><div class='add'>+	    FN_VI0_R6, FN_ETH_MDC, FN_DREQ2_C, FN_HSPI_TX1_B,</div><div class='add'>+	    FN_TRACECLK, FN_MT1_BEN, FN_PWMFSW0_D, 0,</div><div class='add'>+	    /* IP10_17_15 [3] */</div><div class='add'>+	    FN_VI0_R5, FN_ETH_TXD0, FN_SD2_WP_B, FN_HSPI_CS1_B,</div><div class='add'>+	    FN_ARM_TRACEDATA_15, FN_MT1_D, FN_TS_SDEN0, 0,</div><div class='add'>+	    /* IP10_14_12 [3] */</div><div class='add'>+	    FN_VI0_R4, FN_ETH_REFCLK, FN_SD2_CD_B, FN_HSPI_CLK1_B,</div><div class='add'>+	    FN_ARM_TRACEDATA_14, FN_MT1_CLK, FN_TS_SCK0, 0,</div><div class='add'>+	    /* IP10_11_9 [3] */</div><div class='add'>+	    FN_VI0_R3, FN_ETH_MAGIC, FN_SD2_CMD_B, FN_IRQ3,</div><div class='add'>+	    FN_ARM_TRACEDATA_13, 0, 0, 0,</div><div class='add'>+	    /* IP10_8_6 [3] */</div><div class='add'>+	    FN_VI0_R2, FN_ETH_LINK, FN_SD2_CLK_B, FN_IRQ2,</div><div class='add'>+	    FN_ARM_TRACEDATA_12, 0, 0, 0,</div><div class='add'>+	    /* IP10_5_3 [3] */</div><div class='add'>+	    FN_VI0_R1, FN_SSI_SDATA8_C, FN_DACK1_B, FN_ARM_TRACEDATA_11,</div><div class='add'>+	    FN_DACK0_C, FN_DRACK0_C, 0, 0,</div><div class='add'>+	    /* IP10_2_0 [3] */</div><div class='add'>+	    FN_VI0_R0, FN_SSI_SDATA7_C, FN_SCK1_C, FN_DREQ1_B,</div><div class='add'>+	    FN_ARM_TRACEDATA_10, FN_DREQ0_C, 0, 0 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG_VAR("IPSR11", 0xfffc004c, 32,</div><div class='add'>+			     2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3) {</div><div class='add'>+	    /* IP11_31_30 [2] */</div><div class='add'>+	    0, 0, 0, 0,</div><div class='add'>+	    /* IP11_29_27 [3] */</div><div class='add'>+	    FN_VI1_G1, FN_VI3_DATA1, FN_SSI_SCK1, FN_TS_SDEN1,</div><div class='add'>+	    FN_DACK2_B, FN_RX2, FN_HRTS0_B, 0,</div><div class='add'>+	    /* IP11_26_24 [3] */</div><div class='add'>+	    FN_VI1_G0, FN_VI3_DATA0, FN_DU1_DOTCLKOUT1, FN_TS_SCK1,</div><div class='add'>+	    FN_DREQ2_B, FN_TX2, FN_SPA_TDO, FN_HCTS0_B,</div><div class='add'>+	    /* IP11_23_21 [3] */</div><div class='add'>+	    FN_VI1_DATA7_VI1_B7, FN_SD2_WP, FN_MT0_PWM, FN_SPA_TDI,</div><div class='add'>+	    FN_HSPI_RX1_D, 0, 0, 0,</div><div class='add'>+	    /* IP11_20_18 [3] */</div><div class='add'>+	    FN_VI1_DATA6_VI1_B6, FN_SD2_CD, FN_MT0_VCXO, FN_SPA_TMS,</div><div class='add'>+	    FN_HSPI_TX1_D, 0, 0, 0,</div><div class='add'>+	    /* IP11_17_15 [3] */</div><div class='add'>+	    FN_VI1_DATA5_VI1_B5, FN_SD2_CMD, FN_MT0_SYNC, FN_SPA_TCK,</div><div class='add'>+	    FN_HSPI_CS1_D, FN_ADICHS2_B, 0, 0,</div><div class='add'>+	    /* IP11_14_12 [3] */</div><div class='add'>+	    FN_VI1_DATA4_VI1_B4, FN_SD2_CLK, FN_MT0_PEN, FN_SPA_TRST,</div><div class='add'>+	    FN_HSPI_CLK1_D, FN_ADICHS1_B, 0, 0,</div><div class='add'>+	    /* IP11_11_9 [3] */</div><div class='add'>+	    FN_VI1_DATA3_VI1_B3, FN_SD2_DAT3, FN_MT0_BEN, FN_SPV_TDO,</div><div class='add'>+	    FN_ADICHS0_B, 0, 0, 0,</div><div class='add'>+	    /* IP11_8_6 [3] */</div><div class='add'>+	    FN_VI1_DATA2_VI1_B2, FN_SD2_DAT2, FN_MT0_D, FN_SPVTDI,</div><div class='add'>+	    FN_ADIDATA_B, 0, 0, 0,</div><div class='add'>+	    /* IP11_5_3 [3] */</div><div class='add'>+	    FN_VI1_DATA1_VI1_B1, FN_SD2_DAT1, FN_MT0_CLK, FN_SPV_TMS,</div><div class='add'>+	    FN_ADICS_B_SAMP_B, 0, 0, 0,</div><div class='add'>+	    /* IP11_2_0 [3] */</div><div class='add'>+	    FN_VI1_DATA0_VI1_B0, FN_SD2_DAT0, FN_SIM_RST, FN_SPV_TCK,</div><div class='add'>+	    FN_ADICLK_B, 0, 0, 0 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG_VAR("IPSR12", 0xfffc0050, 32,</div><div class='add'>+			     4, 4, 4, 2, 3, 3, 3, 3, 3, 3) {</div><div class='add'>+	    /* IP12_31_28 [4] */</div><div class='add'>+	    0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	    0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	    /* IP12_27_24 [4] */</div><div class='add'>+	    0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	    0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	    /* IP12_23_20 [4] */</div><div class='add'>+	    0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	    0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	    /* IP12_19_18 [2] */</div><div class='add'>+	    0, 0, 0, 0,</div><div class='add'>+	    /* IP12_17_15 [3] */</div><div class='add'>+	    FN_VI1_G7, FN_VI3_DATA7, FN_GPS_MAG, FN_FCE,</div><div class='add'>+	    FN_SCK4_B, 0, 0, 0,</div><div class='add'>+	    /* IP12_14_12 [3] */</div><div class='add'>+	    FN_VI1_G6, FN_VI3_DATA6, FN_GPS_SIGN, FN_FRB,</div><div class='add'>+	    FN_RX4_B, FN_SIM_CLK_B, 0, 0,</div><div class='add'>+	    /* IP12_11_9 [3] */</div><div class='add'>+	    FN_VI1_G5, FN_VI3_DATA5, FN_GPS_CLK, FN_FSE,</div><div class='add'>+	    FN_TX4_B, FN_SIM_D_B, 0, 0,</div><div class='add'>+	    /* IP12_8_6 [3] */</div><div class='add'>+	    FN_VI1_G4, FN_VI3_DATA4, FN_SSI_WS2, FN_SDA1_C,</div><div class='add'>+	    FN_SIM_RST_B, FN_HRX0_B, 0, 0,</div><div class='add'>+	    /* IP12_5_3 [3] */</div><div class='add'>+	    FN_VI1_G3, FN_VI3_DATA3, FN_SSI_SCK2, FN_TS_SDAT1,</div><div class='add'>+	    FN_SCL1_C, FN_HTX0_B, 0, 0,</div><div class='add'>+	    /* IP12_2_0 [3] */</div><div class='add'>+	    FN_VI1_G2, FN_VI3_DATA2, FN_SSI_WS1, FN_TS_SPSYNC1,</div><div class='add'>+	    FN_SCK2, FN_HSCK0_B, 0, 0 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG_VAR("MOD_SEL", 0xfffc0090, 32,</div><div class='add'>+			     2, 2, 3, 3, 2, 2, 2, 2, 2,</div><div class='add'>+			     1, 1, 1, 1, 1, 1, 1, 2, 1, 2) {</div><div class='add'>+	    /* SEL_SCIF5 [2] */</div><div class='add'>+	    FN_SEL_SCIF5_0, FN_SEL_SCIF5_1, FN_SEL_SCIF5_2, FN_SEL_SCIF5_3,</div><div class='add'>+	    /* SEL_SCIF4 [2] */</div><div class='add'>+	    FN_SEL_SCIF4_0, FN_SEL_SCIF4_1, FN_SEL_SCIF4_2, FN_SEL_SCIF4_3,</div><div class='add'>+	    /* SEL_SCIF3 [3] */</div><div class='add'>+	    FN_SEL_SCIF3_0, FN_SEL_SCIF3_1, FN_SEL_SCIF3_2, FN_SEL_SCIF3_3,</div><div class='add'>+	    FN_SEL_SCIF3_4, 0, 0, 0,</div><div class='add'>+	    /* SEL_SCIF2 [3] */</div><div class='add'>+	    FN_SEL_SCIF2_0, FN_SEL_SCIF2_1, FN_SEL_SCIF2_2, FN_SEL_SCIF2_3,</div><div class='add'>+	    FN_SEL_SCIF2_4, 0, 0, 0,</div><div class='add'>+	    /* SEL_SCIF1 [2] */</div><div class='add'>+	    FN_SEL_SCIF1_0, FN_SEL_SCIF1_1, FN_SEL_SCIF1_2, 0,</div><div class='add'>+	    /* SEL_SCIF0 [2] */</div><div class='add'>+	    FN_SEL_SCIF0_0, FN_SEL_SCIF0_1, FN_SEL_SCIF0_2, FN_SEL_SCIF0_3,</div><div class='add'>+	    /* SEL_SSI9 [2] */</div><div class='add'>+	    FN_SEL_SSI9_0, FN_SEL_SSI9_1, FN_SEL_SSI9_2, 0,</div><div class='add'>+	    /* SEL_SSI8 [2] */</div><div class='add'>+	    FN_SEL_SSI8_0, FN_SEL_SSI8_1, FN_SEL_SSI8_2, 0,</div><div class='add'>+	    /* SEL_SSI7 [2] */</div><div class='add'>+	    FN_SEL_SSI7_0, FN_SEL_SSI7_1, FN_SEL_SSI7_2, 0,</div><div class='add'>+	    /* SEL_VI0 [1] */</div><div class='add'>+	    FN_SEL_VI0_0, FN_SEL_VI0_1,</div><div class='add'>+	    /* SEL_SD2 [1] */</div><div class='add'>+	    FN_SEL_SD2_0, FN_SEL_SD2_1,</div><div class='add'>+	    /* SEL_INT3 [1] */</div><div class='add'>+	    FN_SEL_INT3_0, FN_SEL_INT3_1,</div><div class='add'>+	    /* SEL_INT2 [1] */</div><div class='add'>+	    FN_SEL_INT2_0, FN_SEL_INT2_1,</div><div class='add'>+	    /* SEL_INT1 [1] */</div><div class='add'>+	    FN_SEL_INT1_0, FN_SEL_INT1_1,</div><div class='add'>+	    /* SEL_INT0 [1] */</div><div class='add'>+	    FN_SEL_INT0_0, FN_SEL_INT0_1,</div><div class='add'>+	    /* SEL_IE [1] */</div><div class='add'>+	    FN_SEL_IE_0, FN_SEL_IE_1,</div><div class='add'>+	    /* SEL_EXBUS2 [2] */</div><div class='add'>+	    FN_SEL_EXBUS2_0, FN_SEL_EXBUS2_1, FN_SEL_EXBUS2_2, 0,</div><div class='add'>+	    /* SEL_EXBUS1 [1] */</div><div class='add'>+	    FN_SEL_EXBUS1_0, FN_SEL_EXBUS1_1,</div><div class='add'>+	    /* SEL_EXBUS0 [2] */</div><div class='add'>+	    FN_SEL_EXBUS0_0, FN_SEL_EXBUS0_1, FN_SEL_EXBUS0_2, 0 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG_VAR("MOD_SEL2", 0xfffc0094, 32,</div><div class='add'>+			     2, 2, 2, 2, 1, 1, 1, 3, 1,</div><div class='add'>+			     2, 2, 2, 2, 1, 1, 2, 1, 2, 2) {</div><div class='add'>+	    /* SEL_TMU1 [2] */</div><div class='add'>+	    FN_SEL_TMU1_0, FN_SEL_TMU1_1, FN_SEL_TMU1_2, 0,</div><div class='add'>+	    /* SEL_TMU0 [2] */</div><div class='add'>+	    FN_SEL_TMU0_0, FN_SEL_TMU0_1, FN_SEL_TMU0_2, FN_SEL_TMU0_3,</div><div class='add'>+	    /* SEL_SCIF [2] */</div><div class='add'>+	    FN_SEL_SCIF_0, FN_SEL_SCIF_1, FN_SEL_SCIF_2, FN_SEL_SCIF_3,</div><div class='add'>+	    /* SEL_CANCLK [2] */</div><div class='add'>+	    FN_SEL_CANCLK_0, FN_SEL_CANCLK_1, FN_SEL_CANCLK_2,</div><div class='add'>+	    /* SEL_CAN0 [1] */</div><div class='add'>+	    FN_SEL_CAN0_0, FN_SEL_CAN0_1,</div><div class='add'>+	    /* SEL_HSCIF1 [1] */</div><div class='add'>+	    FN_SEL_HSCIF1_0, FN_SEL_HSCIF1_1,</div><div class='add'>+	    /* SEL_HSCIF0 [1] */</div><div class='add'>+	    FN_SEL_HSCIF0_0, FN_SEL_HSCIF0_1,</div><div class='add'>+	    /* SEL_PWMFSW [3] */</div><div class='add'>+	    FN_SEL_PWMFSW_0, FN_SEL_PWMFSW_1, FN_SEL_PWMFSW_2,</div><div class='add'>+	    FN_SEL_PWMFSW_3, FN_SEL_PWMFSW_4, 0, 0, 0,</div><div class='add'>+	    /* SEL_ADI [1] */</div><div class='add'>+	    FN_SEL_ADI_0, FN_SEL_ADI_1,</div><div class='add'>+	    /* [2] */</div><div class='add'>+	    0, 0, 0, 0,</div><div class='add'>+	    /* [2] */</div><div class='add'>+	    0, 0, 0, 0,</div><div class='add'>+	    /* [2] */</div><div class='add'>+	    0, 0, 0, 0,</div><div class='add'>+	    /* SEL_GPS [2] */</div><div class='add'>+	    FN_SEL_GPS_0, FN_SEL_GPS_1, FN_SEL_GPS_2, FN_SEL_GPS_3,</div><div class='add'>+	    /* SEL_SIM [1] */</div><div class='add'>+	    FN_SEL_SIM_0, FN_SEL_SIM_1,</div><div class='add'>+	    /* SEL_HSPI2 [1] */</div><div class='add'>+	    FN_SEL_HSPI2_0, FN_SEL_HSPI2_1,</div><div class='add'>+	    /* SEL_HSPI1 [2] */</div><div class='add'>+	    FN_SEL_HSPI1_0, FN_SEL_HSPI1_1, FN_SEL_HSPI1_2, FN_SEL_HSPI1_3,</div><div class='add'>+	    /* SEL_I2C3 [1] */</div><div class='add'>+	    FN_SEL_I2C3_0, FN_SEL_I2C3_1,</div><div class='add'>+	    /* SEL_I2C2 [2] */</div><div class='add'>+	    FN_SEL_I2C2_0, FN_SEL_I2C2_1, FN_SEL_I2C2_2, FN_SEL_I2C2_3,</div><div class='add'>+	    /* SEL_I2C1 [2] */</div><div class='add'>+	    FN_SEL_I2C1_0, FN_SEL_I2C1_1, FN_SEL_I2C1_2, FN_SEL_I2C1_3 }</div><div class='add'>+	},</div><div class='add'>+	{ PINMUX_CFG_REG("INOUTSEL0", 0xffc40004, 32, 1) { GP_INOUTSEL(0) } },</div><div class='add'>+	{ PINMUX_CFG_REG("INOUTSEL1", 0xffc41004, 32, 1) { GP_INOUTSEL(1) } },</div><div class='add'>+	{ PINMUX_CFG_REG("INOUTSEL2", 0xffc42004, 32, 1) { GP_INOUTSEL(2) } },</div><div class='add'>+	{ PINMUX_CFG_REG("INOUTSEL3", 0xffc43004, 32, 1) { GP_INOUTSEL(3) } },</div><div class='add'>+	{ PINMUX_CFG_REG("INOUTSEL4", 0xffc44004, 32, 1) { GP_INOUTSEL(4) } },</div><div class='add'>+	{ PINMUX_CFG_REG("INOUTSEL5", 0xffc45004, 32, 1) { GP_INOUTSEL(5) } },</div><div class='add'>+	{ PINMUX_CFG_REG("INOUTSEL6", 0xffc46004, 32, 1) {</div><div class='add'>+		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='add'>+		0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+		0, 0,</div><div class='add'>+		0, 0,</div><div class='add'>+		0, 0,</div><div class='add'>+		GP_6_8_IN, GP_6_8_OUT,</div><div class='add'>+		GP_6_7_IN, GP_6_7_OUT,</div><div class='add'>+		GP_6_6_IN, GP_6_6_OUT,</div><div class='add'>+		GP_6_5_IN, GP_6_5_OUT,</div><div class='add'>+		GP_6_4_IN, GP_6_4_OUT,</div><div class='add'>+		GP_6_3_IN, GP_6_3_OUT,</div><div class='add'>+		GP_6_2_IN, GP_6_2_OUT,</div><div class='add'>+		GP_6_1_IN, GP_6_1_OUT,</div><div class='add'>+		GP_6_0_IN, GP_6_0_OUT, }</div><div class='add'>+	},</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pinmux_data_reg pinmux_data_regs[] = {</div><div class='add'>+	{ PINMUX_DATA_REG("INDT0", 0xffc40008, 32) { GP_INDT(0) } },</div><div class='add'>+	{ PINMUX_DATA_REG("INDT1", 0xffc41008, 32) { GP_INDT(1) } },</div><div class='add'>+	{ PINMUX_DATA_REG("INDT2", 0xffc42008, 32) { GP_INDT(2) } },</div><div class='add'>+	{ PINMUX_DATA_REG("INDT3", 0xffc43008, 32) { GP_INDT(3) } },</div><div class='add'>+	{ PINMUX_DATA_REG("INDT4", 0xffc44008, 32) { GP_INDT(4) } },</div><div class='add'>+	{ PINMUX_DATA_REG("INDT5", 0xffc45008, 32) { GP_INDT(5) } },</div><div class='add'>+	{ PINMUX_DATA_REG("INDT6", 0xffc46008, 32) {</div><div class='add'>+		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, GP_6_8_DATA,</div><div class='add'>+		GP_6_7_DATA, GP_6_6_DATA, GP_6_5_DATA, GP_6_4_DATA,</div><div class='add'>+		GP_6_3_DATA, GP_6_2_DATA, GP_6_1_DATA, GP_6_0_DATA }</div><div class='add'>+	},</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource r8a7779_pfc_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= 0xfffc0000,</div><div class='add'>+		.end	= 0xfffc023b,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= 0xffc40000,</div><div class='add'>+		.end	= 0xffc46fff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pinmux_info r8a7779_pinmux_info = {</div><div class='add'>+	.name = "r8a7779_pfc",</div><div class='add'>+</div><div class='add'>+	.resource = r8a7779_pfc_resources,</div><div class='add'>+	.num_resources = ARRAY_SIZE(r8a7779_pfc_resources),</div><div class='add'>+</div><div class='add'>+	.unlock_reg = 0xfffc0000, /* PMMR */</div><div class='add'>+</div><div class='add'>+	.reserved_id = PINMUX_RESERVED,</div><div class='add'>+	.data = { PINMUX_DATA_BEGIN, PINMUX_DATA_END },</div><div class='add'>+	.input = { PINMUX_INPUT_BEGIN, PINMUX_INPUT_END },</div><div class='add'>+	.output = { PINMUX_OUTPUT_BEGIN, PINMUX_OUTPUT_END },</div><div class='add'>+	.mark = { PINMUX_MARK_BEGIN, PINMUX_MARK_END },</div><div class='add'>+	.function = { PINMUX_FUNCTION_BEGIN, PINMUX_FUNCTION_END },</div><div class='add'>+</div><div class='add'>+	.first_gpio = GPIO_GP_0_0,</div><div class='add'>+	.last_gpio = GPIO_FN_SCK4_B,</div><div class='add'>+</div><div class='add'>+	.gpios = pinmux_gpios,</div><div class='add'>+	.cfg_regs = pinmux_config_regs,</div><div class='add'>+	.data_regs = pinmux_data_regs,</div><div class='add'>+</div><div class='add'>+	.gpio_data = pinmux_data,</div><div class='add'>+	.gpio_data_size = ARRAY_SIZE(pinmux_data),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void r8a7779_pinmux_init(void)</div><div class='add'>+{</div><div class='add'>+	register_pinmux(&amp;r8a7779_pinmux_info);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c<br/>index c49a833bf9bb..993381257f69 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/platsmp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/platsmp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/platsmp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/platsmp.c</a></div><div class='hunk'>@@ -22,12 +22,16 @@</div><div class='ctx'> #include &lt;mach/common.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2())</div><div class='add'>+#define is_r8a7779() machine_is_marzen()</div><div class='ctx'> </div><div class='ctx'> static unsigned int __init shmobile_smp_get_core_count(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (is_sh73a0())</div><div class='ctx'> 		return sh73a0_get_core_count();</div><div class='ctx'> </div><div class='add'>+	if (is_r8a7779())</div><div class='add'>+		return r8a7779_get_core_count();</div><div class='add'>+</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -35,6 +39,17 @@ static void __init shmobile_smp_prepare_cpus(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (is_sh73a0())</div><div class='ctx'> 		sh73a0_smp_prepare_cpus();</div><div class='add'>+</div><div class='add'>+	if (is_r8a7779())</div><div class='add'>+		r8a7779_smp_prepare_cpus();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int shmobile_platform_cpu_kill(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	if (is_r8a7779())</div><div class='add'>+		return r8a7779_platform_cpu_kill(cpu);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __cpuinit platform_secondary_init(unsigned int cpu)</div><div class='hunk'>@@ -43,6 +58,9 @@ void __cpuinit platform_secondary_init(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> 	if (is_sh73a0())</div><div class='ctx'> 		sh73a0_secondary_init(cpu);</div><div class='add'>+</div><div class='add'>+	if (is_r8a7779())</div><div class='add'>+		r8a7779_secondary_init(cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='hunk'>@@ -50,6 +68,9 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)</div><div class='ctx'> 	if (is_sh73a0())</div><div class='ctx'> 		return sh73a0_boot_secondary(cpu);</div><div class='ctx'> </div><div class='add'>+	if (is_r8a7779())</div><div class='add'>+		return r8a7779_boot_secondary(cpu);</div><div class='add'>+</div><div class='ctx'> 	return -ENOSYS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-shmobile/pm-r8a7779.c b/arch/arm/mach-shmobile/pm-r8a7779.c<br/>new file mode 100644<br/>index 000000000000..c38ba7b43ef8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/pm-r8a7779.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/pm-r8a7779.c</a></div><div class='hunk'>@@ -0,0 +1,249 @@</div><div class='add'>+/*</div><div class='add'>+ * r8a7779 Power management support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011  Renesas Solutions Corp.</div><div class='add'>+ * Copyright (C) 2011  Magnus Damm</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/suspend.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/pm_clock.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/console.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/r8a7779.h&gt;</div><div class='add'>+</div><div class='add'>+static void __iomem *r8a7779_sysc_base;</div><div class='add'>+</div><div class='add'>+/* SYSC */</div><div class='add'>+#define SYSCSR 0x00</div><div class='add'>+#define SYSCISR 0x04</div><div class='add'>+#define SYSCISCR 0x08</div><div class='add'>+#define SYSCIER 0x0c</div><div class='add'>+#define SYSCIMR 0x10</div><div class='add'>+#define PWRSR0 0x40</div><div class='add'>+#define PWRSR1 0x80</div><div class='add'>+#define PWRSR2 0xc0</div><div class='add'>+#define PWRSR3 0x100</div><div class='add'>+#define PWRSR4 0x140</div><div class='add'>+</div><div class='add'>+#define PWRSR_OFFS 0x00</div><div class='add'>+#define PWROFFCR_OFFS 0x04</div><div class='add'>+#define PWRONCR_OFFS 0x0c</div><div class='add'>+#define PWRER_OFFS 0x14</div><div class='add'>+</div><div class='add'>+#define SYSCSR_RETRIES 100</div><div class='add'>+#define SYSCSR_DELAY_US 1</div><div class='add'>+</div><div class='add'>+#define SYSCISR_RETRIES 1000</div><div class='add'>+#define SYSCISR_DELAY_US 1</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_PM) || defined(CONFIG_SMP)</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(r8a7779_sysc_lock); /* SMP CPUs + I/O devices */</div><div class='add'>+</div><div class='add'>+static int r8a7779_sysc_pwr_on_off(struct r8a7779_pm_ch *r8a7779_ch,</div><div class='add'>+				   int sr_bit, int reg_offs)</div><div class='add'>+{</div><div class='add'>+	int k;</div><div class='add'>+</div><div class='add'>+	for (k = 0; k &lt; SYSCSR_RETRIES; k++) {</div><div class='add'>+		if (ioread32(r8a7779_sysc_base + SYSCSR) &amp; (1 &lt;&lt; sr_bit))</div><div class='add'>+			break;</div><div class='add'>+		udelay(SYSCSR_DELAY_US);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (k == SYSCSR_RETRIES)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	iowrite32(1 &lt;&lt; r8a7779_ch-&gt;chan_bit,</div><div class='add'>+		  r8a7779_sysc_base + r8a7779_ch-&gt;chan_offs + reg_offs);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int r8a7779_sysc_pwr_off(struct r8a7779_pm_ch *r8a7779_ch)</div><div class='add'>+{</div><div class='add'>+	return r8a7779_sysc_pwr_on_off(r8a7779_ch, 0, PWROFFCR_OFFS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int r8a7779_sysc_pwr_on(struct r8a7779_pm_ch *r8a7779_ch)</div><div class='add'>+{</div><div class='add'>+	return r8a7779_sysc_pwr_on_off(r8a7779_ch, 1, PWRONCR_OFFS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int r8a7779_sysc_update(struct r8a7779_pm_ch *r8a7779_ch,</div><div class='add'>+			       int (*on_off_fn)(struct r8a7779_pm_ch *))</div><div class='add'>+{</div><div class='add'>+	unsigned int isr_mask = 1 &lt;&lt; r8a7779_ch-&gt;isr_bit;</div><div class='add'>+	unsigned int chan_mask = 1 &lt;&lt; r8a7779_ch-&gt;chan_bit;</div><div class='add'>+	unsigned int status;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int k;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;r8a7779_sysc_lock, flags);</div><div class='add'>+</div><div class='add'>+	iowrite32(isr_mask, r8a7779_sysc_base + SYSCISCR);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		ret = on_off_fn(r8a7779_ch);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		status = ioread32(r8a7779_sysc_base +</div><div class='add'>+				  r8a7779_ch-&gt;chan_offs + PWRER_OFFS);</div><div class='add'>+	} while (status &amp; chan_mask);</div><div class='add'>+</div><div class='add'>+	for (k = 0; k &lt; SYSCISR_RETRIES; k++) {</div><div class='add'>+		if (ioread32(r8a7779_sysc_base + SYSCISR) &amp; isr_mask)</div><div class='add'>+			break;</div><div class='add'>+		udelay(SYSCISR_DELAY_US);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (k == SYSCISR_RETRIES)</div><div class='add'>+		ret = -EIO;</div><div class='add'>+</div><div class='add'>+	iowrite32(isr_mask, r8a7779_sysc_base + SYSCISCR);</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	spin_unlock_irqrestore(&amp;r8a7779_sysc_lock, flags);</div><div class='add'>+</div><div class='add'>+	pr_debug("r8a7779 power domain %d: %02x %02x %02x %02x %02x -&gt; %d\n",</div><div class='add'>+		 r8a7779_ch-&gt;isr_bit, ioread32(r8a7779_sysc_base + PWRSR0),</div><div class='add'>+		 ioread32(r8a7779_sysc_base + PWRSR1),</div><div class='add'>+		 ioread32(r8a7779_sysc_base + PWRSR2),</div><div class='add'>+		 ioread32(r8a7779_sysc_base + PWRSR3),</div><div class='add'>+		 ioread32(r8a7779_sysc_base + PWRSR4), ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int r8a7779_sysc_power_down(struct r8a7779_pm_ch *r8a7779_ch)</div><div class='add'>+{</div><div class='add'>+	return r8a7779_sysc_update(r8a7779_ch, r8a7779_sysc_pwr_off);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int r8a7779_sysc_power_up(struct r8a7779_pm_ch *r8a7779_ch)</div><div class='add'>+{</div><div class='add'>+	return r8a7779_sysc_update(r8a7779_ch, r8a7779_sysc_pwr_on);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init r8a7779_sysc_init(void)</div><div class='add'>+{</div><div class='add'>+	r8a7779_sysc_base = ioremap_nocache(0xffd85000, PAGE_SIZE);</div><div class='add'>+	if (!r8a7779_sysc_base)</div><div class='add'>+		panic("unable to ioremap r8a7779 SYSC hardware block\n");</div><div class='add'>+</div><div class='add'>+	/* enable all interrupt sources, but do not use interrupt handler */</div><div class='add'>+	iowrite32(0x0131000e, r8a7779_sysc_base + SYSCIER);</div><div class='add'>+	iowrite32(0, r8a7779_sysc_base + SYSCIMR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_PM || CONFIG_SMP */</div><div class='add'>+</div><div class='add'>+static inline void r8a7779_sysc_init(void) {}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PM || CONFIG_SMP */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+static int pd_power_down(struct generic_pm_domain *genpd)</div><div class='add'>+{</div><div class='add'>+	return r8a7779_sysc_power_down(to_r8a7779_ch(genpd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pd_power_up(struct generic_pm_domain *genpd)</div><div class='add'>+{</div><div class='add'>+	return r8a7779_sysc_power_up(to_r8a7779_ch(genpd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool pd_is_off(struct generic_pm_domain *genpd)</div><div class='add'>+{</div><div class='add'>+	struct r8a7779_pm_ch *r8a7779_ch = to_r8a7779_ch(genpd);</div><div class='add'>+	unsigned int st;</div><div class='add'>+</div><div class='add'>+	st = ioread32(r8a7779_sysc_base + r8a7779_ch-&gt;chan_offs + PWRSR_OFFS);</div><div class='add'>+	if (st &amp; (1 &lt;&lt; r8a7779_ch-&gt;chan_bit))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool pd_active_wakeup(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void r8a7779_init_pm_domain(struct r8a7779_pm_domain *r8a7779_pd)</div><div class='add'>+{</div><div class='add'>+	struct generic_pm_domain *genpd = &amp;r8a7779_pd-&gt;genpd;</div><div class='add'>+</div><div class='add'>+	pm_genpd_init(genpd, NULL, false);</div><div class='add'>+	genpd-&gt;dev_ops.stop = pm_clk_suspend;</div><div class='add'>+	genpd-&gt;dev_ops.start = pm_clk_resume;</div><div class='add'>+	genpd-&gt;dev_ops.active_wakeup = pd_active_wakeup;</div><div class='add'>+	genpd-&gt;dev_irq_safe = true;</div><div class='add'>+	genpd-&gt;power_off = pd_power_down;</div><div class='add'>+	genpd-&gt;power_on = pd_power_up;</div><div class='add'>+</div><div class='add'>+	if (pd_is_off(&amp;r8a7779_pd-&gt;genpd))</div><div class='add'>+		pd_power_up(&amp;r8a7779_pd-&gt;genpd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void r8a7779_add_device_to_domain(struct r8a7779_pm_domain *r8a7779_pd,</div><div class='add'>+				 struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	pm_genpd_add_device(&amp;r8a7779_pd-&gt;genpd, dev);</div><div class='add'>+	if (pm_clk_no_clocks(dev))</div><div class='add'>+		pm_clk_add(dev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct r8a7779_pm_domain r8a7779_sh4a = {</div><div class='add'>+	.ch = {</div><div class='add'>+		.chan_offs = 0x80, /* PWRSR1 .. PWRER1 */</div><div class='add'>+		.isr_bit = 16, /* SH4A */</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct r8a7779_pm_domain r8a7779_sgx = {</div><div class='add'>+	.ch = {</div><div class='add'>+		.chan_offs = 0xc0, /* PWRSR2 .. PWRER2 */</div><div class='add'>+		.isr_bit = 20, /* SGX */</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct r8a7779_pm_domain r8a7779_vdp1 = {</div><div class='add'>+	.ch = {</div><div class='add'>+		.chan_offs = 0x100, /* PWRSR3 .. PWRER3 */</div><div class='add'>+		.isr_bit = 21, /* VDP */</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct r8a7779_pm_domain r8a7779_impx3 = {</div><div class='add'>+	.ch = {</div><div class='add'>+		.chan_offs = 0x140, /* PWRSR4 .. PWRER4 */</div><div class='add'>+		.isr_bit = 24, /* IMP */</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+void __init r8a7779_pm_init(void)</div><div class='add'>+{</div><div class='add'>+	static int once;</div><div class='add'>+</div><div class='add'>+	if (!once++)</div><div class='add'>+		r8a7779_sysc_init();</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c<br/>index 34bbcbfb1706..fcf8b1761aef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/pm-sh7372.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/pm-sh7372.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/pm-sh7372.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/pm-sh7372.c</a></div><div class='hunk'>@@ -82,11 +82,12 @@ static int pd_power_down(struct generic_pm_domain *genpd)</div><div class='ctx'> 	struct sh7372_pm_domain *sh7372_pd = to_sh7372_pd(genpd);</div><div class='ctx'> 	unsigned int mask = 1 &lt;&lt; sh7372_pd-&gt;bit_shift;</div><div class='ctx'> </div><div class='del'>-	if (sh7372_pd-&gt;suspend)</div><div class='del'>-		sh7372_pd-&gt;suspend();</div><div class='add'>+	if (sh7372_pd-&gt;suspend) {</div><div class='add'>+		int ret = sh7372_pd-&gt;suspend();</div><div class='ctx'> </div><div class='del'>-	if (sh7372_pd-&gt;stay_on)</div><div class='del'>-		return 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'> 	if (__raw_readl(PSTR) &amp; mask) {</div><div class='ctx'> 		unsigned int retry_count;</div><div class='hunk'>@@ -101,8 +102,8 @@ static int pd_power_down(struct generic_pm_domain *genpd)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!sh7372_pd-&gt;no_debug)</div><div class='del'>-		pr_debug("sh7372 power domain down 0x%08x -&gt; PSTR = 0x%08x\n",</div><div class='del'>-			 mask, __raw_readl(PSTR));</div><div class='add'>+		pr_debug("%s: Power off, 0x%08x -&gt; PSTR = 0x%08x\n",</div><div class='add'>+			 genpd-&gt;name, mask, __raw_readl(PSTR));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -113,9 +114,6 @@ static int __pd_power_up(struct sh7372_pm_domain *sh7372_pd, bool do_resume)</div><div class='ctx'> 	unsigned int retry_count;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (sh7372_pd-&gt;stay_on)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	if (__raw_readl(PSTR) &amp; mask)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -133,8 +131,8 @@ static int __pd_power_up(struct sh7372_pm_domain *sh7372_pd, bool do_resume)</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (!sh7372_pd-&gt;no_debug)</div><div class='del'>-		pr_debug("sh7372 power domain up 0x%08x -&gt; PSTR = 0x%08x\n",</div><div class='del'>-			 mask, __raw_readl(PSTR));</div><div class='add'>+		pr_debug("%s: Power on, 0x%08x -&gt; PSTR = 0x%08x\n",</div><div class='add'>+			 sh7372_pd-&gt;genpd.name, mask, __raw_readl(PSTR));</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='ctx'> 	if (ret == 0 &amp;&amp; sh7372_pd-&gt;resume &amp;&amp; do_resume)</div><div class='hunk'>@@ -148,35 +146,60 @@ static int pd_power_up(struct generic_pm_domain *genpd)</div><div class='ctx'> 	 return __pd_power_up(to_sh7372_pd(genpd), true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sh7372_a4r_suspend(void)</div><div class='add'>+static int sh7372_a4r_suspend(void)</div><div class='ctx'> {</div><div class='ctx'> 	sh7372_intcs_suspend();</div><div class='ctx'> 	__raw_writel(0x300fffff, WUPRMSK); /* avoid wakeup */</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool pd_active_wakeup(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	return true;</div><div class='add'>+	bool (*active_wakeup)(struct device *dev);</div><div class='add'>+</div><div class='add'>+	active_wakeup = dev_gpd_data(dev)-&gt;ops.active_wakeup;</div><div class='add'>+	return active_wakeup ? active_wakeup(dev) : true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool sh7372_power_down_forbidden(struct dev_pm_domain *domain)</div><div class='add'>+static int sh7372_stop_dev(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	return false;</div><div class='add'>+	int (*stop)(struct device *dev);</div><div class='add'>+</div><div class='add'>+	stop = dev_gpd_data(dev)-&gt;ops.stop;</div><div class='add'>+	if (stop) {</div><div class='add'>+		int ret = stop(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	return pm_clk_suspend(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dev_power_governor sh7372_always_on_gov = {</div><div class='del'>-	.power_down_ok = sh7372_power_down_forbidden,</div><div class='del'>-};</div><div class='add'>+static int sh7372_start_dev(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int (*start)(struct device *dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pm_clk_resume(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	start = dev_gpd_data(dev)-&gt;ops.start;</div><div class='add'>+	if (start)</div><div class='add'>+		ret = start(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> void sh7372_init_pm_domain(struct sh7372_pm_domain *sh7372_pd)</div><div class='ctx'> {</div><div class='ctx'> 	struct generic_pm_domain *genpd = &amp;sh7372_pd-&gt;genpd;</div><div class='add'>+	struct dev_power_governor *gov = sh7372_pd-&gt;gov;</div><div class='ctx'> </div><div class='del'>-	pm_genpd_init(genpd, sh7372_pd-&gt;gov, false);</div><div class='del'>-	genpd-&gt;stop_device = pm_clk_suspend;</div><div class='del'>-	genpd-&gt;start_device = pm_clk_resume;</div><div class='add'>+	pm_genpd_init(genpd, gov ? : &amp;simple_qos_governor, false);</div><div class='add'>+	genpd-&gt;dev_ops.stop = sh7372_stop_dev;</div><div class='add'>+	genpd-&gt;dev_ops.start = sh7372_start_dev;</div><div class='add'>+	genpd-&gt;dev_ops.active_wakeup = pd_active_wakeup;</div><div class='ctx'> 	genpd-&gt;dev_irq_safe = true;</div><div class='del'>-	genpd-&gt;active_wakeup = pd_active_wakeup;</div><div class='ctx'> 	genpd-&gt;power_off = pd_power_down;</div><div class='ctx'> 	genpd-&gt;power_on = pd_power_up;</div><div class='ctx'> 	__pd_power_up(sh7372_pd, false);</div><div class='hunk'>@@ -199,48 +222,73 @@ void sh7372_pm_add_subdomain(struct sh7372_pm_domain *sh7372_pd,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct sh7372_pm_domain sh7372_a4lc = {</div><div class='add'>+	.genpd.name = "A4LC",</div><div class='ctx'> 	.bit_shift = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sh7372_pm_domain sh7372_a4mp = {</div><div class='add'>+	.genpd.name = "A4MP",</div><div class='ctx'> 	.bit_shift = 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sh7372_pm_domain sh7372_d4 = {</div><div class='add'>+	.genpd.name = "D4",</div><div class='ctx'> 	.bit_shift = 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sh7372_pm_domain sh7372_a4r = {</div><div class='add'>+	.genpd.name = "A4R",</div><div class='ctx'> 	.bit_shift = 5,</div><div class='del'>-	.gov = &amp;sh7372_always_on_gov,</div><div class='ctx'> 	.suspend = sh7372_a4r_suspend,</div><div class='ctx'> 	.resume = sh7372_intcs_resume,</div><div class='del'>-	.stay_on = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sh7372_pm_domain sh7372_a3rv = {</div><div class='add'>+	.genpd.name = "A3RV",</div><div class='ctx'> 	.bit_shift = 6,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sh7372_pm_domain sh7372_a3ri = {</div><div class='add'>+	.genpd.name = "A3RI",</div><div class='ctx'> 	.bit_shift = 8,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct sh7372_pm_domain sh7372_a3sp = {</div><div class='del'>-	.bit_shift = 11,</div><div class='del'>-	.gov = &amp;sh7372_always_on_gov,</div><div class='add'>+static int sh7372_a4s_suspend(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The A4S domain contains the CPU core and therefore it should</div><div class='add'>+	 * only be turned off if the CPU is in use.</div><div class='add'>+	 */</div><div class='add'>+	return -EBUSY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sh7372_pm_domain sh7372_a4s = {</div><div class='add'>+	.genpd.name = "A4S",</div><div class='add'>+	.bit_shift = 10,</div><div class='add'>+	.gov = &amp;pm_domain_always_on_gov,</div><div class='ctx'> 	.no_debug = true,</div><div class='add'>+	.suspend = sh7372_a4s_suspend,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void sh7372_a3sp_init(void)</div><div class='add'>+static int sh7372_a3sp_suspend(void)</div><div class='ctx'> {</div><div class='del'>-	/* serial consoles make use of SCIF hardware located in A3SP,</div><div class='add'>+	/*</div><div class='add'>+	 * Serial consoles make use of SCIF hardware located in A3SP,</div><div class='ctx'> 	 * keep such power domain on if "no_console_suspend" is set.</div><div class='ctx'> 	 */</div><div class='del'>-	sh7372_a3sp.stay_on = !console_suspend_enabled;</div><div class='add'>+	return console_suspend_enabled ? 0 : -EBUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct sh7372_pm_domain sh7372_a3sp = {</div><div class='add'>+	.genpd.name = "A3SP",</div><div class='add'>+	.bit_shift = 11,</div><div class='add'>+	.gov = &amp;pm_domain_always_on_gov,</div><div class='add'>+	.no_debug = true,</div><div class='add'>+	.suspend = sh7372_a3sp_suspend,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct sh7372_pm_domain sh7372_a3sg = {</div><div class='add'>+	.genpd.name = "A3SG",</div><div class='ctx'> 	.bit_shift = 13,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -257,11 +305,16 @@ static int sh7372_do_idle_core_standby(unsigned long unused)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sh7372_enter_core_standby(void)</div><div class='add'>+static void sh7372_set_reset_vector(unsigned long address)</div><div class='ctx'> {</div><div class='ctx'> 	/* set reset vector, translate 4k */</div><div class='del'>-	__raw_writel(__pa(sh7372_resume_core_standby_a3sm), SBAR);</div><div class='add'>+	__raw_writel(address, SBAR);</div><div class='ctx'> 	__raw_writel(0, APARMBAREA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sh7372_enter_core_standby(void)</div><div class='add'>+{</div><div class='add'>+	sh7372_set_reset_vector(__pa(sh7372_resume_core_standby_sysc));</div><div class='ctx'> </div><div class='ctx'> 	/* enter sleep mode with SYSTBCR to 0x10 */</div><div class='ctx'> 	__raw_writel(0x10, SYSTBCR);</div><div class='hunk'>@@ -274,27 +327,22 @@ static void sh7372_enter_core_standby(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SUSPEND</div><div class='del'>-static void sh7372_enter_a3sm_common(int pllc0_on)</div><div class='add'>+static void sh7372_enter_sysc(int pllc0_on, unsigned long sleep_mode)</div><div class='ctx'> {</div><div class='del'>-	/* set reset vector, translate 4k */</div><div class='del'>-	__raw_writel(__pa(sh7372_resume_core_standby_a3sm), SBAR);</div><div class='del'>-	__raw_writel(0, APARMBAREA);</div><div class='del'>-</div><div class='ctx'> 	if (pllc0_on)</div><div class='ctx'> 		__raw_writel(0, PLLC01STPCR);</div><div class='ctx'> 	else</div><div class='ctx'> 		__raw_writel(1 &lt;&lt; 28, PLLC01STPCR);</div><div class='ctx'> </div><div class='del'>-	__raw_writel(0, PDNSEL); /* power-down A3SM only, not A4S */</div><div class='ctx'> 	__raw_readl(WUPSFAC); /* read wakeup int. factor before sleep */</div><div class='del'>-	cpu_suspend(0, sh7372_do_idle_a3sm);</div><div class='add'>+	cpu_suspend(sleep_mode, sh7372_do_idle_sysc);</div><div class='ctx'> 	__raw_readl(WUPSFAC); /* read wakeup int. factor after wakeup */</div><div class='ctx'> </div><div class='ctx'> 	 /* disable reset vector translation */</div><div class='ctx'> 	__raw_writel(0, SBAR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sh7372_a3sm_valid(unsigned long *mskp, unsigned long *msk2p)</div><div class='add'>+static int sh7372_sysc_valid(unsigned long *mskp, unsigned long *msk2p)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long mstpsr0, mstpsr1, mstpsr2, mstpsr3, mstpsr4;</div><div class='ctx'> 	unsigned long msk, msk2;</div><div class='hunk'>@@ -382,7 +430,7 @@ static void sh7372_icr_to_irqcr(unsigned long icr, u16 *irqcr1p, u16 *irqcr2p)</div><div class='ctx'> 	*irqcr2p = irqcr2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sh7372_setup_a3sm(unsigned long msk, unsigned long msk2)</div><div class='add'>+static void sh7372_setup_sysc(unsigned long msk, unsigned long msk2)</div><div class='ctx'> {</div><div class='ctx'> 	u16 irqcrx_low, irqcrx_high, irqcry_low, irqcry_high;</div><div class='ctx'> 	unsigned long tmp;</div><div class='hunk'>@@ -415,6 +463,22 @@ static void sh7372_setup_a3sm(unsigned long msk, unsigned long msk2)</div><div class='ctx'> 	__raw_writel((irqcrx_high &lt;&lt; 16) | irqcrx_low, IRQCR3);</div><div class='ctx'> 	__raw_writel((irqcry_high &lt;&lt; 16) | irqcry_low, IRQCR4);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static void sh7372_enter_a3sm_common(int pllc0_on)</div><div class='add'>+{</div><div class='add'>+	sh7372_set_reset_vector(__pa(sh7372_resume_core_standby_sysc));</div><div class='add'>+	sh7372_enter_sysc(pllc0_on, 1 &lt;&lt; 12);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sh7372_enter_a4s_common(int pllc0_on)</div><div class='add'>+{</div><div class='add'>+	sh7372_intca_suspend();</div><div class='add'>+	memcpy((void *)SMFRAM, sh7372_resume_core_standby_sysc, 0x100);</div><div class='add'>+	sh7372_set_reset_vector(SMFRAM);</div><div class='add'>+	sh7372_enter_sysc(pllc0_on, 1 &lt;&lt; 10);</div><div class='add'>+	sh7372_intca_resume();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_IDLE</div><div class='hunk'>@@ -448,14 +512,20 @@ static int sh7372_enter_suspend(suspend_state_t suspend_state)</div><div class='ctx'> 	unsigned long msk, msk2;</div><div class='ctx'> </div><div class='ctx'> 	/* check active clocks to determine potential wakeup sources */</div><div class='del'>-	if (sh7372_a3sm_valid(&amp;msk, &amp;msk2)) {</div><div class='del'>-</div><div class='add'>+	if (sh7372_sysc_valid(&amp;msk, &amp;msk2)) {</div><div class='ctx'> 		/* convert INTC mask and sense to SYSC mask and sense */</div><div class='del'>-		sh7372_setup_a3sm(msk, msk2);</div><div class='del'>-</div><div class='del'>-		/* enter A3SM sleep with PLLC0 off */</div><div class='del'>-		pr_debug("entering A3SM\n");</div><div class='del'>-		sh7372_enter_a3sm_common(0);</div><div class='add'>+		sh7372_setup_sysc(msk, msk2);</div><div class='add'>+</div><div class='add'>+		if (!console_suspend_enabled &amp;&amp;</div><div class='add'>+		    sh7372_a4s.genpd.status == GPD_STATE_POWER_OFF) {</div><div class='add'>+			/* enter A4S sleep with PLLC0 off */</div><div class='add'>+			pr_debug("entering A4S\n");</div><div class='add'>+			sh7372_enter_a4s_common(0);</div><div class='add'>+		} else {</div><div class='add'>+			/* enter A3SM sleep with PLLC0 off */</div><div class='add'>+			pr_debug("entering A3SM\n");</div><div class='add'>+			sh7372_enter_a3sm_common(0);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* default to Core Standby that supports all wakeup sources */</div><div class='ctx'> 		pr_debug("entering Core Standby\n");</div><div class='hunk'>@@ -464,9 +534,37 @@ static int sh7372_enter_suspend(suspend_state_t suspend_state)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * sh7372_pm_notifier_fn - SH7372 PM notifier routine.</div><div class='add'>+ * @notifier: Unused.</div><div class='add'>+ * @pm_event: Event being handled.</div><div class='add'>+ * @unused: Unused.</div><div class='add'>+ */</div><div class='add'>+static int sh7372_pm_notifier_fn(struct notifier_block *notifier,</div><div class='add'>+				 unsigned long pm_event, void *unused)</div><div class='add'>+{</div><div class='add'>+	switch (pm_event) {</div><div class='add'>+	case PM_SUSPEND_PREPARE:</div><div class='add'>+		/*</div><div class='add'>+		 * This is necessary, because the A4R domain has to be "on"</div><div class='add'>+		 * when suspend_device_irqs() and resume_device_irqs() are</div><div class='add'>+		 * executed during system suspend and resume, respectively, so</div><div class='add'>+		 * that those functions don't crash while accessing the INTCS.</div><div class='add'>+		 */</div><div class='add'>+		pm_genpd_poweron(&amp;sh7372_a4r.genpd);</div><div class='add'>+		break;</div><div class='add'>+	case PM_POST_SUSPEND:</div><div class='add'>+		pm_genpd_poweroff_unused();</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void sh7372_suspend_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	shmobile_suspend_ops.enter = sh7372_enter_suspend;</div><div class='add'>+	pm_notifier(sh7372_pm_notifier_fn, 0);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static void sh7372_suspend_init(void) {}</div><div class='hunk'>@@ -482,8 +580,6 @@ void __init sh7372_pm_init(void)</div><div class='ctx'> 	/* do not convert A3SM, A3SP, A3SG, A4R power down into A4S */</div><div class='ctx'> 	__raw_writel(0, PDNSEL);</div><div class='ctx'> </div><div class='del'>-	sh7372_a3sp_init();</div><div class='del'>-</div><div class='ctx'> 	sh7372_suspend_init();</div><div class='ctx'> 	sh7372_cpuidle_init();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c<br/>new file mode 100644<br/>index 000000000000..986dca6b3fad<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/setup-r8a7740.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/setup-r8a7740.c</a></div><div class='hunk'>@@ -0,0 +1,352 @@</div><div class='add'>+/*</div><div class='add'>+ * R8A7740 processor support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011  Renesas Solutions Corp.</div><div class='add'>+ * Copyright (C) 2011  Kuninori Morimoto &lt;kuninori.morimoto.gx@renesas.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; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/serial_sci.h&gt;</div><div class='add'>+#include &lt;linux/sh_timer.h&gt;</div><div class='add'>+#include &lt;mach/r8a7740.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+</div><div class='add'>+/* SCIFA0 */</div><div class='add'>+static struct plat_sci_port scif0_platform_data = {</div><div class='add'>+	.mapbase	= 0xe6c40000,</div><div class='add'>+	.flags		= UPF_BOOT_AUTOCONF,</div><div class='add'>+	.scscr		= SCSCR_RE | SCSCR_TE,</div><div class='add'>+	.scbrr_algo_id	= SCBRR_ALGO_4,</div><div class='add'>+	.type		= PORT_SCIFA,</div><div class='add'>+	.irqs		= SCIx_IRQ_MUXED(evt2irq(0x0c00)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device scif0_device = {</div><div class='add'>+	.name		= "sh-sci",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;scif0_platform_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SCIFA1 */</div><div class='add'>+static struct plat_sci_port scif1_platform_data = {</div><div class='add'>+	.mapbase	= 0xe6c50000,</div><div class='add'>+	.flags		= UPF_BOOT_AUTOCONF,</div><div class='add'>+	.scscr		= SCSCR_RE | SCSCR_TE,</div><div class='add'>+	.scbrr_algo_id	= SCBRR_ALGO_4,</div><div class='add'>+	.type		= PORT_SCIFA,</div><div class='add'>+	.irqs		= SCIx_IRQ_MUXED(evt2irq(0x0c20)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device scif1_device = {</div><div class='add'>+	.name		= "sh-sci",</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;scif1_platform_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SCIFA2 */</div><div class='add'>+static struct plat_sci_port scif2_platform_data = {</div><div class='add'>+	.mapbase	= 0xe6c60000,</div><div class='add'>+	.flags		= UPF_BOOT_AUTOCONF,</div><div class='add'>+	.scscr		= SCSCR_RE | SCSCR_TE,</div><div class='add'>+	.scbrr_algo_id	= SCBRR_ALGO_4,</div><div class='add'>+	.type		= PORT_SCIFA,</div><div class='add'>+	.irqs		= SCIx_IRQ_MUXED(evt2irq(0x0c40)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device scif2_device = {</div><div class='add'>+	.name		= "sh-sci",</div><div class='add'>+	.id		= 2,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;scif2_platform_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SCIFA3 */</div><div class='add'>+static struct plat_sci_port scif3_platform_data = {</div><div class='add'>+	.mapbase	= 0xe6c70000,</div><div class='add'>+	.flags		= UPF_BOOT_AUTOCONF,</div><div class='add'>+	.scscr		= SCSCR_RE | SCSCR_TE,</div><div class='add'>+	.scbrr_algo_id	= SCBRR_ALGO_4,</div><div class='add'>+	.type		= PORT_SCIFA,</div><div class='add'>+	.irqs		= SCIx_IRQ_MUXED(evt2irq(0x0c60)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device scif3_device = {</div><div class='add'>+	.name		= "sh-sci",</div><div class='add'>+	.id		= 3,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;scif3_platform_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SCIFA4 */</div><div class='add'>+static struct plat_sci_port scif4_platform_data = {</div><div class='add'>+	.mapbase	= 0xe6c80000,</div><div class='add'>+	.flags		= UPF_BOOT_AUTOCONF,</div><div class='add'>+	.scscr		= SCSCR_RE | SCSCR_TE,</div><div class='add'>+	.scbrr_algo_id	= SCBRR_ALGO_4,</div><div class='add'>+	.type		= PORT_SCIFA,</div><div class='add'>+	.irqs		= SCIx_IRQ_MUXED(evt2irq(0x0d20)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device scif4_device = {</div><div class='add'>+	.name		= "sh-sci",</div><div class='add'>+	.id		= 4,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;scif4_platform_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SCIFA5 */</div><div class='add'>+static struct plat_sci_port scif5_platform_data = {</div><div class='add'>+	.mapbase	= 0xe6cb0000,</div><div class='add'>+	.flags		= UPF_BOOT_AUTOCONF,</div><div class='add'>+	.scscr		= SCSCR_RE | SCSCR_TE,</div><div class='add'>+	.scbrr_algo_id	= SCBRR_ALGO_4,</div><div class='add'>+	.type		= PORT_SCIFA,</div><div class='add'>+	.irqs		= SCIx_IRQ_MUXED(evt2irq(0x0d40)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device scif5_device = {</div><div class='add'>+	.name		= "sh-sci",</div><div class='add'>+	.id		= 5,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;scif5_platform_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SCIFA6 */</div><div class='add'>+static struct plat_sci_port scif6_platform_data = {</div><div class='add'>+	.mapbase	= 0xe6cc0000,</div><div class='add'>+	.flags		= UPF_BOOT_AUTOCONF,</div><div class='add'>+	.scscr		= SCSCR_RE | SCSCR_TE,</div><div class='add'>+	.scbrr_algo_id	= SCBRR_ALGO_4,</div><div class='add'>+	.type		= PORT_SCIFA,</div><div class='add'>+	.irqs		= SCIx_IRQ_MUXED(evt2irq(0x04c0)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device scif6_device = {</div><div class='add'>+	.name		= "sh-sci",</div><div class='add'>+	.id		= 6,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;scif6_platform_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SCIFA7 */</div><div class='add'>+static struct plat_sci_port scif7_platform_data = {</div><div class='add'>+	.mapbase	= 0xe6cd0000,</div><div class='add'>+	.flags		= UPF_BOOT_AUTOCONF,</div><div class='add'>+	.scscr		= SCSCR_RE | SCSCR_TE,</div><div class='add'>+	.scbrr_algo_id	= SCBRR_ALGO_4,</div><div class='add'>+	.type		= PORT_SCIFA,</div><div class='add'>+	.irqs		= SCIx_IRQ_MUXED(evt2irq(0x04e0)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device scif7_device = {</div><div class='add'>+	.name		= "sh-sci",</div><div class='add'>+	.id		= 7,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;scif7_platform_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SCIFB */</div><div class='add'>+static struct plat_sci_port scifb_platform_data = {</div><div class='add'>+	.mapbase	= 0xe6c30000,</div><div class='add'>+	.flags		= UPF_BOOT_AUTOCONF,</div><div class='add'>+	.scscr		= SCSCR_RE | SCSCR_TE,</div><div class='add'>+	.scbrr_algo_id	= SCBRR_ALGO_4,</div><div class='add'>+	.type		= PORT_SCIFB,</div><div class='add'>+	.irqs		= SCIx_IRQ_MUXED(evt2irq(0x0d60)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device scifb_device = {</div><div class='add'>+	.name		= "sh-sci",</div><div class='add'>+	.id		= 8,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;scifb_platform_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CMT */</div><div class='add'>+static struct sh_timer_config cmt10_platform_data = {</div><div class='add'>+	.name = "CMT10",</div><div class='add'>+	.channel_offset = 0x10,</div><div class='add'>+	.timer_bit = 0,</div><div class='add'>+	.clockevent_rating = 125,</div><div class='add'>+	.clocksource_rating = 125,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource cmt10_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.name	= "CMT10",</div><div class='add'>+		.start	= 0xe6138010,</div><div class='add'>+		.end	= 0xe613801b,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= evt2irq(0x0b00),</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device cmt10_device = {</div><div class='add'>+	.name		= "sh_cmt",</div><div class='add'>+	.id		= 10,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data	= &amp;cmt10_platform_data,</div><div class='add'>+	},</div><div class='add'>+	.resource	= cmt10_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(cmt10_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *r8a7740_early_devices[] __initdata = {</div><div class='add'>+	&amp;scif0_device,</div><div class='add'>+	&amp;scif1_device,</div><div class='add'>+	&amp;scif2_device,</div><div class='add'>+	&amp;scif3_device,</div><div class='add'>+	&amp;scif4_device,</div><div class='add'>+	&amp;scif5_device,</div><div class='add'>+	&amp;scif6_device,</div><div class='add'>+	&amp;scif7_device,</div><div class='add'>+	&amp;scifb_device,</div><div class='add'>+	&amp;cmt10_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* I2C */</div><div class='add'>+static struct resource i2c0_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.name	= "IIC0",</div><div class='add'>+		.start	= 0xfff20000,</div><div class='add'>+		.end	= 0xfff20425 - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= intcs_evt2irq(0xe00),</div><div class='add'>+		.end	= intcs_evt2irq(0xe60),</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource i2c1_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.name	= "IIC1",</div><div class='add'>+		.start	= 0xe6c20000,</div><div class='add'>+		.end	= 0xe6c20425 - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start  = evt2irq(0x780), /* IIC1_ALI1 */</div><div class='add'>+		.end    = evt2irq(0x7e0), /* IIC1_DTEI1 */</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device i2c0_device = {</div><div class='add'>+	.name		= "i2c-sh_mobile",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.resource	= i2c0_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(i2c0_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device i2c1_device = {</div><div class='add'>+	.name		= "i2c-sh_mobile",</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.resource	= i2c1_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(i2c1_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *r8a7740_late_devices[] __initdata = {</div><div class='add'>+	&amp;i2c0_device,</div><div class='add'>+	&amp;i2c1_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ICCR	0x0004</div><div class='add'>+#define ICSTART	0x0070</div><div class='add'>+</div><div class='add'>+#define i2c_read(reg, offset)		ioread8(reg + offset)</div><div class='add'>+#define i2c_write(reg, offset, data)	iowrite8(data, reg + offset)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * r8a7740 chip has lasting errata on I2C I/O pad reset.</div><div class='add'>+ * this is work-around for it.</div><div class='add'>+ */</div><div class='add'>+static void r8a7740_i2c_workaround(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct resource *res;</div><div class='add'>+	void __iomem *reg;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (unlikely(!res)) {</div><div class='add'>+		pr_err("r8a7740 i2c workaround fail (cannot find resource)\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg = ioremap(res-&gt;start, resource_size(res));</div><div class='add'>+	if (unlikely(!reg)) {</div><div class='add'>+		pr_err("r8a7740 i2c workaround fail (cannot map IO)\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c_write(reg, ICCR, i2c_read(reg, ICCR) | 0x80);</div><div class='add'>+	i2c_read(reg, ICCR); /* dummy read */</div><div class='add'>+</div><div class='add'>+	i2c_write(reg, ICSTART, i2c_read(reg, ICSTART) | 0x10);</div><div class='add'>+	i2c_read(reg, ICSTART); /* dummy read */</div><div class='add'>+</div><div class='add'>+	mdelay(100);</div><div class='add'>+</div><div class='add'>+	i2c_write(reg, ICCR, 0x01);</div><div class='add'>+	i2c_read(reg, ICCR);</div><div class='add'>+	i2c_write(reg, ICSTART, 0x00);</div><div class='add'>+	i2c_read(reg, ICSTART);</div><div class='add'>+</div><div class='add'>+	i2c_write(reg, ICCR, 0x10);</div><div class='add'>+	mdelay(100);</div><div class='add'>+	i2c_write(reg, ICCR, 0x00);</div><div class='add'>+	mdelay(100);</div><div class='add'>+	i2c_write(reg, ICCR, 0x10);</div><div class='add'>+	mdelay(100);</div><div class='add'>+</div><div class='add'>+	iounmap(reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init r8a7740_add_standard_devices(void)</div><div class='add'>+{</div><div class='add'>+	/* I2C work-around */</div><div class='add'>+	r8a7740_i2c_workaround(&amp;i2c0_device);</div><div class='add'>+	r8a7740_i2c_workaround(&amp;i2c1_device);</div><div class='add'>+</div><div class='add'>+	platform_add_devices(r8a7740_early_devices,</div><div class='add'>+			    ARRAY_SIZE(r8a7740_early_devices));</div><div class='add'>+	platform_add_devices(r8a7740_late_devices,</div><div class='add'>+			     ARRAY_SIZE(r8a7740_late_devices));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init r8a7740_add_early_devices(void)</div><div class='add'>+{</div><div class='add'>+	early_platform_add_devices(r8a7740_early_devices,</div><div class='add'>+				   ARRAY_SIZE(r8a7740_early_devices));</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c<br/>new file mode 100644<br/>index 000000000000..4725663bd032<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/setup-r8a7779.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/setup-r8a7779.c</a></div><div class='hunk'>@@ -0,0 +1,239 @@</div><div class='add'>+/*</div><div class='add'>+ * r8a7779 processor support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011  Renesas Solutions Corp.</div><div class='add'>+ * Copyright (C) 2011  Magnus Damm</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; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</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/irq.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/serial_sci.h&gt;</div><div class='add'>+#include &lt;linux/sh_intc.h&gt;</div><div class='add'>+#include &lt;linux/sh_timer.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/r8a7779.h&gt;</div><div class='add'>+#include &lt;mach/common.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+</div><div class='add'>+static struct plat_sci_port scif0_platform_data = {</div><div class='add'>+	.mapbase	= 0xffe40000,</div><div class='add'>+	.flags		= UPF_BOOT_AUTOCONF | UPF_IOREMAP,</div><div class='add'>+	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,</div><div class='add'>+	.scbrr_algo_id	= SCBRR_ALGO_2,</div><div class='add'>+	.type		= PORT_SCIF,</div><div class='add'>+	.irqs		= { gic_spi(88), gic_spi(88),</div><div class='add'>+			    gic_spi(88), gic_spi(88) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device scif0_device = {</div><div class='add'>+	.name		= "sh-sci",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;scif0_platform_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct plat_sci_port scif1_platform_data = {</div><div class='add'>+	.mapbase	= 0xffe41000,</div><div class='add'>+	.flags		= UPF_BOOT_AUTOCONF | UPF_IOREMAP,</div><div class='add'>+	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,</div><div class='add'>+	.scbrr_algo_id	= SCBRR_ALGO_2,</div><div class='add'>+	.type		= PORT_SCIF,</div><div class='add'>+	.irqs		= { gic_spi(89), gic_spi(89),</div><div class='add'>+			    gic_spi(89), gic_spi(89) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device scif1_device = {</div><div class='add'>+	.name		= "sh-sci",</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;scif1_platform_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct plat_sci_port scif2_platform_data = {</div><div class='add'>+	.mapbase	= 0xffe42000,</div><div class='add'>+	.flags		= UPF_BOOT_AUTOCONF | UPF_IOREMAP,</div><div class='add'>+	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,</div><div class='add'>+	.scbrr_algo_id	= SCBRR_ALGO_2,</div><div class='add'>+	.type		= PORT_SCIF,</div><div class='add'>+	.irqs		= { gic_spi(90), gic_spi(90),</div><div class='add'>+			    gic_spi(90), gic_spi(90) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device scif2_device = {</div><div class='add'>+	.name		= "sh-sci",</div><div class='add'>+	.id		= 2,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;scif2_platform_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct plat_sci_port scif3_platform_data = {</div><div class='add'>+	.mapbase	= 0xffe43000,</div><div class='add'>+	.flags		= UPF_BOOT_AUTOCONF | UPF_IOREMAP,</div><div class='add'>+	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,</div><div class='add'>+	.scbrr_algo_id	= SCBRR_ALGO_2,</div><div class='add'>+	.type		= PORT_SCIF,</div><div class='add'>+	.irqs		= { gic_spi(91), gic_spi(91),</div><div class='add'>+			    gic_spi(91), gic_spi(91) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device scif3_device = {</div><div class='add'>+	.name		= "sh-sci",</div><div class='add'>+	.id		= 3,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;scif3_platform_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct plat_sci_port scif4_platform_data = {</div><div class='add'>+	.mapbase	= 0xffe44000,</div><div class='add'>+	.flags		= UPF_BOOT_AUTOCONF | UPF_IOREMAP,</div><div class='add'>+	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,</div><div class='add'>+	.scbrr_algo_id	= SCBRR_ALGO_2,</div><div class='add'>+	.type		= PORT_SCIF,</div><div class='add'>+	.irqs		= { gic_spi(92), gic_spi(92),</div><div class='add'>+			    gic_spi(92), gic_spi(92) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device scif4_device = {</div><div class='add'>+	.name		= "sh-sci",</div><div class='add'>+	.id		= 4,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;scif4_platform_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct plat_sci_port scif5_platform_data = {</div><div class='add'>+	.mapbase	= 0xffe45000,</div><div class='add'>+	.flags		= UPF_BOOT_AUTOCONF | UPF_IOREMAP,</div><div class='add'>+	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,</div><div class='add'>+	.scbrr_algo_id	= SCBRR_ALGO_2,</div><div class='add'>+	.type		= PORT_SCIF,</div><div class='add'>+	.irqs		= { gic_spi(93), gic_spi(93),</div><div class='add'>+			    gic_spi(93), gic_spi(93) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device scif5_device = {</div><div class='add'>+	.name		= "sh-sci",</div><div class='add'>+	.id		= 5,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;scif5_platform_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* TMU */</div><div class='add'>+static struct sh_timer_config tmu00_platform_data = {</div><div class='add'>+	.name = "TMU00",</div><div class='add'>+	.channel_offset = 0x4,</div><div class='add'>+	.timer_bit = 0,</div><div class='add'>+	.clockevent_rating = 200,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource tmu00_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.name	= "TMU00",</div><div class='add'>+		.start	= 0xffd80008,</div><div class='add'>+		.end	= 0xffd80013,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= gic_spi(32),</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device tmu00_device = {</div><div class='add'>+	.name		= "sh_tmu",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data	= &amp;tmu00_platform_data,</div><div class='add'>+	},</div><div class='add'>+	.resource	= tmu00_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(tmu00_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sh_timer_config tmu01_platform_data = {</div><div class='add'>+	.name = "TMU01",</div><div class='add'>+	.channel_offset = 0x10,</div><div class='add'>+	.timer_bit = 1,</div><div class='add'>+	.clocksource_rating = 200,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource tmu01_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.name	= "TMU01",</div><div class='add'>+		.start	= 0xffd80014,</div><div class='add'>+		.end	= 0xffd8001f,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= gic_spi(33),</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device tmu01_device = {</div><div class='add'>+	.name		= "sh_tmu",</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data	= &amp;tmu01_platform_data,</div><div class='add'>+	},</div><div class='add'>+	.resource	= tmu01_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(tmu01_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *r8a7779_early_devices[] __initdata = {</div><div class='add'>+	&amp;scif0_device,</div><div class='add'>+	&amp;scif1_device,</div><div class='add'>+	&amp;scif2_device,</div><div class='add'>+	&amp;scif3_device,</div><div class='add'>+	&amp;scif4_device,</div><div class='add'>+	&amp;scif5_device,</div><div class='add'>+	&amp;tmu00_device,</div><div class='add'>+	&amp;tmu01_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *r8a7779_late_devices[] __initdata = {</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init r8a7779_add_standard_devices(void)</div><div class='add'>+{</div><div class='add'>+	r8a7779_pm_init();</div><div class='add'>+</div><div class='add'>+	r8a7779_init_pm_domain(&amp;r8a7779_sh4a);</div><div class='add'>+	r8a7779_init_pm_domain(&amp;r8a7779_sgx);</div><div class='add'>+	r8a7779_init_pm_domain(&amp;r8a7779_vdp1);</div><div class='add'>+	r8a7779_init_pm_domain(&amp;r8a7779_impx3);</div><div class='add'>+</div><div class='add'>+	platform_add_devices(r8a7779_early_devices,</div><div class='add'>+			    ARRAY_SIZE(r8a7779_early_devices));</div><div class='add'>+	platform_add_devices(r8a7779_late_devices,</div><div class='add'>+			    ARRAY_SIZE(r8a7779_late_devices));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init r8a7779_add_early_devices(void)</div><div class='add'>+{</div><div class='add'>+	early_platform_add_devices(r8a7779_early_devices,</div><div class='add'>+				   ARRAY_SIZE(r8a7779_early_devices));</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c<br/>index 2380389e6ac5..6fcf304d3cdf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/setup-sh7372.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/setup-sh7372.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/setup-sh7372.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/setup-sh7372.c</a></div><div class='hunk'>@@ -445,31 +445,39 @@ static const struct sh_dmae_slave_config sh7372_dmae_slaves[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define SH7372_CHCLR 0x220</div><div class='add'>+</div><div class='ctx'> static const struct sh_dmae_channel sh7372_dmae_channels[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.dmars = 0,</div><div class='ctx'> 		.dmars_bit = 0,</div><div class='add'>+		.chclr_offset = SH7372_CHCLR + 0,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.offset = 0x10,</div><div class='ctx'> 		.dmars = 0,</div><div class='ctx'> 		.dmars_bit = 8,</div><div class='add'>+		.chclr_offset = SH7372_CHCLR + 0x10,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.offset = 0x20,</div><div class='ctx'> 		.dmars = 4,</div><div class='ctx'> 		.dmars_bit = 0,</div><div class='add'>+		.chclr_offset = SH7372_CHCLR + 0x20,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.offset = 0x30,</div><div class='ctx'> 		.dmars = 4,</div><div class='ctx'> 		.dmars_bit = 8,</div><div class='add'>+		.chclr_offset = SH7372_CHCLR + 0x30,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.offset = 0x50,</div><div class='ctx'> 		.dmars = 8,</div><div class='ctx'> 		.dmars_bit = 0,</div><div class='add'>+		.chclr_offset = SH7372_CHCLR + 0x50,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.offset = 0x60,</div><div class='ctx'> 		.dmars = 8,</div><div class='ctx'> 		.dmars_bit = 8,</div><div class='add'>+		.chclr_offset = SH7372_CHCLR + 0x60,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -487,6 +495,7 @@ static struct sh_dmae_pdata dma_platform_data = {</div><div class='ctx'> 	.ts_shift	= ts_shift,</div><div class='ctx'> 	.ts_shift_num	= ARRAY_SIZE(ts_shift),</div><div class='ctx'> 	.dmaor_init	= DMAOR_DME,</div><div class='add'>+	.chclr_present	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Resource order important! */</div><div class='hunk'>@@ -494,7 +503,7 @@ static struct resource sh7372_dmae0_resources[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		/* Channel registers and DMAOR */</div><div class='ctx'> 		.start	= 0xfe008020,</div><div class='del'>-		.end	= 0xfe00808f,</div><div class='add'>+		.end	= 0xfe00828f,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -504,7 +513,7 @@ static struct resource sh7372_dmae0_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		/* DMA error IRQ */</div><div class='add'>+		.name	= "error_irq",</div><div class='ctx'> 		.start	= evt2irq(0x20c0),</div><div class='ctx'> 		.end	= evt2irq(0x20c0),</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ,</div><div class='hunk'>@@ -522,7 +531,7 @@ static struct resource sh7372_dmae1_resources[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		/* Channel registers and DMAOR */</div><div class='ctx'> 		.start	= 0xfe018020,</div><div class='del'>-		.end	= 0xfe01808f,</div><div class='add'>+		.end	= 0xfe01828f,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -532,7 +541,7 @@ static struct resource sh7372_dmae1_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		/* DMA error IRQ */</div><div class='add'>+		.name	= "error_irq",</div><div class='ctx'> 		.start	= evt2irq(0x21c0),</div><div class='ctx'> 		.end	= evt2irq(0x21c0),</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ,</div><div class='hunk'>@@ -550,7 +559,7 @@ static struct resource sh7372_dmae2_resources[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		/* Channel registers and DMAOR */</div><div class='ctx'> 		.start	= 0xfe028020,</div><div class='del'>-		.end	= 0xfe02808f,</div><div class='add'>+		.end	= 0xfe02828f,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -560,7 +569,7 @@ static struct resource sh7372_dmae2_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		/* DMA error IRQ */</div><div class='add'>+		.name	= "error_irq",</div><div class='ctx'> 		.start	= evt2irq(0x22c0),</div><div class='ctx'> 		.end	= evt2irq(0x22c0),</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ,</div><div class='hunk'>@@ -994,12 +1003,16 @@ void __init sh7372_add_standard_devices(void)</div><div class='ctx'> 	sh7372_init_pm_domain(&amp;sh7372_a4r);</div><div class='ctx'> 	sh7372_init_pm_domain(&amp;sh7372_a3rv);</div><div class='ctx'> 	sh7372_init_pm_domain(&amp;sh7372_a3ri);</div><div class='del'>-	sh7372_init_pm_domain(&amp;sh7372_a3sg);</div><div class='add'>+	sh7372_init_pm_domain(&amp;sh7372_a4s);</div><div class='ctx'> 	sh7372_init_pm_domain(&amp;sh7372_a3sp);</div><div class='add'>+	sh7372_init_pm_domain(&amp;sh7372_a3sg);</div><div class='ctx'> </div><div class='ctx'> 	sh7372_pm_add_subdomain(&amp;sh7372_a4lc, &amp;sh7372_a3rv);</div><div class='ctx'> 	sh7372_pm_add_subdomain(&amp;sh7372_a4r, &amp;sh7372_a4lc);</div><div class='ctx'> </div><div class='add'>+	sh7372_pm_add_subdomain(&amp;sh7372_a4s, &amp;sh7372_a3sg);</div><div class='add'>+	sh7372_pm_add_subdomain(&amp;sh7372_a4s, &amp;sh7372_a3sp);</div><div class='add'>+</div><div class='ctx'> 	platform_add_devices(sh7372_early_devices,</div><div class='ctx'> 			    ARRAY_SIZE(sh7372_early_devices));</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c<br/>index e46821c0a62e..20e71e5cace4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/setup-sh73a0.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/setup-sh73a0.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/setup-sh73a0.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/setup-sh73a0.c</a></div><div class='hunk'>@@ -607,7 +607,7 @@ static struct resource sh73a0_dmae_resources[] = {</div><div class='ctx'> 		.flags  = IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		/* DMA error IRQ */</div><div class='add'>+		.name	= "error_irq",</div><div class='ctx'> 		.start  = gic_spi(129),</div><div class='ctx'> 		.end    = gic_spi(129),</div><div class='ctx'> 		.flags  = IORESOURCE_IRQ,</div><div class='head'>diff --git a/arch/arm/mach-shmobile/sleep-sh7372.S b/arch/arm/mach-shmobile/sleep-sh7372.S<br/>index f3ab3c5810ea..1d564674451d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/sleep-sh7372.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-shmobile/sleep-sh7372.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/sleep-sh7372.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/sleep-sh7372.S</a></div><div class='hunk'>@@ -37,13 +37,18 @@</div><div class='ctx'> #if defined(CONFIG_SUSPEND) || defined(CONFIG_CPU_IDLE)</div><div class='ctx'> 	.align	12</div><div class='ctx'> 	.text</div><div class='del'>-	.global sh7372_resume_core_standby_a3sm</div><div class='del'>-sh7372_resume_core_standby_a3sm:</div><div class='add'>+	.global sh7372_resume_core_standby_sysc</div><div class='add'>+sh7372_resume_core_standby_sysc:</div><div class='ctx'> 	ldr     pc, 1f</div><div class='ctx'> 1:	.long   cpu_resume - PAGE_OFFSET + PLAT_PHYS_OFFSET</div><div class='ctx'> </div><div class='del'>-	.global	sh7372_do_idle_a3sm</div><div class='del'>-sh7372_do_idle_a3sm:</div><div class='add'>+#define SPDCR 0xe6180008</div><div class='add'>+</div><div class='add'>+	/* A3SM &amp; A4S power down */</div><div class='add'>+	.global	sh7372_do_idle_sysc</div><div class='add'>+sh7372_do_idle_sysc:</div><div class='add'>+	mov	r8, r0 /* sleep mode passed in r0 */</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clear the SCTLR.C bit to prevent further data cache</div><div class='ctx'> 	 * allocation. Clearing SCTLR.C would make all the data accesses</div><div class='hunk'>@@ -80,13 +85,9 @@ sh7372_do_idle_a3sm:</div><div class='ctx'> 	dsb</div><div class='ctx'> 	dmb</div><div class='ctx'> </div><div class='del'>-#define SPDCR 0xe6180008</div><div class='del'>-#define A3SM (1 &lt;&lt; 12)</div><div class='del'>-</div><div class='del'>-	/* A3SM power down */</div><div class='add'>+	/* SYSC power down */</div><div class='ctx'> 	ldr     r0, =SPDCR</div><div class='del'>-	ldr     r1, =A3SM</div><div class='del'>-	str     r1, [r0]</div><div class='add'>+	str     r8, [r0]</div><div class='ctx'> 1:</div><div class='ctx'> 	b      1b</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c<br/>new file mode 100644<br/>index 000000000000..cc97ef892d1b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shmobile/smp-r8a7779.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-shmobile/smp-r8a7779.c</a></div><div class='hunk'>@@ -0,0 +1,153 @@</div><div class='add'>+/*</div><div class='add'>+ * SMP support for R-Mobile / SH-Mobile - r8a7779 portion</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011  Renesas Solutions Corp.</div><div class='add'>+ * Copyright (C) 2011  Magnus Damm</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; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</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/smp.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.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;mach/common.h&gt;</div><div class='add'>+#include &lt;mach/r8a7779.h&gt;</div><div class='add'>+#include &lt;asm/smp_scu.h&gt;</div><div class='add'>+#include &lt;asm/smp_twd.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='add'>+</div><div class='add'>+#define AVECR 0xfe700040</div><div class='add'>+</div><div class='add'>+static struct r8a7779_pm_ch r8a7779_ch_cpu1 = {</div><div class='add'>+	.chan_offs = 0x40, /* PWRSR0 .. PWRER0 */</div><div class='add'>+	.chan_bit = 1, /* ARM1 */</div><div class='add'>+	.isr_bit = 1, /* ARM1 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct r8a7779_pm_ch r8a7779_ch_cpu2 = {</div><div class='add'>+	.chan_offs = 0x40, /* PWRSR0 .. PWRER0 */</div><div class='add'>+	.chan_bit = 2, /* ARM2 */</div><div class='add'>+	.isr_bit = 2, /* ARM2 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct r8a7779_pm_ch r8a7779_ch_cpu3 = {</div><div class='add'>+	.chan_offs = 0x40, /* PWRSR0 .. PWRER0 */</div><div class='add'>+	.chan_bit = 3, /* ARM3 */</div><div class='add'>+	.isr_bit = 3, /* ARM3 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct r8a7779_pm_ch *r8a7779_ch_cpu[4] = {</div><div class='add'>+	[1] = &amp;r8a7779_ch_cpu1,</div><div class='add'>+	[2] = &amp;r8a7779_ch_cpu2,</div><div class='add'>+	[3] = &amp;r8a7779_ch_cpu3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __iomem *scu_base_addr(void)</div><div class='add'>+{</div><div class='add'>+	return (void __iomem *)0xf0000000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(scu_lock);</div><div class='add'>+static unsigned long tmp;</div><div class='add'>+</div><div class='add'>+static void modify_scu_cpu_psr(unsigned long set, unsigned long clr)</div><div class='add'>+{</div><div class='add'>+	void __iomem *scu_base = scu_base_addr();</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;scu_lock);</div><div class='add'>+	tmp = __raw_readl(scu_base + 8);</div><div class='add'>+	tmp &amp;= ~clr;</div><div class='add'>+	tmp |= set;</div><div class='add'>+	spin_unlock(&amp;scu_lock);</div><div class='add'>+</div><div class='add'>+	/* disable cache coherency after releasing the lock */</div><div class='add'>+	__raw_writel(tmp, scu_base + 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int __init r8a7779_get_core_count(void)</div><div class='add'>+{</div><div class='add'>+	void __iomem *scu_base = scu_base_addr();</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HAVE_ARM_TWD</div><div class='add'>+	/* twd_base needs to be initialized before percpu_timer_setup() */</div><div class='add'>+	twd_base = (void __iomem *)0xf0000600;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return scu_get_core_count(scu_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int r8a7779_platform_cpu_kill(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct r8a7779_pm_ch *ch = NULL;</div><div class='add'>+	int ret = -EIO;</div><div class='add'>+</div><div class='add'>+	cpu = cpu_logical_map(cpu);</div><div class='add'>+</div><div class='add'>+	/* disable cache coherency */</div><div class='add'>+	modify_scu_cpu_psr(3 &lt;&lt; (cpu * 8), 0);</div><div class='add'>+</div><div class='add'>+	if (cpu &lt; ARRAY_SIZE(r8a7779_ch_cpu))</div><div class='add'>+		ch = r8a7779_ch_cpu[cpu];</div><div class='add'>+</div><div class='add'>+	if (ch)</div><div class='add'>+		ret = r8a7779_sysc_power_down(ch);</div><div class='add'>+</div><div class='add'>+	return ret ? ret : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __cpuinit r8a7779_secondary_init(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	gic_secondary_init(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __cpuinit r8a7779_boot_secondary(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct r8a7779_pm_ch *ch = NULL;</div><div class='add'>+	int ret = -EIO;</div><div class='add'>+</div><div class='add'>+	cpu = cpu_logical_map(cpu);</div><div class='add'>+</div><div class='add'>+	/* enable cache coherency */</div><div class='add'>+	modify_scu_cpu_psr(0, 3 &lt;&lt; (cpu * 8));</div><div class='add'>+</div><div class='add'>+	if (cpu &lt; ARRAY_SIZE(r8a7779_ch_cpu))</div><div class='add'>+		ch = r8a7779_ch_cpu[cpu];</div><div class='add'>+</div><div class='add'>+	if (ch)</div><div class='add'>+		ret = r8a7779_sysc_power_up(ch);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init r8a7779_smp_prepare_cpus(void)</div><div class='add'>+{</div><div class='add'>+	int cpu = cpu_logical_map(0);</div><div class='add'>+</div><div class='add'>+	scu_enable(scu_base_addr());</div><div class='add'>+</div><div class='add'>+	/* Map the reset vector (in headsmp.S) */</div><div class='add'>+	__raw_writel(__pa(shmobile_secondary_vector), __io(AVECR));</div><div class='add'>+</div><div class='add'>+	/* enable cache coherency on CPU0 */</div><div class='add'>+	modify_scu_cpu_psr(0, 3 &lt;&lt; (cpu * 8));</div><div class='add'>+</div><div class='add'>+	r8a7779_pm_init();</div><div class='add'>+</div><div class='add'>+	/* power off secondary CPUs */</div><div class='add'>+	r8a7779_platform_cpu_kill(1);</div><div class='add'>+	r8a7779_platform_cpu_kill(2);</div><div class='add'>+	r8a7779_platform_cpu_kill(3);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-spear3xx/include/mach/entry-macro.S b/arch/arm/mach-spear3xx/include/mach/entry-macro.S<br/>index 53da4224ba3d..de3bb41c8e9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-spear3xx/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear3xx/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-spear3xx/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-spear3xx/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -11,35 +11,8 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware/vic.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-</div><div class='ctx'> 		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='del'>-		.macro	get_irqnr_preamble, base, tmp</div><div class='del'>-		.endm</div><div class='del'>-</div><div class='ctx'> 		.macro	arch_ret_to_user, tmp1, tmp2</div><div class='ctx'> 		.endm</div><div class='del'>-</div><div class='del'>-		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-		ldr	\base, =VA_SPEAR3XX_ML1_VIC_BASE</div><div class='del'>-		ldr	\irqstat, [\base, #VIC_IRQ_STATUS]	@ get status</div><div class='del'>-		teq	\irqstat, #0</div><div class='del'>-		beq	1001f				@ this will set/reset</div><div class='del'>-							@ zero register</div><div class='del'>-		/*</div><div class='del'>-		 * Following code will find bit position of least significang</div><div class='del'>-		 * bit set in irqstat, using following equation</div><div class='del'>-		 * least significant bit set in n = (n &amp; ~(n-1))</div><div class='del'>-		 */</div><div class='del'>-		sub	\tmp, \irqstat, #1		@ tmp = irqstat - 1</div><div class='del'>-		mvn	\tmp, \tmp			@ tmp = ~tmp</div><div class='del'>-		and	\irqstat, \irqstat, \tmp	@ irqstat &amp;= tmp</div><div class='del'>-		/* Now, irqstat is = bit no. of 1st bit set in vic irq status */</div><div class='del'>-		clz	\tmp, \irqstat			@ tmp = leading zeros</div><div class='del'>-		rsb	\irqnr, \tmp, #0x1F		@ irqnr = 32 - tmp - 1</div><div class='del'>-</div><div class='del'>-1001:		/* EQ will be set if no irqs pending */</div><div class='del'>-		.endm</div><div class='head'>diff --git a/arch/arm/mach-spear3xx/include/mach/generic.h b/arch/arm/mach-spear3xx/include/mach/generic.h<br/>index b8f31c3935f7..14276e5a98d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-spear3xx/include/mach/generic.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear3xx/include/mach/generic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-spear3xx/include/mach/generic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-spear3xx/include/mach/generic.h</a></div><div class='hunk'>@@ -42,6 +42,8 @@ void __init spear3xx_map_io(void);</div><div class='ctx'> void __init spear3xx_init_irq(void);</div><div class='ctx'> void __init spear3xx_init(void);</div><div class='ctx'> </div><div class='add'>+void spear_restart(char, const char *);</div><div class='add'>+</div><div class='ctx'> /* pad mux declarations */</div><div class='ctx'> #define PMX_FIRDA_MASK		(1 &lt;&lt; 14)</div><div class='ctx'> #define PMX_I2C_MASK		(1 &lt;&lt; 13)</div><div class='head'>diff --git a/arch/arm/mach-spear3xx/include/mach/vmalloc.h b/arch/arm/mach-spear3xx/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index df977b3c9a63..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-spear3xx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear3xx/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-spear3xx/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * Defining Vmalloc area for SPEAr3xx machine family</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 ST Microelectronics</div><div class='del'>- * Viresh Kumar&lt;viresh.kumar@st.com&gt;</div><div class='del'>- *</div><div class='del'>- * This file is licensed under the terms of the GNU General Public</div><div class='del'>- * License version 2. This program is licensed "as is" without any</div><div class='del'>- * warranty of any kind, whether express or implied.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __MACH_VMALLOC_H</div><div class='del'>-#define __MACH_VMALLOC_H</div><div class='del'>-</div><div class='del'>-#include &lt;plat/vmalloc.h&gt;</div><div class='del'>-</div><div class='del'>-#endif /* __MACH_VMALLOC_H */</div><div class='head'>diff --git a/arch/arm/mach-spear3xx/spear300_evb.c b/arch/arm/mach-spear3xx/spear300_evb.c<br/>index a5ff98eed1db..3462ab9d6122 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-spear3xx/spear300_evb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear3xx/spear300_evb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-spear3xx/spear300_evb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-spear3xx/spear300_evb.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;mach/generic.h&gt;</div><div class='hunk'>@@ -67,6 +68,8 @@ MACHINE_START(SPEAR300, "ST-SPEAR300-EVB")</div><div class='ctx'> 	.atag_offset	=	0x100,</div><div class='ctx'> 	.map_io		=	spear3xx_map_io,</div><div class='ctx'> 	.init_irq	=	spear3xx_init_irq,</div><div class='add'>+	.handle_irq	=	vic_handle_irq,</div><div class='ctx'> 	.timer		=	&amp;spear3xx_timer,</div><div class='ctx'> 	.init_machine	=	spear300_evb_init,</div><div class='add'>+	.restart	=	spear_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-spear3xx/spear310_evb.c b/arch/arm/mach-spear3xx/spear310_evb.c<br/>index 45d180d59362..f92c4993f65a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-spear3xx/spear310_evb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear3xx/spear310_evb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-spear3xx/spear310_evb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-spear3xx/spear310_evb.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;mach/generic.h&gt;</div><div class='hunk'>@@ -73,6 +74,8 @@ MACHINE_START(SPEAR310, "ST-SPEAR310-EVB")</div><div class='ctx'> 	.atag_offset	=	0x100,</div><div class='ctx'> 	.map_io		=	spear3xx_map_io,</div><div class='ctx'> 	.init_irq	=	spear3xx_init_irq,</div><div class='add'>+	.handle_irq	=	vic_handle_irq,</div><div class='ctx'> 	.timer		=	&amp;spear3xx_timer,</div><div class='ctx'> 	.init_machine	=	spear310_evb_init,</div><div class='add'>+	.restart	=	spear_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-spear3xx/spear320_evb.c b/arch/arm/mach-spear3xx/spear320_evb.c<br/>index 22879848d73a..105334ab7021 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-spear3xx/spear320_evb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear3xx/spear320_evb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-spear3xx/spear320_evb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-spear3xx/spear320_evb.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;mach/generic.h&gt;</div><div class='hunk'>@@ -71,6 +72,8 @@ MACHINE_START(SPEAR320, "ST-SPEAR320-EVB")</div><div class='ctx'> 	.atag_offset	=	0x100,</div><div class='ctx'> 	.map_io		=	spear3xx_map_io,</div><div class='ctx'> 	.init_irq	=	spear3xx_init_irq,</div><div class='add'>+	.handle_irq	=	vic_handle_irq,</div><div class='ctx'> 	.timer		=	&amp;spear3xx_timer,</div><div class='ctx'> 	.init_machine	=	spear320_evb_init,</div><div class='add'>+	.restart	=	spear_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-spear6xx/include/mach/entry-macro.S b/arch/arm/mach-spear6xx/include/mach/entry-macro.S<br/>index 8a0b0ed7b203..d490a910d925 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-spear6xx/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear6xx/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-spear6xx/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-spear6xx/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -11,44 +11,8 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/hardware/vic.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-</div><div class='ctx'> 		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='del'>-		.macro	get_irqnr_preamble, base, tmp</div><div class='del'>-		.endm</div><div class='del'>-</div><div class='ctx'> 		.macro	arch_ret_to_user, tmp1, tmp2</div><div class='ctx'> 		.endm</div><div class='del'>-</div><div class='del'>-		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-		ldr	\base, =VA_SPEAR6XX_CPU_VIC_PRI_BASE</div><div class='del'>-		ldr	\irqstat, [\base, #VIC_IRQ_STATUS]	@ get status</div><div class='del'>-		mov	\irqnr, #0</div><div class='del'>-		teq	\irqstat, #0</div><div class='del'>-		bne	1001f</div><div class='del'>-		ldr	\base, =VA_SPEAR6XX_CPU_VIC_SEC_BASE</div><div class='del'>-		ldr	\irqstat, [\base, #VIC_IRQ_STATUS]	@ get status</div><div class='del'>-		teq	\irqstat, #0</div><div class='del'>-		beq	1002f				@ this will set/reset</div><div class='del'>-							@ zero register</div><div class='del'>-		mov	\irqnr, #32</div><div class='del'>-1001:</div><div class='del'>-		/*</div><div class='del'>-		 * Following code will find bit position of least significang</div><div class='del'>-		 * bit set in irqstat, using following equation</div><div class='del'>-		 * least significant bit set in n = (n &amp; ~(n-1))</div><div class='del'>-		 */</div><div class='del'>-		sub	\tmp, \irqstat, #1		@ tmp = irqstat - 1</div><div class='del'>-		mvn	\tmp, \tmp			@ tmp = ~tmp</div><div class='del'>-		and	\irqstat, \irqstat, \tmp	@ irqstat &amp;= tmp</div><div class='del'>-		/* Now, irqstat is = bit no. of 1st bit set in vic irq status */</div><div class='del'>-		clz	\tmp, \irqstat			@ tmp = leading zeros</div><div class='del'>-</div><div class='del'>-		rsb	\tmp, \tmp, #0x1F		@ tmp = 32 - tmp - 1</div><div class='del'>-		add	\irqnr, \irqnr, \tmp</div><div class='del'>-</div><div class='del'>-1002:		/* EQ will be set if no irqs pending */</div><div class='del'>-		.endm</div><div class='head'>diff --git a/arch/arm/mach-spear6xx/include/mach/generic.h b/arch/arm/mach-spear6xx/include/mach/generic.h<br/>index 183f0238c5e2..116b99301cf5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-spear6xx/include/mach/generic.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear6xx/include/mach/generic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-spear6xx/include/mach/generic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-spear6xx/include/mach/generic.h</a></div><div class='hunk'>@@ -41,6 +41,8 @@ void __init spear6xx_init(void);</div><div class='ctx'> void __init spear600_init(void);</div><div class='ctx'> void __init spear6xx_clk_init(void);</div><div class='ctx'> </div><div class='add'>+void spear_restart(char, const char *);</div><div class='add'>+</div><div class='ctx'> /* Add spear600 machine device structure declarations here */</div><div class='ctx'> </div><div class='ctx'> #endif /* __MACH_GENERIC_H */</div><div class='head'>diff --git a/arch/arm/mach-spear6xx/include/mach/vmalloc.h b/arch/arm/mach-spear6xx/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 4a0b56cb2a91..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-spear6xx/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear6xx/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-spear6xx/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * Defining Vmalloc area for SPEAr6xx machine family</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 ST Microelectronics</div><div class='del'>- * Rajeev Kumar&lt;rajeev-dlh.kumar@st.com&gt;</div><div class='del'>- *</div><div class='del'>- * This file is licensed under the terms of the GNU General Public</div><div class='del'>- * License version 2. This program is licensed "as is" without any</div><div class='del'>- * warranty of any kind, whether express or implied.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __MACH_VMALLOC_H</div><div class='del'>-#define __MACH_VMALLOC_H</div><div class='del'>-</div><div class='del'>-#include &lt;plat/vmalloc.h&gt;</div><div class='del'>-</div><div class='del'>-#endif	/* __MACH_VMALLOC_H */</div><div class='head'>diff --git a/arch/arm/mach-spear6xx/spear600_evb.c b/arch/arm/mach-spear6xx/spear600_evb.c<br/>index 8238fe38e713..c6e4254741cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-spear6xx/spear600_evb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-spear6xx/spear600_evb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-spear6xx/spear600_evb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-spear6xx/spear600_evb.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;mach/generic.h&gt;</div><div class='hunk'>@@ -46,6 +47,8 @@ MACHINE_START(SPEAR600, "ST-SPEAR600-EVB")</div><div class='ctx'> 	.atag_offset	=	0x100,</div><div class='ctx'> 	.map_io		=	spear6xx_map_io,</div><div class='ctx'> 	.init_irq	=	spear6xx_init_irq,</div><div class='add'>+	.handle_irq	=	vic_handle_irq,</div><div class='ctx'> 	.timer		=	&amp;spear6xx_timer,</div><div class='ctx'> 	.init_machine	=	spear600_evb_init,</div><div class='add'>+	.restart	=	spear_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-tcc8k/Kconfig b/arch/arm/mach-tcc8k/Kconfig<br/>deleted file mode 100644<br/>index ad86415d1577..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tcc8k/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-if ARCH_TCC8K</div><div class='del'>-</div><div class='del'>-comment "TCC8000 systems:"</div><div class='del'>-</div><div class='del'>-config MACH_TCC8000_SDK</div><div class='del'>-	bool "Telechips TCC8000-SDK development kit"</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Support for the Telechips TCC8000-SDK board.</div><div class='del'>-</div><div class='del'>-endif</div><div class='head'>diff --git a/arch/arm/mach-tcc8k/Makefile b/arch/arm/mach-tcc8k/Makefile<br/>deleted file mode 100644<br/>index 9bacf31e49ba..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tcc8k/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# Makefile for TCC8K boards and common files.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-# Common support</div><div class='del'>-obj-y += clock.o irq.o time.o io.o devices.o</div><div class='del'>-</div><div class='del'>-# Board specific support</div><div class='del'>-obj-$(CONFIG_MACH_TCC8000_SDK) += board-tcc8000-sdk.o</div><div class='head'>diff --git a/arch/arm/mach-tcc8k/Makefile.boot b/arch/arm/mach-tcc8k/Makefile.boot<br/>deleted file mode 100644<br/>index 5e02d4156b04..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tcc8k/Makefile.boot?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/Makefile.boot</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-   zreladdr-y		+= 0x20008000</div><div class='del'>-params_phys-y		:= 0x20000100</div><div class='del'>-initrd_phys-y		:= 0x20800000</div><div class='head'>diff --git a/arch/arm/mach-tcc8k/board-tcc8000-sdk.c b/arch/arm/mach-tcc8k/board-tcc8000-sdk.c<br/>deleted file mode 100644<br/>index 777a5bb9eed2..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tcc8k/board-tcc8000-sdk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/board-tcc8000-sdk.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,81 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2009 Hans J. Koch &lt;hjk@linutronix.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'>-</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/mach/map.h&gt;</div><div class='del'>-#include &lt;asm/mach/time.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/clock.h&gt;</div><div class='del'>-#include &lt;mach/tcc-nand.h&gt;</div><div class='del'>-#include &lt;mach/tcc8k-regs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "common.h"</div><div class='del'>-</div><div class='del'>-#define XI_FREQUENCY	12000000</div><div class='del'>-#define XTI_FREQUENCY	32768</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MTD_NAND_TCC</div><div class='del'>-/* NAND */</div><div class='del'>-static struct tcc_nand_platform_data tcc8k_sdk_nand_data = {</div><div class='del'>-	.width = 1,</div><div class='del'>-	.hw_ecc = 0,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void __init tcc8k_init(void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_MTD_NAND_TCC</div><div class='del'>-	tcc_nand_device.dev.platform_data = &amp;tcc8k_sdk_nand_data;</div><div class='del'>-	platform_device_register(&amp;tcc_nand_device);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init tcc8k_init_timer(void)</div><div class='del'>-{</div><div class='del'>-	tcc_clocks_init(XI_FREQUENCY, XTI_FREQUENCY);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sys_timer tcc8k_timer = {</div><div class='del'>-	.init	= tcc8k_init_timer,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __init tcc8k_map_io(void)</div><div class='del'>-{</div><div class='del'>-	tcc8k_map_common_io();</div><div class='del'>-</div><div class='del'>-	/* set PLL0 clock to 96MHz, adapt UART0 divisor */</div><div class='del'>-	__raw_writel(0x00026003, CKC_BASE + PLL0CFG_OFFS);</div><div class='del'>-	__raw_writel(0x10000001, CKC_BASE + ACLKUART0_OFFS);</div><div class='del'>-</div><div class='del'>-	/* set PLL1 clock to 192MHz */</div><div class='del'>-	__raw_writel(0x00016003, CKC_BASE + PLL1CFG_OFFS);</div><div class='del'>-</div><div class='del'>-	/* set PLL2 clock to 48MHz */</div><div class='del'>-	__raw_writel(0x00036003, CKC_BASE + PLL2CFG_OFFS);</div><div class='del'>-</div><div class='del'>-	/* with CPU freq higher than 150 MHz, need extra DTCM wait */</div><div class='del'>-	__raw_writel(0x00000001, SCFG_BASE + DTCMWAIT_OFFS);</div><div class='del'>-</div><div class='del'>-	/* PLL locking time as specified */</div><div class='del'>-	udelay(300);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-MACHINE_START(TCC8000_SDK, "Telechips TCC8000-SDK Demo Board")</div><div class='del'>-	.atag_offset	= 0x100,</div><div class='del'>-	.map_io		= tcc8k_map_io,</div><div class='del'>-	.init_irq	= tcc8k_init_irq,</div><div class='del'>-	.init_machine	= tcc8k_init,</div><div class='del'>-	.timer		= &amp;tcc8k_timer,</div><div class='del'>-MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-tcc8k/clock.c b/arch/arm/mach-tcc8k/clock.c<br/>deleted file mode 100644<br/>index e7cdae5c77a4..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tcc8k/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/clock.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,580 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Lowlevel clock handling for Telechips TCC8xxx SoCs</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2010 by Hans J. Koch &lt;hjk@linutronix.de&gt;</div><div class='del'>- *</div><div class='del'>- * Licensed under the terms of the GPL v2</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/delay.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/clkdev.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/clock.h&gt;</div><div class='del'>-#include &lt;mach/irqs.h&gt;</div><div class='del'>-#include &lt;mach/tcc8k-regs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "common.h"</div><div class='del'>-</div><div class='del'>-#define BCLKCTR0	(CKC_BASE + BCLKCTR0_OFFS)</div><div class='del'>-#define BCLKCTR1	(CKC_BASE + BCLKCTR1_OFFS)</div><div class='del'>-</div><div class='del'>-#define ACLKREF		(CKC_BASE + ACLKREF_OFFS)</div><div class='del'>-#define ACLKUART0	(CKC_BASE + ACLKUART0_OFFS)</div><div class='del'>-#define ACLKUART1	(CKC_BASE + ACLKUART1_OFFS)</div><div class='del'>-#define ACLKUART2	(CKC_BASE + ACLKUART2_OFFS)</div><div class='del'>-#define ACLKUART3	(CKC_BASE + ACLKUART3_OFFS)</div><div class='del'>-#define ACLKUART4	(CKC_BASE + ACLKUART4_OFFS)</div><div class='del'>-#define ACLKI2C		(CKC_BASE + ACLKI2C_OFFS)</div><div class='del'>-#define ACLKADC		(CKC_BASE + ACLKADC_OFFS)</div><div class='del'>-#define ACLKUSBH	(CKC_BASE + ACLKUSBH_OFFS)</div><div class='del'>-#define ACLKLCD		(CKC_BASE + ACLKLCD_OFFS)</div><div class='del'>-#define ACLKSDH0	(CKC_BASE + ACLKSDH0_OFFS)</div><div class='del'>-#define ACLKSDH1	(CKC_BASE + ACLKSDH1_OFFS)</div><div class='del'>-#define ACLKSPI0	(CKC_BASE + ACLKSPI0_OFFS)</div><div class='del'>-#define ACLKSPI1	(CKC_BASE + ACLKSPI1_OFFS)</div><div class='del'>-#define ACLKSPDIF	(CKC_BASE + ACLKSPDIF_OFFS)</div><div class='del'>-#define ACLKC3DEC	(CKC_BASE + ACLKC3DEC_OFFS)</div><div class='del'>-#define ACLKCAN0	(CKC_BASE + ACLKCAN0_OFFS)</div><div class='del'>-#define ACLKCAN1	(CKC_BASE + ACLKCAN1_OFFS)</div><div class='del'>-#define ACLKGSB0	(CKC_BASE + ACLKGSB0_OFFS)</div><div class='del'>-#define ACLKGSB1	(CKC_BASE + ACLKGSB1_OFFS)</div><div class='del'>-#define ACLKGSB2	(CKC_BASE + ACLKGSB2_OFFS)</div><div class='del'>-#define ACLKGSB3	(CKC_BASE + ACLKGSB3_OFFS)</div><div class='del'>-#define ACLKTCT		(CKC_BASE + ACLKTCT_OFFS)</div><div class='del'>-#define ACLKTCX		(CKC_BASE + ACLKTCX_OFFS)</div><div class='del'>-#define ACLKTCZ		(CKC_BASE + ACLKTCZ_OFFS)</div><div class='del'>-</div><div class='del'>-#define ACLK_MAX_DIV	(0xfff + 1)</div><div class='del'>-</div><div class='del'>-/* Crystal frequencies */</div><div class='del'>-static unsigned long xi_rate, xti_rate;</div><div class='del'>-</div><div class='del'>-static void __iomem *pll_cfg_addr(int pll)</div><div class='del'>-{</div><div class='del'>-	switch (pll) {</div><div class='del'>-	case 0: return (CKC_BASE + PLL0CFG_OFFS);</div><div class='del'>-	case 1: return (CKC_BASE + PLL1CFG_OFFS);</div><div class='del'>-	case 2: return (CKC_BASE + PLL2CFG_OFFS);</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pll_enable(int pll, int enable)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-	void __iomem *addr = pll_cfg_addr(pll);</div><div class='del'>-</div><div class='del'>-	reg = __raw_readl(addr);</div><div class='del'>-	if (enable)</div><div class='del'>-		reg &amp;= ~PLLxCFG_PD;</div><div class='del'>-	else</div><div class='del'>-		reg |= PLLxCFG_PD;</div><div class='del'>-</div><div class='del'>-	__raw_writel(reg, addr);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xi_enable(int enable)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	reg = __raw_readl(CKC_BASE + CLKCTRL_OFFS);</div><div class='del'>-	if (enable)</div><div class='del'>-		reg |= CLKCTRL_XE;</div><div class='del'>-	else</div><div class='del'>-		reg &amp;= ~CLKCTRL_XE;</div><div class='del'>-</div><div class='del'>-	__raw_writel(reg, CKC_BASE + CLKCTRL_OFFS);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int root_clk_enable(enum root_clks src)</div><div class='del'>-{</div><div class='del'>-	switch (src) {</div><div class='del'>-	case CLK_SRC_PLL0: return pll_enable(0, 1);</div><div class='del'>-	case CLK_SRC_PLL1: return pll_enable(1, 1);</div><div class='del'>-	case CLK_SRC_PLL2: return pll_enable(2, 1);</div><div class='del'>-	case CLK_SRC_XI: return xi_enable(1);</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int root_clk_disable(enum root_clks src)</div><div class='del'>-{</div><div class='del'>-	switch (src) {</div><div class='del'>-	case CLK_SRC_PLL0: return pll_enable(0, 0);</div><div class='del'>-	case CLK_SRC_PLL1: return pll_enable(1, 0);</div><div class='del'>-	case CLK_SRC_PLL2: return pll_enable(2, 0);</div><div class='del'>-	case CLK_SRC_XI: return xi_enable(0);</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int enable_clk(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	if (clk-&gt;root_id != CLK_SRC_NOROOT)</div><div class='del'>-		return root_clk_enable(clk-&gt;root_id);</div><div class='del'>-</div><div class='del'>-	if (clk-&gt;aclkreg) {</div><div class='del'>-		reg = __raw_readl(clk-&gt;aclkreg);</div><div class='del'>-		reg |= ACLK_EN;</div><div class='del'>-		__raw_writel(reg, clk-&gt;aclkreg);</div><div class='del'>-	}</div><div class='del'>-	if (clk-&gt;bclkctr) {</div><div class='del'>-		reg = __raw_readl(clk-&gt;bclkctr);</div><div class='del'>-		reg |= 1 &lt;&lt; clk-&gt;bclk_shift;</div><div class='del'>-		__raw_writel(reg, clk-&gt;bclkctr);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void disable_clk(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	if (clk-&gt;root_id != CLK_SRC_NOROOT) {</div><div class='del'>-		root_clk_disable(clk-&gt;root_id);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (clk-&gt;bclkctr) {</div><div class='del'>-		reg = __raw_readl(clk-&gt;bclkctr);</div><div class='del'>-		reg &amp;= ~(1 &lt;&lt; clk-&gt;bclk_shift);</div><div class='del'>-		__raw_writel(reg, clk-&gt;bclkctr);</div><div class='del'>-	}</div><div class='del'>-	if (clk-&gt;aclkreg) {</div><div class='del'>-		reg = __raw_readl(clk-&gt;aclkreg);</div><div class='del'>-		reg &amp;= ~ACLK_EN;</div><div class='del'>-		__raw_writel(reg, clk-&gt;aclkreg);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long get_rate_pll(int pll)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-	unsigned long s, m, p;</div><div class='del'>-	void __iomem *addr = pll_cfg_addr(pll);</div><div class='del'>-</div><div class='del'>-	reg = __raw_readl(addr);</div><div class='del'>-	s = (reg &gt;&gt; 16) &amp; 0x07;</div><div class='del'>-	m = (reg &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	p = reg &amp; 0x3f;</div><div class='del'>-</div><div class='del'>-	return (m * xi_rate) / (p * (1 &lt;&lt; s));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long get_rate_pll_div(int pll)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-	unsigned long div = 0;</div><div class='del'>-	void __iomem *addr;</div><div class='del'>-</div><div class='del'>-	switch (pll) {</div><div class='del'>-	case 0:</div><div class='del'>-		addr = CKC_BASE + CLKDIVC0_OFFS;</div><div class='del'>-		reg = __raw_readl(addr);</div><div class='del'>-		if (reg &amp; CLKDIVC0_P0E)</div><div class='del'>-			div = (reg &gt;&gt; 24) &amp; 0x3f;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		addr = CKC_BASE + CLKDIVC0_OFFS;</div><div class='del'>-		reg = __raw_readl(addr);</div><div class='del'>-		if (reg &amp; CLKDIVC0_P1E)</div><div class='del'>-			div = (reg &gt;&gt; 16) &amp; 0x3f;</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		addr = CKC_BASE + CLKDIVC1_OFFS;</div><div class='del'>-		reg = __raw_readl(addr);</div><div class='del'>-		if (reg &amp; CLKDIVC1_P2E)</div><div class='del'>-			div = reg &amp; 0x3f;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return get_rate_pll(pll) / (div + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long get_rate_xi_div(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long div = 0;</div><div class='del'>-	u32 reg = __raw_readl(CKC_BASE + CLKDIVC0_OFFS);</div><div class='del'>-</div><div class='del'>-	if (reg &amp; CLKDIVC0_XE)</div><div class='del'>-		div = (reg &gt;&gt; 8) &amp; 0x3f;</div><div class='del'>-</div><div class='del'>-	return xi_rate / (div + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long get_rate_xti_div(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long div = 0;</div><div class='del'>-	u32 reg = __raw_readl(CKC_BASE + CLKDIVC0_OFFS);</div><div class='del'>-</div><div class='del'>-	if (reg &amp; CLKDIVC0_XTE)</div><div class='del'>-		div = reg &amp; 0x3f;</div><div class='del'>-</div><div class='del'>-	return xti_rate / (div + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long root_clk_get_rate(enum root_clks src)</div><div class='del'>-{</div><div class='del'>-	switch (src) {</div><div class='del'>-	case CLK_SRC_PLL0: return get_rate_pll(0);</div><div class='del'>-	case CLK_SRC_PLL1: return get_rate_pll(1);</div><div class='del'>-	case CLK_SRC_PLL2: return get_rate_pll(2);</div><div class='del'>-	case CLK_SRC_PLL0DIV: return get_rate_pll_div(0);</div><div class='del'>-	case CLK_SRC_PLL1DIV: return get_rate_pll_div(1);</div><div class='del'>-	case CLK_SRC_PLL2DIV: return get_rate_pll_div(2);</div><div class='del'>-	case CLK_SRC_XI: return xi_rate;</div><div class='del'>-	case CLK_SRC_XTI: return xti_rate;</div><div class='del'>-	case CLK_SRC_XIDIV: return get_rate_xi_div();</div><div class='del'>-	case CLK_SRC_XTIDIV: return get_rate_xti_div();</div><div class='del'>-	default: return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long aclk_get_rate(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-	unsigned long div;</div><div class='del'>-	unsigned int src;</div><div class='del'>-</div><div class='del'>-	reg = __raw_readl(clk-&gt;aclkreg);</div><div class='del'>-	div = reg &amp; 0x0fff;</div><div class='del'>-	src = (reg &gt;&gt; ACLK_SEL_SHIFT) &amp; CLK_SRC_MASK;</div><div class='del'>-	return root_clk_get_rate(src) / (div + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long aclk_best_div(struct clk *clk, unsigned long rate)</div><div class='del'>-{</div><div class='del'>-	unsigned long div, src, freq, r1, r2;</div><div class='del'>-</div><div class='del'>-	if (!rate)</div><div class='del'>-		return ACLK_MAX_DIV;</div><div class='del'>-</div><div class='del'>-	src = __raw_readl(clk-&gt;aclkreg) &gt;&gt; ACLK_SEL_SHIFT;</div><div class='del'>-	src &amp;= CLK_SRC_MASK;</div><div class='del'>-	freq = root_clk_get_rate(src);</div><div class='del'>-	div = freq / rate;</div><div class='del'>-	if (!div)</div><div class='del'>-		return 1;</div><div class='del'>-	if (div &gt;= ACLK_MAX_DIV)</div><div class='del'>-		return ACLK_MAX_DIV;</div><div class='del'>-	r1 = freq / div;</div><div class='del'>-	r2 = freq / (div + 1);</div><div class='del'>-	if ((rate - r2) &lt; (r1 - rate))</div><div class='del'>-		return div + 1;</div><div class='del'>-</div><div class='del'>-	return div;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long aclk_round_rate(struct clk *clk, unsigned long rate)</div><div class='del'>-{</div><div class='del'>-	unsigned int src;</div><div class='del'>-</div><div class='del'>-	src = __raw_readl(clk-&gt;aclkreg) &gt;&gt; ACLK_SEL_SHIFT;</div><div class='del'>-	src &amp;= CLK_SRC_MASK;</div><div class='del'>-</div><div class='del'>-	return root_clk_get_rate(src) / aclk_best_div(clk, rate);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int aclk_set_rate(struct clk *clk, unsigned long rate)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	reg = __raw_readl(clk-&gt;aclkreg) &amp; ~ACLK_DIV_MASK;</div><div class='del'>-	reg |= aclk_best_div(clk, rate) - 1;</div><div class='del'>-	__raw_writel(reg, clk-&gt;aclkreg);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long get_rate_sys(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	unsigned int src;</div><div class='del'>-</div><div class='del'>-	src = __raw_readl(CKC_BASE + CLKCTRL_OFFS) &amp; CLK_SRC_MASK;</div><div class='del'>-	return root_clk_get_rate(src);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long get_rate_bus(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	unsigned int reg, sdiv, bdiv, rate;</div><div class='del'>-</div><div class='del'>-	reg = __raw_readl(CKC_BASE + CLKCTRL_OFFS);</div><div class='del'>-	rate = get_rate_sys(clk);</div><div class='del'>-	sdiv = (reg &gt;&gt; 20) &amp; 3;</div><div class='del'>-	if (sdiv)</div><div class='del'>-		rate /= sdiv + 1;</div><div class='del'>-	bdiv = (reg &gt;&gt; 4) &amp; 0xff;</div><div class='del'>-	if (bdiv)</div><div class='del'>-		rate /= bdiv + 1;</div><div class='del'>-	return rate;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long get_rate_cpu(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	unsigned int reg, div, fsys, fbus;</div><div class='del'>-</div><div class='del'>-	fbus = get_rate_bus(clk);</div><div class='del'>-	reg = __raw_readl(CKC_BASE + CLKCTRL_OFFS);</div><div class='del'>-	if (reg &amp; (1 &lt;&lt; 29))</div><div class='del'>-		return fbus;</div><div class='del'>-	fsys = get_rate_sys(clk);</div><div class='del'>-	div = (reg &gt;&gt; 16) &amp; 0x0f;</div><div class='del'>-	return fbus + ((fsys - fbus) * (div + 1)) / 16;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long get_rate_root(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	return root_clk_get_rate(clk-&gt;root_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int aclk_set_parent(struct clk *clock, struct clk *parent)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	if (clock-&gt;parent == parent)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	clock-&gt;parent = parent;</div><div class='del'>-</div><div class='del'>-	if (!parent)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (parent-&gt;root_id == CLK_SRC_NOROOT)</div><div class='del'>-		return 0;</div><div class='del'>-	reg = __raw_readl(clock-&gt;aclkreg);</div><div class='del'>-	reg &amp;= ~ACLK_SEL_MASK;</div><div class='del'>-	reg |= (parent-&gt;root_id &lt;&lt; ACLK_SEL_SHIFT) &amp; ACLK_SEL_MASK;</div><div class='del'>-	__raw_writel(reg, clock-&gt;aclkreg);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define DEFINE_ROOT_CLOCK(name, ri, p)	\</div><div class='del'>-	static struct clk name = {		\</div><div class='del'>-		.root_id = ri,			\</div><div class='del'>-		.get_rate = get_rate_root,			\</div><div class='del'>-		.enable = enable_clk,		\</div><div class='del'>-		.disable = disable_clk,		\</div><div class='del'>-		.parent = p,			\</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-#define DEFINE_SPECIAL_CLOCK(name, gr, p)	\</div><div class='del'>-	static struct clk name = {		\</div><div class='del'>-		.root_id = CLK_SRC_NOROOT,	\</div><div class='del'>-		.get_rate = gr,			\</div><div class='del'>-		.parent = p,			\</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-#define DEFINE_ACLOCK(name, bc, bs, ar)		\</div><div class='del'>-	static struct clk name = {		\</div><div class='del'>-		.root_id = CLK_SRC_NOROOT,	\</div><div class='del'>-		.bclkctr = bc,			\</div><div class='del'>-		.bclk_shift = bs,		\</div><div class='del'>-		.aclkreg = ar,			\</div><div class='del'>-		.get_rate = aclk_get_rate,	\</div><div class='del'>-		.set_rate = aclk_set_rate,	\</div><div class='del'>-		.round_rate = aclk_round_rate,	\</div><div class='del'>-		.enable = enable_clk,		\</div><div class='del'>-		.disable = disable_clk,		\</div><div class='del'>-		.set_parent = aclk_set_parent,	\</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-#define DEFINE_BCLOCK(name, bc, bs, gr, p)	\</div><div class='del'>-	static struct clk name = {		\</div><div class='del'>-		.root_id = CLK_SRC_NOROOT,	\</div><div class='del'>-		.bclkctr = bc,			\</div><div class='del'>-		.bclk_shift = bs,		\</div><div class='del'>-		.get_rate = gr,			\</div><div class='del'>-		.enable = enable_clk,		\</div><div class='del'>-		.disable = disable_clk,		\</div><div class='del'>-		.parent = p,			\</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-DEFINE_ROOT_CLOCK(xi, CLK_SRC_XI, NULL)</div><div class='del'>-DEFINE_ROOT_CLOCK(xti, CLK_SRC_XTI, NULL)</div><div class='del'>-DEFINE_ROOT_CLOCK(xidiv, CLK_SRC_XIDIV, &amp;xi)</div><div class='del'>-DEFINE_ROOT_CLOCK(xtidiv, CLK_SRC_XTIDIV, &amp;xti)</div><div class='del'>-DEFINE_ROOT_CLOCK(pll0, CLK_SRC_PLL0, &amp;xi)</div><div class='del'>-DEFINE_ROOT_CLOCK(pll1, CLK_SRC_PLL1, &amp;xi)</div><div class='del'>-DEFINE_ROOT_CLOCK(pll2, CLK_SRC_PLL2, &amp;xi)</div><div class='del'>-DEFINE_ROOT_CLOCK(pll0div, CLK_SRC_PLL0DIV, &amp;pll0)</div><div class='del'>-DEFINE_ROOT_CLOCK(pll1div, CLK_SRC_PLL1DIV, &amp;pll1)</div><div class='del'>-DEFINE_ROOT_CLOCK(pll2div, CLK_SRC_PLL2DIV, &amp;pll2)</div><div class='del'>-</div><div class='del'>-/* The following 3 clocks are special and are initialized explicitly later */</div><div class='del'>-DEFINE_SPECIAL_CLOCK(sys, get_rate_sys, NULL)</div><div class='del'>-DEFINE_SPECIAL_CLOCK(bus, get_rate_bus, &amp;sys)</div><div class='del'>-DEFINE_SPECIAL_CLOCK(cpu, get_rate_cpu, &amp;sys)</div><div class='del'>-</div><div class='del'>-DEFINE_ACLOCK(tct, NULL, 0, ACLKTCT)</div><div class='del'>-DEFINE_ACLOCK(tcx, NULL, 0, ACLKTCX)</div><div class='del'>-DEFINE_ACLOCK(tcz, NULL, 0, ACLKTCZ)</div><div class='del'>-DEFINE_ACLOCK(ref, NULL, 0, ACLKREF)</div><div class='del'>-DEFINE_ACLOCK(uart0, BCLKCTR0, 5, ACLKUART0)</div><div class='del'>-DEFINE_ACLOCK(uart1, BCLKCTR0, 23, ACLKUART1)</div><div class='del'>-DEFINE_ACLOCK(uart2, BCLKCTR0, 6, ACLKUART2)</div><div class='del'>-DEFINE_ACLOCK(uart3, BCLKCTR0, 8, ACLKUART3)</div><div class='del'>-DEFINE_ACLOCK(uart4, BCLKCTR1, 6, ACLKUART4)</div><div class='del'>-DEFINE_ACLOCK(i2c, BCLKCTR0, 7, ACLKI2C)</div><div class='del'>-DEFINE_ACLOCK(adc, BCLKCTR0, 10, ACLKADC)</div><div class='del'>-DEFINE_ACLOCK(usbh0, BCLKCTR0, 11, ACLKUSBH)</div><div class='del'>-DEFINE_ACLOCK(lcd, BCLKCTR0, 13, ACLKLCD)</div><div class='del'>-DEFINE_ACLOCK(sd0, BCLKCTR0, 17, ACLKSDH0)</div><div class='del'>-DEFINE_ACLOCK(sd1, BCLKCTR1, 5, ACLKSDH1)</div><div class='del'>-DEFINE_ACLOCK(spi0, BCLKCTR0, 24, ACLKSPI0)</div><div class='del'>-DEFINE_ACLOCK(spi1, BCLKCTR0, 30, ACLKSPI1)</div><div class='del'>-DEFINE_ACLOCK(spdif, BCLKCTR1, 2, ACLKSPDIF)</div><div class='del'>-DEFINE_ACLOCK(c3dec, BCLKCTR1, 9, ACLKC3DEC)</div><div class='del'>-DEFINE_ACLOCK(can0, BCLKCTR1, 10, ACLKCAN0)</div><div class='del'>-DEFINE_ACLOCK(can1, BCLKCTR1, 11, ACLKCAN1)</div><div class='del'>-DEFINE_ACLOCK(gsb0, BCLKCTR1, 13, ACLKGSB0)</div><div class='del'>-DEFINE_ACLOCK(gsb1, BCLKCTR1, 14, ACLKGSB1)</div><div class='del'>-DEFINE_ACLOCK(gsb2, BCLKCTR1, 15, ACLKGSB2)</div><div class='del'>-DEFINE_ACLOCK(gsb3, BCLKCTR1, 16, ACLKGSB3)</div><div class='del'>-DEFINE_ACLOCK(usbh1, BCLKCTR1, 20, ACLKUSBH)</div><div class='del'>-</div><div class='del'>-DEFINE_BCLOCK(dai0, BCLKCTR0, 0, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(pic, BCLKCTR0, 1, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(tc, BCLKCTR0, 2, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(gpio, BCLKCTR0, 3, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(usbd, BCLKCTR0, 4, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(ecc, BCLKCTR0, 9, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(gdma0, BCLKCTR0, 12, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(rtc, BCLKCTR0, 15, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(nfc, BCLKCTR0, 16, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(g2d, BCLKCTR0, 18, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(gdma1, BCLKCTR0, 22, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(mscl, BCLKCTR0, 25, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(bdma, BCLKCTR1, 0, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(adma0, BCLKCTR1, 1, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(scfg, BCLKCTR1, 3, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(cid, BCLKCTR1, 4, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(dai1, BCLKCTR1, 7, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(adma1, BCLKCTR1, 8, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(gps, BCLKCTR1, 12, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(gdma2, BCLKCTR1, 17, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(gdma3, BCLKCTR1, 18, NULL, NULL)</div><div class='del'>-DEFINE_BCLOCK(ddrc, BCLKCTR1, 19, NULL, NULL)</div><div class='del'>-</div><div class='del'>-#define _REGISTER_CLOCK(d, n, c) \</div><div class='del'>-	{ \</div><div class='del'>-		.dev_id = d, \</div><div class='del'>-		.con_id = n, \</div><div class='del'>-		.clk = &amp;c, \</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-static struct clk_lookup lookups[] = {</div><div class='del'>-	_REGISTER_CLOCK(NULL, "bus", bus)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "cpu", cpu)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "tct", tct)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "tcx", tcx)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "tcz", tcz)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "ref", ref)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "dai0", dai0)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "pic", pic)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "tc", tc)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "gpio", gpio)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "usbd", usbd)</div><div class='del'>-	_REGISTER_CLOCK("tcc-uart.0", NULL, uart0)</div><div class='del'>-	_REGISTER_CLOCK("tcc-uart.2", NULL, uart2)</div><div class='del'>-	_REGISTER_CLOCK("tcc-i2c", NULL, i2c)</div><div class='del'>-	_REGISTER_CLOCK("tcc-uart.3", NULL, uart3)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "ecc", ecc)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "adc", adc)</div><div class='del'>-	_REGISTER_CLOCK("tcc-usbh.0", "usb", usbh0)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "gdma0", gdma0)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "lcd", lcd)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "rtc", rtc)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "nfc", nfc)</div><div class='del'>-	_REGISTER_CLOCK("tcc-mmc.0", NULL, sd0)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "g2d", g2d)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "gdma1", gdma1)</div><div class='del'>-	_REGISTER_CLOCK("tcc-uart.1", NULL, uart1)</div><div class='del'>-	_REGISTER_CLOCK("tcc-spi.0", NULL, spi0)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "mscl", mscl)</div><div class='del'>-	_REGISTER_CLOCK("tcc-spi.1", NULL, spi1)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "bdma", bdma)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "adma0", adma0)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "spdif", spdif)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "scfg", scfg)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "cid", cid)</div><div class='del'>-	_REGISTER_CLOCK("tcc-mmc.1", NULL, sd1)</div><div class='del'>-	_REGISTER_CLOCK("tcc-uart.4", NULL, uart4)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "dai1", dai1)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "adma1", adma1)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "c3dec", c3dec)</div><div class='del'>-	_REGISTER_CLOCK("tcc-can.0", NULL, can0)</div><div class='del'>-	_REGISTER_CLOCK("tcc-can.1", NULL, can1)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "gps", gps)</div><div class='del'>-	_REGISTER_CLOCK("tcc-gsb.0", NULL, gsb0)</div><div class='del'>-	_REGISTER_CLOCK("tcc-gsb.1", NULL, gsb1)</div><div class='del'>-	_REGISTER_CLOCK("tcc-gsb.2", NULL, gsb2)</div><div class='del'>-	_REGISTER_CLOCK("tcc-gsb.3", NULL, gsb3)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "gdma2", gdma2)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "gdma3", gdma3)</div><div class='del'>-	_REGISTER_CLOCK(NULL, "ddrc", ddrc)</div><div class='del'>-	_REGISTER_CLOCK("tcc-usbh.1", "usb", usbh1)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct clk *root_clk_by_index(enum root_clks src)</div><div class='del'>-{</div><div class='del'>-	switch (src) {</div><div class='del'>-	case CLK_SRC_PLL0: return &amp;pll0;</div><div class='del'>-	case CLK_SRC_PLL1: return &amp;pll1;</div><div class='del'>-	case CLK_SRC_PLL2: return &amp;pll2;</div><div class='del'>-	case CLK_SRC_PLL0DIV: return &amp;pll0div;</div><div class='del'>-	case CLK_SRC_PLL1DIV: return &amp;pll1div;</div><div class='del'>-	case CLK_SRC_PLL2DIV: return &amp;pll2div;</div><div class='del'>-	case CLK_SRC_XI: return &amp;xi;</div><div class='del'>-	case CLK_SRC_XTI: return &amp;xti;</div><div class='del'>-	case CLK_SRC_XIDIV: return &amp;xidiv;</div><div class='del'>-	case CLK_SRC_XTIDIV: return &amp;xtidiv;</div><div class='del'>-	default: return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void find_aclk_parent(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	unsigned int src;</div><div class='del'>-	struct clk *clock;</div><div class='del'>-</div><div class='del'>-	if (!clk-&gt;aclkreg)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	src = __raw_readl(clk-&gt;aclkreg) &gt;&gt; ACLK_SEL_SHIFT;</div><div class='del'>-	src &amp;= CLK_SRC_MASK;</div><div class='del'>-</div><div class='del'>-	clock = root_clk_by_index(src);</div><div class='del'>-	if (!clock)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	clk-&gt;parent = clock;</div><div class='del'>-	clk-&gt;set_parent = aclk_set_parent;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init tcc_clocks_init(unsigned long xi_freq, unsigned long xti_freq)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	xi_rate = xi_freq;</div><div class='del'>-	xti_rate = xti_freq;</div><div class='del'>-</div><div class='del'>-	/* fixup parents and add the clock */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(lookups); i++) {</div><div class='del'>-		find_aclk_parent(lookups[i].clk);</div><div class='del'>-		clkdev_add(&amp;lookups[i]);</div><div class='del'>-	}</div><div class='del'>-	tcc8k_timer_init(&amp;tcz, (void __iomem *)TIMER_BASE, INT_TC32);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-tcc8k/common.h b/arch/arm/mach-tcc8k/common.h<br/>deleted file mode 100644<br/>index 705690add395..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tcc8k/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/common.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-#ifndef MACH_TCC8K_COMMON_H</div><div class='del'>-#define MACH_TCC8K_COMMON_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='del'>-extern struct platform_device tcc_nand_device;</div><div class='del'>-</div><div class='del'>-struct clk;</div><div class='del'>-</div><div class='del'>-extern void tcc_clocks_init(unsigned long xi_freq, unsigned long xti_freq);</div><div class='del'>-extern void tcc8k_timer_init(struct clk *clock, void __iomem *base, int irq);</div><div class='del'>-extern void tcc8k_init_irq(void);</div><div class='del'>-extern void tcc8k_map_common_io(void);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-tcc8k/devices.c b/arch/arm/mach-tcc8k/devices.c<br/>deleted file mode 100644<br/>index 6722ad7c2836..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tcc8k/devices.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/devices.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,239 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/arch/arm/mach-tcc8k/devices.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) Telechips, Inc.</div><div class='del'>- * Copyright (C) 2009 Hans J. Koch &lt;hjk@linutronix.de&gt;</div><div class='del'>- *</div><div class='del'>- * Licensed under the terms of GPL v2.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</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/io.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'>-</div><div class='del'>-#include &lt;asm/mach/map.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/tcc8k-regs.h&gt;</div><div class='del'>-#include &lt;mach/irqs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "common.h"</div><div class='del'>-</div><div class='del'>-static u64 tcc8k_dmamask = DMA_BIT_MASK(32);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MTD_NAND_TCC</div><div class='del'>-/* NAND controller */</div><div class='del'>-static struct resource tcc_nand_resources[] = {</div><div class='del'>-	{</div><div class='del'>-		.start	= (resource_size_t)NFC_BASE,</div><div class='del'>-		.end	= (resource_size_t)NFC_BASE + 0x7f,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	}, {</div><div class='del'>-		.start	= INT_NFC,</div><div class='del'>-		.end	= INT_NFC,</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct platform_device tcc_nand_device = {</div><div class='del'>-	.name = "tcc_nand",</div><div class='del'>-	.id = 0,</div><div class='del'>-	.num_resources = ARRAY_SIZE(tcc_nand_resources),</div><div class='del'>-	.resource = tcc_nand_resources,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MMC_TCC8K</div><div class='del'>-/* MMC controller */</div><div class='del'>-static struct resource tcc8k_mmc0_resource[] = {</div><div class='del'>-	{</div><div class='del'>-		.start = INT_SD0,</div><div class='del'>-		.end   = INT_SD0,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource tcc8k_mmc1_resource[] = {</div><div class='del'>-	{</div><div class='del'>-		.start = INT_SD1,</div><div class='del'>-		.end   = INT_SD1,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct platform_device tcc8k_mmc0_device = {</div><div class='del'>-	.name		= "tcc-mmc",</div><div class='del'>-	.id		= 0,</div><div class='del'>-	.num_resources	= ARRAY_SIZE(tcc8k_mmc0_resource),</div><div class='del'>-	.resource	= tcc8k_mmc0_resource,</div><div class='del'>-	.dev		= {</div><div class='del'>-		.dma_mask		= &amp;tcc8k_dmamask,</div><div class='del'>-		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct platform_device tcc8k_mmc1_device = {</div><div class='del'>-	.name		= "tcc-mmc",</div><div class='del'>-	.id		= 1,</div><div class='del'>-	.num_resources	= ARRAY_SIZE(tcc8k_mmc1_resource),</div><div class='del'>-	.resource	= tcc8k_mmc1_resource,</div><div class='del'>-	.dev		= {</div><div class='del'>-		.dma_mask		= &amp;tcc8k_dmamask,</div><div class='del'>-		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void tcc8k_init_mmc(void)</div><div class='del'>-{</div><div class='del'>-	u32 reg = __raw_readl(GPIOPS_BASE + GPIOPS_FS1_OFFS);</div><div class='del'>-</div><div class='del'>-	reg |= GPIOPS_FS1_SDH0_BITS | GPIOPS_FS1_SDH1_BITS;</div><div class='del'>-	__raw_writel(reg, GPIOPS_BASE + GPIOPS_FS1_OFFS);</div><div class='del'>-</div><div class='del'>-	platform_device_register(&amp;tcc8k_mmc0_device);</div><div class='del'>-	platform_device_register(&amp;tcc8k_mmc1_device);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void tcc8k_init_mmc(void) { }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_USB_OHCI_HCD</div><div class='del'>-static int tcc8k_ohci_init(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	/* Use GPIO PK19 as VBUS control output */</div><div class='del'>-	reg = __raw_readl(GPIOPK_BASE + GPIOPK_FS0_OFFS);</div><div class='del'>-	reg &amp;= ~(1 &lt;&lt; 19);</div><div class='del'>-	__raw_writel(reg, GPIOPK_BASE + GPIOPK_FS0_OFFS);</div><div class='del'>-	reg = __raw_readl(GPIOPK_BASE + GPIOPK_FS1_OFFS);</div><div class='del'>-	reg &amp;= ~(1 &lt;&lt; 19);</div><div class='del'>-	__raw_writel(reg, GPIOPK_BASE + GPIOPK_FS1_OFFS);</div><div class='del'>-</div><div class='del'>-	reg = __raw_readl(GPIOPK_BASE + GPIOPK_DOE_OFFS);</div><div class='del'>-	reg |= (1 &lt;&lt; 19);</div><div class='del'>-	__raw_writel(reg, GPIOPK_BASE + GPIOPK_DOE_OFFS);</div><div class='del'>-	/* Turn on VBUS */</div><div class='del'>-	reg = __raw_readl(GPIOPK_BASE + GPIOPK_DAT_OFFS);</div><div class='del'>-	reg |= (1 &lt;&lt; 19);</div><div class='del'>-	__raw_writel(reg, GPIOPK_BASE + GPIOPK_DAT_OFFS);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct resource tcc8k_ohci0_resources[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start = (resource_size_t)USBH0_BASE,</div><div class='del'>-		.end   = (resource_size_t)USBH0_BASE + 0x5c,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start = INT_USBH0,</div><div class='del'>-		.end   = INT_USBH0,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource tcc8k_ohci1_resources[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start = (resource_size_t)USBH1_BASE,</div><div class='del'>-		.end   = (resource_size_t)USBH1_BASE + 0x5c,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start = INT_USBH1,</div><div class='del'>-		.end   = INT_USBH1,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct tccohci_platform_data tcc8k_ohci0_platform_data = {</div><div class='del'>-	.controller	= 0,</div><div class='del'>-	.port_mode	= PMM_PERPORT_MODE,</div><div class='del'>-	.init		= tcc8k_ohci_init,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct tccohci_platform_data tcc8k_ohci1_platform_data = {</div><div class='del'>-	.controller	= 1,</div><div class='del'>-	.port_mode	= PMM_PERPORT_MODE,</div><div class='del'>-	.init		= tcc8k_ohci_init,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device ohci0_device = {</div><div class='del'>-	.name = "tcc-ohci",</div><div class='del'>-	.id = 0,</div><div class='del'>-	.dev = {</div><div class='del'>-		.dma_mask = &amp;tcc8k_dmamask,</div><div class='del'>-		.coherent_dma_mask = DMA_BIT_MASK(32),</div><div class='del'>-		.platform_data = &amp;tcc8k_ohci0_platform_data,</div><div class='del'>-	},</div><div class='del'>-	.num_resources  = ARRAY_SIZE(tcc8k_ohci0_resources),</div><div class='del'>-	.resource       = tcc8k_ohci0_resources,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device ohci1_device = {</div><div class='del'>-	.name = "tcc-ohci",</div><div class='del'>-	.id = 1,</div><div class='del'>-	.dev = {</div><div class='del'>-		.dma_mask = &amp;tcc8k_dmamask,</div><div class='del'>-		.coherent_dma_mask = DMA_BIT_MASK(32),</div><div class='del'>-		.platform_data = &amp;tcc8k_ohci1_platform_data,</div><div class='del'>-	},</div><div class='del'>-	.num_resources  = ARRAY_SIZE(tcc8k_ohci1_resources),</div><div class='del'>-	.resource       = tcc8k_ohci1_resources,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __init tcc8k_init_usbhost(void)</div><div class='del'>-{</div><div class='del'>-	platform_device_register(&amp;ohci0_device);</div><div class='del'>-	platform_device_register(&amp;ohci1_device);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static void __init tcc8k_init_usbhost(void) { }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* USB device controller*/</div><div class='del'>-#ifdef CONFIG_USB_GADGET_TCC8K</div><div class='del'>-static struct resource udc_resources[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start = INT_USBD,</div><div class='del'>-		.end   = INT_USBD,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start = INT_UDMA,</div><div class='del'>-		.end   = INT_UDMA,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device tcc8k_udc_device = {</div><div class='del'>-	.name = "tcc-udc",</div><div class='del'>-	.id = 0,</div><div class='del'>-	.resource = udc_resources,</div><div class='del'>-	.num_resources = ARRAY_SIZE(udc_resources),</div><div class='del'>-	.dev = {</div><div class='del'>-		 .dma_mask = &amp;tcc8k_dmamask,</div><div class='del'>-		 .coherent_dma_mask = DMA_BIT_MASK(32),</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __init tcc8k_init_usb_gadget(void)</div><div class='del'>-{</div><div class='del'>-	platform_device_register(&amp;tcc8k_udc_device);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static void __init tcc8k_init_usb_gadget(void) { }</div><div class='del'>-#endif	/* CONFIG_USB_GADGET_TCC83X */</div><div class='del'>-</div><div class='del'>-static int __init tcc8k_init_devices(void)</div><div class='del'>-{</div><div class='del'>-	tcc8k_init_mmc();</div><div class='del'>-	tcc8k_init_usbhost();</div><div class='del'>-	tcc8k_init_usb_gadget();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-arch_initcall(tcc8k_init_devices);</div><div class='head'>diff --git a/arch/arm/mach-tcc8k/io.c b/arch/arm/mach-tcc8k/io.c<br/>deleted file mode 100644<br/>index 9b39d7fa658f..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tcc8k/io.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/io.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/arch/arm/mach-tcc8k/io.c</div><div class='del'>- *</div><div class='del'>- * (C) 2009 Hans J. Koch &lt;hjk@linutronix.de&gt;</div><div class='del'>- *</div><div class='del'>- * derived from TCC83xx io.c</div><div class='del'>- * Copyright (C) Telechips, 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='del'>-</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'>-</div><div class='del'>-#include &lt;asm/mach/map.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/tcc8k-regs.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The machine specific code may provide the extra mapping besides the</div><div class='del'>- * default mapping provided here.</div><div class='del'>- */</div><div class='del'>-static struct map_desc tcc8k_io_desc[] __initdata = {</div><div class='del'>-	{</div><div class='del'>-		.virtual	= (unsigned long)CS1_BASE_VIRT,</div><div class='del'>-		.pfn		= __phys_to_pfn(CS1_BASE),</div><div class='del'>-		.length		= CS1_SIZE,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)AHB_PERI_BASE_VIRT,</div><div class='del'>-		.pfn		= __phys_to_pfn(AHB_PERI_BASE),</div><div class='del'>-		.length		= AHB_PERI_SIZE,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)APB0_PERI_BASE_VIRT,</div><div class='del'>-		.pfn		= __phys_to_pfn(APB0_PERI_BASE),</div><div class='del'>-		.length		= APB0_PERI_SIZE,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)APB1_PERI_BASE_VIRT,</div><div class='del'>-		.pfn		= __phys_to_pfn(APB1_PERI_BASE),</div><div class='del'>-		.length		= APB1_PERI_SIZE,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)EXT_MEM_CTRL_BASE_VIRT,</div><div class='del'>-		.pfn		= __phys_to_pfn(EXT_MEM_CTRL_BASE),</div><div class='del'>-		.length		= EXT_MEM_CTRL_SIZE,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Maps common IO regions for tcc8k.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-void __init tcc8k_map_common_io(void)</div><div class='del'>-{</div><div class='del'>-	iotable_init(tcc8k_io_desc, ARRAY_SIZE(tcc8k_io_desc));</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-tcc8k/irq.c b/arch/arm/mach-tcc8k/irq.c<br/>deleted file mode 100644<br/>index 209fa5c65d4c..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tcc8k/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/irq.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,111 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) Telechips, Inc.</div><div class='del'>- * Copyright (C) 2009-2010 Hans J. Koch &lt;hjk@linutronix.de&gt;</div><div class='del'>- *</div><div class='del'>- * Licensed under the terms of the GNU GPL version 2.</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/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/mach/irq.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/tcc8k-regs.h&gt;</div><div class='del'>-#include &lt;mach/irqs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "common.h"</div><div class='del'>-</div><div class='del'>-/* Disable IRQ */</div><div class='del'>-static void tcc8000_mask_ack_irq0(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	PIC0_IEN &amp;= ~(1 &lt;&lt; d-&gt;irq);</div><div class='del'>-	PIC0_CREQ |=  (1 &lt;&lt; d-&gt;irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tcc8000_mask_ack_irq1(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	PIC1_IEN &amp;= ~(1 &lt;&lt; (d-&gt;irq - 32));</div><div class='del'>-	PIC1_CREQ |= (1 &lt;&lt; (d-&gt;irq - 32));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tcc8000_mask_irq0(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	PIC0_IEN &amp;= ~(1 &lt;&lt; d-&gt;irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tcc8000_mask_irq1(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	PIC1_IEN &amp;= ~(1 &lt;&lt; (d-&gt;irq - 32));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tcc8000_ack_irq0(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	PIC0_CREQ |=  (1 &lt;&lt; d-&gt;irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tcc8000_ack_irq1(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	PIC1_CREQ |= (1 &lt;&lt; (d-&gt;irq - 32));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Enable IRQ */</div><div class='del'>-static void tcc8000_unmask_irq0(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	PIC0_IEN |= (1 &lt;&lt; d-&gt;irq);</div><div class='del'>-	PIC0_INTOEN |= (1 &lt;&lt; d-&gt;irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tcc8000_unmask_irq1(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	PIC1_IEN |= (1 &lt;&lt; (d-&gt;irq - 32));</div><div class='del'>-	PIC1_INTOEN |= (1 &lt;&lt; (d-&gt;irq - 32));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct irq_chip tcc8000_irq_chip0 = {</div><div class='del'>-	.name		= "tcc_irq0",</div><div class='del'>-	.irq_mask	= tcc8000_mask_irq0,</div><div class='del'>-	.irq_ack	= tcc8000_ack_irq0,</div><div class='del'>-	.irq_mask_ack	= tcc8000_mask_ack_irq0,</div><div class='del'>-	.irq_unmask	= tcc8000_unmask_irq0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct irq_chip tcc8000_irq_chip1 = {</div><div class='del'>-	.name		= "tcc_irq1",</div><div class='del'>-	.irq_mask	= tcc8000_mask_irq1,</div><div class='del'>-	.irq_ack	= tcc8000_ack_irq1,</div><div class='del'>-	.irq_mask_ack	= tcc8000_mask_ack_irq1,</div><div class='del'>-	.irq_unmask	= tcc8000_unmask_irq1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __init tcc8k_init_irq(void)</div><div class='del'>-{</div><div class='del'>-	int irqno;</div><div class='del'>-</div><div class='del'>-	/* Mask and clear all interrupts */</div><div class='del'>-	PIC0_IEN = 0x00000000;</div><div class='del'>-	PIC0_CREQ = 0xffffffff;</div><div class='del'>-	PIC1_IEN = 0x00000000;</div><div class='del'>-	PIC1_CREQ = 0xffffffff;</div><div class='del'>-</div><div class='del'>-	PIC0_MEN0 = 0x00000003;</div><div class='del'>-	PIC1_MEN1 = 0x00000003;</div><div class='del'>-	PIC1_MEN = 0x00000003;</div><div class='del'>-</div><div class='del'>-	/* let all IRQs be level triggered */</div><div class='del'>-	PIC0_TMODE = 0xffffffff;</div><div class='del'>-	PIC1_TMODE = 0xffffffff;</div><div class='del'>-	/* all IRQs are IRQs (not FIQs) */</div><div class='del'>-	PIC0_IRQSEL = 0xffffffff;</div><div class='del'>-	PIC1_IRQSEL = 0xffffffff;</div><div class='del'>-</div><div class='del'>-	for (irqno = 0; irqno &lt; NR_IRQS; irqno++) {</div><div class='del'>-		if (irqno &lt; 32)</div><div class='del'>-			irq_set_chip(irqno, &amp;tcc8000_irq_chip0);</div><div class='del'>-		else</div><div class='del'>-			irq_set_chip(irqno, &amp;tcc8000_irq_chip1);</div><div class='del'>-		irq_set_handler(irqno, handle_level_irq);</div><div class='del'>-		set_irq_flags(irqno, IRQF_VALID);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-tcc8k/time.c b/arch/arm/mach-tcc8k/time.c<br/>deleted file mode 100644<br/>index a96babe83771..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tcc8k/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tcc8k/time.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,134 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * TCC8000 system timer setup</div><div class='del'>- *</div><div class='del'>- * (C) 2009 Hans J. Koch &lt;hjk@linutronix.de&gt;</div><div class='del'>- *</div><div class='del'>- * Licensed under the terms of the GPL version 2.</div><div class='del'>- *</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/clockchips.h&gt;</div><div class='del'>-#include &lt;linux/init.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/spinlock.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach/time.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/tcc8k-regs.h&gt;</div><div class='del'>-#include &lt;mach/irqs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "common.h"</div><div class='del'>-</div><div class='del'>-static void __iomem *timer_base;</div><div class='del'>-</div><div class='del'>-static int tcc_set_next_event(unsigned long evt,</div><div class='del'>-			      struct clock_event_device *unused)</div><div class='del'>-{</div><div class='del'>-	unsigned long reg = __raw_readl(timer_base + TC32MCNT_OFFS);</div><div class='del'>-</div><div class='del'>-	__raw_writel(reg + evt, timer_base + TC32CMP0_OFFS);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tcc_set_mode(enum clock_event_mode mode,</div><div class='del'>-				struct clock_event_device *evt)</div><div class='del'>-{</div><div class='del'>-	unsigned long tc32irq;</div><div class='del'>-</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case CLOCK_EVT_MODE_ONESHOT:</div><div class='del'>-		tc32irq = __raw_readl(timer_base + TC32IRQ_OFFS);</div><div class='del'>-		tc32irq |= TC32IRQ_IRQEN0;</div><div class='del'>-		__raw_writel(tc32irq, timer_base + TC32IRQ_OFFS);</div><div class='del'>-		break;</div><div class='del'>-	case CLOCK_EVT_MODE_SHUTDOWN:</div><div class='del'>-	case CLOCK_EVT_MODE_UNUSED:</div><div class='del'>-		tc32irq = __raw_readl(timer_base + TC32IRQ_OFFS);</div><div class='del'>-		tc32irq &amp;= ~TC32IRQ_IRQEN0;</div><div class='del'>-		__raw_writel(tc32irq, timer_base + TC32IRQ_OFFS);</div><div class='del'>-		break;</div><div class='del'>-	case CLOCK_EVT_MODE_PERIODIC:</div><div class='del'>-	case CLOCK_EVT_MODE_RESUME:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t tcc8k_timer_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct clock_event_device *evt = dev_id;</div><div class='del'>-</div><div class='del'>-	/* Acknowledge TC32 interrupt by reading TC32IRQ */</div><div class='del'>-	__raw_readl(timer_base + TC32IRQ_OFFS);</div><div class='del'>-</div><div class='del'>-	evt-&gt;event_handler(evt);</div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct clock_event_device clockevent_tcc = {</div><div class='del'>-	.name		= "tcc_timer1",</div><div class='del'>-	.features	= CLOCK_EVT_FEAT_ONESHOT,</div><div class='del'>-	.shift		= 32,</div><div class='del'>-	.set_mode	= tcc_set_mode,</div><div class='del'>-	.set_next_event	= tcc_set_next_event,</div><div class='del'>-	.rating		= 200,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct irqaction tcc8k_timer_irq = {</div><div class='del'>-	.name		= "TC32_timer",</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='del'>-	.handler	= tcc8k_timer_interrupt,</div><div class='del'>-	.dev_id		= &amp;clockevent_tcc,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init tcc_clockevent_init(struct clk *clock)</div><div class='del'>-{</div><div class='del'>-	unsigned int c = clk_get_rate(clock);</div><div class='del'>-</div><div class='del'>-	clocksource_mmio_init(timer_base + TC32MCNT_OFFS, "tcc_tc32", c,</div><div class='del'>-		200, 32, clocksource_mmio_readl_up);</div><div class='del'>-</div><div class='del'>-	clockevent_tcc.mult = div_sc(c, NSEC_PER_SEC,</div><div class='del'>-					clockevent_tcc.shift);</div><div class='del'>-	clockevent_tcc.max_delta_ns =</div><div class='del'>-			clockevent_delta2ns(0xfffffffe, &amp;clockevent_tcc);</div><div class='del'>-	clockevent_tcc.min_delta_ns =</div><div class='del'>-			clockevent_delta2ns(0xff, &amp;clockevent_tcc);</div><div class='del'>-</div><div class='del'>-	clockevent_tcc.cpumask = cpumask_of(0);</div><div class='del'>-</div><div class='del'>-	clockevents_register_device(&amp;clockevent_tcc);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init tcc8k_timer_init(struct clk *clock, void __iomem *base, int irq)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	timer_base = base;</div><div class='del'>-	tcc8k_timer_irq.irq = irq;</div><div class='del'>-</div><div class='del'>-	/* Enable clocks */</div><div class='del'>-	clk_enable(clock);</div><div class='del'>-</div><div class='del'>-	/* Initialize 32-bit timer */</div><div class='del'>-	reg = __raw_readl(timer_base + TC32EN_OFFS);</div><div class='del'>-	reg &amp;= ~TC32EN_ENABLE; /* Disable timer */</div><div class='del'>-	__raw_writel(reg, timer_base + TC32EN_OFFS);</div><div class='del'>-	/* Free running timer, counting from 0 to 0xffffffff */</div><div class='del'>-	__raw_writel(0, timer_base + TC32EN_OFFS);</div><div class='del'>-	__raw_writel(0, timer_base + TC32LDV_OFFS);</div><div class='del'>-	reg = __raw_readl(timer_base + TC32IRQ_OFFS);</div><div class='del'>-	reg |= TC32IRQ_IRQEN0; /* irq at match with CMP0 */</div><div class='del'>-	__raw_writel(reg, timer_base + TC32IRQ_OFFS);</div><div class='del'>-</div><div class='del'>-	__raw_writel(TC32EN_ENABLE, timer_base + TC32EN_OFFS);</div><div class='del'>-</div><div class='del'>-	tcc_clockevent_init(clock);</div><div class='del'>-	setup_irq(irq, &amp;tcc8k_timer_irq);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig<br/>index 91aff7cb8284..373652d76b90 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/Kconfig</a></div><div class='hunk'>@@ -2,11 +2,8 @@ if ARCH_TEGRA</div><div class='ctx'> </div><div class='ctx'> comment "NVIDIA Tegra options"</div><div class='ctx'> </div><div class='del'>-choice</div><div class='del'>-	prompt "Select Tegra processor family for target system"</div><div class='del'>-</div><div class='ctx'> config ARCH_TEGRA_2x_SOC</div><div class='del'>-	bool "Tegra 2 family"</div><div class='add'>+	bool "Enable support for Tegra20 family"</div><div class='ctx'> 	select CPU_V7</div><div class='ctx'> 	select ARM_GIC</div><div class='ctx'> 	select ARCH_REQUIRE_GPIOLIB</div><div class='hunk'>@@ -17,22 +14,36 @@ config ARCH_TEGRA_2x_SOC</div><div class='ctx'> 	  Support for NVIDIA Tegra AP20 and T20 processors, based on the</div><div class='ctx'> 	  ARM CortexA9MP CPU and the ARM PL310 L2 cache controller</div><div class='ctx'> </div><div class='del'>-endchoice</div><div class='add'>+config ARCH_TEGRA_3x_SOC</div><div class='add'>+	bool "Enable support for Tegra30 family"</div><div class='add'>+	select CPU_V7</div><div class='add'>+	select ARM_GIC</div><div class='add'>+	select ARCH_REQUIRE_GPIOLIB</div><div class='add'>+	select USB_ARCH_HAS_EHCI if USB_SUPPORT</div><div class='add'>+	select USB_ULPI if USB_SUPPORT</div><div class='add'>+	select USB_ULPI_VIEWPORT if USB_SUPPORT</div><div class='add'>+	select USE_OF</div><div class='add'>+	help</div><div class='add'>+	  Support for NVIDIA Tegra T30 processor family, based on the</div><div class='add'>+	  ARM CortexA9MP CPU and the ARM PL310 L2 cache controller</div><div class='ctx'> </div><div class='ctx'> config TEGRA_PCI</div><div class='ctx'> 	bool "PCI Express support"</div><div class='add'>+	depends on ARCH_TEGRA_2x_SOC</div><div class='ctx'> 	select PCI</div><div class='ctx'> </div><div class='ctx'> comment "Tegra board type"</div><div class='ctx'> </div><div class='ctx'> config MACH_HARMONY</div><div class='ctx'>        bool "Harmony board"</div><div class='add'>+       depends on ARCH_TEGRA_2x_SOC</div><div class='ctx'>        select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC</div><div class='ctx'>        help</div><div class='ctx'>          Support for nVidia Harmony development platform</div><div class='ctx'> </div><div class='ctx'> config MACH_KAEN</div><div class='ctx'>        bool "Kaen board"</div><div class='add'>+       depends on ARCH_TEGRA_2x_SOC</div><div class='ctx'>        select MACH_SEABOARD</div><div class='ctx'>        select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC</div><div class='ctx'>        help</div><div class='hunk'>@@ -40,11 +51,13 @@ config MACH_KAEN</div><div class='ctx'> </div><div class='ctx'> config MACH_PAZ00</div><div class='ctx'>        bool "Paz00 board"</div><div class='add'>+       depends on ARCH_TEGRA_2x_SOC</div><div class='ctx'>        help</div><div class='ctx'>          Support for the Toshiba AC100/Dynabook AZ netbook</div><div class='ctx'> </div><div class='ctx'> config MACH_SEABOARD</div><div class='ctx'>        bool "Seaboard board"</div><div class='add'>+       depends on ARCH_TEGRA_2x_SOC</div><div class='ctx'>        select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC</div><div class='ctx'>        help</div><div class='ctx'>          Support for nVidia Seaboard development platform. It will</div><div class='hunk'>@@ -52,25 +65,29 @@ config MACH_SEABOARD</div><div class='ctx'> 	 have large similarities with the seaboard design.</div><div class='ctx'> </div><div class='ctx'> config MACH_TEGRA_DT</div><div class='del'>-	bool "Generic Tegra board (FDT support)"</div><div class='add'>+	bool "Generic Tegra20 board (FDT support)"</div><div class='add'>+	depends on ARCH_TEGRA_2x_SOC</div><div class='ctx'> 	select USE_OF</div><div class='ctx'> 	help</div><div class='del'>-	  Support for generic nVidia Tegra boards using Flattened Device Tree</div><div class='add'>+	  Support for generic NVIDIA Tegra20 boards using Flattened Device Tree</div><div class='ctx'> </div><div class='ctx'> config MACH_TRIMSLICE</div><div class='ctx'>        bool "TrimSlice board"</div><div class='add'>+       depends on ARCH_TEGRA_2x_SOC</div><div class='ctx'>        select TEGRA_PCI</div><div class='ctx'>        help</div><div class='ctx'>          Support for CompuLab TrimSlice platform</div><div class='ctx'> </div><div class='ctx'> config MACH_WARIO</div><div class='ctx'>        bool "Wario board"</div><div class='add'>+       depends on ARCH_TEGRA_2x_SOC</div><div class='ctx'>        select MACH_SEABOARD</div><div class='ctx'>        help</div><div class='ctx'>          Support for the Wario version of Seaboard</div><div class='ctx'> </div><div class='ctx'> config MACH_VENTANA</div><div class='ctx'>        bool "Ventana board"</div><div class='add'>+       depends on ARCH_TEGRA_2x_SOC</div><div class='ctx'>        select MACH_TEGRA_DT</div><div class='ctx'>        help</div><div class='ctx'>          Support for the nVidia Ventana development platform</div><div class='head'>diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile<br/>index 91a07e187208..e120ff54f663 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+obj-y                                   += board-pinmux.o</div><div class='ctx'> obj-y                                   += common.o</div><div class='ctx'> obj-y                                   += devices.o</div><div class='ctx'> obj-y                                   += io.o</div><div class='hunk'>@@ -5,12 +6,13 @@ obj-y                                   += irq.o</div><div class='ctx'> obj-y                                   += clock.o</div><div class='ctx'> obj-y                                   += timer.o</div><div class='ctx'> obj-y                                   += pinmux.o</div><div class='del'>-obj-y                                   += powergate.o</div><div class='ctx'> obj-y					+= fuse.o</div><div class='del'>-obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += clock.o</div><div class='add'>+obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= powergate.o</div><div class='ctx'> obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_clocks.o</div><div class='ctx'> obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= tegra2_emc.o</div><div class='del'>-obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= pinmux-t2-tables.o</div><div class='add'>+obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= pinmux-tegra20-tables.o</div><div class='add'>+obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= pinmux-tegra30-tables.o</div><div class='add'>+obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= board-dt-tegra30.o</div><div class='ctx'> obj-$(CONFIG_SMP)                       += platsmp.o localtimer.o headsmp.o</div><div class='ctx'> obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o</div><div class='ctx'> obj-$(CONFIG_TEGRA_SYSTEM_DMA)		+= dma.o</div><div class='hunk'>@@ -18,20 +20,22 @@ obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o</div><div class='ctx'> obj-$(CONFIG_TEGRA_PCI)			+= pcie.o</div><div class='ctx'> obj-$(CONFIG_USB_SUPPORT)		+= usb_phy.o</div><div class='ctx'> </div><div class='del'>-obj-${CONFIG_MACH_HARMONY}              += board-harmony.o</div><div class='del'>-obj-${CONFIG_MACH_HARMONY}              += board-harmony-pinmux.o</div><div class='del'>-obj-${CONFIG_MACH_HARMONY}              += board-harmony-pcie.o</div><div class='del'>-obj-${CONFIG_MACH_HARMONY}              += board-harmony-power.o</div><div class='add'>+obj-$(CONFIG_MACH_HARMONY)              += board-harmony.o</div><div class='add'>+obj-$(CONFIG_MACH_HARMONY)              += board-harmony-pinmux.o</div><div class='add'>+obj-$(CONFIG_MACH_HARMONY)              += board-harmony-pcie.o</div><div class='add'>+obj-$(CONFIG_MACH_HARMONY)              += board-harmony-power.o</div><div class='ctx'> </div><div class='del'>-obj-${CONFIG_MACH_PAZ00}		+= board-paz00.o</div><div class='del'>-obj-${CONFIG_MACH_PAZ00}		+= board-paz00-pinmux.o</div><div class='add'>+obj-$(CONFIG_MACH_PAZ00)		+= board-paz00.o</div><div class='add'>+obj-$(CONFIG_MACH_PAZ00)		+= board-paz00-pinmux.o</div><div class='ctx'> </div><div class='del'>-obj-${CONFIG_MACH_SEABOARD}             += board-seaboard.o</div><div class='del'>-obj-${CONFIG_MACH_SEABOARD}             += board-seaboard-pinmux.o</div><div class='add'>+obj-$(CONFIG_MACH_SEABOARD)             += board-seaboard.o</div><div class='add'>+obj-$(CONFIG_MACH_SEABOARD)             += board-seaboard-pinmux.o</div><div class='ctx'> </div><div class='del'>-obj-${CONFIG_MACH_TEGRA_DT}             += board-dt.o</div><div class='del'>-obj-${CONFIG_MACH_TEGRA_DT}             += board-harmony-pinmux.o</div><div class='del'>-obj-${CONFIG_MACH_TEGRA_DT}             += board-seaboard-pinmux.o</div><div class='add'>+obj-$(CONFIG_MACH_TEGRA_DT)             += board-dt-tegra20.o</div><div class='add'>+obj-$(CONFIG_MACH_TEGRA_DT)             += board-harmony-pinmux.o</div><div class='add'>+obj-$(CONFIG_MACH_TEGRA_DT)             += board-seaboard-pinmux.o</div><div class='add'>+obj-$(CONFIG_MACH_TEGRA_DT)             += board-paz00-pinmux.o</div><div class='add'>+obj-$(CONFIG_MACH_TEGRA_DT)             += board-trimslice-pinmux.o</div><div class='ctx'> </div><div class='del'>-obj-${CONFIG_MACH_TRIMSLICE}            += board-trimslice.o</div><div class='del'>-obj-${CONFIG_MACH_TRIMSLICE}            += board-trimslice-pinmux.o</div><div class='add'>+obj-$(CONFIG_MACH_TRIMSLICE)            += board-trimslice.o</div><div class='add'>+obj-$(CONFIG_MACH_TRIMSLICE)            += board-trimslice-pinmux.o</div><div class='head'>diff --git a/arch/arm/mach-tegra/Makefile.boot b/arch/arm/mach-tegra/Makefile.boot<br/>index bd12c9fb81e8..9a82094092d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/Makefile.boot?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/Makefile.boot</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/Makefile.boot?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/Makefile.boot</a></div><div class='hunk'>@@ -3,5 +3,8 @@ params_phys-$(CONFIG_ARCH_TEGRA_2x_SOC)	:= 0x00000100</div><div class='ctx'> initrd_phys-$(CONFIG_ARCH_TEGRA_2x_SOC)	:= 0x00800000</div><div class='ctx'> </div><div class='ctx'> dtb-$(CONFIG_MACH_HARMONY) += tegra-harmony.dtb</div><div class='add'>+dtb-$(CONFIG_MACH_PAZ00) += tegra-paz00.dtb</div><div class='ctx'> dtb-$(CONFIG_MACH_SEABOARD) += tegra-seaboard.dtb</div><div class='add'>+dtb-$(CONFIG_MACH_TRIMSLICE) += tegra-trimslice.dtb</div><div class='ctx'> dtb-$(CONFIG_MACH_VENTANA) += tegra-ventana.dtb</div><div class='add'>+dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra-cardhu.dtb</div><div class='head'>diff --git a/arch/arm/mach-tegra/board-dt.c b/arch/arm/mach-tegra/board-dt-tegra20.c<br/>index 74743ad3d2d3..7a95e0bc4aba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-dt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-dt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-dt-tegra20.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/board-dt-tegra20.c</a></div><div class='hunk'>@@ -32,10 +32,12 @@</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-tegra.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/iomap.h&gt;</div><div class='ctx'> #include &lt;mach/irqs.h&gt;</div><div class='hunk'>@@ -46,10 +48,14 @@</div><div class='ctx'> #include "devices.h"</div><div class='ctx'> </div><div class='ctx'> void harmony_pinmux_init(void);</div><div class='add'>+void paz00_pinmux_init(void);</div><div class='ctx'> void seaboard_pinmux_init(void);</div><div class='add'>+void trimslice_pinmux_init(void);</div><div class='ctx'> void ventana_pinmux_init(void);</div><div class='ctx'> </div><div class='ctx'> struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {</div><div class='add'>+	OF_DEV_AUXDATA("nvidia,tegra20-pinmux", TEGRA_APB_MISC_BASE + 0x14, "tegra-pinmux", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("nvidia,tegra20-gpio", TEGRA_GPIO_BASE, "tegra-gpio", NULL),</div><div class='ctx'> 	OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC1_BASE, "sdhci-tegra.0", NULL),</div><div class='ctx'> 	OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC2_BASE, "sdhci-tegra.1", NULL),</div><div class='ctx'> 	OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC3_BASE, "sdhci-tegra.2", NULL),</div><div class='hunk'>@@ -57,16 +63,30 @@ struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {</div><div class='ctx'> 	OF_DEV_AUXDATA("nvidia,tegra20-i2c", TEGRA_I2C_BASE, "tegra-i2c.0", NULL),</div><div class='ctx'> 	OF_DEV_AUXDATA("nvidia,tegra20-i2c", TEGRA_I2C2_BASE, "tegra-i2c.1", NULL),</div><div class='ctx'> 	OF_DEV_AUXDATA("nvidia,tegra20-i2c", TEGRA_I2C3_BASE, "tegra-i2c.2", NULL),</div><div class='del'>-	OF_DEV_AUXDATA("nvidia,tegra20-i2c", TEGRA_DVC_BASE, "tegra-i2c.3", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("nvidia,tegra20-i2c-dvc", TEGRA_DVC_BASE, "tegra-i2c.3", NULL),</div><div class='ctx'> 	OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S1_BASE, "tegra-i2s.0", NULL),</div><div class='del'>-	OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S1_BASE, "tegra-i2s.1", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S2_BASE, "tegra-i2s.1", NULL),</div><div class='ctx'> 	OF_DEV_AUXDATA("nvidia,tegra20-das", TEGRA_APB_MISC_DAS_BASE, "tegra-das", NULL),</div><div class='add'>+	OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB_BASE, "tegra-ehci.0",</div><div class='add'>+		       &amp;tegra_ehci1_device.dev.platform_data),</div><div class='add'>+	OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB2_BASE, "tegra-ehci.1",</div><div class='add'>+		       &amp;tegra_ehci2_device.dev.platform_data),</div><div class='add'>+	OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB3_BASE, "tegra-ehci.2",</div><div class='add'>+		       &amp;tegra_ehci3_device.dev.platform_data),</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __initdata struct tegra_clk_init_table tegra_dt_clk_init_table[] = {</div><div class='ctx'> 	/* name		parent		rate		enabled */</div><div class='ctx'> 	{ "uartd",	"pll_p",	216000000,	true },</div><div class='add'>+	{ "usbd",	"clk_m",	12000000,	false },</div><div class='add'>+	{ "usb2",	"clk_m",	12000000,	false },</div><div class='add'>+	{ "usb3",	"clk_m",	12000000,	false },</div><div class='add'>+	{ "pll_a",      "pll_p_out1",   56448000,       true },</div><div class='add'>+	{ "pll_a_out0", "pll_a",        11289600,       true },</div><div class='add'>+	{ "cdev1",      NULL,           0,              true },</div><div class='add'>+	{ "i2s1",       "pll_a_out0",   11289600,       false},</div><div class='add'>+	{ "i2s2",       "pll_a_out0",   11289600,       false},</div><div class='ctx'> 	{ NULL,		NULL,		0,		0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -75,39 +95,23 @@ static struct of_device_id tegra_dt_match_table[] __initdata = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct of_device_id tegra_dt_gic_match[] __initdata = {</div><div class='del'>-	{ .compatible = "nvidia,tegra20-gic", },</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct {</div><div class='ctx'> 	char *machine;</div><div class='ctx'> 	void (*init)(void);</div><div class='ctx'> } pinmux_configs[] = {</div><div class='add'>+	{ "compulab,trimslice", trimslice_pinmux_init },</div><div class='ctx'> 	{ "nvidia,harmony", harmony_pinmux_init },</div><div class='add'>+	{ "compal,paz00", paz00_pinmux_init },</div><div class='ctx'> 	{ "nvidia,seaboard", seaboard_pinmux_init },</div><div class='ctx'> 	{ "nvidia,ventana", ventana_pinmux_init },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init tegra_dt_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *node;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	node = of_find_matching_node_by_address(NULL, tegra_dt_gic_match,</div><div class='del'>-						TEGRA_ARM_INT_DIST_BASE);</div><div class='del'>-	if (node)</div><div class='del'>-		irq_domain_add_simple(node, INT_GIC_BASE);</div><div class='del'>-</div><div class='ctx'> 	tegra_clk_init_from_table(tegra_dt_clk_init_table);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Finished with the static registrations now; fill in the missing</div><div class='del'>-	 * devices</div><div class='del'>-	 */</div><div class='del'>-	of_platform_populate(NULL, tegra_dt_match_table,</div><div class='del'>-				tegra20_auxdata_lookup, NULL);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(pinmux_configs); i++) {</div><div class='ctx'> 		if (of_machine_is_compatible(pinmux_configs[i].machine)) {</div><div class='ctx'> 			pinmux_configs[i].init();</div><div class='hunk'>@@ -117,20 +121,31 @@ static void __init tegra_dt_init(void)</div><div class='ctx'> </div><div class='ctx'> 	WARN(i == ARRAY_SIZE(pinmux_configs),</div><div class='ctx'> 		"Unknown platform! Pinmuxing not initialized\n");</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Finished with the static registrations now; fill in the missing</div><div class='add'>+	 * devices</div><div class='add'>+	 */</div><div class='add'>+	of_platform_populate(NULL, tegra_dt_match_table,</div><div class='add'>+				tegra20_auxdata_lookup, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char * tegra_dt_board_compat[] = {</div><div class='add'>+static const char *tegra20_dt_board_compat[] = {</div><div class='add'>+	"compulab,trimslice",</div><div class='ctx'> 	"nvidia,harmony",</div><div class='add'>+	"compal,paz00",</div><div class='ctx'> 	"nvidia,seaboard",</div><div class='ctx'> 	"nvidia,ventana",</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-DT_MACHINE_START(TEGRA_DT, "nVidia Tegra (Flattened Device Tree)")</div><div class='add'>+DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)")</div><div class='ctx'> 	.map_io		= tegra_map_common_io,</div><div class='del'>-	.init_early	= tegra_init_early,</div><div class='del'>-	.init_irq	= tegra_init_irq,</div><div class='add'>+	.init_early	= tegra20_init_early,</div><div class='add'>+	.init_irq	= tegra_dt_init_irq,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;tegra_timer,</div><div class='ctx'> 	.init_machine	= tegra_dt_init,</div><div class='del'>-	.dt_compat	= tegra_dt_board_compat,</div><div class='add'>+	.restart	= tegra_assert_system_reset,</div><div class='add'>+	.dt_compat	= tegra20_dt_board_compat,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-tegra/board-dt-tegra30.c b/arch/arm/mach-tegra/board-dt-tegra30.c<br/>new file mode 100644<br/>index 000000000000..3c197e2440b7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-dt-tegra30.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/board-dt-tegra30.c</a></div><div class='hunk'>@@ -0,0 +1,63 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-tegra/board-dt-tegra30.c</div><div class='add'>+ *</div><div class='add'>+ * NVIDIA Tegra30 device tree board support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 NVIDIA Corporation</div><div class='add'>+ *</div><div class='add'>+ * Derived from:</div><div class='add'>+ *</div><div class='add'>+ * arch/arm/mach-tegra/board-dt-tegra20.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2010 Secret Lab Technologies, Ltd.</div><div class='add'>+ * Copyright (C) 2010 Google, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</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/of.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/of_fdt.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='add'>+</div><div class='add'>+#include "board.h"</div><div class='add'>+</div><div class='add'>+static struct of_device_id tegra_dt_match_table[] __initdata = {</div><div class='add'>+	{ .compatible = "simple-bus", },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init tegra30_dt_init(void)</div><div class='add'>+{</div><div class='add'>+	of_platform_populate(NULL, tegra_dt_match_table,</div><div class='add'>+				NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *tegra30_dt_board_compat[] = {</div><div class='add'>+	"nvidia,cardhu",</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DT_MACHINE_START(TEGRA30_DT, "NVIDIA Tegra30 (Flattened Device Tree)")</div><div class='add'>+	.map_io		= tegra_map_common_io,</div><div class='add'>+	.init_early	= tegra30_init_early,</div><div class='add'>+	.init_irq	= tegra_dt_init_irq,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='add'>+	.timer		= &amp;tegra_timer,</div><div class='add'>+	.init_machine	= tegra30_dt_init,</div><div class='add'>+	.restart	= tegra_assert_system_reset,</div><div class='add'>+	.dt_compat	= tegra30_dt_board_compat,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-tegra/board-harmony-pcie.c b/arch/arm/mach-tegra/board-harmony-pcie.c<br/>index 6db7d699ef1c..33c4fedab840 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-harmony-pcie.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-harmony-pcie.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-harmony-pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/board-harmony-pcie.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/pinmux.h&gt;</div><div class='ctx'> #include "board.h"</div><div class='ctx'> #include "board-harmony.h"</div><div class='ctx'> </div><div class='hunk'>@@ -48,10 +47,6 @@ static int __init harmony_pcie_init(void)</div><div class='ctx'> </div><div class='ctx'> 	regulator_enable(regulator);</div><div class='ctx'> </div><div class='del'>-	tegra_pinmux_set_tristate(TEGRA_PINGROUP_GPV, TEGRA_TRI_NORMAL);</div><div class='del'>-	tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXA, TEGRA_TRI_NORMAL);</div><div class='del'>-	tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXK, TEGRA_TRI_NORMAL);</div><div class='del'>-</div><div class='ctx'> 	err = tegra_pcie_init(true, true);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_pcie;</div><div class='hunk'>@@ -59,10 +54,6 @@ static int __init harmony_pcie_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_pcie:</div><div class='del'>-	tegra_pinmux_set_tristate(TEGRA_PINGROUP_GPV, TEGRA_TRI_TRISTATE);</div><div class='del'>-	tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXA, TEGRA_TRI_TRISTATE);</div><div class='del'>-	tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXK, TEGRA_TRI_TRISTATE);</div><div class='del'>-</div><div class='ctx'> 	regulator_disable(regulator);</div><div class='ctx'> 	regulator_put(regulator);</div><div class='ctx'> err_reg:</div><div class='head'>diff --git a/arch/arm/mach-tegra/board-harmony-pinmux.c b/arch/arm/mach-tegra/board-harmony-pinmux.c<br/>index 7a4a26d5174c..465808c8ac0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-harmony-pinmux.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-harmony-pinmux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-harmony-pinmux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/board-harmony-pinmux.c</a></div><div class='hunk'>@@ -19,10 +19,11 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/pinmux.h&gt;</div><div class='add'>+#include &lt;mach/pinmux-tegra20.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "gpio-names.h"</div><div class='ctx'> #include "board-harmony.h"</div><div class='del'>-#include "devices.h"</div><div class='add'>+#include "board-pinmux.h"</div><div class='ctx'> </div><div class='ctx'> static struct tegra_pingroup_config harmony_pinmux[] = {</div><div class='ctx'> 	{TEGRA_PINGROUP_ATA,   TEGRA_MUX_IDE,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='hunk'>@@ -143,11 +144,6 @@ static struct tegra_pingroup_config harmony_pinmux[] = {</div><div class='ctx'> 	{TEGRA_PINGROUP_XM2D,  TEGRA_MUX_NONE,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device *pinmux_devices[] = {</div><div class='del'>-	&amp;tegra_gpio_device,</div><div class='del'>-	&amp;tegra_pinmux_device,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct tegra_gpio_table gpio_table[] = {</div><div class='ctx'> 	{ .gpio = TEGRA_GPIO_SD2_CD,		.enable = true	},</div><div class='ctx'> 	{ .gpio = TEGRA_GPIO_SD2_WP,		.enable = true	},</div><div class='hunk'>@@ -161,13 +157,14 @@ static struct tegra_gpio_table gpio_table[] = {</div><div class='ctx'> 	{ .gpio = TEGRA_GPIO_EXT_MIC_EN,	.enable = true	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct tegra_board_pinmux_conf conf = {</div><div class='add'>+	.pgs = harmony_pinmux,</div><div class='add'>+	.pg_count = ARRAY_SIZE(harmony_pinmux),</div><div class='add'>+	.gpios = gpio_table,</div><div class='add'>+	.gpio_count = ARRAY_SIZE(gpio_table),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void harmony_pinmux_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (!of_machine_is_compatible("nvidia,tegra20"))</div><div class='del'>-		platform_add_devices(pinmux_devices,</div><div class='del'>-					ARRAY_SIZE(pinmux_devices));</div><div class='del'>-</div><div class='del'>-	tegra_pinmux_config_table(harmony_pinmux, ARRAY_SIZE(harmony_pinmux));</div><div class='del'>-</div><div class='del'>-	tegra_gpio_config(gpio_table, ARRAY_SIZE(gpio_table));</div><div class='add'>+	tegra_board_pinmux_init(&amp;conf, NULL);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c<br/>index f0bdc5e3fe52..789bdc9e8f91 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-harmony.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-harmony.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-harmony.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/board-harmony.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/tegra_wm8903_pdata.h&gt;</div><div class='hunk'>@@ -89,11 +90,11 @@ static struct wm8903_platform_data harmony_wm8903_pdata = {</div><div class='ctx'> 	.micdet_delay = 100,</div><div class='ctx'> 	.gpio_base = HARMONY_GPIO_WM8903(0),</div><div class='ctx'> 	.gpio_cfg = {</div><div class='del'>-		WM8903_GPIO_NO_CONFIG,</div><div class='del'>-		WM8903_GPIO_NO_CONFIG,</div><div class='ctx'> 		0,</div><div class='del'>-		WM8903_GPIO_NO_CONFIG,</div><div class='del'>-		WM8903_GPIO_NO_CONFIG,</div><div class='add'>+		0,</div><div class='add'>+		WM8903_GPIO_CONFIG_ZERO,</div><div class='add'>+		0,</div><div class='add'>+		0,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -185,8 +186,10 @@ MACHINE_START(HARMONY, "harmony")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.fixup		= tegra_harmony_fixup,</div><div class='ctx'> 	.map_io         = tegra_map_common_io,</div><div class='del'>-	.init_early	= tegra_init_early,</div><div class='add'>+	.init_early	= tegra20_init_early,</div><div class='ctx'> 	.init_irq       = tegra_init_irq,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.timer          = &amp;tegra_timer,</div><div class='ctx'> 	.init_machine   = tegra_harmony_init,</div><div class='add'>+	.restart	= tegra_assert_system_reset,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-tegra/board-paz00-pinmux.c b/arch/arm/mach-tegra/board-paz00-pinmux.c<br/>index be30e215f4b7..c775572dcea4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-paz00-pinmux.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-paz00-pinmux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-paz00-pinmux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/board-paz00-pinmux.c</a></div><div class='hunk'>@@ -19,10 +19,11 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/pinmux.h&gt;</div><div class='add'>+#include &lt;mach/pinmux-tegra20.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "gpio-names.h"</div><div class='ctx'> #include "board-paz00.h"</div><div class='del'>-#include "devices.h"</div><div class='add'>+#include "board-pinmux.h"</div><div class='ctx'> </div><div class='ctx'> static struct tegra_pingroup_config paz00_pinmux[] = {</div><div class='ctx'> 	{TEGRA_PINGROUP_ATA,   TEGRA_MUX_GMI,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='hunk'>@@ -30,7 +31,7 @@ static struct tegra_pingroup_config paz00_pinmux[] = {</div><div class='ctx'> 	{TEGRA_PINGROUP_ATC,   TEGRA_MUX_GMI,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_ATD,   TEGRA_MUX_GMI,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_ATE,   TEGRA_MUX_GMI,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='del'>-	{TEGRA_PINGROUP_CDEV1, TEGRA_MUX_PLLA_OUT,      TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE},</div><div class='add'>+	{TEGRA_PINGROUP_CDEV1, TEGRA_MUX_PLLA_OUT,      TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_CDEV2, TEGRA_MUX_PLLP_OUT4,     TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_CRTP,  TEGRA_MUX_CRT,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='ctx'> 	{TEGRA_PINGROUP_CSUS,  TEGRA_MUX_PLLC_OUT1,     TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE},</div><div class='hunk'>@@ -143,11 +144,6 @@ static struct tegra_pingroup_config paz00_pinmux[] = {</div><div class='ctx'> 	{TEGRA_PINGROUP_XM2D,  TEGRA_MUX_NONE,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device *pinmux_devices[] = {</div><div class='del'>-	&amp;tegra_gpio_device,</div><div class='del'>-	&amp;tegra_pinmux_device,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct tegra_gpio_table gpio_table[] = {</div><div class='ctx'> 	{ .gpio = TEGRA_GPIO_SD1_CD,	.enable = true },</div><div class='ctx'> 	{ .gpio = TEGRA_GPIO_SD1_WP,	.enable = true },</div><div class='hunk'>@@ -158,13 +154,14 @@ static struct tegra_gpio_table gpio_table[] = {</div><div class='ctx'> 	{ .gpio = TEGRA_WIFI_LED,	.enable = true },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct tegra_board_pinmux_conf conf = {</div><div class='add'>+	.pgs = paz00_pinmux,</div><div class='add'>+	.pg_count = ARRAY_SIZE(paz00_pinmux),</div><div class='add'>+	.gpios = gpio_table,</div><div class='add'>+	.gpio_count = ARRAY_SIZE(gpio_table),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void paz00_pinmux_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (!of_machine_is_compatible("nvidia,tegra20"))</div><div class='del'>-		platform_add_devices(pinmux_devices,</div><div class='del'>-					ARRAY_SIZE(pinmux_devices));</div><div class='del'>-</div><div class='del'>-	tegra_pinmux_config_table(paz00_pinmux, ARRAY_SIZE(paz00_pinmux));</div><div class='del'>-</div><div class='del'>-	tegra_gpio_config(gpio_table, ARRAY_SIZE(gpio_table));</div><div class='add'>+	tegra_board_pinmux_init(&amp;conf, NULL);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c<br/>index 55c55ba89f1e..fcf4f377b1dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-paz00.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-paz00.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-paz00.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/board-paz00.c</a></div><div class='hunk'>@@ -23,12 +23,15 @@</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/gpio_keys.h&gt;</div><div class='ctx'> #include &lt;linux/pda_power.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/rfkill-gpio.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='hunk'>@@ -114,12 +117,37 @@ static struct platform_device leds_gpio = {</div><div class='ctx'>         },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct gpio_keys_button paz00_gpio_keys_buttons[] = {</div><div class='add'>+	{</div><div class='add'>+		.code		= KEY_POWER,</div><div class='add'>+		.gpio		= TEGRA_GPIO_POWERKEY,</div><div class='add'>+		.active_low	= 1,</div><div class='add'>+		.desc		= "Power",</div><div class='add'>+		.type		= EV_KEY,</div><div class='add'>+		.wakeup		= 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_keys_platform_data paz00_gpio_keys = {</div><div class='add'>+	.buttons	= paz00_gpio_keys_buttons,</div><div class='add'>+	.nbuttons	= ARRAY_SIZE(paz00_gpio_keys_buttons),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device gpio_keys_device = {</div><div class='add'>+	.name	= "gpio-keys",</div><div class='add'>+	.id	= -1,</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data = &amp;paz00_gpio_keys,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device *paz00_devices[] __initdata = {</div><div class='ctx'> 	&amp;debug_uart,</div><div class='ctx'> 	&amp;tegra_sdhci_device4,</div><div class='ctx'> 	&amp;tegra_sdhci_device1,</div><div class='ctx'> 	&amp;wifi_rfkill_device,</div><div class='ctx'> 	&amp;leds_gpio,</div><div class='add'>+	&amp;gpio_keys_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void paz00_i2c_init(void)</div><div class='hunk'>@@ -188,8 +216,10 @@ MACHINE_START(PAZ00, "Toshiba AC100 / Dynabook AZ")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.fixup		= tegra_paz00_fixup,</div><div class='ctx'> 	.map_io         = tegra_map_common_io,</div><div class='del'>-	.init_early	= tegra_init_early,</div><div class='add'>+	.init_early	= tegra20_init_early,</div><div class='ctx'> 	.init_irq       = tegra_init_irq,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.timer          = &amp;tegra_timer,</div><div class='ctx'> 	.init_machine   = tegra_paz00_init,</div><div class='add'>+	.restart	= tegra_assert_system_reset,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-tegra/board-paz00.h b/arch/arm/mach-tegra/board-paz00.h<br/>index 8aff06eb58c3..ffa83f580db6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-paz00.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-paz00.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-paz00.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/board-paz00.h</a></div><div class='hunk'>@@ -32,6 +32,9 @@</div><div class='ctx'> #define TEGRA_WIFI_RST			TEGRA_GPIO_PD1</div><div class='ctx'> #define TEGRA_WIFI_LED			TEGRA_GPIO_PD0</div><div class='ctx'> </div><div class='add'>+/* WakeUp */</div><div class='add'>+#define TEGRA_GPIO_POWERKEY	TEGRA_GPIO_PJ7</div><div class='add'>+</div><div class='ctx'> void paz00_pinmux_init(void);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-tegra/board-pinmux.c b/arch/arm/mach-tegra/board-pinmux.c<br/>new file mode 100644<br/>index 000000000000..adc3efe979b3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-pinmux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/board-pinmux.c</a></div><div class='hunk'>@@ -0,0 +1,104 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2011, NVIDIA CORPORATION.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</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/kernel.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/gpio-tegra.h&gt;</div><div class='add'>+#include &lt;mach/pinmux.h&gt;</div><div class='add'>+</div><div class='add'>+#include "board-pinmux.h"</div><div class='add'>+#include "devices.h"</div><div class='add'>+</div><div class='add'>+struct tegra_board_pinmux_conf *confs[2];</div><div class='add'>+</div><div class='add'>+static void tegra_board_pinmux_setup_gpios(void)</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(confs); i++) {</div><div class='add'>+		if (!confs[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		tegra_gpio_config(confs[i]-&gt;gpios, confs[i]-&gt;gpio_count);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tegra_board_pinmux_setup_pinmux(void)</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(confs); i++) {</div><div class='add'>+		if (!confs[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		tegra_pinmux_config_table(confs[i]-&gt;pgs, confs[i]-&gt;pg_count);</div><div class='add'>+</div><div class='add'>+		if (confs[i]-&gt;drives)</div><div class='add'>+			tegra_drive_pinmux_config_table(confs[i]-&gt;drives,</div><div class='add'>+							confs[i]-&gt;drive_count);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra_board_pinmux_bus_notify(struct notifier_block *nb,</div><div class='add'>+					 unsigned long event, void *vdev)</div><div class='add'>+{</div><div class='add'>+	static bool had_gpio;</div><div class='add'>+	static bool had_pinmux;</div><div class='add'>+</div><div class='add'>+	struct device *dev = vdev;</div><div class='add'>+	const char *devname;</div><div class='add'>+</div><div class='add'>+	if (event != BUS_NOTIFY_BOUND_DRIVER)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	devname = dev_name(dev);</div><div class='add'>+</div><div class='add'>+	if (!had_gpio &amp;&amp; !strcmp(devname, GPIO_DEV)) {</div><div class='add'>+		tegra_board_pinmux_setup_gpios();</div><div class='add'>+		had_gpio = true;</div><div class='add'>+	} else if (!had_pinmux &amp;&amp; !strcmp(devname, PINMUX_DEV)) {</div><div class='add'>+		tegra_board_pinmux_setup_pinmux();</div><div class='add'>+		had_pinmux = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (had_gpio &amp;&amp; had_pinmux)</div><div class='add'>+		return NOTIFY_STOP_MASK;</div><div class='add'>+	else</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block nb = {</div><div class='add'>+	.notifier_call = tegra_board_pinmux_bus_notify,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *devices[] = {</div><div class='add'>+	&amp;tegra_gpio_device,</div><div class='add'>+	&amp;tegra_pinmux_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void tegra_board_pinmux_init(struct tegra_board_pinmux_conf *conf_a,</div><div class='add'>+			     struct tegra_board_pinmux_conf *conf_b)</div><div class='add'>+{</div><div class='add'>+	confs[0] = conf_a;</div><div class='add'>+	confs[1] = conf_b;</div><div class='add'>+</div><div class='add'>+	bus_register_notifier(&amp;platform_bus_type, &amp;nb);</div><div class='add'>+</div><div class='add'>+	if (!of_machine_is_compatible("nvidia,tegra20"))</div><div class='add'>+		platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-tegra/board-pinmux.h b/arch/arm/mach-tegra/board-pinmux.h<br/>new file mode 100644<br/>index 000000000000..4aac73546f54<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-pinmux.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/board-pinmux.h</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2011, NVIDIA CORPORATION.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MACH_TEGRA_BOARD_PINMUX_H</div><div class='add'>+#define __MACH_TEGRA_BOARD_PINMUX_H</div><div class='add'>+</div><div class='add'>+#define GPIO_DEV "tegra-gpio"</div><div class='add'>+#define PINMUX_DEV "tegra-pinmux"</div><div class='add'>+</div><div class='add'>+struct tegra_pingroup_config;</div><div class='add'>+struct tegra_gpio_table;</div><div class='add'>+</div><div class='add'>+struct tegra_board_pinmux_conf {</div><div class='add'>+	struct tegra_pingroup_config *pgs;</div><div class='add'>+	int pg_count;</div><div class='add'>+</div><div class='add'>+	struct tegra_drive_pingroup_config *drives;</div><div class='add'>+	int drive_count;</div><div class='add'>+</div><div class='add'>+	struct tegra_gpio_table *gpios;</div><div class='add'>+	int gpio_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void tegra_board_pinmux_init(struct tegra_board_pinmux_conf *conf_a,</div><div class='add'>+			     struct tegra_board_pinmux_conf *conf_b);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-tegra/board-seaboard-pinmux.c b/arch/arm/mach-tegra/board-seaboard-pinmux.c<br/>index b1c2972f62fe..55e7e43a14ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-seaboard-pinmux.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-seaboard-pinmux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-seaboard-pinmux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/board-seaboard-pinmux.c</a></div><div class='hunk'>@@ -19,11 +19,11 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/pinmux.h&gt;</div><div class='del'>-#include &lt;mach/pinmux-t2.h&gt;</div><div class='add'>+#include &lt;mach/pinmux-tegra20.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "gpio-names.h"</div><div class='add'>+#include "board-pinmux.h"</div><div class='ctx'> #include "board-seaboard.h"</div><div class='del'>-#include "devices.h"</div><div class='ctx'> </div><div class='ctx'> #define DEFAULT_DRIVE(_name)					\</div><div class='ctx'> 	{							\</div><div class='hunk'>@@ -37,11 +37,11 @@</div><div class='ctx'> 		.slew_falling = TEGRA_SLEW_SLOWEST,		\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-static __initdata struct tegra_drive_pingroup_config seaboard_drive_pinmux[] = {</div><div class='add'>+static struct tegra_drive_pingroup_config seaboard_drive_pinmux[] = {</div><div class='ctx'> 	DEFAULT_DRIVE(SDIO1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static __initdata struct tegra_pingroup_config seaboard_pinmux[] = {</div><div class='add'>+static struct tegra_pingroup_config common_pinmux[] = {</div><div class='ctx'> 	{TEGRA_PINGROUP_ATA,   TEGRA_MUX_IDE,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_ATB,   TEGRA_MUX_SDIO4,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_ATC,   TEGRA_MUX_NAND,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='hunk'>@@ -55,7 +55,6 @@ static __initdata struct tegra_pingroup_config seaboard_pinmux[] = {</div><div class='ctx'> 	{TEGRA_PINGROUP_DAP2,  TEGRA_MUX_DAP2,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_DAP3,  TEGRA_MUX_DAP3,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='ctx'> 	{TEGRA_PINGROUP_DAP4,  TEGRA_MUX_DAP4,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='del'>-	{TEGRA_PINGROUP_DDC,   TEGRA_MUX_RSVD2,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='ctx'> 	{TEGRA_PINGROUP_DTA,   TEGRA_MUX_VI,            TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_DTB,   TEGRA_MUX_VI,            TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_DTC,   TEGRA_MUX_VI,            TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL},</div><div class='hunk'>@@ -65,7 +64,6 @@ static __initdata struct tegra_pingroup_config seaboard_pinmux[] = {</div><div class='ctx'> 	{TEGRA_PINGROUP_GMA,   TEGRA_MUX_SDIO4,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_GMB,   TEGRA_MUX_GMI,           TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},</div><div class='ctx'> 	{TEGRA_PINGROUP_GMC,   TEGRA_MUX_UARTD,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='del'>-	{TEGRA_PINGROUP_GMD,   TEGRA_MUX_SFLASH,        TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_GME,   TEGRA_MUX_SDIO4,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_GPU,   TEGRA_MUX_PWM,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_GPU7,  TEGRA_MUX_RTCK,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='hunk'>@@ -108,13 +106,8 @@ static __initdata struct tegra_pingroup_config seaboard_pinmux[] = {</div><div class='ctx'> 	{TEGRA_PINGROUP_LM0,   TEGRA_MUX_RSVD4,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_LM1,   TEGRA_MUX_CRT,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='ctx'> 	{TEGRA_PINGROUP_LPP,   TEGRA_MUX_DISPLAYA,      TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='del'>-	{TEGRA_PINGROUP_LPW0,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_LPW1,  TEGRA_MUX_RSVD4,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='del'>-	{TEGRA_PINGROUP_LPW2,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_LSC0,  TEGRA_MUX_DISPLAYA,      TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='del'>-	{TEGRA_PINGROUP_LSC1,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='del'>-	{TEGRA_PINGROUP_LSCK,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='del'>-	{TEGRA_PINGROUP_LSDA,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='ctx'> 	{TEGRA_PINGROUP_LSDI,  TEGRA_MUX_RSVD4,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='ctx'> 	{TEGRA_PINGROUP_LSPI,  TEGRA_MUX_DISPLAYA,      TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_LVP0,  TEGRA_MUX_RSVD4,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='hunk'>@@ -122,25 +115,19 @@ static __initdata struct tegra_pingroup_config seaboard_pinmux[] = {</div><div class='ctx'> 	{TEGRA_PINGROUP_LVS,   TEGRA_MUX_DISPLAYA,      TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_OWC,   TEGRA_MUX_RSVD2,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='ctx'> 	{TEGRA_PINGROUP_PMC,   TEGRA_MUX_PWR_ON,        TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='del'>-	{TEGRA_PINGROUP_PTA,   TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_RM,    TEGRA_MUX_I2C,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_SDB,   TEGRA_MUX_SDIO3,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_SDC,   TEGRA_MUX_SDIO3,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_SDD,   TEGRA_MUX_SDIO3,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_SDIO1, TEGRA_MUX_SDIO1,         TEGRA_PUPD_PULL_UP,   TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_SLXA,  TEGRA_MUX_PCIE,          TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},</div><div class='del'>-	{TEGRA_PINGROUP_SLXC,  TEGRA_MUX_SPDIF,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='ctx'> 	{TEGRA_PINGROUP_SLXD,  TEGRA_MUX_SPDIF,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='del'>-	{TEGRA_PINGROUP_SLXK,  TEGRA_MUX_PCIE,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_SPDI,  TEGRA_MUX_RSVD2,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_SPDO,  TEGRA_MUX_RSVD2,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='del'>-	{TEGRA_PINGROUP_SPIA,  TEGRA_MUX_GMI,           TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},</div><div class='ctx'> 	{TEGRA_PINGROUP_SPIB,  TEGRA_MUX_GMI,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='del'>-	{TEGRA_PINGROUP_SPIC,  TEGRA_MUX_GMI,           TEGRA_PUPD_PULL_UP,   TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_SPID,  TEGRA_MUX_SPI1,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='ctx'> 	{TEGRA_PINGROUP_SPIE,  TEGRA_MUX_SPI1,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='ctx'> 	{TEGRA_PINGROUP_SPIF,  TEGRA_MUX_SPI1,          TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE},</div><div class='del'>-	{TEGRA_PINGROUP_SPIG,  TEGRA_MUX_SPI2_ALT,      TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},</div><div class='ctx'> 	{TEGRA_PINGROUP_SPIH,  TEGRA_MUX_SPI2_ALT,      TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},</div><div class='ctx'> 	{TEGRA_PINGROUP_UAA,   TEGRA_MUX_ULPI,          TEGRA_PUPD_PULL_UP,   TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_UAB,   TEGRA_MUX_ULPI,          TEGRA_PUPD_PULL_UP,   TEGRA_TRI_NORMAL},</div><div class='hunk'>@@ -160,13 +147,24 @@ static __initdata struct tegra_pingroup_config seaboard_pinmux[] = {</div><div class='ctx'> 	{TEGRA_PINGROUP_XM2D,  TEGRA_MUX_NONE,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static __initdata struct tegra_pingroup_config ventana_pinmux[] = {</div><div class='del'>-	{TEGRA_PINGROUP_DAP3, TEGRA_MUX_DAP3,     TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='add'>+static struct tegra_pingroup_config seaboard_pinmux[] = {</div><div class='add'>+	{TEGRA_PINGROUP_DDC,   TEGRA_MUX_RSVD2,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='add'>+	{TEGRA_PINGROUP_GMD,   TEGRA_MUX_SFLASH,        TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='add'>+	{TEGRA_PINGROUP_LPW0,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='add'>+	{TEGRA_PINGROUP_LPW2,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='add'>+	{TEGRA_PINGROUP_LSC1,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='add'>+	{TEGRA_PINGROUP_LSCK,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='add'>+	{TEGRA_PINGROUP_LSDA,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='add'>+	{TEGRA_PINGROUP_PTA,   TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='add'>+	{TEGRA_PINGROUP_SLXC,  TEGRA_MUX_SPDIF,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='add'>+	{TEGRA_PINGROUP_SLXK,  TEGRA_MUX_PCIE,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='add'>+	{TEGRA_PINGROUP_SPIA,  TEGRA_MUX_GMI,           TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},</div><div class='add'>+	{TEGRA_PINGROUP_SPIC,  TEGRA_MUX_GMI,           TEGRA_PUPD_PULL_UP,   TEGRA_TRI_NORMAL},</div><div class='add'>+	{TEGRA_PINGROUP_SPIG,  TEGRA_MUX_SPI2_ALT,      TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct tegra_pingroup_config ventana_pinmux[] = {</div><div class='ctx'> 	{TEGRA_PINGROUP_DDC,  TEGRA_MUX_RSVD2,    TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='del'>-	{TEGRA_PINGROUP_DTA,  TEGRA_MUX_VI,       TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL},</div><div class='del'>-	{TEGRA_PINGROUP_DTB,  TEGRA_MUX_VI,       TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL},</div><div class='del'>-	{TEGRA_PINGROUP_DTC,  TEGRA_MUX_VI,       TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL},</div><div class='del'>-	{TEGRA_PINGROUP_DTD,  TEGRA_MUX_VI,       TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_GMD,  TEGRA_MUX_SFLASH,   TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='ctx'> 	{TEGRA_PINGROUP_LPW0, TEGRA_MUX_RSVD4,    TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_LPW2, TEGRA_MUX_RSVD4,    TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},</div><div class='hunk'>@@ -181,65 +179,59 @@ static __initdata struct tegra_pingroup_config ventana_pinmux[] = {</div><div class='ctx'> 	{TEGRA_PINGROUP_SPIG, TEGRA_MUX_SPI2_ALT, TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device *pinmux_devices[] = {</div><div class='del'>-	&amp;tegra_gpio_device,</div><div class='del'>-	&amp;tegra_pinmux_device,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct tegra_gpio_table common_gpio_table[] = {</div><div class='ctx'> 	{ .gpio = TEGRA_GPIO_SD2_CD,		.enable = true },</div><div class='ctx'> 	{ .gpio = TEGRA_GPIO_SD2_WP,		.enable = true },</div><div class='ctx'> 	{ .gpio = TEGRA_GPIO_SD2_POWER,		.enable = true },</div><div class='add'>+	{ .gpio = TEGRA_GPIO_CDC_IRQ,		.enable = true },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct tegra_gpio_table seaboard_gpio_table[] = {</div><div class='ctx'> 	{ .gpio = TEGRA_GPIO_LIDSWITCH,		.enable = true },</div><div class='ctx'> 	{ .gpio = TEGRA_GPIO_POWERKEY,		.enable = true },</div><div class='ctx'> 	{ .gpio = TEGRA_GPIO_HP_DET,		.enable = true },</div><div class='ctx'> 	{ .gpio = TEGRA_GPIO_ISL29018_IRQ,	.enable = true },</div><div class='del'>-	{ .gpio = TEGRA_GPIO_CDC_IRQ,		.enable = true },</div><div class='ctx'> 	{ .gpio = TEGRA_GPIO_USB1,		.enable = true },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __init update_pinmux(struct tegra_pingroup_config *newtbl, int size)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-	struct tegra_pingroup_config *new_pingroup, *base_pingroup;</div><div class='del'>-</div><div class='del'>-	/* Update base seaboard pinmux table with secondary board</div><div class='del'>-	 * specific pinmux table table.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; size; i++) {</div><div class='del'>-		new_pingroup = &amp;newtbl[i];</div><div class='del'>-		for (j = 0; j &lt; ARRAY_SIZE(seaboard_pinmux); j++) {</div><div class='del'>-			base_pingroup = &amp;seaboard_pinmux[j];</div><div class='del'>-			if (new_pingroup-&gt;pingroup == base_pingroup-&gt;pingroup) {</div><div class='del'>-				*base_pingroup = *new_pingroup;</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 __init seaboard_common_pinmux_init(void)</div><div class='del'>-{</div><div class='del'>-	if (!of_machine_is_compatible("nvidia,tegra20"))</div><div class='del'>-		platform_add_devices(pinmux_devices,</div><div class='del'>-					ARRAY_SIZE(pinmux_devices));</div><div class='add'>+static struct tegra_gpio_table ventana_gpio_table[] = {</div><div class='add'>+	/* hp_det */</div><div class='add'>+	{ .gpio = TEGRA_GPIO_PW2,		.enable = true },</div><div class='add'>+	/* int_mic_en */</div><div class='add'>+	{ .gpio = TEGRA_GPIO_PX0,		.enable = true },</div><div class='add'>+	/* ext_mic_en */</div><div class='add'>+	{ .gpio = TEGRA_GPIO_PX1,		.enable = true },</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	tegra_pinmux_config_table(seaboard_pinmux, ARRAY_SIZE(seaboard_pinmux));</div><div class='add'>+static struct tegra_board_pinmux_conf common_conf = {</div><div class='add'>+	.pgs = common_pinmux,</div><div class='add'>+	.pg_count = ARRAY_SIZE(common_pinmux),</div><div class='add'>+	.gpios = common_gpio_table,</div><div class='add'>+	.gpio_count = ARRAY_SIZE(common_gpio_table),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	tegra_drive_pinmux_config_table(seaboard_drive_pinmux,</div><div class='del'>-					ARRAY_SIZE(seaboard_drive_pinmux));</div><div class='add'>+static struct tegra_board_pinmux_conf seaboard_conf = {</div><div class='add'>+	.pgs = seaboard_pinmux,</div><div class='add'>+	.pg_count = ARRAY_SIZE(seaboard_pinmux),</div><div class='add'>+	.drives = seaboard_drive_pinmux,</div><div class='add'>+	.drive_count = ARRAY_SIZE(seaboard_drive_pinmux),</div><div class='add'>+	.gpios = seaboard_gpio_table,</div><div class='add'>+	.gpio_count = ARRAY_SIZE(seaboard_gpio_table),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	tegra_gpio_config(common_gpio_table, ARRAY_SIZE(common_gpio_table));</div><div class='del'>-}</div><div class='add'>+static struct tegra_board_pinmux_conf ventana_conf = {</div><div class='add'>+	.pgs = ventana_pinmux,</div><div class='add'>+	.pg_count = ARRAY_SIZE(ventana_pinmux),</div><div class='add'>+	.gpios = ventana_gpio_table,</div><div class='add'>+	.gpio_count = ARRAY_SIZE(ventana_gpio_table),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-void __init seaboard_pinmux_init(void)</div><div class='add'>+void seaboard_pinmux_init(void)</div><div class='ctx'> {</div><div class='del'>-	seaboard_common_pinmux_init();</div><div class='add'>+	tegra_board_pinmux_init(&amp;common_conf, &amp;seaboard_conf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init ventana_pinmux_init(void)</div><div class='add'>+void ventana_pinmux_init(void)</div><div class='ctx'> {</div><div class='del'>-	update_pinmux(ventana_pinmux, ARRAY_SIZE(ventana_pinmux));</div><div class='del'>-	seaboard_common_pinmux_init();</div><div class='add'>+	tegra_board_pinmux_init(&amp;common_conf, &amp;ventana_conf);</div><div class='ctx'> }</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-tegra/board-seaboard.c b/arch/arm/mach-tegra/board-seaboard.c<br/>index bf13ea355efc..ebac65f52510 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-seaboard.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-seaboard.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-seaboard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/board-seaboard.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "board.h"</div><div class='ctx'> #include "board-seaboard.h"</div><div class='hunk'>@@ -171,11 +172,11 @@ static struct wm8903_platform_data wm8903_pdata = {</div><div class='ctx'> 	.micdet_delay = 100,</div><div class='ctx'> 	.gpio_base = SEABOARD_GPIO_WM8903(0),</div><div class='ctx'> 	.gpio_cfg = {</div><div class='del'>-		WM8903_GPIO_NO_CONFIG,</div><div class='del'>-		WM8903_GPIO_NO_CONFIG,</div><div class='ctx'> 		0,</div><div class='del'>-		WM8903_GPIO_NO_CONFIG,</div><div class='del'>-		WM8903_GPIO_NO_CONFIG,</div><div class='add'>+		0,</div><div class='add'>+		WM8903_GPIO_CONFIG_ZERO,</div><div class='add'>+		0,</div><div class='add'>+		0,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -282,26 +283,32 @@ static void __init tegra_wario_init(void)</div><div class='ctx'> MACHINE_START(SEABOARD, "seaboard")</div><div class='ctx'> 	.atag_offset    = 0x100,</div><div class='ctx'> 	.map_io         = tegra_map_common_io,</div><div class='del'>-	.init_early     = tegra_init_early,</div><div class='add'>+	.init_early     = tegra20_init_early,</div><div class='ctx'> 	.init_irq       = tegra_init_irq,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.timer          = &amp;tegra_timer,</div><div class='ctx'> 	.init_machine   = tegra_seaboard_init,</div><div class='add'>+	.restart	= tegra_assert_system_reset,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(KAEN, "kaen")</div><div class='ctx'> 	.atag_offset    = 0x100,</div><div class='ctx'> 	.map_io         = tegra_map_common_io,</div><div class='del'>-	.init_early     = tegra_init_early,</div><div class='add'>+	.init_early     = tegra20_init_early,</div><div class='ctx'> 	.init_irq       = tegra_init_irq,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.timer          = &amp;tegra_timer,</div><div class='ctx'> 	.init_machine   = tegra_kaen_init,</div><div class='add'>+	.restart	= tegra_assert_system_reset,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(WARIO, "wario")</div><div class='ctx'> 	.atag_offset    = 0x100,</div><div class='ctx'> 	.map_io         = tegra_map_common_io,</div><div class='del'>-	.init_early     = tegra_init_early,</div><div class='add'>+	.init_early     = tegra20_init_early,</div><div class='ctx'> 	.init_irq       = tegra_init_irq,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.timer          = &amp;tegra_timer,</div><div class='ctx'> 	.init_machine   = tegra_wario_init,</div><div class='add'>+	.restart	= tegra_assert_system_reset,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-tegra/board-trimslice-pinmux.c b/arch/arm/mach-tegra/board-trimslice-pinmux.c<br/>index 7ab719d46da0..a21a2be57cb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-trimslice-pinmux.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-trimslice-pinmux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-trimslice-pinmux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/board-trimslice-pinmux.c</a></div><div class='hunk'>@@ -19,12 +19,13 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/pinmux.h&gt;</div><div class='add'>+#include &lt;mach/pinmux-tegra20.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "gpio-names.h"</div><div class='add'>+#include "board-pinmux.h"</div><div class='ctx'> #include "board-trimslice.h"</div><div class='del'>-#include "devices.h"</div><div class='ctx'> </div><div class='del'>-static __initdata struct tegra_pingroup_config trimslice_pinmux[] = {</div><div class='add'>+static struct tegra_pingroup_config trimslice_pinmux[] = {</div><div class='ctx'> 	{TEGRA_PINGROUP_ATA,   TEGRA_MUX_IDE,           TEGRA_PUPD_NORMAL,	TEGRA_TRI_TRISTATE},</div><div class='ctx'> 	{TEGRA_PINGROUP_ATB,   TEGRA_MUX_SDIO4,         TEGRA_PUPD_NORMAL,	TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_ATC,   TEGRA_MUX_NAND,          TEGRA_PUPD_NORMAL,	TEGRA_TRI_TRISTATE},</div><div class='hunk'>@@ -105,7 +106,7 @@ static __initdata struct tegra_pingroup_config trimslice_pinmux[] = {</div><div class='ctx'> 	{TEGRA_PINGROUP_LVS,   TEGRA_MUX_DISPLAYA,      TEGRA_PUPD_PULL_UP,     TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_OWC,   TEGRA_MUX_RSVD2,         TEGRA_PUPD_PULL_UP,     TEGRA_TRI_TRISTATE},</div><div class='ctx'> 	{TEGRA_PINGROUP_PMC,   TEGRA_MUX_PWR_ON,        TEGRA_PUPD_NORMAL,      TEGRA_TRI_TRISTATE},</div><div class='del'>-	{TEGRA_PINGROUP_PTA,   TEGRA_MUX_RSVD3,         TEGRA_PUPD_NORMAL,      TEGRA_TRI_TRISTATE},</div><div class='add'>+	{TEGRA_PINGROUP_PTA,   TEGRA_MUX_GMI,           TEGRA_PUPD_NORMAL,      TEGRA_TRI_TRISTATE},</div><div class='ctx'> 	{TEGRA_PINGROUP_RM,    TEGRA_MUX_I2C,           TEGRA_PUPD_PULL_UP,     TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_SDB,   TEGRA_MUX_PWM,           TEGRA_PUPD_NORMAL,      TEGRA_TRI_NORMAL},</div><div class='ctx'> 	{TEGRA_PINGROUP_SDC,   TEGRA_MUX_PWM,           TEGRA_PUPD_PULL_UP,     TEGRA_TRI_NORMAL},</div><div class='hunk'>@@ -143,11 +144,6 @@ static __initdata struct tegra_pingroup_config trimslice_pinmux[] = {</div><div class='ctx'> 	{TEGRA_PINGROUP_XM2D,  TEGRA_MUX_NONE,          TEGRA_PUPD_NORMAL,      TEGRA_TRI_NORMAL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device *pinmux_devices[] = {</div><div class='del'>-	&amp;tegra_gpio_device,</div><div class='del'>-	&amp;tegra_pinmux_device,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct tegra_gpio_table gpio_table[] = {</div><div class='ctx'> 	{ .gpio = TRIMSLICE_GPIO_SD4_CD, .enable = true	}, /* mmc4 cd */</div><div class='ctx'> 	{ .gpio = TRIMSLICE_GPIO_SD4_WP, .enable = true	}, /* mmc4 wp */</div><div class='hunk'>@@ -156,11 +152,14 @@ static struct tegra_gpio_table gpio_table[] = {</div><div class='ctx'> 	{ .gpio = TRIMSLICE_GPIO_USB2_RST,  .enable = true }, /* USB2 PHY rst */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init trimslice_pinmux_init(void)</div><div class='add'>+static struct tegra_board_pinmux_conf conf = {</div><div class='add'>+	.pgs = trimslice_pinmux,</div><div class='add'>+	.pg_count = ARRAY_SIZE(trimslice_pinmux),</div><div class='add'>+	.gpios = gpio_table,</div><div class='add'>+	.gpio_count = ARRAY_SIZE(gpio_table),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void trimslice_pinmux_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (!of_machine_is_compatible("nvidia,tegra20"))</div><div class='del'>-		platform_add_devices(pinmux_devices,</div><div class='del'>-					ARRAY_SIZE(pinmux_devices));</div><div class='del'>-	tegra_pinmux_config_table(trimslice_pinmux, ARRAY_SIZE(trimslice_pinmux));</div><div class='del'>-	tegra_gpio_config(gpio_table, ARRAY_SIZE(gpio_table));</div><div class='add'>+	tegra_board_pinmux_init(&amp;conf, NULL);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c<br/>index 1a6617b7806f..cd52820a3e37 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-trimslice.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board-trimslice.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board-trimslice.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/board-trimslice.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -174,8 +175,10 @@ MACHINE_START(TRIMSLICE, "trimslice")</div><div class='ctx'> 	.atag_offset	= 0x100,</div><div class='ctx'> 	.fixup		= tegra_trimslice_fixup,</div><div class='ctx'> 	.map_io         = tegra_map_common_io,</div><div class='del'>-	.init_early	= tegra_init_early,</div><div class='add'>+	.init_early	= tegra20_init_early,</div><div class='ctx'> 	.init_irq       = tegra_init_irq,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.timer          = &amp;tegra_timer,</div><div class='ctx'> 	.init_machine   = tegra_trimslice_init,</div><div class='add'>+	.restart	= tegra_assert_system_reset,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h<br/>index 1d14df7eb7de..75d1543d77c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/board.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/board.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/board.h</a></div><div class='hunk'>@@ -25,10 +25,11 @@</div><div class='ctx'> </div><div class='ctx'> void tegra_assert_system_reset(char mode, const char *cmd);</div><div class='ctx'> </div><div class='del'>-void __init tegra_init_early(void);</div><div class='add'>+void __init tegra20_init_early(void);</div><div class='add'>+void __init tegra30_init_early(void);</div><div class='ctx'> void __init tegra_map_common_io(void);</div><div class='ctx'> void __init tegra_init_irq(void);</div><div class='del'>-void __init tegra_init_clock(void);</div><div class='add'>+void __init tegra_dt_init_irq(void);</div><div class='ctx'> int __init tegra_pcie_init(bool init_port0, bool init_port1);</div><div class='ctx'> </div><div class='ctx'> extern struct sys_timer tegra_timer;</div><div class='head'>diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c<br/>index f8d41ffc0ca9..8337068a4abe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/clock.c</a></div><div class='hunk'>@@ -387,35 +387,18 @@ EXPORT_SYMBOL(tegra_clk_init_from_table);</div><div class='ctx'> </div><div class='ctx'> void tegra_periph_reset_deassert(struct clk *c)</div><div class='ctx'> {</div><div class='del'>-	tegra2_periph_reset_deassert(c);</div><div class='add'>+	BUG_ON(!c-&gt;ops-&gt;reset);</div><div class='add'>+	c-&gt;ops-&gt;reset(c, false);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(tegra_periph_reset_deassert);</div><div class='ctx'> </div><div class='ctx'> void tegra_periph_reset_assert(struct clk *c)</div><div class='ctx'> {</div><div class='del'>-	tegra2_periph_reset_assert(c);</div><div class='add'>+	BUG_ON(!c-&gt;ops-&gt;reset);</div><div class='add'>+	c-&gt;ops-&gt;reset(c, true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(tegra_periph_reset_assert);</div><div class='ctx'> </div><div class='del'>-void __init tegra_init_clock(void)</div><div class='del'>-{</div><div class='del'>-	tegra2_init_clocks();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The SDMMC controllers have extra bits in the clock source register that</div><div class='del'>- * adjust the delay between the clock and data to compenstate for delays</div><div class='del'>- * on the PCB.</div><div class='del'>- */</div><div class='del'>-void tegra_sdmmc_tap_delay(struct clk *c, int delay)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;c-&gt;spinlock, flags);</div><div class='del'>-	tegra2_sdmmc_tap_delay(c, delay);</div><div class='del'>-	spin_unlock_irqrestore(&amp;c-&gt;spinlock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='ctx'> </div><div class='ctx'> static int __clk_lock_all_spinlocks(void)</div><div class='head'>diff --git a/arch/arm/mach-tegra/clock.h b/arch/arm/mach-tegra/clock.h<br/>index 688316abc64e..5c44106616c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/clock.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/clock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/clock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/clock.h</a></div><div class='hunk'>@@ -146,15 +146,11 @@ struct tegra_clk_init_table {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void tegra2_init_clocks(void);</div><div class='del'>-void tegra2_periph_reset_deassert(struct clk *c);</div><div class='del'>-void tegra2_periph_reset_assert(struct clk *c);</div><div class='ctx'> void clk_init(struct clk *clk);</div><div class='ctx'> struct clk *tegra_get_clock_by_name(const char *name);</div><div class='del'>-unsigned long clk_measure_input_freq(void);</div><div class='ctx'> int clk_reparent(struct clk *c, struct clk *parent);</div><div class='ctx'> void tegra_clk_init_from_table(struct tegra_clk_init_table *table);</div><div class='ctx'> unsigned long clk_get_rate_locked(struct clk *c);</div><div class='ctx'> int clk_set_rate_locked(struct clk *c, unsigned long rate);</div><div class='del'>-void tegra2_sdmmc_tap_delay(struct clk *c, int delay);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c<br/>index 690b888be506..a2eb90169aed 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/common.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * arch/arm/mach-tegra/board-harmony.c</div><div class='add'>+ * arch/arm/mach-tegra/common.c</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2010 Google, Inc.</div><div class='ctx'>  *</div><div class='hunk'>@@ -21,8 +21,10 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/cache-l2x0.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/iomap.h&gt;</div><div class='ctx'> #include &lt;mach/system.h&gt;</div><div class='hunk'>@@ -31,20 +33,31 @@</div><div class='ctx'> #include "clock.h"</div><div class='ctx'> #include "fuse.h"</div><div class='ctx'> </div><div class='del'>-void (*arch_reset)(char mode, const char *cmd) = tegra_assert_system_reset;</div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+static const struct of_device_id tegra_dt_irq_match[] __initconst = {</div><div class='add'>+	{ .compatible = "arm,cortex-a9-gic", .data = gic_of_init },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init tegra_dt_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	tegra_init_irq();</div><div class='add'>+	of_irq_init(tegra_dt_irq_match);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> void tegra_assert_system_reset(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *reset = IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x04);</div><div class='add'>+	void __iomem *reset = IO_ADDRESS(TEGRA_PMC_BASE + 0);</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='del'>-	/* use *_related to avoid spinlock since caches are off */</div><div class='ctx'> 	reg = readl_relaxed(reset);</div><div class='del'>-	reg |= 0x04;</div><div class='add'>+	reg |= 0x10;</div><div class='ctx'> 	writel_relaxed(reg, reset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __initdata struct tegra_clk_init_table common_clk_init_table[] = {</div><div class='add'>+#ifdef CONFIG_ARCH_TEGRA_2x_SOC</div><div class='add'>+static __initdata struct tegra_clk_init_table tegra20_clk_init_table[] = {</div><div class='ctx'> 	/* name		parent		rate		enabled */</div><div class='ctx'> 	{ "clk_m",	NULL,		0,		true },</div><div class='ctx'> 	{ "pll_p",	"clk_m",	216000000,	true },</div><div class='hunk'>@@ -60,24 +73,38 @@ static __initdata struct tegra_clk_init_table common_clk_init_table[] = {</div><div class='ctx'> 	{ "cpu",	NULL,		0,		true },</div><div class='ctx'> 	{ NULL,		NULL,		0,		0},</div><div class='ctx'> };</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-static void __init tegra_init_cache(void)</div><div class='add'>+static void __init tegra_init_cache(u32 tag_latency, u32 data_latency)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_CACHE_L2X0</div><div class='ctx'> 	void __iomem *p = IO_ADDRESS(TEGRA_ARM_PERIF_BASE) + 0x3000;</div><div class='add'>+	u32 aux_ctrl, cache_type;</div><div class='ctx'> </div><div class='del'>-	writel_relaxed(0x331, p + L2X0_TAG_LATENCY_CTRL);</div><div class='del'>-	writel_relaxed(0x441, p + L2X0_DATA_LATENCY_CTRL);</div><div class='add'>+	writel_relaxed(tag_latency, p + L2X0_TAG_LATENCY_CTRL);</div><div class='add'>+	writel_relaxed(data_latency, p + L2X0_DATA_LATENCY_CTRL);</div><div class='ctx'> </div><div class='del'>-	l2x0_init(p, 0x6C080001, 0x8200c3fe);</div><div class='add'>+	cache_type = readl(p + L2X0_CACHE_TYPE);</div><div class='add'>+	aux_ctrl = (cache_type &amp; 0x700) &lt;&lt; (17-8);</div><div class='add'>+	aux_ctrl |= 0x6C000001;</div><div class='add'>+</div><div class='add'>+	l2x0_init(p, aux_ctrl, 0x8200c3fe);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init tegra_init_early(void)</div><div class='add'>+#ifdef CONFIG_ARCH_TEGRA_2x_SOC</div><div class='add'>+void __init tegra20_init_early(void)</div><div class='ctx'> {</div><div class='ctx'> 	tegra_init_fuse();</div><div class='del'>-	tegra_init_clock();</div><div class='del'>-	tegra_clk_init_from_table(common_clk_init_table);</div><div class='del'>-	tegra_init_cache();</div><div class='add'>+	tegra2_init_clocks();</div><div class='add'>+	tegra_clk_init_from_table(tegra20_clk_init_table);</div><div class='add'>+	tegra_init_cache(0x331, 0x441);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_ARCH_TEGRA_3x_SOC</div><div class='add'>+void __init tegra30_init_early(void)</div><div class='add'>+{</div><div class='add'>+	tegra_init_cache(0x441, 0x551);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-tegra/include/mach/clk.h b/arch/arm/mach-tegra/include/mach/clk.h<br/>index c8baf8f80d23..fc3ecb66de08 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/include/mach/clk.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/include/mach/clk.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/include/mach/clk.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/include/mach/clk.h</a></div><div class='hunk'>@@ -26,6 +26,6 @@ void tegra_periph_reset_deassert(struct clk *c);</div><div class='ctx'> void tegra_periph_reset_assert(struct clk *c);</div><div class='ctx'> </div><div class='ctx'> unsigned long clk_get_rate_all_locked(struct clk *c);</div><div class='del'>-void tegra_sdmmc_tap_delay(struct clk *c, int delay);</div><div class='add'>+void tegra2_sdmmc_tap_delay(struct clk *c, int delay);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-tegra/include/mach/entry-macro.S b/arch/arm/mach-tegra/include/mach/entry-macro.S<br/>index dd165c53889d..e577cfe27e72 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -12,45 +12,9 @@</div><div class='ctx'>  * GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;mach/iomap.h&gt;</div><div class='del'>-#include &lt;mach/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_ARM_GIC)</div><div class='del'>-#define HAVE_GET_IRQNR_PREAMBLE</div><div class='del'>-#include &lt;asm/hardware/entry-macro-gic.S&gt;</div><div class='del'>-</div><div class='del'>-	/* Uses the GIC interrupt controller built into the cpu */</div><div class='del'>-#define ICTRL_BASE (IO_CPU_VIRT + 0x100)</div><div class='del'>-</div><div class='del'>-	.macro	disable_fiq</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro	get_irqnr_preamble, base, tmp</div><div class='del'>-	movw \base, #(ICTRL_BASE &amp; 0x0000ffff)</div><div class='del'>-	movt \base, #((ICTRL_BASE &amp; 0xffff0000) &gt;&gt; 16)</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro  arch_ret_to_user, tmp1, tmp2</div><div class='del'>-	.endm</div><div class='del'>-#else</div><div class='del'>-	/* legacy interrupt controller for AP16 */</div><div class='ctx'> 	.macro	disable_fiq</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro	get_irqnr_preamble, base, tmp</div><div class='del'>-	@ enable imprecise aborts</div><div class='del'>-	cpsie	a</div><div class='del'>-	@ EVP base at 0xf010f000</div><div class='del'>-	mov \base, #0xf0000000</div><div class='del'>-	orr \base, #0x00100000</div><div class='del'>-	orr \base, #0x0000f000</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='ctx'> 	.macro	arch_ret_to_user, tmp1, tmp2</div><div class='ctx'> 	.endm</div><div class='del'>-</div><div class='del'>-	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-	ldr \irqnr, [\base, #0x20]	@ EVT_IRQ_STS</div><div class='del'>-	cmp \irqnr, #0x80</div><div class='del'>-	.endm</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-tegra/include/mach/io.h b/arch/arm/mach-tegra/include/mach/io.h<br/>index 35a011fbc42d..f15defffb5d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/include/mach/io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/include/mach/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/include/mach/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/include/mach/io.h</a></div><div class='hunk'>@@ -71,12 +71,6 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLER__</div><div class='ctx'> </div><div class='del'>-#define __arch_ioremap		tegra_ioremap</div><div class='del'>-#define __arch_iounmap		tegra_iounmap</div><div class='del'>-</div><div class='del'>-void __iomem *tegra_ioremap(unsigned long phys, size_t size, unsigned int type);</div><div class='del'>-void tegra_iounmap(volatile void __iomem *addr);</div><div class='del'>-</div><div class='ctx'> #define IO_ADDRESS(n) (IO_TO_VIRT(n))</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TEGRA_PCI</div><div class='head'>diff --git a/arch/arm/mach-tegra/include/mach/irqs.h b/arch/arm/mach-tegra/include/mach/irqs.h<br/>index 73265af4dda3..a2146cd6867d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/include/mach/irqs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/include/mach/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/include/mach/irqs.h</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> </div><div class='ctx'> #define IRQ_LOCALTIMER                  29</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARCH_TEGRA_2x_SOC</div><div class='ctx'> /* Primary Interrupt Controller */</div><div class='ctx'> #define INT_PRI_BASE			(INT_GIC_BASE + 32)</div><div class='ctx'> #define INT_TMR1			(INT_PRI_BASE + 0)</div><div class='hunk'>@@ -178,6 +177,5 @@</div><div class='ctx'> #define NR_BOARD_IRQS			32</div><div class='ctx'> </div><div class='ctx'> #define NR_IRQS				(INT_BOARD_BASE + NR_BOARD_IRQS)</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-tegra/include/mach/kbc.h b/arch/arm/mach-tegra/include/mach/kbc.h<br/>index 4f3572a1c684..20bb0545f992 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/include/mach/kbc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/include/mach/kbc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/include/mach/kbc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/include/mach/kbc.h</a></div><div class='hunk'>@@ -53,6 +53,7 @@ struct tegra_kbc_platform_data {</div><div class='ctx'> 	struct tegra_kbc_pin_cfg pin_cfg[KBC_MAX_GPIO];</div><div class='ctx'> 	const struct matrix_keymap_data *keymap_data;</div><div class='ctx'> </div><div class='add'>+	u32 wakeup_key;</div><div class='ctx'> 	bool wakeup;</div><div class='ctx'> 	bool use_fn_map;</div><div class='ctx'> 	bool use_ghost_filter;</div><div class='head'>diff --git a/arch/arm/mach-tegra/include/mach/pinmux-t2.h b/arch/arm/mach-tegra/include/mach/pinmux-tegra20.h<br/>index 4c2626347263..6a40c1dbab17 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/include/mach/pinmux-t2.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/include/mach/pinmux-t2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/include/mach/pinmux-tegra20.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/include/mach/pinmux-tegra20.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/arch/arm/mach-tegra/include/mach/pinmux-t2.h</div><div class='add'>+ * linux/arch/arm/mach-tegra/include/mach/pinmux-tegra20.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2010 Google, Inc.</div><div class='ctx'>  *</div><div class='hunk'>@@ -14,8 +14,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifndef __MACH_TEGRA_PINMUX_T2_H</div><div class='del'>-#define __MACH_TEGRA_PINMUX_T2_H</div><div class='add'>+#ifndef __MACH_TEGRA_PINMUX_TEGRA20_H</div><div class='add'>+#define __MACH_TEGRA_PINMUX_TEGRA20_H</div><div class='ctx'> </div><div class='ctx'> enum tegra_pingroup {</div><div class='ctx'> 	TEGRA_PINGROUP_ATA = 0,</div><div class='head'>diff --git a/arch/arm/mach-tegra/include/mach/pinmux-tegra30.h b/arch/arm/mach-tegra/include/mach/pinmux-tegra30.h<br/>new file mode 100644<br/>index 000000000000..c1aee3eb2df1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/include/mach/pinmux-tegra30.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/include/mach/pinmux-tegra30.h</a></div><div class='hunk'>@@ -0,0 +1,320 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-tegra/include/mach/pinmux-tegra30.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2010 Google, Inc.</div><div class='add'>+ * Copyright (C) 2010,2011 Nvidia, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MACH_TEGRA_PINMUX_TEGRA30_H</div><div class='add'>+#define __MACH_TEGRA_PINMUX_TEGRA30_H</div><div class='add'>+</div><div class='add'>+enum tegra_pingroup {</div><div class='add'>+	TEGRA_PINGROUP_ULPI_DATA0 = 0,</div><div class='add'>+	TEGRA_PINGROUP_ULPI_DATA1,</div><div class='add'>+	TEGRA_PINGROUP_ULPI_DATA2,</div><div class='add'>+	TEGRA_PINGROUP_ULPI_DATA3,</div><div class='add'>+	TEGRA_PINGROUP_ULPI_DATA4,</div><div class='add'>+	TEGRA_PINGROUP_ULPI_DATA5,</div><div class='add'>+	TEGRA_PINGROUP_ULPI_DATA6,</div><div class='add'>+	TEGRA_PINGROUP_ULPI_DATA7,</div><div class='add'>+	TEGRA_PINGROUP_ULPI_CLK,</div><div class='add'>+	TEGRA_PINGROUP_ULPI_DIR,</div><div class='add'>+	TEGRA_PINGROUP_ULPI_NXT,</div><div class='add'>+	TEGRA_PINGROUP_ULPI_STP,</div><div class='add'>+	TEGRA_PINGROUP_DAP3_FS,</div><div class='add'>+	TEGRA_PINGROUP_DAP3_DIN,</div><div class='add'>+	TEGRA_PINGROUP_DAP3_DOUT,</div><div class='add'>+	TEGRA_PINGROUP_DAP3_SCLK,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PV0,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PV1,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC1_CLK,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC1_CMD,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC1_DAT3,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC1_DAT2,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC1_DAT1,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC1_DAT0,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PV2,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PV3,</div><div class='add'>+	TEGRA_PINGROUP_CLK2_OUT,</div><div class='add'>+	TEGRA_PINGROUP_CLK2_REQ,</div><div class='add'>+	TEGRA_PINGROUP_LCD_PWR1,</div><div class='add'>+	TEGRA_PINGROUP_LCD_PWR2,</div><div class='add'>+	TEGRA_PINGROUP_LCD_SDIN,</div><div class='add'>+	TEGRA_PINGROUP_LCD_SDOUT,</div><div class='add'>+	TEGRA_PINGROUP_LCD_WR_N,</div><div class='add'>+	TEGRA_PINGROUP_LCD_CS0_N,</div><div class='add'>+	TEGRA_PINGROUP_LCD_DC0,</div><div class='add'>+	TEGRA_PINGROUP_LCD_SCK,</div><div class='add'>+	TEGRA_PINGROUP_LCD_PWR0,</div><div class='add'>+	TEGRA_PINGROUP_LCD_PCLK,</div><div class='add'>+	TEGRA_PINGROUP_LCD_DE,</div><div class='add'>+	TEGRA_PINGROUP_LCD_HSYNC,</div><div class='add'>+	TEGRA_PINGROUP_LCD_VSYNC,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D0,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D1,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D2,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D3,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D4,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D5,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D6,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D7,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D8,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D9,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D10,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D11,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D12,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D13,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D14,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D15,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D16,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D17,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D18,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D19,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D20,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D21,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D22,</div><div class='add'>+	TEGRA_PINGROUP_LCD_D23,</div><div class='add'>+	TEGRA_PINGROUP_LCD_CS1_N,</div><div class='add'>+	TEGRA_PINGROUP_LCD_M1,</div><div class='add'>+	TEGRA_PINGROUP_LCD_DC1,</div><div class='add'>+	TEGRA_PINGROUP_HDMI_INT,</div><div class='add'>+	TEGRA_PINGROUP_DDC_SCL,</div><div class='add'>+	TEGRA_PINGROUP_DDC_SDA,</div><div class='add'>+	TEGRA_PINGROUP_CRT_HSYNC,</div><div class='add'>+	TEGRA_PINGROUP_CRT_VSYNC,</div><div class='add'>+	TEGRA_PINGROUP_VI_D0,</div><div class='add'>+	TEGRA_PINGROUP_VI_D1,</div><div class='add'>+	TEGRA_PINGROUP_VI_D2,</div><div class='add'>+	TEGRA_PINGROUP_VI_D3,</div><div class='add'>+	TEGRA_PINGROUP_VI_D4,</div><div class='add'>+	TEGRA_PINGROUP_VI_D5,</div><div class='add'>+	TEGRA_PINGROUP_VI_D6,</div><div class='add'>+	TEGRA_PINGROUP_VI_D7,</div><div class='add'>+	TEGRA_PINGROUP_VI_D8,</div><div class='add'>+	TEGRA_PINGROUP_VI_D9,</div><div class='add'>+	TEGRA_PINGROUP_VI_D10,</div><div class='add'>+	TEGRA_PINGROUP_VI_D11,</div><div class='add'>+	TEGRA_PINGROUP_VI_PCLK,</div><div class='add'>+	TEGRA_PINGROUP_VI_MCLK,</div><div class='add'>+	TEGRA_PINGROUP_VI_VSYNC,</div><div class='add'>+	TEGRA_PINGROUP_VI_HSYNC,</div><div class='add'>+	TEGRA_PINGROUP_UART2_RXD,</div><div class='add'>+	TEGRA_PINGROUP_UART2_TXD,</div><div class='add'>+	TEGRA_PINGROUP_UART2_RTS_N,</div><div class='add'>+	TEGRA_PINGROUP_UART2_CTS_N,</div><div class='add'>+	TEGRA_PINGROUP_UART3_TXD,</div><div class='add'>+	TEGRA_PINGROUP_UART3_RXD,</div><div class='add'>+	TEGRA_PINGROUP_UART3_CTS_N,</div><div class='add'>+	TEGRA_PINGROUP_UART3_RTS_N,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PU0,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PU1,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PU2,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PU3,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PU4,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PU5,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PU6,</div><div class='add'>+	TEGRA_PINGROUP_GEN1_I2C_SDA,</div><div class='add'>+	TEGRA_PINGROUP_GEN1_I2C_SCL,</div><div class='add'>+	TEGRA_PINGROUP_DAP4_FS,</div><div class='add'>+	TEGRA_PINGROUP_DAP4_DIN,</div><div class='add'>+	TEGRA_PINGROUP_DAP4_DOUT,</div><div class='add'>+	TEGRA_PINGROUP_DAP4_SCLK,</div><div class='add'>+	TEGRA_PINGROUP_CLK3_OUT,</div><div class='add'>+	TEGRA_PINGROUP_CLK3_REQ,</div><div class='add'>+	TEGRA_PINGROUP_GMI_WP_N,</div><div class='add'>+	TEGRA_PINGROUP_GMI_IORDY,</div><div class='add'>+	TEGRA_PINGROUP_GMI_WAIT,</div><div class='add'>+	TEGRA_PINGROUP_GMI_ADV_N,</div><div class='add'>+	TEGRA_PINGROUP_GMI_CLK,</div><div class='add'>+	TEGRA_PINGROUP_GMI_CS0_N,</div><div class='add'>+	TEGRA_PINGROUP_GMI_CS1_N,</div><div class='add'>+	TEGRA_PINGROUP_GMI_CS2_N,</div><div class='add'>+	TEGRA_PINGROUP_GMI_CS3_N,</div><div class='add'>+	TEGRA_PINGROUP_GMI_CS4_N,</div><div class='add'>+	TEGRA_PINGROUP_GMI_CS6_N,</div><div class='add'>+	TEGRA_PINGROUP_GMI_CS7_N,</div><div class='add'>+	TEGRA_PINGROUP_GMI_AD0,</div><div class='add'>+	TEGRA_PINGROUP_GMI_AD1,</div><div class='add'>+	TEGRA_PINGROUP_GMI_AD2,</div><div class='add'>+	TEGRA_PINGROUP_GMI_AD3,</div><div class='add'>+	TEGRA_PINGROUP_GMI_AD4,</div><div class='add'>+	TEGRA_PINGROUP_GMI_AD5,</div><div class='add'>+	TEGRA_PINGROUP_GMI_AD6,</div><div class='add'>+	TEGRA_PINGROUP_GMI_AD7,</div><div class='add'>+	TEGRA_PINGROUP_GMI_AD8,</div><div class='add'>+	TEGRA_PINGROUP_GMI_AD9,</div><div class='add'>+	TEGRA_PINGROUP_GMI_AD10,</div><div class='add'>+	TEGRA_PINGROUP_GMI_AD11,</div><div class='add'>+	TEGRA_PINGROUP_GMI_AD12,</div><div class='add'>+	TEGRA_PINGROUP_GMI_AD13,</div><div class='add'>+	TEGRA_PINGROUP_GMI_AD14,</div><div class='add'>+	TEGRA_PINGROUP_GMI_AD15,</div><div class='add'>+	TEGRA_PINGROUP_GMI_A16,</div><div class='add'>+	TEGRA_PINGROUP_GMI_A17,</div><div class='add'>+	TEGRA_PINGROUP_GMI_A18,</div><div class='add'>+	TEGRA_PINGROUP_GMI_A19,</div><div class='add'>+	TEGRA_PINGROUP_GMI_WR_N,</div><div class='add'>+	TEGRA_PINGROUP_GMI_OE_N,</div><div class='add'>+	TEGRA_PINGROUP_GMI_DQS,</div><div class='add'>+	TEGRA_PINGROUP_GMI_RST_N,</div><div class='add'>+	TEGRA_PINGROUP_GEN2_I2C_SCL,</div><div class='add'>+	TEGRA_PINGROUP_GEN2_I2C_SDA,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC4_CLK,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC4_CMD,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC4_DAT0,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC4_DAT1,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC4_DAT2,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC4_DAT3,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC4_DAT4,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC4_DAT5,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC4_DAT6,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC4_DAT7,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC4_RST_N,</div><div class='add'>+	TEGRA_PINGROUP_CAM_MCLK,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PCC1,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PBB0,</div><div class='add'>+	TEGRA_PINGROUP_CAM_I2C_SCL,</div><div class='add'>+	TEGRA_PINGROUP_CAM_I2C_SDA,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PBB3,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PBB4,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PBB5,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PBB6,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PBB7,</div><div class='add'>+	TEGRA_PINGROUP_GPIO_PCC2,</div><div class='add'>+	TEGRA_PINGROUP_JTAG_RTCK,</div><div class='add'>+	TEGRA_PINGROUP_PWR_I2C_SCL,</div><div class='add'>+	TEGRA_PINGROUP_PWR_I2C_SDA,</div><div class='add'>+	TEGRA_PINGROUP_KB_ROW0,</div><div class='add'>+	TEGRA_PINGROUP_KB_ROW1,</div><div class='add'>+	TEGRA_PINGROUP_KB_ROW2,</div><div class='add'>+	TEGRA_PINGROUP_KB_ROW3,</div><div class='add'>+	TEGRA_PINGROUP_KB_ROW4,</div><div class='add'>+	TEGRA_PINGROUP_KB_ROW5,</div><div class='add'>+	TEGRA_PINGROUP_KB_ROW6,</div><div class='add'>+	TEGRA_PINGROUP_KB_ROW7,</div><div class='add'>+	TEGRA_PINGROUP_KB_ROW8,</div><div class='add'>+	TEGRA_PINGROUP_KB_ROW9,</div><div class='add'>+	TEGRA_PINGROUP_KB_ROW10,</div><div class='add'>+	TEGRA_PINGROUP_KB_ROW11,</div><div class='add'>+	TEGRA_PINGROUP_KB_ROW12,</div><div class='add'>+	TEGRA_PINGROUP_KB_ROW13,</div><div class='add'>+	TEGRA_PINGROUP_KB_ROW14,</div><div class='add'>+	TEGRA_PINGROUP_KB_ROW15,</div><div class='add'>+	TEGRA_PINGROUP_KB_COL0,</div><div class='add'>+	TEGRA_PINGROUP_KB_COL1,</div><div class='add'>+	TEGRA_PINGROUP_KB_COL2,</div><div class='add'>+	TEGRA_PINGROUP_KB_COL3,</div><div class='add'>+	TEGRA_PINGROUP_KB_COL4,</div><div class='add'>+	TEGRA_PINGROUP_KB_COL5,</div><div class='add'>+	TEGRA_PINGROUP_KB_COL6,</div><div class='add'>+	TEGRA_PINGROUP_KB_COL7,</div><div class='add'>+	TEGRA_PINGROUP_CLK_32K_OUT,</div><div class='add'>+	TEGRA_PINGROUP_SYS_CLK_REQ,</div><div class='add'>+	TEGRA_PINGROUP_CORE_PWR_REQ,</div><div class='add'>+	TEGRA_PINGROUP_CPU_PWR_REQ,</div><div class='add'>+	TEGRA_PINGROUP_PWR_INT_N,</div><div class='add'>+	TEGRA_PINGROUP_CLK_32K_IN,</div><div class='add'>+	TEGRA_PINGROUP_OWR,</div><div class='add'>+	TEGRA_PINGROUP_DAP1_FS,</div><div class='add'>+	TEGRA_PINGROUP_DAP1_DIN,</div><div class='add'>+	TEGRA_PINGROUP_DAP1_DOUT,</div><div class='add'>+	TEGRA_PINGROUP_DAP1_SCLK,</div><div class='add'>+	TEGRA_PINGROUP_CLK1_REQ,</div><div class='add'>+	TEGRA_PINGROUP_CLK1_OUT,</div><div class='add'>+	TEGRA_PINGROUP_SPDIF_IN,</div><div class='add'>+	TEGRA_PINGROUP_SPDIF_OUT,</div><div class='add'>+	TEGRA_PINGROUP_DAP2_FS,</div><div class='add'>+	TEGRA_PINGROUP_DAP2_DIN,</div><div class='add'>+	TEGRA_PINGROUP_DAP2_DOUT,</div><div class='add'>+	TEGRA_PINGROUP_DAP2_SCLK,</div><div class='add'>+	TEGRA_PINGROUP_SPI2_MOSI,</div><div class='add'>+	TEGRA_PINGROUP_SPI2_MISO,</div><div class='add'>+	TEGRA_PINGROUP_SPI2_CS0_N,</div><div class='add'>+	TEGRA_PINGROUP_SPI2_SCK,</div><div class='add'>+	TEGRA_PINGROUP_SPI1_MOSI,</div><div class='add'>+	TEGRA_PINGROUP_SPI1_SCK,</div><div class='add'>+	TEGRA_PINGROUP_SPI1_CS0_N,</div><div class='add'>+	TEGRA_PINGROUP_SPI1_MISO,</div><div class='add'>+	TEGRA_PINGROUP_SPI2_CS1_N,</div><div class='add'>+	TEGRA_PINGROUP_SPI2_CS2_N,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC3_CLK,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC3_CMD,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC3_DAT0,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC3_DAT1,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC3_DAT2,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC3_DAT3,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC3_DAT4,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC3_DAT5,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC3_DAT6,</div><div class='add'>+	TEGRA_PINGROUP_SDMMC3_DAT7,</div><div class='add'>+	TEGRA_PINGROUP_PEX_L0_PRSNT_N,</div><div class='add'>+	TEGRA_PINGROUP_PEX_L0_RST_N,</div><div class='add'>+	TEGRA_PINGROUP_PEX_L0_CLKREQ_N,</div><div class='add'>+	TEGRA_PINGROUP_PEX_WAKE_N,</div><div class='add'>+	TEGRA_PINGROUP_PEX_L1_PRSNT_N,</div><div class='add'>+	TEGRA_PINGROUP_PEX_L1_RST_N,</div><div class='add'>+	TEGRA_PINGROUP_PEX_L1_CLKREQ_N,</div><div class='add'>+	TEGRA_PINGROUP_PEX_L2_PRSNT_N,</div><div class='add'>+	TEGRA_PINGROUP_PEX_L2_RST_N,</div><div class='add'>+	TEGRA_PINGROUP_PEX_L2_CLKREQ_N,</div><div class='add'>+	TEGRA_PINGROUP_HDMI_CEC,</div><div class='add'>+	TEGRA_MAX_PINGROUP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tegra_drive_pingroup {</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_AO1 = 0,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_AO2,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_AT1,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_AT2,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_AT3,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_AT4,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_AT5,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_CDEV1,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_CDEV2,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_CSUS,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_DAP1,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_DAP2,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_DAP3,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_DAP4,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_DBG,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_LCD1,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_LCD2,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_SDIO2,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_SDIO3,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_SPI,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_UAA,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_UAB,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_UART2,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_UART3,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_VI1,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_SDIO1,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_CRT,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_DDC,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_GMA,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_GMB,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_GMC,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_GMD,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_GME,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_GMF,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_GMG,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_GMH,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_OWR,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_UAD,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_GPV,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_DEV3,</div><div class='add'>+	TEGRA_DRIVE_PINGROUP_CEC,</div><div class='add'>+	TEGRA_MAX_DRIVE_PINGROUP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-tegra/include/mach/pinmux.h b/arch/arm/mach-tegra/include/mach/pinmux.h<br/>index bb7dfdb61205..055f1792c8ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/include/mach/pinmux.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/include/mach/pinmux.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/include/mach/pinmux.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/include/mach/pinmux.h</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>  * linux/arch/arm/mach-tegra/include/mach/pinmux.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2010 Google, Inc.</div><div class='add'>+ * Copyright (C) 2010,2011 Nvidia, Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2, as published by the Free Software Foundation, and</div><div class='hunk'>@@ -17,18 +18,13 @@</div><div class='ctx'> #ifndef __MACH_TEGRA_PINMUX_H</div><div class='ctx'> #define __MACH_TEGRA_PINMUX_H</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_ARCH_TEGRA_2x_SOC)</div><div class='del'>-#include "pinmux-t2.h"</div><div class='del'>-#else</div><div class='del'>-#error "Undefined Tegra architecture"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> enum tegra_mux_func {</div><div class='ctx'> 	TEGRA_MUX_RSVD = 0x8000,</div><div class='ctx'> 	TEGRA_MUX_RSVD1 = 0x8000,</div><div class='ctx'> 	TEGRA_MUX_RSVD2 = 0x8001,</div><div class='ctx'> 	TEGRA_MUX_RSVD3 = 0x8002,</div><div class='ctx'> 	TEGRA_MUX_RSVD4 = 0x8003,</div><div class='add'>+	TEGRA_MUX_INVALID = 0x4000,</div><div class='ctx'> 	TEGRA_MUX_NONE = -1,</div><div class='ctx'> 	TEGRA_MUX_AHB_CLK,</div><div class='ctx'> 	TEGRA_MUX_APB_CLK,</div><div class='hunk'>@@ -90,6 +86,49 @@ enum tegra_mux_func {</div><div class='ctx'> 	TEGRA_MUX_VI,</div><div class='ctx'> 	TEGRA_MUX_VI_SENSOR_CLK,</div><div class='ctx'> 	TEGRA_MUX_XIO,</div><div class='add'>+	TEGRA_MUX_BLINK,</div><div class='add'>+	TEGRA_MUX_CEC,</div><div class='add'>+	TEGRA_MUX_CLK12,</div><div class='add'>+	TEGRA_MUX_DAP,</div><div class='add'>+	TEGRA_MUX_DAPSDMMC2,</div><div class='add'>+	TEGRA_MUX_DDR,</div><div class='add'>+	TEGRA_MUX_DEV3,</div><div class='add'>+	TEGRA_MUX_DTV,</div><div class='add'>+	TEGRA_MUX_VI_ALT1,</div><div class='add'>+	TEGRA_MUX_VI_ALT2,</div><div class='add'>+	TEGRA_MUX_VI_ALT3,</div><div class='add'>+	TEGRA_MUX_EMC_DLL,</div><div class='add'>+	TEGRA_MUX_EXTPERIPH1,</div><div class='add'>+	TEGRA_MUX_EXTPERIPH2,</div><div class='add'>+	TEGRA_MUX_EXTPERIPH3,</div><div class='add'>+	TEGRA_MUX_GMI_ALT,</div><div class='add'>+	TEGRA_MUX_HDA,</div><div class='add'>+	TEGRA_MUX_HSI,</div><div class='add'>+	TEGRA_MUX_I2C4,</div><div class='add'>+	TEGRA_MUX_I2C5,</div><div class='add'>+	TEGRA_MUX_I2CPWR,</div><div class='add'>+	TEGRA_MUX_I2S0,</div><div class='add'>+	TEGRA_MUX_I2S1,</div><div class='add'>+	TEGRA_MUX_I2S2,</div><div class='add'>+	TEGRA_MUX_I2S3,</div><div class='add'>+	TEGRA_MUX_I2S4,</div><div class='add'>+	TEGRA_MUX_NAND_ALT,</div><div class='add'>+	TEGRA_MUX_POPSDIO4,</div><div class='add'>+	TEGRA_MUX_POPSDMMC4,</div><div class='add'>+	TEGRA_MUX_PWM0,</div><div class='add'>+	TEGRA_MUX_PWM1,</div><div class='add'>+	TEGRA_MUX_PWM2,</div><div class='add'>+	TEGRA_MUX_PWM3,</div><div class='add'>+	TEGRA_MUX_SATA,</div><div class='add'>+	TEGRA_MUX_SPI5,</div><div class='add'>+	TEGRA_MUX_SPI6,</div><div class='add'>+	TEGRA_MUX_SYSCLK,</div><div class='add'>+	TEGRA_MUX_VGP1,</div><div class='add'>+	TEGRA_MUX_VGP2,</div><div class='add'>+	TEGRA_MUX_VGP3,</div><div class='add'>+	TEGRA_MUX_VGP4,</div><div class='add'>+	TEGRA_MUX_VGP5,</div><div class='add'>+	TEGRA_MUX_VGP6,</div><div class='ctx'> 	TEGRA_MUX_SAFE,</div><div class='ctx'> 	TEGRA_MAX_MUX,</div><div class='ctx'> };</div><div class='hunk'>@@ -105,6 +144,11 @@ enum tegra_tristate {</div><div class='ctx'> 	TEGRA_TRI_TRISTATE = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum tegra_pin_io {</div><div class='add'>+	TEGRA_PIN_OUTPUT = 0,</div><div class='add'>+	TEGRA_PIN_INPUT = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum tegra_vddio {</div><div class='ctx'> 	TEGRA_VDDIO_BB = 0,</div><div class='ctx'> 	TEGRA_VDDIO_LCD,</div><div class='hunk'>@@ -115,10 +159,16 @@ enum tegra_vddio {</div><div class='ctx'> 	TEGRA_VDDIO_SYS,</div><div class='ctx'> 	TEGRA_VDDIO_AUDIO,</div><div class='ctx'> 	TEGRA_VDDIO_SD,</div><div class='add'>+	TEGRA_VDDIO_CAM,</div><div class='add'>+	TEGRA_VDDIO_GMI,</div><div class='add'>+	TEGRA_VDDIO_PEXCTL,</div><div class='add'>+	TEGRA_VDDIO_SDMMC1,</div><div class='add'>+	TEGRA_VDDIO_SDMMC3,</div><div class='add'>+	TEGRA_VDDIO_SDMMC4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct tegra_pingroup_config {</div><div class='del'>-	enum tegra_pingroup	pingroup;</div><div class='add'>+	int pingroup;</div><div class='ctx'> 	enum tegra_mux_func	func;</div><div class='ctx'> 	enum tegra_pullupdown	pupd;</div><div class='ctx'> 	enum tegra_tristate	tristate;</div><div class='hunk'>@@ -187,7 +237,7 @@ enum tegra_schmitt {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct tegra_drive_pingroup_config {</div><div class='del'>-	enum tegra_drive_pingroup pingroup;</div><div class='add'>+	int pingroup;</div><div class='ctx'> 	enum tegra_hsm hsm;</div><div class='ctx'> 	enum tegra_schmitt schmitt;</div><div class='ctx'> 	enum tegra_drive drive;</div><div class='hunk'>@@ -208,6 +258,7 @@ struct tegra_pingroup_desc {</div><div class='ctx'> 	int funcs[4];</div><div class='ctx'> 	int func_safe;</div><div class='ctx'> 	int vddio;</div><div class='add'>+	enum tegra_pin_io io_default;</div><div class='ctx'> 	s16 tri_bank;	/* Register bank the tri_reg exists within */</div><div class='ctx'> 	s16 mux_bank;	/* Register bank the mux_reg exists within */</div><div class='ctx'> 	s16 pupd_bank;	/* Register bank the pupd_reg exists within */</div><div class='hunk'>@@ -217,15 +268,23 @@ struct tegra_pingroup_desc {</div><div class='ctx'> 	s8 tri_bit; 	/* offset into the TRISTATE_REG_* register bit */</div><div class='ctx'> 	s8 mux_bit;	/* offset into the PIN_MUX_CTL_* register bit */</div><div class='ctx'> 	s8 pupd_bit;	/* offset into the PULL_UPDOWN_REG_* register bit */</div><div class='add'>+	s8 lock_bit;	/* offset of the LOCK bit into mux register bit */</div><div class='add'>+	s8 od_bit;	/* offset of the OD bit into mux register bit */</div><div class='add'>+	s8 ioreset_bit;	/* offset of the IO_RESET bit into mux register bit */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern const struct tegra_pingroup_desc tegra_soc_pingroups[];</div><div class='del'>-extern const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[];</div><div class='add'>+typedef void (*pinmux_init) (const struct tegra_pingroup_desc **pg,</div><div class='add'>+	int *pg_max, const struct tegra_drive_pingroup_desc **pgdrive,</div><div class='add'>+	int *pgdrive_max);</div><div class='ctx'> </div><div class='del'>-int tegra_pinmux_set_tristate(enum tegra_pingroup pg,</div><div class='del'>-	enum tegra_tristate tristate);</div><div class='del'>-int tegra_pinmux_set_pullupdown(enum tegra_pingroup pg,</div><div class='del'>-	enum tegra_pullupdown pupd);</div><div class='add'>+void tegra20_pinmux_init(const struct tegra_pingroup_desc **pg, int *pg_max,</div><div class='add'>+	const struct tegra_drive_pingroup_desc **pgdrive, int *pgdrive_max);</div><div class='add'>+</div><div class='add'>+void tegra30_pinmux_init(const struct tegra_pingroup_desc **pg, int *pg_max,</div><div class='add'>+	const struct tegra_drive_pingroup_desc **pgdrive, int *pgdrive_max);</div><div class='add'>+</div><div class='add'>+int tegra_pinmux_set_tristate(int pg, enum tegra_tristate tristate);</div><div class='add'>+int tegra_pinmux_set_pullupdown(int pg, enum tegra_pullupdown pupd);</div><div class='ctx'> </div><div class='ctx'> void tegra_pinmux_config_table(const struct tegra_pingroup_config *config,</div><div class='ctx'> 	int len);</div><div class='hunk'>@@ -241,4 +300,3 @@ void tegra_pinmux_config_tristate_table(const struct tegra_pingroup_config *conf</div><div class='ctx'> void tegra_pinmux_config_pullupdown_table(const struct tegra_pingroup_config *config,</div><div class='ctx'> 	int len, enum tegra_pullupdown pupd);</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-tegra/include/mach/system.h b/arch/arm/mach-tegra/include/mach/system.h<br/>index 027c4215d313..a312988bf6f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/include/mach/system.h</a></div><div class='hunk'>@@ -21,10 +21,6 @@</div><div class='ctx'> #ifndef __MACH_TEGRA_SYSTEM_H</div><div class='ctx'> #define __MACH_TEGRA_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/iomap.h&gt;</div><div class='del'>-</div><div class='del'>-extern void (*arch_reset)(char mode, const char *cmd);</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-tegra/io.c b/arch/arm/mach-tegra/io.c<br/>index 5489f8b5d6ad..d23ee2db2827 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/io.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/io.c</a></div><div class='hunk'>@@ -60,24 +60,3 @@ void __init tegra_map_common_io(void)</div><div class='ctx'> {</div><div class='ctx'> 	iotable_init(tegra_io_desc, ARRAY_SIZE(tegra_io_desc));</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Intercept ioremap() requests for addresses in our fixed mapping regions.</div><div class='del'>- */</div><div class='del'>-void __iomem *tegra_ioremap(unsigned long p, size_t size, unsigned int type)</div><div class='del'>-{</div><div class='del'>-	void __iomem *v = IO_ADDRESS(p);</div><div class='del'>-	if (v == NULL)</div><div class='del'>-		v = __arm_ioremap(p, size, type);</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(tegra_ioremap);</div><div class='del'>-</div><div class='del'>-void tegra_iounmap(volatile void __iomem *addr)</div><div class='del'>-{</div><div class='del'>-	unsigned long virt = (unsigned long)addr;</div><div class='del'>-</div><div class='del'>-	if (virt &gt;= VMALLOC_START &amp;&amp; virt &lt; VMALLOC_END)</div><div class='del'>-		__iounmap(addr);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(tegra_iounmap);</div><div class='head'>diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c<br/>index 4956c3cea731..4e1afcd54fae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/irq.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -28,10 +29,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "board.h"</div><div class='ctx'> </div><div class='del'>-#define INT_SYS_NR	(INT_GPIO_BASE - INT_PRI_BASE)</div><div class='del'>-#define INT_SYS_SZ	(INT_SEC_BASE - INT_PRI_BASE)</div><div class='del'>-#define PPI_NR		((INT_SYS_NR+INT_SYS_SZ-1)/INT_SYS_SZ)</div><div class='del'>-</div><div class='ctx'> #define ICTLR_CPU_IEP_VFIQ	0x08</div><div class='ctx'> #define ICTLR_CPU_IEP_FIR	0x14</div><div class='ctx'> #define ICTLR_CPU_IEP_FIR_SET	0x18</div><div class='hunk'>@@ -129,6 +126,11 @@ void __init tegra_init_irq(void)</div><div class='ctx'> 	gic_arch_extn.irq_unmask = tegra_unmask;</div><div class='ctx'> 	gic_arch_extn.irq_retrigger = tegra_retrigger;</div><div class='ctx'> </div><div class='del'>-	gic_init(0, 29, IO_ADDRESS(TEGRA_ARM_INT_DIST_BASE),</div><div class='del'>-		 IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x100));</div><div class='add'>+	/*</div><div class='add'>+	 * Check if there is a devicetree present, since the GIC will be</div><div class='add'>+	 * initialized elsewhere under DT.</div><div class='add'>+	 */</div><div class='add'>+	if (!of_have_populated_dt())</div><div class='add'>+		gic_init(0, 29, IO_ADDRESS(TEGRA_ARM_INT_DIST_BASE),</div><div class='add'>+			IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x100));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-tegra/pcie.c b/arch/arm/mach-tegra/pcie.c<br/>index 97ef3e55dfdf..af8b63435727 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/pcie.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/pcie.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/pcie.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/pinmux.h&gt;</div><div class='ctx'> #include &lt;mach/iomap.h&gt;</div><div class='ctx'> #include &lt;mach/clk.h&gt;</div><div class='ctx'> #include &lt;mach/powergate.h&gt;</div><div class='hunk'>@@ -409,7 +408,7 @@ static int tegra_pcie_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	pp-&gt;res[0].flags = IORESOURCE_IO;</div><div class='ctx'> 	if (request_resource(&amp;ioport_resource, &amp;pp-&gt;res[0]))</div><div class='ctx'> 		panic("Request PCIe IO resource failed\n");</div><div class='del'>-	sys-&gt;resource[0] = &amp;pp-&gt;res[0];</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;pp-&gt;res[0]);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * IORESOURCE_MEM</div><div class='hunk'>@@ -428,7 +427,7 @@ static int tegra_pcie_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	pp-&gt;res[1].flags = IORESOURCE_MEM;</div><div class='ctx'> 	if (request_resource(&amp;iomem_resource, &amp;pp-&gt;res[1]))</div><div class='ctx'> 		panic("Request PCIe Memory resource failed\n");</div><div class='del'>-	sys-&gt;resource[1] = &amp;pp-&gt;res[1];</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;pp-&gt;res[1]);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * IORESOURCE_MEM | IORESOURCE_PREFETCH</div><div class='hunk'>@@ -447,7 +446,7 @@ static int tegra_pcie_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	pp-&gt;res[2].flags = IORESOURCE_MEM | IORESOURCE_PREFETCH;</div><div class='ctx'> 	if (request_resource(&amp;iomem_resource, &amp;pp-&gt;res[2]))</div><div class='ctx'> 		panic("Request PCIe Prefetch Memory resource failed\n");</div><div class='del'>-	sys-&gt;resource[2] = &amp;pp-&gt;res[2];</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;pp-&gt;res[2]);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -468,7 +467,8 @@ static struct pci_bus __init *tegra_pcie_scan_bus(int nr,</div><div class='ctx'> 	pp = tegra_pcie.port + nr;</div><div class='ctx'> 	pp-&gt;root_bus_nr = sys-&gt;busnr;</div><div class='ctx'> </div><div class='del'>-	return pci_scan_bus(sys-&gt;busnr, &amp;tegra_pcie_ops, sys);</div><div class='add'>+	return pci_scan_root_bus(NULL, sys-&gt;busnr, &amp;tegra_pcie_ops, sys,</div><div class='add'>+				 &amp;sys-&gt;resources);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct hw_pci tegra_pcie_hw __initdata = {</div><div class='head'>diff --git a/arch/arm/mach-tegra/pinmux-t2-tables.c b/arch/arm/mach-tegra/pinmux-tegra20-tables.c<br/>index a0dc2bc28ed3..734add1280b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/pinmux-t2-tables.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/pinmux-t2-tables.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/pinmux-tegra20-tables.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/pinmux-tegra20-tables.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/arch/arm/mach-tegra/pinmux-t2-tables.c</div><div class='add'>+ * linux/arch/arm/mach-tegra/pinmux-tegra20-tables.c</div><div class='ctx'>  *</div><div class='del'>- * Common pinmux configurations for Tegra 2 SoCs</div><div class='add'>+ * Common pinmux configurations for Tegra20 SoCs</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2010 NVIDIA Corporation</div><div class='ctx'>  *</div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/iomap.h&gt;</div><div class='ctx'> #include &lt;mach/pinmux.h&gt;</div><div class='add'>+#include &lt;mach/pinmux-tegra20.h&gt;</div><div class='ctx'> #include &lt;mach/suspend.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define TRISTATE_REG_A		0x14</div><div class='hunk'>@@ -43,7 +44,7 @@</div><div class='ctx'> 		.reg = ((r) - PINGROUP_REG_A)			\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE_PINGROUP] = {</div><div class='add'>+static const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE_PINGROUP] = {</div><div class='ctx'> 	DRIVE_PINGROUP(AO1,		0x868),</div><div class='ctx'> 	DRIVE_PINGROUP(AO2,		0x86c),</div><div class='ctx'> 	DRIVE_PINGROUP(AT1,		0x870),</div><div class='hunk'>@@ -105,9 +106,13 @@ const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE</div><div class='ctx'> 		.pupd_bank = 2,				\</div><div class='ctx'> 		.pupd_reg = ((pupd_r) - PULLUPDOWN_REG_A),	\</div><div class='ctx'> 		.pupd_bit = pupd_b,				\</div><div class='add'>+		.lock_bit = -1,					\</div><div class='add'>+		.od_bit = -1,					\</div><div class='add'>+		.ioreset_bit = -1,				\</div><div class='add'>+		.io_default = -1,				\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-const struct tegra_pingroup_desc tegra_soc_pingroups[TEGRA_MAX_PINGROUP] = {</div><div class='add'>+static const struct tegra_pingroup_desc tegra_soc_pingroups[TEGRA_MAX_PINGROUP] = {</div><div class='ctx'> 	PINGROUP(ATA,   NAND,  IDE,       NAND,      GMI,       RSVD,          IDE,       0x14, 0,  0x80, 24, 0xA0, 0),</div><div class='ctx'> 	PINGROUP(ATB,   NAND,  IDE,       NAND,      GMI,       SDIO4,         IDE,       0x14, 1,  0x80, 16, 0xA0, 2),</div><div class='ctx'> 	PINGROUP(ATC,   NAND,  IDE,       NAND,      GMI,       SDIO4,         IDE,       0x14, 2,  0x80, 22, 0xA0, 4),</div><div class='hunk'>@@ -226,3 +231,14 @@ const struct tegra_pingroup_desc tegra_soc_pingroups[TEGRA_MAX_PINGROUP] = {</div><div class='ctx'> 	PINGROUP(XM2C,  DDR,   RSVD,      RSVD,      RSVD,      RSVD,          RSVD,      -1,   -1, -1,   -1, 0xA8, 30),</div><div class='ctx'> 	PINGROUP(XM2D,  DDR,   RSVD,      RSVD,      RSVD,      RSVD,          RSVD,      -1,   -1, -1,   -1, 0xA8, 28),</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+void __devinit tegra20_pinmux_init(const struct tegra_pingroup_desc **pg,</div><div class='add'>+		int *pg_max, const struct tegra_drive_pingroup_desc **pgdrive,</div><div class='add'>+		int *pgdrive_max)</div><div class='add'>+{</div><div class='add'>+	*pg = tegra_soc_pingroups;</div><div class='add'>+	*pg_max = TEGRA_MAX_PINGROUP;</div><div class='add'>+	*pgdrive = tegra_soc_drive_pingroups;</div><div class='add'>+	*pgdrive_max = TEGRA_MAX_DRIVE_PINGROUP;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-tegra/pinmux-tegra30-tables.c b/arch/arm/mach-tegra/pinmux-tegra30-tables.c<br/>new file mode 100644<br/>index 000000000000..14fc0e4c1c44<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/pinmux-tegra30-tables.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/pinmux-tegra30-tables.c</a></div><div class='hunk'>@@ -0,0 +1,376 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-tegra/pinmux-tegra30-tables.c</div><div class='add'>+ *</div><div class='add'>+ * Common pinmux configurations for Tegra30 SoCs</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2010,2011 NVIDIA Corporation</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.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along</div><div class='add'>+ * with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.</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/errno.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/iomap.h&gt;</div><div class='add'>+#include &lt;mach/pinmux.h&gt;</div><div class='add'>+#include &lt;mach/pinmux-tegra30.h&gt;</div><div class='add'>+#include &lt;mach/suspend.h&gt;</div><div class='add'>+</div><div class='add'>+#define PINGROUP_REG_A	0x868</div><div class='add'>+#define MUXCTL_REG_A	0x3000</div><div class='add'>+</div><div class='add'>+#define DRIVE_PINGROUP(pg_name, r)		\</div><div class='add'>+	[TEGRA_DRIVE_PINGROUP_ ## pg_name] = {	\</div><div class='add'>+		.name = #pg_name,		\</div><div class='add'>+		.reg_bank = 0,			\</div><div class='add'>+		.reg = ((r) - PINGROUP_REG_A)	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE_PINGROUP] = {</div><div class='add'>+	DRIVE_PINGROUP(AO1,		0x868),</div><div class='add'>+	DRIVE_PINGROUP(AO2,		0x86c),</div><div class='add'>+	DRIVE_PINGROUP(AT1,		0x870),</div><div class='add'>+	DRIVE_PINGROUP(AT2,		0x874),</div><div class='add'>+	DRIVE_PINGROUP(AT3,		0x878),</div><div class='add'>+	DRIVE_PINGROUP(AT4,		0x87c),</div><div class='add'>+	DRIVE_PINGROUP(AT5,		0x880),</div><div class='add'>+	DRIVE_PINGROUP(CDEV1,		0x884),</div><div class='add'>+	DRIVE_PINGROUP(CDEV2,		0x888),</div><div class='add'>+	DRIVE_PINGROUP(CSUS,		0x88c),</div><div class='add'>+	DRIVE_PINGROUP(DAP1,		0x890),</div><div class='add'>+	DRIVE_PINGROUP(DAP2,		0x894),</div><div class='add'>+	DRIVE_PINGROUP(DAP3,		0x898),</div><div class='add'>+	DRIVE_PINGROUP(DAP4,		0x89c),</div><div class='add'>+	DRIVE_PINGROUP(DBG,		0x8a0),</div><div class='add'>+	DRIVE_PINGROUP(LCD1,		0x8a4),</div><div class='add'>+	DRIVE_PINGROUP(LCD2,		0x8a8),</div><div class='add'>+	DRIVE_PINGROUP(SDIO2,		0x8ac),</div><div class='add'>+	DRIVE_PINGROUP(SDIO3,		0x8b0),</div><div class='add'>+	DRIVE_PINGROUP(SPI,		0x8b4),</div><div class='add'>+	DRIVE_PINGROUP(UAA,		0x8b8),</div><div class='add'>+	DRIVE_PINGROUP(UAB,		0x8bc),</div><div class='add'>+	DRIVE_PINGROUP(UART2,		0x8c0),</div><div class='add'>+	DRIVE_PINGROUP(UART3,		0x8c4),</div><div class='add'>+	DRIVE_PINGROUP(VI1,		0x8c8),</div><div class='add'>+	DRIVE_PINGROUP(SDIO1,		0x8ec),</div><div class='add'>+	DRIVE_PINGROUP(CRT,		0x8f8),</div><div class='add'>+	DRIVE_PINGROUP(DDC,		0x8fc),</div><div class='add'>+	DRIVE_PINGROUP(GMA,		0x900),</div><div class='add'>+	DRIVE_PINGROUP(GMB,		0x904),</div><div class='add'>+	DRIVE_PINGROUP(GMC,		0x908),</div><div class='add'>+	DRIVE_PINGROUP(GMD,		0x90c),</div><div class='add'>+	DRIVE_PINGROUP(GME,		0x910),</div><div class='add'>+	DRIVE_PINGROUP(GMF,		0x914),</div><div class='add'>+	DRIVE_PINGROUP(GMG,		0x918),</div><div class='add'>+	DRIVE_PINGROUP(GMH,		0x91c),</div><div class='add'>+	DRIVE_PINGROUP(OWR,		0x920),</div><div class='add'>+	DRIVE_PINGROUP(UAD,		0x924),</div><div class='add'>+	DRIVE_PINGROUP(GPV,		0x928),</div><div class='add'>+	DRIVE_PINGROUP(DEV3,		0x92c),</div><div class='add'>+	DRIVE_PINGROUP(CEC,		0x938),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PINGROUP(pg_name, vdd, f0, f1, f2, f3, fs, iod, reg)	\</div><div class='add'>+	[TEGRA_PINGROUP_ ## pg_name] = {			\</div><div class='add'>+		.name = #pg_name,				\</div><div class='add'>+		.vddio = TEGRA_VDDIO_ ## vdd,			\</div><div class='add'>+		.funcs = {					\</div><div class='add'>+			TEGRA_MUX_ ## f0,			\</div><div class='add'>+			TEGRA_MUX_ ## f1,			\</div><div class='add'>+			TEGRA_MUX_ ## f2,			\</div><div class='add'>+			TEGRA_MUX_ ## f3,			\</div><div class='add'>+		},						\</div><div class='add'>+		.func_safe = TEGRA_MUX_ ## fs,			\</div><div class='add'>+		.tri_bank = 1,					\</div><div class='add'>+		.tri_reg = ((reg) - MUXCTL_REG_A),		\</div><div class='add'>+		.tri_bit = 4,					\</div><div class='add'>+		.mux_bank = 1,					\</div><div class='add'>+		.mux_reg = ((reg) - MUXCTL_REG_A),		\</div><div class='add'>+		.mux_bit = 0,					\</div><div class='add'>+		.pupd_bank = 1,					\</div><div class='add'>+		.pupd_reg = ((reg) - MUXCTL_REG_A),		\</div><div class='add'>+		.pupd_bit = 2,					\</div><div class='add'>+		.io_default = TEGRA_PIN_ ## iod,		\</div><div class='add'>+		.od_bit = 6,					\</div><div class='add'>+		.lock_bit = 7,					\</div><div class='add'>+		.ioreset_bit = 8,				\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct tegra_pingroup_desc tegra_soc_pingroups[TEGRA_MAX_PINGROUP] = {</div><div class='add'>+	/*       NAME		  VDD	    f0		f1          f2          f3          fSafe       io	reg */</div><div class='add'>+	PINGROUP(ULPI_DATA0,	  BB,	    SPI3,	HSI,	    UARTA,	ULPI,	    RSVD,	INPUT,	0x3000),</div><div class='add'>+	PINGROUP(ULPI_DATA1,	  BB,	    SPI3,	HSI,	    UARTA,	ULPI,	    RSVD,	INPUT,	0x3004),</div><div class='add'>+	PINGROUP(ULPI_DATA2,	  BB,	    SPI3,	HSI,	    UARTA,	ULPI,	    RSVD,	INPUT,	0x3008),</div><div class='add'>+	PINGROUP(ULPI_DATA3,	  BB,	    SPI3,	HSI,	    UARTA,	ULPI,	    RSVD,	INPUT,	0x300c),</div><div class='add'>+	PINGROUP(ULPI_DATA4,	  BB,	    SPI2,	HSI,	    UARTA,	ULPI,	    RSVD,	INPUT,	0x3010),</div><div class='add'>+	PINGROUP(ULPI_DATA5,	  BB,	    SPI2,	HSI,	    UARTA,	ULPI,	    RSVD,	INPUT,	0x3014),</div><div class='add'>+	PINGROUP(ULPI_DATA6,	  BB,	    SPI2,	HSI,	    UARTA,	ULPI,	    RSVD,	INPUT,	0x3018),</div><div class='add'>+	PINGROUP(ULPI_DATA7,	  BB,	    SPI2,	HSI,	    UARTA,	ULPI,	    RSVD,	INPUT,	0x301c),</div><div class='add'>+	PINGROUP(ULPI_CLK,	  BB,	    SPI1,	RSVD,	    UARTD,	ULPI,	    RSVD,	INPUT,	0x3020),</div><div class='add'>+	PINGROUP(ULPI_DIR,	  BB,	    SPI1,	RSVD,	    UARTD,	ULPI,	    RSVD,	INPUT,	0x3024),</div><div class='add'>+	PINGROUP(ULPI_NXT,	  BB,	    SPI1,	RSVD,	    UARTD,	ULPI,	    RSVD,	INPUT,	0x3028),</div><div class='add'>+	PINGROUP(ULPI_STP,	  BB,	    SPI1,	RSVD,	    UARTD,	ULPI,	    RSVD,	INPUT,	0x302c),</div><div class='add'>+	PINGROUP(DAP3_FS,	  BB,	    I2S2,	RSVD1,	    DISPLAYA,	DISPLAYB,   RSVD,	INPUT,	0x3030),</div><div class='add'>+	PINGROUP(DAP3_DIN,	  BB,	    I2S2,	RSVD1,	    DISPLAYA,	DISPLAYB,   RSVD,	INPUT,	0x3034),</div><div class='add'>+	PINGROUP(DAP3_DOUT,	  BB,	    I2S2,	RSVD1,	    DISPLAYA,	DISPLAYB,   RSVD,	INPUT,	0x3038),</div><div class='add'>+	PINGROUP(DAP3_SCLK,	  BB,	    I2S2,	RSVD1,	    DISPLAYA,	DISPLAYB,   RSVD,	INPUT,	0x303c),</div><div class='add'>+	PINGROUP(GPIO_PV0,	  BB,	    RSVD,	RSVD,	    RSVD,	RSVD,	    RSVD,	INPUT,	0x3040),</div><div class='add'>+	PINGROUP(GPIO_PV1,	  BB,	    RSVD,	RSVD,	    RSVD,	RSVD,	    RSVD,	INPUT,	0x3044),</div><div class='add'>+	PINGROUP(SDMMC1_CLK,	  SDMMC1,   SDIO1,	RSVD1,	    RSVD2,	INVALID,    RSVD,	INPUT,	0x3048),</div><div class='add'>+	PINGROUP(SDMMC1_CMD,	  SDMMC1,   SDIO1,	RSVD1,	    RSVD2,	INVALID,    RSVD,	INPUT,	0x304c),</div><div class='add'>+	PINGROUP(SDMMC1_DAT3,	  SDMMC1,   SDIO1,	RSVD1,	    UARTE,	INVALID,    RSVD,	INPUT,	0x3050),</div><div class='add'>+	PINGROUP(SDMMC1_DAT2,	  SDMMC1,   SDIO1,	RSVD1,	    UARTE,	INVALID,    RSVD,	INPUT,	0x3054),</div><div class='add'>+	PINGROUP(SDMMC1_DAT1,	  SDMMC1,   SDIO1,	RSVD1,	    UARTE,	INVALID,    RSVD,	INPUT,	0x3058),</div><div class='add'>+	PINGROUP(SDMMC1_DAT0,	  SDMMC1,   SDIO1,	RSVD1,	    UARTE,	INVALID,    RSVD,	INPUT,	0x305c),</div><div class='add'>+	PINGROUP(GPIO_PV2,	  SDMMC1,   OWR,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x3060),</div><div class='add'>+	PINGROUP(GPIO_PV3,	  SDMMC1,   INVALID,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x3064),</div><div class='add'>+	PINGROUP(CLK2_OUT,	  SDMMC1,   EXTPERIPH2,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x3068),</div><div class='add'>+	PINGROUP(CLK2_REQ,	  SDMMC1,   DAP,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x306c),</div><div class='add'>+	PINGROUP(LCD_PWR1,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x3070),</div><div class='add'>+	PINGROUP(LCD_PWR2,	  LCD,	    DISPLAYA,	DISPLAYB,   SPI5,	INVALID,    RSVD,	OUTPUT,	0x3074),</div><div class='add'>+	PINGROUP(LCD_SDIN,	  LCD,	    DISPLAYA,	DISPLAYB,   SPI5,	RSVD,	    RSVD,	OUTPUT,	0x3078),</div><div class='add'>+	PINGROUP(LCD_SDOUT,	  LCD,	    DISPLAYA,	DISPLAYB,   SPI5,	INVALID,    RSVD,	OUTPUT,	0x307c),</div><div class='add'>+	PINGROUP(LCD_WR_N,	  LCD,	    DISPLAYA,	DISPLAYB,   SPI5,	INVALID,    RSVD,	OUTPUT,	0x3080),</div><div class='add'>+	PINGROUP(LCD_CS0_N,	  LCD,	    DISPLAYA,	DISPLAYB,   SPI5,	RSVD,	    RSVD,	OUTPUT,	0x3084),</div><div class='add'>+	PINGROUP(LCD_DC0,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x3088),</div><div class='add'>+	PINGROUP(LCD_SCK,	  LCD,	    DISPLAYA,	DISPLAYB,   SPI5,	INVALID,    RSVD,	OUTPUT,	0x308c),</div><div class='add'>+	PINGROUP(LCD_PWR0,	  LCD,	    DISPLAYA,	DISPLAYB,   SPI5,	INVALID,    RSVD,	OUTPUT,	0x3090),</div><div class='add'>+	PINGROUP(LCD_PCLK,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x3094),</div><div class='add'>+	PINGROUP(LCD_DE,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x3098),</div><div class='add'>+	PINGROUP(LCD_HSYNC,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x309c),</div><div class='add'>+	PINGROUP(LCD_VSYNC,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30a0),</div><div class='add'>+	PINGROUP(LCD_D0,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30a4),</div><div class='add'>+	PINGROUP(LCD_D1,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30a8),</div><div class='add'>+	PINGROUP(LCD_D2,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30ac),</div><div class='add'>+	PINGROUP(LCD_D3,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30b0),</div><div class='add'>+	PINGROUP(LCD_D4,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30b4),</div><div class='add'>+	PINGROUP(LCD_D5,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30b8),</div><div class='add'>+	PINGROUP(LCD_D6,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30bc),</div><div class='add'>+	PINGROUP(LCD_D7,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30c0),</div><div class='add'>+	PINGROUP(LCD_D8,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30c4),</div><div class='add'>+	PINGROUP(LCD_D9,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30c8),</div><div class='add'>+	PINGROUP(LCD_D10,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30cc),</div><div class='add'>+	PINGROUP(LCD_D11,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30d0),</div><div class='add'>+	PINGROUP(LCD_D12,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30d4),</div><div class='add'>+	PINGROUP(LCD_D13,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30d8),</div><div class='add'>+	PINGROUP(LCD_D14,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30dc),</div><div class='add'>+	PINGROUP(LCD_D15,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30e0),</div><div class='add'>+	PINGROUP(LCD_D16,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30e4),</div><div class='add'>+	PINGROUP(LCD_D17,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30e8),</div><div class='add'>+	PINGROUP(LCD_D18,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30ec),</div><div class='add'>+	PINGROUP(LCD_D19,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30f0),</div><div class='add'>+	PINGROUP(LCD_D20,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30f4),</div><div class='add'>+	PINGROUP(LCD_D21,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30f8),</div><div class='add'>+	PINGROUP(LCD_D22,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x30fc),</div><div class='add'>+	PINGROUP(LCD_D23,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x3100),</div><div class='add'>+	PINGROUP(LCD_CS1_N,	  LCD,	    DISPLAYA,	DISPLAYB,   SPI5,	RSVD2,	    RSVD,	OUTPUT,	0x3104),</div><div class='add'>+	PINGROUP(LCD_M1,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x3108),</div><div class='add'>+	PINGROUP(LCD_DC1,	  LCD,	    DISPLAYA,	DISPLAYB,   RSVD1,	RSVD2,	    RSVD,	OUTPUT,	0x310c),</div><div class='add'>+	PINGROUP(HDMI_INT,	  LCD,	    RSVD,	RSVD,	    RSVD,	RSVD,	    RSVD,	INPUT,	0x3110),</div><div class='add'>+	PINGROUP(DDC_SCL,	  LCD,	    I2C4,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x3114),</div><div class='add'>+	PINGROUP(DDC_SDA,	  LCD,	    I2C4,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x3118),</div><div class='add'>+	PINGROUP(CRT_HSYNC,	  LCD,	    CRT,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x311c),</div><div class='add'>+	PINGROUP(CRT_VSYNC,	  LCD,	    CRT,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x3120),</div><div class='add'>+	PINGROUP(VI_D0,		  VI,	    INVALID,	RSVD1,	    VI,		RSVD2,	    RSVD,	INPUT,	0x3124),</div><div class='add'>+	PINGROUP(VI_D1,		  VI,	    INVALID,	SDIO2,	    VI,		RSVD1,	    RSVD,	INPUT,	0x3128),</div><div class='add'>+	PINGROUP(VI_D2,		  VI,	    INVALID,	SDIO2,	    VI,		RSVD1,	    RSVD,	INPUT,	0x312c),</div><div class='add'>+	PINGROUP(VI_D3,		  VI,	    INVALID,	SDIO2,	    VI,		RSVD1,	    RSVD,	INPUT,	0x3130),</div><div class='add'>+	PINGROUP(VI_D4,		  VI,	    INVALID,	SDIO2,	    VI,		RSVD1,	    RSVD,	INPUT,	0x3134),</div><div class='add'>+	PINGROUP(VI_D5,		  VI,	    INVALID,	SDIO2,	    VI,		RSVD1,	    RSVD,	INPUT,	0x3138),</div><div class='add'>+	PINGROUP(VI_D6,		  VI,	    INVALID,	SDIO2,	    VI,		RSVD1,	    RSVD,	INPUT,	0x313c),</div><div class='add'>+	PINGROUP(VI_D7,		  VI,	    INVALID,	SDIO2,	    VI,		RSVD1,	    RSVD,	INPUT,	0x3140),</div><div class='add'>+	PINGROUP(VI_D8,		  VI,	    INVALID,	SDIO2,	    VI,		RSVD1,	    RSVD,	INPUT,	0x3144),</div><div class='add'>+	PINGROUP(VI_D9,		  VI,	    INVALID,	SDIO2,	    VI,		RSVD1,	    RSVD,	INPUT,	0x3148),</div><div class='add'>+	PINGROUP(VI_D10,	  VI,	    INVALID,	RSVD1,	    VI,		RSVD2,	    RSVD,	INPUT,	0x314c),</div><div class='add'>+	PINGROUP(VI_D11,	  VI,	    INVALID,	RSVD1,	    VI,		RSVD2,	    RSVD,	INPUT,	0x3150),</div><div class='add'>+	PINGROUP(VI_PCLK,	  VI,	    RSVD1,	SDIO2,	    VI,		RSVD2,	    RSVD,	INPUT,	0x3154),</div><div class='add'>+	PINGROUP(VI_MCLK,	  VI,	    VI,		INVALID,    INVALID,	INVALID,    RSVD,	INPUT,	0x3158),</div><div class='add'>+	PINGROUP(VI_VSYNC,	  VI,	    INVALID,	RSVD1,	    VI,		RSVD2,	    RSVD,	INPUT,	0x315c),</div><div class='add'>+	PINGROUP(VI_HSYNC,	  VI,	    INVALID,	RSVD1,	    VI,		RSVD2,	    RSVD,	INPUT,	0x3160),</div><div class='add'>+	PINGROUP(UART2_RXD,	  UART,	    IRDA,	SPDIF,	    UARTA,	SPI4,	    RSVD,	INPUT,	0x3164),</div><div class='add'>+	PINGROUP(UART2_TXD,	  UART,	    IRDA,	SPDIF,	    UARTA,	SPI4,	    RSVD,	INPUT,	0x3168),</div><div class='add'>+	PINGROUP(UART2_RTS_N,	  UART,	    UARTA,	UARTB,	    GMI,	SPI4,	    RSVD,	INPUT,	0x316c),</div><div class='add'>+	PINGROUP(UART2_CTS_N,	  UART,	    UARTA,	UARTB,	    GMI,	SPI4,	    RSVD,	INPUT,	0x3170),</div><div class='add'>+	PINGROUP(UART3_TXD,	  UART,	    UARTC,	RSVD1,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x3174),</div><div class='add'>+	PINGROUP(UART3_RXD,	  UART,	    UARTC,	RSVD1,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x3178),</div><div class='add'>+	PINGROUP(UART3_CTS_N,	  UART,	    UARTC,	RSVD1,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x317c),</div><div class='add'>+	PINGROUP(UART3_RTS_N,	  UART,	    UARTC,	PWM0,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x3180),</div><div class='add'>+	PINGROUP(GPIO_PU0,	  UART,	    OWR,	UARTA,	    GMI,	RSVD1,	    RSVD,	INPUT,	0x3184),</div><div class='add'>+	PINGROUP(GPIO_PU1,	  UART,	    RSVD1,	UARTA,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x3188),</div><div class='add'>+	PINGROUP(GPIO_PU2,	  UART,	    RSVD1,	UARTA,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x318c),</div><div class='add'>+	PINGROUP(GPIO_PU3,	  UART,	    PWM0,	UARTA,	    GMI,	RSVD1,	    RSVD,	INPUT,	0x3190),</div><div class='add'>+	PINGROUP(GPIO_PU4,	  UART,	    PWM1,	UARTA,	    GMI,	RSVD1,	    RSVD,	INPUT,	0x3194),</div><div class='add'>+	PINGROUP(GPIO_PU5,	  UART,	    PWM2,	UARTA,	    GMI,	RSVD1,	    RSVD,	INPUT,	0x3198),</div><div class='add'>+	PINGROUP(GPIO_PU6,	  UART,	    PWM3,	UARTA,	    GMI,	RSVD1,	    RSVD,	INPUT,	0x319c),</div><div class='add'>+	PINGROUP(GEN1_I2C_SDA,	  UART,	    I2C,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x31a0),</div><div class='add'>+	PINGROUP(GEN1_I2C_SCL,	  UART,	    I2C,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x31a4),</div><div class='add'>+	PINGROUP(DAP4_FS,	  UART,	    I2S3,	RSVD1,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x31a8),</div><div class='add'>+	PINGROUP(DAP4_DIN,	  UART,	    I2S3,	RSVD1,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x31ac),</div><div class='add'>+	PINGROUP(DAP4_DOUT,	  UART,	    I2S3,	RSVD1,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x31b0),</div><div class='add'>+	PINGROUP(DAP4_SCLK,	  UART,	    I2S3,	RSVD1,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x31b4),</div><div class='add'>+	PINGROUP(CLK3_OUT,	  UART,	    EXTPERIPH3,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x31b8),</div><div class='add'>+	PINGROUP(CLK3_REQ,	  UART,	    DEV3,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x31bc),</div><div class='add'>+	PINGROUP(GMI_WP_N,	  GMI,	    RSVD1,	NAND,	    GMI,	GMI_ALT,    RSVD,	INPUT,	0x31c0),</div><div class='add'>+	PINGROUP(GMI_IORDY,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x31c4),</div><div class='add'>+	PINGROUP(GMI_WAIT,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x31c8),</div><div class='add'>+	PINGROUP(GMI_ADV_N,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x31cc),</div><div class='add'>+	PINGROUP(GMI_CLK,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x31d0),</div><div class='add'>+	PINGROUP(GMI_CS0_N,	  GMI,	    RSVD1,	NAND,	    GMI,	INVALID,    RSVD,	INPUT,	0x31d4),</div><div class='add'>+	PINGROUP(GMI_CS1_N,	  GMI,	    RSVD1,	NAND,	    GMI,	DTV,	    RSVD,	INPUT,	0x31d8),</div><div class='add'>+	PINGROUP(GMI_CS2_N,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x31dc),</div><div class='add'>+	PINGROUP(GMI_CS3_N,	  GMI,	    RSVD1,	NAND,	    GMI,	GMI_ALT,    RSVD,	INPUT,	0x31e0),</div><div class='add'>+	PINGROUP(GMI_CS4_N,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x31e4),</div><div class='add'>+	PINGROUP(GMI_CS6_N,	  GMI,	    NAND,	NAND_ALT,   GMI,	SATA,	    RSVD,	INPUT,	0x31e8),</div><div class='add'>+	PINGROUP(GMI_CS7_N,	  GMI,	    NAND,	NAND_ALT,   GMI,	GMI_ALT,    RSVD,	INPUT,	0x31ec),</div><div class='add'>+	PINGROUP(GMI_AD0,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x31f0),</div><div class='add'>+	PINGROUP(GMI_AD1,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x31f4),</div><div class='add'>+	PINGROUP(GMI_AD2,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x31f8),</div><div class='add'>+	PINGROUP(GMI_AD3,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x31fc),</div><div class='add'>+	PINGROUP(GMI_AD4,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x3200),</div><div class='add'>+	PINGROUP(GMI_AD5,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x3204),</div><div class='add'>+	PINGROUP(GMI_AD6,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x3208),</div><div class='add'>+	PINGROUP(GMI_AD7,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x320c),</div><div class='add'>+	PINGROUP(GMI_AD8,	  GMI,	    PWM0,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x3210),</div><div class='add'>+	PINGROUP(GMI_AD9,	  GMI,	    PWM1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x3214),</div><div class='add'>+	PINGROUP(GMI_AD10,	  GMI,	    PWM2,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x3218),</div><div class='add'>+	PINGROUP(GMI_AD11,	  GMI,	    PWM3,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x321c),</div><div class='add'>+	PINGROUP(GMI_AD12,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x3220),</div><div class='add'>+	PINGROUP(GMI_AD13,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x3224),</div><div class='add'>+	PINGROUP(GMI_AD14,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x3228),</div><div class='add'>+	PINGROUP(GMI_AD15,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD2,	    RSVD,	INPUT,	0x322c),</div><div class='add'>+	PINGROUP(GMI_A16,	  GMI,	    UARTD,	SPI4,	    GMI,	GMI_ALT,    RSVD,	INPUT,	0x3230),</div><div class='add'>+	PINGROUP(GMI_A17,	  GMI,	    UARTD,	SPI4,	    GMI,	INVALID,    RSVD,	INPUT,	0x3234),</div><div class='add'>+	PINGROUP(GMI_A18,	  GMI,	    UARTD,	SPI4,	    GMI,	INVALID,    RSVD,	INPUT,	0x3238),</div><div class='add'>+	PINGROUP(GMI_A19,	  GMI,	    UARTD,	SPI4,	    GMI,	RSVD3,	    RSVD,	INPUT,	0x323c),</div><div class='add'>+	PINGROUP(GMI_WR_N,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD3,	    RSVD,	INPUT,	0x3240),</div><div class='add'>+	PINGROUP(GMI_OE_N,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD3,	    RSVD,	INPUT,	0x3244),</div><div class='add'>+	PINGROUP(GMI_DQS,	  GMI,	    RSVD1,	NAND,	    GMI,	RSVD3,	    RSVD,	INPUT,	0x3248),</div><div class='add'>+	PINGROUP(GMI_RST_N,	  GMI,	    NAND,	NAND_ALT,   GMI,	RSVD3,	    RSVD,	INPUT,	0x324c),</div><div class='add'>+	PINGROUP(GEN2_I2C_SCL,	  GMI,	    I2C2,	INVALID,    GMI,	RSVD3,	    RSVD,	INPUT,	0x3250),</div><div class='add'>+	PINGROUP(GEN2_I2C_SDA,	  GMI,	    I2C2,	INVALID,    GMI,	RSVD3,	    RSVD,	INPUT,	0x3254),</div><div class='add'>+	PINGROUP(SDMMC4_CLK,	  SDMMC4,   INVALID,	NAND,	    GMI,	SDIO4,	    RSVD,	INPUT,	0x3258),</div><div class='add'>+	PINGROUP(SDMMC4_CMD,	  SDMMC4,   I2C3,	NAND,	    GMI,	SDIO4,	    RSVD,	INPUT,	0x325c),</div><div class='add'>+	PINGROUP(SDMMC4_DAT0,	  SDMMC4,   UARTE,	SPI3,	    GMI,	SDIO4,	    RSVD,	INPUT,	0x3260),</div><div class='add'>+	PINGROUP(SDMMC4_DAT1,	  SDMMC4,   UARTE,	SPI3,	    GMI,	SDIO4,	    RSVD,	INPUT,	0x3264),</div><div class='add'>+	PINGROUP(SDMMC4_DAT2,	  SDMMC4,   UARTE,	SPI3,	    GMI,	SDIO4,	    RSVD,	INPUT,	0x3268),</div><div class='add'>+	PINGROUP(SDMMC4_DAT3,	  SDMMC4,   UARTE,	SPI3,	    GMI,	SDIO4,	    RSVD,	INPUT,	0x326c),</div><div class='add'>+	PINGROUP(SDMMC4_DAT4,	  SDMMC4,   I2C3,	I2S4,	    GMI,	SDIO4,	    RSVD,	INPUT,	0x3270),</div><div class='add'>+	PINGROUP(SDMMC4_DAT5,	  SDMMC4,   VGP3,	I2S4,	    GMI,	SDIO4,	    RSVD,	INPUT,	0x3274),</div><div class='add'>+	PINGROUP(SDMMC4_DAT6,	  SDMMC4,   VGP4,	I2S4,	    GMI,	SDIO4,	    RSVD,	INPUT,	0x3278),</div><div class='add'>+	PINGROUP(SDMMC4_DAT7,	  SDMMC4,   VGP5,	I2S4,	    GMI,	SDIO4,	    RSVD,	INPUT,	0x327c),</div><div class='add'>+	PINGROUP(SDMMC4_RST_N,	  SDMMC4,   VGP6,	RSVD1,	    RSVD2,	POPSDMMC4,  RSVD,	INPUT,	0x3280),</div><div class='add'>+	PINGROUP(CAM_MCLK,	  CAM,	    VI,		INVALID,    VI_ALT2,	POPSDMMC4,  RSVD,	INPUT,	0x3284),</div><div class='add'>+	PINGROUP(GPIO_PCC1,	  CAM,	    I2S4,	RSVD1,	    RSVD2,	POPSDMMC4,  RSVD,	INPUT,	0x3288),</div><div class='add'>+	PINGROUP(GPIO_PBB0,	  CAM,	    I2S4,	RSVD1,	    RSVD2,	POPSDMMC4,  RSVD,	INPUT,	0x328c),</div><div class='add'>+	PINGROUP(CAM_I2C_SCL,	  CAM,	    INVALID,	I2C3,	    RSVD2,	POPSDMMC4,  RSVD,	INPUT,	0x3290),</div><div class='add'>+	PINGROUP(CAM_I2C_SDA,	  CAM,	    INVALID,	I2C3,	    RSVD2,	POPSDMMC4,  RSVD,	INPUT,	0x3294),</div><div class='add'>+	PINGROUP(GPIO_PBB3,	  CAM,	    VGP3,	DISPLAYA,   DISPLAYB,	POPSDMMC4,  RSVD,	INPUT,	0x3298),</div><div class='add'>+	PINGROUP(GPIO_PBB4,	  CAM,	    VGP4,	DISPLAYA,   DISPLAYB,	POPSDMMC4,  RSVD,	INPUT,	0x329c),</div><div class='add'>+	PINGROUP(GPIO_PBB5,	  CAM,	    VGP5,	DISPLAYA,   DISPLAYB,	POPSDMMC4,  RSVD,	INPUT,	0x32a0),</div><div class='add'>+	PINGROUP(GPIO_PBB6,	  CAM,	    VGP6,	DISPLAYA,   DISPLAYB,	POPSDMMC4,  RSVD,	INPUT,	0x32a4),</div><div class='add'>+	PINGROUP(GPIO_PBB7,	  CAM,	    I2S4,	RSVD1,	    RSVD2,	POPSDMMC4,  RSVD,	INPUT,	0x32a8),</div><div class='add'>+	PINGROUP(GPIO_PCC2,	  CAM,	    I2S4,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x32ac),</div><div class='add'>+	PINGROUP(JTAG_RTCK,	  SYS,	    RTCK,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x32b0),</div><div class='add'>+	PINGROUP(PWR_I2C_SCL,	  SYS,	    I2CPWR,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x32b4),</div><div class='add'>+	PINGROUP(PWR_I2C_SDA,	  SYS,	    I2CPWR,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x32b8),</div><div class='add'>+	PINGROUP(KB_ROW0,	  SYS,	    KBC,	INVALID,    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x32bc),</div><div class='add'>+	PINGROUP(KB_ROW1,	  SYS,	    KBC,	INVALID,    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x32c0),</div><div class='add'>+	PINGROUP(KB_ROW2,	  SYS,	    KBC,	INVALID,    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x32c4),</div><div class='add'>+	PINGROUP(KB_ROW3,	  SYS,	    KBC,	INVALID,    RSVD2,	INVALID,    RSVD,	INPUT,	0x32c8),</div><div class='add'>+	PINGROUP(KB_ROW4,	  SYS,	    KBC,	INVALID,    TRACE,	RSVD3,	    RSVD,	INPUT,	0x32cc),</div><div class='add'>+	PINGROUP(KB_ROW5,	  SYS,	    KBC,	INVALID,    TRACE,	OWR,	    RSVD,	INPUT,	0x32d0),</div><div class='add'>+	PINGROUP(KB_ROW6,	  SYS,	    KBC,	INVALID,    SDIO2,	INVALID,    RSVD,	INPUT,	0x32d4),</div><div class='add'>+	PINGROUP(KB_ROW7,	  SYS,	    KBC,	INVALID,    SDIO2,	INVALID,    RSVD,	INPUT,	0x32d8),</div><div class='add'>+	PINGROUP(KB_ROW8,	  SYS,	    KBC,	INVALID,    SDIO2,	INVALID,    RSVD,	INPUT,	0x32dc),</div><div class='add'>+	PINGROUP(KB_ROW9,	  SYS,	    KBC,	INVALID,    SDIO2,	INVALID,    RSVD,	INPUT,	0x32e0),</div><div class='add'>+	PINGROUP(KB_ROW10,	  SYS,	    KBC,	INVALID,    SDIO2,	INVALID,    RSVD,	INPUT,	0x32e4),</div><div class='add'>+	PINGROUP(KB_ROW11,	  SYS,	    KBC,	INVALID,    SDIO2,	INVALID,    RSVD,	INPUT,	0x32e8),</div><div class='add'>+	PINGROUP(KB_ROW12,	  SYS,	    KBC,	INVALID,    SDIO2,	INVALID,    RSVD,	INPUT,	0x32ec),</div><div class='add'>+	PINGROUP(KB_ROW13,	  SYS,	    KBC,	INVALID,    SDIO2,	INVALID,    RSVD,	INPUT,	0x32f0),</div><div class='add'>+	PINGROUP(KB_ROW14,	  SYS,	    KBC,	INVALID,    SDIO2,	INVALID,    RSVD,	INPUT,	0x32f4),</div><div class='add'>+	PINGROUP(KB_ROW15,	  SYS,	    KBC,	INVALID,    SDIO2,	INVALID,    RSVD,	INPUT,	0x32f8),</div><div class='add'>+	PINGROUP(KB_COL0,	  SYS,	    KBC,	INVALID,    TRACE,	INVALID,    RSVD,	INPUT,	0x32fc),</div><div class='add'>+	PINGROUP(KB_COL1,	  SYS,	    KBC,	INVALID,    TRACE,	INVALID,    RSVD,	INPUT,	0x3300),</div><div class='add'>+	PINGROUP(KB_COL2,	  SYS,	    KBC,	INVALID,    TRACE,	RSVD,	    RSVD,	INPUT,	0x3304),</div><div class='add'>+	PINGROUP(KB_COL3,	  SYS,	    KBC,	INVALID,    TRACE,	RSVD,	    RSVD,	INPUT,	0x3308),</div><div class='add'>+	PINGROUP(KB_COL4,	  SYS,	    KBC,	INVALID,    TRACE,	RSVD,	    RSVD,	INPUT,	0x330c),</div><div class='add'>+	PINGROUP(KB_COL5,	  SYS,	    KBC,	INVALID,    TRACE,	RSVD,	    RSVD,	INPUT,	0x3310),</div><div class='add'>+	PINGROUP(KB_COL6,	  SYS,	    KBC,	INVALID,    TRACE,	INVALID,    RSVD,	INPUT,	0x3314),</div><div class='add'>+	PINGROUP(KB_COL7,	  SYS,	    KBC,	INVALID,    TRACE,	INVALID,    RSVD,	INPUT,	0x3318),</div><div class='add'>+	PINGROUP(CLK_32K_OUT,	  SYS,	    BLINK,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x331c),</div><div class='add'>+	PINGROUP(SYS_CLK_REQ,	  SYS,	    SYSCLK,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x3320),</div><div class='add'>+	PINGROUP(CORE_PWR_REQ,	  SYS,	    RSVD,	RSVD,	    RSVD,	RSVD,	    RSVD,	INPUT,	0x3324),</div><div class='add'>+	PINGROUP(CPU_PWR_REQ,	  SYS,	    RSVD,	RSVD,	    RSVD,	RSVD,	    RSVD,	INPUT,	0x3328),</div><div class='add'>+	PINGROUP(PWR_INT_N,	  SYS,	    RSVD,	RSVD,	    RSVD,	RSVD,	    RSVD,	INPUT,	0x332c),</div><div class='add'>+	PINGROUP(CLK_32K_IN,	  SYS,	    RSVD,	RSVD,	    RSVD,	RSVD,	    RSVD,	INPUT,	0x3330),</div><div class='add'>+	PINGROUP(OWR,		  SYS,	    OWR,	RSVD,	    RSVD,	RSVD,	    RSVD,	INPUT,	0x3334),</div><div class='add'>+	PINGROUP(DAP1_FS,	  AUDIO,    I2S0,	HDA,	    GMI,	SDIO2,	    RSVD,	INPUT,	0x3338),</div><div class='add'>+	PINGROUP(DAP1_DIN,	  AUDIO,    I2S0,	HDA,	    GMI,	SDIO2,	    RSVD,	INPUT,	0x333c),</div><div class='add'>+	PINGROUP(DAP1_DOUT,	  AUDIO,    I2S0,	HDA,	    GMI,	SDIO2,	    RSVD,	INPUT,	0x3340),</div><div class='add'>+	PINGROUP(DAP1_SCLK,	  AUDIO,    I2S0,	HDA,	    GMI,	SDIO2,	    RSVD,	INPUT,	0x3344),</div><div class='add'>+	PINGROUP(CLK1_REQ,	  AUDIO,    DAP,	HDA,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x3348),</div><div class='add'>+	PINGROUP(CLK1_OUT,	  AUDIO,    EXTPERIPH1,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x334c),</div><div class='add'>+	PINGROUP(SPDIF_IN,	  AUDIO,    SPDIF,	HDA,	    INVALID,	DAPSDMMC2,  RSVD,	INPUT,	0x3350),</div><div class='add'>+	PINGROUP(SPDIF_OUT,	  AUDIO,    SPDIF,	RSVD1,	    INVALID,	DAPSDMMC2,  RSVD,	INPUT,	0x3354),</div><div class='add'>+	PINGROUP(DAP2_FS,	  AUDIO,    I2S1,	HDA,	    RSVD2,	GMI,	    RSVD,	INPUT,	0x3358),</div><div class='add'>+	PINGROUP(DAP2_DIN,	  AUDIO,    I2S1,	HDA,	    RSVD2,	GMI,	    RSVD,	INPUT,	0x335c),</div><div class='add'>+	PINGROUP(DAP2_DOUT,	  AUDIO,    I2S1,	HDA,	    RSVD2,	GMI,	    RSVD,	INPUT,	0x3360),</div><div class='add'>+	PINGROUP(DAP2_SCLK,	  AUDIO,    I2S1,	HDA,	    RSVD2,	GMI,	    RSVD,	INPUT,	0x3364),</div><div class='add'>+	PINGROUP(SPI2_MOSI,	  AUDIO,    SPI6,	SPI2,	    INVALID,	GMI,	    RSVD,	INPUT,	0x3368),</div><div class='add'>+	PINGROUP(SPI2_MISO,	  AUDIO,    SPI6,	SPI2,	    INVALID,	GMI,	    RSVD,	INPUT,	0x336c),</div><div class='add'>+	PINGROUP(SPI2_CS0_N,	  AUDIO,    SPI6,	SPI2,	    INVALID,	GMI,	    RSVD,	INPUT,	0x3370),</div><div class='add'>+	PINGROUP(SPI2_SCK,	  AUDIO,    SPI6,	SPI2,	    INVALID,	GMI,	    RSVD,	INPUT,	0x3374),</div><div class='add'>+	PINGROUP(SPI1_MOSI,	  AUDIO,    SPI2,	SPI1,	    INVALID,	GMI,	    RSVD,	INPUT,	0x3378),</div><div class='add'>+	PINGROUP(SPI1_SCK,	  AUDIO,    SPI2,	SPI1,	    INVALID,	GMI,	    RSVD,	INPUT,	0x337c),</div><div class='add'>+	PINGROUP(SPI1_CS0_N,	  AUDIO,    SPI2,	SPI1,	    INVALID,	GMI,	    RSVD,	INPUT,	0x3380),</div><div class='add'>+	PINGROUP(SPI1_MISO,	  AUDIO,    INVALID,	SPI1,	    INVALID,	RSVD3,	    RSVD,	INPUT,	0x3384),</div><div class='add'>+	PINGROUP(SPI2_CS1_N,	  AUDIO,    INVALID,	SPI2,	    INVALID,	INVALID,    RSVD,	INPUT,	0x3388),</div><div class='add'>+	PINGROUP(SPI2_CS2_N,	  AUDIO,    INVALID,	SPI2,	    INVALID,	INVALID,    RSVD,	INPUT,	0x338c),</div><div class='add'>+	PINGROUP(SDMMC3_CLK,	  SDMMC3,   UARTA,	PWM2,	    SDIO3,	INVALID,    RSVD,	INPUT,	0x3390),</div><div class='add'>+	PINGROUP(SDMMC3_CMD,	  SDMMC3,   UARTA,	PWM3,	    SDIO3,	INVALID,    RSVD,	INPUT,	0x3394),</div><div class='add'>+	PINGROUP(SDMMC3_DAT0,	  SDMMC3,   RSVD,	RSVD1,	    SDIO3,	INVALID,    RSVD,	INPUT,	0x3398),</div><div class='add'>+	PINGROUP(SDMMC3_DAT1,	  SDMMC3,   RSVD,	RSVD1,	    SDIO3,	INVALID,    RSVD,	INPUT,	0x339c),</div><div class='add'>+	PINGROUP(SDMMC3_DAT2,	  SDMMC3,   RSVD,	PWM1,	    SDIO3,	INVALID,    RSVD,	INPUT,	0x33a0),</div><div class='add'>+	PINGROUP(SDMMC3_DAT3,	  SDMMC3,   RSVD,	PWM0,	    SDIO3,	INVALID,    RSVD,	INPUT,	0x33a4),</div><div class='add'>+	PINGROUP(SDMMC3_DAT4,	  SDMMC3,   PWM1,	INVALID,    SDIO3,	INVALID,    RSVD,	INPUT,	0x33a8),</div><div class='add'>+	PINGROUP(SDMMC3_DAT5,	  SDMMC3,   PWM0,	INVALID,    SDIO3,	INVALID,    RSVD,	INPUT,	0x33ac),</div><div class='add'>+	PINGROUP(SDMMC3_DAT6,	  SDMMC3,   SPDIF,	INVALID,    SDIO3,	INVALID,    RSVD,	INPUT,	0x33b0),</div><div class='add'>+	PINGROUP(SDMMC3_DAT7,	  SDMMC3,   SPDIF,	INVALID,    SDIO3,	INVALID,    RSVD,	INPUT,	0x33b4),</div><div class='add'>+	PINGROUP(PEX_L0_PRSNT_N,  PEXCTL,   PCIE,	HDA,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x33b8),</div><div class='add'>+	PINGROUP(PEX_L0_RST_N,	  PEXCTL,   PCIE,	HDA,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x33bc),</div><div class='add'>+	PINGROUP(PEX_L0_CLKREQ_N, PEXCTL,   PCIE,	HDA,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x33c0),</div><div class='add'>+	PINGROUP(PEX_WAKE_N,	  PEXCTL,   PCIE,	HDA,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x33c4),</div><div class='add'>+	PINGROUP(PEX_L1_PRSNT_N,  PEXCTL,   PCIE,	HDA,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x33c8),</div><div class='add'>+	PINGROUP(PEX_L1_RST_N,	  PEXCTL,   PCIE,	HDA,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x33cc),</div><div class='add'>+	PINGROUP(PEX_L1_CLKREQ_N, PEXCTL,   PCIE,	HDA,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x33d0),</div><div class='add'>+	PINGROUP(PEX_L2_PRSNT_N,  PEXCTL,   PCIE,	HDA,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x33d4),</div><div class='add'>+	PINGROUP(PEX_L2_RST_N,	  PEXCTL,   PCIE,	HDA,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x33d8),</div><div class='add'>+	PINGROUP(PEX_L2_CLKREQ_N, PEXCTL,   PCIE,	HDA,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x33dc),</div><div class='add'>+	PINGROUP(HDMI_CEC,	  SYS,      CEC,	RSVD1,	    RSVD2,	RSVD3,	    RSVD,	INPUT,	0x33e0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __devinit tegra30_pinmux_init(const struct tegra_pingroup_desc **pg,</div><div class='add'>+		int *pg_max, const struct tegra_drive_pingroup_desc **pgdrive,</div><div class='add'>+		int *pgdrive_max)</div><div class='add'>+{</div><div class='add'>+	*pg = tegra_soc_pingroups;</div><div class='add'>+	*pg_max = TEGRA_MAX_PINGROUP;</div><div class='add'>+	*pgdrive = tegra_soc_drive_pingroups;</div><div class='add'>+	*pgdrive_max = TEGRA_MAX_DRIVE_PINGROUP;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-tegra/pinmux.c b/arch/arm/mach-tegra/pinmux.c<br/>index 1d201650d7a4..ac35d2b76850 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/pinmux.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/pinmux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/pinmux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/pinmux.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/iomap.h&gt;</div><div class='ctx'> #include &lt;mach/pinmux.h&gt;</div><div class='hunk'>@@ -33,8 +34,10 @@</div><div class='ctx'> #define SLWR(reg)	(((reg) &gt;&gt; 28) &amp; 0x3)</div><div class='ctx'> #define SLWF(reg)	(((reg) &gt;&gt; 30) &amp; 0x3)</div><div class='ctx'> </div><div class='del'>-static const struct tegra_pingroup_desc *const pingroups = tegra_soc_pingroups;</div><div class='del'>-static const struct tegra_drive_pingroup_desc *const drive_pingroups = tegra_soc_drive_pingroups;</div><div class='add'>+static const struct tegra_pingroup_desc *pingroups;</div><div class='add'>+static const struct tegra_drive_pingroup_desc *drive_pingroups;</div><div class='add'>+static int pingroup_max;</div><div class='add'>+static int drive_max;</div><div class='ctx'> </div><div class='ctx'> static char *tegra_mux_names[TEGRA_MAX_MUX] = {</div><div class='ctx'> 	[TEGRA_MUX_AHB_CLK] = "AHB_CLK",</div><div class='hunk'>@@ -97,6 +100,49 @@ static char *tegra_mux_names[TEGRA_MAX_MUX] = {</div><div class='ctx'> 	[TEGRA_MUX_VI] = "VI",</div><div class='ctx'> 	[TEGRA_MUX_VI_SENSOR_CLK] = "VI_SENSOR_CLK",</div><div class='ctx'> 	[TEGRA_MUX_XIO] = "XIO",</div><div class='add'>+	[TEGRA_MUX_BLINK] = "BLINK",</div><div class='add'>+	[TEGRA_MUX_CEC] = "CEC",</div><div class='add'>+	[TEGRA_MUX_CLK12] = "CLK12",</div><div class='add'>+	[TEGRA_MUX_DAP] = "DAP",</div><div class='add'>+	[TEGRA_MUX_DAPSDMMC2] = "DAPSDMMC2",</div><div class='add'>+	[TEGRA_MUX_DDR] = "DDR",</div><div class='add'>+	[TEGRA_MUX_DEV3] = "DEV3",</div><div class='add'>+	[TEGRA_MUX_DTV] = "DTV",</div><div class='add'>+	[TEGRA_MUX_VI_ALT1] = "VI_ALT1",</div><div class='add'>+	[TEGRA_MUX_VI_ALT2] = "VI_ALT2",</div><div class='add'>+	[TEGRA_MUX_VI_ALT3] = "VI_ALT3",</div><div class='add'>+	[TEGRA_MUX_EMC_DLL] = "EMC_DLL",</div><div class='add'>+	[TEGRA_MUX_EXTPERIPH1] = "EXTPERIPH1",</div><div class='add'>+	[TEGRA_MUX_EXTPERIPH2] = "EXTPERIPH2",</div><div class='add'>+	[TEGRA_MUX_EXTPERIPH3] = "EXTPERIPH3",</div><div class='add'>+	[TEGRA_MUX_GMI_ALT] = "GMI_ALT",</div><div class='add'>+	[TEGRA_MUX_HDA] = "HDA",</div><div class='add'>+	[TEGRA_MUX_HSI] = "HSI",</div><div class='add'>+	[TEGRA_MUX_I2C4] = "I2C4",</div><div class='add'>+	[TEGRA_MUX_I2C5] = "I2C5",</div><div class='add'>+	[TEGRA_MUX_I2CPWR] = "I2CPWR",</div><div class='add'>+	[TEGRA_MUX_I2S0] = "I2S0",</div><div class='add'>+	[TEGRA_MUX_I2S1] = "I2S1",</div><div class='add'>+	[TEGRA_MUX_I2S2] = "I2S2",</div><div class='add'>+	[TEGRA_MUX_I2S3] = "I2S3",</div><div class='add'>+	[TEGRA_MUX_I2S4] = "I2S4",</div><div class='add'>+	[TEGRA_MUX_NAND_ALT] = "NAND_ALT",</div><div class='add'>+	[TEGRA_MUX_POPSDIO4] = "POPSDIO4",</div><div class='add'>+	[TEGRA_MUX_POPSDMMC4] = "POPSDMMC4",</div><div class='add'>+	[TEGRA_MUX_PWM0] = "PWM0",</div><div class='add'>+	[TEGRA_MUX_PWM1] = "PWM2",</div><div class='add'>+	[TEGRA_MUX_PWM2] = "PWM2",</div><div class='add'>+	[TEGRA_MUX_PWM3] = "PWM3",</div><div class='add'>+	[TEGRA_MUX_SATA] = "SATA",</div><div class='add'>+	[TEGRA_MUX_SPI5] = "SPI5",</div><div class='add'>+	[TEGRA_MUX_SPI6] = "SPI6",</div><div class='add'>+	[TEGRA_MUX_SYSCLK] = "SYSCLK",</div><div class='add'>+	[TEGRA_MUX_VGP1] = "VGP1",</div><div class='add'>+	[TEGRA_MUX_VGP2] = "VGP2",</div><div class='add'>+	[TEGRA_MUX_VGP3] = "VGP3",</div><div class='add'>+	[TEGRA_MUX_VGP4] = "VGP4",</div><div class='add'>+	[TEGRA_MUX_VGP5] = "VGP5",</div><div class='add'>+	[TEGRA_MUX_VGP6] = "VGP6",</div><div class='ctx'> 	[TEGRA_MUX_SAFE] = "&lt;safe&gt;",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -116,9 +162,9 @@ static const char *tegra_slew_names[TEGRA_MAX_SLEW] = {</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(mux_lock);</div><div class='ctx'> </div><div class='del'>-static const char *pingroup_name(enum tegra_pingroup pg)</div><div class='add'>+static const char *pingroup_name(int pg)</div><div class='ctx'> {</div><div class='del'>-	if (pg &lt; 0 || pg &gt;=  TEGRA_MAX_PINGROUP)</div><div class='add'>+	if (pg &lt; 0 || pg &gt;=  pingroup_max)</div><div class='ctx'> 		return "&lt;UNKNOWN&gt;";</div><div class='ctx'> </div><div class='ctx'> 	return pingroups[pg].name;</div><div class='hunk'>@@ -189,10 +235,10 @@ static int tegra_pinmux_set_func(const struct tegra_pingroup_config *config)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned long reg;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	enum tegra_pingroup pg = config-&gt;pingroup;</div><div class='add'>+	int pg = config-&gt;pingroup;</div><div class='ctx'> 	enum tegra_mux_func func = config-&gt;func;</div><div class='ctx'> </div><div class='del'>-	if (pg &lt; 0 || pg &gt;=  TEGRA_MAX_PINGROUP)</div><div class='add'>+	if (pg &lt; 0 || pg &gt;=  pingroup_max)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='ctx'> 	if (pingroups[pg].mux_reg &lt; 0)</div><div class='hunk'>@@ -230,13 +276,12 @@ static int tegra_pinmux_set_func(const struct tegra_pingroup_config *config)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int tegra_pinmux_set_tristate(enum tegra_pingroup pg,</div><div class='del'>-	enum tegra_tristate tristate)</div><div class='add'>+int tegra_pinmux_set_tristate(int pg, enum tegra_tristate tristate)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long reg;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (pg &lt; 0 || pg &gt;=  TEGRA_MAX_PINGROUP)</div><div class='add'>+	if (pg &lt; 0 || pg &gt;=  pingroup_max)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='ctx'> 	if (pingroups[pg].tri_reg &lt; 0)</div><div class='hunk'>@@ -255,13 +300,12 @@ int tegra_pinmux_set_tristate(enum tegra_pingroup pg,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int tegra_pinmux_set_pullupdown(enum tegra_pingroup pg,</div><div class='del'>-	enum tegra_pullupdown pupd)</div><div class='add'>+int tegra_pinmux_set_pullupdown(int pg, enum tegra_pullupdown pupd)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long reg;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (pg &lt; 0 || pg &gt;=  TEGRA_MAX_PINGROUP)</div><div class='add'>+	if (pg &lt; 0 || pg &gt;=  pingroup_max)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='ctx'> 	if (pingroups[pg].pupd_reg &lt; 0)</div><div class='hunk'>@@ -287,7 +331,7 @@ int tegra_pinmux_set_pullupdown(enum tegra_pingroup pg,</div><div class='ctx'> </div><div class='ctx'> static void tegra_pinmux_config_pingroup(const struct tegra_pingroup_config *config)</div><div class='ctx'> {</div><div class='del'>-	enum tegra_pingroup pingroup = config-&gt;pingroup;</div><div class='add'>+	int pingroup = config-&gt;pingroup;</div><div class='ctx'> 	enum tegra_mux_func func     = config-&gt;func;</div><div class='ctx'> 	enum tegra_pullupdown pupd   = config-&gt;pupd;</div><div class='ctx'> 	enum tegra_tristate tristate = config-&gt;tristate;</div><div class='hunk'>@@ -323,9 +367,9 @@ void tegra_pinmux_config_table(const struct tegra_pingroup_config *config, int l</div><div class='ctx'> 		tegra_pinmux_config_pingroup(&amp;config[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char *drive_pinmux_name(enum tegra_drive_pingroup pg)</div><div class='add'>+static const char *drive_pinmux_name(int pg)</div><div class='ctx'> {</div><div class='del'>-	if (pg &lt; 0 || pg &gt;=  TEGRA_MAX_DRIVE_PINGROUP)</div><div class='add'>+	if (pg &lt; 0 || pg &gt;=  drive_max)</div><div class='ctx'> 		return "&lt;UNKNOWN&gt;";</div><div class='ctx'> </div><div class='ctx'> 	return drive_pingroups[pg].name;</div><div class='hunk'>@@ -352,12 +396,11 @@ static const char *slew_name(unsigned long val)</div><div class='ctx'> 	return tegra_slew_names[val];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tegra_drive_pinmux_set_hsm(enum tegra_drive_pingroup pg,</div><div class='del'>-	enum tegra_hsm hsm)</div><div class='add'>+static int tegra_drive_pinmux_set_hsm(int pg, enum tegra_hsm hsm)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 reg;</div><div class='del'>-	if (pg &lt; 0 || pg &gt;=  TEGRA_MAX_DRIVE_PINGROUP)</div><div class='add'>+	if (pg &lt; 0 || pg &gt;=  drive_max)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='ctx'> 	if (hsm != TEGRA_HSM_ENABLE &amp;&amp; hsm != TEGRA_HSM_DISABLE)</div><div class='hunk'>@@ -377,12 +420,11 @@ static int tegra_drive_pinmux_set_hsm(enum tegra_drive_pingroup pg,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tegra_drive_pinmux_set_schmitt(enum tegra_drive_pingroup pg,</div><div class='del'>-	enum tegra_schmitt schmitt)</div><div class='add'>+static int tegra_drive_pinmux_set_schmitt(int pg, enum tegra_schmitt schmitt)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 reg;</div><div class='del'>-	if (pg &lt; 0 || pg &gt;=  TEGRA_MAX_DRIVE_PINGROUP)</div><div class='add'>+	if (pg &lt; 0 || pg &gt;=  drive_max)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='ctx'> 	if (schmitt != TEGRA_SCHMITT_ENABLE &amp;&amp; schmitt != TEGRA_SCHMITT_DISABLE)</div><div class='hunk'>@@ -402,12 +444,11 @@ static int tegra_drive_pinmux_set_schmitt(enum tegra_drive_pingroup pg,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tegra_drive_pinmux_set_drive(enum tegra_drive_pingroup pg,</div><div class='del'>-	enum tegra_drive drive)</div><div class='add'>+static int tegra_drive_pinmux_set_drive(int pg, enum tegra_drive drive)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 reg;</div><div class='del'>-	if (pg &lt; 0 || pg &gt;=  TEGRA_MAX_DRIVE_PINGROUP)</div><div class='add'>+	if (pg &lt; 0 || pg &gt;=  drive_max)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='ctx'> 	if (drive &lt; 0 || drive &gt;= TEGRA_MAX_DRIVE)</div><div class='hunk'>@@ -425,12 +466,12 @@ static int tegra_drive_pinmux_set_drive(enum tegra_drive_pingroup pg,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tegra_drive_pinmux_set_pull_down(enum tegra_drive_pingroup pg,</div><div class='add'>+static int tegra_drive_pinmux_set_pull_down(int pg,</div><div class='ctx'> 	enum tegra_pull_strength pull_down)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 reg;</div><div class='del'>-	if (pg &lt; 0 || pg &gt;=  TEGRA_MAX_DRIVE_PINGROUP)</div><div class='add'>+	if (pg &lt; 0 || pg &gt;=  drive_max)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='ctx'> 	if (pull_down &lt; 0 || pull_down &gt;= TEGRA_MAX_PULL)</div><div class='hunk'>@@ -448,12 +489,12 @@ static int tegra_drive_pinmux_set_pull_down(enum tegra_drive_pingroup pg,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tegra_drive_pinmux_set_pull_up(enum tegra_drive_pingroup pg,</div><div class='add'>+static int tegra_drive_pinmux_set_pull_up(int pg,</div><div class='ctx'> 	enum tegra_pull_strength pull_up)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 reg;</div><div class='del'>-	if (pg &lt; 0 || pg &gt;=  TEGRA_MAX_DRIVE_PINGROUP)</div><div class='add'>+	if (pg &lt; 0 || pg &gt;=  drive_max)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='ctx'> 	if (pull_up &lt; 0 || pull_up &gt;= TEGRA_MAX_PULL)</div><div class='hunk'>@@ -471,12 +512,12 @@ static int tegra_drive_pinmux_set_pull_up(enum tegra_drive_pingroup pg,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tegra_drive_pinmux_set_slew_rising(enum tegra_drive_pingroup pg,</div><div class='add'>+static int tegra_drive_pinmux_set_slew_rising(int pg,</div><div class='ctx'> 	enum tegra_slew slew_rising)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 reg;</div><div class='del'>-	if (pg &lt; 0 || pg &gt;=  TEGRA_MAX_DRIVE_PINGROUP)</div><div class='add'>+	if (pg &lt; 0 || pg &gt;=  drive_max)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='ctx'> 	if (slew_rising &lt; 0 || slew_rising &gt;= TEGRA_MAX_SLEW)</div><div class='hunk'>@@ -494,12 +535,12 @@ static int tegra_drive_pinmux_set_slew_rising(enum tegra_drive_pingroup pg,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tegra_drive_pinmux_set_slew_falling(enum tegra_drive_pingroup pg,</div><div class='add'>+static int tegra_drive_pinmux_set_slew_falling(int pg,</div><div class='ctx'> 	enum tegra_slew slew_falling)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 reg;</div><div class='del'>-	if (pg &lt; 0 || pg &gt;=  TEGRA_MAX_DRIVE_PINGROUP)</div><div class='add'>+	if (pg &lt; 0 || pg &gt;=  drive_max)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='ctx'> 	if (slew_falling &lt; 0 || slew_falling &gt;= TEGRA_MAX_SLEW)</div><div class='hunk'>@@ -517,7 +558,7 @@ static int tegra_drive_pinmux_set_slew_falling(enum tegra_drive_pingroup pg,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tegra_drive_pinmux_config_pingroup(enum tegra_drive_pingroup pingroup,</div><div class='add'>+static void tegra_drive_pinmux_config_pingroup(int pingroup,</div><div class='ctx'> 					  enum tegra_hsm hsm,</div><div class='ctx'> 					  enum tegra_schmitt schmitt,</div><div class='ctx'> 					  enum tegra_drive drive,</div><div class='hunk'>@@ -596,7 +637,7 @@ void tegra_pinmux_set_safe_pinmux_table(const struct tegra_pingroup_config *conf</div><div class='ctx'> 	for (i = 0; i &lt; len; i++) {</div><div class='ctx'> 		int err;</div><div class='ctx'> 		c = config[i];</div><div class='del'>-		if (c.pingroup &lt; 0 || c.pingroup &gt;= TEGRA_MAX_PINGROUP) {</div><div class='add'>+		if (c.pingroup &lt; 0 || c.pingroup &gt;= pingroup_max) {</div><div class='ctx'> 			WARN_ON(1);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -617,7 +658,7 @@ void tegra_pinmux_config_pinmux_table(const struct tegra_pingroup_config *config</div><div class='ctx'> 	for (i = 0; i &lt; len; i++) {</div><div class='ctx'> 		int err;</div><div class='ctx'> 		if (config[i].pingroup &lt; 0 ||</div><div class='del'>-		    config[i].pingroup &gt;= TEGRA_MAX_PINGROUP) {</div><div class='add'>+		    config[i].pingroup &gt;= pingroup_max) {</div><div class='ctx'> 			WARN_ON(1);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -635,7 +676,7 @@ void tegra_pinmux_config_tristate_table(const struct tegra_pingroup_config *conf</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int err;</div><div class='del'>-	enum tegra_pingroup pingroup;</div><div class='add'>+	int pingroup;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; len; i++) {</div><div class='ctx'> 		pingroup = config[i].pingroup;</div><div class='hunk'>@@ -654,7 +695,7 @@ void tegra_pinmux_config_pullupdown_table(const struct tegra_pingroup_config *co</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int err;</div><div class='del'>-	enum tegra_pingroup pingroup;</div><div class='add'>+	int pingroup;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; len; i++) {</div><div class='ctx'> 		pingroup = config[i].pingroup;</div><div class='hunk'>@@ -668,11 +709,36 @@ void tegra_pinmux_config_pullupdown_table(const struct tegra_pingroup_config *co</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct of_device_id tegra_pinmux_of_match[] __devinitdata = {</div><div class='add'>+#ifdef CONFIG_ARCH_TEGRA_2x_SOC</div><div class='add'>+	{ .compatible = "nvidia,tegra20-pinmux", tegra20_pinmux_init },</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_ARCH_TEGRA_3x_SOC</div><div class='add'>+	{ .compatible = "nvidia,tegra30-pinmux", tegra30_pinmux_init },</div><div class='add'>+#endif</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __devinit tegra_pinmux_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int config_bad = 0;</div><div class='add'>+	const struct of_device_id *match;</div><div class='add'>+</div><div class='add'>+	match = of_match_device(tegra_pinmux_of_match, &amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (match)</div><div class='add'>+		((pinmux_init)(match-&gt;data))(&amp;pingroups, &amp;pingroup_max,</div><div class='add'>+			&amp;drive_pingroups, &amp;drive_max);</div><div class='add'>+#ifdef CONFIG_ARCH_TEGRA_2x_SOC</div><div class='add'>+	else</div><div class='add'>+		/* no device tree available, so we must be on tegra20 */</div><div class='add'>+		tegra20_pinmux_init(&amp;pingroups, &amp;pingroup_max,</div><div class='add'>+					&amp;drive_pingroups, &amp;drive_max);</div><div class='add'>+#else</div><div class='add'>+	pr_warn("non Tegra20 platform requires pinmux devicetree node\n");</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; ; i++) {</div><div class='ctx'> 		res = platform_get_resource(pdev, IORESOURCE_MEM, i);</div><div class='hunk'>@@ -681,7 +747,7 @@ static int __devinit tegra_pinmux_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	nbanks = i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; TEGRA_MAX_PINGROUP; i++) {</div><div class='add'>+	for (i = 0; i &lt; pingroup_max; i++) {</div><div class='ctx'> 		if (pingroups[i].tri_bank &gt;= nbanks) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "pingroup %d: bad tri_bank\n", i);</div><div class='ctx'> 			config_bad = 1;</div><div class='hunk'>@@ -698,7 +764,7 @@ static int __devinit tegra_pinmux_probe(struct platform_device *pdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; TEGRA_MAX_DRIVE_PINGROUP; i++) {</div><div class='add'>+	for (i = 0; i &lt; drive_max; i++) {</div><div class='ctx'> 		if (drive_pingroups[i].reg_bank &gt;= nbanks) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 				"drive pingroup %d: bad reg_bank\n", i);</div><div class='hunk'>@@ -741,11 +807,6 @@ static int __devinit tegra_pinmux_probe(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id tegra_pinmux_of_match[] __devinitdata = {</div><div class='del'>-	{ .compatible = "nvidia,tegra20-pinmux", },</div><div class='del'>-	{ },</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct platform_driver tegra_pinmux_driver = {</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "tegra-pinmux",</div><div class='hunk'>@@ -779,7 +840,7 @@ static int dbg_pinmux_show(struct seq_file *s, void *unused)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; TEGRA_MAX_PINGROUP; i++) {</div><div class='add'>+	for (i = 0; i &lt; pingroup_max; i++) {</div><div class='ctx'> 		unsigned long reg;</div><div class='ctx'> 		unsigned long tri;</div><div class='ctx'> 		unsigned long mux;</div><div class='hunk'>@@ -850,7 +911,7 @@ static int dbg_drive_pinmux_show(struct seq_file *s, void *unused)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; TEGRA_MAX_DRIVE_PINGROUP; i++) {</div><div class='add'>+	for (i = 0; i &lt; drive_max; i++) {</div><div class='ctx'> 		u32 reg;</div><div class='ctx'> </div><div class='ctx'> 		seq_printf(s, "\t{TEGRA_DRIVE_PINGROUP_%s",</div><div class='head'>diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c<br/>index 371869d8ea01..ff9e6b6c0460 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/tegra2_clocks.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/tegra2_clocks.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/tegra2_clocks.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/tegra2_clocks.c</a></div><div class='hunk'>@@ -174,7 +174,7 @@ static int tegra_periph_clk_enable_refcount[3 * 32];</div><div class='ctx'> #define pmc_readl(reg) \</div><div class='ctx'> 	__raw_readl(reg_pmc_base + (reg))</div><div class='ctx'> </div><div class='del'>-unsigned long clk_measure_input_freq(void)</div><div class='add'>+static unsigned long clk_measure_input_freq(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 clock_autodetect;</div><div class='ctx'> 	clk_writel(OSC_FREQ_DET_TRIG | 1, OSC_FREQ_DET);</div><div class='hunk'>@@ -278,18 +278,6 @@ static struct clk_ops tegra_clk_m_ops = {</div><div class='ctx'> 	.disable	= tegra2_clk_m_disable,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void tegra2_periph_reset_assert(struct clk *c)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!c-&gt;ops-&gt;reset);</div><div class='del'>-	c-&gt;ops-&gt;reset(c, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void tegra2_periph_reset_deassert(struct clk *c)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!c-&gt;ops-&gt;reset);</div><div class='del'>-	c-&gt;ops-&gt;reset(c, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* super clock functions */</div><div class='ctx'> /* "super clocks" on tegra have two-stage muxes and a clock skipping</div><div class='ctx'>  * super divider.  We will ignore the clock skipping divider, since we</div><div class='hunk'>@@ -1132,6 +1120,9 @@ static struct clk_ops tegra_periph_clk_ops = {</div><div class='ctx'> void tegra2_sdmmc_tap_delay(struct clk *c, int delay)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;c-&gt;spinlock, flags);</div><div class='ctx'> </div><div class='ctx'> 	delay = clamp(delay, 0, 15);</div><div class='ctx'> 	reg = clk_readl(c-&gt;reg);</div><div class='hunk'>@@ -1139,6 +1130,8 @@ void tegra2_sdmmc_tap_delay(struct clk *c, int delay)</div><div class='ctx'> 	reg |= SDMMC_CLK_INT_FB_SEL;</div><div class='ctx'> 	reg |= delay &lt;&lt; SDMMC_CLK_INT_FB_DLY_SHIFT;</div><div class='ctx'> 	clk_writel(reg, c-&gt;reg);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;c-&gt;spinlock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* External memory controller clock ops */</div><div class='head'>diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c<br/>index e2272d263a83..1d1acda4f3e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/timer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-tegra/timer.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/time.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='hunk'>@@ -106,25 +105,9 @@ static struct clock_event_device tegra_clockevent = {</div><div class='ctx'> 	.set_mode	= tegra_timer_set_mode,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_CLOCK_DATA(cd);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Constants generated by clocks_calc_mult_shift(m, s, 1MHz, NSEC_PER_SEC, 60).</div><div class='del'>- * This gives a resolution of about 1us and a wrap period of about 1h11min.</div><div class='del'>- */</div><div class='del'>-#define SC_MULT		4194304000u</div><div class='del'>-#define SC_SHIFT	22</div><div class='del'>-</div><div class='del'>-unsigned long long notrace sched_clock(void)</div><div class='add'>+static u32 notrace tegra_read_sched_clock(void)</div><div class='ctx'> {</div><div class='del'>-	u32 cyc = timer_readl(TIMERUS_CNTR_1US);</div><div class='del'>-	return cyc_to_fixed_sched_clock(&amp;cd, cyc, (u32)~0, SC_MULT, SC_SHIFT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void notrace tegra_update_sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	u32 cyc = timer_readl(TIMERUS_CNTR_1US);</div><div class='del'>-	update_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='add'>+	return timer_readl(TIMERUS_CNTR_1US);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -182,20 +165,28 @@ static struct irqaction tegra_timer_irq = {</div><div class='ctx'> static void __init tegra_init_timer(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk *clk;</div><div class='del'>-	unsigned long rate = clk_measure_input_freq();</div><div class='add'>+	unsigned long rate;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	clk = clk_get_sys("timer", NULL);</div><div class='del'>-	BUG_ON(IS_ERR(clk));</div><div class='del'>-	clk_enable(clk);</div><div class='add'>+	if (IS_ERR(clk)) {</div><div class='add'>+		pr_warn("Unable to get timer clock."</div><div class='add'>+			" Assuming 12Mhz input clock.\n");</div><div class='add'>+		rate = 12000000;</div><div class='add'>+	} else {</div><div class='add'>+		clk_enable(clk);</div><div class='add'>+		rate = clk_get_rate(clk);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * rtc registers are used by read_persistent_clock, keep the rtc clock</div><div class='ctx'> 	 * enabled</div><div class='ctx'> 	 */</div><div class='ctx'> 	clk = clk_get_sys("rtc-tegra", NULL);</div><div class='del'>-	BUG_ON(IS_ERR(clk));</div><div class='del'>-	clk_enable(clk);</div><div class='add'>+	if (IS_ERR(clk))</div><div class='add'>+		pr_warn("Unable to get rtc-tegra clock\n");</div><div class='add'>+	else</div><div class='add'>+		clk_enable(clk);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HAVE_ARM_TWD</div><div class='ctx'> 	twd_base = IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x600);</div><div class='hunk'>@@ -218,8 +209,7 @@ static void __init tegra_init_timer(void)</div><div class='ctx'> 		WARN(1, "Unknown clock rate");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	init_fixed_sched_clock(&amp;cd, tegra_update_sched_clock, 32,</div><div class='del'>-			       1000000, SC_MULT, SC_SHIFT);</div><div class='add'>+	setup_sched_clock(tegra_read_sched_clock, 32, 1000000);</div><div class='ctx'> </div><div class='ctx'> 	if (clocksource_mmio_init(timer_reg_base + TIMERUS_CNTR_1US,</div><div class='ctx'> 		"timer_us", 1000000, 300, 32, clocksource_mmio_readl_up)) {</div><div class='head'>diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig<br/>index 1cbcd4fc1e17..54d8f34fdee5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-u300/Kconfig</a></div><div class='hunk'>@@ -7,8 +7,8 @@ comment "ST-Ericsson Mobile Platform Products"</div><div class='ctx'> config MACH_U300</div><div class='ctx'> 	bool "U300"</div><div class='ctx'> 	select PINCTRL</div><div class='del'>-	select PINMUX_U300</div><div class='del'>-	select GPIO_U300</div><div class='add'>+	select PINCTRL_U300</div><div class='add'>+	select PINCTRL_COH901</div><div class='ctx'> </div><div class='ctx'> comment "ST-Ericsson U300/U330/U335/U365 Feature Selections"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c<br/>index ac0791e924bc..b4c6926a700c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-u300/core.c</a></div><div class='hunk'>@@ -1605,15 +1605,15 @@ static struct platform_device pinmux_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Pinmux settings */</div><div class='del'>-static struct pinmux_map u300_pinmux_map[] = {</div><div class='add'>+static struct pinmux_map __initdata u300_pinmux_map[] = {</div><div class='ctx'> 	/* anonymous maps for chip power and EMIFs */</div><div class='del'>-	PINMUX_MAP_PRIMARY_SYS_HOG("POWER", "power"),</div><div class='del'>-	PINMUX_MAP_PRIMARY_SYS_HOG("EMIF0", "emif0"),</div><div class='del'>-	PINMUX_MAP_PRIMARY_SYS_HOG("EMIF1", "emif1"),</div><div class='add'>+	PINMUX_MAP_SYS_HOG("POWER", "pinmux-u300", "power"),</div><div class='add'>+	PINMUX_MAP_SYS_HOG("EMIF0", "pinmux-u300", "emif0"),</div><div class='add'>+	PINMUX_MAP_SYS_HOG("EMIF1", "pinmux-u300", "emif1"),</div><div class='ctx'> 	/* per-device maps for MMC/SD, SPI and UART */</div><div class='del'>-	PINMUX_MAP_PRIMARY("MMCSD", "mmc0", "mmci"),</div><div class='del'>-	PINMUX_MAP_PRIMARY("SPI", "spi0", "pl022"),</div><div class='del'>-	PINMUX_MAP_PRIMARY("UART0", "uart0", "uart0"),</div><div class='add'>+	PINMUX_MAP("MMCSD", "pinmux-u300", "mmc0", "mmci"),</div><div class='add'>+	PINMUX_MAP("SPI", "pinmux-u300", "spi0", "pl022"),</div><div class='add'>+	PINMUX_MAP("UART0", "pinmux-u300", "uart0", "uart0"),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct u300_mux_hog {</div><div class='hunk'>@@ -1888,3 +1888,23 @@ static int core_module_init(void)</div><div class='ctx'> 	return mmc_init(&amp;mmcsd_device);</div><div class='ctx'> }</div><div class='ctx'> module_init(core_module_init);</div><div class='add'>+</div><div class='add'>+/* Forward declare this function from the watchdog */</div><div class='add'>+void coh901327_watchdog_reset(void);</div><div class='add'>+</div><div class='add'>+void u300_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case 's':</div><div class='add'>+	case 'h':</div><div class='add'>+#ifdef CONFIG_COH901327_WATCHDOG</div><div class='add'>+		coh901327_watchdog_reset();</div><div class='add'>+#endif</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* Do nothing */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	/* Wait for system do die/reset. */</div><div class='add'>+	while (1);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-u300/include/mach/entry-macro.S b/arch/arm/mach-u300/include/mach/entry-macro.S<br/>index 20731ae39d38..7181d6ac6651 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-u300/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -8,33 +8,9 @@</div><div class='ctx'>  * Low-level IRQ helper macros for ST-Ericsson U300</div><div class='ctx'>  * Author: Linus Walleij &lt;linus.walleij@stericsson.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.macro	disable_fiq</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro  get_irqnr_preamble, base, tmp</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='ctx'> 	.macro  arch_ret_to_user, tmp1, tmp2</div><div class='ctx'> 	.endm</div><div class='del'>-</div><div class='del'>-	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-	ldr	\base, = U300_AHB_PER_VIRT_BASE-U300_AHB_PER_PHYS_BASE+U300_INTCON0_BASE</div><div class='del'>-	ldr	\irqstat, [\base, #VIC_IRQ_STATUS] @ get masked status</div><div class='del'>-	mov	\irqnr, #0</div><div class='del'>-	teq	\irqstat, #0</div><div class='del'>-	bne	1002f</div><div class='del'>-1001:	ldr	\base, = U300_AHB_PER_VIRT_BASE-U300_AHB_PER_PHYS_BASE+U300_INTCON1_BASE</div><div class='del'>-	ldr	\irqstat, [\base, #VIC_IRQ_STATUS] @ get masked status</div><div class='del'>-	mov	\irqnr, #32</div><div class='del'>-	teq	\irqstat, #0</div><div class='del'>-	beq	1003f</div><div class='del'>-1002:	tst	\irqstat, #1</div><div class='del'>-	bne	1003f</div><div class='del'>-	add	\irqnr, \irqnr, #1</div><div class='del'>-	movs	\irqstat, \irqstat, lsr #1</div><div class='del'>-	bne	1002b</div><div class='del'>-1003:		/* EQ will be set if no irqs pending */</div><div class='del'>-	.endm</div><div class='head'>diff --git a/arch/arm/mach-u300/include/mach/gpio-u300.h b/arch/arm/mach-u300/include/mach/gpio-u300.h<br/>index 0c2b2021951a..bf4c7935aecd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/include/mach/gpio-u300.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/include/mach/gpio-u300.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/include/mach/gpio-u300.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-u300/include/mach/gpio-u300.h</a></div><div class='hunk'>@@ -9,121 +9,6 @@</div><div class='ctx'> #ifndef __MACH_U300_GPIO_U300_H</div><div class='ctx'> #define __MACH_U300_GPIO_U300_H</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Individual pin assignments for the B26/S26. Notice that the</div><div class='del'>- * actual usage of these pins depends on the PAD MUX settings, that</div><div class='del'>- * is why the same number can potentially appear several times.</div><div class='del'>- * In the reference design each pin is only used for one purpose.</div><div class='del'>- * These were determined by inspecting the B26/S26 schematic:</div><div class='del'>- * 2/1911-ROA 128 1603</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_MACH_U300_BS2X</div><div class='del'>-#define U300_GPIO_PIN_UART_RX		0</div><div class='del'>-#define U300_GPIO_PIN_UART_TX		1</div><div class='del'>-#define U300_GPIO_PIN_GPIO02		2  /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO03		3  /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_CAM_SLEEP		4</div><div class='del'>-#define U300_GPIO_PIN_CAM_REG_EN	5</div><div class='del'>-#define U300_GPIO_PIN_GPIO06		6  /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO07		7  /* Unrouted */</div><div class='del'>-</div><div class='del'>-#define U300_GPIO_PIN_GPIO08		8  /* Service point SP2321 */</div><div class='del'>-#define U300_GPIO_PIN_GPIO09		9  /* Service point SP2322 */</div><div class='del'>-#define U300_GPIO_PIN_PHFSENSE		10 /* Headphone jack sensing */</div><div class='del'>-#define U300_GPIO_PIN_MMC_CLKRET	11 /* Clock return from MMC/SD card */</div><div class='del'>-#define U300_GPIO_PIN_MMC_CD		12 /* MMC Card insertion detection */</div><div class='del'>-#define U300_GPIO_PIN_FLIPSENSE		13 /* Mechanical flip sensing */</div><div class='del'>-#define U300_GPIO_PIN_GPIO14		14 /* DSP JTAG Port RTCK */</div><div class='del'>-#define U300_GPIO_PIN_GPIO15		15 /* Unrouted */</div><div class='del'>-</div><div class='del'>-#define U300_GPIO_PIN_GPIO16		16 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO17		17 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO18		18 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO19		19 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO20		20 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO21		21 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO22		22 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO23		23 /* Unrouted */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Individual pin assignments for the B330/S330 and B365/S365.</div><div class='del'>- * Notice that the actual usage of these pins depends on the</div><div class='del'>- * PAD MUX settings, that is why the same number can potentially</div><div class='del'>- * appear several times. In the reference design each pin is only</div><div class='del'>- * used for one purpose. These were determined by inspecting the</div><div class='del'>- * S365 schematic.</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_MACH_U300_BS330) || defined(CONFIG_MACH_U300_BS365) || \</div><div class='del'>-    defined(CONFIG_MACH_U300_BS335)</div><div class='del'>-#define U300_GPIO_PIN_UART_RX		0</div><div class='del'>-#define U300_GPIO_PIN_UART_TX		1</div><div class='del'>-#define U300_GPIO_PIN_UART_CTS		2</div><div class='del'>-#define U300_GPIO_PIN_UART_RTS		3</div><div class='del'>-#define U300_GPIO_PIN_CAM_MAIN_STANDBY	4 /* Camera MAIN standby */</div><div class='del'>-#define U300_GPIO_PIN_GPIO05		5 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_MS_CD		6 /* Memory Stick Card insertion */</div><div class='del'>-#define U300_GPIO_PIN_GPIO07		7 /* Test point TP2430 */</div><div class='del'>-</div><div class='del'>-#define U300_GPIO_PIN_GPIO08		8 /* Test point TP2437 */</div><div class='del'>-#define U300_GPIO_PIN_GPIO09		9 /* Test point TP2431 */</div><div class='del'>-#define U300_GPIO_PIN_GPIO10		10 /* Test point TP2432 */</div><div class='del'>-#define U300_GPIO_PIN_MMC_CLKRET	11 /* Clock return from MMC/SD card */</div><div class='del'>-#define U300_GPIO_PIN_MMC_CD		12 /* MMC Card insertion detection */</div><div class='del'>-#define U300_GPIO_PIN_CAM_SUB_STANDBY	13 /* Camera SUB standby */</div><div class='del'>-#define U300_GPIO_PIN_GPIO14		14 /* Test point TP2436 */</div><div class='del'>-#define U300_GPIO_PIN_GPIO15		15 /* Unrouted */</div><div class='del'>-</div><div class='del'>-#define U300_GPIO_PIN_GPIO16		16 /* Test point TP2438 */</div><div class='del'>-#define U300_GPIO_PIN_PHFSENSE		17 /* Headphone jack sensing */</div><div class='del'>-#define U300_GPIO_PIN_GPIO18		18 /* Test point TP2439 */</div><div class='del'>-#define U300_GPIO_PIN_GPIO19		19 /* Routed somewhere */</div><div class='del'>-#define U300_GPIO_PIN_GPIO20		20 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO21		21 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO22		22 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO23		23 /* Unrouted */</div><div class='del'>-</div><div class='del'>-#define U300_GPIO_PIN_GPIO24		24 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO25		25 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO26		26 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO27		27 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO28		28 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO29		29 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO30		30 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO31		31 /* Unrouted */</div><div class='del'>-</div><div class='del'>-#define U300_GPIO_PIN_GPIO32		32 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO33		33 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO34		34 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO35		35 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO36		36 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO37		37 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO38		38 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO39		39 /* Unrouted */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MACH_U300_BS335</div><div class='del'>-</div><div class='del'>-#define U300_GPIO_PIN_GPIO40		40 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO41		41 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO42		42 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO43		43 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO44		44 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO45		45 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO46		46 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO47		47 /* Unrouted */</div><div class='del'>-</div><div class='del'>-#define U300_GPIO_PIN_GPIO48		48 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO49		49 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO50		50 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO51		51 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO52		52 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO53		53 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO54		54 /* Unrouted */</div><div class='del'>-#define U300_GPIO_PIN_GPIO55		55 /* Unrouted */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * enum u300_gpio_variant - the type of U300 GPIO employed</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/arm/mach-u300/include/mach/irqs.h b/arch/arm/mach-u300/include/mach/irqs.h<br/>index db3fbfa1d6e9..ee78a26707eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/include/mach/irqs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/include/mach/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/include/mach/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-u300/include/mach/irqs.h</a></div><div class='hunk'>@@ -110,7 +110,7 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Maximum 8*7 GPIO lines */</div><div class='del'>-#ifdef CONFIG_GPIO_U300</div><div class='add'>+#ifdef CONFIG_PINCTRL_COH901</div><div class='ctx'> #define IRQ_U300_GPIO_BASE		(U300_VIC_IRQS_END)</div><div class='ctx'> #define IRQ_U300_GPIO_END		(IRQ_U300_GPIO_BASE + 56)</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/arm/mach-u300/include/mach/memory.h b/arch/arm/mach-u300/include/mach/memory.h<br/>deleted file mode 100644<br/>index c808f347a081..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/include/mach/memory.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/include/mach/memory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * arch/arm/mach-u300/include/mach/memory.h</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2007-2009 ST-Ericsson AB</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='del'>- * Memory virtual/physical mapping constants.</div><div class='del'>- * Author: Linus Walleij &lt;linus.walleij@stericsson.com&gt;</div><div class='del'>- * Author: Jonas Aaberg &lt;jonas.aberg@stericsson.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __MACH_MEMORY_H</div><div class='del'>-#define __MACH_MEMORY_H</div><div class='del'>-</div><div class='del'>-#define PLAT_PHYS_OFFSET	UL(0x48000000)</div><div class='del'>-#define BOOT_PARAMS_OFFSET	0x100</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mach-u300/include/mach/platform.h b/arch/arm/mach-u300/include/mach/platform.h<br/>index 77d9210a82e2..096333f32fc3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/include/mach/platform.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/include/mach/platform.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/include/mach/platform.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-u300/include/mach/platform.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> void u300_map_io(void);</div><div class='ctx'> void u300_init_irq(void);</div><div class='ctx'> void u300_init_devices(void);</div><div class='add'>+void u300_restart(char, const char *);</div><div class='ctx'> extern struct sys_timer u300_timer;</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-u300/include/mach/system.h b/arch/arm/mach-u300/include/mach/system.h<br/>index 8daf13634ce0..574d46e38290 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-u300/include/mach/system.h</a></div><div class='hunk'>@@ -8,35 +8,7 @@</div><div class='ctx'>  * System shutdown and reset functions.</div><div class='ctx'>  * Author: Linus Walleij &lt;linus.walleij@stericsson.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware/vic.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-</div><div class='del'>-/* Forward declare this function from the watchdog */</div><div class='del'>-void coh901327_watchdog_reset(void);</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case 's':</div><div class='del'>-	case 'h':</div><div class='del'>-		printk(KERN_CRIT "RESET: shutting down/rebooting system\n");</div><div class='del'>-		/* Disable interrupts */</div><div class='del'>-		local_irq_disable();</div><div class='del'>-#ifdef CONFIG_COH901327_WATCHDOG</div><div class='del'>-		coh901327_watchdog_reset();</div><div class='del'>-#endif</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* Do nothing */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	/* Wait for system do die/reset. */</div><div class='del'>-	while (1);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/mach-u300/include/mach/vmalloc.h b/arch/arm/mach-u300/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index ec423b92b81d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * arch/arm/mach-u300/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2006-2009 ST-Ericsson AB</div><div class='del'>- * License terms: GNU General Public License (GPL) version 2</div><div class='del'>- * Virtual memory allocations</div><div class='del'>- * End must be above the I/O registers and on an even 2MiB boundary.</div><div class='del'>- * Author: Linus Walleij &lt;linus.walleij@stericsson.com&gt;</div><div class='del'>- */</div><div class='del'>-#define VMALLOC_END	0xfe800000UL</div><div class='head'>diff --git a/arch/arm/mach-u300/mmc.c b/arch/arm/mach-u300/mmc.c<br/>index 4d482aacc272..05abd6ad9fab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/mmc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/mmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/mmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-u300/mmc.c</a></div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;mach/coh901318.h&gt;</div><div class='ctx'> #include &lt;mach/dma_channels.h&gt;</div><div class='del'>-#include &lt;mach/gpio-u300.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "u300-gpio.h"</div><div class='ctx'> #include "mmc.h"</div><div class='ctx'> </div><div class='ctx'> static struct mmci_platform_data mmc0_plat_data = {</div><div class='head'>diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c<br/>index 5f51bdeef0ef..bc1c7897e82d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/timer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-u300/timer.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Author: Linus Walleij &lt;linus.walleij@stericsson.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='hunk'>@@ -337,18 +336,10 @@ static struct irqaction u300_timer_irq = {</div><div class='ctx'>  * this wraps around for now, since it is just a relative time</div><div class='ctx'>  * stamp. (Inspired by OMAP implementation.)</div><div class='ctx'>  */</div><div class='del'>-static DEFINE_CLOCK_DATA(cd);</div><div class='ctx'> </div><div class='del'>-unsigned long long notrace sched_clock(void)</div><div class='add'>+static u32 notrace u300_read_sched_clock(void)</div><div class='ctx'> {</div><div class='del'>-	u32 cyc = readl(U300_TIMER_APP_VBASE + U300_TIMER_APP_GPT2CC);</div><div class='del'>-	return cyc_to_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void notrace u300_update_sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	u32 cyc = readl(U300_TIMER_APP_VBASE + U300_TIMER_APP_GPT2CC);</div><div class='del'>-	update_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='add'>+	return readl(U300_TIMER_APP_VBASE + U300_TIMER_APP_GPT2CC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -366,7 +357,7 @@ static void __init u300_timer_init(void)</div><div class='ctx'> 	clk_enable(clk);</div><div class='ctx'> 	rate = clk_get_rate(clk);</div><div class='ctx'> </div><div class='del'>-	init_sched_clock(&amp;cd, u300_update_sched_clock, 32, rate);</div><div class='add'>+	setup_sched_clock(u300_read_sched_clock, 32, rate);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Disable the "OS" and "DD" timers - these are designed for Symbian!</div><div class='head'>diff --git a/arch/arm/mach-u300/u300-gpio.h b/arch/arm/mach-u300/u300-gpio.h<br/>new file mode 100644<br/>index 000000000000..847dc25300c6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/u300-gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-u300/u300-gpio.h</a></div><div class='hunk'>@@ -0,0 +1,114 @@</div><div class='add'>+/*</div><div class='add'>+ * Individual pin assignments for the B26/S26. Notice that the</div><div class='add'>+ * actual usage of these pins depends on the PAD MUX settings, that</div><div class='add'>+ * is why the same number can potentially appear several times.</div><div class='add'>+ * In the reference design each pin is only used for one purpose.</div><div class='add'>+ * These were determined by inspecting the B26/S26 schematic:</div><div class='add'>+ * 2/1911-ROA 128 1603</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_MACH_U300_BS2X</div><div class='add'>+#define U300_GPIO_PIN_UART_RX		0</div><div class='add'>+#define U300_GPIO_PIN_UART_TX		1</div><div class='add'>+#define U300_GPIO_PIN_GPIO02		2  /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO03		3  /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_CAM_SLEEP		4</div><div class='add'>+#define U300_GPIO_PIN_CAM_REG_EN	5</div><div class='add'>+#define U300_GPIO_PIN_GPIO06		6  /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO07		7  /* Unrouted */</div><div class='add'>+</div><div class='add'>+#define U300_GPIO_PIN_GPIO08		8  /* Service point SP2321 */</div><div class='add'>+#define U300_GPIO_PIN_GPIO09		9  /* Service point SP2322 */</div><div class='add'>+#define U300_GPIO_PIN_PHFSENSE		10 /* Headphone jack sensing */</div><div class='add'>+#define U300_GPIO_PIN_MMC_CLKRET	11 /* Clock return from MMC/SD card */</div><div class='add'>+#define U300_GPIO_PIN_MMC_CD		12 /* MMC Card insertion detection */</div><div class='add'>+#define U300_GPIO_PIN_FLIPSENSE		13 /* Mechanical flip sensing */</div><div class='add'>+#define U300_GPIO_PIN_GPIO14		14 /* DSP JTAG Port RTCK */</div><div class='add'>+#define U300_GPIO_PIN_GPIO15		15 /* Unrouted */</div><div class='add'>+</div><div class='add'>+#define U300_GPIO_PIN_GPIO16		16 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO17		17 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO18		18 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO19		19 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO20		20 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO21		21 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO22		22 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO23		23 /* Unrouted */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Individual pin assignments for the B330/S330 and B365/S365.</div><div class='add'>+ * Notice that the actual usage of these pins depends on the</div><div class='add'>+ * PAD MUX settings, that is why the same number can potentially</div><div class='add'>+ * appear several times. In the reference design each pin is only</div><div class='add'>+ * used for one purpose. These were determined by inspecting the</div><div class='add'>+ * S365 schematic.</div><div class='add'>+ */</div><div class='add'>+#if defined(CONFIG_MACH_U300_BS330) || defined(CONFIG_MACH_U300_BS365) || \</div><div class='add'>+    defined(CONFIG_MACH_U300_BS335)</div><div class='add'>+#define U300_GPIO_PIN_UART_RX		0</div><div class='add'>+#define U300_GPIO_PIN_UART_TX		1</div><div class='add'>+#define U300_GPIO_PIN_UART_CTS		2</div><div class='add'>+#define U300_GPIO_PIN_UART_RTS		3</div><div class='add'>+#define U300_GPIO_PIN_CAM_MAIN_STANDBY	4 /* Camera MAIN standby */</div><div class='add'>+#define U300_GPIO_PIN_GPIO05		5 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_MS_CD		6 /* Memory Stick Card insertion */</div><div class='add'>+#define U300_GPIO_PIN_GPIO07		7 /* Test point TP2430 */</div><div class='add'>+</div><div class='add'>+#define U300_GPIO_PIN_GPIO08		8 /* Test point TP2437 */</div><div class='add'>+#define U300_GPIO_PIN_GPIO09		9 /* Test point TP2431 */</div><div class='add'>+#define U300_GPIO_PIN_GPIO10		10 /* Test point TP2432 */</div><div class='add'>+#define U300_GPIO_PIN_MMC_CLKRET	11 /* Clock return from MMC/SD card */</div><div class='add'>+#define U300_GPIO_PIN_MMC_CD		12 /* MMC Card insertion detection */</div><div class='add'>+#define U300_GPIO_PIN_CAM_SUB_STANDBY	13 /* Camera SUB standby */</div><div class='add'>+#define U300_GPIO_PIN_GPIO14		14 /* Test point TP2436 */</div><div class='add'>+#define U300_GPIO_PIN_GPIO15		15 /* Unrouted */</div><div class='add'>+</div><div class='add'>+#define U300_GPIO_PIN_GPIO16		16 /* Test point TP2438 */</div><div class='add'>+#define U300_GPIO_PIN_PHFSENSE		17 /* Headphone jack sensing */</div><div class='add'>+#define U300_GPIO_PIN_GPIO18		18 /* Test point TP2439 */</div><div class='add'>+#define U300_GPIO_PIN_GPIO19		19 /* Routed somewhere */</div><div class='add'>+#define U300_GPIO_PIN_GPIO20		20 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO21		21 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO22		22 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO23		23 /* Unrouted */</div><div class='add'>+</div><div class='add'>+#define U300_GPIO_PIN_GPIO24		24 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO25		25 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO26		26 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO27		27 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO28		28 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO29		29 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO30		30 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO31		31 /* Unrouted */</div><div class='add'>+</div><div class='add'>+#define U300_GPIO_PIN_GPIO32		32 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO33		33 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO34		34 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO35		35 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO36		36 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO37		37 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO38		38 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO39		39 /* Unrouted */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MACH_U300_BS335</div><div class='add'>+</div><div class='add'>+#define U300_GPIO_PIN_GPIO40		40 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO41		41 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO42		42 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO43		43 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO44		44 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO45		45 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO46		46 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO47		47 /* Unrouted */</div><div class='add'>+</div><div class='add'>+#define U300_GPIO_PIN_GPIO48		48 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO49		49 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO50		50 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO51		51 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO52		52 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO53		53 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO54		54 /* Unrouted */</div><div class='add'>+#define U300_GPIO_PIN_GPIO55		55 /* Unrouted */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-u300/u300.c b/arch/arm/mach-u300/u300.c<br/>index 89422ee7f3a8..f30c69d91d99 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/u300.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-u300/u300.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-u300/u300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-u300/u300.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/platform.h&gt;</div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='hunk'>@@ -46,9 +47,11 @@ static void __init u300_init_machine(void)</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(U300, MACH_U300_STRING)</div><div class='ctx'> 	/* Maintainer: Linus Walleij &lt;linus.walleij@stericsson.com&gt; */</div><div class='del'>-	.atag_offset	= BOOT_PARAMS_OFFSET,</div><div class='add'>+	.atag_offset	= 0x100,</div><div class='ctx'> 	.map_io		= u300_map_io,</div><div class='ctx'> 	.init_irq	= u300_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;u300_timer,</div><div class='ctx'> 	.init_machine	= u300_init_machine,</div><div class='add'>+	.restart	= u300_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c<br/>index 6826faeecc68..23be34b3bb6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/board-mop500-sdi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/board-mop500-sdi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/board-mop500-sdi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/board-mop500-sdi.c</a></div><div class='hunk'>@@ -22,6 +22,12 @@</div><div class='ctx'> #include "ste-dma40-db8500.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * v2 has a new version of this block that need to be forced, the number found</div><div class='add'>+ * in hardware is incorrect</div><div class='add'>+ */</div><div class='add'>+#define U8500_SDI_V2_PERIPHID 0x10480180</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * SDI 0 (MicroSD slot)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -117,10 +123,7 @@ static void sdi0_configure(void)</div><div class='ctx'> 	gpio_direction_output(sdi0_en, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* Add the device, force v2 to subrevision 1 */</div><div class='del'>-	if (cpu_is_u8500v2())</div><div class='del'>-		db8500_add_sdi0(&amp;mop500_sdi0_data, 0x10480180);</div><div class='del'>-	else</div><div class='del'>-		db8500_add_sdi0(&amp;mop500_sdi0_data, 0);</div><div class='add'>+	db8500_add_sdi0(&amp;mop500_sdi0_data, U8500_SDI_V2_PERIPHID);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mop500_sdi_tc35892_init(void)</div><div class='hunk'>@@ -132,6 +135,42 @@ void mop500_sdi_tc35892_init(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * SDI1 (SDIO WLAN)</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_STE_DMA40</div><div class='add'>+static struct stedma40_chan_cfg sdi1_dma_cfg_rx = {</div><div class='add'>+	.mode = STEDMA40_MODE_LOGICAL,</div><div class='add'>+	.dir = STEDMA40_PERIPH_TO_MEM,</div><div class='add'>+	.src_dev_type = DB8500_DMA_DEV32_SD_MM1_RX,</div><div class='add'>+	.dst_dev_type = STEDMA40_DEV_DST_MEMORY,</div><div class='add'>+	.src_info.data_width = STEDMA40_WORD_WIDTH,</div><div class='add'>+	.dst_info.data_width = STEDMA40_WORD_WIDTH,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct stedma40_chan_cfg sdi1_dma_cfg_tx = {</div><div class='add'>+	.mode = STEDMA40_MODE_LOGICAL,</div><div class='add'>+	.dir = STEDMA40_MEM_TO_PERIPH,</div><div class='add'>+	.src_dev_type = STEDMA40_DEV_SRC_MEMORY,</div><div class='add'>+	.dst_dev_type = DB8500_DMA_DEV32_SD_MM1_TX,</div><div class='add'>+	.src_info.data_width = STEDMA40_WORD_WIDTH,</div><div class='add'>+	.dst_info.data_width = STEDMA40_WORD_WIDTH,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct mmci_platform_data mop500_sdi1_data = {</div><div class='add'>+	.ocr_mask	= MMC_VDD_29_30,</div><div class='add'>+	.f_max		= 50000000,</div><div class='add'>+	.capabilities	= MMC_CAP_4_BIT_DATA,</div><div class='add'>+	.gpio_cd	= -1,</div><div class='add'>+	.gpio_wp	= -1,</div><div class='add'>+#ifdef CONFIG_STE_DMA40</div><div class='add'>+	.dma_filter	= stedma40_filter,</div><div class='add'>+	.dma_rx_param	= &amp;sdi1_dma_cfg_rx,</div><div class='add'>+	.dma_tx_param	= &amp;sdi1_dma_cfg_tx,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * SDI 2 (POP eMMC, not on DB8500ed)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -158,7 +197,8 @@ static struct stedma40_chan_cfg mop500_sdi2_dma_cfg_tx = {</div><div class='ctx'> static struct mmci_platform_data mop500_sdi2_data = {</div><div class='ctx'> 	.ocr_mask	= MMC_VDD_165_195,</div><div class='ctx'> 	.f_max		= 50000000,</div><div class='del'>-	.capabilities	= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,</div><div class='add'>+	.capabilities	= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA |</div><div class='add'>+			  MMC_CAP_MMC_HIGHSPEED,</div><div class='ctx'> 	.gpio_cd	= -1,</div><div class='ctx'> 	.gpio_wp	= -1,</div><div class='ctx'> #ifdef CONFIG_STE_DMA40</div><div class='hunk'>@@ -208,20 +248,10 @@ static struct mmci_platform_data mop500_sdi4_data = {</div><div class='ctx'> </div><div class='ctx'> void __init mop500_sdi_init(void)</div><div class='ctx'> {</div><div class='del'>-	u32 periphid = 0;</div><div class='del'>-</div><div class='del'>-	/* v2 has a new version of this block that need to be forced */</div><div class='del'>-	if (cpu_is_u8500v2())</div><div class='del'>-		periphid = 0x10480180;</div><div class='del'>-	/* PoP:ed eMMC on top of DB8500 v1.0 has problems with high speed */</div><div class='del'>-	if (!cpu_is_u8500v10())</div><div class='del'>-		mop500_sdi2_data.capabilities |= MMC_CAP_MMC_HIGHSPEED;</div><div class='del'>-</div><div class='del'>-	db8500_add_sdi2(&amp;mop500_sdi2_data, periphid);</div><div class='del'>-</div><div class='add'>+	/* PoP:ed eMMC */</div><div class='add'>+	db8500_add_sdi2(&amp;mop500_sdi2_data, U8500_SDI_V2_PERIPHID);</div><div class='ctx'> 	/* On-board eMMC */</div><div class='del'>-	db8500_add_sdi4(&amp;mop500_sdi4_data, periphid);</div><div class='del'>-</div><div class='add'>+	db8500_add_sdi4(&amp;mop500_sdi4_data, U8500_SDI_V2_PERIPHID);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * On boards with the TC35892 GPIO expander, sdi0 will finally</div><div class='ctx'> 	 * be added when the TC35892 initializes and calls</div><div class='hunk'>@@ -231,13 +261,9 @@ void __init mop500_sdi_init(void)</div><div class='ctx'> </div><div class='ctx'> void __init snowball_sdi_init(void)</div><div class='ctx'> {</div><div class='del'>-	u32 periphid = 0x10480180;</div><div class='del'>-</div><div class='del'>-	mop500_sdi2_data.capabilities |= MMC_CAP_MMC_HIGHSPEED;</div><div class='del'>-</div><div class='ctx'> 	/* On-board eMMC */</div><div class='del'>-	db8500_add_sdi4(&amp;mop500_sdi4_data, periphid);</div><div class='del'>-</div><div class='add'>+	db8500_add_sdi4(&amp;mop500_sdi4_data, U8500_SDI_V2_PERIPHID);</div><div class='add'>+	/* External Micro SD slot */</div><div class='ctx'> 	mop500_sdi0_data.gpio_cd = SNOWBALL_SDMMC_CD_GPIO;</div><div class='ctx'> 	mop500_sdi0_data.cd_invert = true;</div><div class='ctx'> 	sdi0_en = SNOWBALL_SDMMC_EN_GPIO;</div><div class='hunk'>@@ -247,17 +273,15 @@ void __init snowball_sdi_init(void)</div><div class='ctx'> </div><div class='ctx'> void __init hrefv60_sdi_init(void)</div><div class='ctx'> {</div><div class='del'>-	u32 periphid = 0x10480180;</div><div class='del'>-</div><div class='del'>-	mop500_sdi2_data.capabilities |= MMC_CAP_MMC_HIGHSPEED;</div><div class='del'>-</div><div class='del'>-	db8500_add_sdi2(&amp;mop500_sdi2_data, periphid);</div><div class='del'>-</div><div class='add'>+	/* PoP:ed eMMC */</div><div class='add'>+	db8500_add_sdi2(&amp;mop500_sdi2_data, U8500_SDI_V2_PERIPHID);</div><div class='ctx'> 	/* On-board eMMC */</div><div class='del'>-	db8500_add_sdi4(&amp;mop500_sdi4_data, periphid);</div><div class='del'>-</div><div class='add'>+	db8500_add_sdi4(&amp;mop500_sdi4_data, U8500_SDI_V2_PERIPHID);</div><div class='add'>+	/* External Micro SD slot */</div><div class='ctx'> 	mop500_sdi0_data.gpio_cd = HREFV60_SDMMC_CD_GPIO;</div><div class='ctx'> 	sdi0_en = HREFV60_SDMMC_EN_GPIO;</div><div class='ctx'> 	sdi0_vsel = HREFV60_SDMMC_1V8_3V_GPIO;</div><div class='ctx'> 	sdi0_configure();</div><div class='add'>+	/* WLAN SDIO channel */</div><div class='add'>+	db8500_add_sdi1(&amp;mop500_sdi1_data, U8500_SDI_V2_PERIPHID);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c<br/>index bdd7b80dd7ad..5c00712907d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/board-mop500.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/board-mop500.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/board-mop500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/board-mop500.c</a></div><div class='hunk'>@@ -19,11 +19,11 @@</div><div class='ctx'> #include &lt;linux/amba/pl022.h&gt;</div><div class='ctx'> #include &lt;linux/amba/serial.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='del'>-#include &lt;linux/mfd/ab8500.h&gt;</div><div class='add'>+#include &lt;linux/mfd/abx500/ab8500.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/ab8500.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/tc3589x.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/tps6105x.h&gt;</div><div class='del'>-#include &lt;linux/mfd/ab8500/gpio.h&gt;</div><div class='add'>+#include &lt;linux/mfd/abx500/ab8500-gpio.h&gt;</div><div class='ctx'> #include &lt;linux/leds-lp5521.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/smsc911x.h&gt;</div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/i2c.h&gt;</div><div class='ctx'> #include &lt;plat/ste_dma40.h&gt;</div><div class='hunk'>@@ -672,7 +673,7 @@ static void __init hrefv60_init_machine(void)</div><div class='ctx'> 			ARRAY_SIZE(mop500_platform_devs));</div><div class='ctx'> </div><div class='ctx'> 	mop500_i2c_init();</div><div class='del'>-	mop500_sdi_init();</div><div class='add'>+	hrefv60_sdi_init();</div><div class='ctx'> 	mop500_spi_init();</div><div class='ctx'> 	mop500_uart_init();</div><div class='ctx'> </div><div class='hunk'>@@ -695,6 +696,7 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform")</div><div class='ctx'> 	.init_irq	= ux500_init_irq,</div><div class='ctx'> 	/* we re-use nomadik timer here */</div><div class='ctx'> 	.timer		= &amp;ux500_timer,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= mop500_init_machine,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='hunk'>@@ -703,6 +705,7 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")</div><div class='ctx'> 	.map_io		= u8500_map_io,</div><div class='ctx'> 	.init_irq	= ux500_init_irq,</div><div class='ctx'> 	.timer		= &amp;ux500_timer,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= hrefv60_init_machine,</div><div class='ctx'> MACHINE_END</div><div class='ctx'> </div><div class='hunk'>@@ -712,5 +715,6 @@ MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")</div><div class='ctx'> 	.init_irq	= ux500_init_irq,</div><div class='ctx'> 	/* we re-use nomadik timer here */</div><div class='ctx'> 	.timer		= &amp;ux500_timer,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= snowball_init_machine,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h<br/>index de18a2a23e6e..f926d3db6207 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/board-mop500.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/board-mop500.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/board-mop500.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/board-mop500.h</a></div><div class='hunk'>@@ -7,40 +7,77 @@</div><div class='ctx'> #ifndef __BOARD_MOP500_H</div><div class='ctx'> #define __BOARD_MOP500_H</div><div class='ctx'> </div><div class='del'>-/* snowball GPIO for MMC card */</div><div class='del'>-#define SNOWBALL_SDMMC_EN_GPIO 217</div><div class='del'>-#define SNOWBALL_SDMMC_1V8_3V_GPIO 228</div><div class='del'>-#define SNOWBALL_SDMMC_CD_GPIO 218</div><div class='add'>+/* Snowball specific GPIO assignments, this board has no GPIO expander */</div><div class='add'>+#define SNOWBALL_ACCEL_INT1_GPIO	163</div><div class='add'>+#define SNOWBALL_ACCEL_INT2_GPIO	164</div><div class='add'>+#define SNOWBALL_MAGNET_DRDY_GPIO	165</div><div class='add'>+#define SNOWBALL_SDMMC_EN_GPIO		217</div><div class='add'>+#define SNOWBALL_SDMMC_1V8_3V_GPIO	228</div><div class='add'>+#define SNOWBALL_SDMMC_CD_GPIO		218</div><div class='ctx'> </div><div class='ctx'> /* HREFv60-specific GPIO assignments, this board has no GPIO expander */</div><div class='del'>-#define HREFV60_TOUCH_RST_GPIO		143</div><div class='del'>-#define HREFV60_PROX_SENSE_GPIO		217</div><div class='del'>-#define HREFV60_HAL_SW_GPIO		145</div><div class='del'>-#define HREFV60_SDMMC_EN_GPIO		169</div><div class='ctx'> #define HREFV60_SDMMC_1V8_3V_GPIO	5</div><div class='del'>-#define HREFV60_SDMMC_CD_GPIO		95</div><div class='del'>-#define HREFV60_ACCEL_INT1_GPIO		82</div><div class='del'>-#define HREFV60_ACCEL_INT2_GPIO		83</div><div class='add'>+#define HREFV60_CAMERA_FLASH_ENABLE	21</div><div class='ctx'> #define HREFV60_MAGNET_DRDY_GPIO	32</div><div class='ctx'> #define HREFV60_DISP1_RST_GPIO		65</div><div class='ctx'> #define HREFV60_DISP2_RST_GPIO		66</div><div class='add'>+#define HREFV60_ACCEL_INT1_GPIO		82</div><div class='add'>+#define HREFV60_ACCEL_INT2_GPIO		83</div><div class='add'>+#define HREFV60_SDMMC_CD_GPIO		95</div><div class='add'>+#define HREFV60_XSHUTDOWN_SECONDARY_SENSOR 140</div><div class='add'>+#define HREFV60_TOUCH_RST_GPIO		143</div><div class='add'>+#define HREFV60_HAL_SW_GPIO		145</div><div class='add'>+#define HREFV60_SDMMC_EN_GPIO		169</div><div class='add'>+#define HREFV60_MMIO_XENON_CHARGE	170</div><div class='add'>+#define HREFV60_PROX_SENSE_GPIO		217</div><div class='add'>+</div><div class='add'>+/* MOP500 generic GPIOs */</div><div class='add'>+#define CAMERA_FLASH_INT_PIN		7</div><div class='add'>+#define CYPRESS_TOUCH_INT_PIN		84</div><div class='add'>+#define XSHUTDOWN_PRIMARY_SENSOR	141</div><div class='add'>+#define XSHUTDOWN_SECONDARY_SENSOR	142</div><div class='add'>+#define CYPRESS_TOUCH_RST_GPIO		143</div><div class='add'>+#define MOP500_HDMI_RST_GPIO		196</div><div class='add'>+#define CYPRESS_SLAVE_SELECT_GPIO	216</div><div class='ctx'> </div><div class='ctx'> /* GPIOs on the TC35892 expander */</div><div class='ctx'> #define MOP500_EGPIO(x)			(NOMADIK_NR_GPIO + (x))</div><div class='add'>+#define GPIO_MAGNET_DRDY		MOP500_EGPIO(1)</div><div class='ctx'> #define GPIO_SDMMC_CD			MOP500_EGPIO(3)</div><div class='add'>+#define GPIO_CAMERA_FLASH_ENABLE	MOP500_EGPIO(4)</div><div class='add'>+#define GPIO_MMIO_XENON_CHARGE		MOP500_EGPIO(5)</div><div class='ctx'> #define GPIO_PROX_SENSOR		MOP500_EGPIO(7)</div><div class='add'>+#define GPIO_HAL_SENSOR			MOP500_EGPIO(8)</div><div class='add'>+#define GPIO_ACCEL_INT1			MOP500_EGPIO(10)</div><div class='add'>+#define GPIO_ACCEL_INT2			MOP500_EGPIO(11)</div><div class='ctx'> #define GPIO_BU21013_CS			MOP500_EGPIO(13)</div><div class='add'>+#define MOP500_DISP2_RST_GPIO		MOP500_EGPIO(14)</div><div class='add'>+#define MOP500_DISP1_RST_GPIO		MOP500_EGPIO(15)</div><div class='ctx'> #define GPIO_SDMMC_EN			MOP500_EGPIO(17)</div><div class='ctx'> #define GPIO_SDMMC_1V8_3V_SEL		MOP500_EGPIO(18)</div><div class='ctx'> #define MOP500_EGPIO_END		MOP500_EGPIO(24)</div><div class='ctx'> </div><div class='del'>-/* GPIOs on the AB8500 mixed-signals circuit */</div><div class='del'>-#define MOP500_AB8500_GPIO(x)		(MOP500_EGPIO_END + (x))</div><div class='add'>+/*</div><div class='add'>+ * GPIOs on the AB8500 mixed-signals circuit</div><div class='add'>+ * Notice that we subtract 1 from the number passed into the macro, this is</div><div class='add'>+ * because the AB8500 GPIO pins are enumbered starting from 1, so the value in</div><div class='add'>+ * parens matches the GPIO pin number in the data sheet.</div><div class='add'>+ */</div><div class='add'>+#define MOP500_AB8500_GPIO(x)		(MOP500_EGPIO_END + (x) - 1)</div><div class='add'>+/*Snowball AB8500 GPIO */</div><div class='add'>+#define SNOWBALL_VSMPS2_1V8_GPIO	MOP500_AB8500_PIN_GPIO(1)	/* SYSCLKREQ2/GPIO1 */</div><div class='add'>+#define SNOWBALL_PM_GPIO1_GPIO		MOP500_AB8500_PIN_GPIO(2)	/* SYSCLKREQ3/GPIO2 */</div><div class='add'>+#define SNOWBALL_WLAN_CLK_REQ_GPIO	MOP500_AB8500_PIN_GPIO(3)	/* SYSCLKREQ4/GPIO3 */</div><div class='add'>+#define SNOWBALL_PM_GPIO4_GPIO		MOP500_AB8500_PIN_GPIO(4)	/* SYSCLKREQ6/GPIO4 */</div><div class='add'>+#define SNOWBALL_EN_3V6_GPIO		MOP500_AB8500_PIN_GPIO(16)	/* PWMOUT3/GPIO16 */</div><div class='add'>+#define SNOWBALL_PME_ETH_GPIO		MOP500_AB8500_PIN_GPIO(24)	/* SYSCLKREQ7/GPIO24 */</div><div class='add'>+#define SNOWBALL_EN_3V3_ETH_GPIO	MOP500_AB8500_PIN_GPIO(26)	/* GPIO26 */</div><div class='ctx'> </div><div class='ctx'> struct i2c_board_info;</div><div class='ctx'> </div><div class='ctx'> extern void mop500_sdi_init(void);</div><div class='ctx'> extern void snowball_sdi_init(void);</div><div class='add'>+extern void hrefv60_sdi_init(void);</div><div class='ctx'> extern void mop500_sdi_tc35892_init(void);</div><div class='ctx'> void __init mop500_u8500uib_init(void);</div><div class='ctx'> void __init mop500_stuib_init(void);</div><div class='head'>diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c<br/>index 82025ba70c03..9de9e9c4dbbb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/board-u5500.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/board-u5500.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/board-u5500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/board-u5500.c</a></div><div class='hunk'>@@ -10,8 +10,9 @@</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;linux/mfd/ab5500/ab5500.h&gt;</div><div class='add'>+#include &lt;linux/mfd/abx500/ab5500.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -149,5 +150,6 @@ MACHINE_START(U5500, "ST-Ericsson U5500 Platform")</div><div class='ctx'> 	.map_io		= u5500_map_io,</div><div class='ctx'> 	.init_irq	= ux500_init_irq,</div><div class='ctx'> 	.timer		= &amp;ux500_timer,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= u5500_init_machine,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ux500/clock.c b/arch/arm/mach-ux500/clock.c<br/>index e832664d1bd9..737907537004 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/clock.c</a></div><div class='hunk'>@@ -239,23 +239,6 @@ static void clk_prcmu_disable(struct clk *clk)</div><div class='ctx'> 	writel(1 &lt;&lt; clk-&gt;prcmu_cg_bit, cg_clr_reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* ED doesn't have the combined set/clr registers */</div><div class='del'>-static void clk_prcmu_ed_enable(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	void __iomem *addr = __io_address(U8500_PRCMU_BASE)</div><div class='del'>-			     + clk-&gt;prcmu_cg_mgt;</div><div class='del'>-</div><div class='del'>-	writel(readl(addr) | PRCM_MGT_ENABLE, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void clk_prcmu_ed_disable(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	void __iomem *addr = __io_address(U8500_PRCMU_BASE)</div><div class='del'>-			     + clk-&gt;prcmu_cg_mgt;</div><div class='del'>-</div><div class='del'>-	writel(readl(addr) &amp; ~PRCM_MGT_ENABLE, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct clkops clk_prcmu_ops = {</div><div class='ctx'> 	.enable = clk_prcmu_enable,</div><div class='ctx'> 	.disable = clk_prcmu_disable,</div><div class='hunk'>@@ -267,7 +250,6 @@ static unsigned int clkrst_base[] = {</div><div class='ctx'> 	[3] = U8500_CLKRST3_BASE,</div><div class='ctx'> 	[5] = U8500_CLKRST5_BASE,</div><div class='ctx'> 	[6] = U8500_CLKRST6_BASE,</div><div class='del'>-	[7] = U8500_CLKRST7_BASE_ED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void clk_prcc_enable(struct clk *clk)</div><div class='hunk'>@@ -321,7 +303,6 @@ static DEFINE_PRCMU_CLK(per2clk,	0x0, 12, PER2CLK);</div><div class='ctx'> static DEFINE_PRCMU_CLK(per3clk,	0x0, 13, PER3CLK);</div><div class='ctx'> static DEFINE_PRCMU_CLK(per5clk,	0x0, 14, PER5CLK);</div><div class='ctx'> static DEFINE_PRCMU_CLK_RATE(per6clk,	0x0, 15, PER6CLK, 133330000);</div><div class='del'>-static DEFINE_PRCMU_CLK_RATE(per7clk,	0x0, 16, PER7CLK, 100000000);</div><div class='ctx'> static DEFINE_PRCMU_CLK(lcdclk,		0x0, 17, LCDCLK);</div><div class='ctx'> static DEFINE_PRCMU_CLK(bmlclk,		0x0, 18, BMLCLK);</div><div class='ctx'> static DEFINE_PRCMU_CLK(hsitxclk,	0x0, 19, HSITXCLK);</div><div class='hunk'>@@ -351,44 +332,28 @@ static DEFINE_PRCMU_CLK(uiccclk,	0x4, 1, UICCCLK); /* v1 */</div><div class='ctx'> static DEFINE_PRCC_CLK(1, i2c4,		10, 9, &amp;clk_i2cclk);</div><div class='ctx'> static DEFINE_PRCC_CLK(1, gpio0,	9, -1, NULL);</div><div class='ctx'> static DEFINE_PRCC_CLK(1, slimbus0,	8,  8, &amp;clk_slimclk);</div><div class='del'>-static DEFINE_PRCC_CLK(1, spi3_ed,	7,  7, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(1, spi3_v1,	7, -1, NULL);</div><div class='add'>+static DEFINE_PRCC_CLK(1, spi3,		7, -1, NULL);</div><div class='ctx'> static DEFINE_PRCC_CLK(1, i2c2,		6,  6, &amp;clk_i2cclk);</div><div class='ctx'> static DEFINE_PRCC_CLK(1, sdi0,		5,  5, &amp;clk_sdmmcclk);</div><div class='del'>-static DEFINE_PRCC_CLK(1, msp1_ed,	4,  4, &amp;clk_msp02clk);</div><div class='del'>-static DEFINE_PRCC_CLK(1, msp1_v1,	4,  4, &amp;clk_msp1clk);</div><div class='add'>+static DEFINE_PRCC_CLK(1, msp1,		4,  4, &amp;clk_msp1clk);</div><div class='ctx'> static DEFINE_PRCC_CLK(1, msp0,		3,  3, &amp;clk_msp02clk);</div><div class='ctx'> static DEFINE_PRCC_CLK(1, i2c1,		2,  2, &amp;clk_i2cclk);</div><div class='ctx'> static DEFINE_PRCC_CLK(1, uart1,	1,  1, &amp;clk_uartclk);</div><div class='ctx'> static DEFINE_PRCC_CLK(1, uart0,	0,  0, &amp;clk_uartclk);</div><div class='ctx'> </div><div class='ctx'> /* Peripheral Cluster #2 */</div><div class='del'>-</div><div class='del'>-static DEFINE_PRCC_CLK(2, gpio1_ed,	12, -1, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(2, ssitx_ed,	11, -1, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(2, ssirx_ed,	10, -1, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(2, spi0_ed,	 9, -1, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(2, sdi3_ed,	 8,  6, &amp;clk_sdmmcclk);</div><div class='del'>-static DEFINE_PRCC_CLK(2, sdi1_ed,	 7,  5, &amp;clk_sdmmcclk);</div><div class='del'>-static DEFINE_PRCC_CLK(2, msp2_ed,	 6,  4, &amp;clk_msp02clk);</div><div class='del'>-static DEFINE_PRCC_CLK(2, sdi4_ed,	 4,  2, &amp;clk_sdmmcclk);</div><div class='del'>-static DEFINE_PRCC_CLK(2, pwl_ed,	 3,  1, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(2, spi1_ed,	 2, -1, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(2, spi2_ed,	 1, -1, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(2, i2c3_ed,	 0,  0, &amp;clk_i2cclk);</div><div class='del'>-</div><div class='del'>-static DEFINE_PRCC_CLK(2, gpio1_v1,	11, -1, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(2, ssitx_v1,	10,  7, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(2, ssirx_v1,	 9,  6, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(2, spi0_v1,	 8, -1, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(2, sdi3_v1,	 7,  5, &amp;clk_sdmmcclk);</div><div class='del'>-static DEFINE_PRCC_CLK(2, sdi1_v1,	 6,  4, &amp;clk_sdmmcclk);</div><div class='del'>-static DEFINE_PRCC_CLK(2, msp2_v1,	 5,  3, &amp;clk_msp02clk);</div><div class='del'>-static DEFINE_PRCC_CLK(2, sdi4_v1,	 4,  2, &amp;clk_sdmmcclk);</div><div class='del'>-static DEFINE_PRCC_CLK(2, pwl_v1,	 3,  1, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(2, spi1_v1,	 2, -1, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(2, spi2_v1,	 1, -1, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(2, i2c3_v1,	 0,  0, &amp;clk_i2cclk);</div><div class='add'>+static DEFINE_PRCC_CLK(2, gpio1,	11, -1, NULL);</div><div class='add'>+static DEFINE_PRCC_CLK(2, ssitx,	10,  7, NULL);</div><div class='add'>+static DEFINE_PRCC_CLK(2, ssirx,	 9,  6, NULL);</div><div class='add'>+static DEFINE_PRCC_CLK(2, spi0,		8, -1, NULL);</div><div class='add'>+static DEFINE_PRCC_CLK(2, sdi3,		7,  5, &amp;clk_sdmmcclk);</div><div class='add'>+static DEFINE_PRCC_CLK(2, sdi1,		6,  4, &amp;clk_sdmmcclk);</div><div class='add'>+static DEFINE_PRCC_CLK(2, msp2,		5,  3, &amp;clk_msp02clk);</div><div class='add'>+static DEFINE_PRCC_CLK(2, sdi4,		4,  2, &amp;clk_sdmmcclk);</div><div class='add'>+static DEFINE_PRCC_CLK(2, pwl,		3,  1, NULL);</div><div class='add'>+static DEFINE_PRCC_CLK(2, spi1,		2, -1, NULL);</div><div class='add'>+static DEFINE_PRCC_CLK(2, spi2,		1, -1, NULL);</div><div class='add'>+static DEFINE_PRCC_CLK(2, i2c3,		0,  0, &amp;clk_i2cclk);</div><div class='ctx'> </div><div class='ctx'> /* Peripheral Cluster #3 */</div><div class='ctx'> static DEFINE_PRCC_CLK(3, gpio2,	8, -1, NULL);</div><div class='hunk'>@@ -397,49 +362,34 @@ static DEFINE_PRCC_CLK(3, uart2,	6,  6, &amp;clk_uartclk);</div><div class='ctx'> static DEFINE_PRCC_CLK(3, ske,		5,  5, &amp;clk_32khz);</div><div class='ctx'> static DEFINE_PRCC_CLK(3, sdi2,		4,  4, &amp;clk_sdmmcclk);</div><div class='ctx'> static DEFINE_PRCC_CLK(3, i2c0,		3,  3, &amp;clk_i2cclk);</div><div class='del'>-static DEFINE_PRCC_CLK(3, ssp1_ed,	2,  2, &amp;clk_i2cclk);</div><div class='del'>-static DEFINE_PRCC_CLK(3, ssp0_ed,	1,  1, &amp;clk_i2cclk);</div><div class='del'>-static DEFINE_PRCC_CLK(3, ssp1_v1,	2,  2, &amp;clk_sspclk);</div><div class='del'>-static DEFINE_PRCC_CLK(3, ssp0_v1,	1,  1, &amp;clk_sspclk);</div><div class='add'>+static DEFINE_PRCC_CLK(3, ssp1,		2,  2, &amp;clk_sspclk);</div><div class='add'>+static DEFINE_PRCC_CLK(3, ssp0,		1,  1, &amp;clk_sspclk);</div><div class='ctx'> static DEFINE_PRCC_CLK(3, fsmc,		0, -1, NULL);</div><div class='ctx'> </div><div class='ctx'> /* Peripheral Cluster #4 is in the always on domain */</div><div class='ctx'> </div><div class='ctx'> /* Peripheral Cluster #5 */</div><div class='ctx'> static DEFINE_PRCC_CLK(5, gpio3,	1, -1, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(5, usb_ed,	0,  0, &amp;clk_i2cclk);</div><div class='del'>-static DEFINE_PRCC_CLK(5, usb_v1,	0,  0, NULL);</div><div class='add'>+static DEFINE_PRCC_CLK(5, usb,		0,  0, NULL);</div><div class='ctx'> </div><div class='ctx'> /* Peripheral Cluster #6 */</div><div class='ctx'> </div><div class='ctx'> /* MTU ID in data */</div><div class='del'>-static DEFINE_PRCC_CLK_CUSTOM(6, mtu1_v1, 8, -1, NULL, clk_mtu_get_rate, 1);</div><div class='del'>-static DEFINE_PRCC_CLK_CUSTOM(6, mtu0_v1, 7, -1, NULL, clk_mtu_get_rate, 0);</div><div class='del'>-static DEFINE_PRCC_CLK(6, cfgreg_v1,	6,  6, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(6, dmc_ed,	6,  6, NULL);</div><div class='add'>+static DEFINE_PRCC_CLK_CUSTOM(6, mtu1, 8, -1, NULL, clk_mtu_get_rate, 1);</div><div class='add'>+static DEFINE_PRCC_CLK_CUSTOM(6, mtu0, 7, -1, NULL, clk_mtu_get_rate, 0);</div><div class='add'>+static DEFINE_PRCC_CLK(6, cfgreg,	6,  6, NULL);</div><div class='ctx'> static DEFINE_PRCC_CLK(6, hash1,	5, -1, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(6, unipro_v1,	4,  1, &amp;clk_uniproclk);</div><div class='del'>-static DEFINE_PRCC_CLK(6, cryp1_ed,	4, -1, NULL);</div><div class='add'>+static DEFINE_PRCC_CLK(6, unipro,	4,  1, &amp;clk_uniproclk);</div><div class='ctx'> static DEFINE_PRCC_CLK(6, pka,		3, -1, NULL);</div><div class='ctx'> static DEFINE_PRCC_CLK(6, hash0,	2, -1, NULL);</div><div class='ctx'> static DEFINE_PRCC_CLK(6, cryp0,	1, -1, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(6, rng_ed,	0,  0, &amp;clk_i2cclk);</div><div class='del'>-static DEFINE_PRCC_CLK(6, rng_v1,	0,  0, &amp;clk_rngclk);</div><div class='del'>-</div><div class='del'>-/* Peripheral Cluster #7 */</div><div class='del'>-</div><div class='del'>-static DEFINE_PRCC_CLK(7, tzpc0_ed,	4, -1, NULL);</div><div class='del'>-/* MTU ID in data */</div><div class='del'>-static DEFINE_PRCC_CLK_CUSTOM(7, mtu1_ed, 3, -1, NULL, clk_mtu_get_rate, 1);</div><div class='del'>-static DEFINE_PRCC_CLK_CUSTOM(7, mtu0_ed, 2, -1, NULL, clk_mtu_get_rate, 0);</div><div class='del'>-static DEFINE_PRCC_CLK(7, wdg_ed,	1, -1, NULL);</div><div class='del'>-static DEFINE_PRCC_CLK(7, cfgreg_ed,	0, -1, NULL);</div><div class='add'>+static DEFINE_PRCC_CLK(6, rng,	0,  0, &amp;clk_rngclk);</div><div class='ctx'> </div><div class='ctx'> static struct clk clk_dummy_apb_pclk = {</div><div class='ctx'> 	.name = "apb_pclk",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct clk_lookup u8500_common_clks[] = {</div><div class='add'>+static struct clk_lookup u8500_clks[] = {</div><div class='ctx'> 	CLK(dummy_apb_pclk, NULL,	"apb_pclk"),</div><div class='ctx'> </div><div class='ctx'> 	/* Peripheral Cluster #1 */</div><div class='hunk'>@@ -494,83 +444,41 @@ static struct clk_lookup u8500_common_clks[] = {</div><div class='ctx'> 	CLK(dmaclk,	"dma40.0",	NULL),</div><div class='ctx'> 	CLK(b2r2clk,	"b2r2",		NULL),</div><div class='ctx'> 	CLK(tvclk,	"tv",		NULL),</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static struct clk_lookup u8500_ed_clks[] = {</div><div class='del'>-	/* Peripheral Cluster #1 */</div><div class='del'>-	CLK(spi3_ed,	"spi3",		NULL),</div><div class='del'>-	CLK(msp1_ed,	"msp1",		NULL),</div><div class='del'>-</div><div class='del'>-	/* Peripheral Cluster #2 */</div><div class='del'>-	CLK(gpio1_ed,	"gpio.6",	NULL),</div><div class='del'>-	CLK(gpio1_ed,	"gpio.7",	NULL),</div><div class='del'>-	CLK(ssitx_ed,	"ssitx",	NULL),</div><div class='del'>-	CLK(ssirx_ed,	"ssirx",	NULL),</div><div class='del'>-	CLK(spi0_ed,	"spi0",		NULL),</div><div class='del'>-	CLK(sdi3_ed,	"sdi3",		NULL),</div><div class='del'>-	CLK(sdi1_ed,	"sdi1",		NULL),</div><div class='del'>-	CLK(msp2_ed,	"msp2",		NULL),</div><div class='del'>-	CLK(sdi4_ed,	"sdi4",		NULL),</div><div class='del'>-	CLK(pwl_ed,	"pwl",		NULL),</div><div class='del'>-	CLK(spi1_ed,	"spi1",		NULL),</div><div class='del'>-	CLK(spi2_ed,	"spi2",		NULL),</div><div class='del'>-	CLK(i2c3_ed,	"nmk-i2c.3",	NULL),</div><div class='del'>-</div><div class='del'>-	/* Peripheral Cluster #3 */</div><div class='del'>-	CLK(ssp1_ed,	"ssp1",		NULL),</div><div class='del'>-	CLK(ssp0_ed,	"ssp0",		NULL),</div><div class='del'>-</div><div class='del'>-	/* Peripheral Cluster #5 */</div><div class='del'>-	CLK(usb_ed,	"musb-ux500.0",	"usb"),</div><div class='del'>-</div><div class='del'>-	/* Peripheral Cluster #6 */</div><div class='del'>-	CLK(dmc_ed,	"dmc",		NULL),</div><div class='del'>-	CLK(cryp1_ed,	"cryp1",	NULL),</div><div class='del'>-	CLK(rng_ed,	"rng",		NULL),</div><div class='del'>-</div><div class='del'>-	/* Peripheral Cluster #7 */</div><div class='del'>-	CLK(tzpc0_ed,	"tzpc0",	NULL),</div><div class='del'>-	CLK(mtu1_ed,	"mtu1",		NULL),</div><div class='del'>-	CLK(mtu0_ed,	"mtu0",		NULL),</div><div class='del'>-	CLK(wdg_ed,	"wdg",		NULL),</div><div class='del'>-	CLK(cfgreg_ed,	"cfgreg",	NULL),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct clk_lookup u8500_v1_clks[] = {</div><div class='ctx'> 	/* Peripheral Cluster #1 */</div><div class='ctx'> 	CLK(i2c4,	"nmk-i2c.4",	NULL),</div><div class='del'>-	CLK(spi3_v1,	"spi3",		NULL),</div><div class='del'>-	CLK(msp1_v1,	"msp1",		NULL),</div><div class='add'>+	CLK(spi3,	"spi3",		NULL),</div><div class='add'>+	CLK(msp1,	"msp1",		NULL),</div><div class='ctx'> </div><div class='ctx'> 	/* Peripheral Cluster #2 */</div><div class='del'>-	CLK(gpio1_v1,	"gpio.6",	NULL),</div><div class='del'>-	CLK(gpio1_v1,	"gpio.7",	NULL),</div><div class='del'>-	CLK(ssitx_v1,	"ssitx",	NULL),</div><div class='del'>-	CLK(ssirx_v1,	"ssirx",	NULL),</div><div class='del'>-	CLK(spi0_v1,	"spi0",		NULL),</div><div class='del'>-	CLK(sdi3_v1,	"sdi3",		NULL),</div><div class='del'>-	CLK(sdi1_v1,	"sdi1",		NULL),</div><div class='del'>-	CLK(msp2_v1,	"msp2",		NULL),</div><div class='del'>-	CLK(sdi4_v1,	"sdi4",		NULL),</div><div class='del'>-	CLK(pwl_v1,	"pwl",		NULL),</div><div class='del'>-	CLK(spi1_v1,	"spi1",		NULL),</div><div class='del'>-	CLK(spi2_v1,	"spi2",		NULL),</div><div class='del'>-	CLK(i2c3_v1,	"nmk-i2c.3",	NULL),</div><div class='add'>+	CLK(gpio1,	"gpio.6",	NULL),</div><div class='add'>+	CLK(gpio1,	"gpio.7",	NULL),</div><div class='add'>+	CLK(ssitx,	"ssitx",	NULL),</div><div class='add'>+	CLK(ssirx,	"ssirx",	NULL),</div><div class='add'>+	CLK(spi0,	"spi0",		NULL),</div><div class='add'>+	CLK(sdi3,	"sdi3",		NULL),</div><div class='add'>+	CLK(sdi1,	"sdi1",		NULL),</div><div class='add'>+	CLK(msp2,	"msp2",		NULL),</div><div class='add'>+	CLK(sdi4,	"sdi4",		NULL),</div><div class='add'>+	CLK(pwl,	"pwl",		NULL),</div><div class='add'>+	CLK(spi1,	"spi1",		NULL),</div><div class='add'>+	CLK(spi2,	"spi2",		NULL),</div><div class='add'>+	CLK(i2c3,	"nmk-i2c.3",	NULL),</div><div class='ctx'> </div><div class='ctx'> 	/* Peripheral Cluster #3 */</div><div class='del'>-	CLK(ssp1_v1,	"ssp1",		NULL),</div><div class='del'>-	CLK(ssp0_v1,	"ssp0",		NULL),</div><div class='add'>+	CLK(ssp1,	"ssp1",		NULL),</div><div class='add'>+	CLK(ssp0,	"ssp0",		NULL),</div><div class='ctx'> </div><div class='ctx'> 	/* Peripheral Cluster #5 */</div><div class='del'>-	CLK(usb_v1,	"musb-ux500.0",	"usb"),</div><div class='add'>+	CLK(usb,	"musb-ux500.0",	"usb"),</div><div class='ctx'> </div><div class='ctx'> 	/* Peripheral Cluster #6 */</div><div class='del'>-	CLK(mtu1_v1,	"mtu1",		NULL),</div><div class='del'>-	CLK(mtu0_v1,	"mtu0",		NULL),</div><div class='del'>-	CLK(cfgreg_v1,	"cfgreg",	NULL),</div><div class='add'>+	CLK(mtu1,	"mtu1",		NULL),</div><div class='add'>+	CLK(mtu0,	"mtu0",		NULL),</div><div class='add'>+	CLK(cfgreg,	"cfgreg",	NULL),</div><div class='ctx'> 	CLK(hash1,	"hash1",	NULL),</div><div class='del'>-	CLK(unipro_v1,	"unipro",	NULL),</div><div class='del'>-	CLK(rng_v1,	"rng",		NULL),</div><div class='add'>+	CLK(unipro,	"unipro",	NULL),</div><div class='add'>+	CLK(rng,	"rng",		NULL),</div><div class='ctx'> </div><div class='ctx'> 	/* PRCMU level clock gating */</div><div class='ctx'> </div><div class='hunk'>@@ -743,7 +651,7 @@ err_out:</div><div class='ctx'> late_initcall(clk_debugfs_init);</div><div class='ctx'> #endif /* defined(CONFIG_DEBUG_FS) */</div><div class='ctx'> </div><div class='del'>-unsigned long clk_smp_twd_rate = 400000000;</div><div class='add'>+unsigned long clk_smp_twd_rate = 500000000;</div><div class='ctx'> </div><div class='ctx'> unsigned long clk_smp_twd_get_rate(struct clk *clk)</div><div class='ctx'> {</div><div class='hunk'>@@ -769,7 +677,7 @@ static int clk_twd_cpufreq_transition(struct notifier_block *nb,</div><div class='ctx'> </div><div class='ctx'> 	if (state == CPUFREQ_PRECHANGE) {</div><div class='ctx'> 		/* Save frequency in simple Hz */</div><div class='del'>-		clk_smp_twd_rate = f-&gt;new * 1000;</div><div class='add'>+		clk_smp_twd_rate = (f-&gt;new * 1000) / 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NOTIFY_OK;</div><div class='hunk'>@@ -790,11 +698,7 @@ late_initcall(clk_init_smp_twd_cpufreq);</div><div class='ctx'> </div><div class='ctx'> int __init clk_init(void)</div><div class='ctx'> {</div><div class='del'>-	if (cpu_is_u8500ed()) {</div><div class='del'>-		clk_prcmu_ops.enable = clk_prcmu_ed_enable;</div><div class='del'>-		clk_prcmu_ops.disable = clk_prcmu_ed_disable;</div><div class='del'>-		clk_per6clk.rate = 100000000;</div><div class='del'>-	} else if (cpu_is_u5500()) {</div><div class='add'>+	if (cpu_is_u5500()) {</div><div class='ctx'> 		/* Clock tree for U5500 not implemented yet */</div><div class='ctx'> 		clk_prcc_ops.enable = clk_prcc_ops.disable = NULL;</div><div class='ctx'> 		clk_prcmu_ops.enable = clk_prcmu_ops.disable = NULL;</div><div class='hunk'>@@ -802,20 +706,11 @@ int __init clk_init(void)</div><div class='ctx'> 		clk_sdmmcclk.rate = 99900000;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	clkdev_add_table(u8500_common_clks, ARRAY_SIZE(u8500_common_clks));</div><div class='del'>-	if (cpu_is_u8500ed())</div><div class='del'>-		clkdev_add_table(u8500_ed_clks, ARRAY_SIZE(u8500_ed_clks));</div><div class='del'>-	else</div><div class='del'>-		clkdev_add_table(u8500_v1_clks, ARRAY_SIZE(u8500_v1_clks));</div><div class='del'>-</div><div class='add'>+	clkdev_add_table(u8500_clks, ARRAY_SIZE(u8500_clks));</div><div class='ctx'> 	clkdev_add(&amp;clk_smp_twd_lookup);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='del'>-	clk_debugfs_add_table(u8500_common_clks, ARRAY_SIZE(u8500_common_clks));</div><div class='del'>-	if (cpu_is_u8500ed())</div><div class='del'>-		clk_debugfs_add_table(u8500_ed_clks, ARRAY_SIZE(u8500_ed_clks));</div><div class='del'>-	else</div><div class='del'>-		clk_debugfs_add_table(u8500_v1_clks, ARRAY_SIZE(u8500_v1_clks));</div><div class='add'>+	clk_debugfs_add_table(u8500_clks, ARRAY_SIZE(u8500_clks));</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-ux500/cpu-db5500.c b/arch/arm/mach-ux500/cpu-db5500.c<br/>index 9de1af008094..18aa5c05c69e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/cpu-db5500.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/cpu-db5500.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/cpu-db5500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/cpu-db5500.c</a></div><div class='hunk'>@@ -30,12 +30,11 @@ static struct map_desc u5500_uart_io_desc[] __initdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct map_desc u5500_io_desc[] __initdata = {</div><div class='del'>-	__IO_DEV_DESC(U5500_GIC_CPU_BASE, SZ_4K),</div><div class='add'>+	/* SCU base also covers GIC CPU BASE and TWD with its 4K page */</div><div class='add'>+	__IO_DEV_DESC(U5500_SCU_BASE, SZ_4K),</div><div class='ctx'> 	__IO_DEV_DESC(U5500_GIC_DIST_BASE, SZ_4K),</div><div class='ctx'> 	__IO_DEV_DESC(U5500_L2CC_BASE, SZ_4K),</div><div class='del'>-	__IO_DEV_DESC(U5500_TWD_BASE, SZ_4K),</div><div class='ctx'> 	__IO_DEV_DESC(U5500_MTU0_BASE, SZ_4K),</div><div class='del'>-	__IO_DEV_DESC(U5500_SCU_BASE, SZ_4K),</div><div class='ctx'> 	__IO_DEV_DESC(U5500_BACKUPRAM0_BASE, SZ_8K),</div><div class='ctx'> </div><div class='ctx'> 	__IO_DEV_DESC(U5500_GPIO0_BASE, SZ_4K),</div><div class='hunk'>@@ -47,26 +46,6 @@ static struct map_desc u5500_io_desc[] __initdata = {</div><div class='ctx'> 	__IO_DEV_DESC(U5500_PRCMU_TCDM_BASE, SZ_4K),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct resource db5500_pmu_resources[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start		= IRQ_DB5500_PMU0,</div><div class='del'>-		.end		= IRQ_DB5500_PMU0,</div><div class='del'>-		.flags		= IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start		= IRQ_DB5500_PMU1,</div><div class='del'>-		.end		= IRQ_DB5500_PMU1,</div><div class='del'>-		.flags		= IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device db5500_pmu_device = {</div><div class='del'>-	.name			= "arm-pmu",</div><div class='del'>-	.id			= ARM_PMU_DEVICE_CPU,</div><div class='del'>-	.num_resources		= ARRAY_SIZE(db5500_pmu_resources),</div><div class='del'>-	.resource		= db5500_pmu_resources,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct resource mbox0_resources[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "mbox_peer",</div><div class='hunk'>@@ -152,7 +131,6 @@ static struct platform_device mbox2_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *db5500_platform_devs[] __initdata = {</div><div class='del'>-	&amp;db5500_pmu_device,</div><div class='ctx'> 	&amp;mbox0_device,</div><div class='ctx'> 	&amp;mbox1_device,</div><div class='ctx'> 	&amp;mbox2_device,</div><div class='hunk'>@@ -193,6 +171,25 @@ void __init u5500_map_io(void)</div><div class='ctx'> 	_PRCMU_BASE = __io_address(U5500_PRCMU_BASE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init db5500_pmu_init(void)</div><div class='add'>+{</div><div class='add'>+	struct resource res[] = {</div><div class='add'>+		[0] = {</div><div class='add'>+			.start		= IRQ_DB5500_PMU0,</div><div class='add'>+			.end		= IRQ_DB5500_PMU0,</div><div class='add'>+			.flags		= IORESOURCE_IRQ,</div><div class='add'>+		},</div><div class='add'>+		[1] = {</div><div class='add'>+			.start		= IRQ_DB5500_PMU1,</div><div class='add'>+			.end		= IRQ_DB5500_PMU1,</div><div class='add'>+			.flags		= IORESOURCE_IRQ,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	platform_device_register_simple("arm-pmu", ARM_PMU_DEVICE_CPU,</div><div class='add'>+					res, ARRAY_SIZE(res));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int usb_db5500_rx_dma_cfg[] = {</div><div class='ctx'> 	DB5500_DMA_DEV4_USB_OTG_IEP_1_9,</div><div class='ctx'> 	DB5500_DMA_DEV5_USB_OTG_IEP_2_10,</div><div class='hunk'>@@ -218,6 +215,7 @@ static int usb_db5500_tx_dma_cfg[] = {</div><div class='ctx'> void __init u5500_init_devices(void)</div><div class='ctx'> {</div><div class='ctx'> 	db5500_add_gpios();</div><div class='add'>+	db5500_pmu_init();</div><div class='ctx'> 	db5500_dma_init();</div><div class='ctx'> 	db5500_add_rtc();</div><div class='ctx'> 	db5500_add_usb(usb_db5500_rx_dma_cfg, usb_db5500_tx_dma_cfg);</div><div class='head'>diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c<br/>index 13e8890a8b8a..7176ee7491ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/cpu-db8500.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/cpu-db8500.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/cpu-db8500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/cpu-db8500.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2008-2009 ST-Ericsson</div><div class='add'>+ * Copyright (C) 2008-2009 ST-Ericsson SA</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Srinidhi KASAGAR &lt;srinidhi.kasagar@stericsson.com&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -35,12 +35,11 @@ static struct map_desc u8500_uart_io_desc[] __initdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct map_desc u8500_io_desc[] __initdata = {</div><div class='del'>-	__IO_DEV_DESC(U8500_GIC_CPU_BASE, SZ_4K),</div><div class='add'>+	/* SCU base also covers GIC CPU BASE and TWD with its 4K page */</div><div class='add'>+	__IO_DEV_DESC(U8500_SCU_BASE, SZ_4K),</div><div class='ctx'> 	__IO_DEV_DESC(U8500_GIC_DIST_BASE, SZ_4K),</div><div class='ctx'> 	__IO_DEV_DESC(U8500_L2CC_BASE, SZ_4K),</div><div class='del'>-	__IO_DEV_DESC(U8500_TWD_BASE, SZ_4K),</div><div class='ctx'> 	__IO_DEV_DESC(U8500_MTU0_BASE, SZ_4K),</div><div class='del'>-	__IO_DEV_DESC(U8500_SCU_BASE, SZ_4K),</div><div class='ctx'> 	__IO_DEV_DESC(U8500_BACKUPRAM0_BASE, SZ_8K),</div><div class='ctx'> </div><div class='ctx'> 	__IO_DEV_DESC(U8500_CLKRST1_BASE, SZ_4K),</div><div class='hunk'>@@ -54,19 +53,6 @@ static struct map_desc u8500_io_desc[] __initdata = {</div><div class='ctx'> 	__IO_DEV_DESC(U8500_GPIO1_BASE, SZ_4K),</div><div class='ctx'> 	__IO_DEV_DESC(U8500_GPIO2_BASE, SZ_4K),</div><div class='ctx'> 	__IO_DEV_DESC(U8500_GPIO3_BASE, SZ_4K),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct map_desc u8500_ed_io_desc[] __initdata = {</div><div class='del'>-	__IO_DEV_DESC(U8500_MTU0_BASE_ED, SZ_4K),</div><div class='del'>-	__IO_DEV_DESC(U8500_CLKRST7_BASE_ED, SZ_8K),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct map_desc u8500_v1_io_desc[] __initdata = {</div><div class='del'>-	__IO_DEV_DESC(U8500_MTU0_BASE, SZ_4K),</div><div class='del'>-	__IO_DEV_DESC(U8500_PRCMU_TCDM_BASE_V1, SZ_4K),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct map_desc u8500_v2_io_desc[] __initdata = {</div><div class='ctx'> 	__IO_DEV_DESC(U8500_PRCMU_TCDM_BASE, SZ_4K),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -81,13 +67,6 @@ void __init u8500_map_io(void)</div><div class='ctx'> </div><div class='ctx'> 	iotable_init(u8500_io_desc, ARRAY_SIZE(u8500_io_desc));</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_u8500ed())</div><div class='del'>-		iotable_init(u8500_ed_io_desc, ARRAY_SIZE(u8500_ed_io_desc));</div><div class='del'>-	else if (cpu_is_u8500v1())</div><div class='del'>-		iotable_init(u8500_v1_io_desc, ARRAY_SIZE(u8500_v1_io_desc));</div><div class='del'>-	else if (cpu_is_u8500v2())</div><div class='del'>-		iotable_init(u8500_v2_io_desc, ARRAY_SIZE(u8500_v2_io_desc));</div><div class='del'>-</div><div class='ctx'> 	_PRCMU_BASE = __io_address(U8500_PRCMU_BASE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -156,12 +135,9 @@ static resource_size_t __initdata db8500_gpio_base[] = {</div><div class='ctx'> static void __init db8500_add_gpios(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct nmk_gpio_platform_data pdata = {</div><div class='del'>-		/* No custom data yet */</div><div class='add'>+		.supports_sleepmode = true,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_u8500v2())</div><div class='del'>-		pdata.supports_sleepmode = true;</div><div class='del'>-</div><div class='ctx'> 	dbx500_add_gpios(ARRAY_AND_SIZE(db8500_gpio_base),</div><div class='ctx'> 			 IRQ_DB8500_GPIO0, &amp;pdata);</div><div class='ctx'> }</div><div class='hunk'>@@ -193,9 +169,6 @@ static int usb_db8500_tx_dma_cfg[] = {</div><div class='ctx'>  */</div><div class='ctx'> void __init u8500_init_devices(void)</div><div class='ctx'> {</div><div class='del'>-	if (cpu_is_u8500ed())</div><div class='del'>-		dma40_u8500ed_fixup();</div><div class='del'>-</div><div class='ctx'> 	db8500_add_rtc();</div><div class='ctx'> 	db8500_add_gpios();</div><div class='ctx'> 	db8500_add_usb(usb_db8500_rx_dma_cfg, usb_db8500_tx_dma_cfg);</div><div class='head'>diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c<br/>index 73b17404b194..a7c6cdc9b11e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/devices-db8500.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/devices-db8500.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/devices-db8500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/devices-db8500.c</a></div><div class='hunk'>@@ -166,16 +166,6 @@ struct platform_device u8500_dma40_device = {</div><div class='ctx'> 	.resource = dma40_resources</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void dma40_u8500ed_fixup(void)</div><div class='del'>-{</div><div class='del'>-	dma40_plat_data.memcpy = NULL;</div><div class='del'>-	dma40_plat_data.memcpy_len = 0;</div><div class='del'>-	dma40_resources[0].start = U8500_DMA_BASE_ED;</div><div class='del'>-	dma40_resources[0].end = U8500_DMA_BASE_ED + SZ_4K - 1;</div><div class='del'>-	dma40_resources[1].start = U8500_DMA_LCPA_BASE_ED;</div><div class='del'>-	dma40_resources[1].end = U8500_DMA_LCPA_BASE_ED + 2 * SZ_1K - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct resource keypad_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.start = U8500_SKE_BASE,</div><div class='head'>diff --git a/arch/arm/mach-ux500/headsmp.S b/arch/arm/mach-ux500/headsmp.S<br/>index 64fa451edcfd..08da5589bcd8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/headsmp.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/headsmp.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/headsmp.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/headsmp.S</a></div><div class='hunk'>@@ -32,6 +32,8 @@ pen:	ldr	r7, [r6]</div><div class='ctx'> 	 * should now contain the SVC stack for this core</div><div class='ctx'> 	 */</div><div class='ctx'> 	b	secondary_startup</div><div class='add'>+ENDPROC(u8500_secondary_startup)</div><div class='ctx'> </div><div class='add'>+	.align 2</div><div class='ctx'> 1:	.long	.</div><div class='ctx'> 	.long	pen_release</div><div class='head'>diff --git a/arch/arm/mach-ux500/id.c b/arch/arm/mach-ux500/id.c<br/>index d35122ebc67b..15a0f63b2e2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/id.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/id.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/id.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/id.c</a></div><div class='hunk'>@@ -65,6 +65,7 @@ static unsigned int partnumber(unsigned int asicid)</div><div class='ctx'>  * DB8500v1	0x411fc091	0x9001FFF4		0x008500A0</div><div class='ctx'>  * DB8500v1.1	0x411fc091	0x9001FFF4		0x008500A1</div><div class='ctx'>  * DB8500v2	0x412fc091	0x9001DBF4		0x008500B0</div><div class='add'>+ * DB8520v2.2	0x412fc091	0x9001DBF4		0x008500B2</div><div class='ctx'>  * DB5500v1	0x412fc091	0x9001FFF4		0x005500A0</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -80,9 +81,10 @@ void __init ux500_map_io(void)</div><div class='ctx'> 		addr = 0x9001FFF4;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case 0x412fc091: /* DB8500v2 / DB5500v1 */</div><div class='add'>+	case 0x412fc091: /* DB8520 / DB8500v2 / DB5500v1 */</div><div class='ctx'> 		asicid = ux500_read_asicid(0x9001DBF4);</div><div class='del'>-		if (partnumber(asicid) == 0x8500)</div><div class='add'>+		if (partnumber(asicid) == 0x8500 ||</div><div class='add'>+		    partnumber(asicid) == 0x8520)</div><div class='ctx'> 			/* DB8500v2 */</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ux500/include/mach/db5500-regs.h b/arch/arm/mach-ux500/include/mach/db5500-regs.h<br/>index 994b5fe6f85a..8e714bcb099f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/db5500-regs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/db5500-regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/db5500-regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/include/mach/db5500-regs.h</a></div><div class='hunk'>@@ -65,8 +65,11 @@</div><div class='ctx'> #define U5500_PRCMU_TIMER_4_BASE (U5500_PER4_BASE + 0x07450)</div><div class='ctx'> #define U5500_MSP1_BASE		(U5500_PER4_BASE + 0x9000)</div><div class='ctx'> #define U5500_GPIO2_BASE	(U5500_PER4_BASE + 0xA000)</div><div class='add'>+#define U5500_MTIMER_BASE	(U5500_PER4_BASE + 0xC000)</div><div class='ctx'> #define U5500_CDETECT_BASE	(U5500_PER4_BASE + 0xF000)</div><div class='ctx'> #define U5500_PRCMU_TCDM_BASE	(U5500_PER4_BASE + 0x18000)</div><div class='add'>+#define U5500_PRCMU_TCPM_BASE	(U5500_PER4_BASE + 0x10000)</div><div class='add'>+#define U5500_TPIU_BASE		(U5500_PER4_BASE + 0x50000)</div><div class='ctx'> </div><div class='ctx'> #define U5500_SPI0_BASE		(U5500_PER5_BASE + 0x0000)</div><div class='ctx'> #define U5500_SPI1_BASE		(U5500_PER5_BASE + 0x1000)</div><div class='hunk'>@@ -125,6 +128,7 @@</div><div class='ctx'> #define U5500_ACCCON_BASE		(0xBFFF1000)</div><div class='ctx'> #define U5500_ACCCON_CPUVEC_RESET_ADDR_OFFSET (0x00000020)</div><div class='ctx'> #define U5500_ACCCON_ACC_CPU_CTRL_OFFSET (0x000000BC)</div><div class='add'>+#define U5500_INTCON_MBOX1_INT_RESET_ADDR	(0xBFFD31A4)</div><div class='ctx'> </div><div class='ctx'> #define U5500_ESRAM_BASE	        0x40000000</div><div class='ctx'> #define U5500_ESRAM_DMA_LCPA_OFFSET	0x10000</div><div class='head'>diff --git a/arch/arm/mach-ux500/include/mach/db8500-regs.h b/arch/arm/mach-ux500/include/mach/db8500-regs.h<br/>index 751b0e6938d4..80e10f50282e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/db8500-regs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/db8500-regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/db8500-regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/include/mach/db8500-regs.h</a></div><div class='hunk'>@@ -22,7 +22,9 @@</div><div class='ctx'> #define U8500_ESRAM_DMA_LCPA_OFFSET     0x10000</div><div class='ctx'> </div><div class='ctx'> #define U8500_DMA_LCPA_BASE    (U8500_ESRAM_BANK0 + U8500_ESRAM_DMA_LCPA_OFFSET)</div><div class='del'>-#define U8500_DMA_LCPA_BASE_ED	(U8500_ESRAM_BANK4 + 0x4000)</div><div class='add'>+</div><div class='add'>+/* This address fulfills the 256k alignment requirement of the lcla base */</div><div class='add'>+#define U8500_DMA_LCLA_BASE	U8500_ESRAM_BANK4</div><div class='ctx'> </div><div class='ctx'> #define U8500_PER3_BASE		0x80000000</div><div class='ctx'> #define U8500_STM_BASE		0x80100000</div><div class='hunk'>@@ -40,15 +42,14 @@</div><div class='ctx'> #define U8500_ASIC_ID_BASE	0x9001D000</div><div class='ctx'> </div><div class='ctx'> #define U8500_PER6_BASE		0xa03c0000</div><div class='add'>+#define U8500_PER7_BASE		0xa03d0000</div><div class='ctx'> #define U8500_PER5_BASE		0xa03e0000</div><div class='del'>-#define U8500_PER7_BASE_ED	0xa03d0000</div><div class='ctx'> </div><div class='ctx'> #define U8500_SVA_BASE		0xa0100000</div><div class='ctx'> #define U8500_SIA_BASE		0xa0200000</div><div class='ctx'> </div><div class='ctx'> #define U8500_SGA_BASE		0xa0300000</div><div class='ctx'> #define U8500_MCDE_BASE		0xa0350000</div><div class='del'>-#define U8500_DMA_BASE_ED	0xa0362000</div><div class='ctx'> #define U8500_DMA_BASE		0x801C0000	/* v1 */</div><div class='ctx'> </div><div class='ctx'> #define U8500_SBAG_BASE		0xa0390000</div><div class='hunk'>@@ -66,13 +67,6 @@</div><div class='ctx'> #define U8500_GPIO2_BASE	(U8500_PER2_BASE + 0xE000)</div><div class='ctx'> #define U8500_GPIO3_BASE	(U8500_PER5_BASE + 0x1E000)</div><div class='ctx'> </div><div class='del'>-/* per7 base addresses */</div><div class='del'>-#define U8500_CR_BASE_ED	(U8500_PER7_BASE_ED + 0x8000)</div><div class='del'>-#define U8500_MTU0_BASE_ED	(U8500_PER7_BASE_ED + 0xa000)</div><div class='del'>-#define U8500_MTU1_BASE_ED	(U8500_PER7_BASE_ED + 0xb000)</div><div class='del'>-#define U8500_TZPC0_BASE_ED	(U8500_PER7_BASE_ED + 0xc000)</div><div class='del'>-#define U8500_CLKRST7_BASE_ED	(U8500_PER7_BASE_ED + 0xf000)</div><div class='del'>-</div><div class='ctx'> #define U8500_UART0_BASE	(U8500_PER1_BASE + 0x0000)</div><div class='ctx'> #define U8500_UART1_BASE	(U8500_PER1_BASE + 0x1000)</div><div class='ctx'> </div><div class='hunk'>@@ -102,12 +96,10 @@</div><div class='ctx'> #define U8500_SCR_BASE		(U8500_PER4_BASE + 0x05000)</div><div class='ctx'> #define U8500_DMC_BASE		(U8500_PER4_BASE + 0x06000)</div><div class='ctx'> #define U8500_PRCMU_BASE	(U8500_PER4_BASE + 0x07000)</div><div class='del'>-#define U8500_PRCMU_TIMER_3_BASE (U8500_PER4_BASE + 0x07338)</div><div class='del'>-#define U8500_PRCMU_TIMER_4_BASE (U8500_PER4_BASE + 0x07450)</div><div class='del'>-#define U8500_PRCMU_TCDM_BASE_V1 (U8500_PER4_BASE + 0x0f000)</div><div class='ctx'> #define U8500_PRCMU_TCDM_BASE	(U8500_PER4_BASE + 0x68000)</div><div class='ctx'> #define U8500_PRCMU_TCPM_BASE   (U8500_PER4_BASE + 0x60000)</div><div class='del'>-</div><div class='add'>+#define U8500_PRCMU_TIMER_3_BASE (U8500_PER4_BASE + 0x07338)</div><div class='add'>+#define U8500_PRCMU_TIMER_4_BASE (U8500_PER4_BASE + 0x07450)</div><div class='ctx'> </div><div class='ctx'> /* per3 base addresses */</div><div class='ctx'> #define U8500_FSMC_BASE		(U8500_PER3_BASE + 0x0000)</div><div class='head'>diff --git a/arch/arm/mach-ux500/include/mach/devices.h b/arch/arm/mach-ux500/include/mach/devices.h<br/>index 020b6369a30a..5f6cb71fc62d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/devices.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/devices.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/devices.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/include/mach/devices.h</a></div><div class='hunk'>@@ -18,6 +18,4 @@ extern struct amba_device ux500_pl031_device;</div><div class='ctx'> extern struct platform_device u8500_dma40_device;</div><div class='ctx'> extern struct platform_device ux500_ske_keypad_device;</div><div class='ctx'> </div><div class='del'>-void dma40_u8500ed_fixup(void);</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-ux500/include/mach/entry-macro.S b/arch/arm/mach-ux500/include/mach/entry-macro.S<br/>index 071bba94f727..e16299e1020a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -10,8 +10,6 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/hardware/entry-macro-gic.S&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='head'>diff --git a/arch/arm/mach-ux500/include/mach/gpio.h b/arch/arm/mach-ux500/include/mach/gpio.h<br/>index 7389df911b1a..c01ef66537f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/gpio.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/include/mach/gpio.h</a></div><div class='hunk'>@@ -1,10 +1,5 @@</div><div class='ctx'> #ifndef __ASM_ARCH_GPIO_H</div><div class='ctx'> #define __ASM_ARCH_GPIO_H</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * 288 (#267 is the highest one actually hooked up) onchip GPIOs, plus enough</div><div class='del'>- * room for a couple of GPIO expanders.</div><div class='del'>- */</div><div class='del'>-#define ARCH_NR_GPIOS	350</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_ARCH_GPIO_H */</div><div class='head'>diff --git a/arch/arm/mach-ux500/include/mach/hardware.h b/arch/arm/mach-ux500/include/mach/hardware.h<br/>index 470ac52663d6..b6ba26a1367d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/hardware.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/hardware.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/include/mach/hardware.h</a></div><div class='hunk'>@@ -10,20 +10,21 @@</div><div class='ctx'> #ifndef __MACH_HARDWARE_H</div><div class='ctx'> #define __MACH_HARDWARE_H</div><div class='ctx'> </div><div class='del'>-/* macros to get at IO space when running virtually</div><div class='add'>+/*</div><div class='add'>+ * Macros to get at IO space when running virtually</div><div class='ctx'>  * We dont map all the peripherals, let ioremap do</div><div class='ctx'>  * this for us. We map only very basic peripherals here.</div><div class='ctx'>  */</div><div class='ctx'> #define U8500_IO_VIRTUAL	0xf0000000</div><div class='ctx'> #define U8500_IO_PHYSICAL	0xa0000000</div><div class='ctx'> </div><div class='del'>-/* this macro is used in assembly, so no cast */</div><div class='add'>+/* This macro is used in assembly, so no cast */</div><div class='ctx'> #define IO_ADDRESS(x)           \</div><div class='ctx'> 	(((x) &amp; 0x0fffffff) + (((x) &gt;&gt; 4) &amp; 0x0f000000) + U8500_IO_VIRTUAL)</div><div class='ctx'> </div><div class='ctx'> /* typesafe io address */</div><div class='ctx'> #define __io_address(n)		__io(IO_ADDRESS(n))</div><div class='del'>-/* used by some plat-nomadik code */</div><div class='add'>+/* Used by some plat-nomadik code */</div><div class='ctx'> #define io_p2v(n)		__io_address(n)</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/db8500-regs.h&gt;</div><div class='hunk'>@@ -36,6 +37,5 @@ extern void __iomem *_PRCMU_BASE;</div><div class='ctx'> </div><div class='ctx'> #define ARRAY_AND_SIZE(x)	(x), ARRAY_SIZE(x)</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='del'>-</div><div class='add'>+#endif				/* __ASSEMBLY__ */</div><div class='ctx'> #endif				/* __MACH_HARDWARE_H */</div><div class='head'>diff --git a/arch/arm/mach-ux500/include/mach/id.h b/arch/arm/mach-ux500/include/mach/id.h<br/>index 02b541a37ee5..833d6a6edc9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/id.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/id.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/id.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/include/mach/id.h</a></div><div class='hunk'>@@ -47,6 +47,30 @@ static inline bool __attribute_const__ cpu_is_u5500(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * 5500 revisions</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline bool __attribute_const__ cpu_is_u5500v1(void)</div><div class='add'>+{</div><div class='add'>+	return cpu_is_u5500() &amp;&amp; (dbx500_revision() &amp; 0xf0) == 0xA0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool __attribute_const__ cpu_is_u5500v2(void)</div><div class='add'>+{</div><div class='add'>+	return (dbx500_id.revision &amp; 0xf0) == 0xB0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool __attribute_const__ cpu_is_u5500v20(void)</div><div class='add'>+{</div><div class='add'>+	return cpu_is_u5500() &amp;&amp; ((dbx500_revision() &amp; 0xf0) == 0xB0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool __attribute_const__ cpu_is_u5500v21(void)</div><div class='add'>+{</div><div class='add'>+	return cpu_is_u5500() &amp;&amp; (dbx500_revision() == 0xB1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * 8500 revisions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h b/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h<br/>index 47969909836c..d2d4131435a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/irqs-board-mop500.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/include/mach/irqs-board-mop500.h</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #define __MACH_IRQS_BOARD_MOP500_H</div><div class='ctx'> </div><div class='ctx'> /* Number of AB8500 irqs is taken from header file */</div><div class='del'>-#include &lt;linux/mfd/ab8500.h&gt;</div><div class='add'>+#include &lt;linux/mfd/abx500/ab8500.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MOP500_AB8500_IRQ_BASE		IRQ_BOARD_START</div><div class='ctx'> #define MOP500_AB8500_IRQ_END		(MOP500_AB8500_IRQ_BASE \</div><div class='head'>diff --git a/arch/arm/mach-ux500/include/mach/system.h b/arch/arm/mach-ux500/include/mach/system.h<br/>index c0cd8006f1a2..258e5c919c24 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-ux500/include/mach/system.h</a></div><div class='hunk'>@@ -17,9 +17,4 @@ static inline void arch_idle(void)</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	/* yet to be implemented - TODO */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-ux500/include/mach/vmalloc.h b/arch/arm/mach-ux500/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index a4945cb41172..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ux500/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-ux500/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,18 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2009 ST-Ericsson</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='del'>-#define VMALLOC_END	0xf0000000UL</div><div class='head'>diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c<br/>index e340a54251df..02b7b9303f3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-versatile/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-versatile/core.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irqdomain.h&gt;</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='hunk'>@@ -141,11 +140,6 @@ static struct map_desc versatile_io_desc[] __initdata = {</div><div class='ctx'> 	},</div><div class='ctx'> #ifdef CONFIG_MACH_VERSATILE_AB</div><div class='ctx'>  	{</div><div class='del'>-		.virtual	=  IO_ADDRESS(VERSATILE_GPIO0_BASE),</div><div class='del'>-		.pfn		= __phys_to_pfn(VERSATILE_GPIO0_BASE),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE</div><div class='del'>-	}, {</div><div class='ctx'> 		.virtual	=  IO_ADDRESS(VERSATILE_IB2_BASE),</div><div class='ctx'> 		.pfn		= __phys_to_pfn(VERSATILE_IB2_BASE),</div><div class='ctx'> 		.length		= SZ_64M,</div><div class='hunk'>@@ -745,6 +739,19 @@ static void versatile_leds_event(led_event_t ledevt)</div><div class='ctx'> }</div><div class='ctx'> #endif	/* CONFIG_LEDS */</div><div class='ctx'> </div><div class='add'>+void versatile_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	void __iomem *sys = __io_address(VERSATILE_SYS_BASE);</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = __raw_readl(sys + VERSATILE_SYS_RESETCTL_OFFSET);</div><div class='add'>+	val |= 0x105;</div><div class='add'>+</div><div class='add'>+	__raw_writel(0xa05f, sys + VERSATILE_SYS_LOCK_OFFSET);</div><div class='add'>+	__raw_writel(val, sys + VERSATILE_SYS_RESETCTL_OFFSET);</div><div class='add'>+	__raw_writel(0, sys + VERSATILE_SYS_LOCK_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Early initializations */</div><div class='ctx'> void __init versatile_init_early(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-versatile/core.h b/arch/arm/mach-versatile/core.h<br/>index e01422700ebb..2ef2f555f315 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/core.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-versatile/core.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-versatile/core.h</a></div><div class='hunk'>@@ -30,6 +30,7 @@ extern void __init versatile_init_early(void);</div><div class='ctx'> extern void __init versatile_init_irq(void);</div><div class='ctx'> extern void __init versatile_map_io(void);</div><div class='ctx'> extern struct sys_timer versatile_timer;</div><div class='add'>+extern void versatile_restart(char, const char *);</div><div class='ctx'> extern unsigned int mmc_status(struct device *dev);</div><div class='ctx'> #ifdef CONFIG_OF</div><div class='ctx'> extern struct of_dev_auxdata versatile_auxdata_lookup[];</div><div class='head'>diff --git a/arch/arm/mach-versatile/include/mach/entry-macro.S b/arch/arm/mach-versatile/include/mach/entry-macro.S<br/>index e6f7c1663160..b6f0dbf122ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-versatile/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-versatile/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -7,39 +7,9 @@</div><div class='ctx'>  * License version 2. This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/platform.h&gt;</div><div class='del'>-#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.macro	disable_fiq</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='del'>-		.macro  get_irqnr_preamble, base, tmp</div><div class='del'>-		ldr	\base, =IO_ADDRESS(VERSATILE_VIC_BASE)</div><div class='del'>-		.endm</div><div class='del'>-</div><div class='ctx'> 		.macro  arch_ret_to_user, tmp1, tmp2</div><div class='ctx'> 		.endm</div><div class='del'>-</div><div class='del'>-		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-		ldr	\irqstat, [\base, #VIC_IRQ_STATUS]	@ get masked status</div><div class='del'>-		mov	\irqnr, #0</div><div class='del'>-		teq	\irqstat, #0</div><div class='del'>-		beq	1003f</div><div class='del'>-</div><div class='del'>-1001:		tst	\irqstat, #15</div><div class='del'>-		bne	1002f</div><div class='del'>-		add	\irqnr, \irqnr, #4</div><div class='del'>-		movs	\irqstat, \irqstat, lsr #4</div><div class='del'>-		bne	1001b</div><div class='del'>-1002:		tst	\irqstat, #1</div><div class='del'>-		bne	1003f</div><div class='del'>-		add	\irqnr, \irqnr, #1</div><div class='del'>-		movs	\irqstat, \irqstat, lsr #1</div><div class='del'>-		bne	1002b</div><div class='del'>-1003:		/* EQ will be set if no irqs pending */</div><div class='del'>-</div><div class='del'>-@		clz	\irqnr, \irqstat</div><div class='del'>-@1003:		/* EQ will be set if we reach MAXIRQNUM */</div><div class='del'>-		.endm</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-versatile/include/mach/system.h b/arch/arm/mach-versatile/include/mach/system.h<br/>index 8ffc12a7cb25..f3fa347895f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-versatile/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-versatile/include/mach/system.h</a></div><div class='hunk'>@@ -21,10 +21,6 @@</div><div class='ctx'> #ifndef __ASM_ARCH_SYSTEM_H</div><div class='ctx'> #define __ASM_ARCH_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/platform.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -34,16 +30,4 @@ static inline void arch_idle(void)</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	val = __raw_readl(IO_ADDRESS(VERSATILE_SYS_RESETCTL)) &amp; ~0x7;</div><div class='del'>-	val |= 0x105;</div><div class='del'>-</div><div class='del'>-	__raw_writel(0xa05f, IO_ADDRESS(VERSATILE_SYS_LOCK));</div><div class='del'>-	__raw_writel(val, IO_ADDRESS(VERSATILE_SYS_RESETCTL));</div><div class='del'>-	__raw_writel(0, IO_ADDRESS(VERSATILE_SYS_LOCK));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-versatile/include/mach/vmalloc.h b/arch/arm/mach-versatile/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 7d8e069ad51b..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-versatile/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  arch/arm/mach-versatile/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2003 ARM Limited</div><div class='del'>- *  Copyright (C) 2000 Russell King.</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='del'>-#define VMALLOC_END		0xd8000000UL</div><div class='head'>diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c<br/>index c898deb3ada0..90069bce23bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-versatile/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-versatile/pci.c</a></div><div class='hunk'>@@ -191,7 +191,7 @@ static struct resource pre_mem = {</div><div class='ctx'> 	.flags	= IORESOURCE_MEM | IORESOURCE_PREFETCH,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pci_versatile_setup_resources(struct resource **resource)</div><div class='add'>+static int __init pci_versatile_setup_resources(struct list_head *resources)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -215,13 +215,13 @@ static int __init pci_versatile_setup_resources(struct resource **resource)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * bus-&gt;resource[0] is the IO resource for this bus</div><div class='del'>-	 * bus-&gt;resource[1] is the mem resource for this bus</div><div class='del'>-	 * bus-&gt;resource[2] is the prefetch mem resource for this bus</div><div class='add'>+	 * the IO resource for this bus</div><div class='add'>+	 * the mem resource for this bus</div><div class='add'>+	 * the prefetch mem resource for this bus</div><div class='ctx'> 	 */</div><div class='del'>-	resource[0] = &amp;io_mem;</div><div class='del'>-	resource[1] = &amp;non_mem;</div><div class='del'>-	resource[2] = &amp;pre_mem;</div><div class='add'>+	pci_add_resource(resources, &amp;io_mem);</div><div class='add'>+	pci_add_resource(resources, &amp;non_mem);</div><div class='add'>+	pci_add_resource(resources, &amp;pre_mem);</div><div class='ctx'> </div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -250,7 +250,7 @@ int __init pci_versatile_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> </div><div class='ctx'> 	if (nr == 0) {</div><div class='ctx'> 		sys-&gt;mem_offset = 0;</div><div class='del'>-		ret = pci_versatile_setup_resources(sys-&gt;resource);</div><div class='add'>+		ret = pci_versatile_setup_resources(&amp;sys-&gt;resources);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			printk("pci_versatile_setup: resources... oops?\n");</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -306,7 +306,8 @@ int __init pci_versatile_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> </div><div class='ctx'> struct pci_bus * __init pci_versatile_scan_bus(int nr, struct pci_sys_data *sys)</div><div class='ctx'> {</div><div class='del'>-	return pci_scan_bus(sys-&gt;busnr, &amp;pci_versatile_ops, sys);</div><div class='add'>+	return pci_scan_root_bus(NULL, sys-&gt;busnr, &amp;pci_versatile_ops, sys,</div><div class='add'>+				 &amp;sys-&gt;resources);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init pci_versatile_preinit(void)</div><div class='head'>diff --git a/arch/arm/mach-versatile/versatile_ab.c b/arch/arm/mach-versatile/versatile_ab.c<br/>index fda4866703cd..98f65493177a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/versatile_ab.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-versatile/versatile_ab.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/versatile_ab.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-versatile/versatile_ab.c</a></div><div class='hunk'>@@ -21,12 +21,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -39,6 +39,8 @@ MACHINE_START(VERSATILE_AB, "ARM-Versatile AB")</div><div class='ctx'> 	.map_io		= versatile_map_io,</div><div class='ctx'> 	.init_early	= versatile_init_early,</div><div class='ctx'> 	.init_irq	= versatile_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;versatile_timer,</div><div class='ctx'> 	.init_machine	= versatile_init,</div><div class='add'>+	.restart	= versatile_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-versatile/versatile_dt.c b/arch/arm/mach-versatile/versatile_dt.c<br/>index 54e037c090f5..ae5ad3c8f3dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/versatile_dt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-versatile/versatile_dt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/versatile_dt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-versatile/versatile_dt.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -45,7 +46,9 @@ DT_MACHINE_START(VERSATILE_PB, "ARM-Versatile (Device Tree Support)")</div><div class='ctx'> 	.map_io		= versatile_map_io,</div><div class='ctx'> 	.init_early	= versatile_init_early,</div><div class='ctx'> 	.init_irq	= versatile_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;versatile_timer,</div><div class='ctx'> 	.init_machine	= versatile_dt_init,</div><div class='ctx'> 	.dt_compat	= versatile_dt_match,</div><div class='add'>+	.restart	= versatile_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c<br/>index feaf9cbe60f6..9581c197500c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/versatile_pb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-versatile/versatile_pb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/versatile_pb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-versatile/versatile_pb.c</a></div><div class='hunk'>@@ -21,13 +21,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/pl061.h&gt;</div><div class='ctx'> #include &lt;linux/amba/mmci.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -107,6 +107,8 @@ MACHINE_START(VERSATILE_PB, "ARM-Versatile PB")</div><div class='ctx'> 	.map_io		= versatile_map_io,</div><div class='ctx'> 	.init_early	= versatile_init_early,</div><div class='ctx'> 	.init_irq	= versatile_init_irq,</div><div class='add'>+	.handle_irq	= vic_handle_irq,</div><div class='ctx'> 	.timer		= &amp;versatile_timer,</div><div class='ctx'> 	.init_machine	= versatile_pb_init,</div><div class='add'>+	.restart	= versatile_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig<br/>index 931148487f0b..9b3d0fbaee72 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-vexpress/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-vexpress/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-vexpress/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-vexpress/Kconfig</a></div><div class='hunk'>@@ -8,5 +8,7 @@ config ARCH_VEXPRESS_CA9X4</div><div class='ctx'> 	select ARM_ERRATA_720789</div><div class='ctx'> 	select ARM_ERRATA_751472</div><div class='ctx'> 	select ARM_ERRATA_753970</div><div class='add'>+	select HAVE_SMP</div><div class='add'>+	select MIGHT_HAVE_CACHE_L2X0</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='head'>diff --git a/arch/arm/mach-vexpress/include/mach/entry-macro.S b/arch/arm/mach-vexpress/include/mach/entry-macro.S<br/>index 73c11297509e..a14f9e62ca92 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-vexpress/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-vexpress/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-vexpress/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-vexpress/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -1,5 +1,3 @@</div><div class='del'>-#include &lt;asm/hardware/entry-macro-gic.S&gt;</div><div class='del'>-</div><div class='ctx'> 	.macro	disable_fiq</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-vexpress/include/mach/system.h b/arch/arm/mach-vexpress/include/mach/system.h<br/>index 899a4e628a4c..f653a8e265bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-vexpress/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-vexpress/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-vexpress/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-vexpress/include/mach/system.h</a></div><div class='hunk'>@@ -30,8 +30,4 @@ static inline void arch_idle(void)</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-vexpress/include/mach/vmalloc.h b/arch/arm/mach-vexpress/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index f43a36ef678b..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-vexpress/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-vexpress/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  arch/arm/mach-vexpress/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2003 ARM Limited</div><div class='del'>- *  Copyright (C) 2000 Russell King.</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='del'>-#define VMALLOC_END		0xf8000000UL</div><div class='head'>diff --git a/arch/arm/mach-vexpress/platsmp.c b/arch/arm/mach-vexpress/platsmp.c<br/>index 2b5f7ac001a3..124ffb169093 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-vexpress/platsmp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-vexpress/platsmp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-vexpress/platsmp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-vexpress/platsmp.c</a></div><div class='hunk'>@@ -13,8 +13,6 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unified.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;mach/motherboard.h&gt;</div><div class='ctx'> #define V2M_PA_CS7 0x10000000</div><div class='ctx'> </div><div class='hunk'>@@ -46,6 +44,6 @@ void __init platform_smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	 * secondary CPU branches to this address.</div><div class='ctx'> 	 */</div><div class='ctx'> 	writel(~0, MMIO_P2V(V2M_SYS_FLAGSCLR));</div><div class='del'>-	writel(BSYM(virt_to_phys(versatile_secondary_startup)),</div><div class='add'>+	writel(virt_to_phys(versatile_secondary_startup),</div><div class='ctx'> 		MMIO_P2V(V2M_SYS_FLAGSSET));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c<br/>index 1fafc3244607..b4a28ca0e50a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-vexpress/v2m.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-vexpress/v2m.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-vexpress/v2m.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-vexpress/v2m.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;linux/smsc911x.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/usb/isp1760.h&gt;</div><div class='ctx'> #include &lt;linux/clkdev.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include &lt;asm/hardware/arm_timer.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/timer-sp.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/sp810.h&gt;</div><div class='add'>+#include &lt;asm/hardware/gic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/ct-ca9x4.h&gt;</div><div class='ctx'> #include &lt;mach/motherboard.h&gt;</div><div class='hunk'>@@ -437,7 +438,6 @@ static void __init v2m_init(void)</div><div class='ctx'> 		amba_device_register(v2m_amba_devs[i], &amp;iomem_resource);</div><div class='ctx'> </div><div class='ctx'> 	pm_power_off = v2m_power_off;</div><div class='del'>-	arm_pm_restart = v2m_restart;</div><div class='ctx'> </div><div class='ctx'> 	ct_desc-&gt;init_tile();</div><div class='ctx'> }</div><div class='hunk'>@@ -448,5 +448,7 @@ MACHINE_START(VEXPRESS, "ARM-Versatile Express")</div><div class='ctx'> 	.init_early	= v2m_init_early,</div><div class='ctx'> 	.init_irq	= v2m_init_irq,</div><div class='ctx'> 	.timer		= &amp;v2m_timer,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= v2m_init,</div><div class='add'>+	.restart	= v2m_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-vt8500/include/mach/vmalloc.h b/arch/arm/mach-vt8500/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 4642290ce416..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-vt8500/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-vt8500/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  arch/arm/mach-vt8500/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2000 Russell King.</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='del'>-#define VMALLOC_END	0xd0000000UL</div><div class='head'>diff --git a/arch/arm/mach-w90x900/clksel.c b/arch/arm/mach-w90x900/clksel.c<br/>index 3de4a5211c3b..06d867dce551 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/clksel.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/clksel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/clksel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-w90x900/clksel.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@ static void clock_source_select(const char *dev_id, unsigned int clkval)</div><div class='ctx'> 		offset = ATAOFFSET;</div><div class='ctx'> 	else if (strcmp(dev_id, "nuc900-lcd") == 0)</div><div class='ctx'> 		offset = LCDOFFSET;</div><div class='del'>-	else if (strcmp(dev_id, "nuc900-audio") == 0)</div><div class='add'>+	else if (strcmp(dev_id, "nuc900-ac97") == 0)</div><div class='ctx'> 		offset = AUDOFFSET;</div><div class='ctx'> 	else</div><div class='ctx'> 		offset = CPUOFFSET;</div><div class='head'>diff --git a/arch/arm/mach-w90x900/cpu.c b/arch/arm/mach-w90x900/cpu.c<br/>index 0a235e502330..9a0661992909 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/cpu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/cpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/cpu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-w90x900/cpu.c</a></div><div class='hunk'>@@ -33,9 +33,11 @@</div><div class='ctx'> #include &lt;mach/regs-serial.h&gt;</div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='ctx'> #include &lt;mach/regs-ebi.h&gt;</div><div class='add'>+#include &lt;mach/regs-timer.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cpu.h"</div><div class='ctx'> #include "clock.h"</div><div class='add'>+#include "nuc9xx.h"</div><div class='ctx'> </div><div class='ctx'> /* Initial IO mappings */</div><div class='ctx'> </div><div class='hunk'>@@ -77,7 +79,7 @@ static DEFINE_CLK(timer4, 23);</div><div class='ctx'> </div><div class='ctx'> static struct clk_lookup nuc900_clkregs[] = {</div><div class='ctx'> 	DEF_CLKLOOK(&amp;clk_lcd, "nuc900-lcd", NULL),</div><div class='del'>-	DEF_CLKLOOK(&amp;clk_audio, "nuc900-audio", NULL),</div><div class='add'>+	DEF_CLKLOOK(&amp;clk_audio, "nuc900-ac97", NULL),</div><div class='ctx'> 	DEF_CLKLOOK(&amp;clk_fmi, "nuc900-fmi", NULL),</div><div class='ctx'> 	DEF_CLKLOOK(&amp;clk_ms, "nuc900-fmi", "MS"),</div><div class='ctx'> 	DEF_CLKLOOK(&amp;clk_sd, "nuc900-fmi", "SD"),</div><div class='hunk'>@@ -222,3 +224,17 @@ void __init nuc900_init_clocks(void)</div><div class='ctx'> 	clkdev_add_table(nuc900_clkregs, ARRAY_SIZE(nuc900_clkregs));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define	WTCR	(TMR_BA + 0x1C)</div><div class='add'>+#define	WTCLK	(1 &lt;&lt; 10)</div><div class='add'>+#define	WTE	(1 &lt;&lt; 7)</div><div class='add'>+#define	WTRE	(1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+void nuc9xx_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	if (mode == 's') {</div><div class='add'>+		/* Jump into ROM at address 0 */</div><div class='add'>+		soft_restart(0);</div><div class='add'>+	} else {</div><div class='add'>+		__raw_writel(WTE | WTRE | WTCLK, WTCR);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-w90x900/dev.c b/arch/arm/mach-w90x900/dev.c<br/>index 5b0c38abacc1..78110befb7a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/dev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-w90x900/dev.c</a></div><div class='hunk'>@@ -501,8 +501,8 @@ static struct resource nuc900_ac97_resource[] = {</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct platform_device nuc900_device_audio = {</div><div class='del'>-	.name		= "nuc900-audio",</div><div class='add'>+struct platform_device nuc900_device_ac97 = {</div><div class='add'>+	.name		= "nuc900-ac97",</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(nuc900_ac97_resource),</div><div class='ctx'> 	.resource	= nuc900_ac97_resource,</div><div class='hunk'>@@ -523,7 +523,7 @@ static struct platform_device *nuc900_public_dev[] __initdata = {</div><div class='ctx'> 	&amp;nuc900_device_emc,</div><div class='ctx'> 	&amp;nuc900_device_spi,</div><div class='ctx'> 	&amp;nuc900_device_wdt,</div><div class='del'>-	&amp;nuc900_device_audio,</div><div class='add'>+	&amp;nuc900_device_ac97,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Provide adding specific CPU platform devices API */</div><div class='head'>diff --git a/arch/arm/mach-w90x900/include/mach/system.h b/arch/arm/mach-w90x900/include/mach/system.h<br/>index ce228bdc66dd..2aaeb9311619 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-w90x900/include/mach/system.h</a></div><div class='hunk'>@@ -14,28 +14,6 @@</div><div class='ctx'>  * (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/proc-fns.h&gt;</div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='del'>-#include &lt;mach/regs-timer.h&gt;</div><div class='del'>-</div><div class='del'>-#define	WTCR	(TMR_BA + 0x1C)</div><div class='del'>-#define	WTCLK	(1 &lt;&lt; 10)</div><div class='del'>-#define	WTE	(1 &lt;&lt; 7)</div><div class='del'>-#define	WTRE	(1 &lt;&lt; 1)</div><div class='del'>-</div><div class='ctx'> static void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	if (mode == 's') {</div><div class='del'>-		/* Jump into ROM at address 0 */</div><div class='del'>-		cpu_reset(0);</div><div class='del'>-	} else {</div><div class='del'>-		__raw_writel(WTE | WTRE | WTCLK, WTCR);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-w90x900/include/mach/vmalloc.h b/arch/arm/mach-w90x900/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index b067e44500a4..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,23 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/mach-w90x900/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2008 Nuvoton technology corporation</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Wan ZongShun &lt;mcuos.com@gmail.com&gt;</div><div class='del'>- *</div><div class='del'>- * Based on arch/arm/mach-s3c2410/include/mach/vmalloc.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 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='del'>-</div><div class='del'>-#ifndef __ASM_ARCH_VMALLOC_H</div><div class='del'>-#define __ASM_ARCH_VMALLOC_H</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END	  (0xe0000000UL)</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_ARCH_VMALLOC_H */</div><div class='head'>diff --git a/arch/arm/mach-w90x900/irq.c b/arch/arm/mach-w90x900/irq.c<br/>index 7bf143c443f1..d66d43ae8df5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-w90x900/irq.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -28,6 +28,8 @@</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/regs-irq.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "nuc9xx.h"</div><div class='add'>+</div><div class='ctx'> struct group_irq {</div><div class='ctx'> 	unsigned long		gpen;</div><div class='ctx'> 	unsigned int		enabled;</div><div class='head'>diff --git a/arch/arm/mach-w90x900/mach-nuc910evb.c b/arch/arm/mach-w90x900/mach-nuc910evb.c<br/>index 31c109018228..b4243e4f1565 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/mach-nuc910evb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/mach-nuc910evb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/mach-nuc910evb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-w90x900/mach-nuc910evb.c</a></div><div class='hunk'>@@ -38,4 +38,5 @@ MACHINE_START(W90P910EVB, "W90P910EVB")</div><div class='ctx'> 	.init_irq	= nuc900_init_irq,</div><div class='ctx'> 	.init_machine	= nuc910evb_init,</div><div class='ctx'> 	.timer		= &amp;nuc900_timer,</div><div class='add'>+	.restart	= nuc9xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-w90x900/mach-nuc950evb.c b/arch/arm/mach-w90x900/mach-nuc950evb.c<br/>index 4062e55a57d8..067d8f9166dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/mach-nuc950evb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/mach-nuc950evb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/mach-nuc950evb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-w90x900/mach-nuc950evb.c</a></div><div class='hunk'>@@ -41,4 +41,5 @@ MACHINE_START(W90P950EVB, "W90P950EVB")</div><div class='ctx'> 	.init_irq	= nuc900_init_irq,</div><div class='ctx'> 	.init_machine	= nuc950evb_init,</div><div class='ctx'> 	.timer		= &amp;nuc900_timer,</div><div class='add'>+	.restart	= nuc9xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-w90x900/mach-nuc960evb.c b/arch/arm/mach-w90x900/mach-nuc960evb.c<br/>index 0ab9995d5b58..cbb3adc3db10 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/mach-nuc960evb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/mach-nuc960evb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/mach-nuc960evb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-w90x900/mach-nuc960evb.c</a></div><div class='hunk'>@@ -38,4 +38,5 @@ MACHINE_START(W90N960EVB, "W90N960EVB")</div><div class='ctx'> 	.init_irq	= nuc900_init_irq,</div><div class='ctx'> 	.init_machine	= nuc960evb_init,</div><div class='ctx'> 	.timer		= &amp;nuc900_timer,</div><div class='add'>+	.restart	= nuc9xx_restart,</div><div class='ctx'> MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-w90x900/mfp.c b/arch/arm/mach-w90x900/mfp.c<br/>index 9dd74612bb87..c58d142b8a46 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/mfp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/mfp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/mfp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-w90x900/mfp.c</a></div><div class='hunk'>@@ -155,7 +155,7 @@ void mfp_set_groupg(struct device *dev, const char *subname)</div><div class='ctx'> 	} else if (strcmp(dev_id, "nuc900-i2c1") == 0) {</div><div class='ctx'> 		mfpen &amp;= ~(GPIOG2TO3);</div><div class='ctx'> 		mfpen |= ENI2C1;/*enable i2c1*/</div><div class='del'>-	} else if (strcmp(dev_id, "nuc900-audio") == 0) {</div><div class='add'>+	} else if (strcmp(dev_id, "nuc900-ac97") == 0) {</div><div class='ctx'> 		mfpen &amp;= ~(GPIOG22TO23);</div><div class='ctx'> 		mfpen |= ENAC97;/*enable AC97*/</div><div class='ctx'> 	} else if (strcmp(dev_id, "nuc900-mmc-port1") == 0) {</div><div class='head'>diff --git a/arch/arm/mach-w90x900/nuc910.h b/arch/arm/mach-w90x900/nuc910.h<br/>index 83e9ba5fc26c..b14c71a9e683 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/nuc910.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/nuc910.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/nuc910.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-w90x900/nuc910.h</a></div><div class='hunk'>@@ -12,14 +12,7 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-struct map_desc;</div><div class='del'>-struct sys_timer;</div><div class='del'>-</div><div class='del'>-/* core initialisation functions */</div><div class='del'>-</div><div class='del'>-extern void nuc900_init_irq(void);</div><div class='del'>-extern struct sys_timer nuc900_timer;</div><div class='add'>+#include "nuc9xx.h"</div><div class='ctx'> </div><div class='ctx'> /* extern file from nuc910.c */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-w90x900/nuc950.h b/arch/arm/mach-w90x900/nuc950.h<br/>index 98a1148bc5ae..6e9de3051cd4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/nuc950.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/nuc950.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/nuc950.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-w90x900/nuc950.h</a></div><div class='hunk'>@@ -12,14 +12,7 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-struct map_desc;</div><div class='del'>-struct sys_timer;</div><div class='del'>-</div><div class='del'>-/* core initialisation functions */</div><div class='del'>-</div><div class='del'>-extern void nuc900_init_irq(void);</div><div class='del'>-extern struct sys_timer nuc900_timer;</div><div class='add'>+#include "nuc9xx.h"</div><div class='ctx'> </div><div class='ctx'> /* extern file from nuc950.c */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-w90x900/nuc960.h b/arch/arm/mach-w90x900/nuc960.h<br/>index f0c07cbe3a82..9f6df9a00286 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/nuc960.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/nuc960.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/nuc960.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-w90x900/nuc960.h</a></div><div class='hunk'>@@ -12,14 +12,7 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-struct map_desc;</div><div class='del'>-struct sys_timer;</div><div class='del'>-</div><div class='del'>-/* core initialisation functions */</div><div class='del'>-</div><div class='del'>-extern void nuc900_init_irq(void);</div><div class='del'>-extern struct sys_timer nuc900_timer;</div><div class='add'>+#include "nuc9xx.h"</div><div class='ctx'> </div><div class='ctx'> /* extern file from nuc960.c */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-w90x900/nuc9xx.h b/arch/arm/mach-w90x900/nuc9xx.h<br/>new file mode 100644<br/>index 000000000000..91acb4047793<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/nuc9xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-w90x900/nuc9xx.h</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-w90x900/nuc9xx.h</div><div class='add'>+ *</div><div class='add'>+ * Copied from nuc910.h, which had:</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Nuvoton corporation</div><div class='add'>+ *</div><div class='add'>+ * Header file for NUC900 CPU support</div><div class='add'>+ *</div><div class='add'>+ * Wan ZongShun &lt;mcuos.com@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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+struct map_desc;</div><div class='add'>+struct sys_timer;</div><div class='add'>+</div><div class='add'>+/* core initialisation functions */</div><div class='add'>+</div><div class='add'>+extern void nuc900_init_irq(void);</div><div class='add'>+extern struct sys_timer nuc900_timer;</div><div class='add'>+extern void nuc9xx_restart(char, const char *);</div><div class='head'>diff --git a/arch/arm/mach-w90x900/time.c b/arch/arm/mach-w90x900/time.c<br/>index a2c4e2d0a0d4..fa27c498ac09 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-w90x900/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-w90x900/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-w90x900/time.c</a></div><div class='hunk'>@@ -33,6 +33,8 @@</div><div class='ctx'> #include &lt;mach/map.h&gt;</div><div class='ctx'> #include &lt;mach/regs-timer.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "nuc9xx.h"</div><div class='add'>+</div><div class='ctx'> #define RESETINT	0x1f</div><div class='ctx'> #define PERIOD		(0x01 &lt;&lt; 27)</div><div class='ctx'> #define ONESHOT		(0x00 &lt;&lt; 27)</div><div class='head'>diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c<br/>index 73e93687b81a..ab5cfddc0d7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-zynq/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-zynq/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-zynq/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-zynq/common.c</a></div><div class='hunk'>@@ -112,6 +112,7 @@ static const char *xilinx_dt_match[] = {</div><div class='ctx'> MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform")</div><div class='ctx'> 	.map_io		= xilinx_map_io,</div><div class='ctx'> 	.init_irq	= xilinx_irq_init,</div><div class='add'>+	.handle_irq	= gic_handle_irq,</div><div class='ctx'> 	.init_machine	= xilinx_init_machine,</div><div class='ctx'> 	.timer		= &amp;xttcpss_sys_timer,</div><div class='ctx'> 	.dt_compat	= xilinx_dt_match,</div><div class='head'>diff --git a/arch/arm/mach-zynq/include/mach/entry-macro.S b/arch/arm/mach-zynq/include/mach/entry-macro.S<br/>index 3cfc01b37461..d621fb732569 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-zynq/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-zynq/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-zynq/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-zynq/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -20,9 +20,6 @@</div><div class='ctx'>  * GNU General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/hardware/entry-macro-gic.S&gt;</div><div class='del'>-</div><div class='ctx'> 		.macro  disable_fiq</div><div class='ctx'> 		.endm</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-zynq/include/mach/system.h b/arch/arm/mach-zynq/include/mach/system.h<br/>index 1b84d705c675..8e88e0b8d2ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-zynq/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-zynq/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-zynq/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mach-zynq/include/mach/system.h</a></div><div class='hunk'>@@ -20,9 +20,4 @@ static inline void arch_idle(void)</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	/* Add architecture specific reset processing here */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/mach-zynq/include/mach/vmalloc.h b/arch/arm/mach-zynq/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 2398eff1e8b8..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-zynq/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-zynq/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-/* arch/arm/mach-zynq/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2011 Xilinx</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='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __MACH_VMALLOC_H__</div><div class='del'>-#define __MACH_VMALLOC_H__</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END       0xE0000000UL</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig<br/>index 67f75a0b66d6..4cefb57d9ed2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/Kconfig</a></div><div class='hunk'>@@ -629,6 +629,23 @@ config IO_36</div><div class='ctx'> </div><div class='ctx'> comment "Processor Features"</div><div class='ctx'> </div><div class='add'>+config ARM_LPAE</div><div class='add'>+	bool "Support for the Large Physical Address Extension"</div><div class='add'>+	depends on MMU &amp;&amp; CPU_V7</div><div class='add'>+	help</div><div class='add'>+	  Say Y if you have an ARMv7 processor supporting the LPAE page</div><div class='add'>+	  table format and you would like to access memory beyond the</div><div class='add'>+	  4GB limit. The resulting kernel image will not run on</div><div class='add'>+	  processors without the LPA extension.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config ARCH_PHYS_ADDR_T_64BIT</div><div class='add'>+	def_bool ARM_LPAE</div><div class='add'>+</div><div class='add'>+config ARCH_DMA_ADDR_T_64BIT</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config ARM_THUMB</div><div class='ctx'> 	bool "Support Thumb user binaries"</div><div class='ctx'> 	depends on CPU_ARM720T || CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM940T || CPU_ARM946E || CPU_ARM1020 || CPU_ARM1020E || CPU_ARM1022 || CPU_ARM1026 || CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_V6 || CPU_V6K || CPU_V7 || CPU_FEROCEON</div><div class='hunk'>@@ -816,14 +833,23 @@ config CACHE_FEROCEON_L2_WRITETHROUGH</div><div class='ctx'> 	  Say Y here to use the Feroceon L2 cache in writethrough mode.</div><div class='ctx'> 	  Unless you specifically require this, say N for writeback mode.</div><div class='ctx'> </div><div class='add'>+config MIGHT_HAVE_CACHE_L2X0</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  This option should be selected by machines which have a L2x0</div><div class='add'>+	  or PL310 cache controller, but where its use is optional.</div><div class='add'>+</div><div class='add'>+	  The only effect of this option is to make CACHE_L2X0 and</div><div class='add'>+	  related options available to the user for configuration.</div><div class='add'>+</div><div class='add'>+	  Boards or SoCs which always require the cache controller</div><div class='add'>+	  support to be present should select CACHE_L2X0 directly</div><div class='add'>+	  instead of this option, thus preventing the user from</div><div class='add'>+	  inadvertently configuring a broken kernel.</div><div class='add'>+</div><div class='ctx'> config CACHE_L2X0</div><div class='del'>-	bool "Enable the L2x0 outer cache controller"</div><div class='del'>-	depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \</div><div class='del'>-		   REALVIEW_EB_A9MP || ARCH_IMX_V6_V7 || MACH_REALVIEW_PBX || \</div><div class='del'>-		   ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \</div><div class='del'>-		   ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \</div><div class='del'>-		   ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX || ARCH_HIGHBANK</div><div class='del'>-	default y</div><div class='add'>+	bool "Enable the L2x0 outer cache controller" if MIGHT_HAVE_CACHE_L2X0</div><div class='add'>+	default MIGHT_HAVE_CACHE_L2X0</div><div class='ctx'> 	select OUTER_CACHE</div><div class='ctx'> 	select OUTER_CACHE_SYNC</div><div class='ctx'> 	help</div><div class='head'>diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c<br/>index c335c76e0d88..caf14dc059e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/alignment.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/alignment.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/alignment.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/alignment.c</a></div><div class='hunk'>@@ -968,7 +968,7 @@ static int __init alignment_init(void)</div><div class='ctx'> 		ai_usermode = safe_usermode(ai_usermode, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hook_fault_code(1, do_alignment, SIGBUS, BUS_ADRALN,</div><div class='add'>+	hook_fault_code(FAULT_CODE_ALIGNMENT, do_alignment, SIGBUS, BUS_ADRALN,</div><div class='ctx'> 			"alignment exception");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c<br/>index 93aac068da94..ee9bb363d606 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/context.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/context.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/context.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/context.c</a></div><div class='hunk'>@@ -22,6 +22,21 @@ unsigned int cpu_last_asid = ASID_FIRST_VERSION;</div><div class='ctx'> DEFINE_PER_CPU(struct mm_struct *, current_mm);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+#define cpu_set_asid(asid) {						\</div><div class='add'>+	unsigned long ttbl, ttbh;					\</div><div class='add'>+	asm volatile(							\</div><div class='add'>+	"	mrrc	p15, 0, %0, %1, c2		@ read TTBR0\n"	\</div><div class='add'>+	"	mov	%1, %2, lsl #(48 - 32)		@ set ASID\n"	\</div><div class='add'>+	"	mcrr	p15, 0, %0, %1, c2		@ set TTBR0\n"	\</div><div class='add'>+	: "=&amp;r" (ttbl), "=&amp;r" (ttbh)					\</div><div class='add'>+	: "r" (asid &amp; ~ASID_MASK));					\</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define cpu_set_asid(asid) \</div><div class='add'>+	asm("	mcr	p15, 0, %0, c13, c0, 1\n" : : "r" (asid))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * We fork()ed a process, and we need a new context for the child</div><div class='ctx'>  * to run in.  We reserve version 0 for initial tasks so we will</div><div class='hunk'>@@ -37,7 +52,7 @@ void __init_new_context(struct task_struct *tsk, struct mm_struct *mm)</div><div class='ctx'> static void flush_context(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* set the reserved ASID before flushing the TLB */</div><div class='del'>-	asm("mcr	p15, 0, %0, c13, c0, 1\n" : : "r" (0));</div><div class='add'>+	cpu_set_asid(0);</div><div class='ctx'> 	isb();</div><div class='ctx'> 	local_flush_tlb_all();</div><div class='ctx'> 	if (icache_is_vivt_asid_tagged()) {</div><div class='hunk'>@@ -99,7 +114,7 @@ static void reset_context(void *info)</div><div class='ctx'> 	set_mm_context(mm, asid);</div><div class='ctx'> </div><div class='ctx'> 	/* set the new ASID */</div><div class='del'>-	asm("mcr	p15, 0, %0, c13, c0, 1\n" : : "r" (mm-&gt;context.id));</div><div class='add'>+	cpu_set_asid(mm-&gt;context.id);</div><div class='ctx'> 	isb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c<br/>index aa33949fef60..bb7eac381a8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/fault.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/fault.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/fault.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/fault.c</a></div><div class='hunk'>@@ -27,19 +27,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "fault.h"</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Fault status register encodings.  We steal bit 31 for our own purposes.</div><div class='del'>- */</div><div class='del'>-#define FSR_LNX_PF		(1 &lt;&lt; 31)</div><div class='del'>-#define FSR_WRITE		(1 &lt;&lt; 11)</div><div class='del'>-#define FSR_FS4			(1 &lt;&lt; 10)</div><div class='del'>-#define FSR_FS3_0		(15)</div><div class='del'>-</div><div class='del'>-static inline int fsr_fs(unsigned int fsr)</div><div class='del'>-{</div><div class='del'>-	return (fsr &amp; FSR_FS3_0) | (fsr &amp; FSR_FS4) &gt;&gt; 6;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KPROBES</div><div class='hunk'>@@ -123,8 +110,10 @@ void show_pte(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'> </div><div class='ctx'> 		pte = pte_offset_map(pmd, addr);</div><div class='ctx'> 		printk(", *pte=%08llx", (long long)pte_val(*pte));</div><div class='add'>+#ifndef CONFIG_ARM_LPAE</div><div class='ctx'> 		printk(", *ppte=%08llx",</div><div class='ctx'> 		       (long long)pte_val(pte[PTE_HWTABLE_PTRS]));</div><div class='add'>+#endif</div><div class='ctx'> 		pte_unmap(pte);</div><div class='ctx'> 	} while(0);</div><div class='ctx'> </div><div class='hunk'>@@ -231,7 +220,7 @@ static inline bool access_error(unsigned int fsr, struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> static int __kprobes</div><div class='ctx'> __do_page_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,</div><div class='del'>-		struct task_struct *tsk)</div><div class='add'>+		unsigned int flags, struct task_struct *tsk)</div><div class='ctx'> {</div><div class='ctx'> 	struct vm_area_struct *vma;</div><div class='ctx'> 	int fault;</div><div class='hunk'>@@ -253,18 +242,7 @@ good_area:</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If for any reason at all we couldn't handle the fault, make</div><div class='del'>-	 * sure we exit gracefully rather than endlessly redo the fault.</div><div class='del'>-	 */</div><div class='del'>-	fault = handle_mm_fault(mm, vma, addr &amp; PAGE_MASK, (fsr &amp; FSR_WRITE) ? FAULT_FLAG_WRITE : 0);</div><div class='del'>-	if (unlikely(fault &amp; VM_FAULT_ERROR))</div><div class='del'>-		return fault;</div><div class='del'>-	if (fault &amp; VM_FAULT_MAJOR)</div><div class='del'>-		tsk-&gt;maj_flt++;</div><div class='del'>-	else</div><div class='del'>-		tsk-&gt;min_flt++;</div><div class='del'>-	return fault;</div><div class='add'>+	return handle_mm_fault(mm, vma, addr &amp; PAGE_MASK, flags);</div><div class='ctx'> </div><div class='ctx'> check_stack:</div><div class='ctx'> 	if (vma-&gt;vm_flags &amp; VM_GROWSDOWN &amp;&amp; !expand_stack(vma, addr))</div><div class='hunk'>@@ -279,6 +257,9 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)</div><div class='ctx'> 	struct task_struct *tsk;</div><div class='ctx'> 	struct mm_struct *mm;</div><div class='ctx'> 	int fault, sig, code;</div><div class='add'>+	int write = fsr &amp; FSR_WRITE;</div><div class='add'>+	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |</div><div class='add'>+				(write ? FAULT_FLAG_WRITE : 0);</div><div class='ctx'> </div><div class='ctx'> 	if (notify_page_fault(regs, fsr))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -305,6 +286,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)</div><div class='ctx'> 	if (!down_read_trylock(&amp;mm-&gt;mmap_sem)) {</div><div class='ctx'> 		if (!user_mode(regs) &amp;&amp; !search_exception_tables(regs-&gt;ARM_pc))</div><div class='ctx'> 			goto no_context;</div><div class='add'>+retry:</div><div class='ctx'> 		down_read(&amp;mm-&gt;mmap_sem);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -320,14 +302,41 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fault = __do_page_fault(mm, addr, fsr, tsk);</div><div class='del'>-	up_read(&amp;mm-&gt;mmap_sem);</div><div class='add'>+	fault = __do_page_fault(mm, addr, fsr, flags, tsk);</div><div class='add'>+</div><div class='add'>+	/* If we need to retry but a fatal signal is pending, handle the</div><div class='add'>+	 * signal first. We do not need to release the mmap_sem because</div><div class='add'>+	 * it would already be released in __lock_page_or_retry in</div><div class='add'>+	 * mm/filemap.c. */</div><div class='add'>+	if ((fault &amp; VM_FAULT_RETRY) &amp;&amp; fatal_signal_pending(current))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Major/minor page fault accounting is only done on the</div><div class='add'>+	 * initial attempt. If we go through a retry, it is extremely</div><div class='add'>+	 * likely that the page will be found in page cache at that point.</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, addr);</div><div class='del'>-	if (fault &amp; VM_FAULT_MAJOR)</div><div class='del'>-		perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, addr);</div><div class='del'>-	else if (fault &amp; VM_FAULT_MINOR)</div><div class='del'>-		perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, addr);</div><div class='add'>+	if (flags &amp; FAULT_FLAG_ALLOW_RETRY) {</div><div class='add'>+		if (fault &amp; VM_FAULT_MAJOR) {</div><div class='add'>+			tsk-&gt;maj_flt++;</div><div class='add'>+			perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1,</div><div class='add'>+					regs, addr);</div><div class='add'>+		} else {</div><div class='add'>+			tsk-&gt;min_flt++;</div><div class='add'>+			perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1,</div><div class='add'>+					regs, addr);</div><div class='add'>+		}</div><div class='add'>+		if (fault &amp; VM_FAULT_RETRY) {</div><div class='add'>+			/* Clear FAULT_FLAG_ALLOW_RETRY to avoid any risk</div><div class='add'>+			* of starvation. */</div><div class='add'>+			flags &amp;= ~FAULT_FLAG_ALLOW_RETRY;</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	up_read(&amp;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Handle the "normal" case first - VM_FAULT_MAJOR / VM_FAULT_MINOR</div><div class='hunk'>@@ -441,6 +450,12 @@ do_translation_fault(unsigned long addr, unsigned int fsr,</div><div class='ctx'> 	pmd = pmd_offset(pud, addr);</div><div class='ctx'> 	pmd_k = pmd_offset(pud_k, addr);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+	/*</div><div class='add'>+	 * Only one hardware entry per PMD with LPAE.</div><div class='add'>+	 */</div><div class='add'>+	index = 0;</div><div class='add'>+#else</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * On ARM one Linux PGD entry contains two hardware entries (see page</div><div class='ctx'> 	 * tables layout in pgtable.h). We normally guarantee that we always</div><div class='hunk'>@@ -450,6 +465,7 @@ do_translation_fault(unsigned long addr, unsigned int fsr,</div><div class='ctx'> 	 * for the first of pair.</div><div class='ctx'> 	 */</div><div class='ctx'> 	index = (addr &gt;&gt; SECTION_SHIFT) &amp; 1;</div><div class='add'>+#endif</div><div class='ctx'> 	if (pmd_none(pmd_k[index]))</div><div class='ctx'> 		goto bad_area;</div><div class='ctx'> </div><div class='hunk'>@@ -489,55 +505,20 @@ do_bad(unsigned long addr, unsigned int fsr, struct pt_regs *regs)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct fsr_info {</div><div class='add'>+struct fsr_info {</div><div class='ctx'> 	int	(*fn)(unsigned long addr, unsigned int fsr, struct pt_regs *regs);</div><div class='ctx'> 	int	sig;</div><div class='ctx'> 	int	code;</div><div class='ctx'> 	const char *name;</div><div class='del'>-} fsr_info[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * The following are the standard ARMv3 and ARMv4 aborts.  ARMv5</div><div class='del'>-	 * defines these to be "precise" aborts.</div><div class='del'>-	 */</div><div class='del'>-	{ do_bad,		SIGSEGV, 0,		"vector exception"		   },</div><div class='del'>-	{ do_bad,		SIGBUS,	 BUS_ADRALN,	"alignment exception"		   },</div><div class='del'>-	{ do_bad,		SIGKILL, 0,		"terminal exception"		   },</div><div class='del'>-	{ do_bad,		SIGBUS,	 BUS_ADRALN,	"alignment exception"		   },</div><div class='del'>-	{ do_bad,		SIGBUS,	 0,		"external abort on linefetch"	   },</div><div class='del'>-	{ do_translation_fault,	SIGSEGV, SEGV_MAPERR,	"section translation fault"	   },</div><div class='del'>-	{ do_bad,		SIGBUS,	 0,		"external abort on linefetch"	   },</div><div class='del'>-	{ do_page_fault,	SIGSEGV, SEGV_MAPERR,	"page translation fault"	   },</div><div class='del'>-	{ do_bad,		SIGBUS,	 0,		"external abort on non-linefetch"  },</div><div class='del'>-	{ do_bad,		SIGSEGV, SEGV_ACCERR,	"section domain fault"		   },</div><div class='del'>-	{ do_bad,		SIGBUS,	 0,		"external abort on non-linefetch"  },</div><div class='del'>-	{ do_bad,		SIGSEGV, SEGV_ACCERR,	"page domain fault"		   },</div><div class='del'>-	{ do_bad,		SIGBUS,	 0,		"external abort on translation"	   },</div><div class='del'>-	{ do_sect_fault,	SIGSEGV, SEGV_ACCERR,	"section permission fault"	   },</div><div class='del'>-	{ do_bad,		SIGBUS,	 0,		"external abort on translation"	   },</div><div class='del'>-	{ do_page_fault,	SIGSEGV, SEGV_ACCERR,	"page permission fault"		   },</div><div class='del'>-	/*</div><div class='del'>-	 * The following are "imprecise" aborts, which are signalled by bit</div><div class='del'>-	 * 10 of the FSR, and may not be recoverable.  These are only</div><div class='del'>-	 * supported if the CPU abort handler supports bit 10.</div><div class='del'>-	 */</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 16"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 17"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 18"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 19"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"lock abort"			   }, /* xscale */</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 21"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  BUS_OBJERR,	"imprecise external abort"	   }, /* xscale */</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 23"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"dcache parity error"		   }, /* xscale */</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 25"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 26"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 27"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 28"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 29"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 30"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 31"			   }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* FSR definition */</div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+#include "fsr-3level.c"</div><div class='add'>+#else</div><div class='add'>+#include "fsr-2level.c"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void __init</div><div class='ctx'> hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *),</div><div class='ctx'> 		int sig, int code, const char *name)</div><div class='hunk'>@@ -573,42 +554,6 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)</div><div class='ctx'> 	arm_notify_die("", regs, &amp;info, fsr, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static struct fsr_info ifsr_info[] = {</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 0"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 1"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"debug event"			   },</div><div class='del'>-	{ do_bad,		SIGSEGV, SEGV_ACCERR,	"section access flag fault"	   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 4"			   },</div><div class='del'>-	{ do_translation_fault,	SIGSEGV, SEGV_MAPERR,	"section translation fault"	   },</div><div class='del'>-	{ do_bad,		SIGSEGV, SEGV_ACCERR,	"page access flag fault"	   },</div><div class='del'>-	{ do_page_fault,	SIGSEGV, SEGV_MAPERR,	"page translation fault"	   },</div><div class='del'>-	{ do_bad,		SIGBUS,	 0,		"external abort on non-linefetch"  },</div><div class='del'>-	{ do_bad,		SIGSEGV, SEGV_ACCERR,	"section domain fault"		   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 10"			   },</div><div class='del'>-	{ do_bad,		SIGSEGV, SEGV_ACCERR,	"page domain fault"		   },</div><div class='del'>-	{ do_bad,		SIGBUS,	 0,		"external abort on translation"	   },</div><div class='del'>-	{ do_sect_fault,	SIGSEGV, SEGV_ACCERR,	"section permission fault"	   },</div><div class='del'>-	{ do_bad,		SIGBUS,	 0,		"external abort on translation"	   },</div><div class='del'>-	{ do_page_fault,	SIGSEGV, SEGV_ACCERR,	"page permission fault"		   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 16"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 17"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 18"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 19"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 20"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 21"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 22"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 23"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 24"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 25"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 26"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 27"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 28"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 29"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 30"			   },</div><div class='del'>-	{ do_bad,		SIGBUS,  0,		"unknown 31"			   },</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> void __init</div><div class='ctx'> hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *),</div><div class='ctx'> 		 int sig, int code, const char *name)</div><div class='hunk'>@@ -641,6 +586,7 @@ do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)</div><div class='ctx'> 	arm_notify_die("", regs, &amp;info, ifsr, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_ARM_LPAE</div><div class='ctx'> static int __init exceptions_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (cpu_architecture() &gt;= CPU_ARCH_ARMv6) {</div><div class='hunk'>@@ -663,3 +609,4 @@ static int __init exceptions_init(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> arch_initcall(exceptions_init);</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h<br/>index 49e9e3804de4..cf08bdfbe0d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/fault.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/fault.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/fault.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/fault.h</a></div><div class='hunk'>@@ -1,3 +1,28 @@</div><div class='del'>-void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);</div><div class='add'>+#ifndef __ARCH_ARM_FAULT_H</div><div class='add'>+#define __ARCH_ARM_FAULT_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Fault status register encodings.  We steal bit 31 for our own purposes.</div><div class='add'>+ */</div><div class='add'>+#define FSR_LNX_PF		(1 &lt;&lt; 31)</div><div class='add'>+#define FSR_WRITE		(1 &lt;&lt; 11)</div><div class='add'>+#define FSR_FS4			(1 &lt;&lt; 10)</div><div class='add'>+#define FSR_FS3_0		(15)</div><div class='add'>+#define FSR_FS5_0		(0x3f)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+static inline int fsr_fs(unsigned int fsr)</div><div class='add'>+{</div><div class='add'>+	return fsr &amp; FSR_FS5_0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int fsr_fs(unsigned int fsr)</div><div class='add'>+{</div><div class='add'>+	return (fsr &amp; FSR_FS3_0) | (fsr &amp; FSR_FS4) &gt;&gt; 6;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);</div><div class='ctx'> unsigned long search_exception_table(unsigned long addr);</div><div class='add'>+</div><div class='add'>+#endif	/* __ARCH_ARM_FAULT_H */</div><div class='head'>diff --git a/arch/arm/mm/fsr-2level.c b/arch/arm/mm/fsr-2level.c<br/>new file mode 100644<br/>index 000000000000..18ca74c0f341<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/fsr-2level.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/fsr-2level.c</a></div><div class='hunk'>@@ -0,0 +1,78 @@</div><div class='add'>+static struct fsr_info fsr_info[] = {</div><div class='add'>+	/*</div><div class='add'>+	 * The following are the standard ARMv3 and ARMv4 aborts.  ARMv5</div><div class='add'>+	 * defines these to be "precise" aborts.</div><div class='add'>+	 */</div><div class='add'>+	{ do_bad,		SIGSEGV, 0,		"vector exception"		   },</div><div class='add'>+	{ do_bad,		SIGBUS,	 BUS_ADRALN,	"alignment exception"		   },</div><div class='add'>+	{ do_bad,		SIGKILL, 0,		"terminal exception"		   },</div><div class='add'>+	{ do_bad,		SIGBUS,	 BUS_ADRALN,	"alignment exception"		   },</div><div class='add'>+	{ do_bad,		SIGBUS,	 0,		"external abort on linefetch"	   },</div><div class='add'>+	{ do_translation_fault,	SIGSEGV, SEGV_MAPERR,	"section translation fault"	   },</div><div class='add'>+	{ do_bad,		SIGBUS,	 0,		"external abort on linefetch"	   },</div><div class='add'>+	{ do_page_fault,	SIGSEGV, SEGV_MAPERR,	"page translation fault"	   },</div><div class='add'>+	{ do_bad,		SIGBUS,	 0,		"external abort on non-linefetch"  },</div><div class='add'>+	{ do_bad,		SIGSEGV, SEGV_ACCERR,	"section domain fault"		   },</div><div class='add'>+	{ do_bad,		SIGBUS,	 0,		"external abort on non-linefetch"  },</div><div class='add'>+	{ do_bad,		SIGSEGV, SEGV_ACCERR,	"page domain fault"		   },</div><div class='add'>+	{ do_bad,		SIGBUS,	 0,		"external abort on translation"	   },</div><div class='add'>+	{ do_sect_fault,	SIGSEGV, SEGV_ACCERR,	"section permission fault"	   },</div><div class='add'>+	{ do_bad,		SIGBUS,	 0,		"external abort on translation"	   },</div><div class='add'>+	{ do_page_fault,	SIGSEGV, SEGV_ACCERR,	"page permission fault"		   },</div><div class='add'>+	/*</div><div class='add'>+	 * The following are "imprecise" aborts, which are signalled by bit</div><div class='add'>+	 * 10 of the FSR, and may not be recoverable.  These are only</div><div class='add'>+	 * supported if the CPU abort handler supports bit 10.</div><div class='add'>+	 */</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 16"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 17"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 18"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 19"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"lock abort"			   }, /* xscale */</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 21"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  BUS_OBJERR,	"imprecise external abort"	   }, /* xscale */</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 23"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"dcache parity error"		   }, /* xscale */</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 25"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 26"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 27"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 28"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 29"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 30"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 31"			   },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct fsr_info ifsr_info[] = {</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 0"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 1"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"debug event"			   },</div><div class='add'>+	{ do_bad,		SIGSEGV, SEGV_ACCERR,	"section access flag fault"	   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 4"			   },</div><div class='add'>+	{ do_translation_fault,	SIGSEGV, SEGV_MAPERR,	"section translation fault"	   },</div><div class='add'>+	{ do_bad,		SIGSEGV, SEGV_ACCERR,	"page access flag fault"	   },</div><div class='add'>+	{ do_page_fault,	SIGSEGV, SEGV_MAPERR,	"page translation fault"	   },</div><div class='add'>+	{ do_bad,		SIGBUS,	 0,		"external abort on non-linefetch"  },</div><div class='add'>+	{ do_bad,		SIGSEGV, SEGV_ACCERR,	"section domain fault"		   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 10"			   },</div><div class='add'>+	{ do_bad,		SIGSEGV, SEGV_ACCERR,	"page domain fault"		   },</div><div class='add'>+	{ do_bad,		SIGBUS,	 0,		"external abort on translation"	   },</div><div class='add'>+	{ do_sect_fault,	SIGSEGV, SEGV_ACCERR,	"section permission fault"	   },</div><div class='add'>+	{ do_bad,		SIGBUS,	 0,		"external abort on translation"	   },</div><div class='add'>+	{ do_page_fault,	SIGSEGV, SEGV_ACCERR,	"page permission fault"		   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 16"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 17"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 18"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 19"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 20"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 21"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 22"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 23"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 24"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 25"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 26"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 27"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 28"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 29"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 30"			   },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 31"			   },</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/mm/fsr-3level.c b/arch/arm/mm/fsr-3level.c<br/>new file mode 100644<br/>index 000000000000..05a4e9431836<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/fsr-3level.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/fsr-3level.c</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+static struct fsr_info fsr_info[] = {</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 0"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 1"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 2"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 3"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"reserved translation fault"	},</div><div class='add'>+	{ do_translation_fault,	SIGSEGV, SEGV_MAPERR,	"level 1 translation fault"	},</div><div class='add'>+	{ do_translation_fault,	SIGSEGV, SEGV_MAPERR,	"level 2 translation fault"	},</div><div class='add'>+	{ do_page_fault,	SIGSEGV, SEGV_MAPERR,	"level 3 translation fault"	},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"reserved access flag fault"	},</div><div class='add'>+	{ do_bad,		SIGSEGV, SEGV_ACCERR,	"level 1 access flag fault"	},</div><div class='add'>+	{ do_bad,		SIGSEGV, SEGV_ACCERR,	"level 2 access flag fault"	},</div><div class='add'>+	{ do_page_fault,	SIGSEGV, SEGV_ACCERR,	"level 3 access flag fault"	},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"reserved permission fault"	},</div><div class='add'>+	{ do_bad,		SIGSEGV, SEGV_ACCERR,	"level 1 permission fault"	},</div><div class='add'>+	{ do_sect_fault,	SIGSEGV, SEGV_ACCERR,	"level 2 permission fault"	},</div><div class='add'>+	{ do_page_fault,	SIGSEGV, SEGV_ACCERR,	"level 3 permission fault"	},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"synchronous external abort"	},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"asynchronous external abort"	},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 18"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 19"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"synchronous abort (translation table walk)" },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"synchronous abort (translation table walk)" },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"synchronous abort (translation table walk)" },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"synchronous abort (translation table walk)" },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"synchronous parity error"	},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"asynchronous parity error"	},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 26"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 27"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"synchronous parity error (translation table walk" },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"synchronous parity error (translation table walk" },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"synchronous parity error (translation table walk" },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"synchronous parity error (translation table walk" },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 32"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  BUS_ADRALN,	"alignment fault"		},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"debug event"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 35"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 36"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 37"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 38"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 39"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 40"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 41"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 42"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 43"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 44"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 45"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 46"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 47"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 48"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 49"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 50"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 51"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"implementation fault (lockdown abort)" },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 53"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 54"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 55"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 56"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 57"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"implementation fault (coprocessor abort)" },</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 59"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 60"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 61"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 62"			},</div><div class='add'>+	{ do_bad,		SIGBUS,  0,		"unknown 63"			},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ifsr_info	fsr_info</div><div class='head'>diff --git a/arch/arm/mm/idmap.c b/arch/arm/mm/idmap.c<br/>index 2be9139a4ef3..feacf4c76712 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/idmap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/idmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/idmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/idmap.c</a></div><div class='hunk'>@@ -1,9 +1,38 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cputype.h&gt;</div><div class='add'>+#include &lt;asm/idmap.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/sections.h&gt;</div><div class='ctx'> </div><div class='add'>+pgd_t *idmap_pgd;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+static void idmap_add_pmd(pud_t *pud, unsigned long addr, unsigned long end,</div><div class='add'>+	unsigned long prot)</div><div class='add'>+{</div><div class='add'>+	pmd_t *pmd;</div><div class='add'>+	unsigned long next;</div><div class='add'>+</div><div class='add'>+	if (pud_none_or_clear_bad(pud) || (pud_val(*pud) &amp; L_PGD_SWAPPER)) {</div><div class='add'>+		pmd = pmd_alloc_one(&amp;init_mm, addr);</div><div class='add'>+		if (!pmd) {</div><div class='add'>+			pr_warning("Failed to allocate identity pmd.\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		pud_populate(&amp;init_mm, pud, pmd);</div><div class='add'>+		pmd += pmd_index(addr);</div><div class='add'>+	} else</div><div class='add'>+		pmd = pmd_offset(pud, addr);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		next = pmd_addr_end(addr, end);</div><div class='add'>+		*pmd = __pmd((addr &amp; PMD_MASK) | prot);</div><div class='add'>+		flush_pmd_entry(pmd);</div><div class='add'>+	} while (pmd++, addr = next, addr != end);</div><div class='add'>+}</div><div class='add'>+#else	/* !CONFIG_ARM_LPAE */</div><div class='ctx'> static void idmap_add_pmd(pud_t *pud, unsigned long addr, unsigned long end,</div><div class='ctx'> 	unsigned long prot)</div><div class='ctx'> {</div><div class='hunk'>@@ -15,6 +44,7 @@ static void idmap_add_pmd(pud_t *pud, unsigned long addr, unsigned long end,</div><div class='ctx'> 	pmd[1] = __pmd(addr);</div><div class='ctx'> 	flush_pmd_entry(pmd);</div><div class='ctx'> }</div><div class='add'>+#endif	/* CONFIG_ARM_LPAE */</div><div class='ctx'> </div><div class='ctx'> static void idmap_add_pud(pgd_t *pgd, unsigned long addr, unsigned long end,</div><div class='ctx'> 	unsigned long prot)</div><div class='hunk'>@@ -28,11 +58,11 @@ static void idmap_add_pud(pgd_t *pgd, unsigned long addr, unsigned long end,</div><div class='ctx'> 	} while (pud++, addr = next, addr != end);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void identity_mapping_add(pgd_t *pgd, unsigned long addr, unsigned long end)</div><div class='add'>+static void identity_mapping_add(pgd_t *pgd, unsigned long addr, unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long prot, next;</div><div class='ctx'> </div><div class='del'>-	prot = PMD_TYPE_SECT | PMD_SECT_AP_WRITE;</div><div class='add'>+	prot = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_AF;</div><div class='ctx'> 	if (cpu_architecture() &lt;= CPU_ARCH_ARMv5TEJ &amp;&amp; !cpu_is_xscale())</div><div class='ctx'> 		prot |= PMD_BIT4;</div><div class='ctx'> </div><div class='hunk'>@@ -43,48 +73,41 @@ void identity_mapping_add(pgd_t *pgd, unsigned long addr, unsigned long end)</div><div class='ctx'> 	} while (pgd++, addr = next, addr != end);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-static void idmap_del_pmd(pud_t *pud, unsigned long addr, unsigned long end)</div><div class='del'>-{</div><div class='del'>-	pmd_t *pmd = pmd_offset(pud, addr);</div><div class='del'>-	pmd_clear(pmd);</div><div class='del'>-}</div><div class='add'>+extern char  __idmap_text_start[], __idmap_text_end[];</div><div class='ctx'> </div><div class='del'>-static void idmap_del_pud(pgd_t *pgd, unsigned long addr, unsigned long end)</div><div class='add'>+static int __init init_static_idmap(void)</div><div class='ctx'> {</div><div class='del'>-	pud_t *pud = pud_offset(pgd, addr);</div><div class='del'>-	unsigned long next;</div><div class='add'>+	phys_addr_t idmap_start, idmap_end;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		next = pud_addr_end(addr, end);</div><div class='del'>-		idmap_del_pmd(pud, addr, next);</div><div class='del'>-	} while (pud++, addr = next, addr != end);</div><div class='del'>-}</div><div class='add'>+	idmap_pgd = pgd_alloc(&amp;init_mm);</div><div class='add'>+	if (!idmap_pgd)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-void identity_mapping_del(pgd_t *pgd, unsigned long addr, unsigned long end)</div><div class='del'>-{</div><div class='del'>-	unsigned long next;</div><div class='add'>+	/* Add an identity mapping for the physical address of the section. */</div><div class='add'>+	idmap_start = virt_to_phys((void *)__idmap_text_start);</div><div class='add'>+	idmap_end = virt_to_phys((void *)__idmap_text_end);</div><div class='ctx'> </div><div class='del'>-	pgd += pgd_index(addr);</div><div class='del'>-	do {</div><div class='del'>-		next = pgd_addr_end(addr, end);</div><div class='del'>-		idmap_del_pud(pgd, addr, next);</div><div class='del'>-	} while (pgd++, addr = next, addr != end);</div><div class='add'>+	pr_info("Setting up static identity map for 0x%llx - 0x%llx\n",</div><div class='add'>+		(long long)idmap_start, (long long)idmap_end);</div><div class='add'>+	identity_mapping_add(idmap_pgd, idmap_start, idmap_end);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+early_initcall(init_static_idmap);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * In order to soft-boot, we need to insert a 1:1 mapping in place of</div><div class='del'>- * the user-mode pages.  This will then ensure that we have predictable</div><div class='del'>- * results when turning the mmu off</div><div class='add'>+ * In order to soft-boot, we need to switch to a 1:1 mapping for the</div><div class='add'>+ * cpu_reset functions. This will then ensure that we have predictable</div><div class='add'>+ * results when turning off the mmu.</div><div class='ctx'>  */</div><div class='del'>-void setup_mm_for_reboot(char mode)</div><div class='add'>+void setup_mm_for_reboot(void)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * We need to access to user-mode page tables here. For kernel threads</div><div class='del'>-	 * we don't have any user-mode mappings so we use the context that we</div><div class='del'>-	 * "borrowed".</div><div class='del'>-	 */</div><div class='del'>-	identity_mapping_add(current-&gt;active_mm-&gt;pgd, 0, TASK_SIZE);</div><div class='add'>+	/* Clean and invalidate L1. */</div><div class='add'>+	flush_cache_all();</div><div class='add'>+</div><div class='add'>+	/* Switch to the identity mapping. */</div><div class='add'>+	cpu_switch_mm(idmap_pgd, &amp;init_mm);</div><div class='add'>+</div><div class='add'>+	/* Flush the TLB. */</div><div class='ctx'> 	local_flush_tlb_all();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c<br/>index 7c38474e533a..6ec1226fc62d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/init.c</a></div><div class='hunk'>@@ -20,9 +20,9 @@</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='del'>-#include &lt;linux/sort.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/memblock.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -135,30 +135,18 @@ void show_mem(unsigned int filter)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init find_limits(unsigned long *min, unsigned long *max_low,</div><div class='del'>-	unsigned long *max_high)</div><div class='add'>+			       unsigned long *max_high)</div><div class='ctx'> {</div><div class='ctx'> 	struct meminfo *mi = &amp;meminfo;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	*min = -1UL;</div><div class='del'>-	*max_low = *max_high = 0;</div><div class='del'>-</div><div class='del'>-	for_each_bank (i, mi) {</div><div class='del'>-		struct membank *bank = &amp;mi-&gt;bank[i];</div><div class='del'>-		unsigned long start, end;</div><div class='del'>-</div><div class='del'>-		start = bank_pfn_start(bank);</div><div class='del'>-		end = bank_pfn_end(bank);</div><div class='del'>-</div><div class='del'>-		if (*min &gt; start)</div><div class='del'>-			*min = start;</div><div class='del'>-		if (*max_high &lt; end)</div><div class='del'>-			*max_high = end;</div><div class='del'>-		if (bank-&gt;highmem)</div><div class='del'>-			continue;</div><div class='del'>-		if (*max_low &lt; end)</div><div class='del'>-			*max_low = end;</div><div class='del'>-	}</div><div class='add'>+	/* This assumes the meminfo array is properly sorted */</div><div class='add'>+	*min = bank_pfn_start(&amp;mi-&gt;bank[0]);</div><div class='add'>+	for_each_bank (i, mi)</div><div class='add'>+		if (mi-&gt;bank[i].highmem)</div><div class='add'>+				break;</div><div class='add'>+	*max_low = bank_pfn_end(&amp;mi-&gt;bank[i - 1]);</div><div class='add'>+	*max_high = bank_pfn_end(&amp;mi-&gt;bank[mi-&gt;nr_banks - 1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init arm_bootmem_init(unsigned long start_pfn,</div><div class='hunk'>@@ -320,19 +308,25 @@ static void arm_memory_present(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int __init meminfo_cmp(const void *_a, const void *_b)</div><div class='add'>+static bool arm_memblock_steal_permitted = true;</div><div class='add'>+</div><div class='add'>+phys_addr_t arm_memblock_steal(phys_addr_t size, phys_addr_t align)</div><div class='ctx'> {</div><div class='del'>-	const struct membank *a = _a, *b = _b;</div><div class='del'>-	long cmp = bank_pfn_start(a) - bank_pfn_start(b);</div><div class='del'>-	return cmp &lt; 0 ? -1 : cmp &gt; 0 ? 1 : 0;</div><div class='add'>+	phys_addr_t phys;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!arm_memblock_steal_permitted);</div><div class='add'>+</div><div class='add'>+	phys = memblock_alloc(size, align);</div><div class='add'>+	memblock_free(phys, size);</div><div class='add'>+	memblock_remove(phys, size);</div><div class='add'>+</div><div class='add'>+	return phys;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	sort(&amp;meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), meminfo_cmp, NULL);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; mi-&gt;nr_banks; i++)</div><div class='ctx'> 		memblock_add(mi-&gt;bank[i].start, mi-&gt;bank[i].size);</div><div class='ctx'> </div><div class='hunk'>@@ -371,6 +365,7 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc)</div><div class='ctx'> 	if (mdesc-&gt;reserve)</div><div class='ctx'> 		mdesc-&gt;reserve();</div><div class='ctx'> </div><div class='add'>+	arm_memblock_steal_permitted = false;</div><div class='ctx'> 	memblock_allow_resize();</div><div class='ctx'> 	memblock_dump_all();</div><div class='ctx'> }</div><div class='hunk'>@@ -403,8 +398,6 @@ void __init bootmem_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	arm_bootmem_free(min, max_low, max_high);</div><div class='ctx'> </div><div class='del'>-	high_memory = __va(((phys_addr_t)max_low &lt;&lt; PAGE_SHIFT) - 1) + 1;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This doesn't seem to be used by the Linux memory manager any</div><div class='ctx'> 	 * more, but is used by ll_rw_block.  If we can get rid of it, we</div><div class='head'>diff --git a/arch/arm/mm/iomap.c b/arch/arm/mm/iomap.c<br/>index 430df1a5978d..e62956e12030 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/iomap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/iomap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/iomap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/iomap.c</a></div><div class='hunk'>@@ -35,27 +35,6 @@ EXPORT_SYMBOL(pcibios_min_mem);</div><div class='ctx'> unsigned int pci_flags = PCI_REASSIGN_ALL_RSRC;</div><div class='ctx'> EXPORT_SYMBOL(pci_flags);</div><div class='ctx'> </div><div class='del'>-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)</div><div class='del'>-{</div><div class='del'>-	resource_size_t start = pci_resource_start(dev, bar);</div><div class='del'>-	resource_size_t len   = pci_resource_len(dev, bar);</div><div class='del'>-	unsigned long flags = pci_resource_flags(dev, bar);</div><div class='del'>-</div><div class='del'>-	if (!len || !start)</div><div class='del'>-		return NULL;</div><div class='del'>-	if (maxlen &amp;&amp; len &gt; maxlen)</div><div class='del'>-		len = maxlen;</div><div class='del'>-	if (flags &amp; IORESOURCE_IO)</div><div class='del'>-		return ioport_map(start, len);</div><div class='del'>-	if (flags &amp; IORESOURCE_MEM) {</div><div class='del'>-		if (flags &amp; IORESOURCE_CACHEABLE)</div><div class='del'>-			return ioremap(start, len);</div><div class='del'>-		return ioremap_nocache(start, len);</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(pci_iomap);</div><div class='del'>-</div><div class='ctx'> void pci_iounmap(struct pci_dev *dev, void __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'> 	if ((unsigned long)addr &gt;= VMALLOC_START &amp;&amp;</div><div class='head'>diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c<br/>index bdb248c4f55c..80632e8d7538 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/ioremap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/ioremap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/ioremap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/ioremap.c</a></div><div class='hunk'>@@ -36,12 +36,6 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include "mm.h"</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Used by ioremap() and iounmap() code to mark (super)section-mapped</div><div class='del'>- * I/O regions in vm_struct-&gt;flags field.</div><div class='del'>- */</div><div class='del'>-#define VM_ARM_SECTION_MAPPING	0x80000000</div><div class='del'>-</div><div class='ctx'> int ioremap_page(unsigned long virt, unsigned long phys,</div><div class='ctx'> 		 const struct mem_type *mtype)</div><div class='ctx'> {</div><div class='hunk'>@@ -64,7 +58,7 @@ void __check_kvm_seq(struct mm_struct *mm)</div><div class='ctx'> 	} while (seq != init_mm.context.kvm_seq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_SMP</div><div class='add'>+#if !defined(CONFIG_SMP) &amp;&amp; !defined(CONFIG_ARM_LPAE)</div><div class='ctx'> /*</div><div class='ctx'>  * Section support is unsafe on SMP - If you iounmap and ioremap a region,</div><div class='ctx'>  * the other CPUs will not see this change until their next context switch.</div><div class='hunk'>@@ -79,13 +73,16 @@ static void unmap_area_sections(unsigned long virt, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addr = virt, end = virt + (size &amp; ~(SZ_1M - 1));</div><div class='ctx'> 	pgd_t *pgd;</div><div class='add'>+	pud_t *pud;</div><div class='add'>+	pmd_t *pmdp;</div><div class='ctx'> </div><div class='ctx'> 	flush_cache_vunmap(addr, end);</div><div class='ctx'> 	pgd = pgd_offset_k(addr);</div><div class='add'>+	pud = pud_offset(pgd, addr);</div><div class='add'>+	pmdp = pmd_offset(pud, addr);</div><div class='ctx'> 	do {</div><div class='del'>-		pmd_t pmd, *pmdp = pmd_offset(pgd, addr);</div><div class='add'>+		pmd_t pmd = *pmdp;</div><div class='ctx'> </div><div class='del'>-		pmd = *pmdp;</div><div class='ctx'> 		if (!pmd_none(pmd)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Clear the PMD from the page table, and</div><div class='hunk'>@@ -104,8 +101,8 @@ static void unmap_area_sections(unsigned long virt, unsigned long size)</div><div class='ctx'> 				pte_free_kernel(&amp;init_mm, pmd_page_vaddr(pmd));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		addr += PGDIR_SIZE;</div><div class='del'>-		pgd++;</div><div class='add'>+		addr += PMD_SIZE;</div><div class='add'>+		pmdp += 2;</div><div class='ctx'> 	} while (addr &lt; end);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -124,6 +121,8 @@ remap_area_sections(unsigned long virt, unsigned long pfn,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addr = virt, end = virt + size;</div><div class='ctx'> 	pgd_t *pgd;</div><div class='add'>+	pud_t *pud;</div><div class='add'>+	pmd_t *pmd;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Remove and free any PTE-based mapping, and</div><div class='hunk'>@@ -132,17 +131,17 @@ remap_area_sections(unsigned long virt, unsigned long pfn,</div><div class='ctx'> 	unmap_area_sections(virt, size);</div><div class='ctx'> </div><div class='ctx'> 	pgd = pgd_offset_k(addr);</div><div class='add'>+	pud = pud_offset(pgd, addr);</div><div class='add'>+	pmd = pmd_offset(pud, addr);</div><div class='ctx'> 	do {</div><div class='del'>-		pmd_t *pmd = pmd_offset(pgd, addr);</div><div class='del'>-</div><div class='ctx'> 		pmd[0] = __pmd(__pfn_to_phys(pfn) | type-&gt;prot_sect);</div><div class='ctx'> 		pfn += SZ_1M &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 		pmd[1] = __pmd(__pfn_to_phys(pfn) | type-&gt;prot_sect);</div><div class='ctx'> 		pfn += SZ_1M &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 		flush_pmd_entry(pmd);</div><div class='ctx'> </div><div class='del'>-		addr += PGDIR_SIZE;</div><div class='del'>-		pgd++;</div><div class='add'>+		addr += PMD_SIZE;</div><div class='add'>+		pmd += 2;</div><div class='ctx'> 	} while (addr &lt; end);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -154,6 +153,8 @@ remap_area_supersections(unsigned long virt, unsigned long pfn,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addr = virt, end = virt + size;</div><div class='ctx'> 	pgd_t *pgd;</div><div class='add'>+	pud_t *pud;</div><div class='add'>+	pmd_t *pmd;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Remove and free any PTE-based mapping, and</div><div class='hunk'>@@ -162,6 +163,8 @@ remap_area_supersections(unsigned long virt, unsigned long pfn,</div><div class='ctx'> 	unmap_area_sections(virt, size);</div><div class='ctx'> </div><div class='ctx'> 	pgd = pgd_offset_k(virt);</div><div class='add'>+	pud = pud_offset(pgd, addr);</div><div class='add'>+	pmd = pmd_offset(pud, addr);</div><div class='ctx'> 	do {</div><div class='ctx'> 		unsigned long super_pmd_val, i;</div><div class='ctx'> </div><div class='hunk'>@@ -170,14 +173,12 @@ remap_area_supersections(unsigned long virt, unsigned long pfn,</div><div class='ctx'> 		super_pmd_val |= ((pfn &gt;&gt; (32 - PAGE_SHIFT)) &amp; 0xf) &lt;&lt; 20;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; 8; i++) {</div><div class='del'>-			pmd_t *pmd = pmd_offset(pgd, addr);</div><div class='del'>-</div><div class='ctx'> 			pmd[0] = __pmd(super_pmd_val);</div><div class='ctx'> 			pmd[1] = __pmd(super_pmd_val);</div><div class='ctx'> 			flush_pmd_entry(pmd);</div><div class='ctx'> </div><div class='del'>-			addr += PGDIR_SIZE;</div><div class='del'>-			pgd++;</div><div class='add'>+			addr += PMD_SIZE;</div><div class='add'>+			pmd += 2;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		pfn += SUPERSECTION_SIZE &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -195,17 +196,13 @@ void __iomem * __arm_ioremap_pfn_caller(unsigned long pfn,</div><div class='ctx'> 	unsigned long addr;</div><div class='ctx'>  	struct vm_struct * area;</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_ARM_LPAE</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * High mappings must be supersection aligned</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pfn &gt;= 0x100000 &amp;&amp; (__pfn_to_phys(pfn) &amp; ~SUPERSECTION_MASK))</div><div class='ctx'> 		return NULL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Don't allow RAM to be mapped - this causes problems with ARMv6+</div><div class='del'>-	 */</div><div class='del'>-	if (WARN_ON(pfn_valid(pfn)))</div><div class='del'>-		return NULL;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	type = get_mem_type(mtype);</div><div class='ctx'> 	if (!type)</div><div class='hunk'>@@ -216,12 +213,40 @@ void __iomem * __arm_ioremap_pfn_caller(unsigned long pfn,</div><div class='ctx'> 	 */</div><div class='ctx'> 	size = PAGE_ALIGN(offset + size);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Try to reuse one of the static mapping whenever possible.</div><div class='add'>+	 */</div><div class='add'>+	read_lock(&amp;vmlist_lock);</div><div class='add'>+	for (area = vmlist; area; area = area-&gt;next) {</div><div class='add'>+		if (!size || (sizeof(phys_addr_t) == 4 &amp;&amp; pfn &gt;= 0x100000))</div><div class='add'>+			break;</div><div class='add'>+		if (!(area-&gt;flags &amp; VM_ARM_STATIC_MAPPING))</div><div class='add'>+			continue;</div><div class='add'>+		if ((area-&gt;flags &amp; VM_ARM_MTYPE_MASK) != VM_ARM_MTYPE(mtype))</div><div class='add'>+			continue;</div><div class='add'>+		if (__phys_to_pfn(area-&gt;phys_addr) &gt; pfn ||</div><div class='add'>+		    __pfn_to_phys(pfn) + size-1 &gt; area-&gt;phys_addr + area-&gt;size-1)</div><div class='add'>+			continue;</div><div class='add'>+		/* we can drop the lock here as we know *area is static */</div><div class='add'>+		read_unlock(&amp;vmlist_lock);</div><div class='add'>+		addr = (unsigned long)area-&gt;addr;</div><div class='add'>+		addr += __pfn_to_phys(pfn) - area-&gt;phys_addr;</div><div class='add'>+		return (void __iomem *) (offset + addr);</div><div class='add'>+	}</div><div class='add'>+	read_unlock(&amp;vmlist_lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Don't allow RAM to be mapped - this causes problems with ARMv6+</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON(pfn_valid(pfn)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	area = get_vm_area_caller(size, VM_IOREMAP, caller);</div><div class='ctx'>  	if (!area)</div><div class='ctx'>  		return NULL;</div><div class='ctx'>  	addr = (unsigned long)area-&gt;addr;</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_SMP</div><div class='add'>+#if !defined(CONFIG_SMP) &amp;&amp; !defined(CONFIG_ARM_LPAE)</div><div class='ctx'> 	if (DOMAIN_IO == 0 &amp;&amp;</div><div class='ctx'> 	    (((cpu_architecture() &gt;= CPU_ARCH_ARMv6) &amp;&amp; (get_cr() &amp; CR_XP)) ||</div><div class='ctx'> 	       cpu_is_xsc3()) &amp;&amp; pfn &gt;= 0x100000 &amp;&amp;</div><div class='hunk'>@@ -313,28 +338,34 @@ __arm_ioremap_exec(unsigned long phys_addr, size_t size, bool cached)</div><div class='ctx'> void __iounmap(volatile void __iomem *io_addr)</div><div class='ctx'> {</div><div class='ctx'> 	void *addr = (void *)(PAGE_MASK &amp; (unsigned long)io_addr);</div><div class='del'>-#ifndef CONFIG_SMP</div><div class='del'>-	struct vm_struct **p, *tmp;</div><div class='add'>+	struct vm_struct *vm;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If this is a section based mapping we need to handle it</div><div class='del'>-	 * specially as the VM subsystem does not know how to handle</div><div class='del'>-	 * such a beast. We need the lock here b/c we need to clear</div><div class='del'>-	 * all the mappings before the area can be reclaimed</div><div class='del'>-	 * by someone else.</div><div class='del'>-	 */</div><div class='del'>-	write_lock(&amp;vmlist_lock);</div><div class='del'>-	for (p = &amp;vmlist ; (tmp = *p) ; p = &amp;tmp-&gt;next) {</div><div class='del'>-		if ((tmp-&gt;flags &amp; VM_IOREMAP) &amp;&amp; (tmp-&gt;addr == addr)) {</div><div class='del'>-			if (tmp-&gt;flags &amp; VM_ARM_SECTION_MAPPING) {</div><div class='del'>-				unmap_area_sections((unsigned long)tmp-&gt;addr,</div><div class='del'>-						    tmp-&gt;size);</div><div class='del'>-			}</div><div class='add'>+	read_lock(&amp;vmlist_lock);</div><div class='add'>+	for (vm = vmlist; vm; vm = vm-&gt;next) {</div><div class='add'>+		if (vm-&gt;addr &gt; addr)</div><div class='add'>+			break;</div><div class='add'>+		if (!(vm-&gt;flags &amp; VM_IOREMAP))</div><div class='add'>+			continue;</div><div class='add'>+		/* If this is a static mapping we must leave it alone */</div><div class='add'>+		if ((vm-&gt;flags &amp; VM_ARM_STATIC_MAPPING) &amp;&amp;</div><div class='add'>+		    (vm-&gt;addr &lt;= addr) &amp;&amp; (vm-&gt;addr + vm-&gt;size &gt; addr)) {</div><div class='add'>+			read_unlock(&amp;vmlist_lock);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+#if !defined(CONFIG_SMP) &amp;&amp; !defined(CONFIG_ARM_LPAE)</div><div class='add'>+		/*</div><div class='add'>+		 * If this is a section based mapping we need to handle it</div><div class='add'>+		 * specially as the VM subsystem does not know how to handle</div><div class='add'>+		 * such a beast.</div><div class='add'>+		 */</div><div class='add'>+		if ((vm-&gt;addr == addr) &amp;&amp;</div><div class='add'>+		    (vm-&gt;flags &amp; VM_ARM_SECTION_MAPPING)) {</div><div class='add'>+			unmap_area_sections((unsigned long)vm-&gt;addr, vm-&gt;size);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-	write_unlock(&amp;vmlist_lock);</div><div class='ctx'> #endif</div><div class='add'>+	}</div><div class='add'>+	read_unlock(&amp;vmlist_lock);</div><div class='ctx'> </div><div class='ctx'> 	vunmap(addr);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h<br/>index ad7cce3bc431..70f6d3ea4834 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/mm.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/mm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/mm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/mm.h</a></div><div class='hunk'>@@ -21,6 +21,20 @@ const struct mem_type *get_mem_type(unsigned int type);</div><div class='ctx'> </div><div class='ctx'> extern void __flush_dcache_page(struct address_space *mapping, struct page *page);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * ARM specific vm_struct-&gt;flags bits.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* (super)section-mapped I/O regions used by ioremap()/iounmap() */</div><div class='add'>+#define VM_ARM_SECTION_MAPPING	0x80000000</div><div class='add'>+</div><div class='add'>+/* permanent static mappings from iotable_init() */</div><div class='add'>+#define VM_ARM_STATIC_MAPPING	0x40000000</div><div class='add'>+</div><div class='add'>+/* mapping type (attributes) for permanent static mappings */</div><div class='add'>+#define VM_ARM_MTYPE(mt)		((mt) &lt;&lt; 20)</div><div class='add'>+#define VM_ARM_MTYPE_MASK	(0x1f &lt;&lt; 20)</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ZONE_DMA</div><div class='head'>diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c<br/>index 44b628e4d6ea..ce8cb1970d7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/mmap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/mmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/mmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/mmap.c</a></div><div class='hunk'>@@ -11,10 +11,49 @@</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;asm/cachetype.h&gt;</div><div class='ctx'> </div><div class='add'>+static inline unsigned long COLOUR_ALIGN_DOWN(unsigned long addr,</div><div class='add'>+					      unsigned long pgoff)</div><div class='add'>+{</div><div class='add'>+	unsigned long base = addr &amp; ~(SHMLBA-1);</div><div class='add'>+	unsigned long off = (pgoff &lt;&lt; PAGE_SHIFT) &amp; (SHMLBA-1);</div><div class='add'>+</div><div class='add'>+	if (base + off &lt;= addr)</div><div class='add'>+		return base + off;</div><div class='add'>+</div><div class='add'>+	return base - off;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define COLOUR_ALIGN(addr,pgoff)		\</div><div class='ctx'> 	((((addr)+SHMLBA-1)&amp;~(SHMLBA-1)) +	\</div><div class='ctx'> 	 (((pgoff)&lt;&lt;PAGE_SHIFT) &amp; (SHMLBA-1)))</div><div class='ctx'> </div><div class='add'>+/* gap between mmap and stack */</div><div class='add'>+#define MIN_GAP (128*1024*1024UL)</div><div class='add'>+#define MAX_GAP ((TASK_SIZE)/6*5)</div><div class='add'>+</div><div class='add'>+static int mmap_is_legacy(void)</div><div class='add'>+{</div><div class='add'>+	if (current-&gt;personality &amp; ADDR_COMPAT_LAYOUT)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (rlimit(RLIMIT_STACK) == RLIM_INFINITY)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return sysctl_legacy_va_layout;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long mmap_base(unsigned long rnd)</div><div class='add'>+{</div><div class='add'>+	unsigned long gap = rlimit(RLIMIT_STACK);</div><div class='add'>+</div><div class='add'>+	if (gap &lt; MIN_GAP)</div><div class='add'>+		gap = MIN_GAP;</div><div class='add'>+	else if (gap &gt; MAX_GAP)</div><div class='add'>+		gap = MAX_GAP;</div><div class='add'>+</div><div class='add'>+	return PAGE_ALIGN(TASK_SIZE - gap - rnd);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * We need to ensure that shared mappings are correctly aligned to</div><div class='ctx'>  * avoid aliasing issues with VIPT caches.  We need to ensure that</div><div class='hunk'>@@ -68,13 +107,9 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,</div><div class='ctx'> 	if (len &gt; mm-&gt;cached_hole_size) {</div><div class='ctx'> 	        start_addr = addr = mm-&gt;free_area_cache;</div><div class='ctx'> 	} else {</div><div class='del'>-	        start_addr = addr = TASK_UNMAPPED_BASE;</div><div class='add'>+	        start_addr = addr = mm-&gt;mmap_base;</div><div class='ctx'> 	        mm-&gt;cached_hole_size = 0;</div><div class='ctx'> 	}</div><div class='del'>-	/* 8 bits of randomness in 20 address space bits */</div><div class='del'>-	if ((current-&gt;flags &amp; PF_RANDOMIZE) &amp;&amp;</div><div class='del'>-	    !(current-&gt;personality &amp; ADDR_NO_RANDOMIZE))</div><div class='del'>-		addr += (get_random_int() % (1 &lt;&lt; 8)) &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> full_search:</div><div class='ctx'> 	if (do_align)</div><div class='hunk'>@@ -111,6 +146,134 @@ full_search:</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+unsigned long</div><div class='add'>+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,</div><div class='add'>+			const unsigned long len, const unsigned long pgoff,</div><div class='add'>+			const unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+	struct mm_struct *mm = current-&gt;mm;</div><div class='add'>+	unsigned long addr = addr0;</div><div class='add'>+	int do_align = 0;</div><div class='add'>+	int aliasing = cache_is_vipt_aliasing();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We only need to do colour alignment if either the I or D</div><div class='add'>+	 * caches alias.</div><div class='add'>+	 */</div><div class='add'>+	if (aliasing)</div><div class='add'>+		do_align = filp || (flags &amp; MAP_SHARED);</div><div class='add'>+</div><div class='add'>+	/* requested length too big for entire address space */</div><div class='add'>+	if (len &gt; TASK_SIZE)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; MAP_FIXED) {</div><div class='add'>+		if (aliasing &amp;&amp; flags &amp; MAP_SHARED &amp;&amp;</div><div class='add'>+		    (addr - (pgoff &lt;&lt; PAGE_SHIFT)) &amp; (SHMLBA - 1))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* requesting a specific address */</div><div class='add'>+	if (addr) {</div><div class='add'>+		if (do_align)</div><div class='add'>+			addr = COLOUR_ALIGN(addr, pgoff);</div><div class='add'>+		else</div><div class='add'>+			addr = PAGE_ALIGN(addr);</div><div class='add'>+		vma = find_vma(mm, addr);</div><div class='add'>+		if (TASK_SIZE - len &gt;= addr &amp;&amp;</div><div class='add'>+				(!vma || addr + len &lt;= vma-&gt;vm_start))</div><div class='add'>+			return addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check if free_area_cache is useful for us */</div><div class='add'>+	if (len &lt;= mm-&gt;cached_hole_size) {</div><div class='add'>+		mm-&gt;cached_hole_size = 0;</div><div class='add'>+		mm-&gt;free_area_cache = mm-&gt;mmap_base;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* either no address requested or can't fit in requested address hole */</div><div class='add'>+	addr = mm-&gt;free_area_cache;</div><div class='add'>+	if (do_align) {</div><div class='add'>+		unsigned long base = COLOUR_ALIGN_DOWN(addr - len, pgoff);</div><div class='add'>+		addr = base + len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* make sure it can fit in the remaining address space */</div><div class='add'>+	if (addr &gt; len) {</div><div class='add'>+		vma = find_vma(mm, addr-len);</div><div class='add'>+		if (!vma || addr &lt;= vma-&gt;vm_start)</div><div class='add'>+			/* remember the address as a hint for next time */</div><div class='add'>+			return (mm-&gt;free_area_cache = addr-len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mm-&gt;mmap_base &lt; len)</div><div class='add'>+		goto bottomup;</div><div class='add'>+</div><div class='add'>+	addr = mm-&gt;mmap_base - len;</div><div class='add'>+	if (do_align)</div><div class='add'>+		addr = COLOUR_ALIGN_DOWN(addr, pgoff);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		/*</div><div class='add'>+		 * Lookup failure means no vma is above this address,</div><div class='add'>+		 * else if new region fits below vma-&gt;vm_start,</div><div class='add'>+		 * return with success:</div><div class='add'>+		 */</div><div class='add'>+		vma = find_vma(mm, addr);</div><div class='add'>+		if (!vma || addr+len &lt;= vma-&gt;vm_start)</div><div class='add'>+			/* remember the address as a hint for next time */</div><div class='add'>+			return (mm-&gt;free_area_cache = addr);</div><div class='add'>+</div><div class='add'>+		/* remember the largest hole we saw so far */</div><div class='add'>+		if (addr + mm-&gt;cached_hole_size &lt; vma-&gt;vm_start)</div><div class='add'>+			mm-&gt;cached_hole_size = vma-&gt;vm_start - addr;</div><div class='add'>+</div><div class='add'>+		/* try just below the current vma-&gt;vm_start */</div><div class='add'>+		addr = vma-&gt;vm_start - len;</div><div class='add'>+		if (do_align)</div><div class='add'>+			addr = COLOUR_ALIGN_DOWN(addr, pgoff);</div><div class='add'>+	} while (len &lt; vma-&gt;vm_start);</div><div class='add'>+</div><div class='add'>+bottomup:</div><div class='add'>+	/*</div><div class='add'>+	 * A failed mmap() very likely causes application failure,</div><div class='add'>+	 * so fall back to the bottom-up function here. This scenario</div><div class='add'>+	 * can happen with large stack limits and large mmap()</div><div class='add'>+	 * allocations.</div><div class='add'>+	 */</div><div class='add'>+	mm-&gt;cached_hole_size = ~0UL;</div><div class='add'>+	mm-&gt;free_area_cache = TASK_UNMAPPED_BASE;</div><div class='add'>+	addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);</div><div class='add'>+	/*</div><div class='add'>+	 * Restore the topdown base:</div><div class='add'>+	 */</div><div class='add'>+	mm-&gt;free_area_cache = mm-&gt;mmap_base;</div><div class='add'>+	mm-&gt;cached_hole_size = ~0UL;</div><div class='add'>+</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void arch_pick_mmap_layout(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	unsigned long random_factor = 0UL;</div><div class='add'>+</div><div class='add'>+	/* 8 bits of randomness in 20 address space bits */</div><div class='add'>+	if ((current-&gt;flags &amp; PF_RANDOMIZE) &amp;&amp;</div><div class='add'>+	    !(current-&gt;personality &amp; ADDR_NO_RANDOMIZE))</div><div class='add'>+		random_factor = (get_random_int() % (1 &lt;&lt; 8)) &lt;&lt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	if (mmap_is_legacy()) {</div><div class='add'>+		mm-&gt;mmap_base = TASK_UNMAPPED_BASE + random_factor;</div><div class='add'>+		mm-&gt;get_unmapped_area = arch_get_unmapped_area;</div><div class='add'>+		mm-&gt;unmap_area = arch_unmap_area;</div><div class='add'>+	} else {</div><div class='add'>+		mm-&gt;mmap_base = mmap_base(random_factor);</div><div class='add'>+		mm-&gt;get_unmapped_area = arch_get_unmapped_area_topdown;</div><div class='add'>+		mm-&gt;unmap_area = arch_unmap_area_topdown;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * You really shouldn't be using read() or write() on /dev/mem.  This</div><div class='head'>diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c<br/>index dc8c550e6cbd..94c5a0c94f5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/mmu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/mmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/mmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/mmu.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/nodemask.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cputype.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='hunk'>@@ -150,6 +151,7 @@ static int __init early_nowrite(char *__unused)</div><div class='ctx'> }</div><div class='ctx'> early_param("nowb", early_nowrite);</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_ARM_LPAE</div><div class='ctx'> static int __init early_ecc(char *p)</div><div class='ctx'> {</div><div class='ctx'> 	if (memcmp(p, "on", 2) == 0)</div><div class='hunk'>@@ -159,6 +161,7 @@ static int __init early_ecc(char *p)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> early_param("ecc", early_ecc);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static int __init noalign_setup(char *__unused)</div><div class='ctx'> {</div><div class='hunk'>@@ -228,10 +231,12 @@ static struct mem_type mem_types[] = {</div><div class='ctx'> 		.prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,</div><div class='ctx'> 		.domain    = DOMAIN_KERNEL,</div><div class='ctx'> 	},</div><div class='add'>+#ifndef CONFIG_ARM_LPAE</div><div class='ctx'> 	[MT_MINICLEAN] = {</div><div class='ctx'> 		.prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,</div><div class='ctx'> 		.domain    = DOMAIN_KERNEL,</div><div class='ctx'> 	},</div><div class='add'>+#endif</div><div class='ctx'> 	[MT_LOW_VECTORS] = {</div><div class='ctx'> 		.prot_pte  = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |</div><div class='ctx'> 				L_PTE_RDONLY,</div><div class='hunk'>@@ -429,6 +434,7 @@ static void __init build_mem_type_table(void)</div><div class='ctx'> 	 * ARMv6 and above have extended page tables.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (cpu_arch &gt;= CPU_ARCH_ARMv6 &amp;&amp; (cr &amp; CR_XP)) {</div><div class='add'>+#ifndef CONFIG_ARM_LPAE</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Mark cache clean areas and XIP ROM read only</div><div class='ctx'> 		 * from SVC mode and no access from userspace.</div><div class='hunk'>@@ -436,6 +442,7 @@ static void __init build_mem_type_table(void)</div><div class='ctx'> 		mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;</div><div class='ctx'> 		mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;</div><div class='ctx'> 		mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 		if (is_smp()) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -474,6 +481,18 @@ static void __init build_mem_type_table(void)</div><div class='ctx'> 		mem_types[MT_MEMORY_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+	/*</div><div class='add'>+	 * Do not generate access flag faults for the kernel mappings.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mem_types); i++) {</div><div class='add'>+		mem_types[i].prot_pte |= PTE_EXT_AF;</div><div class='add'>+		mem_types[i].prot_sect |= PMD_SECT_AF;</div><div class='add'>+	}</div><div class='add'>+	kern_pgprot |= PTE_EXT_AF;</div><div class='add'>+	vecs_pgprot |= PTE_EXT_AF;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; 16; i++) {</div><div class='ctx'> 		unsigned long v = pgprot_val(protection_map[i]);</div><div class='ctx'> 		protection_map[i] = __pgprot(v | user_pgprot);</div><div class='hunk'>@@ -529,13 +548,18 @@ EXPORT_SYMBOL(phys_mem_access_prot);</div><div class='ctx'> </div><div class='ctx'> #define vectors_base()	(vectors_high() ? 0xffff0000 : 0)</div><div class='ctx'> </div><div class='del'>-static void __init *early_alloc(unsigned long sz)</div><div class='add'>+static void __init *early_alloc_aligned(unsigned long sz, unsigned long align)</div><div class='ctx'> {</div><div class='del'>-	void *ptr = __va(memblock_alloc(sz, sz));</div><div class='add'>+	void *ptr = __va(memblock_alloc(sz, align));</div><div class='ctx'> 	memset(ptr, 0, sz);</div><div class='ctx'> 	return ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init *early_alloc(unsigned long sz)</div><div class='add'>+{</div><div class='add'>+	return early_alloc_aligned(sz, sz);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static pte_t * __init early_pte_alloc(pmd_t *pmd, unsigned long addr, unsigned long prot)</div><div class='ctx'> {</div><div class='ctx'> 	if (pmd_none(*pmd)) {</div><div class='hunk'>@@ -572,8 +596,10 @@ static void __init alloc_init_section(pud_t *pud, unsigned long addr,</div><div class='ctx'> 	if (((addr | end | phys) &amp; ~SECTION_MASK) == 0) {</div><div class='ctx'> 		pmd_t *p = pmd;</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_ARM_LPAE</div><div class='ctx'> 		if (addr &amp; SECTION_SIZE)</div><div class='ctx'> 			pmd++;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='ctx'> 			*pmd = __pmd(phys | type-&gt;prot_sect);</div><div class='hunk'>@@ -603,6 +629,7 @@ static void alloc_init_pud(pgd_t *pgd, unsigned long addr, unsigned long end,</div><div class='ctx'> 	} while (pud++, addr = next, addr != end);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_ARM_LPAE</div><div class='ctx'> static void __init create_36bit_mapping(struct map_desc *md,</div><div class='ctx'> 					const struct mem_type *type)</div><div class='ctx'> {</div><div class='hunk'>@@ -662,6 +689,7 @@ static void __init create_36bit_mapping(struct map_desc *md,</div><div class='ctx'> 		pgd += SUPERSECTION_SIZE &gt;&gt; PGDIR_SHIFT;</div><div class='ctx'> 	} while (addr != end);</div><div class='ctx'> }</div><div class='add'>+#endif	/* !CONFIG_ARM_LPAE */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Create the page directory entries and any necessary</div><div class='hunk'>@@ -685,14 +713,16 @@ static void __init create_mapping(struct map_desc *md)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((md-&gt;type == MT_DEVICE || md-&gt;type == MT_ROM) &amp;&amp;</div><div class='del'>-	    md-&gt;virtual &gt;= PAGE_OFFSET &amp;&amp; md-&gt;virtual &lt; VMALLOC_END) {</div><div class='add'>+	    md-&gt;virtual &gt;= PAGE_OFFSET &amp;&amp;</div><div class='add'>+	    (md-&gt;virtual &lt; VMALLOC_START || md-&gt;virtual &gt;= VMALLOC_END)) {</div><div class='ctx'> 		printk(KERN_WARNING "BUG: mapping for 0x%08llx"</div><div class='del'>-		       " at 0x%08lx overlaps vmalloc space\n",</div><div class='add'>+		       " at 0x%08lx out of vmalloc space\n",</div><div class='ctx'> 		       (long long)__pfn_to_phys((u64)md-&gt;pfn), md-&gt;virtual);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	type = &amp;mem_types[md-&gt;type];</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_ARM_LPAE</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Catch 36-bit addresses</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -700,6 +730,7 @@ static void __init create_mapping(struct map_desc *md)</div><div class='ctx'> 		create_36bit_mapping(md, type);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	addr = md-&gt;virtual &amp; PAGE_MASK;</div><div class='ctx'> 	phys = __pfn_to_phys(md-&gt;pfn);</div><div class='hunk'>@@ -729,18 +760,33 @@ static void __init create_mapping(struct map_desc *md)</div><div class='ctx'>  */</div><div class='ctx'> void __init iotable_init(struct map_desc *io_desc, int nr)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	struct map_desc *md;</div><div class='add'>+	struct vm_struct *vm;</div><div class='add'>+</div><div class='add'>+	if (!nr)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nr; i++)</div><div class='del'>-		create_mapping(io_desc + i);</div><div class='add'>+	vm = early_alloc_aligned(sizeof(*vm) * nr, __alignof__(*vm));</div><div class='add'>+</div><div class='add'>+	for (md = io_desc; nr; md++, nr--) {</div><div class='add'>+		create_mapping(md);</div><div class='add'>+		vm-&gt;addr = (void *)(md-&gt;virtual &amp; PAGE_MASK);</div><div class='add'>+		vm-&gt;size = PAGE_ALIGN(md-&gt;length + (md-&gt;virtual &amp; ~PAGE_MASK));</div><div class='add'>+		vm-&gt;phys_addr = __pfn_to_phys(md-&gt;pfn); </div><div class='add'>+		vm-&gt;flags = VM_IOREMAP | VM_ARM_STATIC_MAPPING; </div><div class='add'>+		vm-&gt;flags |= VM_ARM_MTYPE(md-&gt;type);</div><div class='add'>+		vm-&gt;caller = iotable_init;</div><div class='add'>+		vm_area_add_early(vm++);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void * __initdata vmalloc_min = (void *)(VMALLOC_END - SZ_128M);</div><div class='add'>+static void * __initdata vmalloc_min =</div><div class='add'>+	(void *)(VMALLOC_END - (240 &lt;&lt; 20) - VMALLOC_OFFSET);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * vmalloc=size forces the vmalloc area to be exactly 'size'</div><div class='ctx'>  * bytes. This can be used to increase (or decrease) the vmalloc</div><div class='del'>- * area - the default is 128m.</div><div class='add'>+ * area - the default is 240m.</div><div class='ctx'>  */</div><div class='ctx'> static int __init early_vmalloc(char *arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -775,6 +821,9 @@ void __init sanity_check_meminfo(void)</div><div class='ctx'> 		struct membank *bank = &amp;meminfo.bank[j];</div><div class='ctx'> 		*bank = meminfo.bank[i];</div><div class='ctx'> </div><div class='add'>+		if (bank-&gt;start &gt; ULONG_MAX)</div><div class='add'>+			highmem = 1;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_HIGHMEM</div><div class='ctx'> 		if (__va(bank-&gt;start) &gt;= vmalloc_min ||</div><div class='ctx'> 		    __va(bank-&gt;start) &lt; (void *)PAGE_OFFSET)</div><div class='hunk'>@@ -786,7 +835,7 @@ void __init sanity_check_meminfo(void)</div><div class='ctx'> 		 * Split those memory banks which are partially overlapping</div><div class='ctx'> 		 * the vmalloc area greatly simplifying things later.</div><div class='ctx'> 		 */</div><div class='del'>-		if (__va(bank-&gt;start) &lt; vmalloc_min &amp;&amp;</div><div class='add'>+		if (!highmem &amp;&amp; __va(bank-&gt;start) &lt; vmalloc_min &amp;&amp;</div><div class='ctx'> 		    bank-&gt;size &gt; vmalloc_min - __va(bank-&gt;start)) {</div><div class='ctx'> 			if (meminfo.nr_banks &gt;= NR_BANKS) {</div><div class='ctx'> 				printk(KERN_CRIT "NR_BANKS too low, "</div><div class='hunk'>@@ -807,6 +856,17 @@ void __init sanity_check_meminfo(void)</div><div class='ctx'> 		bank-&gt;highmem = highmem;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='add'>+		 * Highmem banks not allowed with !CONFIG_HIGHMEM.</div><div class='add'>+		 */</div><div class='add'>+		if (highmem) {</div><div class='add'>+			printk(KERN_NOTICE "Ignoring RAM at %.8llx-%.8llx "</div><div class='add'>+			       "(!CONFIG_HIGHMEM).\n",</div><div class='add'>+			       (unsigned long long)bank-&gt;start,</div><div class='add'>+			       (unsigned long long)bank-&gt;start + bank-&gt;size - 1);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='ctx'> 		 * Check whether this memory bank would entirely overlap</div><div class='ctx'> 		 * the vmalloc area.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -860,6 +920,7 @@ void __init sanity_check_meminfo(void)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	meminfo.nr_banks = j;</div><div class='add'>+	high_memory = __va(lowmem_limit - 1) + 1;</div><div class='ctx'> 	memblock_set_current_limit(lowmem_limit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -890,14 +951,20 @@ static inline void prepare_page_table(void)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clear out all the kernel space mappings, except for the first</div><div class='del'>-	 * memory bank, up to the end of the vmalloc region.</div><div class='add'>+	 * memory bank, up to the vmalloc region.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (addr = __phys_to_virt(end);</div><div class='del'>-	     addr &lt; VMALLOC_END; addr += PMD_SIZE)</div><div class='add'>+	     addr &lt; VMALLOC_START; addr += PMD_SIZE)</div><div class='ctx'> 		pmd_clear(pmd_off_k(addr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+/* the first page is reserved for pgd */</div><div class='add'>+#define SWAPPER_PG_DIR_SIZE	(PAGE_SIZE + \</div><div class='add'>+				 PTRS_PER_PGD * PTRS_PER_PMD * sizeof(pmd_t))</div><div class='add'>+#else</div><div class='ctx'> #define SWAPPER_PG_DIR_SIZE	(PTRS_PER_PGD * sizeof(pgd_t))</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Reserve the special regions of memory</div><div class='hunk'>@@ -920,8 +987,8 @@ void __init arm_mm_memblock_reserve(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Set up device the mappings.  Since we clear out the page tables for all</div><div class='del'>- * mappings above VMALLOC_END, we will remove any debug device mappings.</div><div class='add'>+ * Set up the device mappings.  Since we clear out the page tables for all</div><div class='add'>+ * mappings above VMALLOC_START, we will remove any debug device mappings.</div><div class='ctx'>  * This means you have to be careful how you debug this function, or any</div><div class='ctx'>  * called function.  This means you can't use any function or debugging</div><div class='ctx'>  * method which may touch any device, otherwise the kernel _will_ crash.</div><div class='hunk'>@@ -936,7 +1003,7 @@ static void __init devicemaps_init(struct machine_desc *mdesc)</div><div class='ctx'> 	 */</div><div class='ctx'> 	vectors_page = early_alloc(PAGE_SIZE);</div><div class='ctx'> </div><div class='del'>-	for (addr = VMALLOC_END; addr; addr += PMD_SIZE)</div><div class='add'>+	for (addr = VMALLOC_START; addr; addr += PMD_SIZE)</div><div class='ctx'> 		pmd_clear(pmd_off_k(addr));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c<br/>index 941a98c9e8aa..4fc6794cca4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/nommu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/nommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/nommu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/nommu.c</a></div><div class='hunk'>@@ -29,6 +29,8 @@ void __init arm_mm_memblock_reserve(void)</div><div class='ctx'> </div><div class='ctx'> void __init sanity_check_meminfo(void)</div><div class='ctx'> {</div><div class='add'>+	phys_addr_t end = bank_phys_end(&amp;meminfo.bank[meminfo.nr_banks - 1]);</div><div class='add'>+	high_memory = __va(end - 1) + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -43,7 +45,7 @@ void __init paging_init(struct machine_desc *mdesc)</div><div class='ctx'> /*</div><div class='ctx'>  * We don't need to do anything here for nommu machines.</div><div class='ctx'>  */</div><div class='del'>-void setup_mm_for_reboot(char mode)</div><div class='add'>+void setup_mm_for_reboot(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/pgd.c b/arch/arm/mm/pgd.c<br/>index b2027c154b2a..a3e78ccabd65 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/pgd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/pgd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/pgd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/pgd.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -17,6 +18,14 @@</div><div class='ctx'> </div><div class='ctx'> #include "mm.h"</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+#define __pgd_alloc()	kmalloc(PTRS_PER_PGD * sizeof(pgd_t), GFP_KERNEL)</div><div class='add'>+#define __pgd_free(pgd)	kfree(pgd)</div><div class='add'>+#else</div><div class='add'>+#define __pgd_alloc()	(pgd_t *)__get_free_pages(GFP_KERNEL, 2)</div><div class='add'>+#define __pgd_free(pgd)	free_pages((unsigned long)pgd, 2)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * need to get a 16k page for level 1</div><div class='ctx'>  */</div><div class='hunk'>@@ -27,7 +36,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm)</div><div class='ctx'> 	pmd_t *new_pmd, *init_pmd;</div><div class='ctx'> 	pte_t *new_pte, *init_pte;</div><div class='ctx'> </div><div class='del'>-	new_pgd = (pgd_t *)__get_free_pages(GFP_KERNEL, 2);</div><div class='add'>+	new_pgd = __pgd_alloc();</div><div class='ctx'> 	if (!new_pgd)</div><div class='ctx'> 		goto no_pgd;</div><div class='ctx'> </div><div class='hunk'>@@ -42,10 +51,25 @@ pgd_t *pgd_alloc(struct mm_struct *mm)</div><div class='ctx'> </div><div class='ctx'> 	clean_dcache_area(new_pgd, PTRS_PER_PGD * sizeof(pgd_t));</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+	/*</div><div class='add'>+	 * Allocate PMD table for modules and pkmap mappings.</div><div class='add'>+	 */</div><div class='add'>+	new_pud = pud_alloc(mm, new_pgd + pgd_index(MODULES_VADDR),</div><div class='add'>+			    MODULES_VADDR);</div><div class='add'>+	if (!new_pud)</div><div class='add'>+		goto no_pud;</div><div class='add'>+</div><div class='add'>+	new_pmd = pmd_alloc(mm, new_pud, 0);</div><div class='add'>+	if (!new_pmd)</div><div class='add'>+		goto no_pmd;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (!vectors_high()) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * On ARM, first page must always be allocated since it</div><div class='del'>-		 * contains the machine vectors.</div><div class='add'>+		 * contains the machine vectors. The vectors are always high</div><div class='add'>+		 * with LPAE.</div><div class='ctx'> 		 */</div><div class='ctx'> 		new_pud = pud_alloc(mm, new_pgd, 0);</div><div class='ctx'> 		if (!new_pud)</div><div class='hunk'>@@ -74,7 +98,7 @@ no_pte:</div><div class='ctx'> no_pmd:</div><div class='ctx'> 	pud_free(mm, new_pud);</div><div class='ctx'> no_pud:</div><div class='del'>-	free_pages((unsigned long)new_pgd, 2);</div><div class='add'>+	__pgd_free(new_pgd);</div><div class='ctx'> no_pgd:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -111,5 +135,24 @@ no_pud:</div><div class='ctx'> 	pgd_clear(pgd);</div><div class='ctx'> 	pud_free(mm, pud);</div><div class='ctx'> no_pgd:</div><div class='del'>-	free_pages((unsigned long) pgd_base, 2);</div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+	/*</div><div class='add'>+	 * Free modules/pkmap or identity pmd tables.</div><div class='add'>+	 */</div><div class='add'>+	for (pgd = pgd_base; pgd &lt; pgd_base + PTRS_PER_PGD; pgd++) {</div><div class='add'>+		if (pgd_none_or_clear_bad(pgd))</div><div class='add'>+			continue;</div><div class='add'>+		if (pgd_val(*pgd) &amp; L_PGD_SWAPPER)</div><div class='add'>+			continue;</div><div class='add'>+		pud = pud_offset(pgd, 0);</div><div class='add'>+		if (pud_none_or_clear_bad(pud))</div><div class='add'>+			continue;</div><div class='add'>+		pmd = pmd_offset(pud, 0);</div><div class='add'>+		pud_clear(pud);</div><div class='add'>+		pmd_free(mm, pmd);</div><div class='add'>+		pgd_clear(pgd);</div><div class='add'>+		pud_free(mm, pud);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	__pgd_free(pgd_base);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S<br/>index 67469665d47a..234951345eb3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm1020.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm1020.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm1020.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-arm1020.S</a></div><div class='hunk'>@@ -95,6 +95,7 @@ ENTRY(cpu_arm1020_proc_fin)</div><div class='ctx'>  * loc: location to jump to for soft reset</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_arm1020_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='hunk'>@@ -107,6 +108,8 @@ ENTRY(cpu_arm1020_reset)</div><div class='ctx'> 	bic	ip, ip, #0x1100 		@ ...i...s........</div><div class='ctx'> 	mcr	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_arm1020_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_arm1020_do_idle()</div><div class='head'>diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S<br/>index 4251421c0ed5..c244b06caac9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm1020e.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm1020e.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm1020e.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-arm1020e.S</a></div><div class='hunk'>@@ -95,6 +95,7 @@ ENTRY(cpu_arm1020e_proc_fin)</div><div class='ctx'>  * loc: location to jump to for soft reset</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_arm1020e_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='hunk'>@@ -107,6 +108,8 @@ ENTRY(cpu_arm1020e_reset)</div><div class='ctx'> 	bic	ip, ip, #0x1100 		@ ...i...s........</div><div class='ctx'> 	mcr	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_arm1020e_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_arm1020e_do_idle()</div><div class='head'>diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S<br/>index d283cf3d06e3..38fe22efd18f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm1022.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm1022.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm1022.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-arm1022.S</a></div><div class='hunk'>@@ -84,6 +84,7 @@ ENTRY(cpu_arm1022_proc_fin)</div><div class='ctx'>  * loc: location to jump to for soft reset</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_arm1022_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='hunk'>@@ -96,6 +97,8 @@ ENTRY(cpu_arm1022_reset)</div><div class='ctx'> 	bic	ip, ip, #0x1100 		@ ...i...s........</div><div class='ctx'> 	mcr	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_arm1022_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_arm1022_do_idle()</div><div class='head'>diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S<br/>index 678a1ceafed2..3eb9c3c26c75 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm1026.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm1026.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm1026.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-arm1026.S</a></div><div class='hunk'>@@ -84,6 +84,7 @@ ENTRY(cpu_arm1026_proc_fin)</div><div class='ctx'>  * loc: location to jump to for soft reset</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_arm1026_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='hunk'>@@ -96,6 +97,8 @@ ENTRY(cpu_arm1026_reset)</div><div class='ctx'> 	bic	ip, ip, #0x1100 		@ ...i...s........</div><div class='ctx'> 	mcr	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_arm1026_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_arm1026_do_idle()</div><div class='head'>diff --git a/arch/arm/mm/proc-arm6_7.S b/arch/arm/mm/proc-arm6_7.S<br/>index e5b974cddac3..4fbeb5b8e6c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm6_7.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm6_7.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm6_7.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-arm6_7.S</a></div><div class='hunk'>@@ -225,6 +225,7 @@ ENTRY(cpu_arm7_set_pte_ext)</div><div class='ctx'>  * Params  : r0 = address to jump to</div><div class='ctx'>  * Notes   : This sets up everything for a reset</div><div class='ctx'>  */</div><div class='add'>+		.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_arm6_reset)</div><div class='ctx'> ENTRY(cpu_arm7_reset)</div><div class='ctx'> 		mov	r1, #0</div><div class='hunk'>@@ -235,6 +236,9 @@ ENTRY(cpu_arm7_reset)</div><div class='ctx'> 		mov	r1, #0x30</div><div class='ctx'> 		mcr	p15, 0, r1, c1, c0, 0		@ turn off MMU etc</div><div class='ctx'> 		mov	pc, r0</div><div class='add'>+ENDPROC(cpu_arm6_reset)</div><div class='add'>+ENDPROC(cpu_arm7_reset)</div><div class='add'>+		.popsection</div><div class='ctx'> </div><div class='ctx'> 		__CPUINIT</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S<br/>index 55f4e290665a..0ac908c7ade1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm720.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm720.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm720.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-arm720.S</a></div><div class='hunk'>@@ -101,6 +101,7 @@ ENTRY(cpu_arm720_set_pte_ext)</div><div class='ctx'>  * Params  : r0 = address to jump to</div><div class='ctx'>  * Notes   : This sets up everything for a reset</div><div class='ctx'>  */</div><div class='add'>+		.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_arm720_reset)</div><div class='ctx'> 		mov	ip, #0</div><div class='ctx'> 		mcr	p15, 0, ip, c7, c7, 0		@ invalidate cache</div><div class='hunk'>@@ -112,6 +113,8 @@ ENTRY(cpu_arm720_reset)</div><div class='ctx'> 		bic	ip, ip, #0x2100			@ ..v....s........</div><div class='ctx'> 		mcr	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 		mov	pc, r0</div><div class='add'>+ENDPROC(cpu_arm720_reset)</div><div class='add'>+		.popsection</div><div class='ctx'> </div><div class='ctx'> 	__CPUINIT</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/proc-arm740.S b/arch/arm/mm/proc-arm740.S<br/>index 4506be3adda6..dc5de5d53f20 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm740.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm740.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm740.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-arm740.S</a></div><div class='hunk'>@@ -49,6 +49,7 @@ ENTRY(cpu_arm740_proc_fin)</div><div class='ctx'>  * Params  : r0 = address to jump to</div><div class='ctx'>  * Notes   : This sets up everything for a reset</div><div class='ctx'>  */</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_arm740_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c0, 0		@ invalidate cache</div><div class='hunk'>@@ -56,6 +57,8 @@ ENTRY(cpu_arm740_reset)</div><div class='ctx'> 	bic	ip, ip, #0x0000000c		@ ............wc..</div><div class='ctx'> 	mcr	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_arm740_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> 	__CPUINIT</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S<br/>index 7e0e1fe4ed4d..6ddea3e464bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm7tdmi.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm7tdmi.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm7tdmi.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-arm7tdmi.S</a></div><div class='hunk'>@@ -45,8 +45,11 @@ ENTRY(cpu_arm7tdmi_proc_fin)</div><div class='ctx'>  * Params  : loc(r0)	address to jump to</div><div class='ctx'>  * Purpose : Sets up everything for a reset and jump to the location for soft reset.</div><div class='ctx'>  */</div><div class='add'>+		.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_arm7tdmi_reset)</div><div class='ctx'> 		mov	pc, r0</div><div class='add'>+ENDPROC(cpu_arm7tdmi_reset)</div><div class='add'>+		.popsection</div><div class='ctx'> </div><div class='ctx'> 		__CPUINIT</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S<br/>index 88fb3d9e0640..cb941ae95f66 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm920.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm920.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm920.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-arm920.S</a></div><div class='hunk'>@@ -85,6 +85,7 @@ ENTRY(cpu_arm920_proc_fin)</div><div class='ctx'>  * loc: location to jump to for soft reset</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_arm920_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='hunk'>@@ -97,6 +98,8 @@ ENTRY(cpu_arm920_reset)</div><div class='ctx'> 	bic	ip, ip, #0x1100			@ ...i...s........</div><div class='ctx'> 	mcr	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_arm920_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_arm920_do_idle()</div><div class='head'>diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S<br/>index 490e18833857..4ec0e074dd55 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm922.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm922.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm922.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-arm922.S</a></div><div class='hunk'>@@ -87,6 +87,7 @@ ENTRY(cpu_arm922_proc_fin)</div><div class='ctx'>  * loc: location to jump to for soft reset</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_arm922_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='hunk'>@@ -99,6 +100,8 @@ ENTRY(cpu_arm922_reset)</div><div class='ctx'> 	bic	ip, ip, #0x1100			@ ...i...s........</div><div class='ctx'> 	mcr	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_arm922_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_arm922_do_idle()</div><div class='head'>diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S<br/>index 51d494be057e..9dccd9a365b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm925.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm925.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm925.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-arm925.S</a></div><div class='hunk'>@@ -108,6 +108,7 @@ ENTRY(cpu_arm925_proc_fin)</div><div class='ctx'>  * loc: location to jump to for soft reset</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_arm925_reset)</div><div class='ctx'> 	/* Send software reset to MPU and DSP */</div><div class='ctx'> 	mov	ip, #0xff000000</div><div class='hunk'>@@ -115,6 +116,8 @@ ENTRY(cpu_arm925_reset)</div><div class='ctx'> 	orr	ip, ip, #0x0000ce00</div><div class='ctx'> 	mov	r4, #1</div><div class='ctx'> 	strh	r4, [ip, #0x10]</div><div class='add'>+ENDPROC(cpu_arm925_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='head'>diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S<br/>index 9f8fd91f918a..820259b81a1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm926.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm926.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm926.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-arm926.S</a></div><div class='hunk'>@@ -77,6 +77,7 @@ ENTRY(cpu_arm926_proc_fin)</div><div class='ctx'>  * loc: location to jump to for soft reset</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_arm926_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='hunk'>@@ -89,6 +90,8 @@ ENTRY(cpu_arm926_reset)</div><div class='ctx'> 	bic	ip, ip, #0x1100			@ ...i...s........</div><div class='ctx'> 	mcr	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_arm926_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_arm926_do_idle()</div><div class='head'>diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S<br/>index ac750d506153..9fdc0a170974 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm940.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm940.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm940.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-arm940.S</a></div><div class='hunk'>@@ -48,6 +48,7 @@ ENTRY(cpu_arm940_proc_fin)</div><div class='ctx'>  * Params  : r0 = address to jump to</div><div class='ctx'>  * Notes   : This sets up everything for a reset</div><div class='ctx'>  */</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_arm940_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c5, 0		@ flush I cache</div><div class='hunk'>@@ -58,6 +59,8 @@ ENTRY(cpu_arm940_reset)</div><div class='ctx'> 	bic	ip, ip, #0x00001000		@ i-cache</div><div class='ctx'> 	mcr	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_arm940_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_arm940_do_idle()</div><div class='head'>diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S<br/>index 683af3a182b7..f684cfedcca9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm946.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm946.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm946.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-arm946.S</a></div><div class='hunk'>@@ -55,6 +55,7 @@ ENTRY(cpu_arm946_proc_fin)</div><div class='ctx'>  * Params  : r0 = address to jump to</div><div class='ctx'>  * Notes   : This sets up everything for a reset</div><div class='ctx'>  */</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_arm946_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c5, 0		@ flush I cache</div><div class='hunk'>@@ -65,6 +66,8 @@ ENTRY(cpu_arm946_reset)</div><div class='ctx'> 	bic	ip, ip, #0x00001000		@ i-cache</div><div class='ctx'> 	mcr	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_arm946_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_arm946_do_idle()</div><div class='head'>diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S<br/>index 2120f9e2af7f..8881391dfb9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm9tdmi.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-arm9tdmi.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm9tdmi.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-arm9tdmi.S</a></div><div class='hunk'>@@ -45,8 +45,11 @@ ENTRY(cpu_arm9tdmi_proc_fin)</div><div class='ctx'>  * Params  : loc(r0)	address to jump to</div><div class='ctx'>  * Purpose : Sets up everything for a reset and jump to the location for soft reset.</div><div class='ctx'>  */</div><div class='add'>+		.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_arm9tdmi_reset)</div><div class='ctx'> 		mov	pc, r0</div><div class='add'>+ENDPROC(cpu_arm9tdmi_reset)</div><div class='add'>+		.popsection</div><div class='ctx'> </div><div class='ctx'> 		__CPUINIT</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mm/proc-fa526.S b/arch/arm/mm/proc-fa526.S<br/>index 4c7a5710472b..272558a133a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-fa526.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-fa526.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-fa526.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-fa526.S</a></div><div class='hunk'>@@ -57,6 +57,7 @@ ENTRY(cpu_fa526_proc_fin)</div><div class='ctx'>  * loc: location to jump to for soft reset</div><div class='ctx'>  */</div><div class='ctx'> 	.align	4</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_fa526_reset)</div><div class='ctx'> /* TODO: Use CP8 if possible... */</div><div class='ctx'> 	mov	ip, #0</div><div class='hunk'>@@ -73,6 +74,8 @@ ENTRY(cpu_fa526_reset)</div><div class='ctx'> 	nop</div><div class='ctx'> 	nop</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_fa526_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_fa526_do_idle()</div><div class='head'>diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S<br/>index 8a6c2f78c1c3..ba3c500584ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-feroceon.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-feroceon.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-feroceon.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-feroceon.S</a></div><div class='hunk'>@@ -98,6 +98,7 @@ ENTRY(cpu_feroceon_proc_fin)</div><div class='ctx'>  * loc: location to jump to for soft reset</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_feroceon_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='hunk'>@@ -110,6 +111,8 @@ ENTRY(cpu_feroceon_reset)</div><div class='ctx'> 	bic	ip, ip, #0x1100			@ ...i...s........</div><div class='ctx'> 	mcr	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_feroceon_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_feroceon_do_idle()</div><div class='head'>diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S<br/>index 307a4def8d3a..2d8ff3ad86d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-macros.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-macros.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-macros.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-macros.S</a></div><div class='hunk'>@@ -91,8 +91,9 @@</div><div class='ctx'> #if L_PTE_SHARED != PTE_EXT_SHARED</div><div class='ctx'> #error PTE shared bit mismatch</div><div class='ctx'> #endif</div><div class='del'>-#if (L_PTE_XN+L_PTE_USER+L_PTE_RDONLY+L_PTE_DIRTY+L_PTE_YOUNG+\</div><div class='del'>-     L_PTE_FILE+L_PTE_PRESENT) &gt; L_PTE_SHARED</div><div class='add'>+#if !defined (CONFIG_ARM_LPAE) &amp;&amp; \</div><div class='add'>+	(L_PTE_XN+L_PTE_USER+L_PTE_RDONLY+L_PTE_DIRTY+L_PTE_YOUNG+\</div><div class='add'>+	 L_PTE_FILE+L_PTE_PRESENT) &gt; L_PTE_SHARED</div><div class='ctx'> #error Invalid Linux PTE bit settings</div><div class='ctx'> #endif</div><div class='ctx'> #endif	/* CONFIG_MMU */</div><div class='head'>diff --git a/arch/arm/mm/proc-mohawk.S b/arch/arm/mm/proc-mohawk.S<br/>index db52b0fb14a0..cdfedc5b8ad8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-mohawk.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-mohawk.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-mohawk.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-mohawk.S</a></div><div class='hunk'>@@ -69,6 +69,7 @@ ENTRY(cpu_mohawk_proc_fin)</div><div class='ctx'>  * (same as arm926)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_mohawk_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='hunk'>@@ -79,6 +80,8 @@ ENTRY(cpu_mohawk_reset)</div><div class='ctx'> 	bic	ip, ip, #0x1100			@ ...i...s........</div><div class='ctx'> 	mcr	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_mohawk_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_mohawk_do_idle()</div><div class='head'>diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S<br/>index d50ada26edd6..775d70fba937 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-sa110.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-sa110.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-sa110.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-sa110.S</a></div><div class='hunk'>@@ -62,6 +62,7 @@ ENTRY(cpu_sa110_proc_fin)</div><div class='ctx'>  * loc: location to jump to for soft reset</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_sa110_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='hunk'>@@ -74,6 +75,8 @@ ENTRY(cpu_sa110_reset)</div><div class='ctx'> 	bic	ip, ip, #0x1100			@ ...i...s........</div><div class='ctx'> 	mcr	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_sa110_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_sa110_do_idle(type)</div><div class='head'>diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S<br/>index 7d91545d089b..3aa0da11fd84 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-sa1100.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-sa1100.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-sa1100.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-sa1100.S</a></div><div class='hunk'>@@ -70,6 +70,7 @@ ENTRY(cpu_sa1100_proc_fin)</div><div class='ctx'>  * loc: location to jump to for soft reset</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_sa1100_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='hunk'>@@ -82,6 +83,8 @@ ENTRY(cpu_sa1100_reset)</div><div class='ctx'> 	bic	ip, ip, #0x1100			@ ...i...s........</div><div class='ctx'> 	mcr	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_sa1100_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_sa1100_do_idle(type)</div><div class='head'>diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S<br/>index d061d2fa5506..5900cd520e84 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-v6.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-v6.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-v6.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-v6.S</a></div><div class='hunk'>@@ -55,6 +55,7 @@ ENTRY(cpu_v6_proc_fin)</div><div class='ctx'>  *	- loc   - location to jump to for soft reset</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_v6_reset)</div><div class='ctx'> 	mrc	p15, 0, r1, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	bic	r1, r1, #0x1			@ ...............m</div><div class='hunk'>@@ -62,6 +63,8 @@ ENTRY(cpu_v6_reset)</div><div class='ctx'> 	mov	r1, #0</div><div class='ctx'> 	mcr	p15, 0, r1, c7, c5, 4		@ ISB</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_v6_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	cpu_v6_do_idle()</div><div class='head'>diff --git a/arch/arm/mm/proc-v7-2level.S b/arch/arm/mm/proc-v7-2level.S<br/>new file mode 100644<br/>index 000000000000..3a4b3e7b888c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-v7-2level.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-v7-2level.S</a></div><div class='hunk'>@@ -0,0 +1,171 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mm/proc-v7-2level.S</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2001 Deep Blue Solutions Ltd.</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define TTB_S		(1 &lt;&lt; 1)</div><div class='add'>+#define TTB_RGN_NC	(0 &lt;&lt; 3)</div><div class='add'>+#define TTB_RGN_OC_WBWA	(1 &lt;&lt; 3)</div><div class='add'>+#define TTB_RGN_OC_WT	(2 &lt;&lt; 3)</div><div class='add'>+#define TTB_RGN_OC_WB	(3 &lt;&lt; 3)</div><div class='add'>+#define TTB_NOS		(1 &lt;&lt; 5)</div><div class='add'>+#define TTB_IRGN_NC	((0 &lt;&lt; 0) | (0 &lt;&lt; 6))</div><div class='add'>+#define TTB_IRGN_WBWA	((0 &lt;&lt; 0) | (1 &lt;&lt; 6))</div><div class='add'>+#define TTB_IRGN_WT	((1 &lt;&lt; 0) | (0 &lt;&lt; 6))</div><div class='add'>+#define TTB_IRGN_WB	((1 &lt;&lt; 0) | (1 &lt;&lt; 6))</div><div class='add'>+</div><div class='add'>+/* PTWs cacheable, inner WB not shareable, outer WB not shareable */</div><div class='add'>+#define TTB_FLAGS_UP	TTB_IRGN_WB|TTB_RGN_OC_WB</div><div class='add'>+#define PMD_FLAGS_UP	PMD_SECT_WB</div><div class='add'>+</div><div class='add'>+/* PTWs cacheable, inner WBWA shareable, outer WBWA not shareable */</div><div class='add'>+#define TTB_FLAGS_SMP	TTB_IRGN_WBWA|TTB_S|TTB_NOS|TTB_RGN_OC_WBWA</div><div class='add'>+#define PMD_FLAGS_SMP	PMD_SECT_WBWA|PMD_SECT_S</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	cpu_v7_switch_mm(pgd_phys, tsk)</div><div class='add'>+ *</div><div class='add'>+ *	Set the translation table base pointer to be pgd_phys</div><div class='add'>+ *</div><div class='add'>+ *	- pgd_phys - physical address of new TTB</div><div class='add'>+ *</div><div class='add'>+ *	It is assumed that:</div><div class='add'>+ *	- we are not using split page tables</div><div class='add'>+ */</div><div class='add'>+ENTRY(cpu_v7_switch_mm)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+	mov	r2, #0</div><div class='add'>+	ldr	r1, [r1, #MM_CONTEXT_ID]	@ get mm-&gt;context.id</div><div class='add'>+	ALT_SMP(orr	r0, r0, #TTB_FLAGS_SMP)</div><div class='add'>+	ALT_UP(orr	r0, r0, #TTB_FLAGS_UP)</div><div class='add'>+#ifdef CONFIG_ARM_ERRATA_430973</div><div class='add'>+	mcr	p15, 0, r2, c7, c5, 6		@ flush BTAC/BTB</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_ARM_ERRATA_754322</div><div class='add'>+	dsb</div><div class='add'>+#endif</div><div class='add'>+	mcr	p15, 0, r2, c13, c0, 1		@ set reserved context ID</div><div class='add'>+	isb</div><div class='add'>+1:	mcr	p15, 0, r0, c2, c0, 0		@ set TTB 0</div><div class='add'>+	isb</div><div class='add'>+#ifdef CONFIG_ARM_ERRATA_754322</div><div class='add'>+	dsb</div><div class='add'>+#endif</div><div class='add'>+	mcr	p15, 0, r1, c13, c0, 1		@ set context ID</div><div class='add'>+	isb</div><div class='add'>+#endif</div><div class='add'>+	mov	pc, lr</div><div class='add'>+ENDPROC(cpu_v7_switch_mm)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	cpu_v7_set_pte_ext(ptep, pte)</div><div class='add'>+ *</div><div class='add'>+ *	Set a level 2 translation table entry.</div><div class='add'>+ *</div><div class='add'>+ *	- ptep  - pointer to level 2 translation table entry</div><div class='add'>+ *		  (hardware version is stored at +2048 bytes)</div><div class='add'>+ *	- pte   - PTE value to store</div><div class='add'>+ *	- ext	- value for extended PTE bits</div><div class='add'>+ */</div><div class='add'>+ENTRY(cpu_v7_set_pte_ext)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+	str	r1, [r0]			@ linux version</div><div class='add'>+</div><div class='add'>+	bic	r3, r1, #0x000003f0</div><div class='add'>+	bic	r3, r3, #PTE_TYPE_MASK</div><div class='add'>+	orr	r3, r3, r2</div><div class='add'>+	orr	r3, r3, #PTE_EXT_AP0 | 2</div><div class='add'>+</div><div class='add'>+	tst	r1, #1 &lt;&lt; 4</div><div class='add'>+	orrne	r3, r3, #PTE_EXT_TEX(1)</div><div class='add'>+</div><div class='add'>+	eor	r1, r1, #L_PTE_DIRTY</div><div class='add'>+	tst	r1, #L_PTE_RDONLY | L_PTE_DIRTY</div><div class='add'>+	orrne	r3, r3, #PTE_EXT_APX</div><div class='add'>+</div><div class='add'>+	tst	r1, #L_PTE_USER</div><div class='add'>+	orrne	r3, r3, #PTE_EXT_AP1</div><div class='add'>+#ifdef CONFIG_CPU_USE_DOMAINS</div><div class='add'>+	@ allow kernel read/write access to read-only user pages</div><div class='add'>+	tstne	r3, #PTE_EXT_APX</div><div class='add'>+	bicne	r3, r3, #PTE_EXT_APX | PTE_EXT_AP0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	tst	r1, #L_PTE_XN</div><div class='add'>+	orrne	r3, r3, #PTE_EXT_XN</div><div class='add'>+</div><div class='add'>+	tst	r1, #L_PTE_YOUNG</div><div class='add'>+	tstne	r1, #L_PTE_PRESENT</div><div class='add'>+	moveq	r3, #0</div><div class='add'>+</div><div class='add'>+ ARM(	str	r3, [r0, #2048]! )</div><div class='add'>+ THUMB(	add	r0, r0, #2048 )</div><div class='add'>+ THUMB(	str	r3, [r0] )</div><div class='add'>+	mcr	p15, 0, r0, c7, c10, 1		@ flush_pte</div><div class='add'>+#endif</div><div class='add'>+	mov	pc, lr</div><div class='add'>+ENDPROC(cpu_v7_set_pte_ext)</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Memory region attributes with SCTLR.TRE=1</div><div class='add'>+	 *</div><div class='add'>+	 *   n = TEX[0],C,B</div><div class='add'>+	 *   TR = PRRR[2n+1:2n]		- memory type</div><div class='add'>+	 *   IR = NMRR[2n+1:2n]		- inner cacheable property</div><div class='add'>+	 *   OR = NMRR[2n+17:2n+16]	- outer cacheable property</div><div class='add'>+	 *</div><div class='add'>+	 *			n	TR	IR	OR</div><div class='add'>+	 *   UNCACHED		000	00</div><div class='add'>+	 *   BUFFERABLE		001	10	00	00</div><div class='add'>+	 *   WRITETHROUGH	010	10	10	10</div><div class='add'>+	 *   WRITEBACK		011	10	11	11</div><div class='add'>+	 *   reserved		110</div><div class='add'>+	 *   WRITEALLOC		111	10	01	01</div><div class='add'>+	 *   DEV_SHARED		100	01</div><div class='add'>+	 *   DEV_NONSHARED	100	01</div><div class='add'>+	 *   DEV_WC		001	10</div><div class='add'>+	 *   DEV_CACHED		011	10</div><div class='add'>+	 *</div><div class='add'>+	 * Other attributes:</div><div class='add'>+	 *</div><div class='add'>+	 *   DS0 = PRRR[16] = 0		- device shareable property</div><div class='add'>+	 *   DS1 = PRRR[17] = 1		- device shareable property</div><div class='add'>+	 *   NS0 = PRRR[18] = 0		- normal shareable property</div><div class='add'>+	 *   NS1 = PRRR[19] = 1		- normal shareable property</div><div class='add'>+	 *   NOS = PRRR[24+n] = 1	- not outer shareable</div><div class='add'>+	 */</div><div class='add'>+.equ	PRRR,	0xff0a81a8</div><div class='add'>+.equ	NMRR,	0x40e040e0</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Macro for setting up the TTBRx and TTBCR registers.</div><div class='add'>+	 * - \ttb0 and \ttb1 updated with the corresponding flags.</div><div class='add'>+	 */</div><div class='add'>+	.macro	v7_ttb_setup, zero, ttbr0, ttbr1, tmp</div><div class='add'>+	mcr	p15, 0, \zero, c2, c0, 2	@ TTB control register</div><div class='add'>+	ALT_SMP(orr	\ttbr0, \ttbr0, #TTB_FLAGS_SMP)</div><div class='add'>+	ALT_UP(orr	\ttbr0, \ttbr0, #TTB_FLAGS_UP)</div><div class='add'>+	ALT_SMP(orr	\ttbr1, \ttbr1, #TTB_FLAGS_SMP)</div><div class='add'>+	ALT_UP(orr	\ttbr1, \ttbr1, #TTB_FLAGS_UP)</div><div class='add'>+	mcr	p15, 0, \ttbr1, c2, c0, 1	@ load TTB1</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	__CPUINIT</div><div class='add'>+</div><div class='add'>+	/*   AT</div><div class='add'>+	 *  TFR   EV X F   I D LR    S</div><div class='add'>+	 * .EEE ..EE PUI. .T.T 4RVI ZWRS BLDP WCAM</div><div class='add'>+	 * rxxx rrxx xxx0 0101 xxxx xxxx x111 xxxx &lt; forced</div><div class='add'>+	 *    1    0 110       0011 1100 .111 1101 &lt; we want</div><div class='add'>+	 */</div><div class='add'>+	.align	2</div><div class='add'>+	.type	v7_crval, #object</div><div class='add'>+v7_crval:</div><div class='add'>+	crval	clear=0x0120c302, mmuset=0x10c03c7d, ucset=0x00c01c7c</div><div class='add'>+</div><div class='add'>+	.previous</div><div class='head'>diff --git a/arch/arm/mm/proc-v7-3level.S b/arch/arm/mm/proc-v7-3level.S<br/>new file mode 100644<br/>index 000000000000..8de0f1dd1549<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-v7-3level.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-v7-3level.S</a></div><div class='hunk'>@@ -0,0 +1,150 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mm/proc-v7-3level.S</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2001 Deep Blue Solutions Ltd.</div><div class='add'>+ * Copyright (C) 2011 ARM Ltd.</div><div class='add'>+ * Author: Catalin Marinas &lt;catalin.marinas@arm.com&gt;</div><div class='add'>+ *   based on arch/arm/mm/proc-v7-2level.S</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define TTB_IRGN_NC	(0 &lt;&lt; 8)</div><div class='add'>+#define TTB_IRGN_WBWA	(1 &lt;&lt; 8)</div><div class='add'>+#define TTB_IRGN_WT	(2 &lt;&lt; 8)</div><div class='add'>+#define TTB_IRGN_WB	(3 &lt;&lt; 8)</div><div class='add'>+#define TTB_RGN_NC	(0 &lt;&lt; 10)</div><div class='add'>+#define TTB_RGN_OC_WBWA	(1 &lt;&lt; 10)</div><div class='add'>+#define TTB_RGN_OC_WT	(2 &lt;&lt; 10)</div><div class='add'>+#define TTB_RGN_OC_WB	(3 &lt;&lt; 10)</div><div class='add'>+#define TTB_S		(3 &lt;&lt; 12)</div><div class='add'>+#define TTB_EAE		(1 &lt;&lt; 31)</div><div class='add'>+</div><div class='add'>+/* PTWs cacheable, inner WB not shareable, outer WB not shareable */</div><div class='add'>+#define TTB_FLAGS_UP	(TTB_IRGN_WB|TTB_RGN_OC_WB)</div><div class='add'>+#define PMD_FLAGS_UP	(PMD_SECT_WB)</div><div class='add'>+</div><div class='add'>+/* PTWs cacheable, inner WBWA shareable, outer WBWA not shareable */</div><div class='add'>+#define TTB_FLAGS_SMP	(TTB_IRGN_WBWA|TTB_S|TTB_RGN_OC_WBWA)</div><div class='add'>+#define PMD_FLAGS_SMP	(PMD_SECT_WBWA|PMD_SECT_S)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * cpu_v7_switch_mm(pgd_phys, tsk)</div><div class='add'>+ *</div><div class='add'>+ * Set the translation table base pointer to be pgd_phys (physical address of</div><div class='add'>+ * the new TTB).</div><div class='add'>+ */</div><div class='add'>+ENTRY(cpu_v7_switch_mm)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+	ldr	r1, [r1, #MM_CONTEXT_ID]	@ get mm-&gt;context.id</div><div class='add'>+	and	r3, r1, #0xff</div><div class='add'>+	mov	r3, r3, lsl #(48 - 32)		@ ASID</div><div class='add'>+	mcrr	p15, 0, r0, r3, c2		@ set TTB 0</div><div class='add'>+	isb</div><div class='add'>+#endif</div><div class='add'>+	mov	pc, lr</div><div class='add'>+ENDPROC(cpu_v7_switch_mm)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * cpu_v7_set_pte_ext(ptep, pte)</div><div class='add'>+ *</div><div class='add'>+ * Set a level 2 translation table entry.</div><div class='add'>+ * - ptep - pointer to level 3 translation table entry</div><div class='add'>+ * - pte - PTE value to store (64-bit in r2 and r3)</div><div class='add'>+ */</div><div class='add'>+ENTRY(cpu_v7_set_pte_ext)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+	tst	r2, #L_PTE_PRESENT</div><div class='add'>+	beq	1f</div><div class='add'>+	tst	r3, #1 &lt;&lt; (55 - 32)		@ L_PTE_DIRTY</div><div class='add'>+	orreq	r2, #L_PTE_RDONLY</div><div class='add'>+1:	strd	r2, r3, [r0]</div><div class='add'>+	mcr	p15, 0, r0, c7, c10, 1		@ flush_pte</div><div class='add'>+#endif</div><div class='add'>+	mov	pc, lr</div><div class='add'>+ENDPROC(cpu_v7_set_pte_ext)</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Memory region attributes for LPAE (defined in pgtable-3level.h):</div><div class='add'>+	 *</div><div class='add'>+	 *   n = AttrIndx[2:0]</div><div class='add'>+	 *</div><div class='add'>+	 *			n	MAIR</div><div class='add'>+	 *   UNCACHED		000	00000000</div><div class='add'>+	 *   BUFFERABLE		001	01000100</div><div class='add'>+	 *   DEV_WC		001	01000100</div><div class='add'>+	 *   WRITETHROUGH	010	10101010</div><div class='add'>+	 *   WRITEBACK		011	11101110</div><div class='add'>+	 *   DEV_CACHED		011	11101110</div><div class='add'>+	 *   DEV_SHARED		100	00000100</div><div class='add'>+	 *   DEV_NONSHARED	100	00000100</div><div class='add'>+	 *   unused		101</div><div class='add'>+	 *   unused		110</div><div class='add'>+	 *   WRITEALLOC		111	11111111</div><div class='add'>+	 */</div><div class='add'>+.equ	PRRR,	0xeeaa4400			@ MAIR0</div><div class='add'>+.equ	NMRR,	0xff000004			@ MAIR1</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Macro for setting up the TTBRx and TTBCR registers.</div><div class='add'>+	 * - \ttbr1 updated.</div><div class='add'>+	 */</div><div class='add'>+	.macro	v7_ttb_setup, zero, ttbr0, ttbr1, tmp</div><div class='add'>+	ldr	\tmp, =swapper_pg_dir		@ swapper_pg_dir virtual address</div><div class='add'>+	cmp	\ttbr1, \tmp			@ PHYS_OFFSET &gt; PAGE_OFFSET? (branch below)</div><div class='add'>+	mrc	p15, 0, \tmp, c2, c0, 2		@ TTB control register</div><div class='add'>+	orr	\tmp, \tmp, #TTB_EAE</div><div class='add'>+	ALT_SMP(orr	\tmp, \tmp, #TTB_FLAGS_SMP)</div><div class='add'>+	ALT_UP(orr	\tmp, \tmp, #TTB_FLAGS_UP)</div><div class='add'>+	ALT_SMP(orr	\tmp, \tmp, #TTB_FLAGS_SMP &lt;&lt; 16)</div><div class='add'>+	ALT_UP(orr	\tmp, \tmp, #TTB_FLAGS_UP &lt;&lt; 16)</div><div class='add'>+	/*</div><div class='add'>+	 * TTBR0/TTBR1 split (PAGE_OFFSET):</div><div class='add'>+	 *   0x40000000: T0SZ = 2, T1SZ = 0 (not used)</div><div class='add'>+	 *   0x80000000: T0SZ = 0, T1SZ = 1</div><div class='add'>+	 *   0xc0000000: T0SZ = 0, T1SZ = 2</div><div class='add'>+	 *</div><div class='add'>+	 * Only use this feature if PHYS_OFFSET &lt;= PAGE_OFFSET, otherwise</div><div class='add'>+	 * booting secondary CPUs would end up using TTBR1 for the identity</div><div class='add'>+	 * mapping set up in TTBR0.</div><div class='add'>+	 */</div><div class='add'>+	bhi	9001f				@ PHYS_OFFSET &gt; PAGE_OFFSET?</div><div class='add'>+	orr	\tmp, \tmp, #(((PAGE_OFFSET &gt;&gt; 30) - 1) &lt;&lt; 16) @ TTBCR.T1SZ</div><div class='add'>+#if defined CONFIG_VMSPLIT_2G</div><div class='add'>+	/* PAGE_OFFSET == 0x80000000, T1SZ == 1 */</div><div class='add'>+	add	\ttbr1, \ttbr1, #1 &lt;&lt; 4		@ skip two L1 entries</div><div class='add'>+#elif defined CONFIG_VMSPLIT_3G</div><div class='add'>+	/* PAGE_OFFSET == 0xc0000000, T1SZ == 2 */</div><div class='add'>+	add	\ttbr1, \ttbr1, #4096 * (1 + 3)	@ only L2 used, skip pgd+3*pmd</div><div class='add'>+#endif</div><div class='add'>+	/* CONFIG_VMSPLIT_1G does not need TTBR1 adjustment */</div><div class='add'>+9001:	mcr	p15, 0, \tmp, c2, c0, 2		@ TTB control register</div><div class='add'>+	mcrr	p15, 1, \ttbr1, \zero, c2	@ load TTBR1</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	__CPUINIT</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *   AT</div><div class='add'>+	 *  TFR   EV X F   IHD LR    S</div><div class='add'>+	 * .EEE ..EE PUI. .TAT 4RVI ZWRS BLDP WCAM</div><div class='add'>+	 * rxxx rrxx xxx0 0101 xxxx xxxx x111 xxxx &lt; forced</div><div class='add'>+	 *   11    0 110    1  0011 1100 .111 1101 &lt; we want</div><div class='add'>+	 */</div><div class='add'>+	.align	2</div><div class='add'>+	.type	v7_crval, #object</div><div class='add'>+v7_crval:</div><div class='add'>+	crval	clear=0x0120c302, mmuset=0x30c23c7d, ucset=0x00c01c7c</div><div class='add'>+</div><div class='add'>+	.previous</div><div class='head'>diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S<br/>index e70a73731eaa..7e9b5bf910c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-v7.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-v7.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-v7.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-v7.S</a></div><div class='hunk'>@@ -19,24 +19,11 @@</div><div class='ctx'> </div><div class='ctx'> #include "proc-macros.S"</div><div class='ctx'> </div><div class='del'>-#define TTB_S		(1 &lt;&lt; 1)</div><div class='del'>-#define TTB_RGN_NC	(0 &lt;&lt; 3)</div><div class='del'>-#define TTB_RGN_OC_WBWA	(1 &lt;&lt; 3)</div><div class='del'>-#define TTB_RGN_OC_WT	(2 &lt;&lt; 3)</div><div class='del'>-#define TTB_RGN_OC_WB	(3 &lt;&lt; 3)</div><div class='del'>-#define TTB_NOS		(1 &lt;&lt; 5)</div><div class='del'>-#define TTB_IRGN_NC	((0 &lt;&lt; 0) | (0 &lt;&lt; 6))</div><div class='del'>-#define TTB_IRGN_WBWA	((0 &lt;&lt; 0) | (1 &lt;&lt; 6))</div><div class='del'>-#define TTB_IRGN_WT	((1 &lt;&lt; 0) | (0 &lt;&lt; 6))</div><div class='del'>-#define TTB_IRGN_WB	((1 &lt;&lt; 0) | (1 &lt;&lt; 6))</div><div class='del'>-</div><div class='del'>-/* PTWs cacheable, inner WB not shareable, outer WB not shareable */</div><div class='del'>-#define TTB_FLAGS_UP	TTB_IRGN_WB|TTB_RGN_OC_WB</div><div class='del'>-#define PMD_FLAGS_UP	PMD_SECT_WB</div><div class='del'>-</div><div class='del'>-/* PTWs cacheable, inner WBWA shareable, outer WBWA not shareable */</div><div class='del'>-#define TTB_FLAGS_SMP	TTB_IRGN_WBWA|TTB_S|TTB_NOS|TTB_RGN_OC_WBWA</div><div class='del'>-#define PMD_FLAGS_SMP	PMD_SECT_WBWA|PMD_SECT_S</div><div class='add'>+#ifdef CONFIG_ARM_LPAE</div><div class='add'>+#include "proc-v7-3level.S"</div><div class='add'>+#else</div><div class='add'>+#include "proc-v7-2level.S"</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> ENTRY(cpu_v7_proc_init)</div><div class='ctx'> 	mov	pc, lr</div><div class='hunk'>@@ -63,6 +50,7 @@ ENDPROC(cpu_v7_proc_fin)</div><div class='ctx'>  *      caches disabled.</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_v7_reset)</div><div class='ctx'> 	mrc	p15, 0, r1, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	bic	r1, r1, #0x1			@ ...............m</div><div class='hunk'>@@ -71,6 +59,7 @@ ENTRY(cpu_v7_reset)</div><div class='ctx'> 	isb</div><div class='ctx'> 	mov	pc, r0</div><div class='ctx'> ENDPROC(cpu_v7_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	cpu_v7_do_idle()</div><div class='hunk'>@@ -97,127 +86,12 @@ ENTRY(cpu_v7_dcache_clean_area)</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> ENDPROC(cpu_v7_dcache_clean_area)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	cpu_v7_switch_mm(pgd_phys, tsk)</div><div class='del'>- *</div><div class='del'>- *	Set the translation table base pointer to be pgd_phys</div><div class='del'>- *</div><div class='del'>- *	- pgd_phys - physical address of new TTB</div><div class='del'>- *</div><div class='del'>- *	It is assumed that:</div><div class='del'>- *	- we are not using split page tables</div><div class='del'>- */</div><div class='del'>-ENTRY(cpu_v7_switch_mm)</div><div class='del'>-#ifdef CONFIG_MMU</div><div class='del'>-	mov	r2, #0</div><div class='del'>-	ldr	r1, [r1, #MM_CONTEXT_ID]	@ get mm-&gt;context.id</div><div class='del'>-	ALT_SMP(orr	r0, r0, #TTB_FLAGS_SMP)</div><div class='del'>-	ALT_UP(orr	r0, r0, #TTB_FLAGS_UP)</div><div class='del'>-#ifdef CONFIG_ARM_ERRATA_430973</div><div class='del'>-	mcr	p15, 0, r2, c7, c5, 6		@ flush BTAC/BTB</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_ARM_ERRATA_754322</div><div class='del'>-	dsb</div><div class='del'>-#endif</div><div class='del'>-	mcr	p15, 0, r2, c13, c0, 1		@ set reserved context ID</div><div class='del'>-	isb</div><div class='del'>-1:	mcr	p15, 0, r0, c2, c0, 0		@ set TTB 0</div><div class='del'>-	isb</div><div class='del'>-#ifdef CONFIG_ARM_ERRATA_754322</div><div class='del'>-	dsb</div><div class='del'>-#endif</div><div class='del'>-	mcr	p15, 0, r1, c13, c0, 1		@ set context ID</div><div class='del'>-	isb</div><div class='del'>-#endif</div><div class='del'>-	mov	pc, lr</div><div class='del'>-ENDPROC(cpu_v7_switch_mm)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	cpu_v7_set_pte_ext(ptep, pte)</div><div class='del'>- *</div><div class='del'>- *	Set a level 2 translation table entry.</div><div class='del'>- *</div><div class='del'>- *	- ptep  - pointer to level 2 translation table entry</div><div class='del'>- *		  (hardware version is stored at +2048 bytes)</div><div class='del'>- *	- pte   - PTE value to store</div><div class='del'>- *	- ext	- value for extended PTE bits</div><div class='del'>- */</div><div class='del'>-ENTRY(cpu_v7_set_pte_ext)</div><div class='del'>-#ifdef CONFIG_MMU</div><div class='del'>-	str	r1, [r0]			@ linux version</div><div class='del'>-</div><div class='del'>-	bic	r3, r1, #0x000003f0</div><div class='del'>-	bic	r3, r3, #PTE_TYPE_MASK</div><div class='del'>-	orr	r3, r3, r2</div><div class='del'>-	orr	r3, r3, #PTE_EXT_AP0 | 2</div><div class='del'>-</div><div class='del'>-	tst	r1, #1 &lt;&lt; 4</div><div class='del'>-	orrne	r3, r3, #PTE_EXT_TEX(1)</div><div class='del'>-</div><div class='del'>-	eor	r1, r1, #L_PTE_DIRTY</div><div class='del'>-	tst	r1, #L_PTE_RDONLY | L_PTE_DIRTY</div><div class='del'>-	orrne	r3, r3, #PTE_EXT_APX</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_USER</div><div class='del'>-	orrne	r3, r3, #PTE_EXT_AP1</div><div class='del'>-#ifdef CONFIG_CPU_USE_DOMAINS</div><div class='del'>-	@ allow kernel read/write access to read-only user pages</div><div class='del'>-	tstne	r3, #PTE_EXT_APX</div><div class='del'>-	bicne	r3, r3, #PTE_EXT_APX | PTE_EXT_AP0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_XN</div><div class='del'>-	orrne	r3, r3, #PTE_EXT_XN</div><div class='del'>-</div><div class='del'>-	tst	r1, #L_PTE_YOUNG</div><div class='del'>-	tstne	r1, #L_PTE_PRESENT</div><div class='del'>-	moveq	r3, #0</div><div class='del'>-</div><div class='del'>- ARM(	str	r3, [r0, #2048]! )</div><div class='del'>- THUMB(	add	r0, r0, #2048 )</div><div class='del'>- THUMB(	str	r3, [r0] )</div><div class='del'>-	mcr	p15, 0, r0, c7, c10, 1		@ flush_pte</div><div class='del'>-#endif</div><div class='del'>-	mov	pc, lr</div><div class='del'>-ENDPROC(cpu_v7_set_pte_ext)</div><div class='del'>-</div><div class='ctx'> 	string	cpu_v7_name, "ARMv7 Processor"</div><div class='ctx'> 	.align</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Memory region attributes with SCTLR.TRE=1</div><div class='del'>-	 *</div><div class='del'>-	 *   n = TEX[0],C,B</div><div class='del'>-	 *   TR = PRRR[2n+1:2n]		- memory type</div><div class='del'>-	 *   IR = NMRR[2n+1:2n]		- inner cacheable property</div><div class='del'>-	 *   OR = NMRR[2n+17:2n+16]	- outer cacheable property</div><div class='del'>-	 *</div><div class='del'>-	 *			n	TR	IR	OR</div><div class='del'>-	 *   UNCACHED		000	00</div><div class='del'>-	 *   BUFFERABLE		001	10	00	00</div><div class='del'>-	 *   WRITETHROUGH	010	10	10	10</div><div class='del'>-	 *   WRITEBACK		011	10	11	11</div><div class='del'>-	 *   reserved		110</div><div class='del'>-	 *   WRITEALLOC		111	10	01	01</div><div class='del'>-	 *   DEV_SHARED		100	01</div><div class='del'>-	 *   DEV_NONSHARED	100	01</div><div class='del'>-	 *   DEV_WC		001	10</div><div class='del'>-	 *   DEV_CACHED		011	10</div><div class='del'>-	 *</div><div class='del'>-	 * Other attributes:</div><div class='del'>-	 *</div><div class='del'>-	 *   DS0 = PRRR[16] = 0		- device shareable property</div><div class='del'>-	 *   DS1 = PRRR[17] = 1		- device shareable property</div><div class='del'>-	 *   NS0 = PRRR[18] = 0		- normal shareable property</div><div class='del'>-	 *   NS1 = PRRR[19] = 1		- normal shareable property</div><div class='del'>-	 *   NOS = PRRR[24+n] = 1	- not outer shareable</div><div class='del'>-	 */</div><div class='del'>-.equ	PRRR,	0xff0a81a8</div><div class='del'>-.equ	NMRR,	0x40e040e0</div><div class='del'>-</div><div class='ctx'> /* Suspend/resume support: derived from arch/arm/mach-s5pv210/sleep.S */</div><div class='ctx'> .globl	cpu_v7_suspend_size</div><div class='del'>-.equ	cpu_v7_suspend_size, 4 * 7</div><div class='add'>+.equ	cpu_v7_suspend_size, 4 * 8</div><div class='ctx'> #ifdef CONFIG_ARM_CPU_SUSPEND</div><div class='ctx'> ENTRY(cpu_v7_do_suspend)</div><div class='ctx'> 	stmfd	sp!, {r4 - r10, lr}</div><div class='hunk'>@@ -226,10 +100,11 @@ ENTRY(cpu_v7_do_suspend)</div><div class='ctx'> 	stmia	r0!, {r4 - r5}</div><div class='ctx'> 	mrc	p15, 0, r6, c3, c0, 0	@ Domain ID</div><div class='ctx'> 	mrc	p15, 0, r7, c2, c0, 1	@ TTB 1</div><div class='add'>+	mrc	p15, 0, r11, c2, c0, 2	@ TTB control register</div><div class='ctx'> 	mrc	p15, 0, r8, c1, c0, 0	@ Control register</div><div class='ctx'> 	mrc	p15, 0, r9, c1, c0, 1	@ Auxiliary control register</div><div class='ctx'> 	mrc	p15, 0, r10, c1, c0, 2	@ Co-processor access control</div><div class='del'>-	stmia	r0, {r6 - r10}</div><div class='add'>+	stmia	r0, {r6 - r11}</div><div class='ctx'> 	ldmfd	sp!, {r4 - r10, pc}</div><div class='ctx'> ENDPROC(cpu_v7_do_suspend)</div><div class='ctx'> </div><div class='hunk'>@@ -241,13 +116,15 @@ ENTRY(cpu_v7_do_resume)</div><div class='ctx'> 	ldmia	r0!, {r4 - r5}</div><div class='ctx'> 	mcr	p15, 0, r4, c13, c0, 0	@ FCSE/PID</div><div class='ctx'> 	mcr	p15, 0, r5, c13, c0, 3	@ User r/o thread ID</div><div class='del'>-	ldmia	r0, {r6 - r10}</div><div class='add'>+	ldmia	r0, {r6 - r11}</div><div class='ctx'> 	mcr	p15, 0, r6, c3, c0, 0	@ Domain ID</div><div class='add'>+#ifndef CONFIG_ARM_LPAE</div><div class='ctx'> 	ALT_SMP(orr	r1, r1, #TTB_FLAGS_SMP)</div><div class='ctx'> 	ALT_UP(orr	r1, r1, #TTB_FLAGS_UP)</div><div class='add'>+#endif</div><div class='ctx'> 	mcr	p15, 0, r1, c2, c0, 0	@ TTB 0</div><div class='ctx'> 	mcr	p15, 0, r7, c2, c0, 1	@ TTB 1</div><div class='del'>-	mcr	p15, 0, ip, c2, c0, 2	@ TTB control register</div><div class='add'>+	mcr	p15, 0, r11, c2, c0, 2	@ TTB control register</div><div class='ctx'> 	mrc	p15, 0, r4, c1, c0, 1	@ Read Auxiliary control register</div><div class='ctx'> 	teq	r4, r9			@ Is it already set?</div><div class='ctx'> 	mcrne	p15, 0, r9, c1, c0, 1	@ No, so write it</div><div class='hunk'>@@ -284,6 +161,7 @@ __v7_ca5mp_setup:</div><div class='ctx'> __v7_ca9mp_setup:</div><div class='ctx'> 	mov	r10, #(1 &lt;&lt; 0)			@ TLB ops broadcasting</div><div class='ctx'> 	b	1f</div><div class='add'>+__v7_ca7mp_setup:</div><div class='ctx'> __v7_ca15mp_setup:</div><div class='ctx'> 	mov	r10, #0</div><div class='ctx'> 1:</div><div class='hunk'>@@ -379,12 +257,7 @@ __v7_setup:</div><div class='ctx'> 	dsb</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, r10, c8, c7, 0		@ invalidate I + D TLBs</div><div class='del'>-	mcr	p15, 0, r10, c2, c0, 2		@ TTB control register</div><div class='del'>-	ALT_SMP(orr	r4, r4, #TTB_FLAGS_SMP)</div><div class='del'>-	ALT_UP(orr	r4, r4, #TTB_FLAGS_UP)</div><div class='del'>-	ALT_SMP(orr	r8, r8, #TTB_FLAGS_SMP)</div><div class='del'>-	ALT_UP(orr	r8, r8, #TTB_FLAGS_UP)</div><div class='del'>-	mcr	p15, 0, r8, c2, c0, 1		@ load TTB1</div><div class='add'>+	v7_ttb_setup r10, r4, r8, r5		@ TTBCR, TTBRx setup</div><div class='ctx'> 	ldr	r5, =PRRR			@ PRRR</div><div class='ctx'> 	ldr	r6, =NMRR			@ NMRR</div><div class='ctx'> 	mcr	p15, 0, r5, c10, c2, 0		@ write PRRR</div><div class='hunk'>@@ -406,16 +279,7 @@ __v7_setup:</div><div class='ctx'> 	mov	pc, lr				@ return to head.S:__ret</div><div class='ctx'> ENDPROC(__v7_setup)</div><div class='ctx'> </div><div class='del'>-	/*   AT</div><div class='del'>-	 *  TFR   EV X F   I D LR    S</div><div class='del'>-	 * .EEE ..EE PUI. .T.T 4RVI ZWRS BLDP WCAM</div><div class='del'>-	 * rxxx rrxx xxx0 0101 xxxx xxxx x111 xxxx &lt; forced</div><div class='del'>-	 *    1    0 110       0011 1100 .111 1101 &lt; we want</div><div class='del'>-	 */</div><div class='del'>-	.type	v7_crval, #object</div><div class='del'>-v7_crval:</div><div class='del'>-	crval	clear=0x0120c302, mmuset=0x10c03c7d, ucset=0x00c01c7c</div><div class='del'>-</div><div class='add'>+	.align	2</div><div class='ctx'> __v7_setup_stack:</div><div class='ctx'> 	.space	4 * 11				@ 11 registers</div><div class='ctx'> </div><div class='hunk'>@@ -437,11 +301,11 @@ __v7_setup_stack:</div><div class='ctx'> 	 */</div><div class='ctx'> .macro __v7_proc initfunc, mm_mmuflags = 0, io_mmuflags = 0, hwcaps = 0</div><div class='ctx'> 	ALT_SMP(.long	PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | \</div><div class='del'>-			PMD_FLAGS_SMP | \mm_mmuflags)</div><div class='add'>+			PMD_SECT_AF | PMD_FLAGS_SMP | \mm_mmuflags)</div><div class='ctx'> 	ALT_UP(.long	PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | \</div><div class='del'>-			PMD_FLAGS_UP | \mm_mmuflags)</div><div class='del'>-	.long	PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_AP_WRITE | \</div><div class='del'>-		PMD_SECT_AP_READ | \io_mmuflags</div><div class='add'>+			PMD_SECT_AF | PMD_FLAGS_UP | \mm_mmuflags)</div><div class='add'>+	.long	PMD_TYPE_SECT | PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ | PMD_SECT_AF | \io_mmuflags</div><div class='ctx'> 	W(b)	\initfunc</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='hunk'>@@ -454,6 +318,7 @@ __v7_setup_stack:</div><div class='ctx'> 	.long	v7_cache_fns</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_ARM_LPAE</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * ARM Ltd. Cortex A5 processor.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -465,6 +330,16 @@ __v7_ca5mp_proc_info:</div><div class='ctx'> 	.size	__v7_ca5mp_proc_info, . - __v7_ca5mp_proc_info</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * ARM Ltd. Cortex A7 processor.</div><div class='add'>+	 */</div><div class='add'>+	.type	__v7_ca7mp_proc_info, #object</div><div class='add'>+__v7_ca7mp_proc_info:</div><div class='add'>+	.long	0x410fc070</div><div class='add'>+	.long	0xff0ffff0</div><div class='add'>+	__v7_proc __v7_ca7mp_setup, hwcaps = HWCAP_IDIV</div><div class='add'>+	.size	__v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * ARM Ltd. Cortex A9 processor.</div><div class='ctx'> 	 */</div><div class='ctx'> 	.type   __v7_ca9mp_proc_info, #object</div><div class='hunk'>@@ -473,6 +348,7 @@ __v7_ca9mp_proc_info:</div><div class='ctx'> 	.long	0xff0ffff0</div><div class='ctx'> 	__v7_proc __v7_ca9mp_setup</div><div class='ctx'> 	.size	__v7_ca9mp_proc_info, . - __v7_ca9mp_proc_info</div><div class='add'>+#endif	/* CONFIG_ARM_LPAE */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * ARM Ltd. Cortex A15 processor.</div><div class='head'>diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S<br/>index abf0507a08ae..b0d57869da2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-xsc3.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-xsc3.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-xsc3.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-xsc3.S</a></div><div class='hunk'>@@ -105,6 +105,7 @@ ENTRY(cpu_xsc3_proc_fin)</div><div class='ctx'>  * loc: location to jump to for soft reset</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_xsc3_reset)</div><div class='ctx'> 	mov	r1, #PSR_F_BIT|PSR_I_BIT|SVC_MODE</div><div class='ctx'> 	msr	cpsr_c, r1			@ reset CPSR</div><div class='hunk'>@@ -119,6 +120,8 @@ ENTRY(cpu_xsc3_reset)</div><div class='ctx'> 	@ already containing those two last instructions to survive.</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I and D TLBs</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_xsc3_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_xsc3_do_idle()</div><div class='head'>diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S<br/>index 3277904bebaf..4ffebaa595ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-xscale.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mm/proc-xscale.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-xscale.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/mm/proc-xscale.S</a></div><div class='hunk'>@@ -142,6 +142,7 @@ ENTRY(cpu_xscale_proc_fin)</div><div class='ctx'>  * Beware PXA270 erratum E7.</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='add'>+	.pushsection	.idmap.text, "ax"</div><div class='ctx'> ENTRY(cpu_xscale_reset)</div><div class='ctx'> 	mov	r1, #PSR_F_BIT|PSR_I_BIT|SVC_MODE</div><div class='ctx'> 	msr	cpsr_c, r1			@ reset CPSR</div><div class='hunk'>@@ -160,6 +161,8 @@ ENTRY(cpu_xscale_reset)</div><div class='ctx'> 	@ already containing those two last instructions to survive.</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='ctx'> 	mov	pc, r0</div><div class='add'>+ENDPROC(cpu_xscale_reset)</div><div class='add'>+	.popsection</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_xscale_do_idle()</div><div class='head'>diff --git a/arch/arm/nwfpe/entry.S b/arch/arm/nwfpe/entry.S<br/>index cafa18354339..d18dde95b8aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/entry.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/nwfpe/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/entry.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/nwfpe/entry.S</a></div><div class='hunk'>@@ -20,6 +20,8 @@</div><div class='ctx'>     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/opcodes.h&gt;</div><div class='add'>+</div><div class='ctx'> /* This is the kernel's entry point into the floating point emulator.</div><div class='ctx'> It is called from the kernel with code similar to this:</div><div class='ctx'> </div><div class='hunk'>@@ -81,11 +83,11 @@ nwfpe_enter:</div><div class='ctx'> 	mov	r6, r0			@ save the opcode</div><div class='ctx'> emulate:</div><div class='ctx'> 	ldr	r1, [sp, #S_PSR]	@ fetch the PSR</div><div class='del'>-	bl	checkCondition		@ check the condition</div><div class='del'>-	cmp	r0, #0			@ r0 = 0 ==&gt; condition failed</div><div class='add'>+	bl	arm_check_condition	@ check the condition</div><div class='add'>+	cmp	r0, #ARM_OPCODE_CONDTEST_PASS	@ condition passed?</div><div class='ctx'> </div><div class='ctx'> 	@ if condition code failed to match, next insn</div><div class='del'>-	beq	next			@ get the next instruction;</div><div class='add'>+	bne	next			@ get the next instruction;</div><div class='ctx'> </div><div class='ctx'> 	mov	r0, r6			@ prepare for EmulateAll()</div><div class='ctx'> 	bl	EmulateAll		@ emulate the instruction</div><div class='head'>diff --git a/arch/arm/nwfpe/fpopcode.c b/arch/arm/nwfpe/fpopcode.c<br/>index 922b81107585..ff9834673085 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpopcode.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/nwfpe/fpopcode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpopcode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/nwfpe/fpopcode.c</a></div><div class='hunk'>@@ -61,29 +61,3 @@ const float32 float32Constant[] = {</div><div class='ctx'> 	0x41200000		/* single 10.0 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* condition code lookup table</div><div class='del'>- index into the table is test code: EQ, NE, ... LT, GT, AL, NV</div><div class='del'>- bit position in short is condition code: NZCV */</div><div class='del'>-static const unsigned short aCC[16] = {</div><div class='del'>-	0xF0F0,			// EQ == Z set</div><div class='del'>-	0x0F0F,			// NE</div><div class='del'>-	0xCCCC,			// CS == C set</div><div class='del'>-	0x3333,			// CC</div><div class='del'>-	0xFF00,			// MI == N set</div><div class='del'>-	0x00FF,			// PL</div><div class='del'>-	0xAAAA,			// VS == V set</div><div class='del'>-	0x5555,			// VC</div><div class='del'>-	0x0C0C,			// HI == C set &amp;&amp; Z clear</div><div class='del'>-	0xF3F3,			// LS == C clear || Z set</div><div class='del'>-	0xAA55,			// GE == (N==V)</div><div class='del'>-	0x55AA,			// LT == (N!=V)</div><div class='del'>-	0x0A05,			// GT == (!Z &amp;&amp; (N==V))</div><div class='del'>-	0xF5FA,			// LE == (Z || (N!=V))</div><div class='del'>-	0xFFFF,			// AL always</div><div class='del'>-	0			// NV</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-unsigned int checkCondition(const unsigned int opcode, const unsigned int ccodes)</div><div class='del'>-{</div><div class='del'>-	return (aCC[opcode &gt;&gt; 28] &gt;&gt; (ccodes &gt;&gt; 28)) &amp; 1;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/nwfpe/fpopcode.h b/arch/arm/nwfpe/fpopcode.h<br/>index 786e4c96156d..78f02dbfaa8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpopcode.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/nwfpe/fpopcode.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpopcode.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/nwfpe/fpopcode.h</a></div><div class='hunk'>@@ -475,9 +475,6 @@ static inline unsigned int getDestinationSize(const unsigned int opcode)</div><div class='ctx'> 	return (nRc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern unsigned int checkCondition(const unsigned int opcode,</div><div class='del'>-				   const unsigned int ccodes);</div><div class='del'>-</div><div class='ctx'> extern const float64 float64Constant[];</div><div class='ctx'> extern const float32 float32Constant[];</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-iop/Makefile b/arch/arm/plat-iop/Makefile<br/>index 69b09c1cec8b..a99dc15a70f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-iop/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-iop/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-iop/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-iop/Makefile</a></div><div class='hunk'>@@ -10,10 +10,10 @@ obj-$(CONFIG_ARCH_IOP32X) += i2c.o</div><div class='ctx'> obj-$(CONFIG_ARCH_IOP32X) += pci.o</div><div class='ctx'> obj-$(CONFIG_ARCH_IOP32X) += setup.o</div><div class='ctx'> obj-$(CONFIG_ARCH_IOP32X) += time.o</div><div class='del'>-obj-$(CONFIG_ARCH_IOP32X) += io.o</div><div class='ctx'> obj-$(CONFIG_ARCH_IOP32X) += cp6.o</div><div class='ctx'> obj-$(CONFIG_ARCH_IOP32X) += adma.o</div><div class='ctx'> obj-$(CONFIG_ARCH_IOP32X) += pmu.o</div><div class='add'>+obj-$(CONFIG_ARCH_IOP32X) += restart.o</div><div class='ctx'> </div><div class='ctx'> # IOP33X</div><div class='ctx'> obj-$(CONFIG_ARCH_IOP33X) += gpio.o</div><div class='hunk'>@@ -21,10 +21,10 @@ obj-$(CONFIG_ARCH_IOP33X) += i2c.o</div><div class='ctx'> obj-$(CONFIG_ARCH_IOP33X) += pci.o</div><div class='ctx'> obj-$(CONFIG_ARCH_IOP33X) += setup.o</div><div class='ctx'> obj-$(CONFIG_ARCH_IOP33X) += time.o</div><div class='del'>-obj-$(CONFIG_ARCH_IOP33X) += io.o</div><div class='ctx'> obj-$(CONFIG_ARCH_IOP33X) += cp6.o</div><div class='ctx'> obj-$(CONFIG_ARCH_IOP33X) += adma.o</div><div class='ctx'> obj-$(CONFIG_ARCH_IOP33X) += pmu.o</div><div class='add'>+obj-$(CONFIG_ARCH_IOP33X) += restart.o</div><div class='ctx'> </div><div class='ctx'> # IOP13XX</div><div class='ctx'> obj-$(CONFIG_ARCH_IOP13XX) += cp6.o</div><div class='head'>diff --git a/arch/arm/plat-iop/io.c b/arch/arm/plat-iop/io.c<br/>deleted file mode 100644<br/>index e15bc17db90b..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-iop/io.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-iop/io.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * iop3xx custom ioremap implementation</div><div class='del'>- * Copyright (c) 2006, 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='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 Temple</div><div class='del'>- * Place - Suite 330, Boston, MA 02111-1307 USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-</div><div class='del'>-void * __iomem __iop3xx_ioremap(unsigned long cookie, size_t size,</div><div class='del'>-	unsigned int mtype)</div><div class='del'>-{</div><div class='del'>-	void __iomem * retval;</div><div class='del'>-</div><div class='del'>-	switch (cookie) {</div><div class='del'>-	case IOP3XX_PCI_LOWER_IO_PA ... IOP3XX_PCI_UPPER_IO_PA:</div><div class='del'>-		retval = (void *) IOP3XX_PCI_IO_PHYS_TO_VIRT(cookie);</div><div class='del'>-		break;</div><div class='del'>-	case IOP3XX_PERIPHERAL_PHYS_BASE ... IOP3XX_PERIPHERAL_UPPER_PA:</div><div class='del'>-		retval = (void *) IOP3XX_PMMR_PHYS_TO_VIRT(cookie);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		retval = __arm_ioremap_caller(cookie, size, mtype,</div><div class='del'>-				__builtin_return_address(0));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(__iop3xx_ioremap);</div><div class='del'>-</div><div class='del'>-void __iop3xx_iounmap(void __iomem *addr)</div><div class='del'>-{</div><div class='del'>-	extern void __iounmap(volatile void __iomem *addr);</div><div class='del'>-</div><div class='del'>-	switch ((u32) addr) {</div><div class='del'>-	case IOP3XX_PCI_LOWER_IO_VA ... IOP3XX_PCI_UPPER_IO_VA:</div><div class='del'>-	case IOP3XX_PERIPHERAL_VIRT_BASE ... IOP3XX_PERIPHERAL_UPPER_VA:</div><div class='del'>-		goto skip;</div><div class='del'>-	}</div><div class='del'>-	__iounmap(addr);</div><div class='del'>-</div><div class='del'>-skip:</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(__iop3xx_iounmap);</div><div class='head'>diff --git a/arch/arm/plat-iop/pci.c b/arch/arm/plat-iop/pci.c<br/>index 845549cbbb27..f4d40a27111e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-iop/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-iop/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-iop/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-iop/pci.c</a></div><div class='hunk'>@@ -215,16 +215,16 @@ int iop3xx_pci_setup(int nr, struct pci_sys_data *sys)</div><div class='ctx'> 	sys-&gt;mem_offset = IOP3XX_PCI_LOWER_MEM_PA - *IOP3XX_OMWTVR0;</div><div class='ctx'> 	sys-&gt;io_offset  = IOP3XX_PCI_LOWER_IO_PA - *IOP3XX_OIOWTVR;</div><div class='ctx'> </div><div class='del'>-	sys-&gt;resource[0] = &amp;res[0];</div><div class='del'>-	sys-&gt;resource[1] = &amp;res[1];</div><div class='del'>-	sys-&gt;resource[2] = NULL;</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;res[0]);</div><div class='add'>+	pci_add_resource(&amp;sys-&gt;resources, &amp;res[1]);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct pci_bus *iop3xx_pci_scan_bus(int nr, struct pci_sys_data *sys)</div><div class='ctx'> {</div><div class='del'>-	return pci_scan_bus(sys-&gt;busnr, &amp;iop3xx_ops, sys);</div><div class='add'>+	return pci_scan_root_bus(NULL, sys-&gt;busnr, &amp;iop3xx_ops, sys,</div><div class='add'>+				 &amp;sys-&gt;resources);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init iop3xx_atu_setup(void)</div><div class='head'>diff --git a/arch/arm/plat-iop/restart.c b/arch/arm/plat-iop/restart.c<br/>new file mode 100644<br/>index 000000000000..6a85a0c502e6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-iop/restart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-iop/restart.c</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+/*</div><div class='add'>+ * restart.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2001 MontaVista Software, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;asm/hardware/iop3xx.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+</div><div class='add'>+void iop3xx_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	*IOP3XX_PCSR = 0x30;</div><div class='add'>+</div><div class='add'>+	/* Jump into ROM at address 0 */</div><div class='add'>+	soft_restart(0);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c<br/>index 568dd0223d17..cbfbbe461788 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-iop/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-iop/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-iop/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-iop/time.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='hunk'>@@ -52,21 +51,12 @@ static struct clocksource iop_clocksource = {</div><div class='ctx'> 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_CLOCK_DATA(cd);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * IOP sched_clock() implementation via its clocksource.</div><div class='ctx'>  */</div><div class='del'>-unsigned long long notrace sched_clock(void)</div><div class='add'>+static u32 notrace iop_read_sched_clock(void)</div><div class='ctx'> {</div><div class='del'>-	u32 cyc = 0xffffffffu - read_tcr1();</div><div class='del'>-	return cyc_to_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void notrace iop_update_sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	u32 cyc = 0xffffffffu - read_tcr1();</div><div class='del'>-	update_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='add'>+	return 0xffffffffu - read_tcr1();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -152,7 +142,7 @@ void __init iop_init_time(unsigned long tick_rate)</div><div class='ctx'> {</div><div class='ctx'> 	u32 timer_ctl;</div><div class='ctx'> </div><div class='del'>-	init_sched_clock(&amp;cd, iop_update_sched_clock, 32, tick_rate);</div><div class='add'>+	setup_sched_clock(iop_read_sched_clock, 32, tick_rate);</div><div class='ctx'> </div><div class='ctx'> 	ticks_per_jiffy = DIV_ROUND_CLOSEST(tick_rate, HZ);</div><div class='ctx'> 	iop_tick_rate = tick_rate;</div><div class='head'>diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig<br/>index b3a1f2b3ada3..b30708e28c1d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-mxc/Kconfig</a></div><div class='hunk'>@@ -20,6 +20,7 @@ config ARCH_IMX_V6_V7</div><div class='ctx'> 	bool "i.MX3, i.MX6"</div><div class='ctx'> 	select AUTO_ZRELADDR if !ZBOOT_ROM</div><div class='ctx'> 	select ARM_PATCH_PHYS_VIRT</div><div class='add'>+	select MIGHT_HAVE_CACHE_L2X0</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables support for systems based on the Freescale i.MX3 and i.MX6</div><div class='ctx'> 	  family.</div><div class='head'>diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile<br/>index b9f0f5f499a4..076db84f3e31 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-mxc/Makefile</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'> # Common support</div><div class='ctx'> obj-y := clock.o time.o devices.o cpu.o system.o irq-common.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_ARM_GIC) += gic.o</div><div class='ctx'> obj-$(CONFIG_MXC_TZIC) += tzic.o</div><div class='ctx'> obj-$(CONFIG_MXC_AVIC) += avic.o</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-mxc/gic.c b/arch/arm/plat-mxc/gic.c<br/>deleted file mode 100644<br/>index 12f8f8109010..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/gic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/gic.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2011 Freescale Semiconductor, Inc.</div><div class='del'>- * Copyright 2011 Linaro Ltd.</div><div class='del'>- *</div><div class='del'>- * The code contained herein is licensed under the GNU General Public</div><div class='del'>- * License. You may obtain a copy of the GNU General Public License</div><div class='del'>- * Version 2 or later at the following locations:</div><div class='del'>- *</div><div class='del'>- * http://www.opensource.org/licenses/gpl-license.html</div><div class='del'>- * http://www.gnu.org/copyleft/gpl.html</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/exception.h&gt;</div><div class='del'>-#include &lt;asm/localtimer.h&gt;</div><div class='del'>-#include &lt;asm/hardware/gic.h&gt;</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-#include &lt;asm/smp.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	u32 irqstat, irqnr;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		irqstat = readl_relaxed(gic_cpu_base_addr + GIC_CPU_INTACK);</div><div class='del'>-		irqnr = irqstat &amp; 0x3ff;</div><div class='del'>-		if (irqnr == 1023)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (irqnr &gt; 15 &amp;&amp; irqnr &lt; 1021)</div><div class='del'>-			handle_IRQ(irqnr, regs);</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-		else {</div><div class='del'>-			writel_relaxed(irqstat, gic_cpu_base_addr +</div><div class='del'>-						GIC_CPU_EOI);</div><div class='del'>-			handle_IPI(irqnr, regs);</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-	} while (1);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h<br/>index c75f254abd85..1bf0df81bdc6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/include/mach/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-mxc/include/mach/common.h</a></div><div class='hunk'>@@ -71,8 +71,8 @@ extern int mx6q_clocks_init(void);</div><div class='ctx'> extern struct platform_device *mxc_register_gpio(char *name, int id,</div><div class='ctx'> 	resource_size_t iobase, resource_size_t iosize, int irq, int irq_high);</div><div class='ctx'> extern void mxc_set_cpu_type(unsigned int type);</div><div class='add'>+extern void mxc_restart(char, const char *);</div><div class='ctx'> extern void mxc_arch_reset_init(void __iomem *);</div><div class='del'>-extern void mx51_efikamx_reset(void);</div><div class='ctx'> extern int mx53_revision(void);</div><div class='ctx'> extern int mx53_display_revision(void);</div><div class='ctx'> </div><div class='hunk'>@@ -89,7 +89,6 @@ extern void imx_print_silicon_rev(const char *cpu, int srev);</div><div class='ctx'> </div><div class='ctx'> void avic_handle_irq(struct pt_regs *);</div><div class='ctx'> void tzic_handle_irq(struct pt_regs *);</div><div class='del'>-void gic_handle_irq(struct pt_regs *);</div><div class='ctx'> </div><div class='ctx'> #define imx1_handle_irq avic_handle_irq</div><div class='ctx'> #define imx21_handle_irq avic_handle_irq</div><div class='hunk'>@@ -122,6 +121,7 @@ static inline void imx_smp_prepare(void) {}</div><div class='ctx'> extern void imx_enable_cpu(int cpu, bool enable);</div><div class='ctx'> extern void imx_set_cpu_jump(int cpu, void *jump_addr);</div><div class='ctx'> extern void imx_src_init(void);</div><div class='add'>+extern void imx_src_prepare_restart(void);</div><div class='ctx'> extern void imx_gpc_init(void);</div><div class='ctx'> extern void imx_gpc_pre_suspend(void);</div><div class='ctx'> extern void imx_gpc_post_resume(void);</div><div class='hunk'>@@ -131,6 +131,12 @@ extern void imx53_evk_common_init(void);</div><div class='ctx'> extern void imx53_qsb_common_init(void);</div><div class='ctx'> extern void imx53_smd_common_init(void);</div><div class='ctx'> extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);</div><div class='del'>-extern void imx6q_pm_init(void);</div><div class='ctx'> extern void imx6q_clock_map_io(void);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+extern void imx6q_pm_init(void);</div><div class='add'>+#else</div><div class='add'>+static inline void imx6q_pm_init(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/entry-macro.S b/arch/arm/plat-mxc/include/mach/entry-macro.S<br/>index ca5cf26a04b1..def5d30cb67e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/include/mach/entry-macro.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-mxc/include/mach/entry-macro.S</a></div><div class='hunk'>@@ -9,19 +9,8 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* Unused, we use CONFIG_MULTI_IRQ_HANDLER */</div><div class='del'>-</div><div class='ctx'> 	.macro	disable_fiq</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro  get_irqnr_preamble, base, tmp</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='ctx'> 	.macro  arch_ret_to_user, tmp1, tmp2</div><div class='ctx'> 	.endm</div><div class='del'>-</div><div class='del'>-	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro test_for_ipi, irqnr, irqstat, base, tmp</div><div class='del'>-	.endm</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx25.h b/arch/arm/plat-mxc/include/mach/iomux-mx25.h<br/>index bf64e1e594ed..f0726d48df22 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/iomux-mx25.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/include/mach/iomux-mx25.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/iomux-mx25.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-mxc/include/mach/iomux-mx25.h</a></div><div class='hunk'>@@ -265,16 +265,20 @@</div><div class='ctx'> #define MX25_PAD_CSI_D2__CSI_D2		IOMUX_PAD(0x318, 0x120, 0x10, 0, 0, NO_PAD_CTRL)</div><div class='ctx'> #define MX25_PAD_CSI_D2__UART5_RXD_MUX	IOMUX_PAD(0x318, 0x120, 0x11, 0x578, 1, NO_PAD_CTRL)</div><div class='ctx'> #define MX25_PAD_CSI_D2__GPIO_1_27	IOMUX_PAD(0x318, 0x120, 0x15, 0, 0, NO_PAD_CTRL)</div><div class='add'>+#define MX25_PAD_CSI_D2__CSPI3_MOSI	IOMUX_PAD(0x318, 0x120, 0x17, 0, 0, NO_PAD_CTRL)</div><div class='ctx'> </div><div class='ctx'> #define MX25_PAD_CSI_D3__CSI_D3		IOMUX_PAD(0x31c, 0x124, 0x10, 0, 0, NO_PAD_CTRL)</div><div class='ctx'> #define MX25_PAD_CSI_D3__GPIO_1_28	IOMUX_PAD(0x31c, 0x124, 0x15, 0, 0, NO_PAD_CTRL)</div><div class='add'>+#define MX25_PAD_CSI_D3__CSPI3_MISO	IOMUX_PAD(0x31c, 0x124, 0x17, 0x4b4, 1, NO_PAD_CTRL)</div><div class='ctx'> </div><div class='ctx'> #define MX25_PAD_CSI_D4__CSI_D4		IOMUX_PAD(0x320, 0x128, 0x10, 0, 0, NO_PAD_CTRL)</div><div class='ctx'> #define MX25_PAD_CSI_D4__UART5_RTS	IOMUX_PAD(0x320, 0x128, 0x11, 0x574, 1, NO_PAD_CTRL)</div><div class='ctx'> #define MX25_PAD_CSI_D4__GPIO_1_29	IOMUX_PAD(0x320, 0x128, 0x15, 0, 0, NO_PAD_CTRL)</div><div class='add'>+#define MX25_PAD_CSI_D4__CSPI3_SCLK	IOMUX_PAD(0x320, 0x128, 0x17, 0, 0, NO_PAD_CTRL)</div><div class='ctx'> </div><div class='ctx'> #define MX25_PAD_CSI_D5__CSI_D5		IOMUX_PAD(0x324, 0x12c, 0x10, 0, 0, NO_PAD_CTRL)</div><div class='ctx'> #define MX25_PAD_CSI_D5__GPIO_1_30	IOMUX_PAD(0x324, 0x12c, 0x15, 0, 0, NO_PAD_CTRL)</div><div class='add'>+#define MX25_PAD_CSI_D5__CSPI3_RDY	IOMUX_PAD(0x324, 0x12c, 0x17, 0, 0, NO_PAD_CTRL)</div><div class='ctx'> </div><div class='ctx'> #define MX25_PAD_CSI_D6__CSI_D6		IOMUX_PAD(0x328, 0x130, 0x10, 0, 0, NO_PAD_CTRL)</div><div class='ctx'> #define MX25_PAD_CSI_D6__GPIO_1_31	IOMUX_PAD(0x328, 0x130, 0x15, 0, 0, NO_PAD_CTRL)</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/mx1.h b/arch/arm/plat-mxc/include/mach/mx1.h<br/>index 97b19e7800bc..2b7c08d13e89 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/mx1.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/include/mach/mx1.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/mx1.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-mxc/include/mach/mx1.h</a></div><div class='hunk'>@@ -12,8 +12,6 @@</div><div class='ctx'> #ifndef __MACH_MX1_H__</div><div class='ctx'> #define __MACH_MX1_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/vmalloc.h&gt;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Memory map</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/mx3fb.h b/arch/arm/plat-mxc/include/mach/mx3fb.h<br/>index ac24c5c4bc83..fdbe60001542 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/mx3fb.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/include/mach/mx3fb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/mx3fb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-mxc/include/mach/mx3fb.h</a></div><div class='hunk'>@@ -22,6 +22,20 @@</div><div class='ctx'> #define FB_SYNC_SWAP_RGB	0x04000000</div><div class='ctx'> #define FB_SYNC_CLK_SEL_EN	0x02000000</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Specify the way your display is connected. The IPU can arbitrarily</div><div class='add'>+ * map the internal colors to the external data lines. We only support</div><div class='add'>+ * the following mappings at the moment.</div><div class='add'>+ */</div><div class='add'>+enum disp_data_mapping {</div><div class='add'>+	/* blue -&gt; d[0..5], green -&gt; d[6..11], red -&gt; d[12..17] */</div><div class='add'>+	IPU_DISP_DATA_MAPPING_RGB666,</div><div class='add'>+	/* blue -&gt; d[0..4], green -&gt; d[5..10], red -&gt; d[11..15] */</div><div class='add'>+	IPU_DISP_DATA_MAPPING_RGB565,</div><div class='add'>+	/* blue -&gt; d[0..7], green -&gt; d[8..15], red -&gt; d[16..23] */</div><div class='add'>+	IPU_DISP_DATA_MAPPING_RGB888,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct mx3fb_platform_data - mx3fb platform data</div><div class='ctx'>  *</div><div class='hunk'>@@ -33,6 +47,7 @@ struct mx3fb_platform_data {</div><div class='ctx'> 	const char			*name;</div><div class='ctx'> 	const struct fb_videomode	*mode;</div><div class='ctx'> 	int				num_modes;</div><div class='add'>+	enum disp_data_mapping		disp_data_fmt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h<br/>index a4d36d601d55..d78298366a91 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/mxc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/include/mach/mxc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/mxc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-mxc/include/mach/mxc.h</a></div><div class='hunk'>@@ -168,7 +168,7 @@ struct cpu_op {</div><div class='ctx'> 	u32 cpu_rate;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int tzic_enable_wake(int is_idle);</div><div class='add'>+int tzic_enable_wake(void);</div><div class='ctx'> </div><div class='ctx'> extern struct cpu_op *(*get_cpu_op)(int *op);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/system.h b/arch/arm/plat-mxc/include/mach/system.h<br/>index b9895d250167..13ad0df2e860 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/include/mach/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-mxc/include/mach/system.h</a></div><div class='hunk'>@@ -22,6 +22,4 @@ static inline void arch_idle(void)</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void arch_reset(char mode, const char *cmd);</div><div class='del'>-</div><div class='ctx'> #endif /* __ASM_ARCH_MXC_SYSTEM_H__ */</div><div class='head'>diff --git a/arch/arm/plat-mxc/include/mach/vmalloc.h b/arch/arm/plat-mxc/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index ef6379c474be..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Russell King.</div><div class='del'>- *  Copyright 2004-2007 Freescale Semiconductor, Inc. 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 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 __ASM_ARCH_MXC_VMALLOC_H__</div><div class='del'>-#define __ASM_ARCH_MXC_VMALLOC_H__</div><div class='del'>-</div><div class='del'>-/* vmalloc ending address */</div><div class='del'>-#define VMALLOC_END       0xf4000000UL</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_ARCH_MXC_VMALLOC_H__ */</div><div class='head'>diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c<br/>index d65fb31a55ca..3599bf2cfd4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/system.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/system.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/system.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-mxc/system.c</a></div><div class='hunk'>@@ -37,17 +37,10 @@ static void __iomem *wdog_base;</div><div class='ctx'> /*</div><div class='ctx'>  * Reset the system. It is called by machine_restart().</div><div class='ctx'>  */</div><div class='del'>-void arch_reset(char mode, const char *cmd)</div><div class='add'>+void mxc_restart(char mode, const char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int wcr_enable;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MACH_MX51_EFIKAMX</div><div class='del'>-	if (machine_is_mx51_efikamx()) {</div><div class='del'>-		mx51_efikamx_reset();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (cpu_is_mx1()) {</div><div class='ctx'> 		wcr_enable = (1 &lt;&lt; 0);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -71,7 +64,7 @@ void arch_reset(char mode, const char *cmd)</div><div class='ctx'> 	mdelay(50);</div><div class='ctx'> </div><div class='ctx'> 	/* we'll take a jump through zero as a poor second */</div><div class='del'>-	cpu_reset(0);</div><div class='add'>+	soft_restart(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mxc_arch_reset_init(void __iomem *base)</div><div class='head'>diff --git a/arch/arm/plat-mxc/time.c b/arch/arm/plat-mxc/time.c<br/>index 4b0fe285e83c..1c96cdb4c35e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-mxc/time.c</a></div><div class='hunk'>@@ -108,18 +108,9 @@ static void gpt_irq_acknowledge(void)</div><div class='ctx'> </div><div class='ctx'> static void __iomem *sched_clock_reg;</div><div class='ctx'> </div><div class='del'>-static DEFINE_CLOCK_DATA(cd);</div><div class='del'>-unsigned long long notrace sched_clock(void)</div><div class='add'>+static u32 notrace mxc_read_sched_clock(void)</div><div class='ctx'> {</div><div class='del'>-	cycle_t cyc = sched_clock_reg ? __raw_readl(sched_clock_reg) : 0;</div><div class='del'>-</div><div class='del'>-	return cyc_to_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void notrace mxc_update_sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	cycle_t cyc = sched_clock_reg ? __raw_readl(sched_clock_reg) : 0;</div><div class='del'>-	update_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='add'>+	return sched_clock_reg ? __raw_readl(sched_clock_reg) : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init mxc_clocksource_init(struct clk *timer_clk)</div><div class='hunk'>@@ -129,7 +120,7 @@ static int __init mxc_clocksource_init(struct clk *timer_clk)</div><div class='ctx'> </div><div class='ctx'> 	sched_clock_reg = reg;</div><div class='ctx'> </div><div class='del'>-	init_sched_clock(&amp;cd, mxc_update_sched_clock, 32, c);</div><div class='add'>+	setup_sched_clock(mxc_read_sched_clock, 32, c);</div><div class='ctx'> 	return clocksource_mmio_init(reg, "mxc_timer1", c, 200, 32,</div><div class='ctx'> 			clocksource_mmio_readl_up);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/plat-mxc/tzic.c b/arch/arm/plat-mxc/tzic.c<br/>index a3c164c7ba82..98308ec1f321 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/tzic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-mxc/tzic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-mxc/tzic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-mxc/tzic.c</a></div><div class='hunk'>@@ -73,7 +73,28 @@ static int tzic_set_irq_fiq(unsigned int irq, unsigned int type)</div><div class='ctx'> #define tzic_set_irq_fiq NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static unsigned int *wakeup_intr[4];</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static void tzic_irq_suspend(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);</div><div class='add'>+	int idx = gc-&gt;irq_base &gt;&gt; 5;</div><div class='add'>+</div><div class='add'>+	__raw_writel(gc-&gt;wake_active, tzic_base + TZIC_WAKEUP0(idx));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tzic_irq_resume(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);</div><div class='add'>+	int idx = gc-&gt;irq_base &gt;&gt; 5;</div><div class='add'>+</div><div class='add'>+	__raw_writel(__raw_readl(tzic_base + TZIC_ENSET0(idx)),</div><div class='add'>+		     tzic_base + TZIC_WAKEUP0(idx));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define tzic_irq_suspend NULL</div><div class='add'>+#define tzic_irq_resume NULL</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct mxc_extra_irq tzic_extra_irq = {</div><div class='ctx'> #ifdef CONFIG_FIQ</div><div class='hunk'>@@ -91,12 +112,13 @@ static __init void tzic_init_gc(unsigned int irq_start)</div><div class='ctx'> 				    handle_level_irq);</div><div class='ctx'> 	gc-&gt;private = &amp;tzic_extra_irq;</div><div class='ctx'> 	gc-&gt;wake_enabled = IRQ_MSK(32);</div><div class='del'>-	wakeup_intr[idx] = &amp;gc-&gt;wake_active;</div><div class='ctx'> </div><div class='ctx'> 	ct = gc-&gt;chip_types;</div><div class='ctx'> 	ct-&gt;chip.irq_mask = irq_gc_mask_disable_reg;</div><div class='ctx'> 	ct-&gt;chip.irq_unmask = irq_gc_unmask_enable_reg;</div><div class='ctx'> 	ct-&gt;chip.irq_set_wake = irq_gc_set_wake;</div><div class='add'>+	ct-&gt;chip.irq_suspend = tzic_irq_suspend;</div><div class='add'>+	ct-&gt;chip.irq_resume = tzic_irq_resume;</div><div class='ctx'> 	ct-&gt;regs.disable = TZIC_ENCLEAR0(idx);</div><div class='ctx'> 	ct-&gt;regs.enable = TZIC_ENSET0(idx);</div><div class='ctx'> </div><div class='hunk'>@@ -167,23 +189,19 @@ void __init tzic_init_irq(void __iomem *irqbase)</div><div class='ctx'> /**</div><div class='ctx'>  * tzic_enable_wake() - enable wakeup interrupt</div><div class='ctx'>  *</div><div class='del'>- * @param is_idle		1 if called in idle loop (ENSET0 register);</div><div class='del'>- *				0 to be used when called from low power entry</div><div class='ctx'>  * @return			0 if successful; non-zero otherwise</div><div class='ctx'>  */</div><div class='del'>-int tzic_enable_wake(int is_idle)</div><div class='add'>+int tzic_enable_wake(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i, v;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	__raw_writel(1, tzic_base + TZIC_DSMINT);</div><div class='ctx'> 	if (unlikely(__raw_readl(tzic_base + TZIC_DSMINT) == 0))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		v = is_idle ? __raw_readl(tzic_base + TZIC_ENSET0(i)) :</div><div class='del'>-			*wakeup_intr[i];</div><div class='del'>-		__raw_writel(v, tzic_base + TZIC_WAKEUP0(i));</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		__raw_writel(__raw_readl(tzic_base + TZIC_ENSET0(i)),</div><div class='add'>+			     tzic_base + TZIC_WAKEUP0(i));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/arch/arm/plat-nomadik/include/plat/ste_dma40.h<br/>index 685c78716d95..fd0ee84c45d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-nomadik/include/plat/ste_dma40.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-nomadik/include/plat/ste_dma40.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-nomadik/include/plat/ste_dma40.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-nomadik/include/plat/ste_dma40.h</a></div><div class='hunk'>@@ -113,7 +113,8 @@ struct stedma40_half_channel_info {</div><div class='ctx'>  * @dst_dev_type: Dst device type</div><div class='ctx'>  * @src_info: Parameters for dst half channel</div><div class='ctx'>  * @dst_info: Parameters for dst half channel</div><div class='del'>- *</div><div class='add'>+ * @use_fixed_channel: if true, use physical channel specified by phy_channel</div><div class='add'>+ * @phy_channel: physical channel to use, only if use_fixed_channel is true</div><div class='ctx'>  *</div><div class='ctx'>  * This structure has to be filled by the client drivers.</div><div class='ctx'>  * It is recommended to do all dma configurations for clients in the machine.</div><div class='hunk'>@@ -129,6 +130,9 @@ struct stedma40_chan_cfg {</div><div class='ctx'> 	int					 dst_dev_type;</div><div class='ctx'> 	struct stedma40_half_channel_info	 src_info;</div><div class='ctx'> 	struct stedma40_half_channel_info	 dst_info;</div><div class='add'>+</div><div class='add'>+	bool					 use_fixed_channel;</div><div class='add'>+	int					 phy_channel;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -153,6 +157,7 @@ struct stedma40_platform_data {</div><div class='ctx'> 	struct stedma40_chan_cfg	*memcpy_conf_phy;</div><div class='ctx'> 	struct stedma40_chan_cfg	*memcpy_conf_log;</div><div class='ctx'> 	int				 disabled_channels[STEDMA40_MAX_PHYS];</div><div class='add'>+	bool				 use_esram_lcla;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_STE_DMA40</div><div class='hunk'>@@ -187,7 +192,7 @@ static inline struct</div><div class='ctx'> dma_async_tx_descriptor *stedma40_slave_mem(struct dma_chan *chan,</div><div class='ctx'> 					    dma_addr_t addr,</div><div class='ctx'> 					    unsigned int size,</div><div class='del'>-					    enum dma_data_direction direction,</div><div class='add'>+					    enum dma_transfer_direction direction,</div><div class='ctx'> 					    unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct scatterlist sg;</div><div class='hunk'>@@ -209,7 +214,7 @@ static inline struct</div><div class='ctx'> dma_async_tx_descriptor *stedma40_slave_mem(struct dma_chan *chan,</div><div class='ctx'> 					    dma_addr_t addr,</div><div class='ctx'> 					    unsigned int size,</div><div class='del'>-					    enum dma_data_direction direction,</div><div class='add'>+					    enum dma_transfer_direction direction,</div><div class='ctx'> 					    unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='head'>diff --git a/arch/arm/plat-nomadik/timer.c b/arch/arm/plat-nomadik/timer.c<br/>index 30b6433d910d..ad1b45b605a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-nomadik/timer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-nomadik/timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-nomadik/timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-nomadik/timer.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> #include &lt;asm/sched_clock.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -79,23 +78,12 @@ void __iomem *mtu_base; /* Assigned by machine code */</div><div class='ctx'>  * local implementation which uses the clocksource to get some</div><div class='ctx'>  * better resolution when scheduling the kernel.</div><div class='ctx'>  */</div><div class='del'>-static DEFINE_CLOCK_DATA(cd);</div><div class='del'>-</div><div class='del'>-unsigned long long notrace sched_clock(void)</div><div class='add'>+static u32 notrace nomadik_read_sched_clock(void)</div><div class='ctx'> {</div><div class='del'>-	u32 cyc;</div><div class='del'>-</div><div class='ctx'> 	if (unlikely(!mtu_base))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	cyc = -readl(mtu_base + MTU_VAL(0));</div><div class='del'>-	return cyc_to_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void notrace nomadik_update_sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	u32 cyc = -readl(mtu_base + MTU_VAL(0));</div><div class='del'>-	update_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='add'>+	return -readl(mtu_base + MTU_VAL(0));</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -231,9 +219,11 @@ void __init nmdk_timer_init(void)</div><div class='ctx'> 			rate, 200, 32, clocksource_mmio_readl_down))</div><div class='ctx'> 		pr_err("timer: failed to initialize clock source %s\n",</div><div class='ctx'> 		       "mtu_0");</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NOMADIK_MTU_SCHED_CLOCK</div><div class='del'>-	init_sched_clock(&amp;cd, nomadik_update_sched_clock, 32, rate);</div><div class='add'>+	setup_sched_clock(nomadik_read_sched_clock, 32, rate);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> 	/* Timer 1 is used for events */</div><div class='ctx'> </div><div class='ctx'> 	clockevents_calc_mult_shift(&amp;nmdk_clkevt, rate, MTU_MIN_RANGE);</div><div class='head'>diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile<br/>index 985262242f25..9a584614e7e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/Makefile</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> # Common support</div><div class='ctx'> obj-y := common.o sram.o clock.o devices.o dma.o mux.o \</div><div class='del'>-	 usb.o fb.o io.o counter_32k.o</div><div class='add'>+	 usb.o fb.o counter_32k.o</div><div class='ctx'> obj-m :=</div><div class='ctx'> obj-n :=</div><div class='ctx'> obj-  :=</div><div class='hunk'>@@ -19,7 +19,6 @@ obj-$(CONFIG_ARCH_OMAP4) += omap_device.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_CPU_FREQ) += cpu-omap.o</div><div class='ctx'> obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o</div><div class='ctx'> obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o</div><div class='ctx'> obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o</div><div class='head'>diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c<br/>index d9f10a31e604..06383b51e655 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/common.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</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/io.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/omapfb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/common.h&gt;</div><div class='hunk'>@@ -21,6 +22,8 @@</div><div class='ctx'> #include &lt;plat/vram.h&gt;</div><div class='ctx'> #include &lt;plat/dsp.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;plat/omap-secure.h&gt;</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #define NO_LENGTH_CHECK 0xffffffff</div><div class='ctx'> </div><div class='hunk'>@@ -65,4 +68,12 @@ void __init omap_reserve(void)</div><div class='ctx'> 	omapfb_reserve_sdram_memblock();</div><div class='ctx'> 	omap_vram_reserve_sdram_memblock();</div><div class='ctx'> 	omap_dsp_reserve_sdram_memblock();</div><div class='add'>+	omap_secure_ram_reserve_memblock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init omap_init_consistent_dma_size(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE</div><div class='add'>+	init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE &lt;&lt; 20);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/plat-omap/counter_32k.c b/arch/arm/plat-omap/counter_32k.c<br/>index a6cbb712da51..5f0f2292b7fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/counter_32k.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/counter_32k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/counter_32k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/counter_32k.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sched_clock.h&gt;</div><div class='hunk'>@@ -37,41 +36,9 @@ static void __iomem *timer_32k_base;</div><div class='ctx'> </div><div class='ctx'> #define OMAP16XX_TIMER_32K_SYNCHRONIZED		0xfffbc410</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Returns current time from boot in nsecs. It's OK for this to wrap</div><div class='del'>- * around for now, as it's just a relative time stamp.</div><div class='del'>- */</div><div class='del'>-static DEFINE_CLOCK_DATA(cd);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Constants generated by clocks_calc_mult_shift(m, s, 32768, NSEC_PER_SEC, 60).</div><div class='del'>- * This gives a resolution of about 30us and a wrap period of about 36hrs.</div><div class='del'>- */</div><div class='del'>-#define SC_MULT		4000000000u</div><div class='del'>-#define SC_SHIFT	17</div><div class='del'>-</div><div class='del'>-static inline unsigned long long notrace _omap_32k_sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	u32 cyc = timer_32k_base ? __raw_readl(timer_32k_base) : 0;</div><div class='del'>-	return cyc_to_fixed_sched_clock(&amp;cd, cyc, (u32)~0, SC_MULT, SC_SHIFT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_OMAP_32K_TIMER) &amp;&amp; !defined(CONFIG_OMAP_MPU_TIMER)</div><div class='del'>-unsigned long long notrace sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	return _omap_32k_sched_clock();</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-unsigned long long notrace omap_32k_sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	return _omap_32k_sched_clock();</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void notrace omap_update_sched_clock(void)</div><div class='add'>+static u32 notrace omap_32k_read_sched_clock(void)</div><div class='ctx'> {</div><div class='del'>-	u32 cyc = timer_32k_base ? __raw_readl(timer_32k_base) : 0;</div><div class='del'>-	update_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='add'>+	return timer_32k_base ? __raw_readl(timer_32k_base) : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -147,8 +114,7 @@ int __init omap_init_clocksource_32k(void)</div><div class='ctx'> 					  clocksource_mmio_readl_up))</div><div class='ctx'> 			printk(err, "32k_counter");</div><div class='ctx'> </div><div class='del'>-		init_fixed_sched_clock(&amp;cd, omap_update_sched_clock, 32,</div><div class='del'>-				       32768, SC_MULT, SC_SHIFT);</div><div class='add'>+		setup_sched_clock(omap_32k_read_sched_clock, 32, 32768);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/plat-omap/cpu-omap.c b/arch/arm/plat-omap/cpu-omap.c<br/>deleted file mode 100644<br/>index da4f68dbba1d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/cpu-omap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/cpu-omap.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,171 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  linux/arch/arm/plat-omap/cpu-omap.c</div><div class='del'>- *</div><div class='del'>- *  CPU frequency scaling for OMAP</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2005 Nokia Corporation</div><div class='del'>- *  Written by Tony Lindgren &lt;tony@atomide.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Based on cpu-sa1110.c, Copyright (C) 2001 Russell King</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'>-#include &lt;linux/types.h&gt;</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/cpufreq.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;plat/clock.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-</div><div class='del'>-#define VERY_HI_RATE	900000000</div><div class='del'>-</div><div class='del'>-static struct cpufreq_frequency_table *freq_table;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_OMAP1</div><div class='del'>-#define MPU_CLK		"mpu"</div><div class='del'>-#else</div><div class='del'>-#define MPU_CLK		"virt_prcm_set"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static struct clk *mpu_clk;</div><div class='del'>-</div><div class='del'>-/* TODO: Add support for SDRAM timing changes */</div><div class='del'>-</div><div class='del'>-static int omap_verify_speed(struct cpufreq_policy *policy)</div><div class='del'>-{</div><div class='del'>-	if (freq_table)</div><div class='del'>-		return cpufreq_frequency_table_verify(policy, freq_table);</div><div class='del'>-</div><div class='del'>-	if (policy-&gt;cpu)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	cpufreq_verify_within_limits(policy, policy-&gt;cpuinfo.min_freq,</div><div class='del'>-				     policy-&gt;cpuinfo.max_freq);</div><div class='del'>-</div><div class='del'>-	policy-&gt;min = clk_round_rate(mpu_clk, policy-&gt;min * 1000) / 1000;</div><div class='del'>-	policy-&gt;max = clk_round_rate(mpu_clk, policy-&gt;max * 1000) / 1000;</div><div class='del'>-	cpufreq_verify_within_limits(policy, policy-&gt;cpuinfo.min_freq,</div><div class='del'>-				     policy-&gt;cpuinfo.max_freq);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int omap_getspeed(unsigned int cpu)</div><div class='del'>-{</div><div class='del'>-	unsigned long rate;</div><div class='del'>-</div><div class='del'>-	if (cpu)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	rate = clk_get_rate(mpu_clk) / 1000;</div><div class='del'>-	return rate;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int omap_target(struct cpufreq_policy *policy,</div><div class='del'>-		       unsigned int target_freq,</div><div class='del'>-		       unsigned int relation)</div><div class='del'>-{</div><div class='del'>-	struct cpufreq_freqs freqs;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/* Ensure desired rate is within allowed range.  Some govenors</div><div class='del'>-	 * (ondemand) will just pass target_freq=0 to get the minimum. */</div><div class='del'>-	if (target_freq &lt; policy-&gt;min)</div><div class='del'>-		target_freq = policy-&gt;min;</div><div class='del'>-	if (target_freq &gt; policy-&gt;max)</div><div class='del'>-		target_freq = policy-&gt;max;</div><div class='del'>-</div><div class='del'>-	freqs.old = omap_getspeed(0);</div><div class='del'>-	freqs.new = clk_round_rate(mpu_clk, target_freq * 1000) / 1000;</div><div class='del'>-	freqs.cpu = 0;</div><div class='del'>-</div><div class='del'>-	if (freqs.old == freqs.new)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	cpufreq_notify_transition(&amp;freqs, CPUFREQ_PRECHANGE);</div><div class='del'>-#ifdef CONFIG_CPU_FREQ_DEBUG</div><div class='del'>-	printk(KERN_DEBUG "cpufreq-omap: transition: %u --&gt; %u\n",</div><div class='del'>-	       freqs.old, freqs.new);</div><div class='del'>-#endif</div><div class='del'>-	ret = clk_set_rate(mpu_clk, freqs.new * 1000);</div><div class='del'>-	cpufreq_notify_transition(&amp;freqs, CPUFREQ_POSTCHANGE);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)</div><div class='del'>-{</div><div class='del'>-	int result = 0;</div><div class='del'>-</div><div class='del'>-	mpu_clk = clk_get(NULL, MPU_CLK);</div><div class='del'>-	if (IS_ERR(mpu_clk))</div><div class='del'>-		return PTR_ERR(mpu_clk);</div><div class='del'>-</div><div class='del'>-	if (policy-&gt;cpu != 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	policy-&gt;cur = policy-&gt;min = policy-&gt;max = omap_getspeed(0);</div><div class='del'>-</div><div class='del'>-	clk_init_cpufreq_table(&amp;freq_table);</div><div class='del'>-	if (freq_table) {</div><div class='del'>-		result = cpufreq_frequency_table_cpuinfo(policy, freq_table);</div><div class='del'>-		if (!result)</div><div class='del'>-			cpufreq_frequency_table_get_attr(freq_table,</div><div class='del'>-							policy-&gt;cpu);</div><div class='del'>-	} else {</div><div class='del'>-		policy-&gt;cpuinfo.min_freq = clk_round_rate(mpu_clk, 0) / 1000;</div><div class='del'>-		policy-&gt;cpuinfo.max_freq = clk_round_rate(mpu_clk,</div><div class='del'>-							VERY_HI_RATE) / 1000;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: what's the actual transition time? */</div><div class='del'>-	policy-&gt;cpuinfo.transition_latency = 300 * 1000;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int omap_cpu_exit(struct cpufreq_policy *policy)</div><div class='del'>-{</div><div class='del'>-	clk_exit_cpufreq_table(&amp;freq_table);</div><div class='del'>-	clk_put(mpu_clk);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct freq_attr *omap_cpufreq_attr[] = {</div><div class='del'>-	&amp;cpufreq_freq_attr_scaling_available_freqs,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cpufreq_driver omap_driver = {</div><div class='del'>-	.flags		= CPUFREQ_STICKY,</div><div class='del'>-	.verify		= omap_verify_speed,</div><div class='del'>-	.target		= omap_target,</div><div class='del'>-	.get		= omap_getspeed,</div><div class='del'>-	.init		= omap_cpu_init,</div><div class='del'>-	.exit		= omap_cpu_exit,</div><div class='del'>-	.name		= "omap",</div><div class='del'>-	.attr		= omap_cpufreq_attr,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init omap_cpufreq_init(void)</div><div class='del'>-{</div><div class='del'>-	return cpufreq_register_driver(&amp;omap_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-arch_initcall(omap_cpufreq_init);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * if ever we want to remove this, upon cleanup call:</div><div class='del'>- *</div><div class='del'>- * cpufreq_unregister_driver()</div><div class='del'>- * cpufreq_frequency_table_put_attr()</div><div class='del'>- */</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c<br/>index 19719329a47b..60278f47c0bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/devices.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/devices.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/memblock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/tc.h&gt;</div><div class='ctx'> #include &lt;plat/board.h&gt;</div><div class='hunk'>@@ -164,14 +165,12 @@ void __init omap_dsp_reserve_sdram_memblock(void)</div><div class='ctx'> 	if (!size)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	paddr = memblock_alloc(size, SZ_1M);</div><div class='add'>+	paddr = arm_memblock_steal(size, SZ_1M);</div><div class='ctx'> 	if (!paddr) {</div><div class='ctx'> 		pr_err("%s: failed to reserve %x bytes\n",</div><div class='ctx'> 				__func__, size);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	memblock_free(paddr, size);</div><div class='del'>-	memblock_remove(paddr, size);</div><div class='ctx'> </div><div class='ctx'> 	omap_dsp_phys_mempool_base = paddr;</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 c22217c2ee5f..002fb4d96bbc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/dma.c</a></div><div class='hunk'>@@ -1034,6 +1034,18 @@ dma_addr_t omap_get_dma_src_pos(int lch)</div><div class='ctx'> 	if (IS_DMA_ERRATA(DMA_ERRATA_3_3) &amp;&amp; offset == 0)</div><div class='ctx'> 		offset = p-&gt;dma_read(CSAC, lch);</div><div class='ctx'> </div><div class='add'>+	if (!cpu_is_omap15xx()) {</div><div class='add'>+		/*</div><div class='add'>+		 * CDAC == 0 indicates that the DMA transfer on the channel has</div><div class='add'>+		 * not been started (no data has been transferred so far).</div><div class='add'>+		 * Return the programmed source start address in this case.</div><div class='add'>+		 */</div><div class='add'>+		if (likely(p-&gt;dma_read(CDAC, lch)))</div><div class='add'>+			offset = p-&gt;dma_read(CSAC, lch);</div><div class='add'>+		else</div><div class='add'>+			offset = p-&gt;dma_read(CSSA, lch);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (cpu_class_is_omap1())</div><div class='ctx'> 		offset |= (p-&gt;dma_read(CSSA, lch) &amp; 0xFFFF0000);</div><div class='ctx'> </div><div class='hunk'>@@ -1062,8 +1074,16 @@ dma_addr_t omap_get_dma_dst_pos(int lch)</div><div class='ctx'> 	 * omap 3.2/3.3 erratum: sometimes 0 is returned if CSAC/CDAC is</div><div class='ctx'> 	 * read before the DMA controller finished disabling the channel.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!cpu_is_omap15xx() &amp;&amp; offset == 0)</div><div class='add'>+	if (!cpu_is_omap15xx() &amp;&amp; offset == 0) {</div><div class='ctx'> 		offset = p-&gt;dma_read(CDAC, lch);</div><div class='add'>+		/*</div><div class='add'>+		 * CDAC == 0 indicates that the DMA transfer on the channel has</div><div class='add'>+		 * not been started (no data has been transferred so far).</div><div class='add'>+		 * Return the programmed destination start address in this case.</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(!offset))</div><div class='add'>+			offset = p-&gt;dma_read(CDSA, lch);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_class_is_omap1())</div><div class='ctx'> 		offset |= (p-&gt;dma_read(CDSA, lch) &amp; 0xFFFF0000);</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/am33xx.h b/arch/arm/plat-omap/include/plat/am33xx.h<br/>new file mode 100644<br/>index 000000000000..06c19bb7bca6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/am33xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/am33xx.h</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+/*</div><div class='add'>+ * This file contains the address info for various AM33XX modules.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments, Inc. - http://www.ti.com/</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'>+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any</div><div class='add'>+ * kind, whether express or implied; without even the implied warranty</div><div class='add'>+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ASM_ARCH_AM33XX_H</div><div class='add'>+#define __ASM_ARCH_AM33XX_H</div><div class='add'>+</div><div class='add'>+#define L4_SLOW_AM33XX_BASE	0x48000000</div><div class='add'>+</div><div class='add'>+#define AM33XX_SCM_BASE		0x44E10000</div><div class='add'>+#define AM33XX_CTRL_BASE	AM33XX_SCM_BASE</div><div class='add'>+#define AM33XX_PRCM_BASE	0x44E00000</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_ARCH_AM33XX_H */</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/clkdev_omap.h b/arch/arm/plat-omap/include/plat/clkdev_omap.h<br/>index 387a9638991b..b299b8d201c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/clkdev_omap.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/clkdev_omap.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/clkdev_omap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/clkdev_omap.h</a></div><div class='hunk'>@@ -40,6 +40,7 @@ struct omap_clk {</div><div class='ctx'> #define CK_443X		(1 &lt;&lt; 11)</div><div class='ctx'> #define CK_TI816X	(1 &lt;&lt; 12)</div><div class='ctx'> #define CK_446X		(1 &lt;&lt; 13)</div><div class='add'>+#define CK_1710		(1 &lt;&lt; 15)	/* 1710 extra for rate selection */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define CK_34XX		(CK_3430ES1 | CK_3430ES2PLUS)</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/clock.h b/arch/arm/plat-omap/include/plat/clock.h<br/>index eb73ab40e955..240a7b9fd946 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/clock.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/clock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/clock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/clock.h</a></div><div class='hunk'>@@ -59,6 +59,8 @@ struct clkops {</div><div class='ctx'> #define RATE_IN_4430		(1 &lt;&lt; 5)</div><div class='ctx'> #define RATE_IN_TI816X		(1 &lt;&lt; 6)</div><div class='ctx'> #define RATE_IN_4460		(1 &lt;&lt; 7)</div><div class='add'>+#define RATE_IN_AM33XX		(1 &lt;&lt; 8)</div><div class='add'>+#define RATE_IN_TI814X		(1 &lt;&lt; 9)</div><div class='ctx'> </div><div class='ctx'> #define RATE_IN_24XX		(RATE_IN_242X | RATE_IN_243X)</div><div class='ctx'> #define RATE_IN_34XX		(RATE_IN_3430ES1 | RATE_IN_3430ES2PLUS)</div><div class='hunk'>@@ -84,7 +86,7 @@ struct clkops {</div><div class='ctx'> struct clksel_rate {</div><div class='ctx'> 	u32			val;</div><div class='ctx'> 	u8			div;</div><div class='del'>-	u8			flags;</div><div class='add'>+	u16			flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h<br/>index 3ff3e36580f2..b4d7ec3fbfbe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/common.h</a></div><div class='hunk'>@@ -27,97 +27,14 @@</div><div class='ctx'> #ifndef __ARCH_ARM_MACH_OMAP_COMMON_H</div><div class='ctx'> #define __ARCH_ARM_MACH_OMAP_COMMON_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;plat/i2c.h&gt;</div><div class='ctx'> #include &lt;plat/omap_hwmod.h&gt;</div><div class='ctx'> </div><div class='del'>-struct sys_timer;</div><div class='del'>-</div><div class='del'>-extern void omap_map_common_io(void);</div><div class='del'>-extern struct sys_timer omap1_timer;</div><div class='del'>-extern struct sys_timer omap2_timer;</div><div class='del'>-extern struct sys_timer omap3_timer;</div><div class='del'>-extern struct sys_timer omap3_secure_timer;</div><div class='del'>-extern struct sys_timer omap4_timer;</div><div class='del'>-extern bool omap_32k_timer_init(void);</div><div class='ctx'> extern int __init omap_init_clocksource_32k(void);</div><div class='del'>-extern unsigned long long notrace omap_32k_sched_clock(void);</div><div class='ctx'> </div><div class='ctx'> extern void omap_reserve(void);</div><div class='del'>-</div><div class='del'>-void omap2420_init_early(void);</div><div class='del'>-void omap2430_init_early(void);</div><div class='del'>-void omap3430_init_early(void);</div><div class='del'>-void omap35xx_init_early(void);</div><div class='del'>-void omap3630_init_early(void);</div><div class='del'>-void omap3_init_early(void);	/* Do not use this one */</div><div class='del'>-void am35xx_init_early(void);</div><div class='del'>-void ti816x_init_early(void);</div><div class='del'>-void omap4430_init_early(void);</div><div class='del'>-</div><div class='ctx'> extern int omap_dss_reset(struct omap_hwmod *);</div><div class='ctx'> </div><div class='ctx'> void omap_sram_init(void);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * IO bases for various OMAP processors</div><div class='del'>- * Except the tap base, rest all the io bases</div><div class='del'>- * listed are physical addresses.</div><div class='del'>- */</div><div class='del'>-struct omap_globals {</div><div class='del'>-	u32		class;		/* OMAP class to detect */</div><div class='del'>-	void __iomem	*tap;		/* Control module ID code */</div><div class='del'>-	void __iomem	*sdrc;           /* SDRAM Controller */</div><div class='del'>-	void __iomem	*sms;            /* SDRAM Memory Scheduler */</div><div class='del'>-	void __iomem	*ctrl;           /* System Control Module */</div><div class='del'>-	void __iomem	*ctrl_pad;	/* PAD Control Module */</div><div class='del'>-	void __iomem	*prm;            /* Power and Reset Management */</div><div class='del'>-	void __iomem	*cm;             /* Clock Management */</div><div class='del'>-	void __iomem	*cm2;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void omap2_set_globals_242x(void);</div><div class='del'>-void omap2_set_globals_243x(void);</div><div class='del'>-void omap2_set_globals_3xxx(void);</div><div class='del'>-void omap2_set_globals_443x(void);</div><div class='del'>-void omap2_set_globals_ti816x(void);</div><div class='del'>-</div><div class='del'>-/* These get called from omap2_set_globals_xxxx(), do not call these */</div><div class='del'>-void omap2_set_globals_tap(struct omap_globals *);</div><div class='del'>-void omap2_set_globals_sdrc(struct omap_globals *);</div><div class='del'>-void omap2_set_globals_control(struct omap_globals *);</div><div class='del'>-void omap2_set_globals_prcm(struct omap_globals *);</div><div class='del'>-</div><div class='del'>-void omap242x_map_io(void);</div><div class='del'>-void omap243x_map_io(void);</div><div class='del'>-void omap3_map_io(void);</div><div class='del'>-void omap4_map_io(void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * omap_test_timeout - busy-loop, testing a condition</div><div class='del'>- * @cond: condition to test until it evaluates to true</div><div class='del'>- * @timeout: maximum number of microseconds in the timeout</div><div class='del'>- * @index: loop index (integer)</div><div class='del'>- *</div><div class='del'>- * Loop waiting for @cond to become true or until at least @timeout</div><div class='del'>- * microseconds have passed.  To use, define some integer @index in the</div><div class='del'>- * calling code.  After running, if @index == @timeout, then the loop has</div><div class='del'>- * timed out.</div><div class='del'>- */</div><div class='del'>-#define omap_test_timeout(cond, timeout, index)			\</div><div class='del'>-({								\</div><div class='del'>-	for (index = 0; index &lt; timeout; index++) {		\</div><div class='del'>-		if (cond)					\</div><div class='del'>-			break;					\</div><div class='del'>-		udelay(1);					\</div><div class='del'>-	}							\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-extern struct device *omap2_get_mpuss_device(void);</div><div class='del'>-extern struct device *omap2_get_iva_device(void);</div><div class='del'>-extern struct device *omap2_get_l3_device(void);</div><div class='del'>-extern struct device *omap4_get_dsp_device(void);</div><div class='del'>-</div><div class='ctx'> #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h<br/>index 408a12f79205..6b51086fce18 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/cpu.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/cpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/cpu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/cpu.h</a></div><div class='hunk'>@@ -69,6 +69,7 @@ unsigned int omap_rev(void);</div><div class='ctx'>  * cpu_is_omap343x():	True for OMAP3430</div><div class='ctx'>  * cpu_is_omap443x():	True for OMAP4430</div><div class='ctx'>  * cpu_is_omap446x():	True for OMAP4460</div><div class='add'>+ * cpu_is_omap447x():	True for OMAP4470</div><div class='ctx'>  */</div><div class='ctx'> #define GET_OMAP_CLASS	(omap_rev() &amp; 0xff)</div><div class='ctx'> </div><div class='hunk'>@@ -78,6 +79,22 @@ static inline int is_omap ##class (void)		\</div><div class='ctx'> 	return (GET_OMAP_CLASS == (id)) ? 1 : 0;	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define GET_AM_CLASS	((omap_rev() &gt;&gt; 24) &amp; 0xff)</div><div class='add'>+</div><div class='add'>+#define IS_AM_CLASS(class, id)				\</div><div class='add'>+static inline int is_am ##class (void)			\</div><div class='add'>+{							\</div><div class='add'>+	return (GET_AM_CLASS == (id)) ? 1 : 0;		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define GET_TI_CLASS	((omap_rev() &gt;&gt; 24) &amp; 0xff)</div><div class='add'>+</div><div class='add'>+#define IS_TI_CLASS(class, id)			\</div><div class='add'>+static inline int is_ti ##class (void)		\</div><div class='add'>+{							\</div><div class='add'>+	return (GET_TI_CLASS == (id)) ? 1 : 0;	\</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define GET_OMAP_SUBCLASS	((omap_rev() &gt;&gt; 20) &amp; 0x0fff)</div><div class='ctx'> </div><div class='ctx'> #define IS_OMAP_SUBCLASS(subclass, id)			\</div><div class='hunk'>@@ -92,12 +109,21 @@ static inline int is_ti ##subclass (void)		\</div><div class='ctx'> 	return (GET_OMAP_SUBCLASS == (id)) ? 1 : 0;	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define IS_AM_SUBCLASS(subclass, id)			\</div><div class='add'>+static inline int is_am ##subclass (void)		\</div><div class='add'>+{							\</div><div class='add'>+	return (GET_OMAP_SUBCLASS == (id)) ? 1 : 0;	\</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> IS_OMAP_CLASS(7xx, 0x07)</div><div class='ctx'> IS_OMAP_CLASS(15xx, 0x15)</div><div class='ctx'> IS_OMAP_CLASS(16xx, 0x16)</div><div class='ctx'> IS_OMAP_CLASS(24xx, 0x24)</div><div class='ctx'> IS_OMAP_CLASS(34xx, 0x34)</div><div class='ctx'> IS_OMAP_CLASS(44xx, 0x44)</div><div class='add'>+IS_AM_CLASS(33xx, 0x33)</div><div class='add'>+</div><div class='add'>+IS_TI_CLASS(81xx, 0x81)</div><div class='ctx'> </div><div class='ctx'> IS_OMAP_SUBCLASS(242x, 0x242)</div><div class='ctx'> IS_OMAP_SUBCLASS(243x, 0x243)</div><div class='hunk'>@@ -105,8 +131,11 @@ IS_OMAP_SUBCLASS(343x, 0x343)</div><div class='ctx'> IS_OMAP_SUBCLASS(363x, 0x363)</div><div class='ctx'> IS_OMAP_SUBCLASS(443x, 0x443)</div><div class='ctx'> IS_OMAP_SUBCLASS(446x, 0x446)</div><div class='add'>+IS_OMAP_SUBCLASS(447x, 0x447)</div><div class='ctx'> </div><div class='ctx'> IS_TI_SUBCLASS(816x, 0x816)</div><div class='add'>+IS_TI_SUBCLASS(814x, 0x814)</div><div class='add'>+IS_AM_SUBCLASS(335x, 0x335)</div><div class='ctx'> </div><div class='ctx'> #define cpu_is_omap7xx()		0</div><div class='ctx'> #define cpu_is_omap15xx()		0</div><div class='hunk'>@@ -116,10 +145,15 @@ IS_TI_SUBCLASS(816x, 0x816)</div><div class='ctx'> #define cpu_is_omap243x()		0</div><div class='ctx'> #define cpu_is_omap34xx()		0</div><div class='ctx'> #define cpu_is_omap343x()		0</div><div class='add'>+#define cpu_is_ti81xx()			0</div><div class='ctx'> #define cpu_is_ti816x()			0</div><div class='add'>+#define cpu_is_ti814x()			0</div><div class='add'>+#define cpu_is_am33xx()			0</div><div class='add'>+#define cpu_is_am335x()			0</div><div class='ctx'> #define cpu_is_omap44xx()		0</div><div class='ctx'> #define cpu_is_omap443x()		0</div><div class='ctx'> #define cpu_is_omap446x()		0</div><div class='add'>+#define cpu_is_omap447x()		0</div><div class='ctx'> </div><div class='ctx'> #if defined(MULTI_OMAP1)</div><div class='ctx'> # if defined(CONFIG_ARCH_OMAP730)</div><div class='hunk'>@@ -322,7 +356,11 @@ IS_OMAP_TYPE(3517, 0x3517)</div><div class='ctx'> # undef cpu_is_omap3530</div><div class='ctx'> # undef cpu_is_omap3505</div><div class='ctx'> # undef cpu_is_omap3517</div><div class='add'>+# undef cpu_is_ti81xx</div><div class='ctx'> # undef cpu_is_ti816x</div><div class='add'>+# undef cpu_is_ti814x</div><div class='add'>+# undef cpu_is_am33xx</div><div class='add'>+# undef cpu_is_am335x</div><div class='ctx'> # define cpu_is_omap3430()		is_omap3430()</div><div class='ctx'> # define cpu_is_omap3503()		(cpu_is_omap3430() &amp;&amp;		\</div><div class='ctx'> 						(!omap3_has_iva()) &amp;&amp;	\</div><div class='hunk'>@@ -339,16 +377,22 @@ IS_OMAP_TYPE(3517, 0x3517)</div><div class='ctx'> 						!omap3_has_sgx())</div><div class='ctx'> # undef cpu_is_omap3630</div><div class='ctx'> # define cpu_is_omap3630()		is_omap363x()</div><div class='add'>+# define cpu_is_ti81xx()		is_ti81xx()</div><div class='ctx'> # define cpu_is_ti816x()		is_ti816x()</div><div class='add'>+# define cpu_is_ti814x()		is_ti814x()</div><div class='add'>+# define cpu_is_am33xx()		is_am33xx()</div><div class='add'>+# define cpu_is_am335x()		is_am335x()</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> # if defined(CONFIG_ARCH_OMAP4)</div><div class='ctx'> # undef cpu_is_omap44xx</div><div class='ctx'> # undef cpu_is_omap443x</div><div class='ctx'> # undef cpu_is_omap446x</div><div class='add'>+# undef cpu_is_omap447x</div><div class='ctx'> # define cpu_is_omap44xx()		is_omap44xx()</div><div class='ctx'> # define cpu_is_omap443x()		is_omap443x()</div><div class='ctx'> # define cpu_is_omap446x()		is_omap446x()</div><div class='add'>+# define cpu_is_omap447x()		is_omap447x()</div><div class='ctx'> # endif</div><div class='ctx'> </div><div class='ctx'> /* Macros to detect if we have OMAP1 or OMAP2 */</div><div class='hunk'>@@ -386,15 +430,27 @@ IS_OMAP_TYPE(3517, 0x3517)</div><div class='ctx'> #define TI8168_REV_ES1_0	TI816X_CLASS</div><div class='ctx'> #define TI8168_REV_ES1_1	(TI816X_CLASS | (0x1 &lt;&lt; 8))</div><div class='ctx'> </div><div class='add'>+#define TI814X_CLASS		0x81400034</div><div class='add'>+#define TI8148_REV_ES1_0	TI814X_CLASS</div><div class='add'>+#define TI8148_REV_ES2_0	(TI814X_CLASS | (0x1 &lt;&lt; 8))</div><div class='add'>+#define TI8148_REV_ES2_1	(TI814X_CLASS | (0x2 &lt;&lt; 8))</div><div class='add'>+</div><div class='add'>+#define AM335X_CLASS		0x33500034</div><div class='add'>+#define AM335X_REV_ES1_0	AM335X_CLASS</div><div class='add'>+</div><div class='ctx'> #define OMAP443X_CLASS		0x44300044</div><div class='ctx'> #define OMAP4430_REV_ES1_0	(OMAP443X_CLASS | (0x10 &lt;&lt; 8))</div><div class='ctx'> #define OMAP4430_REV_ES2_0	(OMAP443X_CLASS | (0x20 &lt;&lt; 8))</div><div class='ctx'> #define OMAP4430_REV_ES2_1	(OMAP443X_CLASS | (0x21 &lt;&lt; 8))</div><div class='ctx'> #define OMAP4430_REV_ES2_2	(OMAP443X_CLASS | (0x22 &lt;&lt; 8))</div><div class='add'>+#define OMAP4430_REV_ES2_3	(OMAP443X_CLASS | (0x23 &lt;&lt; 8))</div><div class='ctx'> </div><div class='ctx'> #define OMAP446X_CLASS		0x44600044</div><div class='ctx'> #define OMAP4460_REV_ES1_0	(OMAP446X_CLASS | (0x10 &lt;&lt; 8))</div><div class='ctx'> </div><div class='add'>+#define OMAP447X_CLASS		0x44700044</div><div class='add'>+#define OMAP4470_REV_ES1_0	(OMAP447X_CLASS | (0x10 &lt;&lt; 8))</div><div class='add'>+</div><div class='ctx'> void omap2_check_revision(void);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/hardware.h b/arch/arm/plat-omap/include/plat/hardware.h<br/>index e87efe1499b8..e897978371c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/hardware.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/hardware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/hardware.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/hardware.h</a></div><div class='hunk'>@@ -286,6 +286,7 @@</div><div class='ctx'> #include &lt;plat/omap24xx.h&gt;</div><div class='ctx'> #include &lt;plat/omap34xx.h&gt;</div><div class='ctx'> #include &lt;plat/omap44xx.h&gt;</div><div class='del'>-#include &lt;plat/ti816x.h&gt;</div><div class='add'>+#include &lt;plat/ti81xx.h&gt;</div><div class='add'>+#include &lt;plat/am33xx.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif	/* __ASM_ARCH_OMAP_HARDWARE_H */</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h<br/>index 7f2969eadb85..0696bae1818b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/io.h</a></div><div class='hunk'>@@ -73,6 +73,9 @@</div><div class='ctx'> #define OMAP4_L3_IO_OFFSET	0xb4000000</div><div class='ctx'> #define OMAP4_L3_IO_ADDRESS(pa)	IOMEM((pa) + OMAP4_L3_IO_OFFSET) /* L3 */</div><div class='ctx'> </div><div class='add'>+#define AM33XX_L4_WK_IO_OFFSET	0xb5000000</div><div class='add'>+#define AM33XX_L4_WK_IO_ADDRESS(pa)	IOMEM((pa) + AM33XX_L4_WK_IO_OFFSET)</div><div class='add'>+</div><div class='ctx'> #define OMAP4_L3_PER_IO_OFFSET	0xb1100000</div><div class='ctx'> #define OMAP4_L3_PER_IO_ADDRESS(pa)	IOMEM((pa) + OMAP4_L3_PER_IO_OFFSET)</div><div class='ctx'> </div><div class='hunk'>@@ -154,6 +157,15 @@</div><div class='ctx'> #define L4_34XX_SIZE		SZ_4M   /* 1MB of 128MB used, want 1MB sect */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * ----------------------------------------------------------------------------</div><div class='add'>+ * AM33XX specific IO mapping</div><div class='add'>+ * ----------------------------------------------------------------------------</div><div class='add'>+ */</div><div class='add'>+#define L4_WK_AM33XX_PHYS	L4_WK_AM33XX_BASE</div><div class='add'>+#define L4_WK_AM33XX_VIRT	(L4_WK_AM33XX_PHYS + AM33XX_L4_WK_IO_OFFSET)</div><div class='add'>+#define L4_WK_AM33XX_SIZE	SZ_4M   /* 1MB of 128MB used, want 1MB sect */</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Need to look at the Size 4M for L4.</div><div class='ctx'>  * VPOM3430 was not working for Int controller</div><div class='ctx'>  */</div><div class='hunk'>@@ -247,8 +259,6 @@</div><div class='ctx'>  * NOTE: Please use ioremap + __raw_read/write where possible instead of these</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void omap_ioremap_init(void);</div><div class='del'>-</div><div class='ctx'> extern u8 omap_readb(u32 pa);</div><div class='ctx'> extern u16 omap_readw(u32 pa);</div><div class='ctx'> extern u32 omap_readl(u32 pa);</div><div class='hunk'>@@ -257,83 +267,9 @@ extern void omap_writew(u16 v, u32 pa);</div><div class='ctx'> extern void omap_writel(u32 v, u32 pa);</div><div class='ctx'> </div><div class='ctx'> struct omap_sdrc_params;</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)</div><div class='del'>-void omap7xx_map_io(void);</div><div class='del'>-#else</div><div class='del'>-static inline void omap_map_io(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_OMAP15XX</div><div class='del'>-void omap15xx_map_io(void);</div><div class='del'>-#else</div><div class='del'>-static inline void omap15xx_map_io(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_OMAP16XX</div><div class='del'>-void omap16xx_map_io(void);</div><div class='del'>-#else</div><div class='del'>-static inline void omap16xx_map_io(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void omap1_init_early(void);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SOC_OMAP2420</div><div class='del'>-extern void omap242x_map_common_io(void);</div><div class='del'>-#else</div><div class='del'>-static inline void omap242x_map_common_io(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SOC_OMAP2430</div><div class='del'>-extern void omap243x_map_common_io(void);</div><div class='del'>-#else</div><div class='del'>-static inline void omap243x_map_common_io(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_OMAP3</div><div class='del'>-extern void omap34xx_map_common_io(void);</div><div class='del'>-#else</div><div class='del'>-static inline void omap34xx_map_common_io(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SOC_OMAPTI816X</div><div class='del'>-extern void omapti816x_map_common_io(void);</div><div class='del'>-#else</div><div class='del'>-static inline void omapti816x_map_common_io(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_OMAP4</div><div class='del'>-extern void omap44xx_map_common_io(void);</div><div class='del'>-#else</div><div class='del'>-static inline void omap44xx_map_common_io(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-extern void omap2_init_common_infrastructure(void);</div><div class='ctx'> extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,</div><div class='ctx'> 				      struct omap_sdrc_params *sdrc_cs1);</div><div class='ctx'> </div><div class='del'>-#define __arch_ioremap	omap_ioremap</div><div class='del'>-#define __arch_iounmap	omap_iounmap</div><div class='del'>-</div><div class='del'>-void __iomem *omap_ioremap(unsigned long phys, size_t size, unsigned int type);</div><div class='del'>-void omap_iounmap(volatile void __iomem *addr);</div><div class='del'>-</div><div class='ctx'> extern void __init omap_init_consistent_dma_size(void);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/iommu.h b/arch/arm/plat-omap/include/plat/iommu.h<br/>index a1d79ee19250..88be3e628b33 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/iommu.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/iommu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/iommu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/iommu.h</a></div><div class='hunk'>@@ -111,6 +111,32 @@ struct iommu_platform_data {</div><div class='ctx'> 	u32 da_end;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct iommu_arch_data - omap iommu private data</div><div class='add'>+ * @name: name of the iommu device</div><div class='add'>+ * @iommu_dev: handle of the iommu device</div><div class='add'>+ *</div><div class='add'>+ * This is an omap iommu private data object, which binds an iommu user</div><div class='add'>+ * to its iommu device. This object should be placed at the iommu user's</div><div class='add'>+ * dev_archdata so generic IOMMU API can be used without having to</div><div class='add'>+ * utilize omap-specific plumbing anymore.</div><div class='add'>+ */</div><div class='add'>+struct omap_iommu_arch_data {</div><div class='add'>+	const char *name;</div><div class='add'>+	struct omap_iommu *iommu_dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_to_omap_iommu() - retrieves an omap iommu object from a user device</div><div class='add'>+ * @dev: iommu client device</div><div class='add'>+ */</div><div class='add'>+static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct omap_iommu_arch_data *arch_data = dev-&gt;archdata.iommu;</div><div class='add'>+</div><div class='add'>+	return arch_data-&gt;iommu_dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* IOMMU errors */</div><div class='ctx'> #define OMAP_IOMMU_ERR_TLB_MISS		(1 &lt;&lt; 0)</div><div class='ctx'> #define OMAP_IOMMU_ERR_TRANS_FAULT	(1 &lt;&lt; 1)</div><div class='hunk'>@@ -163,8 +189,8 @@ extern int omap_iommu_set_isr(const char *name,</div><div class='ctx'> 				    void *priv),</div><div class='ctx'> 			 void *isr_priv);</div><div class='ctx'> </div><div class='del'>-extern void omap_iommu_save_ctx(struct omap_iommu *obj);</div><div class='del'>-extern void omap_iommu_restore_ctx(struct omap_iommu *obj);</div><div class='add'>+extern void omap_iommu_save_ctx(struct device *dev);</div><div class='add'>+extern void omap_iommu_restore_ctx(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> extern int omap_install_iommu_arch(const struct iommu_functions *ops);</div><div class='ctx'> extern void omap_uninstall_iommu_arch(const struct iommu_functions *ops);</div><div class='hunk'>@@ -176,6 +202,5 @@ extern ssize_t</div><div class='ctx'> omap_iommu_dump_ctx(struct omap_iommu *obj, char *buf, ssize_t len);</div><div class='ctx'> extern size_t</div><div class='ctx'> omap_dump_tlb_entries(struct omap_iommu *obj, char *buf, ssize_t len);</div><div class='del'>-struct device *omap_find_iommu_device(const char *name);</div><div class='ctx'> </div><div class='ctx'> #endif /* __MACH_IOMMU_H */</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/iovmm.h b/arch/arm/plat-omap/include/plat/iovmm.h<br/>index 6af1a91c0f36..498e57cda6cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/iovmm.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/iovmm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/iovmm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/iovmm.h</a></div><div class='hunk'>@@ -72,18 +72,18 @@ struct iovm_struct {</div><div class='ctx'> #define IOVMF_DA_FIXED		(1 &lt;&lt; (4 + IOVMF_SW_SHIFT))</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-extern struct iovm_struct *omap_find_iovm_area(struct omap_iommu *obj, u32 da);</div><div class='add'>+extern struct iovm_struct *omap_find_iovm_area(struct device *dev, u32 da);</div><div class='ctx'> extern u32</div><div class='del'>-omap_iommu_vmap(struct iommu_domain *domain, struct omap_iommu *obj, u32 da,</div><div class='add'>+omap_iommu_vmap(struct iommu_domain *domain, struct device *dev, u32 da,</div><div class='ctx'> 			const struct sg_table *sgt, u32 flags);</div><div class='ctx'> extern struct sg_table *omap_iommu_vunmap(struct iommu_domain *domain,</div><div class='del'>-				struct omap_iommu *obj, u32 da);</div><div class='add'>+				struct device *dev, u32 da);</div><div class='ctx'> extern u32</div><div class='del'>-omap_iommu_vmalloc(struct iommu_domain *domain, struct omap_iommu *obj,</div><div class='add'>+omap_iommu_vmalloc(struct iommu_domain *domain, struct device *dev,</div><div class='ctx'> 				u32 da, size_t bytes, u32 flags);</div><div class='ctx'> extern void</div><div class='del'>-omap_iommu_vfree(struct iommu_domain *domain, struct omap_iommu *obj,</div><div class='add'>+omap_iommu_vfree(struct iommu_domain *domain, struct device *dev,</div><div class='ctx'> 				const u32 da);</div><div class='del'>-extern void *omap_da_to_va(struct omap_iommu *obj, u32 da);</div><div class='add'>+extern void *omap_da_to_va(struct device *dev, u32 da);</div><div class='ctx'> </div><div class='ctx'> #endif /* __IOMMU_MMAP_H */</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h<br/>index 30e10719b774..2efd6454bce0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/irqs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/irqs.h</a></div><div class='hunk'>@@ -357,7 +357,7 @@</div><div class='ctx'> #define INT_35XX_EMAC_C0_TX_PULSE_IRQ	69</div><div class='ctx'> #define INT_35XX_EMAC_C0_MISC_PULSE_IRQ	70</div><div class='ctx'> #define INT_35XX_USBOTG_IRQ		71</div><div class='del'>-#define INT_35XX_UART4			84</div><div class='add'>+#define INT_35XX_UART4_IRQ		84</div><div class='ctx'> #define INT_35XX_CCDC_VD0_IRQ		88</div><div class='ctx'> #define INT_35XX_CCDC_VD1_IRQ		92</div><div class='ctx'> #define INT_35XX_CCDC_VD2_IRQ		93</div><div class='hunk'>@@ -436,20 +436,6 @@</div><div class='ctx'> #define INTCPS_NR_MIR_REGS	3</div><div class='ctx'> #define INTCPS_NR_IRQS		96</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-extern void __iomem *omap_irq_base;</div><div class='del'>-void omap1_init_irq(void);</div><div class='del'>-void omap2_init_irq(void);</div><div class='del'>-void omap3_init_irq(void);</div><div class='del'>-void ti816x_init_irq(void);</div><div class='del'>-extern int omap_irq_pending(void);</div><div class='del'>-void omap_intc_save_context(void);</div><div class='del'>-void omap_intc_restore_context(void);</div><div class='del'>-void omap3_intc_suspend(void);</div><div class='del'>-void omap3_intc_prepare_idle(void);</div><div class='del'>-void omap3_intc_resume_idle(void);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FIQ</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h<br/>index 94cf70afb236..f75946c3293d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/mmc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/mmc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/mmc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/mmc.h</a></div><div class='hunk'>@@ -96,6 +96,7 @@ struct omap_mmc_platform_data {</div><div class='ctx'> 		 */</div><div class='ctx'> 		u8  wires;	/* Used for the MMC driver on omap1 and 2420 */</div><div class='ctx'> 		u32 caps;	/* Used for the MMC driver on 2430 and later */</div><div class='add'>+		u32 pm_caps;	/* PM capabilities of the mmc */</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * nomux means "standard" muxing is wrong on this board, and</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/omap-secure.h b/arch/arm/plat-omap/include/plat/omap-secure.h<br/>new file mode 100644<br/>index 000000000000..64f9d1c7f1bb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/omap-secure.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/omap-secure.h</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+#ifndef __OMAP_SECURE_H__</div><div class='add'>+#define __OMAP_SECURE_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP2PLUS</div><div class='add'>+extern int omap_secure_ram_reserve_memblock(void);</div><div class='add'>+#else</div><div class='add'>+static inline void omap_secure_ram_reserve_memblock(void)</div><div class='add'>+{ }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __OMAP_SECURE_H__ */</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h<br/>index 2682043f5a5b..9ff444469f3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/omap-serial.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/omap-serial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/omap-serial.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/omap-serial.h</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pm_qos.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/mux.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -33,6 +34,8 @@</div><div class='ctx'> </div><div class='ctx'> #define OMAP_MODE13X_SPEED	230400</div><div class='ctx'> </div><div class='add'>+#define OMAP_UART_SCR_TX_EMPTY	0x08</div><div class='add'>+</div><div class='ctx'> /* WER = 0x7F</div><div class='ctx'>  * Enable module level wakeup in WER reg</div><div class='ctx'>  */</div><div class='hunk'>@@ -51,18 +54,27 @@</div><div class='ctx'> </div><div class='ctx'> #define OMAP_UART_DMA_CH_FREE	-1</div><div class='ctx'> </div><div class='del'>-#define RX_TIMEOUT		(3 * HZ)</div><div class='ctx'> #define OMAP_MAX_HSUART_PORTS	4</div><div class='ctx'> </div><div class='ctx'> #define MSR_SAVE_FLAGS		UART_MSR_ANY_DELTA</div><div class='ctx'> </div><div class='add'>+#define UART_ERRATA_i202_MDR1_ACCESS	BIT(0)</div><div class='add'>+#define UART_ERRATA_i291_DMA_FORCEIDLE	BIT(1)</div><div class='add'>+</div><div class='ctx'> struct omap_uart_port_info {</div><div class='ctx'> 	bool			dma_enabled;	/* To specify DMA Mode */</div><div class='ctx'> 	unsigned int		uartclk;	/* UART clock rate */</div><div class='del'>-	void __iomem		*membase;	/* ioremap cookie or NULL */</div><div class='del'>-	resource_size_t		mapbase;	/* resource base */</div><div class='del'>-	unsigned long		irqflags;	/* request_irq flags */</div><div class='ctx'> 	upf_t			flags;		/* UPF_* flags */</div><div class='add'>+	u32			errata;</div><div class='add'>+	unsigned int		dma_rx_buf_size;</div><div class='add'>+	unsigned int		dma_rx_timeout;</div><div class='add'>+	unsigned int		autosuspend_timeout;</div><div class='add'>+	unsigned int		dma_rx_poll_rate;</div><div class='add'>+</div><div class='add'>+	int (*get_context_loss_count)(struct device *);</div><div class='add'>+	void (*set_forceidle)(struct platform_device *);</div><div class='add'>+	void (*set_noidle)(struct platform_device *);</div><div class='add'>+	void (*enable_wakeup)(struct platform_device *, bool);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct uart_omap_dma {</div><div class='hunk'>@@ -86,8 +98,9 @@ struct uart_omap_dma {</div><div class='ctx'> 	spinlock_t		rx_lock;</div><div class='ctx'> 	/* timer to poll activity on rx dma */</div><div class='ctx'> 	struct timer_list	rx_timer;</div><div class='del'>-	int			rx_buf_size;</div><div class='del'>-	int			rx_timeout;</div><div class='add'>+	unsigned int		rx_buf_size;</div><div class='add'>+	unsigned int		rx_poll_rate;</div><div class='add'>+	unsigned int		rx_timeout;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct uart_omap_port {</div><div class='hunk'>@@ -100,6 +113,10 @@ struct uart_omap_port {</div><div class='ctx'> 	unsigned char		mcr;</div><div class='ctx'> 	unsigned char		fcr;</div><div class='ctx'> 	unsigned char		efr;</div><div class='add'>+	unsigned char		dll;</div><div class='add'>+	unsigned char		dlh;</div><div class='add'>+	unsigned char		mdr1;</div><div class='add'>+	unsigned char		scr;</div><div class='ctx'> </div><div class='ctx'> 	int			use_dma;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -111,6 +128,14 @@ struct uart_omap_port {</div><div class='ctx'> 	unsigned char		msr_saved_flags;</div><div class='ctx'> 	char			name[20];</div><div class='ctx'> 	unsigned long		port_activity;</div><div class='add'>+	u32			context_loss_cnt;</div><div class='add'>+	u32			errata;</div><div class='add'>+	u8			wakeups_enabled;</div><div class='add'>+</div><div class='add'>+	struct pm_qos_request	pm_qos_request;</div><div class='add'>+	u32			latency;</div><div class='add'>+	u32			calc_latency;</div><div class='add'>+	struct work_struct	qos_work;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* __OMAP_SERIAL_H__ */</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/omap34xx.h b/arch/arm/plat-omap/include/plat/omap34xx.h<br/>index b9e85886b9d6..0d818acf3917 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/omap34xx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/omap34xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/omap34xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/omap34xx.h</a></div><div class='hunk'>@@ -35,6 +35,8 @@</div><div class='ctx'> #define L4_EMU_34XX_BASE	0x54000000</div><div class='ctx'> #define L3_34XX_BASE		0x68000000</div><div class='ctx'> </div><div class='add'>+#define L4_WK_AM33XX_BASE	0x44C00000</div><div class='add'>+</div><div class='ctx'> #define OMAP3430_32KSYNCT_BASE	0x48320000</div><div class='ctx'> #define OMAP3430_CM_BASE	0x48004800</div><div class='ctx'> #define OMAP3430_PRM_BASE	0x48306800</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/omap44xx.h b/arch/arm/plat-omap/include/plat/omap44xx.h<br/>index ea2b8a6306e7..c0d478e55c84 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/omap44xx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/omap44xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/omap44xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/omap44xx.h</a></div><div class='hunk'>@@ -45,6 +45,7 @@</div><div class='ctx'> #define OMAP44XX_WKUPGEN_BASE		0x48281000</div><div class='ctx'> #define OMAP44XX_MCPDM_BASE		0x40132000</div><div class='ctx'> #define OMAP44XX_MCPDM_L3_BASE		0x49032000</div><div class='add'>+#define OMAP44XX_SAR_RAM_BASE		0x4a326000</div><div class='ctx'> </div><div class='ctx'> #define OMAP44XX_MAILBOX_BASE		(L4_44XX_BASE + 0xF4000)</div><div class='ctx'> #define OMAP44XX_HSUSB_OTG_BASE		(L4_44XX_BASE + 0xAB000)</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h<br/>index 8b372ede17c1..647010109afa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/omap_hwmod.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/omap_hwmod.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/omap_hwmod.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/omap_hwmod.h</a></div><div class='hunk'>@@ -97,6 +97,7 @@ struct omap_hwmod_mux_info {</div><div class='ctx'> 	struct omap_device_pad		*pads;</div><div class='ctx'> 	int				nr_pads_dynamic;</div><div class='ctx'> 	struct omap_device_pad		**pads_dynamic;</div><div class='add'>+	int				*irqs;</div><div class='ctx'> 	bool				enabled;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -416,10 +417,13 @@ struct omap_hwmod_omap4_prcm {</div><div class='ctx'>  * _HWMOD_NO_MPU_PORT: no path exists for the MPU to write to this module</div><div class='ctx'>  * _HWMOD_WAKEUP_ENABLED: set when the omap_hwmod code has enabled ENAWAKEUP</div><div class='ctx'>  * _HWMOD_SYSCONFIG_LOADED: set when the OCP_SYSCONFIG value has been cached</div><div class='add'>+ * _HWMOD_SKIP_ENABLE: set if hwmod enabled during init (HWMOD_INIT_NO_IDLE) -</div><div class='add'>+ *     causes the first call to _enable() to only update the pinmux</div><div class='ctx'>  */</div><div class='ctx'> #define _HWMOD_NO_MPU_PORT			(1 &lt;&lt; 0)</div><div class='ctx'> #define _HWMOD_WAKEUP_ENABLED			(1 &lt;&lt; 1)</div><div class='ctx'> #define _HWMOD_SYSCONFIG_LOADED			(1 &lt;&lt; 2)</div><div class='add'>+#define _HWMOD_SKIP_ENABLE			(1 &lt;&lt; 3)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * omap_hwmod._state definitions</div><div class='hunk'>@@ -604,6 +608,8 @@ int omap_hwmod_get_context_loss_count(struct omap_hwmod *oh);</div><div class='ctx'> </div><div class='ctx'> int omap_hwmod_no_setup_reset(struct omap_hwmod *oh);</div><div class='ctx'> </div><div class='add'>+int omap_hwmod_pad_route_irq(struct omap_hwmod *oh, int pad_idx, int irq_idx);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Chip variant-specific hwmod init routines - XXX should be converted</div><div class='ctx'>  * to use initcalls once the initial boot ordering is straightened out</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/serial.h b/arch/arm/plat-omap/include/plat/serial.h<br/>index 1ab9fd6abe6d..198d1e6a4a6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/serial.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/serial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/serial.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/serial.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  * arch/arm/plat-omap/include/mach/serial.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2009 Texas Instruments</div><div class='del'>- * Addded OMAP4 support- Santosh Shilimkar &lt;santosh.shilimkar@ti.com&gt;</div><div class='add'>+ * Added OMAP4 support- Santosh Shilimkar &lt;santosh.shilimkar@ti.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This program is distributed in the hope that it will be useful,</div><div class='ctx'>  * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='hunk'>@@ -44,6 +44,7 @@</div><div class='ctx'> #define OMAP3_UART2_BASE	OMAP2_UART2_BASE</div><div class='ctx'> #define OMAP3_UART3_BASE	0x49020000</div><div class='ctx'> #define OMAP3_UART4_BASE	0x49042000	/* Only on 36xx */</div><div class='add'>+#define OMAP3_UART4_AM35XX_BASE	0x4809E000	/* Only on AM35xx */</div><div class='ctx'> </div><div class='ctx'> /* OMAP4 serial ports */</div><div class='ctx'> #define OMAP4_UART1_BASE	OMAP2_UART1_BASE</div><div class='hunk'>@@ -51,10 +52,10 @@</div><div class='ctx'> #define OMAP4_UART3_BASE	0x48020000</div><div class='ctx'> #define OMAP4_UART4_BASE	0x4806e000</div><div class='ctx'> </div><div class='del'>-/* TI816X serial ports */</div><div class='del'>-#define TI816X_UART1_BASE	0x48020000</div><div class='del'>-#define TI816X_UART2_BASE	0x48022000</div><div class='del'>-#define TI816X_UART3_BASE	0x48024000</div><div class='add'>+/* TI81XX serial ports */</div><div class='add'>+#define TI81XX_UART1_BASE	0x48020000</div><div class='add'>+#define TI81XX_UART2_BASE	0x48022000</div><div class='add'>+#define TI81XX_UART3_BASE	0x48024000</div><div class='ctx'> </div><div class='ctx'> /* AM3505/3517 UART4 */</div><div class='ctx'> #define AM35XX_UART4_BASE	0x4809E000	/* Only on AM3505/3517 */</div><div class='hunk'>@@ -89,9 +90,9 @@</div><div class='ctx'> #define OMAP4UART2		OMAP2UART2</div><div class='ctx'> #define OMAP4UART3		43</div><div class='ctx'> #define OMAP4UART4		44</div><div class='del'>-#define TI816XUART1		81</div><div class='del'>-#define TI816XUART2		82</div><div class='del'>-#define TI816XUART3		83</div><div class='add'>+#define TI81XXUART1		81</div><div class='add'>+#define TI81XXUART2		82</div><div class='add'>+#define TI81XXUART3		83</div><div class='ctx'> #define ZOOM_UART		95		/* Only on zoom2/3 */</div><div class='ctx'> </div><div class='ctx'> /* This is only used by 8250.c for omap1510 */</div><div class='hunk'>@@ -106,15 +107,13 @@</div><div class='ctx'> #ifndef __ASSEMBLER__</div><div class='ctx'> </div><div class='ctx'> struct omap_board_data;</div><div class='add'>+struct omap_uart_port_info;</div><div class='ctx'> </div><div class='ctx'> extern void omap_serial_init(void);</div><div class='del'>-extern void omap_serial_init_port(struct omap_board_data *bdata);</div><div class='ctx'> extern int omap_uart_can_sleep(void);</div><div class='del'>-extern void omap_uart_check_wakeup(void);</div><div class='del'>-extern void omap_uart_prepare_suspend(void);</div><div class='del'>-extern void omap_uart_prepare_idle(int num);</div><div class='del'>-extern void omap_uart_resume_idle(int num);</div><div class='del'>-extern void omap_uart_enable_irqs(int enable);</div><div class='add'>+extern void omap_serial_board_init(struct omap_uart_port_info *platform_data);</div><div class='add'>+extern void omap_serial_init_port(struct omap_board_data *bdata,</div><div class='add'>+		struct omap_uart_port_info *platform_data);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/sram.h b/arch/arm/plat-omap/include/plat/sram.h<br/>index f500fc34d065..75aa1b2bef51 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/sram.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/sram.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/sram.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/sram.h</a></div><div class='hunk'>@@ -95,6 +95,10 @@ static inline void omap_push_sram_idle(void) {}</div><div class='ctx'>  */</div><div class='ctx'> #define OMAP2_SRAM_PA		0x40200000</div><div class='ctx'> #define OMAP3_SRAM_PA           0x40200000</div><div class='add'>+#ifdef CONFIG_OMAP4_ERRATA_I688</div><div class='add'>+#define OMAP4_SRAM_PA		0x40304000</div><div class='add'>+#define OMAP4_SRAM_VA		0xfe404000</div><div class='add'>+#else</div><div class='ctx'> #define OMAP4_SRAM_PA		0x40300000</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/system.h b/arch/arm/plat-omap/include/plat/system.h<br/>index c5fa9e929009..8e5ebd74b129 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/system.h</a></div><div class='hunk'>@@ -12,6 +12,4 @@ static inline void arch_idle(void)</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void (*arch_reset)(char, const char *);</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/ti816x.h b/arch/arm/plat-omap/include/plat/ti81xx.h<br/>index 50510f5dda1e..8f9843f78422 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/ti816x.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/ti816x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/ti81xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/ti81xx.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * This file contains the address data for various TI816X modules.</div><div class='add'>+ * This file contains the address data for various TI81XX modules.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2010 Texas Instruments, Inc. - http://www.ti.com/</div><div class='ctx'>  *</div><div class='hunk'>@@ -13,15 +13,15 @@</div><div class='ctx'>  * GNU General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifndef __ASM_ARCH_TI816X_H</div><div class='del'>-#define __ASM_ARCH_TI816X_H</div><div class='add'>+#ifndef __ASM_ARCH_TI81XX_H</div><div class='add'>+#define __ASM_ARCH_TI81XX_H</div><div class='ctx'> </div><div class='del'>-#define L4_SLOW_TI816X_BASE	0x48000000</div><div class='add'>+#define L4_SLOW_TI81XX_BASE	0x48000000</div><div class='ctx'> </div><div class='del'>-#define TI816X_SCM_BASE		0x48140000</div><div class='del'>-#define TI816X_CTRL_BASE	TI816X_SCM_BASE</div><div class='del'>-#define TI816X_PRCM_BASE	0x48180000</div><div class='add'>+#define TI81XX_SCM_BASE		0x48140000</div><div class='add'>+#define TI81XX_CTRL_BASE	TI81XX_SCM_BASE</div><div class='add'>+#define TI81XX_PRCM_BASE	0x48180000</div><div class='ctx'> </div><div class='del'>-#define TI816X_ARM_INTC_BASE	0x48200000</div><div class='add'>+#define TI81XX_ARM_INTC_BASE	0x48200000</div><div class='ctx'> </div><div class='del'>-#endif /* __ASM_ARCH_TI816X_H */</div><div class='add'>+#endif /* __ASM_ARCH_TI81XX_H */</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/uncompress.h b/arch/arm/plat-omap/include/plat/uncompress.h<br/>index 2f472e989ec6..6ee90495ca4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/uncompress.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/uncompress.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/uncompress.h</a></div><div class='hunk'>@@ -99,9 +99,9 @@ static inline void flush(void)</div><div class='ctx'> #define DEBUG_LL_ZOOM(mach)						\</div><div class='ctx'> 	_DEBUG_LL_ENTRY(mach, ZOOM_UART_BASE, ZOOM_PORT_SHIFT, ZOOM_UART)</div><div class='ctx'> </div><div class='del'>-#define DEBUG_LL_TI816X(p, mach)					\</div><div class='del'>-	_DEBUG_LL_ENTRY(mach, TI816X_UART##p##_BASE, OMAP_PORT_SHIFT,	\</div><div class='del'>-		TI816XUART##p)</div><div class='add'>+#define DEBUG_LL_TI81XX(p, mach)					\</div><div class='add'>+	_DEBUG_LL_ENTRY(mach, TI81XX_UART##p##_BASE, OMAP_PORT_SHIFT,	\</div><div class='add'>+		TI81XXUART##p)</div><div class='ctx'> </div><div class='ctx'> static inline void __arch_decomp_setup(unsigned long arch_id)</div><div class='ctx'> {</div><div class='hunk'>@@ -177,7 +177,10 @@ static inline void __arch_decomp_setup(unsigned long arch_id)</div><div class='ctx'> 		DEBUG_LL_ZOOM(omap_zoom3);</div><div class='ctx'> </div><div class='ctx'> 		/* TI8168 base boards using UART3 */</div><div class='del'>-		DEBUG_LL_TI816X(3, ti8168evm);</div><div class='add'>+		DEBUG_LL_TI81XX(3, ti8168evm);</div><div class='add'>+</div><div class='add'>+		/* TI8148 base boards using UART1 */</div><div class='add'>+		DEBUG_LL_TI81XX(1, ti8148evm);</div><div class='ctx'> </div><div class='ctx'> 	} while (0);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h<br/>index 17d3c939775c..dc864b580da0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/usb.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/include/plat/usb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/include/plat/usb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/include/plat/usb.h</a></div><div class='hunk'>@@ -100,9 +100,6 @@ extern void usb_musb_init(struct omap_musb_board_data *board_data);</div><div class='ctx'> </div><div class='ctx'> extern void usbhs_init(const struct usbhs_omap_board_data *pdata);</div><div class='ctx'> </div><div class='del'>-extern int omap_usbhs_enable(struct device *dev);</div><div class='del'>-extern void omap_usbhs_disable(struct device *dev);</div><div class='del'>-</div><div class='ctx'> extern int omap4430_phy_power(struct device *dev, int ID, int on);</div><div class='ctx'> extern int omap4430_phy_set_clk(struct device *dev, int on);</div><div class='ctx'> extern int omap4430_phy_init(struct device *dev);</div><div class='hunk'>@@ -114,6 +111,7 @@ extern void am35x_musb_reset(void);</div><div class='ctx'> extern void am35x_musb_phy_power(u8 on);</div><div class='ctx'> extern void am35x_musb_clear_irq(void);</div><div class='ctx'> extern void am35x_set_mode(u8 musb_mode);</div><div class='add'>+extern void ti81xx_musb_phy_power(u8 on);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * FIXME correct answer depends on hmc_mode,</div><div class='hunk'>@@ -273,6 +271,37 @@ static inline void omap2_usbfs_init(struct omap_usb_config *pdata)</div><div class='ctx'> #define CONF2_OTGPWRDN		(1 &lt;&lt; 2)</div><div class='ctx'> #define CONF2_DATPOL		(1 &lt;&lt; 1)</div><div class='ctx'> </div><div class='add'>+/* TI81XX specific definitions */</div><div class='add'>+#define USBCTRL0	0x620</div><div class='add'>+#define USBSTAT0	0x624</div><div class='add'>+</div><div class='add'>+/* TI816X PHY controls bits */</div><div class='add'>+#define TI816X_USBPHY0_NORMAL_MODE	(1 &lt;&lt; 0)</div><div class='add'>+#define TI816X_USBPHY_REFCLK_OSC	(1 &lt;&lt; 8)</div><div class='add'>+</div><div class='add'>+/* TI814X PHY controls bits */</div><div class='add'>+#define USBPHY_CM_PWRDN		(1 &lt;&lt; 0)</div><div class='add'>+#define USBPHY_OTG_PWRDN	(1 &lt;&lt; 1)</div><div class='add'>+#define USBPHY_CHGDET_DIS	(1 &lt;&lt; 2)</div><div class='add'>+#define USBPHY_CHGDET_RSTRT	(1 &lt;&lt; 3)</div><div class='add'>+#define USBPHY_SRCONDM		(1 &lt;&lt; 4)</div><div class='add'>+#define USBPHY_SINKONDP		(1 &lt;&lt; 5)</div><div class='add'>+#define USBPHY_CHGISINK_EN	(1 &lt;&lt; 6)</div><div class='add'>+#define USBPHY_CHGVSRC_EN	(1 &lt;&lt; 7)</div><div class='add'>+#define USBPHY_DMPULLUP		(1 &lt;&lt; 8)</div><div class='add'>+#define USBPHY_DPPULLUP		(1 &lt;&lt; 9)</div><div class='add'>+#define USBPHY_CDET_EXTCTL	(1 &lt;&lt; 10)</div><div class='add'>+#define USBPHY_GPIO_MODE	(1 &lt;&lt; 12)</div><div class='add'>+#define USBPHY_DPOPBUFCTL	(1 &lt;&lt; 13)</div><div class='add'>+#define USBPHY_DMOPBUFCTL	(1 &lt;&lt; 14)</div><div class='add'>+#define USBPHY_DPINPUT		(1 &lt;&lt; 15)</div><div class='add'>+#define USBPHY_DMINPUT		(1 &lt;&lt; 16)</div><div class='add'>+#define USBPHY_DPGPIO_PD	(1 &lt;&lt; 17)</div><div class='add'>+#define USBPHY_DMGPIO_PD	(1 &lt;&lt; 18)</div><div class='add'>+#define USBPHY_OTGVDET_EN	(1 &lt;&lt; 19)</div><div class='add'>+#define USBPHY_OTGSESSEND_EN	(1 &lt;&lt; 20)</div><div class='add'>+#define USBPHY_DATA_POLARITY	(1 &lt;&lt; 23)</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_ARCH_OMAP1) &amp;&amp; defined(CONFIG_USB)</div><div class='ctx'> u32 omap1_usb0_init(unsigned nwires, unsigned is_device);</div><div class='ctx'> u32 omap1_usb1_init(unsigned nwires);</div><div class='head'>diff --git a/arch/arm/plat-omap/io.c b/arch/arm/plat-omap/io.c<br/>deleted file mode 100644<br/>index 333871f59995..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/io.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/io.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,159 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Common io.c file</div><div class='del'>- * This file is created by Russell King &lt;rmk+kernel@arm.linux.org.uk&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 Texas Instruments</div><div class='del'>- * Added OMAP4 support - Santosh Shilimkar &lt;santosh.shilimkar@ti.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'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/omap7xx.h&gt;</div><div class='del'>-#include &lt;plat/omap1510.h&gt;</div><div class='del'>-#include &lt;plat/omap16xx.h&gt;</div><div class='del'>-#include &lt;plat/omap24xx.h&gt;</div><div class='del'>-#include &lt;plat/omap34xx.h&gt;</div><div class='del'>-#include &lt;plat/omap44xx.h&gt;</div><div class='del'>-</div><div class='del'>-#define BETWEEN(p,st,sz)	((p) &gt;= (st) &amp;&amp; (p) &lt; ((st) + (sz)))</div><div class='del'>-#define XLATE(p,pst,vst)	((void __iomem *)((p) - (pst) + (vst)))</div><div class='del'>-</div><div class='del'>-static int initialized;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Intercept ioremap() requests for addresses in our fixed mapping regions.</div><div class='del'>- */</div><div class='del'>-void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	WARN(!initialized, "Do not use ioremap before init_early\n");</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_OMAP1</div><div class='del'>-	if (cpu_class_is_omap1()) {</div><div class='del'>-		if (BETWEEN(p, OMAP1_IO_PHYS, OMAP1_IO_SIZE))</div><div class='del'>-			return XLATE(p, OMAP1_IO_PHYS, OMAP1_IO_VIRT);</div><div class='del'>-	}</div><div class='del'>-	if (cpu_is_omap7xx()) {</div><div class='del'>-		if (BETWEEN(p, OMAP7XX_DSP_BASE, OMAP7XX_DSP_SIZE))</div><div class='del'>-			return XLATE(p, OMAP7XX_DSP_BASE, OMAP7XX_DSP_START);</div><div class='del'>-</div><div class='del'>-		if (BETWEEN(p, OMAP7XX_DSPREG_BASE, OMAP7XX_DSPREG_SIZE))</div><div class='del'>-			return XLATE(p, OMAP7XX_DSPREG_BASE,</div><div class='del'>-					OMAP7XX_DSPREG_START);</div><div class='del'>-	}</div><div class='del'>-	if (cpu_is_omap15xx()) {</div><div class='del'>-		if (BETWEEN(p, OMAP1510_DSP_BASE, OMAP1510_DSP_SIZE))</div><div class='del'>-			return XLATE(p, OMAP1510_DSP_BASE, OMAP1510_DSP_START);</div><div class='del'>-</div><div class='del'>-		if (BETWEEN(p, OMAP1510_DSPREG_BASE, OMAP1510_DSPREG_SIZE))</div><div class='del'>-			return XLATE(p, OMAP1510_DSPREG_BASE,</div><div class='del'>-					OMAP1510_DSPREG_START);</div><div class='del'>-	}</div><div class='del'>-	if (cpu_is_omap16xx()) {</div><div class='del'>-		if (BETWEEN(p, OMAP16XX_DSP_BASE, OMAP16XX_DSP_SIZE))</div><div class='del'>-			return XLATE(p, OMAP16XX_DSP_BASE, OMAP16XX_DSP_START);</div><div class='del'>-</div><div class='del'>-		if (BETWEEN(p, OMAP16XX_DSPREG_BASE, OMAP16XX_DSPREG_SIZE))</div><div class='del'>-			return XLATE(p, OMAP16XX_DSPREG_BASE,</div><div class='del'>-					OMAP16XX_DSPREG_START);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_ARCH_OMAP2</div><div class='del'>-	if (cpu_is_omap24xx()) {</div><div class='del'>-		if (BETWEEN(p, L3_24XX_PHYS, L3_24XX_SIZE))</div><div class='del'>-			return XLATE(p, L3_24XX_PHYS, L3_24XX_VIRT);</div><div class='del'>-		if (BETWEEN(p, L4_24XX_PHYS, L4_24XX_SIZE))</div><div class='del'>-			return XLATE(p, L4_24XX_PHYS, L4_24XX_VIRT);</div><div class='del'>-	}</div><div class='del'>-	if (cpu_is_omap2420()) {</div><div class='del'>-		if (BETWEEN(p, DSP_MEM_2420_PHYS, DSP_MEM_2420_SIZE))</div><div class='del'>-			return XLATE(p, DSP_MEM_2420_PHYS, DSP_MEM_2420_VIRT);</div><div class='del'>-		if (BETWEEN(p, DSP_IPI_2420_PHYS, DSP_IPI_2420_SIZE))</div><div class='del'>-			return XLATE(p, DSP_IPI_2420_PHYS, DSP_IPI_2420_SIZE);</div><div class='del'>-		if (BETWEEN(p, DSP_MMU_2420_PHYS, DSP_MMU_2420_SIZE))</div><div class='del'>-			return XLATE(p, DSP_MMU_2420_PHYS, DSP_MMU_2420_VIRT);</div><div class='del'>-	}</div><div class='del'>-	if (cpu_is_omap2430()) {</div><div class='del'>-		if (BETWEEN(p, L4_WK_243X_PHYS, L4_WK_243X_SIZE))</div><div class='del'>-			return XLATE(p, L4_WK_243X_PHYS, L4_WK_243X_VIRT);</div><div class='del'>-		if (BETWEEN(p, OMAP243X_GPMC_PHYS, OMAP243X_GPMC_SIZE))</div><div class='del'>-			return XLATE(p, OMAP243X_GPMC_PHYS, OMAP243X_GPMC_VIRT);</div><div class='del'>-		if (BETWEEN(p, OMAP243X_SDRC_PHYS, OMAP243X_SDRC_SIZE))</div><div class='del'>-			return XLATE(p, OMAP243X_SDRC_PHYS, OMAP243X_SDRC_VIRT);</div><div class='del'>-		if (BETWEEN(p, OMAP243X_SMS_PHYS, OMAP243X_SMS_SIZE))</div><div class='del'>-			return XLATE(p, OMAP243X_SMS_PHYS, OMAP243X_SMS_VIRT);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_ARCH_OMAP3</div><div class='del'>-	if (cpu_is_ti816x()) {</div><div class='del'>-		if (BETWEEN(p, L4_34XX_PHYS, L4_34XX_SIZE))</div><div class='del'>-			return XLATE(p, L4_34XX_PHYS, L4_34XX_VIRT);</div><div class='del'>-	} else if (cpu_is_omap34xx()) {</div><div class='del'>-		if (BETWEEN(p, L3_34XX_PHYS, L3_34XX_SIZE))</div><div class='del'>-			return XLATE(p, L3_34XX_PHYS, L3_34XX_VIRT);</div><div class='del'>-		if (BETWEEN(p, L4_34XX_PHYS, L4_34XX_SIZE))</div><div class='del'>-			return XLATE(p, L4_34XX_PHYS, L4_34XX_VIRT);</div><div class='del'>-		if (BETWEEN(p, OMAP34XX_GPMC_PHYS, OMAP34XX_GPMC_SIZE))</div><div class='del'>-			return XLATE(p, OMAP34XX_GPMC_PHYS, OMAP34XX_GPMC_VIRT);</div><div class='del'>-		if (BETWEEN(p, OMAP343X_SMS_PHYS, OMAP343X_SMS_SIZE))</div><div class='del'>-			return XLATE(p, OMAP343X_SMS_PHYS, OMAP343X_SMS_VIRT);</div><div class='del'>-		if (BETWEEN(p, OMAP343X_SDRC_PHYS, OMAP343X_SDRC_SIZE))</div><div class='del'>-			return XLATE(p, OMAP343X_SDRC_PHYS, OMAP343X_SDRC_VIRT);</div><div class='del'>-		if (BETWEEN(p, L4_PER_34XX_PHYS, L4_PER_34XX_SIZE))</div><div class='del'>-			return XLATE(p, L4_PER_34XX_PHYS, L4_PER_34XX_VIRT);</div><div class='del'>-		if (BETWEEN(p, L4_EMU_34XX_PHYS, L4_EMU_34XX_SIZE))</div><div class='del'>-			return XLATE(p, L4_EMU_34XX_PHYS, L4_EMU_34XX_VIRT);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_ARCH_OMAP4</div><div class='del'>-	if (cpu_is_omap44xx()) {</div><div class='del'>-		if (BETWEEN(p, L3_44XX_PHYS, L3_44XX_SIZE))</div><div class='del'>-			return XLATE(p, L3_44XX_PHYS, L3_44XX_VIRT);</div><div class='del'>-		if (BETWEEN(p, L4_44XX_PHYS, L4_44XX_SIZE))</div><div class='del'>-			return XLATE(p, L4_44XX_PHYS, L4_44XX_VIRT);</div><div class='del'>-		if (BETWEEN(p, OMAP44XX_GPMC_PHYS, OMAP44XX_GPMC_SIZE))</div><div class='del'>-			return XLATE(p, OMAP44XX_GPMC_PHYS, OMAP44XX_GPMC_VIRT);</div><div class='del'>-		if (BETWEEN(p, OMAP44XX_EMIF1_PHYS, OMAP44XX_EMIF1_SIZE))</div><div class='del'>-			return XLATE(p, OMAP44XX_EMIF1_PHYS,		\</div><div class='del'>-							OMAP44XX_EMIF1_VIRT);</div><div class='del'>-		if (BETWEEN(p, OMAP44XX_EMIF2_PHYS, OMAP44XX_EMIF2_SIZE))</div><div class='del'>-			return XLATE(p, OMAP44XX_EMIF2_PHYS,		\</div><div class='del'>-							OMAP44XX_EMIF2_VIRT);</div><div class='del'>-		if (BETWEEN(p, OMAP44XX_DMM_PHYS, OMAP44XX_DMM_SIZE))</div><div class='del'>-			return XLATE(p, OMAP44XX_DMM_PHYS, OMAP44XX_DMM_VIRT);</div><div class='del'>-		if (BETWEEN(p, L4_PER_44XX_PHYS, L4_PER_44XX_SIZE))</div><div class='del'>-			return XLATE(p, L4_PER_44XX_PHYS, L4_PER_44XX_VIRT);</div><div class='del'>-		if (BETWEEN(p, L4_EMU_44XX_PHYS, L4_EMU_44XX_SIZE))</div><div class='del'>-			return XLATE(p, L4_EMU_44XX_PHYS, L4_EMU_44XX_VIRT);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return __arm_ioremap_caller(p, size, type, __builtin_return_address(0));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(omap_ioremap);</div><div class='del'>-</div><div class='del'>-void omap_iounmap(volatile void __iomem *addr)</div><div class='del'>-{</div><div class='del'>-	unsigned long virt = (unsigned long)addr;</div><div class='del'>-</div><div class='del'>-	if (virt &gt;= VMALLOC_START &amp;&amp; virt &lt; VMALLOC_END)</div><div class='del'>-		__iounmap(addr);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(omap_iounmap);</div><div class='del'>-</div><div class='del'>-void __init omap_init_consistent_dma_size(void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE</div><div class='del'>-	init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE &lt;&lt; 20);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init omap_ioremap_init(void)</div><div class='del'>-{</div><div class='del'>-	initialized++;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c<br/>index 8b28664d1c62..4243bdcc87bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/sram.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-omap/sram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/sram.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-omap/sram.c</a></div><div class='hunk'>@@ -40,7 +40,11 @@</div><div class='ctx'> #define OMAP1_SRAM_PA		0x20000000</div><div class='ctx'> #define OMAP2_SRAM_PUB_PA	(OMAP2_SRAM_PA + 0xf800)</div><div class='ctx'> #define OMAP3_SRAM_PUB_PA       (OMAP3_SRAM_PA + 0x8000)</div><div class='add'>+#ifdef CONFIG_OMAP4_ERRATA_I688</div><div class='add'>+#define OMAP4_SRAM_PUB_PA	OMAP4_SRAM_PA</div><div class='add'>+#else</div><div class='ctx'> #define OMAP4_SRAM_PUB_PA	(OMAP4_SRAM_PA + 0x4000)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_ARCH_OMAP2PLUS)</div><div class='ctx'> #define SRAM_BOOTLOADER_SZ	0x00</div><div class='hunk'>@@ -141,11 +145,9 @@ static void __init omap_detect_sram(void)</div><div class='ctx'> 			omap_sram_size = 0x32000;	/* 200K */</div><div class='ctx'> 		else if (cpu_is_omap15xx())</div><div class='ctx'> 			omap_sram_size = 0x30000;	/* 192K */</div><div class='del'>-		else if (cpu_is_omap1610() || cpu_is_omap1621() ||</div><div class='del'>-		     cpu_is_omap1710())</div><div class='add'>+		else if (cpu_is_omap1610() || cpu_is_omap1611() ||</div><div class='add'>+				cpu_is_omap1621() || cpu_is_omap1710())</div><div class='ctx'> 			omap_sram_size = 0x4000;	/* 16K */</div><div class='del'>-		else if (cpu_is_omap1611())</div><div class='del'>-			omap_sram_size = SZ_256K;</div><div class='ctx'> 		else {</div><div class='ctx'> 			pr_err("Could not detect SRAM size\n");</div><div class='ctx'> 			omap_sram_size = 0x4000;</div><div class='hunk'>@@ -163,6 +165,10 @@ static void __init omap_map_sram(void)</div><div class='ctx'> 	if (omap_sram_size == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_OMAP4_ERRATA_I688</div><div class='add'>+		omap_sram_start += PAGE_SIZE;</div><div class='add'>+		omap_sram_size -= SZ_16K;</div><div class='add'>+#endif</div><div class='ctx'> 	if (cpu_is_omap34xx()) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * SRAM must be marked as non-cached on OMAP3 since the</div><div class='hunk'>@@ -224,6 +230,9 @@ static void (*_omap_sram_reprogram_clock)(u32 dpllctl, u32 ckctl);</div><div class='ctx'> void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(!_omap_sram_reprogram_clock);</div><div class='add'>+	/* On 730, bit 13 must always be 1 */</div><div class='add'>+	if (cpu_is_omap7xx())</div><div class='add'>+		ckctl |= 0x2000;</div><div class='ctx'> 	_omap_sram_reprogram_clock(dpllctl, ckctl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile<br/>index 95a5fc53b6db..c20ce0f5ce33 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-orion/Makefile</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> # Makefile for the linux kernel.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-y	:= irq.o pcie.o time.o common.o mpp.o</div><div class='add'>+obj-y	:= irq.o pcie.o time.o common.o mpp.o addr-map.o</div><div class='ctx'> obj-m	:=</div><div class='ctx'> obj-n	:=</div><div class='ctx'> obj-	:=</div><div class='head'>diff --git a/arch/arm/plat-orion/addr-map.c b/arch/arm/plat-orion/addr-map.c<br/>new file mode 100644<br/>index 000000000000..367ca89ac403<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/addr-map.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-orion/addr-map.c</a></div><div class='hunk'>@@ -0,0 +1,174 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/plat-orion/addr-map.c</div><div class='add'>+ *</div><div class='add'>+ * Address map functions for Marvell Orion based SoCs</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2.  This program is licensed "as is" without any</div><div class='add'>+ * warranty of any kind, whether express or implied.</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/mbus.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;plat/addr-map.h&gt;</div><div class='add'>+</div><div class='add'>+struct mbus_dram_target_info orion_mbus_dram_info;</div><div class='add'>+</div><div class='add'>+const struct mbus_dram_target_info *mv_mbus_dram_info(void)</div><div class='add'>+{</div><div class='add'>+	return &amp;orion_mbus_dram_info;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mv_mbus_dram_info);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * DDR target is the same on all Orion platforms.</div><div class='add'>+ */</div><div class='add'>+#define TARGET_DDR		0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Helpers to get DDR bank info</div><div class='add'>+ */</div><div class='add'>+#define DDR_BASE_CS_OFF(n)	(0x0000 + ((n) &lt;&lt; 3))</div><div class='add'>+#define DDR_SIZE_CS_OFF(n)	(0x0004 + ((n) &lt;&lt; 3))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CPU Address Decode Windows registers</div><div class='add'>+ */</div><div class='add'>+#define WIN_CTRL_OFF		0x0000</div><div class='add'>+#define WIN_BASE_OFF		0x0004</div><div class='add'>+#define WIN_REMAP_LO_OFF	0x0008</div><div class='add'>+#define WIN_REMAP_HI_OFF	0x000c</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Default implementation</div><div class='add'>+ */</div><div class='add'>+static void __init __iomem *</div><div class='add'>+orion_win_cfg_base(const struct orion_addr_map_cfg *cfg, int win)</div><div class='add'>+{</div><div class='add'>+	return (void __iomem *)(cfg-&gt;bridge_virt_base + (win &lt;&lt; 4));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Default implementation</div><div class='add'>+ */</div><div class='add'>+static int __init orion_cpu_win_can_remap(const struct orion_addr_map_cfg *cfg,</div><div class='add'>+					  const int win)</div><div class='add'>+{</div><div class='add'>+	if (win &lt; cfg-&gt;remappable_wins)</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'>+void __init orion_setup_cpu_win(const struct orion_addr_map_cfg *cfg,</div><div class='add'>+				const int win, const u32 base,</div><div class='add'>+				const u32 size, const u8 target,</div><div class='add'>+				const u8 attr, const int remap)</div><div class='add'>+{</div><div class='add'>+	void __iomem *addr = cfg-&gt;win_cfg_base(cfg, win);</div><div class='add'>+	u32 ctrl, base_high, remap_addr;</div><div class='add'>+</div><div class='add'>+	if (win &gt;= cfg-&gt;num_wins) {</div><div class='add'>+		printk(KERN_ERR "setup_cpu_win: trying to allocate window "</div><div class='add'>+		       "%d when only %d allowed\n", win, cfg-&gt;num_wins);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	base_high = base &amp; 0xffff0000;</div><div class='add'>+	ctrl = ((size - 1) &amp; 0xffff0000) | (attr &lt;&lt; 8) | (target &lt;&lt; 4) | 1;</div><div class='add'>+</div><div class='add'>+	writel(base_high, addr + WIN_BASE_OFF);</div><div class='add'>+	writel(ctrl, addr + WIN_CTRL_OFF);</div><div class='add'>+	if (cfg-&gt;cpu_win_can_remap(cfg, win)) {</div><div class='add'>+		if (remap &lt; 0)</div><div class='add'>+			remap_addr = base;</div><div class='add'>+		else</div><div class='add'>+			remap_addr = remap;</div><div class='add'>+		writel(remap_addr &amp; 0xffff0000, addr + WIN_REMAP_LO_OFF);</div><div class='add'>+		writel(0, addr + WIN_REMAP_HI_OFF);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Configure a number of windows.</div><div class='add'>+ */</div><div class='add'>+static void __init orion_setup_cpu_wins(const struct orion_addr_map_cfg * cfg,</div><div class='add'>+					const struct orion_addr_map_info *info)</div><div class='add'>+{</div><div class='add'>+	while (info-&gt;win != -1) {</div><div class='add'>+		orion_setup_cpu_win(cfg, info-&gt;win, info-&gt;base, info-&gt;size,</div><div class='add'>+				    info-&gt;target, info-&gt;attr, info-&gt;remap);</div><div class='add'>+		info++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init orion_disable_wins(const struct orion_addr_map_cfg * cfg)</div><div class='add'>+{</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;num_wins; i++) {</div><div class='add'>+		addr = cfg-&gt;win_cfg_base(cfg, i);</div><div class='add'>+</div><div class='add'>+		writel(0, addr + WIN_BASE_OFF);</div><div class='add'>+		writel(0, addr + WIN_CTRL_OFF);</div><div class='add'>+		if (cfg-&gt;cpu_win_can_remap(cfg, i)) {</div><div class='add'>+			writel(0, addr + WIN_REMAP_LO_OFF);</div><div class='add'>+			writel(0, addr + WIN_REMAP_HI_OFF);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Disable, clear and configure windows.</div><div class='add'>+ */</div><div class='add'>+void __init orion_config_wins(struct orion_addr_map_cfg * cfg,</div><div class='add'>+			      const struct orion_addr_map_info *info)</div><div class='add'>+{</div><div class='add'>+	if (!cfg-&gt;cpu_win_can_remap)</div><div class='add'>+		cfg-&gt;cpu_win_can_remap = orion_cpu_win_can_remap;</div><div class='add'>+</div><div class='add'>+	if (!cfg-&gt;win_cfg_base)</div><div class='add'>+		cfg-&gt;win_cfg_base = orion_win_cfg_base;</div><div class='add'>+</div><div class='add'>+	orion_disable_wins(cfg);</div><div class='add'>+</div><div class='add'>+	if (info)</div><div class='add'>+		orion_setup_cpu_wins(cfg, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setup MBUS dram target info.</div><div class='add'>+ */</div><div class='add'>+void __init orion_setup_cpu_mbus_target(const struct orion_addr_map_cfg *cfg,</div><div class='add'>+					const u32 ddr_window_cpu_base)</div><div class='add'>+{</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+	int i;</div><div class='add'>+	int cs;</div><div class='add'>+</div><div class='add'>+	orion_mbus_dram_info.mbus_dram_target_id = TARGET_DDR;</div><div class='add'>+</div><div class='add'>+	addr = (void __iomem *)ddr_window_cpu_base;</div><div class='add'>+</div><div class='add'>+	for (i = 0, cs = 0; i &lt; 4; i++) {</div><div class='add'>+		u32 base = readl(addr + DDR_BASE_CS_OFF(i));</div><div class='add'>+		u32 size = readl(addr + DDR_SIZE_CS_OFF(i));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Chip select enabled?</div><div class='add'>+		 */</div><div class='add'>+		if (size &amp; 1) {</div><div class='add'>+			struct mbus_dram_window *w;</div><div class='add'>+</div><div class='add'>+			w = &amp;orion_mbus_dram_info.cs[cs++];</div><div class='add'>+			w-&gt;cs_index = i;</div><div class='add'>+			w-&gt;mbus_attr = 0xf &amp; ~(1 &lt;&lt; i);</div><div class='add'>+			w-&gt;base = base &amp; 0xffff0000;</div><div class='add'>+			w-&gt;size = (size | 0x0000ffff) + 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	orion_mbus_dram_info.num_cs = cs;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c<br/>index 9e5451b3c8e3..e5a2fde29b19 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-orion/common.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='del'>-#include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> #include &lt;linux/mv643xx_eth.h&gt;</div><div class='ctx'> #include &lt;linux/mv643xx_i2c.h&gt;</div><div class='hunk'>@@ -203,13 +202,12 @@ void __init orion_rtc_init(unsigned long mapbase,</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> static __init void ge_complete(</div><div class='ctx'> 	struct mv643xx_eth_shared_platform_data *orion_ge_shared_data,</div><div class='del'>-	struct mbus_dram_target_info *mbus_dram_info, int tclk,</div><div class='add'>+	int tclk,</div><div class='ctx'> 	struct resource *orion_ge_resource, unsigned long irq,</div><div class='ctx'> 	struct platform_device *orion_ge_shared,</div><div class='ctx'> 	struct mv643xx_eth_platform_data *eth_data,</div><div class='ctx'> 	struct platform_device *orion_ge)</div><div class='ctx'> {</div><div class='del'>-	orion_ge_shared_data-&gt;dram = mbus_dram_info;</div><div class='ctx'> 	orion_ge_shared_data-&gt;t_clk = tclk;</div><div class='ctx'> 	orion_ge_resource-&gt;start = irq;</div><div class='ctx'> 	orion_ge_resource-&gt;end = irq;</div><div class='hunk'>@@ -259,7 +257,6 @@ static struct platform_device orion_ge00 = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data,</div><div class='del'>-			    struct mbus_dram_target_info *mbus_dram_info,</div><div class='ctx'> 			    unsigned long mapbase,</div><div class='ctx'> 			    unsigned long irq,</div><div class='ctx'> 			    unsigned long irq_err,</div><div class='hunk'>@@ -267,7 +264,7 @@ void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data,</div><div class='ctx'> {</div><div class='ctx'> 	fill_resources(&amp;orion_ge00_shared, orion_ge00_shared_resources,</div><div class='ctx'> 		       mapbase + 0x2000, SZ_16K - 1, irq_err);</div><div class='del'>-	ge_complete(&amp;orion_ge00_shared_data, mbus_dram_info, tclk,</div><div class='add'>+	ge_complete(&amp;orion_ge00_shared_data, tclk,</div><div class='ctx'> 		    orion_ge00_resources, irq, &amp;orion_ge00_shared,</div><div class='ctx'> 		    eth_data, &amp;orion_ge00);</div><div class='ctx'> }</div><div class='hunk'>@@ -313,7 +310,6 @@ static struct platform_device orion_ge01 = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,</div><div class='del'>-			    struct mbus_dram_target_info *mbus_dram_info,</div><div class='ctx'> 			    unsigned long mapbase,</div><div class='ctx'> 			    unsigned long irq,</div><div class='ctx'> 			    unsigned long irq_err,</div><div class='hunk'>@@ -321,7 +317,7 @@ void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,</div><div class='ctx'> {</div><div class='ctx'> 	fill_resources(&amp;orion_ge01_shared, orion_ge01_shared_resources,</div><div class='ctx'> 		       mapbase + 0x2000, SZ_16K - 1, irq_err);</div><div class='del'>-	ge_complete(&amp;orion_ge01_shared_data, mbus_dram_info, tclk,</div><div class='add'>+	ge_complete(&amp;orion_ge01_shared_data, tclk,</div><div class='ctx'> 		    orion_ge01_resources, irq, &amp;orion_ge01_shared,</div><div class='ctx'> 		    eth_data, &amp;orion_ge01);</div><div class='ctx'> }</div><div class='hunk'>@@ -367,7 +363,6 @@ static struct platform_device orion_ge10 = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init orion_ge10_init(struct mv643xx_eth_platform_data *eth_data,</div><div class='del'>-			    struct mbus_dram_target_info *mbus_dram_info,</div><div class='ctx'> 			    unsigned long mapbase,</div><div class='ctx'> 			    unsigned long irq,</div><div class='ctx'> 			    unsigned long irq_err,</div><div class='hunk'>@@ -375,7 +370,7 @@ void __init orion_ge10_init(struct mv643xx_eth_platform_data *eth_data,</div><div class='ctx'> {</div><div class='ctx'> 	fill_resources(&amp;orion_ge10_shared, orion_ge10_shared_resources,</div><div class='ctx'> 		       mapbase + 0x2000, SZ_16K - 1, irq_err);</div><div class='del'>-	ge_complete(&amp;orion_ge10_shared_data, mbus_dram_info, tclk,</div><div class='add'>+	ge_complete(&amp;orion_ge10_shared_data, tclk,</div><div class='ctx'> 		    orion_ge10_resources, irq, &amp;orion_ge10_shared,</div><div class='ctx'> 		    eth_data, &amp;orion_ge10);</div><div class='ctx'> }</div><div class='hunk'>@@ -421,7 +416,6 @@ static struct platform_device orion_ge11 = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,</div><div class='del'>-			    struct mbus_dram_target_info *mbus_dram_info,</div><div class='ctx'> 			    unsigned long mapbase,</div><div class='ctx'> 			    unsigned long irq,</div><div class='ctx'> 			    unsigned long irq_err,</div><div class='hunk'>@@ -429,7 +423,7 @@ void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,</div><div class='ctx'> {</div><div class='ctx'> 	fill_resources(&amp;orion_ge11_shared, orion_ge11_shared_resources,</div><div class='ctx'> 		       mapbase + 0x2000, SZ_16K - 1, irq_err);</div><div class='del'>-	ge_complete(&amp;orion_ge11_shared_data, mbus_dram_info, tclk,</div><div class='add'>+	ge_complete(&amp;orion_ge11_shared_data, tclk,</div><div class='ctx'> 		    orion_ge11_resources, irq, &amp;orion_ge11_shared,</div><div class='ctx'> 		    eth_data, &amp;orion_ge11);</div><div class='ctx'> }</div><div class='hunk'>@@ -592,8 +586,6 @@ void __init orion_wdt_init(unsigned long tclk)</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  * XOR</div><div class='ctx'>  ****************************************************************************/</div><div class='del'>-static struct mv_xor_platform_shared_data orion_xor_shared_data;</div><div class='del'>-</div><div class='ctx'> static u64 orion_xor_dmamask = DMA_BIT_MASK(32);</div><div class='ctx'> </div><div class='ctx'> void __init orion_xor_init_channels(</div><div class='hunk'>@@ -632,9 +624,6 @@ static struct resource orion_xor0_shared_resources[] = {</div><div class='ctx'> static struct platform_device orion_xor0_shared = {</div><div class='ctx'> 	.name		= MV_XOR_SHARED_NAME,</div><div class='ctx'> 	.id		= 0,</div><div class='del'>-	.dev		= {</div><div class='del'>-		.platform_data = &amp;orion_xor_shared_data,</div><div class='del'>-	},</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(orion_xor0_shared_resources),</div><div class='ctx'> 	.resource	= orion_xor0_shared_resources,</div><div class='ctx'> };</div><div class='hunk'>@@ -687,14 +676,11 @@ static struct platform_device orion_xor01_channel = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init orion_xor0_init(struct mbus_dram_target_info *mbus_dram_info,</div><div class='del'>-			    unsigned long mapbase_low,</div><div class='add'>+void __init orion_xor0_init(unsigned long mapbase_low,</div><div class='ctx'> 			    unsigned long mapbase_high,</div><div class='ctx'> 			    unsigned long irq_0,</div><div class='ctx'> 			    unsigned long irq_1)</div><div class='ctx'> {</div><div class='del'>-	orion_xor_shared_data.dram = mbus_dram_info;</div><div class='del'>-</div><div class='ctx'> 	orion_xor0_shared_resources[0].start = mapbase_low;</div><div class='ctx'> 	orion_xor0_shared_resources[0].end = mapbase_low + 0xff;</div><div class='ctx'> 	orion_xor0_shared_resources[1].start = mapbase_high;</div><div class='hunk'>@@ -727,9 +713,6 @@ static struct resource orion_xor1_shared_resources[] = {</div><div class='ctx'> static struct platform_device orion_xor1_shared = {</div><div class='ctx'> 	.name		= MV_XOR_SHARED_NAME,</div><div class='ctx'> 	.id		= 1,</div><div class='del'>-	.dev		= {</div><div class='del'>-		.platform_data = &amp;orion_xor_shared_data,</div><div class='del'>-	},</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(orion_xor1_shared_resources),</div><div class='ctx'> 	.resource	= orion_xor1_shared_resources,</div><div class='ctx'> };</div><div class='hunk'>@@ -828,11 +811,9 @@ static struct platform_device orion_ehci = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init orion_ehci_init(struct mbus_dram_target_info *mbus_dram_info,</div><div class='del'>-			    unsigned long mapbase,</div><div class='add'>+void __init orion_ehci_init(unsigned long mapbase,</div><div class='ctx'> 			    unsigned long irq)</div><div class='ctx'> {</div><div class='del'>-	orion_ehci_data.dram = mbus_dram_info;</div><div class='ctx'> 	fill_resources(&amp;orion_ehci, orion_ehci_resources, mapbase, SZ_4K - 1,</div><div class='ctx'> 		       irq);</div><div class='ctx'> </div><div class='hunk'>@@ -854,11 +835,9 @@ static struct platform_device orion_ehci_1 = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init orion_ehci_1_init(struct mbus_dram_target_info *mbus_dram_info,</div><div class='del'>-			      unsigned long mapbase,</div><div class='add'>+void __init orion_ehci_1_init(unsigned long mapbase,</div><div class='ctx'> 			      unsigned long irq)</div><div class='ctx'> {</div><div class='del'>-	orion_ehci_data.dram = mbus_dram_info;</div><div class='ctx'> 	fill_resources(&amp;orion_ehci_1, orion_ehci_1_resources,</div><div class='ctx'> 		       mapbase, SZ_4K - 1, irq);</div><div class='ctx'> </div><div class='hunk'>@@ -880,11 +859,9 @@ static struct platform_device orion_ehci_2 = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init orion_ehci_2_init(struct mbus_dram_target_info *mbus_dram_info,</div><div class='del'>-			      unsigned long mapbase,</div><div class='add'>+void __init orion_ehci_2_init(unsigned long mapbase,</div><div class='ctx'> 			      unsigned long irq)</div><div class='ctx'> {</div><div class='del'>-	orion_ehci_data.dram = mbus_dram_info;</div><div class='ctx'> 	fill_resources(&amp;orion_ehci_2, orion_ehci_2_resources,</div><div class='ctx'> 		       mapbase, SZ_4K - 1, irq);</div><div class='ctx'> </div><div class='hunk'>@@ -911,11 +888,9 @@ static struct platform_device orion_sata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init orion_sata_init(struct mv_sata_platform_data *sata_data,</div><div class='del'>-			    struct mbus_dram_target_info *mbus_dram_info,</div><div class='ctx'> 			    unsigned long mapbase,</div><div class='ctx'> 			    unsigned long irq)</div><div class='ctx'> {</div><div class='del'>-	sata_data-&gt;dram = mbus_dram_info;</div><div class='ctx'> 	orion_sata.dev.platform_data = sata_data;</div><div class='ctx'> 	fill_resources(&amp;orion_sata, orion_sata_resources,</div><div class='ctx'> 		       mapbase, 0x5000 - 1, irq);</div><div class='head'>diff --git a/arch/arm/plat-orion/include/plat/addr-map.h b/arch/arm/plat-orion/include/plat/addr-map.h<br/>new file mode 100644<br/>index 000000000000..fd556f77562c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/addr-map.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-orion/include/plat/addr-map.h</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/plat-orion/include/plat/addr-map.h</div><div class='add'>+ *</div><div class='add'>+ * Marvell Orion SoC address map handling.</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2.  This program is licensed "as is" without any</div><div class='add'>+ * warranty of any kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __PLAT_ADDR_MAP_H</div><div class='add'>+#define __PLAT_ADDR_MAP_H</div><div class='add'>+</div><div class='add'>+extern struct mbus_dram_target_info orion_mbus_dram_info;</div><div class='add'>+</div><div class='add'>+struct orion_addr_map_cfg {</div><div class='add'>+	const int num_wins;	/* Total number of windows */</div><div class='add'>+	const int remappable_wins;</div><div class='add'>+	const u32 bridge_virt_base;</div><div class='add'>+</div><div class='add'>+	/* If NULL, the default cpu_win_can_remap will be used, using</div><div class='add'>+	   the value in remappable_wins */</div><div class='add'>+	int (*cpu_win_can_remap) (const struct orion_addr_map_cfg *cfg,</div><div class='add'>+				  const int win);</div><div class='add'>+	/* If NULL, the default win_cfg_base will be used, using the</div><div class='add'>+	   value in bridge_virt_base */</div><div class='add'>+	void __iomem *(*win_cfg_base) (const struct orion_addr_map_cfg *cfg,</div><div class='add'>+				 const int win);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Information needed to setup one address mapping.</div><div class='add'>+ */</div><div class='add'>+struct orion_addr_map_info {</div><div class='add'>+	const int win;</div><div class='add'>+	const u32 base;</div><div class='add'>+	const u32 size;</div><div class='add'>+	const u8 target;</div><div class='add'>+	const u8 attr;</div><div class='add'>+	const int remap;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init orion_config_wins(struct orion_addr_map_cfg *cfg,</div><div class='add'>+			      const struct orion_addr_map_info *info);</div><div class='add'>+</div><div class='add'>+void __init orion_setup_cpu_win(const struct orion_addr_map_cfg *cfg,</div><div class='add'>+				const int win, const u32 base,</div><div class='add'>+				const u32 size, const u8 target,</div><div class='add'>+				const u8 attr, const int remap);</div><div class='add'>+</div><div class='add'>+void __init orion_setup_cpu_mbus_target(const struct orion_addr_map_cfg *cfg,</div><div class='add'>+					const u32 ddr_window_cpu_base);</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/plat-orion/include/plat/audio.h b/arch/arm/plat-orion/include/plat/audio.h<br/>index 9cf1f781329b..885f8abd927b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/audio.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/include/plat/audio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/audio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-orion/include/plat/audio.h</a></div><div class='hunk'>@@ -1,11 +1,8 @@</div><div class='ctx'> #ifndef __PLAT_AUDIO_H</div><div class='ctx'> #define __PLAT_AUDIO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/mbus.h&gt;</div><div class='del'>-</div><div class='ctx'> struct kirkwood_asoc_platform_data {</div><div class='ctx'> 	u32 tclk;</div><div class='del'>-	struct mbus_dram_target_info *dram;</div><div class='ctx'> 	int burst;</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h<br/>index a63c357e2ab1..0fe08d77e835 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/include/plat/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-orion/include/plat/common.h</a></div><div class='hunk'>@@ -37,28 +37,24 @@ void __init orion_rtc_init(unsigned long mapbase,</div><div class='ctx'> 			   unsigned long irq);</div><div class='ctx'> </div><div class='ctx'> void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data,</div><div class='del'>-			    struct mbus_dram_target_info *mbus_dram_info,</div><div class='ctx'> 			    unsigned long mapbase,</div><div class='ctx'> 			    unsigned long irq,</div><div class='ctx'> 			    unsigned long irq_err,</div><div class='ctx'> 			    int tclk);</div><div class='ctx'> </div><div class='ctx'> void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,</div><div class='del'>-			    struct mbus_dram_target_info *mbus_dram_info,</div><div class='ctx'> 			    unsigned long mapbase,</div><div class='ctx'> 			    unsigned long irq,</div><div class='ctx'> 			    unsigned long irq_err,</div><div class='ctx'> 			    int tclk);</div><div class='ctx'> </div><div class='ctx'> void __init orion_ge10_init(struct mv643xx_eth_platform_data *eth_data,</div><div class='del'>-			    struct mbus_dram_target_info *mbus_dram_info,</div><div class='ctx'> 			    unsigned long mapbase,</div><div class='ctx'> 			    unsigned long irq,</div><div class='ctx'> 			    unsigned long irq_err,</div><div class='ctx'> 			    int tclk);</div><div class='ctx'> </div><div class='ctx'> void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,</div><div class='del'>-			    struct mbus_dram_target_info *mbus_dram_info,</div><div class='ctx'> 			    unsigned long mapbase,</div><div class='ctx'> 			    unsigned long irq,</div><div class='ctx'> 			    unsigned long irq_err,</div><div class='hunk'>@@ -82,8 +78,7 @@ void __init orion_spi_1_init(unsigned long mapbase,</div><div class='ctx'> </div><div class='ctx'> void __init orion_wdt_init(unsigned long tclk);</div><div class='ctx'> </div><div class='del'>-void __init orion_xor0_init(struct mbus_dram_target_info *mbus_dram_info,</div><div class='del'>-			    unsigned long mapbase_low,</div><div class='add'>+void __init orion_xor0_init(unsigned long mapbase_low,</div><div class='ctx'> 			    unsigned long mapbase_high,</div><div class='ctx'> 			    unsigned long irq_0,</div><div class='ctx'> 			    unsigned long irq_1);</div><div class='hunk'>@@ -93,20 +88,16 @@ void __init orion_xor1_init(unsigned long mapbase_low,</div><div class='ctx'> 			    unsigned long irq_0,</div><div class='ctx'> 			    unsigned long irq_1);</div><div class='ctx'> </div><div class='del'>-void __init orion_ehci_init(struct mbus_dram_target_info *mbus_dram_info,</div><div class='del'>-			    unsigned long mapbase,</div><div class='add'>+void __init orion_ehci_init(unsigned long mapbase,</div><div class='ctx'> 			    unsigned long irq);</div><div class='ctx'> </div><div class='del'>-void __init orion_ehci_1_init(struct mbus_dram_target_info *mbus_dram_info,</div><div class='del'>-			      unsigned long mapbase,</div><div class='add'>+void __init orion_ehci_1_init(unsigned long mapbase,</div><div class='ctx'> 			      unsigned long irq);</div><div class='ctx'> </div><div class='del'>-void __init orion_ehci_2_init(struct mbus_dram_target_info *mbus_dram_info,</div><div class='del'>-			      unsigned long mapbase,</div><div class='add'>+void __init orion_ehci_2_init(unsigned long mapbase,</div><div class='ctx'> 			      unsigned long irq);</div><div class='ctx'> </div><div class='ctx'> void __init orion_sata_init(struct mv_sata_platform_data *sata_data,</div><div class='del'>-			    struct mbus_dram_target_info *mbus_dram_info,</div><div class='ctx'> 			    unsigned long mapbase,</div><div class='ctx'> 			    unsigned long irq);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-orion/include/plat/ehci-orion.h b/arch/arm/plat-orion/include/plat/ehci-orion.h<br/>index 4ec668e77460..6fc78e430420 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/ehci-orion.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/include/plat/ehci-orion.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/ehci-orion.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-orion/include/plat/ehci-orion.h</a></div><div class='hunk'>@@ -19,7 +19,6 @@ enum orion_ehci_phy_ver {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct orion_ehci_data {</div><div class='del'>-	struct mbus_dram_target_info	*dram;</div><div class='ctx'> 	enum orion_ehci_phy_ver phy_version;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-orion/include/plat/mv_xor.h b/arch/arm/plat-orion/include/plat/mv_xor.h<br/>index bd5f3bdb4ae3..2ba1f7d76eef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/mv_xor.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/include/plat/mv_xor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/mv_xor.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-orion/include/plat/mv_xor.h</a></div><div class='hunk'>@@ -13,12 +13,6 @@</div><div class='ctx'> #define MV_XOR_SHARED_NAME	"mv_xor_shared"</div><div class='ctx'> #define MV_XOR_NAME		"mv_xor"</div><div class='ctx'> </div><div class='del'>-struct mbus_dram_target_info;</div><div class='del'>-</div><div class='del'>-struct mv_xor_platform_shared_data {</div><div class='del'>-	struct mbus_dram_target_info	*dram;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct mv_xor_platform_data {</div><div class='ctx'> 	struct platform_device		*shared;</div><div class='ctx'> 	int				hw_id;</div><div class='head'>diff --git a/arch/arm/plat-orion/include/plat/mvsdio.h b/arch/arm/plat-orion/include/plat/mvsdio.h<br/>index 14ca88676002..1190efedcb94 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/mvsdio.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/include/plat/mvsdio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/mvsdio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-orion/include/plat/mvsdio.h</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct mvsdio_platform_data {</div><div class='del'>-	struct mbus_dram_target_info *dram;</div><div class='ctx'> 	unsigned int clock;</div><div class='ctx'> 	int gpio_card_detect;</div><div class='ctx'> 	int gpio_write_protect;</div><div class='head'>diff --git a/arch/arm/plat-orion/include/plat/pcie.h b/arch/arm/plat-orion/include/plat/pcie.h<br/>index cc99163e73fd..fe5b9e862747 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/pcie.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/include/plat/pcie.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/include/plat/pcie.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-orion/include/plat/pcie.h</a></div><div class='hunk'>@@ -20,8 +20,7 @@ int orion_pcie_x4_mode(void __iomem *base);</div><div class='ctx'> int orion_pcie_get_local_bus_nr(void __iomem *base);</div><div class='ctx'> void orion_pcie_set_local_bus_nr(void __iomem *base, int nr);</div><div class='ctx'> void orion_pcie_reset(void __iomem *base);</div><div class='del'>-void orion_pcie_setup(void __iomem *base,</div><div class='del'>-		      struct mbus_dram_target_info *dram);</div><div class='add'>+void orion_pcie_setup(void __iomem *base);</div><div class='ctx'> int orion_pcie_rd_conf(void __iomem *base, struct pci_bus *bus,</div><div class='ctx'> 		       u32 devfn, int where, int size, u32 *val);</div><div class='ctx'> int orion_pcie_rd_conf_tlp(void __iomem *base, struct pci_bus *bus,</div><div class='head'>diff --git a/arch/arm/plat-orion/pcie.c b/arch/arm/plat-orion/pcie.c<br/>index af2d733c50b5..86dbb5bdb172 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/pcie.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/pcie.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-orion/pcie.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/mbus.h&gt;</div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> #include &lt;plat/pcie.h&gt;</div><div class='add'>+#include &lt;plat/addr-map.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -175,8 +176,7 @@ static void __init orion_pcie_setup_wins(void __iomem *base,</div><div class='ctx'> 	writel(((size - 1) &amp; 0xffff0000) | 1, base + PCIE_BAR_CTRL_OFF(1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init orion_pcie_setup(void __iomem *base,</div><div class='del'>-			     struct mbus_dram_target_info *dram)</div><div class='add'>+void __init orion_pcie_setup(void __iomem *base)</div><div class='ctx'> {</div><div class='ctx'> 	u16 cmd;</div><div class='ctx'> 	u32 mask;</div><div class='hunk'>@@ -184,7 +184,7 @@ void __init orion_pcie_setup(void __iomem *base,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Point PCIe unit MBUS decode windows to DRAM space.</div><div class='ctx'> 	 */</div><div class='del'>-	orion_pcie_setup_wins(base, dram);</div><div class='add'>+	orion_pcie_setup_wins(base, &amp;orion_mbus_dram_info);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Master + slave enable.</div><div class='head'>diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c<br/>index 69a61367e4b8..1ed8d1397fcf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-orion/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-orion/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-orion/time.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -60,24 +59,10 @@ static u32 ticks_per_jiffy;</div><div class='ctx'>  * Orion's sched_clock implementation. It has a resolution of</div><div class='ctx'>  * at least 7.5ns (133MHz TCLK).</div><div class='ctx'>  */</div><div class='del'>-static DEFINE_CLOCK_DATA(cd);</div><div class='ctx'> </div><div class='del'>-unsigned long long notrace sched_clock(void)</div><div class='add'>+static u32 notrace orion_read_sched_clock(void)</div><div class='ctx'> {</div><div class='del'>-	u32 cyc = ~readl(timer_base + TIMER0_VAL_OFF);</div><div class='del'>-	return cyc_to_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void notrace orion_update_sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	u32 cyc = ~readl(timer_base + TIMER0_VAL_OFF);</div><div class='del'>-	update_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init setup_sched_clock(unsigned long tclk)</div><div class='del'>-{</div><div class='del'>-	init_sched_clock(&amp;cd, orion_update_sched_clock, 32, tclk);</div><div class='add'>+	return ~readl(timer_base + TIMER0_VAL_OFF);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -217,7 +202,7 @@ orion_time_init(u32 _bridge_base, u32 _bridge_timer1_clr_mask,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set scale and timer for sched_clock.</div><div class='ctx'> 	 */</div><div class='del'>-	setup_sched_clock(tclk);</div><div class='add'>+	setup_sched_clock(orion_read_sched_clock, 32, tclk);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Setup free-running clocksource timer (interrupts</div><div class='head'>diff --git a/arch/arm/plat-pxa/include/plat/gpio-pxa.h b/arch/arm/plat-pxa/include/plat/gpio-pxa.h<br/>deleted file mode 100644<br/>index b6390beff323..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-pxa/include/plat/gpio-pxa.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-pxa/include/plat/gpio-pxa.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,44 +0,0 @@</div><div class='del'>-#ifndef __PLAT_PXA_GPIO_H</div><div class='del'>-#define __PLAT_PXA_GPIO_H</div><div class='del'>-</div><div class='del'>-struct irq_data;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We handle the GPIOs by banks, each bank covers up to 32 GPIOs with</div><div class='del'>- * one set of registers. The register offsets are organized below:</div><div class='del'>- *</div><div class='del'>- *           GPLR    GPDR    GPSR    GPCR    GRER    GFER    GEDR</div><div class='del'>- * BANK 0 - 0x0000  0x000C  0x0018  0x0024  0x0030  0x003C  0x0048</div><div class='del'>- * BANK 1 - 0x0004  0x0010  0x001C  0x0028  0x0034  0x0040  0x004C</div><div class='del'>- * BANK 2 - 0x0008  0x0014  0x0020  0x002C  0x0038  0x0044  0x0050</div><div class='del'>- *</div><div class='del'>- * BANK 3 - 0x0100  0x010C  0x0118  0x0124  0x0130  0x013C  0x0148</div><div class='del'>- * BANK 4 - 0x0104  0x0110  0x011C  0x0128  0x0134  0x0140  0x014C</div><div class='del'>- * BANK 5 - 0x0108  0x0114  0x0120  0x012C  0x0138  0x0144  0x0150</div><div class='del'>- *</div><div class='del'>- * NOTE:</div><div class='del'>- *   BANK 3 is only available on PXA27x and later processors.</div><div class='del'>- *   BANK 4 and 5 are only available on PXA935</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define GPIO_BANK(n)	(GPIO_REGS_VIRT + BANK_OFF(n))</div><div class='del'>-</div><div class='del'>-#define GPLR_OFFSET	0x00</div><div class='del'>-#define GPDR_OFFSET	0x0C</div><div class='del'>-#define GPSR_OFFSET	0x18</div><div class='del'>-#define GPCR_OFFSET	0x24</div><div class='del'>-#define GRER_OFFSET	0x30</div><div class='del'>-#define GFER_OFFSET	0x3C</div><div class='del'>-#define GEDR_OFFSET	0x48</div><div class='del'>-</div><div class='del'>-/* NOTE: some PXAs have fewer on-chip GPIOs (like PXA255, with 85).</div><div class='del'>- * Those cases currently cause holes in the GPIO number space, the</div><div class='del'>- * actual number of the last GPIO is recorded by 'pxa_last_gpio'.</div><div class='del'>- */</div><div class='del'>-extern int pxa_last_gpio;</div><div class='del'>-</div><div class='del'>-typedef int (*set_wake_t)(struct irq_data *d, unsigned int on);</div><div class='del'>-</div><div class='del'>-extern void pxa_init_gpio(int mux_irq, int start, int end, set_wake_t fn);</div><div class='del'>-</div><div class='del'>-#endif /* __PLAT_PXA_GPIO_H */</div><div class='head'>diff --git a/arch/arm/plat-pxa/include/plat/gpio.h b/arch/arm/plat-pxa/include/plat/gpio.h<br/>deleted file mode 100644<br/>index 258f77210b02..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-pxa/include/plat/gpio.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-pxa/include/plat/gpio.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-#ifndef __PLAT_GPIO_H</div><div class='del'>-#define __PLAT_GPIO_H</div><div class='del'>-</div><div class='del'>-#define __ARM_GPIOLIB_COMPLEX</div><div class='del'>-</div><div class='del'>-/* The individual machine provides register offsets and NR_BUILTIN_GPIO */</div><div class='del'>-#include &lt;mach/gpio-pxa.h&gt;</div><div class='del'>-</div><div class='del'>-static inline int gpio_get_value(unsigned gpio)</div><div class='del'>-{</div><div class='del'>-	if (__builtin_constant_p(gpio) &amp;&amp; (gpio &lt; NR_BUILTIN_GPIO))</div><div class='del'>-		return GPLR(gpio) &amp; GPIO_bit(gpio);</div><div class='del'>-	else</div><div class='del'>-		return __gpio_get_value(gpio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void gpio_set_value(unsigned gpio, int value)</div><div class='del'>-{</div><div class='del'>-	if (__builtin_constant_p(gpio) &amp;&amp; (gpio &lt; NR_BUILTIN_GPIO)) {</div><div class='del'>-		if (value)</div><div class='del'>-			GPSR(gpio) = GPIO_bit(gpio);</div><div class='del'>-		else</div><div class='del'>-			GPCR(gpio) = GPIO_bit(gpio);</div><div class='del'>-	} else</div><div class='del'>-		__gpio_set_value(gpio, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define gpio_cansleep		__gpio_cansleep</div><div class='del'>-</div><div class='del'>-#endif /* __PLAT_GPIO_H */</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/common-smdk.c b/arch/arm/plat-s3c24xx/common-smdk.c<br/>index bcc43f346272..084604be6ad1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/common-smdk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s3c24xx/common-smdk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/common-smdk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-s3c24xx/common-smdk.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/cpu-freq.c b/arch/arm/plat-s3c24xx/cpu-freq.c<br/>index b3d3d0278997..468079938884 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/cpu-freq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s3c24xx/cpu-freq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/cpu-freq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-s3c24xx/cpu-freq.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c<br/>index 3c6335307fb1..21f1fda8b661 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/cpu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s3c24xx/cpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/cpu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-s3c24xx/cpu.c</a></div><div class='hunk'>@@ -38,8 +38,6 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/system-reset.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;mach/regs-gpio.h&gt;</div><div class='ctx'> #include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -192,27 +190,6 @@ static unsigned long s3c24xx_read_idcode_v4(void)</div><div class='ctx'> 	return __raw_readl(S3C2410_GSTATUS1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Hook for arm_pm_restart to ensure we execute the reset code</div><div class='del'>- * with the caches enabled. It seems at least the S3C2440 has a problem</div><div class='del'>- * resetting if there is bus activity interrupted by the reset.</div><div class='del'>- */</div><div class='del'>-static void s3c24xx_pm_restart(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	if (mode != 's') {</div><div class='del'>-		unsigned long flags;</div><div class='del'>-</div><div class='del'>-		local_irq_save(flags);</div><div class='del'>-		__cpuc_flush_kern_all();</div><div class='del'>-		__cpuc_flush_user_all();</div><div class='del'>-</div><div class='del'>-		arch_reset(mode, cmd);</div><div class='del'>-		local_irq_restore(flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* fallback, or unhandled */</div><div class='del'>-	arm_machine_restart(mode, cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __init s3c24xx_init_io(struct map_desc *mach_desc, int size)</div><div class='ctx'> {</div><div class='ctx'> 	/* initialise the io descriptors we need for initialisation */</div><div class='hunk'>@@ -226,7 +203,5 @@ void __init s3c24xx_init_io(struct map_desc *mach_desc, int size)</div><div class='ctx'> 	}</div><div class='ctx'> 	s3c24xx_init_cpu();</div><div class='ctx'> </div><div class='del'>-	arm_pm_restart = s3c24xx_pm_restart;</div><div class='del'>-</div><div class='ctx'> 	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c<br/>index 53754bcf15a7..9fe35348e03b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s3c24xx/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-s3c24xx/dma.c</a></div><div class='hunk'>@@ -1437,11 +1437,10 @@ int __init s3c24xx_dma_init_map(struct s3c24xx_dma_selection *sel)</div><div class='ctx'> 	size_t map_sz = sizeof(*nmap) * sel-&gt;map_size;</div><div class='ctx'> 	int ptr;</div><div class='ctx'> </div><div class='del'>-	nmap = kmalloc(map_sz, GFP_KERNEL);</div><div class='add'>+	nmap = kmemdup(sel-&gt;map, map_sz, GFP_KERNEL);</div><div class='ctx'> 	if (nmap == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	memcpy(nmap, sel-&gt;map, map_sz);</div><div class='ctx'> 	memcpy(&amp;dma_sel, sel, sizeof(*sel));</div><div class='ctx'> </div><div class='ctx'> 	dma_sel.map = nmap;</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c<br/>index fc8c5f89954d..bc42c04091fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s3c24xx/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-s3c24xx/irq.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/pm-simtec.c b/arch/arm/plat-s3c24xx/pm-simtec.c<br/>index 663b280d65da..68296b1fe7e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/pm-simtec.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s3c24xx/pm-simtec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/pm-simtec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-s3c24xx/pm-simtec.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/s3c2410-clock.c b/arch/arm/plat-s3c24xx/s3c2410-clock.c<br/>index def76aa3825a..25dc4d4397b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/s3c2410-clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s3c24xx/s3c2410-clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/s3c2410-clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-s3c24xx/s3c2410-clock.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-s3c24xx/s3c2412-iotiming.c b/arch/arm/plat-s3c24xx/s3c2412-iotiming.c<br/>index 0b46d3895d62..48eee39ab369 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/s3c2412-iotiming.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s3c24xx/s3c2412-iotiming.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/s3c2412-iotiming.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-s3c24xx/s3c2412-iotiming.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</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/arch/arm/plat-s3c24xx/s3c2443-clock.c b/arch/arm/plat-s3c24xx/s3c2443-clock.c<br/>index 5a21b15b2a97..95e68190d593 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/s3c2443-clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s3c24xx/s3c2443-clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s3c24xx/s3c2443-clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-s3c24xx/s3c2443-clock.c</a></div><div class='hunk'>@@ -297,13 +297,6 @@ static struct clksrc_clk clk_usb_bus_host = {</div><div class='ctx'> </div><div class='ctx'> static struct clksrc_clk clksrc_clks[] = {</div><div class='ctx'> 	{</div><div class='del'>-		/* ART baud-rate clock sourced from esysclk via a divisor */</div><div class='del'>-		.clk	= {</div><div class='del'>-			.name		= "uartclk",</div><div class='del'>-			.parent		= &amp;clk_esysclk.clk,</div><div class='del'>-		},</div><div class='del'>-		.reg_div = { .reg = S3C2443_CLKDIV1, .size = 4, .shift = 8 },</div><div class='del'>-	}, {</div><div class='ctx'> 		/* camera interface bus-clock, divided down from esysclk */</div><div class='ctx'> 		.clk	= {</div><div class='ctx'> 			.name		= "camif-upll",	/* same as 2440 name */</div><div class='hunk'>@@ -323,6 +316,15 @@ static struct clksrc_clk clksrc_clks[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clksrc_clk clk_esys_uart = {</div><div class='add'>+	/* ART baud-rate clock sourced from esysclk via a divisor */</div><div class='add'>+	.clk	= {</div><div class='add'>+		.name		= "uartclk",</div><div class='add'>+		.parent		= &amp;clk_esysclk.clk,</div><div class='add'>+	},</div><div class='add'>+	.reg_div = { .reg = S3C2443_CLKDIV1, .size = 4, .shift = 8 },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk clk_i2s_ext = {</div><div class='ctx'> 	.name		= "i2s-ext",</div><div class='ctx'> };</div><div class='hunk'>@@ -425,12 +427,6 @@ static struct clk init_clocks[] = {</div><div class='ctx'> 		.enable		= s3c2443_clkcon_enable_h,</div><div class='ctx'> 		.ctrlbit	= S3C2443_HCLKCON_DMA5,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name		= "hsmmc",</div><div class='del'>-		.devname	= "s3c-sdhci.1",</div><div class='del'>-		.parent		= &amp;clk_h,</div><div class='del'>-		.enable		= s3c2443_clkcon_enable_h,</div><div class='del'>-		.ctrlbit	= S3C2443_HCLKCON_HSMMC,</div><div class='del'>-	}, {</div><div class='ctx'> 		.name		= "gpio",</div><div class='ctx'> 		.parent		= &amp;clk_p,</div><div class='ctx'> 		.enable		= s3c2443_clkcon_enable_p,</div><div class='hunk'>@@ -512,6 +508,14 @@ static struct clk init_clocks[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk hsmmc1_clk = {</div><div class='add'>+	.name		= "hsmmc",</div><div class='add'>+	.devname	= "s3c-sdhci.1",</div><div class='add'>+	.parent		= &amp;clk_h,</div><div class='add'>+	.enable		= s3c2443_clkcon_enable_h,</div><div class='add'>+	.ctrlbit	= S3C2443_HCLKCON_HSMMC,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static inline unsigned long s3c2443_get_hdiv(unsigned long clkcon0)</div><div class='ctx'> {</div><div class='ctx'> 	clkcon0 &amp;= S3C2443_CLKDIV0_HCLKDIV_MASK;</div><div class='hunk'>@@ -577,6 +581,7 @@ static struct clk *clks[] __initdata = {</div><div class='ctx'> 	&amp;clk_epll,</div><div class='ctx'> 	&amp;clk_usb_bus,</div><div class='ctx'> 	&amp;clk_armdiv,</div><div class='add'>+	&amp;hsmmc1_clk,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clksrc_clk *clksrcs[] __initdata = {</div><div class='hunk'>@@ -589,6 +594,13 @@ static struct clksrc_clk *clksrcs[] __initdata = {</div><div class='ctx'> 	&amp;clk_arm,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct clk_lookup s3c2443_clk_lookup[] = {</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud1", &amp;s3c24xx_uclk),</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud2", &amp;clk_p),</div><div class='add'>+	CLKDEV_INIT(NULL, "clk_uart_baud3", &amp;clk_esys_uart.clk),</div><div class='add'>+	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.0", &amp;hsmmc1_clk),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void __init s3c2443_common_init_clocks(int xtal, pll_fn get_mpll,</div><div class='ctx'> 				       unsigned int *divs, int nr_divs,</div><div class='ctx'> 				       int divmask)</div><div class='hunk'>@@ -618,6 +630,7 @@ void __init s3c2443_common_init_clocks(int xtal, pll_fn get_mpll,</div><div class='ctx'> 	/* See s3c2443/etc notes on disabling clocks at init time */</div><div class='ctx'> 	s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));</div><div class='ctx'> 	s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));</div><div class='add'>+	clkdev_add_table(s3c2443_clk_lookup, ARRAY_SIZE(s3c2443_clk_lookup));</div><div class='ctx'> </div><div class='ctx'> 	s3c2443_common_setup_clocks(get_mpll);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig<br/>index 9b9968fa8695..8167ce66188c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s5p/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s5p/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s5p/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-s5p/Kconfig</a></div><div class='hunk'>@@ -11,6 +11,7 @@ config PLAT_S5P</div><div class='ctx'> 	default y</div><div class='ctx'> 	select ARM_VIC if !ARCH_EXYNOS4</div><div class='ctx'> 	select ARM_GIC if ARCH_EXYNOS4</div><div class='add'>+	select GIC_NON_BANKED if ARCH_EXYNOS4</div><div class='ctx'> 	select NO_IOPORT</div><div class='ctx'> 	select ARCH_REQUIRE_GPIOLIB</div><div class='ctx'> 	select S3C_GPIO_TRACK</div><div class='head'>diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile<br/>index 876344038b8d..30d8c3016e6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s5p/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s5p/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s5p/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-s5p/Makefile</a></div><div class='hunk'>@@ -13,7 +13,6 @@ obj-				:=</div><div class='ctx'> # Core files</div><div class='ctx'> </div><div class='ctx'> obj-y				+= dev-uart.o</div><div class='del'>-obj-y				+= cpu.o</div><div class='ctx'> obj-y				+= clock.o</div><div class='ctx'> obj-y				+= irq.o</div><div class='ctx'> obj-$(CONFIG_S5P_EXT_INT)	+= irq-eint.o</div><div class='head'>diff --git a/arch/arm/plat-s5p/clock.c b/arch/arm/plat-s5p/clock.c<br/>index 5f84a3f13ef9..963edea7f7e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s5p/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s5p/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s5p/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-s5p/clock.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-s5p/cpu.c b/arch/arm/plat-s5p/cpu.c<br/>deleted file mode 100644<br/>index a56959e83516..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s5p/cpu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s5p/cpu.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,144 +0,0 @@</div><div class='del'>-/* linux/arch/arm/plat-s5p/cpu.c</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2009-2011 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com</div><div class='del'>- *</div><div class='del'>- * S5P CPU Support</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach/arch.h&gt;</div><div class='del'>-#include &lt;asm/mach/map.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='del'>-#include &lt;mach/regs-clock.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;plat/cpu.h&gt;</div><div class='del'>-#include &lt;plat/s5p6440.h&gt;</div><div class='del'>-#include &lt;plat/s5p6450.h&gt;</div><div class='del'>-#include &lt;plat/s5pc100.h&gt;</div><div class='del'>-#include &lt;plat/s5pv210.h&gt;</div><div class='del'>-#include &lt;plat/exynos4.h&gt;</div><div class='del'>-</div><div class='del'>-/* table of supported CPUs */</div><div class='del'>-</div><div class='del'>-static const char name_s5p6440[] = "S5P6440";</div><div class='del'>-static const char name_s5p6450[] = "S5P6450";</div><div class='del'>-static const char name_s5pc100[] = "S5PC100";</div><div class='del'>-static const char name_s5pv210[] = "S5PV210/S5PC110";</div><div class='del'>-static const char name_exynos4210[] = "EXYNOS4210";</div><div class='del'>-static const char name_exynos4212[] = "EXYNOS4212";</div><div class='del'>-static const char name_exynos4412[] = "EXYNOS4412";</div><div class='del'>-</div><div class='del'>-static struct cpu_table cpu_ids[] __initdata = {</div><div class='del'>-	{</div><div class='del'>-		.idcode		= S5P6440_CPU_ID,</div><div class='del'>-		.idmask		= S5P64XX_CPU_MASK,</div><div class='del'>-		.map_io		= s5p6440_map_io,</div><div class='del'>-		.init_clocks	= s5p6440_init_clocks,</div><div class='del'>-		.init_uarts	= s5p6440_init_uarts,</div><div class='del'>-		.init		= s5p64x0_init,</div><div class='del'>-		.name		= name_s5p6440,</div><div class='del'>-	}, {</div><div class='del'>-		.idcode		= S5P6450_CPU_ID,</div><div class='del'>-		.idmask		= S5P64XX_CPU_MASK,</div><div class='del'>-		.map_io		= s5p6450_map_io,</div><div class='del'>-		.init_clocks	= s5p6450_init_clocks,</div><div class='del'>-		.init_uarts	= s5p6450_init_uarts,</div><div class='del'>-		.init		= s5p64x0_init,</div><div class='del'>-		.name		= name_s5p6450,</div><div class='del'>-	}, {</div><div class='del'>-		.idcode		= S5PC100_CPU_ID,</div><div class='del'>-		.idmask		= S5PC100_CPU_MASK,</div><div class='del'>-		.map_io		= s5pc100_map_io,</div><div class='del'>-		.init_clocks	= s5pc100_init_clocks,</div><div class='del'>-		.init_uarts	= s5pc100_init_uarts,</div><div class='del'>-		.init		= s5pc100_init,</div><div class='del'>-		.name		= name_s5pc100,</div><div class='del'>-	}, {</div><div class='del'>-		.idcode		= S5PV210_CPU_ID,</div><div class='del'>-		.idmask		= S5PV210_CPU_MASK,</div><div class='del'>-		.map_io		= s5pv210_map_io,</div><div class='del'>-		.init_clocks	= s5pv210_init_clocks,</div><div class='del'>-		.init_uarts	= s5pv210_init_uarts,</div><div class='del'>-		.init		= s5pv210_init,</div><div class='del'>-		.name		= name_s5pv210,</div><div class='del'>-	}, {</div><div class='del'>-		.idcode		= EXYNOS4210_CPU_ID,</div><div class='del'>-		.idmask		= EXYNOS4_CPU_MASK,</div><div class='del'>-		.map_io		= exynos4_map_io,</div><div class='del'>-		.init_clocks	= exynos4_init_clocks,</div><div class='del'>-		.init_uarts	= exynos4_init_uarts,</div><div class='del'>-		.init		= exynos_init,</div><div class='del'>-		.name		= name_exynos4210,</div><div class='del'>-	}, {</div><div class='del'>-		.idcode		= EXYNOS4212_CPU_ID,</div><div class='del'>-		.idmask		= EXYNOS4_CPU_MASK,</div><div class='del'>-		.map_io		= exynos4_map_io,</div><div class='del'>-		.init_clocks	= exynos4_init_clocks,</div><div class='del'>-		.init_uarts	= exynos4_init_uarts,</div><div class='del'>-		.init		= exynos_init,</div><div class='del'>-		.name		= name_exynos4212,</div><div class='del'>-	}, {</div><div class='del'>-		.idcode		= EXYNOS4412_CPU_ID,</div><div class='del'>-		.idmask		= EXYNOS4_CPU_MASK,</div><div class='del'>-		.map_io		= exynos4_map_io,</div><div class='del'>-		.init_clocks	= exynos4_init_clocks,</div><div class='del'>-		.init_uarts	= exynos4_init_uarts,</div><div class='del'>-		.init		= exynos_init,</div><div class='del'>-		.name		= name_exynos4412,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* minimal IO mapping */</div><div class='del'>-</div><div class='del'>-static struct map_desc s5p_iodesc[] __initdata = {</div><div class='del'>-	{</div><div class='del'>-		.virtual	= (unsigned long)S5P_VA_CHIPID,</div><div class='del'>-		.pfn		= __phys_to_pfn(S5P_PA_CHIPID),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S3C_VA_SYS,</div><div class='del'>-		.pfn		= __phys_to_pfn(S5P_PA_SYSCON),</div><div class='del'>-		.length		= SZ_64K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S3C_VA_TIMER,</div><div class='del'>-		.pfn		= __phys_to_pfn(S5P_PA_TIMER),</div><div class='del'>-		.length		= SZ_16K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S3C_VA_WATCHDOG,</div><div class='del'>-		.pfn		= __phys_to_pfn(S3C_PA_WDT),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	}, {</div><div class='del'>-		.virtual	= (unsigned long)S5P_VA_SROMC,</div><div class='del'>-		.pfn		= __phys_to_pfn(S5P_PA_SROMC),</div><div class='del'>-		.length		= SZ_4K,</div><div class='del'>-		.type		= MT_DEVICE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* read cpu identification code */</div><div class='del'>-</div><div class='del'>-void __init s5p_init_io(struct map_desc *mach_desc,</div><div class='del'>-			int size, void __iomem *cpuid_addr)</div><div class='del'>-{</div><div class='del'>-	/* initialize the io descriptors we need for initialization */</div><div class='del'>-	iotable_init(s5p_iodesc, ARRAY_SIZE(s5p_iodesc));</div><div class='del'>-	if (mach_desc)</div><div class='del'>-		iotable_init(mach_desc, size);</div><div class='del'>-</div><div class='del'>-	/* detect cpu id and rev. */</div><div class='del'>-	s5p_init_cpu(cpuid_addr);</div><div class='del'>-</div><div class='del'>-	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/plat-s5p/irq-eint.c b/arch/arm/plat-s5p/irq-eint.c<br/>index b5bb774985b0..c496b359c371 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s5p/irq-eint.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s5p/irq-eint.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s5p/irq-eint.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-s5p/irq-eint.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/vic.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-s5p/s5p-time.c b/arch/arm/plat-s5p/s5p-time.c<br/>index c833e7b57599..17c0a2c58dfd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-s5p/s5p-time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-s5p/s5p-time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-s5p/s5p-time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-s5p/s5p-time.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sched.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='ctx'> #include &lt;linux/err.h&gt;</div><div class='hunk'>@@ -321,26 +320,14 @@ static void __iomem *s5p_timer_reg(void)</div><div class='ctx'>  * this wraps around for now, since it is just a relative time</div><div class='ctx'>  * stamp. (Inspired by U300 implementation.)</div><div class='ctx'>  */</div><div class='del'>-static DEFINE_CLOCK_DATA(cd);</div><div class='del'>-</div><div class='del'>-unsigned long long notrace sched_clock(void)</div><div class='add'>+static u32 notrace s5p_read_sched_clock(void)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *reg = s5p_timer_reg();</div><div class='ctx'> </div><div class='ctx'> 	if (!reg)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return cyc_to_sched_clock(&amp;cd, ~__raw_readl(reg), (u32)~0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void notrace s5p_update_sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	void __iomem *reg = s5p_timer_reg();</div><div class='del'>-</div><div class='del'>-	if (!reg)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	update_sched_clock(&amp;cd, ~__raw_readl(reg), (u32)~0);</div><div class='add'>+	return ~__raw_readl(reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init s5p_clocksource_init(void)</div><div class='hunk'>@@ -358,7 +345,7 @@ static void __init s5p_clocksource_init(void)</div><div class='ctx'> 	s5p_time_setup(timer_source.source_id, TCNT_MAX);</div><div class='ctx'> 	s5p_time_start(timer_source.source_id, PERIODIC);</div><div class='ctx'> </div><div class='del'>-	init_sched_clock(&amp;cd, s5p_update_sched_clock, 32, clock_rate);</div><div class='add'>+	setup_sched_clock(s5p_read_sched_clock, 32, clock_rate);</div><div class='ctx'> </div><div class='ctx'> 	if (clocksource_mmio_init(s5p_timer_reg(), "s5p_clocksource_timer",</div><div class='ctx'> 			clock_rate, 250, 32, clocksource_mmio_readl_down))</div><div class='head'>diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig<br/>index 313eb26cfa62..6a2abe67c8b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/Kconfig</a></div><div class='hunk'>@@ -88,12 +88,20 @@ config S5P_GPIO_DRVSTR</div><div class='ctx'> </div><div class='ctx'> config SAMSUNG_GPIO_EXTRA</div><div class='ctx'> 	int "Number of additional GPIO pins"</div><div class='add'>+	default 128 if SAMSUNG_GPIO_EXTRA128</div><div class='add'>+	default 64 if SAMSUNG_GPIO_EXTRA64</div><div class='ctx'> 	default 0</div><div class='ctx'> 	help</div><div class='ctx'> 	  Use additional GPIO space in addition to the GPIO's the SOC</div><div class='ctx'> 	  provides. This allows expanding the GPIO space for use with</div><div class='ctx'> 	  GPIO expanders.</div><div class='ctx'> </div><div class='add'>+config SAMSUNG_GPIO_EXTRA64</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config SAMSUNG_GPIO_EXTRA128</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config S3C_GPIO_SPACE</div><div class='ctx'> 	int "Space between gpio banks"</div><div class='ctx'> 	default 0</div><div class='hunk'>@@ -226,11 +234,23 @@ config SAMSUNG_DEV_IDE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Compile in platform device definitions for IDE</div><div class='ctx'> </div><div class='del'>-config S3C64XX_DEV_SPI</div><div class='add'>+config S3C64XX_DEV_SPI0</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  Compile in platform device definitions for S3C64XX's type</div><div class='add'>+	  SPI controller 0</div><div class='add'>+</div><div class='add'>+config S3C64XX_DEV_SPI1</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  Compile in platform device definitions for S3C64XX's type</div><div class='add'>+	  SPI controller 1</div><div class='add'>+</div><div class='add'>+config S3C64XX_DEV_SPI2</div><div class='ctx'> 	bool</div><div class='ctx'> 	help</div><div class='ctx'> 	  Compile in platform device definitions for S3C64XX's type</div><div class='del'>-	  SPI controllers.</div><div class='add'>+	  SPI controller 2</div><div class='ctx'> </div><div class='ctx'> config SAMSUNG_DEV_TS</div><div class='ctx'> 	bool</div><div class='head'>diff --git a/arch/arm/plat-samsung/clock-clksrc.c b/arch/arm/plat-samsung/clock-clksrc.c<br/>index ae8b8507663f..786a4107a157 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/clock-clksrc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/clock-clksrc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/clock-clksrc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/clock-clksrc.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/clock.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c<br/>index 3b4451979d1b..10f71179071f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/clock.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c<br/>index 4ca8b571f971..32a6e394db24 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/devs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/devs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/devs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/devs.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/host.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/platform_data/s3c-hsudc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/pmu.h&gt;</div><div class='hunk'>@@ -61,6 +62,7 @@</div><div class='ctx'> #include &lt;plat/regs-iic.h&gt;</div><div class='ctx'> #include &lt;plat/regs-serial.h&gt;</div><div class='ctx'> #include &lt;plat/regs-spi.h&gt;</div><div class='add'>+#include &lt;plat/s3c64xx-spi.h&gt;</div><div class='ctx'> </div><div class='ctx'> static u64 samsung_device_dma_mask = DMA_BIT_MASK(32);</div><div class='ctx'> </div><div class='hunk'>@@ -1461,3 +1463,129 @@ struct platform_device s3c_device_wdt = {</div><div class='ctx'> 	.resource	= s3c_wdt_resource,</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_S3C_DEV_WDT */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_S3C64XX_DEV_SPI0</div><div class='add'>+static struct resource s3c64xx_spi0_resource[] = {</div><div class='add'>+	[0] = DEFINE_RES_MEM(S3C_PA_SPI0, SZ_256),</div><div class='add'>+	[1] = DEFINE_RES_DMA(DMACH_SPI0_TX),</div><div class='add'>+	[2] = DEFINE_RES_DMA(DMACH_SPI0_RX),</div><div class='add'>+	[3] = DEFINE_RES_IRQ(IRQ_SPI0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct platform_device s3c64xx_device_spi0 = {</div><div class='add'>+	.name		= "s3c64xx-spi",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(s3c64xx_spi0_resource),</div><div class='add'>+	.resource	= s3c64xx_spi0_resource,</div><div class='add'>+	.dev = {</div><div class='add'>+		.dma_mask		= &amp;samsung_device_dma_mask,</div><div class='add'>+		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init s3c64xx_spi0_set_platdata(struct s3c64xx_spi_info *pd,</div><div class='add'>+				      int src_clk_nr, int num_cs)</div><div class='add'>+{</div><div class='add'>+	if (!pd) {</div><div class='add'>+		pr_err("%s:Need to pass platform data\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reject invalid configuration */</div><div class='add'>+	if (!num_cs || src_clk_nr &lt; 0) {</div><div class='add'>+		pr_err("%s: Invalid SPI configuration\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pd-&gt;num_cs = num_cs;</div><div class='add'>+	pd-&gt;src_clk_nr = src_clk_nr;</div><div class='add'>+	if (!pd-&gt;cfg_gpio)</div><div class='add'>+		pd-&gt;cfg_gpio = s3c64xx_spi0_cfg_gpio;</div><div class='add'>+</div><div class='add'>+	s3c_set_platdata(pd, sizeof(*pd), &amp;s3c64xx_device_spi0);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_S3C64XX_DEV_SPI0 */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_S3C64XX_DEV_SPI1</div><div class='add'>+static struct resource s3c64xx_spi1_resource[] = {</div><div class='add'>+	[0] = DEFINE_RES_MEM(S3C_PA_SPI1, SZ_256),</div><div class='add'>+	[1] = DEFINE_RES_DMA(DMACH_SPI1_TX),</div><div class='add'>+	[2] = DEFINE_RES_DMA(DMACH_SPI1_RX),</div><div class='add'>+	[3] = DEFINE_RES_IRQ(IRQ_SPI1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct platform_device s3c64xx_device_spi1 = {</div><div class='add'>+	.name		= "s3c64xx-spi",</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(s3c64xx_spi1_resource),</div><div class='add'>+	.resource	= s3c64xx_spi1_resource,</div><div class='add'>+	.dev = {</div><div class='add'>+		.dma_mask		= &amp;samsung_device_dma_mask,</div><div class='add'>+		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init s3c64xx_spi1_set_platdata(struct s3c64xx_spi_info *pd,</div><div class='add'>+				      int src_clk_nr, int num_cs)</div><div class='add'>+{</div><div class='add'>+	if (!pd) {</div><div class='add'>+		pr_err("%s:Need to pass platform data\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reject invalid configuration */</div><div class='add'>+	if (!num_cs || src_clk_nr &lt; 0) {</div><div class='add'>+		pr_err("%s: Invalid SPI configuration\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pd-&gt;num_cs = num_cs;</div><div class='add'>+	pd-&gt;src_clk_nr = src_clk_nr;</div><div class='add'>+	if (!pd-&gt;cfg_gpio)</div><div class='add'>+		pd-&gt;cfg_gpio = s3c64xx_spi1_cfg_gpio;</div><div class='add'>+</div><div class='add'>+	s3c_set_platdata(pd, sizeof(*pd), &amp;s3c64xx_device_spi1);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_S3C64XX_DEV_SPI1 */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_S3C64XX_DEV_SPI2</div><div class='add'>+static struct resource s3c64xx_spi2_resource[] = {</div><div class='add'>+	[0] = DEFINE_RES_MEM(S3C_PA_SPI2, SZ_256),</div><div class='add'>+	[1] = DEFINE_RES_DMA(DMACH_SPI2_TX),</div><div class='add'>+	[2] = DEFINE_RES_DMA(DMACH_SPI2_RX),</div><div class='add'>+	[3] = DEFINE_RES_IRQ(IRQ_SPI2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct platform_device s3c64xx_device_spi2 = {</div><div class='add'>+	.name		= "s3c64xx-spi",</div><div class='add'>+	.id		= 2,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(s3c64xx_spi2_resource),</div><div class='add'>+	.resource	= s3c64xx_spi2_resource,</div><div class='add'>+	.dev = {</div><div class='add'>+		.dma_mask		= &amp;samsung_device_dma_mask,</div><div class='add'>+		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init s3c64xx_spi2_set_platdata(struct s3c64xx_spi_info *pd,</div><div class='add'>+				      int src_clk_nr, int num_cs)</div><div class='add'>+{</div><div class='add'>+	if (!pd) {</div><div class='add'>+		pr_err("%s:Need to pass platform data\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reject invalid configuration */</div><div class='add'>+	if (!num_cs || src_clk_nr &lt; 0) {</div><div class='add'>+		pr_err("%s: Invalid SPI configuration\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pd-&gt;num_cs = num_cs;</div><div class='add'>+	pd-&gt;src_clk_nr = src_clk_nr;</div><div class='add'>+	if (!pd-&gt;cfg_gpio)</div><div class='add'>+		pd-&gt;cfg_gpio = s3c64xx_spi2_cfg_gpio;</div><div class='add'>+</div><div class='add'>+	s3c_set_platdata(pd, sizeof(*pd), &amp;s3c64xx_device_spi2);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_S3C64XX_DEV_SPI2 */</div><div class='head'>diff --git a/arch/arm/plat-samsung/dma-ops.c b/arch/arm/plat-samsung/dma-ops.c<br/>index 93a994a5dd8f..0747c77a2fd5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/dma-ops.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/dma-ops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/dma-ops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/dma-ops.c</a></div><div class='hunk'>@@ -18,32 +18,33 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/dma.h&gt;</div><div class='ctx'> </div><div class='del'>-static inline bool pl330_filter(struct dma_chan *chan, void *param)</div><div class='del'>-{</div><div class='del'>-	struct dma_pl330_peri *peri = chan-&gt;private;</div><div class='del'>-	return peri-&gt;peri_id == (unsigned)param;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static unsigned samsung_dmadev_request(enum dma_ch dma_ch,</div><div class='ctx'> 				struct samsung_dma_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_chan *chan;</div><div class='ctx'> 	dma_cap_mask_t mask;</div><div class='ctx'> 	struct dma_slave_config slave_config;</div><div class='add'>+	void *filter_param;</div><div class='ctx'> </div><div class='ctx'> 	dma_cap_zero(mask);</div><div class='ctx'> 	dma_cap_set(info-&gt;cap, mask);</div><div class='ctx'> </div><div class='del'>-	chan = dma_request_channel(mask, pl330_filter, (void *)dma_ch);</div><div class='add'>+	/*</div><div class='add'>+	 * If a dma channel property of a device node from device tree is</div><div class='add'>+	 * specified, use that as the fliter parameter.</div><div class='add'>+	 */</div><div class='add'>+	filter_param = (dma_ch == DMACH_DT_PROP) ? (void *)info-&gt;dt_dmach_prop :</div><div class='add'>+				(void *)dma_ch;</div><div class='add'>+	chan = dma_request_channel(mask, pl330_filter, filter_param);</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;direction == DMA_FROM_DEVICE) {</div><div class='add'>+	if (info-&gt;direction == DMA_DEV_TO_MEM) {</div><div class='ctx'> 		memset(&amp;slave_config, 0, sizeof(struct dma_slave_config));</div><div class='ctx'> 		slave_config.direction = info-&gt;direction;</div><div class='ctx'> 		slave_config.src_addr = info-&gt;fifo;</div><div class='ctx'> 		slave_config.src_addr_width = info-&gt;width;</div><div class='ctx'> 		slave_config.src_maxburst = 1;</div><div class='ctx'> 		dmaengine_slave_config(chan, &amp;slave_config);</div><div class='del'>-	} else if (info-&gt;direction == DMA_TO_DEVICE) {</div><div class='add'>+	} else if (info-&gt;direction == DMA_MEM_TO_DEV) {</div><div class='ctx'> 		memset(&amp;slave_config, 0, sizeof(struct dma_slave_config));</div><div class='ctx'> 		slave_config.direction = info-&gt;direction;</div><div class='ctx'> 		slave_config.dst_addr = info-&gt;fifo;</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/cpu.h b/arch/arm/plat-samsung/include/plat/cpu.h<br/>index 40fd7b6b5e66..73cb3cfd0685 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/cpu.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/cpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/cpu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/include/plat/cpu.h</a></div><div class='hunk'>@@ -152,13 +152,9 @@ extern void s3c_init_cpu(unsigned long idcode,</div><div class='ctx'> /* core initialisation functions */</div><div class='ctx'> </div><div class='ctx'> extern void s3c24xx_init_irq(void);</div><div class='del'>-extern void s3c64xx_init_irq(u32 vic0, u32 vic1);</div><div class='ctx'> extern void s5p_init_irq(u32 *vic, u32 num_vic);</div><div class='ctx'> </div><div class='ctx'> extern void s3c24xx_init_io(struct map_desc *mach_desc, int size);</div><div class='del'>-extern void s3c64xx_init_io(struct map_desc *mach_desc, int size);</div><div class='del'>-extern void s5p_init_io(struct map_desc *mach_desc,</div><div class='del'>-			int size, void __iomem *cpuid_addr);</div><div class='ctx'> </div><div class='ctx'> extern void s3c24xx_init_cpu(void);</div><div class='ctx'> extern void s3c64xx_init_cpu(void);</div><div class='hunk'>@@ -183,22 +179,20 @@ extern struct syscore_ops s3c2410_pm_syscore_ops;</div><div class='ctx'> extern struct syscore_ops s3c2412_pm_syscore_ops;</div><div class='ctx'> extern struct syscore_ops s3c2416_pm_syscore_ops;</div><div class='ctx'> extern struct syscore_ops s3c244x_pm_syscore_ops;</div><div class='del'>-extern struct syscore_ops s3c64xx_irq_syscore_ops;</div><div class='del'>-</div><div class='del'>-/* system device classes */</div><div class='del'>-</div><div class='del'>-extern struct sysdev_class s3c2410_sysclass;</div><div class='del'>-extern struct sysdev_class s3c2410a_sysclass;</div><div class='del'>-extern struct sysdev_class s3c2412_sysclass;</div><div class='del'>-extern struct sysdev_class s3c2416_sysclass;</div><div class='del'>-extern struct sysdev_class s3c2440_sysclass;</div><div class='del'>-extern struct sysdev_class s3c2442_sysclass;</div><div class='del'>-extern struct sysdev_class s3c2443_sysclass;</div><div class='del'>-extern struct sysdev_class s3c6410_sysclass;</div><div class='del'>-extern struct sysdev_class s3c64xx_sysclass;</div><div class='del'>-extern struct sysdev_class s5p64x0_sysclass;</div><div class='del'>-extern struct sysdev_class s5pv210_sysclass;</div><div class='del'>-extern struct sysdev_class exynos4_sysclass;</div><div class='add'>+</div><div class='add'>+/* system device subsystems */</div><div class='add'>+</div><div class='add'>+extern struct bus_type s3c2410_subsys;</div><div class='add'>+extern struct bus_type s3c2410a_subsys;</div><div class='add'>+extern struct bus_type s3c2412_subsys;</div><div class='add'>+extern struct bus_type s3c2416_subsys;</div><div class='add'>+extern struct bus_type s3c2440_subsys;</div><div class='add'>+extern struct bus_type s3c2442_subsys;</div><div class='add'>+extern struct bus_type s3c2443_subsys;</div><div class='add'>+extern struct bus_type s3c6410_subsys;</div><div class='add'>+extern struct bus_type s5p64x0_subsys;</div><div class='add'>+extern struct bus_type s5pv210_subsys;</div><div class='add'>+extern struct bus_type exynos4_subsys;</div><div class='ctx'> </div><div class='ctx'> extern void (*s5pc1xx_idle)(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h<br/>index ab633c9c2aec..4214ea0ff8fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/devs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/devs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/devs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/include/plat/devs.h</a></div><div class='hunk'>@@ -39,6 +39,7 @@ extern struct platform_device s3c64xx_device_pcm0;</div><div class='ctx'> extern struct platform_device s3c64xx_device_pcm1;</div><div class='ctx'> extern struct platform_device s3c64xx_device_spi0;</div><div class='ctx'> extern struct platform_device s3c64xx_device_spi1;</div><div class='add'>+extern struct platform_device s3c64xx_device_spi2;</div><div class='ctx'> </div><div class='ctx'> extern struct platform_device s3c_device_adc;</div><div class='ctx'> extern struct platform_device s3c_device_cfcon;</div><div class='hunk'>@@ -98,8 +99,6 @@ extern struct platform_device s5p6450_device_iis1;</div><div class='ctx'> extern struct platform_device s5p6450_device_iis2;</div><div class='ctx'> extern struct platform_device s5p6450_device_pcm0;</div><div class='ctx'> </div><div class='del'>-extern struct platform_device s5p64x0_device_spi0;</div><div class='del'>-extern struct platform_device s5p64x0_device_spi1;</div><div class='ctx'> </div><div class='ctx'> extern struct platform_device s5pc100_device_ac97;</div><div class='ctx'> extern struct platform_device s5pc100_device_iis0;</div><div class='hunk'>@@ -108,9 +107,6 @@ extern struct platform_device s5pc100_device_iis2;</div><div class='ctx'> extern struct platform_device s5pc100_device_pcm0;</div><div class='ctx'> extern struct platform_device s5pc100_device_pcm1;</div><div class='ctx'> extern struct platform_device s5pc100_device_spdif;</div><div class='del'>-extern struct platform_device s5pc100_device_spi0;</div><div class='del'>-extern struct platform_device s5pc100_device_spi1;</div><div class='del'>-extern struct platform_device s5pc100_device_spi2;</div><div class='ctx'> </div><div class='ctx'> extern struct platform_device s5pv210_device_ac97;</div><div class='ctx'> extern struct platform_device s5pv210_device_iis0;</div><div class='hunk'>@@ -120,8 +116,6 @@ extern struct platform_device s5pv210_device_pcm0;</div><div class='ctx'> extern struct platform_device s5pv210_device_pcm1;</div><div class='ctx'> extern struct platform_device s5pv210_device_pcm2;</div><div class='ctx'> extern struct platform_device s5pv210_device_spdif;</div><div class='del'>-extern struct platform_device s5pv210_device_spi0;</div><div class='del'>-extern struct platform_device s5pv210_device_spi1;</div><div class='ctx'> </div><div class='ctx'> extern struct platform_device exynos4_device_ac97;</div><div class='ctx'> extern struct platform_device exynos4_device_ahci;</div><div class='hunk'>@@ -129,6 +123,7 @@ extern struct platform_device exynos4_device_dwmci;</div><div class='ctx'> extern struct platform_device exynos4_device_i2s0;</div><div class='ctx'> extern struct platform_device exynos4_device_i2s1;</div><div class='ctx'> extern struct platform_device exynos4_device_i2s2;</div><div class='add'>+extern struct platform_device exynos4_device_ohci;</div><div class='ctx'> extern struct platform_device exynos4_device_pcm0;</div><div class='ctx'> extern struct platform_device exynos4_device_pcm1;</div><div class='ctx'> extern struct platform_device exynos4_device_pcm2;</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h<br/>index 4c1a363526cf..71a6827c7706 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/dma-ops.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/dma-ops.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/dma-ops.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/include/plat/dma-ops.h</a></div><div class='hunk'>@@ -14,10 +14,11 @@</div><div class='ctx'> #define __SAMSUNG_DMA_OPS_H_ __FILE__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dmaengine.h&gt;</div><div class='add'>+#include &lt;mach/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct samsung_dma_prep_info {</div><div class='ctx'> 	enum dma_transaction_type cap;</div><div class='del'>-	enum dma_data_direction direction;</div><div class='add'>+	enum dma_transfer_direction direction;</div><div class='ctx'> 	dma_addr_t buf;</div><div class='ctx'> 	unsigned long period;</div><div class='ctx'> 	unsigned long len;</div><div class='hunk'>@@ -27,10 +28,11 @@ struct samsung_dma_prep_info {</div><div class='ctx'> </div><div class='ctx'> struct samsung_dma_info {</div><div class='ctx'> 	enum dma_transaction_type cap;</div><div class='del'>-	enum dma_data_direction direction;</div><div class='add'>+	enum dma_transfer_direction direction;</div><div class='ctx'> 	enum dma_slave_buswidth width;</div><div class='ctx'> 	dma_addr_t fifo;</div><div class='ctx'> 	struct s3c2410_dma_client *client;</div><div class='add'>+	struct property *dt_dmach_prop;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct samsung_dma_ops {</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/dma-pl330.h b/arch/arm/plat-samsung/include/plat/dma-pl330.h<br/>index 2e55e5958674..c5eaad529de5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/dma-pl330.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/dma-pl330.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/dma-pl330.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/include/plat/dma-pl330.h</a></div><div class='hunk'>@@ -21,7 +21,8 @@</div><div class='ctx'>  * use these just as IDs.</div><div class='ctx'>  */</div><div class='ctx'> enum dma_ch {</div><div class='del'>-	DMACH_UART0_RX,</div><div class='add'>+	DMACH_DT_PROP = -1,</div><div class='add'>+	DMACH_UART0_RX = 0,</div><div class='ctx'> 	DMACH_UART0_TX,</div><div class='ctx'> 	DMACH_UART1_RX,</div><div class='ctx'> 	DMACH_UART1_TX,</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h b/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h<br/>index 1c1ed5481253..d01576318b2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/dma-s3c24xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/include/plat/dma-s3c24xx.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;plat/dma-core.h&gt;</div><div class='ctx'> </div><div class='del'>-extern struct sysdev_class dma_sysclass;</div><div class='add'>+extern struct bus_type dma_subsys;</div><div class='ctx'> extern struct s3c2410_dma_chan s3c2410_chans[S3C_DMA_CHANNELS];</div><div class='ctx'> </div><div class='ctx'> #define DMA_CH_VALID		(1&lt;&lt;31)</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/dma.h b/arch/arm/plat-samsung/include/plat/dma.h<br/>index b9061128abde..7b02143ccd9a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/dma.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/dma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/include/plat/dma.h</a></div><div class='hunk'>@@ -10,6 +10,9 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+#ifndef __PLAT_DMA_H</div><div class='add'>+#define __PLAT_DMA_H</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum s3c2410_dma_buffresult {</div><div class='hunk'>@@ -122,5 +125,6 @@ extern int s3c2410_dma_getposition(enum dma_ch channel,</div><div class='ctx'> extern int s3c2410_dma_set_opfn(enum dma_ch, s3c2410_dma_opfn_t rtn);</div><div class='ctx'> extern int s3c2410_dma_set_buffdone_fn(enum dma_ch, s3c2410_dma_cbfn_t rtn);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #include &lt;plat/dma-ops.h&gt;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/exynos4.h b/arch/arm/plat-samsung/include/plat/exynos4.h<br/>deleted file mode 100644<br/>index f546e88ebc94..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/exynos4.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/exynos4.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-/* linux/arch/arm/plat-samsung/include/plat/exynos4.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com</div><div class='del'>- *</div><div class='del'>- * Header file for exynos4 cpu support</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'>-/* Common init code for EXYNOS4 related SoCs */</div><div class='del'>-</div><div class='del'>-extern void exynos4_common_init_uarts(struct s3c2410_uartcfg *cfg, int no);</div><div class='del'>-extern void exynos4_register_clocks(void);</div><div class='del'>-extern void exynos4210_register_clocks(void);</div><div class='del'>-extern void exynos4212_register_clocks(void);</div><div class='del'>-extern void exynos4_setup_clocks(void);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_EXYNOS</div><div class='del'>-extern  int exynos_init(void);</div><div class='del'>-extern void exynos4_init_irq(void);</div><div class='del'>-extern void exynos4_map_io(void);</div><div class='del'>-extern void exynos4_init_clocks(int xtal);</div><div class='del'>-extern struct sys_timer exynos4_timer;</div><div class='del'>-</div><div class='del'>-#define exynos4_init_uarts exynos4_common_init_uarts</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-#define exynos4_init_clocks NULL</div><div class='del'>-#define exynos4_init_uarts NULL</div><div class='del'>-#define exynos4_map_io NULL</div><div class='del'>-#define exynos_init NULL</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/irqs.h b/arch/arm/plat-samsung/include/plat/irqs.h<br/>index 08d1a7ef97b7..df46b776976a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/irqs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/irqs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/irqs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/include/plat/irqs.h</a></div><div class='hunk'>@@ -44,13 +44,14 @@</div><div class='ctx'> #define S5P_IRQ_VIC2(x)		(S5P_VIC2_BASE + (x))</div><div class='ctx'> #define S5P_IRQ_VIC3(x)		(S5P_VIC3_BASE + (x))</div><div class='ctx'> </div><div class='del'>-#define S5P_TIMER_IRQ(x)	(11 + (x))</div><div class='add'>+#define S5P_TIMER_IRQ(x)	(IRQ_TIMER_BASE + (x))</div><div class='ctx'> </div><div class='ctx'> #define IRQ_TIMER0		S5P_TIMER_IRQ(0)</div><div class='ctx'> #define IRQ_TIMER1		S5P_TIMER_IRQ(1)</div><div class='ctx'> #define IRQ_TIMER2		S5P_TIMER_IRQ(2)</div><div class='ctx'> #define IRQ_TIMER3		S5P_TIMER_IRQ(3)</div><div class='ctx'> #define IRQ_TIMER4		S5P_TIMER_IRQ(4)</div><div class='add'>+#define IRQ_TIMER_COUNT		(5)</div><div class='ctx'> </div><div class='ctx'> #define IRQ_EINT(x)		((x) &lt; 16 ? ((x) + S5P_EINT_BASE1) \</div><div class='ctx'> 					: ((x) - 16 + S5P_EINT_BASE2))</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/keypad.h b/arch/arm/plat-samsung/include/plat/keypad.h<br/>index b59a6483cd8a..c81ace332a1e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/keypad.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/keypad.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/keypad.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/include/plat/keypad.h</a></div><div class='hunk'>@@ -13,32 +13,7 @@</div><div class='ctx'> #ifndef __PLAT_SAMSUNG_KEYPAD_H</div><div class='ctx'> #define __PLAT_SAMSUNG_KEYPAD_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/input/matrix_keypad.h&gt;</div><div class='del'>-</div><div class='del'>-#define SAMSUNG_MAX_ROWS	8</div><div class='del'>-#define SAMSUNG_MAX_COLS	8</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct samsung_keypad_platdata - Platform device data for Samsung Keypad.</div><div class='del'>- * @keymap_data: pointer to &amp;matrix_keymap_data.</div><div class='del'>- * @rows: number of keypad row supported.</div><div class='del'>- * @cols: number of keypad col supported.</div><div class='del'>- * @no_autorepeat: disable key autorepeat.</div><div class='del'>- * @wakeup: controls whether the device should be set up as wakeup source.</div><div class='del'>- * @cfg_gpio: configure the GPIO.</div><div class='del'>- *</div><div class='del'>- * Initialisation data specific to either the machine or the platform</div><div class='del'>- * for the device driver to use or call-back when configuring gpio.</div><div class='del'>- */</div><div class='del'>-struct samsung_keypad_platdata {</div><div class='del'>-	const struct matrix_keymap_data	*keymap_data;</div><div class='del'>-	unsigned int rows;</div><div class='del'>-	unsigned int cols;</div><div class='del'>-	bool no_autorepeat;</div><div class='del'>-	bool wakeup;</div><div class='del'>-</div><div class='del'>-	void (*cfg_gpio)(unsigned int rows, unsigned int cols);</div><div class='del'>-};</div><div class='add'>+#include &lt;linux/input/samsung-keypad.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * samsung_keypad_set_platdata - Set platform data for Samsung Keypad device.</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/pm.h b/arch/arm/plat-samsung/include/plat/pm.h<br/>index dcf68709f9cf..61fc53740fbd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/pm.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/pm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/pm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/include/plat/pm.h</a></div><div class='hunk'>@@ -17,11 +17,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-struct sys_device;</div><div class='add'>+struct device;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> </div><div class='ctx'> extern __init int s3c_pm_init(void);</div><div class='add'>+extern __init int s3c64xx_pm_init(void);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='hunk'>@@ -29,6 +30,11 @@ static inline int s3c_pm_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline int s3c64xx_pm_init(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* configuration for the IRQ mask over sleep */</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/regs-serial.h b/arch/arm/plat-samsung/include/plat/regs-serial.h<br/>index 720734847027..29c26a818842 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/regs-serial.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/regs-serial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/regs-serial.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/include/plat/regs-serial.h</a></div><div class='hunk'>@@ -71,6 +71,7 @@</div><div class='ctx'> #define S3C2410_LCON_IRM          (1&lt;&lt;6)</div><div class='ctx'> </div><div class='ctx'> #define S3C2440_UCON_CLKMASK	  (3&lt;&lt;10)</div><div class='add'>+#define S3C2440_UCON_CLKSHIFT	  (10)</div><div class='ctx'> #define S3C2440_UCON_PCLK	  (0&lt;&lt;10)</div><div class='ctx'> #define S3C2440_UCON_UCLK	  (1&lt;&lt;10)</div><div class='ctx'> #define S3C2440_UCON_PCLK2	  (2&lt;&lt;10)</div><div class='hunk'>@@ -78,6 +79,7 @@</div><div class='ctx'> #define S3C2443_UCON_EPLL	  (3&lt;&lt;10)</div><div class='ctx'> </div><div class='ctx'> #define S3C6400_UCON_CLKMASK	(3&lt;&lt;10)</div><div class='add'>+#define S3C6400_UCON_CLKSHIFT	(10)</div><div class='ctx'> #define S3C6400_UCON_PCLK	(0&lt;&lt;10)</div><div class='ctx'> #define S3C6400_UCON_PCLK2	(2&lt;&lt;10)</div><div class='ctx'> #define S3C6400_UCON_UCLK0	(1&lt;&lt;10)</div><div class='hunk'>@@ -90,11 +92,14 @@</div><div class='ctx'> #define S3C2440_UCON_DIVSHIFT	  (12)</div><div class='ctx'> </div><div class='ctx'> #define S3C2412_UCON_CLKMASK	(3&lt;&lt;10)</div><div class='add'>+#define S3C2412_UCON_CLKSHIFT	(10)</div><div class='ctx'> #define S3C2412_UCON_UCLK	(1&lt;&lt;10)</div><div class='ctx'> #define S3C2412_UCON_USYSCLK	(3&lt;&lt;10)</div><div class='ctx'> #define S3C2412_UCON_PCLK	(0&lt;&lt;10)</div><div class='ctx'> #define S3C2412_UCON_PCLK2	(2&lt;&lt;10)</div><div class='ctx'> </div><div class='add'>+#define S3C2410_UCON_CLKMASK	(1 &lt;&lt; 10)</div><div class='add'>+#define S3C2410_UCON_CLKSHIFT	(10)</div><div class='ctx'> #define S3C2410_UCON_UCLK	  (1&lt;&lt;10)</div><div class='ctx'> #define S3C2410_UCON_SBREAK	  (1&lt;&lt;4)</div><div class='ctx'> </div><div class='hunk'>@@ -193,6 +198,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Following are specific to S5PV210 */</div><div class='ctx'> #define S5PV210_UCON_CLKMASK	(1&lt;&lt;10)</div><div class='add'>+#define S5PV210_UCON_CLKSHIFT	(10)</div><div class='ctx'> #define S5PV210_UCON_PCLK	(0&lt;&lt;10)</div><div class='ctx'> #define S5PV210_UCON_UCLK	(1&lt;&lt;10)</div><div class='ctx'> </div><div class='hunk'>@@ -221,29 +227,24 @@</div><div class='ctx'> #define S5PV210_UFSTAT_RXMASK	(255&lt;&lt;0)</div><div class='ctx'> #define S5PV210_UFSTAT_RXSHIFT	(0)</div><div class='ctx'> </div><div class='del'>-#define NO_NEED_CHECK_CLKSRC	1</div><div class='add'>+#define S3C2410_UCON_CLKSEL0	(1 &lt;&lt; 0)</div><div class='add'>+#define S3C2410_UCON_CLKSEL1	(1 &lt;&lt; 1)</div><div class='add'>+#define S3C2410_UCON_CLKSEL2	(1 &lt;&lt; 2)</div><div class='add'>+#define S3C2410_UCON_CLKSEL3	(1 &lt;&lt; 3)</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='add'>+/* Default values for s5pv210 UCON and UFCON uart registers */</div><div class='add'>+#define S5PV210_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\</div><div class='add'>+				 S3C2410_UCON_RXILEVEL |	\</div><div class='add'>+				 S3C2410_UCON_TXIRQMODE |	\</div><div class='add'>+				 S3C2410_UCON_RXIRQMODE |	\</div><div class='add'>+				 S3C2410_UCON_RXFIFO_TOI |	\</div><div class='add'>+				 S3C2443_UCON_RXERR_IRQEN)</div><div class='ctx'> </div><div class='del'>-/* struct s3c24xx_uart_clksrc</div><div class='del'>- *</div><div class='del'>- * this structure defines a named clock source that can be used for the</div><div class='del'>- * uart, so that the best clock can be selected for the requested baud</div><div class='del'>- * rate.</div><div class='del'>- *</div><div class='del'>- * min_baud and max_baud define the range of baud-rates this clock is</div><div class='del'>- * acceptable for, if they are both zero, it is assumed any baud rate that</div><div class='del'>- * can be generated from this clock will be used.</div><div class='del'>- *</div><div class='del'>- * divisor gives the divisor from the clock to the one seen by the uart</div><div class='del'>-*/</div><div class='add'>+#define S5PV210_UFCON_DEFAULT	(S3C2410_UFCON_FIFOMODE |	\</div><div class='add'>+				 S5PV210_UFCON_TXTRIG4 |	\</div><div class='add'>+				 S5PV210_UFCON_RXTRIG4)</div><div class='ctx'> </div><div class='del'>-struct s3c24xx_uart_clksrc {</div><div class='del'>-	const char	*name;</div><div class='del'>-	unsigned int	 divisor;</div><div class='del'>-	unsigned int	 min_baud;</div><div class='del'>-	unsigned int	 max_baud;</div><div class='del'>-};</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='ctx'> /* configuration structure for per-machine configurations for the</div><div class='ctx'>  * serial port</div><div class='hunk'>@@ -257,15 +258,13 @@ struct s3c2410_uartcfg {</div><div class='ctx'> 	unsigned char	   unused;</div><div class='ctx'> 	unsigned short	   flags;</div><div class='ctx'> 	upf_t		   uart_flags;	 /* default uart flags */</div><div class='add'>+	unsigned int	   clk_sel;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int	   has_fracval;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long	   ucon;	 /* value of ucon for port */</div><div class='ctx'> 	unsigned long	   ulcon;	 /* value of ulcon for port */</div><div class='ctx'> 	unsigned long	   ufcon;	 /* value of ufcon for port */</div><div class='del'>-</div><div class='del'>-	struct s3c24xx_uart_clksrc *clocks;</div><div class='del'>-	unsigned int		    clocks_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* s3c24xx_uart_devs</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/reset.h b/arch/arm/plat-samsung/include/plat/reset.h<br/>deleted file mode 100644<br/>index 32ca5179c6e1..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/reset.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/reset.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,16 +0,0 @@</div><div class='del'>-/* linux/arch/arm/plat-samsung/include/plat/reset.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com/</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 __PLAT_SAMSUNG_RESET_H</div><div class='del'>-#define __PLAT_SAMSUNG_RESET_H __FILE__</div><div class='del'>-</div><div class='del'>-extern void (*s5p_reset_hook)(void);</div><div class='del'>-</div><div class='del'>-#endif /* __PLAT_SAMSUNG_RESET_H */</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/s3c2412.h b/arch/arm/plat-samsung/include/plat/s3c2412.h<br/>index 5bcfd143ba16..cbae50ddacc8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/s3c2412.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s3c2412.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/s3c2412.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/include/plat/s3c2412.h</a></div><div class='hunk'>@@ -21,9 +21,12 @@ extern void s3c2412_init_uarts(struct s3c2410_uartcfg *cfg, int no);</div><div class='ctx'> extern void s3c2412_init_clocks(int xtal);</div><div class='ctx'> </div><div class='ctx'> extern  int s3c2412_baseclk_add(void);</div><div class='add'>+</div><div class='add'>+extern void s3c2412_restart(char mode, const char *cmd);</div><div class='ctx'> #else</div><div class='ctx'> #define s3c2412_init_clocks NULL</div><div class='ctx'> #define s3c2412_init_uarts NULL</div><div class='ctx'> #define s3c2412_map_io NULL</div><div class='ctx'> #define s3c2412_init NULL</div><div class='add'>+#define s3c2412_restart NULL</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/s3c2416.h b/arch/arm/plat-samsung/include/plat/s3c2416.h<br/>index a764f8503f52..de2b5bdc5ebd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/s3c2416.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s3c2416.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/s3c2416.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/include/plat/s3c2416.h</a></div><div class='hunk'>@@ -23,9 +23,11 @@ extern void s3c2416_init_clocks(int xtal);</div><div class='ctx'> </div><div class='ctx'> extern  int s3c2416_baseclk_add(void);</div><div class='ctx'> </div><div class='add'>+extern void s3c2416_restart(char mode, const char *cmd);</div><div class='ctx'> #else</div><div class='ctx'> #define s3c2416_init_clocks NULL</div><div class='ctx'> #define s3c2416_init_uarts NULL</div><div class='ctx'> #define s3c2416_map_io NULL</div><div class='ctx'> #define s3c2416_init NULL</div><div class='add'>+#define s3c2416_restart NULL</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/s3c2443.h b/arch/arm/plat-samsung/include/plat/s3c2443.h<br/>index 7fae1a050694..dce05b43d51c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/s3c2443.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s3c2443.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/s3c2443.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/include/plat/s3c2443.h</a></div><div class='hunk'>@@ -24,11 +24,13 @@ extern void s3c2443_init_clocks(int xtal);</div><div class='ctx'> </div><div class='ctx'> extern  int s3c2443_baseclk_add(void);</div><div class='ctx'> </div><div class='add'>+extern void s3c2443_restart(char mode, const char *cmd);</div><div class='ctx'> #else</div><div class='ctx'> #define s3c2443_init_clocks NULL</div><div class='ctx'> #define s3c2443_init_uarts NULL</div><div class='ctx'> #define s3c2443_map_io NULL</div><div class='ctx'> #define s3c2443_init NULL</div><div class='add'>+#define s3c2443_restart NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* common code used by s3c2443 and others.</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/s3c6400.h b/arch/arm/plat-samsung/include/plat/s3c6400.h<br/>deleted file mode 100644<br/>index 37d428aaaebb..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/s3c6400.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s3c6400.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-/* linux/arch/arm/plat-samsung/include/plat/s3c6400.h</div><div class='del'>- *</div><div class='del'>- * Copyright 2008 Openmoko, Inc.</div><div class='del'>- * Copyright 2008 Simtec Electronics</div><div class='del'>- *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='del'>- *	http://armlinux.simtec.co.uk/</div><div class='del'>- *</div><div class='del'>- * Header file for s3c6400 cpu support</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'>-/* Common init code for S3C6400 related SoCs */</div><div class='del'>-</div><div class='del'>-extern void s3c6400_common_init_uarts(struct s3c2410_uartcfg *cfg, int no);</div><div class='del'>-extern void s3c6400_setup_clocks(void);</div><div class='del'>-</div><div class='del'>-extern void s3c64xx_register_clocks(unsigned long xtal, unsigned armclk_limit);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CPU_S3C6400</div><div class='del'>-</div><div class='del'>-extern  int s3c6400_init(void);</div><div class='del'>-extern void s3c6400_init_irq(void);</div><div class='del'>-extern void s3c6400_map_io(void);</div><div class='del'>-extern void s3c6400_init_clocks(int xtal);</div><div class='del'>-</div><div class='del'>-#define s3c6400_init_uarts s3c6400_common_init_uarts</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-#define s3c6400_init_clocks NULL</div><div class='del'>-#define s3c6400_init_uarts NULL</div><div class='del'>-#define s3c6400_map_io NULL</div><div class='del'>-#define s3c6400_init NULL</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/s3c6410.h b/arch/arm/plat-samsung/include/plat/s3c6410.h<br/>deleted file mode 100644<br/>index 20a6675b9d17..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/s3c6410.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s3c6410.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-/* linux/arch/arm/plat-samsung/include/plat/s3c6410.h</div><div class='del'>- *</div><div class='del'>- * Copyright 2008 Openmoko,  Inc.</div><div class='del'>- * Copyright 2008 Simtec Electronics</div><div class='del'>- *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='del'>- *	http://armlinux.simtec.co.uk/</div><div class='del'>- *</div><div class='del'>- * Header file for s3c6410 cpu support</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'>-#ifdef CONFIG_CPU_S3C6410</div><div class='del'>-</div><div class='del'>-extern  int s3c6410_init(void);</div><div class='del'>-extern void s3c6410_init_irq(void);</div><div class='del'>-extern void s3c6410_map_io(void);</div><div class='del'>-extern void s3c6410_init_clocks(int xtal);</div><div class='del'>-</div><div class='del'>-#define s3c6410_init_uarts s3c6400_common_init_uarts</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-#define s3c6410_init_clocks NULL</div><div class='del'>-#define s3c6410_init_uarts NULL</div><div class='del'>-#define s3c6410_map_io NULL</div><div class='del'>-#define s3c6410_init NULL</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h b/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h<br/>index 4c16fa3621bb..fa95e9a00972 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s3c64xx-spi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/include/plat/s3c64xx-spi.h</a></div><div class='hunk'>@@ -11,6 +11,8 @@</div><div class='ctx'> #ifndef __S3C64XX_PLAT_SPI_H</div><div class='ctx'> #define __S3C64XX_PLAT_SPI_H</div><div class='ctx'> </div><div class='add'>+struct platform_device;</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct s3c64xx_spi_csinfo - ChipSelect description</div><div class='ctx'>  * @fb_delay: Slave specific feedback delay.</div><div class='hunk'>@@ -31,7 +33,6 @@ struct s3c64xx_spi_csinfo {</div><div class='ctx'> /**</div><div class='ctx'>  * struct s3c64xx_spi_info - SPI Controller defining structure</div><div class='ctx'>  * @src_clk_nr: Clock source index for the CLK_CFG[SPI_CLKSEL] field.</div><div class='del'>- * @src_clk_name: Platform name of the corresponding clock.</div><div class='ctx'>  * @clk_from_cmu: If the SPI clock/prescalar control block is present</div><div class='ctx'>  *     by the platform's clock-management-unit and not in SPI controller.</div><div class='ctx'>  * @num_cs: Number of CS this controller emulates.</div><div class='hunk'>@@ -43,7 +44,6 @@ struct s3c64xx_spi_csinfo {</div><div class='ctx'>  */</div><div class='ctx'> struct s3c64xx_spi_info {</div><div class='ctx'> 	int src_clk_nr;</div><div class='del'>-	char *src_clk_name;</div><div class='ctx'> 	bool clk_from_cmu;</div><div class='ctx'> </div><div class='ctx'> 	int num_cs;</div><div class='hunk'>@@ -58,18 +58,28 @@ struct s3c64xx_spi_info {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * s3c64xx_spi_set_info - SPI Controller configure callback by the board</div><div class='add'>+ * s3c64xx_spi_set_platdata - SPI Controller configure callback by the board</div><div class='ctx'>  *				initialization code.</div><div class='del'>- * @cntrlr: SPI controller number the configuration is for.</div><div class='add'>+ * @pd: SPI platform data to set.</div><div class='ctx'>  * @src_clk_nr: Clock the SPI controller is to use to generate SPI clocks.</div><div class='ctx'>  * @num_cs: Number of elements in the 'cs' array.</div><div class='ctx'>  *</div><div class='ctx'>  * Call this from machine init code for each SPI Controller that</div><div class='ctx'>  * has some chips attached to it.</div><div class='ctx'>  */</div><div class='del'>-extern void s3c64xx_spi_set_info(int cntrlr, int src_clk_nr, int num_cs);</div><div class='del'>-extern void s5pc100_spi_set_info(int cntrlr, int src_clk_nr, int num_cs);</div><div class='del'>-extern void s5pv210_spi_set_info(int cntrlr, int src_clk_nr, int num_cs);</div><div class='del'>-extern void s5p64x0_spi_set_info(int cntrlr, int src_clk_nr, int num_cs);</div><div class='add'>+extern void s3c64xx_spi0_set_platdata(struct s3c64xx_spi_info *pd,</div><div class='add'>+				      int src_clk_nr, int num_cs);</div><div class='add'>+extern void s3c64xx_spi1_set_platdata(struct s3c64xx_spi_info *pd,</div><div class='add'>+				      int src_clk_nr, int num_cs);</div><div class='add'>+extern void s3c64xx_spi2_set_platdata(struct s3c64xx_spi_info *pd,</div><div class='add'>+				      int src_clk_nr, int num_cs);</div><div class='add'>+</div><div class='add'>+/* defined by architecture to configure gpio */</div><div class='add'>+extern int s3c64xx_spi0_cfg_gpio(struct platform_device *dev);</div><div class='add'>+extern int s3c64xx_spi1_cfg_gpio(struct platform_device *dev);</div><div class='add'>+extern int s3c64xx_spi2_cfg_gpio(struct platform_device *dev);</div><div class='ctx'> </div><div class='add'>+extern struct s3c64xx_spi_info s3c64xx_spi0_pdata;</div><div class='add'>+extern struct s3c64xx_spi_info s3c64xx_spi1_pdata;</div><div class='add'>+extern struct s3c64xx_spi_info s3c64xx_spi2_pdata;</div><div class='ctx'> #endif /* __S3C64XX_PLAT_SPI_H */</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/s5p6440.h b/arch/arm/plat-samsung/include/plat/s5p6440.h<br/>deleted file mode 100644<br/>index bf85ebbb4fbc..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/s5p6440.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s5p6440.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-/* linux/arch/arm/plat-samsung/include/plat/s5p6440.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2009 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com/</div><div class='del'>- *</div><div class='del'>- * Header file for s5p6440 cpu support</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'>- /* Common init code for S5P6440 related SoCs */</div><div class='del'>-</div><div class='del'>-extern void s5p6440_register_clocks(void);</div><div class='del'>-extern void s5p6440_setup_clocks(void);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CPU_S5P6440</div><div class='del'>-</div><div class='del'>-extern  int s5p64x0_init(void);</div><div class='del'>-extern void s5p6440_init_irq(void);</div><div class='del'>-extern void s5p6440_map_io(void);</div><div class='del'>-extern void s5p6440_init_clocks(int xtal);</div><div class='del'>-</div><div class='del'>-extern void s5p6440_init_uarts(struct s3c2410_uartcfg *cfg, int no);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-#define s5p6440_init_clocks NULL</div><div class='del'>-#define s5p6440_init_uarts NULL</div><div class='del'>-#define s5p6440_map_io NULL</div><div class='del'>-#define s5p64x0_init NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* S5P6440 timer */</div><div class='del'>-</div><div class='del'>-extern struct sys_timer s5p6440_timer;</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/s5p6450.h b/arch/arm/plat-samsung/include/plat/s5p6450.h<br/>deleted file mode 100644<br/>index da25f9a1c54a..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/s5p6450.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s5p6450.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-/* linux/arch/arm/plat-samsung/include/plat/s5p6450.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com</div><div class='del'>- *</div><div class='del'>- * Header file for s5p6450 cpu support</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'>-/* Common init code for S5P6450 related SoCs */</div><div class='del'>-</div><div class='del'>-extern void s5p6450_register_clocks(void);</div><div class='del'>-extern void s5p6450_setup_clocks(void);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CPU_S5P6450</div><div class='del'>-</div><div class='del'>-extern  int s5p64x0_init(void);</div><div class='del'>-extern void s5p6450_init_irq(void);</div><div class='del'>-extern void s5p6450_map_io(void);</div><div class='del'>-extern void s5p6450_init_clocks(int xtal);</div><div class='del'>-</div><div class='del'>-extern void s5p6450_init_uarts(struct s3c2410_uartcfg *cfg, int no);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-#define s5p6450_init_clocks NULL</div><div class='del'>-#define s5p6450_init_uarts NULL</div><div class='del'>-#define s5p6450_map_io NULL</div><div class='del'>-#define s5p64x0_init NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* S5P6450 timer */</div><div class='del'>-</div><div class='del'>-extern struct sys_timer s5p6450_timer;</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/s5pc100.h b/arch/arm/plat-samsung/include/plat/s5pc100.h<br/>deleted file mode 100644<br/>index 9a21aeaaf452..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/s5pc100.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s5pc100.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-/* linux/arch/arm/plat-samsung/include/plat/s5pc100.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com/</div><div class='del'>- *</div><div class='del'>- * Header file for s5pc100 cpu support</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'>-/* Common init code for S5PC100 related SoCs */</div><div class='del'>-</div><div class='del'>-extern void s5pc100_common_init_uarts(struct s3c2410_uartcfg *cfg, int no);</div><div class='del'>-extern void s5pc100_register_clocks(void);</div><div class='del'>-extern void s5pc100_setup_clocks(void);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CPU_S5PC100</div><div class='del'>-</div><div class='del'>-extern  int s5pc100_init(void);</div><div class='del'>-extern void s5pc100_init_irq(void);</div><div class='del'>-extern void s5pc100_map_io(void);</div><div class='del'>-extern void s5pc100_init_clocks(int xtal);</div><div class='del'>-</div><div class='del'>-#define s5pc100_init_uarts s5pc100_common_init_uarts</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-#define s5pc100_init_clocks NULL</div><div class='del'>-#define s5pc100_init_uarts NULL</div><div class='del'>-#define s5pc100_map_io NULL</div><div class='del'>-#define s5pc100_init NULL</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/s5pv210.h b/arch/arm/plat-samsung/include/plat/s5pv210.h<br/>deleted file mode 100644<br/>index b4bc6be77072..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/s5pv210.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/s5pv210.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-/* linux/arch/arm/plat-samsung/include/plat/s5pv210.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com/</div><div class='del'>- *</div><div class='del'>- * Header file for s5pv210 cpu support</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'>-/* Common init code for S5PV210 related SoCs */</div><div class='del'>-</div><div class='del'>-extern void s5pv210_common_init_uarts(struct s3c2410_uartcfg *cfg, int no);</div><div class='del'>-extern void s5pv210_register_clocks(void);</div><div class='del'>-extern void s5pv210_setup_clocks(void);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CPU_S5PV210</div><div class='del'>-</div><div class='del'>-extern  int s5pv210_init(void);</div><div class='del'>-extern void s5pv210_init_irq(void);</div><div class='del'>-extern void s5pv210_map_io(void);</div><div class='del'>-extern void s5pv210_init_clocks(int xtal);</div><div class='del'>-</div><div class='del'>-#define s5pv210_init_uarts s5pv210_common_init_uarts</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-#define s5pv210_init_clocks NULL</div><div class='del'>-#define s5pv210_init_uarts NULL</div><div class='del'>-#define s5pv210_map_io NULL</div><div class='del'>-#define s5pv210_init NULL</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat-samsung/include/plat/sdhci.h<br/>index e7b3c752e919..f82f888b91a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/sdhci.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/sdhci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/sdhci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/include/plat/sdhci.h</a></div><div class='hunk'>@@ -63,11 +63,10 @@ enum clk_types {</div><div class='ctx'> struct s3c_sdhci_platdata {</div><div class='ctx'> 	unsigned int	max_width;</div><div class='ctx'> 	unsigned int	host_caps;</div><div class='add'>+	unsigned int	pm_caps;</div><div class='ctx'> 	enum cd_types	cd_type;</div><div class='ctx'> 	enum clk_types	clk_type;</div><div class='ctx'> </div><div class='del'>-	char		**clocks;	/* set of clock sources */</div><div class='del'>-</div><div class='ctx'> 	int		ext_cd_gpio;</div><div class='ctx'> 	bool		ext_cd_gpio_invert;</div><div class='ctx'> 	int	(*ext_cd_init)(void (*notify_func)(struct platform_device *,</div><div class='hunk'>@@ -125,16 +124,17 @@ extern void exynos4_setup_sdhci0_cfg_gpio(struct platform_device *, int w);</div><div class='ctx'> extern void exynos4_setup_sdhci1_cfg_gpio(struct platform_device *, int w);</div><div class='ctx'> extern void exynos4_setup_sdhci2_cfg_gpio(struct platform_device *, int w);</div><div class='ctx'> extern void exynos4_setup_sdhci3_cfg_gpio(struct platform_device *, int w);</div><div class='add'>+extern void s5p64x0_setup_sdhci0_cfg_gpio(struct platform_device *, int w);</div><div class='add'>+extern void s5p64x0_setup_sdhci1_cfg_gpio(struct platform_device *, int w);</div><div class='add'>+extern void s5p6440_setup_sdhci2_cfg_gpio(struct platform_device *, int w);</div><div class='add'>+extern void s5p6450_setup_sdhci2_cfg_gpio(struct platform_device *, int w);</div><div class='ctx'> </div><div class='ctx'> /* S3C2416 SDHCI setup */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_S3C2416_SETUP_SDHCI</div><div class='del'>-extern char *s3c2416_hsmmc_clksrcs[4];</div><div class='del'>-</div><div class='ctx'> static inline void s3c2416_default_sdhci0(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC</div><div class='del'>-	s3c_hsmmc0_def_platdata.clocks = s3c2416_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc0_def_platdata.cfg_gpio = s3c2416_setup_sdhci0_cfg_gpio;</div><div class='ctx'> #endif /* CONFIG_S3C_DEV_HSMMC */</div><div class='ctx'> }</div><div class='hunk'>@@ -142,7 +142,6 @@ static inline void s3c2416_default_sdhci0(void)</div><div class='ctx'> static inline void s3c2416_default_sdhci1(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC1</div><div class='del'>-	s3c_hsmmc1_def_platdata.clocks = s3c2416_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc1_def_platdata.cfg_gpio = s3c2416_setup_sdhci1_cfg_gpio;</div><div class='ctx'> #endif /* CONFIG_S3C_DEV_HSMMC1 */</div><div class='ctx'> }</div><div class='hunk'>@@ -152,15 +151,13 @@ static inline void s3c2416_default_sdhci0(void) { }</div><div class='ctx'> static inline void s3c2416_default_sdhci1(void) { }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_S3C2416_SETUP_SDHCI */</div><div class='add'>+</div><div class='ctx'> /* S3C64XX SDHCI setup */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_S3C64XX_SETUP_SDHCI</div><div class='del'>-extern char *s3c64xx_hsmmc_clksrcs[4];</div><div class='del'>-</div><div class='ctx'> static inline void s3c6400_default_sdhci0(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC</div><div class='del'>-	s3c_hsmmc0_def_platdata.clocks = s3c64xx_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc0_def_platdata.cfg_gpio = s3c64xx_setup_sdhci0_cfg_gpio;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -168,7 +165,6 @@ static inline void s3c6400_default_sdhci0(void)</div><div class='ctx'> static inline void s3c6400_default_sdhci1(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC1</div><div class='del'>-	s3c_hsmmc1_def_platdata.clocks = s3c64xx_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc1_def_platdata.cfg_gpio = s3c64xx_setup_sdhci1_cfg_gpio;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -176,7 +172,6 @@ static inline void s3c6400_default_sdhci1(void)</div><div class='ctx'> static inline void s3c6400_default_sdhci2(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC2</div><div class='del'>-	s3c_hsmmc2_def_platdata.clocks = s3c64xx_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc2_def_platdata.cfg_gpio = s3c64xx_setup_sdhci2_cfg_gpio;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -184,7 +179,6 @@ static inline void s3c6400_default_sdhci2(void)</div><div class='ctx'> static inline void s3c6410_default_sdhci0(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC</div><div class='del'>-	s3c_hsmmc0_def_platdata.clocks = s3c64xx_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc0_def_platdata.cfg_gpio = s3c64xx_setup_sdhci0_cfg_gpio;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -192,7 +186,6 @@ static inline void s3c6410_default_sdhci0(void)</div><div class='ctx'> static inline void s3c6410_default_sdhci1(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC1</div><div class='del'>-	s3c_hsmmc1_def_platdata.clocks = s3c64xx_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc1_def_platdata.cfg_gpio = s3c64xx_setup_sdhci1_cfg_gpio;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -200,7 +193,6 @@ static inline void s3c6410_default_sdhci1(void)</div><div class='ctx'> static inline void s3c6410_default_sdhci2(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC2</div><div class='del'>-	s3c_hsmmc2_def_platdata.clocks = s3c64xx_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc2_def_platdata.cfg_gpio = s3c64xx_setup_sdhci2_cfg_gpio;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -215,15 +207,51 @@ static inline void s3c6400_default_sdhci2(void) { }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_S3C64XX_SETUP_SDHCI */</div><div class='ctx'> </div><div class='add'>+/* S5P64X0 SDHCI setup */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_S5P64X0_SETUP_SDHCI</div><div class='add'>+static inline void s5p64x0_default_sdhci0(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_S3C_DEV_HSMMC</div><div class='add'>+	s3c_hsmmc0_def_platdata.cfg_gpio = s5p64x0_setup_sdhci0_cfg_gpio;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void s5p64x0_default_sdhci1(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_S3C_DEV_HSMMC1</div><div class='add'>+	s3c_hsmmc1_def_platdata.cfg_gpio = s5p64x0_setup_sdhci1_cfg_gpio;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void s5p6440_default_sdhci2(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_S3C_DEV_HSMMC2</div><div class='add'>+	s3c_hsmmc2_def_platdata.cfg_gpio = s5p6440_setup_sdhci2_cfg_gpio;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void s5p6450_default_sdhci2(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_S3C_DEV_HSMMC2</div><div class='add'>+	s3c_hsmmc2_def_platdata.cfg_gpio = s5p6450_setup_sdhci2_cfg_gpio;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static inline void s5p64x0_default_sdhci0(void) { }</div><div class='add'>+static inline void s5p64x0_default_sdhci1(void) { }</div><div class='add'>+static inline void s5p6440_default_sdhci2(void) { }</div><div class='add'>+static inline void s5p6450_default_sdhci2(void) { }</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_S5P64X0_SETUP_SDHCI */</div><div class='add'>+</div><div class='ctx'> /* S5PC100 SDHCI setup */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_S5PC100_SETUP_SDHCI</div><div class='del'>-extern char *s5pc100_hsmmc_clksrcs[4];</div><div class='del'>-</div><div class='ctx'> static inline void s5pc100_default_sdhci0(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC</div><div class='del'>-	s3c_hsmmc0_def_platdata.clocks = s5pc100_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc0_def_platdata.cfg_gpio = s5pc100_setup_sdhci0_cfg_gpio;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -231,7 +259,6 @@ static inline void s5pc100_default_sdhci0(void)</div><div class='ctx'> static inline void s5pc100_default_sdhci1(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC1</div><div class='del'>-	s3c_hsmmc1_def_platdata.clocks = s5pc100_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc1_def_platdata.cfg_gpio = s5pc100_setup_sdhci1_cfg_gpio;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -239,7 +266,6 @@ static inline void s5pc100_default_sdhci1(void)</div><div class='ctx'> static inline void s5pc100_default_sdhci2(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC2</div><div class='del'>-	s3c_hsmmc2_def_platdata.clocks = s5pc100_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc2_def_platdata.cfg_gpio = s5pc100_setup_sdhci2_cfg_gpio;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -254,12 +280,9 @@ static inline void s5pc100_default_sdhci2(void) { }</div><div class='ctx'> /* S5PV210 SDHCI setup */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_S5PV210_SETUP_SDHCI</div><div class='del'>-extern char *s5pv210_hsmmc_clksrcs[4];</div><div class='del'>-</div><div class='ctx'> static inline void s5pv210_default_sdhci0(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC</div><div class='del'>-	s3c_hsmmc0_def_platdata.clocks = s5pv210_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc0_def_platdata.cfg_gpio = s5pv210_setup_sdhci0_cfg_gpio;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -267,7 +290,6 @@ static inline void s5pv210_default_sdhci0(void)</div><div class='ctx'> static inline void s5pv210_default_sdhci1(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC1</div><div class='del'>-	s3c_hsmmc1_def_platdata.clocks = s5pv210_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc1_def_platdata.cfg_gpio = s5pv210_setup_sdhci1_cfg_gpio;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -275,7 +297,6 @@ static inline void s5pv210_default_sdhci1(void)</div><div class='ctx'> static inline void s5pv210_default_sdhci2(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC2</div><div class='del'>-	s3c_hsmmc2_def_platdata.clocks = s5pv210_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc2_def_platdata.cfg_gpio = s5pv210_setup_sdhci2_cfg_gpio;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -283,7 +304,6 @@ static inline void s5pv210_default_sdhci2(void)</div><div class='ctx'> static inline void s5pv210_default_sdhci3(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC3</div><div class='del'>-	s3c_hsmmc3_def_platdata.clocks = s5pv210_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc3_def_platdata.cfg_gpio = s5pv210_setup_sdhci3_cfg_gpio;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -298,12 +318,9 @@ static inline void s5pv210_default_sdhci3(void) { }</div><div class='ctx'> </div><div class='ctx'> /* EXYNOS4 SDHCI setup */</div><div class='ctx'> #ifdef CONFIG_EXYNOS4_SETUP_SDHCI</div><div class='del'>-extern char *exynos4_hsmmc_clksrcs[4];</div><div class='del'>-</div><div class='ctx'> static inline void exynos4_default_sdhci0(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC</div><div class='del'>-	s3c_hsmmc0_def_platdata.clocks = exynos4_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc0_def_platdata.cfg_gpio = exynos4_setup_sdhci0_cfg_gpio;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -311,7 +328,6 @@ static inline void exynos4_default_sdhci0(void)</div><div class='ctx'> static inline void exynos4_default_sdhci1(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC1</div><div class='del'>-	s3c_hsmmc1_def_platdata.clocks = exynos4_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc1_def_platdata.cfg_gpio = exynos4_setup_sdhci1_cfg_gpio;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -319,7 +335,6 @@ static inline void exynos4_default_sdhci1(void)</div><div class='ctx'> static inline void exynos4_default_sdhci2(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC2</div><div class='del'>-	s3c_hsmmc2_def_platdata.clocks = exynos4_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc2_def_platdata.cfg_gpio = exynos4_setup_sdhci2_cfg_gpio;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -327,7 +342,6 @@ static inline void exynos4_default_sdhci2(void)</div><div class='ctx'> static inline void exynos4_default_sdhci3(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_S3C_DEV_HSMMC3</div><div class='del'>-	s3c_hsmmc3_def_platdata.clocks = exynos4_hsmmc_clksrcs;</div><div class='ctx'> 	s3c_hsmmc3_def_platdata.cfg_gpio = exynos4_setup_sdhci3_cfg_gpio;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/system-reset.h b/arch/arm/plat-samsung/include/plat/system-reset.h<br/>deleted file mode 100644<br/>index a448e990964d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/system-reset.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/system-reset.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-/* linux/arch/arm/plat-samsung/include/plat/system-reset.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2010 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com</div><div class='del'>- *</div><div class='del'>- * Based on arch/arm/mach-s3c2410/include/mach/system-reset.h</div><div class='del'>- *</div><div class='del'>- * S5P - System define for arch_reset()</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;plat/watchdog-reset.h&gt;</div><div class='del'>-</div><div class='del'>-void (*s5p_reset_hook)(void);</div><div class='del'>-</div><div class='del'>-static void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	/* SWRESET support in s5p_reset_hook() */</div><div class='del'>-</div><div class='del'>-	if (s5p_reset_hook)</div><div class='del'>-		s5p_reset_hook();</div><div class='del'>-</div><div class='del'>-	/* Perform reset using Watchdog reset</div><div class='del'>-	 * if there is no s5p_reset_hook()</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	arch_wdt_reset();</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/udc.h b/arch/arm/plat-samsung/include/plat/udc.h<br/>index 8c22d586befb..de8e2288a509 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/udc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/udc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/udc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/include/plat/udc.h</a></div><div class='hunk'>@@ -37,20 +37,7 @@ struct s3c2410_udc_mach_info {</div><div class='ctx'> </div><div class='ctx'> extern void __init s3c24xx_udc_set_platdata(struct s3c2410_udc_mach_info *);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * s3c24xx_hsudc_platdata - Platform data for USB High-Speed gadget controller.</div><div class='del'>- * @epnum: Number of endpoints to be instantiated by the controller driver.</div><div class='del'>- * @gpio_init: Platform specific USB related GPIO initialization.</div><div class='del'>- * @gpio_uninit: Platform specific USB releted GPIO uninitialzation.</div><div class='del'>- *</div><div class='del'>- * Representation of platform data for the S3C24XX USB 2.0 High Speed gadget</div><div class='del'>- * controllers.</div><div class='del'>- */</div><div class='del'>-struct s3c24xx_hsudc_platdata {</div><div class='del'>-	unsigned int	epnum;</div><div class='del'>-	void		(*gpio_init)(void);</div><div class='del'>-	void		(*gpio_uninit)(void);</div><div class='del'>-};</div><div class='add'>+struct s3c24xx_hsudc_platdata;</div><div class='ctx'> </div><div class='ctx'> extern void __init s3c24xx_hsudc_set_platdata(struct s3c24xx_hsudc_platdata *pd);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-samsung/include/plat/watchdog-reset.h b/arch/arm/plat-samsung/include/plat/watchdog-reset.h<br/>index 40dbb2b0ae22..f19aff19205c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/watchdog-reset.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/include/plat/watchdog-reset.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/include/plat/watchdog-reset.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/include/plat/watchdog-reset.h</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void arch_wdt_reset(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/plat-samsung/platformdata.c b/arch/arm/plat-samsung/platformdata.c<br/>index ceb9fa3a80c0..0f707184eae0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/platformdata.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/platformdata.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/platformdata.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/platformdata.c</a></div><div class='hunk'>@@ -53,6 +53,8 @@ void s3c_sdhci_set_platdata(struct s3c_sdhci_platdata *pd,</div><div class='ctx'> 		set-&gt;cfg_gpio = pd-&gt;cfg_gpio;</div><div class='ctx'> 	if (pd-&gt;host_caps)</div><div class='ctx'> 		set-&gt;host_caps |= pd-&gt;host_caps;</div><div class='add'>+	if (pd-&gt;pm_caps)</div><div class='add'>+		set-&gt;pm_caps |= pd-&gt;pm_caps;</div><div class='ctx'> 	if (pd-&gt;clk_type)</div><div class='ctx'> 		set-&gt;clk_type = pd-&gt;clk_type;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/plat-samsung/pm-gpio.c b/arch/arm/plat-samsung/pm-gpio.c<br/>index 4be016eaa6db..c2ff92c30bdf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/pm-gpio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/pm-gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/pm-gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/pm-gpio.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.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/gpio.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-samsung/wakeup-mask.c b/arch/arm/plat-samsung/wakeup-mask.c<br/>index dc814037297b..20c3d9117cc2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/wakeup-mask.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-samsung/wakeup-mask.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-samsung/wakeup-mask.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-samsung/wakeup-mask.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</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='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-spear/Makefile b/arch/arm/plat-spear/Makefile<br/>index b4f340b8f1f1..e0f2e5b9530c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-spear/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-spear/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-spear/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-spear/Makefile</a></div><div class='hunk'>@@ -3,6 +3,6 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> # Common support</div><div class='del'>-obj-y	:= clock.o time.o</div><div class='add'>+obj-y	:= clock.o restart.o time.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ARCH_SPEAR3XX)	+= shirq.o padmux.o</div><div class='head'>diff --git a/arch/arm/plat-spear/include/plat/system.h b/arch/arm/plat-spear/include/plat/system.h<br/>index a235fa0ca777..86c6f83b44cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-spear/include/plat/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-spear/include/plat/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-spear/include/plat/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-spear/include/plat/system.h</a></div><div class='hunk'>@@ -14,10 +14,6 @@</div><div class='ctx'> #ifndef __PLAT_SYSTEM_H</div><div class='ctx'> #define __PLAT_SYSTEM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware/sp810.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline void arch_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -27,15 +23,4 @@ static inline void arch_idle(void)</div><div class='ctx'> 	cpu_do_idle();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	if (mode == 's') {</div><div class='del'>-		/* software reset, Jump into ROM at address 0 */</div><div class='del'>-		cpu_reset(0);</div><div class='del'>-	} else {</div><div class='del'>-		/* hardware reset, Use on-chip reset capability */</div><div class='del'>-		sysctl_soft_reset((void __iomem *)VA_SPEAR_SYS_CTRL_BASE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif /* __PLAT_SYSTEM_H */</div><div class='head'>diff --git a/arch/arm/plat-spear/include/plat/vmalloc.h b/arch/arm/plat-spear/include/plat/vmalloc.h<br/>deleted file mode 100644<br/>index 8c8b24d07046..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-spear/include/plat/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-spear/include/plat/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/arm/plat-spear/include/plat/vmalloc.h</div><div class='del'>- *</div><div class='del'>- * Defining Vmalloc area for SPEAr platform</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 ST Microelectronics</div><div class='del'>- * Viresh Kumar&lt;viresh.kumar@st.com&gt;</div><div class='del'>- *</div><div class='del'>- * This file is licensed under the terms of the GNU General Public</div><div class='del'>- * License version 2. This program is licensed "as is" without any</div><div class='del'>- * warranty of any kind, whether express or implied.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __PLAT_VMALLOC_H</div><div class='del'>-#define __PLAT_VMALLOC_H</div><div class='del'>-</div><div class='del'>-#define VMALLOC_END		0xF0000000UL</div><div class='del'>-</div><div class='del'>-#endif /* __PLAT_VMALLOC_H */</div><div class='head'>diff --git a/arch/arm/plat-spear/restart.c b/arch/arm/plat-spear/restart.c<br/>new file mode 100644<br/>index 000000000000..2b4e3d82957c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-spear/restart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-spear/restart.c</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/plat-spear/restart.c</div><div class='add'>+ *</div><div class='add'>+ * SPEAr platform specific restart functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2009 ST Microelectronics</div><div class='add'>+ * Viresh Kumar&lt;viresh.kumar@st.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2. This program is licensed "as is" without any</div><div class='add'>+ * warranty of any kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;asm/hardware/sp810.h&gt;</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+#include &lt;mach/generic.h&gt;</div><div class='add'>+</div><div class='add'>+void spear_restart(char mode, const char *cmd)</div><div class='add'>+{</div><div class='add'>+	if (mode == 's') {</div><div class='add'>+		/* software reset, Jump into ROM at address 0 */</div><div class='add'>+		soft_restart(0);</div><div class='add'>+	} else {</div><div class='add'>+		/* hardware reset, Use on-chip reset capability */</div><div class='add'>+		sysctl_soft_reset((void __iomem *)VA_SPEAR_SYS_CTRL_BASE);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/plat-tcc/Kconfig b/arch/arm/plat-tcc/Kconfig<br/>deleted file mode 100644<br/>index 1bf499570f42..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-tcc/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-if ARCH_TCC_926</div><div class='del'>-</div><div class='del'>-menu "Telechips ARM926-based CPUs"</div><div class='del'>-</div><div class='del'>-choice</div><div class='del'>-	prompt "Telechips CPU type:"</div><div class='del'>-	default ARCH_TCC8K</div><div class='del'>-</div><div class='del'>-config ARCH_TCC8K</div><div class='del'>-	bool TCC8000</div><div class='del'>-	select USB_ARCH_HAS_OHCI</div><div class='del'>-	help</div><div class='del'>-	  Support for Telechips TCC8000 systems</div><div class='del'>-</div><div class='del'>-endchoice</div><div class='del'>-</div><div class='del'>-source "arch/arm/mach-tcc8k/Kconfig"</div><div class='del'>-</div><div class='del'>-endmenu</div><div class='del'>-endif</div><div class='head'>diff --git a/arch/arm/plat-tcc/Makefile b/arch/arm/plat-tcc/Makefile<br/>deleted file mode 100644<br/>index eceabc869b8f..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-tcc/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-# "Telechips Platform Common Modules"</div><div class='del'>-</div><div class='del'>-obj-y := clock.o system.o</div><div class='head'>diff --git a/arch/arm/plat-tcc/clock.c b/arch/arm/plat-tcc/clock.c<br/>deleted file mode 100644<br/>index f3ced10d5271..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-tcc/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/clock.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,179 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Clock framework for Telechips SoCs</div><div class='del'>- * Based on arch/arm/plat-mxc/clock.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2004 - 2005 Nokia corporation</div><div class='del'>- * Written by Tuukka Tikkanen &lt;tuukka.tikkanen@elektrobit.com&gt;</div><div class='del'>- * Modified for omap shared clock framework by Tony Lindgren &lt;tony@atomide.com&gt;</div><div class='del'>- * Copyright 2007 Freescale Semiconductor, Inc. All Rights Reserved.</div><div class='del'>- * Copyright 2008 Juergen Beisert, kernel@pengutronix.de</div><div class='del'>- * Copyright 2010 Hans J. Koch, hjk@linutronix.de</div><div class='del'>- *</div><div class='del'>- * Licensed under the terms of the GPL v2.</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/err.h&gt;</div><div class='del'>-#include &lt;linux/errno.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/string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/clock.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-</div><div class='del'>-static DEFINE_MUTEX(clocks_mutex);</div><div class='del'>-</div><div class='del'>-/*-------------------------------------------------------------------------</div><div class='del'>- * Standard clock functions defined in include/linux/clk.h</div><div class='del'>- *-------------------------------------------------------------------------*/</div><div class='del'>-</div><div class='del'>-static void __clk_disable(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(clk-&gt;refcount == 0);</div><div class='del'>-</div><div class='del'>-	if (!(--clk-&gt;refcount) &amp;&amp; clk-&gt;disable) {</div><div class='del'>-		/* Unconditionally disable the clock in hardware */</div><div class='del'>-		clk-&gt;disable(clk);</div><div class='del'>-		/* recursively disable parents */</div><div class='del'>-		if (clk-&gt;parent)</div><div class='del'>-			__clk_disable(clk-&gt;parent);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __clk_enable(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (clk-&gt;refcount++ == 0 &amp;&amp; clk-&gt;enable) {</div><div class='del'>-		if (clk-&gt;parent)</div><div class='del'>-			ret = __clk_enable(clk-&gt;parent);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		else</div><div class='del'>-			return clk-&gt;enable(clk);</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'>-/* This function increments the reference count on the clock and enables the</div><div class='del'>- * clock if not already enabled. The parent clock tree is recursively enabled</div><div class='del'>- */</div><div class='del'>-int clk_enable(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!clk)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;clocks_mutex);</div><div class='del'>-	ret = __clk_enable(clk);</div><div class='del'>-	mutex_unlock(&amp;clocks_mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(clk_enable);</div><div class='del'>-</div><div class='del'>-/* This function decrements the reference count on the clock and disables</div><div class='del'>- * the clock when reference count is 0. The parent clock tree is</div><div class='del'>- * recursively disabled</div><div class='del'>- */</div><div class='del'>-void clk_disable(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	if (!clk)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;clocks_mutex);</div><div class='del'>-	__clk_disable(clk);</div><div class='del'>-	mutex_unlock(&amp;clocks_mutex);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(clk_disable);</div><div class='del'>-</div><div class='del'>-/* Retrieve the *current* clock rate. If the clock itself</div><div class='del'>- * does not provide a special calculation routine, ask</div><div class='del'>- * its parent and so on, until one is able to return</div><div class='del'>- * a valid clock rate</div><div class='del'>- */</div><div class='del'>-unsigned long clk_get_rate(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	if (!clk)</div><div class='del'>-		return 0UL;</div><div class='del'>-</div><div class='del'>-	if (clk-&gt;get_rate)</div><div class='del'>-		return clk-&gt;get_rate(clk);</div><div class='del'>-</div><div class='del'>-	return clk_get_rate(clk-&gt;parent);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(clk_get_rate);</div><div class='del'>-</div><div class='del'>-/* Round the requested clock rate to the nearest supported</div><div class='del'>- * rate that is less than or equal to the requested rate.</div><div class='del'>- * This is dependent on the clock's current parent.</div><div class='del'>- */</div><div class='del'>-long clk_round_rate(struct clk *clk, unsigned long rate)</div><div class='del'>-{</div><div class='del'>-	if (!clk)</div><div class='del'>-		return 0;</div><div class='del'>-	if (!clk-&gt;round_rate)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return clk-&gt;round_rate(clk, rate);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(clk_round_rate);</div><div class='del'>-</div><div class='del'>-/* Set the clock to the requested clock rate. The rate must</div><div class='del'>- * match a supported rate exactly based on what clk_round_rate returns</div><div class='del'>- */</div><div class='del'>-int clk_set_rate(struct clk *clk, unsigned long rate)</div><div class='del'>-{</div><div class='del'>-	int ret = -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!clk)</div><div class='del'>-		return ret;</div><div class='del'>-	if (!clk-&gt;set_rate || !rate)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;clocks_mutex);</div><div class='del'>-	ret = clk-&gt;set_rate(clk, rate);</div><div class='del'>-	mutex_unlock(&amp;clocks_mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(clk_set_rate);</div><div class='del'>-</div><div class='del'>-/* Set the clock's parent to another clock source */</div><div class='del'>-int clk_set_parent(struct clk *clk, struct clk *parent)</div><div class='del'>-{</div><div class='del'>-	struct clk *old;</div><div class='del'>-	int ret = -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!clk)</div><div class='del'>-		return ret;</div><div class='del'>-	if (!clk-&gt;set_parent || !parent)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;clocks_mutex);</div><div class='del'>-	old = clk-&gt;parent;</div><div class='del'>-	if (clk-&gt;refcount)</div><div class='del'>-		__clk_enable(parent);</div><div class='del'>-	ret = clk-&gt;set_parent(clk, parent);</div><div class='del'>-	if (ret)</div><div class='del'>-		old = parent;</div><div class='del'>-	if (clk-&gt;refcount)</div><div class='del'>-		__clk_disable(old);</div><div class='del'>-	mutex_unlock(&amp;clocks_mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(clk_set_parent);</div><div class='del'>-</div><div class='del'>-/* Retrieve the clock's parent clock source */</div><div class='del'>-struct clk *clk_get_parent(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	if (!clk)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return clk-&gt;parent;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(clk_get_parent);</div><div class='head'>diff --git a/arch/arm/plat-tcc/include/mach/clock.h b/arch/arm/plat-tcc/include/mach/clock.h<br/>deleted file mode 100644<br/>index a12f58ad71a8..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-tcc/include/mach/clock.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/clock.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,48 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Low level clock header file for Telechips TCC architecture</div><div class='del'>- * (C) 2010 Hans J. Koch &lt;hjk@linutronix.de&gt;</div><div class='del'>- *</div><div class='del'>- * Licensed under the GPL v2.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __ASM_ARCH_TCC_CLOCK_H__</div><div class='del'>-#define __ASM_ARCH_TCC_CLOCK_H__</div><div class='del'>-</div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-</div><div class='del'>-struct clk {</div><div class='del'>-	struct clk *parent;</div><div class='del'>-	/* id number of a root clock, 0 for normal clocks */</div><div class='del'>-	int root_id;</div><div class='del'>-	/* Reference count of clock enable/disable */</div><div class='del'>-	int refcount;</div><div class='del'>-	/* Address of associated BCLKCTRx register. Must be set. */</div><div class='del'>-	void __iomem *bclkctr;</div><div class='del'>-	/* Bit position for BCLKCTRx. Must be set. */</div><div class='del'>-	int bclk_shift;</div><div class='del'>-	/* Address of ACLKxxx register, if any. */</div><div class='del'>-	void __iomem *aclkreg;</div><div class='del'>-	/* get the current clock rate (always a fresh value) */</div><div class='del'>-	unsigned long (*get_rate) (struct clk *);</div><div class='del'>-	/* Function ptr to set the clock to a new rate. The rate must match a</div><div class='del'>-	   supported rate returned from round_rate. Leave blank if clock is not</div><div class='del'>-	   programmable */</div><div class='del'>-	int (*set_rate) (struct clk *, unsigned long);</div><div class='del'>-	/* Function ptr to round the requested clock rate to the nearest</div><div class='del'>-	   supported rate that is less than or equal to the requested rate. */</div><div class='del'>-	unsigned long (*round_rate) (struct clk *, unsigned long);</div><div class='del'>-	/* Function ptr to enable the clock. Leave blank if clock can not</div><div class='del'>-	   be gated. */</div><div class='del'>-	int (*enable) (struct clk *);</div><div class='del'>-	/* Function ptr to disable the clock. Leave blank if clock can not</div><div class='del'>-	   be gated. */</div><div class='del'>-	void (*disable) (struct clk *);</div><div class='del'>-	/* Function ptr to set the parent clock of the clock. */</div><div class='del'>-	int (*set_parent) (struct clk *, struct clk *);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int clk_register(struct clk *clk);</div><div class='del'>-void clk_unregister(struct clk *clk);</div><div class='del'>-</div><div class='del'>-#endif /* __ASSEMBLY__ */</div><div class='del'>-#endif /* __ASM_ARCH_MXC_CLOCK_H__ */</div><div class='head'>diff --git a/arch/arm/plat-tcc/include/mach/debug-macro.S b/arch/arm/plat-tcc/include/mach/debug-macro.S<br/>deleted file mode 100644<br/>index cf17d04ec30d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-tcc/include/mach/debug-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/debug-macro.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 1994-1999 Russell King</div><div class='del'>- * Copyright (C) 2008-2009 Telechips</div><div class='del'>- * Copyright (C) 2009 Hans J. Koch &lt;hjk@linutronix.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'>- */</div><div class='del'>-</div><div class='del'>-		.macro	addruart, rp, rv, tmp</div><div class='del'>-		moveq	\rp, #0x90000000	@ physical base address</div><div class='del'>-		movne	\rv, #0xF1000000	@ virtual base</div><div class='del'>-		orr	\rp, \rp, #0x00007000	@ UART0</div><div class='del'>-		orr	\rv, \rv, #0x00007000	@ UART0</div><div class='del'>-		.endm</div><div class='del'>-</div><div class='del'>-		.macro	senduart,rd,rx</div><div class='del'>-		strb	\rd, [\rx, #0x44]</div><div class='del'>-		.endm</div><div class='del'>-</div><div class='del'>-		.macro	waituart,rd,rx</div><div class='del'>-		.endm</div><div class='del'>-</div><div class='del'>-		.macro	busyuart,rd,rx</div><div class='del'>-1001:</div><div class='del'>-		ldr \rd, [\rx, #0x14]</div><div class='del'>-		tst \rd, #0x20</div><div class='del'>-</div><div class='del'>-		beq 1001b</div><div class='del'>-		.endm</div><div class='head'>diff --git a/arch/arm/plat-tcc/include/mach/entry-macro.S b/arch/arm/plat-tcc/include/mach/entry-macro.S<br/>deleted file mode 100644<br/>index 748f401e4b6d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-tcc/include/mach/entry-macro.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/entry-macro.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * include/asm-arm/arch-tcc83x/entry-macro.S</div><div class='del'>- *</div><div class='del'>- * Author : &lt;linux@telechips.com&gt;</div><div class='del'>- * Created: June 10, 2008</div><div class='del'>- * Description: Low-level IRQ helper macros for Telechips-based platforms</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2008-2009 Telechips</div><div class='del'>- *</div><div class='del'>- * This file is licensed under  the terms of the GNU General Public</div><div class='del'>- * License version 2. This program is licensed "as is" without any</div><div class='del'>- * warranty of any kind, whether express or implied.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/irqs.h&gt;</div><div class='del'>-</div><div class='del'>-	.macro	disable_fiq</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro  get_irqnr_preamble, base, tmp</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro  arch_ret_to_user, tmp1, tmp2</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp</div><div class='del'>-</div><div class='del'>-		ldr	\base, =0xF2003000 @ base address of PIC registers</div><div class='del'>-</div><div class='del'>-		@@ read MREQ register of PIC0</div><div class='del'>-</div><div class='del'>-		mov	\irqnr, #0</div><div class='del'>-		ldr	\irqstat, [\base, #0x00000014 ]	@ lower 32 interrupts</div><div class='del'>-		cmp	\irqstat, #0</div><div class='del'>-		bne	1001f</div><div class='del'>-</div><div class='del'>-		@@ read MREQ register of PIC1</div><div class='del'>-</div><div class='del'>-		ldr	\irqstat, [\base, #0x00000094]	@ upper 32 interrupts</div><div class='del'>-		cmp	\irqstat, #0</div><div class='del'>-		beq	1002f</div><div class='del'>-		mov	\irqnr, #0x20</div><div class='del'>-</div><div class='del'>-1001:</div><div class='del'>-		movs	\tmp, \irqstat, lsl #16</div><div class='del'>-		movne	\irqstat, \tmp</div><div class='del'>-		addeq	\irqnr, \irqnr, #16</div><div class='del'>-</div><div class='del'>-		movs	\tmp, \irqstat, lsl #8</div><div class='del'>-		movne	\irqstat, \tmp</div><div class='del'>-		addeq	\irqnr, \irqnr, #8</div><div class='del'>-</div><div class='del'>-		movs	\tmp, \irqstat, lsl #4</div><div class='del'>-		movne	\irqstat, \tmp</div><div class='del'>-		addeq	\irqnr, \irqnr, #4</div><div class='del'>-</div><div class='del'>-		movs	\tmp, \irqstat, lsl #2</div><div class='del'>-		movne	\irqstat, \tmp</div><div class='del'>-		addeq	\irqnr, \irqnr, #2</div><div class='del'>-</div><div class='del'>-		movs	\tmp, \irqstat, lsl #1</div><div class='del'>-		addeq	\irqnr, \irqnr, #1</div><div class='del'>-		orrs	\base, \base, #1</div><div class='del'>-1002:</div><div class='del'>-		@@ exit here, Z flag unset if IRQ</div><div class='del'>-</div><div class='del'>-	.endm</div><div class='head'>diff --git a/arch/arm/plat-tcc/include/mach/hardware.h b/arch/arm/plat-tcc/include/mach/hardware.h<br/>deleted file mode 100644<br/>index e70d126ccaf3..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-tcc/include/mach/hardware.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/hardware.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Author: RidgeRun, Inc. Greg Lonnon &lt;glonnon@ridgerun.com&gt;</div><div class='del'>- * Reorganized for Linux-2.6 by Tony Lindgren &lt;tony@atomide.com&gt;</div><div class='del'>- *                          and Dirk Behme &lt;dirk.behme@de.bosch.com&gt;</div><div class='del'>- * Rewritten by:    &lt;linux@telechips.com&gt;</div><div class='del'>- * Description: Hardware definitions for TCC8300 processors and boards</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 RidgeRun, Inc.</div><div class='del'>- * Copyright (C) 2008-2009 Telechips</div><div class='del'>- *</div><div class='del'>- * Modifications for mainline (C) 2009 Hans J. Koch &lt;hjk@linutronix.de&gt;</div><div class='del'>- *</div><div class='del'>- * Licensed under the terms of the GNU Pulic License version 2.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __ASM_ARCH_TCC_HARDWARE_H</div><div class='del'>-#define __ASM_ARCH_TCC_HARDWARE_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm/sizes.h&gt;</div><div class='del'>-#ifndef __ASSEMBLER__</div><div class='del'>-#include &lt;asm/types.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#include &lt;mach/io.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ----------------------------------------------------------------------------</div><div class='del'>- * Clocks</div><div class='del'>- * ----------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-#define CLKGEN_REG_BASE		0xfffece00</div><div class='del'>-#define ARM_CKCTL		(CLKGEN_REG_BASE + 0x0)</div><div class='del'>-#define ARM_IDLECT1		(CLKGEN_REG_BASE + 0x4)</div><div class='del'>-#define ARM_IDLECT2		(CLKGEN_REG_BASE + 0x8)</div><div class='del'>-#define ARM_EWUPCT		(CLKGEN_REG_BASE + 0xC)</div><div class='del'>-#define ARM_RSTCT1		(CLKGEN_REG_BASE + 0x10)</div><div class='del'>-#define ARM_RSTCT2		(CLKGEN_REG_BASE + 0x14)</div><div class='del'>-#define ARM_SYSST		(CLKGEN_REG_BASE + 0x18)</div><div class='del'>-#define ARM_IDLECT3		(CLKGEN_REG_BASE + 0x24)</div><div class='del'>-</div><div class='del'>-/* DPLL control registers */</div><div class='del'>-#define DPLL_CTL		0xfffecf00</div><div class='del'>-</div><div class='del'>-#endif	/* __ASM_ARCH_TCC_HARDWARE_H */</div><div class='head'>diff --git a/arch/arm/plat-tcc/include/mach/io.h b/arch/arm/plat-tcc/include/mach/io.h<br/>deleted file mode 100644<br/>index 3e911d3ea0f1..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-tcc/include/mach/io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/io.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,23 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * IO definitions for TCC8000 processors and boards</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1997-1999 Russell King</div><div class='del'>- * Copyright (C) 2008-2009 Telechips</div><div class='del'>- * Copyright (C) 2010 Hans J. Koch &lt;hjk@linutronix.de&gt;</div><div class='del'>- *</div><div class='del'>- * Licensed under the terms of the GNU Public License version 2.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __ASM_ARM_ARCH_IO_H</div><div class='del'>-#define __ASM_ARM_ARCH_IO_H</div><div class='del'>-</div><div class='del'>-#define IO_SPACE_LIMIT 0xffffffff</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We don't actually have real ISA nor PCI buses, but there is so many</div><div class='del'>- * drivers out there that might just work if we fake them...</div><div class='del'>- */</div><div class='del'>-#define __io(a)			__typesafe_io(a)</div><div class='del'>-#define __mem_pci(a)		(a)</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/plat-tcc/include/mach/irqs.h b/arch/arm/plat-tcc/include/mach/irqs.h<br/>deleted file mode 100644<br/>index da863894d498..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-tcc/include/mach/irqs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/irqs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * IRQ definitions for TCC8xxx</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2008-2009 Telechips</div><div class='del'>- * Copyright (C) 2009 Hans J. Koch &lt;hjk@linutronix.de&gt;</div><div class='del'>- *</div><div class='del'>- * Licensed under the terms of the GPL v2.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __ASM_ARCH_TCC_IRQS_H</div><div class='del'>-#define __ASM_ARCH_TCC_IRQS_H</div><div class='del'>-</div><div class='del'>-#define NR_IRQS 64</div><div class='del'>-</div><div class='del'>-/* PIC0 interrupts */</div><div class='del'>-#define INT_ADMA1	0</div><div class='del'>-#define INT_BDMA	1</div><div class='del'>-#define INT_ADMA0	2</div><div class='del'>-#define INT_GDMA1	3</div><div class='del'>-#define INT_I2S0RX	4</div><div class='del'>-#define INT_I2S0TX	5</div><div class='del'>-#define INT_TC		6</div><div class='del'>-#define INT_UART0	7</div><div class='del'>-#define INT_USBD	8</div><div class='del'>-#define INT_SPI0TX	9</div><div class='del'>-#define INT_UDMA	10</div><div class='del'>-#define INT_LIRQ	11</div><div class='del'>-#define INT_GDMA2	12</div><div class='del'>-#define INT_GDMA0	13</div><div class='del'>-#define INT_TC32	14</div><div class='del'>-#define INT_LCD		15</div><div class='del'>-#define INT_ADC		16</div><div class='del'>-#define INT_I2C		17</div><div class='del'>-#define INT_RTCP	18</div><div class='del'>-#define INT_RTCA	19</div><div class='del'>-#define INT_NFC		20</div><div class='del'>-#define INT_SD0		21</div><div class='del'>-#define INT_GSB0	22</div><div class='del'>-#define INT_PK		23</div><div class='del'>-#define INT_USBH0	24</div><div class='del'>-#define INT_USBH1	25</div><div class='del'>-#define INT_G2D		26</div><div class='del'>-#define INT_ECC		27</div><div class='del'>-#define INT_SPI0RX	28</div><div class='del'>-#define INT_UART1	29</div><div class='del'>-#define INT_MSCL	30</div><div class='del'>-#define INT_GSB1	31</div><div class='del'>-/* PIC1 interrupts */</div><div class='del'>-#define INT_E0		32</div><div class='del'>-#define INT_E1		33</div><div class='del'>-#define INT_E2		34</div><div class='del'>-#define INT_E3		35</div><div class='del'>-#define INT_E4		36</div><div class='del'>-#define INT_E5		37</div><div class='del'>-#define INT_E6		38</div><div class='del'>-#define INT_E7		39</div><div class='del'>-#define INT_UART2	40</div><div class='del'>-#define INT_UART3	41</div><div class='del'>-#define INT_SPI1TX	42</div><div class='del'>-#define INT_SPI1RX	43</div><div class='del'>-#define INT_GSB2	44</div><div class='del'>-#define INT_SPDIF	45</div><div class='del'>-#define INT_CDIF	46</div><div class='del'>-#define INT_VBON	47</div><div class='del'>-#define INT_VBOFF	48</div><div class='del'>-#define INT_SD1		49</div><div class='del'>-#define INT_UART4	50</div><div class='del'>-#define INT_GDMA3	51</div><div class='del'>-#define INT_I2S1RX	52</div><div class='del'>-#define INT_I2S1TX	53</div><div class='del'>-#define INT_CAN0	54</div><div class='del'>-#define INT_CAN1	55</div><div class='del'>-#define INT_GSB3	56</div><div class='del'>-#define INT_KRST	57</div><div class='del'>-#define INT_UNUSED	58</div><div class='del'>-#define INT_SD0D3	59</div><div class='del'>-#define INT_SD1D3	60</div><div class='del'>-#define INT_GPS0	61</div><div class='del'>-#define INT_GPS1	62</div><div class='del'>-#define INT_GPS2	63</div><div class='del'>-</div><div class='del'>-#endif  /* ASM_ARCH_TCC_IRQS_H */</div><div class='head'>diff --git a/arch/arm/plat-tcc/include/mach/system.h b/arch/arm/plat-tcc/include/mach/system.h<br/>deleted file mode 100644<br/>index 909e6035d843..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-tcc/include/mach/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/system.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Author: &lt;linux@telechips.com&gt;</div><div class='del'>- * Created: June 10, 2008</div><div class='del'>- * Description: LINUX SYSTEM FUNCTIONS for TCC83x</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2008-2009 Telechips</div><div class='del'>- *</div><div class='del'>- * Licensed under the terms of the GPL v2.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __ASM_ARCH_SYSTEM_H</div><div class='del'>-#define __ASM_ARCH_SYSTEM_H</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-</div><div class='del'>-extern void plat_tcc_reboot(void);</div><div class='del'>-</div><div class='del'>-static inline void arch_idle(void)</div><div class='del'>-{</div><div class='del'>-	cpu_do_idle();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void arch_reset(char mode, const char *cmd)</div><div class='del'>-{</div><div class='del'>-	plat_tcc_reboot();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/arm/plat-tcc/include/mach/tcc8k-regs.h b/arch/arm/plat-tcc/include/mach/tcc8k-regs.h<br/>deleted file mode 100644<br/>index 1d9428295332..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-tcc/include/mach/tcc8k-regs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/tcc8k-regs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,807 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Telechips TCC8000 register definitions</div><div class='del'>- *</div><div class='del'>- * (C) 2009 Hans J. Koch &lt;hjk@linutronix.de&gt;</div><div class='del'>- *</div><div class='del'>- * Licensed under the terms of the GPLv2.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef TCC8K_REGS_H</div><div class='del'>-#define TCC8K_REGS_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#define EXT_SDRAM_BASE		0x20000000</div><div class='del'>-#define INT_SRAM_BASE		0x30000000</div><div class='del'>-#define INT_SRAM_SIZE		SZ_32K</div><div class='del'>-#define CS0_BASE		0x40000000</div><div class='del'>-#define CS1_BASE		0x50000000</div><div class='del'>-#define CS1_SIZE		SZ_64K</div><div class='del'>-#define CS2_BASE		0x60000000</div><div class='del'>-#define CS3_BASE		0x70000000</div><div class='del'>-#define AHB_PERI_BASE		0x80000000</div><div class='del'>-#define AHB_PERI_SIZE		SZ_64K</div><div class='del'>-#define APB0_PERI_BASE		0x90000000</div><div class='del'>-#define APB0_PERI_SIZE		SZ_128K</div><div class='del'>-#define APB1_PERI_BASE		0x98000000</div><div class='del'>-#define APB1_PERI_SIZE		SZ_128K</div><div class='del'>-#define DATA_TCM_BASE		0xa0000000</div><div class='del'>-#define DATA_TCM_SIZE		SZ_8K</div><div class='del'>-#define EXT_MEM_CTRL_BASE	0xf0000000</div><div class='del'>-#define EXT_MEM_CTRL_SIZE	SZ_4K</div><div class='del'>-</div><div class='del'>-#define CS1_BASE_VIRT		(void __iomem *)0xf7000000</div><div class='del'>-#define AHB_PERI_BASE_VIRT	(void __iomem *)0xf4000000</div><div class='del'>-#define APB0_PERI_BASE_VIRT	(void __iomem *)0xf1000000</div><div class='del'>-#define APB1_PERI_BASE_VIRT	(void __iomem *)0xf2000000</div><div class='del'>-#define EXT_MEM_CTRL_BASE_VIRT	(void __iomem *)0xf3000000</div><div class='del'>-#define INT_SRAM_BASE_VIRT	(void __iomem *)0xf5000000</div><div class='del'>-#define DATA_TCM_BASE_VIRT	(void __iomem *)0xf6000000</div><div class='del'>-</div><div class='del'>-#define __REG(x)     (*((volatile u32 *)(x)))</div><div class='del'>-</div><div class='del'>-/* USB Device Controller Registers */</div><div class='del'>-#define UDC_BASE	(AHB_PERI_BASE_VIRT + 0x8000)</div><div class='del'>-#define UDC_BASE_PHYS	(AHB_PERI_BASE + 0x8000)</div><div class='del'>-</div><div class='del'>-#define UDC_IR_OFFS		0x00</div><div class='del'>-#define UDC_EIR_OFFS		0x04</div><div class='del'>-#define UDC_EIER_OFFS		0x08</div><div class='del'>-#define UDC_FAR_OFFS		0x0c</div><div class='del'>-#define UDC_FNR_OFFS		0x10</div><div class='del'>-#define UDC_EDR_OFFS		0x14</div><div class='del'>-#define UDC_RT_OFFS		0x18</div><div class='del'>-#define UDC_SSR_OFFS		0x1c</div><div class='del'>-#define UDC_SCR_OFFS		0x20</div><div class='del'>-#define UDC_EP0SR_OFFS		0x24</div><div class='del'>-#define UDC_EP0CR_OFFS		0x28</div><div class='del'>-</div><div class='del'>-#define UDC_ESR_OFFS		0x2c</div><div class='del'>-#define UDC_ECR_OFFS		0x30</div><div class='del'>-#define UDC_BRCR_OFFS		0x34</div><div class='del'>-#define UDC_BWCR_OFFS		0x38</div><div class='del'>-#define UDC_MPR_OFFS		0x3c</div><div class='del'>-#define UDC_DCR_OFFS		0x40</div><div class='del'>-#define UDC_DTCR_OFFS		0x44</div><div class='del'>-#define UDC_DFCR_OFFS		0x48</div><div class='del'>-#define UDC_DTTCR1_OFFS		0x4c</div><div class='del'>-#define UDC_DTTCR2_OFFS		0x50</div><div class='del'>-#define UDC_ESR2_OFFS		0x54</div><div class='del'>-</div><div class='del'>-#define UDC_SCR2_OFFS		0x58</div><div class='del'>-#define UDC_EP0BUF_OFFS		0x60</div><div class='del'>-#define UDC_EP1BUF_OFFS		0x64</div><div class='del'>-#define UDC_EP2BUF_OFFS		0x68</div><div class='del'>-#define UDC_EP3BUF_OFFS		0x6c</div><div class='del'>-#define UDC_PLICR_OFFS		0xa0</div><div class='del'>-#define UDC_PCR_OFFS		0xa4</div><div class='del'>-</div><div class='del'>-#define UDC_UPCR0_OFFS		0xc8</div><div class='del'>-#define UDC_UPCR1_OFFS		0xcc</div><div class='del'>-#define UDC_UPCR2_OFFS		0xd0</div><div class='del'>-#define UDC_UPCR3_OFFS		0xd4</div><div class='del'>-</div><div class='del'>-/* Bits in UDC_EIR */</div><div class='del'>-#define UDC_EIR_EP0I		(1 &lt;&lt; 0)</div><div class='del'>-#define UDC_EIR_EP1I		(1 &lt;&lt; 1)</div><div class='del'>-#define UDC_EIR_EP2I		(1 &lt;&lt; 2)</div><div class='del'>-#define UDC_EIR_EP3I		(1 &lt;&lt; 3)</div><div class='del'>-#define UDC_EIR_EPI_MASK	0x0f</div><div class='del'>-</div><div class='del'>-/* Bits in UDC_EIER */</div><div class='del'>-#define UDC_EIER_EP0IE		(1 &lt;&lt; 0)</div><div class='del'>-#define UDC_EIER_EP1IE		(1 &lt;&lt; 1)</div><div class='del'>-#define UDC_EIER_EP2IE		(1 &lt;&lt; 2)</div><div class='del'>-#define UDC_EIER_EP3IE		(1 &lt;&lt; 3)</div><div class='del'>-</div><div class='del'>-/* Bits in UDC_FNR */</div><div class='del'>-#define UDC_FNR_FN_MASK		0x7ff</div><div class='del'>-#define UDC_FNR_SM		(1 &lt;&lt; 13)</div><div class='del'>-#define UDC_FNR_FTL		(1 &lt;&lt; 14)</div><div class='del'>-</div><div class='del'>-/* Bits in UDC_SSR */</div><div class='del'>-#define UDC_SSR_HFRES		(1 &lt;&lt; 0)</div><div class='del'>-#define UDC_SSR_HFSUSP		(1 &lt;&lt; 1)</div><div class='del'>-#define UDC_SSR_HFRM		(1 &lt;&lt; 2)</div><div class='del'>-#define UDC_SSR_SDE		(1 &lt;&lt; 3)</div><div class='del'>-#define UDC_SSR_HSP		(1 &lt;&lt; 4)</div><div class='del'>-#define UDC_SSR_DM		(1 &lt;&lt; 5)</div><div class='del'>-#define UDC_SSR_DP		(1 &lt;&lt; 6)</div><div class='del'>-#define UDC_SSR_TBM		(1 &lt;&lt; 7)</div><div class='del'>-#define UDC_SSR_VBON		(1 &lt;&lt; 8)</div><div class='del'>-#define UDC_SSR_VBOFF		(1 &lt;&lt; 9)</div><div class='del'>-#define UDC_SSR_EOERR		(1 &lt;&lt; 10)</div><div class='del'>-#define UDC_SSR_DCERR		(1 &lt;&lt; 11)</div><div class='del'>-#define UDC_SSR_TCERR		(1 &lt;&lt; 12)</div><div class='del'>-#define UDC_SSR_BSERR		(1 &lt;&lt; 13)</div><div class='del'>-#define UDC_SSR_TMERR		(1 &lt;&lt; 14)</div><div class='del'>-#define UDC_SSR_BAERR		(1 &lt;&lt; 15)</div><div class='del'>-</div><div class='del'>-/* Bits in UDC_SCR */</div><div class='del'>-#define UDC_SCR_HRESE		(1 &lt;&lt; 0)</div><div class='del'>-#define UDC_SCR_HSSPE		(1 &lt;&lt; 1)</div><div class='del'>-#define UDC_SCR_RRDE		(1 &lt;&lt; 5)</div><div class='del'>-#define UDC_SCR_SPDEN		(1 &lt;&lt; 6)</div><div class='del'>-#define UDC_SCR_DIEN		(1 &lt;&lt; 12)</div><div class='del'>-</div><div class='del'>-/* Bits in UDC_EP0SR */</div><div class='del'>-#define UDC_EP0SR_RSR		(1 &lt;&lt; 0)</div><div class='del'>-#define UDC_EP0SR_TST		(1 &lt;&lt; 1)</div><div class='del'>-#define UDC_EP0SR_SHT		(1 &lt;&lt; 4)</div><div class='del'>-#define UDC_EP0SR_LWO		(1 &lt;&lt; 6)</div><div class='del'>-</div><div class='del'>-/* Bits in UDC_EP0CR */</div><div class='del'>-#define UDC_EP0CR_ESS		(1 &lt;&lt; 1)</div><div class='del'>-</div><div class='del'>-/* Bits in UDC_ESR */</div><div class='del'>-#define UDC_ESR_RPS		(1 &lt;&lt; 0)</div><div class='del'>-#define UDC_ESR_TPS		(1 &lt;&lt; 1)</div><div class='del'>-#define UDC_ESR_LWO		(1 &lt;&lt; 4)</div><div class='del'>-#define UDC_ESR_FFS		(1 &lt;&lt; 6)</div><div class='del'>-</div><div class='del'>-/* Bits in UDC_ECR */</div><div class='del'>-#define UDC_ECR_ESS		(1 &lt;&lt; 1)</div><div class='del'>-#define UDC_ECR_CDP		(1 &lt;&lt; 2)</div><div class='del'>-</div><div class='del'>-#define UDC_ECR_FLUSH		(1 &lt;&lt; 6)</div><div class='del'>-#define UDC_ECR_DUEN		(1 &lt;&lt; 7)</div><div class='del'>-</div><div class='del'>-/* Bits in UDC_UPCR0 */</div><div class='del'>-#define UDC_UPCR0_VBD		(1 &lt;&lt; 1)</div><div class='del'>-#define UDC_UPCR0_VBDS		(1 &lt;&lt; 6)</div><div class='del'>-#define UDC_UPCR0_RCD_12	(0x0 &lt;&lt; 9)</div><div class='del'>-#define UDC_UPCR0_RCD_24	(0x1 &lt;&lt; 9)</div><div class='del'>-#define UDC_UPCR0_RCD_48	(0x2 &lt;&lt; 9)</div><div class='del'>-#define UDC_UPCR0_RCS_EXT	(0x1 &lt;&lt; 11)</div><div class='del'>-#define UDC_UPCR0_RCS_XTAL	(0x0 &lt;&lt; 11)</div><div class='del'>-</div><div class='del'>-/* Bits in UDC_UPCR1 */</div><div class='del'>-#define UDC_UPCR1_CDT(x)	((x) &lt;&lt; 0)</div><div class='del'>-#define UDC_UPCR1_OTGT(x)	((x) &lt;&lt; 3)</div><div class='del'>-#define UDC_UPCR1_SQRXT(x)	((x) &lt;&lt; 8)</div><div class='del'>-#define UDC_UPCR1_TXFSLST(x)	((x) &lt;&lt; 12)</div><div class='del'>-</div><div class='del'>-/* Bits in UDC_UPCR2 */</div><div class='del'>-#define UDC_UPCR2_TP		(1 &lt;&lt; 0)</div><div class='del'>-#define UDC_UPCR2_TXRT(x)	((x) &lt;&lt; 2)</div><div class='del'>-#define UDC_UPCR2_TXVRT(x)	((x) &lt;&lt; 5)</div><div class='del'>-#define UDC_UPCR2_OPMODE(x)	((x) &lt;&lt; 9)</div><div class='del'>-#define UDC_UPCR2_XCVRSEL(x)	((x) &lt;&lt; 12)</div><div class='del'>-#define UDC_UPCR2_TM		(1 &lt;&lt; 14)</div><div class='del'>-</div><div class='del'>-/* USB Host Controller registers */</div><div class='del'>-#define USBH0_BASE	(AHB_PERI_BASE_VIRT + 0xb000)</div><div class='del'>-#define USBH1_BASE	(AHB_PERI_BASE_VIRT + 0xb800)</div><div class='del'>-</div><div class='del'>-#define OHCI_INT_ENABLE_OFFS	0x10</div><div class='del'>-</div><div class='del'>-#define RH_DESCRIPTOR_A_OFFS	0x48</div><div class='del'>-#define RH_DESCRIPTOR_B_OFFS	0x4c</div><div class='del'>-</div><div class='del'>-#define USBHTCFG0_OFFS		0x100</div><div class='del'>-#define USBHHCFG0_OFFS		0x104</div><div class='del'>-#define USBHHCFG1_OFFS		0x104</div><div class='del'>-</div><div class='del'>-/* DMA controller registers */</div><div class='del'>-#define DMAC0_BASE	(AHB_PERI_BASE + 0x4000)</div><div class='del'>-#define DMAC1_BASE	(AHB_PERI_BASE + 0xa000)</div><div class='del'>-#define DMAC2_BASE	(AHB_PERI_BASE + 0x4800)</div><div class='del'>-#define DMAC3_BASE	(AHB_PERI_BASE + 0xa800)</div><div class='del'>-</div><div class='del'>-#define DMAC_CH_OFFSET(ch)	(ch * 0x30)</div><div class='del'>-</div><div class='del'>-#define ST_SADR_OFFS		0x00</div><div class='del'>-#define SPARAM_OFFS		0x04</div><div class='del'>-#define C_SADR_OFFS		0x0c</div><div class='del'>-#define ST_DADR_OFFS		0x10</div><div class='del'>-#define DPARAM_OFFS		0x14</div><div class='del'>-#define C_DADR_OFFS		0x1c</div><div class='del'>-#define HCOUNT_OFFS		0x20</div><div class='del'>-#define CHCTRL_OFFS		0x24</div><div class='del'>-#define RPTCTRL_OFFS		0x28</div><div class='del'>-#define EXTREQ_A_OFFS		0x2c</div><div class='del'>-</div><div class='del'>-/* Bits in CHCTRL register */</div><div class='del'>-#define CHCTRL_EN		(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#define CHCTRL_IEN		(1 &lt;&lt; 2)</div><div class='del'>-#define CHCTRL_FLAG		(1 &lt;&lt; 3)</div><div class='del'>-#define CHCTRL_WSIZE8		(0 &lt;&lt; 4)</div><div class='del'>-#define CHCTRL_WSIZE16		(1 &lt;&lt; 4)</div><div class='del'>-#define CHCTRL_WSIZE32		(2 &lt;&lt; 4)</div><div class='del'>-</div><div class='del'>-#define CHCTRL_BSIZE1		(0 &lt;&lt; 6)</div><div class='del'>-#define CHCTRL_BSIZE2		(1 &lt;&lt; 6)</div><div class='del'>-#define CHCTRL_BSIZE4		(2 &lt;&lt; 6)</div><div class='del'>-#define CHCTRL_BSIZE8		(3 &lt;&lt; 6)</div><div class='del'>-</div><div class='del'>-#define CHCTRL_TYPE_SINGLE_E	(0 &lt;&lt; 8)</div><div class='del'>-#define CHCTRL_TYPE_HW		(1 &lt;&lt; 8)</div><div class='del'>-#define CHCTRL_TYPE_SW		(2 &lt;&lt; 8)</div><div class='del'>-#define CHCTRL_TYPE_SINGLE_L	(3 &lt;&lt; 8)</div><div class='del'>-</div><div class='del'>-#define CHCTRL_BST		(1 &lt;&lt; 10)</div><div class='del'>-</div><div class='del'>-/* Use DMA controller 0, channel 2 for USB */</div><div class='del'>-#define USB_DMA_BASE		(DMAC0_BASE + DMAC_CH_OFFSET(2))</div><div class='del'>-</div><div class='del'>-/* NAND flash controller registers */</div><div class='del'>-#define NFC_BASE	(AHB_PERI_BASE_VIRT + 0xd000)</div><div class='del'>-#define NFC_BASE_PHYS	(AHB_PERI_BASE + 0xd000)</div><div class='del'>-</div><div class='del'>-#define NFC_CMD_OFFS		0x00</div><div class='del'>-#define NFC_LADDR_OFFS		0x04</div><div class='del'>-#define NFC_BADDR_OFFS		0x08</div><div class='del'>-#define NFC_SADDR_OFFS		0x0c</div><div class='del'>-#define NFC_WDATA_OFFS		0x10</div><div class='del'>-#define NFC_LDATA_OFFS		0x20</div><div class='del'>-#define NFC_SDATA_OFFS		0x40</div><div class='del'>-#define NFC_CTRL_OFFS		0x50</div><div class='del'>-#define NFC_PSTART_OFFS		0x54</div><div class='del'>-#define NFC_RSTART_OFFS		0x58</div><div class='del'>-#define NFC_DSIZE_OFFS		0x5c</div><div class='del'>-#define NFC_IREQ_OFFS		0x60</div><div class='del'>-#define NFC_RST_OFFS		0x64</div><div class='del'>-#define NFC_CTRL1_OFFS		0x68</div><div class='del'>-#define NFC_MDATA_OFFS		0x70</div><div class='del'>-</div><div class='del'>-#define NFC_WDATA_PHYS_ADDR	(NFC_BASE_PHYS + NFC_WDATA_OFFS)</div><div class='del'>-</div><div class='del'>-/* Bits in NFC_CTRL */</div><div class='del'>-#define NFC_CTRL_BHLD_MASK	(0xf &lt;&lt; 0)</div><div class='del'>-#define NFC_CTRL_BPW_MASK	(0xf &lt;&lt; 4)</div><div class='del'>-#define NFC_CTRL_BSTP_MASK	(0xf &lt;&lt; 8)</div><div class='del'>-#define NFC_CTRL_CADDR_MASK	(0x7 &lt;&lt; 12)</div><div class='del'>-#define NFC_CTRL_CADDR_1	(0x0 &lt;&lt; 12)</div><div class='del'>-#define NFC_CTRL_CADDR_2	(0x1 &lt;&lt; 12)</div><div class='del'>-#define NFC_CTRL_CADDR_3	(0x2 &lt;&lt; 12)</div><div class='del'>-#define NFC_CTRL_CADDR_4	(0x3 &lt;&lt; 12)</div><div class='del'>-#define NFC_CTRL_CADDR_5	(0x4 &lt;&lt; 12)</div><div class='del'>-#define NFC_CTRL_MSK		(1 &lt;&lt; 15)</div><div class='del'>-#define NFC_CTRL_PSIZE256	(0 &lt;&lt; 16)</div><div class='del'>-#define NFC_CTRL_PSIZE512	(1 &lt;&lt; 16)</div><div class='del'>-#define NFC_CTRL_PSIZE1024	(2 &lt;&lt; 16)</div><div class='del'>-#define NFC_CTRL_PSIZE2048	(3 &lt;&lt; 16)</div><div class='del'>-#define NFC_CTRL_PSIZE4096	(4 &lt;&lt; 16)</div><div class='del'>-#define NFC_CTRL_PSIZE_MASK	(7 &lt;&lt; 16)</div><div class='del'>-#define NFC_CTRL_BSIZE1		(0 &lt;&lt; 19)</div><div class='del'>-#define NFC_CTRL_BSIZE2		(1 &lt;&lt; 19)</div><div class='del'>-#define NFC_CTRL_BSIZE4		(2 &lt;&lt; 19)</div><div class='del'>-#define NFC_CTRL_BSIZE8		(3 &lt;&lt; 19)</div><div class='del'>-#define NFC_CTRL_BSIZE_MASK	(3 &lt;&lt; 19)</div><div class='del'>-#define NFC_CTRL_RDY		(1 &lt;&lt; 21)</div><div class='del'>-#define NFC_CTRL_CS0SEL		(1 &lt;&lt; 22)</div><div class='del'>-#define NFC_CTRL_CS1SEL		(1 &lt;&lt; 23)</div><div class='del'>-#define NFC_CTRL_CS2SEL		(1 &lt;&lt; 24)</div><div class='del'>-#define NFC_CTRL_CS3SEL		(1 &lt;&lt; 25)</div><div class='del'>-#define NFC_CTRL_CSMASK		(0xf &lt;&lt; 22)</div><div class='del'>-#define NFC_CTRL_BW		(1 &lt;&lt; 26)</div><div class='del'>-#define NFC_CTRL_FS		(1 &lt;&lt; 27)</div><div class='del'>-#define NFC_CTRL_DEN		(1 &lt;&lt; 28)</div><div class='del'>-#define NFC_CTRL_READ_IEN	(1 &lt;&lt; 29)</div><div class='del'>-#define NFC_CTRL_PROG_IEN	(1 &lt;&lt; 30)</div><div class='del'>-#define NFC_CTRL_RDY_IEN	(1 &lt;&lt; 31)</div><div class='del'>-</div><div class='del'>-/* Bits in NFC_IREQ */</div><div class='del'>-#define NFC_IREQ_IRQ0		(1 &lt;&lt; 0)</div><div class='del'>-#define NFC_IREQ_IRQ1		(1 &lt;&lt; 1)</div><div class='del'>-#define NFC_IREQ_IRQ2		(1 &lt;&lt; 2)</div><div class='del'>-</div><div class='del'>-#define NFC_IREQ_FLAG0		(1 &lt;&lt; 4)</div><div class='del'>-#define NFC_IREQ_FLAG1		(1 &lt;&lt; 5)</div><div class='del'>-#define NFC_IREQ_FLAG2		(1 &lt;&lt; 6)</div><div class='del'>-</div><div class='del'>-/* MMC controller registers */</div><div class='del'>-#define MMC0_BASE	(AHB_PERI_BASE_VIRT + 0xe000)</div><div class='del'>-#define MMC1_BASE	(AHB_PERI_BASE_VIRT + 0xe800)</div><div class='del'>-</div><div class='del'>-/* UART base addresses */</div><div class='del'>-</div><div class='del'>-#define UART0_BASE	(APB0_PERI_BASE_VIRT + 0x07000)</div><div class='del'>-#define UART0_BASE_PHYS	(APB0_PERI_BASE + 0x07000)</div><div class='del'>-#define UART1_BASE	(APB0_PERI_BASE_VIRT + 0x08000)</div><div class='del'>-#define UART1_BASE_PHYS	(APB0_PERI_BASE + 0x08000)</div><div class='del'>-#define UART2_BASE	(APB0_PERI_BASE_VIRT + 0x09000)</div><div class='del'>-#define UART2_BASE_PHYS	(APB0_PERI_BASE + 0x09000)</div><div class='del'>-#define UART3_BASE	(APB0_PERI_BASE_VIRT + 0x0a000)</div><div class='del'>-#define UART3_BASE_PHYS	(APB0_PERI_BASE + 0x0a000)</div><div class='del'>-#define UART4_BASE	(APB0_PERI_BASE_VIRT + 0x15000)</div><div class='del'>-#define UART4_BASE_PHYS	(APB0_PERI_BASE + 0x15000)</div><div class='del'>-</div><div class='del'>-#define UART_BASE	UART0_BASE</div><div class='del'>-#define UART_BASE_PHYS	UART0_BASE_PHYS</div><div class='del'>-</div><div class='del'>-/* ECC controller */</div><div class='del'>-#define ECC_CTR_BASE	(APB0_PERI_BASE_VIRT + 0xd000)</div><div class='del'>-</div><div class='del'>-#define ECC_CTRL_OFFS		0x00</div><div class='del'>-#define ECC_BASE_OFFS		0x04</div><div class='del'>-#define ECC_MASK_OFFS		0x08</div><div class='del'>-#define ECC_CLEAR_OFFS		0x0c</div><div class='del'>-#define ECC4_0_OFFS		0x10</div><div class='del'>-#define ECC4_1_OFFS		0x14</div><div class='del'>-</div><div class='del'>-#define ECC_EADDR0_OFFS		0x50</div><div class='del'>-</div><div class='del'>-#define ECC_ERRNUM_OFFS		0x90</div><div class='del'>-#define ECC_IREQ_OFFS		0x94</div><div class='del'>-</div><div class='del'>-/* Bits in ECC_CTRL */</div><div class='del'>-#define ECC_CTRL_ECC4_DIEN	(1 &lt;&lt; 28)</div><div class='del'>-#define ECC_CTRL_ECC8_DIEN	(1 &lt;&lt; 29)</div><div class='del'>-#define ECC_CTRL_ECC12_DIEN	(1 &lt;&lt; 30)</div><div class='del'>-#define ECC_CTRL_ECC_DISABLE	0x0</div><div class='del'>-#define ECC_CTRL_ECC_SLC_ENC	0x8</div><div class='del'>-#define ECC_CTRL_ECC_SLC_DEC	0x9</div><div class='del'>-#define ECC_CTRL_ECC4_ENC	0xa</div><div class='del'>-#define ECC_CTRL_ECC4_DEC	0xb</div><div class='del'>-#define ECC_CTRL_ECC8_ENC	0xc</div><div class='del'>-#define ECC_CTRL_ECC8_DEC	0xd</div><div class='del'>-#define ECC_CTRL_ECC12_ENC	0xe</div><div class='del'>-#define ECC_CTRL_ECC12_DEC	0xf</div><div class='del'>-</div><div class='del'>-/* Bits in ECC_IREQ */</div><div class='del'>-#define ECC_IREQ_E4DI		(1 &lt;&lt; 4)</div><div class='del'>-</div><div class='del'>-#define ECC_IREQ_E4DF		(1 &lt;&lt; 20)</div><div class='del'>-#define ECC_IREQ_E4EF		(1 &lt;&lt; 21)</div><div class='del'>-</div><div class='del'>-/* Interrupt controller */</div><div class='del'>-</div><div class='del'>-#define PIC0_BASE	(APB1_PERI_BASE_VIRT + 0x3000)</div><div class='del'>-#define PIC0_BASE_PHYS	(APB1_PERI_BASE + 0x3000)</div><div class='del'>-</div><div class='del'>-#define PIC0_IEN_OFFS		0x00</div><div class='del'>-#define PIC0_CREQ_OFFS		0x04</div><div class='del'>-#define PIC0_IREQ_OFFS		0x08</div><div class='del'>-#define PIC0_IRQSEL_OFFS	0x0c</div><div class='del'>-#define PIC0_SRC_OFFS		0x10</div><div class='del'>-#define PIC0_MREQ_OFFS		0x14</div><div class='del'>-#define PIC0_TSTREQ_OFFS	0x18</div><div class='del'>-#define PIC0_POL_OFFS		0x1c</div><div class='del'>-#define PIC0_IRQ_OFFS		0x20</div><div class='del'>-#define PIC0_FIQ_OFFS		0x24</div><div class='del'>-#define PIC0_MIRQ_OFFS		0x28</div><div class='del'>-#define PIC0_MFIQ_OFFS		0x2c</div><div class='del'>-#define PIC0_TMODE_OFFS		0x30</div><div class='del'>-#define PIC0_SYNC_OFFS		0x34</div><div class='del'>-#define PIC0_WKUP_OFFS		0x38</div><div class='del'>-#define PIC0_TMODEA_OFFS	0x3c</div><div class='del'>-#define PIC0_INTOEN_OFFS	0x40</div><div class='del'>-#define PIC0_MEN0_OFFS		0x44</div><div class='del'>-#define PIC0_MEN_OFFS		0x48</div><div class='del'>-</div><div class='del'>-#define PIC0_IEN		__REG(PIC0_BASE + PIC0_IEN_OFFS)</div><div class='del'>-#define PIC0_IEN_PHYS		__REG(PIC0_BASE_PHYS + PIC0_IEN_OFFS)</div><div class='del'>-#define PIC0_CREQ		__REG(PIC0_BASE + PIC0_CREQ_OFFS)</div><div class='del'>-#define PIC0_CREQ_PHYS		__REG(PIC0_BASE_PHYS + PIC0_CREQ_OFFS)</div><div class='del'>-#define PIC0_IREQ		__REG(PIC0_BASE + PIC0_IREQ_OFFS)</div><div class='del'>-#define PIC0_IRQSEL		__REG(PIC0_BASE + PIC0_IRQSEL_OFFS)</div><div class='del'>-#define PIC0_IRQSEL_PHYS	__REG(PIC0_BASE_PHYS + PIC0_IRQSEL_OFFS)</div><div class='del'>-#define PIC0_SRC		__REG(PIC0_BASE + PIC0_SRC_OFFS)</div><div class='del'>-#define PIC0_MREQ		__REG(PIC0_BASE + PIC0_MREQ_OFFS)</div><div class='del'>-#define PIC0_TSTREQ		__REG(PIC0_BASE + PIC0_TSTREQ_OFFS)</div><div class='del'>-#define PIC0_POL		__REG(PIC0_BASE + PIC0_POL_OFFS)</div><div class='del'>-#define PIC0_IRQ		__REG(PIC0_BASE + PIC0_IRQ_OFFS)</div><div class='del'>-#define PIC0_FIQ		__REG(PIC0_BASE + PIC0_FIQ_OFFS)</div><div class='del'>-#define PIC0_MIRQ		__REG(PIC0_BASE + PIC0_MIRQ_OFFS)</div><div class='del'>-#define PIC0_MFIQ		__REG(PIC0_BASE + PIC0_MFIQ_OFFS)</div><div class='del'>-#define PIC0_TMODE		__REG(PIC0_BASE + PIC0_TMODE_OFFS)</div><div class='del'>-#define PIC0_TMODE_PHYS		__REG(PIC0_BASE_PHYS + PIC0_TMODE_OFFS)</div><div class='del'>-#define PIC0_SYNC		__REG(PIC0_BASE + PIC0_SYNC_OFFS)</div><div class='del'>-#define PIC0_WKUP		__REG(PIC0_BASE + PIC0_WKUP_OFFS)</div><div class='del'>-#define PIC0_TMODEA		__REG(PIC0_BASE + PIC0_TMODEA_OFFS)</div><div class='del'>-#define PIC0_INTOEN		__REG(PIC0_BASE + PIC0_INTOEN_OFFS)</div><div class='del'>-#define PIC0_MEN0		__REG(PIC0_BASE + PIC0_MEN0_OFFS)</div><div class='del'>-#define PIC0_MEN		__REG(PIC0_BASE + PIC0_MEN_OFFS)</div><div class='del'>-</div><div class='del'>-#define PIC1_BASE	(APB1_PERI_BASE_VIRT + 0x3080)</div><div class='del'>-</div><div class='del'>-#define PIC1_IEN_OFFS		0x00</div><div class='del'>-#define PIC1_CREQ_OFFS		0x04</div><div class='del'>-#define PIC1_IREQ_OFFS		0x08</div><div class='del'>-#define PIC1_IRQSEL_OFFS	0x0c</div><div class='del'>-#define PIC1_SRC_OFFS		0x10</div><div class='del'>-#define PIC1_MREQ_OFFS		0x14</div><div class='del'>-#define PIC1_TSTREQ_OFFS	0x18</div><div class='del'>-#define PIC1_POL_OFFS		0x1c</div><div class='del'>-#define PIC1_IRQ_OFFS		0x20</div><div class='del'>-#define PIC1_FIQ_OFFS		0x24</div><div class='del'>-#define PIC1_MIRQ_OFFS		0x28</div><div class='del'>-#define PIC1_MFIQ_OFFS		0x2c</div><div class='del'>-#define PIC1_TMODE_OFFS		0x30</div><div class='del'>-#define PIC1_SYNC_OFFS		0x34</div><div class='del'>-#define PIC1_WKUP_OFFS		0x38</div><div class='del'>-#define PIC1_TMODEA_OFFS	0x3c</div><div class='del'>-#define PIC1_INTOEN_OFFS	0x40</div><div class='del'>-#define PIC1_MEN1_OFFS		0x44</div><div class='del'>-#define PIC1_MEN_OFFS		0x48</div><div class='del'>-</div><div class='del'>-#define PIC1_IEN	__REG(PIC1_BASE + PIC1_IEN_OFFS)</div><div class='del'>-#define PIC1_CREQ	__REG(PIC1_BASE + PIC1_CREQ_OFFS)</div><div class='del'>-#define PIC1_IREQ	__REG(PIC1_BASE + PIC1_IREQ_OFFS)</div><div class='del'>-#define PIC1_IRQSEL	__REG(PIC1_BASE + PIC1_IRQSEL_OFFS)</div><div class='del'>-#define PIC1_SRC	__REG(PIC1_BASE + PIC1_SRC_OFFS)</div><div class='del'>-#define PIC1_MREQ	__REG(PIC1_BASE + PIC1_MREQ_OFFS)</div><div class='del'>-#define PIC1_TSTREQ	__REG(PIC1_BASE + PIC1_TSTREQ_OFFS)</div><div class='del'>-#define PIC1_POL	__REG(PIC1_BASE + PIC1_POL_OFFS)</div><div class='del'>-#define PIC1_IRQ	__REG(PIC1_BASE + PIC1_IRQ_OFFS)</div><div class='del'>-#define PIC1_FIQ	__REG(PIC1_BASE + PIC1_FIQ_OFFS)</div><div class='del'>-#define PIC1_MIRQ	__REG(PIC1_BASE + PIC1_MIRQ_OFFS)</div><div class='del'>-#define PIC1_MFIQ	__REG(PIC1_BASE + PIC1_MFIQ_OFFS)</div><div class='del'>-#define PIC1_TMODE	__REG(PIC1_BASE + PIC1_TMODE_OFFS)</div><div class='del'>-#define PIC1_SYNC	__REG(PIC1_BASE + PIC1_SYNC_OFFS)</div><div class='del'>-#define PIC1_WKUP	__REG(PIC1_BASE + PIC1_WKUP_OFFS)</div><div class='del'>-#define PIC1_TMODEA	__REG(PIC1_BASE + PIC1_TMODEA_OFFS)</div><div class='del'>-#define PIC1_INTOEN	__REG(PIC1_BASE + PIC1_INTOEN_OFFS)</div><div class='del'>-#define PIC1_MEN1	__REG(PIC1_BASE + PIC1_MEN1_OFFS)</div><div class='del'>-#define PIC1_MEN	__REG(PIC1_BASE + PIC1_MEN_OFFS)</div><div class='del'>-</div><div class='del'>-/* Timer registers */</div><div class='del'>-#define TIMER_BASE		(APB1_PERI_BASE_VIRT + 0x4000)</div><div class='del'>-#define TIMER_BASE_PHYS		(APB1_PERI_BASE + 0x4000)</div><div class='del'>-</div><div class='del'>-#define TWDCFG_OFFS		0x70</div><div class='del'>-</div><div class='del'>-#define TC32EN_OFFS		0x80</div><div class='del'>-#define TC32LDV_OFFS		0x84</div><div class='del'>-#define TC32CMP0_OFFS		0x88</div><div class='del'>-#define TC32CMP1_OFFS		0x8c</div><div class='del'>-#define TC32PCNT_OFFS		0x90</div><div class='del'>-#define TC32MCNT_OFFS		0x94</div><div class='del'>-#define TC32IRQ_OFFS		0x98</div><div class='del'>-</div><div class='del'>-/* Bits in TC32EN */</div><div class='del'>-#define TC32EN_PRESCALE_MASK	0x00ffffff</div><div class='del'>-#define TC32EN_ENABLE		(1 &lt;&lt; 24)</div><div class='del'>-#define TC32EN_LOADZERO		(1 &lt;&lt; 25)</div><div class='del'>-#define TC32EN_STOPMODE		(1 &lt;&lt; 26)</div><div class='del'>-#define TC32EN_LDM0		(1 &lt;&lt; 28)</div><div class='del'>-#define TC32EN_LDM1		(1 &lt;&lt; 29)</div><div class='del'>-</div><div class='del'>-/* Bits in TC32IRQ */</div><div class='del'>-#define TC32IRQ_MSTAT_MASK	0x0000001f</div><div class='del'>-#define TC32IRQ_RSTAT_MASK	(0x1f &lt;&lt; 8)</div><div class='del'>-#define TC32IRQ_IRQEN0		(1 &lt;&lt; 16)</div><div class='del'>-#define TC32IRQ_IRQEN1		(1 &lt;&lt; 17)</div><div class='del'>-#define TC32IRQ_IRQEN2		(1 &lt;&lt; 18)</div><div class='del'>-#define TC32IRQ_IRQEN3		(1 &lt;&lt; 19)</div><div class='del'>-#define TC32IRQ_IRQEN4		(1 &lt;&lt; 20)</div><div class='del'>-#define TC32IRQ_RSYNC		(1 &lt;&lt; 30)</div><div class='del'>-#define TC32IRQ_IRQCLR		(1 &lt;&lt; 31)</div><div class='del'>-</div><div class='del'>-/* GPIO registers */</div><div class='del'>-#define GPIOPD_BASE		(APB1_PERI_BASE_VIRT + 0x5000)</div><div class='del'>-</div><div class='del'>-#define GPIOPD_DAT_OFFS		0x00</div><div class='del'>-#define GPIOPD_DOE_OFFS		0x04</div><div class='del'>-#define GPIOPD_FS0_OFFS		0x08</div><div class='del'>-#define GPIOPD_FS1_OFFS		0x0c</div><div class='del'>-#define GPIOPD_FS2_OFFS		0x10</div><div class='del'>-#define GPIOPD_RPU_OFFS		0x30</div><div class='del'>-#define GPIOPD_RPD_OFFS		0x34</div><div class='del'>-#define GPIOPD_DV0_OFFS		0x38</div><div class='del'>-#define GPIOPD_DV1_OFFS		0x3c</div><div class='del'>-</div><div class='del'>-#define GPIOPS_BASE		(APB1_PERI_BASE_VIRT + 0x5000)</div><div class='del'>-</div><div class='del'>-#define GPIOPS_DAT_OFFS		0x40</div><div class='del'>-#define GPIOPS_DOE_OFFS		0x44</div><div class='del'>-#define GPIOPS_FS0_OFFS		0x48</div><div class='del'>-#define GPIOPS_FS1_OFFS		0x4c</div><div class='del'>-#define GPIOPS_FS2_OFFS		0x50</div><div class='del'>-#define GPIOPS_FS3_OFFS		0x54</div><div class='del'>-#define GPIOPS_RPU_OFFS		0x70</div><div class='del'>-#define GPIOPS_RPD_OFFS		0x74</div><div class='del'>-#define GPIOPS_DV0_OFFS		0x78</div><div class='del'>-#define GPIOPS_DV1_OFFS		0x7c</div><div class='del'>-</div><div class='del'>-#define GPIOPS_FS1_SDH0_BITS	0x000000ff</div><div class='del'>-#define GPIOPS_FS1_SDH1_BITS	0x0000ff00</div><div class='del'>-</div><div class='del'>-#define GPIOPU_BASE		(APB1_PERI_BASE_VIRT + 0x5000)</div><div class='del'>-</div><div class='del'>-#define GPIOPU_DAT_OFFS		0x80</div><div class='del'>-#define GPIOPU_DOE_OFFS		0x84</div><div class='del'>-#define GPIOPU_FS0_OFFS		0x88</div><div class='del'>-#define GPIOPU_FS1_OFFS		0x8c</div><div class='del'>-#define GPIOPU_FS2_OFFS		0x90</div><div class='del'>-#define GPIOPU_RPU_OFFS		0xb0</div><div class='del'>-#define GPIOPU_RPD_OFFS		0xb4</div><div class='del'>-#define GPIOPU_DV0_OFFS		0xb8</div><div class='del'>-#define GPIOPU_DV1_OFFS		0xbc</div><div class='del'>-</div><div class='del'>-#define GPIOPU_FS0_TXD0		(1 &lt;&lt; 0)</div><div class='del'>-#define GPIOPU_FS0_RXD0		(1 &lt;&lt; 1)</div><div class='del'>-#define GPIOPU_FS0_CTS0		(1 &lt;&lt; 2)</div><div class='del'>-#define GPIOPU_FS0_RTS0		(1 &lt;&lt; 3)</div><div class='del'>-#define GPIOPU_FS0_TXD1		(1 &lt;&lt; 4)</div><div class='del'>-#define GPIOPU_FS0_RXD1		(1 &lt;&lt; 5)</div><div class='del'>-#define GPIOPU_FS0_CTS1		(1 &lt;&lt; 6)</div><div class='del'>-#define GPIOPU_FS0_RTS1		(1 &lt;&lt; 7)</div><div class='del'>-#define GPIOPU_FS0_TXD2		(1 &lt;&lt; 8)</div><div class='del'>-#define GPIOPU_FS0_RXD2		(1 &lt;&lt; 9)</div><div class='del'>-#define GPIOPU_FS0_CTS2		(1 &lt;&lt; 10)</div><div class='del'>-#define GPIOPU_FS0_RTS2		(1 &lt;&lt; 11)</div><div class='del'>-#define GPIOPU_FS0_TXD3		(1 &lt;&lt; 12)</div><div class='del'>-#define GPIOPU_FS0_RXD3		(1 &lt;&lt; 13)</div><div class='del'>-#define GPIOPU_FS0_CTS3		(1 &lt;&lt; 14)</div><div class='del'>-#define GPIOPU_FS0_RTS3		(1 &lt;&lt; 15)</div><div class='del'>-#define GPIOPU_FS0_TXD4		(1 &lt;&lt; 16)</div><div class='del'>-#define GPIOPU_FS0_RXD4		(1 &lt;&lt; 17)</div><div class='del'>-#define GPIOPU_FS0_CTS4		(1 &lt;&lt; 18)</div><div class='del'>-#define GPIOPU_FS0_RTS4		(1 &lt;&lt; 19)</div><div class='del'>-</div><div class='del'>-#define GPIOFC_BASE		(APB1_PERI_BASE_VIRT + 0x5000)</div><div class='del'>-</div><div class='del'>-#define GPIOFC_DAT_OFFS		0xc0</div><div class='del'>-#define GPIOFC_DOE_OFFS		0xc4</div><div class='del'>-#define GPIOFC_FS0_OFFS		0xc8</div><div class='del'>-#define GPIOFC_FS1_OFFS		0xcc</div><div class='del'>-#define GPIOFC_FS2_OFFS		0xd0</div><div class='del'>-#define GPIOFC_FS3_OFFS		0xd4</div><div class='del'>-#define GPIOFC_RPU_OFFS		0xf0</div><div class='del'>-#define GPIOFC_RPD_OFFS		0xf4</div><div class='del'>-#define GPIOFC_DV0_OFFS		0xf8</div><div class='del'>-#define GPIOFC_DV1_OFFS		0xfc</div><div class='del'>-</div><div class='del'>-#define GPIOFD_BASE		(APB1_PERI_BASE_VIRT + 0x5000)</div><div class='del'>-</div><div class='del'>-#define GPIOFD_DAT_OFFS		0x100</div><div class='del'>-#define GPIOFD_DOE_OFFS		0x104</div><div class='del'>-#define GPIOFD_FS0_OFFS		0x108</div><div class='del'>-#define GPIOFD_FS1_OFFS		0x10c</div><div class='del'>-#define GPIOFD_FS2_OFFS		0x110</div><div class='del'>-#define GPIOFD_RPU_OFFS		0x130</div><div class='del'>-#define GPIOFD_RPD_OFFS		0x134</div><div class='del'>-#define GPIOFD_DV0_OFFS		0x138</div><div class='del'>-#define GPIOFD_DV1_OFFS		0x13c</div><div class='del'>-</div><div class='del'>-#define GPIOLC_BASE		(APB1_PERI_BASE_VIRT + 0x5000)</div><div class='del'>-</div><div class='del'>-#define GPIOLC_DAT_OFFS		0x140</div><div class='del'>-#define GPIOLC_DOE_OFFS		0x144</div><div class='del'>-#define GPIOLC_FS0_OFFS		0x148</div><div class='del'>-#define GPIOLC_FS1_OFFS		0x14c</div><div class='del'>-#define GPIOLC_RPU_OFFS		0x170</div><div class='del'>-#define GPIOLC_RPD_OFFS		0x174</div><div class='del'>-#define GPIOLC_DV0_OFFS		0x178</div><div class='del'>-#define GPIOLC_DV1_OFFS		0x17c</div><div class='del'>-</div><div class='del'>-#define GPIOLD_BASE		(APB1_PERI_BASE_VIRT + 0x5000)</div><div class='del'>-</div><div class='del'>-#define GPIOLD_DAT_OFFS		0x180</div><div class='del'>-#define GPIOLD_DOE_OFFS		0x184</div><div class='del'>-#define GPIOLD_FS0_OFFS		0x188</div><div class='del'>-#define GPIOLD_FS1_OFFS		0x18c</div><div class='del'>-#define GPIOLD_FS2_OFFS		0x190</div><div class='del'>-#define GPIOLD_RPU_OFFS		0x1b0</div><div class='del'>-#define GPIOLD_RPD_OFFS		0x1b4</div><div class='del'>-#define GPIOLD_DV0_OFFS		0x1b8</div><div class='del'>-#define GPIOLD_DV1_OFFS		0x1bc</div><div class='del'>-</div><div class='del'>-#define GPIOAD_BASE		(APB1_PERI_BASE_VIRT + 0x5000)</div><div class='del'>-</div><div class='del'>-#define GPIOAD_DAT_OFFS		0x1c0</div><div class='del'>-#define GPIOAD_DOE_OFFS		0x1c4</div><div class='del'>-#define GPIOAD_FS0_OFFS		0x1c8</div><div class='del'>-#define GPIOAD_RPU_OFFS		0x1f0</div><div class='del'>-#define GPIOAD_RPD_OFFS		0x1f4</div><div class='del'>-#define GPIOAD_DV0_OFFS		0x1f8</div><div class='del'>-#define GPIOAD_DV1_OFFS		0x1fc</div><div class='del'>-</div><div class='del'>-#define GPIOXC_BASE		(APB1_PERI_BASE_VIRT + 0x5000)</div><div class='del'>-</div><div class='del'>-#define GPIOXC_DAT_OFFS		0x200</div><div class='del'>-#define GPIOXC_DOE_OFFS		0x204</div><div class='del'>-#define GPIOXC_FS0_OFFS		0x208</div><div class='del'>-#define GPIOXC_RPU_OFFS		0x230</div><div class='del'>-#define GPIOXC_RPD_OFFS		0x234</div><div class='del'>-#define GPIOXC_DV0_OFFS		0x238</div><div class='del'>-#define GPIOXC_DV1_OFFS		0x23c</div><div class='del'>-</div><div class='del'>-#define GPIOXC_FS0		__REG(GPIOXC_BASE + GPIOXC_FS0_OFFS)</div><div class='del'>-</div><div class='del'>-#define GPIOXC_FS0_CS0		(1 &lt;&lt; 26)</div><div class='del'>-#define GPIOXC_FS0_CS1		(1 &lt;&lt; 27)</div><div class='del'>-</div><div class='del'>-#define GPIOXD_BASE		(APB1_PERI_BASE_VIRT + 0x5000)</div><div class='del'>-</div><div class='del'>-#define GPIOXD_DAT_OFFS		0x240</div><div class='del'>-#define GPIOXD_FS0_OFFS		0x248</div><div class='del'>-#define GPIOXD_RPU_OFFS		0x270</div><div class='del'>-#define GPIOXD_RPD_OFFS		0x274</div><div class='del'>-#define GPIOXD_DV0_OFFS		0x278</div><div class='del'>-#define GPIOXD_DV1_OFFS		0x27c</div><div class='del'>-</div><div class='del'>-#define GPIOPK_BASE		(APB1_PERI_BASE_VIRT + 0x1c000)</div><div class='del'>-</div><div class='del'>-#define GPIOPK_RST_OFFS		0x008</div><div class='del'>-#define GPIOPK_DAT_OFFS		0x100</div><div class='del'>-#define GPIOPK_DOE_OFFS		0x104</div><div class='del'>-#define GPIOPK_FS0_OFFS		0x108</div><div class='del'>-#define GPIOPK_FS1_OFFS		0x10c</div><div class='del'>-#define GPIOPK_FS2_OFFS		0x110</div><div class='del'>-#define GPIOPK_IRQST_OFFS	0x210</div><div class='del'>-#define GPIOPK_IRQEN_OFFS	0x214</div><div class='del'>-#define GPIOPK_IRQPOL_OFFS	0x218</div><div class='del'>-#define GPIOPK_IRQTM0_OFFS	0x21c</div><div class='del'>-#define GPIOPK_IRQTM1_OFFS	0x220</div><div class='del'>-#define GPIOPK_CTL_OFFS		0x22c</div><div class='del'>-</div><div class='del'>-#define PMGPIO_BASE		(APB1_PERI_BASE_VIRT + 0x10000)</div><div class='del'>-#define BACKUP_RAM_BASE		PMGPIO_BASE</div><div class='del'>-</div><div class='del'>-#define PMGPIO_DAT_OFFS		0x800</div><div class='del'>-#define PMGPIO_DOE_OFFS		0x804</div><div class='del'>-#define PMGPIO_FS0_OFFS		0x808</div><div class='del'>-#define PMGPIO_RPU_OFFS		0x810</div><div class='del'>-#define PMGPIO_RPD_OFFS		0x814</div><div class='del'>-#define PMGPIO_DV0_OFFS		0x818</div><div class='del'>-#define PMGPIO_DV1_OFFS		0x81c</div><div class='del'>-#define PMGPIO_EE0_OFFS		0x820</div><div class='del'>-#define PMGPIO_EE1_OFFS		0x824</div><div class='del'>-#define PMGPIO_CTL_OFFS		0x828</div><div class='del'>-#define PMGPIO_DI_OFFS		0x82c</div><div class='del'>-#define PMGPIO_STR_OFFS		0x830</div><div class='del'>-#define PMGPIO_STF_OFFS		0x834</div><div class='del'>-#define PMGPIO_POL_OFFS		0x838</div><div class='del'>-#define PMGPIO_APB_OFFS		0x800</div><div class='del'>-</div><div class='del'>-/* Clock controller registers */</div><div class='del'>-#define CKC_BASE	((void __iomem *)(APB1_PERI_BASE_VIRT + 0x6000))</div><div class='del'>-</div><div class='del'>-#define CLKCTRL_OFFS		0x00</div><div class='del'>-#define PLL0CFG_OFFS		0x04</div><div class='del'>-#define PLL1CFG_OFFS		0x08</div><div class='del'>-#define CLKDIVC0_OFFS		0x0c</div><div class='del'>-</div><div class='del'>-#define BCLKCTR0_OFFS		0x14</div><div class='del'>-#define SWRESET0_OFFS		0x18</div><div class='del'>-</div><div class='del'>-#define BCLKCTR1_OFFS		0x60</div><div class='del'>-#define SWRESET1_OFFS		0x64</div><div class='del'>-#define PWDCTL_OFFS		0x68</div><div class='del'>-#define PLL2CFG_OFFS		0x6c</div><div class='del'>-#define CLKDIVC1_OFFS		0x70</div><div class='del'>-</div><div class='del'>-#define ACLKREF_OFFS		0x80</div><div class='del'>-#define ACLKI2C_OFFS		0x84</div><div class='del'>-#define ACLKSPI0_OFFS		0x88</div><div class='del'>-#define ACLKSPI1_OFFS		0x8c</div><div class='del'>-#define ACLKUART0_OFFS		0x90</div><div class='del'>-#define ACLKUART1_OFFS		0x94</div><div class='del'>-#define ACLKUART2_OFFS		0x98</div><div class='del'>-#define ACLKUART3_OFFS		0x9c</div><div class='del'>-#define ACLKUART4_OFFS		0xa0</div><div class='del'>-#define ACLKTCT_OFFS		0xa4</div><div class='del'>-#define ACLKTCX_OFFS		0xa8</div><div class='del'>-#define ACLKTCZ_OFFS		0xac</div><div class='del'>-#define ACLKADC_OFFS		0xb0</div><div class='del'>-#define ACLKDAI0_OFFS		0xb4</div><div class='del'>-#define ACLKDAI1_OFFS		0xb8</div><div class='del'>-#define ACLKLCD_OFFS		0xbc</div><div class='del'>-#define ACLKSPDIF_OFFS		0xc0</div><div class='del'>-#define ACLKUSBH_OFFS		0xc4</div><div class='del'>-#define ACLKSDH0_OFFS		0xc8</div><div class='del'>-#define ACLKSDH1_OFFS		0xcc</div><div class='del'>-#define ACLKC3DEC_OFFS		0xd0</div><div class='del'>-#define ACLKEXT_OFFS		0xd4</div><div class='del'>-#define ACLKCAN0_OFFS		0xd8</div><div class='del'>-#define ACLKCAN1_OFFS		0xdc</div><div class='del'>-#define ACLKGSB0_OFFS		0xe0</div><div class='del'>-#define ACLKGSB1_OFFS		0xe4</div><div class='del'>-#define ACLKGSB2_OFFS		0xe8</div><div class='del'>-#define ACLKGSB3_OFFS		0xec</div><div class='del'>-</div><div class='del'>-#define PLLxCFG_PD		(1 &lt;&lt; 31)</div><div class='del'>-</div><div class='del'>-/* CLKCTRL bits */</div><div class='del'>-#define CLKCTRL_XE		(1 &lt;&lt; 31)</div><div class='del'>-</div><div class='del'>-/* CLKDIVCx bits */</div><div class='del'>-#define CLKDIVC0_XTE		(1 &lt;&lt; 7)</div><div class='del'>-#define CLKDIVC0_XE		(1 &lt;&lt; 15)</div><div class='del'>-#define CLKDIVC0_P1E		(1 &lt;&lt; 23)</div><div class='del'>-#define CLKDIVC0_P0E		(1 &lt;&lt; 31)</div><div class='del'>-</div><div class='del'>-#define CLKDIVC1_P2E		(1 &lt;&lt; 7)</div><div class='del'>-</div><div class='del'>-/* BCLKCTR0 clock bits */</div><div class='del'>-#define BCLKCTR0_USBD		(1 &lt;&lt; 4)</div><div class='del'>-#define BCLKCTR0_ECC		(1 &lt;&lt; 9)</div><div class='del'>-#define BCLKCTR0_USBH0		(1 &lt;&lt; 11)</div><div class='del'>-#define BCLKCTR0_NFC		(1 &lt;&lt; 16)</div><div class='del'>-</div><div class='del'>-/* BCLKCTR1 clock bits */</div><div class='del'>-#define BCLKCTR1_USBH1		(1 &lt;&lt; 20)</div><div class='del'>-</div><div class='del'>-/* SWRESET0 bits */</div><div class='del'>-#define SWRESET0_USBD		(1 &lt;&lt; 4)</div><div class='del'>-#define SWRESET0_USBH0		(1 &lt;&lt; 11)</div><div class='del'>-</div><div class='del'>-/* SWRESET1 bits */</div><div class='del'>-#define SWRESET1_USBH1		(1 &lt;&lt; 20)</div><div class='del'>-</div><div class='del'>-/* System clock sources.</div><div class='del'>- * Note: These are the clock sources that serve as parents for</div><div class='del'>- * all other clocks. They have no parents themselves.</div><div class='del'>- *</div><div class='del'>- * These values are used for struct clk-&gt;root_id. All clocks</div><div class='del'>- * that are not system clock sources have this value set to</div><div class='del'>- * CLK_SRC_NOROOT.</div><div class='del'>- * The values for system clocks start with CLK_SRC_PLL0 == 0</div><div class='del'>- * because this gives us exactly the values needed for the lower</div><div class='del'>- * 4 bits of ACLK_* registers. Therefore, CLK_SRC_NOROOT is</div><div class='del'>- * defined as -1 to not disturb the order.</div><div class='del'>- */</div><div class='del'>-enum root_clks {</div><div class='del'>-	CLK_SRC_NOROOT = -1,</div><div class='del'>-	CLK_SRC_PLL0 = 0,</div><div class='del'>-	CLK_SRC_PLL1,</div><div class='del'>-	CLK_SRC_PLL0DIV,</div><div class='del'>-	CLK_SRC_PLL1DIV,</div><div class='del'>-	CLK_SRC_XI,</div><div class='del'>-	CLK_SRC_XIDIV,</div><div class='del'>-	CLK_SRC_XTI,</div><div class='del'>-	CLK_SRC_XTIDIV,</div><div class='del'>-	CLK_SRC_PLL2,</div><div class='del'>-	CLK_SRC_PLL2DIV,</div><div class='del'>-	CLK_SRC_PK0,</div><div class='del'>-	CLK_SRC_PK1,</div><div class='del'>-	CLK_SRC_PK2,</div><div class='del'>-	CLK_SRC_PK3,</div><div class='del'>-	CLK_SRC_PK4,</div><div class='del'>-	CLK_SRC_48MHZ</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CLK_SRC_MASK		0xf</div><div class='del'>-</div><div class='del'>-/* Bits in ACLK* registers */</div><div class='del'>-#define ACLK_EN		(1 &lt;&lt; 28)</div><div class='del'>-#define ACLK_SEL_SHIFT		24</div><div class='del'>-#define ACLK_SEL_MASK		0x0f000000</div><div class='del'>-#define ACLK_DIV_MASK		0x00000fff</div><div class='del'>-</div><div class='del'>-/* System configuration registers */</div><div class='del'>-</div><div class='del'>-#define SCFG_BASE		(APB1_PERI_BASE_VIRT + 0x13000)</div><div class='del'>-</div><div class='del'>-#define	BMI_OFFS		0x00</div><div class='del'>-#define AHBCON0_OFFS		0x04</div><div class='del'>-#define APBPWE_OFFS		0x08</div><div class='del'>-#define DTCMWAIT_OFFS		0x0c</div><div class='del'>-#define ECCSEL_OFFS		0x10</div><div class='del'>-#define AHBCON1_OFFS		0x14</div><div class='del'>-#define SDHCFG_OFFS		0x18</div><div class='del'>-#define REMAP_OFFS		0x20</div><div class='del'>-#define LCDSIAE_OFFS		0x24</div><div class='del'>-#define XMCCFG_OFFS		0xe0</div><div class='del'>-#define IMCCFG_OFFS		0xe4</div><div class='del'>-</div><div class='del'>-/* Values for ECCSEL */</div><div class='del'>-#define ECCSEL_EXTMEM		0x0</div><div class='del'>-#define ECCSEL_DTCM		0x1</div><div class='del'>-#define ECCSEL_INT_SRAM		0x2</div><div class='del'>-#define ECCSEL_AHB		0x3</div><div class='del'>-</div><div class='del'>-/* Bits in XMCCFG */</div><div class='del'>-#define XMCCFG_NFCE		(1 &lt;&lt; 1)</div><div class='del'>-#define XMCCFG_FDXD		(1 &lt;&lt; 2)</div><div class='del'>-</div><div class='del'>-/* External memory controller registers */</div><div class='del'>-</div><div class='del'>-#define EMC_BASE		EXT_MEM_CTRL_BASE</div><div class='del'>-</div><div class='del'>-#define SDCFG_OFFS		0x00</div><div class='del'>-#define SDFSM_OFFS		0x04</div><div class='del'>-#define MCFG_OFFS		0x08</div><div class='del'>-</div><div class='del'>-#define CSCFG0_OFFS		0x10</div><div class='del'>-#define CSCFG1_OFFS		0x14</div><div class='del'>-#define CSCFG2_OFFS		0x18</div><div class='del'>-#define CSCFG3_OFFS		0x1c</div><div class='del'>-</div><div class='del'>-#define MCFG_SDEN		(1 &lt;&lt; 4)</div><div class='del'>-</div><div class='del'>-#endif /* TCC8K_REGS_H */</div><div class='head'>diff --git a/arch/arm/plat-tcc/include/mach/timex.h b/arch/arm/plat-tcc/include/mach/timex.h<br/>deleted file mode 100644<br/>index 057acbe651d9..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-tcc/include/mach/timex.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/timex.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * A definition needed by arch core code.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#define CLOCK_TICK_RATE		(HZ * 100000UL)</div><div class='head'>diff --git a/arch/arm/plat-tcc/include/mach/uncompress.h b/arch/arm/plat-tcc/include/mach/uncompress.h<br/>deleted file mode 100644<br/>index 7a3e33a27a30..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-tcc/include/mach/uncompress.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/uncompress.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2009 Hans J. Koch &lt;hjk@linutronix.de&gt;</div><div class='del'>- *</div><div class='del'>- * This file is licensed under the terms of the GPL version 2.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/serial_reg.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/tcc8k-regs.h&gt;</div><div class='del'>-</div><div class='del'>-unsigned int system_rev;</div><div class='del'>-</div><div class='del'>-#define ID_MASK			0x7fff</div><div class='del'>-</div><div class='del'>-static void putc(int c)</div><div class='del'>-{</div><div class='del'>-	u32 *uart_lsr = (u32 *)(UART_BASE_PHYS + (UART_LSR &lt;&lt; 2));</div><div class='del'>-	u32 *uart_tx = (u32 *)(UART_BASE_PHYS + (UART_TX &lt;&lt; 2));</div><div class='del'>-</div><div class='del'>-	while (!(*uart_lsr &amp; UART_LSR_THRE))</div><div class='del'>-		barrier();</div><div class='del'>-	*uart_tx = c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void flush(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * nothing to do</div><div class='del'>- */</div><div class='del'>-#define arch_decomp_setup()</div><div class='del'>-#define arch_decomp_wdog()</div><div class='head'>diff --git a/arch/arm/plat-tcc/include/mach/vmalloc.h b/arch/arm/plat-tcc/include/mach/vmalloc.h<br/>deleted file mode 100644<br/>index 99414d9c2b94..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-tcc/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/include/mach/vmalloc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Author: &lt;linux@telechips.com&gt;</div><div class='del'>- * Created: June 10, 2008</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Russell King.</div><div class='del'>- * Copyright (C) 2008-2009 Telechips</div><div class='del'>- *</div><div class='del'>- * Licensed under the terms of the GPL v2.</div><div class='del'>- */</div><div class='del'>-#define VMALLOC_END	0xf0000000UL</div><div class='head'>diff --git a/arch/arm/plat-tcc/system.c b/arch/arm/plat-tcc/system.c<br/>deleted file mode 100644<br/>index cc208fae3e7a..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-tcc/system.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-tcc/system.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,25 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * System functions for Telechips TCCxxxx SoCs</div><div class='del'>- *</div><div class='del'>- * Copyright (C) Hans J. Koch &lt;hjk@linutronix.de&gt;</div><div class='del'>- *</div><div class='del'>- * Licensed under the terms of the GPL v2.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/tcc8k-regs.h&gt;</div><div class='del'>-</div><div class='del'>-/* System reboot */</div><div class='del'>-void plat_tcc_reboot(void)</div><div class='del'>-{</div><div class='del'>-	/* Make sure clocks are on */</div><div class='del'>-	__raw_writel(0xffffffff, CKC_BASE + BCLKCTR0_OFFS);</div><div class='del'>-</div><div class='del'>-	/* Enable watchdog reset */</div><div class='del'>-	__raw_writel(0x49, TIMER_BASE + TWDCFG_OFFS);</div><div class='del'>-	/* Wait for reset */</div><div class='del'>-	while(1)</div><div class='del'>-		;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/arm/plat-versatile/headsmp.S b/arch/arm/plat-versatile/headsmp.S<br/>index d397a1fb2f54..dd703ef09b8d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-versatile/headsmp.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-versatile/headsmp.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-versatile/headsmp.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-versatile/headsmp.S</a></div><div class='hunk'>@@ -38,3 +38,4 @@ pen:	ldr	r7, [r6]</div><div class='ctx'> 	.align</div><div class='ctx'> 1:	.long	.</div><div class='ctx'> 	.long	pen_release</div><div class='add'>+ENDPROC(versatile_secondary_startup)</div><div class='head'>diff --git a/arch/arm/plat-versatile/sched-clock.c b/arch/arm/plat-versatile/sched-clock.c<br/>index 3d6a4c292cab..b33b74c87232 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-versatile/sched-clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/plat-versatile/sched-clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-versatile/sched-clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/plat-versatile/sched-clock.c</a></div><div class='hunk'>@@ -18,41 +18,24 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sched_clock.h&gt;</div><div class='ctx'> #include &lt;plat/sched_clock.h&gt;</div><div class='ctx'> </div><div class='del'>-static DEFINE_CLOCK_DATA(cd);</div><div class='ctx'> static void __iomem *ctr;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Constants generated by clocks_calc_mult_shift(m, s, 24MHz, NSEC_PER_SEC, 60).</div><div class='del'>- * This gives a resolution of about 41ns and a wrap period of about 178s.</div><div class='del'>- */</div><div class='del'>-#define SC_MULT		2796202667u</div><div class='del'>-#define SC_SHIFT	26</div><div class='del'>-</div><div class='del'>-unsigned long long notrace sched_clock(void)</div><div class='add'>+static u32 notrace versatile_read_sched_clock(void)</div><div class='ctx'> {</div><div class='del'>-	if (ctr) {</div><div class='del'>-		u32 cyc = readl(ctr);</div><div class='del'>-		return cyc_to_fixed_sched_clock(&amp;cd, cyc, (u32)~0,</div><div class='del'>-						SC_MULT, SC_SHIFT);</div><div class='del'>-	} else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='add'>+	if (ctr)</div><div class='add'>+		return readl(ctr);</div><div class='ctx'> </div><div class='del'>-static void notrace versatile_update_sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	u32 cyc = readl(ctr);</div><div class='del'>-	update_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init versatile_sched_clock_init(void __iomem *reg, unsigned long rate)</div><div class='ctx'> {</div><div class='ctx'> 	ctr = reg;</div><div class='del'>-	init_fixed_sched_clock(&amp;cd, versatile_update_sched_clock,</div><div class='del'>-			       32, rate, SC_MULT, SC_SHIFT);</div><div class='add'>+	setup_sched_clock(versatile_read_sched_clock, 32, rate);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types<br/>index ccbe16f47227..f9c9f33f8cbe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/tools/mach-types?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/tools/mach-types</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/tools/mach-types?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/arm/tools/mach-types</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> # are merged into mainline or have been edited in the machine database</div><div class='ctx'> # within the last 12 months.  References to machine_is_NAME() do not count!</div><div class='ctx'> #</div><div class='del'>-# Last update: Sat May 7 08:48:24 2011</div><div class='add'>+# Last update: Tue Dec 6 11:07:38 2011</div><div class='ctx'> #</div><div class='ctx'> # machine_is_xxx	CONFIG_xxxx		MACH_TYPE_xxx		number</div><div class='ctx'> #</div><div class='hunk'>@@ -269,7 +269,7 @@ dns323			MACH_DNS323		DNS323			1542</div><div class='ctx'> omap3_beagle		MACH_OMAP3_BEAGLE	OMAP3_BEAGLE		1546</div><div class='ctx'> nokia_n810		MACH_NOKIA_N810		NOKIA_N810		1548</div><div class='ctx'> pcm038			MACH_PCM038		PCM038			1551</div><div class='del'>-ts_x09			MACH_TS209		TS209			1565</div><div class='add'>+ts209			MACH_TS209		TS209			1565</div><div class='ctx'> at91cap9adk		MACH_AT91CAP9ADK	AT91CAP9ADK		1566</div><div class='ctx'> mx31moboard		MACH_MX31MOBOARD	MX31MOBOARD		1574</div><div class='ctx'> vision_ep9307		MACH_VISION_EP9307	VISION_EP9307		1578</div><div class='hunk'>@@ -321,7 +321,6 @@ lb88rc8480		MACH_LB88RC8480		LB88RC8480		1769</div><div class='ctx'> mx25_3ds		MACH_MX25_3DS		MX25_3DS		1771</div><div class='ctx'> omap3530_lv_som		MACH_OMAP3530_LV_SOM	OMAP3530_LV_SOM		1773</div><div class='ctx'> davinci_da830_evm	MACH_DAVINCI_DA830_EVM	DAVINCI_DA830_EVM	1781</div><div class='del'>-at572d940hfek		MACH_AT572D940HFEB	AT572D940HFEB		1783</div><div class='ctx'> dove_db			MACH_DOVE_DB		DOVE_DB			1788</div><div class='ctx'> overo			MACH_OVERO		OVERO			1798</div><div class='ctx'> at2440evb		MACH_AT2440EVB		AT2440EVB		1799</div><div class='hunk'>@@ -459,7 +458,7 @@ guruplug		MACH_GURUPLUG		GURUPLUG		2659</div><div class='ctx'> spear310		MACH_SPEAR310		SPEAR310		2660</div><div class='ctx'> spear320		MACH_SPEAR320		SPEAR320		2661</div><div class='ctx'> aquila			MACH_AQUILA		AQUILA			2676</div><div class='del'>-sheeva_esata		MACH_ESATA_SHEEVAPLUG	ESATA_SHEEVAPLUG	2678</div><div class='add'>+esata_sheevaplug	MACH_ESATA_SHEEVAPLUG	ESATA_SHEEVAPLUG	2678</div><div class='ctx'> msm7x30_surf		MACH_MSM7X30_SURF	MSM7X30_SURF		2679</div><div class='ctx'> ea2478devkit		MACH_EA2478DEVKIT	EA2478DEVKIT		2683</div><div class='ctx'> terastation_wxl		MACH_TERASTATION_WXL	TERASTATION_WXL		2697</div><div class='hunk'>@@ -491,380 +490,53 @@ eukrea_cpuimx35sd	MACH_EUKREA_CPUIMX35SD	EUKREA_CPUIMX35SD	2821</div><div class='ctx'> eukrea_cpuimx51sd	MACH_EUKREA_CPUIMX51SD	EUKREA_CPUIMX51SD	2822</div><div class='ctx'> eukrea_cpuimx51		MACH_EUKREA_CPUIMX51	EUKREA_CPUIMX51		2823</div><div class='ctx'> smdkc210		MACH_SMDKC210		SMDKC210		2838</div><div class='del'>-omap3_braillo		MACH_OMAP3_BRAILLO	OMAP3_BRAILLO		2839</div><div class='del'>-spyplug			MACH_SPYPLUG		SPYPLUG			2840</div><div class='del'>-ginger			MACH_GINGER		GINGER			2841</div><div class='del'>-tny_t3530		MACH_TNY_T3530		TNY_T3530		2842</div><div class='ctx'> pca102			MACH_PCA102		PCA102			2843</div><div class='del'>-spade			MACH_SPADE		SPADE			2844</div><div class='del'>-mxc25_topaz		MACH_MXC25_TOPAZ	MXC25_TOPAZ		2845</div><div class='ctx'> t5325			MACH_T5325		T5325			2846</div><div class='del'>-gw2361			MACH_GW2361		GW2361			2847</div><div class='del'>-elog			MACH_ELOG		ELOG			2848</div><div class='ctx'> income			MACH_INCOME		INCOME			2849</div><div class='del'>-bcm589x			MACH_BCM589X		BCM589X			2850</div><div class='del'>-etna			MACH_ETNA		ETNA			2851</div><div class='del'>-hawks			MACH_HAWKS		HAWKS			2852</div><div class='del'>-meson			MACH_MESON		MESON			2853</div><div class='del'>-xsbase255		MACH_XSBASE255		XSBASE255		2854</div><div class='del'>-pvm2030			MACH_PVM2030		PVM2030			2855</div><div class='del'>-mioa502			MACH_MIOA502		MIOA502			2856</div><div class='ctx'> vvbox_sdorig2		MACH_VVBOX_SDORIG2	VVBOX_SDORIG2		2857</div><div class='ctx'> vvbox_sdlite2		MACH_VVBOX_SDLITE2	VVBOX_SDLITE2		2858</div><div class='ctx'> vvbox_sdpro4		MACH_VVBOX_SDPRO4	VVBOX_SDPRO4		2859</div><div class='del'>-htc_spv_m700		MACH_HTC_SPV_M700	HTC_SPV_M700		2860</div><div class='ctx'> mx257sx			MACH_MX257SX		MX257SX			2861</div><div class='ctx'> goni			MACH_GONI		GONI			2862</div><div class='del'>-msm8x55_svlte_ffa	MACH_MSM8X55_SVLTE_FFA	MSM8X55_SVLTE_FFA	2863</div><div class='del'>-msm8x55_svlte_surf	MACH_MSM8X55_SVLTE_SURF	MSM8X55_SVLTE_SURF	2864</div><div class='del'>-quickstep		MACH_QUICKSTEP		QUICKSTEP		2865</div><div class='del'>-dmw96			MACH_DMW96		DMW96			2866</div><div class='del'>-hammerhead		MACH_HAMMERHEAD		HAMMERHEAD		2867</div><div class='del'>-trident			MACH_TRIDENT		TRIDENT			2868</div><div class='del'>-lightning		MACH_LIGHTNING		LIGHTNING		2869</div><div class='del'>-iconnect		MACH_ICONNECT		ICONNECT		2870</div><div class='del'>-autobot			MACH_AUTOBOT		AUTOBOT			2871</div><div class='del'>-coconut			MACH_COCONUT		COCONUT			2872</div><div class='del'>-durian			MACH_DURIAN		DURIAN			2873</div><div class='del'>-cayenne			MACH_CAYENNE		CAYENNE			2874</div><div class='del'>-fuji			MACH_FUJI		FUJI			2875</div><div class='del'>-synology_6282		MACH_SYNOLOGY_6282	SYNOLOGY_6282		2876</div><div class='del'>-em1sy			MACH_EM1SY		EM1SY			2877</div><div class='del'>-m502			MACH_M502		M502			2878</div><div class='del'>-matrix518		MACH_MATRIX518		MATRIX518		2879</div><div class='del'>-tiny_gurnard		MACH_TINY_GURNARD	TINY_GURNARD		2880</div><div class='del'>-spear1310		MACH_SPEAR1310		SPEAR1310		2881</div><div class='ctx'> bv07			MACH_BV07		BV07			2882</div><div class='del'>-mxt_td61		MACH_MXT_TD61		MXT_TD61		2883</div><div class='ctx'> openrd_ultimate		MACH_OPENRD_ULTIMATE	OPENRD_ULTIMATE		2884</div><div class='ctx'> devixp			MACH_DEVIXP		DEVIXP			2885</div><div class='ctx'> miccpt			MACH_MICCPT		MICCPT			2886</div><div class='ctx'> mic256			MACH_MIC256		MIC256			2887</div><div class='del'>-as1167			MACH_AS1167		AS1167			2888</div><div class='del'>-omap3_ibiza		MACH_OMAP3_IBIZA	OMAP3_IBIZA		2889</div><div class='ctx'> u5500			MACH_U5500		U5500			2890</div><div class='del'>-davinci_picto		MACH_DAVINCI_PICTO	DAVINCI_PICTO		2891</div><div class='del'>-mecha			MACH_MECHA		MECHA			2892</div><div class='del'>-bubba3			MACH_BUBBA3		BUBBA3			2893</div><div class='del'>-pupitre			MACH_PUPITRE		PUPITRE			2894</div><div class='del'>-tegra_vogue		MACH_TEGRA_VOGUE	TEGRA_VOGUE		2896</div><div class='del'>-tegra_e1165		MACH_TEGRA_E1165	TEGRA_E1165		2897</div><div class='del'>-simplenet		MACH_SIMPLENET		SIMPLENET		2898</div><div class='del'>-ec4350tbm		MACH_EC4350TBM		EC4350TBM		2899</div><div class='del'>-pec_tc			MACH_PEC_TC		PEC_TC			2900</div><div class='del'>-pec_hc2			MACH_PEC_HC2		PEC_HC2			2901</div><div class='del'>-esl_mobilis_a		MACH_ESL_MOBILIS_A	ESL_MOBILIS_A		2902</div><div class='del'>-esl_mobilis_b		MACH_ESL_MOBILIS_B	ESL_MOBILIS_B		2903</div><div class='del'>-esl_wave_a		MACH_ESL_WAVE_A		ESL_WAVE_A		2904</div><div class='del'>-esl_wave_b		MACH_ESL_WAVE_B		ESL_WAVE_B		2905</div><div class='del'>-unisense_mmm		MACH_UNISENSE_MMM	UNISENSE_MMM		2906</div><div class='del'>-blueshark		MACH_BLUESHARK		BLUESHARK		2907</div><div class='del'>-e10			MACH_E10		E10			2908</div><div class='del'>-app3k_robin		MACH_APP3K_ROBIN	APP3K_ROBIN		2909</div><div class='del'>-pov15hd			MACH_POV15HD		POV15HD			2910</div><div class='del'>-stella			MACH_STELLA		STELLA			2911</div><div class='ctx'> linkstation_lschl	MACH_LINKSTATION_LSCHL	LINKSTATION_LSCHL	2913</div><div class='del'>-netwalker		MACH_NETWALKER		NETWALKER		2914</div><div class='del'>-acsx106			MACH_ACSX106		ACSX106			2915</div><div class='del'>-atlas5_c1		MACH_ATLAS5_C1		ATLAS5_C1		2916</div><div class='del'>-nsb3ast			MACH_NSB3AST		NSB3AST			2917</div><div class='del'>-gnet_slc		MACH_GNET_SLC		GNET_SLC		2918</div><div class='del'>-af4000			MACH_AF4000		AF4000			2919</div><div class='del'>-ark9431			MACH_ARK9431		ARK9431			2920</div><div class='del'>-fs_s5pc100		MACH_FS_S5PC100		FS_S5PC100		2921</div><div class='del'>-omap3505nova8		MACH_OMAP3505NOVA8	OMAP3505NOVA8		2922</div><div class='del'>-omap3621_edp1		MACH_OMAP3621_EDP1	OMAP3621_EDP1		2923</div><div class='del'>-oratisaes		MACH_ORATISAES		ORATISAES		2924</div><div class='ctx'> smdkv310		MACH_SMDKV310		SMDKV310		2925</div><div class='del'>-siemens_l0		MACH_SIEMENS_L0		SIEMENS_L0		2926</div><div class='del'>-ventana			MACH_VENTANA		VENTANA			2927</div><div class='ctx'> wm8505_7in_netbook	MACH_WM8505_7IN_NETBOOK	WM8505_7IN_NETBOOK	2928</div><div class='del'>-ec4350sdb		MACH_EC4350SDB		EC4350SDB		2929</div><div class='del'>-mimas			MACH_MIMAS		MIMAS			2930</div><div class='del'>-titan			MACH_TITAN		TITAN			2931</div><div class='ctx'> craneboard		MACH_CRANEBOARD		CRANEBOARD		2932</div><div class='del'>-es2440			MACH_ES2440		ES2440			2933</div><div class='del'>-najay_a9263		MACH_NAJAY_A9263	NAJAY_A9263		2934</div><div class='del'>-htctornado		MACH_HTCTORNADO		HTCTORNADO		2935</div><div class='del'>-dimm_mx257		MACH_DIMM_MX257		DIMM_MX257		2936</div><div class='del'>-jigen301		MACH_JIGEN		JIGEN			2937</div><div class='ctx'> smdk6450		MACH_SMDK6450		SMDK6450		2938</div><div class='del'>-meno_qng		MACH_MENO_QNG		MENO_QNG		2939</div><div class='del'>-ns2416			MACH_NS2416		NS2416			2940</div><div class='del'>-rpc353			MACH_RPC353		RPC353			2941</div><div class='del'>-tq6410			MACH_TQ6410		TQ6410			2942</div><div class='del'>-sky6410			MACH_SKY6410		SKY6410			2943</div><div class='del'>-dynasty			MACH_DYNASTY		DYNASTY			2944</div><div class='del'>-vivo			MACH_VIVO		VIVO			2945</div><div class='del'>-bury_bl7582		MACH_BURY_BL7582	BURY_BL7582		2946</div><div class='del'>-bury_bps5270		MACH_BURY_BPS5270	BURY_BPS5270		2947</div><div class='del'>-basi			MACH_BASI		BASI			2948</div><div class='del'>-tn200			MACH_TN200		TN200			2949</div><div class='del'>-c2mmi			MACH_C2MMI		C2MMI			2950</div><div class='del'>-meson_6236m		MACH_MESON_6236M	MESON_6236M		2951</div><div class='del'>-meson_8626m		MACH_MESON_8626M	MESON_8626M		2952</div><div class='del'>-tube			MACH_TUBE		TUBE			2953</div><div class='del'>-messina			MACH_MESSINA		MESSINA			2954</div><div class='del'>-mx50_arm2		MACH_MX50_ARM2		MX50_ARM2		2955</div><div class='del'>-cetus9263		MACH_CETUS9263		CETUS9263		2956</div><div class='ctx'> brownstone		MACH_BROWNSTONE		BROWNSTONE		2957</div><div class='del'>-vmx25			MACH_VMX25		VMX25			2958</div><div class='del'>-vmx51			MACH_VMX51		VMX51			2959</div><div class='del'>-abacus			MACH_ABACUS		ABACUS			2960</div><div class='del'>-cm4745			MACH_CM4745		CM4745			2961</div><div class='del'>-oratislink		MACH_ORATISLINK		ORATISLINK		2962</div><div class='del'>-davinci_dm365_dvr	MACH_DAVINCI_DM365_DVR	DAVINCI_DM365_DVR	2963</div><div class='del'>-netviz			MACH_NETVIZ		NETVIZ			2964</div><div class='ctx'> flexibity		MACH_FLEXIBITY		FLEXIBITY		2965</div><div class='del'>-wlan_computer		MACH_WLAN_COMPUTER	WLAN_COMPUTER		2966</div><div class='del'>-lpc24xx			MACH_LPC24XX		LPC24XX			2967</div><div class='del'>-spica			MACH_SPICA		SPICA			2968</div><div class='del'>-gpsdisplay		MACH_GPSDISPLAY		GPSDISPLAY		2969</div><div class='del'>-bipnet			MACH_BIPNET		BIPNET			2970</div><div class='del'>-overo_ctu_inertial	MACH_OVERO_CTU_INERTIAL	OVERO_CTU_INERTIAL	2971</div><div class='del'>-davinci_dm355_mmm	MACH_DAVINCI_DM355_MMM	DAVINCI_DM355_MMM	2972</div><div class='del'>-pc9260_v2		MACH_PC9260_V2		PC9260_V2		2973</div><div class='del'>-ptx7545			MACH_PTX7545		PTX7545			2974</div><div class='del'>-tm_efdc			MACH_TM_EFDC		TM_EFDC			2975</div><div class='del'>-omap3_waldo1		MACH_OMAP3_WALDO1	OMAP3_WALDO1		2977</div><div class='del'>-flyer			MACH_FLYER		FLYER			2978</div><div class='del'>-tornado3240		MACH_TORNADO3240	TORNADO3240		2979</div><div class='del'>-soli_01			MACH_SOLI_01		SOLI_01			2980</div><div class='del'>-omapl138_europalc	MACH_OMAPL138_EUROPALC	OMAPL138_EUROPALC	2981</div><div class='del'>-helios_v1		MACH_HELIOS_V1		HELIOS_V1		2982</div><div class='del'>-netspace_lite_v2	MACH_NETSPACE_LITE_V2	NETSPACE_LITE_V2	2983</div><div class='del'>-ssc			MACH_SSC		SSC			2984</div><div class='del'>-premierwave_en		MACH_PREMIERWAVE_EN	PREMIERWAVE_EN		2985</div><div class='del'>-wasabi			MACH_WASABI		WASABI			2986</div><div class='ctx'> mx50_rdp		MACH_MX50_RDP		MX50_RDP		2988</div><div class='ctx'> universal_c210		MACH_UNIVERSAL_C210	UNIVERSAL_C210		2989</div><div class='ctx'> real6410		MACH_REAL6410		REAL6410		2990</div><div class='del'>-spx_sakura		MACH_SPX_SAKURA		SPX_SAKURA		2991</div><div class='del'>-ij3k_2440		MACH_IJ3K_2440		IJ3K_2440		2992</div><div class='del'>-omap3_bc10		MACH_OMAP3_BC10		OMAP3_BC10		2993</div><div class='del'>-thebe			MACH_THEBE		THEBE			2994</div><div class='del'>-rv082			MACH_RV082		RV082			2995</div><div class='del'>-armlguest		MACH_ARMLGUEST		ARMLGUEST		2996</div><div class='del'>-tjinc1000		MACH_TJINC1000		TJINC1000		2997</div><div class='ctx'> dockstar		MACH_DOCKSTAR		DOCKSTAR		2998</div><div class='del'>-ax8008			MACH_AX8008		AX8008			2999</div><div class='del'>-gnet_sgce		MACH_GNET_SGCE		GNET_SGCE		3000</div><div class='del'>-pxwnas_500_1000		MACH_PXWNAS_500_1000	PXWNAS_500_1000		3001</div><div class='del'>-ea20			MACH_EA20		EA20			3002</div><div class='del'>-awm2			MACH_AWM2		AWM2			3003</div><div class='ctx'> ti8148evm		MACH_TI8148EVM		TI8148EVM		3004</div><div class='ctx'> seaboard		MACH_SEABOARD		SEABOARD		3005</div><div class='del'>-linkstation_chlv2	MACH_LINKSTATION_CHLV2	LINKSTATION_CHLV2	3006</div><div class='del'>-tera_pro2_rack		MACH_TERA_PRO2_RACK	TERA_PRO2_RACK		3007</div><div class='del'>-rubys			MACH_RUBYS		RUBYS			3008</div><div class='del'>-aquarius		MACH_AQUARIUS		AQUARIUS		3009</div><div class='ctx'> mx53_ard		MACH_MX53_ARD		MX53_ARD		3010</div><div class='ctx'> mx53_smd		MACH_MX53_SMD		MX53_SMD		3011</div><div class='del'>-lswxl			MACH_LSWXL		LSWXL			3012</div><div class='del'>-dove_avng_v3		MACH_DOVE_AVNG_V3	DOVE_AVNG_V3		3013</div><div class='del'>-sdi_ess_9263		MACH_SDI_ESS_9263	SDI_ESS_9263		3014</div><div class='del'>-jocpu550		MACH_JOCPU550		JOCPU550		3015</div><div class='ctx'> msm8x60_rumi3		MACH_MSM8X60_RUMI3	MSM8X60_RUMI3		3016</div><div class='ctx'> msm8x60_ffa		MACH_MSM8X60_FFA	MSM8X60_FFA		3017</div><div class='del'>-yanomami		MACH_YANOMAMI		YANOMAMI		3018</div><div class='del'>-gta04			MACH_GTA04		GTA04			3019</div><div class='ctx'> cm_a510			MACH_CM_A510		CM_A510			3020</div><div class='del'>-omap3_rfs200		MACH_OMAP3_RFS200	OMAP3_RFS200		3021</div><div class='del'>-kx33xx			MACH_KX33XX		KX33XX			3022</div><div class='del'>-ptx7510			MACH_PTX7510		PTX7510			3023</div><div class='del'>-top9000			MACH_TOP9000		TOP9000			3024</div><div class='del'>-teenote			MACH_TEENOTE		TEENOTE			3025</div><div class='del'>-ts3			MACH_TS3		TS3			3026</div><div class='del'>-a0			MACH_A0			A0			3027</div><div class='del'>-fsm9xxx_surf		MACH_FSM9XXX_SURF	FSM9XXX_SURF		3028</div><div class='del'>-fsm9xxx_ffa		MACH_FSM9XXX_FFA	FSM9XXX_FFA		3029</div><div class='del'>-frrhwcdma60w		MACH_FRRHWCDMA60W	FRRHWCDMA60W		3030</div><div class='del'>-remus			MACH_REMUS		REMUS			3031</div><div class='del'>-at91cap7xdk		MACH_AT91CAP7XDK	AT91CAP7XDK		3032</div><div class='del'>-at91cap7stk		MACH_AT91CAP7STK	AT91CAP7STK		3033</div><div class='del'>-kt_sbc_sam9_1		MACH_KT_SBC_SAM9_1	KT_SBC_SAM9_1		3034</div><div class='del'>-armada_xp_db		MACH_ARMADA_XP_DB	ARMADA_XP_DB		3036</div><div class='del'>-spdm			MACH_SPDM		SPDM			3037</div><div class='del'>-gtib			MACH_GTIB		GTIB			3038</div><div class='del'>-dgm3240			MACH_DGM3240		DGM3240			3039</div><div class='del'>-htcmega			MACH_HTCMEGA		HTCMEGA			3041</div><div class='del'>-tricorder		MACH_TRICORDER		TRICORDER		3042</div><div class='ctx'> tx28			MACH_TX28		TX28			3043</div><div class='del'>-bstbrd			MACH_BSTBRD		BSTBRD			3044</div><div class='del'>-pwb3090			MACH_PWB3090		PWB3090			3045</div><div class='del'>-idea6410		MACH_IDEA6410		IDEA6410		3046</div><div class='del'>-qbc9263			MACH_QBC9263		QBC9263			3047</div><div class='del'>-borabora		MACH_BORABORA		BORABORA		3048</div><div class='del'>-valdez			MACH_VALDEZ		VALDEZ			3049</div><div class='del'>-ls9g20			MACH_LS9G20		LS9G20			3050</div><div class='del'>-mios_v1			MACH_MIOS_V1		MIOS_V1			3051</div><div class='del'>-s5pc110_crespo		MACH_S5PC110_CRESPO	S5PC110_CRESPO		3052</div><div class='del'>-controltek9g20		MACH_CONTROLTEK9G20	CONTROLTEK9G20		3053</div><div class='del'>-tin307			MACH_TIN307		TIN307			3054</div><div class='del'>-tin510			MACH_TIN510		TIN510			3055</div><div class='del'>-bluecheese		MACH_BLUECHEESE		BLUECHEESE		3057</div><div class='del'>-tem3x30			MACH_TEM3X30		TEM3X30			3058</div><div class='del'>-harvest_desoto		MACH_HARVEST_DESOTO	HARVEST_DESOTO		3059</div><div class='del'>-msm8x60_qrdc		MACH_MSM8X60_QRDC	MSM8X60_QRDC		3060</div><div class='del'>-spear900		MACH_SPEAR900		SPEAR900		3061</div><div class='ctx'> pcontrol_g20		MACH_PCONTROL_G20	PCONTROL_G20		3062</div><div class='del'>-rdstor			MACH_RDSTOR		RDSTOR			3063</div><div class='del'>-usdloader		MACH_USDLOADER		USDLOADER		3064</div><div class='del'>-tsoploader		MACH_TSOPLOADER		TSOPLOADER		3065</div><div class='del'>-kronos			MACH_KRONOS		KRONOS			3066</div><div class='del'>-ffcore			MACH_FFCORE		FFCORE			3067</div><div class='del'>-mone			MACH_MONE		MONE			3068</div><div class='del'>-unit2s			MACH_UNIT2S		UNIT2S			3069</div><div class='del'>-acer_a5			MACH_ACER_A5		ACER_A5			3070</div><div class='del'>-etherpro_isp		MACH_ETHERPRO_ISP	ETHERPRO_ISP		3071</div><div class='del'>-stretchs7000		MACH_STRETCHS7000	STRETCHS7000		3072</div><div class='del'>-p87_smartsim		MACH_P87_SMARTSIM	P87_SMARTSIM		3073</div><div class='del'>-tulip			MACH_TULIP		TULIP			3074</div><div class='del'>-sunflower		MACH_SUNFLOWER		SUNFLOWER		3075</div><div class='del'>-rib			MACH_RIB		RIB			3076</div><div class='del'>-clod			MACH_CLOD		CLOD			3077</div><div class='del'>-rump			MACH_RUMP		RUMP			3078</div><div class='del'>-tenderloin		MACH_TENDERLOIN		TENDERLOIN		3079</div><div class='del'>-shortloin		MACH_SHORTLOIN		SHORTLOIN		3080</div><div class='del'>-antares			MACH_ANTARES		ANTARES			3082</div><div class='del'>-wb40n			MACH_WB40N		WB40N			3083</div><div class='del'>-herring			MACH_HERRING		HERRING			3084</div><div class='del'>-naxy400			MACH_NAXY400		NAXY400			3085</div><div class='del'>-naxy1200		MACH_NAXY1200		NAXY1200		3086</div><div class='ctx'> vpr200			MACH_VPR200		VPR200			3087</div><div class='del'>-bug20			MACH_BUG20		BUG20			3088</div><div class='del'>-goflexnet		MACH_GOFLEXNET		GOFLEXNET		3089</div><div class='ctx'> torbreck		MACH_TORBRECK		TORBRECK		3090</div><div class='del'>-saarb_mg1		MACH_SAARB_MG1		SAARB_MG1		3091</div><div class='del'>-callisto		MACH_CALLISTO		CALLISTO		3092</div><div class='del'>-multhsu			MACH_MULTHSU		MULTHSU			3093</div><div class='del'>-saluda			MACH_SALUDA		SALUDA			3094</div><div class='del'>-pemp_omap3_apollo	MACH_PEMP_OMAP3_APOLLO	PEMP_OMAP3_APOLLO	3095</div><div class='del'>-vc0718			MACH_VC0718		VC0718			3096</div><div class='del'>-mvblx			MACH_MVBLX		MVBLX			3097</div><div class='del'>-inhand_apeiron		MACH_INHAND_APEIRON	INHAND_APEIRON		3098</div><div class='del'>-inhand_fury		MACH_INHAND_FURY	INHAND_FURY		3099</div><div class='del'>-inhand_siren		MACH_INHAND_SIREN	INHAND_SIREN		3100</div><div class='del'>-hdnvp			MACH_HDNVP		HDNVP			3101</div><div class='del'>-softwinner		MACH_SOFTWINNER		SOFTWINNER		3102</div><div class='ctx'> prima2_evb		MACH_PRIMA2_EVB		PRIMA2_EVB		3103</div><div class='del'>-nas6210			MACH_NAS6210		NAS6210			3104</div><div class='del'>-unisdev			MACH_UNISDEV		UNISDEV			3105</div><div class='del'>-sbca11			MACH_SBCA11		SBCA11			3106</div><div class='del'>-saga			MACH_SAGA		SAGA			3107</div><div class='del'>-ns_k330			MACH_NS_K330		NS_K330			3108</div><div class='del'>-tanna			MACH_TANNA		TANNA			3109</div><div class='del'>-imate8502		MACH_IMATE8502		IMATE8502		3110</div><div class='del'>-aspen			MACH_ASPEN		ASPEN			3111</div><div class='del'>-daintree_cwac		MACH_DAINTREE_CWAC	DAINTREE_CWAC		3112</div><div class='del'>-zmx25			MACH_ZMX25		ZMX25			3113</div><div class='del'>-maple1			MACH_MAPLE1		MAPLE1			3114</div><div class='del'>-qsd8x72_surf		MACH_QSD8X72_SURF	QSD8X72_SURF		3115</div><div class='del'>-qsd8x72_ffa		MACH_QSD8X72_FFA	QSD8X72_FFA		3116</div><div class='del'>-abilene			MACH_ABILENE		ABILENE			3117</div><div class='del'>-eigen_ttr		MACH_EIGEN_TTR		EIGEN_TTR		3118</div><div class='del'>-iomega_ix2_200		MACH_IOMEGA_IX2_200	IOMEGA_IX2_200		3119</div><div class='del'>-coretec_vcx7400		MACH_CORETEC_VCX7400	CORETEC_VCX7400		3120</div><div class='del'>-santiago		MACH_SANTIAGO		SANTIAGO		3121</div><div class='del'>-mx257sol		MACH_MX257SOL		MX257SOL		3122</div><div class='del'>-strasbourg		MACH_STRASBOURG		STRASBOURG		3123</div><div class='del'>-msm8x60_fluid		MACH_MSM8X60_FLUID	MSM8X60_FLUID		3124</div><div class='del'>-smartqv5		MACH_SMARTQV5		SMARTQV5		3125</div><div class='del'>-smartqv3		MACH_SMARTQV3		SMARTQV3		3126</div><div class='del'>-smartqv7		MACH_SMARTQV7		SMARTQV7		3127</div><div class='ctx'> paz00			MACH_PAZ00		PAZ00			3128</div><div class='ctx'> acmenetusfoxg20		MACH_ACMENETUSFOXG20	ACMENETUSFOXG20		3129</div><div class='del'>-fwbd_0404		MACH_FWBD_0404		FWBD_0404		3131</div><div class='del'>-hdgu			MACH_HDGU		HDGU			3132</div><div class='del'>-pyramid			MACH_PYRAMID		PYRAMID			3133</div><div class='del'>-epiphan			MACH_EPIPHAN		EPIPHAN			3134</div><div class='del'>-omap_bender		MACH_OMAP_BENDER	OMAP_BENDER		3135</div><div class='del'>-gurnard			MACH_GURNARD		GURNARD			3136</div><div class='del'>-gtl_it5100		MACH_GTL_IT5100		GTL_IT5100		3137</div><div class='del'>-bcm2708			MACH_BCM2708		BCM2708			3138</div><div class='del'>-mx51_ggc		MACH_MX51_GGC		MX51_GGC		3139</div><div class='del'>-sharespace		MACH_SHARESPACE		SHARESPACE		3140</div><div class='del'>-haba_knx_explorer	MACH_HABA_KNX_EXPLORER	HABA_KNX_EXPLORER	3141</div><div class='del'>-simtec_kirkmod		MACH_SIMTEC_KIRKMOD	SIMTEC_KIRKMOD		3142</div><div class='del'>-crux			MACH_CRUX		CRUX			3143</div><div class='del'>-mx51_bravo		MACH_MX51_BRAVO		MX51_BRAVO		3144</div><div class='del'>-charon			MACH_CHARON		CHARON			3145</div><div class='del'>-picocom3		MACH_PICOCOM3		PICOCOM3		3146</div><div class='del'>-picocom4		MACH_PICOCOM4		PICOCOM4		3147</div><div class='del'>-serrano			MACH_SERRANO		SERRANO			3148</div><div class='del'>-doubleshot		MACH_DOUBLESHOT		DOUBLESHOT		3149</div><div class='del'>-evsy			MACH_EVSY		EVSY			3150</div><div class='del'>-huashan			MACH_HUASHAN		HUASHAN			3151</div><div class='del'>-lausanne		MACH_LAUSANNE		LAUSANNE		3152</div><div class='del'>-emerald			MACH_EMERALD		EMERALD			3153</div><div class='del'>-tqma35			MACH_TQMA35		TQMA35			3154</div><div class='del'>-marvel			MACH_MARVEL		MARVEL			3155</div><div class='del'>-manuae			MACH_MANUAE		MANUAE			3156</div><div class='del'>-chacha			MACH_CHACHA		CHACHA			3157</div><div class='del'>-lemon			MACH_LEMON		LEMON			3158</div><div class='del'>-csc			MACH_CSC		CSC			3159</div><div class='del'>-gira_knxip_router	MACH_GIRA_KNXIP_ROUTER	GIRA_KNXIP_ROUTER	3160</div><div class='del'>-t20			MACH_T20		T20			3161</div><div class='del'>-hdmini			MACH_HDMINI		HDMINI			3162</div><div class='del'>-sciphone_g2		MACH_SCIPHONE_G2	SCIPHONE_G2		3163</div><div class='del'>-express			MACH_EXPRESS		EXPRESS			3164</div><div class='del'>-express_kt		MACH_EXPRESS_KT		EXPRESS_KT		3165</div><div class='del'>-maximasp		MACH_MAXIMASP		MAXIMASP		3166</div><div class='del'>-nitrogen_imx51		MACH_NITROGEN_IMX51	NITROGEN_IMX51		3167</div><div class='del'>-nitrogen_imx53		MACH_NITROGEN_IMX53	NITROGEN_IMX53		3168</div><div class='del'>-sunfire			MACH_SUNFIRE		SUNFIRE			3169</div><div class='del'>-arowana			MACH_AROWANA		AROWANA			3170</div><div class='del'>-tegra_daytona		MACH_TEGRA_DAYTONA	TEGRA_DAYTONA		3171</div><div class='del'>-tegra_swordfish		MACH_TEGRA_SWORDFISH	TEGRA_SWORDFISH		3172</div><div class='del'>-edison			MACH_EDISON		EDISON			3173</div><div class='del'>-svp8500v1		MACH_SVP8500V1		SVP8500V1		3174</div><div class='del'>-svp8500v2		MACH_SVP8500V2		SVP8500V2		3175</div><div class='del'>-svp5500			MACH_SVP5500		SVP5500			3176</div><div class='del'>-b5500			MACH_B5500		B5500			3177</div><div class='del'>-s5500			MACH_S5500		S5500			3178</div><div class='del'>-icon			MACH_ICON		ICON			3179</div><div class='del'>-elephant		MACH_ELEPHANT		ELEPHANT		3180</div><div class='del'>-shooter			MACH_SHOOTER		SHOOTER			3182</div><div class='del'>-spade_lte		MACH_SPADE_LTE		SPADE_LTE		3183</div><div class='del'>-philhwani		MACH_PHILHWANI		PHILHWANI		3184</div><div class='del'>-gsncomm			MACH_GSNCOMM		GSNCOMM			3185</div><div class='del'>-strasbourg_a2		MACH_STRASBOURG_A2	STRASBOURG_A2		3186</div><div class='del'>-mmm			MACH_MMM		MMM			3187</div><div class='del'>-davinci_dm365_bv	MACH_DAVINCI_DM365_BV	DAVINCI_DM365_BV	3188</div><div class='ctx'> ag5evm			MACH_AG5EVM		AG5EVM			3189</div><div class='del'>-sc575plc		MACH_SC575PLC		SC575PLC		3190</div><div class='del'>-sc575hmi		MACH_SC575IPC		SC575IPC		3191</div><div class='del'>-omap3_tdm3730		MACH_OMAP3_TDM3730	OMAP3_TDM3730		3192</div><div class='del'>-top9000_eval		MACH_TOP9000_EVAL	TOP9000_EVAL		3194</div><div class='del'>-top9000_su		MACH_TOP9000_SU		TOP9000_SU		3195</div><div class='del'>-utm300			MACH_UTM300		UTM300			3196</div><div class='ctx'> tsunagi			MACH_TSUNAGI		TSUNAGI			3197</div><div class='del'>-ts75xx			MACH_TS75XX		TS75XX			3198</div><div class='del'>-ts47xx			MACH_TS47XX		TS47XX			3200</div><div class='del'>-da850_k5		MACH_DA850_K5		DA850_K5		3201</div><div class='del'>-ax502			MACH_AX502		AX502			3202</div><div class='del'>-igep0032		MACH_IGEP0032		IGEP0032		3203</div><div class='del'>-antero			MACH_ANTERO		ANTERO			3204</div><div class='del'>-synergy			MACH_SYNERGY		SYNERGY			3205</div><div class='ctx'> ics_if_voip		MACH_ICS_IF_VOIP	ICS_IF_VOIP		3206</div><div class='ctx'> wlf_cragg_6410		MACH_WLF_CRAGG_6410	WLF_CRAGG_6410		3207</div><div class='del'>-punica			MACH_PUNICA		PUNICA			3208</div><div class='ctx'> trimslice		MACH_TRIMSLICE		TRIMSLICE		3209</div><div class='del'>-mx27_wmultra		MACH_MX27_WMULTRA	MX27_WMULTRA		3210</div><div class='ctx'> mackerel		MACH_MACKEREL		MACKEREL		3211</div><div class='del'>-fa9x27			MACH_FA9X27		FA9X27			3213</div><div class='del'>-ns2816tb		MACH_NS2816TB		NS2816TB		3214</div><div class='del'>-ns2816_ntpad		MACH_NS2816_NTPAD	NS2816_NTPAD		3215</div><div class='del'>-ns2816_ntnb		MACH_NS2816_NTNB	NS2816_NTNB		3216</div><div class='ctx'> kaen			MACH_KAEN		KAEN			3217</div><div class='del'>-nv1000			MACH_NV1000		NV1000			3218</div><div class='del'>-nuc950ts		MACH_NUC950TS		NUC950TS		3219</div><div class='ctx'> nokia_rm680		MACH_NOKIA_RM680	NOKIA_RM680		3220</div><div class='del'>-ast2200			MACH_AST2200		AST2200			3221</div><div class='del'>-lead			MACH_LEAD		LEAD			3222</div><div class='del'>-unino1			MACH_UNINO1		UNINO1			3223</div><div class='del'>-greeco			MACH_GREECO		GREECO			3224</div><div class='del'>-verdi			MACH_VERDI		VERDI			3225</div><div class='ctx'> dm6446_adbox		MACH_DM6446_ADBOX	DM6446_ADBOX		3226</div><div class='ctx'> quad_salsa		MACH_QUAD_SALSA		QUAD_SALSA		3227</div><div class='ctx'> abb_gma_1_1		MACH_ABB_GMA_1_1	ABB_GMA_1_1		3228</div><div class='hunk'>@@ -949,13 +621,11 @@ koi			MACH_KOI		KOI			3312</div><div class='ctx'> ts4800			MACH_TS4800		TS4800			3313</div><div class='ctx'> tqma9263		MACH_TQMA9263		TQMA9263		3314</div><div class='ctx'> holiday			MACH_HOLIDAY		HOLIDAY			3315</div><div class='del'>-dma_6410		MACH_DMA6410		DMA6410			3316</div><div class='ctx'> pcats_overlay		MACH_PCATS_OVERLAY	PCATS_OVERLAY		3317</div><div class='ctx'> hwgw6410		MACH_HWGW6410		HWGW6410		3318</div><div class='ctx'> shenzhou		MACH_SHENZHOU		SHENZHOU		3319</div><div class='ctx'> cwme9210		MACH_CWME9210		CWME9210		3320</div><div class='ctx'> cwme9210js		MACH_CWME9210JS		CWME9210JS		3321</div><div class='del'>-pgs_v1			MACH_PGS_SITARA		PGS_SITARA		3322</div><div class='ctx'> colibri_tegra2		MACH_COLIBRI_TEGRA2	COLIBRI_TEGRA2		3323</div><div class='ctx'> w21			MACH_W21		W21			3324</div><div class='ctx'> polysat1		MACH_POLYSAT1		POLYSAT1		3325</div><div class='hunk'>@@ -1021,13 +691,11 @@ viprinet		MACH_VIPRINET		VIPRINET		3385</div><div class='ctx'> bockw			MACH_BOCKW		BOCKW			3386</div><div class='ctx'> eva2000			MACH_EVA2000		EVA2000			3387</div><div class='ctx'> steelyard		MACH_STEELYARD		STEELYARD		3388</div><div class='del'>-sdh001			MACH_MACH_SDH001	MACH_SDH001		3390</div><div class='ctx'> nsslsboard		MACH_NSSLSBOARD		NSSLSBOARD		3392</div><div class='ctx'> geneva_b5		MACH_GENEVA_B5		GENEVA_B5		3393</div><div class='ctx'> spear1340		MACH_SPEAR1340		SPEAR1340		3394</div><div class='ctx'> rexmas			MACH_REXMAS		REXMAS			3395</div><div class='ctx'> msm8960_cdp		MACH_MSM8960_CDP	MSM8960_CDP		3396</div><div class='del'>-msm8960_mdp		MACH_MSM8960_MDP	MSM8960_MDP		3397</div><div class='ctx'> msm8960_fluid		MACH_MSM8960_FLUID	MSM8960_FLUID		3398</div><div class='ctx'> msm8960_apq		MACH_MSM8960_APQ	MSM8960_APQ		3399</div><div class='ctx'> helios_v2		MACH_HELIOS_V2		HELIOS_V2		3400</div><div class='hunk'>@@ -1123,6 +791,381 @@ blissc			MACH_BLISSC		BLISSC			3491</div><div class='ctx'> thales_adc		MACH_THALES_ADC		THALES_ADC		3492</div><div class='ctx'> ubisys_p9d_evp		MACH_UBISYS_P9D_EVP	UBISYS_P9D_EVP		3493</div><div class='ctx'> atdgp318		MACH_ATDGP318		ATDGP318		3494</div><div class='add'>+dma210u			MACH_DMA210U		DMA210U			3495</div><div class='add'>+em_t3			MACH_EM_T3		EM_T3			3496</div><div class='add'>+htx3250			MACH_HTX3250		HTX3250			3497</div><div class='add'>+g50			MACH_G50		G50			3498</div><div class='add'>+eco5			MACH_ECO5		ECO5			3499</div><div class='add'>+wintergrasp		MACH_WINTERGRASP	WINTERGRASP		3500</div><div class='add'>+puro			MACH_PURO		PURO			3501</div><div class='add'>+shooter_k		MACH_SHOOTER_K		SHOOTER_K		3502</div><div class='add'>+nspire			MACH_NSPIRE		NSPIRE			3503</div><div class='add'>+mickxx			MACH_MICKXX		MICKXX			3504</div><div class='add'>+lxmb			MACH_LXMB		LXMB			3505</div><div class='add'>+adam			MACH_ADAM		ADAM			3507</div><div class='add'>+b1004			MACH_B1004		B1004			3508</div><div class='add'>+oboea			MACH_OBOEA		OBOEA			3509</div><div class='add'>+a1015			MACH_A1015		A1015			3510</div><div class='add'>+robin_vbdt30		MACH_ROBIN_VBDT30	ROBIN_VBDT30		3511</div><div class='add'>+tegra_enterprise	MACH_TEGRA_ENTERPRISE	TEGRA_ENTERPRISE	3512</div><div class='add'>+rfl108200_mk10		MACH_RFL108200_MK10	RFL108200_MK10		3513</div><div class='add'>+rfl108300_mk16		MACH_RFL108300_MK16	RFL108300_MK16		3514</div><div class='add'>+rover_v7		MACH_ROVER_V7		ROVER_V7		3515</div><div class='add'>+miphone			MACH_MIPHONE		MIPHONE			3516</div><div class='add'>+femtobts		MACH_FEMTOBTS		FEMTOBTS		3517</div><div class='add'>+monopoli		MACH_MONOPOLI		MONOPOLI		3518</div><div class='add'>+boss			MACH_BOSS		BOSS			3519</div><div class='add'>+davinci_dm368_vtam	MACH_DAVINCI_DM368_VTAM	DAVINCI_DM368_VTAM	3520</div><div class='add'>+clcon			MACH_CLCON		CLCON			3521</div><div class='add'>+nokia_rm696		MACH_NOKIA_RM696	NOKIA_RM696		3522</div><div class='add'>+tahiti			MACH_TAHITI		TAHITI			3523</div><div class='add'>+fighter			MACH_FIGHTER		FIGHTER			3524</div><div class='add'>+sgh_i710		MACH_SGH_I710		SGH_I710		3525</div><div class='add'>+integreproscb		MACH_INTEGREPROSCB	INTEGREPROSCB		3526</div><div class='add'>+monza			MACH_MONZA		MONZA			3527</div><div class='add'>+calimain		MACH_CALIMAIN		CALIMAIN		3528</div><div class='add'>+mx6q_sabreauto		MACH_MX6Q_SABREAUTO	MX6Q_SABREAUTO		3529</div><div class='add'>+gma01x			MACH_GMA01X		GMA01X			3530</div><div class='add'>+sbc51			MACH_SBC51		SBC51			3531</div><div class='add'>+fit			MACH_FIT		FIT			3532</div><div class='add'>+steelhead		MACH_STEELHEAD		STEELHEAD		3533</div><div class='add'>+panther			MACH_PANTHER		PANTHER			3534</div><div class='add'>+msm8960_liquid		MACH_MSM8960_LIQUID	MSM8960_LIQUID		3535</div><div class='add'>+lexikonct		MACH_LEXIKONCT		LEXIKONCT		3536</div><div class='add'>+ns2816_stb		MACH_NS2816_STB		NS2816_STB		3537</div><div class='add'>+sei_mm2_lpc3250		MACH_SEI_MM2_LPC3250	SEI_MM2_LPC3250		3538</div><div class='add'>+cmimx53			MACH_CMIMX53		CMIMX53			3539</div><div class='add'>+sandwich		MACH_SANDWICH		SANDWICH		3540</div><div class='add'>+chief			MACH_CHIEF		CHIEF			3541</div><div class='add'>+pogo_e02		MACH_POGO_E02		POGO_E02		3542</div><div class='add'>+mikrap_x168		MACH_MIKRAP_X168	MIKRAP_X168		3543</div><div class='add'>+htcmozart		MACH_HTCMOZART		HTCMOZART		3544</div><div class='add'>+htcgold			MACH_HTCGOLD		HTCGOLD			3545</div><div class='add'>+mt72xx			MACH_MT72XX		MT72XX			3546</div><div class='add'>+mx51_ivy		MACH_MX51_IVY		MX51_IVY		3547</div><div class='add'>+mx51_lvd		MACH_MX51_LVD		MX51_LVD		3548</div><div class='add'>+omap3_wiser2		MACH_OMAP3_WISER2	OMAP3_WISER2		3549</div><div class='add'>+dreamplug		MACH_DREAMPLUG		DREAMPLUG		3550</div><div class='add'>+cobas_c_111		MACH_COBAS_C_111	COBAS_C_111		3551</div><div class='add'>+cobas_u_411		MACH_COBAS_U_411	COBAS_U_411		3552</div><div class='add'>+hssd			MACH_HSSD		HSSD			3553</div><div class='add'>+iom35x			MACH_IOM35X		IOM35X			3554</div><div class='add'>+psom_omap		MACH_PSOM_OMAP		PSOM_OMAP		3555</div><div class='add'>+iphone_2g		MACH_IPHONE_2G		IPHONE_2G		3556</div><div class='add'>+iphone_3g		MACH_IPHONE_3G		IPHONE_3G		3557</div><div class='add'>+ipod_touch_1g		MACH_IPOD_TOUCH_1G	IPOD_TOUCH_1G		3558</div><div class='add'>+pharos_tpc		MACH_PHAROS_TPC		PHAROS_TPC		3559</div><div class='add'>+mx53_hydra		MACH_MX53_HYDRA		MX53_HYDRA		3560</div><div class='add'>+ns2816_dev_board	MACH_NS2816_DEV_BOARD	NS2816_DEV_BOARD	3561</div><div class='add'>+iphone_3gs		MACH_IPHONE_3GS		IPHONE_3GS		3562</div><div class='add'>+iphone_4		MACH_IPHONE_4		IPHONE_4		3563</div><div class='add'>+ipod_touch_4g		MACH_IPOD_TOUCH_4G	IPOD_TOUCH_4G		3564</div><div class='add'>+dragon_e1100		MACH_DRAGON_E1100	DRAGON_E1100		3565</div><div class='add'>+topside			MACH_TOPSIDE		TOPSIDE			3566</div><div class='add'>+irisiii			MACH_IRISIII		IRISIII			3567</div><div class='add'>+deto_macarm9		MACH_DETO_MACARM9	DETO_MACARM9		3568</div><div class='add'>+eti_d1			MACH_ETI_D1		ETI_D1			3569</div><div class='add'>+som3530sdk		MACH_SOM3530SDK		SOM3530SDK		3570</div><div class='add'>+oc_engine		MACH_OC_ENGINE		OC_ENGINE		3571</div><div class='add'>+apq8064_sim		MACH_APQ8064_SIM	APQ8064_SIM		3572</div><div class='add'>+alps			MACH_ALPS		ALPS			3575</div><div class='add'>+tny_t3730		MACH_TNY_T3730		TNY_T3730		3576</div><div class='add'>+geryon_nfe		MACH_GERYON_NFE		GERYON_NFE		3577</div><div class='add'>+ns2816_ref_board	MACH_NS2816_REF_BOARD	NS2816_REF_BOARD	3578</div><div class='add'>+silverstone		MACH_SILVERSTONE	SILVERSTONE		3579</div><div class='add'>+mtt2440			MACH_MTT2440		MTT2440			3580</div><div class='add'>+ynicdb			MACH_YNICDB		YNICDB			3581</div><div class='add'>+bct			MACH_BCT		BCT			3582</div><div class='add'>+tuscan			MACH_TUSCAN		TUSCAN			3583</div><div class='add'>+xbt_sam9g45		MACH_XBT_SAM9G45	XBT_SAM9G45		3584</div><div class='add'>+enbw_cmc		MACH_ENBW_CMC		ENBW_CMC		3585</div><div class='add'>+ch104mx257		MACH_CH104MX257		CH104MX257		3587</div><div class='add'>+openpri			MACH_OPENPRI		OPENPRI			3588</div><div class='add'>+am335xevm		MACH_AM335XEVM		AM335XEVM		3589</div><div class='add'>+picodmb			MACH_PICODMB		PICODMB			3590</div><div class='add'>+waluigi			MACH_WALUIGI		WALUIGI			3591</div><div class='add'>+punicag7		MACH_PUNICAG7		PUNICAG7		3592</div><div class='add'>+ipad_1g			MACH_IPAD_1G		IPAD_1G			3593</div><div class='add'>+appletv_2g		MACH_APPLETV_2G		APPLETV_2G		3594</div><div class='add'>+mach_ecog45		MACH_MACH_ECOG45	MACH_ECOG45		3595</div><div class='add'>+ait_cam_enc_4xx		MACH_AIT_CAM_ENC_4XX	AIT_CAM_ENC_4XX		3596</div><div class='add'>+runnymede		MACH_RUNNYMEDE		RUNNYMEDE		3597</div><div class='add'>+play			MACH_PLAY		PLAY			3598</div><div class='add'>+hw90260			MACH_HW90260		HW90260			3599</div><div class='add'>+tagh			MACH_TAGH		TAGH			3600</div><div class='add'>+filbert			MACH_FILBERT		FILBERT			3601</div><div class='add'>+getinge_netcomv3	MACH_GETINGE_NETCOMV3	GETINGE_NETCOMV3	3602</div><div class='add'>+cw20			MACH_CW20		CW20			3603</div><div class='add'>+cinema			MACH_CINEMA		CINEMA			3604</div><div class='add'>+cinema_tea		MACH_CINEMA_TEA		CINEMA_TEA		3605</div><div class='add'>+cinema_coffee		MACH_CINEMA_COFFEE	CINEMA_COFFEE		3606</div><div class='add'>+cinema_juice		MACH_CINEMA_JUICE	CINEMA_JUICE		3607</div><div class='add'>+mx53_mirage2		MACH_MX53_MIRAGE2	MX53_MIRAGE2		3609</div><div class='add'>+mx53_efikasb		MACH_MX53_EFIKASB	MX53_EFIKASB		3610</div><div class='add'>+stm_b2000		MACH_STM_B2000		STM_B2000		3612</div><div class='ctx'> m28evk			MACH_M28EVK		M28EVK			3613</div><div class='add'>+pda			MACH_PDA		PDA			3614</div><div class='add'>+meraki_mr58		MACH_MERAKI_MR58	MERAKI_MR58		3615</div><div class='add'>+kota2			MACH_KOTA2		KOTA2			3616</div><div class='add'>+letcool			MACH_LETCOOL		LETCOOL			3617</div><div class='add'>+mx27iat			MACH_MX27IAT		MX27IAT			3618</div><div class='add'>+apollo_td		MACH_APOLLO_TD		APOLLO_TD		3619</div><div class='add'>+arena			MACH_ARENA		ARENA			3620</div><div class='add'>+gsngateway		MACH_GSNGATEWAY		GSNGATEWAY		3621</div><div class='add'>+lf2000			MACH_LF2000		LF2000			3622</div><div class='add'>+bonito			MACH_BONITO		BONITO			3623</div><div class='add'>+asymptote		MACH_ASYMPTOTE		ASYMPTOTE		3624</div><div class='add'>+bst2brd			MACH_BST2BRD		BST2BRD			3625</div><div class='add'>+tx335s			MACH_TX335S		TX335S			3626</div><div class='add'>+pelco_tesla		MACH_PELCO_TESLA	PELCO_TESLA		3627</div><div class='add'>+rrhtestplat		MACH_RRHTESTPLAT	RRHTESTPLAT		3628</div><div class='add'>+vidtonic_pro		MACH_VIDTONIC_PRO	VIDTONIC_PRO		3629</div><div class='add'>+pl_apollo		MACH_PL_APOLLO		PL_APOLLO		3630</div><div class='add'>+pl_phoenix		MACH_PL_PHOENIX		PL_PHOENIX		3631</div><div class='add'>+m28cu3			MACH_M28CU3		M28CU3			3632</div><div class='add'>+vvbox_hd		MACH_VVBOX_HD		VVBOX_HD		3633</div><div class='add'>+coreware_sam9260_	MACH_COREWARE_SAM9260_	COREWARE_SAM9260_	3634</div><div class='add'>+marmaduke		MACH_MARMADUKE		MARMADUKE		3635</div><div class='add'>+amg_xlcore_camera	MACH_AMG_XLCORE_CAMERA	AMG_XLCORE_CAMERA	3636</div><div class='add'>+omap3_egf		MACH_OMAP3_EGF		OMAP3_EGF		3637</div><div class='ctx'> smdk4212		MACH_SMDK4212		SMDK4212		3638</div><div class='add'>+dnp9200			MACH_DNP9200		DNP9200			3639</div><div class='add'>+tf101			MACH_TF101		TF101			3640</div><div class='add'>+omap3silvio		MACH_OMAP3SILVIO	OMAP3SILVIO		3641</div><div class='add'>+picasso2		MACH_PICASSO2		PICASSO2		3642</div><div class='add'>+vangogh2		MACH_VANGOGH2		VANGOGH2		3643</div><div class='add'>+olpc_xo_1_75		MACH_OLPC_XO_1_75	OLPC_XO_1_75		3644</div><div class='add'>+gx400			MACH_GX400		GX400			3645</div><div class='add'>+gs300			MACH_GS300		GS300			3646</div><div class='add'>+acer_a9			MACH_ACER_A9		ACER_A9			3647</div><div class='add'>+vivow_evm		MACH_VIVOW_EVM		VIVOW_EVM		3648</div><div class='add'>+veloce_cxq		MACH_VELOCE_CXQ		VELOCE_CXQ		3649</div><div class='add'>+veloce_cxm		MACH_VELOCE_CXM		VELOCE_CXM		3650</div><div class='add'>+p1852			MACH_P1852		P1852			3651</div><div class='add'>+naxy100			MACH_NAXY100		NAXY100			3652</div><div class='add'>+taishan			MACH_TAISHAN		TAISHAN			3653</div><div class='add'>+touchlink		MACH_TOUCHLINK		TOUCHLINK		3654</div><div class='add'>+stm32f103ze		MACH_STM32F103ZE	STM32F103ZE		3655</div><div class='add'>+mcx			MACH_MCX		MCX			3656</div><div class='add'>+stm_nmhdk_fli7610	MACH_STM_NMHDK_FLI7610	STM_NMHDK_FLI7610	3657</div><div class='add'>+top28x			MACH_TOP28X		TOP28X			3658</div><div class='add'>+okl4vp_microvisor	MACH_OKL4VP_MICROVISOR	OKL4VP_MICROVISOR	3659</div><div class='add'>+pop			MACH_POP		POP			3660</div><div class='add'>+layer			MACH_LAYER		LAYER			3661</div><div class='add'>+trondheim		MACH_TRONDHEIM		TRONDHEIM		3662</div><div class='add'>+eva			MACH_EVA		EVA			3663</div><div class='add'>+trust_taurus		MACH_TRUST_TAURUS	TRUST_TAURUS		3664</div><div class='add'>+ns2816_huashan		MACH_NS2816_HUASHAN	NS2816_HUASHAN		3665</div><div class='add'>+ns2816_yangcheng	MACH_NS2816_YANGCHENG	NS2816_YANGCHENG	3666</div><div class='add'>+p852			MACH_P852		P852			3667</div><div class='add'>+flea3			MACH_FLEA3		FLEA3			3668</div><div class='add'>+bowfin			MACH_BOWFIN		BOWFIN			3669</div><div class='add'>+mv88de3100		MACH_MV88DE3100		MV88DE3100		3670</div><div class='add'>+pia_am35x		MACH_PIA_AM35X		PIA_AM35X		3671</div><div class='add'>+cedar			MACH_CEDAR		CEDAR			3672</div><div class='add'>+picasso_e		MACH_PICASSO_E		PICASSO_E		3673</div><div class='add'>+samsung_e60		MACH_SAMSUNG_E60	SAMSUNG_E60		3674</div><div class='add'>+sdvr_mini		MACH_SDVR_MINI		SDVR_MINI		3676</div><div class='add'>+omap3_ij3k		MACH_OMAP3_IJ3K		OMAP3_IJ3K		3677</div><div class='add'>+modasmc1		MACH_MODASMC1		MODASMC1		3678</div><div class='add'>+apq8064_rumi3		MACH_APQ8064_RUMI3	APQ8064_RUMI3		3679</div><div class='add'>+matrix506		MACH_MATRIX506		MATRIX506		3680</div><div class='add'>+msm9615_mtp		MACH_MSM9615_MTP	MSM9615_MTP		3681</div><div class='add'>+dm36x_spawndc		MACH_DM36X_SPAWNDC	DM36X_SPAWNDC		3682</div><div class='add'>+sff792			MACH_SFF792		SFF792			3683</div><div class='add'>+am335xiaevm		MACH_AM335XIAEVM	AM335XIAEVM		3684</div><div class='add'>+g3c2440			MACH_G3C2440		G3C2440			3685</div><div class='add'>+tion270			MACH_TION270		TION270			3686</div><div class='add'>+w22q7arm02		MACH_W22Q7ARM02		W22Q7ARM02		3687</div><div class='add'>+omap_cat		MACH_OMAP_CAT		OMAP_CAT		3688</div><div class='add'>+at91sam9n12ek		MACH_AT91SAM9N12EK	AT91SAM9N12EK		3689</div><div class='add'>+morrison		MACH_MORRISON		MORRISON		3690</div><div class='add'>+svdu			MACH_SVDU		SVDU			3691</div><div class='add'>+lpp01			MACH_LPP01		LPP01			3692</div><div class='add'>+ubc283			MACH_UBC283		UBC283			3693</div><div class='add'>+zeppelin		MACH_ZEPPELIN		ZEPPELIN		3694</div><div class='add'>+motus			MACH_MOTUS		MOTUS			3695</div><div class='add'>+neomainboard		MACH_NEOMAINBOARD	NEOMAINBOARD		3696</div><div class='add'>+devkit3250		MACH_DEVKIT3250		DEVKIT3250		3697</div><div class='add'>+devkit7000		MACH_DEVKIT7000		DEVKIT7000		3698</div><div class='add'>+fmc_uic			MACH_FMC_UIC		FMC_UIC			3699</div><div class='add'>+fmc_dcm			MACH_FMC_DCM		FMC_DCM			3700</div><div class='add'>+batwm			MACH_BATWM		BATWM			3701</div><div class='add'>+atlas6cb		MACH_ATLAS6CB		ATLAS6CB		3702</div><div class='add'>+blue			MACH_BLUE		BLUE			3705</div><div class='add'>+colorado		MACH_COLORADO		COLORADO		3706</div><div class='add'>+popc			MACH_POPC		POPC			3707</div><div class='add'>+promwad_jade		MACH_PROMWAD_JADE	PROMWAD_JADE		3708</div><div class='add'>+amp			MACH_AMP		AMP			3709</div><div class='add'>+gnet_amp		MACH_GNET_AMP		GNET_AMP		3710</div><div class='add'>+toques			MACH_TOQUES		TOQUES			3711</div><div class='add'>+dct_storm		MACH_DCT_STORM		DCT_STORM		3713</div><div class='add'>+owl			MACH_OWL		OWL			3715</div><div class='add'>+cogent_csb1741		MACH_COGENT_CSB1741	COGENT_CSB1741		3716</div><div class='add'>+adillustra610		MACH_ADILLUSTRA610	ADILLUSTRA610		3718</div><div class='add'>+ecafe_na04		MACH_ECAFE_NA04		ECAFE_NA04		3719</div><div class='add'>+popct			MACH_POPCT		POPCT			3720</div><div class='add'>+omap3_helena		MACH_OMAP3_HELENA	OMAP3_HELENA		3721</div><div class='add'>+ach			MACH_ACH		ACH			3722</div><div class='add'>+module_dtb		MACH_MODULE_DTB		MODULE_DTB		3723</div><div class='add'>+oslo_elisabeth		MACH_OSLO_ELISABETH	OSLO_ELISABETH		3725</div><div class='add'>+tt01			MACH_TT01		TT01			3726</div><div class='add'>+msm8930_cdp		MACH_MSM8930_CDP	MSM8930_CDP		3727</div><div class='add'>+msm8930_mtp		MACH_MSM8930_MTP	MSM8930_MTP		3728</div><div class='add'>+msm8930_fluid		MACH_MSM8930_FLUID	MSM8930_FLUID		3729</div><div class='add'>+ltu11			MACH_LTU11		LTU11			3730</div><div class='add'>+am1808_spawnco		MACH_AM1808_SPAWNCO	AM1808_SPAWNCO		3731</div><div class='add'>+flx6410			MACH_FLX6410		FLX6410			3732</div><div class='add'>+mx6q_qsb		MACH_MX6Q_QSB		MX6Q_QSB		3733</div><div class='add'>+mx53_plt424		MACH_MX53_PLT424	MX53_PLT424		3734</div><div class='add'>+jasmine			MACH_JASMINE		JASMINE			3735</div><div class='add'>+l138_owlboard_plus	MACH_L138_OWLBOARD_PLUS	L138_OWLBOARD_PLUS	3736</div><div class='add'>+wr21			MACH_WR21		WR21			3737</div><div class='add'>+peaboy			MACH_PEABOY		PEABOY			3739</div><div class='add'>+mx28_plato		MACH_MX28_PLATO		MX28_PLATO		3740</div><div class='add'>+kacom2			MACH_KACOM2		KACOM2			3741</div><div class='add'>+slco			MACH_SLCO		SLCO			3742</div><div class='add'>+imx51pico		MACH_IMX51PICO		IMX51PICO		3743</div><div class='add'>+glink1			MACH_GLINK1		GLINK1			3744</div><div class='add'>+diamond			MACH_DIAMOND		DIAMOND			3745</div><div class='add'>+d9000			MACH_D9000		D9000			3746</div><div class='add'>+w5300e01		MACH_W5300E01		W5300E01		3747</div><div class='add'>+im6000			MACH_IM6000		IM6000			3748</div><div class='add'>+mx51_fred51		MACH_MX51_FRED51	MX51_FRED51		3749</div><div class='add'>+stm32f2			MACH_STM32F2		STM32F2			3750</div><div class='add'>+ville			MACH_VILLE		VILLE			3751</div><div class='add'>+ptip_murnau		MACH_PTIP_MURNAU	PTIP_MURNAU		3752</div><div class='add'>+ptip_classic		MACH_PTIP_CLASSIC	PTIP_CLASSIC		3753</div><div class='add'>+mx53grb			MACH_MX53GRB		MX53GRB			3754</div><div class='add'>+gagarin			MACH_GAGARIN		GAGARIN			3755</div><div class='add'>+nas2big			MACH_NAS2BIG		NAS2BIG			3757</div><div class='add'>+superfemto		MACH_SUPERFEMTO		SUPERFEMTO		3758</div><div class='add'>+teufel			MACH_TEUFEL		TEUFEL			3759</div><div class='add'>+dinara			MACH_DINARA		DINARA			3760</div><div class='add'>+vanquish		MACH_VANQUISH		VANQUISH		3761</div><div class='add'>+zipabox1		MACH_ZIPABOX1		ZIPABOX1		3762</div><div class='add'>+u9540			MACH_U9540		U9540			3763</div><div class='add'>+jet			MACH_JET		JET			3764</div><div class='ctx'> smdk4412		MACH_SMDK4412		SMDK4412		3765</div><div class='add'>+elite			MACH_ELITE		ELITE			3766</div><div class='add'>+spear320_hmi		MACH_SPEAR320_HMI	SPEAR320_HMI		3767</div><div class='add'>+ontario			MACH_ONTARIO		ONTARIO			3768</div><div class='add'>+mx6q_sabrelite		MACH_MX6Q_SABRELITE	MX6Q_SABRELITE		3769</div><div class='add'>+vc200			MACH_VC200		VC200			3770</div><div class='add'>+msm7625a_ffa		MACH_MSM7625A_FFA	MSM7625A_FFA		3771</div><div class='add'>+msm7625a_surf		MACH_MSM7625A_SURF	MSM7625A_SURF		3772</div><div class='add'>+benthossbp		MACH_BENTHOSSBP		BENTHOSSBP		3773</div><div class='add'>+smdk5210		MACH_SMDK5210		SMDK5210		3774</div><div class='add'>+empq2300		MACH_EMPQ2300		EMPQ2300		3775</div><div class='add'>+minipos			MACH_MINIPOS		MINIPOS			3776</div><div class='add'>+omap5_sevm		MACH_OMAP5_SEVM		OMAP5_SEVM		3777</div><div class='add'>+shelter			MACH_SHELTER		SHELTER			3778</div><div class='add'>+omap3_devkit8500	MACH_OMAP3_DEVKIT8500	OMAP3_DEVKIT8500	3779</div><div class='add'>+edgetd			MACH_EDGETD		EDGETD			3780</div><div class='add'>+copperyard		MACH_COPPERYARD		COPPERYARD		3781</div><div class='add'>+edge			MACH_EDGE		EDGE			3782</div><div class='add'>+edge_u			MACH_EDGE_U		EDGE_U			3783</div><div class='add'>+edge_td			MACH_EDGE_TD		EDGE_TD			3784</div><div class='add'>+wdss			MACH_WDSS		WDSS			3785</div><div class='add'>+dl_pb25			MACH_DL_PB25		DL_PB25			3786</div><div class='add'>+dss11			MACH_DSS11		DSS11			3787</div><div class='add'>+cpa			MACH_CPA		CPA			3788</div><div class='add'>+aptp2000		MACH_APTP2000		APTP2000		3789</div><div class='add'>+marzen			MACH_MARZEN		MARZEN			3790</div><div class='add'>+st_turbine		MACH_ST_TURBINE		ST_TURBINE		3791</div><div class='add'>+gtl_it3300		MACH_GTL_IT3300		GTL_IT3300		3792</div><div class='add'>+mx6_mule		MACH_MX6_MULE		MX6_MULE		3793</div><div class='add'>+v7pxa_dt		MACH_V7PXA_DT		V7PXA_DT		3794</div><div class='add'>+v7mmp_dt		MACH_V7MMP_DT		V7MMP_DT		3795</div><div class='add'>+dragon7			MACH_DRAGON7		DRAGON7			3796</div><div class='add'>+krome			MACH_KROME		KROME			3797</div><div class='add'>+oratisdante		MACH_ORATISDANTE	ORATISDANTE		3798</div><div class='add'>+fathom			MACH_FATHOM		FATHOM			3799</div><div class='add'>+dns325			MACH_DNS325		DNS325			3800</div><div class='add'>+sarnen			MACH_SARNEN		SARNEN			3801</div><div class='add'>+ubisys_g1		MACH_UBISYS_G1		UBISYS_G1		3802</div><div class='add'>+mx53_pf1		MACH_MX53_PF1		MX53_PF1		3803</div><div class='add'>+asanti			MACH_ASANTI		ASANTI			3804</div><div class='add'>+volta			MACH_VOLTA		VOLTA			3805</div><div class='add'>+knight			MACH_KNIGHT		KNIGHT			3807</div><div class='add'>+beaglebone		MACH_BEAGLEBONE		BEAGLEBONE		3808</div><div class='add'>+becker			MACH_BECKER		BECKER			3809</div><div class='add'>+fc360			MACH_FC360		FC360			3810</div><div class='add'>+pmi2_xls		MACH_PMI2_XLS		PMI2_XLS		3811</div><div class='add'>+taranto			MACH_TARANTO		TARANTO			3812</div><div class='add'>+plutux			MACH_PLUTUX		PLUTUX			3813</div><div class='add'>+ipmp_medcom		MACH_IPMP_MEDCOM	IPMP_MEDCOM		3814</div><div class='add'>+absolut			MACH_ABSOLUT		ABSOLUT			3815</div><div class='add'>+awpb3			MACH_AWPB3		AWPB3			3816</div><div class='add'>+nfp32xx_dt		MACH_NFP32XX_DT		NFP32XX_DT		3817</div><div class='add'>+dl_pb53			MACH_DL_PB53		DL_PB53			3818</div><div class='add'>+acu_ii			MACH_ACU_II		ACU_II			3819</div><div class='add'>+avalon			MACH_AVALON		AVALON			3820</div><div class='add'>+sphinx			MACH_SPHINX		SPHINX			3821</div><div class='add'>+titan_t			MACH_TITAN_T		TITAN_T			3822</div><div class='add'>+harvest_boris		MACH_HARVEST_BORIS	HARVEST_BORIS		3823</div><div class='add'>+mach_msm7x30_m3s	MACH_MACH_MSM7X30_M3S	MACH_MSM7X30_M3S	3824</div><div class='add'>+smdk5250		MACH_SMDK5250		SMDK5250		3825</div><div class='add'>+imxt_lite		MACH_IMXT_LITE		IMXT_LITE		3826</div><div class='add'>+imxt_std		MACH_IMXT_STD		IMXT_STD		3827</div><div class='add'>+imxt_log		MACH_IMXT_LOG		IMXT_LOG		3828</div><div class='add'>+imxt_nav		MACH_IMXT_NAV		IMXT_NAV		3829</div><div class='add'>+imxt_full		MACH_IMXT_FULL		IMXT_FULL		3830</div><div class='add'>+ag09015			MACH_AG09015		AG09015			3831</div><div class='add'>+am3517_mt_ventoux	MACH_AM3517_MT_VENTOUX	AM3517_MT_VENTOUX	3832</div><div class='add'>+dp1arm9			MACH_DP1ARM9		DP1ARM9			3833</div><div class='add'>+picasso_m		MACH_PICASSO_M		PICASSO_M		3834</div><div class='add'>+video_gadget		MACH_VIDEO_GADGET	VIDEO_GADGET		3835</div><div class='add'>+mtt_om3x		MACH_MTT_OM3X		MTT_OM3X		3836</div><div class='add'>+mx6q_arm2		MACH_MX6Q_ARM2		MX6Q_ARM2		3837</div><div class='add'>+picosam9g45		MACH_PICOSAM9G45	PICOSAM9G45		3838</div><div class='add'>+vpm_dm365		MACH_VPM_DM365		VPM_DM365		3839</div><div class='add'>+bonfire			MACH_BONFIRE		BONFIRE			3840</div><div class='add'>+mt2p2d			MACH_MT2P2D		MT2P2D			3841</div><div class='add'>+sigpda01		MACH_SIGPDA01		SIGPDA01		3842</div><div class='add'>+cn27			MACH_CN27		CN27			3843</div><div class='add'>+mx25_cwtap		MACH_MX25_CWTAP		MX25_CWTAP		3844</div><div class='add'>+apf28			MACH_APF28		APF28			3845</div><div class='add'>+pelco_maxwell		MACH_PELCO_MAXWELL	PELCO_MAXWELL		3846</div><div class='add'>+ge_phoenix		MACH_GE_PHOENIX		GE_PHOENIX		3847</div><div class='add'>+empc_a500		MACH_EMPC_A500		EMPC_A500		3848</div><div class='add'>+ims_arm9		MACH_IMS_ARM9		IMS_ARM9		3849</div><div class='add'>+mini2416		MACH_MINI2416		MINI2416		3850</div><div class='add'>+mini2450		MACH_MINI2450		MINI2450		3851</div><div class='add'>+mini310			MACH_MINI310		MINI310			3852</div><div class='add'>+spear_hurricane		MACH_SPEAR_HURRICANE	SPEAR_HURRICANE		3853</div><div class='add'>+mt7208			MACH_MT7208		MT7208			3854</div><div class='add'>+lpc178x			MACH_LPC178X		LPC178X			3855</div><div class='add'>+farleys			MACH_FARLEYS		FARLEYS			3856</div><div class='add'>+efm32gg_dk3750		MACH_EFM32GG_DK3750	EFM32GG_DK3750		3857</div><div class='add'>+zeus_board		MACH_ZEUS_BOARD		ZEUS_BOARD		3858</div><div class='add'>+cc51			MACH_CC51		CC51			3859</div><div class='add'>+fxi_c210		MACH_FXI_C210		FXI_C210		3860</div><div class='add'>+msm8627_cdp		MACH_MSM8627_CDP	MSM8627_CDP		3861</div><div class='add'>+msm8627_mtp		MACH_MSM8627_MTP	MSM8627_MTP		3862</div><div class='add'>+armadillo800eva		MACH_ARMADILLO800EVA	ARMADILLO800EVA		3863</div><div class='add'>+primou			MACH_PRIMOU		PRIMOU			3864</div><div class='add'>+primoc			MACH_PRIMOC		PRIMOC			3865</div><div class='add'>+primoct			MACH_PRIMOCT		PRIMOCT			3866</div><div class='add'>+a9500			MACH_A9500		A9500			3867</div><div class='add'>+pluto			MACH_PLUTO		PLUTO			3869</div><div class='add'>+acfx100			MACH_ACFX100		ACFX100			3870</div><div class='add'>+msm8625_rumi3		MACH_MSM8625_RUMI3	MSM8625_RUMI3		3871</div><div class='add'>+valente			MACH_VALENTE		VALENTE			3872</div><div class='add'>+crfs_rfeye		MACH_CRFS_RFEYE		CRFS_RFEYE		3873</div><div class='add'>+rfeye			MACH_RFEYE		RFEYE			3874</div><div class='add'>+phidget_sbc3		MACH_PHIDGET_SBC3	PHIDGET_SBC3		3875</div><div class='add'>+tcw_mika		MACH_TCW_MIKA		TCW_MIKA		3876</div><div class='add'>+imx28_egf		MACH_IMX28_EGF		IMX28_EGF		3877</div><div class='add'>+valente_wx		MACH_VALENTE_WX		VALENTE_WX		3878</div><div class='add'>+huangshans		MACH_HUANGSHANS		HUANGSHANS		3879</div><div class='add'>+bosphorus1		MACH_BOSPHORUS1		BOSPHORUS1		3880</div><div class='add'>+prima			MACH_PRIMA		PRIMA			3881</div><div class='add'>+evita_ulk		MACH_EVITA_ULK		EVITA_ULK		3884</div><div class='add'>+merisc600		MACH_MERISC600		MERISC600		3885</div><div class='add'>+dolak			MACH_DOLAK		DOLAK			3886</div><div class='add'>+sbc53			MACH_SBC53		SBC53			3887</div><div class='add'>+elite_ulk		MACH_ELITE_ULK		ELITE_ULK		3888</div><div class='add'>+pov2			MACH_POV2		POV2			3889</div><div class='add'>+ipod_touch_2g		MACH_IPOD_TOUCH_2G	IPOD_TOUCH_2G		3890</div><div class='add'>+da850_pqab		MACH_DA850_PQAB		DA850_PQAB		3891</div><div class='head'>diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c<br/>index 1f17bde52cd4..7c756fb189f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/boards/atngw100/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/boards/atngw100/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/boards/atngw100/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/avr32/boards/atngw100/setup.c</a></div><div class='hunk'>@@ -109,7 +109,7 @@ struct eth_addr {</div><div class='ctx'> 	u8 addr[6];</div><div class='ctx'> };</div><div class='ctx'> static struct eth_addr __initdata hw_addr[2];</div><div class='del'>-static struct eth_platform_data __initdata eth_data[2];</div><div class='add'>+static struct macb_platform_data __initdata eth_data[2];</div><div class='ctx'> </div><div class='ctx'> static struct spi_board_info spi0_board_info[] __initdata = {</div><div class='ctx'> 	{</div><div class='head'>diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c<br/>index 4643ff5107c9..c56ddac85d61 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/boards/atstk1000/atstk1002.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/boards/atstk1000/atstk1002.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/boards/atstk1000/atstk1002.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/avr32/boards/atstk1000/atstk1002.c</a></div><div class='hunk'>@@ -105,7 +105,7 @@ struct eth_addr {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct eth_addr __initdata hw_addr[2];</div><div class='del'>-static struct eth_platform_data __initdata eth_data[2] = {</div><div class='add'>+static struct macb_platform_data __initdata eth_data[2] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The MDIO pullups on STK1000 are a bit too weak for</div><div class='head'>diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c<br/>index 86fab77a5a00..27bd6fbe21cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/boards/favr-32/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/boards/favr-32/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/boards/favr-32/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/avr32/boards/favr-32/setup.c</a></div><div class='hunk'>@@ -50,7 +50,7 @@ struct eth_addr {</div><div class='ctx'> 	u8 addr[6];</div><div class='ctx'> };</div><div class='ctx'> static struct eth_addr __initdata hw_addr[1];</div><div class='del'>-static struct eth_platform_data __initdata eth_data[1] = {</div><div class='add'>+static struct macb_platform_data __initdata eth_data[1] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.phy_mask	= ~(1U &lt;&lt; 1),</div><div class='ctx'> 	},</div><div class='head'>diff --git a/arch/avr32/boards/hammerhead/setup.c b/arch/avr32/boards/hammerhead/setup.c<br/>index da14fbdd4e8e..9d1efd1cd425 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/boards/hammerhead/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/boards/hammerhead/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/boards/hammerhead/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/avr32/boards/hammerhead/setup.c</a></div><div class='hunk'>@@ -102,7 +102,7 @@ struct eth_addr {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct eth_addr __initdata hw_addr[1];</div><div class='del'>-static struct eth_platform_data __initdata eth_data[1];</div><div class='add'>+static struct macb_platform_data __initdata eth_data[1];</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The next two functions should go away as the boot loader is</div><div class='head'>diff --git a/arch/avr32/boards/merisc/merisc_sysfs.c b/arch/avr32/boards/merisc/merisc_sysfs.c<br/>index df431fdba9ad..5a252318f4bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/boards/merisc/merisc_sysfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/boards/merisc/merisc_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/boards/merisc/merisc_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/avr32/boards/merisc/merisc_sysfs.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='head'>diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c<br/>index e61bc948f959..ed137e335796 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/boards/merisc/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/boards/merisc/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/boards/merisc/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/avr32/boards/merisc/setup.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@ struct eth_addr {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct eth_addr __initdata hw_addr[2];</div><div class='del'>-static struct eth_platform_data __initdata eth_data[2];</div><div class='add'>+static struct macb_platform_data __initdata eth_data[2];</div><div class='ctx'> </div><div class='ctx'> static int ads7846_get_pendown_state_PB26(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/avr32/boards/mimc200/setup.c b/arch/avr32/boards/mimc200/setup.c<br/>index c4da5cba2dbf..05358aa5ef7d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/boards/mimc200/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/boards/mimc200/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/boards/mimc200/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/avr32/boards/mimc200/setup.c</a></div><div class='hunk'>@@ -86,7 +86,7 @@ struct eth_addr {</div><div class='ctx'> 	u8 addr[6];</div><div class='ctx'> };</div><div class='ctx'> static struct eth_addr __initdata hw_addr[2];</div><div class='del'>-static struct eth_platform_data __initdata eth_data[2];</div><div class='add'>+static struct macb_platform_data __initdata eth_data[2];</div><div class='ctx'> </div><div class='ctx'> static struct spi_eeprom eeprom_25lc010 = {</div><div class='ctx'> 		.name = "25lc010",</div><div class='head'>diff --git a/arch/avr32/include/asm/ipcbuf.h b/arch/avr32/include/asm/ipcbuf.h<br/>index 1552c9698f5e..84c7e51cb6d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/include/asm/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/avr32/include/asm/ipcbuf.h</a></div><div class='hunk'>@@ -1,29 +1 @@</div><div class='del'>-#ifndef __ASM_AVR32_IPCBUF_H</div><div class='del'>-#define __ASM_AVR32_IPCBUF_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-* The user_ipc_perm structure for AVR32 architecture.</div><div class='del'>-* Note extra padding because this structure is passed back and forth</div><div class='del'>-* between kernel and user space.</div><div class='del'>-*</div><div class='del'>-* Pad space is left for:</div><div class='del'>-* - 32-bit mode_t and seq</div><div class='del'>-* - 2 miscellaneous 32-bit values</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-struct ipc64_perm</div><div class='del'>-{</div><div class='del'>-        __kernel_key_t          key;</div><div class='del'>-        __kernel_uid32_t        uid;</div><div class='del'>-        __kernel_gid32_t        gid;</div><div class='del'>-        __kernel_uid32_t        cuid;</div><div class='del'>-        __kernel_gid32_t        cgid;</div><div class='del'>-        __kernel_mode_t         mode;</div><div class='del'>-        unsigned short          __pad1;</div><div class='del'>-        unsigned short          seq;</div><div class='del'>-        unsigned short          __pad2;</div><div class='del'>-        unsigned long           __unused1;</div><div class='del'>-        unsigned long           __unused2;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_AVR32_IPCBUF_H */</div><div class='add'>+#include &lt;asm-generic/ipcbuf.h&gt;</div><div class='head'>diff --git a/arch/avr32/include/asm/socket.h b/arch/avr32/include/asm/socket.h<br/>index c8d1fae49476..247b88c760be 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/socket.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/include/asm/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/avr32/include/asm/socket.h</a></div><div class='hunk'>@@ -62,4 +62,7 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_RXQ_OVFL             40</div><div class='ctx'> </div><div class='add'>+#define SO_WIFI_STATUS		41</div><div class='add'>+#define SCM_WIFI_STATUS		SO_WIFI_STATUS</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_AVR32_SOCKET_H */</div><div class='head'>diff --git a/arch/avr32/include/asm/system.h b/arch/avr32/include/asm/system.h<br/>index 9702c2213e1e..62d9ded01635 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/include/asm/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/avr32/include/asm/system.h</a></div><div class='hunk'>@@ -169,7 +169,7 @@ static inline unsigned long __cmpxchg_local(volatile void *ptr,</div><div class='ctx'> #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))</div><div class='ctx'> </div><div class='ctx'> struct pt_regs;</div><div class='del'>-void NORET_TYPE die(const char *str, struct pt_regs *regs, long err);</div><div class='add'>+void die(const char *str, struct pt_regs *regs, long err);</div><div class='ctx'> void _exception(long signr, struct pt_regs *regs, int code,</div><div class='ctx'> 		unsigned long addr);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/avr32/include/asm/thread_info.h b/arch/avr32/include/asm/thread_info.h<br/>index 7a9c03dcb0b6..e5deda4691db 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/avr32/include/asm/thread_info.h</a></div><div class='hunk'>@@ -85,7 +85,6 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define TIF_RESTORE_SIGMASK	7	/* restore signal mask in do_signal */</div><div class='ctx'> #define TIF_CPU_GOING_TO_SLEEP	8	/* CPU is entering sleep 0 mode */</div><div class='ctx'> #define TIF_NOTIFY_RESUME	9	/* callback before returning to user */</div><div class='del'>-#define TIF_FREEZE		29</div><div class='ctx'> #define TIF_DEBUG		30	/* debugging enabled */</div><div class='ctx'> #define TIF_USERSPACE		31      /* true if FS sets userspace */</div><div class='ctx'> </div><div class='hunk'>@@ -98,7 +97,6 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define _TIF_RESTORE_SIGMASK	(1 &lt;&lt; TIF_RESTORE_SIGMASK)</div><div class='ctx'> #define _TIF_CPU_GOING_TO_SLEEP (1 &lt;&lt; TIF_CPU_GOING_TO_SLEEP)</div><div class='ctx'> #define _TIF_NOTIFY_RESUME	(1 &lt;&lt; TIF_NOTIFY_RESUME)</div><div class='del'>-#define _TIF_FREEZE		(1 &lt;&lt; TIF_FREEZE)</div><div class='ctx'> </div><div class='ctx'> /* Note: The masks below must never span more than 16 bits! */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/avr32/include/asm/types.h b/arch/avr32/include/asm/types.h<br/>index 72667a3b1af7..9bb2d8b2e6ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/include/asm/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/avr32/include/asm/types.h</a></div><div class='hunk'>@@ -10,12 +10,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/int-ll64.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-</div><div class='del'>-typedef unsigned short umode_t;</div><div class='del'>-</div><div class='del'>-#endif /* __ASSEMBLY__ */</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * These aren't exported outside the kernel to avoid name space clashes</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/avr32/kernel/cpu.c b/arch/avr32/kernel/cpu.c<br/>index e84faffbbeca..2233be71e2e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/kernel/cpu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/kernel/cpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/kernel/cpu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/avr32/kernel/cpu.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -26,16 +26,16 @@ static DEFINE_PER_CPU(struct cpu, cpu_devices);</div><div class='ctx'>  * XXX: If/when a SMP-capable implementation of AVR32 will ever be</div><div class='ctx'>  * made, we must make sure that the code executes on the correct CPU.</div><div class='ctx'>  */</div><div class='del'>-static ssize_t show_pc0event(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_pc0event(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long pccr;</div><div class='ctx'> </div><div class='ctx'> 	pccr = sysreg_read(PCCR);</div><div class='ctx'> 	return sprintf(buf, "0x%lx\n", (pccr &gt;&gt; 12) &amp; 0x3f);</div><div class='ctx'> }</div><div class='del'>-static ssize_t store_pc0event(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, const char *buf,</div><div class='add'>+static ssize_t store_pc0event(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, const char *buf,</div><div class='ctx'> 			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long val;</div><div class='hunk'>@@ -48,16 +48,16 @@ static ssize_t store_pc0event(struct sys_device *dev,</div><div class='ctx'> 	sysreg_write(PCCR, val);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_pc0count(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_pc0count(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long pcnt0;</div><div class='ctx'> </div><div class='ctx'> 	pcnt0 = sysreg_read(PCNT0);</div><div class='ctx'> 	return sprintf(buf, "%lu\n", pcnt0);</div><div class='ctx'> }</div><div class='del'>-static ssize_t store_pc0count(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t store_pc0count(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='ctx'> 				const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long val;</div><div class='hunk'>@@ -71,16 +71,16 @@ static ssize_t store_pc0count(struct sys_device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_pc1event(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_pc1event(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long pccr;</div><div class='ctx'> </div><div class='ctx'> 	pccr = sysreg_read(PCCR);</div><div class='ctx'> 	return sprintf(buf, "0x%lx\n", (pccr &gt;&gt; 18) &amp; 0x3f);</div><div class='ctx'> }</div><div class='del'>-static ssize_t store_pc1event(struct sys_device *dev,</div><div class='del'>-			      struct sysdev_attribute *attr, const char *buf,</div><div class='add'>+static ssize_t store_pc1event(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='ctx'> 			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long val;</div><div class='hunk'>@@ -93,16 +93,16 @@ static ssize_t store_pc1event(struct sys_device *dev,</div><div class='ctx'> 	sysreg_write(PCCR, val);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='del'>-static ssize_t show_pc1count(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_pc1count(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long pcnt1;</div><div class='ctx'> </div><div class='ctx'> 	pcnt1 = sysreg_read(PCNT1);</div><div class='ctx'> 	return sprintf(buf, "%lu\n", pcnt1);</div><div class='ctx'> }</div><div class='del'>-static ssize_t store_pc1count(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, const char *buf,</div><div class='add'>+static ssize_t store_pc1count(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, const char *buf,</div><div class='ctx'> 			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long val;</div><div class='hunk'>@@ -116,16 +116,16 @@ static ssize_t store_pc1count(struct sys_device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_pccycles(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_pccycles(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long pccnt;</div><div class='ctx'> </div><div class='ctx'> 	pccnt = sysreg_read(PCCNT);</div><div class='ctx'> 	return sprintf(buf, "%lu\n", pccnt);</div><div class='ctx'> }</div><div class='del'>-static ssize_t store_pccycles(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, const char *buf,</div><div class='add'>+static ssize_t store_pccycles(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, const char *buf,</div><div class='ctx'> 			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long val;</div><div class='hunk'>@@ -139,16 +139,16 @@ static ssize_t store_pccycles(struct sys_device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_pcenable(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_pcenable(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long pccr;</div><div class='ctx'> </div><div class='ctx'> 	pccr = sysreg_read(PCCR);</div><div class='ctx'> 	return sprintf(buf, "%c\n", (pccr &amp; 1)?'1':'0');</div><div class='ctx'> }</div><div class='del'>-static ssize_t store_pcenable(struct sys_device *dev,</div><div class='del'>-			      struct sysdev_attribute *attr, const char *buf,</div><div class='add'>+static ssize_t store_pcenable(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, const char *buf,</div><div class='ctx'> 			      size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long pccr, val;</div><div class='hunk'>@@ -167,12 +167,12 @@ static ssize_t store_pcenable(struct sys_device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(pc0event, 0600, show_pc0event, store_pc0event);</div><div class='del'>-static SYSDEV_ATTR(pc0count, 0600, show_pc0count, store_pc0count);</div><div class='del'>-static SYSDEV_ATTR(pc1event, 0600, show_pc1event, store_pc1event);</div><div class='del'>-static SYSDEV_ATTR(pc1count, 0600, show_pc1count, store_pc1count);</div><div class='del'>-static SYSDEV_ATTR(pccycles, 0600, show_pccycles, store_pccycles);</div><div class='del'>-static SYSDEV_ATTR(pcenable, 0600, show_pcenable, store_pcenable);</div><div class='add'>+static DEVICE_ATTR(pc0event, 0600, show_pc0event, store_pc0event);</div><div class='add'>+static DEVICE_ATTR(pc0count, 0600, show_pc0count, store_pc0count);</div><div class='add'>+static DEVICE_ATTR(pc1event, 0600, show_pc1event, store_pc1event);</div><div class='add'>+static DEVICE_ATTR(pc1count, 0600, show_pc1count, store_pc1count);</div><div class='add'>+static DEVICE_ATTR(pccycles, 0600, show_pccycles, store_pccycles);</div><div class='add'>+static DEVICE_ATTR(pcenable, 0600, show_pcenable, store_pcenable);</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_PERFORMANCE_COUNTERS */</div><div class='ctx'> </div><div class='hunk'>@@ -186,12 +186,12 @@ static int __init topology_init(void)</div><div class='ctx'> 		register_cpu(c, cpu);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PERFORMANCE_COUNTERS</div><div class='del'>-		sysdev_create_file(&amp;c-&gt;sysdev, &amp;attr_pc0event);</div><div class='del'>-		sysdev_create_file(&amp;c-&gt;sysdev, &amp;attr_pc0count);</div><div class='del'>-		sysdev_create_file(&amp;c-&gt;sysdev, &amp;attr_pc1event);</div><div class='del'>-		sysdev_create_file(&amp;c-&gt;sysdev, &amp;attr_pc1count);</div><div class='del'>-		sysdev_create_file(&amp;c-&gt;sysdev, &amp;attr_pccycles);</div><div class='del'>-		sysdev_create_file(&amp;c-&gt;sysdev, &amp;attr_pcenable);</div><div class='add'>+		device_create_file(&amp;c-&gt;dev, &amp;dev_attr_pc0event);</div><div class='add'>+		device_create_file(&amp;c-&gt;dev, &amp;dev_attr_pc0count);</div><div class='add'>+		device_create_file(&amp;c-&gt;dev, &amp;dev_attr_pc1event);</div><div class='add'>+		device_create_file(&amp;c-&gt;dev, &amp;dev_attr_pc1count);</div><div class='add'>+		device_create_file(&amp;c-&gt;dev, &amp;dev_attr_pccycles);</div><div class='add'>+		device_create_file(&amp;c-&gt;dev, &amp;dev_attr_pcenable);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/avr32/kernel/irq.c b/arch/avr32/kernel/irq.c<br/>index bc3aa18293df..900e49b2258b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/kernel/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/kernel/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/avr32/kernel/irq.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* May be overridden by platform code */</div><div class='ctx'> int __weak nmi_enable(void)</div><div class='head'>diff --git a/arch/avr32/kernel/traps.c b/arch/avr32/kernel/traps.c<br/>index 7aa25756412f..3d760c06f024 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/kernel/traps.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/kernel/traps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/avr32/kernel/traps.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(die_lock);</div><div class='ctx'> </div><div class='del'>-void NORET_TYPE die(const char *str, struct pt_regs *regs, long err)</div><div class='add'>+void die(const char *str, struct pt_regs *regs, long err)</div><div class='ctx'> {</div><div class='ctx'> 	static int die_counter;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c<br/>index 7fbf0dcb9afe..402a7bb72669 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/at32ap700x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/mach-at32ap/at32ap700x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/at32ap700x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/avr32/mach-at32ap/at32ap700x.c</a></div><div class='hunk'>@@ -1067,7 +1067,7 @@ void __init at32_setup_serial_console(unsigned int usart_id)</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_AT32AP7000</div><div class='del'>-static struct eth_platform_data macb0_data;</div><div class='add'>+static struct macb_platform_data macb0_data;</div><div class='ctx'> static struct resource macb0_resource[] = {</div><div class='ctx'> 	PBMEM(0xfff01800),</div><div class='ctx'> 	IRQ(25),</div><div class='hunk'>@@ -1076,7 +1076,7 @@ DEFINE_DEV_DATA(macb, 0);</div><div class='ctx'> DEV_CLK(hclk, macb0, hsb, 8);</div><div class='ctx'> DEV_CLK(pclk, macb0, pbb, 6);</div><div class='ctx'> </div><div class='del'>-static struct eth_platform_data macb1_data;</div><div class='add'>+static struct macb_platform_data macb1_data;</div><div class='ctx'> static struct resource macb1_resource[] = {</div><div class='ctx'> 	PBMEM(0xfff01c00),</div><div class='ctx'> 	IRQ(26),</div><div class='hunk'>@@ -1086,7 +1086,7 @@ DEV_CLK(hclk, macb1, hsb, 9);</div><div class='ctx'> DEV_CLK(pclk, macb1, pbb, 7);</div><div class='ctx'> </div><div class='ctx'> struct platform_device *__init</div><div class='del'>-at32_add_device_eth(unsigned int id, struct eth_platform_data *data)</div><div class='add'>+at32_add_device_eth(unsigned int id, struct macb_platform_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *pdev;</div><div class='ctx'> 	u32 pin_mask;</div><div class='hunk'>@@ -1163,7 +1163,7 @@ at32_add_device_eth(unsigned int id, struct eth_platform_data *data)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(pdev-&gt;dev.platform_data, data, sizeof(struct eth_platform_data));</div><div class='add'>+	memcpy(pdev-&gt;dev.platform_data, data, sizeof(struct macb_platform_data));</div><div class='ctx'> 	platform_device_register(pdev);</div><div class='ctx'> </div><div class='ctx'> 	return pdev;</div><div class='head'>diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h<br/>index 5d7ffca7d69f..67b111ce332d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/include/mach/board.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/avr32/mach-at32ap/include/mach/board.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/avr32/mach-at32ap/include/mach/board.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/avr32/mach-at32ap/include/mach/board.h</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='add'>+#include &lt;linux/platform_data/macb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define GPIO_PIN_NONE	(-1)</div><div class='ctx'> </div><div class='hunk'>@@ -42,12 +43,8 @@ struct atmel_uart_data {</div><div class='ctx'> void at32_map_usart(unsigned int hw_id, unsigned int line, int flags);</div><div class='ctx'> struct platform_device *at32_add_device_usart(unsigned int id);</div><div class='ctx'> </div><div class='del'>-struct eth_platform_data {</div><div class='del'>-	u32	phy_mask;</div><div class='del'>-	u8	is_rmii;</div><div class='del'>-};</div><div class='ctx'> struct platform_device *</div><div class='del'>-at32_add_device_eth(unsigned int id, struct eth_platform_data *data);</div><div class='add'>+at32_add_device_eth(unsigned int id, struct macb_platform_data *data);</div><div class='ctx'> </div><div class='ctx'> struct spi_board_info;</div><div class='ctx'> struct platform_device *</div><div class='head'>diff --git a/arch/blackfin/configs/BF518F-EZBRD_defconfig b/arch/blackfin/configs/BF518F-EZBRD_defconfig<br/>index 5edcb58d6f73..0b7039cf07ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF518F-EZBRD_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF518F-EZBRD_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF518F-EZBRD_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/BF518F-EZBRD_defconfig</a></div><div class='hunk'>@@ -80,7 +80,7 @@ CONFIG_I2C_CHARDEV=y</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI=y</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='head'>diff --git a/arch/blackfin/configs/BF526-EZBRD_defconfig b/arch/blackfin/configs/BF526-EZBRD_defconfig<br/>index 2e549572d4f5..5553205d7cbe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF526-EZBRD_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF526-EZBRD_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF526-EZBRD_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/BF526-EZBRD_defconfig</a></div><div class='hunk'>@@ -97,7 +97,7 @@ CONFIG_I2C_CHARDEV=m</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI=y</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='head'>diff --git a/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig b/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig<br/>index ad0881ba30af..d95658fc3127 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF527-AD7160-EVAL_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/BF527-AD7160-EVAL_defconfig</a></div><div class='hunk'>@@ -68,7 +68,7 @@ CONFIG_I2C_ALGOBIT=y</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI=y</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=400</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='head'>diff --git a/arch/blackfin/configs/BF527-EZKIT-V2_defconfig b/arch/blackfin/configs/BF527-EZKIT-V2_defconfig<br/>index 8465b3e6b862..498f64a87050 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF527-EZKIT-V2_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF527-EZKIT-V2_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF527-EZKIT-V2_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/BF527-EZKIT-V2_defconfig</a></div><div class='hunk'>@@ -105,7 +105,7 @@ CONFIG_I2C_CHARDEV=m</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI=y</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='head'>diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig<br/>index 5e7321b26040..72e0317565ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF527-EZKIT_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF527-EZKIT_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF527-EZKIT_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/BF527-EZKIT_defconfig</a></div><div class='hunk'>@@ -99,7 +99,7 @@ CONFIG_I2C_CHARDEV=m</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI=y</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='head'>diff --git a/arch/blackfin/configs/BF533-EZKIT_defconfig b/arch/blackfin/configs/BF533-EZKIT_defconfig<br/>index a7eb54bf3089..2f075e0b2624 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF533-EZKIT_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF533-EZKIT_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF533-EZKIT_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/BF533-EZKIT_defconfig</a></div><div class='hunk'>@@ -81,7 +81,7 @@ CONFIG_SERIAL_BFIN_CONSOLE=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='head'>diff --git a/arch/blackfin/configs/BF533-STAMP_defconfig b/arch/blackfin/configs/BF533-STAMP_defconfig<br/>index b90d3792ed52..ab38a82597b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF533-STAMP_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF533-STAMP_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF533-STAMP_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/BF533-STAMP_defconfig</a></div><div class='hunk'>@@ -84,7 +84,7 @@ CONFIG_I2C=m</div><div class='ctx'> CONFIG_I2C_CHARDEV=m</div><div class='ctx'> CONFIG_I2C_GPIO=m</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='head'>diff --git a/arch/blackfin/configs/BF537-STAMP_defconfig b/arch/blackfin/configs/BF537-STAMP_defconfig<br/>index 005362537a7b..5c802d6bbbc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF537-STAMP_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF537-STAMP_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF537-STAMP_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/BF537-STAMP_defconfig</a></div><div class='hunk'>@@ -94,7 +94,7 @@ CONFIG_I2C_CHARDEV=m</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI=m</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='head'>diff --git a/arch/blackfin/configs/BF538-EZKIT_defconfig b/arch/blackfin/configs/BF538-EZKIT_defconfig<br/>index 580bf4296a14..972aa6263ad0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF538-EZKIT_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF538-EZKIT_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF538-EZKIT_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/BF538-EZKIT_defconfig</a></div><div class='hunk'>@@ -101,7 +101,7 @@ CONFIG_I2C=m</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI=m</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='head'>diff --git a/arch/blackfin/configs/BF548-EZKIT_defconfig b/arch/blackfin/configs/BF548-EZKIT_defconfig<br/>index 0e6d841b5d01..7a1e3bf2b04f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF548-EZKIT_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF548-EZKIT_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF548-EZKIT_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/BF548-EZKIT_defconfig</a></div><div class='hunk'>@@ -113,7 +113,7 @@ CONFIG_I2C_CHARDEV=y</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI=y</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='head'>diff --git a/arch/blackfin/configs/BF561-ACVILON_defconfig b/arch/blackfin/configs/BF561-ACVILON_defconfig<br/>index 77a27e31d6d1..0fdc4ecaa531 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF561-ACVILON_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF561-ACVILON_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF561-ACVILON_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/BF561-ACVILON_defconfig</a></div><div class='hunk'>@@ -85,7 +85,7 @@ CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='ctx'> CONFIG_I2C_PCA_PLATFORM=y</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_SPI_SPIDEV=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='head'>diff --git a/arch/blackfin/configs/BF561-EZKIT-SMP_defconfig b/arch/blackfin/configs/BF561-EZKIT-SMP_defconfig<br/>index f5ed34e12e0c..78adbbf39826 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF561-EZKIT-SMP_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF561-EZKIT-SMP_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF561-EZKIT-SMP_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/BF561-EZKIT-SMP_defconfig</a></div><div class='hunk'>@@ -84,7 +84,7 @@ CONFIG_SERIAL_BFIN_CONSOLE=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='head'>diff --git a/arch/blackfin/configs/BF561-EZKIT_defconfig b/arch/blackfin/configs/BF561-EZKIT_defconfig<br/>index d7ff2aee3fbc..d3cd0f561c84 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF561-EZKIT_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BF561-EZKIT_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BF561-EZKIT_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/BF561-EZKIT_defconfig</a></div><div class='hunk'>@@ -86,7 +86,7 @@ CONFIG_SERIAL_BFIN_CONSOLE=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='head'>diff --git a/arch/blackfin/configs/BlackStamp_defconfig b/arch/blackfin/configs/BlackStamp_defconfig<br/>index 85014319672c..7b982d0502ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BlackStamp_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/BlackStamp_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/BlackStamp_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/BlackStamp_defconfig</a></div><div class='hunk'>@@ -80,7 +80,7 @@ CONFIG_I2C=m</div><div class='ctx'> CONFIG_I2C_CHARDEV=m</div><div class='ctx'> CONFIG_I2C_GPIO=m</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_SPI_SPIDEV=m</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='head'>diff --git a/arch/blackfin/configs/CM-BF527_defconfig b/arch/blackfin/configs/CM-BF527_defconfig<br/>index dbf750cd2db8..c280a50e7943 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/CM-BF527_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/CM-BF527_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/CM-BF527_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/CM-BF527_defconfig</a></div><div class='hunk'>@@ -88,7 +88,7 @@ CONFIG_I2C_CHARDEV=m</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI=m</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='head'>diff --git a/arch/blackfin/configs/CM-BF533_defconfig b/arch/blackfin/configs/CM-BF533_defconfig<br/>index 07ffbdae34ee..c940a1e3ab36 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/CM-BF533_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/CM-BF533_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/CM-BF533_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/CM-BF533_defconfig</a></div><div class='hunk'>@@ -57,7 +57,7 @@ CONFIG_SERIAL_BFIN_CONSOLE=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='ctx'> CONFIG_MMC=y</div><div class='head'>diff --git a/arch/blackfin/configs/CM-BF537E_defconfig b/arch/blackfin/configs/CM-BF537E_defconfig<br/>index 707cbf8a2590..2e47df77490f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/CM-BF537E_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/CM-BF537E_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/CM-BF537E_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/CM-BF537E_defconfig</a></div><div class='hunk'>@@ -78,7 +78,7 @@ CONFIG_SERIAL_BFIN_UART1=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> CONFIG_USB_GADGET=m</div><div class='head'>diff --git a/arch/blackfin/configs/CM-BF537U_defconfig b/arch/blackfin/configs/CM-BF537U_defconfig<br/>index 4596935eadac..6da629ffc2f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/CM-BF537U_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/CM-BF537U_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/CM-BF537U_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/CM-BF537U_defconfig</a></div><div class='hunk'>@@ -72,7 +72,7 @@ CONFIG_SERIAL_BFIN_UART1=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> CONFIG_USB_GADGET=y</div><div class='head'>diff --git a/arch/blackfin/configs/CM-BF548_defconfig b/arch/blackfin/configs/CM-BF548_defconfig<br/>index 9f1d08401fca..349922be01f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/CM-BF548_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/CM-BF548_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/CM-BF548_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/CM-BF548_defconfig</a></div><div class='hunk'>@@ -89,7 +89,7 @@ CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI=y</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> CONFIG_BFIN_WDT=y</div><div class='head'>diff --git a/arch/blackfin/configs/CM-BF561_defconfig b/arch/blackfin/configs/CM-BF561_defconfig<br/>index 6c7b21585a43..0456deaa2d6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/CM-BF561_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/CM-BF561_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/CM-BF561_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/CM-BF561_defconfig</a></div><div class='hunk'>@@ -78,7 +78,7 @@ CONFIG_SERIAL_BFIN_CONSOLE=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> CONFIG_USB_GADGET=m</div><div class='head'>diff --git a/arch/blackfin/configs/DNP5370_defconfig b/arch/blackfin/configs/DNP5370_defconfig<br/>index b192acfae386..89162d0fff9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/DNP5370_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/DNP5370_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/DNP5370_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/DNP5370_defconfig</a></div><div class='hunk'>@@ -78,7 +78,7 @@ CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI=y</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_SPI_SPIDEV=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='head'>diff --git a/arch/blackfin/configs/H8606_defconfig b/arch/blackfin/configs/H8606_defconfig<br/>index 06e9f497faed..a26436bf50ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/H8606_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/H8606_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/H8606_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/H8606_defconfig</a></div><div class='hunk'>@@ -68,7 +68,7 @@ CONFIG_SERIAL_BFIN_CONSOLE=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_SPI_SPIDEV=y</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> CONFIG_SOUND=m</div><div class='head'>diff --git a/arch/blackfin/configs/IP0X_defconfig b/arch/blackfin/configs/IP0X_defconfig<br/>index 5e797cf72043..647991514ac9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/IP0X_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/IP0X_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/IP0X_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/IP0X_defconfig</a></div><div class='hunk'>@@ -70,7 +70,7 @@ CONFIG_SERIAL_BFIN_CONSOLE=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> CONFIG_USB=y</div><div class='head'>diff --git a/arch/blackfin/configs/PNAV-10_defconfig b/arch/blackfin/configs/PNAV-10_defconfig<br/>index a566a2fe6b9b..8fd9b446d658 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/PNAV-10_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/PNAV-10_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/PNAV-10_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/PNAV-10_defconfig</a></div><div class='hunk'>@@ -84,7 +84,7 @@ CONFIG_I2C_CHARDEV=y</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI=y</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> CONFIG_FIRMWARE_EDID=y</div><div class='ctx'> CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='head'>diff --git a/arch/blackfin/configs/SRV1_defconfig b/arch/blackfin/configs/SRV1_defconfig<br/>index 12e66cd7cdaa..0520c160230d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/SRV1_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/SRV1_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/SRV1_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/SRV1_defconfig</a></div><div class='hunk'>@@ -71,7 +71,7 @@ CONFIG_I2C_CHARDEV=y</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI=y</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_HWMON=m</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> CONFIG_BFIN_WDT=y</div><div class='head'>diff --git a/arch/blackfin/configs/TCM-BF518_defconfig b/arch/blackfin/configs/TCM-BF518_defconfig<br/>index d496ae9a39b0..e4ed865b885e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/TCM-BF518_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/TCM-BF518_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/TCM-BF518_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/TCM-BF518_defconfig</a></div><div class='hunk'>@@ -92,7 +92,7 @@ CONFIG_I2C_CHARDEV=y</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI=y</div><div class='ctx'> CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_SYSFS=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='head'>diff --git a/arch/blackfin/configs/TCM-BF537_defconfig b/arch/blackfin/configs/TCM-BF537_defconfig<br/>index 65f642167a50..c1f45f15295c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/configs/TCM-BF537_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/configs/TCM-BF537_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/configs/TCM-BF537_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/configs/TCM-BF537_defconfig</a></div><div class='hunk'>@@ -70,7 +70,7 @@ CONFIG_SERIAL_BFIN_UART1=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='ctx'> # CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_BFIN=y</div><div class='add'>+CONFIG_SPI_BFIN5XX=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> CONFIG_WATCHDOG=y</div><div class='ctx'> CONFIG_BFIN_WDT=y</div><div class='head'>diff --git a/arch/blackfin/include/asm/bfin_serial.h b/arch/blackfin/include/asm/bfin_serial.h<br/>index ecacdf34768b..68bcc3d119b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/bfin_serial.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/include/asm/bfin_serial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/bfin_serial.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/include/asm/bfin_serial.h</a></div><div class='hunk'>@@ -51,9 +51,6 @@ struct bfin_serial_port {</div><div class='ctx'> #elif ANOMALY_05000363</div><div class='ctx'> 	unsigned int anomaly_threshold;</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS</div><div class='del'>-	int scts;</div><div class='del'>-#endif</div><div class='ctx'> #if defined(CONFIG_SERIAL_BFIN_CTSRTS) || \</div><div class='ctx'> 	defined(CONFIG_SERIAL_BFIN_HARD_CTSRTS)</div><div class='ctx'> 	int cts_pin;</div><div class='head'>diff --git a/arch/blackfin/include/asm/cpu.h b/arch/blackfin/include/asm/cpu.h<br/>index 05043786da21..e349631c8299 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/cpu.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/include/asm/cpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/cpu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/include/asm/cpu.h</a></div><div class='hunk'>@@ -14,6 +14,9 @@ struct blackfin_cpudata {</div><div class='ctx'> 	struct cpu cpu;</div><div class='ctx'> 	unsigned int imemctl;</div><div class='ctx'> 	unsigned int dmemctl;</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	struct task_struct *idle;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> DECLARE_PER_CPU(struct blackfin_cpudata, cpu_data);</div><div class='head'>diff --git a/arch/blackfin/include/asm/pci.h b/arch/blackfin/include/asm/pci.h<br/>index 99cae2e3bac7..74352c4597d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/pci.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/include/asm/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/include/asm/pci.h</a></div><div class='hunk'>@@ -10,10 +10,6 @@</div><div class='ctx'> #define PCIBIOS_MIN_IO 0x00001000</div><div class='ctx'> #define PCIBIOS_MIN_MEM 0x10000000</div><div class='ctx'> </div><div class='del'>-static inline void pcibios_set_master(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	/* No special bus mastering setup handling */</div><div class='del'>-}</div><div class='ctx'> static inline void pcibios_penalize_isa_irq(int irq)</div><div class='ctx'> {</div><div class='ctx'> 	/* We don't do dynamic PCI IRQ allocation */</div><div class='head'>diff --git a/arch/blackfin/include/asm/smp.h b/arch/blackfin/include/asm/smp.h<br/>index af6c0aa79bae..dc3d144b4bb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/smp.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/include/asm/smp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/smp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/include/asm/smp.h</a></div><div class='hunk'>@@ -37,7 +37,7 @@ extern unsigned long dcache_invld_count[NR_CPUS];</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> void smp_icache_flush_range_others(unsigned long start,</div><div class='del'>-				   unsigned long end);</div><div class='add'>+					unsigned long end);</div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> void coreb_die(void);</div><div class='ctx'> void cpu_die(void);</div><div class='hunk'>@@ -46,4 +46,7 @@ int __cpu_disable(void);</div><div class='ctx'> int __cpu_die(unsigned int cpu);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+void smp_timer_broadcast(const struct cpumask *mask);</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #endif /* !__ASM_BLACKFIN_SMP_H */</div><div class='head'>diff --git a/arch/blackfin/include/asm/thread_info.h b/arch/blackfin/include/asm/thread_info.h<br/>index 02560fd8a121..53ad10005ae3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/include/asm/thread_info.h</a></div><div class='hunk'>@@ -100,7 +100,6 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> 					   TIF_NEED_RESCHED */</div><div class='ctx'> #define TIF_MEMDIE		4	/* is terminating due to OOM killer */</div><div class='ctx'> #define TIF_RESTORE_SIGMASK	5	/* restore signal mask in do_signal() */</div><div class='del'>-#define TIF_FREEZE		6	/* is freezing for suspend */</div><div class='ctx'> #define TIF_IRQ_SYNC		7	/* sync pipeline stage */</div><div class='ctx'> #define TIF_NOTIFY_RESUME	8	/* callback before returning to user */</div><div class='ctx'> #define TIF_SINGLESTEP		9</div><div class='hunk'>@@ -111,7 +110,6 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define _TIF_NEED_RESCHED	(1&lt;&lt;TIF_NEED_RESCHED)</div><div class='ctx'> #define _TIF_POLLING_NRFLAG	(1&lt;&lt;TIF_POLLING_NRFLAG)</div><div class='ctx'> #define _TIF_RESTORE_SIGMASK	(1&lt;&lt;TIF_RESTORE_SIGMASK)</div><div class='del'>-#define _TIF_FREEZE		(1&lt;&lt;TIF_FREEZE)</div><div class='ctx'> #define _TIF_IRQ_SYNC		(1&lt;&lt;TIF_IRQ_SYNC)</div><div class='ctx'> #define _TIF_NOTIFY_RESUME	(1&lt;&lt;TIF_NOTIFY_RESUME)</div><div class='ctx'> #define _TIF_SINGLESTEP		(1&lt;&lt;TIF_SINGLESTEP)</div><div class='head'>diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c<br/>index dfa2525a442d..d6102c86d037 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/kernel/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/kernel/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/kernel/setup.c</a></div><div class='hunk'>@@ -828,10 +828,18 @@ static inline int __init get_mem_size(void)</div><div class='ctx'> 	u32 ddrctl = bfin_read_EBIU_DDRCTL1();</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	switch (ddrctl &amp; 0xc0000) {</div><div class='del'>-		case DEVSZ_64:  ret = 64 / 8;</div><div class='del'>-		case DEVSZ_128: ret = 128 / 8;</div><div class='del'>-		case DEVSZ_256: ret = 256 / 8;</div><div class='del'>-		case DEVSZ_512: ret = 512 / 8;</div><div class='add'>+	case DEVSZ_64:</div><div class='add'>+		ret = 64 / 8;</div><div class='add'>+		break;</div><div class='add'>+	case DEVSZ_128:</div><div class='add'>+		ret = 128 / 8;</div><div class='add'>+		break;</div><div class='add'>+	case DEVSZ_256:</div><div class='add'>+		ret = 256 / 8;</div><div class='add'>+		break;</div><div class='add'>+	case DEVSZ_512:</div><div class='add'>+		ret = 512 / 8;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	switch (ddrctl &amp; 0x30000) {</div><div class='ctx'> 		case DEVWD_4:  ret *= 2;</div><div class='head'>diff --git a/arch/blackfin/kernel/time-ts.c b/arch/blackfin/kernel/time-ts.c<br/>index 1bcf3a3c57d8..d98f2d69b0c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/kernel/time-ts.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/kernel/time-ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/kernel/time-ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/kernel/time-ts.c</a></div><div class='hunk'>@@ -219,7 +219,7 @@ static void __init bfin_gptmr0_clockevent_init(struct clock_event_device *evt)</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_TICKSOURCE_CORETMR)</div><div class='ctx'> /* per-cpu local core timer */</div><div class='del'>-static DEFINE_PER_CPU(struct clock_event_device, coretmr_events);</div><div class='add'>+DEFINE_PER_CPU(struct clock_event_device, coretmr_events);</div><div class='ctx'> </div><div class='ctx'> static int bfin_coretmr_set_next_event(unsigned long cycles,</div><div class='ctx'> 				struct clock_event_device *evt)</div><div class='hunk'>@@ -281,6 +281,7 @@ void bfin_coretmr_init(void)</div><div class='ctx'> #ifdef CONFIG_CORE_TIMER_IRQ_L1</div><div class='ctx'> __attribute__((l1_text))</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> irqreturn_t bfin_coretmr_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='hunk'>@@ -306,6 +307,11 @@ void bfin_coretmr_clockevent_init(void)</div><div class='ctx'> 	unsigned int cpu = smp_processor_id();</div><div class='ctx'> 	struct clock_event_device *evt = &amp;per_cpu(coretmr_events, cpu);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	evt-&gt;broadcast = smp_timer_broadcast;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	evt-&gt;name = "bfin_core_timer";</div><div class='ctx'> 	evt-&gt;rating = 350;</div><div class='ctx'> 	evt-&gt;irq = -1;</div><div class='head'>diff --git a/arch/blackfin/mach-bf518/boards/ezbrd.c b/arch/blackfin/mach-bf518/boards/ezbrd.c<br/>index d1c0c0cff3ef..a2d96d31bbf1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf518/boards/ezbrd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf518/boards/ezbrd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf518/boards/ezbrd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf518/boards/ezbrd.c</a></div><div class='hunk'>@@ -61,7 +61,7 @@ static struct physmap_flash_data ezbrd_flash_data = {</div><div class='ctx'> </div><div class='ctx'> static struct resource ezbrd_flash_resource = {</div><div class='ctx'> 	.start = 0x20000000,</div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	.end   = 0x202fffff,</div><div class='ctx'> #else</div><div class='ctx'> 	.end   = 0x203fffff,</div><div class='hunk'>@@ -122,6 +122,8 @@ static struct bfin_mii_bus_platform_data bfin_mii_bus_data = {</div><div class='ctx'> #if defined(CONFIG_NET_DSA_KSZ8893M) || defined(CONFIG_NET_DSA_KSZ8893M_MODULE)</div><div class='ctx'> 	.phy_mask = 0xfff7, /* Only probe the port phy connect to the on chip MAC */</div><div class='ctx'> #endif</div><div class='add'>+	.vlan1_mask = 1,</div><div class='add'>+	.vlan2_mask = 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device bfin_mii_bus = {</div><div class='hunk'>@@ -292,7 +294,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* SPI controller data */</div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* SPI (0) */</div><div class='ctx'> static struct bfin5xx_spi_master bfin_spi0_info = {</div><div class='ctx'> 	.num_chipselect = 6,</div><div class='hunk'>@@ -715,7 +717,7 @@ static struct platform_device *stamp_devices[] __initdata = {</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> 	&amp;bfin_spi1_device,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -777,7 +779,7 @@ static int __init ezbrd_init(void)</div><div class='ctx'> 	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));</div><div class='ctx'> 	/* setup BF518-EZBRD GPIO pin PG11 to AMS2, PG15 to AMS3. */</div><div class='ctx'> 	peripheral_request(P_AMS2, "ParaFlash");</div><div class='del'>-#if !defined(CONFIG_SPI_BFIN) &amp;&amp; !defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if !defined(CONFIG_SPI_BFIN5XX) &amp;&amp; !defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	peripheral_request(P_AMS3, "ParaFlash");</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/blackfin/mach-bf518/boards/tcm-bf518.c b/arch/blackfin/mach-bf518/boards/tcm-bf518.c<br/>index 5470bf89e52e..f271310f739d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf518/boards/tcm-bf518.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf518/boards/tcm-bf518.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf518/boards/tcm-bf518.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf518/boards/tcm-bf518.c</a></div><div class='hunk'>@@ -228,7 +228,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* SPI controller data */</div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* SPI (0) */</div><div class='ctx'> static struct bfin5xx_spi_master bfin_spi0_info = {</div><div class='ctx'> 	.num_chipselect = 6,</div><div class='hunk'>@@ -635,7 +635,7 @@ static struct platform_device *tcm_devices[] __initdata = {</div><div class='ctx'> 	&amp;bfin_mac_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> 	&amp;bfin_spi1_device,</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/blackfin/mach-bf527/boards/ad7160eval.c b/arch/blackfin/mach-bf527/boards/ad7160eval.c<br/>index 5bc6938157ad..c8d5d2b7c732 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/boards/ad7160eval.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf527/boards/ad7160eval.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/boards/ad7160eval.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf527/boards/ad7160eval.c</a></div><div class='hunk'>@@ -334,7 +334,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* SPI controller data */</div><div class='ctx'> static struct bfin5xx_spi_master bfin_spi0_info = {</div><div class='ctx'> 	.num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS,</div><div class='hunk'>@@ -744,7 +744,7 @@ static struct platform_device *stamp_devices[] __initdata = {</div><div class='ctx'> 	&amp;bfin_mac_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c<br/>index cd289698b4dd..7330607856e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/boards/cm_bf527.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf527/boards/cm_bf527.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/boards/cm_bf527.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf527/boards/cm_bf527.c</a></div><div class='hunk'>@@ -444,7 +444,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* SPI controller data */</div><div class='ctx'> static struct bfin5xx_spi_master bfin_spi0_info = {</div><div class='ctx'> 	.num_chipselect = 8,</div><div class='hunk'>@@ -893,7 +893,7 @@ static struct platform_device *cmbf527_devices[] __initdata = {</div><div class='ctx'> 	&amp;net2272_bfin_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c<br/>index 9f792eafd1cc..db3ecfce8306 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/boards/ezbrd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf527/boards/ezbrd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/boards/ezbrd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf527/boards/ezbrd.c</a></div><div class='hunk'>@@ -371,7 +371,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* SPI controller data */</div><div class='ctx'> static struct bfin5xx_spi_master bfin_spi0_info = {</div><div class='ctx'> 	.num_chipselect = 8,</div><div class='hunk'>@@ -776,7 +776,7 @@ static struct platform_device *stamp_devices[] __initdata = {</div><div class='ctx'> 	&amp;bfin_mac_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c<br/>index 3ecafff5d2ef..dfdd8e6bac72 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/boards/ezkit.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf527/boards/ezkit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/boards/ezkit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf527/boards/ezkit.c</a></div><div class='hunk'>@@ -664,7 +664,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* SPI controller data */</div><div class='ctx'> static struct bfin5xx_spi_master bfin_spi0_info = {</div><div class='ctx'> 	.num_chipselect = 8,</div><div class='hunk'>@@ -1189,7 +1189,7 @@ static struct platform_device *stamp_devices[] __initdata = {</div><div class='ctx'> 	&amp;net2272_bfin_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf527/boards/tll6527m.c b/arch/blackfin/mach-bf527/boards/tll6527m.c<br/>index 3a92c4318d2d..360e97fc5293 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/boards/tll6527m.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf527/boards/tll6527m.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf527/boards/tll6527m.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf527/boards/tll6527m.c</a></div><div class='hunk'>@@ -448,7 +448,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* SPI controller data */</div><div class='ctx'> static struct bfin5xx_spi_master bfin_spi0_info = {</div><div class='ctx'> 	.num_chipselect = EXP_GPIO_SPISEL_BASE + 8 + MAX_CTRL_CS,</div><div class='hunk'>@@ -831,7 +831,7 @@ static struct platform_device *tll6527m_devices[] __initdata = {</div><div class='ctx'> 	&amp;bfin_mac_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf533/boards/H8606.c b/arch/blackfin/mach-bf533/boards/H8606.c<br/>index 47cadd316e76..6cb7b3ed9b3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/H8606.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf533/boards/H8606.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/H8606.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf533/boards/H8606.c</a></div><div class='hunk'>@@ -125,7 +125,7 @@ static struct platform_device net2272_bfin_device = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* all SPI peripherals info goes here */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)</div><div class='hunk'>@@ -398,7 +398,7 @@ static struct platform_device *h8606_devices[] __initdata = {</div><div class='ctx'> 	&amp;net2272_bfin_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -428,7 +428,7 @@ static int __init H8606_init(void)</div><div class='ctx'> 	printk(KERN_INFO "HV Sistemas H8606 board support by http://www.hvsistemas.com\n");</div><div class='ctx'> 	printk(KERN_INFO "%s(): registering device resources\n", __func__);</div><div class='ctx'> 	platform_add_devices(h8606_devices, ARRAY_SIZE(h8606_devices));</div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/blackfin/mach-bf533/boards/blackstamp.c b/arch/blackfin/mach-bf533/boards/blackstamp.c<br/>index 18817d57c7a1..de44a3765e59 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/blackstamp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf533/boards/blackstamp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/blackstamp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf533/boards/blackstamp.c</a></div><div class='hunk'>@@ -146,7 +146,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* SPI (0) */</div><div class='ctx'> static struct resource bfin_spi0_resource[] = {</div><div class='ctx'> 	[0] = {</div><div class='hunk'>@@ -422,7 +422,7 @@ static struct platform_device *stamp_devices[] __initdata = {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c<br/>index 2c8f30ef6a7b..fe47e048c4e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/cm_bf533.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf533/boards/cm_bf533.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/cm_bf533.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf533/boards/cm_bf533.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'>  */</div><div class='ctx'> const char bfin_board_name[] = "Bluetechnix CM BF533";</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* all SPI peripherals info goes here */</div><div class='ctx'> #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)</div><div class='ctx'> static struct mtd_partition bfin_spi_flash_partitions[] = {</div><div class='hunk'>@@ -536,7 +536,7 @@ static struct platform_device *cm_bf533_devices[] __initdata = {</div><div class='ctx'> 	&amp;net2272_bfin_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -549,7 +549,7 @@ static int __init cm_bf533_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO "%s(): registering device resources\n", __func__);</div><div class='ctx'> 	platform_add_devices(cm_bf533_devices, ARRAY_SIZE(cm_bf533_devices));</div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c<br/>index 144556e14499..07811c209b9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/ezkit.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf533/boards/ezkit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/ezkit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf533/boards/ezkit.c</a></div><div class='hunk'>@@ -245,7 +245,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* SPI (0) */</div><div class='ctx'> static struct resource bfin_spi0_resource[] = {</div><div class='ctx'> 	[0] = {</div><div class='hunk'>@@ -484,7 +484,7 @@ static struct platform_device *ezkit_devices[] __initdata = {</div><div class='ctx'> 	&amp;smc91x_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf533/boards/ip0x.c b/arch/blackfin/mach-bf533/boards/ip0x.c<br/>index b597d4e50d58..e303dae4e2d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/ip0x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf533/boards/ip0x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/ip0x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf533/boards/ip0x.c</a></div><div class='hunk'>@@ -104,7 +104,7 @@ static struct platform_device dm9000_device2 = {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* all SPI peripherals info goes here */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)</div><div class='hunk'>@@ -270,7 +270,7 @@ static struct platform_device *ip0x_devices[] __initdata = {</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;spi_bfin_master_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c<br/>index 2afd02e14bd1..ce88a7165b62 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/stamp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf533/boards/stamp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf533/boards/stamp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf533/boards/stamp.c</a></div><div class='hunk'>@@ -219,9 +219,10 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)</div><div class='add'>+#if defined(CONFIG_SND_BF5XX_SOC_AD1836) || \</div><div class='add'>+	defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)</div><div class='ctx'> 	{</div><div class='del'>-		.modalias = "ad183x",</div><div class='add'>+		.modalias = "ad1836",</div><div class='ctx'> 		.max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */</div><div class='ctx'> 		.bus_num = 0,</div><div class='ctx'> 		.chip_select = 4,</div><div class='hunk'>@@ -251,7 +252,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* SPI (0) */</div><div class='ctx'> static struct resource bfin_spi0_resource[] = {</div><div class='ctx'> 	[0] = {</div><div class='hunk'>@@ -471,7 +472,7 @@ static struct i2c_gpio_platform_data i2c_gpio_data = {</div><div class='ctx'> 	.scl_pin		= GPIO_PF3,</div><div class='ctx'> 	.sda_is_open_drain	= 0,</div><div class='ctx'> 	.scl_is_open_drain	= 0,</div><div class='del'>-	.udelay			= 40,</div><div class='add'>+	.udelay			= 10,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device i2c_gpio_device = {</div><div class='hunk'>@@ -540,27 +541,150 @@ static struct platform_device bfin_dpmc = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \</div><div class='add'>+	defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) \</div><div class='add'>+	|| defined(CONFIG_SND_BF5XX_AC97) || \</div><div class='add'>+	defined(CONFIG_SND_BF5XX_AC97_MODULE)</div><div class='add'>+</div><div class='add'>+#include &lt;asm/bfin_sport.h&gt;</div><div class='add'>+</div><div class='add'>+#define SPORT_REQ(x) \</div><div class='add'>+	[x] = {P_SPORT##x##_TFS, P_SPORT##x##_DTPRI, P_SPORT##x##_TSCLK, \</div><div class='add'>+		P_SPORT##x##_RFS, P_SPORT##x##_DRPRI, P_SPORT##x##_RSCLK, 0}</div><div class='add'>+</div><div class='add'>+static const u16 bfin_snd_pin[][7] = {</div><div class='add'>+	SPORT_REQ(0),</div><div class='add'>+	SPORT_REQ(1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bfin_snd_platform_data bfin_snd_data[] = {</div><div class='add'>+	{</div><div class='add'>+		.pin_req = &amp;bfin_snd_pin[0][0],</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.pin_req = &amp;bfin_snd_pin[1][0],</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BFIN_SND_RES(x) \</div><div class='add'>+	[x] = { \</div><div class='add'>+		{ \</div><div class='add'>+			.start = SPORT##x##_TCR1, \</div><div class='add'>+			.end = SPORT##x##_TCR1, \</div><div class='add'>+			.flags = IORESOURCE_MEM \</div><div class='add'>+		}, \</div><div class='add'>+		{ \</div><div class='add'>+			.start = CH_SPORT##x##_RX, \</div><div class='add'>+			.end = CH_SPORT##x##_RX, \</div><div class='add'>+			.flags = IORESOURCE_DMA, \</div><div class='add'>+		}, \</div><div class='add'>+		{ \</div><div class='add'>+			.start = CH_SPORT##x##_TX, \</div><div class='add'>+			.end = CH_SPORT##x##_TX, \</div><div class='add'>+			.flags = IORESOURCE_DMA, \</div><div class='add'>+		}, \</div><div class='add'>+		{ \</div><div class='add'>+			.start = IRQ_SPORT##x##_ERROR, \</div><div class='add'>+			.end = IRQ_SPORT##x##_ERROR, \</div><div class='add'>+			.flags = IORESOURCE_IRQ, \</div><div class='add'>+		} \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static struct resource bfin_snd_resources[][4] = {</div><div class='add'>+	BFIN_SND_RES(0),</div><div class='add'>+	BFIN_SND_RES(1),</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)</div><div class='add'>+static struct platform_device bfin_i2s_pcm = {</div><div class='add'>+	.name = "bfin-i2s-pcm-audio",</div><div class='add'>+	.id = -1,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)</div><div class='add'>+static struct platform_device bfin_tdm_pcm = {</div><div class='add'>+	.name = "bfin-tdm-pcm-audio",</div><div class='add'>+	.id = -1,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)</div><div class='add'>+static struct platform_device bfin_ac97_pcm = {</div><div class='add'>+	.name = "bfin-ac97-pcm-audio",</div><div class='add'>+	.id = -1,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SND_BF5XX_SOC_AD73311) || \</div><div class='add'>+	defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE)</div><div class='add'>+static const unsigned ad73311_gpio[] = {</div><div class='add'>+	GPIO_PF4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_ad73311_machine = {</div><div class='add'>+	.name = "bfin-snd-ad73311",</div><div class='add'>+	.id = 1,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = (void *)ad73311_gpio,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SND_SOC_AD73311) || defined(CONFIG_SND_SOC_AD73311_MODULE)</div><div class='add'>+static struct platform_device bfin_ad73311_codec_device = {</div><div class='add'>+	.name = "ad73311",</div><div class='add'>+	.id = -1,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SND_SOC_AD74111) || defined(CONFIG_SND_SOC_AD74111_MODULE)</div><div class='add'>+static struct platform_device bfin_ad74111_codec_device = {</div><div class='add'>+	.name = "ad74111",</div><div class='add'>+	.id = -1,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SND_BF5XX_SOC_I2S) || \</div><div class='add'>+	defined(CONFIG_SND_BF5XX_SOC_I2S_MODULE)</div><div class='ctx'> static struct platform_device bfin_i2s = {</div><div class='ctx'> 	.name = "bfin-i2s",</div><div class='ctx'> 	.id = CONFIG_SND_BF5XX_SPORT_NUM,</div><div class='del'>-	/* TODO: add platform data here */</div><div class='add'>+	.num_resources =</div><div class='add'>+		ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),</div><div class='add'>+	.resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)</div><div class='add'>+#if defined(CONFIG_SND_BF5XX_SOC_TDM) || \</div><div class='add'>+	defined(CONFIG_SND_BF5XX_SOC_TDM_MODULE)</div><div class='ctx'> static struct platform_device bfin_tdm = {</div><div class='ctx'> 	.name = "bfin-tdm",</div><div class='ctx'> 	.id = CONFIG_SND_BF5XX_SPORT_NUM,</div><div class='del'>-	/* TODO: add platform data here */</div><div class='add'>+	.num_resources =</div><div class='add'>+		ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),</div><div class='add'>+	.resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)</div><div class='add'>+#if defined(CONFIG_SND_BF5XX_SOC_AC97) || \</div><div class='add'>+	defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE)</div><div class='ctx'> static struct platform_device bfin_ac97 = {</div><div class='ctx'> 	.name = "bfin-ac97",</div><div class='ctx'> 	.id = CONFIG_SND_BF5XX_SPORT_NUM,</div><div class='del'>-	/* TODO: add platform data here */</div><div class='add'>+	.num_resources =</div><div class='add'>+		ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),</div><div class='add'>+	.resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -580,7 +704,7 @@ static struct platform_device *stamp_devices[] __initdata = {</div><div class='ctx'> 	&amp;net2272_bfin_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -596,7 +720,8 @@ static struct platform_device *stamp_devices[] __initdata = {</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)</div><div class='add'>+#if defined(CONFIG_SERIAL_BFIN_SPORT) || \</div><div class='add'>+	defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)</div><div class='ctx'> #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART</div><div class='ctx'> 	&amp;bfin_sport0_uart_device,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -618,14 +743,42 @@ static struct platform_device *stamp_devices[] __initdata = {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)</div><div class='del'>-	&amp;bfin_i2s,</div><div class='add'>+	&amp;bfin_i2s_pcm,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)</div><div class='del'>-	&amp;bfin_tdm,</div><div class='add'>+	&amp;bfin_tdm_pcm,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)</div><div class='add'>+	&amp;bfin_ac97_pcm,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SND_BF5XX_SOC_AD73311) || \</div><div class='add'>+	defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE)</div><div class='add'>+	&amp;bfin_ad73311_machine,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SND_SOC_AD73311) || defined(CONFIG_SND_SOC_AD73311_MODULE)</div><div class='add'>+	&amp;bfin_ad73311_codec_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SND_SOC_AD74111) || defined(CONFIG_SND_SOC_AD74111_MODULE)</div><div class='add'>+	&amp;bfin_ad74111_codec_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SND_BF5XX_SOC_I2S) || \</div><div class='add'>+	defined(CONFIG_SND_BF5XX_SOC_I2S_MODULE)</div><div class='add'>+	&amp;bfin_i2s,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SND_BF5XX_SOC_TDM) || \</div><div class='add'>+	defined(CONFIG_SND_BF5XX_SOC_TDM_MODULE)</div><div class='add'>+	&amp;bfin_tdm,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SND_BF5XX_SOC_AC97) || \</div><div class='add'>+	defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE)</div><div class='ctx'> 	&amp;bfin_ac97,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c b/arch/blackfin/mach-bf537/boards/cm_bf537e.c<br/>index 604a430038e1..0d4a2f61a973 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/cm_bf537e.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf537/boards/cm_bf537e.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/cm_bf537e.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf537/boards/cm_bf537e.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>  */</div><div class='ctx'> const char bfin_board_name[] = "Bluetechnix CM BF537E";</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* all SPI peripherals info goes here */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)</div><div class='hunk'>@@ -735,7 +735,7 @@ static struct platform_device *cm_bf537e_devices[] __initdata = {</div><div class='ctx'> 	&amp;net2272_bfin_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -770,7 +770,7 @@ static int __init cm_bf537e_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO "%s(): registering device resources\n", __func__);</div><div class='ctx'> 	platform_add_devices(cm_bf537e_devices, ARRAY_SIZE(cm_bf537e_devices));</div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c b/arch/blackfin/mach-bf537/boards/cm_bf537u.c<br/>index d916b46a44fe..f5536982706c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/cm_bf537u.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf537/boards/cm_bf537u.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/cm_bf537u.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf537/boards/cm_bf537u.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'>  */</div><div class='ctx'> const char bfin_board_name[] = "Bluetechnix CM BF537U";</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* all SPI peripherals info goes here */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)</div><div class='hunk'>@@ -700,7 +700,7 @@ static struct platform_device *cm_bf537u_devices[] __initdata = {</div><div class='ctx'> 	&amp;net2272_bfin_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -747,7 +747,7 @@ static int __init cm_bf537u_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO "%s(): registering device resources\n", __func__);</div><div class='ctx'> 	platform_add_devices(cm_bf537u_devices, ARRAY_SIZE(cm_bf537u_devices));</div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf537/boards/dnp5370.c b/arch/blackfin/mach-bf537/boards/dnp5370.c<br/>index 5f307228be63..11dadeb33d79 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/dnp5370.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf537/boards/dnp5370.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/dnp5370.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf537/boards/dnp5370.c</a></div><div class='hunk'>@@ -125,7 +125,7 @@ static struct platform_device asmb_flash_device = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)</div><div class='ctx'> </div><div class='hunk'>@@ -370,7 +370,7 @@ static struct platform_device *dnp5370_devices[] __initdata = {</div><div class='ctx'> 	&amp;bfin_mac_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;spi_bfin_master_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c b/arch/blackfin/mach-bf537/boards/minotaur.c<br/>index 3901dd093b90..d2d71282618f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/minotaur.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf537/boards/minotaur.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/minotaur.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf537/boards/minotaur.c</a></div><div class='hunk'>@@ -121,7 +121,7 @@ static struct platform_device net2272_bfin_device = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* all SPI peripherals info goes here */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MTD_M25P80) \</div><div class='hunk'>@@ -496,7 +496,7 @@ static struct platform_device *minotaur_devices[] __initdata = {</div><div class='ctx'> 	&amp;net2272_bfin_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -537,7 +537,7 @@ static int __init minotaur_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO "%s(): registering device resources\n", __func__);</div><div class='ctx'> 	platform_add_devices(minotaur_devices, ARRAY_SIZE(minotaur_devices));</div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	spi_register_board_info(bfin_spi_board_info,</div><div class='ctx'> 				ARRAY_SIZE(bfin_spi_board_info));</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c<br/>index aebd31c845f0..6fd84709fc68 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/pnav10.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf537/boards/pnav10.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/pnav10.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf537/boards/pnav10.c</a></div><div class='hunk'>@@ -154,7 +154,7 @@ static struct platform_device net2272_bfin_device = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* all SPI peripherals info goes here */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MTD_M25P80) \</div><div class='hunk'>@@ -477,7 +477,7 @@ static struct platform_device *stamp_devices[] __initdata = {</div><div class='ctx'> 	&amp;net2272_bfin_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -508,7 +508,7 @@ static int __init pnav_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO "%s(): registering device resources\n", __func__);</div><div class='ctx'> 	platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));</div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	spi_register_board_info(bfin_spi_board_info,</div><div class='ctx'> 				ARRAY_SIZE(bfin_spi_board_info));</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c<br/>index 7fbb0bbf8676..2221173e489e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/stamp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf537/boards/stamp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/stamp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf537/boards/stamp.c</a></div><div class='hunk'>@@ -1420,7 +1420,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* SPI controller data */</div><div class='ctx'> static struct bfin5xx_spi_master bfin_spi0_info = {</div><div class='ctx'> 	.num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS,</div><div class='hunk'>@@ -1462,7 +1462,7 @@ static struct platform_device bfin_spi0_device = {</div><div class='ctx'> </div><div class='ctx'> /* SPORT SPI controller data */</div><div class='ctx'> static struct bfin5xx_spi_master bfin_sport_spi0_info = {</div><div class='del'>-	.num_chipselect = 1, /* master only supports one device */</div><div class='add'>+	.num_chipselect = MAX_BLACKFIN_GPIOS,</div><div class='ctx'> 	.enable_dma = 0,  /* master don't support DMA */</div><div class='ctx'> 	.pin_req = {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_DRPRI,</div><div class='ctx'> 		P_SPORT0_RSCLK, P_SPORT0_TFS, P_SPORT0_RFS, 0},</div><div class='hunk'>@@ -1492,7 +1492,7 @@ static struct platform_device bfin_sport_spi0_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct bfin5xx_spi_master bfin_sport_spi1_info = {</div><div class='del'>-	.num_chipselect = 1, /* master only supports one device */</div><div class='add'>+	.num_chipselect = MAX_BLACKFIN_GPIOS,</div><div class='ctx'> 	.enable_dma = 0,  /* master don't support DMA */</div><div class='ctx'> 	.pin_req = {P_SPORT1_DTPRI, P_SPORT1_TSCLK, P_SPORT1_DRPRI,</div><div class='ctx'> 		P_SPORT1_RSCLK, P_SPORT1_TFS, P_SPORT1_RFS, 0},</div><div class='hunk'>@@ -1558,6 +1558,71 @@ static struct platform_device bfin_lq035q1_device = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_VIDEO_BLACKFIN_CAPTURE) \</div><div class='add'>+	|| defined(CONFIG_VIDEO_BLACKFIN_CAPTURE_MODULE)</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;media/blackfin/bfin_capture.h&gt;</div><div class='add'>+#include &lt;media/blackfin/ppi.h&gt;</div><div class='add'>+</div><div class='add'>+static const unsigned short ppi_req[] = {</div><div class='add'>+	P_PPI0_D0, P_PPI0_D1, P_PPI0_D2, P_PPI0_D3,</div><div class='add'>+	P_PPI0_D4, P_PPI0_D5, P_PPI0_D6, P_PPI0_D7,</div><div class='add'>+	P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2,</div><div class='add'>+	0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ppi_info ppi_info = {</div><div class='add'>+	.type = PPI_TYPE_PPI,</div><div class='add'>+	.dma_ch = CH_PPI,</div><div class='add'>+	.irq_err = IRQ_PPI_ERROR,</div><div class='add'>+	.base = (void __iomem *)PPI_CONTROL,</div><div class='add'>+	.pin_req = ppi_req,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_VIDEO_VS6624) \</div><div class='add'>+	|| defined(CONFIG_VIDEO_VS6624_MODULE)</div><div class='add'>+static struct v4l2_input vs6624_inputs[] = {</div><div class='add'>+	{</div><div class='add'>+		.index = 0,</div><div class='add'>+		.name = "Camera",</div><div class='add'>+		.type = V4L2_INPUT_TYPE_CAMERA,</div><div class='add'>+		.std = V4L2_STD_UNKNOWN,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bcap_route vs6624_routes[] = {</div><div class='add'>+	{</div><div class='add'>+		.input = 0,</div><div class='add'>+		.output = 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned vs6624_ce_pin = GPIO_PF10;</div><div class='add'>+</div><div class='add'>+static struct bfin_capture_config bfin_capture_data = {</div><div class='add'>+	.card_name = "BF537",</div><div class='add'>+	.inputs = vs6624_inputs,</div><div class='add'>+	.num_inputs = ARRAY_SIZE(vs6624_inputs),</div><div class='add'>+	.routes = vs6624_routes,</div><div class='add'>+	.i2c_adapter_id = 0,</div><div class='add'>+	.board_info = {</div><div class='add'>+		.type = "vs6624",</div><div class='add'>+		.addr = 0x10,</div><div class='add'>+		.platform_data = (void *)&amp;vs6624_ce_pin,</div><div class='add'>+	},</div><div class='add'>+	.ppi_info = &amp;ppi_info,</div><div class='add'>+	.ppi_control = (PACK_EN | DLEN_8 | XFR_TYPE | 0x0020),</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_capture_device = {</div><div class='add'>+	.name = "bfin_capture",</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;bfin_capture_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)</div><div class='ctx'> #ifdef CONFIG_SERIAL_BFIN_UART0</div><div class='ctx'> static struct resource bfin_uart0_resources[] = {</div><div class='hunk'>@@ -2716,7 +2781,7 @@ static struct platform_device *stamp_devices[] __initdata = {</div><div class='ctx'> 	&amp;net2272_bfin_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -2733,6 +2798,11 @@ static struct platform_device *stamp_devices[] __initdata = {</div><div class='ctx'> 	&amp;bfin_lq035q1_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_VIDEO_BLACKFIN_CAPTURE) \</div><div class='add'>+	|| defined(CONFIG_VIDEO_BLACKFIN_CAPTURE_MODULE)</div><div class='add'>+	&amp;bfin_capture_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)</div><div class='ctx'> #ifdef CONFIG_SERIAL_BFIN_UART0</div><div class='ctx'> 	&amp;bfin_uart0_device,</div><div class='head'>diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c<br/>index 6917ce2fa55e..988517671a5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/tcm_bf537.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf537/boards/tcm_bf537.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf537/boards/tcm_bf537.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf537/boards/tcm_bf537.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'>  */</div><div class='ctx'> const char bfin_board_name[] = "Bluetechnix TCM BF537";</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* all SPI peripherals info goes here */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)</div><div class='hunk'>@@ -702,7 +702,7 @@ static struct platform_device *cm_bf537_devices[] __initdata = {</div><div class='ctx'> 	&amp;net2272_bfin_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -737,7 +737,7 @@ static int __init tcm_bf537_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO "%s(): registering device resources\n", __func__);</div><div class='ctx'> 	platform_add_devices(cm_bf537_devices, ARRAY_SIZE(cm_bf537_devices));</div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf538/boards/ezkit.c b/arch/blackfin/mach-bf538/boards/ezkit.c<br/>index 8356eb599f19..1633a6f306c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf538/boards/ezkit.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf538/boards/ezkit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf538/boards/ezkit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf538/boards/ezkit.c</a></div><div class='hunk'>@@ -490,7 +490,7 @@ static struct platform_device smc91x_device = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* all SPI peripherals info goes here */</div><div class='ctx'> #if defined(CONFIG_MTD_M25P80) \</div><div class='ctx'> 	|| defined(CONFIG_MTD_M25P80_MODULE)</div><div class='hunk'>@@ -874,7 +874,7 @@ static struct platform_device *cm_bf538_devices[] __initdata = {</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bf538_spi_master0,</div><div class='ctx'> 	&amp;bf538_spi_master1,</div><div class='ctx'> 	&amp;bf538_spi_master2,</div><div class='hunk'>@@ -938,7 +938,7 @@ static int __init ezkit_init(void)</div><div class='ctx'> 	printk(KERN_INFO "%s(): registering device resources\n", __func__);</div><div class='ctx'> 	platform_add_devices(cm_bf538_devices, ARRAY_SIZE(cm_bf538_devices));</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	spi_register_board_info(bf538_spi_board_info,</div><div class='ctx'> 			ARRAY_SIZE(bf538_spi_board_info));</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c<br/>index 0350eacec21b..68af594db48e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/boards/cm_bf548.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf548/boards/cm_bf548.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/boards/cm_bf548.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf548/boards/cm_bf548.c</a></div><div class='hunk'>@@ -854,7 +854,7 @@ static struct platform_device para_flash_device = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* all SPI peripherals info goes here */</div><div class='ctx'> #if defined(CONFIG_MTD_M25P80) \</div><div class='ctx'> 	|| defined(CONFIG_MTD_M25P80_MODULE)</div><div class='hunk'>@@ -1175,7 +1175,7 @@ static struct platform_device *cm_bf548_devices[] __initdata = {</div><div class='ctx'> 	&amp;bf54x_sdh_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bf54x_spi_master0,</div><div class='ctx'> 	&amp;bf54x_spi_master1,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1210,7 +1210,7 @@ static int __init cm_bf548_init(void)</div><div class='ctx'> 	printk(KERN_INFO "%s(): registering device resources\n", __func__);</div><div class='ctx'> 	platform_add_devices(cm_bf548_devices, ARRAY_SIZE(cm_bf548_devices));</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	spi_register_board_info(bf54x_spi_board_info,</div><div class='ctx'> 			ARRAY_SIZE(bf54x_spi_board_info));</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c<br/>index bb868ac0fe2d..3ea45f8bd61c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/boards/ezkit.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf548/boards/ezkit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf548/boards/ezkit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf548/boards/ezkit.c</a></div><div class='hunk'>@@ -1110,7 +1110,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* SPI (0) */</div><div class='ctx'> static struct resource bfin_spi0_resource[] = {</div><div class='ctx'> 	[0] = {</div><div class='hunk'>@@ -1183,6 +1183,71 @@ static struct platform_device bf54x_spi_master1 = {</div><div class='ctx'> };</div><div class='ctx'> #endif  /* spi master and devices */</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_VIDEO_BLACKFIN_CAPTURE) \</div><div class='add'>+	|| defined(CONFIG_VIDEO_BLACKFIN_CAPTURE_MODULE)</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;media/blackfin/bfin_capture.h&gt;</div><div class='add'>+#include &lt;media/blackfin/ppi.h&gt;</div><div class='add'>+</div><div class='add'>+static const unsigned short ppi_req[] = {</div><div class='add'>+	P_PPI1_D0, P_PPI1_D1, P_PPI1_D2, P_PPI1_D3,</div><div class='add'>+	P_PPI1_D4, P_PPI1_D5, P_PPI1_D6, P_PPI1_D7,</div><div class='add'>+	P_PPI1_CLK, P_PPI1_FS1, P_PPI1_FS2,</div><div class='add'>+	0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ppi_info ppi_info = {</div><div class='add'>+	.type = PPI_TYPE_EPPI,</div><div class='add'>+	.dma_ch = CH_EPPI1,</div><div class='add'>+	.irq_err = IRQ_EPPI1_ERROR,</div><div class='add'>+	.base = (void __iomem *)EPPI1_STATUS,</div><div class='add'>+	.pin_req = ppi_req,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_VIDEO_VS6624) \</div><div class='add'>+	|| defined(CONFIG_VIDEO_VS6624_MODULE)</div><div class='add'>+static struct v4l2_input vs6624_inputs[] = {</div><div class='add'>+	{</div><div class='add'>+		.index = 0,</div><div class='add'>+		.name = "Camera",</div><div class='add'>+		.type = V4L2_INPUT_TYPE_CAMERA,</div><div class='add'>+		.std = V4L2_STD_UNKNOWN,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bcap_route vs6624_routes[] = {</div><div class='add'>+	{</div><div class='add'>+		.input = 0,</div><div class='add'>+		.output = 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned vs6624_ce_pin = GPIO_PG6;</div><div class='add'>+</div><div class='add'>+static struct bfin_capture_config bfin_capture_data = {</div><div class='add'>+	.card_name = "BF548",</div><div class='add'>+	.inputs = vs6624_inputs,</div><div class='add'>+	.num_inputs = ARRAY_SIZE(vs6624_inputs),</div><div class='add'>+	.routes = vs6624_routes,</div><div class='add'>+	.i2c_adapter_id = 0,</div><div class='add'>+	.board_info = {</div><div class='add'>+		.type = "vs6624",</div><div class='add'>+		.addr = 0x10,</div><div class='add'>+		.platform_data = (void *)&amp;vs6624_ce_pin,</div><div class='add'>+	},</div><div class='add'>+	.ppi_info = &amp;ppi_info,</div><div class='add'>+	.ppi_control = (POLC | PACKEN | DLEN_8 | XFR_TYPE | 0x20),</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_capture_device = {</div><div class='add'>+	.name = "bfin_capture",</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;bfin_capture_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)</div><div class='ctx'> static struct resource bfin_twi0_resource[] = {</div><div class='ctx'> 	[0] = {</div><div class='hunk'>@@ -1502,10 +1567,14 @@ static struct platform_device *ezkit_devices[] __initdata = {</div><div class='ctx'> 	&amp;bf54x_sdh_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bf54x_spi_master0,</div><div class='ctx'> 	&amp;bf54x_spi_master1,</div><div class='ctx'> #endif</div><div class='add'>+#if defined(CONFIG_VIDEO_BLACKFIN_CAPTURE) \</div><div class='add'>+	|| defined(CONFIG_VIDEO_BLACKFIN_CAPTURE_MODULE)</div><div class='add'>+	&amp;bfin_capture_device,</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_KEYBOARD_BFIN) || defined(CONFIG_KEYBOARD_BFIN_MODULE)</div><div class='ctx'> 	&amp;bf54x_kpad_device,</div><div class='head'>diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c<br/>index b1b7339b6ba7..f6ffd6f054c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/boards/acvilon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf561/boards/acvilon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/boards/acvilon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf561/boards/acvilon.c</a></div><div class='hunk'>@@ -372,7 +372,7 @@ static struct bfin5xx_spi_chip data_flash_chip_info = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* SPI (0) */</div><div class='ctx'> static struct resource bfin_spi0_resource[] = {</div><div class='ctx'> 	[0] = {</div><div class='hunk'>@@ -475,7 +475,7 @@ static struct platform_device bfin_dpmc = {</div><div class='ctx'> static struct platform_device *acvilon_devices[] __initdata = {</div><div class='ctx'> 	&amp;bfin_dpmc,</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c<br/>index c017cf07ed4e..d81450f635df 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/boards/cm_bf561.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf561/boards/cm_bf561.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/boards/cm_bf561.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf561/boards/cm_bf561.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'>  */</div><div class='ctx'> const char bfin_board_name[] = "Bluetechnix CM BF561";</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* all SPI peripherals info goes here */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)</div><div class='hunk'>@@ -488,7 +488,7 @@ static struct platform_device *cm_bf561_devices[] __initdata = {</div><div class='ctx'> 	&amp;net2272_bfin_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -523,7 +523,7 @@ static int __init cm_bf561_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO "%s(): registering device resources\n", __func__);</div><div class='ctx'> 	platform_add_devices(cm_bf561_devices, ARRAY_SIZE(cm_bf561_devices));</div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c<br/>index 27f22ed381d9..838978808a15 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/boards/ezkit.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf561/boards/ezkit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/boards/ezkit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf561/boards/ezkit.c</a></div><div class='hunk'>@@ -291,7 +291,7 @@ static struct platform_device ezkit_flash_device = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> /* SPI (0) */</div><div class='ctx'> static struct resource bfin_spi0_resource[] = {</div><div class='ctx'> 	[0] = {</div><div class='hunk'>@@ -383,7 +383,7 @@ static struct i2c_gpio_platform_data i2c_gpio_data = {</div><div class='ctx'> 	.scl_pin		= GPIO_PF0,</div><div class='ctx'> 	.sda_is_open_drain	= 0,</div><div class='ctx'> 	.scl_is_open_drain	= 0,</div><div class='del'>-	.udelay			= 40,</div><div class='add'>+	.udelay			= 10,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device i2c_gpio_device = {</div><div class='hunk'>@@ -422,6 +422,96 @@ static struct platform_device bfin_dpmc = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_VIDEO_BLACKFIN_CAPTURE) \</div><div class='add'>+	|| defined(CONFIG_VIDEO_BLACKFIN_CAPTURE_MODULE)</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;media/blackfin/bfin_capture.h&gt;</div><div class='add'>+#include &lt;media/blackfin/ppi.h&gt;</div><div class='add'>+</div><div class='add'>+static const unsigned short ppi_req[] = {</div><div class='add'>+	P_PPI0_D0, P_PPI0_D1, P_PPI0_D2, P_PPI0_D3,</div><div class='add'>+	P_PPI0_D4, P_PPI0_D5, P_PPI0_D6, P_PPI0_D7,</div><div class='add'>+	P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2,</div><div class='add'>+	0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ppi_info ppi_info = {</div><div class='add'>+	.type = PPI_TYPE_PPI,</div><div class='add'>+	.dma_ch = CH_PPI0,</div><div class='add'>+	.irq_err = IRQ_PPI1_ERROR,</div><div class='add'>+	.base = (void __iomem *)PPI0_CONTROL,</div><div class='add'>+	.pin_req = ppi_req,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_VIDEO_ADV7183) \</div><div class='add'>+	|| defined(CONFIG_VIDEO_ADV7183_MODULE)</div><div class='add'>+#include &lt;media/adv7183.h&gt;</div><div class='add'>+static struct v4l2_input adv7183_inputs[] = {</div><div class='add'>+	{</div><div class='add'>+		.index = 0,</div><div class='add'>+		.name = "Composite",</div><div class='add'>+		.type = V4L2_INPUT_TYPE_CAMERA,</div><div class='add'>+		.std = V4L2_STD_ALL,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.index = 1,</div><div class='add'>+		.name = "S-Video",</div><div class='add'>+		.type = V4L2_INPUT_TYPE_CAMERA,</div><div class='add'>+		.std = V4L2_STD_ALL,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.index = 2,</div><div class='add'>+		.name = "Component",</div><div class='add'>+		.type = V4L2_INPUT_TYPE_CAMERA,</div><div class='add'>+		.std = V4L2_STD_ALL,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bcap_route adv7183_routes[] = {</div><div class='add'>+	{</div><div class='add'>+		.input = ADV7183_COMPOSITE4,</div><div class='add'>+		.output = ADV7183_8BIT_OUT,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.input = ADV7183_SVIDEO0,</div><div class='add'>+		.output = ADV7183_8BIT_OUT,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.input = ADV7183_COMPONENT0,</div><div class='add'>+		.output = ADV7183_8BIT_OUT,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const unsigned adv7183_gpio[] = {</div><div class='add'>+	GPIO_PF13, /* reset pin */</div><div class='add'>+	GPIO_PF2,  /* output enable pin */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct bfin_capture_config bfin_capture_data = {</div><div class='add'>+	.card_name = "BF561",</div><div class='add'>+	.inputs = adv7183_inputs,</div><div class='add'>+	.num_inputs = ARRAY_SIZE(adv7183_inputs),</div><div class='add'>+	.routes = adv7183_routes,</div><div class='add'>+	.i2c_adapter_id = 0,</div><div class='add'>+	.board_info = {</div><div class='add'>+		.type = "adv7183",</div><div class='add'>+		.addr = 0x20,</div><div class='add'>+		.platform_data = (void *)adv7183_gpio,</div><div class='add'>+	},</div><div class='add'>+	.ppi_info = &amp;ppi_info,</div><div class='add'>+	.ppi_control = (PACK_EN | DLEN_8 | DMA32 | FLD_SEL),</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct platform_device bfin_capture_device = {</div><div class='add'>+	.name = "bfin_capture",</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;bfin_capture_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)</div><div class='ctx'> static struct platform_device bfin_i2s = {</div><div class='ctx'> 	.name = "bfin-i2s",</div><div class='hunk'>@@ -462,7 +552,7 @@ static struct platform_device *ezkit_devices[] __initdata = {</div><div class='ctx'> 	&amp;bfin_isp1760_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)</div><div class='add'>+#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)</div><div class='ctx'> 	&amp;bfin_spi0_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -494,6 +584,11 @@ static struct platform_device *ezkit_devices[] __initdata = {</div><div class='ctx'> 	&amp;ezkit_flash_device,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_VIDEO_BLACKFIN_CAPTURE) \</div><div class='add'>+	|| defined(CONFIG_VIDEO_BLACKFIN_CAPTURE_MODULE)</div><div class='add'>+	&amp;bfin_capture_device,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)</div><div class='ctx'> 	&amp;bfin_i2s,</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/blackfin/mach-bf561/include/mach/pll.h b/arch/blackfin/mach-bf561/include/mach/pll.h<br/>index 7977db2f1c12..00bdacee9cc2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/include/mach/pll.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf561/include/mach/pll.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/include/mach/pll.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf561/include/mach/pll.h</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SUPPLE_0_WAKEUP ((IRQ_SUPPLE_0 - (IRQ_CORETMR + 1)) % 32)</div><div class='add'>+#define SUPPLE_1_WAKEUP ((IRQ_SUPPLE_1 - (IRQ_CORETMR + 1)) % 32)</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='ctx'> bfin_iwr_restore(unsigned long iwr0, unsigned long iwr1, unsigned long iwr2)</div><div class='hunk'>@@ -42,7 +43,8 @@ bfin_iwr_save(unsigned long niwr0, unsigned long niwr1, unsigned long niwr2,</div><div class='ctx'> static inline void</div><div class='ctx'> bfin_iwr_set_sup0(unsigned long *iwr0, unsigned long *iwr1, unsigned long *iwr2)</div><div class='ctx'> {</div><div class='del'>-	bfin_iwr_save(0, IWR_ENABLE(SUPPLE_0_WAKEUP), 0, iwr0, iwr1, iwr2);</div><div class='add'>+	bfin_iwr_save(0, IWR_ENABLE(SUPPLE_0_WAKEUP) |</div><div class='add'>+			IWR_ENABLE(SUPPLE_1_WAKEUP), 0, iwr0, iwr1, iwr2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/blackfin/mach-bf561/smp.c b/arch/blackfin/mach-bf561/smp.c<br/>index db22401e7605..ab1c617b9cfc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/smp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-bf561/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-bf561/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-bf561/smp.c</a></div><div class='hunk'>@@ -84,7 +84,7 @@ int __cpuinit platform_boot_secondary(unsigned int cpu, struct task_struct *idle</div><div class='ctx'> </div><div class='ctx'> 	if ((bfin_read_SYSCR() &amp; COREB_SRAM_INIT) == 0) {</div><div class='ctx'> 		/* CoreB already running, sending ipi to wakeup it */</div><div class='del'>-		platform_send_ipi_cpu(cpu, IRQ_SUPPLE_0);</div><div class='add'>+		smp_send_reschedule(cpu);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Kick CoreB, which should start execution from CORE_SRAM_BASE. */</div><div class='ctx'> 		bfin_write_SYSCR(bfin_read_SYSCR() &amp; ~COREB_SRAM_INIT);</div><div class='hunk'>@@ -114,7 +114,8 @@ void __init platform_request_ipi(int irq, void *handler)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	const char *name = (irq == IRQ_SUPPLE_0) ? supple0 : supple1;</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(irq, handler, IRQF_PERCPU, name, handler);</div><div class='add'>+	ret = request_irq(irq, handler, IRQF_PERCPU | IRQF_NO_SUSPEND |</div><div class='add'>+			IRQF_FORCE_RESUME, name, handler);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		panic("Cannot request %s for IPI service", name);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/blackfin/mach-common/smp.c b/arch/blackfin/mach-common/smp.c<br/>index 0784a52389c8..ac8f8a43158c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/smp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/blackfin/mach-common/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/blackfin/mach-common/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/blackfin/mach-common/smp.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='add'>+#include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -47,9 +48,10 @@ unsigned long blackfin_iflush_l1_entry[NR_CPUS];</div><div class='ctx'> </div><div class='ctx'> struct blackfin_initial_pda __cpuinitdata initial_pda_coreb;</div><div class='ctx'> </div><div class='del'>-#define BFIN_IPI_RESCHEDULE   0</div><div class='del'>-#define BFIN_IPI_CALL_FUNC    1</div><div class='del'>-#define BFIN_IPI_CPU_STOP     2</div><div class='add'>+#define BFIN_IPI_TIMER	      0</div><div class='add'>+#define BFIN_IPI_RESCHEDULE   1</div><div class='add'>+#define BFIN_IPI_CALL_FUNC    2</div><div class='add'>+#define BFIN_IPI_CPU_STOP     3</div><div class='ctx'> </div><div class='ctx'> struct blackfin_flush_data {</div><div class='ctx'> 	unsigned long start;</div><div class='hunk'>@@ -160,6 +162,14 @@ static irqreturn_t ipi_handler_int0(int irq, void *dev_instance)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DECLARE_PER_CPU(struct clock_event_device, coretmr_events);</div><div class='add'>+void ipi_timer(void)</div><div class='add'>+{</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+	struct clock_event_device *evt = &amp;per_cpu(coretmr_events, cpu);</div><div class='add'>+	evt-&gt;event_handler(evt);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static irqreturn_t ipi_handler_int1(int irq, void *dev_instance)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipi_message *msg;</div><div class='hunk'>@@ -176,18 +186,17 @@ static irqreturn_t ipi_handler_int1(int irq, void *dev_instance)</div><div class='ctx'> 	while (msg_queue-&gt;count) {</div><div class='ctx'> 		msg = &amp;msg_queue-&gt;ipi_message[msg_queue-&gt;head];</div><div class='ctx'> 		switch (msg-&gt;type) {</div><div class='add'>+		case BFIN_IPI_TIMER:</div><div class='add'>+			ipi_timer();</div><div class='add'>+			break;</div><div class='ctx'> 		case BFIN_IPI_RESCHEDULE:</div><div class='ctx'> 			scheduler_ipi();</div><div class='ctx'> 			break;</div><div class='ctx'> 		case BFIN_IPI_CALL_FUNC:</div><div class='del'>-			spin_unlock_irqrestore(&amp;msg_queue-&gt;lock, flags);</div><div class='ctx'> 			ipi_call_function(cpu, msg);</div><div class='del'>-			spin_lock_irqsave(&amp;msg_queue-&gt;lock, flags);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case BFIN_IPI_CPU_STOP:</div><div class='del'>-			spin_unlock_irqrestore(&amp;msg_queue-&gt;lock, flags);</div><div class='ctx'> 			ipi_cpu_stop(cpu);</div><div class='del'>-			spin_lock_irqsave(&amp;msg_queue-&gt;lock, flags);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			printk(KERN_CRIT "CPU%u: Unknown IPI message 0x%lx\n",</div><div class='hunk'>@@ -297,8 +306,6 @@ void smp_send_reschedule(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	cpumask_t callmap;</div><div class='ctx'> 	/* simply trigger an ipi */</div><div class='del'>-	if (cpu_is_offline(cpu))</div><div class='del'>-		return;</div><div class='ctx'> </div><div class='ctx'> 	cpumask_clear(&amp;callmap);</div><div class='ctx'> 	cpumask_set_cpu(cpu, &amp;callmap);</div><div class='hunk'>@@ -308,6 +315,16 @@ void smp_send_reschedule(int cpu)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void smp_send_msg(const struct cpumask *mask, unsigned long type)</div><div class='add'>+{</div><div class='add'>+	smp_send_message(*mask, type, NULL, NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void smp_timer_broadcast(const struct cpumask *mask)</div><div class='add'>+{</div><div class='add'>+	smp_send_msg(mask, BFIN_IPI_TIMER);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void smp_send_stop(void)</div><div class='ctx'> {</div><div class='ctx'> 	cpumask_t callmap;</div><div class='hunk'>@@ -326,17 +343,24 @@ void smp_send_stop(void)</div><div class='ctx'> int __cpuinit __cpu_up(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	static struct task_struct *idle;</div><div class='add'>+	struct blackfin_cpudata *ci = &amp;per_cpu(cpu_data, cpu);</div><div class='add'>+	struct task_struct *idle = ci-&gt;idle;</div><div class='ctx'> </div><div class='del'>-	if (idle)</div><div class='add'>+	if (idle) {</div><div class='ctx'> 		free_task(idle);</div><div class='del'>-</div><div class='del'>-	idle = fork_idle(cpu);</div><div class='del'>-	if (IS_ERR(idle)) {</div><div class='del'>-		printk(KERN_ERR "CPU%u: fork() failed\n", cpu);</div><div class='del'>-		return PTR_ERR(idle);</div><div class='add'>+		idle = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!idle) {</div><div class='add'>+		idle = fork_idle(cpu);</div><div class='add'>+		if (IS_ERR(idle)) {</div><div class='add'>+			printk(KERN_ERR "CPU%u: fork() failed\n", cpu);</div><div class='add'>+			return PTR_ERR(idle);</div><div class='add'>+		}</div><div class='add'>+		ci-&gt;idle = idle;</div><div class='add'>+	} else {</div><div class='add'>+		init_idle(idle, cpu);</div><div class='add'>+	}</div><div class='ctx'> 	secondary_stack = task_stack_page(idle) + THREAD_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	ret = platform_boot_secondary(cpu, idle);</div><div class='hunk'>@@ -411,6 +435,7 @@ void __cpuinit secondary_start_kernel(void)</div><div class='ctx'> </div><div class='ctx'> 	bfin_setup_caches(cpu);</div><div class='ctx'> </div><div class='add'>+	notify_cpu_starting(cpu);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Calibrate loops per jiffy value.</div><div class='ctx'> 	 * IRQs need to be enabled here - D-cache can be invalidated</div><div class='hunk'>@@ -453,8 +478,10 @@ void smp_icache_flush_range_others(unsigned long start, unsigned long end)</div><div class='ctx'> 	smp_flush_data.start = start;</div><div class='ctx'> 	smp_flush_data.end = end;</div><div class='ctx'> </div><div class='del'>-	if (smp_call_function(&amp;ipi_flush_icache, &amp;smp_flush_data, 0))</div><div class='add'>+	preempt_disable();</div><div class='add'>+	if (smp_call_function(&amp;ipi_flush_icache, &amp;smp_flush_data, 1))</div><div class='ctx'> 		printk(KERN_WARNING "SMP: failed to run I-cache flush request on other CPUs\n");</div><div class='add'>+	preempt_enable();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(smp_icache_flush_range_others);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig<br/>new file mode 100644<br/>index 000000000000..26e67f0f0051<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,174 @@</div><div class='add'>+#</div><div class='add'>+# For a description of the syntax of this configuration file,</div><div class='add'>+# see Documentation/kbuild/kconfig-language.txt.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+config TMS320C6X</div><div class='add'>+	def_bool y</div><div class='add'>+	select CLKDEV_LOOKUP</div><div class='add'>+	select GENERIC_IRQ_SHOW</div><div class='add'>+	select HAVE_ARCH_TRACEHOOK</div><div class='add'>+	select HAVE_DMA_API_DEBUG</div><div class='add'>+	select HAVE_GENERIC_HARDIRQS</div><div class='add'>+	select HAVE_MEMBLOCK</div><div class='add'>+	select HAVE_SPARSE_IRQ</div><div class='add'>+	select OF</div><div class='add'>+	select OF_EARLY_FLATTREE</div><div class='add'>+</div><div class='add'>+config MMU</div><div class='add'>+	def_bool n</div><div class='add'>+</div><div class='add'>+config ZONE_DMA</div><div class='add'>+	def_bool y</div><div class='add'>+</div><div class='add'>+config FPU</div><div class='add'>+	def_bool n</div><div class='add'>+</div><div class='add'>+config HIGHMEM</div><div class='add'>+	def_bool n</div><div class='add'>+</div><div class='add'>+config NUMA</div><div class='add'>+	def_bool n</div><div class='add'>+</div><div class='add'>+config RWSEM_GENERIC_SPINLOCK</div><div class='add'>+	def_bool y</div><div class='add'>+</div><div class='add'>+config RWSEM_XCHGADD_ALGORITHM</div><div class='add'>+	def_bool n</div><div class='add'>+</div><div class='add'>+config GENERIC_CALIBRATE_DELAY</div><div class='add'>+	def_bool y</div><div class='add'>+</div><div class='add'>+config GENERIC_HWEIGHT</div><div class='add'>+	def_bool y</div><div class='add'>+</div><div class='add'>+config GENERIC_CLOCKEVENTS</div><div class='add'>+	def_bool y</div><div class='add'>+</div><div class='add'>+config GENERIC_CLOCKEVENTS_BROADCAST</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config GENERIC_BUG</div><div class='add'>+	def_bool y</div><div class='add'>+</div><div class='add'>+config COMMON_CLKDEV</div><div class='add'>+	def_bool y</div><div class='add'>+</div><div class='add'>+config C6X_BIG_KERNEL</div><div class='add'>+	bool "Build a big kernel"</div><div class='add'>+	help</div><div class='add'>+	  The C6X function call instruction has a limited range of +/- 2MiB.</div><div class='add'>+	  This is sufficient for most kernels, but some kernel configurations</div><div class='add'>+	  with lots of compiled-in functionality may require a larger range</div><div class='add'>+	  for function calls. Use this option to have the compiler generate</div><div class='add'>+	  function calls with 32-bit range. This will make the kernel both</div><div class='add'>+	  larger and slower.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+source "init/Kconfig"</div><div class='add'>+</div><div class='add'>+# Use the generic interrupt handling code in kernel/irq/</div><div class='add'>+</div><div class='add'>+source "kernel/Kconfig.freezer"</div><div class='add'>+</div><div class='add'>+config CMDLINE_BOOL</div><div class='add'>+	bool "Default bootloader kernel arguments"</div><div class='add'>+</div><div class='add'>+config CMDLINE</div><div class='add'>+	string "Kernel command line"</div><div class='add'>+	depends on CMDLINE_BOOL</div><div class='add'>+	default "console=ttyS0,57600"</div><div class='add'>+	help</div><div class='add'>+	  On some architectures there is currently no way for the boot loader</div><div class='add'>+	  to pass arguments to the kernel. For these architectures, you should</div><div class='add'>+	  supply some command-line options at build time by entering them</div><div class='add'>+	  here.</div><div class='add'>+</div><div class='add'>+config CMDLINE_FORCE</div><div class='add'>+	bool "Force default kernel command string"</div><div class='add'>+	depends on CMDLINE_BOOL</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Set this to have arguments from the default kernel command string</div><div class='add'>+	  override those passed by the boot loader.</div><div class='add'>+</div><div class='add'>+config CPU_BIG_ENDIAN</div><div class='add'>+	bool "Build big-endian kernel"</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Say Y if you plan on running a kernel in big-endian mode.</div><div class='add'>+	  Note that your board must be properly built and your board</div><div class='add'>+	  port must properly enable any big-endian related features</div><div class='add'>+	  of your chipset/board/processor.</div><div class='add'>+</div><div class='add'>+config FORCE_MAX_ZONEORDER</div><div class='add'>+	int "Maximum zone order"</div><div class='add'>+	default "13"</div><div class='add'>+	help</div><div class='add'>+	  The kernel memory allocator divides physically contiguous memory</div><div class='add'>+	  blocks into "zones", where each zone is a power of two number of</div><div class='add'>+	  pages.  This option selects the largest power of two that the kernel</div><div class='add'>+	  keeps in the memory allocator.  If you need to allocate very large</div><div class='add'>+	  blocks of physically contiguous memory, then you may need to</div><div class='add'>+	  increase this value.</div><div class='add'>+</div><div class='add'>+	  This config option is actually maximum order plus one. For example,</div><div class='add'>+	  a value of 11 means that the largest free memory block is 2^10 pages.</div><div class='add'>+</div><div class='add'>+menu "Processor type and features"</div><div class='add'>+</div><div class='add'>+source "arch/c6x/platforms/Kconfig"</div><div class='add'>+</div><div class='add'>+config TMS320C6X_CACHES_ON</div><div class='add'>+	bool "L2 cache support"</div><div class='add'>+	default y</div><div class='add'>+</div><div class='add'>+config KERNEL_RAM_BASE_ADDRESS</div><div class='add'>+	hex "Virtual address of memory base"</div><div class='add'>+	default 0xe0000000 if SOC_TMS320C6455</div><div class='add'>+	default 0xe0000000 if SOC_TMS320C6457</div><div class='add'>+	default 0xe0000000 if SOC_TMS320C6472</div><div class='add'>+	default 0x80000000</div><div class='add'>+</div><div class='add'>+source "mm/Kconfig"</div><div class='add'>+</div><div class='add'>+source "kernel/Kconfig.preempt"</div><div class='add'>+</div><div class='add'>+source "kernel/Kconfig.hz"</div><div class='add'>+source "kernel/time/Kconfig"</div><div class='add'>+</div><div class='add'>+endmenu</div><div class='add'>+</div><div class='add'>+menu "Executable file formats"</div><div class='add'>+</div><div class='add'>+source "fs/Kconfig.binfmt"</div><div class='add'>+</div><div class='add'>+endmenu</div><div class='add'>+</div><div class='add'>+source "net/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/Kconfig"</div><div class='add'>+</div><div class='add'>+source "fs/Kconfig"</div><div class='add'>+</div><div class='add'>+source "security/Kconfig"</div><div class='add'>+</div><div class='add'>+source "crypto/Kconfig"</div><div class='add'>+</div><div class='add'>+source "lib/Kconfig"</div><div class='add'>+</div><div class='add'>+menu "Kernel hacking"</div><div class='add'>+</div><div class='add'>+source "lib/Kconfig.debug"</div><div class='add'>+</div><div class='add'>+config ACCESS_CHECK</div><div class='add'>+	bool "Check the user pointer address"</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Usually the pointer transfer from user space is checked to see if its</div><div class='add'>+	  address is in the kernel space.</div><div class='add'>+</div><div class='add'>+	  Say N here to disable that check to improve the performance.</div><div class='add'>+</div><div class='add'>+endmenu</div><div class='head'>diff --git a/arch/c6x/Makefile b/arch/c6x/Makefile<br/>new file mode 100644<br/>index 000000000000..1d08dd070277<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/Makefile</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+#</div><div class='add'>+# linux/arch/c6x/Makefile</div><div class='add'>+#</div><div class='add'>+# This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+# License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+# for more details.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+cflags-y += -mno-dsbt -msdata=none</div><div class='add'>+</div><div class='add'>+cflags-$(CONFIG_C6X_BIG_KERNEL) += -mlong-calls</div><div class='add'>+</div><div class='add'>+CFLAGS_MODULE   += -mlong-calls -mno-dsbt -msdata=none</div><div class='add'>+</div><div class='add'>+CHECKFLAGS      +=</div><div class='add'>+</div><div class='add'>+KBUILD_CFLAGS   += $(cflags-y)</div><div class='add'>+KBUILD_AFLAGS   += $(cflags-y)</div><div class='add'>+</div><div class='add'>+ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='add'>+KBUILD_CFLAGS   += -mbig-endian</div><div class='add'>+KBUILD_AFLAGS   += -mbig-endian</div><div class='add'>+LINKFLAGS       += -mbig-endian</div><div class='add'>+KBUILD_LDFLAGS  += -mbig-endian</div><div class='add'>+LDFLAGS += -EB</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+head-y          := arch/c6x/kernel/head.o</div><div class='add'>+core-y          += arch/c6x/kernel/ arch/c6x/mm/ arch/c6x/platforms/</div><div class='add'>+libs-y          += arch/c6x/lib/</div><div class='add'>+</div><div class='add'>+# Default to vmlinux.bin, override when needed</div><div class='add'>+all: vmlinux.bin</div><div class='add'>+</div><div class='add'>+boot := arch/$(ARCH)/boot</div><div class='add'>+</div><div class='add'>+# Are we making a dtbImage.&lt;boardname&gt; target? If so, crack out the boardname</div><div class='add'>+DTB:=$(subst dtbImage.,,$(filter dtbImage.%, $(MAKECMDGOALS)))</div><div class='add'>+export DTB</div><div class='add'>+</div><div class='add'>+ifneq ($(DTB),)</div><div class='add'>+core-y	+= $(boot)/</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+# With make 3.82 we cannot mix normal and wildcard targets</div><div class='add'>+</div><div class='add'>+vmlinux.bin: vmlinux</div><div class='add'>+	$(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)</div><div class='add'>+</div><div class='add'>+dtbImage.%: vmlinux</div><div class='add'>+	$(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)</div><div class='add'>+</div><div class='add'>+archclean:</div><div class='add'>+	$(Q)$(MAKE) $(clean)=$(boot)</div><div class='add'>+</div><div class='add'>+define archhelp</div><div class='add'>+  @echo '  vmlinux.bin     - Binary kernel image (arch/$(ARCH)/boot/vmlinux.bin)'</div><div class='add'>+  @echo '  dtbImage.&lt;dt&gt;   - ELF image with $(arch)/boot/dts/&lt;dt&gt;.dts linked in'</div><div class='add'>+  @echo '                  - stripped elf with fdt blob'</div><div class='add'>+endef</div><div class='head'>diff --git a/arch/c6x/boot/Makefile b/arch/c6x/boot/Makefile<br/>new file mode 100644<br/>index 000000000000..ecca820e6041<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/boot/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/boot/Makefile</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for bootable kernel images</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+OBJCOPYFLAGS_vmlinux.bin := -O binary</div><div class='add'>+$(obj)/vmlinux.bin: vmlinux FORCE</div><div class='add'>+	$(call if_changed,objcopy)</div><div class='add'>+</div><div class='add'>+DTC_FLAGS ?= -p 1024</div><div class='add'>+</div><div class='add'>+ifneq ($(DTB),)</div><div class='add'>+obj-y += linked_dtb.o</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+$(obj)/%.dtb: $(src)/dts/%.dts FORCE</div><div class='add'>+	$(call cmd,dtc)</div><div class='add'>+</div><div class='add'>+quiet_cmd_cp = CP      $&lt; $@$2</div><div class='add'>+	cmd_cp = cat $&lt; &gt;$@$2 || (rm -f $@ &amp;&amp; echo false)</div><div class='add'>+</div><div class='add'>+# Generate builtin.dtb from $(DTB).dtb</div><div class='add'>+$(obj)/builtin.dtb: $(obj)/$(DTB).dtb</div><div class='add'>+	$(call if_changed,cp)</div><div class='add'>+</div><div class='add'>+$(obj)/linked_dtb.o: $(obj)/builtin.dtb</div><div class='add'>+</div><div class='add'>+$(obj)/dtbImage.%: vmlinux</div><div class='add'>+	$(call if_changed,objcopy)</div><div class='add'>+</div><div class='add'>+clean-files := $(obj)/*.dtb</div><div class='head'>diff --git a/arch/c6x/boot/dts/dsk6455.dts b/arch/c6x/boot/dts/dsk6455.dts<br/>new file mode 100644<br/>index 000000000000..2b71f800618d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/boot/dts/dsk6455.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/boot/dts/dsk6455.dts</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/c6x/boot/dts/dsk6455.dts</div><div class='add'>+ *</div><div class='add'>+ * DSK6455 Evaluation Platform For TMS320C6455</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *</div><div class='add'>+ * Author: Mark Salter &lt;msalter@redhat.com&gt;</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 2</div><div class='add'>+ * of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+/include/ "tms320c6455.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Spectrum Digital DSK6455";</div><div class='add'>+	compatible = "spectrum-digital,dsk6455";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "root=/dev/nfs ip=dhcp rw";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0xE0000000 0x08000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		megamod_pic: interrupt-controller@1800000 {</div><div class='add'>+			interrupts = &lt; 12 13 14 15 &gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		emifa@70000000 {</div><div class='add'>+			flash@3,0 {</div><div class='add'>+				  #address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;1&gt;;</div><div class='add'>+				compatible = "cfi-flash";</div><div class='add'>+				reg = &lt;0x3 0x0 0x400000&gt;;</div><div class='add'>+				bank-width = &lt;1&gt;;</div><div class='add'>+				device-width = &lt;1&gt;;</div><div class='add'>+				partition@0 {</div><div class='add'>+					reg = &lt;0x0 0x400000&gt;;</div><div class='add'>+					label = "NOR";</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer1: timer@2980000 {</div><div class='add'>+			interrupt-parent = &lt;&amp;megamod_pic&gt;;</div><div class='add'>+			interrupts = &lt; 69 &gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		clock-controller@029a0000 {</div><div class='add'>+			clock-frequency = &lt;50000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/c6x/boot/dts/evmc6457.dts b/arch/c6x/boot/dts/evmc6457.dts<br/>new file mode 100644<br/>index 000000000000..0301eb9a8ff8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/boot/dts/evmc6457.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/boot/dts/evmc6457.dts</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/c6x/boot/dts/evmc6457.dts</div><div class='add'>+ *</div><div class='add'>+ * EVMC6457 Evaluation Platform For TMS320C6457</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *</div><div class='add'>+ * Author: Mark Salter &lt;msalter@redhat.com&gt;</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 2</div><div class='add'>+ * of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+/include/ "tms320c6457.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "eInfochips EVMC6457";</div><div class='add'>+	compatible = "einfochips,evmc6457";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "console=hvc root=/dev/nfs ip=dhcp rw";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0xE0000000 0x10000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		megamod_pic: interrupt-controller@1800000 {</div><div class='add'>+		       interrupts = &lt; 12 13 14 15 &gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer0: timer@2940000 {</div><div class='add'>+			interrupt-parent = &lt;&amp;megamod_pic&gt;;</div><div class='add'>+			interrupts = &lt; 67 &gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		clock-controller@29a0000 {</div><div class='add'>+			clock-frequency = &lt;60000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/c6x/boot/dts/evmc6472.dts b/arch/c6x/boot/dts/evmc6472.dts<br/>new file mode 100644<br/>index 000000000000..3e207b449a93<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/boot/dts/evmc6472.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/boot/dts/evmc6472.dts</a></div><div class='hunk'>@@ -0,0 +1,73 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/c6x/boot/dts/evmc6472.dts</div><div class='add'>+ *</div><div class='add'>+ * EVMC6472 Evaluation Platform For TMS320C6472</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *</div><div class='add'>+ * Author: Mark Salter &lt;msalter@redhat.com&gt;</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 2</div><div class='add'>+ * of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+/include/ "tms320c6472.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "eInfochips EVMC6472";</div><div class='add'>+	compatible = "einfochips,evmc6472";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "console=hvc root=/dev/nfs ip=dhcp rw";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0xE0000000 0x10000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		megamod_pic: interrupt-controller@1800000 {</div><div class='add'>+		       interrupts = &lt; 12 13 14 15 &gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer0: timer@25e0000 {</div><div class='add'>+			interrupt-parent = &lt;&amp;megamod_pic&gt;;</div><div class='add'>+			interrupts = &lt; 16 &gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer1: timer@25f0000 {</div><div class='add'>+			interrupt-parent = &lt;&amp;megamod_pic&gt;;</div><div class='add'>+			interrupts = &lt; 16 &gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer2: timer@2600000 {</div><div class='add'>+			interrupt-parent = &lt;&amp;megamod_pic&gt;;</div><div class='add'>+			interrupts = &lt; 16 &gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer3: timer@2610000 {</div><div class='add'>+			interrupt-parent = &lt;&amp;megamod_pic&gt;;</div><div class='add'>+			interrupts = &lt; 16 &gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer4: timer@2620000 {</div><div class='add'>+			interrupt-parent = &lt;&amp;megamod_pic&gt;;</div><div class='add'>+			interrupts = &lt; 16 &gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer5: timer@2630000 {</div><div class='add'>+			interrupt-parent = &lt;&amp;megamod_pic&gt;;</div><div class='add'>+			interrupts = &lt; 16 &gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		clock-controller@29a0000 {</div><div class='add'>+			clock-frequency = &lt;25000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/c6x/boot/dts/evmc6474.dts b/arch/c6x/boot/dts/evmc6474.dts<br/>new file mode 100644<br/>index 000000000000..4dc291292bc4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/boot/dts/evmc6474.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/boot/dts/evmc6474.dts</a></div><div class='hunk'>@@ -0,0 +1,58 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/c6x/boot/dts/evmc6474.dts</div><div class='add'>+ *</div><div class='add'>+ * EVMC6474 Evaluation Platform For TMS320C6474</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *</div><div class='add'>+ * Author: Mark Salter &lt;msalter@redhat.com&gt;</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 2</div><div class='add'>+ * of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+/include/ "tms320c6474.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "Spectrum Digital EVMC6474";</div><div class='add'>+	compatible = "spectrum-digital,evmc6474";</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		bootargs = "console=hvc root=/dev/nfs ip=dhcp rw";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x80000000 0x08000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		megamod_pic: interrupt-controller@1800000 {</div><div class='add'>+		       interrupts = &lt; 12 13 14 15 &gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer3: timer@2940000 {</div><div class='add'>+			interrupt-parent = &lt;&amp;megamod_pic&gt;;</div><div class='add'>+			interrupts = &lt; 39 &gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer4: timer@2950000 {</div><div class='add'>+			interrupt-parent = &lt;&amp;megamod_pic&gt;;</div><div class='add'>+			interrupts = &lt; 41 &gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer5: timer@2960000 {</div><div class='add'>+			interrupt-parent = &lt;&amp;megamod_pic&gt;;</div><div class='add'>+			interrupts = &lt; 43 &gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		clock-controller@29a0000 {</div><div class='add'>+			clock-frequency = &lt;50000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/c6x/boot/dts/tms320c6455.dtsi b/arch/c6x/boot/dts/tms320c6455.dtsi<br/>new file mode 100644<br/>index 000000000000..a804ec1e018b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/boot/dts/tms320c6455.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/boot/dts/tms320c6455.dtsi</a></div><div class='hunk'>@@ -0,0 +1,96 @@</div><div class='add'>+</div><div class='add'>+/ {</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'>+	cpus {</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'>+		cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			model = "ti,c64x+";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		model = "tms320c6455";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		core_pic: interrupt-controller {</div><div class='add'>+			  interrupt-controller;</div><div class='add'>+			  #interrupt-cells = &lt;1&gt;;</div><div class='add'>+			  compatible = "ti,c64x+core-pic";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Megamodule interrupt controller</div><div class='add'>+		 */</div><div class='add'>+		megamod_pic: interrupt-controller@1800000 {</div><div class='add'>+		       compatible = "ti,c64x+megamod-pic";</div><div class='add'>+		       interrupt-controller;</div><div class='add'>+		       #interrupt-cells = &lt;1&gt;;</div><div class='add'>+		       reg = &lt;0x1800000 0x1000&gt;;</div><div class='add'>+		       interrupt-parent = &lt;&amp;core_pic&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cache-controller@1840000 {</div><div class='add'>+			compatible = "ti,c64x+cache";</div><div class='add'>+			reg = &lt;0x01840000 0x8400&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		emifa@70000000 {</div><div class='add'>+			compatible = "ti,c64x+emifa", "simple-bus";</div><div class='add'>+			#address-cells = &lt;2&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			reg = &lt;0x70000000 0x100&gt;;</div><div class='add'>+			ranges = &lt;0x2 0x0 0xa0000000 0x00000008</div><div class='add'>+			          0x3 0x0 0xb0000000 0x00400000</div><div class='add'>+				  0x4 0x0 0xc0000000 0x10000000</div><div class='add'>+				  0x5 0x0 0xD0000000 0x10000000&gt;;</div><div class='add'>+</div><div class='add'>+			ti,dscr-dev-enable = &lt;13&gt;;</div><div class='add'>+			ti,emifa-burst-priority = &lt;255&gt;;</div><div class='add'>+			ti,emifa-ce-config = &lt;0x00240120</div><div class='add'>+					      0x00240120</div><div class='add'>+					      0x00240122</div><div class='add'>+					      0x00240122&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer1: timer@2980000 {</div><div class='add'>+			compatible = "ti,c64x+timer64";</div><div class='add'>+			reg = &lt;0x2980000 0x40&gt;;</div><div class='add'>+			ti,dscr-dev-enable = &lt;4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		clock-controller@029a0000 {</div><div class='add'>+			compatible = "ti,c6455-pll", "ti,c64x+pll";</div><div class='add'>+			reg = &lt;0x029a0000 0x200&gt;;</div><div class='add'>+			ti,c64x+pll-bypass-delay = &lt;1440&gt;;</div><div class='add'>+			ti,c64x+pll-reset-delay = &lt;15360&gt;;</div><div class='add'>+			ti,c64x+pll-lock-delay = &lt;24000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		device-state-config-regs@2a80000 {</div><div class='add'>+			compatible = "ti,c64x+dscr";</div><div class='add'>+			reg = &lt;0x02a80000 0x41000&gt;;</div><div class='add'>+</div><div class='add'>+			ti,dscr-devstat = &lt;0&gt;;</div><div class='add'>+			ti,dscr-silicon-rev = &lt;8 28 0xf&gt;;</div><div class='add'>+			ti,dscr-rmii-resets = &lt;0 0x40020 0x00040000&gt;;</div><div class='add'>+</div><div class='add'>+			ti,dscr-locked-regs = &lt;0x40008 0x40004 0x0f0a0b00&gt;;</div><div class='add'>+			ti,dscr-devstate-ctl-regs =</div><div class='add'>+				 &lt;0 12 0x40008 1 0  0  2</div><div class='add'>+				  12 1 0x40008 3 0 30  2</div><div class='add'>+				  13 2 0x4002c 1 0xffffffff 0 1&gt;;</div><div class='add'>+			ti,dscr-devstate-stat-regs =</div><div class='add'>+				&lt;0 10 0x40014 1 0  0  3</div><div class='add'>+				 10 2 0x40018 1 0  0  3&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/c6x/boot/dts/tms320c6457.dtsi b/arch/c6x/boot/dts/tms320c6457.dtsi<br/>new file mode 100644<br/>index 000000000000..35f40709a719<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/boot/dts/tms320c6457.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/boot/dts/tms320c6457.dtsi</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+</div><div class='add'>+/ {</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'>+	cpus {</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'>+		cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			model = "ti,c64x+";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		model = "tms320c6457";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		core_pic: interrupt-controller {</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "ti,c64x+core-pic";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		megamod_pic: interrupt-controller@1800000 {</div><div class='add'>+			compatible = "ti,c64x+megamod-pic";</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;core_pic&gt;;</div><div class='add'>+			reg = &lt;0x1800000 0x1000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cache-controller@1840000 {</div><div class='add'>+			compatible = "ti,c64x+cache";</div><div class='add'>+			reg = &lt;0x01840000 0x8400&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		device-state-controller@2880800 {</div><div class='add'>+			compatible = "ti,c64x+dscr";</div><div class='add'>+			reg = &lt;0x02880800 0x400&gt;;</div><div class='add'>+</div><div class='add'>+			ti,dscr-devstat = &lt;0x20&gt;;</div><div class='add'>+			ti,dscr-silicon-rev = &lt;0x18 28 0xf&gt;;</div><div class='add'>+			ti,dscr-mac-fuse-regs = &lt;0x114 3 4 5 6</div><div class='add'>+						 0x118 0 0 1 2&gt;;</div><div class='add'>+			ti,dscr-kick-regs = &lt;0x38 0x83E70B13</div><div class='add'>+					     0x3c 0x95A4F1E0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer0: timer@2940000 {</div><div class='add'>+			compatible = "ti,c64x+timer64";</div><div class='add'>+			reg = &lt;0x2940000 0x40&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		clock-controller@29a0000 {</div><div class='add'>+			compatible = "ti,c6457-pll", "ti,c64x+pll";</div><div class='add'>+			reg = &lt;0x029a0000 0x200&gt;;</div><div class='add'>+			ti,c64x+pll-bypass-delay = &lt;300&gt;;</div><div class='add'>+			ti,c64x+pll-reset-delay = &lt;24000&gt;;</div><div class='add'>+			ti,c64x+pll-lock-delay = &lt;50000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/c6x/boot/dts/tms320c6472.dtsi b/arch/c6x/boot/dts/tms320c6472.dtsi<br/>new file mode 100644<br/>index 000000000000..b488aaec65c0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/boot/dts/tms320c6472.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/boot/dts/tms320c6472.dtsi</a></div><div class='hunk'>@@ -0,0 +1,134 @@</div><div class='add'>+</div><div class='add'>+/ {</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'>+	cpus {</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'>+		cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			model = "ti,c64x+";</div><div class='add'>+		};</div><div class='add'>+		cpu@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			model = "ti,c64x+";</div><div class='add'>+		};</div><div class='add'>+		cpu@2 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;2&gt;;</div><div class='add'>+			model = "ti,c64x+";</div><div class='add'>+		};</div><div class='add'>+		cpu@3 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;3&gt;;</div><div class='add'>+			model = "ti,c64x+";</div><div class='add'>+		};</div><div class='add'>+		cpu@4 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;4&gt;;</div><div class='add'>+			model = "ti,c64x+";</div><div class='add'>+		};</div><div class='add'>+		cpu@5 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;5&gt;;</div><div class='add'>+			model = "ti,c64x+";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		model = "tms320c6472";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		core_pic: interrupt-controller {</div><div class='add'>+			compatible = "ti,c64x+core-pic";</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		megamod_pic: interrupt-controller@1800000 {</div><div class='add'>+		       compatible = "ti,c64x+megamod-pic";</div><div class='add'>+		       interrupt-controller;</div><div class='add'>+		       #interrupt-cells = &lt;1&gt;;</div><div class='add'>+		       reg = &lt;0x1800000 0x1000&gt;;</div><div class='add'>+		       interrupt-parent = &lt;&amp;core_pic&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cache-controller@1840000 {</div><div class='add'>+			compatible = "ti,c64x+cache";</div><div class='add'>+			reg = &lt;0x01840000 0x8400&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer0: timer@25e0000 {</div><div class='add'>+			compatible = "ti,c64x+timer64";</div><div class='add'>+			ti,core-mask = &lt; 0x01 &gt;;</div><div class='add'>+			reg = &lt;0x25e0000 0x40&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer1: timer@25f0000 {</div><div class='add'>+			compatible = "ti,c64x+timer64";</div><div class='add'>+			ti,core-mask = &lt; 0x02 &gt;;</div><div class='add'>+			reg = &lt;0x25f0000 0x40&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer2: timer@2600000 {</div><div class='add'>+			compatible = "ti,c64x+timer64";</div><div class='add'>+			ti,core-mask = &lt; 0x04 &gt;;</div><div class='add'>+			reg = &lt;0x2600000 0x40&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer3: timer@2610000 {</div><div class='add'>+			compatible = "ti,c64x+timer64";</div><div class='add'>+			ti,core-mask = &lt; 0x08 &gt;;</div><div class='add'>+			reg = &lt;0x2610000 0x40&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer4: timer@2620000 {</div><div class='add'>+			compatible = "ti,c64x+timer64";</div><div class='add'>+			ti,core-mask = &lt; 0x10 &gt;;</div><div class='add'>+			reg = &lt;0x2620000 0x40&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer5: timer@2630000 {</div><div class='add'>+			compatible = "ti,c64x+timer64";</div><div class='add'>+			ti,core-mask = &lt; 0x20 &gt;;</div><div class='add'>+			reg = &lt;0x2630000 0x40&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		clock-controller@29a0000 {</div><div class='add'>+			compatible = "ti,c6472-pll", "ti,c64x+pll";</div><div class='add'>+			reg = &lt;0x029a0000 0x200&gt;;</div><div class='add'>+			ti,c64x+pll-bypass-delay = &lt;200&gt;;</div><div class='add'>+			ti,c64x+pll-reset-delay = &lt;12000&gt;;</div><div class='add'>+			ti,c64x+pll-lock-delay = &lt;80000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		device-state-controller@2a80000 {</div><div class='add'>+			compatible = "ti,c64x+dscr";</div><div class='add'>+			reg = &lt;0x02a80000 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+			ti,dscr-devstat = &lt;0&gt;;</div><div class='add'>+			ti,dscr-silicon-rev = &lt;0x70c 16 0xff&gt;;</div><div class='add'>+</div><div class='add'>+			ti,dscr-mac-fuse-regs = &lt;0x700 1 2 3 4</div><div class='add'>+						 0x704 5 6 0 0&gt;;</div><div class='add'>+</div><div class='add'>+			ti,dscr-rmii-resets = &lt;0x208 1</div><div class='add'>+					       0x20c 1&gt;;</div><div class='add'>+</div><div class='add'>+			ti,dscr-locked-regs = &lt;0x200 0x204 0x0a1e183a</div><div class='add'>+					       0x40c 0x420 0xbea7</div><div class='add'>+					       0x41c 0x420 0xbea7&gt;;</div><div class='add'>+</div><div class='add'>+			ti,dscr-privperm = &lt;0x41c 0xaaaaaaaa&gt;;</div><div class='add'>+</div><div class='add'>+			ti,dscr-devstate-ctl-regs = &lt;0 13 0x200 1 0 0 1&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/c6x/boot/dts/tms320c6474.dtsi b/arch/c6x/boot/dts/tms320c6474.dtsi<br/>new file mode 100644<br/>index 000000000000..cc601bf348a1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/boot/dts/tms320c6474.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/boot/dts/tms320c6474.dtsi</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+</div><div class='add'>+/ {</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'>+	cpus {</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'>+		cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			model = "ti,c64x+";</div><div class='add'>+		};</div><div class='add'>+		cpu@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			model = "ti,c64x+";</div><div class='add'>+		};</div><div class='add'>+		cpu@2 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;2&gt;;</div><div class='add'>+			model = "ti,c64x+";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	soc {</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		model = "tms320c6474";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		core_pic: interrupt-controller {</div><div class='add'>+			interrupt-controller;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "ti,c64x+core-pic";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		megamod_pic: interrupt-controller@1800000 {</div><div class='add'>+		       compatible = "ti,c64x+megamod-pic";</div><div class='add'>+		       interrupt-controller;</div><div class='add'>+		       #interrupt-cells = &lt;1&gt;;</div><div class='add'>+		       reg = &lt;0x1800000 0x1000&gt;;</div><div class='add'>+		       interrupt-parent = &lt;&amp;core_pic&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		cache-controller@1840000 {</div><div class='add'>+			compatible = "ti,c64x+cache";</div><div class='add'>+			reg = &lt;0x01840000 0x8400&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer3: timer@2940000 {</div><div class='add'>+			compatible = "ti,c64x+timer64";</div><div class='add'>+			ti,core-mask = &lt; 0x04 &gt;;</div><div class='add'>+			reg = &lt;0x2940000 0x40&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer4: timer@2950000 {</div><div class='add'>+			compatible = "ti,c64x+timer64";</div><div class='add'>+			ti,core-mask = &lt; 0x02 &gt;;</div><div class='add'>+			reg = &lt;0x2950000 0x40&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		timer5: timer@2960000 {</div><div class='add'>+			compatible = "ti,c64x+timer64";</div><div class='add'>+			ti,core-mask = &lt; 0x01 &gt;;</div><div class='add'>+			reg = &lt;0x2960000 0x40&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		device-state-controller@2880800 {</div><div class='add'>+			compatible = "ti,c64x+dscr";</div><div class='add'>+			reg = &lt;0x02880800 0x400&gt;;</div><div class='add'>+</div><div class='add'>+			ti,dscr-devstat = &lt;0x004&gt;;</div><div class='add'>+			ti,dscr-silicon-rev = &lt;0x014 28 0xf&gt;;</div><div class='add'>+			ti,dscr-mac-fuse-regs = &lt;0x34 3 4 5 6</div><div class='add'>+						 0x38 0 0 1 2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		clock-controller@29a0000 {</div><div class='add'>+			compatible = "ti,c6474-pll", "ti,c64x+pll";</div><div class='add'>+			reg = &lt;0x029a0000 0x200&gt;;</div><div class='add'>+			ti,c64x+pll-bypass-delay = &lt;120&gt;;</div><div class='add'>+			ti,c64x+pll-reset-delay = &lt;30000&gt;;</div><div class='add'>+			ti,c64x+pll-lock-delay = &lt;60000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/c6x/boot/linked_dtb.S b/arch/c6x/boot/linked_dtb.S<br/>new file mode 100644<br/>index 000000000000..57a4454eaec3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/boot/linked_dtb.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/boot/linked_dtb.S</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+.section __fdt_blob,"a"</div><div class='add'>+.incbin "arch/c6x/boot/builtin.dtb"</div><div class='head'>diff --git a/arch/c6x/configs/dsk6455_defconfig b/arch/c6x/configs/dsk6455_defconfig<br/>new file mode 100644<br/>index 000000000000..4663487c67a1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/configs/dsk6455_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/configs/dsk6455_defconfig</a></div><div class='hunk'>@@ -0,0 +1,44 @@</div><div class='add'>+CONFIG_SOC_TMS320C6455=y</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+# CONFIG_LOCALVERSION_AUTO is not set</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SPARSE_IRQ=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_PID_NS is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_EXPERT=y</div><div class='add'>+# CONFIG_FUTEX is not set</div><div class='add'>+# CONFIG_SLUB_DEBUG is not set</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_FORCE_LOAD=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='add'>+CONFIG_CMDLINE_BOOL=y</div><div class='add'>+CONFIG_CMDLINE=""</div><div class='add'>+CONFIG_NO_HZ=y</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=2</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=17000</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_INPUT is not set</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+# CONFIG_IOMMU_SUPPORT is not set</div><div class='add'>+# CONFIG_MISC_FILESYSTEMS is not set</div><div class='add'>+CONFIG_CRC16=y</div><div class='add'>+# CONFIG_ENABLE_MUST_CHECK is not set</div><div class='add'>+# CONFIG_SCHED_DEBUG is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+CONFIG_MTD_CFI_AMDSTD=y</div><div class='add'>+CONFIG_MTD_PHYSMAP_OF=y</div><div class='head'>diff --git a/arch/c6x/configs/evmc6457_defconfig b/arch/c6x/configs/evmc6457_defconfig<br/>new file mode 100644<br/>index 000000000000..bba40e195ec4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/configs/evmc6457_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/configs/evmc6457_defconfig</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+CONFIG_SOC_TMS320C6457=y</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+# CONFIG_LOCALVERSION_AUTO is not set</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SPARSE_IRQ=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_PID_NS is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_EXPERT=y</div><div class='add'>+# CONFIG_FUTEX is not set</div><div class='add'>+# CONFIG_SLUB_DEBUG is not set</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_FORCE_LOAD=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='add'>+CONFIG_CMDLINE_BOOL=y</div><div class='add'>+CONFIG_CMDLINE=""</div><div class='add'>+CONFIG_BOARD_EVM6457=y</div><div class='add'>+CONFIG_NO_HZ=y</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=2</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=17000</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_INPUT is not set</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+# CONFIG_IOMMU_SUPPORT is not set</div><div class='add'>+# CONFIG_MISC_FILESYSTEMS is not set</div><div class='add'>+CONFIG_CRC16=y</div><div class='add'>+# CONFIG_ENABLE_MUST_CHECK is not set</div><div class='add'>+# CONFIG_SCHED_DEBUG is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='head'>diff --git a/arch/c6x/configs/evmc6472_defconfig b/arch/c6x/configs/evmc6472_defconfig<br/>new file mode 100644<br/>index 000000000000..8c46155f6d31<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/configs/evmc6472_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/configs/evmc6472_defconfig</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+CONFIG_SOC_TMS320C6472=y</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+# CONFIG_LOCALVERSION_AUTO is not set</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SPARSE_IRQ=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_PID_NS is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_EXPERT=y</div><div class='add'>+# CONFIG_FUTEX is not set</div><div class='add'>+# CONFIG_SLUB_DEBUG is not set</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_FORCE_LOAD=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='add'>+CONFIG_CMDLINE_BOOL=y</div><div class='add'>+CONFIG_CMDLINE=""</div><div class='add'>+# CONFIG_CMDLINE_FORCE is not set</div><div class='add'>+CONFIG_BOARD_EVM6472=y</div><div class='add'>+CONFIG_NO_HZ=y</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=2</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=17000</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_INPUT is not set</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+# CONFIG_IOMMU_SUPPORT is not set</div><div class='add'>+# CONFIG_MISC_FILESYSTEMS is not set</div><div class='add'>+CONFIG_CRC16=y</div><div class='add'>+# CONFIG_ENABLE_MUST_CHECK is not set</div><div class='add'>+# CONFIG_SCHED_DEBUG is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='head'>diff --git a/arch/c6x/configs/evmc6474_defconfig b/arch/c6x/configs/evmc6474_defconfig<br/>new file mode 100644<br/>index 000000000000..15533f632313<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/configs/evmc6474_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/configs/evmc6474_defconfig</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+CONFIG_SOC_TMS320C6474=y</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+# CONFIG_LOCALVERSION_AUTO is not set</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SPARSE_IRQ=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+# CONFIG_UTS_NS is not set</div><div class='add'>+# CONFIG_USER_NS is not set</div><div class='add'>+# CONFIG_PID_NS is not set</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_EXPERT=y</div><div class='add'>+# CONFIG_FUTEX is not set</div><div class='add'>+# CONFIG_SLUB_DEBUG is not set</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_FORCE_LOAD=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='add'>+CONFIG_CMDLINE_BOOL=y</div><div class='add'>+CONFIG_CMDLINE=""</div><div class='add'>+# CONFIG_CMDLINE_FORCE is not set</div><div class='add'>+CONFIG_BOARD_EVM6474=y</div><div class='add'>+CONFIG_NO_HZ=y</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=2</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=17000</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+# CONFIG_INPUT is not set</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+# CONFIG_IOMMU_SUPPORT is not set</div><div class='add'>+# CONFIG_MISC_FILESYSTEMS is not set</div><div class='add'>+CONFIG_CRC16=y</div><div class='add'>+# CONFIG_ENABLE_MUST_CHECK is not set</div><div class='add'>+# CONFIG_SCHED_DEBUG is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='head'>diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild<br/>new file mode 100644<br/>index 000000000000..13dcf78adf91<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/Kbuild?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/Kbuild</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+include include/asm-generic/Kbuild.asm</div><div class='add'>+</div><div class='add'>+generic-y += atomic.h</div><div class='add'>+generic-y += auxvec.h</div><div class='add'>+generic-y += bitsperlong.h</div><div class='add'>+generic-y += bug.h</div><div class='add'>+generic-y += bugs.h</div><div class='add'>+generic-y += cputime.h</div><div class='add'>+generic-y += current.h</div><div class='add'>+generic-y += device.h</div><div class='add'>+generic-y += div64.h</div><div class='add'>+generic-y += dma.h</div><div class='add'>+generic-y += emergency-restart.h</div><div class='add'>+generic-y += errno.h</div><div class='add'>+generic-y += fb.h</div><div class='add'>+generic-y += fcntl.h</div><div class='add'>+generic-y += futex.h</div><div class='add'>+generic-y += hw_irq.h</div><div class='add'>+generic-y += io.h</div><div class='add'>+generic-y += ioctl.h</div><div class='add'>+generic-y += ioctls.h</div><div class='add'>+generic-y += ipcbuf.h</div><div class='add'>+generic-y += irq_regs.h</div><div class='add'>+generic-y += kdebug.h</div><div class='add'>+generic-y += kmap_types.h</div><div class='add'>+generic-y += local.h</div><div class='add'>+generic-y += mman.h</div><div class='add'>+generic-y += mmu_context.h</div><div class='add'>+generic-y += msgbuf.h</div><div class='add'>+generic-y += param.h</div><div class='add'>+generic-y += pci.h</div><div class='add'>+generic-y += percpu.h</div><div class='add'>+generic-y += pgalloc.h</div><div class='add'>+generic-y += poll.h</div><div class='add'>+generic-y += posix_types.h</div><div class='add'>+generic-y += resource.h</div><div class='add'>+generic-y += scatterlist.h</div><div class='add'>+generic-y += segment.h</div><div class='add'>+generic-y += sembuf.h</div><div class='add'>+generic-y += shmbuf.h</div><div class='add'>+generic-y += shmparam.h</div><div class='add'>+generic-y += siginfo.h</div><div class='add'>+generic-y += socket.h</div><div class='add'>+generic-y += sockios.h</div><div class='add'>+generic-y += stat.h</div><div class='add'>+generic-y += statfs.h</div><div class='add'>+generic-y += termbits.h</div><div class='add'>+generic-y += termios.h</div><div class='add'>+generic-y += tlbflush.h</div><div class='add'>+generic-y += topology.h</div><div class='add'>+generic-y += types.h</div><div class='add'>+generic-y += ucontext.h</div><div class='add'>+generic-y += user.h</div><div class='add'>+generic-y += vga.h</div><div class='head'>diff --git a/arch/c6x/include/asm/asm-offsets.h b/arch/c6x/include/asm/asm-offsets.h<br/>new file mode 100644<br/>index 000000000000..d370ee36a182<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/asm-offsets.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/asm-offsets.h</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+#include &lt;generated/asm-offsets.h&gt;</div><div class='head'>diff --git a/arch/c6x/include/asm/bitops.h b/arch/c6x/include/asm/bitops.h<br/>new file mode 100644<br/>index 000000000000..39ab7e874d96<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/bitops.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/bitops.h</a></div><div class='hunk'>@@ -0,0 +1,105 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_BITOPS_H</div><div class='add'>+#define _ASM_C6X_BITOPS_H</div><div class='add'>+</div><div class='add'>+#ifdef __KERNEL__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * clear_bit() doesn't provide any barrier for the compiler.</div><div class='add'>+ */</div><div class='add'>+#define smp_mb__before_clear_bit() barrier()</div><div class='add'>+#define smp_mb__after_clear_bit()  barrier()</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We are lucky, DSP is perfect for bitops: do it in 3 cycles</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __ffs - find first bit in word.</div><div class='add'>+ * @word: The word to search</div><div class='add'>+ *</div><div class='add'>+ * Undefined if no bit exists, so code should check against 0 first.</div><div class='add'>+ * Note __ffs(0) = undef, __ffs(1) = 0, __ffs(0x80000000) = 31.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long __ffs(unsigned long x)</div><div class='add'>+{</div><div class='add'>+	asm (" bitr  .M1  %0,%0\n"</div><div class='add'>+	     " nop\n"</div><div class='add'>+	     " lmbd  .L1  1,%0,%0\n"</div><div class='add'>+	     : "+a"(x));</div><div class='add'>+</div><div class='add'>+	return x;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ffz - find first zero in word.</div><div class='add'>+ * @word: The word to search</div><div class='add'>+ *</div><div class='add'>+ * Undefined if no zero exists, so code should check against ~0UL first.</div><div class='add'>+ */</div><div class='add'>+#define ffz(x) __ffs(~(x))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fls - find last (most-significant) bit set</div><div class='add'>+ * @x: the word to search</div><div class='add'>+ *</div><div class='add'>+ * This is defined the same way as ffs.</div><div class='add'>+ * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.</div><div class='add'>+ */</div><div class='add'>+static inline int fls(int x)</div><div class='add'>+{</div><div class='add'>+	if (!x)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	asm (" lmbd  .L1  1,%0,%0\n" : "+a"(x));</div><div class='add'>+</div><div class='add'>+	return 32 - x;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ffs - find first bit set</div><div class='add'>+ * @x: the word to search</div><div class='add'>+ *</div><div class='add'>+ * This is defined the same way as</div><div class='add'>+ * the libc and compiler builtin ffs routines, therefore</div><div class='add'>+ * differs in spirit from the above ffz (man ffs).</div><div class='add'>+ * Note ffs(0) = 0, ffs(1) = 1, ffs(0x80000000) = 32.</div><div class='add'>+ */</div><div class='add'>+static inline int ffs(int x)</div><div class='add'>+{</div><div class='add'>+	if (!x)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __ffs(x) + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/bitops/__fls.h&gt;</div><div class='add'>+#include &lt;asm-generic/bitops/fls64.h&gt;</div><div class='add'>+#include &lt;asm-generic/bitops/find.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/bitops/sched.h&gt;</div><div class='add'>+#include &lt;asm-generic/bitops/hweight.h&gt;</div><div class='add'>+#include &lt;asm-generic/bitops/lock.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/bitops/atomic.h&gt;</div><div class='add'>+#include &lt;asm-generic/bitops/non-atomic.h&gt;</div><div class='add'>+#include &lt;asm-generic/bitops/le.h&gt;</div><div class='add'>+#include &lt;asm-generic/bitops/ext2-atomic.h&gt;</div><div class='add'>+</div><div class='add'>+#endif /* __KERNEL__ */</div><div class='add'>+#endif /* _ASM_C6X_BITOPS_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/byteorder.h b/arch/c6x/include/asm/byteorder.h<br/>new file mode 100644<br/>index 000000000000..166038db342b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/byteorder.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/byteorder.h</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+#ifndef _ASM_C6X_BYTEORDER_H</div><div class='add'>+#define _ASM_C6X_BYTEORDER_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/types.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef _BIG_ENDIAN</div><div class='add'>+#include &lt;linux/byteorder/big_endian.h&gt;</div><div class='add'>+#else /* _BIG_ENDIAN */</div><div class='add'>+#include &lt;linux/byteorder/little_endian.h&gt;</div><div class='add'>+#endif /* _BIG_ENDIAN */</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_BYTEORDER_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/cache.h b/arch/c6x/include/asm/cache.h<br/>new file mode 100644<br/>index 000000000000..6d521d96d941<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/cache.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/cache.h</a></div><div class='hunk'>@@ -0,0 +1,90 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005, 2006, 2009, 2010 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_CACHE_H</div><div class='add'>+#define _ASM_C6X_CACHE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/irqflags.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Cache line size</div><div class='add'>+ */</div><div class='add'>+#define L1D_CACHE_BYTES   64</div><div class='add'>+#define L1P_CACHE_BYTES   32</div><div class='add'>+#define L2_CACHE_BYTES	  128</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * L2 used as cache</div><div class='add'>+ */</div><div class='add'>+#define L2MODE_SIZE	  L2MODE_256K_CACHE</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For practical reasons the L1_CACHE_BYTES defines should not be smaller than</div><div class='add'>+ * the L2 line size</div><div class='add'>+ */</div><div class='add'>+#define L1_CACHE_BYTES        L2_CACHE_BYTES</div><div class='add'>+</div><div class='add'>+#define L2_CACHE_ALIGN_LOW(x) \</div><div class='add'>+	(((x) &amp; ~(L2_CACHE_BYTES - 1)))</div><div class='add'>+#define L2_CACHE_ALIGN_UP(x) \</div><div class='add'>+	(((x) + (L2_CACHE_BYTES - 1)) &amp; ~(L2_CACHE_BYTES - 1))</div><div class='add'>+#define L2_CACHE_ALIGN_CNT(x) \</div><div class='add'>+	(((x) + (sizeof(int) - 1)) &amp; ~(sizeof(int) - 1))</div><div class='add'>+</div><div class='add'>+#define ARCH_DMA_MINALIGN	L1_CACHE_BYTES</div><div class='add'>+#define ARCH_SLAB_MINALIGN	L1_CACHE_BYTES</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is the granularity of hardware cacheability control.</div><div class='add'>+ */</div><div class='add'>+#define CACHEABILITY_ALIGN	0x01000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Align a physical address to MAR regions</div><div class='add'>+ */</div><div class='add'>+#define CACHE_REGION_START(v) \</div><div class='add'>+	(((u32) (v)) &amp; ~(CACHEABILITY_ALIGN - 1))</div><div class='add'>+#define CACHE_REGION_END(v) \</div><div class='add'>+	(((u32) (v) + (CACHEABILITY_ALIGN - 1)) &amp; ~(CACHEABILITY_ALIGN - 1))</div><div class='add'>+</div><div class='add'>+extern void __init c6x_cache_init(void);</div><div class='add'>+</div><div class='add'>+extern void enable_caching(unsigned long start, unsigned long end);</div><div class='add'>+extern void disable_caching(unsigned long start, unsigned long end);</div><div class='add'>+</div><div class='add'>+extern void L1_cache_off(void);</div><div class='add'>+extern void L1_cache_on(void);</div><div class='add'>+</div><div class='add'>+extern void L1P_cache_global_invalidate(void);</div><div class='add'>+extern void L1D_cache_global_invalidate(void);</div><div class='add'>+extern void L1D_cache_global_writeback(void);</div><div class='add'>+extern void L1D_cache_global_writeback_invalidate(void);</div><div class='add'>+extern void L2_cache_set_mode(unsigned int mode);</div><div class='add'>+extern void L2_cache_global_writeback_invalidate(void);</div><div class='add'>+extern void L2_cache_global_writeback(void);</div><div class='add'>+</div><div class='add'>+extern void L1P_cache_block_invalidate(unsigned int start, unsigned int end);</div><div class='add'>+extern void L1D_cache_block_invalidate(unsigned int start, unsigned int end);</div><div class='add'>+extern void L1D_cache_block_writeback_invalidate(unsigned int start,</div><div class='add'>+						 unsigned int end);</div><div class='add'>+extern void L1D_cache_block_writeback(unsigned int start, unsigned int end);</div><div class='add'>+extern void L2_cache_block_invalidate(unsigned int start, unsigned int end);</div><div class='add'>+extern void L2_cache_block_writeback(unsigned int start, unsigned int end);</div><div class='add'>+extern void L2_cache_block_writeback_invalidate(unsigned int start,</div><div class='add'>+						unsigned int end);</div><div class='add'>+extern void L2_cache_block_invalidate_nowait(unsigned int start,</div><div class='add'>+					     unsigned int end);</div><div class='add'>+extern void L2_cache_block_writeback_nowait(unsigned int start,</div><div class='add'>+					    unsigned int end);</div><div class='add'>+</div><div class='add'>+extern void L2_cache_block_writeback_invalidate_nowait(unsigned int start,</div><div class='add'>+						       unsigned int end);</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_CACHE_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/cacheflush.h b/arch/c6x/include/asm/cacheflush.h<br/>new file mode 100644<br/>index 000000000000..df5db90dbe56<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/cacheflush.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/cacheflush.h</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_CACHEFLUSH_H</div><div class='add'>+#define _ASM_C6X_CACHEFLUSH_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/cache.h&gt;</div><div class='add'>+#include &lt;asm/mman.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/string.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * virtually-indexed cache management (our cache is physically indexed)</div><div class='add'>+ */</div><div class='add'>+#define flush_cache_all()			do {} while (0)</div><div class='add'>+#define flush_cache_mm(mm)			do {} while (0)</div><div class='add'>+#define flush_cache_dup_mm(mm)			do {} while (0)</div><div class='add'>+#define flush_cache_range(mm, start, end)	do {} while (0)</div><div class='add'>+#define flush_cache_page(vma, vmaddr, pfn)	do {} while (0)</div><div class='add'>+#define flush_cache_vmap(start, end)		do {} while (0)</div><div class='add'>+#define flush_cache_vunmap(start, end)		do {} while (0)</div><div class='add'>+#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0</div><div class='add'>+#define flush_dcache_page(page)			do {} while (0)</div><div class='add'>+#define flush_dcache_mmap_lock(mapping)		do {} while (0)</div><div class='add'>+#define flush_dcache_mmap_unlock(mapping)	do {} while (0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * physically-indexed cache management</div><div class='add'>+ */</div><div class='add'>+#define flush_icache_range(s, e)				  \</div><div class='add'>+do {								  \</div><div class='add'>+		L1D_cache_block_writeback((s), (e));		  \</div><div class='add'>+		L1P_cache_block_invalidate((s), (e));		  \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define flush_icache_page(vma, page)					  \</div><div class='add'>+do {								  \</div><div class='add'>+	if ((vma)-&gt;vm_flags &amp; PROT_EXEC)				  \</div><div class='add'>+		L1D_cache_block_writeback_invalidate(page_address(page),  \</div><div class='add'>+			(unsigned long) page_address(page) + PAGE_SIZE)); \</div><div class='add'>+		L1P_cache_block_invalidate(page_address(page),		  \</div><div class='add'>+			(unsigned long) page_address(page) + PAGE_SIZE)); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define copy_to_user_page(vma, page, vaddr, dst, src, len) \</div><div class='add'>+do {						     \</div><div class='add'>+	memcpy(dst, src, len);			     \</div><div class='add'>+	flush_icache_range((unsigned) (dst), (unsigned) (dst) + (len)); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define copy_from_user_page(vma, page, vaddr, dst, src, len) \</div><div class='add'>+	memcpy(dst, src, len)</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_CACHEFLUSH_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/checksum.h b/arch/c6x/include/asm/checksum.h<br/>new file mode 100644<br/>index 000000000000..7246816d6e4d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/checksum.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/checksum.h</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_CHECKSUM_H</div><div class='add'>+#define _ASM_C6X_CHECKSUM_H</div><div class='add'>+</div><div class='add'>+static inline __wsum</div><div class='add'>+csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,</div><div class='add'>+		   unsigned short proto, __wsum sum)</div><div class='add'>+{</div><div class='add'>+	unsigned long long tmp;</div><div class='add'>+</div><div class='add'>+	asm ("add     .d1   %1,%5,%1\n"</div><div class='add'>+	     "|| addu .l1   %3,%4,%0\n"</div><div class='add'>+	     "addu    .l1   %2,%0,%0\n"</div><div class='add'>+#ifndef CONFIG_CPU_BIG_ENDIAN</div><div class='add'>+	     "|| shl  .s1   %1,8,%1\n"</div><div class='add'>+#endif</div><div class='add'>+	     "addu    .l1   %1,%0,%0\n"</div><div class='add'>+	     "add     .l1   %P0,%p0,%2\n"</div><div class='add'>+	     : "=&amp;a"(tmp), "+a"(len), "+a"(sum)</div><div class='add'>+	     : "a" (saddr), "a" (daddr), "a" (proto));</div><div class='add'>+	return sum;</div><div class='add'>+}</div><div class='add'>+#define csum_tcpudp_nofold csum_tcpudp_nofold</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/checksum.h&gt;</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_CHECKSUM_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/clkdev.h b/arch/c6x/include/asm/clkdev.h<br/>new file mode 100644<br/>index 000000000000..76a070b1c2e5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/clkdev.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/clkdev.h</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+#ifndef _ASM_CLKDEV_H</div><div class='add'>+#define _ASM_CLKDEV_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+struct clk;</div><div class='add'>+</div><div class='add'>+static inline int __clk_get(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __clk_put(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size)</div><div class='add'>+{</div><div class='add'>+	return kzalloc(size, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_CLKDEV_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/clock.h b/arch/c6x/include/asm/clock.h<br/>new file mode 100644<br/>index 000000000000..bcf42b2b4b1e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/clock.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/clock.h</a></div><div class='hunk'>@@ -0,0 +1,148 @@</div><div class='add'>+/*</div><div class='add'>+ * TI C64X clock definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2010, 2011 Texas Instruments.</div><div class='add'>+ * Contributed by: Mark Salter &lt;msalter@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copied heavily from arm/mach-davinci/clock.h, so:</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006-2007 Texas Instruments.</div><div class='add'>+ * Copyright (C) 2008-2009 Deep Root Systems, LLC</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ASM_C6X_CLOCK_H</div><div class='add'>+#define _ASM_C6X_CLOCK_H</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLER__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+</div><div class='add'>+/* PLL/Reset register offsets */</div><div class='add'>+#define PLLCTL		0x100</div><div class='add'>+#define PLLM		0x110</div><div class='add'>+#define PLLPRE		0x114</div><div class='add'>+#define PLLDIV1		0x118</div><div class='add'>+#define PLLDIV2		0x11c</div><div class='add'>+#define PLLDIV3		0x120</div><div class='add'>+#define PLLPOST		0x128</div><div class='add'>+#define PLLCMD		0x138</div><div class='add'>+#define PLLSTAT		0x13c</div><div class='add'>+#define PLLALNCTL	0x140</div><div class='add'>+#define PLLDCHANGE	0x144</div><div class='add'>+#define PLLCKEN		0x148</div><div class='add'>+#define PLLCKSTAT	0x14c</div><div class='add'>+#define PLLSYSTAT	0x150</div><div class='add'>+#define PLLDIV4		0x160</div><div class='add'>+#define PLLDIV5		0x164</div><div class='add'>+#define PLLDIV6		0x168</div><div class='add'>+#define PLLDIV7		0x16c</div><div class='add'>+#define PLLDIV8		0x170</div><div class='add'>+#define PLLDIV9		0x174</div><div class='add'>+#define PLLDIV10	0x178</div><div class='add'>+#define PLLDIV11	0x17c</div><div class='add'>+#define PLLDIV12	0x180</div><div class='add'>+#define PLLDIV13	0x184</div><div class='add'>+#define PLLDIV14	0x188</div><div class='add'>+#define PLLDIV15	0x18c</div><div class='add'>+#define PLLDIV16	0x190</div><div class='add'>+</div><div class='add'>+/* PLLM register bits */</div><div class='add'>+#define PLLM_PLLM_MASK	0xff</div><div class='add'>+#define PLLM_VAL(x)	((x) - 1)</div><div class='add'>+</div><div class='add'>+/* PREDIV register bits */</div><div class='add'>+#define PLLPREDIV_EN	BIT(15)</div><div class='add'>+#define PLLPREDIV_VAL(x) ((x) - 1)</div><div class='add'>+</div><div class='add'>+/* PLLCTL register bits */</div><div class='add'>+#define PLLCTL_PLLEN	BIT(0)</div><div class='add'>+#define PLLCTL_PLLPWRDN	BIT(1)</div><div class='add'>+#define PLLCTL_PLLRST	BIT(3)</div><div class='add'>+#define PLLCTL_PLLDIS	BIT(4)</div><div class='add'>+#define PLLCTL_PLLENSRC	BIT(5)</div><div class='add'>+#define PLLCTL_CLKMODE	BIT(8)</div><div class='add'>+</div><div class='add'>+/* PLLCMD register bits */</div><div class='add'>+#define PLLCMD_GOSTAT	BIT(0)</div><div class='add'>+</div><div class='add'>+/* PLLSTAT register bits */</div><div class='add'>+#define PLLSTAT_GOSTAT	BIT(0)</div><div class='add'>+</div><div class='add'>+/* PLLDIV register bits */</div><div class='add'>+#define PLLDIV_EN	BIT(15)</div><div class='add'>+#define PLLDIV_RATIO_MASK 0x1f</div><div class='add'>+#define PLLDIV_RATIO(x) ((x) - 1)</div><div class='add'>+</div><div class='add'>+struct pll_data;</div><div class='add'>+</div><div class='add'>+struct clk {</div><div class='add'>+	struct list_head	node;</div><div class='add'>+	struct module		*owner;</div><div class='add'>+	const char		*name;</div><div class='add'>+	unsigned long		rate;</div><div class='add'>+	int			usecount;</div><div class='add'>+	u32			flags;</div><div class='add'>+	struct clk		*parent;</div><div class='add'>+	struct list_head	children;	/* list of children */</div><div class='add'>+	struct list_head	childnode;	/* parent's child list node */</div><div class='add'>+	struct pll_data		*pll_data;</div><div class='add'>+	u32			div;</div><div class='add'>+	unsigned long (*recalc) (struct clk *);</div><div class='add'>+	int (*set_rate) (struct clk *clk, unsigned long rate);</div><div class='add'>+	int (*round_rate) (struct clk *clk, unsigned long rate);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Clock flags: SoC-specific flags start at BIT(16) */</div><div class='add'>+#define ALWAYS_ENABLED		BIT(1)</div><div class='add'>+#define CLK_PLL			BIT(2) /* PLL-derived clock */</div><div class='add'>+#define PRE_PLL			BIT(3) /* source is before PLL mult/div */</div><div class='add'>+#define FIXED_DIV_PLL		BIT(4) /* fixed divisor from PLL */</div><div class='add'>+#define FIXED_RATE_PLL		BIT(5) /* fixed ouput rate PLL */</div><div class='add'>+</div><div class='add'>+#define MAX_PLL_SYSCLKS 16</div><div class='add'>+</div><div class='add'>+struct pll_data {</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	u32 num;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 input_rate;</div><div class='add'>+	u32 bypass_delay; /* in loops */</div><div class='add'>+	u32 reset_delay;  /* in loops */</div><div class='add'>+	u32 lock_delay;   /* in loops */</div><div class='add'>+	struct clk sysclks[MAX_PLL_SYSCLKS + 1];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* pll_data flag bit */</div><div class='add'>+#define PLL_HAS_PRE	BIT(0)</div><div class='add'>+#define PLL_HAS_MUL	BIT(1)</div><div class='add'>+#define PLL_HAS_POST	BIT(2)</div><div class='add'>+</div><div class='add'>+#define CLK(dev, con, ck)	\</div><div class='add'>+	{			\</div><div class='add'>+		.dev_id = dev,	\</div><div class='add'>+		.con_id = con,	\</div><div class='add'>+		.clk = ck,	\</div><div class='add'>+	}			\</div><div class='add'>+</div><div class='add'>+extern void c6x_clks_init(struct clk_lookup *clocks);</div><div class='add'>+extern int clk_register(struct clk *clk);</div><div class='add'>+extern void clk_unregister(struct clk *clk);</div><div class='add'>+extern void c64x_setup_clocks(void);</div><div class='add'>+</div><div class='add'>+extern struct pll_data c6x_soc_pll1;</div><div class='add'>+</div><div class='add'>+extern struct clk clkin1;</div><div class='add'>+extern struct clk c6x_core_clk;</div><div class='add'>+extern struct clk c6x_i2c_clk;</div><div class='add'>+extern struct clk c6x_watchdog_clk;</div><div class='add'>+extern struct clk c6x_mcbsp1_clk;</div><div class='add'>+extern struct clk c6x_mcbsp2_clk;</div><div class='add'>+extern struct clk c6x_mdio_clk;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_CLOCK_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/delay.h b/arch/c6x/include/asm/delay.h<br/>new file mode 100644<br/>index 000000000000..f314c2e9eb54<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/delay.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/delay.h</a></div><div class='hunk'>@@ -0,0 +1,67 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_DELAY_H</div><div class='add'>+#define _ASM_C6X_DELAY_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+extern unsigned int ticks_per_ns_scaled;</div><div class='add'>+</div><div class='add'>+static inline void __delay(unsigned long loops)</div><div class='add'>+{</div><div class='add'>+	uint32_t tmp;</div><div class='add'>+</div><div class='add'>+	/* 6 cycles per loop */</div><div class='add'>+	asm volatile ("        mv    .s1  %0,%1\n"</div><div class='add'>+		      "0: [%1] b     .s1  0b\n"</div><div class='add'>+		      "        add   .l1  -6,%0,%0\n"</div><div class='add'>+		      "        cmplt .l1  1,%0,%1\n"</div><div class='add'>+		      "        nop   3\n"</div><div class='add'>+		      : "+a"(loops), "=A"(tmp));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void _c6x_tickdelay(unsigned int x)</div><div class='add'>+{</div><div class='add'>+	uint32_t cnt, endcnt;</div><div class='add'>+</div><div class='add'>+	asm volatile ("        mvc   .s2   TSCL,%0\n"</div><div class='add'>+		      "        add   .s2x  %0,%1,%2\n"</div><div class='add'>+		      " ||     mvk   .l2   1,B0\n"</div><div class='add'>+		      "0: [B0] b     .s2   0b\n"</div><div class='add'>+		      "        mvc   .s2   TSCL,%0\n"</div><div class='add'>+		      "        sub   .s2   %0,%2,%0\n"</div><div class='add'>+		      "        cmpgt .l2   0,%0,B0\n"</div><div class='add'>+		      "        nop   2\n"</div><div class='add'>+		      : "=b"(cnt), "+a"(x), "=b"(endcnt) : : "B0");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* use scaled math to avoid slow division */</div><div class='add'>+#define C6X_NDELAY_SCALE 10</div><div class='add'>+</div><div class='add'>+static inline void _ndelay(unsigned int n)</div><div class='add'>+{</div><div class='add'>+	_c6x_tickdelay((ticks_per_ns_scaled * n) &gt;&gt; C6X_NDELAY_SCALE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void _udelay(unsigned int n)</div><div class='add'>+{</div><div class='add'>+	while (n &gt;= 10) {</div><div class='add'>+		_ndelay(10000);</div><div class='add'>+		n -= 10;</div><div class='add'>+	}</div><div class='add'>+	while (n-- &gt; 0)</div><div class='add'>+		_ndelay(1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define udelay(x) _udelay((unsigned int)(x))</div><div class='add'>+#define ndelay(x) _ndelay((unsigned int)(x))</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_DELAY_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/dma-mapping.h b/arch/c6x/include/asm/dma-mapping.h<br/>new file mode 100644<br/>index 000000000000..03579fd99dba<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/dma-mapping.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/dma-mapping.h</a></div><div class='hunk'>@@ -0,0 +1,91 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot &lt;aurelien.jacquiot@ti.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_DMA_MAPPING_H</div><div class='add'>+#define _ASM_C6X_DMA_MAPPING_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-debug.h&gt;</div><div class='add'>+#include &lt;asm-generic/dma-coherent.h&gt;</div><div class='add'>+</div><div class='add'>+#define dma_supported(d, m)	1</div><div class='add'>+</div><div class='add'>+static inline int dma_set_mask(struct device *dev, u64 dma_mask)</div><div class='add'>+{</div><div class='add'>+	if (!dev-&gt;dma_mask || !dma_supported(dev, dma_mask))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	*dev-&gt;dma_mask = dma_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'>+ * DMA errors are defined by all-bits-set in the DMA address.</div><div class='add'>+ */</div><div class='add'>+static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)</div><div class='add'>+{</div><div class='add'>+	return dma_addr == ~0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern dma_addr_t dma_map_single(struct device *dev, void *cpu_addr,</div><div class='add'>+				 size_t size, enum dma_data_direction dir);</div><div class='add'>+</div><div class='add'>+extern void dma_unmap_single(struct device *dev, dma_addr_t handle,</div><div class='add'>+			     size_t size, enum dma_data_direction dir);</div><div class='add'>+</div><div class='add'>+extern int dma_map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='add'>+		      int nents, enum dma_data_direction direction);</div><div class='add'>+</div><div class='add'>+extern void dma_unmap_sg(struct device *dev, struct scatterlist *sglist,</div><div class='add'>+			 int nents, enum dma_data_direction direction);</div><div class='add'>+</div><div class='add'>+static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,</div><div class='add'>+				      unsigned long offset, size_t size,</div><div class='add'>+				      enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t handle;</div><div class='add'>+</div><div class='add'>+	handle = dma_map_single(dev, page_address(page) + offset, size, dir);</div><div class='add'>+</div><div class='add'>+	debug_dma_map_page(dev, page, offset, size, dir, handle, false);</div><div class='add'>+</div><div class='add'>+	return handle;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dma_unmap_page(struct device *dev, dma_addr_t handle,</div><div class='add'>+		size_t size, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	dma_unmap_single(dev, handle, size, dir);</div><div class='add'>+</div><div class='add'>+	debug_dma_unmap_page(dev, handle, size, dir, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern void dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle,</div><div class='add'>+				    size_t size, enum dma_data_direction dir);</div><div class='add'>+</div><div class='add'>+extern void dma_sync_single_for_device(struct device *dev, dma_addr_t handle,</div><div class='add'>+				       size_t size,</div><div class='add'>+				       enum dma_data_direction dir);</div><div class='add'>+</div><div class='add'>+extern void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,</div><div class='add'>+				int nents, enum dma_data_direction dir);</div><div class='add'>+</div><div class='add'>+extern void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,</div><div class='add'>+				   int nents, enum dma_data_direction dir);</div><div class='add'>+</div><div class='add'>+extern void coherent_mem_init(u32 start, u32 size);</div><div class='add'>+extern void *dma_alloc_coherent(struct device *, size_t, dma_addr_t *, gfp_t);</div><div class='add'>+extern void dma_free_coherent(struct device *, size_t, void *, dma_addr_t);</div><div class='add'>+</div><div class='add'>+#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent((d), (s), (h), (f))</div><div class='add'>+#define dma_free_noncoherent(d, s, v, h)  dma_free_coherent((d), (s), (v), (h))</div><div class='add'>+</div><div class='add'>+#endif	/* _ASM_C6X_DMA_MAPPING_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/dscr.h b/arch/c6x/include/asm/dscr.h<br/>new file mode 100644<br/>index 000000000000..561ba8332042<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/dscr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/dscr.h</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_DSCR_H</div><div class='add'>+#define _ASM_C6X_DSCR_H</div><div class='add'>+</div><div class='add'>+enum dscr_devstate_t {</div><div class='add'>+	DSCR_DEVSTATE_ENABLED,</div><div class='add'>+	DSCR_DEVSTATE_DISABLED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set the device state of the device with the given ID.</div><div class='add'>+ *</div><div class='add'>+ * Individual drivers should use this to enable or disable the</div><div class='add'>+ * hardware device. The devid used to identify the device being</div><div class='add'>+ * controlled should be a property in the device's tree node.</div><div class='add'>+ */</div><div class='add'>+extern void dscr_set_devstate(int devid, enum dscr_devstate_t state);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Assert or de-assert an RMII reset.</div><div class='add'>+ */</div><div class='add'>+extern void dscr_rmii_reset(int id, int assert);</div><div class='add'>+</div><div class='add'>+extern void dscr_probe(void);</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_DSCR_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/elf.h b/arch/c6x/include/asm/elf.h<br/>new file mode 100644<br/>index 000000000000..d57865ba2c44<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/elf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/elf.h</a></div><div class='hunk'>@@ -0,0 +1,113 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_ELF_H</div><div class='add'>+#define _ASM_C6X_ELF_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ELF register definitions..</div><div class='add'>+ */</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+</div><div class='add'>+typedef unsigned long elf_greg_t;</div><div class='add'>+typedef unsigned long elf_fpreg_t;</div><div class='add'>+</div><div class='add'>+#define ELF_NGREG  58</div><div class='add'>+#define ELF_NFPREG 1</div><div class='add'>+</div><div class='add'>+typedef elf_greg_t elf_gregset_t[ELF_NGREG];</div><div class='add'>+typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is used to ensure we don't load something for the wrong architecture.</div><div class='add'>+ */</div><div class='add'>+#define elf_check_arch(x) ((x)-&gt;e_machine == EM_TI_C6000)</div><div class='add'>+</div><div class='add'>+#define elf_check_const_displacement(x) (1)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These are used to set parameters in the core dumps.</div><div class='add'>+ */</div><div class='add'>+#ifdef __LITTLE_ENDIAN__</div><div class='add'>+#define ELF_DATA	ELFDATA2LSB</div><div class='add'>+#else</div><div class='add'>+#define ELF_DATA	ELFDATA2MSB</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define ELF_CLASS	ELFCLASS32</div><div class='add'>+#define ELF_ARCH	EM_TI_C6000</div><div class='add'>+</div><div class='add'>+/* Nothing for now. Need to setup DP... */</div><div class='add'>+#define ELF_PLAT_INIT(_r)</div><div class='add'>+</div><div class='add'>+#define USE_ELF_CORE_DUMP</div><div class='add'>+#define ELF_EXEC_PAGESIZE	4096</div><div class='add'>+</div><div class='add'>+#define ELF_CORE_COPY_REGS(_dest, _regs)		\</div><div class='add'>+	memcpy((char *) &amp;_dest, (char *) _regs,		\</div><div class='add'>+	sizeof(struct pt_regs));</div><div class='add'>+</div><div class='add'>+/* This yields a mask that user programs can use to figure out what</div><div class='add'>+   instruction set this cpu supports.  */</div><div class='add'>+</div><div class='add'>+#define ELF_HWCAP	(0)</div><div class='add'>+</div><div class='add'>+/* This yields a string that ld.so will use to load implementation</div><div class='add'>+   specific libraries for optimization.  This is more specific in</div><div class='add'>+   intent than poking at uname or /proc/cpuinfo.  */</div><div class='add'>+</div><div class='add'>+#define ELF_PLATFORM  (NULL)</div><div class='add'>+</div><div class='add'>+#define SET_PERSONALITY(ex) set_personality(PER_LINUX)</div><div class='add'>+</div><div class='add'>+/* C6X specific section types */</div><div class='add'>+#define SHT_C6000_UNWIND	0x70000001</div><div class='add'>+#define SHT_C6000_PREEMPTMAP	0x70000002</div><div class='add'>+#define SHT_C6000_ATTRIBUTES	0x70000003</div><div class='add'>+</div><div class='add'>+/* C6X specific DT_ tags */</div><div class='add'>+#define DT_C6000_DSBT_BASE	0x70000000</div><div class='add'>+#define DT_C6000_DSBT_SIZE	0x70000001</div><div class='add'>+#define DT_C6000_PREEMPTMAP	0x70000002</div><div class='add'>+#define DT_C6000_DSBT_INDEX	0x70000003</div><div class='add'>+</div><div class='add'>+/* C6X specific relocs */</div><div class='add'>+#define R_C6000_NONE		0</div><div class='add'>+#define R_C6000_ABS32		1</div><div class='add'>+#define R_C6000_ABS16		2</div><div class='add'>+#define R_C6000_ABS8		3</div><div class='add'>+#define R_C6000_PCR_S21		4</div><div class='add'>+#define R_C6000_PCR_S12		5</div><div class='add'>+#define R_C6000_PCR_S10		6</div><div class='add'>+#define R_C6000_PCR_S7		7</div><div class='add'>+#define R_C6000_ABS_S16		8</div><div class='add'>+#define R_C6000_ABS_L16		9</div><div class='add'>+#define R_C6000_ABS_H16		10</div><div class='add'>+#define R_C6000_SBR_U15_B	11</div><div class='add'>+#define R_C6000_SBR_U15_H	12</div><div class='add'>+#define R_C6000_SBR_U15_W	13</div><div class='add'>+#define R_C6000_SBR_S16		14</div><div class='add'>+#define R_C6000_SBR_L16_B	15</div><div class='add'>+#define R_C6000_SBR_L16_H	16</div><div class='add'>+#define R_C6000_SBR_L16_W	17</div><div class='add'>+#define R_C6000_SBR_H16_B	18</div><div class='add'>+#define R_C6000_SBR_H16_H	19</div><div class='add'>+#define R_C6000_SBR_H16_W	20</div><div class='add'>+#define R_C6000_SBR_GOT_U15_W	21</div><div class='add'>+#define R_C6000_SBR_GOT_L16_W	22</div><div class='add'>+#define R_C6000_SBR_GOT_H16_W	23</div><div class='add'>+#define R_C6000_DSBT_INDEX	24</div><div class='add'>+#define R_C6000_PREL31		25</div><div class='add'>+#define R_C6000_COPY		26</div><div class='add'>+#define R_C6000_ALIGN		253</div><div class='add'>+#define R_C6000_FPHEAD		254</div><div class='add'>+#define R_C6000_NOCMP		255</div><div class='add'>+</div><div class='add'>+#endif /*_ASM_C6X_ELF_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/ftrace.h b/arch/c6x/include/asm/ftrace.h<br/>new file mode 100644<br/>index 000000000000..3701958d3d1c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/ftrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/ftrace.h</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+#ifndef _ASM_C6X_FTRACE_H</div><div class='add'>+#define _ASM_C6X_FTRACE_H</div><div class='add'>+</div><div class='add'>+/* empty */</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_FTRACE_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/hardirq.h b/arch/c6x/include/asm/hardirq.h<br/>new file mode 100644<br/>index 000000000000..9621954f98f4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/hardirq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/hardirq.h</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ASM_C6X_HARDIRQ_H</div><div class='add'>+#define _ASM_C6X_HARDIRQ_H</div><div class='add'>+</div><div class='add'>+extern void ack_bad_irq(int irq);</div><div class='add'>+#define ack_bad_irq ack_bad_irq</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/hardirq.h&gt;</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_HARDIRQ_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/irq.h b/arch/c6x/include/asm/irq.h<br/>new file mode 100644<br/>index 000000000000..a6ae3c9d9c40<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/irq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/irq.h</a></div><div class='hunk'>@@ -0,0 +1,302 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2006, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</div><div class='add'>+ *</div><div class='add'>+ *  Large parts taken directly from powerpc.</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_IRQ_H</div><div class='add'>+#define _ASM_C6X_IRQ_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/threads.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/radix-tree.h&gt;</div><div class='add'>+#include &lt;asm/percpu.h&gt;</div><div class='add'>+</div><div class='add'>+#define irq_canonicalize(irq)  (irq)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The C64X+ core has 16 IRQ vectors. One each is used by Reset and NMI. Two</div><div class='add'>+ * are reserved. The remaining 12 vectors are used to route SoC interrupts.</div><div class='add'>+ * These interrupt vectors are prioritized with IRQ 4 having the highest</div><div class='add'>+ * priority and IRQ 15 having the lowest.</div><div class='add'>+ *</div><div class='add'>+ * The C64x+ megamodule provides a PIC which combines SoC IRQ sources into a</div><div class='add'>+ * single core IRQ vector. There are four combined sources, each of which</div><div class='add'>+ * feed into one of the 12 general interrupt vectors. The remaining 8 vectors</div><div class='add'>+ * can each route a single SoC interrupt directly.</div><div class='add'>+ */</div><div class='add'>+#define NR_PRIORITY_IRQS 16</div><div class='add'>+</div><div class='add'>+#define NR_IRQS_LEGACY	NR_PRIORITY_IRQS</div><div class='add'>+</div><div class='add'>+/* Total number of virq in the platform */</div><div class='add'>+#define NR_IRQS		256</div><div class='add'>+</div><div class='add'>+/* This number is used when no interrupt has been assigned */</div><div class='add'>+#define NO_IRQ		0</div><div class='add'>+</div><div class='add'>+/* This type is the placeholder for a hardware interrupt number. It has to</div><div class='add'>+ * be big enough to enclose whatever representation is used by a given</div><div class='add'>+ * platform.</div><div class='add'>+ */</div><div class='add'>+typedef unsigned long irq_hw_number_t;</div><div class='add'>+</div><div class='add'>+/* Interrupt controller "host" data structure. This could be defined as a</div><div class='add'>+ * irq domain controller. That is, it handles the mapping between hardware</div><div class='add'>+ * and virtual interrupt numbers for a given interrupt domain. The host</div><div class='add'>+ * structure is generally created by the PIC code for a given PIC instance</div><div class='add'>+ * (though a host can cover more than one PIC if they have a flat number</div><div class='add'>+ * model). It's the host callbacks that are responsible for setting the</div><div class='add'>+ * irq_chip on a given irq_desc after it's been mapped.</div><div class='add'>+ *</div><div class='add'>+ * The host code and data structures are fairly agnostic to the fact that</div><div class='add'>+ * we use an open firmware device-tree. We do have references to struct</div><div class='add'>+ * device_node in two places: in irq_find_host() to find the host matching</div><div class='add'>+ * a given interrupt controller node, and of course as an argument to its</div><div class='add'>+ * counterpart host-&gt;ops-&gt;match() callback. However, those are treated as</div><div class='add'>+ * generic pointers by the core and the fact that it's actually a device-node</div><div class='add'>+ * pointer is purely a convention between callers and implementation. This</div><div class='add'>+ * code could thus be used on other architectures by replacing those two</div><div class='add'>+ * by some sort of arch-specific void * "token" used to identify interrupt</div><div class='add'>+ * controllers.</div><div class='add'>+ */</div><div class='add'>+struct irq_host;</div><div class='add'>+struct radix_tree_root;</div><div class='add'>+struct device_node;</div><div class='add'>+</div><div class='add'>+/* Functions below are provided by the host and called whenever a new mapping</div><div class='add'>+ * is created or an old mapping is disposed. The host can then proceed to</div><div class='add'>+ * whatever internal data structures management is required. It also needs</div><div class='add'>+ * to setup the irq_desc when returning from map().</div><div class='add'>+ */</div><div class='add'>+struct irq_host_ops {</div><div class='add'>+	/* Match an interrupt controller device node to a host, returns</div><div class='add'>+	 * 1 on a match</div><div class='add'>+	 */</div><div class='add'>+	int (*match)(struct irq_host *h, struct device_node *node);</div><div class='add'>+</div><div class='add'>+	/* Create or update a mapping between a virtual irq number and a hw</div><div class='add'>+	 * irq number. This is called only once for a given mapping.</div><div class='add'>+	 */</div><div class='add'>+	int (*map)(struct irq_host *h, unsigned int virq, irq_hw_number_t hw);</div><div class='add'>+</div><div class='add'>+	/* Dispose of such a mapping */</div><div class='add'>+	void (*unmap)(struct irq_host *h, unsigned int virq);</div><div class='add'>+</div><div class='add'>+	/* Translate device-tree interrupt specifier from raw format coming</div><div class='add'>+	 * from the firmware to a irq_hw_number_t (interrupt line number) and</div><div class='add'>+	 * type (sense) that can be passed to set_irq_type(). In the absence</div><div class='add'>+	 * of this callback, irq_create_of_mapping() and irq_of_parse_and_map()</div><div class='add'>+	 * will return the hw number in the first cell and IRQ_TYPE_NONE for</div><div class='add'>+	 * the type (which amount to keeping whatever default value the</div><div class='add'>+	 * interrupt controller has for that line)</div><div class='add'>+	 */</div><div class='add'>+	int (*xlate)(struct irq_host *h, struct device_node *ctrler,</div><div class='add'>+		     const u32 *intspec, unsigned int intsize,</div><div class='add'>+		     irq_hw_number_t *out_hwirq, unsigned int *out_type);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct irq_host {</div><div class='add'>+	struct list_head	link;</div><div class='add'>+</div><div class='add'>+	/* type of reverse mapping technique */</div><div class='add'>+	unsigned int		revmap_type;</div><div class='add'>+#define IRQ_HOST_MAP_PRIORITY   0 /* core priority irqs, get irqs 1..15 */</div><div class='add'>+#define IRQ_HOST_MAP_NOMAP	1 /* no fast reverse mapping */</div><div class='add'>+#define IRQ_HOST_MAP_LINEAR	2 /* linear map of interrupts */</div><div class='add'>+#define IRQ_HOST_MAP_TREE	3 /* radix tree */</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			unsigned int size;</div><div class='add'>+			unsigned int *revmap;</div><div class='add'>+		} linear;</div><div class='add'>+		struct radix_tree_root tree;</div><div class='add'>+	} revmap_data;</div><div class='add'>+	struct irq_host_ops	*ops;</div><div class='add'>+	void			*host_data;</div><div class='add'>+	irq_hw_number_t		inval_irq;</div><div class='add'>+</div><div class='add'>+	/* Optional device node pointer */</div><div class='add'>+	struct device_node	*of_node;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct irq_data;</div><div class='add'>+extern irq_hw_number_t irqd_to_hwirq(struct irq_data *d);</div><div class='add'>+extern irq_hw_number_t virq_to_hw(unsigned int virq);</div><div class='add'>+extern bool virq_is_host(unsigned int virq, struct irq_host *host);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irq_alloc_host - Allocate a new irq_host data structure</div><div class='add'>+ * @of_node: optional device-tree node of the interrupt controller</div><div class='add'>+ * @revmap_type: type of reverse mapping to use</div><div class='add'>+ * @revmap_arg: for IRQ_HOST_MAP_LINEAR linear only: size of the map</div><div class='add'>+ * @ops: map/unmap host callbacks</div><div class='add'>+ * @inval_irq: provide a hw number in that host space that is always invalid</div><div class='add'>+ *</div><div class='add'>+ * Allocates and initialize and irq_host structure. Note that in the case of</div><div class='add'>+ * IRQ_HOST_MAP_LEGACY, the map() callback will be called before this returns</div><div class='add'>+ * for all legacy interrupts except 0 (which is always the invalid irq for</div><div class='add'>+ * a legacy controller). For a IRQ_HOST_MAP_LINEAR, the map is allocated by</div><div class='add'>+ * this call as well. For a IRQ_HOST_MAP_TREE, the radix tree will be allocated</div><div class='add'>+ * later during boot automatically (the reverse mapping will use the slow path</div><div class='add'>+ * until that happens).</div><div class='add'>+ */</div><div class='add'>+extern struct irq_host *irq_alloc_host(struct device_node *of_node,</div><div class='add'>+				       unsigned int revmap_type,</div><div class='add'>+				       unsigned int revmap_arg,</div><div class='add'>+				       struct irq_host_ops *ops,</div><div class='add'>+				       irq_hw_number_t inval_irq);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irq_find_host - Locates a host for a given device node</div><div class='add'>+ * @node: device-tree node of the interrupt controller</div><div class='add'>+ */</div><div class='add'>+extern struct irq_host *irq_find_host(struct device_node *node);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irq_set_default_host - Set a "default" host</div><div class='add'>+ * @host: default host pointer</div><div class='add'>+ *</div><div class='add'>+ * For convenience, it's possible to set a "default" host that will be used</div><div class='add'>+ * whenever NULL is passed to irq_create_mapping(). It makes life easier for</div><div class='add'>+ * platforms that want to manipulate a few hard coded interrupt numbers that</div><div class='add'>+ * aren't properly represented in the device-tree.</div><div class='add'>+ */</div><div class='add'>+extern void irq_set_default_host(struct irq_host *host);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irq_set_virq_count - Set the maximum number of virt irqs</div><div class='add'>+ * @count: number of linux virtual irqs, capped with NR_IRQS</div><div class='add'>+ *</div><div class='add'>+ * This is mainly for use by platforms like iSeries who want to program</div><div class='add'>+ * the virtual irq number in the controller to avoid the reverse mapping</div><div class='add'>+ */</div><div class='add'>+extern void irq_set_virq_count(unsigned int count);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irq_create_mapping - Map a hardware interrupt into linux virq space</div><div class='add'>+ * @host: host owning this hardware interrupt or NULL for default host</div><div class='add'>+ * @hwirq: hardware irq number in that host space</div><div class='add'>+ *</div><div class='add'>+ * Only one mapping per hardware interrupt is permitted. Returns a linux</div><div class='add'>+ * virq number.</div><div class='add'>+ * If the sense/trigger is to be specified, set_irq_type() should be called</div><div class='add'>+ * on the number returned from that call.</div><div class='add'>+ */</div><div class='add'>+extern unsigned int irq_create_mapping(struct irq_host *host,</div><div class='add'>+				       irq_hw_number_t hwirq);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irq_dispose_mapping - Unmap an interrupt</div><div class='add'>+ * @virq: linux virq number of the interrupt to unmap</div><div class='add'>+ */</div><div class='add'>+extern void irq_dispose_mapping(unsigned int virq);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irq_find_mapping - Find a linux virq from an hw irq number.</div><div class='add'>+ * @host: host owning this hardware interrupt</div><div class='add'>+ * @hwirq: hardware irq number in that host space</div><div class='add'>+ *</div><div class='add'>+ * This is a slow path, for use by generic code. It's expected that an</div><div class='add'>+ * irq controller implementation directly calls the appropriate low level</div><div class='add'>+ * mapping function.</div><div class='add'>+ */</div><div class='add'>+extern unsigned int irq_find_mapping(struct irq_host *host,</div><div class='add'>+				     irq_hw_number_t hwirq);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irq_create_direct_mapping - Allocate a virq for direct mapping</div><div class='add'>+ * @host: host to allocate the virq for or NULL for default host</div><div class='add'>+ *</div><div class='add'>+ * This routine is used for irq controllers which can choose the hardware</div><div class='add'>+ * interrupt numbers they generate. In such a case it's simplest to use</div><div class='add'>+ * the linux virq as the hardware interrupt number.</div><div class='add'>+ */</div><div class='add'>+extern unsigned int irq_create_direct_mapping(struct irq_host *host);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irq_radix_revmap_insert - Insert a hw irq to linux virq number mapping.</div><div class='add'>+ * @host: host owning this hardware interrupt</div><div class='add'>+ * @virq: linux irq number</div><div class='add'>+ * @hwirq: hardware irq number in that host space</div><div class='add'>+ *</div><div class='add'>+ * This is for use by irq controllers that use a radix tree reverse</div><div class='add'>+ * mapping for fast lookup.</div><div class='add'>+ */</div><div class='add'>+extern void irq_radix_revmap_insert(struct irq_host *host, unsigned int virq,</div><div class='add'>+				    irq_hw_number_t hwirq);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irq_radix_revmap_lookup - Find a linux virq from a hw irq number.</div><div class='add'>+ * @host: host owning this hardware interrupt</div><div class='add'>+ * @hwirq: hardware irq number in that host space</div><div class='add'>+ *</div><div class='add'>+ * This is a fast path, for use by irq controller code that uses radix tree</div><div class='add'>+ * revmaps</div><div class='add'>+ */</div><div class='add'>+extern unsigned int irq_radix_revmap_lookup(struct irq_host *host,</div><div class='add'>+					    irq_hw_number_t hwirq);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irq_linear_revmap - Find a linux virq from a hw irq number.</div><div class='add'>+ * @host: host owning this hardware interrupt</div><div class='add'>+ * @hwirq: hardware irq number in that host space</div><div class='add'>+ *</div><div class='add'>+ * This is a fast path, for use by irq controller code that uses linear</div><div class='add'>+ * revmaps. It does fallback to the slow path if the revmap doesn't exist</div><div class='add'>+ * yet and will create the revmap entry with appropriate locking</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+extern unsigned int irq_linear_revmap(struct irq_host *host,</div><div class='add'>+				      irq_hw_number_t hwirq);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irq_alloc_virt - Allocate virtual irq numbers</div><div class='add'>+ * @host: host owning these new virtual irqs</div><div class='add'>+ * @count: number of consecutive numbers to allocate</div><div class='add'>+ * @hint: pass a hint number, the allocator will try to use a 1:1 mapping</div><div class='add'>+ *</div><div class='add'>+ * This is a low level function that is used internally by irq_create_mapping()</div><div class='add'>+ * and that can be used by some irq controllers implementations for things</div><div class='add'>+ * like allocating ranges of numbers for MSIs. The revmaps are left untouched.</div><div class='add'>+ */</div><div class='add'>+extern unsigned int irq_alloc_virt(struct irq_host *host,</div><div class='add'>+				   unsigned int count,</div><div class='add'>+				   unsigned int hint);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irq_free_virt - Free virtual irq numbers</div><div class='add'>+ * @virq: virtual irq number of the first interrupt to free</div><div class='add'>+ * @count: number of interrupts to free</div><div class='add'>+ *</div><div class='add'>+ * This function is the opposite of irq_alloc_virt. It will not clear reverse</div><div class='add'>+ * maps, this should be done previously by unmap'ing the interrupt. In fact,</div><div class='add'>+ * all interrupts covered by the range being freed should have been unmapped</div><div class='add'>+ * prior to calling this.</div><div class='add'>+ */</div><div class='add'>+extern void irq_free_virt(unsigned int virq, unsigned int count);</div><div class='add'>+</div><div class='add'>+extern void __init init_pic_c64xplus(void);</div><div class='add'>+</div><div class='add'>+extern void init_IRQ(void);</div><div class='add'>+</div><div class='add'>+struct pt_regs;</div><div class='add'>+</div><div class='add'>+extern asmlinkage void c6x_do_IRQ(unsigned int prio, struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+extern unsigned long irq_err_count;</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_IRQ_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/irqflags.h b/arch/c6x/include/asm/irqflags.h<br/>new file mode 100644<br/>index 000000000000..cf78e09e18c3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/irqflags.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/irqflags.h</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+/*</div><div class='add'>+ *  C6X IRQ flag handling</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2010 Texas Instruments Incorporated</div><div class='add'>+ * Written by Mark Salter (msalter@redhat.com)</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 Licence</div><div class='add'>+ * as published by the Free Software Foundation; either version</div><div class='add'>+ * 2 of the Licence, or (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ASM_IRQFLAGS_H</div><div class='add'>+#define _ASM_IRQFLAGS_H</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+/* read interrupt enabled status */</div><div class='add'>+static inline unsigned long arch_local_save_flags(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	asm volatile (" mvc .s2 CSR,%0\n" : "=b"(flags));</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set interrupt enabled status */</div><div class='add'>+static inline void arch_local_irq_restore(unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	asm volatile (" mvc .s2 %0,CSR\n" : : "b"(flags));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* unconditionally enable interrupts */</div><div class='add'>+static inline void arch_local_irq_enable(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags = arch_local_save_flags();</div><div class='add'>+	flags |= 1;</div><div class='add'>+	arch_local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* unconditionally disable interrupts */</div><div class='add'>+static inline void arch_local_irq_disable(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags = arch_local_save_flags();</div><div class='add'>+	flags &amp;= ~1;</div><div class='add'>+	arch_local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* get status and disable interrupts */</div><div class='add'>+static inline unsigned long arch_local_irq_save(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	flags = arch_local_save_flags();</div><div class='add'>+	arch_local_irq_restore(flags &amp; ~1);</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* test flags */</div><div class='add'>+static inline int arch_irqs_disabled_flags(unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	return (flags &amp; 1) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* test hardware interrupt enable bit */</div><div class='add'>+static inline int arch_irqs_disabled(void)</div><div class='add'>+{</div><div class='add'>+	return arch_irqs_disabled_flags(arch_local_save_flags());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* __ASSEMBLY__ */</div><div class='add'>+#endif /* __ASM_IRQFLAGS_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/linkage.h b/arch/c6x/include/asm/linkage.h<br/>new file mode 100644<br/>index 000000000000..376925c47d57<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/linkage.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/linkage.h</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+#ifndef _ASM_C6X_LINKAGE_H</div><div class='add'>+#define _ASM_C6X_LINKAGE_H</div><div class='add'>+</div><div class='add'>+#ifdef __ASSEMBLER__</div><div class='add'>+</div><div class='add'>+#define __ALIGN		.align 2</div><div class='add'>+#define __ALIGN_STR	".align 2"</div><div class='add'>+</div><div class='add'>+#ifndef __DSBT__</div><div class='add'>+#define ENTRY(name)		\</div><div class='add'>+	.global name @		\</div><div class='add'>+	__ALIGN @		\</div><div class='add'>+name:</div><div class='add'>+#else</div><div class='add'>+#define ENTRY(name)		\</div><div class='add'>+	.global name @		\</div><div class='add'>+	.hidden name @		\</div><div class='add'>+	__ALIGN @		\</div><div class='add'>+name:</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define ENDPROC(name)		\</div><div class='add'>+	.type name, @function @	\</div><div class='add'>+	.size name, . - name</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_LINKAGE_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/megamod-pic.h b/arch/c6x/include/asm/megamod-pic.h<br/>new file mode 100644<br/>index 000000000000..eca0a8678034<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/megamod-pic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/megamod-pic.h</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+#ifndef _C6X_MEGAMOD_PIC_H</div><div class='add'>+#define _C6X_MEGAMOD_PIC_H</div><div class='add'>+</div><div class='add'>+#ifdef __KERNEL__</div><div class='add'>+</div><div class='add'>+extern void __init megamod_pic_init(void);</div><div class='add'>+</div><div class='add'>+#endif /* __KERNEL__ */</div><div class='add'>+#endif /* _C6X_MEGAMOD_PIC_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/mmu.h b/arch/c6x/include/asm/mmu.h<br/>new file mode 100644<br/>index 000000000000..41592bf16067<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/mmu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/mmu.h</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_MMU_H</div><div class='add'>+#define _ASM_C6X_MMU_H</div><div class='add'>+</div><div class='add'>+typedef struct {</div><div class='add'>+	unsigned long		end_brk;</div><div class='add'>+} mm_context_t;</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_MMU_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/module.h b/arch/c6x/include/asm/module.h<br/>new file mode 100644<br/>index 000000000000..a453f9744f42<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/module.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/module.h</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</div><div class='add'>+ *</div><div class='add'>+ *  Updated for 2.6.34 by: Mark Salter (msalter@redhat.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_MODULE_H</div><div class='add'>+#define _ASM_C6X_MODULE_H</div><div class='add'>+</div><div class='add'>+#define Elf_Shdr	Elf32_Shdr</div><div class='add'>+#define Elf_Sym		Elf32_Sym</div><div class='add'>+#define Elf_Ehdr	Elf32_Ehdr</div><div class='add'>+#define Elf_Addr	Elf32_Addr</div><div class='add'>+#define Elf_Word	Elf32_Word</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This file contains the C6x architecture specific module code.</div><div class='add'>+ */</div><div class='add'>+struct mod_arch_specific {</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct loaded_sections {</div><div class='add'>+	unsigned int new_vaddr;</div><div class='add'>+	unsigned int loaded;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_MODULE_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/mutex.h b/arch/c6x/include/asm/mutex.h<br/>new file mode 100644<br/>index 000000000000..7a7248e0462d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/mutex.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/mutex.h</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+#ifndef _ASM_C6X_MUTEX_H</div><div class='add'>+#define _ASM_C6X_MUTEX_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/mutex-null.h&gt;</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_MUTEX_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/page.h b/arch/c6x/include/asm/page.h<br/>new file mode 100644<br/>index 000000000000..d18e2b0c7aea<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/page.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/page.h</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+#ifndef _ASM_C6X_PAGE_H</div><div class='add'>+#define _ASM_C6X_PAGE_H</div><div class='add'>+</div><div class='add'>+#define VM_DATA_DEFAULT_FLAGS \</div><div class='add'>+	(VM_READ | VM_WRITE | \</div><div class='add'>+	((current-&gt;personality &amp; READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \</div><div class='add'>+		 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/page.h&gt;</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_PAGE_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/pgtable.h b/arch/c6x/include/asm/pgtable.h<br/>new file mode 100644<br/>index 000000000000..68c8af4f1f97<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/pgtable.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/pgtable.h</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_PGTABLE_H</div><div class='add'>+#define _ASM_C6X_PGTABLE_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/4level-fixup.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * All 32bit addresses are effectively valid for vmalloc...</div><div class='add'>+ * Sort of meaningless for non-VM targets.</div><div class='add'>+ */</div><div class='add'>+#define	VMALLOC_START	0</div><div class='add'>+#define	VMALLOC_END	0xffffffff</div><div class='add'>+</div><div class='add'>+#define pgd_present(pgd)	(1)</div><div class='add'>+#define pgd_none(pgd)		(0)</div><div class='add'>+#define pgd_bad(pgd)		(0)</div><div class='add'>+#define pgd_clear(pgdp)</div><div class='add'>+#define kern_addr_valid(addr) (1)</div><div class='add'>+</div><div class='add'>+#define pmd_offset(a, b)	((void *)0)</div><div class='add'>+#define pmd_none(x)		(!pmd_val(x))</div><div class='add'>+#define pmd_present(x)		(pmd_val(x))</div><div class='add'>+#define pmd_clear(xp)		do { set_pmd(xp, __pmd(0)); } while (0)</div><div class='add'>+#define pmd_bad(x)		(pmd_val(x) &amp; ~PAGE_MASK)</div><div class='add'>+</div><div class='add'>+#define PAGE_NONE		__pgprot(0)    /* these mean nothing to NO_MM */</div><div class='add'>+#define PAGE_SHARED		__pgprot(0)    /* these mean nothing to NO_MM */</div><div class='add'>+#define PAGE_COPY		__pgprot(0)    /* these mean nothing to NO_MM */</div><div class='add'>+#define PAGE_READONLY	        __pgprot(0)    /* these mean nothing to NO_MM */</div><div class='add'>+#define PAGE_KERNEL		__pgprot(0)    /* these mean nothing to NO_MM */</div><div class='add'>+#define pgprot_noncached(prot)	(prot)</div><div class='add'>+</div><div class='add'>+extern void paging_init(void);</div><div class='add'>+</div><div class='add'>+#define __swp_type(x)		(0)</div><div class='add'>+#define __swp_offset(x)		(0)</div><div class='add'>+#define __swp_entry(typ, off)	((swp_entry_t) { ((typ) | ((off) &lt;&lt; 7)) })</div><div class='add'>+#define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })</div><div class='add'>+#define __swp_entry_to_pte(x)	((pte_t) { (x).val })</div><div class='add'>+</div><div class='add'>+static inline int pte_file(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define set_pte(pteptr, pteval) (*(pteptr) = pteval)</div><div class='add'>+#define set_pte_at(mm, addr, ptep, pteval) set_pte(ptep, pteval)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ZERO_PAGE is a global shared page that is always zero: used</div><div class='add'>+ * for zero-mapped memory areas etc..</div><div class='add'>+ */</div><div class='add'>+#define ZERO_PAGE(vaddr)	virt_to_page(empty_zero_page)</div><div class='add'>+extern unsigned long empty_zero_page;</div><div class='add'>+</div><div class='add'>+#define swapper_pg_dir ((pgd_t *) 0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * No page table caches to initialise</div><div class='add'>+ */</div><div class='add'>+#define pgtable_cache_init()   do { } while (0)</div><div class='add'>+#define io_remap_pfn_range      remap_pfn_range</div><div class='add'>+</div><div class='add'>+#define io_remap_page_range(vma, vaddr, paddr, size, prot)		\</div><div class='add'>+		remap_pfn_range(vma, vaddr, (paddr) &gt;&gt; PAGE_SHIFT, size, prot)</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/pgtable.h&gt;</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_PGTABLE_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/processor.h b/arch/c6x/include/asm/processor.h<br/>new file mode 100644<br/>index 000000000000..8154c4ee8c9c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/processor.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/processor.h</a></div><div class='hunk'>@@ -0,0 +1,132 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</div><div class='add'>+ *</div><div class='add'>+ *  Updated for 2.6.34: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_PROCESSOR_H</div><div class='add'>+#define _ASM_C6X_PROCESSOR_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/current.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Default implementation of macro that returns current</div><div class='add'>+ * instruction pointer ("program counter").</div><div class='add'>+ */</div><div class='add'>+#define current_text_addr()			\</div><div class='add'>+({						\</div><div class='add'>+	void *__pc;				\</div><div class='add'>+	asm("mvc .S2 pce1,%0\n" : "=b"(__pc));	\</div><div class='add'>+	__pc;					\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * User space process size. This is mostly meaningless for NOMMU</div><div class='add'>+ * but some C6X processors may have RAM addresses up to 0xFFFFFFFF.</div><div class='add'>+ * Since calls like mmap() can return an address or an error, we</div><div class='add'>+ * have to allow room for error returns when code does something</div><div class='add'>+ * like:</div><div class='add'>+ *</div><div class='add'>+ *       addr = do_mmap(...)</div><div class='add'>+ *       if ((unsigned long)addr &gt;= TASK_SIZE)</div><div class='add'>+ *            ... its an error code, not an address ...</div><div class='add'>+ *</div><div class='add'>+ * Here, we allow for 4096 error codes which means we really can't</div><div class='add'>+ * use the last 4K page on systems with RAM extending all the way</div><div class='add'>+ * to the end of the 32-bit address space.</div><div class='add'>+ */</div><div class='add'>+#define TASK_SIZE	0xFFFFF000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This decides where the kernel will search for a free chunk of vm</div><div class='add'>+ * space during mmap's. We won't be using it</div><div class='add'>+ */</div><div class='add'>+#define TASK_UNMAPPED_BASE	0</div><div class='add'>+</div><div class='add'>+struct thread_struct {</div><div class='add'>+	unsigned long long b15_14;</div><div class='add'>+	unsigned long long a15_14;</div><div class='add'>+	unsigned long long b13_12;</div><div class='add'>+	unsigned long long a13_12;</div><div class='add'>+	unsigned long long b11_10;</div><div class='add'>+	unsigned long long a11_10;</div><div class='add'>+	unsigned long long ricl_icl;</div><div class='add'>+	unsigned long  usp;		/* user stack pointer */</div><div class='add'>+	unsigned long  pc;		/* kernel pc */</div><div class='add'>+	unsigned long  wchan;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define INIT_THREAD					\</div><div class='add'>+{							\</div><div class='add'>+	.usp = 0,					\</div><div class='add'>+	.wchan = 0,					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define INIT_MMAP { \</div><div class='add'>+	&amp;init_mm, 0, 0, NULL, PAGE_SHARED, VM_READ | VM_WRITE | VM_EXEC, 1, \</div><div class='add'>+	NULL, NULL }</div><div class='add'>+</div><div class='add'>+#define task_pt_regs(task) \</div><div class='add'>+	((struct pt_regs *)(THREAD_START_SP + task_stack_page(task)) - 1)</div><div class='add'>+</div><div class='add'>+#define alloc_kernel_stack()	__get_free_page(GFP_KERNEL)</div><div class='add'>+#define free_kernel_stack(page) free_page((page))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Forward declaration, a strange C thing */</div><div class='add'>+struct task_struct;</div><div class='add'>+</div><div class='add'>+extern void start_thread(struct pt_regs *regs, unsigned int pc,</div><div class='add'>+			 unsigned long usp);</div><div class='add'>+</div><div class='add'>+/* Free all resources held by a thread. */</div><div class='add'>+static inline void release_thread(struct task_struct *dead_task)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Prepare to copy thread state - unlazy all lazy status */</div><div class='add'>+#define prepare_to_copy(tsk)	do { } while (0)</div><div class='add'>+</div><div class='add'>+extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);</div><div class='add'>+</div><div class='add'>+#define copy_segments(tsk, mm)		do { } while (0)</div><div class='add'>+#define release_segments(mm)		do { } while (0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * saved PC of a blocked thread.</div><div class='add'>+ */</div><div class='add'>+#define thread_saved_pc(tsk) (task_pt_regs(tsk)-&gt;pc)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * saved kernel SP and DP of a blocked thread.</div><div class='add'>+ */</div><div class='add'>+#ifdef _BIG_ENDIAN</div><div class='add'>+#define thread_saved_ksp(tsk) \</div><div class='add'>+	(*(unsigned long *)&amp;(tsk)-&gt;thread.b15_14)</div><div class='add'>+#define thread_saved_dp(tsk) \</div><div class='add'>+	(*(((unsigned long *)&amp;(tsk)-&gt;thread.b15_14) + 1))</div><div class='add'>+#else</div><div class='add'>+#define thread_saved_ksp(tsk) \</div><div class='add'>+	(*(((unsigned long *)&amp;(tsk)-&gt;thread.b15_14) + 1))</div><div class='add'>+#define thread_saved_dp(tsk) \</div><div class='add'>+	(*(unsigned long *)&amp;(tsk)-&gt;thread.b15_14)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+extern unsigned long get_wchan(struct task_struct *p);</div><div class='add'>+</div><div class='add'>+#define KSTK_EIP(tsk)	(task_pt_regs(task)-&gt;pc)</div><div class='add'>+#define	KSTK_ESP(tsk)	(task_pt_regs(task)-&gt;sp)</div><div class='add'>+</div><div class='add'>+#define cpu_relax()		do { } while (0)</div><div class='add'>+</div><div class='add'>+extern const struct seq_operations cpuinfo_op;</div><div class='add'>+</div><div class='add'>+#endif /* ASM_C6X_PROCESSOR_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/procinfo.h b/arch/c6x/include/asm/procinfo.h<br/>new file mode 100644<br/>index 000000000000..c139d1e71f87<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/procinfo.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/procinfo.h</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2010 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Mark Salter (msalter@redhat.com)</div><div class='add'>+ *</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_PROCINFO_H</div><div class='add'>+#define _ASM_C6X_PROCINFO_H</div><div class='add'>+</div><div class='add'>+#ifdef __KERNEL__</div><div class='add'>+</div><div class='add'>+struct proc_info_list {</div><div class='add'>+	unsigned int		cpu_val;</div><div class='add'>+	unsigned int		cpu_mask;</div><div class='add'>+	const char		*arch_name;</div><div class='add'>+	const char		*elf_name;</div><div class='add'>+	unsigned int		elf_hwcap;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#else	/* __KERNEL__ */</div><div class='add'>+#include &lt;asm/elf.h&gt;</div><div class='add'>+#warning "Please include asm/elf.h instead"</div><div class='add'>+#endif	/* __KERNEL__ */</div><div class='add'>+</div><div class='add'>+#endif	/* _ASM_C6X_PROCINFO_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/prom.h b/arch/c6x/include/asm/prom.h<br/>new file mode 100644<br/>index 000000000000..b4ec95f07518<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/prom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/prom.h</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+/* dummy prom.h; here to make linux/of.h's #includes happy */</div><div class='head'>diff --git a/arch/c6x/include/asm/ptrace.h b/arch/c6x/include/asm/ptrace.h<br/>new file mode 100644<br/>index 000000000000..21e8d7931fe7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/ptrace.h</a></div><div class='hunk'>@@ -0,0 +1,174 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2004, 2006, 2009, 2010 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</div><div class='add'>+ *</div><div class='add'>+ *  Updated for 2.6.34: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_PTRACE_H</div><div class='add'>+#define _ASM_C6X_PTRACE_H</div><div class='add'>+</div><div class='add'>+#define BKPT_OPCODE	0x56454314	/* illegal opcode */</div><div class='add'>+</div><div class='add'>+#ifdef _BIG_ENDIAN</div><div class='add'>+#define PT_LO(odd, even)  odd</div><div class='add'>+#define PT_HI(odd, even)  even</div><div class='add'>+#else</div><div class='add'>+#define PT_LO(odd, even)  even</div><div class='add'>+#define PT_HI(odd, even)  odd</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define PT_A4_ORG  PT_LO(1, 0)</div><div class='add'>+#define PT_TSR	   PT_HI(1, 0)</div><div class='add'>+#define PT_ILC	   PT_LO(3, 2)</div><div class='add'>+#define PT_RILC    PT_HI(3, 2)</div><div class='add'>+#define PT_CSR	   PT_LO(5, 4)</div><div class='add'>+#define PT_PC	   PT_HI(5, 4)</div><div class='add'>+#define PT_B16	   PT_LO(7, 6)</div><div class='add'>+#define PT_B17	   PT_HI(7, 6)</div><div class='add'>+#define PT_B18	   PT_LO(9, 8)</div><div class='add'>+#define PT_B19	   PT_HI(9, 8)</div><div class='add'>+#define PT_B20	   PT_LO(11, 10)</div><div class='add'>+#define PT_B21	   PT_HI(11, 10)</div><div class='add'>+#define PT_B22	   PT_LO(13, 12)</div><div class='add'>+#define PT_B23	   PT_HI(13, 12)</div><div class='add'>+#define PT_B24	   PT_LO(15, 14)</div><div class='add'>+#define PT_B25	   PT_HI(15, 14)</div><div class='add'>+#define PT_B26	   PT_LO(17, 16)</div><div class='add'>+#define PT_B27	   PT_HI(17, 16)</div><div class='add'>+#define PT_B28	   PT_LO(19, 18)</div><div class='add'>+#define PT_B29	   PT_HI(19, 18)</div><div class='add'>+#define PT_B30	   PT_LO(21, 20)</div><div class='add'>+#define PT_B31	   PT_HI(21, 20)</div><div class='add'>+#define PT_B0	   PT_LO(23, 22)</div><div class='add'>+#define PT_B1	   PT_HI(23, 22)</div><div class='add'>+#define PT_B2	   PT_LO(25, 24)</div><div class='add'>+#define PT_B3	   PT_HI(25, 24)</div><div class='add'>+#define PT_B4	   PT_LO(27, 26)</div><div class='add'>+#define PT_B5	   PT_HI(27, 26)</div><div class='add'>+#define PT_B6	   PT_LO(29, 28)</div><div class='add'>+#define PT_B7	   PT_HI(29, 28)</div><div class='add'>+#define PT_B8	   PT_LO(31, 30)</div><div class='add'>+#define PT_B9	   PT_HI(31, 30)</div><div class='add'>+#define PT_B10	   PT_LO(33, 32)</div><div class='add'>+#define PT_B11	   PT_HI(33, 32)</div><div class='add'>+#define PT_B12	   PT_LO(35, 34)</div><div class='add'>+#define PT_B13	   PT_HI(35, 34)</div><div class='add'>+#define PT_A16	   PT_LO(37, 36)</div><div class='add'>+#define PT_A17	   PT_HI(37, 36)</div><div class='add'>+#define PT_A18	   PT_LO(39, 38)</div><div class='add'>+#define PT_A19	   PT_HI(39, 38)</div><div class='add'>+#define PT_A20	   PT_LO(41, 40)</div><div class='add'>+#define PT_A21	   PT_HI(41, 40)</div><div class='add'>+#define PT_A22	   PT_LO(43, 42)</div><div class='add'>+#define PT_A23	   PT_HI(43, 42)</div><div class='add'>+#define PT_A24	   PT_LO(45, 44)</div><div class='add'>+#define PT_A25	   PT_HI(45, 44)</div><div class='add'>+#define PT_A26	   PT_LO(47, 46)</div><div class='add'>+#define PT_A27	   PT_HI(47, 46)</div><div class='add'>+#define PT_A28	   PT_LO(49, 48)</div><div class='add'>+#define PT_A29	   PT_HI(49, 48)</div><div class='add'>+#define PT_A30	   PT_LO(51, 50)</div><div class='add'>+#define PT_A31	   PT_HI(51, 50)</div><div class='add'>+#define PT_A0	   PT_LO(53, 52)</div><div class='add'>+#define PT_A1	   PT_HI(53, 52)</div><div class='add'>+#define PT_A2	   PT_LO(55, 54)</div><div class='add'>+#define PT_A3	   PT_HI(55, 54)</div><div class='add'>+#define PT_A4	   PT_LO(57, 56)</div><div class='add'>+#define PT_A5	   PT_HI(57, 56)</div><div class='add'>+#define PT_A6	   PT_LO(59, 58)</div><div class='add'>+#define PT_A7	   PT_HI(59, 58)</div><div class='add'>+#define PT_A8	   PT_LO(61, 60)</div><div class='add'>+#define PT_A9	   PT_HI(61, 60)</div><div class='add'>+#define PT_A10	   PT_LO(63, 62)</div><div class='add'>+#define PT_A11	   PT_HI(63, 62)</div><div class='add'>+#define PT_A12	   PT_LO(65, 64)</div><div class='add'>+#define PT_A13	   PT_HI(65, 64)</div><div class='add'>+#define PT_A14	   PT_LO(67, 66)</div><div class='add'>+#define PT_A15	   PT_HI(67, 66)</div><div class='add'>+#define PT_B14	   PT_LO(69, 68)</div><div class='add'>+#define PT_B15	   PT_HI(69, 68)</div><div class='add'>+</div><div class='add'>+#define NR_PTREGS  70</div><div class='add'>+</div><div class='add'>+#define PT_DP	   PT_B14  /* Data Segment Pointer (B14) */</div><div class='add'>+#define PT_SP	   PT_B15  /* Stack Pointer (B15)  */</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+#ifdef _BIG_ENDIAN</div><div class='add'>+#define REG_PAIR(odd, even) unsigned long odd; unsigned long even</div><div class='add'>+#else</div><div class='add'>+#define REG_PAIR(odd, even) unsigned long even; unsigned long odd</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * this struct defines the way the registers are stored on the</div><div class='add'>+ * stack during a system call. fields defined with REG_PAIR</div><div class='add'>+ * are saved and restored using double-word memory operations</div><div class='add'>+ * which means the word ordering of the pair depends on endianess.</div><div class='add'>+ */</div><div class='add'>+struct pt_regs {</div><div class='add'>+	REG_PAIR(tsr, orig_a4);</div><div class='add'>+	REG_PAIR(rilc, ilc);</div><div class='add'>+	REG_PAIR(pc, csr);</div><div class='add'>+</div><div class='add'>+	REG_PAIR(b17, b16);</div><div class='add'>+	REG_PAIR(b19, b18);</div><div class='add'>+	REG_PAIR(b21, b20);</div><div class='add'>+	REG_PAIR(b23, b22);</div><div class='add'>+	REG_PAIR(b25, b24);</div><div class='add'>+	REG_PAIR(b27, b26);</div><div class='add'>+	REG_PAIR(b29, b28);</div><div class='add'>+	REG_PAIR(b31, b30);</div><div class='add'>+</div><div class='add'>+	REG_PAIR(b1, b0);</div><div class='add'>+	REG_PAIR(b3, b2);</div><div class='add'>+	REG_PAIR(b5, b4);</div><div class='add'>+	REG_PAIR(b7, b6);</div><div class='add'>+	REG_PAIR(b9, b8);</div><div class='add'>+	REG_PAIR(b11, b10);</div><div class='add'>+	REG_PAIR(b13, b12);</div><div class='add'>+</div><div class='add'>+	REG_PAIR(a17, a16);</div><div class='add'>+	REG_PAIR(a19, a18);</div><div class='add'>+	REG_PAIR(a21, a20);</div><div class='add'>+	REG_PAIR(a23, a22);</div><div class='add'>+	REG_PAIR(a25, a24);</div><div class='add'>+	REG_PAIR(a27, a26);</div><div class='add'>+	REG_PAIR(a29, a28);</div><div class='add'>+	REG_PAIR(a31, a30);</div><div class='add'>+</div><div class='add'>+	REG_PAIR(a1, a0);</div><div class='add'>+	REG_PAIR(a3, a2);</div><div class='add'>+	REG_PAIR(a5, a4);</div><div class='add'>+	REG_PAIR(a7, a6);</div><div class='add'>+	REG_PAIR(a9, a8);</div><div class='add'>+	REG_PAIR(a11, a10);</div><div class='add'>+	REG_PAIR(a13, a12);</div><div class='add'>+</div><div class='add'>+	REG_PAIR(a15, a14);</div><div class='add'>+	REG_PAIR(sp, dp);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef __KERNEL__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+#define user_mode(regs)	((((regs)-&gt;tsr) &amp; 0x40) != 0)</div><div class='add'>+</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'>+#define user_stack_pointer(regs) ((regs)-&gt;sp)</div><div class='add'>+</div><div class='add'>+extern void show_regs(struct pt_regs *);</div><div class='add'>+</div><div class='add'>+extern asmlinkage unsigned long syscall_trace_entry(struct pt_regs *regs);</div><div class='add'>+extern asmlinkage void syscall_trace_exit(struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+#endif /* __KERNEL__ */</div><div class='add'>+#endif /* __ASSEMBLY__ */</div><div class='add'>+#endif /* _ASM_C6X_PTRACE_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/sections.h b/arch/c6x/include/asm/sections.h<br/>new file mode 100644<br/>index 000000000000..f703989d837a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/sections.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/sections.h</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+#ifndef _ASM_C6X_SECTIONS_H</div><div class='add'>+#define _ASM_C6X_SECTIONS_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/sections.h&gt;</div><div class='add'>+</div><div class='add'>+extern char _vectors_start[];</div><div class='add'>+extern char _vectors_end[];</div><div class='add'>+</div><div class='add'>+extern char _data_lma[];</div><div class='add'>+extern char _fdt_start[], _fdt_end[];</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_SECTIONS_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/setup.h b/arch/c6x/include/asm/setup.h<br/>new file mode 100644<br/>index 000000000000..1808f279f82e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/setup.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/setup.h</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_SETUP_H</div><div class='add'>+#define _ASM_C6X_SETUP_H</div><div class='add'>+</div><div class='add'>+#define COMMAND_LINE_SIZE   1024</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+extern char c6x_command_line[COMMAND_LINE_SIZE];</div><div class='add'>+</div><div class='add'>+extern int c6x_add_memory(phys_addr_t start, unsigned long size);</div><div class='add'>+</div><div class='add'>+extern unsigned long ram_start;</div><div class='add'>+extern unsigned long ram_end;</div><div class='add'>+</div><div class='add'>+extern int c6x_num_cores;</div><div class='add'>+extern unsigned int c6x_silicon_rev;</div><div class='add'>+extern unsigned int c6x_devstat;</div><div class='add'>+extern unsigned char c6x_fuse_mac[6];</div><div class='add'>+</div><div class='add'>+extern void machine_init(unsigned long dt_ptr);</div><div class='add'>+</div><div class='add'>+#endif /* !__ASSEMBLY__ */</div><div class='add'>+#endif /* _ASM_C6X_SETUP_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/sigcontext.h b/arch/c6x/include/asm/sigcontext.h<br/>new file mode 100644<br/>index 000000000000..eb702f39cde7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/sigcontext.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/sigcontext.h</a></div><div class='hunk'>@@ -0,0 +1,80 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_SIGCONTEXT_H</div><div class='add'>+#define _ASM_C6X_SIGCONTEXT_H</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct sigcontext {</div><div class='add'>+	unsigned long  sc_mask;		/* old sigmask */</div><div class='add'>+	unsigned long  sc_sp;		/* old user stack pointer */</div><div class='add'>+</div><div class='add'>+	unsigned long  sc_a4;</div><div class='add'>+	unsigned long  sc_b4;</div><div class='add'>+	unsigned long  sc_a6;</div><div class='add'>+	unsigned long  sc_b6;</div><div class='add'>+	unsigned long  sc_a8;</div><div class='add'>+	unsigned long  sc_b8;</div><div class='add'>+</div><div class='add'>+	unsigned long  sc_a0;</div><div class='add'>+	unsigned long  sc_a1;</div><div class='add'>+	unsigned long  sc_a2;</div><div class='add'>+	unsigned long  sc_a3;</div><div class='add'>+	unsigned long  sc_a5;</div><div class='add'>+	unsigned long  sc_a7;</div><div class='add'>+	unsigned long  sc_a9;</div><div class='add'>+</div><div class='add'>+	unsigned long  sc_b0;</div><div class='add'>+	unsigned long  sc_b1;</div><div class='add'>+	unsigned long  sc_b2;</div><div class='add'>+	unsigned long  sc_b3;</div><div class='add'>+	unsigned long  sc_b5;</div><div class='add'>+	unsigned long  sc_b7;</div><div class='add'>+	unsigned long  sc_b9;</div><div class='add'>+</div><div class='add'>+	unsigned long  sc_a16;</div><div class='add'>+	unsigned long  sc_a17;</div><div class='add'>+	unsigned long  sc_a18;</div><div class='add'>+	unsigned long  sc_a19;</div><div class='add'>+	unsigned long  sc_a20;</div><div class='add'>+	unsigned long  sc_a21;</div><div class='add'>+	unsigned long  sc_a22;</div><div class='add'>+	unsigned long  sc_a23;</div><div class='add'>+	unsigned long  sc_a24;</div><div class='add'>+	unsigned long  sc_a25;</div><div class='add'>+	unsigned long  sc_a26;</div><div class='add'>+	unsigned long  sc_a27;</div><div class='add'>+	unsigned long  sc_a28;</div><div class='add'>+	unsigned long  sc_a29;</div><div class='add'>+	unsigned long  sc_a30;</div><div class='add'>+	unsigned long  sc_a31;</div><div class='add'>+</div><div class='add'>+	unsigned long  sc_b16;</div><div class='add'>+	unsigned long  sc_b17;</div><div class='add'>+	unsigned long  sc_b18;</div><div class='add'>+	unsigned long  sc_b19;</div><div class='add'>+	unsigned long  sc_b20;</div><div class='add'>+	unsigned long  sc_b21;</div><div class='add'>+	unsigned long  sc_b22;</div><div class='add'>+	unsigned long  sc_b23;</div><div class='add'>+	unsigned long  sc_b24;</div><div class='add'>+	unsigned long  sc_b25;</div><div class='add'>+	unsigned long  sc_b26;</div><div class='add'>+	unsigned long  sc_b27;</div><div class='add'>+	unsigned long  sc_b28;</div><div class='add'>+	unsigned long  sc_b29;</div><div class='add'>+	unsigned long  sc_b30;</div><div class='add'>+	unsigned long  sc_b31;</div><div class='add'>+</div><div class='add'>+	unsigned long  sc_csr;</div><div class='add'>+	unsigned long  sc_pc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_SIGCONTEXT_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/signal.h b/arch/c6x/include/asm/signal.h<br/>new file mode 100644<br/>index 000000000000..f1cd870596a3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/signal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/signal.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+#ifndef _ASM_C6X_SIGNAL_H</div><div class='add'>+#define _ASM_C6X_SIGNAL_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/signal.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+struct pt_regs;</div><div class='add'>+</div><div class='add'>+extern asmlinkage int do_rt_sigreturn(struct pt_regs *regs);</div><div class='add'>+extern asmlinkage void do_notify_resume(struct pt_regs *regs,</div><div class='add'>+					u32 thread_info_flags,</div><div class='add'>+					int syscall);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_SIGNAL_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/soc.h b/arch/c6x/include/asm/soc.h<br/>new file mode 100644<br/>index 000000000000..43f50159e59b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/soc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/soc.h</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+/*</div><div class='add'>+ * Miscellaneous SoC-specific hooks.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *</div><div class='add'>+ * Author: Mark Salter &lt;msalter@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public License</div><div class='add'>+ * version 2. This program is licensed "as is" without any warranty of any</div><div class='add'>+ * kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_SOC_H</div><div class='add'>+#define _ASM_C6X_SOC_H</div><div class='add'>+</div><div class='add'>+struct soc_ops {</div><div class='add'>+	/* Return active exception event or -1 if none */</div><div class='add'>+	int		(*get_exception)(void);</div><div class='add'>+</div><div class='add'>+	/* Assert an event */</div><div class='add'>+	void		(*assert_event)(unsigned int evt);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct soc_ops soc_ops;</div><div class='add'>+</div><div class='add'>+extern int soc_get_exception(void);</div><div class='add'>+extern void soc_assert_event(unsigned int event);</div><div class='add'>+extern int soc_mac_addr(unsigned int index, u8 *addr);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * for mmio on SoC devices. regs are always same byte order as cpu.</div><div class='add'>+ */</div><div class='add'>+#define soc_readl(addr)    __raw_readl(addr)</div><div class='add'>+#define soc_writel(b, addr) __raw_writel((b), (addr))</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_SOC_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/string.h b/arch/c6x/include/asm/string.h<br/>new file mode 100644<br/>index 000000000000..b21517c80a17<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/string.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/string.h</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_STRING_H</div><div class='add'>+#define _ASM_C6X_STRING_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+asmlinkage extern void *memcpy(void *to, const void *from, size_t n);</div><div class='add'>+</div><div class='add'>+#define __HAVE_ARCH_MEMCPY</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_STRING_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/swab.h b/arch/c6x/include/asm/swab.h<br/>new file mode 100644<br/>index 000000000000..fd4bb0520e5e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/swab.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/swab.h</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_SWAB_H</div><div class='add'>+#define _ASM_C6X_SWAB_H</div><div class='add'>+</div><div class='add'>+static inline __attribute_const__ __u16 __c6x_swab16(__u16 val)</div><div class='add'>+{</div><div class='add'>+	asm("swap4 .l1 %0,%0\n" : "+a"(val));</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __attribute_const__ __u32 __c6x_swab32(__u32 val)</div><div class='add'>+{</div><div class='add'>+	asm("swap4 .l1 %0,%0\n"</div><div class='add'>+	    "swap2 .l1 %0,%0\n"</div><div class='add'>+	    : "+a"(val));</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __attribute_const__ __u64 __c6x_swab64(__u64 val)</div><div class='add'>+{</div><div class='add'>+	asm("   swap2 .s1 %p0,%P0\n"</div><div class='add'>+	    "|| swap2 .l1 %P0,%p0\n"</div><div class='add'>+	    "   swap4 .l1 %p0,%p0\n"</div><div class='add'>+	    "   swap4 .l1 %P0,%P0\n"</div><div class='add'>+	    : "+a"(val));</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __attribute_const__ __u32 __c6x_swahw32(__u32 val)</div><div class='add'>+{</div><div class='add'>+	asm("swap2 .l1 %0,%0\n" : "+a"(val));</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __attribute_const__ __u32 __c6x_swahb32(__u32 val)</div><div class='add'>+{</div><div class='add'>+	asm("swap4 .l1 %0,%0\n" : "+a"(val));</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define __arch_swab16 __c6x_swab16</div><div class='add'>+#define __arch_swab32 __c6x_swab32</div><div class='add'>+#define __arch_swab64 __c6x_swab64</div><div class='add'>+#define __arch_swahw32 __c6x_swahw32</div><div class='add'>+#define __arch_swahb32 __c6x_swahb32</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_SWAB_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/syscall.h b/arch/c6x/include/asm/syscall.h<br/>new file mode 100644<br/>index 000000000000..ae2be315ee9c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/syscall.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/syscall.h</a></div><div class='hunk'>@@ -0,0 +1,123 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ * Author: Mark Salter &lt;msalter@redhat.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 __ASM_C6X_SYSCALL_H</div><div class='add'>+#define __ASM_C6X_SYSCALL_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+</div><div class='add'>+static inline int syscall_get_nr(struct task_struct *task,</div><div class='add'>+				 struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return regs-&gt;b0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void syscall_rollback(struct task_struct *task,</div><div class='add'>+				    struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	/* do nothing */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline long syscall_get_error(struct task_struct *task,</div><div class='add'>+				     struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return IS_ERR_VALUE(regs-&gt;a4) ? regs-&gt;a4 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline long syscall_get_return_value(struct task_struct *task,</div><div class='add'>+					    struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return regs-&gt;a4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void syscall_set_return_value(struct task_struct *task,</div><div class='add'>+					    struct pt_regs *regs,</div><div class='add'>+					    int error, long val)</div><div class='add'>+{</div><div class='add'>+	regs-&gt;a4 = error ?: val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void syscall_get_arguments(struct task_struct *task,</div><div class='add'>+					 struct pt_regs *regs, unsigned int i,</div><div class='add'>+					 unsigned int n, unsigned long *args)</div><div class='add'>+{</div><div class='add'>+	switch (i) {</div><div class='add'>+	case 0:</div><div class='add'>+		if (!n--)</div><div class='add'>+			break;</div><div class='add'>+		*args++ = regs-&gt;a4;</div><div class='add'>+	case 1:</div><div class='add'>+		if (!n--)</div><div class='add'>+			break;</div><div class='add'>+		*args++ = regs-&gt;b4;</div><div class='add'>+	case 2:</div><div class='add'>+		if (!n--)</div><div class='add'>+			break;</div><div class='add'>+		*args++ = regs-&gt;a6;</div><div class='add'>+	case 3:</div><div class='add'>+		if (!n--)</div><div class='add'>+			break;</div><div class='add'>+		*args++ = regs-&gt;b6;</div><div class='add'>+	case 4:</div><div class='add'>+		if (!n--)</div><div class='add'>+			break;</div><div class='add'>+		*args++ = regs-&gt;a8;</div><div class='add'>+	case 5:</div><div class='add'>+		if (!n--)</div><div class='add'>+			break;</div><div class='add'>+		*args++ = regs-&gt;b8;</div><div class='add'>+	case 6:</div><div class='add'>+		if (!n--)</div><div class='add'>+			break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void syscall_set_arguments(struct task_struct *task,</div><div class='add'>+					 struct pt_regs *regs,</div><div class='add'>+					 unsigned int i, unsigned int n,</div><div class='add'>+					 const unsigned long *args)</div><div class='add'>+{</div><div class='add'>+	switch (i) {</div><div class='add'>+	case 0:</div><div class='add'>+		if (!n--)</div><div class='add'>+			break;</div><div class='add'>+		regs-&gt;a4 = *args++;</div><div class='add'>+	case 1:</div><div class='add'>+		if (!n--)</div><div class='add'>+			break;</div><div class='add'>+		regs-&gt;b4 = *args++;</div><div class='add'>+	case 2:</div><div class='add'>+		if (!n--)</div><div class='add'>+			break;</div><div class='add'>+		regs-&gt;a6 = *args++;</div><div class='add'>+	case 3:</div><div class='add'>+		if (!n--)</div><div class='add'>+			break;</div><div class='add'>+		regs-&gt;b6 = *args++;</div><div class='add'>+	case 4:</div><div class='add'>+		if (!n--)</div><div class='add'>+			break;</div><div class='add'>+		regs-&gt;a8 = *args++;</div><div class='add'>+	case 5:</div><div class='add'>+		if (!n--)</div><div class='add'>+			break;</div><div class='add'>+		regs-&gt;a9 = *args++;</div><div class='add'>+	case 6:</div><div class='add'>+		if (!n)</div><div class='add'>+			break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_C6X_SYSCALLS_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/syscalls.h b/arch/c6x/include/asm/syscalls.h<br/>new file mode 100644<br/>index 000000000000..aed53da703c9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/syscalls.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/syscalls.h</a></div><div class='hunk'>@@ -0,0 +1,55 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ * Author: Mark Salter &lt;msalter@redhat.com&gt;</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, version 2.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or</div><div class='add'>+ * NON INFRINGEMENT.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ASM_C6X_SYSCALLS_H</div><div class='add'>+#define __ASM_C6X_SYSCALLS_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/* The array of function pointers for syscalls. */</div><div class='add'>+extern void *sys_call_table[];</div><div class='add'>+</div><div class='add'>+/* The following are trampolines in entry.S to handle 64-bit arguments */</div><div class='add'>+extern long sys_pread_c6x(unsigned int fd, char __user *buf,</div><div class='add'>+			  size_t count, off_t pos_low, off_t pos_high);</div><div class='add'>+extern long sys_pwrite_c6x(unsigned int fd, const char __user *buf,</div><div class='add'>+			   size_t count, off_t pos_low, off_t pos_high);</div><div class='add'>+extern long sys_truncate64_c6x(const char __user *path,</div><div class='add'>+			       off_t length_low, off_t length_high);</div><div class='add'>+extern long sys_ftruncate64_c6x(unsigned int fd,</div><div class='add'>+			       off_t length_low, off_t length_high);</div><div class='add'>+extern long sys_fadvise64_c6x(int fd, u32 offset_lo, u32 offset_hi,</div><div class='add'>+			      u32 len, int advice);</div><div class='add'>+extern long sys_fadvise64_64_c6x(int fd, u32 offset_lo, u32 offset_hi,</div><div class='add'>+				u32 len_lo, u32 len_hi, int advice);</div><div class='add'>+extern long sys_fallocate_c6x(int fd, int mode,</div><div class='add'>+			      u32 offset_lo, u32 offset_hi,</div><div class='add'>+			      u32 len_lo, u32 len_hi);</div><div class='add'>+extern int sys_cache_sync(unsigned long s, unsigned long e);</div><div class='add'>+</div><div class='add'>+struct pt_regs;</div><div class='add'>+</div><div class='add'>+extern asmlinkage long sys_c6x_clone(struct pt_regs *regs);</div><div class='add'>+extern asmlinkage long sys_c6x_execve(const char __user *name,</div><div class='add'>+				      const char __user *const __user *argv,</div><div class='add'>+				      const char __user *const __user *envp,</div><div class='add'>+				      struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/syscalls.h&gt;</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_C6X_SYSCALLS_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/system.h b/arch/c6x/include/asm/system.h<br/>new file mode 100644<br/>index 000000000000..e076dc0eacc8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/system.h</a></div><div class='hunk'>@@ -0,0 +1,168 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_SYSTEM_H</div><div class='add'>+#define _ASM_C6X_SYSTEM_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;linux/irqflags.h&gt;</div><div class='add'>+</div><div class='add'>+#define prepare_to_switch()    do { } while (0)</div><div class='add'>+</div><div class='add'>+struct task_struct;</div><div class='add'>+struct thread_struct;</div><div class='add'>+asmlinkage void *__switch_to(struct thread_struct *prev,</div><div class='add'>+			     struct thread_struct *next,</div><div class='add'>+			     struct task_struct *tsk);</div><div class='add'>+</div><div class='add'>+#define switch_to(prev, next, last)				\</div><div class='add'>+	do {							\</div><div class='add'>+		current-&gt;thread.wchan = (u_long) __builtin_return_address(0); \</div><div class='add'>+		(last) = __switch_to(&amp;(prev)-&gt;thread,		\</div><div class='add'>+				     &amp;(next)-&gt;thread, (prev));	\</div><div class='add'>+		mb();						\</div><div class='add'>+		current-&gt;thread.wchan = 0;			\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+/* Reset the board */</div><div class='add'>+#define HARD_RESET_NOW()</div><div class='add'>+</div><div class='add'>+#define get_creg(reg) \</div><div class='add'>+	({ unsigned int __x; \</div><div class='add'>+	   asm volatile ("mvc .s2 " #reg ",%0\n" : "=b"(__x)); __x; })</div><div class='add'>+</div><div class='add'>+#define set_creg(reg, v) \</div><div class='add'>+	do { unsigned int __x = (unsigned int)(v); \</div><div class='add'>+		asm volatile ("mvc .s2 %0," #reg "\n" : : "b"(__x)); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define or_creg(reg, n) \</div><div class='add'>+	do { unsigned __x, __n = (unsigned)(n);		  \</div><div class='add'>+		asm volatile ("mvc .s2 " #reg ",%0\n"	  \</div><div class='add'>+			      "or  .l2 %1,%0,%0\n"	  \</div><div class='add'>+			      "mvc .s2 %0," #reg "\n"	  \</div><div class='add'>+			      "nop\n"			  \</div><div class='add'>+			      : "=&amp;b"(__x) : "b"(__n));	  \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define and_creg(reg, n) \</div><div class='add'>+	do { unsigned __x, __n = (unsigned)(n);		  \</div><div class='add'>+		asm volatile ("mvc .s2 " #reg ",%0\n"	  \</div><div class='add'>+			      "and .l2 %1,%0,%0\n"	  \</div><div class='add'>+			      "mvc .s2 %0," #reg "\n"	  \</div><div class='add'>+			      "nop\n"    \</div><div class='add'>+			      : "=&amp;b"(__x) : "b"(__n));	  \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define get_coreid() (get_creg(DNUM) &amp; 0xff)</div><div class='add'>+</div><div class='add'>+/* Set/get IST */</div><div class='add'>+#define set_ist(x)	set_creg(ISTP, x)</div><div class='add'>+#define get_ist()       get_creg(ISTP)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Exception management</div><div class='add'>+ */</div><div class='add'>+asmlinkage void enable_exception(void);</div><div class='add'>+#define disable_exception()</div><div class='add'>+#define get_except_type()        get_creg(EFR)</div><div class='add'>+#define ack_exception(type)      set_creg(ECR, 1 &lt;&lt; (type))</div><div class='add'>+#define get_iexcept()            get_creg(IERR)</div><div class='add'>+#define set_iexcept(mask)        set_creg(IERR, (mask))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Misc. functions</div><div class='add'>+ */</div><div class='add'>+#define nop()                    asm("NOP\n");</div><div class='add'>+#define mb()                     barrier()</div><div class='add'>+#define rmb()                    barrier()</div><div class='add'>+#define wmb()                    barrier()</div><div class='add'>+#define set_mb(var, value)       do { var = value;  mb(); } while (0)</div><div class='add'>+#define set_wmb(var, value)      do { var = value; wmb(); } while (0)</div><div class='add'>+</div><div class='add'>+#define smp_mb()	         barrier()</div><div class='add'>+#define smp_rmb()	         barrier()</div><div class='add'>+#define smp_wmb()	         barrier()</div><div class='add'>+#define smp_read_barrier_depends()	do { } while (0)</div><div class='add'>+</div><div class='add'>+#define xchg(ptr, x) \</div><div class='add'>+	((__typeof__(*(ptr)))__xchg((unsigned int)(x), (void *) (ptr), \</div><div class='add'>+				    sizeof(*(ptr))))</div><div class='add'>+#define tas(ptr)    xchg((ptr), 1)</div><div class='add'>+</div><div class='add'>+unsigned int _lmbd(unsigned int, unsigned int);</div><div class='add'>+unsigned int _bitr(unsigned int);</div><div class='add'>+</div><div class='add'>+struct __xchg_dummy { unsigned int a[100]; };</div><div class='add'>+#define __xg(x) ((volatile struct __xchg_dummy *)(x))</div><div class='add'>+</div><div class='add'>+static inline unsigned int __xchg(unsigned int x, volatile void *ptr, int size)</div><div class='add'>+{</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+</div><div class='add'>+	switch (size) {</div><div class='add'>+	case 1:</div><div class='add'>+		tmp = 0;</div><div class='add'>+		tmp = *((unsigned char *) ptr);</div><div class='add'>+		*((unsigned char *) ptr) = (unsigned char) x;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		tmp = 0;</div><div class='add'>+		tmp = *((unsigned short *) ptr);</div><div class='add'>+		*((unsigned short *) ptr) = x;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		tmp = 0;</div><div class='add'>+		tmp = *((unsigned int *) ptr);</div><div class='add'>+		*((unsigned int *) ptr) = x;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+	return tmp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/cmpxchg-local.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make</div><div class='add'>+ * them available.</div><div class='add'>+ */</div><div class='add'>+#define cmpxchg_local(ptr, o, n)					\</div><div class='add'>+	((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr),		\</div><div class='add'>+						     (unsigned long)(o), \</div><div class='add'>+						     (unsigned long)(n), \</div><div class='add'>+						     sizeof(*(ptr))))</div><div class='add'>+#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/cmpxchg.h&gt;</div><div class='add'>+</div><div class='add'>+#define _extu(x, s, e)							\</div><div class='add'>+	({      unsigned int __x;					\</div><div class='add'>+		asm volatile ("extu .S2 %3,%1,%2,%0\n" :		\</div><div class='add'>+			      "=b"(__x) : "n"(s), "n"(e), "b"(x));	\</div><div class='add'>+	       __x; })</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+extern unsigned int c6x_core_freq;</div><div class='add'>+</div><div class='add'>+struct pt_regs;</div><div class='add'>+</div><div class='add'>+extern void die(char *str, struct pt_regs *fp, int nr);</div><div class='add'>+extern asmlinkage int process_exception(struct pt_regs *regs);</div><div class='add'>+extern void time_init(void);</div><div class='add'>+extern void free_initmem(void);</div><div class='add'>+</div><div class='add'>+extern void (*c6x_restart)(void);</div><div class='add'>+extern void (*c6x_halt)(void);</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_SYSTEM_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/thread_info.h b/arch/c6x/include/asm/thread_info.h<br/>new file mode 100644<br/>index 000000000000..fd99148cda9d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/thread_info.h</a></div><div class='hunk'>@@ -0,0 +1,121 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</div><div class='add'>+ *</div><div class='add'>+ *  Updated for 2.6.3x: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_THREAD_INFO_H</div><div class='add'>+#define _ASM_C6X_THREAD_INFO_H</div><div class='add'>+</div><div class='add'>+#ifdef __KERNEL__</div><div class='add'>+</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_4KSTACKS</div><div class='add'>+#define THREAD_SIZE		4096</div><div class='add'>+#define THREAD_SHIFT		12</div><div class='add'>+#define THREAD_ORDER		0</div><div class='add'>+#else</div><div class='add'>+#define THREAD_SIZE		8192</div><div class='add'>+#define THREAD_SHIFT		13</div><div class='add'>+#define THREAD_ORDER		1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define THREAD_START_SP		(THREAD_SIZE - 8)</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+typedef struct {</div><div class='add'>+	unsigned long seg;</div><div class='add'>+} mm_segment_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * low level task data.</div><div class='add'>+ */</div><div class='add'>+struct thread_info {</div><div class='add'>+	struct task_struct	*task;		/* main task structure */</div><div class='add'>+	struct exec_domain	*exec_domain;	/* execution domain */</div><div class='add'>+	unsigned long		flags;		/* low level flags */</div><div class='add'>+	int			cpu;		/* cpu we're on */</div><div class='add'>+	int			preempt_count;	/* 0 = preemptable, &lt;0 = BUG */</div><div class='add'>+	mm_segment_t		addr_limit;	/* thread address space */</div><div class='add'>+	struct restart_block	restart_block;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * macros/functions for gaining access to the thread information structure</div><div class='add'>+ *</div><div class='add'>+ * preempt_count needs to be 1 initially, until the scheduler is functional.</div><div class='add'>+ */</div><div class='add'>+#define INIT_THREAD_INFO(tsk)			\</div><div class='add'>+{						\</div><div class='add'>+	.task		= &amp;tsk,			\</div><div class='add'>+	.exec_domain	= &amp;default_exec_domain,	\</div><div class='add'>+	.flags		= 0,			\</div><div class='add'>+	.cpu		= 0,			\</div><div class='add'>+	.preempt_count	= INIT_PREEMPT_COUNT,	\</div><div class='add'>+	.addr_limit	= KERNEL_DS,		\</div><div class='add'>+	.restart_block	= {			\</div><div class='add'>+		.fn = do_no_restart_syscall,	\</div><div class='add'>+	},					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define init_thread_info	(init_thread_union.thread_info)</div><div class='add'>+#define init_stack		(init_thread_union.stack)</div><div class='add'>+</div><div class='add'>+/* get the thread information struct of current task */</div><div class='add'>+static inline __attribute__((const))</div><div class='add'>+struct thread_info *current_thread_info(void)</div><div class='add'>+{</div><div class='add'>+	struct thread_info *ti;</div><div class='add'>+	asm volatile (" clr   .s2 B15,0,%1,%0\n"</div><div class='add'>+		      : "=b" (ti)</div><div class='add'>+		      : "Iu5" (THREAD_SHIFT - 1));</div><div class='add'>+	return ti;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR</div><div class='add'>+</div><div class='add'>+/* thread information allocation */</div><div class='add'>+#ifdef CONFIG_DEBUG_STACK_USAGE</div><div class='add'>+#define THREAD_FLAGS (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO)</div><div class='add'>+#else</div><div class='add'>+#define THREAD_FLAGS (GFP_KERNEL | __GFP_NOTRACK)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define alloc_thread_info_node(tsk, node)	\</div><div class='add'>+	((struct thread_info *)__get_free_pages(THREAD_FLAGS, THREAD_ORDER))</div><div class='add'>+</div><div class='add'>+#define free_thread_info(ti)	free_pages((unsigned long) (ti), THREAD_ORDER)</div><div class='add'>+#define get_thread_info(ti)	get_task_struct((ti)-&gt;task)</div><div class='add'>+#define put_thread_info(ti)	put_task_struct((ti)-&gt;task)</div><div class='add'>+#endif /* __ASSEMBLY__ */</div><div class='add'>+</div><div class='add'>+#define	PREEMPT_ACTIVE	0x10000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * thread information flag bit numbers</div><div class='add'>+ * - pending work-to-be-done flags are in LSW</div><div class='add'>+ * - other flags in MSW</div><div class='add'>+ */</div><div class='add'>+#define TIF_SYSCALL_TRACE	0	/* syscall trace active */</div><div class='add'>+#define TIF_NOTIFY_RESUME	1	/* resumption notification requested */</div><div class='add'>+#define TIF_SIGPENDING		2	/* signal pending */</div><div class='add'>+#define TIF_NEED_RESCHED	3	/* rescheduling necessary */</div><div class='add'>+#define TIF_RESTORE_SIGMASK	4	/* restore signal mask in do_signal() */</div><div class='add'>+</div><div class='add'>+#define TIF_POLLING_NRFLAG	16	/* true if polling TIF_NEED_RESCHED */</div><div class='add'>+#define TIF_MEMDIE		17	/* OOM killer killed process */</div><div class='add'>+</div><div class='add'>+#define TIF_WORK_MASK		0x00007FFE /* work on irq/exception return */</div><div class='add'>+#define TIF_ALLWORK_MASK	0x00007FFF /* work on any return to u-space */</div><div class='add'>+</div><div class='add'>+#endif /* __KERNEL__ */</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_THREAD_INFO_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/timer64.h b/arch/c6x/include/asm/timer64.h<br/>new file mode 100644<br/>index 000000000000..bbe27bb9887e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/timer64.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/timer64.h</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+#ifndef _C6X_TIMER64_H</div><div class='add'>+#define _C6X_TIMER64_H</div><div class='add'>+</div><div class='add'>+extern void __init timer64_init(void);</div><div class='add'>+</div><div class='add'>+#endif /* _C6X_TIMER64_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/timex.h b/arch/c6x/include/asm/timex.h<br/>new file mode 100644<br/>index 000000000000..508c3ec971f9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/timex.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/timex.h</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</div><div class='add'>+ *</div><div class='add'>+ *  Modified for 2.6.34: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_TIMEX_H</div><div class='add'>+#define _ASM_C6X_TIMEX_H</div><div class='add'>+</div><div class='add'>+#define CLOCK_TICK_RATE ((1000 * 1000000UL) / 6)</div><div class='add'>+</div><div class='add'>+/* 64-bit timestamp */</div><div class='add'>+typedef unsigned long long cycles_t;</div><div class='add'>+</div><div class='add'>+static inline cycles_t get_cycles(void)</div><div class='add'>+{</div><div class='add'>+	unsigned l, h;</div><div class='add'>+</div><div class='add'>+	asm volatile (" dint\n"</div><div class='add'>+		      " mvc .s2 TSCL,%0\n"</div><div class='add'>+		      " mvc .s2 TSCH,%1\n"</div><div class='add'>+		      " rint\n"</div><div class='add'>+		      : "=b"(l), "=b"(h));</div><div class='add'>+	return ((cycles_t)h &lt;&lt; 32) | l;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_TIMEX_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/tlb.h b/arch/c6x/include/asm/tlb.h<br/>new file mode 100644<br/>index 000000000000..8709e5e29d2d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/tlb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/tlb.h</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+#ifndef _ASM_C6X_TLB_H</div><div class='add'>+#define _ASM_C6X_TLB_H</div><div class='add'>+</div><div class='add'>+#define tlb_flush(tlb) flush_tlb_mm((tlb)-&gt;mm)</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/tlb.h&gt;</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_TLB_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/traps.h b/arch/c6x/include/asm/traps.h<br/>new file mode 100644<br/>index 000000000000..62124d7b1b5f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/traps.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/traps.h</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_TRAPS_H</div><div class='add'>+#define _ASM_C6X_TRAPS_H</div><div class='add'>+</div><div class='add'>+#define EXCEPT_TYPE_NXF   31	   /* NMI */</div><div class='add'>+#define EXCEPT_TYPE_EXC   30	   /* external exception */</div><div class='add'>+#define EXCEPT_TYPE_IXF   1	   /* internal exception */</div><div class='add'>+#define EXCEPT_TYPE_SXF   0	   /* software exception */</div><div class='add'>+</div><div class='add'>+#define EXCEPT_CAUSE_LBX  (1 &lt;&lt; 7) /* loop buffer exception */</div><div class='add'>+#define EXCEPT_CAUSE_PRX  (1 &lt;&lt; 6) /* privilege exception */</div><div class='add'>+#define EXCEPT_CAUSE_RAX  (1 &lt;&lt; 5) /* resource access exception */</div><div class='add'>+#define EXCEPT_CAUSE_RCX  (1 &lt;&lt; 4) /* resource conflict exception */</div><div class='add'>+#define EXCEPT_CAUSE_OPX  (1 &lt;&lt; 3) /* opcode exception */</div><div class='add'>+#define EXCEPT_CAUSE_EPX  (1 &lt;&lt; 2) /* execute packet exception */</div><div class='add'>+#define EXCEPT_CAUSE_FPX  (1 &lt;&lt; 1) /* fetch packet exception */</div><div class='add'>+#define EXCEPT_CAUSE_IFX  (1 &lt;&lt; 0) /* instruction fetch exception */</div><div class='add'>+</div><div class='add'>+struct exception_info {</div><div class='add'>+	char *kernel_str;</div><div class='add'>+	int  signo;</div><div class='add'>+	int  code;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern int (*c6x_nmi_handler)(struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_TRAPS_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/uaccess.h b/arch/c6x/include/asm/uaccess.h<br/>new file mode 100644<br/>index 000000000000..453dd263bee3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/uaccess.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/uaccess.h</a></div><div class='hunk'>@@ -0,0 +1,107 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_UACCESS_H</div><div class='add'>+#define _ASM_C6X_UACCESS_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ACCESS_CHECK</div><div class='add'>+#define __access_ok _access_ok</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * __copy_from_user/copy_to_user are based on ones in asm-generic/uaccess.h</div><div class='add'>+ *</div><div class='add'>+ * C6X supports unaligned 32 and 64 bit loads and stores.</div><div class='add'>+ */</div><div class='add'>+static inline __must_check long __copy_from_user(void *to,</div><div class='add'>+		const void __user *from, unsigned long n)</div><div class='add'>+{</div><div class='add'>+	u32 tmp32;</div><div class='add'>+	u64 tmp64;</div><div class='add'>+</div><div class='add'>+	if (__builtin_constant_p(n)) {</div><div class='add'>+		switch (n) {</div><div class='add'>+		case 1:</div><div class='add'>+			*(u8 *)to = *(u8 __force *)from;</div><div class='add'>+			return 0;</div><div class='add'>+		case 4:</div><div class='add'>+			asm volatile ("ldnw .d1t1 *%2,%0\n"</div><div class='add'>+				      "nop  4\n"</div><div class='add'>+				      "stnw .d1t1 %0,*%1\n"</div><div class='add'>+				      : "=&amp;a"(tmp32)</div><div class='add'>+				      : "A"(to), "a"(from)</div><div class='add'>+				      : "memory");</div><div class='add'>+			return 0;</div><div class='add'>+		case 8:</div><div class='add'>+			asm volatile ("ldndw .d1t1 *%2,%0\n"</div><div class='add'>+				      "nop   4\n"</div><div class='add'>+				      "stndw .d1t1 %0,*%1\n"</div><div class='add'>+				      : "=&amp;a"(tmp64)</div><div class='add'>+				      : "a"(to), "a"(from)</div><div class='add'>+				      : "memory");</div><div class='add'>+			return 0;</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'>+	memcpy(to, (const void __force *)from, n);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __must_check long __copy_to_user(void __user *to,</div><div class='add'>+		const void *from, unsigned long n)</div><div class='add'>+{</div><div class='add'>+	u32 tmp32;</div><div class='add'>+	u64 tmp64;</div><div class='add'>+</div><div class='add'>+	if (__builtin_constant_p(n)) {</div><div class='add'>+		switch (n) {</div><div class='add'>+		case 1:</div><div class='add'>+			*(u8 __force *)to = *(u8 *)from;</div><div class='add'>+			return 0;</div><div class='add'>+		case 4:</div><div class='add'>+			asm volatile ("ldnw .d1t1 *%2,%0\n"</div><div class='add'>+				      "nop  4\n"</div><div class='add'>+				      "stnw .d1t1 %0,*%1\n"</div><div class='add'>+				      : "=&amp;a"(tmp32)</div><div class='add'>+				      : "a"(to), "a"(from)</div><div class='add'>+				      : "memory");</div><div class='add'>+			return 0;</div><div class='add'>+		case 8:</div><div class='add'>+			asm volatile ("ldndw .d1t1 *%2,%0\n"</div><div class='add'>+				      "nop   4\n"</div><div class='add'>+				      "stndw .d1t1 %0,*%1\n"</div><div class='add'>+				      : "=&amp;a"(tmp64)</div><div class='add'>+				      : "a"(to), "a"(from)</div><div class='add'>+				      : "memory");</div><div class='add'>+			return 0;</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'>+	memcpy((void __force *)to, from, n);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define __copy_to_user   __copy_to_user</div><div class='add'>+#define __copy_from_user __copy_from_user</div><div class='add'>+</div><div class='add'>+extern int _access_ok(unsigned long addr, unsigned long size);</div><div class='add'>+#ifdef CONFIG_ACCESS_CHECK</div><div class='add'>+#define __access_ok _access_ok</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_UACCESS_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/unaligned.h b/arch/c6x/include/asm/unaligned.h<br/>new file mode 100644<br/>index 000000000000..b976cb740eaa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/unaligned.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/unaligned.h</a></div><div class='hunk'>@@ -0,0 +1,170 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</div><div class='add'>+ *  Rewritten for 2.6.3x: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_C6X_UNALIGNED_H</div><div class='add'>+#define _ASM_C6X_UNALIGNED_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/swab.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The C64x+ can do unaligned word and dword accesses in hardware</div><div class='add'>+ * using special load/store instructions.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline u16 get_unaligned_le16(const void *p)</div><div class='add'>+{</div><div class='add'>+	const u8 *_p = p;</div><div class='add'>+	return _p[0] | _p[1] &lt;&lt; 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 get_unaligned_be16(const void *p)</div><div class='add'>+{</div><div class='add'>+	const u8 *_p = p;</div><div class='add'>+	return _p[0] &lt;&lt; 8 | _p[1];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void put_unaligned_le16(u16 val, void *p)</div><div class='add'>+{</div><div class='add'>+	u8 *_p = p;</div><div class='add'>+	_p[0] = val;</div><div class='add'>+	_p[1] = val &gt;&gt; 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void put_unaligned_be16(u16 val, void *p)</div><div class='add'>+{</div><div class='add'>+	u8 *_p = p;</div><div class='add'>+	_p[0] = val &gt;&gt; 8;</div><div class='add'>+	_p[1] = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 get_unaligned32(const void *p)</div><div class='add'>+{</div><div class='add'>+	u32 val = (u32) p;</div><div class='add'>+	asm (" ldnw	.d1t1	*%0,%0\n"</div><div class='add'>+	     " nop     4\n"</div><div class='add'>+	     : "+a"(val));</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void put_unaligned32(u32 val, void *p)</div><div class='add'>+{</div><div class='add'>+	asm volatile (" stnw	.d2t1	%0,*%1\n"</div><div class='add'>+		      : : "a"(val), "b"(p) : "memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 get_unaligned64(const void *p)</div><div class='add'>+{</div><div class='add'>+	u64 val;</div><div class='add'>+	asm volatile (" ldndw	.d1t1	*%1,%0\n"</div><div class='add'>+		      " nop     4\n"</div><div class='add'>+		      : "=a"(val) : "a"(p));</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void put_unaligned64(u64 val, const void *p)</div><div class='add'>+{</div><div class='add'>+	asm volatile (" stndw	.d2t1	%0,*%1\n"</div><div class='add'>+		      : : "a"(val), "b"(p) : "memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='add'>+</div><div class='add'>+#define get_unaligned_le32(p)	 __swab32(get_unaligned32(p))</div><div class='add'>+#define get_unaligned_le64(p)	 __swab64(get_unaligned64(p))</div><div class='add'>+#define get_unaligned_be32(p)	 get_unaligned32(p)</div><div class='add'>+#define get_unaligned_be64(p)	 get_unaligned64(p)</div><div class='add'>+#define put_unaligned_le32(v, p) put_unaligned32(__swab32(v), (p))</div><div class='add'>+#define put_unaligned_le64(v, p) put_unaligned64(__swab64(v), (p))</div><div class='add'>+#define put_unaligned_be32(v, p) put_unaligned32((v), (p))</div><div class='add'>+#define put_unaligned_be64(v, p) put_unaligned64((v), (p))</div><div class='add'>+#define get_unaligned	__get_unaligned_be</div><div class='add'>+#define put_unaligned	__put_unaligned_be</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#define get_unaligned_le32(p)	 get_unaligned32(p)</div><div class='add'>+#define get_unaligned_le64(p)	 get_unaligned64(p)</div><div class='add'>+#define get_unaligned_be32(p)	 __swab32(get_unaligned32(p))</div><div class='add'>+#define get_unaligned_be64(p)	 __swab64(get_unaligned64(p))</div><div class='add'>+#define put_unaligned_le32(v, p) put_unaligned32((v), (p))</div><div class='add'>+#define put_unaligned_le64(v, p) put_unaligned64((v), (p))</div><div class='add'>+#define put_unaligned_be32(v, p) put_unaligned32(__swab32(v), (p))</div><div class='add'>+#define put_unaligned_be64(v, p) put_unaligned64(__swab64(v), (p))</div><div class='add'>+#define get_unaligned	__get_unaligned_le</div><div class='add'>+#define put_unaligned	__put_unaligned_le</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Cause a link-time error if we try an unaligned access other than</div><div class='add'>+ * 1,2,4 or 8 bytes long</div><div class='add'>+ */</div><div class='add'>+extern int __bad_unaligned_access_size(void);</div><div class='add'>+</div><div class='add'>+#define __get_unaligned_le(ptr) (typeof(*(ptr)))({			\</div><div class='add'>+	sizeof(*(ptr)) == 1 ? *(ptr) :					\</div><div class='add'>+	  (sizeof(*(ptr)) == 2 ? get_unaligned_le16((ptr)) :		\</div><div class='add'>+	     (sizeof(*(ptr)) == 4 ? get_unaligned_le32((ptr)) :		\</div><div class='add'>+		(sizeof(*(ptr)) == 8 ? get_unaligned_le64((ptr)) :	\</div><div class='add'>+		   __bad_unaligned_access_size())));			\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define __get_unaligned_be(ptr) (__force typeof(*(ptr)))({	\</div><div class='add'>+	sizeof(*(ptr)) == 1 ? *(ptr) :					\</div><div class='add'>+	  (sizeof(*(ptr)) == 2 ? get_unaligned_be16((ptr)) :		\</div><div class='add'>+	     (sizeof(*(ptr)) == 4 ? get_unaligned_be32((ptr)) :		\</div><div class='add'>+		(sizeof(*(ptr)) == 8 ? get_unaligned_be64((ptr)) :	\</div><div class='add'>+		   __bad_unaligned_access_size())));			\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define __put_unaligned_le(val, ptr) ({					\</div><div class='add'>+	void *__gu_p = (ptr);						\</div><div class='add'>+	switch (sizeof(*(ptr))) {					\</div><div class='add'>+	case 1:								\</div><div class='add'>+		*(u8 *)__gu_p = (__force u8)(val);			\</div><div class='add'>+		break;							\</div><div class='add'>+	case 2:								\</div><div class='add'>+		put_unaligned_le16((__force u16)(val), __gu_p);		\</div><div class='add'>+		break;							\</div><div class='add'>+	case 4:								\</div><div class='add'>+		put_unaligned_le32((__force u32)(val), __gu_p);		\</div><div class='add'>+		break;							\</div><div class='add'>+	case 8:								\</div><div class='add'>+		put_unaligned_le64((__force u64)(val), __gu_p);		\</div><div class='add'>+		break;							\</div><div class='add'>+	default:							\</div><div class='add'>+		__bad_unaligned_access_size();				\</div><div class='add'>+		break;							\</div><div class='add'>+	}								\</div><div class='add'>+	(void)0; })</div><div class='add'>+</div><div class='add'>+#define __put_unaligned_be(val, ptr) ({					\</div><div class='add'>+	void *__gu_p = (ptr);						\</div><div class='add'>+	switch (sizeof(*(ptr))) {					\</div><div class='add'>+	case 1:								\</div><div class='add'>+		*(u8 *)__gu_p = (__force u8)(val);			\</div><div class='add'>+		break;							\</div><div class='add'>+	case 2:								\</div><div class='add'>+		put_unaligned_be16((__force u16)(val), __gu_p);		\</div><div class='add'>+		break;							\</div><div class='add'>+	case 4:								\</div><div class='add'>+		put_unaligned_be32((__force u32)(val), __gu_p);		\</div><div class='add'>+		break;							\</div><div class='add'>+	case 8:								\</div><div class='add'>+		put_unaligned_be64((__force u64)(val), __gu_p);		\</div><div class='add'>+		break;							\</div><div class='add'>+	default:							\</div><div class='add'>+		__bad_unaligned_access_size();				\</div><div class='add'>+		break;							\</div><div class='add'>+	}								\</div><div class='add'>+	(void)0; })</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_UNALIGNED_H */</div><div class='head'>diff --git a/arch/c6x/include/asm/unistd.h b/arch/c6x/include/asm/unistd.h<br/>new file mode 100644<br/>index 000000000000..6d54ea4262eb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/include/asm/unistd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/include/asm/unistd.h</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *</div><div class='add'>+ * Based on arch/tile version.</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, version 2.</div><div class='add'>+ *</div><div class='add'>+ *   This program is distributed in the hope that it will be useful, but</div><div class='add'>+ *   WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or</div><div class='add'>+ *   NON INFRINGEMENT.	See the GNU General Public License for</div><div class='add'>+ *   more details.</div><div class='add'>+ */</div><div class='add'>+#if !defined(_ASM_C6X_UNISTD_H) || defined(__SYSCALL)</div><div class='add'>+#define _ASM_C6X_UNISTD_H</div><div class='add'>+</div><div class='add'>+/* Use the standard ABI for syscalls. */</div><div class='add'>+#include &lt;asm-generic/unistd.h&gt;</div><div class='add'>+</div><div class='add'>+/* C6X-specific syscalls. */</div><div class='add'>+#define __NR_cache_sync	(__NR_arch_specific_syscall + 0)</div><div class='add'>+__SYSCALL(__NR_cache_sync, sys_cache_sync)</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_C6X_UNISTD_H */</div><div class='head'>diff --git a/arch/c6x/kernel/Makefile b/arch/c6x/kernel/Makefile<br/>new file mode 100644<br/>index 000000000000..580a515a9443<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/Makefile</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for arch/c6x/kernel/</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+extra-y := head.o vmlinux.lds</div><div class='add'>+</div><div class='add'>+obj-y := process.o traps.o irq.o signal.o ptrace.o</div><div class='add'>+obj-y += setup.o sys_c6x.o time.o devicetree.o</div><div class='add'>+obj-y += switch_to.o entry.o vectors.o c6x_ksyms.o</div><div class='add'>+obj-y += soc.o dma.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_MODULES)           += module.o</div><div class='head'>diff --git a/arch/c6x/kernel/asm-offsets.c b/arch/c6x/kernel/asm-offsets.c<br/>new file mode 100644<br/>index 000000000000..759ad6d207b6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/asm-offsets.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -0,0 +1,123 @@</div><div class='add'>+/*</div><div class='add'>+ * Generate definitions needed by assembly language modules.</div><div class='add'>+ * This code generates raw asm output which is post-processed</div><div class='add'>+ * to extract and format the required data.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/thread_info.h&gt;</div><div class='add'>+#include &lt;asm/procinfo.h&gt;</div><div class='add'>+#include &lt;linux/kbuild.h&gt;</div><div class='add'>+#include &lt;linux/unistd.h&gt;</div><div class='add'>+</div><div class='add'>+void foo(void)</div><div class='add'>+{</div><div class='add'>+	OFFSET(REGS_A16,	pt_regs, a16);</div><div class='add'>+	OFFSET(REGS_A17,	pt_regs, a17);</div><div class='add'>+	OFFSET(REGS_A18,	pt_regs, a18);</div><div class='add'>+	OFFSET(REGS_A19,	pt_regs, a19);</div><div class='add'>+	OFFSET(REGS_A20,	pt_regs, a20);</div><div class='add'>+	OFFSET(REGS_A21,	pt_regs, a21);</div><div class='add'>+	OFFSET(REGS_A22,	pt_regs, a22);</div><div class='add'>+	OFFSET(REGS_A23,	pt_regs, a23);</div><div class='add'>+	OFFSET(REGS_A24,	pt_regs, a24);</div><div class='add'>+	OFFSET(REGS_A25,	pt_regs, a25);</div><div class='add'>+	OFFSET(REGS_A26,	pt_regs, a26);</div><div class='add'>+	OFFSET(REGS_A27,	pt_regs, a27);</div><div class='add'>+	OFFSET(REGS_A28,	pt_regs, a28);</div><div class='add'>+	OFFSET(REGS_A29,	pt_regs, a29);</div><div class='add'>+	OFFSET(REGS_A30,	pt_regs, a30);</div><div class='add'>+	OFFSET(REGS_A31,	pt_regs, a31);</div><div class='add'>+</div><div class='add'>+	OFFSET(REGS_B16,	pt_regs, b16);</div><div class='add'>+	OFFSET(REGS_B17,	pt_regs, b17);</div><div class='add'>+	OFFSET(REGS_B18,	pt_regs, b18);</div><div class='add'>+	OFFSET(REGS_B19,	pt_regs, b19);</div><div class='add'>+	OFFSET(REGS_B20,	pt_regs, b20);</div><div class='add'>+	OFFSET(REGS_B21,	pt_regs, b21);</div><div class='add'>+	OFFSET(REGS_B22,	pt_regs, b22);</div><div class='add'>+	OFFSET(REGS_B23,	pt_regs, b23);</div><div class='add'>+	OFFSET(REGS_B24,	pt_regs, b24);</div><div class='add'>+	OFFSET(REGS_B25,	pt_regs, b25);</div><div class='add'>+	OFFSET(REGS_B26,	pt_regs, b26);</div><div class='add'>+	OFFSET(REGS_B27,	pt_regs, b27);</div><div class='add'>+	OFFSET(REGS_B28,	pt_regs, b28);</div><div class='add'>+	OFFSET(REGS_B29,	pt_regs, b29);</div><div class='add'>+	OFFSET(REGS_B30,	pt_regs, b30);</div><div class='add'>+	OFFSET(REGS_B31,	pt_regs, b31);</div><div class='add'>+</div><div class='add'>+	OFFSET(REGS_A0,		pt_regs, a0);</div><div class='add'>+	OFFSET(REGS_A1,		pt_regs, a1);</div><div class='add'>+	OFFSET(REGS_A2,		pt_regs, a2);</div><div class='add'>+	OFFSET(REGS_A3,		pt_regs, a3);</div><div class='add'>+	OFFSET(REGS_A4,		pt_regs, a4);</div><div class='add'>+	OFFSET(REGS_A5,		pt_regs, a5);</div><div class='add'>+	OFFSET(REGS_A6,		pt_regs, a6);</div><div class='add'>+	OFFSET(REGS_A7,		pt_regs, a7);</div><div class='add'>+	OFFSET(REGS_A8,		pt_regs, a8);</div><div class='add'>+	OFFSET(REGS_A9,		pt_regs, a9);</div><div class='add'>+	OFFSET(REGS_A10,	pt_regs, a10);</div><div class='add'>+	OFFSET(REGS_A11,	pt_regs, a11);</div><div class='add'>+	OFFSET(REGS_A12,	pt_regs, a12);</div><div class='add'>+	OFFSET(REGS_A13,	pt_regs, a13);</div><div class='add'>+	OFFSET(REGS_A14,	pt_regs, a14);</div><div class='add'>+	OFFSET(REGS_A15,	pt_regs, a15);</div><div class='add'>+</div><div class='add'>+	OFFSET(REGS_B0,		pt_regs, b0);</div><div class='add'>+	OFFSET(REGS_B1,		pt_regs, b1);</div><div class='add'>+	OFFSET(REGS_B2,		pt_regs, b2);</div><div class='add'>+	OFFSET(REGS_B3,		pt_regs, b3);</div><div class='add'>+	OFFSET(REGS_B4,		pt_regs, b4);</div><div class='add'>+	OFFSET(REGS_B5,		pt_regs, b5);</div><div class='add'>+	OFFSET(REGS_B6,		pt_regs, b6);</div><div class='add'>+	OFFSET(REGS_B7,		pt_regs, b7);</div><div class='add'>+	OFFSET(REGS_B8,		pt_regs, b8);</div><div class='add'>+	OFFSET(REGS_B9,		pt_regs, b9);</div><div class='add'>+	OFFSET(REGS_B10,	pt_regs, b10);</div><div class='add'>+	OFFSET(REGS_B11,	pt_regs, b11);</div><div class='add'>+	OFFSET(REGS_B12,	pt_regs, b12);</div><div class='add'>+	OFFSET(REGS_B13,	pt_regs, b13);</div><div class='add'>+	OFFSET(REGS_DP,		pt_regs, dp);</div><div class='add'>+	OFFSET(REGS_SP,		pt_regs, sp);</div><div class='add'>+</div><div class='add'>+	OFFSET(REGS_TSR,	pt_regs, tsr);</div><div class='add'>+	OFFSET(REGS_ORIG_A4,	pt_regs, orig_a4);</div><div class='add'>+</div><div class='add'>+	DEFINE(REGS__END,	sizeof(struct pt_regs));</div><div class='add'>+	BLANK();</div><div class='add'>+</div><div class='add'>+	OFFSET(THREAD_PC,	thread_struct, pc);</div><div class='add'>+	OFFSET(THREAD_B15_14,	thread_struct, b15_14);</div><div class='add'>+	OFFSET(THREAD_A15_14,	thread_struct, a15_14);</div><div class='add'>+	OFFSET(THREAD_B13_12,	thread_struct, b13_12);</div><div class='add'>+	OFFSET(THREAD_A13_12,	thread_struct, a13_12);</div><div class='add'>+	OFFSET(THREAD_B11_10,	thread_struct, b11_10);</div><div class='add'>+	OFFSET(THREAD_A11_10,	thread_struct, a11_10);</div><div class='add'>+	OFFSET(THREAD_RICL_ICL,	thread_struct, ricl_icl);</div><div class='add'>+	BLANK();</div><div class='add'>+</div><div class='add'>+	OFFSET(TASK_STATE,	task_struct, state);</div><div class='add'>+	BLANK();</div><div class='add'>+</div><div class='add'>+	OFFSET(THREAD_INFO_FLAGS,	thread_info, flags);</div><div class='add'>+	OFFSET(THREAD_INFO_PREEMPT_COUNT, thread_info, preempt_count);</div><div class='add'>+	BLANK();</div><div class='add'>+</div><div class='add'>+	/* These would be unneccessary if we ran asm files</div><div class='add'>+	 * through the preprocessor.</div><div class='add'>+	 */</div><div class='add'>+	DEFINE(KTHREAD_SIZE, THREAD_SIZE);</div><div class='add'>+	DEFINE(KTHREAD_SHIFT, THREAD_SHIFT);</div><div class='add'>+	DEFINE(KTHREAD_START_SP, THREAD_START_SP);</div><div class='add'>+	DEFINE(ENOSYS_, ENOSYS);</div><div class='add'>+	DEFINE(NR_SYSCALLS_, __NR_syscalls);</div><div class='add'>+</div><div class='add'>+	DEFINE(_TIF_SYSCALL_TRACE, (1&lt;&lt;TIF_SYSCALL_TRACE));</div><div class='add'>+	DEFINE(_TIF_NOTIFY_RESUME, (1&lt;&lt;TIF_NOTIFY_RESUME));</div><div class='add'>+	DEFINE(_TIF_SIGPENDING, (1&lt;&lt;TIF_SIGPENDING));</div><div class='add'>+	DEFINE(_TIF_NEED_RESCHED, (1&lt;&lt;TIF_NEED_RESCHED));</div><div class='add'>+	DEFINE(_TIF_POLLING_NRFLAG, (1&lt;&lt;TIF_POLLING_NRFLAG));</div><div class='add'>+</div><div class='add'>+	DEFINE(_TIF_ALLWORK_MASK, TIF_ALLWORK_MASK);</div><div class='add'>+	DEFINE(_TIF_WORK_MASK, TIF_WORK_MASK);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/c6x/kernel/c6x_ksyms.c b/arch/c6x/kernel/c6x_ksyms.c<br/>new file mode 100644<br/>index 000000000000..0ba3e0bba3e1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/c6x_ksyms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/c6x_ksyms.c</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;asm/checksum.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * libgcc functions - used internally by the compiler...</div><div class='add'>+ */</div><div class='add'>+extern int __c6xabi_divi(int dividend, int divisor);</div><div class='add'>+EXPORT_SYMBOL(__c6xabi_divi);</div><div class='add'>+</div><div class='add'>+extern unsigned __c6xabi_divu(unsigned	dividend, unsigned divisor);</div><div class='add'>+EXPORT_SYMBOL(__c6xabi_divu);</div><div class='add'>+</div><div class='add'>+extern int __c6xabi_remi(int dividend, int divisor);</div><div class='add'>+EXPORT_SYMBOL(__c6xabi_remi);</div><div class='add'>+</div><div class='add'>+extern unsigned __c6xabi_remu(unsigned	dividend, unsigned divisor);</div><div class='add'>+EXPORT_SYMBOL(__c6xabi_remu);</div><div class='add'>+</div><div class='add'>+extern int __c6xabi_divremi(int dividend, int divisor);</div><div class='add'>+EXPORT_SYMBOL(__c6xabi_divremi);</div><div class='add'>+</div><div class='add'>+extern unsigned __c6xabi_divremu(unsigned  dividend, unsigned divisor);</div><div class='add'>+EXPORT_SYMBOL(__c6xabi_divremu);</div><div class='add'>+</div><div class='add'>+extern unsigned long long __c6xabi_mpyll(unsigned long long src1,</div><div class='add'>+					 unsigned long long src2);</div><div class='add'>+EXPORT_SYMBOL(__c6xabi_mpyll);</div><div class='add'>+</div><div class='add'>+extern long long __c6xabi_negll(long long src);</div><div class='add'>+EXPORT_SYMBOL(__c6xabi_negll);</div><div class='add'>+</div><div class='add'>+extern unsigned long long __c6xabi_llshl(unsigned long long src1, uint src2);</div><div class='add'>+EXPORT_SYMBOL(__c6xabi_llshl);</div><div class='add'>+</div><div class='add'>+extern long long __c6xabi_llshr(long long src1, uint src2);</div><div class='add'>+EXPORT_SYMBOL(__c6xabi_llshr);</div><div class='add'>+</div><div class='add'>+extern unsigned long long __c6xabi_llshru(unsigned long long src1, uint src2);</div><div class='add'>+EXPORT_SYMBOL(__c6xabi_llshru);</div><div class='add'>+</div><div class='add'>+extern void __c6xabi_strasgi(int *dst, const int *src, unsigned cnt);</div><div class='add'>+EXPORT_SYMBOL(__c6xabi_strasgi);</div><div class='add'>+</div><div class='add'>+extern void __c6xabi_push_rts(void);</div><div class='add'>+EXPORT_SYMBOL(__c6xabi_push_rts);</div><div class='add'>+</div><div class='add'>+extern void __c6xabi_pop_rts(void);</div><div class='add'>+EXPORT_SYMBOL(__c6xabi_pop_rts);</div><div class='add'>+</div><div class='add'>+extern void __c6xabi_strasgi_64plus(int *dst, const int *src, unsigned cnt);</div><div class='add'>+EXPORT_SYMBOL(__c6xabi_strasgi_64plus);</div><div class='add'>+</div><div class='add'>+/* lib functions */</div><div class='add'>+EXPORT_SYMBOL(memcpy);</div><div class='head'>diff --git a/arch/c6x/kernel/devicetree.c b/arch/c6x/kernel/devicetree.c<br/>new file mode 100644<br/>index 000000000000..bdb56f09d0ac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/devicetree.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/devicetree.c</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/*</div><div class='add'>+ *  Architecture specific OF callbacks.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_fdt.h&gt;</div><div class='add'>+#include &lt;linux/initrd.h&gt;</div><div class='add'>+#include &lt;linux/memblock.h&gt;</div><div class='add'>+</div><div class='add'>+void __init early_init_devtree(void *params)</div><div class='add'>+{</div><div class='add'>+	/* Setup flat device-tree pointer */</div><div class='add'>+	initial_boot_params = params;</div><div class='add'>+</div><div class='add'>+	/* Retrieve various informations from the /chosen node of the</div><div class='add'>+	 * device-tree, including the platform type, initrd location and</div><div class='add'>+	 * size and more ...</div><div class='add'>+	 */</div><div class='add'>+	of_scan_flat_dt(early_init_dt_scan_chosen, c6x_command_line);</div><div class='add'>+</div><div class='add'>+	/* Scan memory nodes and rebuild MEMBLOCKs */</div><div class='add'>+	of_scan_flat_dt(early_init_dt_scan_root, NULL);</div><div class='add'>+	of_scan_flat_dt(early_init_dt_scan_memory, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BLK_DEV_INITRD</div><div class='add'>+void __init early_init_dt_setup_initrd_arch(unsigned long start,</div><div class='add'>+		unsigned long end)</div><div class='add'>+{</div><div class='add'>+	initrd_start = (unsigned long)__va(start);</div><div class='add'>+	initrd_end = (unsigned long)__va(end);</div><div class='add'>+	initrd_below_start_ok = 1;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void __init early_init_dt_add_memory_arch(u64 base, u64 size)</div><div class='add'>+{</div><div class='add'>+	c6x_add_memory(base, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)</div><div class='add'>+{</div><div class='add'>+	return __va(memblock_alloc(size, align));</div><div class='add'>+}</div><div class='head'>diff --git a/arch/c6x/kernel/dma.c b/arch/c6x/kernel/dma.c<br/>new file mode 100644<br/>index 000000000000..ab7b12de144d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/dma.c</a></div><div class='hunk'>@@ -0,0 +1,153 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+</div><div class='add'>+static void c6x_dma_sync(dma_addr_t handle, size_t size,</div><div class='add'>+			 enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	unsigned long paddr = handle;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!valid_dma_direction(dir));</div><div class='add'>+</div><div class='add'>+	switch (dir) {</div><div class='add'>+	case DMA_FROM_DEVICE:</div><div class='add'>+		L2_cache_block_invalidate(paddr, paddr + size);</div><div class='add'>+		break;</div><div class='add'>+	case DMA_TO_DEVICE:</div><div class='add'>+		L2_cache_block_writeback(paddr, paddr + size);</div><div class='add'>+		break;</div><div class='add'>+	case DMA_BIDIRECTIONAL:</div><div class='add'>+		L2_cache_block_writeback_invalidate(paddr, paddr + size);</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'>+dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size,</div><div class='add'>+			  enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t addr = virt_to_phys(ptr);</div><div class='add'>+</div><div class='add'>+	c6x_dma_sync(addr, size, dir);</div><div class='add'>+</div><div class='add'>+	debug_dma_map_page(dev, virt_to_page(ptr),</div><div class='add'>+			   (unsigned long)ptr &amp; ~PAGE_MASK, size,</div><div class='add'>+			   dir, addr, true);</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_map_single);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void dma_unmap_single(struct device *dev, dma_addr_t handle,</div><div class='add'>+		      size_t size, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	c6x_dma_sync(handle, size, dir);</div><div class='add'>+</div><div class='add'>+	debug_dma_unmap_page(dev, handle, size, dir, true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_unmap_single);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int dma_map_sg(struct device *dev, struct scatterlist *sglist,</div><div class='add'>+	       int nents, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_sg(sglist, sg, nents, i)</div><div class='add'>+		sg-&gt;dma_address = dma_map_single(dev, sg_virt(sg), sg-&gt;length,</div><div class='add'>+						 dir);</div><div class='add'>+</div><div class='add'>+	debug_dma_map_sg(dev, sglist, nents, nents, dir);</div><div class='add'>+</div><div class='add'>+	return nents;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_map_sg);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void dma_unmap_sg(struct device *dev, struct scatterlist *sglist,</div><div class='add'>+		  int nents, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_sg(sglist, sg, nents, i)</div><div class='add'>+		dma_unmap_single(dev, sg_dma_address(sg), sg-&gt;length, dir);</div><div class='add'>+</div><div class='add'>+	debug_dma_unmap_sg(dev, sglist,	nents, dir);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_unmap_sg);</div><div class='add'>+</div><div class='add'>+void dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle,</div><div class='add'>+			     size_t size, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	c6x_dma_sync(handle, size, dir);</div><div class='add'>+</div><div class='add'>+	debug_dma_sync_single_for_cpu(dev, handle, size, dir);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_sync_single_for_cpu);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void dma_sync_single_for_device(struct device *dev, dma_addr_t handle,</div><div class='add'>+				size_t size, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	c6x_dma_sync(handle, size, dir);</div><div class='add'>+</div><div class='add'>+	debug_dma_sync_single_for_device(dev, handle, size, dir);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_sync_single_for_device);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sglist,</div><div class='add'>+			 int nents, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_sg(sglist, sg, nents, i)</div><div class='add'>+		dma_sync_single_for_cpu(dev, sg_dma_address(sg),</div><div class='add'>+					sg-&gt;length, dir);</div><div class='add'>+</div><div class='add'>+	debug_dma_sync_sg_for_cpu(dev, sglist, nents, dir);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_sync_sg_for_cpu);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sglist,</div><div class='add'>+			    int nents, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_sg(sglist, sg, nents, i)</div><div class='add'>+		dma_sync_single_for_device(dev, sg_dma_address(sg),</div><div class='add'>+					   sg-&gt;length, dir);</div><div class='add'>+</div><div class='add'>+	debug_dma_sync_sg_for_device(dev, sglist, nents, dir);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_sync_sg_for_device);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Number of entries preallocated for DMA-API debugging */</div><div class='add'>+#define PREALLOC_DMA_DEBUG_ENTRIES (1 &lt;&lt; 16)</div><div class='add'>+</div><div class='add'>+static int __init dma_init(void)</div><div class='add'>+{</div><div class='add'>+	dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+fs_initcall(dma_init);</div><div class='head'>diff --git a/arch/c6x/kernel/entry.S b/arch/c6x/kernel/entry.S<br/>new file mode 100644<br/>index 000000000000..3e977ccda827<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/entry.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/entry.S</a></div><div class='hunk'>@@ -0,0 +1,803 @@</div><div class='add'>+;</div><div class='add'>+;  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+;</div><div class='add'>+;  Copyright (C) 2004-2011 Texas Instruments Incorporated</div><div class='add'>+;  Author: Aurelien Jacquiot (aurelien.jacquiot@virtuallogix.com)</div><div class='add'>+;  Updated for 2.6.34: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+;  published by the Free Software Foundation.</div><div class='add'>+;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sys.h&gt;</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/thread_info.h&gt;</div><div class='add'>+#include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+#include &lt;asm/unistd.h&gt;</div><div class='add'>+#include &lt;asm/errno.h&gt;</div><div class='add'>+</div><div class='add'>+; Registers naming</div><div class='add'>+#define DP	B14</div><div class='add'>+#define SP	B15</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_PREEMPT</div><div class='add'>+#define resume_kernel restore_all</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	.altmacro</div><div class='add'>+</div><div class='add'>+	.macro MASK_INT reg</div><div class='add'>+	MVC	.S2	CSR,reg</div><div class='add'>+	CLR	.S2	reg,0,0,reg</div><div class='add'>+	MVC	.S2	reg,CSR</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro UNMASK_INT reg</div><div class='add'>+	MVC	.S2	CSR,reg</div><div class='add'>+	SET	.S2	reg,0,0,reg</div><div class='add'>+	MVC	.S2	reg,CSR</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro GET_THREAD_INFO reg</div><div class='add'>+	SHR	.S1X	SP,THREAD_SHIFT,reg</div><div class='add'>+	SHL	.S1	reg,THREAD_SHIFT,reg</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	;;</div><div class='add'>+	;;  This defines the normal kernel pt_regs layout.</div><div class='add'>+	;;</div><div class='add'>+	.macro SAVE_ALL __rp __tsr</div><div class='add'>+	STW	.D2T2	B0,*SP--[2]		; save original B0</div><div class='add'>+	MVKL	.S2	current_ksp,B0</div><div class='add'>+	MVKH	.S2	current_ksp,B0</div><div class='add'>+	LDW	.D2T2	*B0,B1			; KSP</div><div class='add'>+</div><div class='add'>+	NOP	3</div><div class='add'>+	STW	.D2T2	B1,*+SP[1]		; save original B1</div><div class='add'>+	XOR	.D2	SP,B1,B0		; (SP ^ KSP)</div><div class='add'>+	LDW	.D2T2	*+SP[1],B1		; restore B0/B1</div><div class='add'>+	LDW	.D2T2	*++SP[2],B0</div><div class='add'>+	SHR	.S2	B0,THREAD_SHIFT,B0	; 0 if already using kstack</div><div class='add'>+  [B0]	STDW	.D2T2	SP:DP,*--B1[1]		; user: save user sp/dp kstack</div><div class='add'>+  [B0]	MV	.S2	B1,SP			;    and switch to kstack</div><div class='add'>+||[!B0] STDW	.D2T2	SP:DP,*--SP[1]		; kernel: save on current stack</div><div class='add'>+</div><div class='add'>+	SUBAW	.D2	SP,2,SP</div><div class='add'>+</div><div class='add'>+	ADD	.D1X	SP,-8,A15</div><div class='add'>+ ||	STDW	.D2T1	A15:A14,*SP--[16]	; save A15:A14</div><div class='add'>+</div><div class='add'>+	STDW	.D2T2	B13:B12,*SP--[1]</div><div class='add'>+ ||	STDW	.D1T1	A13:A12,*A15--[1]</div><div class='add'>+ ||	MVC	.S2	__rp,B13</div><div class='add'>+</div><div class='add'>+	STDW	.D2T2	B11:B10,*SP--[1]</div><div class='add'>+ ||	STDW	.D1T1	A11:A10,*A15--[1]</div><div class='add'>+ ||	MVC	.S2	CSR,B12</div><div class='add'>+</div><div class='add'>+	STDW	.D2T2	B9:B8,*SP--[1]</div><div class='add'>+ ||	STDW	.D1T1	A9:A8,*A15--[1]</div><div class='add'>+ ||	MVC	.S2	RILC,B11</div><div class='add'>+	STDW	.D2T2	B7:B6,*SP--[1]</div><div class='add'>+ ||	STDW	.D1T1	A7:A6,*A15--[1]</div><div class='add'>+ ||	MVC	.S2	ILC,B10</div><div class='add'>+</div><div class='add'>+	STDW	.D2T2	B5:B4,*SP--[1]</div><div class='add'>+ ||	STDW	.D1T1	A5:A4,*A15--[1]</div><div class='add'>+</div><div class='add'>+	STDW	.D2T2	B3:B2,*SP--[1]</div><div class='add'>+ ||	STDW	.D1T1	A3:A2,*A15--[1]</div><div class='add'>+ ||	MVC	.S2	__tsr,B5</div><div class='add'>+</div><div class='add'>+	STDW	.D2T2	B1:B0,*SP--[1]</div><div class='add'>+ ||	STDW	.D1T1	A1:A0,*A15--[1]</div><div class='add'>+ ||	MV	.S1X	B5,A5</div><div class='add'>+</div><div class='add'>+	STDW	.D2T2	B31:B30,*SP--[1]</div><div class='add'>+ ||	STDW	.D1T1	A31:A30,*A15--[1]</div><div class='add'>+	STDW	.D2T2	B29:B28,*SP--[1]</div><div class='add'>+ ||	STDW	.D1T1	A29:A28,*A15--[1]</div><div class='add'>+	STDW	.D2T2	B27:B26,*SP--[1]</div><div class='add'>+ ||	STDW	.D1T1	A27:A26,*A15--[1]</div><div class='add'>+	STDW	.D2T2	B25:B24,*SP--[1]</div><div class='add'>+ ||	STDW	.D1T1	A25:A24,*A15--[1]</div><div class='add'>+	STDW	.D2T2	B23:B22,*SP--[1]</div><div class='add'>+ ||	STDW	.D1T1	A23:A22,*A15--[1]</div><div class='add'>+	STDW	.D2T2	B21:B20,*SP--[1]</div><div class='add'>+ ||	STDW	.D1T1	A21:A20,*A15--[1]</div><div class='add'>+	STDW	.D2T2	B19:B18,*SP--[1]</div><div class='add'>+ ||	STDW	.D1T1	A19:A18,*A15--[1]</div><div class='add'>+	STDW	.D2T2	B17:B16,*SP--[1]</div><div class='add'>+ ||	STDW	.D1T1	A17:A16,*A15--[1]</div><div class='add'>+</div><div class='add'>+	STDW	.D2T2	B13:B12,*SP--[1]	; save PC and CSR</div><div class='add'>+</div><div class='add'>+	STDW	.D2T2	B11:B10,*SP--[1]	; save RILC and ILC</div><div class='add'>+	STDW	.D2T1	A5:A4,*SP--[1]		; save TSR and orig A4</div><div class='add'>+</div><div class='add'>+	;; We left an unused word on the stack just above pt_regs.</div><div class='add'>+	;; It is used to save whether or not this frame is due to</div><div class='add'>+	;; a syscall. It is cleared here, but the syscall handler</div><div class='add'>+	;; sets it to a non-zero value.</div><div class='add'>+	MVK	.L2	0,B1</div><div class='add'>+	STW	.D2T2	B1,*+SP(REGS__END+8)	; clear syscall flag</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro RESTORE_ALL __rp __tsr</div><div class='add'>+	LDDW	.D2T2	*++SP[1],B9:B8		; get TSR (B9)</div><div class='add'>+	LDDW	.D2T2	*++SP[1],B11:B10	; get RILC (B11) and ILC (B10)</div><div class='add'>+	LDDW	.D2T2	*++SP[1],B13:B12	; get PC (B13) and CSR (B12)</div><div class='add'>+</div><div class='add'>+	ADDAW	.D1X	SP,30,A15</div><div class='add'>+</div><div class='add'>+	LDDW	.D1T1	*++A15[1],A17:A16</div><div class='add'>+ ||	LDDW	.D2T2	*++SP[1],B17:B16</div><div class='add'>+	LDDW	.D1T1	*++A15[1],A19:A18</div><div class='add'>+ ||	LDDW	.D2T2	*++SP[1],B19:B18</div><div class='add'>+	LDDW	.D1T1	*++A15[1],A21:A20</div><div class='add'>+ ||	LDDW	.D2T2	*++SP[1],B21:B20</div><div class='add'>+	LDDW	.D1T1	*++A15[1],A23:A22</div><div class='add'>+ ||	LDDW	.D2T2	*++SP[1],B23:B22</div><div class='add'>+	LDDW	.D1T1	*++A15[1],A25:A24</div><div class='add'>+ ||	LDDW	.D2T2	*++SP[1],B25:B24</div><div class='add'>+	LDDW	.D1T1	*++A15[1],A27:A26</div><div class='add'>+ ||	LDDW	.D2T2	*++SP[1],B27:B26</div><div class='add'>+	LDDW	.D1T1	*++A15[1],A29:A28</div><div class='add'>+ ||	LDDW	.D2T2	*++SP[1],B29:B28</div><div class='add'>+	LDDW	.D1T1	*++A15[1],A31:A30</div><div class='add'>+ ||	LDDW	.D2T2	*++SP[1],B31:B30</div><div class='add'>+</div><div class='add'>+	LDDW	.D1T1	*++A15[1],A1:A0</div><div class='add'>+ ||	LDDW	.D2T2	*++SP[1],B1:B0</div><div class='add'>+</div><div class='add'>+	LDDW	.D1T1	*++A15[1],A3:A2</div><div class='add'>+ ||	LDDW	.D2T2	*++SP[1],B3:B2</div><div class='add'>+ ||	MVC	.S2	B9,__tsr</div><div class='add'>+	LDDW	.D1T1	*++A15[1],A5:A4</div><div class='add'>+ ||	LDDW	.D2T2	*++SP[1],B5:B4</div><div class='add'>+ ||	MVC	.S2	B11,RILC</div><div class='add'>+	LDDW	.D1T1	*++A15[1],A7:A6</div><div class='add'>+ ||	LDDW	.D2T2	*++SP[1],B7:B6</div><div class='add'>+ ||	MVC	.S2	B10,ILC</div><div class='add'>+</div><div class='add'>+	LDDW	.D1T1	*++A15[1],A9:A8</div><div class='add'>+ ||	LDDW	.D2T2	*++SP[1],B9:B8</div><div class='add'>+ ||	MVC	.S2	B13,__rp</div><div class='add'>+</div><div class='add'>+	LDDW	.D1T1	*++A15[1],A11:A10</div><div class='add'>+ ||	LDDW	.D2T2	*++SP[1],B11:B10</div><div class='add'>+ ||	MVC	.S2	B12,CSR</div><div class='add'>+</div><div class='add'>+	LDDW	.D1T1	*++A15[1],A13:A12</div><div class='add'>+ ||	LDDW	.D2T2	*++SP[1],B13:B12</div><div class='add'>+</div><div class='add'>+	MV	.D2X	A15,SP</div><div class='add'>+ ||	MVKL	.S1	current_ksp,A15</div><div class='add'>+	MVKH	.S1	current_ksp,A15</div><div class='add'>+ ||	ADDAW	.D1X	SP,6,A14</div><div class='add'>+	STW	.D1T1	A14,*A15	; save kernel stack pointer</div><div class='add'>+</div><div class='add'>+	LDDW	.D2T1	*++SP[1],A15:A14</div><div class='add'>+</div><div class='add'>+	B	.S2	__rp		; return from interruption</div><div class='add'>+	LDDW	.D2T2	*+SP[1],SP:DP</div><div class='add'>+	NOP	4</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.section .text</div><div class='add'>+</div><div class='add'>+	;;</div><div class='add'>+	;; Jump to schedule() then return to ret_from_exception</div><div class='add'>+	;;</div><div class='add'>+_reschedule:</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+	MVKL	.S1	schedule,A0</div><div class='add'>+	MVKH	.S1	schedule,A0</div><div class='add'>+	B	.S2X	A0</div><div class='add'>+#else</div><div class='add'>+	B	.S1	schedule</div><div class='add'>+#endif</div><div class='add'>+	ADDKPC	.S2	ret_from_exception,B3,4</div><div class='add'>+</div><div class='add'>+	;;</div><div class='add'>+	;; Called before syscall handler when process is being debugged</div><div class='add'>+	;;</div><div class='add'>+tracesys_on:</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+	MVKL	.S1	syscall_trace_entry,A0</div><div class='add'>+	MVKH	.S1	syscall_trace_entry,A0</div><div class='add'>+	B	.S2X	A0</div><div class='add'>+#else</div><div class='add'>+	B	.S1	syscall_trace_entry</div><div class='add'>+#endif</div><div class='add'>+	ADDKPC	.S2	ret_from_syscall_trace,B3,3</div><div class='add'>+	ADD	.S1X	8,SP,A4</div><div class='add'>+</div><div class='add'>+ret_from_syscall_trace:</div><div class='add'>+	;; tracing returns (possibly new) syscall number</div><div class='add'>+	MV	.D2X	A4,B0</div><div class='add'>+ ||	MVK	.S2	__NR_syscalls,B1</div><div class='add'>+	CMPLTU	.L2	B0,B1,B1</div><div class='add'>+</div><div class='add'>+ [!B1]	BNOP	.S2	ret_from_syscall_function,5</div><div class='add'>+ ||	MVK	.S1	-ENOSYS,A4</div><div class='add'>+</div><div class='add'>+	;; reload syscall args from (possibly modified) stack frame</div><div class='add'>+	;; and get syscall handler addr from sys_call_table:</div><div class='add'>+	LDW	.D2T2	*+SP(REGS_B4+8),B4</div><div class='add'>+ ||	MVKL	.S2	sys_call_table,B1</div><div class='add'>+	LDW	.D2T1	*+SP(REGS_A6+8),A6</div><div class='add'>+ ||	MVKH	.S2	sys_call_table,B1</div><div class='add'>+	LDW	.D2T2	*+B1[B0],B0</div><div class='add'>+ ||	MVKL	.S2	ret_from_syscall_function,B3</div><div class='add'>+	LDW	.D2T2	*+SP(REGS_B6+8),B6</div><div class='add'>+ ||	MVKH	.S2	ret_from_syscall_function,B3</div><div class='add'>+	LDW	.D2T1	*+SP(REGS_A8+8),A8</div><div class='add'>+	LDW	.D2T2	*+SP(REGS_B8+8),B8</div><div class='add'>+	NOP</div><div class='add'>+	; B0 = sys_call_table[__NR_*]</div><div class='add'>+	BNOP	.S2	B0,5			; branch to syscall handler</div><div class='add'>+ ||	LDW	.D2T1	*+SP(REGS_ORIG_A4+8),A4</div><div class='add'>+</div><div class='add'>+syscall_exit_work:</div><div class='add'>+	AND	.D1	_TIF_SYSCALL_TRACE,A2,A0</div><div class='add'>+ [!A0]	BNOP	.S1	work_pending,5</div><div class='add'>+ [A0]	B	.S2	syscall_trace_exit</div><div class='add'>+	ADDKPC	.S2	resume_userspace,B3,1</div><div class='add'>+	MVC	.S2	CSR,B1</div><div class='add'>+	SET	.S2	B1,0,0,B1</div><div class='add'>+	MVC	.S2	B1,CSR		; enable ints</div><div class='add'>+</div><div class='add'>+work_pending:</div><div class='add'>+	AND	.D1	_TIF_NEED_RESCHED,A2,A0</div><div class='add'>+ [!A0]	BNOP	.S1	work_notifysig,5</div><div class='add'>+</div><div class='add'>+work_resched:</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+	MVKL	.S1	schedule,A1</div><div class='add'>+	MVKH	.S1	schedule,A1</div><div class='add'>+	B	.S2X	A1</div><div class='add'>+#else</div><div class='add'>+	B	.S2	schedule</div><div class='add'>+#endif</div><div class='add'>+	ADDKPC	.S2	work_rescheduled,B3,4</div><div class='add'>+work_rescheduled:</div><div class='add'>+	;; make sure we don't miss an interrupt setting need_resched or</div><div class='add'>+	;; sigpending between sampling and the rti</div><div class='add'>+	MASK_INT B2</div><div class='add'>+	GET_THREAD_INFO A12</div><div class='add'>+	LDW	.D1T1	*+A12(THREAD_INFO_FLAGS),A2</div><div class='add'>+	MVK	.S1	_TIF_WORK_MASK,A1</div><div class='add'>+	MVK	.S1	_TIF_NEED_RESCHED,A3</div><div class='add'>+	NOP	2</div><div class='add'>+	AND	.D1	A1,A2,A0</div><div class='add'>+ ||	AND	.S1	A3,A2,A1</div><div class='add'>+ [!A0]	BNOP	.S1	restore_all,5</div><div class='add'>+ [A1]	BNOP	.S1	work_resched,5</div><div class='add'>+</div><div class='add'>+work_notifysig:</div><div class='add'>+	B	.S2	do_notify_resume</div><div class='add'>+	LDW	.D2T1	*+SP(REGS__END+8),A6 ; syscall flag</div><div class='add'>+	ADDKPC	.S2	resume_userspace,B3,1</div><div class='add'>+	ADD	.S1X	8,SP,A4		; pt_regs pointer is first arg</div><div class='add'>+	MV	.D2X	A2,B4		; thread_info flags is second arg</div><div class='add'>+</div><div class='add'>+	;;</div><div class='add'>+	;; On C64x+, the return way from exception and interrupt</div><div class='add'>+	;; is a little bit different</div><div class='add'>+	;;</div><div class='add'>+ENTRY(ret_from_exception)</div><div class='add'>+#ifdef CONFIG_PREEMPT</div><div class='add'>+	MASK_INT B2</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+ENTRY(ret_from_interrupt)</div><div class='add'>+	;;</div><div class='add'>+	;; Check if we are comming from user mode.</div><div class='add'>+	;;</div><div class='add'>+	LDW	.D2T2	*+SP(REGS_TSR+8),B0</div><div class='add'>+	MVK	.S2	0x40,B1</div><div class='add'>+	NOP	3</div><div class='add'>+	AND	.D2	B0,B1,B0</div><div class='add'>+ [!B0]	BNOP	.S2	resume_kernel,5</div><div class='add'>+</div><div class='add'>+resume_userspace:</div><div class='add'>+	;; make sure we don't miss an interrupt setting need_resched or</div><div class='add'>+	;; sigpending between sampling and the rti</div><div class='add'>+	MASK_INT B2</div><div class='add'>+	GET_THREAD_INFO A12</div><div class='add'>+	LDW	.D1T1	*+A12(THREAD_INFO_FLAGS),A2</div><div class='add'>+	MVK	.S1	_TIF_WORK_MASK,A1</div><div class='add'>+	MVK	.S1	_TIF_NEED_RESCHED,A3</div><div class='add'>+	NOP	2</div><div class='add'>+	AND	.D1	A1,A2,A0</div><div class='add'>+ [A0]	BNOP	.S1	work_pending,5</div><div class='add'>+	BNOP	.S1	restore_all,5</div><div class='add'>+</div><div class='add'>+	;;</div><div class='add'>+	;; System call handling</div><div class='add'>+	;; B0 = syscall number (in sys_call_table)</div><div class='add'>+	;; A4,B4,A6,B6,A8,B8 = arguments of the syscall function</div><div class='add'>+	;; A4 is the return value register</div><div class='add'>+	;;</div><div class='add'>+system_call_saved:</div><div class='add'>+	MVK	.L2	1,B2</div><div class='add'>+	STW	.D2T2	B2,*+SP(REGS__END+8)	; set syscall flag</div><div class='add'>+	MVC	.S2	B2,ECR			; ack the software exception</div><div class='add'>+</div><div class='add'>+	UNMASK_INT B2			; re-enable global IT</div><div class='add'>+</div><div class='add'>+system_call_saved_noack:</div><div class='add'>+	;; Check system call number</div><div class='add'>+	MVK	.S2	__NR_syscalls,B1</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+ ||	MVKL	.S1	sys_ni_syscall,A0</div><div class='add'>+#endif</div><div class='add'>+	CMPLTU	.L2	B0,B1,B1</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+ ||	MVKH	.S1	sys_ni_syscall,A0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	;; Check for ptrace</div><div class='add'>+	GET_THREAD_INFO A12</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+ [!B1]	B	.S2X	A0</div><div class='add'>+#else</div><div class='add'>+ [!B1]	B	.S2	sys_ni_syscall</div><div class='add'>+#endif</div><div class='add'>+ [!B1]	ADDKPC	.S2	ret_from_syscall_function,B3,4</div><div class='add'>+</div><div class='add'>+	;; Get syscall handler addr from sys_call_table</div><div class='add'>+	;; call tracesys_on or call syscall handler</div><div class='add'>+	LDW	.D1T1	*+A12(THREAD_INFO_FLAGS),A2</div><div class='add'>+ ||	MVKL	.S2	sys_call_table,B1</div><div class='add'>+	MVKH	.S2	sys_call_table,B1</div><div class='add'>+	LDW	.D2T2	*+B1[B0],B0</div><div class='add'>+	NOP	2</div><div class='add'>+	; A2 = thread_info flags</div><div class='add'>+	AND	.D1	_TIF_SYSCALL_TRACE,A2,A2</div><div class='add'>+ [A2]	BNOP	.S1	tracesys_on,5</div><div class='add'>+	;; B0 = _sys_call_table[__NR_*]</div><div class='add'>+	B	.S2	B0</div><div class='add'>+	ADDKPC	.S2	ret_from_syscall_function,B3,4</div><div class='add'>+</div><div class='add'>+ret_from_syscall_function:</div><div class='add'>+	STW	.D2T1	A4,*+SP(REGS_A4+8)	; save return value in A4</div><div class='add'>+						; original A4 is in orig_A4</div><div class='add'>+syscall_exit:</div><div class='add'>+	;; make sure we don't miss an interrupt setting need_resched or</div><div class='add'>+	;; sigpending between sampling and the rti</div><div class='add'>+	MASK_INT B2</div><div class='add'>+	LDW	.D1T1	*+A12(THREAD_INFO_FLAGS),A2</div><div class='add'>+	MVK	.S1	_TIF_ALLWORK_MASK,A1</div><div class='add'>+	NOP	3</div><div class='add'>+	AND	.D1	A1,A2,A2 ; check for work to do</div><div class='add'>+ [A2]	BNOP	.S1	syscall_exit_work,5</div><div class='add'>+</div><div class='add'>+restore_all:</div><div class='add'>+	RESTORE_ALL NRP,NTSR</div><div class='add'>+</div><div class='add'>+	;;</div><div class='add'>+	;; After a fork we jump here directly from resume,</div><div class='add'>+	;; so that A4 contains the previous task structure.</div><div class='add'>+	;;</div><div class='add'>+ENTRY(ret_from_fork)</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+	MVKL	.S1	schedule_tail,A0</div><div class='add'>+	MVKH	.S1	schedule_tail,A0</div><div class='add'>+	B	.S2X	A0</div><div class='add'>+#else</div><div class='add'>+	B	.S2	schedule_tail</div><div class='add'>+#endif</div><div class='add'>+	ADDKPC	.S2	ret_from_fork_2,B3,4</div><div class='add'>+ret_from_fork_2:</div><div class='add'>+	;; return 0 in A4 for child process</div><div class='add'>+	GET_THREAD_INFO A12</div><div class='add'>+	BNOP	.S2	syscall_exit,3</div><div class='add'>+	MVK	.L2	0,B0</div><div class='add'>+	STW	.D2T2	B0,*+SP(REGS_A4+8)</div><div class='add'>+ENDPROC(ret_from_fork)</div><div class='add'>+</div><div class='add'>+	;;</div><div class='add'>+	;; These are the interrupt handlers, responsible for calling __do_IRQ()</div><div class='add'>+	;; int6 is used for syscalls (see _system_call entry)</div><div class='add'>+	;;</div><div class='add'>+	.macro SAVE_ALL_INT</div><div class='add'>+	SAVE_ALL IRP,ITSR</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro CALL_INT int</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+	MVKL	.S1	c6x_do_IRQ,A0</div><div class='add'>+	MVKH	.S1	c6x_do_IRQ,A0</div><div class='add'>+	BNOP	.S2X	A0,1</div><div class='add'>+	MVK	.S1	int,A4</div><div class='add'>+	ADDAW	.D2	SP,2,B4</div><div class='add'>+	MVKL	.S2	ret_from_interrupt,B3</div><div class='add'>+	MVKH	.S2	ret_from_interrupt,B3</div><div class='add'>+#else</div><div class='add'>+	CALLP   .S2	c6x_do_IRQ,B3</div><div class='add'>+ ||	MVK	.S1	int,A4</div><div class='add'>+ ||	ADDAW	.D2	SP,2,B4</div><div class='add'>+	B	.S1	ret_from_interrupt</div><div class='add'>+	NOP	5</div><div class='add'>+#endif</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+ENTRY(_int4_handler)</div><div class='add'>+	SAVE_ALL_INT</div><div class='add'>+	CALL_INT 4</div><div class='add'>+ENDPROC(_int4_handler)</div><div class='add'>+</div><div class='add'>+ENTRY(_int5_handler)</div><div class='add'>+	SAVE_ALL_INT</div><div class='add'>+	CALL_INT 5</div><div class='add'>+ENDPROC(_int5_handler)</div><div class='add'>+</div><div class='add'>+ENTRY(_int6_handler)</div><div class='add'>+	SAVE_ALL_INT</div><div class='add'>+	CALL_INT 6</div><div class='add'>+ENDPROC(_int6_handler)</div><div class='add'>+</div><div class='add'>+ENTRY(_int7_handler)</div><div class='add'>+	SAVE_ALL_INT</div><div class='add'>+	CALL_INT 7</div><div class='add'>+ENDPROC(_int7_handler)</div><div class='add'>+</div><div class='add'>+ENTRY(_int8_handler)</div><div class='add'>+	SAVE_ALL_INT</div><div class='add'>+	CALL_INT 8</div><div class='add'>+ENDPROC(_int8_handler)</div><div class='add'>+</div><div class='add'>+ENTRY(_int9_handler)</div><div class='add'>+	SAVE_ALL_INT</div><div class='add'>+	CALL_INT 9</div><div class='add'>+ENDPROC(_int9_handler)</div><div class='add'>+</div><div class='add'>+ENTRY(_int10_handler)</div><div class='add'>+	SAVE_ALL_INT</div><div class='add'>+	CALL_INT 10</div><div class='add'>+ENDPROC(_int10_handler)</div><div class='add'>+</div><div class='add'>+ENTRY(_int11_handler)</div><div class='add'>+	SAVE_ALL_INT</div><div class='add'>+	CALL_INT 11</div><div class='add'>+ENDPROC(_int11_handler)</div><div class='add'>+</div><div class='add'>+ENTRY(_int12_handler)</div><div class='add'>+	SAVE_ALL_INT</div><div class='add'>+	CALL_INT 12</div><div class='add'>+ENDPROC(_int12_handler)</div><div class='add'>+</div><div class='add'>+ENTRY(_int13_handler)</div><div class='add'>+	SAVE_ALL_INT</div><div class='add'>+	CALL_INT 13</div><div class='add'>+ENDPROC(_int13_handler)</div><div class='add'>+</div><div class='add'>+ENTRY(_int14_handler)</div><div class='add'>+	SAVE_ALL_INT</div><div class='add'>+	CALL_INT 14</div><div class='add'>+ENDPROC(_int14_handler)</div><div class='add'>+</div><div class='add'>+ENTRY(_int15_handler)</div><div class='add'>+	SAVE_ALL_INT</div><div class='add'>+	CALL_INT 15</div><div class='add'>+ENDPROC(_int15_handler)</div><div class='add'>+</div><div class='add'>+	;;</div><div class='add'>+	;; Handler for uninitialized and spurious interrupts</div><div class='add'>+	;;</div><div class='add'>+ENTRY(_bad_interrupt)</div><div class='add'>+	B	.S2	IRP</div><div class='add'>+	NOP	5</div><div class='add'>+ENDPROC(_bad_interrupt)</div><div class='add'>+</div><div class='add'>+	;;</div><div class='add'>+	;; Entry for NMI/exceptions/syscall</div><div class='add'>+	;;</div><div class='add'>+ENTRY(_nmi_handler)</div><div class='add'>+	SAVE_ALL NRP,NTSR</div><div class='add'>+</div><div class='add'>+	MVC	.S2	EFR,B2</div><div class='add'>+	CMPEQ	.L2	1,B2,B2</div><div class='add'>+ ||	MVC	.S2	TSR,B1</div><div class='add'>+	CLR	.S2	B1,10,10,B1</div><div class='add'>+	MVC	.S2	B1,TSR</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+ [!B2]	MVKL	.S1	process_exception,A0</div><div class='add'>+ [!B2]	MVKH	.S1	process_exception,A0</div><div class='add'>+ [!B2]	B	.S2X	A0</div><div class='add'>+#else</div><div class='add'>+ [!B2]	B	.S2	process_exception</div><div class='add'>+#endif</div><div class='add'>+ [B2]	B	.S2	system_call_saved</div><div class='add'>+ [!B2]	ADDAW	.D2	SP,2,B1</div><div class='add'>+ [!B2]	MV	.D1X	B1,A4</div><div class='add'>+	ADDKPC	.S2	ret_from_trap,B3,2</div><div class='add'>+</div><div class='add'>+ret_from_trap:</div><div class='add'>+	MV	.D2X	A4,B0</div><div class='add'>+ [!B0]	BNOP	.S2	ret_from_exception,5</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+	MVKL	.S2	system_call_saved_noack,B3</div><div class='add'>+	MVKH	.S2	system_call_saved_noack,B3</div><div class='add'>+#endif</div><div class='add'>+	LDW	.D2T2	*+SP(REGS_B0+8),B0</div><div class='add'>+	LDW	.D2T1	*+SP(REGS_A4+8),A4</div><div class='add'>+	LDW	.D2T2	*+SP(REGS_B4+8),B4</div><div class='add'>+	LDW	.D2T1	*+SP(REGS_A6+8),A6</div><div class='add'>+	LDW	.D2T2	*+SP(REGS_B6+8),B6</div><div class='add'>+	LDW	.D2T1	*+SP(REGS_A8+8),A8</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+ ||	B	.S2	B3</div><div class='add'>+#else</div><div class='add'>+ ||	B	.S2	system_call_saved_noack</div><div class='add'>+#endif</div><div class='add'>+	LDW	.D2T2	*+SP(REGS_B8+8),B8</div><div class='add'>+	NOP	4</div><div class='add'>+ENDPROC(_nmi_handler)</div><div class='add'>+</div><div class='add'>+	;;</div><div class='add'>+	;; Jump to schedule() then return to ret_from_isr</div><div class='add'>+	;;</div><div class='add'>+#ifdef	CONFIG_PREEMPT</div><div class='add'>+resume_kernel:</div><div class='add'>+	GET_THREAD_INFO A12</div><div class='add'>+	LDW	.D1T1	*+A12(THREAD_INFO_PREEMPT_COUNT),A1</div><div class='add'>+	NOP	4</div><div class='add'>+ [A1]	BNOP	.S2	restore_all,5</div><div class='add'>+</div><div class='add'>+preempt_schedule:</div><div class='add'>+	GET_THREAD_INFO A2</div><div class='add'>+	LDW	.D1T1	*+A2(THREAD_INFO_FLAGS),A1</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+	MVKL	.S2	preempt_schedule_irq,B0</div><div class='add'>+	MVKH	.S2	preempt_schedule_irq,B0</div><div class='add'>+	NOP	2</div><div class='add'>+#else</div><div class='add'>+	NOP	4</div><div class='add'>+#endif</div><div class='add'>+	AND	.D1	_TIF_NEED_RESCHED,A1,A1</div><div class='add'>+ [!A1]	BNOP	.S2	restore_all,5</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+	B	.S2	B0</div><div class='add'>+#else</div><div class='add'>+	B	.S2	preempt_schedule_irq</div><div class='add'>+#endif</div><div class='add'>+	ADDKPC	.S2	preempt_schedule,B3,4</div><div class='add'>+#endif /* CONFIG_PREEMPT */</div><div class='add'>+</div><div class='add'>+ENTRY(enable_exception)</div><div class='add'>+	DINT</div><div class='add'>+	MVC	.S2	TSR,B0</div><div class='add'>+	MVC	.S2	B3,NRP</div><div class='add'>+	MVK	.L2	0xc,B1</div><div class='add'>+	OR	.D2	B0,B1,B0</div><div class='add'>+	MVC	.S2	B0,TSR			;  Set GEE and XEN in TSR</div><div class='add'>+	B	.S2	NRP</div><div class='add'>+	NOP	5</div><div class='add'>+ENDPROC(enable_exception)</div><div class='add'>+</div><div class='add'>+ENTRY(sys_sigaltstack)</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+	MVKL	.S1	do_sigaltstack,A0	; branch to do_sigaltstack</div><div class='add'>+	MVKH	.S1	do_sigaltstack,A0</div><div class='add'>+	B	.S2X	A0</div><div class='add'>+#else</div><div class='add'>+	B	.S2	do_sigaltstack</div><div class='add'>+#endif</div><div class='add'>+	LDW	.D2T1	*+SP(REGS_SP+8),A6</div><div class='add'>+	NOP	4</div><div class='add'>+ENDPROC(sys_sigaltstack)</div><div class='add'>+</div><div class='add'>+	;; kernel_execve</div><div class='add'>+ENTRY(kernel_execve)</div><div class='add'>+	MVK	.S2	__NR_execve,B0</div><div class='add'>+	SWE</div><div class='add'>+	BNOP	.S2	B3,5</div><div class='add'>+ENDPROC(kernel_execve)</div><div class='add'>+</div><div class='add'>+	;;</div><div class='add'>+	;; Special system calls</div><div class='add'>+	;; return address is in B3</div><div class='add'>+	;;</div><div class='add'>+ENTRY(sys_clone)</div><div class='add'>+	ADD	.D1X	SP,8,A4</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+ ||	MVKL	.S1	sys_c6x_clone,A0</div><div class='add'>+	MVKH	.S1	sys_c6x_clone,A0</div><div class='add'>+	BNOP	.S2X	A0,5</div><div class='add'>+#else</div><div class='add'>+ ||	B	.S2	sys_c6x_clone</div><div class='add'>+	NOP	5</div><div class='add'>+#endif</div><div class='add'>+ENDPROC(sys_clone)</div><div class='add'>+</div><div class='add'>+ENTRY(sys_rt_sigreturn)</div><div class='add'>+	ADD	.D1X	SP,8,A4</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+ ||	MVKL	.S1	do_rt_sigreturn,A0</div><div class='add'>+	MVKH	.S1	do_rt_sigreturn,A0</div><div class='add'>+	BNOP	.S2X	A0,5</div><div class='add'>+#else</div><div class='add'>+ ||	B	.S2	do_rt_sigreturn</div><div class='add'>+	NOP	5</div><div class='add'>+#endif</div><div class='add'>+ENDPROC(sys_rt_sigreturn)</div><div class='add'>+</div><div class='add'>+ENTRY(sys_execve)</div><div class='add'>+	ADDAW	.D2	SP,2,B6		; put regs addr in 4th parameter</div><div class='add'>+					; &amp; adjust regs stack addr</div><div class='add'>+	LDW	.D2T2	*+SP(REGS_B4+8),B4</div><div class='add'>+</div><div class='add'>+	;; c6x_execve(char *name, char **argv,</div><div class='add'>+	;;            char **envp, struct pt_regs *regs)</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+ ||	MVKL	.S1	sys_c6x_execve,A0</div><div class='add'>+	MVKH	.S1	sys_c6x_execve,A0</div><div class='add'>+	B	.S2X	A0</div><div class='add'>+#else</div><div class='add'>+ ||	B	.S2	sys_c6x_execve</div><div class='add'>+#endif</div><div class='add'>+	STW	.D2T2	B3,*SP--[2]</div><div class='add'>+	ADDKPC	.S2	ret_from_c6x_execve,B3,3</div><div class='add'>+</div><div class='add'>+ret_from_c6x_execve:</div><div class='add'>+	LDW	.D2T2	*++SP[2],B3</div><div class='add'>+	NOP	4</div><div class='add'>+	BNOP	.S2	B3,5</div><div class='add'>+ENDPROC(sys_execve)</div><div class='add'>+</div><div class='add'>+ENTRY(sys_pread_c6x)</div><div class='add'>+	MV	.D2X	A8,B7</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+ ||	MVKL	.S1	sys_pread64,A0</div><div class='add'>+	MVKH	.S1	sys_pread64,A0</div><div class='add'>+	BNOP	.S2X	A0,5</div><div class='add'>+#else</div><div class='add'>+ ||	B	.S2	sys_pread64</div><div class='add'>+	NOP	5</div><div class='add'>+#endif</div><div class='add'>+ENDPROC(sys_pread_c6x)</div><div class='add'>+</div><div class='add'>+ENTRY(sys_pwrite_c6x)</div><div class='add'>+	MV	.D2X	A8,B7</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+ ||	MVKL	.S1	sys_pwrite64,A0</div><div class='add'>+	MVKH	.S1	sys_pwrite64,A0</div><div class='add'>+	BNOP	.S2X	A0,5</div><div class='add'>+#else</div><div class='add'>+ ||	B	.S2	sys_pwrite64</div><div class='add'>+	NOP	5</div><div class='add'>+#endif</div><div class='add'>+ENDPROC(sys_pwrite_c6x)</div><div class='add'>+</div><div class='add'>+;; On Entry</div><div class='add'>+;;   A4 - path</div><div class='add'>+;;   B4 - offset_lo (LE), offset_hi (BE)</div><div class='add'>+;;   A6 - offset_lo (BE), offset_hi (LE)</div><div class='add'>+ENTRY(sys_truncate64_c6x)</div><div class='add'>+#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='add'>+	MV	.S2	B4,B5</div><div class='add'>+	MV	.D2X	A6,B4</div><div class='add'>+#else</div><div class='add'>+	MV	.D2X	A6,B5</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+ ||	MVKL	.S1	sys_truncate64,A0</div><div class='add'>+	MVKH	.S1	sys_truncate64,A0</div><div class='add'>+	BNOP	.S2X	A0,5</div><div class='add'>+#else</div><div class='add'>+ ||	B	.S2	sys_truncate64</div><div class='add'>+	NOP	5</div><div class='add'>+#endif</div><div class='add'>+ENDPROC(sys_truncate64_c6x)</div><div class='add'>+</div><div class='add'>+;; On Entry</div><div class='add'>+;;   A4 - fd</div><div class='add'>+;;   B4 - offset_lo (LE), offset_hi (BE)</div><div class='add'>+;;   A6 - offset_lo (BE), offset_hi (LE)</div><div class='add'>+ENTRY(sys_ftruncate64_c6x)</div><div class='add'>+#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='add'>+	MV	.S2	B4,B5</div><div class='add'>+	MV	.D2X	A6,B4</div><div class='add'>+#else</div><div class='add'>+	MV	.D2X	A6,B5</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+ ||	MVKL	.S1	sys_ftruncate64,A0</div><div class='add'>+	MVKH	.S1	sys_ftruncate64,A0</div><div class='add'>+	BNOP	.S2X	A0,5</div><div class='add'>+#else</div><div class='add'>+ ||	B	.S2	sys_ftruncate64</div><div class='add'>+	NOP	5</div><div class='add'>+#endif</div><div class='add'>+ENDPROC(sys_ftruncate64_c6x)</div><div class='add'>+</div><div class='add'>+#ifdef __ARCH_WANT_SYSCALL_OFF_T</div><div class='add'>+;; On Entry</div><div class='add'>+;;   A4 - fd</div><div class='add'>+;;   B4 - offset_lo (LE), offset_hi (BE)</div><div class='add'>+;;   A6 - offset_lo (BE), offset_hi (LE)</div><div class='add'>+;;   B6 - len</div><div class='add'>+;;   A8 - advice</div><div class='add'>+ENTRY(sys_fadvise64_c6x)</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+	MVKL	.S1	sys_fadvise64,A0</div><div class='add'>+	MVKH	.S1	sys_fadvise64,A0</div><div class='add'>+	BNOP	.S2X	A0,2</div><div class='add'>+#else</div><div class='add'>+	B	.S2	sys_fadvise64</div><div class='add'>+	NOP	2</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='add'>+	MV	.L2	B4,B5</div><div class='add'>+ ||	MV	.D2X	A6,B4</div><div class='add'>+#else</div><div class='add'>+	MV	.D2X	A6,B5</div><div class='add'>+#endif</div><div class='add'>+	MV	.D1X	B6,A6</div><div class='add'>+	MV	.D2X	A8,B6</div><div class='add'>+#endif</div><div class='add'>+ENDPROC(sys_fadvise64_c6x)</div><div class='add'>+</div><div class='add'>+;; On Entry</div><div class='add'>+;;   A4 - fd</div><div class='add'>+;;   B4 - offset_lo (LE), offset_hi (BE)</div><div class='add'>+;;   A6 - offset_lo (BE), offset_hi (LE)</div><div class='add'>+;;   B6 - len_lo (LE), len_hi (BE)</div><div class='add'>+;;   A8 - len_lo (BE), len_hi (LE)</div><div class='add'>+;;   B8 - advice</div><div class='add'>+ENTRY(sys_fadvise64_64_c6x)</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+	MVKL	.S1	sys_fadvise64_64,A0</div><div class='add'>+	MVKH	.S1	sys_fadvise64_64,A0</div><div class='add'>+	BNOP	.S2X	A0,2</div><div class='add'>+#else</div><div class='add'>+	B	.S2	sys_fadvise64_64</div><div class='add'>+	NOP	2</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='add'>+	MV	.L2	B4,B5</div><div class='add'>+ ||	MV	.D2X	A6,B4</div><div class='add'>+	MV	.L1	A8,A6</div><div class='add'>+ ||	MV	.D1X	B6,A7</div><div class='add'>+#else</div><div class='add'>+	MV	.D2X	A6,B5</div><div class='add'>+	MV	.L1	A8,A7</div><div class='add'>+ ||	MV	.D1X	B6,A6</div><div class='add'>+#endif</div><div class='add'>+	MV	.L2	B8,B6</div><div class='add'>+ENDPROC(sys_fadvise64_64_c6x)</div><div class='add'>+</div><div class='add'>+;; On Entry</div><div class='add'>+;;   A4 - fd</div><div class='add'>+;;   B4 - mode</div><div class='add'>+;;   A6 - offset_hi</div><div class='add'>+;;   B6 - offset_lo</div><div class='add'>+;;   A8 - len_hi</div><div class='add'>+;;   B8 - len_lo</div><div class='add'>+ENTRY(sys_fallocate_c6x)</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+	MVKL	.S1	sys_fallocate,A0</div><div class='add'>+	MVKH	.S1	sys_fallocate,A0</div><div class='add'>+	BNOP	.S2X	A0,1</div><div class='add'>+#else</div><div class='add'>+	B	.S2	sys_fallocate</div><div class='add'>+	NOP</div><div class='add'>+#endif</div><div class='add'>+	MV	.D1	A6,A7</div><div class='add'>+	MV	.D1X	B6,A6</div><div class='add'>+	MV	.D2X	A8,B7</div><div class='add'>+	MV	.D2	B8,B6</div><div class='add'>+ENDPROC(sys_fallocate_c6x)</div><div class='add'>+</div><div class='add'>+	;; put this in .neardata for faster access when using DSBT mode</div><div class='add'>+	.section .neardata,"aw",@progbits</div><div class='add'>+	.global	current_ksp</div><div class='add'>+	.hidden	current_ksp</div><div class='add'>+current_ksp:</div><div class='add'>+	.word	init_thread_union + THREAD_START_SP</div><div class='head'>diff --git a/arch/c6x/kernel/head.S b/arch/c6x/kernel/head.S<br/>new file mode 100644<br/>index 000000000000..133eab6edf6b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/head.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/head.S</a></div><div class='hunk'>@@ -0,0 +1,84 @@</div><div class='add'>+;</div><div class='add'>+;  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+;</div><div class='add'>+;  Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+;  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+;  published by the Free Software Foundation.</div><div class='add'>+;</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;linux/of_fdt.h&gt;</div><div class='add'>+#include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+</div><div class='add'>+	__HEAD</div><div class='add'>+ENTRY(_c_int00)</div><div class='add'>+	;; Save magic and pointer</div><div class='add'>+	MV	.S1	A4,A10</div><div class='add'>+	MV	.S2	B4,B10</div><div class='add'>+	MVKL	.S2	__bss_start,B5</div><div class='add'>+	MVKH	.S2	__bss_start,B5</div><div class='add'>+	MVKL	.S2	__bss_stop,B6</div><div class='add'>+	MVKH	.S2	__bss_stop,B6</div><div class='add'>+	SUB	.L2	B6,B5,B6 ; bss size</div><div class='add'>+</div><div class='add'>+	;; Set the stack pointer</div><div class='add'>+	MVKL	.S2	current_ksp,B0</div><div class='add'>+	MVKH	.S2	current_ksp,B0</div><div class='add'>+	LDW	.D2T2	*B0,B15</div><div class='add'>+</div><div class='add'>+	;; clear bss</div><div class='add'>+	SHR	.S2	B6,3,B0	  ; number of dwords to clear</div><div class='add'>+	ZERO	.L2	B13</div><div class='add'>+	ZERO	.L2	B12</div><div class='add'>+bss_loop:</div><div class='add'>+	BDEC	.S2	bss_loop,B0</div><div class='add'>+	NOP	3</div><div class='add'>+	CMPLT	.L2	B0,0,B1</div><div class='add'>+ [!B1]	STDW	.D2T2	B13:B12,*B5++[1]</div><div class='add'>+</div><div class='add'>+	NOP	4</div><div class='add'>+	AND	.D2	~7,B15,B15</div><div class='add'>+</div><div class='add'>+	;; Clear GIE and PGIE</div><div class='add'>+	MVC	.S2	CSR,B2</div><div class='add'>+	CLR	.S2	B2,0,1,B2</div><div class='add'>+	MVC	.S2	B2,CSR</div><div class='add'>+	MVC	.S2	TSR,B2</div><div class='add'>+	CLR	.S2	B2,0,1,B2</div><div class='add'>+	MVC	.S2	B2,TSR</div><div class='add'>+	MVC	.S2	ITSR,B2</div><div class='add'>+	CLR	.S2	B2,0,1,B2</div><div class='add'>+	MVC	.S2	B2,ITSR</div><div class='add'>+	MVC	.S2	NTSR,B2</div><div class='add'>+	CLR	.S2	B2,0,1,B2</div><div class='add'>+	MVC	.S2	B2,NTSR</div><div class='add'>+</div><div class='add'>+	;; pass DTB pointer to machine_init (or zero if none)</div><div class='add'>+	MVKL	.S1	OF_DT_HEADER,A0</div><div class='add'>+	MVKH	.S1	OF_DT_HEADER,A0</div><div class='add'>+	CMPEQ	.L1	A10,A0,A0</div><div class='add'>+  [A0]	MV	.S1X	B10,A4</div><div class='add'>+  [!A0] MVK	.S1	0,A4</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+	MVKL	.S1	machine_init,A0</div><div class='add'>+	MVKH	.S1	machine_init,A0</div><div class='add'>+	B	.S2X	A0</div><div class='add'>+	ADDKPC  .S2     0f,B3,4</div><div class='add'>+0:</div><div class='add'>+#else</div><div class='add'>+	CALLP	.S2	machine_init,B3</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	;; Jump to Linux init</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+	MVKL	.S1	start_kernel,A0</div><div class='add'>+	MVKH	.S1	start_kernel,A0</div><div class='add'>+	B	.S2X	A0</div><div class='add'>+#else</div><div class='add'>+	B	.S2	start_kernel</div><div class='add'>+#endif</div><div class='add'>+	NOP	5</div><div class='add'>+L1:	BNOP	.S2	L1,5</div><div class='head'>diff --git a/arch/c6x/kernel/irq.c b/arch/c6x/kernel/irq.c<br/>new file mode 100644<br/>index 000000000000..0929e4b2b244<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/irq.c</a></div><div class='hunk'>@@ -0,0 +1,728 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *</div><div class='add'>+ *  This borrows heavily from powerpc version, which is:</div><div class='add'>+ *</div><div class='add'>+ *  Derived from arch/i386/kernel/irq.c</div><div class='add'>+ *    Copyright (C) 1992 Linus Torvalds</div><div class='add'>+ *  Adapted from arch/i386 by Gary Thomas</div><div class='add'>+ *    Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)</div><div class='add'>+ *  Updated and modified by Cort Dougan &lt;cort@fsmlabs.com&gt;</div><div class='add'>+ *    Copyright (C) 1996-2001 Cort Dougan</div><div class='add'>+ *  Adapted for Power Macintosh by Paul Mackerras</div><div class='add'>+ *    Copyright (C) 1996 Paul Mackerras (paulus@cs.anu.edu.au)</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'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/radix-tree.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_irq.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/kernel_stat.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/megamod-pic.h&gt;</div><div class='add'>+</div><div class='add'>+unsigned long irq_err_count;</div><div class='add'>+</div><div class='add'>+static DEFINE_RAW_SPINLOCK(core_irq_lock);</div><div class='add'>+</div><div class='add'>+static void mask_core_irq(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int prio = data-&gt;irq;</div><div class='add'>+</div><div class='add'>+	BUG_ON(prio &lt; 4 || prio &gt;= NR_PRIORITY_IRQS);</div><div class='add'>+</div><div class='add'>+	raw_spin_lock(&amp;core_irq_lock);</div><div class='add'>+	and_creg(IER, ~(1 &lt;&lt; prio));</div><div class='add'>+	raw_spin_unlock(&amp;core_irq_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void unmask_core_irq(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int prio = data-&gt;irq;</div><div class='add'>+</div><div class='add'>+	raw_spin_lock(&amp;core_irq_lock);</div><div class='add'>+	or_creg(IER, 1 &lt;&lt; prio);</div><div class='add'>+	raw_spin_unlock(&amp;core_irq_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip core_chip = {</div><div class='add'>+	.name		= "core",</div><div class='add'>+	.irq_mask	= mask_core_irq,</div><div class='add'>+	.irq_unmask	= unmask_core_irq,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+asmlinkage void c6x_do_IRQ(unsigned int prio, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs *old_regs = set_irq_regs(regs);</div><div class='add'>+</div><div class='add'>+	irq_enter();</div><div class='add'>+</div><div class='add'>+	BUG_ON(prio &lt; 4 || prio &gt;= NR_PRIORITY_IRQS);</div><div class='add'>+</div><div class='add'>+	generic_handle_irq(prio);</div><div class='add'>+</div><div class='add'>+	irq_exit();</div><div class='add'>+</div><div class='add'>+	set_irq_regs(old_regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_host *core_host;</div><div class='add'>+</div><div class='add'>+static int core_host_map(struct irq_host *h, unsigned int virq,</div><div class='add'>+			 irq_hw_number_t hw)</div><div class='add'>+{</div><div class='add'>+	if (hw &lt; 4 || hw &gt;= NR_PRIORITY_IRQS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	irq_set_status_flags(virq, IRQ_LEVEL);</div><div class='add'>+	irq_set_chip_and_handler(virq, &amp;core_chip, handle_level_irq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_host_ops core_host_ops = {</div><div class='add'>+	.map = core_host_map,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init init_IRQ(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	/* Mask all priority IRQs */</div><div class='add'>+	and_creg(IER, ~0xfff0);</div><div class='add'>+</div><div class='add'>+	np = of_find_compatible_node(NULL, NULL, "ti,c64x+core-pic");</div><div class='add'>+	if (np != NULL) {</div><div class='add'>+		/* create the core host */</div><div class='add'>+		core_host = irq_alloc_host(np, IRQ_HOST_MAP_PRIORITY, 0,</div><div class='add'>+					   &amp;core_host_ops, 0);</div><div class='add'>+		if (core_host)</div><div class='add'>+			irq_set_default_host(core_host);</div><div class='add'>+		of_node_put(np);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Core interrupt controller initialized\n");</div><div class='add'>+</div><div class='add'>+	/* now we're ready for other SoC controllers */</div><div class='add'>+	megamod_pic_init();</div><div class='add'>+</div><div class='add'>+	/* Clear all general IRQ flags */</div><div class='add'>+	set_creg(ICR, 0xfff0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ack_bad_irq(int irq)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_ERR "IRQ: spurious interrupt %d\n", irq);</div><div class='add'>+	irq_err_count++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int arch_show_interrupts(struct seq_file *p, int prec)</div><div class='add'>+{</div><div class='add'>+	seq_printf(p, "%*s: %10lu\n", prec, "Err", irq_err_count);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IRQ controller and virtual interrupts</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* The main irq map itself is an array of NR_IRQ entries containing the</div><div class='add'>+ * associate host and irq number. An entry with a host of NULL is free.</div><div class='add'>+ * An entry can be allocated if it's free, the allocator always then sets</div><div class='add'>+ * hwirq first to the host's invalid irq number and then fills ops.</div><div class='add'>+ */</div><div class='add'>+struct irq_map_entry {</div><div class='add'>+	irq_hw_number_t	hwirq;</div><div class='add'>+	struct irq_host	*host;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(irq_hosts);</div><div class='add'>+static DEFINE_RAW_SPINLOCK(irq_big_lock);</div><div class='add'>+static DEFINE_MUTEX(revmap_trees_mutex);</div><div class='add'>+static struct irq_map_entry irq_map[NR_IRQS];</div><div class='add'>+static unsigned int irq_virq_count = NR_IRQS;</div><div class='add'>+static struct irq_host *irq_default_host;</div><div class='add'>+</div><div class='add'>+irq_hw_number_t irqd_to_hwirq(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	return irq_map[d-&gt;irq].hwirq;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(irqd_to_hwirq);</div><div class='add'>+</div><div class='add'>+irq_hw_number_t virq_to_hw(unsigned int virq)</div><div class='add'>+{</div><div class='add'>+	return irq_map[virq].hwirq;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(virq_to_hw);</div><div class='add'>+</div><div class='add'>+bool virq_is_host(unsigned int virq, struct irq_host *host)</div><div class='add'>+{</div><div class='add'>+	return irq_map[virq].host == host;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(virq_is_host);</div><div class='add'>+</div><div class='add'>+static int default_irq_host_match(struct irq_host *h, struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	return h-&gt;of_node != NULL &amp;&amp; h-&gt;of_node == np;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct irq_host *irq_alloc_host(struct device_node *of_node,</div><div class='add'>+				unsigned int revmap_type,</div><div class='add'>+				unsigned int revmap_arg,</div><div class='add'>+				struct irq_host_ops *ops,</div><div class='add'>+				irq_hw_number_t inval_irq)</div><div class='add'>+{</div><div class='add'>+	struct irq_host *host;</div><div class='add'>+	unsigned int size = sizeof(struct irq_host);</div><div class='add'>+	unsigned int i;</div><div class='add'>+	unsigned int *rmap;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* Allocate structure and revmap table if using linear mapping */</div><div class='add'>+	if (revmap_type == IRQ_HOST_MAP_LINEAR)</div><div class='add'>+		size += revmap_arg * sizeof(unsigned int);</div><div class='add'>+	host = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	if (host == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Fill structure */</div><div class='add'>+	host-&gt;revmap_type = revmap_type;</div><div class='add'>+	host-&gt;inval_irq = inval_irq;</div><div class='add'>+	host-&gt;ops = ops;</div><div class='add'>+	host-&gt;of_node = of_node_get(of_node);</div><div class='add'>+</div><div class='add'>+	if (host-&gt;ops-&gt;match == NULL)</div><div class='add'>+		host-&gt;ops-&gt;match = default_irq_host_match;</div><div class='add'>+</div><div class='add'>+	raw_spin_lock_irqsave(&amp;irq_big_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Check for the priority controller. */</div><div class='add'>+	if (revmap_type == IRQ_HOST_MAP_PRIORITY) {</div><div class='add'>+		if (irq_map[0].host != NULL) {</div><div class='add'>+			raw_spin_unlock_irqrestore(&amp;irq_big_lock, flags);</div><div class='add'>+			of_node_put(host-&gt;of_node);</div><div class='add'>+			kfree(host);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		irq_map[0].host = host;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add(&amp;host-&gt;link, &amp;irq_hosts);</div><div class='add'>+	raw_spin_unlock_irqrestore(&amp;irq_big_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Additional setups per revmap type */</div><div class='add'>+	switch (revmap_type) {</div><div class='add'>+	case IRQ_HOST_MAP_PRIORITY:</div><div class='add'>+		/* 0 is always the invalid number for priority */</div><div class='add'>+		host-&gt;inval_irq = 0;</div><div class='add'>+		/* setup us as the host for all priority interrupts */</div><div class='add'>+		for (i = 1; i &lt; NR_PRIORITY_IRQS; i++) {</div><div class='add'>+			irq_map[i].hwirq = i;</div><div class='add'>+			smp_wmb();</div><div class='add'>+			irq_map[i].host = host;</div><div class='add'>+			smp_wmb();</div><div class='add'>+</div><div class='add'>+			ops-&gt;map(host, i, i);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_HOST_MAP_LINEAR:</div><div class='add'>+		rmap = (unsigned int *)(host + 1);</div><div class='add'>+		for (i = 0; i &lt; revmap_arg; i++)</div><div class='add'>+			rmap[i] = NO_IRQ;</div><div class='add'>+		host-&gt;revmap_data.linear.size = revmap_arg;</div><div class='add'>+		smp_wmb();</div><div class='add'>+		host-&gt;revmap_data.linear.revmap = rmap;</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_HOST_MAP_TREE:</div><div class='add'>+		INIT_RADIX_TREE(&amp;host-&gt;revmap_data.tree, GFP_KERNEL);</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'>+	pr_debug("irq: Allocated host of type %d @0x%p\n", revmap_type, host);</div><div class='add'>+</div><div class='add'>+	return host;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct irq_host *irq_find_host(struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	struct irq_host *h, *found = NULL;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* We might want to match the legacy controller last since</div><div class='add'>+	 * it might potentially be set to match all interrupts in</div><div class='add'>+	 * the absence of a device node. This isn't a problem so far</div><div class='add'>+	 * yet though...</div><div class='add'>+	 */</div><div class='add'>+	raw_spin_lock_irqsave(&amp;irq_big_lock, flags);</div><div class='add'>+	list_for_each_entry(h, &amp;irq_hosts, link)</div><div class='add'>+		if (h-&gt;ops-&gt;match(h, node)) {</div><div class='add'>+			found = h;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	raw_spin_unlock_irqrestore(&amp;irq_big_lock, flags);</div><div class='add'>+	return found;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(irq_find_host);</div><div class='add'>+</div><div class='add'>+void irq_set_default_host(struct irq_host *host)</div><div class='add'>+{</div><div class='add'>+	pr_debug("irq: Default host set to @0x%p\n", host);</div><div class='add'>+</div><div class='add'>+	irq_default_host = host;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void irq_set_virq_count(unsigned int count)</div><div class='add'>+{</div><div class='add'>+	pr_debug("irq: Trying to set virq count to %d\n", count);</div><div class='add'>+</div><div class='add'>+	BUG_ON(count &lt; NR_PRIORITY_IRQS);</div><div class='add'>+	if (count &lt; NR_IRQS)</div><div class='add'>+		irq_virq_count = count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int irq_setup_virq(struct irq_host *host, unsigned int virq,</div><div class='add'>+			    irq_hw_number_t hwirq)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = irq_alloc_desc_at(virq, 0);</div><div class='add'>+	if (res != virq) {</div><div class='add'>+		pr_debug("irq: -&gt; allocating desc failed\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* map it */</div><div class='add'>+	smp_wmb();</div><div class='add'>+	irq_map[virq].hwirq = hwirq;</div><div class='add'>+	smp_mb();</div><div class='add'>+</div><div class='add'>+	if (host-&gt;ops-&gt;map(host, virq, hwirq)) {</div><div class='add'>+		pr_debug("irq: -&gt; mapping failed, freeing\n");</div><div class='add'>+		goto errdesc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq_clear_status_flags(virq, IRQ_NOREQUEST);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+errdesc:</div><div class='add'>+	irq_free_descs(virq, 1);</div><div class='add'>+error:</div><div class='add'>+	irq_free_virt(virq, 1);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int irq_create_direct_mapping(struct irq_host *host)</div><div class='add'>+{</div><div class='add'>+	unsigned int virq;</div><div class='add'>+</div><div class='add'>+	if (host == NULL)</div><div class='add'>+		host = irq_default_host;</div><div class='add'>+</div><div class='add'>+	BUG_ON(host == NULL);</div><div class='add'>+	WARN_ON(host-&gt;revmap_type != IRQ_HOST_MAP_NOMAP);</div><div class='add'>+</div><div class='add'>+	virq = irq_alloc_virt(host, 1, 0);</div><div class='add'>+	if (virq == NO_IRQ) {</div><div class='add'>+		pr_debug("irq: create_direct virq allocation failed\n");</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("irq: create_direct obtained virq %d\n", virq);</div><div class='add'>+</div><div class='add'>+	if (irq_setup_virq(host, virq, virq))</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+</div><div class='add'>+	return virq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int irq_create_mapping(struct irq_host *host,</div><div class='add'>+				irq_hw_number_t hwirq)</div><div class='add'>+{</div><div class='add'>+	unsigned int virq, hint;</div><div class='add'>+</div><div class='add'>+	pr_debug("irq: irq_create_mapping(0x%p, 0x%lx)\n", host, hwirq);</div><div class='add'>+</div><div class='add'>+	/* Look for default host if nececssary */</div><div class='add'>+	if (host == NULL)</div><div class='add'>+		host = irq_default_host;</div><div class='add'>+	if (host == NULL) {</div><div class='add'>+		printk(KERN_WARNING "irq_create_mapping called for"</div><div class='add'>+		       " NULL host, hwirq=%lx\n", hwirq);</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+	}</div><div class='add'>+	pr_debug("irq: -&gt; using host @%p\n", host);</div><div class='add'>+</div><div class='add'>+	/* Check if mapping already exists */</div><div class='add'>+	virq = irq_find_mapping(host, hwirq);</div><div class='add'>+	if (virq != NO_IRQ) {</div><div class='add'>+		pr_debug("irq: -&gt; existing mapping on virq %d\n", virq);</div><div class='add'>+		return virq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate a virtual interrupt number */</div><div class='add'>+	hint = hwirq % irq_virq_count;</div><div class='add'>+	virq = irq_alloc_virt(host, 1, hint);</div><div class='add'>+	if (virq == NO_IRQ) {</div><div class='add'>+		pr_debug("irq: -&gt; virq allocation failed\n");</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (irq_setup_virq(host, virq, hwirq))</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+</div><div class='add'>+	pr_debug("irq: irq %lu on host %s mapped to virtual irq %u\n",</div><div class='add'>+		hwirq, host-&gt;of_node ? host-&gt;of_node-&gt;full_name : "null", virq);</div><div class='add'>+</div><div class='add'>+	return virq;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(irq_create_mapping);</div><div class='add'>+</div><div class='add'>+unsigned int irq_create_of_mapping(struct device_node *controller,</div><div class='add'>+				   const u32 *intspec, unsigned int intsize)</div><div class='add'>+{</div><div class='add'>+	struct irq_host *host;</div><div class='add'>+	irq_hw_number_t hwirq;</div><div class='add'>+	unsigned int type = IRQ_TYPE_NONE;</div><div class='add'>+	unsigned int virq;</div><div class='add'>+</div><div class='add'>+	if (controller == NULL)</div><div class='add'>+		host = irq_default_host;</div><div class='add'>+	else</div><div class='add'>+		host = irq_find_host(controller);</div><div class='add'>+	if (host == NULL) {</div><div class='add'>+		printk(KERN_WARNING "irq: no irq host found for %s !\n",</div><div class='add'>+		       controller-&gt;full_name);</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If host has no translation, then we assume interrupt line */</div><div class='add'>+	if (host-&gt;ops-&gt;xlate == NULL)</div><div class='add'>+		hwirq = intspec[0];</div><div class='add'>+	else {</div><div class='add'>+		if (host-&gt;ops-&gt;xlate(host, controller, intspec, intsize,</div><div class='add'>+				     &amp;hwirq, &amp;type))</div><div class='add'>+			return NO_IRQ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Create mapping */</div><div class='add'>+	virq = irq_create_mapping(host, hwirq);</div><div class='add'>+	if (virq == NO_IRQ)</div><div class='add'>+		return virq;</div><div class='add'>+</div><div class='add'>+	/* Set type if specified and different than the current one */</div><div class='add'>+	if (type != IRQ_TYPE_NONE &amp;&amp;</div><div class='add'>+	    type != (irqd_get_trigger_type(irq_get_irq_data(virq))))</div><div class='add'>+		irq_set_irq_type(virq, type);</div><div class='add'>+	return virq;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(irq_create_of_mapping);</div><div class='add'>+</div><div class='add'>+void irq_dispose_mapping(unsigned int virq)</div><div class='add'>+{</div><div class='add'>+	struct irq_host *host;</div><div class='add'>+	irq_hw_number_t hwirq;</div><div class='add'>+</div><div class='add'>+	if (virq == NO_IRQ)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Never unmap priority interrupts */</div><div class='add'>+	if (virq &lt; NR_PRIORITY_IRQS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	host = irq_map[virq].host;</div><div class='add'>+	if (WARN_ON(host == NULL))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	irq_set_status_flags(virq, IRQ_NOREQUEST);</div><div class='add'>+</div><div class='add'>+	/* remove chip and handler */</div><div class='add'>+	irq_set_chip_and_handler(virq, NULL, NULL);</div><div class='add'>+</div><div class='add'>+	/* Make sure it's completed */</div><div class='add'>+	synchronize_irq(virq);</div><div class='add'>+</div><div class='add'>+	/* Tell the PIC about it */</div><div class='add'>+	if (host-&gt;ops-&gt;unmap)</div><div class='add'>+		host-&gt;ops-&gt;unmap(host, virq);</div><div class='add'>+	smp_mb();</div><div class='add'>+</div><div class='add'>+	/* Clear reverse map */</div><div class='add'>+	hwirq = irq_map[virq].hwirq;</div><div class='add'>+	switch (host-&gt;revmap_type) {</div><div class='add'>+	case IRQ_HOST_MAP_LINEAR:</div><div class='add'>+		if (hwirq &lt; host-&gt;revmap_data.linear.size)</div><div class='add'>+			host-&gt;revmap_data.linear.revmap[hwirq] = NO_IRQ;</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_HOST_MAP_TREE:</div><div class='add'>+		mutex_lock(&amp;revmap_trees_mutex);</div><div class='add'>+		radix_tree_delete(&amp;host-&gt;revmap_data.tree, hwirq);</div><div class='add'>+		mutex_unlock(&amp;revmap_trees_mutex);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Destroy map */</div><div class='add'>+	smp_mb();</div><div class='add'>+	irq_map[virq].hwirq = host-&gt;inval_irq;</div><div class='add'>+</div><div class='add'>+	irq_free_descs(virq, 1);</div><div class='add'>+	/* Free it */</div><div class='add'>+	irq_free_virt(virq, 1);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(irq_dispose_mapping);</div><div class='add'>+</div><div class='add'>+unsigned int irq_find_mapping(struct irq_host *host,</div><div class='add'>+			      irq_hw_number_t hwirq)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	unsigned int hint = hwirq % irq_virq_count;</div><div class='add'>+</div><div class='add'>+	/* Look for default host if nececssary */</div><div class='add'>+	if (host == NULL)</div><div class='add'>+		host = irq_default_host;</div><div class='add'>+	if (host == NULL)</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+</div><div class='add'>+	/* Slow path does a linear search of the map */</div><div class='add'>+	i = hint;</div><div class='add'>+	do  {</div><div class='add'>+		if (irq_map[i].host == host &amp;&amp;</div><div class='add'>+		    irq_map[i].hwirq == hwirq)</div><div class='add'>+			return i;</div><div class='add'>+		i++;</div><div class='add'>+		if (i &gt;= irq_virq_count)</div><div class='add'>+			i = 4;</div><div class='add'>+	} while (i != hint);</div><div class='add'>+	return NO_IRQ;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(irq_find_mapping);</div><div class='add'>+</div><div class='add'>+unsigned int irq_radix_revmap_lookup(struct irq_host *host,</div><div class='add'>+				     irq_hw_number_t hwirq)</div><div class='add'>+{</div><div class='add'>+	struct irq_map_entry *ptr;</div><div class='add'>+	unsigned int virq;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(host-&gt;revmap_type != IRQ_HOST_MAP_TREE))</div><div class='add'>+		return irq_find_mapping(host, hwirq);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The ptr returned references the static global irq_map.</div><div class='add'>+	 * but freeing an irq can delete nodes along the path to</div><div class='add'>+	 * do the lookup via call_rcu.</div><div class='add'>+	 */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ptr = radix_tree_lookup(&amp;host-&gt;revmap_data.tree, hwirq);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If found in radix tree, then fine.</div><div class='add'>+	 * Else fallback to linear lookup - this should not happen in practice</div><div class='add'>+	 * as it means that we failed to insert the node in the radix tree.</div><div class='add'>+	 */</div><div class='add'>+	if (ptr)</div><div class='add'>+		virq = ptr - irq_map;</div><div class='add'>+	else</div><div class='add'>+		virq = irq_find_mapping(host, hwirq);</div><div class='add'>+</div><div class='add'>+	return virq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void irq_radix_revmap_insert(struct irq_host *host, unsigned int virq,</div><div class='add'>+			     irq_hw_number_t hwirq)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(host-&gt;revmap_type != IRQ_HOST_MAP_TREE))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (virq != NO_IRQ) {</div><div class='add'>+		mutex_lock(&amp;revmap_trees_mutex);</div><div class='add'>+		radix_tree_insert(&amp;host-&gt;revmap_data.tree, hwirq,</div><div class='add'>+				  &amp;irq_map[virq]);</div><div class='add'>+		mutex_unlock(&amp;revmap_trees_mutex);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int irq_linear_revmap(struct irq_host *host,</div><div class='add'>+			       irq_hw_number_t hwirq)</div><div class='add'>+{</div><div class='add'>+	unsigned int *revmap;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(host-&gt;revmap_type != IRQ_HOST_MAP_LINEAR))</div><div class='add'>+		return irq_find_mapping(host, hwirq);</div><div class='add'>+</div><div class='add'>+	/* Check revmap bounds */</div><div class='add'>+	if (unlikely(hwirq &gt;= host-&gt;revmap_data.linear.size))</div><div class='add'>+		return irq_find_mapping(host, hwirq);</div><div class='add'>+</div><div class='add'>+	/* Check if revmap was allocated */</div><div class='add'>+	revmap = host-&gt;revmap_data.linear.revmap;</div><div class='add'>+	if (unlikely(revmap == NULL))</div><div class='add'>+		return irq_find_mapping(host, hwirq);</div><div class='add'>+</div><div class='add'>+	/* Fill up revmap with slow path if no mapping found */</div><div class='add'>+	if (unlikely(revmap[hwirq] == NO_IRQ))</div><div class='add'>+		revmap[hwirq] = irq_find_mapping(host, hwirq);</div><div class='add'>+</div><div class='add'>+	return revmap[hwirq];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int irq_alloc_virt(struct irq_host *host,</div><div class='add'>+			    unsigned int count,</div><div class='add'>+			    unsigned int hint)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int i, j, found = NO_IRQ;</div><div class='add'>+</div><div class='add'>+	if (count == 0 || count &gt; (irq_virq_count - NR_PRIORITY_IRQS))</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+</div><div class='add'>+	raw_spin_lock_irqsave(&amp;irq_big_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Use hint for 1 interrupt if any */</div><div class='add'>+	if (count == 1 &amp;&amp; hint &gt;= NR_PRIORITY_IRQS &amp;&amp;</div><div class='add'>+	    hint &lt; irq_virq_count &amp;&amp; irq_map[hint].host == NULL) {</div><div class='add'>+		found = hint;</div><div class='add'>+		goto hint_found;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Look for count consecutive numbers in the allocatable</div><div class='add'>+	 * (non-legacy) space</div><div class='add'>+	 */</div><div class='add'>+	for (i = NR_PRIORITY_IRQS, j = 0; i &lt; irq_virq_count; i++) {</div><div class='add'>+		if (irq_map[i].host != NULL)</div><div class='add'>+			j = 0;</div><div class='add'>+		else</div><div class='add'>+			j++;</div><div class='add'>+</div><div class='add'>+		if (j == count) {</div><div class='add'>+			found = i - count + 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (found == NO_IRQ) {</div><div class='add'>+		raw_spin_unlock_irqrestore(&amp;irq_big_lock, flags);</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+	}</div><div class='add'>+ hint_found:</div><div class='add'>+	for (i = found; i &lt; (found + count); i++) {</div><div class='add'>+		irq_map[i].hwirq = host-&gt;inval_irq;</div><div class='add'>+		smp_wmb();</div><div class='add'>+		irq_map[i].host = host;</div><div class='add'>+	}</div><div class='add'>+	raw_spin_unlock_irqrestore(&amp;irq_big_lock, flags);</div><div class='add'>+	return found;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void irq_free_virt(unsigned int virq, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	WARN_ON(virq &lt; NR_PRIORITY_IRQS);</div><div class='add'>+	WARN_ON(count == 0 || (virq + count) &gt; irq_virq_count);</div><div class='add'>+</div><div class='add'>+	if (virq &lt; NR_PRIORITY_IRQS) {</div><div class='add'>+		if (virq + count &lt; NR_PRIORITY_IRQS)</div><div class='add'>+			return;</div><div class='add'>+		count  -= NR_PRIORITY_IRQS - virq;</div><div class='add'>+		virq = NR_PRIORITY_IRQS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (count &gt; irq_virq_count || virq &gt; irq_virq_count - count) {</div><div class='add'>+		if (virq &gt; irq_virq_count)</div><div class='add'>+			return;</div><div class='add'>+		count = irq_virq_count - virq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	raw_spin_lock_irqsave(&amp;irq_big_lock, flags);</div><div class='add'>+	for (i = virq; i &lt; (virq + count); i++) {</div><div class='add'>+		struct irq_host *host;</div><div class='add'>+</div><div class='add'>+		host = irq_map[i].host;</div><div class='add'>+		irq_map[i].hwirq = host-&gt;inval_irq;</div><div class='add'>+		smp_wmb();</div><div class='add'>+		irq_map[i].host = NULL;</div><div class='add'>+	}</div><div class='add'>+	raw_spin_unlock_irqrestore(&amp;irq_big_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_VIRQ_DEBUG</div><div class='add'>+static int virq_debug_show(struct seq_file *m, void *private)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct irq_desc *desc;</div><div class='add'>+	const char *p;</div><div class='add'>+	static const char none[] = "none";</div><div class='add'>+	void *data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "%-5s  %-7s  %-15s  %-18s  %s\n", "virq", "hwirq",</div><div class='add'>+		      "chip name", "chip data", "host name");</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; nr_irqs; i++) {</div><div class='add'>+		desc = irq_to_desc(i);</div><div class='add'>+		if (!desc)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		raw_spin_lock_irqsave(&amp;desc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		if (desc-&gt;action &amp;&amp; desc-&gt;action-&gt;handler) {</div><div class='add'>+			struct irq_chip *chip;</div><div class='add'>+</div><div class='add'>+			seq_printf(m, "%5d  ", i);</div><div class='add'>+			seq_printf(m, "0x%05lx  ", irq_map[i].hwirq);</div><div class='add'>+</div><div class='add'>+			chip = irq_desc_get_chip(desc);</div><div class='add'>+			if (chip &amp;&amp; chip-&gt;name)</div><div class='add'>+				p = chip-&gt;name;</div><div class='add'>+			else</div><div class='add'>+				p = none;</div><div class='add'>+			seq_printf(m, "%-15s  ", p);</div><div class='add'>+</div><div class='add'>+			data = irq_desc_get_chip_data(desc);</div><div class='add'>+			seq_printf(m, "0x%16p  ", data);</div><div class='add'>+</div><div class='add'>+			if (irq_map[i].host &amp;&amp; irq_map[i].host-&gt;of_node)</div><div class='add'>+				p = irq_map[i].host-&gt;of_node-&gt;full_name;</div><div class='add'>+			else</div><div class='add'>+				p = none;</div><div class='add'>+			seq_printf(m, "%s\n", p);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		raw_spin_unlock_irqrestore(&amp;desc-&gt;lock, flags);</div><div 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 virq_debug_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, virq_debug_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations virq_debug_fops = {</div><div class='add'>+	.open = virq_debug_open,</div><div class='add'>+	.read = seq_read,</div><div class='add'>+	.llseek = seq_lseek,</div><div class='add'>+	.release = single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init irq_debugfs_init(void)</div><div class='add'>+{</div><div class='add'>+	if (debugfs_create_file("virq_mapping", S_IRUGO, powerpc_debugfs_root,</div><div class='add'>+				 NULL, &amp;virq_debug_fops) == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+device_initcall(irq_debugfs_init);</div><div class='add'>+#endif /* CONFIG_VIRQ_DEBUG */</div><div class='head'>diff --git a/arch/c6x/kernel/module.c b/arch/c6x/kernel/module.c<br/>new file mode 100644<br/>index 000000000000..5fc03f18f56c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/module.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/module.c</a></div><div class='hunk'>@@ -0,0 +1,123 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Thomas Charleux (thomas.charleux@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/moduleloader.h&gt;</div><div class='add'>+#include &lt;linux/elf.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+static inline int fixup_pcr(u32 *ip, Elf32_Addr dest, u32 maskbits, int shift)</div><div class='add'>+{</div><div class='add'>+	u32 opcode;</div><div class='add'>+	long ep = (long)ip &amp; ~31;</div><div class='add'>+	long delta = ((long)dest - ep) &gt;&gt; 2;</div><div class='add'>+	long mask = (1 &lt;&lt; maskbits) - 1;</div><div class='add'>+</div><div class='add'>+	if ((delta &gt;&gt; (maskbits - 1)) == 0 ||</div><div class='add'>+	    (delta &gt;&gt; (maskbits - 1)) == -1) {</div><div class='add'>+		opcode = *ip;</div><div class='add'>+		opcode &amp;= ~(mask &lt;&lt; shift);</div><div class='add'>+		opcode |= ((delta &amp; mask) &lt;&lt; shift);</div><div class='add'>+		*ip = opcode;</div><div class='add'>+</div><div class='add'>+		pr_debug("REL PCR_S%d[%p] dest[%p] opcode[%08x]\n",</div><div class='add'>+			 maskbits, ip, (void *)dest, opcode);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	pr_err("PCR_S%d reloc %p -&gt; %p out of range!\n",</div><div class='add'>+	       maskbits, ip, (void *)dest);</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * apply a RELA relocation</div><div class='add'>+ */</div><div class='add'>+int apply_relocate_add(Elf32_Shdr *sechdrs,</div><div class='add'>+		       const char *strtab,</div><div class='add'>+		       unsigned int symindex,</div><div class='add'>+		       unsigned int relsec,</div><div class='add'>+		       struct module *me)</div><div class='add'>+{</div><div class='add'>+	Elf32_Rela *rel = (void *) sechdrs[relsec].sh_addr;</div><div class='add'>+	Elf_Sym *sym;</div><div class='add'>+	u32 *location, opcode;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	Elf32_Addr v;</div><div class='add'>+	Elf_Addr offset = 0;</div><div class='add'>+</div><div class='add'>+	pr_debug("Applying relocate section %u to %u with offset 0x%x\n",</div><div class='add'>+		 relsec, sechdrs[relsec].sh_info, offset);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sechdrs[relsec].sh_size / sizeof(*rel); i++) {</div><div class='add'>+		/* This is where to make the change */</div><div class='add'>+		location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr</div><div class='add'>+			+ rel[i].r_offset - offset;</div><div class='add'>+</div><div class='add'>+		/* This is the symbol it is referring to.  Note that all</div><div class='add'>+		   undefined symbols have been resolved.  */</div><div class='add'>+		sym = (Elf_Sym *)sechdrs[symindex].sh_addr</div><div class='add'>+			+ ELF32_R_SYM(rel[i].r_info);</div><div class='add'>+</div><div class='add'>+		/* this is the adjustment to be made */</div><div class='add'>+		v = sym-&gt;st_value + rel[i].r_addend;</div><div class='add'>+</div><div class='add'>+		switch (ELF32_R_TYPE(rel[i].r_info)) {</div><div class='add'>+		case R_C6000_ABS32:</div><div class='add'>+			pr_debug("RELA ABS32: [%p] = 0x%x\n", location, v);</div><div class='add'>+			*location = v;</div><div class='add'>+			break;</div><div class='add'>+		case R_C6000_ABS16:</div><div class='add'>+			pr_debug("RELA ABS16: [%p] = 0x%x\n", location, v);</div><div class='add'>+			*(u16 *)location = v;</div><div class='add'>+			break;</div><div class='add'>+		case R_C6000_ABS8:</div><div class='add'>+			pr_debug("RELA ABS8: [%p] = 0x%x\n", location, v);</div><div class='add'>+			*(u8 *)location = v;</div><div class='add'>+			break;</div><div class='add'>+		case R_C6000_ABS_L16:</div><div class='add'>+			opcode = *location;</div><div class='add'>+			opcode &amp;= ~0x7fff80;</div><div class='add'>+			opcode |= ((v &amp; 0xffff) &lt;&lt; 7);</div><div class='add'>+			pr_debug("RELA ABS_L16[%p] v[0x%x] opcode[0x%x]\n",</div><div class='add'>+				 location, v, opcode);</div><div class='add'>+			*location = opcode;</div><div class='add'>+			break;</div><div class='add'>+		case R_C6000_ABS_H16:</div><div class='add'>+			opcode = *location;</div><div class='add'>+			opcode &amp;= ~0x7fff80;</div><div class='add'>+			opcode |= ((v &gt;&gt; 9) &amp; 0x7fff80);</div><div class='add'>+			pr_debug("RELA ABS_H16[%p] v[0x%x] opcode[0x%x]\n",</div><div class='add'>+				 location, v, opcode);</div><div class='add'>+			*location = opcode;</div><div class='add'>+			break;</div><div class='add'>+		case R_C6000_PCR_S21:</div><div class='add'>+			if (fixup_pcr(location, v, 21, 7))</div><div class='add'>+				return -ENOEXEC;</div><div class='add'>+			break;</div><div class='add'>+		case R_C6000_PCR_S12:</div><div class='add'>+			if (fixup_pcr(location, v, 12, 16))</div><div class='add'>+				return -ENOEXEC;</div><div class='add'>+			break;</div><div class='add'>+		case R_C6000_PCR_S10:</div><div class='add'>+			if (fixup_pcr(location, v, 10, 13))</div><div class='add'>+				return -ENOEXEC;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			pr_err("module %s: Unknown RELA relocation: %u\n",</div><div class='add'>+			       me-&gt;name, ELF32_R_TYPE(rel[i].r_info));</div><div class='add'>+			return -ENOEXEC;</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='head'>diff --git a/arch/c6x/kernel/process.c b/arch/c6x/kernel/process.c<br/>new file mode 100644<br/>index 000000000000..7ca8c41b03cd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/process.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/process.c</a></div><div class='hunk'>@@ -0,0 +1,265 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2006, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</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/unistd.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/init_task.h&gt;</div><div class='add'>+#include &lt;linux/tick.h&gt;</div><div class='add'>+#include &lt;linux/mqueue.h&gt;</div><div class='add'>+#include &lt;linux/syscalls.h&gt;</div><div class='add'>+#include &lt;linux/reboot.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/syscalls.h&gt;</div><div class='add'>+</div><div class='add'>+/* hooks for board specific support */</div><div class='add'>+void	(*c6x_restart)(void);</div><div class='add'>+void	(*c6x_halt)(void);</div><div class='add'>+</div><div class='add'>+extern asmlinkage void ret_from_fork(void);</div><div class='add'>+</div><div class='add'>+static struct signal_struct init_signals = INIT_SIGNALS(init_signals);</div><div class='add'>+static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initial thread structure.</div><div class='add'>+ */</div><div class='add'>+union thread_union init_thread_union __init_task_data =	{</div><div class='add'>+	INIT_THREAD_INFO(init_task)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initial task structure.</div><div class='add'>+ */</div><div class='add'>+struct task_struct init_task = INIT_TASK(init_task);</div><div class='add'>+EXPORT_SYMBOL(init_task);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * power off function, if any</div><div class='add'>+ */</div><div class='add'>+void (*pm_power_off)(void);</div><div class='add'>+EXPORT_SYMBOL(pm_power_off);</div><div class='add'>+</div><div class='add'>+static void c6x_idle(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Put local_irq_enable and idle in same execute packet</div><div class='add'>+	 * to make them atomic and avoid race to idle with</div><div class='add'>+	 * interrupts enabled.</div><div class='add'>+	 */</div><div class='add'>+	asm volatile ("   mvc .s2 CSR,%0\n"</div><div class='add'>+		      "   or  .d2 1,%0,%0\n"</div><div class='add'>+		      "   mvc .s2 %0,CSR\n"</div><div class='add'>+		      "|| idle\n"</div><div class='add'>+		      : "=b"(tmp));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The idle loop for C64x</div><div class='add'>+ */</div><div class='add'>+void cpu_idle(void)</div><div class='add'>+{</div><div class='add'>+	/* endless idle loop with no priority at all */</div><div class='add'>+	while (1) {</div><div class='add'>+		tick_nohz_idle_enter();</div><div class='add'>+		rcu_idle_enter();</div><div class='add'>+		while (1) {</div><div class='add'>+			local_irq_disable();</div><div class='add'>+			if (need_resched()) {</div><div class='add'>+				local_irq_enable();</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			c6x_idle(); /* enables local irqs */</div><div class='add'>+		}</div><div class='add'>+		rcu_idle_exit();</div><div class='add'>+		tick_nohz_idle_exit();</div><div class='add'>+</div><div class='add'>+		preempt_enable_no_resched();</div><div class='add'>+		schedule();</div><div class='add'>+		preempt_disable();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void halt_loop(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_EMERG "System Halted, OK to turn off power\n");</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	while (1)</div><div class='add'>+		asm volatile("idle\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void machine_restart(char *__unused)</div><div class='add'>+{</div><div class='add'>+	if (c6x_restart)</div><div class='add'>+		c6x_restart();</div><div class='add'>+	halt_loop();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void machine_halt(void)</div><div class='add'>+{</div><div class='add'>+	if (c6x_halt)</div><div class='add'>+		c6x_halt();</div><div class='add'>+	halt_loop();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void machine_power_off(void)</div><div class='add'>+{</div><div class='add'>+	if (pm_power_off)</div><div class='add'>+		pm_power_off();</div><div class='add'>+	halt_loop();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kernel_thread_helper(int dummy, void *arg, int (*fn)(void *))</div><div class='add'>+{</div><div class='add'>+	do_exit(fn(arg));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create a kernel thread</div><div class='add'>+ */</div><div class='add'>+int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs regs;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * copy_thread sets a4 to zero (child return from fork)</div><div class='add'>+	 * so we can't just set things up to directly return to</div><div class='add'>+	 * fn.</div><div class='add'>+	 */</div><div class='add'>+	memset(&amp;regs, 0, sizeof(regs));</div><div class='add'>+	regs.b4 = (unsigned long) arg;</div><div class='add'>+	regs.a6 = (unsigned long) fn;</div><div class='add'>+	regs.pc = (unsigned long) kernel_thread_helper;</div><div class='add'>+	local_save_flags(regs.csr);</div><div class='add'>+	regs.csr |= 1;</div><div class='add'>+	regs.tsr = 5; /* Set GEE and GIE in TSR */</div><div class='add'>+</div><div class='add'>+	/* Ok, create the new process.. */</div><div class='add'>+	return do_fork(flags | CLONE_VM | CLONE_UNTRACED, -1, &amp;regs,</div><div class='add'>+		       0, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(kernel_thread);</div><div class='add'>+</div><div class='add'>+void flush_thread(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void exit_thread(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SYSCALL_DEFINE1(c6x_clone, struct pt_regs *, regs)</div><div class='add'>+{</div><div class='add'>+	unsigned long clone_flags;</div><div class='add'>+	unsigned long newsp;</div><div class='add'>+</div><div class='add'>+	/* syscall puts clone_flags in A4 and usp in B4 */</div><div class='add'>+	clone_flags = regs-&gt;orig_a4;</div><div class='add'>+	if (regs-&gt;b4)</div><div class='add'>+		newsp = regs-&gt;b4;</div><div class='add'>+	else</div><div class='add'>+		newsp = regs-&gt;sp;</div><div class='add'>+</div><div class='add'>+	return do_fork(clone_flags, newsp, regs, 0, (int __user *)regs-&gt;a6,</div><div class='add'>+		       (int __user *)regs-&gt;b6);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Do necessary setup to start up a newly executed thread.</div><div class='add'>+ */</div><div class='add'>+void start_thread(struct pt_regs *regs, unsigned int pc, unsigned long usp)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The binfmt loader will setup a "full" stack, but the C6X</div><div class='add'>+	 * operates an "empty" stack. So we adjust the usp so that</div><div class='add'>+	 * argc doesn't get destroyed if an interrupt is taken before</div><div class='add'>+	 * it is read from the stack.</div><div class='add'>+	 *</div><div class='add'>+	 * NB: Library startup code needs to match this.</div><div class='add'>+	 */</div><div class='add'>+	usp -= 8;</div><div class='add'>+</div><div class='add'>+	set_fs(USER_DS);</div><div class='add'>+	regs-&gt;pc  = pc;</div><div class='add'>+	regs-&gt;sp  = usp;</div><div class='add'>+	regs-&gt;tsr |= 0x40; /* set user mode */</div><div class='add'>+	current-&gt;thread.usp = usp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copy a new thread context in its stack.</div><div class='add'>+ */</div><div class='add'>+int copy_thread(unsigned long clone_flags, unsigned long usp,</div><div class='add'>+		unsigned long ustk_size,</div><div class='add'>+		struct task_struct *p, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs *childregs;</div><div class='add'>+</div><div class='add'>+	childregs = task_pt_regs(p);</div><div class='add'>+</div><div class='add'>+	*childregs = *regs;</div><div class='add'>+	childregs-&gt;a4 = 0;</div><div class='add'>+</div><div class='add'>+	if (usp == -1)</div><div class='add'>+		/* case of  __kernel_thread: we return to supervisor space */</div><div class='add'>+		childregs-&gt;sp = (unsigned long)(childregs + 1);</div><div class='add'>+	else</div><div class='add'>+		/* Otherwise use the given stack */</div><div class='add'>+		childregs-&gt;sp = usp;</div><div class='add'>+</div><div class='add'>+	/* Set usp/ksp */</div><div class='add'>+	p-&gt;thread.usp = childregs-&gt;sp;</div><div class='add'>+	/* switch_to uses stack to save/restore 14 callee-saved regs */</div><div class='add'>+	thread_saved_ksp(p) = (unsigned long)childregs - 8;</div><div class='add'>+	p-&gt;thread.pc = (unsigned int) ret_from_fork;</div><div class='add'>+	p-&gt;thread.wchan	= (unsigned long) ret_from_fork;</div><div class='add'>+#ifdef __DSBT__</div><div class='add'>+	{</div><div class='add'>+		unsigned long dp;</div><div class='add'>+</div><div class='add'>+		asm volatile ("mv .S2 b14,%0\n" : "=b"(dp));</div><div class='add'>+</div><div class='add'>+		thread_saved_dp(p) = dp;</div><div class='add'>+		if (usp == -1)</div><div class='add'>+			childregs-&gt;dp = dp;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * c6x_execve() executes a new program.</div><div class='add'>+ */</div><div class='add'>+SYSCALL_DEFINE4(c6x_execve, const char __user *, name,</div><div class='add'>+		const char __user *const __user *, argv,</div><div class='add'>+		const char __user *const __user *, envp,</div><div class='add'>+		struct pt_regs *, regs)</div><div class='add'>+{</div><div class='add'>+	int error;</div><div class='add'>+	char *filename;</div><div class='add'>+</div><div class='add'>+	filename = getname(name);</div><div class='add'>+	error = PTR_ERR(filename);</div><div class='add'>+	if (IS_ERR(filename))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	error = do_execve(filename, argv, envp, regs);</div><div class='add'>+	putname(filename);</div><div class='add'>+out:</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long get_wchan(struct task_struct *p)</div><div class='add'>+{</div><div class='add'>+	return p-&gt;thread.wchan;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/c6x/kernel/ptrace.c b/arch/c6x/kernel/ptrace.c<br/>new file mode 100644<br/>index 000000000000..3c494e84444d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/ptrace.c</a></div><div class='hunk'>@@ -0,0 +1,187 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2006, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</div><div class='add'>+ *</div><div class='add'>+ *  Updated for 2.6.34: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/tracehook.h&gt;</div><div class='add'>+#include &lt;linux/regset.h&gt;</div><div class='add'>+#include &lt;linux/elf.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+</div><div class='add'>+#define PT_REG_SIZE	  (sizeof(struct pt_regs))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called by kernel/ptrace.c when detaching.</div><div class='add'>+ */</div><div class='add'>+void ptrace_disable(struct task_struct *child)</div><div class='add'>+{</div><div class='add'>+	/* nothing to do */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get a register number from live pt_regs for the specified task.</div><div class='add'>+ */</div><div class='add'>+static inline long get_reg(struct task_struct *task, int regno)</div><div class='add'>+{</div><div class='add'>+	long *addr = (long *)task_pt_regs(task);</div><div class='add'>+</div><div class='add'>+	if (regno == PT_TSR || regno == PT_CSR)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return addr[regno];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write contents of register REGNO in task TASK.</div><div class='add'>+ */</div><div class='add'>+static inline int put_reg(struct task_struct *task,</div><div class='add'>+			  int regno,</div><div class='add'>+			  unsigned long data)</div><div class='add'>+{</div><div class='add'>+	unsigned long *addr = (unsigned long *)task_pt_regs(task);</div><div class='add'>+</div><div class='add'>+	if (regno != PT_TSR &amp;&amp; regno != PT_CSR)</div><div class='add'>+		addr[regno] = data;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* regset get/set implementations */</div><div class='add'>+</div><div class='add'>+static int gpr_get(struct task_struct *target,</div><div class='add'>+		   const struct user_regset *regset,</div><div class='add'>+		   unsigned int pos, unsigned int count,</div><div class='add'>+		   void *kbuf, void __user *ubuf)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs *regs = task_pt_regs(target);</div><div class='add'>+</div><div class='add'>+	return user_regset_copyout(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf,</div><div class='add'>+				   regs,</div><div class='add'>+				   0, sizeof(*regs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gpr_set(struct task_struct *target,</div><div class='add'>+		   const struct user_regset *regset,</div><div class='add'>+		   unsigned int pos, unsigned int count,</div><div class='add'>+		   const void *kbuf, const void __user *ubuf)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct pt_regs *regs = task_pt_regs(target);</div><div class='add'>+</div><div class='add'>+	/* Don't copyin TSR or CSR */</div><div class='add'>+	ret = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf,</div><div class='add'>+				 &amp;regs,</div><div class='add'>+				 0, PT_TSR * sizeof(long));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = user_regset_copyin_ignore(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf,</div><div class='add'>+					PT_TSR * sizeof(long),</div><div class='add'>+					(PT_TSR + 1) * sizeof(long));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf,</div><div class='add'>+				 &amp;regs,</div><div class='add'>+				 (PT_TSR + 1) * sizeof(long),</div><div class='add'>+				 PT_CSR * sizeof(long));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = user_regset_copyin_ignore(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf,</div><div class='add'>+					PT_CSR * sizeof(long),</div><div class='add'>+					(PT_CSR + 1) * sizeof(long));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = user_regset_copyin(&amp;pos, &amp;count, &amp;kbuf, &amp;ubuf,</div><div class='add'>+				 &amp;regs,</div><div class='add'>+				 (PT_CSR + 1) * sizeof(long), -1);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum c6x_regset {</div><div class='add'>+	REGSET_GPR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct user_regset c6x_regsets[] = {</div><div class='add'>+	[REGSET_GPR] = {</div><div class='add'>+		.core_note_type = NT_PRSTATUS,</div><div class='add'>+		.n = ELF_NGREG,</div><div class='add'>+		.size = sizeof(u32),</div><div class='add'>+		.align = sizeof(u32),</div><div class='add'>+		.get = gpr_get,</div><div class='add'>+		.set = gpr_set</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct user_regset_view user_c6x_native_view = {</div><div class='add'>+	.name		= "tic6x",</div><div class='add'>+	.e_machine	= EM_TI_C6000,</div><div class='add'>+	.regsets	= c6x_regsets,</div><div class='add'>+	.n		= ARRAY_SIZE(c6x_regsets),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct user_regset_view *task_user_regset_view(struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	return &amp;user_c6x_native_view;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Perform ptrace request</div><div class='add'>+ */</div><div class='add'>+long arch_ptrace(struct task_struct *child, long request,</div><div class='add'>+		 unsigned long addr, unsigned long data)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (request) {</div><div class='add'>+		/*</div><div class='add'>+		 * write the word at location addr.</div><div class='add'>+		 */</div><div class='add'>+	case PTRACE_POKETEXT:</div><div class='add'>+		ret = generic_ptrace_pokedata(child, addr, data);</div><div class='add'>+		if (ret == 0 &amp;&amp; request == PTRACE_POKETEXT)</div><div class='add'>+			flush_icache_range(addr, addr + 4);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = ptrace_request(child, request, addr, data);</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'>+ * handle tracing of system call entry</div><div class='add'>+ * - return the revised system call number or ULONG_MAX to cause ENOSYS</div><div class='add'>+ */</div><div class='add'>+asmlinkage unsigned long syscall_trace_entry(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	if (tracehook_report_syscall_entry(regs))</div><div class='add'>+		/* tracing decided this syscall should not happen, so</div><div class='add'>+		 * We'll return a bogus call number to get an ENOSYS</div><div class='add'>+		 * error, but leave the original number in</div><div class='add'>+		 * regs-&gt;orig_a4</div><div class='add'>+		 */</div><div class='add'>+		return ULONG_MAX;</div><div class='add'>+</div><div class='add'>+	return regs-&gt;b0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * handle tracing of system call exit</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'>+	tracehook_report_syscall_exit(regs, 0);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c<br/>new file mode 100644<br/>index 000000000000..0c07921747f4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/setup.c</a></div><div class='hunk'>@@ -0,0 +1,510 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2006, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/memblock.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/clkdev.h&gt;</div><div class='add'>+#include &lt;linux/initrd.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_fdt.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'>+#include &lt;linux/cache.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;asm/sections.h&gt;</div><div class='add'>+#include &lt;asm/div64.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/dscr.h&gt;</div><div class='add'>+#include &lt;asm/clock.h&gt;</div><div class='add'>+#include &lt;asm/soc.h&gt;</div><div class='add'>+</div><div class='add'>+static const char *c6x_soc_name;</div><div class='add'>+</div><div class='add'>+int c6x_num_cores;</div><div class='add'>+EXPORT_SYMBOL_GPL(c6x_num_cores);</div><div class='add'>+</div><div class='add'>+unsigned int c6x_silicon_rev;</div><div class='add'>+EXPORT_SYMBOL_GPL(c6x_silicon_rev);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Device status register. This holds information</div><div class='add'>+ * about device configuration needed by some drivers.</div><div class='add'>+ */</div><div class='add'>+unsigned int c6x_devstat;</div><div class='add'>+EXPORT_SYMBOL_GPL(c6x_devstat);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Some SoCs have fuse registers holding a unique MAC</div><div class='add'>+ * address. This is parsed out of the device tree with</div><div class='add'>+ * the resulting MAC being held here.</div><div class='add'>+ */</div><div class='add'>+unsigned char c6x_fuse_mac[6];</div><div class='add'>+</div><div class='add'>+unsigned long memory_start;</div><div class='add'>+unsigned long memory_end;</div><div class='add'>+</div><div class='add'>+unsigned long ram_start;</div><div class='add'>+unsigned long ram_end;</div><div class='add'>+</div><div class='add'>+/* Uncached memory for DMA consistent use (memdma=) */</div><div class='add'>+static unsigned long dma_start __initdata;</div><div class='add'>+static unsigned long dma_size __initdata;</div><div class='add'>+</div><div class='add'>+char c6x_command_line[COMMAND_LINE_SIZE];</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CMDLINE_BOOL)</div><div class='add'>+static const char default_command_line[COMMAND_LINE_SIZE] __section(.cmdline) =</div><div class='add'>+	CONFIG_CMDLINE;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct cpuinfo_c6x {</div><div class='add'>+	const char *cpu_name;</div><div class='add'>+	const char *cpu_voltage;</div><div class='add'>+	const char *mmu;</div><div class='add'>+	const char *fpu;</div><div class='add'>+	char *cpu_rev;</div><div class='add'>+	unsigned int core_id;</div><div class='add'>+	char __cpu_rev[5];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_PER_CPU(struct cpuinfo_c6x, cpu_data);</div><div class='add'>+</div><div class='add'>+unsigned int ticks_per_ns_scaled;</div><div class='add'>+EXPORT_SYMBOL(ticks_per_ns_scaled);</div><div class='add'>+</div><div class='add'>+unsigned int c6x_core_freq;</div><div class='add'>+</div><div class='add'>+static void __init get_cpuinfo(void)</div><div class='add'>+{</div><div class='add'>+	unsigned cpu_id, rev_id, csr;</div><div class='add'>+	struct clk *coreclk = clk_get_sys(NULL, "core");</div><div class='add'>+	unsigned long core_khz;</div><div class='add'>+	u64 tmp;</div><div class='add'>+	struct cpuinfo_c6x *p;</div><div class='add'>+	struct device_node *node, *np;</div><div class='add'>+</div><div class='add'>+	p = &amp;per_cpu(cpu_data, smp_processor_id());</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR(coreclk))</div><div class='add'>+		c6x_core_freq = clk_get_rate(coreclk);</div><div class='add'>+	else {</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "Cannot find core clock frequency. Using 700MHz\n");</div><div class='add'>+		c6x_core_freq = 700000000;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	core_khz = c6x_core_freq / 1000;</div><div class='add'>+</div><div class='add'>+	tmp = (uint64_t)core_khz &lt;&lt; C6X_NDELAY_SCALE;</div><div class='add'>+	do_div(tmp, 1000000);</div><div class='add'>+	ticks_per_ns_scaled = tmp;</div><div class='add'>+</div><div class='add'>+	csr = get_creg(CSR);</div><div class='add'>+	cpu_id = csr &gt;&gt; 24;</div><div class='add'>+	rev_id = (csr &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	p-&gt;mmu = "none";</div><div class='add'>+	p-&gt;fpu = "none";</div><div class='add'>+	p-&gt;cpu_voltage = "unknown";</div><div class='add'>+</div><div class='add'>+	switch (cpu_id) {</div><div class='add'>+	case 0:</div><div class='add'>+		p-&gt;cpu_name = "C67x";</div><div class='add'>+		p-&gt;fpu = "yes";</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		p-&gt;cpu_name = "C62x";</div><div class='add'>+		break;</div><div class='add'>+	case 8:</div><div class='add'>+		p-&gt;cpu_name = "C64x";</div><div class='add'>+		break;</div><div class='add'>+	case 12:</div><div class='add'>+		p-&gt;cpu_name = "C64x";</div><div class='add'>+		break;</div><div class='add'>+	case 16:</div><div class='add'>+		p-&gt;cpu_name = "C64x+";</div><div class='add'>+		p-&gt;cpu_voltage = "1.2";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		p-&gt;cpu_name = "unknown";</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cpu_id &lt; 16) {</div><div class='add'>+		switch (rev_id) {</div><div class='add'>+		case 0x1:</div><div class='add'>+			if (cpu_id &gt; 8) {</div><div class='add'>+				p-&gt;cpu_rev = "DM640/DM641/DM642/DM643";</div><div class='add'>+				p-&gt;cpu_voltage = "1.2 - 1.4";</div><div class='add'>+			} else {</div><div class='add'>+				p-&gt;cpu_rev = "C6201";</div><div class='add'>+				p-&gt;cpu_voltage = "2.5";</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case 0x2:</div><div class='add'>+			p-&gt;cpu_rev = "C6201B/C6202/C6211";</div><div class='add'>+			p-&gt;cpu_voltage = "1.8";</div><div class='add'>+			break;</div><div class='add'>+		case 0x3:</div><div class='add'>+			p-&gt;cpu_rev = "C6202B/C6203/C6204/C6205";</div><div class='add'>+			p-&gt;cpu_voltage = "1.5";</div><div class='add'>+			break;</div><div class='add'>+		case 0x201:</div><div class='add'>+			p-&gt;cpu_rev = "C6701 revision 0 (early CPU)";</div><div class='add'>+			p-&gt;cpu_voltage = "1.8";</div><div class='add'>+			break;</div><div class='add'>+		case 0x202:</div><div class='add'>+			p-&gt;cpu_rev = "C6701/C6711/C6712";</div><div class='add'>+			p-&gt;cpu_voltage = "1.8";</div><div class='add'>+			break;</div><div class='add'>+		case 0x801:</div><div class='add'>+			p-&gt;cpu_rev = "C64x";</div><div class='add'>+			p-&gt;cpu_voltage = "1.5";</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			p-&gt;cpu_rev = "unknown";</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		p-&gt;cpu_rev = p-&gt;__cpu_rev;</div><div class='add'>+		snprintf(p-&gt;__cpu_rev, sizeof(p-&gt;__cpu_rev), "0x%x", cpu_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p-&gt;core_id = get_coreid();</div><div class='add'>+</div><div class='add'>+	node = of_find_node_by_name(NULL, "cpus");</div><div class='add'>+	if (node) {</div><div class='add'>+		for_each_child_of_node(node, np)</div><div class='add'>+			if (!strcmp("cpu", np-&gt;name))</div><div class='add'>+				++c6x_num_cores;</div><div class='add'>+		of_node_put(node);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node = of_find_node_by_name(NULL, "soc");</div><div class='add'>+	if (node) {</div><div class='add'>+		if (of_property_read_string(node, "model", &amp;c6x_soc_name))</div><div class='add'>+			c6x_soc_name = "unknown";</div><div class='add'>+		of_node_put(node);</div><div class='add'>+	} else</div><div class='add'>+		c6x_soc_name = "unknown";</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "CPU%d: %s rev %s, %s volts, %uMHz\n",</div><div class='add'>+	       p-&gt;core_id, p-&gt;cpu_name, p-&gt;cpu_rev,</div><div class='add'>+	       p-&gt;cpu_voltage, c6x_core_freq / 1000000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Early parsing of the command line</div><div class='add'>+ */</div><div class='add'>+static u32 mem_size __initdata;</div><div class='add'>+</div><div class='add'>+/* "mem=" parsing. */</div><div class='add'>+static int __init early_mem(char *p)</div><div class='add'>+{</div><div class='add'>+	if (!p)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mem_size = memparse(p, &amp;p);</div><div class='add'>+	/* don't remove all of memory when handling "mem={invalid}" */</div><div class='add'>+	if (mem_size == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("mem", early_mem);</div><div class='add'>+</div><div class='add'>+/* "memdma=&lt;size&gt;[@&lt;address&gt;]" parsing. */</div><div class='add'>+static int __init early_memdma(char *p)</div><div class='add'>+{</div><div class='add'>+	if (!p)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dma_size = memparse(p, &amp;p);</div><div class='add'>+	if (*p == '@')</div><div class='add'>+		dma_start = memparse(p, &amp;p);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("memdma", early_memdma);</div><div class='add'>+</div><div class='add'>+int __init c6x_add_memory(phys_addr_t start, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	static int ram_found __initdata;</div><div class='add'>+</div><div class='add'>+	/* We only handle one bank (the one with PAGE_OFFSET) for now */</div><div class='add'>+	if (ram_found)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (start &gt; PAGE_OFFSET || PAGE_OFFSET &gt;= (start + size))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ram_start = start;</div><div class='add'>+	ram_end = start + size;</div><div class='add'>+</div><div class='add'>+	ram_found = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Do early machine setup and device tree parsing. This is called very</div><div class='add'>+ * early on the boot process.</div><div class='add'>+ */</div><div class='add'>+notrace void __init machine_init(unsigned long dt_ptr)</div><div class='add'>+{</div><div class='add'>+	struct boot_param_header *dtb = __va(dt_ptr);</div><div class='add'>+	struct boot_param_header *fdt = (struct boot_param_header *)_fdt_start;</div><div class='add'>+</div><div class='add'>+	/* interrupts must be masked */</div><div class='add'>+	set_creg(IER, 2);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set the Interrupt Service Table (IST) to the beginning of the</div><div class='add'>+	 * vector table.</div><div class='add'>+	 */</div><div class='add'>+	set_ist(_vectors_start);</div><div class='add'>+</div><div class='add'>+	lockdep_init();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * dtb is passed in from bootloader.</div><div class='add'>+	 * fdt is linked in blob.</div><div class='add'>+	 */</div><div class='add'>+	if (dtb &amp;&amp; dtb != fdt)</div><div class='add'>+		fdt = dtb;</div><div class='add'>+</div><div class='add'>+	/* Do some early initialization based on the flat device tree */</div><div class='add'>+	early_init_devtree(fdt);</div><div class='add'>+</div><div class='add'>+	/* parse_early_param needs a boot_command_line */</div><div class='add'>+	strlcpy(boot_command_line, c6x_command_line, COMMAND_LINE_SIZE);</div><div class='add'>+	parse_early_param();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init setup_arch(char **cmdline_p)</div><div class='add'>+{</div><div class='add'>+	int bootmap_size;</div><div class='add'>+	struct memblock_region *reg;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Initializing kernel\n");</div><div class='add'>+</div><div class='add'>+	/* Initialize command line */</div><div class='add'>+	*cmdline_p = c6x_command_line;</div><div class='add'>+</div><div class='add'>+	memory_end = ram_end;</div><div class='add'>+	memory_end &amp;= ~(PAGE_SIZE - 1);</div><div class='add'>+</div><div class='add'>+	if (mem_size &amp;&amp; (PAGE_OFFSET + PAGE_ALIGN(mem_size)) &lt; memory_end)</div><div class='add'>+		memory_end = PAGE_OFFSET + PAGE_ALIGN(mem_size);</div><div class='add'>+</div><div class='add'>+	/* add block that this kernel can use */</div><div class='add'>+	memblock_add(PAGE_OFFSET, memory_end - PAGE_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* reserve kernel text/data/bss */</div><div class='add'>+	memblock_reserve(PAGE_OFFSET,</div><div class='add'>+			 PAGE_ALIGN((unsigned long)&amp;_end - PAGE_OFFSET));</div><div class='add'>+</div><div class='add'>+	if (dma_size) {</div><div class='add'>+		/* align to cacheability granularity */</div><div class='add'>+		dma_size = CACHE_REGION_END(dma_size);</div><div class='add'>+</div><div class='add'>+		if (!dma_start)</div><div class='add'>+			dma_start = memory_end - dma_size;</div><div class='add'>+</div><div class='add'>+		/* align to cacheability granularity */</div><div class='add'>+		dma_start = CACHE_REGION_START(dma_start);</div><div class='add'>+</div><div class='add'>+		/* reserve DMA memory taken from kernel memory */</div><div class='add'>+		if (memblock_is_region_memory(dma_start, dma_size))</div><div class='add'>+			memblock_reserve(dma_start, dma_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memory_start = PAGE_ALIGN((unsigned int) &amp;_end);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Memory Start=%08lx, Memory End=%08lx\n",</div><div class='add'>+	       memory_start, memory_end);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BLK_DEV_INITRD</div><div class='add'>+	/*</div><div class='add'>+	 * Reserve initrd memory if in kernel memory.</div><div class='add'>+	 */</div><div class='add'>+	if (initrd_start &lt; initrd_end)</div><div class='add'>+		if (memblock_is_region_memory(initrd_start,</div><div class='add'>+					      initrd_end - initrd_start))</div><div class='add'>+			memblock_reserve(initrd_start,</div><div class='add'>+					 initrd_end - initrd_start);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	init_mm.start_code = (unsigned long) &amp;_stext;</div><div class='add'>+	init_mm.end_code   = (unsigned long) &amp;_etext;</div><div class='add'>+	init_mm.end_data   = memory_start;</div><div class='add'>+	init_mm.brk        = memory_start;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Give all the memory to the bootmap allocator,  tell it to put the</div><div class='add'>+	 * boot mem_map at the start of memory</div><div class='add'>+	 */</div><div class='add'>+	bootmap_size = init_bootmem_node(NODE_DATA(0),</div><div class='add'>+					 memory_start &gt;&gt; PAGE_SHIFT,</div><div class='add'>+					 PAGE_OFFSET &gt;&gt; PAGE_SHIFT,</div><div class='add'>+					 memory_end &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	memblock_reserve(memory_start, bootmap_size);</div><div class='add'>+</div><div class='add'>+	unflatten_device_tree();</div><div class='add'>+</div><div class='add'>+	c6x_cache_init();</div><div class='add'>+</div><div class='add'>+	/* Set the whole external memory as non-cacheable */</div><div class='add'>+	disable_caching(ram_start, ram_end - 1);</div><div class='add'>+</div><div class='add'>+	/* Set caching of external RAM used by Linux */</div><div class='add'>+	for_each_memblock(memory, reg)</div><div class='add'>+		enable_caching(CACHE_REGION_START(reg-&gt;base),</div><div class='add'>+			       CACHE_REGION_START(reg-&gt;base + reg-&gt;size - 1));</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BLK_DEV_INITRD</div><div class='add'>+	/*</div><div class='add'>+	 * Enable caching for initrd which falls outside kernel memory.</div><div class='add'>+	 */</div><div class='add'>+	if (initrd_start &lt; initrd_end) {</div><div class='add'>+		if (!memblock_is_region_memory(initrd_start,</div><div class='add'>+					       initrd_end - initrd_start))</div><div class='add'>+			enable_caching(CACHE_REGION_START(initrd_start),</div><div class='add'>+				       CACHE_REGION_START(initrd_end - 1));</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable caching for dma coherent memory taken from kernel memory.</div><div class='add'>+	 */</div><div class='add'>+	if (dma_size &amp;&amp; memblock_is_region_memory(dma_start, dma_size))</div><div class='add'>+		disable_caching(dma_start,</div><div class='add'>+				CACHE_REGION_START(dma_start + dma_size - 1));</div><div class='add'>+</div><div class='add'>+	/* Initialize the coherent memory allocator */</div><div class='add'>+	coherent_mem_init(dma_start, dma_size);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Free all memory as a starting point.</div><div class='add'>+	 */</div><div class='add'>+	free_bootmem(PAGE_OFFSET, memory_end - PAGE_OFFSET);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Then reserve memory which is already being used.</div><div class='add'>+	 */</div><div class='add'>+	for_each_memblock(reserved, reg) {</div><div class='add'>+		pr_debug("reserved - 0x%08x-0x%08x\n",</div><div class='add'>+			 (u32) reg-&gt;base, (u32) reg-&gt;size);</div><div class='add'>+		reserve_bootmem(reg-&gt;base, reg-&gt;size, BOOTMEM_DEFAULT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	max_low_pfn = PFN_DOWN(memory_end);</div><div class='add'>+	min_low_pfn = PFN_UP(memory_start);</div><div class='add'>+	max_mapnr = max_low_pfn - min_low_pfn;</div><div class='add'>+</div><div class='add'>+	/* Get kmalloc into gear */</div><div class='add'>+	paging_init();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Probe for Device State Configuration Registers.</div><div class='add'>+	 * We have to do this early in case timer needs to be enabled</div><div class='add'>+	 * through DSCR.</div><div class='add'>+	 */</div><div class='add'>+	dscr_probe();</div><div class='add'>+</div><div class='add'>+	/* We do this early for timer and core clock frequency */</div><div class='add'>+	c64x_setup_clocks();</div><div class='add'>+</div><div class='add'>+	/* Get CPU info */</div><div class='add'>+	get_cpuinfo();</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_VT) &amp;&amp; defined(CONFIG_DUMMY_CONSOLE)</div><div class='add'>+	conswitchp = &amp;dummy_con;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define cpu_to_ptr(n) ((void *)((long)(n)+1))</div><div class='add'>+#define ptr_to_cpu(p) ((long)(p) - 1)</div><div class='add'>+</div><div class='add'>+static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	int n = ptr_to_cpu(v);</div><div class='add'>+	struct cpuinfo_c6x *p = &amp;per_cpu(cpu_data, n);</div><div class='add'>+</div><div class='add'>+	if (n == 0) {</div><div class='add'>+		seq_printf(m,</div><div class='add'>+			   "soc\t\t: %s\n"</div><div class='add'>+			   "soc revision\t: 0x%x\n"</div><div class='add'>+			   "soc cores\t: %d\n",</div><div class='add'>+			   c6x_soc_name, c6x_silicon_rev, c6x_num_cores);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	seq_printf(m,</div><div class='add'>+		   "\n"</div><div class='add'>+		   "processor\t: %d\n"</div><div class='add'>+		   "cpu\t\t: %s\n"</div><div class='add'>+		   "core revision\t: %s\n"</div><div class='add'>+		   "core voltage\t: %s\n"</div><div class='add'>+		   "core id\t\t: %d\n"</div><div class='add'>+		   "mmu\t\t: %s\n"</div><div class='add'>+		   "fpu\t\t: %s\n"</div><div class='add'>+		   "cpu MHz\t\t: %u\n"</div><div class='add'>+		   "bogomips\t: %lu.%02lu\n\n",</div><div class='add'>+		   n,</div><div class='add'>+		   p-&gt;cpu_name, p-&gt;cpu_rev, p-&gt;cpu_voltage,</div><div class='add'>+		   p-&gt;core_id, p-&gt;mmu, p-&gt;fpu,</div><div class='add'>+		   (c6x_core_freq + 500000) / 1000000,</div><div class='add'>+		   (loops_per_jiffy/(500000/HZ)),</div><div class='add'>+		   (loops_per_jiffy/(5000/HZ))%100);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *c_start(struct seq_file *m, loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	return *pos &lt; nr_cpu_ids ? cpu_to_ptr(*pos) : NULL;</div><div class='add'>+}</div><div class='add'>+static void *c_next(struct seq_file *m, void *v, loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	++*pos;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+static void c_stop(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct seq_operations cpuinfo_op = {</div><div class='add'>+	c_start,</div><div class='add'>+	c_stop,</div><div class='add'>+	c_next,</div><div class='add'>+	show_cpuinfo</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cpu cpu_devices[NR_CPUS];</div><div class='add'>+</div><div class='add'>+static int __init topology_init(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_present_cpu(i)</div><div class='add'>+		register_cpu(&amp;cpu_devices[i], i);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(topology_init);</div><div class='head'>diff --git a/arch/c6x/kernel/signal.c b/arch/c6x/kernel/signal.c<br/>new file mode 100644<br/>index 000000000000..304f675826e9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/signal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/signal.c</a></div><div class='hunk'>@@ -0,0 +1,377 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2006, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</div><div class='add'>+ *</div><div class='add'>+ *  Updated for 2.6.34: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/syscalls.h&gt;</div><div class='add'>+#include &lt;linux/tracehook.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/ucontext.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Do a signal return, undo the signal stack.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define RETCODE_SIZE (9 &lt;&lt; 2)	/* 9 instructions = 36 bytes */</div><div class='add'>+</div><div class='add'>+struct rt_sigframe {</div><div class='add'>+	struct siginfo __user *pinfo;</div><div class='add'>+	void __user *puc;</div><div class='add'>+	struct siginfo info;</div><div class='add'>+	struct ucontext uc;</div><div class='add'>+	unsigned long retcode[RETCODE_SIZE &gt;&gt; 2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int restore_sigcontext(struct pt_regs *regs,</div><div class='add'>+			      struct sigcontext __user *sc)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* The access_ok check was done by caller, so use __get_user here */</div><div class='add'>+#define COPY(x)  (err |= __get_user(regs-&gt;x, &amp;sc-&gt;sc_##x))</div><div class='add'>+</div><div class='add'>+	COPY(sp); COPY(a4); COPY(b4); COPY(a6); COPY(b6); COPY(a8); COPY(b8);</div><div class='add'>+	COPY(a0); COPY(a1); COPY(a2); COPY(a3); COPY(a5); COPY(a7); COPY(a9);</div><div class='add'>+	COPY(b0); COPY(b1); COPY(b2); COPY(b3); COPY(b5); COPY(b7); COPY(b9);</div><div class='add'>+</div><div class='add'>+	COPY(a16); COPY(a17); COPY(a18); COPY(a19);</div><div class='add'>+	COPY(a20); COPY(a21); COPY(a22); COPY(a23);</div><div class='add'>+	COPY(a24); COPY(a25); COPY(a26); COPY(a27);</div><div class='add'>+	COPY(a28); COPY(a29); COPY(a30); COPY(a31);</div><div class='add'>+	COPY(b16); COPY(b17); COPY(b18); COPY(b19);</div><div class='add'>+	COPY(b20); COPY(b21); COPY(b22); COPY(b23);</div><div class='add'>+	COPY(b24); COPY(b25); COPY(b26); COPY(b27);</div><div class='add'>+	COPY(b28); COPY(b29); COPY(b30); COPY(b31);</div><div class='add'>+</div><div class='add'>+	COPY(csr); COPY(pc);</div><div class='add'>+</div><div class='add'>+#undef COPY</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+asmlinkage int do_rt_sigreturn(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct rt_sigframe __user *frame;</div><div class='add'>+	sigset_t set;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Since we stacked the signal on a dword boundary,</div><div class='add'>+	 * 'sp' should be dword aligned here.  If it's</div><div class='add'>+	 * not, then the user is trying to mess with us.</div><div class='add'>+	 */</div><div class='add'>+	if (regs-&gt;sp &amp; 7)</div><div class='add'>+		goto badframe;</div><div class='add'>+</div><div class='add'>+	frame = (struct rt_sigframe __user *) ((unsigned long) regs-&gt;sp + 8);</div><div class='add'>+</div><div class='add'>+	if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))</div><div class='add'>+		goto badframe;</div><div class='add'>+	if (__copy_from_user(&amp;set, &amp;frame-&gt;uc.uc_sigmask, sizeof(set)))</div><div class='add'>+		goto badframe;</div><div class='add'>+</div><div class='add'>+	sigdelsetmask(&amp;set, ~_BLOCKABLE);</div><div class='add'>+	spin_lock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='add'>+	current-&gt;blocked = set;</div><div class='add'>+	recalc_sigpending();</div><div class='add'>+	spin_unlock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='add'>+</div><div class='add'>+	if (restore_sigcontext(regs, &amp;frame-&gt;uc.uc_mcontext))</div><div class='add'>+		goto badframe;</div><div class='add'>+</div><div class='add'>+	return regs-&gt;a4;</div><div class='add'>+</div><div class='add'>+badframe:</div><div class='add'>+	force_sig(SIGSEGV, current);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,</div><div class='add'>+			    unsigned long mask)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	err |= __put_user(mask, &amp;sc-&gt;sc_mask);</div><div class='add'>+</div><div class='add'>+	/* The access_ok check was done by caller, so use __put_user here */</div><div class='add'>+#define COPY(x) (err |= __put_user(regs-&gt;x, &amp;sc-&gt;sc_##x))</div><div class='add'>+</div><div class='add'>+	COPY(sp); COPY(a4); COPY(b4); COPY(a6); COPY(b6); COPY(a8); COPY(b8);</div><div class='add'>+	COPY(a0); COPY(a1); COPY(a2); COPY(a3); COPY(a5); COPY(a7); COPY(a9);</div><div class='add'>+	COPY(b0); COPY(b1); COPY(b2); COPY(b3); COPY(b5); COPY(b7); COPY(b9);</div><div class='add'>+</div><div class='add'>+	COPY(a16); COPY(a17); COPY(a18); COPY(a19);</div><div class='add'>+	COPY(a20); COPY(a21); COPY(a22); COPY(a23);</div><div class='add'>+	COPY(a24); COPY(a25); COPY(a26); COPY(a27);</div><div class='add'>+	COPY(a28); COPY(a29); COPY(a30); COPY(a31);</div><div class='add'>+	COPY(b16); COPY(b17); COPY(b18); COPY(b19);</div><div class='add'>+	COPY(b20); COPY(b21); COPY(b22); COPY(b23);</div><div class='add'>+	COPY(b24); COPY(b25); COPY(b26); COPY(b27);</div><div class='add'>+	COPY(b28); COPY(b29); COPY(b30); COPY(b31);</div><div class='add'>+</div><div class='add'>+	COPY(csr); COPY(pc);</div><div class='add'>+</div><div class='add'>+#undef COPY</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __user *get_sigframe(struct k_sigaction *ka,</div><div class='add'>+					struct pt_regs *regs,</div><div class='add'>+					unsigned long framesize)</div><div class='add'>+{</div><div class='add'>+	unsigned long sp = regs-&gt;sp;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is the X/Open sanctioned signal stack switching.</div><div class='add'>+	 */</div><div class='add'>+	if ((ka-&gt;sa.sa_flags &amp; SA_ONSTACK) &amp;&amp; sas_ss_flags(sp) == 0)</div><div class='add'>+		sp = current-&gt;sas_ss_sp + current-&gt;sas_ss_size;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * No matter what happens, 'sp' must be dword</div><div class='add'>+	 * aligned. Otherwise, nasty things will happen</div><div class='add'>+	 */</div><div class='add'>+	return (void __user *)((sp - framesize) &amp; ~7);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,</div><div class='add'>+			   sigset_t *set, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct rt_sigframe __user *frame;</div><div class='add'>+	unsigned long __user *retcode;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	frame = get_sigframe(ka, regs, sizeof(*frame));</div><div class='add'>+</div><div class='add'>+	if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))</div><div class='add'>+		goto segv_and_exit;</div><div class='add'>+</div><div class='add'>+	err |= __put_user(&amp;frame-&gt;info, &amp;frame-&gt;pinfo);</div><div class='add'>+	err |= __put_user(&amp;frame-&gt;uc, &amp;frame-&gt;puc);</div><div class='add'>+	err |= copy_siginfo_to_user(&amp;frame-&gt;info, info);</div><div class='add'>+</div><div class='add'>+	/* Clear all the bits of the ucontext we don't use.  */</div><div class='add'>+	err |= __clear_user(&amp;frame-&gt;uc, offsetof(struct ucontext, uc_mcontext));</div><div class='add'>+</div><div class='add'>+	err |= setup_sigcontext(&amp;frame-&gt;uc.uc_mcontext,	regs, set-&gt;sig[0]);</div><div class='add'>+	err |= __copy_to_user(&amp;frame-&gt;uc.uc_sigmask, set, sizeof(*set));</div><div class='add'>+</div><div class='add'>+	/* Set up to return from userspace */</div><div class='add'>+	retcode = (unsigned long __user *) &amp;frame-&gt;retcode;</div><div class='add'>+</div><div class='add'>+	/* The access_ok check was done above, so use __put_user here */</div><div class='add'>+#define COPY(x) (err |= __put_user(x, retcode++))</div><div class='add'>+</div><div class='add'>+	COPY(0x0000002AUL | (__NR_rt_sigreturn &lt;&lt; 7));</div><div class='add'>+				/* MVK __NR_rt_sigreturn,B0 */</div><div class='add'>+	COPY(0x10000000UL);	/* SWE */</div><div class='add'>+	COPY(0x00006000UL);	/* NOP 4 */</div><div class='add'>+	COPY(0x00006000UL);	/* NOP 4 */</div><div class='add'>+	COPY(0x00006000UL);	/* NOP 4 */</div><div class='add'>+	COPY(0x00006000UL);	/* NOP 4 */</div><div class='add'>+	COPY(0x00006000UL);	/* NOP 4 */</div><div class='add'>+	COPY(0x00006000UL);	/* NOP 4 */</div><div class='add'>+	COPY(0x00006000UL);	/* NOP 4 */</div><div class='add'>+</div><div class='add'>+#undef COPY</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		goto segv_and_exit;</div><div class='add'>+</div><div class='add'>+	flush_icache_range((unsigned long) &amp;frame-&gt;retcode,</div><div class='add'>+			   (unsigned long) &amp;frame-&gt;retcode + RETCODE_SIZE);</div><div class='add'>+</div><div class='add'>+	retcode = (unsigned long __user *) &amp;frame-&gt;retcode;</div><div class='add'>+</div><div class='add'>+	/* Change user context to branch to signal handler */</div><div class='add'>+	regs-&gt;sp = (unsigned long) frame - 8;</div><div class='add'>+	regs-&gt;b3 = (unsigned long) retcode;</div><div class='add'>+	regs-&gt;pc = (unsigned long) ka-&gt;sa.sa_handler;</div><div class='add'>+</div><div class='add'>+	/* Give the signal number to the handler */</div><div class='add'>+	regs-&gt;a4 = signr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For realtime signals we must also set the second and third</div><div class='add'>+	 * arguments for the signal handler.</div><div class='add'>+	 *   -- Peter Maydell &lt;pmaydell@chiark.greenend.org.uk&gt; 2000-12-06</div><div class='add'>+	 */</div><div class='add'>+	regs-&gt;b4 = (unsigned long)&amp;frame-&gt;info;</div><div class='add'>+	regs-&gt;a6 = (unsigned long)&amp;frame-&gt;uc;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+segv_and_exit:</div><div class='add'>+	force_sigsegv(signr, current);</div><div class='add'>+	return -EFAULT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+handle_restart(struct pt_regs *regs, struct k_sigaction *ka, int has_handler)</div><div class='add'>+{</div><div class='add'>+	switch (regs-&gt;a4) {</div><div class='add'>+	case -ERESTARTNOHAND:</div><div class='add'>+		if (!has_handler)</div><div class='add'>+			goto do_restart;</div><div class='add'>+		regs-&gt;a4 = -EINTR;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case -ERESTARTSYS:</div><div class='add'>+		if (has_handler &amp;&amp; !(ka-&gt;sa.sa_flags &amp; SA_RESTART)) {</div><div class='add'>+			regs-&gt;a4 = -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'>+do_restart:</div><div class='add'>+		regs-&gt;a4 = regs-&gt;orig_a4;</div><div class='add'>+		regs-&gt;pc -= 4;</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'>+ * handle the actual delivery of a signal to userspace</div><div class='add'>+ */</div><div class='add'>+static int handle_signal(int sig,</div><div class='add'>+			 siginfo_t *info, struct k_sigaction *ka,</div><div class='add'>+			 sigset_t *oldset, struct pt_regs *regs,</div><div class='add'>+			 int syscall)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Are we from a system call? */</div><div class='add'>+	if (syscall) {</div><div class='add'>+		/* If so, check system call restarting.. */</div><div class='add'>+		switch (regs-&gt;a4) {</div><div class='add'>+		case -ERESTART_RESTARTBLOCK:</div><div class='add'>+		case -ERESTARTNOHAND:</div><div class='add'>+			regs-&gt;a4 = -EINTR;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case -ERESTARTSYS:</div><div class='add'>+			if (!(ka-&gt;sa.sa_flags &amp; SA_RESTART)) {</div><div class='add'>+				regs-&gt;a4 = -EINTR;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* fallthrough */</div><div class='add'>+		case -ERESTARTNOINTR:</div><div class='add'>+			regs-&gt;a4 = regs-&gt;orig_a4;</div><div class='add'>+			regs-&gt;pc -= 4;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set up the stack frame */</div><div class='add'>+	ret = setup_rt_frame(sig, ka, info, oldset, regs);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		spin_lock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='add'>+		sigorsets(&amp;current-&gt;blocked, &amp;current-&gt;blocked,</div><div class='add'>+			  &amp;ka-&gt;sa.sa_mask);</div><div class='add'>+		if (!(ka-&gt;sa.sa_flags &amp; SA_NODEFER))</div><div class='add'>+			sigaddset(&amp;current-&gt;blocked, sig);</div><div class='add'>+		recalc_sigpending();</div><div class='add'>+		spin_unlock_irq(&amp;current-&gt;sighand-&gt;siglock);</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'>+ * handle a potential signal</div><div class='add'>+ */</div><div class='add'>+static void do_signal(struct pt_regs *regs, int syscall)</div><div class='add'>+{</div><div class='add'>+	struct k_sigaction ka;</div><div class='add'>+	siginfo_t info;</div><div class='add'>+	sigset_t *oldset;</div><div class='add'>+	int signr;</div><div class='add'>+</div><div class='add'>+	/* we want the common case to go fast, which is why we may in certain</div><div class='add'>+	 * cases get here from kernel mode */</div><div class='add'>+	if (!user_mode(regs))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (test_thread_flag(TIF_RESTORE_SIGMASK))</div><div class='add'>+		oldset = &amp;current-&gt;saved_sigmask;</div><div class='add'>+	else</div><div class='add'>+		oldset = &amp;current-&gt;blocked;</div><div class='add'>+</div><div class='add'>+	signr = get_signal_to_deliver(&amp;info, &amp;ka, regs, NULL);</div><div class='add'>+	if (signr &gt; 0) {</div><div class='add'>+		if (handle_signal(signr, &amp;info, &amp;ka, oldset,</div><div class='add'>+				  regs, syscall) == 0) {</div><div class='add'>+			/* a signal was successfully delivered; the saved</div><div class='add'>+			 * sigmask will have been stored in the signal frame,</div><div class='add'>+			 * and will be restored by sigreturn, so we can simply</div><div class='add'>+			 * clear the TIF_RESTORE_SIGMASK flag */</div><div class='add'>+			if (test_thread_flag(TIF_RESTORE_SIGMASK))</div><div class='add'>+				clear_thread_flag(TIF_RESTORE_SIGMASK);</div><div class='add'>+</div><div class='add'>+			tracehook_signal_handler(signr, &amp;info, &amp;ka, regs, 0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* did we come from a system call? */</div><div class='add'>+	if (syscall) {</div><div class='add'>+		/* restart the system call - no handlers present */</div><div class='add'>+		switch (regs-&gt;a4) {</div><div class='add'>+		case -ERESTARTNOHAND:</div><div class='add'>+		case -ERESTARTSYS:</div><div class='add'>+		case -ERESTARTNOINTR:</div><div class='add'>+			regs-&gt;a4 = regs-&gt;orig_a4;</div><div class='add'>+			regs-&gt;pc -= 4;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case -ERESTART_RESTARTBLOCK:</div><div class='add'>+			regs-&gt;a4 = regs-&gt;orig_a4;</div><div class='add'>+			regs-&gt;b0 = __NR_restart_syscall;</div><div class='add'>+			regs-&gt;pc -= 4;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if there's no signal to deliver, we just put the saved sigmask</div><div class='add'>+	 * back */</div><div class='add'>+	if (test_thread_flag(TIF_RESTORE_SIGMASK)) {</div><div class='add'>+		clear_thread_flag(TIF_RESTORE_SIGMASK);</div><div class='add'>+		sigprocmask(SIG_SETMASK, &amp;current-&gt;saved_sigmask, NULL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * notification of userspace execution resumption</div><div class='add'>+ * - triggered by current-&gt;work.notify_resume</div><div class='add'>+ */</div><div class='add'>+asmlinkage void do_notify_resume(struct pt_regs *regs, u32 thread_info_flags,</div><div class='add'>+				 int syscall)</div><div class='add'>+{</div><div class='add'>+	/* deal with pending signal delivery */</div><div class='add'>+	if (thread_info_flags &amp; ((1 &lt;&lt; TIF_SIGPENDING) |</div><div class='add'>+				 (1 &lt;&lt; TIF_RESTORE_SIGMASK)))</div><div class='add'>+		do_signal(regs, syscall);</div><div class='add'>+</div><div class='add'>+	if (thread_info_flags &amp; (1 &lt;&lt; TIF_NOTIFY_RESUME)) {</div><div class='add'>+		clear_thread_flag(TIF_NOTIFY_RESUME);</div><div class='add'>+		tracehook_notify_resume(regs);</div><div class='add'>+		if (current-&gt;replacement_session_keyring)</div><div class='add'>+			key_replace_session_keyring();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/arch/c6x/kernel/soc.c b/arch/c6x/kernel/soc.c<br/>new file mode 100644<br/>index 000000000000..dd45bc39af0e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/soc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/soc.c</a></div><div class='hunk'>@@ -0,0 +1,91 @@</div><div class='add'>+/*</div><div class='add'>+ *  Miscellaneous SoC-specific hooks.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/soc.h&gt;</div><div class='add'>+</div><div class='add'>+struct soc_ops soc_ops;</div><div class='add'>+</div><div class='add'>+int soc_get_exception(void)</div><div class='add'>+{</div><div class='add'>+	if (!soc_ops.get_exception)</div><div class='add'>+		return -1;</div><div class='add'>+	return soc_ops.get_exception();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void soc_assert_event(unsigned int evt)</div><div class='add'>+{</div><div class='add'>+	if (soc_ops.assert_event)</div><div class='add'>+		soc_ops.assert_event(evt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 cmdline_mac[6];</div><div class='add'>+</div><div class='add'>+static int __init get_mac_addr_from_cmdline(char *str)</div><div class='add'>+{</div><div class='add'>+	int count, i, val;</div><div class='add'>+</div><div class='add'>+	for (count = 0; count &lt; 6 &amp;&amp; *str; count++, str += 3) {</div><div class='add'>+		if (!isxdigit(str[0]) || !isxdigit(str[1]))</div><div class='add'>+			return 0;</div><div class='add'>+		if (str[2] != ((count &lt; 5) ? ':' : '\0'))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		for (i = 0, val = 0; i &lt; 2; i++) {</div><div class='add'>+			val = val &lt;&lt; 4;</div><div class='add'>+			val |= isdigit(str[i]) ?</div><div class='add'>+				str[i] - '0' : toupper(str[i]) - 'A' + 10;</div><div class='add'>+		}</div><div class='add'>+		cmdline_mac[count] = val;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+__setup("emac_addr=", get_mac_addr_from_cmdline);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setup the MAC address for SoC ethernet devices.</div><div class='add'>+ *</div><div class='add'>+ * Before calling this function, the ethernet driver will have</div><div class='add'>+ * initialized the addr with local-mac-address from the device</div><div class='add'>+ * tree (if found). Allow command line to override, but not</div><div class='add'>+ * the fused address.</div><div class='add'>+ */</div><div class='add'>+int soc_mac_addr(unsigned int index, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	int i, have_dt_mac = 0, have_cmdline_mac = 0, have_fuse_mac = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 6; i++) {</div><div class='add'>+		if (cmdline_mac[i])</div><div class='add'>+			have_cmdline_mac = 1;</div><div class='add'>+		if (c6x_fuse_mac[i])</div><div class='add'>+			have_fuse_mac = 1;</div><div class='add'>+		if (addr[i])</div><div class='add'>+			have_dt_mac = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* cmdline overrides all */</div><div class='add'>+	if (have_cmdline_mac)</div><div class='add'>+		memcpy(addr, cmdline_mac, 6);</div><div class='add'>+	else if (!have_dt_mac) {</div><div class='add'>+		if (have_fuse_mac)</div><div class='add'>+			memcpy(addr, c6x_fuse_mac, 6);</div><div class='add'>+		else</div><div class='add'>+			random_ether_addr(addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* adjust for specific EMAC device */</div><div class='add'>+	addr[5] += index * c6x_num_cores;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(soc_mac_addr);</div><div class='head'>diff --git a/arch/c6x/kernel/switch_to.S b/arch/c6x/kernel/switch_to.S<br/>new file mode 100644<br/>index 000000000000..09177ed0fa5c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/switch_to.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/switch_to.S</a></div><div class='hunk'>@@ -0,0 +1,74 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Mark Salter (msalter@redhat.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</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/asm-offsets.h&gt;</div><div class='add'>+</div><div class='add'>+#define SP	B15</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * void __switch_to(struct thread_info *prev,</div><div class='add'>+	 *      	    struct thread_info *next,</div><div class='add'>+	 *		    struct task_struct *tsk) ;</div><div class='add'>+	 */</div><div class='add'>+ENTRY(__switch_to)</div><div class='add'>+	LDDW	.D2T2	*+B4(THREAD_B15_14),B7:B6</div><div class='add'>+ ||	MV	.L2X	A4,B5	; prev</div><div class='add'>+ ||	MV	.L1X	B4,A5	; next</div><div class='add'>+ ||	MVC	.S2	RILC,B1</div><div class='add'>+</div><div class='add'>+	STW	.D2T2	B3,*+B5(THREAD_PC)</div><div class='add'>+ ||	STDW	.D1T1	A13:A12,*+A4(THREAD_A13_12)</div><div class='add'>+ ||	MVC	.S2	ILC,B0</div><div class='add'>+</div><div class='add'>+	LDW	.D2T2	*+B4(THREAD_PC),B3</div><div class='add'>+ ||	LDDW	.D1T1	*+A5(THREAD_A13_12),A13:A12</div><div class='add'>+</div><div class='add'>+	STDW	.D1T1	A11:A10,*+A4(THREAD_A11_10)</div><div class='add'>+ ||	STDW	.D2T2	B1:B0,*+B5(THREAD_RICL_ICL)</div><div class='add'>+#ifndef __DSBT__</div><div class='add'>+ ||	MVKL	.S2	current_ksp,B1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	STDW	.D2T2	B15:B14,*+B5(THREAD_B15_14)</div><div class='add'>+ ||	STDW	.D1T1	A15:A14,*+A4(THREAD_A15_14)</div><div class='add'>+#ifndef __DSBT__</div><div class='add'>+ ||	MVKH	.S2	current_ksp,B1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	;; Switch to next SP</div><div class='add'>+	MV	.S2	B7,SP</div><div class='add'>+#ifdef __DSBT__</div><div class='add'>+ ||	STW	.D2T2	B7,*+B14(current_ksp)</div><div class='add'>+#else</div><div class='add'>+ ||	STW	.D2T2	B7,*B1</div><div class='add'>+ ||	MV	.L2	B6,B14</div><div class='add'>+#endif</div><div class='add'>+ ||	LDDW	.D1T1	*+A5(THREAD_RICL_ICL),A1:A0</div><div class='add'>+</div><div class='add'>+	STDW	.D2T2	B11:B10,*+B5(THREAD_B11_10)</div><div class='add'>+ ||	LDDW	.D1T1	*+A5(THREAD_A15_14),A15:A14</div><div class='add'>+</div><div class='add'>+	STDW	.D2T2	B13:B12,*+B5(THREAD_B13_12)</div><div class='add'>+ ||	LDDW	.D1T1	*+A5(THREAD_A11_10),A11:A10</div><div class='add'>+</div><div class='add'>+	B	.S2	B3		; return in next E1</div><div class='add'>+ ||	LDDW	.D2T2	*+B4(THREAD_B13_12),B13:B12</div><div class='add'>+</div><div class='add'>+	LDDW	.D2T2	*+B4(THREAD_B11_10),B11:B10</div><div class='add'>+	NOP</div><div class='add'>+</div><div class='add'>+	MV	.L2X	A0,B0</div><div class='add'>+ ||	MV	.S1	A6,A4</div><div class='add'>+</div><div class='add'>+	MVC	.S2	B0,ILC</div><div class='add'>+ ||	MV	.L2X	A1,B1</div><div class='add'>+</div><div class='add'>+	MVC	.S2	B1,RILC</div><div class='add'>+ENDPROC(__switch_to)</div><div class='head'>diff --git a/arch/c6x/kernel/sys_c6x.c b/arch/c6x/kernel/sys_c6x.c<br/>new file mode 100644<br/>index 000000000000..3e9bdfbee8ad<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/sys_c6x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/sys_c6x.c</a></div><div class='hunk'>@@ -0,0 +1,74 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/syscalls.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/syscalls.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ACCESS_CHECK</div><div class='add'>+int _access_ok(unsigned long addr, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	if (!size)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (!addr || addr &gt; (0xffffffffUL - (size - 1)))</div><div class='add'>+		goto _bad_access;</div><div class='add'>+</div><div class='add'>+	if (segment_eq(get_fs(), KERNEL_DS))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (memory_start &lt;= addr &amp;&amp; (addr + size - 1) &lt; memory_end)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+_bad_access:</div><div class='add'>+	pr_debug("Bad access attempt: pid[%d] addr[%08lx] size[0x%lx]\n",</div><div class='add'>+		 current-&gt;pid, addr, size);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(_access_ok);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* sys_cache_sync -- sync caches over given range */</div><div class='add'>+asmlinkage int sys_cache_sync(unsigned long s, unsigned long e)</div><div class='add'>+{</div><div class='add'>+	L1D_cache_block_writeback_invalidate(s, e);</div><div class='add'>+	L1P_cache_block_invalidate(s, e);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Provide the actual syscall number to call mapping. */</div><div class='add'>+#undef __SYSCALL</div><div class='add'>+#define __SYSCALL(nr, call) [nr] = (call),</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Use trampolines</div><div class='add'>+ */</div><div class='add'>+#define sys_pread64		sys_pread_c6x</div><div class='add'>+#define sys_pwrite64		sys_pwrite_c6x</div><div class='add'>+#define sys_truncate64		sys_truncate64_c6x</div><div class='add'>+#define sys_ftruncate64		sys_ftruncate64_c6x</div><div class='add'>+#define sys_fadvise64		sys_fadvise64_c6x</div><div class='add'>+#define sys_fadvise64_64	sys_fadvise64_64_c6x</div><div class='add'>+#define sys_fallocate		sys_fallocate_c6x</div><div class='add'>+</div><div class='add'>+/* Use sys_mmap_pgoff directly */</div><div class='add'>+#define sys_mmap2 sys_mmap_pgoff</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Note that we can't include &lt;linux/unistd.h&gt; here since the header</div><div class='add'>+ * guard will defeat us; &lt;asm/unistd.h&gt; checks for __SYSCALL as well.</div><div class='add'>+ */</div><div class='add'>+void *sys_call_table[__NR_syscalls] = {</div><div class='add'>+	[0 ... __NR_syscalls-1] = sys_ni_syscall,</div><div class='add'>+#include &lt;asm/unistd.h&gt;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/c6x/kernel/time.c b/arch/c6x/kernel/time.c<br/>new file mode 100644<br/>index 000000000000..4c9f136165f7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/time.c</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/param.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/timex.h&gt;</div><div class='add'>+#include &lt;linux/profile.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/timer64.h&gt;</div><div class='add'>+</div><div class='add'>+static u32 sched_clock_multiplier;</div><div class='add'>+#define SCHED_CLOCK_SHIFT 16</div><div class='add'>+</div><div class='add'>+static cycle_t tsc_read(struct clocksource *cs)</div><div class='add'>+{</div><div class='add'>+	return get_cycles();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clocksource clocksource_tsc = {</div><div class='add'>+	.name		= "timestamp",</div><div class='add'>+	.rating		= 300,</div><div class='add'>+	.read		= tsc_read,</div><div class='add'>+	.mask		= CLOCKSOURCE_MASK(64),</div><div class='add'>+	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * scheduler clock - returns current time in nanoseconds.</div><div class='add'>+ */</div><div class='add'>+u64 sched_clock(void)</div><div class='add'>+{</div><div class='add'>+	u64 tsc = get_cycles();</div><div class='add'>+</div><div class='add'>+	return (tsc * sched_clock_multiplier) &gt;&gt; SCHED_CLOCK_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void time_init(void)</div><div class='add'>+{</div><div class='add'>+	u64 tmp = (u64)NSEC_PER_SEC &lt;&lt; SCHED_CLOCK_SHIFT;</div><div class='add'>+</div><div class='add'>+	do_div(tmp, c6x_core_freq);</div><div class='add'>+	sched_clock_multiplier = tmp;</div><div class='add'>+</div><div class='add'>+	clocksource_register_hz(&amp;clocksource_tsc, c6x_core_freq);</div><div class='add'>+</div><div class='add'>+	/* write anything into TSCL to enable counting */</div><div class='add'>+	set_creg(TSCL, 0);</div><div class='add'>+</div><div class='add'>+	/* probe for timer64 event timer */</div><div class='add'>+	timer64_init();</div><div class='add'>+}</div><div class='head'>diff --git a/arch/c6x/kernel/traps.c b/arch/c6x/kernel/traps.c<br/>new file mode 100644<br/>index 000000000000..f50e3edd6dad<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/traps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/traps.c</a></div><div class='hunk'>@@ -0,0 +1,423 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2006, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/kallsyms.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/soc.h&gt;</div><div class='add'>+#include &lt;asm/traps.h&gt;</div><div class='add'>+</div><div class='add'>+int (*c6x_nmi_handler)(struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+void __init trap_init(void)</div><div class='add'>+{</div><div class='add'>+	ack_exception(EXCEPT_TYPE_NXF);</div><div class='add'>+	ack_exception(EXCEPT_TYPE_EXC);</div><div class='add'>+	ack_exception(EXCEPT_TYPE_IXF);</div><div class='add'>+	ack_exception(EXCEPT_TYPE_SXF);</div><div class='add'>+	enable_exception();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void show_regs(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	pr_err("\n");</div><div class='add'>+	pr_err("PC: %08lx SP: %08lx\n", regs-&gt;pc, regs-&gt;sp);</div><div class='add'>+	pr_err("Status: %08lx ORIG_A4: %08lx\n", regs-&gt;csr, regs-&gt;orig_a4);</div><div class='add'>+	pr_err("A0: %08lx  B0: %08lx\n", regs-&gt;a0, regs-&gt;b0);</div><div class='add'>+	pr_err("A1: %08lx  B1: %08lx\n", regs-&gt;a1, regs-&gt;b1);</div><div class='add'>+	pr_err("A2: %08lx  B2: %08lx\n", regs-&gt;a2, regs-&gt;b2);</div><div class='add'>+	pr_err("A3: %08lx  B3: %08lx\n", regs-&gt;a3, regs-&gt;b3);</div><div class='add'>+	pr_err("A4: %08lx  B4: %08lx\n", regs-&gt;a4, regs-&gt;b4);</div><div class='add'>+	pr_err("A5: %08lx  B5: %08lx\n", regs-&gt;a5, regs-&gt;b5);</div><div class='add'>+	pr_err("A6: %08lx  B6: %08lx\n", regs-&gt;a6, regs-&gt;b6);</div><div class='add'>+	pr_err("A7: %08lx  B7: %08lx\n", regs-&gt;a7, regs-&gt;b7);</div><div class='add'>+	pr_err("A8: %08lx  B8: %08lx\n", regs-&gt;a8, regs-&gt;b8);</div><div class='add'>+	pr_err("A9: %08lx  B9: %08lx\n", regs-&gt;a9, regs-&gt;b9);</div><div class='add'>+	pr_err("A10: %08lx  B10: %08lx\n", regs-&gt;a10, regs-&gt;b10);</div><div class='add'>+	pr_err("A11: %08lx  B11: %08lx\n", regs-&gt;a11, regs-&gt;b11);</div><div class='add'>+	pr_err("A12: %08lx  B12: %08lx\n", regs-&gt;a12, regs-&gt;b12);</div><div class='add'>+	pr_err("A13: %08lx  B13: %08lx\n", regs-&gt;a13, regs-&gt;b13);</div><div class='add'>+	pr_err("A14: %08lx  B14: %08lx\n", regs-&gt;a14, regs-&gt;dp);</div><div class='add'>+	pr_err("A15: %08lx  B15: %08lx\n", regs-&gt;a15, regs-&gt;sp);</div><div class='add'>+	pr_err("A16: %08lx  B16: %08lx\n", regs-&gt;a16, regs-&gt;b16);</div><div class='add'>+	pr_err("A17: %08lx  B17: %08lx\n", regs-&gt;a17, regs-&gt;b17);</div><div class='add'>+	pr_err("A18: %08lx  B18: %08lx\n", regs-&gt;a18, regs-&gt;b18);</div><div class='add'>+	pr_err("A19: %08lx  B19: %08lx\n", regs-&gt;a19, regs-&gt;b19);</div><div class='add'>+	pr_err("A20: %08lx  B20: %08lx\n", regs-&gt;a20, regs-&gt;b20);</div><div class='add'>+	pr_err("A21: %08lx  B21: %08lx\n", regs-&gt;a21, regs-&gt;b21);</div><div class='add'>+	pr_err("A22: %08lx  B22: %08lx\n", regs-&gt;a22, regs-&gt;b22);</div><div class='add'>+	pr_err("A23: %08lx  B23: %08lx\n", regs-&gt;a23, regs-&gt;b23);</div><div class='add'>+	pr_err("A24: %08lx  B24: %08lx\n", regs-&gt;a24, regs-&gt;b24);</div><div class='add'>+	pr_err("A25: %08lx  B25: %08lx\n", regs-&gt;a25, regs-&gt;b25);</div><div class='add'>+	pr_err("A26: %08lx  B26: %08lx\n", regs-&gt;a26, regs-&gt;b26);</div><div class='add'>+	pr_err("A27: %08lx  B27: %08lx\n", regs-&gt;a27, regs-&gt;b27);</div><div class='add'>+	pr_err("A28: %08lx  B28: %08lx\n", regs-&gt;a28, regs-&gt;b28);</div><div class='add'>+	pr_err("A29: %08lx  B29: %08lx\n", regs-&gt;a29, regs-&gt;b29);</div><div class='add'>+	pr_err("A30: %08lx  B30: %08lx\n", regs-&gt;a30, regs-&gt;b30);</div><div class='add'>+	pr_err("A31: %08lx  B31: %08lx\n", regs-&gt;a31, regs-&gt;b31);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dump_stack(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long stack;</div><div class='add'>+</div><div class='add'>+	show_stack(current, &amp;stack);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dump_stack);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void die(char *str, struct pt_regs *fp, int nr)</div><div class='add'>+{</div><div class='add'>+	console_verbose();</div><div class='add'>+	pr_err("%s: %08x\n", str, nr);</div><div class='add'>+	show_regs(fp);</div><div class='add'>+</div><div class='add'>+	pr_err("Process %s (pid: %d, stackpage=%08lx)\n",</div><div class='add'>+	       current-&gt;comm, current-&gt;pid, (PAGE_SIZE +</div><div class='add'>+					     (unsigned long) current));</div><div class='add'>+</div><div class='add'>+	dump_stack();</div><div class='add'>+	while (1)</div><div class='add'>+		;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void die_if_kernel(char *str, struct pt_regs *fp, int nr)</div><div class='add'>+{</div><div class='add'>+	if (user_mode(fp))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	die(str, fp, nr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Internal exceptions */</div><div class='add'>+static struct exception_info iexcept_table[10] = {</div><div class='add'>+	{ "Oops - instruction fetch", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - fetch packet", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - execute packet", SIGILL, ILL_ILLOPC },</div><div class='add'>+	{ "Oops - undefined instruction", SIGILL, ILL_ILLOPC },</div><div class='add'>+	{ "Oops - resource conflict", SIGILL, ILL_ILLOPC },</div><div class='add'>+	{ "Oops - resource access", SIGILL, ILL_PRVREG },</div><div class='add'>+	{ "Oops - privilege", SIGILL, ILL_PRVOPC },</div><div class='add'>+	{ "Oops - loops buffer", SIGILL, ILL_ILLOPC },</div><div class='add'>+	{ "Oops - software exception", SIGILL, ILL_ILLTRP },</div><div class='add'>+	{ "Oops - unknown exception", SIGILL, ILL_ILLOPC }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* External exceptions */</div><div class='add'>+static struct exception_info eexcept_table[128] = {</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - external exception", SIGBUS, BUS_ADRERR },</div><div class='add'>+	{ "Oops - CPU memory protection fault", SIGSEGV, SEGV_ACCERR },</div><div class='add'>+	{ "Oops - CPU memory protection fault in L1P", SIGSEGV, SEGV_ACCERR },</div><div class='add'>+	{ "Oops - DMA memory protection fault in L1P", SIGSEGV, SEGV_ACCERR },</div><div class='add'>+	{ "Oops - CPU memory protection fault in L1D", SIGSEGV, SEGV_ACCERR },</div><div class='add'>+	{ "Oops - DMA memory protection fault in L1D", SIGSEGV, SEGV_ACCERR },</div><div class='add'>+	{ "Oops - CPU memory protection fault in L2", SIGSEGV, SEGV_ACCERR },</div><div class='add'>+	{ "Oops - DMA memory protection fault in L2", SIGSEGV, SEGV_ACCERR },</div><div class='add'>+	{ "Oops - EMC CPU memory protection fault", SIGSEGV, SEGV_ACCERR },</div><div class='add'>+	{ "Oops - EMC bus error", SIGBUS, BUS_ADRERR }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void do_trap(struct exception_info *except_info, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned long addr = instruction_pointer(regs);</div><div class='add'>+	siginfo_t info;</div><div class='add'>+</div><div class='add'>+	if (except_info-&gt;code != TRAP_BRKPT)</div><div class='add'>+		pr_err("TRAP: %s PC[0x%lx] signo[%d] code[%d]\n",</div><div class='add'>+		       except_info-&gt;kernel_str, regs-&gt;pc,</div><div class='add'>+		       except_info-&gt;signo, except_info-&gt;code);</div><div class='add'>+</div><div class='add'>+	die_if_kernel(except_info-&gt;kernel_str, regs, addr);</div><div class='add'>+</div><div class='add'>+	info.si_signo = except_info-&gt;signo;</div><div class='add'>+	info.si_errno = 0;</div><div class='add'>+	info.si_code  = except_info-&gt;code;</div><div class='add'>+	info.si_addr  = (void __user *)addr;</div><div class='add'>+</div><div class='add'>+	force_sig_info(except_info-&gt;signo, &amp;info, current);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Process an internal exception (non maskable)</div><div class='add'>+ */</div><div class='add'>+static int process_iexcept(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned int iexcept_report = get_iexcept();</div><div class='add'>+	unsigned int iexcept_num;</div><div class='add'>+</div><div class='add'>+	ack_exception(EXCEPT_TYPE_IXF);</div><div class='add'>+</div><div class='add'>+	pr_err("IEXCEPT: PC[0x%lx]\n", regs-&gt;pc);</div><div class='add'>+</div><div class='add'>+	while (iexcept_report) {</div><div class='add'>+		iexcept_num = __ffs(iexcept_report);</div><div class='add'>+		iexcept_report &amp;= ~(1 &lt;&lt; iexcept_num);</div><div class='add'>+		set_iexcept(iexcept_report);</div><div class='add'>+		if (*(unsigned int *)regs-&gt;pc == BKPT_OPCODE) {</div><div class='add'>+			/* This is a breakpoint */</div><div class='add'>+			struct exception_info bkpt_exception = {</div><div class='add'>+				"Oops - undefined instruction",</div><div class='add'>+				  SIGTRAP, TRAP_BRKPT</div><div class='add'>+			};</div><div class='add'>+			do_trap(&amp;bkpt_exception, regs);</div><div class='add'>+			iexcept_report &amp;= ~(0xFF);</div><div class='add'>+			set_iexcept(iexcept_report);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		do_trap(&amp;iexcept_table[iexcept_num], regs);</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'>+ * Process an external exception (maskable)</div><div class='add'>+ */</div><div class='add'>+static void process_eexcept(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int evt;</div><div class='add'>+</div><div class='add'>+	pr_err("EEXCEPT: PC[0x%lx]\n", regs-&gt;pc);</div><div class='add'>+</div><div class='add'>+	while ((evt = soc_get_exception()) &gt;= 0)</div><div class='add'>+		do_trap(&amp;eexcept_table[evt], regs);</div><div class='add'>+</div><div class='add'>+	ack_exception(EXCEPT_TYPE_EXC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Main exception processing</div><div class='add'>+ */</div><div class='add'>+asmlinkage int process_exception(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned int type;</div><div class='add'>+	unsigned int type_num;</div><div class='add'>+	unsigned int ie_num = 9; /* default is unknown exception */</div><div class='add'>+</div><div class='add'>+	while ((type = get_except_type()) != 0) {</div><div class='add'>+		type_num = fls(type) - 1;</div><div class='add'>+</div><div class='add'>+		switch (type_num) {</div><div class='add'>+		case EXCEPT_TYPE_NXF:</div><div class='add'>+			ack_exception(EXCEPT_TYPE_NXF);</div><div class='add'>+			if (c6x_nmi_handler)</div><div class='add'>+				(c6x_nmi_handler)(regs);</div><div class='add'>+			else</div><div class='add'>+				pr_alert("NMI interrupt!\n");</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case EXCEPT_TYPE_IXF:</div><div class='add'>+			if (process_iexcept(regs))</div><div class='add'>+				return 1;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case EXCEPT_TYPE_EXC:</div><div class='add'>+			process_eexcept(regs);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case EXCEPT_TYPE_SXF:</div><div class='add'>+			ie_num = 8;</div><div class='add'>+		default:</div><div class='add'>+			ack_exception(type_num);</div><div class='add'>+			do_trap(&amp;iexcept_table[ie_num], regs);</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 kstack_depth_to_print = 48;</div><div class='add'>+</div><div class='add'>+static void show_trace(unsigned long *stack, unsigned long *endstack)</div><div class='add'>+{</div><div class='add'>+	unsigned long addr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	pr_debug("Call trace:");</div><div class='add'>+	i = 0;</div><div class='add'>+	while (stack + 1 &lt;= endstack) {</div><div class='add'>+		addr = *stack++;</div><div class='add'>+		/*</div><div class='add'>+		 * If the address is either in the text segment of the</div><div class='add'>+		 * kernel, or in the region which contains vmalloc'ed</div><div class='add'>+		 * memory, it *may* be the address of a calling</div><div class='add'>+		 * routine; if so, print it so that someone tracing</div><div class='add'>+		 * down the cause of the crash will be able to figure</div><div class='add'>+		 * out the call path that was taken.</div><div class='add'>+		 */</div><div class='add'>+		if (__kernel_text_address(addr)) {</div><div class='add'>+#ifndef CONFIG_KALLSYMS</div><div class='add'>+			if (i % 5 == 0)</div><div class='add'>+				pr_debug("\n	    ");</div><div class='add'>+#endif</div><div class='add'>+			pr_debug(" [&lt;%08lx&gt;]", addr);</div><div class='add'>+			print_symbol(" %s\n", addr);</div><div class='add'>+			i++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	pr_debug("\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void show_stack(struct task_struct *task, unsigned long *stack)</div><div class='add'>+{</div><div class='add'>+	unsigned long *p, *endstack;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!stack) {</div><div class='add'>+		if (task &amp;&amp; task != current)</div><div class='add'>+			/* We know this is a kernel stack,</div><div class='add'>+			   so this is the start/end */</div><div class='add'>+			stack = (unsigned long *)thread_saved_ksp(task);</div><div class='add'>+		else</div><div class='add'>+			stack = (unsigned long *)&amp;stack;</div><div class='add'>+	}</div><div class='add'>+	endstack = (unsigned long *)(((unsigned long)stack + THREAD_SIZE - 1)</div><div class='add'>+				     &amp; -THREAD_SIZE);</div><div class='add'>+</div><div class='add'>+	pr_debug("Stack from %08lx:", (unsigned long)stack);</div><div class='add'>+	for (i = 0, p = stack; i &lt; kstack_depth_to_print; i++) {</div><div class='add'>+		if (p + 1 &gt; endstack)</div><div class='add'>+			break;</div><div class='add'>+		if (i % 8 == 0)</div><div class='add'>+			pr_cont("\n	    ");</div><div class='add'>+		pr_cont(" %08lx", *p++);</div><div class='add'>+	}</div><div class='add'>+	pr_cont("\n");</div><div class='add'>+	show_trace(stack, endstack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int is_valid_bugaddr(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return __kernel_text_address(addr);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/c6x/kernel/vectors.S b/arch/c6x/kernel/vectors.S<br/>new file mode 100644<br/>index 000000000000..c95c66fc71e8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/vectors.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/vectors.S</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+;</div><div class='add'>+;  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+;</div><div class='add'>+;  Copyright (C) 2004, 2006, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+;  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+;  published by the Free Software Foundation.</div><div class='add'>+;</div><div class='add'>+;  This section handles all the interrupt vector routines.</div><div class='add'>+;  At RESET the processor sets up the DRAM timing parameters and</div><div class='add'>+;  branches to the label _c_int00 which handles initialization for the C code.</div><div class='add'>+;</div><div class='add'>+</div><div class='add'>+#define ALIGNMENT 5</div><div class='add'>+</div><div class='add'>+	.macro IRQVEC name, handler</div><div class='add'>+	.align ALIGNMENT</div><div class='add'>+	.hidden \name</div><div class='add'>+	.global \name</div><div class='add'>+\name:</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+	STW	.D2T1	A0,*B15--[2]</div><div class='add'>+ ||	MVKL	.S1	\handler,A0</div><div class='add'>+	MVKH	.S1	\handler,A0</div><div class='add'>+	B	.S2X	A0</div><div class='add'>+	LDW	.D2T1	*++B15[2],A0</div><div class='add'>+	NOP	4</div><div class='add'>+	NOP</div><div class='add'>+	NOP</div><div class='add'>+	.endm</div><div class='add'>+#else /* CONFIG_C6X_BIG_KERNEL */</div><div class='add'>+	B	.S2	\handler</div><div class='add'>+	NOP</div><div class='add'>+	NOP</div><div class='add'>+	NOP</div><div class='add'>+	NOP</div><div class='add'>+	NOP</div><div class='add'>+	NOP</div><div class='add'>+	NOP</div><div class='add'>+	.endm</div><div class='add'>+#endif /* CONFIG_C6X_BIG_KERNEL */</div><div class='add'>+</div><div class='add'>+	   .sect ".vectors","ax"</div><div class='add'>+	   .align ALIGNMENT</div><div class='add'>+	   .global RESET</div><div class='add'>+	   .hidden RESET</div><div class='add'>+RESET:</div><div class='add'>+#ifdef CONFIG_C6X_BIG_KERNEL</div><div class='add'>+	   MVKL	.S1	_c_int00,A0		; branch to _c_int00</div><div class='add'>+	   MVKH	.S1	_c_int00,A0</div><div class='add'>+	   B	.S2X	A0</div><div class='add'>+#else</div><div class='add'>+	   B	.S2	_c_int00</div><div class='add'>+	   NOP</div><div class='add'>+	   NOP</div><div class='add'>+#endif</div><div class='add'>+	   NOP</div><div class='add'>+	   NOP</div><div class='add'>+	   NOP</div><div class='add'>+	   NOP</div><div class='add'>+	   NOP</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	   IRQVEC NMI,_nmi_handler		; NMI interrupt</div><div class='add'>+	   IRQVEC AINT,_bad_interrupt		; reserved</div><div class='add'>+	   IRQVEC MSGINT,_bad_interrupt		; reserved</div><div class='add'>+</div><div class='add'>+	   IRQVEC INT4,_int4_handler</div><div class='add'>+	   IRQVEC INT5,_int5_handler</div><div class='add'>+	   IRQVEC INT6,_int6_handler</div><div class='add'>+	   IRQVEC INT7,_int7_handler</div><div class='add'>+	   IRQVEC INT8,_int8_handler</div><div class='add'>+	   IRQVEC INT9,_int9_handler</div><div class='add'>+	   IRQVEC INT10,_int10_handler</div><div class='add'>+	   IRQVEC INT11,_int11_handler</div><div class='add'>+	   IRQVEC INT12,_int12_handler</div><div class='add'>+	   IRQVEC INT13,_int13_handler</div><div class='add'>+	   IRQVEC INT14,_int14_handler</div><div class='add'>+	   IRQVEC INT15,_int15_handler</div><div class='head'>diff --git a/arch/c6x/kernel/vmlinux.lds.S b/arch/c6x/kernel/vmlinux.lds.S<br/>new file mode 100644<br/>index 000000000000..1d81c4c129ec<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/kernel/vmlinux.lds.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -0,0 +1,162 @@</div><div class='add'>+/*</div><div class='add'>+ * ld script for the c6x kernel</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Mark Salter &lt;msalter@redhat.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;asm-generic/vmlinux.lds.h&gt;</div><div class='add'>+#include &lt;asm/thread_info.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+</div><div class='add'>+ENTRY(_c_int00)</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CPU_BIG_ENDIAN)</div><div class='add'>+jiffies = jiffies_64 + 4;</div><div class='add'>+#else</div><div class='add'>+jiffies = jiffies_64;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define	READONLY_SEGMENT_START	\</div><div class='add'>+	. = PAGE_OFFSET;</div><div class='add'>+#define	READWRITE_SEGMENT_START	\</div><div class='add'>+	. = ALIGN(128);		\</div><div class='add'>+	_data_lma = .;</div><div class='add'>+</div><div class='add'>+SECTIONS</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Start kernel read only segment</div><div class='add'>+	 */</div><div class='add'>+	READONLY_SEGMENT_START</div><div class='add'>+</div><div class='add'>+	.vectors :</div><div class='add'>+	{</div><div class='add'>+		_vectors_start = .;</div><div class='add'>+		*(.vectors)</div><div class='add'>+		. = ALIGN(0x400);</div><div class='add'>+		_vectors_end = .;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	. = ALIGN(0x1000);</div><div class='add'>+	.cmdline :</div><div class='add'>+	{</div><div class='add'>+		*(.cmdline)</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This section contains data which may be shared with other</div><div class='add'>+	 * cores. It needs to be a fixed offset from PAGE_OFFSET</div><div class='add'>+	 * regardless of kernel configuration.</div><div class='add'>+	 */</div><div class='add'>+	.virtio_ipc_dev :</div><div class='add'>+	{</div><div class='add'>+		*(.virtio_ipc_dev)</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	. = ALIGN(PAGE_SIZE);</div><div class='add'>+	.init :</div><div class='add'>+	{</div><div class='add'>+		_stext = .;</div><div class='add'>+		_sinittext = .;</div><div class='add'>+		HEAD_TEXT</div><div class='add'>+		INIT_TEXT</div><div class='add'>+		_einittext = .;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__init_begin = _stext;</div><div class='add'>+	INIT_DATA_SECTION(16)</div><div class='add'>+</div><div class='add'>+	PERCPU_SECTION(128)</div><div class='add'>+</div><div class='add'>+	. = ALIGN(PAGE_SIZE);</div><div class='add'>+	__init_end = .;</div><div class='add'>+</div><div class='add'>+	.text :</div><div class='add'>+	{</div><div class='add'>+		_text = .;</div><div class='add'>+		TEXT_TEXT</div><div class='add'>+		SCHED_TEXT</div><div class='add'>+		LOCK_TEXT</div><div class='add'>+		IRQENTRY_TEXT</div><div class='add'>+		KPROBES_TEXT</div><div class='add'>+		*(.fixup)</div><div class='add'>+		*(.gnu.warning)</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	EXCEPTION_TABLE(16)</div><div class='add'>+	NOTES</div><div class='add'>+</div><div class='add'>+	RO_DATA_SECTION(PAGE_SIZE)</div><div class='add'>+	.const :</div><div class='add'>+	{</div><div class='add'>+		*(.const .const.* .gnu.linkonce.r.*)</div><div class='add'>+		*(.switch)</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	. = ALIGN (8) ;</div><div class='add'>+	__fdt_blob : AT(ADDR(__fdt_blob) - LOAD_OFFSET)</div><div class='add'>+	{</div><div class='add'>+		_fdt_start = . ;	/* place for fdt blob */</div><div class='add'>+		*(__fdt_blob) ;		/* Any link-placed DTB */</div><div class='add'>+		BYTE(0);		/* section always has contents */</div><div class='add'>+	        . = _fdt_start + 0x4000;	/* Pad up to 16kbyte */</div><div class='add'>+		_fdt_end = . ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	_etext = .;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Start kernel read-write segment.</div><div class='add'>+	 */</div><div class='add'>+	READWRITE_SEGMENT_START</div><div class='add'>+	_sdata = .;</div><div class='add'>+</div><div class='add'>+	.fardata : AT(ADDR(.fardata) - LOAD_OFFSET)</div><div class='add'>+	{</div><div class='add'>+		INIT_TASK_DATA(THREAD_SIZE)</div><div class='add'>+		NOSAVE_DATA</div><div class='add'>+		PAGE_ALIGNED_DATA(PAGE_SIZE)</div><div class='add'>+		CACHELINE_ALIGNED_DATA(128)</div><div class='add'>+		READ_MOSTLY_DATA(128)</div><div class='add'>+		DATA_DATA</div><div class='add'>+		CONSTRUCTORS</div><div class='add'>+		*(.data1)</div><div class='add'>+		*(.fardata .fardata.*)</div><div class='add'>+		*(.data.debug_bpt)</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	.neardata ALIGN(8) : AT(ADDR(.neardata) - LOAD_OFFSET)</div><div class='add'>+	{</div><div class='add'>+		*(.neardata2 .neardata2.* .gnu.linkonce.s2.*)</div><div class='add'>+		*(.neardata .neardata.* .gnu.linkonce.s.*)</div><div class='add'>+		. = ALIGN(8);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	_edata = .;</div><div class='add'>+</div><div class='add'>+	__bss_start = .;</div><div class='add'>+	SBSS(8)</div><div class='add'>+	BSS(8)</div><div class='add'>+	.far :</div><div class='add'>+	{</div><div class='add'>+		. = ALIGN(8);</div><div class='add'>+		*(.dynfar)</div><div class='add'>+		*(.far .far.* .gnu.linkonce.b.*)</div><div class='add'>+		. = ALIGN(8);</div><div class='add'>+	}</div><div class='add'>+	__bss_stop = .;</div><div class='add'>+</div><div class='add'>+	_end = .;</div><div class='add'>+</div><div class='add'>+	DWARF_DEBUG</div><div class='add'>+</div><div class='add'>+	/DISCARD/ :</div><div class='add'>+	{</div><div class='add'>+		  EXIT_TEXT</div><div class='add'>+		  EXIT_DATA</div><div class='add'>+		  EXIT_CALL</div><div class='add'>+		  *(.discard)</div><div class='add'>+		  *(.discard.*)</div><div class='add'>+		  *(.interp)</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/arch/c6x/lib/Makefile b/arch/c6x/lib/Makefile<br/>new file mode 100644<br/>index 000000000000..ffd3c659091a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/Makefile</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for arch/c6x/lib/</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+lib-y := divu.o divi.o pop_rts.o push_rts.o remi.o remu.o strasgi.o llshru.o</div><div class='add'>+lib-y += llshr.o llshl.o negll.o mpyll.o divremi.o divremu.o</div><div class='add'>+lib-y += checksum.o csum_64plus.o memcpy_64plus.o strasgi_64plus.o</div><div class='head'>diff --git a/arch/c6x/lib/checksum.c b/arch/c6x/lib/checksum.c<br/>new file mode 100644<br/>index 000000000000..67cc93b0b932<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/checksum.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/checksum.c</a></div><div class='hunk'>@@ -0,0 +1,36 @@</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'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;net/checksum.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * copy from fs while checksumming, otherwise like csum_partial</div><div class='add'>+ */</div><div class='add'>+__wsum</div><div class='add'>+csum_partial_copy_from_user(const void __user *src, void *dst, int len,</div><div class='add'>+			    __wsum sum, int *csum_err)</div><div class='add'>+{</div><div class='add'>+	int missing;</div><div class='add'>+</div><div class='add'>+	missing = __copy_from_user(dst, src, len);</div><div class='add'>+	if (missing) {</div><div class='add'>+		memset(dst + len - missing, 0, missing);</div><div class='add'>+		*csum_err = -EFAULT;</div><div class='add'>+	} else</div><div class='add'>+		*csum_err = 0;</div><div class='add'>+</div><div class='add'>+	return csum_partial(dst, len, sum);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(csum_partial_copy_from_user);</div><div class='add'>+</div><div class='add'>+/* These are from csum_64plus.S */</div><div class='add'>+EXPORT_SYMBOL(csum_partial);</div><div class='add'>+EXPORT_SYMBOL(csum_partial_copy);</div><div class='add'>+EXPORT_SYMBOL(ip_compute_csum);</div><div class='add'>+EXPORT_SYMBOL(ip_fast_csum);</div><div class='head'>diff --git a/arch/c6x/lib/csum_64plus.S b/arch/c6x/lib/csum_64plus.S<br/>new file mode 100644<br/>index 000000000000..6d2589647227<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/csum_64plus.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/csum_64plus.S</a></div><div class='hunk'>@@ -0,0 +1,419 @@</div><div class='add'>+;</div><div class='add'>+;  linux/arch/c6x/lib/csum_64plus.s</div><div class='add'>+;</div><div class='add'>+;  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+;</div><div class='add'>+;  Copyright (C) 2006, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+;  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+;  published by the Free Software Foundation.</div><div class='add'>+;</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+;</div><div class='add'>+;unsigned int csum_partial_copy(const char *src, char * dst,</div><div class='add'>+;				int len, int sum)</div><div class='add'>+;</div><div class='add'>+; A4:	src</div><div class='add'>+; B4:	dst</div><div class='add'>+; A6:	len</div><div class='add'>+; B6:	sum</div><div class='add'>+; return csum in A4</div><div class='add'>+;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+ENTRY(csum_partial_copy)</div><div class='add'>+	MVC	.S2	ILC,B30</div><div class='add'>+</div><div class='add'>+	MV	.D1X	B6,A31		; given csum</div><div class='add'>+	ZERO	.D1	A9		; csum (a side)</div><div class='add'>+||	ZERO	.D2	B9		; csum (b side)</div><div class='add'>+||	SHRU	.S2X	A6,2,B5		; len / 4</div><div class='add'>+</div><div class='add'>+	;; Check alignment and size</div><div class='add'>+	AND	.S1	3,A4,A1</div><div class='add'>+||	AND	.S2	3,B4,B0</div><div class='add'>+	OR	.L2X	B0,A1,B0	; non aligned condition</div><div class='add'>+||	MVC	.S2	B5,ILC</div><div class='add'>+||	MVK	.D2	1,B2</div><div class='add'>+||	MV	.D1X	B5,A1		; words condition</div><div class='add'>+  [!A1]	B	.S1	L8</div><div class='add'>+   [B0] BNOP	.S1	L6,5</div><div class='add'>+</div><div class='add'>+	SPLOOP		1</div><div class='add'>+</div><div class='add'>+	;; Main loop for aligned words</div><div class='add'>+	LDW	.D1T1	*A4++,A7</div><div class='add'>+	NOP	4</div><div class='add'>+	MV	.S2X	A7,B7</div><div class='add'>+||	EXTU	.S1	A7,0,16,A16</div><div class='add'>+	STW	.D2T2	B7,*B4++</div><div class='add'>+||	MPYU	.M2	B7,B2,B8</div><div class='add'>+||	ADD	.L1	A16,A9,A9</div><div class='add'>+	NOP</div><div class='add'>+	SPKERNEL	8,0</div><div class='add'>+||	ADD	.L2	B8,B9,B9</div><div class='add'>+</div><div class='add'>+	ZERO	.D1	A1</div><div class='add'>+||	ADD	.L1X	A9,B9,A9	;  add csum from a and b sides</div><div class='add'>+</div><div class='add'>+L6:</div><div class='add'>+  [!A1]	BNOP	.S1	L8,5</div><div class='add'>+</div><div class='add'>+	;; Main loop for non-aligned words</div><div class='add'>+	SPLOOP		2</div><div class='add'>+ ||	MVK	.L1	1,A2</div><div class='add'>+</div><div class='add'>+	LDNW	.D1T1	*A4++,A7</div><div class='add'>+	NOP		3</div><div class='add'>+</div><div class='add'>+	NOP</div><div class='add'>+	MV	.S2X	A7,B7</div><div class='add'>+ ||	EXTU	.S1	A7,0,16,A16</div><div class='add'>+ ||	MPYU	.M1	A7,A2,A8</div><div class='add'>+</div><div class='add'>+	ADD	.L1	A16,A9,A9</div><div class='add'>+	SPKERNEL	6,0</div><div class='add'>+ ||	STNW	.D2T2	B7,*B4++</div><div class='add'>+ ||	ADD	.L1	A8,A9,A9</div><div class='add'>+</div><div class='add'>+L8:	AND	.S2X	2,A6,B5</div><div class='add'>+	CMPGT	.L2	B5,0,B0</div><div class='add'>+  [!B0]	BNOP	.S1	L82,4</div><div class='add'>+</div><div class='add'>+	;; Manage half-word</div><div class='add'>+	ZERO	.L1	A7</div><div class='add'>+||	ZERO	.D1	A8</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='add'>+</div><div class='add'>+	LDBU	.D1T1	*A4++,A7</div><div class='add'>+	LDBU	.D1T1	*A4++,A8</div><div class='add'>+	NOP		3</div><div class='add'>+	SHL	.S1	A7,8,A0</div><div class='add'>+	ADD	.S1	A8,A9,A9</div><div class='add'>+	STB	.D2T1	A7,*B4++</div><div class='add'>+||	ADD	.S1	A0,A9,A9</div><div class='add'>+	STB	.D2T1	A8,*B4++</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+	LDBU	.D1T1	*A4++,A7</div><div class='add'>+	LDBU	.D1T1	*A4++,A8</div><div class='add'>+	NOP		3</div><div class='add'>+	ADD	.S1	A7,A9,A9</div><div class='add'>+	SHL	.S1	A8,8,A0</div><div class='add'>+</div><div class='add'>+	STB	.D2T1	A7,*B4++</div><div class='add'>+||	ADD	.S1	A0,A9,A9</div><div class='add'>+	STB	.D2T1	A8,*B4++</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	;; Manage eventually the last byte</div><div class='add'>+L82:	AND	.S2X	1,A6,B0</div><div class='add'>+  [!B0]	BNOP	.S1	L9,5</div><div class='add'>+</div><div class='add'>+||	ZERO	.L1	A7</div><div class='add'>+</div><div class='add'>+L83:	LDBU	.D1T1	*A4++,A7</div><div class='add'>+	NOP		4</div><div class='add'>+</div><div class='add'>+	MV	.L2X	A7,B7</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='add'>+</div><div class='add'>+	STB	.D2T2	B7,*B4++</div><div class='add'>+||	SHL	.S1	A7,8,A7</div><div class='add'>+	ADD	.S1	A7,A9,A9</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+	STB	.D2T2	B7,*B4++</div><div class='add'>+||	ADD	.S1	A7,A9,A9</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	;; Fold the csum</div><div class='add'>+L9:	SHRU	.S2X	A9,16,B0</div><div class='add'>+  [!B0]	BNOP	.S1	L10,5</div><div class='add'>+</div><div class='add'>+L91:	SHRU	.S2X	A9,16,B4</div><div class='add'>+||	EXTU	.S1	A9,16,16,A3</div><div class='add'>+	ADD	.D1X	A3,B4,A9</div><div class='add'>+</div><div class='add'>+	SHRU	.S1	A9,16,A0</div><div class='add'>+   [A0]	BNOP	.S1	L91,5</div><div class='add'>+</div><div class='add'>+L10:	ADD	.D1	A31,A9,A9</div><div class='add'>+	MV	.D1	A9,A4</div><div class='add'>+</div><div class='add'>+	BNOP	.S2	B3,4</div><div class='add'>+	MVC	.S2	B30,ILC</div><div class='add'>+ENDPROC(csum_partial_copy)</div><div class='add'>+</div><div class='add'>+;</div><div class='add'>+;unsigned short</div><div class='add'>+;ip_fast_csum(unsigned char *iph, unsigned int ihl)</div><div class='add'>+;{</div><div class='add'>+;	unsigned int checksum = 0;</div><div class='add'>+;	unsigned short *tosum = (unsigned short *) iph;</div><div class='add'>+;	int len;</div><div class='add'>+;</div><div class='add'>+;	len = ihl*4;</div><div class='add'>+;</div><div class='add'>+;	if (len &lt;= 0)</div><div class='add'>+;		return 0;</div><div class='add'>+;</div><div class='add'>+;	while(len) {</div><div class='add'>+;		len -= 2;</div><div class='add'>+;		checksum += *tosum++;</div><div class='add'>+;	}</div><div class='add'>+;	if (len &amp; 1)</div><div class='add'>+;		checksum += *(unsigned char*) tosum;</div><div class='add'>+;</div><div class='add'>+;	while(checksum &gt;&gt; 16)</div><div class='add'>+;		checksum = (checksum &amp; 0xffff) + (checksum &gt;&gt; 16);</div><div class='add'>+;</div><div class='add'>+;	return ~checksum;</div><div class='add'>+;}</div><div class='add'>+;</div><div class='add'>+; A4:	iph</div><div class='add'>+; B4:	ihl</div><div class='add'>+; return checksum in A4</div><div class='add'>+;</div><div class='add'>+	.text</div><div class='add'>+</div><div class='add'>+ENTRY(ip_fast_csum)</div><div class='add'>+	ZERO	.D1	A5</div><div class='add'>+ ||	MVC	.S2	ILC,B30</div><div class='add'>+	SHL	.S2	B4,2,B0</div><div class='add'>+	CMPGT	.L2	B0,0,B1</div><div class='add'>+  [!B1] BNOP	.S1	L15,4</div><div class='add'>+  [!B1]	ZERO	.D1	A3</div><div class='add'>+</div><div class='add'>+  [!B0]	B	.S1	L12</div><div class='add'>+	SHRU	.S2	B0,1,B0</div><div class='add'>+	MVC	.S2	B0,ILC</div><div class='add'>+	NOP	3</div><div class='add'>+</div><div class='add'>+	SPLOOP	1</div><div class='add'>+	LDHU	.D1T1	*A4++,A3</div><div class='add'>+	NOP	3</div><div class='add'>+	NOP</div><div class='add'>+	SPKERNEL	5,0</div><div class='add'>+ ||	ADD	.L1	A3,A5,A5</div><div class='add'>+</div><div class='add'>+L12:	SHRU	.S1	A5,16,A0</div><div class='add'>+  [!A0]	BNOP	.S1	L14,5</div><div class='add'>+</div><div class='add'>+L13:	SHRU	.S2X	A5,16,B4</div><div class='add'>+	EXTU	.S1	A5,16,16,A3</div><div class='add'>+	ADD	.D1X	A3,B4,A5</div><div class='add'>+	SHRU	.S1	A5,16,A0</div><div class='add'>+  [A0]	BNOP	.S1	L13,5</div><div class='add'>+</div><div class='add'>+L14:	NOT	.D1	A5,A3</div><div class='add'>+	EXTU	.S1	A3,16,16,A3</div><div class='add'>+</div><div class='add'>+L15:	BNOP	.S2	B3,3</div><div class='add'>+	MVC	.S2	B30,ILC</div><div class='add'>+	MV	.D1	A3,A4</div><div class='add'>+ENDPROC(ip_fast_csum)</div><div class='add'>+</div><div class='add'>+;</div><div class='add'>+;unsigned short</div><div class='add'>+;do_csum(unsigned char *buff, unsigned int len)</div><div class='add'>+;{</div><div class='add'>+;	int odd, count;</div><div class='add'>+;	unsigned int result = 0;</div><div class='add'>+;</div><div class='add'>+;	if (len &lt;= 0)</div><div class='add'>+;		goto out;</div><div class='add'>+;	odd = 1 &amp; (unsigned long) buff;</div><div class='add'>+;	if (odd) {</div><div class='add'>+;#ifdef __LITTLE_ENDIAN</div><div class='add'>+;		result += (*buff &lt;&lt; 8);</div><div class='add'>+;#else</div><div class='add'>+;		result = *buff;</div><div class='add'>+;#endif</div><div class='add'>+;		len--;</div><div class='add'>+;		buff++;</div><div class='add'>+;	}</div><div class='add'>+;	count = len &gt;&gt; 1;		/* nr of 16-bit words.. */</div><div class='add'>+;	if (count) {</div><div class='add'>+;		if (2 &amp; (unsigned long) buff) {</div><div class='add'>+;			result += *(unsigned short *) buff;</div><div class='add'>+;			count--;</div><div class='add'>+;			len -= 2;</div><div class='add'>+;			buff += 2;</div><div class='add'>+;		}</div><div class='add'>+;		count &gt;&gt;= 1;		/* nr of 32-bit words.. */</div><div class='add'>+;		if (count) {</div><div class='add'>+;			unsigned int carry = 0;</div><div class='add'>+;			do {</div><div class='add'>+;				unsigned int w = *(unsigned int *) buff;</div><div class='add'>+;				count--;</div><div class='add'>+;				buff += 4;</div><div class='add'>+;				result += carry;</div><div class='add'>+;				result += w;</div><div class='add'>+;				carry = (w &gt; result);</div><div class='add'>+;			} while (count);</div><div class='add'>+;			result += carry;</div><div class='add'>+;			result = (result &amp; 0xffff) + (result &gt;&gt; 16);</div><div class='add'>+;		}</div><div class='add'>+;		if (len &amp; 2) {</div><div class='add'>+;			result += *(unsigned short *) buff;</div><div class='add'>+;			buff += 2;</div><div class='add'>+;		}</div><div class='add'>+;	}</div><div class='add'>+;	if (len &amp; 1)</div><div class='add'>+;#ifdef __LITTLE_ENDIAN</div><div class='add'>+;		result += *buff;</div><div class='add'>+;#else</div><div class='add'>+;		result += (*buff &lt;&lt; 8);</div><div class='add'>+;#endif</div><div class='add'>+;	result = (result &amp; 0xffff) + (result &gt;&gt; 16);</div><div class='add'>+;	/* add up carry.. */</div><div class='add'>+;	result = (result &amp; 0xffff) + (result &gt;&gt; 16);</div><div class='add'>+;	if (odd)</div><div class='add'>+;		result = ((result &gt;&gt; 8) &amp; 0xff) | ((result &amp; 0xff) &lt;&lt; 8);</div><div class='add'>+;out:</div><div class='add'>+;	return result;</div><div class='add'>+;}</div><div class='add'>+;</div><div class='add'>+; A4:	buff</div><div class='add'>+; B4:	len</div><div class='add'>+; return checksum in A4</div><div class='add'>+;</div><div class='add'>+</div><div class='add'>+ENTRY(do_csum)</div><div class='add'>+	   CMPGT   .L2	   B4,0,B0</div><div class='add'>+   [!B0]   BNOP    .S1	   L26,3</div><div class='add'>+	   EXTU    .S1	   A4,31,31,A0</div><div class='add'>+</div><div class='add'>+	   MV	   .L1	   A0,A3</div><div class='add'>+||	   MV	   .S1X    B3,A5</div><div class='add'>+||	   MV	   .L2	   B4,B3</div><div class='add'>+||	   ZERO    .D1	   A1</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='add'>+   [A0]    SUB	   .L2	   B3,1,B3</div><div class='add'>+|| [A0]    LDBU    .D1T1   *A4++,A1</div><div class='add'>+#else</div><div class='add'>+   [!A0]   BNOP    .S1	   L21,5</div><div class='add'>+|| [A0]    LDBU    .D1T1   *A4++,A0</div><div class='add'>+	   SUB	   .L2	   B3,1,B3</div><div class='add'>+||	   SHL	   .S1	   A0,8,A1</div><div class='add'>+L21:</div><div class='add'>+#endif</div><div class='add'>+	   SHR	   .S2	   B3,1,B0</div><div class='add'>+   [!B0]   BNOP    .S1	   L24,3</div><div class='add'>+	   MVK	   .L1	   2,A0</div><div class='add'>+	   AND	   .L1	   A4,A0,A0</div><div class='add'>+</div><div class='add'>+   [!A0]   BNOP    .S1	   L22,5</div><div class='add'>+|| [A0]    LDHU    .D1T1   *A4++,A0</div><div class='add'>+	   SUB	   .L2	   B0,1,B0</div><div class='add'>+||	   SUB	   .S2	   B3,2,B3</div><div class='add'>+||	   ADD	   .L1	   A0,A1,A1</div><div class='add'>+L22:</div><div class='add'>+	   SHR	   .S2	   B0,1,B0</div><div class='add'>+||	   ZERO    .L1	   A0</div><div class='add'>+</div><div class='add'>+   [!B0]   BNOP    .S1	   L23,5</div><div class='add'>+|| [B0]    MVC	   .S2	   B0,ILC</div><div class='add'>+</div><div class='add'>+	   SPLOOP  3</div><div class='add'>+	   SPMASK  L1</div><div class='add'>+||	   MV	   .L1	   A1,A2</div><div class='add'>+||	   LDW	   .D1T1   *A4++,A1</div><div class='add'>+</div><div class='add'>+	   NOP	   4</div><div class='add'>+	   ADD	   .L1	   A0,A1,A0</div><div class='add'>+	   ADD	   .L1	   A2,A0,A2</div><div class='add'>+</div><div class='add'>+	   SPKERNEL 1,2</div><div class='add'>+||	   CMPGTU  .L1	   A1,A2,A0</div><div class='add'>+</div><div class='add'>+	   ADD	   .L1	   A0,A2,A6</div><div class='add'>+	   EXTU    .S1	   A6,16,16,A7</div><div class='add'>+	   SHRU    .S2X    A6,16,B0</div><div class='add'>+	   NOP		   1</div><div class='add'>+	   ADD	   .L1X    A7,B0,A1</div><div class='add'>+L23:</div><div class='add'>+	   MVK	   .L2	   2,B0</div><div class='add'>+	   AND	   .L2	   B3,B0,B0</div><div class='add'>+   [B0]    LDHU    .D1T1   *A4++,A0</div><div class='add'>+	   NOP	   4</div><div class='add'>+   [B0]    ADD	   .L1	   A0,A1,A1</div><div class='add'>+L24:</div><div class='add'>+	   EXTU    .S2	   B3,31,31,B0</div><div class='add'>+#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='add'>+   [!B0]   BNOP    .S1	   L25,4</div><div class='add'>+|| [B0]    LDBU    .D1T1   *A4,A0</div><div class='add'>+	   SHL	   .S1	   A0,8,A0</div><div class='add'>+	   ADD	   .L1	   A0,A1,A1</div><div class='add'>+L25:</div><div class='add'>+#else</div><div class='add'>+   [B0]    LDBU    .D1T1   *A4,A0</div><div class='add'>+	   NOP	   4</div><div class='add'>+   [B0]    ADD	   .L1	   A0,A1,A1</div><div class='add'>+#endif</div><div class='add'>+	   EXTU    .S1	   A1,16,16,A0</div><div class='add'>+	   SHRU    .S2X    A1,16,B0</div><div class='add'>+	   NOP	   1</div><div class='add'>+	   ADD	   .L1X    A0,B0,A0</div><div class='add'>+	   SHRU    .S1	   A0,16,A1</div><div class='add'>+	   ADD	   .L1	   A0,A1,A0</div><div class='add'>+	   EXTU    .S1	   A0,16,16,A1</div><div class='add'>+	   EXTU    .S1	   A1,16,24,A2</div><div class='add'>+</div><div class='add'>+	   EXTU    .S1	   A1,24,16,A0</div><div class='add'>+||	   MV	   .L2X    A3,B0</div><div class='add'>+</div><div class='add'>+   [B0]    OR	   .L1	   A0,A2,A1</div><div class='add'>+L26:</div><div class='add'>+	   NOP	   1</div><div class='add'>+	   BNOP    .S2X    A5,4</div><div class='add'>+	   MV	   .L1	   A1,A4</div><div class='add'>+ENDPROC(do_csum)</div><div class='add'>+</div><div class='add'>+;__wsum csum_partial(const void *buff, int len, __wsum wsum)</div><div class='add'>+;{</div><div class='add'>+;	unsigned int sum = (__force unsigned int)wsum;</div><div class='add'>+;	unsigned int result = do_csum(buff, len);</div><div class='add'>+;</div><div class='add'>+;	/* add in old sum, and carry.. */</div><div class='add'>+;	result += sum;</div><div class='add'>+;	if (sum &gt; result)</div><div class='add'>+;		result += 1;</div><div class='add'>+;	return (__force __wsum)result;</div><div class='add'>+;}</div><div class='add'>+;</div><div class='add'>+ENTRY(csum_partial)</div><div class='add'>+	   MV	   .L1X    B3,A9</div><div class='add'>+||	   CALLP   .S2	   do_csum,B3</div><div class='add'>+||	   MV	   .S1	   A6,A8</div><div class='add'>+	   BNOP    .S2X    A9,2</div><div class='add'>+	   ADD	   .L1	   A8,A4,A1</div><div class='add'>+	   CMPGTU  .L1	   A8,A1,A0</div><div class='add'>+	   ADD	   .L1	   A1,A0,A4</div><div class='add'>+ENDPROC(csum_partial)</div><div class='add'>+</div><div class='add'>+;unsigned short</div><div class='add'>+;ip_compute_csum(unsigned char *buff, unsigned int len)</div><div class='add'>+;</div><div class='add'>+; A4:	buff</div><div class='add'>+; B4:	len</div><div class='add'>+; return checksum in A4</div><div class='add'>+</div><div class='add'>+ENTRY(ip_compute_csum)</div><div class='add'>+	   MV	   .L1X    B3,A9</div><div class='add'>+||	   CALLP   .S2	   do_csum,B3</div><div class='add'>+	   BNOP    .S2X    A9,3</div><div class='add'>+	   NOT	   .S1	   A4,A4</div><div class='add'>+	   CLR     .S1	   A4,16,31,A4</div><div class='add'>+ENDPROC(ip_compute_csum)</div><div class='head'>diff --git a/arch/c6x/lib/divi.S b/arch/c6x/lib/divi.S<br/>new file mode 100644<br/>index 000000000000..4bde924f2a98<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/divi.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/divi.S</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+;;  Copyright 2010  Free Software Foundation, Inc.</div><div class='add'>+;;  Contributed by Bernd Schmidt &lt;bernds@codesourcery.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'>+;; This program is distributed in the hope that it will be useful,</div><div class='add'>+;; but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+;; GNU General Public License for more details.</div><div class='add'>+;;</div><div class='add'>+;; You should have received a copy of the GNU General Public License</div><div class='add'>+;; along with this program; if not, write to the Free Software</div><div class='add'>+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+	;; ABI considerations for the divide functions</div><div class='add'>+	;; The following registers are call-used:</div><div class='add'>+	;; __c6xabi_divi A0,A1,A2,A4,A6,B0,B1,B2,B4,B5</div><div class='add'>+	;; __c6xabi_divu A0,A1,A2,A4,A6,B0,B1,B2,B4</div><div class='add'>+	;; __c6xabi_remi A1,A2,A4,A5,A6,B0,B1,B2,B4</div><div class='add'>+	;; __c6xabi_remu A1,A4,A5,A7,B0,B1,B2,B4</div><div class='add'>+	;;</div><div class='add'>+	;; In our implementation, divu and remu are leaf functions,</div><div class='add'>+	;; while both divi and remi call into divu.</div><div class='add'>+	;; A0 is not clobbered by any of the functions.</div><div class='add'>+	;; divu does not clobber B2 either, which is taken advantage of</div><div class='add'>+	;; in remi.</div><div class='add'>+	;; divi uses B5 to hold the original return address during</div><div class='add'>+	;; the call to divu.</div><div class='add'>+	;; remi uses B2 and A5 to hold the input values during the</div><div class='add'>+	;; call to divu.  It stores B3 in on the stack.</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+ENTRY(__c6xabi_divi)</div><div class='add'>+	call	.s2	__c6xabi_divu</div><div class='add'>+||	mv	.d2	B3, B5</div><div class='add'>+||	cmpgt	.l1	0, A4, A1</div><div class='add'>+||	cmpgt	.l2	0, B4, B1</div><div class='add'>+</div><div class='add'>+   [A1]	neg	.l1	A4, A4</div><div class='add'>+|| [B1]	neg	.l2	B4, B4</div><div class='add'>+||	xor	.s1x	A1, B1, A1</div><div class='add'>+   [A1] addkpc	.s2	_divu_ret, B3, 4</div><div class='add'>+_divu_ret:</div><div class='add'>+	neg	.l1	A4, A4</div><div class='add'>+||	mv	.l2	B3,B5</div><div class='add'>+||	ret	.s2	B5</div><div class='add'>+	nop		5</div><div class='add'>+ENDPROC(__c6xabi_divi)</div><div class='head'>diff --git a/arch/c6x/lib/divremi.S b/arch/c6x/lib/divremi.S<br/>new file mode 100644<br/>index 000000000000..64bc5aa95ad3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/divremi.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/divremi.S</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+;;  Copyright 2010  Free Software Foundation, Inc.</div><div class='add'>+;;  Contributed by Bernd Schmidt &lt;bernds@codesourcery.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'>+;; This program is distributed in the hope that it will be useful,</div><div class='add'>+;; but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+;; GNU General Public License for more details.</div><div class='add'>+;;</div><div class='add'>+;; You should have received a copy of the GNU General Public License</div><div class='add'>+;; along with this program; if not, write to the Free Software</div><div class='add'>+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+ENTRY(__c6xabi_divremi)</div><div class='add'>+	stw	.d2t2	B3, *B15--[2]</div><div class='add'>+||	cmpgt	.l1	0, A4, A1</div><div class='add'>+||	cmpgt	.l2	0, B4, B2</div><div class='add'>+||	mv	.s1	A4, A5</div><div class='add'>+||	call	.s2	__c6xabi_divu</div><div class='add'>+</div><div class='add'>+   [A1]	neg	.l1	A4, A4</div><div class='add'>+|| [B2]	neg	.l2	B4, B4</div><div class='add'>+||	xor	.s2x	B2, A1, B0</div><div class='add'>+||	mv	.d2	B4, B2</div><div class='add'>+</div><div class='add'>+   [B0]	addkpc	.s2	_divu_ret_1, B3, 1</div><div class='add'>+  [!B0] addkpc	.s2	_divu_ret_2, B3, 1</div><div class='add'>+	nop	2</div><div class='add'>+_divu_ret_1:</div><div class='add'>+	neg	.l1	A4, A4</div><div class='add'>+_divu_ret_2:</div><div class='add'>+	ldw	.d2t2	*++B15[2], B3</div><div class='add'>+</div><div class='add'>+	mpy32	.m1x	A4, B2, A6</div><div class='add'>+	nop		3</div><div class='add'>+	ret	.s2	B3</div><div class='add'>+	sub	.l1	A5, A6, A5</div><div class='add'>+	nop	4</div><div class='add'>+ENDPROC(__c6xabi_divremi)</div><div class='head'>diff --git a/arch/c6x/lib/divremu.S b/arch/c6x/lib/divremu.S<br/>new file mode 100644<br/>index 000000000000..caa9f23ee167<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/divremu.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/divremu.S</a></div><div class='hunk'>@@ -0,0 +1,87 @@</div><div class='add'>+;;  Copyright 2011  Free Software Foundation, Inc.</div><div class='add'>+;;  Contributed by Bernd Schmidt &lt;bernds@codesourcery.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'>+;; This program is distributed in the hope that it will be useful,</div><div class='add'>+;; but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+;; GNU General Public License for more details.</div><div class='add'>+;;</div><div class='add'>+;; You should have received a copy of the GNU General Public License</div><div class='add'>+;; along with this program; if not, write to the Free Software</div><div class='add'>+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+ENTRY(__c6xabi_divremu)</div><div class='add'>+	;; We use a series of up to 31 subc instructions.  First, we find</div><div class='add'>+	;; out how many leading zero bits there are in the divisor.  This</div><div class='add'>+	;; gives us both a shift count for aligning (shifting) the divisor</div><div class='add'>+	;; to the, and the number of times we have to execute subc.</div><div class='add'>+</div><div class='add'>+	;; At the end, we have both the remainder and most of the quotient</div><div class='add'>+	;; in A4.  The top bit of the quotient is computed first and is</div><div class='add'>+	;; placed in A2.</div><div class='add'>+</div><div class='add'>+	;; Return immediately if the dividend is zero.	Setting B4 to 1</div><div class='add'>+	;; is a trick to allow us to leave the following insns in the jump</div><div class='add'>+	;; delay slot without affecting the result.</div><div class='add'>+	mv	.s2x	A4, B1</div><div class='add'>+</div><div class='add'>+  [b1]	lmbd	.l2	1, B4, B1</div><div class='add'>+||[!b1] b	.s2	B3	; RETURN A</div><div class='add'>+||[!b1] mvk	.d2	1, B4</div><div class='add'>+</div><div class='add'>+||[!b1] zero	.s1	A5</div><div class='add'>+	mv	.l1x	B1, A6</div><div class='add'>+||	shl	.s2	B4, B1, B4</div><div class='add'>+</div><div class='add'>+	;; The loop performs a maximum of 28 steps, so we do the</div><div class='add'>+	;; first 3 here.</div><div class='add'>+	cmpltu	.l1x	A4, B4, A2</div><div class='add'>+  [!A2]	sub	.l1x	A4, B4, A4</div><div class='add'>+||	shru	.s2	B4, 1, B4</div><div class='add'>+||	xor	.s1	1, A2, A2</div><div class='add'>+</div><div class='add'>+	shl	.s1	A2, 31, A2</div><div class='add'>+|| [b1]	subc	.l1x	A4,B4,A4</div><div class='add'>+|| [b1]	add	.s2	-1, B1, B1</div><div class='add'>+   [b1]	subc	.l1x	A4,B4,A4</div><div class='add'>+|| [b1]	add	.s2	-1, B1, B1</div><div class='add'>+</div><div class='add'>+	;; RETURN A may happen here (note: must happen before the next branch)</div><div class='add'>+__divremu0:</div><div class='add'>+	cmpgt	.l2	B1, 7, B0</div><div class='add'>+|| [b1]	subc	.l1x	A4,B4,A4</div><div class='add'>+|| [b1]	add	.s2	-1, B1, B1</div><div class='add'>+   [b1]	subc	.l1x	A4,B4,A4</div><div class='add'>+|| [b1]	add	.s2	-1, B1, B1</div><div class='add'>+|| [b0] b	.s1	__divremu0</div><div class='add'>+   [b1]	subc	.l1x	A4,B4,A4</div><div class='add'>+|| [b1]	add	.s2	-1, B1, B1</div><div class='add'>+   [b1]	subc	.l1x	A4,B4,A4</div><div class='add'>+|| [b1]	add	.s2	-1, B1, B1</div><div class='add'>+   [b1]	subc	.l1x	A4,B4,A4</div><div class='add'>+|| [b1]	add	.s2	-1, B1, B1</div><div class='add'>+   [b1]	subc	.l1x	A4,B4,A4</div><div class='add'>+|| [b1]	add	.s2	-1, B1, B1</div><div class='add'>+   [b1]	subc	.l1x	A4,B4,A4</div><div class='add'>+|| [b1]	add	.s2	-1, B1, B1</div><div class='add'>+	;; loop backwards branch happens here</div><div class='add'>+</div><div class='add'>+	ret	.s2	B3</div><div class='add'>+||	mvk	.s1	32, A1</div><div class='add'>+	sub	.l1	A1, A6, A6</div><div class='add'>+||	extu	.s1	A4, A6, A5</div><div class='add'>+	shl	.s1	A4, A6, A4</div><div class='add'>+	shru	.s1	A4, 1, A4</div><div class='add'>+||	sub	.l1	A6, 1, A6</div><div class='add'>+	or	.l1	A2, A4, A4</div><div class='add'>+	shru	.s1	A4, A6, A4</div><div class='add'>+	nop</div><div class='add'>+ENDPROC(__c6xabi_divremu)</div><div class='head'>diff --git a/arch/c6x/lib/divu.S b/arch/c6x/lib/divu.S<br/>new file mode 100644<br/>index 000000000000..64af3c006dd3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/divu.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/divu.S</a></div><div class='hunk'>@@ -0,0 +1,98 @@</div><div class='add'>+;;  Copyright 2010  Free Software Foundation, Inc.</div><div class='add'>+;;  Contributed by Bernd Schmidt &lt;bernds@codesourcery.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'>+;; This program is distributed in the hope that it will be useful,</div><div class='add'>+;; but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+;; GNU General Public License for more details.</div><div class='add'>+;;</div><div class='add'>+;; You should have received a copy of the GNU General Public License</div><div class='add'>+;; along with this program; if not, write to the Free Software</div><div class='add'>+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+	;; ABI considerations for the divide functions</div><div class='add'>+	;; The following registers are call-used:</div><div class='add'>+	;; __c6xabi_divi A0,A1,A2,A4,A6,B0,B1,B2,B4,B5</div><div class='add'>+	;; __c6xabi_divu A0,A1,A2,A4,A6,B0,B1,B2,B4</div><div class='add'>+	;; __c6xabi_remi A1,A2,A4,A5,A6,B0,B1,B2,B4</div><div class='add'>+	;; __c6xabi_remu A1,A4,A5,A7,B0,B1,B2,B4</div><div class='add'>+	;;</div><div class='add'>+	;; In our implementation, divu and remu are leaf functions,</div><div class='add'>+	;; while both divi and remi call into divu.</div><div class='add'>+	;; A0 is not clobbered by any of the functions.</div><div class='add'>+	;; divu does not clobber B2 either, which is taken advantage of</div><div class='add'>+	;; in remi.</div><div class='add'>+	;; divi uses B5 to hold the original return address during</div><div class='add'>+	;; the call to divu.</div><div class='add'>+	;; remi uses B2 and A5 to hold the input values during the</div><div class='add'>+	;; call to divu.  It stores B3 in on the stack.</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+ENTRY(__c6xabi_divu)</div><div class='add'>+	;; We use a series of up to 31 subc instructions.  First, we find</div><div class='add'>+	;; out how many leading zero bits there are in the divisor.  This</div><div class='add'>+	;; gives us both a shift count for aligning (shifting) the divisor</div><div class='add'>+	;; to the, and the number of times we have to execute subc.</div><div class='add'>+</div><div class='add'>+	;; At the end, we have both the remainder and most of the quotient</div><div class='add'>+	;; in A4.  The top bit of the quotient is computed first and is</div><div class='add'>+	;; placed in A2.</div><div class='add'>+</div><div class='add'>+	;; Return immediately if the dividend is zero.</div><div class='add'>+	 mv	.s2x	A4, B1</div><div class='add'>+   [B1]	 lmbd	.l2	1, B4, B1</div><div class='add'>+|| [!B1] b	.s2	B3	; RETURN A</div><div class='add'>+|| [!B1] mvk	.d2	1, B4</div><div class='add'>+	 mv	.l1x	B1, A6</div><div class='add'>+||	 shl	.s2	B4, B1, B4</div><div class='add'>+</div><div class='add'>+	;; The loop performs a maximum of 28 steps, so we do the</div><div class='add'>+	;; first 3 here.</div><div class='add'>+	 cmpltu	.l1x	A4, B4, A2</div><div class='add'>+   [!A2] sub	.l1x	A4, B4, A4</div><div class='add'>+||	 shru	.s2	B4, 1, B4</div><div class='add'>+||	 xor	.s1	1, A2, A2</div><div class='add'>+</div><div class='add'>+	 shl	.s1	A2, 31, A2</div><div class='add'>+|| [B1]	 subc	.l1x	A4,B4,A4</div><div class='add'>+|| [B1]	 add	.s2	-1, B1, B1</div><div class='add'>+   [B1]	 subc	.l1x	A4,B4,A4</div><div class='add'>+|| [B1]	 add	.s2	-1, B1, B1</div><div class='add'>+</div><div class='add'>+	;; RETURN A may happen here (note: must happen before the next branch)</div><div class='add'>+_divu_loop:</div><div class='add'>+	 cmpgt	.l2	B1, 7, B0</div><div class='add'>+|| [B1]	 subc	.l1x	A4,B4,A4</div><div class='add'>+|| [B1]	 add	.s2	-1, B1, B1</div><div class='add'>+   [B1]	 subc	.l1x	A4,B4,A4</div><div class='add'>+|| [B1]	 add	.s2	-1, B1, B1</div><div class='add'>+|| [B0]  b	.s1	_divu_loop</div><div class='add'>+   [B1]	 subc	.l1x	A4,B4,A4</div><div class='add'>+|| [B1]	 add	.s2	-1, B1, B1</div><div class='add'>+   [B1]	 subc	.l1x	A4,B4,A4</div><div class='add'>+|| [B1]	 add	.s2	-1, B1, B1</div><div class='add'>+   [B1]	 subc	.l1x	A4,B4,A4</div><div class='add'>+|| [B1]	 add	.s2	-1, B1, B1</div><div class='add'>+   [B1]	 subc	.l1x	A4,B4,A4</div><div class='add'>+|| [B1]	 add	.s2	-1, B1, B1</div><div class='add'>+   [B1]	 subc	.l1x	A4,B4,A4</div><div class='add'>+|| [B1]	 add	.s2	-1, B1, B1</div><div class='add'>+	;; loop backwards branch happens here</div><div class='add'>+</div><div class='add'>+	 ret	.s2	B3</div><div class='add'>+||	 mvk	.s1	32, A1</div><div class='add'>+	 sub	.l1	A1, A6, A6</div><div class='add'>+	 shl	.s1	A4, A6, A4</div><div class='add'>+	 shru	.s1	A4, 1, A4</div><div class='add'>+||	 sub	.l1	A6, 1, A6</div><div class='add'>+	 or	.l1	A2, A4, A4</div><div class='add'>+	 shru	.s1	A4, A6, A4</div><div class='add'>+	 nop</div><div class='add'>+ENDPROC(__c6xabi_divu)</div><div class='head'>diff --git a/arch/c6x/lib/llshl.S b/arch/c6x/lib/llshl.S<br/>new file mode 100644<br/>index 000000000000..7b105e2d1b78<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/llshl.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/llshl.S</a></div><div class='hunk'>@@ -0,0 +1,37 @@</div><div class='add'>+;;  Copyright (C) 2010 Texas Instruments Incorporated</div><div class='add'>+;;  Contributed by Mark Salter &lt;msalter@redhat.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'>+;; This program is distributed in the hope that it will be useful,</div><div class='add'>+;; but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+;; GNU General Public License for more details.</div><div class='add'>+;;</div><div class='add'>+;; You should have received a copy of the GNU General Public License</div><div class='add'>+;; along with this program; if not, write to the Free Software</div><div class='add'>+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+</div><div class='add'>+;;  uint64_t __c6xabi_llshl(uint64_t val, uint shift)</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+ENTRY(__c6xabi_llshl)</div><div class='add'>+	 mv	.l1x	B4,A1</div><div class='add'>+   [!A1] b	.s2	B3		; just return if zero shift</div><div class='add'>+	 mvk	.s1	32,A0</div><div class='add'>+	 sub	.d1	A0,A1,A0</div><div class='add'>+	 cmplt	.l1	0,A0,A2</div><div class='add'>+   [A2]	 shru	.s1	A4,A0,A0</div><div class='add'>+   [!A2] neg	.l1	A0,A5</div><div class='add'>+|| [A2]  shl	.s1	A5,A1,A5</div><div class='add'>+   [!A2] shl	.s1	A4,A5,A5</div><div class='add'>+|| [A2]  or	.d1	A5,A0,A5</div><div class='add'>+|| [!A2] mvk	.l1	0,A4</div><div class='add'>+   [A2]	 shl	.s1	A4,A1,A4</div><div class='add'>+	 bnop	.s2	B3,5</div><div class='add'>+ENDPROC(__c6xabi_llshl)</div><div class='head'>diff --git a/arch/c6x/lib/llshr.S b/arch/c6x/lib/llshr.S<br/>new file mode 100644<br/>index 000000000000..fde1bec7cf5a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/llshr.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/llshr.S</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+;;  Copyright (C) 2010 Texas Instruments Incorporated</div><div class='add'>+;;  Contributed by Mark Salter &lt;msalter@redhat.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'>+;; This program is distributed in the hope that it will be useful,</div><div class='add'>+;; but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+;; GNU General Public License for more details.</div><div class='add'>+;;</div><div class='add'>+;; You should have received a copy of the GNU General Public License</div><div class='add'>+;; along with this program; if not, write to the Free Software</div><div class='add'>+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+</div><div class='add'>+;;  uint64_t __c6xabi_llshr(uint64_t val, uint shift)</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+ENTRY(__c6xabi_llshr)</div><div class='add'>+	 mv	.l1x	B4,A1</div><div class='add'>+   [!A1] b	.s2	B3		; return if zero shift count</div><div class='add'>+	 mvk	.s1	32,A0</div><div class='add'>+	 sub	.d1	A0,A1,A0</div><div class='add'>+	 cmplt	.l1	0,A0,A2</div><div class='add'>+   [A2]  shl	.s1	A5,A0,A0</div><div class='add'>+	 nop</div><div class='add'>+   [!A2] neg	.l1	A0,A4</div><div class='add'>+|| [A2]  shru	.s1	A4,A1,A4</div><div class='add'>+   [!A2] shr	.s1	A5,A4,A4</div><div class='add'>+|| [A2]  or	.d1	A4,A0,A4</div><div class='add'>+   [!A2] shr	.s1	A5,0x1f,A5</div><div class='add'>+   [A2]  shr	.s1	A5,A1,A5</div><div class='add'>+	 bnop	.s2	B3,5</div><div class='add'>+ENDPROC(__c6xabi_llshr)</div><div class='head'>diff --git a/arch/c6x/lib/llshru.S b/arch/c6x/lib/llshru.S<br/>new file mode 100644<br/>index 000000000000..596ae3ff5c0f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/llshru.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/llshru.S</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+;;  Copyright (C) 2010 Texas Instruments Incorporated</div><div class='add'>+;;  Contributed by Mark Salter &lt;msalter@redhat.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'>+;; This program is distributed in the hope that it will be useful,</div><div class='add'>+;; but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+;; GNU General Public License for more details.</div><div class='add'>+;;</div><div class='add'>+;; You should have received a copy of the GNU General Public License</div><div class='add'>+;; along with this program; if not, write to the Free Software</div><div class='add'>+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+</div><div class='add'>+;;  uint64_t __c6xabi_llshru(uint64_t val, uint shift)</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+ENTRY(__c6xabi_llshru)</div><div class='add'>+	 mv	.l1x	B4,A1</div><div class='add'>+   [!A1] b	.s2	B3		; return if zero shift count</div><div class='add'>+	 mvk	.s1	32,A0</div><div class='add'>+	 sub	.d1	A0,A1,A0</div><div class='add'>+	 cmplt	.l1	0,A0,A2</div><div class='add'>+   [A2]  shl	.s1	A5,A0,A0</div><div class='add'>+	 nop</div><div class='add'>+   [!A2] neg	.l1	A0,A4</div><div class='add'>+|| [A2]  shru	.s1	A4,A1,A4</div><div class='add'>+   [!A2] shru	.s1	A5,A4,A4</div><div class='add'>+|| [A2]  or	.d1	A4,A0,A4</div><div class='add'>+|| [!A2] mvk	.l1	0,A5</div><div class='add'>+   [A2]  shru	.s1	A5,A1,A5</div><div class='add'>+	 bnop	.s2	B3,5</div><div class='add'>+ENDPROC(__c6xabi_llshru)</div><div class='head'>diff --git a/arch/c6x/lib/memcpy_64plus.S b/arch/c6x/lib/memcpy_64plus.S<br/>new file mode 100644<br/>index 000000000000..0bbc2cbf9318<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/memcpy_64plus.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/memcpy_64plus.S</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+;  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+;</div><div class='add'>+;  Copyright (C) 2006, 2009, 2010 Texas Instruments Incorporated</div><div class='add'>+;  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+;  published by the Free Software Foundation.</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'>+	.text</div><div class='add'>+</div><div class='add'>+ENTRY(memcpy)</div><div class='add'>+	AND	.L1	0x1,A6,A0</div><div class='add'>+ ||	AND	.S1	0x2,A6,A1</div><div class='add'>+ ||	AND	.L2X	0x4,A6,B0</div><div class='add'>+ ||	MV	.D1	A4,A3</div><div class='add'>+ ||	MVC	.S2	ILC,B2</div><div class='add'>+</div><div class='add'>+   [A0] LDB	.D2T1	*B4++,A5</div><div class='add'>+   [A1] LDB	.D2T1	*B4++,A7</div><div class='add'>+   [A1] LDB	.D2T1	*B4++,A8</div><div class='add'>+   [B0] LDNW	.D2T1	*B4++,A9</div><div class='add'>+ ||	SHRU	.S2X	A6,0x3,B1</div><div class='add'>+  [!B1] BNOP	.S2	B3,1</div><div class='add'>+</div><div class='add'>+   [A0] STB	.D1T1	A5,*A3++</div><div class='add'>+ ||[B1] MVC	.S2	B1,ILC</div><div class='add'>+   [A1] STB	.D1T1	A7,*A3++</div><div class='add'>+   [A1] STB	.D1T1	A8,*A3++</div><div class='add'>+   [B0] STNW	.D1T1	A9,*A3++	; return when len &lt; 8</div><div class='add'>+</div><div class='add'>+	SPLOOP	2</div><div class='add'>+</div><div class='add'>+	LDNDW	.D2T1	*B4++,A9:A8</div><div class='add'>+	NOP	3</div><div class='add'>+</div><div class='add'>+	NOP</div><div class='add'>+	SPKERNEL	0,0</div><div class='add'>+ ||	STNDW	.D1T1	A9:A8,*A3++</div><div class='add'>+</div><div class='add'>+	BNOP	.S2	B3,4</div><div class='add'>+	MVC	.S2	B2,ILC</div><div class='add'>+ENDPROC(memcpy)</div><div class='head'>diff --git a/arch/c6x/lib/mpyll.S b/arch/c6x/lib/mpyll.S<br/>new file mode 100644<br/>index 000000000000..f1034418b4db<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/mpyll.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/mpyll.S</a></div><div class='hunk'>@@ -0,0 +1,49 @@</div><div class='add'>+;;  Copyright (C) 2010 Texas Instruments Incorporated</div><div class='add'>+;;  Contributed by Mark Salter &lt;msalter@redhat.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'>+;; This program is distributed in the hope that it will be useful,</div><div class='add'>+;; but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+;; GNU General Public License for more details.</div><div class='add'>+;;</div><div class='add'>+;; You should have received a copy of the GNU General Public License</div><div class='add'>+;; along with this program; if not, write to the Free Software</div><div class='add'>+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+	;; uint64_t __c6xabi_mpyll(uint64_t x, uint64_t y)</div><div class='add'>+	;;</div><div class='add'>+	;; 64x64 multiply</div><div class='add'>+	;; First compute partial results using 32-bit parts of x and y:</div><div class='add'>+	;;</div><div class='add'>+	;;   b63	 b32 b31	  b0</div><div class='add'>+	;;    -----------------------------</div><div class='add'>+	;;    |      1	    |	   0	  |</div><div class='add'>+	;;    -----------------------------</div><div class='add'>+	;;</div><div class='add'>+	;;   P0 = X0*Y0</div><div class='add'>+	;;   P1 = X0*Y1 + X1*Y0</div><div class='add'>+	;;   P2 = X1*Y1</div><div class='add'>+	;;</div><div class='add'>+	;;   result = (P2 &lt;&lt; 64) + (P1 &lt;&lt; 32) + P0</div><div class='add'>+	;;</div><div class='add'>+	;; Since the result is also 64-bit, we can skip the P2 term.</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+ENTRY(__c6xabi_mpyll)</div><div class='add'>+	mpy32u	.m1x	A4,B4,A1:A0	; X0*Y0</div><div class='add'>+	b	.s2	B3</div><div class='add'>+ ||	mpy32u	.m2x	B5,A4,B1:B0	; X0*Y1 (don't need upper 32-bits)</div><div class='add'>+ ||	mpy32u	.m1x	A5,B4,A3:A2	; X1*Y0 (don't need upper 32-bits)</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	mv	.s1	A0,A4</div><div class='add'>+	add	.l1x	A2,B0,A5</div><div class='add'>+	add	.s1	A1,A5,A5</div><div class='add'>+ENDPROC(__c6xabi_mpyll)</div><div class='head'>diff --git a/arch/c6x/lib/negll.S b/arch/c6x/lib/negll.S<br/>new file mode 100644<br/>index 000000000000..82f4bcec9afb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/negll.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/negll.S</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+;;  Copyright (C) 2010 Texas Instruments Incorporated</div><div class='add'>+;;  Contributed by Mark Salter &lt;msalter@redhat.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'>+;; This program is distributed in the hope that it will be useful,</div><div class='add'>+;; but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+;; GNU General Public License for more details.</div><div class='add'>+;;</div><div class='add'>+;; You should have received a copy of the GNU General Public License</div><div class='add'>+;; along with this program; if not, write to the Free Software</div><div class='add'>+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+</div><div class='add'>+;;  int64_t __c6xabi_negll(int64_t val)</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+ENTRY(__c6xabi_negll)</div><div class='add'>+	b	.s2	B3</div><div class='add'>+	mvk	.l1	0,A0</div><div class='add'>+	subu	.l1	A0,A4,A3:A2</div><div class='add'>+	sub	.l1	A0,A5,A0</div><div class='add'>+||	ext	.s1	A3,24,24,A5</div><div class='add'>+	add	.l1	A5,A0,A5</div><div class='add'>+	mv	.s1	A2,A4</div><div class='add'>+ENDPROC(__c6xabi_negll)</div><div class='head'>diff --git a/arch/c6x/lib/pop_rts.S b/arch/c6x/lib/pop_rts.S<br/>new file mode 100644<br/>index 000000000000..d7d96c70e9e7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/pop_rts.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/pop_rts.S</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+;;  Copyright 2010  Free Software Foundation, Inc.</div><div class='add'>+;;  Contributed by Bernd Schmidt &lt;bernds@codesourcery.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'>+;; This program is distributed in the hope that it will be useful,</div><div class='add'>+;; but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+;; GNU General Public License for more details.</div><div class='add'>+;;</div><div class='add'>+;; You should have received a copy of the GNU General Public License</div><div class='add'>+;; along with this program; if not, write to the Free Software</div><div class='add'>+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+</div><div class='add'>+ENTRY(__c6xabi_pop_rts)</div><div class='add'>+	lddw	.d2t2	*++B15, B3:B2</div><div class='add'>+	lddw	.d2t1	*++B15, A11:A10</div><div class='add'>+	lddw	.d2t2	*++B15, B11:B10</div><div class='add'>+	lddw	.d2t1	*++B15, A13:A12</div><div class='add'>+	lddw	.d2t2	*++B15, B13:B12</div><div class='add'>+	lddw	.d2t1	*++B15, A15:A14</div><div class='add'>+||	b	.s2	B3</div><div class='add'>+	ldw	.d2t2	*++B15[2], B14</div><div class='add'>+	nop	4</div><div class='add'>+ENDPROC(__c6xabi_pop_rts)</div><div class='head'>diff --git a/arch/c6x/lib/push_rts.S b/arch/c6x/lib/push_rts.S<br/>new file mode 100644<br/>index 000000000000..f6e3db3b6065<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/push_rts.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/push_rts.S</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+;;  Copyright 2010  Free Software Foundation, Inc.</div><div class='add'>+;;  Contributed by Bernd Schmidt &lt;bernds@codesourcery.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'>+;; This program is distributed in the hope that it will be useful,</div><div class='add'>+;; but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+;; GNU General Public License for more details.</div><div class='add'>+;;</div><div class='add'>+;; You should have received a copy of the GNU General Public License</div><div class='add'>+;; along with this program; if not, write to the Free Software</div><div class='add'>+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+</div><div class='add'>+ENTRY(__c6xabi_push_rts)</div><div class='add'>+	stw	.d2t2	B14, *B15--[2]</div><div class='add'>+	stdw	.d2t1	A15:A14, *B15--</div><div class='add'>+||	b	.s2x	A3</div><div class='add'>+	stdw	.d2t2	B13:B12, *B15--</div><div class='add'>+	stdw	.d2t1	A13:A12, *B15--</div><div class='add'>+	stdw	.d2t2	B11:B10, *B15--</div><div class='add'>+	stdw	.d2t1	A11:A10, *B15--</div><div class='add'>+	stdw	.d2t2	B3:B2, *B15--</div><div class='add'>+ENDPROC(__c6xabi_push_rts)</div><div class='head'>diff --git a/arch/c6x/lib/remi.S b/arch/c6x/lib/remi.S<br/>new file mode 100644<br/>index 000000000000..6f2ca18c3f98<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/remi.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/remi.S</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+;;  Copyright 2010  Free Software Foundation, Inc.</div><div class='add'>+;;  Contributed by Bernd Schmidt &lt;bernds@codesourcery.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'>+;; This program is distributed in the hope that it will be useful,</div><div class='add'>+;; but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+;; GNU General Public License for more details.</div><div class='add'>+;;</div><div class='add'>+;; You should have received a copy of the GNU General Public License</div><div class='add'>+;; along with this program; if not, write to the Free Software</div><div class='add'>+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+	;; ABI considerations for the divide functions</div><div class='add'>+	;; The following registers are call-used:</div><div class='add'>+	;; __c6xabi_divi A0,A1,A2,A4,A6,B0,B1,B2,B4,B5</div><div class='add'>+	;; __c6xabi_divu A0,A1,A2,A4,A6,B0,B1,B2,B4</div><div class='add'>+	;; __c6xabi_remi A1,A2,A4,A5,A6,B0,B1,B2,B4</div><div class='add'>+	;; __c6xabi_remu A1,A4,A5,A7,B0,B1,B2,B4</div><div class='add'>+	;;</div><div class='add'>+	;; In our implementation, divu and remu are leaf functions,</div><div class='add'>+	;; while both divi and remi call into divu.</div><div class='add'>+	;; A0 is not clobbered by any of the functions.</div><div class='add'>+	;; divu does not clobber B2 either, which is taken advantage of</div><div class='add'>+	;; in remi.</div><div class='add'>+	;; divi uses B5 to hold the original return address during</div><div class='add'>+	;; the call to divu.</div><div class='add'>+	;; remi uses B2 and A5 to hold the input values during the</div><div class='add'>+	;; call to divu.  It stores B3 in on the stack.</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+</div><div class='add'>+ENTRY(__c6xabi_remi)</div><div class='add'>+	stw	.d2t2	B3, *B15--[2]</div><div class='add'>+||	cmpgt	.l1	0, A4, A1</div><div class='add'>+||	cmpgt	.l2	0, B4, B2</div><div class='add'>+||	mv	.s1	A4, A5</div><div class='add'>+||	call	.s2	__c6xabi_divu</div><div class='add'>+</div><div class='add'>+   [A1]	neg	.l1	A4, A4</div><div class='add'>+|| [B2]	neg	.l2	B4, B4</div><div class='add'>+||	xor	.s2x	B2, A1, B0</div><div class='add'>+||	mv	.d2	B4, B2</div><div class='add'>+</div><div class='add'>+   [B0]	addkpc	.s2	_divu_ret_1, B3, 1</div><div class='add'>+  [!B0] addkpc	.s2	_divu_ret_2, B3, 1</div><div class='add'>+	nop	2</div><div class='add'>+_divu_ret_1:</div><div class='add'>+	neg	.l1	A4, A4</div><div class='add'>+_divu_ret_2:</div><div class='add'>+	ldw	.d2t2	*++B15[2], B3</div><div class='add'>+</div><div class='add'>+	mpy32	.m1x	A4, B2, A6</div><div class='add'>+	nop		3</div><div class='add'>+	ret	.s2	B3</div><div class='add'>+	sub	.l1	A5, A6, A4</div><div class='add'>+	nop	4</div><div class='add'>+ENDPROC(__c6xabi_remi)</div><div class='head'>diff --git a/arch/c6x/lib/remu.S b/arch/c6x/lib/remu.S<br/>new file mode 100644<br/>index 000000000000..3fae719185ab<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/remu.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/remu.S</a></div><div class='hunk'>@@ -0,0 +1,82 @@</div><div class='add'>+;;  Copyright 2010  Free Software Foundation, Inc.</div><div class='add'>+;;  Contributed by Bernd Schmidt &lt;bernds@codesourcery.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'>+;; This program is distributed in the hope that it will be useful,</div><div class='add'>+;; but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+;; GNU General Public License for more details.</div><div class='add'>+;;</div><div class='add'>+;; You should have received a copy of the GNU General Public License</div><div class='add'>+;; along with this program; if not, write to the Free Software</div><div class='add'>+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+	;; ABI considerations for the divide functions</div><div class='add'>+	;; The following registers are call-used:</div><div class='add'>+	;; __c6xabi_divi A0,A1,A2,A4,A6,B0,B1,B2,B4,B5</div><div class='add'>+	;; __c6xabi_divu A0,A1,A2,A4,A6,B0,B1,B2,B4</div><div class='add'>+	;; __c6xabi_remi A1,A2,A4,A5,A6,B0,B1,B2,B4</div><div class='add'>+	;; __c6xabi_remu A1,A4,A5,A7,B0,B1,B2,B4</div><div class='add'>+	;;</div><div class='add'>+	;; In our implementation, divu and remu are leaf functions,</div><div class='add'>+	;; while both divi and remi call into divu.</div><div class='add'>+	;; A0 is not clobbered by any of the functions.</div><div class='add'>+	;; divu does not clobber B2 either, which is taken advantage of</div><div class='add'>+	;; in remi.</div><div class='add'>+	;; divi uses B5 to hold the original return address during</div><div class='add'>+	;; the call to divu.</div><div class='add'>+	;; remi uses B2 and A5 to hold the input values during the</div><div class='add'>+	;; call to divu.  It stores B3 in on the stack.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+</div><div class='add'>+ENTRY(__c6xabi_remu)</div><div class='add'>+	;; The ABI seems designed to prevent these functions calling each other,</div><div class='add'>+	;; so we duplicate most of the divsi3 code here.</div><div class='add'>+	 mv	.s2x	A4, B1</div><div class='add'>+	 lmbd	.l2	1, B4, B1</div><div class='add'>+|| [!B1] b	.s2	B3	; RETURN A</div><div class='add'>+|| [!B1] mvk	.d2	1, B4</div><div class='add'>+</div><div class='add'>+	 mv	.l1x	B1, A7</div><div class='add'>+||	 shl	.s2	B4, B1, B4</div><div class='add'>+</div><div class='add'>+	 cmpltu	.l1x	A4, B4, A1</div><div class='add'>+   [!A1] sub	.l1x	A4, B4, A4</div><div class='add'>+	 shru	.s2	B4, 1, B4</div><div class='add'>+</div><div class='add'>+_remu_loop:</div><div class='add'>+	 cmpgt	.l2	B1, 7, B0</div><div class='add'>+|| [B1]	 subc	.l1x	A4,B4,A4</div><div class='add'>+|| [B1]	 add	.s2	-1, B1, B1</div><div class='add'>+	;; RETURN A may happen here (note: must happen before the next branch)</div><div class='add'>+   [B1]	 subc	.l1x	A4,B4,A4</div><div class='add'>+|| [B1]	 add	.s2	-1, B1, B1</div><div class='add'>+|| [B0]	 b	.s1	_remu_loop</div><div class='add'>+   [B1]	 subc	.l1x	A4,B4,A4</div><div class='add'>+|| [B1]	 add	.s2	-1, B1, B1</div><div class='add'>+   [B1]	 subc	.l1x	A4,B4,A4</div><div class='add'>+|| [B1]	 add	.s2	-1, B1, B1</div><div class='add'>+   [B1]	 subc	.l1x	A4,B4,A4</div><div class='add'>+|| [B1]	 add	.s2	-1, B1, B1</div><div class='add'>+   [B1]	 subc	.l1x	A4,B4,A4</div><div class='add'>+|| [B1]	 add	.s2	-1, B1, B1</div><div class='add'>+   [B1]	 subc	.l1x	A4,B4,A4</div><div class='add'>+|| [B1]	 add	.s2	-1, B1, B1</div><div class='add'>+	;; loop backwards branch happens here</div><div class='add'>+</div><div class='add'>+	 ret	.s2	B3</div><div class='add'>+   [B1]	 subc	.l1x	A4,B4,A4</div><div class='add'>+|| [B1]	 add	.s2	-1, B1, B1</div><div class='add'>+   [B1]	 subc	.l1x	A4,B4,A4</div><div class='add'>+</div><div class='add'>+	 extu	.s1	A4, A7, A4</div><div class='add'>+	 nop	2</div><div class='add'>+ENDPROC(__c6xabi_remu)</div><div class='head'>diff --git a/arch/c6x/lib/strasgi.S b/arch/c6x/lib/strasgi.S<br/>new file mode 100644<br/>index 000000000000..de2740765536<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/strasgi.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/strasgi.S</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+;;  Copyright 2010  Free Software Foundation, Inc.</div><div class='add'>+;;  Contributed by Bernd Schmidt &lt;bernds@codesourcery.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'>+;; This program is distributed in the hope that it will be useful,</div><div class='add'>+;; but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+;; GNU General Public License for more details.</div><div class='add'>+;;</div><div class='add'>+;; You should have received a copy of the GNU General Public License</div><div class='add'>+;; along with this program; if not, write to the Free Software</div><div class='add'>+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+</div><div class='add'>+ENTRY(__c6xabi_strasgi)</div><div class='add'>+	;; This is essentially memcpy, with alignment known to be at least</div><div class='add'>+	;; 4, and the size a multiple of 4 greater than or equal to 28.</div><div class='add'>+	 ldw	.d2t1	*B4++, A0</div><div class='add'>+||	 mvk	.s2	16, B1</div><div class='add'>+	 ldw	.d2t1	*B4++, A1</div><div class='add'>+||	 mvk	.s2	20, B2</div><div class='add'>+||	 sub	.d1	A6, 24, A6</div><div class='add'>+	 ldw	.d2t1	*B4++, A5</div><div class='add'>+	 ldw	.d2t1	*B4++, A7</div><div class='add'>+||	 mv	.l2x	A6, B7</div><div class='add'>+	 ldw	.d2t1	*B4++, A8</div><div class='add'>+	 ldw	.d2t1	*B4++, A9</div><div class='add'>+||	 mv	.s2x	A0, B5</div><div class='add'>+||	 cmpltu	.l2	B2, B7, B0</div><div class='add'>+</div><div class='add'>+_strasgi_loop:</div><div class='add'>+	 stw	.d1t2	B5, *A4++</div><div class='add'>+|| [B0]	 ldw	.d2t1	*B4++, A0</div><div class='add'>+||	 mv	.s2x	A1, B5</div><div class='add'>+||	 mv	.l2	B7, B6</div><div class='add'>+</div><div class='add'>+   [B0]	 sub	.d2	B6, 24, B7</div><div class='add'>+|| [B0]	 b	.s2	_strasgi_loop</div><div class='add'>+||	 cmpltu	.l2	B1, B6, B0</div><div class='add'>+</div><div class='add'>+   [B0]	 ldw	.d2t1	*B4++, A1</div><div class='add'>+||	 stw	.d1t2	B5, *A4++</div><div class='add'>+||	 mv	.s2x	A5, B5</div><div class='add'>+||	 cmpltu	.l2	12, B6, B0</div><div class='add'>+</div><div class='add'>+   [B0]	 ldw	.d2t1	*B4++, A5</div><div class='add'>+||	 stw	.d1t2	B5, *A4++</div><div class='add'>+||	 mv	.s2x	A7, B5</div><div class='add'>+||	 cmpltu	.l2	8, B6, B0</div><div class='add'>+</div><div class='add'>+   [B0]	 ldw	.d2t1	*B4++, A7</div><div class='add'>+||	 stw	.d1t2	B5, *A4++</div><div class='add'>+||	 mv	.s2x	A8, B5</div><div class='add'>+||	 cmpltu	.l2	4, B6, B0</div><div class='add'>+</div><div class='add'>+   [B0]	 ldw	.d2t1	*B4++, A8</div><div class='add'>+||	 stw	.d1t2	B5, *A4++</div><div class='add'>+||	 mv	.s2x	A9, B5</div><div class='add'>+||	 cmpltu	.l2	0, B6, B0</div><div class='add'>+</div><div class='add'>+   [B0]	 ldw	.d2t1	*B4++, A9</div><div class='add'>+||	 stw	.d1t2	B5, *A4++</div><div class='add'>+||	 mv	.s2x	A0, B5</div><div class='add'>+||	 cmpltu	.l2	B2, B7, B0</div><div class='add'>+</div><div class='add'>+	;; loop back branch happens here</div><div class='add'>+</div><div class='add'>+	 cmpltu	.l2	B1, B6, B0</div><div class='add'>+||	 ret	.s2	b3</div><div class='add'>+</div><div class='add'>+   [B0]	 stw	.d1t1	A1, *A4++</div><div class='add'>+||	 cmpltu	.l2	12, B6, B0</div><div class='add'>+   [B0]	 stw	.d1t1	A5, *A4++</div><div class='add'>+||	 cmpltu	.l2	8, B6, B0</div><div class='add'>+   [B0]	 stw	.d1t1	A7, *A4++</div><div class='add'>+||	 cmpltu	.l2	4, B6, B0</div><div class='add'>+   [B0]	 stw	.d1t1	A8, *A4++</div><div class='add'>+||	 cmpltu	.l2	0, B6, B0</div><div class='add'>+   [B0]	 stw	.d1t1	A9, *A4++</div><div class='add'>+</div><div class='add'>+	;; return happens here</div><div class='add'>+ENDPROC(__c6xabi_strasgi)</div><div class='head'>diff --git a/arch/c6x/lib/strasgi_64plus.S b/arch/c6x/lib/strasgi_64plus.S<br/>new file mode 100644<br/>index 000000000000..c9fd159b5fa2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/lib/strasgi_64plus.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/lib/strasgi_64plus.S</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+;;  Copyright 2010  Free Software Foundation, Inc.</div><div class='add'>+;;  Contributed by Bernd Schmidt &lt;bernds@codesourcery.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'>+;; This program is distributed in the hope that it will be useful,</div><div class='add'>+;; but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+;; GNU General Public License for more details.</div><div class='add'>+;;</div><div class='add'>+;; You should have received a copy of the GNU General Public License</div><div class='add'>+;; along with this program; if not, write to the Free Software</div><div class='add'>+;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+</div><div class='add'>+ENTRY(__c6xabi_strasgi_64plus)</div><div class='add'>+	shru	.s2x	a6, 2, b31</div><div class='add'>+||	mv	.s1	a4, a30</div><div class='add'>+||	mv	.d2	b4, b30</div><div class='add'>+</div><div class='add'>+	add	.s2	-4, b31, b31</div><div class='add'>+</div><div class='add'>+	sploopd		1</div><div class='add'>+||	mvc	.s2	b31, ilc</div><div class='add'>+	ldw	.d2t2	*b30++, b31</div><div class='add'>+	nop	4</div><div class='add'>+	mv	.s1x	b31,a31</div><div class='add'>+	spkernel	6, 0</div><div class='add'>+||	stw	.d1t1	a31, *a30++</div><div class='add'>+</div><div class='add'>+	ret	.s2	b3</div><div class='add'>+	nop 5</div><div class='add'>+ENDPROC(__c6xabi_strasgi_64plus)</div><div class='head'>diff --git a/arch/c6x/mm/Makefile b/arch/c6x/mm/Makefile<br/>new file mode 100644<br/>index 000000000000..136a97576c61<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/mm/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/mm/Makefile</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for the linux c6x-specific parts of the memory manager.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-y := init.o dma-coherent.o</div><div class='head'>diff --git a/arch/c6x/mm/dma-coherent.c b/arch/c6x/mm/dma-coherent.c<br/>new file mode 100644<br/>index 000000000000..4187e5180373<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/mm/dma-coherent.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/mm/dma-coherent.c</a></div><div class='hunk'>@@ -0,0 +1,143 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot &lt;aurelien.jacquiot@ti.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *  DMA uncached mapping support.</div><div class='add'>+ *</div><div class='add'>+ *  Using code pulled from ARM</div><div class='add'>+ *  Copyright (C) 2000-2004 Russell King</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/bitmap.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/memblock.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * DMA coherent memory management, can be redefined using the memdma=</div><div class='add'>+ * kernel command line</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* none by default */</div><div class='add'>+static phys_addr_t dma_base;</div><div class='add'>+static u32 dma_size;</div><div class='add'>+static u32 dma_pages;</div><div class='add'>+</div><div class='add'>+static unsigned long *dma_bitmap;</div><div class='add'>+</div><div class='add'>+/* bitmap lock */</div><div class='add'>+static DEFINE_SPINLOCK(dma_lock);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Return a DMA coherent and contiguous memory chunk from the DMA memory</div><div class='add'>+ */</div><div class='add'>+static inline u32 __alloc_dma_pages(int order)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 pos;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dma_lock, flags);</div><div class='add'>+	pos = bitmap_find_free_region(dma_bitmap, dma_pages, order);</div><div class='add'>+	spin_unlock_irqrestore(&amp;dma_lock, flags);</div><div class='add'>+</div><div class='add'>+	return dma_base + (pos &lt;&lt; PAGE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __free_dma_pages(u32 addr, int order)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 pos = (addr - dma_base) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	if (addr &lt; dma_base || (pos + (1 &lt;&lt; order)) &gt;= dma_pages) {</div><div class='add'>+		printk(KERN_ERR "%s: freeing outside range.\n", __func__);</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dma_lock, flags);</div><div class='add'>+	bitmap_release_region(dma_bitmap, pos, order);</div><div class='add'>+	spin_unlock_irqrestore(&amp;dma_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate DMA coherent memory space and return both the kernel</div><div class='add'>+ * virtual and DMA address for that space.</div><div class='add'>+ */</div><div class='add'>+void *dma_alloc_coherent(struct device *dev, size_t size,</div><div class='add'>+			 dma_addr_t *handle, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	u32 paddr;</div><div class='add'>+	int order;</div><div class='add'>+</div><div class='add'>+	if (!dma_size || !size)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	order = get_count_order(((size - 1) &gt;&gt; PAGE_SHIFT) + 1);</div><div class='add'>+</div><div class='add'>+	paddr = __alloc_dma_pages(order);</div><div class='add'>+</div><div class='add'>+	if (handle)</div><div class='add'>+		*handle = paddr;</div><div class='add'>+</div><div class='add'>+	if (!paddr)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return phys_to_virt(paddr);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_alloc_coherent);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Free DMA coherent memory as defined by the above mapping.</div><div class='add'>+ */</div><div class='add'>+void dma_free_coherent(struct device *dev, size_t size, void *vaddr,</div><div class='add'>+		       dma_addr_t dma_handle)</div><div class='add'>+{</div><div class='add'>+	int order;</div><div class='add'>+</div><div class='add'>+	if (!dma_size || !size)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	order = get_count_order(((size - 1) &gt;&gt; PAGE_SHIFT) + 1);</div><div class='add'>+</div><div class='add'>+	__free_dma_pages(virt_to_phys(vaddr), order);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_free_coherent);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialise the coherent DMA memory allocator using the given uncached region.</div><div class='add'>+ */</div><div class='add'>+void __init coherent_mem_init(phys_addr_t start, u32 size)</div><div class='add'>+{</div><div class='add'>+	phys_addr_t bitmap_phys;</div><div class='add'>+</div><div class='add'>+	if (!size)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO</div><div class='add'>+	       "Coherent memory (DMA) region start=0x%x size=0x%x\n",</div><div class='add'>+	       start, size);</div><div class='add'>+</div><div class='add'>+	dma_base = start;</div><div class='add'>+	dma_size = size;</div><div class='add'>+</div><div class='add'>+	/* allocate bitmap */</div><div class='add'>+	dma_pages = dma_size &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	if (dma_size &amp; (PAGE_SIZE - 1))</div><div class='add'>+		++dma_pages;</div><div class='add'>+</div><div class='add'>+	bitmap_phys = memblock_alloc(BITS_TO_LONGS(dma_pages) * sizeof(long),</div><div class='add'>+				     sizeof(long));</div><div class='add'>+</div><div class='add'>+	dma_bitmap = phys_to_virt(bitmap_phys);</div><div class='add'>+	memset(dma_bitmap, 0, dma_pages * PAGE_SIZE);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/c6x/mm/init.c b/arch/c6x/mm/init.c<br/>new file mode 100644<br/>index 000000000000..89395f09648a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/mm/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/mm/init.c</a></div><div class='hunk'>@@ -0,0 +1,113 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/swap.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/bootmem.h&gt;</div><div class='add'>+#ifdef CONFIG_BLK_DEV_RAM</div><div class='add'>+#include &lt;linux/blkdev.h&gt;</div><div class='add'>+#endif</div><div class='add'>+#include &lt;linux/initrd.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/sections.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ZERO_PAGE is a special page that is used for zero-initialized</div><div class='add'>+ * data and COW.</div><div class='add'>+ */</div><div class='add'>+unsigned long empty_zero_page;</div><div class='add'>+EXPORT_SYMBOL(empty_zero_page);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * paging_init() continues the virtual memory environment setup which</div><div class='add'>+ * was begun by the code in arch/head.S.</div><div class='add'>+ * The parameters are pointers to where to stick the starting and ending</div><div class='add'>+ * addresses  of available kernel virtual memory.</div><div class='add'>+ */</div><div class='add'>+void __init paging_init(void)</div><div class='add'>+{</div><div class='add'>+	struct pglist_data *pgdat = NODE_DATA(0);</div><div class='add'>+	unsigned long zones_size[MAX_NR_ZONES] = {0, };</div><div class='add'>+</div><div class='add'>+	empty_zero_page      = (unsigned long) alloc_bootmem_pages(PAGE_SIZE);</div><div class='add'>+	memset((void *)empty_zero_page, 0, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set up user data space</div><div class='add'>+	 */</div><div class='add'>+	set_fs(KERNEL_DS);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Define zones</div><div class='add'>+	 */</div><div class='add'>+	zones_size[ZONE_NORMAL] = (memory_end - PAGE_OFFSET) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	pgdat-&gt;node_zones[ZONE_NORMAL].zone_start_pfn =</div><div class='add'>+		__pa(PAGE_OFFSET) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	free_area_init(zones_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init mem_init(void)</div><div class='add'>+{</div><div class='add'>+	int codek, datak;</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+	unsigned long len = memory_end - memory_start;</div><div class='add'>+</div><div class='add'>+	high_memory = (void *)(memory_end &amp; PAGE_MASK);</div><div class='add'>+</div><div class='add'>+	/* this will put all memory onto the freelists */</div><div class='add'>+	totalram_pages = free_all_bootmem();</div><div class='add'>+</div><div class='add'>+	codek = (_etext - _stext) &gt;&gt; 10;</div><div class='add'>+	datak = (_end - _sdata) &gt;&gt; 10;</div><div class='add'>+</div><div class='add'>+	tmp = nr_free_pages() &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	printk(KERN_INFO "Memory: %luk/%luk RAM (%dk kernel code, %dk data)\n",</div><div class='add'>+	       tmp &gt;&gt; 10, len &gt;&gt; 10, codek, datak);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BLK_DEV_INITRD</div><div class='add'>+void __init free_initrd_mem(unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	int pages = 0;</div><div class='add'>+	for (; start &lt; end; start += PAGE_SIZE) {</div><div class='add'>+		ClearPageReserved(virt_to_page(start));</div><div class='add'>+		init_page_count(virt_to_page(start));</div><div class='add'>+		free_page(start);</div><div class='add'>+		totalram_pages++;</div><div class='add'>+		pages++;</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_INFO "Freeing initrd memory: %luk freed\n",</div><div class='add'>+	       (pages * PAGE_SIZE) &gt;&gt; 10);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void __init free_initmem(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long addr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The following code should be cool even if these sections</div><div class='add'>+	 * are not page aligned.</div><div class='add'>+	 */</div><div class='add'>+	addr = PAGE_ALIGN((unsigned long)(__init_begin));</div><div class='add'>+</div><div class='add'>+	/* next to check that the page we free is not a partial page */</div><div class='add'>+	for (; addr + PAGE_SIZE &lt; (unsigned long)(__init_end);</div><div class='add'>+	     addr += PAGE_SIZE) {</div><div class='add'>+		ClearPageReserved(virt_to_page(addr));</div><div class='add'>+		init_page_count(virt_to_page(addr));</div><div class='add'>+		free_page(addr);</div><div class='add'>+		totalram_pages++;</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_INFO "Freeing unused kernel memory: %dK freed\n",</div><div class='add'>+	       (int) ((addr - PAGE_ALIGN((long) &amp;__init_begin)) &gt;&gt; 10));</div><div class='add'>+}</div><div class='head'>diff --git a/arch/c6x/platforms/Kconfig b/arch/c6x/platforms/Kconfig<br/>new file mode 100644<br/>index 000000000000..401ee678fd01<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/platforms/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/platforms/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+</div><div class='add'>+config SOC_TMS320C6455</div><div class='add'>+	bool "TMS320C6455"</div><div class='add'>+	default n</div><div class='add'>+</div><div class='add'>+config SOC_TMS320C6457</div><div class='add'>+	bool "TMS320C6457"</div><div class='add'>+	default n</div><div class='add'>+</div><div class='add'>+config SOC_TMS320C6472</div><div class='add'>+	bool "TMS320C6472"</div><div class='add'>+	default n</div><div class='add'>+</div><div class='add'>+config SOC_TMS320C6474</div><div class='add'>+	bool "TMS320C6474"</div><div class='add'>+	default n</div><div class='head'>diff --git a/arch/c6x/platforms/Makefile b/arch/c6x/platforms/Makefile<br/>new file mode 100644<br/>index 000000000000..9a95b9bca8d0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/platforms/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/platforms/Makefile</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for arch/c6x/platforms</div><div class='add'>+#</div><div class='add'>+# Copyright 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-y = platform.o cache.o megamod-pic.o pll.o plldata.o timer64.o</div><div class='add'>+obj-y += dscr.o</div><div class='add'>+</div><div class='add'>+# SoC objects</div><div class='add'>+obj-$(CONFIG_SOC_TMS320C6455)   += emif.o</div><div class='add'>+obj-$(CONFIG_SOC_TMS320C6457)   += emif.o</div><div class='head'>diff --git a/arch/c6x/platforms/cache.c b/arch/c6x/platforms/cache.c<br/>new file mode 100644<br/>index 000000000000..86318a16a252<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/platforms/cache.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/platforms/cache.c</a></div><div class='hunk'>@@ -0,0 +1,445 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</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/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cache.h&gt;</div><div class='add'>+#include &lt;asm/soc.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Internal Memory Control Registers for caches</div><div class='add'>+ */</div><div class='add'>+#define IMCR_CCFG	  0x0000</div><div class='add'>+#define IMCR_L1PCFG	  0x0020</div><div class='add'>+#define IMCR_L1PCC	  0x0024</div><div class='add'>+#define IMCR_L1DCFG	  0x0040</div><div class='add'>+#define IMCR_L1DCC	  0x0044</div><div class='add'>+#define IMCR_L2ALLOC0	  0x2000</div><div class='add'>+#define IMCR_L2ALLOC1	  0x2004</div><div class='add'>+#define IMCR_L2ALLOC2	  0x2008</div><div class='add'>+#define IMCR_L2ALLOC3	  0x200c</div><div class='add'>+#define IMCR_L2WBAR	  0x4000</div><div class='add'>+#define IMCR_L2WWC	  0x4004</div><div class='add'>+#define IMCR_L2WIBAR	  0x4010</div><div class='add'>+#define IMCR_L2WIWC	  0x4014</div><div class='add'>+#define IMCR_L2IBAR	  0x4018</div><div class='add'>+#define IMCR_L2IWC	  0x401c</div><div class='add'>+#define IMCR_L1PIBAR	  0x4020</div><div class='add'>+#define IMCR_L1PIWC	  0x4024</div><div class='add'>+#define IMCR_L1DWIBAR	  0x4030</div><div class='add'>+#define IMCR_L1DWIWC	  0x4034</div><div class='add'>+#define IMCR_L1DWBAR	  0x4040</div><div class='add'>+#define IMCR_L1DWWC	  0x4044</div><div class='add'>+#define IMCR_L1DIBAR	  0x4048</div><div class='add'>+#define IMCR_L1DIWC	  0x404c</div><div class='add'>+#define IMCR_L2WB	  0x5000</div><div class='add'>+#define IMCR_L2WBINV	  0x5004</div><div class='add'>+#define IMCR_L2INV	  0x5008</div><div class='add'>+#define IMCR_L1PINV	  0x5028</div><div class='add'>+#define IMCR_L1DWB	  0x5040</div><div class='add'>+#define IMCR_L1DWBINV	  0x5044</div><div class='add'>+#define IMCR_L1DINV	  0x5048</div><div class='add'>+#define IMCR_MAR_BASE	  0x8000</div><div class='add'>+#define IMCR_MAR96_111	  0x8180</div><div class='add'>+#define IMCR_MAR128_191   0x8200</div><div class='add'>+#define IMCR_MAR224_239   0x8380</div><div class='add'>+#define IMCR_L2MPFAR	  0xa000</div><div class='add'>+#define IMCR_L2MPFSR	  0xa004</div><div class='add'>+#define IMCR_L2MPFCR	  0xa008</div><div class='add'>+#define IMCR_L2MPLK0	  0xa100</div><div class='add'>+#define IMCR_L2MPLK1	  0xa104</div><div class='add'>+#define IMCR_L2MPLK2	  0xa108</div><div class='add'>+#define IMCR_L2MPLK3	  0xa10c</div><div class='add'>+#define IMCR_L2MPLKCMD	  0xa110</div><div class='add'>+#define IMCR_L2MPLKSTAT   0xa114</div><div class='add'>+#define IMCR_L2MPPA_BASE  0xa200</div><div class='add'>+#define IMCR_L1PMPFAR	  0xa400</div><div class='add'>+#define IMCR_L1PMPFSR	  0xa404</div><div class='add'>+#define IMCR_L1PMPFCR	  0xa408</div><div class='add'>+#define IMCR_L1PMPLK0	  0xa500</div><div class='add'>+#define IMCR_L1PMPLK1	  0xa504</div><div class='add'>+#define IMCR_L1PMPLK2	  0xa508</div><div class='add'>+#define IMCR_L1PMPLK3	  0xa50c</div><div class='add'>+#define IMCR_L1PMPLKCMD   0xa510</div><div class='add'>+#define IMCR_L1PMPLKSTAT  0xa514</div><div class='add'>+#define IMCR_L1PMPPA_BASE 0xa600</div><div class='add'>+#define IMCR_L1DMPFAR	  0xac00</div><div class='add'>+#define IMCR_L1DMPFSR	  0xac04</div><div class='add'>+#define IMCR_L1DMPFCR	  0xac08</div><div class='add'>+#define IMCR_L1DMPLK0	  0xad00</div><div class='add'>+#define IMCR_L1DMPLK1	  0xad04</div><div class='add'>+#define IMCR_L1DMPLK2	  0xad08</div><div class='add'>+#define IMCR_L1DMPLK3	  0xad0c</div><div class='add'>+#define IMCR_L1DMPLKCMD   0xad10</div><div class='add'>+#define IMCR_L1DMPLKSTAT  0xad14</div><div class='add'>+#define IMCR_L1DMPPA_BASE 0xae00</div><div class='add'>+#define IMCR_L2PDWAKE0	  0xc040</div><div class='add'>+#define IMCR_L2PDWAKE1	  0xc044</div><div class='add'>+#define IMCR_L2PDSLEEP0   0xc050</div><div class='add'>+#define IMCR_L2PDSLEEP1   0xc054</div><div class='add'>+#define IMCR_L2PDSTAT0	  0xc060</div><div class='add'>+#define IMCR_L2PDSTAT1	  0xc064</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CCFG register values and bits</div><div class='add'>+ */</div><div class='add'>+#define L2MODE_0K_CACHE   0x0</div><div class='add'>+#define L2MODE_32K_CACHE  0x1</div><div class='add'>+#define L2MODE_64K_CACHE  0x2</div><div class='add'>+#define L2MODE_128K_CACHE 0x3</div><div class='add'>+#define L2MODE_256K_CACHE 0x7</div><div class='add'>+</div><div class='add'>+#define L2PRIO_URGENT     0x0</div><div class='add'>+#define L2PRIO_HIGH       0x1</div><div class='add'>+#define L2PRIO_MEDIUM     0x2</div><div class='add'>+#define L2PRIO_LOW        0x3</div><div class='add'>+</div><div class='add'>+#define CCFG_ID           0x100   /* Invalidate L1P bit */</div><div class='add'>+#define CCFG_IP           0x200   /* Invalidate L1D bit */</div><div class='add'>+</div><div class='add'>+static void __iomem *cache_base;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * L1 &amp; L2 caches generic functions</div><div class='add'>+ */</div><div class='add'>+#define imcr_get(reg) soc_readl(cache_base + (reg))</div><div class='add'>+#define imcr_set(reg, value) \</div><div class='add'>+do {								\</div><div class='add'>+	soc_writel((value), cache_base + (reg));		\</div><div class='add'>+	soc_readl(cache_base + (reg));				\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+static void cache_block_operation_wait(unsigned int wc_reg)</div><div class='add'>+{</div><div class='add'>+	/* Wait for completion */</div><div class='add'>+	while (imcr_get(wc_reg))</div><div class='add'>+		cpu_relax();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(cache_lock);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generic function to perform a block cache operation as</div><div class='add'>+ * invalidate or writeback/invalidate</div><div class='add'>+ */</div><div class='add'>+static void cache_block_operation(unsigned int *start,</div><div class='add'>+				  unsigned int *end,</div><div class='add'>+				  unsigned int bar_reg,</div><div class='add'>+				  unsigned int wc_reg)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int wcnt =</div><div class='add'>+		(L2_CACHE_ALIGN_CNT((unsigned int) end)</div><div class='add'>+		 - L2_CACHE_ALIGN_LOW((unsigned int) start)) &gt;&gt; 2;</div><div class='add'>+	unsigned int wc = 0;</div><div class='add'>+</div><div class='add'>+	for (; wcnt; wcnt -= wc, start += wc) {</div><div class='add'>+loop:</div><div class='add'>+		spin_lock_irqsave(&amp;cache_lock, flags);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If another cache operation is occuring</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(imcr_get(wc_reg))) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;cache_lock, flags);</div><div class='add'>+</div><div class='add'>+			/* Wait for previous operation completion */</div><div class='add'>+			cache_block_operation_wait(wc_reg);</div><div class='add'>+</div><div class='add'>+			/* Try again */</div><div class='add'>+			goto loop;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		imcr_set(bar_reg, L2_CACHE_ALIGN_LOW((unsigned int) start));</div><div class='add'>+</div><div class='add'>+		if (wcnt &gt; 0xffff)</div><div class='add'>+			wc = 0xffff;</div><div class='add'>+		else</div><div class='add'>+			wc = wcnt;</div><div class='add'>+</div><div class='add'>+		/* Set word count value in the WC register */</div><div class='add'>+		imcr_set(wc_reg, wc &amp; 0xffff);</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;cache_lock, flags);</div><div class='add'>+</div><div class='add'>+		/* Wait for completion */</div><div class='add'>+		cache_block_operation_wait(wc_reg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cache_block_operation_nowait(unsigned int *start,</div><div class='add'>+					 unsigned int *end,</div><div class='add'>+					 unsigned int bar_reg,</div><div class='add'>+					 unsigned int wc_reg)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int wcnt =</div><div class='add'>+		(L2_CACHE_ALIGN_CNT((unsigned int) end)</div><div class='add'>+		 - L2_CACHE_ALIGN_LOW((unsigned int) start)) &gt;&gt; 2;</div><div class='add'>+	unsigned int wc = 0;</div><div class='add'>+</div><div class='add'>+	for (; wcnt; wcnt -= wc, start += wc) {</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;cache_lock, flags);</div><div class='add'>+</div><div class='add'>+		imcr_set(bar_reg, L2_CACHE_ALIGN_LOW((unsigned int) start));</div><div class='add'>+</div><div class='add'>+		if (wcnt &gt; 0xffff)</div><div class='add'>+			wc = 0xffff;</div><div class='add'>+		else</div><div class='add'>+			wc = wcnt;</div><div class='add'>+</div><div class='add'>+		/* Set word count value in the WC register */</div><div class='add'>+		imcr_set(wc_reg, wc &amp; 0xffff);</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;cache_lock, flags);</div><div class='add'>+</div><div class='add'>+		/* Don't wait for completion on last cache operation */</div><div class='add'>+		if (wcnt &gt; 0xffff)</div><div class='add'>+			cache_block_operation_wait(wc_reg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * L1 caches management</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Disable L1 caches</div><div class='add'>+ */</div><div class='add'>+void L1_cache_off(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int dummy;</div><div class='add'>+</div><div class='add'>+	imcr_set(IMCR_L1PCFG, 0);</div><div class='add'>+	dummy = imcr_get(IMCR_L1PCFG);</div><div class='add'>+</div><div class='add'>+	imcr_set(IMCR_L1DCFG, 0);</div><div class='add'>+	dummy = imcr_get(IMCR_L1DCFG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable L1 caches</div><div class='add'>+ */</div><div class='add'>+void L1_cache_on(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int dummy;</div><div class='add'>+</div><div class='add'>+	imcr_set(IMCR_L1PCFG, 7);</div><div class='add'>+	dummy = imcr_get(IMCR_L1PCFG);</div><div class='add'>+</div><div class='add'>+	imcr_set(IMCR_L1DCFG, 7);</div><div class='add'>+	dummy = imcr_get(IMCR_L1DCFG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  L1P global-invalidate all</div><div class='add'>+ */</div><div class='add'>+void L1P_cache_global_invalidate(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int set = 1;</div><div class='add'>+	imcr_set(IMCR_L1PINV, set);</div><div class='add'>+	while (imcr_get(IMCR_L1PINV) &amp; 1)</div><div class='add'>+		cpu_relax();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  L1D global-invalidate all</div><div class='add'>+ *</div><div class='add'>+ * Warning: this operation causes all updated data in L1D to</div><div class='add'>+ * be discarded rather than written back to the lower levels of</div><div class='add'>+ * memory</div><div class='add'>+ */</div><div class='add'>+void L1D_cache_global_invalidate(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int set = 1;</div><div class='add'>+	imcr_set(IMCR_L1DINV, set);</div><div class='add'>+	while (imcr_get(IMCR_L1DINV) &amp; 1)</div><div class='add'>+		cpu_relax();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void L1D_cache_global_writeback(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int set = 1;</div><div class='add'>+	imcr_set(IMCR_L1DWB, set);</div><div class='add'>+	while (imcr_get(IMCR_L1DWB) &amp; 1)</div><div class='add'>+		cpu_relax();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void L1D_cache_global_writeback_invalidate(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int set = 1;</div><div class='add'>+	imcr_set(IMCR_L1DWBINV, set);</div><div class='add'>+	while (imcr_get(IMCR_L1DWBINV) &amp; 1)</div><div class='add'>+		cpu_relax();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * L2 caches management</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set L2 operation mode</div><div class='add'>+ */</div><div class='add'>+void L2_cache_set_mode(unsigned int mode)</div><div class='add'>+{</div><div class='add'>+	unsigned int ccfg = imcr_get(IMCR_CCFG);</div><div class='add'>+</div><div class='add'>+	/* Clear and set the L2MODE bits in CCFG */</div><div class='add'>+	ccfg &amp;= ~7;</div><div class='add'>+	ccfg |= (mode &amp; 7);</div><div class='add'>+	imcr_set(IMCR_CCFG, ccfg);</div><div class='add'>+	ccfg = imcr_get(IMCR_CCFG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  L2 global-writeback and global-invalidate all</div><div class='add'>+ */</div><div class='add'>+void L2_cache_global_writeback_invalidate(void)</div><div class='add'>+{</div><div class='add'>+	imcr_set(IMCR_L2WBINV, 1);</div><div class='add'>+	while (imcr_get(IMCR_L2WBINV))</div><div class='add'>+		cpu_relax();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  L2 global-writeback all</div><div class='add'>+ */</div><div class='add'>+void L2_cache_global_writeback(void)</div><div class='add'>+{</div><div class='add'>+	imcr_set(IMCR_L2WB, 1);</div><div class='add'>+	while (imcr_get(IMCR_L2WB))</div><div class='add'>+		cpu_relax();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Cacheability controls</div><div class='add'>+ */</div><div class='add'>+void enable_caching(unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	unsigned int mar = IMCR_MAR_BASE + ((start &gt;&gt; 24) &lt;&lt; 2);</div><div class='add'>+	unsigned int mar_e = IMCR_MAR_BASE + ((end &gt;&gt; 24) &lt;&lt; 2);</div><div class='add'>+</div><div class='add'>+	for (; mar &lt;= mar_e; mar += 4)</div><div class='add'>+		imcr_set(mar, imcr_get(mar) | 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void disable_caching(unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	unsigned int mar = IMCR_MAR_BASE + ((start &gt;&gt; 24) &lt;&lt; 2);</div><div class='add'>+	unsigned int mar_e = IMCR_MAR_BASE + ((end &gt;&gt; 24) &lt;&lt; 2);</div><div class='add'>+</div><div class='add'>+	for (; mar &lt;= mar_e; mar += 4)</div><div class='add'>+		imcr_set(mar, imcr_get(mar) &amp; ~1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  L1 block operations</div><div class='add'>+ */</div><div class='add'>+void L1P_cache_block_invalidate(unsigned int start, unsigned int end)</div><div class='add'>+{</div><div class='add'>+	cache_block_operation((unsigned int *) start,</div><div class='add'>+			      (unsigned int *) end,</div><div class='add'>+			      IMCR_L1PIBAR, IMCR_L1PIWC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void L1D_cache_block_invalidate(unsigned int start, unsigned int end)</div><div class='add'>+{</div><div class='add'>+	cache_block_operation((unsigned int *) start,</div><div class='add'>+			      (unsigned int *) end,</div><div class='add'>+			      IMCR_L1DIBAR, IMCR_L1DIWC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void L1D_cache_block_writeback_invalidate(unsigned int start, unsigned int end)</div><div class='add'>+{</div><div class='add'>+	cache_block_operation((unsigned int *) start,</div><div class='add'>+			      (unsigned int *) end,</div><div class='add'>+			      IMCR_L1DWIBAR, IMCR_L1DWIWC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void L1D_cache_block_writeback(unsigned int start, unsigned int end)</div><div class='add'>+{</div><div class='add'>+	cache_block_operation((unsigned int *) start,</div><div class='add'>+			      (unsigned int *) end,</div><div class='add'>+			      IMCR_L1DWBAR, IMCR_L1DWWC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  L2 block operations</div><div class='add'>+ */</div><div class='add'>+void L2_cache_block_invalidate(unsigned int start, unsigned int end)</div><div class='add'>+{</div><div class='add'>+	cache_block_operation((unsigned int *) start,</div><div class='add'>+			      (unsigned int *) end,</div><div class='add'>+			      IMCR_L2IBAR, IMCR_L2IWC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void L2_cache_block_writeback(unsigned int start, unsigned int end)</div><div class='add'>+{</div><div class='add'>+	cache_block_operation((unsigned int *) start,</div><div class='add'>+			      (unsigned int *) end,</div><div class='add'>+			      IMCR_L2WBAR, IMCR_L2WWC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void L2_cache_block_writeback_invalidate(unsigned int start, unsigned int end)</div><div class='add'>+{</div><div class='add'>+	cache_block_operation((unsigned int *) start,</div><div class='add'>+			      (unsigned int *) end,</div><div class='add'>+			      IMCR_L2WIBAR, IMCR_L2WIWC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void L2_cache_block_invalidate_nowait(unsigned int start, unsigned int end)</div><div class='add'>+{</div><div class='add'>+	cache_block_operation_nowait((unsigned int *) start,</div><div class='add'>+				     (unsigned int *) end,</div><div class='add'>+				     IMCR_L2IBAR, IMCR_L2IWC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void L2_cache_block_writeback_nowait(unsigned int start, unsigned int end)</div><div class='add'>+{</div><div class='add'>+	cache_block_operation_nowait((unsigned int *) start,</div><div class='add'>+				     (unsigned int *) end,</div><div class='add'>+				     IMCR_L2WBAR, IMCR_L2WWC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void L2_cache_block_writeback_invalidate_nowait(unsigned int start,</div><div class='add'>+						unsigned int end)</div><div class='add'>+{</div><div class='add'>+	cache_block_operation_nowait((unsigned int *) start,</div><div class='add'>+				     (unsigned int *) end,</div><div class='add'>+				     IMCR_L2WIBAR, IMCR_L2WIWC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * L1 and L2 caches configuration</div><div class='add'>+ */</div><div class='add'>+void __init c6x_cache_init(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *node;</div><div class='add'>+</div><div class='add'>+	node = of_find_compatible_node(NULL, NULL, "ti,c64x+cache");</div><div class='add'>+	if (!node)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cache_base = of_iomap(node, 0);</div><div class='add'>+</div><div class='add'>+	of_node_put(node);</div><div class='add'>+</div><div class='add'>+	if (!cache_base)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Set L2 caches on the the whole L2 SRAM memory */</div><div class='add'>+	L2_cache_set_mode(L2MODE_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Enable L1 */</div><div class='add'>+	L1_cache_on();</div><div class='add'>+}</div><div class='head'>diff --git a/arch/c6x/platforms/dscr.c b/arch/c6x/platforms/dscr.c<br/>new file mode 100644<br/>index 000000000000..f848a65ee646<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/platforms/dscr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/platforms/dscr.c</a></div><div class='hunk'>@@ -0,0 +1,598 @@</div><div class='add'>+/*</div><div class='add'>+ *  Device State Control Registers driver</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The Device State Control Registers (DSCR) provide SoC level control over</div><div class='add'>+ * a number of peripherals. Details vary considerably among the various SoC</div><div class='add'>+ * parts. In general, the DSCR block will provide one or more configuration</div><div class='add'>+ * registers often protected by a lock register. One or more key values must</div><div class='add'>+ * be written to a lock register in order to unlock the configuration register.</div><div class='add'>+ * The configuration register may be used to enable (and disable in some</div><div class='add'>+ * cases) SoC pin drivers, peripheral clock sources (internal or pin), etc.</div><div class='add'>+ * In some cases, a configuration register is write once or the individual</div><div class='add'>+ * bits are write once. That is, you may be able to enable a device, but</div><div class='add'>+ * will not be able to disable it.</div><div class='add'>+ *</div><div class='add'>+ * In addition to device configuration, the DSCR block may provide registers</div><div class='add'>+ * which are used to reset SoC peripherals, provide device ID information,</div><div class='add'>+ * provide MAC addresses, and other miscellaneous functions.</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/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/module.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;asm/soc.h&gt;</div><div class='add'>+#include &lt;asm/dscr.h&gt;</div><div class='add'>+</div><div class='add'>+#define MAX_DEVSTATE_IDS   32</div><div class='add'>+#define MAX_DEVCTL_REGS     8</div><div class='add'>+#define MAX_DEVSTAT_REGS    8</div><div class='add'>+#define MAX_LOCKED_REGS     4</div><div class='add'>+#define MAX_SOC_EMACS       2</div><div class='add'>+</div><div class='add'>+struct rmii_reset_reg {</div><div class='add'>+	u32 reg;</div><div class='add'>+	u32 mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Some registerd may be locked. In order to write to these</div><div class='add'>+ * registers, the key value must first be written to the lockreg.</div><div class='add'>+ */</div><div class='add'>+struct locked_reg {</div><div class='add'>+	u32 reg;	/* offset from base */</div><div class='add'>+	u32 lockreg;	/* offset from base */</div><div class='add'>+	u32 key;	/* unlock key */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This describes a contiguous area of like control bits used to enable/disable</div><div class='add'>+ * SoC devices. Each controllable device is given an ID which is used by the</div><div class='add'>+ * individual device drivers to control the device state. These IDs start at</div><div class='add'>+ * zero and are assigned sequentially to the control bitfield ranges described</div><div class='add'>+ * by this structure.</div><div class='add'>+ */</div><div class='add'>+struct devstate_ctl_reg {</div><div class='add'>+	u32 reg;		/* register holding the control bits */</div><div class='add'>+	u8  start_id;		/* start id of this range */</div><div class='add'>+	u8  num_ids;		/* number of devices in this range */</div><div class='add'>+	u8  enable_only;	/* bits are write-once to enable only */</div><div class='add'>+	u8  enable;		/* value used to enable device */</div><div class='add'>+	u8  disable;		/* value used to disable device */</div><div class='add'>+	u8  shift;		/* starting (rightmost) bit in range */</div><div class='add'>+	u8  nbits;		/* number of bits per device */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This describes a region of status bits indicating the state of</div><div class='add'>+ * various devices. This is used internally to wait for status</div><div class='add'>+ * change completion when enabling/disabling a device. Status is</div><div class='add'>+ * optional and not all device controls will have a corresponding</div><div class='add'>+ * status.</div><div class='add'>+ */</div><div class='add'>+struct devstate_stat_reg {</div><div class='add'>+	u32 reg;		/* register holding the status bits */</div><div class='add'>+	u8  start_id;		/* start id of this range */</div><div class='add'>+	u8  num_ids;		/* number of devices in this range */</div><div class='add'>+	u8  enable;		/* value indicating enabled state */</div><div class='add'>+	u8  disable;		/* value indicating disabled state */</div><div class='add'>+	u8  shift;		/* starting (rightmost) bit in range */</div><div class='add'>+	u8  nbits;		/* number of bits per device */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct devstate_info {</div><div class='add'>+	struct devstate_ctl_reg *ctl;</div><div class='add'>+	struct devstate_stat_reg *stat;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* These are callbacks to SOC-specific code. */</div><div class='add'>+struct dscr_ops {</div><div class='add'>+	void (*init)(struct device_node *node);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dscr_regs {</div><div class='add'>+	spinlock_t		lock;</div><div class='add'>+	void __iomem		*base;</div><div class='add'>+	u32			kick_reg[2];</div><div class='add'>+	u32			kick_key[2];</div><div class='add'>+	struct locked_reg	locked[MAX_LOCKED_REGS];</div><div class='add'>+	struct devstate_info	devstate_info[MAX_DEVSTATE_IDS];</div><div class='add'>+	struct rmii_reset_reg   rmii_resets[MAX_SOC_EMACS];</div><div class='add'>+	struct devstate_ctl_reg devctl[MAX_DEVCTL_REGS];</div><div class='add'>+	struct devstate_stat_reg devstat[MAX_DEVSTAT_REGS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct dscr_regs	dscr;</div><div class='add'>+</div><div class='add'>+static struct locked_reg *find_locked_reg(u32 reg)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_LOCKED_REGS; i++)</div><div class='add'>+		if (dscr.locked[i].key &amp;&amp; reg == dscr.locked[i].reg)</div><div class='add'>+			return &amp;dscr.locked[i];</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write to a register with one lock</div><div class='add'>+ */</div><div class='add'>+static void dscr_write_locked1(u32 reg, u32 val,</div><div class='add'>+			       u32 lock, u32 key)</div><div class='add'>+{</div><div class='add'>+	void __iomem *reg_addr = dscr.base + reg;</div><div class='add'>+	void __iomem *lock_addr = dscr.base + lock;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For some registers, the lock is relocked after a short number</div><div class='add'>+	 * of cycles. We have to put the lock write and register write in</div><div class='add'>+	 * the same fetch packet to meet this timing. The .align ensures</div><div class='add'>+	 * the two stw instructions are in the same fetch packet.</div><div class='add'>+	 */</div><div class='add'>+	asm volatile ("b	.s2	0f\n"</div><div class='add'>+		      "nop	5\n"</div><div class='add'>+		      "    .align 5\n"</div><div class='add'>+		      "0:\n"</div><div class='add'>+		      "stw	.D1T2	%3,*%2\n"</div><div class='add'>+		      "stw	.D1T2	%1,*%0\n"</div><div class='add'>+		      :</div><div class='add'>+		      : "a"(reg_addr), "b"(val), "a"(lock_addr), "b"(key)</div><div class='add'>+		);</div><div class='add'>+</div><div class='add'>+	/* in case the hw doesn't reset the lock */</div><div class='add'>+	soc_writel(0, lock_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write to a register protected by two lock registers</div><div class='add'>+ */</div><div class='add'>+static void dscr_write_locked2(u32 reg, u32 val,</div><div class='add'>+			       u32 lock0, u32 key0,</div><div class='add'>+			       u32 lock1, u32 key1)</div><div class='add'>+{</div><div class='add'>+	soc_writel(key0, dscr.base + lock0);</div><div class='add'>+	soc_writel(key1, dscr.base + lock1);</div><div class='add'>+	soc_writel(val, dscr.base + reg);</div><div class='add'>+	soc_writel(0, dscr.base + lock0);</div><div class='add'>+	soc_writel(0, dscr.base + lock1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dscr_write(u32 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct locked_reg *lock;</div><div class='add'>+</div><div class='add'>+	lock = find_locked_reg(reg);</div><div class='add'>+	if (lock)</div><div class='add'>+		dscr_write_locked1(reg, val, lock-&gt;lockreg, lock-&gt;key);</div><div class='add'>+	else if (dscr.kick_key[0])</div><div class='add'>+		dscr_write_locked2(reg, val, dscr.kick_reg[0], dscr.kick_key[0],</div><div class='add'>+				   dscr.kick_reg[1], dscr.kick_key[1]);</div><div class='add'>+	else</div><div class='add'>+		soc_writel(val, dscr.base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Drivers can use this interface to enable/disable SoC IP blocks.</div><div class='add'>+ */</div><div class='add'>+void dscr_set_devstate(int id, enum dscr_devstate_t state)</div><div class='add'>+{</div><div class='add'>+	struct devstate_ctl_reg *ctl;</div><div class='add'>+	struct devstate_stat_reg *stat;</div><div class='add'>+	struct devstate_info *info;</div><div class='add'>+	u32 ctl_val, val;</div><div class='add'>+	int ctl_shift, ctl_mask;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!dscr.base)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (id &lt; 0 || id &gt;= MAX_DEVSTATE_IDS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	info = &amp;dscr.devstate_info[id];</div><div class='add'>+	ctl = info-&gt;ctl;</div><div class='add'>+	stat = info-&gt;stat;</div><div class='add'>+</div><div class='add'>+	if (ctl == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ctl_shift = ctl-&gt;shift + ctl-&gt;nbits * (id - ctl-&gt;start_id);</div><div class='add'>+	ctl_mask = ((1 &lt;&lt; ctl-&gt;nbits) - 1) &lt;&lt; ctl_shift;</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case DSCR_DEVSTATE_ENABLED:</div><div class='add'>+		ctl_val = ctl-&gt;enable &lt;&lt; ctl_shift;</div><div class='add'>+		break;</div><div class='add'>+	case DSCR_DEVSTATE_DISABLED:</div><div class='add'>+		if (ctl-&gt;enable_only)</div><div class='add'>+			return;</div><div class='add'>+		ctl_val = ctl-&gt;disable &lt;&lt; ctl_shift;</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'>+	spin_lock_irqsave(&amp;dscr.lock, flags);</div><div class='add'>+</div><div class='add'>+	val = soc_readl(dscr.base + ctl-&gt;reg);</div><div class='add'>+	val &amp;= ~ctl_mask;</div><div class='add'>+	val |= ctl_val;</div><div class='add'>+</div><div class='add'>+	dscr_write(ctl-&gt;reg, val);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;dscr.lock, flags);</div><div class='add'>+</div><div class='add'>+	if (!stat)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ctl_shift = stat-&gt;shift + stat-&gt;nbits * (id - stat-&gt;start_id);</div><div class='add'>+</div><div class='add'>+	if (state == DSCR_DEVSTATE_ENABLED)</div><div class='add'>+		ctl_val = stat-&gt;enable;</div><div class='add'>+	else</div><div class='add'>+		ctl_val = stat-&gt;disable;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		val = soc_readl(dscr.base + stat-&gt;reg);</div><div class='add'>+		val &gt;&gt;= ctl_shift;</div><div class='add'>+		val &amp;= ((1 &lt;&lt; stat-&gt;nbits) - 1);</div><div class='add'>+	} while (val != ctl_val);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dscr_set_devstate);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Drivers can use this to reset RMII module.</div><div class='add'>+ */</div><div class='add'>+void dscr_rmii_reset(int id, int assert)</div><div class='add'>+{</div><div class='add'>+	struct rmii_reset_reg *r;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (id &lt; 0 || id &gt;= MAX_SOC_EMACS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	r = &amp;dscr.rmii_resets[id];</div><div class='add'>+	if (r-&gt;mask == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dscr.lock, flags);</div><div class='add'>+</div><div class='add'>+	val = soc_readl(dscr.base + r-&gt;reg);</div><div class='add'>+	if (assert)</div><div class='add'>+		dscr_write(r-&gt;reg, val | r-&gt;mask);</div><div class='add'>+	else</div><div class='add'>+		dscr_write(r-&gt;reg, val &amp; ~(r-&gt;mask));</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;dscr.lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dscr_rmii_reset);</div><div class='add'>+</div><div class='add'>+static void __init dscr_parse_devstat(struct device_node *node,</div><div class='add'>+				      void __iomem *base)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32_array(node, "ti,dscr-devstat", &amp;val, 1);</div><div class='add'>+	if (!err)</div><div class='add'>+		c6x_devstat = soc_readl(base + val);</div><div class='add'>+	printk(KERN_INFO "DEVSTAT: %08x\n", c6x_devstat);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init dscr_parse_silicon_rev(struct device_node *node,</div><div class='add'>+					 void __iomem *base)</div><div class='add'>+{</div><div class='add'>+	u32 vals[3];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32_array(node, "ti,dscr-silicon-rev", vals, 3);</div><div class='add'>+	if (!err) {</div><div class='add'>+		c6x_silicon_rev = soc_readl(base + vals[0]);</div><div class='add'>+		c6x_silicon_rev &gt;&gt;= vals[1];</div><div class='add'>+		c6x_silicon_rev &amp;= vals[2];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Some SoCs will have a pair of fuse registers which hold</div><div class='add'>+ * an ethernet MAC address. The "ti,dscr-mac-fuse-regs"</div><div class='add'>+ * property is a mapping from fuse register bytes to MAC</div><div class='add'>+ * address bytes. The expected format is:</div><div class='add'>+ *</div><div class='add'>+ *	ti,dscr-mac-fuse-regs = &lt;reg0 b3 b2 b1 b0</div><div class='add'>+ *				 reg1 b3 b2 b1 b0&gt;</div><div class='add'>+ *</div><div class='add'>+ * reg0 and reg1 are the offsets of the two fuse registers.</div><div class='add'>+ * b3-b0 positionally represent bytes within the fuse register.</div><div class='add'>+ * b3 is the most significant byte and b0 is the least.</div><div class='add'>+ * Allowable values for b3-b0 are:</div><div class='add'>+ *</div><div class='add'>+ *	  0 = fuse register byte not used in MAC address</div><div class='add'>+ *      1-6 = index+1 into c6x_fuse_mac[]</div><div class='add'>+ */</div><div class='add'>+static void __init dscr_parse_mac_fuse(struct device_node *node,</div><div class='add'>+				       void __iomem *base)</div><div class='add'>+{</div><div class='add'>+	u32 vals[10], fuse;</div><div class='add'>+	int f, i, j, err;</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32_array(node, "ti,dscr-mac-fuse-regs",</div><div class='add'>+					 vals, 10);</div><div class='add'>+	if (err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (f = 0; f &lt; 2; f++) {</div><div class='add'>+		fuse = soc_readl(base + vals[f * 5]);</div><div class='add'>+		for (j = (f * 5) + 1, i = 24; i &gt;= 0; i -= 8, j++)</div><div class='add'>+			if (vals[j] &amp;&amp; vals[j] &lt;= 6)</div><div class='add'>+				c6x_fuse_mac[vals[j] - 1] = fuse &gt;&gt; i;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init dscr_parse_rmii_resets(struct device_node *node,</div><div class='add'>+					  void __iomem *base)</div><div class='add'>+{</div><div class='add'>+	const __be32 *p;</div><div class='add'>+	int i, size;</div><div class='add'>+</div><div class='add'>+	/* look for RMII reset registers */</div><div class='add'>+	p = of_get_property(node, "ti,dscr-rmii-resets", &amp;size);</div><div class='add'>+	if (p) {</div><div class='add'>+		/* parse all the reg/mask pairs we can handle */</div><div class='add'>+		size /= (sizeof(*p) * 2);</div><div class='add'>+		if (size &gt; MAX_SOC_EMACS)</div><div class='add'>+			size = MAX_SOC_EMACS;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; size; i++) {</div><div class='add'>+			dscr.rmii_resets[i].reg = be32_to_cpup(p++);</div><div class='add'>+			dscr.rmii_resets[i].mask = be32_to_cpup(p++);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void __init dscr_parse_privperm(struct device_node *node,</div><div class='add'>+				       void __iomem *base)</div><div class='add'>+{</div><div class='add'>+	u32 vals[2];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32_array(node, "ti,dscr-privperm", vals, 2);</div><div class='add'>+	if (err)</div><div class='add'>+		return;</div><div class='add'>+	dscr_write(vals[0], vals[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SoCs may have "locked" DSCR registers which can only be written</div><div class='add'>+ * to only after writing a key value to a lock registers. These</div><div class='add'>+ * regisers can be described with the "ti,dscr-locked-regs" property.</div><div class='add'>+ * This property provides a list of register descriptions with each</div><div class='add'>+ * description consisting of three values.</div><div class='add'>+ *</div><div class='add'>+ *	ti,dscr-locked-regs = &lt;reg0 lockreg0 key0</div><div class='add'>+ *                               ...</div><div class='add'>+ *                             regN lockregN keyN&gt;;</div><div class='add'>+ *</div><div class='add'>+ * reg is the offset of the locked register</div><div class='add'>+ * lockreg is the offset of the lock register</div><div class='add'>+ * key is the unlock key written to lockreg</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void __init dscr_parse_locked_regs(struct device_node *node,</div><div class='add'>+					  void __iomem *base)</div><div class='add'>+{</div><div class='add'>+	struct locked_reg *r;</div><div class='add'>+	const __be32 *p;</div><div class='add'>+	int i, size;</div><div class='add'>+</div><div class='add'>+	p = of_get_property(node, "ti,dscr-locked-regs", &amp;size);</div><div class='add'>+	if (p) {</div><div class='add'>+		/* parse all the register descriptions we can handle */</div><div class='add'>+		size /= (sizeof(*p) * 3);</div><div class='add'>+		if (size &gt; MAX_LOCKED_REGS)</div><div class='add'>+			size = MAX_LOCKED_REGS;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; size; i++) {</div><div class='add'>+			r = &amp;dscr.locked[i];</div><div class='add'>+</div><div class='add'>+			r-&gt;reg = be32_to_cpup(p++);</div><div class='add'>+			r-&gt;lockreg = be32_to_cpup(p++);</div><div class='add'>+			r-&gt;key = be32_to_cpup(p++);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SoCs may have DSCR registers which are only write enabled after</div><div class='add'>+ * writing specific key values to two registers. The two key registers</div><div class='add'>+ * and the key values can be parsed from a "ti,dscr-kick-regs"</div><div class='add'>+ * propety with the following layout:</div><div class='add'>+ *</div><div class='add'>+ *	ti,dscr-kick-regs = &lt;kickreg0 key0 kickreg1 key1&gt;</div><div class='add'>+ *</div><div class='add'>+ * kickreg is the offset of the "kick" register</div><div class='add'>+ * key is the value which unlocks writing for protected regs</div><div class='add'>+ */</div><div class='add'>+static void __init dscr_parse_kick_regs(struct device_node *node,</div><div class='add'>+					void __iomem *base)</div><div class='add'>+{</div><div class='add'>+	u32 vals[4];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32_array(node, "ti,dscr-kick-regs", vals, 4);</div><div class='add'>+	if (!err) {</div><div class='add'>+		dscr.kick_reg[0] = vals[0];</div><div class='add'>+		dscr.kick_key[0] = vals[1];</div><div class='add'>+		dscr.kick_reg[1] = vals[2];</div><div class='add'>+		dscr.kick_key[1] = vals[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'>+ * SoCs may provide controls to enable/disable individual IP blocks. These</div><div class='add'>+ * controls in the DSCR usually control pin drivers but also may control</div><div class='add'>+ * clocking and or resets. The device tree is used to describe the bitfields</div><div class='add'>+ * in registers used to control device state. The number of bits and their</div><div class='add'>+ * values may vary even within the same register.</div><div class='add'>+ *</div><div class='add'>+ * The layout of these bitfields is described by the ti,dscr-devstate-ctl-regs</div><div class='add'>+ * property. This property is a list where each element describes a contiguous</div><div class='add'>+ * range of control fields with like properties. Each element of the list</div><div class='add'>+ * consists of 7 cells with the following values:</div><div class='add'>+ *</div><div class='add'>+ *   start_id num_ids reg enable disable start_bit nbits</div><div class='add'>+ *</div><div class='add'>+ * start_id is device id for the first device control in the range</div><div class='add'>+ * num_ids is the number of device controls in the range</div><div class='add'>+ * reg is the offset of the register holding the control bits</div><div class='add'>+ * enable is the value to enable a device</div><div class='add'>+ * disable is the value to disable a device (0xffffffff if cannot disable)</div><div class='add'>+ * start_bit is the bit number of the first bit in the range</div><div class='add'>+ * nbits is the number of bits per device control</div><div class='add'>+ */</div><div class='add'>+static void __init dscr_parse_devstate_ctl_regs(struct device_node *node,</div><div class='add'>+						void __iomem *base)</div><div class='add'>+{</div><div class='add'>+	struct devstate_ctl_reg *r;</div><div class='add'>+	const __be32 *p;</div><div class='add'>+	int i, j, size;</div><div class='add'>+</div><div class='add'>+	p = of_get_property(node, "ti,dscr-devstate-ctl-regs", &amp;size);</div><div class='add'>+	if (p) {</div><div class='add'>+		/* parse all the ranges we can handle */</div><div class='add'>+		size /= (sizeof(*p) * 7);</div><div class='add'>+		if (size &gt; MAX_DEVCTL_REGS)</div><div class='add'>+			size = MAX_DEVCTL_REGS;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; size; i++) {</div><div class='add'>+			r = &amp;dscr.devctl[i];</div><div class='add'>+</div><div class='add'>+			r-&gt;start_id = be32_to_cpup(p++);</div><div class='add'>+			r-&gt;num_ids = be32_to_cpup(p++);</div><div class='add'>+			r-&gt;reg = be32_to_cpup(p++);</div><div class='add'>+			r-&gt;enable = be32_to_cpup(p++);</div><div class='add'>+			r-&gt;disable = be32_to_cpup(p++);</div><div class='add'>+			if (r-&gt;disable == 0xffffffff)</div><div class='add'>+				r-&gt;enable_only = 1;</div><div class='add'>+			r-&gt;shift = be32_to_cpup(p++);</div><div class='add'>+			r-&gt;nbits = be32_to_cpup(p++);</div><div class='add'>+</div><div class='add'>+			for (j = r-&gt;start_id;</div><div class='add'>+			     j &lt; (r-&gt;start_id + r-&gt;num_ids);</div><div class='add'>+			     j++)</div><div class='add'>+				dscr.devstate_info[j].ctl = r;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SoCs may provide status registers indicating the state (enabled/disabled) of</div><div class='add'>+ * devices on the SoC. The device tree is used to describe the bitfields in</div><div class='add'>+ * registers used to provide device status. The number of bits and their</div><div class='add'>+ * values used to provide status may vary even within the same register.</div><div class='add'>+ *</div><div class='add'>+ * The layout of these bitfields is described by the ti,dscr-devstate-stat-regs</div><div class='add'>+ * property. This property is a list where each element describes a contiguous</div><div class='add'>+ * range of status fields with like properties. Each element of the list</div><div class='add'>+ * consists of 7 cells with the following values:</div><div class='add'>+ *</div><div class='add'>+ *   start_id num_ids reg enable disable start_bit nbits</div><div class='add'>+ *</div><div class='add'>+ * start_id is device id for the first device status in the range</div><div class='add'>+ * num_ids is the number of devices covered by the range</div><div class='add'>+ * reg is the offset of the register holding the status bits</div><div class='add'>+ * enable is the value indicating device is enabled</div><div class='add'>+ * disable is the value indicating device is disabled</div><div class='add'>+ * start_bit is the bit number of the first bit in the range</div><div class='add'>+ * nbits is the number of bits per device status</div><div class='add'>+ */</div><div class='add'>+static void __init dscr_parse_devstate_stat_regs(struct device_node *node,</div><div class='add'>+						 void __iomem *base)</div><div class='add'>+{</div><div class='add'>+	struct devstate_stat_reg *r;</div><div class='add'>+	const __be32 *p;</div><div class='add'>+	int i, j, size;</div><div class='add'>+</div><div class='add'>+	p = of_get_property(node, "ti,dscr-devstate-stat-regs", &amp;size);</div><div class='add'>+	if (p) {</div><div class='add'>+		/* parse all the ranges we can handle */</div><div class='add'>+		size /= (sizeof(*p) * 7);</div><div class='add'>+		if (size &gt; MAX_DEVSTAT_REGS)</div><div class='add'>+			size = MAX_DEVSTAT_REGS;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; size; i++) {</div><div class='add'>+			r = &amp;dscr.devstat[i];</div><div class='add'>+</div><div class='add'>+			r-&gt;start_id = be32_to_cpup(p++);</div><div class='add'>+			r-&gt;num_ids = be32_to_cpup(p++);</div><div class='add'>+			r-&gt;reg = be32_to_cpup(p++);</div><div class='add'>+			r-&gt;enable = be32_to_cpup(p++);</div><div class='add'>+			r-&gt;disable = be32_to_cpup(p++);</div><div class='add'>+			r-&gt;shift = be32_to_cpup(p++);</div><div class='add'>+			r-&gt;nbits = be32_to_cpup(p++);</div><div class='add'>+</div><div class='add'>+			for (j = r-&gt;start_id;</div><div class='add'>+			     j &lt; (r-&gt;start_id + r-&gt;num_ids);</div><div class='add'>+			     j++)</div><div class='add'>+				dscr.devstate_info[j].stat = r;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct of_device_id dscr_ids[] __initdata = {</div><div class='add'>+	{ .compatible = "ti,c64x+dscr" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Probe for DSCR area.</div><div class='add'>+ *</div><div class='add'>+ * This has to be done early on in case timer or interrupt controller</div><div class='add'>+ * needs something. e.g. On C6455 SoC, timer must be enabled through</div><div class='add'>+ * DSCR before it is functional.</div><div class='add'>+ */</div><div class='add'>+void __init dscr_probe(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *node;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;dscr.lock);</div><div class='add'>+</div><div class='add'>+	node = of_find_matching_node(NULL, dscr_ids);</div><div class='add'>+	if (!node)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	base = of_iomap(node, 0);</div><div class='add'>+	if (!base) {</div><div class='add'>+		of_node_put(node);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dscr.base = base;</div><div class='add'>+</div><div class='add'>+	dscr_parse_devstat(node, base);</div><div class='add'>+	dscr_parse_silicon_rev(node, base);</div><div class='add'>+	dscr_parse_mac_fuse(node, base);</div><div class='add'>+	dscr_parse_rmii_resets(node, base);</div><div class='add'>+	dscr_parse_locked_regs(node, base);</div><div class='add'>+	dscr_parse_kick_regs(node, base);</div><div class='add'>+	dscr_parse_devstate_ctl_regs(node, base);</div><div class='add'>+	dscr_parse_devstate_stat_regs(node, base);</div><div class='add'>+	dscr_parse_privperm(node, base);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/c6x/platforms/emif.c b/arch/c6x/platforms/emif.c<br/>new file mode 100644<br/>index 000000000000..8b564dec241d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/platforms/emif.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/platforms/emif.c</a></div><div class='hunk'>@@ -0,0 +1,87 @@</div><div class='add'>+/*</div><div class='add'>+ *  External Memory Interface</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</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/io.h&gt;</div><div class='add'>+#include &lt;asm/soc.h&gt;</div><div class='add'>+#include &lt;asm/dscr.h&gt;</div><div class='add'>+</div><div class='add'>+#define NUM_EMIFA_CHIP_ENABLES 4</div><div class='add'>+</div><div class='add'>+struct emifa_regs {</div><div class='add'>+	u32	midr;</div><div class='add'>+	u32	stat;</div><div class='add'>+	u32	reserved1[6];</div><div class='add'>+	u32	bprio;</div><div class='add'>+	u32	reserved2[23];</div><div class='add'>+	u32	cecfg[NUM_EMIFA_CHIP_ENABLES];</div><div class='add'>+	u32	reserved3[4];</div><div class='add'>+	u32	awcc;</div><div class='add'>+	u32	reserved4[7];</div><div class='add'>+	u32	intraw;</div><div class='add'>+	u32	intmsk;</div><div class='add'>+	u32	intmskset;</div><div class='add'>+	u32	intmskclr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct of_device_id emifa_match[] __initdata = {</div><div class='add'>+	{ .compatible = "ti,c64x+emifa"	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Parse device tree for existence of an EMIF (External Memory Interface)</div><div class='add'>+ * and initialize it if found.</div><div class='add'>+ */</div><div class='add'>+static int __init c6x_emifa_init(void)</div><div class='add'>+{</div><div class='add'>+	struct emifa_regs __iomem *regs;</div><div class='add'>+	struct device_node *node;</div><div class='add'>+	const __be32 *p;</div><div class='add'>+	u32 val;</div><div class='add'>+	int i, len, err;</div><div class='add'>+</div><div class='add'>+	node = of_find_matching_node(NULL, emifa_match);</div><div class='add'>+	if (!node)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	regs = of_iomap(node, 0);</div><div class='add'>+	if (!regs)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* look for a dscr-based enable for emifa pin buffers */</div><div class='add'>+	err = of_property_read_u32_array(node, "ti,dscr-dev-enable", &amp;val, 1);</div><div class='add'>+	if (!err)</div><div class='add'>+		dscr_set_devstate(val, DSCR_DEVSTATE_ENABLED);</div><div class='add'>+</div><div class='add'>+	/* set up the chip enables */</div><div class='add'>+	p = of_get_property(node, "ti,emifa-ce-config", &amp;len);</div><div class='add'>+	if (p) {</div><div class='add'>+		len /= sizeof(u32);</div><div class='add'>+		if (len &gt; NUM_EMIFA_CHIP_ENABLES)</div><div class='add'>+			len = NUM_EMIFA_CHIP_ENABLES;</div><div class='add'>+		for (i = 0; i &lt;= len; i++)</div><div class='add'>+			soc_writel(be32_to_cpup(&amp;p[i]), &amp;regs-&gt;cecfg[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32_array(node, "ti,emifa-burst-priority", &amp;val, 1);</div><div class='add'>+	if (!err)</div><div class='add'>+		soc_writel(val, &amp;regs-&gt;bprio);</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32_array(node, "ti,emifa-async-wait-control", &amp;val, 1);</div><div class='add'>+	if (!err)</div><div class='add'>+		soc_writel(val, &amp;regs-&gt;awcc);</div><div class='add'>+</div><div class='add'>+	iounmap(regs);</div><div class='add'>+	of_node_put(node);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+pure_initcall(c6x_emifa_init);</div><div class='head'>diff --git a/arch/c6x/platforms/megamod-pic.c b/arch/c6x/platforms/megamod-pic.c<br/>new file mode 100644<br/>index 000000000000..7c37a947fb1c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/platforms/megamod-pic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/platforms/megamod-pic.c</a></div><div class='hunk'>@@ -0,0 +1,349 @@</div><div class='add'>+/*</div><div class='add'>+ *  Support for C64x+ Megamodule Interrupt Controller</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Contributed by: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/of.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/slab.h&gt;</div><div class='add'>+#include &lt;asm/soc.h&gt;</div><div class='add'>+#include &lt;asm/megamod-pic.h&gt;</div><div class='add'>+</div><div class='add'>+#define NR_COMBINERS	4</div><div class='add'>+#define NR_MUX_OUTPUTS  12</div><div class='add'>+</div><div class='add'>+#define IRQ_UNMAPPED 0xffff</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Megamodule Interrupt Controller register layout</div><div class='add'>+ */</div><div class='add'>+struct megamod_regs {</div><div class='add'>+	u32	evtflag[8];</div><div class='add'>+	u32	evtset[8];</div><div class='add'>+	u32	evtclr[8];</div><div class='add'>+	u32	reserved0[8];</div><div class='add'>+	u32	evtmask[8];</div><div class='add'>+	u32	mevtflag[8];</div><div class='add'>+	u32	expmask[8];</div><div class='add'>+	u32	mexpflag[8];</div><div class='add'>+	u32	intmux_unused;</div><div class='add'>+	u32	intmux[7];</div><div class='add'>+	u32	reserved1[8];</div><div class='add'>+	u32	aegmux[2];</div><div class='add'>+	u32	reserved2[14];</div><div class='add'>+	u32	intxstat;</div><div class='add'>+	u32	intxclr;</div><div class='add'>+	u32	intdmask;</div><div class='add'>+	u32	reserved3[13];</div><div class='add'>+	u32	evtasrt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct megamod_pic {</div><div class='add'>+	struct irq_host	*irqhost;</div><div class='add'>+	struct megamod_regs __iomem *regs;</div><div class='add'>+	raw_spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	/* hw mux mapping */</div><div class='add'>+	unsigned int output_to_irq[NR_MUX_OUTPUTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct megamod_pic *mm_pic;</div><div class='add'>+</div><div class='add'>+struct megamod_cascade_data {</div><div class='add'>+	struct megamod_pic *pic;</div><div class='add'>+	int index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct megamod_cascade_data cascade_data[NR_COMBINERS];</div><div class='add'>+</div><div class='add'>+static void mask_megamod(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	struct megamod_pic *pic = irq_data_get_irq_chip_data(data);</div><div class='add'>+	irq_hw_number_t src = irqd_to_hwirq(data);</div><div class='add'>+	u32 __iomem *evtmask = &amp;pic-&gt;regs-&gt;evtmask[src / 32];</div><div class='add'>+</div><div class='add'>+	raw_spin_lock(&amp;pic-&gt;lock);</div><div class='add'>+	soc_writel(soc_readl(evtmask) | (1 &lt;&lt; (src &amp; 31)), evtmask);</div><div class='add'>+	raw_spin_unlock(&amp;pic-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void unmask_megamod(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	struct megamod_pic *pic = irq_data_get_irq_chip_data(data);</div><div class='add'>+	irq_hw_number_t src = irqd_to_hwirq(data);</div><div class='add'>+	u32 __iomem *evtmask = &amp;pic-&gt;regs-&gt;evtmask[src / 32];</div><div class='add'>+</div><div class='add'>+	raw_spin_lock(&amp;pic-&gt;lock);</div><div class='add'>+	soc_writel(soc_readl(evtmask) &amp; ~(1 &lt;&lt; (src &amp; 31)), evtmask);</div><div class='add'>+	raw_spin_unlock(&amp;pic-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip megamod_chip = {</div><div class='add'>+	.name		= "megamod",</div><div class='add'>+	.irq_mask	= mask_megamod,</div><div class='add'>+	.irq_unmask	= unmask_megamod,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void megamod_irq_cascade(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct megamod_cascade_data *cascade;</div><div class='add'>+	struct megamod_pic *pic;</div><div class='add'>+	u32 events;</div><div class='add'>+	int n, idx;</div><div class='add'>+</div><div class='add'>+	cascade = irq_desc_get_handler_data(desc);</div><div class='add'>+</div><div class='add'>+	pic = cascade-&gt;pic;</div><div class='add'>+	idx = cascade-&gt;index;</div><div class='add'>+</div><div class='add'>+	while ((events = soc_readl(&amp;pic-&gt;regs-&gt;mevtflag[idx])) != 0) {</div><div class='add'>+		n = __ffs(events);</div><div class='add'>+</div><div class='add'>+		irq = irq_linear_revmap(pic-&gt;irqhost, idx * 32 + n);</div><div class='add'>+</div><div class='add'>+		soc_writel(1 &lt;&lt; n, &amp;pic-&gt;regs-&gt;evtclr[idx]);</div><div class='add'>+</div><div class='add'>+		generic_handle_irq(irq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int megamod_map(struct irq_host *h, unsigned int virq,</div><div class='add'>+		       irq_hw_number_t hw)</div><div class='add'>+{</div><div class='add'>+	struct megamod_pic *pic = h-&gt;host_data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* We shouldn't see a hwirq which is muxed to core controller */</div><div class='add'>+	for (i = 0; i &lt; NR_MUX_OUTPUTS; i++)</div><div class='add'>+		if (pic-&gt;output_to_irq[i] == hw)</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+	irq_set_chip_data(virq, pic);</div><div class='add'>+	irq_set_chip_and_handler(virq, &amp;megamod_chip, handle_level_irq);</div><div class='add'>+</div><div class='add'>+	/* Set default irq type */</div><div class='add'>+	irq_set_irq_type(virq, IRQ_TYPE_NONE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int megamod_xlate(struct irq_host *h, struct device_node *ct,</div><div class='add'>+			 const u32 *intspec, unsigned int intsize,</div><div class='add'>+			 irq_hw_number_t *out_hwirq, unsigned int *out_type)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	/* megamod intspecs must have 1 cell */</div><div class='add'>+	BUG_ON(intsize != 1);</div><div class='add'>+	*out_hwirq = intspec[0];</div><div class='add'>+	*out_type = IRQ_TYPE_NONE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_host_ops megamod_host_ops = {</div><div class='add'>+	.map	= megamod_map,</div><div class='add'>+	.xlate	= megamod_xlate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init set_megamod_mux(struct megamod_pic *pic, int src, int output)</div><div class='add'>+{</div><div class='add'>+	int index, offset;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (src &lt; 0 || src &gt;= (NR_COMBINERS * 32)) {</div><div class='add'>+		pic-&gt;output_to_irq[output] = IRQ_UNMAPPED;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* four mappings per mux register */</div><div class='add'>+	index = output / 4;</div><div class='add'>+	offset = (output &amp; 3) * 8;</div><div class='add'>+</div><div class='add'>+	val = soc_readl(&amp;pic-&gt;regs-&gt;intmux[index]);</div><div class='add'>+	val &amp;= ~(0xff &lt;&lt; offset);</div><div class='add'>+	val |= src &lt;&lt; offset;</div><div class='add'>+	soc_writel(val, &amp;pic-&gt;regs-&gt;intmux[index]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Parse the MUX mapping, if one exists.</div><div class='add'>+ *</div><div class='add'>+ * The MUX map is an array of up to 12 cells; one for each usable core priority</div><div class='add'>+ * interrupt. The value of a given cell is the megamodule interrupt source</div><div class='add'>+ * which is to me MUXed to the output corresponding to the cell position</div><div class='add'>+ * withing the array. The first cell in the array corresponds to priority</div><div class='add'>+ * 4 and the last (12th) cell corresponds to priority 15. The allowed</div><div class='add'>+ * values are 4 - ((NR_COMBINERS * 32) - 1). Note that the combined interrupt</div><div class='add'>+ * sources (0 - 3) are not allowed to be mapped through this property. They</div><div class='add'>+ * are handled through the "interrupts" property. This allows us to use a</div><div class='add'>+ * value of zero as a "do not map" placeholder.</div><div class='add'>+ */</div><div class='add'>+static void __init parse_priority_map(struct megamod_pic *pic,</div><div class='add'>+				      int *mapping, int size)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = pic-&gt;irqhost-&gt;of_node;</div><div class='add'>+	const __be32 *map;</div><div class='add'>+	int i, maplen;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	map = of_get_property(np, "ti,c64x+megamod-pic-mux", &amp;maplen);</div><div class='add'>+	if (map) {</div><div class='add'>+		maplen /= 4;</div><div class='add'>+		if (maplen &gt; size)</div><div class='add'>+			maplen = size;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; maplen; i++) {</div><div class='add'>+			val = be32_to_cpup(map);</div><div class='add'>+			if (val &amp;&amp; val &gt;= 4)</div><div class='add'>+				mapping[i] = val;</div><div class='add'>+			++map;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct megamod_pic * __init init_megamod_pic(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct megamod_pic *pic;</div><div class='add'>+	int i, irq;</div><div class='add'>+	int mapping[NR_MUX_OUTPUTS];</div><div class='add'>+</div><div class='add'>+	pr_info("Initializing C64x+ Megamodule PIC\n");</div><div class='add'>+</div><div class='add'>+	pic = kzalloc(sizeof(struct megamod_pic), GFP_KERNEL);</div><div class='add'>+	if (!pic) {</div><div class='add'>+		pr_err("%s: Could not alloc PIC structure.\n", np-&gt;full_name);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pic-&gt;irqhost = irq_alloc_host(np, IRQ_HOST_MAP_LINEAR,</div><div class='add'>+				      NR_COMBINERS * 32, &amp;megamod_host_ops,</div><div class='add'>+				      IRQ_UNMAPPED);</div><div class='add'>+	if (!pic-&gt;irqhost) {</div><div class='add'>+		pr_err("%s: Could not alloc host.\n", np-&gt;full_name);</div><div class='add'>+		goto error_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pic-&gt;irqhost-&gt;host_data = pic;</div><div class='add'>+</div><div class='add'>+	raw_spin_lock_init(&amp;pic-&gt;lock);</div><div class='add'>+</div><div class='add'>+	pic-&gt;regs = of_iomap(np, 0);</div><div class='add'>+	if (!pic-&gt;regs) {</div><div class='add'>+		pr_err("%s: Could not map registers.\n", np-&gt;full_name);</div><div class='add'>+		goto error_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize MUX map */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mapping); i++)</div><div class='add'>+		mapping[i] = IRQ_UNMAPPED;</div><div class='add'>+</div><div class='add'>+	parse_priority_map(pic, mapping, ARRAY_SIZE(mapping));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We can have up to 12 interrupts cascading to the core controller.</div><div class='add'>+	 * These cascades can be from the combined interrupt sources or for</div><div class='add'>+	 * individual interrupt sources. The "interrupts" property only</div><div class='add'>+	 * deals with the cascaded combined interrupts. The individual</div><div class='add'>+	 * interrupts muxed to the core controller use the core controller</div><div class='add'>+	 * as their interrupt parent.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; NR_COMBINERS; i++) {</div><div class='add'>+</div><div class='add'>+		irq = irq_of_parse_and_map(np, i);</div><div class='add'>+		if (irq == NO_IRQ)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We count on the core priority interrupts (4 - 15) being</div><div class='add'>+		 * direct mapped. Check that device tree provided something</div><div class='add'>+		 * in that range.</div><div class='add'>+		 */</div><div class='add'>+		if (irq &lt; 4 || irq &gt;= NR_PRIORITY_IRQS) {</div><div class='add'>+			pr_err("%s: combiner-%d virq %d out of range!\n",</div><div class='add'>+				 np-&gt;full_name, i, irq);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* record the mapping */</div><div class='add'>+		mapping[irq - 4] = i;</div><div class='add'>+</div><div class='add'>+		pr_debug("%s: combiner-%d cascading to virq %d\n",</div><div class='add'>+			 np-&gt;full_name, i, irq);</div><div class='add'>+</div><div class='add'>+		cascade_data[i].pic = pic;</div><div class='add'>+		cascade_data[i].index = i;</div><div class='add'>+</div><div class='add'>+		/* mask and clear all events in combiner */</div><div class='add'>+		soc_writel(~0, &amp;pic-&gt;regs-&gt;evtmask[i]);</div><div class='add'>+		soc_writel(~0, &amp;pic-&gt;regs-&gt;evtclr[i]);</div><div class='add'>+</div><div class='add'>+		irq_set_handler_data(irq, &amp;cascade_data[i]);</div><div class='add'>+		irq_set_chained_handler(irq, megamod_irq_cascade);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Finally, set up the MUX registers */</div><div class='add'>+	for (i = 0; i &lt; NR_MUX_OUTPUTS; i++) {</div><div class='add'>+		if (mapping[i] != IRQ_UNMAPPED) {</div><div class='add'>+			pr_debug("%s: setting mux %d to priority %d\n",</div><div class='add'>+				 np-&gt;full_name, mapping[i], i + 4);</div><div class='add'>+			set_megamod_mux(pic, mapping[i], i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return pic;</div><div class='add'>+</div><div class='add'>+error_free:</div><div class='add'>+	kfree(pic);</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'>+ * Return next active event after ACK'ing it.</div><div class='add'>+ * Return -1 if no events active.</div><div class='add'>+ */</div><div class='add'>+static int get_exception(void)</div><div class='add'>+{</div><div class='add'>+	int i, bit;</div><div class='add'>+	u32 mask;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NR_COMBINERS; i++) {</div><div class='add'>+		mask = soc_readl(&amp;mm_pic-&gt;regs-&gt;mexpflag[i]);</div><div class='add'>+		if (mask) {</div><div class='add'>+			bit = __ffs(mask);</div><div class='add'>+			soc_writel(1 &lt;&lt; bit, &amp;mm_pic-&gt;regs-&gt;evtclr[i]);</div><div class='add'>+			return (i * 32) + bit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void assert_event(unsigned int val)</div><div class='add'>+{</div><div class='add'>+	soc_writel(val, &amp;mm_pic-&gt;regs-&gt;evtasrt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init megamod_pic_init(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	np = of_find_compatible_node(NULL, NULL, "ti,c64x+megamod-pic");</div><div class='add'>+	if (!np)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mm_pic = init_megamod_pic(np);</div><div class='add'>+	of_node_put(np);</div><div class='add'>+</div><div class='add'>+	soc_ops.get_exception = get_exception;</div><div class='add'>+	soc_ops.assert_event = assert_event;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/c6x/platforms/platform.c b/arch/c6x/platforms/platform.c<br/>new file mode 100644<br/>index 000000000000..26c1a355d600<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/platforms/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/platforms/platform.c</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2011 Texas Instruments Incorporated</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public License</div><div class='add'>+ * version 2. This program is licensed "as is" without any warranty of any</div><div class='add'>+ * kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+</div><div class='add'>+static int __init c6x_device_probe(void)</div><div class='add'>+{</div><div class='add'>+	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+core_initcall(c6x_device_probe);</div><div class='head'>diff --git a/arch/c6x/platforms/pll.c b/arch/c6x/platforms/pll.c<br/>new file mode 100644<br/>index 000000000000..3aa898f7ce4d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/platforms/pll.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/platforms/pll.c</a></div><div class='hunk'>@@ -0,0 +1,444 @@</div><div class='add'>+/*</div><div class='add'>+ * Clock and PLL control for C64x+ devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2010, 2011 Texas Instruments.</div><div class='add'>+ * Contributed by: Mark Salter &lt;msalter@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copied heavily from arm/mach-davinci/clock.c, so:</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006-2007 Texas Instruments.</div><div class='add'>+ * Copyright (C) 2008-2009 Deep Root Systems, LLC</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 &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/clkdev.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/err.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/clock.h&gt;</div><div class='add'>+#include &lt;asm/soc.h&gt;</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(clocks);</div><div class='add'>+static DEFINE_MUTEX(clocks_mutex);</div><div class='add'>+static DEFINE_SPINLOCK(clockfw_lock);</div><div class='add'>+</div><div class='add'>+static void __clk_enable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	if (clk-&gt;parent)</div><div class='add'>+		__clk_enable(clk-&gt;parent);</div><div class='add'>+	clk-&gt;usecount++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __clk_disable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(clk-&gt;usecount == 0))</div><div class='add'>+		return;</div><div class='add'>+	--clk-&gt;usecount;</div><div class='add'>+</div><div class='add'>+	if (clk-&gt;parent)</div><div class='add'>+		__clk_disable(clk-&gt;parent);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int clk_enable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (clk == NULL || IS_ERR(clk))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;clockfw_lock, flags);</div><div class='add'>+	__clk_enable(clk);</div><div class='add'>+	spin_unlock_irqrestore(&amp;clockfw_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_enable);</div><div class='add'>+</div><div class='add'>+void clk_disable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (clk == NULL || IS_ERR(clk))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;clockfw_lock, flags);</div><div class='add'>+	__clk_disable(clk);</div><div class='add'>+	spin_unlock_irqrestore(&amp;clockfw_lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_disable);</div><div class='add'>+</div><div class='add'>+unsigned long clk_get_rate(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	if (clk == NULL || IS_ERR(clk))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return clk-&gt;rate;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_get_rate);</div><div class='add'>+</div><div class='add'>+long clk_round_rate(struct clk *clk, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	if (clk == NULL || IS_ERR(clk))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (clk-&gt;round_rate)</div><div class='add'>+		return clk-&gt;round_rate(clk, rate);</div><div class='add'>+</div><div class='add'>+	return clk-&gt;rate;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_round_rate);</div><div class='add'>+</div><div class='add'>+/* Propagate rate to children */</div><div class='add'>+static void propagate_rate(struct clk *root)</div><div class='add'>+{</div><div class='add'>+	struct clk *clk;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(clk, &amp;root-&gt;children, childnode) {</div><div class='add'>+		if (clk-&gt;recalc)</div><div class='add'>+			clk-&gt;rate = clk-&gt;recalc(clk);</div><div class='add'>+		propagate_rate(clk);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int clk_set_rate(struct clk *clk, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (clk == NULL || IS_ERR(clk))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (clk-&gt;set_rate)</div><div class='add'>+		ret = clk-&gt;set_rate(clk, rate);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;clockfw_lock, flags);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		if (clk-&gt;recalc)</div><div class='add'>+			clk-&gt;rate = clk-&gt;recalc(clk);</div><div class='add'>+		propagate_rate(clk);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;clockfw_lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_set_rate);</div><div class='add'>+</div><div class='add'>+int clk_set_parent(struct clk *clk, struct clk *parent)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (clk == NULL || IS_ERR(clk))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Cannot change parent on enabled clock */</div><div class='add'>+	if (WARN_ON(clk-&gt;usecount))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;clocks_mutex);</div><div class='add'>+	clk-&gt;parent = parent;</div><div class='add'>+	list_del_init(&amp;clk-&gt;childnode);</div><div class='add'>+	list_add(&amp;clk-&gt;childnode, &amp;clk-&gt;parent-&gt;children);</div><div class='add'>+	mutex_unlock(&amp;clocks_mutex);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;clockfw_lock, flags);</div><div class='add'>+	if (clk-&gt;recalc)</div><div class='add'>+		clk-&gt;rate = clk-&gt;recalc(clk);</div><div class='add'>+	propagate_rate(clk);</div><div class='add'>+	spin_unlock_irqrestore(&amp;clockfw_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_set_parent);</div><div class='add'>+</div><div class='add'>+int clk_register(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	if (clk == NULL || IS_ERR(clk))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (WARN(clk-&gt;parent &amp;&amp; !clk-&gt;parent-&gt;rate,</div><div class='add'>+		 "CLK: %s parent %s has no rate!\n",</div><div class='add'>+		 clk-&gt;name, clk-&gt;parent-&gt;name))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;clocks_mutex);</div><div class='add'>+	list_add_tail(&amp;clk-&gt;node, &amp;clocks);</div><div class='add'>+	if (clk-&gt;parent)</div><div class='add'>+		list_add_tail(&amp;clk-&gt;childnode, &amp;clk-&gt;parent-&gt;children);</div><div class='add'>+	mutex_unlock(&amp;clocks_mutex);</div><div class='add'>+</div><div class='add'>+	/* If rate is already set, use it */</div><div class='add'>+	if (clk-&gt;rate)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Else, see if there is a way to calculate it */</div><div class='add'>+	if (clk-&gt;recalc)</div><div class='add'>+		clk-&gt;rate = clk-&gt;recalc(clk);</div><div class='add'>+</div><div class='add'>+	/* Otherwise, default to parent rate */</div><div class='add'>+	else if (clk-&gt;parent)</div><div class='add'>+		clk-&gt;rate = clk-&gt;parent-&gt;rate;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_register);</div><div class='add'>+</div><div class='add'>+void clk_unregister(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	if (clk == NULL || IS_ERR(clk))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;clocks_mutex);</div><div class='add'>+	list_del(&amp;clk-&gt;node);</div><div class='add'>+	list_del(&amp;clk-&gt;childnode);</div><div class='add'>+	mutex_unlock(&amp;clocks_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_unregister);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static u32 pll_read(struct pll_data *pll, int reg)</div><div class='add'>+{</div><div class='add'>+	return soc_readl(pll-&gt;base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long clk_sysclk_recalc(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	u32 v, plldiv = 0;</div><div class='add'>+	struct pll_data *pll;</div><div class='add'>+	unsigned long rate = clk-&gt;rate;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!clk-&gt;parent))</div><div class='add'>+		return rate;</div><div class='add'>+</div><div class='add'>+	rate = clk-&gt;parent-&gt;rate;</div><div class='add'>+</div><div class='add'>+	/* the parent must be a PLL */</div><div class='add'>+	if (WARN_ON(!clk-&gt;parent-&gt;pll_data))</div><div class='add'>+		return rate;</div><div class='add'>+</div><div class='add'>+	pll = clk-&gt;parent-&gt;pll_data;</div><div class='add'>+</div><div class='add'>+	/* If pre-PLL, source clock is before the multiplier and divider(s) */</div><div class='add'>+	if (clk-&gt;flags &amp; PRE_PLL)</div><div class='add'>+		rate = pll-&gt;input_rate;</div><div class='add'>+</div><div class='add'>+	if (!clk-&gt;div) {</div><div class='add'>+		pr_debug("%s: (no divider) rate = %lu KHz\n",</div><div class='add'>+			 clk-&gt;name, rate / 1000);</div><div class='add'>+		return rate;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (clk-&gt;flags &amp; FIXED_DIV_PLL) {</div><div class='add'>+		rate /= clk-&gt;div;</div><div class='add'>+		pr_debug("%s: (fixed divide by %d) rate = %lu KHz\n",</div><div class='add'>+			 clk-&gt;name, clk-&gt;div, rate / 1000);</div><div class='add'>+		return rate;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	v = pll_read(pll, clk-&gt;div);</div><div class='add'>+	if (v &amp; PLLDIV_EN)</div><div class='add'>+		plldiv = (v &amp; PLLDIV_RATIO_MASK) + 1;</div><div class='add'>+</div><div class='add'>+	if (plldiv == 0)</div><div class='add'>+		plldiv = 1;</div><div class='add'>+</div><div class='add'>+	rate /= plldiv;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s: (divide by %d) rate = %lu KHz\n",</div><div class='add'>+		 clk-&gt;name, plldiv, rate / 1000);</div><div class='add'>+</div><div class='add'>+	return rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long clk_leafclk_recalc(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!clk-&gt;parent))</div><div class='add'>+		return clk-&gt;rate;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s: (parent %s) rate = %lu KHz\n",</div><div class='add'>+		 clk-&gt;name, clk-&gt;parent-&gt;name,	clk-&gt;parent-&gt;rate / 1000);</div><div class='add'>+</div><div class='add'>+	return clk-&gt;parent-&gt;rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long clk_pllclk_recalc(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl, mult = 0, prediv = 0, postdiv = 0;</div><div class='add'>+	u8 bypass;</div><div class='add'>+	struct pll_data *pll = clk-&gt;pll_data;</div><div class='add'>+	unsigned long rate = clk-&gt;rate;</div><div class='add'>+</div><div class='add'>+	if (clk-&gt;flags &amp; FIXED_RATE_PLL)</div><div class='add'>+		return rate;</div><div class='add'>+</div><div class='add'>+	ctrl = pll_read(pll, PLLCTL);</div><div class='add'>+	rate = pll-&gt;input_rate = clk-&gt;parent-&gt;rate;</div><div class='add'>+</div><div class='add'>+	if (ctrl &amp; PLLCTL_PLLEN)</div><div class='add'>+		bypass = 0;</div><div class='add'>+	else</div><div class='add'>+		bypass = 1;</div><div class='add'>+</div><div class='add'>+	if (pll-&gt;flags &amp; PLL_HAS_MUL) {</div><div class='add'>+		mult = pll_read(pll, PLLM);</div><div class='add'>+		mult = (mult &amp; PLLM_PLLM_MASK) + 1;</div><div class='add'>+	}</div><div class='add'>+	if (pll-&gt;flags &amp; PLL_HAS_PRE) {</div><div class='add'>+		prediv = pll_read(pll, PLLPRE);</div><div class='add'>+		if (prediv &amp; PLLDIV_EN)</div><div class='add'>+			prediv = (prediv &amp; PLLDIV_RATIO_MASK) + 1;</div><div class='add'>+		else</div><div class='add'>+			prediv = 0;</div><div class='add'>+	}</div><div class='add'>+	if (pll-&gt;flags &amp; PLL_HAS_POST) {</div><div class='add'>+		postdiv = pll_read(pll, PLLPOST);</div><div class='add'>+		if (postdiv &amp; PLLDIV_EN)</div><div class='add'>+			postdiv = (postdiv &amp; PLLDIV_RATIO_MASK) + 1;</div><div class='add'>+		else</div><div class='add'>+			postdiv = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!bypass) {</div><div class='add'>+		if (prediv)</div><div class='add'>+			rate /= prediv;</div><div class='add'>+		if (mult)</div><div class='add'>+			rate *= mult;</div><div class='add'>+		if (postdiv)</div><div class='add'>+			rate /= postdiv;</div><div class='add'>+</div><div class='add'>+		pr_debug("PLL%d: input = %luMHz, pre[%d] mul[%d] post[%d] "</div><div class='add'>+			 "--&gt; %luMHz output.\n",</div><div class='add'>+			 pll-&gt;num, clk-&gt;parent-&gt;rate / 1000000,</div><div class='add'>+			 prediv, mult, postdiv, rate / 1000000);</div><div class='add'>+	} else</div><div class='add'>+		pr_debug("PLL%d: input = %luMHz, bypass mode.\n",</div><div class='add'>+			 pll-&gt;num, clk-&gt;parent-&gt;rate / 1000000);</div><div class='add'>+</div><div class='add'>+	return rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void __init __init_clk(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	INIT_LIST_HEAD(&amp;clk-&gt;node);</div><div class='add'>+	INIT_LIST_HEAD(&amp;clk-&gt;children);</div><div class='add'>+	INIT_LIST_HEAD(&amp;clk-&gt;childnode);</div><div class='add'>+</div><div class='add'>+	if (!clk-&gt;recalc) {</div><div class='add'>+</div><div class='add'>+		/* Check if clock is a PLL */</div><div class='add'>+		if (clk-&gt;pll_data)</div><div class='add'>+			clk-&gt;recalc = clk_pllclk_recalc;</div><div class='add'>+</div><div class='add'>+		/* Else, if it is a PLL-derived clock */</div><div class='add'>+		else if (clk-&gt;flags &amp; CLK_PLL)</div><div class='add'>+			clk-&gt;recalc = clk_sysclk_recalc;</div><div class='add'>+</div><div class='add'>+		/* Otherwise, it is a leaf clock (PSC clock) */</div><div class='add'>+		else if (clk-&gt;parent)</div><div class='add'>+			clk-&gt;recalc = clk_leafclk_recalc;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init c6x_clks_init(struct clk_lookup *clocks)</div><div class='add'>+{</div><div class='add'>+	struct clk_lookup *c;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	size_t num_clocks = 0;</div><div class='add'>+</div><div class='add'>+	for (c = clocks; c-&gt;clk; c++) {</div><div class='add'>+		clk = c-&gt;clk;</div><div class='add'>+</div><div class='add'>+		__init_clk(clk);</div><div class='add'>+		clk_register(clk);</div><div class='add'>+		num_clocks++;</div><div class='add'>+</div><div class='add'>+		/* Turn on clocks that Linux doesn't otherwise manage */</div><div class='add'>+		if (clk-&gt;flags &amp; ALWAYS_ENABLED)</div><div class='add'>+			clk_enable(clk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clkdev_add_table(clocks, num_clocks);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='add'>+</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+</div><div class='add'>+#define CLKNAME_MAX	10		/* longest clock name */</div><div class='add'>+#define NEST_DELTA	2</div><div class='add'>+#define NEST_MAX	4</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+dump_clock(struct seq_file *s, unsigned nest, struct clk *parent)</div><div class='add'>+{</div><div class='add'>+	char		*state;</div><div class='add'>+	char		buf[CLKNAME_MAX + NEST_DELTA * NEST_MAX];</div><div class='add'>+	struct clk	*clk;</div><div class='add'>+	unsigned	i;</div><div class='add'>+</div><div class='add'>+	if (parent-&gt;flags &amp; CLK_PLL)</div><div class='add'>+		state = "pll";</div><div class='add'>+	else</div><div class='add'>+		state = "";</div><div class='add'>+</div><div class='add'>+	/* &lt;nest spaces&gt; name &lt;pad to end&gt; */</div><div class='add'>+	memset(buf, ' ', sizeof(buf) - 1);</div><div class='add'>+	buf[sizeof(buf) - 1] = 0;</div><div class='add'>+	i = strlen(parent-&gt;name);</div><div class='add'>+	memcpy(buf + nest, parent-&gt;name,</div><div class='add'>+	       min(i, (unsigned)(sizeof(buf) - 1 - nest)));</div><div class='add'>+</div><div class='add'>+	seq_printf(s, "%s users=%2d %-3s %9ld Hz\n",</div><div class='add'>+		   buf, parent-&gt;usecount, state, clk_get_rate(parent));</div><div class='add'>+	/* REVISIT show device associations too */</div><div class='add'>+</div><div class='add'>+	/* cost is now small, but not linear... */</div><div class='add'>+	list_for_each_entry(clk, &amp;parent-&gt;children, childnode) {</div><div class='add'>+		dump_clock(s, nest + NEST_DELTA, clk);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int c6x_ck_show(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct clk *clk;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Show clock tree; We trust nonzero usecounts equate to PSC enables...</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;clocks_mutex);</div><div class='add'>+	list_for_each_entry(clk, &amp;clocks, node)</div><div class='add'>+		if (!clk-&gt;parent)</div><div class='add'>+			dump_clock(m, 0, clk);</div><div class='add'>+	mutex_unlock(&amp;clocks_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 c6x_ck_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, c6x_ck_show, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations c6x_ck_operations = {</div><div class='add'>+	.open		= c6x_ck_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init c6x_clk_debugfs_init(void)</div><div class='add'>+{</div><div class='add'>+	debugfs_create_file("c6x_clocks", S_IFREG | S_IRUGO, NULL, NULL,</div><div class='add'>+			    &amp;c6x_ck_operations);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+device_initcall(c6x_clk_debugfs_init);</div><div class='add'>+#endif /* CONFIG_DEBUG_FS */</div><div class='head'>diff --git a/arch/c6x/platforms/plldata.c b/arch/c6x/platforms/plldata.c<br/>new file mode 100644<br/>index 000000000000..2cfd6f42968f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/platforms/plldata.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/platforms/plldata.c</a></div><div class='hunk'>@@ -0,0 +1,404 @@</div><div class='add'>+/*</div><div class='add'>+ *  Port on Texas Instruments TMS320C6x architecture</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Author: Mark Salter &lt;msalter@redhat.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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/clkdev.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/clock.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Common SoC clock support.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Default input for PLL1 */</div><div class='add'>+struct clk clkin1 = {</div><div class='add'>+	.name = "clkin1",</div><div class='add'>+	.node = LIST_HEAD_INIT(clkin1.node),</div><div class='add'>+	.children = LIST_HEAD_INIT(clkin1.children),</div><div class='add'>+	.childnode = LIST_HEAD_INIT(clkin1.childnode),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pll_data c6x_soc_pll1 = {</div><div class='add'>+	.num	   = 1,</div><div class='add'>+	.sysclks   = {</div><div class='add'>+		{</div><div class='add'>+			.name = "pll1",</div><div class='add'>+			.parent = &amp;clkin1,</div><div class='add'>+			.pll_data = &amp;c6x_soc_pll1,</div><div class='add'>+			.flags = CLK_PLL,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "pll1_sysclk1",</div><div class='add'>+			.parent = &amp;c6x_soc_pll1.sysclks[0],</div><div class='add'>+			.flags = CLK_PLL,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "pll1_sysclk2",</div><div class='add'>+			.parent = &amp;c6x_soc_pll1.sysclks[0],</div><div class='add'>+			.flags = CLK_PLL,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "pll1_sysclk3",</div><div class='add'>+			.parent = &amp;c6x_soc_pll1.sysclks[0],</div><div class='add'>+			.flags = CLK_PLL,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "pll1_sysclk4",</div><div class='add'>+			.parent = &amp;c6x_soc_pll1.sysclks[0],</div><div class='add'>+			.flags = CLK_PLL,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "pll1_sysclk5",</div><div class='add'>+			.parent = &amp;c6x_soc_pll1.sysclks[0],</div><div class='add'>+			.flags = CLK_PLL,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "pll1_sysclk6",</div><div class='add'>+			.parent = &amp;c6x_soc_pll1.sysclks[0],</div><div class='add'>+			.flags = CLK_PLL,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "pll1_sysclk7",</div><div class='add'>+			.parent = &amp;c6x_soc_pll1.sysclks[0],</div><div class='add'>+			.flags = CLK_PLL,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "pll1_sysclk8",</div><div class='add'>+			.parent = &amp;c6x_soc_pll1.sysclks[0],</div><div class='add'>+			.flags = CLK_PLL,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "pll1_sysclk9",</div><div class='add'>+			.parent = &amp;c6x_soc_pll1.sysclks[0],</div><div class='add'>+			.flags = CLK_PLL,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "pll1_sysclk10",</div><div class='add'>+			.parent = &amp;c6x_soc_pll1.sysclks[0],</div><div class='add'>+			.flags = CLK_PLL,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "pll1_sysclk11",</div><div class='add'>+			.parent = &amp;c6x_soc_pll1.sysclks[0],</div><div class='add'>+			.flags = CLK_PLL,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "pll1_sysclk12",</div><div class='add'>+			.parent = &amp;c6x_soc_pll1.sysclks[0],</div><div class='add'>+			.flags = CLK_PLL,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "pll1_sysclk13",</div><div class='add'>+			.parent = &amp;c6x_soc_pll1.sysclks[0],</div><div class='add'>+			.flags = CLK_PLL,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "pll1_sysclk14",</div><div class='add'>+			.parent = &amp;c6x_soc_pll1.sysclks[0],</div><div class='add'>+			.flags = CLK_PLL,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "pll1_sysclk15",</div><div class='add'>+			.parent = &amp;c6x_soc_pll1.sysclks[0],</div><div class='add'>+			.flags = CLK_PLL,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "pll1_sysclk16",</div><div class='add'>+			.parent = &amp;c6x_soc_pll1.sysclks[0],</div><div class='add'>+			.flags = CLK_PLL,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CPU core clock */</div><div class='add'>+struct clk c6x_core_clk = {</div><div class='add'>+	.name = "core",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* miscellaneous IO clocks */</div><div class='add'>+struct clk c6x_i2c_clk = {</div><div class='add'>+	.name = "i2c",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clk c6x_watchdog_clk = {</div><div class='add'>+	.name = "watchdog",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clk c6x_mcbsp1_clk = {</div><div class='add'>+	.name = "mcbsp1",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clk c6x_mcbsp2_clk = {</div><div class='add'>+	.name = "mcbsp2",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clk c6x_mdio_clk = {</div><div class='add'>+	.name = "mdio",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SOC_TMS320C6455</div><div class='add'>+static struct clk_lookup c6455_clks[] = {</div><div class='add'>+	CLK(NULL, "pll1", &amp;c6x_soc_pll1.sysclks[0]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk2", &amp;c6x_soc_pll1.sysclks[2]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk3", &amp;c6x_soc_pll1.sysclks[3]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk4", &amp;c6x_soc_pll1.sysclks[4]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk5", &amp;c6x_soc_pll1.sysclks[5]),</div><div class='add'>+	CLK(NULL, "core", &amp;c6x_core_clk),</div><div class='add'>+	CLK("i2c_davinci.1", NULL, &amp;c6x_i2c_clk),</div><div class='add'>+	CLK("watchdog", NULL, &amp;c6x_watchdog_clk),</div><div class='add'>+	CLK("2c81800.mdio", NULL, &amp;c6x_mdio_clk),</div><div class='add'>+	CLK("", NULL, NULL)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void __init c6455_setup_clocks(struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	struct pll_data *pll = &amp;c6x_soc_pll1;</div><div class='add'>+	struct clk *sysclks = pll-&gt;sysclks;</div><div class='add'>+</div><div class='add'>+	pll-&gt;flags = PLL_HAS_PRE | PLL_HAS_MUL;</div><div class='add'>+</div><div class='add'>+	sysclks[2].flags |= FIXED_DIV_PLL;</div><div class='add'>+	sysclks[2].div = 3;</div><div class='add'>+	sysclks[3].flags |= FIXED_DIV_PLL;</div><div class='add'>+	sysclks[3].div = 6;</div><div class='add'>+	sysclks[4].div = PLLDIV4;</div><div class='add'>+	sysclks[5].div = PLLDIV5;</div><div class='add'>+</div><div class='add'>+	c6x_core_clk.parent = &amp;sysclks[0];</div><div class='add'>+	c6x_i2c_clk.parent = &amp;sysclks[3];</div><div class='add'>+	c6x_watchdog_clk.parent = &amp;sysclks[3];</div><div class='add'>+	c6x_mdio_clk.parent = &amp;sysclks[3];</div><div class='add'>+</div><div class='add'>+	c6x_clks_init(c6455_clks);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_SOC_TMS320C6455 */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SOC_TMS320C6457</div><div class='add'>+static struct clk_lookup c6457_clks[] = {</div><div class='add'>+	CLK(NULL, "pll1", &amp;c6x_soc_pll1.sysclks[0]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk1", &amp;c6x_soc_pll1.sysclks[1]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk2", &amp;c6x_soc_pll1.sysclks[2]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk3", &amp;c6x_soc_pll1.sysclks[3]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk4", &amp;c6x_soc_pll1.sysclks[4]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk5", &amp;c6x_soc_pll1.sysclks[5]),</div><div class='add'>+	CLK(NULL, "core", &amp;c6x_core_clk),</div><div class='add'>+	CLK("i2c_davinci.1", NULL, &amp;c6x_i2c_clk),</div><div class='add'>+	CLK("watchdog", NULL, &amp;c6x_watchdog_clk),</div><div class='add'>+	CLK("2c81800.mdio", NULL, &amp;c6x_mdio_clk),</div><div class='add'>+	CLK("", NULL, NULL)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init c6457_setup_clocks(struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	struct pll_data *pll = &amp;c6x_soc_pll1;</div><div class='add'>+	struct clk *sysclks = pll-&gt;sysclks;</div><div class='add'>+</div><div class='add'>+	pll-&gt;flags = PLL_HAS_MUL | PLL_HAS_POST;</div><div class='add'>+</div><div class='add'>+	sysclks[1].flags |= FIXED_DIV_PLL;</div><div class='add'>+	sysclks[1].div = 1;</div><div class='add'>+	sysclks[2].flags |= FIXED_DIV_PLL;</div><div class='add'>+	sysclks[2].div = 3;</div><div class='add'>+	sysclks[3].flags |= FIXED_DIV_PLL;</div><div class='add'>+	sysclks[3].div = 6;</div><div class='add'>+	sysclks[4].div = PLLDIV4;</div><div class='add'>+	sysclks[5].div = PLLDIV5;</div><div class='add'>+</div><div class='add'>+	c6x_core_clk.parent = &amp;sysclks[1];</div><div class='add'>+	c6x_i2c_clk.parent = &amp;sysclks[3];</div><div class='add'>+	c6x_watchdog_clk.parent = &amp;sysclks[5];</div><div class='add'>+	c6x_mdio_clk.parent = &amp;sysclks[5];</div><div class='add'>+</div><div class='add'>+	c6x_clks_init(c6457_clks);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_SOC_TMS320C6455 */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SOC_TMS320C6472</div><div class='add'>+static struct clk_lookup c6472_clks[] = {</div><div class='add'>+	CLK(NULL, "pll1", &amp;c6x_soc_pll1.sysclks[0]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk1", &amp;c6x_soc_pll1.sysclks[1]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk2", &amp;c6x_soc_pll1.sysclks[2]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk3", &amp;c6x_soc_pll1.sysclks[3]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk4", &amp;c6x_soc_pll1.sysclks[4]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk5", &amp;c6x_soc_pll1.sysclks[5]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk6", &amp;c6x_soc_pll1.sysclks[6]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk7", &amp;c6x_soc_pll1.sysclks[7]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk8", &amp;c6x_soc_pll1.sysclks[8]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk9", &amp;c6x_soc_pll1.sysclks[9]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk10", &amp;c6x_soc_pll1.sysclks[10]),</div><div class='add'>+	CLK(NULL, "core", &amp;c6x_core_clk),</div><div class='add'>+	CLK("i2c_davinci.1", NULL, &amp;c6x_i2c_clk),</div><div class='add'>+	CLK("watchdog", NULL, &amp;c6x_watchdog_clk),</div><div class='add'>+	CLK("2c81800.mdio", NULL, &amp;c6x_mdio_clk),</div><div class='add'>+	CLK("", NULL, NULL)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* assumptions used for delay loop calculations */</div><div class='add'>+#define MIN_CLKIN1_KHz 15625</div><div class='add'>+#define MAX_CORE_KHz   700000</div><div class='add'>+#define MIN_PLLOUT_KHz MIN_CLKIN1_KHz</div><div class='add'>+</div><div class='add'>+static void __init c6472_setup_clocks(struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	struct pll_data *pll = &amp;c6x_soc_pll1;</div><div class='add'>+	struct clk *sysclks = pll-&gt;sysclks;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	pll-&gt;flags = PLL_HAS_MUL;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt;= 6; i++) {</div><div class='add'>+		sysclks[i].flags |= FIXED_DIV_PLL;</div><div class='add'>+		sysclks[i].div = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sysclks[7].flags |= FIXED_DIV_PLL;</div><div class='add'>+	sysclks[7].div = 3;</div><div class='add'>+	sysclks[8].flags |= FIXED_DIV_PLL;</div><div class='add'>+	sysclks[8].div = 6;</div><div class='add'>+	sysclks[9].flags |= FIXED_DIV_PLL;</div><div class='add'>+	sysclks[9].div = 2;</div><div class='add'>+	sysclks[10].div = PLLDIV10;</div><div class='add'>+</div><div class='add'>+	c6x_core_clk.parent = &amp;sysclks[get_coreid() + 1];</div><div class='add'>+	c6x_i2c_clk.parent = &amp;sysclks[8];</div><div class='add'>+	c6x_watchdog_clk.parent = &amp;sysclks[8];</div><div class='add'>+	c6x_mdio_clk.parent = &amp;sysclks[5];</div><div class='add'>+</div><div class='add'>+	c6x_clks_init(c6472_clks);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_SOC_TMS320C6472 */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SOC_TMS320C6474</div><div class='add'>+static struct clk_lookup c6474_clks[] = {</div><div class='add'>+	CLK(NULL, "pll1", &amp;c6x_soc_pll1.sysclks[0]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk7", &amp;c6x_soc_pll1.sysclks[7]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk9", &amp;c6x_soc_pll1.sysclks[9]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk10", &amp;c6x_soc_pll1.sysclks[10]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk11", &amp;c6x_soc_pll1.sysclks[11]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk12", &amp;c6x_soc_pll1.sysclks[12]),</div><div class='add'>+	CLK(NULL, "pll1_sysclk13", &amp;c6x_soc_pll1.sysclks[13]),</div><div class='add'>+	CLK(NULL, "core", &amp;c6x_core_clk),</div><div class='add'>+	CLK("i2c_davinci.1", NULL, &amp;c6x_i2c_clk),</div><div class='add'>+	CLK("mcbsp.1", NULL, &amp;c6x_mcbsp1_clk),</div><div class='add'>+	CLK("mcbsp.2", NULL, &amp;c6x_mcbsp2_clk),</div><div class='add'>+	CLK("watchdog", NULL, &amp;c6x_watchdog_clk),</div><div class='add'>+	CLK("2c81800.mdio", NULL, &amp;c6x_mdio_clk),</div><div class='add'>+	CLK("", NULL, NULL)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init c6474_setup_clocks(struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	struct pll_data *pll = &amp;c6x_soc_pll1;</div><div class='add'>+	struct clk *sysclks = pll-&gt;sysclks;</div><div class='add'>+</div><div class='add'>+	pll-&gt;flags = PLL_HAS_MUL;</div><div class='add'>+</div><div class='add'>+	sysclks[7].flags |= FIXED_DIV_PLL;</div><div class='add'>+	sysclks[7].div = 1;</div><div class='add'>+	sysclks[9].flags |= FIXED_DIV_PLL;</div><div class='add'>+	sysclks[9].div = 3;</div><div class='add'>+	sysclks[10].flags |= FIXED_DIV_PLL;</div><div class='add'>+	sysclks[10].div = 6;</div><div class='add'>+</div><div class='add'>+	sysclks[11].div = PLLDIV11;</div><div class='add'>+</div><div class='add'>+	sysclks[12].flags |= FIXED_DIV_PLL;</div><div class='add'>+	sysclks[12].div = 2;</div><div class='add'>+</div><div class='add'>+	sysclks[13].div = PLLDIV13;</div><div class='add'>+</div><div class='add'>+	c6x_core_clk.parent = &amp;sysclks[7];</div><div class='add'>+	c6x_i2c_clk.parent = &amp;sysclks[10];</div><div class='add'>+	c6x_watchdog_clk.parent = &amp;sysclks[10];</div><div class='add'>+	c6x_mcbsp1_clk.parent = &amp;sysclks[10];</div><div class='add'>+	c6x_mcbsp2_clk.parent = &amp;sysclks[10];</div><div class='add'>+</div><div class='add'>+	c6x_clks_init(c6474_clks);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_SOC_TMS320C6474 */</div><div class='add'>+</div><div class='add'>+static struct of_device_id c6x_clkc_match[] __initdata = {</div><div class='add'>+#ifdef CONFIG_SOC_TMS320C6455</div><div class='add'>+	{ .compatible = "ti,c6455-pll", .data = c6455_setup_clocks },</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SOC_TMS320C6457</div><div class='add'>+	{ .compatible = "ti,c6457-pll", .data = c6457_setup_clocks },</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SOC_TMS320C6472</div><div class='add'>+	{ .compatible = "ti,c6472-pll", .data = c6472_setup_clocks },</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SOC_TMS320C6474</div><div class='add'>+	{ .compatible = "ti,c6474-pll", .data = c6474_setup_clocks },</div><div class='add'>+#endif</div><div class='add'>+	{ .compatible = "ti,c64x+pll" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init c64x_setup_clocks(void)</div><div class='add'>+{</div><div class='add'>+	void (*__setup_clocks)(struct device_node *np);</div><div class='add'>+	struct pll_data *pll = &amp;c6x_soc_pll1;</div><div class='add'>+	struct device_node *node;</div><div class='add'>+	const struct of_device_id *id;</div><div class='add'>+	int err;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	node = of_find_matching_node(NULL, c6x_clkc_match);</div><div class='add'>+	if (!node)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pll-&gt;base = of_iomap(node, 0);</div><div class='add'>+	if (!pll-&gt;base)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32(node, "clock-frequency", &amp;val);</div><div class='add'>+	if (err || val == 0) {</div><div class='add'>+		pr_err("%s: no clock-frequency found! Using %dMHz\n",</div><div class='add'>+		       node-&gt;full_name, (int)val / 1000000);</div><div class='add'>+		val = 25000000;</div><div class='add'>+	}</div><div class='add'>+	clkin1.rate = val;</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32(node, "ti,c64x+pll-bypass-delay", &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		val = 5000;</div><div class='add'>+	pll-&gt;bypass_delay = val;</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32(node, "ti,c64x+pll-reset-delay", &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		val = 30000;</div><div class='add'>+	pll-&gt;reset_delay = val;</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32(node, "ti,c64x+pll-lock-delay", &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		val = 30000;</div><div class='add'>+	pll-&gt;lock_delay = val;</div><div class='add'>+</div><div class='add'>+	/* id-&gt;data is a pointer to SoC-specific setup */</div><div class='add'>+	id = of_match_node(c6x_clkc_match, node);</div><div class='add'>+	if (id &amp;&amp; id-&gt;data) {</div><div class='add'>+		__setup_clocks = id-&gt;data;</div><div class='add'>+		__setup_clocks(node);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	of_node_put(node);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/c6x/platforms/timer64.c b/arch/c6x/platforms/timer64.c<br/>new file mode 100644<br/>index 000000000000..03c03c249191<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/c6x/platforms/timer64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/c6x/platforms/timer64.c</a></div><div class='hunk'>@@ -0,0 +1,244 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2010, 2011 Texas Instruments Incorporated</div><div class='add'>+ *  Contributed by: Mark Salter (msalter@redhat.com)</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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clockchips.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/of.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;asm/soc.h&gt;</div><div class='add'>+#include &lt;asm/dscr.h&gt;</div><div class='add'>+#include &lt;asm/timer64.h&gt;</div><div class='add'>+</div><div class='add'>+struct timer_regs {</div><div class='add'>+	u32	reserved0;</div><div class='add'>+	u32	emumgt;</div><div class='add'>+	u32	reserved1;</div><div class='add'>+	u32	reserved2;</div><div class='add'>+	u32	cntlo;</div><div class='add'>+	u32	cnthi;</div><div class='add'>+	u32	prdlo;</div><div class='add'>+	u32	prdhi;</div><div class='add'>+	u32	tcr;</div><div class='add'>+	u32	tgcr;</div><div class='add'>+	u32	wdtcr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct timer_regs __iomem *timer;</div><div class='add'>+</div><div class='add'>+#define TCR_TSTATLO	     0x001</div><div class='add'>+#define TCR_INVOUTPLO	     0x002</div><div class='add'>+#define TCR_INVINPLO	     0x004</div><div class='add'>+#define TCR_CPLO	     0x008</div><div class='add'>+#define TCR_ENAMODELO_ONCE   0x040</div><div class='add'>+#define TCR_ENAMODELO_CONT   0x080</div><div class='add'>+#define TCR_ENAMODELO_MASK   0x0c0</div><div class='add'>+#define TCR_PWIDLO_MASK      0x030</div><div class='add'>+#define TCR_CLKSRCLO	     0x100</div><div class='add'>+#define TCR_TIENLO	     0x200</div><div class='add'>+#define TCR_TSTATHI	     (0x001 &lt;&lt; 16)</div><div class='add'>+#define TCR_INVOUTPHI	     (0x002 &lt;&lt; 16)</div><div class='add'>+#define TCR_CPHI	     (0x008 &lt;&lt; 16)</div><div class='add'>+#define TCR_PWIDHI_MASK      (0x030 &lt;&lt; 16)</div><div class='add'>+#define TCR_ENAMODEHI_ONCE   (0x040 &lt;&lt; 16)</div><div class='add'>+#define TCR_ENAMODEHI_CONT   (0x080 &lt;&lt; 16)</div><div class='add'>+#define TCR_ENAMODEHI_MASK   (0x0c0 &lt;&lt; 16)</div><div class='add'>+</div><div class='add'>+#define TGCR_TIMLORS	     0x001</div><div class='add'>+#define TGCR_TIMHIRS	     0x002</div><div class='add'>+#define TGCR_TIMMODE_UD32    0x004</div><div class='add'>+#define TGCR_TIMMODE_WDT64   0x008</div><div class='add'>+#define TGCR_TIMMODE_CD32    0x00c</div><div class='add'>+#define TGCR_TIMMODE_MASK    0x00c</div><div class='add'>+#define TGCR_PSCHI_MASK      (0x00f &lt;&lt; 8)</div><div class='add'>+#define TGCR_TDDRHI_MASK     (0x00f &lt;&lt; 12)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Timer clocks are divided down from the CPU clock</div><div class='add'>+ * The divisor is in the EMUMGTCLKSPD register</div><div class='add'>+ */</div><div class='add'>+#define TIMER_DIVISOR \</div><div class='add'>+	((soc_readl(&amp;timer-&gt;emumgt) &amp; (0xf &lt;&lt; 16)) &gt;&gt; 16)</div><div class='add'>+</div><div class='add'>+#define TIMER64_RATE (c6x_core_freq / TIMER_DIVISOR)</div><div class='add'>+</div><div class='add'>+#define TIMER64_MODE_DISABLED 0</div><div class='add'>+#define TIMER64_MODE_ONE_SHOT TCR_ENAMODELO_ONCE</div><div class='add'>+#define TIMER64_MODE_PERIODIC TCR_ENAMODELO_CONT</div><div class='add'>+</div><div class='add'>+static int timer64_mode;</div><div class='add'>+static int timer64_devstate_id = -1;</div><div class='add'>+</div><div class='add'>+static void timer64_config(unsigned long period)</div><div class='add'>+{</div><div class='add'>+	u32 tcr = soc_readl(&amp;timer-&gt;tcr) &amp; ~TCR_ENAMODELO_MASK;</div><div class='add'>+</div><div class='add'>+	soc_writel(tcr, &amp;timer-&gt;tcr);</div><div class='add'>+	soc_writel(period - 1, &amp;timer-&gt;prdlo);</div><div class='add'>+	soc_writel(0, &amp;timer-&gt;cntlo);</div><div class='add'>+	tcr |= timer64_mode;</div><div class='add'>+	soc_writel(tcr, &amp;timer-&gt;tcr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void timer64_enable(void)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (timer64_devstate_id &gt;= 0)</div><div class='add'>+		dscr_set_devstate(timer64_devstate_id, DSCR_DEVSTATE_ENABLED);</div><div class='add'>+</div><div class='add'>+	/* disable timer, reset count */</div><div class='add'>+	soc_writel(soc_readl(&amp;timer-&gt;tcr) &amp; ~TCR_ENAMODELO_MASK, &amp;timer-&gt;tcr);</div><div class='add'>+	soc_writel(0, &amp;timer-&gt;prdlo);</div><div class='add'>+</div><div class='add'>+	/* use internal clock and 1 cycle pulse width */</div><div class='add'>+	val = soc_readl(&amp;timer-&gt;tcr);</div><div class='add'>+	soc_writel(val &amp; ~(TCR_CLKSRCLO | TCR_PWIDLO_MASK), &amp;timer-&gt;tcr);</div><div class='add'>+</div><div class='add'>+	/* dual 32-bit unchained mode */</div><div class='add'>+	val = soc_readl(&amp;timer-&gt;tgcr) &amp; ~TGCR_TIMMODE_MASK;</div><div class='add'>+	soc_writel(val, &amp;timer-&gt;tgcr);</div><div class='add'>+	soc_writel(val | (TGCR_TIMLORS | TGCR_TIMMODE_UD32), &amp;timer-&gt;tgcr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void timer64_disable(void)</div><div class='add'>+{</div><div class='add'>+	/* disable timer, reset count */</div><div class='add'>+	soc_writel(soc_readl(&amp;timer-&gt;tcr) &amp; ~TCR_ENAMODELO_MASK, &amp;timer-&gt;tcr);</div><div class='add'>+	soc_writel(0, &amp;timer-&gt;prdlo);</div><div class='add'>+</div><div class='add'>+	if (timer64_devstate_id &gt;= 0)</div><div class='add'>+		dscr_set_devstate(timer64_devstate_id, DSCR_DEVSTATE_DISABLED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int next_event(unsigned long delta,</div><div class='add'>+		      struct clock_event_device *evt)</div><div class='add'>+{</div><div class='add'>+	timer64_config(delta);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_clock_mode(enum clock_event_mode mode,</div><div class='add'>+			   struct clock_event_device *evt)</div><div class='add'>+{</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case CLOCK_EVT_MODE_PERIODIC:</div><div class='add'>+		timer64_enable();</div><div class='add'>+		timer64_mode = TIMER64_MODE_PERIODIC;</div><div class='add'>+		timer64_config(TIMER64_RATE / HZ);</div><div class='add'>+		break;</div><div class='add'>+	case CLOCK_EVT_MODE_ONESHOT:</div><div class='add'>+		timer64_enable();</div><div class='add'>+		timer64_mode = TIMER64_MODE_ONE_SHOT;</div><div class='add'>+		break;</div><div class='add'>+	case CLOCK_EVT_MODE_UNUSED:</div><div class='add'>+	case CLOCK_EVT_MODE_SHUTDOWN:</div><div class='add'>+		timer64_mode = TIMER64_MODE_DISABLED;</div><div class='add'>+		timer64_disable();</div><div class='add'>+		break;</div><div class='add'>+	case CLOCK_EVT_MODE_RESUME:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clock_event_device t64_clockevent_device = {</div><div class='add'>+	.name		= "TIMER64_EVT32_TIMER",</div><div class='add'>+	.features	= CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC,</div><div class='add'>+	.rating		= 200,</div><div class='add'>+	.set_mode	= set_clock_mode,</div><div class='add'>+	.set_next_event	= next_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static irqreturn_t timer_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct clock_event_device *cd = &amp;t64_clockevent_device;</div><div class='add'>+</div><div class='add'>+	cd-&gt;event_handler(cd);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irqaction timer_iact = {</div><div class='add'>+	.name		= "timer",</div><div class='add'>+	.flags		= IRQF_TIMER,</div><div class='add'>+	.handler	= timer_interrupt,</div><div class='add'>+	.dev_id		= &amp;t64_clockevent_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init timer64_init(void)</div><div class='add'>+{</div><div class='add'>+	struct clock_event_device *cd = &amp;t64_clockevent_device;</div><div class='add'>+	struct device_node *np, *first = NULL;</div><div class='add'>+	u32 val;</div><div class='add'>+	int err, found = 0;</div><div class='add'>+</div><div class='add'>+	for_each_compatible_node(np, NULL, "ti,c64x+timer64") {</div><div class='add'>+		err = of_property_read_u32(np, "ti,core-mask", &amp;val);</div><div class='add'>+		if (!err) {</div><div class='add'>+			if (val &amp; (1 &lt;&lt; get_coreid())) {</div><div class='add'>+				found = 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else if (!first)</div><div class='add'>+			first = np;</div><div class='add'>+	}</div><div class='add'>+	if (!found) {</div><div class='add'>+		/* try first one with no core-mask */</div><div class='add'>+		if (first)</div><div class='add'>+			np = of_node_get(first);</div><div class='add'>+		else {</div><div class='add'>+			pr_debug("Cannot find ti,c64x+timer64 timer.\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	timer = of_iomap(np, 0);</div><div class='add'>+	if (!timer) {</div><div class='add'>+		pr_debug("%s: Cannot map timer registers.\n", np-&gt;full_name);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	pr_debug("%s: Timer registers=%p.\n", np-&gt;full_name, timer);</div><div class='add'>+</div><div class='add'>+	cd-&gt;irq	= irq_of_parse_and_map(np, 0);</div><div class='add'>+	if (cd-&gt;irq == NO_IRQ) {</div><div class='add'>+		pr_debug("%s: Cannot find interrupt.\n", np-&gt;full_name);</div><div class='add'>+		iounmap(timer);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If there is a device state control, save the ID. */</div><div class='add'>+	err = of_property_read_u32(np, "ti,dscr-dev-enable", &amp;val);</div><div class='add'>+	if (!err) {</div><div class='add'>+		timer64_devstate_id = val;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * It is necessary to enable the timer block here because</div><div class='add'>+		 * the TIMER_DIVISOR macro needs to read a timer register</div><div class='add'>+		 * to get the divisor.</div><div class='add'>+		 */</div><div class='add'>+		dscr_set_devstate(timer64_devstate_id, DSCR_DEVSTATE_ENABLED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("%s: Timer irq=%d.\n", np-&gt;full_name, cd-&gt;irq);</div><div class='add'>+</div><div class='add'>+	clockevents_calc_mult_shift(cd, c6x_core_freq / TIMER_DIVISOR, 5);</div><div class='add'>+</div><div class='add'>+	cd-&gt;max_delta_ns	= clockevent_delta2ns(0x7fffffff, cd);</div><div class='add'>+	cd-&gt;min_delta_ns	= clockevent_delta2ns(250, cd);</div><div class='add'>+</div><div class='add'>+	cd-&gt;cpumask		= cpumask_of(smp_processor_id());</div><div class='add'>+</div><div class='add'>+	clockevents_register_device(cd);</div><div class='add'>+	setup_irq(cd-&gt;irq, &amp;timer_iact);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	of_node_put(np);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig<br/>index 408b055c585f..b3abfb08aa5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/cris/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/cris/Kconfig</a></div><div class='hunk'>@@ -19,10 +19,6 @@ config GENERIC_CMOS_UPDATE</div><div class='ctx'> config ARCH_USES_GETTIMEOFFSET</div><div class='ctx'> 	def_bool n</div><div class='ctx'> </div><div class='del'>-config GENERIC_IOMAP</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='hunk'>@@ -52,6 +48,7 @@ config CRIS</div><div class='ctx'> 	select HAVE_IDE</div><div class='ctx'> 	select HAVE_GENERIC_HARDIRQS</div><div class='ctx'> 	select GENERIC_IRQ_SHOW</div><div class='add'>+	select GENERIC_IOMAP</div><div class='ctx'> </div><div class='ctx'> config HZ</div><div class='ctx'> 	int</div><div class='head'>diff --git a/arch/cris/Kconfig.debug b/arch/cris/Kconfig.debug<br/>index 0b9a630dc812..14881e81e8a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/Kconfig.debug?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/cris/Kconfig.debug</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/Kconfig.debug?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/cris/Kconfig.debug</a></div><div class='hunk'>@@ -1,6 +1,5 @@</div><div class='ctx'> menu "Kernel hacking"</div><div class='ctx'> </div><div class='del'>-#bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC</div><div class='ctx'> config PROFILING</div><div class='ctx'> 	bool "Kernel profiling support"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c<br/>index a2bde3744622..b34438e026be 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/drivers/axisflashmap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/cris/arch-v32/drivers/axisflashmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/drivers/axisflashmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/cris/arch-v32/drivers/axisflashmap.c</a></div><div class='hunk'>@@ -404,8 +404,7 @@ static int __init init_axis_flash(void)</div><div class='ctx'> 		 */</div><div class='ctx'> 		int blockstat;</div><div class='ctx'> 		do {</div><div class='del'>-			blockstat = main_mtd-&gt;block_isbad(main_mtd,</div><div class='del'>-				ptable_sector);</div><div class='add'>+			blockstat = mtd_block_isbad(main_mtd, ptable_sector);</div><div class='ctx'> 			if (blockstat &lt; 0)</div><div class='ctx'> 				ptable_sector = 0; /* read error */</div><div class='ctx'> 			else if (blockstat)</div><div class='hunk'>@@ -413,8 +412,8 @@ static int __init init_axis_flash(void)</div><div class='ctx'> 		} while (blockstat &amp;&amp; ptable_sector);</div><div class='ctx'> #endif</div><div class='ctx'> 		if (ptable_sector) {</div><div class='del'>-			main_mtd-&gt;read(main_mtd, ptable_sector, PAGESIZE,</div><div class='del'>-				&amp;len, page);</div><div class='add'>+			mtd_read(main_mtd, ptable_sector, PAGESIZE, &amp;len,</div><div class='add'>+				 page);</div><div class='ctx'> 			ptable_head = &amp;((struct partitiontable *) page)-&gt;head;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/include/asm/ipcbuf.h b/arch/cris/include/asm/ipcbuf.h<br/>index 8b0c18b02844..84c7e51cb6d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/cris/include/asm/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/cris/include/asm/ipcbuf.h</a></div><div class='hunk'>@@ -1,29 +1 @@</div><div class='del'>-#ifndef __CRIS_IPCBUF_H__</div><div class='del'>-#define __CRIS_IPCBUF_H__</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The user_ipc_perm structure for CRIS architecture.</div><div class='del'>- * Note extra padding because this structure is passed back and forth</div><div class='del'>- * between kernel and user space.</div><div class='del'>- *</div><div class='del'>- * Pad space is left for:</div><div class='del'>- * - 32-bit mode_t and seq</div><div class='del'>- * - 2 miscellaneous 32-bit values</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct ipc64_perm</div><div class='del'>-{</div><div class='del'>-	__kernel_key_t		key;</div><div class='del'>-	__kernel_uid32_t	uid;</div><div class='del'>-	__kernel_gid32_t	gid;</div><div class='del'>-	__kernel_uid32_t	cuid;</div><div class='del'>-	__kernel_gid32_t	cgid;</div><div class='del'>-	__kernel_mode_t		mode;</div><div class='del'>-	unsigned short		__pad1;</div><div class='del'>-	unsigned short		seq;</div><div class='del'>-	unsigned short		__pad2;</div><div class='del'>-	unsigned long		__unused1;</div><div class='del'>-	unsigned long		__unused2;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* __CRIS_IPCBUF_H__ */</div><div class='add'>+#include &lt;asm-generic/ipcbuf.h&gt;</div><div class='head'>diff --git a/arch/cris/include/asm/socket.h b/arch/cris/include/asm/socket.h<br/>index 1a4a61909ca8..e269264df7c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/include/asm/socket.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/cris/include/asm/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/cris/include/asm/socket.h</a></div><div class='hunk'>@@ -64,6 +64,9 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_RXQ_OVFL             40</div><div class='ctx'> </div><div class='add'>+#define SO_WIFI_STATUS		41</div><div class='add'>+#define SCM_WIFI_STATUS		SO_WIFI_STATUS</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_SOCKET_H */</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/include/asm/thread_info.h b/arch/cris/include/asm/thread_info.h<br/>index 332f19c54557..29b92884d793 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/cris/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/cris/include/asm/thread_info.h</a></div><div class='hunk'>@@ -86,7 +86,6 @@ struct thread_info {</div><div class='ctx'> #define TIF_RESTORE_SIGMASK	9	/* restore signal mask in do_signal() */</div><div class='ctx'> #define TIF_POLLING_NRFLAG	16	/* true if poll_idle() is polling TIF_NEED_RESCHED */</div><div class='ctx'> #define TIF_MEMDIE		17	/* is terminating due to OOM killer */</div><div class='del'>-#define TIF_FREEZE		18	/* is freezing for suspend */</div><div class='ctx'> </div><div class='ctx'> #define _TIF_SYSCALL_TRACE	(1&lt;&lt;TIF_SYSCALL_TRACE)</div><div class='ctx'> #define _TIF_NOTIFY_RESUME	(1&lt;&lt;TIF_NOTIFY_RESUME)</div><div class='hunk'>@@ -94,7 +93,6 @@ struct thread_info {</div><div class='ctx'> #define _TIF_NEED_RESCHED	(1&lt;&lt;TIF_NEED_RESCHED)</div><div class='ctx'> #define _TIF_RESTORE_SIGMASK	(1&lt;&lt;TIF_RESTORE_SIGMASK)</div><div class='ctx'> #define _TIF_POLLING_NRFLAG	(1&lt;&lt;TIF_POLLING_NRFLAG)</div><div class='del'>-#define _TIF_FREEZE		(1&lt;&lt;TIF_FREEZE)</div><div class='ctx'> </div><div class='ctx'> #define _TIF_WORK_MASK		0x0000FFFE	/* work to do on interrupt/exception return */</div><div class='ctx'> #define _TIF_ALLWORK_MASK	0x0000FFFF	/* work to do on any return to u-space */</div><div class='head'>diff --git a/arch/cris/include/asm/types.h b/arch/cris/include/asm/types.h<br/>index 551a12c0aa01..adaf82780bb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/include/asm/types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/cris/include/asm/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/cris/include/asm/types.h</a></div><div class='hunk'>@@ -3,12 +3,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/int-ll64.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-</div><div class='del'>-typedef unsigned short umode_t;</div><div class='del'>-</div><div class='del'>-#endif /* __ASSEMBLY__ */</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * These aren't exported outside the kernel to avoid name space clashes</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig<br/>index bad27a6ff407..a685910d2d5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/frv/Kconfig</a></div><div class='hunk'>@@ -8,6 +8,7 @@ config FRV</div><div class='ctx'> 	select HAVE_GENERIC_HARDIRQS</div><div class='ctx'> 	select GENERIC_IRQ_SHOW</div><div class='ctx'> 	select ARCH_HAVE_NMI_SAFE_CMPXCHG</div><div class='add'>+	select GENERIC_CPU_DEVICES</div><div class='ctx'> </div><div class='ctx'> config ZONE_DMA</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -317,6 +318,7 @@ config PCI</div><div class='ctx'> 	bool "Use PCI"</div><div class='ctx'> 	depends on MB93090_MB00</div><div class='ctx'> 	default y</div><div class='add'>+	select GENERIC_PCI_IOMAP</div><div class='ctx'> 	help</div><div class='ctx'> 	  Some FR-V systems (such as the MB93090-MB00 VDK) have PCI</div><div class='ctx'> 	  onboard. If you have one of these boards and you wish to use the PCI</div><div class='hunk'>@@ -341,16 +343,6 @@ source "drivers/pci/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/pcmcia/Kconfig"</div><div class='ctx'> </div><div class='del'>-#config MATH_EMULATION</div><div class='del'>-#	bool "Math emulation support (EXPERIMENTAL)"</div><div class='del'>-#	depends on EXPERIMENTAL</div><div class='del'>-#	help</div><div class='del'>-#	  At some point in the future, this will cause floating-point math</div><div class='del'>-#	  instructions to be emulated by the kernel on machines that lack a</div><div class='del'>-#	  floating-point math coprocessor.  Thrill-seekers and chronically</div><div class='del'>-#	  sleep-deprived psychotic hacker types can say Y now, everyone else</div><div class='del'>-#	  should probably wait a while.</div><div class='del'>-</div><div class='ctx'> menu "Power management options"</div><div class='ctx'> </div><div class='ctx'> config ARCH_SUSPEND_POSSIBLE</div><div class='head'>diff --git a/arch/frv/include/asm/io.h b/arch/frv/include/asm/io.h<br/>index ca7475e73b5e..8cb50a2fbcb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/include/asm/io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/include/asm/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/include/asm/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/frv/include/asm/io.h</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;asm/virtconvert.h&gt;</div><div class='ctx'> #include &lt;asm/string.h&gt;</div><div class='ctx'> #include &lt;asm/mb-regs.h&gt;</div><div class='add'>+#include &lt;asm-generic/pci_iomap.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -370,7 +371,6 @@ static inline void iowrite32_rep(void __iomem *p, const void *src, unsigned long</div><div class='ctx'> </div><div class='ctx'> /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */</div><div class='ctx'> struct pci_dev;</div><div class='del'>-extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);</div><div class='ctx'> static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/frv/include/asm/ipcbuf.h b/arch/frv/include/asm/ipcbuf.h<br/>index b546f67e455f..84c7e51cb6d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/include/asm/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/frv/include/asm/ipcbuf.h</a></div><div class='hunk'>@@ -1,30 +1 @@</div><div class='del'>-#ifndef __ASM_IPCBUF_H__</div><div class='del'>-#define __ASM_IPCBUF_H__</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The user_ipc_perm structure for FR-V architecture.</div><div class='del'>- * Note extra padding because this structure is passed back and forth</div><div class='del'>- * between kernel and user space.</div><div class='del'>- *</div><div class='del'>- * Pad space is left for:</div><div class='del'>- * - 32-bit mode_t and seq</div><div class='del'>- * - 2 miscellaneous 32-bit values</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct ipc64_perm</div><div class='del'>-{</div><div class='del'>-	__kernel_key_t		key;</div><div class='del'>-	__kernel_uid32_t	uid;</div><div class='del'>-	__kernel_gid32_t	gid;</div><div class='del'>-	__kernel_uid32_t	cuid;</div><div class='del'>-	__kernel_gid32_t	cgid;</div><div class='del'>-	__kernel_mode_t		mode;</div><div class='del'>-	unsigned short		__pad1;</div><div class='del'>-	unsigned short		seq;</div><div class='del'>-	unsigned short		__pad2;</div><div class='del'>-	unsigned long		__unused1;</div><div class='del'>-	unsigned long		__unused2;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_IPCBUF_H__ */</div><div class='del'>-</div><div class='add'>+#include &lt;asm-generic/ipcbuf.h&gt;</div><div class='head'>diff --git a/arch/frv/include/asm/param.h b/arch/frv/include/asm/param.h<br/>index 6859dd503ed3..a52dca9a9566 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/include/asm/param.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/include/asm/param.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/include/asm/param.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/frv/include/asm/param.h</a></div><div class='hunk'>@@ -1,22 +1,8 @@</div><div class='ctx'> #ifndef _ASM_PARAM_H</div><div class='ctx'> #define _ASM_PARAM_H</div><div class='ctx'> </div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-#define HZ		CONFIG_HZ	/* Internal kernel timer frequency */</div><div class='del'>-#define USER_HZ		100		/* .. some user interfaces are in "ticks" */</div><div class='del'>-#define CLOCKS_PER_SEC	(USER_HZ)	/* like times() */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef HZ</div><div class='del'>-#define HZ 100</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #define EXEC_PAGESIZE	16384</div><div class='ctx'> </div><div class='del'>-#ifndef NOGROUP</div><div class='del'>-#define NOGROUP		(-1)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define MAXHOSTNAMELEN		64	/* max length of hostname */</div><div class='add'>+#include &lt;asm-generic/param.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_PARAM_H */</div><div class='head'>diff --git a/arch/frv/include/asm/socket.h b/arch/frv/include/asm/socket.h<br/>index a6b26880c1ec..ce80fdadcce5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/include/asm/socket.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/include/asm/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/frv/include/asm/socket.h</a></div><div class='hunk'>@@ -62,5 +62,8 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_RXQ_OVFL             40</div><div class='ctx'> </div><div class='add'>+#define SO_WIFI_STATUS		41</div><div class='add'>+#define SCM_WIFI_STATUS		SO_WIFI_STATUS</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_SOCKET_H */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/frv/include/asm/thread_info.h b/arch/frv/include/asm/thread_info.h<br/>index cefbe73dc119..92d83ea99ae5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/frv/include/asm/thread_info.h</a></div><div class='hunk'>@@ -111,7 +111,6 @@ register struct thread_info *__current_thread_info asm("gr15");</div><div class='ctx'> #define TIF_RESTORE_SIGMASK	5	/* restore signal mask in do_signal() */</div><div class='ctx'> #define TIF_POLLING_NRFLAG	16	/* true if poll_idle() is polling TIF_NEED_RESCHED */</div><div class='ctx'> #define TIF_MEMDIE		17	/* is terminating due to OOM killer */</div><div class='del'>-#define TIF_FREEZE		18	/* freezing for suspend */</div><div class='ctx'> </div><div class='ctx'> #define _TIF_SYSCALL_TRACE	(1 &lt;&lt; TIF_SYSCALL_TRACE)</div><div class='ctx'> #define _TIF_NOTIFY_RESUME	(1 &lt;&lt; TIF_NOTIFY_RESUME)</div><div class='hunk'>@@ -120,7 +119,6 @@ register struct thread_info *__current_thread_info asm("gr15");</div><div class='ctx'> #define _TIF_SINGLESTEP		(1 &lt;&lt; TIF_SINGLESTEP)</div><div class='ctx'> #define _TIF_RESTORE_SIGMASK	(1 &lt;&lt; TIF_RESTORE_SIGMASK)</div><div class='ctx'> #define _TIF_POLLING_NRFLAG	(1 &lt;&lt; TIF_POLLING_NRFLAG)</div><div class='del'>-#define _TIF_FREEZE		(1 &lt;&lt; TIF_FREEZE)</div><div class='ctx'> </div><div class='ctx'> #define _TIF_WORK_MASK		0x0000FFFE	/* work to do on interrupt/exception return */</div><div class='ctx'> #define _TIF_ALLWORK_MASK	0x0000FFFF	/* work to do on any return to u-space */</div><div class='head'>diff --git a/arch/frv/include/asm/types.h b/arch/frv/include/asm/types.h<br/>index aa3e7fdc7f29..390a612f3a58 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/include/asm/types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/include/asm/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/frv/include/asm/types.h</a></div><div class='hunk'>@@ -14,12 +14,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/int-ll64.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-</div><div class='del'>-typedef unsigned short umode_t;</div><div class='del'>-</div><div class='del'>-#endif /* __ASSEMBLY__ */</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * These aren't exported outside the kernel to avoid name space clashes</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/frv/mb93090-mb00/Makefile b/arch/frv/mb93090-mb00/Makefile<br/>index b73b542f8f48..21f1df1b378a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/mb93090-mb00/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/mb93090-mb00/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/mb93090-mb00/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/frv/mb93090-mb00/Makefile</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> ifeq "$(CONFIG_PCI)" "y"</div><div class='del'>-obj-y := pci-frv.o pci-irq.o pci-vdk.o pci-iomap.o</div><div class='add'>+obj-y := pci-frv.o pci-irq.o pci-vdk.o</div><div class='ctx'> </div><div class='ctx'> ifeq "$(CONFIG_MMU)" "y"</div><div class='ctx'> obj-y += pci-dma.o</div><div class='head'>diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c<br/>index 6b4fb28e9f99..c28121765448 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/mb93090-mb00/pci-frv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/mb93090-mb00/pci-frv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/mb93090-mb00/pci-frv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/frv/mb93090-mb00/pci-frv.c</a></div><div class='hunk'>@@ -194,23 +194,3 @@ void __init pcibios_resource_survey(void)</div><div class='ctx'> 	pcibios_allocate_resources(1);</div><div class='ctx'> 	pcibios_assign_resources();</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  If we set up a device for bus mastering, we need to check the latency</div><div class='del'>- *  timer as certain crappy BIOSes forget to set it properly.</div><div class='del'>- */</div><div class='del'>-unsigned int pcibios_max_latency = 255;</div><div class='del'>-</div><div class='del'>-void pcibios_set_master(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	u8 lat;</div><div class='del'>-	pci_read_config_byte(dev, PCI_LATENCY_TIMER, &amp;lat);</div><div class='del'>-	if (lat &lt; 16)</div><div class='del'>-		lat = (64 &lt;= pcibios_max_latency) ? 64 : pcibios_max_latency;</div><div class='del'>-	else if (lat &gt; pcibios_max_latency)</div><div class='del'>-		lat = pcibios_max_latency;</div><div class='del'>-	else</div><div class='del'>-		return;</div><div class='del'>-	printk(KERN_DEBUG "PCI: Setting latency timer of device %s to %d\n", pci_name(dev), lat);</div><div class='del'>-	pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/frv/mb93090-mb00/pci-frv.h b/arch/frv/mb93090-mb00/pci-frv.h<br/>index f3fe55914793..089eeba4f3bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/mb93090-mb00/pci-frv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/mb93090-mb00/pci-frv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/mb93090-mb00/pci-frv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/frv/mb93090-mb00/pci-frv.h</a></div><div class='hunk'>@@ -26,8 +26,6 @@ extern unsigned int __nongpreldata pci_probe;</div><div class='ctx'> </div><div class='ctx'> /* pci-frv.c */</div><div class='ctx'> </div><div class='del'>-extern unsigned int pcibios_max_latency;</div><div class='del'>-</div><div class='ctx'> void pcibios_resource_survey(void);</div><div class='ctx'> </div><div class='ctx'> /* pci-vdk.c */</div><div class='head'>diff --git a/arch/frv/mb93090-mb00/pci-iomap.c b/arch/frv/mb93090-mb00/pci-iomap.c<br/>deleted file mode 100644<br/>index 35f6df28351e..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/mb93090-mb00/pci-iomap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/mb93090-mb00/pci-iomap.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-/* pci-iomap.c: description</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.</div><div class='del'>- * Written by David Howells (dhowells@redhat.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License</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'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='del'>-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)</div><div class='del'>-{</div><div class='del'>-	resource_size_t start = pci_resource_start(dev, bar);</div><div class='del'>-	resource_size_t len = pci_resource_len(dev, bar);</div><div class='del'>-	unsigned long flags = pci_resource_flags(dev, bar);</div><div class='del'>-</div><div class='del'>-	if (!len || !start)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if ((flags &amp; IORESOURCE_IO) || (flags &amp; IORESOURCE_MEM))</div><div class='del'>-		return (void __iomem *) start;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(pci_iomap);</div><div class='head'>diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c<br/>index f8dd37e49535..6b0b82ff4419 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/mb93090-mb00/pci-vdk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/frv/mb93090-mb00/pci-vdk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/mb93090-mb00/pci-vdk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/frv/mb93090-mb00/pci-vdk.c</a></div><div class='hunk'>@@ -327,11 +327,6 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> 	printk("### PCIBIOS_FIXUP_BUS(%d)\n",bus-&gt;number);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (bus-&gt;number == 0) {</div><div class='del'>-		bus-&gt;resource[0] = &amp;pci_ioport_resource;</div><div class='del'>-		bus-&gt;resource[1] = &amp;pci_iomem_resource;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	pci_read_bridge_bases(bus);</div><div class='ctx'> </div><div class='ctx'> 	if (bus-&gt;number == 0) {</div><div class='hunk'>@@ -357,6 +352,7 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> int __init pcibios_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_ops *dir = NULL;</div><div class='add'>+	LIST_HEAD(resources);</div><div class='ctx'> </div><div class='ctx'> 	if (!mb93090_mb00_detected)</div><div class='ctx'> 		return -ENXIO;</div><div class='hunk'>@@ -420,7 +416,10 @@ int __init pcibios_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk("PCI: Probing PCI hardware\n");</div><div class='del'>-	pci_root_bus = pci_scan_bus(0, pci_root_ops, NULL);</div><div class='add'>+	pci_add_resource(&amp;resources, &amp;pci_ioport_resource);</div><div class='add'>+	pci_add_resource(&amp;resources, &amp;pci_iomem_resource);</div><div class='add'>+	pci_root_bus = pci_scan_root_bus(NULL, 0, pci_root_ops, NULL,</div><div class='add'>+					 &amp;resources);</div><div class='ctx'> </div><div class='ctx'> 	pcibios_irq_init();</div><div class='ctx'> 	pcibios_fixup_peer_bridges();</div><div class='head'>diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig<br/>index d1f377f5d3b6..56e890df5053 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/h8300/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/h8300/Kconfig</a></div><div class='hunk'>@@ -4,6 +4,7 @@ config H8300</div><div class='ctx'> 	select HAVE_IDE</div><div class='ctx'> 	select HAVE_GENERIC_HARDIRQS</div><div class='ctx'> 	select GENERIC_IRQ_SHOW</div><div class='add'>+	select GENERIC_CPU_DEVICES</div><div class='ctx'> </div><div class='ctx'> config SYMBOL_PREFIX</div><div class='ctx'> 	string</div><div class='head'>diff --git a/arch/h8300/include/asm/ipcbuf.h b/arch/h8300/include/asm/ipcbuf.h<br/>index 2cd1ebcc109d..84c7e51cb6d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/h8300/include/asm/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/h8300/include/asm/ipcbuf.h</a></div><div class='hunk'>@@ -1,29 +1 @@</div><div class='del'>-#ifndef __H8300_IPCBUF_H__</div><div class='del'>-#define __H8300_IPCBUF_H__</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The user_ipc_perm structure for H8/300 architecture.</div><div class='del'>- * Note extra padding because this structure is passed back and forth</div><div class='del'>- * between kernel and user space.</div><div class='del'>- *</div><div class='del'>- * Pad space is left for:</div><div class='del'>- * - 32-bit mode_t and seq</div><div class='del'>- * - 2 miscellaneous 32-bit values</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct ipc64_perm</div><div class='del'>-{</div><div class='del'>-	__kernel_key_t		key;</div><div class='del'>-	__kernel_uid32_t	uid;</div><div class='del'>-	__kernel_gid32_t	gid;</div><div class='del'>-	__kernel_uid32_t	cuid;</div><div class='del'>-	__kernel_gid32_t	cgid;</div><div class='del'>-	__kernel_mode_t		mode;</div><div class='del'>-	unsigned short		__pad1;</div><div class='del'>-	unsigned short		seq;</div><div class='del'>-	unsigned short		__pad2;</div><div class='del'>-	unsigned long		__unused1;</div><div class='del'>-	unsigned long		__unused2;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* __H8300_IPCBUF_H__ */</div><div class='add'>+#include &lt;asm-generic/ipcbuf.h&gt;</div><div class='head'>diff --git a/arch/h8300/include/asm/pci.h b/arch/h8300/include/asm/pci.h<br/>index cc9762091c0a..0b2acaa3dd84 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/pci.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/h8300/include/asm/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/h8300/include/asm/pci.h</a></div><div class='hunk'>@@ -9,11 +9,6 @@</div><div class='ctx'> </div><div class='ctx'> #define pcibios_assign_all_busses()	0</div><div class='ctx'> </div><div class='del'>-static inline void pcibios_set_master(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	/* No special bus mastering setup handling */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void pcibios_penalize_isa_irq(int irq, int active)</div><div class='ctx'> {</div><div class='ctx'> 	/* We don't do dynamic PCI IRQ allocation */</div><div class='head'>diff --git a/arch/h8300/include/asm/socket.h b/arch/h8300/include/asm/socket.h<br/>index 04c0f4596eb5..cf1daab6f27e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/socket.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/h8300/include/asm/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/h8300/include/asm/socket.h</a></div><div class='hunk'>@@ -62,4 +62,7 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_RXQ_OVFL             40</div><div class='ctx'> </div><div class='add'>+#define SO_WIFI_STATUS		41</div><div class='add'>+#define SCM_WIFI_STATUS		SO_WIFI_STATUS</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_SOCKET_H */</div><div class='head'>diff --git a/arch/h8300/include/asm/thread_info.h b/arch/h8300/include/asm/thread_info.h<br/>index d6f1784bfdee..9c126e0c09aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/h8300/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/h8300/include/asm/thread_info.h</a></div><div class='hunk'>@@ -90,7 +90,6 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define TIF_MEMDIE		4	/* is terminating due to OOM killer */</div><div class='ctx'> #define TIF_RESTORE_SIGMASK	5	/* restore signal mask in do_signal() */</div><div class='ctx'> #define TIF_NOTIFY_RESUME	6	/* callback before returning to user */</div><div class='del'>-#define TIF_FREEZE		16	/* is freezing for suspend */</div><div class='ctx'> </div><div class='ctx'> /* as above, but as bit values */</div><div class='ctx'> #define _TIF_SYSCALL_TRACE	(1&lt;&lt;TIF_SYSCALL_TRACE)</div><div class='hunk'>@@ -99,7 +98,6 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define _TIF_POLLING_NRFLAG	(1&lt;&lt;TIF_POLLING_NRFLAG)</div><div class='ctx'> #define _TIF_RESTORE_SIGMASK	(1&lt;&lt;TIF_RESTORE_SIGMASK)</div><div class='ctx'> #define _TIF_NOTIFY_RESUME	(1 &lt;&lt; TIF_NOTIFY_RESUME)</div><div class='del'>-#define _TIF_FREEZE		(1&lt;&lt;TIF_FREEZE)</div><div class='ctx'> </div><div class='ctx'> #define _TIF_WORK_MASK		0x0000FFFE	/* work to do on interrupt/exception return */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/h8300/include/asm/types.h b/arch/h8300/include/asm/types.h<br/>index bb2c91a3522e..07257d9487d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/h8300/include/asm/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/h8300/include/asm/types.h</a></div><div class='hunk'>@@ -3,27 +3,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/int-ll64.h&gt;</div><div class='ctx'> </div><div class='del'>-#if !defined(__ASSEMBLY__)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This file is never included by application software unless</div><div class='del'>- * explicitly requested (e.g., via linux/types.h) in which case the</div><div class='del'>- * application is Linux specific so (user-) name space pollution is</div><div class='del'>- * not a major issue.  However, for interoperability, libraries still</div><div class='del'>- * need to be careful to avoid a name clashes.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-typedef unsigned short umode_t;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * These aren't exported outside the kernel to avoid name space clashes</div><div class='del'>- */</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> #define BITS_PER_LONG 32</div><div class='ctx'> </div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> </div><div class='del'>-#endif /* __ASSEMBLY__ */</div><div class='del'>-</div><div class='ctx'> #endif /* _H8300_TYPES_H */</div><div class='head'>diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig<br/>index 02513c2dd5ec..9059e3905887 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/hexagon/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/hexagon/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/hexagon/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/hexagon/Kconfig</a></div><div class='hunk'>@@ -26,6 +26,7 @@ config HEXAGON</div><div class='ctx'> 	select HAVE_ARCH_KGDB</div><div class='ctx'> 	select HAVE_ARCH_TRACEHOOK</div><div class='ctx'> 	select NO_IOPORT</div><div class='add'>+	select GENERIC_IOMAP</div><div class='ctx'> 	# mostly generic routines, with some accelerated ones</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Qualcomm Hexagon is a processor architecture designed for high</div><div class='hunk'>@@ -73,9 +74,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 GENERIC_IOMAP</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> #config ZONE_DMA</div><div class='ctx'> #	bool</div><div class='ctx'> #	default y</div><div class='head'>diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig<br/>index 3b7a7c483785..bd7266903bf8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/Kconfig</a></div><div class='hunk'>@@ -32,6 +32,7 @@ config IA64</div><div class='ctx'> 	select GENERIC_IRQ_SHOW</div><div class='ctx'> 	select ARCH_WANT_OPTIONAL_GPIOLIB</div><div class='ctx'> 	select ARCH_HAVE_NMI_SAFE_CMPXCHG</div><div class='add'>+	select GENERIC_IOMAP</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  The Itanium Processor Family is Intel's 64-bit successor to</div><div class='hunk'>@@ -105,10 +106,6 @@ config EFI</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-config GENERIC_IOMAP</div><div class='del'>-	bool</div><div class='del'>-	default y</div><div class='del'>-</div><div class='ctx'> config ARCH_CLOCKSOURCE_DATA</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/hp/common/aml_nfw.c b/arch/ia64/hp/common/aml_nfw.c<br/>index 22078486d35d..6192f7188654 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/hp/common/aml_nfw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/hp/common/aml_nfw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/hp/common/aml_nfw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/hp/common/aml_nfw.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@ MODULE_AUTHOR("Bjorn Helgaas &lt;bjorn.helgaas@hp.com&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("ACPI opregion handler for native firmware calls");</div><div class='ctx'> </div><div class='del'>-static int force_register;</div><div class='add'>+static bool force_register;</div><div class='ctx'> module_param_named(force, force_register, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(force, "Install opregion handler even without HPQ5001 device");</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/include/asm/intrinsics.h b/arch/ia64/include/asm/intrinsics.h<br/>index 111ed5222892..e4076b511829 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/intrinsics.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/intrinsics.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/intrinsics.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/include/asm/intrinsics.h</a></div><div class='hunk'>@@ -201,16 +201,21 @@ extern long ia64_cmpxchg_called_with_bad_pointer (void);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='del'>-#if defined(CONFIG_PARAVIRT) &amp;&amp; defined(__KERNEL__)</div><div class='del'>-#ifdef ASM_SUPPORTED</div><div class='del'>-# define IA64_INTRINSIC_API(name)	paravirt_ ## name</div><div class='del'>-#else</div><div class='del'>-# define IA64_INTRINSIC_API(name)	pv_cpu_ops.name</div><div class='del'>-#endif</div><div class='del'>-#define IA64_INTRINSIC_MACRO(name)	paravirt_ ## name</div><div class='del'>-#else</div><div class='add'>+</div><div class='ctx'> #define IA64_INTRINSIC_API(name)	ia64_native_ ## name</div><div class='ctx'> #define IA64_INTRINSIC_MACRO(name)	ia64_native_ ## name</div><div class='add'>+</div><div class='add'>+#if defined(__KERNEL__)</div><div class='add'>+#if defined(CONFIG_PARAVIRT)</div><div class='add'>+# undef IA64_INTRINSIC_API</div><div class='add'>+# undef IA64_INTRINSIC_MACRO</div><div class='add'>+# ifdef ASM_SUPPORTED</div><div class='add'>+#  define IA64_INTRINSIC_API(name)	paravirt_ ## name</div><div class='add'>+# else</div><div class='add'>+#  define IA64_INTRINSIC_API(name)	pv_cpu_ops.name</div><div class='add'>+# endif</div><div class='add'>+#define IA64_INTRINSIC_MACRO(name)	paravirt_ ## name</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /************************************************/</div><div class='head'>diff --git a/arch/ia64/include/asm/iommu.h b/arch/ia64/include/asm/iommu.h<br/>index 105c93b00b1b..b6a809fa2995 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/iommu.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/iommu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/iommu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/include/asm/iommu.h</a></div><div class='hunk'>@@ -11,10 +11,12 @@ extern void no_iommu_init(void);</div><div class='ctx'> extern int force_iommu, no_iommu;</div><div class='ctx'> extern int iommu_pass_through;</div><div class='ctx'> extern int iommu_detected;</div><div class='add'>+extern int iommu_group_mf;</div><div class='ctx'> #else</div><div class='ctx'> #define iommu_pass_through	(0)</div><div class='ctx'> #define no_iommu		(1)</div><div class='ctx'> #define iommu_detected		(0)</div><div class='add'>+#define iommu_group_mf		(0)</div><div class='ctx'> #endif</div><div class='ctx'> extern void iommu_dma_init(void);</div><div class='ctx'> extern void machvec_init(const char *name);</div><div class='head'>diff --git a/arch/ia64/include/asm/ipcbuf.h b/arch/ia64/include/asm/ipcbuf.h<br/>index 079899ae7d32..84c7e51cb6d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/include/asm/ipcbuf.h</a></div><div class='hunk'>@@ -1,28 +1 @@</div><div class='del'>-#ifndef _ASM_IA64_IPCBUF_H</div><div class='del'>-#define _ASM_IA64_IPCBUF_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The ipc64_perm structure for IA-64 architecture.</div><div class='del'>- * Note extra padding because this structure is passed back and forth</div><div class='del'>- * between kernel and user space.</div><div class='del'>- *</div><div class='del'>- * Pad space is left for:</div><div class='del'>- * - 32-bit seq</div><div class='del'>- * - 2 miscellaneous 64-bit values</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct ipc64_perm</div><div class='del'>-{</div><div class='del'>-	__kernel_key_t	key;</div><div class='del'>-	__kernel_uid_t	uid;</div><div class='del'>-	__kernel_gid_t	gid;</div><div class='del'>-	__kernel_uid_t	cuid;</div><div class='del'>-	__kernel_gid_t	cgid;</div><div class='del'>-	__kernel_mode_t	mode;</div><div class='del'>-	unsigned short	seq;</div><div class='del'>-	unsigned short	__pad1;</div><div class='del'>-	unsigned long	__unused1;</div><div class='del'>-	unsigned long	__unused2;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_IA64_IPCBUF_H */</div><div class='add'>+#include &lt;asm-generic/ipcbuf.h&gt;</div><div class='head'>diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h<br/>index 127dd7be346a..279b38ae74aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/pci.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/include/asm/pci.h</a></div><div class='hunk'>@@ -43,12 +43,6 @@ extern unsigned long ia64_max_iommu_merge_mask;</div><div class='ctx'> #define PCI_DMA_BUS_IS_PHYS	(ia64_max_iommu_merge_mask == ~0UL)</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-pcibios_set_master (struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	/* No special bus mastering setup handling */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='ctx'> pcibios_penalize_isa_irq (int irq, int active)</div><div class='ctx'> {</div><div class='ctx'> 	/* We don't do dynamic PCI IRQ allocation */</div><div class='head'>diff --git a/arch/ia64/include/asm/processor.h b/arch/ia64/include/asm/processor.h<br/>index d9f397fae03e..691be0b95c1e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/processor.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/processor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/processor.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/include/asm/processor.h</a></div><div class='hunk'>@@ -309,7 +309,6 @@ struct thread_struct {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define start_thread(regs,new_ip,new_sp) do {							\</div><div class='del'>-	set_fs(USER_DS);									\</div><div class='ctx'> 	regs-&gt;cr_ipsr = ((regs-&gt;cr_ipsr | (IA64_PSR_BITS_TO_SET | IA64_PSR_CPL))		\</div><div class='ctx'> 			 &amp; ~(IA64_PSR_BITS_TO_CLEAR | IA64_PSR_RI | IA64_PSR_IS));		\</div><div class='ctx'> 	regs-&gt;cr_iip = new_ip;									\</div><div class='head'>diff --git a/arch/ia64/include/asm/ptrace.h b/arch/ia64/include/asm/ptrace.h<br/>index f5cb27614e35..68c98f5b3ca6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/ptrace.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/include/asm/ptrace.h</a></div><div class='hunk'>@@ -246,7 +246,18 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs)</div><div class='ctx'> 	return regs-&gt;ar_bspstore;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define regs_return_value(regs) ((regs)-&gt;r8)</div><div class='add'>+static inline int is_syscall_success(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return regs-&gt;r10 != -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline long regs_return_value(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	if (is_syscall_success(regs))</div><div class='add'>+		return regs-&gt;r8;</div><div class='add'>+	else</div><div class='add'>+		return -regs-&gt;r8;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Conserve space in histogram by encoding slot bits in address</div><div class='ctx'>  * bits 2 and 3 rather than bits 0 and 1.</div><div class='head'>diff --git a/arch/ia64/include/asm/socket.h b/arch/ia64/include/asm/socket.h<br/>index 51427eaa51ba..4b03664e3fb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/socket.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/include/asm/socket.h</a></div><div class='hunk'>@@ -71,4 +71,7 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_RXQ_OVFL             40</div><div class='ctx'> </div><div class='add'>+#define SO_WIFI_STATUS		41</div><div class='add'>+#define SCM_WIFI_STATUS		SO_WIFI_STATUS</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_IA64_SOCKET_H */</div><div class='head'>diff --git a/arch/ia64/include/asm/thread_info.h b/arch/ia64/include/asm/thread_info.h<br/>index ff0cc84e7bcc..e054bcc4273c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/include/asm/thread_info.h</a></div><div class='hunk'>@@ -113,7 +113,6 @@ struct thread_info {</div><div class='ctx'> #define TIF_MEMDIE		17	/* is terminating due to OOM killer */</div><div class='ctx'> #define TIF_MCA_INIT		18	/* this task is processing MCA or INIT */</div><div class='ctx'> #define TIF_DB_DISABLED		19	/* debug trap disabled for fsyscall */</div><div class='del'>-#define TIF_FREEZE		20	/* is freezing for suspend */</div><div class='ctx'> #define TIF_RESTORE_RSE		21	/* user RBS is newer than kernel RBS */</div><div class='ctx'> </div><div class='ctx'> #define _TIF_SYSCALL_TRACE	(1 &lt;&lt; TIF_SYSCALL_TRACE)</div><div class='hunk'>@@ -126,7 +125,6 @@ struct thread_info {</div><div class='ctx'> #define _TIF_POLLING_NRFLAG	(1 &lt;&lt; TIF_POLLING_NRFLAG)</div><div class='ctx'> #define _TIF_MCA_INIT		(1 &lt;&lt; TIF_MCA_INIT)</div><div class='ctx'> #define _TIF_DB_DISABLED	(1 &lt;&lt; TIF_DB_DISABLED)</div><div class='del'>-#define _TIF_FREEZE		(1 &lt;&lt; TIF_FREEZE)</div><div class='ctx'> #define _TIF_RESTORE_RSE	(1 &lt;&lt; TIF_RESTORE_RSE)</div><div class='ctx'> </div><div class='ctx'> /* "work to do on user-return" bits */</div><div class='head'>diff --git a/arch/ia64/include/asm/types.h b/arch/ia64/include/asm/types.h<br/>index 82b3939d2718..3f5b122d9975 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/include/asm/types.h</a></div><div class='hunk'>@@ -28,8 +28,6 @@</div><div class='ctx'> # define __IA64_UL(x)		((unsigned long)(x))</div><div class='ctx'> # define __IA64_UL_CONST(x)	x##UL</div><div class='ctx'> </div><div class='del'>-typedef unsigned int umode_t;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * These aren't exported outside the kernel to avoid name space clashes</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h<br/>index 7617248f0d11..7a3bd2524944 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/unistd.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/unistd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/unistd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/include/asm/unistd.h</a></div><div class='hunk'>@@ -323,11 +323,12 @@</div><div class='ctx'> #define __NR_sendmmsg			1331</div><div class='ctx'> #define __NR_process_vm_readv		1332</div><div class='ctx'> #define __NR_process_vm_writev		1333</div><div class='add'>+#define __NR_accept4			1334</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define NR_syscalls			310 /* length of syscall table */</div><div class='add'>+#define NR_syscalls			311 /* length of syscall table */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The following defines stop scripts/checksyscalls.sh from complaining about</div><div class='head'>diff --git a/arch/ia64/include/asm/xen/interface.h b/arch/ia64/include/asm/xen/interface.h<br/>index 1d2427d116e3..fbb519828aa1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/xen/interface.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/include/asm/xen/interface.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/include/asm/xen/interface.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/include/asm/xen/interface.h</a></div><div class='hunk'>@@ -71,7 +71,7 @@</div><div class='ctx'> __DEFINE_GUEST_HANDLE(uchar, unsigned char);</div><div class='ctx'> __DEFINE_GUEST_HANDLE(uint, unsigned int);</div><div class='ctx'> __DEFINE_GUEST_HANDLE(ulong, unsigned long);</div><div class='del'>-__DEFINE_GUEST_HANDLE(u64, unsigned long);</div><div class='add'>+</div><div class='ctx'> DEFINE_GUEST_HANDLE(char);</div><div class='ctx'> DEFINE_GUEST_HANDLE(int);</div><div class='ctx'> DEFINE_GUEST_HANDLE(long);</div><div class='head'>diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c<br/>index bfb4d01e0e51..5207035dc061 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/acpi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kernel/acpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/acpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/kernel/acpi.c</a></div><div class='hunk'>@@ -429,22 +429,24 @@ static u32 __devinitdata pxm_flag[PXM_FLAG_LEN];</div><div class='ctx'> static struct acpi_table_slit __initdata *slit_table;</div><div class='ctx'> cpumask_t early_cpu_possible_map = CPU_MASK_NONE;</div><div class='ctx'> </div><div class='del'>-static int get_processor_proximity_domain(struct acpi_srat_cpu_affinity *pa)</div><div class='add'>+static int __init</div><div class='add'>+get_processor_proximity_domain(struct acpi_srat_cpu_affinity *pa)</div><div class='ctx'> {</div><div class='ctx'> 	int pxm;</div><div class='ctx'> </div><div class='ctx'> 	pxm = pa-&gt;proximity_domain_lo;</div><div class='del'>-	if (ia64_platform_is("sn2"))</div><div class='add'>+	if (ia64_platform_is("sn2") || acpi_srat_revision &gt;= 2)</div><div class='ctx'> 		pxm += pa-&gt;proximity_domain_hi[0] &lt;&lt; 8;</div><div class='ctx'> 	return pxm;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_memory_proximity_domain(struct acpi_srat_mem_affinity *ma)</div><div class='add'>+static int __init</div><div class='add'>+get_memory_proximity_domain(struct acpi_srat_mem_affinity *ma)</div><div class='ctx'> {</div><div class='ctx'> 	int pxm;</div><div class='ctx'> </div><div class='ctx'> 	pxm = ma-&gt;proximity_domain;</div><div class='del'>-	if (!ia64_platform_is("sn2"))</div><div class='add'>+	if (!ia64_platform_is("sn2") &amp;&amp; acpi_srat_revision &lt;= 1)</div><div class='ctx'> 		pxm &amp;= 0xff;</div><div class='ctx'> </div><div class='ctx'> 	return pxm;</div><div class='head'>diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S<br/>index 5b31d46aff67..1ccbe12a4d84 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/entry.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/entry.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/kernel/entry.S</a></div><div class='hunk'>@@ -1779,6 +1779,7 @@ sys_call_table:</div><div class='ctx'> 	data8 sys_sendmmsg</div><div class='ctx'> 	data8 sys_process_vm_readv</div><div class='ctx'> 	data8 sys_process_vm_writev</div><div class='add'>+	data8 sys_accept4</div><div class='ctx'> </div><div class='ctx'> 	.org sys_call_table + 8*NR_syscalls	// guard against failures to increase NR_syscalls</div><div class='ctx'> #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */</div><div class='head'>diff --git a/arch/ia64/kernel/err_inject.c b/arch/ia64/kernel/err_inject.c<br/>index c539c689493b..2d67317a1ec2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/err_inject.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kernel/err_inject.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/err_inject.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/kernel/err_inject.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'>  * Copyright (C) 2006, Intel Corp.  All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='hunk'>@@ -35,10 +35,10 @@</div><div class='ctx'> #define ERR_DATA_BUFFER_SIZE 3 		// Three 8-byte;</div><div class='ctx'> </div><div class='ctx'> #define define_one_ro(name) 						\</div><div class='del'>-static SYSDEV_ATTR(name, 0444, show_##name, NULL)</div><div class='add'>+static DEVICE_ATTR(name, 0444, show_##name, NULL)</div><div class='ctx'> </div><div class='ctx'> #define define_one_rw(name) 						\</div><div class='del'>-static SYSDEV_ATTR(name, 0644, show_##name, store_##name)</div><div class='add'>+static DEVICE_ATTR(name, 0644, show_##name, store_##name)</div><div class='ctx'> </div><div class='ctx'> static u64 call_start[NR_CPUS];</div><div class='ctx'> static u64 phys_addr[NR_CPUS];</div><div class='hunk'>@@ -55,7 +55,7 @@ static u64 resources[NR_CPUS];</div><div class='ctx'> </div><div class='ctx'> #define show(name) 							\</div><div class='ctx'> static ssize_t 								\</div><div class='del'>-show_##name(struct sys_device *dev, struct sysdev_attribute *attr,	\</div><div class='add'>+show_##name(struct device *dev, struct device_attribute *attr,	\</div><div class='ctx'> 		char *buf)						\</div><div class='ctx'> {									\</div><div class='ctx'> 	u32 cpu=dev-&gt;id;						\</div><div class='hunk'>@@ -64,7 +64,7 @@ show_##name(struct sys_device *dev, struct sysdev_attribute *attr,	\</div><div class='ctx'> </div><div class='ctx'> #define store(name)							\</div><div class='ctx'> static ssize_t 								\</div><div class='del'>-store_##name(struct sys_device *dev, struct sysdev_attribute *attr,	\</div><div class='add'>+store_##name(struct device *dev, struct device_attribute *attr,	\</div><div class='ctx'> 					const char *buf, size_t size)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	unsigned int cpu=dev-&gt;id;					\</div><div class='hunk'>@@ -78,7 +78,7 @@ show(call_start)</div><div class='ctx'>  * processor. The cpu number in driver is only used for storing data.</div><div class='ctx'>  */</div><div class='ctx'> static ssize_t</div><div class='del'>-store_call_start(struct sys_device *dev, struct sysdev_attribute *attr,</div><div class='add'>+store_call_start(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		const char *buf, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu=dev-&gt;id;</div><div class='hunk'>@@ -127,7 +127,7 @@ show(err_type_info)</div><div class='ctx'> store(err_type_info)</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_virtual_to_phys(struct sys_device *dev, struct sysdev_attribute *attr,</div><div class='add'>+show_virtual_to_phys(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu=dev-&gt;id;</div><div class='hunk'>@@ -135,7 +135,7 @@ show_virtual_to_phys(struct sys_device *dev, struct sysdev_attribute *attr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-store_virtual_to_phys(struct sys_device *dev, struct sysdev_attribute *attr,</div><div class='add'>+store_virtual_to_phys(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			const char *buf, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu=dev-&gt;id;</div><div class='hunk'>@@ -159,8 +159,8 @@ show(err_struct_info)</div><div class='ctx'> store(err_struct_info)</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_err_data_buffer(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+show_err_data_buffer(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu=dev-&gt;id;</div><div class='ctx'> </div><div class='hunk'>@@ -171,8 +171,8 @@ show_err_data_buffer(struct sys_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-store_err_data_buffer(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr,</div><div class='add'>+store_err_data_buffer(struct device *dev,</div><div class='add'>+			struct device_attribute *attr,</div><div class='ctx'> 			const char *buf, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu=dev-&gt;id;</div><div class='hunk'>@@ -209,14 +209,14 @@ define_one_ro(capabilities);</div><div class='ctx'> define_one_ro(resources);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *default_attrs[] = {</div><div class='del'>-	&amp;attr_call_start.attr,</div><div class='del'>-	&amp;attr_virtual_to_phys.attr,</div><div class='del'>-	&amp;attr_err_type_info.attr,</div><div class='del'>-	&amp;attr_err_struct_info.attr,</div><div class='del'>-	&amp;attr_err_data_buffer.attr,</div><div class='del'>-	&amp;attr_status.attr,</div><div class='del'>-	&amp;attr_capabilities.attr,</div><div class='del'>-	&amp;attr_resources.attr,</div><div class='add'>+	&amp;dev_attr_call_start.attr,</div><div class='add'>+	&amp;dev_attr_virtual_to_phys.attr,</div><div class='add'>+	&amp;dev_attr_err_type_info.attr,</div><div class='add'>+	&amp;dev_attr_err_struct_info.attr,</div><div class='add'>+	&amp;dev_attr_err_data_buffer.attr,</div><div class='add'>+	&amp;dev_attr_status.attr,</div><div class='add'>+	&amp;dev_attr_capabilities.attr,</div><div class='add'>+	&amp;dev_attr_resources.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -225,12 +225,12 @@ static struct attribute_group err_inject_attr_group = {</div><div class='ctx'> 	.name = "err_inject"</div><div class='ctx'> };</div><div class='ctx'> /* Add/Remove err_inject interface for CPU device */</div><div class='del'>-static int __cpuinit err_inject_add_dev(struct sys_device * sys_dev)</div><div class='add'>+static int __cpuinit err_inject_add_dev(struct device * sys_dev)</div><div class='ctx'> {</div><div class='ctx'> 	return sysfs_create_group(&amp;sys_dev-&gt;kobj, &amp;err_inject_attr_group);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __cpuinit err_inject_remove_dev(struct sys_device * sys_dev)</div><div class='add'>+static int __cpuinit err_inject_remove_dev(struct device * sys_dev)</div><div class='ctx'> {</div><div class='ctx'> 	sysfs_remove_group(&amp;sys_dev-&gt;kobj, &amp;err_inject_attr_group);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -239,9 +239,9 @@ static int __cpuinit err_inject_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 		unsigned long action, void *hcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu = (unsigned long)hcpu;</div><div class='del'>-	struct sys_device *sys_dev;</div><div class='add'>+	struct device *sys_dev;</div><div class='ctx'> </div><div class='del'>-	sys_dev = get_cpu_sysdev(cpu);</div><div class='add'>+	sys_dev = get_cpu_device(cpu);</div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case CPU_ONLINE:</div><div class='ctx'> 	case CPU_ONLINE_FROZEN:</div><div class='hunk'>@@ -283,13 +283,13 @@ static void __exit</div><div class='ctx'> err_inject_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct sys_device *sys_dev;</div><div class='add'>+	struct device *sys_dev;</div><div class='ctx'> </div><div class='ctx'> #ifdef ERR_INJ_DEBUG</div><div class='ctx'> 	printk(KERN_INFO "Exit error injection driver.\n");</div><div class='ctx'> #endif</div><div class='ctx'> 	for_each_online_cpu(i) {</div><div class='del'>-		sys_dev = get_cpu_sysdev(i);</div><div class='add'>+		sys_dev = get_cpu_device(i);</div><div class='ctx'> 		sysfs_remove_group(&amp;sys_dev-&gt;kobj, &amp;err_inject_attr_group);</div><div class='ctx'> 	}</div><div class='ctx'> 	unregister_hotcpu_notifier(&amp;err_inject_cpu_notifier);</div><div class='head'>diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c<br/>index 3d3aeef46947..4eed35814994 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/machine_kexec.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kernel/machine_kexec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/machine_kexec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/kernel/machine_kexec.c</a></div><div class='hunk'>@@ -27,11 +27,11 @@</div><div class='ctx'> #include &lt;asm/sal.h&gt;</div><div class='ctx'> #include &lt;asm/mca.h&gt;</div><div class='ctx'> </div><div class='del'>-typedef NORET_TYPE void (*relocate_new_kernel_t)(</div><div class='add'>+typedef void (*relocate_new_kernel_t)(</div><div class='ctx'> 					unsigned long indirection_page,</div><div class='ctx'> 					unsigned long start_address,</div><div class='ctx'> 					struct ia64_boot_param *boot_param,</div><div class='del'>-					unsigned long pal_addr) ATTRIB_NORET;</div><div class='add'>+					unsigned long pal_addr) __noreturn;</div><div class='ctx'> </div><div class='ctx'> struct kimage *ia64_kimage;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c<br/>index c16162c70860..eb1175720050 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/pci-dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kernel/pci-dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/pci-dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/kernel/pci-dma.c</a></div><div class='hunk'>@@ -33,6 +33,7 @@ int force_iommu __read_mostly;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> int iommu_pass_through;</div><div class='add'>+int iommu_group_mf;</div><div class='ctx'> </div><div class='ctx'> /* Dummy device used for NULL arguments (normally ISA). Better would</div><div class='ctx'>    be probably a smaller DMA mask, but this is bug-to-bug compatible</div><div class='head'>diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c<br/>index 89accc626b86..b2c65e034f5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/perfmon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kernel/perfmon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/perfmon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/kernel/perfmon.c</a></div><div class='hunk'>@@ -2228,7 +2228,7 @@ pfm_alloc_file(pfm_context_t *ctx)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * allocate a new dcache entry</div><div class='ctx'> 	 */</div><div class='del'>-	path.dentry = d_alloc(pfmfs_mnt-&gt;mnt_sb-&gt;s_root, &amp;this);</div><div class='add'>+	path.dentry = d_alloc(pfmfs_mnt-&gt;mnt_root, &amp;this);</div><div class='ctx'> 	if (!path.dentry) {</div><div class='ctx'> 		iput(inode);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='head'>diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c<br/>index 8848f43d819e..dad91661ddf9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/ptrace.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/kernel/ptrace.c</a></div><div class='hunk'>@@ -1246,15 +1246,8 @@ syscall_trace_enter (long arg0, long arg1, long arg2, long arg3,</div><div class='ctx'> 	if (test_thread_flag(TIF_RESTORE_RSE))</div><div class='ctx'> 		ia64_sync_krbs();</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context)) {</div><div class='del'>-		long syscall;</div><div class='del'>-		int arch;</div><div class='ctx'> </div><div class='del'>-		syscall = regs.r15;</div><div class='del'>-		arch = AUDIT_ARCH_IA64;</div><div class='del'>-</div><div class='del'>-		audit_syscall_entry(arch, syscall, arg0, arg1, arg2, arg3);</div><div class='del'>-	}</div><div class='add'>+	audit_syscall_entry(AUDIT_ARCH_IA64, regs.r15, arg0, arg1, arg2, arg3);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1268,14 +1261,7 @@ syscall_trace_leave (long arg0, long arg1, long arg2, long arg3,</div><div class='ctx'> {</div><div class='ctx'> 	int step;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context)) {</div><div class='del'>-		int success = AUDITSC_RESULT(regs.r10);</div><div class='del'>-		long result = regs.r8;</div><div class='del'>-</div><div class='del'>-		if (success != AUDITSC_SUCCESS)</div><div class='del'>-			result = -result;</div><div class='del'>-		audit_syscall_exit(success, result);</div><div class='del'>-	}</div><div class='add'>+	audit_syscall_exit(&amp;regs);</div><div class='ctx'> </div><div class='ctx'> 	step = test_thread_flag(TIF_SINGLESTEP);</div><div class='ctx'> 	if (step || test_thread_flag(TIF_SYSCALL_TRACE))</div><div class='head'>diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c<br/>index 5e2c72498c51..cd57d7312de0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/kernel/setup.c</a></div><div class='hunk'>@@ -220,6 +220,23 @@ sort_regions (struct rsvd_region *rsvd_region, int max)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* merge overlaps */</div><div class='add'>+static int __init</div><div class='add'>+merge_regions (struct rsvd_region *rsvd_region, int max)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 1; i &lt; max; ++i) {</div><div class='add'>+		if (rsvd_region[i].start &gt;= rsvd_region[i-1].end)</div><div class='add'>+			continue;</div><div class='add'>+		if (rsvd_region[i].end &gt; rsvd_region[i-1].end)</div><div class='add'>+			rsvd_region[i-1].end = rsvd_region[i].end;</div><div class='add'>+		--max;</div><div class='add'>+		memmove(&amp;rsvd_region[i], &amp;rsvd_region[i+1],</div><div class='add'>+			(max - i) * sizeof(struct rsvd_region));</div><div class='add'>+	}</div><div class='add'>+	return max;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Request address space for all standard resources</div><div class='ctx'>  */</div><div class='hunk'>@@ -270,6 +287,7 @@ static void __init setup_crashkernel(unsigned long total, int *n)</div><div class='ctx'> 	if (ret == 0 &amp;&amp; size &gt; 0) {</div><div class='ctx'> 		if (!base) {</div><div class='ctx'> 			sort_regions(rsvd_region, *n);</div><div class='add'>+			*n = merge_regions(rsvd_region, *n);</div><div class='ctx'> 			base = kdump_find_rsvd_region(size,</div><div class='ctx'> 					rsvd_region, *n);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -373,6 +391,7 @@ reserve_memory (void)</div><div class='ctx'> 	BUG_ON(IA64_MAX_RSVD_REGIONS + 1 &lt; n);</div><div class='ctx'> </div><div class='ctx'> 	sort_regions(rsvd_region, num_rsvd_regions);</div><div class='add'>+	num_rsvd_regions = merge_regions(rsvd_region, num_rsvd_regions);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c<br/>index 9be1f11a01d9..9deb21dbf629 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/topology.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kernel/topology.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/topology.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/kernel/topology.c</a></div><div class='hunk'>@@ -350,7 +350,7 @@ static int __cpuinit cpu_cache_sysfs_init(unsigned int cpu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Add cache interface for CPU device */</div><div class='del'>-static int __cpuinit cache_add_dev(struct sys_device * sys_dev)</div><div class='add'>+static int __cpuinit cache_add_dev(struct device * sys_dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu = sys_dev-&gt;id;</div><div class='ctx'> 	unsigned long i, j;</div><div class='hunk'>@@ -400,7 +400,7 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Remove cache interface for CPU device */</div><div class='del'>-static int __cpuinit cache_remove_dev(struct sys_device * sys_dev)</div><div class='add'>+static int __cpuinit cache_remove_dev(struct device * sys_dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu = sys_dev-&gt;id;</div><div class='ctx'> 	unsigned long i;</div><div class='hunk'>@@ -428,9 +428,9 @@ static int __cpuinit cache_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 		unsigned long action, void *hcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu = (unsigned long)hcpu;</div><div class='del'>-	struct sys_device *sys_dev;</div><div class='add'>+	struct device *sys_dev;</div><div class='ctx'> </div><div class='del'>-	sys_dev = get_cpu_sysdev(cpu);</div><div class='add'>+	sys_dev = get_cpu_device(cpu);</div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case CPU_ONLINE:</div><div class='ctx'> 	case CPU_ONLINE_FROZEN:</div><div class='hunk'>@@ -454,7 +454,7 @@ static int __init cache_sysfs_init(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for_each_online_cpu(i) {</div><div class='del'>-		struct sys_device *sys_dev = get_cpu_sysdev((unsigned int)i);</div><div class='add'>+		struct device *sys_dev = get_cpu_device((unsigned int)i);</div><div class='ctx'> 		cache_add_dev(sys_dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c<br/>index 43f4c92816ef..405052002493 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kvm/kvm-ia64.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/kvm/kvm-ia64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kvm/kvm-ia64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/kvm/kvm-ia64.c</a></div><div class='hunk'>@@ -774,13 +774,13 @@ struct kvm *kvm_arch_alloc_vm(void)</div><div class='ctx'> 	return kvm;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct kvm_io_range {</div><div class='add'>+struct kvm_ia64_io_range {</div><div class='ctx'> 	unsigned long start;</div><div class='ctx'> 	unsigned long size;</div><div class='ctx'> 	unsigned long type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct kvm_io_range io_ranges[] = {</div><div class='add'>+static const struct kvm_ia64_io_range io_ranges[] = {</div><div class='ctx'> 	{VGA_IO_START, VGA_IO_SIZE, GPFN_FRAME_BUFFER},</div><div class='ctx'> 	{MMIO_START, MMIO_SIZE, GPFN_LOW_MMIO},</div><div class='ctx'> 	{LEGACY_IO_START, LEGACY_IO_SIZE, GPFN_LEGACY_IO},</div><div class='hunk'>@@ -1366,14 +1366,12 @@ static void kvm_release_vm_pages(struct kvm *kvm)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_memslots *slots;</div><div class='ctx'> 	struct kvm_memory_slot *memslot;</div><div class='del'>-	int i, j;</div><div class='add'>+	int j;</div><div class='ctx'> 	unsigned long base_gfn;</div><div class='ctx'> </div><div class='ctx'> 	slots = kvm_memslots(kvm);</div><div class='del'>-	for (i = 0; i &lt; slots-&gt;nmemslots; i++) {</div><div class='del'>-		memslot = &amp;slots-&gt;memslots[i];</div><div class='add'>+	kvm_for_each_memslot(memslot, slots) {</div><div class='ctx'> 		base_gfn = memslot-&gt;base_gfn;</div><div class='del'>-</div><div class='ctx'> 		for (j = 0; j &lt; memslot-&gt;npages; j++) {</div><div class='ctx'> 			if (memslot-&gt;rmap[j])</div><div class='ctx'> 				put_page((struct page *)memslot-&gt;rmap[j]);</div><div class='hunk'>@@ -1820,7 +1818,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,</div><div class='ctx'> 	if (log-&gt;slot &gt;= KVM_MEMORY_SLOTS)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	memslot = &amp;kvm-&gt;memslots-&gt;memslots[log-&gt;slot];</div><div class='add'>+	memslot = id_to_memslot(kvm-&gt;memslots, log-&gt;slot);</div><div class='ctx'> 	r = -ENOENT;</div><div class='ctx'> 	if (!memslot-&gt;dirty_bitmap)</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c<br/>index 2c27714d7b78..f82f5d4b65fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/pci/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/pci/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/pci/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/pci/pci.c</a></div><div class='hunk'>@@ -134,6 +134,7 @@ alloc_pci_controller (int seg)</div><div class='ctx'> struct pci_root_info {</div><div class='ctx'> 	struct acpi_device *bridge;</div><div class='ctx'> 	struct pci_controller *controller;</div><div class='add'>+	struct list_head resources;</div><div class='ctx'> 	char *name;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -315,24 +316,13 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data)</div><div class='ctx'> 				 &amp;window-&gt;resource);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return AE_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devinit</div><div class='del'>-pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='add'>+	/* HP's firmware has a hack to work around a Windows bug.</div><div class='add'>+	 * Ignore these tiny memory ranges */</div><div class='add'>+	if (!((window-&gt;resource.flags &amp; IORESOURCE_MEM) &amp;&amp;</div><div class='add'>+	      (window-&gt;resource.end - window-&gt;resource.start &lt; 16)))</div><div class='add'>+		pci_add_resource(&amp;info-&gt;resources, &amp;window-&gt;resource);</div><div class='ctx'> </div><div class='del'>-	pci_bus_remove_resources(bus);</div><div class='del'>-	for (i = 0; i &lt; ctrl-&gt;windows; i++) {</div><div class='del'>-		struct resource *res = &amp;ctrl-&gt;window[i].resource;</div><div class='del'>-		/* HP's firmware has a hack to work around a Windows bug.</div><div class='del'>-		 * Ignore these tiny memory ranges */</div><div class='del'>-		if ((res-&gt;flags &amp; IORESOURCE_MEM) &amp;&amp;</div><div class='del'>-		    (res-&gt;end - res-&gt;start &lt; 16))</div><div class='del'>-			continue;</div><div class='del'>-		pci_bus_add_resource(bus, res, 0);</div><div class='del'>-	}</div><div class='add'>+	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct pci_bus * __devinit</div><div class='hunk'>@@ -343,6 +333,7 @@ pci_acpi_scan_root(struct acpi_pci_root *root)</div><div class='ctx'> 	int bus = root-&gt;secondary.start;</div><div class='ctx'> 	struct pci_controller *controller;</div><div class='ctx'> 	unsigned int windows = 0;</div><div class='add'>+	struct pci_root_info info;</div><div class='ctx'> 	struct pci_bus *pbus;</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	int pxm;</div><div class='hunk'>@@ -359,11 +350,10 @@ pci_acpi_scan_root(struct acpi_pci_root *root)</div><div class='ctx'> 		controller-&gt;node = pxm_to_node(pxm);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	INIT_LIST_HEAD(&amp;info.resources);</div><div class='ctx'> 	acpi_walk_resources(device-&gt;handle, METHOD_NAME__CRS, count_window,</div><div class='ctx'> 			&amp;windows);</div><div class='ctx'> 	if (windows) {</div><div class='del'>-		struct pci_root_info info;</div><div class='del'>-</div><div class='ctx'> 		controller-&gt;window =</div><div class='ctx'> 			kmalloc_node(sizeof(*controller-&gt;window) * windows,</div><div class='ctx'> 				     GFP_KERNEL, controller-&gt;node);</div><div class='hunk'>@@ -387,8 +377,14 @@ pci_acpi_scan_root(struct acpi_pci_root *root)</div><div class='ctx'> 	 * should handle the case here, but it appears that IA64 hasn't</div><div class='ctx'> 	 * such quirk. So we just ignore the case now.</div><div class='ctx'> 	 */</div><div class='del'>-	pbus = pci_scan_bus_parented(NULL, bus, &amp;pci_root_ops, controller);</div><div class='add'>+	pbus = pci_create_root_bus(NULL, bus, &amp;pci_root_ops, controller,</div><div class='add'>+				   &amp;info.resources);</div><div class='add'>+	if (!pbus) {</div><div class='add'>+		pci_free_resource_list(&amp;info.resources);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	pbus-&gt;subordinate = pci_scan_child_bus(pbus);</div><div class='ctx'> 	return pbus;</div><div class='ctx'> </div><div class='ctx'> out3:</div><div class='hunk'>@@ -504,14 +500,15 @@ pcibios_fixup_bus (struct pci_bus *b)</div><div class='ctx'> 	if (b-&gt;self) {</div><div class='ctx'> 		pci_read_bridge_bases(b);</div><div class='ctx'> 		pcibios_fixup_bridge_resources(b-&gt;self);</div><div class='del'>-	} else {</div><div class='del'>-		pcibios_setup_root_windows(b, b-&gt;sysdata);</div><div class='ctx'> 	}</div><div class='ctx'> 	list_for_each_entry(dev, &amp;b-&gt;devices, bus_list)</div><div class='ctx'> 		pcibios_fixup_device_resources(dev);</div><div class='ctx'> 	platform_pci_fixup_bus(b);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return;</div><div class='add'>+void pcibios_set_master (struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	/* No special bus mastering setup handling */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __devinit</div><div class='head'>diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c<br/>index 485c42d97e83..dfac09ab027a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/sn/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/sn/kernel/irq.c</a></div><div class='hunk'>@@ -150,12 +150,11 @@ struct sn_irq_info *sn_retarget_vector(struct sn_irq_info *sn_irq_info,</div><div class='ctx'> 	 * PROM does not support SAL_INTR_REDIRECT, or it failed.</div><div class='ctx'> 	 * Revert to old method.</div><div class='ctx'> 	 */</div><div class='del'>-	new_irq_info = kmalloc(sizeof(struct sn_irq_info), GFP_ATOMIC);</div><div class='add'>+	new_irq_info = kmemdup(sn_irq_info, sizeof(struct sn_irq_info),</div><div class='add'>+			       GFP_ATOMIC);</div><div class='ctx'> 	if (new_irq_info == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	memcpy(new_irq_info, sn_irq_info, sizeof(struct sn_irq_info));</div><div class='del'>-</div><div class='ctx'> 	/* Free the old PROM new_irq_info structure */</div><div class='ctx'> 	sn_intr_free(local_nasid, local_widget, new_irq_info);</div><div class='ctx'> 	unregister_intr_pda(new_irq_info);</div><div class='head'>diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c<br/>index 5698f29d5add..8886a0bc4a11 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/pci/pcibr/pcibr_provider.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/sn/pci/pcibr/pcibr_provider.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/pci/pcibr/pcibr_provider.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/sn/pci/pcibr/pcibr_provider.c</a></div><div class='hunk'>@@ -127,12 +127,11 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont</div><div class='ctx'> 	 * Allocate kernel bus soft and copy from prom.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	soft = kmalloc(sizeof(struct pcibus_info), GFP_KERNEL);</div><div class='add'>+	soft = kmemdup(prom_bussoft, sizeof(struct pcibus_info), GFP_KERNEL);</div><div class='ctx'> 	if (!soft) {</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(soft, prom_bussoft, sizeof(struct pcibus_info));</div><div class='ctx'> 	soft-&gt;pbi_buscommon.bs_base = (unsigned long)</div><div class='ctx'> 		ioremap(REGION_OFFSET(soft-&gt;pbi_buscommon.bs_base),</div><div class='ctx'> 			sizeof(struct pic));</div><div class='head'>diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c<br/>index 642451e770ea..e77c477245fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/pci/tioca_provider.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/ia64/sn/pci/tioca_provider.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/pci/tioca_provider.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/ia64/sn/pci/tioca_provider.c</a></div><div class='hunk'>@@ -600,11 +600,11 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont</div><div class='ctx'> 	 * Allocate kernel bus soft and copy from prom.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	tioca_common = kzalloc(sizeof(struct tioca_common), GFP_KERNEL);</div><div class='add'>+	tioca_common = kmemdup(prom_bussoft, sizeof(struct tioca_common),</div><div class='add'>+			       GFP_KERNEL);</div><div class='ctx'> 	if (!tioca_common)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	memcpy(tioca_common, prom_bussoft, sizeof(struct tioca_common));</div><div class='ctx'> 	tioca_common-&gt;ca_common.bs_base = (unsigned long)</div><div class='ctx'> 		ioremap(REGION_OFFSET(tioca_common-&gt;ca_common.bs_base),</div><div class='ctx'> 			sizeof(struct tioca_common));</div><div class='head'>diff --git a/arch/m32r/include/asm/ipcbuf.h b/arch/m32r/include/asm/ipcbuf.h<br/>index 8d2d7c8ffdb0..84c7e51cb6d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m32r/include/asm/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m32r/include/asm/ipcbuf.h</a></div><div class='hunk'>@@ -1,29 +1 @@</div><div class='del'>-#ifndef _ASM_M32R_IPCBUF_H</div><div class='del'>-#define _ASM_M32R_IPCBUF_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The ipc64_perm structure for m32r architecture.</div><div class='del'>- * Note extra padding because this structure is passed back and forth</div><div class='del'>- * between kernel and user space.</div><div class='del'>- *</div><div class='del'>- * Pad space is left for:</div><div class='del'>- * - 32-bit mode_t and seq</div><div class='del'>- * - 2 miscellaneous 32-bit values</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct ipc64_perm</div><div class='del'>-{</div><div class='del'>-	__kernel_key_t		key;</div><div class='del'>-	__kernel_uid32_t	uid;</div><div class='del'>-	__kernel_gid32_t	gid;</div><div class='del'>-	__kernel_uid32_t	cuid;</div><div class='del'>-	__kernel_gid32_t	cgid;</div><div class='del'>-	__kernel_mode_t		mode;</div><div class='del'>-	unsigned short		__pad1;</div><div class='del'>-	unsigned short		seq;</div><div class='del'>-	unsigned short		__pad2;</div><div class='del'>-	unsigned long		__unused1;</div><div class='del'>-	unsigned long		__unused2;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_M32R_IPCBUF_H */</div><div class='add'>+#include &lt;asm-generic/ipcbuf.h&gt;</div><div class='head'>diff --git a/arch/m32r/include/asm/param.h b/arch/m32r/include/asm/param.h<br/>index 94c770196048..fa207bdf96e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/include/asm/param.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m32r/include/asm/param.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/include/asm/param.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m32r/include/asm/param.h</a></div><div class='hunk'>@@ -1,23 +1,7 @@</div><div class='ctx'> #ifndef _ASM_M32R_PARAM_H</div><div class='ctx'> #define _ASM_M32R_PARAM_H</div><div class='ctx'> </div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-# define HZ		CONFIG_HZ	/* Internal kernel timer frequency */</div><div class='del'>-# define USER_HZ	100		/* .. some user interfaces are in "ticks" */</div><div class='del'>-# define CLOCKS_PER_SEC	(USER_HZ)	/* like times() */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef HZ</div><div class='del'>-#define HZ 100</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define EXEC_PAGESIZE	4096</div><div class='del'>-</div><div class='del'>-#ifndef NOGROUP</div><div class='del'>-#define NOGROUP		(-1)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define MAXHOSTNAMELEN	64	/* max length of hostname */</div><div class='add'>+#include &lt;asm-generic/param.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_M32R_PARAM_H */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m32r/include/asm/socket.h b/arch/m32r/include/asm/socket.h<br/>index 469787c30098..e8b8c5bb053c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/include/asm/socket.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m32r/include/asm/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m32r/include/asm/socket.h</a></div><div class='hunk'>@@ -62,4 +62,7 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_RXQ_OVFL             40</div><div class='ctx'> </div><div class='add'>+#define SO_WIFI_STATUS		41</div><div class='add'>+#define SCM_WIFI_STATUS		SO_WIFI_STATUS</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_M32R_SOCKET_H */</div><div class='head'>diff --git a/arch/m32r/include/asm/thread_info.h b/arch/m32r/include/asm/thread_info.h<br/>index 0227dba44068..bf8fa3c06f4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m32r/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m32r/include/asm/thread_info.h</a></div><div class='hunk'>@@ -138,7 +138,6 @@ static inline unsigned int get_thread_fault_code(void)</div><div class='ctx'> #define TIF_USEDFPU		16	/* FPU was used by this task this quantum (SMP) */</div><div class='ctx'> #define TIF_POLLING_NRFLAG	17	/* true if poll_idle() is polling 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	/* is freezing for suspend */</div><div class='ctx'> </div><div class='ctx'> #define _TIF_SYSCALL_TRACE	(1&lt;&lt;TIF_SYSCALL_TRACE)</div><div class='ctx'> #define _TIF_SIGPENDING		(1&lt;&lt;TIF_SIGPENDING)</div><div class='hunk'>@@ -149,7 +148,6 @@ static inline unsigned int get_thread_fault_code(void)</div><div class='ctx'> #define _TIF_RESTORE_SIGMASK	(1&lt;&lt;TIF_RESTORE_SIGMASK)</div><div class='ctx'> #define _TIF_USEDFPU		(1&lt;&lt;TIF_USEDFPU)</div><div class='ctx'> #define _TIF_POLLING_NRFLAG	(1&lt;&lt;TIF_POLLING_NRFLAG)</div><div class='del'>-#define _TIF_FREEZE		(1&lt;&lt;TIF_FREEZE)</div><div class='ctx'> </div><div class='ctx'> #define _TIF_WORK_MASK		0x0000FFFE	/* work to do on interrupt/exception return */</div><div class='ctx'> #define _TIF_ALLWORK_MASK	0x0000FFFF	/* work to do on any return to u-space */</div><div class='head'>diff --git a/arch/m32r/include/asm/types.h b/arch/m32r/include/asm/types.h<br/>index bd0035597b3b..bb2eeadecf99 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/include/asm/types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m32r/include/asm/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m32r/include/asm/types.h</a></div><div class='hunk'>@@ -3,12 +3,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/int-ll64.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-</div><div class='del'>-typedef unsigned short umode_t;</div><div class='del'>-</div><div class='del'>-#endif /* __ASSEMBLY__ */</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * These aren't exported outside the kernel to avoid name space clashes</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig<br/>index 361d54019bb0..ae413d4a8bb7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/Kconfig</a></div><div class='hunk'>@@ -3,10 +3,10 @@ config M68K</div><div class='ctx'> 	default y</div><div class='ctx'> 	select HAVE_IDE</div><div class='ctx'> 	select HAVE_AOUT if MMU</div><div class='del'>-	select GENERIC_ATOMIC64 if MMU</div><div class='ctx'> 	select HAVE_GENERIC_HARDIRQS</div><div class='ctx'> 	select GENERIC_IRQ_SHOW</div><div class='ctx'> 	select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS</div><div class='add'>+	select GENERIC_CPU_DEVICES</div><div class='ctx'> </div><div class='ctx'> config RWSEM_GENERIC_SPINLOCK</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -38,15 +38,15 @@ config GENERIC_CALIBRATE_DELAY</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-config GENERIC_IOMAP</div><div class='del'>-	def_bool MMU</div><div class='add'>+config GENERIC_CSUM</div><div class='add'>+	bool</div><div class='ctx'> </div><div class='ctx'> config TIME_LOW_RES</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='ctx'> config ARCH_USES_GETTIMEOFFSET</div><div class='del'>-	def_bool MMU</div><div class='add'>+	def_bool MMU &amp;&amp; !COLDFIRE</div><div class='ctx'> </div><div class='ctx'> config NO_IOPORT</div><div class='ctx'> 	def_bool y</div><div class='hunk'>@@ -61,6 +61,12 @@ config ZONE_DMA</div><div class='ctx'> config CPU_HAS_NO_BITFIELDS</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+config CPU_HAS_NO_MULDIV64</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config CPU_HAS_ADDRESS_SPACES</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config HZ</div><div class='ctx'> 	int</div><div class='ctx'> 	default 1000 if CLEOPATRA</div><div class='hunk'>@@ -73,6 +79,7 @@ source "kernel/Kconfig.freezer"</div><div class='ctx'> config MMU</div><div class='ctx'> 	bool "MMU-based Paged Memory Management Support"</div><div class='ctx'> 	default y</div><div class='add'>+	select GENERIC_IOMAP</div><div class='ctx'> 	help</div><div class='ctx'> 	  Select if you want MMU-based virtualised addressing space</div><div class='ctx'> 	  support by paged memory management. If unsure, say 'Y'.</div><div class='hunk'>@@ -80,9 +87,12 @@ config MMU</div><div class='ctx'> config MMU_MOTOROLA</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+config MMU_COLDFIRE</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config MMU_SUN3</div><div class='ctx'> 	bool</div><div class='del'>-	depends on MMU &amp;&amp; !MMU_MOTOROLA</div><div class='add'>+	depends on MMU &amp;&amp; !MMU_MOTOROLA &amp;&amp; !MMU_COLDFIRE</div><div class='ctx'> </div><div class='ctx'> menu "Platform setup"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu<br/>index e632b2d12106..8a9c767125a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/Kconfig.cpu?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/Kconfig.cpu</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/Kconfig.cpu?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/Kconfig.cpu</a></div><div class='hunk'>@@ -1,8 +1,42 @@</div><div class='ctx'> comment "Processor Type"</div><div class='ctx'> </div><div class='add'>+choice</div><div class='add'>+	prompt "CPU family support"</div><div class='add'>+	default M68KCLASSIC if MMU</div><div class='add'>+	default COLDFIRE if !MMU</div><div class='add'>+	help</div><div class='add'>+	  The Freescale (was Motorola) M68K family of processors implements</div><div class='add'>+	  the full 68000 processor instruction set.</div><div class='add'>+	  The Freescale ColdFire family of processors is a modern derivitive</div><div class='add'>+	  of the 68000 processor family. They are mainly targeted at embedded</div><div class='add'>+	  applications, and are all System-On-Chip (SOC) devices, as opposed</div><div class='add'>+	  to stand alone CPUs. They implement a subset of the original 68000</div><div class='add'>+	  processor instruction set.</div><div class='add'>+	  If you anticipate running this kernel on a computer with a classic</div><div class='add'>+	  MC68xxx processor, select M68KCLASSIC.</div><div class='add'>+	  If you anticipate running this kernel on a computer with a ColdFire</div><div class='add'>+	  processor, select COLDFIRE.</div><div class='add'>+</div><div class='add'>+config M68KCLASSIC</div><div class='add'>+	bool "Classic M68K CPU family support"</div><div class='add'>+</div><div class='add'>+config COLDFIRE</div><div class='add'>+	bool "Coldfire CPU family support"</div><div class='add'>+	select GENERIC_GPIO</div><div class='add'>+	select ARCH_REQUIRE_GPIOLIB</div><div class='add'>+	select CPU_HAS_NO_BITFIELDS</div><div class='add'>+	select CPU_HAS_NO_MULDIV64</div><div class='add'>+	select GENERIC_CSUM</div><div class='add'>+</div><div class='add'>+endchoice</div><div class='add'>+</div><div class='add'>+if M68KCLASSIC</div><div class='add'>+</div><div class='ctx'> config M68000</div><div class='ctx'> 	bool</div><div class='ctx'> 	select CPU_HAS_NO_BITFIELDS</div><div class='add'>+	select CPU_HAS_NO_MULDIV64</div><div class='add'>+	select GENERIC_CSUM</div><div class='ctx'> 	help</div><div class='ctx'> 	  The Freescale (was Motorola) 68000 CPU is the first generation of</div><div class='ctx'> 	  the well known M68K family of processors. The CPU core as well as</div><div class='hunk'>@@ -18,21 +52,11 @@ config MCPU32</div><div class='ctx'> 	  based on the 68020 processor. For the most part it is used in</div><div class='ctx'> 	  System-On-Chip parts, and does not contain a paging MMU.</div><div class='ctx'> </div><div class='del'>-config COLDFIRE</div><div class='del'>-	bool</div><div class='del'>-	select GENERIC_GPIO</div><div class='del'>-	select ARCH_REQUIRE_GPIOLIB</div><div class='del'>-	select CPU_HAS_NO_BITFIELDS</div><div class='del'>-	help</div><div class='del'>-	  The Freescale ColdFire family of processors is a modern derivitive</div><div class='del'>-	  of the 68000 processor family. They are mainly targeted at embedded</div><div class='del'>-	  applications, and are all System-On-Chip (SOC) devices, as opposed</div><div class='del'>-	  to stand alone CPUs. They implement a subset of the original 68000</div><div class='del'>-	  processor instruction set.</div><div class='del'>-</div><div class='ctx'> config M68020</div><div class='ctx'> 	bool "68020 support"</div><div class='ctx'> 	depends on MMU</div><div class='add'>+	select GENERIC_ATOMIC64</div><div class='add'>+	select CPU_HAS_ADDRESS_SPACES</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you anticipate running this kernel on a computer with a MC68020</div><div class='ctx'> 	  processor, say Y. Otherwise, say N. Note that the 68020 requires a</div><div class='hunk'>@@ -42,6 +66,8 @@ config M68020</div><div class='ctx'> config M68030</div><div class='ctx'> 	bool "68030 support"</div><div class='ctx'> 	depends on MMU &amp;&amp; !MMU_SUN3</div><div class='add'>+	select GENERIC_ATOMIC64</div><div class='add'>+	select CPU_HAS_ADDRESS_SPACES</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you anticipate running this kernel on a computer with a MC68030</div><div class='ctx'> 	  processor, say Y. Otherwise, say N. Note that a MC68EC030 will not</div><div class='hunk'>@@ -50,6 +76,8 @@ config M68030</div><div class='ctx'> config M68040</div><div class='ctx'> 	bool "68040 support"</div><div class='ctx'> 	depends on MMU &amp;&amp; !MMU_SUN3</div><div class='add'>+	select GENERIC_ATOMIC64</div><div class='add'>+	select CPU_HAS_ADDRESS_SPACES</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you anticipate running this kernel on a computer with a MC68LC040</div><div class='ctx'> 	  or MC68040 processor, say Y. Otherwise, say N. Note that an</div><div class='hunk'>@@ -59,6 +87,8 @@ config M68040</div><div class='ctx'> config M68060</div><div class='ctx'> 	bool "68060 support"</div><div class='ctx'> 	depends on MMU &amp;&amp; !MMU_SUN3</div><div class='add'>+	select GENERIC_ATOMIC64</div><div class='add'>+	select CPU_HAS_ADDRESS_SPACES</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you anticipate running this kernel on a computer with a MC68060</div><div class='ctx'> 	  processor, say Y. Otherwise, say N.</div><div class='hunk'>@@ -91,10 +121,13 @@ config M68360</div><div class='ctx'> 	help</div><div class='ctx'> 	  Motorola 68360 processor support.</div><div class='ctx'> </div><div class='add'>+endif # M68KCLASSIC</div><div class='add'>+</div><div class='add'>+if COLDFIRE</div><div class='add'>+</div><div class='ctx'> config M5206</div><div class='ctx'> 	bool "MCF5206"</div><div class='ctx'> 	depends on !MMU</div><div class='del'>-	select COLDFIRE</div><div class='ctx'> 	select COLDFIRE_SW_A7</div><div class='ctx'> 	select HAVE_MBAR</div><div class='ctx'> 	help</div><div class='hunk'>@@ -103,7 +136,6 @@ config M5206</div><div class='ctx'> config M5206e</div><div class='ctx'> 	bool "MCF5206e"</div><div class='ctx'> 	depends on !MMU</div><div class='del'>-	select COLDFIRE</div><div class='ctx'> 	select COLDFIRE_SW_A7</div><div class='ctx'> 	select HAVE_MBAR</div><div class='ctx'> 	help</div><div class='hunk'>@@ -112,7 +144,6 @@ config M5206e</div><div class='ctx'> config M520x</div><div class='ctx'> 	bool "MCF520x"</div><div class='ctx'> 	depends on !MMU</div><div class='del'>-	select COLDFIRE</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='ctx'> 	select HAVE_CACHE_SPLIT</div><div class='ctx'> 	help</div><div class='hunk'>@@ -121,7 +152,6 @@ config M520x</div><div class='ctx'> config M523x</div><div class='ctx'> 	bool "MCF523x"</div><div class='ctx'> 	depends on !MMU</div><div class='del'>-	select COLDFIRE</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='ctx'> 	select HAVE_CACHE_SPLIT</div><div class='ctx'> 	select HAVE_IPSBAR</div><div class='hunk'>@@ -131,7 +161,6 @@ config M523x</div><div class='ctx'> config M5249</div><div class='ctx'> 	bool "MCF5249"</div><div class='ctx'> 	depends on !MMU</div><div class='del'>-	select COLDFIRE</div><div class='ctx'> 	select COLDFIRE_SW_A7</div><div class='ctx'> 	select HAVE_MBAR</div><div class='ctx'> 	help</div><div class='hunk'>@@ -143,7 +172,6 @@ config M527x</div><div class='ctx'> config M5271</div><div class='ctx'> 	bool "MCF5271"</div><div class='ctx'> 	depends on !MMU</div><div class='del'>-	select COLDFIRE</div><div class='ctx'> 	select M527x</div><div class='ctx'> 	select HAVE_CACHE_SPLIT</div><div class='ctx'> 	select HAVE_IPSBAR</div><div class='hunk'>@@ -154,7 +182,6 @@ config M5271</div><div class='ctx'> config M5272</div><div class='ctx'> 	bool "MCF5272"</div><div class='ctx'> 	depends on !MMU</div><div class='del'>-	select COLDFIRE</div><div class='ctx'> 	select COLDFIRE_SW_A7</div><div class='ctx'> 	select HAVE_MBAR</div><div class='ctx'> 	help</div><div class='hunk'>@@ -163,7 +190,6 @@ config M5272</div><div class='ctx'> config M5275</div><div class='ctx'> 	bool "MCF5275"</div><div class='ctx'> 	depends on !MMU</div><div class='del'>-	select COLDFIRE</div><div class='ctx'> 	select M527x</div><div class='ctx'> 	select HAVE_CACHE_SPLIT</div><div class='ctx'> 	select HAVE_IPSBAR</div><div class='hunk'>@@ -174,7 +200,6 @@ config M5275</div><div class='ctx'> config M528x</div><div class='ctx'> 	bool "MCF528x"</div><div class='ctx'> 	depends on !MMU</div><div class='del'>-	select COLDFIRE</div><div class='ctx'> 	select GENERIC_CLOCKEVENTS</div><div class='ctx'> 	select HAVE_CACHE_SPLIT</div><div class='ctx'> 	select HAVE_IPSBAR</div><div class='hunk'>@@ -184,7 +209,6 @@ config M528x</div><div class='ctx'> config M5307</div><div class='ctx'> 	bool "MCF5307"</div><div class='ctx'> 	depends on !MMU</div><div class='del'>-	select COLDFIRE</div><div class='ctx'> 	select COLDFIRE_SW_A7</div><div class='ctx'> 	select HAVE_CACHE_CB</div><div class='ctx'> 	select HAVE_MBAR</div><div class='hunk'>@@ -194,7 +218,6 @@ config M5307</div><div class='ctx'> config M532x</div><div class='ctx'> 	bool "MCF532x"</div><div class='ctx'> 	depends on !MMU</div><div class='del'>-	select COLDFIRE</div><div class='ctx'> 	select HAVE_CACHE_CB</div><div class='ctx'> 	help</div><div class='ctx'> 	  Freescale (Motorola) ColdFire 532x processor support.</div><div class='hunk'>@@ -202,7 +225,6 @@ config M532x</div><div class='ctx'> config M5407</div><div class='ctx'> 	bool "MCF5407"</div><div class='ctx'> 	depends on !MMU</div><div class='del'>-	select COLDFIRE</div><div class='ctx'> 	select COLDFIRE_SW_A7</div><div class='ctx'> 	select HAVE_CACHE_CB</div><div class='ctx'> 	select HAVE_MBAR</div><div class='hunk'>@@ -214,9 +236,8 @@ config M54xx</div><div class='ctx'> </div><div class='ctx'> config M547x</div><div class='ctx'> 	bool "MCF547x"</div><div class='del'>-	depends on !MMU</div><div class='del'>-	select COLDFIRE</div><div class='ctx'> 	select M54xx</div><div class='add'>+	select MMU_COLDFIRE if MMU</div><div class='ctx'> 	select HAVE_CACHE_CB</div><div class='ctx'> 	select HAVE_MBAR</div><div class='ctx'> 	help</div><div class='hunk'>@@ -224,14 +245,15 @@ config M547x</div><div class='ctx'> </div><div class='ctx'> config M548x</div><div class='ctx'> 	bool "MCF548x"</div><div class='del'>-	depends on !MMU</div><div class='del'>-	select COLDFIRE</div><div class='add'>+	select MMU_COLDFIRE if MMU</div><div class='ctx'> 	select M54xx</div><div class='ctx'> 	select HAVE_CACHE_CB</div><div class='ctx'> 	select HAVE_MBAR</div><div class='ctx'> 	help</div><div class='ctx'> 	  Freescale ColdFire 5480/5481/5482/5483/5484/5485 processor support.</div><div class='ctx'> </div><div class='add'>+endif # COLDFIRE</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> comment "Processor Specific Options"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/Kconfig.debug b/arch/m68k/Kconfig.debug<br/>index 2bdb1b01115c..87233acef18b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/Kconfig.debug?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/Kconfig.debug</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/Kconfig.debug?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/Kconfig.debug</a></div><div class='hunk'>@@ -2,6 +2,25 @@ menu "Kernel hacking"</div><div class='ctx'> </div><div class='ctx'> source "lib/Kconfig.debug"</div><div class='ctx'> </div><div class='add'>+config BOOTPARAM</div><div class='add'>+	bool 'Compiled-in Kernel Boot Parameter'</div><div class='add'>+</div><div class='add'>+config BOOTPARAM_STRING</div><div class='add'>+	string 'Kernel Boot Parameter'</div><div class='add'>+	default 'console=ttyS0,19200'</div><div class='add'>+	depends on BOOTPARAM</div><div class='add'>+</div><div class='add'>+config EARLY_PRINTK</div><div class='add'>+	bool "Early printk" if EMBEDDED</div><div class='add'>+	depends on MVME16x || MAC</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+          Write kernel log output directly to a serial port.</div><div class='add'>+</div><div class='add'>+          This is useful for kernel debugging when your machine crashes very</div><div class='add'>+          early before the console code is initialized.</div><div class='add'>+          You should normally say N here, unless you want to debug such a crash.</div><div class='add'>+</div><div class='ctx'> if !MMU</div><div class='ctx'> </div><div class='ctx'> config FULLDEBUG</div><div class='hunk'>@@ -15,14 +34,6 @@ config HIGHPROFILE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Use a fast secondary clock to produce profiling information.</div><div class='ctx'> </div><div class='del'>-config BOOTPARAM</div><div class='del'>-	bool 'Compiled-in Kernel Boot Parameter'</div><div class='del'>-</div><div class='del'>-config BOOTPARAM_STRING</div><div class='del'>-	string 'Kernel Boot Parameter'</div><div class='del'>-	default 'console=ttyS0,19200'</div><div class='del'>-	depends on BOOTPARAM</div><div class='del'>-</div><div class='ctx'> config NO_KERNEL_MSG</div><div class='ctx'> 	bool "Suppress Kernel BUG Messages"</div><div class='ctx'> 	help</div><div class='head'>diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices<br/>index 6033f5d4e67e..04a3d9be90e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/Kconfig.devices?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/Kconfig.devices</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/Kconfig.devices?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/Kconfig.devices</a></div><div class='hunk'>@@ -8,8 +8,8 @@ config ARCH_MAY_HAVE_PC_FDC</div><div class='ctx'> menu "Platform devices"</div><div class='ctx'> </div><div class='ctx'> config HEARTBEAT</div><div class='del'>-	bool "Use power LED as a heartbeat" if AMIGA || APOLLO || ATARI || MAC ||Q40</div><div class='del'>-	default y if !AMIGA &amp;&amp; !APOLLO &amp;&amp; !ATARI &amp;&amp; !MAC &amp;&amp; !Q40 &amp;&amp; HP300</div><div class='add'>+	bool "Use power LED as a heartbeat" if AMIGA || APOLLO || ATARI || Q40</div><div class='add'>+	default y if !AMIGA &amp;&amp; !APOLLO &amp;&amp; !ATARI &amp;&amp; !Q40 &amp;&amp; HP300</div><div class='ctx'> 	help</div><div class='ctx'> 	  Use the power-on LED on your machine as a load meter.  The exact</div><div class='ctx'> 	  behavior is platform-dependent, but normally the flash frequency is</div><div class='hunk'>@@ -59,27 +59,6 @@ endmenu</div><div class='ctx'> </div><div class='ctx'> menu "Character devices"</div><div class='ctx'> </div><div class='del'>-config ATARI_MFPSER</div><div class='del'>-	tristate "Atari MFP serial support"</div><div class='del'>-	depends on ATARI</div><div class='del'>-	---help---</div><div class='del'>-	  If you like to use the MFP serial ports ("Modem1", "Serial1") under</div><div class='del'>-	  Linux, say Y. The driver equally supports all kinds of MFP serial</div><div class='del'>-	  ports and automatically detects whether Serial1 is available.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here.</div><div class='del'>-</div><div class='del'>-	  Note for Falcon users: You also have an MFP port, it's just not</div><div class='del'>-	  wired to the outside... But you could use the port under Linux.</div><div class='del'>-</div><div class='del'>-config ATARI_MIDI</div><div class='del'>-	tristate "Atari MIDI serial support"</div><div class='del'>-	depends on ATARI</div><div class='del'>-	help</div><div class='del'>-	  If you want to use your Atari's MIDI port in Linux, say Y.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here.</div><div class='del'>-</div><div class='ctx'> config ATARI_DSP56K</div><div class='ctx'> 	tristate "Atari DSP56k support (EXPERIMENTAL)"</div><div class='ctx'> 	depends on ATARI &amp;&amp; EXPERIMENTAL</div><div class='hunk'>@@ -99,15 +78,6 @@ config AMIGA_BUILTIN_SERIAL</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='del'>-config MULTIFACE_III_TTY</div><div class='del'>-	tristate "Multiface Card III serial support"</div><div class='del'>-	depends on AMIGA</div><div class='del'>-	help</div><div class='del'>-	  If you want to use a Multiface III card's serial port in Linux,</div><div class='del'>-	  answer Y.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here.</div><div class='del'>-</div><div class='ctx'> config HPDCA</div><div class='ctx'> 	tristate "HP DCA serial support"</div><div class='ctx'> 	depends on DIO &amp;&amp; SERIAL_8250</div><div class='hunk'>@@ -122,13 +92,9 @@ config HPAPCI</div><div class='ctx'> 	  If you want to use the internal "APCI" serial ports on an HP400</div><div class='ctx'> 	  machine, say Y here.</div><div class='ctx'> </div><div class='del'>-config DN_SERIAL</div><div class='del'>-	bool "Support for DN serial port (dummy)"</div><div class='del'>-	depends on APOLLO</div><div class='del'>-</div><div class='ctx'> config SERIAL_CONSOLE</div><div class='ctx'> 	bool "Support for serial port console"</div><div class='del'>-	depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) &amp;&amp; (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || MULTIFACE_III_TTY=y || SERIAL=y || SERIAL167 || DN_SERIAL)</div><div class='add'>+	depends on AMIGA_BUILTIN_SERIAL=y</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  If you say Y here, it will be possible to use a serial port as the</div><div class='ctx'> 	  system console (the system console is the device which receives all</div><div class='hunk'>@@ -140,10 +106,10 @@ config SERIAL_CONSOLE</div><div class='ctx'> 	  (/dev/tty0) will still be used as the system console by default, but</div><div class='ctx'> 	  you can alter that using a kernel command line option such as</div><div class='ctx'> 	  "console=ttyS1". (Try "man bootparam" or see the documentation of</div><div class='del'>-	  your boot loader (lilo or loadlin) about how to pass options to the</div><div class='del'>-	  kernel at boot time.)</div><div class='add'>+	  your boot loader about how to pass options to the kernel at boot</div><div class='add'>+	  time.)</div><div class='ctx'> </div><div class='del'>-	  If you don't have a VGA card installed and you say Y here, the</div><div class='add'>+	  If you don't have a graphical console and you say Y here, the</div><div class='ctx'> 	  kernel will automatically use the first serial line, /dev/ttyS0, as</div><div class='ctx'> 	  system console.</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine<br/>index ef4a26aff780..7cdf6b010381 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/Kconfig.machine?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/Kconfig.machine</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/Kconfig.machine?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/Kconfig.machine</a></div><div class='hunk'>@@ -1,5 +1,7 @@</div><div class='ctx'> comment "Machine Types"</div><div class='ctx'> </div><div class='add'>+if M68KCLASSIC</div><div class='add'>+</div><div class='ctx'> config AMIGA</div><div class='ctx'> 	bool "Amiga support"</div><div class='ctx'> 	depends on MMU</div><div class='hunk'>@@ -130,6 +132,8 @@ config SUN3</div><div class='ctx'> </div><div class='ctx'> 	  If you don't want to compile a kernel exclusively for a Sun 3, say N.</div><div class='ctx'> </div><div class='add'>+endif # M68KCLASSIC</div><div class='add'>+</div><div class='ctx'> config PILOT</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c<br/>index 82a4bb51d5d8..b95a451b1c3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/amiga/config.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/amiga/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/amiga/config.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/amiga/config.c</a></div><div class='hunk'>@@ -511,8 +511,7 @@ static unsigned long amiga_gettimeoffset(void)</div><div class='ctx'> 	return ticks + offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static NORET_TYPE void amiga_reset(void)</div><div class='del'>-    ATTRIB_NORET;</div><div class='add'>+static void amiga_reset(void)  __noreturn;</div><div class='ctx'> </div><div class='ctx'> static void amiga_reset(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c<br/>index 6d196dadfdbc..8048e1b7e552 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/atari/ataints.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/atari/ataints.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/atari/ataints.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/atari/ataints.c</a></div><div class='hunk'>@@ -82,8 +82,6 @@ __ALIGN_STR "\n\t"</div><div class='ctx'> </div><div class='ctx'> extern void atari_microwire_cmd(int cmd);</div><div class='ctx'> </div><div class='del'>-extern int atari_SCC_reset_done;</div><div class='del'>-</div><div class='ctx'> static unsigned int atari_irq_startup(struct irq_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int irq = data-&gt;irq;</div><div class='head'>diff --git a/arch/m68k/atari/debug.c b/arch/m68k/atari/debug.c<br/>index 5a484247e493..a547ba9683d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/atari/debug.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/atari/debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/atari/debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/atari/debug.c</a></div><div class='hunk'>@@ -202,7 +202,6 @@ static void __init atari_init_mfp_port(int cflag)</div><div class='ctx'> </div><div class='ctx'> static void __init atari_init_scc_port(int cflag)</div><div class='ctx'> {</div><div class='del'>-	extern int atari_SCC_reset_done;</div><div class='ctx'> 	static int clksrc_table[9] =</div><div class='ctx'> 		/* reg 11: 0x50 = BRG, 0x00 = RTxC, 0x28 = TRxC */</div><div class='ctx'> 		{ 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x00, 0x00 };</div><div class='head'>diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig<br/>index dbb49fc6463b..e93fdae10b23 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/configs/amiga_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/configs/amiga_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/configs/amiga_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/configs/amiga_defconfig</a></div><div class='hunk'>@@ -255,7 +255,6 @@ CONFIG_HID=m</div><div class='ctx'> CONFIG_HIDRAW=y</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='ctx'> CONFIG_AMIGA_BUILTIN_SERIAL=y</div><div class='del'>-CONFIG_MULTIFACE_III_TTY=m</div><div class='ctx'> CONFIG_SERIAL_CONSOLE=y</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='ctx'> CONFIG_EXT3_FS=y</div><div class='head'>diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig<br/>index 562b221f6951..66b26c1e848c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/configs/apollo_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/configs/apollo_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/configs/apollo_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/configs/apollo_defconfig</a></div><div class='hunk'>@@ -223,8 +223,6 @@ CONFIG_LOGO=y</div><div class='ctx'> CONFIG_HID=m</div><div class='ctx'> CONFIG_HIDRAW=y</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='del'>-CONFIG_DN_SERIAL=y</div><div class='del'>-CONFIG_SERIAL_CONSOLE=y</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='ctx'> CONFIG_EXT3_FS=y</div><div class='ctx'> # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set</div><div class='head'>diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig<br/>index 82978df637fa..151332515980 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/configs/atari_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/configs/atari_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/configs/atari_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/configs/atari_defconfig</a></div><div class='hunk'>@@ -235,10 +235,7 @@ CONFIG_DMASOUND_ATARI=m</div><div class='ctx'> CONFIG_HID=m</div><div class='ctx'> CONFIG_HIDRAW=y</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='del'>-CONFIG_ATARI_MFPSER=y</div><div class='del'>-CONFIG_ATARI_MIDI=y</div><div class='ctx'> CONFIG_ATARI_DSP56K=m</div><div class='del'>-CONFIG_SERIAL_CONSOLE=y</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='ctx'> CONFIG_EXT3_FS=y</div><div class='ctx'> # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set</div><div class='head'>diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig<br/>index ad9e85760e34..55d394edf633 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/configs/multi_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/configs/multi_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/configs/multi_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/configs/multi_defconfig</a></div><div class='hunk'>@@ -318,13 +318,8 @@ CONFIG_DMASOUND_Q40=m</div><div class='ctx'> CONFIG_HID=m</div><div class='ctx'> CONFIG_HIDRAW=y</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='del'>-CONFIG_ATARI_MFPSER=y</div><div class='del'>-CONFIG_ATARI_MIDI=y</div><div class='ctx'> CONFIG_ATARI_DSP56K=m</div><div class='ctx'> CONFIG_AMIGA_BUILTIN_SERIAL=y</div><div class='del'>-CONFIG_MULTIFACE_III_TTY=m</div><div class='del'>-CONFIG_SERIAL167=y</div><div class='del'>-CONFIG_DN_SERIAL=y</div><div class='ctx'> CONFIG_SERIAL_CONSOLE=y</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='ctx'> CONFIG_EXT3_FS=y</div><div class='head'>diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig<br/>index c45aaf3b816f..cdb70d66e535 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/configs/mvme16x_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/configs/mvme16x_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/configs/mvme16x_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/configs/mvme16x_defconfig</a></div><div class='hunk'>@@ -218,8 +218,6 @@ CONFIG_GEN_RTC_X=y</div><div class='ctx'> CONFIG_HID=m</div><div class='ctx'> CONFIG_HIDRAW=y</div><div class='ctx'> # CONFIG_USB_SUPPORT is not set</div><div class='del'>-CONFIG_SERIAL167=y</div><div class='del'>-CONFIG_SERIAL_CONSOLE=y</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='ctx'> CONFIG_EXT3_FS=y</div><div class='ctx'> # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set</div><div class='head'>diff --git a/arch/m68k/emu/nfeth.c b/arch/m68k/emu/nfeth.c<br/>index c5748bb4ea71..a985a7e87d45 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/emu/nfeth.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/emu/nfeth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/emu/nfeth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/emu/nfeth.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@ enum {</div><div class='ctx'> #define MAX_UNIT	8</div><div class='ctx'> </div><div class='ctx'> /* These identify the driver base version and may not be removed. */</div><div class='del'>-static const char version[] __devinitdata =</div><div class='add'>+static const char version[] __devinitconst =</div><div class='ctx'> 	KERN_INFO KBUILD_MODNAME ".c:v" DRV_VERSION " " DRV_RELDATE</div><div class='ctx'> 	" S.Opichal, M.Jurik, P.Stehlik\n"</div><div class='ctx'> 	KERN_INFO " http://aranym.org/\n";</div><div class='head'>diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c<br/>index 1c05a6260546..bf16af1edacf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/hp300/config.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/hp300/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/hp300/config.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/hp300/config.c</a></div><div class='hunk'>@@ -24,7 +24,8 @@</div><div class='ctx'> </div><div class='ctx'> unsigned long hp300_model;</div><div class='ctx'> unsigned long hp300_uart_scode = -1;</div><div class='del'>-unsigned char ledstate;</div><div class='add'>+unsigned char hp300_ledstate;</div><div class='add'>+EXPORT_SYMBOL(hp300_ledstate);</div><div class='ctx'> </div><div class='ctx'> static char s_hp330[] __initdata = "330";</div><div class='ctx'> static char s_hp340[] __initdata = "340";</div><div class='head'>diff --git a/arch/m68k/include/asm/anchor.h b/arch/m68k/include/asm/anchor.h<br/>deleted file mode 100644<br/>index 871c0d5cfc3d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/anchor.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/anchor.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,112 +0,0 @@</div><div class='del'>-/****************************************************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	anchor.h -- Anchor CO-MEM Lite PCI host bridge part.</div><div class='del'>- *</div><div class='del'>- *	(C) Copyright 2000, Moreton Bay (www.moreton.com.au)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/****************************************************************************/</div><div class='del'>-#ifndef	anchor_h</div><div class='del'>-#define	anchor_h</div><div class='del'>-/****************************************************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Define basic addressing info.</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_M5407C3)</div><div class='del'>-#define	COMEM_BASE	0xFFFF0000	/* Base of CO-MEM address space */</div><div class='del'>-#define	COMEM_IRQ	25		/* IRQ of anchor part */</div><div class='del'>-#else</div><div class='del'>-#define	COMEM_BASE	0x80000000	/* Base of CO-MEM address space */</div><div class='del'>-#define	COMEM_IRQ	25		/* IRQ of anchor part */</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'>- *	4-byte registers of CO-MEM, so adjust register addresses for</div><div class='del'>- *	easy access. Handy macro for word access too.</div><div class='del'>- */</div><div class='del'>-#define	LREG(a)		((a) &gt;&gt; 2)</div><div class='del'>-#define	WREG(a)		((a) &gt;&gt; 1)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Define base addresses within CO-MEM Lite register address space.</div><div class='del'>- */</div><div class='del'>-#define	COMEM_I2O	0x0000		/* I2O registers */</div><div class='del'>-#define	COMEM_OPREGS	0x0400		/* Operation registers */</div><div class='del'>-#define	COMEM_PCIBUS	0x2000		/* Direct access to PCI bus */</div><div class='del'>-#define	COMEM_SHMEM	0x4000		/* Shared memory region */</div><div class='del'>-</div><div class='del'>-#define	COMEM_SHMEMSIZE	0x4000		/* Size of shared memory */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Define CO-MEM Registers.</div><div class='del'>- */</div><div class='del'>-#define	COMEM_I2OHISR	0x0030		/* I2O host interrupt status */</div><div class='del'>-#define	COMEM_I2OHIMR	0x0034		/* I2O host interrupt mask */</div><div class='del'>-#define	COMEM_I2OLISR	0x0038		/* I2O local interrupt status */</div><div class='del'>-#define	COMEM_I2OLIMR	0x003c		/* I2O local interrupt mask */</div><div class='del'>-#define	COMEM_IBFPFIFO	0x0040		/* I2O inbound free/post FIFO */</div><div class='del'>-#define	COMEM_OBPFFIFO	0x0044		/* I2O outbound post/free FIFO */</div><div class='del'>-#define	COMEM_IBPFFIFO	0x0048		/* I2O inbound post/free FIFO */</div><div class='del'>-#define	COMEM_OBFPFIFO	0x004c		/* I2O outbound free/post FIFO */</div><div class='del'>-</div><div class='del'>-#define	COMEM_DAHBASE	0x0460		/* Direct access base address */</div><div class='del'>-</div><div class='del'>-#define	COMEM_NVCMD	0x04a0		/* I2C serial command */</div><div class='del'>-#define	COMEM_NVREAD	0x04a4		/* I2C serial read */</div><div class='del'>-#define	COMEM_NVSTAT	0x04a8		/* I2C status */</div><div class='del'>-</div><div class='del'>-#define	COMEM_DMALBASE	0x04b0		/* DMA local base address */</div><div class='del'>-#define	COMEM_DMAHBASE	0x04b4		/* DMA host base address */</div><div class='del'>-#define	COMEM_DMASIZE	0x04b8		/* DMA size */</div><div class='del'>-#define	COMEM_DMACTL	0x04bc		/* DMA control */</div><div class='del'>-</div><div class='del'>-#define	COMEM_HCTL	0x04e0		/* Host control */</div><div class='del'>-#define	COMEM_HINT	0x04e4		/* Host interrupt control/status */</div><div class='del'>-#define	COMEM_HLDATA	0x04e8		/* Host to local data mailbox */</div><div class='del'>-#define	COMEM_LINT	0x04f4		/* Local interrupt contole status */</div><div class='del'>-#define	COMEM_LHDATA	0x04f8		/* Local to host data mailbox */</div><div class='del'>-</div><div class='del'>-#define	COMEM_LBUSCFG	0x04fc		/* Local bus configuration */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Commands and flags for use with Direct Access Register.</div><div class='del'>- */</div><div class='del'>-#define	COMEM_DA_IACK	0x00000000	/* Interrupt acknowledge (read) */</div><div class='del'>-#define	COMEM_DA_SPCL	0x00000010	/* Special cycle (write) */</div><div class='del'>-#define	COMEM_DA_MEMRD	0x00000004	/* Memory read cycle */</div><div class='del'>-#define	COMEM_DA_MEMWR	0x00000004	/* Memory write cycle */</div><div class='del'>-#define	COMEM_DA_IORD	0x00000002	/* I/O read cycle */</div><div class='del'>-#define	COMEM_DA_IOWR	0x00000002	/* I/O write cycle */</div><div class='del'>-#define	COMEM_DA_CFGRD	0x00000006	/* Configuration read cycle */</div><div class='del'>-#define	COMEM_DA_CFGWR	0x00000006	/* Configuration write cycle */</div><div class='del'>-</div><div class='del'>-#define	COMEM_DA_ADDR(a)	((a) &amp; 0xffffe000)</div><div class='del'>-</div><div class='del'>-#define	COMEM_DA_OFFSET(a)	((a) &amp; 0x00001fff)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	The PCI bus will be limited in what slots will actually be used.</div><div class='del'>- *	Define valid device numbers for different boards.</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_M5407C3)</div><div class='del'>-#define	COMEM_MINDEV	14		/* Minimum valid DEVICE */</div><div class='del'>-#define	COMEM_MAXDEV	14		/* Maximum valid DEVICE */</div><div class='del'>-#define	COMEM_BRIDGEDEV	15		/* Slot bridge is in */</div><div class='del'>-#else</div><div class='del'>-#define	COMEM_MINDEV	0		/* Minimum valid DEVICE */</div><div class='del'>-#define	COMEM_MAXDEV	3		/* Maximum valid DEVICE */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define	COMEM_MAXPCI	(COMEM_MAXDEV+1)	/* Maximum PCI devices */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/****************************************************************************/</div><div class='del'>-#endif	/* anchor_h */</div><div class='head'>diff --git a/arch/m68k/include/asm/atarihw.h b/arch/m68k/include/asm/atarihw.h<br/>index 0392b28656ab..c0cb36350775 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/atarihw.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/atarihw.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/atarihw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/atarihw.h</a></div><div class='hunk'>@@ -30,6 +30,8 @@ extern u_long atari_switches;</div><div class='ctx'> extern int atari_rtc_year_offset;</div><div class='ctx'> extern int atari_dont_touch_floppy_select;</div><div class='ctx'> </div><div class='add'>+extern int atari_SCC_reset_done;</div><div class='add'>+</div><div class='ctx'> /* convenience macros for testing machine type */</div><div class='ctx'> #define MACH_IS_ST	((atari_mch_cookie &gt;&gt; 16) == ATARI_MCH_ST)</div><div class='ctx'> #define MACH_IS_STE	((atari_mch_cookie &gt;&gt; 16) == ATARI_MCH_STE &amp;&amp; \</div><div class='head'>diff --git a/arch/m68k/include/asm/atomic.h b/arch/m68k/include/asm/atomic.h<br/>index 65c6be6c8180..4eba796c00d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/atomic.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/atomic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/atomic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/atomic.h</a></div><div class='hunk'>@@ -55,6 +55,16 @@ static inline int atomic_dec_and_test(atomic_t *v)</div><div class='ctx'> 	return c != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int atomic_dec_and_test_lt(atomic_t *v)</div><div class='add'>+{</div><div class='add'>+	char c;</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+		"subql #1,%1; slt %0"</div><div class='add'>+		: "=d" (c), "=m" (*v)</div><div class='add'>+		: "m" (*v));</div><div class='add'>+	return c != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int atomic_inc_and_test(atomic_t *v)</div><div class='ctx'> {</div><div class='ctx'> 	char c;</div><div class='head'>diff --git a/arch/m68k/include/asm/blinken.h b/arch/m68k/include/asm/blinken.h<br/>index 1a749cf7b06d..0626582a7db4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/blinken.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/blinken.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/blinken.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/blinken.h</a></div><div class='hunk'>@@ -17,15 +17,15 @@</div><div class='ctx'> </div><div class='ctx'> #define HP300_LEDS		0xf001ffff</div><div class='ctx'> </div><div class='del'>-extern unsigned char ledstate;</div><div class='add'>+extern unsigned char hp300_ledstate;</div><div class='ctx'> </div><div class='ctx'> static __inline__ void blinken_leds(int on, int off)</div><div class='ctx'> {</div><div class='ctx'> 	if (MACH_IS_HP300)</div><div class='ctx'> 	{</div><div class='del'>-		ledstate |= on;</div><div class='del'>-		ledstate &amp;= ~off;</div><div class='del'>-		out_8(HP300_LEDS, ~ledstate);</div><div class='add'>+		hp300_ledstate |= on;</div><div class='add'>+		hp300_ledstate &amp;= ~off;</div><div class='add'>+		out_8(HP300_LEDS, ~hp300_ledstate);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/include/asm/cacheflush_mm.h b/arch/m68k/include/asm/cacheflush_mm.h<br/>index 73de7c89d8e0..8104bd874649 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/cacheflush_mm.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/cacheflush_mm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/cacheflush_mm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/cacheflush_mm.h</a></div><div class='hunk'>@@ -2,23 +2,89 @@</div><div class='ctx'> #define _M68K_CACHEFLUSH_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#ifdef CONFIG_COLDFIRE</div><div class='add'>+#include &lt;asm/mcfsim.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* cache code */</div><div class='ctx'> #define FLUSH_I_AND_D	(0x00000808)</div><div class='ctx'> #define FLUSH_I		(0x00000008)</div><div class='ctx'> </div><div class='add'>+#ifndef ICACHE_MAX_ADDR</div><div class='add'>+#define ICACHE_MAX_ADDR	0</div><div class='add'>+#define ICACHE_SET_MASK	0</div><div class='add'>+#define DCACHE_MAX_ADDR	0</div><div class='add'>+#define DCACHE_SETMASK	0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline void flush_cf_icache(unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	unsigned long set;</div><div class='add'>+</div><div class='add'>+	for (set = start; set &lt;= end; set += (0x10 - 3)) {</div><div class='add'>+		__asm__ __volatile__ (</div><div class='add'>+			"cpushl %%ic,(%0)\n\t"</div><div class='add'>+			"addq%.l #1,%0\n\t"</div><div class='add'>+			"cpushl %%ic,(%0)\n\t"</div><div class='add'>+			"addq%.l #1,%0\n\t"</div><div class='add'>+			"cpushl %%ic,(%0)\n\t"</div><div class='add'>+			"addq%.l #1,%0\n\t"</div><div class='add'>+			"cpushl %%ic,(%0)"</div><div class='add'>+			: "=a" (set)</div><div class='add'>+			: "a" (set));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void flush_cf_dcache(unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	unsigned long set;</div><div class='add'>+</div><div class='add'>+	for (set = start; set &lt;= end; set += (0x10 - 3)) {</div><div class='add'>+		__asm__ __volatile__ (</div><div class='add'>+			"cpushl %%dc,(%0)\n\t"</div><div class='add'>+			"addq%.l #1,%0\n\t"</div><div class='add'>+			"cpushl %%dc,(%0)\n\t"</div><div class='add'>+			"addq%.l #1,%0\n\t"</div><div class='add'>+			"cpushl %%dc,(%0)\n\t"</div><div class='add'>+			"addq%.l #1,%0\n\t"</div><div class='add'>+			"cpushl %%dc,(%0)"</div><div class='add'>+			: "=a" (set)</div><div class='add'>+			: "a" (set));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void flush_cf_bcache(unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	unsigned long set;</div><div class='add'>+</div><div class='add'>+	for (set = start; set &lt;= end; set += (0x10 - 3)) {</div><div class='add'>+		__asm__ __volatile__ (</div><div class='add'>+			"cpushl %%bc,(%0)\n\t"</div><div class='add'>+			"addq%.l #1,%0\n\t"</div><div class='add'>+			"cpushl %%bc,(%0)\n\t"</div><div class='add'>+			"addq%.l #1,%0\n\t"</div><div class='add'>+			"cpushl %%bc,(%0)\n\t"</div><div class='add'>+			"addq%.l #1,%0\n\t"</div><div class='add'>+			"cpushl %%bc,(%0)"</div><div class='add'>+			: "=a" (set)</div><div class='add'>+			: "a" (set));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Cache handling functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static inline void flush_icache(void)</div><div class='ctx'> {</div><div class='del'>-	if (CPU_IS_040_OR_060)</div><div class='add'>+	if (CPU_IS_COLDFIRE) {</div><div class='add'>+		flush_cf_icache(0, ICACHE_MAX_ADDR);</div><div class='add'>+	} else if (CPU_IS_040_OR_060) {</div><div class='ctx'> 		asm volatile (	"nop\n"</div><div class='ctx'> 			"	.chip	68040\n"</div><div class='ctx'> 			"	cpusha	%bc\n"</div><div class='ctx'> 			"	.chip	68k");</div><div class='del'>-	else {</div><div class='add'>+	} else {</div><div class='ctx'> 		unsigned long tmp;</div><div class='ctx'> 		asm volatile (	"movec	%%cacr,%0\n"</div><div class='ctx'> 			"	or.w	%1,%0\n"</div><div class='hunk'>@@ -51,12 +117,14 @@ extern void cache_push_v(unsigned long vaddr, int len);</div><div class='ctx'>    process changes.  */</div><div class='ctx'> #define __flush_cache_all()					\</div><div class='ctx'> ({								\</div><div class='del'>-	if (CPU_IS_040_OR_060)					\</div><div class='add'>+	if (CPU_IS_COLDFIRE) {					\</div><div class='add'>+		flush_cf_dcache(0, DCACHE_MAX_ADDR);		\</div><div class='add'>+	} else if (CPU_IS_040_OR_060) {				\</div><div class='ctx'> 		__asm__ __volatile__("nop\n\t"			\</div><div class='ctx'> 				     ".chip 68040\n\t"		\</div><div class='ctx'> 				     "cpusha %dc\n\t"		\</div><div class='ctx'> 				     ".chip 68k");		\</div><div class='del'>-	else {							\</div><div class='add'>+	} else {						\</div><div class='ctx'> 		unsigned long _tmp;				\</div><div class='ctx'> 		__asm__ __volatile__("movec %%cacr,%0\n\t"	\</div><div class='ctx'> 				     "orw %1,%0\n\t"		\</div><div class='hunk'>@@ -112,7 +180,17 @@ static inline void flush_cache_page(struct vm_area_struct *vma, unsigned long vm</div><div class='ctx'> /* RZ: use cpush %bc instead of cpush %dc, cinv %ic */</div><div class='ctx'> static inline void __flush_page_to_ram(void *vaddr)</div><div class='ctx'> {</div><div class='del'>-	if (CPU_IS_040_OR_060) {</div><div class='add'>+	if (CPU_IS_COLDFIRE) {</div><div class='add'>+		unsigned long addr, start, end;</div><div class='add'>+		addr = ((unsigned long) vaddr) &amp; ~(PAGE_SIZE - 1);</div><div class='add'>+		start = addr &amp; ICACHE_SET_MASK;</div><div class='add'>+		end = (addr + PAGE_SIZE - 1) &amp; ICACHE_SET_MASK;</div><div class='add'>+		if (start &gt; end) {</div><div class='add'>+			flush_cf_bcache(0, end);</div><div class='add'>+			end = ICACHE_MAX_ADDR;</div><div class='add'>+		}</div><div class='add'>+		flush_cf_bcache(start, end);</div><div class='add'>+	} else if (CPU_IS_040_OR_060) {</div><div class='ctx'> 		__asm__ __volatile__("nop\n\t"</div><div class='ctx'> 				     ".chip 68040\n\t"</div><div class='ctx'> 				     "cpushp %%bc,(%0)\n\t"</div><div class='head'>diff --git a/arch/m68k/include/asm/checksum.h b/arch/m68k/include/asm/checksum.h<br/>index ec514485c8b6..2f88d867c711 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/checksum.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/checksum.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/checksum.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/checksum.h</a></div><div class='hunk'>@@ -3,6 +3,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_GENERIC_CSUM</div><div class='add'>+#include &lt;asm-generic/checksum.h&gt;</div><div class='add'>+#else</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * computes the checksum of a memory block at buff, length len,</div><div class='ctx'>  * and adds in "sum" (32-bit)</div><div class='hunk'>@@ -34,30 +38,6 @@ extern __wsum csum_partial_copy_nocheck(const void *src,</div><div class='ctx'> 					      void *dst, int len,</div><div class='ctx'> 					      __wsum sum);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COLDFIRE</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	The ColdFire cores don't support all the 68k instructions used</div><div class='del'>- *	in the optimized checksum code below. So it reverts back to using</div><div class='del'>- *	more standard C coded checksums. The fast checksum code is</div><div class='del'>- *	significantly larger than the optimized version, so it is not</div><div class='del'>- *	inlined here.</div><div class='del'>- */</div><div class='del'>-__sum16 ip_fast_csum(const void *iph, unsigned int ihl);</div><div class='del'>-</div><div class='del'>-static inline __sum16 csum_fold(__wsum sum)</div><div class='del'>-{</div><div class='del'>-	unsigned int tmp = (__force u32)sum;</div><div class='del'>-</div><div class='del'>-	tmp = (tmp &amp; 0xffff) + (tmp &gt;&gt; 16);</div><div class='del'>-	tmp = (tmp &amp; 0xffff) + (tmp &gt;&gt; 16);</div><div class='del'>-</div><div class='del'>-	return (__force __sum16)~tmp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	This is a version of ip_fast_csum() optimized for IP headers,</div><div class='ctx'>  *	which always checksum on 4 octet boundaries.</div><div class='hunk'>@@ -97,8 +77,6 @@ static inline __sum16 csum_fold(__wsum sum)</div><div class='ctx'> 	return (__force __sum16)~sum;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_COLDFIRE */</div><div class='del'>-</div><div class='ctx'> static inline __wsum</div><div class='ctx'> csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,</div><div class='ctx'> 		  unsigned short proto, __wsum sum)</div><div class='hunk'>@@ -167,4 +145,5 @@ csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr,</div><div class='ctx'> 	return csum_fold(sum);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#endif /* CONFIG_GENERIC_CSUM */</div><div class='ctx'> #endif /* _M68K_CHECKSUM_H */</div><div class='head'>diff --git a/arch/m68k/include/asm/div64.h b/arch/m68k/include/asm/div64.h<br/>index edb66148a71d..444ea8a09e9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/div64.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/div64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/div64.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/div64.h</a></div><div class='hunk'>@@ -1,7 +1,9 @@</div><div class='ctx'> #ifndef _M68K_DIV64_H</div><div class='ctx'> #define _M68K_DIV64_H</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MMU</div><div class='add'>+#ifdef CONFIG_CPU_HAS_NO_MULDIV64</div><div class='add'>+#include &lt;asm-generic/div64.h&gt;</div><div class='add'>+#else</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -27,8 +29,6 @@</div><div class='ctx'> 	__rem;							\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-#else</div><div class='del'>-#include &lt;asm-generic/div64.h&gt;</div><div class='del'>-#endif /* CONFIG_MMU */</div><div class='add'>+#endif /* CONFIG_CPU_HAS_NO_MULDIV64 */</div><div class='ctx'> </div><div class='ctx'> #endif /* _M68K_DIV64_H */</div><div class='head'>diff --git a/arch/m68k/include/asm/elf.h b/arch/m68k/include/asm/elf.h<br/>index 01c193d91412..e9b7cda59744 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/elf.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/elf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/elf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/elf.h</a></div><div class='hunk'>@@ -59,10 +59,10 @@ typedef struct user_m68kfp_struct elf_fpregset_t;</div><div class='ctx'>    is actually used on ASV.  */</div><div class='ctx'> #define ELF_PLAT_INIT(_r, load_addr)	_r-&gt;a1 = 0</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_SUN3</div><div class='del'>-#define ELF_EXEC_PAGESIZE	4096</div><div class='del'>-#else</div><div class='add'>+#if defined(CONFIG_SUN3) || defined(CONFIG_COLDFIRE)</div><div class='ctx'> #define ELF_EXEC_PAGESIZE	8192</div><div class='add'>+#else</div><div class='add'>+#define ELF_EXEC_PAGESIZE	4096</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* This is the location that an ET_DYN program is loaded if exec'ed.  Typical</div><div class='head'>diff --git a/arch/m68k/include/asm/entry.h b/arch/m68k/include/asm/entry.h<br/>index c3c5a8643e15..622138dc7288 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/entry.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/entry.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/entry.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/entry.h</a></div><div class='hunk'>@@ -222,16 +222,24 @@</div><div class='ctx'>  * Non-MMU systems do not reserve %a2 in this way, and this definition is</div><div class='ctx'>  * not used for them.</div><div class='ctx'>  */</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+</div><div class='ctx'> #define curptr a2</div><div class='ctx'> </div><div class='ctx'> #define GET_CURRENT(tmp) get_current tmp</div><div class='ctx'> .macro get_current reg=%d0</div><div class='ctx'> 	movel	%sp,\reg</div><div class='del'>-	andw	#-THREAD_SIZE,\reg</div><div class='add'>+	andl	#-THREAD_SIZE,\reg</div><div class='ctx'> 	movel	\reg,%curptr</div><div class='ctx'> 	movel	%curptr@,%curptr</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#define GET_CURRENT(tmp)</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_MMU */</div><div class='add'>+</div><div class='ctx'> #else /* C source */</div><div class='ctx'> </div><div class='ctx'> #define STR(X) STR1(X)</div><div class='head'>diff --git a/arch/m68k/include/asm/fpu.h b/arch/m68k/include/asm/fpu.h<br/>index ffb6b8cfc6d5..526db9da9e43 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/fpu.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/fpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/fpu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/fpu.h</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> #define FPSTATESIZE (96)</div><div class='ctx'> #elif defined(CONFIG_M68KFPU_EMU)</div><div class='ctx'> #define FPSTATESIZE (28)</div><div class='add'>+#elif defined(CONFIG_COLDFIRE) &amp;&amp; defined(CONFIG_MMU)</div><div class='add'>+#define FPSTATESIZE (16)</div><div class='ctx'> #elif defined(CONFIG_M68060)</div><div class='ctx'> #define FPSTATESIZE (12)</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/m68k/include/asm/gpio.h b/arch/m68k/include/asm/gpio.h<br/>index b2046839f4b2..00d0071de4c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/gpio.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/gpio.h</a></div><div class='hunk'>@@ -225,7 +225,8 @@ static inline void gpio_set_value(unsigned gpio, int value)</div><div class='ctx'> </div><div class='ctx'> static inline int gpio_to_irq(unsigned gpio)</div><div class='ctx'> {</div><div class='del'>-	return (gpio &lt; MCFGPIO_IRQ_MAX) ? gpio + MCFGPIO_IRQ_VECBASE : -EINVAL;</div><div class='add'>+	return (gpio &lt; MCFGPIO_IRQ_MAX) ? gpio + MCFGPIO_IRQ_VECBASE</div><div class='add'>+		: __gpio_to_irq(gpio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int irq_to_gpio(unsigned irq)</div><div class='head'>diff --git a/arch/m68k/include/asm/ipcbuf.h b/arch/m68k/include/asm/ipcbuf.h<br/>index a623ea3f0955..84c7e51cb6d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/ipcbuf.h</a></div><div class='hunk'>@@ -1,29 +1 @@</div><div class='del'>-#ifndef __m68k_IPCBUF_H__</div><div class='del'>-#define __m68k_IPCBUF_H__</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The user_ipc_perm structure for m68k architecture.</div><div class='del'>- * Note extra padding because this structure is passed back and forth</div><div class='del'>- * between kernel and user space.</div><div class='del'>- *</div><div class='del'>- * Pad space is left for:</div><div class='del'>- * - 32-bit mode_t and seq</div><div class='del'>- * - 2 miscellaneous 32-bit values</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct ipc64_perm</div><div class='del'>-{</div><div class='del'>-	__kernel_key_t		key;</div><div class='del'>-	__kernel_uid32_t	uid;</div><div class='del'>-	__kernel_gid32_t	gid;</div><div class='del'>-	__kernel_uid32_t	cuid;</div><div class='del'>-	__kernel_gid32_t	cgid;</div><div class='del'>-	__kernel_mode_t		mode;</div><div class='del'>-	unsigned short		__pad1;</div><div class='del'>-	unsigned short		seq;</div><div class='del'>-	unsigned short		__pad2;</div><div class='del'>-	unsigned long		__unused1;</div><div class='del'>-	unsigned long		__unused2;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* __m68k_IPCBUF_H__ */</div><div class='add'>+#include &lt;asm-generic/ipcbuf.h&gt;</div><div class='head'>diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h<br/>index 6198df5ff245..0e89fa05de0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/irq.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/irq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/irq.h</a></div><div class='hunk'>@@ -25,7 +25,8 @@</div><div class='ctx'> #define NR_IRQS	0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MMU</div><div class='add'>+#if defined(CONFIG_M68020) || defined(CONFIG_M68030) || \</div><div class='add'>+    defined(CONFIG_M68040) || defined(CONFIG_M68060)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Interrupt source definitions</div><div class='hunk'>@@ -80,7 +81,7 @@ extern unsigned int irq_canonicalize(unsigned int irq);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> #define irq_canonicalize(irq)  (irq)</div><div class='del'>-#endif /* CONFIG_MMU */</div><div class='add'>+#endif /* !(CONFIG_M68020 || CONFIG_M68030 || CONFIG_M68040 || CONFIG_M68060) */</div><div class='ctx'> </div><div class='ctx'> asmlinkage void do_IRQ(int irq, struct pt_regs *regs);</div><div class='ctx'> extern atomic_t irq_err_count;</div><div class='head'>diff --git a/arch/m68k/include/asm/m54xxacr.h b/arch/m68k/include/asm/m54xxacr.h<br/>index 16a1835f9b2a..47906aafbf67 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/m54xxacr.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/m54xxacr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/m54xxacr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/m54xxacr.h</a></div><div class='hunk'>@@ -39,8 +39,12 @@</div><div class='ctx'> #define ACR_CM_OFF_PRE	0x00000040	/* No cache, precise */</div><div class='ctx'> #define ACR_CM_OFF_IMP	0x00000060	/* No cache, imprecise */</div><div class='ctx'> #define ACR_CM		0x00000060	/* Cache mode mask */</div><div class='add'>+#define ACR_SP		0x00000008	/* Supervisor protect */</div><div class='ctx'> #define ACR_WPROTECT	0x00000004	/* Write protect */</div><div class='ctx'> </div><div class='add'>+#define ACR_BA(x)	((x) &amp; 0xff000000)</div><div class='add'>+#define ACR_ADMSK(x)	((((x) - 1) &amp; 0xff000000) &gt;&gt; 8)</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_M5407)</div><div class='ctx'> </div><div class='ctx'> #define ICACHE_SIZE 0x4000	/* instruction - 16k */</div><div class='hunk'>@@ -56,6 +60,11 @@</div><div class='ctx'> #define CACHE_LINE_SIZE 0x0010	/* 16 bytes */</div><div class='ctx'> #define CACHE_WAYS 4		/* 4 ways */</div><div class='ctx'> </div><div class='add'>+#define ICACHE_SET_MASK	((ICACHE_SIZE / 64 - 1) &lt;&lt; CACHE_WAYS)</div><div class='add'>+#define DCACHE_SET_MASK	((DCACHE_SIZE / 64 - 1) &lt;&lt; CACHE_WAYS)</div><div class='add'>+#define ICACHE_MAX_ADDR	ICACHE_SET_MASK</div><div class='add'>+#define DCACHE_MAX_ADDR	DCACHE_SET_MASK</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Version 4 cores have a true harvard style separate instruction</div><div class='ctx'>  *	and data cache. Enable data and instruction caches, also enable write</div><div class='hunk'>@@ -73,6 +82,27 @@</div><div class='ctx'> #else</div><div class='ctx'> #define CACHE_MODE (CACR_DEC+CACR_DESB+CACR_DDCM_P+CACR_BEC+CACR_IEC+CACR_EUSP)</div><div class='ctx'> #endif</div><div class='add'>+#define CACHE_INIT (CACR_DCINVA+CACR_BCINVA+CACR_ICINVA)</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MMU)</div><div class='add'>+/*</div><div class='add'>+ *	If running with the MMU enabled then we need to map the internal</div><div class='add'>+ *	register region as non-cacheable. And then we map all our RAM as</div><div class='add'>+ *	cacheable and supervisor access only.</div><div class='add'>+ */</div><div class='add'>+#define ACR0_MODE	(ACR_BA(CONFIG_MBAR)+ACR_ADMSK(0x1000000)+ \</div><div class='add'>+			 ACR_ENABLE+ACR_SUPER+ACR_CM_OFF_PRE+ACR_SP)</div><div class='add'>+#define ACR1_MODE	(ACR_BA(CONFIG_RAMBASE)+ACR_ADMSK(CONFIG_RAMSIZE)+ \</div><div class='add'>+			 ACR_ENABLE+ACR_SUPER+ACR_SP)</div><div class='add'>+#define ACR2_MODE	0</div><div class='add'>+#define ACR3_MODE	(ACR_BA(CONFIG_RAMBASE)+ACR_ADMSK(CONFIG_RAMSIZE)+ \</div><div class='add'>+			 ACR_ENABLE+ACR_SUPER+ACR_SP)</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	For the non-MMU enabled case we map all of RAM as cacheable.</div><div class='add'>+ */</div><div class='ctx'> #if defined(CONFIG_CACHE_COPYBACK)</div><div class='ctx'> #define DATA_CACHE_MODE (ACR_ENABLE+ACR_ANY+ACR_CM_CP)</div><div class='ctx'> #else</div><div class='hunk'>@@ -80,7 +110,6 @@</div><div class='ctx'> #endif</div><div class='ctx'> #define INSN_CACHE_MODE (ACR_ENABLE+ACR_ANY)</div><div class='ctx'> </div><div class='del'>-#define CACHE_INIT	(CACR_DCINVA+CACR_BCINVA+CACR_ICINVA)</div><div class='ctx'> #define CACHE_INVALIDATE  (CACHE_MODE+CACR_DCINVA+CACR_BCINVA+CACR_ICINVA)</div><div class='ctx'> #define CACHE_INVALIDATEI (CACHE_MODE+CACR_BCINVA+CACR_ICINVA)</div><div class='ctx'> #define CACHE_INVALIDATED (CACHE_MODE+CACR_DCINVA)</div><div class='hunk'>@@ -94,4 +123,5 @@</div><div class='ctx'> #define	CACHE_PUSH</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#endif /* CONFIG_MMU */</div><div class='ctx'> #endif	/* m54xxacr_h */</div><div class='head'>diff --git a/arch/m68k/include/asm/mac_baboon.h b/arch/m68k/include/asm/mac_baboon.h<br/>index c2a042b8c349..a2d32f6589f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/mac_baboon.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/mac_baboon.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/mac_baboon.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/mac_baboon.h</a></div><div class='hunk'>@@ -29,4 +29,10 @@ struct baboon {</div><div class='ctx'> 				 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+extern int baboon_present;</div><div class='add'>+</div><div class='add'>+extern void baboon_register_interrupts(void);</div><div class='add'>+extern void baboon_irq_enable(int);</div><div class='add'>+extern void baboon_irq_disable(int);</div><div class='add'>+</div><div class='ctx'> #endif /* __ASSEMBLY **/</div><div class='head'>diff --git a/arch/m68k/include/asm/mac_iop.h b/arch/m68k/include/asm/mac_iop.h<br/>index a2c7e6fcca38..fde874a01e20 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/mac_iop.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/mac_iop.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/mac_iop.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/mac_iop.h</a></div><div class='hunk'>@@ -159,4 +159,6 @@ extern void iop_upload_code(uint, __u8 *, uint, __u16);</div><div class='ctx'> extern void iop_download_code(uint, __u8 *, uint, __u16);</div><div class='ctx'> extern __u8 *iop_compare_code(uint, __u8 *, uint, __u16);</div><div class='ctx'> </div><div class='add'>+extern void iop_register_interrupts(void);</div><div class='add'>+</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='head'>diff --git a/arch/m68k/include/asm/mac_oss.h b/arch/m68k/include/asm/mac_oss.h<br/>index 3cf2b6ed685a..425fbff4f4d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/mac_oss.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/mac_oss.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/mac_oss.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/mac_oss.h</a></div><div class='hunk'>@@ -58,25 +58,6 @@</div><div class='ctx'> </div><div class='ctx'> #define OSS_POWEROFF	0x80</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * OSS Interrupt levels for various sub-systems</div><div class='del'>- *</div><div class='del'>- * This mapping is laid out with two things in mind: first, we try to keep</div><div class='del'>- * things on their own levels to avoid having to do double-dispatches. Second,</div><div class='del'>- * the levels match as closely as possible the alternate IRQ mapping mode (aka</div><div class='del'>- * "A/UX mode") available on some VIA machines.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define OSS_IRQLEV_DISABLED	0</div><div class='del'>-#define OSS_IRQLEV_IOPISM	1	/* ADB? */</div><div class='del'>-#define OSS_IRQLEV_SCSI		IRQ_AUTO_2</div><div class='del'>-#define OSS_IRQLEV_NUBUS	IRQ_AUTO_3	/* keep this on its own level */</div><div class='del'>-#define OSS_IRQLEV_IOPSCC	IRQ_AUTO_4	/* matches VIA alternate mapping */</div><div class='del'>-#define OSS_IRQLEV_SOUND	IRQ_AUTO_5	/* matches VIA alternate mapping */</div><div class='del'>-#define OSS_IRQLEV_60HZ		6	/* matches VIA alternate mapping */</div><div class='del'>-#define OSS_IRQLEV_VIA1		IRQ_AUTO_6	/* matches VIA alternate mapping */</div><div class='del'>-#define OSS_IRQLEV_PARITY	7	/* matches VIA alternate mapping */</div><div class='del'>-</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='ctx'> struct mac_oss {</div><div class='hunk'>@@ -91,4 +72,8 @@ struct mac_oss {</div><div class='ctx'> extern volatile struct mac_oss *oss;</div><div class='ctx'> extern int oss_present;</div><div class='ctx'> </div><div class='add'>+extern void oss_register_interrupts(void);</div><div class='add'>+extern void oss_irq_enable(int);</div><div class='add'>+extern void oss_irq_disable(int);</div><div class='add'>+</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='head'>diff --git a/arch/m68k/include/asm/mac_psc.h b/arch/m68k/include/asm/mac_psc.h<br/>index 7808bb0b2323..e5c0d71d1543 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/mac_psc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/mac_psc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/mac_psc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/mac_psc.h</a></div><div class='hunk'>@@ -211,6 +211,10 @@</div><div class='ctx'> extern volatile __u8 *psc;</div><div class='ctx'> extern int psc_present;</div><div class='ctx'> </div><div class='add'>+extern void psc_register_interrupts(void);</div><div class='add'>+extern void psc_irq_enable(int);</div><div class='add'>+extern void psc_irq_disable(int);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Access functions</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/m68k/include/asm/mac_via.h b/arch/m68k/include/asm/mac_via.h<br/>index a59665e1d41b..aeeedf8b2d25 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/mac_via.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/mac_via.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/mac_via.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/mac_via.h</a></div><div class='hunk'>@@ -254,6 +254,15 @@</div><div class='ctx'> extern volatile __u8 *via1,*via2;</div><div class='ctx'> extern int rbv_present,via_alt_mapping;</div><div class='ctx'> </div><div class='add'>+extern void via_register_interrupts(void);</div><div class='add'>+extern void via_irq_enable(int);</div><div class='add'>+extern void via_irq_disable(int);</div><div class='add'>+extern void via_nubus_irq_startup(int irq);</div><div class='add'>+extern void via_nubus_irq_shutdown(int irq);</div><div class='add'>+extern void via1_irq(unsigned int irq, struct irq_desc *desc);</div><div class='add'>+extern void via1_set_head(int);</div><div class='add'>+extern int via2_scsi_drq_pending(void);</div><div class='add'>+</div><div class='ctx'> static inline int rbv_set_video_bpp(int bpp)</div><div class='ctx'> {</div><div class='ctx'> 	char val = (bpp==1)?0:(bpp==2)?1:(bpp==4)?2:(bpp==8)?3:-1;</div><div class='head'>diff --git a/arch/m68k/include/asm/macintosh.h b/arch/m68k/include/asm/macintosh.h<br/>index 12ebe43b008b..682a1a2ff55f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/macintosh.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/macintosh.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/macintosh.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/macintosh.h</a></div><div class='hunk'>@@ -11,17 +11,11 @@</div><div class='ctx'> extern void mac_reset(void);</div><div class='ctx'> extern void mac_poweroff(void);</div><div class='ctx'> extern void mac_init_IRQ(void);</div><div class='del'>-extern int mac_irq_pending(unsigned int);</div><div class='add'>+</div><div class='ctx'> extern void mac_irq_enable(struct irq_data *data);</div><div class='ctx'> extern void mac_irq_disable(struct irq_data *data);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *	Floppy driver magic hook - probably shouldn't be here</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-extern void via1_set_head(int);</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  *	Macintosh Table</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -48,7 +42,7 @@ struct mac_model</div><div class='ctx'> #define MAC_ADB_IOP		6</div><div class='ctx'> </div><div class='ctx'> #define MAC_VIA_II		1</div><div class='del'>-#define MAC_VIA_IIci		2</div><div class='add'>+#define MAC_VIA_IICI		2</div><div class='ctx'> #define MAC_VIA_QUADRA		3</div><div class='ctx'> </div><div class='ctx'> #define MAC_SCSI_NONE		0</div><div class='head'>diff --git a/arch/m68k/include/asm/macints.h b/arch/m68k/include/asm/macints.h<br/>index ebe1b70fe90c..92aa8a4c2d03 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/macints.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/macints.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/macints.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/macints.h</a></div><div class='hunk'>@@ -104,6 +104,9 @@</div><div class='ctx'> #define IRQ_PSC4_3	  (35)</div><div class='ctx'> #define IRQ_MAC_MACE_DMA  IRQ_PSC4_3</div><div class='ctx'> </div><div class='add'>+/* OSS Level 4 interrupts */</div><div class='add'>+#define IRQ_MAC_SCC	  (33)</div><div class='add'>+</div><div class='ctx'> /* Level 5 (PSC, AV Macs only) interrupts */</div><div class='ctx'> #define IRQ_PSC5_0	  (40)</div><div class='ctx'> #define IRQ_PSC5_1	  (41)</div><div class='hunk'>@@ -131,9 +134,6 @@</div><div class='ctx'> #define IRQ_BABOON_2	  (66)</div><div class='ctx'> #define IRQ_BABOON_3	  (67)</div><div class='ctx'> </div><div class='del'>-/* On non-PSC machines, the serial ports share an IRQ */</div><div class='del'>-#define IRQ_MAC_SCC	  IRQ_AUTO_4</div><div class='del'>-</div><div class='ctx'> #define SLOT2IRQ(x)	  (x + 47)</div><div class='ctx'> #define IRQ2SLOT(x)	  (x - 47)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/include/asm/mcf_pgalloc.h b/arch/m68k/include/asm/mcf_pgalloc.h<br/>new file mode 100644<br/>index 000000000000..313f3dd23cdc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/mcf_pgalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/mcf_pgalloc.h</a></div><div class='hunk'>@@ -0,0 +1,102 @@</div><div class='add'>+#ifndef M68K_MCF_PGALLOC_H</div><div class='add'>+#define M68K_MCF_PGALLOC_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/tlb.h&gt;</div><div class='add'>+#include &lt;asm/tlbflush.h&gt;</div><div class='add'>+</div><div class='add'>+extern inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)</div><div class='add'>+{</div><div class='add'>+	free_page((unsigned long) pte);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern const char bad_pmd_string[];</div><div class='add'>+</div><div class='add'>+extern inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,</div><div class='add'>+	unsigned long address)</div><div class='add'>+{</div><div class='add'>+	unsigned long page = __get_free_page(GFP_DMA|__GFP_REPEAT);</div><div class='add'>+</div><div class='add'>+	if (!page)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	memset((void *)page, 0, PAGE_SIZE);</div><div class='add'>+	return (pte_t *) (page);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address)</div><div class='add'>+{</div><div class='add'>+	return (pmd_t *) pgd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define pmd_alloc_one_fast(mm, address) ({ BUG(); ((pmd_t *)1); })</div><div class='add'>+#define pmd_alloc_one(mm, address)      ({ BUG(); ((pmd_t *)2); })</div><div class='add'>+</div><div class='add'>+#define pte_alloc_one_fast(mm, addr) pte_alloc_one(mm, addr)</div><div class='add'>+</div><div class='add'>+#define pmd_populate(mm, pmd, page) (pmd_val(*pmd) = \</div><div class='add'>+	(unsigned long)(page_address(page)))</div><div class='add'>+</div><div class='add'>+#define pmd_populate_kernel(mm, pmd, pte) (pmd_val(*pmd) = (unsigned long)(pte))</div><div class='add'>+</div><div class='add'>+#define pmd_pgtable(pmd) pmd_page(pmd)</div><div class='add'>+</div><div class='add'>+static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t page,</div><div class='add'>+				  unsigned long address)</div><div class='add'>+{</div><div class='add'>+	__free_page(page);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define __pmd_free_tlb(tlb, pmd, address) do { } while (0)</div><div class='add'>+</div><div class='add'>+static inline struct page *pte_alloc_one(struct mm_struct *mm,</div><div class='add'>+	unsigned long address)</div><div class='add'>+{</div><div class='add'>+	struct page *page = alloc_pages(GFP_DMA|__GFP_REPEAT, 0);</div><div class='add'>+	pte_t *pte;</div><div class='add'>+</div><div class='add'>+	if (!page)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	pte = kmap(page);</div><div class='add'>+	if (pte) {</div><div class='add'>+		clear_page(pte);</div><div class='add'>+		__flush_page_to_ram(pte);</div><div class='add'>+		flush_tlb_kernel_page(pte);</div><div class='add'>+		nocache_page(pte);</div><div class='add'>+	}</div><div class='add'>+	kunmap(page);</div><div class='add'>+</div><div class='add'>+	return page;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern inline void pte_free(struct mm_struct *mm, struct page *page)</div><div class='add'>+{</div><div class='add'>+	__free_page(page);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * In our implementation, each pgd entry contains 1 pmd that is never allocated</div><div class='add'>+ * or freed.  pgd_present is always 1, so this should never be called. -NL</div><div class='add'>+ */</div><div class='add'>+#define pmd_free(mm, pmd) BUG()</div><div class='add'>+</div><div class='add'>+static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)</div><div class='add'>+{</div><div class='add'>+	free_page((unsigned long) pgd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pgd_t *pgd_alloc(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	pgd_t *new_pgd;</div><div class='add'>+</div><div class='add'>+	new_pgd = (pgd_t *)__get_free_page(GFP_DMA | __GFP_NOWARN);</div><div class='add'>+	if (!new_pgd)</div><div class='add'>+		return NULL;</div><div class='add'>+	memcpy(new_pgd, swapper_pg_dir, PAGE_SIZE);</div><div class='add'>+	memset(new_pgd, 0, PAGE_OFFSET &gt;&gt; PGDIR_SHIFT);</div><div class='add'>+	return new_pgd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define pgd_populate(mm, pmd, pte) BUG()</div><div class='add'>+</div><div class='add'>+#endif /* M68K_MCF_PGALLOC_H */</div><div class='head'>diff --git a/arch/m68k/include/asm/mcf_pgtable.h b/arch/m68k/include/asm/mcf_pgtable.h<br/>new file mode 100644<br/>index 000000000000..756bde4fb4f8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/mcf_pgtable.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/mcf_pgtable.h</a></div><div class='hunk'>@@ -0,0 +1,425 @@</div><div class='add'>+#ifndef _MCF_PGTABLE_H</div><div class='add'>+#define _MCF_PGTABLE_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mcfmmu.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MMUDR bits, in proper place. We write these directly into the MMUDR</div><div class='add'>+ * after masking from the pte.</div><div class='add'>+ */</div><div class='add'>+#define CF_PAGE_LOCKED		MMUDR_LK	/* 0x00000002 */</div><div class='add'>+#define CF_PAGE_EXEC		MMUDR_X		/* 0x00000004 */</div><div class='add'>+#define CF_PAGE_WRITABLE	MMUDR_W		/* 0x00000008 */</div><div class='add'>+#define CF_PAGE_READABLE	MMUDR_R		/* 0x00000010 */</div><div class='add'>+#define CF_PAGE_SYSTEM		MMUDR_SP	/* 0x00000020 */</div><div class='add'>+#define CF_PAGE_COPYBACK	MMUDR_CM_CCB	/* 0x00000040 */</div><div class='add'>+#define CF_PAGE_NOCACHE		MMUDR_CM_NCP	/* 0x00000080 */</div><div class='add'>+</div><div class='add'>+#define CF_CACHEMASK		(~MMUDR_CM_CCB)</div><div class='add'>+#define CF_PAGE_MMUDR_MASK	0x000000fe</div><div class='add'>+</div><div class='add'>+#define _PAGE_NOCACHE030	CF_PAGE_NOCACHE</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MMUTR bits, need shifting down.</div><div class='add'>+ */</div><div class='add'>+#define CF_PAGE_MMUTR_MASK	0x00000c00</div><div class='add'>+#define CF_PAGE_MMUTR_SHIFT	10</div><div class='add'>+</div><div class='add'>+#define CF_PAGE_VALID		(MMUTR_V &lt;&lt; CF_PAGE_MMUTR_SHIFT)</div><div class='add'>+#define CF_PAGE_SHARED		(MMUTR_SG &lt;&lt; CF_PAGE_MMUTR_SHIFT)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Fake bits, not implemented in CF, will get masked out before</div><div class='add'>+ * hitting hardware.</div><div class='add'>+ */</div><div class='add'>+#define CF_PAGE_DIRTY		0x00000001</div><div class='add'>+#define CF_PAGE_FILE		0x00000200</div><div class='add'>+#define CF_PAGE_ACCESSED	0x00001000</div><div class='add'>+</div><div class='add'>+#define _PAGE_CACHE040		0x020   /* 68040 cache mode, cachable, copyback */</div><div class='add'>+#define _PAGE_NOCACHE_S		0x040   /* 68040 no-cache mode, serialized */</div><div class='add'>+#define _PAGE_NOCACHE		0x060   /* 68040 cache mode, non-serialized */</div><div class='add'>+#define _PAGE_CACHE040W		0x000   /* 68040 cache mode, cachable, write-through */</div><div class='add'>+#define _DESCTYPE_MASK		0x003</div><div class='add'>+#define _CACHEMASK040		(~0x060)</div><div class='add'>+#define _PAGE_GLOBAL040		0x400   /* 68040 global bit, used for kva descs */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Externally used page protection values.</div><div class='add'>+ */</div><div class='add'>+#define _PAGE_PRESENT	(CF_PAGE_VALID)</div><div class='add'>+#define _PAGE_ACCESSED	(CF_PAGE_ACCESSED)</div><div class='add'>+#define _PAGE_DIRTY	(CF_PAGE_DIRTY)</div><div class='add'>+#define _PAGE_READWRITE (CF_PAGE_READABLE \</div><div class='add'>+				| CF_PAGE_WRITABLE \</div><div class='add'>+				| CF_PAGE_SYSTEM \</div><div class='add'>+				| CF_PAGE_SHARED)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Compound page protection values.</div><div class='add'>+ */</div><div class='add'>+#define PAGE_NONE	__pgprot(CF_PAGE_VALID \</div><div class='add'>+				 | CF_PAGE_ACCESSED)</div><div class='add'>+</div><div class='add'>+#define PAGE_SHARED     __pgprot(CF_PAGE_VALID \</div><div class='add'>+				 | CF_PAGE_ACCESSED \</div><div class='add'>+				 | CF_PAGE_SHARED)</div><div class='add'>+</div><div class='add'>+#define PAGE_INIT	__pgprot(CF_PAGE_VALID \</div><div class='add'>+				 | CF_PAGE_READABLE \</div><div class='add'>+				 | CF_PAGE_WRITABLE \</div><div class='add'>+				 | CF_PAGE_EXEC \</div><div class='add'>+				 | CF_PAGE_SYSTEM)</div><div class='add'>+</div><div class='add'>+#define PAGE_KERNEL	__pgprot(CF_PAGE_VALID \</div><div class='add'>+				 | CF_PAGE_ACCESSED \</div><div class='add'>+				 | CF_PAGE_READABLE \</div><div class='add'>+				 | CF_PAGE_WRITABLE \</div><div class='add'>+				 | CF_PAGE_EXEC \</div><div class='add'>+				 | CF_PAGE_SYSTEM)</div><div class='add'>+</div><div class='add'>+#define PAGE_COPY	__pgprot(CF_PAGE_VALID \</div><div class='add'>+				 | CF_PAGE_ACCESSED \</div><div class='add'>+				 | CF_PAGE_READABLE \</div><div class='add'>+				 | CF_PAGE_DIRTY)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Page protections for initialising protection_map. See mm/mmap.c</div><div class='add'>+ * for use. In general, the bit positions are xwr, and P-items are</div><div class='add'>+ * private, the S-items are shared.</div><div class='add'>+ */</div><div class='add'>+#define __P000		PAGE_NONE</div><div class='add'>+#define __P001		__pgprot(CF_PAGE_VALID \</div><div class='add'>+				 | CF_PAGE_ACCESSED \</div><div class='add'>+				 | CF_PAGE_READABLE)</div><div class='add'>+#define __P010		__pgprot(CF_PAGE_VALID \</div><div class='add'>+				 | CF_PAGE_ACCESSED \</div><div class='add'>+				 | CF_PAGE_WRITABLE)</div><div class='add'>+#define __P011		__pgprot(CF_PAGE_VALID \</div><div class='add'>+				 | CF_PAGE_ACCESSED \</div><div class='add'>+				 | CF_PAGE_READABLE \</div><div class='add'>+				 | CF_PAGE_WRITABLE)</div><div class='add'>+#define __P100		__pgprot(CF_PAGE_VALID \</div><div class='add'>+				 | CF_PAGE_ACCESSED \</div><div class='add'>+				 | CF_PAGE_EXEC)</div><div class='add'>+#define __P101		__pgprot(CF_PAGE_VALID \</div><div class='add'>+				 | CF_PAGE_ACCESSED \</div><div class='add'>+				 | CF_PAGE_READABLE \</div><div class='add'>+				 | CF_PAGE_EXEC)</div><div class='add'>+#define __P110		__pgprot(CF_PAGE_VALID \</div><div class='add'>+				 | CF_PAGE_ACCESSED \</div><div class='add'>+				 | CF_PAGE_WRITABLE \</div><div class='add'>+				 | CF_PAGE_EXEC)</div><div class='add'>+#define __P111		__pgprot(CF_PAGE_VALID \</div><div class='add'>+				 | CF_PAGE_ACCESSED \</div><div class='add'>+				 | CF_PAGE_READABLE \</div><div class='add'>+				 | CF_PAGE_WRITABLE \</div><div class='add'>+				 | CF_PAGE_EXEC)</div><div class='add'>+</div><div class='add'>+#define __S000		PAGE_NONE</div><div class='add'>+#define __S001		__pgprot(CF_PAGE_VALID \</div><div class='add'>+				 | CF_PAGE_ACCESSED \</div><div class='add'>+				 | CF_PAGE_READABLE)</div><div class='add'>+#define __S010		PAGE_SHARED</div><div class='add'>+#define __S011		__pgprot(CF_PAGE_VALID \</div><div class='add'>+				 | CF_PAGE_ACCESSED \</div><div class='add'>+				 | CF_PAGE_SHARED \</div><div class='add'>+				 | CF_PAGE_READABLE)</div><div class='add'>+#define __S100		__pgprot(CF_PAGE_VALID \</div><div class='add'>+				 | CF_PAGE_ACCESSED \</div><div class='add'>+				 | CF_PAGE_EXEC)</div><div class='add'>+#define __S101		__pgprot(CF_PAGE_VALID \</div><div class='add'>+				 | CF_PAGE_ACCESSED \</div><div class='add'>+				 | CF_PAGE_READABLE \</div><div class='add'>+				 | CF_PAGE_EXEC)</div><div class='add'>+#define __S110		__pgprot(CF_PAGE_VALID \</div><div class='add'>+				 | CF_PAGE_ACCESSED \</div><div class='add'>+				 | CF_PAGE_SHARED \</div><div class='add'>+				 | CF_PAGE_EXEC)</div><div class='add'>+#define __S111		__pgprot(CF_PAGE_VALID \</div><div class='add'>+				 | CF_PAGE_ACCESSED \</div><div class='add'>+				 | CF_PAGE_SHARED \</div><div class='add'>+				 | CF_PAGE_READABLE \</div><div class='add'>+				 | CF_PAGE_EXEC)</div><div class='add'>+</div><div class='add'>+#define PTE_MASK	PAGE_MASK</div><div class='add'>+#define CF_PAGE_CHG_MASK (PTE_MASK | CF_PAGE_ACCESSED | CF_PAGE_DIRTY)</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Conversion functions: convert a page and protection to a page entry,</div><div class='add'>+ * and a page entry and page directory to the page they refer to.</div><div class='add'>+ */</div><div class='add'>+#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot))</div><div class='add'>+</div><div class='add'>+static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)</div><div class='add'>+{</div><div class='add'>+	pte_val(pte) = (pte_val(pte) &amp; CF_PAGE_CHG_MASK) | pgprot_val(newprot);</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define pmd_set(pmdp, ptep) do {} while (0)</div><div class='add'>+</div><div class='add'>+static inline void pgd_set(pgd_t *pgdp, pmd_t *pmdp)</div><div class='add'>+{</div><div class='add'>+	pgd_val(*pgdp) = virt_to_phys(pmdp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define __pte_page(pte)	((unsigned long) (pte_val(pte) &amp; PAGE_MASK))</div><div class='add'>+#define __pmd_page(pmd)	((unsigned long) (pmd_val(pmd)))</div><div class='add'>+</div><div class='add'>+static inline int pte_none(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	return !pte_val(pte);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int pte_present(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	return pte_val(pte) &amp; CF_PAGE_VALID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void pte_clear(struct mm_struct *mm, unsigned long addr,</div><div class='add'>+	pte_t *ptep)</div><div class='add'>+{</div><div class='add'>+	pte_val(*ptep) = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define pte_pagenr(pte)	((__pte_page(pte) - PAGE_OFFSET) &gt;&gt; PAGE_SHIFT)</div><div class='add'>+#define pte_page(pte)	virt_to_page(__pte_page(pte))</div><div class='add'>+</div><div class='add'>+static inline int pmd_none2(pmd_t *pmd) { return !pmd_val(*pmd); }</div><div class='add'>+#define pmd_none(pmd) pmd_none2(&amp;(pmd))</div><div class='add'>+static inline int pmd_bad2(pmd_t *pmd) { return 0; }</div><div class='add'>+#define pmd_bad(pmd) pmd_bad2(&amp;(pmd))</div><div class='add'>+#define pmd_present(pmd) (!pmd_none2(&amp;(pmd)))</div><div class='add'>+static inline void pmd_clear(pmd_t *pmdp) { pmd_val(*pmdp) = 0; }</div><div class='add'>+</div><div class='add'>+static inline int pgd_none(pgd_t pgd) { return 0; }</div><div class='add'>+static inline int pgd_bad(pgd_t pgd) { return 0; }</div><div class='add'>+static inline int pgd_present(pgd_t pgd) { return 1; }</div><div class='add'>+static inline void pgd_clear(pgd_t *pgdp) {}</div><div class='add'>+</div><div class='add'>+#define pte_ERROR(e) \</div><div class='add'>+	printk(KERN_ERR "%s:%d: bad pte %08lx.\n",	\</div><div class='add'>+	__FILE__, __LINE__, pte_val(e))</div><div class='add'>+#define pmd_ERROR(e) \</div><div class='add'>+	printk(KERN_ERR "%s:%d: bad pmd %08lx.\n",	\</div><div class='add'>+	__FILE__, __LINE__, pmd_val(e))</div><div class='add'>+#define pgd_ERROR(e) \</div><div class='add'>+	printk(KERN_ERR "%s:%d: bad pgd %08lx.\n",	\</div><div class='add'>+	__FILE__, __LINE__, pgd_val(e))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The following only work if pte_present() is true.</div><div class='add'>+ * Undefined behaviour if not...</div><div class='add'>+ * [we have the full set here even if they don't change from m68k]</div><div class='add'>+ */</div><div class='add'>+static inline int pte_read(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	return pte_val(pte) &amp; CF_PAGE_READABLE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int pte_write(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	return pte_val(pte) &amp; CF_PAGE_WRITABLE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int pte_exec(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	return pte_val(pte) &amp; CF_PAGE_EXEC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int pte_dirty(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	return pte_val(pte) &amp; CF_PAGE_DIRTY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int pte_young(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	return pte_val(pte) &amp; CF_PAGE_ACCESSED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int pte_file(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	return pte_val(pte) &amp; CF_PAGE_FILE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int pte_special(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pte_t pte_wrprotect(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	pte_val(pte) &amp;= ~CF_PAGE_WRITABLE;</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pte_t pte_rdprotect(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	pte_val(pte) &amp;= ~CF_PAGE_READABLE;</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pte_t pte_exprotect(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	pte_val(pte) &amp;= ~CF_PAGE_EXEC;</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pte_t pte_mkclean(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	pte_val(pte) &amp;= ~CF_PAGE_DIRTY;</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pte_t pte_mkold(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	pte_val(pte) &amp;= ~CF_PAGE_ACCESSED;</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pte_t pte_mkwrite(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	pte_val(pte) |= CF_PAGE_WRITABLE;</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pte_t pte_mkread(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	pte_val(pte) |= CF_PAGE_READABLE;</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pte_t pte_mkexec(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	pte_val(pte) |= CF_PAGE_EXEC;</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pte_t pte_mkdirty(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	pte_val(pte) |= CF_PAGE_DIRTY;</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pte_t pte_mkyoung(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	pte_val(pte) |= CF_PAGE_ACCESSED;</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pte_t pte_mknocache(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	pte_val(pte) |= 0x80 | (pte_val(pte) &amp; ~0x40);</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pte_t pte_mkcache(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	pte_val(pte) &amp;= ~CF_PAGE_NOCACHE;</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pte_t pte_mkspecial(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define swapper_pg_dir kernel_pg_dir</div><div class='add'>+extern pgd_t kernel_pg_dir[PTRS_PER_PGD];</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Find an entry in a pagetable directory.</div><div class='add'>+ */</div><div class='add'>+#define pgd_index(address)	((address) &gt;&gt; PGDIR_SHIFT)</div><div class='add'>+#define pgd_offset(mm, address)	((mm)-&gt;pgd + pgd_index(address))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Find an entry in a kernel pagetable directory.</div><div class='add'>+ */</div><div class='add'>+#define pgd_offset_k(address)	pgd_offset(&amp;init_mm, address)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Find an entry in the second-level pagetable.</div><div class='add'>+ */</div><div class='add'>+static inline pmd_t *pmd_offset(pgd_t *pgd, unsigned long address)</div><div class='add'>+{</div><div class='add'>+	return (pmd_t *) pgd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Find an entry in the third-level pagetable.</div><div class='add'>+ */</div><div class='add'>+#define __pte_offset(address)	((address &gt;&gt; PAGE_SHIFT) &amp; (PTRS_PER_PTE - 1))</div><div class='add'>+#define pte_offset_kernel(dir, address) \</div><div class='add'>+	((pte_t *) __pmd_page(*(dir)) + __pte_offset(address))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Disable caching for page at given kernel virtual address.</div><div class='add'>+ */</div><div class='add'>+static inline void nocache_page(void *vaddr)</div><div class='add'>+{</div><div class='add'>+	pgd_t *dir;</div><div class='add'>+	pmd_t *pmdp;</div><div class='add'>+	pte_t *ptep;</div><div class='add'>+	unsigned long addr = (unsigned long) vaddr;</div><div class='add'>+</div><div class='add'>+	dir = pgd_offset_k(addr);</div><div class='add'>+	pmdp = pmd_offset(dir, addr);</div><div class='add'>+	ptep = pte_offset_kernel(pmdp, addr);</div><div class='add'>+	*ptep = pte_mknocache(*ptep);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable caching for page at given kernel virtual address.</div><div class='add'>+ */</div><div class='add'>+static inline void cache_page(void *vaddr)</div><div class='add'>+{</div><div class='add'>+	pgd_t *dir;</div><div class='add'>+	pmd_t *pmdp;</div><div class='add'>+	pte_t *ptep;</div><div class='add'>+	unsigned long addr = (unsigned long) vaddr;</div><div class='add'>+</div><div class='add'>+	dir = pgd_offset_k(addr);</div><div class='add'>+	pmdp = pmd_offset(dir, addr);</div><div class='add'>+	ptep = pte_offset_kernel(pmdp, addr);</div><div class='add'>+	*ptep = pte_mkcache(*ptep);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define PTE_FILE_MAX_BITS	21</div><div class='add'>+#define PTE_FILE_SHIFT		11</div><div class='add'>+</div><div class='add'>+static inline unsigned long pte_to_pgoff(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	return pte_val(pte) &gt;&gt; PTE_FILE_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pte_t pgoff_to_pte(unsigned pgoff)</div><div class='add'>+{</div><div class='add'>+	return __pte((pgoff &lt;&lt; PTE_FILE_SHIFT) + CF_PAGE_FILE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Encode and de-code a swap entry (must be !pte_none(e) &amp;&amp; !pte_present(e))</div><div class='add'>+ */</div><div class='add'>+#define __swp_type(x)		((x).val &amp; 0xFF)</div><div class='add'>+#define __swp_offset(x)		((x).val &gt;&gt; PTE_FILE_SHIFT)</div><div class='add'>+#define __swp_entry(typ, off)	((swp_entry_t) { (typ) | \</div><div class='add'>+					(off &lt;&lt; PTE_FILE_SHIFT) })</div><div class='add'>+#define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })</div><div class='add'>+#define __swp_entry_to_pte(x)	(__pte((x).val))</div><div class='add'>+</div><div class='add'>+#define pmd_page(pmd)		(pfn_to_page(pmd_val(pmd) &gt;&gt; PAGE_SHIFT))</div><div class='add'>+</div><div class='add'>+#define pte_offset_map(pmdp, addr) ((pte_t *)__pmd_page(*pmdp) + \</div><div class='add'>+				       __pte_offset(addr))</div><div class='add'>+#define pte_unmap(pte)		((void) 0)</div><div class='add'>+#define pfn_pte(pfn, prot)	__pte(((pfn) &lt;&lt; PAGE_SHIFT) | pgprot_val(prot))</div><div class='add'>+#define pte_pfn(pte)		(pte_val(pte) &gt;&gt; PAGE_SHIFT)</div><div class='add'>+</div><div class='add'>+#endif	/* !__ASSEMBLY__ */</div><div class='add'>+#endif	/* _MCF_PGTABLE_H */</div><div class='head'>diff --git a/arch/m68k/include/asm/mcfmmu.h b/arch/m68k/include/asm/mcfmmu.h<br/>new file mode 100644<br/>index 000000000000..26cc3d5a63f8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/mcfmmu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/mcfmmu.h</a></div><div class='hunk'>@@ -0,0 +1,112 @@</div><div class='add'>+/*</div><div class='add'>+ *	mcfmmu.h -- definitions for the ColdFire v4e MMU</div><div class='add'>+ *</div><div class='add'>+ *	(C) Copyright 2011,  Greg Ungerer &lt;gerg@uclinux.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file COPYING in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef	MCFMMU_H</div><div class='add'>+#define	MCFMMU_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	The MMU support registers are mapped into the address space using</div><div class='add'>+ *	the processor MMUBASE register. We used a fixed address for mapping,</div><div class='add'>+ *	there doesn't seem any need to make this configurable yet.</div><div class='add'>+ */</div><div class='add'>+#define	MMUBASE		0xfe000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	The support registers of the MMU. Names are the sames as those</div><div class='add'>+ *	used in the Freescale v4e documentation.</div><div class='add'>+ */</div><div class='add'>+#define	MMUCR		(MMUBASE + 0x00)	/* Control register */</div><div class='add'>+#define	MMUOR		(MMUBASE + 0x04)	/* Operation register */</div><div class='add'>+#define	MMUSR		(MMUBASE + 0x08)	/* Status register */</div><div class='add'>+#define	MMUAR		(MMUBASE + 0x10)	/* TLB Address register */</div><div class='add'>+#define	MMUTR		(MMUBASE + 0x14)	/* TLB Tag register */</div><div class='add'>+#define	MMUDR		(MMUBASE + 0x18)	/* TLB Data register */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	MMU Control register bit flags</div><div class='add'>+ */</div><div class='add'>+#define	MMUCR_EN	0x00000001		/* Virtual mode enable */</div><div class='add'>+#define	MMUCR_ASM	0x00000002		/* Address space mode */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	MMU Operation register.</div><div class='add'>+ */</div><div class='add'>+#define	MMUOR_UAA	0x00000001		/* Update allocatiom address */</div><div class='add'>+#define	MMUOR_ACC	0x00000002		/* TLB access */</div><div class='add'>+#define	MMUOR_RD	0x00000004		/* TLB access read */</div><div class='add'>+#define	MMUOR_WR	0x00000000		/* TLB access write */</div><div class='add'>+#define	MMUOR_ADR	0x00000008		/* TLB address select */</div><div class='add'>+#define	MMUOR_ITLB	0x00000010		/* ITLB operation */</div><div class='add'>+#define	MMUOR_CAS	0x00000020		/* Clear non-locked ASID TLBs */</div><div class='add'>+#define	MMUOR_CNL	0x00000040		/* Clear non-locked TLBs */</div><div class='add'>+#define	MMUOR_CA	0x00000080		/* Clear all TLBs */</div><div class='add'>+#define	MMUOR_STLB	0x00000100		/* Search TLBs */</div><div class='add'>+#define	MMUOR_AAN	16			/* TLB allocation address */</div><div class='add'>+#define	MMUOR_AAMASK	0xffff0000		/* AA mask */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	MMU Status register.</div><div class='add'>+ */</div><div class='add'>+#define	MMUSR_HIT	0x00000002		/* Search TLB hit */</div><div class='add'>+#define	MMUSR_WF	0x00000008		/* Write access fault */</div><div class='add'>+#define	MMUSR_RF	0x00000010		/* Read access fault */</div><div class='add'>+#define	MMUSR_SPF	0x00000020		/* Supervisor protect fault */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	MMU Read/Write Tag register.</div><div class='add'>+ */</div><div class='add'>+#define	MMUTR_V		0x00000001		/* Valid */</div><div class='add'>+#define	MMUTR_SG	0x00000002		/* Shared global */</div><div class='add'>+#define	MMUTR_IDN	2			/* Address Space ID */</div><div class='add'>+#define	MMUTR_IDMASK	0x000003fc		/* ASID mask */</div><div class='add'>+#define	MMUTR_VAN	10			/* Virtual Address */</div><div class='add'>+#define	MMUTR_VAMASK	0xfffffc00		/* VA mask */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	MMU Read/Write Data register.</div><div class='add'>+ */</div><div class='add'>+#define	MMUDR_LK	0x00000002		/* Lock entry */</div><div class='add'>+#define	MMUDR_X		0x00000004		/* Execute access enable */</div><div class='add'>+#define	MMUDR_W		0x00000008		/* Write access enable */</div><div class='add'>+#define	MMUDR_R		0x00000010		/* Read access enable */</div><div class='add'>+#define	MMUDR_SP	0x00000020		/* Supervisor access enable */</div><div class='add'>+#define	MMUDR_CM_CWT	0x00000000		/* Cachable write thru */</div><div class='add'>+#define	MMUDR_CM_CCB	0x00000040		/* Cachable copy back */</div><div class='add'>+#define	MMUDR_CM_NCP	0x00000080		/* Non-cachable precise */</div><div class='add'>+#define	MMUDR_CM_NCI	0x000000c0		/* Non-cachable imprecise */</div><div class='add'>+#define	MMUDR_SZ_1MB	0x00000000		/* 1MB page size */</div><div class='add'>+#define	MMUDR_SZ_4KB	0x00000100		/* 4kB page size */</div><div class='add'>+#define	MMUDR_SZ_8KB	0x00000200		/* 8kB page size */</div><div class='add'>+#define	MMUDR_SZ_1KB	0x00000300		/* 1kB page size */</div><div class='add'>+#define	MMUDR_PAN	10			/* Physical address */</div><div class='add'>+#define	MMUDR_PAMASK	0xfffffc00		/* PA mask */</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Simple access functions for the MMU registers. Nothing fancy</div><div class='add'>+ *	currently required, just simple 32bit access.</div><div class='add'>+ */</div><div class='add'>+static inline u32 mmu_read(u32 a)</div><div class='add'>+{</div><div class='add'>+	return *((volatile u32 *) a);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mmu_write(u32 a, u32 v)</div><div class='add'>+{</div><div class='add'>+	*((volatile u32 *) a) = v;</div><div class='add'>+	__asm__ __volatile__ ("nop");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cf_tlb_miss(struct pt_regs *regs, int write, int dtlb, int extension_word);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif	/* MCFMMU_H */</div><div class='head'>diff --git a/arch/m68k/include/asm/mmu_context.h b/arch/m68k/include/asm/mmu_context.h<br/>index 7d4341e55a99..dc3be991d634 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/mmu_context.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/mmu_context.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/mmu_context.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/mmu_context.h</a></div><div class='hunk'>@@ -8,7 +8,206 @@ static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-#ifndef CONFIG_SUN3</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_COLDFIRE)</div><div class='add'>+</div><div class='add'>+#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+#include &lt;asm/mcfmmu.h&gt;</div><div class='add'>+#include &lt;asm/mmu.h&gt;</div><div class='add'>+</div><div class='add'>+#define NO_CONTEXT		256</div><div class='add'>+#define LAST_CONTEXT		255</div><div class='add'>+#define FIRST_CONTEXT		1</div><div class='add'>+</div><div class='add'>+extern unsigned long context_map[];</div><div class='add'>+extern mm_context_t next_mmu_context;</div><div class='add'>+</div><div class='add'>+extern atomic_t nr_free_contexts;</div><div class='add'>+extern struct mm_struct *context_mm[LAST_CONTEXT+1];</div><div class='add'>+extern void steal_context(void);</div><div class='add'>+</div><div class='add'>+static inline void get_mmu_context(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	mm_context_t ctx;</div><div class='add'>+</div><div class='add'>+	if (mm-&gt;context != NO_CONTEXT)</div><div class='add'>+		return;</div><div class='add'>+	while (atomic_dec_and_test_lt(&amp;nr_free_contexts)) {</div><div class='add'>+		atomic_inc(&amp;nr_free_contexts);</div><div class='add'>+		steal_context();</div><div class='add'>+	}</div><div class='add'>+	ctx = next_mmu_context;</div><div class='add'>+	while (test_and_set_bit(ctx, context_map)) {</div><div class='add'>+		ctx = find_next_zero_bit(context_map, LAST_CONTEXT+1, ctx);</div><div class='add'>+		if (ctx &gt; LAST_CONTEXT)</div><div class='add'>+			ctx = 0;</div><div class='add'>+	}</div><div class='add'>+	next_mmu_context = (ctx + 1) &amp; LAST_CONTEXT;</div><div class='add'>+	mm-&gt;context = ctx;</div><div class='add'>+	context_mm[ctx] = mm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set up the context for a new address space.</div><div class='add'>+ */</div><div class='add'>+#define init_new_context(tsk, mm)	(((mm)-&gt;context = NO_CONTEXT), 0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We're finished using the context for an address space.</div><div class='add'>+ */</div><div class='add'>+static inline void destroy_context(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	if (mm-&gt;context != NO_CONTEXT) {</div><div class='add'>+		clear_bit(mm-&gt;context, context_map);</div><div class='add'>+		mm-&gt;context = NO_CONTEXT;</div><div class='add'>+		atomic_inc(&amp;nr_free_contexts);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void set_context(mm_context_t context, pgd_t *pgd)</div><div class='add'>+{</div><div class='add'>+	__asm__ __volatile__ ("movec %0,%%asid" : : "d" (context));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,</div><div class='add'>+	struct task_struct *tsk)</div><div class='add'>+{</div><div class='add'>+	get_mmu_context(tsk-&gt;mm);</div><div class='add'>+	set_context(tsk-&gt;mm-&gt;context, next-&gt;pgd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * After we have set current-&gt;mm to a new value, this activates</div><div class='add'>+ * the context for the new mm so we see the new mappings.</div><div class='add'>+ */</div><div class='add'>+static inline void activate_mm(struct mm_struct *active_mm,</div><div class='add'>+	struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	get_mmu_context(mm);</div><div class='add'>+	set_context(mm-&gt;context, mm-&gt;pgd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define deactivate_mm(tsk, mm) do { } while (0)</div><div class='add'>+</div><div class='add'>+extern void mmu_context_init(void);</div><div class='add'>+#define prepare_arch_switch(next) load_ksp_mmu(next)</div><div class='add'>+</div><div class='add'>+static inline void load_ksp_mmu(struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct mm_struct *mm;</div><div class='add'>+	int asid;</div><div class='add'>+	pgd_t *pgd;</div><div class='add'>+	pmd_t *pmd;</div><div class='add'>+	pte_t *pte;</div><div class='add'>+	unsigned long mmuar;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	mmuar = task-&gt;thread.ksp;</div><div class='add'>+</div><div class='add'>+	/* Search for a valid TLB entry, if one is found, don't remap */</div><div class='add'>+	mmu_write(MMUAR, mmuar);</div><div class='add'>+	mmu_write(MMUOR, MMUOR_STLB | MMUOR_ADR);</div><div class='add'>+	if (mmu_read(MMUSR) &amp; MMUSR_HIT)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	if (mmuar &gt;= PAGE_OFFSET) {</div><div class='add'>+		mm = &amp;init_mm;</div><div class='add'>+	} else {</div><div class='add'>+		pr_info("load_ksp_mmu: non-kernel mm found: 0x%p\n", task-&gt;mm);</div><div class='add'>+		mm = task-&gt;mm;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mm)</div><div class='add'>+		goto bug;</div><div class='add'>+</div><div class='add'>+	pgd = pgd_offset(mm, mmuar);</div><div class='add'>+	if (pgd_none(*pgd))</div><div class='add'>+		goto bug;</div><div class='add'>+</div><div class='add'>+	pmd = pmd_offset(pgd, mmuar);</div><div class='add'>+	if (pmd_none(*pmd))</div><div class='add'>+		goto bug;</div><div class='add'>+</div><div class='add'>+	pte = (mmuar &gt;= PAGE_OFFSET) ? pte_offset_kernel(pmd, mmuar)</div><div class='add'>+				     : pte_offset_map(pmd, mmuar);</div><div class='add'>+	if (pte_none(*pte) || !pte_present(*pte))</div><div class='add'>+		goto bug;</div><div class='add'>+</div><div class='add'>+	set_pte(pte, pte_mkyoung(*pte));</div><div class='add'>+	asid = mm-&gt;context &amp; 0xff;</div><div class='add'>+	if (!pte_dirty(*pte) &amp;&amp; mmuar &lt;= PAGE_OFFSET)</div><div class='add'>+		set_pte(pte, pte_wrprotect(*pte));</div><div class='add'>+</div><div class='add'>+	mmu_write(MMUTR, (mmuar &amp; PAGE_MASK) | (asid &lt;&lt; MMUTR_IDN) |</div><div class='add'>+		(((int)(pte-&gt;pte) &amp; (int)CF_PAGE_MMUTR_MASK)</div><div class='add'>+		&gt;&gt; CF_PAGE_MMUTR_SHIFT) | MMUTR_V);</div><div class='add'>+</div><div class='add'>+	mmu_write(MMUDR, (pte_val(*pte) &amp; PAGE_MASK) |</div><div class='add'>+		((pte-&gt;pte) &amp; CF_PAGE_MMUDR_MASK) | MMUDR_SZ_8KB | MMUDR_X);</div><div class='add'>+</div><div class='add'>+	mmu_write(MMUOR, MMUOR_ACC | MMUOR_UAA);</div><div class='add'>+</div><div class='add'>+	goto end;</div><div class='add'>+</div><div class='add'>+bug:</div><div class='add'>+	pr_info("ksp load failed: mm=0x%p ksp=0x08%lx\n", mm, mmuar);</div><div class='add'>+end:</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#elif defined(CONFIG_SUN3)</div><div class='add'>+#include &lt;asm/sun3mmu.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+</div><div class='add'>+extern unsigned long get_free_context(struct mm_struct *mm);</div><div class='add'>+extern void clear_context(unsigned long context);</div><div class='add'>+</div><div class='add'>+/* set the context for a new task to unmapped */</div><div class='add'>+static inline int init_new_context(struct task_struct *tsk,</div><div class='add'>+				   struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	mm-&gt;context = SUN3_INVALID_CONTEXT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* find the context given to this process, and if it hasn't already</div><div class='add'>+   got one, go get one for it. */</div><div class='add'>+static inline void get_mmu_context(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	if (mm-&gt;context == SUN3_INVALID_CONTEXT)</div><div class='add'>+		mm-&gt;context = get_free_context(mm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* flush context if allocated... */</div><div class='add'>+static inline void destroy_context(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	if (mm-&gt;context != SUN3_INVALID_CONTEXT)</div><div class='add'>+		clear_context(mm-&gt;context);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void activate_context(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	get_mmu_context(mm);</div><div class='add'>+	sun3_put_context(mm-&gt;context);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,</div><div class='add'>+			     struct task_struct *tsk)</div><div class='add'>+{</div><div class='add'>+	activate_context(tsk-&gt;mm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define deactivate_mm(tsk, mm)	do { } while (0)</div><div class='add'>+</div><div class='add'>+static inline void activate_mm(struct mm_struct *prev_mm,</div><div class='add'>+			       struct mm_struct *next_mm)</div><div class='add'>+{</div><div class='add'>+	activate_context(next_mm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -103,55 +302,8 @@ static inline void activate_mm(struct mm_struct *prev_mm,</div><div class='ctx'> 		switch_mm_0460(next_mm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else  /* CONFIG_SUN3 */</div><div class='del'>-#include &lt;asm/sun3mmu.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-</div><div class='del'>-extern unsigned long get_free_context(struct mm_struct *mm);</div><div class='del'>-extern void clear_context(unsigned long context);</div><div class='del'>-</div><div class='del'>-/* set the context for a new task to unmapped */</div><div class='del'>-static inline int init_new_context(struct task_struct *tsk, struct mm_struct *mm)</div><div class='del'>-{</div><div class='del'>-	mm-&gt;context = SUN3_INVALID_CONTEXT;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* find the context given to this process, and if it hasn't already</div><div class='del'>-   got one, go get one for it. */</div><div class='del'>-static inline void get_mmu_context(struct mm_struct *mm)</div><div class='del'>-{</div><div class='del'>-	if(mm-&gt;context == SUN3_INVALID_CONTEXT)</div><div class='del'>-		mm-&gt;context = get_free_context(mm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* flush context if allocated... */</div><div class='del'>-static inline void destroy_context(struct mm_struct *mm)</div><div class='del'>-{</div><div class='del'>-	if(mm-&gt;context != SUN3_INVALID_CONTEXT)</div><div class='del'>-		clear_context(mm-&gt;context);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void activate_context(struct mm_struct *mm)</div><div class='del'>-{</div><div class='del'>-	get_mmu_context(mm);</div><div class='del'>-	sun3_put_context(mm-&gt;context);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk)</div><div class='del'>-{</div><div class='del'>-	activate_context(tsk-&gt;mm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define deactivate_mm(tsk,mm)	do { } while (0)</div><div class='del'>-</div><div class='del'>-static inline void activate_mm(struct mm_struct *prev_mm,</div><div class='del'>-			       struct mm_struct *next_mm)</div><div class='del'>-{</div><div class='del'>-	activate_context(next_mm);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #else /* !CONFIG_MMU */</div><div class='ctx'> </div><div class='ctx'> static inline int init_new_context(struct task_struct *tsk, struct mm_struct *mm)</div><div class='head'>diff --git a/arch/m68k/include/asm/motorola_pgtable.h b/arch/m68k/include/asm/motorola_pgtable.h<br/>index 45bd3f589bf0..e0fdd4d08075 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/motorola_pgtable.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/motorola_pgtable.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/motorola_pgtable.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/motorola_pgtable.h</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #define _PAGE_PRESENT	0x001</div><div class='ctx'> #define _PAGE_SHORT	0x002</div><div class='ctx'> #define _PAGE_RONLY	0x004</div><div class='add'>+#define _PAGE_READWRITE	0x000</div><div class='ctx'> #define _PAGE_ACCESSED	0x008</div><div class='ctx'> #define _PAGE_DIRTY	0x010</div><div class='ctx'> #define _PAGE_SUPER	0x080	/* 68040 supervisor only */</div><div class='head'>diff --git a/arch/m68k/include/asm/page.h b/arch/m68k/include/asm/page.h<br/>index dfebb7c1e379..98baa82a8615 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/page.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/page.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/page.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/page.h</a></div><div class='hunk'>@@ -6,10 +6,10 @@</div><div class='ctx'> #include &lt;asm/page_offset.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* PAGE_SHIFT determines the page size */</div><div class='del'>-#ifndef CONFIG_SUN3</div><div class='del'>-#define PAGE_SHIFT	(12)</div><div class='add'>+#if defined(CONFIG_SUN3) || defined(CONFIG_COLDFIRE)</div><div class='add'>+#define PAGE_SHIFT	13</div><div class='ctx'> #else</div><div class='del'>-#define PAGE_SHIFT	(13)</div><div class='add'>+#define PAGE_SHIFT	12</div><div class='ctx'> #endif</div><div class='ctx'> #define PAGE_SIZE	(_AC(1, UL) &lt;&lt; PAGE_SHIFT)</div><div class='ctx'> #define PAGE_MASK	(~(PAGE_SIZE-1))</div><div class='hunk'>@@ -36,6 +36,10 @@ 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='add'>+extern unsigned long _rambase;</div><div class='add'>+extern unsigned long _ramstart;</div><div class='add'>+extern unsigned long _ramend;</div><div class='add'>+</div><div class='ctx'> #endif /* !__ASSEMBLY__ */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='head'>diff --git a/arch/m68k/include/asm/page_no.h b/arch/m68k/include/asm/page_no.h<br/>index a8d1c60eb9ce..90595721185f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/page_no.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/page_no.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/page_no.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/page_no.h</a></div><div class='hunk'>@@ -5,9 +5,6 @@</div><div class='ctx'>  </div><div class='ctx'> extern unsigned long memory_start;</div><div class='ctx'> extern unsigned long memory_end;</div><div class='del'>-extern unsigned long _rambase;</div><div class='del'>-extern unsigned long _ramstart;</div><div class='del'>-extern unsigned long _ramend;</div><div class='ctx'> </div><div class='ctx'> #define get_user_page(vaddr)		__get_free_page(GFP_KERNEL)</div><div class='ctx'> #define free_user_page(page, addr)	free_page(addr)</div><div class='head'>diff --git a/arch/m68k/include/asm/page_offset.h b/arch/m68k/include/asm/page_offset.h<br/>index 1780152d81da..82626a8f1d0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/page_offset.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/page_offset.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/page_offset.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/page_offset.h</a></div><div class='hunk'>@@ -1,11 +1,9 @@</div><div class='ctx'> /* This handles the memory map.. */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MMU</div><div class='del'>-#ifndef CONFIG_SUN3</div><div class='del'>-#define PAGE_OFFSET_RAW		0x00000000</div><div class='del'>-#else</div><div class='add'>+#if defined(CONFIG_RAMBASE)</div><div class='add'>+#define PAGE_OFFSET_RAW		CONFIG_RAMBASE</div><div class='add'>+#elif defined(CONFIG_SUN3)</div><div class='ctx'> #define PAGE_OFFSET_RAW		0x0E000000</div><div class='del'>-#endif</div><div class='ctx'> #else</div><div class='del'>-#define	PAGE_OFFSET_RAW		CONFIG_RAMBASE</div><div class='add'>+#define PAGE_OFFSET_RAW		0x00000000</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/m68k/include/asm/pgalloc.h b/arch/m68k/include/asm/pgalloc.h<br/>index c294aad8a900..37bee7e3223d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/pgalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/pgalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/pgalloc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/pgalloc.h</a></div><div class='hunk'>@@ -7,7 +7,9 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> #include &lt;asm/virtconvert.h&gt;</div><div class='del'>-#ifdef CONFIG_SUN3</div><div class='add'>+#if defined(CONFIG_COLDFIRE)</div><div class='add'>+#include &lt;asm/mcf_pgalloc.h&gt;</div><div class='add'>+#elif defined(CONFIG_SUN3)</div><div class='ctx'> #include &lt;asm/sun3_pgalloc.h&gt;</div><div class='ctx'> #else</div><div class='ctx'> #include &lt;asm/motorola_pgalloc.h&gt;</div><div class='head'>diff --git a/arch/m68k/include/asm/pgtable_mm.h b/arch/m68k/include/asm/pgtable_mm.h<br/>index 87174c904d2b..dc35e0e106e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/pgtable_mm.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/pgtable_mm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/pgtable_mm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/pgtable_mm.h</a></div><div class='hunk'>@@ -40,6 +40,8 @@</div><div class='ctx'> /* PGDIR_SHIFT determines what a third-level page table entry can map */</div><div class='ctx'> #ifdef CONFIG_SUN3</div><div class='ctx'> #define PGDIR_SHIFT     17</div><div class='add'>+#elif defined(CONFIG_COLDFIRE)</div><div class='add'>+#define PGDIR_SHIFT     22</div><div class='ctx'> #else</div><div class='ctx'> #define PGDIR_SHIFT	25</div><div class='ctx'> #endif</div><div class='hunk'>@@ -54,6 +56,10 @@</div><div class='ctx'> #define PTRS_PER_PTE   16</div><div class='ctx'> #define PTRS_PER_PMD   1</div><div class='ctx'> #define PTRS_PER_PGD   2048</div><div class='add'>+#elif defined(CONFIG_COLDFIRE)</div><div class='add'>+#define PTRS_PER_PTE	512</div><div class='add'>+#define PTRS_PER_PMD	1</div><div class='add'>+#define PTRS_PER_PGD	1024</div><div class='ctx'> #else</div><div class='ctx'> #define PTRS_PER_PTE	1024</div><div class='ctx'> #define PTRS_PER_PMD	8</div><div class='hunk'>@@ -66,12 +72,22 @@</div><div class='ctx'> #ifdef CONFIG_SUN3</div><div class='ctx'> #define KMAP_START     0x0DC00000</div><div class='ctx'> #define KMAP_END       0x0E000000</div><div class='add'>+#elif defined(CONFIG_COLDFIRE)</div><div class='add'>+#define KMAP_START	0xe0000000</div><div class='add'>+#define KMAP_END	0xf0000000</div><div class='ctx'> #else</div><div class='ctx'> #define	KMAP_START	0xd0000000</div><div class='ctx'> #define	KMAP_END	0xf0000000</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_SUN3</div><div class='add'>+#ifdef CONFIG_SUN3</div><div class='add'>+extern unsigned long m68k_vmalloc_end;</div><div class='add'>+#define VMALLOC_START 0x0f800000</div><div class='add'>+#define VMALLOC_END m68k_vmalloc_end</div><div class='add'>+#elif defined(CONFIG_COLDFIRE)</div><div class='add'>+#define VMALLOC_START	0xd0000000</div><div class='add'>+#define VMALLOC_END	0xe0000000</div><div class='add'>+#else</div><div class='ctx'> /* Just any arbitrary offset to the start of the vmalloc VM area: the</div><div class='ctx'>  * current 8MB value just means that there will be a 8MB "hole" after the</div><div class='ctx'>  * physical memory until the kernel virtual memory starts.  That means that</div><div class='hunk'>@@ -82,11 +98,7 @@</div><div class='ctx'> #define VMALLOC_OFFSET	(8*1024*1024)</div><div class='ctx'> #define VMALLOC_START (((unsigned long) high_memory + VMALLOC_OFFSET) &amp; ~(VMALLOC_OFFSET-1))</div><div class='ctx'> #define VMALLOC_END KMAP_START</div><div class='del'>-#else</div><div class='del'>-extern unsigned long m68k_vmalloc_end;</div><div class='del'>-#define VMALLOC_START 0x0f800000</div><div class='del'>-#define VMALLOC_END m68k_vmalloc_end</div><div class='del'>-#endif /* CONFIG_SUN3 */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* zero page used for uninitialized stuff */</div><div class='ctx'> extern void *empty_zero_page;</div><div class='hunk'>@@ -130,6 +142,8 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SUN3</div><div class='ctx'> #include &lt;asm/sun3_pgtable.h&gt;</div><div class='add'>+#elif defined(CONFIG_COLDFIRE)</div><div class='add'>+#include &lt;asm/mcf_pgtable.h&gt;</div><div class='ctx'> #else</div><div class='ctx'> #include &lt;asm/motorola_pgtable.h&gt;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -138,6 +152,9 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,</div><div class='ctx'> /*</div><div class='ctx'>  * Macro to mark a page protection value as "uncacheable".</div><div class='ctx'>  */</div><div class='add'>+#ifdef CONFIG_COLDFIRE</div><div class='add'>+# define pgprot_noncached(prot) (__pgprot(pgprot_val(prot) | CF_PAGE_NOCACHE))</div><div class='add'>+#else</div><div class='ctx'> #ifdef SUN3_PAGE_NOCACHE</div><div class='ctx'> # define __SUN3_PAGE_NOCACHE	SUN3_PAGE_NOCACHE</div><div class='ctx'> #else</div><div class='hunk'>@@ -152,6 +169,7 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,</div><div class='ctx'> 	    ? (__pgprot((pgprot_val(prot) &amp; _CACHEMASK040) | _PAGE_NOCACHE_S))	\</div><div class='ctx'> 	    : (prot)))</div><div class='ctx'> </div><div class='add'>+#endif /* CONFIG_COLDFIRE */</div><div class='ctx'> #include &lt;asm-generic/pgtable.h&gt;</div><div class='ctx'> #endif /* !__ASSEMBLY__ */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h<br/>index 568facf30276..46460fa15d5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/processor.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/processor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/processor.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/processor.h</a></div><div class='hunk'>@@ -48,10 +48,12 @@ static inline void wrusp(unsigned long usp)</div><div class='ctx'>  * so don't change it unless you know what you are doing.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-#ifndef CONFIG_SUN3</div><div class='del'>-#define TASK_SIZE	(0xF0000000UL)</div><div class='del'>-#else</div><div class='add'>+#if defined(CONFIG_COLDFIRE)</div><div class='add'>+#define TASK_SIZE	(0xC0000000UL)</div><div class='add'>+#elif defined(CONFIG_SUN3)</div><div class='ctx'> #define TASK_SIZE	(0x0E000000UL)</div><div class='add'>+#else</div><div class='add'>+#define TASK_SIZE	(0xF0000000UL)</div><div class='ctx'> #endif</div><div class='ctx'> #else</div><div class='ctx'> #define TASK_SIZE	(0xFFFFFFFFUL)</div><div class='hunk'>@@ -66,10 +68,12 @@ static inline void wrusp(unsigned long usp)</div><div class='ctx'>  * space during mmap's.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-#ifndef CONFIG_SUN3</div><div class='del'>-#define TASK_UNMAPPED_BASE	0xC0000000UL</div><div class='del'>-#else</div><div class='add'>+#if defined(CONFIG_COLDFIRE)</div><div class='add'>+#define TASK_UNMAPPED_BASE	0x60000000UL</div><div class='add'>+#elif defined(CONFIG_SUN3)</div><div class='ctx'> #define TASK_UNMAPPED_BASE	0x0A000000UL</div><div class='add'>+#else</div><div class='add'>+#define TASK_UNMAPPED_BASE	0xC0000000UL</div><div class='ctx'> #endif</div><div class='ctx'> #define TASK_UNMAPPED_ALIGN(addr, off)	PAGE_ALIGN(addr)</div><div class='ctx'> #else</div><div class='hunk'>@@ -88,14 +92,12 @@ struct thread_struct {</div><div class='ctx'> 	unsigned long  fp[8*3];</div><div class='ctx'> 	unsigned long  fpcntl[3];	/* fp control regs */</div><div class='ctx'> 	unsigned char  fpstate[FPSTATESIZE];  /* floating point state */</div><div class='del'>-	struct thread_info info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define INIT_THREAD  {							\</div><div class='ctx'> 	.ksp	= sizeof(init_stack) + (unsigned long) init_stack,	\</div><div class='ctx'> 	.sr	= PS_S,							\</div><div class='ctx'> 	.fs	= __KERNEL_DS,						\</div><div class='del'>-	.info	= INIT_THREAD_INFO(init_task),				\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='head'>diff --git a/arch/m68k/include/asm/segment.h b/arch/m68k/include/asm/segment.h<br/>index ee959219fdfe..0fa80e97ed2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/segment.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/segment.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/segment.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/segment.h</a></div><div class='hunk'>@@ -22,23 +22,26 @@ typedef struct {</div><div class='ctx'> } mm_segment_t;</div><div class='ctx'> </div><div class='ctx'> #define MAKE_MM_SEG(s)	((mm_segment_t) { (s) })</div><div class='del'>-#define USER_DS		MAKE_MM_SEG(__USER_DS)</div><div class='del'>-#define KERNEL_DS	MAKE_MM_SEG(__KERNEL_DS)</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CPU_HAS_ADDRESS_SPACES</div><div class='ctx'> /*</div><div class='ctx'>  * Get/set the SFC/DFC registers for MOVES instructions</div><div class='ctx'>  */</div><div class='add'>+#define USER_DS		MAKE_MM_SEG(__USER_DS)</div><div class='add'>+#define KERNEL_DS	MAKE_MM_SEG(__KERNEL_DS)</div><div class='ctx'> </div><div class='ctx'> static inline mm_segment_t get_fs(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_MMU</div><div class='ctx'> 	mm_segment_t _v;</div><div class='ctx'> 	__asm__ ("movec %/dfc,%0":"=r" (_v.seg):);</div><div class='del'>-</div><div class='ctx'> 	return _v;</div><div class='del'>-#else</div><div class='del'>-	return USER_DS;</div><div class='del'>-#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void set_fs(mm_segment_t val)</div><div class='add'>+{</div><div class='add'>+	__asm__ __volatile__ ("movec %0,%/sfc\n\t"</div><div class='add'>+			      "movec %0,%/dfc\n\t"</div><div class='add'>+			      : /* no outputs */ : "r" (val.seg) : "memory");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline mm_segment_t get_ds(void)</div><div class='hunk'>@@ -47,14 +50,13 @@ static inline mm_segment_t get_ds(void)</div><div class='ctx'>     return KERNEL_DS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void set_fs(mm_segment_t val)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_MMU</div><div class='del'>-	__asm__ __volatile__ ("movec %0,%/sfc\n\t"</div><div class='del'>-			      "movec %0,%/dfc\n\t"</div><div class='del'>-			      : /* no outputs */ : "r" (val.seg) : "memory");</div><div class='add'>+#else</div><div class='add'>+#define USER_DS		MAKE_MM_SEG(TASK_SIZE)</div><div class='add'>+#define KERNEL_DS	MAKE_MM_SEG(0xFFFFFFFF)</div><div class='add'>+#define get_ds()	(KERNEL_DS)</div><div class='add'>+#define get_fs()	(current_thread_info()-&gt;addr_limit)</div><div class='add'>+#define set_fs(x)	(current_thread_info()-&gt;addr_limit = (x))</div><div class='ctx'> #endif</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> #define segment_eq(a,b)	((a).seg == (b).seg)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/include/asm/serial.h b/arch/m68k/include/asm/serial.h<br/>index 2b90d6e69070..7267536adbcc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/serial.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/serial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/serial.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/serial.h</a></div><div class='hunk'>@@ -25,9 +25,11 @@</div><div class='ctx'> #define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ISA</div><div class='ctx'> #define SERIAL_PORT_DFNS			\</div><div class='ctx'> 	/* UART CLK   PORT IRQ     FLAGS        */			\</div><div class='ctx'> 	{ 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS },	/* ttyS0 */	\</div><div class='ctx'> 	{ 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS },	/* ttyS1 */	\</div><div class='ctx'> 	{ 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS },	/* ttyS2 */	\</div><div class='ctx'> 	{ 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS },	/* ttyS3 */</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/m68k/include/asm/setup.h b/arch/m68k/include/asm/setup.h<br/>index 4dfb3952b375..00c2c5397d37 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/setup.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/setup.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/setup.h</a></div><div class='hunk'>@@ -40,6 +40,7 @@</div><div class='ctx'> #define MACH_HP300    9</div><div class='ctx'> #define MACH_Q40     10</div><div class='ctx'> #define MACH_SUN3X   11</div><div class='add'>+#define MACH_M54XX   12</div><div class='ctx'> </div><div class='ctx'> #define COMMAND_LINE_SIZE 256</div><div class='ctx'> </div><div class='hunk'>@@ -211,23 +212,27 @@ extern unsigned long m68k_machtype;</div><div class='ctx'> #define CPUB_68030     1</div><div class='ctx'> #define CPUB_68040     2</div><div class='ctx'> #define CPUB_68060     3</div><div class='add'>+#define CPUB_COLDFIRE  4</div><div class='ctx'> </div><div class='ctx'> #define CPU_68020      (1&lt;&lt;CPUB_68020)</div><div class='ctx'> #define CPU_68030      (1&lt;&lt;CPUB_68030)</div><div class='ctx'> #define CPU_68040      (1&lt;&lt;CPUB_68040)</div><div class='ctx'> #define CPU_68060      (1&lt;&lt;CPUB_68060)</div><div class='add'>+#define CPU_COLDFIRE   (1&lt;&lt;CPUB_COLDFIRE)</div><div class='ctx'> </div><div class='ctx'> #define FPUB_68881     0</div><div class='ctx'> #define FPUB_68882     1</div><div class='ctx'> #define FPUB_68040     2                       /* Internal FPU */</div><div class='ctx'> #define FPUB_68060     3                       /* Internal FPU */</div><div class='ctx'> #define FPUB_SUNFPA    4                       /* Sun-3 FPA */</div><div class='add'>+#define FPUB_COLDFIRE  5                       /* ColdFire FPU */</div><div class='ctx'> </div><div class='ctx'> #define FPU_68881      (1&lt;&lt;FPUB_68881)</div><div class='ctx'> #define FPU_68882      (1&lt;&lt;FPUB_68882)</div><div class='ctx'> #define FPU_68040      (1&lt;&lt;FPUB_68040)</div><div class='ctx'> #define FPU_68060      (1&lt;&lt;FPUB_68060)</div><div class='ctx'> #define FPU_SUNFPA     (1&lt;&lt;FPUB_SUNFPA)</div><div class='add'>+#define FPU_COLDFIRE   (1&lt;&lt;FPUB_COLDFIRE)</div><div class='ctx'> </div><div class='ctx'> #define MMUB_68851     0</div><div class='ctx'> #define MMUB_68030     1                       /* Internal MMU */</div><div class='hunk'>@@ -235,6 +240,7 @@ extern unsigned long m68k_machtype;</div><div class='ctx'> #define MMUB_68060     3                       /* Internal MMU */</div><div class='ctx'> #define MMUB_APOLLO    4                       /* Custom Apollo */</div><div class='ctx'> #define MMUB_SUN3      5                       /* Custom Sun-3 */</div><div class='add'>+#define MMUB_COLDFIRE  6                       /* Internal MMU */</div><div class='ctx'> </div><div class='ctx'> #define MMU_68851      (1&lt;&lt;MMUB_68851)</div><div class='ctx'> #define MMU_68030      (1&lt;&lt;MMUB_68030)</div><div class='hunk'>@@ -242,6 +248,7 @@ extern unsigned long m68k_machtype;</div><div class='ctx'> #define MMU_68060      (1&lt;&lt;MMUB_68060)</div><div class='ctx'> #define MMU_SUN3       (1&lt;&lt;MMUB_SUN3)</div><div class='ctx'> #define MMU_APOLLO     (1&lt;&lt;MMUB_APOLLO)</div><div class='add'>+#define MMU_COLDFIRE   (1&lt;&lt;MMUB_COLDFIRE)</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='hunk'>@@ -341,6 +348,13 @@ extern int m68k_is040or060;</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if !defined(CONFIG_COLDFIRE)</div><div class='add'>+#  define CPU_IS_COLDFIRE (0)</div><div class='add'>+#else</div><div class='add'>+#  define CPU_IS_COLDFIRE (1)</div><div class='add'>+#  define MMU_IS_COLDFIRE (1)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define CPU_TYPE (m68k_cputype)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_M68KFPU_EMU</div><div class='head'>diff --git a/arch/m68k/include/asm/sigcontext.h b/arch/m68k/include/asm/sigcontext.h<br/>index a29dd74a17cb..523db2a51cf3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/sigcontext.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/sigcontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/sigcontext.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/sigcontext.h</a></div><div class='hunk'>@@ -15,11 +15,7 @@ struct sigcontext {</div><div class='ctx'> 	unsigned long  sc_pc;</div><div class='ctx'> 	unsigned short sc_formatvec;</div><div class='ctx'> #ifndef __uClinux__</div><div class='del'>-# ifdef __mcoldfire__</div><div class='del'>-	unsigned long  sc_fpregs[2][2];	/* room for two fp registers */</div><div class='del'>-# else</div><div class='ctx'> 	unsigned long  sc_fpregs[2*3];  /* room for two fp registers */</div><div class='del'>-# endif</div><div class='ctx'> 	unsigned long  sc_fpcntl[3];</div><div class='ctx'> 	unsigned char  sc_fpstate[216];</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/m68k/include/asm/socket.h b/arch/m68k/include/asm/socket.h<br/>index 9bf49c87d954..d4708ce466e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/socket.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/socket.h</a></div><div class='hunk'>@@ -62,4 +62,7 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_RXQ_OVFL             40</div><div class='ctx'> </div><div class='add'>+#define SO_WIFI_STATUS		41</div><div class='add'>+#define SCM_WIFI_STATUS		SO_WIFI_STATUS</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_SOCKET_H */</div><div class='head'>diff --git a/arch/m68k/include/asm/thread_info.h b/arch/m68k/include/asm/thread_info.h<br/>index 790988967ba7..e8665e6f9464 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/thread_info.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/segment.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * On machines with 4k pages we default to an 8k thread size, though we</div><div class='hunk'>@@ -26,6 +27,7 @@ struct thread_info {</div><div class='ctx'> 	struct task_struct	*task;		/* main task structure */</div><div class='ctx'> 	unsigned long		flags;</div><div class='ctx'> 	struct exec_domain	*exec_domain;	/* execution domain */</div><div class='add'>+	mm_segment_t		addr_limit;	/* thread address space */</div><div class='ctx'> 	int			preempt_count;	/* 0 =&gt; preemptable, &lt;0 =&gt; BUG */</div><div class='ctx'> 	__u32			cpu;		/* should always be 0 on m68k */</div><div class='ctx'> 	unsigned long		tp_value;	/* thread pointer */</div><div class='hunk'>@@ -39,6 +41,7 @@ struct thread_info {</div><div class='ctx'> {						\</div><div class='ctx'> 	.task		= &amp;tsk,			\</div><div class='ctx'> 	.exec_domain	= &amp;default_exec_domain,	\</div><div class='add'>+	.addr_limit	= KERNEL_DS,		\</div><div class='ctx'> 	.preempt_count	= INIT_PREEMPT_COUNT,	\</div><div class='ctx'> 	.restart_block = {			\</div><div class='ctx'> 		.fn = do_no_restart_syscall,	\</div><div class='hunk'>@@ -47,34 +50,6 @@ struct thread_info {</div><div class='ctx'> </div><div class='ctx'> #define init_stack		(init_thread_union.stack)</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MMU</div><div class='del'>-</div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-#include &lt;asm/current.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef ASM_OFFSETS_C</div><div class='del'>-#define task_thread_info(tsk)	((struct thread_info *) NULL)</div><div class='del'>-#else</div><div class='del'>-#include &lt;asm/asm-offsets.h&gt;</div><div class='del'>-#define task_thread_info(tsk)	((struct thread_info *)((char *)tsk+TASK_TINFO))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define init_thread_info	(init_task.thread.info)</div><div class='del'>-#define task_stack_page(tsk)	((tsk)-&gt;stack)</div><div class='del'>-#define current_thread_info()	task_thread_info(current)</div><div class='del'>-</div><div class='del'>-#define __HAVE_THREAD_FUNCTIONS</div><div class='del'>-</div><div class='del'>-#define setup_thread_stack(p, org) ({			\</div><div class='del'>-	*(struct task_struct **)(p)-&gt;stack = (p);	\</div><div class='del'>-	task_thread_info(p)-&gt;task = (p);		\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define end_of_stack(p)		((unsigned long *)(p)-&gt;stack + 1)</div><div class='del'>-</div><div class='del'>-#else /* !CONFIG_MMU */</div><div class='del'>-</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> /* how to get the thread information struct from C */</div><div class='ctx'> static inline struct thread_info *current_thread_info(void)</div><div class='hunk'>@@ -92,8 +67,6 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> </div><div class='ctx'> #define init_thread_info	(init_thread_union.thread_info)</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_MMU */</div><div class='del'>-</div><div class='ctx'> /* entry.S relies on these definitions!</div><div class='ctx'>  * bits 0-7 are tested at every exception exit</div><div class='ctx'>  * bits 8-15 are also tested at syscall exit</div><div class='hunk'>@@ -103,7 +76,6 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define TIF_DELAYED_TRACE	14	/* single step a syscall */</div><div class='ctx'> #define TIF_SYSCALL_TRACE	15	/* syscall trace active */</div><div class='ctx'> #define TIF_MEMDIE		16	/* is terminating due to OOM killer */</div><div class='del'>-#define TIF_FREEZE		17	/* thread is freezing for suspend */</div><div class='ctx'> #define TIF_RESTORE_SIGMASK	18	/* restore signal mask in do_signal */</div><div class='ctx'> </div><div class='ctx'> #endif	/* _ASM_M68K_THREAD_INFO_H */</div><div class='head'>diff --git a/arch/m68k/include/asm/tlbflush.h b/arch/m68k/include/asm/tlbflush.h<br/>index a6b4ed4fc90f..965ea35c9a40 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/tlbflush.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/tlbflush.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/tlbflush.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/tlbflush.h</a></div><div class='hunk'>@@ -5,10 +5,13 @@</div><div class='ctx'> #ifndef CONFIG_SUN3</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/current.h&gt;</div><div class='add'>+#include &lt;asm/mcfmmu.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void flush_tlb_kernel_page(void *addr)</div><div class='ctx'> {</div><div class='del'>-	if (CPU_IS_040_OR_060) {</div><div class='add'>+	if (CPU_IS_COLDFIRE) {</div><div class='add'>+		mmu_write(MMUOR, MMUOR_CNL);</div><div class='add'>+	} else if (CPU_IS_040_OR_060) {</div><div class='ctx'> 		mm_segment_t old_fs = get_fs();</div><div class='ctx'> 		set_fs(KERNEL_DS);</div><div class='ctx'> 		__asm__ __volatile__(".chip 68040\n\t"</div><div class='hunk'>@@ -25,12 +28,15 @@ static inline void flush_tlb_kernel_page(void *addr)</div><div class='ctx'>  */</div><div class='ctx'> static inline void __flush_tlb(void)</div><div class='ctx'> {</div><div class='del'>-	if (CPU_IS_040_OR_060)</div><div class='add'>+	if (CPU_IS_COLDFIRE) {</div><div class='add'>+		mmu_write(MMUOR, MMUOR_CNL);</div><div class='add'>+	} else if (CPU_IS_040_OR_060) {</div><div class='ctx'> 		__asm__ __volatile__(".chip 68040\n\t"</div><div class='ctx'> 				     "pflushan\n\t"</div><div class='ctx'> 				     ".chip 68k");</div><div class='del'>-	else if (CPU_IS_020_OR_030)</div><div class='add'>+	} else if (CPU_IS_020_OR_030) {</div><div class='ctx'> 		__asm__ __volatile__("pflush #0,#4");</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void __flush_tlb040_one(unsigned long addr)</div><div class='hunk'>@@ -43,7 +49,9 @@ static inline void __flush_tlb040_one(unsigned long addr)</div><div class='ctx'> </div><div class='ctx'> static inline void __flush_tlb_one(unsigned long addr)</div><div class='ctx'> {</div><div class='del'>-	if (CPU_IS_040_OR_060)</div><div class='add'>+	if (CPU_IS_COLDFIRE)</div><div class='add'>+		mmu_write(MMUOR, MMUOR_CNL);</div><div class='add'>+	else if (CPU_IS_040_OR_060)</div><div class='ctx'> 		__flush_tlb040_one(addr);</div><div class='ctx'> 	else if (CPU_IS_020_OR_030)</div><div class='ctx'> 		__asm__ __volatile__("pflush #0,#4,(%0)" : : "a" (addr));</div><div class='hunk'>@@ -56,12 +64,15 @@ static inline void __flush_tlb_one(unsigned long addr)</div><div class='ctx'>  */</div><div class='ctx'> static inline void flush_tlb_all(void)</div><div class='ctx'> {</div><div class='del'>-	if (CPU_IS_040_OR_060)</div><div class='add'>+	if (CPU_IS_COLDFIRE) {</div><div class='add'>+		mmu_write(MMUOR, MMUOR_CNL);</div><div class='add'>+	} else if (CPU_IS_040_OR_060) {</div><div class='ctx'> 		__asm__ __volatile__(".chip 68040\n\t"</div><div class='ctx'> 				     "pflusha\n\t"</div><div class='ctx'> 				     ".chip 68k");</div><div class='del'>-	else if (CPU_IS_020_OR_030)</div><div class='add'>+	} else if (CPU_IS_020_OR_030) {</div><div class='ctx'> 		__asm__ __volatile__("pflusha");</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void flush_tlb_mm(struct mm_struct *mm)</div><div class='head'>diff --git a/arch/m68k/include/asm/traps.h b/arch/m68k/include/asm/traps.h<br/>index 151068f64f44..4aff3358fbaf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/traps.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/traps.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/traps.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/traps.h</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> typedef void (*e_vector)(void);</div><div class='ctx'> extern e_vector vectors[];</div><div class='add'>+extern e_vector *_ramvec;</div><div class='ctx'> </div><div class='ctx'> asmlinkage void auto_inthandler(void);</div><div class='ctx'> asmlinkage void user_inthandler(void);</div><div class='head'>diff --git a/arch/m68k/include/asm/types.h b/arch/m68k/include/asm/types.h<br/>index b17fd115a4e7..89705adcbd52 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/types.h</a></div><div class='hunk'>@@ -10,12 +10,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm-generic/int-ll64.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-</div><div class='del'>-typedef unsigned short umode_t;</div><div class='del'>-</div><div class='del'>-#endif /* __ASSEMBLY__ */</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * These aren't exported outside the kernel to avoid name space clashes</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/m68k/include/asm/uaccess_mm.h b/arch/m68k/include/asm/uaccess_mm.h<br/>index 7107f3fbdbb6..9c80cd515b20 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/uaccess_mm.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/uaccess_mm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/uaccess_mm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/uaccess_mm.h</a></div><div class='hunk'>@@ -21,6 +21,22 @@ static inline int access_ok(int type, const void __user *addr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Not all varients of the 68k family support the notion of address spaces.</div><div class='add'>+ * The traditional 680x0 parts do, and they use the sfc/dfc registers and</div><div class='add'>+ * the "moves" instruction to access user space from kernel space. Other</div><div class='add'>+ * family members like ColdFire don't support this, and only have a single</div><div class='add'>+ * address space, and use the usual "move" instruction for user space access.</div><div class='add'>+ *</div><div class='add'>+ * Outside of this difference the user space access functions are the same.</div><div class='add'>+ * So lets keep the code simple and just define in what we need to use.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_CPU_HAS_ADDRESS_SPACES</div><div class='add'>+#define	MOVES	"moves"</div><div class='add'>+#else</div><div class='add'>+#define	MOVES	"move"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * The exception table consists of pairs of addresses: the first is the</div><div class='ctx'>  * address of an instruction that is allowed to fault, and the second is</div><div class='ctx'>  * the address at which the program should continue.  No registers are</div><div class='hunk'>@@ -43,7 +59,7 @@ extern int __get_user_bad(void);</div><div class='ctx'> </div><div class='ctx'> #define __put_user_asm(res, x, ptr, bwl, reg, err)	\</div><div class='ctx'> asm volatile ("\n"					\</div><div class='del'>-	"1:	moves."#bwl"	%2,%1\n"		\</div><div class='add'>+	"1:	"MOVES"."#bwl"	%2,%1\n"		\</div><div class='ctx'> 	"2:\n"						\</div><div class='ctx'> 	"	.section .fixup,\"ax\"\n"		\</div><div class='ctx'> 	"	.even\n"				\</div><div class='hunk'>@@ -83,8 +99,8 @@ asm volatile ("\n"					\</div><div class='ctx'>  	    {								\</div><div class='ctx'>  		const void __user *__pu_ptr = (ptr);			\</div><div class='ctx'> 		asm volatile ("\n"					\</div><div class='del'>-			"1:	moves.l	%2,(%1)+\n"			\</div><div class='del'>-			"2:	moves.l	%R2,(%1)\n"			\</div><div class='add'>+			"1:	"MOVES".l	%2,(%1)+\n"		\</div><div class='add'>+			"2:	"MOVES".l	%R2,(%1)\n"		\</div><div class='ctx'> 			"3:\n"						\</div><div class='ctx'> 			"	.section .fixup,\"ax\"\n"		\</div><div class='ctx'> 			"	.even\n"				\</div><div class='hunk'>@@ -115,12 +131,12 @@ asm volatile ("\n"					\</div><div class='ctx'> #define __get_user_asm(res, x, ptr, type, bwl, reg, err) ({	\</div><div class='ctx'> 	type __gu_val;						\</div><div class='ctx'> 	asm volatile ("\n"					\</div><div class='del'>-		"1:	moves."#bwl"	%2,%1\n"		\</div><div class='add'>+		"1:	"MOVES"."#bwl"	%2,%1\n"		\</div><div class='ctx'> 		"2:\n"						\</div><div class='ctx'> 		"	.section .fixup,\"ax\"\n"		\</div><div class='ctx'> 		"	.even\n"				\</div><div class='ctx'> 		"10:	move.l	%3,%0\n"			\</div><div class='del'>-		"	sub."#bwl"	%1,%1\n"		\</div><div class='add'>+		"	sub.l	%1,%1\n"			\</div><div class='ctx'> 		"	jra	2b\n"				\</div><div class='ctx'> 		"	.previous\n"				\</div><div class='ctx'> 		"\n"						\</div><div class='hunk'>@@ -152,8 +168,8 @@ asm volatile ("\n"					\</div><div class='ctx'>  		const void *__gu_ptr = (ptr);				\</div><div class='ctx'>  		u64 __gu_val;						\</div><div class='ctx'> 		asm volatile ("\n"					\</div><div class='del'>-			"1:	moves.l	(%2)+,%1\n"			\</div><div class='del'>-			"2:	moves.l	(%2),%R1\n"			\</div><div class='add'>+			"1:	"MOVES".l	(%2)+,%1\n"		\</div><div class='add'>+			"2:	"MOVES".l	(%2),%R1\n"		\</div><div class='ctx'> 			"3:\n"						\</div><div class='ctx'> 			"	.section .fixup,\"ax\"\n"		\</div><div class='ctx'> 			"	.even\n"				\</div><div class='hunk'>@@ -188,12 +204,12 @@ unsigned long __generic_copy_to_user(void __user *to, const void *from, unsigned</div><div class='ctx'> </div><div class='ctx'> #define __constant_copy_from_user_asm(res, to, from, tmp, n, s1, s2, s3)\</div><div class='ctx'> 	asm volatile ("\n"						\</div><div class='del'>-		"1:	moves."#s1"	(%2)+,%3\n"			\</div><div class='add'>+		"1:	"MOVES"."#s1"	(%2)+,%3\n"			\</div><div class='ctx'> 		"	move."#s1"	%3,(%1)+\n"			\</div><div class='del'>-		"2:	moves."#s2"	(%2)+,%3\n"			\</div><div class='add'>+		"2:	"MOVES"."#s2"	(%2)+,%3\n"			\</div><div class='ctx'> 		"	move."#s2"	%3,(%1)+\n"			\</div><div class='ctx'> 		"	.ifnc	\""#s3"\",\"\"\n"			\</div><div class='del'>-		"3:	moves."#s3"	(%2)+,%3\n"			\</div><div class='add'>+		"3:	"MOVES"."#s3"	(%2)+,%3\n"			\</div><div class='ctx'> 		"	move."#s3"	%3,(%1)+\n"			\</div><div class='ctx'> 		"	.endif\n"					\</div><div class='ctx'> 		"4:\n"							\</div><div class='hunk'>@@ -269,13 +285,13 @@ __constant_copy_from_user(void *to, const void __user *from, unsigned long n)</div><div class='ctx'> #define __constant_copy_to_user_asm(res, to, from, tmp, n, s1, s2, s3)	\</div><div class='ctx'> 	asm volatile ("\n"						\</div><div class='ctx'> 		"	move."#s1"	(%2)+,%3\n"			\</div><div class='del'>-		"11:	moves."#s1"	%3,(%1)+\n"			\</div><div class='add'>+		"11:	"MOVES"."#s1"	%3,(%1)+\n"			\</div><div class='ctx'> 		"12:	move."#s2"	(%2)+,%3\n"			\</div><div class='del'>-		"21:	moves."#s2"	%3,(%1)+\n"			\</div><div class='add'>+		"21:	"MOVES"."#s2"	%3,(%1)+\n"			\</div><div class='ctx'> 		"22:\n"							\</div><div class='ctx'> 		"	.ifnc	\""#s3"\",\"\"\n"			\</div><div class='ctx'> 		"	move."#s3"	(%2)+,%3\n"			\</div><div class='del'>-		"31:	moves."#s3"	%3,(%1)+\n"			\</div><div class='add'>+		"31:	"MOVES"."#s3"	%3,(%1)+\n"			\</div><div class='ctx'> 		"32:\n"							\</div><div class='ctx'> 		"	.endif\n"					\</div><div class='ctx'> 		"4:\n"							\</div><div class='head'>diff --git a/arch/m68k/include/asm/ucontext.h b/arch/m68k/include/asm/ucontext.h<br/>index 00dcc5176c57..e4e22669edc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/ucontext.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/ucontext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/ucontext.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/ucontext.h</a></div><div class='hunk'>@@ -7,11 +7,7 @@ typedef greg_t gregset_t[NGREG];</div><div class='ctx'> </div><div class='ctx'> typedef struct fpregset {</div><div class='ctx'> 	int f_fpcntl[3];</div><div class='del'>-#ifdef __mcoldfire__</div><div class='del'>-	int f_fpregs[8][2];</div><div class='del'>-#else</div><div class='ctx'> 	int f_fpregs[8*3];</div><div class='del'>-#endif</div><div class='ctx'> } fpregset_t;</div><div class='ctx'> </div><div class='ctx'> struct mcontext {</div><div class='head'>diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h<br/>index 303192fc9260..ea0b502f845e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/unistd.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/include/asm/unistd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/include/asm/unistd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/include/asm/unistd.h</a></div><div class='hunk'>@@ -132,10 +132,10 @@</div><div class='ctx'> #define __NR_adjtimex		124</div><div class='ctx'> #define __NR_mprotect		125</div><div class='ctx'> #define __NR_sigprocmask	126</div><div class='del'>-/*#define __NR_create_module	127*/</div><div class='add'>+#define __NR_create_module	127</div><div class='ctx'> #define __NR_init_module	128</div><div class='ctx'> #define __NR_delete_module	129</div><div class='del'>-/*#define __NR_get_kernel_syms	130*/</div><div class='add'>+#define __NR_get_kernel_syms	130</div><div class='ctx'> #define __NR_quotactl		131</div><div class='ctx'> #define __NR_getpgid		132</div><div class='ctx'> #define __NR_fchdir		133</div><div class='hunk'>@@ -172,7 +172,7 @@</div><div class='ctx'> #define __NR_setresuid		164</div><div class='ctx'> #define __NR_getresuid		165</div><div class='ctx'> #define __NR_getpagesize	166</div><div class='del'>-/*#define __NR_query_module	167*/</div><div class='add'>+#define __NR_query_module	167</div><div class='ctx'> #define __NR_poll		168</div><div class='ctx'> #define __NR_nfsservctl		169</div><div class='ctx'> #define __NR_setresgid		170</div><div class='hunk'>@@ -193,8 +193,8 @@</div><div class='ctx'> #define __NR_capset		185</div><div class='ctx'> #define __NR_sigaltstack	186</div><div class='ctx'> #define __NR_sendfile		187</div><div class='del'>-/*#define __NR_getpmsg		188*/	/* some people actually want streams */</div><div class='del'>-/*#define __NR_putpmsg		189*/	/* some people actually want streams */</div><div class='add'>+#define __NR_getpmsg		188	/* some people actually want streams */</div><div class='add'>+#define __NR_putpmsg		189	/* some people actually want streams */</div><div class='ctx'> #define __NR_vfork		190</div><div class='ctx'> #define __NR_ugetrlimit		191</div><div class='ctx'> #define __NR_mmap2		192</div><div class='head'>diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile<br/>index c5696193281a..40d29a788b05 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/Makefile</a></div><div class='hunk'>@@ -2,19 +2,24 @@</div><div class='ctx'> # Makefile for the linux kernel.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-extra-$(CONFIG_MMU)	:= head.o</div><div class='add'>+extra-$(CONFIG_AMIGA)	:= head.o</div><div class='add'>+extra-$(CONFIG_ATARI)	:= head.o</div><div class='add'>+extra-$(CONFIG_MAC)	:= head.o</div><div class='add'>+extra-$(CONFIG_APOLLO)	:= head.o</div><div class='add'>+extra-$(CONFIG_VME)	:= head.o</div><div class='add'>+extra-$(CONFIG_HP300)	:= head.o</div><div class='add'>+extra-$(CONFIG_Q40)	:= head.o</div><div class='add'>+extra-$(CONFIG_SUN3X)	:= head.o</div><div class='ctx'> extra-$(CONFIG_SUN3)	:= sun3-head.o</div><div class='ctx'> extra-y			+= vmlinux.lds</div><div class='ctx'> </div><div class='del'>-obj-y	:= entry.o irq.o m68k_ksyms.o module.o process.o ptrace.o setup.o \</div><div class='del'>-	   signal.o sys_m68k.o syscalltable.o time.o traps.o</div><div class='add'>+obj-y	:= entry.o init_task.o irq.o m68k_ksyms.o module.o process.o ptrace.o</div><div class='add'>+obj-y	+= setup.o signal.o sys_m68k.o syscalltable.o time.o traps.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_MMU)	+= ints.o vectors.o</div><div class='add'>+obj-$(CONFIG_MMU_MOTOROLA) += ints.o vectors.o</div><div class='add'>+obj-$(CONFIG_MMU_SUN3) += ints.o vectors.o</div><div class='ctx'> </div><div class='ctx'> ifndef CONFIG_MMU_SUN3</div><div class='del'>-obj-y			+= dma.o</div><div class='del'>-endif</div><div class='del'>-ifndef CONFIG_MMU</div><div class='del'>-obj-y			+= init_task.o</div><div class='add'>+obj-y	+= dma.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/kernel/asm-offsets.c b/arch/m68k/kernel/asm-offsets.c<br/>index 983fed9d469b..a972b00cd77d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/asm-offsets.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/asm-offsets.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -24,8 +24,7 @@ int main(void)</div><div class='ctx'> 	/* offsets into the task struct */</div><div class='ctx'> 	DEFINE(TASK_THREAD, offsetof(struct task_struct, thread));</div><div class='ctx'> 	DEFINE(TASK_MM, offsetof(struct task_struct, mm));</div><div class='del'>-	DEFINE(TASK_INFO, offsetof(struct task_struct, thread.info));</div><div class='del'>-	DEFINE(TASK_TINFO, offsetof(struct task_struct, thread.info));</div><div class='add'>+	DEFINE(TASK_STACK, offsetof(struct task_struct, stack));</div><div class='ctx'> </div><div class='ctx'> 	/* offsets into the thread struct */</div><div class='ctx'> 	DEFINE(THREAD_KSP, offsetof(struct thread_struct, ksp));</div><div class='head'>diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S<br/>index 081cf96f243b..b8daf64e347d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/entry.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/entry.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/entry.S</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-#ifdef CONFIG_MMU</div><div class='add'>+#if defined(CONFIG_MMU) &amp;&amp; !defined(CONFIG_COLDFIRE)</div><div class='ctx'> #include "entry_mm.S"</div><div class='ctx'> #else</div><div class='ctx'> #include "entry_no.S"</div><div class='head'>diff --git a/arch/m68k/kernel/entry_mm.S b/arch/m68k/kernel/entry_mm.S<br/>index c713f514843d..675a854966a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/entry_mm.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/entry_mm.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/entry_mm.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/entry_mm.S</a></div><div class='hunk'>@@ -99,7 +99,8 @@ do_trace_exit:</div><div class='ctx'> 	jra	.Lret_from_exception</div><div class='ctx'> </div><div class='ctx'> ENTRY(ret_from_signal)</div><div class='del'>-	tstb	%curptr@(TASK_INFO+TINFO_FLAGS+2)</div><div class='add'>+	movel	%curptr@(TASK_STACK),%a1</div><div class='add'>+	tstb	%a1@(TINFO_FLAGS+2)</div><div class='ctx'> 	jge	1f</div><div class='ctx'> 	jbsr	syscall_trace</div><div class='ctx'> 1:	RESTORE_SWITCH_STACK</div><div class='hunk'>@@ -120,11 +121,13 @@ ENTRY(system_call)</div><div class='ctx'> 	SAVE_ALL_SYS</div><div class='ctx'> </div><div class='ctx'> 	GET_CURRENT(%d1)</div><div class='add'>+	movel	%d1,%a1</div><div class='add'>+</div><div class='ctx'> 	| save top of frame</div><div class='ctx'> 	movel	%sp,%curptr@(TASK_THREAD+THREAD_ESP0)</div><div class='ctx'> </div><div class='ctx'> 	| syscall trace?</div><div class='del'>-	tstb	%curptr@(TASK_INFO+TINFO_FLAGS+2)</div><div class='add'>+	tstb	%a1@(TINFO_FLAGS+2)</div><div class='ctx'> 	jmi	do_trace_entry</div><div class='ctx'> 	cmpl	#NR_syscalls,%d0</div><div class='ctx'> 	jcc	badsys</div><div class='hunk'>@@ -133,7 +136,8 @@ syscall:</div><div class='ctx'> 	movel	%d0,%sp@(PT_OFF_D0)	| save the return value</div><div class='ctx'> ret_from_syscall:</div><div class='ctx'> 	|oriw	#0x0700,%sr</div><div class='del'>-	movew	%curptr@(TASK_INFO+TINFO_FLAGS+2),%d0</div><div class='add'>+	movel	%curptr@(TASK_STACK),%a1</div><div class='add'>+	movew	%a1@(TINFO_FLAGS+2),%d0</div><div class='ctx'> 	jne	syscall_exit_work</div><div class='ctx'> 1:	RESTORE_ALL</div><div class='ctx'> </div><div class='hunk'>@@ -159,7 +163,8 @@ ENTRY(ret_from_exception)</div><div class='ctx'> 	andw	#ALLOWINT,%sr</div><div class='ctx'> </div><div class='ctx'> resume_userspace:</div><div class='del'>-	moveb	%curptr@(TASK_INFO+TINFO_FLAGS+3),%d0</div><div class='add'>+	movel	%curptr@(TASK_STACK),%a1</div><div class='add'>+	moveb	%a1@(TINFO_FLAGS+3),%d0</div><div class='ctx'> 	jne	exit_work</div><div class='ctx'> 1:	RESTORE_ALL</div><div class='ctx'> </div><div class='hunk'>@@ -199,7 +204,8 @@ do_delayed_trace:</div><div class='ctx'> ENTRY(auto_inthandler)</div><div class='ctx'> 	SAVE_ALL_INT</div><div class='ctx'> 	GET_CURRENT(%d0)</div><div class='del'>-	addqb	#1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)</div><div class='add'>+	movel	%d0,%a1</div><div class='add'>+	addqb	#1,%a1@(TINFO_PREEMPT+1)</div><div class='ctx'> 					|  put exception # in d0</div><div class='ctx'> 	bfextu	%sp@(PT_OFF_FORMATVEC){#4,#10},%d0</div><div class='ctx'> 	subw	#VEC_SPUR,%d0</div><div class='hunk'>@@ -211,7 +217,8 @@ auto_irqhandler_fixup = . + 2</div><div class='ctx'> 	addql	#8,%sp			|  pop parameters off stack</div><div class='ctx'> </div><div class='ctx'> ret_from_interrupt:</div><div class='del'>-	subqb	#1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)</div><div class='add'>+	movel	%curptr@(TASK_STACK),%a1</div><div class='add'>+	subqb	#1,%a1@(TINFO_PREEMPT+1)</div><div class='ctx'> 	jeq	ret_from_last_interrupt</div><div class='ctx'> 2:	RESTORE_ALL</div><div class='ctx'> </div><div class='hunk'>@@ -232,7 +239,8 @@ ret_from_last_interrupt:</div><div class='ctx'> ENTRY(user_inthandler)</div><div class='ctx'> 	SAVE_ALL_INT</div><div class='ctx'> 	GET_CURRENT(%d0)</div><div class='del'>-	addqb	#1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)</div><div class='add'>+	movel	%d0,%a1</div><div class='add'>+	addqb	#1,%a1@(TINFO_PREEMPT+1)</div><div class='ctx'> 					|  put exception # in d0</div><div class='ctx'> 	bfextu	%sp@(PT_OFF_FORMATVEC){#4,#10},%d0</div><div class='ctx'> user_irqvec_fixup = . + 2</div><div class='hunk'>@@ -243,7 +251,8 @@ user_irqvec_fixup = . + 2</div><div class='ctx'> 	jsr	do_IRQ			|  process the IRQ</div><div class='ctx'> 	addql	#8,%sp			|  pop parameters off stack</div><div class='ctx'> </div><div class='del'>-	subqb	#1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)</div><div class='add'>+	movel	%curptr@(TASK_STACK),%a1</div><div class='add'>+	subqb	#1,%a1@(TINFO_PREEMPT+1)</div><div class='ctx'> 	jeq	ret_from_last_interrupt</div><div class='ctx'> 	RESTORE_ALL</div><div class='ctx'> </div><div class='hunk'>@@ -252,13 +261,15 @@ user_irqvec_fixup = . + 2</div><div class='ctx'> ENTRY(bad_inthandler)</div><div class='ctx'> 	SAVE_ALL_INT</div><div class='ctx'> 	GET_CURRENT(%d0)</div><div class='del'>-	addqb	#1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)</div><div class='add'>+	movel	%d0,%a1</div><div class='add'>+	addqb	#1,%a1@(TINFO_PREEMPT+1)</div><div class='ctx'> </div><div class='ctx'> 	movel	%sp,%sp@-</div><div class='ctx'> 	jsr	handle_badint</div><div class='ctx'> 	addql	#4,%sp</div><div class='ctx'> </div><div class='del'>-	subqb	#1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)</div><div class='add'>+	movel	%curptr@(TASK_STACK),%a1</div><div class='add'>+	subqb	#1,%a1@(TINFO_PREEMPT+1)</div><div class='ctx'> 	jeq	ret_from_last_interrupt</div><div class='ctx'> 	RESTORE_ALL</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/kernel/entry_no.S b/arch/m68k/kernel/entry_no.S<br/>index 1b4289061a64..d80cba45589f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/entry_no.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/entry_no.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/entry_no.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/entry_no.S</a></div><div class='hunk'>@@ -44,8 +44,7 @@</div><div class='ctx'> </div><div class='ctx'> ENTRY(buserr)</div><div class='ctx'> 	SAVE_ALL_INT</div><div class='del'>-	moveq	#-1,%d0</div><div class='del'>-	movel	%d0,%sp@(PT_OFF_ORIG_D0)</div><div class='add'>+	GET_CURRENT(%d0)</div><div class='ctx'> 	movel	%sp,%sp@- 		/* stack frame pointer argument */</div><div class='ctx'> 	jsr	buserr_c</div><div class='ctx'> 	addql	#4,%sp</div><div class='hunk'>@@ -53,8 +52,7 @@ ENTRY(buserr)</div><div class='ctx'> </div><div class='ctx'> ENTRY(trap)</div><div class='ctx'> 	SAVE_ALL_INT</div><div class='del'>-	moveq	#-1,%d0</div><div class='del'>-	movel	%d0,%sp@(PT_OFF_ORIG_D0)</div><div class='add'>+	GET_CURRENT(%d0)</div><div class='ctx'> 	movel	%sp,%sp@- 		/* stack frame pointer argument */</div><div class='ctx'> 	jsr	trap_c</div><div class='ctx'> 	addql	#4,%sp</div><div class='hunk'>@@ -65,8 +63,7 @@ ENTRY(trap)</div><div class='ctx'> .globl dbginterrupt</div><div class='ctx'> ENTRY(dbginterrupt)</div><div class='ctx'> 	SAVE_ALL_INT</div><div class='del'>-	moveq	#-1,%d0</div><div class='del'>-	movel	%d0,%sp@(PT_OFF_ORIG_D0)</div><div class='add'>+	GET_CURRENT(%d0)</div><div class='ctx'> 	movel	%sp,%sp@- 		/* stack frame pointer argument */</div><div class='ctx'> 	jsr	dbginterrupt_c</div><div class='ctx'> 	addql	#4,%sp</div><div class='head'>diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S<br/>index 27622b3273c1..d197e7ff62c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/head.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/head.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/head.S</a></div><div class='hunk'>@@ -250,9 +250,8 @@</div><div class='ctx'>  * USE_MFP:	Use the ST-MFP port (Modem1) for serial debug.</div><div class='ctx'>  *</div><div class='ctx'>  * Macintosh constants:</div><div class='del'>- * MAC_SERIAL_DEBUG:	Turns on serial debug output for the Macintosh.</div><div class='del'>- * MAC_USE_SCC_A:	Use the SCC port A (modem) for serial debug.</div><div class='del'>- * MAC_USE_SCC_B:	Use the SCC port B (printer) for serial debug (default).</div><div class='add'>+ * MAC_USE_SCC_A: Use SCC port A (modem) for serial debug and early console.</div><div class='add'>+ * MAC_USE_SCC_B: Use SCC port B (printer) for serial debug and early console.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='hunk'>@@ -268,33 +267,25 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/machw.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Macintosh console support</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_FRAMEBUFFER_CONSOLE</div><div class='ctx'> #define CONSOLE</div><div class='ctx'> #define CONSOLE_PENGUIN</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Macintosh serial debug support; outputs boot info to the printer</div><div class='del'>- *   and/or modem serial ports</div><div class='del'>- */</div><div class='del'>-#undef MAC_SERIAL_DEBUG</div><div class='add'>+#ifdef CONFIG_EARLY_PRINTK</div><div class='add'>+#define SERIAL_DEBUG</div><div class='add'>+#else</div><div class='add'>+#undef SERIAL_DEBUG</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Macintosh serial debug port selection; define one or both;</div><div class='del'>- *   requires MAC_SERIAL_DEBUG to be defined</div><div class='del'>- */</div><div class='del'>-#define MAC_USE_SCC_A		/* Macintosh modem serial port */</div><div class='del'>-#define MAC_USE_SCC_B		/* Macintosh printer serial port */</div><div class='add'>+#else /* !CONFIG_MAC */</div><div class='ctx'> </div><div class='del'>-#endif	/* CONFIG_MAC */</div><div class='add'>+#define SERIAL_DEBUG</div><div class='add'>+</div><div class='add'>+#endif /* !CONFIG_MAC */</div><div class='ctx'> </div><div class='ctx'> #undef MMU_PRINT</div><div class='ctx'> #undef MMU_NOCACHE_KERNEL</div><div class='del'>-#define SERIAL_DEBUG</div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -655,11 +646,11 @@ ENTRY(__start)</div><div class='ctx'> 	lea	%pc@(L(mac_rowbytes)),%a1</div><div class='ctx'> 	movel	%a0@,%a1@</div><div class='ctx'> </div><div class='del'>-#ifdef MAC_SERIAL_DEBUG</div><div class='add'>+#ifdef SERIAL_DEBUG</div><div class='ctx'> 	get_bi_record	BI_MAC_SCCBASE</div><div class='ctx'> 	lea	%pc@(L(mac_sccbase)),%a1</div><div class='ctx'> 	movel	%a0@,%a1@</div><div class='del'>-#endif /* MAC_SERIAL_DEBUG */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1427,7 +1418,7 @@ L(mmu_fixup_done):</div><div class='ctx'> 	subl	%d0,L(console_font)</div><div class='ctx'> 	subl	%d0,L(console_font_data)</div><div class='ctx'> #endif</div><div class='del'>-#ifdef MAC_SERIAL_DEBUG</div><div class='add'>+#ifdef SERIAL_DEBUG</div><div class='ctx'> 	orl	#0x50000000,L(mac_sccbase)</div><div class='ctx'> #endif</div><div class='ctx'> 1:</div><div class='hunk'>@@ -1917,7 +1908,7 @@ mmu_030_print:</div><div class='ctx'> 	jbne	30b</div><div class='ctx'> </div><div class='ctx'> mmu_print_done:</div><div class='del'>-	puts	"\n\n"</div><div class='add'>+	puts	"\n"</div><div class='ctx'> </div><div class='ctx'> func_return	mmu_print</div><div class='ctx'> </div><div class='hunk'>@@ -2768,7 +2759,7 @@ L(scc_initable_mac):</div><div class='ctx'> 	.byte	9,0		/* no interrupts */</div><div class='ctx'> 	.byte	10,0		/* NRZ */</div><div class='ctx'> 	.byte	11,0x50		/* use baud rate generator */</div><div class='del'>-	.byte	12,10,13,0	/* 9600 baud */</div><div class='add'>+	.byte	12,1,13,0	/* 38400 baud */</div><div class='ctx'> 	.byte	14,1		/* Baud rate generator enable */</div><div class='ctx'> 	.byte	3,0xc1		/* enable receiver */</div><div class='ctx'> 	.byte	5,0xea		/* enable transmitter */</div><div class='hunk'>@@ -2906,10 +2897,12 @@ func_start	serial_init,%d0/%d1/%a0/%a1</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_MAC</div><div class='ctx'> 	is_not_mac(L(serial_init_not_mac))</div><div class='del'>-#ifdef MAC_SERIAL_DEBUG</div><div class='del'>-#if !defined(MAC_USE_SCC_A) &amp;&amp; !defined(MAC_USE_SCC_B)</div><div class='del'>-#define MAC_USE_SCC_B</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+#ifdef SERIAL_DEBUG</div><div class='add'>+/* You may define either or both of these. */</div><div class='add'>+#define MAC_USE_SCC_A /* Modem port */</div><div class='add'>+#define MAC_USE_SCC_B /* Printer port */</div><div class='add'>+</div><div class='ctx'> #define mac_scc_cha_b_ctrl_offset	0x0</div><div class='ctx'> #define mac_scc_cha_a_ctrl_offset	0x2</div><div class='ctx'> #define mac_scc_cha_b_data_offset	0x4</div><div class='hunk'>@@ -2940,7 +2933,7 @@ func_start	serial_init,%d0/%d1/%a0/%a1</div><div class='ctx'> 	jra	7b</div><div class='ctx'> 8:</div><div class='ctx'> #endif	/* MAC_USE_SCC_B */</div><div class='del'>-#endif	/* MAC_SERIAL_DEBUG */</div><div class='add'>+#endif	/* SERIAL_DEBUG */</div><div class='ctx'> </div><div class='ctx'> 	jra	L(serial_init_done)</div><div class='ctx'> L(serial_init_not_mac):</div><div class='hunk'>@@ -3011,7 +3004,7 @@ func_start	serial_putc,%d0/%d1/%a0/%a1</div><div class='ctx'> #ifdef CONFIG_MAC</div><div class='ctx'> 	is_not_mac(5f)</div><div class='ctx'> </div><div class='del'>-#ifdef MAC_SERIAL_DEBUG</div><div class='add'>+#ifdef SERIAL_DEBUG</div><div class='ctx'> </div><div class='ctx'> #ifdef MAC_USE_SCC_A</div><div class='ctx'> 	movel	%pc@(L(mac_sccbase)),%a1</div><div class='hunk'>@@ -3029,7 +3022,7 @@ func_start	serial_putc,%d0/%d1/%a0/%a1</div><div class='ctx'> 	moveb	%d0,%a1@(mac_scc_cha_b_data_offset)</div><div class='ctx'> #endif	/* MAC_USE_SCC_B */</div><div class='ctx'> </div><div class='del'>-#endif	/* MAC_SERIAL_DEBUG */</div><div class='add'>+#endif	/* SERIAL_DEBUG */</div><div class='ctx'> </div><div class='ctx'> 	jra	L(serial_putc_done)</div><div class='ctx'> 5:</div><div class='hunk'>@@ -3248,33 +3241,39 @@ func_return	putn</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MAC</div><div class='ctx'> /*</div><div class='del'>- *	mac_serial_print</div><div class='add'>+ *	mac_early_print</div><div class='ctx'>  *</div><div class='ctx'>  *	This routine takes its parameters on the stack.  It then</div><div class='del'>- *	turns around and calls the internal routine.  This routine</div><div class='del'>- *	is used until the Linux console driver initializes itself.</div><div class='add'>+ *	turns around and calls the internal routines.  This routine</div><div class='add'>+ *	is used by the boot console.</div><div class='ctx'>  *</div><div class='ctx'>  *	The calling parameters are:</div><div class='del'>- *		void mac_serial_print(const char *str);</div><div class='add'>+ *		void mac_early_print(const char *str, unsigned length);</div><div class='ctx'>  *</div><div class='ctx'>  *	This routine does NOT understand variable arguments only</div><div class='ctx'>  *	simple strings!</div><div class='ctx'>  */</div><div class='del'>-ENTRY(mac_serial_print)</div><div class='del'>-	moveml	%d0/%a0,%sp@-</div><div class='del'>-#if 1</div><div class='del'>-	move	%sr,%sp@-</div><div class='add'>+ENTRY(mac_early_print)</div><div class='add'>+	moveml	%d0/%d1/%a0,%sp@-</div><div class='add'>+	movew	%sr,%sp@-</div><div class='ctx'> 	ori	#0x0700,%sr</div><div class='del'>-#endif</div><div class='del'>-	movel	%sp@(10),%a0		/* fetch parameter */</div><div class='add'>+	movel	%sp@(18),%a0		/* fetch parameter */</div><div class='add'>+	movel	%sp@(22),%d1		/* fetch parameter */</div><div class='ctx'> 	jra	2f</div><div class='del'>-1:	serial_putc	%d0</div><div class='del'>-2:	moveb	%a0@+,%d0</div><div class='del'>-	jne	1b</div><div class='del'>-#if 1</div><div class='del'>-	move	%sp@+,%sr</div><div class='add'>+1:</div><div class='add'>+#ifdef CONSOLE</div><div class='add'>+	console_putc	%d0</div><div class='ctx'> #endif</div><div class='del'>-	moveml	%sp@+,%d0/%a0</div><div class='add'>+#ifdef SERIAL_DEBUG</div><div class='add'>+	serial_putc	%d0</div><div class='add'>+#endif</div><div class='add'>+	subq	#1,%d1</div><div class='add'>+2:	jeq	3f</div><div class='add'>+	moveb	%a0@+,%d0</div><div class='add'>+	jne	1b</div><div class='add'>+3:</div><div class='add'>+	movew	%sp@+,%sr</div><div class='add'>+	moveml	%sp@+,%d0/%d1/%a0</div><div class='ctx'> 	rts</div><div class='ctx'> #endif /* CONFIG_MAC */</div><div class='ctx'> </div><div class='hunk'>@@ -3409,10 +3408,10 @@ func_start	console_put_stats,%a0/%d7</div><div class='ctx'> 	 *		a0 = pointer to boot_info</div><div class='ctx'> 	 *		d7 = value of boot_info fields</div><div class='ctx'> 	 */</div><div class='del'>-	puts	"\nMacLinux\n\n"</div><div class='add'>+	puts	"\nMacLinux\n"</div><div class='ctx'> </div><div class='ctx'> #ifdef SERIAL_DEBUG</div><div class='del'>-	puts	" vidaddr:"</div><div class='add'>+	puts	"\n vidaddr:"</div><div class='ctx'> 	putn	%pc@(L(mac_videobase))		/* video addr. */</div><div class='ctx'> </div><div class='ctx'> 	puts	"\n  _stext:"</div><div class='hunk'>@@ -3423,19 +3422,21 @@ func_start	console_put_stats,%a0/%d7</div><div class='ctx'> 	lea	%pc@(_end),%a0</div><div class='ctx'> 	putn	%a0</div><div class='ctx'> </div><div class='del'>-	puts	"\ncpuid:"</div><div class='add'>+	puts	"\n   cpuid:"</div><div class='ctx'> 	putn	%pc@(L(cputype))</div><div class='del'>-	putc	'\n'</div><div class='ctx'> </div><div class='del'>-#ifdef MAC_SERIAL_DEBUG</div><div class='add'>+#  ifdef CONFIG_MAC</div><div class='add'>+	puts	"\n sccbase:"</div><div class='ctx'> 	putn	%pc@(L(mac_sccbase))</div><div class='add'>+#  endif</div><div class='add'>+#  ifdef MMU_PRINT</div><div class='ctx'> 	putc	'\n'</div><div class='del'>-#endif</div><div class='del'>-#  if defined(MMU_PRINT)</div><div class='ctx'> 	jbsr	mmu_print_machine_cpu_types</div><div class='del'>-#  endif /* MMU_PRINT */</div><div class='add'>+#  endif</div><div class='ctx'> #endif /* SERIAL_DEBUG */</div><div class='ctx'> </div><div class='add'>+	putc	'\n'</div><div class='add'>+</div><div class='ctx'> func_return	console_put_stats</div><div class='ctx'> </div><div class='ctx'> #ifdef CONSOLE_PENGUIN</div><div class='hunk'>@@ -3896,11 +3897,11 @@ L(mac_dimensions):</div><div class='ctx'> 	.long	0</div><div class='ctx'> L(mac_rowbytes):</div><div class='ctx'> 	.long	0</div><div class='del'>-#ifdef MAC_SERIAL_DEBUG</div><div class='add'>+#ifdef SERIAL_DEBUG</div><div class='ctx'> L(mac_sccbase):</div><div class='ctx'> 	.long	0</div><div class='del'>-#endif /* MAC_SERIAL_DEBUG */</div><div class='ctx'> #endif</div><div class='add'>+#endif /* CONFIG_MAC */</div><div class='ctx'> </div><div class='ctx'> #if defined (CONFIG_APOLLO)</div><div class='ctx'> LSRB0        = 0x10412</div><div class='head'>diff --git a/arch/m68k/kernel/init_task.c b/arch/m68k/kernel/init_task.c<br/>index cbf9dc3cc51d..c744cfc6bfa1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/init_task.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/init_task.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/init_task.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/init_task.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);</div><div class='ctx'>  *</div><div class='ctx'>  * All other task structs will be allocated on slabs in fork.c</div><div class='ctx'>  */</div><div class='del'>-__asm__(".align 4");</div><div class='ctx'> struct task_struct init_task = INIT_TASK(init_task);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(init_task);</div><div class='hunk'>@@ -27,7 +26,7 @@ EXPORT_SYMBOL(init_task);</div><div class='ctx'> /*</div><div class='ctx'>  * Initial thread structure.</div><div class='ctx'>  *</div><div class='del'>- * We need to make sure that this is 8192-byte aligned due to the</div><div class='add'>+ * We need to make sure that this is THREAD size aligned due to the</div><div class='ctx'>  * way process stacks are handled. This is done by having a special</div><div class='ctx'>  * "init_task" linker map entry..</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/m68k/kernel/m68k_ksyms.c b/arch/m68k/kernel/m68k_ksyms.c<br/>index 1b7a14d1a000..774c1bd59c36 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/m68k_ksyms.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/m68k_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/m68k_ksyms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/m68k_ksyms.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@ EXPORT_SYMBOL(__ashrdi3);</div><div class='ctx'> EXPORT_SYMBOL(__lshrdi3);</div><div class='ctx'> EXPORT_SYMBOL(__muldi3);</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_M68000) || defined(CONFIG_COLDFIRE)</div><div class='add'>+#if defined(CONFIG_CPU_HAS_NO_MULDIV64)</div><div class='ctx'> /*</div><div class='ctx'>  * Simpler 68k and ColdFire parts also need a few other gcc functions.</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/m68k/kernel/process_mm.c b/arch/m68k/kernel/process_mm.c<br/>index 1bc223aa07ec..125f34e00bf0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/process_mm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/process_mm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/process_mm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/process_mm.c</a></div><div class='hunk'>@@ -33,22 +33,6 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Initial task/thread structure. Make this a per-architecture thing,</div><div class='del'>- * because different architectures tend to have different</div><div class='del'>- * alignment requirements and potentially different initial</div><div class='del'>- * setup.</div><div class='del'>- */</div><div class='del'>-static struct signal_struct init_signals = INIT_SIGNALS(init_signals);</div><div class='del'>-static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);</div><div class='del'>-union thread_union init_thread_union __init_task_data</div><div class='del'>-	__attribute__((aligned(THREAD_SIZE))) =</div><div class='del'>-		{ INIT_THREAD_INFO(init_task) };</div><div class='del'>-</div><div class='del'>-/* initial task structure */</div><div class='del'>-struct task_struct init_task = INIT_TASK(init_task);</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(init_task);</div><div class='ctx'> </div><div class='ctx'> asmlinkage void ret_from_fork(void);</div><div class='ctx'> </div><div class='hunk'>@@ -188,9 +172,7 @@ void flush_thread(void)</div><div class='ctx'> </div><div class='ctx'> 	current-&gt;thread.fs = __USER_DS;</div><div class='ctx'> 	if (!FPU_IS_EMU)</div><div class='del'>-		asm volatile (".chip 68k/68881\n\t"</div><div class='del'>-			      "frestore %0@\n\t"</div><div class='del'>-			      ".chip 68k" : : "a" (&amp;zero));</div><div class='add'>+		asm volatile ("frestore %0@" : : "a" (&amp;zero) : "memory");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -264,11 +246,28 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,</div><div class='ctx'> 		/* Copy the current fpu state */</div><div class='ctx'> 		asm volatile ("fsave %0" : : "m" (p-&gt;thread.fpstate[0]) : "memory");</div><div class='ctx'> </div><div class='del'>-		if (!CPU_IS_060 ? p-&gt;thread.fpstate[0] : p-&gt;thread.fpstate[2])</div><div class='del'>-		  asm volatile ("fmovemx %/fp0-%/fp7,%0\n\t"</div><div class='del'>-				"fmoveml %/fpiar/%/fpcr/%/fpsr,%1"</div><div class='del'>-				: : "m" (p-&gt;thread.fp[0]), "m" (p-&gt;thread.fpcntl[0])</div><div class='del'>-				: "memory");</div><div class='add'>+		if (!CPU_IS_060 ? p-&gt;thread.fpstate[0] : p-&gt;thread.fpstate[2]) {</div><div class='add'>+			if (CPU_IS_COLDFIRE) {</div><div class='add'>+				asm volatile ("fmovemd %/fp0-%/fp7,%0\n\t"</div><div class='add'>+					      "fmovel %/fpiar,%1\n\t"</div><div class='add'>+					      "fmovel %/fpcr,%2\n\t"</div><div class='add'>+					      "fmovel %/fpsr,%3"</div><div class='add'>+					      :</div><div class='add'>+					      : "m" (p-&gt;thread.fp[0]),</div><div class='add'>+						"m" (p-&gt;thread.fpcntl[0]),</div><div class='add'>+						"m" (p-&gt;thread.fpcntl[1]),</div><div class='add'>+						"m" (p-&gt;thread.fpcntl[2])</div><div class='add'>+					      : "memory");</div><div class='add'>+			} else {</div><div class='add'>+				asm volatile ("fmovemx %/fp0-%/fp7,%0\n\t"</div><div class='add'>+					      "fmoveml %/fpiar/%/fpcr/%/fpsr,%1"</div><div class='add'>+					      :</div><div class='add'>+					      : "m" (p-&gt;thread.fp[0]),</div><div class='add'>+						"m" (p-&gt;thread.fpcntl[0])</div><div class='add'>+					      : "memory");</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* Restore the state in case the fpu was busy */</div><div class='ctx'> 		asm volatile ("frestore %0" : : "m" (p-&gt;thread.fpstate[0]));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -301,12 +300,28 @@ int dump_fpu (struct pt_regs *regs, struct user_m68kfp_struct *fpu)</div><div class='ctx'> 	if (!CPU_IS_060 ? !fpustate[0] : !fpustate[2])</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	asm volatile ("fmovem %/fpiar/%/fpcr/%/fpsr,%0"</div><div class='del'>-		:: "m" (fpu-&gt;fpcntl[0])</div><div class='del'>-		: "memory");</div><div class='del'>-	asm volatile ("fmovemx %/fp0-%/fp7,%0"</div><div class='del'>-		:: "m" (fpu-&gt;fpregs[0])</div><div class='del'>-		: "memory");</div><div class='add'>+	if (CPU_IS_COLDFIRE) {</div><div class='add'>+		asm volatile ("fmovel %/fpiar,%0\n\t"</div><div class='add'>+			      "fmovel %/fpcr,%1\n\t"</div><div class='add'>+			      "fmovel %/fpsr,%2\n\t"</div><div class='add'>+			      "fmovemd %/fp0-%/fp7,%3"</div><div class='add'>+			      :</div><div class='add'>+			      : "m" (fpu-&gt;fpcntl[0]),</div><div class='add'>+				"m" (fpu-&gt;fpcntl[1]),</div><div class='add'>+				"m" (fpu-&gt;fpcntl[2]),</div><div class='add'>+				"m" (fpu-&gt;fpregs[0])</div><div class='add'>+			      : "memory");</div><div class='add'>+	} else {</div><div class='add'>+		asm volatile ("fmovem %/fpiar/%/fpcr/%/fpsr,%0"</div><div class='add'>+			      :</div><div class='add'>+			      : "m" (fpu-&gt;fpcntl[0])</div><div class='add'>+			      : "memory");</div><div class='add'>+		asm volatile ("fmovemx %/fp0-%/fp7,%0"</div><div class='add'>+			      :</div><div class='add'>+			      : "m" (fpu-&gt;fpregs[0])</div><div class='add'>+			      : "memory");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dump_fpu);</div><div class='head'>diff --git a/arch/m68k/kernel/ptrace_mm.c b/arch/m68k/kernel/ptrace_mm.c<br/>index 0b252683cefb..7bc999b73529 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/ptrace_mm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/ptrace_mm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/ptrace_mm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/ptrace_mm.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='add'>+#include &lt;linux/tracehook.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -275,3 +276,20 @@ asmlinkage void syscall_trace(void)</div><div class='ctx'> 		current-&gt;exit_code = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_COLDFIRE</div><div class='add'>+asmlinkage int syscall_trace_enter(void)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (test_thread_flag(TIF_SYSCALL_TRACE))</div><div class='add'>+		ret = tracehook_report_syscall_entry(task_pt_regs(current));</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+asmlinkage void syscall_trace_leave(void)</div><div class='add'>+{</div><div class='add'>+	if (test_thread_flag(TIF_SYSCALL_TRACE))</div><div class='add'>+		tracehook_report_syscall_exit(task_pt_regs(current), 0);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_COLDFIRE */</div><div class='head'>diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c<br/>index c3b45061dd08..d872ce4807c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/setup_mm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/setup_mm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/setup_mm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/setup_mm.c</a></div><div class='hunk'>@@ -221,7 +221,8 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* The bootinfo is located right after the kernel bss */</div><div class='del'>-	m68k_parse_bootinfo((const struct bi_record *)_end);</div><div class='add'>+	if (!CPU_IS_COLDFIRE)</div><div class='add'>+		m68k_parse_bootinfo((const struct bi_record *)_end);</div><div class='ctx'> </div><div class='ctx'> 	if (CPU_IS_040)</div><div class='ctx'> 		m68k_is040or060 = 4;</div><div class='hunk'>@@ -235,7 +236,7 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	 *  with them, we should add a test to check_bugs() below] */</div><div class='ctx'> #ifndef CONFIG_M68KFPU_EMU_ONLY</div><div class='ctx'> 	/* clear the fpu if we have one */</div><div class='del'>-	if (m68k_fputype &amp; (FPU_68881|FPU_68882|FPU_68040|FPU_68060)) {</div><div class='add'>+	if (m68k_fputype &amp; (FPU_68881|FPU_68882|FPU_68040|FPU_68060|FPU_COLDFIRE)) {</div><div class='ctx'> 		volatile int zero = 0;</div><div class='ctx'> 		asm volatile ("frestore %0" : : "m" (zero));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -258,6 +259,10 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	init_mm.end_data = (unsigned long)_edata;</div><div class='ctx'> 	init_mm.brk = (unsigned long)_end;</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_BOOTPARAM)</div><div class='add'>+	strncpy(m68k_command_line, CONFIG_BOOTPARAM_STRING, CL_SIZE);</div><div class='add'>+	m68k_command_line[CL_SIZE - 1] = 0;</div><div class='add'>+#endif /* CONFIG_BOOTPARAM */</div><div class='ctx'> 	*cmdline_p = m68k_command_line;</div><div class='ctx'> 	memcpy(boot_command_line, *cmdline_p, CL_SIZE);</div><div class='ctx'> </div><div class='hunk'>@@ -323,6 +328,11 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 		config_sun3x();</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_COLDFIRE</div><div class='add'>+	case MACH_M54XX:</div><div class='add'>+		config_BSP(NULL, 0);</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='ctx'> 	default:</div><div class='ctx'> 		panic("No configuration setup");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -384,6 +394,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> #define LOOP_CYCLES_68030	(8)</div><div class='ctx'> #define LOOP_CYCLES_68040	(3)</div><div class='ctx'> #define LOOP_CYCLES_68060	(1)</div><div class='add'>+#define LOOP_CYCLES_COLDFIRE	(2)</div><div class='ctx'> </div><div class='ctx'> 	if (CPU_IS_020) {</div><div class='ctx'> 		cpu = "68020";</div><div class='hunk'>@@ -397,6 +408,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> 	} else if (CPU_IS_060) {</div><div class='ctx'> 		cpu = "68060";</div><div class='ctx'> 		clockfactor = LOOP_CYCLES_68060;</div><div class='add'>+	} else if (CPU_IS_COLDFIRE) {</div><div class='add'>+		cpu = "ColdFire";</div><div class='add'>+		clockfactor = LOOP_CYCLES_COLDFIRE;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		cpu = "680x0";</div><div class='ctx'> 		clockfactor = 0;</div><div class='hunk'>@@ -415,6 +429,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> 		fpu = "68060";</div><div class='ctx'> 	else if (m68k_fputype &amp; FPU_SUNFPA)</div><div class='ctx'> 		fpu = "Sun FPA";</div><div class='add'>+	else if (m68k_fputype &amp; FPU_COLDFIRE)</div><div class='add'>+		fpu = "ColdFire";</div><div class='ctx'> 	else</div><div class='ctx'> 		fpu = "none";</div><div class='ctx'> #endif</div><div class='hunk'>@@ -431,6 +447,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> 		mmu = "Sun-3";</div><div class='ctx'> 	else if (m68k_mmutype &amp; MMU_APOLLO)</div><div class='ctx'> 		mmu = "Apollo";</div><div class='add'>+	else if (m68k_mmutype &amp; MMU_COLDFIRE)</div><div class='add'>+		mmu = "ColdFire";</div><div class='ctx'> 	else</div><div class='ctx'> 		mmu = "unknown";</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c<br/>index 2ed8c0fb1517..ca3df0dc7e88 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/setup_no.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/setup_no.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/setup_no.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/setup_no.c</a></div><div class='hunk'>@@ -47,7 +47,6 @@ EXPORT_SYMBOL(memory_end);</div><div class='ctx'> char __initdata command_line[COMMAND_LINE_SIZE];</div><div class='ctx'> </div><div class='ctx'> /* machine dependent timer functions */</div><div class='del'>-void (*mach_gettod)(int*, int*, int*, int*, int*, int*);</div><div class='ctx'> int (*mach_set_clock_mmss)(unsigned long);</div><div class='ctx'> </div><div class='ctx'> /* machine dependent reboot functions */</div><div class='head'>diff --git a/arch/m68k/kernel/signal_mm.c b/arch/m68k/kernel/signal_mm.c<br/>index a0afc239304e..cb856f9da655 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/signal_mm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/signal_mm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/signal_mm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/signal_mm.c</a></div><div class='hunk'>@@ -56,7 +56,11 @@ static const int frame_extra_sizes[16] = {</div><div class='ctx'>   [1]	= -1, /* sizeof(((struct frame *)0)-&gt;un.fmt1), */</div><div class='ctx'>   [2]	= sizeof(((struct frame *)0)-&gt;un.fmt2),</div><div class='ctx'>   [3]	= sizeof(((struct frame *)0)-&gt;un.fmt3),</div><div class='add'>+#ifdef CONFIG_COLDFIRE</div><div class='add'>+  [4]	= 0,</div><div class='add'>+#else</div><div class='ctx'>   [4]	= sizeof(((struct frame *)0)-&gt;un.fmt4),</div><div class='add'>+#endif</div><div class='ctx'>   [5]	= -1, /* sizeof(((struct frame *)0)-&gt;un.fmt5), */</div><div class='ctx'>   [6]	= -1, /* sizeof(((struct frame *)0)-&gt;un.fmt6), */</div><div class='ctx'>   [7]	= sizeof(((struct frame *)0)-&gt;un.fmt7),</div><div class='hunk'>@@ -84,7 +88,11 @@ int handle_kernel_fault(struct pt_regs *regs)</div><div class='ctx'> 	regs-&gt;stkadj = frame_extra_sizes[regs-&gt;format];</div><div class='ctx'> 	tregs =	(struct pt_regs *)((long)regs + regs-&gt;stkadj);</div><div class='ctx'> 	tregs-&gt;vector = regs-&gt;vector;</div><div class='add'>+#ifdef CONFIG_COLDFIRE</div><div class='add'>+	tregs-&gt;format = 4;</div><div class='add'>+#else</div><div class='ctx'> 	tregs-&gt;format = 0;</div><div class='add'>+#endif</div><div class='ctx'> 	tregs-&gt;pc = fixup-&gt;fixup;</div><div class='ctx'> 	tregs-&gt;sr = regs-&gt;sr;</div><div class='ctx'> </div><div class='hunk'>@@ -195,7 +203,8 @@ static inline int restore_fpu_state(struct sigcontext *sc)</div><div class='ctx'> </div><div class='ctx'> 	if (CPU_IS_060 ? sc-&gt;sc_fpstate[2] : sc-&gt;sc_fpstate[0]) {</div><div class='ctx'> 	    /* Verify the frame format.  */</div><div class='del'>-	    if (!CPU_IS_060 &amp;&amp; (sc-&gt;sc_fpstate[0] != fpu_version))</div><div class='add'>+	    if (!(CPU_IS_060 || CPU_IS_COLDFIRE) &amp;&amp;</div><div class='add'>+		 (sc-&gt;sc_fpstate[0] != fpu_version))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	    if (CPU_IS_020_OR_030) {</div><div class='ctx'> 		if (m68k_fputype &amp; FPU_68881 &amp;&amp;</div><div class='hunk'>@@ -214,19 +223,43 @@ static inline int restore_fpu_state(struct sigcontext *sc)</div><div class='ctx'>                       sc-&gt;sc_fpstate[3] == 0x60 ||</div><div class='ctx'> 		      sc-&gt;sc_fpstate[3] == 0xe0))</div><div class='ctx'> 		    goto out;</div><div class='add'>+	    } else if (CPU_IS_COLDFIRE) {</div><div class='add'>+		if (!(sc-&gt;sc_fpstate[0] == 0x00 ||</div><div class='add'>+		      sc-&gt;sc_fpstate[0] == 0x05 ||</div><div class='add'>+		      sc-&gt;sc_fpstate[0] == 0xe5))</div><div class='add'>+		    goto out;</div><div class='ctx'> 	    } else</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	    __asm__ volatile (".chip 68k/68881\n\t"</div><div class='del'>-			      "fmovemx %0,%%fp0-%%fp1\n\t"</div><div class='del'>-			      "fmoveml %1,%%fpcr/%%fpsr/%%fpiar\n\t"</div><div class='del'>-			      ".chip 68k"</div><div class='del'>-			      : /* no outputs */</div><div class='del'>-			      : "m" (*sc-&gt;sc_fpregs), "m" (*sc-&gt;sc_fpcntl));</div><div class='add'>+	    if (CPU_IS_COLDFIRE) {</div><div class='add'>+		__asm__ volatile ("fmovemd %0,%%fp0-%%fp1\n\t"</div><div class='add'>+				  "fmovel %1,%%fpcr\n\t"</div><div class='add'>+				  "fmovel %2,%%fpsr\n\t"</div><div class='add'>+				  "fmovel %3,%%fpiar"</div><div class='add'>+				  : /* no outputs */</div><div class='add'>+				  : "m" (sc-&gt;sc_fpregs[0]),</div><div class='add'>+				    "m" (sc-&gt;sc_fpcntl[0]),</div><div class='add'>+				    "m" (sc-&gt;sc_fpcntl[1]),</div><div class='add'>+				    "m" (sc-&gt;sc_fpcntl[2]));</div><div class='add'>+	    } else {</div><div class='add'>+		__asm__ volatile (".chip 68k/68881\n\t"</div><div class='add'>+				  "fmovemx %0,%%fp0-%%fp1\n\t"</div><div class='add'>+				  "fmoveml %1,%%fpcr/%%fpsr/%%fpiar\n\t"</div><div class='add'>+				  ".chip 68k"</div><div class='add'>+				  : /* no outputs */</div><div class='add'>+				  : "m" (*sc-&gt;sc_fpregs),</div><div class='add'>+				    "m" (*sc-&gt;sc_fpcntl));</div><div class='add'>+	    }</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (CPU_IS_COLDFIRE) {</div><div class='add'>+		__asm__ volatile ("frestore %0" : : "m" (*sc-&gt;sc_fpstate));</div><div class='add'>+	} else {</div><div class='add'>+		__asm__ volatile (".chip 68k/68881\n\t"</div><div class='add'>+				  "frestore %0\n\t"</div><div class='add'>+				  ".chip 68k"</div><div class='add'>+				  : : "m" (*sc-&gt;sc_fpstate));</div><div class='ctx'> 	}</div><div class='del'>-	__asm__ volatile (".chip 68k/68881\n\t"</div><div class='del'>-			  "frestore %0\n\t"</div><div class='del'>-			  ".chip 68k" : : "m" (*sc-&gt;sc_fpstate));</div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -241,7 +274,7 @@ out:</div><div class='ctx'> static inline int rt_restore_fpu_state(struct ucontext __user *uc)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char fpstate[FPCONTEXT_SIZE];</div><div class='del'>-	int context_size = CPU_IS_060 ? 8 : 0;</div><div class='add'>+	int context_size = CPU_IS_060 ? 8 : (CPU_IS_COLDFIRE ? 12 : 0);</div><div class='ctx'> 	fpregset_t fpregs;</div><div class='ctx'> 	int err = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -260,10 +293,11 @@ static inline int rt_restore_fpu_state(struct ucontext __user *uc)</div><div class='ctx'> 	if (__get_user(*(long *)fpstate, (long __user *)&amp;uc-&gt;uc_fpstate))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if (CPU_IS_060 ? fpstate[2] : fpstate[0]) {</div><div class='del'>-		if (!CPU_IS_060)</div><div class='add'>+		if (!(CPU_IS_060 || CPU_IS_COLDFIRE))</div><div class='ctx'> 			context_size = fpstate[1];</div><div class='ctx'> 		/* Verify the frame format.  */</div><div class='del'>-		if (!CPU_IS_060 &amp;&amp; (fpstate[0] != fpu_version))</div><div class='add'>+		if (!(CPU_IS_060 || CPU_IS_COLDFIRE) &amp;&amp;</div><div class='add'>+		     (fpstate[0] != fpu_version))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		if (CPU_IS_020_OR_030) {</div><div class='ctx'> 			if (m68k_fputype &amp; FPU_68881 &amp;&amp;</div><div class='hunk'>@@ -282,26 +316,50 @@ static inline int rt_restore_fpu_state(struct ucontext __user *uc)</div><div class='ctx'> 			      fpstate[3] == 0x60 ||</div><div class='ctx'> 			      fpstate[3] == 0xe0))</div><div class='ctx'> 				goto out;</div><div class='add'>+		} else if (CPU_IS_COLDFIRE) {</div><div class='add'>+			if (!(fpstate[3] == 0x00 ||</div><div class='add'>+			      fpstate[3] == 0x05 ||</div><div class='add'>+			      fpstate[3] == 0xe5))</div><div class='add'>+				goto out;</div><div class='ctx'> 		} else</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		if (__copy_from_user(&amp;fpregs, &amp;uc-&gt;uc_mcontext.fpregs,</div><div class='ctx'> 				     sizeof(fpregs)))</div><div class='ctx'> 			goto out;</div><div class='del'>-		__asm__ volatile (".chip 68k/68881\n\t"</div><div class='del'>-				  "fmovemx %0,%%fp0-%%fp7\n\t"</div><div class='del'>-				  "fmoveml %1,%%fpcr/%%fpsr/%%fpiar\n\t"</div><div class='del'>-				  ".chip 68k"</div><div class='del'>-				  : /* no outputs */</div><div class='del'>-				  : "m" (*fpregs.f_fpregs),</div><div class='del'>-				    "m" (*fpregs.f_fpcntl));</div><div class='add'>+</div><div class='add'>+		if (CPU_IS_COLDFIRE) {</div><div class='add'>+			__asm__ volatile ("fmovemd %0,%%fp0-%%fp7\n\t"</div><div class='add'>+					  "fmovel %1,%%fpcr\n\t"</div><div class='add'>+					  "fmovel %2,%%fpsr\n\t"</div><div class='add'>+					  "fmovel %3,%%fpiar"</div><div class='add'>+					  : /* no outputs */</div><div class='add'>+					  : "m" (fpregs.f_fpregs[0]),</div><div class='add'>+					    "m" (fpregs.f_fpcntl[0]),</div><div class='add'>+					    "m" (fpregs.f_fpcntl[1]),</div><div class='add'>+					    "m" (fpregs.f_fpcntl[2]));</div><div class='add'>+		} else {</div><div class='add'>+			__asm__ volatile (".chip 68k/68881\n\t"</div><div class='add'>+					  "fmovemx %0,%%fp0-%%fp7\n\t"</div><div class='add'>+					  "fmoveml %1,%%fpcr/%%fpsr/%%fpiar\n\t"</div><div class='add'>+					  ".chip 68k"</div><div class='add'>+					  : /* no outputs */</div><div class='add'>+					  : "m" (*fpregs.f_fpregs),</div><div class='add'>+					    "m" (*fpregs.f_fpcntl));</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (context_size &amp;&amp;</div><div class='ctx'> 	    __copy_from_user(fpstate + 4, (long __user *)&amp;uc-&gt;uc_fpstate + 1,</div><div class='ctx'> 			     context_size))</div><div class='ctx'> 		goto out;</div><div class='del'>-	__asm__ volatile (".chip 68k/68881\n\t"</div><div class='del'>-			  "frestore %0\n\t"</div><div class='del'>-			  ".chip 68k" : : "m" (*fpstate));</div><div class='add'>+</div><div class='add'>+	if (CPU_IS_COLDFIRE) {</div><div class='add'>+		__asm__ volatile ("frestore %0" : : "m" (*fpstate));</div><div class='add'>+	} else {</div><div class='add'>+		__asm__ volatile (".chip 68k/68881\n\t"</div><div class='add'>+				  "frestore %0\n\t"</div><div class='add'>+				  ".chip 68k"</div><div class='add'>+				  : : "m" (*fpstate));</div><div class='add'>+	}</div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -336,8 +394,12 @@ static int mangle_kernel_stack(struct pt_regs *regs, int formatvec,</div><div class='ctx'> 		regs-&gt;format = formatvec &gt;&gt; 12;</div><div class='ctx'> 		regs-&gt;vector = formatvec &amp; 0xfff;</div><div class='ctx'> #define frame_offset (sizeof(struct pt_regs)+sizeof(struct switch_stack))</div><div class='del'>-		__asm__ __volatile__</div><div class='del'>-			("   movel %0,%/a0\n\t"</div><div class='add'>+		__asm__ __volatile__ (</div><div class='add'>+#ifdef CONFIG_COLDFIRE</div><div class='add'>+			 "   movel %0,%/sp\n\t"</div><div class='add'>+			 "   bra ret_from_signal\n"</div><div class='add'>+#else</div><div class='add'>+			 "   movel %0,%/a0\n\t"</div><div class='ctx'> 			 "   subl %1,%/a0\n\t"     /* make room on stack */</div><div class='ctx'> 			 "   movel %/a0,%/sp\n\t"  /* set stack pointer */</div><div class='ctx'> 			 /* move switch_stack and pt_regs */</div><div class='hunk'>@@ -350,6 +412,7 @@ static int mangle_kernel_stack(struct pt_regs *regs, int formatvec,</div><div class='ctx'> 			 "2: movel %4@+,%/a0@+\n\t"</div><div class='ctx'> 			 "   dbra %1,2b\n\t"</div><div class='ctx'> 			 "   bral ret_from_signal\n"</div><div class='add'>+#endif</div><div class='ctx'> 			 : /* no outputs, it doesn't ever return */</div><div class='ctx'> 			 : "a" (sw), "d" (fsize), "d" (frame_offset/4-1),</div><div class='ctx'> 			   "n" (frame_offset), "a" (buf + fsize/4)</div><div class='hunk'>@@ -516,10 +579,15 @@ static inline void save_fpu_state(struct sigcontext *sc, struct pt_regs *regs)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__asm__ volatile (".chip 68k/68881\n\t"</div><div class='del'>-			  "fsave %0\n\t"</div><div class='del'>-			  ".chip 68k"</div><div class='del'>-			  : : "m" (*sc-&gt;sc_fpstate) : "memory");</div><div class='add'>+	if (CPU_IS_COLDFIRE) {</div><div class='add'>+		__asm__ volatile ("fsave %0"</div><div class='add'>+				  : : "m" (*sc-&gt;sc_fpstate) : "memory");</div><div class='add'>+	} else {</div><div class='add'>+		__asm__ volatile (".chip 68k/68881\n\t"</div><div class='add'>+				  "fsave %0\n\t"</div><div class='add'>+				  ".chip 68k"</div><div class='add'>+				  : : "m" (*sc-&gt;sc_fpstate) : "memory");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (CPU_IS_060 ? sc-&gt;sc_fpstate[2] : sc-&gt;sc_fpstate[0]) {</div><div class='ctx'> 		fpu_version = sc-&gt;sc_fpstate[0];</div><div class='hunk'>@@ -530,21 +598,35 @@ static inline void save_fpu_state(struct sigcontext *sc, struct pt_regs *regs)</div><div class='ctx'> 			if (*(unsigned short *) sc-&gt;sc_fpstate == 0x1f38)</div><div class='ctx'> 				sc-&gt;sc_fpstate[0x38] |= 1 &lt;&lt; 3;</div><div class='ctx'> 		}</div><div class='del'>-		__asm__ volatile (".chip 68k/68881\n\t"</div><div class='del'>-				  "fmovemx %%fp0-%%fp1,%0\n\t"</div><div class='del'>-				  "fmoveml %%fpcr/%%fpsr/%%fpiar,%1\n\t"</div><div class='del'>-				  ".chip 68k"</div><div class='del'>-				  : "=m" (*sc-&gt;sc_fpregs),</div><div class='del'>-				    "=m" (*sc-&gt;sc_fpcntl)</div><div class='del'>-				  : /* no inputs */</div><div class='del'>-				  : "memory");</div><div class='add'>+</div><div class='add'>+		if (CPU_IS_COLDFIRE) {</div><div class='add'>+			__asm__ volatile ("fmovemd %%fp0-%%fp1,%0\n\t"</div><div class='add'>+					  "fmovel %%fpcr,%1\n\t"</div><div class='add'>+					  "fmovel %%fpsr,%2\n\t"</div><div class='add'>+					  "fmovel %%fpiar,%3"</div><div class='add'>+					  : "=m" (sc-&gt;sc_fpregs[0]),</div><div class='add'>+					    "=m" (sc-&gt;sc_fpcntl[0]),</div><div class='add'>+					    "=m" (sc-&gt;sc_fpcntl[1]),</div><div class='add'>+					    "=m" (sc-&gt;sc_fpcntl[2])</div><div class='add'>+					  : /* no inputs */</div><div class='add'>+					  : "memory");</div><div class='add'>+		} else {</div><div class='add'>+			__asm__ volatile (".chip 68k/68881\n\t"</div><div class='add'>+					  "fmovemx %%fp0-%%fp1,%0\n\t"</div><div class='add'>+					  "fmoveml %%fpcr/%%fpsr/%%fpiar,%1\n\t"</div><div class='add'>+					  ".chip 68k"</div><div class='add'>+					  : "=m" (*sc-&gt;sc_fpregs),</div><div class='add'>+					    "=m" (*sc-&gt;sc_fpcntl)</div><div class='add'>+					  : /* no inputs */</div><div class='add'>+					  : "memory");</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int rt_save_fpu_state(struct ucontext __user *uc, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char fpstate[FPCONTEXT_SIZE];</div><div class='del'>-	int context_size = CPU_IS_060 ? 8 : 0;</div><div class='add'>+	int context_size = CPU_IS_060 ? 8 : (CPU_IS_COLDFIRE ? 12 : 0);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (FPU_IS_EMU) {</div><div class='hunk'>@@ -557,15 +639,19 @@ static inline int rt_save_fpu_state(struct ucontext __user *uc, struct pt_regs *</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__asm__ volatile (".chip 68k/68881\n\t"</div><div class='del'>-			  "fsave %0\n\t"</div><div class='del'>-			  ".chip 68k"</div><div class='del'>-			  : : "m" (*fpstate) : "memory");</div><div class='add'>+	if (CPU_IS_COLDFIRE) {</div><div class='add'>+		__asm__ volatile ("fsave %0" : : "m" (*fpstate) : "memory");</div><div class='add'>+	} else {</div><div class='add'>+		__asm__ volatile (".chip 68k/68881\n\t"</div><div class='add'>+				  "fsave %0\n\t"</div><div class='add'>+				  ".chip 68k"</div><div class='add'>+				  : : "m" (*fpstate) : "memory");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err |= __put_user(*(long *)fpstate, (long __user *)&amp;uc-&gt;uc_fpstate);</div><div class='ctx'> 	if (CPU_IS_060 ? fpstate[2] : fpstate[0]) {</div><div class='ctx'> 		fpregset_t fpregs;</div><div class='del'>-		if (!CPU_IS_060)</div><div class='add'>+		if (!(CPU_IS_060 || CPU_IS_COLDFIRE))</div><div class='ctx'> 			context_size = fpstate[1];</div><div class='ctx'> 		fpu_version = fpstate[0];</div><div class='ctx'> 		if (CPU_IS_020_OR_030 &amp;&amp;</div><div class='hunk'>@@ -575,14 +661,27 @@ static inline int rt_save_fpu_state(struct ucontext __user *uc, struct pt_regs *</div><div class='ctx'> 			if (*(unsigned short *) fpstate == 0x1f38)</div><div class='ctx'> 				fpstate[0x38] |= 1 &lt;&lt; 3;</div><div class='ctx'> 		}</div><div class='del'>-		__asm__ volatile (".chip 68k/68881\n\t"</div><div class='del'>-				  "fmovemx %%fp0-%%fp7,%0\n\t"</div><div class='del'>-				  "fmoveml %%fpcr/%%fpsr/%%fpiar,%1\n\t"</div><div class='del'>-				  ".chip 68k"</div><div class='del'>-				  : "=m" (*fpregs.f_fpregs),</div><div class='del'>-				    "=m" (*fpregs.f_fpcntl)</div><div class='del'>-				  : /* no inputs */</div><div class='del'>-				  : "memory");</div><div class='add'>+		if (CPU_IS_COLDFIRE) {</div><div class='add'>+			__asm__ volatile ("fmovemd %%fp0-%%fp7,%0\n\t"</div><div class='add'>+					  "fmovel %%fpcr,%1\n\t"</div><div class='add'>+					  "fmovel %%fpsr,%2\n\t"</div><div class='add'>+					  "fmovel %%fpiar,%3"</div><div class='add'>+					  : "=m" (fpregs.f_fpregs[0]),</div><div class='add'>+					    "=m" (fpregs.f_fpcntl[0]),</div><div class='add'>+					    "=m" (fpregs.f_fpcntl[1]),</div><div class='add'>+					    "=m" (fpregs.f_fpcntl[2])</div><div class='add'>+					  : /* no inputs */</div><div class='add'>+					  : "memory");</div><div class='add'>+		} else {</div><div class='add'>+			__asm__ volatile (".chip 68k/68881\n\t"</div><div class='add'>+					  "fmovemx %%fp0-%%fp7,%0\n\t"</div><div class='add'>+					  "fmoveml %%fpcr/%%fpsr/%%fpiar,%1\n\t"</div><div class='add'>+					  ".chip 68k"</div><div class='add'>+					  : "=m" (*fpregs.f_fpregs),</div><div class='add'>+					    "=m" (*fpregs.f_fpcntl)</div><div class='add'>+					  : /* no inputs */</div><div class='add'>+					  : "memory");</div><div class='add'>+		}</div><div class='ctx'> 		err |= copy_to_user(&amp;uc-&gt;uc_mcontext.fpregs, &amp;fpregs,</div><div class='ctx'> 				    sizeof(fpregs));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -679,8 +778,7 @@ static inline void push_cache (unsigned long vaddr)</div><div class='ctx'> 				      "cpushl %%bc,(%0)\n\t"</div><div class='ctx'> 				      ".chip 68k"</div><div class='ctx'> 				      : : "a" (temp));</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='add'>+	} else if (!CPU_IS_COLDFIRE) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * 68030/68020 have no writeback cache;</div><div class='ctx'> 		 * still need to clear icache.</div><div class='head'>diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c<br/>index a5cf40c26de5..75ab79b3bdeb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/time.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-#ifdef CONFIG_MMU</div><div class='add'>+#if defined(CONFIG_MMU) &amp;&amp; !defined(CONFIG_COLDFIRE)</div><div class='ctx'> #include "time_mm.c"</div><div class='ctx'> #else</div><div class='ctx'> #include "time_no.c"</div><div class='head'>diff --git a/arch/m68k/kernel/time_no.c b/arch/m68k/kernel/time_no.c<br/>index 6623909f70e6..3ef0f7768dcd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/time_no.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/time_no.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/time_no.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/time_no.c</a></div><div class='hunk'>@@ -26,6 +26,9 @@</div><div class='ctx'> </div><div class='ctx'> #define	TICK_SIZE (tick_nsec / 1000)</div><div class='ctx'> </div><div class='add'>+/* machine dependent timer functions */</div><div class='add'>+void (*mach_gettod)(int*, int*, int*, int*, int*, int*);</div><div class='add'>+</div><div class='ctx'> static inline int set_rtc_mmss(unsigned long nowtime)</div><div class='ctx'> {</div><div class='ctx'> 	if (mach_set_clock_mmss)</div><div class='head'>diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c<br/>index 89362f2bb56a..a76452ca964e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/traps.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/traps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/traps.c</a></div><div class='hunk'>@@ -706,6 +706,88 @@ create_atc_entry:</div><div class='ctx'> #endif /* CPU_M68020_OR_M68030 */</div><div class='ctx'> #endif /* !CONFIG_SUN3 */</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_COLDFIRE) &amp;&amp; defined(CONFIG_MMU)</div><div class='add'>+#include &lt;asm/mcfmmu.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	The following table converts the FS encoding of a ColdFire</div><div class='add'>+ *	exception stack frame into the error_code value needed by</div><div class='add'>+ *	do_fault.</div><div class='add'>+*/</div><div class='add'>+static const unsigned char fs_err_code[] = {</div><div class='add'>+	0,  /* 0000 */</div><div class='add'>+	0,  /* 0001 */</div><div class='add'>+	0,  /* 0010 */</div><div class='add'>+	0,  /* 0011 */</div><div class='add'>+	1,  /* 0100 */</div><div class='add'>+	0,  /* 0101 */</div><div class='add'>+	0,  /* 0110 */</div><div class='add'>+	0,  /* 0111 */</div><div class='add'>+	2,  /* 1000 */</div><div class='add'>+	3,  /* 1001 */</div><div class='add'>+	2,  /* 1010 */</div><div class='add'>+	0,  /* 1011 */</div><div class='add'>+	1,  /* 1100 */</div><div class='add'>+	1,  /* 1101 */</div><div class='add'>+	0,  /* 1110 */</div><div class='add'>+	0   /* 1111 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void access_errorcf(unsigned int fs, struct frame *fp)</div><div class='add'>+{</div><div class='add'>+	unsigned long mmusr, addr;</div><div class='add'>+	unsigned int err_code;</div><div class='add'>+	int need_page_fault;</div><div class='add'>+</div><div class='add'>+	mmusr = mmu_read(MMUSR);</div><div class='add'>+	addr = mmu_read(MMUAR);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * error_code:</div><div class='add'>+	 *	bit 0 == 0 means no page found, 1 means protection fault</div><div class='add'>+	 *	bit 1 == 0 means read, 1 means write</div><div class='add'>+	 */</div><div class='add'>+	switch (fs) {</div><div class='add'>+	case  5:  /* 0101 TLB opword X miss */</div><div class='add'>+		need_page_fault = cf_tlb_miss(&amp;fp-&gt;ptregs, 0, 0, 0);</div><div class='add'>+		addr = fp-&gt;ptregs.pc;</div><div class='add'>+		break;</div><div class='add'>+	case  6:  /* 0110 TLB extension word X miss */</div><div class='add'>+		need_page_fault = cf_tlb_miss(&amp;fp-&gt;ptregs, 0, 0, 1);</div><div class='add'>+		addr = fp-&gt;ptregs.pc + sizeof(long);</div><div class='add'>+		break;</div><div class='add'>+	case 10:  /* 1010 TLB W miss */</div><div class='add'>+		need_page_fault = cf_tlb_miss(&amp;fp-&gt;ptregs, 1, 1, 0);</div><div class='add'>+		break;</div><div class='add'>+	case 14: /* 1110 TLB R miss */</div><div class='add'>+		need_page_fault = cf_tlb_miss(&amp;fp-&gt;ptregs, 0, 1, 0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* 0000 Normal  */</div><div class='add'>+		/* 0001 Reserved */</div><div class='add'>+		/* 0010 Interrupt during debug service routine */</div><div class='add'>+		/* 0011 Reserved */</div><div class='add'>+		/* 0100 X Protection */</div><div class='add'>+		/* 0111 IFP in emulator mode */</div><div class='add'>+		/* 1000 W Protection*/</div><div class='add'>+		/* 1001 Write error*/</div><div class='add'>+		/* 1011 Reserved*/</div><div class='add'>+		/* 1100 R Protection*/</div><div class='add'>+		/* 1101 R Protection*/</div><div class='add'>+		/* 1111 OEP in emulator mode*/</div><div class='add'>+		need_page_fault = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (need_page_fault) {</div><div class='add'>+		err_code = fs_err_code[fs];</div><div class='add'>+		if ((fs == 13) &amp;&amp; (mmusr &amp; MMUSR_WF)) /* rd-mod-wr access */</div><div class='add'>+			err_code |= 2; /* bit1 - write, bit0 - protection */</div><div class='add'>+		do_page_fault(&amp;fp-&gt;ptregs, addr, err_code);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_COLDFIRE CONFIG_MMU */</div><div class='add'>+</div><div class='ctx'> asmlinkage void buserr_c(struct frame *fp)</div><div class='ctx'> {</div><div class='ctx'> 	/* Only set esp0 if coming from user mode */</div><div class='hunk'>@@ -716,6 +798,28 @@ asmlinkage void buserr_c(struct frame *fp)</div><div class='ctx'> 	printk ("*** Bus Error *** Format is %x\n", fp-&gt;ptregs.format);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_COLDFIRE) &amp;&amp; defined(CONFIG_MMU)</div><div class='add'>+	if (CPU_IS_COLDFIRE) {</div><div class='add'>+		unsigned int fs;</div><div class='add'>+		fs = (fp-&gt;ptregs.vector &amp; 0x3) |</div><div class='add'>+			((fp-&gt;ptregs.vector &amp; 0xc00) &gt;&gt; 8);</div><div class='add'>+		switch (fs) {</div><div class='add'>+		case 0x5:</div><div class='add'>+		case 0x6:</div><div class='add'>+		case 0x7:</div><div class='add'>+		case 0x9:</div><div class='add'>+		case 0xa:</div><div class='add'>+		case 0xd:</div><div class='add'>+		case 0xe:</div><div class='add'>+		case 0xf:</div><div class='add'>+			access_errorcf(fs, fp);</div><div class='add'>+			return;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_COLDFIRE &amp;&amp; CONFIG_MMU */</div><div class='add'>+</div><div class='ctx'> 	switch (fp-&gt;ptregs.format) {</div><div class='ctx'> #if defined (CONFIG_M68060)</div><div class='ctx'> 	case 4:				/* 68060 access error */</div><div class='head'>diff --git a/arch/m68k/kernel/vmlinux.lds_no.S b/arch/m68k/kernel/vmlinux-nommu.lds<br/>index 4e2389340837..8e66ccb0935e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/vmlinux.lds_no.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/vmlinux.lds_no.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/vmlinux-nommu.lds?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/vmlinux-nommu.lds</a></div><div class='hunk'>@@ -69,6 +69,7 @@ SECTIONS {</div><div class='ctx'> 		SCHED_TEXT</div><div class='ctx'> 		LOCK_TEXT</div><div class='ctx'> 		*(.text..lock)</div><div class='add'>+		*(.fixup)</div><div class='ctx'> </div><div class='ctx'> 		. = ALIGN(16);          /* Exception table              */</div><div class='ctx'> 		__start___ex_table = .;</div><div class='hunk'>@@ -161,6 +162,13 @@ SECTIONS {</div><div class='ctx'> 		_edata = . ;</div><div class='ctx'> 	} &gt; DATA</div><div class='ctx'> </div><div class='add'>+	.m68k_fixup : {</div><div class='add'>+		__start_fixup = .;</div><div class='add'>+		*(.m68k_fixup)</div><div class='add'>+		__stop_fixup = .;</div><div class='add'>+	} &gt; DATA</div><div class='add'>+	NOTES &gt; DATA</div><div class='add'>+</div><div class='ctx'> 	.init.text : {</div><div class='ctx'> 		. = ALIGN(PAGE_SIZE);</div><div class='ctx'> 		__init_begin = .;</div><div class='head'>diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds<br/>index d0993594f558..63407c836826 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/vmlinux-std.lds?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/vmlinux-std.lds</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/vmlinux-std.lds?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/vmlinux-std.lds</a></div><div class='hunk'>@@ -31,7 +31,9 @@ SECTIONS</div><div class='ctx'> </div><div class='ctx'>   RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE)</div><div class='ctx'> </div><div class='add'>+  _sbss = .;</div><div class='ctx'>   BSS_SECTION(0, 0, 0)</div><div class='add'>+  _ebss = .;</div><div class='ctx'> </div><div class='ctx'>   _edata = .;			/* End of data section */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds<br/>index 8080469ee6c1..ad0f46d64c0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/vmlinux-sun3.lds?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/vmlinux-sun3.lds</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/vmlinux-sun3.lds?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/vmlinux-sun3.lds</a></div><div class='hunk'>@@ -44,7 +44,9 @@ __init_begin = .;</div><div class='ctx'> 	. = ALIGN(PAGE_SIZE);</div><div class='ctx'> 	__init_end = .;</div><div class='ctx'> </div><div class='add'>+  _sbss = .;</div><div class='ctx'>   BSS_SECTION(0, 0, 0)</div><div class='add'>+  _ebss = .;</div><div class='ctx'> </div><div class='ctx'>   _end = . ;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/kernel/vmlinux.lds.S b/arch/m68k/kernel/vmlinux.lds.S<br/>index 030dabf0bc53..69ec79638870 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/vmlinux.lds.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/vmlinux.lds.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -1,5 +1,14 @@</div><div class='del'>-#ifdef CONFIG_MMU</div><div class='del'>-#include "vmlinux.lds_mm.S"</div><div class='add'>+#if defined(CONFIG_MMU) &amp;&amp; !defined(CONFIG_COLDFIRE)</div><div class='add'>+PHDRS</div><div class='add'>+{</div><div class='add'>+  text PT_LOAD FILEHDR PHDRS FLAGS (7);</div><div class='add'>+  data PT_LOAD FLAGS (7);</div><div class='add'>+}</div><div class='add'>+#ifdef CONFIG_SUN3</div><div class='add'>+#include "vmlinux-sun3.lds"</div><div class='ctx'> #else</div><div class='del'>-#include "vmlinux.lds_no.S"</div><div class='add'>+#include "vmlinux-std.lds"</div><div class='add'>+#endif</div><div class='add'>+#else</div><div class='add'>+#include "vmlinux-nommu.lds"</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/m68k/kernel/vmlinux.lds_mm.S b/arch/m68k/kernel/vmlinux.lds_mm.S<br/>deleted file mode 100644<br/>index 99ba315bd0a8..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/vmlinux.lds_mm.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/kernel/vmlinux.lds_mm.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-PHDRS</div><div class='del'>-{</div><div class='del'>-  text PT_LOAD FILEHDR PHDRS FLAGS (7);</div><div class='del'>-  data PT_LOAD FLAGS (7);</div><div class='del'>-}</div><div class='del'>-#ifdef CONFIG_SUN3</div><div class='del'>-#include "vmlinux-sun3.lds"</div><div class='del'>-#else</div><div class='del'>-#include "vmlinux-std.lds"</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile<br/>index 1a1bd9067e90..a9d782d34276 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/lib/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/lib/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/lib/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/lib/Makefile</a></div><div class='hunk'>@@ -6,9 +6,11 @@</div><div class='ctx'> lib-y	:= ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \</div><div class='ctx'> 	   memcpy.o memset.o memmove.o</div><div class='ctx'> </div><div class='del'>-ifdef CONFIG_MMU</div><div class='del'>-lib-y	+= string.o uaccess.o checksum_mm.o</div><div class='del'>-else</div><div class='del'>-lib-y	+= mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o checksum_no.o</div><div class='add'>+lib-$(CONFIG_MMU) += string.o uaccess.o</div><div class='add'>+lib-$(CONFIG_CPU_HAS_NO_MULDIV64) += mulsi3.o divsi3.o udivsi3.o</div><div class='add'>+lib-$(CONFIG_CPU_HAS_NO_MULDIV64) += modsi3.o umodsi3.o</div><div class='add'>+</div><div class='add'>+ifndef CONFIG_GENERIC_CSUM</div><div class='add'>+lib-y	+= checksum.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/lib/checksum_mm.c b/arch/m68k/lib/checksum.c<br/>index 6216f12a756b..6216f12a756b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/lib/checksum_mm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/lib/checksum_mm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/lib/checksum.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/lib/checksum.c</a></div><div class='head'>diff --git a/arch/m68k/lib/checksum_no.c b/arch/m68k/lib/checksum_no.c<br/>deleted file mode 100644<br/>index e4c6354da765..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/lib/checksum_no.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/lib/checksum_no.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,156 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * INET		An implementation of the TCP/IP protocol suite for the LINUX</div><div class='del'>- *		operating system.  INET is implemented using the  BSD Socket</div><div class='del'>- *		interface as the means of communication with the user level.</div><div class='del'>- *</div><div class='del'>- *		IP/TCP/UDP checksumming routines</div><div class='del'>- *</div><div class='del'>- * Authors:	Jorge Cwik, &lt;jorge@laser.satlink.net&gt;</div><div class='del'>- *		Arnt Gulbrandsen, &lt;agulbra@nvg.unit.no&gt;</div><div class='del'>- *		Tom May, &lt;ftom@netcom.com&gt;</div><div class='del'>- *		Andreas Schwab, &lt;schwab@issan.informatik.uni-dortmund.de&gt;</div><div class='del'>- *		Lots of code moved from tcp.c and ip.c; see those files</div><div class='del'>- *		for more names.</div><div class='del'>- *</div><div class='del'>- * 03/02/96	Jes Sorensen, Andreas Schwab, Roman Hodek:</div><div class='del'>- *		Fixed some nasty bugs, causing some horrible crashes.</div><div class='del'>- *		A: At some points, the sum (%0) was used as</div><div class='del'>- *		length-counter instead of the length counter</div><div class='del'>- *		(%1). Thanks to Roman Hodek for pointing this out.</div><div class='del'>- *		B: GCC seems to mess up if one uses too many</div><div class='del'>- *		data-registers to hold input values and one tries to</div><div class='del'>- *		specify d0 and d1 as scratch registers. Letting gcc choose these</div><div class='del'>- *      registers itself solves the problem.</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='del'>-/* Revised by Kenneth Albanowski for m68knommu. Basic problem: unaligned access kills, so most</div><div class='del'>-   of the assembly has to go. */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;net/checksum.h&gt;</div><div class='del'>-</div><div class='del'>-static inline unsigned short from32to16(unsigned long x)</div><div class='del'>-{</div><div class='del'>-	/* add up 16-bit and 16-bit for 16+c bit */</div><div class='del'>-	x = (x &amp; 0xffff) + (x &gt;&gt; 16);</div><div class='del'>-	/* add up carry.. */</div><div class='del'>-	x = (x &amp; 0xffff) + (x &gt;&gt; 16);</div><div class='del'>-	return x;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long do_csum(const unsigned char * buff, int len)</div><div class='del'>-{</div><div class='del'>-	int odd, count;</div><div class='del'>-	unsigned long result = 0;</div><div class='del'>-</div><div class='del'>-	if (len &lt;= 0)</div><div class='del'>-		goto out;</div><div class='del'>-	odd = 1 &amp; (unsigned long) buff;</div><div class='del'>-	if (odd) {</div><div class='del'>-		result = *buff;</div><div class='del'>-		len--;</div><div class='del'>-		buff++;</div><div class='del'>-	}</div><div class='del'>-	count = len &gt;&gt; 1;		/* nr of 16-bit words.. */</div><div class='del'>-	if (count) {</div><div class='del'>-		if (2 &amp; (unsigned long) buff) {</div><div class='del'>-			result += *(unsigned short *) buff;</div><div class='del'>-			count--;</div><div class='del'>-			len -= 2;</div><div class='del'>-			buff += 2;</div><div class='del'>-		}</div><div class='del'>-		count &gt;&gt;= 1;		/* nr of 32-bit words.. */</div><div class='del'>-		if (count) {</div><div class='del'>-		        unsigned long carry = 0;</div><div class='del'>-			do {</div><div class='del'>-				unsigned long w = *(unsigned long *) buff;</div><div class='del'>-				count--;</div><div class='del'>-				buff += 4;</div><div class='del'>-				result += carry;</div><div class='del'>-				result += w;</div><div class='del'>-				carry = (w &gt; result);</div><div class='del'>-			} while (count);</div><div class='del'>-			result += carry;</div><div class='del'>-			result = (result &amp; 0xffff) + (result &gt;&gt; 16);</div><div class='del'>-		}</div><div class='del'>-		if (len &amp; 2) {</div><div class='del'>-			result += *(unsigned short *) buff;</div><div class='del'>-			buff += 2;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (len &amp; 1)</div><div class='del'>-		result += (*buff &lt;&lt; 8);</div><div class='del'>-	result = from32to16(result);</div><div class='del'>-	if (odd)</div><div class='del'>-		result = ((result &gt;&gt; 8) &amp; 0xff) | ((result &amp; 0xff) &lt;&lt; 8);</div><div class='del'>-out:</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COLDFIRE</div><div class='del'>-/*</div><div class='del'>- *	This is a version of ip_compute_csum() optimized for IP headers,</div><div class='del'>- *	which always checksum on 4 octet boundaries.</div><div class='del'>- */</div><div class='del'>-__sum16 ip_fast_csum(const void *iph, unsigned int ihl)</div><div class='del'>-{</div><div class='del'>-	return (__force __sum16)~do_csum(iph,ihl*4);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ip_fast_csum);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * computes the checksum of a memory block at buff, length len,</div><div class='del'>- * and adds in "sum" (32-bit)</div><div class='del'>- *</div><div class='del'>- * returns a 32-bit number suitable for feeding into itself</div><div class='del'>- * or csum_tcpudp_magic</div><div class='del'>- *</div><div class='del'>- * this function must be called with even lengths, except</div><div class='del'>- * for the last fragment, which may be odd</div><div class='del'>- *</div><div class='del'>- * it's best to have buff aligned on a 32-bit boundary</div><div class='del'>- */</div><div class='del'>-__wsum csum_partial(const void *buff, int len, __wsum sum)</div><div class='del'>-{</div><div class='del'>-	unsigned int result = do_csum(buff, len);</div><div class='del'>-</div><div class='del'>-	/* add in old sum, and carry.. */</div><div class='del'>-	result += (__force u32)sum;</div><div class='del'>-	if ((__force u32)sum &gt; result)</div><div class='del'>-		result += 1;</div><div class='del'>-	return (__force __wsum)result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(csum_partial);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * copy from fs while checksumming, otherwise like csum_partial</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-__wsum</div><div class='del'>-csum_partial_copy_from_user(const void __user *src, void *dst,</div><div class='del'>-			    int len, __wsum sum, int *csum_err)</div><div class='del'>-{</div><div class='del'>-	if (csum_err) *csum_err = 0;</div><div class='del'>-	memcpy(dst, (__force const void *)src, len);</div><div class='del'>-	return csum_partial(dst, len, sum);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(csum_partial_copy_from_user);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * copy from ds while checksumming, otherwise like csum_partial</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-__wsum</div><div class='del'>-csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)</div><div class='del'>-{</div><div class='del'>-	memcpy(dst, src, len);</div><div class='del'>-	return csum_partial(dst, len, sum);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(csum_partial_copy_nocheck);</div><div class='head'>diff --git a/arch/m68k/lib/uaccess.c b/arch/m68k/lib/uaccess.c<br/>index 13854ed8cd9a..5664386338da 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/lib/uaccess.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/lib/uaccess.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/lib/uaccess.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/lib/uaccess.c</a></div><div class='hunk'>@@ -15,17 +15,17 @@ unsigned long __generic_copy_from_user(void *to, const void __user *from,</div><div class='ctx'> 	asm volatile ("\n"</div><div class='ctx'> 		"	tst.l	%0\n"</div><div class='ctx'> 		"	jeq	2f\n"</div><div class='del'>-		"1:	moves.l	(%1)+,%3\n"</div><div class='add'>+		"1:	"MOVES".l	(%1)+,%3\n"</div><div class='ctx'> 		"	move.l	%3,(%2)+\n"</div><div class='ctx'> 		"	subq.l	#1,%0\n"</div><div class='ctx'> 		"	jne	1b\n"</div><div class='ctx'> 		"2:	btst	#1,%5\n"</div><div class='ctx'> 		"	jeq	4f\n"</div><div class='del'>-		"3:	moves.w	(%1)+,%3\n"</div><div class='add'>+		"3:	"MOVES".w	(%1)+,%3\n"</div><div class='ctx'> 		"	move.w	%3,(%2)+\n"</div><div class='ctx'> 		"4:	btst	#0,%5\n"</div><div class='ctx'> 		"	jeq	6f\n"</div><div class='del'>-		"5:	moves.b	(%1)+,%3\n"</div><div class='add'>+		"5:	"MOVES".b	(%1)+,%3\n"</div><div class='ctx'> 		"	move.b  %3,(%2)+\n"</div><div class='ctx'> 		"6:\n"</div><div class='ctx'> 		"	.section .fixup,\"ax\"\n"</div><div class='hunk'>@@ -68,17 +68,17 @@ unsigned long __generic_copy_to_user(void __user *to, const void *from,</div><div class='ctx'> 		"	tst.l	%0\n"</div><div class='ctx'> 		"	jeq	4f\n"</div><div class='ctx'> 		"1:	move.l	(%1)+,%3\n"</div><div class='del'>-		"2:	moves.l	%3,(%2)+\n"</div><div class='add'>+		"2:	"MOVES".l	%3,(%2)+\n"</div><div class='ctx'> 		"3:	subq.l	#1,%0\n"</div><div class='ctx'> 		"	jne	1b\n"</div><div class='ctx'> 		"4:	btst	#1,%5\n"</div><div class='ctx'> 		"	jeq	6f\n"</div><div class='ctx'> 		"	move.w	(%1)+,%3\n"</div><div class='del'>-		"5:	moves.w	%3,(%2)+\n"</div><div class='add'>+		"5:	"MOVES".w	%3,(%2)+\n"</div><div class='ctx'> 		"6:	btst	#0,%5\n"</div><div class='ctx'> 		"	jeq	8f\n"</div><div class='ctx'> 		"	move.b	(%1)+,%3\n"</div><div class='del'>-		"7:	moves.b  %3,(%2)+\n"</div><div class='add'>+		"7:	"MOVES".b  %3,(%2)+\n"</div><div class='ctx'> 		"8:\n"</div><div class='ctx'> 		"	.section .fixup,\"ax\"\n"</div><div class='ctx'> 		"	.even\n"</div><div class='hunk'>@@ -115,7 +115,7 @@ long strncpy_from_user(char *dst, const char __user *src, long count)</div><div class='ctx'> 		return count;</div><div class='ctx'> </div><div class='ctx'> 	asm volatile ("\n"</div><div class='del'>-		"1:	moves.b	(%2)+,%4\n"</div><div class='add'>+		"1:	"MOVES".b	(%2)+,%4\n"</div><div class='ctx'> 		"	move.b	%4,(%1)+\n"</div><div class='ctx'> 		"	jeq	2f\n"</div><div class='ctx'> 		"	subq.l	#1,%3\n"</div><div class='hunk'>@@ -152,7 +152,7 @@ long strnlen_user(const char __user *src, long n)</div><div class='ctx'> 	asm volatile ("\n"</div><div class='ctx'> 		"1:	subq.l	#1,%1\n"</div><div class='ctx'> 		"	jmi	3f\n"</div><div class='del'>-		"2:	moves.b	(%0)+,%2\n"</div><div class='add'>+		"2:	"MOVES".b	(%0)+,%2\n"</div><div class='ctx'> 		"	tst.b	%2\n"</div><div class='ctx'> 		"	jne	1b\n"</div><div class='ctx'> 		"	jra	4f\n"</div><div class='hunk'>@@ -188,15 +188,15 @@ unsigned long __clear_user(void __user *to, unsigned long n)</div><div class='ctx'> 	asm volatile ("\n"</div><div class='ctx'> 		"	tst.l	%0\n"</div><div class='ctx'> 		"	jeq	3f\n"</div><div class='del'>-		"1:	moves.l	%2,(%1)+\n"</div><div class='add'>+		"1:	"MOVES".l	%2,(%1)+\n"</div><div class='ctx'> 		"2:	subq.l	#1,%0\n"</div><div class='ctx'> 		"	jne	1b\n"</div><div class='ctx'> 		"3:	btst	#1,%4\n"</div><div class='ctx'> 		"	jeq	5f\n"</div><div class='del'>-		"4:	moves.w	%2,(%1)+\n"</div><div class='add'>+		"4:	"MOVES".w	%2,(%1)+\n"</div><div class='ctx'> 		"5:	btst	#0,%4\n"</div><div class='ctx'> 		"	jeq	7f\n"</div><div class='del'>-		"6:	moves.b	%2,(%1)\n"</div><div class='add'>+		"6:	"MOVES".b	%2,(%1)\n"</div><div class='ctx'> 		"7:\n"</div><div class='ctx'> 		"	.section .fixup,\"ax\"\n"</div><div class='ctx'> 		"	.even\n"</div><div class='head'>diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c<br/>index b403924a1cad..3fe0e43d44f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mac/baboon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mac/baboon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mac/baboon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/mac/baboon.c</a></div><div class='hunk'>@@ -8,13 +8,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> #include &lt;asm/macintosh.h&gt;</div><div class='ctx'> #include &lt;asm/macints.h&gt;</div><div class='ctx'> #include &lt;asm/mac_baboon.h&gt;</div><div class='hunk'>@@ -23,7 +18,6 @@</div><div class='ctx'> </div><div class='ctx'> int baboon_present;</div><div class='ctx'> static volatile struct baboon *baboon;</div><div class='del'>-static unsigned char baboon_disabled;</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='ctx'> extern int macide_ack_intr(struct ata_channel *);</div><div class='hunk'>@@ -89,51 +83,32 @@ static void baboon_irq(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> </div><div class='ctx'> void __init baboon_register_interrupts(void)</div><div class='ctx'> {</div><div class='del'>-	baboon_disabled = 0;</div><div class='ctx'> 	irq_set_chained_handler(IRQ_NUBUS_C, baboon_irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The means for masking individual baboon interrupts remains a mystery, so</div><div class='del'>- * enable the umbrella interrupt only when no baboon interrupt is disabled.</div><div class='add'>+ * The means for masking individual Baboon interrupts remains a mystery.</div><div class='add'>+ * However, since we only use the IDE IRQ, we can just enable/disable all</div><div class='add'>+ * Baboon interrupts. If/when we handle more than one Baboon IRQ, we must</div><div class='add'>+ * either figure out how to mask them individually or else implement the</div><div class='add'>+ * same workaround that's used for NuBus slots (see nubus_disabled and</div><div class='add'>+ * via_nubus_irq_shutdown).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> void baboon_irq_enable(int irq)</div><div class='ctx'> {</div><div class='del'>-	int irq_idx = IRQ_IDX(irq);</div><div class='del'>-</div><div class='ctx'> #ifdef DEBUG_IRQUSE</div><div class='ctx'> 	printk("baboon_irq_enable(%d)\n", irq);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	baboon_disabled &amp;= ~(1 &lt;&lt; irq_idx);</div><div class='del'>-	if (!baboon_disabled)</div><div class='del'>-		mac_irq_enable(irq_get_irq_data(IRQ_NUBUS_C));</div><div class='add'>+	mac_irq_enable(irq_get_irq_data(IRQ_NUBUS_C));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void baboon_irq_disable(int irq)</div><div class='ctx'> {</div><div class='del'>-	int irq_idx = IRQ_IDX(irq);</div><div class='del'>-</div><div class='ctx'> #ifdef DEBUG_IRQUSE</div><div class='ctx'> 	printk("baboon_irq_disable(%d)\n", irq);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	baboon_disabled |= 1 &lt;&lt; irq_idx;</div><div class='del'>-	if (baboon_disabled)</div><div class='del'>-		mac_irq_disable(irq_get_irq_data(IRQ_NUBUS_C));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void baboon_irq_clear(int irq)</div><div class='del'>-{</div><div class='del'>-	int irq_idx = IRQ_IDX(irq);</div><div class='del'>-</div><div class='del'>-	baboon-&gt;mb_ifr &amp;= ~(1 &lt;&lt; irq_idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int baboon_irq_pending(int irq)</div><div class='del'>-{</div><div class='del'>-	int irq_idx = IRQ_IDX(irq);</div><div class='del'>-</div><div class='del'>-	return baboon-&gt;mb_ifr &amp; (1 &lt;&lt; irq_idx);</div><div class='add'>+	mac_irq_disable(irq_get_irq_data(IRQ_NUBUS_C));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c<br/>index c247de02bc7e..f60ff5f59205 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mac/config.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mac/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mac/config.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/mac/config.c</a></div><div class='hunk'>@@ -71,6 +71,31 @@ static void mac_get_model(char *str);</div><div class='ctx'> static void mac_identify(void);</div><div class='ctx'> static void mac_report_hardware(void);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_EARLY_PRINTK</div><div class='add'>+asmlinkage void __init mac_early_print(const char *s, unsigned n);</div><div class='add'>+</div><div class='add'>+static void __init mac_early_cons_write(struct console *con,</div><div class='add'>+                                 const char *s, unsigned n)</div><div class='add'>+{</div><div class='add'>+	mac_early_print(s, n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct console __initdata mac_early_cons = {</div><div class='add'>+	.name  = "early",</div><div class='add'>+	.write = mac_early_cons_write,</div><div class='add'>+	.flags = CON_PRINTBUFFER | CON_BOOT,</div><div class='add'>+	.index = -1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init mac_unregister_early_cons(void)</div><div class='add'>+{</div><div class='add'>+	/* mac_early_print can't be used after init sections are discarded */</div><div class='add'>+	return unregister_console(&amp;mac_early_cons);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+late_initcall(mac_unregister_early_cons);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void __init mac_sched_init(irq_handler_t vector)</div><div class='ctx'> {</div><div class='ctx'> 	via_init_clock(vector);</div><div class='hunk'>@@ -164,6 +189,10 @@ void __init config_mac(void)</div><div class='ctx'> 	mach_beep = mac_mksound;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_EARLY_PRINTK</div><div class='add'>+	register_console(&amp;mac_early_cons);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Determine hardware present</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -192,7 +221,7 @@ void __init config_mac(void)</div><div class='ctx'>  * inaccurate, so look here if a new Mac model won't run. Example: if</div><div class='ctx'>  * a Mac crashes immediately after the VIA1 registers have been dumped</div><div class='ctx'>  * to the screen, it probably died attempting to read DirB on a RBV.</div><div class='del'>- * Meaning it should have MAC_VIA_IIci here :-)</div><div class='add'>+ * Meaning it should have MAC_VIA_IICI here :-)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct mac_model *macintosh_config;</div><div class='hunk'>@@ -267,7 +296,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_IICI,</div><div class='ctx'> 		.name		= "IIci",</div><div class='ctx'> 		.adb_type	= MAC_ADB_II,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -276,7 +305,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_IIFX,</div><div class='ctx'> 		.name		= "IIfx",</div><div class='ctx'> 		.adb_type	= MAC_ADB_IOP,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_IOP,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -285,7 +314,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_IISI,</div><div class='ctx'> 		.name		= "IIsi",</div><div class='ctx'> 		.adb_type	= MAC_ADB_IISI,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -294,7 +323,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_IIVI,</div><div class='ctx'> 		.name		= "IIvi",</div><div class='ctx'> 		.adb_type	= MAC_ADB_IISI,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -303,7 +332,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_IIVX,</div><div class='ctx'> 		.name		= "IIvx",</div><div class='ctx'> 		.adb_type	= MAC_ADB_IISI,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -318,7 +347,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_CLII,</div><div class='ctx'> 		.name		= "Classic II",</div><div class='ctx'> 		.adb_type	= MAC_ADB_IISI,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -327,7 +356,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_CCL,</div><div class='ctx'> 		.name		= "Color Classic",</div><div class='ctx'> 		.adb_type	= MAC_ADB_CUDA,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -336,7 +365,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_CCLII,</div><div class='ctx'> 		.name		= "Color Classic II",</div><div class='ctx'> 		.adb_type	= MAC_ADB_CUDA,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -351,7 +380,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_LC,</div><div class='ctx'> 		.name		= "LC",</div><div class='ctx'> 		.adb_type	= MAC_ADB_IISI,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -360,7 +389,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_LCII,</div><div class='ctx'> 		.name		= "LC II",</div><div class='ctx'> 		.adb_type	= MAC_ADB_IISI,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -369,7 +398,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_LCIII,</div><div class='ctx'> 		.name		= "LC III",</div><div class='ctx'> 		.adb_type	= MAC_ADB_IISI,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -497,7 +526,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_P460,</div><div class='ctx'> 		.name		= "Performa 460",</div><div class='ctx'> 		.adb_type	= MAC_ADB_IISI,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -524,7 +553,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_P520,</div><div class='ctx'> 		.name		= "Performa 520",</div><div class='ctx'> 		.adb_type	= MAC_ADB_CUDA,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -533,7 +562,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_P550,</div><div class='ctx'> 		.name		= "Performa 550",</div><div class='ctx'> 		.adb_type	= MAC_ADB_CUDA,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -565,7 +594,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_TV,</div><div class='ctx'> 		.name		= "TV",</div><div class='ctx'> 		.adb_type	= MAC_ADB_CUDA,</div><div class='del'>-		.via_type	= MAC_VIA_QUADRA,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -574,7 +603,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_P600,</div><div class='ctx'> 		.name		= "Performa 600",</div><div class='ctx'> 		.adb_type	= MAC_ADB_IISI,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_II,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -645,8 +674,8 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.ident		= MAC_MODEL_PB150,</div><div class='ctx'> 		.name		= "PowerBook 150",</div><div class='del'>-		.adb_type	= MAC_ADB_PB1,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.adb_type	= MAC_ADB_PB2,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.ide_type	= MAC_IDE_PB,</div><div class='ctx'> 		.scc_type	= MAC_SCC_QUADRA,</div><div class='hunk'>@@ -732,17 +761,13 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 	 * PowerBook Duos are pretty much like normal PowerBooks</div><div class='ctx'> 	 * All of these probably have onboard SONIC in the Dock which</div><div class='ctx'> 	 * means we'll have to probe for it eventually.</div><div class='del'>-	 *</div><div class='del'>-	 * Are these really MAC_VIA_IIci? The developer notes for the</div><div class='del'>-	 * Duos show pretty much the same custom parts as in most of</div><div class='del'>-	 * the other PowerBooks which would imply MAC_VIA_QUADRA.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='ctx'> 		.ident		= MAC_MODEL_PB210,</div><div class='ctx'> 		.name		= "PowerBook Duo 210",</div><div class='ctx'> 		.adb_type	= MAC_ADB_PB2,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_QUADRA,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -751,7 +776,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_PB230,</div><div class='ctx'> 		.name		= "PowerBook Duo 230",</div><div class='ctx'> 		.adb_type	= MAC_ADB_PB2,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_QUADRA,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -760,7 +785,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_PB250,</div><div class='ctx'> 		.name		= "PowerBook Duo 250",</div><div class='ctx'> 		.adb_type	= MAC_ADB_PB2,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_QUADRA,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -769,7 +794,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_PB270C,</div><div class='ctx'> 		.name		= "PowerBook Duo 270c",</div><div class='ctx'> 		.adb_type	= MAC_ADB_PB2,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_QUADRA,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -778,7 +803,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_PB280,</div><div class='ctx'> 		.name		= "PowerBook Duo 280",</div><div class='ctx'> 		.adb_type	= MAC_ADB_PB2,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_QUADRA,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -787,7 +812,7 @@ static struct mac_model mac_data_table[] = {</div><div class='ctx'> 		.ident		= MAC_MODEL_PB280C,</div><div class='ctx'> 		.name		= "PowerBook Duo 280c",</div><div class='ctx'> 		.adb_type	= MAC_ADB_PB2,</div><div class='del'>-		.via_type	= MAC_VIA_IIci,</div><div class='add'>+		.via_type	= MAC_VIA_IICI,</div><div class='ctx'> 		.scsi_type	= MAC_SCSI_OLD,</div><div class='ctx'> 		.scc_type	= MAC_SCC_QUADRA,</div><div class='ctx'> 		.nubus_type	= MAC_NUBUS,</div><div class='hunk'>@@ -864,8 +889,14 @@ static void __init mac_identify(void)</div><div class='ctx'> 		scc_b_rsrcs[1].start = scc_b_rsrcs[1].end = IRQ_MAC_SCC_B;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		scc_a_rsrcs[1].start = scc_a_rsrcs[1].end = IRQ_MAC_SCC;</div><div class='del'>-		scc_b_rsrcs[1].start = scc_b_rsrcs[1].end = IRQ_MAC_SCC;</div><div class='add'>+		/* On non-PSC machines, the serial ports share an IRQ. */</div><div class='add'>+		if (macintosh_config-&gt;ident == MAC_MODEL_IIFX) {</div><div class='add'>+			scc_a_rsrcs[1].start = scc_a_rsrcs[1].end = IRQ_MAC_SCC;</div><div class='add'>+			scc_b_rsrcs[1].start = scc_b_rsrcs[1].end = IRQ_MAC_SCC;</div><div class='add'>+		} else {</div><div class='add'>+			scc_a_rsrcs[1].start = scc_a_rsrcs[1].end = IRQ_AUTO_4;</div><div class='add'>+			scc_b_rsrcs[1].start = scc_b_rsrcs[1].end = IRQ_AUTO_4;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c<br/>index a5462cc0bfd6..7d8d46127ad9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mac/iop.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mac/iop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mac/iop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/mac/iop.c</a></div><div class='hunk'>@@ -115,7 +115,6 @@</div><div class='ctx'> #include &lt;asm/macintosh.h&gt;</div><div class='ctx'> #include &lt;asm/macints.h&gt;</div><div class='ctx'> #include &lt;asm/mac_iop.h&gt;</div><div class='del'>-#include &lt;asm/mac_oss.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*#define DEBUG_IOP*/</div><div class='ctx'> </div><div class='hunk'>@@ -149,8 +148,6 @@ static struct listener iop_listeners[NUM_IOPS][NUM_IOP_CHAN];</div><div class='ctx'> </div><div class='ctx'> irqreturn_t iop_ism_irq(int, void *);</div><div class='ctx'> </div><div class='del'>-extern void oss_irq_enable(int);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Private access functions</div><div class='ctx'>  */</div><div class='hunk'>@@ -304,11 +301,10 @@ void __init iop_init(void)</div><div class='ctx'> void __init iop_register_interrupts(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (iop_ism_present) {</div><div class='del'>-		if (oss_present) {</div><div class='del'>-			if (request_irq(OSS_IRQLEV_IOPISM, iop_ism_irq, 0,</div><div class='add'>+		if (macintosh_config-&gt;ident == MAC_MODEL_IIFX) {</div><div class='add'>+			if (request_irq(IRQ_MAC_ADB, iop_ism_irq, 0,</div><div class='ctx'> 					"ISM IOP", (void *)IOP_NUM_ISM))</div><div class='ctx'> 				pr_err("Couldn't register ISM IOP interrupt\n");</div><div class='del'>-			oss_irq_enable(IRQ_MAC_ADB);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (request_irq(IRQ_VIA2_0, iop_ism_irq, 0, "ISM IOP",</div><div class='ctx'> 					(void *)IOP_NUM_ISM))</div><div class='head'>diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c<br/>index ba220b70ab8c..5c1a6b2ff0af 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mac/macints.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mac/macints.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mac/macints.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/mac/macints.c</a></div><div class='hunk'>@@ -26,10 +26,6 @@</div><div class='ctx'>  *		  - slot 6: timer 1 (not on IIci)</div><div class='ctx'>  *		  - slot 7: status of IRQ; signals 'any enabled int.'</div><div class='ctx'>  *</div><div class='del'>- *	2	- OSS (IIfx only?)</div><div class='del'>- *		  - slot 0: SCSI interrupt</div><div class='del'>- *		  - slot 1: Sound interrupt</div><div class='del'>- *</div><div class='ctx'>  * Levels 3-6 vary by machine type. For VIA or RBV Macintoshes:</div><div class='ctx'>  *</div><div class='ctx'>  *	3	- unused (?)</div><div class='hunk'>@@ -42,21 +38,30 @@</div><div class='ctx'>  *</div><div class='ctx'>  *	6	- off switch (?)</div><div class='ctx'>  *</div><div class='del'>- * For OSS Macintoshes (IIfx only at this point):</div><div class='add'>+ * Machines with Quadra-like VIA hardware, except PSC and PMU machines, support</div><div class='add'>+ * an alternate interrupt mapping, as used by A/UX. It spreads ethernet and</div><div class='add'>+ * sound out to their own autovector IRQs and gives VIA1 a higher priority:</div><div class='ctx'>  *</div><div class='del'>- *	3	- Nubus interrupt</div><div class='del'>- *		  - slot 0: Slot $9</div><div class='del'>- *		  - slot 1: Slot $A</div><div class='del'>- *		  - slot 2: Slot $B</div><div class='del'>- *		  - slot 3: Slot $C</div><div class='del'>- *		  - slot 4: Slot $D</div><div class='del'>- *		  - slot 5: Slot $E</div><div class='add'>+ *	1	- unused (?)</div><div class='ctx'>  *</div><div class='del'>- *	4	- SCC IOP</div><div class='add'>+ *	3	- on-board SONIC</div><div class='add'>+ *</div><div class='add'>+ *	5	- Apple Sound Chip (ASC)</div><div class='add'>+ *</div><div class='add'>+ *	6	- VIA1</div><div class='add'>+ *</div><div class='add'>+ * For OSS Macintoshes (IIfx only), we apply an interrupt mapping similar to</div><div class='add'>+ * the Quadra (A/UX) mapping:</div><div class='add'>+ *</div><div class='add'>+ *	1	- ISM IOP (ADB)</div><div class='ctx'>  *</div><div class='del'>- *	5	- ISM IOP (ADB?)</div><div class='add'>+ *	2	- SCSI</div><div class='ctx'>  *</div><div class='del'>- *	6	- unused</div><div class='add'>+ *	3	- NuBus</div><div class='add'>+ *</div><div class='add'>+ *	4	- SCC IOP</div><div class='add'>+ *</div><div class='add'>+ *	6	- VIA1</div><div class='ctx'>  *</div><div class='ctx'>  * For PSC Macintoshes (660AV, 840AV):</div><div class='ctx'>  *</div><div class='hunk'>@@ -100,88 +105,29 @@</div><div class='ctx'>  *   case. They're hidden behind the Nubus slot $C interrupt thus adding a</div><div class='ctx'>  *   third layer of indirection. Why oh why did the Apple engineers do that?</div><div class='ctx'>  *</div><div class='del'>- * - We support "fast" and "slow" handlers, just like the Amiga port. The</div><div class='del'>- *   fast handlers are called first and with all interrupts disabled. They</div><div class='del'>- *   are expected to execute quickly (hence the name). The slow handlers are</div><div class='del'>- *   called last with interrupts enabled and the interrupt level restored.</div><div class='del'>- *   They must therefore be reentrant.</div><div class='del'>- *</div><div class='del'>- *   TODO:</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.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/sched.h&gt;</div><div class='del'>-#include &lt;linux/kernel_stat.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt; /* for intr_count */</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> #include &lt;asm/macintosh.h&gt;</div><div class='add'>+#include &lt;asm/macints.h&gt;</div><div class='ctx'> #include &lt;asm/mac_via.h&gt;</div><div class='ctx'> #include &lt;asm/mac_psc.h&gt;</div><div class='add'>+#include &lt;asm/mac_oss.h&gt;</div><div class='add'>+#include &lt;asm/mac_iop.h&gt;</div><div class='add'>+#include &lt;asm/mac_baboon.h&gt;</div><div class='ctx'> #include &lt;asm/hwtest.h&gt;</div><div class='del'>-#include &lt;asm/errno.h&gt;</div><div class='del'>-#include &lt;asm/macints.h&gt;</div><div class='ctx'> #include &lt;asm/irq_regs.h&gt;</div><div class='del'>-#include &lt;asm/mac_oss.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SHUTUP_SONIC</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * VIA/RBV hooks</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-extern void via_register_interrupts(void);</div><div class='del'>-extern void via_irq_enable(int);</div><div class='del'>-extern void via_irq_disable(int);</div><div class='del'>-extern void via_irq_clear(int);</div><div class='del'>-extern int  via_irq_pending(int);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * OSS hooks</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-extern void oss_register_interrupts(void);</div><div class='del'>-extern void oss_irq_enable(int);</div><div class='del'>-extern void oss_irq_disable(int);</div><div class='del'>-extern void oss_irq_clear(int);</div><div class='del'>-extern int  oss_irq_pending(int);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * PSC hooks</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-extern void psc_register_interrupts(void);</div><div class='del'>-extern void psc_irq_enable(int);</div><div class='del'>-extern void psc_irq_disable(int);</div><div class='del'>-extern void psc_irq_clear(int);</div><div class='del'>-extern int  psc_irq_pending(int);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * IOP hooks</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-extern void iop_register_interrupts(void);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Baboon hooks</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-extern int baboon_present;</div><div class='del'>-</div><div class='del'>-extern void baboon_register_interrupts(void);</div><div class='del'>-extern void baboon_irq_enable(int);</div><div class='del'>-extern void baboon_irq_disable(int);</div><div class='del'>-extern void baboon_irq_clear(int);</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * console_loglevel determines NMI handler function</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -190,10 +136,15 @@ irqreturn_t mac_debug_handler(int, void *);</div><div class='ctx'> </div><div class='ctx'> /* #define DEBUG_MACINTS */</div><div class='ctx'> </div><div class='add'>+static unsigned int mac_irq_startup(struct irq_data *);</div><div class='add'>+static void mac_irq_shutdown(struct irq_data *);</div><div class='add'>+</div><div class='ctx'> static struct irq_chip mac_irq_chip = {</div><div class='ctx'> 	.name		= "mac",</div><div class='ctx'> 	.irq_enable	= mac_irq_enable,</div><div class='ctx'> 	.irq_disable	= mac_irq_disable,</div><div class='add'>+	.irq_startup	= mac_irq_startup,</div><div class='add'>+	.irq_shutdown	= mac_irq_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init mac_init_IRQ(void)</div><div class='hunk'>@@ -239,8 +190,6 @@ void __init mac_init_IRQ(void)</div><div class='ctx'> /*</div><div class='ctx'>  *  mac_irq_enable - enable an interrupt source</div><div class='ctx'>  * mac_irq_disable - disable an interrupt source</div><div class='del'>- *   mac_clear_irq - clears a pending interrupt</div><div class='del'>- * mac_irq_pending - returns the pending status of an IRQ (nonzero = pending)</div><div class='ctx'>  *</div><div class='ctx'>  * These routines are just dispatchers to the VIA/OSS/PSC routines.</div><div class='ctx'>  */</div><div class='hunk'>@@ -252,8 +201,6 @@ void mac_irq_enable(struct irq_data *data)</div><div class='ctx'> </div><div class='ctx'> 	switch(irq_src) {</div><div class='ctx'> 	case 1:</div><div class='del'>-		via_irq_enable(irq);</div><div class='del'>-		break;</div><div class='ctx'> 	case 2:</div><div class='ctx'> 	case 7:</div><div class='ctx'> 		if (oss_present)</div><div class='hunk'>@@ -262,6 +209,7 @@ void mac_irq_enable(struct irq_data *data)</div><div class='ctx'> 			via_irq_enable(irq);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='add'>+	case 4:</div><div class='ctx'> 	case 5:</div><div class='ctx'> 	case 6:</div><div class='ctx'> 		if (psc_present)</div><div class='hunk'>@@ -269,10 +217,6 @@ void mac_irq_enable(struct irq_data *data)</div><div class='ctx'> 		else if (oss_present)</div><div class='ctx'> 			oss_irq_enable(irq);</div><div class='ctx'> 		break;</div><div class='del'>-	case 4:</div><div class='del'>-		if (psc_present)</div><div class='del'>-			psc_irq_enable(irq);</div><div class='del'>-		break;</div><div class='ctx'> 	case 8:</div><div class='ctx'> 		if (baboon_present)</div><div class='ctx'> 			baboon_irq_enable(irq);</div><div class='hunk'>@@ -287,8 +231,6 @@ void mac_irq_disable(struct irq_data *data)</div><div class='ctx'> </div><div class='ctx'> 	switch(irq_src) {</div><div class='ctx'> 	case 1:</div><div class='del'>-		via_irq_disable(irq);</div><div class='del'>-		break;</div><div class='ctx'> 	case 2:</div><div class='ctx'> 	case 7:</div><div class='ctx'> 		if (oss_present)</div><div class='hunk'>@@ -297,6 +239,7 @@ void mac_irq_disable(struct irq_data *data)</div><div class='ctx'> 			via_irq_disable(irq);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='add'>+	case 4:</div><div class='ctx'> 	case 5:</div><div class='ctx'> 	case 6:</div><div class='ctx'> 		if (psc_present)</div><div class='hunk'>@@ -304,10 +247,6 @@ void mac_irq_disable(struct irq_data *data)</div><div class='ctx'> 		else if (oss_present)</div><div class='ctx'> 			oss_irq_disable(irq);</div><div class='ctx'> 		break;</div><div class='del'>-	case 4:</div><div class='del'>-		if (psc_present)</div><div class='del'>-			psc_irq_disable(irq);</div><div class='del'>-		break;</div><div class='ctx'> 	case 8:</div><div class='ctx'> 		if (baboon_present)</div><div class='ctx'> 			baboon_irq_disable(irq);</div><div class='hunk'>@@ -315,65 +254,27 @@ void mac_irq_disable(struct irq_data *data)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mac_clear_irq(unsigned int irq)</div><div class='add'>+static unsigned int mac_irq_startup(struct irq_data *data)</div><div class='ctx'> {</div><div class='del'>-	switch(IRQ_SRC(irq)) {</div><div class='del'>-	case 1:</div><div class='del'>-		via_irq_clear(irq);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-	case 7:</div><div class='del'>-		if (oss_present)</div><div class='del'>-			oss_irq_clear(irq);</div><div class='del'>-		else</div><div class='del'>-			via_irq_clear(irq);</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-	case 5:</div><div class='del'>-	case 6:</div><div class='del'>-		if (psc_present)</div><div class='del'>-			psc_irq_clear(irq);</div><div class='del'>-		else if (oss_present)</div><div class='del'>-			oss_irq_clear(irq);</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		if (psc_present)</div><div class='del'>-			psc_irq_clear(irq);</div><div class='del'>-		break;</div><div class='del'>-	case 8:</div><div class='del'>-		if (baboon_present)</div><div class='del'>-			baboon_irq_clear(irq);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	int irq = data-&gt;irq;</div><div class='add'>+</div><div class='add'>+	if (IRQ_SRC(irq) == 7 &amp;&amp; !oss_present)</div><div class='add'>+		via_nubus_irq_startup(irq);</div><div class='add'>+	else</div><div class='add'>+		mac_irq_enable(data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mac_irq_pending(unsigned int irq)</div><div class='add'>+static void mac_irq_shutdown(struct irq_data *data)</div><div class='ctx'> {</div><div class='del'>-	switch(IRQ_SRC(irq)) {</div><div class='del'>-	case 1:</div><div class='del'>-		return via_irq_pending(irq);</div><div class='del'>-	case 2:</div><div class='del'>-	case 7:</div><div class='del'>-		if (oss_present)</div><div class='del'>-			return oss_irq_pending(irq);</div><div class='del'>-		else</div><div class='del'>-			return via_irq_pending(irq);</div><div class='del'>-	case 3:</div><div class='del'>-	case 5:</div><div class='del'>-	case 6:</div><div class='del'>-		if (psc_present)</div><div class='del'>-			return psc_irq_pending(irq);</div><div class='del'>-		else if (oss_present)</div><div class='del'>-			return oss_irq_pending(irq);</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		if (psc_present)</div><div class='del'>-			return psc_irq_pending(irq);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	int irq = data-&gt;irq;</div><div class='add'>+</div><div class='add'>+	if (IRQ_SRC(irq) == 7 &amp;&amp; !oss_present)</div><div class='add'>+		via_nubus_irq_shutdown(irq);</div><div class='add'>+	else</div><div class='add'>+		mac_irq_disable(data);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(mac_irq_pending);</div><div class='ctx'> </div><div class='ctx'> static int num_debug[8];</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c<br/>index a4c82dab9ff1..6c4c882c126e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mac/oss.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mac/oss.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mac/oss.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/mac/oss.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *	OSS handling</div><div class='add'>+ *	Operating System Services (OSS) chip handling</div><div class='ctx'>  *	Written by Joshua M. Thompson (funaho@jurai.org)</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='hunk'>@@ -30,8 +30,6 @@</div><div class='ctx'> int oss_present;</div><div class='ctx'> volatile struct mac_oss *oss;</div><div class='ctx'> </div><div class='del'>-extern void via1_irq(unsigned int irq, struct irq_desc *desc);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Initialize the OSS</div><div class='ctx'>  *</div><div class='hunk'>@@ -51,10 +49,8 @@ void __init oss_init(void)</div><div class='ctx'> 	/* do this by setting the source's interrupt level to zero. */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt;= OSS_NUM_SOURCES; i++) {</div><div class='del'>-		oss-&gt;irq_level[i] = OSS_IRQLEV_DISABLED;</div><div class='add'>+		oss-&gt;irq_level[i] = 0;</div><div class='ctx'> 	}</div><div class='del'>-	/* If we disable VIA1 here, we never really handle it... */</div><div class='del'>-	oss-&gt;irq_level[OSS_VIA1] = OSS_IRQLEV_VIA1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -66,17 +62,13 @@ void __init oss_nubus_init(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Handle miscellaneous OSS interrupts. Right now that's just sound</div><div class='del'>- * and SCSI; everything else is routed to its own autovector IRQ.</div><div class='add'>+ * Handle miscellaneous OSS interrupts.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void oss_irq(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	int events;</div><div class='del'>-</div><div class='del'>-	events = oss-&gt;irq_pending &amp; (OSS_IP_SOUND|OSS_IP_SCSI);</div><div class='del'>-	if (!events)</div><div class='del'>-		return;</div><div class='add'>+	int events = oss-&gt;irq_pending &amp;</div><div class='add'>+	             (OSS_IP_IOPSCC | OSS_IP_SCSI | OSS_IP_IOPISM);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG_IRQS</div><div class='ctx'> 	if ((console_loglevel == 10) &amp;&amp; !(events &amp; OSS_IP_SCSI)) {</div><div class='hunk'>@@ -84,16 +76,20 @@ static void oss_irq(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 			(int) oss-&gt;irq_pending);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	/* FIXME: how do you clear a pending IRQ?    */</div><div class='ctx'> </div><div class='del'>-	if (events &amp; OSS_IP_SOUND) {</div><div class='del'>-		oss-&gt;irq_pending &amp;= ~OSS_IP_SOUND;</div><div class='del'>-		/* FIXME: call sound handler */</div><div class='del'>-	} else if (events &amp; OSS_IP_SCSI) {</div><div class='add'>+	if (events &amp; OSS_IP_IOPSCC) {</div><div class='add'>+		oss-&gt;irq_pending &amp;= ~OSS_IP_IOPSCC;</div><div class='add'>+		generic_handle_irq(IRQ_MAC_SCC);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (events &amp; OSS_IP_SCSI) {</div><div class='ctx'> 		oss-&gt;irq_pending &amp;= ~OSS_IP_SCSI;</div><div class='ctx'> 		generic_handle_irq(IRQ_MAC_SCSI);</div><div class='del'>-	} else {</div><div class='del'>-		/* FIXME: error check here? */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (events &amp; OSS_IP_IOPISM) {</div><div class='add'>+		oss-&gt;irq_pending &amp;= ~OSS_IP_IOPISM;</div><div class='add'>+		generic_handle_irq(IRQ_MAC_ADB);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -132,14 +128,29 @@ static void oss_nubus_irq(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Register the OSS and NuBus interrupt dispatchers.</div><div class='add'>+ *</div><div class='add'>+ * This IRQ mapping is laid out with two things in mind: first, we try to keep</div><div class='add'>+ * things on their own levels to avoid having to do double-dispatches. Second,</div><div class='add'>+ * the levels match as closely as possible the alternate IRQ mapping mode (aka</div><div class='add'>+ * "A/UX mode") available on some VIA machines.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define OSS_IRQLEV_IOPISM    IRQ_AUTO_1</div><div class='add'>+#define OSS_IRQLEV_SCSI      IRQ_AUTO_2</div><div class='add'>+#define OSS_IRQLEV_NUBUS     IRQ_AUTO_3</div><div class='add'>+#define OSS_IRQLEV_IOPSCC    IRQ_AUTO_4</div><div class='add'>+#define OSS_IRQLEV_VIA1      IRQ_AUTO_6</div><div class='add'>+</div><div class='ctx'> void __init oss_register_interrupts(void)</div><div class='ctx'> {</div><div class='del'>-	irq_set_chained_handler(OSS_IRQLEV_SCSI, oss_irq);</div><div class='del'>-	irq_set_chained_handler(OSS_IRQLEV_NUBUS, oss_nubus_irq);</div><div class='del'>-	irq_set_chained_handler(OSS_IRQLEV_SOUND, oss_irq);</div><div class='del'>-	irq_set_chained_handler(OSS_IRQLEV_VIA1, via1_irq);</div><div class='add'>+	irq_set_chained_handler(OSS_IRQLEV_IOPISM, oss_irq);</div><div class='add'>+	irq_set_chained_handler(OSS_IRQLEV_SCSI,   oss_irq);</div><div class='add'>+	irq_set_chained_handler(OSS_IRQLEV_NUBUS,  oss_nubus_irq);</div><div class='add'>+	irq_set_chained_handler(OSS_IRQLEV_IOPSCC, oss_irq);</div><div class='add'>+	irq_set_chained_handler(OSS_IRQLEV_VIA1,   via1_irq);</div><div class='add'>+</div><div class='add'>+	/* OSS_VIA1 gets enabled here because it has no machspec interrupt. */</div><div class='add'>+	oss-&gt;irq_level[OSS_VIA1] = IRQ_AUTO_6;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -158,13 +169,13 @@ void oss_irq_enable(int irq) {</div><div class='ctx'> 	switch(irq) {</div><div class='ctx'> 		case IRQ_MAC_SCC:</div><div class='ctx'> 			oss-&gt;irq_level[OSS_IOPSCC] = OSS_IRQLEV_IOPSCC;</div><div class='del'>-			break;</div><div class='add'>+			return;</div><div class='ctx'> 		case IRQ_MAC_ADB:</div><div class='ctx'> 			oss-&gt;irq_level[OSS_IOPISM] = OSS_IRQLEV_IOPISM;</div><div class='del'>-			break;</div><div class='add'>+			return;</div><div class='ctx'> 		case IRQ_MAC_SCSI:</div><div class='ctx'> 			oss-&gt;irq_level[OSS_SCSI] = OSS_IRQLEV_SCSI;</div><div class='del'>-			break;</div><div class='add'>+			return;</div><div class='ctx'> 		case IRQ_NUBUS_9:</div><div class='ctx'> 		case IRQ_NUBUS_A:</div><div class='ctx'> 		case IRQ_NUBUS_B:</div><div class='hunk'>@@ -173,13 +184,11 @@ void oss_irq_enable(int irq) {</div><div class='ctx'> 		case IRQ_NUBUS_E:</div><div class='ctx'> 			irq -= NUBUS_SOURCE_BASE;</div><div class='ctx'> 			oss-&gt;irq_level[irq] = OSS_IRQLEV_NUBUS;</div><div class='del'>-			break;</div><div class='del'>-#ifdef DEBUG_IRQUSE</div><div class='del'>-		default:</div><div class='del'>-			printk("%s unknown irq %d\n", __func__, irq);</div><div class='del'>-			break;</div><div class='del'>-#endif</div><div class='add'>+			return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (IRQ_SRC(irq) == 1)</div><div class='add'>+		via_irq_enable(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -195,50 +204,14 @@ void oss_irq_disable(int irq) {</div><div class='ctx'> #endif</div><div class='ctx'> 	switch(irq) {</div><div class='ctx'> 		case IRQ_MAC_SCC:</div><div class='del'>-			oss-&gt;irq_level[OSS_IOPSCC] = OSS_IRQLEV_DISABLED;</div><div class='del'>-			break;</div><div class='del'>-		case IRQ_MAC_ADB:</div><div class='del'>-			oss-&gt;irq_level[OSS_IOPISM] = OSS_IRQLEV_DISABLED;</div><div class='del'>-			break;</div><div class='del'>-		case IRQ_MAC_SCSI:</div><div class='del'>-			oss-&gt;irq_level[OSS_SCSI] = OSS_IRQLEV_DISABLED;</div><div class='del'>-			break;</div><div class='del'>-		case IRQ_NUBUS_9:</div><div class='del'>-		case IRQ_NUBUS_A:</div><div class='del'>-		case IRQ_NUBUS_B:</div><div class='del'>-		case IRQ_NUBUS_C:</div><div class='del'>-		case IRQ_NUBUS_D:</div><div class='del'>-		case IRQ_NUBUS_E:</div><div class='del'>-			irq -= NUBUS_SOURCE_BASE;</div><div class='del'>-			oss-&gt;irq_level[irq] = OSS_IRQLEV_DISABLED;</div><div class='del'>-			break;</div><div class='del'>-#ifdef DEBUG_IRQUSE</div><div class='del'>-		default:</div><div class='del'>-			printk("%s unknown irq %d\n", __func__, irq);</div><div class='del'>-			break;</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'>- * Clear an OSS interrupt</div><div class='del'>- *</div><div class='del'>- * Not sure if this works or not but it's the only method I could</div><div class='del'>- * think of based on the contents of the mac_oss structure.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void oss_irq_clear(int irq) {</div><div class='del'>-	/* FIXME: how to do this on OSS? */</div><div class='del'>-	switch(irq) {</div><div class='del'>-		case IRQ_MAC_SCC:</div><div class='del'>-			oss-&gt;irq_pending &amp;= ~OSS_IP_IOPSCC;</div><div class='del'>-			break;</div><div class='add'>+			oss-&gt;irq_level[OSS_IOPSCC] = 0;</div><div class='add'>+			return;</div><div class='ctx'> 		case IRQ_MAC_ADB:</div><div class='del'>-			oss-&gt;irq_pending &amp;= ~OSS_IP_IOPISM;</div><div class='del'>-			break;</div><div class='add'>+			oss-&gt;irq_level[OSS_IOPISM] = 0;</div><div class='add'>+			return;</div><div class='ctx'> 		case IRQ_MAC_SCSI:</div><div class='del'>-			oss-&gt;irq_pending &amp;= ~OSS_IP_SCSI;</div><div class='del'>-			break;</div><div class='add'>+			oss-&gt;irq_level[OSS_SCSI] = 0;</div><div class='add'>+			return;</div><div class='ctx'> 		case IRQ_NUBUS_9:</div><div class='ctx'> 		case IRQ_NUBUS_A:</div><div class='ctx'> 		case IRQ_NUBUS_B:</div><div class='hunk'>@@ -246,36 +219,10 @@ void oss_irq_clear(int irq) {</div><div class='ctx'> 		case IRQ_NUBUS_D:</div><div class='ctx'> 		case IRQ_NUBUS_E:</div><div class='ctx'> 			irq -= NUBUS_SOURCE_BASE;</div><div class='del'>-			oss-&gt;irq_pending &amp;= ~(1 &lt;&lt; irq);</div><div class='del'>-			break;</div><div class='add'>+			oss-&gt;irq_level[irq] = 0;</div><div class='add'>+			return;</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check to see if a specific OSS interrupt is pending</div><div class='del'>- */</div><div class='ctx'> </div><div class='del'>-int oss_irq_pending(int irq)</div><div class='del'>-{</div><div class='del'>-	switch(irq) {</div><div class='del'>-		case IRQ_MAC_SCC:</div><div class='del'>-			return oss-&gt;irq_pending &amp; OSS_IP_IOPSCC;</div><div class='del'>-			break;</div><div class='del'>-		case IRQ_MAC_ADB:</div><div class='del'>-			return oss-&gt;irq_pending &amp; OSS_IP_IOPISM;</div><div class='del'>-			break;</div><div class='del'>-		case IRQ_MAC_SCSI:</div><div class='del'>-			return oss-&gt;irq_pending &amp; OSS_IP_SCSI;</div><div class='del'>-			break;</div><div class='del'>-		case IRQ_NUBUS_9:</div><div class='del'>-		case IRQ_NUBUS_A:</div><div class='del'>-		case IRQ_NUBUS_B:</div><div class='del'>-		case IRQ_NUBUS_C:</div><div class='del'>-		case IRQ_NUBUS_D:</div><div class='del'>-		case IRQ_NUBUS_E:</div><div class='del'>-			irq -= NUBUS_SOURCE_BASE;</div><div class='del'>-			return oss-&gt;irq_pending &amp; (1 &lt;&lt; irq);</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	if (IRQ_SRC(irq) == 1)</div><div class='add'>+		via_irq_disable(irq);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c<br/>index e6c2d20f328d..6f026fc302fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mac/psc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mac/psc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mac/psc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/mac/psc.c</a></div><div class='hunk'>@@ -180,20 +180,3 @@ void psc_irq_disable(int irq) {</div><div class='ctx'> #endif</div><div class='ctx'> 	psc_write_byte(pIER, 1 &lt;&lt; irq_idx);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-void psc_irq_clear(int irq) {</div><div class='del'>-	int irq_src	= IRQ_SRC(irq);</div><div class='del'>-	int irq_idx	= IRQ_IDX(irq);</div><div class='del'>-	int pIFR	= pIERbase + (irq_src &lt;&lt; 4);</div><div class='del'>-</div><div class='del'>-	psc_write_byte(pIFR, 1 &lt;&lt; irq_idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int psc_irq_pending(int irq)</div><div class='del'>-{</div><div class='del'>-	int irq_src	= IRQ_SRC(irq);</div><div class='del'>-	int irq_idx	= IRQ_IDX(irq);</div><div class='del'>-	int pIFR	= pIERbase + (irq_src &lt;&lt; 4);</div><div class='del'>-</div><div class='del'>-	return psc_read_byte(pIFR) &amp; (1 &lt;&lt; irq_idx);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c<br/>index f1600ad26621..2d85662715fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mac/via.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mac/via.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mac/via.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/mac/via.c</a></div><div class='hunk'>@@ -63,24 +63,50 @@ static int gIER,gIFR,gBufA,gBufB;</div><div class='ctx'> #define MAC_CLOCK_LOW		(MAC_CLOCK_TICK&amp;0xFF)</div><div class='ctx'> #define MAC_CLOCK_HIGH		(MAC_CLOCK_TICK&gt;&gt;8)</div><div class='ctx'> </div><div class='del'>-/* To disable a NuBus slot on Quadras we make that slot IRQ line an output set</div><div class='del'>- * high. On RBV we just use the slot interrupt enable register. On Macs with</div><div class='del'>- * genuine VIA chips we must use nubus_disabled to keep track of disabled slot</div><div class='del'>- * interrupts. When any slot IRQ is disabled we mask the (edge triggered) CA1</div><div class='del'>- * or "SLOTS" interrupt. When no slot is disabled, we unmask the CA1 interrupt.</div><div class='del'>- * So, on genuine VIAs, having more than one NuBus IRQ can mean trouble,</div><div class='del'>- * because closing one of those drivers can mask all of the NuBus interrupts.</div><div class='del'>- * Also, since we can't mask the unregistered slot IRQs on genuine VIAs, it's</div><div class='del'>- * possible to get interrupts from cards that MacOS or the ROM has configured</div><div class='del'>- * but we have not. FWIW, "Designing Cards and Drivers for Macintosh II and</div><div class='del'>- * Macintosh SE", page 9-8, says, a slot IRQ with no driver would crash MacOS.</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On Macs with a genuine VIA chip there is no way to mask an individual slot</div><div class='add'>+ * interrupt. This limitation also seems to apply to VIA clone logic cores in</div><div class='add'>+ * Quadra-like ASICs. (RBV and OSS machines don't have this limitation.)</div><div class='add'>+ *</div><div class='add'>+ * We used to fake it by configuring the relevent VIA pin as an output</div><div class='add'>+ * (to mask the interrupt) or input (to unmask). That scheme did not work on</div><div class='add'>+ * (at least) the Quadra 700. A NuBus card's /NMRQ signal is an open-collector</div><div class='add'>+ * circuit (see Designing Cards and Drivers for Macintosh II and Macintosh SE,</div><div class='add'>+ * p. 10-11 etc) but VIA outputs are not (see datasheet).</div><div class='add'>+ *</div><div class='add'>+ * Driving these outputs high must cause the VIA to source current and the</div><div class='add'>+ * card to sink current when it asserts /NMRQ. Current will flow but the pin</div><div class='add'>+ * voltage is uncertain and so the /NMRQ condition may still cause a transition</div><div class='add'>+ * at the VIA2 CA1 input (which explains the lost interrupts). A side effect</div><div class='add'>+ * is that a disabled slot IRQ can never be tested as pending or not.</div><div class='add'>+ *</div><div class='add'>+ * Driving these outputs low doesn't work either. All the slot /NMRQ lines are</div><div class='add'>+ * (active low) OR'd together to generate the CA1 (aka "SLOTS") interrupt (see</div><div class='add'>+ * The Guide To Macintosh Family Hardware, 2nd edition p. 167). If we drive a</div><div class='add'>+ * disabled /NMRQ line low, the falling edge immediately triggers a CA1</div><div class='add'>+ * interrupt and all slot interrupts after that will generate no transition</div><div class='add'>+ * and therefore no interrupt, even after being re-enabled.</div><div class='add'>+ *</div><div class='add'>+ * So we make the VIA port A I/O lines inputs and use nubus_disabled to keep</div><div class='add'>+ * track of their states. When any slot IRQ becomes disabled we mask the CA1</div><div class='add'>+ * umbrella interrupt. Only when all slot IRQs become enabled do we unmask</div><div class='add'>+ * the CA1 interrupt. It must remain enabled even when cards have no interrupt</div><div class='add'>+ * handler registered. Drivers must therefore disable a slot interrupt at the</div><div class='add'>+ * device before they call free_irq (like shared and autovector interrupts).</div><div class='add'>+ *</div><div class='add'>+ * There is also a related problem when MacOS is used to boot Linux. A network</div><div class='add'>+ * card brought up by a MacOS driver may raise an interrupt while Linux boots.</div><div class='add'>+ * This can be fatal since it can't be handled until the right driver loads</div><div class='add'>+ * (if such a driver exists at all). Apparently related to this hardware</div><div class='add'>+ * limitation, "Designing Cards and Drivers", p. 9-8, says that a slot</div><div class='add'>+ * interrupt with no driver would crash MacOS (the book was written before</div><div class='add'>+ * the appearance of Macs with RBV or OSS).</div><div class='ctx'>  */</div><div class='add'>+</div><div class='ctx'> static u8 nubus_disabled;</div><div class='ctx'> </div><div class='ctx'> void via_debug_dump(void);</div><div class='del'>-void via_irq_enable(int irq);</div><div class='del'>-void via_irq_disable(int irq);</div><div class='del'>-void via_irq_clear(int irq);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Initialize the VIAs</div><div class='hunk'>@@ -100,7 +126,7 @@ void __init via_init(void)</div><div class='ctx'> </div><div class='ctx'> 		/* IIci, IIsi, IIvx, IIvi (P6xx), LC series */</div><div class='ctx'> </div><div class='del'>-		case MAC_VIA_IIci:</div><div class='add'>+		case MAC_VIA_IICI:</div><div class='ctx'> 			via1 = (void *) VIA1_BASE;</div><div class='ctx'> 			if (macintosh_config-&gt;ident == MAC_MODEL_IIFX) {</div><div class='ctx'> 				via2 = NULL;</div><div class='hunk'>@@ -197,38 +223,17 @@ void __init via_init(void)</div><div class='ctx'> 	if (oss_present)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* Some machines support an alternate IRQ mapping that spreads  */</div><div class='del'>-	/* Ethernet and Sound out to their own autolevel IRQs and moves */</div><div class='del'>-	/* VIA1 to level 6. A/UX uses this mapping and we do too.  Note */</div><div class='del'>-	/* that the IIfx emulates this alternate mapping using the OSS. */</div><div class='del'>-</div><div class='del'>-	via_alt_mapping = 0;</div><div class='del'>-	if (macintosh_config-&gt;via_type == MAC_VIA_QUADRA)</div><div class='del'>-		switch (macintosh_config-&gt;ident) {</div><div class='del'>-		case MAC_MODEL_C660:</div><div class='del'>-		case MAC_MODEL_Q840:</div><div class='del'>-			/* not applicable */</div><div class='del'>-			break;</div><div class='del'>-		case MAC_MODEL_P588:</div><div class='del'>-		case MAC_MODEL_TV:</div><div class='del'>-		case MAC_MODEL_PB140:</div><div class='del'>-		case MAC_MODEL_PB145:</div><div class='del'>-		case MAC_MODEL_PB160:</div><div class='del'>-		case MAC_MODEL_PB165:</div><div class='del'>-		case MAC_MODEL_PB165C:</div><div class='del'>-		case MAC_MODEL_PB170:</div><div class='del'>-		case MAC_MODEL_PB180:</div><div class='del'>-		case MAC_MODEL_PB180C:</div><div class='del'>-		case MAC_MODEL_PB190:</div><div class='del'>-		case MAC_MODEL_PB520:</div><div class='del'>-			/* not yet tested */</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			via_alt_mapping = 1;</div><div class='del'>-			via1[vDirB] |= 0x40;</div><div class='del'>-			via1[vBufB] &amp;= ~0x40;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	if ((macintosh_config-&gt;via_type == MAC_VIA_QUADRA) &amp;&amp;</div><div class='add'>+	    (macintosh_config-&gt;adb_type != MAC_ADB_PB1) &amp;&amp;</div><div class='add'>+	    (macintosh_config-&gt;adb_type != MAC_ADB_PB2) &amp;&amp;</div><div class='add'>+	    (macintosh_config-&gt;ident    != MAC_MODEL_C660) &amp;&amp;</div><div class='add'>+	    (macintosh_config-&gt;ident    != MAC_MODEL_Q840)) {</div><div class='add'>+		via_alt_mapping = 1;</div><div class='add'>+		via1[vDirB] |= 0x40;</div><div class='add'>+		via1[vBufB] &amp;= ~0x40;</div><div class='add'>+	} else {</div><div class='add'>+		via_alt_mapping = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Now initialize VIA2. For RBV we just kill all interrupts;</div><div class='hunk'>@@ -248,22 +253,28 @@ void __init via_init(void)</div><div class='ctx'> 		via2[vACR] &amp;= ~0x03; /* disable port A &amp; B latches */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Everything below this point is VIA2 only... */</div><div class='add'>+</div><div class='add'>+	if (rbv_present)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * Set vPCR for control line interrupts (but not on RBV)</div><div class='add'>+	 * Set vPCR for control line interrupts.</div><div class='add'>+	 *</div><div class='add'>+	 * CA1 (SLOTS IRQ), CB1 (ASC IRQ): negative edge trigger.</div><div class='add'>+	 *</div><div class='add'>+	 * Macs with ESP SCSI have a negative edge triggered SCSI interrupt.</div><div class='add'>+	 * Testing reveals that PowerBooks do too. However, the SE/30</div><div class='add'>+	 * schematic diagram shows an active high NCR5380 IRQ line.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!rbv_present) {</div><div class='del'>-		/* For all VIA types, CA1 (SLOTS IRQ) and CB1 (ASC IRQ)</div><div class='del'>-		 * are made negative edge triggered here.</div><div class='del'>-		 */</div><div class='del'>-		if (macintosh_config-&gt;scsi_type == MAC_SCSI_OLD) {</div><div class='del'>-			/* CB2 (IRQ) indep. input, positive edge */</div><div class='del'>-			/* CA2 (DRQ) indep. input, positive edge */</div><div class='del'>-			via2[vPCR] = 0x66;</div><div class='del'>-		} else {</div><div class='del'>-			/* CB2 (IRQ) indep. input, negative edge */</div><div class='del'>-			/* CA2 (DRQ) indep. input, negative edge */</div><div class='del'>-			via2[vPCR] = 0x22;</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+	pr_debug("VIA2 vPCR is 0x%02X\n", via2[vPCR]);</div><div class='add'>+	if (macintosh_config-&gt;via_type == MAC_VIA_II) {</div><div class='add'>+		/* CA2 (SCSI DRQ), CB2 (SCSI IRQ): indep. input, pos. edge */</div><div class='add'>+		via2[vPCR] = 0x66;</div><div class='add'>+	} else {</div><div class='add'>+		/* CA2 (SCSI DRQ), CB2 (SCSI IRQ): indep. input, neg. edge */</div><div class='add'>+		via2[vPCR] = 0x22;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -378,34 +389,55 @@ void __init via_nubus_init(void)</div><div class='ctx'> 		via2[gBufB] |= 0x02;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Disable all the slot interrupts (where possible). */</div><div class='add'>+	/*</div><div class='add'>+	 * Disable the slot interrupts. On some hardware that's not possible.</div><div class='add'>+	 * On some hardware it's unclear what all of these I/O lines do.</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	switch (macintosh_config-&gt;via_type) {</div><div class='ctx'> 	case MAC_VIA_II:</div><div class='del'>-		/* Just make the port A lines inputs. */</div><div class='del'>-		switch(macintosh_config-&gt;ident) {</div><div class='del'>-		case MAC_MODEL_II:</div><div class='del'>-		case MAC_MODEL_IIX:</div><div class='del'>-		case MAC_MODEL_IICX:</div><div class='del'>-		case MAC_MODEL_SE30:</div><div class='del'>-			/* The top two bits are RAM size outputs. */</div><div class='del'>-			via2[vDirA] &amp;= 0xC0;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			via2[vDirA] &amp;= 0x80;</div><div class='del'>-		}</div><div class='add'>+	case MAC_VIA_QUADRA:</div><div class='add'>+		pr_debug("VIA2 vDirA is 0x%02X\n", via2[vDirA]);</div><div class='ctx'> 		break;</div><div class='del'>-	case MAC_VIA_IIci:</div><div class='add'>+	case MAC_VIA_IICI:</div><div class='ctx'> 		/* RBV. Disable all the slot interrupts. SIER works like IER. */</div><div class='ctx'> 		via2[rSIER] = 0x7F;</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void via_nubus_irq_startup(int irq)</div><div class='add'>+{</div><div class='add'>+	int irq_idx = IRQ_IDX(irq);</div><div class='add'>+</div><div class='add'>+	switch (macintosh_config-&gt;via_type) {</div><div class='add'>+	case MAC_VIA_II:</div><div class='ctx'> 	case MAC_VIA_QUADRA:</div><div class='del'>-		/* Disable the inactive slot interrupts by making those lines outputs. */</div><div class='del'>-		if ((macintosh_config-&gt;adb_type != MAC_ADB_PB1) &amp;&amp;</div><div class='del'>-		    (macintosh_config-&gt;adb_type != MAC_ADB_PB2)) {</div><div class='del'>-			via2[vBufA] |= 0x7F;</div><div class='del'>-			via2[vDirA] |= 0x7F;</div><div class='add'>+		/* Make the port A line an input. Probably redundant. */</div><div class='add'>+		if (macintosh_config-&gt;via_type == MAC_VIA_II) {</div><div class='add'>+			/* The top two bits are RAM size outputs. */</div><div class='add'>+			via2[vDirA] &amp;= 0xC0 | ~(1 &lt;&lt; irq_idx);</div><div class='add'>+		} else {</div><div class='add'>+			/* Allow NuBus slots 9 through F. */</div><div class='add'>+			via2[vDirA] &amp;= 0x80 | ~(1 &lt;&lt; irq_idx);</div><div class='ctx'> 		}</div><div class='add'>+		/* fall through */</div><div class='add'>+	case MAC_VIA_IICI:</div><div class='add'>+		via_irq_enable(irq);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void via_nubus_irq_shutdown(int irq)</div><div class='add'>+{</div><div class='add'>+	switch (macintosh_config-&gt;via_type) {</div><div class='add'>+	case MAC_VIA_II:</div><div class='add'>+	case MAC_VIA_QUADRA:</div><div class='add'>+		/* Ensure that the umbrella CA1 interrupt remains enabled. */</div><div class='add'>+		via_irq_enable(irq);</div><div class='add'>+		break;</div><div class='add'>+	case MAC_VIA_IICI:</div><div class='add'>+		via_irq_disable(irq);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -531,25 +563,18 @@ void via_irq_enable(int irq) {</div><div class='ctx'> 	} else if (irq_src == 7) {</div><div class='ctx'> 		switch (macintosh_config-&gt;via_type) {</div><div class='ctx'> 		case MAC_VIA_II:</div><div class='add'>+		case MAC_VIA_QUADRA:</div><div class='ctx'> 			nubus_disabled &amp;= ~(1 &lt;&lt; irq_idx);</div><div class='ctx'> 			/* Enable the CA1 interrupt when no slot is disabled. */</div><div class='ctx'> 			if (!nubus_disabled)</div><div class='ctx'> 				via2[gIER] = IER_SET_BIT(1);</div><div class='ctx'> 			break;</div><div class='del'>-		case MAC_VIA_IIci:</div><div class='add'>+		case MAC_VIA_IICI:</div><div class='ctx'> 			/* On RBV, enable the slot interrupt.</div><div class='ctx'> 			 * SIER works like IER.</div><div class='ctx'> 			 */</div><div class='ctx'> 			via2[rSIER] = IER_SET_BIT(irq_idx);</div><div class='ctx'> 			break;</div><div class='del'>-		case MAC_VIA_QUADRA:</div><div class='del'>-			/* Make the port A line an input to enable the slot irq.</div><div class='del'>-			 * But not on PowerBooks, that's ADB.</div><div class='del'>-			 */</div><div class='del'>-			if ((macintosh_config-&gt;adb_type != MAC_ADB_PB1) &amp;&amp;</div><div class='del'>-			    (macintosh_config-&gt;adb_type != MAC_ADB_PB2))</div><div class='del'>-				via2[vDirA] &amp;= ~(1 &lt;&lt; irq_idx);</div><div class='del'>-			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -569,60 +594,18 @@ void via_irq_disable(int irq) {</div><div class='ctx'> 	} else if (irq_src == 7) {</div><div class='ctx'> 		switch (macintosh_config-&gt;via_type) {</div><div class='ctx'> 		case MAC_VIA_II:</div><div class='add'>+		case MAC_VIA_QUADRA:</div><div class='ctx'> 			nubus_disabled |= 1 &lt;&lt; irq_idx;</div><div class='ctx'> 			if (nubus_disabled)</div><div class='ctx'> 				via2[gIER] = IER_CLR_BIT(1);</div><div class='ctx'> 			break;</div><div class='del'>-		case MAC_VIA_IIci:</div><div class='add'>+		case MAC_VIA_IICI:</div><div class='ctx'> 			via2[rSIER] = IER_CLR_BIT(irq_idx);</div><div class='ctx'> 			break;</div><div class='del'>-		case MAC_VIA_QUADRA:</div><div class='del'>-			if ((macintosh_config-&gt;adb_type != MAC_ADB_PB1) &amp;&amp;</div><div class='del'>-			    (macintosh_config-&gt;adb_type != MAC_ADB_PB2))</div><div class='del'>-				via2[vDirA] |= 1 &lt;&lt; irq_idx;</div><div class='del'>-			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void via_irq_clear(int irq) {</div><div class='del'>-	int irq_src	= IRQ_SRC(irq);</div><div class='del'>-	int irq_idx	= IRQ_IDX(irq);</div><div class='del'>-	int irq_bit	= 1 &lt;&lt; irq_idx;</div><div class='del'>-</div><div class='del'>-	if (irq_src == 1) {</div><div class='del'>-		via1[vIFR] = irq_bit;</div><div class='del'>-	} else if (irq_src == 2) {</div><div class='del'>-		via2[gIFR] = irq_bit | rbv_clear;</div><div class='del'>-	} else if (irq_src == 7) {</div><div class='del'>-		/* FIXME: There is no way to clear an individual nubus slot</div><div class='del'>-		 * IRQ flag, other than getting the device to do it.</div><div class='del'>-		 */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Returns nonzero if an interrupt is pending on the given</div><div class='del'>- * VIA/IRQ combination.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int via_irq_pending(int irq)</div><div class='del'>-{</div><div class='del'>-	int irq_src	= IRQ_SRC(irq);</div><div class='del'>-	int irq_idx	= IRQ_IDX(irq);</div><div class='del'>-	int irq_bit	= 1 &lt;&lt; irq_idx;</div><div class='del'>-</div><div class='del'>-	if (irq_src == 1) {</div><div class='del'>-		return via1[vIFR] &amp; irq_bit;</div><div class='del'>-	} else if (irq_src == 2) {</div><div class='del'>-		return via2[gIFR] &amp; irq_bit;</div><div class='del'>-	} else if (irq_src == 7) {</div><div class='del'>-		/* Always 0 for MAC_VIA_QUADRA if the slot irq is disabled. */</div><div class='del'>-		return ~via2[gBufA] &amp; irq_bit;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void via1_set_head(int head)</div><div class='ctx'> {</div><div class='ctx'> 	if (head == 0)</div><div class='hunk'>@@ -631,3 +614,9 @@ void via1_set_head(int head)</div><div class='ctx'> 		via1[vBufA] |= VIA1A_vHeadSel;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(via1_set_head);</div><div class='add'>+</div><div class='add'>+int via2_scsi_drq_pending(void)</div><div class='add'>+{</div><div class='add'>+	return via2[gIFR] &amp; (1 &lt;&lt; IRQ_IDX(IRQ_MAC_SCSIDRQ));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(via2_scsi_drq_pending);</div><div class='head'>diff --git a/arch/m68k/mm/Makefile b/arch/m68k/mm/Makefile<br/>index 09cadf1058d5..cfbf3205724a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mm/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mm/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mm/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/mm/Makefile</a></div><div class='hunk'>@@ -4,6 +4,8 @@</div><div class='ctx'> </div><div class='ctx'> obj-y	:= init.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_MMU)		+= cache.o fault.o hwtest.o</div><div class='del'>-obj-$(CONFIG_MMU_MOTOROLA)	+= kmap.o memory.o motorola.o</div><div class='del'>-obj-$(CONFIG_MMU_SUN3)		+= sun3kmap.o sun3mmu.o</div><div class='add'>+obj-$(CONFIG_MMU)		+= cache.o fault.o</div><div class='add'>+obj-$(CONFIG_MMU_MOTOROLA)	+= kmap.o memory.o motorola.o hwtest.o</div><div class='add'>+obj-$(CONFIG_MMU_SUN3)		+= sun3kmap.o sun3mmu.o hwtest.o</div><div class='add'>+obj-$(CONFIG_MMU_COLDFIRE)	+= kmap.o memory.o mcfmmu.o</div><div class='add'>+</div><div class='head'>diff --git a/arch/m68k/mm/cache.c b/arch/m68k/mm/cache.c<br/>index 5437fff5fe07..95d0bf66e2e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mm/cache.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mm/cache.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mm/cache.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/mm/cache.c</a></div><div class='hunk'>@@ -74,8 +74,16 @@ static unsigned long virt_to_phys_slow(unsigned long vaddr)</div><div class='ctx'> /* RZ: use cpush %bc instead of cpush %dc, cinv %ic */</div><div class='ctx'> void flush_icache_range(unsigned long address, unsigned long endaddr)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	if (CPU_IS_040_OR_060) {</div><div class='add'>+	if (CPU_IS_COLDFIRE) {</div><div class='add'>+		unsigned long start, end;</div><div class='add'>+		start = address &amp; ICACHE_SET_MASK;</div><div class='add'>+		end = endaddr &amp; ICACHE_SET_MASK;</div><div class='add'>+		if (start &gt; end) {</div><div class='add'>+			flush_cf_icache(0, end);</div><div class='add'>+			end = ICACHE_MAX_ADDR;</div><div class='add'>+		}</div><div class='add'>+		flush_cf_icache(start, end);</div><div class='add'>+	} else if (CPU_IS_040_OR_060) {</div><div class='ctx'> 		address &amp;= PAGE_MASK;</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='hunk'>@@ -100,7 +108,17 @@ EXPORT_SYMBOL(flush_icache_range);</div><div class='ctx'> void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,</div><div class='ctx'> 			     unsigned long addr, int len)</div><div class='ctx'> {</div><div class='del'>-	if (CPU_IS_040_OR_060) {</div><div class='add'>+	if (CPU_IS_COLDFIRE) {</div><div class='add'>+		unsigned long start, end;</div><div class='add'>+		start = addr &amp; ICACHE_SET_MASK;</div><div class='add'>+		end = (addr + len) &amp; ICACHE_SET_MASK;</div><div class='add'>+		if (start &gt; end) {</div><div class='add'>+			flush_cf_icache(0, end);</div><div class='add'>+			end = ICACHE_MAX_ADDR;</div><div class='add'>+		}</div><div class='add'>+		flush_cf_icache(start, end);</div><div class='add'>+</div><div class='add'>+	} else if (CPU_IS_040_OR_060) {</div><div class='ctx'> 		asm volatile ("nop\n\t"</div><div class='ctx'> 			      ".chip 68040\n\t"</div><div class='ctx'> 			      "cpushp %%bc,(%0)\n\t"</div><div class='head'>diff --git a/arch/m68k/mm/init_mm.c b/arch/m68k/mm/init_mm.c<br/>index bbe525434ccb..89f3b203814b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mm/init_mm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mm/init_mm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mm/init_mm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/mm/init_mm.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #ifdef CONFIG_ATARI</div><div class='hunk'>@@ -75,6 +76,38 @@ extern void init_pointer_table(unsigned long ptable);</div><div class='ctx'> </div><div class='ctx'> extern pmd_t *zero_pgtable;</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_MMU) &amp;&amp; !defined(CONFIG_COLDFIRE)</div><div class='add'>+#define VECTORS	&amp;vectors[0]</div><div class='add'>+#else</div><div class='add'>+#define VECTORS	_ramvec</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void __init print_memmap(void)</div><div class='add'>+{</div><div class='add'>+#define UL(x) ((unsigned long) (x))</div><div class='add'>+#define MLK(b, t) UL(b), UL(t), (UL(t) - UL(b)) &gt;&gt; 10</div><div class='add'>+#define MLM(b, t) UL(b), UL(t), (UL(t) - UL(b)) &gt;&gt; 20</div><div class='add'>+#define MLK_ROUNDUP(b, t) b, t, DIV_ROUND_UP(((t) - (b)), 1024)</div><div class='add'>+</div><div class='add'>+	pr_notice("Virtual kernel memory layout:\n"</div><div class='add'>+		"    vector  : 0x%08lx - 0x%08lx   (%4ld KiB)\n"</div><div class='add'>+		"    kmap    : 0x%08lx - 0x%08lx   (%4ld MiB)\n"</div><div class='add'>+		"    vmalloc : 0x%08lx - 0x%08lx   (%4ld MiB)\n"</div><div class='add'>+		"    lowmem  : 0x%08lx - 0x%08lx   (%4ld MiB)\n"</div><div class='add'>+		"      .init : 0x%p" " - 0x%p" "   (%4d KiB)\n"</div><div class='add'>+		"      .text : 0x%p" " - 0x%p" "   (%4d KiB)\n"</div><div class='add'>+		"      .data : 0x%p" " - 0x%p" "   (%4d KiB)\n"</div><div class='add'>+		"      .bss  : 0x%p" " - 0x%p" "   (%4d KiB)\n",</div><div class='add'>+		MLK(VECTORS, VECTORS + 256),</div><div class='add'>+		MLM(KMAP_START, KMAP_END),</div><div class='add'>+		MLM(VMALLOC_START, VMALLOC_END),</div><div class='add'>+		MLM(PAGE_OFFSET, (unsigned long)high_memory),</div><div class='add'>+		MLK_ROUNDUP(__init_begin, __init_end),</div><div class='add'>+		MLK_ROUNDUP(_stext, _etext),</div><div class='add'>+		MLK_ROUNDUP(_sdata, _edata),</div><div class='add'>+		MLK_ROUNDUP(_sbss, _ebss));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init mem_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	pg_data_t *pgdat;</div><div class='hunk'>@@ -106,7 +139,7 @@ void __init mem_init(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_SUN3</div><div class='add'>+#if !defined(CONFIG_SUN3) &amp;&amp; !defined(CONFIG_COLDFIRE)</div><div class='ctx'> 	/* insert pointer tables allocated so far into the tablelist */</div><div class='ctx'> 	init_pointer_table((unsigned long)kernel_pg_dir);</div><div class='ctx'> 	for (i = 0; i &lt; PTRS_PER_PGD; i++) {</div><div class='hunk'>@@ -125,6 +158,7 @@ void __init mem_init(void)</div><div class='ctx'> 	       codepages &lt;&lt; (PAGE_SHIFT-10),</div><div class='ctx'> 	       datapages &lt;&lt; (PAGE_SHIFT-10),</div><div class='ctx'> 	       initpages &lt;&lt; (PAGE_SHIFT-10));</div><div class='add'>+	print_memmap();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BLK_DEV_INITRD</div><div class='head'>diff --git a/arch/m68k/mm/kmap.c b/arch/m68k/mm/kmap.c<br/>index 69345849454b..1cc2bed4c3dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mm/kmap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mm/kmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mm/kmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/mm/kmap.c</a></div><div class='hunk'>@@ -171,7 +171,8 @@ void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cachefla</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		physaddr |= (_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_DIRTY);</div><div class='add'>+		physaddr |= (_PAGE_PRESENT | _PAGE_ACCESSED |</div><div class='add'>+			     _PAGE_DIRTY | _PAGE_READWRITE);</div><div class='ctx'> 		switch (cacheflag) {</div><div class='ctx'> 		case IOMAP_NOCACHE_SER:</div><div class='ctx'> 		case IOMAP_NOCACHE_NONSER:</div><div class='head'>diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c<br/>new file mode 100644<br/>index 000000000000..babd5a97cdcb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mm/mcfmmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/mm/mcfmmu.c</a></div><div class='hunk'>@@ -0,0 +1,198 @@</div><div class='add'>+/*</div><div class='add'>+ * Based upon linux/arch/m68k/mm/sun3mmu.c</div><div class='add'>+ * Based upon linux/arch/ppc/mm/mmu_context.c</div><div class='add'>+ *</div><div class='add'>+ * Implementations of mm routines specific to the Coldfire MMU.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Freescale Semiconductor, 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/types.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/bootmem.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/mmu_context.h&gt;</div><div class='add'>+#include &lt;asm/mcf_pgalloc.h&gt;</div><div class='add'>+#include &lt;asm/tlbflush.h&gt;</div><div class='add'>+</div><div class='add'>+#define KMAPAREA(x)	((x &gt;= VMALLOC_START) &amp;&amp; (x &lt; KMAP_END))</div><div class='add'>+</div><div class='add'>+mm_context_t next_mmu_context;</div><div class='add'>+unsigned long context_map[LAST_CONTEXT / BITS_PER_LONG + 1];</div><div class='add'>+atomic_t nr_free_contexts;</div><div class='add'>+struct mm_struct *context_mm[LAST_CONTEXT+1];</div><div class='add'>+extern unsigned long num_pages;</div><div class='add'>+</div><div class='add'>+void free_initmem(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ColdFire paging_init derived from sun3.</div><div class='add'>+ */</div><div class='add'>+void __init paging_init(void)</div><div class='add'>+{</div><div class='add'>+	pgd_t *pg_dir;</div><div class='add'>+	pte_t *pg_table;</div><div class='add'>+	unsigned long address, size;</div><div class='add'>+	unsigned long next_pgtable, bootmem_end;</div><div class='add'>+	unsigned long zones_size[MAX_NR_ZONES];</div><div class='add'>+	enum zone_type zone;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	empty_zero_page = (void *) alloc_bootmem_pages(PAGE_SIZE);</div><div class='add'>+	memset((void *) empty_zero_page, 0, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	pg_dir = swapper_pg_dir;</div><div class='add'>+	memset(swapper_pg_dir, 0, sizeof(swapper_pg_dir));</div><div class='add'>+</div><div class='add'>+	size = num_pages * sizeof(pte_t);</div><div class='add'>+	size = (size + PAGE_SIZE) &amp; ~(PAGE_SIZE-1);</div><div class='add'>+	next_pgtable = (unsigned long) alloc_bootmem_pages(size);</div><div class='add'>+</div><div class='add'>+	bootmem_end = (next_pgtable + size + PAGE_SIZE) &amp; PAGE_MASK;</div><div class='add'>+	pg_dir += PAGE_OFFSET &gt;&gt; PGDIR_SHIFT;</div><div class='add'>+</div><div class='add'>+	address = PAGE_OFFSET;</div><div class='add'>+	while (address &lt; (unsigned long)high_memory) {</div><div class='add'>+		pg_table = (pte_t *) next_pgtable;</div><div class='add'>+		next_pgtable += PTRS_PER_PTE * sizeof(pte_t);</div><div class='add'>+		pgd_val(*pg_dir) = (unsigned long) pg_table;</div><div class='add'>+		pg_dir++;</div><div class='add'>+</div><div class='add'>+		/* now change pg_table to kernel virtual addresses */</div><div class='add'>+		for (i = 0; i &lt; PTRS_PER_PTE; ++i, ++pg_table) {</div><div class='add'>+			pte_t pte = pfn_pte(virt_to_pfn(address), PAGE_INIT);</div><div class='add'>+			if (address &gt;= (unsigned long) high_memory)</div><div class='add'>+				pte_val(pte) = 0;</div><div class='add'>+</div><div class='add'>+			set_pte(pg_table, pte);</div><div class='add'>+			address += PAGE_SIZE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	current-&gt;mm = NULL;</div><div class='add'>+</div><div class='add'>+	for (zone = 0; zone &lt; MAX_NR_ZONES; zone++)</div><div class='add'>+		zones_size[zone] = 0x0;</div><div class='add'>+	zones_size[ZONE_DMA] = num_pages;</div><div class='add'>+	free_area_init(zones_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cf_tlb_miss(struct pt_regs *regs, int write, int dtlb, int extension_word)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags, mmuar;</div><div class='add'>+	struct mm_struct *mm;</div><div class='add'>+	pgd_t *pgd;</div><div class='add'>+	pmd_t *pmd;</div><div class='add'>+	pte_t *pte;</div><div class='add'>+	int asid;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+</div><div class='add'>+	mmuar = (dtlb) ? mmu_read(MMUAR) :</div><div class='add'>+		regs-&gt;pc + (extension_word * sizeof(long));</div><div class='add'>+</div><div class='add'>+	mm = (!user_mode(regs) &amp;&amp; KMAPAREA(mmuar)) ? &amp;init_mm : current-&gt;mm;</div><div class='add'>+	if (!mm) {</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pgd = pgd_offset(mm, mmuar);</div><div class='add'>+	if (pgd_none(*pgd))  {</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pmd = pmd_offset(pgd, mmuar);</div><div class='add'>+	if (pmd_none(*pmd)) {</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pte = (KMAPAREA(mmuar)) ? pte_offset_kernel(pmd, mmuar)</div><div class='add'>+				: pte_offset_map(pmd, mmuar);</div><div class='add'>+	if (pte_none(*pte) || !pte_present(*pte)) {</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (write) {</div><div class='add'>+		if (!pte_write(*pte)) {</div><div class='add'>+			local_irq_restore(flags);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+		set_pte(pte, pte_mkdirty(*pte));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_pte(pte, pte_mkyoung(*pte));</div><div class='add'>+	asid = mm-&gt;context &amp; 0xff;</div><div class='add'>+	if (!pte_dirty(*pte) &amp;&amp; !KMAPAREA(mmuar))</div><div class='add'>+		set_pte(pte, pte_wrprotect(*pte));</div><div class='add'>+</div><div class='add'>+	mmu_write(MMUTR, (mmuar &amp; PAGE_MASK) | (asid &lt;&lt; MMUTR_IDN) |</div><div class='add'>+		(((int)(pte-&gt;pte) &amp; (int)CF_PAGE_MMUTR_MASK)</div><div class='add'>+		&gt;&gt; CF_PAGE_MMUTR_SHIFT) | MMUTR_V);</div><div class='add'>+</div><div class='add'>+	mmu_write(MMUDR, (pte_val(*pte) &amp; PAGE_MASK) |</div><div class='add'>+		((pte-&gt;pte) &amp; CF_PAGE_MMUDR_MASK) | MMUDR_SZ_8KB | MMUDR_X);</div><div class='add'>+</div><div class='add'>+	if (dtlb)</div><div class='add'>+		mmu_write(MMUOR, MMUOR_ACC | MMUOR_UAA);</div><div class='add'>+	else</div><div class='add'>+		mmu_write(MMUOR, MMUOR_ITLB | MMUOR_ACC | MMUOR_UAA);</div><div class='add'>+</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize the context management stuff.</div><div class='add'>+ * The following was taken from arch/ppc/mmu_context.c</div><div class='add'>+ */</div><div class='add'>+void __init mmu_context_init(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Some processors have too few contexts to reserve one for</div><div class='add'>+	 * init_mm, and require using context 0 for a normal task.</div><div class='add'>+	 * Other processors reserve the use of context zero for the kernel.</div><div class='add'>+	 * This code assumes FIRST_CONTEXT &lt; 32.</div><div class='add'>+	 */</div><div class='add'>+	context_map[0] = (1 &lt;&lt; FIRST_CONTEXT) - 1;</div><div class='add'>+	next_mmu_context = FIRST_CONTEXT;</div><div class='add'>+	atomic_set(&amp;nr_free_contexts, LAST_CONTEXT - FIRST_CONTEXT + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Steal a context from a task that has one at the moment.</div><div class='add'>+ * This is only used on 8xx and 4xx and we presently assume that</div><div class='add'>+ * they don't do SMP.  If they do then thicfpgalloc.hs will have to check</div><div class='add'>+ * whether the MM we steal is in use.</div><div class='add'>+ * We also assume that this is only used on systems that don't</div><div class='add'>+ * use an MMU hash table - this is true for 8xx and 4xx.</div><div class='add'>+ * This isn't an LRU system, it just frees up each context in</div><div class='add'>+ * turn (sort-of pseudo-random replacement :).  This would be the</div><div class='add'>+ * place to implement an LRU scheme if anyone was motivated to do it.</div><div class='add'>+ *  -- paulus</div><div class='add'>+ */</div><div class='add'>+void steal_context(void)</div><div class='add'>+{</div><div class='add'>+	struct mm_struct *mm;</div><div class='add'>+	/*</div><div class='add'>+	 * free up context `next_mmu_context'</div><div class='add'>+	 * if we shouldn't free context 0, don't...</div><div class='add'>+	 */</div><div class='add'>+	if (next_mmu_context &lt; FIRST_CONTEXT)</div><div class='add'>+		next_mmu_context = FIRST_CONTEXT;</div><div class='add'>+	mm = context_mm[next_mmu_context];</div><div class='add'>+	flush_tlb_mm(mm);</div><div class='add'>+	destroy_context(mm);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/m68k/mm/memory.c b/arch/m68k/mm/memory.c<br/>index 34c77ce24fba..a5dbb74fe1de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mm/memory.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mm/memory.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mm/memory.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/mm/memory.c</a></div><div class='hunk'>@@ -203,7 +203,9 @@ static inline void pushcl040(unsigned long paddr)</div><div class='ctx'> </div><div class='ctx'> void cache_clear (unsigned long paddr, int len)</div><div class='ctx'> {</div><div class='del'>-    if (CPU_IS_040_OR_060) {</div><div class='add'>+    if (CPU_IS_COLDFIRE) {</div><div class='add'>+	flush_cf_bcache(0, DCACHE_MAX_ADDR);</div><div class='add'>+    } else if (CPU_IS_040_OR_060) {</div><div class='ctx'> 	int tmp;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -250,7 +252,9 @@ EXPORT_SYMBOL(cache_clear);</div><div class='ctx'> </div><div class='ctx'> void cache_push (unsigned long paddr, int len)</div><div class='ctx'> {</div><div class='del'>-    if (CPU_IS_040_OR_060) {</div><div class='add'>+    if (CPU_IS_COLDFIRE) {</div><div class='add'>+	flush_cf_bcache(0, DCACHE_MAX_ADDR);</div><div class='add'>+    } else if (CPU_IS_040_OR_060) {</div><div class='ctx'> 	int tmp = PAGE_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c<br/>index 31a66d99cbca..c3fb3bdd7ed9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mvme16x/config.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/mvme16x/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mvme16x/config.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/mvme16x/config.c</a></div><div class='hunk'>@@ -124,6 +124,163 @@ static void __init mvme16x_init_IRQ (void)</div><div class='ctx'> #define PccSCCMICR	0x1d</div><div class='ctx'> #define PccSCCTICR	0x1e</div><div class='ctx'> #define PccSCCRICR	0x1f</div><div class='add'>+#define PccTPIACKR	0x25</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_EARLY_PRINTK</div><div class='add'>+</div><div class='add'>+/**** cd2401 registers ****/</div><div class='add'>+#define CD2401_ADDR	(0xfff45000)</div><div class='add'>+</div><div class='add'>+#define CyGFRCR         (0x81)</div><div class='add'>+#define CyCCR		(0x13)</div><div class='add'>+#define      CyCLR_CHAN		(0x40)</div><div class='add'>+#define      CyINIT_CHAN	(0x20)</div><div class='add'>+#define      CyCHIP_RESET	(0x10)</div><div class='add'>+#define      CyENB_XMTR		(0x08)</div><div class='add'>+#define      CyDIS_XMTR		(0x04)</div><div class='add'>+#define      CyENB_RCVR		(0x02)</div><div class='add'>+#define      CyDIS_RCVR		(0x01)</div><div class='add'>+#define CyCAR		(0xee)</div><div class='add'>+#define CyIER		(0x11)</div><div class='add'>+#define      CyMdmCh		(0x80)</div><div class='add'>+#define      CyRxExc		(0x20)</div><div class='add'>+#define      CyRxData		(0x08)</div><div class='add'>+#define      CyTxMpty		(0x02)</div><div class='add'>+#define      CyTxRdy		(0x01)</div><div class='add'>+#define CyLICR		(0x26)</div><div class='add'>+#define CyRISR		(0x89)</div><div class='add'>+#define      CyTIMEOUT		(0x80)</div><div class='add'>+#define      CySPECHAR		(0x70)</div><div class='add'>+#define      CyOVERRUN		(0x08)</div><div class='add'>+#define      CyPARITY		(0x04)</div><div class='add'>+#define      CyFRAME		(0x02)</div><div class='add'>+#define      CyBREAK		(0x01)</div><div class='add'>+#define CyREOIR		(0x84)</div><div class='add'>+#define CyTEOIR		(0x85)</div><div class='add'>+#define CyMEOIR		(0x86)</div><div class='add'>+#define      CyNOTRANS		(0x08)</div><div class='add'>+#define CyRFOC		(0x30)</div><div class='add'>+#define CyRDR		(0xf8)</div><div class='add'>+#define CyTDR		(0xf8)</div><div class='add'>+#define CyMISR		(0x8b)</div><div class='add'>+#define CyRISR		(0x89)</div><div class='add'>+#define CyTISR		(0x8a)</div><div class='add'>+#define CyMSVR1		(0xde)</div><div class='add'>+#define CyMSVR2		(0xdf)</div><div class='add'>+#define      CyDSR		(0x80)</div><div class='add'>+#define      CyDCD		(0x40)</div><div class='add'>+#define      CyCTS		(0x20)</div><div class='add'>+#define      CyDTR		(0x02)</div><div class='add'>+#define      CyRTS		(0x01)</div><div class='add'>+#define CyRTPRL		(0x25)</div><div class='add'>+#define CyRTPRH		(0x24)</div><div class='add'>+#define CyCOR1		(0x10)</div><div class='add'>+#define      CyPARITY_NONE	(0x00)</div><div class='add'>+#define      CyPARITY_E		(0x40)</div><div class='add'>+#define      CyPARITY_O		(0xC0)</div><div class='add'>+#define      Cy_5_BITS		(0x04)</div><div class='add'>+#define      Cy_6_BITS		(0x05)</div><div class='add'>+#define      Cy_7_BITS		(0x06)</div><div class='add'>+#define      Cy_8_BITS		(0x07)</div><div class='add'>+#define CyCOR2		(0x17)</div><div class='add'>+#define      CyETC		(0x20)</div><div class='add'>+#define      CyCtsAE		(0x02)</div><div class='add'>+#define CyCOR3		(0x16)</div><div class='add'>+#define      Cy_1_STOP		(0x02)</div><div class='add'>+#define      Cy_2_STOP		(0x04)</div><div class='add'>+#define CyCOR4		(0x15)</div><div class='add'>+#define      CyREC_FIFO		(0x0F)  /* Receive FIFO threshold */</div><div class='add'>+#define CyCOR5		(0x14)</div><div class='add'>+#define CyCOR6		(0x18)</div><div class='add'>+#define CyCOR7		(0x07)</div><div class='add'>+#define CyRBPR		(0xcb)</div><div class='add'>+#define CyRCOR		(0xc8)</div><div class='add'>+#define CyTBPR		(0xc3)</div><div class='add'>+#define CyTCOR		(0xc0)</div><div class='add'>+#define CySCHR1		(0x1f)</div><div class='add'>+#define CySCHR2 	(0x1e)</div><div class='add'>+#define CyTPR		(0xda)</div><div class='add'>+#define CyPILR1		(0xe3)</div><div class='add'>+#define CyPILR2		(0xe0)</div><div class='add'>+#define CyPILR3		(0xe1)</div><div class='add'>+#define CyCMR		(0x1b)</div><div class='add'>+#define      CyASYNC		(0x02)</div><div class='add'>+#define CyLICR          (0x26)</div><div class='add'>+#define CyLIVR          (0x09)</div><div class='add'>+#define CySCRL		(0x23)</div><div class='add'>+#define CySCRH		(0x22)</div><div class='add'>+#define CyTFTC		(0x80)</div><div class='add'>+</div><div class='add'>+static void cons_write(struct console *co, const char *str, unsigned count)</div><div class='add'>+{</div><div class='add'>+	volatile unsigned char *base_addr = (u_char *)CD2401_ADDR;</div><div class='add'>+	volatile u_char sink;</div><div class='add'>+	u_char ier;</div><div class='add'>+	int port;</div><div class='add'>+	u_char do_lf = 0;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	/* Ensure transmitter is enabled! */</div><div class='add'>+</div><div class='add'>+	port = 0;</div><div class='add'>+	base_addr[CyCAR] = (u_char)port;</div><div class='add'>+	while (base_addr[CyCCR])</div><div class='add'>+		;</div><div class='add'>+	base_addr[CyCCR] = CyENB_XMTR;</div><div class='add'>+</div><div class='add'>+	ier = base_addr[CyIER];</div><div class='add'>+	base_addr[CyIER] = CyTxMpty;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		if (pcc2chip[PccSCCTICR] &amp; 0x20)</div><div class='add'>+		{</div><div class='add'>+			/* We have a Tx int. Acknowledge it */</div><div class='add'>+			sink = pcc2chip[PccTPIACKR];</div><div class='add'>+			if ((base_addr[CyLICR] &gt;&gt; 2) == port) {</div><div class='add'>+				if (i == count) {</div><div class='add'>+					/* Last char of string is now output */</div><div class='add'>+					base_addr[CyTEOIR] = CyNOTRANS;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				if (do_lf) {</div><div class='add'>+					base_addr[CyTDR] = '\n';</div><div class='add'>+					str++;</div><div class='add'>+					i++;</div><div class='add'>+					do_lf = 0;</div><div class='add'>+				}</div><div class='add'>+				else if (*str == '\n') {</div><div class='add'>+					base_addr[CyTDR] = '\r';</div><div class='add'>+					do_lf = 1;</div><div class='add'>+				}</div><div class='add'>+				else {</div><div class='add'>+					base_addr[CyTDR] = *str++;</div><div class='add'>+					i++;</div><div class='add'>+				}</div><div class='add'>+				base_addr[CyTEOIR] = 0;</div><div class='add'>+			}</div><div class='add'>+			else</div><div class='add'>+				base_addr[CyTEOIR] = CyNOTRANS;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	base_addr[CyIER] = ier;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct console cons_info =</div><div class='add'>+{</div><div class='add'>+	.name	= "sercon",</div><div class='add'>+	.write	= cons_write,</div><div class='add'>+	.flags	= CON_PRINTBUFFER | CON_BOOT,</div><div class='add'>+	.index	= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init mvme16x_early_console(void)</div><div class='add'>+{</div><div class='add'>+	register_console(&amp;cons_info);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "MVME16x: early console registered\n");</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> void __init config_mvme16x(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -183,6 +340,9 @@ void __init config_mvme16x(void)</div><div class='ctx'> 	pcc2chip[PccSCCMICR] = 0x10;</div><div class='ctx'> 	pcc2chip[PccSCCTICR] = 0x10;</div><div class='ctx'> 	pcc2chip[PccSCCRICR] = 0x10;</div><div class='add'>+#ifdef CONFIG_EARLY_PRINTK</div><div class='add'>+	mvme16x_early_console();</div><div class='add'>+#endif</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/platform/54xx/config.c b/arch/m68k/platform/54xx/config.c<br/>index 78130984db95..ee043540bfa2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/platform/54xx/config.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/54xx/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/platform/54xx/config.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/platform/54xx/config.c</a></div><div class='hunk'>@@ -13,11 +13,17 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/coldfire.h&gt;</div><div class='ctx'> #include &lt;asm/m54xxsim.h&gt;</div><div class='ctx'> #include &lt;asm/mcfuart.h&gt;</div><div class='ctx'> #include &lt;asm/m54xxgpt.h&gt;</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+#include &lt;asm/mmu_context.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -95,8 +101,49 @@ static void mcf54xx_reset(void)</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+</div><div class='add'>+unsigned long num_pages;</div><div class='add'>+</div><div class='add'>+static void __init mcf54xx_bootmem_alloc(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long start_pfn;</div><div class='add'>+	unsigned long memstart;</div><div class='add'>+</div><div class='add'>+	/* _rambase and _ramend will be naturally page aligned */</div><div class='add'>+	m68k_memory[0].addr = _rambase;</div><div class='add'>+	m68k_memory[0].size = _ramend - _rambase;</div><div class='add'>+</div><div class='add'>+	/* compute total pages in system */</div><div class='add'>+	num_pages = (_ramend - _rambase) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	/* page numbers */</div><div class='add'>+	memstart = PAGE_ALIGN(_ramstart);</div><div class='add'>+	min_low_pfn = _rambase &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	start_pfn = memstart &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	max_low_pfn = _ramend &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	high_memory = (void *)_ramend;</div><div class='add'>+</div><div class='add'>+	m68k_virt_to_node_shift = fls(_ramend - _rambase - 1) - 6;</div><div class='add'>+	module_fixup(NULL, __start_fixup, __stop_fixup);</div><div class='add'>+</div><div class='add'>+	/* setup bootmem data */</div><div class='add'>+	m68k_setup_node(0);</div><div class='add'>+	memstart += init_bootmem_node(NODE_DATA(0), start_pfn,</div><div class='add'>+		min_low_pfn, max_low_pfn);</div><div class='add'>+	free_bootmem_node(NODE_DATA(0), memstart, _ramend - memstart);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_MMU */</div><div class='add'>+</div><div class='add'>+/***************************************************************************/</div><div class='add'>+</div><div class='ctx'> void __init config_BSP(char *commandp, int size)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+	mcf54xx_bootmem_alloc();</div><div class='add'>+	mmu_context_init();</div><div class='add'>+#endif</div><div class='ctx'> 	mach_reset = mcf54xx_reset;</div><div class='ctx'> 	m54xx_uarts_init();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m68k/platform/68328/Makefile b/arch/m68k/platform/68328/Makefile<br/>index e4dfd8fde068..ee61bf84d4a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/platform/68328/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/68328/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/platform/68328/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/platform/68328/Makefile</a></div><div class='hunk'>@@ -14,12 +14,8 @@ obj-$(CONFIG_M68328)	+= config.o</div><div class='ctx'> obj-$(CONFIG_ROM)	+= romvec.o</div><div class='ctx'> </div><div class='ctx'> extra-y			:= head.o</div><div class='del'>-extra-$(CONFIG_M68328)	+= bootlogo.rh head.o</div><div class='del'>-</div><div class='del'>-$(obj)/bootlogo.rh: $(src)/bootlogo.h</div><div class='del'>-	perl $(src)/bootlogo.pl &lt; $(src)/bootlogo.h &gt; $(obj)/bootlogo.rh</div><div class='ctx'> </div><div class='ctx'> $(obj)/head.o: $(obj)/$(head-y)</div><div class='ctx'> 	ln -sf $(head-y) $(obj)/head.o</div><div class='ctx'> </div><div class='del'>-clean-files := $(obj)/bootlogo.rh $(obj)/head.o $(head-y)</div><div class='add'>+clean-files := $(obj)/head.o $(head-y)</div><div class='head'>diff --git a/arch/m68k/platform/68328/bootlogo.h b/arch/m68k/platform/68328/bootlogo.h<br/>index 67bc2c17386e..b896c933fafc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/platform/68328/bootlogo.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/68328/bootlogo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/platform/68328/bootlogo.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/platform/68328/bootlogo.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> #define bootlogo_width 160</div><div class='ctx'> #define bootlogo_height 160</div><div class='del'>-static unsigned char bootlogo_bits[] = {</div><div class='add'>+unsigned char __attribute__ ((aligned(16))) bootlogo_bits[] = {</div><div class='ctx'>   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x01, 0x00, 0x00, 0x00,</div><div class='ctx'>   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='ctx'>   0x00, 0x00, 0x40, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='head'>diff --git a/arch/m68k/platform/68328/bootlogo.pl b/arch/m68k/platform/68328/bootlogo.pl<br/>deleted file mode 100644<br/>index b04ae3f50da5..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/platform/68328/bootlogo.pl?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/68328/bootlogo.pl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-</div><div class='del'>-$_ = join("", &lt;&gt;);</div><div class='del'>-</div><div class='del'>-s/(0x[0-9a-f]{2})/sprintf("0x%.2x",ord(pack("b8",unpack("B8",chr(hex($1))))))/gei;</div><div class='del'>-</div><div class='del'>-s/^ /	.byte /gm;</div><div class='del'>-s/[,};]+$//gm;</div><div class='del'>-s/^static.*//gm;</div><div class='del'>-</div><div class='del'>-print $_;</div><div class='head'>diff --git a/arch/m68k/platform/68328/config.c b/arch/m68k/platform/68328/config.c<br/>index a7bd21deb00f..d70bf2623db1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/platform/68328/config.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/68328/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/platform/68328/config.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/platform/68328/config.c</a></div><div class='hunk'>@@ -20,6 +20,9 @@</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/MC68328.h&gt;</div><div class='add'>+#if defined(CONFIG_PILOT) || defined(CONFIG_INIT_LCD)</div><div class='add'>+#include "bootlogo.h"</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/platform/68328/head-pilot.S b/arch/m68k/platform/68328/head-pilot.S<br/>index aecff532b343..2ebfd6420818 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/platform/68328/head-pilot.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/68328/head-pilot.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/platform/68328/head-pilot.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/platform/68328/head-pilot.S</a></div><div class='hunk'>@@ -24,19 +24,7 @@</div><div class='ctx'> .global _ramstart</div><div class='ctx'> .global _ramend</div><div class='ctx'> </div><div class='del'>-.global penguin_bits</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PILOT</div><div class='del'>-</div><div class='del'>-#define IMR 0xFFFFF304</div><div class='del'>-</div><div class='del'>-	.data</div><div class='del'>-	.align 16</div><div class='del'>-</div><div class='del'>-penguin_bits:	</div><div class='del'>-#include "bootlogo.rh"</div><div class='del'>-</div><div class='del'>-#endif</div><div class='add'>+.global bootlogo_bits</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -185,9 +173,6 @@ L3:</div><div class='ctx'> 	moveq	#79, %d7</div><div class='ctx'> 	movel	%d0, _ramend</div><div class='ctx'> </div><div class='del'>-	movel	%a3, %d0</div><div class='del'>-	movel	%d0, rom_length</div><div class='del'>-</div><div class='ctx'> 	pea	0</div><div class='ctx'> 	pea	env</div><div class='ctx'> 	pea	%sp@(4)</div><div class='hunk'>@@ -196,7 +181,7 @@ L3:</div><div class='ctx'> 	DBG_PUTC('H')</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PILOT</div><div class='del'>-	movel	#penguin_bits, 0xFFFFFA00</div><div class='add'>+	movel	#bootlogo_bits, 0xFFFFFA00</div><div class='ctx'> 	moveb	#10, 0xFFFFFA05</div><div class='ctx'> 	movew	#160, 0xFFFFFA08</div><div class='ctx'> 	movew	#160, 0xFFFFFA0A</div><div class='head'>diff --git a/arch/m68k/platform/68328/head-rom.S b/arch/m68k/platform/68328/head-rom.S<br/>index 6ec77d3ea0b3..a5ff96d0295f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/platform/68328/head-rom.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/68328/head-rom.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/platform/68328/head-rom.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/platform/68328/head-rom.S</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> 	.global _ramend</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_INIT_LCD</div><div class='del'>-	.global splash_bits</div><div class='add'>+	.global bootlogo_bits</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	.data</div><div class='hunk'>@@ -29,16 +29,11 @@ _ramend:</div><div class='ctx'> </div><div class='ctx'> #define	RAMEND	(CONFIG_RAMBASE + CONFIG_RAMSIZE)</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_INIT_LCD</div><div class='del'>-splash_bits:</div><div class='del'>-#include "bootlogo.rh"</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='ctx'> 	.text</div><div class='ctx'> _start:</div><div class='ctx'> _stext:	movew	#0x2700,%sr</div><div class='ctx'> #ifdef CONFIG_INIT_LCD</div><div class='del'>-	movel	#splash_bits, 0xfffffA00 /* LSSA */</div><div class='add'>+	movel	#bootlogo_bits, 0xfffffA00 /* LSSA */</div><div class='ctx'> 	moveb	#0x28,   0xfffffA05	/* LVPW */</div><div class='ctx'> 	movew	#0x280,  0xFFFFFa08	/* LXMAX */</div><div class='ctx'> 	movew	#0x1df,  0xFFFFFa0a	/* LYMAX */</div><div class='head'>diff --git a/arch/m68k/platform/coldfire/entry.S b/arch/m68k/platform/coldfire/entry.S<br/>index 3157461a8d1d..863889fc31c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/platform/coldfire/entry.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/coldfire/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/platform/coldfire/entry.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/platform/coldfire/entry.S</a></div><div class='hunk'>@@ -54,7 +54,6 @@ sw_usp:</div><div class='ctx'> .globl ret_from_signal</div><div class='ctx'> .globl sys_call_table</div><div class='ctx'> .globl inthandler</div><div class='del'>-.globl fasthandler</div><div class='ctx'> </div><div class='ctx'> enosys:</div><div class='ctx'> 	mov.l	#sys_ni_syscall,%d3</div><div class='hunk'>@@ -63,6 +62,7 @@ enosys:</div><div class='ctx'> ENTRY(system_call)</div><div class='ctx'> 	SAVE_ALL_SYS</div><div class='ctx'> 	move	#0x2000,%sr		/* enable intrs again */</div><div class='add'>+	GET_CURRENT(%d2)</div><div class='ctx'> </div><div class='ctx'> 	cmpl	#NR_syscalls,%d0</div><div class='ctx'> 	jcc	enosys</div><div class='hunk'>@@ -166,6 +166,7 @@ Lsignal_return:</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(inthandler)</div><div class='ctx'> 	SAVE_ALL_INT</div><div class='add'>+	GET_CURRENT(%d2)</div><div class='ctx'> </div><div class='ctx'> 	movew	%sp@(PT_OFF_FORMATVEC),%d0 /* put exception # in d0 */</div><div class='ctx'> 	andl	#0x03fc,%d0		/* mask out vector only */</div><div class='hunk'>@@ -191,7 +192,9 @@ ENTRY(resume)</div><div class='ctx'> 	movel	%sp,%a0@(TASK_THREAD+THREAD_KSP) /* save kernel stack pointer */</div><div class='ctx'> 	RDUSP					 /* movel %usp,%a3 */</div><div class='ctx'> 	movel	%a3,%a0@(TASK_THREAD+THREAD_USP) /* save thread user stack */</div><div class='del'>-</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+	movel	%a1,%a2				 /* set new current */</div><div class='add'>+#endif</div><div class='ctx'> 	movel	%a1@(TASK_THREAD+THREAD_USP),%a3 /* restore thread user stack */</div><div class='ctx'> 	WRUSP					 /* movel %a3,%usp */</div><div class='ctx'> 	movel	%a1@(TASK_THREAD+THREAD_KSP),%sp /* restore new kernel stack */</div><div class='head'>diff --git a/arch/m68k/platform/coldfire/gpio.c b/arch/m68k/platform/coldfire/gpio.c<br/>index ff0045793450..292a1a5a2d7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/platform/coldfire/gpio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/coldfire/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/platform/coldfire/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/platform/coldfire/gpio.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</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='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/pinmux.h&gt;</div><div class='hunk'>@@ -115,13 +115,14 @@ void mcf_gpio_free(struct gpio_chip *chip, unsigned offset)</div><div class='ctx'> 		mcf_pinmux_release(mcf_chip-&gt;gpio_to_pinmux[offset], 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sysdev_class mcf_gpio_sysclass = {</div><div class='del'>-	.name	= "gpio",</div><div class='add'>+struct bus_type mcf_gpio_subsys = {</div><div class='add'>+	.name		= "gpio",</div><div class='add'>+	.dev_name	= "gpio",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init mcf_gpio_sysinit(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_class_register(&amp;mcf_gpio_sysclass);</div><div class='add'>+	return subsys_system_register(&amp;mcf_gpio_subsys, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> core_initcall(mcf_gpio_sysinit);</div><div class='head'>diff --git a/arch/m68k/platform/coldfire/head.S b/arch/m68k/platform/coldfire/head.S<br/>index c33483824a2e..38f04a3f6207 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/platform/coldfire/head.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/coldfire/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/platform/coldfire/head.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/platform/coldfire/head.S</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *	head.S -- common startup code for ColdFire CPUs.</div><div class='ctx'>  *</div><div class='del'>- *	(C) Copyright 1999-2010, Greg Ungerer &lt;gerg@snapgear.com&gt;.</div><div class='add'>+ *	(C) Copyright 1999-2011, Greg Ungerer &lt;gerg@snapgear.com&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/coldfire.h&gt;</div><div class='ctx'> #include &lt;asm/mcfsim.h&gt;</div><div class='add'>+#include &lt;asm/mcfmmu.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -135,6 +136,14 @@ _init_sp:</div><div class='ctx'> </div><div class='ctx'> __HEAD</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+_start0:</div><div class='add'>+	jmp	_start</div><div class='add'>+.global kernel_pg_dir</div><div class='add'>+.equ	kernel_pg_dir,_start0</div><div class='add'>+.equ	.,_start0+0x1000</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	This is the codes first entry point. This is where it all</div><div class='ctx'>  *	begins...</div><div class='hunk'>@@ -143,6 +152,9 @@ __HEAD</div><div class='ctx'> _start:</div><div class='ctx'> 	nop					/* filler */</div><div class='ctx'> 	movew	#0x2700, %sr			/* no interrupts */</div><div class='add'>+	movel	#CACHE_INIT,%d0			/* disable cache */</div><div class='add'>+	movec	%d0,%CACR</div><div class='add'>+	nop</div><div class='ctx'> #if defined(CONFIG_UBOOT)</div><div class='ctx'> 	movel	%sp,_init_sp			/* save initial stack pointer */</div><div class='ctx'> #endif</div><div class='hunk'>@@ -176,9 +188,6 @@ _start:</div><div class='ctx'> 	 *	it is very similar. Define the exact settings in the headers</div><div class='ctx'> 	 *	then the code here is the same for all.</div><div class='ctx'> 	 */</div><div class='del'>-	movel	#CACHE_INIT,%d0			/* invalidate whole cache */</div><div class='del'>-	movec	%d0,%CACR</div><div class='del'>-	nop</div><div class='ctx'> 	movel	#ACR0_MODE,%d0			/* set RAM region for caching */</div><div class='ctx'> 	movec	%d0,%ACR0</div><div class='ctx'> 	movel	#ACR1_MODE,%d0			/* anything else to cache? */</div><div class='hunk'>@@ -193,6 +202,26 @@ _start:</div><div class='ctx'> 	movec	%d0,%CACR</div><div class='ctx'> 	nop</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+	/*</div><div class='add'>+	 *	Identity mapping for the kernel region.</div><div class='add'>+	 */</div><div class='add'>+	movel	#(MMUBASE+1),%d0		/* enable MMUBAR registers */</div><div class='add'>+	movec	%d0,%MMUBAR</div><div class='add'>+	movel	#MMUOR_CA,%d0			/* clear TLB entries */</div><div class='add'>+	movel	%d0,MMUOR</div><div class='add'>+	movel	#0,%d0				/* set ASID to 0 */</div><div class='add'>+	movec	%d0,%asid</div><div class='add'>+</div><div class='add'>+	movel	#MMUCR_EN,%d0			/* Enable the identity map */</div><div class='add'>+	movel	%d0,MMUCR</div><div class='add'>+	nop					/* sync i-pipeline */</div><div class='add'>+</div><div class='add'>+	movel	#_vstart,%a0			/* jump to "virtual" space */</div><div class='add'>+	jmp	%a0@</div><div class='add'>+_vstart:</div><div class='add'>+#endif /* CONFIG_MMU */</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_ROMFS_FS</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Move ROM filesystem above bss :-)</div><div class='hunk'>@@ -238,6 +267,22 @@ _clear_bss:</div><div class='ctx'> 	lea	init_thread_union,%a0</div><div class='ctx'> 	lea	THREAD_SIZE(%a0),%sp</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+.global m68k_cputype</div><div class='add'>+.global m68k_mmutype</div><div class='add'>+.global m68k_fputype</div><div class='add'>+.global m68k_machtype</div><div class='add'>+	movel	#CPU_COLDFIRE,%d0</div><div class='add'>+	movel	%d0,m68k_cputype		/* Mark us as a ColdFire */</div><div class='add'>+	movel	#MMU_COLDFIRE,%d0</div><div class='add'>+	movel	%d0,m68k_mmutype</div><div class='add'>+	movel	#FPU_COLDFIRE,%d0</div><div class='add'>+	movel	%d0,m68k_fputype</div><div class='add'>+	movel	#MACH_M54XX,%d0</div><div class='add'>+	movel	%d0,m68k_machtype		/* Mark us as a 54xx machine */</div><div class='add'>+	lea	init_task,%a2			/* Set "current" init task */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Assember start up done, start code proper.</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/arch/m68k/platform/coldfire/sltimers.c b/arch/m68k/platform/coldfire/sltimers.c<br/>index b7f822b552bb..54e1452f853a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/platform/coldfire/sltimers.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/m68k/platform/coldfire/sltimers.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/platform/coldfire/sltimers.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/m68k/platform/coldfire/sltimers.c</a></div><div class='hunk'>@@ -98,16 +98,19 @@ static struct irqaction mcfslt_timer_irq = {</div><div class='ctx'> static cycle_t mcfslt_read_clk(struct clocksource *cs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	u32 cycles;</div><div class='del'>-	u16 scnt;</div><div class='add'>+	u32 cycles, scnt;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	scnt = __raw_readl(TA(MCFSLT_SCNT));</div><div class='ctx'> 	cycles = mcfslt_cnt;</div><div class='add'>+	if (__raw_readl(TA(MCFSLT_SSR)) &amp; MCFSLT_SSR_TE) {</div><div class='add'>+		cycles += mcfslt_cycles_per_jiffy;</div><div class='add'>+		scnt = __raw_readl(TA(MCFSLT_SCNT));</div><div class='add'>+	}</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> </div><div class='ctx'> 	/* subtract because slice timers count down */</div><div class='del'>-	return cycles - scnt;</div><div class='add'>+	return cycles + ((mcfslt_cycles_per_jiffy - 1) - scnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct clocksource mcfslt_clk = {</div><div class='head'>diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig<br/>index e446bab2427b..74f23a460ba2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/Kconfig</a></div><div class='hunk'>@@ -17,6 +17,8 @@ config MICROBLAZE</div><div class='ctx'> 	select HAVE_GENERIC_HARDIRQS</div><div class='ctx'> 	select GENERIC_IRQ_PROBE</div><div class='ctx'> 	select GENERIC_IRQ_SHOW</div><div class='add'>+	select GENERIC_PCI_IOMAP</div><div class='add'>+	select GENERIC_CPU_DEVICES</div><div class='ctx'> </div><div class='ctx'> config SWAP</div><div class='ctx'> 	def_bool n</div><div class='head'>diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile<br/>index 4c4e58ef0cb6..0c796cf81586 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/boot/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/boot/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/boot/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/boot/Makefile</a></div><div class='hunk'>@@ -53,6 +53,6 @@ $(obj)/simpleImage.%: vmlinux FORCE</div><div class='ctx'> DTC_FLAGS := -p 1024</div><div class='ctx'> </div><div class='ctx'> $(obj)/%.dtb: $(src)/dts/%.dts FORCE</div><div class='del'>-	$(call cmd,dtc)</div><div class='add'>+	$(call if_changed_dep,dtc)</div><div class='ctx'> </div><div class='ctx'> clean-files += *.dtb simpleImage.*.unstrip linux.bin.ub</div><div class='head'>diff --git a/arch/microblaze/include/asm/irq.h b/arch/microblaze/include/asm/irq.h<br/>index cc54187f3d38..a175132e4496 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/include/asm/irq.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/include/asm/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/include/asm/irq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/include/asm/irq.h</a></div><div class='hunk'>@@ -9,7 +9,14 @@</div><div class='ctx'> #ifndef _ASM_MICROBLAZE_IRQ_H</div><div class='ctx'> #define _ASM_MICROBLAZE_IRQ_H</div><div class='ctx'> </div><div class='del'>-#define NR_IRQS 32</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Linux IRQ# is currently offset by one to map to the hardware</div><div class='add'>+ * irq number. So hardware IRQ0 maps to Linux irq 1.</div><div class='add'>+ */</div><div class='add'>+#define NO_IRQ_OFFSET	1</div><div class='add'>+#define IRQ_OFFSET	NO_IRQ_OFFSET</div><div class='add'>+#define NR_IRQS		(32 + IRQ_OFFSET)</div><div class='ctx'> #include &lt;asm-generic/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* This type is the placeholder for a hardware interrupt number. It has to</div><div class='hunk'>@@ -20,8 +27,6 @@ typedef unsigned long irq_hw_number_t;</div><div class='ctx'> </div><div class='ctx'> extern unsigned int nr_irq;</div><div class='ctx'> </div><div class='del'>-#define NO_IRQ (-1)</div><div class='del'>-</div><div class='ctx'> struct pt_regs;</div><div class='ctx'> extern void do_IRQ(struct pt_regs *regs);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/microblaze/include/asm/page.h b/arch/microblaze/include/asm/page.h<br/>index ed9d0f6e2cdb..a25e6b5e2ad4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/include/asm/page.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/include/asm/page.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/include/asm/page.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/include/asm/page.h</a></div><div class='hunk'>@@ -174,15 +174,8 @@ extern int page_is_ram(unsigned long pfn);</div><div class='ctx'> </div><div class='ctx'> #define	virt_addr_valid(vaddr)	(pfn_valid(virt_to_pfn(vaddr)))</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#  ifndef CONFIG_MMU</div><div class='del'>-#  define __pa(vaddr)	((unsigned long) (vaddr))</div><div class='del'>-#  define __va(paddr)	((void *) (paddr))</div><div class='del'>-#  else /* CONFIG_MMU */</div><div class='del'>-#  define __pa(x)	__virt_to_phys((unsigned long)(x))</div><div class='del'>-#  define __va(x)	((void *)__phys_to_virt((unsigned long)(x)))</div><div class='del'>-#  endif /* CONFIG_MMU */</div><div class='del'>-</div><div class='add'>+# define __pa(x)	__virt_to_phys((unsigned long)(x))</div><div class='add'>+# define __va(x)	((void *)__phys_to_virt((unsigned long)(x)))</div><div class='ctx'> </div><div class='ctx'> /* Convert between virtual and physical address for MMU. */</div><div class='ctx'> /* Handle MicroBlaze processor with virtual memory. */</div><div class='head'>diff --git a/arch/microblaze/include/asm/pci-bridge.h b/arch/microblaze/include/asm/pci-bridge.h<br/>index 32764cd077c6..e9834b2991d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/include/asm/pci-bridge.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/include/asm/pci-bridge.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/include/asm/pci-bridge.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/include/asm/pci-bridge.h</a></div><div class='hunk'>@@ -140,7 +140,6 @@ extern void pci_process_bridge_OF_ranges(struct pci_controller *hose,</div><div class='ctx'> /* Allocate &amp; free a PCI host bridge structure */</div><div class='ctx'> extern struct pci_controller *pcibios_alloc_controller(struct device_node *dev);</div><div class='ctx'> extern void pcibios_free_controller(struct pci_controller *phb);</div><div class='del'>-extern void pcibios_setup_phb_resources(struct pci_controller *hose);</div><div class='ctx'> </div><div class='ctx'> #endif	/* __KERNEL__ */</div><div class='ctx'> #endif	/* _ASM_MICROBLAZE_PCI_BRIDGE_H */</div><div class='head'>diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h<br/>index 1dd9d6b1e275..033137628e8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/include/asm/pci.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/include/asm/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/include/asm/pci.h</a></div><div class='hunk'>@@ -42,11 +42,6 @@ struct pci_dev;</div><div class='ctx'>  */</div><div class='ctx'> #define pcibios_assign_all_busses()	0</div><div class='ctx'> </div><div class='del'>-static inline void pcibios_set_master(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	/* No special bus mastering setup handling */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void pcibios_penalize_isa_irq(int irq, int active)</div><div class='ctx'> {</div><div class='ctx'> 	/* We don't do dynamic PCI IRQ allocation */</div><div class='head'>diff --git a/arch/microblaze/include/asm/ptrace.h b/arch/microblaze/include/asm/ptrace.h<br/>index 816bee64b196..94e92c805859 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/include/asm/ptrace.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/include/asm/ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/include/asm/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/include/asm/ptrace.h</a></div><div class='hunk'>@@ -61,6 +61,11 @@ struct pt_regs {</div><div class='ctx'> #define instruction_pointer(regs)	((regs)-&gt;pc)</div><div class='ctx'> #define profile_pc(regs)		instruction_pointer(regs)</div><div class='ctx'> </div><div class='add'>+static inline long regs_return_value(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return regs-&gt;r3;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else /* __KERNEL__ */</div><div class='ctx'> </div><div class='ctx'> /* pt_regs offsets used by gdbserver etc in ptrace syscalls */</div><div class='head'>diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h<br/>index 904e5ef6a11b..6c72ed7eba98 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/include/asm/setup.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/include/asm/setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/include/asm/setup.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/include/asm/setup.h</a></div><div class='hunk'>@@ -26,12 +26,6 @@ int setup_early_printk(char *opt);</div><div class='ctx'> void remap_early_printk(void);</div><div class='ctx'> void disable_early_printk(void);</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_EARLY_PRINTK)</div><div class='del'>-#define eprintk early_printk</div><div class='del'>-#else</div><div class='del'>-#define eprintk printk</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> void heartbeat(void);</div><div class='ctx'> void setup_heartbeat(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/microblaze/include/asm/thread_info.h b/arch/microblaze/include/asm/thread_info.h<br/>index b73da2ac21b3..1a8ab6a5c03f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/include/asm/thread_info.h</a></div><div class='hunk'>@@ -125,7 +125,6 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define TIF_MEMDIE		6	/* is terminating due to OOM killer */</div><div class='ctx'> #define TIF_SYSCALL_AUDIT	9       /* syscall auditing active */</div><div class='ctx'> #define TIF_SECCOMP		10      /* secure computing */</div><div class='del'>-#define TIF_FREEZE		14	/* Freezing for suspend */</div><div class='ctx'> </div><div class='ctx'> /* true if poll_idle() is polling TIF_NEED_RESCHED */</div><div class='ctx'> #define TIF_POLLING_NRFLAG	16</div><div class='hunk'>@@ -137,7 +136,6 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define _TIF_SINGLESTEP		(1 &lt;&lt; TIF_SINGLESTEP)</div><div class='ctx'> #define _TIF_IRET		(1 &lt;&lt; TIF_IRET)</div><div class='ctx'> #define _TIF_POLLING_NRFLAG	(1 &lt;&lt; TIF_POLLING_NRFLAG)</div><div class='del'>-#define _TIF_FREEZE		(1 &lt;&lt; TIF_FREEZE)</div><div class='ctx'> #define _TIF_SYSCALL_AUDIT	(1 &lt;&lt; TIF_SYSCALL_AUDIT)</div><div class='ctx'> #define _TIF_SECCOMP		(1 &lt;&lt; TIF_SECCOMP)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h<br/>index 7d7092b917ac..d20ffbc86beb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/include/asm/unistd.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/include/asm/unistd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/include/asm/unistd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/include/asm/unistd.h</a></div><div class='hunk'>@@ -391,8 +391,11 @@</div><div class='ctx'> #define __NR_clock_adjtime	373</div><div class='ctx'> #define __NR_syncfs		374</div><div class='ctx'> #define __NR_setns		375</div><div class='add'>+#define __NR_sendmmsg		376</div><div class='add'>+#define __NR_process_vm_readv	377</div><div class='add'>+#define __NR_process_vm_writev	378</div><div class='ctx'> </div><div class='del'>-#define __NR_syscalls		376</div><div class='add'>+#define __NR_syscalls		379</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='head'>diff --git a/arch/microblaze/kernel/early_printk.c b/arch/microblaze/kernel/early_printk.c<br/>index d26d92d47754..8356e47631c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/early_printk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/early_printk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/early_printk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/kernel/early_printk.c</a></div><div class='hunk'>@@ -50,9 +50,9 @@ static void early_printk_uartlite_write(struct console *unused,</div><div class='ctx'> 					const char *s, unsigned n)</div><div class='ctx'> {</div><div class='ctx'> 	while (*s &amp;&amp; n-- &gt; 0) {</div><div class='del'>-		early_printk_uartlite_putc(*s);</div><div class='ctx'> 		if (*s == '\n')</div><div class='ctx'> 			early_printk_uartlite_putc('\r');</div><div class='add'>+		early_printk_uartlite_putc(*s);</div><div class='ctx'> 		s++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -94,9 +94,9 @@ static void early_printk_uart16550_write(struct console *unused,</div><div class='ctx'> 					const char *s, unsigned n)</div><div class='ctx'> {</div><div class='ctx'> 	while (*s &amp;&amp; n-- &gt; 0) {</div><div class='del'>-		early_printk_uart16550_putc(*s);</div><div class='ctx'> 		if (*s == '\n')</div><div class='ctx'> 			early_printk_uart16550_putc('\r');</div><div class='add'>+		early_printk_uart16550_putc(*s);</div><div class='ctx'> 		s++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S<br/>index ca15bc5c7449..66e34a3bfe1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/entry.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/entry.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/kernel/entry.S</a></div><div class='hunk'>@@ -468,7 +468,7 @@ C_ENTRY(sys_fork_wrapper):</div><div class='ctx'> 	addi	r5, r0, SIGCHLD			/* Arg 0: flags */</div><div class='ctx'> 	lwi	r6, r1, PT_R1	/* Arg 1: child SP (use parent's) */</div><div class='ctx'> 	addik	r7, r1, 0			/* Arg 2: parent context */</div><div class='del'>-	add	r8. r0, r0			/* Arg 3: (unused) */</div><div class='add'>+	add	r8, r0, r0			/* Arg 3: (unused) */</div><div class='ctx'> 	add	r9, r0, r0;			/* Arg 4: (unused) */</div><div class='ctx'> 	brid	do_fork		/* Do real work (tail-call) */</div><div class='ctx'> 	add	r10, r0, r0;			/* Arg 5: (unused) */</div><div class='head'>diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c<br/>index eb41441c7fd0..44b177e2ab12 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/intc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/intc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/intc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/kernel/intc.c</a></div><div class='hunk'>@@ -42,8 +42,9 @@ unsigned int nr_irq;</div><div class='ctx'> </div><div class='ctx'> static void intc_enable_or_unmask(struct irq_data *d)</div><div class='ctx'> {</div><div class='del'>-	unsigned long mask = 1 &lt;&lt; d-&gt;irq;</div><div class='del'>-	pr_debug("enable_or_unmask: %d\n", d-&gt;irq);</div><div class='add'>+	unsigned long mask = 1 &lt;&lt; d-&gt;hwirq;</div><div class='add'>+</div><div class='add'>+	pr_debug("enable_or_unmask: %ld\n", d-&gt;hwirq);</div><div class='ctx'> 	out_be32(INTC_BASE + SIE, mask);</div><div class='ctx'> </div><div class='ctx'> 	/* ack level irqs because they can't be acked during</div><div class='hunk'>@@ -56,20 +57,21 @@ static void intc_enable_or_unmask(struct irq_data *d)</div><div class='ctx'> </div><div class='ctx'> static void intc_disable_or_mask(struct irq_data *d)</div><div class='ctx'> {</div><div class='del'>-	pr_debug("disable: %d\n", d-&gt;irq);</div><div class='del'>-	out_be32(INTC_BASE + CIE, 1 &lt;&lt; d-&gt;irq);</div><div class='add'>+	pr_debug("disable: %ld\n", d-&gt;hwirq);</div><div class='add'>+	out_be32(INTC_BASE + CIE, 1 &lt;&lt; d-&gt;hwirq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void intc_ack(struct irq_data *d)</div><div class='ctx'> {</div><div class='del'>-	pr_debug("ack: %d\n", d-&gt;irq);</div><div class='del'>-	out_be32(INTC_BASE + IAR, 1 &lt;&lt; d-&gt;irq);</div><div class='add'>+	pr_debug("ack: %ld\n", d-&gt;hwirq);</div><div class='add'>+	out_be32(INTC_BASE + IAR, 1 &lt;&lt; d-&gt;hwirq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void intc_mask_ack(struct irq_data *d)</div><div class='ctx'> {</div><div class='del'>-	unsigned long mask = 1 &lt;&lt; d-&gt;irq;</div><div class='del'>-	pr_debug("disable_and_ack: %d\n", d-&gt;irq);</div><div class='add'>+	unsigned long mask = 1 &lt;&lt; d-&gt;hwirq;</div><div class='add'>+</div><div class='add'>+	pr_debug("disable_and_ack: %ld\n", d-&gt;hwirq);</div><div class='ctx'> 	out_be32(INTC_BASE + CIE, mask);</div><div class='ctx'> 	out_be32(INTC_BASE + IAR, mask);</div><div class='ctx'> }</div><div class='hunk'>@@ -91,7 +93,7 @@ unsigned int get_irq(struct pt_regs *regs)</div><div class='ctx'> 	 * order to handle multiple interrupt controllers. It currently</div><div class='ctx'> 	 * is hardcoded to check for interrupts only on the first INTC.</div><div class='ctx'> 	 */</div><div class='del'>-	irq = in_be32(INTC_BASE + IVR);</div><div class='add'>+	irq = in_be32(INTC_BASE + IVR) + NO_IRQ_OFFSET;</div><div class='ctx'> 	pr_debug("get_irq: %d\n", irq);</div><div class='ctx'> </div><div class='ctx'> 	return irq;</div><div class='hunk'>@@ -99,7 +101,7 @@ unsigned int get_irq(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> void __init init_IRQ(void)</div><div class='ctx'> {</div><div class='del'>-	u32 i, j, intr_type;</div><div class='add'>+	u32 i, intr_mask;</div><div class='ctx'> 	struct device_node *intc = NULL;</div><div class='ctx'> #ifdef CONFIG_SELFMOD_INTC</div><div class='ctx'> 	unsigned int intc_baseaddr = 0;</div><div class='hunk'>@@ -113,35 +115,24 @@ void __init init_IRQ(void)</div><div class='ctx'> 				0</div><div class='ctx'> 			};</div><div class='ctx'> #endif</div><div class='del'>-	const char * const intc_list[] = {</div><div class='del'>-				"xlnx,xps-intc-1.00.a",</div><div class='del'>-				NULL</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-	for (j = 0; intc_list[j] != NULL; j++) {</div><div class='del'>-		intc = of_find_compatible_node(NULL, NULL, intc_list[j]);</div><div class='del'>-		if (intc)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='add'>+	intc = of_find_compatible_node(NULL, NULL, "xlnx,xps-intc-1.00.a");</div><div class='ctx'> 	BUG_ON(!intc);</div><div class='ctx'> </div><div class='del'>-	intc_baseaddr = be32_to_cpup(of_get_property(intc,</div><div class='del'>-								"reg", NULL));</div><div class='add'>+	intc_baseaddr = be32_to_cpup(of_get_property(intc, "reg", NULL));</div><div class='ctx'> 	intc_baseaddr = (unsigned long) ioremap(intc_baseaddr, PAGE_SIZE);</div><div class='ctx'> 	nr_irq = be32_to_cpup(of_get_property(intc,</div><div class='ctx'> 						"xlnx,num-intr-inputs", NULL));</div><div class='ctx'> </div><div class='del'>-	intr_type =</div><div class='del'>-		be32_to_cpup(of_get_property(intc,</div><div class='del'>-						"xlnx,kind-of-intr", NULL));</div><div class='del'>-	if (intr_type &gt; (u32)((1ULL &lt;&lt; nr_irq) - 1))</div><div class='add'>+	intr_mask =</div><div class='add'>+		be32_to_cpup(of_get_property(intc, "xlnx,kind-of-intr", NULL));</div><div class='add'>+	if (intr_mask &gt; (u32)((1ULL &lt;&lt; nr_irq) - 1))</div><div class='ctx'> 		printk(KERN_INFO " ERROR: Mismatch in kind-of-intr param\n");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SELFMOD_INTC</div><div class='ctx'> 	selfmod_function((int *) arr_func, intc_baseaddr);</div><div class='ctx'> #endif</div><div class='del'>-	printk(KERN_INFO "%s #0 at 0x%08x, num_irq=%d, edge=0x%x\n",</div><div class='del'>-		intc_list[j], intc_baseaddr, nr_irq, intr_type);</div><div class='add'>+	printk(KERN_INFO "XPS intc #0 at 0x%08x, num_irq=%d, edge=0x%x\n",</div><div class='add'>+		intc_baseaddr, nr_irq, intr_mask);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Disable all external interrupts until they are</div><div class='hunk'>@@ -155,8 +146,8 @@ void __init init_IRQ(void)</div><div class='ctx'> 	/* Turn on the Master Enable. */</div><div class='ctx'> 	out_be32(intc_baseaddr + MER, MER_HIE | MER_ME);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nr_irq; ++i) {</div><div class='del'>-		if (intr_type &amp; (0x00000001 &lt;&lt; i)) {</div><div class='add'>+	for (i = IRQ_OFFSET; i &lt; (nr_irq + IRQ_OFFSET); ++i) {</div><div class='add'>+		if (intr_mask &amp; (0x00000001 &lt;&lt; (i - IRQ_OFFSET))) {</div><div class='ctx'> 			irq_set_chip_and_handler_name(i, &amp;intc_dev,</div><div class='ctx'> 				handle_edge_irq, "edge");</div><div class='ctx'> 			irq_clear_status_flags(i, IRQ_LEVEL);</div><div class='hunk'>@@ -165,5 +156,6 @@ void __init init_IRQ(void)</div><div class='ctx'> 				handle_level_irq, "level");</div><div class='ctx'> 			irq_set_status_flags(i, IRQ_LEVEL);</div><div class='ctx'> 		}</div><div class='add'>+		irq_get_irq_data(i)-&gt;hwirq = i - IRQ_OFFSET;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/microblaze/kernel/irq.c b/arch/microblaze/kernel/irq.c<br/>index e5d63a89b9b2..bbebcae72c02 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/kernel/irq.c</a></div><div class='hunk'>@@ -33,11 +33,12 @@ void __irq_entry do_IRQ(struct pt_regs *regs)</div><div class='ctx'> 	irq_enter();</div><div class='ctx'> 	irq = get_irq(regs);</div><div class='ctx'> next_irq:</div><div class='del'>-	BUG_ON(irq == -1U);</div><div class='del'>-	generic_handle_irq(irq);</div><div class='add'>+	BUG_ON(!irq);</div><div class='add'>+	/* Substract 1 because of get_irq */</div><div class='add'>+	generic_handle_irq(irq + IRQ_OFFSET - NO_IRQ_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 	irq = get_irq(regs);</div><div class='del'>-	if (irq != -1U) {</div><div class='add'>+	if (irq) {</div><div class='ctx'> 		pr_debug("next irq: %d\n", irq);</div><div class='ctx'> 		++concurrent_irq;</div><div class='ctx'> 		goto next_irq;</div><div class='hunk'>@@ -52,13 +53,13 @@ next_irq:</div><div class='ctx'>   intc without any cascades or any connection that's why mapping is 1:1 */</div><div class='ctx'> unsigned int irq_create_mapping(struct irq_host *host, irq_hw_number_t hwirq)</div><div class='ctx'> {</div><div class='del'>-	return hwirq;</div><div class='add'>+	return hwirq + IRQ_OFFSET;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(irq_create_mapping);</div><div class='ctx'> </div><div class='ctx'> unsigned int irq_create_of_mapping(struct device_node *controller,</div><div class='ctx'> 				   const u32 *intspec, unsigned int intsize)</div><div class='ctx'> {</div><div class='del'>-	return intspec[0];</div><div class='add'>+	return intspec[0] + IRQ_OFFSET;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(irq_create_of_mapping);</div><div class='head'>diff --git a/arch/microblaze/kernel/module.c b/arch/microblaze/kernel/module.c<br/>index 142426f631bb..f39257a5abcf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/module.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/module.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/module.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/kernel/module.c</a></div><div class='hunk'>@@ -100,7 +100,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case R_MICROBLAZE_64_NONE:</div><div class='del'>-			pr_debug("R_MICROBLAZE_NONE\n");</div><div class='add'>+			pr_debug("R_MICROBLAZE_64_NONE\n");</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case R_MICROBLAZE_NONE:</div><div class='head'>diff --git a/arch/microblaze/kernel/ptrace.c b/arch/microblaze/kernel/ptrace.c<br/>index 043cb58f9c44..6eb2aa927d89 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/ptrace.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/kernel/ptrace.c</a></div><div class='hunk'>@@ -147,10 +147,8 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = -1L;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context))</div><div class='del'>-		audit_syscall_entry(EM_MICROBLAZE, regs-&gt;r12,</div><div class='del'>-				    regs-&gt;r5, regs-&gt;r6,</div><div class='del'>-				    regs-&gt;r7, regs-&gt;r8);</div><div class='add'>+	audit_syscall_entry(EM_MICROBLAZE, regs-&gt;r12, regs-&gt;r5, regs-&gt;r6,</div><div class='add'>+			    regs-&gt;r7, regs-&gt;r8);</div><div class='ctx'> </div><div class='ctx'> 	return ret ?: regs-&gt;r12;</div><div class='ctx'> }</div><div class='hunk'>@@ -159,8 +157,7 @@ asmlinkage void do_syscall_trace_leave(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	int step;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context))</div><div class='del'>-		audit_syscall_exit(AUDITSC_RESULT(regs-&gt;r3), regs-&gt;r3);</div><div class='add'>+	audit_syscall_exit(regs);</div><div class='ctx'> </div><div class='ctx'> 	step = test_thread_flag(TIF_SINGLESTEP);</div><div class='ctx'> 	if (step || test_thread_flag(TIF_SYSCALL_TRACE))</div><div class='head'>diff --git a/arch/microblaze/kernel/reset.c b/arch/microblaze/kernel/reset.c<br/>index bd8ccab5ceff..88a01636f785 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/reset.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/reset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/reset.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/kernel/reset.c</a></div><div class='hunk'>@@ -19,50 +19,11 @@</div><div class='ctx'> static int handle; /* reset pin handle */</div><div class='ctx'> static unsigned int reset_val;</div><div class='ctx'> </div><div class='del'>-static int of_reset_gpio_handle(void)</div><div class='del'>-{</div><div class='del'>-	int ret; /* variable which stored handle reset gpio pin */</div><div class='del'>-	struct device_node *root; /* root node */</div><div class='del'>-	struct device_node *gpio; /* gpio node */</div><div class='del'>-	struct gpio_chip *gc;</div><div class='del'>-	u32 flags;</div><div class='del'>-	const void *gpio_spec;</div><div class='del'>-</div><div class='del'>-	/* find out root node */</div><div class='del'>-	root = of_find_node_by_path("/");</div><div class='del'>-</div><div class='del'>-	/* give me handle for gpio node to be possible allocate pin */</div><div class='del'>-	ret = of_parse_phandles_with_args(root, "hard-reset-gpios",</div><div class='del'>-				"#gpio-cells", 0, &amp;gpio, &amp;gpio_spec);</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_debug("%s: can't parse gpios property\n", __func__);</div><div class='del'>-		goto err0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gc = of_node_to_gpiochip(gpio);</div><div class='del'>-	if (!gc) {</div><div class='del'>-		pr_debug("%s: gpio controller %s isn't registered\n",</div><div class='del'>-			 root-&gt;full_name, gpio-&gt;full_name);</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto err1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = gc-&gt;of_xlate(gc, root, gpio_spec, &amp;flags);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err1;</div><div class='del'>-</div><div class='del'>-	ret += gc-&gt;base;</div><div class='del'>-err1:</div><div class='del'>-	of_node_put(gpio);</div><div class='del'>-err0:</div><div class='del'>-	pr_debug("%s exited with status %d\n", __func__, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void of_platform_reset_gpio_probe(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	handle = of_reset_gpio_handle();</div><div class='add'>+	handle = of_get_named_gpio(of_find_node_by_path("/"),</div><div class='add'>+				   "hard-reset-gpios", 0);</div><div class='ctx'> </div><div class='ctx'> 	if (!gpio_is_valid(handle)) {</div><div class='ctx'> 		printk(KERN_INFO "Skipping unavailable RESET gpio %d (%s)\n",</div><div class='head'>diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c<br/>index 0e654a12d37e..d4fc1a971779 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/kernel/setup.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/entry.h&gt;</div><div class='ctx'> #include &lt;asm/cpuinfo.h&gt;</div><div class='hunk'>@@ -145,32 +146,32 @@ void __init machine_early_init(const char *cmdline, unsigned int ram,</div><div class='ctx'> 	setup_early_printk(NULL);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	eprintk("Ramdisk addr 0x%08x, ", ram);</div><div class='add'>+	printk("Ramdisk addr 0x%08x, ", ram);</div><div class='ctx'> 	if (fdt)</div><div class='del'>-		eprintk("FDT at 0x%08x\n", fdt);</div><div class='add'>+		printk("FDT at 0x%08x\n", fdt);</div><div class='ctx'> 	else</div><div class='del'>-		eprintk("Compiled-in FDT at 0x%08x\n",</div><div class='add'>+		printk("Compiled-in FDT at 0x%08x\n",</div><div class='ctx'> 					(unsigned int)_fdt_start);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MTD_UCLINUX</div><div class='del'>-	eprintk("Found romfs @ 0x%08x (0x%08x)\n",</div><div class='add'>+	printk("Found romfs @ 0x%08x (0x%08x)\n",</div><div class='ctx'> 			romfs_base, romfs_size);</div><div class='del'>-	eprintk("#### klimit %p ####\n", old_klimit);</div><div class='add'>+	printk("#### klimit %p ####\n", old_klimit);</div><div class='ctx'> 	BUG_ON(romfs_size &lt; 0); /* What else can we do? */</div><div class='ctx'> </div><div class='del'>-	eprintk("Moved 0x%08x bytes from 0x%08x to 0x%08x\n",</div><div class='add'>+	printk("Moved 0x%08x bytes from 0x%08x to 0x%08x\n",</div><div class='ctx'> 			romfs_size, romfs_base, (unsigned)&amp;_ebss);</div><div class='ctx'> </div><div class='del'>-	eprintk("New klimit: 0x%08x\n", (unsigned)klimit);</div><div class='add'>+	printk("New klimit: 0x%08x\n", (unsigned)klimit);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR</div><div class='ctx'> 	if (msr)</div><div class='del'>-		eprintk("!!!Your kernel has setup MSR instruction but "</div><div class='add'>+		printk("!!!Your kernel has setup MSR instruction but "</div><div class='ctx'> 				"CPU don't have it %x\n", msr);</div><div class='ctx'> #else</div><div class='ctx'> 	if (!msr)</div><div class='del'>-		eprintk("!!!Your kernel not setup MSR instruction but "</div><div class='add'>+		printk("!!!Your kernel not setup MSR instruction but "</div><div class='ctx'> 				"CPU have it %x\n", msr);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -226,5 +227,23 @@ static int __init setup_bus_notifier(void)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> arch_initcall(setup_bus_notifier);</div><div class='add'>+</div><div class='add'>+static DEFINE_PER_CPU(struct cpu, cpu_devices);</div><div class='add'>+</div><div class='add'>+static int __init topology_init(void)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	for_each_present_cpu(i) {</div><div class='add'>+		struct cpu *c = &amp;per_cpu(cpu_devices, i);</div><div class='add'>+</div><div class='add'>+		ret = register_cpu(c, i);</div><div class='add'>+		if (ret)</div><div class='add'>+			printk(KERN_WARNING "topology_init: register_cpu %d "</div><div class='add'>+						"failed (%d)\n", i, ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+subsys_initcall(topology_init);</div><div class='head'>diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S<br/>index 8789daa2a346..6a2b294ef6dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/syscall_table.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/syscall_table.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/syscall_table.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/kernel/syscall_table.S</a></div><div class='hunk'>@@ -380,3 +380,6 @@ ENTRY(sys_call_table)</div><div class='ctx'> 	.long sys_clock_adjtime</div><div class='ctx'> 	.long sys_syncfs</div><div class='ctx'> 	.long sys_setns			/* 375 */</div><div class='add'>+	.long sys_sendmmsg</div><div class='add'>+	.long sys_process_vm_readv</div><div class='add'>+	.long sys_process_vm_writev</div><div class='head'>diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c<br/>index af74b1113aab..3cb0bf640135 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/timer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/kernel/timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/kernel/timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/kernel/timer.c</a></div><div class='hunk'>@@ -243,7 +243,7 @@ static int timer_initialized;</div><div class='ctx'> </div><div class='ctx'> void __init time_init(void)</div><div class='ctx'> {</div><div class='del'>-	u32 irq, i = 0;</div><div class='add'>+	u32 irq;</div><div class='ctx'> 	u32 timer_num = 1;</div><div class='ctx'> 	struct device_node *timer = NULL;</div><div class='ctx'> 	const void *prop;</div><div class='hunk'>@@ -258,33 +258,24 @@ void __init time_init(void)</div><div class='ctx'> 				0</div><div class='ctx'> 			};</div><div class='ctx'> #endif</div><div class='del'>-	const char * const timer_list[] = {</div><div class='del'>-		"xlnx,xps-timer-1.00.a",</div><div class='del'>-		NULL</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	for (i = 0; timer_list[i] != NULL; i++) {</div><div class='del'>-		timer = of_find_compatible_node(NULL, NULL, timer_list[i]);</div><div class='del'>-		if (timer)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='add'>+	timer = of_find_compatible_node(NULL, NULL, "xlnx,xps-timer-1.00.a");</div><div class='ctx'> 	BUG_ON(!timer);</div><div class='ctx'> </div><div class='ctx'> 	timer_baseaddr = be32_to_cpup(of_get_property(timer, "reg", NULL));</div><div class='ctx'> 	timer_baseaddr = (unsigned long) ioremap(timer_baseaddr, PAGE_SIZE);</div><div class='del'>-	irq = be32_to_cpup(of_get_property(timer, "interrupts", NULL));</div><div class='add'>+	irq = irq_of_parse_and_map(timer, 0);</div><div class='ctx'> 	timer_num = be32_to_cpup(of_get_property(timer,</div><div class='ctx'> 						"xlnx,one-timer-only", NULL));</div><div class='ctx'> 	if (timer_num) {</div><div class='del'>-		eprintk(KERN_EMERG "Please enable two timers in HW\n");</div><div class='add'>+		printk(KERN_EMERG "Please enable two timers in HW\n");</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SELFMOD_TIMER</div><div class='ctx'> 	selfmod_function((int *) arr_func, timer_baseaddr);</div><div class='ctx'> #endif</div><div class='del'>-	printk(KERN_INFO "%s #0 at 0x%08x, irq=%d\n",</div><div class='del'>-		timer_list[i], timer_baseaddr, irq);</div><div class='add'>+	printk(KERN_INFO "XPS timer #0 at 0x%08x, irq=%d\n",</div><div class='add'>+		timer_baseaddr, irq);</div><div class='ctx'> </div><div class='ctx'> 	/* If there is clock-frequency property than use it */</div><div class='ctx'> 	prop = of_get_property(timer, "clock-frequency", NULL);</div><div class='head'>diff --git a/arch/microblaze/lib/Makefile b/arch/microblaze/lib/Makefile<br/>index c13067b243c3..844960e8ae18 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/lib/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/lib/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/lib/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/lib/Makefile</a></div><div class='hunk'>@@ -20,6 +20,7 @@ lib-y += uaccess_old.o</div><div class='ctx'> </div><div class='ctx'> lib-y += ashldi3.o</div><div class='ctx'> lib-y += ashrdi3.o</div><div class='add'>+lib-y += cmpdi2.o</div><div class='ctx'> lib-y += divsi3.o</div><div class='ctx'> lib-y += lshrdi3.o</div><div class='ctx'> lib-y += modsi3.o</div><div class='head'>diff --git a/arch/microblaze/lib/cmpdi2.c b/arch/microblaze/lib/cmpdi2.c<br/>new file mode 100644<br/>index 000000000000..a708400ea7b7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/lib/cmpdi2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/lib/cmpdi2.c</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "libgcc.h"</div><div class='add'>+</div><div class='add'>+word_type __cmpdi2(long long a, long long b)</div><div class='add'>+{</div><div class='add'>+	const DWunion au = {</div><div class='add'>+		.ll = a</div><div class='add'>+	};</div><div class='add'>+	const DWunion bu = {</div><div class='add'>+		.ll = b</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (au.s.high &lt; bu.s.high)</div><div class='add'>+		return 0;</div><div class='add'>+	else if (au.s.high &gt; bu.s.high)</div><div class='add'>+		return 2;</div><div class='add'>+</div><div class='add'>+	if ((unsigned int) au.s.low &lt; (unsigned int) bu.s.low)</div><div class='add'>+		return 0;</div><div class='add'>+	else if ((unsigned int) au.s.low &gt; (unsigned int) bu.s.low)</div><div class='add'>+		return 2;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__cmpdi2);</div><div class='head'>diff --git a/arch/microblaze/pci/iomap.c b/arch/microblaze/pci/iomap.c<br/>index 57acda852f5a..b07abbac0319 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/pci/iomap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/pci/iomap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/pci/iomap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/pci/iomap.c</a></div><div class='hunk'>@@ -10,25 +10,6 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/pci-bridge.h&gt;</div><div class='ctx'> </div><div class='del'>-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)</div><div class='del'>-{</div><div class='del'>-	resource_size_t start = pci_resource_start(dev, bar);</div><div class='del'>-	resource_size_t len = pci_resource_len(dev, bar);</div><div class='del'>-	unsigned long flags = pci_resource_flags(dev, bar);</div><div class='del'>-</div><div class='del'>-	if (!len)</div><div class='del'>-		return NULL;</div><div class='del'>-	if (max &amp;&amp; len &gt; max)</div><div class='del'>-		len = max;</div><div class='del'>-	if (flags &amp; IORESOURCE_IO)</div><div class='del'>-		return ioport_map(start, len);</div><div class='del'>-	if (flags &amp; IORESOURCE_MEM)</div><div class='del'>-		return ioremap(start, len);</div><div class='del'>-	/* What? */</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(pci_iomap);</div><div class='del'>-</div><div class='ctx'> void pci_iounmap(struct pci_dev *dev, void __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'> 	if (isa_vaddr_is_ioport(addr))</div><div class='head'>diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c<br/>index db841c7b9d5b..85f2ac1230a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/microblaze/pci/pci-common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/microblaze/pci/pci-common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/microblaze/pci/pci-common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/microblaze/pci/pci-common.c</a></div><div class='hunk'>@@ -190,6 +190,11 @@ int pcibios_add_platform_entries(struct pci_dev *pdev)</div><div class='ctx'> 	return device_create_file(&amp;pdev-&gt;dev, &amp;dev_attr_devspec);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void pcibios_set_master(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	/* No special bus mastering setup handling */</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char __devinit *pcibios_setup(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	return str;</div><div class='hunk'>@@ -242,7 +247,7 @@ int pci_read_irq_line(struct pci_dev *pci_dev)</div><div class='ctx'> 			 line, pin);</div><div class='ctx'> </div><div class='ctx'> 		virq = irq_create_mapping(NULL, line);</div><div class='del'>-		if (virq != NO_IRQ)</div><div class='add'>+		if (virq)</div><div class='ctx'> 			irq_set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n",</div><div class='hunk'>@@ -253,7 +258,7 @@ int pci_read_irq_line(struct pci_dev *pci_dev)</div><div class='ctx'> 		virq = irq_create_of_mapping(oirq.controller, oirq.specifier,</div><div class='ctx'> 					     oirq.size);</div><div class='ctx'> 	}</div><div class='del'>-	if (virq == NO_IRQ) {</div><div class='add'>+	if (!virq) {</div><div class='ctx'> 		pr_debug(" Failed to map !\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1019,7 +1024,6 @@ static void __devinit pcibios_fixup_bridge(struct pci_bus *bus)</div><div class='ctx'> 	struct pci_dev *dev = bus-&gt;self;</div><div class='ctx'> </div><div class='ctx'> 	pci_bus_for_each_resource(bus, res, i) {</div><div class='del'>-		res = bus-&gt;resource[i];</div><div class='ctx'> 		if (!res)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (!res-&gt;flags)</div><div class='hunk'>@@ -1219,7 +1223,6 @@ void pcibios_allocate_bus_resources(struct pci_bus *bus)</div><div class='ctx'> 		 pci_domain_nr(bus), bus-&gt;number);</div><div class='ctx'> </div><div class='ctx'> 	pci_bus_for_each_resource(bus, res, i) {</div><div class='del'>-		res = bus-&gt;resource[i];</div><div class='ctx'> 		if (!res || !res-&gt;flags</div><div class='ctx'> 		    || res-&gt;start &gt; res-&gt;end || res-&gt;parent)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -1510,14 +1513,18 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)</div><div class='ctx'> 	return pci_enable_resources(dev, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __devinit pcibios_setup_phb_resources(struct pci_controller *hose)</div><div class='add'>+static void __devinit pcibios_setup_phb_resources(struct pci_controller *hose, struct list_head *resources)</div><div class='ctx'> {</div><div class='del'>-	struct pci_bus *bus = hose-&gt;bus;</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Hookup PHB IO resource */</div><div class='del'>-	bus-&gt;resource[0] = res = &amp;hose-&gt;io_resource;</div><div class='add'>+	res = &amp;hose-&gt;io_resource;</div><div class='add'>+</div><div class='add'>+	/* Fixup IO space offset */</div><div class='add'>+	io_offset = (unsigned long)hose-&gt;io_base_virt - isa_io_base;</div><div class='add'>+	res-&gt;start = (res-&gt;start + io_offset) &amp; 0xffffffffu;</div><div class='add'>+	res-&gt;end = (res-&gt;end + io_offset) &amp; 0xffffffffu;</div><div class='ctx'> </div><div class='ctx'> 	if (!res-&gt;flags) {</div><div class='ctx'> 		printk(KERN_WARNING "PCI: I/O resource not set for host"</div><div class='hunk'>@@ -1528,6 +1535,7 @@ void __devinit pcibios_setup_phb_resources(struct pci_controller *hose)</div><div class='ctx'> 		res-&gt;end = res-&gt;start + IO_SPACE_LIMIT;</div><div class='ctx'> 		res-&gt;flags = IORESOURCE_IO;</div><div class='ctx'> 	}</div><div class='add'>+	pci_add_resource(resources, res);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("PCI: PHB IO resource    = %016llx-%016llx [%lx]\n",</div><div class='ctx'> 		 (unsigned long long)res-&gt;start,</div><div class='hunk'>@@ -1550,7 +1558,7 @@ void __devinit pcibios_setup_phb_resources(struct pci_controller *hose)</div><div class='ctx'> 			res-&gt;flags = IORESOURCE_MEM;</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='del'>-		bus-&gt;resource[i+1] = res;</div><div class='add'>+		pci_add_resource(resources, res);</div><div class='ctx'> </div><div class='ctx'> 		pr_debug("PCI: PHB MEM resource %d = %016llx-%016llx [%lx]\n",</div><div class='ctx'> 			i, (unsigned long long)res-&gt;start,</div><div class='hunk'>@@ -1573,34 +1581,27 @@ struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus)</div><div class='ctx'> </div><div class='ctx'> static void __devinit pcibios_scan_phb(struct pci_controller *hose)</div><div class='ctx'> {</div><div class='add'>+	LIST_HEAD(resources);</div><div class='ctx'> 	struct pci_bus *bus;</div><div class='ctx'> 	struct device_node *node = hose-&gt;dn;</div><div class='del'>-	unsigned long io_offset;</div><div class='del'>-	struct resource *res = &amp;hose-&gt;io_resource;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("PCI: Scanning PHB %s\n",</div><div class='ctx'> 		 node ? node-&gt;full_name : "&lt;NO NAME&gt;");</div><div class='ctx'> </div><div class='del'>-	/* Create an empty bus for the toplevel */</div><div class='del'>-	bus = pci_create_bus(hose-&gt;parent, hose-&gt;first_busno, hose-&gt;ops, hose);</div><div class='add'>+	pcibios_setup_phb_resources(hose, &amp;resources);</div><div class='add'>+</div><div class='add'>+	bus = pci_scan_root_bus(hose-&gt;parent, hose-&gt;first_busno,</div><div class='add'>+				hose-&gt;ops, hose, &amp;resources);</div><div class='ctx'> 	if (bus == NULL) {</div><div class='ctx'> 		printk(KERN_ERR "Failed to create bus for PCI domain %04x\n",</div><div class='ctx'> 		       hose-&gt;global_number);</div><div class='add'>+		pci_free_resource_list(&amp;resources);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	bus-&gt;secondary = hose-&gt;first_busno;</div><div class='ctx'> 	hose-&gt;bus = bus;</div><div class='ctx'> </div><div class='del'>-	/* Fixup IO space offset */</div><div class='del'>-	io_offset = (unsigned long)hose-&gt;io_base_virt - isa_io_base;</div><div class='del'>-	res-&gt;start = (res-&gt;start + io_offset) &amp; 0xffffffffu;</div><div class='del'>-	res-&gt;end = (res-&gt;end + io_offset) &amp; 0xffffffffu;</div><div class='del'>-</div><div class='del'>-	/* Wire up PHB bus resources */</div><div class='del'>-	pcibios_setup_phb_resources(hose);</div><div class='del'>-</div><div class='del'>-	/* Scan children */</div><div class='del'>-	hose-&gt;last_busno = bus-&gt;subordinate = pci_scan_child_bus(bus);</div><div class='add'>+	hose-&gt;last_busno = bus-&gt;subordinate;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init pcibios_init(void)</div><div class='hunk'>@@ -1614,8 +1615,6 @@ static int __init pcibios_init(void)</div><div class='ctx'> 	list_for_each_entry_safe(hose, tmp, &amp;hose_list, list_node) {</div><div class='ctx'> 		hose-&gt;last_busno = 0xff;</div><div class='ctx'> 		pcibios_scan_phb(hose);</div><div class='del'>-		printk(KERN_INFO "calling pci_bus_add_devices()\n");</div><div class='del'>-		pci_bus_add_devices(hose-&gt;bus);</div><div class='ctx'> 		if (next_busno &lt;= hose-&gt;last_busno)</div><div class='ctx'> 			next_busno = hose-&gt;last_busno + 1;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig<br/>index 9c652eb68aaa..c4c1312473fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/Kconfig</a></div><div class='hunk'>@@ -16,6 +16,7 @@ config MIPS</div><div class='ctx'> 	select HAVE_FUNCTION_GRAPH_TRACER</div><div class='ctx'> 	select HAVE_KPROBES</div><div class='ctx'> 	select HAVE_KRETPROBES</div><div class='add'>+	select ARCH_BINFMT_ELF_RANDOMIZE_PIE</div><div class='ctx'> 	select RTC_LIB if !MACH_LOONGSON</div><div class='ctx'> 	select GENERIC_ATOMIC64 if !64BIT</div><div class='ctx'> 	select HAVE_DMA_ATTRS</div><div class='hunk'>@@ -68,7 +69,6 @@ config AR7</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> 	select SYS_SUPPORTS_ZBOOT_UART16550</div><div class='ctx'> 	select ARCH_REQUIRE_GPIOLIB</div><div class='del'>-	select GCD</div><div class='ctx'> 	select VLYNQ</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for the Texas Instruments AR7 System-on-a-Chip</div><div class='hunk'>@@ -719,7 +719,6 @@ config CAVIUM_OCTEON_SIMULATOR</div><div class='ctx'> 	select DMA_COHERENT</div><div class='ctx'> 	select SYS_SUPPORTS_64BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='del'>-	select SYS_SUPPORTS_HIGHMEM</div><div class='ctx'> 	select SYS_SUPPORTS_HOTPLUG_CPU</div><div class='ctx'> 	select SYS_HAS_CPU_CAVIUM_OCTEON</div><div class='ctx'> 	select HOLES_IN_ZONE</div><div class='hunk'>@@ -735,7 +734,6 @@ config CAVIUM_OCTEON_REFERENCE_BOARD</div><div class='ctx'> 	select DMA_COHERENT</div><div class='ctx'> 	select SYS_SUPPORTS_64BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='del'>-	select SYS_SUPPORTS_HIGHMEM</div><div class='ctx'> 	select SYS_SUPPORTS_HOTPLUG_CPU</div><div class='ctx'> 	select SYS_HAS_EARLY_PRINTK</div><div class='ctx'> 	select SYS_HAS_CPU_CAVIUM_OCTEON</div><div class='hunk'>@@ -764,7 +762,6 @@ config NLM_XLR_BOARD</div><div class='ctx'> 	depends on EXPERIMENTAL</div><div class='ctx'> 	select BOOT_ELF32</div><div class='ctx'> 	select NLM_COMMON</div><div class='del'>-	select NLM_XLR</div><div class='ctx'> 	select SYS_HAS_CPU_XLR</div><div class='ctx'> 	select SYS_SUPPORTS_SMP</div><div class='ctx'> 	select HW_HAS_PCI</div><div class='hunk'>@@ -779,6 +776,7 @@ config NLM_XLR_BOARD</div><div class='ctx'> 	select CEVT_R4K</div><div class='ctx'> 	select CSRC_R4K</div><div class='ctx'> 	select IRQ_CPU</div><div class='add'>+	select ARCH_SUPPORTS_MSI</div><div class='ctx'> 	select ZONE_DMA if 64BIT</div><div class='ctx'> 	select SYNC_R4K</div><div class='ctx'> 	select SYS_HAS_EARLY_PRINTK</div><div class='hunk'>@@ -786,6 +784,33 @@ config NLM_XLR_BOARD</div><div class='ctx'> 	  Support for systems based on Netlogic XLR and XLS processors.</div><div class='ctx'> 	  Say Y here if you have a XLR or XLS based board.</div><div class='ctx'> </div><div class='add'>+config NLM_XLP_BOARD</div><div class='add'>+	bool "Netlogic XLP based systems"</div><div class='add'>+	depends on EXPERIMENTAL</div><div class='add'>+	select BOOT_ELF32</div><div class='add'>+	select NLM_COMMON</div><div class='add'>+	select SYS_HAS_CPU_XLP</div><div class='add'>+	select SYS_SUPPORTS_SMP</div><div class='add'>+	select HW_HAS_PCI</div><div class='add'>+	select SWAP_IO_SPACE</div><div class='add'>+	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='add'>+	select SYS_SUPPORTS_64BIT_KERNEL</div><div class='add'>+	select 64BIT_PHYS_ADDR</div><div class='add'>+	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='add'>+	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='add'>+	select SYS_SUPPORTS_HIGHMEM</div><div class='add'>+	select DMA_COHERENT</div><div class='add'>+	select NR_CPUS_DEFAULT_32</div><div class='add'>+	select CEVT_R4K</div><div class='add'>+	select CSRC_R4K</div><div class='add'>+	select IRQ_CPU</div><div class='add'>+	select ZONE_DMA if 64BIT</div><div class='add'>+	select SYNC_R4K</div><div class='add'>+	select SYS_HAS_EARLY_PRINTK</div><div class='add'>+	help</div><div class='add'>+	  This board is based on Netlogic XLP Processor.</div><div class='add'>+	  Say Y here if you have a XLP based board.</div><div class='add'>+</div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='ctx'> source "arch/mips/alchemy/Kconfig"</div><div class='hunk'>@@ -1416,51 +1441,36 @@ config CPU_CAVIUM_OCTEON</div><div class='ctx'> config CPU_BMIPS3300</div><div class='ctx'> 	bool "BMIPS3300"</div><div class='ctx'> 	depends on SYS_HAS_CPU_BMIPS3300</div><div class='del'>-	select DMA_NONCOHERENT</div><div class='del'>-	select IRQ_CPU</div><div class='del'>-	select SWAP_IO_SPACE</div><div class='del'>-	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='del'>-	select WEAK_ORDERING</div><div class='add'>+	select CPU_BMIPS</div><div class='ctx'> 	help</div><div class='ctx'> 	  Broadcom BMIPS3300 processors.</div><div class='ctx'> </div><div class='ctx'> config CPU_BMIPS4350</div><div class='ctx'> 	bool "BMIPS4350"</div><div class='ctx'> 	depends on SYS_HAS_CPU_BMIPS4350</div><div class='del'>-	select CPU_SUPPORTS_32BIT_KERNEL</div><div class='del'>-	select DMA_NONCOHERENT</div><div class='del'>-	select IRQ_CPU</div><div class='del'>-	select SWAP_IO_SPACE</div><div class='add'>+	select CPU_BMIPS</div><div class='ctx'> 	select SYS_SUPPORTS_SMP</div><div class='ctx'> 	select SYS_SUPPORTS_HOTPLUG_CPU</div><div class='del'>-	select WEAK_ORDERING</div><div class='ctx'> 	help</div><div class='ctx'> 	  Broadcom BMIPS4350 ("VIPER") processors.</div><div class='ctx'> </div><div class='ctx'> config CPU_BMIPS4380</div><div class='ctx'> 	bool "BMIPS4380"</div><div class='ctx'> 	depends on SYS_HAS_CPU_BMIPS4380</div><div class='del'>-	select CPU_SUPPORTS_32BIT_KERNEL</div><div class='del'>-	select DMA_NONCOHERENT</div><div class='del'>-	select IRQ_CPU</div><div class='del'>-	select SWAP_IO_SPACE</div><div class='add'>+	select CPU_BMIPS</div><div class='ctx'> 	select SYS_SUPPORTS_SMP</div><div class='ctx'> 	select SYS_SUPPORTS_HOTPLUG_CPU</div><div class='del'>-	select WEAK_ORDERING</div><div class='ctx'> 	help</div><div class='ctx'> 	  Broadcom BMIPS4380 processors.</div><div class='ctx'> </div><div class='ctx'> config CPU_BMIPS5000</div><div class='ctx'> 	bool "BMIPS5000"</div><div class='ctx'> 	depends on SYS_HAS_CPU_BMIPS5000</div><div class='del'>-	select CPU_SUPPORTS_32BIT_KERNEL</div><div class='add'>+	select CPU_BMIPS</div><div class='ctx'> 	select CPU_SUPPORTS_HIGHMEM</div><div class='del'>-	select DMA_NONCOHERENT</div><div class='del'>-	select IRQ_CPU</div><div class='del'>-	select SWAP_IO_SPACE</div><div class='add'>+	select MIPS_CPU_SCACHE</div><div class='ctx'> 	select SYS_SUPPORTS_SMP</div><div class='ctx'> 	select SYS_SUPPORTS_HOTPLUG_CPU</div><div class='del'>-	select WEAK_ORDERING</div><div class='ctx'> 	help</div><div class='ctx'> 	  Broadcom BMIPS5000 processors.</div><div class='ctx'> </div><div class='hunk'>@@ -1475,6 +1485,19 @@ config CPU_XLR</div><div class='ctx'> 	select CPU_SUPPORTS_HUGEPAGES</div><div class='ctx'> 	help</div><div class='ctx'> 	  Netlogic Microsystems XLR/XLS processors.</div><div class='add'>+</div><div class='add'>+config CPU_XLP</div><div class='add'>+	bool "Netlogic XLP SoC"</div><div class='add'>+	depends on SYS_HAS_CPU_XLP</div><div class='add'>+	select CPU_SUPPORTS_32BIT_KERNEL</div><div class='add'>+	select CPU_SUPPORTS_64BIT_KERNEL</div><div class='add'>+	select CPU_SUPPORTS_HIGHMEM</div><div class='add'>+	select CPU_HAS_LLSC</div><div class='add'>+	select WEAK_ORDERING</div><div class='add'>+	select WEAK_REORDERING_BEYOND_LLSC</div><div class='add'>+	select CPU_HAS_PREFETCH</div><div class='add'>+	help</div><div class='add'>+	  Netlogic Microsystems XLP processors.</div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='ctx'> if CPU_LOONGSON2F</div><div class='hunk'>@@ -1521,6 +1544,15 @@ config CPU_LOONGSON2</div><div class='ctx'> 	select CPU_SUPPORTS_64BIT_KERNEL</div><div class='ctx'> 	select CPU_SUPPORTS_HIGHMEM</div><div class='ctx'> </div><div class='add'>+config CPU_BMIPS</div><div class='add'>+	bool</div><div class='add'>+	select CPU_MIPS32</div><div class='add'>+	select CPU_SUPPORTS_32BIT_KERNEL</div><div class='add'>+	select DMA_NONCOHERENT</div><div class='add'>+	select IRQ_CPU</div><div class='add'>+	select SWAP_IO_SPACE</div><div class='add'>+	select WEAK_ORDERING</div><div class='add'>+</div><div class='ctx'> config SYS_HAS_CPU_LOONGSON2E</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='hunk'>@@ -1608,6 +1640,9 @@ config SYS_HAS_CPU_BMIPS5000</div><div class='ctx'> config SYS_HAS_CPU_XLR</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+config SYS_HAS_CPU_XLP</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> #</div><div class='ctx'> # CPU may reorder R-&gt;R, R-&gt;W, W-&gt;R, W-&gt;W</div><div class='ctx'> # Reordering beyond LL and SC is handled in WEAK_REORDERING_BEYOND_LLSC</div><div class='hunk'>@@ -1995,6 +2030,9 @@ config CPU_HAS_SMARTMIPS</div><div class='ctx'> config CPU_HAS_WB</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+config XKS01</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> #</div><div class='ctx'> # Vectored interrupt mode is an R2 feature</div><div class='ctx'> #</div><div class='hunk'>@@ -2317,6 +2355,7 @@ config PCI</div><div class='ctx'> 	bool "Support for PCI controller"</div><div class='ctx'> 	depends on HW_HAS_PCI</div><div class='ctx'> 	select PCI_DOMAINS</div><div class='add'>+	select GENERIC_PCI_IOMAP</div><div class='ctx'> 	help</div><div class='ctx'> 	  Find out whether you have a PCI motherboard. PCI is the name of a</div><div class='ctx'> 	  bus system, i.e. the way the CPU talks to the other stuff inside</div><div class='hunk'>@@ -2369,10 +2408,6 @@ config TC</div><div class='ctx'> 	  Linux driver support status is documented at:</div><div class='ctx'> 	  &lt;http://www.linux-mips.org/wiki/DECstation&gt;</div><div class='ctx'> </div><div class='del'>-#config ACCESSBUS</div><div class='del'>-#	bool "Access.Bus support"</div><div class='del'>-#	depends on TC</div><div class='del'>-</div><div class='ctx'> config MMU</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='head'>diff --git a/arch/mips/Makefile b/arch/mips/Makefile<br/>index 0be318609fc6..4fedf5a51d96 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/Makefile</a></div><div class='hunk'>@@ -157,6 +157,7 @@ ifeq (,$(findstring march=octeon, $(cflags-$(CONFIG_CPU_CAVIUM_OCTEON))))</div><div class='ctx'> cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon</div><div class='ctx'> endif</div><div class='ctx'> cflags-$(CONFIG_CAVIUM_CN63XXP1) += -Wa,-mfix-cn63xxp1</div><div class='add'>+cflags-$(CONFIG_CPU_BMIPS)	+= -march=mips32 -Wa,-mips32 -Wa,--trap</div><div class='ctx'> </div><div class='ctx'> cflags-$(CONFIG_CPU_R4000_WORKAROUNDS)	+= $(call cc-option,-mfix-r4000,)</div><div class='ctx'> cflags-$(CONFIG_CPU_R4400_WORKAROUNDS)	+= $(call cc-option,-mfix-r4400,)</div><div class='head'>diff --git a/arch/mips/alchemy/Kconfig b/arch/mips/alchemy/Kconfig<br/>index 2a68be6a1b97..0faaab24376e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/Kconfig</a></div><div class='hunk'>@@ -2,6 +2,10 @@</div><div class='ctx'> config ALCHEMY_GPIOINT_AU1000</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+# au1300-style GPIO/INT controller</div><div class='add'>+config ALCHEMY_GPIOINT_AU1300</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> # select this in your board config if you don't want to use the gpio</div><div class='ctx'> # namespace as documented in the manuals.  In this case however you need</div><div class='ctx'> # to create the necessary gpio_* functions in your board code/headers!</div><div class='hunk'>@@ -22,43 +26,29 @@ config MIPS_MTX1</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> 	select SYS_HAS_EARLY_PRINTK</div><div class='ctx'> </div><div class='del'>-config MIPS_BOSPORUS</div><div class='del'>-	bool "Alchemy Bosporus board"</div><div class='del'>-	select ALCHEMY_GPIOINT_AU1000</div><div class='del'>-	select DMA_NONCOHERENT</div><div class='del'>-	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='del'>-	select SYS_HAS_EARLY_PRINTK</div><div class='del'>-</div><div class='ctx'> config MIPS_DB1000</div><div class='del'>-	bool "Alchemy DB1000 board"</div><div class='add'>+	bool "Alchemy DB1000/DB1500/DB1100 boards"</div><div class='ctx'> 	select ALCHEMY_GPIOINT_AU1000</div><div class='ctx'> 	select DMA_NONCOHERENT</div><div class='ctx'> 	select HW_HAS_PCI</div><div class='del'>-	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='del'>-	select SYS_HAS_EARLY_PRINTK</div><div class='del'>-</div><div class='del'>-config MIPS_DB1100</div><div class='del'>-	bool "Alchemy DB1100 board"</div><div class='del'>-	select ALCHEMY_GPIOINT_AU1000</div><div class='del'>-	select DMA_NONCOHERENT</div><div class='add'>+	select MIPS_DISABLE_OBSOLETE_IDE</div><div class='add'>+	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> 	select SYS_HAS_EARLY_PRINTK</div><div class='ctx'> </div><div class='ctx'> config MIPS_DB1200</div><div class='del'>-	bool "Alchemy DB1200 board"</div><div class='add'>+	bool "Alchemy DB1200/PB1200 board"</div><div class='ctx'> 	select ALCHEMY_GPIOINT_AU1000</div><div class='ctx'> 	select DMA_COHERENT</div><div class='ctx'> 	select MIPS_DISABLE_OBSOLETE_IDE</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> 	select SYS_HAS_EARLY_PRINTK</div><div class='ctx'> </div><div class='del'>-config MIPS_DB1500</div><div class='del'>-	bool "Alchemy DB1500 board"</div><div class='del'>-	select ALCHEMY_GPIOINT_AU1000</div><div class='del'>-	select DMA_NONCOHERENT</div><div class='del'>-	select HW_HAS_PCI</div><div class='add'>+config MIPS_DB1300</div><div class='add'>+	bool "NetLogic DB1300 board"</div><div class='add'>+	select ALCHEMY_GPIOINT_AU1300</div><div class='add'>+	select DMA_COHERENT</div><div class='ctx'> 	select MIPS_DISABLE_OBSOLETE_IDE</div><div class='del'>-	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> 	select SYS_HAS_EARLY_PRINTK</div><div class='ctx'> </div><div class='hunk'>@@ -66,27 +56,11 @@ config MIPS_DB1550</div><div class='ctx'> 	bool "Alchemy DB1550 board"</div><div class='ctx'> 	select ALCHEMY_GPIOINT_AU1000</div><div class='ctx'> 	select HW_HAS_PCI</div><div class='del'>-	select DMA_NONCOHERENT</div><div class='add'>+	select DMA_COHERENT</div><div class='ctx'> 	select MIPS_DISABLE_OBSOLETE_IDE</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> 	select SYS_HAS_EARLY_PRINTK</div><div class='ctx'> </div><div class='del'>-config MIPS_MIRAGE</div><div class='del'>-	bool "Alchemy Mirage board"</div><div class='del'>-	select DMA_NONCOHERENT</div><div class='del'>-	select ALCHEMY_GPIOINT_AU1000</div><div class='del'>-	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='del'>-	select SYS_HAS_EARLY_PRINTK</div><div class='del'>-</div><div class='del'>-config MIPS_PB1000</div><div class='del'>-	bool "Alchemy PB1000 board"</div><div class='del'>-	select ALCHEMY_GPIOINT_AU1000</div><div class='del'>-	select DMA_NONCOHERENT</div><div class='del'>-	select HW_HAS_PCI</div><div class='del'>-	select SWAP_IO_SPACE</div><div class='del'>-	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='del'>-	select SYS_HAS_EARLY_PRINTK</div><div class='del'>-</div><div class='ctx'> config MIPS_PB1100</div><div class='ctx'> 	bool "Alchemy PB1100 board"</div><div class='ctx'> 	select ALCHEMY_GPIOINT_AU1000</div><div class='hunk'>@@ -96,14 +70,6 @@ config MIPS_PB1100</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> 	select SYS_HAS_EARLY_PRINTK</div><div class='ctx'> </div><div class='del'>-config MIPS_PB1200</div><div class='del'>-	bool "Alchemy PB1200 board"</div><div class='del'>-	select ALCHEMY_GPIOINT_AU1000</div><div class='del'>-	select DMA_NONCOHERENT</div><div class='del'>-	select MIPS_DISABLE_OBSOLETE_IDE</div><div class='del'>-	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='del'>-	select SYS_HAS_EARLY_PRINTK</div><div class='del'>-</div><div class='ctx'> config MIPS_PB1500</div><div class='ctx'> 	bool "Alchemy PB1500 board"</div><div class='ctx'> 	select ALCHEMY_GPIOINT_AU1000</div><div class='head'>diff --git a/arch/mips/alchemy/Makefile b/arch/mips/alchemy/Makefile<br/>new file mode 100644<br/>index 000000000000..aac3b179bbc0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/Makefile</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+obj-$(CONFIG_MIPS_GPR) += board-gpr.o</div><div class='add'>+obj-$(CONFIG_MIPS_MTX1) += board-mtx1.o</div><div class='add'>+obj-$(CONFIG_MIPS_XXS1500) += board-xxs1500.o</div><div class='head'>diff --git a/arch/mips/alchemy/Platform b/arch/mips/alchemy/Platform<br/>index 96e9e41f1b2a..7956274de15f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/Platform?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/Platform</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/Platform?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/Platform</a></div><div class='hunk'>@@ -5,62 +5,31 @@ platform-$(CONFIG_MIPS_ALCHEMY)	+= alchemy/common/</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# AMD Alchemy Pb1000 eval board</div><div class='del'>-#</div><div class='del'>-platform-$(CONFIG_MIPS_PB1000)	+= alchemy/devboards/</div><div class='del'>-cflags-$(CONFIG_MIPS_PB1000)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00</div><div class='del'>-load-$(CONFIG_MIPS_PB1000)	+= 0xffffffff80100000</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # AMD Alchemy Pb1100 eval board</div><div class='ctx'> #</div><div class='ctx'> platform-$(CONFIG_MIPS_PB1100)	+= alchemy/devboards/</div><div class='del'>-cflags-$(CONFIG_MIPS_PB1100)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00</div><div class='ctx'> load-$(CONFIG_MIPS_PB1100)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AMD Alchemy Pb1500 eval board</div><div class='ctx'> #</div><div class='ctx'> platform-$(CONFIG_MIPS_PB1500)	+= alchemy/devboards/</div><div class='del'>-cflags-$(CONFIG_MIPS_PB1500)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00</div><div class='ctx'> load-$(CONFIG_MIPS_PB1500)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # AMD Alchemy Pb1550 eval board</div><div class='ctx'> #</div><div class='ctx'> platform-$(CONFIG_MIPS_PB1550)	+= alchemy/devboards/</div><div class='del'>-cflags-$(CONFIG_MIPS_PB1550)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00</div><div class='ctx'> load-$(CONFIG_MIPS_PB1550)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# AMD Alchemy Pb1200 eval board</div><div class='del'>-#</div><div class='del'>-platform-$(CONFIG_MIPS_PB1200)	+= alchemy/devboards/</div><div class='del'>-cflags-$(CONFIG_MIPS_PB1200)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00</div><div class='del'>-load-$(CONFIG_MIPS_PB1200)	+= 0xffffffff80100000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# AMD Alchemy Db1000 eval board</div><div class='add'>+# AMD Alchemy Db1000/Db1500/Db1100 eval boards</div><div class='ctx'> #</div><div class='ctx'> platform-$(CONFIG_MIPS_DB1000)	+= alchemy/devboards/</div><div class='ctx'> cflags-$(CONFIG_MIPS_DB1000)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00</div><div class='ctx'> load-$(CONFIG_MIPS_DB1000)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# AMD Alchemy Db1100 eval board</div><div class='del'>-#</div><div class='del'>-platform-$(CONFIG_MIPS_DB1100)	+= alchemy/devboards/</div><div class='del'>-cflags-$(CONFIG_MIPS_DB1100)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00</div><div class='del'>-load-$(CONFIG_MIPS_DB1100)	+= 0xffffffff80100000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# AMD Alchemy Db1500 eval board</div><div class='del'>-#</div><div class='del'>-platform-$(CONFIG_MIPS_DB1500)	+= alchemy/devboards/</div><div class='del'>-cflags-$(CONFIG_MIPS_DB1500)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00</div><div class='del'>-load-$(CONFIG_MIPS_DB1500)	+= 0xffffffff80100000</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # AMD Alchemy Db1550 eval board</div><div class='ctx'> #</div><div class='ctx'> platform-$(CONFIG_MIPS_DB1550)	+= alchemy/devboards/</div><div class='hunk'>@@ -68,42 +37,35 @@ cflags-$(CONFIG_MIPS_DB1550)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00</div><div class='ctx'> load-$(CONFIG_MIPS_DB1550)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# AMD Alchemy Db1200 eval board</div><div class='add'>+# AMD Alchemy Db1200/Pb1200 eval boards</div><div class='ctx'> #</div><div class='ctx'> platform-$(CONFIG_MIPS_DB1200)	+= alchemy/devboards/</div><div class='ctx'> cflags-$(CONFIG_MIPS_DB1200)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00</div><div class='ctx'> load-$(CONFIG_MIPS_DB1200)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# AMD Alchemy Bosporus eval board</div><div class='del'>-#</div><div class='del'>-platform-$(CONFIG_MIPS_BOSPORUS) += alchemy/devboards/</div><div class='del'>-cflags-$(CONFIG_MIPS_BOSPORUS)	 += -I$(srctree)/arch/mips/include/asm/mach-db1x00</div><div class='del'>-load-$(CONFIG_MIPS_BOSPORUS)	 += 0xffffffff80100000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# AMD Alchemy Mirage eval board</div><div class='add'>+# NetLogic DBAu1300 development platform</div><div class='ctx'> #</div><div class='del'>-platform-$(CONFIG_MIPS_MIRAGE)	+= alchemy/devboards/</div><div class='del'>-cflags-$(CONFIG_MIPS_MIRAGE)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00</div><div class='del'>-load-$(CONFIG_MIPS_MIRAGE)	+= 0xffffffff80100000</div><div class='add'>+platform-$(CONFIG_MIPS_DB1300)	+= alchemy/devboards/</div><div class='add'>+cflags-$(CONFIG_MIPS_DB1300)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00</div><div class='add'>+load-$(CONFIG_MIPS_DB1300)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# 4G-Systems eval board</div><div class='add'>+# 4G-Systems MTX-1 "MeshCube" wireless router</div><div class='ctx'> #</div><div class='del'>-platform-$(CONFIG_MIPS_MTX1)	+= alchemy/mtx-1/</div><div class='add'>+platform-$(CONFIG_MIPS_MTX1)	+= alchemy/</div><div class='ctx'> load-$(CONFIG_MIPS_MTX1)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MyCable eval board</div><div class='ctx'> #</div><div class='del'>-platform-$(CONFIG_MIPS_XXS1500)	+= alchemy/xxs1500/</div><div class='add'>+platform-$(CONFIG_MIPS_XXS1500)	+= alchemy/</div><div class='ctx'> load-$(CONFIG_MIPS_XXS1500)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Trapeze ITS GRP board</div><div class='ctx'> #</div><div class='del'>-platform-$(CONFIG_MIPS_GPR)	+= alchemy/gpr/</div><div class='add'>+platform-$(CONFIG_MIPS_GPR)	+= alchemy/</div><div class='ctx'> load-$(CONFIG_MIPS_GPR)		+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> # boards can specify their own &lt;gpio.h&gt; in one of their include dirs.</div><div class='head'>diff --git a/arch/mips/alchemy/gpr/platform.c b/arch/mips/alchemy/board-gpr.c<br/>index 982ce85db60d..ba3259086b9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/gpr/platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/gpr/platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/board-gpr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/board-gpr.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * GPR board platform device registration</div><div class='add'>+ * GPR board platform device registration (Au1550)</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2010 Wolfgang Grandegger &lt;wg@denx.de&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -18,16 +18,89 @@</div><div class='ctx'>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-gpio.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/reboot.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='add'>+#include &lt;prom.h&gt;</div><div class='add'>+</div><div class='add'>+const char *get_system_type(void)</div><div class='add'>+{</div><div class='add'>+	return "GPR";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init prom_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned char *memsize_str;</div><div class='add'>+	unsigned long memsize;</div><div class='add'>+</div><div class='add'>+	prom_argc = fw_arg0;</div><div class='add'>+	prom_argv = (char **)fw_arg1;</div><div class='add'>+	prom_envp = (char **)fw_arg2;</div><div class='add'>+</div><div class='add'>+	prom_init_cmdline();</div><div class='add'>+</div><div class='add'>+	memsize_str = prom_getenv("memsize");</div><div class='add'>+	if (!memsize_str)</div><div class='add'>+		memsize = 0x04000000;</div><div class='add'>+	else</div><div class='add'>+		strict_strtoul(memsize_str, 0, &amp;memsize);</div><div class='add'>+	add_memory_region(0, memsize, BOOT_MEM_RAM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void prom_putchar(unsigned char c)</div><div class='add'>+{</div><div class='add'>+	alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gpr_reset(char *c)</div><div class='add'>+{</div><div class='add'>+	/* switch System-LED to orange (red# and green# on) */</div><div class='add'>+	alchemy_gpio_direction_output(4, 0);</div><div class='add'>+	alchemy_gpio_direction_output(5, 0);</div><div class='add'>+</div><div class='add'>+	/* trigger watchdog to reset board in 200ms */</div><div class='add'>+	printk(KERN_EMERG "Triggering watchdog soft reset...\n");</div><div class='add'>+	raw_local_irq_disable();</div><div class='add'>+	alchemy_gpio_direction_output(1, 0);</div><div class='add'>+	udelay(1);</div><div class='add'>+	alchemy_gpio_set_value(1, 1);</div><div class='add'>+	while (1)</div><div class='add'>+		cpu_wait();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gpr_power_off(void)</div><div class='add'>+{</div><div class='add'>+	while (1)</div><div class='add'>+		cpu_wait();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init board_setup(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO "Trapeze ITS GPR board\n");</div><div class='add'>+</div><div class='add'>+	pm_power_off = gpr_power_off;</div><div class='add'>+	_machine_halt = gpr_power_off;</div><div class='add'>+	_machine_restart = gpr_reset;</div><div class='add'>+</div><div class='add'>+	/* Enable UART1/3 */</div><div class='add'>+	alchemy_uart_enable(AU1000_UART3_PHYS_ADDR);</div><div class='add'>+	alchemy_uart_enable(AU1000_UART1_PHYS_ADDR);</div><div class='add'>+</div><div class='add'>+	/* Take away Reset of UMTS-card */</div><div class='add'>+	alchemy_gpio_direction_output(215, 1);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Watchdog</div><div class='hunk'>@@ -152,7 +225,7 @@ static struct i2c_gpio_platform_data gpr_i2c_data = {</div><div class='ctx'> 	.scl_is_open_drain	= 1,</div><div class='ctx'> 	.udelay			= 2,		/* ~100 kHz */</div><div class='ctx'> 	.timeout		= HZ,</div><div class='del'>- };</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static struct platform_device gpr_i2c_device = {</div><div class='ctx'> 	.name			= "i2c-gpio",</div><div class='hunk'>@@ -184,7 +257,7 @@ static int gpr_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)</div><div class='ctx'> 	else if ((slot == 0) &amp;&amp; (pin == 2))</div><div class='ctx'> 		return AU1550_PCI_INTB;</div><div class='ctx'> </div><div class='del'>-	return -1;</div><div class='add'>+	return 0xff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct alchemy_pci_platdata gpr_pci_pd = {</div><div class='head'>diff --git a/arch/mips/alchemy/mtx-1/platform.c b/arch/mips/alchemy/board-mtx1.c<br/>index cc47b6868ca3..295f1a95f745 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/mtx-1/platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/mtx-1/platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/board-mtx1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/board-mtx1.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * MTX-1 platform devices registration</div><div class='add'>+ * MTX-1 platform devices registration (Au1500)</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007-2009, Florian Fainelli &lt;florian@openwrt.org&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -19,6 +19,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='hunk'>@@ -27,8 +29,85 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;mtd/mtd-abi.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1xxx_eth.h&gt;</div><div class='add'>+#include &lt;prom.h&gt;</div><div class='add'>+</div><div class='add'>+const char *get_system_type(void)</div><div class='add'>+{</div><div class='add'>+	return "MTX-1";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init prom_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned char *memsize_str;</div><div class='add'>+	unsigned long memsize;</div><div class='add'>+</div><div class='add'>+	prom_argc = fw_arg0;</div><div class='add'>+	prom_argv = (char **)fw_arg1;</div><div class='add'>+	prom_envp = (char **)fw_arg2;</div><div class='add'>+</div><div class='add'>+	prom_init_cmdline();</div><div class='add'>+</div><div class='add'>+	memsize_str = prom_getenv("memsize");</div><div class='add'>+	if (!memsize_str)</div><div class='add'>+		memsize = 0x04000000;</div><div class='add'>+	else</div><div class='add'>+		strict_strtoul(memsize_str, 0, &amp;memsize);</div><div class='add'>+	add_memory_region(0, memsize, BOOT_MEM_RAM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void prom_putchar(unsigned char c)</div><div class='add'>+{</div><div class='add'>+	alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mtx1_reset(char *c)</div><div class='add'>+{</div><div class='add'>+	/* Jump to the reset vector */</div><div class='add'>+	__asm__ __volatile__("jr\t%0" : : "r"(0xbfc00000));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mtx1_power_off(void)</div><div class='add'>+{</div><div class='add'>+	while (1)</div><div class='add'>+		asm volatile (</div><div class='add'>+		"	.set	mips32					\n"</div><div class='add'>+		"	wait						\n"</div><div class='add'>+		"	.set	mips0					\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init board_setup(void)</div><div class='add'>+{</div><div class='add'>+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)</div><div class='add'>+	/* Enable USB power switch */</div><div class='add'>+	alchemy_gpio_direction_output(204, 0);</div><div class='add'>+#endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */</div><div class='add'>+</div><div class='add'>+	/* Initialize sys_pinfunc */</div><div class='add'>+	au_writel(SYS_PF_NI2, SYS_PINFUNC);</div><div class='add'>+</div><div class='add'>+	/* Initialize GPIO */</div><div class='add'>+	au_writel(~0, KSEG1ADDR(AU1000_SYS_PHYS_ADDR) + SYS_TRIOUTCLR);</div><div class='add'>+	alchemy_gpio_direction_output(0, 0);	/* Disable M66EN (PCI 66MHz) */</div><div class='add'>+	alchemy_gpio_direction_output(3, 1);	/* Disable PCI CLKRUN# */</div><div class='add'>+	alchemy_gpio_direction_output(1, 1);	/* Enable EXT_IO3 */</div><div class='add'>+	alchemy_gpio_direction_output(5, 0);	/* Disable eth PHY TX_ER */</div><div class='add'>+</div><div class='add'>+	/* Enable LED and set it to green */</div><div class='add'>+	alchemy_gpio_direction_output(211, 1);	/* green on */</div><div class='add'>+	alchemy_gpio_direction_output(212, 0);	/* red off */</div><div class='add'>+</div><div class='add'>+	pm_power_off = mtx1_power_off;</div><div class='add'>+	_machine_halt = mtx1_power_off;</div><div class='add'>+	_machine_restart = mtx1_reset;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "4G Systems MTX-1 Board\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static struct gpio_keys_button mtx1_gpio_button[] = {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -195,7 +274,6 @@ static struct platform_device mtx1_pci_host = {</div><div class='ctx'> 	.resource	= alchemy_pci_host_res,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static struct __initdata platform_device * mtx1_devs[] = {</div><div class='ctx'> 	&amp;mtx1_pci_host,</div><div class='ctx'> 	&amp;mtx1_gpio_leds,</div><div class='hunk'>@@ -206,13 +284,19 @@ static struct __initdata platform_device * mtx1_devs[] = {</div><div class='ctx'> </div><div class='ctx'> static struct au1000_eth_platform_data mtx1_au1000_eth0_pdata = {</div><div class='ctx'> 	.phy_search_highest_addr	= 1,</div><div class='del'>-	.phy1_search_mac0 		= 1,</div><div class='add'>+	.phy1_search_mac0		= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init mtx1_register_devices(void)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	irq_set_irq_type(AU1500_GPIO204_INT, IRQ_TYPE_LEVEL_HIGH);</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO201_INT, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO202_INT, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO203_INT, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO205_INT, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+</div><div class='ctx'> 	au1xxx_override_eth_cfg(0, &amp;mtx1_au1000_eth0_pdata);</div><div class='ctx'> </div><div class='ctx'> 	rc = gpio_request(mtx1_gpio_button[0].gpio,</div><div class='hunk'>@@ -226,5 +310,4 @@ static int __init mtx1_register_devices(void)</div><div class='ctx'> out:</div><div class='ctx'> 	return platform_add_devices(mtx1_devs, ARRAY_SIZE(mtx1_devs));</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> arch_initcall(mtx1_register_devices);</div><div class='head'>diff --git a/arch/mips/alchemy/board-xxs1500.c b/arch/mips/alchemy/board-xxs1500.c<br/>new file mode 100644<br/>index 000000000000..bd5513650293<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/board-xxs1500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/board-xxs1500.c</a></div><div class='hunk'>@@ -0,0 +1,154 @@</div><div class='add'>+/*</div><div class='add'>+ * BRIEF MODULE DESCRIPTION</div><div class='add'>+ *	MyCable XXS1500 board support</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2003, 2008 MontaVista Software Inc.</div><div class='add'>+ * Author: MontaVista Software, Inc. &lt;source@mvista.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'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</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/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='add'>+#include &lt;prom.h&gt;</div><div class='add'>+</div><div class='add'>+const char *get_system_type(void)</div><div class='add'>+{</div><div class='add'>+	return "XXS1500";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init prom_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned char *memsize_str;</div><div class='add'>+	unsigned long memsize;</div><div class='add'>+</div><div class='add'>+	prom_argc = fw_arg0;</div><div class='add'>+	prom_argv = (char **)fw_arg1;</div><div class='add'>+	prom_envp = (char **)fw_arg2;</div><div class='add'>+</div><div class='add'>+	prom_init_cmdline();</div><div class='add'>+</div><div class='add'>+	memsize_str = prom_getenv("memsize");</div><div class='add'>+	if (!memsize_str || strict_strtoul(memsize_str, 0, &amp;memsize))</div><div class='add'>+		memsize = 0x04000000;</div><div class='add'>+</div><div class='add'>+	add_memory_region(0, memsize, BOOT_MEM_RAM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void prom_putchar(unsigned char c)</div><div class='add'>+{</div><div class='add'>+	alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xxs1500_reset(char *c)</div><div class='add'>+{</div><div class='add'>+	/* Jump to the reset vector */</div><div class='add'>+	__asm__ __volatile__("jr\t%0" : : "r"(0xbfc00000));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xxs1500_power_off(void)</div><div class='add'>+{</div><div class='add'>+	while (1)</div><div class='add'>+		asm volatile (</div><div class='add'>+		"	.set	mips32					\n"</div><div class='add'>+		"	wait						\n"</div><div class='add'>+		"	.set	mips0					\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init board_setup(void)</div><div class='add'>+{</div><div class='add'>+	u32 pin_func;</div><div class='add'>+</div><div class='add'>+	pm_power_off = xxs1500_power_off;</div><div class='add'>+	_machine_halt = xxs1500_power_off;</div><div class='add'>+	_machine_restart = xxs1500_reset;</div><div class='add'>+</div><div class='add'>+	alchemy_gpio1_input_enable();</div><div class='add'>+	alchemy_gpio2_enable();</div><div class='add'>+</div><div class='add'>+	/* Set multiple use pins (UART3/GPIO) to UART (it's used as UART too) */</div><div class='add'>+	pin_func  = au_readl(SYS_PINFUNC) &amp; ~SYS_PF_UR3;</div><div class='add'>+	pin_func |= SYS_PF_UR3;</div><div class='add'>+	au_writel(pin_func, SYS_PINFUNC);</div><div class='add'>+</div><div class='add'>+	/* Enable UART */</div><div class='add'>+	alchemy_uart_enable(AU1000_UART3_PHYS_ADDR);</div><div class='add'>+	/* Enable DTR (MCR bit 0) = USB power up */</div><div class='add'>+	__raw_writel(1, (void __iomem *)KSEG1ADDR(AU1000_UART3_PHYS_ADDR + 0x18));</div><div class='add'>+	wmb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************/</div><div class='add'>+</div><div class='add'>+static struct resource xxs1500_pcmcia_res[] = {</div><div class='add'>+	{</div><div class='add'>+		.name	= "pcmcia-io",</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+		.start	= AU1000_PCMCIA_IO_PHYS_ADDR,</div><div class='add'>+		.end	= AU1000_PCMCIA_IO_PHYS_ADDR + 0x000400000 - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "pcmcia-attr",</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+		.start	= AU1000_PCMCIA_ATTR_PHYS_ADDR,</div><div class='add'>+		.end	= AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "pcmcia-mem",</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+		.start	= AU1000_PCMCIA_MEM_PHYS_ADDR,</div><div class='add'>+		.end	= AU1000_PCMCIA_MEM_PHYS_ADDR + 0x000400000 - 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device xxs1500_pcmcia_dev = {</div><div class='add'>+	.name		= "xxs1500_pcmcia",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(xxs1500_pcmcia_res),</div><div class='add'>+	.resource	= xxs1500_pcmcia_res,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *xxs1500_devs[] __initdata = {</div><div class='add'>+	&amp;xxs1500_pcmcia_dev,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init xxs1500_dev_init(void)</div><div class='add'>+{</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO204_INT, IRQ_TYPE_LEVEL_HIGH);</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO201_INT, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO202_INT, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO203_INT, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO205_INT, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO207_INT, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO0_INT, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO1_INT, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO2_INT, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO3_INT, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO4_INT, IRQ_TYPE_LEVEL_LOW); /* CF irq */</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO5_INT, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+</div><div class='add'>+	return platform_add_devices(xxs1500_devs,</div><div class='add'>+				    ARRAY_SIZE(xxs1500_devs));</div><div class='add'>+}</div><div class='add'>+device_initcall(xxs1500_dev_init);</div><div class='head'>diff --git a/arch/mips/alchemy/common/Makefile b/arch/mips/alchemy/common/Makefile<br/>index 811ece7b22e3..407ebc00e661 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/common/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/common/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/common/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/common/Makefile</a></div><div class='hunk'>@@ -6,9 +6,7 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-y += prom.o time.o clocks.o platform.o power.o setup.o \</div><div class='del'>-	sleeper.o dma.o dbdma.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_ALCHEMY_GPIOINT_AU1000) += irq.o</div><div class='add'>+	sleeper.o dma.o dbdma.o vss.o irq.o</div><div class='ctx'> </div><div class='ctx'> # optional gpiolib support</div><div class='ctx'> ifeq ($(CONFIG_ALCHEMY_GPIO_INDIRECT),)</div><div class='head'>diff --git a/arch/mips/alchemy/common/dbdma.c b/arch/mips/alchemy/common/dbdma.c<br/>index 0e63ee487d6d..cf02d7dc2df0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/common/dbdma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/common/dbdma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/common/dbdma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/common/dbdma.c</a></div><div class='hunk'>@@ -148,6 +148,50 @@ static dbdev_tab_t au1200_dbdev_tab[] __initdata = {</div><div class='ctx'> 	{ DSCR_CMD0_ALWAYS,   DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static dbdev_tab_t au1300_dbdev_tab[] __initdata = {</div><div class='add'>+	{ AU1300_DSCR_CMD0_UART0_TX, DEV_FLAGS_OUT, 0, 8,  0x10100004, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_UART0_RX, DEV_FLAGS_IN,  0, 8,  0x10100000, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_UART1_TX, DEV_FLAGS_OUT, 0, 8,  0x10101004, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_UART1_RX, DEV_FLAGS_IN,  0, 8,  0x10101000, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_UART2_TX, DEV_FLAGS_OUT, 0, 8,  0x10102004, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_UART2_RX, DEV_FLAGS_IN,  0, 8,  0x10102000, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_UART3_TX, DEV_FLAGS_OUT, 0, 8,  0x10103004, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_UART3_RX, DEV_FLAGS_IN,  0, 8,  0x10103000, 0, 0 },</div><div class='add'>+</div><div class='add'>+	{ AU1300_DSCR_CMD0_SDMS_TX0, DEV_FLAGS_OUT, 4, 8,  0x10600000, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_SDMS_RX0, DEV_FLAGS_IN,  4, 8,  0x10600004, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_SDMS_TX1, DEV_FLAGS_OUT, 8, 8,  0x10601000, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_SDMS_RX1, DEV_FLAGS_IN,  8, 8,  0x10601004, 0, 0 },</div><div class='add'>+</div><div class='add'>+	{ AU1300_DSCR_CMD0_AES_RX, DEV_FLAGS_IN ,   4, 32, 0x10300008, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_AES_TX, DEV_FLAGS_OUT,   4, 32, 0x10300004, 0, 0 },</div><div class='add'>+</div><div class='add'>+	{ AU1300_DSCR_CMD0_PSC0_TX, DEV_FLAGS_OUT,  0, 16, 0x10a0001c, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_PSC0_RX, DEV_FLAGS_IN,   0, 16, 0x10a0001c, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_PSC1_TX, DEV_FLAGS_OUT,  0, 16, 0x10a0101c, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_PSC1_RX, DEV_FLAGS_IN,   0, 16, 0x10a0101c, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_PSC2_TX, DEV_FLAGS_OUT,  0, 16, 0x10a0201c, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_PSC2_RX, DEV_FLAGS_IN,   0, 16, 0x10a0201c, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_PSC3_TX, DEV_FLAGS_OUT,  0, 16, 0x10a0301c, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_PSC3_RX, DEV_FLAGS_IN,   0, 16, 0x10a0301c, 0, 0 },</div><div class='add'>+</div><div class='add'>+	{ AU1300_DSCR_CMD0_LCD, DEV_FLAGS_ANYUSE,   0, 0,  0x00000000, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_NAND_FLASH, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 },</div><div class='add'>+</div><div class='add'>+	{ AU1300_DSCR_CMD0_SDMS_TX2, DEV_FLAGS_OUT, 4, 8,  0x10602000, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_SDMS_RX2, DEV_FLAGS_IN,  4, 8,  0x10602004, 0, 0 },</div><div class='add'>+</div><div class='add'>+	{ AU1300_DSCR_CMD0_CIM_SYNC, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },</div><div class='add'>+</div><div class='add'>+	{ AU1300_DSCR_CMD0_UDMA, DEV_FLAGS_ANYUSE,  0, 32, 0x14001810, 0, 0 },</div><div class='add'>+</div><div class='add'>+	{ AU1300_DSCR_CMD0_DMA_REQ0, 0, 0, 0, 0x00000000, 0, 0 },</div><div class='add'>+	{ AU1300_DSCR_CMD0_DMA_REQ1, 0, 0, 0, 0x00000000, 0, 0 },</div><div class='add'>+</div><div class='add'>+	{ DSCR_CMD0_THROTTLE, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },</div><div class='add'>+	{ DSCR_CMD0_ALWAYS,   DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* 32 predefined plus 32 custom */</div><div class='ctx'> #define DBDEV_TAB_SIZE		64</div><div class='ctx'> </div><div class='hunk'>@@ -1019,8 +1063,7 @@ static int __init dbdma_setup(unsigned int irq, dbdev_tab_t *idtable)</div><div class='ctx'> 	dbdma_gptr-&gt;ddma_inten = 0xffff;</div><div class='ctx'> 	au_sync();</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(irq, dbdma_interrupt, IRQF_DISABLED, "dbdma",</div><div class='del'>-			  (void *)dbdma_gptr);</div><div class='add'>+	ret = request_irq(irq, dbdma_interrupt, 0, "dbdma", (void *)dbdma_gptr);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		printk(KERN_ERR "Cannot grab DBDMA interrupt!\n");</div><div class='ctx'> 	else {</div><div class='hunk'>@@ -1038,6 +1081,8 @@ static int __init alchemy_dbdma_init(void)</div><div class='ctx'> 		return dbdma_setup(AU1550_DDMA_INT, au1550_dbdev_tab);</div><div class='ctx'> 	case ALCHEMY_CPU_AU1200:</div><div class='ctx'> 		return dbdma_setup(AU1200_DDMA_INT, au1200_dbdev_tab);</div><div class='add'>+	case ALCHEMY_CPU_AU1300:</div><div class='add'>+		return dbdma_setup(AU1300_DDMA_INT, au1300_dbdev_tab);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/alchemy/common/gpiolib.c b/arch/mips/alchemy/common/gpiolib.c<br/>index 91fb4d9e30fd..f1b50f0c01db 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/common/gpiolib.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/common/gpiolib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/common/gpiolib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/common/gpiolib.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'>  *	 CONFIG_ALCHEMY_GPIO_INDIRECT=n, otherwise compilation will fail!</div><div class='ctx'>  *	au1000 SoC have only one GPIO block : GPIO1</div><div class='ctx'>  *	Au1100, Au15x0, Au12x0 have a second one : GPIO2</div><div class='add'>+ *	Au1300 is totally different: 1 block with up to 128 GPIOs</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -35,6 +36,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/gpio-au1000.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/gpio-au1300.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int gpio2_get(struct gpio_chip *chip, unsigned offset)</div><div class='ctx'> {</div><div class='hunk'>@@ -115,6 +117,43 @@ struct gpio_chip alchemy_gpio_chip[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int alchemy_gpic_get(struct gpio_chip *chip, unsigned int off)</div><div class='add'>+{</div><div class='add'>+	return au1300_gpio_get_value(off + AU1300_GPIO_BASE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alchemy_gpic_set(struct gpio_chip *chip, unsigned int off, int v)</div><div class='add'>+{</div><div class='add'>+	au1300_gpio_set_value(off + AU1300_GPIO_BASE, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alchemy_gpic_dir_input(struct gpio_chip *chip, unsigned int off)</div><div class='add'>+{</div><div class='add'>+	return au1300_gpio_direction_input(off + AU1300_GPIO_BASE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alchemy_gpic_dir_output(struct gpio_chip *chip, unsigned int off,</div><div class='add'>+				   int v)</div><div class='add'>+{</div><div class='add'>+	return au1300_gpio_direction_output(off + AU1300_GPIO_BASE, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alchemy_gpic_gpio_to_irq(struct gpio_chip *chip, unsigned int off)</div><div class='add'>+{</div><div class='add'>+	return au1300_gpio_to_irq(off + AU1300_GPIO_BASE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct gpio_chip au1300_gpiochip = {</div><div class='add'>+	.label			= "alchemy-gpic",</div><div class='add'>+	.direction_input	= alchemy_gpic_dir_input,</div><div class='add'>+	.direction_output	= alchemy_gpic_dir_output,</div><div class='add'>+	.get			= alchemy_gpic_get,</div><div class='add'>+	.set			= alchemy_gpic_set,</div><div class='add'>+	.to_irq			= alchemy_gpic_gpio_to_irq,</div><div class='add'>+	.base			= AU1300_GPIO_BASE,</div><div class='add'>+	.ngpio			= AU1300_GPIO_NUM,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init alchemy_gpiochip_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -127,6 +166,9 @@ static int __init alchemy_gpiochip_init(void)</div><div class='ctx'> 		ret = gpiochip_add(&amp;alchemy_gpio_chip[0]);</div><div class='ctx'> 		ret |= gpiochip_add(&amp;alchemy_gpio_chip[1]);</div><div class='ctx'> 		break;</div><div class='add'>+	case ALCHEMY_CPU_AU1300:</div><div class='add'>+		ret = gpiochip_add(&amp;au1300_gpiochip);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/alchemy/common/irq.c b/arch/mips/alchemy/common/irq.c<br/>index 8b60ba0675e2..94fbcd19eb9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/common/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/common/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/common/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/common/irq.c</a></div><div class='hunk'>@@ -25,19 +25,15 @@</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/export.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='del'>-#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq_cpu.h&gt;</div><div class='del'>-#include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-#ifdef CONFIG_MIPS_PB1000</div><div class='del'>-#include &lt;asm/mach-pb1x00/pb1000.h&gt;</div><div class='del'>-#endif</div><div class='add'>+#include &lt;asm/mach-au1x00/gpio-au1300.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Interrupt Controller register offsets */</div><div class='ctx'> #define IC_CFG0RD	0x40</div><div class='hunk'>@@ -69,7 +65,17 @@</div><div class='ctx'> #define IC_FALLINGCLR	0x7C</div><div class='ctx'> #define IC_TESTBIT	0x80</div><div class='ctx'> </div><div class='del'>-static int au1x_ic_settype(struct irq_data *d, unsigned int flow_type);</div><div class='add'>+/* per-processor fixed function irqs */</div><div class='add'>+struct alchemy_irqmap {</div><div class='add'>+	int irq;	/* linux IRQ number */</div><div class='add'>+	int type;	/* IRQ_TYPE_ */</div><div class='add'>+	int prio;	/* irq priority, 0 highest, 3 lowest */</div><div class='add'>+	int internal;	/* GPIC: internal source (no ext. pin)? */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int au1x_ic_settype(struct irq_data *d, unsigned int type);</div><div class='add'>+static int au1300_gpic_settype(struct irq_data *d, unsigned int type);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* NOTE on interrupt priorities: The original writers of this code said:</div><div class='ctx'>  *</div><div class='hunk'>@@ -77,176 +83,207 @@ static int au1x_ic_settype(struct irq_data *d, unsigned int flow_type);</div><div class='ctx'>  * the USB devices-side packet complete interrupt (USB_DEV_REQ_INT)</div><div class='ctx'>  * needs the highest priority.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-/* per-processor fixed function irqs */</div><div class='del'>-struct au1xxx_irqmap {</div><div class='del'>-	int im_irq;</div><div class='del'>-	int im_type;</div><div class='del'>-	int im_request;		/* set 1 to get higher priority */</div><div class='add'>+struct alchemy_irqmap au1000_irqmap[] __initdata = {</div><div class='add'>+	{ AU1000_UART0_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1000_UART1_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1000_UART2_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1000_UART3_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1000_SSI0_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1000_SSI1_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1000_DMA_INT_BASE,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1000_DMA_INT_BASE+1,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1000_DMA_INT_BASE+2,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1000_DMA_INT_BASE+3,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1000_DMA_INT_BASE+4,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1000_DMA_INT_BASE+5,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1000_DMA_INT_BASE+6,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1000_DMA_INT_BASE+7,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1000_TOY_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1000_TOY_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1000_TOY_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1000_TOY_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1000_RTC_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1000_RTC_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1000_RTC_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1000_RTC_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 0, 0 },</div><div class='add'>+	{ AU1000_IRDA_TX_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1000_IRDA_RX_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1000_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH,  0, 0 },</div><div class='add'>+	{ AU1000_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1000_USB_HOST_INT,	  IRQ_TYPE_LEVEL_LOW,   1, 0 },</div><div class='add'>+	{ AU1000_ACSYNC_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1000_MAC0_DMA_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1000_MAC1_DMA_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1000_AC97C_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ -1, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct au1xxx_irqmap au1000_irqmap[] __initdata = {</div><div class='del'>-	{ AU1000_UART0_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1000_UART1_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1000_UART2_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1000_UART3_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1000_SSI0_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1000_SSI1_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1000_DMA_INT_BASE,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1000_DMA_INT_BASE+1,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1000_DMA_INT_BASE+2,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1000_DMA_INT_BASE+3,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1000_DMA_INT_BASE+4,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1000_DMA_INT_BASE+5,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1000_DMA_INT_BASE+6,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1000_DMA_INT_BASE+7,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1000_TOY_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1000_TOY_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1000_TOY_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1000_TOY_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1000_RTC_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1000_RTC_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1000_RTC_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1000_RTC_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 1 },</div><div class='del'>-	{ AU1000_IRDA_TX_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1000_IRDA_RX_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1000_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH,  1 },</div><div class='del'>-	{ AU1000_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1000_USB_HOST_INT,	  IRQ_TYPE_LEVEL_LOW,   0 },</div><div class='del'>-	{ AU1000_ACSYNC_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1000_MAC0_DMA_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1000_MAC1_DMA_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1000_AC97C_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='add'>+struct alchemy_irqmap au1500_irqmap[] __initdata = {</div><div class='add'>+	{ AU1500_UART0_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1500_PCI_INTA,	  IRQ_TYPE_LEVEL_LOW,   1, 0 },</div><div class='add'>+	{ AU1500_PCI_INTB,	  IRQ_TYPE_LEVEL_LOW,   1, 0 },</div><div class='add'>+	{ AU1500_UART3_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1500_PCI_INTC,	  IRQ_TYPE_LEVEL_LOW,   1, 0 },</div><div class='add'>+	{ AU1500_PCI_INTD,	  IRQ_TYPE_LEVEL_LOW,   1, 0 },</div><div class='add'>+	{ AU1500_DMA_INT_BASE,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1500_DMA_INT_BASE+1,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1500_DMA_INT_BASE+2,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1500_DMA_INT_BASE+3,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1500_DMA_INT_BASE+4,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1500_DMA_INT_BASE+5,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1500_DMA_INT_BASE+6,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1500_DMA_INT_BASE+7,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1500_TOY_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1500_TOY_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1500_TOY_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1500_TOY_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1500_RTC_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1500_RTC_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1500_RTC_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1500_RTC_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 0, 0 },</div><div class='add'>+	{ AU1500_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH,  0, 0 },</div><div class='add'>+	{ AU1500_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1500_USB_HOST_INT,	  IRQ_TYPE_LEVEL_LOW,   1, 0 },</div><div class='add'>+	{ AU1500_ACSYNC_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1500_MAC0_DMA_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1500_MAC1_DMA_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1500_AC97C_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='ctx'> 	{ -1, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct au1xxx_irqmap au1500_irqmap[] __initdata = {</div><div class='del'>-	{ AU1500_UART0_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1500_PCI_INTA,	  IRQ_TYPE_LEVEL_LOW,   0 },</div><div class='del'>-	{ AU1500_PCI_INTB,	  IRQ_TYPE_LEVEL_LOW,   0 },</div><div class='del'>-	{ AU1500_UART3_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1500_PCI_INTC,	  IRQ_TYPE_LEVEL_LOW,   0 },</div><div class='del'>-	{ AU1500_PCI_INTD,	  IRQ_TYPE_LEVEL_LOW,   0 },</div><div class='del'>-	{ AU1500_DMA_INT_BASE,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1500_DMA_INT_BASE+1,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1500_DMA_INT_BASE+2,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1500_DMA_INT_BASE+3,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1500_DMA_INT_BASE+4,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1500_DMA_INT_BASE+5,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1500_DMA_INT_BASE+6,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1500_DMA_INT_BASE+7,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1500_TOY_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1500_TOY_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1500_TOY_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1500_TOY_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1500_RTC_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1500_RTC_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1500_RTC_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1500_RTC_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 1 },</div><div class='del'>-	{ AU1500_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH,  1 },</div><div class='del'>-	{ AU1500_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1500_USB_HOST_INT,	  IRQ_TYPE_LEVEL_LOW,   0 },</div><div class='del'>-	{ AU1500_ACSYNC_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1500_MAC0_DMA_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1500_MAC1_DMA_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1500_AC97C_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='add'>+struct alchemy_irqmap au1100_irqmap[] __initdata = {</div><div class='add'>+	{ AU1100_UART0_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1100_UART1_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1100_SD_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1100_UART3_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1100_SSI0_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1100_SSI1_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1100_DMA_INT_BASE,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1100_DMA_INT_BASE+1,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1100_DMA_INT_BASE+2,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1100_DMA_INT_BASE+3,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1100_DMA_INT_BASE+4,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1100_DMA_INT_BASE+5,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1100_DMA_INT_BASE+6,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1100_DMA_INT_BASE+7,  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1100_TOY_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1100_TOY_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1100_TOY_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1100_TOY_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1100_RTC_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1100_RTC_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1100_RTC_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1100_RTC_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 0, 0 },</div><div class='add'>+	{ AU1100_IRDA_TX_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1100_IRDA_RX_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1100_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH,  0, 0 },</div><div class='add'>+	{ AU1100_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1100_USB_HOST_INT,	  IRQ_TYPE_LEVEL_LOW,   1, 0 },</div><div class='add'>+	{ AU1100_ACSYNC_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1100_MAC0_DMA_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1100_LCD_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1100_AC97C_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='ctx'> 	{ -1, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct au1xxx_irqmap au1100_irqmap[] __initdata = {</div><div class='del'>-	{ AU1100_UART0_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1100_UART1_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1100_SD_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1100_UART3_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1100_SSI0_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1100_SSI1_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1100_DMA_INT_BASE,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1100_DMA_INT_BASE+1,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1100_DMA_INT_BASE+2,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1100_DMA_INT_BASE+3,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1100_DMA_INT_BASE+4,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1100_DMA_INT_BASE+5,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1100_DMA_INT_BASE+6,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1100_DMA_INT_BASE+7,  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1100_TOY_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1100_TOY_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1100_TOY_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1100_TOY_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1100_RTC_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1100_RTC_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1100_RTC_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1100_RTC_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 1 },</div><div class='del'>-	{ AU1100_IRDA_TX_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1100_IRDA_RX_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1100_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH,  1 },</div><div class='del'>-	{ AU1100_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1100_USB_HOST_INT,	  IRQ_TYPE_LEVEL_LOW,   0 },</div><div class='del'>-	{ AU1100_ACSYNC_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1100_MAC0_DMA_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1100_LCD_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1100_AC97C_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='add'>+struct alchemy_irqmap au1550_irqmap[] __initdata = {</div><div class='add'>+	{ AU1550_UART0_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1550_PCI_INTA,	  IRQ_TYPE_LEVEL_LOW,   1, 0 },</div><div class='add'>+	{ AU1550_PCI_INTB,	  IRQ_TYPE_LEVEL_LOW,   1, 0 },</div><div class='add'>+	{ AU1550_DDMA_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1550_CRYPTO_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1550_PCI_INTC,	  IRQ_TYPE_LEVEL_LOW,   1, 0 },</div><div class='add'>+	{ AU1550_PCI_INTD,	  IRQ_TYPE_LEVEL_LOW,   1, 0 },</div><div class='add'>+	{ AU1550_PCI_RST_INT,	  IRQ_TYPE_LEVEL_LOW,   1, 0 },</div><div class='add'>+	{ AU1550_UART1_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1550_UART3_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1550_PSC0_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1550_PSC1_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1550_PSC2_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1550_PSC3_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1550_TOY_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1550_TOY_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1550_TOY_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1550_TOY_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1550_RTC_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1550_RTC_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1550_RTC_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1550_RTC_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 0, 0 },</div><div class='add'>+	{ AU1550_NAND_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1550_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH,  0, 0 },</div><div class='add'>+	{ AU1550_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1550_USB_HOST_INT,	  IRQ_TYPE_LEVEL_LOW,   1, 0 },</div><div class='add'>+	{ AU1550_MAC0_DMA_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1550_MAC1_DMA_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='ctx'> 	{ -1, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct au1xxx_irqmap au1550_irqmap[] __initdata = {</div><div class='del'>-	{ AU1550_UART0_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1550_PCI_INTA,	  IRQ_TYPE_LEVEL_LOW,   0 },</div><div class='del'>-	{ AU1550_PCI_INTB,	  IRQ_TYPE_LEVEL_LOW,   0 },</div><div class='del'>-	{ AU1550_DDMA_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1550_CRYPTO_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1550_PCI_INTC,	  IRQ_TYPE_LEVEL_LOW,   0 },</div><div class='del'>-	{ AU1550_PCI_INTD,	  IRQ_TYPE_LEVEL_LOW,   0 },</div><div class='del'>-	{ AU1550_PCI_RST_INT,	  IRQ_TYPE_LEVEL_LOW,   0 },</div><div class='del'>-	{ AU1550_UART1_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1550_UART3_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1550_PSC0_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1550_PSC1_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1550_PSC2_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1550_PSC3_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1550_TOY_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1550_TOY_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1550_TOY_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1550_TOY_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1550_RTC_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1550_RTC_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1550_RTC_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1550_RTC_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 1 },</div><div class='del'>-	{ AU1550_NAND_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1550_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH,  1 },</div><div class='del'>-	{ AU1550_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1550_USB_HOST_INT,	  IRQ_TYPE_LEVEL_LOW,   0 },</div><div class='del'>-	{ AU1550_MAC0_DMA_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1550_MAC1_DMA_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='add'>+struct alchemy_irqmap au1200_irqmap[] __initdata = {</div><div class='add'>+	{ AU1200_UART0_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1200_SWT_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1200_SD_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1200_DDMA_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1200_MAE_BE_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1200_UART1_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1200_MAE_FE_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1200_PSC0_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1200_PSC1_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1200_AES_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1200_CAMERA_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1200_TOY_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1200_TOY_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1200_TOY_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1200_TOY_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1200_RTC_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1200_RTC_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1200_RTC_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1200_RTC_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 0, 0 },</div><div class='add'>+	{ AU1200_NAND_INT,	  IRQ_TYPE_EDGE_RISING, 1, 0 },</div><div class='add'>+	{ AU1200_USB_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1200_LCD_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='add'>+	{ AU1200_MAE_BOTH_INT,	  IRQ_TYPE_LEVEL_HIGH,  1, 0 },</div><div class='ctx'> 	{ -1, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct au1xxx_irqmap au1200_irqmap[] __initdata = {</div><div class='del'>-	{ AU1200_UART0_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1200_SWT_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1200_SD_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1200_DDMA_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1200_MAE_BE_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1200_UART1_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1200_MAE_FE_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1200_PSC0_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1200_PSC1_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1200_AES_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1200_CAMERA_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1200_TOY_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1200_TOY_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1200_TOY_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1200_TOY_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1200_RTC_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1200_RTC_MATCH0_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1200_RTC_MATCH1_INT,  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1200_RTC_MATCH2_INT,  IRQ_TYPE_EDGE_RISING, 1 },</div><div class='del'>-	{ AU1200_NAND_INT,	  IRQ_TYPE_EDGE_RISING, 0 },</div><div class='del'>-	{ AU1200_USB_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1200_LCD_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ AU1200_MAE_BOTH_INT,	  IRQ_TYPE_LEVEL_HIGH,  0 },</div><div class='del'>-	{ -1, },</div><div class='add'>+static struct alchemy_irqmap au1300_irqmap[] __initdata = {</div><div class='add'>+	/* multifunction: gpio pin or device */</div><div class='add'>+	{ AU1300_UART1_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 0, },</div><div class='add'>+	{ AU1300_UART2_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 0, },</div><div class='add'>+	{ AU1300_UART3_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 0, },</div><div class='add'>+	{ AU1300_SD1_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 0, },</div><div class='add'>+	{ AU1300_SD2_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 0, },</div><div class='add'>+	{ AU1300_PSC0_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 0, },</div><div class='add'>+	{ AU1300_PSC1_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 0, },</div><div class='add'>+	{ AU1300_PSC2_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 0, },</div><div class='add'>+	{ AU1300_PSC3_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 0, },</div><div class='add'>+	{ AU1300_NAND_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 0, },</div><div class='add'>+	/* au1300 internal */</div><div class='add'>+	{ AU1300_DDMA_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 1, },</div><div class='add'>+	{ AU1300_MMU_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 1, },</div><div class='add'>+	{ AU1300_MPU_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 1, },</div><div class='add'>+	{ AU1300_GPU_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 1, },</div><div class='add'>+	{ AU1300_UDMA_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 1, },</div><div class='add'>+	{ AU1300_TOY_INT,	 IRQ_TYPE_EDGE_RISING,	1, 1, },</div><div class='add'>+	{ AU1300_TOY_MATCH0_INT, IRQ_TYPE_EDGE_RISING,	1, 1, },</div><div class='add'>+	{ AU1300_TOY_MATCH1_INT, IRQ_TYPE_EDGE_RISING,	1, 1, },</div><div class='add'>+	{ AU1300_TOY_MATCH2_INT, IRQ_TYPE_EDGE_RISING,	1, 1, },</div><div class='add'>+	{ AU1300_RTC_INT,	 IRQ_TYPE_EDGE_RISING,	1, 1, },</div><div class='add'>+	{ AU1300_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING,	1, 1, },</div><div class='add'>+	{ AU1300_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING,	1, 1, },</div><div class='add'>+	{ AU1300_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING,	0, 1, },</div><div class='add'>+	{ AU1300_UART0_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 1, },</div><div class='add'>+	{ AU1300_SD0_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 1, },</div><div class='add'>+	{ AU1300_USB_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 1, },</div><div class='add'>+	{ AU1300_LCD_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 1, },</div><div class='add'>+	{ AU1300_BSA_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 1, },</div><div class='add'>+	{ AU1300_MPE_INT,	 IRQ_TYPE_EDGE_RISING,	1, 1, },</div><div class='add'>+	{ AU1300_ITE_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 1, },</div><div class='add'>+	{ AU1300_AES_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 1, },</div><div class='add'>+	{ AU1300_CIM_INT,	 IRQ_TYPE_LEVEL_HIGH,	1, 1, },</div><div class='add'>+	{ -1, },	/* terminator */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static void au1x_ic0_unmask(struct irq_data *d)</div><div class='ctx'> {</div><div class='hunk'>@@ -265,14 +302,6 @@ static void au1x_ic1_unmask(struct irq_data *d)</div><div class='ctx'> </div><div class='ctx'> 	__raw_writel(1 &lt;&lt; bit, base + IC_MASKSET);</div><div class='ctx'> 	__raw_writel(1 &lt;&lt; bit, base + IC_WAKESET);</div><div class='del'>-</div><div class='del'>-/* very hacky. does the pb1000 cpld auto-disable this int?</div><div class='del'>- * nowhere in the current kernel sources is it disabled.	--mlau</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_MIPS_PB1000)</div><div class='del'>-	if (d-&gt;irq == AU1000_GPIO15_INT)</div><div class='del'>-		__raw_writel(0x4000, (void __iomem *)PB1000_MDR); /* enable int */</div><div class='del'>-#endif</div><div class='ctx'> 	wmb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -470,40 +499,219 @@ static int au1x_ic_settype(struct irq_data *d, unsigned int flow_type)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage void plat_irq_dispatch(void)</div><div class='add'>+/******************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * au1300_gpic_chgcfg - change PIN configuration.</div><div class='add'>+ * @gpio:	pin to change (0-based GPIO number from datasheet).</div><div class='add'>+ * @clr:	clear all bits set in 'clr'.</div><div class='add'>+ * @set:	set these bits.</div><div class='add'>+ *</div><div class='add'>+ * modifies a pins' configuration register, bits set in @clr will</div><div class='add'>+ * be cleared in the register, bits in @set will be set.</div><div class='add'>+ */</div><div class='add'>+static inline void au1300_gpic_chgcfg(unsigned int gpio,</div><div class='add'>+				      unsigned long clr,</div><div class='add'>+				      unsigned long set)</div><div class='add'>+{</div><div class='add'>+	void __iomem *r = AU1300_GPIC_ADDR;</div><div class='add'>+	unsigned long l;</div><div class='add'>+</div><div class='add'>+	r += gpio * 4;	/* offset into pin config array */</div><div class='add'>+	l = __raw_readl(r + AU1300_GPIC_PINCFG);</div><div class='add'>+	l &amp;= ~clr;</div><div class='add'>+	l |= set;</div><div class='add'>+	__raw_writel(l, r + AU1300_GPIC_PINCFG);</div><div class='add'>+	wmb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * au1300_pinfunc_to_gpio - assign a pin as GPIO input (GPIO ctrl).</div><div class='add'>+ * @pin:	pin (0-based GPIO number from datasheet).</div><div class='add'>+ *</div><div class='add'>+ * Assigns a GPIO pin to the GPIO controller, so its level can either</div><div class='add'>+ * be read or set through the generic GPIO functions.</div><div class='add'>+ * If you need a GPOUT, use au1300_gpio_set_value(pin, 0/1).</div><div class='add'>+ * REVISIT: is this function really necessary?</div><div class='add'>+ */</div><div class='add'>+void au1300_pinfunc_to_gpio(enum au1300_multifunc_pins gpio)</div><div class='add'>+{</div><div class='add'>+	au1300_gpio_direction_input(gpio + AU1300_GPIO_BASE);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(au1300_pinfunc_to_gpio);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * au1300_pinfunc_to_dev - assign a pin to the device function.</div><div class='add'>+ * @pin:	pin (0-based GPIO number from datasheet).</div><div class='add'>+ *</div><div class='add'>+ * Assigns a GPIO pin to its associated device function; the pin will be</div><div class='add'>+ * driven by the device and not through GPIO functions.</div><div class='add'>+ */</div><div class='add'>+void au1300_pinfunc_to_dev(enum au1300_multifunc_pins gpio)</div><div class='add'>+{</div><div class='add'>+	void __iomem *r = AU1300_GPIC_ADDR;</div><div class='add'>+	unsigned long bit;</div><div class='add'>+</div><div class='add'>+	r += GPIC_GPIO_BANKOFF(gpio);</div><div class='add'>+	bit = GPIC_GPIO_TO_BIT(gpio);</div><div class='add'>+	__raw_writel(bit, r + AU1300_GPIC_DEVSEL);</div><div class='add'>+	wmb();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(au1300_pinfunc_to_dev);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * au1300_set_irq_priority -  set internal priority of IRQ.</div><div class='add'>+ * @irq:	irq to set priority (linux irq number).</div><div class='add'>+ * @p:		priority (0 = highest, 3 = lowest).</div><div class='add'>+ */</div><div class='add'>+void au1300_set_irq_priority(unsigned int irq, int p)</div><div class='ctx'> {</div><div class='del'>-	unsigned int pending = read_c0_status() &amp; read_c0_cause();</div><div class='del'>-	unsigned long s, off;</div><div class='del'>-</div><div class='del'>-	if (pending &amp; CAUSEF_IP7) {</div><div class='del'>-		off = MIPS_CPU_IRQ_BASE + 7;</div><div class='del'>-		goto handle;</div><div class='del'>-	} else if (pending &amp; CAUSEF_IP2) {</div><div class='del'>-		s = KSEG1ADDR(AU1000_IC0_PHYS_ADDR) + IC_REQ0INT;</div><div class='del'>-		off = AU1000_INTC0_INT_BASE;</div><div class='del'>-	} else if (pending &amp; CAUSEF_IP3) {</div><div class='del'>-		s = KSEG1ADDR(AU1000_IC0_PHYS_ADDR) + IC_REQ1INT;</div><div class='del'>-		off = AU1000_INTC0_INT_BASE;</div><div class='del'>-	} else if (pending &amp; CAUSEF_IP4) {</div><div class='del'>-		s = KSEG1ADDR(AU1000_IC1_PHYS_ADDR) + IC_REQ0INT;</div><div class='del'>-		off = AU1000_INTC1_INT_BASE;</div><div class='del'>-	} else if (pending &amp; CAUSEF_IP5) {</div><div class='del'>-		s = KSEG1ADDR(AU1000_IC1_PHYS_ADDR) + IC_REQ1INT;</div><div class='del'>-		off = AU1000_INTC1_INT_BASE;</div><div class='del'>-	} else</div><div class='del'>-		goto spurious;</div><div class='del'>-</div><div class='del'>-	s = __raw_readl((void __iomem *)s);</div><div class='del'>-	if (unlikely(!s)) {</div><div class='del'>-spurious:</div><div class='del'>-		spurious_interrupt();</div><div class='del'>-		return;</div><div class='add'>+	irq -= ALCHEMY_GPIC_INT_BASE;</div><div class='add'>+	au1300_gpic_chgcfg(irq, GPIC_CFG_IL_MASK, GPIC_CFG_IL_SET(p));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(au1300_set_irq_priority);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * au1300_set_dbdma_gpio - assign a gpio to one of the DBDMA triggers.</div><div class='add'>+ * @dchan:	dbdma trigger select (0, 1).</div><div class='add'>+ * @gpio:	pin to assign as trigger.</div><div class='add'>+ *</div><div class='add'>+ * DBDMA controller has 2 external trigger sources; this function</div><div class='add'>+ * assigns a GPIO to the selected trigger.</div><div class='add'>+ */</div><div class='add'>+void au1300_set_dbdma_gpio(int dchan, unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	unsigned long r;</div><div class='add'>+</div><div class='add'>+	if ((dchan &gt;= 0) &amp;&amp; (dchan &lt;= 1)) {</div><div class='add'>+		r = __raw_readl(AU1300_GPIC_ADDR + AU1300_GPIC_DMASEL);</div><div class='add'>+		r &amp;= ~(0xff &lt;&lt; (8 * dchan));</div><div class='add'>+		r |= (gpio &amp; 0x7f) &lt;&lt; (8 * dchan);</div><div class='add'>+		__raw_writel(r, AU1300_GPIC_ADDR + AU1300_GPIC_DMASEL);</div><div class='add'>+		wmb();</div><div class='ctx'> 	}</div><div class='del'>-	off += __ffs(s);</div><div class='del'>-handle:</div><div class='del'>-	do_IRQ(off);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void gpic_pin_set_idlewake(unsigned int gpio, int allow)</div><div class='add'>+{</div><div class='add'>+	au1300_gpic_chgcfg(gpio, GPIC_CFG_IDLEWAKE,</div><div class='add'>+			   allow ? GPIC_CFG_IDLEWAKE : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void au1300_gpic_mask(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	void __iomem *r = AU1300_GPIC_ADDR;</div><div class='add'>+	unsigned long bit, irq = d-&gt;irq;</div><div class='add'>+</div><div class='add'>+	irq -= ALCHEMY_GPIC_INT_BASE;</div><div class='add'>+	r += GPIC_GPIO_BANKOFF(irq);</div><div class='add'>+	bit = GPIC_GPIO_TO_BIT(irq);</div><div class='add'>+	__raw_writel(bit, r + AU1300_GPIC_IDIS);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	gpic_pin_set_idlewake(irq, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void au1300_gpic_unmask(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	void __iomem *r = AU1300_GPIC_ADDR;</div><div class='add'>+	unsigned long bit, irq = d-&gt;irq;</div><div class='add'>+</div><div class='add'>+	irq -= ALCHEMY_GPIC_INT_BASE;</div><div class='add'>+</div><div class='add'>+	gpic_pin_set_idlewake(irq, 1);</div><div class='add'>+</div><div class='add'>+	r += GPIC_GPIO_BANKOFF(irq);</div><div class='add'>+	bit = GPIC_GPIO_TO_BIT(irq);</div><div class='add'>+	__raw_writel(bit, r + AU1300_GPIC_IEN);</div><div class='add'>+	wmb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void au1300_gpic_maskack(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	void __iomem *r = AU1300_GPIC_ADDR;</div><div class='add'>+	unsigned long bit, irq = d-&gt;irq;</div><div class='add'>+</div><div class='add'>+	irq -= ALCHEMY_GPIC_INT_BASE;</div><div class='add'>+	r += GPIC_GPIO_BANKOFF(irq);</div><div class='add'>+	bit = GPIC_GPIO_TO_BIT(irq);</div><div class='add'>+	__raw_writel(bit, r + AU1300_GPIC_IPEND);	/* ack */</div><div class='add'>+	__raw_writel(bit, r + AU1300_GPIC_IDIS);	/* mask */</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	gpic_pin_set_idlewake(irq, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void au1300_gpic_ack(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	void __iomem *r = AU1300_GPIC_ADDR;</div><div class='add'>+	unsigned long bit, irq = d-&gt;irq;</div><div class='add'>+</div><div class='add'>+	irq -= ALCHEMY_GPIC_INT_BASE;</div><div class='add'>+	r += GPIC_GPIO_BANKOFF(irq);</div><div class='add'>+	bit = GPIC_GPIO_TO_BIT(irq);</div><div class='add'>+	__raw_writel(bit, r + AU1300_GPIC_IPEND);	/* ack */</div><div class='add'>+	wmb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip au1300_gpic = {</div><div class='add'>+	.name		= "GPIOINT",</div><div class='add'>+	.irq_ack	= au1300_gpic_ack,</div><div class='add'>+	.irq_mask	= au1300_gpic_mask,</div><div class='add'>+	.irq_mask_ack	= au1300_gpic_maskack,</div><div class='add'>+	.irq_unmask	= au1300_gpic_unmask,</div><div class='add'>+	.irq_set_type	= au1300_gpic_settype,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int au1300_gpic_settype(struct irq_data *d, unsigned int type)</div><div class='add'>+{</div><div class='add'>+	unsigned long s;</div><div class='add'>+	unsigned char *name = NULL;</div><div class='add'>+	irq_flow_handler_t hdl = NULL;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case IRQ_TYPE_LEVEL_HIGH:</div><div class='add'>+		s = GPIC_CFG_IC_LEVEL_HIGH;</div><div class='add'>+		name = "high";</div><div class='add'>+		hdl = handle_level_irq;</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_TYPE_LEVEL_LOW:</div><div class='add'>+		s = GPIC_CFG_IC_LEVEL_LOW;</div><div class='add'>+		name = "low";</div><div class='add'>+		hdl = handle_level_irq;</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_TYPE_EDGE_RISING:</div><div class='add'>+		s = GPIC_CFG_IC_EDGE_RISE;</div><div class='add'>+		name = "posedge";</div><div class='add'>+		hdl = handle_edge_irq;</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_TYPE_EDGE_FALLING:</div><div class='add'>+		s = GPIC_CFG_IC_EDGE_FALL;</div><div class='add'>+		name = "negedge";</div><div class='add'>+		hdl = handle_edge_irq;</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_TYPE_EDGE_BOTH:</div><div class='add'>+		s = GPIC_CFG_IC_EDGE_BOTH;</div><div class='add'>+		name = "bothedge";</div><div class='add'>+		hdl = handle_edge_irq;</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_TYPE_NONE:</div><div class='add'>+		s = GPIC_CFG_IC_OFF;</div><div class='add'>+		name = "disabled";</div><div class='add'>+		hdl = handle_level_irq;</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'>+	__irq_set_chip_handler_name_locked(d-&gt;irq, &amp;au1300_gpic, hdl, name);</div><div class='add'>+</div><div class='add'>+	au1300_gpic_chgcfg(d-&gt;irq - ALCHEMY_GPIC_INT_BASE, GPIC_CFG_IC_MASK, s);</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'> </div><div class='ctx'> static inline void ic_init(void __iomem *base)</div><div class='ctx'> {</div><div class='hunk'>@@ -521,13 +729,159 @@ static inline void ic_init(void __iomem *base)</div><div class='ctx'> 	wmb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init au1000_init_irq(struct au1xxx_irqmap *map)</div><div class='add'>+static unsigned long alchemy_gpic_pmdata[ALCHEMY_GPIC_INT_NUM + 6];</div><div class='add'>+</div><div class='add'>+static inline void alchemy_ic_suspend_one(void __iomem *base, unsigned long *d)</div><div class='add'>+{</div><div class='add'>+	d[0] = __raw_readl(base + IC_CFG0RD);</div><div class='add'>+	d[1] = __raw_readl(base + IC_CFG1RD);</div><div class='add'>+	d[2] = __raw_readl(base + IC_CFG2RD);</div><div class='add'>+	d[3] = __raw_readl(base + IC_SRCRD);</div><div class='add'>+	d[4] = __raw_readl(base + IC_ASSIGNRD);</div><div class='add'>+	d[5] = __raw_readl(base + IC_WAKERD);</div><div class='add'>+	d[6] = __raw_readl(base + IC_MASKRD);</div><div class='add'>+	ic_init(base);		/* shut it up too while at it */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void alchemy_ic_resume_one(void __iomem *base, unsigned long *d)</div><div class='add'>+{</div><div class='add'>+	ic_init(base);</div><div class='add'>+</div><div class='add'>+	__raw_writel(d[0], base + IC_CFG0SET);</div><div class='add'>+	__raw_writel(d[1], base + IC_CFG1SET);</div><div class='add'>+	__raw_writel(d[2], base + IC_CFG2SET);</div><div class='add'>+	__raw_writel(d[3], base + IC_SRCSET);</div><div class='add'>+	__raw_writel(d[4], base + IC_ASSIGNSET);</div><div class='add'>+	__raw_writel(d[5], base + IC_WAKESET);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	__raw_writel(d[6], base + IC_MASKSET);</div><div class='add'>+	wmb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alchemy_ic_suspend(void)</div><div class='add'>+{</div><div class='add'>+	alchemy_ic_suspend_one((void __iomem *)KSEG1ADDR(AU1000_IC0_PHYS_ADDR),</div><div class='add'>+			       alchemy_gpic_pmdata);</div><div class='add'>+	alchemy_ic_suspend_one((void __iomem *)KSEG1ADDR(AU1000_IC1_PHYS_ADDR),</div><div class='add'>+			       &amp;alchemy_gpic_pmdata[7]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alchemy_ic_resume(void)</div><div class='add'>+{</div><div class='add'>+	alchemy_ic_resume_one((void __iomem *)KSEG1ADDR(AU1000_IC1_PHYS_ADDR),</div><div class='add'>+			      &amp;alchemy_gpic_pmdata[7]);</div><div class='add'>+	alchemy_ic_resume_one((void __iomem *)KSEG1ADDR(AU1000_IC0_PHYS_ADDR),</div><div class='add'>+			      alchemy_gpic_pmdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alchemy_gpic_suspend(void)</div><div class='add'>+{</div><div class='add'>+	void __iomem *base = (void __iomem *)KSEG1ADDR(AU1300_GPIC_PHYS_ADDR);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* save 4 interrupt mask status registers */</div><div class='add'>+	alchemy_gpic_pmdata[0] = __raw_readl(base + AU1300_GPIC_IEN + 0x0);</div><div class='add'>+	alchemy_gpic_pmdata[1] = __raw_readl(base + AU1300_GPIC_IEN + 0x4);</div><div class='add'>+	alchemy_gpic_pmdata[2] = __raw_readl(base + AU1300_GPIC_IEN + 0x8);</div><div class='add'>+	alchemy_gpic_pmdata[3] = __raw_readl(base + AU1300_GPIC_IEN + 0xc);</div><div class='add'>+</div><div class='add'>+	/* save misc register(s) */</div><div class='add'>+	alchemy_gpic_pmdata[4] = __raw_readl(base + AU1300_GPIC_DMASEL);</div><div class='add'>+</div><div class='add'>+	/* molto silenzioso */</div><div class='add'>+	__raw_writel(~0UL, base + AU1300_GPIC_IDIS + 0x0);</div><div class='add'>+	__raw_writel(~0UL, base + AU1300_GPIC_IDIS + 0x4);</div><div class='add'>+	__raw_writel(~0UL, base + AU1300_GPIC_IDIS + 0x8);</div><div class='add'>+	__raw_writel(~0UL, base + AU1300_GPIC_IDIS + 0xc);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	/* save pin/int-type configuration */</div><div class='add'>+	base += AU1300_GPIC_PINCFG;</div><div class='add'>+	for (i = 0; i &lt; ALCHEMY_GPIC_INT_NUM; i++)</div><div class='add'>+		alchemy_gpic_pmdata[i + 5] = __raw_readl(base + (i &lt;&lt; 2));</div><div class='add'>+</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alchemy_gpic_resume(void)</div><div class='add'>+{</div><div class='add'>+	void __iomem *base = (void __iomem *)KSEG1ADDR(AU1300_GPIC_PHYS_ADDR);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* disable all first */</div><div class='add'>+	__raw_writel(~0UL, base + AU1300_GPIC_IDIS + 0x0);</div><div class='add'>+	__raw_writel(~0UL, base + AU1300_GPIC_IDIS + 0x4);</div><div class='add'>+	__raw_writel(~0UL, base + AU1300_GPIC_IDIS + 0x8);</div><div class='add'>+	__raw_writel(~0UL, base + AU1300_GPIC_IDIS + 0xc);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	/* restore pin/int-type configurations */</div><div class='add'>+	base += AU1300_GPIC_PINCFG;</div><div class='add'>+	for (i = 0; i &lt; ALCHEMY_GPIC_INT_NUM; i++)</div><div class='add'>+		__raw_writel(alchemy_gpic_pmdata[i + 5], base + (i &lt;&lt; 2));</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	/* restore misc register(s) */</div><div class='add'>+	base = (void __iomem *)KSEG1ADDR(AU1300_GPIC_PHYS_ADDR);</div><div class='add'>+	__raw_writel(alchemy_gpic_pmdata[4], base + AU1300_GPIC_DMASEL);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	/* finally restore masks */</div><div class='add'>+	__raw_writel(alchemy_gpic_pmdata[0], base + AU1300_GPIC_IEN + 0x0);</div><div class='add'>+	__raw_writel(alchemy_gpic_pmdata[1], base + AU1300_GPIC_IEN + 0x4);</div><div class='add'>+	__raw_writel(alchemy_gpic_pmdata[2], base + AU1300_GPIC_IEN + 0x8);</div><div class='add'>+	__raw_writel(alchemy_gpic_pmdata[3], base + AU1300_GPIC_IEN + 0xc);</div><div class='add'>+	wmb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct syscore_ops alchemy_ic_pmops = {</div><div class='add'>+	.suspend	= alchemy_ic_suspend,</div><div class='add'>+	.resume		= alchemy_ic_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct syscore_ops alchemy_gpic_pmops = {</div><div class='add'>+	.suspend	= alchemy_gpic_suspend,</div><div class='add'>+	.resume		= alchemy_gpic_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************/</div><div class='add'>+</div><div class='add'>+/* create chained handlers for the 4 IC requests to the MIPS IRQ ctrl */</div><div class='add'>+#define DISP(name, base, addr)						      \</div><div class='add'>+static void au1000_##name##_dispatch(unsigned int irq, struct irq_desc *d)    \</div><div class='add'>+{									      \</div><div class='add'>+	unsigned long r = __raw_readl((void __iomem *)KSEG1ADDR(addr));	      \</div><div class='add'>+	if (likely(r))							      \</div><div class='add'>+		generic_handle_irq(base + __ffs(r));			      \</div><div class='add'>+	else								      \</div><div class='add'>+		spurious_interrupt();					      \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DISP(ic0r0, AU1000_INTC0_INT_BASE, AU1000_IC0_PHYS_ADDR + IC_REQ0INT)</div><div class='add'>+DISP(ic0r1, AU1000_INTC0_INT_BASE, AU1000_IC0_PHYS_ADDR + IC_REQ1INT)</div><div class='add'>+DISP(ic1r0, AU1000_INTC1_INT_BASE, AU1000_IC1_PHYS_ADDR + IC_REQ0INT)</div><div class='add'>+DISP(ic1r1, AU1000_INTC1_INT_BASE, AU1000_IC1_PHYS_ADDR + IC_REQ1INT)</div><div class='add'>+</div><div class='add'>+static void alchemy_gpic_dispatch(unsigned int irq, struct irq_desc *d)</div><div class='add'>+{</div><div class='add'>+	int i = __raw_readl(AU1300_GPIC_ADDR + AU1300_GPIC_PRIENC);</div><div class='add'>+	generic_handle_irq(ALCHEMY_GPIC_INT_BASE + i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************/</div><div class='add'>+</div><div class='add'>+static void __init au1000_init_irq(struct alchemy_irqmap *map)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int bit, irq_nr;</div><div class='ctx'> 	void __iomem *base;</div><div class='ctx'> </div><div class='ctx'> 	ic_init((void __iomem *)KSEG1ADDR(AU1000_IC0_PHYS_ADDR));</div><div class='ctx'> 	ic_init((void __iomem *)KSEG1ADDR(AU1000_IC1_PHYS_ADDR));</div><div class='add'>+	register_syscore_ops(&amp;alchemy_ic_pmops);</div><div class='ctx'> 	mips_cpu_irq_init();</div><div class='ctx'> </div><div class='ctx'> 	/* register all 64 possible IC0+IC1 irq sources as type "none".</div><div class='hunk'>@@ -544,8 +898,8 @@ static void __init au1000_init_irq(struct au1xxx_irqmap *map)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize IC0, which is fixed per processor.</div><div class='ctx'> 	 */</div><div class='del'>-	while (map-&gt;im_irq != -1) {</div><div class='del'>-		irq_nr = map-&gt;im_irq;</div><div class='add'>+	while (map-&gt;irq != -1) {</div><div class='add'>+		irq_nr = map-&gt;irq;</div><div class='ctx'> </div><div class='ctx'> 		if (irq_nr &gt;= AU1000_INTC1_INT_BASE) {</div><div class='ctx'> 			bit = irq_nr - AU1000_INTC1_INT_BASE;</div><div class='hunk'>@@ -554,16 +908,61 @@ static void __init au1000_init_irq(struct au1xxx_irqmap *map)</div><div class='ctx'> 			bit = irq_nr - AU1000_INTC0_INT_BASE;</div><div class='ctx'> 			base = (void __iomem *)KSEG1ADDR(AU1000_IC0_PHYS_ADDR);</div><div class='ctx'> 		}</div><div class='del'>-		if (map-&gt;im_request)</div><div class='add'>+		if (map-&gt;prio == 0)</div><div class='ctx'> 			__raw_writel(1 &lt;&lt; bit, base + IC_ASSIGNSET);</div><div class='ctx'> </div><div class='del'>-		au1x_ic_settype(irq_get_irq_data(irq_nr), map-&gt;im_type);</div><div class='add'>+		au1x_ic_settype(irq_get_irq_data(irq_nr), map-&gt;type);</div><div class='ctx'> 		++map;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_c0_status(IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3);</div><div class='add'>+	irq_set_chained_handler(MIPS_CPU_IRQ_BASE + 2, au1000_ic0r0_dispatch);</div><div class='add'>+	irq_set_chained_handler(MIPS_CPU_IRQ_BASE + 3, au1000_ic0r1_dispatch);</div><div class='add'>+	irq_set_chained_handler(MIPS_CPU_IRQ_BASE + 4, au1000_ic1r0_dispatch);</div><div class='add'>+	irq_set_chained_handler(MIPS_CPU_IRQ_BASE + 5, au1000_ic1r1_dispatch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init alchemy_gpic_init_irq(const struct alchemy_irqmap *dints)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	void __iomem *bank_base;</div><div class='add'>+</div><div class='add'>+	register_syscore_ops(&amp;alchemy_gpic_pmops);</div><div class='add'>+	mips_cpu_irq_init();</div><div class='add'>+</div><div class='add'>+	/* disable &amp; ack all possible interrupt sources */</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		bank_base = AU1300_GPIC_ADDR + (i * 4);</div><div class='add'>+		__raw_writel(~0UL, bank_base + AU1300_GPIC_IDIS);</div><div class='add'>+		wmb();</div><div class='add'>+		__raw_writel(~0UL, bank_base + AU1300_GPIC_IPEND);</div><div class='add'>+		wmb();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* register an irq_chip for them, with 2nd highest priority */</div><div class='add'>+	for (i = ALCHEMY_GPIC_INT_BASE; i &lt;= ALCHEMY_GPIC_INT_LAST; i++) {</div><div class='add'>+		au1300_set_irq_priority(i, 1);</div><div class='add'>+		au1300_gpic_settype(irq_get_irq_data(i), IRQ_TYPE_NONE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* setup known on-chip sources */</div><div class='add'>+	while ((i = dints-&gt;irq) != -1) {</div><div class='add'>+		au1300_gpic_settype(irq_get_irq_data(i), dints-&gt;type);</div><div class='add'>+		au1300_set_irq_priority(i, dints-&gt;prio);</div><div class='add'>+</div><div class='add'>+		if (dints-&gt;internal)</div><div class='add'>+			au1300_pinfunc_to_dev(i - ALCHEMY_GPIC_INT_BASE);</div><div class='add'>+</div><div class='add'>+		dints++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq_set_chained_handler(MIPS_CPU_IRQ_BASE + 2, alchemy_gpic_dispatch);</div><div class='add'>+	irq_set_chained_handler(MIPS_CPU_IRQ_BASE + 3, alchemy_gpic_dispatch);</div><div class='add'>+	irq_set_chained_handler(MIPS_CPU_IRQ_BASE + 4, alchemy_gpic_dispatch);</div><div class='add'>+	irq_set_chained_handler(MIPS_CPU_IRQ_BASE + 5, alchemy_gpic_dispatch);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/******************************************************************************/</div><div class='add'>+</div><div class='ctx'> void __init arch_init_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	switch (alchemy_get_cputype()) {</div><div class='hunk'>@@ -582,65 +981,17 @@ void __init arch_init_irq(void)</div><div class='ctx'> 	case ALCHEMY_CPU_AU1200:</div><div class='ctx'> 		au1000_init_irq(au1200_irqmap);</div><div class='ctx'> 		break;</div><div class='add'>+	case ALCHEMY_CPU_AU1300:</div><div class='add'>+		alchemy_gpic_init_irq(au1300_irqmap);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_err("unknown Alchemy IRQ core\n");</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static unsigned long alchemy_ic_pmdata[7 * 2];</div><div class='del'>-</div><div class='del'>-static inline void alchemy_ic_suspend_one(void __iomem *base, unsigned long *d)</div><div class='del'>-{</div><div class='del'>-	d[0] = __raw_readl(base + IC_CFG0RD);</div><div class='del'>-	d[1] = __raw_readl(base + IC_CFG1RD);</div><div class='del'>-	d[2] = __raw_readl(base + IC_CFG2RD);</div><div class='del'>-	d[3] = __raw_readl(base + IC_SRCRD);</div><div class='del'>-	d[4] = __raw_readl(base + IC_ASSIGNRD);</div><div class='del'>-	d[5] = __raw_readl(base + IC_WAKERD);</div><div class='del'>-	d[6] = __raw_readl(base + IC_MASKRD);</div><div class='del'>-	ic_init(base);		/* shut it up too while at it */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void alchemy_ic_resume_one(void __iomem *base, unsigned long *d)</div><div class='del'>-{</div><div class='del'>-	ic_init(base);</div><div class='del'>-</div><div class='del'>-	__raw_writel(d[0], base + IC_CFG0SET);</div><div class='del'>-	__raw_writel(d[1], base + IC_CFG1SET);</div><div class='del'>-	__raw_writel(d[2], base + IC_CFG2SET);</div><div class='del'>-	__raw_writel(d[3], base + IC_SRCSET);</div><div class='del'>-	__raw_writel(d[4], base + IC_ASSIGNSET);</div><div class='del'>-	__raw_writel(d[5], base + IC_WAKESET);</div><div class='del'>-	wmb();</div><div class='del'>-</div><div class='del'>-	__raw_writel(d[6], base + IC_MASKSET);</div><div class='del'>-	wmb();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alchemy_ic_suspend(void)</div><div class='del'>-{</div><div class='del'>-	alchemy_ic_suspend_one((void __iomem *)KSEG1ADDR(AU1000_IC0_PHYS_ADDR),</div><div class='del'>-			       alchemy_ic_pmdata);</div><div class='del'>-	alchemy_ic_suspend_one((void __iomem *)KSEG1ADDR(AU1000_IC1_PHYS_ADDR),</div><div class='del'>-			       &amp;alchemy_ic_pmdata[7]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alchemy_ic_resume(void)</div><div class='del'>-{</div><div class='del'>-	alchemy_ic_resume_one((void __iomem *)KSEG1ADDR(AU1000_IC1_PHYS_ADDR),</div><div class='del'>-			      &amp;alchemy_ic_pmdata[7]);</div><div class='del'>-	alchemy_ic_resume_one((void __iomem *)KSEG1ADDR(AU1000_IC0_PHYS_ADDR),</div><div class='del'>-			      alchemy_ic_pmdata);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct syscore_ops alchemy_ic_syscore_ops = {</div><div class='del'>-	.suspend	= alchemy_ic_suspend,</div><div class='del'>-	.resume		= alchemy_ic_resume,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init alchemy_ic_pm_init(void)</div><div class='add'>+asmlinkage void plat_irq_dispatch(void)</div><div class='ctx'> {</div><div class='del'>-	register_syscore_ops(&amp;alchemy_ic_syscore_ops);</div><div class='del'>-	return 0;</div><div class='add'>+	unsigned long r = (read_c0_status() &amp; read_c0_cause()) &gt;&gt; 8;</div><div class='add'>+	do_IRQ(MIPS_CPU_IRQ_BASE + __ffs(r &amp; 0xff));</div><div class='ctx'> }</div><div class='del'>-device_initcall(alchemy_ic_pm_init);</div><div class='head'>diff --git a/arch/mips/alchemy/common/platform.c b/arch/mips/alchemy/common/platform.c<br/>index c8e5d72a5826..95cb9113b12c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/common/platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/common/platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/common/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/common/platform.c</a></div><div class='hunk'>@@ -82,6 +82,12 @@ static struct plat_serial8250_port au1x00_uart_data[][4] __initdata = {</div><div class='ctx'> 		PORT(AU1000_UART0_PHYS_ADDR, AU1200_UART0_INT),</div><div class='ctx'> 		PORT(AU1000_UART1_PHYS_ADDR, AU1200_UART1_INT),</div><div class='ctx'> 	},</div><div class='add'>+	[ALCHEMY_CPU_AU1300] = {</div><div class='add'>+		PORT(AU1300_UART0_PHYS_ADDR, AU1300_UART0_INT),</div><div class='add'>+		PORT(AU1300_UART1_PHYS_ADDR, AU1300_UART1_INT),</div><div class='add'>+		PORT(AU1300_UART2_PHYS_ADDR, AU1300_UART2_INT),</div><div class='add'>+		PORT(AU1300_UART3_PHYS_ADDR, AU1300_UART3_INT),</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device au1xx0_uart_device = {</div><div class='hunk'>@@ -122,10 +128,12 @@ static unsigned long alchemy_ohci_data[][2] __initdata = {</div><div class='ctx'> 	[ALCHEMY_CPU_AU1100] = { AU1000_USB_OHCI_PHYS_ADDR, AU1100_USB_HOST_INT },</div><div class='ctx'> 	[ALCHEMY_CPU_AU1550] = { AU1550_USB_OHCI_PHYS_ADDR, AU1550_USB_HOST_INT },</div><div class='ctx'> 	[ALCHEMY_CPU_AU1200] = { AU1200_USB_OHCI_PHYS_ADDR, AU1200_USB_INT },</div><div class='add'>+	[ALCHEMY_CPU_AU1300] = { AU1300_USB_OHCI0_PHYS_ADDR, AU1300_USB_INT },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static unsigned long alchemy_ehci_data[][2] __initdata = {</div><div class='ctx'> 	[ALCHEMY_CPU_AU1200] = { AU1200_USB_EHCI_PHYS_ADDR, AU1200_USB_INT },</div><div class='add'>+	[ALCHEMY_CPU_AU1300] = { AU1300_USB_EHCI_PHYS_ADDR, AU1300_USB_INT },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init _new_usbres(struct resource **r, struct platform_device **d)</div><div class='hunk'>@@ -169,8 +177,8 @@ static void __init alchemy_setup_usb(int ctype)</div><div class='ctx'> 		printk(KERN_INFO "Alchemy USB: cannot add OHCI0\n");</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	/* setup EHCI0: Au1200 */</div><div class='del'>-	if (ctype == ALCHEMY_CPU_AU1200) {</div><div class='add'>+	/* setup EHCI0: Au1200/Au1300 */</div><div class='add'>+	if ((ctype == ALCHEMY_CPU_AU1200) || (ctype == ALCHEMY_CPU_AU1300)) {</div><div class='ctx'> 		if (_new_usbres(&amp;res, &amp;pdev))</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='hunk'>@@ -187,6 +195,25 @@ static void __init alchemy_setup_usb(int ctype)</div><div class='ctx'> 		if (platform_device_register(pdev))</div><div class='ctx'> 			printk(KERN_INFO "Alchemy USB: cannot add EHCI0\n");</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Au1300: OHCI1 */</div><div class='add'>+	if (ctype == ALCHEMY_CPU_AU1300) {</div><div class='add'>+		if (_new_usbres(&amp;res, &amp;pdev))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		res[0].start = AU1300_USB_OHCI1_PHYS_ADDR;</div><div class='add'>+		res[0].end = res[0].start + 0x100 - 1;</div><div class='add'>+		res[0].flags = IORESOURCE_MEM;</div><div class='add'>+		res[1].start = AU1300_USB_INT;</div><div class='add'>+		res[1].end = res[1].start;</div><div class='add'>+		res[1].flags = IORESOURCE_IRQ;</div><div class='add'>+		pdev-&gt;name = "au1xxx-ohci";</div><div class='add'>+		pdev-&gt;id = 1;</div><div class='add'>+		pdev-&gt;dev.dma_mask = &amp;alchemy_ohci_dmamask;</div><div class='add'>+</div><div class='add'>+		if (platform_device_register(pdev))</div><div class='add'>+			printk(KERN_INFO "Alchemy USB: cannot add OHCI1\n");</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Macro to help defining the Ethernet MAC resources */</div><div class='head'>diff --git a/arch/mips/alchemy/common/power.c b/arch/mips/alchemy/common/power.c<br/>index bdd6651e9a4f..0c7fce2a3c12 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/common/power.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/common/power.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/common/power.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/common/power.c</a></div><div class='hunk'>@@ -126,6 +126,9 @@ void au_sleep(void)</div><div class='ctx'> 	case ALCHEMY_CPU_AU1200:</div><div class='ctx'> 		alchemy_sleep_au1550();</div><div class='ctx'> 		break;</div><div class='add'>+	case ALCHEMY_CPU_AU1300:</div><div class='add'>+		alchemy_sleep_au1300();</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	restore_core_regs();</div><div class='head'>diff --git a/arch/mips/alchemy/common/sleeper.S b/arch/mips/alchemy/common/sleeper.S<br/>index 77f3c743b716..c7bcc7e5c822 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/common/sleeper.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/common/sleeper.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/common/sleeper.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/common/sleeper.S</a></div><div class='hunk'>@@ -153,6 +153,79 @@ LEAF(alchemy_sleep_au1550)</div><div class='ctx'> </div><div class='ctx'> END(alchemy_sleep_au1550)</div><div class='ctx'> </div><div class='add'>+/* sleepcode for Au1300 memory controller type */</div><div class='add'>+LEAF(alchemy_sleep_au1300)</div><div class='add'>+</div><div class='add'>+	SETUP_SLEEP</div><div class='add'>+</div><div class='add'>+	/* cache following instructions, as memory gets put to sleep */</div><div class='add'>+	la	t0, 2f</div><div class='add'>+	la	t1, 4f</div><div class='add'>+	subu	t2, t1, t0</div><div class='add'>+</div><div class='add'>+	.set	mips3</div><div class='add'>+</div><div class='add'>+1:	cache	0x14, 0(t0)</div><div class='add'>+	subu	t2, t2, 32</div><div class='add'>+	bgez	t2, 1b</div><div class='add'>+	 addu	t0, t0, 32</div><div class='add'>+</div><div class='add'>+	.set	mips0</div><div class='add'>+</div><div class='add'>+2:	lui	a0, 0xb400		/* mem_xxx */</div><div class='add'>+</div><div class='add'>+	/* disable all ports in mem_sdportcfga */</div><div class='add'>+	sw	zero, 0x868(a0)		/* mem_sdportcfga */</div><div class='add'>+	sync</div><div class='add'>+</div><div class='add'>+	/* disable ODT */</div><div class='add'>+	li	t0, 0x03010000</div><div class='add'>+	sw	t0, 0x08d8(a0)		/* mem_sdcmd0 */</div><div class='add'>+	sw	t0, 0x08dc(a0)		/* mem_sdcmd1 */</div><div class='add'>+	sync</div><div class='add'>+</div><div class='add'>+	/* precharge */</div><div class='add'>+	li	t0, 0x23000400</div><div class='add'>+	sw	t0, 0x08dc(a0)		/* mem_sdcmd1 */</div><div class='add'>+	sw	t0, 0x08d8(a0)		/* mem_sdcmd0 */</div><div class='add'>+	sync</div><div class='add'>+</div><div class='add'>+	/* auto refresh */</div><div class='add'>+	sw	zero, 0x08c8(a0)	/* mem_sdautoref */</div><div class='add'>+	sync</div><div class='add'>+</div><div class='add'>+	/* block access to the DDR */</div><div class='add'>+	lw	t0, 0x0848(a0)		/* mem_sdconfigb */</div><div class='add'>+	li	t1, (1 &lt;&lt; 7 | 0x3F)</div><div class='add'>+	or	t0, t0, t1</div><div class='add'>+	sw	t0, 0x0848(a0)		/* mem_sdconfigb */</div><div class='add'>+	sync</div><div class='add'>+</div><div class='add'>+	/* issue the Self Refresh command */</div><div class='add'>+	li	t0, 0x10000000</div><div class='add'>+	sw	t0, 0x08dc(a0)		/* mem_sdcmd1 */</div><div class='add'>+	sw	t0, 0x08d8(a0)		/* mem_sdcmd0 */</div><div class='add'>+	sync</div><div class='add'>+</div><div class='add'>+	/* wait for sdram to enter self-refresh mode */</div><div class='add'>+	lui	t0, 0x0300</div><div class='add'>+3:	lw	t1, 0x0850(a0)		/* mem_sdstat */</div><div class='add'>+	and	t2, t1, t0</div><div class='add'>+	bne	t2, t0, 3b</div><div class='add'>+	 nop</div><div class='add'>+</div><div class='add'>+	/* disable SDRAM clocks */</div><div class='add'>+	li	t0, ~(3&lt;&lt;28)</div><div class='add'>+	lw	t1, 0x0840(a0)		/* mem_sdconfiga */</div><div class='add'>+	and	t1, t1, t0		/* clear CE[1:0] */</div><div class='add'>+	sw	t1, 0x0840(a0)		/* mem_sdconfiga */</div><div class='add'>+	sync</div><div class='add'>+</div><div class='add'>+	DO_SLEEP</div><div class='add'>+4:</div><div class='add'>+</div><div class='add'>+END(alchemy_sleep_au1300)</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	/* This is where we return upon wakeup.</div><div class='ctx'> 	 * Reload all of the registers and return.</div><div class='head'>diff --git a/arch/mips/alchemy/common/time.c b/arch/mips/alchemy/common/time.c<br/>index d5da6adbf634..7da4d0081487 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/common/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/common/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/common/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/common/time.c</a></div><div class='hunk'>@@ -92,7 +92,7 @@ static struct clock_event_device au1x_rtcmatch2_clockdev = {</div><div class='ctx'> </div><div class='ctx'> static struct irqaction au1x_rtcmatch2_irqaction = {</div><div class='ctx'> 	.handler	= au1x_rtcmatch2_irq,</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='add'>+	.flags		= IRQF_TIMER,</div><div class='ctx'> 	.name		= "timer",</div><div class='ctx'> 	.dev_id		= &amp;au1x_rtcmatch2_clockdev,</div><div class='ctx'> };</div><div class='hunk'>@@ -178,6 +178,7 @@ static int alchemy_m2inttab[] __initdata = {</div><div class='ctx'> 	AU1100_RTC_MATCH2_INT,</div><div class='ctx'> 	AU1550_RTC_MATCH2_INT,</div><div class='ctx'> 	AU1200_RTC_MATCH2_INT,</div><div class='add'>+	AU1300_RTC_MATCH2_INT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init plat_time_init(void)</div><div class='head'>diff --git a/arch/mips/alchemy/common/vss.c b/arch/mips/alchemy/common/vss.c<br/>new file mode 100644<br/>index 000000000000..d23b1444d365<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/common/vss.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/common/vss.c</a></div><div class='hunk'>@@ -0,0 +1,84 @@</div><div class='add'>+/*</div><div class='add'>+ * Au1300 media block power gating (VSS)</div><div class='add'>+ *</div><div class='add'>+ * This is a stop-gap solution until I have the clock framework integration</div><div class='add'>+ * ready. This stuff here really must be handled transparently when clocks</div><div class='add'>+ * for various media blocks are enabled/disabled.</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/spinlock.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='add'>+</div><div class='add'>+#define VSS_GATE	0x00	/* gate wait timers */</div><div class='add'>+#define VSS_CLKRST	0x04	/* clock/block control */</div><div class='add'>+#define VSS_FTR		0x08	/* footers */</div><div class='add'>+</div><div class='add'>+#define VSS_ADDR(blk)	(KSEG1ADDR(AU1300_VSS_PHYS_ADDR) + (blk * 0x0c))</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(au1300_vss_lock);</div><div class='add'>+</div><div class='add'>+/* enable a block as outlined in the databook */</div><div class='add'>+static inline void __enable_block(int block)</div><div class='add'>+{</div><div class='add'>+	void __iomem *base = (void __iomem *)VSS_ADDR(block);</div><div class='add'>+</div><div class='add'>+	__raw_writel(3, base + VSS_CLKRST);	/* enable clock, assert reset */</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	__raw_writel(0x01fffffe, base + VSS_GATE); /* maximum setup time */</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	/* enable footers in sequence */</div><div class='add'>+	__raw_writel(0x01, base + VSS_FTR);</div><div class='add'>+	wmb();</div><div class='add'>+	__raw_writel(0x03, base + VSS_FTR);</div><div class='add'>+	wmb();</div><div class='add'>+	__raw_writel(0x07, base + VSS_FTR);</div><div class='add'>+	wmb();</div><div class='add'>+	__raw_writel(0x0f, base + VSS_FTR);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	__raw_writel(0x01ffffff, base + VSS_GATE); /* start FSM too */</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	__raw_writel(2, base + VSS_CLKRST);	/* deassert reset */</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	__raw_writel(0x1f, base + VSS_FTR);	/* enable isolation cells */</div><div class='add'>+	wmb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* disable a block as outlined in the databook */</div><div class='add'>+static inline void __disable_block(int block)</div><div class='add'>+{</div><div class='add'>+	void __iomem *base = (void __iomem *)VSS_ADDR(block);</div><div class='add'>+</div><div class='add'>+	__raw_writel(0x0f, base + VSS_FTR);	/* disable isolation cells */</div><div class='add'>+	wmb();</div><div class='add'>+	__raw_writel(0, base + VSS_GATE);	/* disable FSM */</div><div class='add'>+	wmb();</div><div class='add'>+	__raw_writel(3, base + VSS_CLKRST);	/* assert reset */</div><div class='add'>+	wmb();</div><div class='add'>+	__raw_writel(1, base + VSS_CLKRST);	/* disable clock */</div><div class='add'>+	wmb();</div><div class='add'>+	__raw_writel(0, base + VSS_FTR);	/* disable all footers */</div><div class='add'>+	wmb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void au1300_vss_block_control(int block, int enable)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (alchemy_get_cputype() != ALCHEMY_CPU_AU1300)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* only one block at a time */</div><div class='add'>+	spin_lock_irqsave(&amp;au1300_vss_lock, flags);</div><div class='add'>+	if (enable)</div><div class='add'>+		__enable_block(block);</div><div class='add'>+	else</div><div class='add'>+		__disable_block(block);</div><div class='add'>+	spin_unlock_irqrestore(&amp;au1300_vss_lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(au1300_vss_block_control);</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/Makefile b/arch/mips/alchemy/devboards/Makefile<br/>index 826449c817c3..3c37fb303364 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/devboards/Makefile</a></div><div class='hunk'>@@ -4,15 +4,10 @@</div><div class='ctx'> </div><div class='ctx'> obj-y += prom.o bcsr.o platform.o</div><div class='ctx'> obj-$(CONFIG_PM)		+= pm.o</div><div class='del'>-obj-$(CONFIG_MIPS_PB1000)	+= pb1000/</div><div class='del'>-obj-$(CONFIG_MIPS_PB1100)	+= pb1100/</div><div class='del'>-obj-$(CONFIG_MIPS_PB1200)	+= pb1200/</div><div class='del'>-obj-$(CONFIG_MIPS_PB1500)	+= pb1500/</div><div class='del'>-obj-$(CONFIG_MIPS_PB1550)	+= pb1550/</div><div class='del'>-obj-$(CONFIG_MIPS_DB1000)	+= db1x00/</div><div class='del'>-obj-$(CONFIG_MIPS_DB1100)	+= db1x00/</div><div class='del'>-obj-$(CONFIG_MIPS_DB1200)	+= db1200/</div><div class='del'>-obj-$(CONFIG_MIPS_DB1500)	+= db1x00/</div><div class='del'>-obj-$(CONFIG_MIPS_DB1550)	+= db1x00/</div><div class='del'>-obj-$(CONFIG_MIPS_BOSPORUS)	+= db1x00/</div><div class='del'>-obj-$(CONFIG_MIPS_MIRAGE)	+= db1x00/</div><div class='add'>+obj-$(CONFIG_MIPS_PB1100)	+= pb1100.o</div><div class='add'>+obj-$(CONFIG_MIPS_PB1500)	+= pb1500.o</div><div class='add'>+obj-$(CONFIG_MIPS_PB1550)	+= pb1550.o</div><div class='add'>+obj-$(CONFIG_MIPS_DB1000)	+= db1000.o</div><div class='add'>+obj-$(CONFIG_MIPS_DB1200)	+= db1200.o</div><div class='add'>+obj-$(CONFIG_MIPS_DB1300)	+= db1300.o</div><div class='add'>+obj-$(CONFIG_MIPS_DB1550)	+= db1550.o</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/bcsr.c b/arch/mips/alchemy/devboards/bcsr.c<br/>index 463d2c4d9441..1e83ce2e1147 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/bcsr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/bcsr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/bcsr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/devboards/bcsr.c</a></div><div class='hunk'>@@ -97,14 +97,9 @@ static void bcsr_csc_handler(unsigned int irq, struct irq_desc *d)</div><div class='ctx'> 	enable_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* NOTE: both the enable and mask bits must be cleared, otherwise the</div><div class='del'>- * CPLD generates tons of spurious interrupts (at least on my DB1200).</div><div class='del'>- *	-- mlau</div><div class='del'>- */</div><div class='ctx'> static void bcsr_irq_mask(struct irq_data *d)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short v = 1 &lt;&lt; (d-&gt;irq - bcsr_csc_base);</div><div class='del'>-	__raw_writew(v, bcsr_virt + BCSR_REG_INTCLR);</div><div class='ctx'> 	__raw_writew(v, bcsr_virt + BCSR_REG_MASKCLR);</div><div class='ctx'> 	wmb();</div><div class='ctx'> }</div><div class='hunk'>@@ -112,7 +107,6 @@ static void bcsr_irq_mask(struct irq_data *d)</div><div class='ctx'> static void bcsr_irq_maskack(struct irq_data *d)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short v = 1 &lt;&lt; (d-&gt;irq - bcsr_csc_base);</div><div class='del'>-	__raw_writew(v, bcsr_virt + BCSR_REG_INTCLR);</div><div class='ctx'> 	__raw_writew(v, bcsr_virt + BCSR_REG_MASKCLR);</div><div class='ctx'> 	__raw_writew(v, bcsr_virt + BCSR_REG_INTSTAT);	/* ack */</div><div class='ctx'> 	wmb();</div><div class='hunk'>@@ -121,7 +115,6 @@ static void bcsr_irq_maskack(struct irq_data *d)</div><div class='ctx'> static void bcsr_irq_unmask(struct irq_data *d)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short v = 1 &lt;&lt; (d-&gt;irq - bcsr_csc_base);</div><div class='del'>-	__raw_writew(v, bcsr_virt + BCSR_REG_INTSET);</div><div class='ctx'> 	__raw_writew(v, bcsr_virt + BCSR_REG_MASKSET);</div><div class='ctx'> 	wmb();</div><div class='ctx'> }</div><div class='hunk'>@@ -137,9 +130,9 @@ void __init bcsr_init_irq(int csc_start, int csc_end, int hook_irq)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int irq;</div><div class='ctx'> </div><div class='del'>-	/* mask &amp; disable &amp; ack all */</div><div class='del'>-	__raw_writew(0xffff, bcsr_virt + BCSR_REG_INTCLR);</div><div class='add'>+	/* mask &amp; enable &amp; ack all */</div><div class='ctx'> 	__raw_writew(0xffff, bcsr_virt + BCSR_REG_MASKCLR);</div><div class='add'>+	__raw_writew(0xffff, bcsr_virt + BCSR_REG_INTSET);</div><div class='ctx'> 	__raw_writew(0xffff, bcsr_virt + BCSR_REG_INTSTAT);</div><div class='ctx'> 	wmb();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/alchemy/devboards/db1000.c b/arch/mips/alchemy/devboards/db1000.c<br/>new file mode 100644<br/>index 000000000000..1b81dbf6b804<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/db1000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/devboards/db1000.c</a></div><div class='hunk'>@@ -0,0 +1,565 @@</div><div class='add'>+/*</div><div class='add'>+ * DBAu1000/1500/1100 board support</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2000, 2008 MontaVista Software Inc.</div><div class='add'>+ * Author: MontaVista Software, Inc. &lt;source@mvista.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'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/gpio.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/leds.h&gt;</div><div class='add'>+#include &lt;linux/mmc/host.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/pm.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi_gpio.h&gt;</div><div class='add'>+#include &lt;linux/spi/ads7846.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1000_dma.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1100_mmc.h&gt;</div><div class='add'>+#include &lt;asm/mach-db1x00/bcsr.h&gt;</div><div class='add'>+#include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;prom.h&gt;</div><div class='add'>+#include "platform.h"</div><div class='add'>+</div><div class='add'>+#define F_SWAPPED (bcsr_read(BCSR_STATUS) &amp; BCSR_STATUS_DB1000_SWAPBOOT)</div><div class='add'>+</div><div class='add'>+struct pci_dev;</div><div class='add'>+</div><div class='add'>+static const char *board_type_str(void)</div><div class='add'>+{</div><div class='add'>+	switch (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI))) {</div><div class='add'>+	case BCSR_WHOAMI_DB1000:</div><div class='add'>+		return "DB1000";</div><div class='add'>+	case BCSR_WHOAMI_DB1500:</div><div class='add'>+		return "DB1500";</div><div class='add'>+	case BCSR_WHOAMI_DB1100:</div><div class='add'>+		return "DB1100";</div><div class='add'>+	default:</div><div class='add'>+		return "(unknown)";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *get_system_type(void)</div><div class='add'>+{</div><div class='add'>+	return board_type_str();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init board_setup(void)</div><div class='add'>+{</div><div class='add'>+	/* initialize board register space */</div><div class='add'>+	bcsr_init(DB1000_BCSR_PHYS_ADDR,</div><div class='add'>+		  DB1000_BCSR_PHYS_ADDR + DB1000_BCSR_HEXLED_OFS);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "AMD Alchemy %s Board\n", board_type_str());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int db1500_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)</div><div class='add'>+{</div><div class='add'>+	if ((slot &lt; 12) || (slot &gt; 13) || pin == 0)</div><div class='add'>+		return -1;</div><div class='add'>+	if (slot == 12)</div><div class='add'>+		return (pin == 1) ? AU1500_PCI_INTA : 0xff;</div><div class='add'>+	if (slot == 13) {</div><div class='add'>+		switch (pin) {</div><div class='add'>+		case 1: return AU1500_PCI_INTA;</div><div class='add'>+		case 2: return AU1500_PCI_INTB;</div><div class='add'>+		case 3: return AU1500_PCI_INTC;</div><div class='add'>+		case 4: return AU1500_PCI_INTD;</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 struct resource alchemy_pci_host_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1500_PCI_PHYS_ADDR,</div><div class='add'>+		.end	= AU1500_PCI_PHYS_ADDR + 0xfff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct alchemy_pci_platdata db1500_pci_pd = {</div><div class='add'>+	.board_map_irq	= db1500_map_pci_irq,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1500_pci_host_dev = {</div><div class='add'>+	.dev.platform_data = &amp;db1500_pci_pd,</div><div class='add'>+	.name		= "alchemy-pci",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(alchemy_pci_host_res),</div><div class='add'>+	.resource	= alchemy_pci_host_res,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init db1500_pci_init(void)</div><div class='add'>+{</div><div class='add'>+	if (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) == BCSR_WHOAMI_DB1500)</div><div class='add'>+		return platform_device_register(&amp;db1500_pci_host_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+/* must be arch_initcall; MIPS PCI scans busses in a subsys_initcall */</div><div class='add'>+arch_initcall(db1500_pci_init);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct resource au1100_lcd_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1100_LCD_PHYS_ADDR,</div><div class='add'>+		.end	= AU1100_LCD_PHYS_ADDR + 0x800 - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AU1100_LCD_INT,</div><div class='add'>+		.end	= AU1100_LCD_INT,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 au1100_lcd_dmamask = DMA_BIT_MASK(32);</div><div class='add'>+</div><div class='add'>+static struct platform_device au1100_lcd_device = {</div><div class='add'>+	.name		= "au1100-lcd",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev = {</div><div class='add'>+		.dma_mask		= &amp;au1100_lcd_dmamask,</div><div class='add'>+		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= ARRAY_SIZE(au1100_lcd_resources),</div><div class='add'>+	.resource	= au1100_lcd_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource alchemy_ac97c_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1000_AC97_PHYS_ADDR,</div><div class='add'>+		.end	= AU1000_AC97_PHYS_ADDR + 0xfff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= DMA_ID_AC97C_TX,</div><div class='add'>+		.end	= DMA_ID_AC97C_TX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start	= DMA_ID_AC97C_RX,</div><div class='add'>+		.end	= DMA_ID_AC97C_RX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device alchemy_ac97c_dev = {</div><div class='add'>+	.name		= "alchemy-ac97c",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.resource	= alchemy_ac97c_res,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(alchemy_ac97c_res),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device alchemy_ac97c_dma_dev = {</div><div class='add'>+	.name		= "alchemy-pcm-dma",</div><div class='add'>+	.id		= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1x00_codec_dev = {</div><div class='add'>+	.name		= "ac97-codec",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1x00_audio_dev = {</div><div class='add'>+	.name		= "db1000-audio",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************/</div><div class='add'>+</div><div class='add'>+static irqreturn_t db1100_mmc_cd(int irq, void *ptr)</div><div class='add'>+{</div><div class='add'>+	void (*mmc_cd)(struct mmc_host *, unsigned long);</div><div class='add'>+	/* link against CONFIG_MMC=m */</div><div class='add'>+	mmc_cd = symbol_get(mmc_detect_change);</div><div class='add'>+	mmc_cd(ptr, msecs_to_jiffies(500));</div><div class='add'>+	symbol_put(mmc_detect_change);</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 db1100_mmc_cd_setup(void *mmc_host, int en)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (en) {</div><div class='add'>+		irq_set_irq_type(AU1100_GPIO19_INT, IRQ_TYPE_EDGE_BOTH);</div><div class='add'>+		ret = request_irq(AU1100_GPIO19_INT, db1100_mmc_cd, 0,</div><div class='add'>+				  "sd0_cd", mmc_host);</div><div class='add'>+	} else</div><div class='add'>+		free_irq(AU1100_GPIO19_INT, mmc_host);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int db1100_mmc1_cd_setup(void *mmc_host, int en)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (en) {</div><div class='add'>+		irq_set_irq_type(AU1100_GPIO20_INT, IRQ_TYPE_EDGE_BOTH);</div><div class='add'>+		ret = request_irq(AU1100_GPIO20_INT, db1100_mmc_cd, 0,</div><div class='add'>+				  "sd1_cd", mmc_host);</div><div class='add'>+	} else</div><div class='add'>+		free_irq(AU1100_GPIO20_INT, mmc_host);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int db1100_mmc_card_readonly(void *mmc_host)</div><div class='add'>+{</div><div class='add'>+	/* testing suggests that this bit is inverted */</div><div class='add'>+	return (bcsr_read(BCSR_STATUS) &amp; BCSR_STATUS_SD0WP) ? 0 : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int db1100_mmc_card_inserted(void *mmc_host)</div><div class='add'>+{</div><div class='add'>+	return !alchemy_gpio_get_value(19);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void db1100_mmc_set_power(void *mmc_host, int state)</div><div class='add'>+{</div><div class='add'>+	if (state) {</div><div class='add'>+		bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_SD0PWR);</div><div class='add'>+		msleep(400);	/* stabilization time */</div><div class='add'>+	} else</div><div class='add'>+		bcsr_mod(BCSR_BOARD, BCSR_BOARD_SD0PWR, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void db1100_mmcled_set(struct led_classdev *led, enum led_brightness b)</div><div class='add'>+{</div><div class='add'>+	if (b != LED_OFF)</div><div class='add'>+		bcsr_mod(BCSR_LEDS, BCSR_LEDS_LED0, 0);</div><div class='add'>+	else</div><div class='add'>+		bcsr_mod(BCSR_LEDS, 0, BCSR_LEDS_LED0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct led_classdev db1100_mmc_led = {</div><div class='add'>+	.brightness_set	= db1100_mmcled_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int db1100_mmc1_card_readonly(void *mmc_host)</div><div class='add'>+{</div><div class='add'>+	return (bcsr_read(BCSR_BOARD) &amp; BCSR_BOARD_SD1WP) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int db1100_mmc1_card_inserted(void *mmc_host)</div><div class='add'>+{</div><div class='add'>+	return !alchemy_gpio_get_value(20);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void db1100_mmc1_set_power(void *mmc_host, int state)</div><div class='add'>+{</div><div class='add'>+	if (state) {</div><div class='add'>+		bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_SD1PWR);</div><div class='add'>+		msleep(400);	/* stabilization time */</div><div class='add'>+	} else</div><div class='add'>+		bcsr_mod(BCSR_BOARD, BCSR_BOARD_SD1PWR, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void db1100_mmc1led_set(struct led_classdev *led, enum led_brightness b)</div><div class='add'>+{</div><div class='add'>+	if (b != LED_OFF)</div><div class='add'>+		bcsr_mod(BCSR_LEDS, BCSR_LEDS_LED1, 0);</div><div class='add'>+	else</div><div class='add'>+		bcsr_mod(BCSR_LEDS, 0, BCSR_LEDS_LED1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct led_classdev db1100_mmc1_led = {</div><div class='add'>+	.brightness_set	= db1100_mmc1led_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct au1xmmc_platform_data db1100_mmc_platdata[2] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.cd_setup	= db1100_mmc_cd_setup,</div><div class='add'>+		.set_power	= db1100_mmc_set_power,</div><div class='add'>+		.card_inserted	= db1100_mmc_card_inserted,</div><div class='add'>+		.card_readonly	= db1100_mmc_card_readonly,</div><div class='add'>+		.led		= &amp;db1100_mmc_led,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.cd_setup	= db1100_mmc1_cd_setup,</div><div class='add'>+		.set_power	= db1100_mmc1_set_power,</div><div class='add'>+		.card_inserted	= db1100_mmc1_card_inserted,</div><div class='add'>+		.card_readonly	= db1100_mmc1_card_readonly,</div><div class='add'>+		.led		= &amp;db1100_mmc1_led,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource au1100_mmc0_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1100_SD0_PHYS_ADDR,</div><div class='add'>+		.end	= AU1100_SD0_PHYS_ADDR + 0xfff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AU1100_SD_INT,</div><div class='add'>+		.end	= AU1100_SD_INT,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start	= DMA_ID_SD0_TX,</div><div class='add'>+		.end	= DMA_ID_SD0_TX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+	[3] = {</div><div class='add'>+		.start	= DMA_ID_SD0_RX,</div><div class='add'>+		.end	= DMA_ID_SD0_RX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 au1xxx_mmc_dmamask =  DMA_BIT_MASK(32);</div><div class='add'>+</div><div class='add'>+static struct platform_device db1100_mmc0_dev = {</div><div class='add'>+	.name		= "au1xxx-mmc",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev = {</div><div class='add'>+		.dma_mask		= &amp;au1xxx_mmc_dmamask,</div><div class='add'>+		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='add'>+		.platform_data		= &amp;db1100_mmc_platdata[0],</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= ARRAY_SIZE(au1100_mmc0_resources),</div><div class='add'>+	.resource	= au1100_mmc0_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource au1100_mmc1_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1100_SD1_PHYS_ADDR,</div><div class='add'>+		.end	= AU1100_SD1_PHYS_ADDR + 0xfff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AU1100_SD_INT,</div><div class='add'>+		.end	= AU1100_SD_INT,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start	= DMA_ID_SD1_TX,</div><div class='add'>+		.end	= DMA_ID_SD1_TX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+	[3] = {</div><div class='add'>+		.start	= DMA_ID_SD1_RX,</div><div class='add'>+		.end	= DMA_ID_SD1_RX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1100_mmc1_dev = {</div><div class='add'>+	.name		= "au1xxx-mmc",</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.dev = {</div><div class='add'>+		.dma_mask		= &amp;au1xxx_mmc_dmamask,</div><div class='add'>+		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='add'>+		.platform_data		= &amp;db1100_mmc_platdata[1],</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= ARRAY_SIZE(au1100_mmc1_res),</div><div class='add'>+	.resource	= au1100_mmc1_res,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************/</div><div class='add'>+</div><div class='add'>+static void db1000_irda_set_phy_mode(int mode)</div><div class='add'>+{</div><div class='add'>+	unsigned short mask = BCSR_RESETS_IRDA_MODE_MASK | BCSR_RESETS_FIR_SEL;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case AU1000_IRDA_PHY_MODE_OFF:</div><div class='add'>+		bcsr_mod(BCSR_RESETS, mask, BCSR_RESETS_IRDA_MODE_OFF);</div><div class='add'>+		break;</div><div class='add'>+	case AU1000_IRDA_PHY_MODE_SIR:</div><div class='add'>+		bcsr_mod(BCSR_RESETS, mask, BCSR_RESETS_IRDA_MODE_FULL);</div><div class='add'>+		break;</div><div class='add'>+	case AU1000_IRDA_PHY_MODE_FIR:</div><div class='add'>+		bcsr_mod(BCSR_RESETS, mask, BCSR_RESETS_IRDA_MODE_FULL |</div><div class='add'>+					    BCSR_RESETS_FIR_SEL);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct au1k_irda_platform_data db1000_irda_platdata = {</div><div class='add'>+	.set_phy_mode	= db1000_irda_set_phy_mode,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource au1000_irda_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1000_IRDA_PHYS_ADDR,</div><div class='add'>+		.end	= AU1000_IRDA_PHYS_ADDR + 0x0fff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AU1000_IRDA_TX_INT,</div><div class='add'>+		.end	= AU1000_IRDA_TX_INT,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start	= AU1000_IRDA_RX_INT,</div><div class='add'>+		.end	= AU1000_IRDA_RX_INT,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1000_irda_dev = {</div><div class='add'>+	.name	= "au1000-irda",</div><div class='add'>+	.id	= -1,</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data = &amp;db1000_irda_platdata,</div><div class='add'>+	},</div><div class='add'>+	.resource	= au1000_irda_res,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(au1000_irda_res),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************/</div><div class='add'>+</div><div class='add'>+static struct ads7846_platform_data db1100_touch_pd = {</div><div class='add'>+	.model		= 7846,</div><div class='add'>+	.vref_mv	= 3300,</div><div class='add'>+	.gpio_pendown	= 21,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_gpio_platform_data db1100_spictl_pd = {</div><div class='add'>+	.sck		= 209,</div><div class='add'>+	.mosi		= 208,</div><div class='add'>+	.miso		= 207,</div><div class='add'>+	.num_chipselect = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_board_info db1100_spi_info[] __initdata = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.modalias	 = "ads7846",</div><div class='add'>+		.max_speed_hz	 = 3250000,</div><div class='add'>+		.bus_num	 = 0,</div><div class='add'>+		.chip_select	 = 0,</div><div class='add'>+		.mode		 = 0,</div><div class='add'>+		.irq		 = AU1100_GPIO21_INT,</div><div class='add'>+		.platform_data	 = &amp;db1100_touch_pd,</div><div class='add'>+		.controller_data = (void *)210,	/* for spi_gpio: CS# GPIO210 */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1100_spi_dev = {</div><div class='add'>+	.name		= "spi_gpio",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;db1100_spictl_pd,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct platform_device *db1x00_devs[] = {</div><div class='add'>+	&amp;db1x00_codec_dev,</div><div class='add'>+	&amp;alchemy_ac97c_dma_dev,</div><div class='add'>+	&amp;alchemy_ac97c_dev,</div><div class='add'>+	&amp;db1x00_audio_dev,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *db1000_devs[] = {</div><div class='add'>+	&amp;db1000_irda_dev,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *db1100_devs[] = {</div><div class='add'>+	&amp;au1100_lcd_device,</div><div class='add'>+	&amp;db1100_mmc0_dev,</div><div class='add'>+	&amp;db1100_mmc1_dev,</div><div class='add'>+	&amp;db1000_irda_dev,</div><div class='add'>+	&amp;db1100_spi_dev,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init db1000_dev_init(void)</div><div class='add'>+{</div><div class='add'>+	int board = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));</div><div class='add'>+	int c0, c1, d0, d1, s0, s1;</div><div class='add'>+	unsigned long pfc;</div><div class='add'>+</div><div class='add'>+	if (board == BCSR_WHOAMI_DB1500) {</div><div class='add'>+		c0 = AU1500_GPIO2_INT;</div><div class='add'>+		c1 = AU1500_GPIO5_INT;</div><div class='add'>+		d0 = AU1500_GPIO0_INT;</div><div class='add'>+		d1 = AU1500_GPIO3_INT;</div><div class='add'>+		s0 = AU1500_GPIO1_INT;</div><div class='add'>+		s1 = AU1500_GPIO4_INT;</div><div class='add'>+	} else if (board == BCSR_WHOAMI_DB1100) {</div><div class='add'>+		c0 = AU1100_GPIO2_INT;</div><div class='add'>+		c1 = AU1100_GPIO5_INT;</div><div class='add'>+		d0 = AU1100_GPIO0_INT;</div><div class='add'>+		d1 = AU1100_GPIO3_INT;</div><div class='add'>+		s0 = AU1100_GPIO1_INT;</div><div class='add'>+		s1 = AU1100_GPIO4_INT;</div><div class='add'>+</div><div class='add'>+		gpio_direction_input(19);	/* sd0 cd# */</div><div class='add'>+		gpio_direction_input(20);	/* sd1 cd# */</div><div class='add'>+		gpio_direction_input(21);	/* touch pendown# */</div><div class='add'>+		gpio_direction_input(207);	/* SPI MISO */</div><div class='add'>+		gpio_direction_output(208, 0);	/* SPI MOSI */</div><div class='add'>+		gpio_direction_output(209, 1);	/* SPI SCK */</div><div class='add'>+		gpio_direction_output(210, 1);	/* SPI CS# */</div><div class='add'>+</div><div class='add'>+		/* spi_gpio on SSI0 pins */</div><div class='add'>+		pfc = __raw_readl((void __iomem *)SYS_PINFUNC);</div><div class='add'>+		pfc |= (1 &lt;&lt; 0);	/* SSI0 pins as GPIOs */</div><div class='add'>+		__raw_writel(pfc, (void __iomem *)SYS_PINFUNC);</div><div class='add'>+		wmb();</div><div class='add'>+</div><div class='add'>+		spi_register_board_info(db1100_spi_info,</div><div class='add'>+					ARRAY_SIZE(db1100_spi_info));</div><div class='add'>+</div><div class='add'>+		platform_add_devices(db1100_devs, ARRAY_SIZE(db1100_devs));</div><div class='add'>+	} else if (board == BCSR_WHOAMI_DB1000) {</div><div class='add'>+		c0 = AU1000_GPIO2_INT;</div><div class='add'>+		c1 = AU1000_GPIO5_INT;</div><div class='add'>+		d0 = AU1000_GPIO0_INT;</div><div class='add'>+		d1 = AU1000_GPIO3_INT;</div><div class='add'>+		s0 = AU1000_GPIO1_INT;</div><div class='add'>+		s1 = AU1000_GPIO4_INT;</div><div class='add'>+		platform_add_devices(db1000_devs, ARRAY_SIZE(db1000_devs));</div><div class='add'>+	} else</div><div class='add'>+		return 0; /* unknown board, no further dev setup to do */</div><div class='add'>+</div><div class='add'>+	irq_set_irq_type(d0, IRQ_TYPE_EDGE_BOTH);</div><div class='add'>+	irq_set_irq_type(d1, IRQ_TYPE_EDGE_BOTH);</div><div class='add'>+	irq_set_irq_type(c0, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+	irq_set_irq_type(c1, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+	irq_set_irq_type(s0, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+	irq_set_irq_type(s1, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+</div><div class='add'>+	db1x_register_pcmcia_socket(</div><div class='add'>+		AU1000_PCMCIA_ATTR_PHYS_ADDR,</div><div class='add'>+		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,</div><div class='add'>+		AU1000_PCMCIA_MEM_PHYS_ADDR,</div><div class='add'>+		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,</div><div class='add'>+		AU1000_PCMCIA_IO_PHYS_ADDR,</div><div class='add'>+		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,</div><div class='add'>+		c0, d0,	/*s0*/0, 0, 0);</div><div class='add'>+</div><div class='add'>+	db1x_register_pcmcia_socket(</div><div class='add'>+		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004000000,</div><div class='add'>+		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,</div><div class='add'>+		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004000000,</div><div class='add'>+		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004400000 - 1,</div><div class='add'>+		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004000000,</div><div class='add'>+		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004010000 - 1,</div><div class='add'>+		c1, d1,	/*s1*/0, 0, 1);</div><div class='add'>+</div><div class='add'>+	platform_add_devices(db1x00_devs, ARRAY_SIZE(db1x00_devs));</div><div class='add'>+	db1x_register_norflash(32 &lt;&lt; 20, 4 /* 32bit */, F_SWAPPED);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+device_initcall(db1000_dev_init);</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/db1200/platform.c b/arch/mips/alchemy/devboards/db1200.c<br/>index c61867c93c4a..a83302b96c01 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/db1200/platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/db1200/platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/db1200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/devboards/db1200.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='del'>- * DBAu1200 board platform device registration</div><div class='add'>+ * DBAu1200/PBAu1200 board platform device registration</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2008-2009 Manuel Lauss</div><div class='add'>+ * Copyright (C) 2008-2011 Manuel Lauss</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'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/host.h&gt;</div><div class='hunk'>@@ -33,18 +34,116 @@</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/spi/flash.h&gt;</div><div class='ctx'> #include &lt;linux/smc91x.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1100_mmc.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1xxx_dbdma.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1200fb.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1550_spi.h&gt;</div><div class='ctx'> #include &lt;asm/mach-db1x00/bcsr.h&gt;</div><div class='ctx'> #include &lt;asm/mach-db1x00/db1200.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../platform.h"</div><div class='add'>+#include "platform.h"</div><div class='add'>+</div><div class='add'>+static const char *board_type_str(void)</div><div class='add'>+{</div><div class='add'>+	switch (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI))) {</div><div class='add'>+	case BCSR_WHOAMI_PB1200_DDR1:</div><div class='add'>+	case BCSR_WHOAMI_PB1200_DDR2:</div><div class='add'>+		return "PB1200";</div><div class='add'>+	case BCSR_WHOAMI_DB1200:</div><div class='add'>+		return "DB1200";</div><div class='add'>+	default:</div><div class='add'>+		return "(unknown)";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *get_system_type(void)</div><div class='add'>+{</div><div class='add'>+	return board_type_str();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init detect_board(void)</div><div class='add'>+{</div><div class='add'>+	int bid;</div><div class='add'>+</div><div class='add'>+	/* try the DB1200 first */</div><div class='add'>+	bcsr_init(DB1200_BCSR_PHYS_ADDR,</div><div class='add'>+		  DB1200_BCSR_PHYS_ADDR + DB1200_BCSR_HEXLED_OFS);</div><div class='add'>+	if (BCSR_WHOAMI_DB1200 == BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI))) {</div><div class='add'>+		unsigned short t = bcsr_read(BCSR_HEXLEDS);</div><div class='add'>+		bcsr_write(BCSR_HEXLEDS, ~t);</div><div class='add'>+		if (bcsr_read(BCSR_HEXLEDS) != t) {</div><div class='add'>+			bcsr_write(BCSR_HEXLEDS, t);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* okay, try the PB1200 then */</div><div class='add'>+	bcsr_init(PB1200_BCSR_PHYS_ADDR,</div><div class='add'>+		  PB1200_BCSR_PHYS_ADDR + PB1200_BCSR_HEXLED_OFS);</div><div class='add'>+	bid = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));</div><div class='add'>+	if ((bid == BCSR_WHOAMI_PB1200_DDR1) ||</div><div class='add'>+	    (bid == BCSR_WHOAMI_PB1200_DDR2)) {</div><div class='add'>+		unsigned short t = bcsr_read(BCSR_HEXLEDS);</div><div class='add'>+		bcsr_write(BCSR_HEXLEDS, ~t);</div><div class='add'>+		if (bcsr_read(BCSR_HEXLEDS) != t) {</div><div class='add'>+			bcsr_write(BCSR_HEXLEDS, t);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;	/* it's neither */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init board_setup(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long freq0, clksrc, div, pfc;</div><div class='add'>+	unsigned short whoami;</div><div class='add'>+</div><div class='add'>+	if (detect_board()) {</div><div class='add'>+		printk(KERN_ERR "NOT running on a DB1200/PB1200 board!\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	whoami = bcsr_read(BCSR_WHOAMI);</div><div class='add'>+	printk(KERN_INFO "Alchemy/AMD/RMI %s Board, CPLD Rev %d"</div><div class='add'>+		"  Board-ID %d  Daughtercard ID %d\n", board_type_str(),</div><div class='add'>+		(whoami &gt;&gt; 4) &amp; 0xf, (whoami &gt;&gt; 8) &amp; 0xf, whoami &amp; 0xf);</div><div class='add'>+</div><div class='add'>+	/* SMBus/SPI on PSC0, Audio on PSC1 */</div><div class='add'>+	pfc = __raw_readl((void __iomem *)SYS_PINFUNC);</div><div class='add'>+	pfc &amp;= ~(SYS_PINFUNC_P0A | SYS_PINFUNC_P0B);</div><div class='add'>+	pfc &amp;= ~(SYS_PINFUNC_P1A | SYS_PINFUNC_P1B | SYS_PINFUNC_FS3);</div><div class='add'>+	pfc |= SYS_PINFUNC_P1C;	/* SPI is configured later */</div><div class='add'>+	__raw_writel(pfc, (void __iomem *)SYS_PINFUNC);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	/* Clock configurations: PSC0: ~50MHz via Clkgen0, derived from</div><div class='add'>+	 * CPU clock; all other clock generators off/unused.</div><div class='add'>+	 */</div><div class='add'>+	div = (get_au1x00_speed() + 25000000) / 50000000;</div><div class='add'>+	if (div &amp; 1)</div><div class='add'>+		div++;</div><div class='add'>+	div = ((div &gt;&gt; 1) - 1) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	freq0 = div &lt;&lt; SYS_FC_FRDIV0_BIT;</div><div class='add'>+	__raw_writel(freq0, (void __iomem *)SYS_FREQCTRL0);</div><div class='add'>+	wmb();</div><div class='add'>+	freq0 |= SYS_FC_FE0;	/* enable F0 */</div><div class='add'>+	__raw_writel(freq0, (void __iomem *)SYS_FREQCTRL0);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	/* psc0_intclk comes 1:1 from F0 */</div><div class='add'>+	clksrc = SYS_CS_MUX_FQ0 &lt;&lt; SYS_CS_ME0_BIT;</div><div class='add'>+	__raw_writel(clksrc, (void __iomem *)SYS_CLKSRC);</div><div class='add'>+	wmb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static struct mtd_partition db1200_spiflash_parts[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name	= "DB1200 SPI flash",</div><div class='add'>+		.name	= "spi_flash",</div><div class='ctx'> 		.offset	= 0,</div><div class='ctx'> 		.size	= MTDPART_SIZ_FULL,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -78,18 +177,9 @@ static struct spi_board_info db1200_spi_devs[] __initdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct i2c_board_info db1200_i2c_devs[] __initdata = {</div><div class='del'>-	{</div><div class='del'>-		/* AT24C04-10 I2C eeprom */</div><div class='del'>-		I2C_BOARD_INFO("24c04", 0x52),</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		/* Philips NE1619 temp/voltage sensor (adm1025 drv) */</div><div class='del'>-		I2C_BOARD_INFO("ne1619", 0x2d),</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		/* I2S audio codec WM8731 */</div><div class='del'>-		I2C_BOARD_INFO("wm8731", 0x1b),</div><div class='del'>-	},</div><div class='add'>+	{ I2C_BOARD_INFO("24c04", 0x52),  }, /* AT24C04-10 I2C eeprom */</div><div class='add'>+	{ I2C_BOARD_INFO("ne1619", 0x2d), }, /* adm1025-compat hwmon */</div><div class='add'>+	{ I2C_BOARD_INFO("wm8731", 0x1b), }, /* I2S audio codec WM8731 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**********************************************************************/</div><div class='hunk'>@@ -206,7 +296,7 @@ static struct platform_device db1200_eth_dev = {</div><div class='ctx'> static struct resource db1200_ide_res[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.start	= DB1200_IDE_PHYS_ADDR,</div><div class='del'>-		.end 	= DB1200_IDE_PHYS_ADDR + DB1200_IDE_PHYS_LEN - 1,</div><div class='add'>+		.end	= DB1200_IDE_PHYS_ADDR + DB1200_IDE_PHYS_LEN - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='hunk'>@@ -221,13 +311,13 @@ static struct resource db1200_ide_res[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u64 ide_dmamask = DMA_BIT_MASK(32);</div><div class='add'>+static u64 au1200_ide_dmamask = DMA_BIT_MASK(32);</div><div class='ctx'> </div><div class='ctx'> static struct platform_device db1200_ide_dev = {</div><div class='ctx'> 	.name		= "au1200-ide",</div><div class='ctx'> 	.id		= 0,</div><div class='ctx'> 	.dev = {</div><div class='del'>-		.dma_mask 		= &amp;ide_dmamask,</div><div class='add'>+		.dma_mask		= &amp;au1200_ide_dmamask,</div><div class='ctx'> 		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='ctx'> 	},</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(db1200_ide_res),</div><div class='hunk'>@@ -236,13 +326,6 @@ static struct platform_device db1200_ide_dev = {</div><div class='ctx'> </div><div class='ctx'> /**********************************************************************/</div><div class='ctx'> </div><div class='del'>-static struct platform_device db1200_rtc_dev = {</div><div class='del'>-	.name	= "rtc-au1xxx",</div><div class='del'>-	.id	= -1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**********************************************************************/</div><div class='del'>-</div><div class='ctx'> /* SD carddetects:  they're supposed to be edge-triggered, but ack</div><div class='ctx'>  * doesn't seem to work (CPLD Rev 2).  Instead, the screaming one</div><div class='ctx'>  * is disabled and its counterpart enabled.  The 500ms timeout is</div><div class='hunk'>@@ -276,12 +359,12 @@ static int db1200_mmc_cd_setup(void *mmc_host, int en)</div><div class='ctx'> </div><div class='ctx'> 	if (en) {</div><div class='ctx'> 		ret = request_irq(DB1200_SD0_INSERT_INT, db1200_mmc_cd,</div><div class='del'>-				  IRQF_DISABLED, "sd_insert", mmc_host);</div><div class='add'>+				  0, "sd_insert", mmc_host);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		ret = request_irq(DB1200_SD0_EJECT_INT, db1200_mmc_cd,</div><div class='del'>-				  IRQF_DISABLED, "sd_eject", mmc_host);</div><div class='add'>+				  0, "sd_eject", mmc_host);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			free_irq(DB1200_SD0_INSERT_INT, mmc_host);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -333,12 +416,109 @@ static struct led_classdev db1200_mmc_led = {</div><div class='ctx'> 	.brightness_set	= db1200_mmcled_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct au1xmmc_platform_data db1200mmc_platdata = {</div><div class='del'>-	.cd_setup	= db1200_mmc_cd_setup,</div><div class='del'>-	.set_power	= db1200_mmc_set_power,</div><div class='del'>-	.card_inserted	= db1200_mmc_card_inserted,</div><div class='del'>-	.card_readonly	= db1200_mmc_card_readonly,</div><div class='del'>-	.led		= &amp;db1200_mmc_led,</div><div class='add'>+/* -- */</div><div class='add'>+</div><div class='add'>+static irqreturn_t pb1200_mmc1_cd(int irq, void *ptr)</div><div class='add'>+{</div><div class='add'>+	void(*mmc_cd)(struct mmc_host *, unsigned long);</div><div class='add'>+</div><div class='add'>+	if (irq == PB1200_SD1_INSERT_INT) {</div><div class='add'>+		disable_irq_nosync(PB1200_SD1_INSERT_INT);</div><div class='add'>+		enable_irq(PB1200_SD1_EJECT_INT);</div><div class='add'>+	} else {</div><div class='add'>+		disable_irq_nosync(PB1200_SD1_EJECT_INT);</div><div class='add'>+		enable_irq(PB1200_SD1_INSERT_INT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* link against CONFIG_MMC=m */</div><div class='add'>+	mmc_cd = symbol_get(mmc_detect_change);</div><div class='add'>+	if (mmc_cd) {</div><div class='add'>+		mmc_cd(ptr, msecs_to_jiffies(500));</div><div class='add'>+		symbol_put(mmc_detect_change);</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 pb1200_mmc1_cd_setup(void *mmc_host, int en)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (en) {</div><div class='add'>+		ret = request_irq(PB1200_SD1_INSERT_INT, pb1200_mmc1_cd, 0,</div><div class='add'>+				  "sd1_insert", mmc_host);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		ret = request_irq(PB1200_SD1_EJECT_INT, pb1200_mmc1_cd, 0,</div><div class='add'>+				  "sd1_eject", mmc_host);</div><div class='add'>+		if (ret) {</div><div class='add'>+			free_irq(PB1200_SD1_INSERT_INT, mmc_host);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (bcsr_read(BCSR_SIGSTAT) &amp; BCSR_INT_SD1INSERT)</div><div class='add'>+			enable_irq(PB1200_SD1_EJECT_INT);</div><div class='add'>+		else</div><div class='add'>+			enable_irq(PB1200_SD1_INSERT_INT);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		free_irq(PB1200_SD1_INSERT_INT, mmc_host);</div><div class='add'>+		free_irq(PB1200_SD1_EJECT_INT, mmc_host);</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='add'>+static void pb1200_mmc1led_set(struct led_classdev *led,</div><div class='add'>+			enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	if (brightness != LED_OFF)</div><div class='add'>+			bcsr_mod(BCSR_LEDS, BCSR_LEDS_LED1, 0);</div><div class='add'>+	else</div><div class='add'>+			bcsr_mod(BCSR_LEDS, 0, BCSR_LEDS_LED1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct led_classdev pb1200_mmc1_led = {</div><div class='add'>+	.brightness_set	= pb1200_mmc1led_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void pb1200_mmc1_set_power(void *mmc_host, int state)</div><div class='add'>+{</div><div class='add'>+	if (state) {</div><div class='add'>+		bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_SD1PWR);</div><div class='add'>+		msleep(400);	/* stabilization time */</div><div class='add'>+	} else</div><div class='add'>+		bcsr_mod(BCSR_BOARD, BCSR_BOARD_SD1PWR, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pb1200_mmc1_card_readonly(void *mmc_host)</div><div class='add'>+{</div><div class='add'>+	return (bcsr_read(BCSR_STATUS) &amp; BCSR_STATUS_SD1WP) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pb1200_mmc1_card_inserted(void *mmc_host)</div><div class='add'>+{</div><div class='add'>+	return (bcsr_read(BCSR_SIGSTAT) &amp; BCSR_INT_SD1INSERT) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct au1xmmc_platform_data db1200_mmc_platdata[2] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.cd_setup	= db1200_mmc_cd_setup,</div><div class='add'>+		.set_power	= db1200_mmc_set_power,</div><div class='add'>+		.card_inserted	= db1200_mmc_card_inserted,</div><div class='add'>+		.card_readonly	= db1200_mmc_card_readonly,</div><div class='add'>+		.led		= &amp;db1200_mmc_led,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.cd_setup	= pb1200_mmc1_cd_setup,</div><div class='add'>+		.set_power	= pb1200_mmc1_set_power,</div><div class='add'>+		.card_inserted	= pb1200_mmc1_card_inserted,</div><div class='add'>+		.card_readonly	= pb1200_mmc1_card_readonly,</div><div class='add'>+		.led		= &amp;pb1200_mmc1_led,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource au1200_mmc0_resources[] = {</div><div class='hunk'>@@ -372,14 +552,76 @@ static struct platform_device db1200_mmc0_dev = {</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.dma_mask		= &amp;au1xxx_mmc_dmamask,</div><div class='ctx'> 		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-		.platform_data		= &amp;db1200mmc_platdata,</div><div class='add'>+		.platform_data		= &amp;db1200_mmc_platdata[0],</div><div class='ctx'> 	},</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(au1200_mmc0_resources),</div><div class='ctx'> 	.resource	= au1200_mmc0_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct resource au1200_mmc1_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1100_SD1_PHYS_ADDR,</div><div class='add'>+		.end	= AU1100_SD1_PHYS_ADDR + 0xfff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AU1200_SD_INT,</div><div class='add'>+		.end	= AU1200_SD_INT,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start	= AU1200_DSCR_CMD0_SDMS_TX1,</div><div class='add'>+		.end	= AU1200_DSCR_CMD0_SDMS_TX1,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+	[3] = {</div><div class='add'>+		.start	= AU1200_DSCR_CMD0_SDMS_RX1,</div><div class='add'>+		.end	= AU1200_DSCR_CMD0_SDMS_RX1,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device pb1200_mmc1_dev = {</div><div class='add'>+	.name		= "au1xxx-mmc",</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.dev = {</div><div class='add'>+		.dma_mask		= &amp;au1xxx_mmc_dmamask,</div><div class='add'>+		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='add'>+		.platform_data		= &amp;db1200_mmc_platdata[1],</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= ARRAY_SIZE(au1200_mmc1_res),</div><div class='add'>+	.resource	= au1200_mmc1_res,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**********************************************************************/</div><div class='ctx'> </div><div class='add'>+static int db1200fb_panel_index(void)</div><div class='add'>+{</div><div class='add'>+	return (bcsr_read(BCSR_SWITCHES) &gt;&gt; 8) &amp; 0x0f;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int db1200fb_panel_init(void)</div><div class='add'>+{</div><div class='add'>+	/* Apply power */</div><div class='add'>+	bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD |</div><div class='add'>+				BCSR_BOARD_LCDBL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int db1200fb_panel_shutdown(void)</div><div class='add'>+{</div><div class='add'>+	/* Remove power */</div><div class='add'>+	bcsr_mod(BCSR_BOARD, BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD |</div><div class='add'>+			     BCSR_BOARD_LCDBL, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct au1200fb_platdata db1200fb_pd = {</div><div class='add'>+	.panel_index	= db1200fb_panel_index,</div><div class='add'>+	.panel_init	= db1200fb_panel_init,</div><div class='add'>+	.panel_shutdown	= db1200fb_panel_shutdown,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct resource au1200_lcd_res[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.start	= AU1200_LCD_PHYS_ADDR,</div><div class='hunk'>@@ -401,6 +643,7 @@ static struct platform_device au1200_lcd_dev = {</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.dma_mask		= &amp;au1200_lcd_dmamask,</div><div class='ctx'> 		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='add'>+		.platform_data		= &amp;db1200fb_pd,</div><div class='ctx'> 	},</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(au1200_lcd_res),</div><div class='ctx'> 	.resource	= au1200_lcd_res,</div><div class='hunk'>@@ -519,7 +762,6 @@ static struct platform_device *db1200_devs[] __initdata = {</div><div class='ctx'> 	&amp;db1200_mmc0_dev,</div><div class='ctx'> 	&amp;au1200_lcd_dev,</div><div class='ctx'> 	&amp;db1200_eth_dev,</div><div class='del'>-	&amp;db1200_rtc_dev,</div><div class='ctx'> 	&amp;db1200_nand_dev,</div><div class='ctx'> 	&amp;db1200_audiodma_dev,</div><div class='ctx'> 	&amp;db1200_audio_dev,</div><div class='hunk'>@@ -527,11 +769,62 @@ static struct platform_device *db1200_devs[] __initdata = {</div><div class='ctx'> 	&amp;db1200_sound_dev,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct platform_device *pb1200_devs[] __initdata = {</div><div class='add'>+	&amp;pb1200_mmc1_dev,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Some peripheral base addresses differ on the PB1200 */</div><div class='add'>+static int __init pb1200_res_fixup(void)</div><div class='add'>+{</div><div class='add'>+	/* CPLD Revs earlier than 4 cause problems */</div><div class='add'>+	if (BCSR_WHOAMI_CPLD(bcsr_read(BCSR_WHOAMI)) &lt;= 3) {</div><div class='add'>+		printk(KERN_ERR "WARNING!!!\n");</div><div class='add'>+		printk(KERN_ERR "WARNING!!!\n");</div><div class='add'>+		printk(KERN_ERR "PB1200 must be at CPLD rev 4. Please have\n");</div><div class='add'>+		printk(KERN_ERR "the board updated to latest revisions.\n");</div><div class='add'>+		printk(KERN_ERR "This software will not work reliably\n");</div><div class='add'>+		printk(KERN_ERR "on anything older than CPLD rev 4.!\n");</div><div class='add'>+		printk(KERN_ERR "WARNING!!!\n");</div><div class='add'>+		printk(KERN_ERR "WARNING!!!\n");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	db1200_nand_res[0].start = PB1200_NAND_PHYS_ADDR;</div><div class='add'>+	db1200_nand_res[0].end   = PB1200_NAND_PHYS_ADDR + 0xff;</div><div class='add'>+	db1200_ide_res[0].start = PB1200_IDE_PHYS_ADDR;</div><div class='add'>+	db1200_ide_res[0].end   = PB1200_IDE_PHYS_ADDR + DB1200_IDE_PHYS_LEN - 1;</div><div class='add'>+	db1200_eth_res[0].start = PB1200_ETH_PHYS_ADDR;</div><div class='add'>+	db1200_eth_res[0].end   = PB1200_ETH_PHYS_ADDR + 0xff;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init db1200_dev_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long pfc;</div><div class='ctx'> 	unsigned short sw;</div><div class='del'>-	int swapped;</div><div class='add'>+	int swapped, bid;</div><div class='add'>+</div><div class='add'>+	bid = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));</div><div class='add'>+	if ((bid == BCSR_WHOAMI_PB1200_DDR1) ||</div><div class='add'>+	    (bid == BCSR_WHOAMI_PB1200_DDR2)) {</div><div class='add'>+		if (pb1200_res_fixup())</div><div class='add'>+			return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* GPIO7 is low-level triggered CPLD cascade */</div><div class='add'>+	irq_set_irq_type(AU1200_GPIO7_INT, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+	bcsr_init_irq(DB1200_INT_BEGIN, DB1200_INT_END, AU1200_GPIO7_INT);</div><div class='add'>+</div><div class='add'>+	/* insert/eject pairs: one of both is always screaming.  To avoid</div><div class='add'>+	 * issues they must not be automatically enabled when initially</div><div class='add'>+	 * requested.</div><div class='add'>+	 */</div><div class='add'>+	irq_set_status_flags(DB1200_SD0_INSERT_INT, IRQ_NOAUTOEN);</div><div class='add'>+	irq_set_status_flags(DB1200_SD0_EJECT_INT, IRQ_NOAUTOEN);</div><div class='add'>+	irq_set_status_flags(DB1200_PC0_INSERT_INT, IRQ_NOAUTOEN);</div><div class='add'>+	irq_set_status_flags(DB1200_PC0_EJECT_INT, IRQ_NOAUTOEN);</div><div class='add'>+	irq_set_status_flags(DB1200_PC1_INSERT_INT, IRQ_NOAUTOEN);</div><div class='add'>+	irq_set_status_flags(DB1200_PC1_EJECT_INT, IRQ_NOAUTOEN);</div><div class='ctx'> </div><div class='ctx'> 	i2c_register_board_info(0, db1200_i2c_devs,</div><div class='ctx'> 				ARRAY_SIZE(db1200_i2c_devs));</div><div class='hunk'>@@ -540,6 +833,7 @@ static int __init db1200_dev_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SWITCHES:	S6.8 I2C/SPI selector  (OFF=I2C  ON=SPI)</div><div class='ctx'> 	 *		S6.7 AC97/I2S selector (OFF=AC97 ON=I2S)</div><div class='add'>+	 *		or S12 on the PB1200.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	/* NOTE: GPIO215 controls OTG VBUS supply.  In SPI mode however</div><div class='hunk'>@@ -554,7 +848,7 @@ static int __init db1200_dev_init(void)</div><div class='ctx'> 	gpio_request(215, "otg-vbus");</div><div class='ctx'> 	gpio_direction_output(215, 1);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "DB1200 device configuration:\n");</div><div class='add'>+	printk(KERN_INFO "%s device configuration:\n", board_type_str());</div><div class='ctx'> </div><div class='ctx'> 	sw = bcsr_read(BCSR_SWITCHES);</div><div class='ctx'> 	if (sw &amp; BCSR_SWITCHES_DIP_8) {</div><div class='hunk'>@@ -595,7 +889,7 @@ static int __init db1200_dev_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Audio PSC clock is supplied externally. (FIXME: platdata!!) */</div><div class='ctx'> 	__raw_writel(PSC_SEL_CLK_SERCLK,</div><div class='del'>-		(void __iomem *)KSEG1ADDR(AU1550_PSC1_PHYS_ADDR) + PSC_SEL_OFFSET);</div><div class='add'>+	    (void __iomem *)KSEG1ADDR(AU1550_PSC1_PHYS_ADDR) + PSC_SEL_OFFSET);</div><div class='ctx'> 	wmb();</div><div class='ctx'> </div><div class='ctx'> 	db1x_register_pcmcia_socket(</div><div class='hunk'>@@ -621,28 +915,13 @@ static int __init db1200_dev_init(void)</div><div class='ctx'> 	swapped = bcsr_read(BCSR_STATUS) &amp; BCSR_STATUS_DB1200_SWAPBOOT;</div><div class='ctx'> 	db1x_register_norflash(64 &lt;&lt; 20, 2, swapped);</div><div class='ctx'> </div><div class='del'>-	return platform_add_devices(db1200_devs, ARRAY_SIZE(db1200_devs));</div><div class='del'>-}</div><div class='del'>-device_initcall(db1200_dev_init);</div><div class='del'>-</div><div class='del'>-/* au1200fb calls these: STERBT EINEN TRAGISCHEN TOD!!! */</div><div class='del'>-int board_au1200fb_panel(void)</div><div class='del'>-{</div><div class='del'>-	return (bcsr_read(BCSR_SWITCHES) &gt;&gt; 8) &amp; 0x0f;</div><div class='del'>-}</div><div class='add'>+	platform_add_devices(db1200_devs, ARRAY_SIZE(db1200_devs));</div><div class='ctx'> </div><div class='del'>-int board_au1200fb_panel_init(void)</div><div class='del'>-{</div><div class='del'>-	/* Apply power */</div><div class='del'>-	bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD |</div><div class='del'>-				BCSR_BOARD_LCDBL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	/* PB1200 is a DB1200 with a 2nd MMC and Camera connector */</div><div class='add'>+	if ((bid == BCSR_WHOAMI_PB1200_DDR1) ||</div><div class='add'>+	    (bid == BCSR_WHOAMI_PB1200_DDR2))</div><div class='add'>+		platform_add_devices(pb1200_devs, ARRAY_SIZE(pb1200_devs));</div><div class='ctx'> </div><div class='del'>-int board_au1200fb_panel_shutdown(void)</div><div class='del'>-{</div><div class='del'>-	/* Remove power */</div><div class='del'>-	bcsr_mod(BCSR_BOARD, BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD |</div><div class='del'>-			     BCSR_BOARD_LCDBL, 0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+device_initcall(db1200_dev_init);</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/db1200/Makefile b/arch/mips/alchemy/devboards/db1200/Makefile<br/>deleted file mode 100644<br/>index 17840a5e2738..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/db1200/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/db1200/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-obj-y += setup.o platform.o</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/db1200/setup.c b/arch/mips/alchemy/devboards/db1200/setup.c<br/>deleted file mode 100644<br/>index 4a8980027ecf..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/db1200/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/db1200/setup.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,81 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Alchemy/AMD/RMI DB1200 board setup.</div><div class='del'>- *</div><div class='del'>- * Licensed under the terms outlined in the file COPYING in the root of</div><div class='del'>- * this source archive.</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/interrupt.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;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-#include &lt;asm/mach-db1x00/bcsr.h&gt;</div><div class='del'>-#include &lt;asm/mach-db1x00/db1200.h&gt;</div><div class='del'>-</div><div class='del'>-const char *get_system_type(void)</div><div class='del'>-{</div><div class='del'>-	return "Alchemy Db1200";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init board_setup(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long freq0, clksrc, div, pfc;</div><div class='del'>-	unsigned short whoami;</div><div class='del'>-</div><div class='del'>-	bcsr_init(DB1200_BCSR_PHYS_ADDR,</div><div class='del'>-		  DB1200_BCSR_PHYS_ADDR + DB1200_BCSR_HEXLED_OFS);</div><div class='del'>-</div><div class='del'>-	whoami = bcsr_read(BCSR_WHOAMI);</div><div class='del'>-	printk(KERN_INFO "Alchemy/AMD/RMI DB1200 Board, CPLD Rev %d"</div><div class='del'>-		"  Board-ID %d  Daughtercard ID %d\n",</div><div class='del'>-		(whoami &gt;&gt; 4) &amp; 0xf, (whoami &gt;&gt; 8) &amp; 0xf, whoami &amp; 0xf);</div><div class='del'>-</div><div class='del'>-	/* SMBus/SPI on PSC0, Audio on PSC1 */</div><div class='del'>-	pfc = __raw_readl((void __iomem *)SYS_PINFUNC);</div><div class='del'>-	pfc &amp;= ~(SYS_PINFUNC_P0A | SYS_PINFUNC_P0B);</div><div class='del'>-	pfc &amp;= ~(SYS_PINFUNC_P1A | SYS_PINFUNC_P1B | SYS_PINFUNC_FS3);</div><div class='del'>-	pfc |= SYS_PINFUNC_P1C;	/* SPI is configured later */</div><div class='del'>-	__raw_writel(pfc, (void __iomem *)SYS_PINFUNC);</div><div class='del'>-	wmb();</div><div class='del'>-</div><div class='del'>-	/* Clock configurations: PSC0: ~50MHz via Clkgen0, derived from</div><div class='del'>-	 * CPU clock; all other clock generators off/unused.</div><div class='del'>-	 */</div><div class='del'>-	div = (get_au1x00_speed() + 25000000) / 50000000;</div><div class='del'>-	if (div &amp; 1)</div><div class='del'>-		div++;</div><div class='del'>-	div = ((div &gt;&gt; 1) - 1) &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	freq0 = div &lt;&lt; SYS_FC_FRDIV0_BIT;</div><div class='del'>-	__raw_writel(freq0, (void __iomem *)SYS_FREQCTRL0);</div><div class='del'>-	wmb();</div><div class='del'>-	freq0 |= SYS_FC_FE0;	/* enable F0 */</div><div class='del'>-	__raw_writel(freq0, (void __iomem *)SYS_FREQCTRL0);</div><div class='del'>-	wmb();</div><div class='del'>-</div><div class='del'>-	/* psc0_intclk comes 1:1 from F0 */</div><div class='del'>-	clksrc = SYS_CS_MUX_FQ0 &lt;&lt; SYS_CS_ME0_BIT;</div><div class='del'>-	__raw_writel(clksrc, (void __iomem *)SYS_CLKSRC);</div><div class='del'>-	wmb();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init db1200_arch_init(void)</div><div class='del'>-{</div><div class='del'>-	/* GPIO7 is low-level triggered CPLD cascade */</div><div class='del'>-	irq_set_irq_type(AU1200_GPIO7_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-	bcsr_init_irq(DB1200_INT_BEGIN, DB1200_INT_END, AU1200_GPIO7_INT);</div><div class='del'>-</div><div class='del'>-	/* insert/eject pairs: one of both is always screaming.  To avoid</div><div class='del'>-	 * issues they must not be automatically enabled when initially</div><div class='del'>-	 * requested.</div><div class='del'>-	 */</div><div class='del'>-	irq_set_status_flags(DB1200_SD0_INSERT_INT, IRQ_NOAUTOEN);</div><div class='del'>-	irq_set_status_flags(DB1200_SD0_EJECT_INT, IRQ_NOAUTOEN);</div><div class='del'>-	irq_set_status_flags(DB1200_PC0_INSERT_INT, IRQ_NOAUTOEN);</div><div class='del'>-	irq_set_status_flags(DB1200_PC0_EJECT_INT, IRQ_NOAUTOEN);</div><div class='del'>-	irq_set_status_flags(DB1200_PC1_INSERT_INT, IRQ_NOAUTOEN);</div><div class='del'>-	irq_set_status_flags(DB1200_PC1_EJECT_INT, IRQ_NOAUTOEN);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-arch_initcall(db1200_arch_init);</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c<br/>new file mode 100644<br/>index 000000000000..0893f2af0d01<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/db1300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/devboards/db1300.c</a></div><div class='hunk'>@@ -0,0 +1,785 @@</div><div class='add'>+/*</div><div class='add'>+ * DBAu1300 init and platform device setup.</div><div class='add'>+ *</div><div class='add'>+ * (c) 2009 Manuel Lauss &lt;manuel.lauss@googlemail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/gpio_keys.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;	/* KEY_* codes */</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/ata_platform.h&gt;</div><div class='add'>+#include &lt;linux/mmc/host.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/mtd/nand.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/smsc911x.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1100_mmc.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1200fb.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1xxx_dbdma.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1xxx_psc.h&gt;</div><div class='add'>+#include &lt;asm/mach-db1x00/db1300.h&gt;</div><div class='add'>+#include &lt;asm/mach-db1x00/bcsr.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/prom.h&gt;</div><div class='add'>+</div><div class='add'>+#include "platform.h"</div><div class='add'>+</div><div class='add'>+static struct i2c_board_info db1300_i2c_devs[] __initdata = {</div><div class='add'>+	{ I2C_BOARD_INFO("wm8731", 0x1b), },	/* I2S audio codec */</div><div class='add'>+	{ I2C_BOARD_INFO("ne1619", 0x2d), },	/* adm1025-compat hwmon */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* multifunction pins to assign to GPIO controller */</div><div class='add'>+static int db1300_gpio_pins[] __initdata = {</div><div class='add'>+	AU1300_PIN_LCDPWM0, AU1300_PIN_PSC2SYNC1, AU1300_PIN_WAKE1,</div><div class='add'>+	AU1300_PIN_WAKE2, AU1300_PIN_WAKE3, AU1300_PIN_FG3AUX,</div><div class='add'>+	AU1300_PIN_EXTCLK1,</div><div class='add'>+	-1,	/* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* multifunction pins to assign to device functions */</div><div class='add'>+static int db1300_dev_pins[] __initdata = {</div><div class='add'>+	/* wake-from-str pins 0-3 */</div><div class='add'>+	AU1300_PIN_WAKE0,</div><div class='add'>+	/* external clock sources for PSC0 */</div><div class='add'>+	AU1300_PIN_EXTCLK0,</div><div class='add'>+	/* 8bit MMC interface on SD0: 6-9 */</div><div class='add'>+	AU1300_PIN_SD0DAT4, AU1300_PIN_SD0DAT5, AU1300_PIN_SD0DAT6,</div><div class='add'>+	AU1300_PIN_SD0DAT7,</div><div class='add'>+	/* UART1 pins: 11-18 */</div><div class='add'>+	AU1300_PIN_U1RI, AU1300_PIN_U1DCD, AU1300_PIN_U1DSR,</div><div class='add'>+	AU1300_PIN_U1CTS, AU1300_PIN_U1RTS, AU1300_PIN_U1DTR,</div><div class='add'>+	AU1300_PIN_U1RX, AU1300_PIN_U1TX,</div><div class='add'>+	/* UART0 pins: 19-24 */</div><div class='add'>+	AU1300_PIN_U0RI, AU1300_PIN_U0DCD, AU1300_PIN_U0DSR,</div><div class='add'>+	AU1300_PIN_U0CTS, AU1300_PIN_U0RTS, AU1300_PIN_U0DTR,</div><div class='add'>+	/* UART2: 25-26 */</div><div class='add'>+	AU1300_PIN_U2RX, AU1300_PIN_U2TX,</div><div class='add'>+	/* UART3: 27-28 */</div><div class='add'>+	AU1300_PIN_U3RX, AU1300_PIN_U3TX,</div><div class='add'>+	/* LCD controller PWMs, ext pixclock: 30-31 */</div><div class='add'>+	AU1300_PIN_LCDPWM1, AU1300_PIN_LCDCLKIN,</div><div class='add'>+	/* SD1 interface: 32-37 */</div><div class='add'>+	AU1300_PIN_SD1DAT0, AU1300_PIN_SD1DAT1, AU1300_PIN_SD1DAT2,</div><div class='add'>+	AU1300_PIN_SD1DAT3, AU1300_PIN_SD1CMD, AU1300_PIN_SD1CLK,</div><div class='add'>+	/* SD2 interface: 38-43 */</div><div class='add'>+	AU1300_PIN_SD2DAT0, AU1300_PIN_SD2DAT1, AU1300_PIN_SD2DAT2,</div><div class='add'>+	AU1300_PIN_SD2DAT3, AU1300_PIN_SD2CMD, AU1300_PIN_SD2CLK,</div><div class='add'>+	/* PSC0/1 clocks: 44-45 */</div><div class='add'>+	AU1300_PIN_PSC0CLK, AU1300_PIN_PSC1CLK,</div><div class='add'>+	/* PSCs: 46-49/50-53/54-57/58-61 */</div><div class='add'>+	AU1300_PIN_PSC0SYNC0, AU1300_PIN_PSC0SYNC1, AU1300_PIN_PSC0D0,</div><div class='add'>+	AU1300_PIN_PSC0D1,</div><div class='add'>+	AU1300_PIN_PSC1SYNC0, AU1300_PIN_PSC1SYNC1, AU1300_PIN_PSC1D0,</div><div class='add'>+	AU1300_PIN_PSC1D1,</div><div class='add'>+	AU1300_PIN_PSC2SYNC0,                       AU1300_PIN_PSC2D0,</div><div class='add'>+	AU1300_PIN_PSC2D1,</div><div class='add'>+	AU1300_PIN_PSC3SYNC0, AU1300_PIN_PSC3SYNC1, AU1300_PIN_PSC3D0,</div><div class='add'>+	AU1300_PIN_PSC3D1,</div><div class='add'>+	/* PCMCIA interface: 62-70 */</div><div class='add'>+	AU1300_PIN_PCE2, AU1300_PIN_PCE1, AU1300_PIN_PIOS16,</div><div class='add'>+	AU1300_PIN_PIOR, AU1300_PIN_PWE, AU1300_PIN_PWAIT,</div><div class='add'>+	AU1300_PIN_PREG, AU1300_PIN_POE, AU1300_PIN_PIOW,</div><div class='add'>+	/* camera interface H/V sync inputs: 71-72 */</div><div class='add'>+	AU1300_PIN_CIMLS, AU1300_PIN_CIMFS,</div><div class='add'>+	/* PSC2/3 clocks: 73-74 */</div><div class='add'>+	AU1300_PIN_PSC2CLK, AU1300_PIN_PSC3CLK,</div><div class='add'>+	-1,	/* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init db1300_gpio_config(void)</div><div class='add'>+{</div><div class='add'>+	int *i;</div><div class='add'>+</div><div class='add'>+	i = &amp;db1300_dev_pins[0];</div><div class='add'>+	while (*i != -1)</div><div class='add'>+		au1300_pinfunc_to_dev(*i++);</div><div class='add'>+</div><div class='add'>+	i = &amp;db1300_gpio_pins[0];</div><div class='add'>+	while (*i != -1)</div><div class='add'>+		au1300_gpio_direction_input(*i++);/* implies pin_to_gpio */</div><div class='add'>+</div><div class='add'>+	au1300_set_dbdma_gpio(1, AU1300_PIN_FG3AUX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char *get_system_type(void)</div><div class='add'>+{</div><div class='add'>+	return "DB1300";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='add'>+static void au1300_nand_cmd_ctrl(struct mtd_info *mtd, int cmd,</div><div class='add'>+				 unsigned int ctrl)</div><div class='add'>+{</div><div class='add'>+	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	unsigned long ioaddr = (unsigned long)this-&gt;IO_ADDR_W;</div><div class='add'>+</div><div class='add'>+	ioaddr &amp;= 0xffffff00;</div><div class='add'>+</div><div class='add'>+	if (ctrl &amp; NAND_CLE) {</div><div class='add'>+		ioaddr += MEM_STNAND_CMD;</div><div class='add'>+	} else if (ctrl &amp; NAND_ALE) {</div><div class='add'>+		ioaddr += MEM_STNAND_ADDR;</div><div class='add'>+	} else {</div><div class='add'>+		/* assume we want to r/w real data  by default */</div><div class='add'>+		ioaddr += MEM_STNAND_DATA;</div><div class='add'>+	}</div><div class='add'>+	this-&gt;IO_ADDR_R = this-&gt;IO_ADDR_W = (void __iomem *)ioaddr;</div><div class='add'>+	if (cmd != NAND_CMD_NONE) {</div><div class='add'>+		__raw_writeb(cmd, this-&gt;IO_ADDR_W);</div><div class='add'>+		wmb();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int au1300_nand_device_ready(struct mtd_info *mtd)</div><div class='add'>+{</div><div class='add'>+	return __raw_readl((void __iomem *)MEM_STSTAT) &amp; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *db1300_part_probes[] = { "cmdlinepart", NULL };</div><div class='add'>+</div><div class='add'>+static struct mtd_partition db1300_nand_parts[] = {</div><div class='add'>+	{</div><div class='add'>+		.name	= "NAND FS 0",</div><div class='add'>+		.offset	= 0,</div><div class='add'>+		.size	= 8 * 1024 * 1024,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "NAND FS 1",</div><div class='add'>+		.offset	= MTDPART_OFS_APPEND,</div><div class='add'>+		.size	= MTDPART_SIZ_FULL</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct platform_nand_data db1300_nand_platdata = {</div><div class='add'>+	.chip = {</div><div class='add'>+		.nr_chips	= 1,</div><div class='add'>+		.chip_offset	= 0,</div><div class='add'>+		.nr_partitions	= ARRAY_SIZE(db1300_nand_parts),</div><div class='add'>+		.partitions	= db1300_nand_parts,</div><div class='add'>+		.chip_delay	= 20,</div><div class='add'>+		.part_probe_types = db1300_part_probes,</div><div class='add'>+	},</div><div class='add'>+	.ctrl = {</div><div class='add'>+		.dev_ready	= au1300_nand_device_ready,</div><div class='add'>+		.cmd_ctrl	= au1300_nand_cmd_ctrl,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource db1300_nand_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= DB1300_NAND_PHYS_ADDR,</div><div class='add'>+		.end	= DB1300_NAND_PHYS_ADDR + 0xff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1300_nand_dev = {</div><div class='add'>+	.name		= "gen_nand",</div><div class='add'>+	.num_resources	= ARRAY_SIZE(db1300_nand_res),</div><div class='add'>+	.resource	= db1300_nand_res,</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;db1300_nand_platdata,</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 resource db1300_eth_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start		= DB1300_ETH_PHYS_ADDR,</div><div class='add'>+		.end		= DB1300_ETH_PHYS_END,</div><div class='add'>+		.flags		= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start		= DB1300_ETH_INT,</div><div class='add'>+		.end		= DB1300_ETH_INT,</div><div class='add'>+		.flags		= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct smsc911x_platform_config db1300_eth_config = {</div><div class='add'>+	.phy_interface		= PHY_INTERFACE_MODE_MII,</div><div class='add'>+	.irq_polarity		= SMSC911X_IRQ_POLARITY_ACTIVE_LOW,</div><div class='add'>+	.irq_type		= SMSC911X_IRQ_TYPE_PUSH_PULL,</div><div class='add'>+	.flags			= SMSC911X_USE_32BIT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1300_eth_dev = {</div><div class='add'>+	.name			= "smsc911x",</div><div class='add'>+	.id			= -1,</div><div class='add'>+	.num_resources		= ARRAY_SIZE(db1300_eth_res),</div><div class='add'>+	.resource		= db1300_eth_res,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data	= &amp;db1300_eth_config,</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 resource au1300_psc1_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1300_PSC1_PHYS_ADDR,</div><div class='add'>+		.end	= AU1300_PSC1_PHYS_ADDR + 0x0fff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AU1300_PSC1_INT,</div><div class='add'>+		.end	= AU1300_PSC1_INT,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start	= AU1300_DSCR_CMD0_PSC1_TX,</div><div class='add'>+		.end	= AU1300_DSCR_CMD0_PSC1_TX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+	[3] = {</div><div class='add'>+		.start	= AU1300_DSCR_CMD0_PSC1_RX,</div><div class='add'>+		.end	= AU1300_DSCR_CMD0_PSC1_RX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1300_ac97_dev = {</div><div class='add'>+	.name		= "au1xpsc_ac97",</div><div class='add'>+	.id		= 1,	/* PSC ID. match with AC97 codec ID! */</div><div class='add'>+	.num_resources	= ARRAY_SIZE(au1300_psc1_res),</div><div class='add'>+	.resource	= au1300_psc1_res,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='add'>+static struct resource au1300_psc2_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1300_PSC2_PHYS_ADDR,</div><div class='add'>+		.end	= AU1300_PSC2_PHYS_ADDR + 0x0fff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AU1300_PSC2_INT,</div><div class='add'>+		.end	= AU1300_PSC2_INT,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start	= AU1300_DSCR_CMD0_PSC2_TX,</div><div class='add'>+		.end	= AU1300_DSCR_CMD0_PSC2_TX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+	[3] = {</div><div class='add'>+		.start	= AU1300_DSCR_CMD0_PSC2_RX,</div><div class='add'>+		.end	= AU1300_DSCR_CMD0_PSC2_RX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1300_i2s_dev = {</div><div class='add'>+	.name		= "au1xpsc_i2s",</div><div class='add'>+	.id		= 2,	/* PSC ID */</div><div class='add'>+	.num_resources	= ARRAY_SIZE(au1300_psc2_res),</div><div class='add'>+	.resource	= au1300_psc2_res,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='add'>+static struct resource au1300_psc3_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1300_PSC3_PHYS_ADDR,</div><div class='add'>+		.end	= AU1300_PSC3_PHYS_ADDR + 0x0fff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AU1300_PSC3_INT,</div><div class='add'>+		.end	= AU1300_PSC3_INT,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start	= AU1300_DSCR_CMD0_PSC3_TX,</div><div class='add'>+		.end	= AU1300_DSCR_CMD0_PSC3_TX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+	[3] = {</div><div class='add'>+		.start	= AU1300_DSCR_CMD0_PSC3_RX,</div><div class='add'>+		.end	= AU1300_DSCR_CMD0_PSC3_RX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1300_i2c_dev = {</div><div class='add'>+	.name		= "au1xpsc_smbus",</div><div class='add'>+	.id		= 0,	/* bus number */</div><div class='add'>+	.num_resources	= ARRAY_SIZE(au1300_psc3_res),</div><div class='add'>+	.resource	= au1300_psc3_res,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='add'>+/* proper key assignments when facing the LCD panel.  For key assignments</div><div class='add'>+ * according to the schematics swap up with down and left with right.</div><div class='add'>+ * I chose to use it to emulate the arrow keys of a keyboard.</div><div class='add'>+ */</div><div class='add'>+static struct gpio_keys_button db1300_5waysw_arrowkeys[] = {</div><div class='add'>+	{</div><div class='add'>+		.code			= KEY_DOWN,</div><div class='add'>+		.gpio			= AU1300_PIN_LCDPWM0,</div><div class='add'>+		.type			= EV_KEY,</div><div class='add'>+		.debounce_interval	= 1,</div><div class='add'>+		.active_low		= 1,</div><div class='add'>+		.desc			= "5waysw-down",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.code			= KEY_UP,</div><div class='add'>+		.gpio			= AU1300_PIN_PSC2SYNC1,</div><div class='add'>+		.type			= EV_KEY,</div><div class='add'>+		.debounce_interval	= 1,</div><div class='add'>+		.active_low		= 1,</div><div class='add'>+		.desc			= "5waysw-up",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.code			= KEY_RIGHT,</div><div class='add'>+		.gpio			= AU1300_PIN_WAKE3,</div><div class='add'>+		.type			= EV_KEY,</div><div class='add'>+		.debounce_interval	= 1,</div><div class='add'>+		.active_low		= 1,</div><div class='add'>+		.desc			= "5waysw-right",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.code			= KEY_LEFT,</div><div class='add'>+		.gpio			= AU1300_PIN_WAKE2,</div><div class='add'>+		.type			= EV_KEY,</div><div class='add'>+		.debounce_interval	= 1,</div><div class='add'>+		.active_low		= 1,</div><div class='add'>+		.desc			= "5waysw-left",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.code			= KEY_ENTER,</div><div class='add'>+		.gpio			= AU1300_PIN_WAKE1,</div><div class='add'>+		.type			= EV_KEY,</div><div class='add'>+		.debounce_interval	= 1,</div><div class='add'>+		.active_low		= 1,</div><div class='add'>+		.desc			= "5waysw-push",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_keys_platform_data db1300_5waysw_data = {</div><div class='add'>+	.buttons	= db1300_5waysw_arrowkeys,</div><div class='add'>+	.nbuttons	= ARRAY_SIZE(db1300_5waysw_arrowkeys),</div><div class='add'>+	.rep		= 1,</div><div class='add'>+	.name		= "db1300-5wayswitch",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1300_5waysw_dev = {</div><div class='add'>+	.name		= "gpio-keys",</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data	= &amp;db1300_5waysw_data,</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 pata_platform_info db1300_ide_info = {</div><div class='add'>+	.ioport_shift	= DB1300_IDE_REG_SHIFT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IDE_ALT_START	(14 &lt;&lt; DB1300_IDE_REG_SHIFT)</div><div class='add'>+static struct resource db1300_ide_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= DB1300_IDE_PHYS_ADDR,</div><div class='add'>+		.end	= DB1300_IDE_PHYS_ADDR + IDE_ALT_START - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= DB1300_IDE_PHYS_ADDR + IDE_ALT_START,</div><div class='add'>+		.end	= DB1300_IDE_PHYS_ADDR + DB1300_IDE_PHYS_LEN - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start	= DB1300_IDE_INT,</div><div class='add'>+		.end	= DB1300_IDE_INT,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1300_ide_dev = {</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data	= &amp;db1300_ide_info,</div><div class='add'>+	},</div><div class='add'>+	.name		= "pata_platform",</div><div class='add'>+	.resource	= db1300_ide_res,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(db1300_ide_res),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='add'>+static irqreturn_t db1300_mmc_cd(int irq, void *ptr)</div><div class='add'>+{</div><div class='add'>+	void(*mmc_cd)(struct mmc_host *, unsigned long);</div><div class='add'>+</div><div class='add'>+	/* disable the one currently screaming. No other way to shut it up */</div><div class='add'>+	if (irq == DB1300_SD1_INSERT_INT) {</div><div class='add'>+		disable_irq_nosync(DB1300_SD1_INSERT_INT);</div><div class='add'>+		enable_irq(DB1300_SD1_EJECT_INT);</div><div class='add'>+	} else {</div><div class='add'>+		disable_irq_nosync(DB1300_SD1_EJECT_INT);</div><div class='add'>+		enable_irq(DB1300_SD1_INSERT_INT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* link against CONFIG_MMC=m.  We can only be called once MMC core has</div><div class='add'>+	 * initialized the controller, so symbol_get() should always succeed.</div><div class='add'>+	 */</div><div class='add'>+	mmc_cd = symbol_get(mmc_detect_change);</div><div class='add'>+	mmc_cd(ptr, msecs_to_jiffies(500));</div><div class='add'>+	symbol_put(mmc_detect_change);</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 db1300_mmc_card_readonly(void *mmc_host)</div><div class='add'>+{</div><div class='add'>+	/* it uses SD1 interface, but the DB1200's SD0 bit in the CPLD */</div><div class='add'>+	return bcsr_read(BCSR_STATUS) &amp; BCSR_STATUS_SD0WP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int db1300_mmc_card_inserted(void *mmc_host)</div><div class='add'>+{</div><div class='add'>+	return bcsr_read(BCSR_SIGSTAT) &amp; (1 &lt;&lt; 12); /* insertion irq signal */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int db1300_mmc_cd_setup(void *mmc_host, int en)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (en) {</div><div class='add'>+		ret = request_irq(DB1300_SD1_INSERT_INT, db1300_mmc_cd, 0,</div><div class='add'>+				  "sd_insert", mmc_host);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		ret = request_irq(DB1300_SD1_EJECT_INT, db1300_mmc_cd, 0,</div><div class='add'>+				  "sd_eject", mmc_host);</div><div class='add'>+		if (ret) {</div><div class='add'>+			free_irq(DB1300_SD1_INSERT_INT, mmc_host);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (db1300_mmc_card_inserted(mmc_host))</div><div class='add'>+			enable_irq(DB1300_SD1_EJECT_INT);</div><div class='add'>+		else</div><div class='add'>+			enable_irq(DB1300_SD1_INSERT_INT);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		free_irq(DB1300_SD1_INSERT_INT, mmc_host);</div><div class='add'>+		free_irq(DB1300_SD1_EJECT_INT, mmc_host);</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='add'>+static void db1300_mmcled_set(struct led_classdev *led,</div><div class='add'>+			      enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	if (brightness != LED_OFF)</div><div class='add'>+		bcsr_mod(BCSR_LEDS, BCSR_LEDS_LED0, 0);</div><div class='add'>+	else</div><div class='add'>+		bcsr_mod(BCSR_LEDS, 0, BCSR_LEDS_LED0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct led_classdev db1300_mmc_led = {</div><div class='add'>+	.brightness_set	= db1300_mmcled_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct au1xmmc_platform_data db1300_sd1_platdata = {</div><div class='add'>+	.cd_setup	= db1300_mmc_cd_setup,</div><div class='add'>+	.card_inserted	= db1300_mmc_card_inserted,</div><div class='add'>+	.card_readonly	= db1300_mmc_card_readonly,</div><div class='add'>+	.led		= &amp;db1300_mmc_led,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource au1300_sd1_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1300_SD1_PHYS_ADDR,</div><div class='add'>+		.end	= AU1300_SD1_PHYS_ADDR,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AU1300_SD1_INT,</div><div class='add'>+		.end	= AU1300_SD1_INT,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start	= AU1300_DSCR_CMD0_SDMS_TX1,</div><div class='add'>+		.end	= AU1300_DSCR_CMD0_SDMS_TX1,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+	[3] = {</div><div class='add'>+		.start	= AU1300_DSCR_CMD0_SDMS_RX1,</div><div class='add'>+		.end	= AU1300_DSCR_CMD0_SDMS_RX1,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1300_sd1_dev = {</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data	= &amp;db1300_sd1_platdata,</div><div class='add'>+	},</div><div class='add'>+	.name		= "au1xxx-mmc",</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.resource	= au1300_sd1_res,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(au1300_sd1_res),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='add'>+static int db1300_movinand_inserted(void *mmc_host)</div><div class='add'>+{</div><div class='add'>+	return 0; /* disable for now, it doesn't work yet */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int db1300_movinand_readonly(void *mmc_host)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void db1300_movinand_led_set(struct led_classdev *led,</div><div class='add'>+				    enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	if (brightness != LED_OFF)</div><div class='add'>+		bcsr_mod(BCSR_LEDS, BCSR_LEDS_LED1, 0);</div><div class='add'>+	else</div><div class='add'>+		bcsr_mod(BCSR_LEDS, 0, BCSR_LEDS_LED1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct led_classdev db1300_movinand_led = {</div><div class='add'>+	.brightness_set		= db1300_movinand_led_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct au1xmmc_platform_data db1300_sd0_platdata = {</div><div class='add'>+	.card_inserted		= db1300_movinand_inserted,</div><div class='add'>+	.card_readonly		= db1300_movinand_readonly,</div><div class='add'>+	.led			= &amp;db1300_movinand_led,</div><div class='add'>+	.mask_host_caps		= MMC_CAP_NEEDS_POLL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource au1300_sd0_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1100_SD0_PHYS_ADDR,</div><div class='add'>+		.end	= AU1100_SD0_PHYS_ADDR,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AU1300_SD0_INT,</div><div class='add'>+		.end	= AU1300_SD0_INT,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start	= AU1300_DSCR_CMD0_SDMS_TX0,</div><div class='add'>+		.end	= AU1300_DSCR_CMD0_SDMS_TX0,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+	[3] = {</div><div class='add'>+		.start	= AU1300_DSCR_CMD0_SDMS_RX0,</div><div class='add'>+		.end	= AU1300_DSCR_CMD0_SDMS_RX0,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1300_sd0_dev = {</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data	= &amp;db1300_sd0_platdata,</div><div class='add'>+	},</div><div class='add'>+	.name		= "au1xxx-mmc",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.resource	= au1300_sd0_res,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(au1300_sd0_res),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='add'>+static struct platform_device db1300_wm9715_dev = {</div><div class='add'>+	.name		= "wm9712-codec",</div><div class='add'>+	.id		= 1,	/* ID of PSC for AC97 audio, see asoc glue! */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1300_ac97dma_dev = {</div><div class='add'>+	.name		= "au1xpsc-pcm",</div><div class='add'>+	.id		= 1,	/* PSC ID */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1300_i2sdma_dev = {</div><div class='add'>+	.name		= "au1xpsc-pcm",</div><div class='add'>+	.id		= 2,	/* PSC ID */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1300_sndac97_dev = {</div><div class='add'>+	.name		= "db1300-ac97",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1300_sndi2s_dev = {</div><div class='add'>+	.name		= "db1300-i2s",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='add'>+static int db1300fb_panel_index(void)</div><div class='add'>+{</div><div class='add'>+	return 9;	/* DB1300_800x480 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int db1300fb_panel_init(void)</div><div class='add'>+{</div><div class='add'>+	/* Apply power (Vee/Vdd logic is inverted on Panel DB1300_800x480) */</div><div class='add'>+	bcsr_mod(BCSR_BOARD, BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD,</div><div class='add'>+			     BCSR_BOARD_LCDBL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int db1300fb_panel_shutdown(void)</div><div class='add'>+{</div><div class='add'>+	/* Remove power (Vee/Vdd logic is inverted on Panel DB1300_800x480) */</div><div class='add'>+	bcsr_mod(BCSR_BOARD, BCSR_BOARD_LCDBL,</div><div class='add'>+			     BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct au1200fb_platdata db1300fb_pd = {</div><div class='add'>+	.panel_index	= db1300fb_panel_index,</div><div class='add'>+	.panel_init	= db1300fb_panel_init,</div><div class='add'>+	.panel_shutdown	= db1300fb_panel_shutdown,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource au1300_lcd_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1200_LCD_PHYS_ADDR,</div><div class='add'>+		.end	= AU1200_LCD_PHYS_ADDR + 0x800 - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AU1300_LCD_INT,</div><div class='add'>+		.end	= AU1300_LCD_INT,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 au1300_lcd_dmamask = DMA_BIT_MASK(32);</div><div class='add'>+</div><div class='add'>+static struct platform_device db1300_lcd_dev = {</div><div class='add'>+	.name		= "au1200-lcd",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev = {</div><div class='add'>+		.dma_mask		= &amp;au1300_lcd_dmamask,</div><div class='add'>+		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='add'>+		.platform_data		= &amp;db1300fb_pd,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= ARRAY_SIZE(au1300_lcd_res),</div><div class='add'>+	.resource	= au1300_lcd_res,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='add'>+static struct platform_device *db1300_dev[] __initdata = {</div><div class='add'>+	&amp;db1300_eth_dev,</div><div class='add'>+	&amp;db1300_i2c_dev,</div><div class='add'>+	&amp;db1300_5waysw_dev,</div><div class='add'>+	&amp;db1300_nand_dev,</div><div class='add'>+	&amp;db1300_ide_dev,</div><div class='add'>+	&amp;db1300_sd0_dev,</div><div class='add'>+	&amp;db1300_sd1_dev,</div><div class='add'>+	&amp;db1300_lcd_dev,</div><div class='add'>+	&amp;db1300_ac97_dev,</div><div class='add'>+	&amp;db1300_i2s_dev,</div><div class='add'>+	&amp;db1300_wm9715_dev,</div><div class='add'>+	&amp;db1300_ac97dma_dev,</div><div class='add'>+	&amp;db1300_i2sdma_dev,</div><div class='add'>+	&amp;db1300_sndac97_dev,</div><div class='add'>+	&amp;db1300_sndi2s_dev,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init db1300_device_init(void)</div><div class='add'>+{</div><div class='add'>+	int swapped, cpldirq;</div><div class='add'>+</div><div class='add'>+	/* setup CPLD IRQ muxer */</div><div class='add'>+	cpldirq = au1300_gpio_to_irq(AU1300_PIN_EXTCLK1);</div><div class='add'>+	irq_set_irq_type(cpldirq, IRQ_TYPE_LEVEL_HIGH);</div><div class='add'>+	bcsr_init_irq(DB1300_FIRST_INT, DB1300_LAST_INT, cpldirq);</div><div class='add'>+</div><div class='add'>+	/* insert/eject IRQs: one always triggers so don't enable them</div><div class='add'>+	 * when doing request_irq() on them.  DB1200 has this bug too.</div><div class='add'>+	 */</div><div class='add'>+	irq_set_status_flags(DB1300_SD1_INSERT_INT, IRQ_NOAUTOEN);</div><div class='add'>+	irq_set_status_flags(DB1300_SD1_EJECT_INT, IRQ_NOAUTOEN);</div><div class='add'>+	irq_set_status_flags(DB1300_CF_INSERT_INT, IRQ_NOAUTOEN);</div><div class='add'>+	irq_set_status_flags(DB1300_CF_EJECT_INT, IRQ_NOAUTOEN);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * setup board</div><div class='add'>+	 */</div><div class='add'>+	prom_get_ethernet_addr(&amp;db1300_eth_config.mac[0]);</div><div class='add'>+</div><div class='add'>+	i2c_register_board_info(0, db1300_i2c_devs,</div><div class='add'>+				ARRAY_SIZE(db1300_i2c_devs));</div><div class='add'>+</div><div class='add'>+	/* Audio PSC clock is supplied by codecs (PSC1, 2) */</div><div class='add'>+	__raw_writel(PSC_SEL_CLK_SERCLK,</div><div class='add'>+	    (void __iomem *)KSEG1ADDR(AU1300_PSC1_PHYS_ADDR) + PSC_SEL_OFFSET);</div><div class='add'>+	wmb();</div><div class='add'>+	__raw_writel(PSC_SEL_CLK_SERCLK,</div><div class='add'>+	    (void __iomem *)KSEG1ADDR(AU1300_PSC2_PHYS_ADDR) + PSC_SEL_OFFSET);</div><div class='add'>+	wmb();</div><div class='add'>+	/* I2C uses internal 48MHz EXTCLK1 */</div><div class='add'>+	__raw_writel(PSC_SEL_CLK_INTCLK,</div><div class='add'>+	    (void __iomem *)KSEG1ADDR(AU1300_PSC3_PHYS_ADDR) + PSC_SEL_OFFSET);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	/* enable power to USB ports */</div><div class='add'>+	bcsr_mod(BCSR_RESETS, 0, BCSR_RESETS_USBHPWR | BCSR_RESETS_OTGPWR);</div><div class='add'>+</div><div class='add'>+	/* although it is socket #0, it uses the CPLD bits which previous boards</div><div class='add'>+	 * have used for socket #1.</div><div class='add'>+	 */</div><div class='add'>+	db1x_register_pcmcia_socket(</div><div class='add'>+		AU1000_PCMCIA_ATTR_PHYS_ADDR,</div><div class='add'>+		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x00400000 - 1,</div><div class='add'>+		AU1000_PCMCIA_MEM_PHYS_ADDR,</div><div class='add'>+		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x00400000 - 1,</div><div class='add'>+		AU1000_PCMCIA_IO_PHYS_ADDR,</div><div class='add'>+		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x00010000 - 1,</div><div class='add'>+		DB1300_CF_INT, DB1300_CF_INSERT_INT, 0, DB1300_CF_EJECT_INT, 1);</div><div class='add'>+</div><div class='add'>+	swapped = bcsr_read(BCSR_STATUS) &amp; BCSR_STATUS_DB1200_SWAPBOOT;</div><div class='add'>+	db1x_register_norflash(64 &lt;&lt; 20, 2, swapped);</div><div class='add'>+</div><div class='add'>+	return platform_add_devices(db1300_dev, ARRAY_SIZE(db1300_dev));</div><div class='add'>+}</div><div class='add'>+device_initcall(db1300_device_init);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void __init board_setup(void)</div><div class='add'>+{</div><div class='add'>+	unsigned short whoami;</div><div class='add'>+</div><div class='add'>+	db1300_gpio_config();</div><div class='add'>+	bcsr_init(DB1300_BCSR_PHYS_ADDR,</div><div class='add'>+		  DB1300_BCSR_PHYS_ADDR + DB1300_BCSR_HEXLED_OFS);</div><div class='add'>+</div><div class='add'>+	whoami = bcsr_read(BCSR_WHOAMI);</div><div class='add'>+	printk(KERN_INFO "NetLogic DBAu1300 Development Platform.\n\t"</div><div class='add'>+		"BoardID %d   CPLD Rev %d   DaughtercardID %d\n",</div><div class='add'>+		BCSR_WHOAMI_BOARD(whoami), BCSR_WHOAMI_CPLD(whoami),</div><div class='add'>+		BCSR_WHOAMI_DCID(whoami));</div><div class='add'>+</div><div class='add'>+	/* enable UARTs, YAMON only enables #2 */</div><div class='add'>+	alchemy_uart_enable(AU1300_UART0_PHYS_ADDR);</div><div class='add'>+	alchemy_uart_enable(AU1300_UART1_PHYS_ADDR);</div><div class='add'>+	alchemy_uart_enable(AU1300_UART3_PHYS_ADDR);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/db1550.c b/arch/mips/alchemy/devboards/db1550.c<br/>new file mode 100644<br/>index 000000000000..6815d0783cd8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/db1550.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/devboards/db1550.c</a></div><div class='hunk'>@@ -0,0 +1,498 @@</div><div class='add'>+/*</div><div class='add'>+ * Alchemy Db1550 board support</div><div class='add'>+ *</div><div class='add'>+ * (c) 2011 Manuel Lauss &lt;manuel.lauss@googlemail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/gpio.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/io.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/mtd/nand.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/spi/flash.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1xxx_eth.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1xxx_dbdma.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1xxx_psc.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1550_spi.h&gt;</div><div class='add'>+#include &lt;asm/mach-db1x00/bcsr.h&gt;</div><div class='add'>+#include &lt;prom.h&gt;</div><div class='add'>+#include "platform.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+const char *get_system_type(void)</div><div class='add'>+{</div><div class='add'>+	return "DB1550";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init db1550_hw_setup(void)</div><div class='add'>+{</div><div class='add'>+	void __iomem *base;</div><div class='add'>+</div><div class='add'>+	alchemy_gpio_direction_output(203, 0);	/* red led on */</div><div class='add'>+</div><div class='add'>+	/* complete SPI setup: link psc0_intclk to a 48MHz source,</div><div class='add'>+	 * and assign GPIO16 to PSC0_SYNC1 (SPI cs# line)</div><div class='add'>+	 */</div><div class='add'>+	base = (void __iomem *)SYS_CLKSRC;</div><div class='add'>+	__raw_writel(__raw_readl(base) | 0x000001e0, base);</div><div class='add'>+	base = (void __iomem *)SYS_PINFUNC;</div><div class='add'>+	__raw_writel(__raw_readl(base) | 1, base);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	/* reset the AC97 codec now, the reset time in the psc-ac97 driver</div><div class='add'>+	 * is apparently too short although it's ridiculous as it is.</div><div class='add'>+	 */</div><div class='add'>+	base = (void __iomem *)KSEG1ADDR(AU1550_PSC1_PHYS_ADDR);</div><div class='add'>+	__raw_writel(PSC_SEL_CLK_SERCLK | PSC_SEL_PS_AC97MODE,</div><div class='add'>+		     base + PSC_SEL_OFFSET);</div><div class='add'>+	__raw_writel(PSC_CTRL_DISABLE, base + PSC_CTRL_OFFSET);</div><div class='add'>+	wmb();</div><div class='add'>+	__raw_writel(PSC_AC97RST_RST, base + PSC_AC97RST_OFFSET);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	alchemy_gpio_direction_output(202, 0);	/* green led on */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init board_setup(void)</div><div class='add'>+{</div><div class='add'>+	unsigned short whoami;</div><div class='add'>+</div><div class='add'>+	bcsr_init(DB1550_BCSR_PHYS_ADDR,</div><div class='add'>+		  DB1550_BCSR_PHYS_ADDR + DB1550_BCSR_HEXLED_OFS);</div><div class='add'>+</div><div class='add'>+	whoami = bcsr_read(BCSR_WHOAMI);</div><div class='add'>+	printk(KERN_INFO "Alchemy/AMD DB1550 Board, CPLD Rev %d"</div><div class='add'>+		"  Board-ID %d  Daughtercard ID %d\n",</div><div class='add'>+		(whoami &gt;&gt; 4) &amp; 0xf, (whoami &gt;&gt; 8) &amp; 0xf, whoami &amp; 0xf);</div><div class='add'>+</div><div class='add'>+	db1550_hw_setup();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+</div><div class='add'>+static struct mtd_partition db1550_spiflash_parts[] = {</div><div class='add'>+	{</div><div class='add'>+		.name	= "spi_flash",</div><div class='add'>+		.offset	= 0,</div><div class='add'>+		.size	= MTDPART_SIZ_FULL,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct flash_platform_data db1550_spiflash_data = {</div><div class='add'>+	.name		= "s25fl010",</div><div class='add'>+	.parts		= db1550_spiflash_parts,</div><div class='add'>+	.nr_parts	= ARRAY_SIZE(db1550_spiflash_parts),</div><div class='add'>+	.type		= "m25p10",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_board_info db1550_spi_devs[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		/* TI TMP121AIDBVR temp sensor */</div><div class='add'>+		.modalias	= "tmp121",</div><div class='add'>+		.max_speed_hz	= 2400000,</div><div class='add'>+		.bus_num	= 0,</div><div class='add'>+		.chip_select	= 0,</div><div class='add'>+		.mode		= SPI_MODE_0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		/* Spansion S25FL001D0FMA SPI flash */</div><div class='add'>+		.modalias	= "m25p80",</div><div class='add'>+		.max_speed_hz	= 2400000,</div><div class='add'>+		.bus_num	= 0,</div><div class='add'>+		.chip_select	= 1,</div><div class='add'>+		.mode		= SPI_MODE_0,</div><div class='add'>+		.platform_data	= &amp;db1550_spiflash_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_board_info db1550_i2c_devs[] __initdata = {</div><div class='add'>+	{ I2C_BOARD_INFO("24c04",  0x52),}, /* AT24C04-10 I2C eeprom */</div><div class='add'>+	{ I2C_BOARD_INFO("ne1619", 0x2d),}, /* adm1025-compat hwmon */</div><div class='add'>+	{ I2C_BOARD_INFO("wm8731", 0x1b),}, /* I2S audio codec WM8731 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='add'>+static void au1550_nand_cmd_ctrl(struct mtd_info *mtd, int cmd,</div><div class='add'>+				 unsigned int ctrl)</div><div class='add'>+{</div><div class='add'>+	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	unsigned long ioaddr = (unsigned long)this-&gt;IO_ADDR_W;</div><div class='add'>+</div><div class='add'>+	ioaddr &amp;= 0xffffff00;</div><div class='add'>+</div><div class='add'>+	if (ctrl &amp; NAND_CLE) {</div><div class='add'>+		ioaddr += MEM_STNAND_CMD;</div><div class='add'>+	} else if (ctrl &amp; NAND_ALE) {</div><div class='add'>+		ioaddr += MEM_STNAND_ADDR;</div><div class='add'>+	} else {</div><div class='add'>+		/* assume we want to r/w real data  by default */</div><div class='add'>+		ioaddr += MEM_STNAND_DATA;</div><div class='add'>+	}</div><div class='add'>+	this-&gt;IO_ADDR_R = this-&gt;IO_ADDR_W = (void __iomem *)ioaddr;</div><div class='add'>+	if (cmd != NAND_CMD_NONE) {</div><div class='add'>+		__raw_writeb(cmd, this-&gt;IO_ADDR_W);</div><div class='add'>+		wmb();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int au1550_nand_device_ready(struct mtd_info *mtd)</div><div class='add'>+{</div><div class='add'>+	return __raw_readl((void __iomem *)MEM_STSTAT) &amp; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *db1550_part_probes[] = { "cmdlinepart", NULL };</div><div class='add'>+</div><div class='add'>+static struct mtd_partition db1550_nand_parts[] = {</div><div class='add'>+	{</div><div class='add'>+		.name	= "NAND FS 0",</div><div class='add'>+		.offset	= 0,</div><div class='add'>+		.size	= 8 * 1024 * 1024,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "NAND FS 1",</div><div class='add'>+		.offset	= MTDPART_OFS_APPEND,</div><div class='add'>+		.size	= MTDPART_SIZ_FULL</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct platform_nand_data db1550_nand_platdata = {</div><div class='add'>+	.chip = {</div><div class='add'>+		.nr_chips	= 1,</div><div class='add'>+		.chip_offset	= 0,</div><div class='add'>+		.nr_partitions	= ARRAY_SIZE(db1550_nand_parts),</div><div class='add'>+		.partitions	= db1550_nand_parts,</div><div class='add'>+		.chip_delay	= 20,</div><div class='add'>+		.part_probe_types = db1550_part_probes,</div><div class='add'>+	},</div><div class='add'>+	.ctrl = {</div><div class='add'>+		.dev_ready	= au1550_nand_device_ready,</div><div class='add'>+		.cmd_ctrl	= au1550_nand_cmd_ctrl,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource db1550_nand_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= 0x20000000,</div><div class='add'>+		.end	= 0x200000ff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1550_nand_dev = {</div><div class='add'>+	.name		= "gen_nand",</div><div class='add'>+	.num_resources	= ARRAY_SIZE(db1550_nand_res),</div><div class='add'>+	.resource	= db1550_nand_res,</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;db1550_nand_platdata,</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 resource au1550_psc0_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1550_PSC0_PHYS_ADDR,</div><div class='add'>+		.end	= AU1550_PSC0_PHYS_ADDR + 0xfff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AU1550_PSC0_INT,</div><div class='add'>+		.end	= AU1550_PSC0_INT,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start	= AU1550_DSCR_CMD0_PSC0_TX,</div><div class='add'>+		.end	= AU1550_DSCR_CMD0_PSC0_TX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+	[3] = {</div><div class='add'>+		.start	= AU1550_DSCR_CMD0_PSC0_RX,</div><div class='add'>+		.end	= AU1550_DSCR_CMD0_PSC0_RX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void db1550_spi_cs_en(struct au1550_spi_info *spi, int cs, int pol)</div><div class='add'>+{</div><div class='add'>+	if (cs)</div><div class='add'>+		bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_SPISEL);</div><div class='add'>+	else</div><div class='add'>+		bcsr_mod(BCSR_BOARD, BCSR_BOARD_SPISEL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct au1550_spi_info db1550_spi_platdata = {</div><div class='add'>+	.mainclk_hz	= 48000000,	/* PSC0 clock: max. 2.4MHz SPI clk */</div><div class='add'>+	.num_chipselect = 2,</div><div class='add'>+	.activate_cs	= db1550_spi_cs_en,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 spi_dmamask = DMA_BIT_MASK(32);</div><div class='add'>+</div><div class='add'>+static struct platform_device db1550_spi_dev = {</div><div class='add'>+	.dev	= {</div><div class='add'>+		.dma_mask		= &amp;spi_dmamask,</div><div class='add'>+		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='add'>+		.platform_data		= &amp;db1550_spi_platdata,</div><div class='add'>+	},</div><div class='add'>+	.name		= "au1550-spi",</div><div class='add'>+	.id		= 0,	/* bus number */</div><div class='add'>+	.num_resources	= ARRAY_SIZE(au1550_psc0_res),</div><div class='add'>+	.resource	= au1550_psc0_res,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='add'>+static struct resource au1550_psc1_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1550_PSC1_PHYS_ADDR,</div><div class='add'>+		.end	= AU1550_PSC1_PHYS_ADDR + 0xfff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AU1550_PSC1_INT,</div><div class='add'>+		.end	= AU1550_PSC1_INT,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start	= AU1550_DSCR_CMD0_PSC1_TX,</div><div class='add'>+		.end	= AU1550_DSCR_CMD0_PSC1_TX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+	[3] = {</div><div class='add'>+		.start	= AU1550_DSCR_CMD0_PSC1_RX,</div><div class='add'>+		.end	= AU1550_DSCR_CMD0_PSC1_RX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1550_ac97_dev = {</div><div class='add'>+	.name		= "au1xpsc_ac97",</div><div class='add'>+	.id		= 1,	/* PSC ID */</div><div class='add'>+	.num_resources	= ARRAY_SIZE(au1550_psc1_res),</div><div class='add'>+	.resource	= au1550_psc1_res,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct resource au1550_psc2_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1550_PSC2_PHYS_ADDR,</div><div class='add'>+		.end	= AU1550_PSC2_PHYS_ADDR + 0xfff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AU1550_PSC2_INT,</div><div class='add'>+		.end	= AU1550_PSC2_INT,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start	= AU1550_DSCR_CMD0_PSC2_TX,</div><div class='add'>+		.end	= AU1550_DSCR_CMD0_PSC2_TX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+	[3] = {</div><div class='add'>+		.start	= AU1550_DSCR_CMD0_PSC2_RX,</div><div class='add'>+		.end	= AU1550_DSCR_CMD0_PSC2_RX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1550_i2c_dev = {</div><div class='add'>+	.name		= "au1xpsc_smbus",</div><div class='add'>+	.id		= 0,	/* bus number */</div><div class='add'>+	.num_resources	= ARRAY_SIZE(au1550_psc2_res),</div><div class='add'>+	.resource	= au1550_psc2_res,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='add'>+static struct resource au1550_psc3_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1550_PSC3_PHYS_ADDR,</div><div class='add'>+		.end	= AU1550_PSC3_PHYS_ADDR + 0xfff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AU1550_PSC3_INT,</div><div class='add'>+		.end	= AU1550_PSC3_INT,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start	= AU1550_DSCR_CMD0_PSC3_TX,</div><div class='add'>+		.end	= AU1550_DSCR_CMD0_PSC3_TX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+	[3] = {</div><div class='add'>+		.start	= AU1550_DSCR_CMD0_PSC3_RX,</div><div class='add'>+		.end	= AU1550_DSCR_CMD0_PSC3_RX,</div><div class='add'>+		.flags	= IORESOURCE_DMA,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1550_i2s_dev = {</div><div class='add'>+	.name		= "au1xpsc_i2s",</div><div class='add'>+	.id		= 3,	/* PSC ID */</div><div class='add'>+	.num_resources	= ARRAY_SIZE(au1550_psc3_res),</div><div class='add'>+	.resource	= au1550_psc3_res,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='add'>+static struct platform_device db1550_stac_dev = {</div><div class='add'>+	.name		= "ac97-codec",</div><div class='add'>+	.id		= 1,	/* on PSC1 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1550_ac97dma_dev = {</div><div class='add'>+	.name		= "au1xpsc-pcm",</div><div class='add'>+	.id		= 1,	/* on PSC3 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1550_i2sdma_dev = {</div><div class='add'>+	.name		= "au1xpsc-pcm",</div><div class='add'>+	.id		= 3,	/* on PSC3 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1550_sndac97_dev = {</div><div class='add'>+	.name		= "db1550-ac97",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1550_sndi2s_dev = {</div><div class='add'>+	.name		= "db1550-i2s",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='add'>+static int db1550_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)</div><div class='add'>+{</div><div class='add'>+	if ((slot &lt; 11) || (slot &gt; 13) || pin == 0)</div><div class='add'>+		return -1;</div><div class='add'>+	if (slot == 11)</div><div class='add'>+		return (pin == 1) ? AU1550_PCI_INTC : 0xff;</div><div class='add'>+	if (slot == 12) {</div><div class='add'>+		switch (pin) {</div><div class='add'>+		case 1: return AU1550_PCI_INTB;</div><div class='add'>+		case 2: return AU1550_PCI_INTC;</div><div class='add'>+		case 3: return AU1550_PCI_INTD;</div><div class='add'>+		case 4: return AU1550_PCI_INTA;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (slot == 13) {</div><div class='add'>+		switch (pin) {</div><div class='add'>+		case 1: return AU1550_PCI_INTA;</div><div class='add'>+		case 2: return AU1550_PCI_INTB;</div><div class='add'>+		case 3: return AU1550_PCI_INTC;</div><div class='add'>+		case 4: return AU1550_PCI_INTD;</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 struct resource alchemy_pci_host_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1500_PCI_PHYS_ADDR,</div><div class='add'>+		.end	= AU1500_PCI_PHYS_ADDR + 0xfff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct alchemy_pci_platdata db1550_pci_pd = {</div><div class='add'>+	.board_map_irq	= db1550_map_pci_irq,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device db1550_pci_host_dev = {</div><div class='add'>+	.dev.platform_data = &amp;db1550_pci_pd,</div><div class='add'>+	.name		= "alchemy-pci",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(alchemy_pci_host_res),</div><div class='add'>+	.resource	= alchemy_pci_host_res,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='add'>+static struct platform_device *db1550_devs[] __initdata = {</div><div class='add'>+	&amp;db1550_nand_dev,</div><div class='add'>+	&amp;db1550_i2c_dev,</div><div class='add'>+	&amp;db1550_ac97_dev,</div><div class='add'>+	&amp;db1550_spi_dev,</div><div class='add'>+	&amp;db1550_i2s_dev,</div><div class='add'>+	&amp;db1550_stac_dev,</div><div class='add'>+	&amp;db1550_ac97dma_dev,</div><div class='add'>+	&amp;db1550_i2sdma_dev,</div><div class='add'>+	&amp;db1550_sndac97_dev,</div><div class='add'>+	&amp;db1550_sndi2s_dev,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* must be arch_initcall; MIPS PCI scans busses in a subsys_initcall */</div><div class='add'>+static int __init db1550_pci_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_device_register(&amp;db1550_pci_host_dev);</div><div class='add'>+}</div><div class='add'>+arch_initcall(db1550_pci_init);</div><div class='add'>+</div><div class='add'>+static int __init db1550_dev_init(void)</div><div class='add'>+{</div><div class='add'>+	int swapped;</div><div class='add'>+</div><div class='add'>+	irq_set_irq_type(AU1550_GPIO0_INT, IRQ_TYPE_EDGE_BOTH);  /* CD0# */</div><div class='add'>+	irq_set_irq_type(AU1550_GPIO1_INT, IRQ_TYPE_EDGE_BOTH);  /* CD1# */</div><div class='add'>+	irq_set_irq_type(AU1550_GPIO3_INT, IRQ_TYPE_LEVEL_LOW);  /* CARD0# */</div><div class='add'>+	irq_set_irq_type(AU1550_GPIO5_INT, IRQ_TYPE_LEVEL_LOW);  /* CARD1# */</div><div class='add'>+	irq_set_irq_type(AU1550_GPIO21_INT, IRQ_TYPE_LEVEL_LOW); /* STSCHG0# */</div><div class='add'>+	irq_set_irq_type(AU1550_GPIO22_INT, IRQ_TYPE_LEVEL_LOW); /* STSCHG1# */</div><div class='add'>+</div><div class='add'>+	i2c_register_board_info(0, db1550_i2c_devs,</div><div class='add'>+				ARRAY_SIZE(db1550_i2c_devs));</div><div class='add'>+	spi_register_board_info(db1550_spi_devs,</div><div class='add'>+				ARRAY_SIZE(db1550_i2c_devs));</div><div class='add'>+</div><div class='add'>+	/* Audio PSC clock is supplied by codecs (PSC1, 3) FIXME: platdata!! */</div><div class='add'>+	__raw_writel(PSC_SEL_CLK_SERCLK,</div><div class='add'>+	    (void __iomem *)KSEG1ADDR(AU1550_PSC1_PHYS_ADDR) + PSC_SEL_OFFSET);</div><div class='add'>+	wmb();</div><div class='add'>+	__raw_writel(PSC_SEL_CLK_SERCLK,</div><div class='add'>+	    (void __iomem *)KSEG1ADDR(AU1550_PSC3_PHYS_ADDR) + PSC_SEL_OFFSET);</div><div class='add'>+	wmb();</div><div class='add'>+	/* SPI/I2C use internally supplied 50MHz source */</div><div class='add'>+	__raw_writel(PSC_SEL_CLK_INTCLK,</div><div class='add'>+	    (void __iomem *)KSEG1ADDR(AU1550_PSC0_PHYS_ADDR) + PSC_SEL_OFFSET);</div><div class='add'>+	wmb();</div><div class='add'>+	__raw_writel(PSC_SEL_CLK_INTCLK,</div><div class='add'>+	    (void __iomem *)KSEG1ADDR(AU1550_PSC2_PHYS_ADDR) + PSC_SEL_OFFSET);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	db1x_register_pcmcia_socket(</div><div class='add'>+		AU1000_PCMCIA_ATTR_PHYS_ADDR,</div><div class='add'>+		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,</div><div class='add'>+		AU1000_PCMCIA_MEM_PHYS_ADDR,</div><div class='add'>+		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,</div><div class='add'>+		AU1000_PCMCIA_IO_PHYS_ADDR,</div><div class='add'>+		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,</div><div class='add'>+		AU1550_GPIO3_INT, AU1550_GPIO0_INT,</div><div class='add'>+		/*AU1550_GPIO21_INT*/0, 0, 0);</div><div class='add'>+</div><div class='add'>+	db1x_register_pcmcia_socket(</div><div class='add'>+		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004000000,</div><div class='add'>+		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,</div><div class='add'>+		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004000000,</div><div class='add'>+		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004400000 - 1,</div><div class='add'>+		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004000000,</div><div class='add'>+		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004010000 - 1,</div><div class='add'>+		AU1550_GPIO5_INT, AU1550_GPIO1_INT,</div><div class='add'>+		/*AU1550_GPIO22_INT*/0, 0, 1);</div><div class='add'>+</div><div class='add'>+	swapped = bcsr_read(BCSR_STATUS) &amp; BCSR_STATUS_DB1000_SWAPBOOT;</div><div class='add'>+	db1x_register_norflash(128 &lt;&lt; 20, 4, swapped);</div><div class='add'>+</div><div class='add'>+	return platform_add_devices(db1550_devs, ARRAY_SIZE(db1550_devs));</div><div class='add'>+}</div><div class='add'>+device_initcall(db1550_dev_init);</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/db1x00/Makefile b/arch/mips/alchemy/devboards/db1x00/Makefile<br/>deleted file mode 100644<br/>index 613c0c0c8be9..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/db1x00/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/db1x00/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#</div><div class='del'>-#  Copyright 2000, 2008 MontaVista Software Inc.</div><div class='del'>-#  Author: MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='del'>-#</div><div class='del'>-# Makefile for the Alchemy Semiconductor DBAu1xx0 boards.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-y := board_setup.o platform.o</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/db1x00/board_setup.c b/arch/mips/alchemy/devboards/db1x00/board_setup.c<br/>deleted file mode 100644<br/>index 7cd36e631f6c..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/db1x00/board_setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/db1x00/board_setup.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,229 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * BRIEF MODULE DESCRIPTION</div><div class='del'>- *	Alchemy Db1x00 board setup.</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, 2008 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc. &lt;source@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='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1xxx_eth.h&gt;</div><div class='del'>-#include &lt;asm/mach-db1x00/db1x00.h&gt;</div><div class='del'>-#include &lt;asm/mach-db1x00/bcsr.h&gt;</div><div class='del'>-#include &lt;asm/reboot.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;prom.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MIPS_BOSPORUS</div><div class='del'>-char irq_tab_alchemy[][5] __initdata = {</div><div class='del'>-	[11] = { -1, AU1500_PCI_INTA, AU1500_PCI_INTB, 0xff, 0xff }, /* IDSEL 11 - miniPCI  */</div><div class='del'>-	[12] = { -1, AU1500_PCI_INTA, 0xff, 0xff, 0xff }, /* IDSEL 12 - SN1741   */</div><div class='del'>-	[13] = { -1, AU1500_PCI_INTA, AU1500_PCI_INTB, AU1500_PCI_INTC, AU1500_PCI_INTD }, /* IDSEL 13 - PCI slot */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Micrel/Kendin 5 port switch attached to MAC0,</div><div class='del'>- * MAC0 is associated with PHY address 5 (== WAN port)</div><div class='del'>- * MAC1 is not associated with any PHY, since it's connected directly</div><div class='del'>- * to the switch.</div><div class='del'>- * no interrupts are used</div><div class='del'>- */</div><div class='del'>-static struct au1000_eth_platform_data eth0_pdata = {</div><div class='del'>-	.phy_static_config	= 1,</div><div class='del'>-	.phy_addr		= 5,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void bosporus_power_off(void)</div><div class='del'>-{</div><div class='del'>-	while (1)</div><div class='del'>-		asm volatile (".set mips3 ; wait ; .set mips0");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *get_system_type(void)</div><div class='del'>-{</div><div class='del'>-	return "Alchemy Bosporus Gateway Reference";</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MIPS_MIRAGE</div><div class='del'>-static void mirage_power_off(void)</div><div class='del'>-{</div><div class='del'>-	alchemy_gpio_direction_output(210, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *get_system_type(void)</div><div class='del'>-{</div><div class='del'>-	return "Alchemy Mirage";</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_MIPS_BOSPORUS) || defined(CONFIG_MIPS_MIRAGE)</div><div class='del'>-static void mips_softreset(void)</div><div class='del'>-{</div><div class='del'>-	asm volatile ("jr\t%0" : : "r"(0xbfc00000));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-const char *get_system_type(void)</div><div class='del'>-{</div><div class='del'>-	return "Alchemy Db1x00";</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void __init board_setup(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long bcsr1, bcsr2;</div><div class='del'>-</div><div class='del'>-	bcsr1 = DB1000_BCSR_PHYS_ADDR;</div><div class='del'>-	bcsr2 = DB1000_BCSR_PHYS_ADDR + DB1000_BCSR_HEXLED_OFS;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MIPS_DB1000</div><div class='del'>-	printk(KERN_INFO "AMD Alchemy Au1000/Db1000 Board\n");</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_MIPS_DB1500</div><div class='del'>-	printk(KERN_INFO "AMD Alchemy Au1500/Db1500 Board\n");</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_MIPS_DB1100</div><div class='del'>-	printk(KERN_INFO "AMD Alchemy Au1100/Db1100 Board\n");</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_MIPS_BOSPORUS</div><div class='del'>-	au1xxx_override_eth_cfg(0, &amp;eth0_pdata);</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "AMD Alchemy Bosporus Board\n");</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_MIPS_MIRAGE</div><div class='del'>-	printk(KERN_INFO "AMD Alchemy Mirage Board\n");</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_MIPS_DB1550</div><div class='del'>-	printk(KERN_INFO "AMD Alchemy Au1550/Db1550 Board\n");</div><div class='del'>-</div><div class='del'>-	bcsr1 = DB1550_BCSR_PHYS_ADDR;</div><div class='del'>-	bcsr2 = DB1550_BCSR_PHYS_ADDR + DB1550_BCSR_HEXLED_OFS;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* initialize board register space */</div><div class='del'>-	bcsr_init(bcsr1, bcsr2);</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_IRDA) &amp;&amp; defined(CONFIG_AU1000_FIR)</div><div class='del'>-	{</div><div class='del'>-		u32 pin_func;</div><div class='del'>-</div><div class='del'>-		/* Set IRFIRSEL instead of GPIO15 */</div><div class='del'>-		pin_func = au_readl(SYS_PINFUNC) | SYS_PF_IRF;</div><div class='del'>-		au_writel(pin_func, SYS_PINFUNC);</div><div class='del'>-		/* Power off until the driver is in use */</div><div class='del'>-		bcsr_mod(BCSR_RESETS, BCSR_RESETS_IRDA_MODE_MASK,</div><div class='del'>-			 BCSR_RESETS_IRDA_MODE_OFF);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	bcsr_write(BCSR_PCMCIA, 0);	/* turn off PCMCIA power */</div><div class='del'>-</div><div class='del'>-	/* Enable GPIO[31:0] inputs */</div><div class='del'>-	alchemy_gpio1_input_enable();</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MIPS_MIRAGE</div><div class='del'>-	{</div><div class='del'>-		u32 pin_func;</div><div class='del'>-</div><div class='del'>-		/* GPIO[20] is output */</div><div class='del'>-		alchemy_gpio_direction_output(20, 0);</div><div class='del'>-</div><div class='del'>-		/* Set GPIO[210:208] instead of SSI_0 */</div><div class='del'>-		pin_func = au_readl(SYS_PINFUNC) | SYS_PF_S0;</div><div class='del'>-</div><div class='del'>-		/* Set GPIO[215:211] for LEDs */</div><div class='del'>-		pin_func |= 5 &lt;&lt; 2;</div><div class='del'>-</div><div class='del'>-		/* Set GPIO[214:213] for more LEDs */</div><div class='del'>-		pin_func |= 5 &lt;&lt; 12;</div><div class='del'>-</div><div class='del'>-		/* Set GPIO[207:200] instead of PCMCIA/LCD */</div><div class='del'>-		pin_func |= SYS_PF_LCD | SYS_PF_PC;</div><div class='del'>-		au_writel(pin_func, SYS_PINFUNC);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Enable speaker amplifier.  This should</div><div class='del'>-		 * be part of the audio driver.</div><div class='del'>-		 */</div><div class='del'>-		alchemy_gpio_direction_output(209, 1);</div><div class='del'>-</div><div class='del'>-		pm_power_off = mirage_power_off;</div><div class='del'>-		_machine_halt = mirage_power_off;</div><div class='del'>-		_machine_restart = (void(*)(char *))mips_softreset;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MIPS_BOSPORUS</div><div class='del'>-	pm_power_off = bosporus_power_off;</div><div class='del'>-	_machine_halt = bosporus_power_off;</div><div class='del'>-	_machine_restart = (void(*)(char *))mips_softreset;</div><div class='del'>-#endif</div><div class='del'>-	au_sync();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init db1x00_init_irq(void)</div><div class='del'>-{</div><div class='del'>-#if defined(CONFIG_MIPS_MIRAGE)</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO7_INT, IRQF_TRIGGER_RISING); /* TS pendown */</div><div class='del'>-#elif defined(CONFIG_MIPS_DB1550)</div><div class='del'>-	irq_set_irq_type(AU1550_GPIO0_INT, IRQF_TRIGGER_LOW);  /* CD0# */</div><div class='del'>-	irq_set_irq_type(AU1550_GPIO1_INT, IRQF_TRIGGER_LOW);  /* CD1# */</div><div class='del'>-	irq_set_irq_type(AU1550_GPIO3_INT, IRQF_TRIGGER_LOW);  /* CARD0# */</div><div class='del'>-	irq_set_irq_type(AU1550_GPIO5_INT, IRQF_TRIGGER_LOW);  /* CARD1# */</div><div class='del'>-	irq_set_irq_type(AU1550_GPIO21_INT, IRQF_TRIGGER_LOW); /* STSCHG0# */</div><div class='del'>-	irq_set_irq_type(AU1550_GPIO22_INT, IRQF_TRIGGER_LOW); /* STSCHG1# */</div><div class='del'>-#elif defined(CONFIG_MIPS_DB1500)</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO0_INT, IRQF_TRIGGER_LOW); /* CD0# */</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO3_INT, IRQF_TRIGGER_LOW); /* CD1# */</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO2_INT, IRQF_TRIGGER_LOW); /* CARD0# */</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO5_INT, IRQF_TRIGGER_LOW); /* CARD1# */</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO1_INT, IRQF_TRIGGER_LOW); /* STSCHG0# */</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO4_INT, IRQF_TRIGGER_LOW); /* STSCHG1# */</div><div class='del'>-#elif defined(CONFIG_MIPS_DB1100)</div><div class='del'>-	irq_set_irq_type(AU1100_GPIO0_INT, IRQF_TRIGGER_LOW); /* CD0# */</div><div class='del'>-	irq_set_irq_type(AU1100_GPIO3_INT, IRQF_TRIGGER_LOW); /* CD1# */</div><div class='del'>-	irq_set_irq_type(AU1100_GPIO2_INT, IRQF_TRIGGER_LOW); /* CARD0# */</div><div class='del'>-	irq_set_irq_type(AU1100_GPIO5_INT, IRQF_TRIGGER_LOW); /* CARD1# */</div><div class='del'>-	irq_set_irq_type(AU1100_GPIO1_INT, IRQF_TRIGGER_LOW); /* STSCHG0# */</div><div class='del'>-	irq_set_irq_type(AU1100_GPIO4_INT, IRQF_TRIGGER_LOW); /* STSCHG1# */</div><div class='del'>-#elif defined(CONFIG_MIPS_DB1000)</div><div class='del'>-	irq_set_irq_type(AU1000_GPIO0_INT, IRQF_TRIGGER_LOW); /* CD0# */</div><div class='del'>-	irq_set_irq_type(AU1000_GPIO3_INT, IRQF_TRIGGER_LOW); /* CD1# */</div><div class='del'>-	irq_set_irq_type(AU1000_GPIO2_INT, IRQF_TRIGGER_LOW); /* CARD0# */</div><div class='del'>-	irq_set_irq_type(AU1000_GPIO5_INT, IRQF_TRIGGER_LOW); /* CARD1# */</div><div class='del'>-	irq_set_irq_type(AU1000_GPIO1_INT, IRQF_TRIGGER_LOW); /* STSCHG0# */</div><div class='del'>-	irq_set_irq_type(AU1000_GPIO4_INT, IRQF_TRIGGER_LOW); /* STSCHG1# */</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-arch_initcall(db1x00_init_irq);</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/db1x00/platform.c b/arch/mips/alchemy/devboards/db1x00/platform.c<br/>deleted file mode 100644<br/>index 9e6b3d442acd..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/db1x00/platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/db1x00/platform.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,316 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * DBAu1xxx board platform device registration</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 Manuel Lauss</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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</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/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000_dma.h&gt;</div><div class='del'>-#include &lt;asm/mach-db1x00/bcsr.h&gt;</div><div class='del'>-#include "../platform.h"</div><div class='del'>-</div><div class='del'>-struct pci_dev;</div><div class='del'>-</div><div class='del'>-/* DB1xxx PCMCIA interrupt sources:</div><div class='del'>- * CD0/1 	GPIO0/3</div><div class='del'>- * STSCHG0/1	GPIO1/4</div><div class='del'>- * CARD0/1	GPIO2/5</div><div class='del'>- * Db1550:	0/1, 21/22, 3/5</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define DB1XXX_HAS_PCMCIA</div><div class='del'>-#define F_SWAPPED (bcsr_read(BCSR_STATUS) &amp; BCSR_STATUS_DB1000_SWAPBOOT)</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_MIPS_DB1000)</div><div class='del'>-#define DB1XXX_PCMCIA_CD0	AU1000_GPIO0_INT</div><div class='del'>-#define DB1XXX_PCMCIA_STSCHG0	AU1000_GPIO1_INT</div><div class='del'>-#define DB1XXX_PCMCIA_CARD0	AU1000_GPIO2_INT</div><div class='del'>-#define DB1XXX_PCMCIA_CD1	AU1000_GPIO3_INT</div><div class='del'>-#define DB1XXX_PCMCIA_STSCHG1	AU1000_GPIO4_INT</div><div class='del'>-#define DB1XXX_PCMCIA_CARD1	AU1000_GPIO5_INT</div><div class='del'>-#define BOARD_FLASH_SIZE	0x02000000 /* 32MB */</div><div class='del'>-#define BOARD_FLASH_WIDTH	4 /* 32-bits */</div><div class='del'>-#elif defined(CONFIG_MIPS_DB1100)</div><div class='del'>-#define DB1XXX_PCMCIA_CD0	AU1100_GPIO0_INT</div><div class='del'>-#define DB1XXX_PCMCIA_STSCHG0	AU1100_GPIO1_INT</div><div class='del'>-#define DB1XXX_PCMCIA_CARD0	AU1100_GPIO2_INT</div><div class='del'>-#define DB1XXX_PCMCIA_CD1	AU1100_GPIO3_INT</div><div class='del'>-#define DB1XXX_PCMCIA_STSCHG1	AU1100_GPIO4_INT</div><div class='del'>-#define DB1XXX_PCMCIA_CARD1	AU1100_GPIO5_INT</div><div class='del'>-#define BOARD_FLASH_SIZE	0x02000000 /* 32MB */</div><div class='del'>-#define BOARD_FLASH_WIDTH	4 /* 32-bits */</div><div class='del'>-#elif defined(CONFIG_MIPS_DB1500)</div><div class='del'>-#define DB1XXX_PCMCIA_CD0	AU1500_GPIO0_INT</div><div class='del'>-#define DB1XXX_PCMCIA_STSCHG0	AU1500_GPIO1_INT</div><div class='del'>-#define DB1XXX_PCMCIA_CARD0	AU1500_GPIO2_INT</div><div class='del'>-#define DB1XXX_PCMCIA_CD1	AU1500_GPIO3_INT</div><div class='del'>-#define DB1XXX_PCMCIA_STSCHG1	AU1500_GPIO4_INT</div><div class='del'>-#define DB1XXX_PCMCIA_CARD1	AU1500_GPIO5_INT</div><div class='del'>-#define BOARD_FLASH_SIZE	0x02000000 /* 32MB */</div><div class='del'>-#define BOARD_FLASH_WIDTH	4 /* 32-bits */</div><div class='del'>-#elif defined(CONFIG_MIPS_DB1550)</div><div class='del'>-#define DB1XXX_PCMCIA_CD0	AU1550_GPIO0_INT</div><div class='del'>-#define DB1XXX_PCMCIA_STSCHG0	AU1550_GPIO21_INT</div><div class='del'>-#define DB1XXX_PCMCIA_CARD0	AU1550_GPIO3_INT</div><div class='del'>-#define DB1XXX_PCMCIA_CD1	AU1550_GPIO1_INT</div><div class='del'>-#define DB1XXX_PCMCIA_STSCHG1	AU1550_GPIO22_INT</div><div class='del'>-#define DB1XXX_PCMCIA_CARD1	AU1550_GPIO5_INT</div><div class='del'>-#define BOARD_FLASH_SIZE	0x08000000 /* 128MB */</div><div class='del'>-#define BOARD_FLASH_WIDTH	4 /* 32-bits */</div><div class='del'>-#else</div><div class='del'>-/* other board: no PCMCIA */</div><div class='del'>-#undef DB1XXX_HAS_PCMCIA</div><div class='del'>-#undef F_SWAPPED</div><div class='del'>-#define F_SWAPPED 0</div><div class='del'>-#if defined(CONFIG_MIPS_BOSPORUS)</div><div class='del'>-#define BOARD_FLASH_SIZE	0x01000000 /* 16MB */</div><div class='del'>-#define BOARD_FLASH_WIDTH	2 /* 16-bits */</div><div class='del'>-#elif defined(CONFIG_MIPS_MIRAGE)</div><div class='del'>-#define BOARD_FLASH_SIZE	0x04000000 /* 64MB */</div><div class='del'>-#define BOARD_FLASH_WIDTH	4 /* 32-bits */</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-#ifdef CONFIG_MIPS_DB1500</div><div class='del'>-static int db1xxx_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)</div><div class='del'>-{</div><div class='del'>-	if ((slot &lt; 12) || (slot &gt; 13) || pin == 0)</div><div class='del'>-		return -1;</div><div class='del'>-	if (slot == 12)</div><div class='del'>-		return (pin == 1) ? AU1500_PCI_INTA : 0xff;</div><div class='del'>-	if (slot == 13) {</div><div class='del'>-		switch (pin) {</div><div class='del'>-		case 1: return AU1500_PCI_INTA;</div><div class='del'>-		case 2: return AU1500_PCI_INTB;</div><div class='del'>-		case 3: return AU1500_PCI_INTC;</div><div class='del'>-		case 4: return AU1500_PCI_INTD;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MIPS_DB1550</div><div class='del'>-static int db1xxx_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)</div><div class='del'>-{</div><div class='del'>-	if ((slot &lt; 11) || (slot &gt; 13) || pin == 0)</div><div class='del'>-		return -1;</div><div class='del'>-	if (slot == 11)</div><div class='del'>-		return (pin == 1) ? AU1550_PCI_INTC : 0xff;</div><div class='del'>-	if (slot == 12) {</div><div class='del'>-		switch (pin) {</div><div class='del'>-		case 1: return AU1550_PCI_INTB;</div><div class='del'>-		case 2: return AU1550_PCI_INTC;</div><div class='del'>-		case 3: return AU1550_PCI_INTD;</div><div class='del'>-		case 4: return AU1550_PCI_INTA;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (slot == 13) {</div><div class='del'>-		switch (pin) {</div><div class='del'>-		case 1: return AU1550_PCI_INTA;</div><div class='del'>-		case 2: return AU1550_PCI_INTB;</div><div class='del'>-		case 3: return AU1550_PCI_INTC;</div><div class='del'>-		case 4: return AU1550_PCI_INTD;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MIPS_BOSPORUS</div><div class='del'>-static int db1xxx_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)</div><div class='del'>-{</div><div class='del'>-	if ((slot &lt; 11) || (slot &gt; 13) || pin == 0)</div><div class='del'>-		return -1;</div><div class='del'>-	if (slot == 12)</div><div class='del'>-		return (pin == 1) ? AU1500_PCI_INTA : 0xff;</div><div class='del'>-	if (slot == 11) {</div><div class='del'>-		switch (pin) {</div><div class='del'>-		case 1: return AU1500_PCI_INTA;</div><div class='del'>-		case 2: return AU1500_PCI_INTB;</div><div class='del'>-		default: return 0xff;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (slot == 13) {</div><div class='del'>-		switch (pin) {</div><div class='del'>-		case 1: return AU1500_PCI_INTA;</div><div class='del'>-		case 2: return AU1500_PCI_INTB;</div><div class='del'>-		case 3: return AU1500_PCI_INTC;</div><div class='del'>-		case 4: return AU1500_PCI_INTD;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MIPS_MIRAGE</div><div class='del'>-static int db1xxx_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)</div><div class='del'>-{</div><div class='del'>-	if ((slot &lt; 11) || (slot &gt; 13) || pin == 0)</div><div class='del'>-		return -1;</div><div class='del'>-	if (slot == 11)</div><div class='del'>-		return (pin == 1) ? AU1500_PCI_INTD : 0xff;</div><div class='del'>-	if (slot == 12)</div><div class='del'>-		return (pin == 3) ? AU1500_PCI_INTC : 0xff;</div><div class='del'>-	if (slot == 13) {</div><div class='del'>-		switch (pin) {</div><div class='del'>-		case 1: return AU1500_PCI_INTA;</div><div class='del'>-		case 2: return AU1500_PCI_INTB;</div><div class='del'>-		default: return 0xff;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static struct resource alchemy_pci_host_res[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start	= AU1500_PCI_PHYS_ADDR,</div><div class='del'>-		.end	= AU1500_PCI_PHYS_ADDR + 0xfff,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct alchemy_pci_platdata db1xxx_pci_pd = {</div><div class='del'>-	.board_map_irq	= db1xxx_map_pci_irq,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device db1xxx_pci_host_dev = {</div><div class='del'>-	.dev.platform_data = &amp;db1xxx_pci_pd,</div><div class='del'>-	.name		= "alchemy-pci",</div><div class='del'>-	.id		= 0,</div><div class='del'>-	.num_resources	= ARRAY_SIZE(alchemy_pci_host_res),</div><div class='del'>-	.resource	= alchemy_pci_host_res,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init db15x0_pci_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_device_register(&amp;db1xxx_pci_host_dev);</div><div class='del'>-}</div><div class='del'>-/* must be arch_initcall; MIPS PCI scans busses in a subsys_initcall */</div><div class='del'>-arch_initcall(db15x0_pci_init);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MIPS_DB1100</div><div class='del'>-static struct resource au1100_lcd_resources[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start	= AU1100_LCD_PHYS_ADDR,</div><div class='del'>-		.end	= AU1100_LCD_PHYS_ADDR + 0x800 - 1,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start	= AU1100_LCD_INT,</div><div class='del'>-		.end	= AU1100_LCD_INT,</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u64 au1100_lcd_dmamask = DMA_BIT_MASK(32);</div><div class='del'>-</div><div class='del'>-static struct platform_device au1100_lcd_device = {</div><div class='del'>-	.name		= "au1100-lcd",</div><div class='del'>-	.id		= 0,</div><div class='del'>-	.dev = {</div><div class='del'>-		.dma_mask		= &amp;au1100_lcd_dmamask,</div><div class='del'>-		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-	},</div><div class='del'>-	.num_resources	= ARRAY_SIZE(au1100_lcd_resources),</div><div class='del'>-	.resource	= au1100_lcd_resources,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static struct resource alchemy_ac97c_res[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start	= AU1000_AC97_PHYS_ADDR,</div><div class='del'>-		.end	= AU1000_AC97_PHYS_ADDR + 0xfff,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start	= DMA_ID_AC97C_TX,</div><div class='del'>-		.end	= DMA_ID_AC97C_TX,</div><div class='del'>-		.flags	= IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.start	= DMA_ID_AC97C_RX,</div><div class='del'>-		.end	= DMA_ID_AC97C_RX,</div><div class='del'>-		.flags	= IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device alchemy_ac97c_dev = {</div><div class='del'>-	.name		= "alchemy-ac97c",</div><div class='del'>-	.id		= -1,</div><div class='del'>-	.resource	= alchemy_ac97c_res,</div><div class='del'>-	.num_resources	= ARRAY_SIZE(alchemy_ac97c_res),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device alchemy_ac97c_dma_dev = {</div><div class='del'>-	.name		= "alchemy-pcm-dma",</div><div class='del'>-	.id		= 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device db1x00_codec_dev = {</div><div class='del'>-	.name		= "ac97-codec",</div><div class='del'>-	.id		= -1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device db1x00_audio_dev = {</div><div class='del'>-	.name		= "db1000-audio",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init db1xxx_dev_init(void)</div><div class='del'>-{</div><div class='del'>-#ifdef DB1XXX_HAS_PCMCIA</div><div class='del'>-	db1x_register_pcmcia_socket(</div><div class='del'>-		AU1000_PCMCIA_ATTR_PHYS_ADDR,</div><div class='del'>-		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,</div><div class='del'>-		AU1000_PCMCIA_MEM_PHYS_ADDR,</div><div class='del'>-		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,</div><div class='del'>-		AU1000_PCMCIA_IO_PHYS_ADDR,</div><div class='del'>-		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,</div><div class='del'>-		DB1XXX_PCMCIA_CARD0, DB1XXX_PCMCIA_CD0,</div><div class='del'>-		/*DB1XXX_PCMCIA_STSCHG0*/0, 0, 0);</div><div class='del'>-</div><div class='del'>-	db1x_register_pcmcia_socket(</div><div class='del'>-		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004000000,</div><div class='del'>-		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,</div><div class='del'>-		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004000000,</div><div class='del'>-		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004400000 - 1,</div><div class='del'>-		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004000000,</div><div class='del'>-		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004010000 - 1,</div><div class='del'>-		DB1XXX_PCMCIA_CARD1, DB1XXX_PCMCIA_CD1,</div><div class='del'>-		/*DB1XXX_PCMCIA_STSCHG1*/0, 0, 1);</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_MIPS_DB1100</div><div class='del'>-	platform_device_register(&amp;au1100_lcd_device);</div><div class='del'>-#endif</div><div class='del'>-	db1x_register_norflash(BOARD_FLASH_SIZE, BOARD_FLASH_WIDTH, F_SWAPPED);</div><div class='del'>-</div><div class='del'>-	platform_device_register(&amp;db1x00_codec_dev);</div><div class='del'>-	platform_device_register(&amp;alchemy_ac97c_dma_dev);</div><div class='del'>-	platform_device_register(&amp;alchemy_ac97c_dev);</div><div class='del'>-	platform_device_register(&amp;db1x00_audio_dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-device_initcall(db1xxx_dev_init);</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/pb1000/Makefile b/arch/mips/alchemy/devboards/pb1000/Makefile<br/>deleted file mode 100644<br/>index 97c6615ba2bb..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/pb1000/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1000/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#</div><div class='del'>-#  Copyright 2000, 2008 MontaVista Software Inc.</div><div class='del'>-#  Author: MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='del'>-#</div><div class='del'>-# Makefile for the Alchemy Semiconductor Pb1000 board.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-y := board_setup.o</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/pb1000/board_setup.c b/arch/mips/alchemy/devboards/pb1000/board_setup.c<br/>deleted file mode 100644<br/>index e64fdcbf75d0..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/pb1000/board_setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1000/board_setup.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,209 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000, 2008 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc. &lt;source@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='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-#include &lt;asm/mach-pb1x00/pb1000.h&gt;</div><div class='del'>-#include &lt;asm/reboot.h&gt;</div><div class='del'>-#include &lt;prom.h&gt;</div><div class='del'>-</div><div class='del'>-#include "../platform.h"</div><div class='del'>-</div><div class='del'>-const char *get_system_type(void)</div><div class='del'>-{</div><div class='del'>-	return "Alchemy Pb1000";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void board_reset(char *c)</div><div class='del'>-{</div><div class='del'>-	asm volatile ("jr %0" : : "r" (0xbfc00000));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void board_power_off(void)</div><div class='del'>-{</div><div class='del'>-	while (1)</div><div class='del'>-		asm volatile (</div><div class='del'>-		"	.set	mips32					\n"</div><div class='del'>-		"	wait						\n"</div><div class='del'>-		"	.set	mips0					\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init board_setup(void)</div><div class='del'>-{</div><div class='del'>-	u32 pin_func, static_cfg0;</div><div class='del'>-	u32 sys_freqctrl, sys_clksrc;</div><div class='del'>-	u32 prid = read_c0_prid();</div><div class='del'>-</div><div class='del'>-	sys_freqctrl = 0;</div><div class='del'>-	sys_clksrc = 0;</div><div class='del'>-</div><div class='del'>-	/* Set AUX clock to 12 MHz * 8 = 96 MHz */</div><div class='del'>-	au_writel(8, SYS_AUXPLL);</div><div class='del'>-	alchemy_gpio1_input_enable();</div><div class='del'>-	udelay(100);</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)</div><div class='del'>-	/* Zero and disable FREQ2 */</div><div class='del'>-	sys_freqctrl = au_readl(SYS_FREQCTRL0);</div><div class='del'>-	sys_freqctrl &amp;= ~0xFFF00000;</div><div class='del'>-	au_writel(sys_freqctrl, SYS_FREQCTRL0);</div><div class='del'>-</div><div class='del'>-	/* Zero and disable USBH/USBD clocks */</div><div class='del'>-	sys_clksrc = au_readl(SYS_CLKSRC);</div><div class='del'>-	sys_clksrc &amp;= ~(SYS_CS_CUD | SYS_CS_DUD | SYS_CS_MUD_MASK |</div><div class='del'>-		        SYS_CS_CUH | SYS_CS_DUH | SYS_CS_MUH_MASK);</div><div class='del'>-	au_writel(sys_clksrc, SYS_CLKSRC);</div><div class='del'>-</div><div class='del'>-	sys_freqctrl = au_readl(SYS_FREQCTRL0);</div><div class='del'>-	sys_freqctrl &amp;= ~0xFFF00000;</div><div class='del'>-</div><div class='del'>-	sys_clksrc = au_readl(SYS_CLKSRC);</div><div class='del'>-	sys_clksrc &amp;= ~(SYS_CS_CUD | SYS_CS_DUD | SYS_CS_MUD_MASK |</div><div class='del'>-		        SYS_CS_CUH | SYS_CS_DUH | SYS_CS_MUH_MASK);</div><div class='del'>-</div><div class='del'>-	switch (prid &amp; 0x000000FF) {</div><div class='del'>-	case 0x00: /* DA */</div><div class='del'>-	case 0x01: /* HA */</div><div class='del'>-	case 0x02: /* HB */</div><div class='del'>-		/* CPU core freq to 48 MHz to slow it way down... */</div><div class='del'>-		au_writel(4, SYS_CPUPLL);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Setup 48 MHz FREQ2 from CPUPLL for USB Host</div><div class='del'>-		 * FRDIV2 = 3 -&gt; div by 8 of 384 MHz -&gt; 48 MHz</div><div class='del'>-		 */</div><div class='del'>-		sys_freqctrl |= (3 &lt;&lt; SYS_FC_FRDIV2_BIT) | SYS_FC_FE2;</div><div class='del'>-		au_writel(sys_freqctrl, SYS_FREQCTRL0);</div><div class='del'>-</div><div class='del'>-		/* CPU core freq to 384 MHz */</div><div class='del'>-		au_writel(0x20, SYS_CPUPLL);</div><div class='del'>-</div><div class='del'>-		printk(KERN_INFO "Au1000: 48 MHz OHCI workaround enabled\n");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default: /* HC and newer */</div><div class='del'>-		/* FREQ2 = aux / 2 = 48 MHz */</div><div class='del'>-		sys_freqctrl |= (0 &lt;&lt; SYS_FC_FRDIV2_BIT) |</div><div class='del'>-				 SYS_FC_FE2 | SYS_FC_FS2;</div><div class='del'>-		au_writel(sys_freqctrl, SYS_FREQCTRL0);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Route 48 MHz FREQ2 into USB Host and/or Device</div><div class='del'>-	 */</div><div class='del'>-	sys_clksrc |= SYS_CS_MUX_FQ2 &lt;&lt; SYS_CS_MUH_BIT;</div><div class='del'>-	au_writel(sys_clksrc, SYS_CLKSRC);</div><div class='del'>-</div><div class='del'>-	/* Configure pins GPIO[14:9] as GPIO */</div><div class='del'>-	pin_func = au_readl(SYS_PINFUNC) &amp; ~(SYS_PF_UR3 | SYS_PF_USB);</div><div class='del'>-</div><div class='del'>-	/* 2nd USB port is USB host */</div><div class='del'>-	pin_func |= SYS_PF_USB;</div><div class='del'>-</div><div class='del'>-	au_writel(pin_func, SYS_PINFUNC);</div><div class='del'>-</div><div class='del'>-	alchemy_gpio_direction_input(11);</div><div class='del'>-	alchemy_gpio_direction_input(13);</div><div class='del'>-	alchemy_gpio_direction_output(4, 0);</div><div class='del'>-	alchemy_gpio_direction_output(5, 0);</div><div class='del'>-#endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */</div><div class='del'>-</div><div class='del'>-	/* Make GPIO 15 an input (for interrupt line) */</div><div class='del'>-	pin_func = au_readl(SYS_PINFUNC) &amp; ~SYS_PF_IRF;</div><div class='del'>-	/* We don't need I2S, so make it available for GPIO[31:29] */</div><div class='del'>-	pin_func |= SYS_PF_I2S;</div><div class='del'>-	au_writel(pin_func, SYS_PINFUNC);</div><div class='del'>-</div><div class='del'>-	alchemy_gpio_direction_input(15);</div><div class='del'>-</div><div class='del'>-	static_cfg0 = au_readl(MEM_STCFG0) &amp; ~0xc00;</div><div class='del'>-	au_writel(static_cfg0, MEM_STCFG0);</div><div class='del'>-</div><div class='del'>-	/* configure RCE2* for LCD */</div><div class='del'>-	au_writel(0x00000004, MEM_STCFG2);</div><div class='del'>-</div><div class='del'>-	/* MEM_STTIME2 */</div><div class='del'>-	au_writel(0x09000000, MEM_STTIME2);</div><div class='del'>-</div><div class='del'>-	/* Set 32-bit base address decoding for RCE2* */</div><div class='del'>-	au_writel(0x10003ff0, MEM_STADDR2);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * PCI CPLD setup</div><div class='del'>-	 * Expand CE0 to cover PCI</div><div class='del'>-	 */</div><div class='del'>-	au_writel(0x11803e40, MEM_STADDR1);</div><div class='del'>-</div><div class='del'>-	/* Burst visibility on */</div><div class='del'>-	au_writel(au_readl(MEM_STCFG0) | 0x1000, MEM_STCFG0);</div><div class='del'>-</div><div class='del'>-	au_writel(0x83, MEM_STCFG1);	     /* ewait enabled, flash timing */</div><div class='del'>-	au_writel(0x33030a10, MEM_STTIME1);  /* slower timing for FPGA */</div><div class='del'>-</div><div class='del'>-	/* Setup the static bus controller */</div><div class='del'>-	au_writel(0x00000002, MEM_STCFG3);  /* type = PCMCIA */</div><div class='del'>-	au_writel(0x280E3D07, MEM_STTIME3); /* 250ns cycle time */</div><div class='del'>-	au_writel(0x10000000, MEM_STADDR3); /* any PCMCIA select */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Enable Au1000 BCLK switching - note: sed1356 must not use</div><div class='del'>-	 * its BCLK (Au1000 LCLK) for any timings</div><div class='del'>-	 */</div><div class='del'>-	switch (prid &amp; 0x000000FF) {</div><div class='del'>-	case 0x00: /* DA */</div><div class='del'>-	case 0x01: /* HA */</div><div class='del'>-	case 0x02: /* HB */</div><div class='del'>-		break;</div><div class='del'>-	default:  /* HC and newer */</div><div class='del'>-		/*</div><div class='del'>-		 * Enable sys bus clock divider when IDLE state or no bus</div><div class='del'>-		 * activity.</div><div class='del'>-		 */</div><div class='del'>-		au_writel(au_readl(SYS_POWERCTRL) | (0x3 &lt;&lt; 5), SYS_POWERCTRL);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pm_power_off = board_power_off;</div><div class='del'>-	_machine_halt = board_power_off;</div><div class='del'>-	_machine_restart = board_reset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init pb1000_init_irq(void)</div><div class='del'>-{</div><div class='del'>-	irq_set_irq_type(AU1000_GPIO15_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-arch_initcall(pb1000_init_irq);</div><div class='del'>-</div><div class='del'>-static int __init pb1000_device_init(void)</div><div class='del'>-{</div><div class='del'>-	return db1x_register_norflash(8 * 1024 * 1024, 4, 0);</div><div class='del'>-}</div><div class='del'>-device_initcall(pb1000_device_init);</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/pb1100/board_setup.c b/arch/mips/alchemy/devboards/pb1100.c<br/>index d108fd573aaf..cff50d05ddd4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/pb1100/board_setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1100/board_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/pb1100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/devboards/pb1100.c</a></div><div class='hunk'>@@ -1,42 +1,37 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright 2002, 2008 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='add'>+ * Pb1100 board platform device registration</div><div class='ctx'>  *</div><div class='del'>- *  This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- *  under  the terms of  the GNU General  Public License as published 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='add'>+ * Copyright (C) 2009 Manuel Lauss</div><div class='ctx'>  *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='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='ctx'>  *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='ctx'> #include &lt;asm/mach-db1x00/bcsr.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;prom.h&gt;</div><div class='del'>-</div><div class='add'>+#include "platform.h"</div><div class='ctx'> </div><div class='ctx'> const char *get_system_type(void)</div><div class='ctx'> {</div><div class='del'>-	return "Alchemy Pb1100";</div><div class='add'>+	return "PB1100";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init board_setup(void)</div><div class='hunk'>@@ -115,13 +110,58 @@ void __init board_setup(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init pb1100_init_irq(void)</div><div class='add'>+/******************************************************************************/</div><div class='add'>+</div><div class='add'>+static struct resource au1100_lcd_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1100_LCD_PHYS_ADDR,</div><div class='add'>+		.end	= AU1100_LCD_PHYS_ADDR + 0x800 - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AU1100_LCD_INT,</div><div class='add'>+		.end	= AU1100_LCD_INT,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 au1100_lcd_dmamask = DMA_BIT_MASK(32);</div><div class='add'>+</div><div class='add'>+static struct platform_device au1100_lcd_device = {</div><div class='add'>+	.name		= "au1100-lcd",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev = {</div><div class='add'>+		.dma_mask		= &amp;au1100_lcd_dmamask,</div><div class='add'>+		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= ARRAY_SIZE(au1100_lcd_resources),</div><div class='add'>+	.resource	= au1100_lcd_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init pb1100_dev_init(void)</div><div class='ctx'> {</div><div class='add'>+	int swapped;</div><div class='add'>+</div><div class='ctx'> 	irq_set_irq_type(AU1100_GPIO9_INT, IRQF_TRIGGER_LOW); /* PCCD# */</div><div class='ctx'> 	irq_set_irq_type(AU1100_GPIO10_INT, IRQF_TRIGGER_LOW); /* PCSTSCHG# */</div><div class='ctx'> 	irq_set_irq_type(AU1100_GPIO11_INT, IRQF_TRIGGER_LOW); /* PCCard# */</div><div class='ctx'> 	irq_set_irq_type(AU1100_GPIO13_INT, IRQF_TRIGGER_LOW); /* DC_IRQ# */</div><div class='ctx'> </div><div class='add'>+	/* PCMCIA. single socket, identical to Pb1500 */</div><div class='add'>+	db1x_register_pcmcia_socket(</div><div class='add'>+		AU1000_PCMCIA_ATTR_PHYS_ADDR,</div><div class='add'>+		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,</div><div class='add'>+		AU1000_PCMCIA_MEM_PHYS_ADDR,</div><div class='add'>+		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,</div><div class='add'>+		AU1000_PCMCIA_IO_PHYS_ADDR,</div><div class='add'>+		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,</div><div class='add'>+		AU1100_GPIO11_INT, AU1100_GPIO9_INT,	 /* card / insert */</div><div class='add'>+		/*AU1100_GPIO10_INT*/0, 0, 0); /* stschg / eject / id */</div><div class='add'>+</div><div class='add'>+	swapped = bcsr_read(BCSR_STATUS) &amp;  BCSR_STATUS_DB1000_SWAPBOOT;</div><div class='add'>+	db1x_register_norflash(64 * 1024 * 1024, 4, swapped);</div><div class='add'>+	platform_device_register(&amp;au1100_lcd_device);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-arch_initcall(pb1100_init_irq);</div><div class='add'>+device_initcall(pb1100_dev_init);</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/pb1100/Makefile b/arch/mips/alchemy/devboards/pb1100/Makefile<br/>deleted file mode 100644<br/>index 7e3756c83fe5..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/pb1100/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1100/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#</div><div class='del'>-#  Copyright 2000, 2001, 2008 MontaVista Software Inc.</div><div class='del'>-#  Author: MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='del'>-#</div><div class='del'>-# Makefile for the Alchemy Semiconductor Pb1100 board.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-y := board_setup.o platform.o</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/pb1100/platform.c b/arch/mips/alchemy/devboards/pb1100/platform.c<br/>deleted file mode 100644<br/>index 9c57c01a68c4..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/pb1100/platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1100/platform.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Pb1100 board platform device registration</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 Manuel Lauss</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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</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/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-#include &lt;asm/mach-db1x00/bcsr.h&gt;</div><div class='del'>-</div><div class='del'>-#include "../platform.h"</div><div class='del'>-</div><div class='del'>-static struct resource au1100_lcd_resources[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start	= AU1100_LCD_PHYS_ADDR,</div><div class='del'>-		.end	= AU1100_LCD_PHYS_ADDR + 0x800 - 1,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start	= AU1100_LCD_INT,</div><div class='del'>-		.end	= AU1100_LCD_INT,</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u64 au1100_lcd_dmamask = DMA_BIT_MASK(32);</div><div class='del'>-</div><div class='del'>-static struct platform_device au1100_lcd_device = {</div><div class='del'>-	.name		= "au1100-lcd",</div><div class='del'>-	.id		= 0,</div><div class='del'>-	.dev = {</div><div class='del'>-		.dma_mask		= &amp;au1100_lcd_dmamask,</div><div class='del'>-		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-	},</div><div class='del'>-	.num_resources	= ARRAY_SIZE(au1100_lcd_resources),</div><div class='del'>-	.resource	= au1100_lcd_resources,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init pb1100_dev_init(void)</div><div class='del'>-{</div><div class='del'>-	int swapped;</div><div class='del'>-</div><div class='del'>-	/* PCMCIA. single socket, identical to Pb1500 */</div><div class='del'>-	db1x_register_pcmcia_socket(</div><div class='del'>-		AU1000_PCMCIA_ATTR_PHYS_ADDR,</div><div class='del'>-		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,</div><div class='del'>-		AU1000_PCMCIA_MEM_PHYS_ADDR,</div><div class='del'>-		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,</div><div class='del'>-		AU1000_PCMCIA_IO_PHYS_ADDR,</div><div class='del'>-		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,</div><div class='del'>-		AU1100_GPIO11_INT, AU1100_GPIO9_INT,	 /* card / insert */</div><div class='del'>-		/*AU1100_GPIO10_INT*/0, 0, 0); /* stschg / eject / id */</div><div class='del'>-</div><div class='del'>-	swapped = bcsr_read(BCSR_STATUS) &amp;  BCSR_STATUS_DB1000_SWAPBOOT;</div><div class='del'>-	db1x_register_norflash(64 * 1024 * 1024, 4, swapped);</div><div class='del'>-	platform_device_register(&amp;au1100_lcd_device);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-device_initcall(pb1100_dev_init);</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/pb1200/Makefile b/arch/mips/alchemy/devboards/pb1200/Makefile<br/>deleted file mode 100644<br/>index 18c1bd53e4c0..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/pb1200/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1200/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# Makefile for the Alchemy Semiconductor Pb1200/DBAu1200 boards.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-y := board_setup.o platform.o</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/pb1200/board_setup.c b/arch/mips/alchemy/devboards/pb1200/board_setup.c<br/>deleted file mode 100644<br/>index 6d06b07c2381..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/pb1200/board_setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1200/board_setup.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,174 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * BRIEF MODULE DESCRIPTION</div><div class='del'>- *	Alchemy Pb1200/Db1200 board setup.</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- *  under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- *  option) any later version.</div><div class='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-#include &lt;asm/mach-db1x00/bcsr.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MIPS_PB1200</div><div class='del'>-#include &lt;asm/mach-pb1x00/pb1200.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MIPS_DB1200</div><div class='del'>-#include &lt;asm/mach-db1x00/db1200.h&gt;</div><div class='del'>-#define PB1200_INT_BEGIN DB1200_INT_BEGIN</div><div class='del'>-#define PB1200_INT_END DB1200_INT_END</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;prom.h&gt;</div><div class='del'>-</div><div class='del'>-const char *get_system_type(void)</div><div class='del'>-{</div><div class='del'>-	return "Alchemy Pb1200";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init board_setup(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "AMD Alchemy Pb1200 Board\n");</div><div class='del'>-	bcsr_init(PB1200_BCSR_PHYS_ADDR,</div><div class='del'>-		  PB1200_BCSR_PHYS_ADDR + PB1200_BCSR_HEXLED_OFS);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	{</div><div class='del'>-		u32 pin_func;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Enable PSC1 SYNC for AC97.  Normaly done in audio driver,</div><div class='del'>-		 * but it is board specific code, so put it here.</div><div class='del'>-		 */</div><div class='del'>-		pin_func = au_readl(SYS_PINFUNC);</div><div class='del'>-		au_sync();</div><div class='del'>-		pin_func |= SYS_PF_MUST_BE_SET | SYS_PF_PSC1_S1;</div><div class='del'>-		au_writel(pin_func, SYS_PINFUNC);</div><div class='del'>-</div><div class='del'>-		au_writel(0, (u32)bcsr | 0x10); /* turn off PCMCIA power */</div><div class='del'>-		au_sync();</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_I2C_AU1550)</div><div class='del'>-	{</div><div class='del'>-		u32 freq0, clksrc;</div><div class='del'>-		u32 pin_func;</div><div class='del'>-</div><div class='del'>-		/* Select SMBus in CPLD */</div><div class='del'>-		bcsr_mod(BCSR_RESETS, BCSR_RESETS_PSC0MUX, 0);</div><div class='del'>-</div><div class='del'>-		pin_func = au_readl(SYS_PINFUNC);</div><div class='del'>-		au_sync();</div><div class='del'>-		pin_func &amp;= ~(SYS_PINFUNC_P0A | SYS_PINFUNC_P0B);</div><div class='del'>-		/* Set GPIOs correctly */</div><div class='del'>-		pin_func |= 2 &lt;&lt; 17;</div><div class='del'>-		au_writel(pin_func, SYS_PINFUNC);</div><div class='del'>-		au_sync();</div><div class='del'>-</div><div class='del'>-		/* The I2C driver depends on 50 MHz clock */</div><div class='del'>-		freq0 = au_readl(SYS_FREQCTRL0);</div><div class='del'>-		au_sync();</div><div class='del'>-		freq0 &amp;= ~(SYS_FC_FRDIV1_MASK | SYS_FC_FS1 | SYS_FC_FE1);</div><div class='del'>-		freq0 |= 3 &lt;&lt; SYS_FC_FRDIV1_BIT;</div><div class='del'>-		/* 396 MHz / (3 + 1) * 2 == 49.5 MHz */</div><div class='del'>-		au_writel(freq0, SYS_FREQCTRL0);</div><div class='del'>-		au_sync();</div><div class='del'>-		freq0 |= SYS_FC_FE1;</div><div class='del'>-		au_writel(freq0, SYS_FREQCTRL0);</div><div class='del'>-		au_sync();</div><div class='del'>-</div><div class='del'>-		clksrc = au_readl(SYS_CLKSRC);</div><div class='del'>-		au_sync();</div><div class='del'>-		clksrc &amp;= ~(SYS_CS_CE0 | SYS_CS_DE0 | SYS_CS_ME0_MASK);</div><div class='del'>-		/* Bit 22 is EXTCLK0 for PSC0 */</div><div class='del'>-		clksrc |= SYS_CS_MUX_FQ1 &lt;&lt; SYS_CS_ME0_BIT;</div><div class='del'>-		au_writel(clksrc, SYS_CLKSRC);</div><div class='del'>-		au_sync();</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The Pb1200 development board uses external MUX for PSC0 to</div><div class='del'>-	 * support SMB/SPI. bcsr_resets bit 12: 0=SMB 1=SPI</div><div class='del'>-	 */</div><div class='del'>-#ifdef CONFIG_I2C_AU1550</div><div class='del'>-	bcsr_mod(BCSR_RESETS, BCSR_RESETS_PSC0MUX, 0);</div><div class='del'>-#endif</div><div class='del'>-	au_sync();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init pb1200_init_irq(void)</div><div class='del'>-{</div><div class='del'>-	/* We have a problem with CPLD rev 3. */</div><div class='del'>-	if (BCSR_WHOAMI_CPLD(bcsr_read(BCSR_WHOAMI)) &lt;= 3) {</div><div class='del'>-		printk(KERN_ERR "WARNING!!!\n");</div><div class='del'>-		printk(KERN_ERR "WARNING!!!\n");</div><div class='del'>-		printk(KERN_ERR "WARNING!!!\n");</div><div class='del'>-		printk(KERN_ERR "WARNING!!!\n");</div><div class='del'>-		printk(KERN_ERR "WARNING!!!\n");</div><div class='del'>-		printk(KERN_ERR "WARNING!!!\n");</div><div class='del'>-		printk(KERN_ERR "Pb1200 must be at CPLD rev 4. Please have Pb1200\n");</div><div class='del'>-		printk(KERN_ERR "updated to latest revision. This software will\n");</div><div class='del'>-		printk(KERN_ERR "not work on anything less than CPLD rev 4.\n");</div><div class='del'>-		printk(KERN_ERR "WARNING!!!\n");</div><div class='del'>-		printk(KERN_ERR "WARNING!!!\n");</div><div class='del'>-		printk(KERN_ERR "WARNING!!!\n");</div><div class='del'>-		printk(KERN_ERR "WARNING!!!\n");</div><div class='del'>-		printk(KERN_ERR "WARNING!!!\n");</div><div class='del'>-		printk(KERN_ERR "WARNING!!!\n");</div><div class='del'>-		panic("Game over.  Your score is 0.");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	irq_set_irq_type(AU1200_GPIO7_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-	bcsr_init_irq(PB1200_INT_BEGIN, PB1200_INT_END, AU1200_GPIO7_INT);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-arch_initcall(pb1200_init_irq);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int board_au1200fb_panel(void)</div><div class='del'>-{</div><div class='del'>-	return (bcsr_read(BCSR_SWITCHES) &gt;&gt; 8) &amp; 0x0f;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int board_au1200fb_panel_init(void)</div><div class='del'>-{</div><div class='del'>-	/* Apply power */</div><div class='del'>-	bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD |</div><div class='del'>-				BCSR_BOARD_LCDBL);</div><div class='del'>-	/* printk(KERN_DEBUG "board_au1200fb_panel_init()\n"); */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int board_au1200fb_panel_shutdown(void)</div><div class='del'>-{</div><div class='del'>-	/* Remove power */</div><div class='del'>-	bcsr_mod(BCSR_BOARD, BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD |</div><div class='del'>-			     BCSR_BOARD_LCDBL, 0);</div><div class='del'>-	/* printk(KERN_DEBUG "board_au1200fb_panel_shutdown()\n"); */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/pb1200/platform.c b/arch/mips/alchemy/devboards/pb1200/platform.c<br/>deleted file mode 100644<br/>index 54f7f7b0676e..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/pb1200/platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1200/platform.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,339 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Pb1200/DBAu1200 board platform device registration</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2008 MontaVista Software Inc. &lt;source@mvista.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='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='del'>- */</div><div class='del'>-</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/leds.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/smc91x.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1100_mmc.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1xxx_dbdma.h&gt;</div><div class='del'>-#include &lt;asm/mach-db1x00/bcsr.h&gt;</div><div class='del'>-#include &lt;asm/mach-pb1x00/pb1200.h&gt;</div><div class='del'>-</div><div class='del'>-#include "../platform.h"</div><div class='del'>-</div><div class='del'>-static int mmc_activity;</div><div class='del'>-</div><div class='del'>-static void pb1200mmc0_set_power(void *mmc_host, int state)</div><div class='del'>-{</div><div class='del'>-	if (state)</div><div class='del'>-		bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_SD0PWR);</div><div class='del'>-	else</div><div class='del'>-		bcsr_mod(BCSR_BOARD, BCSR_BOARD_SD0PWR, 0);</div><div class='del'>-</div><div class='del'>-	msleep(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pb1200mmc0_card_readonly(void *mmc_host)</div><div class='del'>-{</div><div class='del'>-	return (bcsr_read(BCSR_STATUS) &amp; BCSR_STATUS_SD0WP) ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pb1200mmc0_card_inserted(void *mmc_host)</div><div class='del'>-{</div><div class='del'>-	return (bcsr_read(BCSR_SIGSTAT) &amp; BCSR_INT_SD0INSERT) ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pb1200_mmcled_set(struct led_classdev *led,</div><div class='del'>-			enum led_brightness brightness)</div><div class='del'>-{</div><div class='del'>-	if (brightness != LED_OFF) {</div><div class='del'>-		if (++mmc_activity == 1)</div><div class='del'>-			bcsr_mod(BCSR_LEDS, BCSR_LEDS_LED0, 0);</div><div class='del'>-	} else {</div><div class='del'>-		if (--mmc_activity == 0)</div><div class='del'>-			bcsr_mod(BCSR_LEDS, 0, BCSR_LEDS_LED0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct led_classdev pb1200mmc_led = {</div><div class='del'>-	.brightness_set	= pb1200_mmcled_set,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void pb1200mmc1_set_power(void *mmc_host, int state)</div><div class='del'>-{</div><div class='del'>-	if (state)</div><div class='del'>-		bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_SD1PWR);</div><div class='del'>-	else</div><div class='del'>-		bcsr_mod(BCSR_BOARD, BCSR_BOARD_SD1PWR, 0);</div><div class='del'>-</div><div class='del'>-	msleep(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pb1200mmc1_card_readonly(void *mmc_host)</div><div class='del'>-{</div><div class='del'>-	return (bcsr_read(BCSR_STATUS) &amp; BCSR_STATUS_SD1WP) ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pb1200mmc1_card_inserted(void *mmc_host)</div><div class='del'>-{</div><div class='del'>-	return (bcsr_read(BCSR_SIGSTAT) &amp; BCSR_INT_SD1INSERT) ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct au1xmmc_platform_data pb1200mmc_platdata[2] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.set_power	= pb1200mmc0_set_power,</div><div class='del'>-		.card_inserted	= pb1200mmc0_card_inserted,</div><div class='del'>-		.card_readonly	= pb1200mmc0_card_readonly,</div><div class='del'>-		.cd_setup	= NULL,		/* use poll-timer in driver */</div><div class='del'>-		.led		= &amp;pb1200mmc_led,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.set_power	= pb1200mmc1_set_power,</div><div class='del'>-		.card_inserted	= pb1200mmc1_card_inserted,</div><div class='del'>-		.card_readonly	= pb1200mmc1_card_readonly,</div><div class='del'>-		.cd_setup	= NULL,		/* use poll-timer in driver */</div><div class='del'>-		.led		= &amp;pb1200mmc_led,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u64 au1xxx_mmc_dmamask =  DMA_BIT_MASK(32);</div><div class='del'>-</div><div class='del'>-static struct resource au1200_mmc0_res[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start	= AU1100_SD0_PHYS_ADDR,</div><div class='del'>-		.end	= AU1100_SD0_PHYS_ADDR + 0xfff,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start	= AU1200_SD_INT,</div><div class='del'>-		.end	= AU1200_SD_INT,</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.start	= AU1200_DSCR_CMD0_SDMS_TX0,</div><div class='del'>-		.end	= AU1200_DSCR_CMD0_SDMS_TX0,</div><div class='del'>-		.flags	= IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[3] = {</div><div class='del'>-		.start	= AU1200_DSCR_CMD0_SDMS_RX0,</div><div class='del'>-		.end	= AU1200_DSCR_CMD0_SDMS_RX0,</div><div class='del'>-		.flags	= IORESOURCE_DMA,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device pb1200_mmc0_dev = {</div><div class='del'>-	.name		= "au1xxx-mmc",</div><div class='del'>-	.id		= 0,</div><div class='del'>-	.dev = {</div><div class='del'>-		.dma_mask		= &amp;au1xxx_mmc_dmamask,</div><div class='del'>-		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-		.platform_data		= &amp;pb1200mmc_platdata[0],</div><div class='del'>-	},</div><div class='del'>-	.num_resources	= ARRAY_SIZE(au1200_mmc0_res),</div><div class='del'>-	.resource	= au1200_mmc0_res,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource au1200_mmc1_res[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start	= AU1100_SD1_PHYS_ADDR,</div><div class='del'>-		.end	= AU1100_SD1_PHYS_ADDR + 0xfff,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start	= AU1200_SD_INT,</div><div class='del'>-		.end	= AU1200_SD_INT,</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.start	= AU1200_DSCR_CMD0_SDMS_TX1,</div><div class='del'>-		.end	= AU1200_DSCR_CMD0_SDMS_TX1,</div><div class='del'>-		.flags	= IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[3] = {</div><div class='del'>-		.start	= AU1200_DSCR_CMD0_SDMS_RX1,</div><div class='del'>-		.end	= AU1200_DSCR_CMD0_SDMS_RX1,</div><div class='del'>-		.flags	= IORESOURCE_DMA,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device pb1200_mmc1_dev = {</div><div class='del'>-	.name		= "au1xxx-mmc",</div><div class='del'>-	.id		= 1,</div><div class='del'>-	.dev = {</div><div class='del'>-		.dma_mask		= &amp;au1xxx_mmc_dmamask,</div><div class='del'>-		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-		.platform_data		= &amp;pb1200mmc_platdata[1],</div><div class='del'>-	},</div><div class='del'>-	.num_resources	= ARRAY_SIZE(au1200_mmc1_res),</div><div class='del'>-	.resource	= au1200_mmc1_res,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct resource ide_resources[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start	= IDE_PHYS_ADDR,</div><div class='del'>-		.end 	= IDE_PHYS_ADDR + IDE_PHYS_LEN - 1,</div><div class='del'>-		.flags	= IORESOURCE_MEM</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start	= IDE_INT,</div><div class='del'>-		.end	= IDE_INT,</div><div class='del'>-		.flags	= IORESOURCE_IRQ</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.start	= AU1200_DSCR_CMD0_DMA_REQ1,</div><div class='del'>-		.end	= AU1200_DSCR_CMD0_DMA_REQ1,</div><div class='del'>-		.flags	= IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u64 ide_dmamask = DMA_BIT_MASK(32);</div><div class='del'>-</div><div class='del'>-static struct platform_device ide_device = {</div><div class='del'>-	.name		= "au1200-ide",</div><div class='del'>-	.id		= 0,</div><div class='del'>-	.dev = {</div><div class='del'>-		.dma_mask 		= &amp;ide_dmamask,</div><div class='del'>-		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-	},</div><div class='del'>-	.num_resources	= ARRAY_SIZE(ide_resources),</div><div class='del'>-	.resource	= ide_resources</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct smc91x_platdata smc_data = {</div><div class='del'>-	.flags	= SMC91X_NOWAIT | SMC91X_USE_16BIT,</div><div class='del'>-	.leda	= RPC_LED_100_10,</div><div class='del'>-	.ledb	= RPC_LED_TX_RX,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource smc91c111_resources[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.name	= "smc91x-regs",</div><div class='del'>-		.start	= SMC91C111_PHYS_ADDR,</div><div class='del'>-		.end	= SMC91C111_PHYS_ADDR + 0xf,</div><div class='del'>-		.flags	= IORESOURCE_MEM</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start	= SMC91C111_INT,</div><div class='del'>-		.end	= SMC91C111_INT,</div><div class='del'>-		.flags	= IORESOURCE_IRQ</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device smc91c111_device = {</div><div class='del'>-	.dev	= {</div><div class='del'>-		.platform_data	= &amp;smc_data,</div><div class='del'>-	},</div><div class='del'>-	.name		= "smc91x",</div><div class='del'>-	.id		= -1,</div><div class='del'>-	.num_resources	= ARRAY_SIZE(smc91c111_resources),</div><div class='del'>-	.resource	= smc91c111_resources</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource au1200_psc0_res[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start	= AU1550_PSC0_PHYS_ADDR,</div><div class='del'>-		.end	= AU1550_PSC0_PHYS_ADDR + 0xfff,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start	= AU1200_PSC0_INT,</div><div class='del'>-		.end	= AU1200_PSC0_INT,</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-	[2] = {</div><div class='del'>-		.start	= AU1200_DSCR_CMD0_PSC0_TX,</div><div class='del'>-		.end	= AU1200_DSCR_CMD0_PSC0_TX,</div><div class='del'>-		.flags	= IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-	[3] = {</div><div class='del'>-		.start	= AU1200_DSCR_CMD0_PSC0_RX,</div><div class='del'>-		.end	= AU1200_DSCR_CMD0_PSC0_RX,</div><div class='del'>-		.flags	= IORESOURCE_DMA,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device pb1200_i2c_dev = {</div><div class='del'>-	.name		= "au1xpsc_smbus",</div><div class='del'>-	.id		= 0,	/* bus number */</div><div class='del'>-	.num_resources	= ARRAY_SIZE(au1200_psc0_res),</div><div class='del'>-	.resource	= au1200_psc0_res,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource au1200_lcd_res[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start	= AU1200_LCD_PHYS_ADDR,</div><div class='del'>-		.end	= AU1200_LCD_PHYS_ADDR + 0x800 - 1,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start	= AU1200_LCD_INT,</div><div class='del'>-		.end	= AU1200_LCD_INT,</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u64 au1200_lcd_dmamask = DMA_BIT_MASK(32);</div><div class='del'>-</div><div class='del'>-static struct platform_device au1200_lcd_dev = {</div><div class='del'>-	.name		= "au1200-lcd",</div><div class='del'>-	.id		= 0,</div><div class='del'>-	.dev = {</div><div class='del'>-		.dma_mask		= &amp;au1200_lcd_dmamask,</div><div class='del'>-		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='del'>-	},</div><div class='del'>-	.num_resources	= ARRAY_SIZE(au1200_lcd_res),</div><div class='del'>-	.resource	= au1200_lcd_res,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device *board_platform_devices[] __initdata = {</div><div class='del'>-	&amp;ide_device,</div><div class='del'>-	&amp;smc91c111_device,</div><div class='del'>-	&amp;pb1200_i2c_dev,</div><div class='del'>-	&amp;pb1200_mmc0_dev,</div><div class='del'>-	&amp;pb1200_mmc1_dev,</div><div class='del'>-	&amp;au1200_lcd_dev,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init board_register_devices(void)</div><div class='del'>-{</div><div class='del'>-	int swapped;</div><div class='del'>-</div><div class='del'>-	db1x_register_pcmcia_socket(</div><div class='del'>-		AU1000_PCMCIA_ATTR_PHYS_ADDR,</div><div class='del'>-		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,</div><div class='del'>-		AU1000_PCMCIA_MEM_PHYS_ADDR,</div><div class='del'>-		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,</div><div class='del'>-		AU1000_PCMCIA_IO_PHYS_ADDR,</div><div class='del'>-		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,</div><div class='del'>-		PB1200_PC0_INT, PB1200_PC0_INSERT_INT,</div><div class='del'>-		/*PB1200_PC0_STSCHG_INT*/0, PB1200_PC0_EJECT_INT, 0);</div><div class='del'>-</div><div class='del'>-	db1x_register_pcmcia_socket(</div><div class='del'>-		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x008000000,</div><div class='del'>-		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x008400000 - 1,</div><div class='del'>-		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x008000000,</div><div class='del'>-		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x008400000 - 1,</div><div class='del'>-		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x008000000,</div><div class='del'>-		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x008010000 - 1,</div><div class='del'>-		PB1200_PC1_INT, PB1200_PC1_INSERT_INT,</div><div class='del'>-		/*PB1200_PC1_STSCHG_INT*/0, PB1200_PC1_EJECT_INT, 1);</div><div class='del'>-</div><div class='del'>-	swapped = bcsr_read(BCSR_STATUS) &amp;  BCSR_STATUS_DB1200_SWAPBOOT;</div><div class='del'>-	db1x_register_norflash(128 * 1024 * 1024, 2, swapped);</div><div class='del'>-</div><div class='del'>-	return platform_add_devices(board_platform_devices,</div><div class='del'>-				    ARRAY_SIZE(board_platform_devices));</div><div class='del'>-}</div><div class='del'>-device_initcall(board_register_devices);</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/pb1500/board_setup.c b/arch/mips/alchemy/devboards/pb1500.c<br/>index 37c1883b5ea9..e7b807b3ec51 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/pb1500/board_setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1500/board_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/pb1500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/devboards/pb1500.c</a></div><div class='hunk'>@@ -1,41 +1,37 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright 2000, 2008 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='add'>+ * Pb1500 board support.</div><div class='ctx'>  *</div><div class='del'>- *  This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- *  under  the terms of  the GNU General  Public License as published 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='add'>+ * Copyright (C) 2009 Manuel Lauss</div><div class='ctx'>  *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='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='ctx'>  *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * 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/delay.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.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='del'>-</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='ctx'> #include &lt;asm/mach-db1x00/bcsr.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;prom.h&gt;</div><div class='add'>+#include "platform.h"</div><div class='ctx'> </div><div class='ctx'> const char *get_system_type(void)</div><div class='ctx'> {</div><div class='del'>-	return "Alchemy Pb1500";</div><div class='add'>+	return "PB1500";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init board_setup(void)</div><div class='hunk'>@@ -123,17 +119,80 @@ void __init board_setup(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init pb1500_init_irq(void)</div><div class='add'>+/******************************************************************************/</div><div class='add'>+</div><div class='add'>+static int pb1500_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)</div><div class='ctx'> {</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO9_INT, IRQF_TRIGGER_LOW);   /* CD0# */</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO10_INT, IRQF_TRIGGER_LOW);  /* CARD0 */</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO11_INT, IRQF_TRIGGER_LOW);  /* STSCHG0# */</div><div class='add'>+	if ((slot &lt; 12) || (slot &gt; 13) || pin == 0)</div><div class='add'>+		return -1;</div><div class='add'>+	if (slot == 12)</div><div class='add'>+		return (pin == 1) ? AU1500_PCI_INTA : 0xff;</div><div class='add'>+	if (slot == 13) {</div><div class='add'>+		switch (pin) {</div><div class='add'>+		case 1: return AU1500_PCI_INTA;</div><div class='add'>+		case 2: return AU1500_PCI_INTB;</div><div class='add'>+		case 3: return AU1500_PCI_INTC;</div><div class='add'>+		case 4: return AU1500_PCI_INTD;</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 struct resource alchemy_pci_host_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AU1500_PCI_PHYS_ADDR,</div><div class='add'>+		.end	= AU1500_PCI_PHYS_ADDR + 0xfff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct alchemy_pci_platdata pb1500_pci_pd = {</div><div class='add'>+	.board_map_irq	= pb1500_map_pci_irq,</div><div class='add'>+	.pci_cfg_set	= PCI_CONFIG_AEN | PCI_CONFIG_R2H | PCI_CONFIG_R1H |</div><div class='add'>+			  PCI_CONFIG_CH |</div><div class='add'>+#if defined(__MIPSEB__)</div><div class='add'>+			  PCI_CONFIG_SIC_HWA_DAT | PCI_CONFIG_SM,</div><div class='add'>+#else</div><div class='add'>+			  0,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device pb1500_pci_host = {</div><div class='add'>+	.dev.platform_data = &amp;pb1500_pci_pd,</div><div class='add'>+	.name		= "alchemy-pci",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(alchemy_pci_host_res),</div><div class='add'>+	.resource	= alchemy_pci_host_res,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init pb1500_dev_init(void)</div><div class='add'>+{</div><div class='add'>+	int swapped;</div><div class='add'>+</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO9_INT,   IRQF_TRIGGER_LOW);   /* CD0# */</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO10_INT,  IRQF_TRIGGER_LOW);  /* CARD0 */</div><div class='add'>+	irq_set_irq_type(AU1500_GPIO11_INT,  IRQF_TRIGGER_LOW);  /* STSCHG0# */</div><div class='ctx'> 	irq_set_irq_type(AU1500_GPIO204_INT, IRQF_TRIGGER_HIGH);</div><div class='ctx'> 	irq_set_irq_type(AU1500_GPIO201_INT, IRQF_TRIGGER_LOW);</div><div class='ctx'> 	irq_set_irq_type(AU1500_GPIO202_INT, IRQF_TRIGGER_LOW);</div><div class='ctx'> 	irq_set_irq_type(AU1500_GPIO203_INT, IRQF_TRIGGER_LOW);</div><div class='ctx'> 	irq_set_irq_type(AU1500_GPIO205_INT, IRQF_TRIGGER_LOW);</div><div class='ctx'> </div><div class='add'>+	/* PCMCIA. single socket, identical to Pb1100 */</div><div class='add'>+	db1x_register_pcmcia_socket(</div><div class='add'>+		AU1000_PCMCIA_ATTR_PHYS_ADDR,</div><div class='add'>+		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,</div><div class='add'>+		AU1000_PCMCIA_MEM_PHYS_ADDR,</div><div class='add'>+		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,</div><div class='add'>+		AU1000_PCMCIA_IO_PHYS_ADDR,</div><div class='add'>+		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,</div><div class='add'>+		AU1500_GPIO11_INT, AU1500_GPIO9_INT,	 /* card / insert */</div><div class='add'>+		/*AU1500_GPIO10_INT*/0, 0, 0); /* stschg / eject / id */</div><div class='add'>+</div><div class='add'>+	swapped = bcsr_read(BCSR_STATUS) &amp;  BCSR_STATUS_DB1000_SWAPBOOT;</div><div class='add'>+	db1x_register_norflash(64 * 1024 * 1024, 4, swapped);</div><div class='add'>+	platform_device_register(&amp;pb1500_pci_host);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-arch_initcall(pb1500_init_irq);</div><div class='add'>+arch_initcall(pb1500_dev_init);</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/pb1500/Makefile b/arch/mips/alchemy/devboards/pb1500/Makefile<br/>deleted file mode 100644<br/>index e83b151b5b63..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/pb1500/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1500/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#</div><div class='del'>-#  Copyright 2000, 2001, 2008 MontaVista Software Inc.</div><div class='del'>-#  Author: MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='del'>-#</div><div class='del'>-# Makefile for the Alchemy Semiconductor Pb1500 board.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-y := board_setup.o platform.o</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/pb1500/platform.c b/arch/mips/alchemy/devboards/pb1500/platform.c<br/>deleted file mode 100644<br/>index 1e52a01bac00..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/pb1500/platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1500/platform.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,94 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Pb1500 board platform device registration</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 Manuel Lauss</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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='del'>- */</div><div class='del'>-</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/platform_device.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-#include &lt;asm/mach-db1x00/bcsr.h&gt;</div><div class='del'>-</div><div class='del'>-#include "../platform.h"</div><div class='del'>-</div><div class='del'>-static int pb1500_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)</div><div class='del'>-{</div><div class='del'>-	if ((slot &lt; 12) || (slot &gt; 13) || pin == 0)</div><div class='del'>-		return -1;</div><div class='del'>-	if (slot == 12)</div><div class='del'>-		return (pin == 1) ? AU1500_PCI_INTA : 0xff;</div><div class='del'>-	if (slot == 13) {</div><div class='del'>-		switch (pin) {</div><div class='del'>-		case 1: return AU1500_PCI_INTA;</div><div class='del'>-		case 2: return AU1500_PCI_INTB;</div><div class='del'>-		case 3: return AU1500_PCI_INTC;</div><div class='del'>-		case 4: return AU1500_PCI_INTD;</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 struct resource alchemy_pci_host_res[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start	= AU1500_PCI_PHYS_ADDR,</div><div class='del'>-		.end	= AU1500_PCI_PHYS_ADDR + 0xfff,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct alchemy_pci_platdata pb1500_pci_pd = {</div><div class='del'>-	.board_map_irq	= pb1500_map_pci_irq,</div><div class='del'>-	.pci_cfg_set	= PCI_CONFIG_AEN | PCI_CONFIG_R2H | PCI_CONFIG_R1H |</div><div class='del'>-			  PCI_CONFIG_CH |</div><div class='del'>-#if defined(__MIPSEB__)</div><div class='del'>-			  PCI_CONFIG_SIC_HWA_DAT | PCI_CONFIG_SM,</div><div class='del'>-#else</div><div class='del'>-			  0,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device pb1500_pci_host = {</div><div class='del'>-	.dev.platform_data = &amp;pb1500_pci_pd,</div><div class='del'>-	.name		= "alchemy-pci",</div><div class='del'>-	.id		= 0,</div><div class='del'>-	.num_resources	= ARRAY_SIZE(alchemy_pci_host_res),</div><div class='del'>-	.resource	= alchemy_pci_host_res,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init pb1500_dev_init(void)</div><div class='del'>-{</div><div class='del'>-	int swapped;</div><div class='del'>-</div><div class='del'>-	/* PCMCIA. single socket, identical to Pb1100 */</div><div class='del'>-	db1x_register_pcmcia_socket(</div><div class='del'>-		AU1000_PCMCIA_ATTR_PHYS_ADDR,</div><div class='del'>-		AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,</div><div class='del'>-		AU1000_PCMCIA_MEM_PHYS_ADDR,</div><div class='del'>-		AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,</div><div class='del'>-		AU1000_PCMCIA_IO_PHYS_ADDR,</div><div class='del'>-		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,</div><div class='del'>-		AU1500_GPIO11_INT, AU1500_GPIO9_INT,	 /* card / insert */</div><div class='del'>-		/*AU1500_GPIO10_INT*/0, 0, 0); /* stschg / eject / id */</div><div class='del'>-</div><div class='del'>-	swapped = bcsr_read(BCSR_STATUS) &amp;  BCSR_STATUS_DB1000_SWAPBOOT;</div><div class='del'>-	db1x_register_norflash(64 * 1024 * 1024, 4, swapped);</div><div class='del'>-	platform_device_register(&amp;pb1500_pci_host);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-arch_initcall(pb1500_dev_init);</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/pb1550/platform.c b/arch/mips/alchemy/devboards/pb1550.c<br/>index a4604b8a349e..b37e7de8d920 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/pb1550/platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1550/platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/pb1550.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/devboards/pb1550.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='del'>- * Pb1550 board platform device registration</div><div class='add'>+ * Pb1550 board support.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2009 Manuel Lauss</div><div class='add'>+ * Copyright (C) 2009-2011 Manuel Lauss</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'>@@ -20,13 +20,44 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1xxx_dbdma.h&gt;</div><div class='del'>-#include &lt;asm/mach-pb1x00/pb1550.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1550nd.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/gpio.h&gt;</div><div class='ctx'> #include &lt;asm/mach-db1x00/bcsr.h&gt;</div><div class='add'>+#include "platform.h"</div><div class='ctx'> </div><div class='del'>-#include "../platform.h"</div><div class='add'>+const char *get_system_type(void)</div><div class='add'>+{</div><div class='add'>+	return "PB1550";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init board_setup(void)</div><div class='add'>+{</div><div class='add'>+	u32 pin_func;</div><div class='add'>+</div><div class='add'>+	bcsr_init(PB1550_BCSR_PHYS_ADDR,</div><div class='add'>+		  PB1550_BCSR_PHYS_ADDR + PB1550_BCSR_HEXLED_OFS);</div><div class='add'>+</div><div class='add'>+	alchemy_gpio2_enable();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable PSC1 SYNC for AC'97.  Normaly done in audio driver,</div><div class='add'>+	 * but it is board specific code, so put it here.</div><div class='add'>+	 */</div><div class='add'>+	pin_func = au_readl(SYS_PINFUNC);</div><div class='add'>+	au_sync();</div><div class='add'>+	pin_func |= SYS_PF_MUST_BE_SET | SYS_PF_PSC1_S1;</div><div class='add'>+	au_writel(pin_func, SYS_PINFUNC);</div><div class='add'>+</div><div class='add'>+	bcsr_write(BCSR_PCMCIA, 0);	/* turn off PCMCIA power */</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "AMD Alchemy Pb1550 Board\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static int pb1550_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)</div><div class='ctx'> {</div><div class='hunk'>@@ -101,10 +132,79 @@ static struct platform_device pb1550_i2c_dev = {</div><div class='ctx'> 	.resource	= au1550_psc2_res,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct mtd_partition pb1550_nand_parts[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.name	= "NAND FS 0",</div><div class='add'>+		.offset	= 0,</div><div class='add'>+		.size	= 8 * 1024 * 1024,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.name	= "NAND FS 1",</div><div class='add'>+		.offset	= MTDPART_OFS_APPEND,</div><div class='add'>+		.size	= MTDPART_SIZ_FULL,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct au1550nd_platdata pb1550_nand_pd = {</div><div class='add'>+	.parts		= pb1550_nand_parts,</div><div class='add'>+	.num_parts	= ARRAY_SIZE(pb1550_nand_parts),</div><div class='add'>+	.devwidth	= 0,	/* x8 NAND default, needs fixing up */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource pb1550_nand_res[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= 0x20000000,</div><div class='add'>+		.end	= 0x20000fff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device pb1550_nand_dev = {</div><div class='add'>+	.name		= "au1550-nand",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.resource	= pb1550_nand_res,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(pb1550_nand_res),</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;pb1550_nand_pd,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init pb1550_nand_setup(void)</div><div class='add'>+{</div><div class='add'>+	int boot_swapboot = (au_readl(MEM_STSTAT) &amp; (0x7 &lt;&lt; 1)) |</div><div class='add'>+			    ((bcsr_read(BCSR_STATUS) &gt;&gt; 6) &amp; 0x1);</div><div class='add'>+</div><div class='add'>+	switch (boot_swapboot) {</div><div class='add'>+	case 0:</div><div class='add'>+	case 2:</div><div class='add'>+	case 8:</div><div class='add'>+	case 0xC:</div><div class='add'>+	case 0xD:</div><div class='add'>+		/* x16 NAND Flash */</div><div class='add'>+		pb1550_nand_pd.devwidth = 1;</div><div class='add'>+		/* fallthrough */</div><div class='add'>+	case 1:</div><div class='add'>+	case 9:</div><div class='add'>+	case 3:</div><div class='add'>+	case 0xE:</div><div class='add'>+	case 0xF:</div><div class='add'>+		/* x8 NAND, already set up */</div><div class='add'>+		platform_device_register(&amp;pb1550_nand_dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init pb1550_dev_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int swapped;</div><div class='ctx'> </div><div class='add'>+	irq_set_irq_type(AU1550_GPIO0_INT, IRQF_TRIGGER_LOW);</div><div class='add'>+	irq_set_irq_type(AU1550_GPIO1_INT, IRQF_TRIGGER_LOW);</div><div class='add'>+	irq_set_irq_type(AU1550_GPIO201_205_INT, IRQF_TRIGGER_HIGH);</div><div class='add'>+</div><div class='add'>+	/* enable both PCMCIA card irqs in the shared line */</div><div class='add'>+	alchemy_gpio2_enable_int(201);</div><div class='add'>+	alchemy_gpio2_enable_int(202);</div><div class='add'>+</div><div class='ctx'> 	/* Pb1550, like all others, also has statuschange irqs; however they're</div><div class='ctx'> 	* wired up on one of the Au1550's shared GPIO201_205 line, which also</div><div class='ctx'> 	* services the PCMCIA card interrupts.  So we ignore statuschange and</div><div class='hunk'>@@ -130,6 +230,10 @@ static int __init pb1550_dev_init(void)</div><div class='ctx'> 		AU1000_PCMCIA_IO_PHYS_ADDR   + 0x008010000 - 1,</div><div class='ctx'> 		AU1550_GPIO201_205_INT, AU1550_GPIO1_INT, 0, 0, 1);</div><div class='ctx'> </div><div class='add'>+	/* NAND setup */</div><div class='add'>+	gpio_direction_input(206);	/* GPIO206 high */</div><div class='add'>+	pb1550_nand_setup();</div><div class='add'>+</div><div class='ctx'> 	swapped = bcsr_read(BCSR_STATUS) &amp; BCSR_STATUS_PB1550_SWAPBOOT;</div><div class='ctx'> 	db1x_register_norflash(128 * 1024 * 1024, 4, swapped);</div><div class='ctx'> 	platform_device_register(&amp;pb1550_pci_host);</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/pb1550/Makefile b/arch/mips/alchemy/devboards/pb1550/Makefile<br/>deleted file mode 100644<br/>index 9661b6ec5dd3..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/pb1550/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1550/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#</div><div class='del'>-#  Copyright 2000, 2008 MontaVista Software Inc.</div><div class='del'>-#  Author: MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='del'>-#</div><div class='del'>-# Makefile for the Alchemy Semiconductor Pb1550 board.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-y := board_setup.o platform.o</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/pb1550/board_setup.c b/arch/mips/alchemy/devboards/pb1550/board_setup.c<br/>deleted file mode 100644<br/>index 0f62d1e3df24..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/pb1550/board_setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/pb1550/board_setup.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,80 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * BRIEF MODULE DESCRIPTION</div><div class='del'>- *	Alchemy Pb1550 board setup.</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, 2008 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc. &lt;source@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='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-#include &lt;asm/mach-pb1x00/pb1550.h&gt;</div><div class='del'>-#include &lt;asm/mach-db1x00/bcsr.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/gpio.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;prom.h&gt;</div><div class='del'>-</div><div class='del'>-const char *get_system_type(void)</div><div class='del'>-{</div><div class='del'>-	return "Alchemy Pb1550";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init board_setup(void)</div><div class='del'>-{</div><div class='del'>-	u32 pin_func;</div><div class='del'>-</div><div class='del'>-	bcsr_init(PB1550_BCSR_PHYS_ADDR,</div><div class='del'>-		  PB1550_BCSR_PHYS_ADDR + PB1550_BCSR_HEXLED_OFS);</div><div class='del'>-</div><div class='del'>-	alchemy_gpio2_enable();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Enable PSC1 SYNC for AC'97.  Normaly done in audio driver,</div><div class='del'>-	 * but it is board specific code, so put it here.</div><div class='del'>-	 */</div><div class='del'>-	pin_func = au_readl(SYS_PINFUNC);</div><div class='del'>-	au_sync();</div><div class='del'>-	pin_func |= SYS_PF_MUST_BE_SET | SYS_PF_PSC1_S1;</div><div class='del'>-	au_writel(pin_func, SYS_PINFUNC);</div><div class='del'>-</div><div class='del'>-	bcsr_write(BCSR_PCMCIA, 0);	/* turn off PCMCIA power */</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "AMD Alchemy Pb1550 Board\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init pb1550_init_irq(void)</div><div class='del'>-{</div><div class='del'>-	irq_set_irq_type(AU1550_GPIO0_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-	irq_set_irq_type(AU1550_GPIO1_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-	irq_set_irq_type(AU1550_GPIO201_205_INT, IRQF_TRIGGER_HIGH);</div><div class='del'>-</div><div class='del'>-	/* enable both PCMCIA card irqs in the shared line */</div><div class='del'>-	alchemy_gpio2_enable_int(201);</div><div class='del'>-	alchemy_gpio2_enable_int(202);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-arch_initcall(pb1550_init_irq);</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/platform.c b/arch/mips/alchemy/devboards/platform.c<br/>index 49a4b3244d8e..621f70afb63a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/devboards/platform.c</a></div><div class='hunk'>@@ -13,6 +13,13 @@</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='ctx'> #include &lt;asm/mach-db1x00/bcsr.h&gt;</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static struct platform_device db1x00_rtc_dev = {</div><div class='add'>+	.name	= "rtc-au1xxx",</div><div class='add'>+	.id	= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static void db1x_power_off(void)</div><div class='ctx'> {</div><div class='ctx'> 	bcsr_write(BCSR_RESETS, 0);</div><div class='hunk'>@@ -25,7 +32,7 @@ static void db1x_reset(char *c)</div><div class='ctx'> 	bcsr_write(BCSR_SYSTEM, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init db1x_poweroff_setup(void)</div><div class='add'>+static int __init db1x_late_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!pm_power_off)</div><div class='ctx'> 		pm_power_off = db1x_power_off;</div><div class='hunk'>@@ -34,9 +41,11 @@ static int __init db1x_poweroff_setup(void)</div><div class='ctx'> 	if (!_machine_restart)</div><div class='ctx'> 		_machine_restart = db1x_reset;</div><div class='ctx'> </div><div class='add'>+	platform_device_register(&amp;db1x00_rtc_dev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-late_initcall(db1x_poweroff_setup);</div><div class='add'>+device_initcall(db1x_late_setup);</div><div class='ctx'> </div><div class='ctx'> /* register a pcmcia socket */</div><div class='ctx'> int __init db1x_register_pcmcia_socket(phys_addr_t pcmcia_attr_start,</div><div class='head'>diff --git a/arch/mips/alchemy/devboards/prom.c b/arch/mips/alchemy/devboards/prom.c<br/>index e5306b56da6d..93a22107cc41 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/prom.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/devboards/prom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/alchemy/devboards/prom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/alchemy/devboards/prom.c</a></div><div class='hunk'>@@ -33,10 +33,9 @@</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='ctx'> #include &lt;prom.h&gt;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_DB1000) || \</div><div class='del'>-    defined(CONFIG_MIPS_PB1100) || defined(CONFIG_MIPS_DB1100) || \</div><div class='del'>-    defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_DB1500) || \</div><div class='del'>-    defined(CONFIG_MIPS_BOSPORUS) || defined(CONFIG_MIPS_MIRAGE)</div><div class='add'>+#if defined(CONFIG_MIPS_DB1000) || \</div><div class='add'>+    defined(CONFIG_MIPS_PB1100) || \</div><div class='add'>+    defined(CONFIG_MIPS_PB1500)</div><div class='ctx'> #define ALCHEMY_BOARD_DEFAULT_MEMSIZE	0x04000000</div><div class='ctx'> </div><div class='ctx'> #else	/* Au1550/Au1200-based develboards */</div><div class='hunk'>@@ -62,5 +61,9 @@ void __init prom_init(void)</div><div class='ctx'> </div><div class='ctx'> void prom_putchar(unsigned char c)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_MIPS_DB1300</div><div class='add'>+	alchemy_uart_putchar(AU1300_UART2_PHYS_ADDR, c);</div><div class='add'>+#else</div><div class='ctx'> 	alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/alchemy/gpr/Makefile b/arch/mips/alchemy/gpr/Makefile<br/>deleted file mode 100644<br/>index cb73fe256dce..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/gpr/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/gpr/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#</div><div class='del'>-#  Copyright 2003 MontaVista Software Inc.</div><div class='del'>-#  Author: MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='del'>-#</div><div class='del'>-# Makefile for Trapeze ITS GPR board.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-y += board_setup.o init.o platform.o</div><div class='head'>diff --git a/arch/mips/alchemy/gpr/board_setup.c b/arch/mips/alchemy/gpr/board_setup.c<br/>deleted file mode 100644<br/>index dea45c78fdcd..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/gpr/board_setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/gpr/board_setup.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,75 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2010 Wolfgang Grandegger &lt;wg@denx.de&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000-2003, 2008 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc. &lt;source@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='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/reboot.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;prom.h&gt;</div><div class='del'>-</div><div class='del'>-static void gpr_reset(char *c)</div><div class='del'>-{</div><div class='del'>-	/* switch System-LED to orange (red# and green# on) */</div><div class='del'>-	alchemy_gpio_direction_output(4, 0);</div><div class='del'>-	alchemy_gpio_direction_output(5, 0);</div><div class='del'>-</div><div class='del'>-	/* trigger watchdog to reset board in 200ms */</div><div class='del'>-	printk(KERN_EMERG "Triggering watchdog soft reset...\n");</div><div class='del'>-	raw_local_irq_disable();</div><div class='del'>-	alchemy_gpio_direction_output(1, 0);</div><div class='del'>-	udelay(1);</div><div class='del'>-	alchemy_gpio_set_value(1, 1);</div><div class='del'>-	while (1)</div><div class='del'>-		cpu_wait();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gpr_power_off(void)</div><div class='del'>-{</div><div class='del'>-	while (1)</div><div class='del'>-		cpu_wait();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init board_setup(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "Trapeze ITS GPR board\n");</div><div class='del'>-</div><div class='del'>-	pm_power_off = gpr_power_off;</div><div class='del'>-	_machine_halt = gpr_power_off;</div><div class='del'>-	_machine_restart = gpr_reset;</div><div class='del'>-</div><div class='del'>-	/* Enable UART1/3 */</div><div class='del'>-	alchemy_uart_enable(AU1000_UART3_PHYS_ADDR);</div><div class='del'>-	alchemy_uart_enable(AU1000_UART1_PHYS_ADDR);</div><div class='del'>-</div><div class='del'>-	/* Take away Reset of UMTS-card */</div><div class='del'>-	alchemy_gpio_direction_output(215, 1);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/alchemy/gpr/init.c b/arch/mips/alchemy/gpr/init.c<br/>deleted file mode 100644<br/>index 229aafae680c..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/gpr/init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/gpr/init.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2010 Wolfgang Grandegger &lt;wg@denx.de&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2003, 2008 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc. &lt;source@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='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/bootinfo.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;prom.h&gt;</div><div class='del'>-</div><div class='del'>-const char *get_system_type(void)</div><div class='del'>-{</div><div class='del'>-	return "GPR";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init prom_init(void)</div><div class='del'>-{</div><div class='del'>-	unsigned char *memsize_str;</div><div class='del'>-	unsigned long memsize;</div><div class='del'>-</div><div class='del'>-	prom_argc = fw_arg0;</div><div class='del'>-	prom_argv = (char **)fw_arg1;</div><div class='del'>-	prom_envp = (char **)fw_arg2;</div><div class='del'>-</div><div class='del'>-	prom_init_cmdline();</div><div class='del'>-</div><div class='del'>-	memsize_str = prom_getenv("memsize");</div><div class='del'>-	if (!memsize_str)</div><div class='del'>-		memsize = 0x04000000;</div><div class='del'>-	else</div><div class='del'>-		strict_strtoul(memsize_str, 0, &amp;memsize);</div><div class='del'>-	add_memory_region(0, memsize, BOOT_MEM_RAM);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void prom_putchar(unsigned char c)</div><div class='del'>-{</div><div class='del'>-	alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/alchemy/mtx-1/Makefile b/arch/mips/alchemy/mtx-1/Makefile<br/>deleted file mode 100644<br/>index 81b540ceaf88..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/mtx-1/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/mtx-1/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-#</div><div class='del'>-#  Copyright 2003 MontaVista Software Inc.</div><div class='del'>-#  Author: MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='del'>-#       Bruno Randolf &lt;bruno.randolf@4g-systems.biz&gt;</div><div class='del'>-#</div><div class='del'>-# Makefile for 4G Systems MTX-1 board.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-y += init.o board_setup.o platform.o</div><div class='head'>diff --git a/arch/mips/alchemy/mtx-1/board_setup.c b/arch/mips/alchemy/mtx-1/board_setup.c<br/>deleted file mode 100644<br/>index 851a5ab4c8f2..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/mtx-1/board_setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/mtx-1/board_setup.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,94 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * BRIEF MODULE DESCRIPTION</div><div class='del'>- *	4G Systems MTX-1 board setup.</div><div class='del'>- *</div><div class='del'>- * Copyright 2003, 2008 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='del'>- *         Bruno Randolf &lt;bruno.randolf@4g-systems.biz&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- *  under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- *  option) any later version.</div><div class='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/reboot.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;prom.h&gt;</div><div class='del'>-</div><div class='del'>-static void mtx1_reset(char *c)</div><div class='del'>-{</div><div class='del'>-	/* Jump to the reset vector */</div><div class='del'>-	__asm__ __volatile__("jr\t%0"::"r"(0xbfc00000));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mtx1_power_off(void)</div><div class='del'>-{</div><div class='del'>-	while (1)</div><div class='del'>-		asm volatile (</div><div class='del'>-		"	.set	mips32					\n"</div><div class='del'>-		"	wait						\n"</div><div class='del'>-		"	.set	mips0					\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init board_setup(void)</div><div class='del'>-{</div><div class='del'>-#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)</div><div class='del'>-	/* Enable USB power switch */</div><div class='del'>-	alchemy_gpio_direction_output(204, 0);</div><div class='del'>-#endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */</div><div class='del'>-</div><div class='del'>-	/* Initialize sys_pinfunc */</div><div class='del'>-	au_writel(SYS_PF_NI2, SYS_PINFUNC);</div><div class='del'>-</div><div class='del'>-	/* Initialize GPIO */</div><div class='del'>-	au_writel(~0, KSEG1ADDR(AU1000_SYS_PHYS_ADDR) + SYS_TRIOUTCLR);</div><div class='del'>-	alchemy_gpio_direction_output(0, 0);	/* Disable M66EN (PCI 66MHz) */</div><div class='del'>-	alchemy_gpio_direction_output(3, 1);	/* Disable PCI CLKRUN# */</div><div class='del'>-	alchemy_gpio_direction_output(1, 1);	/* Enable EXT_IO3 */</div><div class='del'>-	alchemy_gpio_direction_output(5, 0);	/* Disable eth PHY TX_ER */</div><div class='del'>-</div><div class='del'>-	/* Enable LED and set it to green */</div><div class='del'>-	alchemy_gpio_direction_output(211, 1);	/* green on */</div><div class='del'>-	alchemy_gpio_direction_output(212, 0);	/* red off */</div><div class='del'>-</div><div class='del'>-	pm_power_off = mtx1_power_off;</div><div class='del'>-	_machine_halt = mtx1_power_off;</div><div class='del'>-	_machine_restart = mtx1_reset;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "4G Systems MTX-1 Board\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init mtx1_init_irq(void)</div><div class='del'>-{</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO204_INT, IRQF_TRIGGER_HIGH);</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO201_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO202_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO203_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO205_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-arch_initcall(mtx1_init_irq);</div><div class='head'>diff --git a/arch/mips/alchemy/mtx-1/init.c b/arch/mips/alchemy/mtx-1/init.c<br/>deleted file mode 100644<br/>index 2e81cc7f3422..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/mtx-1/init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/mtx-1/init.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,66 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * BRIEF MODULE DESCRIPTION</div><div class='del'>- *	4G Systems MTX-1 board setup</div><div class='del'>- *</div><div class='del'>- * Copyright 2003, 2008 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='del'>- *         Bruno Randolf &lt;bruno.randolf@4g-systems.biz&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- *  under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- *  option) any later version.</div><div class='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/bootinfo.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;prom.h&gt;</div><div class='del'>-</div><div class='del'>-const char *get_system_type(void)</div><div class='del'>-{</div><div class='del'>-	return "MTX-1";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init prom_init(void)</div><div class='del'>-{</div><div class='del'>-	unsigned char *memsize_str;</div><div class='del'>-	unsigned long memsize;</div><div class='del'>-</div><div class='del'>-	prom_argc = fw_arg0;</div><div class='del'>-	prom_argv = (char **)fw_arg1;</div><div class='del'>-	prom_envp = (char **)fw_arg2;</div><div class='del'>-</div><div class='del'>-	prom_init_cmdline();</div><div class='del'>-</div><div class='del'>-	memsize_str = prom_getenv("memsize");</div><div class='del'>-	if (!memsize_str)</div><div class='del'>-		memsize = 0x04000000;</div><div class='del'>-	else</div><div class='del'>-		strict_strtoul(memsize_str, 0, &amp;memsize);</div><div class='del'>-	add_memory_region(0, memsize, BOOT_MEM_RAM);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void prom_putchar(unsigned char c)</div><div class='del'>-{</div><div class='del'>-	alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/alchemy/xxs1500/Makefile b/arch/mips/alchemy/xxs1500/Makefile<br/>deleted file mode 100644<br/>index 91defcf4f335..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/xxs1500/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/xxs1500/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#</div><div class='del'>-#  Copyright 2003 MontaVista Software Inc.</div><div class='del'>-#  Author: MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='del'>-#</div><div class='del'>-# Makefile for MyCable XXS1500 board.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-y += init.o board_setup.o platform.o</div><div class='head'>diff --git a/arch/mips/alchemy/xxs1500/board_setup.c b/arch/mips/alchemy/xxs1500/board_setup.c<br/>deleted file mode 100644<br/>index 3fa83f72e014..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/xxs1500/board_setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/xxs1500/board_setup.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,93 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000-2003, 2008 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc. &lt;source@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='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/reboot.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;prom.h&gt;</div><div class='del'>-</div><div class='del'>-static void xxs1500_reset(char *c)</div><div class='del'>-{</div><div class='del'>-	/* Jump to the reset vector */</div><div class='del'>-	__asm__ __volatile__("jr\t%0"::"r"(0xbfc00000));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xxs1500_power_off(void)</div><div class='del'>-{</div><div class='del'>-	while (1)</div><div class='del'>-		asm volatile (</div><div class='del'>-		"	.set	mips32					\n"</div><div class='del'>-		"	wait						\n"</div><div class='del'>-		"	.set	mips0					\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init board_setup(void)</div><div class='del'>-{</div><div class='del'>-	u32 pin_func;</div><div class='del'>-</div><div class='del'>-	pm_power_off = xxs1500_power_off;</div><div class='del'>-	_machine_halt = xxs1500_power_off;</div><div class='del'>-	_machine_restart = xxs1500_reset;</div><div class='del'>-</div><div class='del'>-	alchemy_gpio1_input_enable();</div><div class='del'>-	alchemy_gpio2_enable();</div><div class='del'>-</div><div class='del'>-	/* Set multiple use pins (UART3/GPIO) to UART (it's used as UART too) */</div><div class='del'>-	pin_func  = au_readl(SYS_PINFUNC) &amp; ~SYS_PF_UR3;</div><div class='del'>-	pin_func |= SYS_PF_UR3;</div><div class='del'>-	au_writel(pin_func, SYS_PINFUNC);</div><div class='del'>-</div><div class='del'>-	/* Enable UART */</div><div class='del'>-	alchemy_uart_enable(AU1000_UART3_PHYS_ADDR);</div><div class='del'>-	/* Enable DTR (MCR bit 0) = USB power up */</div><div class='del'>-	__raw_writel(1, (void __iomem *)KSEG1ADDR(AU1000_UART3_PHYS_ADDR + 0x18));</div><div class='del'>-	wmb();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init xxs1500_init_irq(void)</div><div class='del'>-{</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO204_INT, IRQF_TRIGGER_HIGH);</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO201_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO202_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO203_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO205_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO207_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO0_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO1_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO2_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO3_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO4_INT, IRQF_TRIGGER_LOW); /* CF irq */</div><div class='del'>-	irq_set_irq_type(AU1500_GPIO5_INT, IRQF_TRIGGER_LOW);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-arch_initcall(xxs1500_init_irq);</div><div class='head'>diff --git a/arch/mips/alchemy/xxs1500/init.c b/arch/mips/alchemy/xxs1500/init.c<br/>deleted file mode 100644<br/>index 0ee02cfa989d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/xxs1500/init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/xxs1500/init.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * BRIEF MODULE DESCRIPTION</div><div class='del'>- *	XXS1500 board setup</div><div class='del'>- *</div><div class='del'>- * Copyright 2003, 2008 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc. &lt;source@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='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/bootinfo.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;prom.h&gt;</div><div class='del'>-</div><div class='del'>-const char *get_system_type(void)</div><div class='del'>-{</div><div class='del'>-	return "XXS1500";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init prom_init(void)</div><div class='del'>-{</div><div class='del'>-	unsigned char *memsize_str;</div><div class='del'>-	unsigned long memsize;</div><div class='del'>-</div><div class='del'>-	prom_argc = fw_arg0;</div><div class='del'>-	prom_argv = (char **)fw_arg1;</div><div class='del'>-	prom_envp = (char **)fw_arg2;</div><div class='del'>-</div><div class='del'>-	prom_init_cmdline();</div><div class='del'>-</div><div class='del'>-	memsize_str = prom_getenv("memsize");</div><div class='del'>-	if (!memsize_str || strict_strtoul(memsize_str, 0, &amp;memsize))</div><div class='del'>-		memsize = 0x04000000;</div><div class='del'>-</div><div class='del'>-	add_memory_region(0, memsize, BOOT_MEM_RAM);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void prom_putchar(unsigned char c)</div><div class='del'>-{</div><div class='del'>-	alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/alchemy/xxs1500/platform.c b/arch/mips/alchemy/xxs1500/platform.c<br/>deleted file mode 100644<br/>index 06a3a459b8aa..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/alchemy/xxs1500/platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/alchemy/xxs1500/platform.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * XXS1500 board platform device registration</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 Manuel Lauss</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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</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/platform_device.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-</div><div class='del'>-static struct resource xxs1500_pcmcia_res[] = {</div><div class='del'>-	{</div><div class='del'>-		.name	= "pcmcia-io",</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-		.start	= AU1000_PCMCIA_IO_PHYS_ADDR,</div><div class='del'>-		.end	= AU1000_PCMCIA_IO_PHYS_ADDR + 0x000400000 - 1,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.name	= "pcmcia-attr",</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-		.start	= AU1000_PCMCIA_ATTR_PHYS_ADDR,</div><div class='del'>-		.end	= AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.name	= "pcmcia-mem",</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-		.start	= AU1000_PCMCIA_MEM_PHYS_ADDR,</div><div class='del'>-		.end	= AU1000_PCMCIA_MEM_PHYS_ADDR + 0x000400000 - 1,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device xxs1500_pcmcia_dev = {</div><div class='del'>-	.name		= "xxs1500_pcmcia",</div><div class='del'>-	.id		= -1,</div><div class='del'>-	.num_resources	= ARRAY_SIZE(xxs1500_pcmcia_res),</div><div class='del'>-	.resource	= xxs1500_pcmcia_res,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device *xxs1500_devs[] __initdata = {</div><div class='del'>-	&amp;xxs1500_pcmcia_dev,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init xxs1500_dev_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_add_devices(xxs1500_devs,</div><div class='del'>-				    ARRAY_SIZE(xxs1500_devs));</div><div class='del'>-}</div><div class='del'>-device_initcall(xxs1500_dev_init);</div><div class='head'>diff --git a/arch/mips/ar7/gpio.c b/arch/mips/ar7/gpio.c<br/>index bb571bcdb8f2..d8dbd8f0c1d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ar7/gpio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ar7/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ar7/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ar7/gpio.c</a></div><div class='hunk'>@@ -217,7 +217,7 @@ struct titan_gpio_cfg {</div><div class='ctx'> 	u32 func;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct titan_gpio_cfg titan_gpio_table[] = {</div><div class='add'>+static const struct titan_gpio_cfg titan_gpio_table[] = {</div><div class='ctx'> 	/* reg, start bit, mux value */</div><div class='ctx'> 	{4, 24, 1},</div><div class='ctx'> 	{4, 26, 1},</div><div class='head'>diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c<br/>index 33ffecf6a6d6..1a24d317e7a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ar7/platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ar7/platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ar7/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ar7/platform.c</a></div><div class='hunk'>@@ -462,6 +462,40 @@ static struct gpio_led fb_fon_leds[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct gpio_led gt701_leds[] = {</div><div class='add'>+	{</div><div class='add'>+		.name			= "inet:green",</div><div class='add'>+		.gpio			= 13,</div><div class='add'>+		.active_low		= 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name			= "usb",</div><div class='add'>+		.gpio			= 12,</div><div class='add'>+		.active_low		= 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name			= "inet:red",</div><div class='add'>+		.gpio			= 9,</div><div class='add'>+		.active_low		= 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name			= "power:red",</div><div class='add'>+		.gpio			= 7,</div><div class='add'>+		.active_low		= 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name			= "power:green",</div><div class='add'>+		.gpio			= 8,</div><div class='add'>+		.active_low		= 1,</div><div class='add'>+		.default_trigger	= "default-on",</div><div class='add'>+	},</div><div class='add'>+        {</div><div class='add'>+                .name                   = "ethernet",</div><div class='add'>+                .gpio                   = 10,</div><div class='add'>+                .active_low             = 1,</div><div class='add'>+        },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct gpio_led_platform_data ar7_led_data;</div><div class='ctx'> </div><div class='ctx'> static struct platform_device ar7_gpio_leds = {</div><div class='hunk'>@@ -503,6 +537,9 @@ static void __init detect_leds(void)</div><div class='ctx'> 	} else if (strstr(prid, "CYWM") || strstr(prid, "CYWL")) {</div><div class='ctx'> 		ar7_led_data.num_leds = ARRAY_SIZE(titan_leds);</div><div class='ctx'> 		ar7_led_data.leds = titan_leds;</div><div class='add'>+	} else if (strstr(prid, "GT701")) {</div><div class='add'>+		ar7_led_data.num_leds = ARRAY_SIZE(gt701_leds);</div><div class='add'>+		ar7_led_data.leds = gt701_leds;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -536,7 +573,7 @@ static int __init ar7_register_uarts(void)</div><div class='ctx'> </div><div class='ctx'> 	bus_clk = clk_get(NULL, "bus");</div><div class='ctx'> 	if (IS_ERR(bus_clk))</div><div class='del'>-		panic("unable to get bus clk\n");</div><div class='add'>+		panic("unable to get bus clk");</div><div class='ctx'> </div><div class='ctx'> 	uart_port.type		= PORT_AR7;</div><div class='ctx'> 	uart_port.uartclk	= clk_get_rate(bus_clk) / 2;</div><div class='head'>diff --git a/arch/mips/ar7/prom.c b/arch/mips/ar7/prom.c<br/>index 8088c6fdb83e..a23adc49d50f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ar7/prom.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ar7/prom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ar7/prom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ar7/prom.c</a></div><div class='hunk'>@@ -69,7 +69,7 @@ struct psbl_rec {</div><div class='ctx'> 	u32	ffs_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static __initdata char psp_env_version[] = "TIENV0.8";</div><div class='add'>+static const char psp_env_version[] __initconst = "TIENV0.8";</div><div class='ctx'> </div><div class='ctx'> struct psp_env_chunk {</div><div class='ctx'> 	u8	num;</div><div class='hunk'>@@ -84,7 +84,7 @@ struct psp_var_map_entry {</div><div class='ctx'> 	char	*value;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct psp_var_map_entry psp_var_map[] = {</div><div class='add'>+static const struct psp_var_map_entry psp_var_map[] = {</div><div class='ctx'> 	{  1,	"cpufrequency" },</div><div class='ctx'> 	{  2,	"memsize" },</div><div class='ctx'> 	{  3,	"flashsize" },</div><div class='head'>diff --git a/arch/mips/ar7/setup.c b/arch/mips/ar7/setup.c<br/>index f20b53e597c4..9a357fffcfbe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ar7/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ar7/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ar7/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ar7/setup.c</a></div><div class='hunk'>@@ -96,7 +96,7 @@ void __init plat_mem_setup(void)</div><div class='ctx'> </div><div class='ctx'> 	io_base = (unsigned long)ioremap(AR7_REGS_BASE, 0x10000);</div><div class='ctx'> 	if (!io_base)</div><div class='del'>-		panic("Can't remap IO base!\n");</div><div class='add'>+		panic("Can't remap IO base!");</div><div class='ctx'> 	set_io_port_base(io_base);</div><div class='ctx'> </div><div class='ctx'> 	prom_meminit();</div><div class='head'>diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig<br/>index 47707410582c..e0fae8f4442b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ath79/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ath79/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ath79/Kconfig</a></div><div class='hunk'>@@ -2,13 +2,26 @@ if ATH79</div><div class='ctx'> </div><div class='ctx'> menu "Atheros AR71XX/AR724X/AR913X machine selection"</div><div class='ctx'> </div><div class='add'>+config ATH79_MACH_AP121</div><div class='add'>+	bool "Atheros AP121 reference board"</div><div class='add'>+	select SOC_AR933X</div><div class='add'>+	select ATH79_DEV_GPIO_BUTTONS</div><div class='add'>+	select ATH79_DEV_LEDS_GPIO</div><div class='add'>+	select ATH79_DEV_SPI</div><div class='add'>+	select ATH79_DEV_USB</div><div class='add'>+	select ATH79_DEV_WMAC</div><div class='add'>+	help</div><div class='add'>+	  Say 'Y' here if you want your kernel to support the</div><div class='add'>+	  Atheros AP121 reference board.</div><div class='add'>+</div><div class='ctx'> config ATH79_MACH_AP81</div><div class='ctx'> 	bool "Atheros AP81 reference board"</div><div class='ctx'> 	select SOC_AR913X</div><div class='del'>-	select ATH79_DEV_AR913X_WMAC</div><div class='ctx'> 	select ATH79_DEV_GPIO_BUTTONS</div><div class='ctx'> 	select ATH79_DEV_LEDS_GPIO</div><div class='ctx'> 	select ATH79_DEV_SPI</div><div class='add'>+	select ATH79_DEV_USB</div><div class='add'>+	select ATH79_DEV_WMAC</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say 'Y' here if you want your kernel to support the</div><div class='ctx'> 	  Atheros AP81 reference board.</div><div class='hunk'>@@ -19,10 +32,21 @@ config ATH79_MACH_PB44</div><div class='ctx'> 	select ATH79_DEV_GPIO_BUTTONS</div><div class='ctx'> 	select ATH79_DEV_LEDS_GPIO</div><div class='ctx'> 	select ATH79_DEV_SPI</div><div class='add'>+	select ATH79_DEV_USB</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say 'Y' here if you want your kernel to support the</div><div class='ctx'> 	  Atheros PB44 reference board.</div><div class='ctx'> </div><div class='add'>+config ATH79_MACH_UBNT_XM</div><div class='add'>+	bool "Ubiquiti Networks XM (rev 1.0) board"</div><div class='add'>+	select SOC_AR724X</div><div class='add'>+	select ATH79_DEV_GPIO_BUTTONS</div><div class='add'>+	select ATH79_DEV_LEDS_GPIO</div><div class='add'>+	select ATH79_DEV_SPI</div><div class='add'>+	help</div><div class='add'>+	  Say 'Y' here if you want your kernel to support the</div><div class='add'>+	  Ubiquiti Networks XM (rev 1.0) board.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> config SOC_AR71XX</div><div class='hunk'>@@ -33,14 +57,15 @@ config SOC_AR71XX</div><div class='ctx'> config SOC_AR724X</div><div class='ctx'> 	select USB_ARCH_HAS_EHCI</div><div class='ctx'> 	select USB_ARCH_HAS_OHCI</div><div class='add'>+	select HW_HAS_PCI</div><div class='ctx'> 	def_bool n</div><div class='ctx'> </div><div class='ctx'> config SOC_AR913X</div><div class='ctx'> 	select USB_ARCH_HAS_EHCI</div><div class='ctx'> 	def_bool n</div><div class='ctx'> </div><div class='del'>-config ATH79_DEV_AR913X_WMAC</div><div class='del'>-	depends on SOC_AR913X</div><div class='add'>+config SOC_AR933X</div><div class='add'>+	select USB_ARCH_HAS_EHCI</div><div class='ctx'> 	def_bool n</div><div class='ctx'> </div><div class='ctx'> config ATH79_DEV_GPIO_BUTTONS</div><div class='hunk'>@@ -52,4 +77,11 @@ config ATH79_DEV_LEDS_GPIO</div><div class='ctx'> config ATH79_DEV_SPI</div><div class='ctx'> 	def_bool n</div><div class='ctx'> </div><div class='add'>+config ATH79_DEV_USB</div><div class='add'>+	def_bool n</div><div class='add'>+</div><div class='add'>+config ATH79_DEV_WMAC</div><div class='add'>+	depends on (SOC_AR913X || SOC_AR933X)</div><div class='add'>+	def_bool n</div><div class='add'>+</div><div class='ctx'> endif</div><div class='head'>diff --git a/arch/mips/ath79/Makefile b/arch/mips/ath79/Makefile<br/>index c33d4653007c..3b911e09dbec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ath79/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ath79/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ath79/Makefile</a></div><div class='hunk'>@@ -16,13 +16,16 @@ obj-$(CONFIG_EARLY_PRINTK)		+= early_printk.o</div><div class='ctx'> # Devices</div><div class='ctx'> #</div><div class='ctx'> obj-y					+= dev-common.o</div><div class='del'>-obj-$(CONFIG_ATH79_DEV_AR913X_WMAC)	+= dev-ar913x-wmac.o</div><div class='ctx'> obj-$(CONFIG_ATH79_DEV_GPIO_BUTTONS)	+= dev-gpio-buttons.o</div><div class='ctx'> obj-$(CONFIG_ATH79_DEV_LEDS_GPIO)	+= dev-leds-gpio.o</div><div class='ctx'> obj-$(CONFIG_ATH79_DEV_SPI)		+= dev-spi.o</div><div class='add'>+obj-$(CONFIG_ATH79_DEV_USB)		+= dev-usb.o</div><div class='add'>+obj-$(CONFIG_ATH79_DEV_WMAC)		+= dev-wmac.o</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Machines</div><div class='ctx'> #</div><div class='add'>+obj-$(CONFIG_ATH79_MACH_AP121)		+= mach-ap121.o</div><div class='ctx'> obj-$(CONFIG_ATH79_MACH_AP81)		+= mach-ap81.o</div><div class='ctx'> obj-$(CONFIG_ATH79_MACH_PB44)		+= mach-pb44.o</div><div class='add'>+obj-$(CONFIG_ATH79_MACH_UBNT_XM)	+= mach-ubnt-xm.o</div><div class='head'>diff --git a/arch/mips/ath79/clock.c b/arch/mips/ath79/clock.c<br/>index 680bde99a26c..54d0eb4db987 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ath79/clock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ath79/clock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ath79/clock.c</a></div><div class='hunk'>@@ -110,6 +110,59 @@ static void __init ar913x_clocks_init(void)</div><div class='ctx'> 	ath79_uart_clk.rate = ath79_ahb_clk.rate;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init ar933x_clocks_init(void)</div><div class='add'>+{</div><div class='add'>+	u32 clock_ctrl;</div><div class='add'>+	u32 cpu_config;</div><div class='add'>+	u32 freq;</div><div class='add'>+	u32 t;</div><div class='add'>+</div><div class='add'>+	t = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);</div><div class='add'>+	if (t &amp; AR933X_BOOTSTRAP_REF_CLK_40)</div><div class='add'>+		ath79_ref_clk.rate = (40 * 1000 * 1000);</div><div class='add'>+	else</div><div class='add'>+		ath79_ref_clk.rate = (25 * 1000 * 1000);</div><div class='add'>+</div><div class='add'>+	clock_ctrl = ath79_pll_rr(AR933X_PLL_CLOCK_CTRL_REG);</div><div class='add'>+	if (clock_ctrl &amp; AR933X_PLL_CLOCK_CTRL_BYPASS) {</div><div class='add'>+		ath79_cpu_clk.rate = ath79_ref_clk.rate;</div><div class='add'>+		ath79_ahb_clk.rate = ath79_ref_clk.rate;</div><div class='add'>+		ath79_ddr_clk.rate = ath79_ref_clk.rate;</div><div class='add'>+	} else {</div><div class='add'>+		cpu_config = ath79_pll_rr(AR933X_PLL_CPU_CONFIG_REG);</div><div class='add'>+</div><div class='add'>+		t = (cpu_config &gt;&gt; AR933X_PLL_CPU_CONFIG_REFDIV_SHIFT) &amp;</div><div class='add'>+		    AR933X_PLL_CPU_CONFIG_REFDIV_MASK;</div><div class='add'>+		freq = ath79_ref_clk.rate / t;</div><div class='add'>+</div><div class='add'>+		t = (cpu_config &gt;&gt; AR933X_PLL_CPU_CONFIG_NINT_SHIFT) &amp;</div><div class='add'>+		    AR933X_PLL_CPU_CONFIG_NINT_MASK;</div><div class='add'>+		freq *= t;</div><div class='add'>+</div><div class='add'>+		t = (cpu_config &gt;&gt; AR933X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &amp;</div><div class='add'>+		    AR933X_PLL_CPU_CONFIG_OUTDIV_MASK;</div><div class='add'>+		if (t == 0)</div><div class='add'>+			t = 1;</div><div class='add'>+</div><div class='add'>+		freq &gt;&gt;= t;</div><div class='add'>+</div><div class='add'>+		t = ((clock_ctrl &gt;&gt; AR933X_PLL_CLOCK_CTRL_CPU_DIV_SHIFT) &amp;</div><div class='add'>+		     AR933X_PLL_CLOCK_CTRL_CPU_DIV_MASK) + 1;</div><div class='add'>+		ath79_cpu_clk.rate = freq / t;</div><div class='add'>+</div><div class='add'>+		t = ((clock_ctrl &gt;&gt; AR933X_PLL_CLOCK_CTRL_DDR_DIV_SHIFT) &amp;</div><div class='add'>+		      AR933X_PLL_CLOCK_CTRL_DDR_DIV_MASK) + 1;</div><div class='add'>+		ath79_ddr_clk.rate = freq / t;</div><div class='add'>+</div><div class='add'>+		t = ((clock_ctrl &gt;&gt; AR933X_PLL_CLOCK_CTRL_AHB_DIV_SHIFT) &amp;</div><div class='add'>+		     AR933X_PLL_CLOCK_CTRL_AHB_DIV_MASK) + 1;</div><div class='add'>+		ath79_ahb_clk.rate = freq / t;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath79_wdt_clk.rate = ath79_ref_clk.rate;</div><div class='add'>+	ath79_uart_clk.rate = ath79_ref_clk.rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init ath79_clocks_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (soc_is_ar71xx())</div><div class='hunk'>@@ -118,6 +171,8 @@ void __init ath79_clocks_init(void)</div><div class='ctx'> 		ar724x_clocks_init();</div><div class='ctx'> 	else if (soc_is_ar913x())</div><div class='ctx'> 		ar913x_clocks_init();</div><div class='add'>+	else if (soc_is_ar933x())</div><div class='add'>+		ar933x_clocks_init();</div><div class='ctx'> 	else</div><div class='ctx'> 		BUG();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/ath79/common.c b/arch/mips/ath79/common.c<br/>index 58f60e722a03..f0fda982b965 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ath79/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ath79/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ath79/common.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@ u32 ath79_ddr_freq;</div><div class='ctx'> EXPORT_SYMBOL_GPL(ath79_ddr_freq);</div><div class='ctx'> </div><div class='ctx'> enum ath79_soc_type ath79_soc;</div><div class='add'>+unsigned int ath79_soc_rev;</div><div class='ctx'> </div><div class='ctx'> void __iomem *ath79_pll_base;</div><div class='ctx'> void __iomem *ath79_reset_base;</div><div class='hunk'>@@ -64,6 +65,8 @@ void ath79_device_reset_set(u32 mask)</div><div class='ctx'> 		reg = AR724X_RESET_REG_RESET_MODULE;</div><div class='ctx'> 	else if (soc_is_ar913x())</div><div class='ctx'> 		reg = AR913X_RESET_REG_RESET_MODULE;</div><div class='add'>+	else if (soc_is_ar933x())</div><div class='add'>+		reg = AR933X_RESET_REG_RESET_MODULE;</div><div class='ctx'> 	else</div><div class='ctx'> 		BUG();</div><div class='ctx'> </div><div class='hunk'>@@ -86,6 +89,8 @@ void ath79_device_reset_clear(u32 mask)</div><div class='ctx'> 		reg = AR724X_RESET_REG_RESET_MODULE;</div><div class='ctx'> 	else if (soc_is_ar913x())</div><div class='ctx'> 		reg = AR913X_RESET_REG_RESET_MODULE;</div><div class='add'>+	else if (soc_is_ar933x())</div><div class='add'>+		reg = AR933X_RESET_REG_RESET_MODULE;</div><div class='ctx'> 	else</div><div class='ctx'> 		BUG();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/ath79/dev-ar913x-wmac.c b/arch/mips/ath79/dev-ar913x-wmac.c<br/>deleted file mode 100644<br/>index 48f425a5ba28..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ath79/dev-ar913x-wmac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/dev-ar913x-wmac.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,60 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Atheros AR913X SoC built-in WMAC device support</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2008-2010 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='del'>- *  Copyright (C) 2008 Imre Kaloz &lt;kaloz@openwrt.org&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 as published</div><div class='del'>- *  by the Free Software Foundation.</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/delay.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/ath9k_platform.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-ath79/ath79.h&gt;</div><div class='del'>-#include &lt;asm/mach-ath79/ar71xx_regs.h&gt;</div><div class='del'>-#include "dev-ar913x-wmac.h"</div><div class='del'>-</div><div class='del'>-static struct ath9k_platform_data ar913x_wmac_data;</div><div class='del'>-</div><div class='del'>-static struct resource ar913x_wmac_resources[] = {</div><div class='del'>-	{</div><div class='del'>-		.start	= AR913X_WMAC_BASE,</div><div class='del'>-		.end	= AR913X_WMAC_BASE + AR913X_WMAC_SIZE - 1,</div><div class='del'>-		.flags	= IORESOURCE_MEM,</div><div class='del'>-	}, {</div><div class='del'>-		.start	= ATH79_CPU_IRQ_IP2,</div><div class='del'>-		.end	= ATH79_CPU_IRQ_IP2,</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device ar913x_wmac_device = {</div><div class='del'>-	.name		= "ath9k",</div><div class='del'>-	.id		= -1,</div><div class='del'>-	.resource	= ar913x_wmac_resources,</div><div class='del'>-	.num_resources	= ARRAY_SIZE(ar913x_wmac_resources),</div><div class='del'>-	.dev = {</div><div class='del'>-		.platform_data = &amp;ar913x_wmac_data,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __init ath79_register_ar913x_wmac(u8 *cal_data)</div><div class='del'>-{</div><div class='del'>-	if (cal_data)</div><div class='del'>-		memcpy(ar913x_wmac_data.eeprom_data, cal_data,</div><div class='del'>-		       sizeof(ar913x_wmac_data.eeprom_data));</div><div class='del'>-</div><div class='del'>-	/* reset the WMAC */</div><div class='del'>-	ath79_device_reset_set(AR913X_RESET_AMBA2WMAC);</div><div class='del'>-	mdelay(10);</div><div class='del'>-</div><div class='del'>-	ath79_device_reset_clear(AR913X_RESET_AMBA2WMAC);</div><div class='del'>-	mdelay(10);</div><div class='del'>-</div><div class='del'>-	platform_device_register(&amp;ar913x_wmac_device);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/ath79/dev-common.c b/arch/mips/ath79/dev-common.c<br/>index 3b82e325bebf..f4956f809072 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ath79/dev-common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/dev-common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ath79/dev-common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ath79/dev-common.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-ath79/ath79.h&gt;</div><div class='ctx'> #include &lt;asm/mach-ath79/ar71xx_regs.h&gt;</div><div class='add'>+#include &lt;asm/mach-ath79/ar933x_uart_platform.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "dev-common.h"</div><div class='ctx'> </div><div class='hunk'>@@ -54,6 +55,30 @@ static struct platform_device ath79_uart_device = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct resource ar933x_uart_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= AR933X_UART_BASE,</div><div class='add'>+		.end	= AR933X_UART_BASE + AR71XX_UART_SIZE - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.start	= ATH79_MISC_IRQ_UART,</div><div class='add'>+		.end	= ATH79_MISC_IRQ_UART,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ar933x_uart_platform_data ar933x_uart_data;</div><div class='add'>+static struct platform_device ar933x_uart_device = {</div><div class='add'>+	.name		= "ar933x-uart",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.resource	= ar933x_uart_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(ar933x_uart_resources),</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data	= &amp;ar933x_uart_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void __init ath79_register_uart(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk *clk;</div><div class='hunk'>@@ -62,8 +87,17 @@ void __init ath79_register_uart(void)</div><div class='ctx'> 	if (IS_ERR(clk))</div><div class='ctx'> 		panic("unable to get UART clock, err=%ld", PTR_ERR(clk));</div><div class='ctx'> </div><div class='del'>-	ath79_uart_data[0].uartclk = clk_get_rate(clk);</div><div class='del'>-	platform_device_register(&amp;ath79_uart_device);</div><div class='add'>+	if (soc_is_ar71xx() ||</div><div class='add'>+	    soc_is_ar724x() ||</div><div class='add'>+	    soc_is_ar913x()) {</div><div class='add'>+		ath79_uart_data[0].uartclk = clk_get_rate(clk);</div><div class='add'>+		platform_device_register(&amp;ath79_uart_device);</div><div class='add'>+	} else if (soc_is_ar933x()) {</div><div class='add'>+		ar933x_uart_data.uartclk = clk_get_rate(clk);</div><div class='add'>+		platform_device_register(&amp;ar933x_uart_device);</div><div class='add'>+	} else {</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_device ath79_wdt_device = {</div><div class='head'>diff --git a/arch/mips/ath79/dev-usb.c b/arch/mips/ath79/dev-usb.c<br/>new file mode 100644<br/>index 000000000000..002d6d2afe04<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ath79/dev-usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ath79/dev-usb.c</a></div><div class='hunk'>@@ -0,0 +1,197 @@</div><div class='add'>+/*</div><div class='add'>+ *  Atheros AR7XXX/AR9XXX USB Host Controller device</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2008-2011 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='add'>+ *  Copyright (C) 2008 Imre Kaloz &lt;kaloz@openwrt.org&gt;</div><div class='add'>+ *</div><div class='add'>+ *  Parts of this file are based on Atheros' 2.6.15 BSP</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 version 2 as published</div><div class='add'>+ *  by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach-ath79/ath79.h&gt;</div><div class='add'>+#include &lt;asm/mach-ath79/ar71xx_regs.h&gt;</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "dev-usb.h"</div><div class='add'>+</div><div class='add'>+static struct resource ath79_ohci_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		/* .start and .end fields are filled dynamically */</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= ATH79_MISC_IRQ_OHCI,</div><div class='add'>+		.end	= ATH79_MISC_IRQ_OHCI,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 ath79_ohci_dmamask = DMA_BIT_MASK(32);</div><div class='add'>+static struct platform_device ath79_ohci_device = {</div><div class='add'>+	.name		= "ath79-ohci",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.resource	= ath79_ohci_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(ath79_ohci_resources),</div><div class='add'>+	.dev = {</div><div class='add'>+		.dma_mask		= &amp;ath79_ohci_dmamask,</div><div class='add'>+		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource ath79_ehci_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		/* .start and .end fields are filled dynamically */</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= ATH79_CPU_IRQ_USB,</div><div class='add'>+		.end	= ATH79_CPU_IRQ_USB,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 ath79_ehci_dmamask = DMA_BIT_MASK(32);</div><div class='add'>+static struct platform_device ath79_ehci_device = {</div><div class='add'>+	.name		= "ath79-ehci",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.resource	= ath79_ehci_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(ath79_ehci_resources),</div><div class='add'>+	.dev = {</div><div class='add'>+		.dma_mask		= &amp;ath79_ehci_dmamask,</div><div class='add'>+		.coherent_dma_mask	= DMA_BIT_MASK(32),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AR71XX_USB_RESET_MASK	(AR71XX_RESET_USB_HOST | \</div><div class='add'>+				 AR71XX_RESET_USB_PHY | \</div><div class='add'>+				 AR71XX_RESET_USB_OHCI_DLL)</div><div class='add'>+</div><div class='add'>+static void __init ath79_usb_setup(void)</div><div class='add'>+{</div><div class='add'>+	void __iomem *usb_ctrl_base;</div><div class='add'>+</div><div class='add'>+	ath79_device_reset_set(AR71XX_USB_RESET_MASK);</div><div class='add'>+	mdelay(1000);</div><div class='add'>+	ath79_device_reset_clear(AR71XX_USB_RESET_MASK);</div><div class='add'>+</div><div class='add'>+	usb_ctrl_base = ioremap(AR71XX_USB_CTRL_BASE, AR71XX_USB_CTRL_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Turning on the Buff and Desc swap bits */</div><div class='add'>+	__raw_writel(0xf0000, usb_ctrl_base + AR71XX_USB_CTRL_REG_CONFIG);</div><div class='add'>+</div><div class='add'>+	/* WAR for HW bug. Here it adjusts the duration between two SOFS */</div><div class='add'>+	__raw_writel(0x20c00, usb_ctrl_base + AR71XX_USB_CTRL_REG_FLADJ);</div><div class='add'>+</div><div class='add'>+	iounmap(usb_ctrl_base);</div><div class='add'>+</div><div class='add'>+	mdelay(900);</div><div class='add'>+</div><div class='add'>+	ath79_ohci_resources[0].start = AR71XX_OHCI_BASE;</div><div class='add'>+	ath79_ohci_resources[0].end = AR71XX_OHCI_BASE + AR71XX_OHCI_SIZE - 1;</div><div class='add'>+	platform_device_register(&amp;ath79_ohci_device);</div><div class='add'>+</div><div class='add'>+	ath79_ehci_resources[0].start = AR71XX_EHCI_BASE;</div><div class='add'>+	ath79_ehci_resources[0].end = AR71XX_EHCI_BASE + AR71XX_EHCI_SIZE - 1;</div><div class='add'>+	ath79_ehci_device.name = "ar71xx-ehci";</div><div class='add'>+	platform_device_register(&amp;ath79_ehci_device);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init ar7240_usb_setup(void)</div><div class='add'>+{</div><div class='add'>+	void __iomem *usb_ctrl_base;</div><div class='add'>+</div><div class='add'>+	ath79_device_reset_clear(AR7240_RESET_OHCI_DLL);</div><div class='add'>+	ath79_device_reset_set(AR7240_RESET_USB_HOST);</div><div class='add'>+</div><div class='add'>+	mdelay(1000);</div><div class='add'>+</div><div class='add'>+	ath79_device_reset_set(AR7240_RESET_OHCI_DLL);</div><div class='add'>+	ath79_device_reset_clear(AR7240_RESET_USB_HOST);</div><div class='add'>+</div><div class='add'>+	usb_ctrl_base = ioremap(AR7240_USB_CTRL_BASE, AR7240_USB_CTRL_SIZE);</div><div class='add'>+</div><div class='add'>+	/* WAR for HW bug. Here it adjusts the duration between two SOFS */</div><div class='add'>+	__raw_writel(0x3, usb_ctrl_base + AR71XX_USB_CTRL_REG_FLADJ);</div><div class='add'>+</div><div class='add'>+	iounmap(usb_ctrl_base);</div><div class='add'>+</div><div class='add'>+	ath79_ohci_resources[0].start = AR7240_OHCI_BASE;</div><div class='add'>+	ath79_ohci_resources[0].end = AR7240_OHCI_BASE + AR7240_OHCI_SIZE - 1;</div><div class='add'>+	platform_device_register(&amp;ath79_ohci_device);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init ar724x_usb_setup(void)</div><div class='add'>+{</div><div class='add'>+	ath79_device_reset_set(AR724X_RESET_USBSUS_OVERRIDE);</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	ath79_device_reset_clear(AR724X_RESET_USB_HOST);</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	ath79_device_reset_clear(AR724X_RESET_USB_PHY);</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	ath79_ehci_resources[0].start = AR724X_EHCI_BASE;</div><div class='add'>+	ath79_ehci_resources[0].end = AR724X_EHCI_BASE + AR724X_EHCI_SIZE - 1;</div><div class='add'>+	ath79_ehci_device.name = "ar724x-ehci";</div><div class='add'>+	platform_device_register(&amp;ath79_ehci_device);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init ar913x_usb_setup(void)</div><div class='add'>+{</div><div class='add'>+	ath79_device_reset_set(AR913X_RESET_USBSUS_OVERRIDE);</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	ath79_device_reset_clear(AR913X_RESET_USB_HOST);</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	ath79_device_reset_clear(AR913X_RESET_USB_PHY);</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	ath79_ehci_resources[0].start = AR913X_EHCI_BASE;</div><div class='add'>+	ath79_ehci_resources[0].end = AR913X_EHCI_BASE + AR913X_EHCI_SIZE - 1;</div><div class='add'>+	ath79_ehci_device.name = "ar913x-ehci";</div><div class='add'>+	platform_device_register(&amp;ath79_ehci_device);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init ar933x_usb_setup(void)</div><div class='add'>+{</div><div class='add'>+	ath79_device_reset_set(AR933X_RESET_USBSUS_OVERRIDE);</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	ath79_device_reset_clear(AR933X_RESET_USB_HOST);</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	ath79_device_reset_clear(AR933X_RESET_USB_PHY);</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	ath79_ehci_resources[0].start = AR933X_EHCI_BASE;</div><div class='add'>+	ath79_ehci_resources[0].end = AR933X_EHCI_BASE + AR933X_EHCI_SIZE - 1;</div><div class='add'>+	ath79_ehci_device.name = "ar933x-ehci";</div><div class='add'>+	platform_device_register(&amp;ath79_ehci_device);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init ath79_register_usb(void)</div><div class='add'>+{</div><div class='add'>+	if (soc_is_ar71xx())</div><div class='add'>+		ath79_usb_setup();</div><div class='add'>+	else if (soc_is_ar7240())</div><div class='add'>+		ar7240_usb_setup();</div><div class='add'>+	else if (soc_is_ar7241() || soc_is_ar7242())</div><div class='add'>+		ar724x_usb_setup();</div><div class='add'>+	else if (soc_is_ar913x())</div><div class='add'>+		ar913x_usb_setup();</div><div class='add'>+	else if (soc_is_ar933x())</div><div class='add'>+		ar933x_usb_setup();</div><div class='add'>+	else</div><div class='add'>+		BUG();</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/ath79/dev-ar913x-wmac.h b/arch/mips/ath79/dev-usb.h<br/>index 579d562bbda8..4b86a69ca080 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ath79/dev-ar913x-wmac.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/dev-ar913x-wmac.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ath79/dev-usb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ath79/dev-usb.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  Atheros AR913X SoC built-in WMAC device support</div><div class='add'>+ *  Atheros AR71XX/AR724X/AR913X USB Host Controller support</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2008-2010 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='ctx'>  *  Copyright (C) 2008 Imre Kaloz &lt;kaloz@openwrt.org&gt;</div><div class='hunk'>@@ -9,9 +9,9 @@</div><div class='ctx'>  *  by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifndef _ATH79_DEV_AR913X_WMAC_H</div><div class='del'>-#define _ATH79_DEV_AR913X_WMAC_H</div><div class='add'>+#ifndef _ATH79_DEV_USB_H</div><div class='add'>+#define _ATH79_DEV_USB_H</div><div class='ctx'> </div><div class='del'>-void ath79_register_ar913x_wmac(u8 *cal_data);</div><div class='add'>+void ath79_register_usb(void);</div><div class='ctx'> </div><div class='del'>-#endif /* _ATH79_DEV_AR913X_WMAC_H */</div><div class='add'>+#endif /* _ATH79_DEV_USB_H */</div><div class='head'>diff --git a/arch/mips/ath79/dev-wmac.c b/arch/mips/ath79/dev-wmac.c<br/>new file mode 100644<br/>index 000000000000..24f546985b69<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ath79/dev-wmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ath79/dev-wmac.c</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+/*</div><div class='add'>+ *  Atheros AR913X/AR933X SoC built-in WMAC device support</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2008-2011 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='add'>+ *  Copyright (C) 2008 Imre Kaloz &lt;kaloz@openwrt.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 version 2 as published</div><div class='add'>+ *  by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/ath9k_platform.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach-ath79/ath79.h&gt;</div><div class='add'>+#include &lt;asm/mach-ath79/ar71xx_regs.h&gt;</div><div class='add'>+#include "dev-wmac.h"</div><div class='add'>+</div><div class='add'>+static struct ath9k_platform_data ath79_wmac_data;</div><div class='add'>+</div><div class='add'>+static struct resource ath79_wmac_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		/* .start and .end fields are filled dynamically */</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start	= ATH79_CPU_IRQ_IP2,</div><div class='add'>+		.end	= ATH79_CPU_IRQ_IP2,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device ath79_wmac_device = {</div><div class='add'>+	.name		= "ath9k",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.resource	= ath79_wmac_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(ath79_wmac_resources),</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;ath79_wmac_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init ar913x_wmac_setup(void)</div><div class='add'>+{</div><div class='add'>+	/* reset the WMAC */</div><div class='add'>+	ath79_device_reset_set(AR913X_RESET_AMBA2WMAC);</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	ath79_device_reset_clear(AR913X_RESET_AMBA2WMAC);</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	ath79_wmac_resources[0].start = AR913X_WMAC_BASE;</div><div class='add'>+	ath79_wmac_resources[0].end = AR913X_WMAC_BASE + AR913X_WMAC_SIZE - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int ar933x_wmac_reset(void)</div><div class='add'>+{</div><div class='add'>+	ath79_device_reset_clear(AR933X_RESET_WMAC);</div><div class='add'>+	ath79_device_reset_set(AR933X_RESET_WMAC);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ar933x_r1_get_wmac_revision(void)</div><div class='add'>+{</div><div class='add'>+	return ath79_soc_rev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init ar933x_wmac_setup(void)</div><div class='add'>+{</div><div class='add'>+	u32 t;</div><div class='add'>+</div><div class='add'>+	ar933x_wmac_reset();</div><div class='add'>+</div><div class='add'>+	ath79_wmac_device.name = "ar933x_wmac";</div><div class='add'>+</div><div class='add'>+	ath79_wmac_resources[0].start = AR933X_WMAC_BASE;</div><div class='add'>+	ath79_wmac_resources[0].end = AR933X_WMAC_BASE + AR933X_WMAC_SIZE - 1;</div><div class='add'>+</div><div class='add'>+	t = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);</div><div class='add'>+	if (t &amp; AR933X_BOOTSTRAP_REF_CLK_40)</div><div class='add'>+		ath79_wmac_data.is_clk_25mhz = false;</div><div class='add'>+	else</div><div class='add'>+		ath79_wmac_data.is_clk_25mhz = true;</div><div class='add'>+</div><div class='add'>+	if (ath79_soc_rev == 1)</div><div class='add'>+		ath79_wmac_data.get_mac_revision = ar933x_r1_get_wmac_revision;</div><div class='add'>+</div><div class='add'>+	ath79_wmac_data.external_reset = ar933x_wmac_reset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init ath79_register_wmac(u8 *cal_data)</div><div class='add'>+{</div><div class='add'>+	if (soc_is_ar913x())</div><div class='add'>+		ar913x_wmac_setup();</div><div class='add'>+	if (soc_is_ar933x())</div><div class='add'>+		ar933x_wmac_setup();</div><div class='add'>+	else</div><div class='add'>+		BUG();</div><div class='add'>+</div><div class='add'>+	if (cal_data)</div><div class='add'>+		memcpy(ath79_wmac_data.eeprom_data, cal_data,</div><div class='add'>+		       sizeof(ath79_wmac_data.eeprom_data));</div><div class='add'>+</div><div class='add'>+	platform_device_register(&amp;ath79_wmac_device);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/ath79/dev-wmac.h b/arch/mips/ath79/dev-wmac.h<br/>new file mode 100644<br/>index 000000000000..c9cd8709f090<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ath79/dev-wmac.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ath79/dev-wmac.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+/*</div><div class='add'>+ *  Atheros AR913X/AR933X SoC built-in WMAC device support</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2008-2011 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='add'>+ *  Copyright (C) 2008 Imre Kaloz &lt;kaloz@openwrt.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 version 2 as published</div><div class='add'>+ *  by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ATH79_DEV_WMAC_H</div><div class='add'>+#define _ATH79_DEV_WMAC_H</div><div class='add'>+</div><div class='add'>+void ath79_register_wmac(u8 *cal_data);</div><div class='add'>+</div><div class='add'>+#endif /* _ATH79_DEV_WMAC_H */</div><div class='head'>diff --git a/arch/mips/ath79/early_printk.c b/arch/mips/ath79/early_printk.c<br/>index 7499b0e9df26..6a51ced7a293 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ath79/early_printk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/early_printk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ath79/early_printk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ath79/early_printk.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='del'>- *  Atheros AR71XX/AR724X/AR913X SoC early printk support</div><div class='add'>+ *  Atheros AR7XXX/AR9XXX SoC early printk support</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (C) 2008-2010 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='add'>+ *  Copyright (C) 2008-2011 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='ctx'>  *  Copyright (C) 2008 Imre Kaloz &lt;kaloz@openwrt.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify it</div><div class='hunk'>@@ -10,27 +10,85 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/mach-ath79/ath79.h&gt;</div><div class='ctx'> #include &lt;asm/mach-ath79/ar71xx_regs.h&gt;</div><div class='add'>+#include &lt;asm/mach-ath79/ar933x_uart.h&gt;</div><div class='ctx'> </div><div class='del'>-static inline void prom_wait_thre(void __iomem *base)</div><div class='add'>+static void (*_prom_putchar) (unsigned char);</div><div class='add'>+</div><div class='add'>+static inline void prom_putchar_wait(void __iomem *reg, u32 mask, u32 val)</div><div class='ctx'> {</div><div class='del'>-	u32 lsr;</div><div class='add'>+	u32 t;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		lsr = __raw_readl(base + UART_LSR * 4);</div><div class='del'>-		if (lsr &amp; UART_LSR_THRE)</div><div class='add'>+		t = __raw_readl(reg);</div><div class='add'>+		if ((t &amp; mask) == val)</div><div class='ctx'> 			break;</div><div class='ctx'> 	} while (1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void prom_putchar(unsigned char ch)</div><div class='add'>+static void prom_putchar_ar71xx(unsigned char ch)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *base = (void __iomem *)(KSEG1ADDR(AR71XX_UART_BASE));</div><div class='ctx'> </div><div class='del'>-	prom_wait_thre(base);</div><div class='add'>+	prom_putchar_wait(base + UART_LSR * 4, UART_LSR_THRE, UART_LSR_THRE);</div><div class='ctx'> 	__raw_writel(ch, base + UART_TX * 4);</div><div class='del'>-	prom_wait_thre(base);</div><div class='add'>+	prom_putchar_wait(base + UART_LSR * 4, UART_LSR_THRE, UART_LSR_THRE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prom_putchar_ar933x(unsigned char ch)</div><div class='add'>+{</div><div class='add'>+	void __iomem *base = (void __iomem *)(KSEG1ADDR(AR933X_UART_BASE));</div><div class='add'>+</div><div class='add'>+	prom_putchar_wait(base + AR933X_UART_DATA_REG, AR933X_UART_DATA_TX_CSR,</div><div class='add'>+			  AR933X_UART_DATA_TX_CSR);</div><div class='add'>+	__raw_writel(AR933X_UART_DATA_TX_CSR | ch, base + AR933X_UART_DATA_REG);</div><div class='add'>+	prom_putchar_wait(base + AR933X_UART_DATA_REG, AR933X_UART_DATA_TX_CSR,</div><div class='add'>+			  AR933X_UART_DATA_TX_CSR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prom_putchar_dummy(unsigned char ch)</div><div class='add'>+{</div><div class='add'>+	/* nothing to do */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prom_putchar_init(void)</div><div class='add'>+{</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	u32 id;</div><div class='add'>+</div><div class='add'>+	base = (void __iomem *)(KSEG1ADDR(AR71XX_RESET_BASE));</div><div class='add'>+	id = __raw_readl(base + AR71XX_RESET_REG_REV_ID);</div><div class='add'>+	id &amp;= REV_ID_MAJOR_MASK;</div><div class='add'>+</div><div class='add'>+	switch (id) {</div><div class='add'>+	case REV_ID_MAJOR_AR71XX:</div><div class='add'>+	case REV_ID_MAJOR_AR7240:</div><div class='add'>+	case REV_ID_MAJOR_AR7241:</div><div class='add'>+	case REV_ID_MAJOR_AR7242:</div><div class='add'>+	case REV_ID_MAJOR_AR913X:</div><div class='add'>+		_prom_putchar = prom_putchar_ar71xx;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case REV_ID_MAJOR_AR9330:</div><div class='add'>+	case REV_ID_MAJOR_AR9331:</div><div class='add'>+		_prom_putchar = prom_putchar_ar933x;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		_prom_putchar = prom_putchar_dummy;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void prom_putchar(unsigned char ch)</div><div class='add'>+{</div><div class='add'>+	if (!_prom_putchar)</div><div class='add'>+		prom_putchar_init();</div><div class='add'>+</div><div class='add'>+	_prom_putchar(ch);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/ath79/gpio.c b/arch/mips/ath79/gpio.c<br/>index a0c426b82123..a2f8ca630ed6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ath79/gpio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ath79/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ath79/gpio.c</a></div><div class='hunk'>@@ -153,6 +153,8 @@ void __init ath79_gpio_init(void)</div><div class='ctx'> 		ath79_gpio_count = AR724X_GPIO_COUNT;</div><div class='ctx'> 	else if (soc_is_ar913x())</div><div class='ctx'> 		ath79_gpio_count = AR913X_GPIO_COUNT;</div><div class='add'>+	else if (soc_is_ar933x())</div><div class='add'>+		ath79_gpio_count = AR933X_GPIO_COUNT;</div><div class='ctx'> 	else</div><div class='ctx'> 		BUG();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/ath79/irq.c b/arch/mips/ath79/irq.c<br/>index ac610d5fe3ba..1b073de44680 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ath79/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ath79/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ath79/irq.c</a></div><div class='hunk'>@@ -46,6 +46,15 @@ static void ath79_misc_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 	else if (pending &amp; MISC_INT_TIMER)</div><div class='ctx'> 		generic_handle_irq(ATH79_MISC_IRQ_TIMER);</div><div class='ctx'> </div><div class='add'>+	else if (pending &amp; MISC_INT_TIMER2)</div><div class='add'>+		generic_handle_irq(ATH79_MISC_IRQ_TIMER2);</div><div class='add'>+</div><div class='add'>+	else if (pending &amp; MISC_INT_TIMER3)</div><div class='add'>+		generic_handle_irq(ATH79_MISC_IRQ_TIMER3);</div><div class='add'>+</div><div class='add'>+	else if (pending &amp; MISC_INT_TIMER4)</div><div class='add'>+		generic_handle_irq(ATH79_MISC_IRQ_TIMER4);</div><div class='add'>+</div><div class='ctx'> 	else if (pending &amp; MISC_INT_OHCI)</div><div class='ctx'> 		generic_handle_irq(ATH79_MISC_IRQ_OHCI);</div><div class='ctx'> </div><div class='hunk'>@@ -58,6 +67,9 @@ static void ath79_misc_irq_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 	else if (pending &amp; MISC_INT_WDOG)</div><div class='ctx'> 		generic_handle_irq(ATH79_MISC_IRQ_WDOG);</div><div class='ctx'> </div><div class='add'>+	else if (pending &amp; MISC_INT_ETHSW)</div><div class='add'>+		generic_handle_irq(ATH79_MISC_IRQ_ETHSW);</div><div class='add'>+</div><div class='ctx'> 	else</div><div class='ctx'> 		spurious_interrupt();</div><div class='ctx'> }</div><div class='hunk'>@@ -117,7 +129,7 @@ static void __init ath79_misc_irq_init(void)</div><div class='ctx'> </div><div class='ctx'> 	if (soc_is_ar71xx() || soc_is_ar913x())</div><div class='ctx'> 		ath79_misc_irq_chip.irq_mask_ack = ar71xx_misc_irq_mask;</div><div class='del'>-	else if (soc_is_ar724x())</div><div class='add'>+	else if (soc_is_ar724x() || soc_is_ar933x())</div><div class='ctx'> 		ath79_misc_irq_chip.irq_ack = ar724x_misc_irq_ack;</div><div class='ctx'> 	else</div><div class='ctx'> 		BUG();</div><div class='hunk'>@@ -174,6 +186,9 @@ void __init arch_init_irq(void)</div><div class='ctx'> 	} else if (soc_is_ar913x()) {</div><div class='ctx'> 		ath79_ip2_flush_reg = AR913X_DDR_REG_FLUSH_WMAC;</div><div class='ctx'> 		ath79_ip3_flush_reg = AR913X_DDR_REG_FLUSH_USB;</div><div class='add'>+	} else if (soc_is_ar933x()) {</div><div class='add'>+		ath79_ip2_flush_reg = AR933X_DDR_REG_FLUSH_WMAC;</div><div class='add'>+		ath79_ip3_flush_reg = AR933X_DDR_REG_FLUSH_USB;</div><div class='ctx'> 	} else</div><div class='ctx'> 		BUG();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/ath79/mach-ap121.c b/arch/mips/ath79/mach-ap121.c<br/>new file mode 100644<br/>index 000000000000..4c20200d7c72<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ath79/mach-ap121.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ath79/mach-ap121.c</a></div><div class='hunk'>@@ -0,0 +1,92 @@</div><div class='add'>+/*</div><div class='add'>+ *  Atheros AP121 board support</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2011 Gabor Juhos &lt;juhosg@openwrt.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 version 2 as published</div><div class='add'>+ *  by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "machtypes.h"</div><div class='add'>+#include "dev-gpio-buttons.h"</div><div class='add'>+#include "dev-leds-gpio.h"</div><div class='add'>+#include "dev-spi.h"</div><div class='add'>+#include "dev-usb.h"</div><div class='add'>+#include "dev-wmac.h"</div><div class='add'>+</div><div class='add'>+#define AP121_GPIO_LED_WLAN		0</div><div class='add'>+#define AP121_GPIO_LED_USB		1</div><div class='add'>+</div><div class='add'>+#define AP121_GPIO_BTN_JUMPSTART	11</div><div class='add'>+#define AP121_GPIO_BTN_RESET		12</div><div class='add'>+</div><div class='add'>+#define AP121_KEYS_POLL_INTERVAL	20	/* msecs */</div><div class='add'>+#define AP121_KEYS_DEBOUNCE_INTERVAL	(3 * AP121_KEYS_POLL_INTERVAL)</div><div class='add'>+</div><div class='add'>+#define AP121_CAL_DATA_ADDR	0x1fff1000</div><div class='add'>+</div><div class='add'>+static struct gpio_led ap121_leds_gpio[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "ap121:green:usb",</div><div class='add'>+		.gpio		= AP121_GPIO_LED_USB,</div><div class='add'>+		.active_low	= 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "ap121:green:wlan",</div><div class='add'>+		.gpio		= AP121_GPIO_LED_WLAN,</div><div class='add'>+		.active_low	= 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_keys_button ap121_gpio_keys[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.desc		= "jumpstart button",</div><div class='add'>+		.type		= EV_KEY,</div><div class='add'>+		.code		= KEY_WPS_BUTTON,</div><div class='add'>+		.debounce_interval = AP121_KEYS_DEBOUNCE_INTERVAL,</div><div class='add'>+		.gpio		= AP121_GPIO_BTN_JUMPSTART,</div><div class='add'>+		.active_low	= 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.desc		= "reset button",</div><div class='add'>+		.type		= EV_KEY,</div><div class='add'>+		.code		= KEY_RESTART,</div><div class='add'>+		.debounce_interval = AP121_KEYS_DEBOUNCE_INTERVAL,</div><div class='add'>+		.gpio		= AP121_GPIO_BTN_RESET,</div><div class='add'>+		.active_low	= 1,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_board_info ap121_spi_info[] = {</div><div class='add'>+	{</div><div class='add'>+		.bus_num	= 0,</div><div class='add'>+		.chip_select	= 0,</div><div class='add'>+		.max_speed_hz	= 25000000,</div><div class='add'>+		.modalias	= "mx25l1606e",</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ath79_spi_platform_data ap121_spi_data = {</div><div class='add'>+	.bus_num	= 0,</div><div class='add'>+	.num_chipselect	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init ap121_setup(void)</div><div class='add'>+{</div><div class='add'>+	u8 *cal_data = (u8 *) KSEG1ADDR(AP121_CAL_DATA_ADDR);</div><div class='add'>+</div><div class='add'>+	ath79_register_leds_gpio(-1, ARRAY_SIZE(ap121_leds_gpio),</div><div class='add'>+				 ap121_leds_gpio);</div><div class='add'>+	ath79_register_gpio_keys_polled(-1, AP121_KEYS_POLL_INTERVAL,</div><div class='add'>+					ARRAY_SIZE(ap121_gpio_keys),</div><div class='add'>+					ap121_gpio_keys);</div><div class='add'>+</div><div class='add'>+	ath79_register_spi(&amp;ap121_spi_data, ap121_spi_info,</div><div class='add'>+			   ARRAY_SIZE(ap121_spi_info));</div><div class='add'>+	ath79_register_usb();</div><div class='add'>+	ath79_register_wmac(cal_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MIPS_MACHINE(ATH79_MACH_AP121, "AP121", "Atheros AP121 reference board",</div><div class='add'>+	     ap121_setup);</div><div class='head'>diff --git a/arch/mips/ath79/mach-ap81.c b/arch/mips/ath79/mach-ap81.c<br/>index eee4c121deb4..abe19836331c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ath79/mach-ap81.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/mach-ap81.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ath79/mach-ap81.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ath79/mach-ap81.c</a></div><div class='hunk'>@@ -10,10 +10,11 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "machtypes.h"</div><div class='del'>-#include "dev-ar913x-wmac.h"</div><div class='add'>+#include "dev-wmac.h"</div><div class='ctx'> #include "dev-gpio-buttons.h"</div><div class='ctx'> #include "dev-leds-gpio.h"</div><div class='ctx'> #include "dev-spi.h"</div><div class='add'>+#include "dev-usb.h"</div><div class='ctx'> </div><div class='ctx'> #define AP81_GPIO_LED_STATUS	1</div><div class='ctx'> #define AP81_GPIO_LED_AOSS	3</div><div class='hunk'>@@ -91,7 +92,8 @@ static void __init ap81_setup(void)</div><div class='ctx'> 					ap81_gpio_keys);</div><div class='ctx'> 	ath79_register_spi(&amp;ap81_spi_data, ap81_spi_info,</div><div class='ctx'> 			   ARRAY_SIZE(ap81_spi_info));</div><div class='del'>-	ath79_register_ar913x_wmac(cal_data);</div><div class='add'>+	ath79_register_wmac(cal_data);</div><div class='add'>+	ath79_register_usb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MIPS_MACHINE(ATH79_MACH_AP81, "AP81", "Atheros AP81 reference board",</div><div class='head'>diff --git a/arch/mips/ath79/mach-pb44.c b/arch/mips/ath79/mach-pb44.c<br/>index ec7b7a135d53..fe9701a32291 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ath79/mach-pb44.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/mach-pb44.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ath79/mach-pb44.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ath79/mach-pb44.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include "dev-gpio-buttons.h"</div><div class='ctx'> #include "dev-leds-gpio.h"</div><div class='ctx'> #include "dev-spi.h"</div><div class='add'>+#include "dev-usb.h"</div><div class='ctx'> </div><div class='ctx'> #define PB44_GPIO_I2C_SCL	0</div><div class='ctx'> #define PB44_GPIO_I2C_SDA	1</div><div class='hunk'>@@ -112,6 +113,7 @@ static void __init pb44_init(void)</div><div class='ctx'> 					pb44_gpio_keys);</div><div class='ctx'> 	ath79_register_spi(&amp;pb44_spi_data, pb44_spi_info,</div><div class='ctx'> 			   ARRAY_SIZE(pb44_spi_info));</div><div class='add'>+	ath79_register_usb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MIPS_MACHINE(ATH79_MACH_PB44, "PB44", "Atheros PB44 reference board",</div><div class='head'>diff --git a/arch/mips/ath79/mach-ubnt-xm.c b/arch/mips/ath79/mach-ubnt-xm.c<br/>new file mode 100644<br/>index 000000000000..3c311a539347<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ath79/mach-ubnt-xm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ath79/mach-ubnt-xm.c</a></div><div class='hunk'>@@ -0,0 +1,119 @@</div><div class='add'>+/*</div><div class='add'>+ *  Ubiquiti Networks XM (rev 1.0) board support</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2011 René Bolldorf &lt;xsecute@googlemail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  Derived from: mach-pb44.c</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 version 2 as published</div><div class='add'>+ *  by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+#include &lt;linux/ath9k_platform.h&gt;</div><div class='add'>+#include &lt;asm/mach-ath79/pci-ath724x.h&gt;</div><div class='add'>+#endif /* CONFIG_PCI */</div><div class='add'>+</div><div class='add'>+#include "machtypes.h"</div><div class='add'>+#include "dev-gpio-buttons.h"</div><div class='add'>+#include "dev-leds-gpio.h"</div><div class='add'>+#include "dev-spi.h"</div><div class='add'>+</div><div class='add'>+#define UBNT_XM_GPIO_LED_L1		0</div><div class='add'>+#define UBNT_XM_GPIO_LED_L2		1</div><div class='add'>+#define UBNT_XM_GPIO_LED_L3		11</div><div class='add'>+#define UBNT_XM_GPIO_LED_L4		7</div><div class='add'>+</div><div class='add'>+#define UBNT_XM_GPIO_BTN_RESET		12</div><div class='add'>+</div><div class='add'>+#define UBNT_XM_KEYS_POLL_INTERVAL	20</div><div class='add'>+#define UBNT_XM_KEYS_DEBOUNCE_INTERVAL	(3 * UBNT_XM_KEYS_POLL_INTERVAL)</div><div class='add'>+</div><div class='add'>+#define UBNT_XM_PCI_IRQ			48</div><div class='add'>+#define UBNT_XM_EEPROM_ADDR		(u8 *) KSEG1ADDR(0x1fff1000)</div><div class='add'>+</div><div class='add'>+static struct gpio_led ubnt_xm_leds_gpio[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "ubnt-xm:red:link1",</div><div class='add'>+		.gpio		= UBNT_XM_GPIO_LED_L1,</div><div class='add'>+		.active_low	= 0,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "ubnt-xm:orange:link2",</div><div class='add'>+		.gpio		= UBNT_XM_GPIO_LED_L2,</div><div class='add'>+		.active_low	= 0,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "ubnt-xm:green:link3",</div><div class='add'>+		.gpio		= UBNT_XM_GPIO_LED_L3,</div><div class='add'>+		.active_low	= 0,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "ubnt-xm:green:link4",</div><div class='add'>+		.gpio		= UBNT_XM_GPIO_LED_L4,</div><div class='add'>+		.active_low	= 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct gpio_keys_button ubnt_xm_gpio_keys[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.desc			= "reset",</div><div class='add'>+		.type			= EV_KEY,</div><div class='add'>+		.code			= KEY_RESTART,</div><div class='add'>+		.debounce_interval	= UBNT_XM_KEYS_DEBOUNCE_INTERVAL,</div><div class='add'>+		.gpio			= UBNT_XM_GPIO_BTN_RESET,</div><div class='add'>+		.active_low		= 1,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_board_info ubnt_xm_spi_info[] = {</div><div class='add'>+	{</div><div class='add'>+		.bus_num	= 0,</div><div class='add'>+		.chip_select	= 0,</div><div class='add'>+		.max_speed_hz	= 25000000,</div><div class='add'>+		.modalias	= "mx25l6405d",</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ath79_spi_platform_data ubnt_xm_spi_data = {</div><div class='add'>+	.bus_num		= 0,</div><div class='add'>+	.num_chipselect		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+static struct ath9k_platform_data ubnt_xm_eeprom_data;</div><div class='add'>+</div><div class='add'>+static struct ath724x_pci_data ubnt_xm_pci_data[] = {</div><div class='add'>+	{</div><div class='add'>+		.irq	= UBNT_XM_PCI_IRQ,</div><div class='add'>+		.pdata	= &amp;ubnt_xm_eeprom_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif /* CONFIG_PCI */</div><div class='add'>+</div><div class='add'>+static void __init ubnt_xm_init(void)</div><div class='add'>+{</div><div class='add'>+	ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_xm_leds_gpio),</div><div class='add'>+				 ubnt_xm_leds_gpio);</div><div class='add'>+</div><div class='add'>+	ath79_register_gpio_keys_polled(-1, UBNT_XM_KEYS_POLL_INTERVAL,</div><div class='add'>+					ARRAY_SIZE(ubnt_xm_gpio_keys),</div><div class='add'>+					ubnt_xm_gpio_keys);</div><div class='add'>+</div><div class='add'>+	ath79_register_spi(&amp;ubnt_xm_spi_data, ubnt_xm_spi_info,</div><div class='add'>+			   ARRAY_SIZE(ubnt_xm_spi_info));</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	memcpy(ubnt_xm_eeprom_data.eeprom_data, UBNT_XM_EEPROM_ADDR,</div><div class='add'>+	       sizeof(ubnt_xm_eeprom_data.eeprom_data));</div><div class='add'>+</div><div class='add'>+	ath724x_pci_add_data(ubnt_xm_pci_data, ARRAY_SIZE(ubnt_xm_pci_data));</div><div class='add'>+#endif /* CONFIG_PCI */</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MIPS_MACHINE(ATH79_MACH_UBNT_XM,</div><div class='add'>+	     "UBNT-XM",</div><div class='add'>+	     "Ubiquiti Networks XM (rev 1.0) board",</div><div class='add'>+	     ubnt_xm_init);</div><div class='head'>diff --git a/arch/mips/ath79/machtypes.h b/arch/mips/ath79/machtypes.h<br/>index 3940fe470b2d..9a1f3826626e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ath79/machtypes.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/machtypes.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ath79/machtypes.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ath79/machtypes.h</a></div><div class='hunk'>@@ -16,8 +16,10 @@</div><div class='ctx'> </div><div class='ctx'> enum ath79_mach_type {</div><div class='ctx'> 	ATH79_MACH_GENERIC = 0,</div><div class='add'>+	ATH79_MACH_AP121,		/* Atheros AP121 reference board */</div><div class='ctx'> 	ATH79_MACH_AP81,		/* Atheros AP81 reference board */</div><div class='ctx'> 	ATH79_MACH_PB44,		/* Atheros PB44 reference board */</div><div class='add'>+	ATH79_MACH_UBNT_XM,		/* Ubiquiti Networks XM board rev 1.0 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* _ATH79_MACHTYPE_H */</div><div class='head'>diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c<br/>index 159b42f106b0..80a7d4023d7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ath79/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/ath79/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ath79/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/ath79/setup.c</a></div><div class='hunk'>@@ -101,19 +101,31 @@ static void __init ath79_detect_sys_type(void)</div><div class='ctx'> 	case REV_ID_MAJOR_AR7240:</div><div class='ctx'> 		ath79_soc = ATH79_SOC_AR7240;</div><div class='ctx'> 		chip = "7240";</div><div class='del'>-		rev = (id &amp; AR724X_REV_ID_REVISION_MASK);</div><div class='add'>+		rev = id &amp; AR724X_REV_ID_REVISION_MASK;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case REV_ID_MAJOR_AR7241:</div><div class='ctx'> 		ath79_soc = ATH79_SOC_AR7241;</div><div class='ctx'> 		chip = "7241";</div><div class='del'>-		rev = (id &amp; AR724X_REV_ID_REVISION_MASK);</div><div class='add'>+		rev = id &amp; AR724X_REV_ID_REVISION_MASK;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case REV_ID_MAJOR_AR7242:</div><div class='ctx'> 		ath79_soc = ATH79_SOC_AR7242;</div><div class='ctx'> 		chip = "7242";</div><div class='del'>-		rev = (id &amp; AR724X_REV_ID_REVISION_MASK);</div><div class='add'>+		rev = id &amp; AR724X_REV_ID_REVISION_MASK;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case REV_ID_MAJOR_AR9330:</div><div class='add'>+		ath79_soc = ATH79_SOC_AR9330;</div><div class='add'>+		chip = "9330";</div><div class='add'>+		rev = id &amp; AR933X_REV_ID_REVISION_MASK;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case REV_ID_MAJOR_AR9331:</div><div class='add'>+		ath79_soc = ATH79_SOC_AR9331;</div><div class='add'>+		chip = "9331";</div><div class='add'>+		rev = id &amp; AR933X_REV_ID_REVISION_MASK;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case REV_ID_MAJOR_AR913X:</div><div class='hunk'>@@ -134,9 +146,11 @@ static void __init ath79_detect_sys_type(void)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		panic("ath79: unknown SoC, id:0x%08x\n", id);</div><div class='add'>+		panic("ath79: unknown SoC, id:0x%08x", id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath79_soc_rev = rev;</div><div class='add'>+</div><div class='ctx'> 	sprintf(ath79_sys_type, "Atheros AR%s rev %u", chip, rev);</div><div class='ctx'> 	pr_info("SoC: %s\n", ath79_sys_type);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c<br/>index 1cfdda03546a..aab6b0c40a75 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/bcm47xx/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm47xx/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/bcm47xx/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/bcm47xx/setup.c</a></div><div class='hunk'>@@ -289,7 +289,7 @@ static void __init bcm47xx_register_ssb(void)</div><div class='ctx'> 	err = ssb_bus_ssbbus_register(&amp;(bcm47xx_bus.ssb), SSB_ENUM_BASE,</div><div class='ctx'> 				      bcm47xx_get_invariants);</div><div class='ctx'> 	if (err)</div><div class='del'>-		panic("Failed to initialize SSB bus (err %d)\n", err);</div><div class='add'>+		panic("Failed to initialize SSB bus (err %d)", err);</div><div class='ctx'> </div><div class='ctx'> 	mcore = &amp;bcm47xx_bus.ssb.mipscore;</div><div class='ctx'> 	if (nvram_getenv("kernel_args", buf, sizeof(buf)) &gt;= 0) {</div><div class='hunk'>@@ -314,7 +314,7 @@ static void __init bcm47xx_register_bcma(void)</div><div class='ctx'> </div><div class='ctx'> 	err = bcma_host_soc_register(&amp;bcm47xx_bus.bcma);</div><div class='ctx'> 	if (err)</div><div class='del'>-		panic("Failed to initialize BCMA bus (err %d)\n", err);</div><div class='add'>+		panic("Failed to initialize BCMA bus (err %d)", err);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/bcm63xx/Kconfig b/arch/mips/bcm63xx/Kconfig<br/>index fb177d6df066..6b1b9ad8d857 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/bcm63xx/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm63xx/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/bcm63xx/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/bcm63xx/Kconfig</a></div><div class='hunk'>@@ -20,6 +20,10 @@ config BCM63XX_CPU_6348</div><div class='ctx'> config BCM63XX_CPU_6358</div><div class='ctx'> 	bool "support 6358 CPU"</div><div class='ctx'> 	select HW_HAS_PCI</div><div class='add'>+</div><div class='add'>+config BCM63XX_CPU_6368</div><div class='add'>+	bool "support 6368 CPU"</div><div class='add'>+	select HW_HAS_PCI</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> source "arch/mips/bcm63xx/boards/Kconfig"</div><div class='head'>diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c<br/>index 40b223b603be..2f1773f3fb7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/bcm63xx/boards/board_bcm963xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm63xx/boards/board_bcm963xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/bcm63xx/boards/board_bcm963xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/bcm63xx/boards/board_bcm963xx.c</a></div><div class='hunk'>@@ -709,15 +709,9 @@ void __init board_prom_init(void)</div><div class='ctx'> 	char cfe_version[32];</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	/* read base address of boot chip select (0)</div><div class='del'>-	 * 6345 does not have MPI but boots from standard</div><div class='del'>-	 * MIPS Flash address */</div><div class='del'>-	if (BCMCPU_IS_6345())</div><div class='del'>-		val = 0x1fc00000;</div><div class='del'>-	else {</div><div class='del'>-		val = bcm_mpi_readl(MPI_CSBASE_REG(0));</div><div class='del'>-		val &amp;= MPI_CSBASE_BASE_MASK;</div><div class='del'>-	}</div><div class='add'>+	/* read base address of boot chip select (0) */</div><div class='add'>+	val = bcm_mpi_readl(MPI_CSBASE_REG(0));</div><div class='add'>+	val &amp;= MPI_CSBASE_BASE_MASK;</div><div class='ctx'> 	boot_addr = (u8 *)KSEG1ADDR(val);</div><div class='ctx'> </div><div class='ctx'> 	/* dump cfe version */</div><div class='hunk'>@@ -797,18 +791,6 @@ void __init board_prom_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bcm_gpio_writel(val, GPIO_MODE_REG);</div><div class='del'>-</div><div class='del'>-	/* Generate MAC address for WLAN and</div><div class='del'>-	 * register our SPROM */</div><div class='del'>-#ifdef CONFIG_SSB_PCIHOST</div><div class='del'>-	if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {</div><div class='del'>-		memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);</div><div class='del'>-		memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);</div><div class='del'>-		if (ssb_arch_register_fallback_sprom(</div><div class='del'>-				&amp;bcm63xx_get_fallback_sprom) &lt; 0)</div><div class='del'>-			printk(KERN_ERR PFX "failed to register fallback SPROM\n");</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -834,10 +816,13 @@ static struct mtd_partition mtd_partitions[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const char *bcm63xx_part_types[] = { "bcm63xxpart", NULL };</div><div class='add'>+</div><div class='ctx'> static struct physmap_flash_data flash_data = {</div><div class='ctx'> 	.width			= 2,</div><div class='ctx'> 	.nr_parts		= ARRAY_SIZE(mtd_partitions),</div><div class='ctx'> 	.parts			= mtd_partitions,</div><div class='add'>+	.part_probe_types	= bcm63xx_part_types,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource mtd_resources[] = {</div><div class='hunk'>@@ -892,13 +877,23 @@ int __init board_register_devices(void)</div><div class='ctx'> 	if (board.has_dsp)</div><div class='ctx'> 		bcm63xx_dsp_register(&amp;board.dsp);</div><div class='ctx'> </div><div class='del'>-	/* read base address of boot chip select (0) */</div><div class='del'>-	if (BCMCPU_IS_6345())</div><div class='del'>-		val = 0x1fc00000;</div><div class='del'>-	else {</div><div class='del'>-		val = bcm_mpi_readl(MPI_CSBASE_REG(0));</div><div class='del'>-		val &amp;= MPI_CSBASE_BASE_MASK;</div><div class='add'>+	/* Generate MAC address for WLAN and register our SPROM,</div><div class='add'>+	 * do this after registering enet devices</div><div class='add'>+	 */</div><div class='add'>+#ifdef CONFIG_SSB_PCIHOST</div><div class='add'>+	if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {</div><div class='add'>+		memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);</div><div class='add'>+		memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);</div><div class='add'>+		if (ssb_arch_register_fallback_sprom(</div><div class='add'>+				&amp;bcm63xx_get_fallback_sprom) &lt; 0)</div><div class='add'>+			pr_err(PFX "failed to register fallback SPROM\n");</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* read base address of boot chip select (0) */</div><div class='add'>+	val = bcm_mpi_readl(MPI_CSBASE_REG(0));</div><div class='add'>+	val &amp;= MPI_CSBASE_BASE_MASK;</div><div class='add'>+</div><div class='ctx'> 	mtd_resources[0].start = val;</div><div class='ctx'> 	mtd_resources[0].end = 0x1FFFFFFF;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/bcm63xx/clk.c b/arch/mips/bcm63xx/clk.c<br/>index 2c68ee9ccee2..9d57c71b7b58 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/bcm63xx/clk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm63xx/clk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/bcm63xx/clk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/bcm63xx/clk.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;bcm63xx_cpu.h&gt;</div><div class='ctx'> #include &lt;bcm63xx_io.h&gt;</div><div class='ctx'> #include &lt;bcm63xx_regs.h&gt;</div><div class='hunk'>@@ -113,6 +114,34 @@ static struct clk clk_ephy = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Ethernet switch clock</div><div class='add'>+ */</div><div class='add'>+static void enetsw_set(struct clk *clk, int enable)</div><div class='add'>+{</div><div class='add'>+	if (!BCMCPU_IS_6368())</div><div class='add'>+		return;</div><div class='add'>+	bcm_hwclock_set(CKCTL_6368_ROBOSW_CLK_EN |</div><div class='add'>+			CKCTL_6368_SWPKT_USB_EN |</div><div class='add'>+			CKCTL_6368_SWPKT_SAR_EN, enable);</div><div class='add'>+	if (enable) {</div><div class='add'>+		u32 val;</div><div class='add'>+</div><div class='add'>+		/* reset switch core afer clock change */</div><div class='add'>+		val = bcm_perf_readl(PERF_SOFTRESET_6368_REG);</div><div class='add'>+		val &amp;= ~SOFTRESET_6368_ENETSW_MASK;</div><div class='add'>+		bcm_perf_writel(val, PERF_SOFTRESET_6368_REG);</div><div class='add'>+		msleep(10);</div><div class='add'>+		val |= SOFTRESET_6368_ENETSW_MASK;</div><div class='add'>+		bcm_perf_writel(val, PERF_SOFTRESET_6368_REG);</div><div class='add'>+		msleep(10);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk clk_enetsw = {</div><div class='add'>+	.set	= enetsw_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * PCM clock</div><div class='ctx'>  */</div><div class='ctx'> static void pcm_set(struct clk *clk, int enable)</div><div class='hunk'>@@ -131,9 +160,10 @@ static struct clk clk_pcm = {</div><div class='ctx'>  */</div><div class='ctx'> static void usbh_set(struct clk *clk, int enable)</div><div class='ctx'> {</div><div class='del'>-	if (!BCMCPU_IS_6348())</div><div class='del'>-		return;</div><div class='del'>-	bcm_hwclock_set(CKCTL_6348_USBH_EN, enable);</div><div class='add'>+	if (BCMCPU_IS_6348())</div><div class='add'>+		bcm_hwclock_set(CKCTL_6348_USBH_EN, enable);</div><div class='add'>+	else if (BCMCPU_IS_6368())</div><div class='add'>+		bcm_hwclock_set(CKCTL_6368_USBH_CLK_EN, enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct clk clk_usbh = {</div><div class='hunk'>@@ -162,6 +192,36 @@ static struct clk clk_spi = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * XTM clock</div><div class='add'>+ */</div><div class='add'>+static void xtm_set(struct clk *clk, int enable)</div><div class='add'>+{</div><div class='add'>+	if (!BCMCPU_IS_6368())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bcm_hwclock_set(CKCTL_6368_SAR_CLK_EN |</div><div class='add'>+			CKCTL_6368_SWPKT_SAR_EN, enable);</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		u32 val;</div><div class='add'>+</div><div class='add'>+		/* reset sar core afer clock change */</div><div class='add'>+		val = bcm_perf_readl(PERF_SOFTRESET_6368_REG);</div><div class='add'>+		val &amp;= ~SOFTRESET_6368_SAR_MASK;</div><div class='add'>+		bcm_perf_writel(val, PERF_SOFTRESET_6368_REG);</div><div class='add'>+		mdelay(1);</div><div class='add'>+		val |= SOFTRESET_6368_SAR_MASK;</div><div class='add'>+		bcm_perf_writel(val, PERF_SOFTRESET_6368_REG);</div><div class='add'>+		mdelay(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct clk clk_xtm = {</div><div class='add'>+	.set	= xtm_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Internal peripheral clock</div><div class='ctx'>  */</div><div class='ctx'> static struct clk clk_periph = {</div><div class='hunk'>@@ -204,12 +264,16 @@ struct clk *clk_get(struct device *dev, const char *id)</div><div class='ctx'> 		return &amp;clk_enet0;</div><div class='ctx'> 	if (!strcmp(id, "enet1"))</div><div class='ctx'> 		return &amp;clk_enet1;</div><div class='add'>+	if (!strcmp(id, "enetsw"))</div><div class='add'>+		return &amp;clk_enetsw;</div><div class='ctx'> 	if (!strcmp(id, "ephy"))</div><div class='ctx'> 		return &amp;clk_ephy;</div><div class='ctx'> 	if (!strcmp(id, "usbh"))</div><div class='ctx'> 		return &amp;clk_usbh;</div><div class='ctx'> 	if (!strcmp(id, "spi"))</div><div class='ctx'> 		return &amp;clk_spi;</div><div class='add'>+	if (!strcmp(id, "xtm"))</div><div class='add'>+		return &amp;clk_xtm;</div><div class='ctx'> 	if (!strcmp(id, "periph"))</div><div class='ctx'> 		return &amp;clk_periph;</div><div class='ctx'> 	if (BCMCPU_IS_6358() &amp;&amp; !strcmp(id, "pcm"))</div><div class='head'>diff --git a/arch/mips/bcm63xx/cpu.c b/arch/mips/bcm63xx/cpu.c<br/>index 7c7e4d4486ce..8f0d6c7725ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/bcm63xx/cpu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm63xx/cpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/bcm63xx/cpu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/bcm63xx/cpu.c</a></div><div class='hunk'>@@ -29,166 +29,47 @@ static u16 bcm63xx_cpu_rev;</div><div class='ctx'> static unsigned int bcm63xx_cpu_freq;</div><div class='ctx'> static unsigned int bcm63xx_memory_size;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * 6338 register sets and irqs</div><div class='del'>- */</div><div class='del'>-static const unsigned long bcm96338_regs_base[] = {</div><div class='del'>-	[RSET_DSL_LMEM]		= BCM_6338_DSL_LMEM_BASE,</div><div class='del'>-	[RSET_PERF]		= BCM_6338_PERF_BASE,</div><div class='del'>-	[RSET_TIMER]		= BCM_6338_TIMER_BASE,</div><div class='del'>-	[RSET_WDT]		= BCM_6338_WDT_BASE,</div><div class='del'>-	[RSET_UART0]		= BCM_6338_UART0_BASE,</div><div class='del'>-	[RSET_UART1]		= BCM_6338_UART1_BASE,</div><div class='del'>-	[RSET_GPIO]		= BCM_6338_GPIO_BASE,</div><div class='del'>-	[RSET_SPI]		= BCM_6338_SPI_BASE,</div><div class='del'>-	[RSET_OHCI0]		= BCM_6338_OHCI0_BASE,</div><div class='del'>-	[RSET_OHCI_PRIV]	= BCM_6338_OHCI_PRIV_BASE,</div><div class='del'>-	[RSET_USBH_PRIV]	= BCM_6338_USBH_PRIV_BASE,</div><div class='del'>-	[RSET_UDC0]		= BCM_6338_UDC0_BASE,</div><div class='del'>-	[RSET_MPI]		= BCM_6338_MPI_BASE,</div><div class='del'>-	[RSET_PCMCIA]		= BCM_6338_PCMCIA_BASE,</div><div class='del'>-	[RSET_SDRAM]		= BCM_6338_SDRAM_BASE,</div><div class='del'>-	[RSET_DSL]		= BCM_6338_DSL_BASE,</div><div class='del'>-	[RSET_ENET0]		= BCM_6338_ENET0_BASE,</div><div class='del'>-	[RSET_ENET1]		= BCM_6338_ENET1_BASE,</div><div class='del'>-	[RSET_ENETDMA]		= BCM_6338_ENETDMA_BASE,</div><div class='del'>-	[RSET_MEMC]		= BCM_6338_MEMC_BASE,</div><div class='del'>-	[RSET_DDR]		= BCM_6338_DDR_BASE,</div><div class='add'>+static const unsigned long bcm6338_regs_base[] = {</div><div class='add'>+	__GEN_CPU_REGS_TABLE(6338)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const int bcm96338_irqs[] = {</div><div class='del'>-	[IRQ_TIMER]		= BCM_6338_TIMER_IRQ,</div><div class='del'>-	[IRQ_UART0]		= BCM_6338_UART0_IRQ,</div><div class='del'>-	[IRQ_DSL]		= BCM_6338_DSL_IRQ,</div><div class='del'>-	[IRQ_ENET0]		= BCM_6338_ENET0_IRQ,</div><div class='del'>-	[IRQ_ENET_PHY]		= BCM_6338_ENET_PHY_IRQ,</div><div class='del'>-	[IRQ_ENET0_RXDMA]	= BCM_6338_ENET0_RXDMA_IRQ,</div><div class='del'>-	[IRQ_ENET0_TXDMA]	= BCM_6338_ENET0_TXDMA_IRQ,</div><div class='add'>+static const int bcm6338_irqs[] = {</div><div class='add'>+	__GEN_CPU_IRQ_TABLE(6338)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * 6345 register sets and irqs</div><div class='del'>- */</div><div class='del'>-static const unsigned long bcm96345_regs_base[] = {</div><div class='del'>-	[RSET_DSL_LMEM]		= BCM_6345_DSL_LMEM_BASE,</div><div class='del'>-	[RSET_PERF]		= BCM_6345_PERF_BASE,</div><div class='del'>-	[RSET_TIMER]		= BCM_6345_TIMER_BASE,</div><div class='del'>-	[RSET_WDT]		= BCM_6345_WDT_BASE,</div><div class='del'>-	[RSET_UART0]		= BCM_6345_UART0_BASE,</div><div class='del'>-	[RSET_UART1]		= BCM_6345_UART1_BASE,</div><div class='del'>-	[RSET_GPIO]		= BCM_6345_GPIO_BASE,</div><div class='del'>-	[RSET_SPI]		= BCM_6345_SPI_BASE,</div><div class='del'>-	[RSET_UDC0]		= BCM_6345_UDC0_BASE,</div><div class='del'>-	[RSET_OHCI0]		= BCM_6345_OHCI0_BASE,</div><div class='del'>-	[RSET_OHCI_PRIV]	= BCM_6345_OHCI_PRIV_BASE,</div><div class='del'>-	[RSET_USBH_PRIV]	= BCM_6345_USBH_PRIV_BASE,</div><div class='del'>-	[RSET_MPI]		= BCM_6345_MPI_BASE,</div><div class='del'>-	[RSET_PCMCIA]		= BCM_6345_PCMCIA_BASE,</div><div class='del'>-	[RSET_DSL]		= BCM_6345_DSL_BASE,</div><div class='del'>-	[RSET_ENET0]		= BCM_6345_ENET0_BASE,</div><div class='del'>-	[RSET_ENET1]		= BCM_6345_ENET1_BASE,</div><div class='del'>-	[RSET_ENETDMA]		= BCM_6345_ENETDMA_BASE,</div><div class='del'>-	[RSET_EHCI0]		= BCM_6345_EHCI0_BASE,</div><div class='del'>-	[RSET_SDRAM]		= BCM_6345_SDRAM_BASE,</div><div class='del'>-	[RSET_MEMC]		= BCM_6345_MEMC_BASE,</div><div class='del'>-	[RSET_DDR]		= BCM_6345_DDR_BASE,</div><div class='add'>+static const unsigned long bcm6345_regs_base[] = {</div><div class='add'>+	__GEN_CPU_REGS_TABLE(6345)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const int bcm96345_irqs[] = {</div><div class='del'>-	[IRQ_TIMER]		= BCM_6345_TIMER_IRQ,</div><div class='del'>-	[IRQ_UART0]		= BCM_6345_UART0_IRQ,</div><div class='del'>-	[IRQ_DSL]		= BCM_6345_DSL_IRQ,</div><div class='del'>-	[IRQ_ENET0]		= BCM_6345_ENET0_IRQ,</div><div class='del'>-	[IRQ_ENET_PHY]		= BCM_6345_ENET_PHY_IRQ,</div><div class='del'>-	[IRQ_ENET0_RXDMA]	= BCM_6345_ENET0_RXDMA_IRQ,</div><div class='del'>-	[IRQ_ENET0_TXDMA]	= BCM_6345_ENET0_TXDMA_IRQ,</div><div class='add'>+static const int bcm6345_irqs[] = {</div><div class='add'>+	__GEN_CPU_IRQ_TABLE(6345)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * 6348 register sets and irqs</div><div class='del'>- */</div><div class='del'>-static const unsigned long bcm96348_regs_base[] = {</div><div class='del'>-	[RSET_DSL_LMEM]		= BCM_6348_DSL_LMEM_BASE,</div><div class='del'>-	[RSET_PERF]		= BCM_6348_PERF_BASE,</div><div class='del'>-	[RSET_TIMER]		= BCM_6348_TIMER_BASE,</div><div class='del'>-	[RSET_WDT]		= BCM_6348_WDT_BASE,</div><div class='del'>-	[RSET_UART0]		= BCM_6348_UART0_BASE,</div><div class='del'>-	[RSET_UART1]		= BCM_6348_UART1_BASE,</div><div class='del'>-	[RSET_GPIO]		= BCM_6348_GPIO_BASE,</div><div class='del'>-	[RSET_SPI]		= BCM_6348_SPI_BASE,</div><div class='del'>-	[RSET_OHCI0]		= BCM_6348_OHCI0_BASE,</div><div class='del'>-	[RSET_OHCI_PRIV]	= BCM_6348_OHCI_PRIV_BASE,</div><div class='del'>-	[RSET_USBH_PRIV]	= BCM_6348_USBH_PRIV_BASE,</div><div class='del'>-	[RSET_MPI]		= BCM_6348_MPI_BASE,</div><div class='del'>-	[RSET_PCMCIA]		= BCM_6348_PCMCIA_BASE,</div><div class='del'>-	[RSET_SDRAM]		= BCM_6348_SDRAM_BASE,</div><div class='del'>-	[RSET_DSL]		= BCM_6348_DSL_BASE,</div><div class='del'>-	[RSET_ENET0]		= BCM_6348_ENET0_BASE,</div><div class='del'>-	[RSET_ENET1]		= BCM_6348_ENET1_BASE,</div><div class='del'>-	[RSET_ENETDMA]		= BCM_6348_ENETDMA_BASE,</div><div class='del'>-	[RSET_MEMC]		= BCM_6348_MEMC_BASE,</div><div class='del'>-	[RSET_DDR]		= BCM_6348_DDR_BASE,</div><div class='add'>+static const unsigned long bcm6348_regs_base[] = {</div><div class='add'>+	__GEN_CPU_REGS_TABLE(6348)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const int bcm96348_irqs[] = {</div><div class='del'>-	[IRQ_TIMER]		= BCM_6348_TIMER_IRQ,</div><div class='del'>-	[IRQ_UART0]		= BCM_6348_UART0_IRQ,</div><div class='del'>-	[IRQ_DSL]		= BCM_6348_DSL_IRQ,</div><div class='del'>-	[IRQ_ENET0]		= BCM_6348_ENET0_IRQ,</div><div class='del'>-	[IRQ_ENET1]		= BCM_6348_ENET1_IRQ,</div><div class='del'>-	[IRQ_ENET_PHY]		= BCM_6348_ENET_PHY_IRQ,</div><div class='del'>-	[IRQ_OHCI0]		= BCM_6348_OHCI0_IRQ,</div><div class='del'>-	[IRQ_PCMCIA]		= BCM_6348_PCMCIA_IRQ,</div><div class='del'>-	[IRQ_ENET0_RXDMA]	= BCM_6348_ENET0_RXDMA_IRQ,</div><div class='del'>-	[IRQ_ENET0_TXDMA]	= BCM_6348_ENET0_TXDMA_IRQ,</div><div class='del'>-	[IRQ_ENET1_RXDMA]	= BCM_6348_ENET1_RXDMA_IRQ,</div><div class='del'>-	[IRQ_ENET1_TXDMA]	= BCM_6348_ENET1_TXDMA_IRQ,</div><div class='del'>-	[IRQ_PCI]		= BCM_6348_PCI_IRQ,</div><div class='add'>+static const int bcm6348_irqs[] = {</div><div class='add'>+	__GEN_CPU_IRQ_TABLE(6348)</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * 6358 register sets and irqs</div><div class='del'>- */</div><div class='del'>-static const unsigned long bcm96358_regs_base[] = {</div><div class='del'>-	[RSET_DSL_LMEM]		= BCM_6358_DSL_LMEM_BASE,</div><div class='del'>-	[RSET_PERF]		= BCM_6358_PERF_BASE,</div><div class='del'>-	[RSET_TIMER]		= BCM_6358_TIMER_BASE,</div><div class='del'>-	[RSET_WDT]		= BCM_6358_WDT_BASE,</div><div class='del'>-	[RSET_UART0]		= BCM_6358_UART0_BASE,</div><div class='del'>-	[RSET_UART1]		= BCM_6358_UART1_BASE,</div><div class='del'>-	[RSET_GPIO]		= BCM_6358_GPIO_BASE,</div><div class='del'>-	[RSET_SPI]		= BCM_6358_SPI_BASE,</div><div class='del'>-	[RSET_OHCI0]		= BCM_6358_OHCI0_BASE,</div><div class='del'>-	[RSET_EHCI0]		= BCM_6358_EHCI0_BASE,</div><div class='del'>-	[RSET_OHCI_PRIV]	= BCM_6358_OHCI_PRIV_BASE,</div><div class='del'>-	[RSET_USBH_PRIV]	= BCM_6358_USBH_PRIV_BASE,</div><div class='del'>-	[RSET_MPI]		= BCM_6358_MPI_BASE,</div><div class='del'>-	[RSET_PCMCIA]		= BCM_6358_PCMCIA_BASE,</div><div class='del'>-	[RSET_SDRAM]		= BCM_6358_SDRAM_BASE,</div><div class='del'>-	[RSET_DSL]		= BCM_6358_DSL_BASE,</div><div class='del'>-	[RSET_ENET0]		= BCM_6358_ENET0_BASE,</div><div class='del'>-	[RSET_ENET1]		= BCM_6358_ENET1_BASE,</div><div class='del'>-	[RSET_ENETDMA]		= BCM_6358_ENETDMA_BASE,</div><div class='del'>-	[RSET_MEMC]		= BCM_6358_MEMC_BASE,</div><div class='del'>-	[RSET_DDR]		= BCM_6358_DDR_BASE,</div><div class='add'>+static const unsigned long bcm6358_regs_base[] = {</div><div class='add'>+	__GEN_CPU_REGS_TABLE(6358)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const int bcm6358_irqs[] = {</div><div class='add'>+	__GEN_CPU_IRQ_TABLE(6358)</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const int bcm96358_irqs[] = {</div><div class='del'>-	[IRQ_TIMER]		= BCM_6358_TIMER_IRQ,</div><div class='del'>-	[IRQ_UART0]		= BCM_6358_UART0_IRQ,</div><div class='del'>-	[IRQ_UART1]		= BCM_6358_UART1_IRQ,</div><div class='del'>-	[IRQ_DSL]		= BCM_6358_DSL_IRQ,</div><div class='del'>-	[IRQ_ENET0]		= BCM_6358_ENET0_IRQ,</div><div class='del'>-	[IRQ_ENET1]		= BCM_6358_ENET1_IRQ,</div><div class='del'>-	[IRQ_ENET_PHY]		= BCM_6358_ENET_PHY_IRQ,</div><div class='del'>-	[IRQ_OHCI0]		= BCM_6358_OHCI0_IRQ,</div><div class='del'>-	[IRQ_EHCI0]		= BCM_6358_EHCI0_IRQ,</div><div class='del'>-	[IRQ_PCMCIA]		= BCM_6358_PCMCIA_IRQ,</div><div class='del'>-	[IRQ_ENET0_RXDMA]	= BCM_6358_ENET0_RXDMA_IRQ,</div><div class='del'>-	[IRQ_ENET0_TXDMA]	= BCM_6358_ENET0_TXDMA_IRQ,</div><div class='del'>-	[IRQ_ENET1_RXDMA]	= BCM_6358_ENET1_RXDMA_IRQ,</div><div class='del'>-	[IRQ_ENET1_TXDMA]	= BCM_6358_ENET1_TXDMA_IRQ,</div><div class='del'>-	[IRQ_PCI]		= BCM_6358_PCI_IRQ,</div><div class='add'>+static const unsigned long bcm6368_regs_base[] = {</div><div class='add'>+	__GEN_CPU_REGS_TABLE(6368)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const int bcm6368_irqs[] = {</div><div class='add'>+	__GEN_CPU_IRQ_TABLE(6368)</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> u16 __bcm63xx_get_cpu_id(void)</div><div class='hunk'>@@ -217,20 +98,19 @@ unsigned int bcm63xx_get_memory_size(void)</div><div class='ctx'> </div><div class='ctx'> static unsigned int detect_cpu_clock(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned int tmp, n1 = 0, n2 = 0, m1 = 0;</div><div class='del'>-</div><div class='del'>-	/* BCM6338 has a fixed 240 Mhz frequency */</div><div class='del'>-	if (BCMCPU_IS_6338())</div><div class='add'>+	switch (bcm63xx_get_cpu_id()) {</div><div class='add'>+	case BCM6338_CPU_ID:</div><div class='add'>+		/* BCM6338 has a fixed 240 Mhz frequency */</div><div class='ctx'> 		return 240000000;</div><div class='ctx'> </div><div class='del'>-	/* BCM6345 has a fixed 140Mhz frequency */</div><div class='del'>-	if (BCMCPU_IS_6345())</div><div class='add'>+	case BCM6345_CPU_ID:</div><div class='add'>+		/* BCM6345 has a fixed 140Mhz frequency */</div><div class='ctx'> 		return 140000000;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * frequency depends on PLL configuration:</div><div class='del'>-	 */</div><div class='del'>-	if (BCMCPU_IS_6348()) {</div><div class='add'>+	case BCM6348_CPU_ID:</div><div class='add'>+	{</div><div class='add'>+		unsigned int tmp, n1, n2, m1;</div><div class='add'>+</div><div class='ctx'> 		/* 16MHz * (N1 + 1) * (N2 + 2) / (M1_CPU + 1) */</div><div class='ctx'> 		tmp = bcm_perf_readl(PERF_MIPSPLLCTL_REG);</div><div class='ctx'> 		n1 = (tmp &amp; MIPSPLLCTL_N1_MASK) &gt;&gt; MIPSPLLCTL_N1_SHIFT;</div><div class='hunk'>@@ -239,17 +119,47 @@ static unsigned int detect_cpu_clock(void)</div><div class='ctx'> 		n1 += 1;</div><div class='ctx'> 		n2 += 2;</div><div class='ctx'> 		m1 += 1;</div><div class='add'>+		return (16 * 1000000 * n1 * n2) / m1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (BCMCPU_IS_6358()) {</div><div class='add'>+	case BCM6358_CPU_ID:</div><div class='add'>+	{</div><div class='add'>+		unsigned int tmp, n1, n2, m1;</div><div class='add'>+</div><div class='ctx'> 		/* 16MHz * N1 * N2 / M1_CPU */</div><div class='ctx'> 		tmp = bcm_ddr_readl(DDR_DMIPSPLLCFG_REG);</div><div class='ctx'> 		n1 = (tmp &amp; DMIPSPLLCFG_N1_MASK) &gt;&gt; DMIPSPLLCFG_N1_SHIFT;</div><div class='ctx'> 		n2 = (tmp &amp; DMIPSPLLCFG_N2_MASK) &gt;&gt; DMIPSPLLCFG_N2_SHIFT;</div><div class='ctx'> 		m1 = (tmp &amp; DMIPSPLLCFG_M1_MASK) &gt;&gt; DMIPSPLLCFG_M1_SHIFT;</div><div class='add'>+		return (16 * 1000000 * n1 * n2) / m1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return (16 * 1000000 * n1 * n2) / m1;</div><div class='add'>+	case BCM6368_CPU_ID:</div><div class='add'>+	{</div><div class='add'>+		unsigned int tmp, p1, p2, ndiv, m1;</div><div class='add'>+</div><div class='add'>+		/* (64MHz / P1) * P2 * NDIV / M1_CPU */</div><div class='add'>+		tmp = bcm_ddr_readl(DDR_DMIPSPLLCFG_6368_REG);</div><div class='add'>+</div><div class='add'>+		p1 = (tmp &amp; DMIPSPLLCFG_6368_P1_MASK) &gt;&gt;</div><div class='add'>+			DMIPSPLLCFG_6368_P1_SHIFT;</div><div class='add'>+</div><div class='add'>+		p2 = (tmp &amp; DMIPSPLLCFG_6368_P2_MASK) &gt;&gt;</div><div class='add'>+			DMIPSPLLCFG_6368_P2_SHIFT;</div><div class='add'>+</div><div class='add'>+		ndiv = (tmp &amp; DMIPSPLLCFG_6368_NDIV_MASK) &gt;&gt;</div><div class='add'>+			DMIPSPLLCFG_6368_NDIV_SHIFT;</div><div class='add'>+</div><div class='add'>+		tmp = bcm_ddr_readl(DDR_DMIPSPLLDIV_6368_REG);</div><div class='add'>+		m1 = (tmp &amp; DMIPSPLLDIV_6368_MDIV_MASK) &gt;&gt;</div><div class='add'>+			DMIPSPLLDIV_6368_MDIV_SHIFT;</div><div class='add'>+</div><div class='add'>+		return (((64 * 1000000) / p1) * p2 * ndiv) / m1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -260,8 +170,10 @@ static unsigned int detect_memory_size(void)</div><div class='ctx'> 	unsigned int cols = 0, rows = 0, is_32bits = 0, banks = 0;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	if (BCMCPU_IS_6345())</div><div class='del'>-		return (8 * 1024 * 1024);</div><div class='add'>+	if (BCMCPU_IS_6345()) {</div><div class='add'>+		val = bcm_sdram_readl(SDRAM_MBASE_REG);</div><div class='add'>+		return (val * 8 * 1024 * 1024);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (BCMCPU_IS_6338() || BCMCPU_IS_6348()) {</div><div class='ctx'> 		val = bcm_sdram_readl(SDRAM_CFG_REG);</div><div class='hunk'>@@ -271,7 +183,7 @@ static unsigned int detect_memory_size(void)</div><div class='ctx'> 		banks = (val &amp; SDRAM_CFG_BANK_MASK) ? 2 : 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (BCMCPU_IS_6358()) {</div><div class='add'>+	if (BCMCPU_IS_6358() || BCMCPU_IS_6368()) {</div><div class='ctx'> 		val = bcm_memc_readl(MEMC_CFG_REG);</div><div class='ctx'> 		rows = (val &amp; MEMC_CFG_ROW_MASK) &gt;&gt; MEMC_CFG_ROW_SHIFT;</div><div class='ctx'> 		cols = (val &amp; MEMC_CFG_COL_MASK) &gt;&gt; MEMC_CFG_COL_SHIFT;</div><div class='hunk'>@@ -301,24 +213,33 @@ void __init bcm63xx_cpu_init(void)</div><div class='ctx'> 	case CPU_BMIPS3300:</div><div class='ctx'> 		if ((read_c0_prid() &amp; 0xff00) == PRID_IMP_BMIPS3300_ALT) {</div><div class='ctx'> 			expected_cpu_id = BCM6348_CPU_ID;</div><div class='del'>-			bcm63xx_regs_base = bcm96348_regs_base;</div><div class='del'>-			bcm63xx_irqs = bcm96348_irqs;</div><div class='add'>+			bcm63xx_regs_base = bcm6348_regs_base;</div><div class='add'>+			bcm63xx_irqs = bcm6348_irqs;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			__cpu_name[cpu] = "Broadcom BCM6338";</div><div class='ctx'> 			expected_cpu_id = BCM6338_CPU_ID;</div><div class='del'>-			bcm63xx_regs_base = bcm96338_regs_base;</div><div class='del'>-			bcm63xx_irqs = bcm96338_irqs;</div><div class='add'>+			bcm63xx_regs_base = bcm6338_regs_base;</div><div class='add'>+			bcm63xx_irqs = bcm6338_irqs;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPU_BMIPS32:</div><div class='ctx'> 		expected_cpu_id = BCM6345_CPU_ID;</div><div class='del'>-		bcm63xx_regs_base = bcm96345_regs_base;</div><div class='del'>-		bcm63xx_irqs = bcm96345_irqs;</div><div class='add'>+		bcm63xx_regs_base = bcm6345_regs_base;</div><div class='add'>+		bcm63xx_irqs = bcm6345_irqs;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPU_BMIPS4350:</div><div class='del'>-		expected_cpu_id = BCM6358_CPU_ID;</div><div class='del'>-		bcm63xx_regs_base = bcm96358_regs_base;</div><div class='del'>-		bcm63xx_irqs = bcm96358_irqs;</div><div class='add'>+		switch (read_c0_prid() &amp; 0xf0) {</div><div class='add'>+		case 0x10:</div><div class='add'>+			expected_cpu_id = BCM6358_CPU_ID;</div><div class='add'>+			bcm63xx_regs_base = bcm6358_regs_base;</div><div class='add'>+			bcm63xx_irqs = bcm6358_irqs;</div><div class='add'>+			break;</div><div class='add'>+		case 0x30:</div><div class='add'>+			expected_cpu_id = BCM6368_CPU_ID;</div><div class='add'>+			bcm63xx_regs_base = bcm6368_regs_base;</div><div class='add'>+			bcm63xx_irqs = bcm6368_irqs;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/bcm63xx/dev-uart.c b/arch/mips/bcm63xx/dev-uart.c<br/>index c2963da0253e..d6e42c608325 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/bcm63xx/dev-uart.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm63xx/dev-uart.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/bcm63xx/dev-uart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/bcm63xx/dev-uart.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@ int __init bcm63xx_uart_register(unsigned int id)</div><div class='ctx'> 	if (id &gt;= ARRAY_SIZE(bcm63xx_uart_devices))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (id == 1 &amp;&amp; !BCMCPU_IS_6358())</div><div class='add'>+	if (id == 1 &amp;&amp; (!BCMCPU_IS_6358() &amp;&amp; !BCMCPU_IS_6368()))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (id == 0) {</div><div class='head'>diff --git a/arch/mips/bcm63xx/gpio.c b/arch/mips/bcm63xx/gpio.c<br/>index f560fe7d38dd..a6c2135dbf38 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/bcm63xx/gpio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm63xx/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/bcm63xx/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/bcm63xx/gpio.c</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2008 Maxime Bizon &lt;mbizon@freebox.fr&gt;</div><div class='del'>- * Copyright (C) 2008 Florian Fainelli &lt;florian@openwrt.org&gt;</div><div class='add'>+ * Copyright (C) 2008-2011 Florian Fainelli &lt;florian@openwrt.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -18,6 +18,34 @@</div><div class='ctx'> #include &lt;bcm63xx_io.h&gt;</div><div class='ctx'> #include &lt;bcm63xx_regs.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifndef BCMCPU_RUNTIME_DETECT</div><div class='add'>+#define gpio_out_low_reg	GPIO_DATA_LO_REG</div><div class='add'>+#ifdef CONFIG_BCM63XX_CPU_6345</div><div class='add'>+#ifdef gpio_out_low_reg</div><div class='add'>+#undef gpio_out_low_reg</div><div class='add'>+#define gpio_out_low_reg	GPIO_DATA_LO_REG_6345</div><div class='add'>+#endif /* gpio_out_low_reg */</div><div class='add'>+#endif /* CONFIG_BCM63XX_CPU_6345 */</div><div class='add'>+</div><div class='add'>+static inline void bcm63xx_gpio_out_low_reg_init(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#else /* ! BCMCPU_RUNTIME_DETECT */</div><div class='add'>+static u32 gpio_out_low_reg;</div><div class='add'>+</div><div class='add'>+static void bcm63xx_gpio_out_low_reg_init(void)</div><div class='add'>+{</div><div class='add'>+	switch (bcm63xx_get_cpu_id()) {</div><div class='add'>+	case BCM6345_CPU_ID:</div><div class='add'>+		gpio_out_low_reg = GPIO_DATA_LO_REG_6345;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		gpio_out_low_reg = GPIO_DATA_LO_REG;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif /* ! BCMCPU_RUNTIME_DETECT */</div><div class='add'>+</div><div class='ctx'> static DEFINE_SPINLOCK(bcm63xx_gpio_lock);</div><div class='ctx'> static u32 gpio_out_low, gpio_out_high;</div><div class='ctx'> </div><div class='hunk'>@@ -33,7 +61,7 @@ static void bcm63xx_gpio_set(struct gpio_chip *chip,</div><div class='ctx'> 		BUG();</div><div class='ctx'> </div><div class='ctx'> 	if (gpio &lt; 32) {</div><div class='del'>-		reg = GPIO_DATA_LO_REG;</div><div class='add'>+		reg = gpio_out_low_reg;</div><div class='ctx'> 		mask = 1 &lt;&lt; gpio;</div><div class='ctx'> 		v = &amp;gpio_out_low;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -60,7 +88,7 @@ static int bcm63xx_gpio_get(struct gpio_chip *chip, unsigned gpio)</div><div class='ctx'> 		BUG();</div><div class='ctx'> </div><div class='ctx'> 	if (gpio &lt; 32) {</div><div class='del'>-		reg = GPIO_DATA_LO_REG;</div><div class='add'>+		reg = gpio_out_low_reg;</div><div class='ctx'> 		mask = 1 &lt;&lt; gpio;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		reg = GPIO_DATA_HI_REG;</div><div class='hunk'>@@ -125,8 +153,11 @@ static struct gpio_chip bcm63xx_gpio_chip = {</div><div class='ctx'> </div><div class='ctx'> int __init bcm63xx_gpio_init(void)</div><div class='ctx'> {</div><div class='del'>-	gpio_out_low = bcm_gpio_readl(GPIO_DATA_LO_REG);</div><div class='del'>-	gpio_out_high = bcm_gpio_readl(GPIO_DATA_HI_REG);</div><div class='add'>+	bcm63xx_gpio_out_low_reg_init();</div><div class='add'>+</div><div class='add'>+	gpio_out_low = bcm_gpio_readl(gpio_out_low_reg);</div><div class='add'>+	if (!BCMCPU_IS_6345())</div><div class='add'>+		gpio_out_high = bcm_gpio_readl(GPIO_DATA_HI_REG);</div><div class='ctx'> 	bcm63xx_gpio_chip.ngpio = bcm63xx_gpio_count();</div><div class='ctx'> 	pr_info("registering %d GPIOs\n", bcm63xx_gpio_chip.ngpio);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/bcm63xx/irq.c b/arch/mips/bcm63xx/irq.c<br/>index 162e11b4ed75..9a216a451d92 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/bcm63xx/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm63xx/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/bcm63xx/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/bcm63xx/irq.c</a></div><div class='hunk'>@@ -19,19 +19,187 @@</div><div class='ctx'> #include &lt;bcm63xx_io.h&gt;</div><div class='ctx'> #include &lt;bcm63xx_irq.h&gt;</div><div class='ctx'> </div><div class='add'>+static void __dispatch_internal(void) __maybe_unused;</div><div class='add'>+static void __dispatch_internal_64(void) __maybe_unused;</div><div class='add'>+static void __internal_irq_mask_32(unsigned int irq) __maybe_unused;</div><div class='add'>+static void __internal_irq_mask_64(unsigned int irq) __maybe_unused;</div><div class='add'>+static void __internal_irq_unmask_32(unsigned int irq) __maybe_unused;</div><div class='add'>+static void __internal_irq_unmask_64(unsigned int irq) __maybe_unused;</div><div class='add'>+</div><div class='add'>+#ifndef BCMCPU_RUNTIME_DETECT</div><div class='add'>+#ifdef CONFIG_BCM63XX_CPU_6338</div><div class='add'>+#define irq_stat_reg		PERF_IRQSTAT_6338_REG</div><div class='add'>+#define irq_mask_reg		PERF_IRQMASK_6338_REG</div><div class='add'>+#define irq_bits		32</div><div class='add'>+#define is_ext_irq_cascaded	0</div><div class='add'>+#define ext_irq_start		0</div><div class='add'>+#define ext_irq_end		0</div><div class='add'>+#define ext_irq_count		4</div><div class='add'>+#define ext_irq_cfg_reg1	PERF_EXTIRQ_CFG_REG_6338</div><div class='add'>+#define ext_irq_cfg_reg2	0</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_BCM63XX_CPU_6345</div><div class='add'>+#define irq_stat_reg		PERF_IRQSTAT_6345_REG</div><div class='add'>+#define irq_mask_reg		PERF_IRQMASK_6345_REG</div><div class='add'>+#define irq_bits		32</div><div class='add'>+#define is_ext_irq_cascaded	0</div><div class='add'>+#define ext_irq_start		0</div><div class='add'>+#define ext_irq_end		0</div><div class='add'>+#define ext_irq_count		0</div><div class='add'>+#define ext_irq_cfg_reg1	0</div><div class='add'>+#define ext_irq_cfg_reg2	0</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_BCM63XX_CPU_6348</div><div class='add'>+#define irq_stat_reg		PERF_IRQSTAT_6348_REG</div><div class='add'>+#define irq_mask_reg		PERF_IRQMASK_6348_REG</div><div class='add'>+#define irq_bits		32</div><div class='add'>+#define is_ext_irq_cascaded	0</div><div class='add'>+#define ext_irq_start		0</div><div class='add'>+#define ext_irq_end		0</div><div class='add'>+#define ext_irq_count		4</div><div class='add'>+#define ext_irq_cfg_reg1	PERF_EXTIRQ_CFG_REG_6348</div><div class='add'>+#define ext_irq_cfg_reg2	0</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_BCM63XX_CPU_6358</div><div class='add'>+#define irq_stat_reg		PERF_IRQSTAT_6358_REG</div><div class='add'>+#define irq_mask_reg		PERF_IRQMASK_6358_REG</div><div class='add'>+#define irq_bits		32</div><div class='add'>+#define is_ext_irq_cascaded	1</div><div class='add'>+#define ext_irq_start		(BCM_6358_EXT_IRQ0 - IRQ_INTERNAL_BASE)</div><div class='add'>+#define ext_irq_end		(BCM_6358_EXT_IRQ3 - IRQ_INTERNAL_BASE)</div><div class='add'>+#define ext_irq_count		4</div><div class='add'>+#define ext_irq_cfg_reg1	PERF_EXTIRQ_CFG_REG_6358</div><div class='add'>+#define ext_irq_cfg_reg2	0</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_BCM63XX_CPU_6368</div><div class='add'>+#define irq_stat_reg		PERF_IRQSTAT_6368_REG</div><div class='add'>+#define irq_mask_reg		PERF_IRQMASK_6368_REG</div><div class='add'>+#define irq_bits		64</div><div class='add'>+#define is_ext_irq_cascaded	1</div><div class='add'>+#define ext_irq_start		(BCM_6368_EXT_IRQ0 - IRQ_INTERNAL_BASE)</div><div class='add'>+#define ext_irq_end		(BCM_6368_EXT_IRQ5 - IRQ_INTERNAL_BASE)</div><div class='add'>+#define ext_irq_count		6</div><div class='add'>+#define ext_irq_cfg_reg1	PERF_EXTIRQ_CFG_REG_6368</div><div class='add'>+#define ext_irq_cfg_reg2	PERF_EXTIRQ_CFG_REG2_6368</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if irq_bits == 32</div><div class='add'>+#define dispatch_internal			__dispatch_internal</div><div class='add'>+#define internal_irq_mask			__internal_irq_mask_32</div><div class='add'>+#define internal_irq_unmask			__internal_irq_unmask_32</div><div class='add'>+#else</div><div class='add'>+#define dispatch_internal			__dispatch_internal_64</div><div class='add'>+#define internal_irq_mask			__internal_irq_mask_64</div><div class='add'>+#define internal_irq_unmask			__internal_irq_unmask_64</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define irq_stat_addr	(bcm63xx_regset_address(RSET_PERF) + irq_stat_reg)</div><div class='add'>+#define irq_mask_addr	(bcm63xx_regset_address(RSET_PERF) + irq_mask_reg)</div><div class='add'>+</div><div class='add'>+static inline void bcm63xx_init_irq(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#else /* ! BCMCPU_RUNTIME_DETECT */</div><div class='add'>+</div><div class='add'>+static u32 irq_stat_addr, irq_mask_addr;</div><div class='add'>+static void (*dispatch_internal)(void);</div><div class='add'>+static int is_ext_irq_cascaded;</div><div class='add'>+static unsigned int ext_irq_count;</div><div class='add'>+static unsigned int ext_irq_start, ext_irq_end;</div><div class='add'>+static unsigned int ext_irq_cfg_reg1, ext_irq_cfg_reg2;</div><div class='add'>+static void (*internal_irq_mask)(unsigned int irq);</div><div class='add'>+static void (*internal_irq_unmask)(unsigned int irq);</div><div class='add'>+</div><div class='add'>+static void bcm63xx_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	int irq_bits;</div><div class='add'>+</div><div class='add'>+	irq_stat_addr = bcm63xx_regset_address(RSET_PERF);</div><div class='add'>+	irq_mask_addr = bcm63xx_regset_address(RSET_PERF);</div><div class='add'>+</div><div class='add'>+	switch (bcm63xx_get_cpu_id()) {</div><div class='add'>+	case BCM6338_CPU_ID:</div><div class='add'>+		irq_stat_addr += PERF_IRQSTAT_6338_REG;</div><div class='add'>+		irq_mask_addr += PERF_IRQMASK_6338_REG;</div><div class='add'>+		irq_bits = 32;</div><div class='add'>+		break;</div><div class='add'>+	case BCM6345_CPU_ID:</div><div class='add'>+		irq_stat_addr += PERF_IRQSTAT_6345_REG;</div><div class='add'>+		irq_mask_addr += PERF_IRQMASK_6345_REG;</div><div class='add'>+		irq_bits = 32;</div><div class='add'>+		break;</div><div class='add'>+	case BCM6348_CPU_ID:</div><div class='add'>+		irq_stat_addr += PERF_IRQSTAT_6348_REG;</div><div class='add'>+		irq_mask_addr += PERF_IRQMASK_6348_REG;</div><div class='add'>+		irq_bits = 32;</div><div class='add'>+		ext_irq_count = 4;</div><div class='add'>+		ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6348;</div><div class='add'>+		break;</div><div class='add'>+	case BCM6358_CPU_ID:</div><div class='add'>+		irq_stat_addr += PERF_IRQSTAT_6358_REG;</div><div class='add'>+		irq_mask_addr += PERF_IRQMASK_6358_REG;</div><div class='add'>+		irq_bits = 32;</div><div class='add'>+		ext_irq_count = 4;</div><div class='add'>+		is_ext_irq_cascaded = 1;</div><div class='add'>+		ext_irq_start = BCM_6358_EXT_IRQ0 - IRQ_INTERNAL_BASE;</div><div class='add'>+		ext_irq_end = BCM_6358_EXT_IRQ3 - IRQ_INTERNAL_BASE;</div><div class='add'>+		ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6358;</div><div class='add'>+		break;</div><div class='add'>+	case BCM6368_CPU_ID:</div><div class='add'>+		irq_stat_addr += PERF_IRQSTAT_6368_REG;</div><div class='add'>+		irq_mask_addr += PERF_IRQMASK_6368_REG;</div><div class='add'>+		irq_bits = 64;</div><div class='add'>+		ext_irq_count = 6;</div><div class='add'>+		is_ext_irq_cascaded = 1;</div><div class='add'>+		ext_irq_start = BCM_6368_EXT_IRQ0 - IRQ_INTERNAL_BASE;</div><div class='add'>+		ext_irq_end = BCM_6368_EXT_IRQ5 - IRQ_INTERNAL_BASE;</div><div class='add'>+		ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6368;</div><div class='add'>+		ext_irq_cfg_reg2 = PERF_EXTIRQ_CFG_REG2_6368;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (irq_bits == 32) {</div><div class='add'>+		dispatch_internal = __dispatch_internal;</div><div class='add'>+		internal_irq_mask = __internal_irq_mask_32;</div><div class='add'>+		internal_irq_unmask = __internal_irq_unmask_32;</div><div class='add'>+	} else {</div><div class='add'>+		dispatch_internal = __dispatch_internal_64;</div><div class='add'>+		internal_irq_mask = __internal_irq_mask_64;</div><div class='add'>+		internal_irq_unmask = __internal_irq_unmask_64;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif /* ! BCMCPU_RUNTIME_DETECT */</div><div class='add'>+</div><div class='add'>+static inline u32 get_ext_irq_perf_reg(int irq)</div><div class='add'>+{</div><div class='add'>+	if (irq &lt; 4)</div><div class='add'>+		return ext_irq_cfg_reg1;</div><div class='add'>+	return ext_irq_cfg_reg2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void handle_internal(int intbit)</div><div class='add'>+{</div><div class='add'>+	if (is_ext_irq_cascaded &amp;&amp;</div><div class='add'>+	    intbit &gt;= ext_irq_start &amp;&amp; intbit &lt;= ext_irq_end)</div><div class='add'>+		do_IRQ(intbit - ext_irq_start + IRQ_EXTERNAL_BASE);</div><div class='add'>+	else</div><div class='add'>+		do_IRQ(intbit + IRQ_INTERNAL_BASE);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * dispatch internal devices IRQ (uart, enet, watchdog, ...). do not</div><div class='ctx'>  * prioritize any interrupt relatively to another. the static counter</div><div class='ctx'>  * will resume the loop where it ended the last time we left this</div><div class='ctx'>  * function.</div><div class='ctx'>  */</div><div class='del'>-static void bcm63xx_irq_dispatch_internal(void)</div><div class='add'>+static void __dispatch_internal(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 pending;</div><div class='ctx'> 	static int i;</div><div class='ctx'> </div><div class='del'>-	pending = bcm_perf_readl(PERF_IRQMASK_REG) &amp;</div><div class='del'>-		bcm_perf_readl(PERF_IRQSTAT_REG);</div><div class='add'>+	pending = bcm_readl(irq_stat_addr) &amp; bcm_readl(irq_mask_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (!pending)</div><div class='ctx'> 		return ;</div><div class='hunk'>@@ -41,7 +209,28 @@ static void bcm63xx_irq_dispatch_internal(void)</div><div class='ctx'> </div><div class='ctx'> 		i = (i + 1) &amp; 0x1f;</div><div class='ctx'> 		if (pending &amp; (1 &lt;&lt; to_call)) {</div><div class='del'>-			do_IRQ(to_call + IRQ_INTERNAL_BASE);</div><div class='add'>+			handle_internal(to_call);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __dispatch_internal_64(void)</div><div class='add'>+{</div><div class='add'>+	u64 pending;</div><div class='add'>+	static int i;</div><div class='add'>+</div><div class='add'>+	pending = bcm_readq(irq_stat_addr) &amp; bcm_readq(irq_mask_addr);</div><div class='add'>+</div><div class='add'>+	if (!pending)</div><div class='add'>+		return ;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		int to_call = i;</div><div class='add'>+</div><div class='add'>+		i = (i + 1) &amp; 0x3f;</div><div class='add'>+		if (pending &amp; (1ull &lt;&lt; to_call)) {</div><div class='add'>+			handle_internal(to_call);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -60,15 +249,17 @@ asmlinkage void plat_irq_dispatch(void)</div><div class='ctx'> 		if (cause &amp; CAUSEF_IP7)</div><div class='ctx'> 			do_IRQ(7);</div><div class='ctx'> 		if (cause &amp; CAUSEF_IP2)</div><div class='del'>-			bcm63xx_irq_dispatch_internal();</div><div class='del'>-		if (cause &amp; CAUSEF_IP3)</div><div class='del'>-			do_IRQ(IRQ_EXT_0);</div><div class='del'>-		if (cause &amp; CAUSEF_IP4)</div><div class='del'>-			do_IRQ(IRQ_EXT_1);</div><div class='del'>-		if (cause &amp; CAUSEF_IP5)</div><div class='del'>-			do_IRQ(IRQ_EXT_2);</div><div class='del'>-		if (cause &amp; CAUSEF_IP6)</div><div class='del'>-			do_IRQ(IRQ_EXT_3);</div><div class='add'>+			dispatch_internal();</div><div class='add'>+		if (!is_ext_irq_cascaded) {</div><div class='add'>+			if (cause &amp; CAUSEF_IP3)</div><div class='add'>+				do_IRQ(IRQ_EXT_0);</div><div class='add'>+			if (cause &amp; CAUSEF_IP4)</div><div class='add'>+				do_IRQ(IRQ_EXT_1);</div><div class='add'>+			if (cause &amp; CAUSEF_IP5)</div><div class='add'>+				do_IRQ(IRQ_EXT_2);</div><div class='add'>+			if (cause &amp; CAUSEF_IP6)</div><div class='add'>+				do_IRQ(IRQ_EXT_3);</div><div class='add'>+		}</div><div class='ctx'> 	} while (1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -76,24 +267,50 @@ asmlinkage void plat_irq_dispatch(void)</div><div class='ctx'>  * internal IRQs operations: only mask/unmask on PERF irq mask</div><div class='ctx'>  * register.</div><div class='ctx'>  */</div><div class='del'>-static inline void bcm63xx_internal_irq_mask(struct irq_data *d)</div><div class='add'>+static void __internal_irq_mask_32(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	unsigned int irq = d-&gt;irq - IRQ_INTERNAL_BASE;</div><div class='ctx'> 	u32 mask;</div><div class='ctx'> </div><div class='del'>-	mask = bcm_perf_readl(PERF_IRQMASK_REG);</div><div class='add'>+	mask = bcm_readl(irq_mask_addr);</div><div class='ctx'> 	mask &amp;= ~(1 &lt;&lt; irq);</div><div class='del'>-	bcm_perf_writel(mask, PERF_IRQMASK_REG);</div><div class='add'>+	bcm_writel(mask, irq_mask_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcm63xx_internal_irq_unmask(struct irq_data *d)</div><div class='add'>+static void __internal_irq_mask_64(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	u64 mask;</div><div class='add'>+</div><div class='add'>+	mask = bcm_readq(irq_mask_addr);</div><div class='add'>+	mask &amp;= ~(1ull &lt;&lt; irq);</div><div class='add'>+	bcm_writeq(mask, irq_mask_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __internal_irq_unmask_32(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	unsigned int irq = d-&gt;irq - IRQ_INTERNAL_BASE;</div><div class='ctx'> 	u32 mask;</div><div class='ctx'> </div><div class='del'>-	mask = bcm_perf_readl(PERF_IRQMASK_REG);</div><div class='add'>+	mask = bcm_readl(irq_mask_addr);</div><div class='ctx'> 	mask |= (1 &lt;&lt; irq);</div><div class='del'>-	bcm_perf_writel(mask, PERF_IRQMASK_REG);</div><div class='add'>+	bcm_writel(mask, irq_mask_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __internal_irq_unmask_64(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	u64 mask;</div><div class='add'>+</div><div class='add'>+	mask = bcm_readq(irq_mask_addr);</div><div class='add'>+	mask |= (1ull &lt;&lt; irq);</div><div class='add'>+	bcm_writeq(mask, irq_mask_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm63xx_internal_irq_mask(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	internal_irq_mask(d-&gt;irq - IRQ_INTERNAL_BASE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm63xx_internal_irq_unmask(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	internal_irq_unmask(d-&gt;irq - IRQ_INTERNAL_BASE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -102,94 +319,131 @@ static void bcm63xx_internal_irq_unmask(struct irq_data *d)</div><div class='ctx'>  */</div><div class='ctx'> static void bcm63xx_external_irq_mask(struct irq_data *d)</div><div class='ctx'> {</div><div class='del'>-	unsigned int irq = d-&gt;irq - IRQ_EXT_BASE;</div><div class='del'>-	u32 reg;</div><div class='add'>+	unsigned int irq = d-&gt;irq - IRQ_EXTERNAL_BASE;</div><div class='add'>+	u32 reg, regaddr;</div><div class='ctx'> </div><div class='del'>-	reg = bcm_perf_readl(PERF_EXTIRQ_CFG_REG);</div><div class='del'>-	reg &amp;= ~EXTIRQ_CFG_MASK(irq);</div><div class='del'>-	bcm_perf_writel(reg, PERF_EXTIRQ_CFG_REG);</div><div class='add'>+	regaddr = get_ext_irq_perf_reg(irq);</div><div class='add'>+	reg = bcm_perf_readl(regaddr);</div><div class='add'>+</div><div class='add'>+	if (BCMCPU_IS_6348())</div><div class='add'>+		reg &amp;= ~EXTIRQ_CFG_MASK_6348(irq % 4);</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~EXTIRQ_CFG_MASK(irq % 4);</div><div class='add'>+</div><div class='add'>+	bcm_perf_writel(reg, regaddr);</div><div class='add'>+	if (is_ext_irq_cascaded)</div><div class='add'>+		internal_irq_mask(irq + ext_irq_start);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcm63xx_external_irq_unmask(struct irq_data *d)</div><div class='ctx'> {</div><div class='del'>-	unsigned int irq = d-&gt;irq - IRQ_EXT_BASE;</div><div class='del'>-	u32 reg;</div><div class='add'>+	unsigned int irq = d-&gt;irq - IRQ_EXTERNAL_BASE;</div><div class='add'>+	u32 reg, regaddr;</div><div class='ctx'> </div><div class='del'>-	reg = bcm_perf_readl(PERF_EXTIRQ_CFG_REG);</div><div class='del'>-	reg |= EXTIRQ_CFG_MASK(irq);</div><div class='del'>-	bcm_perf_writel(reg, PERF_EXTIRQ_CFG_REG);</div><div class='add'>+	regaddr = get_ext_irq_perf_reg(irq);</div><div class='add'>+	reg = bcm_perf_readl(regaddr);</div><div class='add'>+</div><div class='add'>+	if (BCMCPU_IS_6348())</div><div class='add'>+		reg |= EXTIRQ_CFG_MASK_6348(irq % 4);</div><div class='add'>+	else</div><div class='add'>+		reg |= EXTIRQ_CFG_MASK(irq % 4);</div><div class='add'>+</div><div class='add'>+	bcm_perf_writel(reg, regaddr);</div><div class='add'>+</div><div class='add'>+	if (is_ext_irq_cascaded)</div><div class='add'>+		internal_irq_unmask(irq + ext_irq_start);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcm63xx_external_irq_clear(struct irq_data *d)</div><div class='ctx'> {</div><div class='del'>-	unsigned int irq = d-&gt;irq - IRQ_EXT_BASE;</div><div class='del'>-	u32 reg;</div><div class='add'>+	unsigned int irq = d-&gt;irq - IRQ_EXTERNAL_BASE;</div><div class='add'>+	u32 reg, regaddr;</div><div class='ctx'> </div><div class='del'>-	reg = bcm_perf_readl(PERF_EXTIRQ_CFG_REG);</div><div class='del'>-	reg |= EXTIRQ_CFG_CLEAR(irq);</div><div class='del'>-	bcm_perf_writel(reg, PERF_EXTIRQ_CFG_REG);</div><div class='del'>-}</div><div class='add'>+	regaddr = get_ext_irq_perf_reg(irq);</div><div class='add'>+	reg = bcm_perf_readl(regaddr);</div><div class='ctx'> </div><div class='del'>-static unsigned int bcm63xx_external_irq_startup(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	set_c0_status(0x100 &lt;&lt; (d-&gt;irq - IRQ_MIPS_BASE));</div><div class='del'>-	irq_enable_hazard();</div><div class='del'>-	bcm63xx_external_irq_unmask(d);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	if (BCMCPU_IS_6348())</div><div class='add'>+		reg |= EXTIRQ_CFG_CLEAR_6348(irq % 4);</div><div class='add'>+	else</div><div class='add'>+		reg |= EXTIRQ_CFG_CLEAR(irq % 4);</div><div class='ctx'> </div><div class='del'>-static void bcm63xx_external_irq_shutdown(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	bcm63xx_external_irq_mask(d);</div><div class='del'>-	clear_c0_status(0x100 &lt;&lt; (d-&gt;irq - IRQ_MIPS_BASE));</div><div class='del'>-	irq_disable_hazard();</div><div class='add'>+	bcm_perf_writel(reg, regaddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bcm63xx_external_irq_set_type(struct irq_data *d,</div><div class='ctx'> 					 unsigned int flow_type)</div><div class='ctx'> {</div><div class='del'>-	unsigned int irq = d-&gt;irq - IRQ_EXT_BASE;</div><div class='del'>-	u32 reg;</div><div class='add'>+	unsigned int irq = d-&gt;irq - IRQ_EXTERNAL_BASE;</div><div class='add'>+	u32 reg, regaddr;</div><div class='add'>+	int levelsense, sense, bothedge;</div><div class='ctx'> </div><div class='ctx'> 	flow_type &amp;= IRQ_TYPE_SENSE_MASK;</div><div class='ctx'> </div><div class='ctx'> 	if (flow_type == IRQ_TYPE_NONE)</div><div class='ctx'> 		flow_type = IRQ_TYPE_LEVEL_LOW;</div><div class='ctx'> </div><div class='del'>-	reg = bcm_perf_readl(PERF_EXTIRQ_CFG_REG);</div><div class='add'>+	levelsense = sense = bothedge = 0;</div><div class='ctx'> 	switch (flow_type) {</div><div class='ctx'> 	case IRQ_TYPE_EDGE_BOTH:</div><div class='del'>-		reg &amp;= ~EXTIRQ_CFG_LEVELSENSE(irq);</div><div class='del'>-		reg |= EXTIRQ_CFG_BOTHEDGE(irq);</div><div class='add'>+		bothedge = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IRQ_TYPE_EDGE_RISING:</div><div class='del'>-		reg &amp;= ~EXTIRQ_CFG_LEVELSENSE(irq);</div><div class='del'>-		reg |= EXTIRQ_CFG_SENSE(irq);</div><div class='del'>-		reg &amp;= ~EXTIRQ_CFG_BOTHEDGE(irq);</div><div class='add'>+		sense = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IRQ_TYPE_EDGE_FALLING:</div><div class='del'>-		reg &amp;= ~EXTIRQ_CFG_LEVELSENSE(irq);</div><div class='del'>-		reg &amp;= ~EXTIRQ_CFG_SENSE(irq);</div><div class='del'>-		reg &amp;= ~EXTIRQ_CFG_BOTHEDGE(irq);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IRQ_TYPE_LEVEL_HIGH:</div><div class='del'>-		reg |= EXTIRQ_CFG_LEVELSENSE(irq);</div><div class='del'>-		reg |= EXTIRQ_CFG_SENSE(irq);</div><div class='add'>+		levelsense = 1;</div><div class='add'>+		sense = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IRQ_TYPE_LEVEL_LOW:</div><div class='del'>-		reg |= EXTIRQ_CFG_LEVELSENSE(irq);</div><div class='del'>-		reg &amp;= ~EXTIRQ_CFG_SENSE(irq);</div><div class='add'>+		levelsense = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_ERR "bogus flow type combination given !\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	bcm_perf_writel(reg, PERF_EXTIRQ_CFG_REG);</div><div class='add'>+</div><div class='add'>+	regaddr = get_ext_irq_perf_reg(irq);</div><div class='add'>+	reg = bcm_perf_readl(regaddr);</div><div class='add'>+	irq %= 4;</div><div class='add'>+</div><div class='add'>+	if (BCMCPU_IS_6348()) {</div><div class='add'>+		if (levelsense)</div><div class='add'>+			reg |= EXTIRQ_CFG_LEVELSENSE_6348(irq);</div><div class='add'>+		else</div><div class='add'>+			reg &amp;= ~EXTIRQ_CFG_LEVELSENSE_6348(irq);</div><div class='add'>+		if (sense)</div><div class='add'>+			reg |= EXTIRQ_CFG_SENSE_6348(irq);</div><div class='add'>+		else</div><div class='add'>+			reg &amp;= ~EXTIRQ_CFG_SENSE_6348(irq);</div><div class='add'>+		if (bothedge)</div><div class='add'>+			reg |= EXTIRQ_CFG_BOTHEDGE_6348(irq);</div><div class='add'>+		else</div><div class='add'>+			reg &amp;= ~EXTIRQ_CFG_BOTHEDGE_6348(irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (BCMCPU_IS_6338() || BCMCPU_IS_6358() || BCMCPU_IS_6368()) {</div><div class='add'>+		if (levelsense)</div><div class='add'>+			reg |= EXTIRQ_CFG_LEVELSENSE(irq);</div><div class='add'>+		else</div><div class='add'>+			reg &amp;= ~EXTIRQ_CFG_LEVELSENSE(irq);</div><div class='add'>+		if (sense)</div><div class='add'>+			reg |= EXTIRQ_CFG_SENSE(irq);</div><div class='add'>+		else</div><div class='add'>+			reg &amp;= ~EXTIRQ_CFG_SENSE(irq);</div><div class='add'>+		if (bothedge)</div><div class='add'>+			reg |= EXTIRQ_CFG_BOTHEDGE(irq);</div><div class='add'>+		else</div><div class='add'>+			reg &amp;= ~EXTIRQ_CFG_BOTHEDGE(irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bcm_perf_writel(reg, regaddr);</div><div class='ctx'> </div><div class='ctx'> 	irqd_set_trigger_type(d, flow_type);</div><div class='ctx'> 	if (flow_type &amp; (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))</div><div class='hunk'>@@ -208,9 +462,6 @@ static struct irq_chip bcm63xx_internal_irq_chip = {</div><div class='ctx'> </div><div class='ctx'> static struct irq_chip bcm63xx_external_irq_chip = {</div><div class='ctx'> 	.name		= "bcm63xx_epic",</div><div class='del'>-	.irq_startup	= bcm63xx_external_irq_startup,</div><div class='del'>-	.irq_shutdown	= bcm63xx_external_irq_shutdown,</div><div class='del'>-</div><div class='ctx'> 	.irq_ack	= bcm63xx_external_irq_clear,</div><div class='ctx'> </div><div class='ctx'> 	.irq_mask	= bcm63xx_external_irq_mask,</div><div class='hunk'>@@ -225,18 +476,30 @@ static struct irqaction cpu_ip2_cascade_action = {</div><div class='ctx'> 	.flags		= IRQF_NO_THREAD,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct irqaction cpu_ext_cascade_action = {</div><div class='add'>+	.handler	= no_action,</div><div class='add'>+	.name		= "cascade_extirq",</div><div class='add'>+	.flags		= IRQF_NO_THREAD,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void __init arch_init_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	bcm63xx_init_irq();</div><div class='ctx'> 	mips_cpu_irq_init();</div><div class='ctx'> 	for (i = IRQ_INTERNAL_BASE; i &lt; NR_IRQS; ++i)</div><div class='ctx'> 		irq_set_chip_and_handler(i, &amp;bcm63xx_internal_irq_chip,</div><div class='ctx'> 					 handle_level_irq);</div><div class='ctx'> </div><div class='del'>-	for (i = IRQ_EXT_BASE; i &lt; IRQ_EXT_BASE + 4; ++i)</div><div class='add'>+	for (i = IRQ_EXTERNAL_BASE; i &lt; IRQ_EXTERNAL_BASE + ext_irq_count; ++i)</div><div class='ctx'> 		irq_set_chip_and_handler(i, &amp;bcm63xx_external_irq_chip,</div><div class='ctx'> 					 handle_edge_irq);</div><div class='ctx'> </div><div class='del'>-	setup_irq(IRQ_MIPS_BASE + 2, &amp;cpu_ip2_cascade_action);</div><div class='add'>+	if (!is_ext_irq_cascaded) {</div><div class='add'>+		for (i = 3; i &lt; 3 + ext_irq_count; ++i)</div><div class='add'>+			setup_irq(MIPS_CPU_IRQ_BASE + i, &amp;cpu_ext_cascade_action);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	setup_irq(MIPS_CPU_IRQ_BASE + 2, &amp;cpu_ip2_cascade_action);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c<br/>index be252efa0757..99d7f405cbeb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/bcm63xx/prom.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm63xx/prom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/bcm63xx/prom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/bcm63xx/prom.c</a></div><div class='hunk'>@@ -32,9 +32,12 @@ void __init prom_init(void)</div><div class='ctx'> 		mask = CKCTL_6345_ALL_SAFE_EN;</div><div class='ctx'> 	else if (BCMCPU_IS_6348())</div><div class='ctx'> 		mask = CKCTL_6348_ALL_SAFE_EN;</div><div class='del'>-	else</div><div class='del'>-		/* BCMCPU_IS_6358() */</div><div class='add'>+	else if (BCMCPU_IS_6358())</div><div class='ctx'> 		mask = CKCTL_6358_ALL_SAFE_EN;</div><div class='add'>+	else if (BCMCPU_IS_6368())</div><div class='add'>+		mask = CKCTL_6368_ALL_SAFE_EN;</div><div class='add'>+	else</div><div class='add'>+		mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	reg = bcm_perf_readl(PERF_CKCTL_REG);</div><div class='ctx'> 	reg &amp;= ~mask;</div><div class='head'>diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c<br/>index d0056598fbfc..d209f85d87bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/bcm63xx/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/bcm63xx/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/bcm63xx/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/bcm63xx/setup.c</a></div><div class='hunk'>@@ -63,13 +63,33 @@ static void bcm6348_a1_reboot(void)</div><div class='ctx'> </div><div class='ctx'> void bcm63xx_machine_reboot(void)</div><div class='ctx'> {</div><div class='del'>-	u32 reg;</div><div class='add'>+	u32 reg, perf_regs[2] = { 0, 0 };</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	/* mask and clear all external irq */</div><div class='del'>-	reg = bcm_perf_readl(PERF_EXTIRQ_CFG_REG);</div><div class='del'>-	reg &amp;= ~EXTIRQ_CFG_MASK_ALL;</div><div class='del'>-	reg |= EXTIRQ_CFG_CLEAR_ALL;</div><div class='del'>-	bcm_perf_writel(reg, PERF_EXTIRQ_CFG_REG);</div><div class='add'>+	switch (bcm63xx_get_cpu_id()) {</div><div class='add'>+	case BCM6338_CPU_ID:</div><div class='add'>+		perf_regs[0] = PERF_EXTIRQ_CFG_REG_6338;</div><div class='add'>+		break;</div><div class='add'>+	case BCM6348_CPU_ID:</div><div class='add'>+		perf_regs[0] = PERF_EXTIRQ_CFG_REG_6348;</div><div class='add'>+		break;</div><div class='add'>+	case BCM6358_CPU_ID:</div><div class='add'>+		perf_regs[0] = PERF_EXTIRQ_CFG_REG_6358;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		reg = bcm_perf_readl(perf_regs[i]);</div><div class='add'>+		if (BCMCPU_IS_6348()) {</div><div class='add'>+			reg &amp;= ~EXTIRQ_CFG_MASK_ALL_6348;</div><div class='add'>+			reg |= EXTIRQ_CFG_CLEAR_ALL_6348;</div><div class='add'>+		} else {</div><div class='add'>+			reg &amp;= ~EXTIRQ_CFG_MASK_ALL;</div><div class='add'>+			reg |= EXTIRQ_CFG_CLEAR_ALL;</div><div class='add'>+		}</div><div class='add'>+		bcm_perf_writel(reg, perf_regs[i]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (BCMCPU_IS_6348() &amp;&amp; (bcm63xx_get_cpu_rev() == 0xa1))</div><div class='ctx'> 		bcm6348_a1_reboot();</div><div class='hunk'>@@ -124,4 +144,4 @@ int __init bcm63xx_register_devices(void)</div><div class='ctx'> 	return board_register_devices();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-arch_initcall(bcm63xx_register_devices);</div><div class='add'>+device_initcall(bcm63xx_register_devices);</div><div class='head'>diff --git a/arch/mips/boot/compressed/uart-alchemy.c b/arch/mips/boot/compressed/uart-alchemy.c<br/>index eb063e6dead9..3112df8f90db 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/boot/compressed/uart-alchemy.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/boot/compressed/uart-alchemy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/boot/compressed/uart-alchemy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/boot/compressed/uart-alchemy.c</a></div><div class='hunk'>@@ -2,6 +2,9 @@</div><div class='ctx'> </div><div class='ctx'> void putc(char c)</div><div class='ctx'> {</div><div class='del'>-	/* all current (Jan. 2010) in-kernel boards */</div><div class='add'>+#ifdef CONFIG_MIPS_DB1300</div><div class='add'>+	alchemy_uart_putchar(AU1300_UART2_PHYS_ADDR, c);</div><div class='add'>+#else</div><div class='ctx'> 	alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/cavium-octeon/Kconfig b/arch/mips/cavium-octeon/Kconfig<br/>index cad555ebeca3..f9e275a50d98 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/Kconfig</a></div><div class='hunk'>@@ -86,10 +86,6 @@ config ARCH_SPARSEMEM_ENABLE</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	select SPARSEMEM_STATIC</div><div class='ctx'> </div><div class='del'>-config CAVIUM_OCTEON_HELPER</div><div class='del'>-	def_bool y</div><div class='del'>-	depends on OCTEON_ETHERNET || PCI</div><div class='del'>-</div><div class='ctx'> config IOMMU_HELPER</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c<br/>index ea4febaa4bb1..b6bb92c16a47 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/dma-octeon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/dma-octeon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/dma-octeon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/dma-octeon.c</a></div><div class='hunk'>@@ -61,6 +61,16 @@ static phys_addr_t octeon_gen1_dma_to_phys(struct device *dev, dma_addr_t daddr)</div><div class='ctx'> 	return daddr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static dma_addr_t octeon_gen2_phys_to_dma(struct device *dev, phys_addr_t paddr)</div><div class='add'>+{</div><div class='add'>+	return octeon_hole_phys_to_dma(paddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static phys_addr_t octeon_gen2_dma_to_phys(struct device *dev, dma_addr_t daddr)</div><div class='add'>+{</div><div class='add'>+	return octeon_hole_dma_to_phys(daddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static dma_addr_t octeon_big_phys_to_dma(struct device *dev, phys_addr_t paddr)</div><div class='ctx'> {</div><div class='ctx'> 	if (paddr &gt;= 0x410000000ull &amp;&amp; paddr &lt; 0x420000000ull)</div><div class='hunk'>@@ -262,11 +272,11 @@ void __init plat_swiotlb_setup(void)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0 ; i &lt; boot_mem_map.nr_map; i++) {</div><div class='ctx'> 		struct boot_mem_map_entry *e = &amp;boot_mem_map.map[i];</div><div class='del'>-		if (e-&gt;type != BOOT_MEM_RAM)</div><div class='add'>+		if (e-&gt;type != BOOT_MEM_RAM &amp;&amp; e-&gt;type != BOOT_MEM_INIT_RAM)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* These addresses map low for PCI. */</div><div class='del'>-		if (e-&gt;addr &gt; 0x410000000ull)</div><div class='add'>+		if (e-&gt;addr &gt; 0x410000000ull &amp;&amp; !OCTEON_IS_MODEL(OCTEON_CN6XXX))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		addr_size += e-&gt;size;</div><div class='hunk'>@@ -296,6 +306,11 @@ void __init plat_swiotlb_setup(void)</div><div class='ctx'> 		swiotlbsize = 64 * (1&lt;&lt;20);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_USB_OCTEON_OHCI</div><div class='add'>+	/* OCTEON II ohci is only 32-bit. */</div><div class='add'>+	if (OCTEON_IS_MODEL(OCTEON_CN6XXX) &amp;&amp; max_addr &gt;= 0x100000000ul)</div><div class='add'>+		swiotlbsize = 64 * (1&lt;&lt;20);</div><div class='add'>+#endif</div><div class='ctx'> 	swiotlb_nslabs = swiotlbsize &gt;&gt; IO_TLB_SHIFT;</div><div class='ctx'> 	swiotlb_nslabs = ALIGN(swiotlb_nslabs, IO_TLB_SEGSIZE);</div><div class='ctx'> 	swiotlbsize = swiotlb_nslabs &lt;&lt; IO_TLB_SHIFT;</div><div class='hunk'>@@ -330,6 +345,10 @@ struct dma_map_ops *octeon_pci_dma_map_ops;</div><div class='ctx'> void __init octeon_pci_dma_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	switch (octeon_dma_bar_type) {</div><div class='add'>+	case OCTEON_DMA_BAR_TYPE_PCIE2:</div><div class='add'>+		_octeon_pci_dma_map_ops.phys_to_dma = octeon_gen2_phys_to_dma;</div><div class='add'>+		_octeon_pci_dma_map_ops.dma_to_phys = octeon_gen2_dma_to_phys;</div><div class='add'>+		break;</div><div class='ctx'> 	case OCTEON_DMA_BAR_TYPE_PCIE:</div><div class='ctx'> 		_octeon_pci_dma_map_ops.phys_to_dma = octeon_gen1_phys_to_dma;</div><div class='ctx'> 		_octeon_pci_dma_map_ops.dma_to_phys = octeon_gen1_dma_to_phys;</div><div class='head'>diff --git a/arch/mips/cavium-octeon/executive/Makefile b/arch/mips/cavium-octeon/executive/Makefile<br/>index 7f41c5be2190..b6d6e841a984 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/executive/Makefile</a></div><div class='hunk'>@@ -10,5 +10,10 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-y += cvmx-bootmem.o cvmx-l2c.o cvmx-sysinfo.o octeon-model.o</div><div class='add'>+obj-y += cvmx-pko.o cvmx-spi.o cvmx-cmd-queue.o \</div><div class='add'>+	cvmx-helper-board.o cvmx-helper.o cvmx-helper-xaui.o \</div><div class='add'>+	cvmx-helper-rgmii.o cvmx-helper-sgmii.o cvmx-helper-npi.o \</div><div class='add'>+	cvmx-helper-loop.o cvmx-helper-spi.o cvmx-helper-util.o \</div><div class='add'>+	cvmx-interrupt-decodes.o cvmx-interrupt-rsl.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_CAVIUM_OCTEON_HELPER) += cvmx-helper-errata.o cvmx-helper-jtag.o</div><div class='add'>+obj-y += cvmx-helper-errata.o cvmx-helper-jtag.o</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-cmd-queue.c b/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c<br/>index e9809d375162..132bccc66a93 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-cmd-queue.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-cmd-queue.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c</a></div><div class='hunk'>@@ -34,13 +34,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/octeon/octeon.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-config.h"</div><div class='del'>-#include "cvmx-fpa.h"</div><div class='del'>-#include "cvmx-cmd-queue.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-config.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-fpa.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-cmd-queue.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/octeon/cvmx-npei-defs.h&gt;</div><div class='ctx'> #include &lt;asm/octeon/cvmx-pexp-defs.h&gt;</div><div class='del'>-#include "cvmx-pko-defs.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-pko-defs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * This application uses this pointer to access the global queue</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-fpa.c b/arch/mips/cavium-octeon/executive/cvmx-fpa.c<br/>index ad44b8bd8057..ad44b8bd8057 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-fpa.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-fpa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/cvmx-fpa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/executive/cvmx-fpa.c</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper-board.c b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c<br/>index 57d35dc63ddb..fd2015331a20 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper-board.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper-board.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/cvmx-helper-board.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/executive/cvmx-helper-board.c</a></div><div class='hunk'>@@ -34,16 +34,16 @@</div><div class='ctx'> #include &lt;asm/octeon/octeon.h&gt;</div><div class='ctx'> #include &lt;asm/octeon/cvmx-bootinfo.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-config.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-config.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-mdio.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-mdio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-helper.h"</div><div class='del'>-#include "cvmx-helper-util.h"</div><div class='del'>-#include "cvmx-helper-board.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-helper.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-helper-util.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-helper-board.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-gmxx-defs.h"</div><div class='del'>-#include "cvmx-asxx-defs.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-gmxx-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-asxx-defs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cvmx_override_board_link_get(int ipd_port) is a function</div><div class='hunk'>@@ -117,6 +117,10 @@ int cvmx_helper_board_get_mii_address(int ipd_port)</div><div class='ctx'> 	case CVMX_BOARD_TYPE_EBH5200:</div><div class='ctx'> 	case CVMX_BOARD_TYPE_EBH5201:</div><div class='ctx'> 	case CVMX_BOARD_TYPE_EBT5200:</div><div class='add'>+		/* Board has 2 management ports */</div><div class='add'>+		if ((ipd_port &gt;= CVMX_HELPER_BOARD_MGMT_IPD_PORT) &amp;&amp;</div><div class='add'>+		    (ipd_port &lt; (CVMX_HELPER_BOARD_MGMT_IPD_PORT + 2)))</div><div class='add'>+			return ipd_port - CVMX_HELPER_BOARD_MGMT_IPD_PORT;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Board has 4 SGMII ports. The PHYs start right after the MII</div><div class='ctx'> 		 * ports MII0 = 0, MII1 = 1, SGMII = 2-5.</div><div class='hunk'>@@ -128,6 +132,9 @@ int cvmx_helper_board_get_mii_address(int ipd_port)</div><div class='ctx'> 	case CVMX_BOARD_TYPE_EBH5600:</div><div class='ctx'> 	case CVMX_BOARD_TYPE_EBH5601:</div><div class='ctx'> 	case CVMX_BOARD_TYPE_EBH5610:</div><div class='add'>+		/* Board has 1 management port */</div><div class='add'>+		if (ipd_port == CVMX_HELPER_BOARD_MGMT_IPD_PORT)</div><div class='add'>+			return 0;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Board has 8 SGMII ports. 4 connect out, two connect</div><div class='ctx'> 		 * to a switch, and 2 loop to each other</div><div class='hunk'>@@ -147,6 +154,19 @@ int cvmx_helper_board_get_mii_address(int ipd_port)</div><div class='ctx'> 			return ipd_port - 16 + 1;</div><div class='ctx'> 		else</div><div class='ctx'> 			return -1;</div><div class='add'>+	case CVMX_BOARD_TYPE_NIC_XLE_10G:</div><div class='add'>+	case CVMX_BOARD_TYPE_NIC10E:</div><div class='add'>+		return -1;</div><div class='add'>+	case CVMX_BOARD_TYPE_NIC4E:</div><div class='add'>+		if (ipd_port &gt;= 0 &amp;&amp; ipd_port &lt;= 3)</div><div class='add'>+			return (ipd_port + 0x1f) &amp; 0x1f;</div><div class='add'>+		else</div><div class='add'>+			return -1;</div><div class='add'>+	case CVMX_BOARD_TYPE_NIC2E:</div><div class='add'>+		if (ipd_port &gt;= 0 &amp;&amp; ipd_port &lt;= 1)</div><div class='add'>+			return ipd_port + 1;</div><div class='add'>+		else</div><div class='add'>+			return -1;</div><div class='ctx'> 	case CVMX_BOARD_TYPE_BBGW_REF:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * No PHYs are connected to Octeon, everything is</div><div class='hunk'>@@ -493,7 +513,6 @@ int cvmx_helper_board_link_set_phy(int phy_addr,</div><div class='ctx'> 		cvmx_mdio_phy_reg_control_t reg_control;</div><div class='ctx'> 		cvmx_mdio_phy_reg_status_t reg_status;</div><div class='ctx'> 		cvmx_mdio_phy_reg_autoneg_adver_t reg_autoneg_adver;</div><div class='del'>-		cvmx_mdio_phy_reg_extended_status_t reg_extended_status;</div><div class='ctx'> 		cvmx_mdio_phy_reg_control_1000_t reg_control_1000;</div><div class='ctx'> </div><div class='ctx'> 		reg_status.u16 =</div><div class='hunk'>@@ -508,9 +527,6 @@ int cvmx_helper_board_link_set_phy(int phy_addr,</div><div class='ctx'> 		reg_autoneg_adver.s.advert_100base_tx_full = 0;</div><div class='ctx'> 		reg_autoneg_adver.s.advert_100base_tx_half = 0;</div><div class='ctx'> 		if (reg_status.s.capable_extended_status) {</div><div class='del'>-			reg_extended_status.u16 =</div><div class='del'>-			    cvmx_mdio_read(phy_addr &gt;&gt; 8, phy_addr &amp; 0xff,</div><div class='del'>-					   CVMX_MDIO_PHY_REG_EXTENDED_STATUS);</div><div class='ctx'> 			reg_control_1000.u16 =</div><div class='ctx'> 			    cvmx_mdio_read(phy_addr &gt;&gt; 8, phy_addr &amp; 0xff,</div><div class='ctx'> 					   CVMX_MDIO_PHY_REG_CONTROL_1000);</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper-fpa.c b/arch/mips/cavium-octeon/executive/cvmx-helper-fpa.c<br/>index c239e5f4ab9a..c239e5f4ab9a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper-fpa.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper-fpa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/cvmx-helper-fpa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/executive/cvmx-helper-fpa.c</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper-loop.c b/arch/mips/cavium-octeon/executive/cvmx-helper-loop.c<br/>index 55a571a69529..bfbd46115e71 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper-loop.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper-loop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/cvmx-helper-loop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/executive/cvmx-helper-loop.c</a></div><div class='hunk'>@@ -31,10 +31,10 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/octeon/octeon.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-config.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-config.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-helper.h"</div><div class='del'>-#include "cvmx-pip-defs.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-helper.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-pip-defs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Probe a LOOP interface and determine the number of ports</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper-npi.c b/arch/mips/cavium-octeon/executive/cvmx-helper-npi.c<br/>index 7388a1e72b38..cc94cfa545b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper-npi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper-npi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/cvmx-helper-npi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/executive/cvmx-helper-npi.c</a></div><div class='hunk'>@@ -31,11 +31,11 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/octeon/octeon.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-config.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-config.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-helper.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-helper.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-pip-defs.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-pip-defs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Probe a NPI interface and determine the number of ports</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper-rgmii.c b/arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c<br/>index aa2d5d7fee2b..82b21843421c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper-rgmii.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper-rgmii.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c</a></div><div class='hunk'>@@ -31,18 +31,18 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/octeon/octeon.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-config.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-config.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include "cvmx-mdio.h"</div><div class='del'>-#include "cvmx-pko.h"</div><div class='del'>-#include "cvmx-helper.h"</div><div class='del'>-#include "cvmx-helper-board.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-mdio.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-pko.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-helper.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-helper-board.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/octeon/cvmx-npi-defs.h&gt;</div><div class='del'>-#include "cvmx-gmxx-defs.h"</div><div class='del'>-#include "cvmx-asxx-defs.h"</div><div class='del'>-#include "cvmx-dbg-defs.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-gmxx-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-asxx-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-dbg-defs.h&gt;</div><div class='ctx'> </div><div class='ctx'> void __cvmx_interrupt_gmxx_enable(int interface);</div><div class='ctx'> void __cvmx_interrupt_asxx_enable(int block);</div><div class='hunk'>@@ -326,6 +326,7 @@ int __cvmx_helper_rgmii_link_set(int ipd_port,</div><div class='ctx'> 		       cvmx_read_csr(CVMX_ASXX_RX_PRT_EN(interface)) &amp;</div><div class='ctx'> 				     ~(1 &lt;&lt; index));</div><div class='ctx'> </div><div class='add'>+	memset(pko_mem_queue_qos_save, 0, sizeof(pko_mem_queue_qos_save));</div><div class='ctx'> 	/* Disable all queues so that TX should become idle */</div><div class='ctx'> 	for (i = 0; i &lt; cvmx_pko_get_num_queues(ipd_port); i++) {</div><div class='ctx'> 		int queue = cvmx_pko_get_base_queue(ipd_port) + i;</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper-sgmii.c b/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c<br/>index 6214e3b6d975..0c0bf5d30e70 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper-sgmii.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper-sgmii.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c</a></div><div class='hunk'>@@ -32,14 +32,14 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/octeon/octeon.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-config.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-config.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-mdio.h"</div><div class='del'>-#include "cvmx-helper.h"</div><div class='del'>-#include "cvmx-helper-board.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-mdio.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-helper.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-helper-board.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-gmxx-defs.h"</div><div class='del'>-#include "cvmx-pcsx-defs.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-gmxx-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-pcsx-defs.h&gt;</div><div class='ctx'> </div><div class='ctx'> void __cvmx_interrupt_gmxx_enable(int interface);</div><div class='ctx'> void __cvmx_interrupt_pcsx_intx_en_reg_enable(int index, int block);</div><div class='hunk'>@@ -326,6 +326,10 @@ static int __cvmx_helper_sgmii_hardware_init(int interface, int num_ports)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int __cvmx_helper_sgmii_enumerate(int interface)</div><div class='add'>+{</div><div class='add'>+	return 4;</div><div class='add'>+}</div><div class='ctx'> /**</div><div class='ctx'>  * Probe a SGMII interface and determine the number of ports</div><div class='ctx'>  * connected to it. The SGMII interface should still be down after</div><div class='hunk'>@@ -347,7 +351,7 @@ int __cvmx_helper_sgmii_probe(int interface)</div><div class='ctx'> 	mode.u64 = cvmx_read_csr(CVMX_GMXX_INF_MODE(interface));</div><div class='ctx'> 	mode.s.en = 1;</div><div class='ctx'> 	cvmx_write_csr(CVMX_GMXX_INF_MODE(interface), mode.u64);</div><div class='del'>-	return 4;</div><div class='add'>+	return __cvmx_helper_sgmii_enumerate(interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper-spi.c b/arch/mips/cavium-octeon/executive/cvmx-helper-spi.c<br/>index 8ba6c832471e..2830e4bdf7f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper-spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper-spi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/cvmx-helper-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/executive/cvmx-helper-spi.c</a></div><div class='hunk'>@@ -35,12 +35,12 @@ void __cvmx_interrupt_stxx_int_msk_enable(int index);</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/octeon/octeon.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-config.h"</div><div class='del'>-#include "cvmx-spi.h"</div><div class='del'>-#include "cvmx-helper.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-config.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-spi.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-helper.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-pip-defs.h"</div><div class='del'>-#include "cvmx-pko-defs.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-pip-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-pko-defs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * CVMX_HELPER_SPI_TIMEOUT is used to determine how long the SPI</div><div class='hunk'>@@ -51,6 +51,16 @@ void __cvmx_interrupt_stxx_int_msk_enable(int index);</div><div class='ctx'> #define CVMX_HELPER_SPI_TIMEOUT 10</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+int __cvmx_helper_spi_enumerate(int interface)</div><div class='add'>+{</div><div class='add'>+	if ((cvmx_sysinfo_get()-&gt;board_type != CVMX_BOARD_TYPE_SIM) &amp;&amp;</div><div class='add'>+	    cvmx_spi4000_is_present(interface)) {</div><div class='add'>+		return 10;</div><div class='add'>+	} else {</div><div class='add'>+		return 16;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * Probe a SPI interface and determine the number of ports</div><div class='ctx'>  * connected to it. The SPI interface should still be down after</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper-util.c b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c<br/>index 131182bf5abb..116dea17acf5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper-util.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper-util.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/cvmx-helper-util.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/executive/cvmx-helper-util.c</a></div><div class='hunk'>@@ -32,16 +32,16 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/octeon/octeon.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-config.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-config.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-fpa.h"</div><div class='del'>-#include "cvmx-pip.h"</div><div class='del'>-#include "cvmx-pko.h"</div><div class='del'>-#include "cvmx-ipd.h"</div><div class='del'>-#include "cvmx-spi.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-fpa.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-pip.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-pko.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-ipd.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-spi.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-helper.h"</div><div class='del'>-#include "cvmx-helper-util.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-helper.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-helper-util.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/octeon/cvmx-ipd-defs.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper-xaui.c b/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c<br/>index a11e6769e234..1723248e987d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper-xaui.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper-xaui.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c</a></div><div class='hunk'>@@ -33,17 +33,30 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/octeon/octeon.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-config.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-config.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-helper.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-helper.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-pko-defs.h"</div><div class='del'>-#include "cvmx-gmxx-defs.h"</div><div class='del'>-#include "cvmx-pcsxx-defs.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-pko-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-gmxx-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-pcsxx-defs.h&gt;</div><div class='ctx'> </div><div class='ctx'> void __cvmx_interrupt_gmxx_enable(int interface);</div><div class='ctx'> void __cvmx_interrupt_pcsx_intx_en_reg_enable(int index, int block);</div><div class='ctx'> void __cvmx_interrupt_pcsxx_int_en_reg_enable(int index);</div><div class='add'>+</div><div class='add'>+int __cvmx_helper_xaui_enumerate(int interface)</div><div class='add'>+{</div><div class='add'>+	union cvmx_gmxx_hg2_control gmx_hg2_control;</div><div class='add'>+</div><div class='add'>+	/* If HiGig2 is enabled return 16 ports, otherwise return 1 port */</div><div class='add'>+	gmx_hg2_control.u64 = cvmx_read_csr(CVMX_GMXX_HG2_CONTROL(interface));</div><div class='add'>+	if (gmx_hg2_control.s.hg2tx_en)</div><div class='add'>+		return 16;</div><div class='add'>+	else</div><div class='add'>+		return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * Probe a XAUI interface and determine the number of ports</div><div class='ctx'>  * connected to it. The XAUI interface should still be down</div><div class='hunk'>@@ -56,7 +69,6 @@ void __cvmx_interrupt_pcsxx_int_en_reg_enable(int index);</div><div class='ctx'> int __cvmx_helper_xaui_probe(int interface)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	union cvmx_gmxx_hg2_control gmx_hg2_control;</div><div class='ctx'> 	union cvmx_gmxx_inf_mode mode;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -90,13 +102,7 @@ int __cvmx_helper_xaui_probe(int interface)</div><div class='ctx'> 		pko_mem_port_ptrs.s.pid = interface * 16 + i;</div><div class='ctx'> 		cvmx_write_csr(CVMX_PKO_MEM_PORT_PTRS, pko_mem_port_ptrs.u64);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* If HiGig2 is enabled return 16 ports, otherwise return 1 port */</div><div class='del'>-	gmx_hg2_control.u64 = cvmx_read_csr(CVMX_GMXX_HG2_CONTROL(interface));</div><div class='del'>-	if (gmx_hg2_control.s.hg2tx_en)</div><div class='del'>-		return 16;</div><div class='del'>-	else</div><div class='del'>-		return 1;</div><div class='add'>+	return __cvmx_helper_xaui_enumerate(interface);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c<br/>index e9c5c836ceff..fa4963856353 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/cvmx-helper.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/executive/cvmx-helper.c</a></div><div class='hunk'>@@ -32,19 +32,19 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/octeon/octeon.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-config.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-config.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-fpa.h"</div><div class='del'>-#include "cvmx-pip.h"</div><div class='del'>-#include "cvmx-pko.h"</div><div class='del'>-#include "cvmx-ipd.h"</div><div class='del'>-#include "cvmx-spi.h"</div><div class='del'>-#include "cvmx-helper.h"</div><div class='del'>-#include "cvmx-helper-board.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-fpa.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-pip.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-pko.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-ipd.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-spi.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-helper.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-helper-board.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-pip-defs.h"</div><div class='del'>-#include "cvmx-smix-defs.h"</div><div class='del'>-#include "cvmx-asxx-defs.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-pip-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-smix-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-asxx-defs.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cvmx_override_pko_queue_priority(int ipd_port, uint64_t</div><div class='hunk'>@@ -234,21 +234,16 @@ static int __cvmx_helper_port_setup_ipd(int ipd_port)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * This function probes an interface to determine the actual</div><div class='del'>- * number of hardware ports connected to it. It doesn't setup the</div><div class='del'>- * ports or enable them. The main goal here is to set the global</div><div class='del'>- * interface_port_count[interface] correctly. Hardware setup of the</div><div class='del'>- * ports will be performed later.</div><div class='add'>+ * This function sets the interface_port_count[interface] correctly,</div><div class='add'>+ * without modifying any hardware configuration.  Hardware setup of</div><div class='add'>+ * the ports will be performed later.</div><div class='ctx'>  *</div><div class='ctx'>  * @interface: Interface to probe</div><div class='ctx'>  *</div><div class='ctx'>  * Returns Zero on success, negative on failure</div><div class='ctx'>  */</div><div class='del'>-int cvmx_helper_interface_probe(int interface)</div><div class='add'>+int cvmx_helper_interface_enumerate(int interface)</div><div class='ctx'> {</div><div class='del'>-	/* At this stage in the game we don't want packets to be moving yet.</div><div class='del'>-	   The following probe calls should perform hardware setup</div><div class='del'>-	   needed to determine port counts. Receive must still be disabled */</div><div class='ctx'> 	switch (cvmx_helper_interface_get_mode(interface)) {</div><div class='ctx'> 		/* These types don't support ports to IPD/PKO */</div><div class='ctx'> 	case CVMX_HELPER_INTERFACE_MODE_DISABLED:</div><div class='hunk'>@@ -258,7 +253,7 @@ int cvmx_helper_interface_probe(int interface)</div><div class='ctx'> 		/* XAUI is a single high speed port */</div><div class='ctx'> 	case CVMX_HELPER_INTERFACE_MODE_XAUI:</div><div class='ctx'> 		interface_port_count[interface] =</div><div class='del'>-		    __cvmx_helper_xaui_probe(interface);</div><div class='add'>+		    __cvmx_helper_xaui_enumerate(interface);</div><div class='ctx'> 		break;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * RGMII/GMII/MII are all treated about the same. Most</div><div class='hunk'>@@ -267,7 +262,7 @@ int cvmx_helper_interface_probe(int interface)</div><div class='ctx'> 	case CVMX_HELPER_INTERFACE_MODE_RGMII:</div><div class='ctx'> 	case CVMX_HELPER_INTERFACE_MODE_GMII:</div><div class='ctx'> 		interface_port_count[interface] =</div><div class='del'>-		    __cvmx_helper_rgmii_probe(interface);</div><div class='add'>+		    __cvmx_helper_rgmii_enumerate(interface);</div><div class='ctx'> 		break;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * SPI4 can have 1-16 ports depending on the device at</div><div class='hunk'>@@ -275,7 +270,7 @@ int cvmx_helper_interface_probe(int interface)</div><div class='ctx'> 		 */</div><div class='ctx'> 	case CVMX_HELPER_INTERFACE_MODE_SPI:</div><div class='ctx'> 		interface_port_count[interface] =</div><div class='del'>-		    __cvmx_helper_spi_probe(interface);</div><div class='add'>+		    __cvmx_helper_spi_enumerate(interface);</div><div class='ctx'> 		break;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * SGMII can have 1-4 ports depending on how many are</div><div class='hunk'>@@ -284,12 +279,12 @@ int cvmx_helper_interface_probe(int interface)</div><div class='ctx'> 	case CVMX_HELPER_INTERFACE_MODE_SGMII:</div><div class='ctx'> 	case CVMX_HELPER_INTERFACE_MODE_PICMG:</div><div class='ctx'> 		interface_port_count[interface] =</div><div class='del'>-		    __cvmx_helper_sgmii_probe(interface);</div><div class='add'>+		    __cvmx_helper_sgmii_enumerate(interface);</div><div class='ctx'> 		break;</div><div class='ctx'> 		/* PCI target Network Packet Interface */</div><div class='ctx'> 	case CVMX_HELPER_INTERFACE_MODE_NPI:</div><div class='ctx'> 		interface_port_count[interface] =</div><div class='del'>-		    __cvmx_helper_npi_probe(interface);</div><div class='add'>+		    __cvmx_helper_npi_enumerate(interface);</div><div class='ctx'> 		break;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Special loopback only ports. These are not the same</div><div class='hunk'>@@ -297,7 +292,7 @@ int cvmx_helper_interface_probe(int interface)</div><div class='ctx'> 		 */</div><div class='ctx'> 	case CVMX_HELPER_INTERFACE_MODE_LOOP:</div><div class='ctx'> 		interface_port_count[interface] =</div><div class='del'>-		    __cvmx_helper_loop_probe(interface);</div><div class='add'>+		    __cvmx_helper_loop_enumerate(interface);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -313,6 +308,74 @@ int cvmx_helper_interface_probe(int interface)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * This function probes an interface to determine the actual</div><div class='add'>+ * number of hardware ports connected to it. It doesn't setup the</div><div class='add'>+ * ports or enable them. The main goal here is to set the global</div><div class='add'>+ * interface_port_count[interface] correctly. Hardware setup of the</div><div class='add'>+ * ports will be performed later.</div><div class='add'>+ *</div><div class='add'>+ * @interface: Interface to probe</div><div class='add'>+ *</div><div class='add'>+ * Returns Zero on success, negative on failure</div><div class='add'>+ */</div><div class='add'>+int cvmx_helper_interface_probe(int interface)</div><div class='add'>+{</div><div class='add'>+	cvmx_helper_interface_enumerate(interface);</div><div class='add'>+	/* At this stage in the game we don't want packets to be moving yet.</div><div class='add'>+	   The following probe calls should perform hardware setup</div><div class='add'>+	   needed to determine port counts. Receive must still be disabled */</div><div class='add'>+	switch (cvmx_helper_interface_get_mode(interface)) {</div><div class='add'>+		/* These types don't support ports to IPD/PKO */</div><div class='add'>+	case CVMX_HELPER_INTERFACE_MODE_DISABLED:</div><div class='add'>+	case CVMX_HELPER_INTERFACE_MODE_PCIE:</div><div class='add'>+		break;</div><div class='add'>+		/* XAUI is a single high speed port */</div><div class='add'>+	case CVMX_HELPER_INTERFACE_MODE_XAUI:</div><div class='add'>+		__cvmx_helper_xaui_probe(interface);</div><div class='add'>+		break;</div><div class='add'>+		/*</div><div class='add'>+		 * RGMII/GMII/MII are all treated about the same. Most</div><div class='add'>+		 * functions refer to these ports as RGMII.</div><div class='add'>+		 */</div><div class='add'>+	case CVMX_HELPER_INTERFACE_MODE_RGMII:</div><div class='add'>+	case CVMX_HELPER_INTERFACE_MODE_GMII:</div><div class='add'>+		__cvmx_helper_rgmii_probe(interface);</div><div class='add'>+		break;</div><div class='add'>+		/*</div><div class='add'>+		 * SPI4 can have 1-16 ports depending on the device at</div><div class='add'>+		 * the other end.</div><div class='add'>+		 */</div><div class='add'>+	case CVMX_HELPER_INTERFACE_MODE_SPI:</div><div class='add'>+		__cvmx_helper_spi_probe(interface);</div><div class='add'>+		break;</div><div class='add'>+		/*</div><div class='add'>+		 * SGMII can have 1-4 ports depending on how many are</div><div class='add'>+		 * hooked up.</div><div class='add'>+		 */</div><div class='add'>+	case CVMX_HELPER_INTERFACE_MODE_SGMII:</div><div class='add'>+	case CVMX_HELPER_INTERFACE_MODE_PICMG:</div><div class='add'>+		__cvmx_helper_sgmii_probe(interface);</div><div class='add'>+		break;</div><div class='add'>+		/* PCI target Network Packet Interface */</div><div class='add'>+	case CVMX_HELPER_INTERFACE_MODE_NPI:</div><div class='add'>+		__cvmx_helper_npi_probe(interface);</div><div class='add'>+		break;</div><div class='add'>+		/*</div><div class='add'>+		 * Special loopback only ports. These are not the same</div><div class='add'>+		 * as other ports in loopback mode.</div><div class='add'>+		 */</div><div class='add'>+	case CVMX_HELPER_INTERFACE_MODE_LOOP:</div><div class='add'>+		__cvmx_helper_loop_probe(interface);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make sure all global variables propagate to other cores */</div><div class='add'>+	CVMX_SYNCWS;</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'>  * Setup the IPD/PIP for the ports on an interface. Packet</div><div class='ctx'>  * classification and tagging are set for every port on the</div><div class='ctx'>  * interface. The number of ports on the interface must already</div><div class='hunk'>@@ -548,7 +611,6 @@ int __cvmx_helper_errata_fix_ipd_ptr_alignment(void)</div><div class='ctx'> 	union cvmx_gmxx_prtx_cfg gmx_cfg;</div><div class='ctx'> 	int retry_cnt;</div><div class='ctx'> 	int retry_loop_cnt;</div><div class='del'>-	int mtu;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	cvmx_helper_link_info_t link_info;</div><div class='ctx'> </div><div class='hunk'>@@ -662,10 +724,6 @@ int __cvmx_helper_errata_fix_ipd_ptr_alignment(void)</div><div class='ctx'> 		cvmx_write_csr(CVMX_ASXX_RX_PRT_EN(INTERFACE(FIX_IPD_OUTPORT)),</div><div class='ctx'> 			       1 &lt;&lt; INDEX(FIX_IPD_OUTPORT));</div><div class='ctx'> </div><div class='del'>-		mtu =</div><div class='del'>-		    cvmx_read_csr(CVMX_GMXX_RXX_JABBER</div><div class='del'>-				  (INDEX(FIX_IPD_OUTPORT),</div><div class='del'>-				   INTERFACE(FIX_IPD_OUTPORT)));</div><div class='ctx'> 		cvmx_write_csr(CVMX_GMXX_RXX_JABBER</div><div class='ctx'> 			       (INDEX(FIX_IPD_OUTPORT),</div><div class='ctx'> 				INTERFACE(FIX_IPD_OUTPORT)), 65392 - 14 - 4);</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-interrupt-decodes.c b/arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c<br/>index a3337e382ee9..e59d1b79f24c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-interrupt-decodes.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-interrupt-decodes.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c</a></div><div class='hunk'>@@ -34,11 +34,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/octeon/octeon.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-gmxx-defs.h"</div><div class='del'>-#include "cvmx-pcsx-defs.h"</div><div class='del'>-#include "cvmx-pcsxx-defs.h"</div><div class='del'>-#include "cvmx-spxx-defs.h"</div><div class='del'>-#include "cvmx-stxx-defs.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-gmxx-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-pcsx-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-pcsxx-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-spxx-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-stxx-defs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef PRINT_ERROR</div><div class='ctx'> #define PRINT_ERROR(format, ...)</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-interrupt-rsl.c b/arch/mips/cavium-octeon/executive/cvmx-interrupt-rsl.c<br/>index df50048cfbc0..bea7538ea4e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-interrupt-rsl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-interrupt-rsl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/cvmx-interrupt-rsl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/executive/cvmx-interrupt-rsl.c</a></div><div class='hunk'>@@ -32,8 +32,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/octeon/octeon.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-asxx-defs.h"</div><div class='del'>-#include "cvmx-gmxx-defs.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-asxx-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-gmxx-defs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef PRINT_ERROR</div><div class='ctx'> #define PRINT_ERROR(format, ...)</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-pko.c b/arch/mips/cavium-octeon/executive/cvmx-pko.c<br/>index 50a2c9bd5a55..f557084b1092 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-pko.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-pko.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/cvmx-pko.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/executive/cvmx-pko.c</a></div><div class='hunk'>@@ -31,9 +31,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/octeon/octeon.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-config.h"</div><div class='del'>-#include "cvmx-pko.h"</div><div class='del'>-#include "cvmx-helper.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-config.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-pko.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-helper.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Internal state of packet output</div><div class='hunk'>@@ -54,7 +54,7 @@ void cvmx_pko_initialize_global(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set the size of the PKO command buffers to an odd number of</div><div class='ctx'> 	 * 64bit words. This allows the normal two word send to stay</div><div class='del'>-	 * aligned and never span a command word buffer.</div><div class='add'>+	 * aligned and never span a comamnd word buffer.</div><div class='ctx'> 	 */</div><div class='ctx'> 	config.u64 = 0;</div><div class='ctx'> 	config.s.pool = CVMX_FPA_OUTPUT_BUFFER_POOL;</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-spi.c b/arch/mips/cavium-octeon/executive/cvmx-spi.c<br/>index 82794d920cec..74afb1710cd9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-spi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/cvmx-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/executive/cvmx-spi.c</a></div><div class='hunk'>@@ -31,14 +31,14 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;asm/octeon/octeon.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-config.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-config.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-pko.h"</div><div class='del'>-#include "cvmx-spi.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-pko.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-spi.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "cvmx-spxx-defs.h"</div><div class='del'>-#include "cvmx-stxx-defs.h"</div><div class='del'>-#include "cvmx-srxx-defs.h"</div><div class='add'>+#include &lt;asm/octeon/cvmx-spxx-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-stxx-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-srxx-defs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define INVOKE_CB(function_p, args...)		\</div><div class='ctx'> 	do {					\</div><div class='head'>diff --git a/arch/mips/cavium-octeon/executive/octeon-model.c b/arch/mips/cavium-octeon/executive/octeon-model.c<br/>index c8d35684504e..f4c1b36fdf65 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/octeon-model.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/executive/octeon-model.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/executive/octeon-model.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/executive/octeon-model.c</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>  * Contact: support@caviumnetworks.com</div><div class='ctx'>  * This file is part of the OCTEON SDK</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2003-2008 Cavium Networks</div><div class='add'>+ * Copyright (c) 2003-2010 Cavium Networks</div><div class='ctx'>  *</div><div class='ctx'>  * This file is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License, Version 2, as</div><div class='hunk'>@@ -25,10 +25,6 @@</div><div class='ctx'>  * Contact Cavium Networks for more information</div><div class='ctx'>  ***********************license end**************************************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * File defining functions for working with different Octeon</div><div class='del'>- * models.</div><div class='del'>- */</div><div class='ctx'> #include &lt;asm/octeon/octeon.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -69,11 +65,12 @@ const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer)</div><div class='ctx'> 	char fuse_model[10];</div><div class='ctx'> 	uint32_t fuse_data = 0;</div><div class='ctx'> </div><div class='del'>-	fus3.u64 = cvmx_read_csr(CVMX_L2D_FUS3);</div><div class='add'>+	fus3.u64 = 0;</div><div class='add'>+	if (!OCTEON_IS_MODEL(OCTEON_CN6XXX))</div><div class='add'>+		fus3.u64 = cvmx_read_csr(CVMX_L2D_FUS3);</div><div class='ctx'> 	fus_dat2.u64 = cvmx_read_csr(CVMX_MIO_FUS_DAT2);</div><div class='ctx'> 	fus_dat3.u64 = cvmx_read_csr(CVMX_MIO_FUS_DAT3);</div><div class='del'>-</div><div class='del'>-	num_cores = cvmx_octeon_num_cores();</div><div class='add'>+	num_cores = cvmx_pop(cvmx_read_csr(CVMX_CIU_FUSE));</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure the non existent devices look disabled */</div><div class='ctx'> 	switch ((chip_id &gt;&gt; 8) &amp; 0xff) {</div><div class='hunk'>@@ -108,7 +105,7 @@ const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer)</div><div class='ctx'> 	 * Assume pass number is encoded using &lt;5:3&gt;&lt;2:0&gt;. Exceptions</div><div class='ctx'> 	 * will be fixed later.</div><div class='ctx'> 	 */</div><div class='del'>-	sprintf(pass, "%u.%u", ((chip_id &gt;&gt; 3) &amp; 7) + 1, chip_id &amp; 7);</div><div class='add'>+	sprintf(pass, "%d.%d", (int)((chip_id &gt;&gt; 3) &amp; 7) + 1, (int)chip_id &amp; 7);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Use the number of cores to determine the last 2 digits of</div><div class='hunk'>@@ -116,6 +113,12 @@ const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer)</div><div class='ctx'> 	 * later.</div><div class='ctx'> 	 */</div><div class='ctx'> 	switch (num_cores) {</div><div class='add'>+	case 32:</div><div class='add'>+		core_model = "80";</div><div class='add'>+		break;</div><div class='add'>+	case 24:</div><div class='add'>+		core_model = "70";</div><div class='add'>+		break;</div><div class='ctx'> 	case 16:</div><div class='ctx'> 		core_model = "60";</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -246,8 +249,8 @@ const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:		/* CN58XX */</div><div class='ctx'> 		family = "58";</div><div class='del'>-		/* Special case. 4 core, no crypto */</div><div class='del'>-		if ((num_cores == 4) &amp;&amp; fus_dat2.cn38xx.nocrypto)</div><div class='add'>+		/* Special case. 4 core, half cache (CP with half cache) */</div><div class='add'>+		if ((num_cores == 4) &amp;&amp; fus3.cn58xx.crip_1024k &amp;&amp; !strncmp(suffix, "CP", 2))</div><div class='ctx'> 			core_model = "29";</div><div class='ctx'> </div><div class='ctx'> 		/* Pass 1 uses different encodings for pass numbers */</div><div class='hunk'>@@ -285,6 +288,9 @@ const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer)</div><div class='ctx'> 				suffix = "NSP";</div><div class='ctx'> 				if (fus_dat3.s.nozip)</div><div class='ctx'> 					suffix = "SCP";</div><div class='add'>+</div><div class='add'>+				if (fus_dat3.s.bar2_en)</div><div class='add'>+					suffix = "NSPB2";</div><div class='ctx'> 			}</div><div class='ctx'> 			if (fus3.cn56xx.crip_1024k)</div><div class='ctx'> 				family = "54";</div><div class='hunk'>@@ -301,6 +307,60 @@ const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer)</div><div class='ctx'> 		else</div><div class='ctx'> 			family = "52";</div><div class='ctx'> 		break;</div><div class='add'>+	case 0x93:		/* CN61XX */</div><div class='add'>+		family = "61";</div><div class='add'>+		if (fus_dat2.cn61xx.nocrypto &amp;&amp; fus_dat2.cn61xx.dorm_crypto)</div><div class='add'>+			suffix = "AP";</div><div class='add'>+		if (fus_dat2.cn61xx.nocrypto)</div><div class='add'>+			suffix = "CP";</div><div class='add'>+		else if (fus_dat2.cn61xx.dorm_crypto)</div><div class='add'>+			suffix = "DAP";</div><div class='add'>+		else if (fus_dat3.cn61xx.nozip)</div><div class='add'>+			suffix = "SCP";</div><div class='add'>+		break;</div><div class='add'>+	case 0x90:		/* CN63XX */</div><div class='add'>+		family = "63";</div><div class='add'>+		if (fus_dat3.s.l2c_crip == 2)</div><div class='add'>+			family = "62";</div><div class='add'>+		if (num_cores == 6)	/* Other core counts match generic */</div><div class='add'>+			core_model = "35";</div><div class='add'>+		if (fus_dat2.cn63xx.nocrypto)</div><div class='add'>+			suffix = "CP";</div><div class='add'>+		else if (fus_dat2.cn63xx.dorm_crypto)</div><div class='add'>+			suffix = "DAP";</div><div class='add'>+		else if (fus_dat3.cn63xx.nozip)</div><div class='add'>+			suffix = "SCP";</div><div class='add'>+		else</div><div class='add'>+			suffix = "AAP";</div><div class='add'>+		break;</div><div class='add'>+	case 0x92:		/* CN66XX */</div><div class='add'>+		family = "66";</div><div class='add'>+		if (num_cores == 6)	/* Other core counts match generic */</div><div class='add'>+			core_model = "35";</div><div class='add'>+		if (fus_dat2.cn66xx.nocrypto &amp;&amp; fus_dat2.cn66xx.dorm_crypto)</div><div class='add'>+			suffix = "AP";</div><div class='add'>+		if (fus_dat2.cn66xx.nocrypto)</div><div class='add'>+			suffix = "CP";</div><div class='add'>+		else if (fus_dat2.cn66xx.dorm_crypto)</div><div class='add'>+			suffix = "DAP";</div><div class='add'>+		else if (fus_dat3.cn66xx.nozip)</div><div class='add'>+			suffix = "SCP";</div><div class='add'>+		else</div><div class='add'>+			suffix = "AAP";</div><div class='add'>+		break;</div><div class='add'>+	case 0x91:		/* CN68XX */</div><div class='add'>+		family = "68";</div><div class='add'>+		if (fus_dat2.cn68xx.nocrypto &amp;&amp; fus_dat3.cn68xx.nozip)</div><div class='add'>+			suffix = "CP";</div><div class='add'>+		else if (fus_dat2.cn68xx.dorm_crypto)</div><div class='add'>+			suffix = "DAP";</div><div class='add'>+		else if (fus_dat3.cn68xx.nozip)</div><div class='add'>+			suffix = "SCP";</div><div class='add'>+		else if (fus_dat2.cn68xx.nocrypto)</div><div class='add'>+			suffix = "SP";</div><div class='add'>+		else</div><div class='add'>+			suffix = "AAP";</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		family = "XX";</div><div class='ctx'> 		core_model = "XX";</div><div class='hunk'>@@ -310,49 +370,40 @@ const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	clock_mhz = octeon_get_clock_rate() / 1000000;</div><div class='del'>-</div><div class='ctx'> 	if (family[0] != '3') {</div><div class='add'>+		int fuse_base = 384 / 8;</div><div class='add'>+		if (family[0] == '6')</div><div class='add'>+			fuse_base = 832 / 8;</div><div class='add'>+</div><div class='ctx'> 		/* Check for model in fuses, overrides normal decode */</div><div class='ctx'> 		/* This is _not_ valid for Octeon CN3XXX models */</div><div class='del'>-		fuse_data |= cvmx_fuse_read_byte(51);</div><div class='add'>+		fuse_data |= cvmx_fuse_read_byte(fuse_base + 3);</div><div class='ctx'> 		fuse_data = fuse_data &lt;&lt; 8;</div><div class='del'>-		fuse_data |= cvmx_fuse_read_byte(50);</div><div class='add'>+		fuse_data |= cvmx_fuse_read_byte(fuse_base + 2);</div><div class='ctx'> 		fuse_data = fuse_data &lt;&lt; 8;</div><div class='del'>-		fuse_data |= cvmx_fuse_read_byte(49);</div><div class='add'>+		fuse_data |= cvmx_fuse_read_byte(fuse_base + 1);</div><div class='ctx'> 		fuse_data = fuse_data &lt;&lt; 8;</div><div class='del'>-		fuse_data |= cvmx_fuse_read_byte(48);</div><div class='add'>+		fuse_data |= cvmx_fuse_read_byte(fuse_base);</div><div class='ctx'> 		if (fuse_data &amp; 0x7ffff) {</div><div class='ctx'> 			int model = fuse_data &amp; 0x3fff;</div><div class='ctx'> 			int suffix = (fuse_data &gt;&gt; 14) &amp; 0x1f;</div><div class='ctx'> 			if (suffix &amp;&amp; model) {</div><div class='del'>-				/*</div><div class='del'>-				 * Have both number and suffix in</div><div class='del'>-				 * fuses, so both</div><div class='del'>-				 */</div><div class='del'>-				sprintf(fuse_model, "%d%c",</div><div class='del'>-					model, 'A' + suffix - 1);</div><div class='add'>+				/* Have both number and suffix in fuses, so both */</div><div class='add'>+				sprintf(fuse_model, "%d%c", model, 'A' + suffix - 1);</div><div class='ctx'> 				core_model = "";</div><div class='ctx'> 				family = fuse_model;</div><div class='ctx'> 			} else if (suffix &amp;&amp; !model) {</div><div class='del'>-				/*</div><div class='del'>-				 * Only have suffix, so add suffix to</div><div class='del'>-				 * 'normal' model number.</div><div class='del'>-				 */</div><div class='del'>-				sprintf(fuse_model, "%s%c", core_model,</div><div class='del'>-					'A' + suffix - 1);</div><div class='add'>+				/* Only have suffix, so add suffix to 'normal' model number */</div><div class='add'>+				sprintf(fuse_model, "%s%c", core_model, 'A' + suffix - 1);</div><div class='ctx'> 				core_model = fuse_model;</div><div class='ctx'> 			} else {</div><div class='del'>-				/*</div><div class='del'>-				 * Don't have suffix, so just use</div><div class='del'>-				 * model from fuses.</div><div class='del'>-				 */</div><div class='add'>+				/* Don't have suffix, so just use model from fuses */</div><div class='ctx'> 				sprintf(fuse_model, "%d", model);</div><div class='ctx'> 				core_model = "";</div><div class='ctx'> 				family = fuse_model;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	sprintf(buffer, "CN%s%sp%s-%d-%s",</div><div class='del'>-		family, core_model, pass, clock_mhz, suffix);</div><div class='add'>+	sprintf(buffer, "CN%s%sp%s-%d-%s", family, core_model, pass, clock_mhz, suffix);</div><div class='ctx'> 	return buffer;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c<br/>index 2d9028f1474c..260b27367347 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/setup.c</a></div><div class='hunk'>@@ -642,14 +642,6 @@ void __init plat_mem_setup(void)</div><div class='ctx'> </div><div class='ctx'> 	total = 0;</div><div class='ctx'> </div><div class='del'>-	/* First add the init memory we will be returning.  */</div><div class='del'>-	memory = __pa_symbol(&amp;__init_begin) &amp; PAGE_MASK;</div><div class='del'>-	mem_alloc_size = (__pa_symbol(&amp;__init_end) &amp; PAGE_MASK) - memory;</div><div class='del'>-	if (mem_alloc_size &gt; 0) {</div><div class='del'>-		add_memory_region(memory, mem_alloc_size, BOOT_MEM_RAM);</div><div class='del'>-		total += mem_alloc_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The Mips memory init uses the first memory location for</div><div class='ctx'> 	 * some memory vectors. When SPARSEMEM is in use, it doesn't</div><div class='hunk'>@@ -767,11 +759,11 @@ void prom_free_prom_memory(void)</div><div class='ctx'> 			: "=r" (insn) : : "$31", "memory");</div><div class='ctx'> </div><div class='ctx'> 		if ((insn &gt;&gt; 26) != 0x33)</div><div class='del'>-			panic("No PREF instruction at Core-14449 probe point.\n");</div><div class='add'>+			panic("No PREF instruction at Core-14449 probe point.");</div><div class='ctx'> </div><div class='ctx'> 		if (((insn &gt;&gt; 16) &amp; 0x1f) != 28)</div><div class='ctx'> 			panic("Core-14449 WAR not in place (%04x).\n"</div><div class='del'>-			      "Please build kernel with proper options (CONFIG_CAVIUM_CN63XXP1).\n", insn);</div><div class='add'>+			      "Please build kernel with proper options (CONFIG_CAVIUM_CN63XXP1).", insn);</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_CAVIUM_DECODE_RSL</div><div class='ctx'> 	cvmx_interrupt_rsl_enable();</div><div class='hunk'>@@ -779,7 +771,7 @@ void prom_free_prom_memory(void)</div><div class='ctx'> 	/* Add an interrupt handler for general failures. */</div><div class='ctx'> 	if (request_irq(OCTEON_IRQ_RML, octeon_rlm_interrupt, IRQF_SHARED,</div><div class='ctx'> 			"RML/RSL", octeon_rlm_interrupt)) {</div><div class='del'>-		panic("Unable to request_irq(OCTEON_IRQ_RML)\n");</div><div class='add'>+		panic("Unable to request_irq(OCTEON_IRQ_RML)");</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c<br/>index efcfff4d4627..b1535fe409d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/smp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/cavium-octeon/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cavium-octeon/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/cavium-octeon/smp.c</a></div><div class='hunk'>@@ -210,7 +210,7 @@ void octeon_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	if (request_irq(OCTEON_IRQ_MBOX0, mailbox_interrupt,</div><div class='ctx'> 			IRQF_PERCPU | IRQF_NO_THREAD, "SMP-IPI",</div><div class='ctx'> 			mailbox_interrupt)) {</div><div class='del'>-		panic("Cannot request_irq(OCTEON_IRQ_MBOX0)\n");</div><div class='add'>+		panic("Cannot request_irq(OCTEON_IRQ_MBOX0)");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig<br/>index 4044c9e0fb73..17a36c125172 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/db1000_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/configs/db1000_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/db1000_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/configs/db1000_defconfig</a></div><div class='hunk'>@@ -1,118 +1,359 @@</div><div class='add'>+CONFIG_MIPS=y</div><div class='ctx'> CONFIG_MIPS_ALCHEMY=y</div><div class='add'>+CONFIG_MIPS_DB1000=y</div><div class='add'>+CONFIG_SCHED_OMIT_FRAME_POINTER=y</div><div class='add'>+CONFIG_TICK_ONESHOT=y</div><div class='ctx'> CONFIG_NO_HZ=y</div><div class='ctx'> CONFIG_HIGH_RES_TIMERS=y</div><div class='ctx'> CONFIG_HZ_100=y</div><div class='del'>-# CONFIG_SECCOMP is not set</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+CONFIG_PREEMPT_NONE=y</div><div class='ctx'> CONFIG_EXPERIMENTAL=y</div><div class='del'>-CONFIG_LOCALVERSION="-db1000"</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_CROSS_COMPILE=""</div><div class='add'>+CONFIG_LOCALVERSION="-db1x00"</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='ctx'> CONFIG_KERNEL_LZMA=y</div><div class='add'>+CONFIG_DEFAULT_HOSTNAME="db1x00"</div><div class='add'>+CONFIG_SWAP=y</div><div class='ctx'> CONFIG_SYSVIPC=y</div><div class='del'>-CONFIG_POSIX_MQUEUE=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+CONFIG_FHANDLE=y</div><div class='add'>+CONFIG_AUDIT=y</div><div class='ctx'> CONFIG_TINY_RCU=y</div><div class='del'>-CONFIG_LOG_BUF_SHIFT=14</div><div class='del'>-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=18</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+CONFIG_UTS_NS=y</div><div class='add'>+CONFIG_IPC_NS=y</div><div class='add'>+CONFIG_USER_NS=y</div><div class='add'>+CONFIG_PID_NS=y</div><div class='add'>+CONFIG_NET_NS=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='ctx'> CONFIG_EXPERT=y</div><div class='del'>-# CONFIG_KALLSYMS is not set</div><div class='del'>-# CONFIG_PCSPKR_PLATFORM is not set</div><div class='del'>-# CONFIG_VM_EVENT_COUNTERS is not set</div><div class='del'>-# CONFIG_COMPAT_BRK is not set</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+CONFIG_KALLSYMS_ALL=y</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_AIO=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_HAVE_PERF_EVENTS=y</div><div class='add'>+CONFIG_PERF_USE_VMALLOC=y</div><div class='add'>+CONFIG_PCI_QUIRKS=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='del'>-CONFIG_MODULES=y</div><div class='del'>-CONFIG_MODULE_UNLOAD=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='del'>-# CONFIG_BLK_DEV_BSG is not set</div><div class='del'>-# CONFIG_IOSCHED_DEADLINE is not set</div><div class='del'>-# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+CONFIG_LBDAF=y</div><div class='add'>+CONFIG_BLK_DEV_BSG=y</div><div class='add'>+CONFIG_BLK_DEV_BSGLIB=y</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_DEFAULT_NOOP=y</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="noop"</div><div class='add'>+CONFIG_FREEZER=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_PCI_DOMAINS=y</div><div class='ctx'> CONFIG_PCCARD=y</div><div class='add'>+CONFIG_PCMCIA=y</div><div class='add'>+CONFIG_PCMCIA_LOAD_CIS=y</div><div class='ctx'> CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y</div><div class='del'>-CONFIG_PM=y</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y</div><div class='add'>+CONFIG_SUSPEND=y</div><div class='add'>+CONFIG_SUSPEND_FREEZER=y</div><div class='add'>+CONFIG_PM_SLEEP=y</div><div class='ctx'> CONFIG_PM_RUNTIME=y</div><div class='add'>+CONFIG_PM=y</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_MULTICAST=y</div><div class='ctx'> CONFIG_IP_PNP=y</div><div class='ctx'> CONFIG_IP_PNP_DHCP=y</div><div class='ctx'> CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> CONFIG_IP_PNP_RARP=y</div><div class='del'>-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='del'>-# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='del'>-# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='del'>-# CONFIG_INET_DIAG is not set</div><div class='del'>-# CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_WIRELESS is not set</div><div class='del'>-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_NET_IPIP=y</div><div class='add'>+CONFIG_INET_TUNNEL=y</div><div class='add'>+CONFIG_INET_LRO=y</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+CONFIG_IPV6=y</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET6_XFRM_MODE_BEET=y</div><div class='add'>+CONFIG_IPV6_SIT=y</div><div class='add'>+CONFIG_IPV6_NDISC_NODETYPE=y</div><div class='add'>+CONFIG_STP=y</div><div class='add'>+CONFIG_GARP=y</div><div class='add'>+CONFIG_BRIDGE=y</div><div class='add'>+CONFIG_BRIDGE_IGMP_SNOOPING=y</div><div class='add'>+CONFIG_VLAN_8021Q=y</div><div class='add'>+CONFIG_VLAN_8021Q_GVRP=y</div><div class='add'>+CONFIG_LLC=y</div><div class='add'>+CONFIG_LLC2=y</div><div class='add'>+CONFIG_DNS_RESOLVER=y</div><div class='add'>+CONFIG_BT=y</div><div class='add'>+CONFIG_BT_L2CAP=y</div><div class='add'>+CONFIG_BT_SCO=y</div><div class='add'>+CONFIG_BT_RFCOMM=y</div><div class='add'>+CONFIG_BT_RFCOMM_TTY=y</div><div class='add'>+CONFIG_BT_BNEP=y</div><div class='add'>+CONFIG_BT_BNEP_MC_FILTER=y</div><div class='add'>+CONFIG_BT_BNEP_PROTO_FILTER=y</div><div class='add'>+CONFIG_BT_HIDP=y</div><div class='add'>+CONFIG_BT_HCIBTUSB=y</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH=""</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='ctx'> CONFIG_MTD=y</div><div class='del'>-CONFIG_MTD_PARTITIONS=y</div><div class='ctx'> CONFIG_MTD_CMDLINE_PARTS=y</div><div class='ctx'> CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='ctx'> CONFIG_MTD_BLOCK=y</div><div class='ctx'> CONFIG_MTD_CFI=y</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+CONFIG_MTD_CFI_ADV_OPTIONS=y</div><div class='add'>+CONFIG_MTD_CFI_NOSWAP=y</div><div class='add'>+CONFIG_MTD_CFI_GEOMETRY=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+CONFIG_MTD_CFI_I4=y</div><div class='add'>+CONFIG_MTD_CFI_I8=y</div><div class='add'>+CONFIG_MTD_CFI_INTELEXT=y</div><div class='ctx'> CONFIG_MTD_CFI_AMDSTD=y</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='ctx'> CONFIG_MTD_PHYSMAP=y</div><div class='del'>-# CONFIG_MISC_DEVICES is not set</div><div class='add'>+CONFIG_SCSI_MOD=y</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+CONFIG_CHR_DEV_SG=y</div><div class='add'>+CONFIG_SCSI_MULTI_LUN=y</div><div class='add'>+CONFIG_SCSI_CONSTANTS=y</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+CONFIG_ATA_VERBOSE_ERROR=y</div><div class='add'>+CONFIG_ATA_SFF=y</div><div class='add'>+CONFIG_ATA_BMDMA=y</div><div class='add'>+CONFIG_PATA_HPT37X=y</div><div class='add'>+CONFIG_PATA_PCMCIA=y</div><div class='add'>+CONFIG_MD=y</div><div class='add'>+CONFIG_BLK_DEV_DM=y</div><div class='add'>+CONFIG_FIREWIRE=y</div><div class='add'>+CONFIG_FIREWIRE_OHCI=y</div><div class='add'>+CONFIG_FIREWIRE_OHCI_DEBUG=y</div><div class='add'>+CONFIG_FIREWIRE_NET=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-CONFIG_MARVELL_PHY=y</div><div class='del'>-CONFIG_DAVICOM_PHY=y</div><div class='del'>-CONFIG_QSEMI_PHY=y</div><div class='del'>-CONFIG_LXT_PHY=y</div><div class='del'>-CONFIG_CICADA_PHY=y</div><div class='del'>-CONFIG_VITESSE_PHY=y</div><div class='del'>-CONFIG_SMSC_PHY=y</div><div class='del'>-CONFIG_BROADCOM_PHY=y</div><div class='del'>-CONFIG_ICPLUS_PHY=y</div><div class='del'>-CONFIG_REALTEK_PHY=y</div><div class='del'>-CONFIG_NATIONAL_PHY=y</div><div class='del'>-CONFIG_STE10XP=y</div><div class='del'>-CONFIG_LSI_ET1011C_PHY=y</div><div class='del'>-CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MIPS_AU1X00_ENET=y</div><div class='del'>-# CONFIG_NETDEV_1000 is not set</div><div class='del'>-# CONFIG_NETDEV_10000 is not set</div><div class='del'>-# CONFIG_WLAN is not set</div><div class='del'>-# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+CONFIG_NET_PCMCIA=y</div><div class='add'>+CONFIG_PCMCIA_3C589=y</div><div class='add'>+CONFIG_PCMCIA_PCNET=y</div><div class='add'>+CONFIG_PPP=y</div><div class='add'>+CONFIG_PPP_MULTILINK=y</div><div class='add'>+CONFIG_PPP_FILTER=y</div><div class='add'>+CONFIG_PPP_ASYNC=y</div><div class='add'>+CONFIG_PPP_SYNC_TTY=y</div><div class='add'>+CONFIG_PPP_DEFLATE=y</div><div class='add'>+CONFIG_PPP_BSDCOMP=y</div><div class='add'>+CONFIG_PPP_MPPE=y</div><div class='add'>+CONFIG_PPPOE=y</div><div class='add'>+CONFIG_INPUT=y</div><div class='ctx'> CONFIG_INPUT_EVDEV=y</div><div class='del'>-# CONFIG_INPUT_KEYBOARD is not set</div><div class='del'>-# CONFIG_INPUT_MOUSE is not set</div><div class='del'>-# CONFIG_SERIO is not set</div><div class='add'>+CONFIG_INPUT_MISC=y</div><div class='add'>+CONFIG_INPUT_UINPUT=y</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> CONFIG_SERIAL_8250=y</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='del'>-# CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_HW_RANDOM is not set</div><div class='del'>-# CONFIG_HWMON is not set</div><div class='del'>-# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_TTY_PRINTK=y</div><div class='add'>+CONFIG_DEVPORT=y</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=y</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=y</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='add'>+CONFIG_FB_AU1100=y</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y</div><div class='add'>+CONFIG_FONTS=y</div><div class='add'>+CONFIG_FONT_8x16=y</div><div class='add'>+CONFIG_SOUND=y</div><div class='add'>+CONFIG_SND=y</div><div class='add'>+CONFIG_SND_TIMER=y</div><div class='add'>+CONFIG_SND_PCM=y</div><div class='add'>+CONFIG_SND_JACK=y</div><div class='add'>+CONFIG_SND_SEQUENCER=y</div><div class='add'>+CONFIG_SND_HRTIMER=y</div><div class='add'>+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y</div><div class='add'>+CONFIG_SND_DYNAMIC_MINORS=y</div><div class='add'>+CONFIG_SND_VMASTER=y</div><div class='add'>+CONFIG_SND_AC97_CODEC=y</div><div class='add'>+CONFIG_SND_SOC=y</div><div class='add'>+CONFIG_SND_SOC_AC97_BUS=y</div><div class='add'>+CONFIG_SND_SOC_AU1XAUDIO=y</div><div class='add'>+CONFIG_SND_SOC_AU1XAC97C=y</div><div class='add'>+CONFIG_SND_SOC_DB1000=y</div><div class='add'>+CONFIG_SND_SOC_AC97_CODEC=y</div><div class='add'>+CONFIG_AC97_BUS=y</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+CONFIG_HIDRAW=y</div><div class='add'>+CONFIG_USB_HID=y</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='ctx'> CONFIG_USB=y</div><div class='del'>-# CONFIG_USB_DEVICE_CLASS is not set</div><div class='del'>-CONFIG_USB_DYNAMIC_MINORS=y</div><div class='ctx'> CONFIG_USB_SUSPEND=y</div><div class='add'>+CONFIG_USB_EHCI_HCD=y</div><div class='add'>+CONFIG_USB_EHCI_ROOT_HUB_TT=y</div><div class='add'>+CONFIG_USB_EHCI_TT_NEWSCHED=y</div><div class='ctx'> CONFIG_USB_OHCI_HCD=y</div><div class='add'>+CONFIG_USB_UHCI_HCD=y</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='add'>+CONFIG_NEW_LEDS=y</div><div class='add'>+CONFIG_LEDS_CLASS=y</div><div class='add'>+CONFIG_LEDS_TRIGGERS=y</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='ctx'> CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> CONFIG_RTC_DRV_AU1XXX=y</div><div class='del'>-CONFIG_EXT2_FS=y</div><div class='del'>-CONFIG_EXT3_FS=y</div><div class='del'>-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set</div><div class='del'>-# CONFIG_EXT3_FS_XATTR is not set</div><div class='del'>-# CONFIG_PROC_PAGE_MONITOR is not set</div><div class='add'>+CONFIG_EXT4_FS=y</div><div class='add'>+CONFIG_EXT4_USE_FOR_EXT23=y</div><div class='add'>+CONFIG_EXT4_FS_XATTR=y</div><div class='add'>+CONFIG_EXT4_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_EXT4_FS_SECURITY=y</div><div class='add'>+CONFIG_JBD2=y</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+CONFIG_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_EXPORTFS=y</div><div class='add'>+CONFIG_FILE_LOCKING=y</div><div class='add'>+CONFIG_FSNOTIFY=y</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+CONFIG_GENERIC_ACL=y</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='ctx'> CONFIG_TMPFS=y</div><div class='del'>-CONFIG_CRAMFS=y</div><div class='add'>+CONFIG_TMPFS_POSIX_ACL=y</div><div class='add'>+CONFIG_TMPFS_XATTR=y</div><div class='add'>+CONFIG_MISC_FILESYSTEMS=y</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+CONFIG_JFFS2_SUMMARY=y</div><div class='add'>+CONFIG_JFFS2_FS_XATTR=y</div><div class='add'>+CONFIG_JFFS2_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_JFFS2_FS_SECURITY=y</div><div class='add'>+CONFIG_JFFS2_COMPRESSION_OPTIONS=y</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+CONFIG_JFFS2_LZO=y</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+CONFIG_JFFS2_RUBIN=y</div><div class='add'>+CONFIG_JFFS2_CMODE_PRIORITY=y</div><div class='ctx'> CONFIG_SQUASHFS=y</div><div class='add'>+CONFIG_SQUASHFS_ZLIB=y</div><div class='add'>+CONFIG_SQUASHFS_LZO=y</div><div class='add'>+CONFIG_SQUASHFS_XZ=y</div><div class='add'>+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_NFS_V4_1=y</div><div class='add'>+CONFIG_PNFS_FILE_LAYOUT=y</div><div class='add'>+CONFIG_PNFS_BLOCK=y</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_NFS_USE_KERNEL_DNS=y</div><div class='add'>+CONFIG_NFS_USE_NEW_IDMAPPER=y</div><div class='add'>+CONFIG_NFSD=y</div><div class='add'>+CONFIG_NFSD_V2_ACL=y</div><div class='add'>+CONFIG_NFSD_V3=y</div><div class='add'>+CONFIG_NFSD_V3_ACL=y</div><div class='add'>+CONFIG_NFSD_V4=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_ACL_SUPPORT=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+CONFIG_SUNRPC_BACKCHANNEL=y</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> CONFIG_NLS_CODEPAGE_437=y</div><div class='ctx'> CONFIG_NLS_CODEPAGE_850=y</div><div class='ctx'> CONFIG_NLS_CODEPAGE_1250=y</div><div class='add'>+CONFIG_NLS_ASCII=y</div><div class='ctx'> CONFIG_NLS_ISO8859_1=y</div><div class='ctx'> CONFIG_NLS_ISO8859_15=y</div><div class='ctx'> CONFIG_NLS_UTF8=y</div><div class='del'>-# CONFIG_ENABLE_WARN_DEPRECATED is not set</div><div class='del'>-# CONFIG_ENABLE_MUST_CHECK is not set</div><div class='del'>-CONFIG_STRIP_ASM_SYMS=y</div><div class='del'>-CONFIG_DEBUG_KERNEL=y</div><div class='del'>-# CONFIG_SCHED_DEBUG is not set</div><div class='del'>-# CONFIG_FTRACE is not set</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_CMDLINE_BOOL=y</div><div class='add'>+CONFIG_CMDLINE="noirqdebug rootwait root=/dev/sda1 rootfstype=ext4 console=ttyS0,115200 video=au1100fb:panel:CRT_800x600_16"</div><div class='ctx'> CONFIG_DEBUG_ZBOOT=y</div><div class='ctx'> CONFIG_KEYS=y</div><div class='ctx'> CONFIG_KEYS_DEBUG_PROC_KEYS=y</div><div class='add'>+CONFIG_SECURITYFS=y</div><div class='add'>+CONFIG_DEFAULT_SECURITY_DAC=y</div><div class='add'>+CONFIG_DEFAULT_SECURITY=""</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+CONFIG_CRYPTO_ALGAPI=y</div><div class='add'>+CONFIG_CRYPTO_ALGAPI2=y</div><div class='add'>+CONFIG_CRYPTO_AEAD2=y</div><div class='add'>+CONFIG_CRYPTO_BLKCIPHER=y</div><div class='add'>+CONFIG_CRYPTO_BLKCIPHER2=y</div><div class='add'>+CONFIG_CRYPTO_HASH=y</div><div class='add'>+CONFIG_CRYPTO_HASH2=y</div><div class='add'>+CONFIG_CRYPTO_RNG=y</div><div class='add'>+CONFIG_CRYPTO_RNG2=y</div><div class='add'>+CONFIG_CRYPTO_PCOMP2=y</div><div class='add'>+CONFIG_CRYPTO_MANAGER=y</div><div class='add'>+CONFIG_CRYPTO_MANAGER2=y</div><div class='add'>+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y</div><div class='add'>+CONFIG_CRYPTO_WORKQUEUE=y</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+CONFIG_CRYPTO_SHA1=y</div><div class='add'>+CONFIG_CRYPTO_AES=y</div><div class='add'>+CONFIG_CRYPTO_ANSI_CPRNG=y</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+CONFIG_CRC_CCITT=y</div><div class='add'>+CONFIG_CRC16=y</div><div class='add'>+CONFIG_CRC_ITU_T=y</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_LZO_COMPRESS=y</div><div class='add'>+CONFIG_LZO_DECOMPRESS=y</div><div class='add'>+CONFIG_XZ_DEC=y</div><div class='head'>diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig<br/>deleted file mode 100644<br/>index c6b49938ee84..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/db1100_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/configs/db1100_defconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,122 +0,0 @@</div><div class='del'>-CONFIG_MIPS_ALCHEMY=y</div><div class='del'>-CONFIG_MIPS_DB1100=y</div><div class='del'>-CONFIG_NO_HZ=y</div><div class='del'>-CONFIG_HIGH_RES_TIMERS=y</div><div class='del'>-CONFIG_HZ_100=y</div><div class='del'>-# CONFIG_SECCOMP is not set</div><div class='del'>-CONFIG_EXPERIMENTAL=y</div><div class='del'>-CONFIG_LOCALVERSION="-db1100"</div><div class='del'>-CONFIG_KERNEL_LZMA=y</div><div class='del'>-CONFIG_SYSVIPC=y</div><div class='del'>-CONFIG_POSIX_MQUEUE=y</div><div class='del'>-CONFIG_TINY_RCU=y</div><div class='del'>-CONFIG_LOG_BUF_SHIFT=14</div><div class='del'>-CONFIG_EXPERT=y</div><div class='del'>-# CONFIG_SYSCTL_SYSCALL is not set</div><div class='del'>-# CONFIG_KALLSYMS is not set</div><div class='del'>-# CONFIG_PCSPKR_PLATFORM is not set</div><div class='del'>-# CONFIG_COMPAT_BRK is not set</div><div class='del'>-CONFIG_SLAB=y</div><div class='del'>-CONFIG_MODULES=y</div><div class='del'>-CONFIG_MODULE_UNLOAD=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='del'>-# CONFIG_BLK_DEV_BSG is not set</div><div class='del'>-# CONFIG_IOSCHED_DEADLINE is not set</div><div class='del'>-# CONFIG_IOSCHED_CFQ is not set</div><div class='del'>-CONFIG_PCCARD=y</div><div class='del'>-CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y</div><div class='del'>-CONFIG_PM=y</div><div class='del'>-CONFIG_PM_RUNTIME=y</div><div class='del'>-CONFIG_NET=y</div><div class='del'>-CONFIG_PACKET=y</div><div class='del'>-CONFIG_UNIX=y</div><div class='del'>-CONFIG_INET=y</div><div class='del'>-CONFIG_IP_MULTICAST=y</div><div class='del'>-CONFIG_IP_PNP=y</div><div class='del'>-CONFIG_IP_PNP_DHCP=y</div><div class='del'>-CONFIG_IP_PNP_BOOTP=y</div><div class='del'>-CONFIG_IP_PNP_RARP=y</div><div class='del'>-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='del'>-# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='del'>-# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='del'>-# CONFIG_INET_DIAG is not set</div><div class='del'>-# CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_WIRELESS is not set</div><div class='del'>-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='del'>-CONFIG_MTD=y</div><div class='del'>-CONFIG_MTD_PARTITIONS=y</div><div class='del'>-CONFIG_MTD_CHAR=y</div><div class='del'>-CONFIG_MTD_BLOCK=y</div><div class='del'>-CONFIG_MTD_CFI=y</div><div class='del'>-CONFIG_MTD_CFI_AMDSTD=y</div><div class='del'>-CONFIG_MTD_PHYSMAP=y</div><div class='del'>-# CONFIG_BLK_DEV is not set</div><div class='del'>-# CONFIG_MISC_DEVICES is not set</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_IDE_TASK_IOCTL=y</div><div class='del'>-CONFIG_NETDEVICES=y</div><div class='del'>-CONFIG_MARVELL_PHY=y</div><div class='del'>-CONFIG_DAVICOM_PHY=y</div><div class='del'>-CONFIG_QSEMI_PHY=y</div><div class='del'>-CONFIG_LXT_PHY=y</div><div class='del'>-CONFIG_CICADA_PHY=y</div><div class='del'>-CONFIG_VITESSE_PHY=y</div><div class='del'>-CONFIG_SMSC_PHY=y</div><div class='del'>-CONFIG_BROADCOM_PHY=y</div><div class='del'>-CONFIG_ICPLUS_PHY=y</div><div class='del'>-CONFIG_REALTEK_PHY=y</div><div class='del'>-CONFIG_NATIONAL_PHY=y</div><div class='del'>-CONFIG_STE10XP=y</div><div class='del'>-CONFIG_LSI_ET1011C_PHY=y</div><div class='del'>-CONFIG_NET_ETHERNET=y</div><div class='del'>-CONFIG_MII=y</div><div class='del'>-CONFIG_MIPS_AU1X00_ENET=y</div><div class='del'>-# CONFIG_NETDEV_1000 is not set</div><div class='del'>-# CONFIG_NETDEV_10000 is not set</div><div class='del'>-# CONFIG_WLAN is not set</div><div class='del'>-# CONFIG_INPUT_MOUSEDEV is not set</div><div class='del'>-CONFIG_INPUT_EVDEV=y</div><div class='del'>-# CONFIG_INPUT_KEYBOARD is not set</div><div class='del'>-# CONFIG_INPUT_MOUSE is not set</div><div class='del'>-# CONFIG_SERIO is not set</div><div class='del'>-CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='del'>-CONFIG_SERIAL_8250=y</div><div class='del'>-CONFIG_SERIAL_8250_CONSOLE=y</div><div class='del'>-# CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_HW_RANDOM is not set</div><div class='del'>-# CONFIG_HWMON is not set</div><div class='del'>-CONFIG_FB=y</div><div class='del'>-CONFIG_FB_AU1100=y</div><div class='del'>-# CONFIG_VGA_CONSOLE is not set</div><div class='del'>-CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='del'>-CONFIG_FONTS=y</div><div class='del'>-CONFIG_FONT_8x16=y</div><div class='del'>-# CONFIG_HID_SUPPORT is not set</div><div class='del'>-CONFIG_USB=y</div><div class='del'>-# CONFIG_USB_DEVICE_CLASS is not set</div><div class='del'>-CONFIG_USB_DYNAMIC_MINORS=y</div><div class='del'>-CONFIG_USB_SUSPEND=y</div><div class='del'>-CONFIG_USB_OHCI_HCD=y</div><div class='del'>-CONFIG_RTC_CLASS=y</div><div class='del'>-CONFIG_RTC_DRV_AU1XXX=y</div><div class='del'>-CONFIG_EXT2_FS=y</div><div class='del'>-# CONFIG_PROC_PAGE_MONITOR is not set</div><div class='del'>-CONFIG_TMPFS=y</div><div class='del'>-CONFIG_JFFS2_FS=y</div><div class='del'>-CONFIG_JFFS2_SUMMARY=y</div><div class='del'>-CONFIG_JFFS2_FS_XATTR=y</div><div class='del'>-CONFIG_JFFS2_COMPRESSION_OPTIONS=y</div><div class='del'>-CONFIG_JFFS2_LZO=y</div><div class='del'>-CONFIG_JFFS2_RUBIN=y</div><div class='del'>-CONFIG_SQUASHFS=y</div><div class='del'>-CONFIG_NFS_FS=y</div><div class='del'>-CONFIG_NFS_V3=y</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='del'>-CONFIG_STRIP_ASM_SYMS=y</div><div class='del'>-CONFIG_DEBUG_KERNEL=y</div><div class='del'>-# CONFIG_SCHED_DEBUG is not set</div><div class='del'>-# CONFIG_FTRACE is not set</div><div class='del'>-CONFIG_DEBUG_ZBOOT=y</div><div class='del'>-CONFIG_KEYS=y</div><div class='del'>-CONFIG_KEYS_DEBUG_PROC_KEYS=y</div><div class='del'>-CONFIG_SECURITYFS=y</div><div class='head'>diff --git a/arch/mips/configs/db1300_defconfig b/arch/mips/configs/db1300_defconfig<br/>new file mode 100644<br/>index 000000000000..c38b190151c4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/db1300_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/configs/db1300_defconfig</a></div><div class='hunk'>@@ -0,0 +1,391 @@</div><div class='add'>+CONFIG_MIPS=y</div><div class='add'>+CONFIG_MIPS_ALCHEMY=y</div><div class='add'>+CONFIG_ALCHEMY_GPIOINT_AU1300=y</div><div class='add'>+CONFIG_MIPS_DB1300=y</div><div class='add'>+CONFIG_SOC_AU1300=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+CONFIG_ARCH_SUPPORTS_OPROFILE=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS=y</div><div class='add'>+CONFIG_GENERIC_CMOS_UPDATE=y</div><div class='add'>+CONFIG_SCHED_OMIT_FRAME_POINTER=y</div><div class='add'>+CONFIG_CEVT_R4K_LIB=y</div><div class='add'>+CONFIG_CSRC_R4K_LIB=y</div><div class='add'>+CONFIG_DMA_COHERENT=y</div><div class='add'>+CONFIG_SYS_HAS_EARLY_PRINTK=y</div><div class='add'>+CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_CPU_LITTLE_ENDIAN=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_APM_EMULATION=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y</div><div class='add'>+CONFIG_IRQ_CPU=y</div><div class='add'>+CONFIG_MIPS_L1_CACHE_SHIFT=5</div><div class='add'>+CONFIG_CPU_MIPS32_R1=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_ZBOOT=y</div><div class='add'>+CONFIG_SYS_HAS_CPU_MIPS32_R1=y</div><div class='add'>+CONFIG_CPU_MIPS32=y</div><div class='add'>+CONFIG_CPU_MIPSR1=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y</div><div class='add'>+CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y</div><div class='add'>+CONFIG_HARDWARE_WATCHPOINTS=y</div><div class='add'>+CONFIG_32BIT=y</div><div class='add'>+CONFIG_PAGE_SIZE_4KB=y</div><div class='add'>+CONFIG_FORCE_MAX_ZONEORDER=11</div><div class='add'>+CONFIG_CPU_HAS_PREFETCH=y</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+CONFIG_64BIT_PHYS_ADDR=y</div><div class='add'>+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y</div><div class='add'>+CONFIG_CPU_HAS_SYNC=y</div><div class='add'>+CONFIG_CPU_SUPPORTS_HIGHMEM=y</div><div class='add'>+CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+CONFIG_ARCH_POPULATES_NODE_MAP=y</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+CONFIG_PAGEFLAGS_EXTENDED=y</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_COMPACTION=y</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='add'>+CONFIG_PHYS_ADDR_T_64BIT=y</div><div class='add'>+CONFIG_ZONE_DMA_FLAG=0</div><div class='add'>+CONFIG_VIRT_TO_BUS=y</div><div class='add'>+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096</div><div class='add'>+CONFIG_NEED_PER_CPU_KM=y</div><div class='add'>+CONFIG_TICK_ONESHOT=y</div><div class='add'>+CONFIG_NO_HZ=y</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y</div><div class='add'>+CONFIG_HZ_100=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+CONFIG_PREEMPT_NONE=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+CONFIG_CONSTRUCTORS=y</div><div class='add'>+CONFIG_HAVE_IRQ_WORK=y</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+CONFIG_CROSS_COMPILE=""</div><div class='add'>+CONFIG_LOCALVERSION="-db1300"</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_HAVE_KERNEL_GZIP=y</div><div class='add'>+CONFIG_HAVE_KERNEL_BZIP2=y</div><div class='add'>+CONFIG_HAVE_KERNEL_LZMA=y</div><div class='add'>+CONFIG_HAVE_KERNEL_LZO=y</div><div class='add'>+CONFIG_KERNEL_LZMA=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+CONFIG_POSIX_MQUEUE_SYSCTL=y</div><div class='add'>+CONFIG_FHANDLE=y</div><div class='add'>+CONFIG_HAVE_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_GENERIC_IRQ_SHOW=y</div><div class='add'>+CONFIG_TINY_RCU=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=19</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+CONFIG_UTS_NS=y</div><div class='add'>+CONFIG_IPC_NS=y</div><div class='add'>+CONFIG_USER_NS=y</div><div class='add'>+CONFIG_PID_NS=y</div><div class='add'>+CONFIG_NET_NS=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_ANON_INODES=y</div><div class='add'>+CONFIG_EXPERT=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+CONFIG_KALLSYMS_ALL=y</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_AIO=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_HAVE_PERF_EVENTS=y</div><div class='add'>+CONFIG_PERF_USE_VMALLOC=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+CONFIG_HAVE_OPROFILE=y</div><div class='add'>+CONFIG_HAVE_KPROBES=y</div><div class='add'>+CONFIG_HAVE_KRETPROBES=y</div><div class='add'>+CONFIG_HAVE_DMA_ATTRS=y</div><div class='add'>+CONFIG_HAVE_DMA_API_DEBUG=y</div><div class='add'>+CONFIG_HAVE_ARCH_JUMP_LABEL=y</div><div class='add'>+CONFIG_HAVE_GENERIC_DMA_COHERENT=y</div><div class='add'>+CONFIG_SLABINFO=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+CONFIG_LBDAF=y</div><div class='add'>+CONFIG_BLK_DEV_BSG=y</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_DEFAULT_NOOP=y</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="noop"</div><div class='add'>+CONFIG_INLINE_SPIN_UNLOCK=y</div><div class='add'>+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y</div><div class='add'>+CONFIG_INLINE_READ_UNLOCK=y</div><div class='add'>+CONFIG_INLINE_READ_UNLOCK_IRQ=y</div><div class='add'>+CONFIG_INLINE_WRITE_UNLOCK=y</div><div class='add'>+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_PCCARD=y</div><div class='add'>+CONFIG_PCMCIA=y</div><div class='add'>+CONFIG_PCMCIA_LOAD_CIS=y</div><div class='add'>+CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y</div><div class='add'>+CONFIG_TRAD_SIGNALS=y</div><div class='add'>+CONFIG_ARCH_HIBERNATION_POSSIBLE=y</div><div class='add'>+CONFIG_ARCH_SUSPEND_POSSIBLE=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_XFRM=y</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=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_INET_TUNNEL=y</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+CONFIG_IPV6=y</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET6_XFRM_MODE_BEET=y</div><div class='add'>+CONFIG_IPV6_SIT=y</div><div class='add'>+CONFIG_IPV6_NDISC_NODETYPE=y</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='add'>+CONFIG_EXTRA_FIRMWARE=""</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+CONFIG_MTD_CFI_AMDSTD=y</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='add'>+CONFIG_MTD_PHYSMAP=y</div><div class='add'>+CONFIG_MTD_NAND_ECC=y</div><div class='add'>+CONFIG_MTD_NAND=y</div><div class='add'>+CONFIG_MTD_NAND_IDS=y</div><div class='add'>+CONFIG_MTD_NAND_PLATFORM=y</div><div class='add'>+CONFIG_BLK_DEV=y</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+CONFIG_BLK_DEV_UB=y</div><div class='add'>+CONFIG_HAVE_IDE=y</div><div class='add'>+CONFIG_IDE=y</div><div class='add'>+CONFIG_IDE_GD=y</div><div class='add'>+CONFIG_IDE_GD_ATA=y</div><div class='add'>+CONFIG_BLK_DEV_IDECS=y</div><div class='add'>+CONFIG_IDE_TASK_IOCTL=y</div><div class='add'>+CONFIG_IDE_PROC_FS=y</div><div class='add'>+CONFIG_BLK_DEV_PLATFORM=y</div><div class='add'>+CONFIG_SCSI_MOD=y</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+CONFIG_SMSC_PHY=y</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_SMSC911X=y</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+CONFIG_KEYBOARD_GPIO=y</div><div class='add'>+CONFIG_INPUT_TOUCHSCREEN=y</div><div class='add'>+CONFIG_TOUCHSCREEN_WM97XX=y</div><div class='add'>+CONFIG_TOUCHSCREEN_WM9712=y</div><div class='add'>+CONFIG_TOUCHSCREEN_WM9713=y</div><div class='add'>+CONFIG_INPUT_MISC=y</div><div class='add'>+CONFIG_INPUT_UINPUT=y</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_SMBUS=y</div><div class='add'>+CONFIG_I2C_AU1550=y</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+CONFIG_SPI_MASTER=y</div><div class='add'>+CONFIG_SPI_AU1550=y</div><div class='add'>+CONFIG_SPI_BITBANG=y</div><div class='add'>+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+CONFIG_HWMON_VID=y</div><div class='add'>+CONFIG_SENSORS_ADM1025=y</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+CONFIG_FB_AU1200=y</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+CONFIG_FONTS=y</div><div class='add'>+CONFIG_FONT_ACORN_8x8=y</div><div class='add'>+CONFIG_LOGO=y</div><div class='add'>+CONFIG_LOGO_LINUX_CLUT224=y</div><div class='add'>+CONFIG_SOUND=y</div><div class='add'>+CONFIG_SND=y</div><div class='add'>+CONFIG_SND_TIMER=y</div><div class='add'>+CONFIG_SND_PCM=y</div><div class='add'>+CONFIG_SND_JACK=y</div><div class='add'>+CONFIG_SND_HRTIMER=y</div><div class='add'>+CONFIG_SND_DYNAMIC_MINORS=y</div><div class='add'>+CONFIG_SND_VERBOSE_PROCFS=y</div><div class='add'>+CONFIG_SND_VERBOSE_PRINTK=y</div><div class='add'>+CONFIG_SND_VMASTER=y</div><div class='add'>+CONFIG_SND_AC97_CODEC=y</div><div class='add'>+CONFIG_SND_SOC=y</div><div class='add'>+CONFIG_SND_SOC_CACHE_LZO=y</div><div class='add'>+CONFIG_SND_SOC_AC97_BUS=y</div><div class='add'>+CONFIG_SND_SOC_AU1XPSC=y</div><div class='add'>+CONFIG_SND_SOC_AU1XPSC_I2S=y</div><div class='add'>+CONFIG_SND_SOC_AU1XPSC_AC97=y</div><div class='add'>+CONFIG_SND_SOC_DB1300=y</div><div class='add'>+CONFIG_SND_SOC_I2C_AND_SPI=y</div><div class='add'>+CONFIG_SND_SOC_WM8731=y</div><div class='add'>+CONFIG_SND_SOC_WM9712=y</div><div class='add'>+CONFIG_AC97_BUS=y</div><div class='add'>+CONFIG_HID_SUPPORT=y</div><div class='add'>+CONFIG_HID=y</div><div class='add'>+CONFIG_HIDRAW=y</div><div class='add'>+CONFIG_USB_HID=y</div><div class='add'>+CONFIG_USB_HIDDEV=y</div><div class='add'>+CONFIG_USB_SUPPORT=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+CONFIG_USB_DYNAMIC_MINORS=y</div><div class='add'>+CONFIG_USB_EHCI_HCD=y</div><div class='add'>+CONFIG_USB_EHCI_ROOT_HUB_TT=y</div><div class='add'>+CONFIG_USB_EHCI_TT_NEWSCHED=y</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+CONFIG_RTC_INTF_DEV_UIE_EMUL=y</div><div class='add'>+CONFIG_RTC_DRV_AU1XXX=y</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+CONFIG_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_EXPORTFS=y</div><div class='add'>+CONFIG_FILE_LOCKING=y</div><div class='add'>+CONFIG_FSNOTIFY=y</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+CONFIG_GENERIC_ACL=y</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_PROC_PAGE_MONITOR=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+CONFIG_TMPFS_POSIX_ACL=y</div><div class='add'>+CONFIG_TMPFS_XATTR=y</div><div class='add'>+CONFIG_MISC_FILESYSTEMS=y</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+CONFIG_JFFS2_SUMMARY=y</div><div class='add'>+CONFIG_JFFS2_FS_XATTR=y</div><div class='add'>+CONFIG_JFFS2_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_JFFS2_FS_SECURITY=y</div><div class='add'>+CONFIG_JFFS2_COMPRESSION_OPTIONS=y</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+CONFIG_JFFS2_LZO=y</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+CONFIG_JFFS2_RUBIN=y</div><div class='add'>+CONFIG_JFFS2_CMODE_PRIORITY=y</div><div class='add'>+CONFIG_SQUASHFS=y</div><div class='add'>+CONFIG_SQUASHFS_XZ=y</div><div class='add'>+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=y</div><div class='add'>+CONFIG_NLS_CODEPAGE_850=y</div><div class='add'>+CONFIG_NLS_ASCII=y</div><div class='add'>+CONFIG_NLS_ISO8859_1=y</div><div class='add'>+CONFIG_NLS_ISO8859_15=y</div><div class='add'>+CONFIG_NLS_UTF8=y</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='add'>+CONFIG_PRINTK_TIME=y</div><div class='add'>+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4</div><div class='add'>+CONFIG_ENABLE_WARN_DEPRECATED=y</div><div class='add'>+CONFIG_ENABLE_MUST_CHECK=y</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+CONFIG_STRIP_ASM_SYMS=y</div><div class='add'>+CONFIG_HAVE_FUNCTION_TRACER=y</div><div class='add'>+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y</div><div class='add'>+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y</div><div class='add'>+CONFIG_HAVE_DYNAMIC_FTRACE=y</div><div class='add'>+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y</div><div class='add'>+CONFIG_HAVE_C_RECORDMCOUNT=y</div><div class='add'>+CONFIG_TRACING_SUPPORT=y</div><div class='add'>+CONFIG_HAVE_ARCH_KGDB=y</div><div class='add'>+CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_CMDLINE_BOOL=y</div><div class='add'>+CONFIG_CMDLINE="video=au1200fb:panel:bs console=tty console=ttyS2,115200"</div><div class='add'>+CONFIG_DEBUG_ZBOOT=y</div><div class='add'>+CONFIG_DEFAULT_SECURITY_DAC=y</div><div class='add'>+CONFIG_DEFAULT_SECURITY=""</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_LZO_COMPRESS=y</div><div class='add'>+CONFIG_LZO_DECOMPRESS=y</div><div class='add'>+CONFIG_XZ_DEC=y</div><div class='add'>+CONFIG_HAS_IOMEM=y</div><div class='add'>+CONFIG_HAS_IOPORT=y</div><div class='add'>+CONFIG_HAS_DMA=y</div><div class='add'>+CONFIG_NLATTR=y</div><div class='add'>+CONFIG_GENERIC_ATOMIC64=y</div><div class='head'>diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig<br/>deleted file mode 100644<br/>index b6e21c7cb6bd..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/db1500_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/configs/db1500_defconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,128 +0,0 @@</div><div class='del'>-CONFIG_MIPS_ALCHEMY=y</div><div class='del'>-CONFIG_MIPS_DB1500=y</div><div class='del'>-CONFIG_CPU_LITTLE_ENDIAN=y</div><div class='del'>-CONFIG_NO_HZ=y</div><div class='del'>-CONFIG_HIGH_RES_TIMERS=y</div><div class='del'>-CONFIG_HZ_100=y</div><div class='del'>-# CONFIG_SECCOMP is not set</div><div class='del'>-CONFIG_EXPERIMENTAL=y</div><div class='del'>-CONFIG_LOCALVERSION="-db1500"</div><div class='del'>-CONFIG_KERNEL_LZMA=y</div><div class='del'>-CONFIG_SYSVIPC=y</div><div class='del'>-CONFIG_LOG_BUF_SHIFT=14</div><div class='del'>-CONFIG_EXPERT=y</div><div class='del'>-# CONFIG_KALLSYMS is not set</div><div class='del'>-# CONFIG_PCSPKR_PLATFORM is not set</div><div class='del'>-# CONFIG_VM_EVENT_COUNTERS is not set</div><div class='del'>-# CONFIG_COMPAT_BRK is not set</div><div class='del'>-CONFIG_SLAB=y</div><div class='del'>-CONFIG_MODULES=y</div><div class='del'>-CONFIG_MODULE_UNLOAD=y</div><div class='del'>-# CONFIG_IOSCHED_DEADLINE is not set</div><div class='del'>-# CONFIG_IOSCHED_CFQ is not set</div><div class='del'>-CONFIG_PCI=y</div><div class='del'>-CONFIG_PCCARD=y</div><div class='del'>-# CONFIG_CARDBUS is not set</div><div class='del'>-CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y</div><div class='del'>-CONFIG_PM=y</div><div class='del'>-CONFIG_PM_RUNTIME=y</div><div class='del'>-CONFIG_NET=y</div><div class='del'>-CONFIG_PACKET=y</div><div class='del'>-CONFIG_UNIX=y</div><div class='del'>-CONFIG_INET=y</div><div class='del'>-CONFIG_IP_MULTICAST=y</div><div class='del'>-CONFIG_IP_PNP=y</div><div class='del'>-CONFIG_IP_PNP_DHCP=y</div><div class='del'>-CONFIG_IP_PNP_BOOTP=y</div><div class='del'>-CONFIG_IP_PNP_RARP=y</div><div class='del'>-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='del'>-# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='del'>-# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='del'>-# CONFIG_INET_DIAG is not set</div><div class='del'>-# CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_WIRELESS is not set</div><div class='del'>-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='del'>-CONFIG_MTD=y</div><div class='del'>-CONFIG_MTD_PARTITIONS=y</div><div class='del'>-CONFIG_MTD_CMDLINE_PARTS=y</div><div class='del'>-CONFIG_MTD_CHAR=y</div><div class='del'>-CONFIG_MTD_BLOCK=y</div><div class='del'>-CONFIG_MTD_CFI=y</div><div class='del'>-CONFIG_MTD_CFI_INTELEXT=y</div><div class='del'>-CONFIG_MTD_CFI_AMDSTD=y</div><div class='del'>-CONFIG_MTD_PHYSMAP=y</div><div class='del'>-# CONFIG_MISC_DEVICES is not set</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECS=y</div><div class='del'>-# CONFIG_IDEPCI_PCIBUS_ORDER is not set</div><div class='del'>-CONFIG_BLK_DEV_HPT366=y</div><div class='del'>-CONFIG_NETDEVICES=y</div><div class='del'>-CONFIG_MARVELL_PHY=y</div><div class='del'>-CONFIG_DAVICOM_PHY=y</div><div class='del'>-CONFIG_QSEMI_PHY=y</div><div class='del'>-CONFIG_LXT_PHY=y</div><div class='del'>-CONFIG_CICADA_PHY=y</div><div class='del'>-CONFIG_VITESSE_PHY=y</div><div class='del'>-CONFIG_SMSC_PHY=y</div><div class='del'>-CONFIG_BROADCOM_PHY=y</div><div class='del'>-CONFIG_ICPLUS_PHY=y</div><div class='del'>-CONFIG_REALTEK_PHY=y</div><div class='del'>-CONFIG_NATIONAL_PHY=y</div><div class='del'>-CONFIG_STE10XP=y</div><div class='del'>-CONFIG_LSI_ET1011C_PHY=y</div><div class='del'>-CONFIG_NET_ETHERNET=y</div><div class='del'>-CONFIG_MII=y</div><div class='del'>-CONFIG_MIPS_AU1X00_ENET=y</div><div class='del'>-# CONFIG_NETDEV_1000 is not set</div><div class='del'>-# CONFIG_NETDEV_10000 is not set</div><div class='del'>-# CONFIG_WLAN is not set</div><div class='del'>-# CONFIG_INPUT_MOUSEDEV is not set</div><div class='del'>-CONFIG_INPUT_EVDEV=y</div><div class='del'>-# CONFIG_INPUT_KEYBOARD is not set</div><div class='del'>-# CONFIG_INPUT_MOUSE is not set</div><div class='del'>-# CONFIG_SERIO is not set</div><div class='del'>-CONFIG_SERIAL_8250=y</div><div class='del'>-CONFIG_SERIAL_8250_CONSOLE=y</div><div class='del'>-# CONFIG_SERIAL_8250_PCI is not set</div><div class='del'>-# CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_HW_RANDOM is not set</div><div class='del'>-# CONFIG_HWMON is not set</div><div class='del'>-# CONFIG_VGA_ARB is not set</div><div class='del'>-# CONFIG_VGA_CONSOLE is not set</div><div class='del'>-# CONFIG_HID_SUPPORT is not set</div><div class='del'>-CONFIG_USB=y</div><div class='del'>-# CONFIG_USB_DEVICE_CLASS is not set</div><div class='del'>-CONFIG_USB_DYNAMIC_MINORS=y</div><div class='del'>-CONFIG_USB_SUSPEND=y</div><div class='del'>-CONFIG_USB_OHCI_HCD=y</div><div class='del'>-CONFIG_RTC_CLASS=y</div><div class='del'>-CONFIG_RTC_DRV_AU1XXX=y</div><div class='del'>-CONFIG_EXT2_FS=y</div><div class='del'>-# CONFIG_PROC_PAGE_MONITOR is not set</div><div class='del'>-CONFIG_TMPFS=y</div><div class='del'>-CONFIG_JFFS2_FS=y</div><div class='del'>-CONFIG_JFFS2_SUMMARY=y</div><div class='del'>-CONFIG_JFFS2_FS_XATTR=y</div><div class='del'>-CONFIG_JFFS2_COMPRESSION_OPTIONS=y</div><div class='del'>-CONFIG_JFFS2_LZO=y</div><div class='del'>-CONFIG_JFFS2_RUBIN=y</div><div class='del'>-CONFIG_SQUASHFS=y</div><div class='del'>-CONFIG_NFS_FS=y</div><div class='del'>-CONFIG_NFS_V3=y</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='del'>-CONFIG_NLS_CODEPAGE_437=y</div><div class='del'>-CONFIG_NLS_CODEPAGE_850=y</div><div class='del'>-CONFIG_NLS_CODEPAGE_1250=y</div><div class='del'>-CONFIG_NLS_ASCII=y</div><div class='del'>-CONFIG_NLS_ISO8859_1=y</div><div class='del'>-CONFIG_NLS_ISO8859_15=y</div><div class='del'>-CONFIG_NLS_UTF8=y</div><div class='del'>-CONFIG_STRIP_ASM_SYMS=y</div><div class='del'>-CONFIG_DEBUG_KERNEL=y</div><div class='del'>-# CONFIG_SCHED_DEBUG is not set</div><div class='del'>-# CONFIG_RCU_CPU_STALL_DETECTOR is not set</div><div class='del'>-# CONFIG_FTRACE is not set</div><div class='del'>-CONFIG_DEBUG_ZBOOT=y</div><div class='del'>-CONFIG_KEYS=y</div><div class='del'>-CONFIG_KEYS_DEBUG_PROC_KEYS=y</div><div class='del'>-CONFIG_SECURITYFS=y</div><div class='head'>diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig<br/>index 798a553c9e80..36cda27725e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/db1550_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/configs/db1550_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/db1550_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/configs/db1550_defconfig</a></div><div class='hunk'>@@ -1,145 +1,262 @@</div><div class='add'>+CONFIG_MIPS=y</div><div class='ctx'> CONFIG_MIPS_ALCHEMY=y</div><div class='ctx'> CONFIG_MIPS_DB1550=y</div><div class='add'>+CONFIG_SCHED_OMIT_FRAME_POINTER=y</div><div class='add'>+CONFIG_GENERIC_GPIO=y</div><div class='add'>+CONFIG_TICK_ONESHOT=y</div><div class='ctx'> CONFIG_NO_HZ=y</div><div class='ctx'> CONFIG_HIGH_RES_TIMERS=y</div><div class='ctx'> CONFIG_HZ_100=y</div><div class='del'>-# CONFIG_SECCOMP is not set</div><div class='add'>+CONFIG_HZ=100</div><div class='ctx'> CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='ctx'> CONFIG_LOCALVERSION="-db1550"</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='ctx'> CONFIG_KERNEL_LZMA=y</div><div class='add'>+CONFIG_DEFAULT_HOSTNAME="db1550"</div><div class='add'>+CONFIG_SWAP=y</div><div class='ctx'> CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_SYSVIPC_SYSCTL=y</div><div class='ctx'> CONFIG_POSIX_MQUEUE=y</div><div class='add'>+CONFIG_POSIX_MQUEUE_SYSCTL=y</div><div class='add'>+CONFIG_FHANDLE=y</div><div class='add'>+CONFIG_AUDIT=y</div><div class='ctx'> CONFIG_TINY_RCU=y</div><div class='del'>-CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=18</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+CONFIG_UTS_NS=y</div><div class='add'>+CONFIG_IPC_NS=y</div><div class='add'>+CONFIG_USER_NS=y</div><div class='add'>+CONFIG_PID_NS=y</div><div class='add'>+CONFIG_NET_NS=y</div><div class='ctx'> CONFIG_EXPERT=y</div><div class='del'>-# CONFIG_SYSCTL_SYSCALL is not set</div><div class='del'>-# CONFIG_KALLSYMS is not set</div><div class='del'>-# CONFIG_PCSPKR_PLATFORM is not set</div><div class='del'>-# CONFIG_VM_EVENT_COUNTERS is not set</div><div class='del'>-# CONFIG_COMPAT_BRK is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SIGNALFD=y</div><div class='add'>+CONFIG_TIMERFD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_AIO=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_PCI_QUIRKS=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='del'>-CONFIG_MODULES=y</div><div class='del'>-CONFIG_MODULE_UNLOAD=y</div><div class='del'>-# CONFIG_IOSCHED_DEADLINE is not set</div><div class='del'>-# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+CONFIG_BLOCK=y</div><div class='add'>+CONFIG_LBDAF=y</div><div class='add'>+CONFIG_BLK_DEV_BSG=y</div><div class='add'>+CONFIG_BLK_DEV_BSGLIB=y</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_DEFAULT_NOOP=y</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="noop"</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCCARD=y</div><div class='del'>-# CONFIG_CARDBUS is not set</div><div class='add'>+CONFIG_PCMCIA=y</div><div class='add'>+CONFIG_PCMCIA_LOAD_CIS=y</div><div class='ctx'> CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y</div><div class='del'>-CONFIG_PM=y</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y</div><div class='add'>+CONFIG_BINFMT_MISC=y</div><div class='add'>+CONFIG_SUSPEND=y</div><div class='add'>+CONFIG_SUSPEND_FREEZER=y</div><div class='add'>+CONFIG_PM_SLEEP=y</div><div class='ctx'> CONFIG_PM_RUNTIME=y</div><div class='add'>+CONFIG_PM=y</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_MULTICAST=y</div><div class='ctx'> CONFIG_IP_PNP=y</div><div class='ctx'> CONFIG_IP_PNP_DHCP=y</div><div class='ctx'> CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> CONFIG_IP_PNP_RARP=y</div><div class='del'>-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='del'>-# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='del'>-# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='del'>-# CONFIG_INET_DIAG is not set</div><div class='del'>-# CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_WIRELESS is not set</div><div class='del'>-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_INET_TUNNEL=y</div><div class='add'>+CONFIG_INET_LRO=y</div><div class='add'>+CONFIG_TCP_CONG_CUBIC=y</div><div class='add'>+CONFIG_DEFAULT_TCP_CONG="cubic"</div><div class='add'>+CONFIG_IPV6=y</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET6_XFRM_MODE_BEET=y</div><div class='add'>+CONFIG_IPV6_SIT=y</div><div class='add'>+CONFIG_IPV6_NDISC_NODETYPE=y</div><div class='add'>+CONFIG_DNS_RESOLVER=y</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH=""</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+CONFIG_FIRMWARE_IN_KERNEL=y</div><div class='ctx'> CONFIG_MTD=y</div><div class='del'>-CONFIG_MTD_PARTITIONS=y</div><div class='ctx'> CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLKDEVS=y</div><div class='ctx'> CONFIG_MTD_BLOCK=y</div><div class='ctx'> CONFIG_MTD_CFI=y</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='ctx'> CONFIG_MTD_CFI_AMDSTD=y</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='ctx'> CONFIG_MTD_PHYSMAP=y</div><div class='add'>+CONFIG_MTD_M25P80=y</div><div class='add'>+CONFIG_MTD_NAND_ECC=y</div><div class='ctx'> CONFIG_MTD_NAND=y</div><div class='del'>-CONFIG_MTD_NAND_AU1550=y</div><div class='del'>-CONFIG_BLK_DEV_UB=y</div><div class='del'>-# CONFIG_MISC_DEVICES is not set</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECS=y</div><div class='del'>-CONFIG_BLK_DEV_IDECD=y</div><div class='del'>-# CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS is not set</div><div class='del'>-CONFIG_IDE_TASK_IOCTL=y</div><div class='del'>-# CONFIG_IDEPCI_PCIBUS_ORDER is not set</div><div class='del'>-CONFIG_BLK_DEV_HPT366=y</div><div class='add'>+CONFIG_MTD_NAND_IDS=y</div><div class='add'>+CONFIG_MTD_NAND_PLATFORM=y</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+CONFIG_EEPROM_AT24=y</div><div class='add'>+CONFIG_SCSI_MOD=y</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_DMA=y</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+CONFIG_CHR_DEV_SG=y</div><div class='add'>+CONFIG_SCSI_MULTI_LUN=y</div><div class='add'>+CONFIG_SCSI_SCAN_ASYNC=y</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+CONFIG_ATA_SFF=y</div><div class='add'>+CONFIG_ATA_BMDMA=y</div><div class='add'>+CONFIG_PATA_HPT37X=y</div><div class='add'>+CONFIG_PATA_PCMCIA=y</div><div class='add'>+CONFIG_MD=y</div><div class='add'>+CONFIG_BLK_DEV_DM=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-CONFIG_MARVELL_PHY=y</div><div class='del'>-CONFIG_DAVICOM_PHY=y</div><div class='del'>-CONFIG_QSEMI_PHY=y</div><div class='del'>-CONFIG_LXT_PHY=y</div><div class='del'>-CONFIG_CICADA_PHY=y</div><div class='del'>-CONFIG_VITESSE_PHY=y</div><div class='del'>-CONFIG_SMSC_PHY=y</div><div class='del'>-CONFIG_BROADCOM_PHY=y</div><div class='del'>-CONFIG_ICPLUS_PHY=y</div><div class='del'>-CONFIG_REALTEK_PHY=y</div><div class='del'>-CONFIG_NATIONAL_PHY=y</div><div class='del'>-CONFIG_STE10XP=y</div><div class='del'>-CONFIG_LSI_ET1011C_PHY=y</div><div class='del'>-CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MIPS_AU1X00_ENET=y</div><div class='del'>-# CONFIG_NETDEV_1000 is not set</div><div class='del'>-# CONFIG_NETDEV_10000 is not set</div><div class='del'>-# CONFIG_WLAN is not set</div><div class='del'>-# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+CONFIG_NET_PCMCIA=y</div><div class='add'>+CONFIG_PCMCIA_3C589=y</div><div class='add'>+CONFIG_PCMCIA_PCNET=y</div><div class='add'>+CONFIG_INPUT=y</div><div class='ctx'> CONFIG_INPUT_EVDEV=y</div><div class='del'>-# CONFIG_INPUT_KEYBOARD is not set</div><div class='del'>-# CONFIG_INPUT_MOUSE is not set</div><div class='del'>-# CONFIG_SERIO is not set</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_CONSOLE_TRANSLATIONS=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y</div><div class='add'>+CONFIG_DEVKMEM=y</div><div class='ctx'> CONFIG_SERIAL_8250=y</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='del'>-# CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_DEVPORT=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='del'>-# CONFIG_I2C_COMPAT is not set</div><div class='add'>+CONFIG_I2C_BOARDINFO=y</div><div class='ctx'> CONFIG_I2C_CHARDEV=y</div><div class='del'>-# CONFIG_I2C_HELPER_AUTO is not set</div><div class='ctx'> CONFIG_I2C_AU1550=y</div><div class='ctx'> CONFIG_SPI=y</div><div class='add'>+CONFIG_SPI_MASTER=y</div><div class='ctx'> CONFIG_SPI_AU1550=y</div><div class='del'>-# CONFIG_HWMON is not set</div><div class='del'>-# CONFIG_VGA_ARB is not set</div><div class='del'>-# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_SPI_BITBANG=y</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+CONFIG_SENSORS_ADM1025=y</div><div class='add'>+CONFIG_SENSORS_LM70=y</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> CONFIG_SOUND=y</div><div class='ctx'> CONFIG_SND=y</div><div class='del'>-CONFIG_SND_HRTIMER=y</div><div class='del'>-CONFIG_SND_DYNAMIC_MINORS=y</div><div class='del'>-# CONFIG_SND_SUPPORT_OLD_API is not set</div><div class='del'>-# CONFIG_SND_VERBOSE_PROCFS is not set</div><div class='del'>-# CONFIG_SND_DRIVERS is not set</div><div class='del'>-# CONFIG_SND_PCI is not set</div><div class='del'>-# CONFIG_SND_SPI is not set</div><div class='del'>-# CONFIG_SND_MIPS is not set</div><div class='del'>-# CONFIG_SND_PCMCIA is not set</div><div class='add'>+CONFIG_SND_TIMER=y</div><div class='add'>+CONFIG_SND_PCM=y</div><div class='add'>+CONFIG_SND_JACK=y</div><div class='add'>+CONFIG_SND_VMASTER=y</div><div class='add'>+CONFIG_SND_AC97_CODEC=y</div><div class='ctx'> CONFIG_SND_SOC=y</div><div class='add'>+CONFIG_SND_SOC_AC97_BUS=y</div><div class='ctx'> CONFIG_SND_SOC_AU1XPSC=y</div><div class='del'>-# CONFIG_HID_SUPPORT is not set</div><div class='add'>+CONFIG_SND_SOC_AU1XPSC_I2S=y</div><div class='add'>+CONFIG_SND_SOC_AU1XPSC_AC97=y</div><div class='add'>+CONFIG_SND_SOC_DB1200=y</div><div class='add'>+CONFIG_SND_SOC_I2C_AND_SPI=y</div><div class='add'>+CONFIG_SND_SOC_AC97_CODEC=y</div><div class='add'>+CONFIG_SND_SOC_WM8731=y</div><div class='add'>+CONFIG_SND_SOC_WM9712=y</div><div class='add'>+CONFIG_AC97_BUS=y</div><div class='ctx'> CONFIG_USB=y</div><div class='del'>-# CONFIG_USB_DEVICE_CLASS is not set</div><div class='ctx'> CONFIG_USB_DYNAMIC_MINORS=y</div><div class='del'>-CONFIG_USB_SUSPEND=y</div><div class='ctx'> CONFIG_USB_EHCI_HCD=y</div><div class='ctx'> CONFIG_USB_EHCI_ROOT_HUB_TT=y</div><div class='add'>+CONFIG_USB_EHCI_TT_NEWSCHED=y</div><div class='ctx'> CONFIG_USB_OHCI_HCD=y</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+CONFIG_USB_UHCI_HCD=y</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='ctx'> CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='ctx'> CONFIG_RTC_DRV_AU1XXX=y</div><div class='del'>-CONFIG_EXT2_FS=y</div><div class='del'>-# CONFIG_PROC_PAGE_MONITOR is not set</div><div class='add'>+CONFIG_EXT4_FS=y</div><div class='add'>+CONFIG_EXT4_USE_FOR_EXT23=y</div><div class='add'>+CONFIG_EXT4_FS_XATTR=y</div><div class='add'>+CONFIG_EXT4_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_EXT4_FS_SECURITY=y</div><div class='add'>+CONFIG_JBD2=y</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+CONFIG_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_EXPORTFS=y</div><div class='add'>+CONFIG_FILE_LOCKING=y</div><div class='add'>+CONFIG_FSNOTIFY=y</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_SYSCTL=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='ctx'> CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_CONFIGFS_FS=y</div><div class='add'>+CONFIG_MISC_FILESYSTEMS=y</div><div class='ctx'> CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='ctx'> CONFIG_JFFS2_SUMMARY=y</div><div class='ctx'> CONFIG_JFFS2_FS_XATTR=y</div><div class='del'>-# CONFIG_JFFS2_FS_POSIX_ACL is not set</div><div class='del'>-# CONFIG_JFFS2_FS_SECURITY is not set</div><div class='ctx'> CONFIG_JFFS2_COMPRESSION_OPTIONS=y</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='ctx'> CONFIG_JFFS2_LZO=y</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='ctx'> CONFIG_JFFS2_RUBIN=y</div><div class='add'>+CONFIG_JFFS2_CMODE_PRIORITY=y</div><div class='ctx'> CONFIG_SQUASHFS=y</div><div class='add'>+CONFIG_SQUASHFS_ZLIB=y</div><div class='add'>+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3</div><div class='add'>+CONFIG_NETWORK_FILESYSTEMS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='add'>+CONFIG_NFS_V3_ACL=y</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_NFS_V4_1=y</div><div class='add'>+CONFIG_PNFS_FILE_LAYOUT=y</div><div class='add'>+CONFIG_PNFS_BLOCK=y</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_NFS_USE_KERNEL_DNS=y</div><div class='add'>+CONFIG_NFS_USE_NEW_IDMAPPER=y</div><div class='add'>+CONFIG_NFSD=y</div><div class='add'>+CONFIG_NFSD_V2_ACL=y</div><div class='add'>+CONFIG_NFSD_V3=y</div><div class='add'>+CONFIG_NFSD_V3_ACL=y</div><div class='add'>+CONFIG_NFSD_V4=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_ACL_SUPPORT=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+CONFIG_SUNRPC_BACKCHANNEL=y</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> CONFIG_NLS_CODEPAGE_437=y</div><div class='ctx'> CONFIG_NLS_CODEPAGE_850=y</div><div class='ctx'> CONFIG_NLS_CODEPAGE_852=y</div><div class='hunk'>@@ -148,10 +265,21 @@ CONFIG_NLS_ASCII=y</div><div class='ctx'> CONFIG_NLS_ISO8859_1=y</div><div class='ctx'> CONFIG_NLS_ISO8859_15=y</div><div class='ctx'> CONFIG_NLS_UTF8=y</div><div class='del'>-CONFIG_DEBUG_KERNEL=y</div><div class='del'>-# CONFIG_SCHED_DEBUG is not set</div><div class='del'>-# CONFIG_FTRACE is not set</div><div class='del'>-CONFIG_DEBUG_ZBOOT=y</div><div class='add'>+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='add'>+CONFIG_CMDLINE_BOOL=y</div><div class='add'>+CONFIG_CMDLINE="noirqdebug console=ttyS0,115200 root=/dev/sda1 rootfstype=ext4"</div><div class='ctx'> CONFIG_KEYS=y</div><div class='del'>-CONFIG_KEYS_DEBUG_PROC_KEYS=y</div><div class='ctx'> CONFIG_SECURITYFS=y</div><div class='add'>+CONFIG_DEFAULT_SECURITY_DAC=y</div><div class='add'>+CONFIG_BITREVERSE=y</div><div class='add'>+CONFIG_CRC16=y</div><div class='add'>+CONFIG_CRC_ITU_T=y</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+CONFIG_AUDIT_GENERIC=y</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_LZO_COMPRESS=y</div><div class='add'>+CONFIG_LZO_DECOMPRESS=y</div><div class='add'>+CONFIG_BCH=y</div><div class='add'>+CONFIG_NLATTR=y</div><div class='head'>diff --git a/arch/mips/configs/nlm_xlp_defconfig b/arch/mips/configs/nlm_xlp_defconfig<br/>new file mode 100644<br/>index 000000000000..4479fd669ac1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/nlm_xlp_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/configs/nlm_xlp_defconfig</a></div><div class='hunk'>@@ -0,0 +1,570 @@</div><div class='add'>+CONFIG_NLM_XLP_BOARD=y</div><div class='add'>+CONFIG_64BIT=y</div><div class='add'>+CONFIG_KSM=y</div><div class='add'>+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536</div><div class='add'>+CONFIG_SMP=y</div><div class='add'>+CONFIG_NO_HZ=y</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+# CONFIG_SECCOMP is not set</div><div class='add'>+CONFIG_USE_OF=y</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_CROSS_COMPILE="mips-linux-gnu-"</div><div class='add'>+# CONFIG_LOCALVERSION_AUTO is not set</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT_V3=y</div><div class='add'>+CONFIG_TASKSTATS=y</div><div class='add'>+CONFIG_TASK_DELAY_ACCT=y</div><div class='add'>+CONFIG_TASK_XACCT=y</div><div class='add'>+CONFIG_TASK_IO_ACCOUNTING=y</div><div class='add'>+CONFIG_AUDIT=y</div><div class='add'>+CONFIG_CGROUPS=y</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE="usr/dev_file_list usr/rootfs.xlp"</div><div class='add'>+CONFIG_RD_BZIP2=y</div><div class='add'>+CONFIG_RD_LZMA=y</div><div class='add'>+CONFIG_INITRAMFS_COMPRESSION_LZMA=y</div><div class='add'>+CONFIG_KALLSYMS_ALL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+# CONFIG_COMPAT_BRK is not set</div><div class='add'>+CONFIG_PROFILING=y</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODVERSIONS=y</div><div class='add'>+CONFIG_MODULE_SRCVERSION_ALL=y</div><div class='add'>+CONFIG_BLK_DEV_INTEGRITY=y</div><div class='add'>+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set</div><div class='add'>+CONFIG_BINFMT_MISC=y</div><div class='add'>+CONFIG_MIPS32_COMPAT=y</div><div class='add'>+CONFIG_MIPS32_O32=y</div><div class='add'>+CONFIG_MIPS32_N32=y</div><div class='add'>+CONFIG_PM_RUNTIME=y</div><div class='add'>+CONFIG_PM_DEBUG=y</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM_USER=m</div><div class='add'>+CONFIG_NET_KEY=m</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_MULTIPLE_TABLES=y</div><div class='add'>+CONFIG_IP_ROUTE_MULTIPATH=y</div><div class='add'>+CONFIG_IP_ROUTE_VERBOSE=y</div><div class='add'>+CONFIG_NET_IPIP=m</div><div class='add'>+CONFIG_IP_MROUTE=y</div><div class='add'>+CONFIG_IP_PIMSM_V1=y</div><div class='add'>+CONFIG_IP_PIMSM_V2=y</div><div class='add'>+CONFIG_SYN_COOKIES=y</div><div class='add'>+CONFIG_INET_AH=m</div><div class='add'>+CONFIG_INET_ESP=m</div><div class='add'>+CONFIG_INET_IPCOMP=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_BEET=m</div><div class='add'>+CONFIG_TCP_CONG_ADVANCED=y</div><div class='add'>+CONFIG_TCP_CONG_HSTCP=m</div><div class='add'>+CONFIG_TCP_CONG_HYBLA=m</div><div class='add'>+CONFIG_TCP_CONG_SCALABLE=m</div><div class='add'>+CONFIG_TCP_CONG_LP=m</div><div class='add'>+CONFIG_TCP_CONG_VENO=m</div><div class='add'>+CONFIG_TCP_CONG_YEAH=m</div><div class='add'>+CONFIG_TCP_CONG_ILLINOIS=m</div><div class='add'>+CONFIG_TCP_MD5SIG=y</div><div class='add'>+CONFIG_IPV6=y</div><div class='add'>+CONFIG_IPV6_PRIVACY=y</div><div class='add'>+CONFIG_INET6_AH=m</div><div class='add'>+CONFIG_INET6_ESP=m</div><div class='add'>+CONFIG_INET6_IPCOMP=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_BEET=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m</div><div class='add'>+CONFIG_IPV6_SIT=m</div><div class='add'>+CONFIG_IPV6_TUNNEL=m</div><div class='add'>+CONFIG_IPV6_MULTIPLE_TABLES=y</div><div class='add'>+CONFIG_NETLABEL=y</div><div class='add'>+CONFIG_NETFILTER=y</div><div class='add'>+CONFIG_NF_CONNTRACK=m</div><div class='add'>+CONFIG_NF_CONNTRACK_SECMARK=y</div><div class='add'>+CONFIG_NF_CONNTRACK_EVENTS=y</div><div class='add'>+CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='add'>+CONFIG_NF_CONNTRACK_AMANDA=m</div><div class='add'>+CONFIG_NF_CONNTRACK_FTP=m</div><div class='add'>+CONFIG_NF_CONNTRACK_H323=m</div><div class='add'>+CONFIG_NF_CONNTRACK_IRC=m</div><div class='add'>+CONFIG_NF_CONNTRACK_NETBIOS_NS=m</div><div class='add'>+CONFIG_NF_CONNTRACK_PPTP=m</div><div class='add'>+CONFIG_NF_CONNTRACK_SANE=m</div><div class='add'>+CONFIG_NF_CONNTRACK_SIP=m</div><div class='add'>+CONFIG_NF_CONNTRACK_TFTP=m</div><div class='add'>+CONFIG_NF_CT_NETLINK=m</div><div class='add'>+CONFIG_NETFILTER_TPROXY=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_DSCP=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_MARK=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_NFLOG=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_TPROXY=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_TRACE=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_SECMARK=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_DSCP=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_ESP=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_HELPER=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_LENGTH=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_LIMIT=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_MAC=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_MARK=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_OSF=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_OWNER=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_POLICY=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_RATEEST=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_RECENT=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_SOCKET=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_TIME=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_U32=m</div><div class='add'>+CONFIG_IP_VS=m</div><div class='add'>+CONFIG_IP_VS_IPV6=y</div><div class='add'>+CONFIG_IP_VS_PROTO_TCP=y</div><div class='add'>+CONFIG_IP_VS_PROTO_UDP=y</div><div class='add'>+CONFIG_IP_VS_PROTO_ESP=y</div><div class='add'>+CONFIG_IP_VS_PROTO_AH=y</div><div class='add'>+CONFIG_IP_VS_RR=m</div><div class='add'>+CONFIG_IP_VS_WRR=m</div><div class='add'>+CONFIG_IP_VS_LC=m</div><div class='add'>+CONFIG_IP_VS_WLC=m</div><div class='add'>+CONFIG_IP_VS_LBLC=m</div><div class='add'>+CONFIG_IP_VS_LBLCR=m</div><div class='add'>+CONFIG_IP_VS_DH=m</div><div class='add'>+CONFIG_IP_VS_SH=m</div><div class='add'>+CONFIG_IP_VS_SED=m</div><div class='add'>+CONFIG_IP_VS_NQ=m</div><div class='add'>+CONFIG_IP_VS_FTP=m</div><div class='add'>+CONFIG_NF_CONNTRACK_IPV4=m</div><div class='add'>+CONFIG_IP_NF_QUEUE=m</div><div class='add'>+CONFIG_IP_NF_IPTABLES=m</div><div class='add'>+CONFIG_IP_NF_MATCH_AH=m</div><div class='add'>+CONFIG_IP_NF_MATCH_ECN=m</div><div class='add'>+CONFIG_IP_NF_MATCH_TTL=m</div><div class='add'>+CONFIG_IP_NF_FILTER=m</div><div class='add'>+CONFIG_IP_NF_TARGET_REJECT=m</div><div class='add'>+CONFIG_IP_NF_TARGET_LOG=m</div><div class='add'>+CONFIG_IP_NF_TARGET_ULOG=m</div><div class='add'>+CONFIG_NF_NAT=m</div><div class='add'>+CONFIG_IP_NF_TARGET_MASQUERADE=m</div><div class='add'>+CONFIG_IP_NF_TARGET_NETMAP=m</div><div class='add'>+CONFIG_IP_NF_TARGET_REDIRECT=m</div><div class='add'>+CONFIG_IP_NF_MANGLE=m</div><div class='add'>+CONFIG_IP_NF_TARGET_CLUSTERIP=m</div><div class='add'>+CONFIG_IP_NF_TARGET_ECN=m</div><div class='add'>+CONFIG_IP_NF_TARGET_TTL=m</div><div class='add'>+CONFIG_IP_NF_RAW=m</div><div class='add'>+CONFIG_IP_NF_SECURITY=m</div><div class='add'>+CONFIG_IP_NF_ARPTABLES=m</div><div class='add'>+CONFIG_IP_NF_ARPFILTER=m</div><div class='add'>+CONFIG_IP_NF_ARP_MANGLE=m</div><div class='add'>+CONFIG_NF_CONNTRACK_IPV6=m</div><div class='add'>+CONFIG_IP6_NF_QUEUE=m</div><div class='add'>+CONFIG_IP6_NF_IPTABLES=m</div><div class='add'>+CONFIG_IP6_NF_MATCH_AH=m</div><div class='add'>+CONFIG_IP6_NF_MATCH_EUI64=m</div><div class='add'>+CONFIG_IP6_NF_MATCH_FRAG=m</div><div class='add'>+CONFIG_IP6_NF_MATCH_OPTS=m</div><div class='add'>+CONFIG_IP6_NF_MATCH_HL=m</div><div class='add'>+CONFIG_IP6_NF_MATCH_IPV6HEADER=m</div><div class='add'>+CONFIG_IP6_NF_MATCH_MH=m</div><div class='add'>+CONFIG_IP6_NF_MATCH_RT=m</div><div class='add'>+CONFIG_IP6_NF_TARGET_HL=m</div><div class='add'>+CONFIG_IP6_NF_TARGET_LOG=m</div><div class='add'>+CONFIG_IP6_NF_FILTER=m</div><div class='add'>+CONFIG_IP6_NF_TARGET_REJECT=m</div><div class='add'>+CONFIG_IP6_NF_MANGLE=m</div><div class='add'>+CONFIG_IP6_NF_RAW=m</div><div class='add'>+CONFIG_IP6_NF_SECURITY=m</div><div class='add'>+CONFIG_DECNET_NF_GRABULATOR=m</div><div class='add'>+CONFIG_BRIDGE_NF_EBTABLES=m</div><div class='add'>+CONFIG_BRIDGE_EBT_BROUTE=m</div><div class='add'>+CONFIG_BRIDGE_EBT_T_FILTER=m</div><div class='add'>+CONFIG_BRIDGE_EBT_T_NAT=m</div><div class='add'>+CONFIG_BRIDGE_EBT_802_3=m</div><div class='add'>+CONFIG_BRIDGE_EBT_AMONG=m</div><div class='add'>+CONFIG_BRIDGE_EBT_ARP=m</div><div class='add'>+CONFIG_BRIDGE_EBT_IP=m</div><div class='add'>+CONFIG_BRIDGE_EBT_IP6=m</div><div class='add'>+CONFIG_BRIDGE_EBT_LIMIT=m</div><div class='add'>+CONFIG_BRIDGE_EBT_MARK=m</div><div class='add'>+CONFIG_BRIDGE_EBT_PKTTYPE=m</div><div class='add'>+CONFIG_BRIDGE_EBT_STP=m</div><div class='add'>+CONFIG_BRIDGE_EBT_VLAN=m</div><div class='add'>+CONFIG_BRIDGE_EBT_ARPREPLY=m</div><div class='add'>+CONFIG_BRIDGE_EBT_DNAT=m</div><div class='add'>+CONFIG_BRIDGE_EBT_MARK_T=m</div><div class='add'>+CONFIG_BRIDGE_EBT_REDIRECT=m</div><div class='add'>+CONFIG_BRIDGE_EBT_SNAT=m</div><div class='add'>+CONFIG_BRIDGE_EBT_LOG=m</div><div class='add'>+CONFIG_BRIDGE_EBT_ULOG=m</div><div class='add'>+CONFIG_BRIDGE_EBT_NFLOG=m</div><div class='add'>+CONFIG_IP_DCCP=m</div><div class='add'>+CONFIG_RDS=m</div><div class='add'>+CONFIG_RDS_TCP=m</div><div class='add'>+CONFIG_TIPC=m</div><div class='add'>+CONFIG_ATM=m</div><div class='add'>+CONFIG_ATM_CLIP=m</div><div class='add'>+CONFIG_ATM_LANE=m</div><div class='add'>+CONFIG_ATM_MPOA=m</div><div class='add'>+CONFIG_ATM_BR2684=m</div><div class='add'>+CONFIG_BRIDGE=m</div><div class='add'>+CONFIG_VLAN_8021Q=m</div><div class='add'>+CONFIG_VLAN_8021Q_GVRP=y</div><div class='add'>+CONFIG_DECNET=m</div><div class='add'>+CONFIG_LLC2=m</div><div class='add'>+CONFIG_IPX=m</div><div class='add'>+CONFIG_ATALK=m</div><div class='add'>+CONFIG_DEV_APPLETALK=m</div><div class='add'>+CONFIG_IPDDP=m</div><div class='add'>+CONFIG_IPDDP_ENCAP=y</div><div class='add'>+CONFIG_IPDDP_DECAP=y</div><div class='add'>+CONFIG_X25=m</div><div class='add'>+CONFIG_LAPB=m</div><div class='add'>+CONFIG_ECONET=m</div><div class='add'>+CONFIG_ECONET_AUNUDP=y</div><div class='add'>+CONFIG_ECONET_NATIVE=y</div><div class='add'>+CONFIG_WAN_ROUTER=m</div><div class='add'>+CONFIG_PHONET=m</div><div class='add'>+CONFIG_IEEE802154=m</div><div class='add'>+CONFIG_NET_SCHED=y</div><div class='add'>+CONFIG_NET_SCH_CBQ=m</div><div class='add'>+CONFIG_NET_SCH_HTB=m</div><div class='add'>+CONFIG_NET_SCH_HFSC=m</div><div class='add'>+CONFIG_NET_SCH_ATM=m</div><div class='add'>+CONFIG_NET_SCH_PRIO=m</div><div class='add'>+CONFIG_NET_SCH_MULTIQ=m</div><div class='add'>+CONFIG_NET_SCH_RED=m</div><div class='add'>+CONFIG_NET_SCH_SFQ=m</div><div class='add'>+CONFIG_NET_SCH_TEQL=m</div><div class='add'>+CONFIG_NET_SCH_TBF=m</div><div class='add'>+CONFIG_NET_SCH_GRED=m</div><div class='add'>+CONFIG_NET_SCH_DSMARK=m</div><div class='add'>+CONFIG_NET_SCH_NETEM=m</div><div class='add'>+CONFIG_NET_SCH_DRR=m</div><div class='add'>+CONFIG_NET_SCH_INGRESS=m</div><div class='add'>+CONFIG_NET_CLS_BASIC=m</div><div class='add'>+CONFIG_NET_CLS_TCINDEX=m</div><div class='add'>+CONFIG_NET_CLS_ROUTE4=m</div><div class='add'>+CONFIG_NET_CLS_FW=m</div><div class='add'>+CONFIG_NET_CLS_U32=m</div><div class='add'>+CONFIG_CLS_U32_MARK=y</div><div class='add'>+CONFIG_NET_CLS_RSVP=m</div><div class='add'>+CONFIG_NET_CLS_RSVP6=m</div><div class='add'>+CONFIG_NET_CLS_FLOW=m</div><div class='add'>+CONFIG_NET_EMATCH=y</div><div class='add'>+CONFIG_NET_EMATCH_CMP=m</div><div class='add'>+CONFIG_NET_EMATCH_NBYTE=m</div><div class='add'>+CONFIG_NET_EMATCH_U32=m</div><div class='add'>+CONFIG_NET_EMATCH_META=m</div><div class='add'>+CONFIG_NET_EMATCH_TEXT=m</div><div class='add'>+CONFIG_NET_CLS_ACT=y</div><div class='add'>+CONFIG_NET_ACT_POLICE=m</div><div class='add'>+CONFIG_NET_ACT_GACT=m</div><div class='add'>+CONFIG_GACT_PROB=y</div><div class='add'>+CONFIG_NET_ACT_MIRRED=m</div><div class='add'>+CONFIG_NET_ACT_IPT=m</div><div class='add'>+CONFIG_NET_ACT_NAT=m</div><div class='add'>+CONFIG_NET_ACT_PEDIT=m</div><div class='add'>+CONFIG_NET_ACT_SIMP=m</div><div class='add'>+CONFIG_NET_ACT_SKBEDIT=m</div><div class='add'>+CONFIG_DCB=y</div><div class='add'>+CONFIG_NET_PKTGEN=m</div><div class='add'>+# CONFIG_WIRELESS is not set</div><div class='add'>+CONFIG_DEVTMPFS=y</div><div class='add'>+CONFIG_DEVTMPFS_MOUNT=y</div><div class='add'>+# CONFIG_STANDALONE is not set</div><div class='add'>+CONFIG_CONNECTOR=y</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='add'>+CONFIG_BLK_DEV_NBD=m</div><div class='add'>+CONFIG_BLK_DEV_OSD=m</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=65536</div><div class='add'>+CONFIG_CDROM_PKTCDVD=y</div><div class='add'>+CONFIG_RAID_ATTRS=m</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_TGT=m</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+CONFIG_CHR_DEV_ST=m</div><div class='add'>+CONFIG_CHR_DEV_OSST=m</div><div class='add'>+CONFIG_BLK_DEV_SR=y</div><div class='add'>+CONFIG_CHR_DEV_SG=y</div><div class='add'>+CONFIG_CHR_DEV_SCH=m</div><div class='add'>+CONFIG_SCSI_MULTI_LUN=y</div><div class='add'>+CONFIG_SCSI_CONSTANTS=y</div><div class='add'>+CONFIG_SCSI_LOGGING=y</div><div class='add'>+CONFIG_SCSI_SCAN_ASYNC=y</div><div class='add'>+CONFIG_SCSI_SPI_ATTRS=m</div><div class='add'>+CONFIG_SCSI_FC_TGT_ATTRS=y</div><div class='add'>+CONFIG_SCSI_SAS_LIBSAS=m</div><div class='add'>+CONFIG_SCSI_SRP_ATTRS=m</div><div class='add'>+CONFIG_SCSI_SRP_TGT_ATTRS=y</div><div class='add'>+CONFIG_ISCSI_TCP=m</div><div class='add'>+CONFIG_LIBFCOE=m</div><div class='add'>+CONFIG_SCSI_DEBUG=m</div><div class='add'>+CONFIG_SCSI_DH=y</div><div class='add'>+CONFIG_SCSI_DH_RDAC=m</div><div class='add'>+CONFIG_SCSI_DH_HP_SW=m</div><div class='add'>+CONFIG_SCSI_DH_EMC=m</div><div class='add'>+CONFIG_SCSI_DH_ALUA=m</div><div class='add'>+CONFIG_SCSI_OSD_INITIATOR=m</div><div class='add'>+CONFIG_SCSI_OSD_ULD=m</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+CONFIG_INPUT_EVBUG=m</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_SERIO_I8042 is not set</div><div class='add'>+CONFIG_SERIO_SERPORT=m</div><div class='add'>+CONFIG_SERIO_LIBPS2=y</div><div class='add'>+CONFIG_SERIO_RAW=m</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='add'>+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=0</div><div class='add'>+CONFIG_SERIAL_NONSTANDARD=y</div><div class='add'>+CONFIG_N_HDLC=m</div><div class='add'>+# CONFIG_DEVKMEM is not set</div><div class='add'>+CONFIG_STALDRV=y</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=48</div><div class='add'>+CONFIG_SERIAL_8250_EXTENDED=y</div><div class='add'>+CONFIG_SERIAL_8250_MANY_PORTS=y</div><div class='add'>+CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='add'>+CONFIG_SERIAL_8250_RSA=y</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='add'>+CONFIG_HW_RANDOM_TIMERIOMEM=m</div><div class='add'>+CONFIG_RAW_DRIVER=m</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+# CONFIG_HID_SUPPORT is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+CONFIG_UIO=y</div><div class='add'>+CONFIG_UIO_PDRV=m</div><div class='add'>+CONFIG_UIO_PDRV_GENIRQ=m</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+CONFIG_EXT2_FS_XATTR=y</div><div class='add'>+CONFIG_EXT2_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_EXT2_FS_SECURITY=y</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_EXT3_FS_SECURITY=y</div><div class='add'>+CONFIG_EXT4_FS=y</div><div class='add'>+CONFIG_EXT4_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_EXT4_FS_SECURITY=y</div><div class='add'>+CONFIG_GFS2_FS=m</div><div class='add'>+CONFIG_GFS2_FS_LOCKING_DLM=y</div><div class='add'>+CONFIG_OCFS2_FS=m</div><div class='add'>+CONFIG_BTRFS_FS=m</div><div class='add'>+CONFIG_BTRFS_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_NILFS2_FS=m</div><div class='add'>+CONFIG_QUOTA_NETLINK_INTERFACE=y</div><div class='add'>+# CONFIG_PRINT_QUOTA_WARNING is not set</div><div class='add'>+CONFIG_QFMT_V1=m</div><div class='add'>+CONFIG_QFMT_V2=m</div><div class='add'>+CONFIG_AUTOFS4_FS=m</div><div class='add'>+CONFIG_FUSE_FS=y</div><div class='add'>+CONFIG_CUSE=m</div><div class='add'>+CONFIG_FSCACHE=m</div><div class='add'>+CONFIG_FSCACHE_STATS=y</div><div class='add'>+CONFIG_FSCACHE_HISTOGRAM=y</div><div class='add'>+CONFIG_CACHEFILES=m</div><div class='add'>+CONFIG_ISO9660_FS=m</div><div class='add'>+CONFIG_JOLIET=y</div><div class='add'>+CONFIG_ZISOFS=y</div><div class='add'>+CONFIG_UDF_FS=m</div><div class='add'>+CONFIG_MSDOS_FS=m</div><div class='add'>+CONFIG_VFAT_FS=m</div><div class='add'>+CONFIG_NTFS_FS=m</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+CONFIG_TMPFS_POSIX_ACL=y</div><div class='add'>+CONFIG_ADFS_FS=m</div><div class='add'>+CONFIG_AFFS_FS=m</div><div class='add'>+CONFIG_ECRYPT_FS=y</div><div class='add'>+CONFIG_HFS_FS=m</div><div class='add'>+CONFIG_HFSPLUS_FS=m</div><div class='add'>+CONFIG_BEFS_FS=m</div><div class='add'>+CONFIG_BFS_FS=m</div><div class='add'>+CONFIG_EFS_FS=m</div><div class='add'>+CONFIG_CRAMFS=m</div><div class='add'>+CONFIG_SQUASHFS=m</div><div class='add'>+CONFIG_VXFS_FS=m</div><div class='add'>+CONFIG_MINIX_FS=m</div><div class='add'>+CONFIG_OMFS_FS=m</div><div class='add'>+CONFIG_HPFS_FS=m</div><div class='add'>+CONFIG_QNX4FS_FS=m</div><div class='add'>+CONFIG_ROMFS_FS=m</div><div class='add'>+CONFIG_SYSV_FS=m</div><div class='add'>+CONFIG_UFS_FS=m</div><div class='add'>+CONFIG_EXOFS_FS=m</div><div class='add'>+CONFIG_NFS_FS=m</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+CONFIG_NFS_V3_ACL=y</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_NFS_FSCACHE=y</div><div class='add'>+CONFIG_NFSD=m</div><div class='add'>+CONFIG_NFSD_V3_ACL=y</div><div class='add'>+CONFIG_NFSD_V4=y</div><div class='add'>+CONFIG_CIFS=m</div><div class='add'>+CONFIG_CIFS_WEAK_PW_HASH=y</div><div class='add'>+CONFIG_CIFS_UPCALL=y</div><div class='add'>+CONFIG_CIFS_XATTR=y</div><div class='add'>+CONFIG_CIFS_POSIX=y</div><div class='add'>+CONFIG_CIFS_DFS_UPCALL=y</div><div class='add'>+CONFIG_NCP_FS=m</div><div class='add'>+CONFIG_NCPFS_PACKET_SIGNING=y</div><div class='add'>+CONFIG_NCPFS_IOCTL_LOCKING=y</div><div class='add'>+CONFIG_NCPFS_STRONG=y</div><div class='add'>+CONFIG_NCPFS_NFS_NS=y</div><div class='add'>+CONFIG_NCPFS_OS2_NS=y</div><div class='add'>+CONFIG_NCPFS_NLS=y</div><div class='add'>+CONFIG_NCPFS_EXTRAS=y</div><div class='add'>+CONFIG_CODA_FS=m</div><div class='add'>+CONFIG_AFS_FS=m</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+CONFIG_ACORN_PARTITION=y</div><div class='add'>+CONFIG_ACORN_PARTITION_ICS=y</div><div class='add'>+CONFIG_ACORN_PARTITION_RISCIX=y</div><div class='add'>+CONFIG_OSF_PARTITION=y</div><div class='add'>+CONFIG_AMIGA_PARTITION=y</div><div class='add'>+CONFIG_ATARI_PARTITION=y</div><div class='add'>+CONFIG_MAC_PARTITION=y</div><div class='add'>+CONFIG_BSD_DISKLABEL=y</div><div class='add'>+CONFIG_MINIX_SUBPARTITION=y</div><div class='add'>+CONFIG_SOLARIS_X86_PARTITION=y</div><div class='add'>+CONFIG_UNIXWARE_DISKLABEL=y</div><div class='add'>+CONFIG_LDM_PARTITION=y</div><div class='add'>+CONFIG_SGI_PARTITION=y</div><div class='add'>+CONFIG_ULTRIX_PARTITION=y</div><div class='add'>+CONFIG_SUN_PARTITION=y</div><div class='add'>+CONFIG_KARMA_PARTITION=y</div><div class='add'>+CONFIG_EFI_PARTITION=y</div><div class='add'>+CONFIG_SYSV68_PARTITION=y</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="cp437"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_737=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_775=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_850=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_852=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_855=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_857=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_860=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_861=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_862=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_863=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_864=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_865=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_866=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_869=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_936=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_950=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_932=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_949=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_874=m</div><div class='add'>+CONFIG_NLS_ISO8859_8=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_1250=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_1251=m</div><div class='add'>+CONFIG_NLS_ASCII=m</div><div class='add'>+CONFIG_NLS_ISO8859_1=m</div><div class='add'>+CONFIG_NLS_ISO8859_2=m</div><div class='add'>+CONFIG_NLS_ISO8859_3=m</div><div class='add'>+CONFIG_NLS_ISO8859_4=m</div><div class='add'>+CONFIG_NLS_ISO8859_5=m</div><div class='add'>+CONFIG_NLS_ISO8859_6=m</div><div class='add'>+CONFIG_NLS_ISO8859_7=m</div><div class='add'>+CONFIG_NLS_ISO8859_9=m</div><div class='add'>+CONFIG_NLS_ISO8859_13=m</div><div class='add'>+CONFIG_NLS_ISO8859_14=m</div><div class='add'>+CONFIG_NLS_ISO8859_15=m</div><div class='add'>+CONFIG_NLS_KOI8_R=m</div><div class='add'>+CONFIG_NLS_KOI8_U=m</div><div class='add'>+CONFIG_PRINTK_TIME=y</div><div class='add'>+# CONFIG_ENABLE_WARN_DEPRECATED is not set</div><div class='add'>+# CONFIG_ENABLE_MUST_CHECK is not set</div><div class='add'>+CONFIG_FRAME_WARN=1024</div><div class='add'>+CONFIG_UNUSED_SYMBOLS=y</div><div class='add'>+CONFIG_DETECT_HUNG_TASK=y</div><div class='add'>+CONFIG_SCHEDSTATS=y</div><div class='add'>+CONFIG_TIMER_STATS=y</div><div class='add'>+CONFIG_DEBUG_INFO=y</div><div class='add'>+CONFIG_DEBUG_MEMORY_INIT=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_SCHED_TRACER=y</div><div class='add'>+CONFIG_BLK_DEV_IO_TRACE=y</div><div class='add'>+CONFIG_KGDB=y</div><div class='add'>+CONFIG_SECURITY=y</div><div class='add'>+CONFIG_SECURITY_NETWORK=y</div><div class='add'>+CONFIG_LSM_MMAP_MIN_ADDR=0</div><div class='add'>+CONFIG_SECURITY_SELINUX=y</div><div class='add'>+CONFIG_SECURITY_SELINUX_BOOTPARAM=y</div><div class='add'>+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0</div><div class='add'>+CONFIG_SECURITY_SELINUX_DISABLE=y</div><div class='add'>+CONFIG_SECURITY_SMACK=y</div><div class='add'>+CONFIG_SECURITY_TOMOYO=y</div><div class='add'>+CONFIG_CRYPTO_NULL=m</div><div class='add'>+CONFIG_CRYPTO_CRYPTD=m</div><div class='add'>+CONFIG_CRYPTO_TEST=m</div><div class='add'>+CONFIG_CRYPTO_CCM=m</div><div class='add'>+CONFIG_CRYPTO_GCM=m</div><div class='add'>+CONFIG_CRYPTO_CTS=m</div><div class='add'>+CONFIG_CRYPTO_LRW=m</div><div class='add'>+CONFIG_CRYPTO_PCBC=m</div><div class='add'>+CONFIG_CRYPTO_XTS=m</div><div class='add'>+CONFIG_CRYPTO_HMAC=y</div><div class='add'>+CONFIG_CRYPTO_XCBC=m</div><div class='add'>+CONFIG_CRYPTO_VMAC=m</div><div class='add'>+CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_RMD128=m</div><div class='add'>+CONFIG_CRYPTO_RMD160=m</div><div class='add'>+CONFIG_CRYPTO_RMD256=m</div><div class='add'>+CONFIG_CRYPTO_RMD320=m</div><div class='add'>+CONFIG_CRYPTO_SHA256=m</div><div class='add'>+CONFIG_CRYPTO_SHA512=m</div><div class='add'>+CONFIG_CRYPTO_TGR192=m</div><div class='add'>+CONFIG_CRYPTO_WP512=m</div><div class='add'>+CONFIG_CRYPTO_ANUBIS=m</div><div class='add'>+CONFIG_CRYPTO_BLOWFISH=m</div><div class='add'>+CONFIG_CRYPTO_CAMELLIA=m</div><div class='add'>+CONFIG_CRYPTO_CAST5=m</div><div class='add'>+CONFIG_CRYPTO_CAST6=m</div><div class='add'>+CONFIG_CRYPTO_FCRYPT=m</div><div class='add'>+CONFIG_CRYPTO_KHAZAD=m</div><div class='add'>+CONFIG_CRYPTO_SALSA20=m</div><div class='add'>+CONFIG_CRYPTO_SEED=m</div><div class='add'>+CONFIG_CRYPTO_SERPENT=m</div><div class='add'>+CONFIG_CRYPTO_TEA=m</div><div class='add'>+CONFIG_CRYPTO_TWOFISH=m</div><div class='add'>+CONFIG_CRYPTO_ZLIB=m</div><div class='add'>+CONFIG_CRYPTO_LZO=m</div><div class='add'>+CONFIG_CRC_CCITT=m</div><div class='add'>+CONFIG_CRC7=m</div><div class='head'>diff --git a/arch/mips/configs/nlm_xlr_defconfig b/arch/mips/configs/nlm_xlr_defconfig<br/>index e4b399fdaa61..7c68666fdd64 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/nlm_xlr_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/configs/nlm_xlr_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/nlm_xlr_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/configs/nlm_xlr_defconfig</a></div><div class='hunk'>@@ -8,7 +8,7 @@ CONFIG_HIGH_RES_TIMERS=y</div><div class='ctx'> CONFIG_PREEMPT_VOLUNTARY=y</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='ctx'> CONFIG_EXPERIMENTAL=y</div><div class='del'>-CONFIG_CROSS_COMPILE="mips64-unknown-linux-gnu-"</div><div class='add'>+CONFIG_CROSS_COMPILE="mips-linux-gnu-"</div><div class='ctx'> # CONFIG_LOCALVERSION_AUTO is not set</div><div class='ctx'> CONFIG_SYSVIPC=y</div><div class='ctx'> CONFIG_POSIX_MQUEUE=y</div><div class='hunk'>@@ -22,15 +22,13 @@ CONFIG_AUDIT=y</div><div class='ctx'> CONFIG_NAMESPACES=y</div><div class='ctx'> CONFIG_SCHED_AUTOGROUP=y</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='del'>-CONFIG_INITRAMFS_SOURCE="usr/dev_file_list usr/rootfs"</div><div class='add'>+CONFIG_INITRAMFS_SOURCE="usr/dev_file_list usr/rootfs.xlr"</div><div class='ctx'> CONFIG_RD_BZIP2=y</div><div class='ctx'> CONFIG_RD_LZMA=y</div><div class='ctx'> CONFIG_INITRAMFS_COMPRESSION_GZIP=y</div><div class='del'>-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='ctx'> CONFIG_EXPERT=y</div><div class='ctx'> CONFIG_KALLSYMS_ALL=y</div><div class='ctx'> # CONFIG_ELF_CORE is not set</div><div class='del'>-# CONFIG_PCSPKR_PLATFORM is not set</div><div class='ctx'> # CONFIG_PERF_EVENTS is not set</div><div class='ctx'> # CONFIG_COMPAT_BRK is not set</div><div class='ctx'> CONFIG_PROFILING=y</div><div class='hunk'>@@ -39,6 +37,9 @@ CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODVERSIONS=y</div><div class='ctx'> CONFIG_MODULE_SRCVERSION_ALL=y</div><div class='ctx'> CONFIG_BLK_DEV_INTEGRITY=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_PCI_MSI=y</div><div class='add'>+CONFIG_PCI_DEBUG=y</div><div class='ctx'> CONFIG_BINFMT_MISC=m</div><div class='ctx'> CONFIG_PM_RUNTIME=y</div><div class='ctx'> CONFIG_PM_DEBUG=y</div><div class='hunk'>@@ -297,12 +298,10 @@ CONFIG_NET_ACT_SIMP=m</div><div class='ctx'> CONFIG_NET_ACT_SKBEDIT=m</div><div class='ctx'> CONFIG_DCB=y</div><div class='ctx'> CONFIG_NET_PKTGEN=m</div><div class='del'>-# CONFIG_WIRELESS is not set</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> # CONFIG_STANDALONE is not set</div><div class='ctx'> CONFIG_CONNECTOR=y</div><div class='del'>-CONFIG_MTD=m</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='ctx'> CONFIG_BLK_DEV_NBD=m</div><div class='hunk'>@@ -339,6 +338,9 @@ CONFIG_SCSI_DH_EMC=m</div><div class='ctx'> CONFIG_SCSI_DH_ALUA=m</div><div class='ctx'> CONFIG_SCSI_OSD_INITIATOR=m</div><div class='ctx'> CONFIG_SCSI_OSD_ULD=m</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+CONFIG_E1000E=y</div><div class='add'>+CONFIG_SKY2=y</div><div class='ctx'> # CONFIG_INPUT_MOUSEDEV is not set</div><div class='ctx'> CONFIG_INPUT_EVDEV=y</div><div class='ctx'> CONFIG_INPUT_EVBUG=m</div><div class='hunk'>@@ -443,7 +445,6 @@ CONFIG_CIFS_UPCALL=y</div><div class='ctx'> CONFIG_CIFS_XATTR=y</div><div class='ctx'> CONFIG_CIFS_POSIX=y</div><div class='ctx'> CONFIG_CIFS_DFS_UPCALL=y</div><div class='del'>-CONFIG_CIFS_EXPERIMENTAL=y</div><div class='ctx'> CONFIG_NCP_FS=m</div><div class='ctx'> CONFIG_NCPFS_PACKET_SIGNING=y</div><div class='ctx'> CONFIG_NCPFS_IOCTL_LOCKING=y</div><div class='hunk'>@@ -516,7 +517,6 @@ CONFIG_PRINTK_TIME=y</div><div class='ctx'> # CONFIG_ENABLE_WARN_DEPRECATED is not set</div><div class='ctx'> # CONFIG_ENABLE_MUST_CHECK is not set</div><div class='ctx'> CONFIG_UNUSED_SYMBOLS=y</div><div class='del'>-CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_DETECT_HUNG_TASK=y</div><div class='ctx'> CONFIG_SCHEDSTATS=y</div><div class='ctx'> CONFIG_TIMER_STATS=y</div><div class='head'>diff --git a/arch/mips/configs/pb1200_defconfig b/arch/mips/configs/pb1200_defconfig<br/>deleted file mode 100644<br/>index dcbe2704e5ed..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/pb1200_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/configs/pb1200_defconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,170 +0,0 @@</div><div class='del'>-CONFIG_MIPS_ALCHEMY=y</div><div class='del'>-CONFIG_MIPS_PB1200=y</div><div class='del'>-CONFIG_KSM=y</div><div class='del'>-CONFIG_NO_HZ=y</div><div class='del'>-CONFIG_HIGH_RES_TIMERS=y</div><div class='del'>-CONFIG_HZ_100=y</div><div class='del'>-# CONFIG_SECCOMP is not set</div><div class='del'>-CONFIG_EXPERIMENTAL=y</div><div class='del'>-CONFIG_LOCALVERSION="-pb1200"</div><div class='del'>-CONFIG_KERNEL_LZMA=y</div><div class='del'>-CONFIG_SYSVIPC=y</div><div class='del'>-CONFIG_POSIX_MQUEUE=y</div><div class='del'>-CONFIG_TINY_RCU=y</div><div class='del'>-CONFIG_LOG_BUF_SHIFT=14</div><div class='del'>-CONFIG_EXPERT=y</div><div class='del'>-# CONFIG_SYSCTL_SYSCALL is not set</div><div class='del'>-# CONFIG_KALLSYMS is not set</div><div class='del'>-# CONFIG_PCSPKR_PLATFORM is not set</div><div class='del'>-# CONFIG_VM_EVENT_COUNTERS is not set</div><div class='del'>-# CONFIG_COMPAT_BRK is not set</div><div class='del'>-CONFIG_SLAB=y</div><div class='del'>-CONFIG_MODULES=y</div><div class='del'>-CONFIG_MODULE_UNLOAD=y</div><div class='del'>-# CONFIG_LBDAF is not set</div><div class='del'>-# CONFIG_BLK_DEV_BSG is not set</div><div class='del'>-# CONFIG_IOSCHED_DEADLINE is not set</div><div class='del'>-# CONFIG_IOSCHED_CFQ is not set</div><div class='del'>-CONFIG_PCCARD=y</div><div class='del'>-CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y</div><div class='del'>-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y</div><div class='del'>-CONFIG_BINFMT_MISC=y</div><div class='del'>-CONFIG_NET=y</div><div class='del'>-CONFIG_PACKET=y</div><div class='del'>-CONFIG_UNIX=y</div><div class='del'>-CONFIG_INET=y</div><div class='del'>-CONFIG_IP_MULTICAST=y</div><div class='del'>-CONFIG_IP_PNP=y</div><div class='del'>-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='del'>-# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='del'>-# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='del'>-# CONFIG_INET_DIAG is not set</div><div class='del'>-# CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_WIRELESS is not set</div><div class='del'>-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='del'>-CONFIG_MTD=y</div><div class='del'>-CONFIG_MTD_PARTITIONS=y</div><div class='del'>-CONFIG_MTD_CMDLINE_PARTS=y</div><div class='del'>-CONFIG_MTD_CHAR=y</div><div class='del'>-CONFIG_MTD_BLOCK=y</div><div class='del'>-CONFIG_MTD_CFI=y</div><div class='del'>-CONFIG_MTD_CFI_AMDSTD=y</div><div class='del'>-CONFIG_MTD_PHYSMAP=y</div><div class='del'>-CONFIG_MTD_NAND=y</div><div class='del'>-CONFIG_MTD_NAND_PLATFORM=y</div><div class='del'>-CONFIG_BLK_DEV_LOOP=y</div><div class='del'>-CONFIG_BLK_DEV_UB=y</div><div class='del'>-# CONFIG_MISC_DEVICES is not set</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDECS=y</div><div class='del'>-CONFIG_BLK_DEV_IDECD=y</div><div class='del'>-CONFIG_IDE_TASK_IOCTL=y</div><div class='del'>-# CONFIG_IDE_PROC_FS is not set</div><div class='del'>-CONFIG_BLK_DEV_IDE_AU1XXX=y</div><div class='del'>-CONFIG_NETDEVICES=y</div><div class='del'>-CONFIG_NET_ETHERNET=y</div><div class='del'>-CONFIG_SMC91X=y</div><div class='del'>-# CONFIG_NETDEV_1000 is not set</div><div class='del'>-# CONFIG_NETDEV_10000 is not set</div><div class='del'>-# CONFIG_WLAN is not set</div><div class='del'>-# CONFIG_INPUT_MOUSEDEV is not set</div><div class='del'>-CONFIG_INPUT_EVDEV=y</div><div class='del'>-# CONFIG_INPUT_KEYBOARD is not set</div><div class='del'>-# CONFIG_INPUT_MOUSE is not set</div><div class='del'>-# CONFIG_SERIO is not set</div><div class='del'>-CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='del'>-CONFIG_SERIAL_8250=y</div><div class='del'>-CONFIG_SERIAL_8250_CONSOLE=y</div><div class='del'>-CONFIG_SERIAL_8250_NR_UARTS=2</div><div class='del'>-CONFIG_SERIAL_8250_RUNTIME_UARTS=2</div><div class='del'>-# CONFIG_LEGACY_PTYS is not set</div><div class='del'>-# CONFIG_HW_RANDOM is not set</div><div class='del'>-CONFIG_I2C=y</div><div class='del'>-# CONFIG_I2C_COMPAT is not set</div><div class='del'>-CONFIG_I2C_CHARDEV=y</div><div class='del'>-# CONFIG_I2C_HELPER_AUTO is not set</div><div class='del'>-CONFIG_I2C_AU1550=y</div><div class='del'>-CONFIG_SPI=y</div><div class='del'>-CONFIG_SPI_AU1550=y</div><div class='del'>-CONFIG_GPIOLIB=y</div><div class='del'>-CONFIG_GPIO_SYSFS=y</div><div class='del'>-CONFIG_SENSORS_ADM1025=y</div><div class='del'>-CONFIG_SENSORS_LM70=y</div><div class='del'>-CONFIG_FB=y</div><div class='del'>-CONFIG_FB_AU1200=y</div><div class='del'>-# CONFIG_VGA_CONSOLE is not set</div><div class='del'>-CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='del'>-CONFIG_FONTS=y</div><div class='del'>-CONFIG_FONT_8x16=y</div><div class='del'>-CONFIG_SOUND=y</div><div class='del'>-CONFIG_SND=y</div><div class='del'>-CONFIG_SND_DYNAMIC_MINORS=y</div><div class='del'>-# CONFIG_SND_SUPPORT_OLD_API is not set</div><div class='del'>-# CONFIG_SND_VERBOSE_PROCFS is not set</div><div class='del'>-# CONFIG_SND_DRIVERS is not set</div><div class='del'>-# CONFIG_SND_SPI is not set</div><div class='del'>-# CONFIG_SND_MIPS is not set</div><div class='del'>-# CONFIG_SND_USB is not set</div><div class='del'>-# CONFIG_SND_PCMCIA is not set</div><div class='del'>-CONFIG_SND_SOC=y</div><div class='del'>-CONFIG_SND_SOC_AU1XPSC=y</div><div class='del'>-CONFIG_SND_SOC_DB1200=y</div><div class='del'>-CONFIG_HIDRAW=y</div><div class='del'>-CONFIG_USB_HIDDEV=y</div><div class='del'>-CONFIG_USB=y</div><div class='del'>-CONFIG_USB_DEBUG=y</div><div class='del'>-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y</div><div class='del'>-# CONFIG_USB_DEVICE_CLASS is not set</div><div class='del'>-CONFIG_USB_DYNAMIC_MINORS=y</div><div class='del'>-CONFIG_USB_EHCI_HCD=y</div><div class='del'>-CONFIG_USB_EHCI_ROOT_HUB_TT=y</div><div class='del'>-CONFIG_USB_OHCI_HCD=y</div><div class='del'>-CONFIG_MMC=y</div><div class='del'>-# CONFIG_MMC_BLOCK_BOUNCE is not set</div><div class='del'>-CONFIG_MMC_AU1X=y</div><div class='del'>-CONFIG_NEW_LEDS=y</div><div class='del'>-CONFIG_LEDS_CLASS=y</div><div class='del'>-CONFIG_LEDS_TRIGGERS=y</div><div class='del'>-CONFIG_RTC_CLASS=y</div><div class='del'>-CONFIG_RTC_DRV_AU1XXX=y</div><div class='del'>-CONFIG_EXT2_FS=y</div><div class='del'>-CONFIG_ISO9660_FS=y</div><div class='del'>-CONFIG_JOLIET=y</div><div class='del'>-CONFIG_ZISOFS=y</div><div class='del'>-CONFIG_UDF_FS=y</div><div class='del'>-CONFIG_VFAT_FS=y</div><div class='del'>-# CONFIG_PROC_PAGE_MONITOR is not set</div><div class='del'>-CONFIG_TMPFS=y</div><div class='del'>-CONFIG_JFFS2_FS=y</div><div class='del'>-CONFIG_JFFS2_SUMMARY=y</div><div class='del'>-CONFIG_JFFS2_COMPRESSION_OPTIONS=y</div><div class='del'>-CONFIG_JFFS2_LZO=y</div><div class='del'>-CONFIG_JFFS2_RUBIN=y</div><div class='del'>-CONFIG_SQUASHFS=y</div><div class='del'>-CONFIG_NFS_FS=y</div><div class='del'>-CONFIG_NFS_V3=y</div><div class='del'>-CONFIG_ROOT_NFS=y</div><div class='del'>-CONFIG_PARTITION_ADVANCED=y</div><div class='del'>-CONFIG_EFI_PARTITION=y</div><div class='del'>-CONFIG_NLS_CODEPAGE_437=y</div><div class='del'>-CONFIG_NLS_CODEPAGE_850=y</div><div class='del'>-CONFIG_NLS_CODEPAGE_852=y</div><div class='del'>-CONFIG_NLS_CODEPAGE_1250=y</div><div class='del'>-CONFIG_NLS_ASCII=y</div><div class='del'>-CONFIG_NLS_ISO8859_1=y</div><div class='del'>-CONFIG_NLS_ISO8859_2=y</div><div class='del'>-CONFIG_NLS_ISO8859_15=y</div><div class='del'>-CONFIG_NLS_UTF8=y</div><div class='del'>-# CONFIG_ENABLE_WARN_DEPRECATED is not set</div><div class='del'>-# CONFIG_ENABLE_MUST_CHECK is not set</div><div class='del'>-CONFIG_MAGIC_SYSRQ=y</div><div class='del'>-CONFIG_STRIP_ASM_SYMS=y</div><div class='del'>-CONFIG_DEBUG_KERNEL=y</div><div class='del'>-# CONFIG_SCHED_DEBUG is not set</div><div class='del'>-# CONFIG_FTRACE is not set</div><div class='del'>-CONFIG_CMDLINE_BOOL=y</div><div class='del'>-CONFIG_CMDLINE="console=ttyS0,115200"</div><div class='del'>-CONFIG_DEBUG_ZBOOT=y</div><div class='del'>-CONFIG_KEYS=y</div><div class='del'>-CONFIG_KEYS_DEBUG_PROC_KEYS=y</div><div class='del'>-CONFIG_SECURITYFS=y</div><div class='head'>diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c<br/>index f7b7ba6d5c45..b874accd878a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/dec/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/dec/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/dec/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/dec/setup.c</a></div><div class='hunk'>@@ -110,7 +110,6 @@ static struct irqaction fpuirq = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction busirq = {</div><div class='del'>-	.flags = IRQF_DISABLED,</div><div class='ctx'> 	.name = "bus error",</div><div class='ctx'> 	.flags = IRQF_NO_THREAD,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild<br/>index 7897f05e3165..f53f9ca73996 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/Kbuild?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/Kbuild</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/Kbuild?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/Kbuild</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='ctx'> include include/asm-generic/Kbuild.asm</div><div class='ctx'> </div><div class='del'>-header-y += cachectl.h sgidefs.h sysmips.h</div><div class='add'>+header-y += cachectl.h</div><div class='add'>+header-y += sgidefs.h</div><div class='add'>+header-y += sysmips.h</div><div class='head'>diff --git a/arch/mips/include/asm/bmips.h b/arch/mips/include/asm/bmips.h<br/>new file mode 100644<br/>index 000000000000..552a65a0cf2b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/bmips.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/bmips.h</a></div><div class='hunk'>@@ -0,0 +1,110 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 by Kevin Cernekee (cernekee@gmail.com)</div><div class='add'>+ *</div><div class='add'>+ * Definitions for BMIPS processors</div><div class='add'>+ */</div><div class='add'>+#ifndef _ASM_BMIPS_H</div><div class='add'>+#define _ASM_BMIPS_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/addrspace.h&gt;</div><div class='add'>+#include &lt;asm/mipsregs.h&gt;</div><div class='add'>+#include &lt;asm/hazards.h&gt;</div><div class='add'>+</div><div class='add'>+/* NOTE: the CBR register returns a PA, and it can be above 0xff00_0000 */</div><div class='add'>+#define BMIPS_GET_CBR()			((void __iomem *)(CKSEG1 | \</div><div class='add'>+					 (unsigned long) \</div><div class='add'>+					 ((read_c0_brcm_cbr() &gt;&gt; 18) &lt;&lt; 18)))</div><div class='add'>+</div><div class='add'>+#define BMIPS_RAC_CONFIG		0x00000000</div><div class='add'>+#define BMIPS_RAC_ADDRESS_RANGE		0x00000004</div><div class='add'>+#define BMIPS_RAC_CONFIG_1		0x00000008</div><div class='add'>+#define BMIPS_L2_CONFIG			0x0000000c</div><div class='add'>+#define BMIPS_LMB_CONTROL		0x0000001c</div><div class='add'>+#define BMIPS_SYSTEM_BASE		0x00000020</div><div class='add'>+#define BMIPS_PERF_GLOBAL_CONTROL	0x00020000</div><div class='add'>+#define BMIPS_PERF_CONTROL_0		0x00020004</div><div class='add'>+#define BMIPS_PERF_CONTROL_1		0x00020008</div><div class='add'>+#define BMIPS_PERF_COUNTER_0		0x00020010</div><div class='add'>+#define BMIPS_PERF_COUNTER_1		0x00020014</div><div class='add'>+#define BMIPS_PERF_COUNTER_2		0x00020018</div><div class='add'>+#define BMIPS_PERF_COUNTER_3		0x0002001c</div><div class='add'>+#define BMIPS_RELO_VECTOR_CONTROL_0	0x00030000</div><div class='add'>+#define BMIPS_RELO_VECTOR_CONTROL_1	0x00038000</div><div class='add'>+</div><div class='add'>+#define BMIPS_NMI_RESET_VEC		0x80000000</div><div class='add'>+#define BMIPS_WARM_RESTART_VEC		0x80000380</div><div class='add'>+</div><div class='add'>+#define ZSCM_REG_BASE			0x97000000</div><div class='add'>+</div><div class='add'>+#if !defined(__ASSEMBLY__)</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;asm/r4kcache.h&gt;</div><div class='add'>+</div><div class='add'>+extern struct plat_smp_ops bmips_smp_ops;</div><div class='add'>+extern char bmips_reset_nmi_vec;</div><div class='add'>+extern char bmips_reset_nmi_vec_end;</div><div class='add'>+extern char bmips_smp_movevec;</div><div class='add'>+extern char bmips_smp_int_vec;</div><div class='add'>+extern char bmips_smp_int_vec_end;</div><div class='add'>+</div><div class='add'>+extern int bmips_smp_enabled;</div><div class='add'>+extern int bmips_cpu_offset;</div><div class='add'>+extern cpumask_t bmips_booted_mask;</div><div class='add'>+</div><div class='add'>+extern void bmips_ebase_setup(void);</div><div class='add'>+extern asmlinkage void plat_wired_tlb_setup(void);</div><div class='add'>+</div><div class='add'>+static inline unsigned long bmips_read_zscm_reg(unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	unsigned long ret;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+		".set push\n"</div><div class='add'>+		".set noreorder\n"</div><div class='add'>+		"cache %1, 0(%2)\n"</div><div class='add'>+		"sync\n"</div><div class='add'>+		"_ssnop\n"</div><div class='add'>+		"_ssnop\n"</div><div class='add'>+		"_ssnop\n"</div><div class='add'>+		"_ssnop\n"</div><div class='add'>+		"_ssnop\n"</div><div class='add'>+		"_ssnop\n"</div><div class='add'>+		"_ssnop\n"</div><div class='add'>+		"mfc0 %0, $28, 3\n"</div><div class='add'>+		"_ssnop\n"</div><div class='add'>+		".set pop\n"</div><div class='add'>+		: "=&amp;r" (ret)</div><div class='add'>+		: "i" (Index_Load_Tag_S), "r" (ZSCM_REG_BASE + offset)</div><div class='add'>+		: "memory");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bmips_write_zscm_reg(unsigned int offset, unsigned long data)</div><div class='add'>+{</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+		".set push\n"</div><div class='add'>+		".set noreorder\n"</div><div class='add'>+		"mtc0 %0, $28, 3\n"</div><div class='add'>+		"_ssnop\n"</div><div class='add'>+		"_ssnop\n"</div><div class='add'>+		"_ssnop\n"</div><div class='add'>+		"cache %1, 0(%2)\n"</div><div class='add'>+		"_ssnop\n"</div><div class='add'>+		"_ssnop\n"</div><div class='add'>+		"_ssnop\n"</div><div class='add'>+		: /* no outputs */</div><div class='add'>+		: "r" (data),</div><div class='add'>+		  "i" (Index_Store_Tag_S), "r" (ZSCM_REG_BASE + offset)</div><div class='add'>+		: "memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* !defined(__ASSEMBLY__) */</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_BMIPS_H */</div><div class='head'>diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h<br/>index 35cd1bab69c3..7a51d879e6ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/bootinfo.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/bootinfo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/bootinfo.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/bootinfo.h</a></div><div class='hunk'>@@ -86,6 +86,7 @@ extern unsigned long mips_machtype;</div><div class='ctx'> #define BOOT_MEM_RAM		1</div><div class='ctx'> #define BOOT_MEM_ROM_DATA	2</div><div class='ctx'> #define BOOT_MEM_RESERVED	3</div><div class='add'>+#define BOOT_MEM_INIT_RAM	4</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * A memory map that's built upon what was determined</div><div class='head'>diff --git a/arch/mips/include/asm/branch.h b/arch/mips/include/asm/branch.h<br/>index 37c6857c8d4a..888766ae1f85 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/branch.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/branch.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/branch.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/branch.h</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #define _ASM_BRANCH_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;asm/inst.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline int delay_slot(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='hunk'>@@ -23,7 +24,11 @@ static inline unsigned long exception_epc(struct pt_regs *regs)</div><div class='ctx'> 	return regs-&gt;cp0_epc + 4;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define BRANCH_LIKELY_TAKEN 0x0001</div><div class='add'>+</div><div class='ctx'> extern int __compute_return_epc(struct pt_regs *regs);</div><div class='add'>+extern int __compute_return_epc_for_insn(struct pt_regs *regs,</div><div class='add'>+					 union mips_instruction insn);</div><div class='ctx'> </div><div class='ctx'> static inline int compute_return_epc(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h<br/>index 2f7f41873f24..f9fa2a479dd0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/cpu.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/cpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/cpu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/cpu.h</a></div><div class='hunk'>@@ -169,6 +169,10 @@</div><div class='ctx'> #define PRID_IMP_NETLOGIC_XLS412B	0x4c00</div><div class='ctx'> #define PRID_IMP_NETLOGIC_XLS408B	0x4e00</div><div class='ctx'> #define PRID_IMP_NETLOGIC_XLS404B	0x4f00</div><div class='add'>+#define PRID_IMP_NETLOGIC_AU13XX	0x8000</div><div class='add'>+</div><div class='add'>+#define PRID_IMP_NETLOGIC_XLP8XX	0x1000</div><div class='add'>+#define PRID_IMP_NETLOGIC_XLP3XX	0x1100</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Definitions for 7:0 on legacy processors</div><div class='hunk'>@@ -263,7 +267,7 @@ enum cpu_type_enum {</div><div class='ctx'> 	 */</div><div class='ctx'> 	CPU_5KC, CPU_20KC, CPU_25KF, CPU_SB1, CPU_SB1A, CPU_LOONGSON2,</div><div class='ctx'> 	CPU_CAVIUM_OCTEON, CPU_CAVIUM_OCTEON_PLUS, CPU_CAVIUM_OCTEON2,</div><div class='del'>-	CPU_XLR,</div><div class='add'>+	CPU_XLR, CPU_XLP,</div><div class='ctx'> </div><div class='ctx'> 	CPU_LAST</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/mips/include/asm/gio_device.h b/arch/mips/include/asm/gio_device.h<br/>new file mode 100644<br/>index 000000000000..5437c84664bf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/gio_device.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/gio_device.h</a></div><div class='hunk'>@@ -0,0 +1,56 @@</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+</div><div class='add'>+struct gio_device_id {</div><div class='add'>+	__u8 id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct gio_device {</div><div class='add'>+	struct device   dev;</div><div class='add'>+	struct resource resource;</div><div class='add'>+	unsigned int    irq;</div><div class='add'>+	unsigned int    slotno;</div><div class='add'>+</div><div class='add'>+	const char      *name;</div><div class='add'>+	struct gio_device_id id;</div><div class='add'>+	unsigned        id32:1;</div><div class='add'>+	unsigned        gio64:1;</div><div class='add'>+};</div><div class='add'>+#define to_gio_device(d) container_of(d, struct gio_device, dev)</div><div class='add'>+</div><div class='add'>+struct gio_driver {</div><div class='add'>+	const char    *name;</div><div class='add'>+	struct module *owner;</div><div class='add'>+	const struct gio_device_id *id_table;</div><div class='add'>+</div><div class='add'>+	int  (*probe)(struct gio_device *, const struct gio_device_id *);</div><div class='add'>+	void (*remove)(struct gio_device *);</div><div class='add'>+	int  (*suspend)(struct gio_device *, pm_message_t);</div><div class='add'>+	int  (*resume)(struct gio_device *);</div><div class='add'>+	void (*shutdown)(struct gio_device *);</div><div class='add'>+</div><div class='add'>+	struct device_driver driver;</div><div class='add'>+};</div><div class='add'>+#define to_gio_driver(drv) container_of(drv, struct gio_driver, driver)</div><div class='add'>+</div><div class='add'>+extern const struct gio_device_id *gio_match_device(const struct gio_device_id *,</div><div class='add'>+						    const struct gio_device *);</div><div class='add'>+extern struct gio_device *gio_dev_get(struct gio_device *);</div><div class='add'>+extern void gio_dev_put(struct gio_device *);</div><div class='add'>+</div><div class='add'>+extern int gio_device_register(struct gio_device *);</div><div class='add'>+extern void gio_device_unregister(struct gio_device *);</div><div class='add'>+extern void gio_release_dev(struct device *);</div><div class='add'>+</div><div class='add'>+static inline void gio_device_free(struct gio_device *dev)</div><div class='add'>+{</div><div class='add'>+	gio_release_dev(&amp;dev-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern int gio_register_driver(struct gio_driver *);</div><div class='add'>+extern void gio_unregister_driver(struct gio_driver *);</div><div class='add'>+</div><div class='add'>+#define gio_get_drvdata(_dev)        drv_get_drvdata(&amp;(_dev)-&gt;dev)</div><div class='add'>+#define gio_set_drvdata(_dev, data)  drv_set_drvdata(&amp;(_dev)-&gt;dev, (data))</div><div class='add'>+</div><div class='add'>+extern void gio_set_master(struct gio_device *);</div><div class='head'>diff --git a/arch/mips/include/asm/hazards.h b/arch/mips/include/asm/hazards.h<br/>index 4e332165d7b7..b4c20e4f87cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/hazards.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/hazards.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/hazards.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/hazards.h</a></div><div class='hunk'>@@ -87,7 +87,8 @@ do {									\</div><div class='ctx'> 	: "=r" (tmp));							\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-#elif defined(CONFIG_CPU_MIPSR1) &amp;&amp; !defined(CONFIG_MIPS_ALCHEMY)</div><div class='add'>+#elif (defined(CONFIG_CPU_MIPSR1) &amp;&amp; !defined(CONFIG_MIPS_ALCHEMY)) || \</div><div class='add'>+	defined(CONFIG_CPU_BMIPS)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * These are slightly complicated by the fact that we guarantee R1 kernels to</div><div class='hunk'>@@ -139,8 +140,8 @@ do {									\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> #elif defined(CONFIG_MIPS_ALCHEMY) || defined(CONFIG_CPU_CAVIUM_OCTEON) || \</div><div class='del'>-      defined(CONFIG_CPU_LOONGSON2) || defined(CONFIG_CPU_R10000) || \</div><div class='del'>-      defined(CONFIG_CPU_R5500)</div><div class='add'>+	defined(CONFIG_CPU_LOONGSON2) || defined(CONFIG_CPU_R10000) || \</div><div class='add'>+	defined(CONFIG_CPU_R5500)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * R10000 rocks - all hazards handled in hardware, so this becomes a nobrainer.</div><div class='head'>diff --git a/arch/mips/include/asm/hugetlb.h b/arch/mips/include/asm/hugetlb.h<br/>index c565b7c3f0b5..58d36889f09b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/hugetlb.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/hugetlb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/hugetlb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/hugetlb.h</a></div><div class='hunk'>@@ -70,7 +70,7 @@ static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,</div><div class='ctx'> static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,</div><div class='ctx'> 					 unsigned long addr, pte_t *ptep)</div><div class='ctx'> {</div><div class='del'>-	flush_tlb_mm(vma-&gt;vm_mm);</div><div class='add'>+	flush_tlb_page(vma, addr &amp; huge_page_mask(hstate_vma(vma)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int huge_pte_none(pte_t pte)</div><div class='head'>diff --git a/arch/mips/include/asm/ip32/mace.h b/arch/mips/include/asm/ip32/mace.h<br/>index d08d7c672139..c523123df380 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/ip32/mace.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/ip32/mace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/ip32/mace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/ip32/mace.h</a></div><div class='hunk'>@@ -95,7 +95,7 @@ struct mace_video {</div><div class='ctx'>  * Ethernet interface</div><div class='ctx'>  */</div><div class='ctx'> struct mace_ethernet {</div><div class='del'>-	volatile unsigned long mac_ctrl;</div><div class='add'>+	volatile u64 mac_ctrl;</div><div class='ctx'> 	volatile unsigned long int_stat;</div><div class='ctx'> 	volatile unsigned long dma_ctrl;</div><div class='ctx'> 	volatile unsigned long timer;</div><div class='head'>diff --git a/arch/mips/include/asm/ipcbuf.h b/arch/mips/include/asm/ipcbuf.h<br/>index d47d08f264e7..84c7e51cb6d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/ipcbuf.h</a></div><div class='hunk'>@@ -1,28 +1 @@</div><div class='del'>-#ifndef _ASM_IPCBUF_H</div><div class='del'>-#define _ASM_IPCBUF_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The ipc64_perm structure for alpha architecture.</div><div class='del'>- * Note extra padding because this structure is passed back and forth</div><div class='del'>- * between kernel and user space.</div><div class='del'>- *</div><div class='del'>- * Pad space is left for:</div><div class='del'>- * - 32-bit seq</div><div class='del'>- * - 2 miscellaneous 64-bit values</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct ipc64_perm</div><div class='del'>-{</div><div class='del'>-	__kernel_key_t	key;</div><div class='del'>-	__kernel_uid_t	uid;</div><div class='del'>-	__kernel_gid_t	gid;</div><div class='del'>-	__kernel_uid_t	cuid;</div><div class='del'>-	__kernel_gid_t	cgid;</div><div class='del'>-	__kernel_mode_t	mode;</div><div class='del'>-	unsigned short	seq;</div><div class='del'>-	unsigned short	__pad1;</div><div class='del'>-	unsigned long	__unused1;</div><div class='del'>-	unsigned long	__unused2;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_IPCBUF_H */</div><div class='add'>+#include &lt;asm-generic/ipcbuf.h&gt;</div><div class='head'>diff --git a/arch/mips/include/asm/kprobes.h b/arch/mips/include/asm/kprobes.h<br/>index e6ea4d4d7205..1fbbca01e681 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/kprobes.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/kprobes.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/kprobes.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/kprobes.h</a></div><div class='hunk'>@@ -74,6 +74,8 @@ struct prev_kprobe {</div><div class='ctx'> 		: MAX_JPROBES_STACK_SIZE)</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+#define SKIP_DELAYSLOT 0x0001</div><div class='add'>+</div><div class='ctx'> /* per-cpu kprobe control block */</div><div class='ctx'> struct kprobe_ctlblk {</div><div class='ctx'> 	unsigned long kprobe_status;</div><div class='hunk'>@@ -82,6 +84,9 @@ struct kprobe_ctlblk {</div><div class='ctx'> 	unsigned long kprobe_saved_epc;</div><div class='ctx'> 	unsigned long jprobe_saved_sp;</div><div class='ctx'> 	struct pt_regs jprobe_saved_regs;</div><div class='add'>+	/* Per-thread fields, used while emulating branches */</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned long target_epc;</div><div class='ctx'> 	u8 jprobes_stack[MAX_JPROBES_STACK_SIZE];</div><div class='ctx'> 	struct prev_kprobe prev_kprobe;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h<br/>index cda1c8070b27..2f0becb4ec8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-ath79/ar71xx_regs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-ath79/ar71xx_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-ath79/ar71xx_regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-ath79/ar71xx_regs.h</a></div><div class='hunk'>@@ -20,6 +20,10 @@</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define AR71XX_APB_BASE		0x18000000</div><div class='add'>+#define AR71XX_EHCI_BASE	0x1b000000</div><div class='add'>+#define AR71XX_EHCI_SIZE	0x1000</div><div class='add'>+#define AR71XX_OHCI_BASE	0x1c000000</div><div class='add'>+#define AR71XX_OHCI_SIZE	0x1000</div><div class='ctx'> #define AR71XX_SPI_BASE		0x1f000000</div><div class='ctx'> #define AR71XX_SPI_SIZE		0x01000000</div><div class='ctx'> </div><div class='hunk'>@@ -27,6 +31,8 @@</div><div class='ctx'> #define AR71XX_DDR_CTRL_SIZE	0x100</div><div class='ctx'> #define AR71XX_UART_BASE	(AR71XX_APB_BASE + 0x00020000)</div><div class='ctx'> #define AR71XX_UART_SIZE	0x100</div><div class='add'>+#define AR71XX_USB_CTRL_BASE	(AR71XX_APB_BASE + 0x00030000)</div><div class='add'>+#define AR71XX_USB_CTRL_SIZE	0x100</div><div class='ctx'> #define AR71XX_GPIO_BASE        (AR71XX_APB_BASE + 0x00040000)</div><div class='ctx'> #define AR71XX_GPIO_SIZE        0x100</div><div class='ctx'> #define AR71XX_PLL_BASE		(AR71XX_APB_BASE + 0x00050000)</div><div class='hunk'>@@ -34,9 +40,26 @@</div><div class='ctx'> #define AR71XX_RESET_BASE	(AR71XX_APB_BASE + 0x00060000)</div><div class='ctx'> #define AR71XX_RESET_SIZE	0x100</div><div class='ctx'> </div><div class='add'>+#define AR7240_USB_CTRL_BASE	(AR71XX_APB_BASE + 0x00030000)</div><div class='add'>+#define AR7240_USB_CTRL_SIZE	0x100</div><div class='add'>+#define AR7240_OHCI_BASE	0x1b000000</div><div class='add'>+#define AR7240_OHCI_SIZE	0x1000</div><div class='add'>+</div><div class='add'>+#define AR724X_EHCI_BASE	0x1b000000</div><div class='add'>+#define AR724X_EHCI_SIZE	0x1000</div><div class='add'>+</div><div class='add'>+#define AR913X_EHCI_BASE	0x1b000000</div><div class='add'>+#define AR913X_EHCI_SIZE	0x1000</div><div class='ctx'> #define AR913X_WMAC_BASE	(AR71XX_APB_BASE + 0x000C0000)</div><div class='ctx'> #define AR913X_WMAC_SIZE	0x30000</div><div class='ctx'> </div><div class='add'>+#define AR933X_UART_BASE	(AR71XX_APB_BASE + 0x00020000)</div><div class='add'>+#define AR933X_UART_SIZE	0x14</div><div class='add'>+#define AR933X_WMAC_BASE	(AR71XX_APB_BASE + 0x00100000)</div><div class='add'>+#define AR933X_WMAC_SIZE	0x20000</div><div class='add'>+#define AR933X_EHCI_BASE	0x1b000000</div><div class='add'>+#define AR933X_EHCI_SIZE	0x1000</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * DDR_CTRL block</div><div class='ctx'>  */</div><div class='hunk'>@@ -63,6 +86,11 @@</div><div class='ctx'> #define AR913X_DDR_REG_FLUSH_USB	0x84</div><div class='ctx'> #define AR913X_DDR_REG_FLUSH_WMAC	0x88</div><div class='ctx'> </div><div class='add'>+#define AR933X_DDR_REG_FLUSH_GE0	0x7c</div><div class='add'>+#define AR933X_DDR_REG_FLUSH_GE1	0x80</div><div class='add'>+#define AR933X_DDR_REG_FLUSH_USB	0x84</div><div class='add'>+#define AR933X_DDR_REG_FLUSH_WMAC	0x88</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * PLL block</div><div class='ctx'>  */</div><div class='hunk'>@@ -104,6 +132,30 @@</div><div class='ctx'> #define AR913X_AHB_DIV_SHIFT		19</div><div class='ctx'> #define AR913X_AHB_DIV_MASK		0x1</div><div class='ctx'> </div><div class='add'>+#define AR933X_PLL_CPU_CONFIG_REG	0x00</div><div class='add'>+#define AR933X_PLL_CLOCK_CTRL_REG	0x08</div><div class='add'>+</div><div class='add'>+#define AR933X_PLL_CPU_CONFIG_NINT_SHIFT	10</div><div class='add'>+#define AR933X_PLL_CPU_CONFIG_NINT_MASK		0x3f</div><div class='add'>+#define AR933X_PLL_CPU_CONFIG_REFDIV_SHIFT	16</div><div class='add'>+#define AR933X_PLL_CPU_CONFIG_REFDIV_MASK	0x1f</div><div class='add'>+#define AR933X_PLL_CPU_CONFIG_OUTDIV_SHIFT	23</div><div class='add'>+#define AR933X_PLL_CPU_CONFIG_OUTDIV_MASK	0x7</div><div class='add'>+</div><div class='add'>+#define AR933X_PLL_CLOCK_CTRL_BYPASS		BIT(2)</div><div class='add'>+#define AR933X_PLL_CLOCK_CTRL_CPU_DIV_SHIFT	5</div><div class='add'>+#define AR933X_PLL_CLOCK_CTRL_CPU_DIV_MASK	0x3</div><div class='add'>+#define AR933X_PLL_CLOCK_CTRL_DDR_DIV_SHIFT	10</div><div class='add'>+#define AR933X_PLL_CLOCK_CTRL_DDR_DIV_MASK	0x3</div><div class='add'>+#define AR933X_PLL_CLOCK_CTRL_AHB_DIV_SHIFT	15</div><div class='add'>+#define AR933X_PLL_CLOCK_CTRL_AHB_DIV_MASK	0x7</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * USB_CONFIG block</div><div class='add'>+ */</div><div class='add'>+#define AR71XX_USB_CTRL_REG_FLADJ	0x00</div><div class='add'>+#define AR71XX_USB_CTRL_REG_CONFIG	0x04</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * RESET block</div><div class='ctx'>  */</div><div class='hunk'>@@ -130,6 +182,13 @@</div><div class='ctx'> </div><div class='ctx'> #define AR724X_RESET_REG_RESET_MODULE		0x1c</div><div class='ctx'> </div><div class='add'>+#define AR933X_RESET_REG_RESET_MODULE		0x1c</div><div class='add'>+#define AR933X_RESET_REG_BOOTSTRAP		0xac</div><div class='add'>+</div><div class='add'>+#define MISC_INT_ETHSW			BIT(12)</div><div class='add'>+#define MISC_INT_TIMER4			BIT(10)</div><div class='add'>+#define MISC_INT_TIMER3			BIT(9)</div><div class='add'>+#define MISC_INT_TIMER2			BIT(8)</div><div class='ctx'> #define MISC_INT_DMA			BIT(7)</div><div class='ctx'> #define MISC_INT_OHCI			BIT(6)</div><div class='ctx'> #define MISC_INT_PERFC			BIT(5)</div><div class='hunk'>@@ -158,14 +217,29 @@</div><div class='ctx'> #define AR71XX_RESET_PCI_BUS		BIT(1)</div><div class='ctx'> #define AR71XX_RESET_PCI_CORE		BIT(0)</div><div class='ctx'> </div><div class='add'>+#define AR7240_RESET_USB_HOST		BIT(5)</div><div class='add'>+#define AR7240_RESET_OHCI_DLL		BIT(3)</div><div class='add'>+</div><div class='ctx'> #define AR724X_RESET_GE1_MDIO		BIT(23)</div><div class='ctx'> #define AR724X_RESET_GE0_MDIO		BIT(22)</div><div class='ctx'> #define AR724X_RESET_PCIE_PHY_SERIAL	BIT(10)</div><div class='ctx'> #define AR724X_RESET_PCIE_PHY		BIT(7)</div><div class='ctx'> #define AR724X_RESET_PCIE		BIT(6)</div><div class='del'>-#define AR724X_RESET_OHCI_DLL		BIT(3)</div><div class='add'>+#define AR724X_RESET_USB_HOST		BIT(5)</div><div class='add'>+#define AR724X_RESET_USB_PHY		BIT(4)</div><div class='add'>+#define AR724X_RESET_USBSUS_OVERRIDE	BIT(3)</div><div class='ctx'> </div><div class='ctx'> #define AR913X_RESET_AMBA2WMAC		BIT(22)</div><div class='add'>+#define AR913X_RESET_USBSUS_OVERRIDE	BIT(10)</div><div class='add'>+#define AR913X_RESET_USB_HOST		BIT(5)</div><div class='add'>+#define AR913X_RESET_USB_PHY		BIT(4)</div><div class='add'>+</div><div class='add'>+#define AR933X_RESET_WMAC		BIT(11)</div><div class='add'>+#define AR933X_RESET_USB_HOST		BIT(5)</div><div class='add'>+#define AR933X_RESET_USB_PHY		BIT(4)</div><div class='add'>+#define AR933X_RESET_USBSUS_OVERRIDE	BIT(3)</div><div class='add'>+</div><div class='add'>+#define AR933X_BOOTSTRAP_REF_CLK_40	BIT(0)</div><div class='ctx'> </div><div class='ctx'> #define REV_ID_MAJOR_MASK		0xfff0</div><div class='ctx'> #define REV_ID_MAJOR_AR71XX		0x00a0</div><div class='hunk'>@@ -173,6 +247,8 @@</div><div class='ctx'> #define REV_ID_MAJOR_AR7240		0x00c0</div><div class='ctx'> #define REV_ID_MAJOR_AR7241		0x0100</div><div class='ctx'> #define REV_ID_MAJOR_AR7242		0x1100</div><div class='add'>+#define REV_ID_MAJOR_AR9330		0x0110</div><div class='add'>+#define REV_ID_MAJOR_AR9331		0x1110</div><div class='ctx'> </div><div class='ctx'> #define AR71XX_REV_ID_MINOR_MASK	0x3</div><div class='ctx'> #define AR71XX_REV_ID_MINOR_AR7130	0x0</div><div class='hunk'>@@ -187,6 +263,8 @@</div><div class='ctx'> #define AR913X_REV_ID_REVISION_MASK	0x3</div><div class='ctx'> #define AR913X_REV_ID_REVISION_SHIFT	2</div><div class='ctx'> </div><div class='add'>+#define AR933X_REV_ID_REVISION_MASK	0x3</div><div class='add'>+</div><div class='ctx'> #define AR724X_REV_ID_REVISION_MASK	0x3</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -229,5 +307,6 @@</div><div class='ctx'> #define AR71XX_GPIO_COUNT		16</div><div class='ctx'> #define AR724X_GPIO_COUNT		18</div><div class='ctx'> #define AR913X_GPIO_COUNT		22</div><div class='add'>+#define AR933X_GPIO_COUNT		30</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_MACH_AR71XX_REGS_H */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-ath79/ar933x_uart.h b/arch/mips/include/asm/mach-ath79/ar933x_uart.h<br/>new file mode 100644<br/>index 000000000000..52730555937f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-ath79/ar933x_uart.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-ath79/ar933x_uart.h</a></div><div class='hunk'>@@ -0,0 +1,67 @@</div><div class='add'>+/*</div><div class='add'>+ *  Atheros AR933X UART defines</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2011 Gabor Juhos &lt;juhosg@openwrt.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 version 2 as published</div><div class='add'>+ *  by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __AR933X_UART_H</div><div class='add'>+#define __AR933X_UART_H</div><div class='add'>+</div><div class='add'>+#define AR933X_UART_REGS_SIZE		20</div><div class='add'>+#define AR933X_UART_FIFO_SIZE		16</div><div class='add'>+</div><div class='add'>+#define AR933X_UART_DATA_REG		0x00</div><div class='add'>+#define AR933X_UART_CS_REG		0x04</div><div class='add'>+#define AR933X_UART_CLOCK_REG		0x08</div><div class='add'>+#define AR933X_UART_INT_REG		0x0c</div><div class='add'>+#define AR933X_UART_INT_EN_REG		0x10</div><div class='add'>+</div><div class='add'>+#define AR933X_UART_DATA_TX_RX_MASK	0xff</div><div class='add'>+#define AR933X_UART_DATA_RX_CSR		BIT(8)</div><div class='add'>+#define AR933X_UART_DATA_TX_CSR		BIT(9)</div><div class='add'>+</div><div class='add'>+#define AR933X_UART_CS_PARITY_S		0</div><div class='add'>+#define AR933X_UART_CS_PARITY_M		0x3</div><div class='add'>+#define   AR933X_UART_CS_PARITY_NONE	0</div><div class='add'>+#define   AR933X_UART_CS_PARITY_ODD	1</div><div class='add'>+#define   AR933X_UART_CS_PARITY_EVEN	2</div><div class='add'>+#define AR933X_UART_CS_IF_MODE_S	2</div><div class='add'>+#define AR933X_UART_CS_IF_MODE_M	0x3</div><div class='add'>+#define   AR933X_UART_CS_IF_MODE_NONE	0</div><div class='add'>+#define   AR933X_UART_CS_IF_MODE_DTE	1</div><div class='add'>+#define   AR933X_UART_CS_IF_MODE_DCE	2</div><div class='add'>+#define AR933X_UART_CS_FLOW_CTRL_S	4</div><div class='add'>+#define AR933X_UART_CS_FLOW_CTRL_M	0x3</div><div class='add'>+#define AR933X_UART_CS_DMA_EN		BIT(6)</div><div class='add'>+#define AR933X_UART_CS_TX_READY_ORIDE	BIT(7)</div><div class='add'>+#define AR933X_UART_CS_RX_READY_ORIDE	BIT(8)</div><div class='add'>+#define AR933X_UART_CS_TX_READY		BIT(9)</div><div class='add'>+#define AR933X_UART_CS_RX_BREAK		BIT(10)</div><div class='add'>+#define AR933X_UART_CS_TX_BREAK		BIT(11)</div><div class='add'>+#define AR933X_UART_CS_HOST_INT		BIT(12)</div><div class='add'>+#define AR933X_UART_CS_HOST_INT_EN	BIT(13)</div><div class='add'>+#define AR933X_UART_CS_TX_BUSY		BIT(14)</div><div class='add'>+#define AR933X_UART_CS_RX_BUSY		BIT(15)</div><div class='add'>+</div><div class='add'>+#define AR933X_UART_CLOCK_STEP_M	0xffff</div><div class='add'>+#define AR933X_UART_CLOCK_SCALE_M	0xfff</div><div class='add'>+#define AR933X_UART_CLOCK_SCALE_S	16</div><div class='add'>+#define AR933X_UART_CLOCK_STEP_M	0xffff</div><div class='add'>+</div><div class='add'>+#define AR933X_UART_INT_RX_VALID	BIT(0)</div><div class='add'>+#define AR933X_UART_INT_TX_READY	BIT(1)</div><div class='add'>+#define AR933X_UART_INT_RX_FRAMING_ERR	BIT(2)</div><div class='add'>+#define AR933X_UART_INT_RX_OFLOW_ERR	BIT(3)</div><div class='add'>+#define AR933X_UART_INT_TX_OFLOW_ERR	BIT(4)</div><div class='add'>+#define AR933X_UART_INT_RX_PARITY_ERR	BIT(5)</div><div class='add'>+#define AR933X_UART_INT_RX_BREAK_ON	BIT(6)</div><div class='add'>+#define AR933X_UART_INT_RX_BREAK_OFF	BIT(7)</div><div class='add'>+#define AR933X_UART_INT_RX_FULL		BIT(8)</div><div class='add'>+#define AR933X_UART_INT_TX_EMPTY	BIT(9)</div><div class='add'>+#define AR933X_UART_INT_ALLINTS		0x3ff</div><div class='add'>+</div><div class='add'>+#endif /* __AR933X_UART_H */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h b/arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h<br/>new file mode 100644<br/>index 000000000000..6cb30f2b7198<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+/*</div><div class='add'>+ *  Platform data definition for Atheros AR933X UART</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2011 Gabor Juhos &lt;juhosg@openwrt.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 version 2 as published</div><div class='add'>+ *  by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _AR933X_UART_PLATFORM_H</div><div class='add'>+#define _AR933X_UART_PLATFORM_H</div><div class='add'>+</div><div class='add'>+struct ar933x_uart_platform_data {</div><div class='add'>+	unsigned	uartclk;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _AR933X_UART_PLATFORM_H */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-ath79/ath79.h b/arch/mips/include/asm/mach-ath79/ath79.h<br/>index 6a9f168506fe..6d0c6c9d5622 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-ath79/ath79.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-ath79/ath79.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-ath79/ath79.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-ath79/ath79.h</a></div><div class='hunk'>@@ -26,10 +26,13 @@ enum ath79_soc_type {</div><div class='ctx'> 	ATH79_SOC_AR7241,</div><div class='ctx'> 	ATH79_SOC_AR7242,</div><div class='ctx'> 	ATH79_SOC_AR9130,</div><div class='del'>-	ATH79_SOC_AR9132</div><div class='add'>+	ATH79_SOC_AR9132,</div><div class='add'>+	ATH79_SOC_AR9330,</div><div class='add'>+	ATH79_SOC_AR9331,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern enum ath79_soc_type ath79_soc;</div><div class='add'>+extern unsigned int ath79_soc_rev;</div><div class='ctx'> </div><div class='ctx'> static inline int soc_is_ar71xx(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -66,6 +69,12 @@ static inline int soc_is_ar913x(void)</div><div class='ctx'> 		ath79_soc == ATH79_SOC_AR9132);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int soc_is_ar933x(void)</div><div class='add'>+{</div><div class='add'>+	return (ath79_soc == ATH79_SOC_AR9330 ||</div><div class='add'>+		ath79_soc == ATH79_SOC_AR9331);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern void __iomem *ath79_ddr_base;</div><div class='ctx'> extern void __iomem *ath79_pll_base;</div><div class='ctx'> extern void __iomem *ath79_reset_base;</div><div class='head'>diff --git a/arch/mips/include/asm/mach-ath79/irq.h b/arch/mips/include/asm/mach-ath79/irq.h<br/>index 189bc6eb9c10..519958fe4e3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-ath79/irq.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-ath79/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-ath79/irq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-ath79/irq.h</a></div><div class='hunk'>@@ -10,10 +10,10 @@</div><div class='ctx'> #define __ASM_MACH_ATH79_IRQ_H</div><div class='ctx'> </div><div class='ctx'> #define MIPS_CPU_IRQ_BASE	0</div><div class='del'>-#define NR_IRQS			16</div><div class='add'>+#define NR_IRQS			40</div><div class='ctx'> </div><div class='ctx'> #define ATH79_MISC_IRQ_BASE	8</div><div class='del'>-#define ATH79_MISC_IRQ_COUNT	8</div><div class='add'>+#define ATH79_MISC_IRQ_COUNT	32</div><div class='ctx'> </div><div class='ctx'> #define ATH79_CPU_IRQ_IP2	(MIPS_CPU_IRQ_BASE + 2)</div><div class='ctx'> #define ATH79_CPU_IRQ_USB	(MIPS_CPU_IRQ_BASE + 3)</div><div class='hunk'>@@ -30,6 +30,10 @@</div><div class='ctx'> #define ATH79_MISC_IRQ_PERFC	(ATH79_MISC_IRQ_BASE + 5)</div><div class='ctx'> #define ATH79_MISC_IRQ_OHCI	(ATH79_MISC_IRQ_BASE + 6)</div><div class='ctx'> #define ATH79_MISC_IRQ_DMA	(ATH79_MISC_IRQ_BASE + 7)</div><div class='add'>+#define ATH79_MISC_IRQ_TIMER2	(ATH79_MISC_IRQ_BASE + 8)</div><div class='add'>+#define ATH79_MISC_IRQ_TIMER3	(ATH79_MISC_IRQ_BASE + 9)</div><div class='add'>+#define ATH79_MISC_IRQ_TIMER4	(ATH79_MISC_IRQ_BASE + 10)</div><div class='add'>+#define ATH79_MISC_IRQ_ETHSW	(ATH79_MISC_IRQ_BASE + 12)</div><div class='ctx'> </div><div class='ctx'> #include_next &lt;irq.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/include/asm/mach-ath79/pci-ath724x.h b/arch/mips/include/asm/mach-ath79/pci-ath724x.h<br/>new file mode 100644<br/>index 000000000000..454885fa30c3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-ath79/pci-ath724x.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-ath79/pci-ath724x.h</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+/*</div><div class='add'>+ *  Atheros 724x PCI support</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2011 René Bolldorf &lt;xsecute@googlemail.com&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 version 2 as published</div><div class='add'>+ *  by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ASM_MACH_ATH79_PCI_ATH724X_H</div><div class='add'>+#define __ASM_MACH_ATH79_PCI_ATH724X_H</div><div class='add'>+</div><div class='add'>+struct ath724x_pci_data {</div><div class='add'>+	int irq;</div><div class='add'>+	void *pdata;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath724x_pci_add_data(struct ath724x_pci_data *data, int size);</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_MACH_ATH79_PCI_ATH724X_H */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-au1x00/au1000.h b/arch/mips/include/asm/mach-au1x00/au1000.h<br/>index de24ec57dd2f..569828d3ccab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-au1x00/au1000.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-au1x00/au1000.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-au1x00/au1000.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-au1x00/au1000.h</a></div><div class='hunk'>@@ -136,6 +136,7 @@ static inline int au1xxx_cpu_needs_config_od(void)</div><div class='ctx'> #define ALCHEMY_CPU_AU1100	2</div><div class='ctx'> #define ALCHEMY_CPU_AU1550	3</div><div class='ctx'> #define ALCHEMY_CPU_AU1200	4</div><div class='add'>+#define ALCHEMY_CPU_AU1300	5</div><div class='ctx'> </div><div class='ctx'> static inline int alchemy_get_cputype(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -156,6 +157,9 @@ static inline int alchemy_get_cputype(void)</div><div class='ctx'> 	case 0x05030000:</div><div class='ctx'> 		return ALCHEMY_CPU_AU1200;</div><div class='ctx'> 		break;</div><div class='add'>+	case 0x800c0000:</div><div class='add'>+		return ALCHEMY_CPU_AU1300;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ALCHEMY_CPU_UNKNOWN;</div><div class='hunk'>@@ -166,6 +170,7 @@ static inline int alchemy_get_uarts(int type)</div><div class='ctx'> {</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case ALCHEMY_CPU_AU1000:</div><div class='add'>+	case ALCHEMY_CPU_AU1300:</div><div class='ctx'> 		return 4;</div><div class='ctx'> 	case ALCHEMY_CPU_AU1500:</div><div class='ctx'> 	case ALCHEMY_CPU_AU1200:</div><div class='hunk'>@@ -243,6 +248,7 @@ extern unsigned long au1xxx_calc_clock(void);</div><div class='ctx'> /* PM: arch/mips/alchemy/common/sleeper.S, power.c, irq.c */</div><div class='ctx'> void alchemy_sleep_au1000(void);</div><div class='ctx'> void alchemy_sleep_au1550(void);</div><div class='add'>+void alchemy_sleep_au1300(void);</div><div class='ctx'> void au_sleep(void);</div><div class='ctx'> </div><div class='ctx'> /* USB: drivers/usb/host/alchemy-common.c */</div><div class='hunk'>@@ -251,6 +257,7 @@ enum alchemy_usb_block {</div><div class='ctx'> 	ALCHEMY_USB_UDC0,</div><div class='ctx'> 	ALCHEMY_USB_EHCI0,</div><div class='ctx'> 	ALCHEMY_USB_OTG0,</div><div class='add'>+	ALCHEMY_USB_OHCI1,</div><div class='ctx'> };</div><div class='ctx'> int alchemy_usb_control(int block, int enable);</div><div class='ctx'> </div><div class='hunk'>@@ -263,14 +270,92 @@ struct alchemy_pci_platdata {</div><div class='ctx'> 	unsigned long pci_cfg_clr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* SOC Interrupt numbers */</div><div class='add'>+/* Multifunction pins: Each of these pins can either be assigned to the</div><div class='add'>+ * GPIO controller or a on-chip peripheral.</div><div class='add'>+ * Call "au1300_pinfunc_to_dev()" or "au1300_pinfunc_to_gpio()" to</div><div class='add'>+ * assign one of these to either the GPIO controller or the device.</div><div class='add'>+ */</div><div class='add'>+enum au1300_multifunc_pins {</div><div class='add'>+	/* wake-from-str pins 0-3 */</div><div class='add'>+	AU1300_PIN_WAKE0 = 0, AU1300_PIN_WAKE1, AU1300_PIN_WAKE2,</div><div class='add'>+	AU1300_PIN_WAKE3,</div><div class='add'>+	/* external clock sources for PSCs: 4-5 */</div><div class='add'>+	AU1300_PIN_EXTCLK0, AU1300_PIN_EXTCLK1,</div><div class='add'>+	/* 8bit MMC interface on SD0: 6-9 */</div><div class='add'>+	AU1300_PIN_SD0DAT4, AU1300_PIN_SD0DAT5, AU1300_PIN_SD0DAT6,</div><div class='add'>+	AU1300_PIN_SD0DAT7,</div><div class='add'>+	/* aux clk input for freqgen 3: 10 */</div><div class='add'>+	AU1300_PIN_FG3AUX,</div><div class='add'>+	/* UART1 pins: 11-18 */</div><div class='add'>+	AU1300_PIN_U1RI, AU1300_PIN_U1DCD, AU1300_PIN_U1DSR,</div><div class='add'>+	AU1300_PIN_U1CTS, AU1300_PIN_U1RTS, AU1300_PIN_U1DTR,</div><div class='add'>+	AU1300_PIN_U1RX, AU1300_PIN_U1TX,</div><div class='add'>+	/* UART0 pins: 19-24 */</div><div class='add'>+	AU1300_PIN_U0RI, AU1300_PIN_U0DCD, AU1300_PIN_U0DSR,</div><div class='add'>+	AU1300_PIN_U0CTS, AU1300_PIN_U0RTS, AU1300_PIN_U0DTR,</div><div class='add'>+	/* UART2: 25-26 */</div><div class='add'>+	AU1300_PIN_U2RX, AU1300_PIN_U2TX,</div><div class='add'>+	/* UART3: 27-28 */</div><div class='add'>+	AU1300_PIN_U3RX, AU1300_PIN_U3TX,</div><div class='add'>+	/* LCD controller PWMs, ext pixclock: 29-31 */</div><div class='add'>+	AU1300_PIN_LCDPWM0, AU1300_PIN_LCDPWM1, AU1300_PIN_LCDCLKIN,</div><div class='add'>+	/* SD1 interface: 32-37 */</div><div class='add'>+	AU1300_PIN_SD1DAT0, AU1300_PIN_SD1DAT1, AU1300_PIN_SD1DAT2,</div><div class='add'>+	AU1300_PIN_SD1DAT3, AU1300_PIN_SD1CMD, AU1300_PIN_SD1CLK,</div><div class='add'>+	/* SD2 interface: 38-43 */</div><div class='add'>+	AU1300_PIN_SD2DAT0, AU1300_PIN_SD2DAT1, AU1300_PIN_SD2DAT2,</div><div class='add'>+	AU1300_PIN_SD2DAT3, AU1300_PIN_SD2CMD, AU1300_PIN_SD2CLK,</div><div class='add'>+	/* PSC0/1 clocks: 44-45 */</div><div class='add'>+	AU1300_PIN_PSC0CLK, AU1300_PIN_PSC1CLK,</div><div class='add'>+	/* PSCs: 46-49/50-53/54-57/58-61 */</div><div class='add'>+	AU1300_PIN_PSC0SYNC0, AU1300_PIN_PSC0SYNC1, AU1300_PIN_PSC0D0,</div><div class='add'>+	AU1300_PIN_PSC0D1,</div><div class='add'>+	AU1300_PIN_PSC1SYNC0, AU1300_PIN_PSC1SYNC1, AU1300_PIN_PSC1D0,</div><div class='add'>+	AU1300_PIN_PSC1D1,</div><div class='add'>+	AU1300_PIN_PSC2SYNC0, AU1300_PIN_PSC2SYNC1, AU1300_PIN_PSC2D0,</div><div class='add'>+	AU1300_PIN_PSC2D1,</div><div class='add'>+	AU1300_PIN_PSC3SYNC0, AU1300_PIN_PSC3SYNC1, AU1300_PIN_PSC3D0,</div><div class='add'>+	AU1300_PIN_PSC3D1,</div><div class='add'>+	/* PCMCIA interface: 62-70 */</div><div class='add'>+	AU1300_PIN_PCE2, AU1300_PIN_PCE1, AU1300_PIN_PIOS16,</div><div class='add'>+	AU1300_PIN_PIOR, AU1300_PIN_PWE, AU1300_PIN_PWAIT,</div><div class='add'>+	AU1300_PIN_PREG, AU1300_PIN_POE, AU1300_PIN_PIOW,</div><div class='add'>+	/* camera interface H/V sync inputs: 71-72 */</div><div class='add'>+	AU1300_PIN_CIMLS, AU1300_PIN_CIMFS,</div><div class='add'>+	/* PSC2/3 clocks: 73-74 */</div><div class='add'>+	AU1300_PIN_PSC2CLK, AU1300_PIN_PSC3CLK,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* GPIC (Au1300) pin management: arch/mips/alchemy/common/gpioint.c */</div><div class='add'>+extern void au1300_pinfunc_to_gpio(enum au1300_multifunc_pins gpio);</div><div class='add'>+extern void au1300_pinfunc_to_dev(enum au1300_multifunc_pins gpio);</div><div class='add'>+extern void au1300_set_irq_priority(unsigned int irq, int p);</div><div class='add'>+extern void au1300_set_dbdma_gpio(int dchan, unsigned int gpio);</div><div class='add'>+</div><div class='add'>+/* Au1300 allows to disconnect certain blocks from internal power supply */</div><div class='add'>+enum au1300_vss_block {</div><div class='add'>+	AU1300_VSS_MPE = 0,</div><div class='add'>+	AU1300_VSS_BSA,</div><div class='add'>+	AU1300_VSS_GPE,</div><div class='add'>+	AU1300_VSS_MGP,</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+extern void au1300_vss_block_control(int block, int enable);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* SOC Interrupt numbers */</div><div class='add'>+/* Au1000-style (IC0/1): 2 controllers with 32 sources each */</div><div class='ctx'> #define AU1000_INTC0_INT_BASE	(MIPS_CPU_IRQ_BASE + 8)</div><div class='ctx'> #define AU1000_INTC0_INT_LAST	(AU1000_INTC0_INT_BASE + 31)</div><div class='ctx'> #define AU1000_INTC1_INT_BASE	(AU1000_INTC0_INT_LAST + 1)</div><div class='ctx'> #define AU1000_INTC1_INT_LAST	(AU1000_INTC1_INT_BASE + 31)</div><div class='ctx'> #define AU1000_MAX_INTR 	AU1000_INTC1_INT_LAST</div><div class='ctx'> </div><div class='add'>+/* Au1300-style (GPIC): 1 controller with up to 128 sources */</div><div class='add'>+#define ALCHEMY_GPIC_INT_BASE	(MIPS_CPU_IRQ_BASE + 8)</div><div class='add'>+#define ALCHEMY_GPIC_INT_NUM	128</div><div class='add'>+#define ALCHEMY_GPIC_INT_LAST	(ALCHEMY_GPIC_INT_BASE + ALCHEMY_GPIC_INT_NUM - 1)</div><div class='add'>+</div><div class='ctx'> enum soc_au1000_ints {</div><div class='ctx'> 	AU1000_FIRST_INT	= AU1000_INTC0_INT_BASE,</div><div class='ctx'> 	AU1000_UART0_INT	= AU1000_FIRST_INT,</div><div class='hunk'>@@ -591,24 +676,77 @@ enum soc_au1200_ints {</div><div class='ctx'> </div><div class='ctx'> #endif /* !defined (_LANGUAGE_ASSEMBLY) */</div><div class='ctx'> </div><div class='add'>+/* Au1300 peripheral interrupt numbers */</div><div class='add'>+#define AU1300_FIRST_INT	(ALCHEMY_GPIC_INT_BASE)</div><div class='add'>+#define AU1300_UART1_INT	(AU1300_FIRST_INT + 17)</div><div class='add'>+#define AU1300_UART2_INT	(AU1300_FIRST_INT + 25)</div><div class='add'>+#define AU1300_UART3_INT	(AU1300_FIRST_INT + 27)</div><div class='add'>+#define AU1300_SD1_INT		(AU1300_FIRST_INT + 32)</div><div class='add'>+#define AU1300_SD2_INT		(AU1300_FIRST_INT + 38)</div><div class='add'>+#define AU1300_PSC0_INT		(AU1300_FIRST_INT + 48)</div><div class='add'>+#define AU1300_PSC1_INT		(AU1300_FIRST_INT + 52)</div><div class='add'>+#define AU1300_PSC2_INT		(AU1300_FIRST_INT + 56)</div><div class='add'>+#define AU1300_PSC3_INT		(AU1300_FIRST_INT + 60)</div><div class='add'>+#define AU1300_NAND_INT		(AU1300_FIRST_INT + 62)</div><div class='add'>+#define AU1300_DDMA_INT		(AU1300_FIRST_INT + 75)</div><div class='add'>+#define AU1300_MMU_INT		(AU1300_FIRST_INT + 76)</div><div class='add'>+#define AU1300_MPU_INT		(AU1300_FIRST_INT + 77)</div><div class='add'>+#define AU1300_GPU_INT		(AU1300_FIRST_INT + 78)</div><div class='add'>+#define AU1300_UDMA_INT		(AU1300_FIRST_INT + 79)</div><div class='add'>+#define AU1300_TOY_INT		(AU1300_FIRST_INT + 80)</div><div class='add'>+#define AU1300_TOY_MATCH0_INT	(AU1300_FIRST_INT + 81)</div><div class='add'>+#define AU1300_TOY_MATCH1_INT	(AU1300_FIRST_INT + 82)</div><div class='add'>+#define AU1300_TOY_MATCH2_INT	(AU1300_FIRST_INT + 83)</div><div class='add'>+#define AU1300_RTC_INT		(AU1300_FIRST_INT + 84)</div><div class='add'>+#define AU1300_RTC_MATCH0_INT	(AU1300_FIRST_INT + 85)</div><div class='add'>+#define AU1300_RTC_MATCH1_INT	(AU1300_FIRST_INT + 86)</div><div class='add'>+#define AU1300_RTC_MATCH2_INT	(AU1300_FIRST_INT + 87)</div><div class='add'>+#define AU1300_UART0_INT	(AU1300_FIRST_INT + 88)</div><div class='add'>+#define AU1300_SD0_INT		(AU1300_FIRST_INT + 89)</div><div class='add'>+#define AU1300_USB_INT		(AU1300_FIRST_INT + 90)</div><div class='add'>+#define AU1300_LCD_INT		(AU1300_FIRST_INT + 91)</div><div class='add'>+#define AU1300_BSA_INT		(AU1300_FIRST_INT + 92)</div><div class='add'>+#define AU1300_MPE_INT		(AU1300_FIRST_INT + 93)</div><div class='add'>+#define AU1300_ITE_INT		(AU1300_FIRST_INT + 94)</div><div class='add'>+#define AU1300_AES_INT		(AU1300_FIRST_INT + 95)</div><div class='add'>+#define AU1300_CIM_INT		(AU1300_FIRST_INT + 96)</div><div class='add'>+</div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Physical base addresses for integrated peripherals</div><div class='del'>- * 0..au1000 1..au1500 2..au1100 3..au1550 4..au1200</div><div class='add'>+ * 0..au1000 1..au1500 2..au1100 3..au1550 4..au1200 5..au1300</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define AU1000_AC97_PHYS_ADDR		0x10000000 /* 012 */</div><div class='add'>+#define AU1300_ROM_PHYS_ADDR		0x10000000 /* 5 */</div><div class='add'>+#define AU1300_OTP_PHYS_ADDR		0x10002000 /* 5 */</div><div class='add'>+#define AU1300_VSS_PHYS_ADDR		0x10003000 /* 5 */</div><div class='add'>+#define AU1300_UART0_PHYS_ADDR		0x10100000 /* 5 */</div><div class='add'>+#define AU1300_UART1_PHYS_ADDR		0x10101000 /* 5 */</div><div class='add'>+#define AU1300_UART2_PHYS_ADDR		0x10102000 /* 5 */</div><div class='add'>+#define AU1300_UART3_PHYS_ADDR		0x10103000 /* 5 */</div><div class='ctx'> #define AU1000_USB_OHCI_PHYS_ADDR	0x10100000 /* 012 */</div><div class='ctx'> #define AU1000_USB_UDC_PHYS_ADDR	0x10200000 /* 0123 */</div><div class='add'>+#define AU1300_GPIC_PHYS_ADDR		0x10200000 /* 5 */</div><div class='ctx'> #define AU1000_IRDA_PHYS_ADDR		0x10300000 /* 02 */</div><div class='del'>-#define AU1200_AES_PHYS_ADDR		0x10300000 /* 4 */</div><div class='add'>+#define AU1200_AES_PHYS_ADDR		0x10300000 /* 45 */</div><div class='ctx'> #define AU1000_IC0_PHYS_ADDR		0x10400000 /* 01234 */</div><div class='add'>+#define AU1300_GPU_PHYS_ADDR		0x10500000 /* 5 */</div><div class='ctx'> #define AU1000_MAC0_PHYS_ADDR		0x10500000 /* 023 */</div><div class='ctx'> #define AU1000_MAC1_PHYS_ADDR		0x10510000 /* 023 */</div><div class='ctx'> #define AU1000_MACEN_PHYS_ADDR		0x10520000 /* 023 */</div><div class='del'>-#define AU1100_SD0_PHYS_ADDR		0x10600000 /* 24 */</div><div class='add'>+#define AU1100_SD0_PHYS_ADDR		0x10600000 /* 245 */</div><div class='add'>+#define AU1300_SD1_PHYS_ADDR		0x10601000 /* 5 */</div><div class='add'>+#define AU1300_SD2_PHYS_ADDR		0x10602000 /* 5 */</div><div class='ctx'> #define AU1100_SD1_PHYS_ADDR		0x10680000 /* 24 */</div><div class='add'>+#define AU1300_SYS_PHYS_ADDR		0x10900000 /* 5 */</div><div class='ctx'> #define AU1550_PSC2_PHYS_ADDR		0x10A00000 /* 3 */</div><div class='ctx'> #define AU1550_PSC3_PHYS_ADDR		0x10B00000 /* 3 */</div><div class='add'>+#define AU1300_PSC0_PHYS_ADDR		0x10A00000 /* 5 */</div><div class='add'>+#define AU1300_PSC1_PHYS_ADDR		0x10A01000 /* 5 */</div><div class='add'>+#define AU1300_PSC2_PHYS_ADDR		0x10A02000 /* 5 */</div><div class='add'>+#define AU1300_PSC3_PHYS_ADDR		0x10A03000 /* 5 */</div><div class='ctx'> #define AU1000_I2S_PHYS_ADDR		0x11000000 /* 02 */</div><div class='ctx'> #define AU1500_MAC0_PHYS_ADDR		0x11500000 /* 1 */</div><div class='ctx'> #define AU1500_MAC1_PHYS_ADDR		0x11510000 /* 1 */</div><div class='hunk'>@@ -622,37 +760,96 @@ enum soc_au1200_ints {</div><div class='ctx'> #define AU1000_SSI1_PHYS_ADDR		0x11680000 /* 02 */</div><div class='ctx'> #define AU1500_GPIO2_PHYS_ADDR		0x11700000 /* 1234 */</div><div class='ctx'> #define AU1000_IC1_PHYS_ADDR		0x11800000 /* 01234 */</div><div class='del'>-#define AU1000_SYS_PHYS_ADDR		0x11900000 /* 01234 */</div><div class='add'>+#define AU1000_SYS_PHYS_ADDR		0x11900000 /* 012345 */</div><div class='ctx'> #define AU1550_PSC0_PHYS_ADDR		0x11A00000 /* 34 */</div><div class='ctx'> #define AU1550_PSC1_PHYS_ADDR		0x11B00000 /* 34 */</div><div class='ctx'> #define AU1000_MEM_PHYS_ADDR		0x14000000 /* 01234 */</div><div class='ctx'> #define AU1000_STATIC_MEM_PHYS_ADDR	0x14001000 /* 01234 */</div><div class='add'>+#define AU1300_UDMA_PHYS_ADDR		0x14001800 /* 5 */</div><div class='ctx'> #define AU1000_DMA_PHYS_ADDR		0x14002000 /* 012 */</div><div class='del'>-#define AU1550_DBDMA_PHYS_ADDR		0x14002000 /* 34 */</div><div class='del'>-#define AU1550_DBDMA_CONF_PHYS_ADDR	0x14003000 /* 34 */</div><div class='add'>+#define AU1550_DBDMA_PHYS_ADDR		0x14002000 /* 345 */</div><div class='add'>+#define AU1550_DBDMA_CONF_PHYS_ADDR	0x14003000 /* 345 */</div><div class='ctx'> #define AU1000_MACDMA0_PHYS_ADDR	0x14004000 /* 0123 */</div><div class='ctx'> #define AU1000_MACDMA1_PHYS_ADDR	0x14004200 /* 0123 */</div><div class='del'>-#define AU1200_CIM_PHYS_ADDR		0x14004000 /* 4 */</div><div class='add'>+#define AU1200_CIM_PHYS_ADDR		0x14004000 /* 45 */</div><div class='ctx'> #define AU1500_PCI_PHYS_ADDR		0x14005000 /* 13 */</div><div class='ctx'> #define AU1550_PE_PHYS_ADDR		0x14008000 /* 3 */</div><div class='ctx'> #define AU1200_MAEBE_PHYS_ADDR		0x14010000 /* 4 */</div><div class='ctx'> #define AU1200_MAEFE_PHYS_ADDR		0x14012000 /* 4 */</div><div class='add'>+#define AU1300_MAEITE_PHYS_ADDR		0x14010000 /* 5 */</div><div class='add'>+#define AU1300_MAEMPE_PHYS_ADDR		0x14014000 /* 5 */</div><div class='ctx'> #define AU1550_USB_OHCI_PHYS_ADDR	0x14020000 /* 3 */</div><div class='ctx'> #define AU1200_USB_CTL_PHYS_ADDR	0x14020000 /* 4 */</div><div class='ctx'> #define AU1200_USB_OTG_PHYS_ADDR	0x14020020 /* 4 */</div><div class='ctx'> #define AU1200_USB_OHCI_PHYS_ADDR	0x14020100 /* 4 */</div><div class='ctx'> #define AU1200_USB_EHCI_PHYS_ADDR	0x14020200 /* 4 */</div><div class='ctx'> #define AU1200_USB_UDC_PHYS_ADDR	0x14022000 /* 4 */</div><div class='add'>+#define AU1300_USB_EHCI_PHYS_ADDR	0x14020000 /* 5 */</div><div class='add'>+#define AU1300_USB_OHCI0_PHYS_ADDR	0x14020400 /* 5 */</div><div class='add'>+#define AU1300_USB_OHCI1_PHYS_ADDR	0x14020800 /* 5 */</div><div class='add'>+#define AU1300_USB_CTL_PHYS_ADDR	0x14021000 /* 5 */</div><div class='add'>+#define AU1300_USB_OTG_PHYS_ADDR	0x14022000 /* 5 */</div><div class='add'>+#define AU1300_MAEBSA_PHYS_ADDR		0x14030000 /* 5 */</div><div class='ctx'> #define AU1100_LCD_PHYS_ADDR		0x15000000 /* 2 */</div><div class='del'>-#define AU1200_LCD_PHYS_ADDR		0x15000000 /* 4 */</div><div class='add'>+#define AU1200_LCD_PHYS_ADDR		0x15000000 /* 45 */</div><div class='ctx'> #define AU1500_PCI_MEM_PHYS_ADDR	0x400000000ULL /* 13 */</div><div class='ctx'> #define AU1500_PCI_IO_PHYS_ADDR		0x500000000ULL /* 13 */</div><div class='ctx'> #define AU1500_PCI_CONFIG0_PHYS_ADDR	0x600000000ULL /* 13 */</div><div class='ctx'> #define AU1500_PCI_CONFIG1_PHYS_ADDR	0x680000000ULL /* 13 */</div><div class='del'>-#define AU1000_PCMCIA_IO_PHYS_ADDR	0xF00000000ULL /* 01234 */</div><div class='del'>-#define AU1000_PCMCIA_ATTR_PHYS_ADDR	0xF40000000ULL /* 01234 */</div><div class='del'>-#define AU1000_PCMCIA_MEM_PHYS_ADDR	0xF80000000ULL /* 01234 */</div><div class='add'>+#define AU1000_PCMCIA_IO_PHYS_ADDR	0xF00000000ULL /* 012345 */</div><div class='add'>+#define AU1000_PCMCIA_ATTR_PHYS_ADDR	0xF40000000ULL /* 012345 */</div><div class='add'>+#define AU1000_PCMCIA_MEM_PHYS_ADDR	0xF80000000ULL /* 012345 */</div><div class='ctx'> </div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Au1300 GPIO+INT controller (GPIC) register offsets and bits</div><div class='add'>+ * Registers are 128bits (0x10 bytes), divided into 4 "banks".</div><div class='add'>+ */</div><div class='add'>+#define AU1300_GPIC_PINVAL	0x0000</div><div class='add'>+#define AU1300_GPIC_PINVALCLR	0x0010</div><div class='add'>+#define AU1300_GPIC_IPEND	0x0020</div><div class='add'>+#define AU1300_GPIC_PRIENC	0x0030</div><div class='add'>+#define AU1300_GPIC_IEN		0x0040	/* int_mask in manual */</div><div class='add'>+#define AU1300_GPIC_IDIS	0x0050	/* int_maskclr in manual */</div><div class='add'>+#define AU1300_GPIC_DMASEL	0x0060</div><div class='add'>+#define AU1300_GPIC_DEVSEL	0x0080</div><div class='add'>+#define AU1300_GPIC_DEVCLR	0x0090</div><div class='add'>+#define AU1300_GPIC_RSTVAL	0x00a0</div><div class='add'>+/* pin configuration space. one 32bit register for up to 128 IRQs */</div><div class='add'>+#define AU1300_GPIC_PINCFG	0x1000</div><div class='add'>+</div><div class='add'>+#define GPIC_GPIO_TO_BIT(gpio)	\</div><div class='add'>+	(1 &lt;&lt; ((gpio) &amp; 0x1f))</div><div class='add'>+</div><div class='add'>+#define GPIC_GPIO_BANKOFF(gpio)	\</div><div class='add'>+	(((gpio) &gt;&gt; 5) * 4)</div><div class='add'>+</div><div class='add'>+/* Pin Control bits: who owns the pin, what does it do */</div><div class='add'>+#define GPIC_CFG_PC_GPIN		0</div><div class='add'>+#define GPIC_CFG_PC_DEV			1</div><div class='add'>+#define GPIC_CFG_PC_GPOLOW		2</div><div class='add'>+#define GPIC_CFG_PC_GPOHIGH		3</div><div class='add'>+#define GPIC_CFG_PC_MASK		3</div><div class='add'>+</div><div class='add'>+/* assign pin to MIPS IRQ line */</div><div class='add'>+#define GPIC_CFG_IL_SET(x)	(((x) &amp; 3) &lt;&lt; 2)</div><div class='add'>+#define GPIC_CFG_IL_MASK	(3 &lt;&lt; 2)</div><div class='add'>+</div><div class='add'>+/* pin interrupt type setup */</div><div class='add'>+#define GPIC_CFG_IC_OFF		(0 &lt;&lt; 4)</div><div class='add'>+#define GPIC_CFG_IC_LEVEL_LOW	(1 &lt;&lt; 4)</div><div class='add'>+#define GPIC_CFG_IC_LEVEL_HIGH	(2 &lt;&lt; 4)</div><div class='add'>+#define GPIC_CFG_IC_EDGE_FALL	(5 &lt;&lt; 4)</div><div class='add'>+#define GPIC_CFG_IC_EDGE_RISE	(6 &lt;&lt; 4)</div><div class='add'>+#define GPIC_CFG_IC_EDGE_BOTH	(7 &lt;&lt; 4)</div><div class='add'>+#define GPIC_CFG_IC_MASK	(7 &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+/* allow interrupt to wake cpu from 'wait' */</div><div class='add'>+#define GPIC_CFG_IDLEWAKE	(1 &lt;&lt; 7)</div><div class='add'>+</div><div class='add'>+/***********************************************************************/</div><div class='ctx'> </div><div class='ctx'> /* Au1000 SDRAM memory controller register offsets */</div><div class='ctx'> #define AU1000_MEM_SDMODE0		0x0000</div><div class='hunk'>@@ -1068,44 +1265,20 @@ enum soc_au1200_ints {</div><div class='ctx'> #define SSI_ENABLE_CD		(1 &lt;&lt; 1)</div><div class='ctx'> #define SSI_ENABLE_E		(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='del'>-/* IrDA Controller */</div><div class='del'>-#define IRDA_BASE		0xB0300000</div><div class='del'>-#define IR_RING_PTR_STATUS	(IRDA_BASE + 0x00)</div><div class='del'>-#define IR_RING_BASE_ADDR_H	(IRDA_BASE + 0x04)</div><div class='del'>-#define IR_RING_BASE_ADDR_L	(IRDA_BASE + 0x08)</div><div class='del'>-#define IR_RING_SIZE		(IRDA_BASE + 0x0C)</div><div class='del'>-#define IR_RING_PROMPT		(IRDA_BASE + 0x10)</div><div class='del'>-#define IR_RING_ADDR_CMPR	(IRDA_BASE + 0x14)</div><div class='del'>-#define IR_INT_CLEAR		(IRDA_BASE + 0x18)</div><div class='del'>-#define IR_CONFIG_1		(IRDA_BASE + 0x20)</div><div class='del'>-#  define IR_RX_INVERT_LED	(1 &lt;&lt; 0)</div><div class='del'>-#  define IR_TX_INVERT_LED	(1 &lt;&lt; 1)</div><div class='del'>-#  define IR_ST 		(1 &lt;&lt; 2)</div><div class='del'>-#  define IR_SF 		(1 &lt;&lt; 3)</div><div class='del'>-#  define IR_SIR		(1 &lt;&lt; 4)</div><div class='del'>-#  define IR_MIR		(1 &lt;&lt; 5)</div><div class='del'>-#  define IR_FIR		(1 &lt;&lt; 6)</div><div class='del'>-#  define IR_16CRC		(1 &lt;&lt; 7)</div><div class='del'>-#  define IR_TD 		(1 &lt;&lt; 8)</div><div class='del'>-#  define IR_RX_ALL		(1 &lt;&lt; 9)</div><div class='del'>-#  define IR_DMA_ENABLE 	(1 &lt;&lt; 10)</div><div class='del'>-#  define IR_RX_ENABLE		(1 &lt;&lt; 11)</div><div class='del'>-#  define IR_TX_ENABLE		(1 &lt;&lt; 12)</div><div class='del'>-#  define IR_LOOPBACK		(1 &lt;&lt; 14)</div><div class='del'>-#  define IR_SIR_MODE		(IR_SIR | IR_DMA_ENABLE | \</div><div class='del'>-				 IR_RX_ALL | IR_RX_ENABLE | IR_SF | IR_16CRC)</div><div class='del'>-#define IR_SIR_FLAGS		(IRDA_BASE + 0x24)</div><div class='del'>-#define IR_ENABLE		(IRDA_BASE + 0x28)</div><div class='del'>-#  define IR_RX_STATUS		(1 &lt;&lt; 9)</div><div class='del'>-#  define IR_TX_STATUS		(1 &lt;&lt; 10)</div><div class='del'>-#define IR_READ_PHY_CONFIG	(IRDA_BASE + 0x2C)</div><div class='del'>-#define IR_WRITE_PHY_CONFIG	(IRDA_BASE + 0x30)</div><div class='del'>-#define IR_MAX_PKT_LEN		(IRDA_BASE + 0x34)</div><div class='del'>-#define IR_RX_BYTE_CNT		(IRDA_BASE + 0x38)</div><div class='del'>-#define IR_CONFIG_2		(IRDA_BASE + 0x3C)</div><div class='del'>-#  define IR_MODE_INV		(1 &lt;&lt; 0)</div><div class='del'>-#  define IR_ONE_PIN		(1 &lt;&lt; 1)</div><div class='del'>-#define IR_INTERFACE_CONFIG	(IRDA_BASE + 0x40)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The IrDA peripheral has an IRFIRSEL pin, but on the DB/PB boards it's not</div><div class='add'>+ * used to select FIR/SIR mode on the transceiver but as a GPIO.  Instead a</div><div class='add'>+ * CPLD has to be told about the mode.</div><div class='add'>+ */</div><div class='add'>+#define AU1000_IRDA_PHY_MODE_OFF	0</div><div class='add'>+#define AU1000_IRDA_PHY_MODE_SIR	1</div><div class='add'>+#define AU1000_IRDA_PHY_MODE_FIR	2</div><div class='add'>+</div><div class='add'>+struct au1k_irda_platform_data {</div><div class='add'>+	void(*set_phy_mode)(int mode);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* GPIO */</div><div class='ctx'> #define SYS_PINFUNC		0xB190002C</div><div class='head'>diff --git a/arch/mips/include/asm/mach-au1x00/au1100_mmc.h b/arch/mips/include/asm/mach-au1x00/au1100_mmc.h<br/>index 94000a3b6f0b..e221659f1bca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-au1x00/au1100_mmc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-au1x00/au1100_mmc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-au1x00/au1100_mmc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-au1x00/au1100_mmc.h</a></div><div class='hunk'>@@ -130,8 +130,10 @@ struct au1xmmc_platform_data {</div><div class='ctx'> #define SD_CONFIG2_DF	(0x00000008)</div><div class='ctx'> #define SD_CONFIG2_DC	(0x00000010)</div><div class='ctx'> #define SD_CONFIG2_xx2	(0x000000e0)</div><div class='add'>+#define SD_CONFIG2_BB	(0x00000080)</div><div class='ctx'> #define SD_CONFIG2_WB	(0x00000100)</div><div class='ctx'> #define SD_CONFIG2_RW	(0x00000200)</div><div class='add'>+#define SD_CONFIG2_DP	(0x00000400)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/mips/include/asm/mach-au1x00/au1200fb.h b/arch/mips/include/asm/mach-au1x00/au1200fb.h<br/>new file mode 100644<br/>index 000000000000..b3c87cc64bb9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-au1x00/au1200fb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-au1x00/au1200fb.h</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+/*</div><div class='add'>+ * platform data for au1200fb driver.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _AU1200FB_PLAT_H_</div><div class='add'>+#define _AU1200FB_PLAT_H_</div><div class='add'>+</div><div class='add'>+struct au1200fb_platdata {</div><div class='add'>+	int (*panel_index)(void);</div><div class='add'>+	int (*panel_init)(void);</div><div class='add'>+	int (*panel_shutdown)(void);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/mips/include/asm/mach-au1x00/au1550nd.h b/arch/mips/include/asm/mach-au1x00/au1550nd.h<br/>new file mode 100644<br/>index 000000000000..ad4c0a03afef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-au1x00/au1550nd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-au1x00/au1550nd.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+/*</div><div class='add'>+ * platform data for the Au1550 NAND driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _AU1550ND_H_</div><div class='add'>+#define _AU1550ND_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+</div><div class='add'>+struct au1550nd_platdata {</div><div class='add'>+	struct mtd_partition *parts;</div><div class='add'>+	int num_parts;</div><div class='add'>+	int devwidth;	/* 0 = 8bit device, 1 = 16bit device */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h b/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h<br/>index 323ce2d145f2..217810e18361 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h</a></div><div class='hunk'>@@ -183,6 +183,37 @@ typedef volatile struct au1xxx_ddma_desc {</div><div class='ctx'> #define AU1200_DSCR_CMD0_PSC1_SYNC	25</div><div class='ctx'> #define AU1200_DSCR_CMD0_CIM_SYNC	26</div><div class='ctx'> </div><div class='add'>+#define AU1300_DSCR_CMD0_UART0_TX      0</div><div class='add'>+#define AU1300_DSCR_CMD0_UART0_RX      1</div><div class='add'>+#define AU1300_DSCR_CMD0_UART1_TX      2</div><div class='add'>+#define AU1300_DSCR_CMD0_UART1_RX      3</div><div class='add'>+#define AU1300_DSCR_CMD0_UART2_TX      4</div><div class='add'>+#define AU1300_DSCR_CMD0_UART2_RX      5</div><div class='add'>+#define AU1300_DSCR_CMD0_UART3_TX      6</div><div class='add'>+#define AU1300_DSCR_CMD0_UART3_RX      7</div><div class='add'>+#define AU1300_DSCR_CMD0_SDMS_TX0      8</div><div class='add'>+#define AU1300_DSCR_CMD0_SDMS_RX0      9</div><div class='add'>+#define AU1300_DSCR_CMD0_SDMS_TX1      10</div><div class='add'>+#define AU1300_DSCR_CMD0_SDMS_RX1      11</div><div class='add'>+#define AU1300_DSCR_CMD0_AES_TX        12</div><div class='add'>+#define AU1300_DSCR_CMD0_AES_RX        13</div><div class='add'>+#define AU1300_DSCR_CMD0_PSC0_TX       14</div><div class='add'>+#define AU1300_DSCR_CMD0_PSC0_RX       15</div><div class='add'>+#define AU1300_DSCR_CMD0_PSC1_TX       16</div><div class='add'>+#define AU1300_DSCR_CMD0_PSC1_RX       17</div><div class='add'>+#define AU1300_DSCR_CMD0_PSC2_TX       18</div><div class='add'>+#define AU1300_DSCR_CMD0_PSC2_RX       19</div><div class='add'>+#define AU1300_DSCR_CMD0_PSC3_TX       20</div><div class='add'>+#define AU1300_DSCR_CMD0_PSC3_RX       21</div><div class='add'>+#define AU1300_DSCR_CMD0_LCD           22</div><div class='add'>+#define AU1300_DSCR_CMD0_NAND_FLASH    23</div><div class='add'>+#define AU1300_DSCR_CMD0_SDMS_TX2      24</div><div class='add'>+#define AU1300_DSCR_CMD0_SDMS_RX2      25</div><div class='add'>+#define AU1300_DSCR_CMD0_CIM_SYNC      26</div><div class='add'>+#define AU1300_DSCR_CMD0_UDMA          27</div><div class='add'>+#define AU1300_DSCR_CMD0_DMA_REQ0      28</div><div class='add'>+#define AU1300_DSCR_CMD0_DMA_REQ1      29</div><div class='add'>+</div><div class='ctx'> #define DSCR_CMD0_THROTTLE	30</div><div class='ctx'> #define DSCR_CMD0_ALWAYS	31</div><div class='ctx'> #define DSCR_NDEV_IDS		32</div><div class='head'>diff --git a/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h b/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h<br/>index d5df0cab9b87..3f741af37d47 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h</a></div><div class='hunk'>@@ -13,12 +13,14 @@</div><div class='ctx'> #define cpu_has_4k_cache		1</div><div class='ctx'> #define cpu_has_tx39_cache		0</div><div class='ctx'> #define cpu_has_fpu			0</div><div class='add'>+#define cpu_has_32fpr			0</div><div class='ctx'> #define cpu_has_counter			1</div><div class='ctx'> #define cpu_has_watch			1</div><div class='ctx'> #define cpu_has_divec			1</div><div class='ctx'> #define cpu_has_vce			0</div><div class='ctx'> #define cpu_has_cache_cdex_p		0</div><div class='ctx'> #define cpu_has_cache_cdex_s		0</div><div class='add'>+#define cpu_has_prefetch		1</div><div class='ctx'> #define cpu_has_mcheck			1</div><div class='ctx'> #define cpu_has_ejtag			1</div><div class='ctx'> #define cpu_has_llsc			1</div><div class='hunk'>@@ -29,6 +31,7 @@</div><div class='ctx'> #define cpu_has_vtag_icache		0</div><div class='ctx'> #define cpu_has_dc_aliases		0</div><div class='ctx'> #define cpu_has_ic_fills_f_dc		1</div><div class='add'>+#define cpu_has_pindexed_dcache		0</div><div class='ctx'> #define cpu_has_mips32r1		1</div><div class='ctx'> #define cpu_has_mips32r2		0</div><div class='ctx'> #define cpu_has_mips64r1		0</div><div class='head'>diff --git a/arch/mips/include/asm/mach-au1x00/gpio-au1300.h b/arch/mips/include/asm/mach-au1x00/gpio-au1300.h<br/>new file mode 100644<br/>index 000000000000..556e1be20bf6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-au1x00/gpio-au1300.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-au1x00/gpio-au1300.h</a></div><div class='hunk'>@@ -0,0 +1,241 @@</div><div class='add'>+/*</div><div class='add'>+ * gpio-au1300.h -- GPIO control for Au1300 GPIC and compatibles.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2009-2011 Manuel Lauss &lt;manuel.lauss@googlemail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _GPIO_AU1300_H_</div><div class='add'>+#define _GPIO_AU1300_H_</div><div class='add'>+</div><div class='add'>+#include &lt;asm/addrspace.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='add'>+</div><div class='add'>+/* with the current GPIC design, up to 128 GPIOs are possible.</div><div class='add'>+ * The only implementation so far is in the Au1300, which has 75 externally</div><div class='add'>+ * available GPIOs.</div><div class='add'>+ */</div><div class='add'>+#define AU1300_GPIO_BASE	0</div><div class='add'>+#define AU1300_GPIO_NUM		75</div><div class='add'>+#define AU1300_GPIO_MAX		(AU1300_GPIO_BASE + AU1300_GPIO_NUM - 1)</div><div class='add'>+</div><div class='add'>+#define AU1300_GPIC_ADDR	\</div><div class='add'>+	(void __iomem *)KSEG1ADDR(AU1300_GPIC_PHYS_ADDR)</div><div class='add'>+</div><div class='add'>+static inline int au1300_gpio_get_value(unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	void __iomem *roff = AU1300_GPIC_ADDR;</div><div class='add'>+	int bit;</div><div class='add'>+</div><div class='add'>+	gpio -= AU1300_GPIO_BASE;</div><div class='add'>+	roff += GPIC_GPIO_BANKOFF(gpio);</div><div class='add'>+	bit = GPIC_GPIO_TO_BIT(gpio);</div><div class='add'>+	return __raw_readl(roff + AU1300_GPIC_PINVAL) &amp; bit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int au1300_gpio_direction_input(unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	void __iomem *roff = AU1300_GPIC_ADDR;</div><div class='add'>+	unsigned long bit;</div><div class='add'>+</div><div class='add'>+	gpio -= AU1300_GPIO_BASE;</div><div class='add'>+</div><div class='add'>+	roff += GPIC_GPIO_BANKOFF(gpio);</div><div class='add'>+	bit = GPIC_GPIO_TO_BIT(gpio);</div><div class='add'>+	__raw_writel(bit, roff + AU1300_GPIC_DEVCLR);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int au1300_gpio_set_value(unsigned int gpio, int v)</div><div class='add'>+{</div><div class='add'>+	void __iomem *roff = AU1300_GPIC_ADDR;</div><div class='add'>+	unsigned long bit;</div><div class='add'>+</div><div class='add'>+	gpio -= AU1300_GPIO_BASE;</div><div class='add'>+</div><div class='add'>+	roff += GPIC_GPIO_BANKOFF(gpio);</div><div class='add'>+	bit = GPIC_GPIO_TO_BIT(gpio);</div><div class='add'>+	__raw_writel(bit, roff + (v ? AU1300_GPIC_PINVAL</div><div class='add'>+				    : AU1300_GPIC_PINVALCLR));</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int au1300_gpio_direction_output(unsigned int gpio, int v)</div><div class='add'>+{</div><div class='add'>+	/* hw switches to output automatically */</div><div class='add'>+	return au1300_gpio_set_value(gpio, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int au1300_gpio_to_irq(unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	return AU1300_FIRST_INT + (gpio - AU1300_GPIO_BASE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int au1300_irq_to_gpio(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	return (irq - AU1300_FIRST_INT) + AU1300_GPIO_BASE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int au1300_gpio_is_valid(unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (alchemy_get_cputype()) {</div><div class='add'>+	case ALCHEMY_CPU_AU1300:</div><div class='add'>+		ret = ((gpio &gt;= AU1300_GPIO_BASE) &amp;&amp; (gpio &lt;= AU1300_GPIO_MAX));</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int au1300_gpio_cansleep(unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* hardware remembers gpio 0-63 levels on powerup */</div><div class='add'>+static inline int au1300_gpio_getinitlvl(unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	void __iomem *roff = AU1300_GPIC_ADDR;</div><div class='add'>+	unsigned long v;</div><div class='add'>+</div><div class='add'>+	if (unlikely(gpio &gt; 63))</div><div class='add'>+		return 0;</div><div class='add'>+	else if (gpio &gt; 31) {</div><div class='add'>+		gpio -= 32;</div><div class='add'>+		roff += 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	v = __raw_readl(roff + AU1300_GPIC_RSTVAL);</div><div class='add'>+	return (v &gt;&gt; gpio) &amp; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**********************************************************************/</div><div class='add'>+</div><div class='add'>+/* Linux gpio framework integration.</div><div class='add'>+*</div><div class='add'>+* 4 use cases of Alchemy GPIOS:</div><div class='add'>+*(1) GPIOLIB=y, ALCHEMY_GPIO_INDIRECT=y:</div><div class='add'>+*	Board must register gpiochips.</div><div class='add'>+*(2) GPIOLIB=y, ALCHEMY_GPIO_INDIRECT=n:</div><div class='add'>+*	A gpiochip for the 75 GPIOs is registered.</div><div class='add'>+*</div><div class='add'>+*(3) GPIOLIB=n, ALCHEMY_GPIO_INDIRECT=y:</div><div class='add'>+*	the boards' gpio.h must provide	the linux gpio wrapper functions,</div><div class='add'>+*</div><div class='add'>+*(4) GPIOLIB=n, ALCHEMY_GPIO_INDIRECT=n:</div><div class='add'>+*	inlinable gpio functions are provided which enable access to the</div><div class='add'>+*	Au1300 gpios only by using the numbers straight out of the data-</div><div class='add'>+*	sheets.</div><div class='add'>+</div><div class='add'>+* Cases 1 and 3 are intended for boards which want to provide their own</div><div class='add'>+* GPIO namespace and -operations (i.e. for example you have 8 GPIOs</div><div class='add'>+* which are in part provided by spare Au1300 GPIO pins and in part by</div><div class='add'>+* an external FPGA but you still want them to be accssible in linux</div><div class='add'>+* as gpio0-7. The board can of course use the alchemy_gpioX_* functions</div><div class='add'>+* as required).</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_GPIOLIB</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ALCHEMY_GPIOINT_AU1300</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_ALCHEMY_GPIO_INDIRECT	/* case (4) */</div><div class='add'>+</div><div class='add'>+static inline int gpio_direction_input(unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	return au1300_gpio_direction_input(gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gpio_direction_output(unsigned int gpio, int v)</div><div class='add'>+{</div><div class='add'>+	return au1300_gpio_direction_output(gpio, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gpio_get_value(unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	return au1300_gpio_get_value(gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gpio_set_value(unsigned int gpio, int v)</div><div class='add'>+{</div><div class='add'>+	au1300_gpio_set_value(gpio, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gpio_get_value_cansleep(unsigned gpio)</div><div class='add'>+{</div><div class='add'>+	return gpio_get_value(gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gpio_set_value_cansleep(unsigned gpio, int value)</div><div class='add'>+{</div><div class='add'>+	gpio_set_value(gpio, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gpio_is_valid(unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	return au1300_gpio_is_valid(gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gpio_cansleep(unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	return au1300_gpio_cansleep(gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gpio_to_irq(unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+	return au1300_gpio_to_irq(gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int irq_to_gpio(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	return au1300_irq_to_gpio(irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gpio_request(unsigned int gpio, const char *label)</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 gpio_free(unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gpio_set_debounce(unsigned gpio, unsigned debounce)</div><div class='add'>+{</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gpio_unexport(unsigned gpio)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gpio_export(unsigned gpio, bool direction_may_change)</div><div class='add'>+{</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gpio_sysfs_set_active_low(unsigned gpio, int value)</div><div class='add'>+{</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gpio_export_link(struct device *dev, const char *name,</div><div class='add'>+				   unsigned gpio)</div><div class='add'>+{</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif	/* !CONFIG_ALCHEMY_GPIO_INDIRECT */</div><div class='add'>+</div><div class='add'>+#endif	/* CONFIG_ALCHEMY_GPIOINT_AU1300 */</div><div class='add'>+</div><div class='add'>+#endif	/* CONFIG GPIOLIB */</div><div class='add'>+</div><div class='add'>+#endif /* _GPIO_AU1300_H_ */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-au1x00/gpio.h b/arch/mips/include/asm/mach-au1x00/gpio.h<br/>index fcdc8c4809db..22e7ff17fc48 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-au1x00/gpio.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-au1x00/gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-au1x00/gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-au1x00/gpio.h</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/gpio-au1000.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/gpio-au1300.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* On Au1000, Au1500 and Au1100 GPIOs won't work as inputs before</div><div class='ctx'>  * SYS_PININPUTEN is written to at least once.  On Au1550/Au1200/Au1300 this</div><div class='hunk'>@@ -58,6 +59,8 @@ static inline int __au_irq_to_gpio(unsigned int irq)</div><div class='ctx'> 	switch (alchemy_get_cputype()) {</div><div class='ctx'> 	case ALCHEMY_CPU_AU1000...ALCHEMY_CPU_AU1200:</div><div class='ctx'> 		return alchemy_irq_to_gpio(irq);</div><div class='add'>+	case ALCHEMY_CPU_AU1300:</div><div class='add'>+		return au1300_irq_to_gpio(irq);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h<br/>index 96a2391ad85b..5b8d15bb5fe8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #define BCM6345_CPU_ID		0x6345</div><div class='ctx'> #define BCM6348_CPU_ID		0x6348</div><div class='ctx'> #define BCM6358_CPU_ID		0x6358</div><div class='add'>+#define BCM6368_CPU_ID		0x6368</div><div class='ctx'> </div><div class='ctx'> void __init bcm63xx_cpu_init(void);</div><div class='ctx'> u16 __bcm63xx_get_cpu_id(void);</div><div class='hunk'>@@ -71,6 +72,19 @@ unsigned int bcm63xx_get_cpu_freq(void);</div><div class='ctx'> # define BCMCPU_IS_6358()	(0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_BCM63XX_CPU_6368</div><div class='add'>+# ifdef bcm63xx_get_cpu_id</div><div class='add'>+#  undef bcm63xx_get_cpu_id</div><div class='add'>+#  define bcm63xx_get_cpu_id()	__bcm63xx_get_cpu_id()</div><div class='add'>+#  define BCMCPU_RUNTIME_DETECT</div><div class='add'>+# else</div><div class='add'>+#  define bcm63xx_get_cpu_id()	BCM6368_CPU_ID</div><div class='add'>+# endif</div><div class='add'>+# define BCMCPU_IS_6368()	(bcm63xx_get_cpu_id() == BCM6368_CPU_ID)</div><div class='add'>+#else</div><div class='add'>+# define BCMCPU_IS_6368()	(0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef bcm63xx_get_cpu_id</div><div class='ctx'> #error "No CPU support configured"</div><div class='ctx'> #endif</div><div class='hunk'>@@ -88,6 +102,7 @@ enum bcm63xx_regs_set {</div><div class='ctx'> 	RSET_UART1,</div><div class='ctx'> 	RSET_GPIO,</div><div class='ctx'> 	RSET_SPI,</div><div class='add'>+	RSET_SPI2,</div><div class='ctx'> 	RSET_UDC0,</div><div class='ctx'> 	RSET_OHCI0,</div><div class='ctx'> 	RSET_OHCI_PRIV,</div><div class='hunk'>@@ -98,10 +113,23 @@ enum bcm63xx_regs_set {</div><div class='ctx'> 	RSET_ENET0,</div><div class='ctx'> 	RSET_ENET1,</div><div class='ctx'> 	RSET_ENETDMA,</div><div class='add'>+	RSET_ENETDMAC,</div><div class='add'>+	RSET_ENETDMAS,</div><div class='add'>+	RSET_ENETSW,</div><div class='ctx'> 	RSET_EHCI0,</div><div class='ctx'> 	RSET_SDRAM,</div><div class='ctx'> 	RSET_MEMC,</div><div class='ctx'> 	RSET_DDR,</div><div class='add'>+	RSET_M2M,</div><div class='add'>+	RSET_ATM,</div><div class='add'>+	RSET_XTM,</div><div class='add'>+	RSET_XTMDMA,</div><div class='add'>+	RSET_XTMDMAC,</div><div class='add'>+	RSET_XTMDMAS,</div><div class='add'>+	RSET_PCM,</div><div class='add'>+	RSET_PCMDMA,</div><div class='add'>+	RSET_PCMDMAC,</div><div class='add'>+	RSET_PCMDMAS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define RSET_DSL_LMEM_SIZE		(64 * 1024 * 4)</div><div class='hunk'>@@ -109,11 +137,18 @@ enum bcm63xx_regs_set {</div><div class='ctx'> #define RSET_WDT_SIZE			12</div><div class='ctx'> #define RSET_ENET_SIZE			2048</div><div class='ctx'> #define RSET_ENETDMA_SIZE		2048</div><div class='add'>+#define RSET_ENETSW_SIZE		65536</div><div class='ctx'> #define RSET_UART_SIZE			24</div><div class='ctx'> #define RSET_UDC_SIZE			256</div><div class='ctx'> #define RSET_OHCI_SIZE			256</div><div class='ctx'> #define RSET_EHCI_SIZE			256</div><div class='ctx'> #define RSET_PCMCIA_SIZE		12</div><div class='add'>+#define RSET_M2M_SIZE			256</div><div class='add'>+#define RSET_ATM_SIZE			4096</div><div class='add'>+#define RSET_XTM_SIZE			10240</div><div class='add'>+#define RSET_XTMDMA_SIZE		256</div><div class='add'>+#define RSET_XTMDMAC_SIZE(chans)	(16 * (chans))</div><div class='add'>+#define RSET_XTMDMAS_SIZE(chans)	(16 * (chans))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * 6338 register sets base address</div><div class='hunk'>@@ -127,6 +162,7 @@ enum bcm63xx_regs_set {</div><div class='ctx'> #define BCM_6338_UART1_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6338_GPIO_BASE		(0xfffe0400)</div><div class='ctx'> #define BCM_6338_SPI_BASE		(0xfffe0c00)</div><div class='add'>+#define BCM_6338_SPI2_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6338_UDC0_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6338_USBDMA_BASE		(0xfffe2400)</div><div class='ctx'> #define BCM_6338_OHCI0_BASE		(0xdeadbeef)</div><div class='hunk'>@@ -136,15 +172,27 @@ enum bcm63xx_regs_set {</div><div class='ctx'> #define BCM_6338_PCMCIA_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6338_SDRAM_REGS_BASE	(0xfffe3100)</div><div class='ctx'> #define BCM_6338_DSL_BASE		(0xfffe1000)</div><div class='del'>-#define BCM_6338_SAR_BASE		(0xfffe2000)</div><div class='ctx'> #define BCM_6338_UBUS_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6338_ENET0_BASE		(0xfffe2800)</div><div class='ctx'> #define BCM_6338_ENET1_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6338_ENETDMA_BASE		(0xfffe2400)</div><div class='add'>+#define BCM_6338_ENETDMAC_BASE		(0xfffe2500)</div><div class='add'>+#define BCM_6338_ENETDMAS_BASE		(0xfffe2600)</div><div class='add'>+#define BCM_6338_ENETSW_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6338_EHCI0_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6338_SDRAM_BASE		(0xfffe3100)</div><div class='ctx'> #define BCM_6338_MEMC_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6338_DDR_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6338_M2M_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6338_ATM_BASE		(0xfffe2000)</div><div class='add'>+#define BCM_6338_XTM_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6338_XTMDMA_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6338_XTMDMAC_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6338_XTMDMAS_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6338_PCM_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6338_PCMDMA_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6338_PCMDMAC_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6338_PCMDMAS_BASE		(0xdeadbeef)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * 6345 register sets base address</div><div class='hunk'>@@ -158,24 +206,37 @@ enum bcm63xx_regs_set {</div><div class='ctx'> #define BCM_6345_UART1_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6345_GPIO_BASE		(0xfffe0400)</div><div class='ctx'> #define BCM_6345_SPI_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6345_SPI2_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6345_UDC0_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6345_USBDMA_BASE		(0xfffe2800)</div><div class='ctx'> #define BCM_6345_ENET0_BASE		(0xfffe1800)</div><div class='ctx'> #define BCM_6345_ENETDMA_BASE		(0xfffe2800)</div><div class='add'>+#define BCM_6345_ENETDMAC_BASE		(0xfffe2900)</div><div class='add'>+#define BCM_6345_ENETDMAS_BASE		(0xfffe2a00)</div><div class='add'>+#define BCM_6345_ENETSW_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6345_PCMCIA_BASE		(0xfffe2028)</div><div class='del'>-#define BCM_6345_MPI_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6345_MPI_BASE		(0xfffe2000)</div><div class='ctx'> #define BCM_6345_OHCI0_BASE		(0xfffe2100)</div><div class='ctx'> #define BCM_6345_OHCI_PRIV_BASE		(0xfffe2200)</div><div class='ctx'> #define BCM_6345_USBH_PRIV_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6345_SDRAM_REGS_BASE	(0xfffe2300)</div><div class='ctx'> #define BCM_6345_DSL_BASE		(0xdeadbeef)</div><div class='del'>-#define BCM_6345_SAR_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6345_UBUS_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6345_ENET1_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6345_EHCI0_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6345_SDRAM_BASE		(0xfffe2300)</div><div class='ctx'> #define BCM_6345_MEMC_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6345_DDR_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6345_M2M_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6345_ATM_BASE		(0xfffe4000)</div><div class='add'>+#define BCM_6345_XTM_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6345_XTMDMA_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6345_XTMDMAC_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6345_XTMDMAS_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6345_PCM_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6345_PCMDMA_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6345_PCMDMAC_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6345_PCMDMAS_BASE		(0xdeadbeef)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * 6348 register sets base address</div><div class='hunk'>@@ -188,6 +249,7 @@ enum bcm63xx_regs_set {</div><div class='ctx'> #define BCM_6348_UART1_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6348_GPIO_BASE		(0xfffe0400)</div><div class='ctx'> #define BCM_6348_SPI_BASE		(0xfffe0c00)</div><div class='add'>+#define BCM_6348_SPI2_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6348_UDC0_BASE		(0xfffe1000)</div><div class='ctx'> #define BCM_6348_OHCI0_BASE		(0xfffe1b00)</div><div class='ctx'> #define BCM_6348_OHCI_PRIV_BASE		(0xfffe1c00)</div><div class='hunk'>@@ -195,14 +257,27 @@ enum bcm63xx_regs_set {</div><div class='ctx'> #define BCM_6348_MPI_BASE		(0xfffe2000)</div><div class='ctx'> #define BCM_6348_PCMCIA_BASE		(0xfffe2054)</div><div class='ctx'> #define BCM_6348_SDRAM_REGS_BASE	(0xfffe2300)</div><div class='add'>+#define BCM_6348_M2M_BASE		(0xfffe2800)</div><div class='ctx'> #define BCM_6348_DSL_BASE		(0xfffe3000)</div><div class='ctx'> #define BCM_6348_ENET0_BASE		(0xfffe6000)</div><div class='ctx'> #define BCM_6348_ENET1_BASE		(0xfffe6800)</div><div class='ctx'> #define BCM_6348_ENETDMA_BASE		(0xfffe7000)</div><div class='add'>+#define BCM_6348_ENETDMAC_BASE		(0xfffe7100)</div><div class='add'>+#define BCM_6348_ENETDMAS_BASE		(0xfffe7200)</div><div class='add'>+#define BCM_6348_ENETSW_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6348_EHCI0_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6348_SDRAM_BASE		(0xfffe2300)</div><div class='ctx'> #define BCM_6348_MEMC_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6348_DDR_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6348_ATM_BASE		(0xfffe4000)</div><div class='add'>+#define BCM_6348_XTM_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6348_XTMDMA_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6348_XTMDMAC_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6348_XTMDMAS_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6348_PCM_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6348_PCMDMA_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6348_PCMDMAC_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6348_PCMDMAS_BASE		(0xdeadbeef)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * 6358 register sets base address</div><div class='hunk'>@@ -215,6 +290,7 @@ enum bcm63xx_regs_set {</div><div class='ctx'> #define BCM_6358_UART1_BASE		(0xfffe0120)</div><div class='ctx'> #define BCM_6358_GPIO_BASE		(0xfffe0080)</div><div class='ctx'> #define BCM_6358_SPI_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6358_SPI2_BASE		(0xfffe0800)</div><div class='ctx'> #define BCM_6358_UDC0_BASE		(0xfffe0800)</div><div class='ctx'> #define BCM_6358_OHCI0_BASE		(0xfffe1400)</div><div class='ctx'> #define BCM_6358_OHCI_PRIV_BASE		(0xdeadbeef)</div><div class='hunk'>@@ -222,214 +298,175 @@ enum bcm63xx_regs_set {</div><div class='ctx'> #define BCM_6358_MPI_BASE		(0xfffe1000)</div><div class='ctx'> #define BCM_6358_PCMCIA_BASE		(0xfffe1054)</div><div class='ctx'> #define BCM_6358_SDRAM_REGS_BASE	(0xfffe2300)</div><div class='add'>+#define BCM_6358_M2M_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6358_DSL_BASE		(0xfffe3000)</div><div class='ctx'> #define BCM_6358_ENET0_BASE		(0xfffe4000)</div><div class='ctx'> #define BCM_6358_ENET1_BASE		(0xfffe4800)</div><div class='ctx'> #define BCM_6358_ENETDMA_BASE		(0xfffe5000)</div><div class='add'>+#define BCM_6358_ENETDMAC_BASE		(0xfffe5100)</div><div class='add'>+#define BCM_6358_ENETDMAS_BASE		(0xfffe5200)</div><div class='add'>+#define BCM_6358_ENETSW_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6358_EHCI0_BASE		(0xfffe1300)</div><div class='ctx'> #define BCM_6358_SDRAM_BASE		(0xdeadbeef)</div><div class='ctx'> #define BCM_6358_MEMC_BASE		(0xfffe1200)</div><div class='ctx'> #define BCM_6358_DDR_BASE		(0xfffe12a0)</div><div class='add'>+#define BCM_6358_ATM_BASE		(0xfffe2000)</div><div class='add'>+#define BCM_6358_XTM_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6358_XTMDMA_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6358_XTMDMAC_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6358_XTMDMAS_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6358_PCM_BASE		(0xfffe1600)</div><div class='add'>+#define BCM_6358_PCMDMA_BASE		(0xfffe1800)</div><div class='add'>+#define BCM_6358_PCMDMAC_BASE		(0xfffe1900)</div><div class='add'>+#define BCM_6358_PCMDMAS_BASE		(0xfffe1a00)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 6368 register sets base address</div><div class='add'>+ */</div><div class='add'>+#define BCM_6368_DSL_LMEM_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6368_PERF_BASE		(0xb0000000)</div><div class='add'>+#define BCM_6368_TIMER_BASE		(0xb0000040)</div><div class='add'>+#define BCM_6368_WDT_BASE		(0xb000005c)</div><div class='add'>+#define BCM_6368_UART0_BASE		(0xb0000100)</div><div class='add'>+#define BCM_6368_UART1_BASE		(0xb0000120)</div><div class='add'>+#define BCM_6368_GPIO_BASE		(0xb0000080)</div><div class='add'>+#define BCM_6368_SPI_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6368_SPI2_BASE		(0xb0000800)</div><div class='add'>+#define BCM_6368_UDC0_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6368_OHCI0_BASE		(0xb0001600)</div><div class='add'>+#define BCM_6368_OHCI_PRIV_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6368_USBH_PRIV_BASE		(0xb0001700)</div><div class='add'>+#define BCM_6368_MPI_BASE		(0xb0001000)</div><div class='add'>+#define BCM_6368_PCMCIA_BASE		(0xb0001054)</div><div class='add'>+#define BCM_6368_SDRAM_REGS_BASE	(0xdeadbeef)</div><div class='add'>+#define BCM_6368_M2M_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6368_DSL_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6368_ENET0_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6368_ENET1_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6368_ENETDMA_BASE		(0xb0006800)</div><div class='add'>+#define BCM_6368_ENETDMAC_BASE		(0xb0006a00)</div><div class='add'>+#define BCM_6368_ENETDMAS_BASE		(0xb0006c00)</div><div class='add'>+#define BCM_6368_ENETSW_BASE		(0xb0f00000)</div><div class='add'>+#define BCM_6368_EHCI0_BASE		(0xb0001500)</div><div class='add'>+#define BCM_6368_SDRAM_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6368_MEMC_BASE		(0xb0001200)</div><div class='add'>+#define BCM_6368_DDR_BASE		(0xb0001280)</div><div class='add'>+#define BCM_6368_ATM_BASE		(0xdeadbeef)</div><div class='add'>+#define BCM_6368_XTM_BASE		(0xb0001800)</div><div class='add'>+#define BCM_6368_XTMDMA_BASE		(0xb0005000)</div><div class='add'>+#define BCM_6368_XTMDMAC_BASE		(0xb0005200)</div><div class='add'>+#define BCM_6368_XTMDMAS_BASE		(0xb0005400)</div><div class='add'>+#define BCM_6368_PCM_BASE		(0xb0004000)</div><div class='add'>+#define BCM_6368_PCMDMA_BASE		(0xb0005800)</div><div class='add'>+#define BCM_6368_PCMDMAC_BASE		(0xb0005a00)</div><div class='add'>+#define BCM_6368_PCMDMAS_BASE		(0xb0005c00)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> extern const unsigned long *bcm63xx_regs_base;</div><div class='ctx'> </div><div class='add'>+#define __GEN_RSET_BASE(__cpu, __rset)					\</div><div class='add'>+	case RSET_## __rset :						\</div><div class='add'>+		return BCM_## __cpu ##_## __rset ##_BASE;</div><div class='add'>+</div><div class='add'>+#define __GEN_RSET(__cpu)						\</div><div class='add'>+	switch (set) {							\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, DSL_LMEM)				\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, PERF)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, TIMER)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, WDT)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, UART0)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, UART1)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, GPIO)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, SPI)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, SPI2)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, UDC0)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, OHCI0)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, OHCI_PRIV)				\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, USBH_PRIV)				\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, MPI)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, PCMCIA)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, DSL)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, ENET0)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, ENET1)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, ENETDMA)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, ENETDMAC)				\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, ENETDMAS)				\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, ENETSW)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, EHCI0)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, SDRAM)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, MEMC)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, DDR)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, M2M)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, ATM)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, XTM)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, XTMDMA)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, XTMDMAC)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, XTMDMAS)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, PCM)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, PCMDMA)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, PCMDMAC)					\</div><div class='add'>+	__GEN_RSET_BASE(__cpu, PCMDMAS)					\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define __GEN_CPU_REGS_TABLE(__cpu)					\</div><div class='add'>+	[RSET_DSL_LMEM]		= BCM_## __cpu ##_DSL_LMEM_BASE,	\</div><div class='add'>+	[RSET_PERF]		= BCM_## __cpu ##_PERF_BASE,		\</div><div class='add'>+	[RSET_TIMER]		= BCM_## __cpu ##_TIMER_BASE,		\</div><div class='add'>+	[RSET_WDT]		= BCM_## __cpu ##_WDT_BASE,		\</div><div class='add'>+	[RSET_UART0]		= BCM_## __cpu ##_UART0_BASE,		\</div><div class='add'>+	[RSET_UART1]		= BCM_## __cpu ##_UART1_BASE,		\</div><div class='add'>+	[RSET_GPIO]		= BCM_## __cpu ##_GPIO_BASE,		\</div><div class='add'>+	[RSET_SPI]		= BCM_## __cpu ##_SPI_BASE,		\</div><div class='add'>+	[RSET_SPI2]		= BCM_## __cpu ##_SPI2_BASE,		\</div><div class='add'>+	[RSET_UDC0]		= BCM_## __cpu ##_UDC0_BASE,		\</div><div class='add'>+	[RSET_OHCI0]		= BCM_## __cpu ##_OHCI0_BASE,		\</div><div class='add'>+	[RSET_OHCI_PRIV]	= BCM_## __cpu ##_OHCI_PRIV_BASE,	\</div><div class='add'>+	[RSET_USBH_PRIV]	= BCM_## __cpu ##_USBH_PRIV_BASE,	\</div><div class='add'>+	[RSET_MPI]		= BCM_## __cpu ##_MPI_BASE,		\</div><div class='add'>+	[RSET_PCMCIA]		= BCM_## __cpu ##_PCMCIA_BASE,		\</div><div class='add'>+	[RSET_DSL]		= BCM_## __cpu ##_DSL_BASE,		\</div><div class='add'>+	[RSET_ENET0]		= BCM_## __cpu ##_ENET0_BASE,		\</div><div class='add'>+	[RSET_ENET1]		= BCM_## __cpu ##_ENET1_BASE,		\</div><div class='add'>+	[RSET_ENETDMA]		= BCM_## __cpu ##_ENETDMA_BASE,		\</div><div class='add'>+	[RSET_ENETDMAC]		= BCM_## __cpu ##_ENETDMAC_BASE,	\</div><div class='add'>+	[RSET_ENETDMAS]		= BCM_## __cpu ##_ENETDMAS_BASE,	\</div><div class='add'>+	[RSET_ENETSW]		= BCM_## __cpu ##_ENETSW_BASE,		\</div><div class='add'>+	[RSET_EHCI0]		= BCM_## __cpu ##_EHCI0_BASE,		\</div><div class='add'>+	[RSET_SDRAM]		= BCM_## __cpu ##_SDRAM_BASE,		\</div><div class='add'>+	[RSET_MEMC]		= BCM_## __cpu ##_MEMC_BASE,		\</div><div class='add'>+	[RSET_DDR]		= BCM_## __cpu ##_DDR_BASE,		\</div><div class='add'>+	[RSET_M2M]		= BCM_## __cpu ##_M2M_BASE,		\</div><div class='add'>+	[RSET_ATM]		= BCM_## __cpu ##_ATM_BASE,		\</div><div class='add'>+	[RSET_XTM]		= BCM_## __cpu ##_XTM_BASE,		\</div><div class='add'>+	[RSET_XTMDMA]		= BCM_## __cpu ##_XTMDMA_BASE,		\</div><div class='add'>+	[RSET_XTMDMAC]		= BCM_## __cpu ##_XTMDMAC_BASE,		\</div><div class='add'>+	[RSET_XTMDMAS]		= BCM_## __cpu ##_XTMDMAS_BASE,		\</div><div class='add'>+	[RSET_PCM]		= BCM_## __cpu ##_PCM_BASE,		\</div><div class='add'>+	[RSET_PCMDMA]		= BCM_## __cpu ##_PCMDMA_BASE,		\</div><div class='add'>+	[RSET_PCMDMAC]		= BCM_## __cpu ##_PCMDMAC_BASE,		\</div><div class='add'>+	[RSET_PCMDMAS]		= BCM_## __cpu ##_PCMDMAS_BASE,		\</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static inline unsigned long bcm63xx_regset_address(enum bcm63xx_regs_set set)</div><div class='ctx'> {</div><div class='ctx'> #ifdef BCMCPU_RUNTIME_DETECT</div><div class='ctx'> 	return bcm63xx_regs_base[set];</div><div class='ctx'> #else</div><div class='ctx'> #ifdef CONFIG_BCM63XX_CPU_6338</div><div class='del'>-	switch (set) {</div><div class='del'>-	case RSET_DSL_LMEM:</div><div class='del'>-		return BCM_6338_DSL_LMEM_BASE;</div><div class='del'>-	case RSET_PERF:</div><div class='del'>-		return BCM_6338_PERF_BASE;</div><div class='del'>-	case RSET_TIMER:</div><div class='del'>-		return BCM_6338_TIMER_BASE;</div><div class='del'>-	case RSET_WDT:</div><div class='del'>-		return BCM_6338_WDT_BASE;</div><div class='del'>-	case RSET_UART0:</div><div class='del'>-		return BCM_6338_UART0_BASE;</div><div class='del'>-	case RSET_UART1:</div><div class='del'>-		return BCM_6338_UART1_BASE;</div><div class='del'>-	case RSET_GPIO:</div><div class='del'>-		return BCM_6338_GPIO_BASE;</div><div class='del'>-	case RSET_SPI:</div><div class='del'>-		return BCM_6338_SPI_BASE;</div><div class='del'>-	case RSET_UDC0:</div><div class='del'>-		return BCM_6338_UDC0_BASE;</div><div class='del'>-	case RSET_OHCI0:</div><div class='del'>-		return BCM_6338_OHCI0_BASE;</div><div class='del'>-	case RSET_OHCI_PRIV:</div><div class='del'>-		return BCM_6338_OHCI_PRIV_BASE;</div><div class='del'>-	case RSET_USBH_PRIV:</div><div class='del'>-		return BCM_6338_USBH_PRIV_BASE;</div><div class='del'>-	case RSET_MPI:</div><div class='del'>-		return BCM_6338_MPI_BASE;</div><div class='del'>-	case RSET_PCMCIA:</div><div class='del'>-		return BCM_6338_PCMCIA_BASE;</div><div class='del'>-	case RSET_DSL:</div><div class='del'>-		return BCM_6338_DSL_BASE;</div><div class='del'>-	case RSET_ENET0:</div><div class='del'>-		return BCM_6338_ENET0_BASE;</div><div class='del'>-	case RSET_ENET1:</div><div class='del'>-		return BCM_6338_ENET1_BASE;</div><div class='del'>-	case RSET_ENETDMA:</div><div class='del'>-		return BCM_6338_ENETDMA_BASE;</div><div class='del'>-	case RSET_EHCI0:</div><div class='del'>-		return BCM_6338_EHCI0_BASE;</div><div class='del'>-	case RSET_SDRAM:</div><div class='del'>-		return BCM_6338_SDRAM_BASE;</div><div class='del'>-	case RSET_MEMC:</div><div class='del'>-		return BCM_6338_MEMC_BASE;</div><div class='del'>-	case RSET_DDR:</div><div class='del'>-		return BCM_6338_DDR_BASE;</div><div class='del'>-	}</div><div class='add'>+	__GEN_RSET(6338)</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_BCM63XX_CPU_6345</div><div class='del'>-	switch (set) {</div><div class='del'>-	case RSET_DSL_LMEM:</div><div class='del'>-		return BCM_6345_DSL_LMEM_BASE;</div><div class='del'>-	case RSET_PERF:</div><div class='del'>-		return BCM_6345_PERF_BASE;</div><div class='del'>-	case RSET_TIMER:</div><div class='del'>-		return BCM_6345_TIMER_BASE;</div><div class='del'>-	case RSET_WDT:</div><div class='del'>-		return BCM_6345_WDT_BASE;</div><div class='del'>-	case RSET_UART0:</div><div class='del'>-		return BCM_6345_UART0_BASE;</div><div class='del'>-	case RSET_UART1:</div><div class='del'>-		return BCM_6345_UART1_BASE;</div><div class='del'>-	case RSET_GPIO:</div><div class='del'>-		return BCM_6345_GPIO_BASE;</div><div class='del'>-	case RSET_SPI:</div><div class='del'>-		return BCM_6345_SPI_BASE;</div><div class='del'>-	case RSET_UDC0:</div><div class='del'>-		return BCM_6345_UDC0_BASE;</div><div class='del'>-	case RSET_OHCI0:</div><div class='del'>-		return BCM_6345_OHCI0_BASE;</div><div class='del'>-	case RSET_OHCI_PRIV:</div><div class='del'>-		return BCM_6345_OHCI_PRIV_BASE;</div><div class='del'>-	case RSET_USBH_PRIV:</div><div class='del'>-		return BCM_6345_USBH_PRIV_BASE;</div><div class='del'>-	case RSET_MPI:</div><div class='del'>-		return BCM_6345_MPI_BASE;</div><div class='del'>-	case RSET_PCMCIA:</div><div class='del'>-		return BCM_6345_PCMCIA_BASE;</div><div class='del'>-	case RSET_DSL:</div><div class='del'>-		return BCM_6345_DSL_BASE;</div><div class='del'>-	case RSET_ENET0:</div><div class='del'>-		return BCM_6345_ENET0_BASE;</div><div class='del'>-	case RSET_ENET1:</div><div class='del'>-		return BCM_6345_ENET1_BASE;</div><div class='del'>-	case RSET_ENETDMA:</div><div class='del'>-		return BCM_6345_ENETDMA_BASE;</div><div class='del'>-	case RSET_EHCI0:</div><div class='del'>-		return BCM_6345_EHCI0_BASE;</div><div class='del'>-	case RSET_SDRAM:</div><div class='del'>-		return BCM_6345_SDRAM_BASE;</div><div class='del'>-	case RSET_MEMC:</div><div class='del'>-		return BCM_6345_MEMC_BASE;</div><div class='del'>-	case RSET_DDR:</div><div class='del'>-		return BCM_6345_DDR_BASE;</div><div class='del'>-	}</div><div class='add'>+	__GEN_RSET(6345)</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_BCM63XX_CPU_6348</div><div class='del'>-	switch (set) {</div><div class='del'>-	case RSET_DSL_LMEM:</div><div class='del'>-		return BCM_6348_DSL_LMEM_BASE;</div><div class='del'>-	case RSET_PERF:</div><div class='del'>-		return BCM_6348_PERF_BASE;</div><div class='del'>-	case RSET_TIMER:</div><div class='del'>-		return BCM_6348_TIMER_BASE;</div><div class='del'>-	case RSET_WDT:</div><div class='del'>-		return BCM_6348_WDT_BASE;</div><div class='del'>-	case RSET_UART0:</div><div class='del'>-		return BCM_6348_UART0_BASE;</div><div class='del'>-	case RSET_UART1:</div><div class='del'>-		return BCM_6348_UART1_BASE;</div><div class='del'>-	case RSET_GPIO:</div><div class='del'>-		return BCM_6348_GPIO_BASE;</div><div class='del'>-	case RSET_SPI:</div><div class='del'>-		return BCM_6348_SPI_BASE;</div><div class='del'>-	case RSET_UDC0:</div><div class='del'>-		return BCM_6348_UDC0_BASE;</div><div class='del'>-	case RSET_OHCI0:</div><div class='del'>-		return BCM_6348_OHCI0_BASE;</div><div class='del'>-	case RSET_OHCI_PRIV:</div><div class='del'>-		return BCM_6348_OHCI_PRIV_BASE;</div><div class='del'>-	case RSET_USBH_PRIV:</div><div class='del'>-		return BCM_6348_USBH_PRIV_BASE;</div><div class='del'>-	case RSET_MPI:</div><div class='del'>-		return BCM_6348_MPI_BASE;</div><div class='del'>-	case RSET_PCMCIA:</div><div class='del'>-		return BCM_6348_PCMCIA_BASE;</div><div class='del'>-	case RSET_DSL:</div><div class='del'>-		return BCM_6348_DSL_BASE;</div><div class='del'>-	case RSET_ENET0:</div><div class='del'>-		return BCM_6348_ENET0_BASE;</div><div class='del'>-	case RSET_ENET1:</div><div class='del'>-		return BCM_6348_ENET1_BASE;</div><div class='del'>-	case RSET_ENETDMA:</div><div class='del'>-		return BCM_6348_ENETDMA_BASE;</div><div class='del'>-	case RSET_EHCI0:</div><div class='del'>-		return BCM_6348_EHCI0_BASE;</div><div class='del'>-	case RSET_SDRAM:</div><div class='del'>-		return BCM_6348_SDRAM_BASE;</div><div class='del'>-	case RSET_MEMC:</div><div class='del'>-		return BCM_6348_MEMC_BASE;</div><div class='del'>-	case RSET_DDR:</div><div class='del'>-		return BCM_6348_DDR_BASE;</div><div class='del'>-	}</div><div class='add'>+	__GEN_RSET(6348)</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_BCM63XX_CPU_6358</div><div class='del'>-	switch (set) {</div><div class='del'>-	case RSET_DSL_LMEM:</div><div class='del'>-		return BCM_6358_DSL_LMEM_BASE;</div><div class='del'>-	case RSET_PERF:</div><div class='del'>-		return BCM_6358_PERF_BASE;</div><div class='del'>-	case RSET_TIMER:</div><div class='del'>-		return BCM_6358_TIMER_BASE;</div><div class='del'>-	case RSET_WDT:</div><div class='del'>-		return BCM_6358_WDT_BASE;</div><div class='del'>-	case RSET_UART0:</div><div class='del'>-		return BCM_6358_UART0_BASE;</div><div class='del'>-	case RSET_UART1:</div><div class='del'>-		return BCM_6358_UART1_BASE;</div><div class='del'>-	case RSET_GPIO:</div><div class='del'>-		return BCM_6358_GPIO_BASE;</div><div class='del'>-	case RSET_SPI:</div><div class='del'>-		return BCM_6358_SPI_BASE;</div><div class='del'>-	case RSET_UDC0:</div><div class='del'>-		return BCM_6358_UDC0_BASE;</div><div class='del'>-	case RSET_OHCI0:</div><div class='del'>-		return BCM_6358_OHCI0_BASE;</div><div class='del'>-	case RSET_OHCI_PRIV:</div><div class='del'>-		return BCM_6358_OHCI_PRIV_BASE;</div><div class='del'>-	case RSET_USBH_PRIV:</div><div class='del'>-		return BCM_6358_USBH_PRIV_BASE;</div><div class='del'>-	case RSET_MPI:</div><div class='del'>-		return BCM_6358_MPI_BASE;</div><div class='del'>-	case RSET_PCMCIA:</div><div class='del'>-		return BCM_6358_PCMCIA_BASE;</div><div class='del'>-	case RSET_ENET0:</div><div class='del'>-		return BCM_6358_ENET0_BASE;</div><div class='del'>-	case RSET_ENET1:</div><div class='del'>-		return BCM_6358_ENET1_BASE;</div><div class='del'>-	case RSET_ENETDMA:</div><div class='del'>-		return BCM_6358_ENETDMA_BASE;</div><div class='del'>-	case RSET_DSL:</div><div class='del'>-		return BCM_6358_DSL_BASE;</div><div class='del'>-	case RSET_EHCI0:</div><div class='del'>-		return BCM_6358_EHCI0_BASE;</div><div class='del'>-	case RSET_SDRAM:</div><div class='del'>-		return BCM_6358_SDRAM_BASE;</div><div class='del'>-	case RSET_MEMC:</div><div class='del'>-		return BCM_6358_MEMC_BASE;</div><div class='del'>-	case RSET_DDR:</div><div class='del'>-		return BCM_6358_DDR_BASE;</div><div class='del'>-	}</div><div class='add'>+	__GEN_RSET(6358)</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_BCM63XX_CPU_6368</div><div class='add'>+	__GEN_RSET(6368)</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> 	/* unreached */</div><div class='hunk'>@@ -449,75 +486,114 @@ enum bcm63xx_irq {</div><div class='ctx'> 	IRQ_ENET_PHY,</div><div class='ctx'> 	IRQ_OHCI0,</div><div class='ctx'> 	IRQ_EHCI0,</div><div class='del'>-	IRQ_PCMCIA0,</div><div class='ctx'> 	IRQ_ENET0_RXDMA,</div><div class='ctx'> 	IRQ_ENET0_TXDMA,</div><div class='ctx'> 	IRQ_ENET1_RXDMA,</div><div class='ctx'> 	IRQ_ENET1_TXDMA,</div><div class='ctx'> 	IRQ_PCI,</div><div class='ctx'> 	IRQ_PCMCIA,</div><div class='add'>+	IRQ_ATM,</div><div class='add'>+	IRQ_ENETSW_RXDMA0,</div><div class='add'>+	IRQ_ENETSW_RXDMA1,</div><div class='add'>+	IRQ_ENETSW_RXDMA2,</div><div class='add'>+	IRQ_ENETSW_RXDMA3,</div><div class='add'>+	IRQ_ENETSW_TXDMA0,</div><div class='add'>+	IRQ_ENETSW_TXDMA1,</div><div class='add'>+	IRQ_ENETSW_TXDMA2,</div><div class='add'>+	IRQ_ENETSW_TXDMA3,</div><div class='add'>+	IRQ_XTM,</div><div class='add'>+	IRQ_XTM_DMA0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * 6338 irqs</div><div class='ctx'>  */</div><div class='ctx'> #define BCM_6338_TIMER_IRQ		(IRQ_INTERNAL_BASE + 0)</div><div class='del'>-#define BCM_6338_SPI_IRQ		(IRQ_INTERNAL_BASE + 1)</div><div class='ctx'> #define BCM_6338_UART0_IRQ		(IRQ_INTERNAL_BASE + 2)</div><div class='del'>-#define BCM_6338_DG_IRQ			(IRQ_INTERNAL_BASE + 4)</div><div class='add'>+#define BCM_6338_UART1_IRQ		0</div><div class='ctx'> #define BCM_6338_DSL_IRQ		(IRQ_INTERNAL_BASE + 5)</div><div class='del'>-#define BCM_6338_ATM_IRQ		(IRQ_INTERNAL_BASE + 6)</div><div class='del'>-#define BCM_6338_UDC0_IRQ		(IRQ_INTERNAL_BASE + 7)</div><div class='ctx'> #define BCM_6338_ENET0_IRQ		(IRQ_INTERNAL_BASE + 8)</div><div class='add'>+#define BCM_6338_ENET1_IRQ		0</div><div class='ctx'> #define BCM_6338_ENET_PHY_IRQ		(IRQ_INTERNAL_BASE + 9)</div><div class='del'>-#define BCM_6338_SDRAM_IRQ		(IRQ_INTERNAL_BASE + 10)</div><div class='del'>-#define BCM_6338_USB_CNTL_RX_DMA_IRQ	(IRQ_INTERNAL_BASE + 11)</div><div class='del'>-#define BCM_6338_USB_CNTL_TX_DMA_IRQ	(IRQ_INTERNAL_BASE + 12)</div><div class='del'>-#define BCM_6338_USB_BULK_RX_DMA_IRQ	(IRQ_INTERNAL_BASE + 13)</div><div class='del'>-#define BCM_6338_USB_BULK_TX_DMA_IRQ	(IRQ_INTERNAL_BASE + 14)</div><div class='add'>+#define BCM_6338_OHCI0_IRQ		0</div><div class='add'>+#define BCM_6338_EHCI0_IRQ		0</div><div class='ctx'> #define BCM_6338_ENET0_RXDMA_IRQ	(IRQ_INTERNAL_BASE + 15)</div><div class='ctx'> #define BCM_6338_ENET0_TXDMA_IRQ	(IRQ_INTERNAL_BASE + 16)</div><div class='del'>-#define BCM_6338_SDIO_IRQ		(IRQ_INTERNAL_BASE + 17)</div><div class='add'>+#define BCM_6338_ENET1_RXDMA_IRQ	0</div><div class='add'>+#define BCM_6338_ENET1_TXDMA_IRQ	0</div><div class='add'>+#define BCM_6338_PCI_IRQ		0</div><div class='add'>+#define BCM_6338_PCMCIA_IRQ		0</div><div class='add'>+#define BCM_6338_ATM_IRQ		0</div><div class='add'>+#define BCM_6338_ENETSW_RXDMA0_IRQ	0</div><div class='add'>+#define BCM_6338_ENETSW_RXDMA1_IRQ	0</div><div class='add'>+#define BCM_6338_ENETSW_RXDMA2_IRQ	0</div><div class='add'>+#define BCM_6338_ENETSW_RXDMA3_IRQ	0</div><div class='add'>+#define BCM_6338_ENETSW_TXDMA0_IRQ	0</div><div class='add'>+#define BCM_6338_ENETSW_TXDMA1_IRQ	0</div><div class='add'>+#define BCM_6338_ENETSW_TXDMA2_IRQ	0</div><div class='add'>+#define BCM_6338_ENETSW_TXDMA3_IRQ	0</div><div class='add'>+#define BCM_6338_XTM_IRQ		0</div><div class='add'>+#define BCM_6338_XTM_DMA0_IRQ		0</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * 6345 irqs</div><div class='ctx'>  */</div><div class='ctx'> #define BCM_6345_TIMER_IRQ		(IRQ_INTERNAL_BASE + 0)</div><div class='ctx'> #define BCM_6345_UART0_IRQ		(IRQ_INTERNAL_BASE + 2)</div><div class='add'>+#define BCM_6345_UART1_IRQ		0</div><div class='ctx'> #define BCM_6345_DSL_IRQ		(IRQ_INTERNAL_BASE + 3)</div><div class='del'>-#define BCM_6345_ATM_IRQ		(IRQ_INTERNAL_BASE + 4)</div><div class='del'>-#define BCM_6345_USB_IRQ		(IRQ_INTERNAL_BASE + 5)</div><div class='ctx'> #define BCM_6345_ENET0_IRQ		(IRQ_INTERNAL_BASE + 8)</div><div class='add'>+#define BCM_6345_ENET1_IRQ		0</div><div class='ctx'> #define BCM_6345_ENET_PHY_IRQ		(IRQ_INTERNAL_BASE + 12)</div><div class='add'>+#define BCM_6345_OHCI0_IRQ		0</div><div class='add'>+#define BCM_6345_EHCI0_IRQ		0</div><div class='ctx'> #define BCM_6345_ENET0_RXDMA_IRQ	(IRQ_INTERNAL_BASE + 13 + 1)</div><div class='ctx'> #define BCM_6345_ENET0_TXDMA_IRQ	(IRQ_INTERNAL_BASE + 13 + 2)</div><div class='del'>-#define BCM_6345_EBI_RX_IRQ		(IRQ_INTERNAL_BASE + 13 + 5)</div><div class='del'>-#define BCM_6345_EBI_TX_IRQ		(IRQ_INTERNAL_BASE + 13 + 6)</div><div class='del'>-#define BCM_6345_RESERVED_RX_IRQ	(IRQ_INTERNAL_BASE + 13 + 9)</div><div class='del'>-#define BCM_6345_RESERVED_TX_IRQ	(IRQ_INTERNAL_BASE + 13 + 10)</div><div class='del'>-#define BCM_6345_USB_BULK_RX_DMA_IRQ	(IRQ_INTERNAL_BASE + 13 + 13)</div><div class='del'>-#define BCM_6345_USB_BULK_TX_DMA_IRQ	(IRQ_INTERNAL_BASE + 13 + 14)</div><div class='del'>-#define BCM_6345_USB_CNTL_RX_DMA_IRQ	(IRQ_INTERNAL_BASE + 13 + 15)</div><div class='del'>-#define BCM_6345_USB_CNTL_TX_DMA_IRQ	(IRQ_INTERNAL_BASE + 13 + 16)</div><div class='del'>-#define BCM_6345_USB_ISO_RX_DMA_IRQ	(IRQ_INTERNAL_BASE + 13 + 17)</div><div class='del'>-#define BCM_6345_USB_ISO_TX_DMA_IRQ	(IRQ_INTERNAL_BASE + 13 + 18)</div><div class='add'>+#define BCM_6345_ENET1_RXDMA_IRQ	0</div><div class='add'>+#define BCM_6345_ENET1_TXDMA_IRQ	0</div><div class='add'>+#define BCM_6345_PCI_IRQ		0</div><div class='add'>+#define BCM_6345_PCMCIA_IRQ		0</div><div class='add'>+#define BCM_6345_ATM_IRQ		0</div><div class='add'>+#define BCM_6345_ENETSW_RXDMA0_IRQ	0</div><div class='add'>+#define BCM_6345_ENETSW_RXDMA1_IRQ	0</div><div class='add'>+#define BCM_6345_ENETSW_RXDMA2_IRQ	0</div><div class='add'>+#define BCM_6345_ENETSW_RXDMA3_IRQ	0</div><div class='add'>+#define BCM_6345_ENETSW_TXDMA0_IRQ	0</div><div class='add'>+#define BCM_6345_ENETSW_TXDMA1_IRQ	0</div><div class='add'>+#define BCM_6345_ENETSW_TXDMA2_IRQ	0</div><div class='add'>+#define BCM_6345_ENETSW_TXDMA3_IRQ	0</div><div class='add'>+#define BCM_6345_XTM_IRQ		0</div><div class='add'>+#define BCM_6345_XTM_DMA0_IRQ		0</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * 6348 irqs</div><div class='ctx'>  */</div><div class='ctx'> #define BCM_6348_TIMER_IRQ		(IRQ_INTERNAL_BASE + 0)</div><div class='ctx'> #define BCM_6348_UART0_IRQ		(IRQ_INTERNAL_BASE + 2)</div><div class='add'>+#define BCM_6348_UART1_IRQ		0</div><div class='ctx'> #define BCM_6348_DSL_IRQ		(IRQ_INTERNAL_BASE + 4)</div><div class='del'>-#define BCM_6348_ENET1_IRQ		(IRQ_INTERNAL_BASE + 7)</div><div class='ctx'> #define BCM_6348_ENET0_IRQ		(IRQ_INTERNAL_BASE + 8)</div><div class='add'>+#define BCM_6348_ENET1_IRQ		(IRQ_INTERNAL_BASE + 7)</div><div class='ctx'> #define BCM_6348_ENET_PHY_IRQ		(IRQ_INTERNAL_BASE + 9)</div><div class='ctx'> #define BCM_6348_OHCI0_IRQ		(IRQ_INTERNAL_BASE + 12)</div><div class='add'>+#define BCM_6348_EHCI0_IRQ		0</div><div class='ctx'> #define BCM_6348_ENET0_RXDMA_IRQ	(IRQ_INTERNAL_BASE + 20)</div><div class='ctx'> #define BCM_6348_ENET0_TXDMA_IRQ	(IRQ_INTERNAL_BASE + 21)</div><div class='ctx'> #define BCM_6348_ENET1_RXDMA_IRQ	(IRQ_INTERNAL_BASE + 22)</div><div class='ctx'> #define BCM_6348_ENET1_TXDMA_IRQ	(IRQ_INTERNAL_BASE + 23)</div><div class='del'>-#define BCM_6348_PCMCIA_IRQ		(IRQ_INTERNAL_BASE + 24)</div><div class='ctx'> #define BCM_6348_PCI_IRQ		(IRQ_INTERNAL_BASE + 24)</div><div class='add'>+#define BCM_6348_PCMCIA_IRQ		(IRQ_INTERNAL_BASE + 24)</div><div class='add'>+#define BCM_6348_ATM_IRQ		(IRQ_INTERNAL_BASE + 5)</div><div class='add'>+#define BCM_6348_ENETSW_RXDMA0_IRQ	0</div><div class='add'>+#define BCM_6348_ENETSW_RXDMA1_IRQ	0</div><div class='add'>+#define BCM_6348_ENETSW_RXDMA2_IRQ	0</div><div class='add'>+#define BCM_6348_ENETSW_RXDMA3_IRQ	0</div><div class='add'>+#define BCM_6348_ENETSW_TXDMA0_IRQ	0</div><div class='add'>+#define BCM_6348_ENETSW_TXDMA1_IRQ	0</div><div class='add'>+#define BCM_6348_ENETSW_TXDMA2_IRQ	0</div><div class='add'>+#define BCM_6348_ENETSW_TXDMA3_IRQ	0</div><div class='add'>+#define BCM_6348_XTM_IRQ		0</div><div class='add'>+#define BCM_6348_XTM_DMA0_IRQ		0</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * 6358 irqs</div><div class='hunk'>@@ -525,21 +601,108 @@ enum bcm63xx_irq {</div><div class='ctx'> #define BCM_6358_TIMER_IRQ		(IRQ_INTERNAL_BASE + 0)</div><div class='ctx'> #define BCM_6358_UART0_IRQ		(IRQ_INTERNAL_BASE + 2)</div><div class='ctx'> #define BCM_6358_UART1_IRQ		(IRQ_INTERNAL_BASE + 3)</div><div class='del'>-#define BCM_6358_OHCI0_IRQ		(IRQ_INTERNAL_BASE + 5)</div><div class='del'>-#define BCM_6358_ENET1_IRQ		(IRQ_INTERNAL_BASE + 6)</div><div class='add'>+#define BCM_6358_DSL_IRQ		(IRQ_INTERNAL_BASE + 29)</div><div class='ctx'> #define BCM_6358_ENET0_IRQ		(IRQ_INTERNAL_BASE + 8)</div><div class='add'>+#define BCM_6358_ENET1_IRQ		(IRQ_INTERNAL_BASE + 6)</div><div class='ctx'> #define BCM_6358_ENET_PHY_IRQ		(IRQ_INTERNAL_BASE + 9)</div><div class='add'>+#define BCM_6358_OHCI0_IRQ		(IRQ_INTERNAL_BASE + 5)</div><div class='ctx'> #define BCM_6358_EHCI0_IRQ		(IRQ_INTERNAL_BASE + 10)</div><div class='ctx'> #define BCM_6358_ENET0_RXDMA_IRQ	(IRQ_INTERNAL_BASE + 15)</div><div class='ctx'> #define BCM_6358_ENET0_TXDMA_IRQ	(IRQ_INTERNAL_BASE + 16)</div><div class='ctx'> #define BCM_6358_ENET1_RXDMA_IRQ	(IRQ_INTERNAL_BASE + 17)</div><div class='ctx'> #define BCM_6358_ENET1_TXDMA_IRQ	(IRQ_INTERNAL_BASE + 18)</div><div class='del'>-#define BCM_6358_DSL_IRQ		(IRQ_INTERNAL_BASE + 29)</div><div class='ctx'> #define BCM_6358_PCI_IRQ		(IRQ_INTERNAL_BASE + 31)</div><div class='ctx'> #define BCM_6358_PCMCIA_IRQ		(IRQ_INTERNAL_BASE + 24)</div><div class='add'>+#define BCM_6358_ATM_IRQ		(IRQ_INTERNAL_BASE + 19)</div><div class='add'>+#define BCM_6358_ENETSW_RXDMA0_IRQ	0</div><div class='add'>+#define BCM_6358_ENETSW_RXDMA1_IRQ	0</div><div class='add'>+#define BCM_6358_ENETSW_RXDMA2_IRQ	0</div><div class='add'>+#define BCM_6358_ENETSW_RXDMA3_IRQ	0</div><div class='add'>+#define BCM_6358_ENETSW_TXDMA0_IRQ	0</div><div class='add'>+#define BCM_6358_ENETSW_TXDMA1_IRQ	0</div><div class='add'>+#define BCM_6358_ENETSW_TXDMA2_IRQ	0</div><div class='add'>+#define BCM_6358_ENETSW_TXDMA3_IRQ	0</div><div class='add'>+#define BCM_6358_XTM_IRQ		0</div><div class='add'>+#define BCM_6358_XTM_DMA0_IRQ		0</div><div class='add'>+</div><div class='add'>+#define BCM_6358_PCM_DMA0_IRQ		(IRQ_INTERNAL_BASE + 23)</div><div class='add'>+#define BCM_6358_PCM_DMA1_IRQ		(IRQ_INTERNAL_BASE + 24)</div><div class='add'>+#define BCM_6358_EXT_IRQ0		(IRQ_INTERNAL_BASE + 25)</div><div class='add'>+#define BCM_6358_EXT_IRQ1		(IRQ_INTERNAL_BASE + 26)</div><div class='add'>+#define BCM_6358_EXT_IRQ2		(IRQ_INTERNAL_BASE + 27)</div><div class='add'>+#define BCM_6358_EXT_IRQ3		(IRQ_INTERNAL_BASE + 28)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 6368 irqs</div><div class='add'>+ */</div><div class='add'>+#define BCM_6368_HIGH_IRQ_BASE		(IRQ_INTERNAL_BASE + 32)</div><div class='add'>+</div><div class='add'>+#define BCM_6368_TIMER_IRQ		(IRQ_INTERNAL_BASE + 0)</div><div class='add'>+#define BCM_6368_UART0_IRQ		(IRQ_INTERNAL_BASE + 2)</div><div class='add'>+#define BCM_6368_UART1_IRQ		(IRQ_INTERNAL_BASE + 3)</div><div class='add'>+#define BCM_6368_DSL_IRQ		(IRQ_INTERNAL_BASE + 4)</div><div class='add'>+#define BCM_6368_ENET0_IRQ		0</div><div class='add'>+#define BCM_6368_ENET1_IRQ		0</div><div class='add'>+#define BCM_6368_ENET_PHY_IRQ		(IRQ_INTERNAL_BASE + 15)</div><div class='add'>+#define BCM_6368_OHCI0_IRQ		(IRQ_INTERNAL_BASE + 5)</div><div class='add'>+#define BCM_6368_EHCI0_IRQ		(IRQ_INTERNAL_BASE + 7)</div><div class='add'>+#define BCM_6368_PCMCIA_IRQ		0</div><div class='add'>+#define BCM_6368_ENET0_RXDMA_IRQ	0</div><div class='add'>+#define BCM_6368_ENET0_TXDMA_IRQ	0</div><div class='add'>+#define BCM_6368_ENET1_RXDMA_IRQ	0</div><div class='add'>+#define BCM_6368_ENET1_TXDMA_IRQ	0</div><div class='add'>+#define BCM_6368_PCI_IRQ		(IRQ_INTERNAL_BASE + 13)</div><div class='add'>+#define BCM_6368_ATM_IRQ		0</div><div class='add'>+#define BCM_6368_ENETSW_RXDMA0_IRQ	(BCM_6368_HIGH_IRQ_BASE + 0)</div><div class='add'>+#define BCM_6368_ENETSW_RXDMA1_IRQ	(BCM_6368_HIGH_IRQ_BASE + 1)</div><div class='add'>+#define BCM_6368_ENETSW_RXDMA2_IRQ	(BCM_6368_HIGH_IRQ_BASE + 2)</div><div class='add'>+#define BCM_6368_ENETSW_RXDMA3_IRQ	(BCM_6368_HIGH_IRQ_BASE + 3)</div><div class='add'>+#define BCM_6368_ENETSW_TXDMA0_IRQ	(BCM_6368_HIGH_IRQ_BASE + 4)</div><div class='add'>+#define BCM_6368_ENETSW_TXDMA1_IRQ	(BCM_6368_HIGH_IRQ_BASE + 5)</div><div class='add'>+#define BCM_6368_ENETSW_TXDMA2_IRQ	(BCM_6368_HIGH_IRQ_BASE + 6)</div><div class='add'>+#define BCM_6368_ENETSW_TXDMA3_IRQ	(BCM_6368_HIGH_IRQ_BASE + 7)</div><div class='add'>+#define BCM_6368_XTM_IRQ		(IRQ_INTERNAL_BASE + 11)</div><div class='add'>+#define BCM_6368_XTM_DMA0_IRQ		(BCM_6368_HIGH_IRQ_BASE + 8)</div><div class='add'>+</div><div class='add'>+#define BCM_6368_PCM_DMA0_IRQ		(BCM_6368_HIGH_IRQ_BASE + 30)</div><div class='add'>+#define BCM_6368_PCM_DMA1_IRQ		(BCM_6368_HIGH_IRQ_BASE + 31)</div><div class='add'>+#define BCM_6368_EXT_IRQ0		(IRQ_INTERNAL_BASE + 20)</div><div class='add'>+#define BCM_6368_EXT_IRQ1		(IRQ_INTERNAL_BASE + 21)</div><div class='add'>+#define BCM_6368_EXT_IRQ2		(IRQ_INTERNAL_BASE + 22)</div><div class='add'>+#define BCM_6368_EXT_IRQ3		(IRQ_INTERNAL_BASE + 23)</div><div class='add'>+#define BCM_6368_EXT_IRQ4		(IRQ_INTERNAL_BASE + 24)</div><div class='add'>+#define BCM_6368_EXT_IRQ5		(IRQ_INTERNAL_BASE + 25)</div><div class='ctx'> </div><div class='ctx'> extern const int *bcm63xx_irqs;</div><div class='ctx'> </div><div class='add'>+#define __GEN_CPU_IRQ_TABLE(__cpu)					\</div><div class='add'>+	[IRQ_TIMER]		= BCM_## __cpu ##_TIMER_IRQ,		\</div><div class='add'>+	[IRQ_UART0]		= BCM_## __cpu ##_UART0_IRQ,		\</div><div class='add'>+	[IRQ_UART1]		= BCM_## __cpu ##_UART1_IRQ,		\</div><div class='add'>+	[IRQ_DSL]		= BCM_## __cpu ##_DSL_IRQ,		\</div><div class='add'>+	[IRQ_ENET0]		= BCM_## __cpu ##_ENET0_IRQ,		\</div><div class='add'>+	[IRQ_ENET1]		= BCM_## __cpu ##_ENET1_IRQ,		\</div><div class='add'>+	[IRQ_ENET_PHY]		= BCM_## __cpu ##_ENET_PHY_IRQ,		\</div><div class='add'>+	[IRQ_OHCI0]		= BCM_## __cpu ##_OHCI0_IRQ,		\</div><div class='add'>+	[IRQ_EHCI0]		= BCM_## __cpu ##_EHCI0_IRQ,		\</div><div class='add'>+	[IRQ_ENET0_RXDMA]	= BCM_## __cpu ##_ENET0_RXDMA_IRQ,	\</div><div class='add'>+	[IRQ_ENET0_TXDMA]	= BCM_## __cpu ##_ENET0_TXDMA_IRQ,	\</div><div class='add'>+	[IRQ_ENET1_RXDMA]	= BCM_## __cpu ##_ENET1_RXDMA_IRQ,	\</div><div class='add'>+	[IRQ_ENET1_TXDMA]	= BCM_## __cpu ##_ENET1_TXDMA_IRQ,	\</div><div class='add'>+	[IRQ_PCI]		= BCM_## __cpu ##_PCI_IRQ,		\</div><div class='add'>+	[IRQ_PCMCIA]		= BCM_## __cpu ##_PCMCIA_IRQ,		\</div><div class='add'>+	[IRQ_ATM]		= BCM_## __cpu ##_ATM_IRQ,		\</div><div class='add'>+	[IRQ_ENETSW_RXDMA0]	= BCM_## __cpu ##_ENETSW_RXDMA0_IRQ,	\</div><div class='add'>+	[IRQ_ENETSW_RXDMA1]	= BCM_## __cpu ##_ENETSW_RXDMA1_IRQ,	\</div><div class='add'>+	[IRQ_ENETSW_RXDMA2]	= BCM_## __cpu ##_ENETSW_RXDMA2_IRQ,	\</div><div class='add'>+	[IRQ_ENETSW_RXDMA3]	= BCM_## __cpu ##_ENETSW_RXDMA3_IRQ,	\</div><div class='add'>+	[IRQ_ENETSW_TXDMA0]	= BCM_## __cpu ##_ENETSW_TXDMA0_IRQ,	\</div><div class='add'>+	[IRQ_ENETSW_TXDMA1]	= BCM_## __cpu ##_ENETSW_TXDMA1_IRQ,	\</div><div class='add'>+	[IRQ_ENETSW_TXDMA2]	= BCM_## __cpu ##_ENETSW_TXDMA2_IRQ,	\</div><div class='add'>+	[IRQ_ENETSW_TXDMA3]	= BCM_## __cpu ##_ENETSW_TXDMA3_IRQ,	\</div><div class='add'>+	[IRQ_XTM]		= BCM_## __cpu ##_XTM_IRQ,		\</div><div class='add'>+	[IRQ_XTM_DMA0]		= BCM_## __cpu ##_XTM_DMA0_IRQ,		\</div><div class='add'>+</div><div class='ctx'> static inline int bcm63xx_get_irq_number(enum bcm63xx_irq irq)</div><div class='ctx'> {</div><div class='ctx'> 	return bcm63xx_irqs[irq];</div><div class='hunk'>@@ -550,4 +713,8 @@ static inline int bcm63xx_get_irq_number(enum bcm63xx_irq irq)</div><div class='ctx'>  */</div><div class='ctx'> unsigned int bcm63xx_get_memory_size(void);</div><div class='ctx'> </div><div class='add'>+void bcm63xx_machine_halt(void);</div><div class='add'>+</div><div class='add'>+void bcm63xx_machine_reboot(void);</div><div class='add'>+</div><div class='ctx'> #endif /* !BCM63XX_CPU_H_ */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h<br/>index 3999ec0aa7f5..3d5de96d4036 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h</a></div><div class='hunk'>@@ -14,6 +14,8 @@ static inline unsigned long bcm63xx_gpio_count(void)</div><div class='ctx'> 		return 8;</div><div class='ctx'> 	case BCM6345_CPU_ID:</div><div class='ctx'> 		return 16;</div><div class='add'>+	case BCM6368_CPU_ID:</div><div class='add'>+		return 38;</div><div class='ctx'> 	case BCM6348_CPU_ID:</div><div class='ctx'> 	default:</div><div class='ctx'> 		return 37;</div><div class='head'>diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h<br/>index 91180fac6ed9..72477a6441dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h</a></div><div class='hunk'>@@ -49,9 +49,11 @@</div><div class='ctx'> #define bcm_readb(a)	(*(volatile unsigned char *)	BCM_REGS_VA(a))</div><div class='ctx'> #define bcm_readw(a)	(*(volatile unsigned short *)	BCM_REGS_VA(a))</div><div class='ctx'> #define bcm_readl(a)	(*(volatile unsigned int *)	BCM_REGS_VA(a))</div><div class='add'>+#define bcm_readq(a)	(*(volatile u64 *)		BCM_REGS_VA(a))</div><div class='ctx'> #define bcm_writeb(v, a) (*(volatile unsigned char *) BCM_REGS_VA((a)) = (v))</div><div class='ctx'> #define bcm_writew(v, a) (*(volatile unsigned short *) BCM_REGS_VA((a)) = (v))</div><div class='ctx'> #define bcm_writel(v, a) (*(volatile unsigned int *) BCM_REGS_VA((a)) = (v))</div><div class='add'>+#define bcm_writeq(v, a) (*(volatile u64 *) BCM_REGS_VA((a)) = (v))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * IO helpers to access register set for current CPU</div><div class='head'>diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h<br/>index 5f95577c8213..0c3074b871b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h</a></div><div class='hunk'>@@ -3,13 +3,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;bcm63xx_cpu.h&gt;</div><div class='ctx'> </div><div class='del'>-#define IRQ_MIPS_BASE			0</div><div class='ctx'> #define IRQ_INTERNAL_BASE		8</div><div class='del'>-</div><div class='del'>-#define IRQ_EXT_BASE			(IRQ_MIPS_BASE + 3)</div><div class='del'>-#define IRQ_EXT_0			(IRQ_EXT_BASE + 0)</div><div class='del'>-#define IRQ_EXT_1			(IRQ_EXT_BASE + 1)</div><div class='del'>-#define IRQ_EXT_2			(IRQ_EXT_BASE + 2)</div><div class='del'>-#define IRQ_EXT_3			(IRQ_EXT_BASE + 3)</div><div class='add'>+#define IRQ_EXTERNAL_BASE		100</div><div class='add'>+#define IRQ_EXT_0			(IRQ_EXTERNAL_BASE + 0)</div><div class='add'>+#define IRQ_EXT_1			(IRQ_EXTERNAL_BASE + 1)</div><div class='add'>+#define IRQ_EXT_2			(IRQ_EXTERNAL_BASE + 2)</div><div class='add'>+#define IRQ_EXT_3			(IRQ_EXTERNAL_BASE + 3)</div><div class='ctx'> </div><div class='ctx'> #endif /* ! BCM63XX_IRQ_H_ */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h<br/>index 0ed5230243c9..94d4faad29a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h</a></div><div class='hunk'>@@ -83,30 +83,86 @@</div><div class='ctx'> 					CKCTL_6358_USBSU_EN |		\</div><div class='ctx'> 					CKCTL_6358_EPHY_EN)</div><div class='ctx'> </div><div class='add'>+#define CKCTL_6368_VDSL_QPROC_EN	(1 &lt;&lt; 2)</div><div class='add'>+#define CKCTL_6368_VDSL_AFE_EN		(1 &lt;&lt; 3)</div><div class='add'>+#define CKCTL_6368_VDSL_BONDING_EN	(1 &lt;&lt; 4)</div><div class='add'>+#define CKCTL_6368_VDSL_EN		(1 &lt;&lt; 5)</div><div class='add'>+#define CKCTL_6368_PHYMIPS_EN		(1 &lt;&lt; 6)</div><div class='add'>+#define CKCTL_6368_SWPKT_USB_EN		(1 &lt;&lt; 7)</div><div class='add'>+#define CKCTL_6368_SWPKT_SAR_EN		(1 &lt;&lt; 8)</div><div class='add'>+#define CKCTL_6368_SPI_CLK_EN		(1 &lt;&lt; 9)</div><div class='add'>+#define CKCTL_6368_USBD_CLK_EN		(1 &lt;&lt; 10)</div><div class='add'>+#define CKCTL_6368_SAR_CLK_EN		(1 &lt;&lt; 11)</div><div class='add'>+#define CKCTL_6368_ROBOSW_CLK_EN	(1 &lt;&lt; 12)</div><div class='add'>+#define CKCTL_6368_UTOPIA_CLK_EN	(1 &lt;&lt; 13)</div><div class='add'>+#define CKCTL_6368_PCM_CLK_EN		(1 &lt;&lt; 14)</div><div class='add'>+#define CKCTL_6368_USBH_CLK_EN		(1 &lt;&lt; 15)</div><div class='add'>+#define CKCTL_6368_DISABLE_GLESS_EN	(1 &lt;&lt; 16)</div><div class='add'>+#define CKCTL_6368_NAND_CLK_EN		(1 &lt;&lt; 17)</div><div class='add'>+#define CKCTL_6368_IPSEC_CLK_EN		(1 &lt;&lt; 17)</div><div class='add'>+</div><div class='add'>+#define CKCTL_6368_ALL_SAFE_EN		(CKCTL_6368_SWPKT_USB_EN |	\</div><div class='add'>+					CKCTL_6368_SWPKT_SAR_EN |	\</div><div class='add'>+					CKCTL_6368_SPI_CLK_EN |		\</div><div class='add'>+					CKCTL_6368_USBD_CLK_EN |	\</div><div class='add'>+					CKCTL_6368_SAR_CLK_EN |		\</div><div class='add'>+					CKCTL_6368_ROBOSW_CLK_EN |	\</div><div class='add'>+					CKCTL_6368_UTOPIA_CLK_EN |	\</div><div class='add'>+					CKCTL_6368_PCM_CLK_EN |		\</div><div class='add'>+					CKCTL_6368_USBH_CLK_EN |	\</div><div class='add'>+					CKCTL_6368_DISABLE_GLESS_EN |	\</div><div class='add'>+					CKCTL_6368_NAND_CLK_EN |	\</div><div class='add'>+					CKCTL_6368_IPSEC_CLK_EN)</div><div class='add'>+</div><div class='ctx'> /* System PLL Control register  */</div><div class='ctx'> #define PERF_SYS_PLL_CTL_REG		0x8</div><div class='ctx'> #define SYS_PLL_SOFT_RESET		0x1</div><div class='ctx'> </div><div class='ctx'> /* Interrupt Mask register */</div><div class='del'>-#define PERF_IRQMASK_REG		0xc</div><div class='add'>+#define PERF_IRQMASK_6338_REG		0xc</div><div class='add'>+#define PERF_IRQMASK_6345_REG		0xc</div><div class='add'>+#define PERF_IRQMASK_6348_REG		0xc</div><div class='add'>+#define PERF_IRQMASK_6358_REG		0xc</div><div class='add'>+#define PERF_IRQMASK_6368_REG		0x20</div><div class='ctx'> </div><div class='ctx'> /* Interrupt Status register */</div><div class='del'>-#define PERF_IRQSTAT_REG		0x10</div><div class='add'>+#define PERF_IRQSTAT_6338_REG		0x10</div><div class='add'>+#define PERF_IRQSTAT_6345_REG		0x10</div><div class='add'>+#define PERF_IRQSTAT_6348_REG		0x10</div><div class='add'>+#define PERF_IRQSTAT_6358_REG		0x10</div><div class='add'>+#define PERF_IRQSTAT_6368_REG		0x28</div><div class='ctx'> </div><div class='ctx'> /* External Interrupt Configuration register */</div><div class='del'>-#define PERF_EXTIRQ_CFG_REG		0x14</div><div class='add'>+#define PERF_EXTIRQ_CFG_REG_6338	0x14</div><div class='add'>+#define PERF_EXTIRQ_CFG_REG_6348	0x14</div><div class='add'>+#define PERF_EXTIRQ_CFG_REG_6358	0x14</div><div class='add'>+#define PERF_EXTIRQ_CFG_REG_6368	0x18</div><div class='add'>+</div><div class='add'>+#define PERF_EXTIRQ_CFG_REG2_6368	0x1c</div><div class='add'>+</div><div class='add'>+/* for 6348 only */</div><div class='add'>+#define EXTIRQ_CFG_SENSE_6348(x)	(1 &lt;&lt; (x))</div><div class='add'>+#define EXTIRQ_CFG_STAT_6348(x)		(1 &lt;&lt; (x + 5))</div><div class='add'>+#define EXTIRQ_CFG_CLEAR_6348(x)	(1 &lt;&lt; (x + 10))</div><div class='add'>+#define EXTIRQ_CFG_MASK_6348(x)		(1 &lt;&lt; (x + 15))</div><div class='add'>+#define EXTIRQ_CFG_BOTHEDGE_6348(x)	(1 &lt;&lt; (x + 20))</div><div class='add'>+#define EXTIRQ_CFG_LEVELSENSE_6348(x)	(1 &lt;&lt; (x + 25))</div><div class='add'>+#define EXTIRQ_CFG_CLEAR_ALL_6348	(0xf &lt;&lt; 10)</div><div class='add'>+#define EXTIRQ_CFG_MASK_ALL_6348	(0xf &lt;&lt; 15)</div><div class='add'>+</div><div class='add'>+/* for all others */</div><div class='ctx'> #define EXTIRQ_CFG_SENSE(x)		(1 &lt;&lt; (x))</div><div class='del'>-#define EXTIRQ_CFG_STAT(x)		(1 &lt;&lt; (x + 5))</div><div class='del'>-#define EXTIRQ_CFG_CLEAR(x)		(1 &lt;&lt; (x + 10))</div><div class='del'>-#define EXTIRQ_CFG_MASK(x)		(1 &lt;&lt; (x + 15))</div><div class='del'>-#define EXTIRQ_CFG_BOTHEDGE(x)		(1 &lt;&lt; (x + 20))</div><div class='del'>-#define EXTIRQ_CFG_LEVELSENSE(x)	(1 &lt;&lt; (x + 25))</div><div class='del'>-</div><div class='del'>-#define EXTIRQ_CFG_CLEAR_ALL		(0xf &lt;&lt; 10)</div><div class='del'>-#define EXTIRQ_CFG_MASK_ALL		(0xf &lt;&lt; 15)</div><div class='add'>+#define EXTIRQ_CFG_STAT(x)		(1 &lt;&lt; (x + 4))</div><div class='add'>+#define EXTIRQ_CFG_CLEAR(x)		(1 &lt;&lt; (x + 8))</div><div class='add'>+#define EXTIRQ_CFG_MASK(x)		(1 &lt;&lt; (x + 12))</div><div class='add'>+#define EXTIRQ_CFG_BOTHEDGE(x)		(1 &lt;&lt; (x + 16))</div><div class='add'>+#define EXTIRQ_CFG_LEVELSENSE(x)	(1 &lt;&lt; (x + 20))</div><div class='add'>+#define EXTIRQ_CFG_CLEAR_ALL		(0xf &lt;&lt; 8)</div><div class='add'>+#define EXTIRQ_CFG_MASK_ALL		(0xf &lt;&lt; 12)</div><div class='ctx'> </div><div class='ctx'> /* Soft Reset register */</div><div class='ctx'> #define PERF_SOFTRESET_REG		0x28</div><div class='add'>+#define PERF_SOFTRESET_6368_REG		0x10</div><div class='ctx'> </div><div class='ctx'> #define SOFTRESET_6338_SPI_MASK		(1 &lt;&lt; 0)</div><div class='ctx'> #define SOFTRESET_6338_ENET_MASK	(1 &lt;&lt; 2)</div><div class='hunk'>@@ -147,6 +203,15 @@</div><div class='ctx'> 				  SOFTRESET_6348_ACLC_MASK |		\</div><div class='ctx'> 				  SOFTRESET_6348_ADSLMIPSPLL_MASK)</div><div class='ctx'> </div><div class='add'>+#define SOFTRESET_6368_SPI_MASK		(1 &lt;&lt; 0)</div><div class='add'>+#define SOFTRESET_6368_MPI_MASK		(1 &lt;&lt; 3)</div><div class='add'>+#define SOFTRESET_6368_EPHY_MASK	(1 &lt;&lt; 6)</div><div class='add'>+#define SOFTRESET_6368_SAR_MASK		(1 &lt;&lt; 7)</div><div class='add'>+#define SOFTRESET_6368_ENETSW_MASK	(1 &lt;&lt; 10)</div><div class='add'>+#define SOFTRESET_6368_USBS_MASK	(1 &lt;&lt; 11)</div><div class='add'>+#define SOFTRESET_6368_USBH_MASK	(1 &lt;&lt; 12)</div><div class='add'>+#define SOFTRESET_6368_PCM_MASK		(1 &lt;&lt; 13)</div><div class='add'>+</div><div class='ctx'> /* MIPS PLL control register */</div><div class='ctx'> #define PERF_MIPSPLLCTL_REG		0x34</div><div class='ctx'> #define MIPSPLLCTL_N1_SHIFT		20</div><div class='hunk'>@@ -372,6 +437,7 @@</div><div class='ctx'> #define GPIO_CTL_LO_REG			0x4</div><div class='ctx'> #define GPIO_DATA_HI_REG		0x8</div><div class='ctx'> #define GPIO_DATA_LO_REG		0xC</div><div class='add'>+#define GPIO_DATA_LO_REG_6345		0x8</div><div class='ctx'> </div><div class='ctx'> /* GPIO mux registers and constants */</div><div class='ctx'> #define GPIO_MODE_REG			0x18</div><div class='hunk'>@@ -402,6 +468,44 @@</div><div class='ctx'> #define GPIO_MODE_6358_SERIAL_LED	(1 &lt;&lt; 10)</div><div class='ctx'> #define GPIO_MODE_6358_UTOPIA		(1 &lt;&lt; 12)</div><div class='ctx'> </div><div class='add'>+#define GPIO_MODE_6368_ANALOG_AFE_0	(1 &lt;&lt; 0)</div><div class='add'>+#define GPIO_MODE_6368_ANALOG_AFE_1	(1 &lt;&lt; 1)</div><div class='add'>+#define GPIO_MODE_6368_SYS_IRQ		(1 &lt;&lt; 2)</div><div class='add'>+#define GPIO_MODE_6368_SERIAL_LED_DATA	(1 &lt;&lt; 3)</div><div class='add'>+#define GPIO_MODE_6368_SERIAL_LED_CLK	(1 &lt;&lt; 4)</div><div class='add'>+#define GPIO_MODE_6368_INET_LED		(1 &lt;&lt; 5)</div><div class='add'>+#define GPIO_MODE_6368_EPHY0_LED	(1 &lt;&lt; 6)</div><div class='add'>+#define GPIO_MODE_6368_EPHY1_LED	(1 &lt;&lt; 7)</div><div class='add'>+#define GPIO_MODE_6368_EPHY2_LED	(1 &lt;&lt; 8)</div><div class='add'>+#define GPIO_MODE_6368_EPHY3_LED	(1 &lt;&lt; 9)</div><div class='add'>+#define GPIO_MODE_6368_ROBOSW_LED_DAT	(1 &lt;&lt; 10)</div><div class='add'>+#define GPIO_MODE_6368_ROBOSW_LED_CLK	(1 &lt;&lt; 11)</div><div class='add'>+#define GPIO_MODE_6368_ROBOSW_LED0	(1 &lt;&lt; 12)</div><div class='add'>+#define GPIO_MODE_6368_ROBOSW_LED1	(1 &lt;&lt; 13)</div><div class='add'>+#define GPIO_MODE_6368_USBD_LED		(1 &lt;&lt; 14)</div><div class='add'>+#define GPIO_MODE_6368_NTR_PULSE	(1 &lt;&lt; 15)</div><div class='add'>+#define GPIO_MODE_6368_PCI_REQ1		(1 &lt;&lt; 16)</div><div class='add'>+#define GPIO_MODE_6368_PCI_GNT1		(1 &lt;&lt; 17)</div><div class='add'>+#define GPIO_MODE_6368_PCI_INTB		(1 &lt;&lt; 18)</div><div class='add'>+#define GPIO_MODE_6368_PCI_REQ0		(1 &lt;&lt; 19)</div><div class='add'>+#define GPIO_MODE_6368_PCI_GNT0		(1 &lt;&lt; 20)</div><div class='add'>+#define GPIO_MODE_6368_PCMCIA_CD1	(1 &lt;&lt; 22)</div><div class='add'>+#define GPIO_MODE_6368_PCMCIA_CD2	(1 &lt;&lt; 23)</div><div class='add'>+#define GPIO_MODE_6368_PCMCIA_VS1	(1 &lt;&lt; 24)</div><div class='add'>+#define GPIO_MODE_6368_PCMCIA_VS2	(1 &lt;&lt; 25)</div><div class='add'>+#define GPIO_MODE_6368_EBI_CS2		(1 &lt;&lt; 26)</div><div class='add'>+#define GPIO_MODE_6368_EBI_CS3		(1 &lt;&lt; 27)</div><div class='add'>+#define GPIO_MODE_6368_SPI_SSN2		(1 &lt;&lt; 28)</div><div class='add'>+#define GPIO_MODE_6368_SPI_SSN3		(1 &lt;&lt; 29)</div><div class='add'>+#define GPIO_MODE_6368_SPI_SSN4		(1 &lt;&lt; 30)</div><div class='add'>+#define GPIO_MODE_6368_SPI_SSN5		(1 &lt;&lt; 31)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define GPIO_BASEMODE_6368_REG		0x38</div><div class='add'>+#define GPIO_BASEMODE_6368_UART2	0x1</div><div class='add'>+#define GPIO_BASEMODE_6368_GPIO		0x0</div><div class='add'>+#define GPIO_BASEMODE_6368_MASK		0x7</div><div class='add'>+/* those bits must be kept as read in gpio basemode register*/</div><div class='ctx'> </div><div class='ctx'> /*************************************************************************</div><div class='ctx'>  * _REG relative to RSET_ENET</div><div class='hunk'>@@ -548,6 +652,56 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*************************************************************************</div><div class='add'>+ * _REG relative to RSET_ENETDMAC</div><div class='add'>+ *************************************************************************/</div><div class='add'>+</div><div class='add'>+/* Channel Configuration register */</div><div class='add'>+#define ENETDMAC_CHANCFG_REG(x)		((x) * 0x10)</div><div class='add'>+#define ENETDMAC_CHANCFG_EN_SHIFT	0</div><div class='add'>+#define ENETDMAC_CHANCFG_EN_MASK	(1 &lt;&lt; ENETDMA_CHANCFG_EN_SHIFT)</div><div class='add'>+#define ENETDMAC_CHANCFG_PKTHALT_SHIFT	1</div><div class='add'>+#define ENETDMAC_CHANCFG_PKTHALT_MASK	(1 &lt;&lt; ENETDMA_CHANCFG_PKTHALT_SHIFT)</div><div class='add'>+</div><div class='add'>+/* Interrupt Control/Status register */</div><div class='add'>+#define ENETDMAC_IR_REG(x)		(0x4 + (x) * 0x10)</div><div class='add'>+#define ENETDMAC_IR_BUFDONE_MASK	(1 &lt;&lt; 0)</div><div class='add'>+#define ENETDMAC_IR_PKTDONE_MASK	(1 &lt;&lt; 1)</div><div class='add'>+#define ENETDMAC_IR_NOTOWNER_MASK	(1 &lt;&lt; 2)</div><div class='add'>+</div><div class='add'>+/* Interrupt Mask register */</div><div class='add'>+#define ENETDMAC_IRMASK_REG(x)		(0x8 + (x) * 0x10)</div><div class='add'>+</div><div class='add'>+/* Maximum Burst Length */</div><div class='add'>+#define ENETDMAC_MAXBURST_REG(x)	(0xc + (x) * 0x10)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*************************************************************************</div><div class='add'>+ * _REG relative to RSET_ENETDMAS</div><div class='add'>+ *************************************************************************/</div><div class='add'>+</div><div class='add'>+/* Ring Start Address register */</div><div class='add'>+#define ENETDMAS_RSTART_REG(x)		((x) * 0x10)</div><div class='add'>+</div><div class='add'>+/* State Ram Word 2 */</div><div class='add'>+#define ENETDMAS_SRAM2_REG(x)		(0x4 + (x) * 0x10)</div><div class='add'>+</div><div class='add'>+/* State Ram Word 3 */</div><div class='add'>+#define ENETDMAS_SRAM3_REG(x)		(0x8 + (x) * 0x10)</div><div class='add'>+</div><div class='add'>+/* State Ram Word 4 */</div><div class='add'>+#define ENETDMAS_SRAM4_REG(x)		(0xc + (x) * 0x10)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*************************************************************************</div><div class='add'>+ * _REG relative to RSET_ENETSW</div><div class='add'>+ *************************************************************************/</div><div class='add'>+</div><div class='add'>+/* MIB register */</div><div class='add'>+#define ENETSW_MIB_REG(x)		(0x2800 + (x) * 4)</div><div class='add'>+#define ENETSW_MIB_REG_COUNT		47</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*************************************************************************</div><div class='ctx'>  * _REG relative to RSET_OHCI_PRIV</div><div class='ctx'>  *************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -562,7 +716,9 @@</div><div class='ctx'>  * _REG relative to RSET_USBH_PRIV</div><div class='ctx'>  *************************************************************************/</div><div class='ctx'> </div><div class='del'>-#define USBH_PRIV_SWAP_REG		0x0</div><div class='add'>+#define USBH_PRIV_SWAP_6358_REG		0x0</div><div class='add'>+#define USBH_PRIV_SWAP_6368_REG		0x1c</div><div class='add'>+</div><div class='ctx'> #define USBH_PRIV_SWAP_EHCI_ENDN_SHIFT	4</div><div class='ctx'> #define USBH_PRIV_SWAP_EHCI_ENDN_MASK	(1 &lt;&lt; USBH_PRIV_SWAP_EHCI_ENDN_SHIFT)</div><div class='ctx'> #define USBH_PRIV_SWAP_EHCI_DATA_SHIFT	3</div><div class='hunk'>@@ -572,7 +728,13 @@</div><div class='ctx'> #define USBH_PRIV_SWAP_OHCI_DATA_SHIFT	0</div><div class='ctx'> #define USBH_PRIV_SWAP_OHCI_DATA_MASK	(1 &lt;&lt; USBH_PRIV_SWAP_OHCI_DATA_SHIFT)</div><div class='ctx'> </div><div class='del'>-#define USBH_PRIV_TEST_REG		0x24</div><div class='add'>+#define USBH_PRIV_TEST_6358_REG		0x24</div><div class='add'>+#define USBH_PRIV_TEST_6368_REG		0x14</div><div class='add'>+</div><div class='add'>+#define USBH_PRIV_SETUP_6368_REG	0x28</div><div class='add'>+#define USBH_PRIV_SETUP_IOC_SHIFT	4</div><div class='add'>+#define USBH_PRIV_SETUP_IOC_MASK	(1 &lt;&lt; USBH_PRIV_SETUP_IOC_SHIFT)</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*************************************************************************</div><div class='hunk'>@@ -734,6 +896,8 @@</div><div class='ctx'> #define SDRAM_CFG_BANK_SHIFT		13</div><div class='ctx'> #define SDRAM_CFG_BANK_MASK		(1 &lt;&lt; SDRAM_CFG_BANK_SHIFT)</div><div class='ctx'> </div><div class='add'>+#define SDRAM_MBASE_REG			0xc</div><div class='add'>+</div><div class='ctx'> #define SDRAM_PRIO_REG			0x2C</div><div class='ctx'> #define SDRAM_PRIO_MIPS_SHIFT		29</div><div class='ctx'> #define SDRAM_PRIO_MIPS_MASK		(1 &lt;&lt; SDRAM_PRIO_MIPS_SHIFT)</div><div class='hunk'>@@ -768,4 +932,45 @@</div><div class='ctx'> #define DMIPSPLLCFG_N2_SHIFT		29</div><div class='ctx'> #define DMIPSPLLCFG_N2_MASK		(0x7 &lt;&lt; DMIPSPLLCFG_N2_SHIFT)</div><div class='ctx'> </div><div class='add'>+#define DDR_DMIPSPLLCFG_6368_REG	0x20</div><div class='add'>+#define DMIPSPLLCFG_6368_P1_SHIFT	0</div><div class='add'>+#define DMIPSPLLCFG_6368_P1_MASK	(0xf &lt;&lt; DMIPSPLLCFG_6368_P1_SHIFT)</div><div class='add'>+#define DMIPSPLLCFG_6368_P2_SHIFT	4</div><div class='add'>+#define DMIPSPLLCFG_6368_P2_MASK	(0xf &lt;&lt; DMIPSPLLCFG_6368_P2_SHIFT)</div><div class='add'>+#define DMIPSPLLCFG_6368_NDIV_SHIFT	16</div><div class='add'>+#define DMIPSPLLCFG_6368_NDIV_MASK	(0x1ff &lt;&lt; DMIPSPLLCFG_6368_NDIV_SHIFT)</div><div class='add'>+</div><div class='add'>+#define DDR_DMIPSPLLDIV_6368_REG	0x24</div><div class='add'>+#define DMIPSPLLDIV_6368_MDIV_SHIFT	0</div><div class='add'>+#define DMIPSPLLDIV_6368_MDIV_MASK	(0xff &lt;&lt; DMIPSPLLDIV_6368_MDIV_SHIFT)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*************************************************************************</div><div class='add'>+ * _REG relative to RSET_M2M</div><div class='add'>+ *************************************************************************/</div><div class='add'>+</div><div class='add'>+#define M2M_RX				0</div><div class='add'>+#define M2M_TX				1</div><div class='add'>+</div><div class='add'>+#define M2M_SRC_REG(x)			((x) * 0x40 + 0x00)</div><div class='add'>+#define M2M_DST_REG(x)			((x) * 0x40 + 0x04)</div><div class='add'>+#define M2M_SIZE_REG(x)			((x) * 0x40 + 0x08)</div><div class='add'>+</div><div class='add'>+#define M2M_CTRL_REG(x)			((x) * 0x40 + 0x0c)</div><div class='add'>+#define M2M_CTRL_ENABLE_MASK		(1 &lt;&lt; 0)</div><div class='add'>+#define M2M_CTRL_IRQEN_MASK		(1 &lt;&lt; 1)</div><div class='add'>+#define M2M_CTRL_ERROR_CLR_MASK		(1 &lt;&lt; 6)</div><div class='add'>+#define M2M_CTRL_DONE_CLR_MASK		(1 &lt;&lt; 7)</div><div class='add'>+#define M2M_CTRL_NOINC_MASK		(1 &lt;&lt; 8)</div><div class='add'>+#define M2M_CTRL_PCMCIASWAP_MASK	(1 &lt;&lt; 9)</div><div class='add'>+#define M2M_CTRL_SWAPBYTE_MASK		(1 &lt;&lt; 10)</div><div class='add'>+#define M2M_CTRL_ENDIAN_MASK		(1 &lt;&lt; 11)</div><div class='add'>+</div><div class='add'>+#define M2M_STAT_REG(x)			((x) * 0x40 + 0x10)</div><div class='add'>+#define M2M_STAT_DONE			(1 &lt;&lt; 0)</div><div class='add'>+#define M2M_STAT_ERROR			(1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+#define M2M_SRCID_REG(x)		((x) * 0x40 + 0x14)</div><div class='add'>+#define M2M_DSTID_REG(x)		((x) * 0x40 + 0x18)</div><div class='add'>+</div><div class='ctx'> #endif /* BCM63XX_REGS_H_ */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h b/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h<br/>index ed72e6a26b73..1e6b587f62c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #define TAGINFO1_LEN		30	/* Length of vendor information field1 in tag */</div><div class='ctx'> #define FLASHLAYOUTVER_LEN	4	/* Length of Flash Layout Version String tag */</div><div class='ctx'> #define TAGINFO2_LEN		16	/* Length of vendor information field2 in tag */</div><div class='del'>-#define CRC_LEN			4	/* Length of CRC in bytes */</div><div class='ctx'> #define ALTTAGINFO_LEN		54	/* Alternate length for vendor information; Pirelli */</div><div class='ctx'> </div><div class='ctx'> #define NUM_PIRELLI		2</div><div class='hunk'>@@ -77,19 +76,19 @@ struct bcm_tag {</div><div class='ctx'> 	/* 192-195: Version flash layout */</div><div class='ctx'> 	char flash_layout_ver[FLASHLAYOUTVER_LEN];</div><div class='ctx'> 	/* 196-199: kernel+rootfs CRC32 */</div><div class='del'>-	char fskernel_crc[CRC_LEN];</div><div class='add'>+	__u32 fskernel_crc;</div><div class='ctx'> 	/* 200-215: Unused except on Alice Gate where is is information */</div><div class='ctx'> 	char information2[TAGINFO2_LEN];</div><div class='ctx'> 	/* 216-219: CRC32 of image less imagetag (kernel for Alice Gate) */</div><div class='del'>-	char image_crc[CRC_LEN];</div><div class='add'>+	__u32 image_crc;</div><div class='ctx'> 	/* 220-223: CRC32 of rootfs partition */</div><div class='del'>-	char rootfs_crc[CRC_LEN];</div><div class='add'>+	__u32 rootfs_crc;</div><div class='ctx'> 	/* 224-227: CRC32 of kernel partition */</div><div class='del'>-	char kernel_crc[CRC_LEN];</div><div class='add'>+	__u32 kernel_crc;</div><div class='ctx'> 	/* 228-235: Unused at present */</div><div class='ctx'> 	char reserved1[8];</div><div class='ctx'> 	/* 236-239: CRC32 of header excluding last 20 bytes */</div><div class='del'>-	char header_crc[CRC_LEN];</div><div class='add'>+	__u32 header_crc;</div><div class='ctx'> 	/* 240-255: Unused at present */</div><div class='ctx'> 	char reserved2[16];</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/mips/include/asm/mach-bcm63xx/ioremap.h b/arch/mips/include/asm/mach-bcm63xx/ioremap.h<br/>new file mode 100644<br/>index 000000000000..ef94ba73646e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-bcm63xx/ioremap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-bcm63xx/ioremap.h</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+#ifndef BCM63XX_IOREMAP_H_</div><div class='add'>+#define BCM63XX_IOREMAP_H_</div><div class='add'>+</div><div class='add'>+#include &lt;bcm63xx_cpu.h&gt;</div><div class='add'>+</div><div class='add'>+static inline phys_t fixup_bigphys_addr(phys_t phys_addr, phys_t size)</div><div class='add'>+{</div><div class='add'>+	return phys_addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int is_bcm63xx_internal_registers(phys_t offset)</div><div class='add'>+{</div><div class='add'>+	switch (bcm63xx_get_cpu_id()) {</div><div class='add'>+	case BCM6338_CPU_ID:</div><div class='add'>+	case BCM6345_CPU_ID:</div><div class='add'>+	case BCM6348_CPU_ID:</div><div class='add'>+	case BCM6358_CPU_ID:</div><div class='add'>+		if (offset &gt;= 0xfff00000)</div><div class='add'>+			return 1;</div><div class='add'>+		break;</div><div class='add'>+	case BCM6368_CPU_ID:</div><div class='add'>+		if (offset &gt;= 0xb0000000 &amp;&amp; offset &lt; 0xb1000000)</div><div class='add'>+			return 1;</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 inline void __iomem *plat_ioremap(phys_t offset, unsigned long size,</div><div class='add'>+					 unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	if (is_bcm63xx_internal_registers(offset))</div><div class='add'>+		return (void __iomem *)offset;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int plat_iounmap(const volatile void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	return is_bcm63xx_internal_registers((unsigned long)addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* BCM63XX_IOREMAP_H_ */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-bcm63xx/irq.h b/arch/mips/include/asm/mach-bcm63xx/irq.h<br/>new file mode 100644<br/>index 000000000000..9332e788a5c9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-bcm63xx/irq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-bcm63xx/irq.h</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+#ifndef __ASM_MACH_BCM63XX_IRQ_H</div><div class='add'>+#define __ASM_MACH_BCM63XX_IRQ_H</div><div class='add'>+</div><div class='add'>+#define NR_IRQS	128</div><div class='add'>+#define MIPS_CPU_IRQ_BASE 0</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/mips/include/asm/mach-db1x00/bcsr.h b/arch/mips/include/asm/mach-db1x00/bcsr.h<br/>index 618d2de02ed3..bb9fc23d853a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-db1x00/bcsr.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-db1x00/bcsr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-db1x00/bcsr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-db1x00/bcsr.h</a></div><div class='hunk'>@@ -34,6 +34,8 @@</div><div class='ctx'> #define PB1200_BCSR_PHYS_ADDR	0x0D800000</div><div class='ctx'> #define PB1200_BCSR_HEXLED_OFS	0x00400000</div><div class='ctx'> </div><div class='add'>+#define DB1300_BCSR_PHYS_ADDR	0x19800000</div><div class='add'>+#define DB1300_BCSR_HEXLED_OFS	0x00400000</div><div class='ctx'> </div><div class='ctx'> enum bcsr_id {</div><div class='ctx'> 	/* BCSR base 1 */</div><div class='hunk'>@@ -105,6 +107,7 @@ enum bcsr_whoami_boards {</div><div class='ctx'> 	BCSR_WHOAMI_PB1200 = BCSR_WHOAMI_PB1200_DDR1,</div><div class='ctx'> 	BCSR_WHOAMI_PB1200_DDR2,</div><div class='ctx'> 	BCSR_WHOAMI_DB1200,</div><div class='add'>+	BCSR_WHOAMI_DB1300,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* STATUS reg.  Unless otherwise noted, they're valid on all boards.</div><div class='hunk'>@@ -118,12 +121,12 @@ enum bcsr_whoami_boards {</div><div class='ctx'> #define BCSR_STATUS_SRAMWIDTH		0x0080</div><div class='ctx'> #define BCSR_STATUS_FLASHBUSY		0x0100</div><div class='ctx'> #define BCSR_STATUS_ROMBUSY		0x0400</div><div class='del'>-#define BCSR_STATUS_SD0WP		0x0400	/* DB1200 */</div><div class='add'>+#define BCSR_STATUS_SD0WP		0x0400	/* DB1200/DB1300:SD1 */</div><div class='ctx'> #define BCSR_STATUS_SD1WP		0x0800</div><div class='ctx'> #define BCSR_STATUS_USBOTGID		0x0800	/* PB/DB1550 */</div><div class='ctx'> #define BCSR_STATUS_DB1000_SWAPBOOT	0x2000</div><div class='del'>-#define BCSR_STATUS_DB1200_SWAPBOOT	0x0040	/* DB1200 */</div><div class='del'>-#define BCSR_STATUS_IDECBLID		0x0200	/* DB1200 */</div><div class='add'>+#define BCSR_STATUS_DB1200_SWAPBOOT	0x0040	/* DB1200/1300 */</div><div class='add'>+#define BCSR_STATUS_IDECBLID		0x0200	/* DB1200/1300 */</div><div class='ctx'> #define BCSR_STATUS_DB1200_U0RXD	0x1000	/* DB1200 */</div><div class='ctx'> #define BCSR_STATUS_DB1200_U1RXD	0x2000	/* DB1200 */</div><div class='ctx'> #define BCSR_STATUS_FLASHDEN		0xC000</div><div class='hunk'>@@ -133,6 +136,11 @@ enum bcsr_whoami_boards {</div><div class='ctx'> #define BCSR_STATUS_PB1550_U1RXD	0x2000	/* PB1550 */</div><div class='ctx'> #define BCSR_STATUS_PB1550_U3RXD	0x8000	/* PB1550 */</div><div class='ctx'> </div><div class='add'>+#define BCSR_STATUS_CFWP		0x4000	/* DB1300 */</div><div class='add'>+#define BCSR_STATUS_USBOCn		0x2000	/* DB1300 */</div><div class='add'>+#define BCSR_STATUS_OTGOCn		0x1000	/* DB1300 */</div><div class='add'>+#define BCSR_STATUS_DCDMARQ		0x0010	/* DB1300 */</div><div class='add'>+#define BCSR_STATUS_IDEDMARQ		0x0020	/* DB1300 */</div><div class='ctx'> </div><div class='ctx'> /* DB/PB1000,1100,1500,1550 */</div><div class='ctx'> #define BCSR_RESETS_PHY0		0x0001</div><div class='hunk'>@@ -155,17 +163,17 @@ enum bcsr_whoami_boards {</div><div class='ctx'> #define BCSR_BOARD_GPIO200RST		0x0400</div><div class='ctx'> #define BCSR_BOARD_PCICLKOUT		0x0800</div><div class='ctx'> #define BCSR_BOARD_PCICFG		0x1000</div><div class='del'>-#define BCSR_BOARD_SPISEL		0x4000	/* PB/DB1550 */</div><div class='add'>+#define BCSR_BOARD_SPISEL		0x2000	/* PB/DB1550 */</div><div class='ctx'> #define BCSR_BOARD_SD0WP		0x4000	/* DB1100 */</div><div class='ctx'> #define BCSR_BOARD_SD1WP		0x8000	/* DB1100 */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* DB/PB1200 */</div><div class='add'>+/* DB/PB1200/1300 */</div><div class='ctx'> #define BCSR_RESETS_ETH			0x0001</div><div class='ctx'> #define BCSR_RESETS_CAMERA		0x0002</div><div class='ctx'> #define BCSR_RESETS_DC			0x0004</div><div class='ctx'> #define BCSR_RESETS_IDE			0x0008</div><div class='del'>-#define BCSR_RESETS_TV			0x0010	/* DB1200 */</div><div class='add'>+#define BCSR_RESETS_TV			0x0010	/* DB1200/1300 */</div><div class='ctx'> /* Not resets but in the same register */</div><div class='ctx'> #define BCSR_RESETS_PWMR1MUX		0x0800	/* DB1200 */</div><div class='ctx'> #define BCSR_RESETS_PB1200_WSCFSM	0x0800	/* PB1200 */</div><div class='hunk'>@@ -174,13 +182,22 @@ enum bcsr_whoami_boards {</div><div class='ctx'> #define BCSR_RESETS_SPISEL		0x4000</div><div class='ctx'> #define BCSR_RESETS_SD1MUX		0x8000	/* PB1200 */</div><div class='ctx'> </div><div class='add'>+#define BCSR_RESETS_VDDQSHDN		0x0200	/* DB1300 */</div><div class='add'>+#define BCSR_RESETS_OTPPGM		0x0400	/* DB1300 */</div><div class='add'>+#define BCSR_RESETS_OTPSCLK		0x0800	/* DB1300 */</div><div class='add'>+#define BCSR_RESETS_OTPWRPROT		0x1000	/* DB1300 */</div><div class='add'>+#define BCSR_RESETS_OTPCSB		0x2000	/* DB1300 */</div><div class='add'>+#define BCSR_RESETS_OTGPWR		0x4000	/* DB1300 */</div><div class='add'>+#define BCSR_RESETS_USBHPWR		0x8000  /* DB1300 */</div><div class='add'>+</div><div class='ctx'> #define BCSR_BOARD_LCDVEE		0x0001</div><div class='ctx'> #define BCSR_BOARD_LCDVDD		0x0002</div><div class='ctx'> #define BCSR_BOARD_LCDBL		0x0004</div><div class='ctx'> #define BCSR_BOARD_CAMSNAP		0x0010</div><div class='ctx'> #define BCSR_BOARD_CAMPWR		0x0020</div><div class='ctx'> #define BCSR_BOARD_SD0PWR		0x0040</div><div class='del'>-</div><div class='add'>+#define BCSR_BOARD_CAMCS		0x0010	/* DB1300 */</div><div class='add'>+#define BCSR_BOARD_HDMI_DE		0x0040	/* DB1300 */</div><div class='ctx'> </div><div class='ctx'> #define BCSR_SWITCHES_DIP		0x00FF</div><div class='ctx'> #define BCSR_SWITCHES_DIP_1		0x0080</div><div class='hunk'>@@ -214,7 +231,10 @@ enum bcsr_whoami_boards {</div><div class='ctx'> #define BCSR_SYSTEM_RESET		0x8000	/* clear to reset */</div><div class='ctx'> #define BCSR_SYSTEM_PWROFF		0x4000	/* set to power off */</div><div class='ctx'> #define BCSR_SYSTEM_VDDI		0x001F	/* PB1xxx boards */</div><div class='del'>-</div><div class='add'>+#define BCSR_SYSTEM_DEBUGCSMASK		0x003F	/* DB1300 */</div><div class='add'>+#define BCSR_SYSTEM_UDMAMODE		0x0100	/* DB1300 */</div><div class='add'>+#define BCSR_SYSTEM_WAKEONIRQ		0x0200	/* DB1300 */</div><div class='add'>+#define BCSR_SYSTEM_VDDI1300		0x3C00	/* DB1300 */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/include/asm/mach-db1x00/db1200.h b/arch/mips/include/asm/mach-db1x00/db1200.h<br/>index 7a39657108c4..b2a8319521e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-db1x00/db1200.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-db1x00/db1200.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-db1x00/db1200.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-db1x00/db1200.h</a></div><div class='hunk'>@@ -43,15 +43,20 @@</div><div class='ctx'> #define BCSR_INT_PC1EJECT	0x0800</div><div class='ctx'> #define BCSR_INT_SD0INSERT	0x1000</div><div class='ctx'> #define BCSR_INT_SD0EJECT	0x2000</div><div class='add'>+#define BCSR_INT_SD1INSERT	0x4000</div><div class='add'>+#define BCSR_INT_SD1EJECT	0x8000</div><div class='ctx'> </div><div class='del'>-#define IDE_PHYS_ADDR		0x18800000</div><div class='ctx'> #define IDE_REG_SHIFT		5</div><div class='ctx'> </div><div class='del'>-#define DB1200_IDE_PHYS_ADDR	IDE_PHYS_ADDR</div><div class='add'>+#define DB1200_IDE_PHYS_ADDR	0x18800000</div><div class='ctx'> #define DB1200_IDE_PHYS_LEN	(16 &lt;&lt; IDE_REG_SHIFT)</div><div class='ctx'> #define DB1200_ETH_PHYS_ADDR	0x19000300</div><div class='ctx'> #define DB1200_NAND_PHYS_ADDR	0x20000000</div><div class='ctx'> </div><div class='add'>+#define PB1200_IDE_PHYS_ADDR	0x0C800000</div><div class='add'>+#define PB1200_ETH_PHYS_ADDR	0x0D000300</div><div class='add'>+#define PB1200_NAND_PHYS_ADDR	0x1C000000</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * External Interrupts for DBAu1200 as of 8/6/2004.</div><div class='ctx'>  * Bit positions in the CPLD registers can be calculated by taking</div><div class='hunk'>@@ -77,6 +82,8 @@ enum external_db1200_ints {</div><div class='ctx'> 	DB1200_PC1_EJECT_INT,</div><div class='ctx'> 	DB1200_SD0_INSERT_INT,</div><div class='ctx'> 	DB1200_SD0_EJECT_INT,</div><div class='add'>+	PB1200_SD1_INSERT_INT,</div><div class='add'>+	PB1200_SD1_EJECT_INT,</div><div class='ctx'> </div><div class='ctx'> 	DB1200_INT_END		= DB1200_INT_BEGIN + 15,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/mips/include/asm/mach-db1x00/db1300.h b/arch/mips/include/asm/mach-db1x00/db1300.h<br/>new file mode 100644<br/>index 000000000000..7fe5fb3ba877<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-db1x00/db1300.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-db1x00/db1300.h</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+/*</div><div class='add'>+ * NetLogic DB1300 board constants</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DB1300_H_</div><div class='add'>+#define _DB1300_H_</div><div class='add'>+</div><div class='add'>+/* FPGA (external mux) interrupt sources */</div><div class='add'>+#define DB1300_FIRST_INT	(ALCHEMY_GPIC_INT_LAST + 1)</div><div class='add'>+#define DB1300_IDE_INT		(DB1300_FIRST_INT + 0)</div><div class='add'>+#define DB1300_ETH_INT		(DB1300_FIRST_INT + 1)</div><div class='add'>+#define DB1300_CF_INT		(DB1300_FIRST_INT + 2)</div><div class='add'>+#define DB1300_VIDEO_INT	(DB1300_FIRST_INT + 4)</div><div class='add'>+#define DB1300_HDMI_INT		(DB1300_FIRST_INT + 5)</div><div class='add'>+#define DB1300_DC_INT		(DB1300_FIRST_INT + 6)</div><div class='add'>+#define DB1300_FLASH_INT	(DB1300_FIRST_INT + 7)</div><div class='add'>+#define DB1300_CF_INSERT_INT	(DB1300_FIRST_INT + 8)</div><div class='add'>+#define DB1300_CF_EJECT_INT	(DB1300_FIRST_INT + 9)</div><div class='add'>+#define DB1300_AC97_INT		(DB1300_FIRST_INT + 10)</div><div class='add'>+#define DB1300_AC97_PEN_INT	(DB1300_FIRST_INT + 11)</div><div class='add'>+#define DB1300_SD1_INSERT_INT	(DB1300_FIRST_INT + 12)</div><div class='add'>+#define DB1300_SD1_EJECT_INT	(DB1300_FIRST_INT + 13)</div><div class='add'>+#define DB1300_OTG_VBUS_OC_INT	(DB1300_FIRST_INT + 14)</div><div class='add'>+#define DB1300_HOST_VBUS_OC_INT	(DB1300_FIRST_INT + 15)</div><div class='add'>+#define DB1300_LAST_INT		(DB1300_FIRST_INT + 15)</div><div class='add'>+</div><div class='add'>+/* SMSC9210 CS */</div><div class='add'>+#define DB1300_ETH_PHYS_ADDR	0x19000000</div><div class='add'>+#define DB1300_ETH_PHYS_END	0x197fffff</div><div class='add'>+</div><div class='add'>+/* ATA CS */</div><div class='add'>+#define DB1300_IDE_PHYS_ADDR	0x18800000</div><div class='add'>+#define DB1300_IDE_REG_SHIFT	5</div><div class='add'>+#define DB1300_IDE_PHYS_LEN	(16 &lt;&lt; DB1300_IDE_REG_SHIFT)</div><div class='add'>+</div><div class='add'>+/* NAND CS */</div><div class='add'>+#define DB1300_NAND_PHYS_ADDR	0x20000000</div><div class='add'>+#define DB1300_NAND_PHYS_END	0x20000fff</div><div class='add'>+</div><div class='add'>+#endif	/* _DB1300_H_ */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-db1x00/db1x00.h b/arch/mips/include/asm/mach-db1x00/db1x00.h<br/>deleted file mode 100644<br/>index a5affb0568ef..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-db1x00/db1x00.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-db1x00/db1x00.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,79 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * AMD Alchemy DBAu1x00 Reference Boards</div><div class='del'>- *</div><div class='del'>- * Copyright 2001, 2008 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='del'>- * Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)</div><div class='del'>- *</div><div class='del'>- * ########################################################################</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can distribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License (Version 2) as</div><div class='del'>- *  published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope it will be useful, but WITHOUT</div><div class='del'>- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License</div><div class='del'>- *  for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License along</div><div class='del'>- *  with this program; if not, write to the 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'>- * ########################################################################</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#ifndef __ASM_DB1X00_H</div><div class='del'>-#define __ASM_DB1X00_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-au1x00/au1xxx_psc.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MIPS_DB1550</div><div class='del'>-</div><div class='del'>-#define DBDMA_AC97_TX_CHAN	AU1550_DSCR_CMD0_PSC1_TX</div><div class='del'>-#define DBDMA_AC97_RX_CHAN	AU1550_DSCR_CMD0_PSC1_RX</div><div class='del'>-#define DBDMA_I2S_TX_CHAN	AU1550_DSCR_CMD0_PSC3_TX</div><div class='del'>-#define DBDMA_I2S_RX_CHAN	AU1550_DSCR_CMD0_PSC3_RX</div><div class='del'>-</div><div class='del'>-#define SPI_PSC_BASE		AU1550_PSC0_PHYS_ADDR</div><div class='del'>-#define AC97_PSC_BASE		AU1550_PSC1_PHYS_ADDR</div><div class='del'>-#define SMBUS_PSC_BASE		AU1550_PSC2_PHYS_ADDR</div><div class='del'>-#define I2S_PSC_BASE		AU1550_PSC3_PHYS_ADDR</div><div class='del'>-</div><div class='del'>-#define NAND_PHYS_ADDR		0x20000000</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * NAND defines</div><div class='del'>- *</div><div class='del'>- * Timing values as described in databook, * ns value stripped of the</div><div class='del'>- * lower 2 bits.</div><div class='del'>- * These defines are here rather than an Au1550 generic file because</div><div class='del'>- * the parts chosen on another board may be different and may require</div><div class='del'>- * different timings.</div><div class='del'>- */</div><div class='del'>-#define NAND_T_H		(18 &gt;&gt; 2)</div><div class='del'>-#define NAND_T_PUL		(30 &gt;&gt; 2)</div><div class='del'>-#define NAND_T_SU		(30 &gt;&gt; 2)</div><div class='del'>-#define NAND_T_WH		(30 &gt;&gt; 2)</div><div class='del'>-</div><div class='del'>-/* Bitfield shift amounts */</div><div class='del'>-#define NAND_T_H_SHIFT		0</div><div class='del'>-#define NAND_T_PUL_SHIFT	4</div><div class='del'>-#define NAND_T_SU_SHIFT		8</div><div class='del'>-#define NAND_T_WH_SHIFT		12</div><div class='del'>-</div><div class='del'>-#define NAND_TIMING	(((NAND_T_H   &amp; 0xF) &lt;&lt; NAND_T_H_SHIFT)   | \</div><div class='del'>-			 ((NAND_T_PUL &amp; 0xF) &lt;&lt; NAND_T_PUL_SHIFT) | \</div><div class='del'>-			 ((NAND_T_SU  &amp; 0xF) &lt;&lt; NAND_T_SU_SHIFT)  | \</div><div class='del'>-			 ((NAND_T_WH  &amp; 0xF) &lt;&lt; NAND_T_WH_SHIFT))</div><div class='del'>-#define NAND_CS 	1</div><div class='del'>-</div><div class='del'>-/* Should be done by YAMON */</div><div class='del'>-#define NAND_STCFG	0x00400005 /* 8-bit NAND */</div><div class='del'>-#define NAND_STTIME	0x00007774 /* valid for 396 MHz SD=2 only */</div><div class='del'>-#define NAND_STADDR	0x12000FFF /* physical address 0x20000000 */</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_DB1X00_H */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-db1x00/irq.h b/arch/mips/include/asm/mach-db1x00/irq.h<br/>new file mode 100644<br/>index 000000000000..15b26693238f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-db1x00/irq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-db1x00/irq.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2003 by Ralf Baechle</div><div class='add'>+ */</div><div class='add'>+#ifndef __ASM_MACH_GENERIC_IRQ_H</div><div class='add'>+#define __ASM_MACH_GENERIC_IRQ_H</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef NR_IRQS</div><div class='add'>+#undef NR_IRQS</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef MIPS_CPU_IRQ_BASE</div><div class='add'>+#define MIPS_CPU_IRQ_BASE 0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* 8 (MIPS) + 128 (au1300) + 16 (cpld) */</div><div class='add'>+#define NR_IRQS 152</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_MACH_GENERIC_IRQ_H */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-generic/floppy.h b/arch/mips/include/asm/mach-generic/floppy.h<br/>index 001a8ce17c17..a38f4d43e5e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-generic/floppy.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-generic/floppy.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-generic/floppy.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-generic/floppy.h</a></div><div class='hunk'>@@ -98,7 +98,7 @@ static inline void fd_disable_irq(void)</div><div class='ctx'> static inline int fd_request_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	return request_irq(FLOPPY_IRQ, floppy_interrupt,</div><div class='del'>-	                   IRQF_DISABLED, "floppy", NULL);</div><div class='add'>+	                   0, "floppy", NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void fd_free_irq(void)</div><div class='head'>diff --git a/arch/mips/include/asm/mach-jazz/floppy.h b/arch/mips/include/asm/mach-jazz/floppy.h<br/>index 56e9ca6ae426..88b5acb75145 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-jazz/floppy.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-jazz/floppy.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-jazz/floppy.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-jazz/floppy.h</a></div><div class='hunk'>@@ -90,7 +90,7 @@ static inline void fd_disable_irq(void)</div><div class='ctx'> static inline int fd_request_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	return request_irq(FLOPPY_IRQ, floppy_interrupt,</div><div class='del'>-	                   IRQF_DISABLED, "floppy", NULL);</div><div class='add'>+	                   0, "floppy", NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void fd_free_irq(void)</div><div class='head'>diff --git a/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h b/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h<br/>index 3b728275b9b0..d193fb68cf27 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h</a></div><div class='hunk'>@@ -24,24 +24,33 @@</div><div class='ctx'> </div><div class='ctx'> #define cpu_has_llsc		1</div><div class='ctx'> #define cpu_has_vtag_icache	0</div><div class='del'>-#define cpu_has_dc_aliases	0</div><div class='del'>-#define cpu_has_ic_fills_f_dc	0</div><div class='add'>+#define cpu_has_ic_fills_f_dc	1</div><div class='ctx'> #define cpu_has_dsp		0</div><div class='ctx'> #define cpu_has_mipsmt		0</div><div class='del'>-#define cpu_has_userlocal	0</div><div class='del'>-#define cpu_icache_snoops_remote_store	0</div><div class='add'>+#define cpu_icache_snoops_remote_store	1</div><div class='ctx'> </div><div class='del'>-#define cpu_has_nofpuex		0</div><div class='ctx'> #define cpu_has_64bits		1</div><div class='ctx'> </div><div class='ctx'> #define cpu_has_mips32r1	1</div><div class='del'>-#define cpu_has_mips32r2	0</div><div class='ctx'> #define cpu_has_mips64r1	1</div><div class='del'>-#define cpu_has_mips64r2	0</div><div class='ctx'> </div><div class='ctx'> #define cpu_has_inclusive_pcaches	0</div><div class='ctx'> </div><div class='ctx'> #define cpu_dcache_line_size()	32</div><div class='ctx'> #define cpu_icache_line_size()	32</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_CPU_XLR)</div><div class='add'>+#define cpu_has_userlocal	0</div><div class='add'>+#define cpu_has_dc_aliases	0</div><div class='add'>+#define cpu_has_mips32r2	0</div><div class='add'>+#define cpu_has_mips64r2	0</div><div class='add'>+#elif defined(CONFIG_CPU_XLP)</div><div class='add'>+#define cpu_has_userlocal	1</div><div class='add'>+#define cpu_has_mips32r2	1</div><div class='add'>+#define cpu_has_mips64r2	1</div><div class='add'>+#define cpu_has_dc_aliases	1</div><div class='add'>+#else</div><div class='add'>+#error "Unknown Netlogic CPU"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_MACH_NETLOGIC_CPU_FEATURE_OVERRIDES_H */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-pb1x00/mc146818rtc.h b/arch/mips/include/asm/mach-pb1x00/mc146818rtc.h<br/>deleted file mode 100644<br/>index 622c58710e5b..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-pb1x00/mc146818rtc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-pb1x00/mc146818rtc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</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.  See the file "COPYING" in the main directory of this archive</div><div class='del'>- * for more details.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998, 2001, 03 by Ralf Baechle</div><div class='del'>- *</div><div class='del'>- * RTC routines for PC style attached Dallas chip.</div><div class='del'>- */</div><div class='del'>-#ifndef __ASM_MACH_AU1XX_MC146818RTC_H</div><div class='del'>-#define __ASM_MACH_AU1XX_MC146818RTC_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-</div><div class='del'>-#define RTC_PORT(x)	(0x0c000000 + (x))</div><div class='del'>-#define RTC_IRQ		8</div><div class='del'>-#define PB1500_RTC_ADDR 0x0c000000</div><div class='del'>-</div><div class='del'>-static inline unsigned char CMOS_READ(unsigned long offset)</div><div class='del'>-{</div><div class='del'>-	offset &lt;&lt;= 2;</div><div class='del'>-	return (u8)(au_readl(offset + PB1500_RTC_ADDR) &amp; 0xff);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void CMOS_WRITE(unsigned char data, unsigned long offset)</div><div class='del'>-{</div><div class='del'>-	offset &lt;&lt;= 2;</div><div class='del'>-	au_writel(data, offset + PB1500_RTC_ADDR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define RTC_ALWAYS_BCD	1</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_MACH_AU1XX_MC146818RTC_H */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-pb1x00/pb1000.h b/arch/mips/include/asm/mach-pb1x00/pb1000.h<br/>deleted file mode 100644<br/>index 65059255dc1e..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-pb1x00/pb1000.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-pb1x00/pb1000.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,87 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Alchemy Semi Pb1000 Reference Board</div><div class='del'>- *</div><div class='del'>- * Copyright 2001, 2008 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='del'>- *</div><div class='del'>- * ########################################################################</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can distribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License (Version 2) as</div><div class='del'>- *  published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope it will be useful, but WITHOUT</div><div class='del'>- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License</div><div class='del'>- *  for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License along</div><div class='del'>- *  with this program; if not, write to the 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'>- * ########################################################################</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#ifndef __ASM_PB1000_H</div><div class='del'>-#define __ASM_PB1000_H</div><div class='del'>-</div><div class='del'>-/* PCMCIA PB1000 specific defines */</div><div class='del'>-#define PCMCIA_MAX_SOCK  1</div><div class='del'>-#define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK + 1)</div><div class='del'>-</div><div class='del'>-#define PB1000_PCR		0xBE000000</div><div class='del'>-#  define PCR_SLOT_0_VPP0	(1 &lt;&lt; 0)</div><div class='del'>-#  define PCR_SLOT_0_VPP1	(1 &lt;&lt; 1)</div><div class='del'>-#  define PCR_SLOT_0_VCC0	(1 &lt;&lt; 2)</div><div class='del'>-#  define PCR_SLOT_0_VCC1	(1 &lt;&lt; 3)</div><div class='del'>-#  define PCR_SLOT_0_RST	(1 &lt;&lt; 4)</div><div class='del'>-#  define PCR_SLOT_1_VPP0	(1 &lt;&lt; 8)</div><div class='del'>-#  define PCR_SLOT_1_VPP1	(1 &lt;&lt; 9)</div><div class='del'>-#  define PCR_SLOT_1_VCC0	(1 &lt;&lt; 10)</div><div class='del'>-#  define PCR_SLOT_1_VCC1	(1 &lt;&lt; 11)</div><div class='del'>-#  define PCR_SLOT_1_RST	(1 &lt;&lt; 12)</div><div class='del'>-</div><div class='del'>-#define PB1000_MDR		0xBE000004</div><div class='del'>-#  define MDR_PI		(1 &lt;&lt; 5)	/* PCMCIA int latch  */</div><div class='del'>-#  define MDR_EPI		(1 &lt;&lt; 14)	/* enable PCMCIA int */</div><div class='del'>-#  define MDR_CPI		(1 &lt;&lt; 15)	/* clear  PCMCIA int  */</div><div class='del'>-</div><div class='del'>-#define PB1000_ACR1		0xBE000008</div><div class='del'>-#  define ACR1_SLOT_0_CD1	(1 &lt;&lt; 0)	/* card detect 1	*/</div><div class='del'>-#  define ACR1_SLOT_0_CD2	(1 &lt;&lt; 1)	/* card detect 2	*/</div><div class='del'>-#  define ACR1_SLOT_0_READY	(1 &lt;&lt; 2)	/* ready		*/</div><div class='del'>-#  define ACR1_SLOT_0_STATUS	(1 &lt;&lt; 3)	/* status change	*/</div><div class='del'>-#  define ACR1_SLOT_0_VS1	(1 &lt;&lt; 4)	/* voltage sense 1	*/</div><div class='del'>-#  define ACR1_SLOT_0_VS2	(1 &lt;&lt; 5)	/* voltage sense 2	*/</div><div class='del'>-#  define ACR1_SLOT_0_INPACK	(1 &lt;&lt; 6)	/* inpack pin status	*/</div><div class='del'>-#  define ACR1_SLOT_1_CD1	(1 &lt;&lt; 8)	/* card detect 1	*/</div><div class='del'>-#  define ACR1_SLOT_1_CD2	(1 &lt;&lt; 9)	/* card detect 2	*/</div><div class='del'>-#  define ACR1_SLOT_1_READY	(1 &lt;&lt; 10)	/* ready		*/</div><div class='del'>-#  define ACR1_SLOT_1_STATUS	(1 &lt;&lt; 11)	/* status change	*/</div><div class='del'>-#  define ACR1_SLOT_1_VS1	(1 &lt;&lt; 12)	/* voltage sense 1	*/</div><div class='del'>-#  define ACR1_SLOT_1_VS2	(1 &lt;&lt; 13)	/* voltage sense 2	*/</div><div class='del'>-#  define ACR1_SLOT_1_INPACK	(1 &lt;&lt; 14)	/* inpack pin status	*/</div><div class='del'>-</div><div class='del'>-#define CPLD_AUX0		0xBE00000C</div><div class='del'>-#define CPLD_AUX1		0xBE000010</div><div class='del'>-#define CPLD_AUX2		0xBE000014</div><div class='del'>-</div><div class='del'>-/* Voltage levels */</div><div class='del'>-</div><div class='del'>-/* VPPEN1 - VPPEN0 */</div><div class='del'>-#define VPP_GND ((0 &lt;&lt; 1) | (0 &lt;&lt; 0))</div><div class='del'>-#define VPP_5V	((1 &lt;&lt; 1) | (0 &lt;&lt; 0))</div><div class='del'>-#define VPP_3V	((0 &lt;&lt; 1) | (1 &lt;&lt; 0))</div><div class='del'>-#define VPP_12V ((0 &lt;&lt; 1) | (1 &lt;&lt; 0))</div><div class='del'>-#define VPP_HIZ ((1 &lt;&lt; 1) | (1 &lt;&lt; 0))</div><div class='del'>-</div><div class='del'>-/* VCCEN1 - VCCEN0 */</div><div class='del'>-#define VCC_3V	((0 &lt;&lt; 1) | (1 &lt;&lt; 0))</div><div class='del'>-#define VCC_5V	((1 &lt;&lt; 1) | (0 &lt;&lt; 0))</div><div class='del'>-#define VCC_HIZ ((0 &lt;&lt; 1) | (0 &lt;&lt; 0))</div><div class='del'>-</div><div class='del'>-/* VPP/VCC */</div><div class='del'>-#define SET_VCC_VPP(VCC, VPP, SLOT) \</div><div class='del'>-	((((VCC) &lt;&lt; 2) | ((VPP) &lt;&lt; 0)) &lt;&lt; ((SLOT) * 8))</div><div class='del'>-#endif /* __ASM_PB1000_H */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-pb1x00/pb1200.h b/arch/mips/include/asm/mach-pb1x00/pb1200.h<br/>deleted file mode 100644<br/>index 374416adb65b..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-pb1x00/pb1200.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-pb1x00/pb1200.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,139 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * AMD Alchemy Pb1200 Reference Board</div><div class='del'>- * Board Registers defines.</div><div class='del'>- *</div><div class='del'>- * ########################################################################</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can distribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License (Version 2) as</div><div class='del'>- *  published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope it will be useful, but WITHOUT</div><div class='del'>- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License</div><div class='del'>- *  for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License along</div><div class='del'>- *  with this program; if not, write to the 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'>- * ########################################################################</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#ifndef __ASM_PB1200_H</div><div class='del'>-#define __ASM_PB1200_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1xxx_psc.h&gt;</div><div class='del'>-</div><div class='del'>-#define DBDMA_AC97_TX_CHAN	AU1200_DSCR_CMD0_PSC1_TX</div><div class='del'>-#define DBDMA_AC97_RX_CHAN	AU1200_DSCR_CMD0_PSC1_RX</div><div class='del'>-#define DBDMA_I2S_TX_CHAN	AU1200_DSCR_CMD0_PSC1_TX</div><div class='del'>-#define DBDMA_I2S_RX_CHAN	AU1200_DSCR_CMD0_PSC1_RX</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SPI and SMB are muxed on the Pb1200 board.</div><div class='del'>- * Refer to board documentation.</div><div class='del'>- */</div><div class='del'>-#define SPI_PSC_BASE		AU1550_PSC0_PHYS_ADDR</div><div class='del'>-#define SMBUS_PSC_BASE		AU1550_PSC0_PHYS_ADDR</div><div class='del'>-/*</div><div class='del'>- * AC97 and I2S are muxed on the Pb1200 board.</div><div class='del'>- * Refer to board documentation.</div><div class='del'>- */</div><div class='del'>-#define AC97_PSC_BASE       AU1550_PSC1_PHYS_ADDR</div><div class='del'>-#define I2S_PSC_BASE	AU1550_PSC1_PHYS_ADDR</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define BCSR_SYSTEM_VDDI	0x001F</div><div class='del'>-#define BCSR_SYSTEM_POWEROFF	0x4000</div><div class='del'>-#define BCSR_SYSTEM_RESET	0x8000</div><div class='del'>-</div><div class='del'>-/* Bit positions for the different interrupt sources */</div><div class='del'>-#define BCSR_INT_IDE		0x0001</div><div class='del'>-#define BCSR_INT_ETH		0x0002</div><div class='del'>-#define BCSR_INT_PC0		0x0004</div><div class='del'>-#define BCSR_INT_PC0STSCHG	0x0008</div><div class='del'>-#define BCSR_INT_PC1		0x0010</div><div class='del'>-#define BCSR_INT_PC1STSCHG	0x0020</div><div class='del'>-#define BCSR_INT_DC		0x0040</div><div class='del'>-#define BCSR_INT_FLASHBUSY	0x0080</div><div class='del'>-#define BCSR_INT_PC0INSERT	0x0100</div><div class='del'>-#define BCSR_INT_PC0EJECT	0x0200</div><div class='del'>-#define BCSR_INT_PC1INSERT	0x0400</div><div class='del'>-#define BCSR_INT_PC1EJECT	0x0800</div><div class='del'>-#define BCSR_INT_SD0INSERT	0x1000</div><div class='del'>-#define BCSR_INT_SD0EJECT	0x2000</div><div class='del'>-#define BCSR_INT_SD1INSERT	0x4000</div><div class='del'>-#define BCSR_INT_SD1EJECT	0x8000</div><div class='del'>-</div><div class='del'>-#define SMC91C111_PHYS_ADDR	0x0D000300</div><div class='del'>-#define SMC91C111_INT		PB1200_ETH_INT</div><div class='del'>-</div><div class='del'>-#define IDE_PHYS_ADDR		0x0C800000</div><div class='del'>-#define IDE_REG_SHIFT		5</div><div class='del'>-#define IDE_PHYS_LEN		(16 &lt;&lt; IDE_REG_SHIFT)</div><div class='del'>-#define IDE_INT 		PB1200_IDE_INT</div><div class='del'>-</div><div class='del'>-#define NAND_PHYS_ADDR 	0x1C000000</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Timing values as described in databook, * ns value stripped of</div><div class='del'>- * lower 2 bits.</div><div class='del'>- * These defines are here rather than an Au1200 generic file because</div><div class='del'>- * the parts chosen on another board may be different and may require</div><div class='del'>- * different timings.</div><div class='del'>- */</div><div class='del'>-#define NAND_T_H		(18 &gt;&gt; 2)</div><div class='del'>-#define NAND_T_PUL		(30 &gt;&gt; 2)</div><div class='del'>-#define NAND_T_SU		(30 &gt;&gt; 2)</div><div class='del'>-#define NAND_T_WH		(30 &gt;&gt; 2)</div><div class='del'>-</div><div class='del'>-/* Bitfield shift amounts */</div><div class='del'>-#define NAND_T_H_SHIFT		0</div><div class='del'>-#define NAND_T_PUL_SHIFT	4</div><div class='del'>-#define NAND_T_SU_SHIFT		8</div><div class='del'>-#define NAND_T_WH_SHIFT		12</div><div class='del'>-</div><div class='del'>-#define NAND_TIMING	(((NAND_T_H   &amp; 0xF) &lt;&lt; NAND_T_H_SHIFT)   | \</div><div class='del'>-			 ((NAND_T_PUL &amp; 0xF) &lt;&lt; NAND_T_PUL_SHIFT) | \</div><div class='del'>-			 ((NAND_T_SU  &amp; 0xF) &lt;&lt; NAND_T_SU_SHIFT)  | \</div><div class='del'>-			 ((NAND_T_WH  &amp; 0xF) &lt;&lt; NAND_T_WH_SHIFT))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * External Interrupts for Pb1200 as of 8/6/2004.</div><div class='del'>- * Bit positions in the CPLD registers can be calculated by taking</div><div class='del'>- * the interrupt define and subtracting the PB1200_INT_BEGIN value.</div><div class='del'>- *</div><div class='del'>- *   Example: IDE bis pos is  = 64 - 64</div><div class='del'>- *            ETH bit pos is  = 65 - 64</div><div class='del'>- */</div><div class='del'>-enum external_pb1200_ints {</div><div class='del'>-	PB1200_INT_BEGIN	= AU1000_MAX_INTR + 1,</div><div class='del'>-</div><div class='del'>-	PB1200_IDE_INT		= PB1200_INT_BEGIN,</div><div class='del'>-	PB1200_ETH_INT,</div><div class='del'>-	PB1200_PC0_INT,</div><div class='del'>-	PB1200_PC0_STSCHG_INT,</div><div class='del'>-	PB1200_PC1_INT,</div><div class='del'>-	PB1200_PC1_STSCHG_INT,</div><div class='del'>-	PB1200_DC_INT,</div><div class='del'>-	PB1200_FLASHBUSY_INT,</div><div class='del'>-	PB1200_PC0_INSERT_INT,</div><div class='del'>-	PB1200_PC0_EJECT_INT,</div><div class='del'>-	PB1200_PC1_INSERT_INT,</div><div class='del'>-	PB1200_PC1_EJECT_INT,</div><div class='del'>-	PB1200_SD0_INSERT_INT,</div><div class='del'>-	PB1200_SD0_EJECT_INT,</div><div class='del'>-	PB1200_SD1_INSERT_INT,</div><div class='del'>-	PB1200_SD1_EJECT_INT,</div><div class='del'>-</div><div class='del'>-	PB1200_INT_END		= PB1200_INT_BEGIN + 15</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* NAND chip select */</div><div class='del'>-#define NAND_CS 1</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_PB1200_H */</div><div class='head'>diff --git a/arch/mips/include/asm/mach-pb1x00/pb1550.h b/arch/mips/include/asm/mach-pb1x00/pb1550.h<br/>deleted file mode 100644<br/>index 443b88adebf1..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mach-pb1x00/pb1550.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mach-pb1x00/pb1550.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * AMD Alchemy Semi PB1550 Reference Board</div><div class='del'>- * Board Registers defines.</div><div class='del'>- *</div><div class='del'>- * Copyright 2004 Embedded Edge LLC.</div><div class='del'>- * Copyright 2005 Ralf Baechle (ralf@linux-mips.org)</div><div class='del'>- *</div><div class='del'>- * ########################################################################</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can distribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License (Version 2) as</div><div class='del'>- *  published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope it will be useful, but WITHOUT</div><div class='del'>- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License</div><div class='del'>- *  for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License along</div><div class='del'>- *  with this program; if not, write to the 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'>- * ########################################################################</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#ifndef __ASM_PB1550_H</div><div class='del'>-#define __ASM_PB1550_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1xxx_psc.h&gt;</div><div class='del'>-</div><div class='del'>-#define DBDMA_AC97_TX_CHAN	AU1550_DSCR_CMD0_PSC1_TX</div><div class='del'>-#define DBDMA_AC97_RX_CHAN	AU1550_DSCR_CMD0_PSC1_RX</div><div class='del'>-#define DBDMA_I2S_TX_CHAN	AU1550_DSCR_CMD0_PSC3_TX</div><div class='del'>-#define DBDMA_I2S_RX_CHAN	AU1550_DSCR_CMD0_PSC3_RX</div><div class='del'>-</div><div class='del'>-#define SPI_PSC_BASE		AU1550_PSC0_PHYS_ADDR</div><div class='del'>-#define AC97_PSC_BASE		AU1550_PSC1_PHYS_ADDR</div><div class='del'>-#define SMBUS_PSC_BASE		AU1550_PSC2_PHYS_ADDR</div><div class='del'>-#define I2S_PSC_BASE		AU1550_PSC3_PHYS_ADDR</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Timing values as described in databook, * ns value stripped of</div><div class='del'>- * lower 2 bits.</div><div class='del'>- * These defines are here rather than an SOC1550 generic file because</div><div class='del'>- * the parts chosen on another board may be different and may require</div><div class='del'>- * different timings.</div><div class='del'>- */</div><div class='del'>-#define NAND_T_H		(18 &gt;&gt; 2)</div><div class='del'>-#define NAND_T_PUL		(30 &gt;&gt; 2)</div><div class='del'>-#define NAND_T_SU		(30 &gt;&gt; 2)</div><div class='del'>-#define NAND_T_WH		(30 &gt;&gt; 2)</div><div class='del'>-</div><div class='del'>-/* Bitfield shift amounts */</div><div class='del'>-#define NAND_T_H_SHIFT		0</div><div class='del'>-#define NAND_T_PUL_SHIFT	4</div><div class='del'>-#define NAND_T_SU_SHIFT		8</div><div class='del'>-#define NAND_T_WH_SHIFT		12</div><div class='del'>-</div><div class='del'>-#define NAND_TIMING	(((NAND_T_H   &amp; 0xF) &lt;&lt; NAND_T_H_SHIFT)   | \</div><div class='del'>-			 ((NAND_T_PUL &amp; 0xF) &lt;&lt; NAND_T_PUL_SHIFT) | \</div><div class='del'>-			 ((NAND_T_SU  &amp; 0xF) &lt;&lt; NAND_T_SU_SHIFT)  | \</div><div class='del'>-			 ((NAND_T_WH  &amp; 0xF) &lt;&lt; NAND_T_WH_SHIFT))</div><div class='del'>-</div><div class='del'>-#define NAND_CS 1</div><div class='del'>-</div><div class='del'>-/* Should be done by YAMON */</div><div class='del'>-#define NAND_STCFG	0x00400005 /* 8-bit NAND */</div><div class='del'>-#define NAND_STTIME	0x00007774 /* valid for 396 MHz SD=2 only */</div><div class='del'>-#define NAND_STADDR	0x12000FFF /* physical address 0x20000000 */</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_PB1550_H */</div><div class='head'>diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h<br/>index 2ea7b817feb8..7f87d824eeb0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mipsregs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/mipsregs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/mipsregs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/mipsregs.h</a></div><div class='hunk'>@@ -1106,7 +1106,7 @@ do {									\</div><div class='ctx'> #define read_c0_brcm_reset()		__read_32bit_c0_register($22, 5)</div><div class='ctx'> #define write_c0_brcm_reset(val)	__write_32bit_c0_register($22, 5, val)</div><div class='ctx'> </div><div class='del'>-/* BMIPS4380 */</div><div class='add'>+/* BMIPS43xx */</div><div class='ctx'> #define read_c0_brcm_cmt_intr()		__read_32bit_c0_register($22, 1)</div><div class='ctx'> #define write_c0_brcm_cmt_intr(val)	__write_32bit_c0_register($22, 1, val)</div><div class='ctx'> </div><div class='hunk'>@@ -1667,6 +1667,13 @@ __BUILD_SET_C0(config)</div><div class='ctx'> __BUILD_SET_C0(intcontrol)</div><div class='ctx'> __BUILD_SET_C0(intctl)</div><div class='ctx'> __BUILD_SET_C0(srsmap)</div><div class='add'>+__BUILD_SET_C0(brcm_config_0)</div><div class='add'>+__BUILD_SET_C0(brcm_bus_pll)</div><div class='add'>+__BUILD_SET_C0(brcm_reset)</div><div class='add'>+__BUILD_SET_C0(brcm_cmt_intr)</div><div class='add'>+__BUILD_SET_C0(brcm_cmt_ctrl)</div><div class='add'>+__BUILD_SET_C0(brcm_config)</div><div class='add'>+__BUILD_SET_C0(brcm_mode)</div><div class='ctx'> </div><div class='ctx'> #endif /* !__ASSEMBLY__ */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/include/asm/module.h b/arch/mips/include/asm/module.h<br/>index bc01a02cacd8..7467d1d933d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/module.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/module.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/module.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/module.h</a></div><div class='hunk'>@@ -74,7 +74,9 @@ search_module_dbetables(unsigned long addr)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CPU_MIPS32_R1</div><div class='add'>+#ifdef CONFIG_CPU_BMIPS</div><div class='add'>+#define MODULE_PROC_FAMILY "BMIPS "</div><div class='add'>+#elif defined CONFIG_CPU_MIPS32_R1</div><div class='ctx'> #define MODULE_PROC_FAMILY "MIPS32_R1 "</div><div class='ctx'> #elif defined CONFIG_CPU_MIPS32_R2</div><div class='ctx'> #define MODULE_PROC_FAMILY "MIPS32_R2 "</div><div class='hunk'>@@ -120,6 +122,8 @@ search_module_dbetables(unsigned long addr)</div><div class='ctx'> #define MODULE_PROC_FAMILY "OCTEON "</div><div class='ctx'> #elif defined CONFIG_CPU_XLR</div><div class='ctx'> #define MODULE_PROC_FAMILY "XLR "</div><div class='add'>+#elif defined CONFIG_CPU_XLP</div><div class='add'>+#define MODULE_PROC_FAMILY "XLP "</div><div class='ctx'> #else</div><div class='ctx'> #error MODULE_PROC_FAMILY undefined for your processor configuration</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/mips/include/asm/netlogic/common.h b/arch/mips/include/asm/netlogic/common.h<br/>new file mode 100644<br/>index 000000000000..fdd2f44c7b59<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/netlogic/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/netlogic/common.h</a></div><div class='hunk'>@@ -0,0 +1,76 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights</div><div class='add'>+ * reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the NetLogic</div><div class='add'>+ * license below:</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in</div><div class='add'>+ *    the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR</div><div class='add'>+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE</div><div class='add'>+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='add'>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='add'>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='add'>+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,</div><div class='add'>+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE</div><div class='add'>+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN</div><div class='add'>+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _NETLOGIC_COMMON_H_</div><div class='add'>+#define _NETLOGIC_COMMON_H_</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Common SMP definitions</div><div class='add'>+ */</div><div class='add'>+#define	RESET_VEC_PHYS		0x1fc00000</div><div class='add'>+#define	RESET_DATA_PHYS		(RESET_VEC_PHYS + (1&lt;&lt;10))</div><div class='add'>+#define	BOOT_THREAD_MODE	0</div><div class='add'>+#define	BOOT_NMI_LOCK		4</div><div class='add'>+#define	BOOT_NMI_HANDLER	8</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+struct irq_desc;</div><div class='add'>+extern struct plat_smp_ops nlm_smp_ops;</div><div class='add'>+extern char nlm_reset_entry[], nlm_reset_entry_end[];</div><div class='add'>+void nlm_smp_function_ipi_handler(unsigned int irq, struct irq_desc *desc);</div><div class='add'>+void nlm_smp_resched_ipi_handler(unsigned int irq, struct irq_desc *desc);</div><div class='add'>+void nlm_smp_irq_init(void);</div><div class='add'>+void nlm_boot_secondary_cpus(void);</div><div class='add'>+int nlm_wakeup_secondary_cpus(u32 wakeup_mask);</div><div class='add'>+void nlm_rmiboot_preboot(void);</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_set_nmi_handler(void *handler)</div><div class='add'>+{</div><div class='add'>+	char *reset_data;</div><div class='add'>+</div><div class='add'>+	reset_data = (char *)CKSEG1ADDR(RESET_DATA_PHYS);</div><div class='add'>+	*(int64_t *)(reset_data + BOOT_NMI_HANDLER) = (long)handler;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Misc.</div><div class='add'>+ */</div><div class='add'>+unsigned int nlm_get_cpu_frequency(void);</div><div class='add'>+</div><div class='add'>+extern unsigned long nlm_common_ebase;</div><div class='add'>+extern int nlm_threads_per_core;</div><div class='add'>+extern uint32_t nlm_cpumask, nlm_coremask;</div><div class='add'>+#endif</div><div class='add'>+#endif /* _NETLOGIC_COMMON_H_ */</div><div class='head'>diff --git a/arch/mips/include/asm/netlogic/haldefs.h b/arch/mips/include/asm/netlogic/haldefs.h<br/>new file mode 100644<br/>index 000000000000..72a0c788b472<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/netlogic/haldefs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/netlogic/haldefs.h</a></div><div class='hunk'>@@ -0,0 +1,163 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights</div><div class='add'>+ * reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the NetLogic</div><div class='add'>+ * license below:</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in</div><div class='add'>+ *    the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR</div><div class='add'>+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE</div><div class='add'>+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='add'>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='add'>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='add'>+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,</div><div class='add'>+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE</div><div class='add'>+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN</div><div class='add'>+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __NLM_HAL_HALDEFS_H__</div><div class='add'>+#define __NLM_HAL_HALDEFS_H__</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This file contains platform specific memory mapped IO implementation</div><div class='add'>+ * and will provide a way to read 32/64 bit memory mapped registers in</div><div class='add'>+ * all ABIs</div><div class='add'>+ */</div><div class='add'>+#if !defined(CONFIG_64BIT) &amp;&amp; defined(CONFIG_CPU_XLP)</div><div class='add'>+#error "o32 compile not supported on XLP yet"</div><div class='add'>+#endif</div><div class='add'>+/*</div><div class='add'>+ * For o32 compilation, we have to disable interrupts and enable KX bit to</div><div class='add'>+ * access 64 bit addresses or data.</div><div class='add'>+ *</div><div class='add'>+ * We need to disable interrupts because we save just the lower 32 bits of</div><div class='add'>+ * registers in  interrupt handling. So if we get hit by an interrupt while</div><div class='add'>+ * using the upper 32 bits of a register, we lose.</div><div class='add'>+ */</div><div class='add'>+static inline uint32_t nlm_save_flags_kx(void)</div><div class='add'>+{</div><div class='add'>+	return change_c0_status(ST0_KX | ST0_IE, ST0_KX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline uint32_t nlm_save_flags_cop2(void)</div><div class='add'>+{</div><div class='add'>+	return change_c0_status(ST0_CU2 | ST0_IE, ST0_CU2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void nlm_restore_flags(uint32_t sr)</div><div class='add'>+{</div><div class='add'>+	write_c0_status(sr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The n64 implementations are simple, the o32 implementations when they</div><div class='add'>+ * are added, will have to disable interrupts and enable KX before doing</div><div class='add'>+ * 64 bit ops.</div><div class='add'>+ */</div><div class='add'>+static inline uint32_t</div><div class='add'>+nlm_read_reg(uint64_t base, uint32_t reg)</div><div class='add'>+{</div><div class='add'>+	volatile uint32_t *addr = (volatile uint32_t *)(long)base + reg;</div><div class='add'>+</div><div class='add'>+	return *addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_write_reg(uint64_t base, uint32_t reg, uint32_t val)</div><div class='add'>+{</div><div class='add'>+	volatile uint32_t *addr = (volatile uint32_t *)(long)base + reg;</div><div class='add'>+</div><div class='add'>+	*addr = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline uint64_t</div><div class='add'>+nlm_read_reg64(uint64_t base, uint32_t reg)</div><div class='add'>+{</div><div class='add'>+	uint64_t addr = base + (reg &gt;&gt; 1) * sizeof(uint64_t);</div><div class='add'>+	volatile uint64_t *ptr = (volatile uint64_t *)(long)addr;</div><div class='add'>+</div><div class='add'>+	return *ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_write_reg64(uint64_t base, uint32_t reg, uint64_t val)</div><div class='add'>+{</div><div class='add'>+	uint64_t addr = base + (reg &gt;&gt; 1) * sizeof(uint64_t);</div><div class='add'>+	volatile uint64_t *ptr = (volatile uint64_t *)(long)addr;</div><div class='add'>+</div><div class='add'>+	*ptr = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Routines to store 32/64 bit values to 64 bit addresses,</div><div class='add'>+ * used when going thru XKPHYS to access registers</div><div class='add'>+ */</div><div class='add'>+static inline uint32_t</div><div class='add'>+nlm_read_reg_xkphys(uint64_t base, uint32_t reg)</div><div class='add'>+{</div><div class='add'>+	return nlm_read_reg(base, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_write_reg_xkphys(uint64_t base, uint32_t reg, uint32_t val)</div><div class='add'>+{</div><div class='add'>+	nlm_write_reg(base, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline uint64_t</div><div class='add'>+nlm_read_reg64_xkphys(uint64_t base, uint32_t reg)</div><div class='add'>+{</div><div class='add'>+	return nlm_read_reg64(base, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_write_reg64_xkphys(uint64_t base, uint32_t reg, uint64_t val)</div><div class='add'>+{</div><div class='add'>+	nlm_write_reg64(base, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Location where IO base is mapped */</div><div class='add'>+extern uint64_t nlm_io_base;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CPU_XLP)</div><div class='add'>+static inline uint64_t</div><div class='add'>+nlm_pcicfg_base(uint32_t devoffset)</div><div class='add'>+{</div><div class='add'>+	return nlm_io_base + devoffset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline uint64_t</div><div class='add'>+nlm_xkphys_map_pcibar0(uint64_t pcibase)</div><div class='add'>+{</div><div class='add'>+	uint64_t paddr;</div><div class='add'>+</div><div class='add'>+	paddr = nlm_read_reg(pcibase, 0x4) &amp; ~0xfu;</div><div class='add'>+	return (uint64_t)0x9000000000000000 | paddr;</div><div class='add'>+}</div><div class='add'>+#elif defined(CONFIG_CPU_XLR)</div><div class='add'>+</div><div class='add'>+static inline uint64_t</div><div class='add'>+nlm_mmio_base(uint32_t devoffset)</div><div class='add'>+{</div><div class='add'>+	return nlm_io_base + devoffset;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/mips/include/asm/netlogic/xlp-hal/bridge.h b/arch/mips/include/asm/netlogic/xlp-hal/bridge.h<br/>new file mode 100644<br/>index 000000000000..ca95133f1ad1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/netlogic/xlp-hal/bridge.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/netlogic/xlp-hal/bridge.h</a></div><div class='hunk'>@@ -0,0 +1,187 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights</div><div class='add'>+ * reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the NetLogic</div><div class='add'>+ * license below:</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in</div><div class='add'>+ *    the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR</div><div class='add'>+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE</div><div class='add'>+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='add'>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='add'>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='add'>+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,</div><div class='add'>+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE</div><div class='add'>+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN</div><div class='add'>+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __NLM_HAL_BRIDGE_H__</div><div class='add'>+#define __NLM_HAL_BRIDGE_H__</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+* @file_name mio.h</div><div class='add'>+* @author Netlogic Microsystems</div><div class='add'>+* @brief Basic definitions of XLP memory and io subsystem</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * BRIDGE specific registers</div><div class='add'>+ *</div><div class='add'>+ * These registers start after the PCIe header, which has 0x40</div><div class='add'>+ * standard entries</div><div class='add'>+ */</div><div class='add'>+#define BRIDGE_MODE			0x00</div><div class='add'>+#define BRIDGE_PCI_CFG_BASE		0x01</div><div class='add'>+#define BRIDGE_PCI_CFG_LIMIT		0x02</div><div class='add'>+#define BRIDGE_PCIE_CFG_BASE		0x03</div><div class='add'>+#define BRIDGE_PCIE_CFG_LIMIT		0x04</div><div class='add'>+#define BRIDGE_BUSNUM_BAR0		0x05</div><div class='add'>+#define BRIDGE_BUSNUM_BAR1		0x06</div><div class='add'>+#define BRIDGE_BUSNUM_BAR2		0x07</div><div class='add'>+#define BRIDGE_BUSNUM_BAR3		0x08</div><div class='add'>+#define BRIDGE_BUSNUM_BAR4		0x09</div><div class='add'>+#define BRIDGE_BUSNUM_BAR5		0x0a</div><div class='add'>+#define BRIDGE_BUSNUM_BAR6		0x0b</div><div class='add'>+#define BRIDGE_FLASH_BAR0		0x0c</div><div class='add'>+#define BRIDGE_FLASH_BAR1		0x0d</div><div class='add'>+#define BRIDGE_FLASH_BAR2		0x0e</div><div class='add'>+#define BRIDGE_FLASH_BAR3		0x0f</div><div class='add'>+#define BRIDGE_FLASH_LIMIT0		0x10</div><div class='add'>+#define BRIDGE_FLASH_LIMIT1		0x11</div><div class='add'>+#define BRIDGE_FLASH_LIMIT2		0x12</div><div class='add'>+#define BRIDGE_FLASH_LIMIT3		0x13</div><div class='add'>+</div><div class='add'>+#define BRIDGE_DRAM_BAR(i)		(0x14 + (i))</div><div class='add'>+#define BRIDGE_DRAM_BAR0		0x14</div><div class='add'>+#define BRIDGE_DRAM_BAR1		0x15</div><div class='add'>+#define BRIDGE_DRAM_BAR2		0x16</div><div class='add'>+#define BRIDGE_DRAM_BAR3		0x17</div><div class='add'>+#define BRIDGE_DRAM_BAR4		0x18</div><div class='add'>+#define BRIDGE_DRAM_BAR5		0x19</div><div class='add'>+#define BRIDGE_DRAM_BAR6		0x1a</div><div class='add'>+#define BRIDGE_DRAM_BAR7		0x1b</div><div class='add'>+</div><div class='add'>+#define BRIDGE_DRAM_LIMIT(i)		(0x1c + (i))</div><div class='add'>+#define BRIDGE_DRAM_LIMIT0		0x1c</div><div class='add'>+#define BRIDGE_DRAM_LIMIT1		0x1d</div><div class='add'>+#define BRIDGE_DRAM_LIMIT2		0x1e</div><div class='add'>+#define BRIDGE_DRAM_LIMIT3		0x1f</div><div class='add'>+#define BRIDGE_DRAM_LIMIT4		0x20</div><div class='add'>+#define BRIDGE_DRAM_LIMIT5		0x21</div><div class='add'>+#define BRIDGE_DRAM_LIMIT6		0x22</div><div class='add'>+#define BRIDGE_DRAM_LIMIT7		0x23</div><div class='add'>+</div><div class='add'>+#define BRIDGE_DRAM_NODE_TRANSLN0	0x24</div><div class='add'>+#define BRIDGE_DRAM_NODE_TRANSLN1	0x25</div><div class='add'>+#define BRIDGE_DRAM_NODE_TRANSLN2	0x26</div><div class='add'>+#define BRIDGE_DRAM_NODE_TRANSLN3	0x27</div><div class='add'>+#define BRIDGE_DRAM_NODE_TRANSLN4	0x28</div><div class='add'>+#define BRIDGE_DRAM_NODE_TRANSLN5	0x29</div><div class='add'>+#define BRIDGE_DRAM_NODE_TRANSLN6	0x2a</div><div class='add'>+#define BRIDGE_DRAM_NODE_TRANSLN7	0x2b</div><div class='add'>+#define BRIDGE_DRAM_CHNL_TRANSLN0	0x2c</div><div class='add'>+#define BRIDGE_DRAM_CHNL_TRANSLN1	0x2d</div><div class='add'>+#define BRIDGE_DRAM_CHNL_TRANSLN2	0x2e</div><div class='add'>+#define BRIDGE_DRAM_CHNL_TRANSLN3	0x2f</div><div class='add'>+#define BRIDGE_DRAM_CHNL_TRANSLN4	0x30</div><div class='add'>+#define BRIDGE_DRAM_CHNL_TRANSLN5	0x31</div><div class='add'>+#define BRIDGE_DRAM_CHNL_TRANSLN6	0x32</div><div class='add'>+#define BRIDGE_DRAM_CHNL_TRANSLN7	0x33</div><div class='add'>+#define BRIDGE_PCIEMEM_BASE0		0x34</div><div class='add'>+#define BRIDGE_PCIEMEM_BASE1		0x35</div><div class='add'>+#define BRIDGE_PCIEMEM_BASE2		0x36</div><div class='add'>+#define BRIDGE_PCIEMEM_BASE3		0x37</div><div class='add'>+#define BRIDGE_PCIEMEM_LIMIT0		0x38</div><div class='add'>+#define BRIDGE_PCIEMEM_LIMIT1		0x39</div><div class='add'>+#define BRIDGE_PCIEMEM_LIMIT2		0x3a</div><div class='add'>+#define BRIDGE_PCIEMEM_LIMIT3		0x3b</div><div class='add'>+#define BRIDGE_PCIEIO_BASE0		0x3c</div><div class='add'>+#define BRIDGE_PCIEIO_BASE1		0x3d</div><div class='add'>+#define BRIDGE_PCIEIO_BASE2		0x3e</div><div class='add'>+#define BRIDGE_PCIEIO_BASE3		0x3f</div><div class='add'>+#define BRIDGE_PCIEIO_LIMIT0		0x40</div><div class='add'>+#define BRIDGE_PCIEIO_LIMIT1		0x41</div><div class='add'>+#define BRIDGE_PCIEIO_LIMIT2		0x42</div><div class='add'>+#define BRIDGE_PCIEIO_LIMIT3		0x43</div><div class='add'>+#define BRIDGE_PCIEMEM_BASE4		0x44</div><div class='add'>+#define BRIDGE_PCIEMEM_BASE5		0x45</div><div class='add'>+#define BRIDGE_PCIEMEM_BASE6		0x46</div><div class='add'>+#define BRIDGE_PCIEMEM_LIMIT4		0x47</div><div class='add'>+#define BRIDGE_PCIEMEM_LIMIT5		0x48</div><div class='add'>+#define BRIDGE_PCIEMEM_LIMIT6		0x49</div><div class='add'>+#define BRIDGE_PCIEIO_BASE4		0x4a</div><div class='add'>+#define BRIDGE_PCIEIO_BASE5		0x4b</div><div class='add'>+#define BRIDGE_PCIEIO_BASE6		0x4c</div><div class='add'>+#define BRIDGE_PCIEIO_LIMIT4		0x4d</div><div class='add'>+#define BRIDGE_PCIEIO_LIMIT5		0x4e</div><div class='add'>+#define BRIDGE_PCIEIO_LIMIT6		0x4f</div><div class='add'>+#define BRIDGE_NBU_EVENT_CNT_CTL	0x50</div><div class='add'>+#define BRIDGE_EVNTCTR1_LOW		0x51</div><div class='add'>+#define BRIDGE_EVNTCTR1_HI		0x52</div><div class='add'>+#define BRIDGE_EVNT_CNT_CTL2		0x53</div><div class='add'>+#define BRIDGE_EVNTCTR2_LOW		0x54</div><div class='add'>+#define BRIDGE_EVNTCTR2_HI		0x55</div><div class='add'>+#define BRIDGE_TRACEBUF_MATCH0		0x56</div><div class='add'>+#define BRIDGE_TRACEBUF_MATCH1		0x57</div><div class='add'>+#define BRIDGE_TRACEBUF_MATCH_LOW	0x58</div><div class='add'>+#define BRIDGE_TRACEBUF_MATCH_HI	0x59</div><div class='add'>+#define BRIDGE_TRACEBUF_CTRL		0x5a</div><div class='add'>+#define BRIDGE_TRACEBUF_INIT		0x5b</div><div class='add'>+#define BRIDGE_TRACEBUF_ACCESS		0x5c</div><div class='add'>+#define BRIDGE_TRACEBUF_READ_DATA0	0x5d</div><div class='add'>+#define BRIDGE_TRACEBUF_READ_DATA1	0x5d</div><div class='add'>+#define BRIDGE_TRACEBUF_READ_DATA2	0x5f</div><div class='add'>+#define BRIDGE_TRACEBUF_READ_DATA3	0x60</div><div class='add'>+#define BRIDGE_TRACEBUF_STATUS		0x61</div><div class='add'>+#define BRIDGE_ADDRESS_ERROR0		0x62</div><div class='add'>+#define BRIDGE_ADDRESS_ERROR1		0x63</div><div class='add'>+#define BRIDGE_ADDRESS_ERROR2		0x64</div><div class='add'>+#define BRIDGE_TAG_ECC_ADDR_ERROR0	0x65</div><div class='add'>+#define BRIDGE_TAG_ECC_ADDR_ERROR1	0x66</div><div class='add'>+#define BRIDGE_TAG_ECC_ADDR_ERROR2	0x67</div><div class='add'>+#define BRIDGE_LINE_FLUSH0		0x68</div><div class='add'>+#define BRIDGE_LINE_FLUSH1		0x69</div><div class='add'>+#define BRIDGE_NODE_ID			0x6a</div><div class='add'>+#define BRIDGE_ERROR_INTERRUPT_EN	0x6b</div><div class='add'>+#define BRIDGE_PCIE0_WEIGHT		0x2c0</div><div class='add'>+#define BRIDGE_PCIE1_WEIGHT		0x2c1</div><div class='add'>+#define BRIDGE_PCIE2_WEIGHT		0x2c2</div><div class='add'>+#define BRIDGE_PCIE3_WEIGHT		0x2c3</div><div class='add'>+#define BRIDGE_USB_WEIGHT		0x2c4</div><div class='add'>+#define BRIDGE_NET_WEIGHT		0x2c5</div><div class='add'>+#define BRIDGE_POE_WEIGHT		0x2c6</div><div class='add'>+#define BRIDGE_CMS_WEIGHT		0x2c7</div><div class='add'>+#define BRIDGE_DMAENG_WEIGHT		0x2c8</div><div class='add'>+#define BRIDGE_SEC_WEIGHT		0x2c9</div><div class='add'>+#define BRIDGE_COMP_WEIGHT		0x2ca</div><div class='add'>+#define BRIDGE_GIO_WEIGHT		0x2cb</div><div class='add'>+#define BRIDGE_FLASH_WEIGHT		0x2cc</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+#define nlm_read_bridge_reg(b, r)	nlm_read_reg(b, r)</div><div class='add'>+#define nlm_write_bridge_reg(b, r, v)	nlm_write_reg(b, r, v)</div><div class='add'>+#define	nlm_get_bridge_pcibase(node)	\</div><div class='add'>+			nlm_pcicfg_base(XLP_IO_BRIDGE_OFFSET(node))</div><div class='add'>+#define	nlm_get_bridge_regbase(node)	\</div><div class='add'>+			(nlm_get_bridge_pcibase(node) + XLP_IO_PCI_HDRSZ)</div><div class='add'>+</div><div class='add'>+#endif /* __ASSEMBLY__ */</div><div class='add'>+#endif /* __NLM_HAL_BRIDGE_H__ */</div><div class='head'>diff --git a/arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h b/arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h<br/>new file mode 100644<br/>index 000000000000..bf7d41deb9be<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h</a></div><div class='hunk'>@@ -0,0 +1,83 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights</div><div class='add'>+ * reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the NetLogic</div><div class='add'>+ * license below:</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in</div><div class='add'>+ *    the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR</div><div class='add'>+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE</div><div class='add'>+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='add'>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='add'>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='add'>+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,</div><div class='add'>+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE</div><div class='add'>+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN</div><div class='add'>+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __NLM_HAL_CPUCONTROL_H__</div><div class='add'>+#define __NLM_HAL_CPUCONTROL_H__</div><div class='add'>+</div><div class='add'>+#define CPU_BLOCKID_IFU		0</div><div class='add'>+#define CPU_BLOCKID_ICU		1</div><div class='add'>+#define CPU_BLOCKID_IEU		2</div><div class='add'>+#define CPU_BLOCKID_LSU		3</div><div class='add'>+#define CPU_BLOCKID_MMU		4</div><div class='add'>+#define CPU_BLOCKID_PRF		5</div><div class='add'>+#define CPU_BLOCKID_SCH		7</div><div class='add'>+#define CPU_BLOCKID_SCU		8</div><div class='add'>+#define CPU_BLOCKID_FPU		9</div><div class='add'>+#define CPU_BLOCKID_MAP		10</div><div class='add'>+</div><div class='add'>+#define LSU_DEFEATURE		0x304</div><div class='add'>+#define LSU_CERRLOG_REGID	0x09</div><div class='add'>+#define SCHED_DEFEATURE		0x700</div><div class='add'>+</div><div class='add'>+/* Offsets of interest from the 'MAP' Block */</div><div class='add'>+#define MAP_THREADMODE			0x00</div><div class='add'>+#define MAP_EXT_EBASE_ENABLE		0x04</div><div class='add'>+#define MAP_CCDI_CONFIG			0x08</div><div class='add'>+#define MAP_THRD0_CCDI_STATUS		0x0c</div><div class='add'>+#define MAP_THRD1_CCDI_STATUS		0x10</div><div class='add'>+#define MAP_THRD2_CCDI_STATUS		0x14</div><div class='add'>+#define MAP_THRD3_CCDI_STATUS		0x18</div><div class='add'>+#define MAP_THRD0_DEBUG_MODE		0x1c</div><div class='add'>+#define MAP_THRD1_DEBUG_MODE		0x20</div><div class='add'>+#define MAP_THRD2_DEBUG_MODE		0x24</div><div class='add'>+#define MAP_THRD3_DEBUG_MODE		0x28</div><div class='add'>+#define MAP_MISC_STATE			0x60</div><div class='add'>+#define MAP_DEBUG_READ_CTL		0x64</div><div class='add'>+#define MAP_DEBUG_READ_REG0		0x68</div><div class='add'>+#define MAP_DEBUG_READ_REG1		0x6c</div><div class='add'>+</div><div class='add'>+#define MMU_SETUP		0x400</div><div class='add'>+#define MMU_LFSRSEED		0x401</div><div class='add'>+#define MMU_HPW_NUM_PAGE_LVL	0x410</div><div class='add'>+#define MMU_PGWKR_PGDBASE	0x411</div><div class='add'>+#define MMU_PGWKR_PGDSHFT	0x412</div><div class='add'>+#define MMU_PGWKR_PGDMASK	0x413</div><div class='add'>+#define MMU_PGWKR_PUDSHFT	0x414</div><div class='add'>+#define MMU_PGWKR_PUDMASK	0x415</div><div class='add'>+#define MMU_PGWKR_PMDSHFT	0x416</div><div class='add'>+#define MMU_PGWKR_PMDMASK	0x417</div><div class='add'>+#define MMU_PGWKR_PTESHFT	0x418</div><div class='add'>+#define MMU_PGWKR_PTEMASK	0x419</div><div class='add'>+</div><div class='add'>+#endif /* __NLM_CPUCONTROL_H__ */</div><div class='head'>diff --git a/arch/mips/include/asm/netlogic/xlp-hal/iomap.h b/arch/mips/include/asm/netlogic/xlp-hal/iomap.h<br/>new file mode 100644<br/>index 000000000000..86cc3391e50c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/netlogic/xlp-hal/iomap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/netlogic/xlp-hal/iomap.h</a></div><div class='hunk'>@@ -0,0 +1,153 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights</div><div class='add'>+ * reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the NetLogic</div><div class='add'>+ * license below:</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in</div><div class='add'>+ *    the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR</div><div class='add'>+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE</div><div class='add'>+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='add'>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='add'>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='add'>+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,</div><div class='add'>+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE</div><div class='add'>+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN</div><div class='add'>+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __NLM_HAL_IOMAP_H__</div><div class='add'>+#define __NLM_HAL_IOMAP_H__</div><div class='add'>+</div><div class='add'>+#define XLP_DEFAULT_IO_BASE             0x18000000</div><div class='add'>+#define NMI_BASE			0xbfc00000</div><div class='add'>+#define	XLP_IO_CLK			133333333</div><div class='add'>+</div><div class='add'>+#define XLP_PCIE_CFG_SIZE		0x1000		/* 4K */</div><div class='add'>+#define XLP_PCIE_DEV_BLK_SIZE		(8 * XLP_PCIE_CFG_SIZE)</div><div class='add'>+#define XLP_PCIE_BUS_BLK_SIZE		(256 * XLP_PCIE_DEV_BLK_SIZE)</div><div class='add'>+#define XLP_IO_SIZE			(64 &lt;&lt; 20)	/* ECFG space size */</div><div class='add'>+#define XLP_IO_PCI_HDRSZ		0x100</div><div class='add'>+#define XLP_IO_DEV(node, dev)		((dev) + (node) * 8)</div><div class='add'>+#define XLP_HDR_OFFSET(node, bus, dev, fn)	(((bus) &lt;&lt; 20) | \</div><div class='add'>+				((XLP_IO_DEV(node, dev)) &lt;&lt; 15) | ((fn) &lt;&lt; 12))</div><div class='add'>+</div><div class='add'>+#define XLP_IO_BRIDGE_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 0, 0)</div><div class='add'>+/* coherent inter chip */</div><div class='add'>+#define XLP_IO_CIC0_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 0, 1)</div><div class='add'>+#define XLP_IO_CIC1_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 0, 2)</div><div class='add'>+#define XLP_IO_CIC2_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 0, 3)</div><div class='add'>+#define XLP_IO_PIC_OFFSET(node)		XLP_HDR_OFFSET(node, 0, 0, 4)</div><div class='add'>+</div><div class='add'>+#define XLP_IO_PCIE_OFFSET(node, i)	XLP_HDR_OFFSET(node, 0, 1, i)</div><div class='add'>+#define XLP_IO_PCIE0_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 1, 0)</div><div class='add'>+#define XLP_IO_PCIE1_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 1, 1)</div><div class='add'>+#define XLP_IO_PCIE2_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 1, 2)</div><div class='add'>+#define XLP_IO_PCIE3_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 1, 3)</div><div class='add'>+</div><div class='add'>+#define XLP_IO_USB_OFFSET(node, i)	XLP_HDR_OFFSET(node, 0, 2, i)</div><div class='add'>+#define XLP_IO_USB_EHCI0_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 2, 0)</div><div class='add'>+#define XLP_IO_USB_OHCI0_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 2, 1)</div><div class='add'>+#define XLP_IO_USB_OHCI1_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 2, 2)</div><div class='add'>+#define XLP_IO_USB_EHCI1_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 2, 3)</div><div class='add'>+#define XLP_IO_USB_OHCI2_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 2, 4)</div><div class='add'>+#define XLP_IO_USB_OHCI3_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 2, 5)</div><div class='add'>+</div><div class='add'>+#define XLP_IO_NAE_OFFSET(node)		XLP_HDR_OFFSET(node, 0, 3, 0)</div><div class='add'>+#define XLP_IO_POE_OFFSET(node)		XLP_HDR_OFFSET(node, 0, 3, 1)</div><div class='add'>+</div><div class='add'>+#define XLP_IO_CMS_OFFSET(node)		XLP_HDR_OFFSET(node, 0, 4, 0)</div><div class='add'>+</div><div class='add'>+#define XLP_IO_DMA_OFFSET(node)		XLP_HDR_OFFSET(node, 0, 5, 1)</div><div class='add'>+#define XLP_IO_SEC_OFFSET(node)		XLP_HDR_OFFSET(node, 0, 5, 2)</div><div class='add'>+#define XLP_IO_CMP_OFFSET(node)		XLP_HDR_OFFSET(node, 0, 5, 3)</div><div class='add'>+</div><div class='add'>+#define XLP_IO_UART_OFFSET(node, i)	XLP_HDR_OFFSET(node, 0, 6, i)</div><div class='add'>+#define XLP_IO_UART0_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 6, 0)</div><div class='add'>+#define XLP_IO_UART1_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 6, 1)</div><div class='add'>+#define XLP_IO_I2C_OFFSET(node, i)	XLP_HDR_OFFSET(node, 0, 6, 2 + i)</div><div class='add'>+#define XLP_IO_I2C0_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 6, 2)</div><div class='add'>+#define XLP_IO_I2C1_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 6, 3)</div><div class='add'>+#define XLP_IO_GPIO_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 6, 4)</div><div class='add'>+/* system management */</div><div class='add'>+#define XLP_IO_SYS_OFFSET(node)		XLP_HDR_OFFSET(node, 0, 6, 5)</div><div class='add'>+#define XLP_IO_JTAG_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 6, 6)</div><div class='add'>+</div><div class='add'>+#define XLP_IO_NOR_OFFSET(node)		XLP_HDR_OFFSET(node, 0, 7, 0)</div><div class='add'>+#define XLP_IO_NAND_OFFSET(node)	XLP_HDR_OFFSET(node, 0, 7, 1)</div><div class='add'>+#define XLP_IO_SPI_OFFSET(node)		XLP_HDR_OFFSET(node, 0, 7, 2)</div><div class='add'>+/* SD flash */</div><div class='add'>+#define XLP_IO_SD_OFFSET(node)          XLP_HDR_OFFSET(node, 0, 7, 3)</div><div class='add'>+#define XLP_IO_MMC_OFFSET(node, slot)   \</div><div class='add'>+		((XLP_IO_SD_OFFSET(node))+(slot*0x100)+XLP_IO_PCI_HDRSZ)</div><div class='add'>+</div><div class='add'>+/* PCI config header register id's */</div><div class='add'>+#define XLP_PCI_CFGREG0			0x00</div><div class='add'>+#define XLP_PCI_CFGREG1			0x01</div><div class='add'>+#define XLP_PCI_CFGREG2			0x02</div><div class='add'>+#define XLP_PCI_CFGREG3			0x03</div><div class='add'>+#define XLP_PCI_CFGREG4			0x04</div><div class='add'>+#define XLP_PCI_CFGREG5			0x05</div><div class='add'>+#define XLP_PCI_DEVINFO_REG0		0x30</div><div class='add'>+#define XLP_PCI_DEVINFO_REG1		0x31</div><div class='add'>+#define XLP_PCI_DEVINFO_REG2		0x32</div><div class='add'>+#define XLP_PCI_DEVINFO_REG3		0x33</div><div class='add'>+#define XLP_PCI_DEVINFO_REG4		0x34</div><div class='add'>+#define XLP_PCI_DEVINFO_REG5		0x35</div><div class='add'>+#define XLP_PCI_DEVINFO_REG6		0x36</div><div class='add'>+#define XLP_PCI_DEVINFO_REG7		0x37</div><div class='add'>+#define XLP_PCI_DEVSCRATCH_REG0		0x38</div><div class='add'>+#define XLP_PCI_DEVSCRATCH_REG1		0x39</div><div class='add'>+#define XLP_PCI_DEVSCRATCH_REG2		0x3a</div><div class='add'>+#define XLP_PCI_DEVSCRATCH_REG3		0x3b</div><div class='add'>+#define XLP_PCI_MSGSTN_REG		0x3c</div><div class='add'>+#define XLP_PCI_IRTINFO_REG		0x3d</div><div class='add'>+#define XLP_PCI_UCODEINFO_REG		0x3e</div><div class='add'>+#define XLP_PCI_SBB_WT_REG		0x3f</div><div class='add'>+</div><div class='add'>+/* PCI IDs for SoC device */</div><div class='add'>+#define	PCI_VENDOR_NETLOGIC		0x184e</div><div class='add'>+</div><div class='add'>+#define	PCI_DEVICE_ID_NLM_ROOT		0x1001</div><div class='add'>+#define	PCI_DEVICE_ID_NLM_ICI		0x1002</div><div class='add'>+#define	PCI_DEVICE_ID_NLM_PIC		0x1003</div><div class='add'>+#define	PCI_DEVICE_ID_NLM_PCIE		0x1004</div><div class='add'>+#define	PCI_DEVICE_ID_NLM_EHCI		0x1007</div><div class='add'>+#define	PCI_DEVICE_ID_NLM_ILK		0x1008</div><div class='add'>+#define	PCI_DEVICE_ID_NLM_NAE		0x1009</div><div class='add'>+#define	PCI_DEVICE_ID_NLM_POE		0x100A</div><div class='add'>+#define	PCI_DEVICE_ID_NLM_FMN		0x100B</div><div class='add'>+#define	PCI_DEVICE_ID_NLM_RAID		0x100D</div><div class='add'>+#define	PCI_DEVICE_ID_NLM_SAE		0x100D</div><div class='add'>+#define	PCI_DEVICE_ID_NLM_RSA		0x100E</div><div class='add'>+#define	PCI_DEVICE_ID_NLM_CMP		0x100F</div><div class='add'>+#define	PCI_DEVICE_ID_NLM_UART		0x1010</div><div class='add'>+#define	PCI_DEVICE_ID_NLM_I2C		0x1011</div><div class='add'>+#define	PCI_DEVICE_ID_NLM_NOR		0x1015</div><div class='add'>+#define	PCI_DEVICE_ID_NLM_NAND		0x1016</div><div class='add'>+#define	PCI_DEVICE_ID_NLM_MMC		0x1018</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+#define nlm_read_pci_reg(b, r)		nlm_read_reg(b, r)</div><div class='add'>+#define nlm_write_pci_reg(b, r, v)	nlm_write_reg(b, r, v)</div><div class='add'>+</div><div class='add'>+#endif /* !__ASSEMBLY */</div><div class='add'>+</div><div class='add'>+#endif /* __NLM_HAL_IOMAP_H__ */</div><div class='head'>diff --git a/arch/mips/include/asm/netlogic/xlp-hal/pic.h b/arch/mips/include/asm/netlogic/xlp-hal/pic.h<br/>new file mode 100644<br/>index 000000000000..b6628f7ccf74<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/netlogic/xlp-hal/pic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/netlogic/xlp-hal/pic.h</a></div><div class='hunk'>@@ -0,0 +1,411 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights</div><div class='add'>+ * reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the NetLogic</div><div class='add'>+ * license below:</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in</div><div class='add'>+ *    the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR</div><div class='add'>+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE</div><div class='add'>+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='add'>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='add'>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='add'>+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,</div><div class='add'>+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE</div><div class='add'>+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN</div><div class='add'>+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _NLM_HAL_PIC_H</div><div class='add'>+#define _NLM_HAL_PIC_H</div><div class='add'>+</div><div class='add'>+/* PIC Specific registers */</div><div class='add'>+#define PIC_CTRL                0x00</div><div class='add'>+</div><div class='add'>+/* PIC control register defines */</div><div class='add'>+#define PIC_CTRL_ITV		32 /* interrupt timeout value */</div><div class='add'>+#define PIC_CTRL_ICI		19 /* ICI interrupt timeout enable */</div><div class='add'>+#define PIC_CTRL_ITE		18 /* interrupt timeout enable */</div><div class='add'>+#define PIC_CTRL_STE		10 /* system timer interrupt enable */</div><div class='add'>+#define PIC_CTRL_WWR1		8  /* watchdog 1 wraparound count for reset */</div><div class='add'>+#define PIC_CTRL_WWR0		6  /* watchdog 0 wraparound count for reset */</div><div class='add'>+#define PIC_CTRL_WWN1		4  /* watchdog 1 wraparound count for NMI */</div><div class='add'>+#define PIC_CTRL_WWN0		2  /* watchdog 0 wraparound count for NMI */</div><div class='add'>+#define PIC_CTRL_WTE		0  /* watchdog timer enable */</div><div class='add'>+</div><div class='add'>+/* PIC Status register defines */</div><div class='add'>+#define PIC_ICI_STATUS		33 /* ICI interrupt timeout status */</div><div class='add'>+#define PIC_ITE_STATUS		32 /* interrupt timeout status */</div><div class='add'>+#define PIC_STS_STATUS		4  /* System timer interrupt status */</div><div class='add'>+#define PIC_WNS_STATUS		2  /* NMI status for watchdog timers */</div><div class='add'>+#define PIC_WIS_STATUS		0  /* Interrupt status for watchdog timers */</div><div class='add'>+</div><div class='add'>+/* PIC IPI control register offsets */</div><div class='add'>+#define PIC_IPICTRL_NMI		32</div><div class='add'>+#define PIC_IPICTRL_RIV		20 /* received interrupt vector */</div><div class='add'>+#define PIC_IPICTRL_IDB		16 /* interrupt destination base */</div><div class='add'>+#define PIC_IPICTRL_DTE		 0 /* interrupt destination thread enables */</div><div class='add'>+</div><div class='add'>+/* PIC IRT register offsets */</div><div class='add'>+#define PIC_IRT_ENABLE		31</div><div class='add'>+#define PIC_IRT_NMI		29</div><div class='add'>+#define PIC_IRT_SCH		28 /* Scheduling scheme */</div><div class='add'>+#define PIC_IRT_RVEC		20 /* Interrupt receive vectors */</div><div class='add'>+#define PIC_IRT_DT		19 /* Destination type */</div><div class='add'>+#define PIC_IRT_DB		16 /* Destination base */</div><div class='add'>+#define PIC_IRT_DTE		0  /* Destination thread enables */</div><div class='add'>+</div><div class='add'>+#define PIC_BYTESWAP            0x02</div><div class='add'>+#define PIC_STATUS              0x04</div><div class='add'>+#define PIC_INTR_TIMEOUT	0x06</div><div class='add'>+#define PIC_ICI0_INTR_TIMEOUT	0x08</div><div class='add'>+#define PIC_ICI1_INTR_TIMEOUT	0x0a</div><div class='add'>+#define PIC_ICI2_INTR_TIMEOUT	0x0c</div><div class='add'>+#define PIC_IPI_CTL		0x0e</div><div class='add'>+#define PIC_INT_ACK             0x10</div><div class='add'>+#define PIC_INT_PENDING0        0x12</div><div class='add'>+#define PIC_INT_PENDING1        0x14</div><div class='add'>+#define PIC_INT_PENDING2        0x16</div><div class='add'>+</div><div class='add'>+#define PIC_WDOG0_MAXVAL        0x18</div><div class='add'>+#define PIC_WDOG0_COUNT         0x1a</div><div class='add'>+#define PIC_WDOG0_ENABLE0       0x1c</div><div class='add'>+#define PIC_WDOG0_ENABLE1       0x1e</div><div class='add'>+#define PIC_WDOG0_BEATCMD       0x20</div><div class='add'>+#define PIC_WDOG0_BEAT0         0x22</div><div class='add'>+#define PIC_WDOG0_BEAT1         0x24</div><div class='add'>+</div><div class='add'>+#define PIC_WDOG1_MAXVAL        0x26</div><div class='add'>+#define PIC_WDOG1_COUNT         0x28</div><div class='add'>+#define PIC_WDOG1_ENABLE0       0x2a</div><div class='add'>+#define PIC_WDOG1_ENABLE1       0x2c</div><div class='add'>+#define PIC_WDOG1_BEATCMD       0x2e</div><div class='add'>+#define PIC_WDOG1_BEAT0         0x30</div><div class='add'>+#define PIC_WDOG1_BEAT1         0x32</div><div class='add'>+</div><div class='add'>+#define PIC_WDOG_MAXVAL(i)      (PIC_WDOG0_MAXVAL + ((i) ? 7 : 0))</div><div class='add'>+#define PIC_WDOG_COUNT(i)       (PIC_WDOG0_COUNT + ((i) ? 7 : 0))</div><div class='add'>+#define PIC_WDOG_ENABLE0(i)     (PIC_WDOG0_ENABLE0 + ((i) ? 7 : 0))</div><div class='add'>+#define PIC_WDOG_ENABLE1(i)     (PIC_WDOG0_ENABLE1 + ((i) ? 7 : 0))</div><div class='add'>+#define PIC_WDOG_BEATCMD(i)     (PIC_WDOG0_BEATCMD + ((i) ? 7 : 0))</div><div class='add'>+#define PIC_WDOG_BEAT0(i)       (PIC_WDOG0_BEAT0 + ((i) ? 7 : 0))</div><div class='add'>+#define PIC_WDOG_BEAT1(i)       (PIC_WDOG0_BEAT1 + ((i) ? 7 : 0))</div><div class='add'>+</div><div class='add'>+#define PIC_TIMER0_MAXVAL    0x34</div><div class='add'>+#define PIC_TIMER1_MAXVAL    0x36</div><div class='add'>+#define PIC_TIMER2_MAXVAL    0x38</div><div class='add'>+#define PIC_TIMER3_MAXVAL    0x3a</div><div class='add'>+#define PIC_TIMER4_MAXVAL    0x3c</div><div class='add'>+#define PIC_TIMER5_MAXVAL    0x3e</div><div class='add'>+#define PIC_TIMER6_MAXVAL    0x40</div><div class='add'>+#define PIC_TIMER7_MAXVAL    0x42</div><div class='add'>+#define PIC_TIMER_MAXVAL(i)  (PIC_TIMER0_MAXVAL + ((i) * 2))</div><div class='add'>+</div><div class='add'>+#define PIC_TIMER0_COUNT     0x44</div><div class='add'>+#define PIC_TIMER1_COUNT     0x46</div><div class='add'>+#define PIC_TIMER2_COUNT     0x48</div><div class='add'>+#define PIC_TIMER3_COUNT     0x4a</div><div class='add'>+#define PIC_TIMER4_COUNT     0x4c</div><div class='add'>+#define PIC_TIMER5_COUNT     0x4e</div><div class='add'>+#define PIC_TIMER6_COUNT     0x50</div><div class='add'>+#define PIC_TIMER7_COUNT     0x52</div><div class='add'>+#define PIC_TIMER_COUNT(i)   (PIC_TIMER0_COUNT + ((i) * 2))</div><div class='add'>+</div><div class='add'>+#define PIC_ITE0_N0_N1          0x54</div><div class='add'>+#define PIC_ITE1_N0_N1          0x58</div><div class='add'>+#define PIC_ITE2_N0_N1          0x5c</div><div class='add'>+#define PIC_ITE3_N0_N1          0x60</div><div class='add'>+#define PIC_ITE4_N0_N1          0x64</div><div class='add'>+#define PIC_ITE5_N0_N1          0x68</div><div class='add'>+#define PIC_ITE6_N0_N1          0x6c</div><div class='add'>+#define PIC_ITE7_N0_N1          0x70</div><div class='add'>+#define PIC_ITE_N0_N1(i)        (PIC_ITE0_N0_N1 + ((i) * 4))</div><div class='add'>+</div><div class='add'>+#define PIC_ITE0_N2_N3          0x56</div><div class='add'>+#define PIC_ITE1_N2_N3          0x5a</div><div class='add'>+#define PIC_ITE2_N2_N3          0x5e</div><div class='add'>+#define PIC_ITE3_N2_N3          0x62</div><div class='add'>+#define PIC_ITE4_N2_N3          0x66</div><div class='add'>+#define PIC_ITE5_N2_N3          0x6a</div><div class='add'>+#define PIC_ITE6_N2_N3          0x6e</div><div class='add'>+#define PIC_ITE7_N2_N3          0x72</div><div class='add'>+#define PIC_ITE_N2_N3(i)        (PIC_ITE0_N2_N3 + ((i) * 4))</div><div class='add'>+</div><div class='add'>+#define PIC_IRT0                0x74</div><div class='add'>+#define PIC_IRT(i)              (PIC_IRT0 + ((i) * 2))</div><div class='add'>+</div><div class='add'>+#define TIMER_CYCLES_MAXVAL	0xffffffffffffffffULL</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *    IRT Map</div><div class='add'>+ */</div><div class='add'>+#define PIC_NUM_IRTS		160</div><div class='add'>+</div><div class='add'>+#define PIC_IRT_WD_0_INDEX	0</div><div class='add'>+#define PIC_IRT_WD_1_INDEX	1</div><div class='add'>+#define PIC_IRT_WD_NMI_0_INDEX	2</div><div class='add'>+#define PIC_IRT_WD_NMI_1_INDEX	3</div><div class='add'>+#define PIC_IRT_TIMER_0_INDEX	4</div><div class='add'>+#define PIC_IRT_TIMER_1_INDEX	5</div><div class='add'>+#define PIC_IRT_TIMER_2_INDEX	6</div><div class='add'>+#define PIC_IRT_TIMER_3_INDEX	7</div><div class='add'>+#define PIC_IRT_TIMER_4_INDEX	8</div><div class='add'>+#define PIC_IRT_TIMER_5_INDEX	9</div><div class='add'>+#define PIC_IRT_TIMER_6_INDEX	10</div><div class='add'>+#define PIC_IRT_TIMER_7_INDEX	11</div><div class='add'>+#define PIC_IRT_CLOCK_INDEX	PIC_IRT_TIMER_7_INDEX</div><div class='add'>+#define PIC_IRT_TIMER_INDEX(num)	((num) + PIC_IRT_TIMER_0_INDEX)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* 11 and 12 */</div><div class='add'>+#define PIC_NUM_MSG_Q_IRTS	32</div><div class='add'>+#define PIC_IRT_MSG_Q0_INDEX	12</div><div class='add'>+#define PIC_IRT_MSG_Q_INDEX(qid)	((qid) + PIC_IRT_MSG_Q0_INDEX)</div><div class='add'>+/* 12 to 43 */</div><div class='add'>+#define PIC_IRT_MSG_0_INDEX	44</div><div class='add'>+#define PIC_IRT_MSG_1_INDEX	45</div><div class='add'>+/* 44 and 45 */</div><div class='add'>+#define PIC_NUM_PCIE_MSIX_IRTS	32</div><div class='add'>+#define PIC_IRT_PCIE_MSIX_0_INDEX	46</div><div class='add'>+#define PIC_IRT_PCIE_MSIX_INDEX(num)	((num) + PIC_IRT_PCIE_MSIX_0_INDEX)</div><div class='add'>+/* 46 to 77 */</div><div class='add'>+#define PIC_NUM_PCIE_LINK_IRTS		4</div><div class='add'>+#define PIC_IRT_PCIE_LINK_0_INDEX	78</div><div class='add'>+#define PIC_IRT_PCIE_LINK_1_INDEX	79</div><div class='add'>+#define PIC_IRT_PCIE_LINK_2_INDEX	80</div><div class='add'>+#define PIC_IRT_PCIE_LINK_3_INDEX	81</div><div class='add'>+#define PIC_IRT_PCIE_LINK_INDEX(num)	((num) + PIC_IRT_PCIE_LINK_0_INDEX)</div><div class='add'>+/* 78 to 81 */</div><div class='add'>+#define PIC_NUM_NA_IRTS			32</div><div class='add'>+/* 82 to 113 */</div><div class='add'>+#define PIC_IRT_NA_0_INDEX		82</div><div class='add'>+#define PIC_IRT_NA_INDEX(num)		((num) + PIC_IRT_NA_0_INDEX)</div><div class='add'>+#define PIC_IRT_POE_INDEX		114</div><div class='add'>+</div><div class='add'>+#define PIC_NUM_USB_IRTS		6</div><div class='add'>+#define PIC_IRT_USB_0_INDEX		115</div><div class='add'>+#define PIC_IRT_EHCI_0_INDEX		115</div><div class='add'>+#define PIC_IRT_EHCI_1_INDEX		118</div><div class='add'>+#define PIC_IRT_USB_INDEX(num)		((num) + PIC_IRT_USB_0_INDEX)</div><div class='add'>+/* 115 to 120 */</div><div class='add'>+#define PIC_IRT_GDX_INDEX		121</div><div class='add'>+#define PIC_IRT_SEC_INDEX		122</div><div class='add'>+#define PIC_IRT_RSA_INDEX		123</div><div class='add'>+</div><div class='add'>+#define PIC_NUM_COMP_IRTS		4</div><div class='add'>+#define PIC_IRT_COMP_0_INDEX		124</div><div class='add'>+#define PIC_IRT_COMP_INDEX(num)		((num) + PIC_IRT_COMP_0_INDEX)</div><div class='add'>+/* 124 to 127 */</div><div class='add'>+#define PIC_IRT_GBU_INDEX		128</div><div class='add'>+#define PIC_IRT_ICC_0_INDEX		129 /* ICC - Inter Chip Coherency */</div><div class='add'>+#define PIC_IRT_ICC_1_INDEX		130</div><div class='add'>+#define PIC_IRT_ICC_2_INDEX		131</div><div class='add'>+#define PIC_IRT_CAM_INDEX		132</div><div class='add'>+#define PIC_IRT_UART_0_INDEX		133</div><div class='add'>+#define PIC_IRT_UART_1_INDEX		134</div><div class='add'>+#define PIC_IRT_I2C_0_INDEX		135</div><div class='add'>+#define PIC_IRT_I2C_1_INDEX		136</div><div class='add'>+#define PIC_IRT_SYS_0_INDEX		137</div><div class='add'>+#define PIC_IRT_SYS_1_INDEX		138</div><div class='add'>+#define PIC_IRT_JTAG_INDEX		139</div><div class='add'>+#define PIC_IRT_PIC_INDEX		140</div><div class='add'>+#define PIC_IRT_NBU_INDEX		141</div><div class='add'>+#define PIC_IRT_TCU_INDEX		142</div><div class='add'>+#define PIC_IRT_GCU_INDEX		143 /* GBC - Global Coherency */</div><div class='add'>+#define PIC_IRT_DMC_0_INDEX		144</div><div class='add'>+#define PIC_IRT_DMC_1_INDEX		145</div><div class='add'>+</div><div class='add'>+#define PIC_NUM_GPIO_IRTS		4</div><div class='add'>+#define PIC_IRT_GPIO_0_INDEX		146</div><div class='add'>+#define PIC_IRT_GPIO_INDEX(num)		((num) + PIC_IRT_GPIO_0_INDEX)</div><div class='add'>+</div><div class='add'>+/* 146 to 149 */</div><div class='add'>+#define PIC_IRT_NOR_INDEX		150</div><div class='add'>+#define PIC_IRT_NAND_INDEX		151</div><div class='add'>+#define PIC_IRT_SPI_INDEX		152</div><div class='add'>+#define PIC_IRT_MMC_INDEX		153</div><div class='add'>+</div><div class='add'>+#define PIC_CLOCK_TIMER			7</div><div class='add'>+#define PIC_IRQ_BASE			8</div><div class='add'>+</div><div class='add'>+#if !defined(LOCORE) &amp;&amp; !defined(__ASSEMBLY__)</div><div class='add'>+</div><div class='add'>+#define PIC_IRT_FIRST_IRQ		(PIC_IRQ_BASE)</div><div class='add'>+#define PIC_IRT_LAST_IRQ		63</div><div class='add'>+#define PIC_IRQ_IS_IRT(irq)		((irq) &gt;= PIC_IRT_FIRST_IRQ)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *   Misc</div><div class='add'>+ */</div><div class='add'>+#define PIC_IRT_VALID			1</div><div class='add'>+#define PIC_LOCAL_SCHEDULING		1</div><div class='add'>+#define PIC_GLOBAL_SCHEDULING		0</div><div class='add'>+</div><div class='add'>+#define nlm_read_pic_reg(b, r)	nlm_read_reg64(b, r)</div><div class='add'>+#define nlm_write_pic_reg(b, r, v) nlm_write_reg64(b, r, v)</div><div class='add'>+#define nlm_get_pic_pcibase(node) nlm_pcicfg_base(XLP_IO_PIC_OFFSET(node))</div><div class='add'>+#define nlm_get_pic_regbase(node) (nlm_get_pic_pcibase(node) + XLP_IO_PCI_HDRSZ)</div><div class='add'>+</div><div class='add'>+/* IRT and h/w interrupt routines */</div><div class='add'>+static inline int</div><div class='add'>+nlm_pic_read_irt(uint64_t base, int irt_index)</div><div class='add'>+{</div><div class='add'>+	return nlm_read_pic_reg(base, PIC_IRT(irt_index));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline uint64_t</div><div class='add'>+nlm_pic_read_control(uint64_t base)</div><div class='add'>+{</div><div class='add'>+	return nlm_read_pic_reg(base, PIC_CTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_pic_write_control(uint64_t base, uint64_t control)</div><div class='add'>+{</div><div class='add'>+	nlm_write_pic_reg(base, PIC_CTRL, control);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_pic_update_control(uint64_t base, uint64_t control)</div><div class='add'>+{</div><div class='add'>+	uint64_t val;</div><div class='add'>+</div><div class='add'>+	val = nlm_read_pic_reg(base, PIC_CTRL);</div><div class='add'>+	nlm_write_pic_reg(base, PIC_CTRL, control | val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_set_irt_to_cpu(uint64_t base, int irt, int cpu)</div><div class='add'>+{</div><div class='add'>+	uint64_t val;</div><div class='add'>+</div><div class='add'>+	val = nlm_read_pic_reg(base, PIC_IRT(irt));</div><div class='add'>+	val |= cpu &amp; 0xf;</div><div class='add'>+	if (cpu &gt; 15)</div><div class='add'>+		val |= 1 &lt;&lt; 16;</div><div class='add'>+	nlm_write_pic_reg(base, PIC_IRT(irt), val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_pic_write_irt(uint64_t base, int irt_num, int en, int nmi,</div><div class='add'>+	int sch, int vec, int dt, int db, int dte)</div><div class='add'>+{</div><div class='add'>+	uint64_t val;</div><div class='add'>+</div><div class='add'>+	val = (((uint64_t)en &amp; 0x1) &lt;&lt; 31) | ((nmi &amp; 0x1) &lt;&lt; 29) |</div><div class='add'>+			((sch &amp; 0x1) &lt;&lt; 28) | ((vec &amp; 0x3f) &lt;&lt; 20) |</div><div class='add'>+			((dt &amp; 0x1) &lt;&lt; 19) | ((db &amp; 0x7) &lt;&lt; 16) |</div><div class='add'>+			(dte &amp; 0xffff);</div><div class='add'>+</div><div class='add'>+	nlm_write_pic_reg(base, PIC_IRT(irt_num), val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_pic_write_irt_direct(uint64_t base, int irt_num, int en, int nmi,</div><div class='add'>+	int sch, int vec, int cpu)</div><div class='add'>+{</div><div class='add'>+	nlm_pic_write_irt(base, irt_num, en, nmi, sch, vec, 1,</div><div class='add'>+		(cpu &gt;&gt; 4),		/* thread group */</div><div class='add'>+		1 &lt;&lt; (cpu &amp; 0xf));	/* thread mask */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline uint64_t</div><div class='add'>+nlm_pic_read_timer(uint64_t base, int timer)</div><div class='add'>+{</div><div class='add'>+	return nlm_read_pic_reg(base, PIC_TIMER_COUNT(timer));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_pic_write_timer(uint64_t base, int timer, uint64_t value)</div><div class='add'>+{</div><div class='add'>+	nlm_write_pic_reg(base, PIC_TIMER_COUNT(timer), value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_pic_set_timer(uint64_t base, int timer, uint64_t value, int irq, int cpu)</div><div class='add'>+{</div><div class='add'>+	uint64_t pic_ctrl = nlm_read_pic_reg(base, PIC_CTRL);</div><div class='add'>+	int en;</div><div class='add'>+</div><div class='add'>+	en = (irq &gt; 0);</div><div class='add'>+	nlm_write_pic_reg(base, PIC_TIMER_MAXVAL(timer), value);</div><div class='add'>+	nlm_pic_write_irt_direct(base, PIC_IRT_TIMER_INDEX(timer),</div><div class='add'>+		en, 0, 0, irq, cpu);</div><div class='add'>+</div><div class='add'>+	/* enable the timer */</div><div class='add'>+	pic_ctrl |= (1 &lt;&lt; (PIC_CTRL_STE + timer));</div><div class='add'>+	nlm_write_pic_reg(base, PIC_CTRL, pic_ctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_pic_enable_irt(uint64_t base, int irt)</div><div class='add'>+{</div><div class='add'>+	uint64_t reg;</div><div class='add'>+</div><div class='add'>+	reg = nlm_read_pic_reg(base, PIC_IRT(irt));</div><div class='add'>+	nlm_write_pic_reg(base, PIC_IRT(irt), reg | (1u &lt;&lt; 31));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_pic_disable_irt(uint64_t base, int irt)</div><div class='add'>+{</div><div class='add'>+	uint32_t reg;</div><div class='add'>+</div><div class='add'>+	reg = nlm_read_pic_reg(base, PIC_IRT(irt));</div><div class='add'>+	nlm_write_pic_reg(base, PIC_IRT(irt), reg &amp; ~((uint64_t)1 &lt;&lt; 31));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_pic_send_ipi(uint64_t base, int hwt, int irq, int nmi)</div><div class='add'>+{</div><div class='add'>+	uint64_t ipi;</div><div class='add'>+	int	node, ncpu;</div><div class='add'>+</div><div class='add'>+	node = hwt / 32;</div><div class='add'>+	ncpu = hwt &amp; 0x1f;</div><div class='add'>+	ipi = ((uint64_t)nmi &lt;&lt; 31) | (irq &lt;&lt; 20) | (node &lt;&lt; 17) |</div><div class='add'>+		(1 &lt;&lt; (ncpu &amp; 0xf));</div><div class='add'>+	if (ncpu &gt; 15)</div><div class='add'>+		ipi |= 0x10000; /* Setting bit 16 to select cpus 16-31 */</div><div class='add'>+</div><div class='add'>+	nlm_write_pic_reg(base, PIC_IPI_CTL, ipi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_pic_ack(uint64_t base, int irt_num)</div><div class='add'>+{</div><div class='add'>+	nlm_write_pic_reg(base, PIC_INT_ACK, irt_num);</div><div class='add'>+</div><div class='add'>+	/* Ack the Status register for Watchdog &amp; System timers */</div><div class='add'>+	if (irt_num &lt; 12)</div><div class='add'>+		nlm_write_pic_reg(base, PIC_STATUS, (1 &lt;&lt; irt_num));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_pic_init_irt(uint64_t base, int irt, int irq, int hwt)</div><div class='add'>+{</div><div class='add'>+	nlm_pic_write_irt_direct(base, irt, 0, 0, 0, irq, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern uint64_t nlm_pic_base;</div><div class='add'>+int nlm_irq_to_irt(int irq);</div><div class='add'>+int nlm_irt_to_irq(int irt);</div><div class='add'>+</div><div class='add'>+#endif /* __ASSEMBLY__ */</div><div class='add'>+#endif /* _NLM_HAL_PIC_H */</div><div class='head'>diff --git a/arch/mips/include/asm/netlogic/xlp-hal/sys.h b/arch/mips/include/asm/netlogic/xlp-hal/sys.h<br/>new file mode 100644<br/>index 000000000000..21432f7d89b9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/netlogic/xlp-hal/sys.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/netlogic/xlp-hal/sys.h</a></div><div class='hunk'>@@ -0,0 +1,129 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights</div><div class='add'>+ * reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the NetLogic</div><div class='add'>+ * license below:</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in</div><div class='add'>+ *    the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR</div><div class='add'>+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE</div><div class='add'>+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='add'>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='add'>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='add'>+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,</div><div class='add'>+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE</div><div class='add'>+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN</div><div class='add'>+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __NLM_HAL_SYS_H__</div><div class='add'>+#define __NLM_HAL_SYS_H__</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+* @file_name sys.h</div><div class='add'>+* @author Netlogic Microsystems</div><div class='add'>+* @brief HAL for System configuration registers</div><div class='add'>+*/</div><div class='add'>+#define	SYS_CHIP_RESET				0x00</div><div class='add'>+#define	SYS_POWER_ON_RESET_CFG			0x01</div><div class='add'>+#define	SYS_EFUSE_DEVICE_CFG_STATUS0		0x02</div><div class='add'>+#define	SYS_EFUSE_DEVICE_CFG_STATUS1		0x03</div><div class='add'>+#define	SYS_EFUSE_DEVICE_CFG_STATUS2		0x04</div><div class='add'>+#define	SYS_EFUSE_DEVICE_CFG3			0x05</div><div class='add'>+#define	SYS_EFUSE_DEVICE_CFG4			0x06</div><div class='add'>+#define	SYS_EFUSE_DEVICE_CFG5			0x07</div><div class='add'>+#define	SYS_EFUSE_DEVICE_CFG6			0x08</div><div class='add'>+#define	SYS_EFUSE_DEVICE_CFG7			0x09</div><div class='add'>+#define	SYS_PLL_CTRL				0x0a</div><div class='add'>+#define	SYS_CPU_RESET				0x0b</div><div class='add'>+#define	SYS_CPU_NONCOHERENT_MODE		0x0d</div><div class='add'>+#define	SYS_CORE_DFS_DIS_CTRL			0x0e</div><div class='add'>+#define	SYS_CORE_DFS_RST_CTRL			0x0f</div><div class='add'>+#define	SYS_CORE_DFS_BYP_CTRL			0x10</div><div class='add'>+#define	SYS_CORE_DFS_PHA_CTRL			0x11</div><div class='add'>+#define	SYS_CORE_DFS_DIV_INC_CTRL		0x12</div><div class='add'>+#define	SYS_CORE_DFS_DIV_DEC_CTRL		0x13</div><div class='add'>+#define	SYS_CORE_DFS_DIV_VALUE			0x14</div><div class='add'>+#define	SYS_RESET				0x15</div><div class='add'>+#define	SYS_DFS_DIS_CTRL			0x16</div><div class='add'>+#define	SYS_DFS_RST_CTRL			0x17</div><div class='add'>+#define	SYS_DFS_BYP_CTRL			0x18</div><div class='add'>+#define	SYS_DFS_DIV_INC_CTRL			0x19</div><div class='add'>+#define	SYS_DFS_DIV_DEC_CTRL			0x1a</div><div class='add'>+#define	SYS_DFS_DIV_VALUE0			0x1b</div><div class='add'>+#define	SYS_DFS_DIV_VALUE1			0x1c</div><div class='add'>+#define	SYS_SENSE_AMP_DLY			0x1d</div><div class='add'>+#define	SYS_SOC_SENSE_AMP_DLY			0x1e</div><div class='add'>+#define	SYS_CTRL0				0x1f</div><div class='add'>+#define	SYS_CTRL1				0x20</div><div class='add'>+#define	SYS_TIMEOUT_BS1				0x21</div><div class='add'>+#define	SYS_BYTE_SWAP				0x22</div><div class='add'>+#define	SYS_VRM_VID				0x23</div><div class='add'>+#define	SYS_PWR_RAM_CMD				0x24</div><div class='add'>+#define	SYS_PWR_RAM_ADDR			0x25</div><div class='add'>+#define	SYS_PWR_RAM_DATA0			0x26</div><div class='add'>+#define	SYS_PWR_RAM_DATA1			0x27</div><div class='add'>+#define	SYS_PWR_RAM_DATA2			0x28</div><div class='add'>+#define	SYS_PWR_UCODE				0x29</div><div class='add'>+#define	SYS_CPU0_PWR_STATUS			0x2a</div><div class='add'>+#define	SYS_CPU1_PWR_STATUS			0x2b</div><div class='add'>+#define	SYS_CPU2_PWR_STATUS			0x2c</div><div class='add'>+#define	SYS_CPU3_PWR_STATUS			0x2d</div><div class='add'>+#define	SYS_CPU4_PWR_STATUS			0x2e</div><div class='add'>+#define	SYS_CPU5_PWR_STATUS			0x2f</div><div class='add'>+#define	SYS_CPU6_PWR_STATUS			0x30</div><div class='add'>+#define	SYS_CPU7_PWR_STATUS			0x31</div><div class='add'>+#define	SYS_STATUS				0x32</div><div class='add'>+#define	SYS_INT_POL				0x33</div><div class='add'>+#define	SYS_INT_TYPE				0x34</div><div class='add'>+#define	SYS_INT_STATUS				0x35</div><div class='add'>+#define	SYS_INT_MASK0				0x36</div><div class='add'>+#define	SYS_INT_MASK1				0x37</div><div class='add'>+#define	SYS_UCO_S_ECC				0x38</div><div class='add'>+#define	SYS_UCO_M_ECC				0x39</div><div class='add'>+#define	SYS_UCO_ADDR				0x3a</div><div class='add'>+#define	SYS_UCO_INSTR				0x3b</div><div class='add'>+#define	SYS_MEM_BIST0				0x3c</div><div class='add'>+#define	SYS_MEM_BIST1				0x3d</div><div class='add'>+#define	SYS_MEM_BIST2				0x3e</div><div class='add'>+#define	SYS_MEM_BIST3				0x3f</div><div class='add'>+#define	SYS_MEM_BIST4				0x40</div><div class='add'>+#define	SYS_MEM_BIST5				0x41</div><div class='add'>+#define	SYS_MEM_BIST6				0x42</div><div class='add'>+#define	SYS_MEM_BIST7				0x43</div><div class='add'>+#define	SYS_MEM_BIST8				0x44</div><div class='add'>+#define	SYS_MEM_BIST9				0x45</div><div class='add'>+#define	SYS_MEM_BIST10				0x46</div><div class='add'>+#define	SYS_MEM_BIST11				0x47</div><div class='add'>+#define	SYS_MEM_BIST12				0x48</div><div class='add'>+#define	SYS_SCRTCH0				0x49</div><div class='add'>+#define	SYS_SCRTCH1				0x4a</div><div class='add'>+#define	SYS_SCRTCH2				0x4b</div><div class='add'>+#define	SYS_SCRTCH3				0x4c</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+#define	nlm_read_sys_reg(b, r)		nlm_read_reg(b, r)</div><div class='add'>+#define	nlm_write_sys_reg(b, r, v)	nlm_write_reg(b, r, v)</div><div class='add'>+#define	nlm_get_sys_pcibase(node) nlm_pcicfg_base(XLP_IO_SYS_OFFSET(node))</div><div class='add'>+#define	nlm_get_sys_regbase(node) (nlm_get_sys_pcibase(node) + XLP_IO_PCI_HDRSZ)</div><div class='add'>+</div><div class='add'>+extern uint64_t nlm_sys_base;</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/mips/include/asm/netlogic/xlp-hal/uart.h b/arch/mips/include/asm/netlogic/xlp-hal/uart.h<br/>new file mode 100644<br/>index 000000000000..6a7046ca094d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/netlogic/xlp-hal/uart.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/netlogic/xlp-hal/uart.h</a></div><div class='hunk'>@@ -0,0 +1,191 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights</div><div class='add'>+ * reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the NetLogic</div><div class='add'>+ * license below:</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in</div><div class='add'>+ *    the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR</div><div class='add'>+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE</div><div class='add'>+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='add'>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='add'>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='add'>+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,</div><div class='add'>+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE</div><div class='add'>+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN</div><div class='add'>+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __XLP_HAL_UART_H__</div><div class='add'>+#define __XLP_HAL_UART_H__</div><div class='add'>+</div><div class='add'>+/* UART Specific registers */</div><div class='add'>+#define UART_RX_DATA		0x00</div><div class='add'>+#define UART_TX_DATA		0x00</div><div class='add'>+</div><div class='add'>+#define UART_INT_EN		0x01</div><div class='add'>+#define UART_INT_ID		0x02</div><div class='add'>+#define UART_FIFO_CTL		0x02</div><div class='add'>+#define UART_LINE_CTL		0x03</div><div class='add'>+#define UART_MODEM_CTL		0x04</div><div class='add'>+#define UART_LINE_STS		0x05</div><div class='add'>+#define UART_MODEM_STS		0x06</div><div class='add'>+</div><div class='add'>+#define UART_DIVISOR0		0x00</div><div class='add'>+#define UART_DIVISOR1		0x01</div><div class='add'>+</div><div class='add'>+#define BASE_BAUD		(XLP_IO_CLK/16)</div><div class='add'>+#define BAUD_DIVISOR(baud)	(BASE_BAUD / baud)</div><div class='add'>+</div><div class='add'>+/* LCR mask values */</div><div class='add'>+#define LCR_5BITS		0x00</div><div class='add'>+#define LCR_6BITS		0x01</div><div class='add'>+#define LCR_7BITS		0x02</div><div class='add'>+#define LCR_8BITS		0x03</div><div class='add'>+#define LCR_STOPB		0x04</div><div class='add'>+#define LCR_PENAB		0x08</div><div class='add'>+#define LCR_PODD		0x00</div><div class='add'>+#define LCR_PEVEN		0x10</div><div class='add'>+#define LCR_PONE		0x20</div><div class='add'>+#define LCR_PZERO		0x30</div><div class='add'>+#define LCR_SBREAK		0x40</div><div class='add'>+#define LCR_EFR_ENABLE		0xbf</div><div class='add'>+#define LCR_DLAB		0x80</div><div class='add'>+</div><div class='add'>+/* MCR mask values */</div><div class='add'>+#define MCR_DTR			0x01</div><div class='add'>+#define MCR_RTS			0x02</div><div class='add'>+#define MCR_DRS			0x04</div><div class='add'>+#define MCR_IE			0x08</div><div class='add'>+#define MCR_LOOPBACK		0x10</div><div class='add'>+</div><div class='add'>+/* FCR mask values */</div><div class='add'>+#define FCR_RCV_RST		0x02</div><div class='add'>+#define FCR_XMT_RST		0x04</div><div class='add'>+#define FCR_RX_LOW		0x00</div><div class='add'>+#define FCR_RX_MEDL		0x40</div><div class='add'>+#define FCR_RX_MEDH		0x80</div><div class='add'>+#define FCR_RX_HIGH		0xc0</div><div class='add'>+</div><div class='add'>+/* IER mask values */</div><div class='add'>+#define IER_ERXRDY		0x1</div><div class='add'>+#define IER_ETXRDY		0x2</div><div class='add'>+#define IER_ERLS		0x4</div><div class='add'>+#define IER_EMSC		0x8</div><div class='add'>+</div><div class='add'>+#if !defined(LOCORE) &amp;&amp; !defined(__ASSEMBLY__)</div><div class='add'>+</div><div class='add'>+#define	nlm_read_uart_reg(b, r)		nlm_read_reg(b, r)</div><div class='add'>+#define	nlm_write_uart_reg(b, r, v)	nlm_write_reg(b, r, v)</div><div class='add'>+#define nlm_get_uart_pcibase(node, inst)	\</div><div class='add'>+		nlm_pcicfg_base(XLP_IO_UART_OFFSET(node, inst))</div><div class='add'>+#define nlm_get_uart_regbase(node, inst)	\</div><div class='add'>+			(nlm_get_uart_pcibase(node, inst) + XLP_IO_PCI_HDRSZ)</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_uart_set_baudrate(uint64_t base, int baud)</div><div class='add'>+{</div><div class='add'>+	uint32_t lcr;</div><div class='add'>+</div><div class='add'>+	lcr = nlm_read_uart_reg(base, UART_LINE_CTL);</div><div class='add'>+</div><div class='add'>+	/* enable divisor register, and write baud values */</div><div class='add'>+	nlm_write_uart_reg(base, UART_LINE_CTL, lcr | (1 &lt;&lt; 7));</div><div class='add'>+	nlm_write_uart_reg(base, UART_DIVISOR0,</div><div class='add'>+			(BAUD_DIVISOR(baud) &amp; 0xff));</div><div class='add'>+	nlm_write_uart_reg(base, UART_DIVISOR1,</div><div class='add'>+			((BAUD_DIVISOR(baud) &gt;&gt; 8) &amp; 0xff));</div><div class='add'>+</div><div class='add'>+	/* restore default lcr */</div><div class='add'>+	nlm_write_uart_reg(base, UART_LINE_CTL, lcr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_uart_outbyte(uint64_t base, char c)</div><div class='add'>+{</div><div class='add'>+	uint32_t lsr;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		lsr = nlm_read_uart_reg(base, UART_LINE_STS);</div><div class='add'>+		if (lsr &amp; 0x20)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nlm_write_uart_reg(base, UART_TX_DATA, (int)c);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline char</div><div class='add'>+nlm_uart_inbyte(uint64_t base)</div><div class='add'>+{</div><div class='add'>+	int data, lsr;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		lsr = nlm_read_uart_reg(base, UART_LINE_STS);</div><div class='add'>+		if (lsr &amp; 0x80) { /* parity/frame/break-error - push a zero */</div><div class='add'>+			data = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (lsr &amp; 0x01) {	/* Rx data */</div><div class='add'>+			data = nlm_read_uart_reg(base, UART_RX_DATA);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (char)data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+nlm_uart_init(uint64_t base, int baud, int databits, int stopbits,</div><div class='add'>+	int parity, int int_en, int loopback)</div><div class='add'>+{</div><div class='add'>+	uint32_t lcr;</div><div class='add'>+</div><div class='add'>+	lcr = 0;</div><div class='add'>+	if (databits &gt;= 8)</div><div class='add'>+		lcr |= LCR_8BITS;</div><div class='add'>+	else if (databits == 7)</div><div class='add'>+		lcr |= LCR_7BITS;</div><div class='add'>+	else if (databits == 6)</div><div class='add'>+		lcr |= LCR_6BITS;</div><div class='add'>+	else</div><div class='add'>+		lcr |= LCR_5BITS;</div><div class='add'>+</div><div class='add'>+	if (stopbits &gt; 1)</div><div class='add'>+		lcr |= LCR_STOPB;</div><div class='add'>+</div><div class='add'>+	lcr |= parity &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	/* setup default lcr */</div><div class='add'>+	nlm_write_uart_reg(base, UART_LINE_CTL, lcr);</div><div class='add'>+</div><div class='add'>+	/* Reset the FIFOs */</div><div class='add'>+	nlm_write_uart_reg(base, UART_LINE_CTL, FCR_RCV_RST | FCR_XMT_RST);</div><div class='add'>+</div><div class='add'>+	nlm_uart_set_baudrate(base, baud);</div><div class='add'>+</div><div class='add'>+	if (loopback)</div><div class='add'>+		nlm_write_uart_reg(base, UART_MODEM_CTL, 0x1f);</div><div class='add'>+</div><div class='add'>+	if (int_en)</div><div class='add'>+		nlm_write_uart_reg(base, UART_INT_EN, IER_ERXRDY | IER_ETXRDY);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* !LOCORE &amp;&amp; !__ASSEMBLY__ */</div><div class='add'>+#endif /* __XLP_HAL_UART_H__ */</div><div class='head'>diff --git a/arch/mips/netlogic/xlr/xlr_console.c b/arch/mips/include/asm/netlogic/xlp-hal/xlp.h<br/>index 759df0692201..1540588e396d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/netlogic/xlr/xlr_console.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/xlr/xlr_console.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/netlogic/xlp-hal/xlp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/netlogic/xlp-hal/xlp.h</a></div><div class='hunk'>@@ -32,15 +32,20 @@</div><div class='ctx'>  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;asm/netlogic/xlr/iomap.h&gt;</div><div class='add'>+#ifndef _NLM_HAL_XLP_H</div><div class='add'>+#define _NLM_HAL_XLP_H</div><div class='ctx'> </div><div class='del'>-void prom_putchar(char c)</div><div class='del'>-{</div><div class='del'>-	nlm_reg_t *mmio;</div><div class='add'>+#define PIC_UART_0_IRQ           17</div><div class='add'>+#define PIC_UART_1_IRQ           18</div><div class='ctx'> </div><div class='del'>-	mmio = netlogic_io_mmio(NETLOGIC_IO_UART_0_OFFSET);</div><div class='del'>-	while (netlogic_read_reg(mmio, 0x5) == 0)</div><div class='del'>-		;</div><div class='del'>-	netlogic_write_reg(mmio, 0x0, c);</div><div class='del'>-}</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+/* SMP support functions */</div><div class='add'>+void xlp_boot_core0_siblings(void);</div><div class='add'>+void xlp_wakeup_secondary_cpus(void);</div><div class='add'>+</div><div class='add'>+void xlp_mmu_init(void);</div><div class='add'>+void nlm_hal_init(void);</div><div class='add'>+</div><div class='add'>+#endif /* !__ASSEMBLY__ */</div><div class='add'>+#endif /* _ASM_NLM_XLP_H */</div><div class='head'>diff --git a/arch/mips/include/asm/netlogic/xlr/iomap.h b/arch/mips/include/asm/netlogic/xlr/iomap.h<br/>index 2e3a4dd53045..2e768f032e83 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/netlogic/xlr/iomap.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/netlogic/xlr/iomap.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/netlogic/xlr/iomap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/netlogic/xlr/iomap.h</a></div><div class='hunk'>@@ -106,26 +106,4 @@</div><div class='ctx'> #define DEFAULT_HT_TYPE0_CFG_BASE       0x16000000</div><div class='ctx'> #define DEFAULT_HT_TYPE1_CFG_BASE       0x17000000</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='del'>-</div><div class='del'>-typedef volatile __u32 nlm_reg_t;</div><div class='del'>-extern unsigned long netlogic_io_base;</div><div class='del'>-</div><div class='del'>-/* FIXME read once in write_reg */</div><div class='del'>-#ifdef CONFIG_CPU_LITTLE_ENDIAN</div><div class='del'>-#define netlogic_read_reg(base, offset)		((base)[(offset)])</div><div class='del'>-#define netlogic_write_reg(base, offset, value)	((base)[(offset)] = (value))</div><div class='del'>-#else</div><div class='del'>-#define netlogic_read_reg(base, offset)		(be32_to_cpu((base)[(offset)]))</div><div class='del'>-#define netlogic_write_reg(base, offset, value) \</div><div class='del'>-				((base)[(offset)] = cpu_to_be32((value)))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define netlogic_read_reg_le32(base, offset) (le32_to_cpu((base)[(offset)]))</div><div class='del'>-#define netlogic_write_reg_le32(base, offset, value) \</div><div class='del'>-				((base)[(offset)] = cpu_to_le32((value)))</div><div class='del'>-#define netlogic_io_mmio(offset) ((nlm_reg_t *)(netlogic_io_base+(offset)))</div><div class='del'>-#endif /* __ASSEMBLY__ */</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/mips/include/asm/netlogic/xlr/msidef.h b/arch/mips/include/asm/netlogic/xlr/msidef.h<br/>new file mode 100644<br/>index 000000000000..7e39d40be4f5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/netlogic/xlr/msidef.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/netlogic/xlr/msidef.h</a></div><div class='hunk'>@@ -0,0 +1,84 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights</div><div class='add'>+ * reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the NetLogic</div><div class='add'>+ * license below:</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in</div><div class='add'>+ *    the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR</div><div class='add'>+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE</div><div class='add'>+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='add'>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='add'>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='add'>+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,</div><div class='add'>+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE</div><div class='add'>+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN</div><div class='add'>+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ASM_RMI_MSIDEF_H</div><div class='add'>+#define ASM_RMI_MSIDEF_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Constants for Intel APIC based MSI messages.</div><div class='add'>+ * Adapted for the RMI XLR using identical defines</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Shifts for MSI data</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define MSI_DATA_VECTOR_SHIFT		0</div><div class='add'>+#define  MSI_DATA_VECTOR_MASK		0x000000ff</div><div class='add'>+#define	 MSI_DATA_VECTOR(v)		(((v) &lt;&lt; MSI_DATA_VECTOR_SHIFT) &amp; \</div><div class='add'>+						MSI_DATA_VECTOR_MASK)</div><div class='add'>+</div><div class='add'>+#define MSI_DATA_DELIVERY_MODE_SHIFT	8</div><div class='add'>+#define  MSI_DATA_DELIVERY_FIXED	(0 &lt;&lt; MSI_DATA_DELIVERY_MODE_SHIFT)</div><div class='add'>+#define  MSI_DATA_DELIVERY_LOWPRI	(1 &lt;&lt; MSI_DATA_DELIVERY_MODE_SHIFT)</div><div class='add'>+</div><div class='add'>+#define MSI_DATA_LEVEL_SHIFT		14</div><div class='add'>+#define	 MSI_DATA_LEVEL_DEASSERT	(0 &lt;&lt; MSI_DATA_LEVEL_SHIFT)</div><div class='add'>+#define	 MSI_DATA_LEVEL_ASSERT		(1 &lt;&lt; MSI_DATA_LEVEL_SHIFT)</div><div class='add'>+</div><div class='add'>+#define MSI_DATA_TRIGGER_SHIFT		15</div><div class='add'>+#define  MSI_DATA_TRIGGER_EDGE		(0 &lt;&lt; MSI_DATA_TRIGGER_SHIFT)</div><div class='add'>+#define  MSI_DATA_TRIGGER_LEVEL		(1 &lt;&lt; MSI_DATA_TRIGGER_SHIFT)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Shift/mask fields for msi address</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define MSI_ADDR_BASE_HI		0</div><div class='add'>+#define MSI_ADDR_BASE_LO		0xfee00000</div><div class='add'>+</div><div class='add'>+#define MSI_ADDR_DEST_MODE_SHIFT	2</div><div class='add'>+#define  MSI_ADDR_DEST_MODE_PHYSICAL	(0 &lt;&lt; MSI_ADDR_DEST_MODE_SHIFT)</div><div class='add'>+#define	 MSI_ADDR_DEST_MODE_LOGICAL	(1 &lt;&lt; MSI_ADDR_DEST_MODE_SHIFT)</div><div class='add'>+</div><div class='add'>+#define MSI_ADDR_REDIRECTION_SHIFT	3</div><div class='add'>+#define  MSI_ADDR_REDIRECTION_CPU	(0 &lt;&lt; MSI_ADDR_REDIRECTION_SHIFT)</div><div class='add'>+#define  MSI_ADDR_REDIRECTION_LOWPRI	(1 &lt;&lt; MSI_ADDR_REDIRECTION_SHIFT)</div><div class='add'>+</div><div class='add'>+#define MSI_ADDR_DEST_ID_SHIFT		12</div><div class='add'>+#define	 MSI_ADDR_DEST_ID_MASK		0x00ffff0</div><div class='add'>+#define  MSI_ADDR_DEST_ID(dest)		(((dest) &lt;&lt; MSI_ADDR_DEST_ID_SHIFT) &amp; \</div><div class='add'>+						 MSI_ADDR_DEST_ID_MASK)</div><div class='add'>+</div><div class='add'>+#endif /* ASM_RMI_MSIDEF_H */</div><div class='head'>diff --git a/arch/mips/include/asm/netlogic/xlr/pic.h b/arch/mips/include/asm/netlogic/xlr/pic.h<br/>index 5cceb746f080..868013e62f32 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/netlogic/xlr/pic.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/netlogic/xlr/pic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/netlogic/xlr/pic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/netlogic/xlr/pic.h</a></div><div class='hunk'>@@ -193,39 +193,72 @@</div><div class='ctx'> /* end XLS */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='del'>-static inline void pic_send_ipi(u32 ipi)</div><div class='add'>+</div><div class='add'>+#define PIC_IRQ_IS_EDGE_TRIGGERED(irq)	(((irq) &gt;= PIC_TIMER_0_IRQ) &amp;&amp; \</div><div class='add'>+					((irq) &lt;= PIC_TIMER_7_IRQ))</div><div class='add'>+#define PIC_IRQ_IS_IRT(irq)		(((irq) &gt;= PIC_IRT_FIRST_IRQ) &amp;&amp; \</div><div class='add'>+					((irq) &lt;= PIC_IRT_LAST_IRQ))</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+nlm_irq_to_irt(int irq)</div><div class='ctx'> {</div><div class='del'>-	nlm_reg_t *mmio = netlogic_io_mmio(NETLOGIC_IO_PIC_OFFSET);</div><div class='add'>+	if (PIC_IRQ_IS_IRT(irq) == 0)</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='del'>-	netlogic_write_reg(mmio, PIC_IPI, ipi);</div><div class='add'>+	return PIC_IRQ_TO_INTR(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u32 pic_read_control(void)</div><div class='add'>+static inline int</div><div class='add'>+nlm_irt_to_irq(int irt)</div><div class='ctx'> {</div><div class='del'>-	nlm_reg_t *mmio = netlogic_io_mmio(NETLOGIC_IO_PIC_OFFSET);</div><div class='ctx'> </div><div class='del'>-	return netlogic_read_reg(mmio, PIC_CTRL);</div><div class='add'>+	return PIC_INTR_TO_IRQ(irt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void pic_write_control(u32 control)</div><div class='add'>+static inline void</div><div class='add'>+nlm_pic_enable_irt(uint64_t base, int irt)</div><div class='ctx'> {</div><div class='del'>-	nlm_reg_t *mmio = netlogic_io_mmio(NETLOGIC_IO_PIC_OFFSET);</div><div class='add'>+	uint32_t reg;</div><div class='ctx'> </div><div class='del'>-	netlogic_write_reg(mmio, PIC_CTRL, control);</div><div class='add'>+	reg = nlm_read_reg(base, PIC_IRT_1(irt));</div><div class='add'>+	nlm_write_reg(base, PIC_IRT_1(irt), reg | (1u &lt;&lt; 31));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void pic_update_control(u32 control)</div><div class='add'>+static inline void</div><div class='add'>+nlm_pic_disable_irt(uint64_t base, int irt)</div><div class='ctx'> {</div><div class='del'>-	nlm_reg_t *mmio = netlogic_io_mmio(NETLOGIC_IO_PIC_OFFSET);</div><div class='add'>+	uint32_t reg;</div><div class='ctx'> </div><div class='del'>-	netlogic_write_reg(mmio, PIC_CTRL,</div><div class='del'>-		(control | netlogic_read_reg(mmio, PIC_CTRL)));</div><div class='add'>+	reg = nlm_read_reg(base, PIC_IRT_1(irt));</div><div class='add'>+	nlm_write_reg(base, PIC_IRT_1(irt), reg &amp; ~(1u &lt;&lt; 31));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define PIC_IRQ_IS_EDGE_TRIGGERED(irq)	(((irq) &gt;= PIC_TIMER_0_IRQ) &amp;&amp; \</div><div class='del'>-					((irq) &lt;= PIC_TIMER_7_IRQ))</div><div class='del'>-#define PIC_IRQ_IS_IRT(irq)		(((irq) &gt;= PIC_IRT_FIRST_IRQ) &amp;&amp; \</div><div class='del'>-					((irq) &lt;= PIC_IRT_LAST_IRQ))</div><div class='del'>-#endif</div><div class='add'>+static inline void</div><div class='add'>+nlm_pic_send_ipi(uint64_t base, int hwt, int irq, int nmi)</div><div class='add'>+{</div><div class='add'>+	unsigned int tid, pid;</div><div class='add'>+</div><div class='add'>+	tid = hwt &amp; 0x3;</div><div class='add'>+	pid = (hwt &gt;&gt; 2) &amp; 0x07;</div><div class='add'>+	nlm_write_reg(base, PIC_IPI,</div><div class='add'>+		(pid &lt;&lt; 20) | (tid &lt;&lt; 16) | (nmi &lt;&lt; 8) | irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nlm_pic_ack(uint64_t base, int irt)</div><div class='add'>+{</div><div class='add'>+	nlm_write_reg(base, PIC_INT_ACK, 1u &lt;&lt; irt);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static inline void</div><div class='add'>+nlm_pic_init_irt(uint64_t base, int irt, int irq, int hwt)</div><div class='add'>+{</div><div class='add'>+	nlm_write_reg(base, PIC_IRT_0(irt), (1u &lt;&lt; hwt));</div><div class='add'>+	/* local scheduling, invalid, level by default */</div><div class='add'>+	nlm_write_reg(base, PIC_IRT_1(irt),</div><div class='add'>+		(1 &lt;&lt; 30) | (1 &lt;&lt; 6) | irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern uint64_t nlm_pic_base;</div><div class='add'>+#endif</div><div class='ctx'> #endif /* _ASM_NLM_XLR_PIC_H */</div><div class='head'>diff --git a/arch/mips/include/asm/netlogic/xlr/xlr.h b/arch/mips/include/asm/netlogic/xlr/xlr.h<br/>index 3e6372692a04..ff4a17b0bf78 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/netlogic/xlr/xlr.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/netlogic/xlr/xlr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/netlogic/xlr/xlr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/netlogic/xlr/xlr.h</a></div><div class='hunk'>@@ -40,17 +40,8 @@ struct uart_port;</div><div class='ctx'> unsigned int nlm_xlr_uart_in(struct uart_port *, int);</div><div class='ctx'> void nlm_xlr_uart_out(struct uart_port *, int, int);</div><div class='ctx'> </div><div class='del'>-/* SMP support functions */</div><div class='del'>-struct irq_desc;</div><div class='del'>-void nlm_smp_function_ipi_handler(unsigned int irq, struct irq_desc *desc);</div><div class='del'>-void nlm_smp_resched_ipi_handler(unsigned int irq, struct irq_desc *desc);</div><div class='del'>-int nlm_wakeup_secondary_cpus(u32 wakeup_mask);</div><div class='del'>-void nlm_smp_irq_init(void);</div><div class='del'>-void nlm_boot_smp_nmi(void);</div><div class='del'>-void prom_pre_boot_secondary_cpus(void);</div><div class='del'>-</div><div class='del'>-extern struct plat_smp_ops nlm_smp_ops;</div><div class='del'>-extern unsigned long nlm_common_ebase;</div><div class='add'>+/* SMP helpers */</div><div class='add'>+void xlr_wakeup_secondary_cpus(void);</div><div class='ctx'> </div><div class='ctx'> /* XLS B silicon "Rook" */</div><div class='ctx'> static inline unsigned int nlm_chip_is_xls_b(void)</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-address.h b/arch/mips/include/asm/octeon/cvmx-address.h<br/>index 3c74d826e2e6..3c74d826e2e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-address.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-address.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-address.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-address.h</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-asxx-defs.h b/arch/mips/include/asm/octeon/cvmx-asxx-defs.h<br/>index 91415a85e8d2..91415a85e8d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-asxx-defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-asxx-defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-asxx-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-asxx-defs.h</a></div><div class='head'>diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h b/arch/mips/include/asm/octeon/cvmx-bootinfo.h<br/>index 4e4c3a8282d6..1db1dc2724cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-bootinfo.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-bootinfo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-bootinfo.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-bootinfo.h</a></div><div class='hunk'>@@ -39,7 +39,7 @@</div><div class='ctx'>  * versions.</div><div class='ctx'>  */</div><div class='ctx'> #define CVMX_BOOTINFO_MAJ_VER 1</div><div class='del'>-#define CVMX_BOOTINFO_MIN_VER 2</div><div class='add'>+#define CVMX_BOOTINFO_MIN_VER 3</div><div class='ctx'> </div><div class='ctx'> #if (CVMX_BOOTINFO_MAJ_VER == 1)</div><div class='ctx'> #define CVMX_BOOTINFO_OCTEON_SERIAL_LEN 20</div><div class='hunk'>@@ -116,7 +116,13 @@ struct cvmx_bootinfo {</div><div class='ctx'> 	 */</div><div class='ctx'> 	uint32_t config_flags;</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='add'>+#if (CVMX_BOOTINFO_MIN_VER &gt;= 3)</div><div class='add'>+	/*</div><div class='add'>+	 * Address of the OF Flattened Device Tree structure</div><div class='add'>+	 * describing the board.</div><div class='add'>+	 */</div><div class='add'>+	uint64_t fdt_addr;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define CVMX_BOOTINFO_CFG_FLAG_PCI_HOST			(1ull &lt;&lt; 0)</div><div class='hunk'>@@ -164,6 +170,22 @@ enum cvmx_board_types_enum {</div><div class='ctx'> 	/* Special 'generic' board type, supports many boards */</div><div class='ctx'> 	CVMX_BOARD_TYPE_GENERIC = 28,</div><div class='ctx'> 	CVMX_BOARD_TYPE_EBH5610 = 29,</div><div class='add'>+	CVMX_BOARD_TYPE_LANAI2_A = 30,</div><div class='add'>+	CVMX_BOARD_TYPE_LANAI2_U = 31,</div><div class='add'>+	CVMX_BOARD_TYPE_EBB5600 = 32,</div><div class='add'>+	CVMX_BOARD_TYPE_EBB6300 = 33,</div><div class='add'>+	CVMX_BOARD_TYPE_NIC_XLE_10G = 34,</div><div class='add'>+	CVMX_BOARD_TYPE_LANAI2_G = 35,</div><div class='add'>+	CVMX_BOARD_TYPE_EBT5810 = 36,</div><div class='add'>+	CVMX_BOARD_TYPE_NIC10E = 37,</div><div class='add'>+	CVMX_BOARD_TYPE_EP6300C = 38,</div><div class='add'>+	CVMX_BOARD_TYPE_EBB6800 = 39,</div><div class='add'>+	CVMX_BOARD_TYPE_NIC4E = 40,</div><div class='add'>+	CVMX_BOARD_TYPE_NIC2E = 41,</div><div class='add'>+	CVMX_BOARD_TYPE_EBB6600 = 42,</div><div class='add'>+	CVMX_BOARD_TYPE_REDWING = 43,</div><div class='add'>+	CVMX_BOARD_TYPE_NIC68_4 = 44,</div><div class='add'>+	CVMX_BOARD_TYPE_NIC10E_66 = 45,</div><div class='ctx'> 	CVMX_BOARD_TYPE_MAX,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -181,6 +203,23 @@ enum cvmx_board_types_enum {</div><div class='ctx'> 	CVMX_BOARD_TYPE_CUST_NS0216 = 10002,</div><div class='ctx'> 	CVMX_BOARD_TYPE_CUST_NB5 = 10003,</div><div class='ctx'> 	CVMX_BOARD_TYPE_CUST_WMR500 = 10004,</div><div class='add'>+	CVMX_BOARD_TYPE_CUST_ITB101 = 10005,</div><div class='add'>+	CVMX_BOARD_TYPE_CUST_NTE102 = 10006,</div><div class='add'>+	CVMX_BOARD_TYPE_CUST_AGS103 = 10007,</div><div class='add'>+	CVMX_BOARD_TYPE_CUST_GST104 = 10008,</div><div class='add'>+	CVMX_BOARD_TYPE_CUST_GCT105 = 10009,</div><div class='add'>+	CVMX_BOARD_TYPE_CUST_AGS106 = 10010,</div><div class='add'>+	CVMX_BOARD_TYPE_CUST_SGM107 = 10011,</div><div class='add'>+	CVMX_BOARD_TYPE_CUST_GCT108 = 10012,</div><div class='add'>+	CVMX_BOARD_TYPE_CUST_AGS109 = 10013,</div><div class='add'>+	CVMX_BOARD_TYPE_CUST_GCT110 = 10014,</div><div class='add'>+	CVMX_BOARD_TYPE_CUST_L2_AIR_SENDER = 10015,</div><div class='add'>+	CVMX_BOARD_TYPE_CUST_L2_AIR_RECEIVER = 10016,</div><div class='add'>+	CVMX_BOARD_TYPE_CUST_L2_ACCTON2_TX = 10017,</div><div class='add'>+	CVMX_BOARD_TYPE_CUST_L2_ACCTON2_RX = 10018,</div><div class='add'>+	CVMX_BOARD_TYPE_CUST_L2_WSTRNSNIC_TX = 10019,</div><div class='add'>+	CVMX_BOARD_TYPE_CUST_L2_WSTRNSNIC_RX = 10020,</div><div class='add'>+	CVMX_BOARD_TYPE_CUST_L2_ZINWELL = 10021,</div><div class='ctx'> 	CVMX_BOARD_TYPE_CUST_DEFINED_MAX = 20000,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -241,6 +280,22 @@ static inline const char *cvmx_board_type_to_string(enum</div><div class='ctx'> 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CB5200)</div><div class='ctx'> 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_GENERIC)</div><div class='ctx'> 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBH5610)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_LANAI2_A)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_LANAI2_U)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBB5600)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBB6300)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_NIC_XLE_10G)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_LANAI2_G)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBT5810)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_NIC10E)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EP6300C)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBB6800)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_NIC4E)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_NIC2E)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_EBB6600)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_REDWING)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_NIC68_4)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_NIC10E_66)</div><div class='ctx'> 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_MAX)</div><div class='ctx'> </div><div class='ctx'> 			/* Customer boards listed here */</div><div class='hunk'>@@ -249,6 +304,23 @@ static inline const char *cvmx_board_type_to_string(enum</div><div class='ctx'> 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_NS0216)</div><div class='ctx'> 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_NB5)</div><div class='ctx'> 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_WMR500)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_ITB101)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_NTE102)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_AGS103)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_GST104)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_GCT105)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_AGS106)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_SGM107)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_GCT108)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_AGS109)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_GCT110)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_L2_AIR_SENDER)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_L2_AIR_RECEIVER)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_L2_ACCTON2_TX)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_L2_ACCTON2_RX)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_L2_WSTRNSNIC_TX)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_L2_WSTRNSNIC_RX)</div><div class='add'>+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_L2_ZINWELL)</div><div class='ctx'> 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DEFINED_MAX)</div><div class='ctx'> </div><div class='ctx'> 		    /* Customer private range */</div><div class='hunk'>@@ -265,9 +337,9 @@ static inline const char *cvmx_chip_type_to_string(enum</div><div class='ctx'> {</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 		ENUM_CHIP_TYPE_CASE(CVMX_CHIP_TYPE_NULL)</div><div class='del'>-		    ENUM_CHIP_TYPE_CASE(CVMX_CHIP_SIM_TYPE_DEPRECATED)</div><div class='del'>-		    ENUM_CHIP_TYPE_CASE(CVMX_CHIP_TYPE_OCTEON_SAMPLE)</div><div class='del'>-		    ENUM_CHIP_TYPE_CASE(CVMX_CHIP_TYPE_MAX)</div><div class='add'>+		ENUM_CHIP_TYPE_CASE(CVMX_CHIP_SIM_TYPE_DEPRECATED)</div><div class='add'>+		ENUM_CHIP_TYPE_CASE(CVMX_CHIP_TYPE_OCTEON_SAMPLE)</div><div class='add'>+		ENUM_CHIP_TYPE_CASE(CVMX_CHIP_TYPE_MAX)</div><div class='ctx'> 	}</div><div class='ctx'> 	return "Unsupported Chip";</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-cmd-queue.h b/arch/mips/include/asm/octeon/cvmx-cmd-queue.h<br/>index 614653b686a0..614653b686a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-cmd-queue.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-cmd-queue.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-cmd-queue.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-cmd-queue.h</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-config.h b/arch/mips/include/asm/octeon/cvmx-config.h<br/>index 078a520481cf..26835d1b43b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-config.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-config.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-config.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-config.h</a></div><div class='hunk'>@@ -166,4 +166,3 @@ typedef enum {</div><div class='ctx'> #define CVMX_HELPER_DISABLE_RGMII_BACKPRESSURE 0</div><div class='ctx'> </div><div class='ctx'> #endif /* __CVMX_CONFIG_H__ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-dbg-defs.h b/arch/mips/include/asm/octeon/cvmx-dbg-defs.h<br/>index abbf42d05e5a..abbf42d05e5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-dbg-defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-dbg-defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-dbg-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-dbg-defs.h</a></div><div class='head'>diff --git a/arch/mips/include/asm/octeon/cvmx-dpi-defs.h b/arch/mips/include/asm/octeon/cvmx-dpi-defs.h<br/>new file mode 100644<br/>index 000000000000..c34ad04789ce<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-dpi-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-dpi-defs.h</a></div><div class='hunk'>@@ -0,0 +1,643 @@</div><div class='add'>+/***********************license start***************</div><div class='add'>+ * Author: Cavium Networks</div><div class='add'>+ *</div><div class='add'>+ * Contact: support@caviumnetworks.com</div><div class='add'>+ * This file is part of the OCTEON SDK</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2003-2011 Cavium Networks</div><div class='add'>+ *</div><div class='add'>+ * This file is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License, Version 2, as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This file is distributed in the hope that it will be useful, but</div><div class='add'>+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty</div><div class='add'>+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or</div><div class='add'>+ * NONINFRINGEMENT.  See the GNU General Public License for more</div><div class='add'>+ * details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this file; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</div><div class='add'>+ * or visit http://www.gnu.org/licenses/.</div><div class='add'>+ *</div><div class='add'>+ * This file may also be available under a different license from Cavium.</div><div class='add'>+ * Contact Cavium Networks for more information</div><div class='add'>+ ***********************license end**************************************/</div><div class='add'>+</div><div class='add'>+#ifndef __CVMX_DPI_DEFS_H__</div><div class='add'>+#define __CVMX_DPI_DEFS_H__</div><div class='add'>+</div><div class='add'>+#define CVMX_DPI_BIST_STATUS (CVMX_ADD_IO_SEG(0x0001DF0000000000ull))</div><div class='add'>+#define CVMX_DPI_CTL (CVMX_ADD_IO_SEG(0x0001DF0000000040ull))</div><div class='add'>+#define CVMX_DPI_DMAX_COUNTS(offset) (CVMX_ADD_IO_SEG(0x0001DF0000000300ull) + ((offset) &amp; 7) * 8)</div><div class='add'>+#define CVMX_DPI_DMAX_DBELL(offset) (CVMX_ADD_IO_SEG(0x0001DF0000000200ull) + ((offset) &amp; 7) * 8)</div><div class='add'>+#define CVMX_DPI_DMAX_ERR_RSP_STATUS(offset) (CVMX_ADD_IO_SEG(0x0001DF0000000A80ull) + ((offset) &amp; 7) * 8)</div><div class='add'>+#define CVMX_DPI_DMAX_IBUFF_SADDR(offset) (CVMX_ADD_IO_SEG(0x0001DF0000000280ull) + ((offset) &amp; 7) * 8)</div><div class='add'>+#define CVMX_DPI_DMAX_IFLIGHT(offset) (CVMX_ADD_IO_SEG(0x0001DF0000000A00ull) + ((offset) &amp; 7) * 8)</div><div class='add'>+#define CVMX_DPI_DMAX_NADDR(offset) (CVMX_ADD_IO_SEG(0x0001DF0000000380ull) + ((offset) &amp; 7) * 8)</div><div class='add'>+#define CVMX_DPI_DMAX_REQBNK0(offset) (CVMX_ADD_IO_SEG(0x0001DF0000000400ull) + ((offset) &amp; 7) * 8)</div><div class='add'>+#define CVMX_DPI_DMAX_REQBNK1(offset) (CVMX_ADD_IO_SEG(0x0001DF0000000480ull) + ((offset) &amp; 7) * 8)</div><div class='add'>+#define CVMX_DPI_DMA_CONTROL (CVMX_ADD_IO_SEG(0x0001DF0000000048ull))</div><div class='add'>+#define CVMX_DPI_DMA_ENGX_EN(offset) (CVMX_ADD_IO_SEG(0x0001DF0000000080ull) + ((offset) &amp; 7) * 8)</div><div class='add'>+#define CVMX_DPI_DMA_PPX_CNT(offset) (CVMX_ADD_IO_SEG(0x0001DF0000000B00ull) + ((offset) &amp; 31) * 8)</div><div class='add'>+#define CVMX_DPI_ENGX_BUF(offset) (CVMX_ADD_IO_SEG(0x0001DF0000000880ull) + ((offset) &amp; 7) * 8)</div><div class='add'>+#define CVMX_DPI_INFO_REG (CVMX_ADD_IO_SEG(0x0001DF0000000980ull))</div><div class='add'>+#define CVMX_DPI_INT_EN (CVMX_ADD_IO_SEG(0x0001DF0000000010ull))</div><div class='add'>+#define CVMX_DPI_INT_REG (CVMX_ADD_IO_SEG(0x0001DF0000000008ull))</div><div class='add'>+#define CVMX_DPI_NCBX_CFG(block_id) (CVMX_ADD_IO_SEG(0x0001DF0000000800ull))</div><div class='add'>+#define CVMX_DPI_PINT_INFO (CVMX_ADD_IO_SEG(0x0001DF0000000830ull))</div><div class='add'>+#define CVMX_DPI_PKT_ERR_RSP (CVMX_ADD_IO_SEG(0x0001DF0000000078ull))</div><div class='add'>+#define CVMX_DPI_REQ_ERR_RSP (CVMX_ADD_IO_SEG(0x0001DF0000000058ull))</div><div class='add'>+#define CVMX_DPI_REQ_ERR_RSP_EN (CVMX_ADD_IO_SEG(0x0001DF0000000068ull))</div><div class='add'>+#define CVMX_DPI_REQ_ERR_RST (CVMX_ADD_IO_SEG(0x0001DF0000000060ull))</div><div class='add'>+#define CVMX_DPI_REQ_ERR_RST_EN (CVMX_ADD_IO_SEG(0x0001DF0000000070ull))</div><div class='add'>+#define CVMX_DPI_REQ_ERR_SKIP_COMP (CVMX_ADD_IO_SEG(0x0001DF0000000838ull))</div><div class='add'>+#define CVMX_DPI_REQ_GBL_EN (CVMX_ADD_IO_SEG(0x0001DF0000000050ull))</div><div class='add'>+#define CVMX_DPI_SLI_PRTX_CFG(offset) (CVMX_ADD_IO_SEG(0x0001DF0000000900ull) + ((offset) &amp; 3) * 8)</div><div class='add'>+#define CVMX_DPI_SLI_PRTX_ERR_INFO(offset) (CVMX_ADD_IO_SEG(0x0001DF0000000940ull) + ((offset) &amp; 3) * 8)</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_bist_status {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_bist_status_s {</div><div class='add'>+		uint64_t reserved_47_63:17;</div><div class='add'>+		uint64_t bist:47;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_bist_status_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_bist_status_cn63xx {</div><div class='add'>+		uint64_t reserved_45_63:19;</div><div class='add'>+		uint64_t bist:45;</div><div class='add'>+	} cn63xx;</div><div class='add'>+	struct cvmx_dpi_bist_status_cn63xxp1 {</div><div class='add'>+		uint64_t reserved_37_63:27;</div><div class='add'>+		uint64_t bist:37;</div><div class='add'>+	} cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_bist_status_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_bist_status_cn63xx cn68xx;</div><div class='add'>+	struct cvmx_dpi_bist_status_cn63xx cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_ctl {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_ctl_s {</div><div class='add'>+		uint64_t reserved_2_63:62;</div><div class='add'>+		uint64_t clk:1;</div><div class='add'>+		uint64_t en:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_ctl_cn61xx {</div><div class='add'>+		uint64_t reserved_1_63:63;</div><div class='add'>+		uint64_t en:1;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_dpi_ctl_s cn63xx;</div><div class='add'>+	struct cvmx_dpi_ctl_s cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_ctl_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_ctl_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_ctl_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_dmax_counts {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_dmax_counts_s {</div><div class='add'>+		uint64_t reserved_39_63:25;</div><div class='add'>+		uint64_t fcnt:7;</div><div class='add'>+		uint64_t dbell:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_dmax_counts_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_dmax_counts_s cn63xx;</div><div class='add'>+	struct cvmx_dpi_dmax_counts_s cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_dmax_counts_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_dmax_counts_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_dmax_counts_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_dmax_dbell {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_dmax_dbell_s {</div><div class='add'>+		uint64_t reserved_16_63:48;</div><div class='add'>+		uint64_t dbell:16;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_dmax_dbell_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_dmax_dbell_s cn63xx;</div><div class='add'>+	struct cvmx_dpi_dmax_dbell_s cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_dmax_dbell_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_dmax_dbell_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_dmax_dbell_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_dmax_err_rsp_status {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_dmax_err_rsp_status_s {</div><div class='add'>+		uint64_t reserved_6_63:58;</div><div class='add'>+		uint64_t status:6;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_dmax_err_rsp_status_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_dmax_err_rsp_status_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_dmax_err_rsp_status_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_dmax_err_rsp_status_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_dmax_ibuff_saddr {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_dmax_ibuff_saddr_s {</div><div class='add'>+		uint64_t reserved_62_63:2;</div><div class='add'>+		uint64_t csize:14;</div><div class='add'>+		uint64_t reserved_41_47:7;</div><div class='add'>+		uint64_t idle:1;</div><div class='add'>+		uint64_t saddr:33;</div><div class='add'>+		uint64_t reserved_0_6:7;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_dmax_ibuff_saddr_cn61xx {</div><div class='add'>+		uint64_t reserved_62_63:2;</div><div class='add'>+		uint64_t csize:14;</div><div class='add'>+		uint64_t reserved_41_47:7;</div><div class='add'>+		uint64_t idle:1;</div><div class='add'>+		uint64_t reserved_36_39:4;</div><div class='add'>+		uint64_t saddr:29;</div><div class='add'>+		uint64_t reserved_0_6:7;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_dpi_dmax_ibuff_saddr_cn61xx cn63xx;</div><div class='add'>+	struct cvmx_dpi_dmax_ibuff_saddr_cn61xx cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_dmax_ibuff_saddr_cn61xx cn66xx;</div><div class='add'>+	struct cvmx_dpi_dmax_ibuff_saddr_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_dmax_ibuff_saddr_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_dmax_iflight {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_dmax_iflight_s {</div><div class='add'>+		uint64_t reserved_3_63:61;</div><div class='add'>+		uint64_t cnt:3;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_dmax_iflight_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_dmax_iflight_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_dmax_iflight_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_dmax_iflight_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_dmax_naddr {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_dmax_naddr_s {</div><div class='add'>+		uint64_t reserved_40_63:24;</div><div class='add'>+		uint64_t addr:40;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_dmax_naddr_cn61xx {</div><div class='add'>+		uint64_t reserved_36_63:28;</div><div class='add'>+		uint64_t addr:36;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_dpi_dmax_naddr_cn61xx cn63xx;</div><div class='add'>+	struct cvmx_dpi_dmax_naddr_cn61xx cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_dmax_naddr_cn61xx cn66xx;</div><div class='add'>+	struct cvmx_dpi_dmax_naddr_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_dmax_naddr_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_dmax_reqbnk0 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_dmax_reqbnk0_s {</div><div class='add'>+		uint64_t state:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_dmax_reqbnk0_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_dmax_reqbnk0_s cn63xx;</div><div class='add'>+	struct cvmx_dpi_dmax_reqbnk0_s cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_dmax_reqbnk0_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_dmax_reqbnk0_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_dmax_reqbnk0_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_dmax_reqbnk1 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_dmax_reqbnk1_s {</div><div class='add'>+		uint64_t state:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_dmax_reqbnk1_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_dmax_reqbnk1_s cn63xx;</div><div class='add'>+	struct cvmx_dpi_dmax_reqbnk1_s cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_dmax_reqbnk1_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_dmax_reqbnk1_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_dmax_reqbnk1_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_dma_control {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_dma_control_s {</div><div class='add'>+		uint64_t reserved_62_63:2;</div><div class='add'>+		uint64_t dici_mode:1;</div><div class='add'>+		uint64_t pkt_en1:1;</div><div class='add'>+		uint64_t ffp_dis:1;</div><div class='add'>+		uint64_t commit_mode:1;</div><div class='add'>+		uint64_t pkt_hp:1;</div><div class='add'>+		uint64_t pkt_en:1;</div><div class='add'>+		uint64_t reserved_54_55:2;</div><div class='add'>+		uint64_t dma_enb:6;</div><div class='add'>+		uint64_t reserved_34_47:14;</div><div class='add'>+		uint64_t b0_lend:1;</div><div class='add'>+		uint64_t dwb_denb:1;</div><div class='add'>+		uint64_t dwb_ichk:9;</div><div class='add'>+		uint64_t fpa_que:3;</div><div class='add'>+		uint64_t o_add1:1;</div><div class='add'>+		uint64_t o_ro:1;</div><div class='add'>+		uint64_t o_ns:1;</div><div class='add'>+		uint64_t o_es:2;</div><div class='add'>+		uint64_t o_mode:1;</div><div class='add'>+		uint64_t reserved_0_13:14;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_dma_control_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_dma_control_cn63xx {</div><div class='add'>+		uint64_t reserved_61_63:3;</div><div class='add'>+		uint64_t pkt_en1:1;</div><div class='add'>+		uint64_t ffp_dis:1;</div><div class='add'>+		uint64_t commit_mode:1;</div><div class='add'>+		uint64_t pkt_hp:1;</div><div class='add'>+		uint64_t pkt_en:1;</div><div class='add'>+		uint64_t reserved_54_55:2;</div><div class='add'>+		uint64_t dma_enb:6;</div><div class='add'>+		uint64_t reserved_34_47:14;</div><div class='add'>+		uint64_t b0_lend:1;</div><div class='add'>+		uint64_t dwb_denb:1;</div><div class='add'>+		uint64_t dwb_ichk:9;</div><div class='add'>+		uint64_t fpa_que:3;</div><div class='add'>+		uint64_t o_add1:1;</div><div class='add'>+		uint64_t o_ro:1;</div><div class='add'>+		uint64_t o_ns:1;</div><div class='add'>+		uint64_t o_es:2;</div><div class='add'>+		uint64_t o_mode:1;</div><div class='add'>+		uint64_t reserved_0_13:14;</div><div class='add'>+	} cn63xx;</div><div class='add'>+	struct cvmx_dpi_dma_control_cn63xxp1 {</div><div class='add'>+		uint64_t reserved_59_63:5;</div><div class='add'>+		uint64_t commit_mode:1;</div><div class='add'>+		uint64_t pkt_hp:1;</div><div class='add'>+		uint64_t pkt_en:1;</div><div class='add'>+		uint64_t reserved_54_55:2;</div><div class='add'>+		uint64_t dma_enb:6;</div><div class='add'>+		uint64_t reserved_34_47:14;</div><div class='add'>+		uint64_t b0_lend:1;</div><div class='add'>+		uint64_t dwb_denb:1;</div><div class='add'>+		uint64_t dwb_ichk:9;</div><div class='add'>+		uint64_t fpa_que:3;</div><div class='add'>+		uint64_t o_add1:1;</div><div class='add'>+		uint64_t o_ro:1;</div><div class='add'>+		uint64_t o_ns:1;</div><div class='add'>+		uint64_t o_es:2;</div><div class='add'>+		uint64_t o_mode:1;</div><div class='add'>+		uint64_t reserved_0_13:14;</div><div class='add'>+	} cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_dma_control_cn63xx cn66xx;</div><div class='add'>+	struct cvmx_dpi_dma_control_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_dma_control_cn63xx cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_dma_engx_en {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_dma_engx_en_s {</div><div class='add'>+		uint64_t reserved_8_63:56;</div><div class='add'>+		uint64_t qen:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_dma_engx_en_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_dma_engx_en_s cn63xx;</div><div class='add'>+	struct cvmx_dpi_dma_engx_en_s cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_dma_engx_en_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_dma_engx_en_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_dma_engx_en_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_dma_ppx_cnt {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_dma_ppx_cnt_s {</div><div class='add'>+		uint64_t reserved_16_63:48;</div><div class='add'>+		uint64_t cnt:16;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_dma_ppx_cnt_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_dma_ppx_cnt_s cn68xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_engx_buf {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_engx_buf_s {</div><div class='add'>+		uint64_t reserved_37_63:27;</div><div class='add'>+		uint64_t compblks:5;</div><div class='add'>+		uint64_t reserved_9_31:23;</div><div class='add'>+		uint64_t base:5;</div><div class='add'>+		uint64_t blks:4;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_engx_buf_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_engx_buf_cn63xx {</div><div class='add'>+		uint64_t reserved_8_63:56;</div><div class='add'>+		uint64_t base:4;</div><div class='add'>+		uint64_t blks:4;</div><div class='add'>+	} cn63xx;</div><div class='add'>+	struct cvmx_dpi_engx_buf_cn63xx cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_engx_buf_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_engx_buf_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_engx_buf_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_info_reg {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_info_reg_s {</div><div class='add'>+		uint64_t reserved_8_63:56;</div><div class='add'>+		uint64_t ffp:4;</div><div class='add'>+		uint64_t reserved_2_3:2;</div><div class='add'>+		uint64_t ncb:1;</div><div class='add'>+		uint64_t rsl:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_info_reg_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_info_reg_s cn63xx;</div><div class='add'>+	struct cvmx_dpi_info_reg_cn63xxp1 {</div><div class='add'>+		uint64_t reserved_2_63:62;</div><div class='add'>+		uint64_t ncb:1;</div><div class='add'>+		uint64_t rsl:1;</div><div class='add'>+	} cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_info_reg_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_info_reg_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_info_reg_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_int_en {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_int_en_s {</div><div class='add'>+		uint64_t reserved_28_63:36;</div><div class='add'>+		uint64_t sprt3_rst:1;</div><div class='add'>+		uint64_t sprt2_rst:1;</div><div class='add'>+		uint64_t sprt1_rst:1;</div><div class='add'>+		uint64_t sprt0_rst:1;</div><div class='add'>+		uint64_t reserved_23_23:1;</div><div class='add'>+		uint64_t req_badfil:1;</div><div class='add'>+		uint64_t req_inull:1;</div><div class='add'>+		uint64_t req_anull:1;</div><div class='add'>+		uint64_t req_undflw:1;</div><div class='add'>+		uint64_t req_ovrflw:1;</div><div class='add'>+		uint64_t req_badlen:1;</div><div class='add'>+		uint64_t req_badadr:1;</div><div class='add'>+		uint64_t dmadbo:8;</div><div class='add'>+		uint64_t reserved_2_7:6;</div><div class='add'>+		uint64_t nfovr:1;</div><div class='add'>+		uint64_t nderr:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_int_en_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_int_en_cn63xx {</div><div class='add'>+		uint64_t reserved_26_63:38;</div><div class='add'>+		uint64_t sprt1_rst:1;</div><div class='add'>+		uint64_t sprt0_rst:1;</div><div class='add'>+		uint64_t reserved_23_23:1;</div><div class='add'>+		uint64_t req_badfil:1;</div><div class='add'>+		uint64_t req_inull:1;</div><div class='add'>+		uint64_t req_anull:1;</div><div class='add'>+		uint64_t req_undflw:1;</div><div class='add'>+		uint64_t req_ovrflw:1;</div><div class='add'>+		uint64_t req_badlen:1;</div><div class='add'>+		uint64_t req_badadr:1;</div><div class='add'>+		uint64_t dmadbo:8;</div><div class='add'>+		uint64_t reserved_2_7:6;</div><div class='add'>+		uint64_t nfovr:1;</div><div class='add'>+		uint64_t nderr:1;</div><div class='add'>+	} cn63xx;</div><div class='add'>+	struct cvmx_dpi_int_en_cn63xx cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_int_en_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_int_en_cn63xx cn68xx;</div><div class='add'>+	struct cvmx_dpi_int_en_cn63xx cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_int_reg {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_int_reg_s {</div><div class='add'>+		uint64_t reserved_28_63:36;</div><div class='add'>+		uint64_t sprt3_rst:1;</div><div class='add'>+		uint64_t sprt2_rst:1;</div><div class='add'>+		uint64_t sprt1_rst:1;</div><div class='add'>+		uint64_t sprt0_rst:1;</div><div class='add'>+		uint64_t reserved_23_23:1;</div><div class='add'>+		uint64_t req_badfil:1;</div><div class='add'>+		uint64_t req_inull:1;</div><div class='add'>+		uint64_t req_anull:1;</div><div class='add'>+		uint64_t req_undflw:1;</div><div class='add'>+		uint64_t req_ovrflw:1;</div><div class='add'>+		uint64_t req_badlen:1;</div><div class='add'>+		uint64_t req_badadr:1;</div><div class='add'>+		uint64_t dmadbo:8;</div><div class='add'>+		uint64_t reserved_2_7:6;</div><div class='add'>+		uint64_t nfovr:1;</div><div class='add'>+		uint64_t nderr:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_int_reg_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_int_reg_cn63xx {</div><div class='add'>+		uint64_t reserved_26_63:38;</div><div class='add'>+		uint64_t sprt1_rst:1;</div><div class='add'>+		uint64_t sprt0_rst:1;</div><div class='add'>+		uint64_t reserved_23_23:1;</div><div class='add'>+		uint64_t req_badfil:1;</div><div class='add'>+		uint64_t req_inull:1;</div><div class='add'>+		uint64_t req_anull:1;</div><div class='add'>+		uint64_t req_undflw:1;</div><div class='add'>+		uint64_t req_ovrflw:1;</div><div class='add'>+		uint64_t req_badlen:1;</div><div class='add'>+		uint64_t req_badadr:1;</div><div class='add'>+		uint64_t dmadbo:8;</div><div class='add'>+		uint64_t reserved_2_7:6;</div><div class='add'>+		uint64_t nfovr:1;</div><div class='add'>+		uint64_t nderr:1;</div><div class='add'>+	} cn63xx;</div><div class='add'>+	struct cvmx_dpi_int_reg_cn63xx cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_int_reg_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_int_reg_cn63xx cn68xx;</div><div class='add'>+	struct cvmx_dpi_int_reg_cn63xx cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_ncbx_cfg {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_ncbx_cfg_s {</div><div class='add'>+		uint64_t reserved_6_63:58;</div><div class='add'>+		uint64_t molr:6;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_ncbx_cfg_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_ncbx_cfg_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_ncbx_cfg_s cn68xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_pint_info {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_pint_info_s {</div><div class='add'>+		uint64_t reserved_14_63:50;</div><div class='add'>+		uint64_t iinfo:6;</div><div class='add'>+		uint64_t reserved_6_7:2;</div><div class='add'>+		uint64_t sinfo:6;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_pint_info_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_pint_info_s cn63xx;</div><div class='add'>+	struct cvmx_dpi_pint_info_s cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_pint_info_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_pint_info_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_pint_info_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_pkt_err_rsp {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_pkt_err_rsp_s {</div><div class='add'>+		uint64_t reserved_1_63:63;</div><div class='add'>+		uint64_t pkterr:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_pkt_err_rsp_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_pkt_err_rsp_s cn63xx;</div><div class='add'>+	struct cvmx_dpi_pkt_err_rsp_s cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_pkt_err_rsp_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_pkt_err_rsp_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_pkt_err_rsp_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_req_err_rsp {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_req_err_rsp_s {</div><div class='add'>+		uint64_t reserved_8_63:56;</div><div class='add'>+		uint64_t qerr:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_req_err_rsp_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_req_err_rsp_s cn63xx;</div><div class='add'>+	struct cvmx_dpi_req_err_rsp_s cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_req_err_rsp_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_req_err_rsp_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_req_err_rsp_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_req_err_rsp_en {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_req_err_rsp_en_s {</div><div class='add'>+		uint64_t reserved_8_63:56;</div><div class='add'>+		uint64_t en:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_req_err_rsp_en_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_req_err_rsp_en_s cn63xx;</div><div class='add'>+	struct cvmx_dpi_req_err_rsp_en_s cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_req_err_rsp_en_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_req_err_rsp_en_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_req_err_rsp_en_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_req_err_rst {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_req_err_rst_s {</div><div class='add'>+		uint64_t reserved_8_63:56;</div><div class='add'>+		uint64_t qerr:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_req_err_rst_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_req_err_rst_s cn63xx;</div><div class='add'>+	struct cvmx_dpi_req_err_rst_s cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_req_err_rst_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_req_err_rst_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_req_err_rst_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_req_err_rst_en {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_req_err_rst_en_s {</div><div class='add'>+		uint64_t reserved_8_63:56;</div><div class='add'>+		uint64_t en:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_req_err_rst_en_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_req_err_rst_en_s cn63xx;</div><div class='add'>+	struct cvmx_dpi_req_err_rst_en_s cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_req_err_rst_en_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_req_err_rst_en_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_req_err_rst_en_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_req_err_skip_comp {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_req_err_skip_comp_s {</div><div class='add'>+		uint64_t reserved_24_63:40;</div><div class='add'>+		uint64_t en_rst:8;</div><div class='add'>+		uint64_t reserved_8_15:8;</div><div class='add'>+		uint64_t en_rsp:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_req_err_skip_comp_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_req_err_skip_comp_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_req_err_skip_comp_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_req_err_skip_comp_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_req_gbl_en {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_req_gbl_en_s {</div><div class='add'>+		uint64_t reserved_8_63:56;</div><div class='add'>+		uint64_t qen:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_req_gbl_en_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_req_gbl_en_s cn63xx;</div><div class='add'>+	struct cvmx_dpi_req_gbl_en_s cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_req_gbl_en_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_req_gbl_en_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_req_gbl_en_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_sli_prtx_cfg {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_cfg_s {</div><div class='add'>+		uint64_t reserved_25_63:39;</div><div class='add'>+		uint64_t halt:1;</div><div class='add'>+		uint64_t qlm_cfg:4;</div><div class='add'>+		uint64_t reserved_17_19:3;</div><div class='add'>+		uint64_t rd_mode:1;</div><div class='add'>+		uint64_t reserved_14_15:2;</div><div class='add'>+		uint64_t molr:6;</div><div class='add'>+		uint64_t mps_lim:1;</div><div class='add'>+		uint64_t reserved_5_6:2;</div><div class='add'>+		uint64_t mps:1;</div><div class='add'>+		uint64_t mrrs_lim:1;</div><div class='add'>+		uint64_t reserved_2_2:1;</div><div class='add'>+		uint64_t mrrs:2;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_cfg_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_cfg_cn63xx {</div><div class='add'>+		uint64_t reserved_25_63:39;</div><div class='add'>+		uint64_t halt:1;</div><div class='add'>+		uint64_t reserved_21_23:3;</div><div class='add'>+		uint64_t qlm_cfg:1;</div><div class='add'>+		uint64_t reserved_17_19:3;</div><div class='add'>+		uint64_t rd_mode:1;</div><div class='add'>+		uint64_t reserved_14_15:2;</div><div class='add'>+		uint64_t molr:6;</div><div class='add'>+		uint64_t mps_lim:1;</div><div class='add'>+		uint64_t reserved_5_6:2;</div><div class='add'>+		uint64_t mps:1;</div><div class='add'>+		uint64_t mrrs_lim:1;</div><div class='add'>+		uint64_t reserved_2_2:1;</div><div class='add'>+		uint64_t mrrs:2;</div><div class='add'>+	} cn63xx;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_cfg_cn63xx cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_cfg_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_cfg_cn63xx cn68xx;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_cfg_cn63xx cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_sli_prtx_err {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_err_s {</div><div class='add'>+		uint64_t addr:61;</div><div class='add'>+		uint64_t reserved_0_2:3;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_err_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_err_s cn63xx;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_err_s cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_err_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_err_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_err_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_dpi_sli_prtx_err_info {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_err_info_s {</div><div class='add'>+		uint64_t reserved_9_63:55;</div><div class='add'>+		uint64_t lock:1;</div><div class='add'>+		uint64_t reserved_5_7:3;</div><div class='add'>+		uint64_t type:1;</div><div class='add'>+		uint64_t reserved_3_3:1;</div><div class='add'>+		uint64_t reqq:3;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_err_info_s cn61xx;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_err_info_s cn63xx;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_err_info_s cn63xxp1;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_err_info_s cn66xx;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_err_info_s cn68xx;</div><div class='add'>+	struct cvmx_dpi_sli_prtx_err_info_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-fau.h b/arch/mips/include/asm/octeon/cvmx-fau.h<br/>index a6939fc8ba18..a6939fc8ba18 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-fau.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-fau.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-fau.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-fau.h</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-fpa-defs.h b/arch/mips/include/asm/octeon/cvmx-fpa-defs.h<br/>index bf5546b90110..bf5546b90110 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-fpa-defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-fpa-defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-fpa-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-fpa-defs.h</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-fpa.h b/arch/mips/include/asm/octeon/cvmx-fpa.h<br/>index 1f04f9658736..1f04f9658736 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-fpa.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-fpa.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-fpa.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-fpa.h</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-gmxx-defs.h b/arch/mips/include/asm/octeon/cvmx-gmxx-defs.h<br/>index 946a43a73fd7..946a43a73fd7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-gmxx-defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-gmxx-defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-gmxx-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-gmxx-defs.h</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper-board.h b/arch/mips/include/asm/octeon/cvmx-helper-board.h<br/>index b465bec43553..88527fa835c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper-board.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper-board.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-helper-board.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-helper-board.h</a></div><div class='hunk'>@@ -44,6 +44,12 @@ typedef enum {</div><div class='ctx'> 	set_phy_link_flags_flow_control_mask = 0x3 &lt;&lt; 1,	/* Mask for 2 bit wide flow control field */</div><div class='ctx'> } cvmx_helper_board_set_phy_link_flags_types_t;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Fake IPD port, the RGMII/MII interface may use different PHY, use</div><div class='add'>+ * this macro to return appropriate MIX address to read the PHY.</div><div class='add'>+ */</div><div class='add'>+#define CVMX_HELPER_BOARD_MGMT_IPD_PORT     -10</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * cvmx_override_board_link_get(int ipd_port) is a function</div><div class='ctx'>  * pointer. It is meant to allow customization of the process of</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper-fpa.h b/arch/mips/include/asm/octeon/cvmx-helper-fpa.h<br/>index 5ff8c93198de..5ff8c93198de 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper-fpa.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper-fpa.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-helper-fpa.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-helper-fpa.h</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper-loop.h b/arch/mips/include/asm/octeon/cvmx-helper-loop.h<br/>index e646a6ccce75..077f0e9d3b2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper-loop.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper-loop.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-helper-loop.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-helper-loop.h</a></div><div class='hunk'>@@ -44,6 +44,7 @@</div><div class='ctx'>  * Returns Number of ports on the interface. Zero to disable.</div><div class='ctx'>  */</div><div class='ctx'> extern int __cvmx_helper_loop_probe(int interface);</div><div class='add'>+static inline int __cvmx_helper_loop_enumerate(int interface) {return 4; }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Bringup and enable a LOOP interface. After this call packet</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper-npi.h b/arch/mips/include/asm/octeon/cvmx-helper-npi.h<br/>index 908e7b08c214..8df4c7fafdba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper-npi.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper-npi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-helper-npi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-helper-npi.h</a></div><div class='hunk'>@@ -45,6 +45,7 @@</div><div class='ctx'>  * Returns Number of ports on the interface. Zero to disable.</div><div class='ctx'>  */</div><div class='ctx'> extern int __cvmx_helper_npi_probe(int interface);</div><div class='add'>+#define __cvmx_helper_npi_enumerate __cvmx_helper_npi_probe</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Bringup and enable a NPI interface. After this call packet</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper-rgmii.h b/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h<br/>index ea2652604a57..78295ba0050f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper-rgmii.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper-rgmii.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-helper-rgmii.h</a></div><div class='hunk'>@@ -43,6 +43,7 @@</div><div class='ctx'>  * Returns Number of RGMII/GMII/MII ports (0-4).</div><div class='ctx'>  */</div><div class='ctx'> extern int __cvmx_helper_rgmii_probe(int interface);</div><div class='add'>+#define __cvmx_helper_rgmii_enumerate __cvmx_helper_rgmii_probe</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Put an RGMII interface in loopback mode. Internal packets sent</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper-sgmii.h b/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h<br/>index 19b48d60857f..9a9b6c103ede 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper-sgmii.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper-sgmii.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-helper-sgmii.h</a></div><div class='hunk'>@@ -45,6 +45,7 @@</div><div class='ctx'>  * Returns Number of ports on the interface. Zero to disable.</div><div class='ctx'>  */</div><div class='ctx'> extern int __cvmx_helper_sgmii_probe(int interface);</div><div class='add'>+extern int __cvmx_helper_sgmii_enumerate(int interface);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Bringup and enable a SGMII interface. After this call packet</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper-spi.h b/arch/mips/include/asm/octeon/cvmx-helper-spi.h<br/>index 69bac036d10e..9f1c6b968f91 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper-spi.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper-spi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-helper-spi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-helper-spi.h</a></div><div class='hunk'>@@ -42,6 +42,7 @@</div><div class='ctx'>  * Returns Number of ports on the interface. Zero to disable.</div><div class='ctx'>  */</div><div class='ctx'> extern int __cvmx_helper_spi_probe(int interface);</div><div class='add'>+extern int __cvmx_helper_spi_enumerate(int interface);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Bringup and enable a SPI interface. After this call packet I/O</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper-util.h b/arch/mips/include/asm/octeon/cvmx-helper-util.h<br/>index 6a6e52fc22c1..6a6e52fc22c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper-util.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper-util.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-helper-util.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-helper-util.h</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper-xaui.h b/arch/mips/include/asm/octeon/cvmx-helper-xaui.h<br/>index 4b4db2f93cd4..f6fbc4f45b56 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper-xaui.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper-xaui.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-helper-xaui.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-helper-xaui.h</a></div><div class='hunk'>@@ -45,6 +45,7 @@</div><div class='ctx'>  * Returns Number of ports on the interface. Zero to disable.</div><div class='ctx'>  */</div><div class='ctx'> extern int __cvmx_helper_xaui_probe(int interface);</div><div class='add'>+extern int __cvmx_helper_xaui_enumerate(int interface);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Bringup and enable a XAUI interface. After this call packet</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-helper.h b/arch/mips/include/asm/octeon/cvmx-helper.h<br/>index 51916f3cc40c..3169cd79f2ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-helper.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-helper.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-helper.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-helper.h</a></div><div class='hunk'>@@ -207,6 +207,7 @@ extern int cvmx_helper_link_set(int ipd_port,</div><div class='ctx'>  * Returns Zero on success, negative on failure</div><div class='ctx'>  */</div><div class='ctx'> extern int cvmx_helper_interface_probe(int interface);</div><div class='add'>+extern int cvmx_helper_interface_enumerate(int interface);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Configure a port for internal and/or external loopback. Internal loopback</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-ipd.h b/arch/mips/include/asm/octeon/cvmx-ipd.h<br/>index 115a552c5c7f..115a552c5c7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-ipd.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-ipd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-ipd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-ipd.h</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-mdio.h b/arch/mips/include/asm/octeon/cvmx-mdio.h<br/>index d88ab8d8e37d..d88ab8d8e37d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-mdio.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-mdio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-mdio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-mdio.h</a></div><div class='head'>diff --git a/arch/mips/include/asm/octeon/cvmx-mio-defs.h b/arch/mips/include/asm/octeon/cvmx-mio-defs.h<br/>index 52b14a333ad4..b1774126736d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-mio-defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-mio-defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-mio-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-mio-defs.h</a></div><div class='hunk'>@@ -43,6 +43,22 @@</div><div class='ctx'> #define CVMX_MIO_BOOT_REG_CFGX(offset) (CVMX_ADD_IO_SEG(0x0001180000000000ull) + ((offset) &amp; 7) * 8)</div><div class='ctx'> #define CVMX_MIO_BOOT_REG_TIMX(offset) (CVMX_ADD_IO_SEG(0x0001180000000040ull) + ((offset) &amp; 7) * 8)</div><div class='ctx'> #define CVMX_MIO_BOOT_THR (CVMX_ADD_IO_SEG(0x00011800000000B0ull))</div><div class='add'>+#define CVMX_MIO_EMM_BUF_DAT (CVMX_ADD_IO_SEG(0x00011800000020E8ull))</div><div class='add'>+#define CVMX_MIO_EMM_BUF_IDX (CVMX_ADD_IO_SEG(0x00011800000020E0ull))</div><div class='add'>+#define CVMX_MIO_EMM_CFG (CVMX_ADD_IO_SEG(0x0001180000002000ull))</div><div class='add'>+#define CVMX_MIO_EMM_CMD (CVMX_ADD_IO_SEG(0x0001180000002058ull))</div><div class='add'>+#define CVMX_MIO_EMM_DMA (CVMX_ADD_IO_SEG(0x0001180000002050ull))</div><div class='add'>+#define CVMX_MIO_EMM_INT (CVMX_ADD_IO_SEG(0x0001180000002078ull))</div><div class='add'>+#define CVMX_MIO_EMM_INT_EN (CVMX_ADD_IO_SEG(0x0001180000002080ull))</div><div class='add'>+#define CVMX_MIO_EMM_MODEX(offset) (CVMX_ADD_IO_SEG(0x0001180000002008ull) + ((offset) &amp; 3) * 8)</div><div class='add'>+#define CVMX_MIO_EMM_RCA (CVMX_ADD_IO_SEG(0x00011800000020A0ull))</div><div class='add'>+#define CVMX_MIO_EMM_RSP_HI (CVMX_ADD_IO_SEG(0x0001180000002070ull))</div><div class='add'>+#define CVMX_MIO_EMM_RSP_LO (CVMX_ADD_IO_SEG(0x0001180000002068ull))</div><div class='add'>+#define CVMX_MIO_EMM_RSP_STS (CVMX_ADD_IO_SEG(0x0001180000002060ull))</div><div class='add'>+#define CVMX_MIO_EMM_SAMPLE (CVMX_ADD_IO_SEG(0x0001180000002090ull))</div><div class='add'>+#define CVMX_MIO_EMM_STS_MASK (CVMX_ADD_IO_SEG(0x0001180000002098ull))</div><div class='add'>+#define CVMX_MIO_EMM_SWITCH (CVMX_ADD_IO_SEG(0x0001180000002048ull))</div><div class='add'>+#define CVMX_MIO_EMM_WDOG (CVMX_ADD_IO_SEG(0x0001180000002088ull))</div><div class='ctx'> #define CVMX_MIO_FUS_BNK_DATX(offset) (CVMX_ADD_IO_SEG(0x0001180000001520ull) + ((offset) &amp; 3) * 8)</div><div class='ctx'> #define CVMX_MIO_FUS_DAT0 (CVMX_ADD_IO_SEG(0x0001180000001400ull))</div><div class='ctx'> #define CVMX_MIO_FUS_DAT1 (CVMX_ADD_IO_SEG(0x0001180000001408ull))</div><div class='hunk'>@@ -60,6 +76,7 @@</div><div class='ctx'> #define CVMX_MIO_FUS_REPAIR_RES2 (CVMX_ADD_IO_SEG(0x0001180000001568ull))</div><div class='ctx'> #define CVMX_MIO_FUS_SPR_REPAIR_RES (CVMX_ADD_IO_SEG(0x0001180000001548ull))</div><div class='ctx'> #define CVMX_MIO_FUS_SPR_REPAIR_SUM (CVMX_ADD_IO_SEG(0x0001180000001540ull))</div><div class='add'>+#define CVMX_MIO_FUS_TGG (CVMX_ADD_IO_SEG(0x0001180000001428ull))</div><div class='ctx'> #define CVMX_MIO_FUS_UNLOCK (CVMX_ADD_IO_SEG(0x0001180000001578ull))</div><div class='ctx'> #define CVMX_MIO_FUS_WADR (CVMX_ADD_IO_SEG(0x0001180000001508ull))</div><div class='ctx'> #define CVMX_MIO_GPIO_COMP (CVMX_ADD_IO_SEG(0x00011800000000C8ull))</div><div class='hunk'>@@ -68,14 +85,25 @@</div><div class='ctx'> #define CVMX_MIO_NDF_DMA_INT_EN (CVMX_ADD_IO_SEG(0x0001180000000178ull))</div><div class='ctx'> #define CVMX_MIO_PLL_CTL (CVMX_ADD_IO_SEG(0x0001180000001448ull))</div><div class='ctx'> #define CVMX_MIO_PLL_SETTING (CVMX_ADD_IO_SEG(0x0001180000001440ull))</div><div class='add'>+#define CVMX_MIO_PTP_CKOUT_HI_INCR (CVMX_ADD_IO_SEG(0x0001070000000F40ull))</div><div class='add'>+#define CVMX_MIO_PTP_CKOUT_LO_INCR (CVMX_ADD_IO_SEG(0x0001070000000F48ull))</div><div class='add'>+#define CVMX_MIO_PTP_CKOUT_THRESH_HI (CVMX_ADD_IO_SEG(0x0001070000000F38ull))</div><div class='add'>+#define CVMX_MIO_PTP_CKOUT_THRESH_LO (CVMX_ADD_IO_SEG(0x0001070000000F30ull))</div><div class='ctx'> #define CVMX_MIO_PTP_CLOCK_CFG (CVMX_ADD_IO_SEG(0x0001070000000F00ull))</div><div class='ctx'> #define CVMX_MIO_PTP_CLOCK_COMP (CVMX_ADD_IO_SEG(0x0001070000000F18ull))</div><div class='ctx'> #define CVMX_MIO_PTP_CLOCK_HI (CVMX_ADD_IO_SEG(0x0001070000000F10ull))</div><div class='ctx'> #define CVMX_MIO_PTP_CLOCK_LO (CVMX_ADD_IO_SEG(0x0001070000000F08ull))</div><div class='ctx'> #define CVMX_MIO_PTP_EVT_CNT (CVMX_ADD_IO_SEG(0x0001070000000F28ull))</div><div class='add'>+#define CVMX_MIO_PTP_PPS_HI_INCR (CVMX_ADD_IO_SEG(0x0001070000000F60ull))</div><div class='add'>+#define CVMX_MIO_PTP_PPS_LO_INCR (CVMX_ADD_IO_SEG(0x0001070000000F68ull))</div><div class='add'>+#define CVMX_MIO_PTP_PPS_THRESH_HI (CVMX_ADD_IO_SEG(0x0001070000000F58ull))</div><div class='add'>+#define CVMX_MIO_PTP_PPS_THRESH_LO (CVMX_ADD_IO_SEG(0x0001070000000F50ull))</div><div class='ctx'> #define CVMX_MIO_PTP_TIMESTAMP (CVMX_ADD_IO_SEG(0x0001070000000F20ull))</div><div class='add'>+#define CVMX_MIO_QLMX_CFG(offset) (CVMX_ADD_IO_SEG(0x0001180000001590ull) + ((offset) &amp; 7) * 8)</div><div class='ctx'> #define CVMX_MIO_RST_BOOT (CVMX_ADD_IO_SEG(0x0001180000001600ull))</div><div class='ctx'> #define CVMX_MIO_RST_CFG (CVMX_ADD_IO_SEG(0x0001180000001610ull))</div><div class='add'>+#define CVMX_MIO_RST_CKILL (CVMX_ADD_IO_SEG(0x0001180000001638ull))</div><div class='add'>+#define CVMX_MIO_RST_CNTLX(offset) (CVMX_ADD_IO_SEG(0x0001180000001648ull) + ((offset) &amp; 3) * 8)</div><div class='ctx'> #define CVMX_MIO_RST_CTLX(offset) (CVMX_ADD_IO_SEG(0x0001180000001618ull) + ((offset) &amp; 1) * 8)</div><div class='ctx'> #define CVMX_MIO_RST_DELAY (CVMX_ADD_IO_SEG(0x0001180000001608ull))</div><div class='ctx'> #define CVMX_MIO_RST_INT (CVMX_ADD_IO_SEG(0x0001180000001628ull))</div><div class='hunk'>@@ -183,11 +211,21 @@ union cvmx_mio_boot_bist_stat {</div><div class='ctx'> 	struct cvmx_mio_boot_bist_stat_cn52xxp1 cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_boot_bist_stat_cn38xx cn58xx;</div><div class='ctx'> 	struct cvmx_mio_boot_bist_stat_cn38xx cn58xxp1;</div><div class='add'>+	struct cvmx_mio_boot_bist_stat_cn61xx {</div><div class='add'>+		uint64_t reserved_12_63:52;</div><div class='add'>+		uint64_t stat:12;</div><div class='add'>+	} cn61xx;</div><div class='ctx'> 	struct cvmx_mio_boot_bist_stat_cn63xx {</div><div class='ctx'> 		uint64_t reserved_9_63:55;</div><div class='ctx'> 		uint64_t stat:9;</div><div class='ctx'> 	} cn63xx;</div><div class='ctx'> 	struct cvmx_mio_boot_bist_stat_cn63xx cn63xxp1;</div><div class='add'>+	struct cvmx_mio_boot_bist_stat_cn66xx {</div><div class='add'>+		uint64_t reserved_10_63:54;</div><div class='add'>+		uint64_t stat:10;</div><div class='add'>+	} cn66xx;</div><div class='add'>+	struct cvmx_mio_boot_bist_stat_cn66xx cn68xx;</div><div class='add'>+	struct cvmx_mio_boot_bist_stat_cn66xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_boot_comp {</div><div class='hunk'>@@ -204,12 +242,16 @@ union cvmx_mio_boot_comp {</div><div class='ctx'> 	struct cvmx_mio_boot_comp_cn50xx cn52xxp1;</div><div class='ctx'> 	struct cvmx_mio_boot_comp_cn50xx cn56xx;</div><div class='ctx'> 	struct cvmx_mio_boot_comp_cn50xx cn56xxp1;</div><div class='del'>-	struct cvmx_mio_boot_comp_cn63xx {</div><div class='add'>+	struct cvmx_mio_boot_comp_cn61xx {</div><div class='ctx'> 		uint64_t reserved_12_63:52;</div><div class='ctx'> 		uint64_t pctl:6;</div><div class='ctx'> 		uint64_t nctl:6;</div><div class='del'>-	} cn63xx;</div><div class='del'>-	struct cvmx_mio_boot_comp_cn63xx cn63xxp1;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_mio_boot_comp_cn61xx cn63xx;</div><div class='add'>+	struct cvmx_mio_boot_comp_cn61xx cn63xxp1;</div><div class='add'>+	struct cvmx_mio_boot_comp_cn61xx cn66xx;</div><div class='add'>+	struct cvmx_mio_boot_comp_cn61xx cn68xx;</div><div class='add'>+	struct cvmx_mio_boot_comp_cn61xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_boot_dma_cfgx {</div><div class='hunk'>@@ -230,8 +272,12 @@ union cvmx_mio_boot_dma_cfgx {</div><div class='ctx'> 	struct cvmx_mio_boot_dma_cfgx_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_mio_boot_dma_cfgx_s cn56xx;</div><div class='ctx'> 	struct cvmx_mio_boot_dma_cfgx_s cn56xxp1;</div><div class='add'>+	struct cvmx_mio_boot_dma_cfgx_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_boot_dma_cfgx_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_boot_dma_cfgx_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_boot_dma_cfgx_s cn66xx;</div><div class='add'>+	struct cvmx_mio_boot_dma_cfgx_s cn68xx;</div><div class='add'>+	struct cvmx_mio_boot_dma_cfgx_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_boot_dma_intx {</div><div class='hunk'>@@ -245,8 +291,12 @@ union cvmx_mio_boot_dma_intx {</div><div class='ctx'> 	struct cvmx_mio_boot_dma_intx_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_mio_boot_dma_intx_s cn56xx;</div><div class='ctx'> 	struct cvmx_mio_boot_dma_intx_s cn56xxp1;</div><div class='add'>+	struct cvmx_mio_boot_dma_intx_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_boot_dma_intx_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_boot_dma_intx_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_boot_dma_intx_s cn66xx;</div><div class='add'>+	struct cvmx_mio_boot_dma_intx_s cn68xx;</div><div class='add'>+	struct cvmx_mio_boot_dma_intx_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_boot_dma_int_enx {</div><div class='hunk'>@@ -260,8 +310,12 @@ union cvmx_mio_boot_dma_int_enx {</div><div class='ctx'> 	struct cvmx_mio_boot_dma_int_enx_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_mio_boot_dma_int_enx_s cn56xx;</div><div class='ctx'> 	struct cvmx_mio_boot_dma_int_enx_s cn56xxp1;</div><div class='add'>+	struct cvmx_mio_boot_dma_int_enx_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_boot_dma_int_enx_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_boot_dma_int_enx_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_boot_dma_int_enx_s cn66xx;</div><div class='add'>+	struct cvmx_mio_boot_dma_int_enx_s cn68xx;</div><div class='add'>+	struct cvmx_mio_boot_dma_int_enx_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_boot_dma_timx {</div><div class='hunk'>@@ -287,8 +341,12 @@ union cvmx_mio_boot_dma_timx {</div><div class='ctx'> 	struct cvmx_mio_boot_dma_timx_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_mio_boot_dma_timx_s cn56xx;</div><div class='ctx'> 	struct cvmx_mio_boot_dma_timx_s cn56xxp1;</div><div class='add'>+	struct cvmx_mio_boot_dma_timx_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_boot_dma_timx_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_boot_dma_timx_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_boot_dma_timx_s cn66xx;</div><div class='add'>+	struct cvmx_mio_boot_dma_timx_s cn68xx;</div><div class='add'>+	struct cvmx_mio_boot_dma_timx_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_boot_err {</div><div class='hunk'>@@ -309,8 +367,12 @@ union cvmx_mio_boot_err {</div><div class='ctx'> 	struct cvmx_mio_boot_err_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_boot_err_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_boot_err_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_boot_err_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_boot_err_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_boot_err_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_boot_err_s cn66xx;</div><div class='add'>+	struct cvmx_mio_boot_err_s cn68xx;</div><div class='add'>+	struct cvmx_mio_boot_err_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_boot_int {</div><div class='hunk'>@@ -331,8 +393,12 @@ union cvmx_mio_boot_int {</div><div class='ctx'> 	struct cvmx_mio_boot_int_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_boot_int_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_boot_int_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_boot_int_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_boot_int_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_boot_int_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_boot_int_s cn66xx;</div><div class='add'>+	struct cvmx_mio_boot_int_s cn68xx;</div><div class='add'>+	struct cvmx_mio_boot_int_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_boot_loc_adr {</div><div class='hunk'>@@ -353,8 +419,12 @@ union cvmx_mio_boot_loc_adr {</div><div class='ctx'> 	struct cvmx_mio_boot_loc_adr_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_boot_loc_adr_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_boot_loc_adr_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_boot_loc_adr_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_boot_loc_adr_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_boot_loc_adr_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_boot_loc_adr_s cn66xx;</div><div class='add'>+	struct cvmx_mio_boot_loc_adr_s cn68xx;</div><div class='add'>+	struct cvmx_mio_boot_loc_adr_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_boot_loc_cfgx {</div><div class='hunk'>@@ -377,8 +447,12 @@ union cvmx_mio_boot_loc_cfgx {</div><div class='ctx'> 	struct cvmx_mio_boot_loc_cfgx_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_boot_loc_cfgx_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_boot_loc_cfgx_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_boot_loc_cfgx_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_boot_loc_cfgx_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_boot_loc_cfgx_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_boot_loc_cfgx_s cn66xx;</div><div class='add'>+	struct cvmx_mio_boot_loc_cfgx_s cn68xx;</div><div class='add'>+	struct cvmx_mio_boot_loc_cfgx_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_boot_loc_dat {</div><div class='hunk'>@@ -397,14 +471,19 @@ union cvmx_mio_boot_loc_dat {</div><div class='ctx'> 	struct cvmx_mio_boot_loc_dat_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_boot_loc_dat_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_boot_loc_dat_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_boot_loc_dat_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_boot_loc_dat_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_boot_loc_dat_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_boot_loc_dat_s cn66xx;</div><div class='add'>+	struct cvmx_mio_boot_loc_dat_s cn68xx;</div><div class='add'>+	struct cvmx_mio_boot_loc_dat_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_boot_pin_defs {</div><div class='ctx'> 	uint64_t u64;</div><div class='ctx'> 	struct cvmx_mio_boot_pin_defs_s {</div><div class='del'>-		uint64_t reserved_16_63:48;</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t user1:16;</div><div class='ctx'> 		uint64_t ale:1;</div><div class='ctx'> 		uint64_t width:1;</div><div class='ctx'> 		uint64_t dmack_p2:1;</div><div class='hunk'>@@ -412,7 +491,7 @@ union cvmx_mio_boot_pin_defs {</div><div class='ctx'> 		uint64_t dmack_p0:1;</div><div class='ctx'> 		uint64_t term:2;</div><div class='ctx'> 		uint64_t nand:1;</div><div class='del'>-		uint64_t reserved_0_7:8;</div><div class='add'>+		uint64_t user0:8;</div><div class='ctx'> 	} s;</div><div class='ctx'> 	struct cvmx_mio_boot_pin_defs_cn52xx {</div><div class='ctx'> 		uint64_t reserved_16_63:48;</div><div class='hunk'>@@ -435,8 +514,23 @@ union cvmx_mio_boot_pin_defs {</div><div class='ctx'> 		uint64_t term:2;</div><div class='ctx'> 		uint64_t reserved_0_8:9;</div><div class='ctx'> 	} cn56xx;</div><div class='add'>+	struct cvmx_mio_boot_pin_defs_cn61xx {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t user1:16;</div><div class='add'>+		uint64_t ale:1;</div><div class='add'>+		uint64_t width:1;</div><div class='add'>+		uint64_t reserved_13_13:1;</div><div class='add'>+		uint64_t dmack_p1:1;</div><div class='add'>+		uint64_t dmack_p0:1;</div><div class='add'>+		uint64_t term:2;</div><div class='add'>+		uint64_t nand:1;</div><div class='add'>+		uint64_t user0:8;</div><div class='add'>+	} cn61xx;</div><div class='ctx'> 	struct cvmx_mio_boot_pin_defs_cn52xx cn63xx;</div><div class='ctx'> 	struct cvmx_mio_boot_pin_defs_cn52xx cn63xxp1;</div><div class='add'>+	struct cvmx_mio_boot_pin_defs_cn52xx cn66xx;</div><div class='add'>+	struct cvmx_mio_boot_pin_defs_cn52xx cn68xx;</div><div class='add'>+	struct cvmx_mio_boot_pin_defs_cn52xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_boot_reg_cfgx {</div><div class='hunk'>@@ -498,8 +592,12 @@ union cvmx_mio_boot_reg_cfgx {</div><div class='ctx'> 	struct cvmx_mio_boot_reg_cfgx_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_boot_reg_cfgx_cn30xx cn58xx;</div><div class='ctx'> 	struct cvmx_mio_boot_reg_cfgx_cn30xx cn58xxp1;</div><div class='add'>+	struct cvmx_mio_boot_reg_cfgx_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_boot_reg_cfgx_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_boot_reg_cfgx_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_boot_reg_cfgx_s cn66xx;</div><div class='add'>+	struct cvmx_mio_boot_reg_cfgx_s cn68xx;</div><div class='add'>+	struct cvmx_mio_boot_reg_cfgx_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_boot_reg_timx {</div><div class='hunk'>@@ -544,8 +642,12 @@ union cvmx_mio_boot_reg_timx {</div><div class='ctx'> 	struct cvmx_mio_boot_reg_timx_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_boot_reg_timx_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_boot_reg_timx_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_boot_reg_timx_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_boot_reg_timx_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_boot_reg_timx_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_boot_reg_timx_s cn66xx;</div><div class='add'>+	struct cvmx_mio_boot_reg_timx_s cn68xx;</div><div class='add'>+	struct cvmx_mio_boot_reg_timx_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_boot_thr {</div><div class='hunk'>@@ -574,8 +676,231 @@ union cvmx_mio_boot_thr {</div><div class='ctx'> 	struct cvmx_mio_boot_thr_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_boot_thr_cn30xx cn58xx;</div><div class='ctx'> 	struct cvmx_mio_boot_thr_cn30xx cn58xxp1;</div><div class='add'>+	struct cvmx_mio_boot_thr_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_boot_thr_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_boot_thr_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_boot_thr_s cn66xx;</div><div class='add'>+	struct cvmx_mio_boot_thr_s cn68xx;</div><div class='add'>+	struct cvmx_mio_boot_thr_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_emm_buf_dat {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_emm_buf_dat_s {</div><div class='add'>+		uint64_t dat:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_emm_buf_dat_s cn61xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_emm_buf_idx {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_emm_buf_idx_s {</div><div class='add'>+		uint64_t reserved_17_63:47;</div><div class='add'>+		uint64_t inc:1;</div><div class='add'>+		uint64_t reserved_7_15:9;</div><div class='add'>+		uint64_t buf_num:1;</div><div class='add'>+		uint64_t offset:6;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_emm_buf_idx_s cn61xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_emm_cfg {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_emm_cfg_s {</div><div class='add'>+		uint64_t reserved_17_63:47;</div><div class='add'>+		uint64_t boot_fail:1;</div><div class='add'>+		uint64_t reserved_4_15:12;</div><div class='add'>+		uint64_t bus_ena:4;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_emm_cfg_s cn61xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_emm_cmd {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_emm_cmd_s {</div><div class='add'>+		uint64_t reserved_62_63:2;</div><div class='add'>+		uint64_t bus_id:2;</div><div class='add'>+		uint64_t cmd_val:1;</div><div class='add'>+		uint64_t reserved_56_58:3;</div><div class='add'>+		uint64_t dbuf:1;</div><div class='add'>+		uint64_t offset:6;</div><div class='add'>+		uint64_t reserved_43_48:6;</div><div class='add'>+		uint64_t ctype_xor:2;</div><div class='add'>+		uint64_t rtype_xor:3;</div><div class='add'>+		uint64_t cmd_idx:6;</div><div class='add'>+		uint64_t arg:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_emm_cmd_s cn61xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_emm_dma {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_emm_dma_s {</div><div class='add'>+		uint64_t reserved_62_63:2;</div><div class='add'>+		uint64_t bus_id:2;</div><div class='add'>+		uint64_t dma_val:1;</div><div class='add'>+		uint64_t sector:1;</div><div class='add'>+		uint64_t dat_null:1;</div><div class='add'>+		uint64_t thres:6;</div><div class='add'>+		uint64_t rel_wr:1;</div><div class='add'>+		uint64_t rw:1;</div><div class='add'>+		uint64_t multi:1;</div><div class='add'>+		uint64_t block_cnt:16;</div><div class='add'>+		uint64_t card_addr:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_emm_dma_s cn61xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_emm_int {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_emm_int_s {</div><div class='add'>+		uint64_t reserved_7_63:57;</div><div class='add'>+		uint64_t switch_err:1;</div><div class='add'>+		uint64_t switch_done:1;</div><div class='add'>+		uint64_t dma_err:1;</div><div class='add'>+		uint64_t cmd_err:1;</div><div class='add'>+		uint64_t dma_done:1;</div><div class='add'>+		uint64_t cmd_done:1;</div><div class='add'>+		uint64_t buf_done:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_emm_int_s cn61xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_emm_int_en {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_emm_int_en_s {</div><div class='add'>+		uint64_t reserved_7_63:57;</div><div class='add'>+		uint64_t switch_err:1;</div><div class='add'>+		uint64_t switch_done:1;</div><div class='add'>+		uint64_t dma_err:1;</div><div class='add'>+		uint64_t cmd_err:1;</div><div class='add'>+		uint64_t dma_done:1;</div><div class='add'>+		uint64_t cmd_done:1;</div><div class='add'>+		uint64_t buf_done:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_emm_int_en_s cn61xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_emm_modex {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_emm_modex_s {</div><div class='add'>+		uint64_t reserved_49_63:15;</div><div class='add'>+		uint64_t hs_timing:1;</div><div class='add'>+		uint64_t reserved_43_47:5;</div><div class='add'>+		uint64_t bus_width:3;</div><div class='add'>+		uint64_t reserved_36_39:4;</div><div class='add'>+		uint64_t power_class:4;</div><div class='add'>+		uint64_t clk_hi:16;</div><div class='add'>+		uint64_t clk_lo:16;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_emm_modex_s cn61xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_emm_rca {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_emm_rca_s {</div><div class='add'>+		uint64_t reserved_16_63:48;</div><div class='add'>+		uint64_t card_rca:16;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_emm_rca_s cn61xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_emm_rsp_hi {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_emm_rsp_hi_s {</div><div class='add'>+		uint64_t dat:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_emm_rsp_hi_s cn61xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_emm_rsp_lo {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_emm_rsp_lo_s {</div><div class='add'>+		uint64_t dat:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_emm_rsp_lo_s cn61xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_emm_rsp_sts {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_emm_rsp_sts_s {</div><div class='add'>+		uint64_t reserved_62_63:2;</div><div class='add'>+		uint64_t bus_id:2;</div><div class='add'>+		uint64_t cmd_val:1;</div><div class='add'>+		uint64_t switch_val:1;</div><div class='add'>+		uint64_t dma_val:1;</div><div class='add'>+		uint64_t dma_pend:1;</div><div class='add'>+		uint64_t reserved_29_55:27;</div><div class='add'>+		uint64_t dbuf_err:1;</div><div class='add'>+		uint64_t reserved_24_27:4;</div><div class='add'>+		uint64_t dbuf:1;</div><div class='add'>+		uint64_t blk_timeout:1;</div><div class='add'>+		uint64_t blk_crc_err:1;</div><div class='add'>+		uint64_t rsp_busybit:1;</div><div class='add'>+		uint64_t stp_timeout:1;</div><div class='add'>+		uint64_t stp_crc_err:1;</div><div class='add'>+		uint64_t stp_bad_sts:1;</div><div class='add'>+		uint64_t stp_val:1;</div><div class='add'>+		uint64_t rsp_timeout:1;</div><div class='add'>+		uint64_t rsp_crc_err:1;</div><div class='add'>+		uint64_t rsp_bad_sts:1;</div><div class='add'>+		uint64_t rsp_val:1;</div><div class='add'>+		uint64_t rsp_type:3;</div><div class='add'>+		uint64_t cmd_type:2;</div><div class='add'>+		uint64_t cmd_idx:6;</div><div class='add'>+		uint64_t cmd_done:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_emm_rsp_sts_s cn61xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_emm_sample {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_emm_sample_s {</div><div class='add'>+		uint64_t reserved_26_63:38;</div><div class='add'>+		uint64_t cmd_cnt:10;</div><div class='add'>+		uint64_t reserved_10_15:6;</div><div class='add'>+		uint64_t dat_cnt:10;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_emm_sample_s cn61xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_emm_sts_mask {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_emm_sts_mask_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t sts_msk:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_emm_sts_mask_s cn61xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_emm_switch {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_emm_switch_s {</div><div class='add'>+		uint64_t reserved_62_63:2;</div><div class='add'>+		uint64_t bus_id:2;</div><div class='add'>+		uint64_t switch_exe:1;</div><div class='add'>+		uint64_t switch_err0:1;</div><div class='add'>+		uint64_t switch_err1:1;</div><div class='add'>+		uint64_t switch_err2:1;</div><div class='add'>+		uint64_t reserved_49_55:7;</div><div class='add'>+		uint64_t hs_timing:1;</div><div class='add'>+		uint64_t reserved_43_47:5;</div><div class='add'>+		uint64_t bus_width:3;</div><div class='add'>+		uint64_t reserved_36_39:4;</div><div class='add'>+		uint64_t power_class:4;</div><div class='add'>+		uint64_t clk_hi:16;</div><div class='add'>+		uint64_t clk_lo:16;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_emm_switch_s cn61xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_emm_wdog {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_emm_wdog_s {</div><div class='add'>+		uint64_t reserved_26_63:38;</div><div class='add'>+		uint64_t clk_cnt:26;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_emm_wdog_s cn61xx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_fus_bnk_datx {</div><div class='hunk'>@@ -590,8 +915,12 @@ union cvmx_mio_fus_bnk_datx {</div><div class='ctx'> 	struct cvmx_mio_fus_bnk_datx_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_fus_bnk_datx_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_fus_bnk_datx_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_fus_bnk_datx_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_fus_bnk_datx_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_fus_bnk_datx_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_bnk_datx_s cn66xx;</div><div class='add'>+	struct cvmx_mio_fus_bnk_datx_s cn68xx;</div><div class='add'>+	struct cvmx_mio_fus_bnk_datx_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_fus_dat0 {</div><div class='hunk'>@@ -611,8 +940,12 @@ union cvmx_mio_fus_dat0 {</div><div class='ctx'> 	struct cvmx_mio_fus_dat0_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_fus_dat0_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_fus_dat0_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_fus_dat0_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_fus_dat0_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_fus_dat0_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_dat0_s cn66xx;</div><div class='add'>+	struct cvmx_mio_fus_dat0_s cn68xx;</div><div class='add'>+	struct cvmx_mio_fus_dat0_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_fus_dat1 {</div><div class='hunk'>@@ -632,14 +965,21 @@ union cvmx_mio_fus_dat1 {</div><div class='ctx'> 	struct cvmx_mio_fus_dat1_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_fus_dat1_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_fus_dat1_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_fus_dat1_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_fus_dat1_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_fus_dat1_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_dat1_s cn66xx;</div><div class='add'>+	struct cvmx_mio_fus_dat1_s cn68xx;</div><div class='add'>+	struct cvmx_mio_fus_dat1_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_fus_dat2 {</div><div class='ctx'> 	uint64_t u64;</div><div class='ctx'> 	struct cvmx_mio_fus_dat2_s {</div><div class='del'>-		uint64_t reserved_35_63:29;</div><div class='add'>+		uint64_t reserved_48_63:16;</div><div class='add'>+		uint64_t fus118:1;</div><div class='add'>+		uint64_t rom_info:10;</div><div class='add'>+		uint64_t power_limit:2;</div><div class='ctx'> 		uint64_t dorm_crypto:1;</div><div class='ctx'> 		uint64_t fus318:1;</div><div class='ctx'> 		uint64_t raid_en:1;</div><div class='hunk'>@@ -747,6 +1087,23 @@ union cvmx_mio_fus_dat2 {</div><div class='ctx'> 		uint64_t pp_dis:16;</div><div class='ctx'> 	} cn58xx;</div><div class='ctx'> 	struct cvmx_mio_fus_dat2_cn58xx cn58xxp1;</div><div class='add'>+	struct cvmx_mio_fus_dat2_cn61xx {</div><div class='add'>+		uint64_t reserved_48_63:16;</div><div class='add'>+		uint64_t fus118:1;</div><div class='add'>+		uint64_t rom_info:10;</div><div class='add'>+		uint64_t power_limit:2;</div><div class='add'>+		uint64_t dorm_crypto:1;</div><div class='add'>+		uint64_t fus318:1;</div><div class='add'>+		uint64_t raid_en:1;</div><div class='add'>+		uint64_t reserved_29_31:3;</div><div class='add'>+		uint64_t nodfa_cp2:1;</div><div class='add'>+		uint64_t nomul:1;</div><div class='add'>+		uint64_t nocrypto:1;</div><div class='add'>+		uint64_t reserved_24_25:2;</div><div class='add'>+		uint64_t chip_id:8;</div><div class='add'>+		uint64_t reserved_4_15:12;</div><div class='add'>+		uint64_t pp_dis:4;</div><div class='add'>+	} cn61xx;</div><div class='ctx'> 	struct cvmx_mio_fus_dat2_cn63xx {</div><div class='ctx'> 		uint64_t reserved_35_63:29;</div><div class='ctx'> 		uint64_t dorm_crypto:1;</div><div class='hunk'>@@ -762,6 +1119,38 @@ union cvmx_mio_fus_dat2 {</div><div class='ctx'> 		uint64_t pp_dis:6;</div><div class='ctx'> 	} cn63xx;</div><div class='ctx'> 	struct cvmx_mio_fus_dat2_cn63xx cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_dat2_cn66xx {</div><div class='add'>+		uint64_t reserved_48_63:16;</div><div class='add'>+		uint64_t fus118:1;</div><div class='add'>+		uint64_t rom_info:10;</div><div class='add'>+		uint64_t power_limit:2;</div><div class='add'>+		uint64_t dorm_crypto:1;</div><div class='add'>+		uint64_t fus318:1;</div><div class='add'>+		uint64_t raid_en:1;</div><div class='add'>+		uint64_t reserved_29_31:3;</div><div class='add'>+		uint64_t nodfa_cp2:1;</div><div class='add'>+		uint64_t nomul:1;</div><div class='add'>+		uint64_t nocrypto:1;</div><div class='add'>+		uint64_t reserved_24_25:2;</div><div class='add'>+		uint64_t chip_id:8;</div><div class='add'>+		uint64_t reserved_10_15:6;</div><div class='add'>+		uint64_t pp_dis:10;</div><div class='add'>+	} cn66xx;</div><div class='add'>+	struct cvmx_mio_fus_dat2_cn68xx {</div><div class='add'>+		uint64_t reserved_37_63:27;</div><div class='add'>+		uint64_t power_limit:2;</div><div class='add'>+		uint64_t dorm_crypto:1;</div><div class='add'>+		uint64_t fus318:1;</div><div class='add'>+		uint64_t raid_en:1;</div><div class='add'>+		uint64_t reserved_29_31:3;</div><div class='add'>+		uint64_t nodfa_cp2:1;</div><div class='add'>+		uint64_t nomul:1;</div><div class='add'>+		uint64_t nocrypto:1;</div><div class='add'>+		uint64_t reserved_24_25:2;</div><div class='add'>+		uint64_t chip_id:8;</div><div class='add'>+		uint64_t reserved_0_15:16;</div><div class='add'>+	} cn68xx;</div><div class='add'>+	struct cvmx_mio_fus_dat2_cn68xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_fus_dat3 {</div><div class='hunk'>@@ -834,7 +1223,7 @@ union cvmx_mio_fus_dat3 {</div><div class='ctx'> 	struct cvmx_mio_fus_dat3_cn38xx cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_fus_dat3_cn38xx cn58xx;</div><div class='ctx'> 	struct cvmx_mio_fus_dat3_cn38xx cn58xxp1;</div><div class='del'>-	struct cvmx_mio_fus_dat3_cn63xx {</div><div class='add'>+	struct cvmx_mio_fus_dat3_cn61xx {</div><div class='ctx'> 		uint64_t reserved_58_63:6;</div><div class='ctx'> 		uint64_t pll_ctl:10;</div><div class='ctx'> 		uint64_t dfa_info_dte:3;</div><div class='hunk'>@@ -853,8 +1242,12 @@ union cvmx_mio_fus_dat3 {</div><div class='ctx'> 		uint64_t nozip:1;</div><div class='ctx'> 		uint64_t nodfa_dte:1;</div><div class='ctx'> 		uint64_t reserved_0_23:24;</div><div class='del'>-	} cn63xx;</div><div class='del'>-	struct cvmx_mio_fus_dat3_cn63xx cn63xxp1;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_mio_fus_dat3_cn61xx cn63xx;</div><div class='add'>+	struct cvmx_mio_fus_dat3_cn61xx cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_dat3_cn61xx cn66xx;</div><div class='add'>+	struct cvmx_mio_fus_dat3_cn61xx cn68xx;</div><div class='add'>+	struct cvmx_mio_fus_dat3_cn61xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_fus_ema {</div><div class='hunk'>@@ -875,8 +1268,12 @@ union cvmx_mio_fus_ema {</div><div class='ctx'> 		uint64_t ema:2;</div><div class='ctx'> 	} cn58xx;</div><div class='ctx'> 	struct cvmx_mio_fus_ema_cn58xx cn58xxp1;</div><div class='add'>+	struct cvmx_mio_fus_ema_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_fus_ema_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_fus_ema_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_ema_s cn66xx;</div><div class='add'>+	struct cvmx_mio_fus_ema_s cn68xx;</div><div class='add'>+	struct cvmx_mio_fus_ema_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_fus_pdf {</div><div class='hunk'>@@ -890,14 +1287,21 @@ union cvmx_mio_fus_pdf {</div><div class='ctx'> 	struct cvmx_mio_fus_pdf_s cn56xx;</div><div class='ctx'> 	struct cvmx_mio_fus_pdf_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_fus_pdf_s cn58xx;</div><div class='add'>+	struct cvmx_mio_fus_pdf_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_fus_pdf_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_fus_pdf_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_pdf_s cn66xx;</div><div class='add'>+	struct cvmx_mio_fus_pdf_s cn68xx;</div><div class='add'>+	struct cvmx_mio_fus_pdf_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_fus_pll {</div><div class='ctx'> 	uint64_t u64;</div><div class='ctx'> 	struct cvmx_mio_fus_pll_s {</div><div class='del'>-		uint64_t reserved_8_63:56;</div><div class='add'>+		uint64_t reserved_48_63:16;</div><div class='add'>+		uint64_t rclk_align_r:8;</div><div class='add'>+		uint64_t rclk_align_l:8;</div><div class='add'>+		uint64_t reserved_8_31:24;</div><div class='ctx'> 		uint64_t c_cout_rst:1;</div><div class='ctx'> 		uint64_t c_cout_sel:2;</div><div class='ctx'> 		uint64_t pnr_cout_rst:1;</div><div class='hunk'>@@ -916,8 +1320,20 @@ union cvmx_mio_fus_pll {</div><div class='ctx'> 	struct cvmx_mio_fus_pll_cn50xx cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_fus_pll_cn50xx cn58xx;</div><div class='ctx'> 	struct cvmx_mio_fus_pll_cn50xx cn58xxp1;</div><div class='del'>-	struct cvmx_mio_fus_pll_s cn63xx;</div><div class='del'>-	struct cvmx_mio_fus_pll_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_pll_cn61xx {</div><div class='add'>+		uint64_t reserved_8_63:56;</div><div class='add'>+		uint64_t c_cout_rst:1;</div><div class='add'>+		uint64_t c_cout_sel:2;</div><div class='add'>+		uint64_t pnr_cout_rst:1;</div><div class='add'>+		uint64_t pnr_cout_sel:2;</div><div class='add'>+		uint64_t rfslip:1;</div><div class='add'>+		uint64_t fbslip:1;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_mio_fus_pll_cn61xx cn63xx;</div><div class='add'>+	struct cvmx_mio_fus_pll_cn61xx cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_pll_cn61xx cn66xx;</div><div class='add'>+	struct cvmx_mio_fus_pll_s cn68xx;</div><div class='add'>+	struct cvmx_mio_fus_pll_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_fus_prog {</div><div class='hunk'>@@ -941,8 +1357,12 @@ union cvmx_mio_fus_prog {</div><div class='ctx'> 	struct cvmx_mio_fus_prog_cn30xx cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_fus_prog_cn30xx cn58xx;</div><div class='ctx'> 	struct cvmx_mio_fus_prog_cn30xx cn58xxp1;</div><div class='add'>+	struct cvmx_mio_fus_prog_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_fus_prog_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_fus_prog_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_prog_s cn66xx;</div><div class='add'>+	struct cvmx_mio_fus_prog_s cn68xx;</div><div class='add'>+	struct cvmx_mio_fus_prog_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_fus_prog_times {</div><div class='hunk'>@@ -969,7 +1389,7 @@ union cvmx_mio_fus_prog_times {</div><div class='ctx'> 	struct cvmx_mio_fus_prog_times_cn50xx cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_fus_prog_times_cn50xx cn58xx;</div><div class='ctx'> 	struct cvmx_mio_fus_prog_times_cn50xx cn58xxp1;</div><div class='del'>-	struct cvmx_mio_fus_prog_times_cn63xx {</div><div class='add'>+	struct cvmx_mio_fus_prog_times_cn61xx {</div><div class='ctx'> 		uint64_t reserved_35_63:29;</div><div class='ctx'> 		uint64_t vgate_pin:1;</div><div class='ctx'> 		uint64_t fsrc_pin:1;</div><div class='hunk'>@@ -978,8 +1398,12 @@ union cvmx_mio_fus_prog_times {</div><div class='ctx'> 		uint64_t sclk_lo:4;</div><div class='ctx'> 		uint64_t sclk_hi:15;</div><div class='ctx'> 		uint64_t setup:6;</div><div class='del'>-	} cn63xx;</div><div class='del'>-	struct cvmx_mio_fus_prog_times_cn63xx cn63xxp1;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_mio_fus_prog_times_cn61xx cn63xx;</div><div class='add'>+	struct cvmx_mio_fus_prog_times_cn61xx cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_prog_times_cn61xx cn66xx;</div><div class='add'>+	struct cvmx_mio_fus_prog_times_cn61xx cn68xx;</div><div class='add'>+	struct cvmx_mio_fus_prog_times_cn61xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_fus_rcmd {</div><div class='hunk'>@@ -1013,8 +1437,12 @@ union cvmx_mio_fus_rcmd {</div><div class='ctx'> 	struct cvmx_mio_fus_rcmd_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_fus_rcmd_cn30xx cn58xx;</div><div class='ctx'> 	struct cvmx_mio_fus_rcmd_cn30xx cn58xxp1;</div><div class='add'>+	struct cvmx_mio_fus_rcmd_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_fus_rcmd_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_fus_rcmd_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_rcmd_s cn66xx;</div><div class='add'>+	struct cvmx_mio_fus_rcmd_s cn68xx;</div><div class='add'>+	struct cvmx_mio_fus_rcmd_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_fus_read_times {</div><div class='hunk'>@@ -1027,8 +1455,12 @@ union cvmx_mio_fus_read_times {</div><div class='ctx'> 		uint64_t sdh:4;</div><div class='ctx'> 		uint64_t setup:10;</div><div class='ctx'> 	} s;</div><div class='add'>+	struct cvmx_mio_fus_read_times_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_fus_read_times_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_fus_read_times_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_read_times_s cn66xx;</div><div class='add'>+	struct cvmx_mio_fus_read_times_s cn68xx;</div><div class='add'>+	struct cvmx_mio_fus_read_times_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_fus_repair_res0 {</div><div class='hunk'>@@ -1040,8 +1472,12 @@ union cvmx_mio_fus_repair_res0 {</div><div class='ctx'> 		uint64_t repair1:18;</div><div class='ctx'> 		uint64_t repair0:18;</div><div class='ctx'> 	} s;</div><div class='add'>+	struct cvmx_mio_fus_repair_res0_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_fus_repair_res0_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_fus_repair_res0_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_repair_res0_s cn66xx;</div><div class='add'>+	struct cvmx_mio_fus_repair_res0_s cn68xx;</div><div class='add'>+	struct cvmx_mio_fus_repair_res0_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_fus_repair_res1 {</div><div class='hunk'>@@ -1052,8 +1488,12 @@ union cvmx_mio_fus_repair_res1 {</div><div class='ctx'> 		uint64_t repair4:18;</div><div class='ctx'> 		uint64_t repair3:18;</div><div class='ctx'> 	} s;</div><div class='add'>+	struct cvmx_mio_fus_repair_res1_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_fus_repair_res1_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_fus_repair_res1_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_repair_res1_s cn66xx;</div><div class='add'>+	struct cvmx_mio_fus_repair_res1_s cn68xx;</div><div class='add'>+	struct cvmx_mio_fus_repair_res1_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_fus_repair_res2 {</div><div class='hunk'>@@ -1062,8 +1502,12 @@ union cvmx_mio_fus_repair_res2 {</div><div class='ctx'> 		uint64_t reserved_18_63:46;</div><div class='ctx'> 		uint64_t repair6:18;</div><div class='ctx'> 	} s;</div><div class='add'>+	struct cvmx_mio_fus_repair_res2_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_fus_repair_res2_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_fus_repair_res2_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_repair_res2_s cn66xx;</div><div class='add'>+	struct cvmx_mio_fus_repair_res2_s cn68xx;</div><div class='add'>+	struct cvmx_mio_fus_repair_res2_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_fus_spr_repair_res {</div><div class='hunk'>@@ -1084,8 +1528,12 @@ union cvmx_mio_fus_spr_repair_res {</div><div class='ctx'> 	struct cvmx_mio_fus_spr_repair_res_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_fus_spr_repair_res_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_fus_spr_repair_res_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_fus_spr_repair_res_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_fus_spr_repair_res_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_fus_spr_repair_res_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_spr_repair_res_s cn66xx;</div><div class='add'>+	struct cvmx_mio_fus_spr_repair_res_s cn68xx;</div><div class='add'>+	struct cvmx_mio_fus_spr_repair_res_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_fus_spr_repair_sum {</div><div class='hunk'>@@ -1104,8 +1552,22 @@ union cvmx_mio_fus_spr_repair_sum {</div><div class='ctx'> 	struct cvmx_mio_fus_spr_repair_sum_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_fus_spr_repair_sum_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_fus_spr_repair_sum_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_fus_spr_repair_sum_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_fus_spr_repair_sum_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_fus_spr_repair_sum_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_spr_repair_sum_s cn66xx;</div><div class='add'>+	struct cvmx_mio_fus_spr_repair_sum_s cn68xx;</div><div class='add'>+	struct cvmx_mio_fus_spr_repair_sum_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_fus_tgg {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_fus_tgg_s {</div><div class='add'>+		uint64_t val:1;</div><div class='add'>+		uint64_t dat:63;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_fus_tgg_s cn61xx;</div><div class='add'>+	struct cvmx_mio_fus_tgg_s cn66xx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_fus_unlock {</div><div class='hunk'>@@ -1141,11 +1603,15 @@ union cvmx_mio_fus_wadr {</div><div class='ctx'> 	struct cvmx_mio_fus_wadr_cn52xx cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_fus_wadr_cn50xx cn58xx;</div><div class='ctx'> 	struct cvmx_mio_fus_wadr_cn50xx cn58xxp1;</div><div class='del'>-	struct cvmx_mio_fus_wadr_cn63xx {</div><div class='add'>+	struct cvmx_mio_fus_wadr_cn61xx {</div><div class='ctx'> 		uint64_t reserved_4_63:60;</div><div class='ctx'> 		uint64_t addr:4;</div><div class='del'>-	} cn63xx;</div><div class='del'>-	struct cvmx_mio_fus_wadr_cn63xx cn63xxp1;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_mio_fus_wadr_cn61xx cn63xx;</div><div class='add'>+	struct cvmx_mio_fus_wadr_cn61xx cn63xxp1;</div><div class='add'>+	struct cvmx_mio_fus_wadr_cn61xx cn66xx;</div><div class='add'>+	struct cvmx_mio_fus_wadr_cn61xx cn68xx;</div><div class='add'>+	struct cvmx_mio_fus_wadr_cn61xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_gpio_comp {</div><div class='hunk'>@@ -1155,8 +1621,12 @@ union cvmx_mio_gpio_comp {</div><div class='ctx'> 		uint64_t pctl:6;</div><div class='ctx'> 		uint64_t nctl:6;</div><div class='ctx'> 	} s;</div><div class='add'>+	struct cvmx_mio_gpio_comp_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_gpio_comp_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_gpio_comp_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_gpio_comp_s cn66xx;</div><div class='add'>+	struct cvmx_mio_gpio_comp_s cn68xx;</div><div class='add'>+	struct cvmx_mio_gpio_comp_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_ndf_dma_cfg {</div><div class='hunk'>@@ -1174,8 +1644,12 @@ union cvmx_mio_ndf_dma_cfg {</div><div class='ctx'> 		uint64_t adr:36;</div><div class='ctx'> 	} s;</div><div class='ctx'> 	struct cvmx_mio_ndf_dma_cfg_s cn52xx;</div><div class='add'>+	struct cvmx_mio_ndf_dma_cfg_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_ndf_dma_cfg_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_ndf_dma_cfg_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_ndf_dma_cfg_s cn66xx;</div><div class='add'>+	struct cvmx_mio_ndf_dma_cfg_s cn68xx;</div><div class='add'>+	struct cvmx_mio_ndf_dma_cfg_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_ndf_dma_int {</div><div class='hunk'>@@ -1185,8 +1659,12 @@ union cvmx_mio_ndf_dma_int {</div><div class='ctx'> 		uint64_t done:1;</div><div class='ctx'> 	} s;</div><div class='ctx'> 	struct cvmx_mio_ndf_dma_int_s cn52xx;</div><div class='add'>+	struct cvmx_mio_ndf_dma_int_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_ndf_dma_int_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_ndf_dma_int_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_ndf_dma_int_s cn66xx;</div><div class='add'>+	struct cvmx_mio_ndf_dma_int_s cn68xx;</div><div class='add'>+	struct cvmx_mio_ndf_dma_int_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_ndf_dma_int_en {</div><div class='hunk'>@@ -1196,8 +1674,12 @@ union cvmx_mio_ndf_dma_int_en {</div><div class='ctx'> 		uint64_t done:1;</div><div class='ctx'> 	} s;</div><div class='ctx'> 	struct cvmx_mio_ndf_dma_int_en_s cn52xx;</div><div class='add'>+	struct cvmx_mio_ndf_dma_int_en_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_ndf_dma_int_en_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_ndf_dma_int_en_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_ndf_dma_int_en_s cn66xx;</div><div class='add'>+	struct cvmx_mio_ndf_dma_int_en_s cn68xx;</div><div class='add'>+	struct cvmx_mio_ndf_dma_int_en_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_pll_ctl {</div><div class='hunk'>@@ -1220,10 +1702,63 @@ union cvmx_mio_pll_setting {</div><div class='ctx'> 	struct cvmx_mio_pll_setting_s cn31xx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+union cvmx_mio_ptp_ckout_hi_incr {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_ptp_ckout_hi_incr_s {</div><div class='add'>+		uint64_t nanosec:32;</div><div class='add'>+		uint64_t frnanosec:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_ptp_ckout_hi_incr_s cn61xx;</div><div class='add'>+	struct cvmx_mio_ptp_ckout_hi_incr_s cn66xx;</div><div class='add'>+	struct cvmx_mio_ptp_ckout_hi_incr_s cn68xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_ptp_ckout_lo_incr {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_ptp_ckout_lo_incr_s {</div><div class='add'>+		uint64_t nanosec:32;</div><div class='add'>+		uint64_t frnanosec:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_ptp_ckout_lo_incr_s cn61xx;</div><div class='add'>+	struct cvmx_mio_ptp_ckout_lo_incr_s cn66xx;</div><div class='add'>+	struct cvmx_mio_ptp_ckout_lo_incr_s cn68xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_ptp_ckout_thresh_hi {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_ptp_ckout_thresh_hi_s {</div><div class='add'>+		uint64_t nanosec:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_ptp_ckout_thresh_hi_s cn61xx;</div><div class='add'>+	struct cvmx_mio_ptp_ckout_thresh_hi_s cn66xx;</div><div class='add'>+	struct cvmx_mio_ptp_ckout_thresh_hi_s cn68xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_ptp_ckout_thresh_lo {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_ptp_ckout_thresh_lo_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t frnanosec:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_ptp_ckout_thresh_lo_s cn61xx;</div><div class='add'>+	struct cvmx_mio_ptp_ckout_thresh_lo_s cn66xx;</div><div class='add'>+	struct cvmx_mio_ptp_ckout_thresh_lo_s cn68xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> union cvmx_mio_ptp_clock_cfg {</div><div class='ctx'> 	uint64_t u64;</div><div class='ctx'> 	struct cvmx_mio_ptp_clock_cfg_s {</div><div class='del'>-		uint64_t reserved_24_63:40;</div><div class='add'>+		uint64_t reserved_42_63:22;</div><div class='add'>+		uint64_t pps:1;</div><div class='add'>+		uint64_t ckout:1;</div><div class='add'>+		uint64_t ext_clk_edge:2;</div><div class='add'>+		uint64_t ckout_out4:1;</div><div class='add'>+		uint64_t pps_out:5;</div><div class='add'>+		uint64_t pps_inv:1;</div><div class='add'>+		uint64_t pps_en:1;</div><div class='add'>+		uint64_t ckout_out:4;</div><div class='add'>+		uint64_t ckout_inv:1;</div><div class='add'>+		uint64_t ckout_en:1;</div><div class='ctx'> 		uint64_t evcnt_in:6;</div><div class='ctx'> 		uint64_t evcnt_edge:1;</div><div class='ctx'> 		uint64_t evcnt_en:1;</div><div class='hunk'>@@ -1234,8 +1769,42 @@ union cvmx_mio_ptp_clock_cfg {</div><div class='ctx'> 		uint64_t ext_clk_en:1;</div><div class='ctx'> 		uint64_t ptp_en:1;</div><div class='ctx'> 	} s;</div><div class='del'>-	struct cvmx_mio_ptp_clock_cfg_s cn63xx;</div><div class='del'>-	struct cvmx_mio_ptp_clock_cfg_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_ptp_clock_cfg_s cn61xx;</div><div class='add'>+	struct cvmx_mio_ptp_clock_cfg_cn63xx {</div><div class='add'>+		uint64_t reserved_24_63:40;</div><div class='add'>+		uint64_t evcnt_in:6;</div><div class='add'>+		uint64_t evcnt_edge:1;</div><div class='add'>+		uint64_t evcnt_en:1;</div><div class='add'>+		uint64_t tstmp_in:6;</div><div class='add'>+		uint64_t tstmp_edge:1;</div><div class='add'>+		uint64_t tstmp_en:1;</div><div class='add'>+		uint64_t ext_clk_in:6;</div><div class='add'>+		uint64_t ext_clk_en:1;</div><div class='add'>+		uint64_t ptp_en:1;</div><div class='add'>+	} cn63xx;</div><div class='add'>+	struct cvmx_mio_ptp_clock_cfg_cn63xx cn63xxp1;</div><div class='add'>+	struct cvmx_mio_ptp_clock_cfg_cn66xx {</div><div class='add'>+		uint64_t reserved_40_63:24;</div><div class='add'>+		uint64_t ext_clk_edge:2;</div><div class='add'>+		uint64_t ckout_out4:1;</div><div class='add'>+		uint64_t pps_out:5;</div><div class='add'>+		uint64_t pps_inv:1;</div><div class='add'>+		uint64_t pps_en:1;</div><div class='add'>+		uint64_t ckout_out:4;</div><div class='add'>+		uint64_t ckout_inv:1;</div><div class='add'>+		uint64_t ckout_en:1;</div><div class='add'>+		uint64_t evcnt_in:6;</div><div class='add'>+		uint64_t evcnt_edge:1;</div><div class='add'>+		uint64_t evcnt_en:1;</div><div class='add'>+		uint64_t tstmp_in:6;</div><div class='add'>+		uint64_t tstmp_edge:1;</div><div class='add'>+		uint64_t tstmp_en:1;</div><div class='add'>+		uint64_t ext_clk_in:6;</div><div class='add'>+		uint64_t ext_clk_en:1;</div><div class='add'>+		uint64_t ptp_en:1;</div><div class='add'>+	} cn66xx;</div><div class='add'>+	struct cvmx_mio_ptp_clock_cfg_s cn68xx;</div><div class='add'>+	struct cvmx_mio_ptp_clock_cfg_cn63xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_ptp_clock_comp {</div><div class='hunk'>@@ -1244,8 +1813,12 @@ union cvmx_mio_ptp_clock_comp {</div><div class='ctx'> 		uint64_t nanosec:32;</div><div class='ctx'> 		uint64_t frnanosec:32;</div><div class='ctx'> 	} s;</div><div class='add'>+	struct cvmx_mio_ptp_clock_comp_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_ptp_clock_comp_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_ptp_clock_comp_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_ptp_clock_comp_s cn66xx;</div><div class='add'>+	struct cvmx_mio_ptp_clock_comp_s cn68xx;</div><div class='add'>+	struct cvmx_mio_ptp_clock_comp_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_ptp_clock_hi {</div><div class='hunk'>@@ -1253,8 +1826,12 @@ union cvmx_mio_ptp_clock_hi {</div><div class='ctx'> 	struct cvmx_mio_ptp_clock_hi_s {</div><div class='ctx'> 		uint64_t nanosec:64;</div><div class='ctx'> 	} s;</div><div class='add'>+	struct cvmx_mio_ptp_clock_hi_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_ptp_clock_hi_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_ptp_clock_hi_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_ptp_clock_hi_s cn66xx;</div><div class='add'>+	struct cvmx_mio_ptp_clock_hi_s cn68xx;</div><div class='add'>+	struct cvmx_mio_ptp_clock_hi_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_ptp_clock_lo {</div><div class='hunk'>@@ -1263,8 +1840,12 @@ union cvmx_mio_ptp_clock_lo {</div><div class='ctx'> 		uint64_t reserved_32_63:32;</div><div class='ctx'> 		uint64_t frnanosec:32;</div><div class='ctx'> 	} s;</div><div class='add'>+	struct cvmx_mio_ptp_clock_lo_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_ptp_clock_lo_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_ptp_clock_lo_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_ptp_clock_lo_s cn66xx;</div><div class='add'>+	struct cvmx_mio_ptp_clock_lo_s cn68xx;</div><div class='add'>+	struct cvmx_mio_ptp_clock_lo_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_ptp_evt_cnt {</div><div class='hunk'>@@ -1272,8 +1853,55 @@ union cvmx_mio_ptp_evt_cnt {</div><div class='ctx'> 	struct cvmx_mio_ptp_evt_cnt_s {</div><div class='ctx'> 		uint64_t cntr:64;</div><div class='ctx'> 	} s;</div><div class='add'>+	struct cvmx_mio_ptp_evt_cnt_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_ptp_evt_cnt_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_ptp_evt_cnt_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_ptp_evt_cnt_s cn66xx;</div><div class='add'>+	struct cvmx_mio_ptp_evt_cnt_s cn68xx;</div><div class='add'>+	struct cvmx_mio_ptp_evt_cnt_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_ptp_pps_hi_incr {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_ptp_pps_hi_incr_s {</div><div class='add'>+		uint64_t nanosec:32;</div><div class='add'>+		uint64_t frnanosec:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_ptp_pps_hi_incr_s cn61xx;</div><div class='add'>+	struct cvmx_mio_ptp_pps_hi_incr_s cn66xx;</div><div class='add'>+	struct cvmx_mio_ptp_pps_hi_incr_s cn68xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_ptp_pps_lo_incr {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_ptp_pps_lo_incr_s {</div><div class='add'>+		uint64_t nanosec:32;</div><div class='add'>+		uint64_t frnanosec:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_ptp_pps_lo_incr_s cn61xx;</div><div class='add'>+	struct cvmx_mio_ptp_pps_lo_incr_s cn66xx;</div><div class='add'>+	struct cvmx_mio_ptp_pps_lo_incr_s cn68xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_ptp_pps_thresh_hi {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_ptp_pps_thresh_hi_s {</div><div class='add'>+		uint64_t nanosec:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_ptp_pps_thresh_hi_s cn61xx;</div><div class='add'>+	struct cvmx_mio_ptp_pps_thresh_hi_s cn66xx;</div><div class='add'>+	struct cvmx_mio_ptp_pps_thresh_hi_s cn68xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_ptp_pps_thresh_lo {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_ptp_pps_thresh_lo_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t frnanosec:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_ptp_pps_thresh_lo_s cn61xx;</div><div class='add'>+	struct cvmx_mio_ptp_pps_thresh_lo_s cn66xx;</div><div class='add'>+	struct cvmx_mio_ptp_pps_thresh_lo_s cn68xx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_ptp_timestamp {</div><div class='hunk'>@@ -1281,14 +1909,52 @@ union cvmx_mio_ptp_timestamp {</div><div class='ctx'> 	struct cvmx_mio_ptp_timestamp_s {</div><div class='ctx'> 		uint64_t nanosec:64;</div><div class='ctx'> 	} s;</div><div class='add'>+	struct cvmx_mio_ptp_timestamp_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_ptp_timestamp_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_ptp_timestamp_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_ptp_timestamp_s cn66xx;</div><div class='add'>+	struct cvmx_mio_ptp_timestamp_s cn68xx;</div><div class='add'>+	struct cvmx_mio_ptp_timestamp_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_qlmx_cfg {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_qlmx_cfg_s {</div><div class='add'>+		uint64_t reserved_12_63:52;</div><div class='add'>+		uint64_t qlm_spd:4;</div><div class='add'>+		uint64_t reserved_4_7:4;</div><div class='add'>+		uint64_t qlm_cfg:4;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_qlmx_cfg_cn61xx {</div><div class='add'>+		uint64_t reserved_12_63:52;</div><div class='add'>+		uint64_t qlm_spd:4;</div><div class='add'>+		uint64_t reserved_2_7:6;</div><div class='add'>+		uint64_t qlm_cfg:2;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_mio_qlmx_cfg_s cn66xx;</div><div class='add'>+	struct cvmx_mio_qlmx_cfg_cn68xx {</div><div class='add'>+		uint64_t reserved_12_63:52;</div><div class='add'>+		uint64_t qlm_spd:4;</div><div class='add'>+		uint64_t reserved_3_7:5;</div><div class='add'>+		uint64_t qlm_cfg:3;</div><div class='add'>+	} cn68xx;</div><div class='add'>+	struct cvmx_mio_qlmx_cfg_cn68xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_rst_boot {</div><div class='ctx'> 	uint64_t u64;</div><div class='ctx'> 	struct cvmx_mio_rst_boot_s {</div><div class='del'>-		uint64_t reserved_36_63:28;</div><div class='add'>+		uint64_t chipkill:1;</div><div class='add'>+		uint64_t jtcsrdis:1;</div><div class='add'>+		uint64_t ejtagdis:1;</div><div class='add'>+		uint64_t romen:1;</div><div class='add'>+		uint64_t ckill_ppdis:1;</div><div class='add'>+		uint64_t jt_tstmode:1;</div><div class='add'>+		uint64_t reserved_50_57:8;</div><div class='add'>+		uint64_t lboot_ext:2;</div><div class='add'>+		uint64_t reserved_44_47:4;</div><div class='add'>+		uint64_t qlm4_spd:4;</div><div class='add'>+		uint64_t qlm3_spd:4;</div><div class='ctx'> 		uint64_t c_mul:6;</div><div class='ctx'> 		uint64_t pnr_mul:6;</div><div class='ctx'> 		uint64_t qlm2_spd:4;</div><div class='hunk'>@@ -1298,32 +1964,168 @@ union cvmx_mio_rst_boot {</div><div class='ctx'> 		uint64_t rboot:1;</div><div class='ctx'> 		uint64_t rboot_pin:1;</div><div class='ctx'> 	} s;</div><div class='del'>-	struct cvmx_mio_rst_boot_s cn63xx;</div><div class='del'>-	struct cvmx_mio_rst_boot_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_rst_boot_cn61xx {</div><div class='add'>+		uint64_t chipkill:1;</div><div class='add'>+		uint64_t jtcsrdis:1;</div><div class='add'>+		uint64_t ejtagdis:1;</div><div class='add'>+		uint64_t romen:1;</div><div class='add'>+		uint64_t ckill_ppdis:1;</div><div class='add'>+		uint64_t jt_tstmode:1;</div><div class='add'>+		uint64_t reserved_50_57:8;</div><div class='add'>+		uint64_t lboot_ext:2;</div><div class='add'>+		uint64_t reserved_36_47:12;</div><div class='add'>+		uint64_t c_mul:6;</div><div class='add'>+		uint64_t pnr_mul:6;</div><div class='add'>+		uint64_t qlm2_spd:4;</div><div class='add'>+		uint64_t qlm1_spd:4;</div><div class='add'>+		uint64_t qlm0_spd:4;</div><div class='add'>+		uint64_t lboot:10;</div><div class='add'>+		uint64_t rboot:1;</div><div class='add'>+		uint64_t rboot_pin:1;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_mio_rst_boot_cn63xx {</div><div class='add'>+		uint64_t reserved_36_63:28;</div><div class='add'>+		uint64_t c_mul:6;</div><div class='add'>+		uint64_t pnr_mul:6;</div><div class='add'>+		uint64_t qlm2_spd:4;</div><div class='add'>+		uint64_t qlm1_spd:4;</div><div class='add'>+		uint64_t qlm0_spd:4;</div><div class='add'>+		uint64_t lboot:10;</div><div class='add'>+		uint64_t rboot:1;</div><div class='add'>+		uint64_t rboot_pin:1;</div><div class='add'>+	} cn63xx;</div><div class='add'>+	struct cvmx_mio_rst_boot_cn63xx cn63xxp1;</div><div class='add'>+	struct cvmx_mio_rst_boot_cn66xx {</div><div class='add'>+		uint64_t chipkill:1;</div><div class='add'>+		uint64_t jtcsrdis:1;</div><div class='add'>+		uint64_t ejtagdis:1;</div><div class='add'>+		uint64_t romen:1;</div><div class='add'>+		uint64_t ckill_ppdis:1;</div><div class='add'>+		uint64_t reserved_50_58:9;</div><div class='add'>+		uint64_t lboot_ext:2;</div><div class='add'>+		uint64_t reserved_36_47:12;</div><div class='add'>+		uint64_t c_mul:6;</div><div class='add'>+		uint64_t pnr_mul:6;</div><div class='add'>+		uint64_t qlm2_spd:4;</div><div class='add'>+		uint64_t qlm1_spd:4;</div><div class='add'>+		uint64_t qlm0_spd:4;</div><div class='add'>+		uint64_t lboot:10;</div><div class='add'>+		uint64_t rboot:1;</div><div class='add'>+		uint64_t rboot_pin:1;</div><div class='add'>+	} cn66xx;</div><div class='add'>+	struct cvmx_mio_rst_boot_cn68xx {</div><div class='add'>+		uint64_t reserved_59_63:5;</div><div class='add'>+		uint64_t jt_tstmode:1;</div><div class='add'>+		uint64_t reserved_44_57:14;</div><div class='add'>+		uint64_t qlm4_spd:4;</div><div class='add'>+		uint64_t qlm3_spd:4;</div><div class='add'>+		uint64_t c_mul:6;</div><div class='add'>+		uint64_t pnr_mul:6;</div><div class='add'>+		uint64_t qlm2_spd:4;</div><div class='add'>+		uint64_t qlm1_spd:4;</div><div class='add'>+		uint64_t qlm0_spd:4;</div><div class='add'>+		uint64_t lboot:10;</div><div class='add'>+		uint64_t rboot:1;</div><div class='add'>+		uint64_t rboot_pin:1;</div><div class='add'>+	} cn68xx;</div><div class='add'>+	struct cvmx_mio_rst_boot_cn68xxp1 {</div><div class='add'>+		uint64_t reserved_44_63:20;</div><div class='add'>+		uint64_t qlm4_spd:4;</div><div class='add'>+		uint64_t qlm3_spd:4;</div><div class='add'>+		uint64_t c_mul:6;</div><div class='add'>+		uint64_t pnr_mul:6;</div><div class='add'>+		uint64_t qlm2_spd:4;</div><div class='add'>+		uint64_t qlm1_spd:4;</div><div class='add'>+		uint64_t qlm0_spd:4;</div><div class='add'>+		uint64_t lboot:10;</div><div class='add'>+		uint64_t rboot:1;</div><div class='add'>+		uint64_t rboot_pin:1;</div><div class='add'>+	} cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_rst_cfg {</div><div class='ctx'> 	uint64_t u64;</div><div class='ctx'> 	struct cvmx_mio_rst_cfg_s {</div><div class='add'>+		uint64_t reserved_3_63:61;</div><div class='add'>+		uint64_t cntl_clr_bist:1;</div><div class='add'>+		uint64_t warm_clr_bist:1;</div><div class='add'>+		uint64_t soft_clr_bist:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_rst_cfg_cn61xx {</div><div class='ctx'> 		uint64_t bist_delay:58;</div><div class='ctx'> 		uint64_t reserved_3_5:3;</div><div class='ctx'> 		uint64_t cntl_clr_bist:1;</div><div class='ctx'> 		uint64_t warm_clr_bist:1;</div><div class='ctx'> 		uint64_t soft_clr_bist:1;</div><div class='del'>-	} s;</div><div class='del'>-	struct cvmx_mio_rst_cfg_s cn63xx;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_mio_rst_cfg_cn61xx cn63xx;</div><div class='ctx'> 	struct cvmx_mio_rst_cfg_cn63xxp1 {</div><div class='ctx'> 		uint64_t bist_delay:58;</div><div class='ctx'> 		uint64_t reserved_2_5:4;</div><div class='ctx'> 		uint64_t warm_clr_bist:1;</div><div class='ctx'> 		uint64_t soft_clr_bist:1;</div><div class='ctx'> 	} cn63xxp1;</div><div class='add'>+	struct cvmx_mio_rst_cfg_cn61xx cn66xx;</div><div class='add'>+	struct cvmx_mio_rst_cfg_cn68xx {</div><div class='add'>+		uint64_t bist_delay:56;</div><div class='add'>+		uint64_t reserved_3_7:5;</div><div class='add'>+		uint64_t cntl_clr_bist:1;</div><div class='add'>+		uint64_t warm_clr_bist:1;</div><div class='add'>+		uint64_t soft_clr_bist:1;</div><div class='add'>+	} cn68xx;</div><div class='add'>+	struct cvmx_mio_rst_cfg_cn68xx cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_rst_ckill {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_rst_ckill_s {</div><div class='add'>+		uint64_t reserved_47_63:17;</div><div class='add'>+		uint64_t timer:47;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_rst_ckill_s cn61xx;</div><div class='add'>+	struct cvmx_mio_rst_ckill_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_mio_rst_cntlx {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_mio_rst_cntlx_s {</div><div class='add'>+		uint64_t reserved_13_63:51;</div><div class='add'>+		uint64_t in_rev_ln:1;</div><div class='add'>+		uint64_t rev_lanes:1;</div><div class='add'>+		uint64_t gen1_only:1;</div><div class='add'>+		uint64_t prst_link:1;</div><div class='add'>+		uint64_t rst_done:1;</div><div class='add'>+		uint64_t rst_link:1;</div><div class='add'>+		uint64_t host_mode:1;</div><div class='add'>+		uint64_t prtmode:2;</div><div class='add'>+		uint64_t rst_drv:1;</div><div class='add'>+		uint64_t rst_rcv:1;</div><div class='add'>+		uint64_t rst_chip:1;</div><div class='add'>+		uint64_t rst_val:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_mio_rst_cntlx_s cn61xx;</div><div class='add'>+	struct cvmx_mio_rst_cntlx_cn66xx {</div><div class='add'>+		uint64_t reserved_10_63:54;</div><div class='add'>+		uint64_t prst_link:1;</div><div class='add'>+		uint64_t rst_done:1;</div><div class='add'>+		uint64_t rst_link:1;</div><div class='add'>+		uint64_t host_mode:1;</div><div class='add'>+		uint64_t prtmode:2;</div><div class='add'>+		uint64_t rst_drv:1;</div><div class='add'>+		uint64_t rst_rcv:1;</div><div class='add'>+		uint64_t rst_chip:1;</div><div class='add'>+		uint64_t rst_val:1;</div><div class='add'>+	} cn66xx;</div><div class='add'>+	struct cvmx_mio_rst_cntlx_cn66xx cn68xx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_rst_ctlx {</div><div class='ctx'> 	uint64_t u64;</div><div class='ctx'> 	struct cvmx_mio_rst_ctlx_s {</div><div class='del'>-		uint64_t reserved_10_63:54;</div><div class='add'>+		uint64_t reserved_13_63:51;</div><div class='add'>+		uint64_t in_rev_ln:1;</div><div class='add'>+		uint64_t rev_lanes:1;</div><div class='add'>+		uint64_t gen1_only:1;</div><div class='ctx'> 		uint64_t prst_link:1;</div><div class='ctx'> 		uint64_t rst_done:1;</div><div class='ctx'> 		uint64_t rst_link:1;</div><div class='hunk'>@@ -1334,7 +2136,19 @@ union cvmx_mio_rst_ctlx {</div><div class='ctx'> 		uint64_t rst_chip:1;</div><div class='ctx'> 		uint64_t rst_val:1;</div><div class='ctx'> 	} s;</div><div class='del'>-	struct cvmx_mio_rst_ctlx_s cn63xx;</div><div class='add'>+	struct cvmx_mio_rst_ctlx_s cn61xx;</div><div class='add'>+	struct cvmx_mio_rst_ctlx_cn63xx {</div><div class='add'>+		uint64_t reserved_10_63:54;</div><div class='add'>+		uint64_t prst_link:1;</div><div class='add'>+		uint64_t rst_done:1;</div><div class='add'>+		uint64_t rst_link:1;</div><div class='add'>+		uint64_t host_mode:1;</div><div class='add'>+		uint64_t prtmode:2;</div><div class='add'>+		uint64_t rst_drv:1;</div><div class='add'>+		uint64_t rst_rcv:1;</div><div class='add'>+		uint64_t rst_chip:1;</div><div class='add'>+		uint64_t rst_val:1;</div><div class='add'>+	} cn63xx;</div><div class='ctx'> 	struct cvmx_mio_rst_ctlx_cn63xxp1 {</div><div class='ctx'> 		uint64_t reserved_9_63:55;</div><div class='ctx'> 		uint64_t rst_done:1;</div><div class='hunk'>@@ -1346,17 +2160,24 @@ union cvmx_mio_rst_ctlx {</div><div class='ctx'> 		uint64_t rst_chip:1;</div><div class='ctx'> 		uint64_t rst_val:1;</div><div class='ctx'> 	} cn63xxp1;</div><div class='add'>+	struct cvmx_mio_rst_ctlx_cn63xx cn66xx;</div><div class='add'>+	struct cvmx_mio_rst_ctlx_cn63xx cn68xx;</div><div class='add'>+	struct cvmx_mio_rst_ctlx_cn63xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_rst_delay {</div><div class='ctx'> 	uint64_t u64;</div><div class='ctx'> 	struct cvmx_mio_rst_delay_s {</div><div class='ctx'> 		uint64_t reserved_32_63:32;</div><div class='del'>-		uint64_t soft_rst_dly:16;</div><div class='ctx'> 		uint64_t warm_rst_dly:16;</div><div class='add'>+		uint64_t soft_rst_dly:16;</div><div class='ctx'> 	} s;</div><div class='add'>+	struct cvmx_mio_rst_delay_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_rst_delay_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_rst_delay_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_rst_delay_s cn66xx;</div><div class='add'>+	struct cvmx_mio_rst_delay_s cn68xx;</div><div class='add'>+	struct cvmx_mio_rst_delay_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_rst_int {</div><div class='hunk'>@@ -1365,12 +2186,25 @@ union cvmx_mio_rst_int {</div><div class='ctx'> 		uint64_t reserved_10_63:54;</div><div class='ctx'> 		uint64_t perst1:1;</div><div class='ctx'> 		uint64_t perst0:1;</div><div class='del'>-		uint64_t reserved_2_7:6;</div><div class='add'>+		uint64_t reserved_4_7:4;</div><div class='add'>+		uint64_t rst_link3:1;</div><div class='add'>+		uint64_t rst_link2:1;</div><div class='ctx'> 		uint64_t rst_link1:1;</div><div class='ctx'> 		uint64_t rst_link0:1;</div><div class='ctx'> 	} s;</div><div class='del'>-	struct cvmx_mio_rst_int_s cn63xx;</div><div class='del'>-	struct cvmx_mio_rst_int_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_rst_int_cn61xx {</div><div class='add'>+		uint64_t reserved_10_63:54;</div><div class='add'>+		uint64_t perst1:1;</div><div class='add'>+		uint64_t perst0:1;</div><div class='add'>+		uint64_t reserved_2_7:6;</div><div class='add'>+		uint64_t rst_link1:1;</div><div class='add'>+		uint64_t rst_link0:1;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_mio_rst_int_cn61xx cn63xx;</div><div class='add'>+	struct cvmx_mio_rst_int_cn61xx cn63xxp1;</div><div class='add'>+	struct cvmx_mio_rst_int_s cn66xx;</div><div class='add'>+	struct cvmx_mio_rst_int_cn61xx cn68xx;</div><div class='add'>+	struct cvmx_mio_rst_int_cn61xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_rst_int_en {</div><div class='hunk'>@@ -1379,12 +2213,25 @@ union cvmx_mio_rst_int_en {</div><div class='ctx'> 		uint64_t reserved_10_63:54;</div><div class='ctx'> 		uint64_t perst1:1;</div><div class='ctx'> 		uint64_t perst0:1;</div><div class='del'>-		uint64_t reserved_2_7:6;</div><div class='add'>+		uint64_t reserved_4_7:4;</div><div class='add'>+		uint64_t rst_link3:1;</div><div class='add'>+		uint64_t rst_link2:1;</div><div class='ctx'> 		uint64_t rst_link1:1;</div><div class='ctx'> 		uint64_t rst_link0:1;</div><div class='ctx'> 	} s;</div><div class='del'>-	struct cvmx_mio_rst_int_en_s cn63xx;</div><div class='del'>-	struct cvmx_mio_rst_int_en_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_rst_int_en_cn61xx {</div><div class='add'>+		uint64_t reserved_10_63:54;</div><div class='add'>+		uint64_t perst1:1;</div><div class='add'>+		uint64_t perst0:1;</div><div class='add'>+		uint64_t reserved_2_7:6;</div><div class='add'>+		uint64_t rst_link1:1;</div><div class='add'>+		uint64_t rst_link0:1;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_mio_rst_int_en_cn61xx cn63xx;</div><div class='add'>+	struct cvmx_mio_rst_int_en_cn61xx cn63xxp1;</div><div class='add'>+	struct cvmx_mio_rst_int_en_s cn66xx;</div><div class='add'>+	struct cvmx_mio_rst_int_en_cn61xx cn68xx;</div><div class='add'>+	struct cvmx_mio_rst_int_en_cn61xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_twsx_int {</div><div class='hunk'>@@ -1424,8 +2271,12 @@ union cvmx_mio_twsx_int {</div><div class='ctx'> 	struct cvmx_mio_twsx_int_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_twsx_int_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_twsx_int_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_twsx_int_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_twsx_int_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_twsx_int_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_twsx_int_s cn66xx;</div><div class='add'>+	struct cvmx_mio_twsx_int_s cn68xx;</div><div class='add'>+	struct cvmx_mio_twsx_int_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_twsx_sw_twsi {</div><div class='hunk'>@@ -1455,8 +2306,12 @@ union cvmx_mio_twsx_sw_twsi {</div><div class='ctx'> 	struct cvmx_mio_twsx_sw_twsi_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_twsx_sw_twsi_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_twsx_sw_twsi_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_twsx_sw_twsi_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_twsx_sw_twsi_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_twsx_sw_twsi_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_twsx_sw_twsi_s cn66xx;</div><div class='add'>+	struct cvmx_mio_twsx_sw_twsi_s cn68xx;</div><div class='add'>+	struct cvmx_mio_twsx_sw_twsi_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_twsx_sw_twsi_ext {</div><div class='hunk'>@@ -1477,8 +2332,12 @@ union cvmx_mio_twsx_sw_twsi_ext {</div><div class='ctx'> 	struct cvmx_mio_twsx_sw_twsi_ext_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_twsx_sw_twsi_ext_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_twsx_sw_twsi_ext_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_twsx_sw_twsi_ext_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_twsx_sw_twsi_ext_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_twsx_sw_twsi_ext_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_twsx_sw_twsi_ext_s cn66xx;</div><div class='add'>+	struct cvmx_mio_twsx_sw_twsi_ext_s cn68xx;</div><div class='add'>+	struct cvmx_mio_twsx_sw_twsi_ext_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_twsx_twsi_sw {</div><div class='hunk'>@@ -1499,8 +2358,12 @@ union cvmx_mio_twsx_twsi_sw {</div><div class='ctx'> 	struct cvmx_mio_twsx_twsi_sw_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_twsx_twsi_sw_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_twsx_twsi_sw_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_twsx_twsi_sw_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_twsx_twsi_sw_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_twsx_twsi_sw_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_twsx_twsi_sw_s cn66xx;</div><div class='add'>+	struct cvmx_mio_twsx_twsi_sw_s cn68xx;</div><div class='add'>+	struct cvmx_mio_twsx_twsi_sw_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_dlh {</div><div class='hunk'>@@ -1520,8 +2383,12 @@ union cvmx_mio_uartx_dlh {</div><div class='ctx'> 	struct cvmx_mio_uartx_dlh_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_dlh_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_dlh_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_dlh_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_dlh_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_dlh_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_dlh_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_dlh_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_dlh_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_dll {</div><div class='hunk'>@@ -1541,8 +2408,12 @@ union cvmx_mio_uartx_dll {</div><div class='ctx'> 	struct cvmx_mio_uartx_dll_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_dll_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_dll_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_dll_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_dll_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_dll_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_dll_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_dll_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_dll_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_far {</div><div class='hunk'>@@ -1562,8 +2433,12 @@ union cvmx_mio_uartx_far {</div><div class='ctx'> 	struct cvmx_mio_uartx_far_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_far_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_far_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_far_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_far_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_far_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_far_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_far_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_far_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_fcr {</div><div class='hunk'>@@ -1588,8 +2463,12 @@ union cvmx_mio_uartx_fcr {</div><div class='ctx'> 	struct cvmx_mio_uartx_fcr_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_fcr_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_fcr_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_fcr_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_fcr_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_fcr_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_fcr_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_fcr_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_fcr_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_htx {</div><div class='hunk'>@@ -1609,8 +2488,12 @@ union cvmx_mio_uartx_htx {</div><div class='ctx'> 	struct cvmx_mio_uartx_htx_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_htx_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_htx_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_htx_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_htx_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_htx_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_htx_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_htx_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_htx_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_ier {</div><div class='hunk'>@@ -1635,8 +2518,12 @@ union cvmx_mio_uartx_ier {</div><div class='ctx'> 	struct cvmx_mio_uartx_ier_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_ier_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_ier_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_ier_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_ier_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_ier_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_ier_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_ier_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_ier_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_iir {</div><div class='hunk'>@@ -1658,8 +2545,12 @@ union cvmx_mio_uartx_iir {</div><div class='ctx'> 	struct cvmx_mio_uartx_iir_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_iir_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_iir_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_iir_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_iir_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_iir_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_iir_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_iir_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_iir_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_lcr {</div><div class='hunk'>@@ -1685,8 +2576,12 @@ union cvmx_mio_uartx_lcr {</div><div class='ctx'> 	struct cvmx_mio_uartx_lcr_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_lcr_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_lcr_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_lcr_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_lcr_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_lcr_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_lcr_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_lcr_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_lcr_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_lsr {</div><div class='hunk'>@@ -1713,8 +2608,12 @@ union cvmx_mio_uartx_lsr {</div><div class='ctx'> 	struct cvmx_mio_uartx_lsr_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_lsr_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_lsr_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_lsr_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_lsr_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_lsr_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_lsr_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_lsr_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_lsr_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_mcr {</div><div class='hunk'>@@ -1739,8 +2638,12 @@ union cvmx_mio_uartx_mcr {</div><div class='ctx'> 	struct cvmx_mio_uartx_mcr_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_mcr_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_mcr_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_mcr_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_mcr_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_mcr_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_mcr_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_mcr_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_mcr_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_msr {</div><div class='hunk'>@@ -1767,8 +2670,12 @@ union cvmx_mio_uartx_msr {</div><div class='ctx'> 	struct cvmx_mio_uartx_msr_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_msr_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_msr_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_msr_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_msr_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_msr_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_msr_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_msr_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_msr_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_rbr {</div><div class='hunk'>@@ -1788,8 +2695,12 @@ union cvmx_mio_uartx_rbr {</div><div class='ctx'> 	struct cvmx_mio_uartx_rbr_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_rbr_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_rbr_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_rbr_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_rbr_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_rbr_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_rbr_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_rbr_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_rbr_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_rfl {</div><div class='hunk'>@@ -1809,8 +2720,12 @@ union cvmx_mio_uartx_rfl {</div><div class='ctx'> 	struct cvmx_mio_uartx_rfl_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_rfl_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_rfl_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_rfl_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_rfl_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_rfl_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_rfl_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_rfl_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_rfl_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_rfw {</div><div class='hunk'>@@ -1832,8 +2747,12 @@ union cvmx_mio_uartx_rfw {</div><div class='ctx'> 	struct cvmx_mio_uartx_rfw_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_rfw_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_rfw_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_rfw_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_rfw_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_rfw_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_rfw_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_rfw_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_rfw_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_sbcr {</div><div class='hunk'>@@ -1853,8 +2772,12 @@ union cvmx_mio_uartx_sbcr {</div><div class='ctx'> 	struct cvmx_mio_uartx_sbcr_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_sbcr_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_sbcr_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_sbcr_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_sbcr_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_sbcr_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_sbcr_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_sbcr_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_sbcr_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_scr {</div><div class='hunk'>@@ -1874,8 +2797,12 @@ union cvmx_mio_uartx_scr {</div><div class='ctx'> 	struct cvmx_mio_uartx_scr_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_scr_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_scr_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_scr_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_scr_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_scr_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_scr_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_scr_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_scr_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_sfe {</div><div class='hunk'>@@ -1895,8 +2822,12 @@ union cvmx_mio_uartx_sfe {</div><div class='ctx'> 	struct cvmx_mio_uartx_sfe_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_sfe_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_sfe_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_sfe_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_sfe_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_sfe_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_sfe_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_sfe_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_sfe_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_srr {</div><div class='hunk'>@@ -1918,8 +2849,12 @@ union cvmx_mio_uartx_srr {</div><div class='ctx'> 	struct cvmx_mio_uartx_srr_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_srr_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_srr_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_srr_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_srr_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_srr_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_srr_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_srr_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_srr_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_srt {</div><div class='hunk'>@@ -1939,8 +2874,12 @@ union cvmx_mio_uartx_srt {</div><div class='ctx'> 	struct cvmx_mio_uartx_srt_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_srt_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_srt_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_srt_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_srt_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_srt_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_srt_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_srt_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_srt_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_srts {</div><div class='hunk'>@@ -1960,8 +2899,12 @@ union cvmx_mio_uartx_srts {</div><div class='ctx'> 	struct cvmx_mio_uartx_srts_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_srts_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_srts_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_srts_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_srts_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_srts_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_srts_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_srts_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_srts_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_stt {</div><div class='hunk'>@@ -1981,8 +2924,12 @@ union cvmx_mio_uartx_stt {</div><div class='ctx'> 	struct cvmx_mio_uartx_stt_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_stt_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_stt_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_stt_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_stt_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_stt_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_stt_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_stt_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_stt_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_tfl {</div><div class='hunk'>@@ -2002,8 +2949,12 @@ union cvmx_mio_uartx_tfl {</div><div class='ctx'> 	struct cvmx_mio_uartx_tfl_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_tfl_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_tfl_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_tfl_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_tfl_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_tfl_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_tfl_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_tfl_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_tfl_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_tfr {</div><div class='hunk'>@@ -2023,8 +2974,12 @@ union cvmx_mio_uartx_tfr {</div><div class='ctx'> 	struct cvmx_mio_uartx_tfr_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_tfr_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_tfr_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_tfr_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_tfr_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_tfr_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_tfr_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_tfr_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_tfr_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_thr {</div><div class='hunk'>@@ -2044,8 +2999,12 @@ union cvmx_mio_uartx_thr {</div><div class='ctx'> 	struct cvmx_mio_uartx_thr_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_thr_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_thr_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_thr_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_thr_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_thr_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_thr_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_thr_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_thr_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uartx_usr {</div><div class='hunk'>@@ -2069,8 +3028,12 @@ union cvmx_mio_uartx_usr {</div><div class='ctx'> 	struct cvmx_mio_uartx_usr_s cn56xxp1;</div><div class='ctx'> 	struct cvmx_mio_uartx_usr_s cn58xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_usr_s cn58xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_usr_s cn61xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_usr_s cn63xx;</div><div class='ctx'> 	struct cvmx_mio_uartx_usr_s cn63xxp1;</div><div class='add'>+	struct cvmx_mio_uartx_usr_s cn66xx;</div><div class='add'>+	struct cvmx_mio_uartx_usr_s cn68xx;</div><div class='add'>+	struct cvmx_mio_uartx_usr_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_mio_uart2_dlh {</div><div class='head'>diff --git a/arch/mips/include/asm/octeon/cvmx-npei-defs.h b/arch/mips/include/asm/octeon/cvmx-npei-defs.h<br/>index 9899a9d2ba72..a3075f733ca5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-npei-defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-npei-defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-npei-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-npei-defs.h</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>  * Contact: support@caviumnetworks.com</div><div class='ctx'>  * This file is part of the OCTEON SDK</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2003-2010 Cavium Networks</div><div class='add'>+ * Copyright (c) 2003-2011 Cavium Networks</div><div class='ctx'>  *</div><div class='ctx'>  * This file is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License, Version 2, as</div><div class='hunk'>@@ -65,7 +65,7 @@</div><div class='ctx'> #define CVMX_NPEI_LAST_WIN_RDATA0 (0x0000000000000600ull)</div><div class='ctx'> #define CVMX_NPEI_LAST_WIN_RDATA1 (0x0000000000000610ull)</div><div class='ctx'> #define CVMX_NPEI_MEM_ACCESS_CTL (0x00000000000004F0ull)</div><div class='del'>-#define CVMX_NPEI_MEM_ACCESS_SUBIDX(offset) (0x0000000000000340ull + ((offset) &amp; 31) * 16 - 16*12)</div><div class='add'>+#define CVMX_NPEI_MEM_ACCESS_SUBIDX(offset) (0x0000000000000280ull + ((offset) &amp; 31) * 16 - 16*12)</div><div class='ctx'> #define CVMX_NPEI_MSI_ENB0 (0x0000000000003C50ull)</div><div class='ctx'> #define CVMX_NPEI_MSI_ENB1 (0x0000000000003C60ull)</div><div class='ctx'> #define CVMX_NPEI_MSI_ENB2 (0x0000000000003C70ull)</div><div class='head'>diff --git a/arch/mips/include/asm/octeon/cvmx-pciercx-defs.h b/arch/mips/include/asm/octeon/cvmx-pciercx-defs.h<br/>index f8cb88902efb..7b1dc8b74e5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-pciercx-defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-pciercx-defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-pciercx-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-pciercx-defs.h</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>  * Contact: support@caviumnetworks.com</div><div class='ctx'>  * This file is part of the OCTEON SDK</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2003-2010 Cavium Networks</div><div class='add'>+ * Copyright (c) 2003-2011 Cavium Networks</div><div class='ctx'>  *</div><div class='ctx'>  * This file is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License, Version 2, as</div><div class='hunk'>@@ -116,8 +116,12 @@ union cvmx_pciercx_cfg000 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg000_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg000_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg000_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg000_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg000_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg000_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg000_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg000_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg000_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg001 {</div><div class='hunk'>@@ -152,8 +156,12 @@ union cvmx_pciercx_cfg001 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg001_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg001_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg001_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg001_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg001_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg001_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg001_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg001_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg001_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg002 {</div><div class='hunk'>@@ -168,8 +176,12 @@ union cvmx_pciercx_cfg002 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg002_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg002_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg002_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg002_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg002_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg002_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg002_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg002_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg002_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg003 {</div><div class='hunk'>@@ -185,8 +197,12 @@ union cvmx_pciercx_cfg003 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg003_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg003_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg003_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg003_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg003_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg003_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg003_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg003_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg003_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg004 {</div><div class='hunk'>@@ -198,8 +214,12 @@ union cvmx_pciercx_cfg004 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg004_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg004_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg004_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg004_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg004_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg004_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg004_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg004_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg004_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg005 {</div><div class='hunk'>@@ -211,8 +231,12 @@ union cvmx_pciercx_cfg005 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg005_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg005_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg005_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg005_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg005_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg005_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg005_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg005_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg005_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg006 {</div><div class='hunk'>@@ -227,8 +251,12 @@ union cvmx_pciercx_cfg006 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg006_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg006_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg006_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg006_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg006_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg006_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg006_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg006_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg006_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg007 {</div><div class='hunk'>@@ -256,8 +284,12 @@ union cvmx_pciercx_cfg007 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg007_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg007_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg007_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg007_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg007_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg007_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg007_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg007_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg007_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg008 {</div><div class='hunk'>@@ -272,8 +304,12 @@ union cvmx_pciercx_cfg008 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg008_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg008_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg008_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg008_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg008_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg008_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg008_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg008_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg008_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg009 {</div><div class='hunk'>@@ -290,8 +326,12 @@ union cvmx_pciercx_cfg009 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg009_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg009_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg009_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg009_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg009_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg009_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg009_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg009_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg009_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg010 {</div><div class='hunk'>@@ -303,8 +343,12 @@ union cvmx_pciercx_cfg010 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg010_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg010_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg010_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg010_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg010_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg010_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg010_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg010_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg010_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg011 {</div><div class='hunk'>@@ -316,8 +360,12 @@ union cvmx_pciercx_cfg011 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg011_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg011_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg011_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg011_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg011_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg011_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg011_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg011_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg011_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg012 {</div><div class='hunk'>@@ -330,8 +378,12 @@ union cvmx_pciercx_cfg012 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg012_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg012_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg012_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg012_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg012_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg012_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg012_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg012_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg012_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg013 {</div><div class='hunk'>@@ -344,8 +396,12 @@ union cvmx_pciercx_cfg013 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg013_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg013_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg013_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg013_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg013_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg013_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg013_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg013_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg013_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg014 {</div><div class='hunk'>@@ -357,8 +413,12 @@ union cvmx_pciercx_cfg014 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg014_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg014_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg014_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg014_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg014_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg014_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg014_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg014_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg014_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg015 {</div><div class='hunk'>@@ -384,8 +444,12 @@ union cvmx_pciercx_cfg015 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg015_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg015_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg015_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg015_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg015_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg015_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg015_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg015_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg015_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg016 {</div><div class='hunk'>@@ -406,8 +470,12 @@ union cvmx_pciercx_cfg016 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg016_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg016_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg016_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg016_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg016_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg016_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg016_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg016_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg016_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg017 {</div><div class='hunk'>@@ -430,14 +498,19 @@ union cvmx_pciercx_cfg017 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg017_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg017_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg017_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg017_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg017_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg017_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg017_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg017_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg017_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg020 {</div><div class='ctx'> 	uint32_t u32;</div><div class='ctx'> 	struct cvmx_pciercx_cfg020_s {</div><div class='del'>-		uint32_t reserved_24_31:8;</div><div class='add'>+		uint32_t reserved_25_31:7;</div><div class='add'>+		uint32_t pvm:1;</div><div class='ctx'> 		uint32_t m64:1;</div><div class='ctx'> 		uint32_t mme:3;</div><div class='ctx'> 		uint32_t mmc:3;</div><div class='hunk'>@@ -445,12 +518,24 @@ union cvmx_pciercx_cfg020 {</div><div class='ctx'> 		uint32_t ncp:8;</div><div class='ctx'> 		uint32_t msicid:8;</div><div class='ctx'> 	} s;</div><div class='del'>-	struct cvmx_pciercx_cfg020_s cn52xx;</div><div class='del'>-	struct cvmx_pciercx_cfg020_s cn52xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg020_s cn56xx;</div><div class='del'>-	struct cvmx_pciercx_cfg020_s cn56xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg020_s cn63xx;</div><div class='del'>-	struct cvmx_pciercx_cfg020_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg020_cn52xx {</div><div class='add'>+		uint32_t reserved_24_31:8;</div><div class='add'>+		uint32_t m64:1;</div><div class='add'>+		uint32_t mme:3;</div><div class='add'>+		uint32_t mmc:3;</div><div class='add'>+		uint32_t msien:1;</div><div class='add'>+		uint32_t ncp:8;</div><div class='add'>+		uint32_t msicid:8;</div><div class='add'>+	} cn52xx;</div><div class='add'>+	struct cvmx_pciercx_cfg020_cn52xx cn52xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg020_cn52xx cn56xx;</div><div class='add'>+	struct cvmx_pciercx_cfg020_cn52xx cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg020_s cn61xx;</div><div class='add'>+	struct cvmx_pciercx_cfg020_cn52xx cn63xx;</div><div class='add'>+	struct cvmx_pciercx_cfg020_cn52xx cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg020_cn52xx cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg020_cn52xx cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg020_cn52xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg021 {</div><div class='hunk'>@@ -463,8 +548,12 @@ union cvmx_pciercx_cfg021 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg021_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg021_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg021_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg021_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg021_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg021_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg021_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg021_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg021_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg022 {</div><div class='hunk'>@@ -476,8 +565,12 @@ union cvmx_pciercx_cfg022 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg022_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg022_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg022_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg022_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg022_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg022_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg022_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg022_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg022_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg023 {</div><div class='hunk'>@@ -490,8 +583,12 @@ union cvmx_pciercx_cfg023 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg023_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg023_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg023_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg023_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg023_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg023_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg023_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg023_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg023_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg028 {</div><div class='hunk'>@@ -509,8 +606,12 @@ union cvmx_pciercx_cfg028 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg028_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg028_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg028_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg028_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg028_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg028_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg028_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg028_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg028_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg029 {</div><div class='hunk'>@@ -532,8 +633,12 @@ union cvmx_pciercx_cfg029 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg029_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg029_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg029_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg029_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg029_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg029_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg029_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg029_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg029_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg030 {</div><div class='hunk'>@@ -563,15 +668,20 @@ union cvmx_pciercx_cfg030 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg030_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg030_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg030_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg030_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg030_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg030_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg030_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg030_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg030_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg031 {</div><div class='ctx'> 	uint32_t u32;</div><div class='ctx'> 	struct cvmx_pciercx_cfg031_s {</div><div class='ctx'> 		uint32_t pnum:8;</div><div class='del'>-		uint32_t reserved_22_23:2;</div><div class='add'>+		uint32_t reserved_23_23:1;</div><div class='add'>+		uint32_t aspm:1;</div><div class='ctx'> 		uint32_t lbnc:1;</div><div class='ctx'> 		uint32_t dllarc:1;</div><div class='ctx'> 		uint32_t sderc:1;</div><div class='hunk'>@@ -582,12 +692,28 @@ union cvmx_pciercx_cfg031 {</div><div class='ctx'> 		uint32_t mlw:6;</div><div class='ctx'> 		uint32_t mls:4;</div><div class='ctx'> 	} s;</div><div class='del'>-	struct cvmx_pciercx_cfg031_s cn52xx;</div><div class='del'>-	struct cvmx_pciercx_cfg031_s cn52xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg031_s cn56xx;</div><div class='del'>-	struct cvmx_pciercx_cfg031_s cn56xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg031_s cn63xx;</div><div class='del'>-	struct cvmx_pciercx_cfg031_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg031_cn52xx {</div><div class='add'>+		uint32_t pnum:8;</div><div class='add'>+		uint32_t reserved_22_23:2;</div><div class='add'>+		uint32_t lbnc:1;</div><div class='add'>+		uint32_t dllarc:1;</div><div class='add'>+		uint32_t sderc:1;</div><div class='add'>+		uint32_t cpm:1;</div><div class='add'>+		uint32_t l1el:3;</div><div class='add'>+		uint32_t l0el:3;</div><div class='add'>+		uint32_t aslpms:2;</div><div class='add'>+		uint32_t mlw:6;</div><div class='add'>+		uint32_t mls:4;</div><div class='add'>+	} cn52xx;</div><div class='add'>+	struct cvmx_pciercx_cfg031_cn52xx cn52xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg031_cn52xx cn56xx;</div><div class='add'>+	struct cvmx_pciercx_cfg031_cn52xx cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg031_s cn61xx;</div><div class='add'>+	struct cvmx_pciercx_cfg031_cn52xx cn63xx;</div><div class='add'>+	struct cvmx_pciercx_cfg031_cn52xx cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg031_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg031_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg031_cn52xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg032 {</div><div class='hunk'>@@ -618,8 +744,12 @@ union cvmx_pciercx_cfg032 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg032_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg032_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg032_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg032_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg032_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg032_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg032_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg032_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg032_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg033 {</div><div class='hunk'>@@ -642,8 +772,12 @@ union cvmx_pciercx_cfg033 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg033_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg033_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg033_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg033_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg033_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg033_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg033_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg033_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg033_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg034 {</div><div class='hunk'>@@ -676,8 +810,12 @@ union cvmx_pciercx_cfg034 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg034_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg034_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg034_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg034_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg034_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg034_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg034_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg034_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg034_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg035 {</div><div class='hunk'>@@ -696,8 +834,12 @@ union cvmx_pciercx_cfg035 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg035_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg035_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg035_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg035_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg035_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg035_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg035_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg035_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg035_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg036 {</div><div class='hunk'>@@ -712,38 +854,95 @@ union cvmx_pciercx_cfg036 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg036_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg036_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg036_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg036_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg036_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg036_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg036_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg036_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg036_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg037 {</div><div class='ctx'> 	uint32_t u32;</div><div class='ctx'> 	struct cvmx_pciercx_cfg037_s {</div><div class='del'>-		uint32_t reserved_5_31:27;</div><div class='add'>+		uint32_t reserved_14_31:18;</div><div class='add'>+		uint32_t tph:2;</div><div class='add'>+		uint32_t reserved_11_11:1;</div><div class='add'>+		uint32_t noroprpr:1;</div><div class='add'>+		uint32_t atom128s:1;</div><div class='add'>+		uint32_t atom64s:1;</div><div class='add'>+		uint32_t atom32s:1;</div><div class='add'>+		uint32_t atom_ops:1;</div><div class='add'>+		uint32_t reserved_5_5:1;</div><div class='ctx'> 		uint32_t ctds:1;</div><div class='ctx'> 		uint32_t ctrs:4;</div><div class='ctx'> 	} s;</div><div class='del'>-	struct cvmx_pciercx_cfg037_s cn52xx;</div><div class='del'>-	struct cvmx_pciercx_cfg037_s cn52xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg037_s cn56xx;</div><div class='del'>-	struct cvmx_pciercx_cfg037_s cn56xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg037_s cn63xx;</div><div class='del'>-	struct cvmx_pciercx_cfg037_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg037_cn52xx {</div><div class='add'>+		uint32_t reserved_5_31:27;</div><div class='add'>+		uint32_t ctds:1;</div><div class='add'>+		uint32_t ctrs:4;</div><div class='add'>+	} cn52xx;</div><div class='add'>+	struct cvmx_pciercx_cfg037_cn52xx cn52xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg037_cn52xx cn56xx;</div><div class='add'>+	struct cvmx_pciercx_cfg037_cn52xx cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg037_cn61xx {</div><div class='add'>+		uint32_t reserved_14_31:18;</div><div class='add'>+		uint32_t tph:2;</div><div class='add'>+		uint32_t reserved_11_11:1;</div><div class='add'>+		uint32_t noroprpr:1;</div><div class='add'>+		uint32_t atom128s:1;</div><div class='add'>+		uint32_t atom64s:1;</div><div class='add'>+		uint32_t atom32s:1;</div><div class='add'>+		uint32_t atom_ops:1;</div><div class='add'>+		uint32_t ari_fw:1;</div><div class='add'>+		uint32_t ctds:1;</div><div class='add'>+		uint32_t ctrs:4;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_pciercx_cfg037_cn52xx cn63xx;</div><div class='add'>+	struct cvmx_pciercx_cfg037_cn52xx cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg037_cn66xx {</div><div class='add'>+		uint32_t reserved_14_31:18;</div><div class='add'>+		uint32_t tph:2;</div><div class='add'>+		uint32_t reserved_11_11:1;</div><div class='add'>+		uint32_t noroprpr:1;</div><div class='add'>+		uint32_t atom128s:1;</div><div class='add'>+		uint32_t atom64s:1;</div><div class='add'>+		uint32_t atom32s:1;</div><div class='add'>+		uint32_t atom_ops:1;</div><div class='add'>+		uint32_t ari:1;</div><div class='add'>+		uint32_t ctds:1;</div><div class='add'>+		uint32_t ctrs:4;</div><div class='add'>+	} cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg037_cn66xx cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg037_cn66xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg038 {</div><div class='ctx'> 	uint32_t u32;</div><div class='ctx'> 	struct cvmx_pciercx_cfg038_s {</div><div class='del'>-		uint32_t reserved_5_31:27;</div><div class='add'>+		uint32_t reserved_10_31:22;</div><div class='add'>+		uint32_t id0_cp:1;</div><div class='add'>+		uint32_t id0_rq:1;</div><div class='add'>+		uint32_t atom_op_eb:1;</div><div class='add'>+		uint32_t atom_op:1;</div><div class='add'>+		uint32_t ari:1;</div><div class='ctx'> 		uint32_t ctd:1;</div><div class='ctx'> 		uint32_t ctv:4;</div><div class='ctx'> 	} s;</div><div class='del'>-	struct cvmx_pciercx_cfg038_s cn52xx;</div><div class='del'>-	struct cvmx_pciercx_cfg038_s cn52xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg038_s cn56xx;</div><div class='del'>-	struct cvmx_pciercx_cfg038_s cn56xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg038_s cn63xx;</div><div class='del'>-	struct cvmx_pciercx_cfg038_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg038_cn52xx {</div><div class='add'>+		uint32_t reserved_5_31:27;</div><div class='add'>+		uint32_t ctd:1;</div><div class='add'>+		uint32_t ctv:4;</div><div class='add'>+	} cn52xx;</div><div class='add'>+	struct cvmx_pciercx_cfg038_cn52xx cn52xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg038_cn52xx cn56xx;</div><div class='add'>+	struct cvmx_pciercx_cfg038_cn52xx cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg038_s cn61xx;</div><div class='add'>+	struct cvmx_pciercx_cfg038_cn52xx cn63xx;</div><div class='add'>+	struct cvmx_pciercx_cfg038_cn52xx cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg038_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg038_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg038_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg039 {</div><div class='hunk'>@@ -760,8 +959,12 @@ union cvmx_pciercx_cfg039 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg039_cn52xx cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg039_cn52xx cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg039_cn52xx cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg039_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg039_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg039_cn52xx cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg039_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg039_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg039_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg040 {</div><div class='hunk'>@@ -785,8 +988,12 @@ union cvmx_pciercx_cfg040 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg040_cn52xx cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg040_cn52xx cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg040_cn52xx cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg040_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg040_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg040_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg040_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg040_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg040_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg041 {</div><div class='hunk'>@@ -798,8 +1005,12 @@ union cvmx_pciercx_cfg041 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg041_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg041_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg041_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg041_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg041_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg041_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg041_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg041_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg041_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg042 {</div><div class='hunk'>@@ -811,8 +1022,12 @@ union cvmx_pciercx_cfg042 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg042_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg042_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg042_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg042_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg042_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg042_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg042_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg042_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg042_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg064 {</div><div class='hunk'>@@ -826,14 +1041,20 @@ union cvmx_pciercx_cfg064 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg064_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg064_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg064_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg064_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg064_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg064_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg064_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg064_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg064_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg065 {</div><div class='ctx'> 	uint32_t u32;</div><div class='ctx'> 	struct cvmx_pciercx_cfg065_s {</div><div class='del'>-		uint32_t reserved_21_31:11;</div><div class='add'>+		uint32_t reserved_25_31:7;</div><div class='add'>+		uint32_t uatombs:1;</div><div class='add'>+		uint32_t reserved_21_23:3;</div><div class='ctx'> 		uint32_t ures:1;</div><div class='ctx'> 		uint32_t ecrces:1;</div><div class='ctx'> 		uint32_t mtlps:1;</div><div class='hunk'>@@ -848,18 +1069,39 @@ union cvmx_pciercx_cfg065 {</div><div class='ctx'> 		uint32_t dlpes:1;</div><div class='ctx'> 		uint32_t reserved_0_3:4;</div><div class='ctx'> 	} s;</div><div class='del'>-	struct cvmx_pciercx_cfg065_s cn52xx;</div><div class='del'>-	struct cvmx_pciercx_cfg065_s cn52xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg065_s cn56xx;</div><div class='del'>-	struct cvmx_pciercx_cfg065_s cn56xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg065_s cn63xx;</div><div class='del'>-	struct cvmx_pciercx_cfg065_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg065_cn52xx {</div><div class='add'>+		uint32_t reserved_21_31:11;</div><div class='add'>+		uint32_t ures:1;</div><div class='add'>+		uint32_t ecrces:1;</div><div class='add'>+		uint32_t mtlps:1;</div><div class='add'>+		uint32_t ros:1;</div><div class='add'>+		uint32_t ucs:1;</div><div class='add'>+		uint32_t cas:1;</div><div class='add'>+		uint32_t cts:1;</div><div class='add'>+		uint32_t fcpes:1;</div><div class='add'>+		uint32_t ptlps:1;</div><div class='add'>+		uint32_t reserved_6_11:6;</div><div class='add'>+		uint32_t sdes:1;</div><div class='add'>+		uint32_t dlpes:1;</div><div class='add'>+		uint32_t reserved_0_3:4;</div><div class='add'>+	} cn52xx;</div><div class='add'>+	struct cvmx_pciercx_cfg065_cn52xx cn52xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg065_cn52xx cn56xx;</div><div class='add'>+	struct cvmx_pciercx_cfg065_cn52xx cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg065_s cn61xx;</div><div class='add'>+	struct cvmx_pciercx_cfg065_cn52xx cn63xx;</div><div class='add'>+	struct cvmx_pciercx_cfg065_cn52xx cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg065_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg065_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg065_cn52xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg066 {</div><div class='ctx'> 	uint32_t u32;</div><div class='ctx'> 	struct cvmx_pciercx_cfg066_s {</div><div class='del'>-		uint32_t reserved_21_31:11;</div><div class='add'>+		uint32_t reserved_25_31:7;</div><div class='add'>+		uint32_t uatombm:1;</div><div class='add'>+		uint32_t reserved_21_23:3;</div><div class='ctx'> 		uint32_t urem:1;</div><div class='ctx'> 		uint32_t ecrcem:1;</div><div class='ctx'> 		uint32_t mtlpm:1;</div><div class='hunk'>@@ -874,18 +1116,39 @@ union cvmx_pciercx_cfg066 {</div><div class='ctx'> 		uint32_t dlpem:1;</div><div class='ctx'> 		uint32_t reserved_0_3:4;</div><div class='ctx'> 	} s;</div><div class='del'>-	struct cvmx_pciercx_cfg066_s cn52xx;</div><div class='del'>-	struct cvmx_pciercx_cfg066_s cn52xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg066_s cn56xx;</div><div class='del'>-	struct cvmx_pciercx_cfg066_s cn56xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg066_s cn63xx;</div><div class='del'>-	struct cvmx_pciercx_cfg066_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg066_cn52xx {</div><div class='add'>+		uint32_t reserved_21_31:11;</div><div class='add'>+		uint32_t urem:1;</div><div class='add'>+		uint32_t ecrcem:1;</div><div class='add'>+		uint32_t mtlpm:1;</div><div class='add'>+		uint32_t rom:1;</div><div class='add'>+		uint32_t ucm:1;</div><div class='add'>+		uint32_t cam:1;</div><div class='add'>+		uint32_t ctm:1;</div><div class='add'>+		uint32_t fcpem:1;</div><div class='add'>+		uint32_t ptlpm:1;</div><div class='add'>+		uint32_t reserved_6_11:6;</div><div class='add'>+		uint32_t sdem:1;</div><div class='add'>+		uint32_t dlpem:1;</div><div class='add'>+		uint32_t reserved_0_3:4;</div><div class='add'>+	} cn52xx;</div><div class='add'>+	struct cvmx_pciercx_cfg066_cn52xx cn52xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg066_cn52xx cn56xx;</div><div class='add'>+	struct cvmx_pciercx_cfg066_cn52xx cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg066_s cn61xx;</div><div class='add'>+	struct cvmx_pciercx_cfg066_cn52xx cn63xx;</div><div class='add'>+	struct cvmx_pciercx_cfg066_cn52xx cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg066_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg066_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg066_cn52xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg067 {</div><div class='ctx'> 	uint32_t u32;</div><div class='ctx'> 	struct cvmx_pciercx_cfg067_s {</div><div class='del'>-		uint32_t reserved_21_31:11;</div><div class='add'>+		uint32_t reserved_25_31:7;</div><div class='add'>+		uint32_t uatombs:1;</div><div class='add'>+		uint32_t reserved_21_23:3;</div><div class='ctx'> 		uint32_t ures:1;</div><div class='ctx'> 		uint32_t ecrces:1;</div><div class='ctx'> 		uint32_t mtlps:1;</div><div class='hunk'>@@ -900,12 +1163,31 @@ union cvmx_pciercx_cfg067 {</div><div class='ctx'> 		uint32_t dlpes:1;</div><div class='ctx'> 		uint32_t reserved_0_3:4;</div><div class='ctx'> 	} s;</div><div class='del'>-	struct cvmx_pciercx_cfg067_s cn52xx;</div><div class='del'>-	struct cvmx_pciercx_cfg067_s cn52xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg067_s cn56xx;</div><div class='del'>-	struct cvmx_pciercx_cfg067_s cn56xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg067_s cn63xx;</div><div class='del'>-	struct cvmx_pciercx_cfg067_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg067_cn52xx {</div><div class='add'>+		uint32_t reserved_21_31:11;</div><div class='add'>+		uint32_t ures:1;</div><div class='add'>+		uint32_t ecrces:1;</div><div class='add'>+		uint32_t mtlps:1;</div><div class='add'>+		uint32_t ros:1;</div><div class='add'>+		uint32_t ucs:1;</div><div class='add'>+		uint32_t cas:1;</div><div class='add'>+		uint32_t cts:1;</div><div class='add'>+		uint32_t fcpes:1;</div><div class='add'>+		uint32_t ptlps:1;</div><div class='add'>+		uint32_t reserved_6_11:6;</div><div class='add'>+		uint32_t sdes:1;</div><div class='add'>+		uint32_t dlpes:1;</div><div class='add'>+		uint32_t reserved_0_3:4;</div><div class='add'>+	} cn52xx;</div><div class='add'>+	struct cvmx_pciercx_cfg067_cn52xx cn52xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg067_cn52xx cn56xx;</div><div class='add'>+	struct cvmx_pciercx_cfg067_cn52xx cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg067_s cn61xx;</div><div class='add'>+	struct cvmx_pciercx_cfg067_cn52xx cn63xx;</div><div class='add'>+	struct cvmx_pciercx_cfg067_cn52xx cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg067_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg067_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg067_cn52xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg068 {</div><div class='hunk'>@@ -925,8 +1207,12 @@ union cvmx_pciercx_cfg068 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg068_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg068_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg068_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg068_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg068_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg068_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg068_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg068_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg068_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg069 {</div><div class='hunk'>@@ -946,8 +1232,12 @@ union cvmx_pciercx_cfg069 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg069_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg069_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg069_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg069_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg069_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg069_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg069_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg069_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg069_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg070 {</div><div class='hunk'>@@ -964,8 +1254,12 @@ union cvmx_pciercx_cfg070 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg070_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg070_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg070_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg070_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg070_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg070_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg070_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg070_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg070_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg071 {</div><div class='hunk'>@@ -977,8 +1271,12 @@ union cvmx_pciercx_cfg071 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg071_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg071_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg071_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg071_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg071_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg071_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg071_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg071_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg071_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg072 {</div><div class='hunk'>@@ -990,8 +1288,12 @@ union cvmx_pciercx_cfg072 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg072_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg072_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg072_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg072_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg072_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg072_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg072_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg072_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg072_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg073 {</div><div class='hunk'>@@ -1003,8 +1305,12 @@ union cvmx_pciercx_cfg073 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg073_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg073_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg073_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg073_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg073_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg073_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg073_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg073_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg073_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg074 {</div><div class='hunk'>@@ -1016,8 +1322,12 @@ union cvmx_pciercx_cfg074 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg074_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg074_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg074_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg074_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg074_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg074_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg074_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg074_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg074_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg075 {</div><div class='hunk'>@@ -1032,8 +1342,12 @@ union cvmx_pciercx_cfg075 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg075_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg075_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg075_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg075_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg075_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg075_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg075_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg075_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg075_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg076 {</div><div class='hunk'>@@ -1053,8 +1367,12 @@ union cvmx_pciercx_cfg076 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg076_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg076_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg076_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg076_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg076_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg076_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg076_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg076_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg076_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg077 {</div><div class='hunk'>@@ -1067,8 +1385,12 @@ union cvmx_pciercx_cfg077 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg077_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg077_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg077_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg077_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg077_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg077_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg077_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg077_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg077_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg448 {</div><div class='hunk'>@@ -1081,8 +1403,12 @@ union cvmx_pciercx_cfg448 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg448_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg448_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg448_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg448_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg448_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg448_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg448_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg448_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg448_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg449 {</div><div class='hunk'>@@ -1094,8 +1420,12 @@ union cvmx_pciercx_cfg449 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg449_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg449_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg449_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg449_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg449_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg449_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg449_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg449_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg449_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg450 {</div><div class='hunk'>@@ -1112,26 +1442,42 @@ union cvmx_pciercx_cfg450 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg450_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg450_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg450_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg450_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg450_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg450_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg450_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg450_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg450_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg451 {</div><div class='ctx'> 	uint32_t u32;</div><div class='ctx'> 	struct cvmx_pciercx_cfg451_s {</div><div class='del'>-		uint32_t reserved_30_31:2;</div><div class='add'>+		uint32_t reserved_31_31:1;</div><div class='add'>+		uint32_t easpml1:1;</div><div class='ctx'> 		uint32_t l1el:3;</div><div class='ctx'> 		uint32_t l0el:3;</div><div class='ctx'> 		uint32_t n_fts_cc:8;</div><div class='ctx'> 		uint32_t n_fts:8;</div><div class='ctx'> 		uint32_t ack_freq:8;</div><div class='ctx'> 	} s;</div><div class='del'>-	struct cvmx_pciercx_cfg451_s cn52xx;</div><div class='del'>-	struct cvmx_pciercx_cfg451_s cn52xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg451_s cn56xx;</div><div class='del'>-	struct cvmx_pciercx_cfg451_s cn56xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg451_s cn63xx;</div><div class='del'>-	struct cvmx_pciercx_cfg451_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg451_cn52xx {</div><div class='add'>+		uint32_t reserved_30_31:2;</div><div class='add'>+		uint32_t l1el:3;</div><div class='add'>+		uint32_t l0el:3;</div><div class='add'>+		uint32_t n_fts_cc:8;</div><div class='add'>+		uint32_t n_fts:8;</div><div class='add'>+		uint32_t ack_freq:8;</div><div class='add'>+	} cn52xx;</div><div class='add'>+	struct cvmx_pciercx_cfg451_cn52xx cn52xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg451_cn52xx cn56xx;</div><div class='add'>+	struct cvmx_pciercx_cfg451_cn52xx cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg451_s cn61xx;</div><div class='add'>+	struct cvmx_pciercx_cfg451_cn52xx cn63xx;</div><div class='add'>+	struct cvmx_pciercx_cfg451_cn52xx cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg451_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg451_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg451_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg452 {</div><div class='hunk'>@@ -1155,8 +1501,24 @@ union cvmx_pciercx_cfg452 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg452_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg452_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg452_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg452_cn61xx {</div><div class='add'>+		uint32_t reserved_22_31:10;</div><div class='add'>+		uint32_t lme:6;</div><div class='add'>+		uint32_t reserved_8_15:8;</div><div class='add'>+		uint32_t flm:1;</div><div class='add'>+		uint32_t reserved_6_6:1;</div><div class='add'>+		uint32_t dllle:1;</div><div class='add'>+		uint32_t reserved_4_4:1;</div><div class='add'>+		uint32_t ra:1;</div><div class='add'>+		uint32_t le:1;</div><div class='add'>+		uint32_t sd:1;</div><div class='add'>+		uint32_t omr:1;</div><div class='add'>+	} cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg452_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg452_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg452_cn61xx cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg452_cn61xx cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg452_cn61xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg453 {</div><div class='hunk'>@@ -1172,13 +1534,26 @@ union cvmx_pciercx_cfg453 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg453_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg453_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg453_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg453_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg453_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg453_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg453_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg453_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg453_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg454 {</div><div class='ctx'> 	uint32_t u32;</div><div class='ctx'> 	struct cvmx_pciercx_cfg454_s {</div><div class='add'>+		uint32_t cx_nfunc:3;</div><div class='add'>+		uint32_t tmfcwt:5;</div><div class='add'>+		uint32_t tmanlt:5;</div><div class='add'>+		uint32_t tmrt:5;</div><div class='add'>+		uint32_t reserved_11_13:3;</div><div class='add'>+		uint32_t nskps:3;</div><div class='add'>+		uint32_t reserved_0_7:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pciercx_cfg454_cn52xx {</div><div class='ctx'> 		uint32_t reserved_29_31:3;</div><div class='ctx'> 		uint32_t tmfcwt:5;</div><div class='ctx'> 		uint32_t tmanlt:5;</div><div class='hunk'>@@ -1187,13 +1562,23 @@ union cvmx_pciercx_cfg454 {</div><div class='ctx'> 		uint32_t nskps:3;</div><div class='ctx'> 		uint32_t reserved_4_7:4;</div><div class='ctx'> 		uint32_t ntss:4;</div><div class='del'>-	} s;</div><div class='del'>-	struct cvmx_pciercx_cfg454_s cn52xx;</div><div class='del'>-	struct cvmx_pciercx_cfg454_s cn52xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg454_s cn56xx;</div><div class='del'>-	struct cvmx_pciercx_cfg454_s cn56xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg454_s cn63xx;</div><div class='del'>-	struct cvmx_pciercx_cfg454_s cn63xxp1;</div><div class='add'>+	} cn52xx;</div><div class='add'>+	struct cvmx_pciercx_cfg454_cn52xx cn52xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg454_cn52xx cn56xx;</div><div class='add'>+	struct cvmx_pciercx_cfg454_cn52xx cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg454_cn61xx {</div><div class='add'>+		uint32_t cx_nfunc:3;</div><div class='add'>+		uint32_t tmfcwt:5;</div><div class='add'>+		uint32_t tmanlt:5;</div><div class='add'>+		uint32_t tmrt:5;</div><div class='add'>+		uint32_t reserved_8_13:6;</div><div class='add'>+		uint32_t mfuncn:8;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_pciercx_cfg454_cn52xx cn63xx;</div><div class='add'>+	struct cvmx_pciercx_cfg454_cn52xx cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg454_cn61xx cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg454_cn61xx cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg454_cn52xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg455 {</div><div class='hunk'>@@ -1223,23 +1608,37 @@ union cvmx_pciercx_cfg455 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg455_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg455_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg455_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg455_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg455_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg455_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg455_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg455_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg455_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg456 {</div><div class='ctx'> 	uint32_t u32;</div><div class='ctx'> 	struct cvmx_pciercx_cfg456_s {</div><div class='del'>-		uint32_t reserved_2_31:30;</div><div class='add'>+		uint32_t reserved_4_31:28;</div><div class='add'>+		uint32_t m_handle_flush:1;</div><div class='add'>+		uint32_t m_dabort_4ucpl:1;</div><div class='ctx'> 		uint32_t m_vend1_drp:1;</div><div class='ctx'> 		uint32_t m_vend0_drp:1;</div><div class='ctx'> 	} s;</div><div class='del'>-	struct cvmx_pciercx_cfg456_s cn52xx;</div><div class='del'>-	struct cvmx_pciercx_cfg456_s cn52xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg456_s cn56xx;</div><div class='del'>-	struct cvmx_pciercx_cfg456_s cn56xxp1;</div><div class='del'>-	struct cvmx_pciercx_cfg456_s cn63xx;</div><div class='del'>-	struct cvmx_pciercx_cfg456_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg456_cn52xx {</div><div class='add'>+		uint32_t reserved_2_31:30;</div><div class='add'>+		uint32_t m_vend1_drp:1;</div><div class='add'>+		uint32_t m_vend0_drp:1;</div><div class='add'>+	} cn52xx;</div><div class='add'>+	struct cvmx_pciercx_cfg456_cn52xx cn52xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg456_cn52xx cn56xx;</div><div class='add'>+	struct cvmx_pciercx_cfg456_cn52xx cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg456_s cn61xx;</div><div class='add'>+	struct cvmx_pciercx_cfg456_cn52xx cn63xx;</div><div class='add'>+	struct cvmx_pciercx_cfg456_cn52xx cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg456_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg456_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg456_cn52xx cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg458 {</div><div class='hunk'>@@ -1251,8 +1650,12 @@ union cvmx_pciercx_cfg458 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg458_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg458_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg458_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg458_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg458_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg458_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg458_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg458_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg458_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg459 {</div><div class='hunk'>@@ -1264,8 +1667,12 @@ union cvmx_pciercx_cfg459 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg459_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg459_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg459_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg459_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg459_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg459_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg459_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg459_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg459_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg460 {</div><div class='hunk'>@@ -1279,8 +1686,12 @@ union cvmx_pciercx_cfg460 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg460_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg460_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg460_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg460_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg460_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg460_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg460_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg460_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg460_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg461 {</div><div class='hunk'>@@ -1294,8 +1705,12 @@ union cvmx_pciercx_cfg461 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg461_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg461_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg461_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg461_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg461_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg461_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg461_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg461_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg461_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg462 {</div><div class='hunk'>@@ -1309,8 +1724,12 @@ union cvmx_pciercx_cfg462 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg462_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg462_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg462_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg462_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg462_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg462_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg462_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg462_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg462_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg463 {</div><div class='hunk'>@@ -1325,8 +1744,12 @@ union cvmx_pciercx_cfg463 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg463_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg463_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg463_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg463_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg463_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg463_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg463_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg463_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg463_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg464 {</div><div class='hunk'>@@ -1341,8 +1764,12 @@ union cvmx_pciercx_cfg464 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg464_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg464_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg464_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg464_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg464_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg464_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg464_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg464_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg464_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg465 {</div><div class='hunk'>@@ -1357,8 +1784,12 @@ union cvmx_pciercx_cfg465 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg465_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg465_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg465_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg465_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg465_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg465_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg465_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg465_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg465_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg466 {</div><div class='hunk'>@@ -1376,8 +1807,12 @@ union cvmx_pciercx_cfg466 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg466_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg466_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg466_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg466_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg466_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg466_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg466_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg466_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg466_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg467 {</div><div class='hunk'>@@ -1393,8 +1828,12 @@ union cvmx_pciercx_cfg467 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg467_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg467_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg467_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg467_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg467_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg467_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg467_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg467_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg467_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg468 {</div><div class='hunk'>@@ -1410,8 +1849,12 @@ union cvmx_pciercx_cfg468 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg468_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg468_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg468_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg468_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg468_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg468_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg468_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg468_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg468_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg490 {</div><div class='hunk'>@@ -1426,8 +1869,12 @@ union cvmx_pciercx_cfg490 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg490_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg490_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg490_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg490_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg490_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg490_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg490_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg490_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg490_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg491 {</div><div class='hunk'>@@ -1442,8 +1889,12 @@ union cvmx_pciercx_cfg491 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg491_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg491_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg491_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg491_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg491_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg491_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg491_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg491_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg491_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg492 {</div><div class='hunk'>@@ -1458,8 +1909,12 @@ union cvmx_pciercx_cfg492 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg492_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg492_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg492_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg492_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg492_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg492_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg492_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg492_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg492_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg515 {</div><div class='hunk'>@@ -1473,8 +1928,12 @@ union cvmx_pciercx_cfg515 {</div><div class='ctx'> 		uint32_t le:9;</div><div class='ctx'> 		uint32_t n_fts:8;</div><div class='ctx'> 	} s;</div><div class='add'>+	struct cvmx_pciercx_cfg515_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg515_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg515_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg515_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg515_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg515_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg516 {</div><div class='hunk'>@@ -1486,8 +1945,12 @@ union cvmx_pciercx_cfg516 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg516_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg516_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg516_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg516_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg516_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg516_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg516_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg516_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg516_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union cvmx_pciercx_cfg517 {</div><div class='hunk'>@@ -1499,8 +1962,12 @@ union cvmx_pciercx_cfg517 {</div><div class='ctx'> 	struct cvmx_pciercx_cfg517_s cn52xxp1;</div><div class='ctx'> 	struct cvmx_pciercx_cfg517_s cn56xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg517_s cn56xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg517_s cn61xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg517_s cn63xx;</div><div class='ctx'> 	struct cvmx_pciercx_cfg517_s cn63xxp1;</div><div class='add'>+	struct cvmx_pciercx_cfg517_s cn66xx;</div><div class='add'>+	struct cvmx_pciercx_cfg517_s cn68xx;</div><div class='add'>+	struct cvmx_pciercx_cfg517_s cn68xxp1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-pcsx-defs.h b/arch/mips/include/asm/octeon/cvmx-pcsx-defs.h<br/>index d45952df5f5b..d45952df5f5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-pcsx-defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-pcsx-defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-pcsx-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-pcsx-defs.h</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-pcsxx-defs.h b/arch/mips/include/asm/octeon/cvmx-pcsxx-defs.h<br/>index 55d120fe8aed..55d120fe8aed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-pcsxx-defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-pcsxx-defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-pcsxx-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-pcsxx-defs.h</a></div><div class='head'>diff --git a/arch/mips/include/asm/octeon/cvmx-pemx-defs.h b/arch/mips/include/asm/octeon/cvmx-pemx-defs.h<br/>new file mode 100644<br/>index 000000000000..be189a2585e0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-pemx-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-pemx-defs.h</a></div><div class='hunk'>@@ -0,0 +1,509 @@</div><div class='add'>+/***********************license start***************</div><div class='add'>+ * Author: Cavium Networks</div><div class='add'>+ *</div><div class='add'>+ * Contact: support@caviumnetworks.com</div><div class='add'>+ * This file is part of the OCTEON SDK</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2003-2011 Cavium Networks</div><div class='add'>+ *</div><div class='add'>+ * This file is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License, Version 2, as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This file is distributed in the hope that it will be useful, but</div><div class='add'>+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty</div><div class='add'>+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or</div><div class='add'>+ * NONINFRINGEMENT.  See the GNU General Public License for more</div><div class='add'>+ * details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this file; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</div><div class='add'>+ * or visit http://www.gnu.org/licenses/.</div><div class='add'>+ *</div><div class='add'>+ * This file may also be available under a different license from Cavium.</div><div class='add'>+ * Contact Cavium Networks for more information</div><div class='add'>+ ***********************license end**************************************/</div><div class='add'>+</div><div class='add'>+#ifndef __CVMX_PEMX_DEFS_H__</div><div class='add'>+#define __CVMX_PEMX_DEFS_H__</div><div class='add'>+</div><div class='add'>+#define CVMX_PEMX_BAR1_INDEXX(offset, block_id) (CVMX_ADD_IO_SEG(0x00011800C00000A8ull) + (((offset) &amp; 15) + ((block_id) &amp; 1) * 0x200000ull) * 8)</div><div class='add'>+#define CVMX_PEMX_BAR2_MASK(block_id) (CVMX_ADD_IO_SEG(0x00011800C0000130ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+#define CVMX_PEMX_BAR_CTL(block_id) (CVMX_ADD_IO_SEG(0x00011800C0000128ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+#define CVMX_PEMX_BIST_STATUS(block_id) (CVMX_ADD_IO_SEG(0x00011800C0000018ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+#define CVMX_PEMX_BIST_STATUS2(block_id) (CVMX_ADD_IO_SEG(0x00011800C0000420ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+#define CVMX_PEMX_CFG_RD(block_id) (CVMX_ADD_IO_SEG(0x00011800C0000030ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+#define CVMX_PEMX_CFG_WR(block_id) (CVMX_ADD_IO_SEG(0x00011800C0000028ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+#define CVMX_PEMX_CPL_LUT_VALID(block_id) (CVMX_ADD_IO_SEG(0x00011800C0000098ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+#define CVMX_PEMX_CTL_STATUS(block_id) (CVMX_ADD_IO_SEG(0x00011800C0000000ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+#define CVMX_PEMX_DBG_INFO(block_id) (CVMX_ADD_IO_SEG(0x00011800C0000008ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+#define CVMX_PEMX_DBG_INFO_EN(block_id) (CVMX_ADD_IO_SEG(0x00011800C00000A0ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+#define CVMX_PEMX_DIAG_STATUS(block_id) (CVMX_ADD_IO_SEG(0x00011800C0000020ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+#define CVMX_PEMX_INB_READ_CREDITS(block_id) (CVMX_ADD_IO_SEG(0x00011800C0000138ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+#define CVMX_PEMX_INT_ENB(block_id) (CVMX_ADD_IO_SEG(0x00011800C0000410ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+#define CVMX_PEMX_INT_ENB_INT(block_id) (CVMX_ADD_IO_SEG(0x00011800C0000418ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+#define CVMX_PEMX_INT_SUM(block_id) (CVMX_ADD_IO_SEG(0x00011800C0000408ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+#define CVMX_PEMX_P2N_BAR0_START(block_id) (CVMX_ADD_IO_SEG(0x00011800C0000080ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+#define CVMX_PEMX_P2N_BAR1_START(block_id) (CVMX_ADD_IO_SEG(0x00011800C0000088ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+#define CVMX_PEMX_P2N_BAR2_START(block_id) (CVMX_ADD_IO_SEG(0x00011800C0000090ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+#define CVMX_PEMX_P2P_BARX_END(offset, block_id) (CVMX_ADD_IO_SEG(0x00011800C0000048ull) + (((offset) &amp; 3) + ((block_id) &amp; 1) * 0x100000ull) * 16)</div><div class='add'>+#define CVMX_PEMX_P2P_BARX_START(offset, block_id) (CVMX_ADD_IO_SEG(0x00011800C0000040ull) + (((offset) &amp; 3) + ((block_id) &amp; 1) * 0x100000ull) * 16)</div><div class='add'>+#define CVMX_PEMX_TLP_CREDITS(block_id) (CVMX_ADD_IO_SEG(0x00011800C0000038ull) + ((block_id) &amp; 1) * 0x1000000ull)</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_bar1_indexx {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_bar1_indexx_s {</div><div class='add'>+		uint64_t reserved_20_63:44;</div><div class='add'>+		uint64_t addr_idx:16;</div><div class='add'>+		uint64_t ca:1;</div><div class='add'>+		uint64_t end_swp:2;</div><div class='add'>+		uint64_t addr_v:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_bar1_indexx_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_bar1_indexx_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_bar1_indexx_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_bar1_indexx_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_bar1_indexx_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_bar1_indexx_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_bar2_mask {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_bar2_mask_s {</div><div class='add'>+		uint64_t reserved_38_63:26;</div><div class='add'>+		uint64_t mask:35;</div><div class='add'>+		uint64_t reserved_0_2:3;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_bar2_mask_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_bar2_mask_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_bar2_mask_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_bar2_mask_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_bar_ctl {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_bar_ctl_s {</div><div class='add'>+		uint64_t reserved_7_63:57;</div><div class='add'>+		uint64_t bar1_siz:3;</div><div class='add'>+		uint64_t bar2_enb:1;</div><div class='add'>+		uint64_t bar2_esx:2;</div><div class='add'>+		uint64_t bar2_cax:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_bar_ctl_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_bar_ctl_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_bar_ctl_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_bar_ctl_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_bar_ctl_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_bar_ctl_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_bist_status {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_bist_status_s {</div><div class='add'>+		uint64_t reserved_8_63:56;</div><div class='add'>+		uint64_t retry:1;</div><div class='add'>+		uint64_t rqdata0:1;</div><div class='add'>+		uint64_t rqdata1:1;</div><div class='add'>+		uint64_t rqdata2:1;</div><div class='add'>+		uint64_t rqdata3:1;</div><div class='add'>+		uint64_t rqhdr1:1;</div><div class='add'>+		uint64_t rqhdr0:1;</div><div class='add'>+		uint64_t sot:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_bist_status_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_bist_status_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_bist_status_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_bist_status_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_bist_status_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_bist_status_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_bist_status2 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_bist_status2_s {</div><div class='add'>+		uint64_t reserved_10_63:54;</div><div class='add'>+		uint64_t e2p_cpl:1;</div><div class='add'>+		uint64_t e2p_n:1;</div><div class='add'>+		uint64_t e2p_p:1;</div><div class='add'>+		uint64_t peai_p2e:1;</div><div class='add'>+		uint64_t pef_tpf1:1;</div><div class='add'>+		uint64_t pef_tpf0:1;</div><div class='add'>+		uint64_t pef_tnf:1;</div><div class='add'>+		uint64_t pef_tcf1:1;</div><div class='add'>+		uint64_t pef_tc0:1;</div><div class='add'>+		uint64_t ppf:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_bist_status2_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_bist_status2_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_bist_status2_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_bist_status2_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_bist_status2_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_bist_status2_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_cfg_rd {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_cfg_rd_s {</div><div class='add'>+		uint64_t data:32;</div><div class='add'>+		uint64_t addr:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_cfg_rd_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_cfg_rd_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_cfg_rd_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_cfg_rd_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_cfg_rd_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_cfg_rd_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_cfg_wr {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_cfg_wr_s {</div><div class='add'>+		uint64_t data:32;</div><div class='add'>+		uint64_t addr:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_cfg_wr_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_cfg_wr_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_cfg_wr_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_cfg_wr_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_cfg_wr_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_cfg_wr_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_cpl_lut_valid {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_cpl_lut_valid_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t tag:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_cpl_lut_valid_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_cpl_lut_valid_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_cpl_lut_valid_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_cpl_lut_valid_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_cpl_lut_valid_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_cpl_lut_valid_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_ctl_status {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_ctl_status_s {</div><div class='add'>+		uint64_t reserved_48_63:16;</div><div class='add'>+		uint64_t auto_sd:1;</div><div class='add'>+		uint64_t dnum:5;</div><div class='add'>+		uint64_t pbus:8;</div><div class='add'>+		uint64_t reserved_32_33:2;</div><div class='add'>+		uint64_t cfg_rtry:16;</div><div class='add'>+		uint64_t reserved_12_15:4;</div><div class='add'>+		uint64_t pm_xtoff:1;</div><div class='add'>+		uint64_t pm_xpme:1;</div><div class='add'>+		uint64_t ob_p_cmd:1;</div><div class='add'>+		uint64_t reserved_7_8:2;</div><div class='add'>+		uint64_t nf_ecrc:1;</div><div class='add'>+		uint64_t dly_one:1;</div><div class='add'>+		uint64_t lnk_enb:1;</div><div class='add'>+		uint64_t ro_ctlp:1;</div><div class='add'>+		uint64_t fast_lm:1;</div><div class='add'>+		uint64_t inv_ecrc:1;</div><div class='add'>+		uint64_t inv_lcrc:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_ctl_status_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_ctl_status_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_ctl_status_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_ctl_status_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_ctl_status_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_ctl_status_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_dbg_info {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_dbg_info_s {</div><div class='add'>+		uint64_t reserved_31_63:33;</div><div class='add'>+		uint64_t ecrc_e:1;</div><div class='add'>+		uint64_t rawwpp:1;</div><div class='add'>+		uint64_t racpp:1;</div><div class='add'>+		uint64_t ramtlp:1;</div><div class='add'>+		uint64_t rarwdns:1;</div><div class='add'>+		uint64_t caar:1;</div><div class='add'>+		uint64_t racca:1;</div><div class='add'>+		uint64_t racur:1;</div><div class='add'>+		uint64_t rauc:1;</div><div class='add'>+		uint64_t rqo:1;</div><div class='add'>+		uint64_t fcuv:1;</div><div class='add'>+		uint64_t rpe:1;</div><div class='add'>+		uint64_t fcpvwt:1;</div><div class='add'>+		uint64_t dpeoosd:1;</div><div class='add'>+		uint64_t rtwdle:1;</div><div class='add'>+		uint64_t rdwdle:1;</div><div class='add'>+		uint64_t mre:1;</div><div class='add'>+		uint64_t rte:1;</div><div class='add'>+		uint64_t acto:1;</div><div class='add'>+		uint64_t rvdm:1;</div><div class='add'>+		uint64_t rumep:1;</div><div class='add'>+		uint64_t rptamrc:1;</div><div class='add'>+		uint64_t rpmerc:1;</div><div class='add'>+		uint64_t rfemrc:1;</div><div class='add'>+		uint64_t rnfemrc:1;</div><div class='add'>+		uint64_t rcemrc:1;</div><div class='add'>+		uint64_t rpoison:1;</div><div class='add'>+		uint64_t recrce:1;</div><div class='add'>+		uint64_t rtlplle:1;</div><div class='add'>+		uint64_t rtlpmal:1;</div><div class='add'>+		uint64_t spoison:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_dbg_info_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_dbg_info_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_dbg_info_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_dbg_info_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_dbg_info_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_dbg_info_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_dbg_info_en {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_dbg_info_en_s {</div><div class='add'>+		uint64_t reserved_31_63:33;</div><div class='add'>+		uint64_t ecrc_e:1;</div><div class='add'>+		uint64_t rawwpp:1;</div><div class='add'>+		uint64_t racpp:1;</div><div class='add'>+		uint64_t ramtlp:1;</div><div class='add'>+		uint64_t rarwdns:1;</div><div class='add'>+		uint64_t caar:1;</div><div class='add'>+		uint64_t racca:1;</div><div class='add'>+		uint64_t racur:1;</div><div class='add'>+		uint64_t rauc:1;</div><div class='add'>+		uint64_t rqo:1;</div><div class='add'>+		uint64_t fcuv:1;</div><div class='add'>+		uint64_t rpe:1;</div><div class='add'>+		uint64_t fcpvwt:1;</div><div class='add'>+		uint64_t dpeoosd:1;</div><div class='add'>+		uint64_t rtwdle:1;</div><div class='add'>+		uint64_t rdwdle:1;</div><div class='add'>+		uint64_t mre:1;</div><div class='add'>+		uint64_t rte:1;</div><div class='add'>+		uint64_t acto:1;</div><div class='add'>+		uint64_t rvdm:1;</div><div class='add'>+		uint64_t rumep:1;</div><div class='add'>+		uint64_t rptamrc:1;</div><div class='add'>+		uint64_t rpmerc:1;</div><div class='add'>+		uint64_t rfemrc:1;</div><div class='add'>+		uint64_t rnfemrc:1;</div><div class='add'>+		uint64_t rcemrc:1;</div><div class='add'>+		uint64_t rpoison:1;</div><div class='add'>+		uint64_t recrce:1;</div><div class='add'>+		uint64_t rtlplle:1;</div><div class='add'>+		uint64_t rtlpmal:1;</div><div class='add'>+		uint64_t spoison:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_dbg_info_en_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_dbg_info_en_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_dbg_info_en_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_dbg_info_en_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_dbg_info_en_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_dbg_info_en_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_diag_status {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_diag_status_s {</div><div class='add'>+		uint64_t reserved_4_63:60;</div><div class='add'>+		uint64_t pm_dst:1;</div><div class='add'>+		uint64_t pm_stat:1;</div><div class='add'>+		uint64_t pm_en:1;</div><div class='add'>+		uint64_t aux_en:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_diag_status_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_diag_status_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_diag_status_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_diag_status_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_diag_status_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_diag_status_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_inb_read_credits {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_inb_read_credits_s {</div><div class='add'>+		uint64_t reserved_6_63:58;</div><div class='add'>+		uint64_t num:6;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_inb_read_credits_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_inb_read_credits_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_inb_read_credits_s cn68xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_int_enb {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_int_enb_s {</div><div class='add'>+		uint64_t reserved_14_63:50;</div><div class='add'>+		uint64_t crs_dr:1;</div><div class='add'>+		uint64_t crs_er:1;</div><div class='add'>+		uint64_t rdlk:1;</div><div class='add'>+		uint64_t exc:1;</div><div class='add'>+		uint64_t un_bx:1;</div><div class='add'>+		uint64_t un_b2:1;</div><div class='add'>+		uint64_t un_b1:1;</div><div class='add'>+		uint64_t up_bx:1;</div><div class='add'>+		uint64_t up_b2:1;</div><div class='add'>+		uint64_t up_b1:1;</div><div class='add'>+		uint64_t pmem:1;</div><div class='add'>+		uint64_t pmei:1;</div><div class='add'>+		uint64_t se:1;</div><div class='add'>+		uint64_t aeri:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_int_enb_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_int_enb_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_int_enb_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_int_enb_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_int_enb_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_int_enb_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_int_enb_int {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_int_enb_int_s {</div><div class='add'>+		uint64_t reserved_14_63:50;</div><div class='add'>+		uint64_t crs_dr:1;</div><div class='add'>+		uint64_t crs_er:1;</div><div class='add'>+		uint64_t rdlk:1;</div><div class='add'>+		uint64_t exc:1;</div><div class='add'>+		uint64_t un_bx:1;</div><div class='add'>+		uint64_t un_b2:1;</div><div class='add'>+		uint64_t un_b1:1;</div><div class='add'>+		uint64_t up_bx:1;</div><div class='add'>+		uint64_t up_b2:1;</div><div class='add'>+		uint64_t up_b1:1;</div><div class='add'>+		uint64_t pmem:1;</div><div class='add'>+		uint64_t pmei:1;</div><div class='add'>+		uint64_t se:1;</div><div class='add'>+		uint64_t aeri:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_int_enb_int_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_int_enb_int_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_int_enb_int_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_int_enb_int_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_int_enb_int_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_int_enb_int_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_int_sum {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_int_sum_s {</div><div class='add'>+		uint64_t reserved_14_63:50;</div><div class='add'>+		uint64_t crs_dr:1;</div><div class='add'>+		uint64_t crs_er:1;</div><div class='add'>+		uint64_t rdlk:1;</div><div class='add'>+		uint64_t exc:1;</div><div class='add'>+		uint64_t un_bx:1;</div><div class='add'>+		uint64_t un_b2:1;</div><div class='add'>+		uint64_t un_b1:1;</div><div class='add'>+		uint64_t up_bx:1;</div><div class='add'>+		uint64_t up_b2:1;</div><div class='add'>+		uint64_t up_b1:1;</div><div class='add'>+		uint64_t pmem:1;</div><div class='add'>+		uint64_t pmei:1;</div><div class='add'>+		uint64_t se:1;</div><div class='add'>+		uint64_t aeri:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_int_sum_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_int_sum_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_int_sum_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_int_sum_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_int_sum_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_int_sum_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_p2n_bar0_start {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_p2n_bar0_start_s {</div><div class='add'>+		uint64_t addr:50;</div><div class='add'>+		uint64_t reserved_0_13:14;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_p2n_bar0_start_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_p2n_bar0_start_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_p2n_bar0_start_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_p2n_bar0_start_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_p2n_bar0_start_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_p2n_bar0_start_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_p2n_bar1_start {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_p2n_bar1_start_s {</div><div class='add'>+		uint64_t addr:38;</div><div class='add'>+		uint64_t reserved_0_25:26;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_p2n_bar1_start_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_p2n_bar1_start_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_p2n_bar1_start_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_p2n_bar1_start_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_p2n_bar1_start_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_p2n_bar1_start_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_p2n_bar2_start {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_p2n_bar2_start_s {</div><div class='add'>+		uint64_t addr:23;</div><div class='add'>+		uint64_t reserved_0_40:41;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_p2n_bar2_start_s cn61xx;</div><div class='add'>+	struct cvmx_pemx_p2n_bar2_start_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_p2n_bar2_start_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_p2n_bar2_start_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_p2n_bar2_start_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_p2n_bar2_start_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_p2p_barx_end {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_p2p_barx_end_s {</div><div class='add'>+		uint64_t addr:52;</div><div class='add'>+		uint64_t reserved_0_11:12;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_p2p_barx_end_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_p2p_barx_end_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_p2p_barx_end_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_p2p_barx_end_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_p2p_barx_end_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_p2p_barx_start {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_p2p_barx_start_s {</div><div class='add'>+		uint64_t addr:52;</div><div class='add'>+		uint64_t reserved_0_11:12;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_p2p_barx_start_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_p2p_barx_start_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_p2p_barx_start_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_p2p_barx_start_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_p2p_barx_start_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_pemx_tlp_credits {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_pemx_tlp_credits_s {</div><div class='add'>+		uint64_t reserved_56_63:8;</div><div class='add'>+		uint64_t peai_ppf:8;</div><div class='add'>+		uint64_t pem_cpl:8;</div><div class='add'>+		uint64_t pem_np:8;</div><div class='add'>+		uint64_t pem_p:8;</div><div class='add'>+		uint64_t sli_cpl:8;</div><div class='add'>+		uint64_t sli_np:8;</div><div class='add'>+		uint64_t sli_p:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_pemx_tlp_credits_cn61xx {</div><div class='add'>+		uint64_t reserved_56_63:8;</div><div class='add'>+		uint64_t peai_ppf:8;</div><div class='add'>+		uint64_t reserved_24_47:24;</div><div class='add'>+		uint64_t sli_cpl:8;</div><div class='add'>+		uint64_t sli_np:8;</div><div class='add'>+		uint64_t sli_p:8;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_pemx_tlp_credits_s cn63xx;</div><div class='add'>+	struct cvmx_pemx_tlp_credits_s cn63xxp1;</div><div class='add'>+	struct cvmx_pemx_tlp_credits_s cn66xx;</div><div class='add'>+	struct cvmx_pemx_tlp_credits_s cn68xx;</div><div class='add'>+	struct cvmx_pemx_tlp_credits_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/mips/include/asm/octeon/cvmx-pexp-defs.h b/arch/mips/include/asm/octeon/cvmx-pexp-defs.h<br/>index 5ab8679d89af..4438d211988b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-pexp-defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx-pexp-defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-pexp-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-pexp-defs.h</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>  * Contact: support@caviumnetworks.com</div><div class='ctx'>  * This file is part of the OCTEON SDK</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2003-2010 Cavium Networks</div><div class='add'>+ * Copyright (c) 2003-2011 Cavium Networks</div><div class='ctx'>  *</div><div class='ctx'>  * This file is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License, Version 2, as</div><div class='hunk'>@@ -25,13 +25,6 @@</div><div class='ctx'>  * Contact Cavium Networks for more information</div><div class='ctx'>  ***********************license end**************************************/</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * cvmx-pexp-defs.h</div><div class='del'>- *</div><div class='del'>- * Configuration and status register (CSR) definitions for</div><div class='del'>- * OCTEON PEXP.</div><div class='del'>- *</div><div class='del'>- */</div><div class='ctx'> #ifndef __CVMX_PEXP_DEFS_H__</div><div class='ctx'> #define __CVMX_PEXP_DEFS_H__</div><div class='ctx'> </div><div class='hunk'>@@ -139,7 +132,7 @@</div><div class='ctx'> #define CVMX_PEXP_NPEI_STATE3 (CVMX_ADD_IO_SEG(0x00011F0000008640ull))</div><div class='ctx'> #define CVMX_PEXP_NPEI_WINDOW_CTL (CVMX_ADD_IO_SEG(0x00011F0000008380ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_BIST_STATUS (CVMX_ADD_IO_SEG(0x00011F0000010580ull))</div><div class='del'>-#define CVMX_PEXP_SLI_CTL_PORTX(offset) (CVMX_ADD_IO_SEG(0x00011F0000010050ull) + ((offset) &amp; 1) * 16)</div><div class='add'>+#define CVMX_PEXP_SLI_CTL_PORTX(offset) (CVMX_ADD_IO_SEG(0x00011F0000010050ull) + ((offset) &amp; 3) * 16)</div><div class='ctx'> #define CVMX_PEXP_SLI_CTL_STATUS (CVMX_ADD_IO_SEG(0x00011F0000010570ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_DATA_OUT_CNT (CVMX_ADD_IO_SEG(0x00011F00000105F0ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_DBG_DATA (CVMX_ADD_IO_SEG(0x00011F0000010310ull))</div><div class='hunk'>@@ -152,7 +145,10 @@</div><div class='ctx'> #define CVMX_PEXP_SLI_INT_SUM (CVMX_ADD_IO_SEG(0x00011F0000010330ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_LAST_WIN_RDATA0 (CVMX_ADD_IO_SEG(0x00011F0000010600ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_LAST_WIN_RDATA1 (CVMX_ADD_IO_SEG(0x00011F0000010610ull))</div><div class='add'>+#define CVMX_PEXP_SLI_LAST_WIN_RDATA2 (CVMX_ADD_IO_SEG(0x00011F00000106C0ull))</div><div class='add'>+#define CVMX_PEXP_SLI_LAST_WIN_RDATA3 (CVMX_ADD_IO_SEG(0x00011F00000106D0ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_MAC_CREDIT_CNT (CVMX_ADD_IO_SEG(0x00011F0000013D70ull))</div><div class='add'>+#define CVMX_PEXP_SLI_MAC_CREDIT_CNT2 (CVMX_ADD_IO_SEG(0x00011F0000013E10ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_MEM_ACCESS_CTL (CVMX_ADD_IO_SEG(0x00011F00000102F0ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_MEM_ACCESS_SUBIDX(offset) (CVMX_ADD_IO_SEG(0x00011F00000100E0ull) + ((offset) &amp; 31) * 16 - 16*12)</div><div class='ctx'> #define CVMX_PEXP_SLI_MSI_ENB0 (CVMX_ADD_IO_SEG(0x00011F0000013C50ull))</div><div class='hunk'>@@ -206,6 +202,7 @@</div><div class='ctx'> #define CVMX_PEXP_SLI_PKT_IPTR (CVMX_ADD_IO_SEG(0x00011F0000011070ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_PKT_OUTPUT_WMARK (CVMX_ADD_IO_SEG(0x00011F0000011180ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_PKT_OUT_BMODE (CVMX_ADD_IO_SEG(0x00011F00000110D0ull))</div><div class='add'>+#define CVMX_PEXP_SLI_PKT_OUT_BP_EN (CVMX_ADD_IO_SEG(0x00011F0000011240ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_PKT_OUT_ENB (CVMX_ADD_IO_SEG(0x00011F0000011010ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_PKT_PCIE_PORT (CVMX_ADD_IO_SEG(0x00011F00000110E0ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_PKT_PORT_IN_RST (CVMX_ADD_IO_SEG(0x00011F00000111F0ull))</div><div class='hunk'>@@ -214,12 +211,14 @@</div><div class='ctx'> #define CVMX_PEXP_SLI_PKT_SLIST_ROR (CVMX_ADD_IO_SEG(0x00011F0000011030ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_PKT_TIME_INT (CVMX_ADD_IO_SEG(0x00011F0000011140ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_PKT_TIME_INT_ENB (CVMX_ADD_IO_SEG(0x00011F0000011160ull))</div><div class='del'>-#define CVMX_PEXP_SLI_S2M_PORTX_CTL(offset) (CVMX_ADD_IO_SEG(0x00011F0000013D80ull) + ((offset) &amp; 1) * 16)</div><div class='add'>+#define CVMX_PEXP_SLI_PORTX_PKIND(offset) (CVMX_ADD_IO_SEG(0x00011F0000010800ull) + ((offset) &amp; 31) * 16)</div><div class='add'>+#define CVMX_PEXP_SLI_S2M_PORTX_CTL(offset) (CVMX_ADD_IO_SEG(0x00011F0000013D80ull) + ((offset) &amp; 3) * 16)</div><div class='ctx'> #define CVMX_PEXP_SLI_SCRATCH_1 (CVMX_ADD_IO_SEG(0x00011F00000103C0ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_SCRATCH_2 (CVMX_ADD_IO_SEG(0x00011F00000103D0ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_STATE1 (CVMX_ADD_IO_SEG(0x00011F0000010620ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_STATE2 (CVMX_ADD_IO_SEG(0x00011F0000010630ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_STATE3 (CVMX_ADD_IO_SEG(0x00011F0000010640ull))</div><div class='add'>+#define CVMX_PEXP_SLI_TX_PIPE (CVMX_ADD_IO_SEG(0x00011F0000011230ull))</div><div class='ctx'> #define CVMX_PEXP_SLI_WINDOW_CTL (CVMX_ADD_IO_SEG(0x00011F00000102E0ull))</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-pip-defs.h b/arch/mips/include/asm/octeon/cvmx-pip-defs.h<br/>index 5a369100ca68..5a369100ca68 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-pip-defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-pip-defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-pip-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-pip-defs.h</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-pip.h b/arch/mips/include/asm/octeon/cvmx-pip.h<br/>index 78dbce8f2c5e..78dbce8f2c5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-pip.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-pip.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-pip.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-pip.h</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-pko-defs.h b/arch/mips/include/asm/octeon/cvmx-pko-defs.h<br/>index 50e779cf1ad8..50e779cf1ad8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-pko-defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-pko-defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-pko-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-pko-defs.h</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-pko.h b/arch/mips/include/asm/octeon/cvmx-pko.h<br/>index de3412aada5d..de3412aada5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-pko.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-pko.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-pko.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-pko.h</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-pow.h b/arch/mips/include/asm/octeon/cvmx-pow.h<br/>index 999aefe3274c..999aefe3274c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-pow.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-pow.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-pow.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-pow.h</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-scratch.h b/arch/mips/include/asm/octeon/cvmx-scratch.h<br/>index 96b70cfd6245..96b70cfd6245 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-scratch.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-scratch.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-scratch.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-scratch.h</a></div><div class='head'>diff --git a/arch/mips/include/asm/octeon/cvmx-sli-defs.h b/arch/mips/include/asm/octeon/cvmx-sli-defs.h<br/>new file mode 100644<br/>index 000000000000..7c6c901d3d28<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-sli-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-sli-defs.h</a></div><div class='hunk'>@@ -0,0 +1,2172 @@</div><div class='add'>+/***********************license start***************</div><div class='add'>+ * Author: Cavium Networks</div><div class='add'>+ *</div><div class='add'>+ * Contact: support@caviumnetworks.com</div><div class='add'>+ * This file is part of the OCTEON SDK</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2003-2011 Cavium Networks</div><div class='add'>+ *</div><div class='add'>+ * This file is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License, Version 2, as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This file is distributed in the hope that it will be useful, but</div><div class='add'>+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty</div><div class='add'>+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or</div><div class='add'>+ * NONINFRINGEMENT.  See the GNU General Public License for more</div><div class='add'>+ * details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this file; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</div><div class='add'>+ * or visit http://www.gnu.org/licenses/.</div><div class='add'>+ *</div><div class='add'>+ * This file may also be available under a different license from Cavium.</div><div class='add'>+ * Contact Cavium Networks for more information</div><div class='add'>+ ***********************license end**************************************/</div><div class='add'>+</div><div class='add'>+#ifndef __CVMX_SLI_DEFS_H__</div><div class='add'>+#define __CVMX_SLI_DEFS_H__</div><div class='add'>+</div><div class='add'>+#define CVMX_SLI_BIST_STATUS (0x0000000000000580ull)</div><div class='add'>+#define CVMX_SLI_CTL_PORTX(offset) (0x0000000000000050ull + ((offset) &amp; 3) * 16)</div><div class='add'>+#define CVMX_SLI_CTL_STATUS (0x0000000000000570ull)</div><div class='add'>+#define CVMX_SLI_DATA_OUT_CNT (0x00000000000005F0ull)</div><div class='add'>+#define CVMX_SLI_DBG_DATA (0x0000000000000310ull)</div><div class='add'>+#define CVMX_SLI_DBG_SELECT (0x0000000000000300ull)</div><div class='add'>+#define CVMX_SLI_DMAX_CNT(offset) (0x0000000000000400ull + ((offset) &amp; 1) * 16)</div><div class='add'>+#define CVMX_SLI_DMAX_INT_LEVEL(offset) (0x00000000000003E0ull + ((offset) &amp; 1) * 16)</div><div class='add'>+#define CVMX_SLI_DMAX_TIM(offset) (0x0000000000000420ull + ((offset) &amp; 1) * 16)</div><div class='add'>+#define CVMX_SLI_INT_ENB_CIU (0x0000000000003CD0ull)</div><div class='add'>+#define CVMX_SLI_INT_ENB_PORTX(offset) (0x0000000000000340ull + ((offset) &amp; 1) * 16)</div><div class='add'>+#define CVMX_SLI_INT_SUM (0x0000000000000330ull)</div><div class='add'>+#define CVMX_SLI_LAST_WIN_RDATA0 (0x0000000000000600ull)</div><div class='add'>+#define CVMX_SLI_LAST_WIN_RDATA1 (0x0000000000000610ull)</div><div class='add'>+#define CVMX_SLI_LAST_WIN_RDATA2 (0x00000000000006C0ull)</div><div class='add'>+#define CVMX_SLI_LAST_WIN_RDATA3 (0x00000000000006D0ull)</div><div class='add'>+#define CVMX_SLI_MAC_CREDIT_CNT (0x0000000000003D70ull)</div><div class='add'>+#define CVMX_SLI_MAC_CREDIT_CNT2 (0x0000000000003E10ull)</div><div class='add'>+#define CVMX_SLI_MAC_NUMBER (0x0000000000003E00ull)</div><div class='add'>+#define CVMX_SLI_MEM_ACCESS_CTL (0x00000000000002F0ull)</div><div class='add'>+#define CVMX_SLI_MEM_ACCESS_SUBIDX(offset) (0x00000000000000E0ull + ((offset) &amp; 31) * 16 - 16*12)</div><div class='add'>+#define CVMX_SLI_MSI_ENB0 (0x0000000000003C50ull)</div><div class='add'>+#define CVMX_SLI_MSI_ENB1 (0x0000000000003C60ull)</div><div class='add'>+#define CVMX_SLI_MSI_ENB2 (0x0000000000003C70ull)</div><div class='add'>+#define CVMX_SLI_MSI_ENB3 (0x0000000000003C80ull)</div><div class='add'>+#define CVMX_SLI_MSI_RCV0 (0x0000000000003C10ull)</div><div class='add'>+#define CVMX_SLI_MSI_RCV1 (0x0000000000003C20ull)</div><div class='add'>+#define CVMX_SLI_MSI_RCV2 (0x0000000000003C30ull)</div><div class='add'>+#define CVMX_SLI_MSI_RCV3 (0x0000000000003C40ull)</div><div class='add'>+#define CVMX_SLI_MSI_RD_MAP (0x0000000000003CA0ull)</div><div class='add'>+#define CVMX_SLI_MSI_W1C_ENB0 (0x0000000000003CF0ull)</div><div class='add'>+#define CVMX_SLI_MSI_W1C_ENB1 (0x0000000000003D00ull)</div><div class='add'>+#define CVMX_SLI_MSI_W1C_ENB2 (0x0000000000003D10ull)</div><div class='add'>+#define CVMX_SLI_MSI_W1C_ENB3 (0x0000000000003D20ull)</div><div class='add'>+#define CVMX_SLI_MSI_W1S_ENB0 (0x0000000000003D30ull)</div><div class='add'>+#define CVMX_SLI_MSI_W1S_ENB1 (0x0000000000003D40ull)</div><div class='add'>+#define CVMX_SLI_MSI_W1S_ENB2 (0x0000000000003D50ull)</div><div class='add'>+#define CVMX_SLI_MSI_W1S_ENB3 (0x0000000000003D60ull)</div><div class='add'>+#define CVMX_SLI_MSI_WR_MAP (0x0000000000003C90ull)</div><div class='add'>+#define CVMX_SLI_PCIE_MSI_RCV (0x0000000000003CB0ull)</div><div class='add'>+#define CVMX_SLI_PCIE_MSI_RCV_B1 (0x0000000000000650ull)</div><div class='add'>+#define CVMX_SLI_PCIE_MSI_RCV_B2 (0x0000000000000660ull)</div><div class='add'>+#define CVMX_SLI_PCIE_MSI_RCV_B3 (0x0000000000000670ull)</div><div class='add'>+#define CVMX_SLI_PKTX_CNTS(offset) (0x0000000000002400ull + ((offset) &amp; 31) * 16)</div><div class='add'>+#define CVMX_SLI_PKTX_INSTR_BADDR(offset) (0x0000000000002800ull + ((offset) &amp; 31) * 16)</div><div class='add'>+#define CVMX_SLI_PKTX_INSTR_BAOFF_DBELL(offset) (0x0000000000002C00ull + ((offset) &amp; 31) * 16)</div><div class='add'>+#define CVMX_SLI_PKTX_INSTR_FIFO_RSIZE(offset) (0x0000000000003000ull + ((offset) &amp; 31) * 16)</div><div class='add'>+#define CVMX_SLI_PKTX_INSTR_HEADER(offset) (0x0000000000003400ull + ((offset) &amp; 31) * 16)</div><div class='add'>+#define CVMX_SLI_PKTX_IN_BP(offset) (0x0000000000003800ull + ((offset) &amp; 31) * 16)</div><div class='add'>+#define CVMX_SLI_PKTX_OUT_SIZE(offset) (0x0000000000000C00ull + ((offset) &amp; 31) * 16)</div><div class='add'>+#define CVMX_SLI_PKTX_SLIST_BADDR(offset) (0x0000000000001400ull + ((offset) &amp; 31) * 16)</div><div class='add'>+#define CVMX_SLI_PKTX_SLIST_BAOFF_DBELL(offset) (0x0000000000001800ull + ((offset) &amp; 31) * 16)</div><div class='add'>+#define CVMX_SLI_PKTX_SLIST_FIFO_RSIZE(offset) (0x0000000000001C00ull + ((offset) &amp; 31) * 16)</div><div class='add'>+#define CVMX_SLI_PKT_CNT_INT (0x0000000000001130ull)</div><div class='add'>+#define CVMX_SLI_PKT_CNT_INT_ENB (0x0000000000001150ull)</div><div class='add'>+#define CVMX_SLI_PKT_CTL (0x0000000000001220ull)</div><div class='add'>+#define CVMX_SLI_PKT_DATA_OUT_ES (0x00000000000010B0ull)</div><div class='add'>+#define CVMX_SLI_PKT_DATA_OUT_NS (0x00000000000010A0ull)</div><div class='add'>+#define CVMX_SLI_PKT_DATA_OUT_ROR (0x0000000000001090ull)</div><div class='add'>+#define CVMX_SLI_PKT_DPADDR (0x0000000000001080ull)</div><div class='add'>+#define CVMX_SLI_PKT_INPUT_CONTROL (0x0000000000001170ull)</div><div class='add'>+#define CVMX_SLI_PKT_INSTR_ENB (0x0000000000001000ull)</div><div class='add'>+#define CVMX_SLI_PKT_INSTR_RD_SIZE (0x00000000000011A0ull)</div><div class='add'>+#define CVMX_SLI_PKT_INSTR_SIZE (0x0000000000001020ull)</div><div class='add'>+#define CVMX_SLI_PKT_INT_LEVELS (0x0000000000001120ull)</div><div class='add'>+#define CVMX_SLI_PKT_IN_BP (0x0000000000001210ull)</div><div class='add'>+#define CVMX_SLI_PKT_IN_DONEX_CNTS(offset) (0x0000000000002000ull + ((offset) &amp; 31) * 16)</div><div class='add'>+#define CVMX_SLI_PKT_IN_INSTR_COUNTS (0x0000000000001200ull)</div><div class='add'>+#define CVMX_SLI_PKT_IN_PCIE_PORT (0x00000000000011B0ull)</div><div class='add'>+#define CVMX_SLI_PKT_IPTR (0x0000000000001070ull)</div><div class='add'>+#define CVMX_SLI_PKT_OUTPUT_WMARK (0x0000000000001180ull)</div><div class='add'>+#define CVMX_SLI_PKT_OUT_BMODE (0x00000000000010D0ull)</div><div class='add'>+#define CVMX_SLI_PKT_OUT_BP_EN (0x0000000000001240ull)</div><div class='add'>+#define CVMX_SLI_PKT_OUT_ENB (0x0000000000001010ull)</div><div class='add'>+#define CVMX_SLI_PKT_PCIE_PORT (0x00000000000010E0ull)</div><div class='add'>+#define CVMX_SLI_PKT_PORT_IN_RST (0x00000000000011F0ull)</div><div class='add'>+#define CVMX_SLI_PKT_SLIST_ES (0x0000000000001050ull)</div><div class='add'>+#define CVMX_SLI_PKT_SLIST_NS (0x0000000000001040ull)</div><div class='add'>+#define CVMX_SLI_PKT_SLIST_ROR (0x0000000000001030ull)</div><div class='add'>+#define CVMX_SLI_PKT_TIME_INT (0x0000000000001140ull)</div><div class='add'>+#define CVMX_SLI_PKT_TIME_INT_ENB (0x0000000000001160ull)</div><div class='add'>+#define CVMX_SLI_PORTX_PKIND(offset) (0x0000000000000800ull + ((offset) &amp; 31) * 16)</div><div class='add'>+#define CVMX_SLI_S2M_PORTX_CTL(offset) (0x0000000000003D80ull + ((offset) &amp; 3) * 16)</div><div class='add'>+#define CVMX_SLI_SCRATCH_1 (0x00000000000003C0ull)</div><div class='add'>+#define CVMX_SLI_SCRATCH_2 (0x00000000000003D0ull)</div><div class='add'>+#define CVMX_SLI_STATE1 (0x0000000000000620ull)</div><div class='add'>+#define CVMX_SLI_STATE2 (0x0000000000000630ull)</div><div class='add'>+#define CVMX_SLI_STATE3 (0x0000000000000640ull)</div><div class='add'>+#define CVMX_SLI_TX_PIPE (0x0000000000001230ull)</div><div class='add'>+#define CVMX_SLI_WINDOW_CTL (0x00000000000002E0ull)</div><div class='add'>+#define CVMX_SLI_WIN_RD_ADDR (0x0000000000000010ull)</div><div class='add'>+#define CVMX_SLI_WIN_RD_DATA (0x0000000000000040ull)</div><div class='add'>+#define CVMX_SLI_WIN_WR_ADDR (0x0000000000000000ull)</div><div class='add'>+#define CVMX_SLI_WIN_WR_DATA (0x0000000000000020ull)</div><div class='add'>+#define CVMX_SLI_WIN_WR_MASK (0x0000000000000030ull)</div><div class='add'>+</div><div class='add'>+union cvmx_sli_bist_status {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_bist_status_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t ncb_req:1;</div><div class='add'>+		uint64_t n2p0_c:1;</div><div class='add'>+		uint64_t n2p0_o:1;</div><div class='add'>+		uint64_t n2p1_c:1;</div><div class='add'>+		uint64_t n2p1_o:1;</div><div class='add'>+		uint64_t cpl_p0:1;</div><div class='add'>+		uint64_t cpl_p1:1;</div><div class='add'>+		uint64_t reserved_19_24:6;</div><div class='add'>+		uint64_t p2n0_c0:1;</div><div class='add'>+		uint64_t p2n0_c1:1;</div><div class='add'>+		uint64_t p2n0_n:1;</div><div class='add'>+		uint64_t p2n0_p0:1;</div><div class='add'>+		uint64_t p2n0_p1:1;</div><div class='add'>+		uint64_t p2n1_c0:1;</div><div class='add'>+		uint64_t p2n1_c1:1;</div><div class='add'>+		uint64_t p2n1_n:1;</div><div class='add'>+		uint64_t p2n1_p0:1;</div><div class='add'>+		uint64_t p2n1_p1:1;</div><div class='add'>+		uint64_t reserved_6_8:3;</div><div class='add'>+		uint64_t dsi1_1:1;</div><div class='add'>+		uint64_t dsi1_0:1;</div><div class='add'>+		uint64_t dsi0_1:1;</div><div class='add'>+		uint64_t dsi0_0:1;</div><div class='add'>+		uint64_t msi:1;</div><div class='add'>+		uint64_t ncb_cmd:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_bist_status_cn61xx {</div><div class='add'>+		uint64_t reserved_31_63:33;</div><div class='add'>+		uint64_t n2p0_c:1;</div><div class='add'>+		uint64_t n2p0_o:1;</div><div class='add'>+		uint64_t reserved_27_28:2;</div><div class='add'>+		uint64_t cpl_p0:1;</div><div class='add'>+		uint64_t cpl_p1:1;</div><div class='add'>+		uint64_t reserved_19_24:6;</div><div class='add'>+		uint64_t p2n0_c0:1;</div><div class='add'>+		uint64_t p2n0_c1:1;</div><div class='add'>+		uint64_t p2n0_n:1;</div><div class='add'>+		uint64_t p2n0_p0:1;</div><div class='add'>+		uint64_t p2n0_p1:1;</div><div class='add'>+		uint64_t p2n1_c0:1;</div><div class='add'>+		uint64_t p2n1_c1:1;</div><div class='add'>+		uint64_t p2n1_n:1;</div><div class='add'>+		uint64_t p2n1_p0:1;</div><div class='add'>+		uint64_t p2n1_p1:1;</div><div class='add'>+		uint64_t reserved_6_8:3;</div><div class='add'>+		uint64_t dsi1_1:1;</div><div class='add'>+		uint64_t dsi1_0:1;</div><div class='add'>+		uint64_t dsi0_1:1;</div><div class='add'>+		uint64_t dsi0_0:1;</div><div class='add'>+		uint64_t msi:1;</div><div class='add'>+		uint64_t ncb_cmd:1;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_sli_bist_status_cn63xx {</div><div class='add'>+		uint64_t reserved_31_63:33;</div><div class='add'>+		uint64_t n2p0_c:1;</div><div class='add'>+		uint64_t n2p0_o:1;</div><div class='add'>+		uint64_t n2p1_c:1;</div><div class='add'>+		uint64_t n2p1_o:1;</div><div class='add'>+		uint64_t cpl_p0:1;</div><div class='add'>+		uint64_t cpl_p1:1;</div><div class='add'>+		uint64_t reserved_19_24:6;</div><div class='add'>+		uint64_t p2n0_c0:1;</div><div class='add'>+		uint64_t p2n0_c1:1;</div><div class='add'>+		uint64_t p2n0_n:1;</div><div class='add'>+		uint64_t p2n0_p0:1;</div><div class='add'>+		uint64_t p2n0_p1:1;</div><div class='add'>+		uint64_t p2n1_c0:1;</div><div class='add'>+		uint64_t p2n1_c1:1;</div><div class='add'>+		uint64_t p2n1_n:1;</div><div class='add'>+		uint64_t p2n1_p0:1;</div><div class='add'>+		uint64_t p2n1_p1:1;</div><div class='add'>+		uint64_t reserved_6_8:3;</div><div class='add'>+		uint64_t dsi1_1:1;</div><div class='add'>+		uint64_t dsi1_0:1;</div><div class='add'>+		uint64_t dsi0_1:1;</div><div class='add'>+		uint64_t dsi0_0:1;</div><div class='add'>+		uint64_t msi:1;</div><div class='add'>+		uint64_t ncb_cmd:1;</div><div class='add'>+	} cn63xx;</div><div class='add'>+	struct cvmx_sli_bist_status_cn63xx cn63xxp1;</div><div class='add'>+	struct cvmx_sli_bist_status_cn61xx cn66xx;</div><div class='add'>+	struct cvmx_sli_bist_status_s cn68xx;</div><div class='add'>+	struct cvmx_sli_bist_status_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_ctl_portx {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_ctl_portx_s {</div><div class='add'>+		uint64_t reserved_22_63:42;</div><div class='add'>+		uint64_t intd:1;</div><div class='add'>+		uint64_t intc:1;</div><div class='add'>+		uint64_t intb:1;</div><div class='add'>+		uint64_t inta:1;</div><div class='add'>+		uint64_t dis_port:1;</div><div class='add'>+		uint64_t waitl_com:1;</div><div class='add'>+		uint64_t intd_map:2;</div><div class='add'>+		uint64_t intc_map:2;</div><div class='add'>+		uint64_t intb_map:2;</div><div class='add'>+		uint64_t inta_map:2;</div><div class='add'>+		uint64_t ctlp_ro:1;</div><div class='add'>+		uint64_t reserved_6_6:1;</div><div class='add'>+		uint64_t ptlp_ro:1;</div><div class='add'>+		uint64_t reserved_1_4:4;</div><div class='add'>+		uint64_t wait_com:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_ctl_portx_s cn61xx;</div><div class='add'>+	struct cvmx_sli_ctl_portx_s cn63xx;</div><div class='add'>+	struct cvmx_sli_ctl_portx_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_ctl_portx_s cn66xx;</div><div class='add'>+	struct cvmx_sli_ctl_portx_s cn68xx;</div><div class='add'>+	struct cvmx_sli_ctl_portx_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_ctl_status {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_ctl_status_s {</div><div class='add'>+		uint64_t reserved_20_63:44;</div><div class='add'>+		uint64_t p1_ntags:6;</div><div class='add'>+		uint64_t p0_ntags:6;</div><div class='add'>+		uint64_t chip_rev:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_ctl_status_cn61xx {</div><div class='add'>+		uint64_t reserved_14_63:50;</div><div class='add'>+		uint64_t p0_ntags:6;</div><div class='add'>+		uint64_t chip_rev:8;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_sli_ctl_status_s cn63xx;</div><div class='add'>+	struct cvmx_sli_ctl_status_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_ctl_status_cn61xx cn66xx;</div><div class='add'>+	struct cvmx_sli_ctl_status_s cn68xx;</div><div class='add'>+	struct cvmx_sli_ctl_status_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_data_out_cnt {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_data_out_cnt_s {</div><div class='add'>+		uint64_t reserved_44_63:20;</div><div class='add'>+		uint64_t p1_ucnt:16;</div><div class='add'>+		uint64_t p1_fcnt:6;</div><div class='add'>+		uint64_t p0_ucnt:16;</div><div class='add'>+		uint64_t p0_fcnt:6;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_data_out_cnt_s cn61xx;</div><div class='add'>+	struct cvmx_sli_data_out_cnt_s cn63xx;</div><div class='add'>+	struct cvmx_sli_data_out_cnt_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_data_out_cnt_s cn66xx;</div><div class='add'>+	struct cvmx_sli_data_out_cnt_s cn68xx;</div><div class='add'>+	struct cvmx_sli_data_out_cnt_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_dbg_data {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_dbg_data_s {</div><div class='add'>+		uint64_t reserved_18_63:46;</div><div class='add'>+		uint64_t dsel_ext:1;</div><div class='add'>+		uint64_t data:17;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_dbg_data_s cn61xx;</div><div class='add'>+	struct cvmx_sli_dbg_data_s cn63xx;</div><div class='add'>+	struct cvmx_sli_dbg_data_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_dbg_data_s cn66xx;</div><div class='add'>+	struct cvmx_sli_dbg_data_s cn68xx;</div><div class='add'>+	struct cvmx_sli_dbg_data_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_dbg_select {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_dbg_select_s {</div><div class='add'>+		uint64_t reserved_33_63:31;</div><div class='add'>+		uint64_t adbg_sel:1;</div><div class='add'>+		uint64_t dbg_sel:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_dbg_select_s cn61xx;</div><div class='add'>+	struct cvmx_sli_dbg_select_s cn63xx;</div><div class='add'>+	struct cvmx_sli_dbg_select_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_dbg_select_s cn66xx;</div><div class='add'>+	struct cvmx_sli_dbg_select_s cn68xx;</div><div class='add'>+	struct cvmx_sli_dbg_select_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_dmax_cnt {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_dmax_cnt_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t cnt:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_dmax_cnt_s cn61xx;</div><div class='add'>+	struct cvmx_sli_dmax_cnt_s cn63xx;</div><div class='add'>+	struct cvmx_sli_dmax_cnt_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_dmax_cnt_s cn66xx;</div><div class='add'>+	struct cvmx_sli_dmax_cnt_s cn68xx;</div><div class='add'>+	struct cvmx_sli_dmax_cnt_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_dmax_int_level {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_dmax_int_level_s {</div><div class='add'>+		uint64_t time:32;</div><div class='add'>+		uint64_t cnt:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_dmax_int_level_s cn61xx;</div><div class='add'>+	struct cvmx_sli_dmax_int_level_s cn63xx;</div><div class='add'>+	struct cvmx_sli_dmax_int_level_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_dmax_int_level_s cn66xx;</div><div class='add'>+	struct cvmx_sli_dmax_int_level_s cn68xx;</div><div class='add'>+	struct cvmx_sli_dmax_int_level_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_dmax_tim {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_dmax_tim_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t tim:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_dmax_tim_s cn61xx;</div><div class='add'>+	struct cvmx_sli_dmax_tim_s cn63xx;</div><div class='add'>+	struct cvmx_sli_dmax_tim_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_dmax_tim_s cn66xx;</div><div class='add'>+	struct cvmx_sli_dmax_tim_s cn68xx;</div><div class='add'>+	struct cvmx_sli_dmax_tim_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_int_enb_ciu {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_int_enb_ciu_s {</div><div class='add'>+		uint64_t reserved_62_63:2;</div><div class='add'>+		uint64_t pipe_err:1;</div><div class='add'>+		uint64_t ill_pad:1;</div><div class='add'>+		uint64_t sprt3_err:1;</div><div class='add'>+		uint64_t sprt2_err:1;</div><div class='add'>+		uint64_t sprt1_err:1;</div><div class='add'>+		uint64_t sprt0_err:1;</div><div class='add'>+		uint64_t pins_err:1;</div><div class='add'>+		uint64_t pop_err:1;</div><div class='add'>+		uint64_t pdi_err:1;</div><div class='add'>+		uint64_t pgl_err:1;</div><div class='add'>+		uint64_t pin_bp:1;</div><div class='add'>+		uint64_t pout_err:1;</div><div class='add'>+		uint64_t psldbof:1;</div><div class='add'>+		uint64_t pidbof:1;</div><div class='add'>+		uint64_t reserved_38_47:10;</div><div class='add'>+		uint64_t dtime:2;</div><div class='add'>+		uint64_t dcnt:2;</div><div class='add'>+		uint64_t dmafi:2;</div><div class='add'>+		uint64_t reserved_28_31:4;</div><div class='add'>+		uint64_t m3_un_wi:1;</div><div class='add'>+		uint64_t m3_un_b0:1;</div><div class='add'>+		uint64_t m3_up_wi:1;</div><div class='add'>+		uint64_t m3_up_b0:1;</div><div class='add'>+		uint64_t m2_un_wi:1;</div><div class='add'>+		uint64_t m2_un_b0:1;</div><div class='add'>+		uint64_t m2_up_wi:1;</div><div class='add'>+		uint64_t m2_up_b0:1;</div><div class='add'>+		uint64_t reserved_18_19:2;</div><div class='add'>+		uint64_t mio_int1:1;</div><div class='add'>+		uint64_t mio_int0:1;</div><div class='add'>+		uint64_t m1_un_wi:1;</div><div class='add'>+		uint64_t m1_un_b0:1;</div><div class='add'>+		uint64_t m1_up_wi:1;</div><div class='add'>+		uint64_t m1_up_b0:1;</div><div class='add'>+		uint64_t m0_un_wi:1;</div><div class='add'>+		uint64_t m0_un_b0:1;</div><div class='add'>+		uint64_t m0_up_wi:1;</div><div class='add'>+		uint64_t m0_up_b0:1;</div><div class='add'>+		uint64_t reserved_6_7:2;</div><div class='add'>+		uint64_t ptime:1;</div><div class='add'>+		uint64_t pcnt:1;</div><div class='add'>+		uint64_t iob2big:1;</div><div class='add'>+		uint64_t bar0_to:1;</div><div class='add'>+		uint64_t reserved_1_1:1;</div><div class='add'>+		uint64_t rml_to:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_int_enb_ciu_cn61xx {</div><div class='add'>+		uint64_t reserved_61_63:3;</div><div class='add'>+		uint64_t ill_pad:1;</div><div class='add'>+		uint64_t sprt3_err:1;</div><div class='add'>+		uint64_t sprt2_err:1;</div><div class='add'>+		uint64_t sprt1_err:1;</div><div class='add'>+		uint64_t sprt0_err:1;</div><div class='add'>+		uint64_t pins_err:1;</div><div class='add'>+		uint64_t pop_err:1;</div><div class='add'>+		uint64_t pdi_err:1;</div><div class='add'>+		uint64_t pgl_err:1;</div><div class='add'>+		uint64_t pin_bp:1;</div><div class='add'>+		uint64_t pout_err:1;</div><div class='add'>+		uint64_t psldbof:1;</div><div class='add'>+		uint64_t pidbof:1;</div><div class='add'>+		uint64_t reserved_38_47:10;</div><div class='add'>+		uint64_t dtime:2;</div><div class='add'>+		uint64_t dcnt:2;</div><div class='add'>+		uint64_t dmafi:2;</div><div class='add'>+		uint64_t reserved_28_31:4;</div><div class='add'>+		uint64_t m3_un_wi:1;</div><div class='add'>+		uint64_t m3_un_b0:1;</div><div class='add'>+		uint64_t m3_up_wi:1;</div><div class='add'>+		uint64_t m3_up_b0:1;</div><div class='add'>+		uint64_t m2_un_wi:1;</div><div class='add'>+		uint64_t m2_un_b0:1;</div><div class='add'>+		uint64_t m2_up_wi:1;</div><div class='add'>+		uint64_t m2_up_b0:1;</div><div class='add'>+		uint64_t reserved_18_19:2;</div><div class='add'>+		uint64_t mio_int1:1;</div><div class='add'>+		uint64_t mio_int0:1;</div><div class='add'>+		uint64_t m1_un_wi:1;</div><div class='add'>+		uint64_t m1_un_b0:1;</div><div class='add'>+		uint64_t m1_up_wi:1;</div><div class='add'>+		uint64_t m1_up_b0:1;</div><div class='add'>+		uint64_t m0_un_wi:1;</div><div class='add'>+		uint64_t m0_un_b0:1;</div><div class='add'>+		uint64_t m0_up_wi:1;</div><div class='add'>+		uint64_t m0_up_b0:1;</div><div class='add'>+		uint64_t reserved_6_7:2;</div><div class='add'>+		uint64_t ptime:1;</div><div class='add'>+		uint64_t pcnt:1;</div><div class='add'>+		uint64_t iob2big:1;</div><div class='add'>+		uint64_t bar0_to:1;</div><div class='add'>+		uint64_t reserved_1_1:1;</div><div class='add'>+		uint64_t rml_to:1;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_sli_int_enb_ciu_cn63xx {</div><div class='add'>+		uint64_t reserved_61_63:3;</div><div class='add'>+		uint64_t ill_pad:1;</div><div class='add'>+		uint64_t reserved_58_59:2;</div><div class='add'>+		uint64_t sprt1_err:1;</div><div class='add'>+		uint64_t sprt0_err:1;</div><div class='add'>+		uint64_t pins_err:1;</div><div class='add'>+		uint64_t pop_err:1;</div><div class='add'>+		uint64_t pdi_err:1;</div><div class='add'>+		uint64_t pgl_err:1;</div><div class='add'>+		uint64_t pin_bp:1;</div><div class='add'>+		uint64_t pout_err:1;</div><div class='add'>+		uint64_t psldbof:1;</div><div class='add'>+		uint64_t pidbof:1;</div><div class='add'>+		uint64_t reserved_38_47:10;</div><div class='add'>+		uint64_t dtime:2;</div><div class='add'>+		uint64_t dcnt:2;</div><div class='add'>+		uint64_t dmafi:2;</div><div class='add'>+		uint64_t reserved_18_31:14;</div><div class='add'>+		uint64_t mio_int1:1;</div><div class='add'>+		uint64_t mio_int0:1;</div><div class='add'>+		uint64_t m1_un_wi:1;</div><div class='add'>+		uint64_t m1_un_b0:1;</div><div class='add'>+		uint64_t m1_up_wi:1;</div><div class='add'>+		uint64_t m1_up_b0:1;</div><div class='add'>+		uint64_t m0_un_wi:1;</div><div class='add'>+		uint64_t m0_un_b0:1;</div><div class='add'>+		uint64_t m0_up_wi:1;</div><div class='add'>+		uint64_t m0_up_b0:1;</div><div class='add'>+		uint64_t reserved_6_7:2;</div><div class='add'>+		uint64_t ptime:1;</div><div class='add'>+		uint64_t pcnt:1;</div><div class='add'>+		uint64_t iob2big:1;</div><div class='add'>+		uint64_t bar0_to:1;</div><div class='add'>+		uint64_t reserved_1_1:1;</div><div class='add'>+		uint64_t rml_to:1;</div><div class='add'>+	} cn63xx;</div><div class='add'>+	struct cvmx_sli_int_enb_ciu_cn63xx cn63xxp1;</div><div class='add'>+	struct cvmx_sli_int_enb_ciu_cn61xx cn66xx;</div><div class='add'>+	struct cvmx_sli_int_enb_ciu_cn68xx {</div><div class='add'>+		uint64_t reserved_62_63:2;</div><div class='add'>+		uint64_t pipe_err:1;</div><div class='add'>+		uint64_t ill_pad:1;</div><div class='add'>+		uint64_t reserved_58_59:2;</div><div class='add'>+		uint64_t sprt1_err:1;</div><div class='add'>+		uint64_t sprt0_err:1;</div><div class='add'>+		uint64_t pins_err:1;</div><div class='add'>+		uint64_t pop_err:1;</div><div class='add'>+		uint64_t pdi_err:1;</div><div class='add'>+		uint64_t pgl_err:1;</div><div class='add'>+		uint64_t reserved_51_51:1;</div><div class='add'>+		uint64_t pout_err:1;</div><div class='add'>+		uint64_t psldbof:1;</div><div class='add'>+		uint64_t pidbof:1;</div><div class='add'>+		uint64_t reserved_38_47:10;</div><div class='add'>+		uint64_t dtime:2;</div><div class='add'>+		uint64_t dcnt:2;</div><div class='add'>+		uint64_t dmafi:2;</div><div class='add'>+		uint64_t reserved_18_31:14;</div><div class='add'>+		uint64_t mio_int1:1;</div><div class='add'>+		uint64_t mio_int0:1;</div><div class='add'>+		uint64_t m1_un_wi:1;</div><div class='add'>+		uint64_t m1_un_b0:1;</div><div class='add'>+		uint64_t m1_up_wi:1;</div><div class='add'>+		uint64_t m1_up_b0:1;</div><div class='add'>+		uint64_t m0_un_wi:1;</div><div class='add'>+		uint64_t m0_un_b0:1;</div><div class='add'>+		uint64_t m0_up_wi:1;</div><div class='add'>+		uint64_t m0_up_b0:1;</div><div class='add'>+		uint64_t reserved_6_7:2;</div><div class='add'>+		uint64_t ptime:1;</div><div class='add'>+		uint64_t pcnt:1;</div><div class='add'>+		uint64_t iob2big:1;</div><div class='add'>+		uint64_t bar0_to:1;</div><div class='add'>+		uint64_t reserved_1_1:1;</div><div class='add'>+		uint64_t rml_to:1;</div><div class='add'>+	} cn68xx;</div><div class='add'>+	struct cvmx_sli_int_enb_ciu_cn68xx cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_int_enb_portx {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_int_enb_portx_s {</div><div class='add'>+		uint64_t reserved_62_63:2;</div><div class='add'>+		uint64_t pipe_err:1;</div><div class='add'>+		uint64_t ill_pad:1;</div><div class='add'>+		uint64_t sprt3_err:1;</div><div class='add'>+		uint64_t sprt2_err:1;</div><div class='add'>+		uint64_t sprt1_err:1;</div><div class='add'>+		uint64_t sprt0_err:1;</div><div class='add'>+		uint64_t pins_err:1;</div><div class='add'>+		uint64_t pop_err:1;</div><div class='add'>+		uint64_t pdi_err:1;</div><div class='add'>+		uint64_t pgl_err:1;</div><div class='add'>+		uint64_t pin_bp:1;</div><div class='add'>+		uint64_t pout_err:1;</div><div class='add'>+		uint64_t psldbof:1;</div><div class='add'>+		uint64_t pidbof:1;</div><div class='add'>+		uint64_t reserved_38_47:10;</div><div class='add'>+		uint64_t dtime:2;</div><div class='add'>+		uint64_t dcnt:2;</div><div class='add'>+		uint64_t dmafi:2;</div><div class='add'>+		uint64_t reserved_28_31:4;</div><div class='add'>+		uint64_t m3_un_wi:1;</div><div class='add'>+		uint64_t m3_un_b0:1;</div><div class='add'>+		uint64_t m3_up_wi:1;</div><div class='add'>+		uint64_t m3_up_b0:1;</div><div class='add'>+		uint64_t m2_un_wi:1;</div><div class='add'>+		uint64_t m2_un_b0:1;</div><div class='add'>+		uint64_t m2_up_wi:1;</div><div class='add'>+		uint64_t m2_up_b0:1;</div><div class='add'>+		uint64_t mac1_int:1;</div><div class='add'>+		uint64_t mac0_int:1;</div><div class='add'>+		uint64_t mio_int1:1;</div><div class='add'>+		uint64_t mio_int0:1;</div><div class='add'>+		uint64_t m1_un_wi:1;</div><div class='add'>+		uint64_t m1_un_b0:1;</div><div class='add'>+		uint64_t m1_up_wi:1;</div><div class='add'>+		uint64_t m1_up_b0:1;</div><div class='add'>+		uint64_t m0_un_wi:1;</div><div class='add'>+		uint64_t m0_un_b0:1;</div><div class='add'>+		uint64_t m0_up_wi:1;</div><div class='add'>+		uint64_t m0_up_b0:1;</div><div class='add'>+		uint64_t reserved_6_7:2;</div><div class='add'>+		uint64_t ptime:1;</div><div class='add'>+		uint64_t pcnt:1;</div><div class='add'>+		uint64_t iob2big:1;</div><div class='add'>+		uint64_t bar0_to:1;</div><div class='add'>+		uint64_t reserved_1_1:1;</div><div class='add'>+		uint64_t rml_to:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_int_enb_portx_cn61xx {</div><div class='add'>+		uint64_t reserved_61_63:3;</div><div class='add'>+		uint64_t ill_pad:1;</div><div class='add'>+		uint64_t sprt3_err:1;</div><div class='add'>+		uint64_t sprt2_err:1;</div><div class='add'>+		uint64_t sprt1_err:1;</div><div class='add'>+		uint64_t sprt0_err:1;</div><div class='add'>+		uint64_t pins_err:1;</div><div class='add'>+		uint64_t pop_err:1;</div><div class='add'>+		uint64_t pdi_err:1;</div><div class='add'>+		uint64_t pgl_err:1;</div><div class='add'>+		uint64_t pin_bp:1;</div><div class='add'>+		uint64_t pout_err:1;</div><div class='add'>+		uint64_t psldbof:1;</div><div class='add'>+		uint64_t pidbof:1;</div><div class='add'>+		uint64_t reserved_38_47:10;</div><div class='add'>+		uint64_t dtime:2;</div><div class='add'>+		uint64_t dcnt:2;</div><div class='add'>+		uint64_t dmafi:2;</div><div class='add'>+		uint64_t reserved_28_31:4;</div><div class='add'>+		uint64_t m3_un_wi:1;</div><div class='add'>+		uint64_t m3_un_b0:1;</div><div class='add'>+		uint64_t m3_up_wi:1;</div><div class='add'>+		uint64_t m3_up_b0:1;</div><div class='add'>+		uint64_t m2_un_wi:1;</div><div class='add'>+		uint64_t m2_un_b0:1;</div><div class='add'>+		uint64_t m2_up_wi:1;</div><div class='add'>+		uint64_t m2_up_b0:1;</div><div class='add'>+		uint64_t mac1_int:1;</div><div class='add'>+		uint64_t mac0_int:1;</div><div class='add'>+		uint64_t mio_int1:1;</div><div class='add'>+		uint64_t mio_int0:1;</div><div class='add'>+		uint64_t m1_un_wi:1;</div><div class='add'>+		uint64_t m1_un_b0:1;</div><div class='add'>+		uint64_t m1_up_wi:1;</div><div class='add'>+		uint64_t m1_up_b0:1;</div><div class='add'>+		uint64_t m0_un_wi:1;</div><div class='add'>+		uint64_t m0_un_b0:1;</div><div class='add'>+		uint64_t m0_up_wi:1;</div><div class='add'>+		uint64_t m0_up_b0:1;</div><div class='add'>+		uint64_t reserved_6_7:2;</div><div class='add'>+		uint64_t ptime:1;</div><div class='add'>+		uint64_t pcnt:1;</div><div class='add'>+		uint64_t iob2big:1;</div><div class='add'>+		uint64_t bar0_to:1;</div><div class='add'>+		uint64_t reserved_1_1:1;</div><div class='add'>+		uint64_t rml_to:1;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_sli_int_enb_portx_cn63xx {</div><div class='add'>+		uint64_t reserved_61_63:3;</div><div class='add'>+		uint64_t ill_pad:1;</div><div class='add'>+		uint64_t reserved_58_59:2;</div><div class='add'>+		uint64_t sprt1_err:1;</div><div class='add'>+		uint64_t sprt0_err:1;</div><div class='add'>+		uint64_t pins_err:1;</div><div class='add'>+		uint64_t pop_err:1;</div><div class='add'>+		uint64_t pdi_err:1;</div><div class='add'>+		uint64_t pgl_err:1;</div><div class='add'>+		uint64_t pin_bp:1;</div><div class='add'>+		uint64_t pout_err:1;</div><div class='add'>+		uint64_t psldbof:1;</div><div class='add'>+		uint64_t pidbof:1;</div><div class='add'>+		uint64_t reserved_38_47:10;</div><div class='add'>+		uint64_t dtime:2;</div><div class='add'>+		uint64_t dcnt:2;</div><div class='add'>+		uint64_t dmafi:2;</div><div class='add'>+		uint64_t reserved_20_31:12;</div><div class='add'>+		uint64_t mac1_int:1;</div><div class='add'>+		uint64_t mac0_int:1;</div><div class='add'>+		uint64_t mio_int1:1;</div><div class='add'>+		uint64_t mio_int0:1;</div><div class='add'>+		uint64_t m1_un_wi:1;</div><div class='add'>+		uint64_t m1_un_b0:1;</div><div class='add'>+		uint64_t m1_up_wi:1;</div><div class='add'>+		uint64_t m1_up_b0:1;</div><div class='add'>+		uint64_t m0_un_wi:1;</div><div class='add'>+		uint64_t m0_un_b0:1;</div><div class='add'>+		uint64_t m0_up_wi:1;</div><div class='add'>+		uint64_t m0_up_b0:1;</div><div class='add'>+		uint64_t reserved_6_7:2;</div><div class='add'>+		uint64_t ptime:1;</div><div class='add'>+		uint64_t pcnt:1;</div><div class='add'>+		uint64_t iob2big:1;</div><div class='add'>+		uint64_t bar0_to:1;</div><div class='add'>+		uint64_t reserved_1_1:1;</div><div class='add'>+		uint64_t rml_to:1;</div><div class='add'>+	} cn63xx;</div><div class='add'>+	struct cvmx_sli_int_enb_portx_cn63xx cn63xxp1;</div><div class='add'>+	struct cvmx_sli_int_enb_portx_cn61xx cn66xx;</div><div class='add'>+	struct cvmx_sli_int_enb_portx_cn68xx {</div><div class='add'>+		uint64_t reserved_62_63:2;</div><div class='add'>+		uint64_t pipe_err:1;</div><div class='add'>+		uint64_t ill_pad:1;</div><div class='add'>+		uint64_t reserved_58_59:2;</div><div class='add'>+		uint64_t sprt1_err:1;</div><div class='add'>+		uint64_t sprt0_err:1;</div><div class='add'>+		uint64_t pins_err:1;</div><div class='add'>+		uint64_t pop_err:1;</div><div class='add'>+		uint64_t pdi_err:1;</div><div class='add'>+		uint64_t pgl_err:1;</div><div class='add'>+		uint64_t reserved_51_51:1;</div><div class='add'>+		uint64_t pout_err:1;</div><div class='add'>+		uint64_t psldbof:1;</div><div class='add'>+		uint64_t pidbof:1;</div><div class='add'>+		uint64_t reserved_38_47:10;</div><div class='add'>+		uint64_t dtime:2;</div><div class='add'>+		uint64_t dcnt:2;</div><div class='add'>+		uint64_t dmafi:2;</div><div class='add'>+		uint64_t reserved_20_31:12;</div><div class='add'>+		uint64_t mac1_int:1;</div><div class='add'>+		uint64_t mac0_int:1;</div><div class='add'>+		uint64_t mio_int1:1;</div><div class='add'>+		uint64_t mio_int0:1;</div><div class='add'>+		uint64_t m1_un_wi:1;</div><div class='add'>+		uint64_t m1_un_b0:1;</div><div class='add'>+		uint64_t m1_up_wi:1;</div><div class='add'>+		uint64_t m1_up_b0:1;</div><div class='add'>+		uint64_t m0_un_wi:1;</div><div class='add'>+		uint64_t m0_un_b0:1;</div><div class='add'>+		uint64_t m0_up_wi:1;</div><div class='add'>+		uint64_t m0_up_b0:1;</div><div class='add'>+		uint64_t reserved_6_7:2;</div><div class='add'>+		uint64_t ptime:1;</div><div class='add'>+		uint64_t pcnt:1;</div><div class='add'>+		uint64_t iob2big:1;</div><div class='add'>+		uint64_t bar0_to:1;</div><div class='add'>+		uint64_t reserved_1_1:1;</div><div class='add'>+		uint64_t rml_to:1;</div><div class='add'>+	} cn68xx;</div><div class='add'>+	struct cvmx_sli_int_enb_portx_cn68xx cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_int_sum {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_int_sum_s {</div><div class='add'>+		uint64_t reserved_62_63:2;</div><div class='add'>+		uint64_t pipe_err:1;</div><div class='add'>+		uint64_t ill_pad:1;</div><div class='add'>+		uint64_t sprt3_err:1;</div><div class='add'>+		uint64_t sprt2_err:1;</div><div class='add'>+		uint64_t sprt1_err:1;</div><div class='add'>+		uint64_t sprt0_err:1;</div><div class='add'>+		uint64_t pins_err:1;</div><div class='add'>+		uint64_t pop_err:1;</div><div class='add'>+		uint64_t pdi_err:1;</div><div class='add'>+		uint64_t pgl_err:1;</div><div class='add'>+		uint64_t pin_bp:1;</div><div class='add'>+		uint64_t pout_err:1;</div><div class='add'>+		uint64_t psldbof:1;</div><div class='add'>+		uint64_t pidbof:1;</div><div class='add'>+		uint64_t reserved_38_47:10;</div><div class='add'>+		uint64_t dtime:2;</div><div class='add'>+		uint64_t dcnt:2;</div><div class='add'>+		uint64_t dmafi:2;</div><div class='add'>+		uint64_t reserved_28_31:4;</div><div class='add'>+		uint64_t m3_un_wi:1;</div><div class='add'>+		uint64_t m3_un_b0:1;</div><div class='add'>+		uint64_t m3_up_wi:1;</div><div class='add'>+		uint64_t m3_up_b0:1;</div><div class='add'>+		uint64_t m2_un_wi:1;</div><div class='add'>+		uint64_t m2_un_b0:1;</div><div class='add'>+		uint64_t m2_up_wi:1;</div><div class='add'>+		uint64_t m2_up_b0:1;</div><div class='add'>+		uint64_t mac1_int:1;</div><div class='add'>+		uint64_t mac0_int:1;</div><div class='add'>+		uint64_t mio_int1:1;</div><div class='add'>+		uint64_t mio_int0:1;</div><div class='add'>+		uint64_t m1_un_wi:1;</div><div class='add'>+		uint64_t m1_un_b0:1;</div><div class='add'>+		uint64_t m1_up_wi:1;</div><div class='add'>+		uint64_t m1_up_b0:1;</div><div class='add'>+		uint64_t m0_un_wi:1;</div><div class='add'>+		uint64_t m0_un_b0:1;</div><div class='add'>+		uint64_t m0_up_wi:1;</div><div class='add'>+		uint64_t m0_up_b0:1;</div><div class='add'>+		uint64_t reserved_6_7:2;</div><div class='add'>+		uint64_t ptime:1;</div><div class='add'>+		uint64_t pcnt:1;</div><div class='add'>+		uint64_t iob2big:1;</div><div class='add'>+		uint64_t bar0_to:1;</div><div class='add'>+		uint64_t reserved_1_1:1;</div><div class='add'>+		uint64_t rml_to:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_int_sum_cn61xx {</div><div class='add'>+		uint64_t reserved_61_63:3;</div><div class='add'>+		uint64_t ill_pad:1;</div><div class='add'>+		uint64_t sprt3_err:1;</div><div class='add'>+		uint64_t sprt2_err:1;</div><div class='add'>+		uint64_t sprt1_err:1;</div><div class='add'>+		uint64_t sprt0_err:1;</div><div class='add'>+		uint64_t pins_err:1;</div><div class='add'>+		uint64_t pop_err:1;</div><div class='add'>+		uint64_t pdi_err:1;</div><div class='add'>+		uint64_t pgl_err:1;</div><div class='add'>+		uint64_t pin_bp:1;</div><div class='add'>+		uint64_t pout_err:1;</div><div class='add'>+		uint64_t psldbof:1;</div><div class='add'>+		uint64_t pidbof:1;</div><div class='add'>+		uint64_t reserved_38_47:10;</div><div class='add'>+		uint64_t dtime:2;</div><div class='add'>+		uint64_t dcnt:2;</div><div class='add'>+		uint64_t dmafi:2;</div><div class='add'>+		uint64_t reserved_28_31:4;</div><div class='add'>+		uint64_t m3_un_wi:1;</div><div class='add'>+		uint64_t m3_un_b0:1;</div><div class='add'>+		uint64_t m3_up_wi:1;</div><div class='add'>+		uint64_t m3_up_b0:1;</div><div class='add'>+		uint64_t m2_un_wi:1;</div><div class='add'>+		uint64_t m2_un_b0:1;</div><div class='add'>+		uint64_t m2_up_wi:1;</div><div class='add'>+		uint64_t m2_up_b0:1;</div><div class='add'>+		uint64_t mac1_int:1;</div><div class='add'>+		uint64_t mac0_int:1;</div><div class='add'>+		uint64_t mio_int1:1;</div><div class='add'>+		uint64_t mio_int0:1;</div><div class='add'>+		uint64_t m1_un_wi:1;</div><div class='add'>+		uint64_t m1_un_b0:1;</div><div class='add'>+		uint64_t m1_up_wi:1;</div><div class='add'>+		uint64_t m1_up_b0:1;</div><div class='add'>+		uint64_t m0_un_wi:1;</div><div class='add'>+		uint64_t m0_un_b0:1;</div><div class='add'>+		uint64_t m0_up_wi:1;</div><div class='add'>+		uint64_t m0_up_b0:1;</div><div class='add'>+		uint64_t reserved_6_7:2;</div><div class='add'>+		uint64_t ptime:1;</div><div class='add'>+		uint64_t pcnt:1;</div><div class='add'>+		uint64_t iob2big:1;</div><div class='add'>+		uint64_t bar0_to:1;</div><div class='add'>+		uint64_t reserved_1_1:1;</div><div class='add'>+		uint64_t rml_to:1;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_sli_int_sum_cn63xx {</div><div class='add'>+		uint64_t reserved_61_63:3;</div><div class='add'>+		uint64_t ill_pad:1;</div><div class='add'>+		uint64_t reserved_58_59:2;</div><div class='add'>+		uint64_t sprt1_err:1;</div><div class='add'>+		uint64_t sprt0_err:1;</div><div class='add'>+		uint64_t pins_err:1;</div><div class='add'>+		uint64_t pop_err:1;</div><div class='add'>+		uint64_t pdi_err:1;</div><div class='add'>+		uint64_t pgl_err:1;</div><div class='add'>+		uint64_t pin_bp:1;</div><div class='add'>+		uint64_t pout_err:1;</div><div class='add'>+		uint64_t psldbof:1;</div><div class='add'>+		uint64_t pidbof:1;</div><div class='add'>+		uint64_t reserved_38_47:10;</div><div class='add'>+		uint64_t dtime:2;</div><div class='add'>+		uint64_t dcnt:2;</div><div class='add'>+		uint64_t dmafi:2;</div><div class='add'>+		uint64_t reserved_20_31:12;</div><div class='add'>+		uint64_t mac1_int:1;</div><div class='add'>+		uint64_t mac0_int:1;</div><div class='add'>+		uint64_t mio_int1:1;</div><div class='add'>+		uint64_t mio_int0:1;</div><div class='add'>+		uint64_t m1_un_wi:1;</div><div class='add'>+		uint64_t m1_un_b0:1;</div><div class='add'>+		uint64_t m1_up_wi:1;</div><div class='add'>+		uint64_t m1_up_b0:1;</div><div class='add'>+		uint64_t m0_un_wi:1;</div><div class='add'>+		uint64_t m0_un_b0:1;</div><div class='add'>+		uint64_t m0_up_wi:1;</div><div class='add'>+		uint64_t m0_up_b0:1;</div><div class='add'>+		uint64_t reserved_6_7:2;</div><div class='add'>+		uint64_t ptime:1;</div><div class='add'>+		uint64_t pcnt:1;</div><div class='add'>+		uint64_t iob2big:1;</div><div class='add'>+		uint64_t bar0_to:1;</div><div class='add'>+		uint64_t reserved_1_1:1;</div><div class='add'>+		uint64_t rml_to:1;</div><div class='add'>+	} cn63xx;</div><div class='add'>+	struct cvmx_sli_int_sum_cn63xx cn63xxp1;</div><div class='add'>+	struct cvmx_sli_int_sum_cn61xx cn66xx;</div><div class='add'>+	struct cvmx_sli_int_sum_cn68xx {</div><div class='add'>+		uint64_t reserved_62_63:2;</div><div class='add'>+		uint64_t pipe_err:1;</div><div class='add'>+		uint64_t ill_pad:1;</div><div class='add'>+		uint64_t reserved_58_59:2;</div><div class='add'>+		uint64_t sprt1_err:1;</div><div class='add'>+		uint64_t sprt0_err:1;</div><div class='add'>+		uint64_t pins_err:1;</div><div class='add'>+		uint64_t pop_err:1;</div><div class='add'>+		uint64_t pdi_err:1;</div><div class='add'>+		uint64_t pgl_err:1;</div><div class='add'>+		uint64_t reserved_51_51:1;</div><div class='add'>+		uint64_t pout_err:1;</div><div class='add'>+		uint64_t psldbof:1;</div><div class='add'>+		uint64_t pidbof:1;</div><div class='add'>+		uint64_t reserved_38_47:10;</div><div class='add'>+		uint64_t dtime:2;</div><div class='add'>+		uint64_t dcnt:2;</div><div class='add'>+		uint64_t dmafi:2;</div><div class='add'>+		uint64_t reserved_20_31:12;</div><div class='add'>+		uint64_t mac1_int:1;</div><div class='add'>+		uint64_t mac0_int:1;</div><div class='add'>+		uint64_t mio_int1:1;</div><div class='add'>+		uint64_t mio_int0:1;</div><div class='add'>+		uint64_t m1_un_wi:1;</div><div class='add'>+		uint64_t m1_un_b0:1;</div><div class='add'>+		uint64_t m1_up_wi:1;</div><div class='add'>+		uint64_t m1_up_b0:1;</div><div class='add'>+		uint64_t m0_un_wi:1;</div><div class='add'>+		uint64_t m0_un_b0:1;</div><div class='add'>+		uint64_t m0_up_wi:1;</div><div class='add'>+		uint64_t m0_up_b0:1;</div><div class='add'>+		uint64_t reserved_6_7:2;</div><div class='add'>+		uint64_t ptime:1;</div><div class='add'>+		uint64_t pcnt:1;</div><div class='add'>+		uint64_t iob2big:1;</div><div class='add'>+		uint64_t bar0_to:1;</div><div class='add'>+		uint64_t reserved_1_1:1;</div><div class='add'>+		uint64_t rml_to:1;</div><div class='add'>+	} cn68xx;</div><div class='add'>+	struct cvmx_sli_int_sum_cn68xx cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_last_win_rdata0 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_last_win_rdata0_s {</div><div class='add'>+		uint64_t data:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_last_win_rdata0_s cn61xx;</div><div class='add'>+	struct cvmx_sli_last_win_rdata0_s cn63xx;</div><div class='add'>+	struct cvmx_sli_last_win_rdata0_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_last_win_rdata0_s cn66xx;</div><div class='add'>+	struct cvmx_sli_last_win_rdata0_s cn68xx;</div><div class='add'>+	struct cvmx_sli_last_win_rdata0_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_last_win_rdata1 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_last_win_rdata1_s {</div><div class='add'>+		uint64_t data:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_last_win_rdata1_s cn61xx;</div><div class='add'>+	struct cvmx_sli_last_win_rdata1_s cn63xx;</div><div class='add'>+	struct cvmx_sli_last_win_rdata1_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_last_win_rdata1_s cn66xx;</div><div class='add'>+	struct cvmx_sli_last_win_rdata1_s cn68xx;</div><div class='add'>+	struct cvmx_sli_last_win_rdata1_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_last_win_rdata2 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_last_win_rdata2_s {</div><div class='add'>+		uint64_t data:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_last_win_rdata2_s cn61xx;</div><div class='add'>+	struct cvmx_sli_last_win_rdata2_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_last_win_rdata3 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_last_win_rdata3_s {</div><div class='add'>+		uint64_t data:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_last_win_rdata3_s cn61xx;</div><div class='add'>+	struct cvmx_sli_last_win_rdata3_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_mac_credit_cnt {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_mac_credit_cnt_s {</div><div class='add'>+		uint64_t reserved_54_63:10;</div><div class='add'>+		uint64_t p1_c_d:1;</div><div class='add'>+		uint64_t p1_n_d:1;</div><div class='add'>+		uint64_t p1_p_d:1;</div><div class='add'>+		uint64_t p0_c_d:1;</div><div class='add'>+		uint64_t p0_n_d:1;</div><div class='add'>+		uint64_t p0_p_d:1;</div><div class='add'>+		uint64_t p1_ccnt:8;</div><div class='add'>+		uint64_t p1_ncnt:8;</div><div class='add'>+		uint64_t p1_pcnt:8;</div><div class='add'>+		uint64_t p0_ccnt:8;</div><div class='add'>+		uint64_t p0_ncnt:8;</div><div class='add'>+		uint64_t p0_pcnt:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_mac_credit_cnt_s cn61xx;</div><div class='add'>+	struct cvmx_sli_mac_credit_cnt_s cn63xx;</div><div class='add'>+	struct cvmx_sli_mac_credit_cnt_cn63xxp1 {</div><div class='add'>+		uint64_t reserved_48_63:16;</div><div class='add'>+		uint64_t p1_ccnt:8;</div><div class='add'>+		uint64_t p1_ncnt:8;</div><div class='add'>+		uint64_t p1_pcnt:8;</div><div class='add'>+		uint64_t p0_ccnt:8;</div><div class='add'>+		uint64_t p0_ncnt:8;</div><div class='add'>+		uint64_t p0_pcnt:8;</div><div class='add'>+	} cn63xxp1;</div><div class='add'>+	struct cvmx_sli_mac_credit_cnt_s cn66xx;</div><div class='add'>+	struct cvmx_sli_mac_credit_cnt_s cn68xx;</div><div class='add'>+	struct cvmx_sli_mac_credit_cnt_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_mac_credit_cnt2 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_mac_credit_cnt2_s {</div><div class='add'>+		uint64_t reserved_54_63:10;</div><div class='add'>+		uint64_t p3_c_d:1;</div><div class='add'>+		uint64_t p3_n_d:1;</div><div class='add'>+		uint64_t p3_p_d:1;</div><div class='add'>+		uint64_t p2_c_d:1;</div><div class='add'>+		uint64_t p2_n_d:1;</div><div class='add'>+		uint64_t p2_p_d:1;</div><div class='add'>+		uint64_t p3_ccnt:8;</div><div class='add'>+		uint64_t p3_ncnt:8;</div><div class='add'>+		uint64_t p3_pcnt:8;</div><div class='add'>+		uint64_t p2_ccnt:8;</div><div class='add'>+		uint64_t p2_ncnt:8;</div><div class='add'>+		uint64_t p2_pcnt:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_mac_credit_cnt2_s cn61xx;</div><div class='add'>+	struct cvmx_sli_mac_credit_cnt2_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_mac_number {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_mac_number_s {</div><div class='add'>+		uint64_t reserved_9_63:55;</div><div class='add'>+		uint64_t a_mode:1;</div><div class='add'>+		uint64_t num:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_mac_number_s cn61xx;</div><div class='add'>+	struct cvmx_sli_mac_number_cn63xx {</div><div class='add'>+		uint64_t reserved_8_63:56;</div><div class='add'>+		uint64_t num:8;</div><div class='add'>+	} cn63xx;</div><div class='add'>+	struct cvmx_sli_mac_number_s cn66xx;</div><div class='add'>+	struct cvmx_sli_mac_number_cn63xx cn68xx;</div><div class='add'>+	struct cvmx_sli_mac_number_cn63xx cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_mem_access_ctl {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_mem_access_ctl_s {</div><div class='add'>+		uint64_t reserved_14_63:50;</div><div class='add'>+		uint64_t max_word:4;</div><div class='add'>+		uint64_t timer:10;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_mem_access_ctl_s cn61xx;</div><div class='add'>+	struct cvmx_sli_mem_access_ctl_s cn63xx;</div><div class='add'>+	struct cvmx_sli_mem_access_ctl_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_mem_access_ctl_s cn66xx;</div><div class='add'>+	struct cvmx_sli_mem_access_ctl_s cn68xx;</div><div class='add'>+	struct cvmx_sli_mem_access_ctl_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_mem_access_subidx {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_mem_access_subidx_s {</div><div class='add'>+		uint64_t reserved_43_63:21;</div><div class='add'>+		uint64_t zero:1;</div><div class='add'>+		uint64_t port:3;</div><div class='add'>+		uint64_t nmerge:1;</div><div class='add'>+		uint64_t esr:2;</div><div class='add'>+		uint64_t esw:2;</div><div class='add'>+		uint64_t wtype:2;</div><div class='add'>+		uint64_t rtype:2;</div><div class='add'>+		uint64_t reserved_0_29:30;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_mem_access_subidx_cn61xx {</div><div class='add'>+		uint64_t reserved_43_63:21;</div><div class='add'>+		uint64_t zero:1;</div><div class='add'>+		uint64_t port:3;</div><div class='add'>+		uint64_t nmerge:1;</div><div class='add'>+		uint64_t esr:2;</div><div class='add'>+		uint64_t esw:2;</div><div class='add'>+		uint64_t wtype:2;</div><div class='add'>+		uint64_t rtype:2;</div><div class='add'>+		uint64_t ba:30;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_sli_mem_access_subidx_cn61xx cn63xx;</div><div class='add'>+	struct cvmx_sli_mem_access_subidx_cn61xx cn63xxp1;</div><div class='add'>+	struct cvmx_sli_mem_access_subidx_cn61xx cn66xx;</div><div class='add'>+	struct cvmx_sli_mem_access_subidx_cn68xx {</div><div class='add'>+		uint64_t reserved_43_63:21;</div><div class='add'>+		uint64_t zero:1;</div><div class='add'>+		uint64_t port:3;</div><div class='add'>+		uint64_t nmerge:1;</div><div class='add'>+		uint64_t esr:2;</div><div class='add'>+		uint64_t esw:2;</div><div class='add'>+		uint64_t wtype:2;</div><div class='add'>+		uint64_t rtype:2;</div><div class='add'>+		uint64_t ba:28;</div><div class='add'>+		uint64_t reserved_0_1:2;</div><div class='add'>+	} cn68xx;</div><div class='add'>+	struct cvmx_sli_mem_access_subidx_cn68xx cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_msi_enb0 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_msi_enb0_s {</div><div class='add'>+		uint64_t enb:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_msi_enb0_s cn61xx;</div><div class='add'>+	struct cvmx_sli_msi_enb0_s cn63xx;</div><div class='add'>+	struct cvmx_sli_msi_enb0_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_msi_enb0_s cn66xx;</div><div class='add'>+	struct cvmx_sli_msi_enb0_s cn68xx;</div><div class='add'>+	struct cvmx_sli_msi_enb0_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_msi_enb1 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_msi_enb1_s {</div><div class='add'>+		uint64_t enb:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_msi_enb1_s cn61xx;</div><div class='add'>+	struct cvmx_sli_msi_enb1_s cn63xx;</div><div class='add'>+	struct cvmx_sli_msi_enb1_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_msi_enb1_s cn66xx;</div><div class='add'>+	struct cvmx_sli_msi_enb1_s cn68xx;</div><div class='add'>+	struct cvmx_sli_msi_enb1_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_msi_enb2 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_msi_enb2_s {</div><div class='add'>+		uint64_t enb:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_msi_enb2_s cn61xx;</div><div class='add'>+	struct cvmx_sli_msi_enb2_s cn63xx;</div><div class='add'>+	struct cvmx_sli_msi_enb2_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_msi_enb2_s cn66xx;</div><div class='add'>+	struct cvmx_sli_msi_enb2_s cn68xx;</div><div class='add'>+	struct cvmx_sli_msi_enb2_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_msi_enb3 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_msi_enb3_s {</div><div class='add'>+		uint64_t enb:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_msi_enb3_s cn61xx;</div><div class='add'>+	struct cvmx_sli_msi_enb3_s cn63xx;</div><div class='add'>+	struct cvmx_sli_msi_enb3_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_msi_enb3_s cn66xx;</div><div class='add'>+	struct cvmx_sli_msi_enb3_s cn68xx;</div><div class='add'>+	struct cvmx_sli_msi_enb3_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_msi_rcv0 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_msi_rcv0_s {</div><div class='add'>+		uint64_t intr:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_msi_rcv0_s cn61xx;</div><div class='add'>+	struct cvmx_sli_msi_rcv0_s cn63xx;</div><div class='add'>+	struct cvmx_sli_msi_rcv0_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_msi_rcv0_s cn66xx;</div><div class='add'>+	struct cvmx_sli_msi_rcv0_s cn68xx;</div><div class='add'>+	struct cvmx_sli_msi_rcv0_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_msi_rcv1 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_msi_rcv1_s {</div><div class='add'>+		uint64_t intr:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_msi_rcv1_s cn61xx;</div><div class='add'>+	struct cvmx_sli_msi_rcv1_s cn63xx;</div><div class='add'>+	struct cvmx_sli_msi_rcv1_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_msi_rcv1_s cn66xx;</div><div class='add'>+	struct cvmx_sli_msi_rcv1_s cn68xx;</div><div class='add'>+	struct cvmx_sli_msi_rcv1_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_msi_rcv2 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_msi_rcv2_s {</div><div class='add'>+		uint64_t intr:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_msi_rcv2_s cn61xx;</div><div class='add'>+	struct cvmx_sli_msi_rcv2_s cn63xx;</div><div class='add'>+	struct cvmx_sli_msi_rcv2_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_msi_rcv2_s cn66xx;</div><div class='add'>+	struct cvmx_sli_msi_rcv2_s cn68xx;</div><div class='add'>+	struct cvmx_sli_msi_rcv2_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_msi_rcv3 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_msi_rcv3_s {</div><div class='add'>+		uint64_t intr:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_msi_rcv3_s cn61xx;</div><div class='add'>+	struct cvmx_sli_msi_rcv3_s cn63xx;</div><div class='add'>+	struct cvmx_sli_msi_rcv3_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_msi_rcv3_s cn66xx;</div><div class='add'>+	struct cvmx_sli_msi_rcv3_s cn68xx;</div><div class='add'>+	struct cvmx_sli_msi_rcv3_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_msi_rd_map {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_msi_rd_map_s {</div><div class='add'>+		uint64_t reserved_16_63:48;</div><div class='add'>+		uint64_t rd_int:8;</div><div class='add'>+		uint64_t msi_int:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_msi_rd_map_s cn61xx;</div><div class='add'>+	struct cvmx_sli_msi_rd_map_s cn63xx;</div><div class='add'>+	struct cvmx_sli_msi_rd_map_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_msi_rd_map_s cn66xx;</div><div class='add'>+	struct cvmx_sli_msi_rd_map_s cn68xx;</div><div class='add'>+	struct cvmx_sli_msi_rd_map_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_msi_w1c_enb0 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb0_s {</div><div class='add'>+		uint64_t clr:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb0_s cn61xx;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb0_s cn63xx;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb0_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb0_s cn66xx;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb0_s cn68xx;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb0_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_msi_w1c_enb1 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb1_s {</div><div class='add'>+		uint64_t clr:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb1_s cn61xx;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb1_s cn63xx;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb1_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb1_s cn66xx;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb1_s cn68xx;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb1_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_msi_w1c_enb2 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb2_s {</div><div class='add'>+		uint64_t clr:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb2_s cn61xx;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb2_s cn63xx;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb2_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb2_s cn66xx;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb2_s cn68xx;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb2_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_msi_w1c_enb3 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb3_s {</div><div class='add'>+		uint64_t clr:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb3_s cn61xx;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb3_s cn63xx;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb3_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb3_s cn66xx;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb3_s cn68xx;</div><div class='add'>+	struct cvmx_sli_msi_w1c_enb3_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_msi_w1s_enb0 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb0_s {</div><div class='add'>+		uint64_t set:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb0_s cn61xx;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb0_s cn63xx;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb0_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb0_s cn66xx;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb0_s cn68xx;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb0_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_msi_w1s_enb1 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb1_s {</div><div class='add'>+		uint64_t set:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb1_s cn61xx;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb1_s cn63xx;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb1_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb1_s cn66xx;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb1_s cn68xx;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb1_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_msi_w1s_enb2 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb2_s {</div><div class='add'>+		uint64_t set:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb2_s cn61xx;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb2_s cn63xx;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb2_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb2_s cn66xx;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb2_s cn68xx;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb2_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_msi_w1s_enb3 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb3_s {</div><div class='add'>+		uint64_t set:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb3_s cn61xx;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb3_s cn63xx;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb3_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb3_s cn66xx;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb3_s cn68xx;</div><div class='add'>+	struct cvmx_sli_msi_w1s_enb3_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_msi_wr_map {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_msi_wr_map_s {</div><div class='add'>+		uint64_t reserved_16_63:48;</div><div class='add'>+		uint64_t ciu_int:8;</div><div class='add'>+		uint64_t msi_int:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_msi_wr_map_s cn61xx;</div><div class='add'>+	struct cvmx_sli_msi_wr_map_s cn63xx;</div><div class='add'>+	struct cvmx_sli_msi_wr_map_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_msi_wr_map_s cn66xx;</div><div class='add'>+	struct cvmx_sli_msi_wr_map_s cn68xx;</div><div class='add'>+	struct cvmx_sli_msi_wr_map_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pcie_msi_rcv {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_s {</div><div class='add'>+		uint64_t reserved_8_63:56;</div><div class='add'>+		uint64_t intr:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pcie_msi_rcv_b1 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b1_s {</div><div class='add'>+		uint64_t reserved_16_63:48;</div><div class='add'>+		uint64_t intr:8;</div><div class='add'>+		uint64_t reserved_0_7:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b1_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b1_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b1_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b1_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b1_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b1_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pcie_msi_rcv_b2 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b2_s {</div><div class='add'>+		uint64_t reserved_24_63:40;</div><div class='add'>+		uint64_t intr:8;</div><div class='add'>+		uint64_t reserved_0_15:16;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b2_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b2_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b2_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b2_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b2_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b2_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pcie_msi_rcv_b3 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b3_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t intr:8;</div><div class='add'>+		uint64_t reserved_0_23:24;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b3_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b3_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b3_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b3_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b3_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pcie_msi_rcv_b3_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pktx_cnts {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pktx_cnts_s {</div><div class='add'>+		uint64_t reserved_54_63:10;</div><div class='add'>+		uint64_t timer:22;</div><div class='add'>+		uint64_t cnt:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pktx_cnts_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pktx_cnts_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pktx_cnts_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pktx_cnts_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pktx_cnts_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pktx_cnts_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pktx_in_bp {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pktx_in_bp_s {</div><div class='add'>+		uint64_t wmark:32;</div><div class='add'>+		uint64_t cnt:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pktx_in_bp_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pktx_in_bp_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pktx_in_bp_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pktx_in_bp_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pktx_instr_baddr {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pktx_instr_baddr_s {</div><div class='add'>+		uint64_t addr:61;</div><div class='add'>+		uint64_t reserved_0_2:3;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pktx_instr_baddr_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pktx_instr_baddr_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pktx_instr_baddr_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pktx_instr_baddr_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pktx_instr_baddr_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pktx_instr_baddr_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pktx_instr_baoff_dbell {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pktx_instr_baoff_dbell_s {</div><div class='add'>+		uint64_t aoff:32;</div><div class='add'>+		uint64_t dbell:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pktx_instr_baoff_dbell_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pktx_instr_baoff_dbell_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pktx_instr_baoff_dbell_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pktx_instr_baoff_dbell_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pktx_instr_baoff_dbell_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pktx_instr_baoff_dbell_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pktx_instr_fifo_rsize {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pktx_instr_fifo_rsize_s {</div><div class='add'>+		uint64_t max:9;</div><div class='add'>+		uint64_t rrp:9;</div><div class='add'>+		uint64_t wrp:9;</div><div class='add'>+		uint64_t fcnt:5;</div><div class='add'>+		uint64_t rsize:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pktx_instr_fifo_rsize_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pktx_instr_fifo_rsize_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pktx_instr_fifo_rsize_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pktx_instr_fifo_rsize_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pktx_instr_fifo_rsize_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pktx_instr_fifo_rsize_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pktx_instr_header {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pktx_instr_header_s {</div><div class='add'>+		uint64_t reserved_44_63:20;</div><div class='add'>+		uint64_t pbp:1;</div><div class='add'>+		uint64_t reserved_38_42:5;</div><div class='add'>+		uint64_t rparmode:2;</div><div class='add'>+		uint64_t reserved_35_35:1;</div><div class='add'>+		uint64_t rskp_len:7;</div><div class='add'>+		uint64_t rngrpext:2;</div><div class='add'>+		uint64_t rnqos:1;</div><div class='add'>+		uint64_t rngrp:1;</div><div class='add'>+		uint64_t rntt:1;</div><div class='add'>+		uint64_t rntag:1;</div><div class='add'>+		uint64_t use_ihdr:1;</div><div class='add'>+		uint64_t reserved_16_20:5;</div><div class='add'>+		uint64_t par_mode:2;</div><div class='add'>+		uint64_t reserved_13_13:1;</div><div class='add'>+		uint64_t skp_len:7;</div><div class='add'>+		uint64_t ngrpext:2;</div><div class='add'>+		uint64_t nqos:1;</div><div class='add'>+		uint64_t ngrp:1;</div><div class='add'>+		uint64_t ntt:1;</div><div class='add'>+		uint64_t ntag:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pktx_instr_header_cn61xx {</div><div class='add'>+		uint64_t reserved_44_63:20;</div><div class='add'>+		uint64_t pbp:1;</div><div class='add'>+		uint64_t reserved_38_42:5;</div><div class='add'>+		uint64_t rparmode:2;</div><div class='add'>+		uint64_t reserved_35_35:1;</div><div class='add'>+		uint64_t rskp_len:7;</div><div class='add'>+		uint64_t reserved_26_27:2;</div><div class='add'>+		uint64_t rnqos:1;</div><div class='add'>+		uint64_t rngrp:1;</div><div class='add'>+		uint64_t rntt:1;</div><div class='add'>+		uint64_t rntag:1;</div><div class='add'>+		uint64_t use_ihdr:1;</div><div class='add'>+		uint64_t reserved_16_20:5;</div><div class='add'>+		uint64_t par_mode:2;</div><div class='add'>+		uint64_t reserved_13_13:1;</div><div class='add'>+		uint64_t skp_len:7;</div><div class='add'>+		uint64_t reserved_4_5:2;</div><div class='add'>+		uint64_t nqos:1;</div><div class='add'>+		uint64_t ngrp:1;</div><div class='add'>+		uint64_t ntt:1;</div><div class='add'>+		uint64_t ntag:1;</div><div class='add'>+	} cn61xx;</div><div class='add'>+	struct cvmx_sli_pktx_instr_header_cn61xx cn63xx;</div><div class='add'>+	struct cvmx_sli_pktx_instr_header_cn61xx cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pktx_instr_header_cn61xx cn66xx;</div><div class='add'>+	struct cvmx_sli_pktx_instr_header_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pktx_instr_header_cn61xx cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pktx_out_size {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pktx_out_size_s {</div><div class='add'>+		uint64_t reserved_23_63:41;</div><div class='add'>+		uint64_t isize:7;</div><div class='add'>+		uint64_t bsize:16;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pktx_out_size_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pktx_out_size_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pktx_out_size_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pktx_out_size_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pktx_out_size_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pktx_out_size_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pktx_slist_baddr {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pktx_slist_baddr_s {</div><div class='add'>+		uint64_t addr:60;</div><div class='add'>+		uint64_t reserved_0_3:4;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pktx_slist_baddr_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pktx_slist_baddr_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pktx_slist_baddr_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pktx_slist_baddr_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pktx_slist_baddr_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pktx_slist_baddr_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pktx_slist_baoff_dbell {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pktx_slist_baoff_dbell_s {</div><div class='add'>+		uint64_t aoff:32;</div><div class='add'>+		uint64_t dbell:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pktx_slist_baoff_dbell_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pktx_slist_baoff_dbell_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pktx_slist_baoff_dbell_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pktx_slist_baoff_dbell_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pktx_slist_baoff_dbell_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pktx_slist_baoff_dbell_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pktx_slist_fifo_rsize {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pktx_slist_fifo_rsize_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t rsize:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pktx_slist_fifo_rsize_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pktx_slist_fifo_rsize_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pktx_slist_fifo_rsize_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pktx_slist_fifo_rsize_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pktx_slist_fifo_rsize_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pktx_slist_fifo_rsize_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_cnt_int {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_cnt_int_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t port:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_cnt_int_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_cnt_int_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_cnt_int_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_cnt_int_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_cnt_int_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_cnt_int_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_cnt_int_enb {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_cnt_int_enb_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t port:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_cnt_int_enb_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_cnt_int_enb_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_cnt_int_enb_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_cnt_int_enb_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_cnt_int_enb_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_cnt_int_enb_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_ctl {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_ctl_s {</div><div class='add'>+		uint64_t reserved_5_63:59;</div><div class='add'>+		uint64_t ring_en:1;</div><div class='add'>+		uint64_t pkt_bp:4;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_ctl_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_ctl_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_ctl_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_ctl_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_ctl_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_ctl_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_data_out_es {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_es_s {</div><div class='add'>+		uint64_t es:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_es_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_es_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_es_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_es_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_es_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_es_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_data_out_ns {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_ns_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t nsr:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_ns_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_ns_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_ns_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_ns_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_ns_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_ns_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_data_out_ror {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_ror_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t ror:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_ror_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_ror_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_ror_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_ror_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_ror_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_data_out_ror_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_dpaddr {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_dpaddr_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t dptr:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_dpaddr_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_dpaddr_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_dpaddr_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_dpaddr_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_dpaddr_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_dpaddr_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_in_bp {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_in_bp_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t bp:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_in_bp_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_in_bp_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_in_bp_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_in_bp_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_in_donex_cnts {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_in_donex_cnts_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t cnt:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_in_donex_cnts_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_in_donex_cnts_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_in_donex_cnts_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_in_donex_cnts_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_in_donex_cnts_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_in_donex_cnts_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_in_instr_counts {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_in_instr_counts_s {</div><div class='add'>+		uint64_t wr_cnt:32;</div><div class='add'>+		uint64_t rd_cnt:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_in_instr_counts_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_in_instr_counts_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_in_instr_counts_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_in_instr_counts_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_in_instr_counts_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_in_instr_counts_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_in_pcie_port {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_in_pcie_port_s {</div><div class='add'>+		uint64_t pp:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_in_pcie_port_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_in_pcie_port_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_in_pcie_port_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_in_pcie_port_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_in_pcie_port_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_in_pcie_port_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_input_control {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_input_control_s {</div><div class='add'>+		uint64_t prd_erst:1;</div><div class='add'>+		uint64_t prd_rds:7;</div><div class='add'>+		uint64_t gii_erst:1;</div><div class='add'>+		uint64_t gii_rds:7;</div><div class='add'>+		uint64_t reserved_41_47:7;</div><div class='add'>+		uint64_t prc_idle:1;</div><div class='add'>+		uint64_t reserved_24_39:16;</div><div class='add'>+		uint64_t pin_rst:1;</div><div class='add'>+		uint64_t pkt_rr:1;</div><div class='add'>+		uint64_t pbp_dhi:13;</div><div class='add'>+		uint64_t d_nsr:1;</div><div class='add'>+		uint64_t d_esr:2;</div><div class='add'>+		uint64_t d_ror:1;</div><div class='add'>+		uint64_t use_csr:1;</div><div class='add'>+		uint64_t nsr:1;</div><div class='add'>+		uint64_t esr:2;</div><div class='add'>+		uint64_t ror:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_input_control_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_input_control_cn63xx {</div><div class='add'>+		uint64_t reserved_23_63:41;</div><div class='add'>+		uint64_t pkt_rr:1;</div><div class='add'>+		uint64_t pbp_dhi:13;</div><div class='add'>+		uint64_t d_nsr:1;</div><div class='add'>+		uint64_t d_esr:2;</div><div class='add'>+		uint64_t d_ror:1;</div><div class='add'>+		uint64_t use_csr:1;</div><div class='add'>+		uint64_t nsr:1;</div><div class='add'>+		uint64_t esr:2;</div><div class='add'>+		uint64_t ror:1;</div><div class='add'>+	} cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_input_control_cn63xx cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_input_control_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_input_control_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_input_control_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_instr_enb {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_instr_enb_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t enb:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_instr_enb_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_instr_enb_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_instr_enb_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_instr_enb_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_instr_enb_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_instr_enb_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_instr_rd_size {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_instr_rd_size_s {</div><div class='add'>+		uint64_t rdsize:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_instr_rd_size_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_instr_rd_size_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_instr_rd_size_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_instr_rd_size_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_instr_rd_size_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_instr_rd_size_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_instr_size {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_instr_size_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t is_64b:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_instr_size_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_instr_size_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_instr_size_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_instr_size_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_instr_size_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_instr_size_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_int_levels {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_int_levels_s {</div><div class='add'>+		uint64_t reserved_54_63:10;</div><div class='add'>+		uint64_t time:22;</div><div class='add'>+		uint64_t cnt:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_int_levels_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_int_levels_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_int_levels_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_int_levels_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_int_levels_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_int_levels_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_iptr {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_iptr_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t iptr:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_iptr_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_iptr_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_iptr_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_iptr_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_iptr_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_iptr_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_out_bmode {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_out_bmode_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t bmode:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_out_bmode_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_out_bmode_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_out_bmode_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_out_bmode_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_out_bmode_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_out_bmode_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_out_bp_en {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_out_bp_en_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t bp_en:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_out_bp_en_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_out_bp_en_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_out_enb {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_out_enb_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t enb:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_out_enb_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_out_enb_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_out_enb_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_out_enb_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_out_enb_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_out_enb_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_output_wmark {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_output_wmark_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t wmark:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_output_wmark_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_output_wmark_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_output_wmark_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_output_wmark_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_output_wmark_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_output_wmark_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_pcie_port {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_pcie_port_s {</div><div class='add'>+		uint64_t pp:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_pcie_port_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_pcie_port_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_pcie_port_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_pcie_port_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_pcie_port_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_pcie_port_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_port_in_rst {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_port_in_rst_s {</div><div class='add'>+		uint64_t in_rst:32;</div><div class='add'>+		uint64_t out_rst:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_port_in_rst_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_port_in_rst_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_port_in_rst_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_port_in_rst_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_port_in_rst_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_port_in_rst_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_slist_es {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_slist_es_s {</div><div class='add'>+		uint64_t es:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_slist_es_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_slist_es_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_slist_es_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_slist_es_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_slist_es_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_slist_es_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_slist_ns {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_slist_ns_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t nsr:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_slist_ns_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_slist_ns_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_slist_ns_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_slist_ns_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_slist_ns_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_slist_ns_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_slist_ror {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_slist_ror_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t ror:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_slist_ror_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_slist_ror_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_slist_ror_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_slist_ror_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_slist_ror_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_slist_ror_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_time_int {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_time_int_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t port:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_time_int_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_time_int_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_time_int_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_time_int_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_time_int_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_time_int_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_pkt_time_int_enb {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_pkt_time_int_enb_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t port:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_pkt_time_int_enb_s cn61xx;</div><div class='add'>+	struct cvmx_sli_pkt_time_int_enb_s cn63xx;</div><div class='add'>+	struct cvmx_sli_pkt_time_int_enb_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_pkt_time_int_enb_s cn66xx;</div><div class='add'>+	struct cvmx_sli_pkt_time_int_enb_s cn68xx;</div><div class='add'>+	struct cvmx_sli_pkt_time_int_enb_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_portx_pkind {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_portx_pkind_s {</div><div class='add'>+		uint64_t reserved_25_63:39;</div><div class='add'>+		uint64_t rpk_enb:1;</div><div class='add'>+		uint64_t reserved_22_23:2;</div><div class='add'>+		uint64_t pkindr:6;</div><div class='add'>+		uint64_t reserved_14_15:2;</div><div class='add'>+		uint64_t bpkind:6;</div><div class='add'>+		uint64_t reserved_6_7:2;</div><div class='add'>+		uint64_t pkind:6;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_portx_pkind_s cn68xx;</div><div class='add'>+	struct cvmx_sli_portx_pkind_cn68xxp1 {</div><div class='add'>+		uint64_t reserved_14_63:50;</div><div class='add'>+		uint64_t bpkind:6;</div><div class='add'>+		uint64_t reserved_6_7:2;</div><div class='add'>+		uint64_t pkind:6;</div><div class='add'>+	} cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_s2m_portx_ctl {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_s2m_portx_ctl_s {</div><div class='add'>+		uint64_t reserved_5_63:59;</div><div class='add'>+		uint64_t wind_d:1;</div><div class='add'>+		uint64_t bar0_d:1;</div><div class='add'>+		uint64_t mrrs:3;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_s2m_portx_ctl_s cn61xx;</div><div class='add'>+	struct cvmx_sli_s2m_portx_ctl_s cn63xx;</div><div class='add'>+	struct cvmx_sli_s2m_portx_ctl_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_s2m_portx_ctl_s cn66xx;</div><div class='add'>+	struct cvmx_sli_s2m_portx_ctl_s cn68xx;</div><div class='add'>+	struct cvmx_sli_s2m_portx_ctl_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_scratch_1 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_scratch_1_s {</div><div class='add'>+		uint64_t data:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_scratch_1_s cn61xx;</div><div class='add'>+	struct cvmx_sli_scratch_1_s cn63xx;</div><div class='add'>+	struct cvmx_sli_scratch_1_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_scratch_1_s cn66xx;</div><div class='add'>+	struct cvmx_sli_scratch_1_s cn68xx;</div><div class='add'>+	struct cvmx_sli_scratch_1_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_scratch_2 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_scratch_2_s {</div><div class='add'>+		uint64_t data:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_scratch_2_s cn61xx;</div><div class='add'>+	struct cvmx_sli_scratch_2_s cn63xx;</div><div class='add'>+	struct cvmx_sli_scratch_2_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_scratch_2_s cn66xx;</div><div class='add'>+	struct cvmx_sli_scratch_2_s cn68xx;</div><div class='add'>+	struct cvmx_sli_scratch_2_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_state1 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_state1_s {</div><div class='add'>+		uint64_t cpl1:12;</div><div class='add'>+		uint64_t cpl0:12;</div><div class='add'>+		uint64_t arb:1;</div><div class='add'>+		uint64_t csr:39;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_state1_s cn61xx;</div><div class='add'>+	struct cvmx_sli_state1_s cn63xx;</div><div class='add'>+	struct cvmx_sli_state1_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_state1_s cn66xx;</div><div class='add'>+	struct cvmx_sli_state1_s cn68xx;</div><div class='add'>+	struct cvmx_sli_state1_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_state2 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_state2_s {</div><div class='add'>+		uint64_t reserved_56_63:8;</div><div class='add'>+		uint64_t nnp1:8;</div><div class='add'>+		uint64_t reserved_47_47:1;</div><div class='add'>+		uint64_t rac:1;</div><div class='add'>+		uint64_t csm1:15;</div><div class='add'>+		uint64_t csm0:15;</div><div class='add'>+		uint64_t nnp0:8;</div><div class='add'>+		uint64_t nnd:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_state2_s cn61xx;</div><div class='add'>+	struct cvmx_sli_state2_s cn63xx;</div><div class='add'>+	struct cvmx_sli_state2_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_state2_s cn66xx;</div><div class='add'>+	struct cvmx_sli_state2_s cn68xx;</div><div class='add'>+	struct cvmx_sli_state2_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_state3 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_state3_s {</div><div class='add'>+		uint64_t reserved_56_63:8;</div><div class='add'>+		uint64_t psm1:15;</div><div class='add'>+		uint64_t psm0:15;</div><div class='add'>+		uint64_t nsm1:13;</div><div class='add'>+		uint64_t nsm0:13;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_state3_s cn61xx;</div><div class='add'>+	struct cvmx_sli_state3_s cn63xx;</div><div class='add'>+	struct cvmx_sli_state3_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_state3_s cn66xx;</div><div class='add'>+	struct cvmx_sli_state3_s cn68xx;</div><div class='add'>+	struct cvmx_sli_state3_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_tx_pipe {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_tx_pipe_s {</div><div class='add'>+		uint64_t reserved_24_63:40;</div><div class='add'>+		uint64_t nump:8;</div><div class='add'>+		uint64_t reserved_7_15:9;</div><div class='add'>+		uint64_t base:7;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_tx_pipe_s cn68xx;</div><div class='add'>+	struct cvmx_sli_tx_pipe_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_win_rd_addr {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_win_rd_addr_s {</div><div class='add'>+		uint64_t reserved_51_63:13;</div><div class='add'>+		uint64_t ld_cmd:2;</div><div class='add'>+		uint64_t iobit:1;</div><div class='add'>+		uint64_t rd_addr:48;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_win_rd_addr_s cn61xx;</div><div class='add'>+	struct cvmx_sli_win_rd_addr_s cn63xx;</div><div class='add'>+	struct cvmx_sli_win_rd_addr_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_win_rd_addr_s cn66xx;</div><div class='add'>+	struct cvmx_sli_win_rd_addr_s cn68xx;</div><div class='add'>+	struct cvmx_sli_win_rd_addr_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_win_rd_data {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_win_rd_data_s {</div><div class='add'>+		uint64_t rd_data:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_win_rd_data_s cn61xx;</div><div class='add'>+	struct cvmx_sli_win_rd_data_s cn63xx;</div><div class='add'>+	struct cvmx_sli_win_rd_data_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_win_rd_data_s cn66xx;</div><div class='add'>+	struct cvmx_sli_win_rd_data_s cn68xx;</div><div class='add'>+	struct cvmx_sli_win_rd_data_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_win_wr_addr {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_win_wr_addr_s {</div><div class='add'>+		uint64_t reserved_49_63:15;</div><div class='add'>+		uint64_t iobit:1;</div><div class='add'>+		uint64_t wr_addr:45;</div><div class='add'>+		uint64_t reserved_0_2:3;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_win_wr_addr_s cn61xx;</div><div class='add'>+	struct cvmx_sli_win_wr_addr_s cn63xx;</div><div class='add'>+	struct cvmx_sli_win_wr_addr_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_win_wr_addr_s cn66xx;</div><div class='add'>+	struct cvmx_sli_win_wr_addr_s cn68xx;</div><div class='add'>+	struct cvmx_sli_win_wr_addr_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_win_wr_data {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_win_wr_data_s {</div><div class='add'>+		uint64_t wr_data:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_win_wr_data_s cn61xx;</div><div class='add'>+	struct cvmx_sli_win_wr_data_s cn63xx;</div><div class='add'>+	struct cvmx_sli_win_wr_data_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_win_wr_data_s cn66xx;</div><div class='add'>+	struct cvmx_sli_win_wr_data_s cn68xx;</div><div class='add'>+	struct cvmx_sli_win_wr_data_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_win_wr_mask {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_win_wr_mask_s {</div><div class='add'>+		uint64_t reserved_8_63:56;</div><div class='add'>+		uint64_t wr_mask:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_win_wr_mask_s cn61xx;</div><div class='add'>+	struct cvmx_sli_win_wr_mask_s cn63xx;</div><div class='add'>+	struct cvmx_sli_win_wr_mask_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_win_wr_mask_s cn66xx;</div><div class='add'>+	struct cvmx_sli_win_wr_mask_s cn68xx;</div><div class='add'>+	struct cvmx_sli_win_wr_mask_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sli_window_ctl {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sli_window_ctl_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t time:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sli_window_ctl_s cn61xx;</div><div class='add'>+	struct cvmx_sli_window_ctl_s cn63xx;</div><div class='add'>+	struct cvmx_sli_window_ctl_s cn63xxp1;</div><div class='add'>+	struct cvmx_sli_window_ctl_s cn66xx;</div><div class='add'>+	struct cvmx_sli_window_ctl_s cn68xx;</div><div class='add'>+	struct cvmx_sli_window_ctl_s cn68xxp1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-spi.h b/arch/mips/include/asm/octeon/cvmx-spi.h<br/>index e814648953a5..e814648953a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-spi.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-spi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-spi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-spi.h</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-spxx-defs.h b/arch/mips/include/asm/octeon/cvmx-spxx-defs.h<br/>index b16940e32c83..b16940e32c83 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-spxx-defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-spxx-defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-spxx-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-spxx-defs.h</a></div><div class='head'>diff --git a/arch/mips/include/asm/octeon/cvmx-sriox-defs.h b/arch/mips/include/asm/octeon/cvmx-sriox-defs.h<br/>new file mode 100644<br/>index 000000000000..7be7e9ed7465<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-sriox-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-sriox-defs.h</a></div><div class='hunk'>@@ -0,0 +1,1036 @@</div><div class='add'>+/***********************license start***************</div><div class='add'>+ * Author: Cavium Networks</div><div class='add'>+ *</div><div class='add'>+ * Contact: support@caviumnetworks.com</div><div class='add'>+ * This file is part of the OCTEON SDK</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2003-2011 Cavium Networks</div><div class='add'>+ *</div><div class='add'>+ * This file is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License, Version 2, as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This file is distributed in the hope that it will be useful, but</div><div class='add'>+ * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty</div><div class='add'>+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or</div><div class='add'>+ * NONINFRINGEMENT.  See the GNU General Public License for more</div><div class='add'>+ * details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this file; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</div><div class='add'>+ * or visit http://www.gnu.org/licenses/.</div><div class='add'>+ *</div><div class='add'>+ * This file may also be available under a different license from Cavium.</div><div class='add'>+ * Contact Cavium Networks for more information</div><div class='add'>+ ***********************license end**************************************/</div><div class='add'>+</div><div class='add'>+#ifndef __CVMX_SRIOX_DEFS_H__</div><div class='add'>+#define __CVMX_SRIOX_DEFS_H__</div><div class='add'>+</div><div class='add'>+#define CVMX_SRIOX_ACC_CTRL(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000148ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_ASMBLY_ID(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000200ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_ASMBLY_INFO(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000208ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_BELL_RESP_CTRL(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000310ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_BIST_STATUS(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000108ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_IMSG_CTRL(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000508ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_IMSG_INST_HDRX(offset, block_id) (CVMX_ADD_IO_SEG(0x00011800C8000510ull) + (((offset) &amp; 1) + ((block_id) &amp; 3) * 0x200000ull) * 8)</div><div class='add'>+#define CVMX_SRIOX_IMSG_QOS_GRPX(offset, block_id) (CVMX_ADD_IO_SEG(0x00011800C8000600ull) + (((offset) &amp; 31) + ((block_id) &amp; 3) * 0x200000ull) * 8)</div><div class='add'>+#define CVMX_SRIOX_IMSG_STATUSX(offset, block_id) (CVMX_ADD_IO_SEG(0x00011800C8000700ull) + (((offset) &amp; 31) + ((block_id) &amp; 3) * 0x200000ull) * 8)</div><div class='add'>+#define CVMX_SRIOX_IMSG_VPORT_THR(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000500ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_IMSG_VPORT_THR2(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000528ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_INT2_ENABLE(block_id) (CVMX_ADD_IO_SEG(0x00011800C80003E0ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_INT2_REG(block_id) (CVMX_ADD_IO_SEG(0x00011800C80003E8ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_INT_ENABLE(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000110ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_INT_INFO0(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000120ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_INT_INFO1(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000128ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_INT_INFO2(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000130ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_INT_INFO3(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000138ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_INT_REG(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000118ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_IP_FEATURE(block_id) (CVMX_ADD_IO_SEG(0x00011800C80003F8ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_MAC_BUFFERS(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000390ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_MAINT_OP(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000158ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_MAINT_RD_DATA(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000160ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_MCE_TX_CTL(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000240ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_MEM_OP_CTRL(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000168ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_OMSG_CTRLX(offset, block_id) (CVMX_ADD_IO_SEG(0x00011800C8000488ull) + (((offset) &amp; 1) + ((block_id) &amp; 3) * 0x40000ull) * 64)</div><div class='add'>+#define CVMX_SRIOX_OMSG_DONE_COUNTSX(offset, block_id) (CVMX_ADD_IO_SEG(0x00011800C80004B0ull) + (((offset) &amp; 1) + ((block_id) &amp; 3) * 0x40000ull) * 64)</div><div class='add'>+#define CVMX_SRIOX_OMSG_FMP_MRX(offset, block_id) (CVMX_ADD_IO_SEG(0x00011800C8000498ull) + (((offset) &amp; 1) + ((block_id) &amp; 3) * 0x40000ull) * 64)</div><div class='add'>+#define CVMX_SRIOX_OMSG_NMP_MRX(offset, block_id) (CVMX_ADD_IO_SEG(0x00011800C80004A0ull) + (((offset) &amp; 1) + ((block_id) &amp; 3) * 0x40000ull) * 64)</div><div class='add'>+#define CVMX_SRIOX_OMSG_PORTX(offset, block_id) (CVMX_ADD_IO_SEG(0x00011800C8000480ull) + (((offset) &amp; 1) + ((block_id) &amp; 3) * 0x40000ull) * 64)</div><div class='add'>+#define CVMX_SRIOX_OMSG_SILO_THR(block_id) (CVMX_ADD_IO_SEG(0x00011800C80004F8ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_OMSG_SP_MRX(offset, block_id) (CVMX_ADD_IO_SEG(0x00011800C8000490ull) + (((offset) &amp; 1) + ((block_id) &amp; 3) * 0x40000ull) * 64)</div><div class='add'>+#define CVMX_SRIOX_PRIOX_IN_USE(offset, block_id) (CVMX_ADD_IO_SEG(0x00011800C80003C0ull) + (((offset) &amp; 3) + ((block_id) &amp; 3) * 0x200000ull) * 8)</div><div class='add'>+#define CVMX_SRIOX_RX_BELL(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000308ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_RX_BELL_SEQ(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000300ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_RX_STATUS(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000380ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_S2M_TYPEX(offset, block_id) (CVMX_ADD_IO_SEG(0x00011800C8000180ull) + (((offset) &amp; 15) + ((block_id) &amp; 3) * 0x200000ull) * 8)</div><div class='add'>+#define CVMX_SRIOX_SEQ(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000278ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_STATUS_REG(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000100ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_TAG_CTRL(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000178ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_TLP_CREDITS(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000150ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_TX_BELL(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000280ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_TX_BELL_INFO(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000288ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_TX_CTRL(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000170ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_TX_EMPHASIS(block_id) (CVMX_ADD_IO_SEG(0x00011800C80003F0ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_TX_STATUS(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000388ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+#define CVMX_SRIOX_WR_DONE_COUNTS(block_id) (CVMX_ADD_IO_SEG(0x00011800C8000340ull) + ((block_id) &amp; 3) * 0x1000000ull)</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_acc_ctrl {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_acc_ctrl_s {</div><div class='add'>+		uint64_t reserved_7_63:57;</div><div class='add'>+		uint64_t deny_adr2:1;</div><div class='add'>+		uint64_t deny_adr1:1;</div><div class='add'>+		uint64_t deny_adr0:1;</div><div class='add'>+		uint64_t reserved_3_3:1;</div><div class='add'>+		uint64_t deny_bar2:1;</div><div class='add'>+		uint64_t deny_bar1:1;</div><div class='add'>+		uint64_t deny_bar0:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_acc_ctrl_cn63xx {</div><div class='add'>+		uint64_t reserved_3_63:61;</div><div class='add'>+		uint64_t deny_bar2:1;</div><div class='add'>+		uint64_t deny_bar1:1;</div><div class='add'>+		uint64_t deny_bar0:1;</div><div class='add'>+	} cn63xx;</div><div class='add'>+	struct cvmx_sriox_acc_ctrl_cn63xx cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_acc_ctrl_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_asmbly_id {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_asmbly_id_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t assy_id:16;</div><div class='add'>+		uint64_t assy_ven:16;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_asmbly_id_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_asmbly_id_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_asmbly_id_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_asmbly_info {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_asmbly_info_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t assy_rev:16;</div><div class='add'>+		uint64_t reserved_0_15:16;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_asmbly_info_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_asmbly_info_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_asmbly_info_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_bell_resp_ctrl {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_bell_resp_ctrl_s {</div><div class='add'>+		uint64_t reserved_6_63:58;</div><div class='add'>+		uint64_t rp1_sid:1;</div><div class='add'>+		uint64_t rp0_sid:2;</div><div class='add'>+		uint64_t rp1_pid:1;</div><div class='add'>+		uint64_t rp0_pid:2;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_bell_resp_ctrl_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_bell_resp_ctrl_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_bell_resp_ctrl_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_bist_status {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_bist_status_s {</div><div class='add'>+		uint64_t reserved_45_63:19;</div><div class='add'>+		uint64_t lram:1;</div><div class='add'>+		uint64_t mram:2;</div><div class='add'>+		uint64_t cram:2;</div><div class='add'>+		uint64_t bell:2;</div><div class='add'>+		uint64_t otag:2;</div><div class='add'>+		uint64_t itag:1;</div><div class='add'>+		uint64_t ofree:1;</div><div class='add'>+		uint64_t rtn:2;</div><div class='add'>+		uint64_t obulk:4;</div><div class='add'>+		uint64_t optrs:4;</div><div class='add'>+		uint64_t oarb2:2;</div><div class='add'>+		uint64_t rxbuf2:2;</div><div class='add'>+		uint64_t oarb:2;</div><div class='add'>+		uint64_t ispf:1;</div><div class='add'>+		uint64_t ospf:1;</div><div class='add'>+		uint64_t txbuf:2;</div><div class='add'>+		uint64_t rxbuf:2;</div><div class='add'>+		uint64_t imsg:5;</div><div class='add'>+		uint64_t omsg:7;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_bist_status_cn63xx {</div><div class='add'>+		uint64_t reserved_44_63:20;</div><div class='add'>+		uint64_t mram:2;</div><div class='add'>+		uint64_t cram:2;</div><div class='add'>+		uint64_t bell:2;</div><div class='add'>+		uint64_t otag:2;</div><div class='add'>+		uint64_t itag:1;</div><div class='add'>+		uint64_t ofree:1;</div><div class='add'>+		uint64_t rtn:2;</div><div class='add'>+		uint64_t obulk:4;</div><div class='add'>+		uint64_t optrs:4;</div><div class='add'>+		uint64_t oarb2:2;</div><div class='add'>+		uint64_t rxbuf2:2;</div><div class='add'>+		uint64_t oarb:2;</div><div class='add'>+		uint64_t ispf:1;</div><div class='add'>+		uint64_t ospf:1;</div><div class='add'>+		uint64_t txbuf:2;</div><div class='add'>+		uint64_t rxbuf:2;</div><div class='add'>+		uint64_t imsg:5;</div><div class='add'>+		uint64_t omsg:7;</div><div class='add'>+	} cn63xx;</div><div class='add'>+	struct cvmx_sriox_bist_status_cn63xxp1 {</div><div class='add'>+		uint64_t reserved_44_63:20;</div><div class='add'>+		uint64_t mram:2;</div><div class='add'>+		uint64_t cram:2;</div><div class='add'>+		uint64_t bell:2;</div><div class='add'>+		uint64_t otag:2;</div><div class='add'>+		uint64_t itag:1;</div><div class='add'>+		uint64_t ofree:1;</div><div class='add'>+		uint64_t rtn:2;</div><div class='add'>+		uint64_t obulk:4;</div><div class='add'>+		uint64_t optrs:4;</div><div class='add'>+		uint64_t reserved_20_23:4;</div><div class='add'>+		uint64_t oarb:2;</div><div class='add'>+		uint64_t ispf:1;</div><div class='add'>+		uint64_t ospf:1;</div><div class='add'>+		uint64_t txbuf:2;</div><div class='add'>+		uint64_t rxbuf:2;</div><div class='add'>+		uint64_t imsg:5;</div><div class='add'>+		uint64_t omsg:7;</div><div class='add'>+	} cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_bist_status_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_imsg_ctrl {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_imsg_ctrl_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t to_mode:1;</div><div class='add'>+		uint64_t reserved_30_30:1;</div><div class='add'>+		uint64_t rsp_thr:6;</div><div class='add'>+		uint64_t reserved_22_23:2;</div><div class='add'>+		uint64_t rp1_sid:1;</div><div class='add'>+		uint64_t rp0_sid:2;</div><div class='add'>+		uint64_t rp1_pid:1;</div><div class='add'>+		uint64_t rp0_pid:2;</div><div class='add'>+		uint64_t reserved_15_15:1;</div><div class='add'>+		uint64_t prt_sel:3;</div><div class='add'>+		uint64_t lttr:4;</div><div class='add'>+		uint64_t prio:4;</div><div class='add'>+		uint64_t mbox:4;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_imsg_ctrl_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_imsg_ctrl_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_imsg_ctrl_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_imsg_inst_hdrx {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_imsg_inst_hdrx_s {</div><div class='add'>+		uint64_t r:1;</div><div class='add'>+		uint64_t reserved_58_62:5;</div><div class='add'>+		uint64_t pm:2;</div><div class='add'>+		uint64_t reserved_55_55:1;</div><div class='add'>+		uint64_t sl:7;</div><div class='add'>+		uint64_t reserved_46_47:2;</div><div class='add'>+		uint64_t nqos:1;</div><div class='add'>+		uint64_t ngrp:1;</div><div class='add'>+		uint64_t ntt:1;</div><div class='add'>+		uint64_t ntag:1;</div><div class='add'>+		uint64_t reserved_35_41:7;</div><div class='add'>+		uint64_t rs:1;</div><div class='add'>+		uint64_t tt:2;</div><div class='add'>+		uint64_t tag:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_imsg_inst_hdrx_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_imsg_inst_hdrx_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_imsg_inst_hdrx_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_imsg_qos_grpx {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_imsg_qos_grpx_s {</div><div class='add'>+		uint64_t reserved_63_63:1;</div><div class='add'>+		uint64_t qos7:3;</div><div class='add'>+		uint64_t grp7:4;</div><div class='add'>+		uint64_t reserved_55_55:1;</div><div class='add'>+		uint64_t qos6:3;</div><div class='add'>+		uint64_t grp6:4;</div><div class='add'>+		uint64_t reserved_47_47:1;</div><div class='add'>+		uint64_t qos5:3;</div><div class='add'>+		uint64_t grp5:4;</div><div class='add'>+		uint64_t reserved_39_39:1;</div><div class='add'>+		uint64_t qos4:3;</div><div class='add'>+		uint64_t grp4:4;</div><div class='add'>+		uint64_t reserved_31_31:1;</div><div class='add'>+		uint64_t qos3:3;</div><div class='add'>+		uint64_t grp3:4;</div><div class='add'>+		uint64_t reserved_23_23:1;</div><div class='add'>+		uint64_t qos2:3;</div><div class='add'>+		uint64_t grp2:4;</div><div class='add'>+		uint64_t reserved_15_15:1;</div><div class='add'>+		uint64_t qos1:3;</div><div class='add'>+		uint64_t grp1:4;</div><div class='add'>+		uint64_t reserved_7_7:1;</div><div class='add'>+		uint64_t qos0:3;</div><div class='add'>+		uint64_t grp0:4;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_imsg_qos_grpx_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_imsg_qos_grpx_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_imsg_qos_grpx_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_imsg_statusx {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_imsg_statusx_s {</div><div class='add'>+		uint64_t val1:1;</div><div class='add'>+		uint64_t err1:1;</div><div class='add'>+		uint64_t toe1:1;</div><div class='add'>+		uint64_t toc1:1;</div><div class='add'>+		uint64_t prt1:1;</div><div class='add'>+		uint64_t reserved_58_58:1;</div><div class='add'>+		uint64_t tt1:1;</div><div class='add'>+		uint64_t dis1:1;</div><div class='add'>+		uint64_t seg1:4;</div><div class='add'>+		uint64_t mbox1:2;</div><div class='add'>+		uint64_t lttr1:2;</div><div class='add'>+		uint64_t sid1:16;</div><div class='add'>+		uint64_t val0:1;</div><div class='add'>+		uint64_t err0:1;</div><div class='add'>+		uint64_t toe0:1;</div><div class='add'>+		uint64_t toc0:1;</div><div class='add'>+		uint64_t prt0:1;</div><div class='add'>+		uint64_t reserved_26_26:1;</div><div class='add'>+		uint64_t tt0:1;</div><div class='add'>+		uint64_t dis0:1;</div><div class='add'>+		uint64_t seg0:4;</div><div class='add'>+		uint64_t mbox0:2;</div><div class='add'>+		uint64_t lttr0:2;</div><div class='add'>+		uint64_t sid0:16;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_imsg_statusx_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_imsg_statusx_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_imsg_statusx_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_imsg_vport_thr {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_imsg_vport_thr_s {</div><div class='add'>+		uint64_t reserved_54_63:10;</div><div class='add'>+		uint64_t max_tot:6;</div><div class='add'>+		uint64_t reserved_46_47:2;</div><div class='add'>+		uint64_t max_s1:6;</div><div class='add'>+		uint64_t reserved_38_39:2;</div><div class='add'>+		uint64_t max_s0:6;</div><div class='add'>+		uint64_t sp_vport:1;</div><div class='add'>+		uint64_t reserved_20_30:11;</div><div class='add'>+		uint64_t buf_thr:4;</div><div class='add'>+		uint64_t reserved_14_15:2;</div><div class='add'>+		uint64_t max_p1:6;</div><div class='add'>+		uint64_t reserved_6_7:2;</div><div class='add'>+		uint64_t max_p0:6;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_imsg_vport_thr_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_imsg_vport_thr_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_imsg_vport_thr_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_imsg_vport_thr2 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_imsg_vport_thr2_s {</div><div class='add'>+		uint64_t reserved_46_63:18;</div><div class='add'>+		uint64_t max_s3:6;</div><div class='add'>+		uint64_t reserved_38_39:2;</div><div class='add'>+		uint64_t max_s2:6;</div><div class='add'>+		uint64_t reserved_0_31:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_imsg_vport_thr2_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_int2_enable {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_int2_enable_s {</div><div class='add'>+		uint64_t reserved_1_63:63;</div><div class='add'>+		uint64_t pko_rst:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_int2_enable_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_int2_enable_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_int2_reg {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_int2_reg_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t int_sum:1;</div><div class='add'>+		uint64_t reserved_1_30:30;</div><div class='add'>+		uint64_t pko_rst:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_int2_reg_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_int2_reg_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_int_enable {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_int_enable_s {</div><div class='add'>+		uint64_t reserved_27_63:37;</div><div class='add'>+		uint64_t zero_pkt:1;</div><div class='add'>+		uint64_t ttl_tout:1;</div><div class='add'>+		uint64_t fail:1;</div><div class='add'>+		uint64_t degrade:1;</div><div class='add'>+		uint64_t mac_buf:1;</div><div class='add'>+		uint64_t f_error:1;</div><div class='add'>+		uint64_t rtry_err:1;</div><div class='add'>+		uint64_t pko_err:1;</div><div class='add'>+		uint64_t omsg_err:1;</div><div class='add'>+		uint64_t omsg1:1;</div><div class='add'>+		uint64_t omsg0:1;</div><div class='add'>+		uint64_t link_up:1;</div><div class='add'>+		uint64_t link_dwn:1;</div><div class='add'>+		uint64_t phy_erb:1;</div><div class='add'>+		uint64_t log_erb:1;</div><div class='add'>+		uint64_t soft_rx:1;</div><div class='add'>+		uint64_t soft_tx:1;</div><div class='add'>+		uint64_t mce_rx:1;</div><div class='add'>+		uint64_t mce_tx:1;</div><div class='add'>+		uint64_t wr_done:1;</div><div class='add'>+		uint64_t sli_err:1;</div><div class='add'>+		uint64_t deny_wr:1;</div><div class='add'>+		uint64_t bar_err:1;</div><div class='add'>+		uint64_t maint_op:1;</div><div class='add'>+		uint64_t rxbell:1;</div><div class='add'>+		uint64_t bell_err:1;</div><div class='add'>+		uint64_t txbell:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_int_enable_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_int_enable_cn63xxp1 {</div><div class='add'>+		uint64_t reserved_22_63:42;</div><div class='add'>+		uint64_t f_error:1;</div><div class='add'>+		uint64_t rtry_err:1;</div><div class='add'>+		uint64_t pko_err:1;</div><div class='add'>+		uint64_t omsg_err:1;</div><div class='add'>+		uint64_t omsg1:1;</div><div class='add'>+		uint64_t omsg0:1;</div><div class='add'>+		uint64_t link_up:1;</div><div class='add'>+		uint64_t link_dwn:1;</div><div class='add'>+		uint64_t phy_erb:1;</div><div class='add'>+		uint64_t log_erb:1;</div><div class='add'>+		uint64_t soft_rx:1;</div><div class='add'>+		uint64_t soft_tx:1;</div><div class='add'>+		uint64_t mce_rx:1;</div><div class='add'>+		uint64_t mce_tx:1;</div><div class='add'>+		uint64_t wr_done:1;</div><div class='add'>+		uint64_t sli_err:1;</div><div class='add'>+		uint64_t deny_wr:1;</div><div class='add'>+		uint64_t bar_err:1;</div><div class='add'>+		uint64_t maint_op:1;</div><div class='add'>+		uint64_t rxbell:1;</div><div class='add'>+		uint64_t bell_err:1;</div><div class='add'>+		uint64_t txbell:1;</div><div class='add'>+	} cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_int_enable_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_int_info0 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_int_info0_s {</div><div class='add'>+		uint64_t cmd:4;</div><div class='add'>+		uint64_t type:4;</div><div class='add'>+		uint64_t tag:8;</div><div class='add'>+		uint64_t reserved_42_47:6;</div><div class='add'>+		uint64_t length:10;</div><div class='add'>+		uint64_t status:3;</div><div class='add'>+		uint64_t reserved_16_28:13;</div><div class='add'>+		uint64_t be0:8;</div><div class='add'>+		uint64_t be1:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_int_info0_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_int_info0_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_int_info0_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_int_info1 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_int_info1_s {</div><div class='add'>+		uint64_t info1:64;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_int_info1_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_int_info1_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_int_info1_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_int_info2 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_int_info2_s {</div><div class='add'>+		uint64_t prio:2;</div><div class='add'>+		uint64_t tt:1;</div><div class='add'>+		uint64_t sis:1;</div><div class='add'>+		uint64_t ssize:4;</div><div class='add'>+		uint64_t did:16;</div><div class='add'>+		uint64_t xmbox:4;</div><div class='add'>+		uint64_t mbox:2;</div><div class='add'>+		uint64_t letter:2;</div><div class='add'>+		uint64_t rsrvd:30;</div><div class='add'>+		uint64_t lns:1;</div><div class='add'>+		uint64_t intr:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_int_info2_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_int_info2_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_int_info2_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_int_info3 {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_int_info3_s {</div><div class='add'>+		uint64_t prio:2;</div><div class='add'>+		uint64_t tt:2;</div><div class='add'>+		uint64_t type:4;</div><div class='add'>+		uint64_t other:48;</div><div class='add'>+		uint64_t reserved_0_7:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_int_info3_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_int_info3_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_int_info3_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_int_reg {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_int_reg_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t int2_sum:1;</div><div class='add'>+		uint64_t reserved_27_30:4;</div><div class='add'>+		uint64_t zero_pkt:1;</div><div class='add'>+		uint64_t ttl_tout:1;</div><div class='add'>+		uint64_t fail:1;</div><div class='add'>+		uint64_t degrad:1;</div><div class='add'>+		uint64_t mac_buf:1;</div><div class='add'>+		uint64_t f_error:1;</div><div class='add'>+		uint64_t rtry_err:1;</div><div class='add'>+		uint64_t pko_err:1;</div><div class='add'>+		uint64_t omsg_err:1;</div><div class='add'>+		uint64_t omsg1:1;</div><div class='add'>+		uint64_t omsg0:1;</div><div class='add'>+		uint64_t link_up:1;</div><div class='add'>+		uint64_t link_dwn:1;</div><div class='add'>+		uint64_t phy_erb:1;</div><div class='add'>+		uint64_t log_erb:1;</div><div class='add'>+		uint64_t soft_rx:1;</div><div class='add'>+		uint64_t soft_tx:1;</div><div class='add'>+		uint64_t mce_rx:1;</div><div class='add'>+		uint64_t mce_tx:1;</div><div class='add'>+		uint64_t wr_done:1;</div><div class='add'>+		uint64_t sli_err:1;</div><div class='add'>+		uint64_t deny_wr:1;</div><div class='add'>+		uint64_t bar_err:1;</div><div class='add'>+		uint64_t maint_op:1;</div><div class='add'>+		uint64_t rxbell:1;</div><div class='add'>+		uint64_t bell_err:1;</div><div class='add'>+		uint64_t txbell:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_int_reg_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_int_reg_cn63xxp1 {</div><div class='add'>+		uint64_t reserved_22_63:42;</div><div class='add'>+		uint64_t f_error:1;</div><div class='add'>+		uint64_t rtry_err:1;</div><div class='add'>+		uint64_t pko_err:1;</div><div class='add'>+		uint64_t omsg_err:1;</div><div class='add'>+		uint64_t omsg1:1;</div><div class='add'>+		uint64_t omsg0:1;</div><div class='add'>+		uint64_t link_up:1;</div><div class='add'>+		uint64_t link_dwn:1;</div><div class='add'>+		uint64_t phy_erb:1;</div><div class='add'>+		uint64_t log_erb:1;</div><div class='add'>+		uint64_t soft_rx:1;</div><div class='add'>+		uint64_t soft_tx:1;</div><div class='add'>+		uint64_t mce_rx:1;</div><div class='add'>+		uint64_t mce_tx:1;</div><div class='add'>+		uint64_t wr_done:1;</div><div class='add'>+		uint64_t sli_err:1;</div><div class='add'>+		uint64_t deny_wr:1;</div><div class='add'>+		uint64_t bar_err:1;</div><div class='add'>+		uint64_t maint_op:1;</div><div class='add'>+		uint64_t rxbell:1;</div><div class='add'>+		uint64_t bell_err:1;</div><div class='add'>+		uint64_t txbell:1;</div><div class='add'>+	} cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_int_reg_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_ip_feature {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_ip_feature_s {</div><div class='add'>+		uint64_t ops:32;</div><div class='add'>+		uint64_t reserved_15_31:17;</div><div class='add'>+		uint64_t no_vmin:1;</div><div class='add'>+		uint64_t a66:1;</div><div class='add'>+		uint64_t a50:1;</div><div class='add'>+		uint64_t reserved_11_11:1;</div><div class='add'>+		uint64_t tx_flow:1;</div><div class='add'>+		uint64_t pt_width:2;</div><div class='add'>+		uint64_t tx_pol:4;</div><div class='add'>+		uint64_t rx_pol:4;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_ip_feature_cn63xx {</div><div class='add'>+		uint64_t ops:32;</div><div class='add'>+		uint64_t reserved_14_31:18;</div><div class='add'>+		uint64_t a66:1;</div><div class='add'>+		uint64_t a50:1;</div><div class='add'>+		uint64_t reserved_11_11:1;</div><div class='add'>+		uint64_t tx_flow:1;</div><div class='add'>+		uint64_t pt_width:2;</div><div class='add'>+		uint64_t tx_pol:4;</div><div class='add'>+		uint64_t rx_pol:4;</div><div class='add'>+	} cn63xx;</div><div class='add'>+	struct cvmx_sriox_ip_feature_cn63xx cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_ip_feature_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_mac_buffers {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_mac_buffers_s {</div><div class='add'>+		uint64_t reserved_56_63:8;</div><div class='add'>+		uint64_t tx_enb:8;</div><div class='add'>+		uint64_t reserved_44_47:4;</div><div class='add'>+		uint64_t tx_inuse:4;</div><div class='add'>+		uint64_t tx_stat:8;</div><div class='add'>+		uint64_t reserved_24_31:8;</div><div class='add'>+		uint64_t rx_enb:8;</div><div class='add'>+		uint64_t reserved_12_15:4;</div><div class='add'>+		uint64_t rx_inuse:4;</div><div class='add'>+		uint64_t rx_stat:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_mac_buffers_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_mac_buffers_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_maint_op {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_maint_op_s {</div><div class='add'>+		uint64_t wr_data:32;</div><div class='add'>+		uint64_t reserved_27_31:5;</div><div class='add'>+		uint64_t fail:1;</div><div class='add'>+		uint64_t pending:1;</div><div class='add'>+		uint64_t op:1;</div><div class='add'>+		uint64_t addr:24;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_maint_op_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_maint_op_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_maint_op_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_maint_rd_data {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_maint_rd_data_s {</div><div class='add'>+		uint64_t reserved_33_63:31;</div><div class='add'>+		uint64_t valid:1;</div><div class='add'>+		uint64_t rd_data:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_maint_rd_data_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_maint_rd_data_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_maint_rd_data_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_mce_tx_ctl {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_mce_tx_ctl_s {</div><div class='add'>+		uint64_t reserved_1_63:63;</div><div class='add'>+		uint64_t mce:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_mce_tx_ctl_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_mce_tx_ctl_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_mce_tx_ctl_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_mem_op_ctrl {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_mem_op_ctrl_s {</div><div class='add'>+		uint64_t reserved_10_63:54;</div><div class='add'>+		uint64_t rr_ro:1;</div><div class='add'>+		uint64_t w_ro:1;</div><div class='add'>+		uint64_t reserved_6_7:2;</div><div class='add'>+		uint64_t rp1_sid:1;</div><div class='add'>+		uint64_t rp0_sid:2;</div><div class='add'>+		uint64_t rp1_pid:1;</div><div class='add'>+		uint64_t rp0_pid:2;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_mem_op_ctrl_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_mem_op_ctrl_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_mem_op_ctrl_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_omsg_ctrlx {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_omsg_ctrlx_s {</div><div class='add'>+		uint64_t testmode:1;</div><div class='add'>+		uint64_t reserved_37_62:26;</div><div class='add'>+		uint64_t silo_max:5;</div><div class='add'>+		uint64_t rtry_thr:16;</div><div class='add'>+		uint64_t rtry_en:1;</div><div class='add'>+		uint64_t reserved_11_14:4;</div><div class='add'>+		uint64_t idm_tt:1;</div><div class='add'>+		uint64_t idm_sis:1;</div><div class='add'>+		uint64_t idm_did:1;</div><div class='add'>+		uint64_t lttr_sp:4;</div><div class='add'>+		uint64_t lttr_mp:4;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_omsg_ctrlx_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_omsg_ctrlx_cn63xxp1 {</div><div class='add'>+		uint64_t testmode:1;</div><div class='add'>+		uint64_t reserved_32_62:31;</div><div class='add'>+		uint64_t rtry_thr:16;</div><div class='add'>+		uint64_t rtry_en:1;</div><div class='add'>+		uint64_t reserved_11_14:4;</div><div class='add'>+		uint64_t idm_tt:1;</div><div class='add'>+		uint64_t idm_sis:1;</div><div class='add'>+		uint64_t idm_did:1;</div><div class='add'>+		uint64_t lttr_sp:4;</div><div class='add'>+		uint64_t lttr_mp:4;</div><div class='add'>+	} cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_omsg_ctrlx_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_omsg_done_countsx {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_omsg_done_countsx_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t bad:16;</div><div class='add'>+		uint64_t good:16;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_omsg_done_countsx_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_omsg_done_countsx_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_omsg_fmp_mrx {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_omsg_fmp_mrx_s {</div><div class='add'>+		uint64_t reserved_15_63:49;</div><div class='add'>+		uint64_t ctlr_sp:1;</div><div class='add'>+		uint64_t ctlr_fmp:1;</div><div class='add'>+		uint64_t ctlr_nmp:1;</div><div class='add'>+		uint64_t id_sp:1;</div><div class='add'>+		uint64_t id_fmp:1;</div><div class='add'>+		uint64_t id_nmp:1;</div><div class='add'>+		uint64_t id_psd:1;</div><div class='add'>+		uint64_t mbox_sp:1;</div><div class='add'>+		uint64_t mbox_fmp:1;</div><div class='add'>+		uint64_t mbox_nmp:1;</div><div class='add'>+		uint64_t mbox_psd:1;</div><div class='add'>+		uint64_t all_sp:1;</div><div class='add'>+		uint64_t all_fmp:1;</div><div class='add'>+		uint64_t all_nmp:1;</div><div class='add'>+		uint64_t all_psd:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_omsg_fmp_mrx_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_omsg_fmp_mrx_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_omsg_fmp_mrx_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_omsg_nmp_mrx {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_omsg_nmp_mrx_s {</div><div class='add'>+		uint64_t reserved_15_63:49;</div><div class='add'>+		uint64_t ctlr_sp:1;</div><div class='add'>+		uint64_t ctlr_fmp:1;</div><div class='add'>+		uint64_t ctlr_nmp:1;</div><div class='add'>+		uint64_t id_sp:1;</div><div class='add'>+		uint64_t id_fmp:1;</div><div class='add'>+		uint64_t id_nmp:1;</div><div class='add'>+		uint64_t reserved_8_8:1;</div><div class='add'>+		uint64_t mbox_sp:1;</div><div class='add'>+		uint64_t mbox_fmp:1;</div><div class='add'>+		uint64_t mbox_nmp:1;</div><div class='add'>+		uint64_t reserved_4_4:1;</div><div class='add'>+		uint64_t all_sp:1;</div><div class='add'>+		uint64_t all_fmp:1;</div><div class='add'>+		uint64_t all_nmp:1;</div><div class='add'>+		uint64_t reserved_0_0:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_omsg_nmp_mrx_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_omsg_nmp_mrx_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_omsg_nmp_mrx_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_omsg_portx {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_omsg_portx_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t enable:1;</div><div class='add'>+		uint64_t reserved_3_30:28;</div><div class='add'>+		uint64_t port:3;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_omsg_portx_cn63xx {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t enable:1;</div><div class='add'>+		uint64_t reserved_2_30:29;</div><div class='add'>+		uint64_t port:2;</div><div class='add'>+	} cn63xx;</div><div class='add'>+	struct cvmx_sriox_omsg_portx_cn63xx cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_omsg_portx_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_omsg_silo_thr {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_omsg_silo_thr_s {</div><div class='add'>+		uint64_t reserved_5_63:59;</div><div class='add'>+		uint64_t tot_silo:5;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_omsg_silo_thr_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_omsg_silo_thr_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_omsg_sp_mrx {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_omsg_sp_mrx_s {</div><div class='add'>+		uint64_t reserved_16_63:48;</div><div class='add'>+		uint64_t xmbox_sp:1;</div><div class='add'>+		uint64_t ctlr_sp:1;</div><div class='add'>+		uint64_t ctlr_fmp:1;</div><div class='add'>+		uint64_t ctlr_nmp:1;</div><div class='add'>+		uint64_t id_sp:1;</div><div class='add'>+		uint64_t id_fmp:1;</div><div class='add'>+		uint64_t id_nmp:1;</div><div class='add'>+		uint64_t id_psd:1;</div><div class='add'>+		uint64_t mbox_sp:1;</div><div class='add'>+		uint64_t mbox_fmp:1;</div><div class='add'>+		uint64_t mbox_nmp:1;</div><div class='add'>+		uint64_t mbox_psd:1;</div><div class='add'>+		uint64_t all_sp:1;</div><div class='add'>+		uint64_t all_fmp:1;</div><div class='add'>+		uint64_t all_nmp:1;</div><div class='add'>+		uint64_t all_psd:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_omsg_sp_mrx_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_omsg_sp_mrx_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_omsg_sp_mrx_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_priox_in_use {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_priox_in_use_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t end_cnt:16;</div><div class='add'>+		uint64_t start_cnt:16;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_priox_in_use_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_priox_in_use_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_rx_bell {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_rx_bell_s {</div><div class='add'>+		uint64_t reserved_48_63:16;</div><div class='add'>+		uint64_t data:16;</div><div class='add'>+		uint64_t src_id:16;</div><div class='add'>+		uint64_t count:8;</div><div class='add'>+		uint64_t reserved_5_7:3;</div><div class='add'>+		uint64_t dest_id:1;</div><div class='add'>+		uint64_t id16:1;</div><div class='add'>+		uint64_t reserved_2_2:1;</div><div class='add'>+		uint64_t priority:2;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_rx_bell_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_rx_bell_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_rx_bell_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_rx_bell_seq {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_rx_bell_seq_s {</div><div class='add'>+		uint64_t reserved_40_63:24;</div><div class='add'>+		uint64_t count:8;</div><div class='add'>+		uint64_t seq:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_rx_bell_seq_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_rx_bell_seq_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_rx_bell_seq_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_rx_status {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_rx_status_s {</div><div class='add'>+		uint64_t rtn_pr3:8;</div><div class='add'>+		uint64_t rtn_pr2:8;</div><div class='add'>+		uint64_t rtn_pr1:8;</div><div class='add'>+		uint64_t reserved_28_39:12;</div><div class='add'>+		uint64_t mbox:4;</div><div class='add'>+		uint64_t comp:8;</div><div class='add'>+		uint64_t reserved_13_15:3;</div><div class='add'>+		uint64_t n_post:5;</div><div class='add'>+		uint64_t post:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_rx_status_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_rx_status_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_rx_status_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_s2m_typex {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_s2m_typex_s {</div><div class='add'>+		uint64_t reserved_19_63:45;</div><div class='add'>+		uint64_t wr_op:3;</div><div class='add'>+		uint64_t reserved_15_15:1;</div><div class='add'>+		uint64_t rd_op:3;</div><div class='add'>+		uint64_t wr_prior:2;</div><div class='add'>+		uint64_t rd_prior:2;</div><div class='add'>+		uint64_t reserved_6_7:2;</div><div class='add'>+		uint64_t src_id:1;</div><div class='add'>+		uint64_t id16:1;</div><div class='add'>+		uint64_t reserved_2_3:2;</div><div class='add'>+		uint64_t iaow_sel:2;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_s2m_typex_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_s2m_typex_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_s2m_typex_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_seq {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_seq_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t seq:32;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_seq_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_seq_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_seq_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_status_reg {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_status_reg_s {</div><div class='add'>+		uint64_t reserved_2_63:62;</div><div class='add'>+		uint64_t access:1;</div><div class='add'>+		uint64_t srio:1;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_status_reg_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_status_reg_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_status_reg_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_tag_ctrl {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_tag_ctrl_s {</div><div class='add'>+		uint64_t reserved_17_63:47;</div><div class='add'>+		uint64_t o_clr:1;</div><div class='add'>+		uint64_t reserved_13_15:3;</div><div class='add'>+		uint64_t otag:5;</div><div class='add'>+		uint64_t reserved_5_7:3;</div><div class='add'>+		uint64_t itag:5;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_tag_ctrl_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_tag_ctrl_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_tag_ctrl_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_tlp_credits {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_tlp_credits_s {</div><div class='add'>+		uint64_t reserved_28_63:36;</div><div class='add'>+		uint64_t mbox:4;</div><div class='add'>+		uint64_t comp:8;</div><div class='add'>+		uint64_t reserved_13_15:3;</div><div class='add'>+		uint64_t n_post:5;</div><div class='add'>+		uint64_t post:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_tlp_credits_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_tlp_credits_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_tlp_credits_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_tx_bell {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_tx_bell_s {</div><div class='add'>+		uint64_t reserved_48_63:16;</div><div class='add'>+		uint64_t data:16;</div><div class='add'>+		uint64_t dest_id:16;</div><div class='add'>+		uint64_t reserved_9_15:7;</div><div class='add'>+		uint64_t pending:1;</div><div class='add'>+		uint64_t reserved_5_7:3;</div><div class='add'>+		uint64_t src_id:1;</div><div class='add'>+		uint64_t id16:1;</div><div class='add'>+		uint64_t reserved_2_2:1;</div><div class='add'>+		uint64_t priority:2;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_tx_bell_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_tx_bell_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_tx_bell_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_tx_bell_info {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_tx_bell_info_s {</div><div class='add'>+		uint64_t reserved_48_63:16;</div><div class='add'>+		uint64_t data:16;</div><div class='add'>+		uint64_t dest_id:16;</div><div class='add'>+		uint64_t reserved_8_15:8;</div><div class='add'>+		uint64_t timeout:1;</div><div class='add'>+		uint64_t error:1;</div><div class='add'>+		uint64_t retry:1;</div><div class='add'>+		uint64_t src_id:1;</div><div class='add'>+		uint64_t id16:1;</div><div class='add'>+		uint64_t reserved_2_2:1;</div><div class='add'>+		uint64_t priority:2;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_tx_bell_info_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_tx_bell_info_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_tx_bell_info_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_tx_ctrl {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_tx_ctrl_s {</div><div class='add'>+		uint64_t reserved_53_63:11;</div><div class='add'>+		uint64_t tag_th2:5;</div><div class='add'>+		uint64_t reserved_45_47:3;</div><div class='add'>+		uint64_t tag_th1:5;</div><div class='add'>+		uint64_t reserved_37_39:3;</div><div class='add'>+		uint64_t tag_th0:5;</div><div class='add'>+		uint64_t reserved_20_31:12;</div><div class='add'>+		uint64_t tx_th2:4;</div><div class='add'>+		uint64_t reserved_12_15:4;</div><div class='add'>+		uint64_t tx_th1:4;</div><div class='add'>+		uint64_t reserved_4_7:4;</div><div class='add'>+		uint64_t tx_th0:4;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_tx_ctrl_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_tx_ctrl_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_tx_ctrl_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_tx_emphasis {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_tx_emphasis_s {</div><div class='add'>+		uint64_t reserved_4_63:60;</div><div class='add'>+		uint64_t emph:4;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_tx_emphasis_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_tx_emphasis_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_tx_status {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_tx_status_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t s2m_pr3:8;</div><div class='add'>+		uint64_t s2m_pr2:8;</div><div class='add'>+		uint64_t s2m_pr1:8;</div><div class='add'>+		uint64_t s2m_pr0:8;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_tx_status_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_tx_status_s cn63xxp1;</div><div class='add'>+	struct cvmx_sriox_tx_status_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cvmx_sriox_wr_done_counts {</div><div class='add'>+	uint64_t u64;</div><div class='add'>+	struct cvmx_sriox_wr_done_counts_s {</div><div class='add'>+		uint64_t reserved_32_63:32;</div><div class='add'>+		uint64_t bad:16;</div><div class='add'>+		uint64_t good:16;</div><div class='add'>+	} s;</div><div class='add'>+	struct cvmx_sriox_wr_done_counts_s cn63xx;</div><div class='add'>+	struct cvmx_sriox_wr_done_counts_s cn66xx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-srxx-defs.h b/arch/mips/include/asm/octeon/cvmx-srxx-defs.h<br/>index d82b366c279f..d82b366c279f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-srxx-defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-srxx-defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-srxx-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-srxx-defs.h</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-stxx-defs.h b/arch/mips/include/asm/octeon/cvmx-stxx-defs.h<br/>index 4f209b62cae1..4f209b62cae1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-stxx-defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-stxx-defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-stxx-defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-stxx-defs.h</a></div><div class='head'>diff --git a/drivers/staging/octeon/cvmx-wqe.h b/arch/mips/include/asm/octeon/cvmx-wqe.h<br/>index 653610953d28..653610953d28 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/octeon/cvmx-wqe.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/octeon/cvmx-wqe.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx-wqe.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx-wqe.h</a></div><div class='head'>diff --git a/arch/mips/include/asm/octeon/cvmx.h b/arch/mips/include/asm/octeon/cvmx.h<br/>index 7e1286706d46..740be97a3251 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/cvmx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/cvmx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/cvmx.h</a></div><div class='hunk'>@@ -31,6 +31,27 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='add'>+enum cvmx_mips_space {</div><div class='add'>+	CVMX_MIPS_SPACE_XKSEG = 3LL,</div><div class='add'>+	CVMX_MIPS_SPACE_XKPHYS = 2LL,</div><div class='add'>+	CVMX_MIPS_SPACE_XSSEG = 1LL,</div><div class='add'>+	CVMX_MIPS_SPACE_XUSEG = 0LL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* These macros for use when using 32 bit pointers. */</div><div class='add'>+#define CVMX_MIPS32_SPACE_KSEG0 1l</div><div class='add'>+#define CVMX_ADD_SEG32(segment, add) \</div><div class='add'>+	(((int32_t)segment &lt;&lt; 31) | (int32_t)(add))</div><div class='add'>+</div><div class='add'>+#define CVMX_IO_SEG CVMX_MIPS_SPACE_XKPHYS</div><div class='add'>+</div><div class='add'>+/* These macros simplify the process of creating common IO addresses */</div><div class='add'>+#define CVMX_ADD_SEG(segment, add) \</div><div class='add'>+	((((uint64_t)segment) &lt;&lt; 62) | (add))</div><div class='add'>+#ifndef CVMX_ADD_IO_SEG</div><div class='add'>+#define CVMX_ADD_IO_SEG(add) CVMX_ADD_SEG(CVMX_IO_SEG, (add))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #include "cvmx-asm.h"</div><div class='ctx'> #include "cvmx-packet.h"</div><div class='ctx'> #include "cvmx-sysinfo.h"</div><div class='hunk'>@@ -129,27 +150,6 @@ static inline uint64_t cvmx_build_bits(uint64_t high_bit,</div><div class='ctx'> 	return (value &amp; cvmx_build_mask(high_bit - low_bit + 1)) &lt;&lt; low_bit;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-enum cvmx_mips_space {</div><div class='del'>-	CVMX_MIPS_SPACE_XKSEG = 3LL,</div><div class='del'>-	CVMX_MIPS_SPACE_XKPHYS = 2LL,</div><div class='del'>-	CVMX_MIPS_SPACE_XSSEG = 1LL,</div><div class='del'>-	CVMX_MIPS_SPACE_XUSEG = 0LL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* These macros for use when using 32 bit pointers. */</div><div class='del'>-#define CVMX_MIPS32_SPACE_KSEG0 1l</div><div class='del'>-#define CVMX_ADD_SEG32(segment, add) \</div><div class='del'>-	(((int32_t)segment &lt;&lt; 31) | (int32_t)(add))</div><div class='del'>-</div><div class='del'>-#define CVMX_IO_SEG CVMX_MIPS_SPACE_XKPHYS</div><div class='del'>-</div><div class='del'>-/* These macros simplify the process of creating common IO addresses */</div><div class='del'>-#define CVMX_ADD_SEG(segment, add) \</div><div class='del'>-	((((uint64_t)segment) &lt;&lt; 62) | (add))</div><div class='del'>-#ifndef CVMX_ADD_IO_SEG</div><div class='del'>-#define CVMX_ADD_IO_SEG(add) CVMX_ADD_SEG(CVMX_IO_SEG, (add))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * Convert a memory pointer (void*) into a hardware compatible</div><div class='ctx'>  * memory address (uint64_t). Octeon hardware widgets don't</div><div class='head'>diff --git a/arch/mips/include/asm/octeon/octeon-feature.h b/arch/mips/include/asm/octeon/octeon-feature.h<br/>index cba6fbed9f43..8008da2f8779 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/octeon-feature.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/octeon-feature.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/octeon-feature.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/octeon-feature.h</a></div><div class='hunk'>@@ -31,8 +31,14 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __OCTEON_FEATURE_H__</div><div class='ctx'> #define __OCTEON_FEATURE_H__</div><div class='add'>+#include &lt;asm/octeon/cvmx-mio-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-rnm-defs.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum octeon_feature {</div><div class='add'>+        /* CN68XX uses port kinds for packet interface */</div><div class='add'>+	OCTEON_FEATURE_PKND,</div><div class='add'>+	/* CN68XX has different fields in word0 - word2 */</div><div class='add'>+	OCTEON_FEATURE_CN68XX_WQE,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Octeon models in the CN5XXX family and higher support</div><div class='ctx'> 	 * atomic add instructions to memory (saa/saad).</div><div class='hunk'>@@ -42,8 +48,13 @@ enum octeon_feature {</div><div class='ctx'> 	OCTEON_FEATURE_ZIP,</div><div class='ctx'> 	/* Does this Octeon support crypto acceleration using COP2? */</div><div class='ctx'> 	OCTEON_FEATURE_CRYPTO,</div><div class='add'>+	OCTEON_FEATURE_DORM_CRYPTO,</div><div class='ctx'> 	/* Does this Octeon support PCI express? */</div><div class='ctx'> 	OCTEON_FEATURE_PCIE,</div><div class='add'>+        /* Does this Octeon support SRIOs */</div><div class='add'>+	OCTEON_FEATURE_SRIO,</div><div class='add'>+	/*  Does this Octeon support Interlaken */</div><div class='add'>+	OCTEON_FEATURE_ILK,</div><div class='ctx'> 	/* Some Octeon models support internal memory for storing</div><div class='ctx'> 	 * cryptographic keys */</div><div class='ctx'> 	OCTEON_FEATURE_KEY_MEMORY,</div><div class='hunk'>@@ -64,6 +75,15 @@ enum octeon_feature {</div><div class='ctx'> 	/* Octeon MDIO block supports clause 45 transactions for 10</div><div class='ctx'> 	 * Gig support */</div><div class='ctx'> 	OCTEON_FEATURE_MDIO_CLAUSE_45,</div><div class='add'>+        /*</div><div class='add'>+	 *  CN52XX and CN56XX used a block named NPEI for PCIe</div><div class='add'>+	 *  access. Newer chips replaced this with SLI+DPI.</div><div class='add'>+	 */</div><div class='add'>+	OCTEON_FEATURE_NPEI,</div><div class='add'>+	OCTEON_FEATURE_HFA,</div><div class='add'>+	OCTEON_FEATURE_DFM,</div><div class='add'>+	OCTEON_FEATURE_CIU2,</div><div class='add'>+	OCTEON_MAX_FEATURE</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline int cvmx_fuse_read(int fuse);</div><div class='hunk'>@@ -96,30 +116,78 @@ static inline int octeon_has_feature(enum octeon_feature feature)</div><div class='ctx'> 			return !cvmx_fuse_read(121);</div><div class='ctx'> </div><div class='ctx'> 	case OCTEON_FEATURE_CRYPTO:</div><div class='del'>-		return !cvmx_fuse_read(90);</div><div class='add'>+		if (OCTEON_IS_MODEL(OCTEON_CN6XXX)) {</div><div class='add'>+			union cvmx_mio_fus_dat2 fus_2;</div><div class='add'>+			fus_2.u64 = cvmx_read_csr(CVMX_MIO_FUS_DAT2);</div><div class='add'>+			if (fus_2.s.nocrypto || fus_2.s.nomul) {</div><div class='add'>+				return 0;</div><div class='add'>+			} else if (!fus_2.s.dorm_crypto) {</div><div class='add'>+				return 1;</div><div class='add'>+			} else {</div><div class='add'>+				union cvmx_rnm_ctl_status st;</div><div class='add'>+				st.u64 = cvmx_read_csr(CVMX_RNM_CTL_STATUS);</div><div class='add'>+				return st.s.eer_val;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			return !cvmx_fuse_read(90);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case OCTEON_FEATURE_DORM_CRYPTO:</div><div class='add'>+		if (OCTEON_IS_MODEL(OCTEON_CN6XXX)) {</div><div class='add'>+			union cvmx_mio_fus_dat2 fus_2;</div><div class='add'>+			fus_2.u64 = cvmx_read_csr(CVMX_MIO_FUS_DAT2);</div><div class='add'>+			return !fus_2.s.nocrypto &amp;&amp; !fus_2.s.nomul &amp;&amp; fus_2.s.dorm_crypto;</div><div class='add'>+		} else {</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 	case OCTEON_FEATURE_PCIE:</div><div class='del'>-	case OCTEON_FEATURE_MGMT_PORT:</div><div class='del'>-	case OCTEON_FEATURE_RAID:</div><div class='ctx'> 		return OCTEON_IS_MODEL(OCTEON_CN56XX)</div><div class='del'>-			|| OCTEON_IS_MODEL(OCTEON_CN52XX);</div><div class='add'>+			|| OCTEON_IS_MODEL(OCTEON_CN52XX)</div><div class='add'>+			|| OCTEON_IS_MODEL(OCTEON_CN6XXX);</div><div class='add'>+</div><div class='add'>+	case OCTEON_FEATURE_SRIO:</div><div class='add'>+		return OCTEON_IS_MODEL(OCTEON_CN63XX)</div><div class='add'>+			|| OCTEON_IS_MODEL(OCTEON_CN66XX);</div><div class='add'>+</div><div class='add'>+	case OCTEON_FEATURE_ILK:</div><div class='add'>+		return (OCTEON_IS_MODEL(OCTEON_CN68XX));</div><div class='ctx'> </div><div class='ctx'> 	case OCTEON_FEATURE_KEY_MEMORY:</div><div class='add'>+		return OCTEON_IS_MODEL(OCTEON_CN38XX)</div><div class='add'>+			|| OCTEON_IS_MODEL(OCTEON_CN58XX)</div><div class='add'>+			|| OCTEON_IS_MODEL(OCTEON_CN56XX)</div><div class='add'>+			|| OCTEON_IS_MODEL(OCTEON_CN6XXX);</div><div class='add'>+</div><div class='ctx'> 	case OCTEON_FEATURE_LED_CONTROLLER:</div><div class='ctx'> 		return OCTEON_IS_MODEL(OCTEON_CN38XX)</div><div class='ctx'> 			|| OCTEON_IS_MODEL(OCTEON_CN58XX)</div><div class='ctx'> 			|| OCTEON_IS_MODEL(OCTEON_CN56XX);</div><div class='add'>+</div><div class='ctx'> 	case OCTEON_FEATURE_TRA:</div><div class='ctx'> 		return !(OCTEON_IS_MODEL(OCTEON_CN30XX)</div><div class='ctx'> 			 || OCTEON_IS_MODEL(OCTEON_CN50XX));</div><div class='add'>+	case OCTEON_FEATURE_MGMT_PORT:</div><div class='add'>+		return OCTEON_IS_MODEL(OCTEON_CN56XX)</div><div class='add'>+			|| OCTEON_IS_MODEL(OCTEON_CN52XX)</div><div class='add'>+			|| OCTEON_IS_MODEL(OCTEON_CN6XXX);</div><div class='add'>+</div><div class='add'>+	case OCTEON_FEATURE_RAID:</div><div class='add'>+		return OCTEON_IS_MODEL(OCTEON_CN56XX)</div><div class='add'>+			|| OCTEON_IS_MODEL(OCTEON_CN52XX)</div><div class='add'>+			|| OCTEON_IS_MODEL(OCTEON_CN6XXX);</div><div class='add'>+</div><div class='ctx'> 	case OCTEON_FEATURE_USB:</div><div class='ctx'> 		return !(OCTEON_IS_MODEL(OCTEON_CN38XX)</div><div class='ctx'> 			 || OCTEON_IS_MODEL(OCTEON_CN58XX));</div><div class='add'>+</div><div class='ctx'> 	case OCTEON_FEATURE_NO_WPTR:</div><div class='ctx'> 		return (OCTEON_IS_MODEL(OCTEON_CN56XX)</div><div class='del'>-			 || OCTEON_IS_MODEL(OCTEON_CN52XX))</div><div class='del'>-			&amp;&amp; !OCTEON_IS_MODEL(OCTEON_CN56XX_PASS1_X)</div><div class='del'>-			&amp;&amp; !OCTEON_IS_MODEL(OCTEON_CN52XX_PASS1_X);</div><div class='add'>+			|| OCTEON_IS_MODEL(OCTEON_CN52XX)</div><div class='add'>+			|| OCTEON_IS_MODEL(OCTEON_CN6XXX))</div><div class='add'>+			  &amp;&amp; !OCTEON_IS_MODEL(OCTEON_CN56XX_PASS1_X)</div><div class='add'>+			  &amp;&amp; !OCTEON_IS_MODEL(OCTEON_CN52XX_PASS1_X);</div><div class='add'>+</div><div class='ctx'> 	case OCTEON_FEATURE_DFA:</div><div class='ctx'> 		if (!OCTEON_IS_MODEL(OCTEON_CN38XX)</div><div class='ctx'> 		    &amp;&amp; !OCTEON_IS_MODEL(OCTEON_CN31XX)</div><div class='hunk'>@@ -127,14 +195,42 @@ static inline int octeon_has_feature(enum octeon_feature feature)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		else if (OCTEON_IS_MODEL(OCTEON_CN3020))</div><div class='ctx'> 			return 0;</div><div class='del'>-		else if (OCTEON_IS_MODEL(OCTEON_CN38XX_PASS1))</div><div class='del'>-			return 1;</div><div class='ctx'> 		else</div><div class='ctx'> 			return !cvmx_fuse_read(120);</div><div class='add'>+</div><div class='add'>+	case OCTEON_FEATURE_HFA:</div><div class='add'>+		if (!OCTEON_IS_MODEL(OCTEON_CN6XXX))</div><div class='add'>+			return 0;</div><div class='add'>+		else</div><div class='add'>+			return !cvmx_fuse_read(90);</div><div class='add'>+</div><div class='add'>+	case OCTEON_FEATURE_DFM:</div><div class='add'>+		if (!(OCTEON_IS_MODEL(OCTEON_CN63XX)</div><div class='add'>+		      || OCTEON_IS_MODEL(OCTEON_CN66XX)))</div><div class='add'>+			return 0;</div><div class='add'>+		else</div><div class='add'>+			return !cvmx_fuse_read(90);</div><div class='add'>+</div><div class='ctx'> 	case OCTEON_FEATURE_MDIO_CLAUSE_45:</div><div class='ctx'> 		return !(OCTEON_IS_MODEL(OCTEON_CN3XXX)</div><div class='ctx'> 			 || OCTEON_IS_MODEL(OCTEON_CN58XX)</div><div class='ctx'> 			 || OCTEON_IS_MODEL(OCTEON_CN50XX));</div><div class='add'>+</div><div class='add'>+	case OCTEON_FEATURE_NPEI:</div><div class='add'>+		return OCTEON_IS_MODEL(OCTEON_CN56XX)</div><div class='add'>+			|| OCTEON_IS_MODEL(OCTEON_CN52XX);</div><div class='add'>+</div><div class='add'>+	case OCTEON_FEATURE_PKND:</div><div class='add'>+		return OCTEON_IS_MODEL(OCTEON_CN68XX);</div><div class='add'>+</div><div class='add'>+	case OCTEON_FEATURE_CN68XX_WQE:</div><div class='add'>+		return OCTEON_IS_MODEL(OCTEON_CN68XX);</div><div class='add'>+</div><div class='add'>+	case OCTEON_FEATURE_CIU2:</div><div class='add'>+		return OCTEON_IS_MODEL(OCTEON_CN68XX);</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/include/asm/octeon/octeon-model.h b/arch/mips/include/asm/octeon/octeon-model.h<br/>index 700f88e31cad..4e338a4d9424 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/octeon-model.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/octeon-model.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/octeon-model.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/octeon-model.h</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>  * Contact: support@caviumnetworks.com</div><div class='ctx'>  * This file is part of the OCTEON SDK</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2003-2008 Cavium Networks</div><div class='add'>+ * Copyright (c) 2003-2010 Cavium Networks</div><div class='ctx'>  *</div><div class='ctx'>  * This file is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License, Version 2, as</div><div class='hunk'>@@ -24,14 +24,6 @@</div><div class='ctx'>  * This file may also be available under a different license from Cavium.</div><div class='ctx'>  * Contact Cavium Networks for more information</div><div class='ctx'>  ***********************license end**************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * File defining different Octeon model IDs and macros to</div><div class='del'>- * compare them.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #ifndef __OCTEON_MODEL_H__</div><div class='ctx'> #define __OCTEON_MODEL_H__</div><div class='ctx'> </div><div class='hunk'>@@ -52,6 +44,8 @@</div><div class='ctx'>  * for internal use only, and may change without notice.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define OCTEON_FAMILY_MASK      0x00ffff00</div><div class='add'>+</div><div class='ctx'> /* Flag bits in top byte */</div><div class='ctx'> /* Ignores revision in model checks */</div><div class='ctx'> #define OM_IGNORE_REVISION        0x01000000</div><div class='hunk'>@@ -63,21 +57,48 @@</div><div class='ctx'> #define OM_IGNORE_MINOR_REVISION  0x08000000</div><div class='ctx'> #define OM_FLAG_MASK              0xff000000</div><div class='ctx'> </div><div class='del'>-#define OM_MATCH_5XXX_FAMILY_MODELS     0x20000000 /* Match all cn5XXX Octeon models. */</div><div class='del'>-#define OM_MATCH_6XXX_FAMILY_MODELS     0x40000000 /* Match all cn6XXX Octeon models. */</div><div class='add'>+/* Match all cn5XXX Octeon models. */</div><div class='add'>+#define OM_MATCH_5XXX_FAMILY_MODELS     0x20000000</div><div class='add'>+/* Match all cn6XXX Octeon models. */</div><div class='add'>+#define OM_MATCH_6XXX_FAMILY_MODELS     0x40000000</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * CN6XXX models with new revision encoding</div><div class='ctx'>  */</div><div class='add'>+#define OCTEON_CN68XX_PASS1_0   0x000d9100</div><div class='add'>+#define OCTEON_CN68XX_PASS1_1   0x000d9101</div><div class='add'>+#define OCTEON_CN68XX_PASS1_2   0x000d9102</div><div class='add'>+#define OCTEON_CN68XX_PASS2_0   0x000d9108</div><div class='add'>+</div><div class='add'>+#define OCTEON_CN68XX           (OCTEON_CN68XX_PASS2_0 | OM_IGNORE_REVISION)</div><div class='add'>+#define OCTEON_CN68XX_PASS1_X   (OCTEON_CN68XX_PASS1_0 | OM_IGNORE_MINOR_REVISION)</div><div class='add'>+#define OCTEON_CN68XX_PASS2_X   (OCTEON_CN68XX_PASS2_0 | OM_IGNORE_MINOR_REVISION)</div><div class='add'>+</div><div class='add'>+#define OCTEON_CN68XX_PASS1	OCTEON_CN68XX_PASS1_X</div><div class='add'>+#define OCTEON_CN68XX_PASS2	OCTEON_CN68XX_PASS2_X</div><div class='add'>+</div><div class='add'>+#define OCTEON_CN66XX_PASS1_0   0x000d9200</div><div class='add'>+#define OCTEON_CN66XX_PASS1_2   0x000d9202</div><div class='add'>+</div><div class='add'>+#define OCTEON_CN66XX           (OCTEON_CN66XX_PASS1_0 | OM_IGNORE_REVISION)</div><div class='add'>+#define OCTEON_CN66XX_PASS1_X   (OCTEON_CN66XX_PASS1_0 | OM_IGNORE_MINOR_REVISION)</div><div class='add'>+</div><div class='ctx'> #define OCTEON_CN63XX_PASS1_0   0x000d9000</div><div class='ctx'> #define OCTEON_CN63XX_PASS1_1   0x000d9001</div><div class='ctx'> #define OCTEON_CN63XX_PASS1_2   0x000d9002</div><div class='ctx'> #define OCTEON_CN63XX_PASS2_0   0x000d9008</div><div class='add'>+#define OCTEON_CN63XX_PASS2_1   0x000d9009</div><div class='add'>+#define OCTEON_CN63XX_PASS2_2   0x000d900a</div><div class='ctx'> </div><div class='ctx'> #define OCTEON_CN63XX           (OCTEON_CN63XX_PASS2_0 | OM_IGNORE_REVISION)</div><div class='ctx'> #define OCTEON_CN63XX_PASS1_X   (OCTEON_CN63XX_PASS1_0 | OM_IGNORE_MINOR_REVISION)</div><div class='ctx'> #define OCTEON_CN63XX_PASS2_X   (OCTEON_CN63XX_PASS2_0 | OM_IGNORE_MINOR_REVISION)</div><div class='ctx'> </div><div class='add'>+#define OCTEON_CN61XX_PASS1_0   0x000d9300</div><div class='add'>+</div><div class='add'>+#define OCTEON_CN61XX           (OCTEON_CN61XX_PASS1_0 | OM_IGNORE_REVISION)</div><div class='add'>+#define OCTEON_CN61XX_PASS1_X   (OCTEON_CN61XX_PASS1_0 | OM_IGNORE_MINOR_REVISION)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * CN5XXX models with new revision encoding</div><div class='ctx'>  */</div><div class='hunk'>@@ -90,10 +111,8 @@</div><div class='ctx'> #define OCTEON_CN58XX_PASS2_3   0x000d030b</div><div class='ctx'> </div><div class='ctx'> #define OCTEON_CN58XX           (OCTEON_CN58XX_PASS1_0 | OM_IGNORE_REVISION)</div><div class='del'>-#define OCTEON_CN58XX_PASS1_X   (OCTEON_CN58XX_PASS1_0 \</div><div class='del'>-				 | OM_IGNORE_MINOR_REVISION)</div><div class='del'>-#define OCTEON_CN58XX_PASS2_X   (OCTEON_CN58XX_PASS2_0 \</div><div class='del'>-				 | OM_IGNORE_MINOR_REVISION)</div><div class='add'>+#define OCTEON_CN58XX_PASS1_X   (OCTEON_CN58XX_PASS1_0 | OM_IGNORE_MINOR_REVISION)</div><div class='add'>+#define OCTEON_CN58XX_PASS2_X   (OCTEON_CN58XX_PASS2_0 | OM_IGNORE_MINOR_REVISION)</div><div class='ctx'> #define OCTEON_CN58XX_PASS1     OCTEON_CN58XX_PASS1_X</div><div class='ctx'> #define OCTEON_CN58XX_PASS2     OCTEON_CN58XX_PASS2_X</div><div class='ctx'> </div><div class='hunk'>@@ -103,10 +122,8 @@</div><div class='ctx'> #define OCTEON_CN56XX_PASS2_1   0x000d0409</div><div class='ctx'> </div><div class='ctx'> #define OCTEON_CN56XX           (OCTEON_CN56XX_PASS2_0 | OM_IGNORE_REVISION)</div><div class='del'>-#define OCTEON_CN56XX_PASS1_X   (OCTEON_CN56XX_PASS1_0 \</div><div class='del'>-				 | OM_IGNORE_MINOR_REVISION)</div><div class='del'>-#define OCTEON_CN56XX_PASS2_X   (OCTEON_CN56XX_PASS2_0 \</div><div class='del'>-				 | OM_IGNORE_MINOR_REVISION)</div><div class='add'>+#define OCTEON_CN56XX_PASS1_X   (OCTEON_CN56XX_PASS1_0 | OM_IGNORE_MINOR_REVISION)</div><div class='add'>+#define OCTEON_CN56XX_PASS2_X   (OCTEON_CN56XX_PASS2_0 | OM_IGNORE_MINOR_REVISION)</div><div class='ctx'> #define OCTEON_CN56XX_PASS1     OCTEON_CN56XX_PASS1_X</div><div class='ctx'> #define OCTEON_CN56XX_PASS2     OCTEON_CN56XX_PASS2_X</div><div class='ctx'> </div><div class='hunk'>@@ -125,8 +142,7 @@</div><div class='ctx'> #define OCTEON_CN50XX_PASS1_0   0x000d0600</div><div class='ctx'> </div><div class='ctx'> #define OCTEON_CN50XX           (OCTEON_CN50XX_PASS1_0 | OM_IGNORE_REVISION)</div><div class='del'>-#define OCTEON_CN50XX_PASS1_X   (OCTEON_CN50XX_PASS1_0 \</div><div class='del'>-				 | OM_IGNORE_MINOR_REVISION)</div><div class='add'>+#define OCTEON_CN50XX_PASS1_X   (OCTEON_CN50XX_PASS1_0 | OM_IGNORE_MINOR_REVISION)</div><div class='ctx'> #define OCTEON_CN50XX_PASS1     OCTEON_CN50XX_PASS1_X</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -138,10 +154,8 @@</div><div class='ctx'> #define OCTEON_CN52XX_PASS2_0   0x000d0708</div><div class='ctx'> </div><div class='ctx'> #define OCTEON_CN52XX           (OCTEON_CN52XX_PASS2_0 | OM_IGNORE_REVISION)</div><div class='del'>-#define OCTEON_CN52XX_PASS1_X   (OCTEON_CN52XX_PASS1_0 \</div><div class='del'>-				 | OM_IGNORE_MINOR_REVISION)</div><div class='del'>-#define OCTEON_CN52XX_PASS2_X   (OCTEON_CN52XX_PASS2_0 \</div><div class='del'>-				 | OM_IGNORE_MINOR_REVISION)</div><div class='add'>+#define OCTEON_CN52XX_PASS1_X   (OCTEON_CN52XX_PASS1_0 | OM_IGNORE_MINOR_REVISION)</div><div class='add'>+#define OCTEON_CN52XX_PASS2_X   (OCTEON_CN52XX_PASS2_0 | OM_IGNORE_MINOR_REVISION)</div><div class='ctx'> #define OCTEON_CN52XX_PASS1     OCTEON_CN52XX_PASS1_X</div><div class='ctx'> #define OCTEON_CN52XX_PASS2     OCTEON_CN52XX_PASS2_X</div><div class='ctx'> </div><div class='hunk'>@@ -174,28 +188,23 @@</div><div class='ctx'> #define OCTEON_CN3005_PASS1     (0x000d0210 | OM_CHECK_SUBMODEL)</div><div class='ctx'> #define OCTEON_CN3005_PASS1_0   (0x000d0210 | OM_CHECK_SUBMODEL)</div><div class='ctx'> #define OCTEON_CN3005_PASS1_1   (0x000d0212 | OM_CHECK_SUBMODEL)</div><div class='del'>-#define OCTEON_CN3005           (OCTEON_CN3005_PASS1 | OM_IGNORE_REVISION \</div><div class='del'>-				 | OM_CHECK_SUBMODEL)</div><div class='add'>+#define OCTEON_CN3005           (OCTEON_CN3005_PASS1 | OM_IGNORE_REVISION | OM_CHECK_SUBMODEL)</div><div class='ctx'> </div><div class='ctx'> #define OCTEON_CN3010_PASS1     (0x000d0200 | OM_CHECK_SUBMODEL)</div><div class='ctx'> #define OCTEON_CN3010_PASS1_0   (0x000d0200 | OM_CHECK_SUBMODEL)</div><div class='ctx'> #define OCTEON_CN3010_PASS1_1   (0x000d0202 | OM_CHECK_SUBMODEL)</div><div class='del'>-#define OCTEON_CN3010           (OCTEON_CN3010_PASS1 | OM_IGNORE_REVISION \</div><div class='del'>-				 | OM_CHECK_SUBMODEL)</div><div class='add'>+#define OCTEON_CN3010           (OCTEON_CN3010_PASS1 | OM_IGNORE_REVISION | OM_CHECK_SUBMODEL)</div><div class='ctx'> </div><div class='ctx'> #define OCTEON_CN3020_PASS1     (0x000d0110 | OM_CHECK_SUBMODEL)</div><div class='ctx'> #define OCTEON_CN3020_PASS1_0   (0x000d0110 | OM_CHECK_SUBMODEL)</div><div class='ctx'> #define OCTEON_CN3020_PASS1_1   (0x000d0112 | OM_CHECK_SUBMODEL)</div><div class='del'>-#define OCTEON_CN3020           (OCTEON_CN3020_PASS1 | OM_IGNORE_REVISION \</div><div class='del'>-				 | OM_CHECK_SUBMODEL)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This matches the complete family of CN3xxx CPUs, and not subsequent models */</div><div class='del'>-#define OCTEON_CN3XXX           (OCTEON_CN58XX_PASS1_0 \</div><div class='del'>-				 | OM_MATCH_PREVIOUS_MODELS \</div><div class='del'>-				 | OM_IGNORE_REVISION)</div><div class='add'>+#define OCTEON_CN3020           (OCTEON_CN3020_PASS1 | OM_IGNORE_REVISION | OM_CHECK_SUBMODEL)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This matches the complete family of CN3xxx CPUs, and not subsequent</div><div class='add'>+ * models</div><div class='add'>+ */</div><div class='add'>+#define OCTEON_CN3XXX           (OCTEON_CN58XX_PASS1_0 | OM_MATCH_PREVIOUS_MODELS | OM_IGNORE_REVISION)</div><div class='ctx'> #define OCTEON_CN5XXX           (OCTEON_CN58XX_PASS1_0 | OM_MATCH_5XXX_FAMILY_MODELS)</div><div class='ctx'> #define OCTEON_CN6XXX           (OCTEON_CN63XX_PASS1_0 | OM_MATCH_6XXX_FAMILY_MODELS)</div><div class='ctx'> </div><div class='hunk'>@@ -221,90 +230,55 @@</div><div class='ctx'> #define OCTEON_38XX_FAMILY_MASK      0x00ffff00</div><div class='ctx'> #define OCTEON_38XX_FAMILY_REV_MASK  0x00ffff0f</div><div class='ctx'> #define OCTEON_38XX_MODEL_MASK       0x00ffff10</div><div class='del'>-#define OCTEON_38XX_MODEL_REV_MASK   (OCTEON_38XX_FAMILY_REV_MASK \</div><div class='del'>-				      | OCTEON_38XX_MODEL_MASK)</div><div class='add'>+#define OCTEON_38XX_MODEL_REV_MASK   (OCTEON_38XX_FAMILY_REV_MASK | OCTEON_38XX_MODEL_MASK)</div><div class='ctx'> </div><div class='ctx'> /* CN5XXX and later use different layout of bits in the revision ID field */</div><div class='ctx'> #define OCTEON_58XX_FAMILY_MASK      OCTEON_38XX_FAMILY_MASK</div><div class='ctx'> #define OCTEON_58XX_FAMILY_REV_MASK  0x00ffff3f</div><div class='ctx'> #define OCTEON_58XX_MODEL_MASK       0x00ffffc0</div><div class='del'>-#define OCTEON_58XX_MODEL_REV_MASK   (OCTEON_58XX_FAMILY_REV_MASK \</div><div class='del'>-				      | OCTEON_58XX_MODEL_MASK)</div><div class='del'>-#define OCTEON_58XX_MODEL_MINOR_REV_MASK (OCTEON_58XX_MODEL_REV_MASK \</div><div class='del'>-					  &amp; 0x00fffff8)</div><div class='add'>+#define OCTEON_58XX_MODEL_REV_MASK   (OCTEON_58XX_FAMILY_REV_MASK | OCTEON_58XX_MODEL_MASK)</div><div class='add'>+#define OCTEON_58XX_MODEL_MINOR_REV_MASK (OCTEON_58XX_MODEL_REV_MASK &amp; 0x00fffff8)</div><div class='ctx'> #define OCTEON_5XXX_MODEL_MASK       0x00ff0fc0</div><div class='ctx'> </div><div class='del'>-#define __OCTEON_MATCH_MASK__(x, y, z) (((x) &amp; (z)) == ((y) &amp; (z)))</div><div class='del'>-</div><div class='del'>-/* NOTE: This is for internal (to this file) use only. */</div><div class='del'>-static inline int __OCTEON_IS_MODEL_COMPILE__(uint32_t arg_model,</div><div class='del'>-					      uint32_t chip_model)</div><div class='del'>-{</div><div class='del'>-	uint32_t rev_and_sub = OM_IGNORE_REVISION | OM_CHECK_SUBMODEL;</div><div class='del'>-</div><div class='del'>-	if ((arg_model &amp; OCTEON_38XX_FAMILY_MASK) &lt; OCTEON_CN58XX_PASS1_0) {</div><div class='del'>-		if (((arg_model &amp; OM_FLAG_MASK) == rev_and_sub) &amp;&amp;</div><div class='del'>-		    __OCTEON_MATCH_MASK__(chip_model, arg_model,</div><div class='del'>-					  OCTEON_38XX_MODEL_MASK))</div><div class='del'>-			return 1;</div><div class='del'>-		if (((arg_model &amp; OM_FLAG_MASK) == 0) &amp;&amp;</div><div class='del'>-		    __OCTEON_MATCH_MASK__(chip_model, arg_model,</div><div class='del'>-					  OCTEON_38XX_FAMILY_REV_MASK))</div><div class='del'>-			return 1;</div><div class='del'>-		if (((arg_model &amp; OM_FLAG_MASK) == OM_IGNORE_REVISION) &amp;&amp;</div><div class='del'>-		    __OCTEON_MATCH_MASK__(chip_model, arg_model,</div><div class='del'>-					  OCTEON_38XX_FAMILY_MASK))</div><div class='del'>-			return 1;</div><div class='del'>-		if (((arg_model &amp; OM_FLAG_MASK) == OM_CHECK_SUBMODEL) &amp;&amp;</div><div class='del'>-		    __OCTEON_MATCH_MASK__((chip_model), (arg_model),</div><div class='del'>-					  OCTEON_38XX_MODEL_REV_MASK))</div><div class='del'>-			return 1;</div><div class='del'>-		if ((arg_model &amp; OM_MATCH_PREVIOUS_MODELS) &amp;&amp;</div><div class='del'>-		    ((chip_model &amp; OCTEON_38XX_MODEL_MASK) &lt;</div><div class='del'>-			    (arg_model &amp; OCTEON_38XX_MODEL_MASK)))</div><div class='del'>-			return 1;</div><div class='del'>-	} else {</div><div class='del'>-		if (((arg_model &amp; OM_FLAG_MASK) == rev_and_sub) &amp;&amp;</div><div class='del'>-		    __OCTEON_MATCH_MASK__((chip_model), (arg_model),</div><div class='del'>-					  OCTEON_58XX_MODEL_MASK))</div><div class='del'>-			return 1;</div><div class='del'>-		if (((arg_model &amp; OM_FLAG_MASK) == 0) &amp;&amp;</div><div class='del'>-		    __OCTEON_MATCH_MASK__((chip_model), (arg_model),</div><div class='del'>-					  OCTEON_58XX_FAMILY_REV_MASK))</div><div class='del'>-			return 1;</div><div class='del'>-		if (((arg_model &amp; OM_FLAG_MASK) == OM_IGNORE_MINOR_REVISION) &amp;&amp;</div><div class='del'>-		    __OCTEON_MATCH_MASK__((chip_model), (arg_model),</div><div class='del'>-					  OCTEON_58XX_MODEL_MINOR_REV_MASK))</div><div class='del'>-			return 1;</div><div class='del'>-		if (((arg_model &amp; OM_FLAG_MASK) == OM_IGNORE_REVISION) &amp;&amp;</div><div class='del'>-		    __OCTEON_MATCH_MASK__((chip_model), (arg_model),</div><div class='del'>-					  OCTEON_58XX_FAMILY_MASK))</div><div class='del'>-			return 1;</div><div class='del'>-		if (((arg_model &amp; OM_FLAG_MASK) == OM_CHECK_SUBMODEL) &amp;&amp;</div><div class='del'>-		    __OCTEON_MATCH_MASK__((chip_model), (arg_model),</div><div class='del'>-					  OCTEON_58XX_MODEL_REV_MASK))</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-		if (((arg_model &amp; OM_MATCH_5XXX_FAMILY_MODELS) == OM_MATCH_5XXX_FAMILY_MODELS) &amp;&amp;</div><div class='del'>-		    ((chip_model) &gt;= OCTEON_CN58XX_PASS1_0) &amp;&amp; ((chip_model) &lt; OCTEON_CN63XX_PASS1_0))</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-		if (((arg_model &amp; OM_MATCH_6XXX_FAMILY_MODELS) == OM_MATCH_6XXX_FAMILY_MODELS) &amp;&amp;</div><div class='del'>-		    ((chip_model) &gt;= OCTEON_CN63XX_PASS1_0))</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-		if ((arg_model &amp; OM_MATCH_PREVIOUS_MODELS) &amp;&amp;</div><div class='del'>-		    ((chip_model &amp; OCTEON_58XX_MODEL_MASK) &lt;</div><div class='del'>-			    (arg_model &amp; OCTEON_58XX_MODEL_MASK)))</div><div class='del'>-			return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* forward declarations */</div><div class='ctx'> static inline uint32_t cvmx_get_proc_id(void) __attribute__ ((pure));</div><div class='ctx'> static inline uint64_t cvmx_read_csr(uint64_t csr_addr);</div><div class='ctx'> </div><div class='add'>+#define __OCTEON_MATCH_MASK__(x, y, z) (((x) &amp; (z)) == ((y) &amp; (z)))</div><div class='add'>+</div><div class='add'>+/* NOTE: This for internal use only! */</div><div class='add'>+#define __OCTEON_IS_MODEL_COMPILE__(arg_model, chip_model)		\</div><div class='add'>+((((arg_model &amp; OCTEON_38XX_FAMILY_MASK) &lt; OCTEON_CN58XX_PASS1_0)  &amp;&amp; (	\</div><div class='add'>+		((((arg_model) &amp; (OM_FLAG_MASK)) == (OM_IGNORE_REVISION | OM_CHECK_SUBMODEL)) \</div><div class='add'>+			&amp;&amp; __OCTEON_MATCH_MASK__((chip_model), (arg_model), OCTEON_38XX_MODEL_MASK)) || \</div><div class='add'>+		((((arg_model) &amp; (OM_FLAG_MASK)) == 0)			\</div><div class='add'>+			&amp;&amp; __OCTEON_MATCH_MASK__((chip_model), (arg_model), OCTEON_38XX_FAMILY_REV_MASK)) || \</div><div class='add'>+		((((arg_model) &amp; (OM_FLAG_MASK)) == OM_IGNORE_REVISION) \</div><div class='add'>+			&amp;&amp; __OCTEON_MATCH_MASK__((chip_model), (arg_model), OCTEON_38XX_FAMILY_MASK)) || \</div><div class='add'>+		((((arg_model) &amp; (OM_FLAG_MASK)) == OM_CHECK_SUBMODEL)	\</div><div class='add'>+			&amp;&amp; __OCTEON_MATCH_MASK__((chip_model), (arg_model), OCTEON_38XX_MODEL_REV_MASK)) || \</div><div class='add'>+		((((arg_model) &amp; (OM_MATCH_PREVIOUS_MODELS)) == OM_MATCH_PREVIOUS_MODELS) \</div><div class='add'>+			&amp;&amp; (((chip_model) &amp; OCTEON_38XX_MODEL_MASK) &lt; ((arg_model) &amp; OCTEON_38XX_MODEL_MASK))) \</div><div class='add'>+		)) ||							\</div><div class='add'>+	(((arg_model &amp; OCTEON_38XX_FAMILY_MASK) &gt;= OCTEON_CN58XX_PASS1_0)  &amp;&amp; (	\</div><div class='add'>+		((((arg_model) &amp; (OM_FLAG_MASK)) == (OM_IGNORE_REVISION | OM_CHECK_SUBMODEL)) \</div><div class='add'>+			&amp;&amp; __OCTEON_MATCH_MASK__((chip_model), (arg_model), OCTEON_58XX_MODEL_MASK)) || \</div><div class='add'>+		((((arg_model) &amp; (OM_FLAG_MASK)) == 0)			\</div><div class='add'>+			&amp;&amp; __OCTEON_MATCH_MASK__((chip_model), (arg_model), OCTEON_58XX_FAMILY_REV_MASK)) || \</div><div class='add'>+		((((arg_model) &amp; (OM_FLAG_MASK)) == OM_IGNORE_MINOR_REVISION) \</div><div class='add'>+			&amp;&amp; __OCTEON_MATCH_MASK__((chip_model), (arg_model), OCTEON_58XX_MODEL_MINOR_REV_MASK)) || \</div><div class='add'>+		((((arg_model) &amp; (OM_FLAG_MASK)) == OM_IGNORE_REVISION) \</div><div class='add'>+			&amp;&amp; __OCTEON_MATCH_MASK__((chip_model), (arg_model), OCTEON_58XX_FAMILY_MASK)) || \</div><div class='add'>+		((((arg_model) &amp; (OM_FLAG_MASK)) == OM_CHECK_SUBMODEL)	\</div><div class='add'>+			&amp;&amp; __OCTEON_MATCH_MASK__((chip_model), (arg_model), OCTEON_58XX_MODEL_REV_MASK)) || \</div><div class='add'>+		((((arg_model) &amp; (OM_MATCH_5XXX_FAMILY_MODELS)) == OM_MATCH_5XXX_FAMILY_MODELS) \</div><div class='add'>+			&amp;&amp; ((chip_model) &gt;= OCTEON_CN58XX_PASS1_0) &amp;&amp; ((chip_model) &lt; OCTEON_CN63XX_PASS1_0)) || \</div><div class='add'>+		((((arg_model) &amp; (OM_MATCH_6XXX_FAMILY_MODELS)) == OM_MATCH_6XXX_FAMILY_MODELS) \</div><div class='add'>+			&amp;&amp; ((chip_model) &gt;= OCTEON_CN63XX_PASS1_0)) ||	\</div><div class='add'>+		((((arg_model) &amp; (OM_MATCH_PREVIOUS_MODELS)) == OM_MATCH_PREVIOUS_MODELS) \</div><div class='add'>+			&amp;&amp; (((chip_model) &amp; OCTEON_58XX_MODEL_MASK) &lt; ((arg_model) &amp; OCTEON_58XX_MODEL_MASK))) \</div><div class='add'>+		)))</div><div class='add'>+</div><div class='ctx'> /* NOTE: This for internal use only!!!!! */</div><div class='ctx'> static inline int __octeon_is_model_runtime__(uint32_t model)</div><div class='ctx'> {</div><div class='hunk'>@@ -312,22 +286,25 @@ static inline int __octeon_is_model_runtime__(uint32_t model)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check for special case of mismarked 3005 samples. We only</div><div class='del'>-	 * need to check if the sub model isn't being ignored.</div><div class='add'>+	 * need to check if the sub model isn't being ignored</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((model &amp; OM_CHECK_SUBMODEL) == OM_CHECK_SUBMODEL) {</div><div class='del'>-		if (cpuid == OCTEON_CN3010_PASS1 \</div><div class='del'>-		    &amp;&amp; (cvmx_read_csr(0x80011800800007B8ull) &amp; (1ull &lt;&lt; 34)))</div><div class='add'>+		if (cpuid == OCTEON_CN3010_PASS1 &amp;&amp; (cvmx_read_csr(0x80011800800007B8ull) &amp; (1ull &lt;&lt; 34)))</div><div class='ctx'> 			cpuid |= 0x10;</div><div class='ctx'> 	}</div><div class='ctx'> 	return __OCTEON_IS_MODEL_COMPILE__(model, cpuid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The OCTEON_IS_MODEL macro should be used for all Octeon model</div><div class='del'>- * checking done in a program.  This should be kept runtime if at all</div><div class='del'>- * possible.  Any compile time (#if OCTEON_IS_MODEL) usage must be</div><div class='del'>- * condtionalized with OCTEON_IS_COMMON_BINARY() if runtime checking</div><div class='del'>- * support is required.</div><div class='add'>+ * The OCTEON_IS_MODEL macro should be used for all Octeon model checking done</div><div class='add'>+ * in a program.</div><div class='add'>+ * This should be kept runtime if at all possible  and must be conditionalized</div><div class='add'>+ * with OCTEON_IS_COMMON_BINARY() if runtime checking support is required.</div><div class='add'>+ *</div><div class='add'>+ * Use of the macro in preprocessor directives ( #if OCTEON_IS_MODEL(...) )</div><div class='add'>+ * is NOT SUPPORTED, and should be replaced with CVMX_COMPILED_FOR()</div><div class='add'>+ * I.e.:</div><div class='add'>+ *  #if OCTEON_IS_MODEL(OCTEON_CN56XX)  -&gt;  #if CVMX_COMPILED_FOR(OCTEON_CN56XX)</div><div class='ctx'>  */</div><div class='ctx'> #define OCTEON_IS_MODEL(x) __octeon_is_model_runtime__(x)</div><div class='ctx'> #define OCTEON_IS_COMMON_BINARY() 1</div><div class='head'>diff --git a/arch/mips/include/asm/octeon/pci-octeon.h b/arch/mips/include/asm/octeon/pci-octeon.h<br/>index fba2ba200f58..c66734bd3382 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/pci-octeon.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/octeon/pci-octeon.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/octeon/pci-octeon.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/octeon/pci-octeon.h</a></div><div class='hunk'>@@ -56,7 +56,8 @@ enum octeon_dma_bar_type {</div><div class='ctx'> 	OCTEON_DMA_BAR_TYPE_INVALID,</div><div class='ctx'> 	OCTEON_DMA_BAR_TYPE_SMALL,</div><div class='ctx'> 	OCTEON_DMA_BAR_TYPE_BIG,</div><div class='del'>-	OCTEON_DMA_BAR_TYPE_PCIE</div><div class='add'>+	OCTEON_DMA_BAR_TYPE_PCIE,</div><div class='add'>+	OCTEON_DMA_BAR_TYPE_PCIE2</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h<br/>index e59cd1ac09c2..d41790928c64 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/page.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/page.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/page.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/page.h</a></div><div class='hunk'>@@ -38,6 +38,14 @@</div><div class='ctx'> #define HPAGE_SIZE	(_AC(1,UL) &lt;&lt; HPAGE_SHIFT)</div><div class='ctx'> #define HPAGE_MASK	(~(HPAGE_SIZE - 1))</div><div class='ctx'> #define HUGETLB_PAGE_ORDER	(HPAGE_SHIFT - PAGE_SHIFT)</div><div class='add'>+#else /* !CONFIG_HUGETLB_PAGE */</div><div class='add'>+# ifndef BUILD_BUG</div><div class='add'>+#  define BUILD_BUG() do { extern void __build_bug(void); __build_bug(); } while (0)</div><div class='add'>+# endif</div><div class='add'>+#define HPAGE_SHIFT	({BUILD_BUG(); 0; })</div><div class='add'>+#define HPAGE_SIZE	({BUILD_BUG(); 0; })</div><div class='add'>+#define HPAGE_MASK	({BUILD_BUG(); 0; })</div><div class='add'>+#define HUGETLB_PAGE_ORDER	({BUILD_BUG(); 0; })</div><div class='ctx'> #endif /* CONFIG_HUGETLB_PAGE */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='head'>diff --git a/arch/mips/include/asm/pgtable-32.h b/arch/mips/include/asm/pgtable-32.h<br/>index 8a153d2fa62a..5d56bb230345 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/pgtable-32.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/pgtable-32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/pgtable-32.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/pgtable-32.h</a></div><div class='hunk'>@@ -19,23 +19,7 @@</div><div class='ctx'> #include &lt;asm-generic/pgtable-nopmd.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * - add_wired_entry() add a fixed TLB entry, and move wired register</div><div class='del'>- */</div><div class='del'>-extern void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,</div><div class='del'>-			       unsigned long entryhi, unsigned long pagemask);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * - add_temporary_entry() add a temporary TLB entry. We use TLB entries</div><div class='del'>- *	starting at the top and working down. This is for populating the</div><div class='del'>- *	TLB before trap_init() puts the TLB miss handler in place. It</div><div class='del'>- *	should be used only for entries matching the actual page tables,</div><div class='del'>- *	to prevent inconsistencies.</div><div class='del'>- */</div><div class='del'>-extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,</div><div class='del'>-			       unsigned long entryhi, unsigned long pagemask);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Basically we have the same two-level (which is the logical three level</div><div class='add'>+ * Basically we have the same two-level (which is the logical three level</div><div class='ctx'>  * Linux page table layout folded) page tables as the i386.  Some day</div><div class='ctx'>  * when we have proper page coloring support we can have a 1% quicker</div><div class='ctx'>  * tlb refill handling mechanism, but for now it is a bit slower but</div><div class='head'>diff --git a/arch/mips/include/asm/ptrace.h b/arch/mips/include/asm/ptrace.h<br/>index de39b1f343ea..4b7f5252d2fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/ptrace.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/ptrace.h</a></div><div class='hunk'>@@ -137,14 +137,26 @@ extern int ptrace_set_watch_regs(struct task_struct *child,</div><div class='ctx'>  */</div><div class='ctx'> #define user_mode(regs) (((regs)-&gt;cp0_status &amp; KU_MASK) == KU_USER)</div><div class='ctx'> </div><div class='del'>-#define regs_return_value(_regs) ((_regs)-&gt;regs[2])</div><div class='add'>+static inline int is_syscall_success(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return !regs-&gt;regs[7];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline long regs_return_value(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	if (is_syscall_success(regs))</div><div class='add'>+		return regs-&gt;regs[2];</div><div class='add'>+	else</div><div class='add'>+		return -regs-&gt;regs[2];</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define instruction_pointer(regs) ((regs)-&gt;cp0_epc)</div><div class='ctx'> #define profile_pc(regs) instruction_pointer(regs)</div><div class='ctx'> </div><div class='ctx'> extern asmlinkage void syscall_trace_enter(struct pt_regs *regs);</div><div class='ctx'> extern asmlinkage void syscall_trace_leave(struct pt_regs *regs);</div><div class='ctx'> </div><div class='del'>-extern NORET_TYPE void die(const char *, struct pt_regs *) ATTRIB_NORET;</div><div class='add'>+extern void die(const char *, struct pt_regs *) __noreturn;</div><div class='ctx'> </div><div class='ctx'> static inline void die_if_kernel(const char *str, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/mips/include/asm/socket.h b/arch/mips/include/asm/socket.h<br/>index 9de5190f2487..ad5c0a7a02a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/socket.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/socket.h</a></div><div class='hunk'>@@ -82,6 +82,9 @@ To add: #define SO_REUSEPORT 0x0200	/* Allow local address and port reuse.  */</div><div class='ctx'> </div><div class='ctx'> #define SO_RXQ_OVFL             40</div><div class='ctx'> </div><div class='add'>+#define SO_WIFI_STATUS		41</div><div class='add'>+#define SCM_WIFI_STATUS		SO_WIFI_STATUS</div><div class='add'>+</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> /** sock_type - Socket types</div><div class='head'>diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h<br/>index 97f8bf6639e7..0d85d8e440c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/thread_info.h</a></div><div class='hunk'>@@ -117,7 +117,6 @@ register struct thread_info *__current_thread_info __asm__("$28");</div><div class='ctx'> #define TIF_USEDFPU		16	/* FPU was used by this task this quantum (SMP) */</div><div class='ctx'> #define TIF_POLLING_NRFLAG	17	/* true if poll_idle() is polling 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</div><div class='ctx'> #define TIF_FIXADE		20	/* Fix address errors in software */</div><div class='ctx'> #define TIF_LOGADE		21	/* Log address errors to syslog */</div><div class='ctx'> #define TIF_32BIT_REGS		22	/* also implies 16/32 fprs */</div><div class='hunk'>@@ -141,7 +140,6 @@ register struct thread_info *__current_thread_info __asm__("$28");</div><div class='ctx'> #define _TIF_RESTORE_SIGMASK	(1&lt;&lt;TIF_RESTORE_SIGMASK)</div><div class='ctx'> #define _TIF_USEDFPU		(1&lt;&lt;TIF_USEDFPU)</div><div class='ctx'> #define _TIF_POLLING_NRFLAG	(1&lt;&lt;TIF_POLLING_NRFLAG)</div><div class='del'>-#define _TIF_FREEZE		(1&lt;&lt;TIF_FREEZE)</div><div class='ctx'> #define _TIF_FIXADE		(1&lt;&lt;TIF_FIXADE)</div><div class='ctx'> #define _TIF_LOGADE		(1&lt;&lt;TIF_LOGADE)</div><div class='ctx'> #define _TIF_32BIT_REGS		(1&lt;&lt;TIF_32BIT_REGS)</div><div class='head'>diff --git a/arch/mips/include/asm/tlbmisc.h b/arch/mips/include/asm/tlbmisc.h<br/>new file mode 100644<br/>index 000000000000..3a452282cba0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/tlbmisc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/tlbmisc.h</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+#ifndef __ASM_TLBMISC_H</div><div class='add'>+#define __ASM_TLBMISC_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * - add_wired_entry() add a fixed TLB entry, and move wired register</div><div class='add'>+ */</div><div class='add'>+extern void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,</div><div class='add'>+	unsigned long entryhi, unsigned long pagemask);</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_TLBMISC_H */</div><div class='head'>diff --git a/arch/mips/include/asm/traps.h b/arch/mips/include/asm/traps.h<br/>index 90ff2f497c50..ff74aec3561a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/traps.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/traps.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/traps.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/traps.h</a></div><div class='hunk'>@@ -24,5 +24,18 @@ extern int (*board_be_handler)(struct pt_regs *regs, int is_fixup);</div><div class='ctx'> extern void (*board_nmi_handler_setup)(void);</div><div class='ctx'> extern void (*board_ejtag_handler_setup)(void);</div><div class='ctx'> extern void (*board_bind_eic_interrupt)(int irq, int regset);</div><div class='add'>+extern void (*board_ebase_setup)(void);</div><div class='add'>+</div><div class='add'>+extern int register_nmi_notifier(struct notifier_block *nb);</div><div class='add'>+</div><div class='add'>+#define nmi_notifier(fn, pri)						\</div><div class='add'>+({									\</div><div class='add'>+	static struct notifier_block fn##_nb = {			\</div><div class='add'>+		.notifier_call = fn,					\</div><div class='add'>+		.priority = pri						\</div><div class='add'>+	};								\</div><div class='add'>+									\</div><div class='add'>+	register_nmi_notifier(&amp;fn##_nb);				\</div><div class='add'>+})</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_TRAPS_H */</div><div class='head'>diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h<br/>index 533812b61881..1228b25b290a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/include/asm/types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/include/asm/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/include/asm/types.h</a></div><div class='hunk'>@@ -15,18 +15,16 @@</div><div class='ctx'>  * We don't use int-l64.h for the kernel anymore but still use it for</div><div class='ctx'>  * userspace to avoid code changes.</div><div class='ctx'>  */</div><div class='del'>-#if (_MIPS_SZLONG == 64) &amp;&amp; !defined(__KERNEL__)</div><div class='del'>-# include &lt;asm-generic/int-l64.h&gt;</div><div class='del'>-#else</div><div class='add'>+#ifdef __KERNEL__</div><div class='ctx'> # include &lt;asm-generic/int-ll64.h&gt;</div><div class='add'>+#else</div><div class='add'>+# if _MIPS_SZLONG == 64</div><div class='add'>+#  include &lt;asm-generic/int-l64.h&gt;</div><div class='add'>+# else</div><div class='add'>+#  include &lt;asm-generic/int-ll64.h&gt;</div><div class='add'>+# endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-</div><div class='del'>-typedef unsigned short umode_t;</div><div class='del'>-</div><div class='del'>-#endif /* __ASSEMBLY__ */</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * These aren't exported outside the kernel to avoid name space clashes</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c<br/>index ca9bd2069142..f21868b28b24 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/jazz/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/jazz/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/jazz/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/jazz/irq.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/jazz.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/tlbmisc.h&gt;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_RAW_SPINLOCK(r4030_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -133,7 +134,7 @@ static irqreturn_t r4030_timer_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction r4030_timer_irqaction = {</div><div class='ctx'> 	.handler	= r4030_timer_interrupt,</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='add'>+	.flags		= IRQF_TIMER,</div><div class='ctx'> 	.name		= "R4030 timer",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c<br/>index 0d0f054a02f4..820e926dacbc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/jazz/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/jazz/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/jazz/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/jazz/setup.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;asm/jazzdma.h&gt;</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/tlbmisc.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern asmlinkage void jazz_handle_int(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c<br/>index c3b04be3fb2b..639e3ce6c264 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/jz4740/board-qi_lb60.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/jz4740/board-qi_lb60.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/jz4740/board-qi_lb60.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/jz4740/board-qi_lb60.c</a></div><div class='hunk'>@@ -488,7 +488,7 @@ static int __init qi_lb60_board_setup(void)</div><div class='ctx'> 	board_gpio_setup();</div><div class='ctx'> </div><div class='ctx'> 	if (qi_lb60_init_platform_devices())</div><div class='del'>-		panic("Failed to initialize platform devices\n");</div><div class='add'>+		panic("Failed to initialize platform devices");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile<br/>index 1a966183e353..0c6877ea9004 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/Makefile</a></div><div class='hunk'>@@ -55,9 +55,11 @@ obj-$(CONFIG_CPU_TX49XX)	+= r4k_fpu.o r4k_switch.o</div><div class='ctx'> obj-$(CONFIG_CPU_VR41XX)	+= r4k_fpu.o r4k_switch.o</div><div class='ctx'> obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= octeon_switch.o</div><div class='ctx'> obj-$(CONFIG_CPU_XLR)		+= r4k_fpu.o r4k_switch.o</div><div class='add'>+obj-$(CONFIG_CPU_XLP)		+= r4k_fpu.o r4k_switch.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SMP)		+= smp.o</div><div class='ctx'> obj-$(CONFIG_SMP_UP)		+= smp-up.o</div><div class='add'>+obj-$(CONFIG_CPU_BMIPS)		+= smp-bmips.o bmips_vec.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MIPS_MT)		+= mips-mt.o</div><div class='ctx'> obj-$(CONFIG_MIPS_MT_FPAFF)	+= mips-mt-fpaff.o</div><div class='head'>diff --git a/arch/mips/kernel/bmips_vec.S b/arch/mips/kernel/bmips_vec.S<br/>new file mode 100644<br/>index 000000000000..e908e81330b1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/bmips_vec.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/bmips_vec.S</a></div><div class='hunk'>@@ -0,0 +1,255 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 by Kevin Cernekee (cernekee@gmail.com)</div><div class='add'>+ *</div><div class='add'>+ * Reset/NMI/re-entry vectors for BMIPS processors</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/asm.h&gt;</div><div class='add'>+#include &lt;asm/asmmacro.h&gt;</div><div class='add'>+#include &lt;asm/cacheops.h&gt;</div><div class='add'>+#include &lt;asm/regdef.h&gt;</div><div class='add'>+#include &lt;asm/mipsregs.h&gt;</div><div class='add'>+#include &lt;asm/stackframe.h&gt;</div><div class='add'>+#include &lt;asm/addrspace.h&gt;</div><div class='add'>+#include &lt;asm/hazards.h&gt;</div><div class='add'>+#include &lt;asm/bmips.h&gt;</div><div class='add'>+</div><div class='add'>+	.macro	BARRIER</div><div class='add'>+	.set	mips32</div><div class='add'>+	_ssnop</div><div class='add'>+	_ssnop</div><div class='add'>+	_ssnop</div><div class='add'>+	.set	mips0</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	__CPUINIT</div><div class='add'>+</div><div class='add'>+/***********************************************************************</div><div class='add'>+ * Alternate CPU1 startup vector for BMIPS4350</div><div class='add'>+ *</div><div class='add'>+ * On some systems the bootloader has already started CPU1 and configured</div><div class='add'>+ * it to resume execution at 0x8000_0200 (!BEV IV vector) when it is</div><div class='add'>+ * triggered by the SW1 interrupt.  If that is the case we try to move</div><div class='add'>+ * it to a more convenient place: BMIPS_WARM_RESTART_VEC @ 0x8000_0380.</div><div class='add'>+ ***********************************************************************/</div><div class='add'>+</div><div class='add'>+LEAF(bmips_smp_movevec)</div><div class='add'>+	la	k0, 1f</div><div class='add'>+	li	k1, CKSEG1</div><div class='add'>+	or	k0, k1</div><div class='add'>+	jr	k0</div><div class='add'>+</div><div class='add'>+1:</div><div class='add'>+	/* clear IV, pending IPIs */</div><div class='add'>+	mtc0	zero, CP0_CAUSE</div><div class='add'>+</div><div class='add'>+	/* re-enable IRQs to wait for SW1 */</div><div class='add'>+	li	k0, ST0_IE | ST0_BEV | STATUSF_IP1</div><div class='add'>+	mtc0	k0, CP0_STATUS</div><div class='add'>+</div><div class='add'>+	/* set up CPU1 CBR; move BASE to 0xa000_0000 */</div><div class='add'>+	li	k0, 0xff400000</div><div class='add'>+	mtc0	k0, $22, 6</div><div class='add'>+	li	k1, CKSEG1 | BMIPS_RELO_VECTOR_CONTROL_1</div><div class='add'>+	or	k0, k1</div><div class='add'>+	li	k1, 0xa0080000</div><div class='add'>+	sw	k1, 0(k0)</div><div class='add'>+</div><div class='add'>+	/* wait here for SW1 interrupt from bmips_boot_secondary() */</div><div class='add'>+	wait</div><div class='add'>+</div><div class='add'>+	la	k0, bmips_reset_nmi_vec</div><div class='add'>+	li	k1, CKSEG1</div><div class='add'>+	or	k0, k1</div><div class='add'>+	jr	k0</div><div class='add'>+END(bmips_smp_movevec)</div><div class='add'>+</div><div class='add'>+/***********************************************************************</div><div class='add'>+ * Reset/NMI vector</div><div class='add'>+ * For BMIPS processors that can relocate their exception vectors, this</div><div class='add'>+ * entire function gets copied to 0x8000_0000.</div><div class='add'>+ ***********************************************************************/</div><div class='add'>+</div><div class='add'>+NESTED(bmips_reset_nmi_vec, PT_SIZE, sp)</div><div class='add'>+	.set	push</div><div class='add'>+	.set	noat</div><div class='add'>+	.align	4</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	/* if the NMI bit is clear, assume this is a CPU1 reset instead */</div><div class='add'>+	li	k1, (1 &lt;&lt; 19)</div><div class='add'>+	mfc0	k0, CP0_STATUS</div><div class='add'>+	and	k0, k1</div><div class='add'>+	beqz	k0, bmips_smp_entry</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CPU_BMIPS5000)</div><div class='add'>+	/* if we're not on core 0, this must be the SMP boot signal */</div><div class='add'>+	li	k1, (3 &lt;&lt; 25)</div><div class='add'>+	mfc0	k0, $22</div><div class='add'>+	and	k0, k1</div><div class='add'>+	bnez	k0, bmips_smp_entry</div><div class='add'>+#endif</div><div class='add'>+#endif /* CONFIG_SMP */</div><div class='add'>+</div><div class='add'>+	/* nope, it's just a regular NMI */</div><div class='add'>+	SAVE_ALL</div><div class='add'>+	move	a0, sp</div><div class='add'>+</div><div class='add'>+	/* clear EXL, ERL, BEV so that TLB refills still work */</div><div class='add'>+	mfc0	k0, CP0_STATUS</div><div class='add'>+	li	k1, ST0_ERL | ST0_EXL | ST0_BEV | ST0_IE</div><div class='add'>+	or	k0, k1</div><div class='add'>+	xor	k0, k1</div><div class='add'>+	mtc0	k0, CP0_STATUS</div><div class='add'>+	BARRIER</div><div class='add'>+</div><div class='add'>+	/* jump to the NMI handler function */</div><div class='add'>+	la	k0, nmi_handler</div><div class='add'>+	jr	k0</div><div class='add'>+</div><div class='add'>+	RESTORE_ALL</div><div class='add'>+	.set	mips3</div><div class='add'>+	eret</div><div class='add'>+</div><div class='add'>+/***********************************************************************</div><div class='add'>+ * CPU1 reset vector (used for the initial boot only)</div><div class='add'>+ * This is still part of bmips_reset_nmi_vec().</div><div class='add'>+ ***********************************************************************/</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+</div><div class='add'>+bmips_smp_entry:</div><div class='add'>+</div><div class='add'>+	/* set up CP0 STATUS; enable FPU */</div><div class='add'>+	li	k0, 0x30000000</div><div class='add'>+	mtc0	k0, CP0_STATUS</div><div class='add'>+	BARRIER</div><div class='add'>+</div><div class='add'>+	/* set local CP0 CONFIG to make kseg0 cacheable, write-back */</div><div class='add'>+	mfc0	k0, CP0_CONFIG</div><div class='add'>+	ori	k0, 0x07</div><div class='add'>+	xori	k0, 0x04</div><div class='add'>+	mtc0	k0, CP0_CONFIG</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CPU_BMIPS4350) || defined(CONFIG_CPU_BMIPS4380)</div><div class='add'>+	/* initialize CPU1's local I-cache */</div><div class='add'>+	li	k0, 0x80000000</div><div class='add'>+	li	k1, 0x80010000</div><div class='add'>+	mtc0	zero, $28</div><div class='add'>+	mtc0	zero, $28, 1</div><div class='add'>+	BARRIER</div><div class='add'>+</div><div class='add'>+1:	cache	Index_Store_Tag_I, 0(k0)</div><div class='add'>+	addiu	k0, 16</div><div class='add'>+	bne	k0, k1, 1b</div><div class='add'>+#elif defined(CONFIG_CPU_BMIPS5000)</div><div class='add'>+	/* set exception vector base */</div><div class='add'>+	la	k0, ebase</div><div class='add'>+	lw	k0, 0(k0)</div><div class='add'>+	mtc0	k0, $15, 1</div><div class='add'>+	BARRIER</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* jump back to kseg0 in case we need to remap the kseg1 area */</div><div class='add'>+	la	k0, 1f</div><div class='add'>+	jr	k0</div><div class='add'>+1:</div><div class='add'>+	la	k0, bmips_enable_xks01</div><div class='add'>+	jalr	k0</div><div class='add'>+</div><div class='add'>+	/* use temporary stack to set up upper memory TLB */</div><div class='add'>+	li	sp, BMIPS_WARM_RESTART_VEC</div><div class='add'>+	la	k0, plat_wired_tlb_setup</div><div class='add'>+	jalr	k0</div><div class='add'>+</div><div class='add'>+	/* switch to permanent stack and continue booting */</div><div class='add'>+</div><div class='add'>+	.global	bmips_secondary_reentry</div><div class='add'>+bmips_secondary_reentry:</div><div class='add'>+	la	k0, bmips_smp_boot_sp</div><div class='add'>+	lw	sp, 0(k0)</div><div class='add'>+	la	k0, bmips_smp_boot_gp</div><div class='add'>+	lw	gp, 0(k0)</div><div class='add'>+	la	k0, start_secondary</div><div class='add'>+	jr	k0</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_SMP */</div><div class='add'>+</div><div class='add'>+	.align	4</div><div class='add'>+	.global	bmips_reset_nmi_vec_end</div><div class='add'>+bmips_reset_nmi_vec_end:</div><div class='add'>+</div><div class='add'>+END(bmips_reset_nmi_vec)</div><div class='add'>+</div><div class='add'>+	.set	pop</div><div class='add'>+	.previous</div><div class='add'>+</div><div class='add'>+/***********************************************************************</div><div class='add'>+ * CPU1 warm restart vector (used for second and subsequent boots).</div><div class='add'>+ * Also used for S2 standby recovery (PM).</div><div class='add'>+ * This entire function gets copied to (BMIPS_WARM_RESTART_VEC)</div><div class='add'>+ ***********************************************************************/</div><div class='add'>+</div><div class='add'>+LEAF(bmips_smp_int_vec)</div><div class='add'>+</div><div class='add'>+	.align	4</div><div class='add'>+	mfc0	k0, CP0_STATUS</div><div class='add'>+	ori	k0, 0x01</div><div class='add'>+	xori	k0, 0x01</div><div class='add'>+	mtc0	k0, CP0_STATUS</div><div class='add'>+	eret</div><div class='add'>+</div><div class='add'>+	.align	4</div><div class='add'>+	.global	bmips_smp_int_vec_end</div><div class='add'>+bmips_smp_int_vec_end:</div><div class='add'>+</div><div class='add'>+END(bmips_smp_int_vec)</div><div class='add'>+</div><div class='add'>+/***********************************************************************</div><div class='add'>+ * XKS01 support</div><div class='add'>+ * Certain CPUs support extending kseg0 to 1024MB.</div><div class='add'>+ ***********************************************************************/</div><div class='add'>+</div><div class='add'>+	__CPUINIT</div><div class='add'>+</div><div class='add'>+LEAF(bmips_enable_xks01)</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_XKS01)</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CPU_BMIPS4380)</div><div class='add'>+	mfc0	t0, $22, 3</div><div class='add'>+	li	t1, 0x1ff0</div><div class='add'>+	li	t2, (1 &lt;&lt; 12) | (1 &lt;&lt; 9)</div><div class='add'>+	or	t0, t1</div><div class='add'>+	xor	t0, t1</div><div class='add'>+	or	t0, t2</div><div class='add'>+	mtc0	t0, $22, 3</div><div class='add'>+	BARRIER</div><div class='add'>+#elif defined(CONFIG_CPU_BMIPS5000)</div><div class='add'>+	mfc0	t0, $22, 5</div><div class='add'>+	li	t1, 0x01ff</div><div class='add'>+	li	t2, (1 &lt;&lt; 8) | (1 &lt;&lt; 5)</div><div class='add'>+	or	t0, t1</div><div class='add'>+	xor	t0, t1</div><div class='add'>+	or	t0, t2</div><div class='add'>+	mtc0	t0, $22, 5</div><div class='add'>+	BARRIER</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#error Missing XKS01 setup</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* defined(CONFIG_XKS01) */</div><div class='add'>+</div><div class='add'>+	jr	ra</div><div class='add'>+</div><div class='add'>+END(bmips_enable_xks01)</div><div class='add'>+</div><div class='add'>+	.previous</div><div class='head'>diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c<br/>index 32103cc2a257..4d735d0e58f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/branch.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/branch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/branch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/branch.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/branch.h&gt;</div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/cpu-features.h&gt;</div><div class='hunk'>@@ -17,28 +18,22 @@</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Compute the return address and do emulate branch simulation, if required.</div><div class='add'>+/**</div><div class='add'>+ * __compute_return_epc_for_insn - Computes the return address and do emulate</div><div class='add'>+ *				    branch simulation, if required.</div><div class='add'>+ *</div><div class='add'>+ * @regs:	Pointer to pt_regs</div><div class='add'>+ * @insn:	branch instruction to decode</div><div class='add'>+ * @returns:	-EFAULT on error and forces SIGBUS, and on success</div><div class='add'>+ *		returns 0 or BRANCH_LIKELY_TAKEN as appropriate after</div><div class='add'>+ *		evaluating the branch.</div><div class='ctx'>  */</div><div class='del'>-int __compute_return_epc(struct pt_regs *regs)</div><div class='add'>+int __compute_return_epc_for_insn(struct pt_regs *regs,</div><div class='add'>+				   union mips_instruction insn)</div><div class='ctx'> {</div><div class='del'>-	unsigned int __user *addr;</div><div class='ctx'> 	unsigned int bit, fcr31, dspcontrol;</div><div class='del'>-	long epc;</div><div class='del'>-	union mips_instruction insn;</div><div class='del'>-</div><div class='del'>-	epc = regs-&gt;cp0_epc;</div><div class='del'>-	if (epc &amp; 3)</div><div class='del'>-		goto unaligned;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Read the instruction</div><div class='del'>-	 */</div><div class='del'>-	addr = (unsigned int __user *) epc;</div><div class='del'>-	if (__get_user(insn.word, addr)) {</div><div class='del'>-		force_sig(SIGSEGV, current);</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='add'>+	long epc = regs-&gt;cp0_epc;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (insn.i_format.opcode) {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -64,18 +59,22 @@ int __compute_return_epc(struct pt_regs *regs)</div><div class='ctx'> 		switch (insn.i_format.rt) {</div><div class='ctx'> 	 	case bltz_op:</div><div class='ctx'> 		case bltzl_op:</div><div class='del'>-			if ((long)regs-&gt;regs[insn.i_format.rs] &lt; 0)</div><div class='add'>+			if ((long)regs-&gt;regs[insn.i_format.rs] &lt; 0) {</div><div class='ctx'> 				epc = epc + 4 + (insn.i_format.simmediate &lt;&lt; 2);</div><div class='del'>-			else</div><div class='add'>+				if (insn.i_format.rt == bltzl_op)</div><div class='add'>+					ret = BRANCH_LIKELY_TAKEN;</div><div class='add'>+			} else</div><div class='ctx'> 				epc += 8;</div><div class='ctx'> 			regs-&gt;cp0_epc = epc;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case bgez_op:</div><div class='ctx'> 		case bgezl_op:</div><div class='del'>-			if ((long)regs-&gt;regs[insn.i_format.rs] &gt;= 0)</div><div class='add'>+			if ((long)regs-&gt;regs[insn.i_format.rs] &gt;= 0) {</div><div class='ctx'> 				epc = epc + 4 + (insn.i_format.simmediate &lt;&lt; 2);</div><div class='del'>-			else</div><div class='add'>+				if (insn.i_format.rt == bgezl_op)</div><div class='add'>+					ret = BRANCH_LIKELY_TAKEN;</div><div class='add'>+			} else</div><div class='ctx'> 				epc += 8;</div><div class='ctx'> 			regs-&gt;cp0_epc = epc;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -83,9 +82,11 @@ int __compute_return_epc(struct pt_regs *regs)</div><div class='ctx'> 		case bltzal_op:</div><div class='ctx'> 		case bltzall_op:</div><div class='ctx'> 			regs-&gt;regs[31] = epc + 8;</div><div class='del'>-			if ((long)regs-&gt;regs[insn.i_format.rs] &lt; 0)</div><div class='add'>+			if ((long)regs-&gt;regs[insn.i_format.rs] &lt; 0) {</div><div class='ctx'> 				epc = epc + 4 + (insn.i_format.simmediate &lt;&lt; 2);</div><div class='del'>-			else</div><div class='add'>+				if (insn.i_format.rt == bltzall_op)</div><div class='add'>+					ret = BRANCH_LIKELY_TAKEN;</div><div class='add'>+			} else</div><div class='ctx'> 				epc += 8;</div><div class='ctx'> 			regs-&gt;cp0_epc = epc;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -93,12 +94,15 @@ int __compute_return_epc(struct pt_regs *regs)</div><div class='ctx'> 		case bgezal_op:</div><div class='ctx'> 		case bgezall_op:</div><div class='ctx'> 			regs-&gt;regs[31] = epc + 8;</div><div class='del'>-			if ((long)regs-&gt;regs[insn.i_format.rs] &gt;= 0)</div><div class='add'>+			if ((long)regs-&gt;regs[insn.i_format.rs] &gt;= 0) {</div><div class='ctx'> 				epc = epc + 4 + (insn.i_format.simmediate &lt;&lt; 2);</div><div class='del'>-			else</div><div class='add'>+				if (insn.i_format.rt == bgezall_op)</div><div class='add'>+					ret = BRANCH_LIKELY_TAKEN;</div><div class='add'>+			} else</div><div class='ctx'> 				epc += 8;</div><div class='ctx'> 			regs-&gt;cp0_epc = epc;</div><div class='ctx'> 			break;</div><div class='add'>+</div><div class='ctx'> 		case bposge32_op:</div><div class='ctx'> 			if (!cpu_has_dsp)</div><div class='ctx'> 				goto sigill;</div><div class='hunk'>@@ -133,9 +137,11 @@ int __compute_return_epc(struct pt_regs *regs)</div><div class='ctx'> 	case beq_op:</div><div class='ctx'> 	case beql_op:</div><div class='ctx'> 		if (regs-&gt;regs[insn.i_format.rs] ==</div><div class='del'>-		    regs-&gt;regs[insn.i_format.rt])</div><div class='add'>+		    regs-&gt;regs[insn.i_format.rt]) {</div><div class='ctx'> 			epc = epc + 4 + (insn.i_format.simmediate &lt;&lt; 2);</div><div class='del'>-		else</div><div class='add'>+			if (insn.i_format.rt == beql_op)</div><div class='add'>+				ret = BRANCH_LIKELY_TAKEN;</div><div class='add'>+		} else</div><div class='ctx'> 			epc += 8;</div><div class='ctx'> 		regs-&gt;cp0_epc = epc;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -143,9 +149,11 @@ int __compute_return_epc(struct pt_regs *regs)</div><div class='ctx'> 	case bne_op:</div><div class='ctx'> 	case bnel_op:</div><div class='ctx'> 		if (regs-&gt;regs[insn.i_format.rs] !=</div><div class='del'>-		    regs-&gt;regs[insn.i_format.rt])</div><div class='add'>+		    regs-&gt;regs[insn.i_format.rt]) {</div><div class='ctx'> 			epc = epc + 4 + (insn.i_format.simmediate &lt;&lt; 2);</div><div class='del'>-		else</div><div class='add'>+			if (insn.i_format.rt == bnel_op)</div><div class='add'>+				ret = BRANCH_LIKELY_TAKEN;</div><div class='add'>+		} else</div><div class='ctx'> 			epc += 8;</div><div class='ctx'> 		regs-&gt;cp0_epc = epc;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -153,9 +161,11 @@ int __compute_return_epc(struct pt_regs *regs)</div><div class='ctx'> 	case blez_op: /* not really i_format */</div><div class='ctx'> 	case blezl_op:</div><div class='ctx'> 		/* rt field assumed to be zero */</div><div class='del'>-		if ((long)regs-&gt;regs[insn.i_format.rs] &lt;= 0)</div><div class='add'>+		if ((long)regs-&gt;regs[insn.i_format.rs] &lt;= 0) {</div><div class='ctx'> 			epc = epc + 4 + (insn.i_format.simmediate &lt;&lt; 2);</div><div class='del'>-		else</div><div class='add'>+			if (insn.i_format.rt == bnel_op)</div><div class='add'>+				ret = BRANCH_LIKELY_TAKEN;</div><div class='add'>+		} else</div><div class='ctx'> 			epc += 8;</div><div class='ctx'> 		regs-&gt;cp0_epc = epc;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -163,9 +173,11 @@ int __compute_return_epc(struct pt_regs *regs)</div><div class='ctx'> 	case bgtz_op:</div><div class='ctx'> 	case bgtzl_op:</div><div class='ctx'> 		/* rt field assumed to be zero */</div><div class='del'>-		if ((long)regs-&gt;regs[insn.i_format.rs] &gt; 0)</div><div class='add'>+		if ((long)regs-&gt;regs[insn.i_format.rs] &gt; 0) {</div><div class='ctx'> 			epc = epc + 4 + (insn.i_format.simmediate &lt;&lt; 2);</div><div class='del'>-		else</div><div class='add'>+			if (insn.i_format.rt == bnel_op)</div><div class='add'>+				ret = BRANCH_LIKELY_TAKEN;</div><div class='add'>+		} else</div><div class='ctx'> 			epc += 8;</div><div class='ctx'> 		regs-&gt;cp0_epc = epc;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -187,18 +199,22 @@ int __compute_return_epc(struct pt_regs *regs)</div><div class='ctx'> 		switch (insn.i_format.rt &amp; 3) {</div><div class='ctx'> 		case 0:	/* bc1f */</div><div class='ctx'> 		case 2:	/* bc1fl */</div><div class='del'>-			if (~fcr31 &amp; (1 &lt;&lt; bit))</div><div class='add'>+			if (~fcr31 &amp; (1 &lt;&lt; bit)) {</div><div class='ctx'> 				epc = epc + 4 + (insn.i_format.simmediate &lt;&lt; 2);</div><div class='del'>-			else</div><div class='add'>+				if (insn.i_format.rt == 2)</div><div class='add'>+					ret = BRANCH_LIKELY_TAKEN;</div><div class='add'>+			} else</div><div class='ctx'> 				epc += 8;</div><div class='ctx'> 			regs-&gt;cp0_epc = epc;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case 1:	/* bc1t */</div><div class='ctx'> 		case 3:	/* bc1tl */</div><div class='del'>-			if (fcr31 &amp; (1 &lt;&lt; bit))</div><div class='add'>+			if (fcr31 &amp; (1 &lt;&lt; bit)) {</div><div class='ctx'> 				epc = epc + 4 + (insn.i_format.simmediate &lt;&lt; 2);</div><div class='del'>-			else</div><div class='add'>+				if (insn.i_format.rt == 3)</div><div class='add'>+					ret = BRANCH_LIKELY_TAKEN;</div><div class='add'>+			} else</div><div class='ctx'> 				epc += 8;</div><div class='ctx'> 			regs-&gt;cp0_epc = epc;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -239,15 +255,39 @@ int __compute_return_epc(struct pt_regs *regs)</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='del'>-unaligned:</div><div class='del'>-	printk("%s: unaligned epc - sending SIGBUS.\n", current-&gt;comm);</div><div class='add'>+sigill:</div><div class='add'>+	printk("%s: DSP branch but not DSP ASE - sending SIGBUS.\n", current-&gt;comm);</div><div class='ctx'> 	force_sig(SIGBUS, current);</div><div class='ctx'> 	return -EFAULT;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__compute_return_epc_for_insn);</div><div class='ctx'> </div><div class='del'>-sigill:</div><div class='del'>-	printk("%s: DSP branch but not DSP ASE - sending SIGBUS.\n", current-&gt;comm);</div><div class='add'>+int __compute_return_epc(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned int __user *addr;</div><div class='add'>+	long epc;</div><div class='add'>+	union mips_instruction insn;</div><div class='add'>+</div><div class='add'>+	epc = regs-&gt;cp0_epc;</div><div class='add'>+	if (epc &amp; 3)</div><div class='add'>+		goto unaligned;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Read the instruction</div><div class='add'>+	 */</div><div class='add'>+	addr = (unsigned int __user *) epc;</div><div class='add'>+	if (__get_user(insn.word, addr)) {</div><div class='add'>+		force_sig(SIGSEGV, current);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __compute_return_epc_for_insn(regs, insn);</div><div class='add'>+</div><div class='add'>+unaligned:</div><div class='add'>+	printk("%s: unaligned epc - sending SIGBUS.\n", current-&gt;comm);</div><div class='ctx'> 	force_sig(SIGBUS, current);</div><div class='ctx'> 	return -EFAULT;</div><div class='add'>+</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/kernel/cevt-bcm1480.c b/arch/mips/kernel/cevt-bcm1480.c<br/>index 36c3898b76db..69bbfae183bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/cevt-bcm1480.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/cevt-bcm1480.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/cevt-bcm1480.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/cevt-bcm1480.c</a></div><div class='hunk'>@@ -145,7 +145,7 @@ void __cpuinit sb1480_clockevent_init(void)</div><div class='ctx'> 	bcm1480_unmask_irq(cpu, irq);</div><div class='ctx'> </div><div class='ctx'> 	action-&gt;handler	= sibyte_counter_handler;</div><div class='del'>-	action-&gt;flags	= IRQF_DISABLED | IRQF_PERCPU | IRQF_TIMER;</div><div class='add'>+	action-&gt;flags	= IRQF_PERCPU | IRQF_TIMER;</div><div class='ctx'> 	action-&gt;name	= name;</div><div class='ctx'> 	action-&gt;dev_id	= cd;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/cevt-ds1287.c b/arch/mips/kernel/cevt-ds1287.c<br/>index 939157e397b9..ed648cb5a69f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/cevt-ds1287.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/cevt-ds1287.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/cevt-ds1287.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/cevt-ds1287.c</a></div><div class='hunk'>@@ -108,7 +108,7 @@ static irqreturn_t ds1287_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction ds1287_irqaction = {</div><div class='ctx'> 	.handler	= ds1287_interrupt,</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_PERCPU | IRQF_TIMER,</div><div class='add'>+	.flags		= IRQF_PERCPU | IRQF_TIMER,</div><div class='ctx'> 	.name		= "ds1287",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/cevt-gt641xx.c b/arch/mips/kernel/cevt-gt641xx.c<br/>index 339f3639b90e..831b47585b7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/cevt-gt641xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/cevt-gt641xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/cevt-gt641xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/cevt-gt641xx.c</a></div><div class='hunk'>@@ -114,7 +114,7 @@ static irqreturn_t gt641xx_timer0_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction gt641xx_timer0_irqaction = {</div><div class='ctx'> 	.handler	= gt641xx_timer0_interrupt,</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_PERCPU | IRQF_TIMER,</div><div class='add'>+	.flags		= IRQF_PERCPU | IRQF_TIMER,</div><div class='ctx'> 	.name		= "gt641xx_timer0",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c<br/>index e2d8e199be32..51095dd9599d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/cevt-r4k.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/cevt-r4k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/cevt-r4k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/cevt-r4k.c</a></div><div class='hunk'>@@ -84,7 +84,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> struct irqaction c0_compare_irqaction = {</div><div class='ctx'> 	.handler = c0_compare_interrupt,</div><div class='del'>-	.flags = IRQF_DISABLED | IRQF_PERCPU | IRQF_TIMER,</div><div class='add'>+	.flags = IRQF_PERCPU | IRQF_TIMER,</div><div class='ctx'> 	.name = "timer",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/cevt-sb1250.c b/arch/mips/kernel/cevt-sb1250.c<br/>index 590c54f28a81..e73439fd6850 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/cevt-sb1250.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/cevt-sb1250.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/cevt-sb1250.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/cevt-sb1250.c</a></div><div class='hunk'>@@ -144,7 +144,7 @@ void __cpuinit sb1250_clockevent_init(void)</div><div class='ctx'> 	sb1250_unmask_irq(cpu, irq);</div><div class='ctx'> </div><div class='ctx'> 	action-&gt;handler	= sibyte_counter_handler;</div><div class='del'>-	action-&gt;flags	= IRQF_DISABLED | IRQF_PERCPU | IRQF_TIMER;</div><div class='add'>+	action-&gt;flags	= IRQF_PERCPU | IRQF_TIMER;</div><div class='ctx'> 	action-&gt;name	= name;</div><div class='ctx'> 	action-&gt;dev_id	= cd;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/cevt-txx9.c b/arch/mips/kernel/cevt-txx9.c<br/>index f0ab92a1b057..e5c30b1d0860 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/cevt-txx9.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/cevt-txx9.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/cevt-txx9.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/cevt-txx9.c</a></div><div class='hunk'>@@ -146,7 +146,7 @@ static irqreturn_t txx9tmr_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction txx9tmr_irq = {</div><div class='ctx'> 	.handler	= txx9tmr_interrupt,</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_PERCPU | IRQF_TIMER,</div><div class='add'>+	.flags		= IRQF_PERCPU | IRQF_TIMER,</div><div class='ctx'> 	.name		= "txx9tmr",</div><div class='ctx'> 	.dev_id		= &amp;txx9_clock_event_device,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c<br/>index c7d3cf1ce46e..0bab464b8e33 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/cpu-probe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/cpu-probe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/cpu-probe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/cpu-probe.c</a></div><div class='hunk'>@@ -191,6 +191,8 @@ void __init check_wait(void)</div><div class='ctx'> 	case CPU_CAVIUM_OCTEON_PLUS:</div><div class='ctx'> 	case CPU_CAVIUM_OCTEON2:</div><div class='ctx'> 	case CPU_JZRISC:</div><div class='add'>+	case CPU_XLR:</div><div class='add'>+	case CPU_XLP:</div><div class='ctx'> 		cpu_wait = r4k_wait;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1014,6 +1016,13 @@ static inline void cpu_probe_netlogic(struct cpuinfo_mips *c, int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	decode_configs(c);</div><div class='ctx'> </div><div class='add'>+	if ((c-&gt;processor_id &amp; 0xff00) == PRID_IMP_NETLOGIC_AU13XX) {</div><div class='add'>+		c-&gt;cputype = CPU_ALCHEMY;</div><div class='add'>+		__cpu_name[cpu] = "Au1300";</div><div class='add'>+		/* following stuff is not for Alchemy */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	c-&gt;options = (MIPS_CPU_TLB       |</div><div class='ctx'> 			MIPS_CPU_4KEX    |</div><div class='ctx'> 			MIPS_CPU_COUNTER |</div><div class='hunk'>@@ -1023,6 +1032,12 @@ static inline void cpu_probe_netlogic(struct cpuinfo_mips *c, int cpu)</div><div class='ctx'> 			MIPS_CPU_LLSC);</div><div class='ctx'> </div><div class='ctx'> 	switch (c-&gt;processor_id &amp; 0xff00) {</div><div class='add'>+	case PRID_IMP_NETLOGIC_XLP8XX:</div><div class='add'>+	case PRID_IMP_NETLOGIC_XLP3XX:</div><div class='add'>+		c-&gt;cputype = CPU_XLP;</div><div class='add'>+		__cpu_name[cpu] = "Netlogic XLP";</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case PRID_IMP_NETLOGIC_XLR732:</div><div class='ctx'> 	case PRID_IMP_NETLOGIC_XLR716:</div><div class='ctx'> 	case PRID_IMP_NETLOGIC_XLR532:</div><div class='hunk'>@@ -1053,14 +1068,21 @@ static inline void cpu_probe_netlogic(struct cpuinfo_mips *c, int cpu)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		printk(KERN_INFO "Unknown Netlogic chip id [%02x]!\n",</div><div class='add'>+		pr_info("Unknown Netlogic chip id [%02x]!\n",</div><div class='ctx'> 		       c-&gt;processor_id);</div><div class='ctx'> 		c-&gt;cputype = CPU_XLR;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	c-&gt;isa_level = MIPS_CPU_ISA_M64R1;</div><div class='del'>-	c-&gt;tlbsize = ((read_c0_config1() &gt;&gt; 25) &amp; 0x3f) + 1;</div><div class='add'>+	if (c-&gt;cputype == CPU_XLP) {</div><div class='add'>+		c-&gt;isa_level = MIPS_CPU_ISA_M64R2;</div><div class='add'>+		c-&gt;options |= (MIPS_CPU_FPU | MIPS_CPU_ULRI | MIPS_CPU_MCHECK);</div><div class='add'>+		/* This will be updated again after all threads are woken up */</div><div class='add'>+		c-&gt;tlbsize = ((read_c0_config6() &gt;&gt; 16) &amp; 0xffff) + 1;</div><div class='add'>+	} else {</div><div class='add'>+		c-&gt;isa_level = MIPS_CPU_ISA_M64R1;</div><div class='add'>+		c-&gt;tlbsize = ((read_c0_config1() &gt;&gt; 25) &amp; 0x3f) + 1;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='head'>diff --git a/arch/mips/kernel/i8253.c b/arch/mips/kernel/i8253.c<br/>index 7047bff35ea5..c5bc344fc745 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/i8253.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/i8253.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/i8253.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/i8253.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction irq0  = {</div><div class='ctx'> 	.handler = timer_interrupt,</div><div class='del'>-	.flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_TIMER,</div><div class='add'>+	.flags = IRQF_NOBALANCING | IRQF_TIMER,</div><div class='ctx'> 	.name = "timer"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/kprobes.c b/arch/mips/kernel/kprobes.c<br/>index ee28683fc2ac..158467da9bc1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/kprobes.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/kprobes.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/kprobes.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/kprobes.c</a></div><div class='hunk'>@@ -25,10 +25,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/preempt.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/kdebug.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;asm/branch.h&gt;</div><div class='ctx'> #include &lt;asm/break.h&gt;</div><div class='ctx'> #include &lt;asm/inst.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -112,17 +114,49 @@ insn_ok:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * insn_has_ll_or_sc function checks whether instruction is ll or sc</div><div class='add'>+ * one; putting breakpoint on top of atomic ll/sc pair is bad idea;</div><div class='add'>+ * so we need to prevent it and refuse kprobes insertion for such</div><div class='add'>+ * instructions; cannot do much about breakpoint in the middle of</div><div class='add'>+ * ll/sc pair; it is upto user to avoid those places</div><div class='add'>+ */</div><div class='add'>+static int __kprobes insn_has_ll_or_sc(union mips_instruction insn)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (insn.i_format.opcode) {</div><div class='add'>+	case ll_op:</div><div class='add'>+	case lld_op:</div><div class='add'>+	case sc_op:</div><div class='add'>+	case scd_op:</div><div class='add'>+		ret = 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int __kprobes arch_prepare_kprobe(struct kprobe *p)</div><div class='ctx'> {</div><div class='ctx'> 	union mips_instruction insn;</div><div class='ctx'> 	union mips_instruction prev_insn;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	prev_insn = p-&gt;addr[-1];</div><div class='ctx'> 	insn = p-&gt;addr[0];</div><div class='ctx'> </div><div class='del'>-	if (insn_has_delayslot(insn) || insn_has_delayslot(prev_insn)) {</div><div class='del'>-		pr_notice("Kprobes for branch and jump instructions are not supported\n");</div><div class='add'>+	if (insn_has_ll_or_sc(insn)) {</div><div class='add'>+		pr_notice("Kprobes for ll and sc instructions are not"</div><div class='add'>+			  "supported\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'>+	if ((probe_kernel_read(&amp;prev_insn, p-&gt;addr - 1,</div><div class='add'>+				sizeof(mips_instruction)) == 0) &amp;&amp;</div><div class='add'>+				insn_has_delayslot(prev_insn)) {</div><div class='add'>+		pr_notice("Kprobes for branch delayslot are not supported\n");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -138,9 +172,20 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)</div><div class='ctx'> 	 * In the kprobe-&gt;ainsn.insn[] array we store the original</div><div class='ctx'> 	 * instruction at index zero and a break trap instruction at</div><div class='ctx'> 	 * index one.</div><div class='add'>+	 *</div><div class='add'>+	 * On MIPS arch if the instruction at probed address is a</div><div class='add'>+	 * branch instruction, we need to execute the instruction at</div><div class='add'>+	 * Branch Delayslot (BD) at the time of probe hit. As MIPS also</div><div class='add'>+	 * doesn't have single stepping support, the BD instruction can</div><div class='add'>+	 * not be executed in-line and it would be executed on SSOL slot</div><div class='add'>+	 * using a normal breakpoint instruction in the next slot.</div><div class='add'>+	 * So, read the instruction and save it for later execution.</div><div class='ctx'> 	 */</div><div class='add'>+	if (insn_has_delayslot(insn))</div><div class='add'>+		memcpy(&amp;p-&gt;ainsn.insn[0], p-&gt;addr + 1, sizeof(kprobe_opcode_t));</div><div class='add'>+	else</div><div class='add'>+		memcpy(&amp;p-&gt;ainsn.insn[0], p-&gt;addr, sizeof(kprobe_opcode_t));</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;p-&gt;ainsn.insn[0], p-&gt;addr, sizeof(kprobe_opcode_t));</div><div class='ctx'> 	p-&gt;ainsn.insn[1] = breakpoint2_insn;</div><div class='ctx'> 	p-&gt;opcode = *p-&gt;addr;</div><div class='ctx'> </div><div class='hunk'>@@ -191,16 +236,96 @@ static void set_current_kprobe(struct kprobe *p, struct pt_regs *regs,</div><div class='ctx'> 	kcb-&gt;kprobe_saved_epc = regs-&gt;cp0_epc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void prepare_singlestep(struct kprobe *p, struct pt_regs *regs)</div><div class='add'>+/**</div><div class='add'>+ * evaluate_branch_instrucion -</div><div class='add'>+ *</div><div class='add'>+ * Evaluate the branch instruction at probed address during probe hit. The</div><div class='add'>+ * result of evaluation would be the updated epc. The insturction in delayslot</div><div class='add'>+ * would actually be single stepped using a normal breakpoint) on SSOL slot.</div><div class='add'>+ *</div><div class='add'>+ * The result is also saved in the kprobe control block for later use,</div><div class='add'>+ * in case we need to execute the delayslot instruction. The latter will be</div><div class='add'>+ * false for NOP instruction in dealyslot and the branch-likely instructions</div><div class='add'>+ * when the branch is taken. And for those cases we set a flag as</div><div class='add'>+ * SKIP_DELAYSLOT in the kprobe control block</div><div class='add'>+ */</div><div class='add'>+static int evaluate_branch_instruction(struct kprobe *p, struct pt_regs *regs,</div><div class='add'>+					struct kprobe_ctlblk *kcb)</div><div class='ctx'> {</div><div class='add'>+	union mips_instruction insn = p-&gt;opcode;</div><div class='add'>+	long epc;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	epc = regs-&gt;cp0_epc;</div><div class='add'>+	if (epc &amp; 3)</div><div class='add'>+		goto unaligned;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;ainsn.insn-&gt;word == 0)</div><div class='add'>+		kcb-&gt;flags |= SKIP_DELAYSLOT;</div><div class='add'>+	else</div><div class='add'>+		kcb-&gt;flags &amp;= ~SKIP_DELAYSLOT;</div><div class='add'>+</div><div class='add'>+	ret = __compute_return_epc_for_insn(regs, insn);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ret == BRANCH_LIKELY_TAKEN)</div><div class='add'>+		kcb-&gt;flags |= SKIP_DELAYSLOT;</div><div class='add'>+</div><div class='add'>+	kcb-&gt;target_epc = regs-&gt;cp0_epc;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unaligned:</div><div class='add'>+	pr_notice("%s: unaligned epc - sending SIGBUS.\n", current-&gt;comm);</div><div class='add'>+	force_sig(SIGBUS, current);</div><div class='add'>+	return -EFAULT;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prepare_singlestep(struct kprobe *p, struct pt_regs *regs,</div><div class='add'>+						struct kprobe_ctlblk *kcb)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='ctx'> 	regs-&gt;cp0_status &amp;= ~ST0_IE;</div><div class='ctx'> </div><div class='ctx'> 	/* single step inline if the instruction is a break */</div><div class='ctx'> 	if (p-&gt;opcode.word == breakpoint_insn.word ||</div><div class='ctx'> 	    p-&gt;opcode.word == breakpoint2_insn.word)</div><div class='ctx'> 		regs-&gt;cp0_epc = (unsigned long)p-&gt;addr;</div><div class='del'>-	else</div><div class='del'>-		regs-&gt;cp0_epc = (unsigned long)&amp;p-&gt;ainsn.insn[0];</div><div class='add'>+	else if (insn_has_delayslot(p-&gt;opcode)) {</div><div class='add'>+		ret = evaluate_branch_instruction(p, regs, kcb);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			pr_notice("Kprobes: Error in evaluating branch\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	regs-&gt;cp0_epc = (unsigned long)&amp;p-&gt;ainsn.insn[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called after single-stepping.  p-&gt;addr is the address of the</div><div class='add'>+ * instruction whose first byte has been replaced by the "break 0"</div><div class='add'>+ * instruction.  To avoid the SMP problems that can occur when we</div><div class='add'>+ * temporarily put back the original opcode to single-step, we</div><div class='add'>+ * single-stepped a copy of the instruction.  The address of this</div><div class='add'>+ * copy is p-&gt;ainsn.insn.</div><div class='add'>+ *</div><div class='add'>+ * This function prepares to return from the post-single-step</div><div class='add'>+ * breakpoint trap. In case of branch instructions, the target</div><div class='add'>+ * epc to be restored.</div><div class='add'>+ */</div><div class='add'>+static void __kprobes resume_execution(struct kprobe *p,</div><div class='add'>+				       struct pt_regs *regs,</div><div class='add'>+				       struct kprobe_ctlblk *kcb)</div><div class='add'>+{</div><div class='add'>+	if (insn_has_delayslot(p-&gt;opcode))</div><div class='add'>+		regs-&gt;cp0_epc = kcb-&gt;target_epc;</div><div class='add'>+	else {</div><div class='add'>+		unsigned long orig_epc = kcb-&gt;kprobe_saved_epc;</div><div class='add'>+		regs-&gt;cp0_epc = orig_epc + 4;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __kprobes kprobe_handler(struct pt_regs *regs)</div><div class='hunk'>@@ -239,8 +364,13 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)</div><div class='ctx'> 			save_previous_kprobe(kcb);</div><div class='ctx'> 			set_current_kprobe(p, regs, kcb);</div><div class='ctx'> 			kprobes_inc_nmissed_count(p);</div><div class='del'>-			prepare_singlestep(p, regs);</div><div class='add'>+			prepare_singlestep(p, regs, kcb);</div><div class='ctx'> 			kcb-&gt;kprobe_status = KPROBE_REENTER;</div><div class='add'>+			if (kcb-&gt;flags &amp; SKIP_DELAYSLOT) {</div><div class='add'>+				resume_execution(p, regs, kcb);</div><div class='add'>+				restore_previous_kprobe(kcb);</div><div class='add'>+				preempt_enable_no_resched();</div><div class='add'>+			}</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (addr-&gt;word != breakpoint_insn.word) {</div><div class='hunk'>@@ -284,8 +414,16 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> ss_probe:</div><div class='del'>-	prepare_singlestep(p, regs);</div><div class='del'>-	kcb-&gt;kprobe_status = KPROBE_HIT_SS;</div><div class='add'>+	prepare_singlestep(p, regs, kcb);</div><div class='add'>+	if (kcb-&gt;flags &amp; SKIP_DELAYSLOT) {</div><div class='add'>+		kcb-&gt;kprobe_status = KPROBE_HIT_SSDONE;</div><div class='add'>+		if (p-&gt;post_handler)</div><div class='add'>+			p-&gt;post_handler(p, regs, 0);</div><div class='add'>+		resume_execution(p, regs, kcb);</div><div class='add'>+		preempt_enable_no_resched();</div><div class='add'>+	} else</div><div class='add'>+		kcb-&gt;kprobe_status = KPROBE_HIT_SS;</div><div class='add'>+</div><div class='ctx'> 	return 1;</div><div class='ctx'> </div><div class='ctx'> no_kprobe:</div><div class='hunk'>@@ -294,25 +432,6 @@ no_kprobe:</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Called after single-stepping.  p-&gt;addr is the address of the</div><div class='del'>- * instruction whose first byte has been replaced by the "break 0"</div><div class='del'>- * instruction.  To avoid the SMP problems that can occur when we</div><div class='del'>- * temporarily put back the original opcode to single-step, we</div><div class='del'>- * single-stepped a copy of the instruction.  The address of this</div><div class='del'>- * copy is p-&gt;ainsn.insn.</div><div class='del'>- *</div><div class='del'>- * This function prepares to return from the post-single-step</div><div class='del'>- * breakpoint trap.</div><div class='del'>- */</div><div class='del'>-static void __kprobes resume_execution(struct kprobe *p,</div><div class='del'>-				       struct pt_regs *regs,</div><div class='del'>-				       struct kprobe_ctlblk *kcb)</div><div class='del'>-{</div><div class='del'>-	unsigned long orig_epc = kcb-&gt;kprobe_saved_epc;</div><div class='del'>-	regs-&gt;cp0_epc = orig_epc + 4;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int post_kprobe_handler(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct kprobe *cur = kprobe_running();</div><div class='head'>diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c<br/>index 315fc0b250f8..e3b897acfbc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/perf_event_mipsxx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/perf_event_mipsxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/perf_event_mipsxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/perf_event_mipsxx.c</a></div><div class='hunk'>@@ -621,11 +621,6 @@ static int mipspmu_event_init(struct perf_event *event)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (!atomic_inc_not_zero(&amp;active_events)) {</div><div class='del'>-		if (atomic_read(&amp;active_events) &gt; MIPS_MAX_HWEVENTS) {</div><div class='del'>-			atomic_dec(&amp;active_events);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		mutex_lock(&amp;pmu_reserve_mutex);</div><div class='ctx'> 		if (atomic_read(&amp;active_events) == 0)</div><div class='ctx'> 			err = mipspmu_get_irq();</div><div class='hunk'>@@ -638,11 +633,7 @@ static int mipspmu_event_init(struct perf_event *event)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = __hw_perf_event_init(event);</div><div class='del'>-	if (err)</div><div class='del'>-		hw_perf_event_destroy(event);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return __hw_perf_event_init(event);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pmu pmu = {</div><div class='hunk'>@@ -712,18 +703,6 @@ static const struct mips_perf_event *mipspmu_map_cache_event(u64 config)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int validate_event(struct cpu_hw_events *cpuc,</div><div class='del'>-	       struct perf_event *event)</div><div class='del'>-{</div><div class='del'>-	struct hw_perf_event fake_hwc = event-&gt;hw;</div><div class='del'>-</div><div class='del'>-	/* Allow mixed event group. So return 1 to pass validation. */</div><div class='del'>-	if (event-&gt;pmu != &amp;pmu || event-&gt;state &lt;= PERF_EVENT_STATE_OFF)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return mipsxx_pmu_alloc_counter(cpuc, &amp;fake_hwc) &gt;= 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int validate_group(struct perf_event *event)</div><div class='ctx'> {</div><div class='ctx'> 	struct perf_event *sibling, *leader = event-&gt;group_leader;</div><div class='hunk'>@@ -731,15 +710,15 @@ static int validate_group(struct perf_event *event)</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;fake_cpuc, 0, sizeof(fake_cpuc));</div><div class='ctx'> </div><div class='del'>-	if (!validate_event(&amp;fake_cpuc, leader))</div><div class='add'>+	if (mipsxx_pmu_alloc_counter(&amp;fake_cpuc, &amp;leader-&gt;hw) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(sibling, &amp;leader-&gt;sibling_list, group_entry) {</div><div class='del'>-		if (!validate_event(&amp;fake_cpuc, sibling))</div><div class='add'>+		if (mipsxx_pmu_alloc_counter(&amp;fake_cpuc, &amp;sibling-&gt;hw) &lt; 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!validate_event(&amp;fake_cpuc, event))</div><div class='add'>+	if (mipsxx_pmu_alloc_counter(&amp;fake_cpuc, &amp;event-&gt;hw) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1279,13 +1258,14 @@ static int __hw_perf_event_init(struct perf_event *event)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='del'>-	if (event-&gt;group_leader != event) {</div><div class='add'>+	if (event-&gt;group_leader != event)</div><div class='ctx'> 		err = validate_group(event);</div><div class='del'>-		if (err)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	event-&gt;destroy = hw_perf_event_destroy;</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		event-&gt;destroy(event);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1380,20 +1360,10 @@ static irqreturn_t mipsxx_pmu_handle_irq(int irq, void *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* 24K */</div><div class='del'>-#define IS_UNSUPPORTED_24K_EVENT(r, b)					\</div><div class='del'>-	((b) == 12 || (r) == 151 || (r) == 152 || (b) == 26 ||		\</div><div class='del'>-	 (b) == 27 || (r) == 28 || (r) == 158 || (b) == 31 ||		\</div><div class='del'>-	 (b) == 32 || (b) == 34 || (b) == 36 || (r) == 168 ||		\</div><div class='del'>-	 (r) == 172 || (b) == 47 || ((b) &gt;= 56 &amp;&amp; (b) &lt;= 63) ||		\</div><div class='del'>-	 ((b) &gt;= 68 &amp;&amp; (b) &lt;= 127))</div><div class='ctx'> #define IS_BOTH_COUNTERS_24K_EVENT(b)					\</div><div class='ctx'> 	((b) == 0 || (b) == 1 || (b) == 11)</div><div class='ctx'> </div><div class='ctx'> /* 34K */</div><div class='del'>-#define IS_UNSUPPORTED_34K_EVENT(r, b)					\</div><div class='del'>-	((b) == 12 || (r) == 27 || (r) == 158 || (b) == 36 ||		\</div><div class='del'>-	 (b) == 38 || (r) == 175 || ((b) &gt;= 56 &amp;&amp; (b) &lt;= 63) ||		\</div><div class='del'>-	 ((b) &gt;= 68 &amp;&amp; (b) &lt;= 127))</div><div class='ctx'> #define IS_BOTH_COUNTERS_34K_EVENT(b)					\</div><div class='ctx'> 	((b) == 0 || (b) == 1 || (b) == 11)</div><div class='ctx'> #ifdef CONFIG_MIPS_MT_SMP</div><div class='hunk'>@@ -1406,20 +1376,10 @@ static irqreturn_t mipsxx_pmu_handle_irq(int irq, void *dev)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* 74K */</div><div class='del'>-#define IS_UNSUPPORTED_74K_EVENT(r, b)					\</div><div class='del'>-	((r) == 5 || ((r) &gt;= 135 &amp;&amp; (r) &lt;= 137) ||			\</div><div class='del'>-	 ((b) &gt;= 10 &amp;&amp; (b) &lt;= 12) || (b) == 22 || (b) == 27 ||		\</div><div class='del'>-	 (b) == 33 || (b) == 34 || ((b) &gt;= 47 &amp;&amp; (b) &lt;= 49) ||		\</div><div class='del'>-	 (r) == 178 || (b) == 55 || (b) == 57 || (b) == 60 ||		\</div><div class='del'>-	 (b) == 61 || (r) == 62 || (r) == 191 ||			\</div><div class='del'>-	 ((b) &gt;= 64 &amp;&amp; (b) &lt;= 127))</div><div class='ctx'> #define IS_BOTH_COUNTERS_74K_EVENT(b)					\</div><div class='ctx'> 	((b) == 0 || (b) == 1)</div><div class='ctx'> </div><div class='ctx'> /* 1004K */</div><div class='del'>-#define IS_UNSUPPORTED_1004K_EVENT(r, b)				\</div><div class='del'>-	((b) == 12 || (r) == 27 || (r) == 158 || (b) == 38 ||		\</div><div class='del'>-	 (r) == 175 || (b) == 63 || ((b) &gt;= 68 &amp;&amp; (b) &lt;= 127))</div><div class='ctx'> #define IS_BOTH_COUNTERS_1004K_EVENT(b)					\</div><div class='ctx'> 	((b) == 0 || (b) == 1 || (b) == 11)</div><div class='ctx'> #ifdef CONFIG_MIPS_MT_SMP</div><div class='hunk'>@@ -1445,11 +1405,10 @@ static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config)</div><div class='ctx'> 	unsigned int raw_id = config &amp; 0xff;</div><div class='ctx'> 	unsigned int base_id = raw_id &amp; 0x7f;</div><div class='ctx'> </div><div class='add'>+	raw_event.event_id = base_id;</div><div class='add'>+</div><div class='ctx'> 	switch (current_cpu_type()) {</div><div class='ctx'> 	case CPU_24K:</div><div class='del'>-		if (IS_UNSUPPORTED_24K_EVENT(raw_id, base_id))</div><div class='del'>-			return ERR_PTR(-EOPNOTSUPP);</div><div class='del'>-		raw_event.event_id = base_id;</div><div class='ctx'> 		if (IS_BOTH_COUNTERS_24K_EVENT(base_id))</div><div class='ctx'> 			raw_event.cntr_mask = CNTR_EVEN | CNTR_ODD;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1464,9 +1423,6 @@ static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config)</div><div class='ctx'> #endif</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPU_34K:</div><div class='del'>-		if (IS_UNSUPPORTED_34K_EVENT(raw_id, base_id))</div><div class='del'>-			return ERR_PTR(-EOPNOTSUPP);</div><div class='del'>-		raw_event.event_id = base_id;</div><div class='ctx'> 		if (IS_BOTH_COUNTERS_34K_EVENT(base_id))</div><div class='ctx'> 			raw_event.cntr_mask = CNTR_EVEN | CNTR_ODD;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1482,9 +1438,6 @@ static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config)</div><div class='ctx'> #endif</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPU_74K:</div><div class='del'>-		if (IS_UNSUPPORTED_74K_EVENT(raw_id, base_id))</div><div class='del'>-			return ERR_PTR(-EOPNOTSUPP);</div><div class='del'>-		raw_event.event_id = base_id;</div><div class='ctx'> 		if (IS_BOTH_COUNTERS_74K_EVENT(base_id))</div><div class='ctx'> 			raw_event.cntr_mask = CNTR_EVEN | CNTR_ODD;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1495,9 +1448,6 @@ static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config)</div><div class='ctx'> #endif</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPU_1004K:</div><div class='del'>-		if (IS_UNSUPPORTED_1004K_EVENT(raw_id, base_id))</div><div class='del'>-			return ERR_PTR(-EOPNOTSUPP);</div><div class='del'>-		raw_event.event_id = base_id;</div><div class='ctx'> 		if (IS_BOTH_COUNTERS_1004K_EVENT(base_id))</div><div class='ctx'> 			raw_event.cntr_mask = CNTR_EVEN | CNTR_ODD;</div><div class='ctx'> 		else</div><div class='head'>diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c<br/>index 4e6ea1ffad46..7786b608d932 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/ptrace.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/ptrace.c</a></div><div class='hunk'>@@ -560,10 +560,9 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if (unlikely(current-&gt;audit_context))</div><div class='del'>-		audit_syscall_entry(audit_arch(), regs-&gt;regs[2],</div><div class='del'>-				    regs-&gt;regs[4], regs-&gt;regs[5],</div><div class='del'>-				    regs-&gt;regs[6], regs-&gt;regs[7]);</div><div class='add'>+	audit_syscall_entry(audit_arch(), regs-&gt;regs[2],</div><div class='add'>+			    regs-&gt;regs[4], regs-&gt;regs[5],</div><div class='add'>+			    regs-&gt;regs[6], regs-&gt;regs[7]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -572,9 +571,7 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> asmlinkage void syscall_trace_leave(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(current-&gt;audit_context))</div><div class='del'>-		audit_syscall_exit(AUDITSC_RESULT(regs-&gt;regs[7]),</div><div class='del'>-		                   -regs-&gt;regs[2]);</div><div class='add'>+	audit_syscall_exit(regs);</div><div class='ctx'> </div><div class='ctx'> 	if (!(current-&gt;ptrace &amp; PT_PTRACED))</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c<br/>index 933166f44a6d..a9d801dec6b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/rtlx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/rtlx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/rtlx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/rtlx.c</a></div><div class='hunk'>@@ -473,7 +473,6 @@ static const struct file_operations rtlx_fops = {</div><div class='ctx'> </div><div class='ctx'> static struct irqaction rtlx_irq = {</div><div class='ctx'> 	.handler	= rtlx_interrupt,</div><div class='del'>-	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.name		= "RTLX",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c<br/>index b1cb8f87d7b4..058e964e7303 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/setup.c</a></div><div class='hunk'>@@ -122,6 +122,9 @@ static void __init print_memory_map(void)</div><div class='ctx'> 		case BOOT_MEM_RAM:</div><div class='ctx'> 			printk(KERN_CONT "(usable)\n");</div><div class='ctx'> 			break;</div><div class='add'>+		case BOOT_MEM_INIT_RAM:</div><div class='add'>+			printk(KERN_CONT "(usable after init)\n");</div><div class='add'>+			break;</div><div class='ctx'> 		case BOOT_MEM_ROM_DATA:</div><div class='ctx'> 			printk(KERN_CONT "(ROM data)\n");</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -362,15 +365,24 @@ static void __init bootmem_init(void)</div><div class='ctx'> 	for (i = 0; i &lt; boot_mem_map.nr_map; i++) {</div><div class='ctx'> 		unsigned long start, end, size;</div><div class='ctx'> </div><div class='add'>+		start = PFN_UP(boot_mem_map.map[i].addr);</div><div class='add'>+		end   = PFN_DOWN(boot_mem_map.map[i].addr</div><div class='add'>+				    + boot_mem_map.map[i].size);</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Reserve usable memory.</div><div class='ctx'> 		 */</div><div class='del'>-		if (boot_mem_map.map[i].type != BOOT_MEM_RAM)</div><div class='add'>+		switch (boot_mem_map.map[i].type) {</div><div class='add'>+		case BOOT_MEM_RAM:</div><div class='add'>+			break;</div><div class='add'>+		case BOOT_MEM_INIT_RAM:</div><div class='add'>+			memory_present(0, start, end);</div><div class='ctx'> 			continue;</div><div class='add'>+		default:</div><div class='add'>+			/* Not usable memory */</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		start = PFN_UP(boot_mem_map.map[i].addr);</div><div class='del'>-		end   = PFN_DOWN(boot_mem_map.map[i].addr</div><div class='del'>-				    + boot_mem_map.map[i].size);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We are rounding up the start address of usable memory</div><div class='ctx'> 		 * and at the end of the usable range downwards.</div><div class='hunk'>@@ -456,11 +468,33 @@ early_param("mem", early_parse_mem);</div><div class='ctx'> </div><div class='ctx'> static void __init arch_mem_init(char **cmdline_p)</div><div class='ctx'> {</div><div class='add'>+	phys_t init_mem, init_end, init_size;</div><div class='add'>+</div><div class='ctx'> 	extern void plat_mem_setup(void);</div><div class='ctx'> </div><div class='ctx'> 	/* call board setup routine */</div><div class='ctx'> 	plat_mem_setup();</div><div class='ctx'> </div><div class='add'>+	init_mem = PFN_UP(__pa_symbol(&amp;__init_begin)) &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	init_end = PFN_DOWN(__pa_symbol(&amp;__init_end)) &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	init_size = init_end - init_mem;</div><div class='add'>+	if (init_size) {</div><div class='add'>+		/* Make sure it is in the boot_mem_map */</div><div class='add'>+		int i, found;</div><div class='add'>+		found = 0;</div><div class='add'>+		for (i = 0; i &lt; boot_mem_map.nr_map; i++) {</div><div class='add'>+			if (init_mem &gt;= boot_mem_map.map[i].addr &amp;&amp;</div><div class='add'>+			    init_mem &lt; (boot_mem_map.map[i].addr +</div><div class='add'>+					boot_mem_map.map[i].size)) {</div><div class='add'>+				found = 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (!found)</div><div class='add'>+			add_memory_region(init_mem, init_size,</div><div class='add'>+					  BOOT_MEM_INIT_RAM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	pr_info("Determined physical RAM map:\n");</div><div class='ctx'> 	print_memory_map();</div><div class='ctx'> </div><div class='hunk'>@@ -524,6 +558,7 @@ static void __init resource_init(void)</div><div class='ctx'> 		res = alloc_bootmem(sizeof(struct resource));</div><div class='ctx'> 		switch (boot_mem_map.map[i].type) {</div><div class='ctx'> 		case BOOT_MEM_RAM:</div><div class='add'>+		case BOOT_MEM_INIT_RAM:</div><div class='ctx'> 		case BOOT_MEM_ROM_DATA:</div><div class='ctx'> 			res-&gt;name = "System RAM";</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c<br/>new file mode 100644<br/>index 000000000000..58fe71afd879<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/smp-bmips.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/smp-bmips.c</a></div><div class='hunk'>@@ -0,0 +1,458 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 by Kevin Cernekee (cernekee@gmail.com)</div><div class='add'>+ *</div><div class='add'>+ * SMP support for BMIPS</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/reboot.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/pmon.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/tlbflush.h&gt;</div><div class='add'>+#include &lt;asm/mipsregs.h&gt;</div><div class='add'>+#include &lt;asm/bmips.h&gt;</div><div class='add'>+#include &lt;asm/traps.h&gt;</div><div class='add'>+#include &lt;asm/barrier.h&gt;</div><div class='add'>+</div><div class='add'>+static int __maybe_unused max_cpus = 1;</div><div class='add'>+</div><div class='add'>+/* these may be configured by the platform code */</div><div class='add'>+int bmips_smp_enabled = 1;</div><div class='add'>+int bmips_cpu_offset;</div><div class='add'>+cpumask_t bmips_booted_mask;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+</div><div class='add'>+/* initial $sp, $gp - used by arch/mips/kernel/bmips_vec.S */</div><div class='add'>+unsigned long bmips_smp_boot_sp;</div><div class='add'>+unsigned long bmips_smp_boot_gp;</div><div class='add'>+</div><div class='add'>+static void bmips_send_ipi_single(int cpu, unsigned int action);</div><div class='add'>+static irqreturn_t bmips_ipi_interrupt(int irq, void *dev_id);</div><div class='add'>+</div><div class='add'>+/* SW interrupts 0,1 are used for interprocessor signaling */</div><div class='add'>+#define IPI0_IRQ			(MIPS_CPU_IRQ_BASE + 0)</div><div class='add'>+#define IPI1_IRQ			(MIPS_CPU_IRQ_BASE + 1)</div><div class='add'>+</div><div class='add'>+#define CPUNUM(cpu, shift)		(((cpu) + bmips_cpu_offset) &lt;&lt; (shift))</div><div class='add'>+#define ACTION_CLR_IPI(cpu, ipi)	(0x2000 | CPUNUM(cpu, 9) | ((ipi) &lt;&lt; 8))</div><div class='add'>+#define ACTION_SET_IPI(cpu, ipi)	(0x3000 | CPUNUM(cpu, 9) | ((ipi) &lt;&lt; 8))</div><div class='add'>+#define ACTION_BOOT_THREAD(cpu)		(0x08 | CPUNUM(cpu, 0))</div><div class='add'>+</div><div class='add'>+static void __init bmips_smp_setup(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CPU_BMIPS4350) || defined(CONFIG_CPU_BMIPS4380)</div><div class='add'>+	/* arbitration priority */</div><div class='add'>+	clear_c0_brcm_cmt_ctrl(0x30);</div><div class='add'>+</div><div class='add'>+	/* NBK and weak order flags */</div><div class='add'>+	set_c0_brcm_config_0(0x30000);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * MIPS interrupts 0,1 (SW INT 0,1) cross over to the other thread</div><div class='add'>+	 * MIPS interrupt 2 (HW INT 0) is the CPU0 L1 controller output</div><div class='add'>+	 * MIPS interrupt 3 (HW INT 1) is the CPU1 L1 controller output</div><div class='add'>+	 */</div><div class='add'>+	change_c0_brcm_cmt_intr(0xf8018000,</div><div class='add'>+		(0x02 &lt;&lt; 27) | (0x03 &lt;&lt; 15));</div><div class='add'>+</div><div class='add'>+	/* single core, 2 threads (2 pipelines) */</div><div class='add'>+	max_cpus = 2;</div><div class='add'>+#elif defined(CONFIG_CPU_BMIPS5000)</div><div class='add'>+	/* enable raceless SW interrupts */</div><div class='add'>+	set_c0_brcm_config(0x03 &lt;&lt; 22);</div><div class='add'>+</div><div class='add'>+	/* route HW interrupt 0 to CPU0, HW interrupt 1 to CPU1 */</div><div class='add'>+	change_c0_brcm_mode(0x1f &lt;&lt; 27, 0x02 &lt;&lt; 27);</div><div class='add'>+</div><div class='add'>+	/* N cores, 2 threads per core */</div><div class='add'>+	max_cpus = (((read_c0_brcm_config() &gt;&gt; 6) &amp; 0x03) + 1) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	/* clear any pending SW interrupts */</div><div class='add'>+	for (i = 0; i &lt; max_cpus; i++) {</div><div class='add'>+		write_c0_brcm_action(ACTION_CLR_IPI(i, 0));</div><div class='add'>+		write_c0_brcm_action(ACTION_CLR_IPI(i, 1));</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (!bmips_smp_enabled)</div><div class='add'>+		max_cpus = 1;</div><div class='add'>+</div><div class='add'>+	/* this can be overridden by the BSP */</div><div class='add'>+	if (!board_ebase_setup)</div><div class='add'>+		board_ebase_setup = &amp;bmips_ebase_setup;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; max_cpus; i++) {</div><div class='add'>+		__cpu_number_map[i] = 1;</div><div class='add'>+		__cpu_logical_map[i] = 1;</div><div class='add'>+		set_cpu_possible(i, 1);</div><div class='add'>+		set_cpu_present(i, 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IPI IRQ setup - runs on CPU0</div><div class='add'>+ */</div><div class='add'>+static void bmips_prepare_cpus(unsigned int max_cpus)</div><div class='add'>+{</div><div class='add'>+	if (request_irq(IPI0_IRQ, bmips_ipi_interrupt, IRQF_PERCPU,</div><div class='add'>+			"smp_ipi0", NULL))</div><div class='add'>+		panic("Can't request IPI0 interrupt\n");</div><div class='add'>+	if (request_irq(IPI1_IRQ, bmips_ipi_interrupt, IRQF_PERCPU,</div><div class='add'>+			"smp_ipi1", NULL))</div><div class='add'>+		panic("Can't request IPI1 interrupt\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Tell the hardware to boot CPUx - runs on CPU0</div><div class='add'>+ */</div><div class='add'>+static void bmips_boot_secondary(int cpu, struct task_struct *idle)</div><div class='add'>+{</div><div class='add'>+	bmips_smp_boot_sp = __KSTK_TOS(idle);</div><div class='add'>+	bmips_smp_boot_gp = (unsigned long)task_thread_info(idle);</div><div class='add'>+	mb();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Initial boot sequence for secondary CPU:</div><div class='add'>+	 *   bmips_reset_nmi_vec @ a000_0000 -&gt;</div><div class='add'>+	 *   bmips_smp_entry -&gt;</div><div class='add'>+	 *   plat_wired_tlb_setup (cached function call; optional) -&gt;</div><div class='add'>+	 *   start_secondary (cached jump)</div><div class='add'>+	 *</div><div class='add'>+	 * Warm restart sequence:</div><div class='add'>+	 *   play_dead WAIT loop -&gt;</div><div class='add'>+	 *   bmips_smp_int_vec @ BMIPS_WARM_RESTART_VEC -&gt;</div><div class='add'>+	 *   eret to play_dead -&gt;</div><div class='add'>+	 *   bmips_secondary_reentry -&gt;</div><div class='add'>+	 *   start_secondary</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	pr_info("SMP: Booting CPU%d...\n", cpu);</div><div class='add'>+</div><div class='add'>+	if (cpumask_test_cpu(cpu, &amp;bmips_booted_mask))</div><div class='add'>+		bmips_send_ipi_single(cpu, 0);</div><div class='add'>+	else {</div><div class='add'>+#if defined(CONFIG_CPU_BMIPS4350) || defined(CONFIG_CPU_BMIPS4380)</div><div class='add'>+		set_c0_brcm_cmt_ctrl(0x01);</div><div class='add'>+#elif defined(CONFIG_CPU_BMIPS5000)</div><div class='add'>+		if (cpu &amp; 0x01)</div><div class='add'>+			write_c0_brcm_action(ACTION_BOOT_THREAD(cpu));</div><div class='add'>+		else {</div><div class='add'>+			/*</div><div class='add'>+			 * core N thread 0 was already booted; just</div><div class='add'>+			 * pulse the NMI line</div><div class='add'>+			 */</div><div class='add'>+			bmips_write_zscm_reg(0x210, 0xc0000000);</div><div class='add'>+			udelay(10);</div><div class='add'>+			bmips_write_zscm_reg(0x210, 0x00);</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+		cpumask_set_cpu(cpu, &amp;bmips_booted_mask);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Early setup - runs on secondary CPU after cache probe</div><div class='add'>+ */</div><div class='add'>+static void bmips_init_secondary(void)</div><div class='add'>+{</div><div class='add'>+	/* move NMI vector to kseg0, in case XKS01 is enabled */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CPU_BMIPS4350) || defined(CONFIG_CPU_BMIPS4380)</div><div class='add'>+	void __iomem *cbr = BMIPS_GET_CBR();</div><div class='add'>+	unsigned long old_vec;</div><div class='add'>+</div><div class='add'>+	old_vec = __raw_readl(cbr + BMIPS_RELO_VECTOR_CONTROL_1);</div><div class='add'>+	__raw_writel(old_vec &amp; ~0x20000000, cbr + BMIPS_RELO_VECTOR_CONTROL_1);</div><div class='add'>+</div><div class='add'>+	clear_c0_cause(smp_processor_id() ? C_SW1 : C_SW0);</div><div class='add'>+#elif defined(CONFIG_CPU_BMIPS5000)</div><div class='add'>+	write_c0_brcm_bootvec(read_c0_brcm_bootvec() &amp;</div><div class='add'>+		(smp_processor_id() &amp; 0x01 ? ~0x20000000 : ~0x2000));</div><div class='add'>+</div><div class='add'>+	write_c0_brcm_action(ACTION_CLR_IPI(smp_processor_id(), 0));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* make sure there won't be a timer interrupt for a little while */</div><div class='add'>+	write_c0_compare(read_c0_count() + mips_hpt_frequency / HZ);</div><div class='add'>+</div><div class='add'>+	irq_enable_hazard();</div><div class='add'>+	set_c0_status(IE_SW0 | IE_SW1 | IE_IRQ1 | IE_IRQ5 | ST0_IE);</div><div class='add'>+	irq_enable_hazard();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Late setup - runs on secondary CPU before entering the idle loop</div><div class='add'>+ */</div><div class='add'>+static void bmips_smp_finish(void)</div><div class='add'>+{</div><div class='add'>+	pr_info("SMP: CPU%d is running\n", smp_processor_id());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Runs on CPU0 after all CPUs have been booted</div><div class='add'>+ */</div><div class='add'>+static void bmips_cpus_done(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CPU_BMIPS5000)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * BMIPS5000 raceless IPIs</div><div class='add'>+ *</div><div class='add'>+ * Each CPU has two inbound SW IRQs which are independent of all other CPUs.</div><div class='add'>+ * IPI0 is used for SMP_RESCHEDULE_YOURSELF</div><div class='add'>+ * IPI1 is used for SMP_CALL_FUNCTION</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void bmips_send_ipi_single(int cpu, unsigned int action)</div><div class='add'>+{</div><div class='add'>+	write_c0_brcm_action(ACTION_SET_IPI(cpu, action == SMP_CALL_FUNCTION));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t bmips_ipi_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	int action = irq - IPI0_IRQ;</div><div class='add'>+</div><div class='add'>+	write_c0_brcm_action(ACTION_CLR_IPI(smp_processor_id(), action));</div><div class='add'>+</div><div class='add'>+	if (action == 0)</div><div class='add'>+		scheduler_ipi();</div><div class='add'>+	else</div><div class='add'>+		smp_call_function_interrupt();</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * BMIPS43xx racey IPIs</div><div class='add'>+ *</div><div class='add'>+ * We use one inbound SW IRQ for each CPU.</div><div class='add'>+ *</div><div class='add'>+ * A spinlock must be held in order to keep CPUx from accidentally clearing</div><div class='add'>+ * an incoming IPI when it writes CP0 CAUSE to raise an IPI on CPUy.  The</div><div class='add'>+ * same spinlock is used to protect the action masks.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(ipi_lock);</div><div class='add'>+static DEFINE_PER_CPU(int, ipi_action_mask);</div><div class='add'>+</div><div class='add'>+static void bmips_send_ipi_single(int cpu, unsigned int action)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ipi_lock, flags);</div><div class='add'>+	set_c0_cause(cpu ? C_SW1 : C_SW0);</div><div class='add'>+	per_cpu(ipi_action_mask, cpu) |= action;</div><div class='add'>+	irq_enable_hazard();</div><div class='add'>+	spin_unlock_irqrestore(&amp;ipi_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t bmips_ipi_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int action, cpu = irq - IPI0_IRQ;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ipi_lock, flags);</div><div class='add'>+	action = __get_cpu_var(ipi_action_mask);</div><div class='add'>+	per_cpu(ipi_action_mask, cpu) = 0;</div><div class='add'>+	clear_c0_cause(cpu ? C_SW1 : C_SW0);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ipi_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (action &amp; SMP_RESCHEDULE_YOURSELF)</div><div class='add'>+		scheduler_ipi();</div><div class='add'>+	if (action &amp; SMP_CALL_FUNCTION)</div><div class='add'>+		smp_call_function_interrupt();</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* BMIPS type */</div><div class='add'>+</div><div class='add'>+static void bmips_send_ipi_mask(const struct cpumask *mask,</div><div class='add'>+	unsigned int action)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for_each_cpu(i, mask)</div><div class='add'>+		bmips_send_ipi_single(i, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='add'>+</div><div class='add'>+static int bmips_cpu_disable(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	if (cpu == 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	pr_info("SMP: CPU%d is offline\n", cpu);</div><div class='add'>+</div><div class='add'>+	cpu_clear(cpu, cpu_online_map);</div><div class='add'>+	cpu_clear(cpu, cpu_callin_map);</div><div class='add'>+</div><div class='add'>+	local_flush_tlb_all();</div><div class='add'>+	local_flush_icache_range(0, ~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 bmips_cpu_die(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __ref play_dead(void)</div><div class='add'>+{</div><div class='add'>+	idle_task_exit();</div><div class='add'>+</div><div class='add'>+	/* flush data cache */</div><div class='add'>+	_dma_cache_wback_inv(0, ~0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Wakeup is on SW0 or SW1; disable everything else</div><div class='add'>+	 * Use BEV !IV (BMIPS_WARM_RESTART_VEC) to avoid the regular Linux</div><div class='add'>+	 * IRQ handlers; this clears ST0_IE and returns immediately.</div><div class='add'>+	 */</div><div class='add'>+	clear_c0_cause(CAUSEF_IV | C_SW0 | C_SW1);</div><div class='add'>+	change_c0_status(IE_IRQ5 | IE_IRQ1 | IE_SW0 | IE_SW1 | ST0_IE | ST0_BEV,</div><div class='add'>+		IE_SW0 | IE_SW1 | ST0_IE | ST0_BEV);</div><div class='add'>+	irq_disable_hazard();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * wait for SW interrupt from bmips_boot_secondary(), then jump</div><div class='add'>+	 * back to start_secondary()</div><div class='add'>+	 */</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+	"	wait\n"</div><div class='add'>+	"	j	bmips_secondary_reentry\n"</div><div class='add'>+	: : : "memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_HOTPLUG_CPU */</div><div class='add'>+</div><div class='add'>+struct plat_smp_ops bmips_smp_ops = {</div><div class='add'>+	.smp_setup		= bmips_smp_setup,</div><div class='add'>+	.prepare_cpus		= bmips_prepare_cpus,</div><div class='add'>+	.boot_secondary		= bmips_boot_secondary,</div><div class='add'>+	.smp_finish		= bmips_smp_finish,</div><div class='add'>+	.init_secondary		= bmips_init_secondary,</div><div class='add'>+	.cpus_done		= bmips_cpus_done,</div><div class='add'>+	.send_ipi_single	= bmips_send_ipi_single,</div><div class='add'>+	.send_ipi_mask		= bmips_send_ipi_mask,</div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='add'>+	.cpu_disable		= bmips_cpu_disable,</div><div class='add'>+	.cpu_die		= bmips_cpu_die,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_SMP */</div><div class='add'>+</div><div class='add'>+/***********************************************************************</div><div class='add'>+ * BMIPS vector relocation</div><div class='add'>+ * This is primarily used for SMP boot, but it is applicable to some</div><div class='add'>+ * UP BMIPS systems as well.</div><div class='add'>+ ***********************************************************************/</div><div class='add'>+</div><div class='add'>+static void __cpuinit bmips_wr_vec(unsigned long dst, char *start, char *end)</div><div class='add'>+{</div><div class='add'>+	memcpy((void *)dst, start, end - start);</div><div class='add'>+	dma_cache_wback((unsigned long)start, end - start);</div><div class='add'>+	local_flush_icache_range(dst, dst + (end - start));</div><div class='add'>+	instruction_hazard();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __cpuinit bmips_nmi_handler_setup(void)</div><div class='add'>+{</div><div class='add'>+	bmips_wr_vec(BMIPS_NMI_RESET_VEC, &amp;bmips_reset_nmi_vec,</div><div class='add'>+		&amp;bmips_reset_nmi_vec_end);</div><div class='add'>+	bmips_wr_vec(BMIPS_WARM_RESTART_VEC, &amp;bmips_smp_int_vec,</div><div class='add'>+		&amp;bmips_smp_int_vec_end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __cpuinit bmips_ebase_setup(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long new_ebase = ebase;</div><div class='add'>+	void __iomem __maybe_unused *cbr;</div><div class='add'>+</div><div class='add'>+	BUG_ON(ebase != CKSEG0);</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CPU_BMIPS4350)</div><div class='add'>+	/*</div><div class='add'>+	 * BMIPS4350 cannot relocate the normal vectors, but it</div><div class='add'>+	 * can relocate the BEV=1 vectors.  So CPU1 starts up at</div><div class='add'>+	 * the relocated BEV=1, IV=0 general exception vector @</div><div class='add'>+	 * 0xa000_0380.</div><div class='add'>+	 *</div><div class='add'>+	 * set_uncached_handler() is used here because:</div><div class='add'>+	 *  - CPU1 will run this from uncached space</div><div class='add'>+	 *  - None of the cacheflush functions are set up yet</div><div class='add'>+	 */</div><div class='add'>+	set_uncached_handler(BMIPS_WARM_RESTART_VEC - CKSEG0,</div><div class='add'>+		&amp;bmips_smp_int_vec, 0x80);</div><div class='add'>+	__sync();</div><div class='add'>+	return;</div><div class='add'>+#elif defined(CONFIG_CPU_BMIPS4380)</div><div class='add'>+	/*</div><div class='add'>+	 * 0x8000_0000: reset/NMI (initially in kseg1)</div><div class='add'>+	 * 0x8000_0400: normal vectors</div><div class='add'>+	 */</div><div class='add'>+	new_ebase = 0x80000400;</div><div class='add'>+	cbr = BMIPS_GET_CBR();</div><div class='add'>+	__raw_writel(0x80080800, cbr + BMIPS_RELO_VECTOR_CONTROL_0);</div><div class='add'>+	__raw_writel(0xa0080800, cbr + BMIPS_RELO_VECTOR_CONTROL_1);</div><div class='add'>+#elif defined(CONFIG_CPU_BMIPS5000)</div><div class='add'>+	/*</div><div class='add'>+	 * 0x8000_0000: reset/NMI (initially in kseg1)</div><div class='add'>+	 * 0x8000_1000: normal vectors</div><div class='add'>+	 */</div><div class='add'>+	new_ebase = 0x80001000;</div><div class='add'>+	write_c0_brcm_bootvec(0xa0088008);</div><div class='add'>+	write_c0_ebase(new_ebase);</div><div class='add'>+	if (max_cpus &gt; 2)</div><div class='add'>+		bmips_write_zscm_reg(0xa0, 0xa008a008);</div><div class='add'>+#else</div><div class='add'>+	return;</div><div class='add'>+#endif</div><div class='add'>+	board_nmi_handler_setup = &amp;bmips_nmi_handler_setup;</div><div class='add'>+	ebase = new_ebase;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+asmlinkage void __weak plat_wired_tlb_setup(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Called when starting/restarting a secondary CPU.</div><div class='add'>+	 * Kernel stacks and other important data might only be accessible</div><div class='add'>+	 * once the wired entries are present.</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c<br/>index f0895e70e283..0a42ff3ff6a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/smtc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/smtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/smtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/smtc.c</a></div><div class='hunk'>@@ -559,7 +559,7 @@ void smtc_prepare_cpus(int cpus)</div><div class='ctx'> </div><div class='ctx'> 	pipi = kmalloc(nipi *sizeof(struct smtc_ipi), GFP_KERNEL);</div><div class='ctx'> 	if (pipi == NULL)</div><div class='del'>-		panic("kmalloc of IPI message buffers failed\n");</div><div class='add'>+		panic("kmalloc of IPI message buffers failed");</div><div class='ctx'> 	else</div><div class='ctx'> 		printk("IPI buffer pool of %d buffers\n", nipi);</div><div class='ctx'> 	for (i = 0; i &lt; nipi; i++) {</div><div class='hunk'>@@ -813,7 +813,7 @@ void smtc_send_ipi(int cpu, int type, unsigned int action)</div><div class='ctx'> 	if (pipi == NULL) {</div><div class='ctx'> 		bust_spinlocks(1);</div><div class='ctx'> 		mips_mt_regdump(dvpe());</div><div class='del'>-		panic("IPI Msg. Buffers Depleted\n");</div><div class='add'>+		panic("IPI Msg. Buffers Depleted");</div><div class='ctx'> 	}</div><div class='ctx'> 	pipi-&gt;type = type;</div><div class='ctx'> 	pipi-&gt;arg = (void *)action;</div><div class='hunk'>@@ -1130,7 +1130,7 @@ static void ipi_irq_dispatch(void)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction irq_ipi = {</div><div class='ctx'> 	.handler	= ipi_interrupt,</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_PERCPU,</div><div class='add'>+	.flags		= IRQF_PERCPU,</div><div class='ctx'> 	.name		= "SMTC_IPI"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c<br/>index 5c8a49d55054..cc4a3f120f54 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/traps.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/traps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/kernel/traps.c</a></div><div class='hunk'>@@ -91,6 +91,7 @@ int (*board_be_handler)(struct pt_regs *regs, int is_fixup);</div><div class='ctx'> void (*board_nmi_handler_setup)(void);</div><div class='ctx'> void (*board_ejtag_handler_setup)(void);</div><div class='ctx'> void (*board_bind_eic_interrupt)(int irq, int regset);</div><div class='add'>+void (*board_ebase_setup)(void);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void show_raw_backtrace(unsigned long reg29)</div><div class='hunk'>@@ -400,7 +401,7 @@ void __noreturn die(const char *str, struct pt_regs *regs)</div><div class='ctx'> 		panic("Fatal exception in interrupt");</div><div class='ctx'> </div><div class='ctx'> 	if (panic_on_oops) {</div><div class='del'>-		printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");</div><div class='add'>+		printk(KERN_EMERG "Fatal exception: panic in 5 seconds");</div><div class='ctx'> 		ssleep(5);</div><div class='ctx'> 		panic("Fatal exception");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1150,7 +1151,7 @@ asmlinkage void do_mt(struct pt_regs *regs)</div><div class='ctx'> asmlinkage void do_dsp(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	if (cpu_has_dsp)</div><div class='del'>-		panic("Unexpected DSP exception\n");</div><div class='add'>+		panic("Unexpected DSP exception");</div><div class='ctx'> </div><div class='ctx'> 	force_sig(SIGILL, current);</div><div class='ctx'> }</div><div class='hunk'>@@ -1339,9 +1340,18 @@ void ejtag_exception_handler(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * NMI exception handler.</div><div class='add'>+ * No lock; only written during early bootup by CPU 0.</div><div class='ctx'>  */</div><div class='del'>-NORET_TYPE void ATTRIB_NORET nmi_exception_handler(struct pt_regs *regs)</div><div class='add'>+static RAW_NOTIFIER_HEAD(nmi_chain);</div><div class='add'>+</div><div class='add'>+int register_nmi_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	return raw_notifier_chain_register(&amp;nmi_chain, nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __noreturn nmi_exception_handler(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='add'>+	raw_notifier_call_chain(&amp;nmi_chain, 0, regs);</div><div class='ctx'> 	bust_spinlocks(1);</div><div class='ctx'> 	printk("NMI taken!!!!\n");</div><div class='ctx'> 	die("NMI", regs);</div><div class='hunk'>@@ -1682,6 +1692,8 @@ void __init trap_init(void)</div><div class='ctx'> 			ebase += (read_c0_ebase() &amp; 0x3ffff000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (board_ebase_setup)</div><div class='add'>+		board_ebase_setup();</div><div class='ctx'> 	per_cpu_trap_init();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/mips/lantiq/clk.c b/arch/mips/lantiq/clk.c<br/>index 77ed70fc2fe5..412814fdd3ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/lantiq/clk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/lantiq/clk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lantiq/clk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/lantiq/clk.c</a></div><div class='hunk'>@@ -134,11 +134,11 @@ void __init plat_time_init(void)</div><div class='ctx'> 	struct clk *clk;</div><div class='ctx'> </div><div class='ctx'> 	if (insert_resource(&amp;iomem_resource, &amp;ltq_cgu_resource) &lt; 0)</div><div class='del'>-		panic("Failed to insert cgu memory\n");</div><div class='add'>+		panic("Failed to insert cgu memory");</div><div class='ctx'> </div><div class='ctx'> 	if (request_mem_region(ltq_cgu_resource.start,</div><div class='ctx'> 			resource_size(&amp;ltq_cgu_resource), "cgu") &lt; 0)</div><div class='del'>-		panic("Failed to request cgu memory\n");</div><div class='add'>+		panic("Failed to request cgu memory");</div><div class='ctx'> </div><div class='ctx'> 	ltq_cgu_membase = ioremap_nocache(ltq_cgu_resource.start,</div><div class='ctx'> 				resource_size(&amp;ltq_cgu_resource));</div><div class='head'>diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c<br/>index f9737bb3c5ab..d673731c538a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/lantiq/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/lantiq/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lantiq/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/lantiq/irq.c</a></div><div class='hunk'>@@ -240,7 +240,6 @@ out:</div><div class='ctx'> </div><div class='ctx'> static struct irqaction cascade = {</div><div class='ctx'> 	.handler = no_action,</div><div class='del'>-	.flags = IRQF_DISABLED,</div><div class='ctx'> 	.name = "cascade",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -249,28 +248,28 @@ void __init arch_init_irq(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (insert_resource(&amp;iomem_resource, &amp;ltq_icu_resource) &lt; 0)</div><div class='del'>-		panic("Failed to insert icu memory\n");</div><div class='add'>+		panic("Failed to insert icu memory");</div><div class='ctx'> </div><div class='ctx'> 	if (request_mem_region(ltq_icu_resource.start,</div><div class='ctx'> 			resource_size(&amp;ltq_icu_resource), "icu") &lt; 0)</div><div class='del'>-		panic("Failed to request icu memory\n");</div><div class='add'>+		panic("Failed to request icu memory");</div><div class='ctx'> </div><div class='ctx'> 	ltq_icu_membase = ioremap_nocache(ltq_icu_resource.start,</div><div class='ctx'> 				resource_size(&amp;ltq_icu_resource));</div><div class='ctx'> 	if (!ltq_icu_membase)</div><div class='del'>-		panic("Failed to remap icu memory\n");</div><div class='add'>+		panic("Failed to remap icu memory");</div><div class='ctx'> </div><div class='ctx'> 	if (insert_resource(&amp;iomem_resource, &amp;ltq_eiu_resource) &lt; 0)</div><div class='del'>-		panic("Failed to insert eiu memory\n");</div><div class='add'>+		panic("Failed to insert eiu memory");</div><div class='ctx'> </div><div class='ctx'> 	if (request_mem_region(ltq_eiu_resource.start,</div><div class='ctx'> 			resource_size(&amp;ltq_eiu_resource), "eiu") &lt; 0)</div><div class='del'>-		panic("Failed to request eiu memory\n");</div><div class='add'>+		panic("Failed to request eiu memory");</div><div class='ctx'> </div><div class='ctx'> 	ltq_eiu_membase = ioremap_nocache(ltq_eiu_resource.start,</div><div class='ctx'> 				resource_size(&amp;ltq_eiu_resource));</div><div class='ctx'> 	if (!ltq_eiu_membase)</div><div class='del'>-		panic("Failed to remap eiu memory\n");</div><div class='add'>+		panic("Failed to remap eiu memory");</div><div class='ctx'> </div><div class='ctx'> 	/* make sure all irqs are turned off by default */</div><div class='ctx'> 	for (i = 0; i &lt; 5; i++)</div><div class='head'>diff --git a/arch/mips/lantiq/xway/dma.c b/arch/mips/lantiq/xway/dma.c<br/>index cbb6ae5747b9..b210e936c7c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/lantiq/xway/dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/lantiq/xway/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lantiq/xway/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/lantiq/xway/dma.c</a></div><div class='hunk'>@@ -222,17 +222,17 @@ ltq_dma_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* insert and request the memory region */</div><div class='ctx'> 	if (insert_resource(&amp;iomem_resource, &amp;ltq_dma_resource) &lt; 0)</div><div class='del'>-		panic("Failed to insert dma memory\n");</div><div class='add'>+		panic("Failed to insert dma memory");</div><div class='ctx'> </div><div class='ctx'> 	if (request_mem_region(ltq_dma_resource.start,</div><div class='ctx'> 			resource_size(&amp;ltq_dma_resource), "dma") &lt; 0)</div><div class='del'>-		panic("Failed to request dma memory\n");</div><div class='add'>+		panic("Failed to request dma memory");</div><div class='ctx'> </div><div class='ctx'> 	/* remap dma register range */</div><div class='ctx'> 	ltq_dma_membase = ioremap_nocache(ltq_dma_resource.start,</div><div class='ctx'> 				resource_size(&amp;ltq_dma_resource));</div><div class='ctx'> 	if (!ltq_dma_membase)</div><div class='del'>-		panic("Failed to remap dma memory\n");</div><div class='add'>+		panic("Failed to remap dma memory");</div><div class='ctx'> </div><div class='ctx'> 	/* power up and reset the dma engine */</div><div class='ctx'> 	ltq_pmu_enable(PMU_DMA);</div><div class='head'>diff --git a/arch/mips/lantiq/xway/ebu.c b/arch/mips/lantiq/xway/ebu.c<br/>index 033b3184c7a7..862e3e830680 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/lantiq/xway/ebu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/lantiq/xway/ebu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lantiq/xway/ebu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/lantiq/xway/ebu.c</a></div><div class='hunk'>@@ -32,17 +32,17 @@ static int __init lantiq_ebu_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* insert and request the memory region */</div><div class='ctx'> 	if (insert_resource(&amp;iomem_resource, &amp;ltq_ebu_resource) &lt; 0)</div><div class='del'>-		panic("Failed to insert ebu memory\n");</div><div class='add'>+		panic("Failed to insert ebu memory");</div><div class='ctx'> </div><div class='ctx'> 	if (request_mem_region(ltq_ebu_resource.start,</div><div class='ctx'> 			resource_size(&amp;ltq_ebu_resource), "ebu") &lt; 0)</div><div class='del'>-		panic("Failed to request ebu memory\n");</div><div class='add'>+		panic("Failed to request ebu memory");</div><div class='ctx'> </div><div class='ctx'> 	/* remap ebu register range */</div><div class='ctx'> 	ltq_ebu_membase = ioremap_nocache(ltq_ebu_resource.start,</div><div class='ctx'> 				resource_size(&amp;ltq_ebu_resource));</div><div class='ctx'> 	if (!ltq_ebu_membase)</div><div class='del'>-		panic("Failed to remap ebu memory\n");</div><div class='add'>+		panic("Failed to remap ebu memory");</div><div class='ctx'> </div><div class='ctx'> 	/* make sure to unprotect the memory region where flash is located */</div><div class='ctx'> 	ltq_ebu_w32(ltq_ebu_r32(LTQ_EBU_BUSCON0) &amp; ~EBU_WRDIS, LTQ_EBU_BUSCON0);</div><div class='head'>diff --git a/arch/mips/lantiq/xway/pmu.c b/arch/mips/lantiq/xway/pmu.c<br/>index 39f0d2641cbf..fe85361e032e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/lantiq/xway/pmu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/lantiq/xway/pmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lantiq/xway/pmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/lantiq/xway/pmu.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@ void ltq_pmu_enable(unsigned int module)</div><div class='ctx'> 	do {} while (--err &amp;&amp; (ltq_pmu_r32(LTQ_PMU_PWDSR) &amp; module));</div><div class='ctx'> </div><div class='ctx'> 	if (!err)</div><div class='del'>-		panic("activating PMU module failed!\n");</div><div class='add'>+		panic("activating PMU module failed!");</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ltq_pmu_enable);</div><div class='ctx'> </div><div class='hunk'>@@ -53,16 +53,16 @@ EXPORT_SYMBOL(ltq_pmu_disable);</div><div class='ctx'> int __init ltq_pmu_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (insert_resource(&amp;iomem_resource, &amp;ltq_pmu_resource) &lt; 0)</div><div class='del'>-		panic("Failed to insert pmu memory\n");</div><div class='add'>+		panic("Failed to insert pmu memory");</div><div class='ctx'> </div><div class='ctx'> 	if (request_mem_region(ltq_pmu_resource.start,</div><div class='ctx'> 			resource_size(&amp;ltq_pmu_resource), "pmu") &lt; 0)</div><div class='del'>-		panic("Failed to request pmu memory\n");</div><div class='add'>+		panic("Failed to request pmu memory");</div><div class='ctx'> </div><div class='ctx'> 	ltq_pmu_membase = ioremap_nocache(ltq_pmu_resource.start,</div><div class='ctx'> 				resource_size(&amp;ltq_pmu_resource));</div><div class='ctx'> 	if (!ltq_pmu_membase)</div><div class='del'>-		panic("Failed to remap pmu memory\n");</div><div class='add'>+		panic("Failed to remap pmu memory");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/lantiq/xway/reset.c b/arch/mips/lantiq/xway/reset.c<br/>index 3d41f0bb5bf7..8b66bd87f0c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/lantiq/xway/reset.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/lantiq/xway/reset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lantiq/xway/reset.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/lantiq/xway/reset.c</a></div><div class='hunk'>@@ -69,17 +69,17 @@ static int __init mips_reboot_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* insert and request the memory region */</div><div class='ctx'> 	if (insert_resource(&amp;iomem_resource, &amp;ltq_rcu_resource) &lt; 0)</div><div class='del'>-		panic("Failed to insert rcu memory\n");</div><div class='add'>+		panic("Failed to insert rcu memory");</div><div class='ctx'> </div><div class='ctx'> 	if (request_mem_region(ltq_rcu_resource.start,</div><div class='ctx'> 			resource_size(&amp;ltq_rcu_resource), "rcu") &lt; 0)</div><div class='del'>-		panic("Failed to request rcu memory\n");</div><div class='add'>+		panic("Failed to request rcu memory");</div><div class='ctx'> </div><div class='ctx'> 	/* remap rcu register range */</div><div class='ctx'> 	ltq_rcu_membase = ioremap_nocache(ltq_rcu_resource.start,</div><div class='ctx'> 				resource_size(&amp;ltq_rcu_resource));</div><div class='ctx'> 	if (!ltq_rcu_membase)</div><div class='del'>-		panic("Failed to remap rcu memory\n");</div><div class='add'>+		panic("Failed to remap rcu memory");</div><div class='ctx'> </div><div class='ctx'> 	_machine_restart = ltq_machine_restart;</div><div class='ctx'> 	_machine_halt = ltq_machine_halt;</div><div class='head'>diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile<br/>index b2cad4fd5fc4..2a7c74fc15fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/lib/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/lib/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lib/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/lib/Makefile</a></div><div class='hunk'>@@ -29,6 +29,7 @@ obj-$(CONFIG_CPU_TX49XX)	+= dump_tlb.o</div><div class='ctx'> obj-$(CONFIG_CPU_VR41XX)	+= dump_tlb.o</div><div class='ctx'> obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= dump_tlb.o</div><div class='ctx'> obj-$(CONFIG_CPU_XLR)		+= dump_tlb.o</div><div class='add'>+obj-$(CONFIG_CPU_XLP)		+= dump_tlb.o</div><div class='ctx'> </div><div class='ctx'> # libgcc-style stuff needed in the kernel</div><div class='ctx'> obj-y += ashldi3.o ashrdi3.o cmpdi2.o lshrdi3.o ucmpdi2.o</div><div class='head'>diff --git a/arch/mips/lib/iomap-pci.c b/arch/mips/lib/iomap-pci.c<br/>index 2ab899c4b4ce..2635b1a96333 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/lib/iomap-pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/lib/iomap-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lib/iomap-pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/lib/iomap-pci.c</a></div><div class='hunk'>@@ -40,32 +40,6 @@ static void __iomem *ioport_map_pci(struct pci_dev *dev,</div><div class='ctx'> 	return (void __iomem *) (ctrl-&gt;io_map_base + port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Create a virtual mapping cookie for a PCI BAR (memory or IO)</div><div class='del'>- */</div><div class='del'>-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)</div><div class='del'>-{</div><div class='del'>-	resource_size_t start = pci_resource_start(dev, bar);</div><div class='del'>-	resource_size_t len = pci_resource_len(dev, bar);</div><div class='del'>-	unsigned long flags = pci_resource_flags(dev, bar);</div><div class='del'>-</div><div class='del'>-	if (!len || !start)</div><div class='del'>-		return NULL;</div><div class='del'>-	if (maxlen &amp;&amp; len &gt; maxlen)</div><div class='del'>-		len = maxlen;</div><div class='del'>-	if (flags &amp; IORESOURCE_IO)</div><div class='del'>-		return ioport_map_pci(dev, start, len);</div><div class='del'>-	if (flags &amp; IORESOURCE_MEM) {</div><div class='del'>-		if (flags &amp; IORESOURCE_CACHEABLE)</div><div class='del'>-			return ioremap(start, len);</div><div class='del'>-		return ioremap_nocache(start, len);</div><div class='del'>-	}</div><div class='del'>-	/* What? */</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(pci_iomap);</div><div class='del'>-</div><div class='ctx'> void pci_iounmap(struct pci_dev *dev, void __iomem * addr)</div><div class='ctx'> {</div><div class='ctx'> 	iounmap(addr);</div><div class='head'>diff --git a/arch/mips/loongson/common/cs5536/cs5536_mfgpt.c b/arch/mips/loongson/common/cs5536/cs5536_mfgpt.c<br/>index 0cb1b9760e34..5d1f48fa1a52 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/loongson/common/cs5536/cs5536_mfgpt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/loongson/common/cs5536/cs5536_mfgpt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/loongson/common/cs5536/cs5536_mfgpt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/loongson/common/cs5536/cs5536_mfgpt.c</a></div><div class='hunk'>@@ -111,7 +111,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction irq5 = {</div><div class='ctx'> 	.handler = timer_interrupt,</div><div class='del'>-	.flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_TIMER,</div><div class='add'>+	.flags = IRQF_NOBALANCING | IRQF_TIMER,</div><div class='ctx'> 	.name = "timer"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c<br/>index dbf2f93a5091..a03bf00a1a9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/math-emu/cp1emu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/math-emu/cp1emu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/math-emu/cp1emu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/math-emu/cp1emu.c</a></div><div class='hunk'>@@ -245,7 +245,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,</div><div class='ctx'> 		 */</div><div class='ctx'> 		emulpc = xcp-&gt;cp0_epc + 4;	/* Snapshot emulation target */</div><div class='ctx'> </div><div class='del'>-		if (__compute_return_epc(xcp)) {</div><div class='add'>+		if (__compute_return_epc(xcp) &lt; 0) {</div><div class='ctx'> #ifdef CP1DBG</div><div class='ctx'> 			printk("failed to emulate branch at %p\n",</div><div class='ctx'> 				(void *) (xcp-&gt;cp0_epc));</div><div class='head'>diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile<br/>index 4d8c1623eee2..4aa20280613e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/mm/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/mm/Makefile</a></div><div class='hunk'>@@ -3,8 +3,8 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-y				+= cache.o dma-default.o extable.o fault.o \</div><div class='del'>-				   init.o mmap.o tlbex.o tlbex-fault.o uasm.o \</div><div class='del'>-				   page.o</div><div class='add'>+				   gup.o init.o mmap.o page.o tlbex.o \</div><div class='add'>+				   tlbex-fault.o uasm.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_32BIT)		+= ioremap.o pgtable-32.o</div><div class='ctx'> obj-$(CONFIG_64BIT)		+= pgtable-64.o</div><div class='hunk'>@@ -31,6 +31,7 @@ obj-$(CONFIG_CPU_TX49XX)	+= c-r4k.o cex-gen.o tlb-r4k.o</div><div class='ctx'> obj-$(CONFIG_CPU_VR41XX)	+= c-r4k.o cex-gen.o tlb-r4k.o</div><div class='ctx'> obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= c-octeon.o cex-oct.o tlb-r4k.o</div><div class='ctx'> obj-$(CONFIG_CPU_XLR)		+= c-r4k.o tlb-r4k.o cex-gen.o</div><div class='add'>+obj-$(CONFIG_CPU_XLP)		+= c-r4k.o tlb-r4k.o cex-gen.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_IP22_CPU_SCACHE)	+= sc-ip22.o</div><div class='ctx'> obj-$(CONFIG_R5000_CPU_SCACHE)  += sc-r5k.o</div><div class='head'>diff --git a/arch/mips/mm/c-octeon.c b/arch/mips/mm/c-octeon.c<br/>index daa81f7284ac..cf7895db0739 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/c-octeon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/mm/c-octeon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/c-octeon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/mm/c-octeon.c</a></div><div class='hunk'>@@ -223,7 +223,7 @@ static void __cpuinit probe_octeon(void)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		panic("Unsupported Cavium Networks CPU type\n");</div><div class='add'>+		panic("Unsupported Cavium Networks CPU type");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c<br/>index a79fe9aa7721..4f9eb0b23036 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/c-r4k.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/mm/c-r4k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/c-r4k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/mm/c-r4k.c</a></div><div class='hunk'>@@ -1235,6 +1235,9 @@ static void __cpuinit setup_scache(void)</div><div class='ctx'> 		loongson2_sc_init();</div><div class='ctx'> 		return;</div><div class='ctx'> #endif</div><div class='add'>+	case CPU_XLP:</div><div class='add'>+		/* don't need to worry about L2, fully coherent */</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		if (c-&gt;isa_level == MIPS_CPU_ISA_M32R1 ||</div><div class='head'>diff --git a/arch/mips/mm/gup.c b/arch/mips/mm/gup.c<br/>new file mode 100644<br/>index 000000000000..33aadbcf170b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/gup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/mm/gup.c</a></div><div class='hunk'>@@ -0,0 +1,315 @@</div><div class='add'>+/*</div><div class='add'>+ * Lockless get_user_pages_fast for MIPS</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Nick Piggin</div><div class='add'>+ * Copyright (C) 2008 Novell Inc.</div><div class='add'>+ * Copyright (C) 2011 Ralf Baechle</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/vmstat.h&gt;</div><div class='add'>+#include &lt;linux/highmem.h&gt;</div><div class='add'>+#include &lt;linux/swap.h&gt;</div><div class='add'>+#include &lt;linux/hugetlb.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+</div><div class='add'>+static inline pte_t gup_get_pte(pte_t *ptep)</div><div class='add'>+{</div><div class='add'>+#if defined(CONFIG_64BIT_PHYS_ADDR) &amp;&amp; defined(CONFIG_CPU_MIPS32)</div><div class='add'>+	pte_t pte;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	pte.pte_low = ptep-&gt;pte_low;</div><div class='add'>+	smp_rmb();</div><div class='add'>+	pte.pte_high = ptep-&gt;pte_high;</div><div class='add'>+	smp_rmb();</div><div class='add'>+	if (unlikely(pte.pte_low != ptep-&gt;pte_low))</div><div class='add'>+		goto retry;</div><div class='add'>+</div><div class='add'>+	return pte;</div><div class='add'>+#else</div><div class='add'>+	return ACCESS_ONCE(*ptep);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gup_pte_range(pmd_t pmd, unsigned long addr, unsigned long end,</div><div class='add'>+			int write, struct page **pages, int *nr)</div><div class='add'>+{</div><div class='add'>+	pte_t *ptep = pte_offset_map(&amp;pmd, addr);</div><div class='add'>+	do {</div><div class='add'>+		pte_t pte = gup_get_pte(ptep);</div><div class='add'>+		struct page *page;</div><div class='add'>+</div><div class='add'>+		if (!pte_present(pte) ||</div><div class='add'>+		    pte_special(pte) || (write &amp;&amp; !pte_write(pte))) {</div><div class='add'>+			pte_unmap(ptep);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		VM_BUG_ON(!pfn_valid(pte_pfn(pte)));</div><div class='add'>+		page = pte_page(pte);</div><div class='add'>+		get_page(page);</div><div class='add'>+		SetPageReferenced(page);</div><div class='add'>+		pages[*nr] = page;</div><div class='add'>+		(*nr)++;</div><div class='add'>+</div><div class='add'>+	} while (ptep++, addr += PAGE_SIZE, addr != end);</div><div class='add'>+</div><div class='add'>+	pte_unmap(ptep - 1);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void get_head_page_multiple(struct page *page, int nr)</div><div class='add'>+{</div><div class='add'>+	VM_BUG_ON(page != compound_head(page));</div><div class='add'>+	VM_BUG_ON(page_count(page) == 0);</div><div class='add'>+	atomic_add(nr, &amp;page-&gt;_count);</div><div class='add'>+	SetPageReferenced(page);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gup_huge_pmd(pmd_t pmd, unsigned long addr, unsigned long end,</div><div class='add'>+			int write, struct page **pages, int *nr)</div><div class='add'>+{</div><div class='add'>+	pte_t pte = *(pte_t *)&amp;pmd;</div><div class='add'>+	struct page *head, *page;</div><div class='add'>+	int refs;</div><div class='add'>+</div><div class='add'>+	if (write &amp;&amp; !pte_write(pte))</div><div class='add'>+		return 0;</div><div class='add'>+	/* hugepages are never "special" */</div><div class='add'>+	VM_BUG_ON(pte_special(pte));</div><div class='add'>+	VM_BUG_ON(!pfn_valid(pte_pfn(pte)));</div><div class='add'>+</div><div class='add'>+	refs = 0;</div><div class='add'>+	head = pte_page(pte);</div><div class='add'>+	page = head + ((addr &amp; ~PMD_MASK) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	do {</div><div class='add'>+		VM_BUG_ON(compound_head(page) != head);</div><div class='add'>+		pages[*nr] = page;</div><div class='add'>+		if (PageTail(page))</div><div class='add'>+			get_huge_page_tail(page);</div><div class='add'>+		(*nr)++;</div><div class='add'>+		page++;</div><div class='add'>+		refs++;</div><div class='add'>+	} while (addr += PAGE_SIZE, addr != end);</div><div class='add'>+</div><div class='add'>+	get_head_page_multiple(head, refs);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gup_pmd_range(pud_t pud, unsigned long addr, unsigned long end,</div><div class='add'>+			int write, struct page **pages, int *nr)</div><div class='add'>+{</div><div class='add'>+	unsigned long next;</div><div class='add'>+	pmd_t *pmdp;</div><div class='add'>+</div><div class='add'>+	pmdp = pmd_offset(&amp;pud, addr);</div><div class='add'>+	do {</div><div class='add'>+		pmd_t pmd = *pmdp;</div><div class='add'>+</div><div class='add'>+		next = pmd_addr_end(addr, end);</div><div class='add'>+		/*</div><div class='add'>+		 * The pmd_trans_splitting() check below explains why</div><div class='add'>+		 * pmdp_splitting_flush has to flush the tlb, to stop</div><div class='add'>+		 * this gup-fast code from running while we set the</div><div class='add'>+		 * splitting bit in the pmd. Returning zero will take</div><div class='add'>+		 * the slow path that will call wait_split_huge_page()</div><div class='add'>+		 * if the pmd is still in splitting state. gup-fast</div><div class='add'>+		 * can't because it has irq disabled and</div><div class='add'>+		 * wait_split_huge_page() would never return as the</div><div class='add'>+		 * tlb flush IPI wouldn't run.</div><div class='add'>+		 */</div><div class='add'>+		if (pmd_none(pmd) || pmd_trans_splitting(pmd))</div><div class='add'>+			return 0;</div><div class='add'>+		if (unlikely(pmd_huge(pmd))) {</div><div class='add'>+			if (!gup_huge_pmd(pmd, addr, next, write, pages,nr))</div><div class='add'>+				return 0;</div><div class='add'>+		} else {</div><div class='add'>+			if (!gup_pte_range(pmd, addr, next, write, pages,nr))</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+	} while (pmdp++, addr = next, addr != end);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gup_huge_pud(pud_t pud, unsigned long addr, unsigned long end,</div><div class='add'>+			int write, struct page **pages, int *nr)</div><div class='add'>+{</div><div class='add'>+	pte_t pte = *(pte_t *)&amp;pud;</div><div class='add'>+	struct page *head, *page;</div><div class='add'>+	int refs;</div><div class='add'>+</div><div class='add'>+	if (write &amp;&amp; !pte_write(pte))</div><div class='add'>+		return 0;</div><div class='add'>+	/* hugepages are never "special" */</div><div class='add'>+	VM_BUG_ON(pte_special(pte));</div><div class='add'>+	VM_BUG_ON(!pfn_valid(pte_pfn(pte)));</div><div class='add'>+</div><div class='add'>+	refs = 0;</div><div class='add'>+	head = pte_page(pte);</div><div class='add'>+	page = head + ((addr &amp; ~PUD_MASK) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	do {</div><div class='add'>+		VM_BUG_ON(compound_head(page) != head);</div><div class='add'>+		pages[*nr] = page;</div><div class='add'>+		(*nr)++;</div><div class='add'>+		page++;</div><div class='add'>+		refs++;</div><div class='add'>+	} while (addr += PAGE_SIZE, addr != end);</div><div class='add'>+</div><div class='add'>+	get_head_page_multiple(head, refs);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gup_pud_range(pgd_t pgd, unsigned long addr, unsigned long end,</div><div class='add'>+			int write, struct page **pages, int *nr)</div><div class='add'>+{</div><div class='add'>+	unsigned long next;</div><div class='add'>+	pud_t *pudp;</div><div class='add'>+</div><div class='add'>+	pudp = pud_offset(&amp;pgd, addr);</div><div class='add'>+	do {</div><div class='add'>+		pud_t pud = *pudp;</div><div class='add'>+</div><div class='add'>+		next = pud_addr_end(addr, end);</div><div class='add'>+		if (pud_none(pud))</div><div class='add'>+			return 0;</div><div class='add'>+		if (unlikely(pud_huge(pud))) {</div><div class='add'>+			if (!gup_huge_pud(pud, addr, next, write, pages,nr))</div><div class='add'>+				return 0;</div><div class='add'>+		} else {</div><div class='add'>+			if (!gup_pmd_range(pud, addr, next, write, pages,nr))</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+	} while (pudp++, addr = next, addr != end);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Like get_user_pages_fast() except its IRQ-safe in that it won't fall</div><div class='add'>+ * back to the regular GUP.</div><div class='add'>+ */</div><div class='add'>+int __get_user_pages_fast(unsigned long start, int nr_pages, int write,</div><div class='add'>+			  struct page **pages)</div><div class='add'>+{</div><div class='add'>+	struct mm_struct *mm = current-&gt;mm;</div><div class='add'>+	unsigned long addr, len, end;</div><div class='add'>+	unsigned long next;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	pgd_t *pgdp;</div><div class='add'>+	int nr = 0;</div><div class='add'>+</div><div class='add'>+	start &amp;= PAGE_MASK;</div><div class='add'>+	addr = start;</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 (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,</div><div class='add'>+					(void __user *)start, len)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * XXX: batch / limit 'nr', to avoid large irq off latency</div><div class='add'>+	 * needs some instrumenting to determine the common sizes used by</div><div class='add'>+	 * important workloads (eg. DB2), and whether limiting the batch</div><div class='add'>+	 * size will decrease performance.</div><div class='add'>+	 *</div><div class='add'>+	 * It seems like we're in the clear for the moment. Direct-IO is</div><div class='add'>+	 * the main guy that batches up lots of get_user_pages, and even</div><div class='add'>+	 * they are limited to 64-at-a-time which is not so many.</div><div class='add'>+	 */</div><div class='add'>+	/*</div><div class='add'>+	 * This doesn't prevent pagetable teardown, but does prevent</div><div class='add'>+	 * the pagetables and pages from being freed.</div><div class='add'>+	 *</div><div class='add'>+	 * So long as we atomically load page table pointers versus teardown,</div><div class='add'>+	 * we can follow the address down to the page and take a ref on it.</div><div class='add'>+	 */</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	pgdp = pgd_offset(mm, addr);</div><div class='add'>+	do {</div><div class='add'>+		pgd_t pgd = *pgdp;</div><div class='add'>+</div><div class='add'>+		next = pgd_addr_end(addr, end);</div><div class='add'>+		if (pgd_none(pgd))</div><div class='add'>+			break;</div><div class='add'>+		if (!gup_pud_range(pgd, addr, next, write, pages, &amp;nr))</div><div class='add'>+			break;</div><div class='add'>+	} while (pgdp++, addr = next, addr != end);</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	return nr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * get_user_pages_fast() - pin user pages in memory</div><div class='add'>+ * @start:	starting user address</div><div class='add'>+ * @nr_pages:	number of pages from start to pin</div><div class='add'>+ * @write:	whether pages will be written to</div><div class='add'>+ * @pages:	array that receives pointers to the pages pinned.</div><div class='add'>+ * 		Should be at least nr_pages long.</div><div class='add'>+ *</div><div class='add'>+ * Attempt to pin user pages in memory without taking mm-&gt;mmap_sem.</div><div class='add'>+ * If not successful, it will fall back to taking the lock and</div><div class='add'>+ * calling get_user_pages().</div><div class='add'>+ *</div><div class='add'>+ * Returns number of pages pinned. This may be fewer than the number</div><div class='add'>+ * requested. If nr_pages is 0 or negative, returns 0. If no pages</div><div class='add'>+ * were pinned, returns -errno.</div><div class='add'>+ */</div><div class='add'>+int get_user_pages_fast(unsigned long start, int nr_pages, int write,</div><div class='add'>+			struct page **pages)</div><div class='add'>+{</div><div class='add'>+	struct mm_struct *mm = current-&gt;mm;</div><div class='add'>+	unsigned long addr, len, end;</div><div class='add'>+	unsigned long next;</div><div class='add'>+	pgd_t *pgdp;</div><div class='add'>+	int ret, nr = 0;</div><div class='add'>+</div><div class='add'>+	start &amp;= PAGE_MASK;</div><div class='add'>+	addr = start;</div><div class='add'>+	len = (unsigned long) nr_pages &lt;&lt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	end = start + len;</div><div class='add'>+	if (end &lt; start)</div><div class='add'>+		goto slow_irqon;</div><div class='add'>+</div><div class='add'>+	/* XXX: batch / limit 'nr' */</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	pgdp = pgd_offset(mm, addr);</div><div class='add'>+	do {</div><div class='add'>+		pgd_t pgd = *pgdp;</div><div class='add'>+</div><div class='add'>+		next = pgd_addr_end(addr, end);</div><div class='add'>+		if (pgd_none(pgd))</div><div class='add'>+			goto slow;</div><div class='add'>+		if (!gup_pud_range(pgd, addr, next, write, pages, &amp;nr))</div><div class='add'>+			goto slow;</div><div class='add'>+	} while (pgdp++, addr = next, addr != end);</div><div class='add'>+	local_irq_enable();</div><div class='add'>+</div><div class='add'>+	VM_BUG_ON(nr != (end - start) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	return nr;</div><div class='add'>+slow:</div><div class='add'>+	local_irq_enable();</div><div class='add'>+</div><div class='add'>+slow_irqon:</div><div class='add'>+	/* Try to get the remaining pages with get_user_pages */</div><div class='add'>+	start += nr &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	pages += nr;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;mm-&gt;mmap_sem);</div><div class='add'>+	ret = get_user_pages(current, mm, start,</div><div class='add'>+				(end - start) &gt;&gt; PAGE_SHIFT,</div><div class='add'>+				write, 0, pages, NULL);</div><div class='add'>+	up_read(&amp;mm-&gt;mmap_sem);</div><div class='add'>+</div><div class='add'>+	/* Have to be a bit careful with return values */</div><div class='add'>+	if (nr &gt; 0) {</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			ret = nr;</div><div class='add'>+		else</div><div class='add'>+			ret += nr;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c<br/>index b7ebc4fa89bc..3b3ffd439cd7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/mm/init.c</a></div><div class='hunk'>@@ -304,9 +304,14 @@ int page_is_ram(unsigned long pagenr)</div><div class='ctx'> 	for (i = 0; i &lt; boot_mem_map.nr_map; i++) {</div><div class='ctx'> 		unsigned long addr, end;</div><div class='ctx'> </div><div class='del'>-		if (boot_mem_map.map[i].type != BOOT_MEM_RAM)</div><div class='add'>+		switch (boot_mem_map.map[i].type) {</div><div class='add'>+		case BOOT_MEM_RAM:</div><div class='add'>+		case BOOT_MEM_INIT_RAM:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='ctx'> 			/* not usable memory */</div><div class='ctx'> 			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		addr = PFN_UP(boot_mem_map.map[i].addr);</div><div class='ctx'> 		end = PFN_DOWN(boot_mem_map.map[i].addr +</div><div class='hunk'>@@ -379,7 +384,7 @@ void __init mem_init(void)</div><div class='ctx'> </div><div class='ctx'> 	reservedpages = ram = 0;</div><div class='ctx'> 	for (tmp = 0; tmp &lt; max_low_pfn; tmp++)</div><div class='del'>-		if (page_is_ram(tmp)) {</div><div class='add'>+		if (page_is_ram(tmp) &amp;&amp; pfn_valid(tmp)) {</div><div class='ctx'> 			ram++;</div><div class='ctx'> 			if (PageReserved(pfn_to_page(tmp)))</div><div class='ctx'> 				reservedpages++;</div><div class='head'>diff --git a/arch/mips/mm/tlb-r3k.c b/arch/mips/mm/tlb-r3k.c<br/>index 87bb85d8d537..ed1fa460f84e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/tlb-r3k.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/mm/tlb-r3k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/tlb-r3k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/mm/tlb-r3k.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/tlbmisc.h&gt;</div><div class='ctx'> #include &lt;asm/isadep.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='head'>diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c<br/>index 0d394e0e8837..2dc625346c40 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/tlb-r4k.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/mm/tlb-r4k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/tlb-r4k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/mm/tlb-r4k.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/tlbmisc.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void build_tlb_refill_handler(void);</div><div class='ctx'> </div><div class='hunk'>@@ -120,22 +121,30 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_context(cpu, mm) != 0) {</div><div class='ctx'> 		unsigned long size, flags;</div><div class='add'>+		int huge = is_vm_hugetlb_page(vma);</div><div class='ctx'> </div><div class='ctx'> 		ENTER_CRITICAL(flags);</div><div class='del'>-		size = (end - start + (PAGE_SIZE - 1)) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		size = (size + 1) &gt;&gt; 1;</div><div class='add'>+		if (huge) {</div><div class='add'>+			start = round_down(start, HPAGE_SIZE);</div><div class='add'>+			end = round_up(end, HPAGE_SIZE);</div><div class='add'>+			size = (end - start) &gt;&gt; HPAGE_SHIFT;</div><div class='add'>+		} else {</div><div class='add'>+			start = round_down(start, PAGE_SIZE &lt;&lt; 1);</div><div class='add'>+			end = round_up(end, PAGE_SIZE &lt;&lt; 1);</div><div class='add'>+			size = (end - start) &gt;&gt; (PAGE_SHIFT + 1);</div><div class='add'>+		}</div><div class='ctx'> 		if (size &lt;= current_cpu_data.tlbsize/2) {</div><div class='ctx'> 			int oldpid = read_c0_entryhi();</div><div class='ctx'> 			int newpid = cpu_asid(cpu, mm);</div><div class='ctx'> </div><div class='del'>-			start &amp;= (PAGE_MASK &lt;&lt; 1);</div><div class='del'>-			end += ((PAGE_SIZE &lt;&lt; 1) - 1);</div><div class='del'>-			end &amp;= (PAGE_MASK &lt;&lt; 1);</div><div class='ctx'> 			while (start &lt; end) {</div><div class='ctx'> 				int idx;</div><div class='ctx'> </div><div class='ctx'> 				write_c0_entryhi(start | newpid);</div><div class='del'>-				start += (PAGE_SIZE &lt;&lt; 1);</div><div class='add'>+				if (huge)</div><div class='add'>+					start += HPAGE_SIZE;</div><div class='add'>+				else</div><div class='add'>+					start += (PAGE_SIZE &lt;&lt; 1);</div><div class='ctx'> 				mtc0_tlbw_hazard();</div><div class='ctx'> 				tlb_probe();</div><div class='ctx'> 				tlb_probe_hazard();</div><div class='hunk'>@@ -368,51 +377,6 @@ void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,</div><div class='ctx'> 	EXIT_CRITICAL(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Used for loading TLB entries before trap_init() has started, when we</div><div class='del'>- * don't actually want to add a wired entry which remains throughout the</div><div class='del'>- * lifetime of the system</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int temp_tlb_entry __cpuinitdata;</div><div class='del'>-</div><div class='del'>-__init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,</div><div class='del'>-			       unsigned long entryhi, unsigned long pagemask)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned long wired;</div><div class='del'>-	unsigned long old_pagemask;</div><div class='del'>-	unsigned long old_ctx;</div><div class='del'>-</div><div class='del'>-	ENTER_CRITICAL(flags);</div><div class='del'>-	/* Save old context and create impossible VPN2 value */</div><div class='del'>-	old_ctx = read_c0_entryhi();</div><div class='del'>-	old_pagemask = read_c0_pagemask();</div><div class='del'>-	wired = read_c0_wired();</div><div class='del'>-	if (--temp_tlb_entry &lt; wired) {</div><div class='del'>-		printk(KERN_WARNING</div><div class='del'>-		       "No TLB space left for add_temporary_entry\n");</div><div class='del'>-		ret = -ENOSPC;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	write_c0_index(temp_tlb_entry);</div><div class='del'>-	write_c0_pagemask(pagemask);</div><div class='del'>-	write_c0_entryhi(entryhi);</div><div class='del'>-	write_c0_entrylo0(entrylo0);</div><div class='del'>-	write_c0_entrylo1(entrylo1);</div><div class='del'>-	mtc0_tlbw_hazard();</div><div class='del'>-	tlb_write_indexed();</div><div class='del'>-	tlbw_use_hazard();</div><div class='del'>-</div><div class='del'>-	write_c0_entryhi(old_ctx);</div><div class='del'>-	write_c0_pagemask(old_pagemask);</div><div class='del'>-out:</div><div class='del'>-	EXIT_CRITICAL(flags);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __cpuinitdata ntlb;</div><div class='ctx'> static int __init set_ntlb(char *str)</div><div class='ctx'> {</div><div class='hunk'>@@ -450,8 +414,6 @@ void __cpuinit tlb_init(void)</div><div class='ctx'> 		write_c0_pagegrain(pg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	temp_tlb_entry = current_cpu_data.tlbsize - 1;</div><div class='del'>-</div><div class='ctx'>         /* From this point on the ARC firmware is dead.  */</div><div class='ctx'> 	local_flush_tlb_all();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/mti-malta/malta-int.c b/arch/mips/mti-malta/malta-int.c<br/>index d53ff91b277c..a588b5cef8d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mti-malta/malta-int.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/mti-malta/malta-int.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mti-malta/malta-int.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/mti-malta/malta-int.c</a></div><div class='hunk'>@@ -322,13 +322,13 @@ static irqreturn_t ipi_call_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction irq_resched = {</div><div class='ctx'> 	.handler	= ipi_resched_interrupt,</div><div class='del'>-	.flags		= IRQF_DISABLED|IRQF_PERCPU,</div><div class='add'>+	.flags		= IRQF_PERCPU,</div><div class='ctx'> 	.name		= "IPI_resched"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction irq_call = {</div><div class='ctx'> 	.handler	= ipi_call_interrupt,</div><div class='del'>-	.flags		= IRQF_DISABLED|IRQF_PERCPU,</div><div class='add'>+	.flags		= IRQF_PERCPU,</div><div class='ctx'> 	.name		= "IPI_call"</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_MIPS_MT_SMP */</div><div class='head'>diff --git a/arch/mips/netlogic/Kconfig b/arch/mips/netlogic/Kconfig<br/>index a5ca743613f2..75bec44b5856 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/netlogic/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/netlogic/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/netlogic/Kconfig</a></div><div class='hunk'>@@ -1,5 +1,2 @@</div><div class='ctx'> config NLM_COMMON</div><div class='ctx'> 	bool</div><div class='del'>-</div><div class='del'>-config NLM_XLR</div><div class='del'>-	bool</div><div class='head'>diff --git a/arch/mips/netlogic/Makefile b/arch/mips/netlogic/Makefile<br/>new file mode 100644<br/>index 000000000000..36d169b2ca6d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/netlogic/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/netlogic/Makefile</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+obj-$(CONFIG_NLM_COMMON)	+=	common/</div><div class='add'>+obj-$(CONFIG_CPU_XLR)		+=	xlr/</div><div class='add'>+obj-$(CONFIG_CPU_XLP)		+=	xlp/</div><div class='head'>diff --git a/arch/mips/netlogic/Platform b/arch/mips/netlogic/Platform<br/>index b648b487fd66..cdfc9abbbb7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/netlogic/Platform?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/Platform</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/netlogic/Platform?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/netlogic/Platform</a></div><div class='hunk'>@@ -1,16 +1,17 @@</div><div class='ctx'> #</div><div class='ctx'> # NETLOGIC includes</div><div class='ctx'> #</div><div class='del'>-cflags-$(CONFIG_NLM_COMMON)  += -I$(srctree)/arch/mips/include/asm/mach-netlogic</div><div class='del'>-cflags-$(CONFIG_NLM_COMMON)  += -I$(srctree)/arch/mips/include/asm/netlogic</div><div class='add'>+cflags-$(CONFIG_NLM_COMMON)	+= -I$(srctree)/arch/mips/include/asm/mach-netlogic</div><div class='add'>+cflags-$(CONFIG_NLM_COMMON)	+= -I$(srctree)/arch/mips/include/asm/netlogic</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # use mips64 if xlr is not available</div><div class='ctx'> #</div><div class='del'>-cflags-$(CONFIG_NLM_XLR)	+= $(call cc-option,-march=xlr,-march=mips64)</div><div class='add'>+cflags-$(CONFIG_CPU_XLR)	+= $(call cc-option,-march=xlr,-march=mips64)</div><div class='add'>+cflags-$(CONFIG_CPU_XLP)	+= $(call cc-option,-march=xlp,-march=mips64r2)</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# NETLOGIC XLR/XLS SoC, Simulator and boards</div><div class='add'>+# NETLOGIC processor support</div><div class='ctx'> #</div><div class='del'>-core-$(CONFIG_NLM_XLR)	      += arch/mips/netlogic/xlr/</div><div class='del'>-load-$(CONFIG_NLM_XLR_BOARD)  += 0xffffffff84000000</div><div class='add'>+platform-$(CONFIG_NLM_COMMON)  	+= netlogic/</div><div class='add'>+load-$(CONFIG_NLM_COMMON)  	+= 0xffffffff80100000</div><div class='head'>diff --git a/arch/mips/netlogic/common/Makefile b/arch/mips/netlogic/common/Makefile<br/>new file mode 100644<br/>index 000000000000..291372a086f5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/netlogic/common/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/netlogic/common/Makefile</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+obj-y				+= irq.o time.o</div><div class='add'>+obj-$(CONFIG_SMP)		+= smp.o smpboot.o</div><div class='add'>+obj-$(CONFIG_EARLY_PRINTK)	+= earlycons.o</div><div class='head'>diff --git a/arch/mips/netlogic/common/earlycons.c b/arch/mips/netlogic/common/earlycons.c<br/>new file mode 100644<br/>index 000000000000..f193f7b3bd81<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/netlogic/common/earlycons.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/netlogic/common/earlycons.c</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights</div><div class='add'>+ * reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the NetLogic</div><div class='add'>+ * license below:</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in</div><div class='add'>+ *    the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR</div><div class='add'>+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE</div><div class='add'>+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='add'>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='add'>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='add'>+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,</div><div class='add'>+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE</div><div class='add'>+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN</div><div class='add'>+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</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/serial_reg.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mipsregs.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/haldefs.h&gt;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CPU_XLP)</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/iomap.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/uart.h&gt;</div><div class='add'>+#elif defined(CONFIG_CPU_XLR)</div><div class='add'>+#include &lt;asm/netlogic/xlr/iomap.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void prom_putchar(char c)</div><div class='add'>+{</div><div class='add'>+	uint64_t uartbase;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CPU_XLP)</div><div class='add'>+	uartbase = nlm_get_uart_regbase(0, 0);</div><div class='add'>+#elif defined(CONFIG_CPU_XLR)</div><div class='add'>+	uartbase = nlm_mmio_base(NETLOGIC_IO_UART_0_OFFSET);</div><div class='add'>+#endif</div><div class='add'>+	while (nlm_read_reg(uartbase, UART_LSR) == 0)</div><div class='add'>+		;</div><div class='add'>+	nlm_write_reg(uartbase, UART_TX, c);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/netlogic/common/irq.c b/arch/mips/netlogic/common/irq.c<br/>new file mode 100644<br/>index 000000000000..49a4f6cf71e5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/netlogic/common/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/netlogic/common/irq.c</a></div><div class='hunk'>@@ -0,0 +1,238 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights</div><div class='add'>+ * reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the NetLogic</div><div class='add'>+ * license below:</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in</div><div class='add'>+ *    the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR</div><div class='add'>+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE</div><div class='add'>+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='add'>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='add'>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='add'>+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,</div><div class='add'>+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE</div><div class='add'>+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN</div><div class='add'>+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</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/linkage.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/errno.h&gt;</div><div class='add'>+#include &lt;asm/signal.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;asm/mipsregs.h&gt;</div><div class='add'>+#include &lt;asm/thread_info.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/netlogic/mips-extns.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/interrupt.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/haldefs.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/common.h&gt;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CPU_XLP)</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/iomap.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/xlp.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/pic.h&gt;</div><div class='add'>+#elif defined(CONFIG_CPU_XLR)</div><div class='add'>+#include &lt;asm/netlogic/xlr/iomap.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlr/pic.h&gt;</div><div class='add'>+#else</div><div class='add'>+#error "Unknown CPU"</div><div class='add'>+#endif</div><div class='add'>+/*</div><div class='add'>+ * These are the routines that handle all the low level interrupt stuff.</div><div class='add'>+ * Actions handled here are: initialization of the interrupt map, requesting of</div><div class='add'>+ * interrupt lines by handlers, dispatching if interrupts to handlers, probing</div><div class='add'>+ * for interrupt lines</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Globals */</div><div class='add'>+static uint64_t nlm_irq_mask;</div><div class='add'>+static DEFINE_SPINLOCK(nlm_pic_lock);</div><div class='add'>+</div><div class='add'>+static void xlp_pic_enable(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int irt;</div><div class='add'>+</div><div class='add'>+	irt = nlm_irq_to_irt(d-&gt;irq);</div><div class='add'>+	if (irt == -1)</div><div class='add'>+		return;</div><div class='add'>+	spin_lock_irqsave(&amp;nlm_pic_lock, flags);</div><div class='add'>+	nlm_pic_enable_irt(nlm_pic_base, irt);</div><div class='add'>+	spin_unlock_irqrestore(&amp;nlm_pic_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xlp_pic_disable(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int irt;</div><div class='add'>+</div><div class='add'>+	irt = nlm_irq_to_irt(d-&gt;irq);</div><div class='add'>+	if (irt == -1)</div><div class='add'>+		return;</div><div class='add'>+	spin_lock_irqsave(&amp;nlm_pic_lock, flags);</div><div class='add'>+	nlm_pic_disable_irt(nlm_pic_base, irt);</div><div class='add'>+	spin_unlock_irqrestore(&amp;nlm_pic_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xlp_pic_mask_ack(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	uint64_t mask = 1ull &lt;&lt; d-&gt;irq;</div><div class='add'>+</div><div class='add'>+	write_c0_eirr(mask);            /* ack by writing EIRR */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xlp_pic_unmask(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	void *hd = irq_data_get_irq_handler_data(d);</div><div class='add'>+	int irt;</div><div class='add'>+</div><div class='add'>+	irt = nlm_irq_to_irt(d-&gt;irq);</div><div class='add'>+	if (irt == -1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (hd) {</div><div class='add'>+		void (*extra_ack)(void *) = hd;</div><div class='add'>+		extra_ack(d);</div><div class='add'>+	}</div><div class='add'>+	/* Ack is a single write, no need to lock */</div><div class='add'>+	nlm_pic_ack(nlm_pic_base, irt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip xlp_pic = {</div><div class='add'>+	.name		= "XLP-PIC",</div><div class='add'>+	.irq_enable	= xlp_pic_enable,</div><div class='add'>+	.irq_disable	= xlp_pic_disable,</div><div class='add'>+	.irq_mask_ack	= xlp_pic_mask_ack,</div><div class='add'>+	.irq_unmask	= xlp_pic_unmask,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void cpuintr_disable(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	uint64_t eimr;</div><div class='add'>+	uint64_t mask = 1ull &lt;&lt; d-&gt;irq;</div><div class='add'>+</div><div class='add'>+	eimr = read_c0_eimr();</div><div class='add'>+	write_c0_eimr(eimr &amp; ~mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpuintr_enable(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	uint64_t eimr;</div><div class='add'>+	uint64_t mask = 1ull &lt;&lt; d-&gt;irq;</div><div class='add'>+</div><div class='add'>+	eimr = read_c0_eimr();</div><div class='add'>+	write_c0_eimr(eimr | mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpuintr_ack(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	uint64_t mask = 1ull &lt;&lt; d-&gt;irq;</div><div class='add'>+</div><div class='add'>+	write_c0_eirr(mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpuintr_nop(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	WARN(d-&gt;irq &gt;= PIC_IRQ_BASE, "Bad irq %d", d-&gt;irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Chip definition for CPU originated interrupts(timer, msg) and</div><div class='add'>+ * IPIs</div><div class='add'>+ */</div><div class='add'>+struct irq_chip nlm_cpu_intr = {</div><div class='add'>+	.name		= "XLP-CPU-INTR",</div><div class='add'>+	.irq_enable	= cpuintr_enable,</div><div class='add'>+	.irq_disable	= cpuintr_disable,</div><div class='add'>+	.irq_mask	= cpuintr_nop,</div><div class='add'>+	.irq_ack	= cpuintr_nop,</div><div class='add'>+	.irq_eoi	= cpuintr_ack,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init init_nlm_common_irqs(void)</div><div class='add'>+{</div><div class='add'>+	int i, irq, irt;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PIC_IRT_FIRST_IRQ; i++)</div><div class='add'>+		irq_set_chip_and_handler(i, &amp;nlm_cpu_intr, handle_percpu_irq);</div><div class='add'>+</div><div class='add'>+	for (i = PIC_IRT_FIRST_IRQ; i &lt;= PIC_IRT_LAST_IRQ ; i++)</div><div class='add'>+		irq_set_chip_and_handler(i, &amp;xlp_pic, handle_level_irq);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	irq_set_chip_and_handler(IRQ_IPI_SMP_FUNCTION, &amp;nlm_cpu_intr,</div><div class='add'>+			 nlm_smp_function_ipi_handler);</div><div class='add'>+	irq_set_chip_and_handler(IRQ_IPI_SMP_RESCHEDULE, &amp;nlm_cpu_intr,</div><div class='add'>+			 nlm_smp_resched_ipi_handler);</div><div class='add'>+	nlm_irq_mask |=</div><div class='add'>+	    ((1ULL &lt;&lt; IRQ_IPI_SMP_FUNCTION) | (1ULL &lt;&lt; IRQ_IPI_SMP_RESCHEDULE));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (irq = PIC_IRT_FIRST_IRQ; irq &lt;= PIC_IRT_LAST_IRQ; irq++) {</div><div class='add'>+		irt = nlm_irq_to_irt(irq);</div><div class='add'>+		if (irt == -1)</div><div class='add'>+			continue;</div><div class='add'>+		nlm_irq_mask |= (1ULL &lt;&lt; irq);</div><div class='add'>+		nlm_pic_init_irt(nlm_pic_base, irt, irq, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nlm_irq_mask |= (1ULL &lt;&lt; IRQ_TIMER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init arch_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	/* Initialize the irq descriptors */</div><div class='add'>+	init_nlm_common_irqs();</div><div class='add'>+</div><div class='add'>+	write_c0_eimr(nlm_irq_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __cpuinit nlm_smp_irq_init(void)</div><div class='add'>+{</div><div class='add'>+	/* set interrupt mask for non-zero cpus */</div><div class='add'>+	write_c0_eimr(nlm_irq_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+asmlinkage void plat_irq_dispatch(void)</div><div class='add'>+{</div><div class='add'>+	uint64_t eirr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	eirr = read_c0_eirr() &amp; read_c0_eimr();</div><div class='add'>+	if (eirr &amp; (1 &lt;&lt; IRQ_TIMER)) {</div><div class='add'>+		do_IRQ(IRQ_TIMER);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i = __ilog2_u64(eirr);</div><div class='add'>+	if (i == -1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	do_IRQ(i);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/netlogic/xlr/smp.c b/arch/mips/netlogic/common/smp.c<br/>index 080284ded508..db17f49886c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/netlogic/xlr/smp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/xlr/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/netlogic/common/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/netlogic/common/smp.c</a></div><div class='hunk'>@@ -42,31 +42,29 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/netlogic/interrupt.h&gt;</div><div class='ctx'> #include &lt;asm/netlogic/mips-extns.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;asm/netlogic/haldefs.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/common.h&gt;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CPU_XLP)</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/iomap.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/xlp.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/pic.h&gt;</div><div class='add'>+#elif defined(CONFIG_CPU_XLR)</div><div class='ctx'> #include &lt;asm/netlogic/xlr/iomap.h&gt;</div><div class='ctx'> #include &lt;asm/netlogic/xlr/pic.h&gt;</div><div class='ctx'> #include &lt;asm/netlogic/xlr/xlr.h&gt;</div><div class='add'>+#else</div><div class='add'>+#error "Unknown CPU"</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-void core_send_ipi(int logical_cpu, unsigned int action)</div><div class='add'>+void nlm_send_ipi_single(int logical_cpu, unsigned int action)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = cpu_logical_map(logical_cpu);</div><div class='del'>-	u32 tid = cpu &amp; 0x3;</div><div class='del'>-	u32 pid = (cpu &gt;&gt; 2) &amp; 0x07;</div><div class='del'>-	u32 ipi = (tid &lt;&lt; 16) | (pid &lt;&lt; 20);</div><div class='ctx'> </div><div class='ctx'> 	if (action &amp; SMP_CALL_FUNCTION)</div><div class='del'>-		ipi |= IRQ_IPI_SMP_FUNCTION;</div><div class='del'>-	else if (action &amp; SMP_RESCHEDULE_YOURSELF)</div><div class='del'>-		ipi |= IRQ_IPI_SMP_RESCHEDULE;</div><div class='del'>-	else</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pic_send_ipi(ipi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nlm_send_ipi_single(int cpu, unsigned int action)</div><div class='del'>-{</div><div class='del'>-	core_send_ipi(cpu, action);</div><div class='add'>+		nlm_pic_send_ipi(nlm_pic_base, cpu, IRQ_IPI_SMP_FUNCTION, 0);</div><div class='add'>+	if (action &amp; SMP_RESCHEDULE_YOURSELF)</div><div class='add'>+		nlm_pic_send_ipi(nlm_pic_base, cpu, IRQ_IPI_SMP_RESCHEDULE, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void nlm_send_ipi_mask(const struct cpumask *mask, unsigned int action)</div><div class='hunk'>@@ -74,29 +72,35 @@ void nlm_send_ipi_mask(const struct cpumask *mask, unsigned int action)</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	for_each_cpu(cpu, mask) {</div><div class='del'>-		core_send_ipi(cpu, action);</div><div class='add'>+		nlm_send_ipi_single(cpu, action);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* IRQ_IPI_SMP_FUNCTION Handler */</div><div class='ctx'> void nlm_smp_function_ipi_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> {</div><div class='add'>+	write_c0_eirr(1ull &lt;&lt; irq);</div><div class='ctx'> 	smp_call_function_interrupt();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* IRQ_IPI_SMP_RESCHEDULE  handler */</div><div class='ctx'> void nlm_smp_resched_ipi_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> {</div><div class='add'>+	write_c0_eirr(1ull &lt;&lt; irq);</div><div class='ctx'> 	scheduler_ipi();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called before going into mips code, early cpu init</div><div class='ctx'>  */</div><div class='del'>-void nlm_early_init_secondary(void)</div><div class='add'>+void nlm_early_init_secondary(int cpu)</div><div class='ctx'> {</div><div class='add'>+	change_c0_config(CONF_CM_CMASK, 0x3);</div><div class='ctx'> 	write_c0_ebase((uint32_t)nlm_common_ebase);</div><div class='del'>-	/* TLB partition here later */</div><div class='add'>+#ifdef CONFIG_CPU_XLP</div><div class='add'>+	if (hard_smp_processor_id() % 4 == 0)</div><div class='add'>+		xlp_mmu_init();</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -104,9 +108,16 @@ void nlm_early_init_secondary(void)</div><div class='ctx'>  */</div><div class='ctx'> static void __cpuinit nlm_init_secondary(void)</div><div class='ctx'> {</div><div class='add'>+	current_cpu_data.core = hard_smp_processor_id() / 4;</div><div class='ctx'> 	nlm_smp_irq_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void nlm_prepare_cpus(unsigned int max_cpus)</div><div class='add'>+{</div><div class='add'>+	/* declare we are SMT capable */</div><div class='add'>+	smp_num_siblings = nlm_threads_per_core;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void nlm_smp_finish(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef notyet</div><div class='hunk'>@@ -123,10 +134,10 @@ void nlm_cpus_done(void)</div><div class='ctx'>  * Boot all other cpus in the system, initialize them, and bring them into</div><div class='ctx'>  * the boot function</div><div class='ctx'>  */</div><div class='del'>-int nlm_cpu_unblock[NR_CPUS];</div><div class='ctx'> int nlm_cpu_ready[NR_CPUS];</div><div class='ctx'> unsigned long nlm_next_gp;</div><div class='ctx'> unsigned long nlm_next_sp;</div><div class='add'>+</div><div class='ctx'> cpumask_t phys_cpu_present_map;</div><div class='ctx'> </div><div class='ctx'> void nlm_boot_secondary(int logical_cpu, struct task_struct *idle)</div><div class='hunk'>@@ -140,7 +151,7 @@ void nlm_boot_secondary(int logical_cpu, struct task_struct *idle)</div><div class='ctx'> </div><div class='ctx'> 	/* barrier */</div><div class='ctx'> 	__sync();</div><div class='del'>-	nlm_cpu_unblock[cpu] = 1;</div><div class='add'>+	nlm_pic_send_ipi(nlm_pic_base, cpu, 1, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init nlm_smp_setup(void)</div><div class='hunk'>@@ -159,8 +170,8 @@ void __init nlm_smp_setup(void)</div><div class='ctx'> 	num_cpus = 1;</div><div class='ctx'> 	for (i = 0; i &lt; NR_CPUS; i++) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * BSP is not set in nlm_cpu_ready array, it is only for</div><div class='del'>-		 * ASPs (goto see smpboot.S)</div><div class='add'>+		 * nlm_cpu_ready array is not set for the boot_cpu,</div><div class='add'>+		 * it is only set for ASPs (see smpboot.S)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (nlm_cpu_ready[i]) {</div><div class='ctx'> 			cpu_set(i, phys_cpu_present_map);</div><div class='hunk'>@@ -176,10 +187,75 @@ void __init nlm_smp_setup(void)</div><div class='ctx'> 		(unsigned long)cpu_possible_map.bits[0]);</div><div class='ctx'> </div><div class='ctx'> 	pr_info("Detected %i Slave CPU(s)\n", num_cpus);</div><div class='add'>+	nlm_set_nmi_handler(nlm_boot_secondary_cpus);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void nlm_prepare_cpus(unsigned int max_cpus)</div><div class='add'>+static int nlm_parse_cpumask(u32 cpu_mask)</div><div class='add'>+{</div><div class='add'>+	uint32_t core0_thr_mask, core_thr_mask;</div><div class='add'>+	int threadmode, i;</div><div class='add'>+</div><div class='add'>+	core0_thr_mask = cpu_mask &amp; 0xf;</div><div class='add'>+	switch (core0_thr_mask) {</div><div class='add'>+	case 1:</div><div class='add'>+		nlm_threads_per_core = 1;</div><div class='add'>+		threadmode = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		nlm_threads_per_core = 2;</div><div class='add'>+		threadmode = 2;</div><div class='add'>+		break;</div><div class='add'>+	case 0xf:</div><div class='add'>+		nlm_threads_per_core = 4;</div><div class='add'>+		threadmode = 3;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto unsupp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Verify other cores CPU masks */</div><div class='add'>+	nlm_coremask = 1;</div><div class='add'>+	nlm_cpumask = core0_thr_mask;</div><div class='add'>+	for (i = 1; i &lt; 8; i++) {</div><div class='add'>+		core_thr_mask = (cpu_mask &gt;&gt; (i * 4)) &amp; 0xf;</div><div class='add'>+		if (core_thr_mask) {</div><div class='add'>+			if (core_thr_mask != core0_thr_mask)</div><div class='add'>+				goto unsupp;</div><div class='add'>+			nlm_coremask |= 1 &lt;&lt; i;</div><div class='add'>+			nlm_cpumask |= core0_thr_mask &lt;&lt; (4 * i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return threadmode;</div><div class='add'>+</div><div class='add'>+unsupp:</div><div class='add'>+	panic("Unsupported CPU mask %x\n", cpu_mask);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __cpuinit nlm_wakeup_secondary_cpus(u32 wakeup_mask)</div><div class='ctx'> {</div><div class='add'>+	unsigned long reset_vec;</div><div class='add'>+	char *reset_data;</div><div class='add'>+	int threadmode;</div><div class='add'>+</div><div class='add'>+	/* Update reset entry point with CPU init code */</div><div class='add'>+	reset_vec = CKSEG1ADDR(RESET_VEC_PHYS);</div><div class='add'>+	memcpy((void *)reset_vec, (void *)nlm_reset_entry,</div><div class='add'>+			(nlm_reset_entry_end - nlm_reset_entry));</div><div class='add'>+</div><div class='add'>+	/* verify the mask and setup core config variables */</div><div class='add'>+	threadmode = nlm_parse_cpumask(wakeup_mask);</div><div class='add'>+</div><div class='add'>+	/* Setup CPU init parameters */</div><div class='add'>+	reset_data = (char *)CKSEG1ADDR(RESET_DATA_PHYS);</div><div class='add'>+	*(int *)(reset_data + BOOT_THREAD_MODE) = threadmode;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_XLP</div><div class='add'>+	xlp_wakeup_secondary_cpus();</div><div class='add'>+#else</div><div class='add'>+	xlr_wakeup_secondary_cpus();</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct plat_smp_ops nlm_smp_ops = {</div><div class='hunk'>@@ -192,29 +268,3 @@ struct plat_smp_ops nlm_smp_ops = {</div><div class='ctx'> 	.smp_setup		= nlm_smp_setup,</div><div class='ctx'> 	.prepare_cpus		= nlm_prepare_cpus,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-unsigned long secondary_entry_point;</div><div class='del'>-</div><div class='del'>-int __cpuinit nlm_wakeup_secondary_cpus(u32 wakeup_mask)</div><div class='del'>-{</div><div class='del'>-	unsigned int tid, pid, ipi, i, boot_cpu;</div><div class='del'>-	void *reset_vec;</div><div class='del'>-</div><div class='del'>-	secondary_entry_point = (unsigned long)prom_pre_boot_secondary_cpus;</div><div class='del'>-	reset_vec = (void *)CKSEG1ADDR(0x1fc00000);</div><div class='del'>-	memcpy(reset_vec, nlm_boot_smp_nmi, 0x80);</div><div class='del'>-	boot_cpu = hard_smp_processor_id();</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NR_CPUS; i++) {</div><div class='del'>-		if (i == boot_cpu)</div><div class='del'>-			continue;</div><div class='del'>-		if (wakeup_mask &amp; (1u &lt;&lt; i)) {</div><div class='del'>-			tid = i &amp; 0x3;</div><div class='del'>-			pid = (i &gt;&gt; 2) &amp; 0x7;</div><div class='del'>-			ipi = (tid &lt;&lt; 16) | (pid &lt;&lt; 20) | (1 &lt;&lt; 8);</div><div class='del'>-			pic_send_ipi(ipi);</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='head'>diff --git a/arch/mips/netlogic/common/smpboot.S b/arch/mips/netlogic/common/smpboot.S<br/>new file mode 100644<br/>index 000000000000..c138b1a6dec3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/netlogic/common/smpboot.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/netlogic/common/smpboot.S</a></div><div class='hunk'>@@ -0,0 +1,272 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights</div><div class='add'>+ * reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the NetLogic</div><div class='add'>+ * license below:</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in</div><div class='add'>+ *    the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR</div><div class='add'>+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE</div><div class='add'>+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='add'>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='add'>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='add'>+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,</div><div class='add'>+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE</div><div class='add'>+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN</div><div class='add'>+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/asm.h&gt;</div><div class='add'>+#include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+#include &lt;asm/regdef.h&gt;</div><div class='add'>+#include &lt;asm/mipsregs.h&gt;</div><div class='add'>+#include &lt;asm/stackframe.h&gt;</div><div class='add'>+#include &lt;asm/asmmacro.h&gt;</div><div class='add'>+#include &lt;asm/addrspace.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/netlogic/common.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/iomap.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/xlp.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/sys.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/cpucontrol.h&gt;</div><div class='add'>+</div><div class='add'>+#define	CP0_EBASE	$15</div><div class='add'>+#define SYS_CPU_COHERENT_BASE(node)	CKSEG1ADDR(XLP_DEFAULT_IO_BASE) + \</div><div class='add'>+			XLP_IO_SYS_OFFSET(node) + XLP_IO_PCI_HDRSZ + \</div><div class='add'>+			SYS_CPU_NONCOHERENT_MODE * 4</div><div class='add'>+</div><div class='add'>+.macro __config_lsu</div><div class='add'>+	li      t0, LSU_DEFEATURE</div><div class='add'>+	mfcr    t1, t0</div><div class='add'>+</div><div class='add'>+	lui     t2, 0x4080  /* Enable Unaligned Access, L2HPE */</div><div class='add'>+	or      t1, t1, t2</div><div class='add'>+	li	t2, ~0xe    /* S1RCM */</div><div class='add'>+	and	t1, t1, t2</div><div class='add'>+	mtcr    t1, t0</div><div class='add'>+</div><div class='add'>+	li      t0, SCHED_DEFEATURE</div><div class='add'>+	lui     t1, 0x0100  /* Experimental: Disable BRU accepting ALU ops */</div><div class='add'>+	mtcr    t1, t0</div><div class='add'>+.endm</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The cores can come start when they are woken up. This is also the NMI</div><div class='add'>+ * entry, so check that first.</div><div class='add'>+ *</div><div class='add'>+ * The data corresponding to reset is stored at RESET_DATA_PHYS location,</div><div class='add'>+ * this will have the thread mask (used when core is woken up) and the</div><div class='add'>+ * current NMI handler in case we reached here for an NMI.</div><div class='add'>+ *</div><div class='add'>+ * When a core or thread is newly woken up, it loops in a 'wait'. When</div><div class='add'>+ * the CPU really needs waking up, we send an NMI to it, with the NMI</div><div class='add'>+ * handler set to prom_boot_secondary_cpus</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+	.set	noreorder</div><div class='add'>+	.set	noat</div><div class='add'>+	.set	arch=xlr	/* for mfcr/mtcr, XLR is sufficient */</div><div class='add'>+</div><div class='add'>+FEXPORT(nlm_reset_entry)</div><div class='add'>+	dmtc0	k0, $22, 6</div><div class='add'>+	dmtc0	k1, $22, 7</div><div class='add'>+	mfc0    k0, CP0_STATUS</div><div class='add'>+	li      k1, 0x80000</div><div class='add'>+	and     k1, k0, k1</div><div class='add'>+	beqz    k1, 1f         /* go to real reset entry */</div><div class='add'>+	nop</div><div class='add'>+	li	k1, CKSEG1ADDR(RESET_DATA_PHYS)   /* NMI */</div><div class='add'>+	ld	k0, BOOT_NMI_HANDLER(k1)</div><div class='add'>+	jr	k0</div><div class='add'>+	nop</div><div class='add'>+</div><div class='add'>+1:	/* Entry point on core wakeup */</div><div class='add'>+	mfc0	t0, CP0_EBASE, 1</div><div class='add'>+	mfc0	t1, CP0_EBASE, 1</div><div class='add'>+	srl	t1, 5</div><div class='add'>+	andi	t1, 0x3			/* t1 &lt;- node */</div><div class='add'>+	li	t2, 0x40000</div><div class='add'>+	mul	t3, t2, t1		/* t3 = node * 0x40000 */</div><div class='add'>+	srl	t0, t0, 2</div><div class='add'>+	and	t0, t0, 0x7		/* t0 &lt;- core */</div><div class='add'>+	li	t1, 0x1</div><div class='add'>+	sll	t0, t1, t0</div><div class='add'>+	nor	t0, t0, zero		/* t0 &lt;- ~(1 &lt;&lt; core) */</div><div class='add'>+	li	t2, SYS_CPU_COHERENT_BASE(0)</div><div class='add'>+	add	t2, t2, t3		/* t2 &lt;- SYS offset for node */</div><div class='add'>+	lw	t1, 0(t2)</div><div class='add'>+	and     t1, t1, t0</div><div class='add'>+	sw      t1, 0(t2)</div><div class='add'>+</div><div class='add'>+	/* read back to ensure complete */</div><div class='add'>+	lw      t1, 0(t2)</div><div class='add'>+	sync</div><div class='add'>+</div><div class='add'>+	/* Configure LSU on Non-0 Cores. */</div><div class='add'>+	__config_lsu</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wake up sibling threads from the initial thread in</div><div class='add'>+ * a core.</div><div class='add'>+ */</div><div class='add'>+EXPORT(nlm_boot_siblings)</div><div class='add'>+	li	t0, CKSEG1ADDR(RESET_DATA_PHYS)</div><div class='add'>+	lw	t1, BOOT_THREAD_MODE(t0)	/* t1 &lt;- thread mode */</div><div class='add'>+	li	t0, ((CPU_BLOCKID_MAP &lt;&lt; 8) | MAP_THREADMODE)</div><div class='add'>+	mfcr	t2, t0</div><div class='add'>+	or	t2, t2, t1</div><div class='add'>+	mtcr	t2, t0</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The new hardware thread starts at the next instruction</div><div class='add'>+	 * For all the cases other than core 0 thread 0, we will</div><div class='add'>+         * jump to the secondary wait function.</div><div class='add'>+         */</div><div class='add'>+	mfc0	v0, CP0_EBASE, 1</div><div class='add'>+	andi	v0, 0x7f		/* v0 &lt;- node/core */</div><div class='add'>+</div><div class='add'>+#if 1</div><div class='add'>+	/* A0 errata - Write MMU_SETUP after changing thread mode register. */</div><div class='add'>+	andi	v1, v0, 0x3		/* v1 &lt;- thread id */</div><div class='add'>+	bnez	v1, 2f</div><div class='add'>+	nop</div><div class='add'>+</div><div class='add'>+        li	t0, MMU_SETUP</div><div class='add'>+        li	t1, 0</div><div class='add'>+        mtcr	t1, t0</div><div class='add'>+	ehb</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+2:	beqz	v0, 4f</div><div class='add'>+	nop</div><div class='add'>+</div><div class='add'>+	/* setup status reg */</div><div class='add'>+	mfc0	t1, CP0_STATUS</div><div class='add'>+	li	t0, ST0_BEV</div><div class='add'>+	or	t1, t0</div><div class='add'>+	xor	t1, t0</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+	ori	t1, ST0_KX</div><div class='add'>+#endif</div><div class='add'>+	mtc0	t1, CP0_STATUS</div><div class='add'>+	/* mark CPU ready */</div><div class='add'>+	PTR_LA	t1, nlm_cpu_ready</div><div class='add'>+	sll	v1, v0, 2</div><div class='add'>+	PTR_ADDU t1, v1</div><div class='add'>+	li	t2, 1</div><div class='add'>+	sw	t2, 0(t1)</div><div class='add'>+	/* Wait until NMI hits */</div><div class='add'>+3:	wait</div><div class='add'>+	j	3b</div><div class='add'>+	nop</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For the boot CPU, we have to restore registers and</div><div class='add'>+	 * return</div><div class='add'>+	 */</div><div class='add'>+4:	dmfc0	t0, $4, 2       /* restore SP from UserLocal */</div><div class='add'>+	li	t1, 0xfadebeef</div><div class='add'>+	dmtc0	t1, $4, 2       /* restore SP from UserLocal */</div><div class='add'>+	PTR_SUBU sp, t0, PT_SIZE</div><div class='add'>+	RESTORE_ALL</div><div class='add'>+	jr   ra</div><div class='add'>+	nop</div><div class='add'>+EXPORT(nlm_reset_entry_end)</div><div class='add'>+</div><div class='add'>+FEXPORT(xlp_boot_core0_siblings)	/* "Master" cpu starts from here */</div><div class='add'>+	__config_lsu</div><div class='add'>+	dmtc0   sp, $4, 2		/* SP saved in UserLocal */</div><div class='add'>+	SAVE_ALL</div><div class='add'>+	sync</div><div class='add'>+	/* find the location to which nlm_boot_siblings was relocated */</div><div class='add'>+	li	t0, CKSEG1ADDR(RESET_VEC_PHYS)</div><div class='add'>+	dla	t1, nlm_reset_entry</div><div class='add'>+	dla	t2, nlm_boot_siblings</div><div class='add'>+	dsubu	t2, t1</div><div class='add'>+	daddu	t2, t0</div><div class='add'>+	/* call it */</div><div class='add'>+	jr	t2</div><div class='add'>+	nop</div><div class='add'>+	/* not reached */</div><div class='add'>+</div><div class='add'>+	__CPUINIT</div><div class='add'>+NESTED(nlm_boot_secondary_cpus, 16, sp)</div><div class='add'>+	PTR_LA	t1, nlm_next_sp</div><div class='add'>+	PTR_L	sp, 0(t1)</div><div class='add'>+	PTR_LA	t1, nlm_next_gp</div><div class='add'>+	PTR_L	gp, 0(t1)</div><div class='add'>+</div><div class='add'>+	/* a0 has the processor id */</div><div class='add'>+	PTR_LA	t0, nlm_early_init_secondary</div><div class='add'>+	jalr	t0</div><div class='add'>+	nop</div><div class='add'>+</div><div class='add'>+	PTR_LA	t0, smp_bootstrap</div><div class='add'>+	jr	t0</div><div class='add'>+	nop</div><div class='add'>+END(nlm_boot_secondary_cpus)</div><div class='add'>+	__FINIT</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * In case of RMIboot bootloader which is used on XLR boards, the CPUs</div><div class='add'>+ * be already woken up and waiting in bootloader code.</div><div class='add'>+ * This will get them out of the bootloader code and into linux. Needed</div><div class='add'>+ *  because the bootloader area will be taken and initialized by linux.</div><div class='add'>+ */</div><div class='add'>+	__CPUINIT</div><div class='add'>+NESTED(nlm_rmiboot_preboot, 16, sp)</div><div class='add'>+	mfc0	t0, $15, 1	# read ebase</div><div class='add'>+	andi	t0, 0x1f	# t0 has the processor_id()</div><div class='add'>+	andi	t2, t0, 0x3	# thread no</div><div class='add'>+	sll	t0, 2		# offset in cpu array</div><div class='add'>+</div><div class='add'>+	PTR_LA	t1, nlm_cpu_ready # mark CPU ready</div><div class='add'>+	PTR_ADDU t1, t0</div><div class='add'>+	li	t3, 1</div><div class='add'>+	sw	t3, 0(t1)</div><div class='add'>+</div><div class='add'>+	bnez	t2, 1f		# skip thread programming</div><div class='add'>+	nop			# for non zero hw threads</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * MMU setup only for first thread in core</div><div class='add'>+	 */</div><div class='add'>+	li	t0, 0x400</div><div class='add'>+	mfcr	t1, t0</div><div class='add'>+	li	t2, 6 		# XLR thread mode mask</div><div class='add'>+	nor	t3, t2, zero</div><div class='add'>+	and	t2, t1, t2	# t2 - current thread mode</div><div class='add'>+	li	v0, CKSEG1ADDR(RESET_DATA_PHYS)</div><div class='add'>+	lw	v1, BOOT_THREAD_MODE(v0) # v1 - new thread mode</div><div class='add'>+	sll	v1, 1</div><div class='add'>+	beq	v1, t2, 1f 	# same as request value</div><div class='add'>+	nop			# nothing to do */</div><div class='add'>+</div><div class='add'>+	and	t2, t1, t3	# mask out old thread mode</div><div class='add'>+	or	t1, t2, v1	# put in new value</div><div class='add'>+	mtcr	t1, t0		# update core control</div><div class='add'>+</div><div class='add'>+1:	wait</div><div class='add'>+	j	1b</div><div class='add'>+	nop</div><div class='add'>+END(nlm_rmiboot_preboot)</div><div class='add'>+	__FINIT</div><div class='head'>diff --git a/arch/mips/netlogic/xlr/time.c b/arch/mips/netlogic/common/time.c<br/>index 0d81b262593c..bd3e498157ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/netlogic/xlr/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/xlr/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/netlogic/common/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/netlogic/common/time.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='ctx'> #include &lt;asm/netlogic/interrupt.h&gt;</div><div class='del'>-#include &lt;asm/netlogic/psb-bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/common.h&gt;</div><div class='ctx'> </div><div class='ctx'> unsigned int __cpuinit get_c0_compare_int(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -45,7 +45,7 @@ unsigned int __cpuinit get_c0_compare_int(void)</div><div class='ctx'> </div><div class='ctx'> void __init plat_time_init(void)</div><div class='ctx'> {</div><div class='del'>-	mips_hpt_frequency = nlm_prom_info.cpu_frequency;</div><div class='add'>+	mips_hpt_frequency = nlm_get_cpu_frequency();</div><div class='ctx'> 	pr_info("MIPS counter frequency [%ld]\n",</div><div class='del'>-		(unsigned long)mips_hpt_frequency);</div><div class='add'>+			(unsigned long)mips_hpt_frequency);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/netlogic/xlp/Makefile b/arch/mips/netlogic/xlp/Makefile<br/>new file mode 100644<br/>index 000000000000..b93ed83474ec<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/netlogic/xlp/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/netlogic/xlp/Makefile</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+obj-y				+= setup.o platform.o nlm_hal.o</div><div class='add'>+obj-$(CONFIG_SMP)		+= wakeup.o</div><div class='head'>diff --git a/arch/mips/netlogic/xlp/nlm_hal.c b/arch/mips/netlogic/xlp/nlm_hal.c<br/>new file mode 100644<br/>index 000000000000..9428e7125fed<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/netlogic/xlp/nlm_hal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/netlogic/xlp/nlm_hal.c</a></div><div class='hunk'>@@ -0,0 +1,111 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights</div><div class='add'>+ * reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the NetLogic</div><div class='add'>+ * license below:</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in</div><div class='add'>+ *    the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR</div><div class='add'>+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE</div><div class='add'>+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='add'>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='add'>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='add'>+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,</div><div class='add'>+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE</div><div class='add'>+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN</div><div class='add'>+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</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/kernel.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mipsregs.h&gt;</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/netlogic/haldefs.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/iomap.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/xlp.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/pic.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/sys.h&gt;</div><div class='add'>+</div><div class='add'>+/* These addresses are computed by the nlm_hal_init() */</div><div class='add'>+uint64_t nlm_io_base;</div><div class='add'>+uint64_t nlm_sys_base;</div><div class='add'>+uint64_t nlm_pic_base;</div><div class='add'>+</div><div class='add'>+/* Main initialization */</div><div class='add'>+void nlm_hal_init(void)</div><div class='add'>+{</div><div class='add'>+	nlm_io_base = CKSEG1ADDR(XLP_DEFAULT_IO_BASE);</div><div class='add'>+	nlm_sys_base = nlm_get_sys_regbase(0);	/* node 0 */</div><div class='add'>+	nlm_pic_base = nlm_get_pic_regbase(0);	/* node 0 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int nlm_irq_to_irt(int irq)</div><div class='add'>+{</div><div class='add'>+	if (!PIC_IRQ_IS_IRT(irq))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	switch (irq) {</div><div class='add'>+	case PIC_UART_0_IRQ:</div><div class='add'>+		return PIC_IRT_UART_0_INDEX;</div><div class='add'>+	case PIC_UART_1_IRQ:</div><div class='add'>+		return PIC_IRT_UART_1_INDEX;</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'>+int nlm_irt_to_irq(int irt)</div><div class='add'>+{</div><div class='add'>+	switch (irt) {</div><div class='add'>+	case PIC_IRT_UART_0_INDEX:</div><div class='add'>+		return PIC_UART_0_IRQ;</div><div class='add'>+	case PIC_IRT_UART_1_INDEX:</div><div class='add'>+		return PIC_UART_1_IRQ;</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'>+unsigned int nlm_get_core_frequency(int core)</div><div class='add'>+{</div><div class='add'>+	unsigned int pll_divf, pll_divr, dfs_div, ext_div;</div><div class='add'>+	unsigned int rstval, dfsval, denom;</div><div class='add'>+	uint64_t num;</div><div class='add'>+</div><div class='add'>+	rstval = nlm_read_sys_reg(nlm_sys_base, SYS_POWER_ON_RESET_CFG);</div><div class='add'>+	dfsval = nlm_read_sys_reg(nlm_sys_base, SYS_CORE_DFS_DIV_VALUE);</div><div class='add'>+	pll_divf = ((rstval &gt;&gt; 10) &amp; 0x7f) + 1;</div><div class='add'>+	pll_divr = ((rstval &gt;&gt; 8)  &amp; 0x3) + 1;</div><div class='add'>+	ext_div  = ((rstval &gt;&gt; 30) &amp; 0x3) + 1;</div><div class='add'>+	dfs_div  = ((dfsval &gt;&gt; (core * 4)) &amp; 0xf) + 1;</div><div class='add'>+</div><div class='add'>+	num = 800000000ULL * pll_divf;</div><div class='add'>+	denom = 3 * pll_divr * ext_div * dfs_div;</div><div class='add'>+	do_div(num, denom);</div><div class='add'>+	return (unsigned int)num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int nlm_get_cpu_frequency(void)</div><div class='add'>+{</div><div class='add'>+	return nlm_get_core_frequency(0);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/netlogic/xlp/platform.c b/arch/mips/netlogic/xlp/platform.c<br/>new file mode 100644<br/>index 000000000000..1f5e4cba891d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/netlogic/xlp/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/netlogic/xlp/platform.c</a></div><div class='hunk'>@@ -0,0 +1,108 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights</div><div class='add'>+ * reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the NetLogic</div><div class='add'>+ * license below:</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in</div><div class='add'>+ *    the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR</div><div class='add'>+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE</div><div class='add'>+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='add'>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='add'>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='add'>+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,</div><div class='add'>+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE</div><div class='add'>+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN</div><div class='add'>+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/serial.h&gt;</div><div class='add'>+#include &lt;linux/serial_8250.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/serial_reg.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/addrspace.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/haldefs.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/iomap.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/xlp.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/pic.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/uart.h&gt;</div><div class='add'>+</div><div class='add'>+static unsigned int nlm_xlp_uart_in(struct uart_port *p, int offset)</div><div class='add'>+{</div><div class='add'>+	 return nlm_read_reg(p-&gt;iobase, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nlm_xlp_uart_out(struct uart_port *p, int offset, int value)</div><div class='add'>+{</div><div class='add'>+	nlm_write_reg(p-&gt;iobase, offset, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define PORT(_irq)					\</div><div class='add'>+	{						\</div><div class='add'>+		.irq		= _irq,			\</div><div class='add'>+		.regshift	= 2,			\</div><div class='add'>+		.iotype		= UPIO_MEM32,		\</div><div class='add'>+		.flags		= (UPF_SKIP_TEST|UPF_FIXED_TYPE|\</div><div class='add'>+					UPF_BOOT_AUTOCONF),	\</div><div class='add'>+		.uartclk	= XLP_IO_CLK,		\</div><div class='add'>+		.type		= PORT_16550A,		\</div><div class='add'>+		.serial_in	= nlm_xlp_uart_in,	\</div><div class='add'>+		.serial_out	= nlm_xlp_uart_out,	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static struct plat_serial8250_port xlp_uart_data[] = {</div><div class='add'>+	PORT(PIC_UART_0_IRQ),</div><div class='add'>+	PORT(PIC_UART_1_IRQ),</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device uart_device = {</div><div class='add'>+	.name		= "serial8250",</div><div class='add'>+	.id		= PLAT8250_DEV_PLATFORM,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = xlp_uart_data,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init nlm_platform_uart_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long mmio;</div><div class='add'>+</div><div class='add'>+	mmio = (unsigned long)nlm_get_uart_regbase(0, 0);</div><div class='add'>+	xlp_uart_data[0].iobase = mmio;</div><div class='add'>+	xlp_uart_data[0].membase = (void __iomem *)mmio;</div><div class='add'>+	xlp_uart_data[0].mapbase = mmio;</div><div class='add'>+</div><div class='add'>+	mmio = (unsigned long)nlm_get_uart_regbase(0, 1);</div><div class='add'>+	xlp_uart_data[1].iobase = mmio;</div><div class='add'>+	xlp_uart_data[1].membase = (void __iomem *)mmio;</div><div class='add'>+	xlp_uart_data[1].mapbase = mmio;</div><div class='add'>+</div><div class='add'>+	return platform_device_register(&amp;uart_device);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(nlm_platform_uart_init);</div><div class='head'>diff --git a/arch/mips/netlogic/xlp/setup.c b/arch/mips/netlogic/xlp/setup.c<br/>new file mode 100644<br/>index 000000000000..acb677a1227c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/netlogic/xlp/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/netlogic/xlp/setup.c</a></div><div class='hunk'>@@ -0,0 +1,105 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights</div><div class='add'>+ * reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the NetLogic</div><div class='add'>+ * license below:</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in</div><div class='add'>+ *    the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR</div><div class='add'>+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE</div><div class='add'>+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='add'>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='add'>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='add'>+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,</div><div class='add'>+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE</div><div class='add'>+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN</div><div class='add'>+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</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/serial_8250.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/of_fdt.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/netlogic/haldefs.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/common.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/iomap.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/xlp.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/sys.h&gt;</div><div class='add'>+</div><div class='add'>+unsigned long nlm_common_ebase = 0x0;</div><div class='add'>+</div><div class='add'>+/* default to uniprocessor */</div><div class='add'>+uint32_t nlm_coremask = 1, nlm_cpumask  = 1;</div><div class='add'>+int  nlm_threads_per_core = 1;</div><div class='add'>+</div><div class='add'>+static void nlm_linux_exit(void)</div><div class='add'>+{</div><div class='add'>+	nlm_write_sys_reg(nlm_sys_base, SYS_CHIP_RESET, 1);</div><div class='add'>+	for ( ; ; )</div><div class='add'>+		cpu_wait();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='add'>+{</div><div class='add'>+	panic_timeout	= 5;</div><div class='add'>+	_machine_restart = (void (*)(char *))nlm_linux_exit;</div><div class='add'>+	_machine_halt	= nlm_linux_exit;</div><div class='add'>+	pm_power_off	= nlm_linux_exit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *get_system_type(void)</div><div class='add'>+{</div><div class='add'>+	return "Netlogic XLP Series";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init prom_free_prom_memory(void)</div><div class='add'>+{</div><div class='add'>+	/* Nothing yet */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void xlp_mmu_init(void)</div><div class='add'>+{</div><div class='add'>+	write_c0_config6(read_c0_config6() | 0x24);</div><div class='add'>+	current_cpu_data.tlbsize = ((read_c0_config6() &gt;&gt; 16) &amp; 0xffff) + 1;</div><div class='add'>+	write_c0_config7(PM_DEFAULT_MASK &gt;&gt;</div><div class='add'>+		(13 + (ffz(PM_DEFAULT_MASK &gt;&gt; 13) / 2)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init prom_init(void)</div><div class='add'>+{</div><div class='add'>+	void *fdtp;</div><div class='add'>+</div><div class='add'>+	fdtp = (void *)(long)fw_arg0;</div><div class='add'>+	xlp_mmu_init();</div><div class='add'>+	nlm_hal_init();</div><div class='add'>+	early_init_devtree(fdtp);</div><div class='add'>+</div><div class='add'>+	nlm_common_ebase = read_c0_ebase() &amp; (~((1 &lt;&lt; 12) - 1));</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	nlm_wakeup_secondary_cpus(0xffffffff);</div><div class='add'>+	register_smp_ops(&amp;nlm_smp_ops);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/netlogic/xlp/wakeup.c b/arch/mips/netlogic/xlp/wakeup.c<br/>new file mode 100644<br/>index 000000000000..44d923ff3846<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/netlogic/xlp/wakeup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/netlogic/xlp/wakeup.c</a></div><div class='hunk'>@@ -0,0 +1,102 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights</div><div class='add'>+ * reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the NetLogic</div><div class='add'>+ * license below:</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ *</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in</div><div class='add'>+ *    the documentation and/or other materials provided with the</div><div class='add'>+ *    distribution.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR</div><div class='add'>+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE</div><div class='add'>+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='add'>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='add'>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='add'>+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,</div><div class='add'>+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE</div><div class='add'>+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN</div><div class='add'>+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</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/threads.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/asm.h&gt;</div><div class='add'>+#include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+#include &lt;asm/mipsregs.h&gt;</div><div class='add'>+#include &lt;asm/addrspace.h&gt;</div><div class='add'>+#include &lt;asm/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/netlogic/haldefs.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/common.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/mips-extns.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/iomap.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/pic.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/xlp.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlp-hal/sys.h&gt;</div><div class='add'>+</div><div class='add'>+static void xlp_enable_secondary_cores(void)</div><div class='add'>+{</div><div class='add'>+	uint32_t core, value, coremask, syscoremask;</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='add'>+	/* read cores in reset from SYS block */</div><div class='add'>+	syscoremask = nlm_read_sys_reg(nlm_sys_base, SYS_CPU_RESET);</div><div class='add'>+</div><div class='add'>+	/* update user specified */</div><div class='add'>+	nlm_coremask = nlm_coremask &amp; (syscoremask | 1);</div><div class='add'>+</div><div class='add'>+	for (core = 1; core &lt; 8; core++) {</div><div class='add'>+		coremask = 1 &lt;&lt; core;</div><div class='add'>+		if ((nlm_coremask &amp; coremask) == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Enable CPU clock */</div><div class='add'>+		value = nlm_read_sys_reg(nlm_sys_base, SYS_CORE_DFS_DIS_CTRL);</div><div class='add'>+		value &amp;= ~coremask;</div><div class='add'>+		nlm_write_sys_reg(nlm_sys_base, SYS_CORE_DFS_DIS_CTRL, value);</div><div class='add'>+</div><div class='add'>+		/* Remove CPU Reset */</div><div class='add'>+		value = nlm_read_sys_reg(nlm_sys_base, SYS_CPU_RESET);</div><div class='add'>+		value &amp;= ~coremask;</div><div class='add'>+		nlm_write_sys_reg(nlm_sys_base, SYS_CPU_RESET, value);</div><div class='add'>+</div><div class='add'>+		/* Poll for CPU to mark itself coherent */</div><div class='add'>+		count = 100000;</div><div class='add'>+		do {</div><div class='add'>+			value = nlm_read_sys_reg(nlm_sys_base,</div><div class='add'>+			    SYS_CPU_NONCOHERENT_MODE);</div><div class='add'>+		} while ((value &amp; coremask) != 0 &amp;&amp; count-- &gt; 0);</div><div class='add'>+</div><div class='add'>+		if (count == 0)</div><div class='add'>+			pr_err("Failed to enable core %d\n", core);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void xlp_wakeup_secondary_cpus(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * In case of u-boot, the secondaries are in reset</div><div class='add'>+	 * first wakeup core 0 threads</div><div class='add'>+	 */</div><div class='add'>+	xlp_boot_core0_siblings();</div><div class='add'>+</div><div class='add'>+	/* now get other cores out of reset */</div><div class='add'>+	xlp_enable_secondary_cores();</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/netlogic/xlr/Makefile b/arch/mips/netlogic/xlr/Makefile<br/>index 2dca585dd2f7..f01e4d7a0600 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/netlogic/xlr/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/xlr/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/netlogic/xlr/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/netlogic/xlr/Makefile</a></div><div class='hunk'>@@ -1,5 +1,2 @@</div><div class='del'>-obj-y				+= setup.o platform.o irq.o setup.o time.o</div><div class='del'>-obj-$(CONFIG_SMP)		+= smp.o smpboot.o</div><div class='del'>-obj-$(CONFIG_EARLY_PRINTK)	+= xlr_console.o</div><div class='del'>-</div><div class='del'>-ccflags-y			+= -Werror</div><div class='add'>+obj-y				+= setup.o platform.o</div><div class='add'>+obj-$(CONFIG_SMP)		+= wakeup.o</div><div class='head'>diff --git a/arch/mips/netlogic/xlr/irq.c b/arch/mips/netlogic/xlr/irq.c<br/>deleted file mode 100644<br/>index 521bb7377eb0..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/netlogic/xlr/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/xlr/irq.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,300 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights</div><div class='del'>- * reserved.</div><div class='del'>- *</div><div class='del'>- * This software is available to you under a choice of one of two</div><div class='del'>- * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='del'>- * General Public License (GPL) Version 2, available from the file</div><div class='del'>- * COPYING in the main directory of this source tree, or the NetLogic</div><div class='del'>- * license below:</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'>- * 1. 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'>- * 2. 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'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR</div><div class='del'>- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='del'>- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE</div><div class='del'>- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR</div><div class='del'>- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,</div><div class='del'>- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE</div><div class='del'>- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN</div><div class='del'>- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</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/init.h&gt;</div><div class='del'>-#include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mipsregs.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/netlogic/xlr/iomap.h&gt;</div><div class='del'>-#include &lt;asm/netlogic/xlr/pic.h&gt;</div><div class='del'>-#include &lt;asm/netlogic/xlr/xlr.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/netlogic/interrupt.h&gt;</div><div class='del'>-#include &lt;asm/netlogic/mips-extns.h&gt;</div><div class='del'>-</div><div class='del'>-static u64 nlm_irq_mask;</div><div class='del'>-static DEFINE_SPINLOCK(nlm_pic_lock);</div><div class='del'>-</div><div class='del'>-static void xlr_pic_enable(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	nlm_reg_t *mmio = netlogic_io_mmio(NETLOGIC_IO_PIC_OFFSET);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	nlm_reg_t reg;</div><div class='del'>-	int irq = d-&gt;irq;</div><div class='del'>-</div><div class='del'>-	WARN(!PIC_IRQ_IS_IRT(irq), "Bad irq %d", irq);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;nlm_pic_lock, flags);</div><div class='del'>-	reg = netlogic_read_reg(mmio, PIC_IRT_1_BASE + irq - PIC_IRQ_BASE);</div><div class='del'>-	netlogic_write_reg(mmio, PIC_IRT_1_BASE + irq - PIC_IRQ_BASE,</div><div class='del'>-			  reg | (1 &lt;&lt; 6) | (1 &lt;&lt; 30) | (1 &lt;&lt; 31));</div><div class='del'>-	spin_unlock_irqrestore(&amp;nlm_pic_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xlr_pic_mask(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	nlm_reg_t *mmio = netlogic_io_mmio(NETLOGIC_IO_PIC_OFFSET);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	nlm_reg_t reg;</div><div class='del'>-	int irq = d-&gt;irq;</div><div class='del'>-</div><div class='del'>-	WARN(!PIC_IRQ_IS_IRT(irq), "Bad irq %d", irq);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;nlm_pic_lock, flags);</div><div class='del'>-	reg = netlogic_read_reg(mmio, PIC_IRT_1_BASE + irq - PIC_IRQ_BASE);</div><div class='del'>-	netlogic_write_reg(mmio, PIC_IRT_1_BASE + irq - PIC_IRQ_BASE,</div><div class='del'>-			  reg | (1 &lt;&lt; 6) | (1 &lt;&lt; 30) | (0 &lt;&lt; 31));</div><div class='del'>-	spin_unlock_irqrestore(&amp;nlm_pic_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-/* Extra ACK needed for XLR on chip PCI controller */</div><div class='del'>-static void xlr_pci_ack(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	nlm_reg_t *pci_mmio = netlogic_io_mmio(NETLOGIC_IO_PCIX_OFFSET);</div><div class='del'>-</div><div class='del'>-	netlogic_read_reg(pci_mmio, (0x140 &gt;&gt; 2));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Extra ACK needed for XLS on chip PCIe controller */</div><div class='del'>-static void xls_pcie_ack(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	nlm_reg_t *pcie_mmio_le = netlogic_io_mmio(NETLOGIC_IO_PCIE_1_OFFSET);</div><div class='del'>-</div><div class='del'>-	switch (d-&gt;irq) {</div><div class='del'>-	case PIC_PCIE_LINK0_IRQ:</div><div class='del'>-		netlogic_write_reg(pcie_mmio_le, (0x90 &gt;&gt; 2), 0xffffffff);</div><div class='del'>-		break;</div><div class='del'>-	case PIC_PCIE_LINK1_IRQ:</div><div class='del'>-		netlogic_write_reg(pcie_mmio_le, (0x94 &gt;&gt; 2), 0xffffffff);</div><div class='del'>-		break;</div><div class='del'>-	case PIC_PCIE_LINK2_IRQ:</div><div class='del'>-		netlogic_write_reg(pcie_mmio_le, (0x190 &gt;&gt; 2), 0xffffffff);</div><div class='del'>-		break;</div><div class='del'>-	case PIC_PCIE_LINK3_IRQ:</div><div class='del'>-		netlogic_write_reg(pcie_mmio_le, (0x194 &gt;&gt; 2), 0xffffffff);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* For XLS B silicon, the 3,4 PCI interrupts are different */</div><div class='del'>-static void xls_pcie_ack_b(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	nlm_reg_t *pcie_mmio_le = netlogic_io_mmio(NETLOGIC_IO_PCIE_1_OFFSET);</div><div class='del'>-</div><div class='del'>-	switch (d-&gt;irq) {</div><div class='del'>-	case PIC_PCIE_LINK0_IRQ:</div><div class='del'>-		netlogic_write_reg(pcie_mmio_le, (0x90 &gt;&gt; 2), 0xffffffff);</div><div class='del'>-		break;</div><div class='del'>-	case PIC_PCIE_LINK1_IRQ:</div><div class='del'>-		netlogic_write_reg(pcie_mmio_le, (0x94 &gt;&gt; 2), 0xffffffff);</div><div class='del'>-		break;</div><div class='del'>-	case PIC_PCIE_XLSB0_LINK2_IRQ:</div><div class='del'>-		netlogic_write_reg(pcie_mmio_le, (0x190 &gt;&gt; 2), 0xffffffff);</div><div class='del'>-		break;</div><div class='del'>-	case PIC_PCIE_XLSB0_LINK3_IRQ:</div><div class='del'>-		netlogic_write_reg(pcie_mmio_le, (0x194 &gt;&gt; 2), 0xffffffff);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void xlr_pic_ack(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	nlm_reg_t *mmio;</div><div class='del'>-	int irq = d-&gt;irq;</div><div class='del'>-	void *hd = irq_data_get_irq_handler_data(d);</div><div class='del'>-</div><div class='del'>-	WARN(!PIC_IRQ_IS_IRT(irq), "Bad irq %d", irq);</div><div class='del'>-</div><div class='del'>-	if (hd) {</div><div class='del'>-		void (*extra_ack)(void *) = hd;</div><div class='del'>-		extra_ack(d);</div><div class='del'>-	}</div><div class='del'>-	mmio = netlogic_io_mmio(NETLOGIC_IO_PIC_OFFSET);</div><div class='del'>-	spin_lock_irqsave(&amp;nlm_pic_lock, flags);</div><div class='del'>-	netlogic_write_reg(mmio, PIC_INT_ACK, (1 &lt;&lt; (irq - PIC_IRQ_BASE)));</div><div class='del'>-	spin_unlock_irqrestore(&amp;nlm_pic_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This chip definition handles interrupts routed thru the XLR</div><div class='del'>- * hardware PIC, currently IRQs 8-39 are mapped to hardware intr</div><div class='del'>- * 0-31 wired the XLR PIC</div><div class='del'>- */</div><div class='del'>-static struct irq_chip xlr_pic = {</div><div class='del'>-	.name		= "XLR-PIC",</div><div class='del'>-	.irq_enable	= xlr_pic_enable,</div><div class='del'>-	.irq_mask	= xlr_pic_mask,</div><div class='del'>-	.irq_ack	= xlr_pic_ack,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void rsvd_irq_handler(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	WARN(d-&gt;irq &gt;= PIC_IRQ_BASE, "Bad irq %d", d-&gt;irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Chip definition for CPU originated interrupts(timer, msg) and</div><div class='del'>- * IPIs</div><div class='del'>- */</div><div class='del'>-struct irq_chip nlm_cpu_intr = {</div><div class='del'>-	.name		= "XLR-CPU-INTR",</div><div class='del'>-	.irq_enable	= rsvd_irq_handler,</div><div class='del'>-	.irq_mask	= rsvd_irq_handler,</div><div class='del'>-	.irq_ack	= rsvd_irq_handler,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __init init_xlr_irqs(void)</div><div class='del'>-{</div><div class='del'>-	nlm_reg_t *mmio = netlogic_io_mmio(NETLOGIC_IO_PIC_OFFSET);</div><div class='del'>-	uint32_t thread_mask = 1;</div><div class='del'>-	int level, i;</div><div class='del'>-</div><div class='del'>-	pr_info("Interrupt thread mask [%x]\n", thread_mask);</div><div class='del'>-	for (i = 0; i &lt; PIC_NUM_IRTS; i++) {</div><div class='del'>-		level = PIC_IRQ_IS_EDGE_TRIGGERED(i);</div><div class='del'>-</div><div class='del'>-		/* Bind all PIC irqs to boot cpu */</div><div class='del'>-		netlogic_write_reg(mmio, PIC_IRT_0_BASE + i, thread_mask);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Use local scheduling and high polarity for all IRTs</div><div class='del'>-		 * Invalidate all IRTs, by default</div><div class='del'>-		 */</div><div class='del'>-		netlogic_write_reg(mmio, PIC_IRT_1_BASE + i,</div><div class='del'>-				(level &lt;&lt; 30) | (1 &lt;&lt; 6) | (PIC_IRQ_BASE + i));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Make all IRQs as level triggered by default */</div><div class='del'>-	for (i = 0; i &lt; NR_IRQS; i++) {</div><div class='del'>-		if (PIC_IRQ_IS_IRT(i))</div><div class='del'>-			irq_set_chip_and_handler(i, &amp;xlr_pic, handle_level_irq);</div><div class='del'>-		else</div><div class='del'>-			irq_set_chip_and_handler(i, &amp;nlm_cpu_intr,</div><div class='del'>-						handle_percpu_irq);</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	irq_set_chip_and_handler(IRQ_IPI_SMP_FUNCTION, &amp;nlm_cpu_intr,</div><div class='del'>-			 nlm_smp_function_ipi_handler);</div><div class='del'>-	irq_set_chip_and_handler(IRQ_IPI_SMP_RESCHEDULE, &amp;nlm_cpu_intr,</div><div class='del'>-			 nlm_smp_resched_ipi_handler);</div><div class='del'>-	nlm_irq_mask |=</div><div class='del'>-	    ((1ULL &lt;&lt; IRQ_IPI_SMP_FUNCTION) | (1ULL &lt;&lt; IRQ_IPI_SMP_RESCHEDULE));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	/*</div><div class='del'>-	 * For PCI interrupts, we need to ack the PIC controller too, overload</div><div class='del'>-	 * irq handler data to do this</div><div class='del'>-	 */</div><div class='del'>-	if (nlm_chip_is_xls()) {</div><div class='del'>-		if (nlm_chip_is_xls_b()) {</div><div class='del'>-			irq_set_handler_data(PIC_PCIE_LINK0_IRQ,</div><div class='del'>-							xls_pcie_ack_b);</div><div class='del'>-			irq_set_handler_data(PIC_PCIE_LINK1_IRQ,</div><div class='del'>-							xls_pcie_ack_b);</div><div class='del'>-			irq_set_handler_data(PIC_PCIE_XLSB0_LINK2_IRQ,</div><div class='del'>-							xls_pcie_ack_b);</div><div class='del'>-			irq_set_handler_data(PIC_PCIE_XLSB0_LINK3_IRQ,</div><div class='del'>-							xls_pcie_ack_b);</div><div class='del'>-		} else {</div><div class='del'>-			irq_set_handler_data(PIC_PCIE_LINK0_IRQ, xls_pcie_ack);</div><div class='del'>-			irq_set_handler_data(PIC_PCIE_LINK1_IRQ, xls_pcie_ack);</div><div class='del'>-			irq_set_handler_data(PIC_PCIE_LINK2_IRQ, xls_pcie_ack);</div><div class='del'>-			irq_set_handler_data(PIC_PCIE_LINK3_IRQ, xls_pcie_ack);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* XLR PCI controller ACK */</div><div class='del'>-		irq_set_handler_data(PIC_PCIE_XLSB0_LINK3_IRQ, xlr_pci_ack);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	/* unmask all PIC related interrupts. If no handler is installed by the</div><div class='del'>-	 * drivers, it'll just ack the interrupt and return</div><div class='del'>-	 */</div><div class='del'>-	for (i = PIC_IRT_FIRST_IRQ; i &lt;= PIC_IRT_LAST_IRQ; i++)</div><div class='del'>-		nlm_irq_mask |= (1ULL &lt;&lt; i);</div><div class='del'>-</div><div class='del'>-	nlm_irq_mask |= (1ULL &lt;&lt; IRQ_TIMER);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init arch_init_irq(void)</div><div class='del'>-{</div><div class='del'>-	/* Initialize the irq descriptors */</div><div class='del'>-	init_xlr_irqs();</div><div class='del'>-	write_c0_eimr(nlm_irq_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __cpuinit nlm_smp_irq_init(void)</div><div class='del'>-{</div><div class='del'>-	/* set interrupt mask for non-zero cpus */</div><div class='del'>-	write_c0_eimr(nlm_irq_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage void plat_irq_dispatch(void)</div><div class='del'>-{</div><div class='del'>-	uint64_t eirr;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	eirr = read_c0_eirr() &amp; read_c0_eimr();</div><div class='del'>-	if (!eirr)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* no need of EIRR here, writing compare clears interrupt */</div><div class='del'>-	if (eirr &amp; (1 &lt;&lt; IRQ_TIMER)) {</div><div class='del'>-		do_IRQ(IRQ_TIMER);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* use dcltz: optimize below code */</div><div class='del'>-	for (i = 63; i != -1; i--) {</div><div class='del'>-		if (eirr &amp; (1ULL &lt;&lt; i))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (i == -1) {</div><div class='del'>-		pr_err("no interrupt !!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Ack eirr */</div><div class='del'>-	write_c0_eirr(1ULL &lt;&lt; i);</div><div class='del'>-</div><div class='del'>-	do_IRQ(i);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/netlogic/xlr/platform.c b/arch/mips/netlogic/xlr/platform.c<br/>index 609ec2534642..eab64b45dffd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/netlogic/xlr/platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/xlr/platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/netlogic/xlr/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/netlogic/xlr/platform.c</a></div><div class='hunk'>@@ -15,18 +15,19 @@</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/netlogic/haldefs.h&gt;</div><div class='ctx'> #include &lt;asm/netlogic/xlr/iomap.h&gt;</div><div class='ctx'> #include &lt;asm/netlogic/xlr/pic.h&gt;</div><div class='ctx'> #include &lt;asm/netlogic/xlr/xlr.h&gt;</div><div class='ctx'> </div><div class='ctx'> unsigned int nlm_xlr_uart_in(struct uart_port *p, int offset)</div><div class='ctx'> {</div><div class='del'>-	nlm_reg_t *mmio;</div><div class='add'>+	uint64_t uartbase;</div><div class='ctx'> 	unsigned int value;</div><div class='ctx'> </div><div class='del'>-	/* XLR uart does not need any mapping of regs */</div><div class='del'>-	mmio = (nlm_reg_t *)(p-&gt;membase + (offset &lt;&lt; p-&gt;regshift));</div><div class='del'>-	value = netlogic_read_reg(mmio, 0);</div><div class='add'>+	/* sign extend to 64 bits, if needed */</div><div class='add'>+	uartbase = (uint64_t)(long)p-&gt;membase;</div><div class='add'>+	value = nlm_read_reg(uartbase, offset);</div><div class='ctx'> </div><div class='ctx'> 	/* See XLR/XLS errata */</div><div class='ctx'> 	if (offset == UART_MSR)</div><div class='hunk'>@@ -39,10 +40,10 @@ unsigned int nlm_xlr_uart_in(struct uart_port *p, int offset)</div><div class='ctx'> </div><div class='ctx'> void nlm_xlr_uart_out(struct uart_port *p, int offset, int value)</div><div class='ctx'> {</div><div class='del'>-	nlm_reg_t *mmio;</div><div class='add'>+	uint64_t uartbase;</div><div class='ctx'> </div><div class='del'>-	/* XLR uart does not need any mapping of regs */</div><div class='del'>-	mmio = (nlm_reg_t *)(p-&gt;membase + (offset &lt;&lt; p-&gt;regshift));</div><div class='add'>+	/* sign extend to 64 bits, if needed */</div><div class='add'>+	uartbase = (uint64_t)(long)p-&gt;membase;</div><div class='ctx'> </div><div class='ctx'> 	/* See XLR/XLS errata */</div><div class='ctx'> 	if (offset == UART_MSR)</div><div class='hunk'>@@ -50,7 +51,7 @@ void nlm_xlr_uart_out(struct uart_port *p, int offset, int value)</div><div class='ctx'> 	else if (offset == UART_MCR)</div><div class='ctx'> 		value ^= 0x3;</div><div class='ctx'> </div><div class='del'>-	netlogic_write_reg(mmio, 0, value);</div><div class='add'>+	nlm_write_reg(uartbase, offset, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define PORT(_irq)					\</div><div class='hunk'>@@ -82,15 +83,15 @@ static struct platform_device uart_device = {</div><div class='ctx'> </div><div class='ctx'> static int __init nlm_uart_init(void)</div><div class='ctx'> {</div><div class='del'>-	nlm_reg_t *mmio;</div><div class='add'>+	unsigned long uartbase;</div><div class='ctx'> </div><div class='del'>-	mmio = netlogic_io_mmio(NETLOGIC_IO_UART_0_OFFSET);</div><div class='del'>-	xlr_uart_data[0].membase = (void __iomem *)mmio;</div><div class='del'>-	xlr_uart_data[0].mapbase = CPHYSADDR((unsigned long)mmio);</div><div class='add'>+	uartbase = (unsigned long)nlm_mmio_base(NETLOGIC_IO_UART_0_OFFSET);</div><div class='add'>+	xlr_uart_data[0].membase = (void __iomem *)uartbase;</div><div class='add'>+	xlr_uart_data[0].mapbase = CPHYSADDR(uartbase);</div><div class='ctx'> </div><div class='del'>-	mmio = netlogic_io_mmio(NETLOGIC_IO_UART_1_OFFSET);</div><div class='del'>-	xlr_uart_data[1].membase = (void __iomem *)mmio;</div><div class='del'>-	xlr_uart_data[1].mapbase = CPHYSADDR((unsigned long)mmio);</div><div class='add'>+	uartbase = (unsigned long)nlm_mmio_base(NETLOGIC_IO_UART_1_OFFSET);</div><div class='add'>+	xlr_uart_data[1].membase = (void __iomem *)uartbase;</div><div class='add'>+	xlr_uart_data[1].mapbase = CPHYSADDR(uartbase);</div><div class='ctx'> </div><div class='ctx'> 	return platform_device_register(&amp;uart_device);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/netlogic/xlr/setup.c b/arch/mips/netlogic/xlr/setup.c<br/>index cee25ddd0887..c9d066dedc4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/netlogic/xlr/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/xlr/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/netlogic/xlr/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/netlogic/xlr/setup.c</a></div><div class='hunk'>@@ -39,26 +39,33 @@</div><div class='ctx'> #include &lt;asm/reboot.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='del'>-#include &lt;asm/smp-ops.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/netlogic/interrupt.h&gt;</div><div class='ctx'> #include &lt;asm/netlogic/psb-bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/haldefs.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/common.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/netlogic/xlr/xlr.h&gt;</div><div class='ctx'> #include &lt;asm/netlogic/xlr/iomap.h&gt;</div><div class='ctx'> #include &lt;asm/netlogic/xlr/pic.h&gt;</div><div class='ctx'> #include &lt;asm/netlogic/xlr/gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-unsigned long netlogic_io_base = (unsigned long)(DEFAULT_NETLOGIC_IO_BASE);</div><div class='del'>-unsigned long nlm_common_ebase = 0x0;</div><div class='add'>+uint64_t nlm_io_base = DEFAULT_NETLOGIC_IO_BASE;</div><div class='add'>+uint64_t nlm_pic_base;</div><div class='ctx'> struct psb_info nlm_prom_info;</div><div class='ctx'> </div><div class='add'>+unsigned long nlm_common_ebase = 0x0;</div><div class='add'>+</div><div class='add'>+/* default to uniprocessor */</div><div class='add'>+uint32_t nlm_coremask = 1, nlm_cpumask  = 1;</div><div class='add'>+int  nlm_threads_per_core = 1;</div><div class='add'>+</div><div class='ctx'> static void __init nlm_early_serial_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct uart_port s;</div><div class='del'>-	nlm_reg_t *uart_base;</div><div class='add'>+	unsigned long uart_base;</div><div class='ctx'> </div><div class='del'>-	uart_base = netlogic_io_mmio(NETLOGIC_IO_UART_0_OFFSET);</div><div class='add'>+	uart_base = (unsigned long)nlm_mmio_base(NETLOGIC_IO_UART_0_OFFSET);</div><div class='ctx'> 	memset(&amp;s, 0, sizeof(s));</div><div class='ctx'> 	s.flags		= ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;</div><div class='ctx'> 	s.iotype	= UPIO_MEM32;</div><div class='hunk'>@@ -67,18 +74,18 @@ static void __init nlm_early_serial_setup(void)</div><div class='ctx'> 	s.uartclk	= PIC_CLKS_PER_SEC;</div><div class='ctx'> 	s.serial_in	= nlm_xlr_uart_in;</div><div class='ctx'> 	s.serial_out	= nlm_xlr_uart_out;</div><div class='del'>-	s.mapbase	= (unsigned long)uart_base;</div><div class='add'>+	s.mapbase	= uart_base;</div><div class='ctx'> 	s.membase	= (unsigned char __iomem *)uart_base;</div><div class='ctx'> 	early_serial_setup(&amp;s);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nlm_linux_exit(void)</div><div class='ctx'> {</div><div class='del'>-	nlm_reg_t *mmio;</div><div class='add'>+	uint64_t gpiobase;</div><div class='ctx'> </div><div class='del'>-	mmio = netlogic_io_mmio(NETLOGIC_IO_GPIO_OFFSET);</div><div class='add'>+	gpiobase = nlm_mmio_base(NETLOGIC_IO_GPIO_OFFSET);</div><div class='ctx'> 	/* trigger a chip reset by writing 1 to GPIO_SWRESET_REG */</div><div class='del'>-	netlogic_write_reg(mmio, NETLOGIC_GPIO_SWRESET_REG, 1);</div><div class='add'>+	nlm_write_reg(gpiobase, NETLOGIC_GPIO_SWRESET_REG, 1);</div><div class='ctx'> 	for ( ; ; )</div><div class='ctx'> 		cpu_wait();</div><div class='ctx'> }</div><div class='hunk'>@@ -96,6 +103,11 @@ const char *get_system_type(void)</div><div class='ctx'> 	return "Netlogic XLR/XLS Series";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+unsigned int nlm_get_cpu_frequency(void)</div><div class='add'>+{</div><div class='add'>+	return (unsigned int)nlm_prom_info.cpu_frequency;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init prom_free_prom_memory(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Nothing yet */</div><div class='hunk'>@@ -175,6 +187,7 @@ void __init prom_init(void)</div><div class='ctx'> 	prom_infop = (struct psb_info *)(long)(int)fw_arg3;</div><div class='ctx'> </div><div class='ctx'> 	nlm_prom_info = *prom_infop;</div><div class='add'>+	nlm_pic_base = nlm_mmio_base(NETLOGIC_IO_PIC_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 	nlm_early_serial_setup();</div><div class='ctx'> 	build_arcs_cmdline(argv);</div><div class='head'>diff --git a/arch/mips/netlogic/xlr/smpboot.S b/arch/mips/netlogic/xlr/wakeup.c<br/>index 8cb7889ce0cc..db5d987d4881 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/netlogic/xlr/smpboot.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/netlogic/xlr/smpboot.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/netlogic/xlr/wakeup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/netlogic/xlr/wakeup.c</a></div><div class='hunk'>@@ -33,68 +33,36 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/threads.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='del'>-#include &lt;asm/regdef.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='add'>+#include &lt;asm/addrspace.h&gt;</div><div class='add'>+#include &lt;asm/string.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Early code for secondary CPUs. This will get them out of the bootloader</div><div class='del'>- * code and into linux. Needed because the bootloader area will be taken</div><div class='del'>- * and initialized by linux.</div><div class='del'>- */</div><div class='del'>-	__CPUINIT</div><div class='del'>-NESTED(prom_pre_boot_secondary_cpus, 16, sp)</div><div class='del'>-	.set	mips64</div><div class='del'>-	mfc0	t0, $15, 1	# read ebase</div><div class='del'>-	andi	t0, 0x1f	# t0 has the processor_id()</div><div class='del'>-	sll	t0, 2		# offset in cpu array</div><div class='del'>-</div><div class='del'>-	PTR_LA	t1, nlm_cpu_ready # mark CPU ready</div><div class='del'>-	PTR_ADDU t1, t0</div><div class='del'>-	li	t2, 1</div><div class='del'>-	sw	t2, 0(t1)</div><div class='del'>-</div><div class='del'>-	PTR_LA	t1, nlm_cpu_unblock</div><div class='del'>-	PTR_ADDU t1, t0</div><div class='del'>-1:	lw	t2, 0(t1)	# wait till unblocked</div><div class='del'>-	beqz	t2, 1b</div><div class='del'>-	nop</div><div class='add'>+#include &lt;asm/netlogic/haldefs.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/common.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/mips-extns.h&gt;</div><div class='ctx'> </div><div class='del'>-	PTR_LA	t1, nlm_next_sp</div><div class='del'>-	PTR_L	sp, 0(t1)</div><div class='del'>-	PTR_LA	t1, nlm_next_gp</div><div class='del'>-	PTR_L	gp, 0(t1)</div><div class='add'>+#include &lt;asm/netlogic/xlr/iomap.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/xlr/pic.h&gt;</div><div class='ctx'> </div><div class='del'>-	PTR_LA	t0, nlm_early_init_secondary</div><div class='del'>-	jalr	t0</div><div class='del'>-	nop</div><div class='del'>-</div><div class='del'>-	PTR_LA	t0, smp_bootstrap</div><div class='del'>-	jr	t0</div><div class='del'>-	nop</div><div class='del'>-END(prom_pre_boot_secondary_cpus)</div><div class='del'>-	__FINIT</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * NMI code, used for CPU wakeup, copied to reset entry</div><div class='del'>- */</div><div class='del'>-NESTED(nlm_boot_smp_nmi, 0, sp)</div><div class='del'>-	.set push</div><div class='del'>-	.set noat</div><div class='del'>-	.set mips64</div><div class='del'>-	.set noreorder</div><div class='add'>+int __cpuinit xlr_wakeup_secondary_cpus(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, boot_cpu;</div><div class='ctx'> </div><div class='del'>-	/* Clear the  NMI and BEV bits */</div><div class='del'>-	MFC0	k0, CP0_STATUS</div><div class='del'>-	li 	k1, 0xffb7ffff</div><div class='del'>-	and	k0, k0, k1</div><div class='del'>-	MTC0	k0, CP0_STATUS</div><div class='add'>+	/*</div><div class='add'>+	 *  In case of RMI boot, hit with NMI to get the cores</div><div class='add'>+	 *  from bootloader to linux code.</div><div class='add'>+	 */</div><div class='add'>+	boot_cpu = hard_smp_processor_id();</div><div class='add'>+	nlm_set_nmi_handler(nlm_rmiboot_preboot);</div><div class='add'>+	for (i = 0; i &lt; NR_CPUS; i++) {</div><div class='add'>+		if (i == boot_cpu || (nlm_cpumask &amp; (1u &lt;&lt; i)) == 0)</div><div class='add'>+			continue;</div><div class='add'>+		nlm_pic_send_ipi(nlm_pic_base, i, 1, 1); /* send NMI */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	PTR_LA  k1, secondary_entry_point</div><div class='del'>-	PTR_L	k0, 0(k1)</div><div class='del'>-	jr	k0</div><div class='del'>-	nop</div><div class='del'>-	.set pop</div><div class='del'>-END(nlm_boot_smp_nmi)</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile<br/>index bb82cbdbc62a..c3ac4b086eb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pci/Makefile</a></div><div class='hunk'>@@ -19,6 +19,7 @@ obj-$(CONFIG_BCM47XX)		+= pci-bcm47xx.o</div><div class='ctx'> obj-$(CONFIG_BCM63XX)		+= pci-bcm63xx.o fixup-bcm63xx.o \</div><div class='ctx'> 					ops-bcm63xx.o</div><div class='ctx'> obj-$(CONFIG_MIPS_ALCHEMY)	+= pci-alchemy.o</div><div class='add'>+obj-$(CONFIG_SOC_AR724X)	+= pci-ath724x.o</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # These are still pretty much in the old state, watch, go blind.</div><div class='hunk'>@@ -55,7 +56,7 @@ obj-$(CONFIG_ZAO_CAPCELLA)	+= fixup-capcella.o</div><div class='ctx'> obj-$(CONFIG_WR_PPMC)		+= fixup-wrppmc.o</div><div class='ctx'> obj-$(CONFIG_MIKROTIK_RB532)	+= pci-rc32434.o ops-rc32434.o fixup-rc32434.o</div><div class='ctx'> obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= pci-octeon.o pcie-octeon.o</div><div class='del'>-obj-$(CONFIG_NLM_XLR)		+= pci-xlr.o</div><div class='add'>+obj-$(CONFIG_CPU_XLR)		+= pci-xlr.o</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_PCI_MSI</div><div class='ctx'> obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= msi-octeon.o</div><div class='head'>diff --git a/arch/mips/pci/msi-octeon.c b/arch/mips/pci/msi-octeon.c<br/>index 5d530f89d872..d37be36dc659 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/msi-octeon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/msi-octeon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/msi-octeon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pci/msi-octeon.c</a></div><div class='hunk'>@@ -162,7 +162,7 @@ msi_irq_allocated:</div><div class='ctx'> 		msg.address_hi = (0 + CVMX_NPEI_PCIE_MSI_RCV) &gt;&gt; 32;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		panic("arch_setup_msi_irq: Invalid octeon_dma_bar_type\n");</div><div class='add'>+		panic("arch_setup_msi_irq: Invalid octeon_dma_bar_type");</div><div class='ctx'> 	}</div><div class='ctx'> 	msg.data = irq - OCTEON_IRQ_MSI_BIT0;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/pci/ops-pmcmsp.c b/arch/mips/pci/ops-pmcmsp.c<br/>index 8fbfbf2b931c..389bf669d56e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-pmcmsp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/ops-pmcmsp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-pmcmsp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pci/ops-pmcmsp.c</a></div><div class='hunk'>@@ -405,7 +405,7 @@ int msp_pcibios_config_access(unsigned char access_type,</div><div class='ctx'> 	if (pciirqflag == 0) {</div><div class='ctx'> 		ret = request_irq(MSP_INT_PCI,/* Hardcoded internal MSP7120 wiring */</div><div class='ctx'> 				bpci_interrupt,</div><div class='del'>-				IRQF_SHARED | IRQF_DISABLED,</div><div class='add'>+				IRQF_SHARED,</div><div class='ctx'> 				"PMC MSP PCI Host",</div><div class='ctx'> 				preg);</div><div class='ctx'> 		if (ret != 0)</div><div class='head'>diff --git a/arch/mips/pci/ops-tx3927.c b/arch/mips/pci/ops-tx3927.c<br/>index 6a3bdb5ffa80..02d64f77e967 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-tx3927.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/ops-tx3927.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-tx3927.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pci/ops-tx3927.c</a></div><div class='hunk'>@@ -225,7 +225,7 @@ void __init tx3927_setup_pcierr_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (request_irq(TXX9_IRQ_BASE + TX3927_IR_PCI,</div><div class='ctx'> 			tx3927_pcierr_interrupt,</div><div class='del'>-			IRQF_DISABLED, "PCI error",</div><div class='add'>+			0, "PCI error",</div><div class='ctx'> 			(void *)TX3927_PCIC_REG))</div><div class='ctx'> 		printk(KERN_WARNING "Failed to request irq for PCIERR\n");</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/pci/pci-alchemy.c b/arch/mips/pci/pci-alchemy.c<br/>index b5ce041cdafb..ec125bed721c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-alchemy.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pci-alchemy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-alchemy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pci/pci-alchemy.c</a></div><div class='hunk'>@@ -13,9 +13,11 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='add'>+#include &lt;asm/tlbmisc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_PCI</div><div class='ctx'> #define DBG(x...) printk(KERN_DEBUG x)</div><div class='hunk'>@@ -41,6 +43,12 @@ struct alchemy_pci_context {</div><div class='ctx'> 	int (*board_pci_idsel)(unsigned int devsel, int assert);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* for syscore_ops. There's only one PCI controller on Alchemy chips, so this</div><div class='add'>+ * should suffice for now.</div><div class='add'>+ */</div><div class='add'>+static struct alchemy_pci_context *__alchemy_pci_ctx;</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* IO/MEM resources for PCI. Keep the memres in sync with __fixup_bigphys_addr</div><div class='ctx'>  * in arch/mips/alchemy/common/setup.c</div><div class='ctx'>  */</div><div class='hunk'>@@ -99,18 +107,6 @@ static int config_access(unsigned char access_type, struct pci_bus *bus,</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* YAMON on all db1xxx boards wipes the TLB and writes zero to C0_wired</div><div class='del'>-	 * on resume, clearing our wired entry.  Unfortunately the -&gt;resume()</div><div class='del'>-	 * callback is called way way way too late (and -&gt;suspend() too early)</div><div class='del'>-	 * to have them destroy and recreate it.  Instead just test if c0_wired</div><div class='del'>-	 * is now lower than the index we retrieved before suspending and then</div><div class='del'>-	 * recreate the entry if necessary.  Of course this is totally bonkers</div><div class='del'>-	 * and breaks as soon as someone else adds another wired entry somewhere</div><div class='del'>-	 * else.  Anyone have any ideas how to handle this better?</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(read_c0_wired() &lt; ctx-&gt;wired_entry))</div><div class='del'>-		alchemy_pci_wired_entry(ctx);</div><div class='del'>-</div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	r = __raw_readl(ctx-&gt;regs + PCI_REG_STATCMD) &amp; 0x0000ffff;</div><div class='ctx'> 	r |= PCI_STATCMD_STATUS(0x2000);</div><div class='hunk'>@@ -304,6 +300,62 @@ static int alchemy_pci_def_idsel(unsigned int devsel, int assert)</div><div class='ctx'> 	return 1;	/* success */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* save PCI controller register contents. */</div><div class='add'>+static int alchemy_pci_suspend(void)</div><div class='add'>+{</div><div class='add'>+	struct alchemy_pci_context *ctx = __alchemy_pci_ctx;</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;pm[0]  = __raw_readl(ctx-&gt;regs + PCI_REG_CMEM);</div><div class='add'>+	ctx-&gt;pm[1]  = __raw_readl(ctx-&gt;regs + PCI_REG_CONFIG) &amp; 0x0009ffff;</div><div class='add'>+	ctx-&gt;pm[2]  = __raw_readl(ctx-&gt;regs + PCI_REG_B2BMASK_CCH);</div><div class='add'>+	ctx-&gt;pm[3]  = __raw_readl(ctx-&gt;regs + PCI_REG_B2BBASE0_VID);</div><div class='add'>+	ctx-&gt;pm[4]  = __raw_readl(ctx-&gt;regs + PCI_REG_B2BBASE1_SID);</div><div class='add'>+	ctx-&gt;pm[5]  = __raw_readl(ctx-&gt;regs + PCI_REG_MWMASK_DEV);</div><div class='add'>+	ctx-&gt;pm[6]  = __raw_readl(ctx-&gt;regs + PCI_REG_MWBASE_REV_CCL);</div><div class='add'>+	ctx-&gt;pm[7]  = __raw_readl(ctx-&gt;regs + PCI_REG_ID);</div><div class='add'>+	ctx-&gt;pm[8]  = __raw_readl(ctx-&gt;regs + PCI_REG_CLASSREV);</div><div class='add'>+	ctx-&gt;pm[9]  = __raw_readl(ctx-&gt;regs + PCI_REG_PARAM);</div><div class='add'>+	ctx-&gt;pm[10] = __raw_readl(ctx-&gt;regs + PCI_REG_MBAR);</div><div class='add'>+	ctx-&gt;pm[11] = __raw_readl(ctx-&gt;regs + PCI_REG_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alchemy_pci_resume(void)</div><div class='add'>+{</div><div class='add'>+	struct alchemy_pci_context *ctx = __alchemy_pci_ctx;</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__raw_writel(ctx-&gt;pm[0],  ctx-&gt;regs + PCI_REG_CMEM);</div><div class='add'>+	__raw_writel(ctx-&gt;pm[2],  ctx-&gt;regs + PCI_REG_B2BMASK_CCH);</div><div class='add'>+	__raw_writel(ctx-&gt;pm[3],  ctx-&gt;regs + PCI_REG_B2BBASE0_VID);</div><div class='add'>+	__raw_writel(ctx-&gt;pm[4],  ctx-&gt;regs + PCI_REG_B2BBASE1_SID);</div><div class='add'>+	__raw_writel(ctx-&gt;pm[5],  ctx-&gt;regs + PCI_REG_MWMASK_DEV);</div><div class='add'>+	__raw_writel(ctx-&gt;pm[6],  ctx-&gt;regs + PCI_REG_MWBASE_REV_CCL);</div><div class='add'>+	__raw_writel(ctx-&gt;pm[7],  ctx-&gt;regs + PCI_REG_ID);</div><div class='add'>+	__raw_writel(ctx-&gt;pm[8],  ctx-&gt;regs + PCI_REG_CLASSREV);</div><div class='add'>+	__raw_writel(ctx-&gt;pm[9],  ctx-&gt;regs + PCI_REG_PARAM);</div><div class='add'>+	__raw_writel(ctx-&gt;pm[10], ctx-&gt;regs + PCI_REG_MBAR);</div><div class='add'>+	__raw_writel(ctx-&gt;pm[11], ctx-&gt;regs + PCI_REG_TIMEOUT);</div><div class='add'>+	wmb();</div><div class='add'>+	__raw_writel(ctx-&gt;pm[1],  ctx-&gt;regs + PCI_REG_CONFIG);</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	/* YAMON on all db1xxx boards wipes the TLB and writes zero to C0_wired</div><div class='add'>+	 * on resume, making it necessary to recreate it as soon as possible.</div><div class='add'>+	 */</div><div class='add'>+	ctx-&gt;wired_entry = 8191;	/* impossibly high value */</div><div class='add'>+	alchemy_pci_wired_entry(ctx);	/* install it */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct syscore_ops alchemy_pci_pmops = {</div><div class='add'>+	.suspend	= alchemy_pci_suspend,</div><div class='add'>+	.resume		= alchemy_pci_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __devinit alchemy_pci_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct alchemy_pci_platdata *pd = pdev-&gt;dev.platform_data;</div><div class='hunk'>@@ -396,7 +448,8 @@ static int __devinit alchemy_pci_probe(struct platform_device *pdev)</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out4;</div><div class='ctx'> 	}</div><div class='del'>-	ctx-&gt;wired_entry = 8192;	/* impossibly high value */</div><div class='add'>+	ctx-&gt;wired_entry = 8191;	/* impossibly high value */</div><div class='add'>+	alchemy_pci_wired_entry(ctx);	/* install it */</div><div class='ctx'> </div><div class='ctx'> 	set_io_port_base((unsigned long)ctx-&gt;alchemy_pci_ctrl.io_map_base);</div><div class='ctx'> </div><div class='hunk'>@@ -408,7 +461,9 @@ static int __devinit alchemy_pci_probe(struct platform_device *pdev)</div><div class='ctx'> 	__raw_writel(val, ctx-&gt;regs + PCI_REG_CONFIG);</div><div class='ctx'> 	wmb();</div><div class='ctx'> </div><div class='add'>+	__alchemy_pci_ctx = ctx;</div><div class='ctx'> 	platform_set_drvdata(pdev, ctx);</div><div class='add'>+	register_syscore_ops(&amp;alchemy_pci_pmops);</div><div class='ctx'> 	register_pci_controller(&amp;ctx-&gt;alchemy_pci_ctrl);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -425,68 +480,11 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-/* save PCI controller register contents. */</div><div class='del'>-static int alchemy_pci_suspend(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct alchemy_pci_context *ctx = dev_get_drvdata(dev);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;pm[0]  = __raw_readl(ctx-&gt;regs + PCI_REG_CMEM);</div><div class='del'>-	ctx-&gt;pm[1]  = __raw_readl(ctx-&gt;regs + PCI_REG_CONFIG) &amp; 0x0009ffff;</div><div class='del'>-	ctx-&gt;pm[2]  = __raw_readl(ctx-&gt;regs + PCI_REG_B2BMASK_CCH);</div><div class='del'>-	ctx-&gt;pm[3]  = __raw_readl(ctx-&gt;regs + PCI_REG_B2BBASE0_VID);</div><div class='del'>-	ctx-&gt;pm[4]  = __raw_readl(ctx-&gt;regs + PCI_REG_B2BBASE1_SID);</div><div class='del'>-	ctx-&gt;pm[5]  = __raw_readl(ctx-&gt;regs + PCI_REG_MWMASK_DEV);</div><div class='del'>-	ctx-&gt;pm[6]  = __raw_readl(ctx-&gt;regs + PCI_REG_MWBASE_REV_CCL);</div><div class='del'>-	ctx-&gt;pm[7]  = __raw_readl(ctx-&gt;regs + PCI_REG_ID);</div><div class='del'>-	ctx-&gt;pm[8]  = __raw_readl(ctx-&gt;regs + PCI_REG_CLASSREV);</div><div class='del'>-	ctx-&gt;pm[9]  = __raw_readl(ctx-&gt;regs + PCI_REG_PARAM);</div><div class='del'>-	ctx-&gt;pm[10] = __raw_readl(ctx-&gt;regs + PCI_REG_MBAR);</div><div class='del'>-	ctx-&gt;pm[11] = __raw_readl(ctx-&gt;regs + PCI_REG_TIMEOUT);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alchemy_pci_resume(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct alchemy_pci_context *ctx = dev_get_drvdata(dev);</div><div class='del'>-</div><div class='del'>-	__raw_writel(ctx-&gt;pm[0],  ctx-&gt;regs + PCI_REG_CMEM);</div><div class='del'>-	__raw_writel(ctx-&gt;pm[2],  ctx-&gt;regs + PCI_REG_B2BMASK_CCH);</div><div class='del'>-	__raw_writel(ctx-&gt;pm[3],  ctx-&gt;regs + PCI_REG_B2BBASE0_VID);</div><div class='del'>-	__raw_writel(ctx-&gt;pm[4],  ctx-&gt;regs + PCI_REG_B2BBASE1_SID);</div><div class='del'>-	__raw_writel(ctx-&gt;pm[5],  ctx-&gt;regs + PCI_REG_MWMASK_DEV);</div><div class='del'>-	__raw_writel(ctx-&gt;pm[6],  ctx-&gt;regs + PCI_REG_MWBASE_REV_CCL);</div><div class='del'>-	__raw_writel(ctx-&gt;pm[7],  ctx-&gt;regs + PCI_REG_ID);</div><div class='del'>-	__raw_writel(ctx-&gt;pm[8],  ctx-&gt;regs + PCI_REG_CLASSREV);</div><div class='del'>-	__raw_writel(ctx-&gt;pm[9],  ctx-&gt;regs + PCI_REG_PARAM);</div><div class='del'>-	__raw_writel(ctx-&gt;pm[10], ctx-&gt;regs + PCI_REG_MBAR);</div><div class='del'>-	__raw_writel(ctx-&gt;pm[11], ctx-&gt;regs + PCI_REG_TIMEOUT);</div><div class='del'>-	wmb();</div><div class='del'>-	__raw_writel(ctx-&gt;pm[1],  ctx-&gt;regs + PCI_REG_CONFIG);</div><div class='del'>-	wmb();</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 dev_pm_ops alchemy_pci_pmops = {</div><div class='del'>-	.suspend	= alchemy_pci_suspend,</div><div class='del'>-	.resume		= alchemy_pci_resume,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define ALCHEMY_PCICTL_PM	(&amp;alchemy_pci_pmops)</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-#define ALCHEMY_PCICTL_PM	NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static struct platform_driver alchemy_pcictl_driver = {</div><div class='ctx'> 	.probe		= alchemy_pci_probe,</div><div class='ctx'> 	.driver	= {</div><div class='ctx'> 		.name	= "alchemy-pci",</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='del'>-		.pm	= ALCHEMY_PCICTL_PM,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/pci/pci-ath724x.c b/arch/mips/pci/pci-ath724x.c<br/>new file mode 100644<br/>index 000000000000..a4dd24a4130b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-ath724x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pci/pci-ath724x.c</a></div><div class='hunk'>@@ -0,0 +1,174 @@</div><div class='add'>+/*</div><div class='add'>+ *  Atheros 724x PCI support</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2011 René Bolldorf &lt;xsecute@googlemail.com&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 version 2 as published</div><div class='add'>+ *  by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;asm/mach-ath79/pci-ath724x.h&gt;</div><div class='add'>+</div><div class='add'>+#define reg_read(_phys)		(*(unsigned int *) KSEG1ADDR(_phys))</div><div class='add'>+#define reg_write(_phys, _val)	((*(unsigned int *) KSEG1ADDR(_phys)) = (_val))</div><div class='add'>+</div><div class='add'>+#define ATH724X_PCI_DEV_BASE	0x14000000</div><div class='add'>+#define ATH724X_PCI_MEM_BASE	0x10000000</div><div class='add'>+#define ATH724X_PCI_MEM_SIZE	0x08000000</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(ath724x_pci_lock);</div><div class='add'>+static struct ath724x_pci_data *pci_data;</div><div class='add'>+static int pci_data_size;</div><div class='add'>+</div><div class='add'>+static int ath724x_pci_read(struct pci_bus *bus, unsigned int devfn, int where,</div><div class='add'>+			    int size, uint32_t *value)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags, addr, tval, mask;</div><div class='add'>+</div><div class='add'>+	if (devfn)</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	if (where &amp; (size - 1))</div><div class='add'>+		return PCIBIOS_BAD_REGISTER_NUMBER;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ath724x_pci_lock, flags);</div><div class='add'>+</div><div class='add'>+	switch (size) {</div><div class='add'>+	case 1:</div><div class='add'>+		addr = where &amp; ~3;</div><div class='add'>+		mask = 0xff000000 &gt;&gt; ((where % 4) * 8);</div><div class='add'>+		tval = reg_read(ATH724X_PCI_DEV_BASE + addr);</div><div class='add'>+		tval = tval &amp; ~mask;</div><div class='add'>+		*value = (tval &gt;&gt; ((4 - (where % 4))*8));</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		addr = where &amp; ~3;</div><div class='add'>+		mask = 0xffff0000 &gt;&gt; ((where % 4)*8);</div><div class='add'>+		tval = reg_read(ATH724X_PCI_DEV_BASE + addr);</div><div class='add'>+		tval = tval &amp; ~mask;</div><div class='add'>+		*value = (tval &gt;&gt; ((4 - (where % 4))*8));</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		*value = reg_read(ATH724X_PCI_DEV_BASE + where);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		spin_unlock_irqrestore(&amp;ath724x_pci_lock, flags);</div><div class='add'>+</div><div class='add'>+		return PCIBIOS_BAD_REGISTER_NUMBER;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;ath724x_pci_lock, flags);</div><div class='add'>+</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath724x_pci_write(struct pci_bus *bus, unsigned int devfn, int where,</div><div class='add'>+			     int size, uint32_t value)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags, tval, addr, mask;</div><div class='add'>+</div><div class='add'>+	if (devfn)</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	if (where &amp; (size - 1))</div><div class='add'>+		return PCIBIOS_BAD_REGISTER_NUMBER;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ath724x_pci_lock, flags);</div><div class='add'>+</div><div class='add'>+	switch (size) {</div><div class='add'>+	case 1:</div><div class='add'>+		addr = (ATH724X_PCI_DEV_BASE + where) &amp; ~3;</div><div class='add'>+		mask = 0xff000000 &gt;&gt; ((where % 4)*8);</div><div class='add'>+		tval = reg_read(addr);</div><div class='add'>+		tval = tval &amp; ~mask;</div><div class='add'>+		tval |= (value &lt;&lt; ((4 - (where % 4))*8)) &amp; mask;</div><div class='add'>+		reg_write(addr, tval);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		addr = (ATH724X_PCI_DEV_BASE + where) &amp; ~3;</div><div class='add'>+		mask = 0xffff0000 &gt;&gt; ((where % 4)*8);</div><div class='add'>+		tval = reg_read(addr);</div><div class='add'>+		tval = tval &amp; ~mask;</div><div class='add'>+		tval |= (value &lt;&lt; ((4 - (where % 4))*8)) &amp; mask;</div><div class='add'>+		reg_write(addr, tval);</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		reg_write((ATH724X_PCI_DEV_BASE + where), value);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		spin_unlock_irqrestore(&amp;ath724x_pci_lock, flags);</div><div class='add'>+</div><div class='add'>+		return PCIBIOS_BAD_REGISTER_NUMBER;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;ath724x_pci_lock, flags);</div><div class='add'>+</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pci_ops ath724x_pci_ops = {</div><div class='add'>+	.read	= ath724x_pci_read,</div><div class='add'>+	.write	= ath724x_pci_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource ath724x_io_resource = {</div><div class='add'>+	.name   = "PCI IO space",</div><div class='add'>+	.start  = 0,</div><div class='add'>+	.end    = 0,</div><div class='add'>+	.flags  = IORESOURCE_IO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource ath724x_mem_resource = {</div><div class='add'>+	.name   = "PCI memory space",</div><div class='add'>+	.start  = ATH724X_PCI_MEM_BASE,</div><div class='add'>+	.end    = ATH724X_PCI_MEM_BASE + ATH724X_PCI_MEM_SIZE - 1,</div><div class='add'>+	.flags  = IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pci_controller ath724x_pci_controller = {</div><div class='add'>+	.pci_ops        = &amp;ath724x_pci_ops,</div><div class='add'>+	.io_resource    = &amp;ath724x_io_resource,</div><div class='add'>+	.mem_resource	= &amp;ath724x_mem_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath724x_pci_add_data(struct ath724x_pci_data *data, int size)</div><div class='add'>+{</div><div class='add'>+	pci_data	= data;</div><div class='add'>+	pci_data_size	= size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin)</div><div class='add'>+{</div><div class='add'>+	unsigned int devfn = dev-&gt;devfn;</div><div class='add'>+	int irq = -1;</div><div class='add'>+</div><div class='add'>+	if (devfn &gt; pci_data_size - 1)</div><div class='add'>+		return irq;</div><div class='add'>+</div><div class='add'>+	irq = pci_data[devfn].irq;</div><div class='add'>+</div><div class='add'>+	return irq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pcibios_plat_dev_init(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned int devfn = dev-&gt;devfn;</div><div class='add'>+</div><div class='add'>+	if (devfn &gt; pci_data_size - 1)</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	dev-&gt;dev.platform_data = pci_data[devfn].pdata;</div><div class='add'>+</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init ath724x_pcibios_init(void)</div><div class='add'>+{</div><div class='add'>+	register_pci_controller(&amp;ath724x_pci_controller);</div><div class='add'>+</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(ath724x_pcibios_init);</div><div class='head'>diff --git a/arch/mips/pci/pci-bcm63xx.c b/arch/mips/pci/pci-bcm63xx.c<br/>index 82e0fde1dba0..39eb7c417e2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-bcm63xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pci-bcm63xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-bcm63xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pci/pci-bcm63xx.c</a></div><div class='hunk'>@@ -99,7 +99,7 @@ static int __init bcm63xx_pci_init(void)</div><div class='ctx'> 	unsigned int mem_size;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	if (!BCMCPU_IS_6348() &amp;&amp; !BCMCPU_IS_6358())</div><div class='add'>+	if (!BCMCPU_IS_6348() &amp;&amp; !BCMCPU_IS_6358() &amp;&amp; !BCMCPU_IS_6368())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (!bcm63xx_pci_enabled)</div><div class='hunk'>@@ -159,7 +159,7 @@ static int __init bcm63xx_pci_init(void)</div><div class='ctx'> 	/* setup PCI to local bus access, used by PCI device to target</div><div class='ctx'> 	 * local RAM while bus mastering */</div><div class='ctx'> 	bcm63xx_int_cfg_writel(0, PCI_BASE_ADDRESS_3);</div><div class='del'>-	if (BCMCPU_IS_6358())</div><div class='add'>+	if (BCMCPU_IS_6358() || BCMCPU_IS_6368())</div><div class='ctx'> 		val = MPI_SP0_REMAP_ENABLE_MASK;</div><div class='ctx'> 	else</div><div class='ctx'> 		val = 0;</div><div class='head'>diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c<br/>index ed1c54284b8f..52a1ba70b3b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-octeon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pci-octeon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-octeon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pci/pci-octeon.c</a></div><div class='hunk'>@@ -99,7 +99,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, 64 / 4);</div><div class='ctx'> 	/* Set latency timers for all devices */</div><div class='del'>-	pci_write_config_byte(dev, PCI_LATENCY_TIMER, 48);</div><div class='add'>+	pci_write_config_byte(dev, PCI_LATENCY_TIMER, 64);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable reporting System errors and parity errors on all devices */</div><div class='ctx'> 	/* Enable parity checking and error reporting */</div><div class='hunk'>@@ -109,7 +109,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;subordinate) {</div><div class='ctx'> 		/* Set latency timers on sub bridges */</div><div class='del'>-		pci_write_config_byte(dev, PCI_SEC_LATENCY_TIMER, 48);</div><div class='add'>+		pci_write_config_byte(dev, PCI_SEC_LATENCY_TIMER, 64);</div><div class='ctx'> 		/* More bridge error detection */</div><div class='ctx'> 		pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &amp;config);</div><div class='ctx'> 		config |= PCI_BRIDGE_CTL_PARITY | PCI_BRIDGE_CTL_SERR;</div><div class='hunk'>@@ -121,14 +121,10 @@ int pcibios_plat_dev_init(struct pci_dev *dev)</div><div class='ctx'> 	if (pos) {</div><div class='ctx'> 		/* Update Device Control */</div><div class='ctx'> 		pci_read_config_word(dev, pos + PCI_EXP_DEVCTL, &amp;config);</div><div class='del'>-		/* Correctable Error Reporting */</div><div class='del'>-		config |= PCI_EXP_DEVCTL_CERE;</div><div class='del'>-		/* Non-Fatal Error Reporting */</div><div class='del'>-		config |= PCI_EXP_DEVCTL_NFERE;</div><div class='del'>-		/* Fatal Error Reporting */</div><div class='del'>-		config |= PCI_EXP_DEVCTL_FERE;</div><div class='del'>-		/* Unsupported Request */</div><div class='del'>-		config |= PCI_EXP_DEVCTL_URRE;</div><div class='add'>+		config |= PCI_EXP_DEVCTL_CERE; /* Correctable Error Reporting */</div><div class='add'>+		config |= PCI_EXP_DEVCTL_NFERE; /* Non-Fatal Error Reporting */</div><div class='add'>+		config |= PCI_EXP_DEVCTL_FERE;  /* Fatal Error Reporting */</div><div class='add'>+		config |= PCI_EXP_DEVCTL_URRE;  /* Unsupported Request */</div><div class='ctx'> 		pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, config);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/pci/pci-tx4927.c b/arch/mips/pci/pci-tx4927.c<br/>index a5807406a7f1..a032ae0a533d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-tx4927.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pci-tx4927.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-tx4927.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pci/pci-tx4927.c</a></div><div class='hunk'>@@ -85,7 +85,7 @@ void __init tx4927_setup_pcierr_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (request_irq(TXX9_IRQ_BASE + TX4927_IR_PCIERR,</div><div class='ctx'> 			tx4927_pcierr_interrupt,</div><div class='del'>-			IRQF_DISABLED, "PCI error",</div><div class='add'>+			0, "PCI error",</div><div class='ctx'> 			(void *)TX4927_PCIC_REG))</div><div class='ctx'> 		printk(KERN_WARNING "Failed to request irq for PCIERR\n");</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/pci/pci-tx4938.c b/arch/mips/pci/pci-tx4938.c<br/>index 20e45f30b2ef..141bba562488 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-tx4938.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pci-tx4938.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-tx4938.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pci/pci-tx4938.c</a></div><div class='hunk'>@@ -136,7 +136,7 @@ void __init tx4938_setup_pcierr_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (request_irq(TXX9_IRQ_BASE + TX4938_IR_PCIERR,</div><div class='ctx'> 			tx4927_pcierr_interrupt,</div><div class='del'>-			IRQF_DISABLED, "PCI error",</div><div class='add'>+			0, "PCI error",</div><div class='ctx'> 			(void *)TX4927_PCIC_REG))</div><div class='ctx'> 		printk(KERN_WARNING "Failed to request irq for PCIERR\n");</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/pci/pci-tx4939.c b/arch/mips/pci/pci-tx4939.c<br/>index 9ef840693baf..c10fbf2a19dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-tx4939.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pci-tx4939.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-tx4939.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pci/pci-tx4939.c</a></div><div class='hunk'>@@ -101,7 +101,7 @@ void __init tx4939_setup_pcierr_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (request_irq(TXX9_IRQ_BASE + TX4939_IR_PCIERR,</div><div class='ctx'> 			tx4927_pcierr_interrupt,</div><div class='del'>-			IRQF_DISABLED, "PCI error",</div><div class='add'>+			0, "PCI error",</div><div class='ctx'> 			(void *)TX4939_PCIC_REG))</div><div class='ctx'> 		pr_warning("Failed to request irq for PCIERR\n");</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/pci/pci-xlr.c b/arch/mips/pci/pci-xlr.c<br/>index 38fece16c435..3d701a962ef4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-xlr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pci-xlr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-xlr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pci/pci-xlr.c</a></div><div class='hunk'>@@ -36,12 +36,18 @@</div><div class='ctx'> #include &lt;linux/pci.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='add'>+#include &lt;linux/msi.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/irqdesc.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/netlogic/interrupt.h&gt;</div><div class='add'>+#include &lt;asm/netlogic/haldefs.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/netlogic/xlr/msidef.h&gt;</div><div class='ctx'> #include &lt;asm/netlogic/xlr/iomap.h&gt;</div><div class='ctx'> #include &lt;asm/netlogic/xlr/pic.h&gt;</div><div class='ctx'> #include &lt;asm/netlogic/xlr/xlr.h&gt;</div><div class='hunk'>@@ -150,7 +156,7 @@ struct pci_controller nlm_pci_controller = {</div><div class='ctx'> 	.io_offset      = 0x00000000UL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)</div><div class='add'>+static int get_irq_vector(const struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (!nlm_chip_is_xls())</div><div class='ctx'> 		return	PIC_PCIX_IRQ;	/* for XLR just one IRQ*/</div><div class='hunk'>@@ -182,6 +188,101 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PCI_MSI</div><div class='add'>+void destroy_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	    /* nothing to do yet */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void arch_teardown_msi_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	destroy_irq(irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct msi_msg msg;</div><div class='add'>+	int irq, ret;</div><div class='add'>+</div><div class='add'>+	irq = get_irq_vector(dev);</div><div class='add'>+	if (irq &lt;= 0)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	msg.address_hi = MSI_ADDR_BASE_HI;</div><div class='add'>+	msg.address_lo = MSI_ADDR_BASE_LO   |</div><div class='add'>+		MSI_ADDR_DEST_MODE_PHYSICAL |</div><div class='add'>+		MSI_ADDR_REDIRECTION_CPU;</div><div class='add'>+</div><div class='add'>+	msg.data = MSI_DATA_TRIGGER_EDGE |</div><div class='add'>+		MSI_DATA_LEVEL_ASSERT    |</div><div class='add'>+		MSI_DATA_DELIVERY_FIXED;</div><div class='add'>+</div><div class='add'>+	ret = irq_set_msi_desc(irq, desc);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		destroy_irq(irq);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	write_msi_msg(irq, &amp;msg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Extra ACK needed for XLR on chip PCI controller */</div><div class='add'>+static void xlr_pci_ack(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	uint64_t pcibase = nlm_mmio_base(NETLOGIC_IO_PCIX_OFFSET);</div><div class='add'>+</div><div class='add'>+	nlm_read_reg(pcibase, (0x140 &gt;&gt; 2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Extra ACK needed for XLS on chip PCIe controller */</div><div class='add'>+static void xls_pcie_ack(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	uint64_t pciebase_le = nlm_mmio_base(NETLOGIC_IO_PCIE_1_OFFSET);</div><div class='add'>+</div><div class='add'>+	switch (d-&gt;irq) {</div><div class='add'>+	case PIC_PCIE_LINK0_IRQ:</div><div class='add'>+		nlm_write_reg(pciebase_le, (0x90 &gt;&gt; 2), 0xffffffff);</div><div class='add'>+		break;</div><div class='add'>+	case PIC_PCIE_LINK1_IRQ:</div><div class='add'>+		nlm_write_reg(pciebase_le, (0x94 &gt;&gt; 2), 0xffffffff);</div><div class='add'>+		break;</div><div class='add'>+	case PIC_PCIE_LINK2_IRQ:</div><div class='add'>+		nlm_write_reg(pciebase_le, (0x190 &gt;&gt; 2), 0xffffffff);</div><div class='add'>+		break;</div><div class='add'>+	case PIC_PCIE_LINK3_IRQ:</div><div class='add'>+		nlm_write_reg(pciebase_le, (0x194 &gt;&gt; 2), 0xffffffff);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* For XLS B silicon, the 3,4 PCI interrupts are different */</div><div class='add'>+static void xls_pcie_ack_b(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	uint64_t pciebase_le = nlm_mmio_base(NETLOGIC_IO_PCIE_1_OFFSET);</div><div class='add'>+</div><div class='add'>+	switch (d-&gt;irq) {</div><div class='add'>+	case PIC_PCIE_LINK0_IRQ:</div><div class='add'>+		nlm_write_reg(pciebase_le, (0x90 &gt;&gt; 2), 0xffffffff);</div><div class='add'>+		break;</div><div class='add'>+	case PIC_PCIE_LINK1_IRQ:</div><div class='add'>+		nlm_write_reg(pciebase_le, (0x94 &gt;&gt; 2), 0xffffffff);</div><div class='add'>+		break;</div><div class='add'>+	case PIC_PCIE_XLSB0_LINK2_IRQ:</div><div class='add'>+		nlm_write_reg(pciebase_le, (0x190 &gt;&gt; 2), 0xffffffff);</div><div class='add'>+		break;</div><div class='add'>+	case PIC_PCIE_XLSB0_LINK3_IRQ:</div><div class='add'>+		nlm_write_reg(pciebase_le, (0x194 &gt;&gt; 2), 0xffffffff);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)</div><div class='add'>+{</div><div class='add'>+	return get_irq_vector(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Do platform specific device initialization at pci_enable_device() time */</div><div class='ctx'> int pcibios_plat_dev_init(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -204,6 +305,31 @@ static int __init pcibios_init(void)</div><div class='ctx'> 	pr_info("Registering XLR/XLS PCIX/PCIE Controller.\n");</div><div class='ctx'> 	register_pci_controller(&amp;nlm_pci_controller);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * For PCI interrupts, we need to ack the PCI controller too, overload</div><div class='add'>+	 * irq handler data to do this</div><div class='add'>+	 */</div><div class='add'>+	if (nlm_chip_is_xls()) {</div><div class='add'>+		if (nlm_chip_is_xls_b()) {</div><div class='add'>+			irq_set_handler_data(PIC_PCIE_LINK0_IRQ,</div><div class='add'>+							xls_pcie_ack_b);</div><div class='add'>+			irq_set_handler_data(PIC_PCIE_LINK1_IRQ,</div><div class='add'>+							xls_pcie_ack_b);</div><div class='add'>+			irq_set_handler_data(PIC_PCIE_XLSB0_LINK2_IRQ,</div><div class='add'>+							xls_pcie_ack_b);</div><div class='add'>+			irq_set_handler_data(PIC_PCIE_XLSB0_LINK3_IRQ,</div><div class='add'>+							xls_pcie_ack_b);</div><div class='add'>+		} else {</div><div class='add'>+			irq_set_handler_data(PIC_PCIE_LINK0_IRQ, xls_pcie_ack);</div><div class='add'>+			irq_set_handler_data(PIC_PCIE_LINK1_IRQ, xls_pcie_ack);</div><div class='add'>+			irq_set_handler_data(PIC_PCIE_LINK2_IRQ, xls_pcie_ack);</div><div class='add'>+			irq_set_handler_data(PIC_PCIE_LINK3_IRQ, xls_pcie_ack);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* XLR PCI controller ACK */</div><div class='add'>+		irq_set_handler_data(PIC_PCIE_XLSB0_LINK3_IRQ, xlr_pci_ack);</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/arch/mips/pci/pci.c b/arch/mips/pci/pci.c<br/>index 41af7fa2887b..aec2b111d35b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pci/pci.c</a></div><div class='hunk'>@@ -4,8 +4,11 @@</div><div class='ctx'>  * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003, 04 Ralf Baechle (ralf@linux-mips.org)</div><div class='add'>+ * Copyright (C) 2003, 04, 11 Ralf Baechle (ralf@linux-mips.org)</div><div class='add'>+ * Copyright (C) 2011 Wind River Systems,</div><div class='add'>+ *   written by Ralf Baechle (ralf@linux-mips.org)</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/bug.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='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='hunk'>@@ -14,6 +17,8 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/cpu-info.h&gt;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Indicate whether we respect the PCI setup left by the firmware.</div><div class='ctx'>  *</div><div class='hunk'>@@ -81,6 +86,7 @@ static void __devinit pcibios_scanbus(struct pci_controller *hose)</div><div class='ctx'> {</div><div class='ctx'> 	static int next_busno;</div><div class='ctx'> 	static int need_domain_info;</div><div class='add'>+	LIST_HEAD(resources);</div><div class='ctx'> 	struct pci_bus *bus;</div><div class='ctx'> </div><div class='ctx'> 	if (!hose-&gt;iommu)</div><div class='hunk'>@@ -89,7 +95,13 @@ static void __devinit pcibios_scanbus(struct pci_controller *hose)</div><div class='ctx'> 	if (hose-&gt;get_busno &amp;&amp; pci_probe_only)</div><div class='ctx'> 		next_busno = (*hose-&gt;get_busno)();</div><div class='ctx'> </div><div class='del'>-	bus = pci_scan_bus(next_busno, hose-&gt;pci_ops, hose);</div><div class='add'>+	pci_add_resource(&amp;resources, hose-&gt;mem_resource);</div><div class='add'>+	pci_add_resource(&amp;resources, hose-&gt;io_resource);</div><div class='add'>+	bus = pci_scan_root_bus(NULL, next_busno, hose-&gt;pci_ops, hose,</div><div class='add'>+				&amp;resources);</div><div class='add'>+	if (!bus)</div><div class='add'>+		pci_free_resource_list(&amp;resources);</div><div class='add'>+</div><div class='ctx'> 	hose-&gt;bus = bus;</div><div class='ctx'> </div><div class='ctx'> 	need_domain_info = need_domain_info || hose-&gt;index;</div><div class='hunk'>@@ -150,10 +162,32 @@ out:</div><div class='ctx'> 	       "Skipping PCI bus scan due to resource conflict\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init pcibios_set_cache_line_size(void)</div><div class='add'>+{</div><div class='add'>+	struct cpuinfo_mips *c = &amp;current_cpu_data;</div><div class='add'>+	unsigned int lsize;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set PCI cacheline size to that of the highest level in the</div><div class='add'>+	 * cache hierarchy.</div><div class='add'>+	 */</div><div class='add'>+	lsize = c-&gt;dcache.linesz;</div><div class='add'>+	lsize = c-&gt;scache.linesz ? : lsize;</div><div class='add'>+	lsize = c-&gt;tcache.linesz ? : lsize;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!lsize);</div><div class='add'>+</div><div class='add'>+	pci_dfl_cache_line_size = lsize &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	pr_debug("PCI: pci_cache_line_size set to %d bytes\n", lsize);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init pcibios_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_controller *hose;</div><div class='ctx'> </div><div class='add'>+	pcibios_set_cache_line_size();</div><div class='add'>+</div><div class='ctx'> 	/* Scan all of the recorded PCI controllers.  */</div><div class='ctx'> 	for (hose = hose_head; hose; hose = hose-&gt;next)</div><div class='ctx'> 		pcibios_scanbus(hose);</div><div class='hunk'>@@ -205,27 +239,6 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *  If we set up a device for bus mastering, we need to check the latency</div><div class='del'>- *  timer as certain crappy BIOSes forget to set it properly.</div><div class='del'>- */</div><div class='del'>-static unsigned int pcibios_max_latency = 255;</div><div class='del'>-</div><div class='del'>-void pcibios_set_master(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	u8 lat;</div><div class='del'>-	pci_read_config_byte(dev, PCI_LATENCY_TIMER, &amp;lat);</div><div class='del'>-	if (lat &lt; 16)</div><div class='del'>-		lat = (64 &lt;= pcibios_max_latency) ? 64 : pcibios_max_latency;</div><div class='del'>-	else if (lat &gt; pcibios_max_latency)</div><div class='del'>-		lat = pcibios_max_latency;</div><div class='del'>-	else</div><div class='del'>-		return;</div><div class='del'>-	printk(KERN_DEBUG "PCI: Setting latency timer of device %s to %d\n",</div><div class='del'>-	       pci_name(dev), lat);</div><div class='del'>-	pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> unsigned int pcibios_assign_all_busses(void)</div><div class='ctx'> {</div><div class='ctx'> 	return (pci_probe &amp; PCI_ASSIGN_ALL_BUSSES) ? 1 : 0;</div><div class='hunk'>@@ -266,15 +279,11 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> {</div><div class='ctx'> 	/* Propagate hose info into the subordinate devices.  */</div><div class='ctx'> </div><div class='del'>-	struct pci_controller *hose = bus-&gt;sysdata;</div><div class='ctx'> 	struct list_head *ln;</div><div class='ctx'> 	struct pci_dev *dev = bus-&gt;self;</div><div class='ctx'> </div><div class='del'>-	if (!dev) {</div><div class='del'>-		bus-&gt;resource[0] = hose-&gt;io_resource;</div><div class='del'>-		bus-&gt;resource[1] = hose-&gt;mem_resource;</div><div class='del'>-	} else if (pci_probe_only &amp;&amp;</div><div class='del'>-		   (dev-&gt;class &gt;&gt; 8) == PCI_CLASS_BRIDGE_PCI) {</div><div class='add'>+	if (pci_probe_only &amp;&amp; dev &amp;&amp;</div><div class='add'>+	    (dev-&gt;class &gt;&gt; 8) == PCI_CLASS_BRIDGE_PCI) {</div><div class='ctx'> 		pci_read_bridge_bases(bus);</div><div class='ctx'> 		pcibios_fixup_device_resources(dev, bus);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/mips/pci/pcie-octeon.c b/arch/mips/pci/pcie-octeon.c<br/>index 0583c463e5f1..fdb4d558c0cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pcie-octeon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pci/pcie-octeon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pcie-octeon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pci/pcie-octeon.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  * License.  See the file "COPYING" in the main directory of this archive</div><div class='ctx'>  * for more details.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2007, 2008 Cavium Networks</div><div class='add'>+ * Copyright (C) 2007, 2008, 2009, 2010, 2011 Cavium Networks</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='hunk'>@@ -11,15 +11,32 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/time.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'> </div><div class='ctx'> #include &lt;asm/octeon/octeon.h&gt;</div><div class='ctx'> #include &lt;asm/octeon/cvmx-npei-defs.h&gt;</div><div class='ctx'> #include &lt;asm/octeon/cvmx-pciercx-defs.h&gt;</div><div class='ctx'> #include &lt;asm/octeon/cvmx-pescx-defs.h&gt;</div><div class='ctx'> #include &lt;asm/octeon/cvmx-pexp-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-pemx-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-dpi-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-sli-defs.h&gt;</div><div class='add'>+#include &lt;asm/octeon/cvmx-sriox-defs.h&gt;</div><div class='ctx'> #include &lt;asm/octeon/cvmx-helper-errata.h&gt;</div><div class='ctx'> #include &lt;asm/octeon/pci-octeon.h&gt;</div><div class='ctx'> </div><div class='add'>+#define MRRS_CN5XXX 0 /* 128 byte Max Read Request Size */</div><div class='add'>+#define MPS_CN5XXX  0 /* 128 byte Max Packet Size (Limit of most PCs) */</div><div class='add'>+#define MRRS_CN6XXX 3 /* 1024 byte Max Read Request Size */</div><div class='add'>+#define MPS_CN6XXX  0 /* 128 byte Max Packet Size (Limit of most PCs) */</div><div class='add'>+</div><div class='add'>+/* Module parameter to disable PCI probing */</div><div class='add'>+static int pcie_disable;</div><div class='add'>+module_param(pcie_disable, int, S_IRUGO);</div><div class='add'>+</div><div class='add'>+static int enable_pcie_14459_war;</div><div class='add'>+static int enable_pcie_bus_num_war[2];</div><div class='add'>+</div><div class='ctx'> union cvmx_pcie_address {</div><div class='ctx'> 	uint64_t u64;</div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -75,6 +92,8 @@ union cvmx_pcie_address {</div><div class='ctx'> 	} mem;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int cvmx_pcie_rc_initialize(int pcie_port);</div><div class='add'>+</div><div class='ctx'> #include &lt;dma-coherence.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -154,12 +173,21 @@ static inline uint64_t cvmx_pcie_get_mem_size(int pcie_port)</div><div class='ctx'>  */</div><div class='ctx'> static uint32_t cvmx_pcie_cfgx_read(int pcie_port, uint32_t cfg_offset)</div><div class='ctx'> {</div><div class='del'>-	union cvmx_pescx_cfg_rd pescx_cfg_rd;</div><div class='del'>-	pescx_cfg_rd.u64 = 0;</div><div class='del'>-	pescx_cfg_rd.s.addr = cfg_offset;</div><div class='del'>-	cvmx_write_csr(CVMX_PESCX_CFG_RD(pcie_port), pescx_cfg_rd.u64);</div><div class='del'>-	pescx_cfg_rd.u64 = cvmx_read_csr(CVMX_PESCX_CFG_RD(pcie_port));</div><div class='del'>-	return pescx_cfg_rd.s.data;</div><div class='add'>+	if (octeon_has_feature(OCTEON_FEATURE_NPEI)) {</div><div class='add'>+		union cvmx_pescx_cfg_rd pescx_cfg_rd;</div><div class='add'>+		pescx_cfg_rd.u64 = 0;</div><div class='add'>+		pescx_cfg_rd.s.addr = cfg_offset;</div><div class='add'>+		cvmx_write_csr(CVMX_PESCX_CFG_RD(pcie_port), pescx_cfg_rd.u64);</div><div class='add'>+		pescx_cfg_rd.u64 = cvmx_read_csr(CVMX_PESCX_CFG_RD(pcie_port));</div><div class='add'>+		return pescx_cfg_rd.s.data;</div><div class='add'>+	} else {</div><div class='add'>+		union cvmx_pemx_cfg_rd pemx_cfg_rd;</div><div class='add'>+		pemx_cfg_rd.u64 = 0;</div><div class='add'>+		pemx_cfg_rd.s.addr = cfg_offset;</div><div class='add'>+		cvmx_write_csr(CVMX_PEMX_CFG_RD(pcie_port), pemx_cfg_rd.u64);</div><div class='add'>+		pemx_cfg_rd.u64 = cvmx_read_csr(CVMX_PEMX_CFG_RD(pcie_port));</div><div class='add'>+		return pemx_cfg_rd.s.data;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -173,11 +201,19 @@ static uint32_t cvmx_pcie_cfgx_read(int pcie_port, uint32_t cfg_offset)</div><div class='ctx'> static void cvmx_pcie_cfgx_write(int pcie_port, uint32_t cfg_offset,</div><div class='ctx'> 				 uint32_t val)</div><div class='ctx'> {</div><div class='del'>-	union cvmx_pescx_cfg_wr pescx_cfg_wr;</div><div class='del'>-	pescx_cfg_wr.u64 = 0;</div><div class='del'>-	pescx_cfg_wr.s.addr = cfg_offset;</div><div class='del'>-	pescx_cfg_wr.s.data = val;</div><div class='del'>-	cvmx_write_csr(CVMX_PESCX_CFG_WR(pcie_port), pescx_cfg_wr.u64);</div><div class='add'>+	if (octeon_has_feature(OCTEON_FEATURE_NPEI)) {</div><div class='add'>+		union cvmx_pescx_cfg_wr pescx_cfg_wr;</div><div class='add'>+		pescx_cfg_wr.u64 = 0;</div><div class='add'>+		pescx_cfg_wr.s.addr = cfg_offset;</div><div class='add'>+		pescx_cfg_wr.s.data = val;</div><div class='add'>+		cvmx_write_csr(CVMX_PESCX_CFG_WR(pcie_port), pescx_cfg_wr.u64);</div><div class='add'>+	} else {</div><div class='add'>+		union cvmx_pemx_cfg_wr pemx_cfg_wr;</div><div class='add'>+		pemx_cfg_wr.u64 = 0;</div><div class='add'>+		pemx_cfg_wr.s.addr = cfg_offset;</div><div class='add'>+		pemx_cfg_wr.s.data = val;</div><div class='add'>+		cvmx_write_csr(CVMX_PEMX_CFG_WR(pcie_port), pemx_cfg_wr.u64);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -348,7 +384,6 @@ static void cvmx_pcie_config_write32(int pcie_port, int bus, int dev, int fn,</div><div class='ctx'> static void __cvmx_pcie_rc_initialize_config_space(int pcie_port)</div><div class='ctx'> {</div><div class='ctx'> 	union cvmx_pciercx_cfg030 pciercx_cfg030;</div><div class='del'>-	union cvmx_npei_ctl_status2 npei_ctl_status2;</div><div class='ctx'> 	union cvmx_pciercx_cfg070 pciercx_cfg070;</div><div class='ctx'> 	union cvmx_pciercx_cfg001 pciercx_cfg001;</div><div class='ctx'> 	union cvmx_pciercx_cfg032 pciercx_cfg032;</div><div class='hunk'>@@ -365,21 +400,21 @@ static void __cvmx_pcie_rc_initialize_config_space(int pcie_port)</div><div class='ctx'> 	/* Max Read Request Size (PCIE*_CFG030[MRRS]) */</div><div class='ctx'> 	/* Relaxed-order, no-snoop enables (PCIE*_CFG030[RO_EN,NS_EN] */</div><div class='ctx'> 	/* Error Message Enables (PCIE*_CFG030[CE_EN,NFE_EN,FE_EN,UR_EN]) */</div><div class='del'>-	pciercx_cfg030.u32 =</div><div class='del'>-		cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG030(pcie_port));</div><div class='del'>-	/*</div><div class='del'>-	 * Max payload size = 128 bytes for best Octeon DMA</div><div class='del'>-	 * performance.</div><div class='del'>-	 */</div><div class='del'>-	pciercx_cfg030.s.mps = 0;</div><div class='add'>+</div><div class='add'>+	pciercx_cfg030.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG030(pcie_port));</div><div class='add'>+	if (OCTEON_IS_MODEL(OCTEON_CN5XXX)) {</div><div class='add'>+		pciercx_cfg030.s.mps = MPS_CN5XXX;</div><div class='add'>+		pciercx_cfg030.s.mrrs = MRRS_CN5XXX;</div><div class='add'>+	} else {</div><div class='add'>+		pciercx_cfg030.s.mps = MPS_CN6XXX;</div><div class='add'>+		pciercx_cfg030.s.mrrs = MRRS_CN6XXX;</div><div class='add'>+	}</div><div class='ctx'> 	/*</div><div class='del'>-	 * Max read request size = 128 bytes for best Octeon DMA</div><div class='del'>-	 * performance.</div><div class='add'>+	 * Enable relaxed order processing. This will allow devices to</div><div class='add'>+	 * affect read response ordering.</div><div class='ctx'> 	 */</div><div class='del'>-	pciercx_cfg030.s.mrrs = 0;</div><div class='del'>-	/* Enable relaxed ordering. */</div><div class='ctx'> 	pciercx_cfg030.s.ro_en = 1;</div><div class='del'>-	/* Enable no snoop. */</div><div class='add'>+	/* Enable no snoop processing. Not used by Octeon */</div><div class='ctx'> 	pciercx_cfg030.s.ns_en = 1;</div><div class='ctx'> 	/* Correctable error reporting enable. */</div><div class='ctx'> 	pciercx_cfg030.s.ce_en = 1;</div><div class='hunk'>@@ -389,50 +424,67 @@ static void __cvmx_pcie_rc_initialize_config_space(int pcie_port)</div><div class='ctx'> 	pciercx_cfg030.s.fe_en = 1;</div><div class='ctx'> 	/* Unsupported request reporting enable. */</div><div class='ctx'> 	pciercx_cfg030.s.ur_en = 1;</div><div class='del'>-	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG030(pcie_port),</div><div class='del'>-			     pciercx_cfg030.u32);</div><div class='add'>+	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG030(pcie_port), pciercx_cfg030.u32);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Max Payload Size (NPEI_CTL_STATUS2[MPS]) must match</div><div class='del'>-	 * PCIE*_CFG030[MPS]</div><div class='del'>-	 *</div><div class='del'>-	 * Max Read Request Size (NPEI_CTL_STATUS2[MRRS]) must not</div><div class='del'>-	 * exceed PCIE*_CFG030[MRRS].</div><div class='del'>-	 */</div><div class='del'>-	npei_ctl_status2.u64 = cvmx_read_csr(CVMX_PEXP_NPEI_CTL_STATUS2);</div><div class='del'>-	/* Max payload size = 128 bytes for best Octeon DMA performance */</div><div class='del'>-	npei_ctl_status2.s.mps = 0;</div><div class='del'>-	/* Max read request size = 128 bytes for best Octeon DMA performance */</div><div class='del'>-	npei_ctl_status2.s.mrrs = 0;</div><div class='del'>-	if (pcie_port)</div><div class='del'>-		npei_ctl_status2.s.c1_b1_s = 3; /* Port1 BAR1 Size 256MB */</div><div class='del'>-	else</div><div class='del'>-		npei_ctl_status2.s.c0_b1_s = 3; /* Port0 BAR1 Size 256MB */</div><div class='del'>-	cvmx_write_csr(CVMX_PEXP_NPEI_CTL_STATUS2, npei_ctl_status2.u64);</div><div class='add'>+</div><div class='add'>+	if (octeon_has_feature(OCTEON_FEATURE_NPEI)) {</div><div class='add'>+		union cvmx_npei_ctl_status2 npei_ctl_status2;</div><div class='add'>+		/*</div><div class='add'>+		 * Max Payload Size (NPEI_CTL_STATUS2[MPS]) must match</div><div class='add'>+		 * PCIE*_CFG030[MPS].  Max Read Request Size</div><div class='add'>+		 * (NPEI_CTL_STATUS2[MRRS]) must not exceed</div><div class='add'>+		 * PCIE*_CFG030[MRRS]</div><div class='add'>+		 */</div><div class='add'>+		npei_ctl_status2.u64 = cvmx_read_csr(CVMX_PEXP_NPEI_CTL_STATUS2);</div><div class='add'>+		/* Max payload size = 128 bytes for best Octeon DMA performance */</div><div class='add'>+		npei_ctl_status2.s.mps = MPS_CN5XXX;</div><div class='add'>+		/* Max read request size = 128 bytes for best Octeon DMA performance */</div><div class='add'>+		npei_ctl_status2.s.mrrs = MRRS_CN5XXX;</div><div class='add'>+		if (pcie_port)</div><div class='add'>+			npei_ctl_status2.s.c1_b1_s = 3; /* Port1 BAR1 Size 256MB */</div><div class='add'>+		else</div><div class='add'>+			npei_ctl_status2.s.c0_b1_s = 3; /* Port0 BAR1 Size 256MB */</div><div class='add'>+</div><div class='add'>+		cvmx_write_csr(CVMX_PEXP_NPEI_CTL_STATUS2, npei_ctl_status2.u64);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Max Payload Size (DPI_SLI_PRTX_CFG[MPS]) must match</div><div class='add'>+		 * PCIE*_CFG030[MPS].  Max Read Request Size</div><div class='add'>+		 * (DPI_SLI_PRTX_CFG[MRRS]) must not exceed</div><div class='add'>+		 * PCIE*_CFG030[MRRS].</div><div class='add'>+		 */</div><div class='add'>+		union cvmx_dpi_sli_prtx_cfg prt_cfg;</div><div class='add'>+		union cvmx_sli_s2m_portx_ctl sli_s2m_portx_ctl;</div><div class='add'>+		prt_cfg.u64 = cvmx_read_csr(CVMX_DPI_SLI_PRTX_CFG(pcie_port));</div><div class='add'>+		prt_cfg.s.mps = MPS_CN6XXX;</div><div class='add'>+		prt_cfg.s.mrrs = MRRS_CN6XXX;</div><div class='add'>+		/* Max outstanding load request. */</div><div class='add'>+		prt_cfg.s.molr = 32;</div><div class='add'>+		cvmx_write_csr(CVMX_DPI_SLI_PRTX_CFG(pcie_port), prt_cfg.u64);</div><div class='add'>+</div><div class='add'>+		sli_s2m_portx_ctl.u64 = cvmx_read_csr(CVMX_PEXP_SLI_S2M_PORTX_CTL(pcie_port));</div><div class='add'>+		sli_s2m_portx_ctl.s.mrrs = MRRS_CN6XXX;</div><div class='add'>+		cvmx_write_csr(CVMX_PEXP_SLI_S2M_PORTX_CTL(pcie_port), sli_s2m_portx_ctl.u64);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* ECRC Generation (PCIE*_CFG070[GE,CE]) */</div><div class='del'>-	pciercx_cfg070.u32 =</div><div class='del'>-		cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG070(pcie_port));</div><div class='add'>+	pciercx_cfg070.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG070(pcie_port));</div><div class='ctx'> 	pciercx_cfg070.s.ge = 1;	/* ECRC generation enable. */</div><div class='ctx'> 	pciercx_cfg070.s.ce = 1;	/* ECRC check enable. */</div><div class='del'>-	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG070(pcie_port),</div><div class='del'>-			     pciercx_cfg070.u32);</div><div class='add'>+	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG070(pcie_port), pciercx_cfg070.u32);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Access Enables (PCIE*_CFG001[MSAE,ME]) ME and MSAE should</div><div class='del'>-	 * always be set.</div><div class='del'>-	 *</div><div class='del'>-	 * Interrupt Disable (PCIE*_CFG001[I_DIS]) System Error</div><div class='del'>-	 * Message Enable (PCIE*_CFG001[SEE])</div><div class='add'>+	 * Access Enables (PCIE*_CFG001[MSAE,ME])</div><div class='add'>+	 * ME and MSAE should always be set.</div><div class='add'>+	 * Interrupt Disable (PCIE*_CFG001[I_DIS])</div><div class='add'>+	 * System Error Message Enable (PCIE*_CFG001[SEE])</div><div class='ctx'> 	 */</div><div class='del'>-	pciercx_cfg001.u32 =</div><div class='del'>-		cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG001(pcie_port));</div><div class='add'>+	pciercx_cfg001.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG001(pcie_port));</div><div class='ctx'> 	pciercx_cfg001.s.msae = 1;	/* Memory space enable. */</div><div class='ctx'> 	pciercx_cfg001.s.me = 1;	/* Bus master enable. */</div><div class='ctx'> 	pciercx_cfg001.s.i_dis = 1;	/* INTx assertion disable. */</div><div class='ctx'> 	pciercx_cfg001.s.see = 1;	/* SERR# enable */</div><div class='del'>-	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG001(pcie_port),</div><div class='del'>-			pciercx_cfg001.u32);</div><div class='add'>+	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG001(pcie_port), pciercx_cfg001.u32);</div><div class='ctx'> </div><div class='ctx'> 	/* Advanced Error Recovery Message Enables */</div><div class='ctx'> 	/* (PCIE*_CFG066,PCIE*_CFG067,PCIE*_CFG069) */</div><div class='hunk'>@@ -440,14 +492,11 @@ static void __cvmx_pcie_rc_initialize_config_space(int pcie_port)</div><div class='ctx'> 	/* Use CVMX_PCIERCX_CFG067 hardware default */</div><div class='ctx'> 	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG069(pcie_port), 0);</div><div class='ctx'> </div><div class='del'>-	/* Active State Power Management (PCIE*_CFG032[ASLPC]) */</div><div class='del'>-	pciercx_cfg032.u32 =</div><div class='del'>-		cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG032(pcie_port));</div><div class='del'>-	pciercx_cfg032.s.aslpc = 0;	/* Active state Link PM control. */</div><div class='del'>-	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG032(pcie_port),</div><div class='del'>-			     pciercx_cfg032.u32);</div><div class='ctx'> </div><div class='del'>-	/* Entrance Latencies (PCIE*_CFG451[L0EL,L1EL]) */</div><div class='add'>+	/* Active State Power Management (PCIE*_CFG032[ASLPC]) */</div><div class='add'>+	pciercx_cfg032.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG032(pcie_port));</div><div class='add'>+	pciercx_cfg032.s.aslpc = 0; /* Active state Link PM control. */</div><div class='add'>+	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG032(pcie_port), pciercx_cfg032.u32);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Link Width Mode (PCIERCn_CFG452[LME]) - Set during</div><div class='hunk'>@@ -462,8 +511,8 @@ static void __cvmx_pcie_rc_initialize_config_space(int pcie_port)</div><div class='ctx'> 	pciercx_cfg006.s.pbnum = 1;</div><div class='ctx'> 	pciercx_cfg006.s.sbnum = 1;</div><div class='ctx'> 	pciercx_cfg006.s.subbnum = 1;</div><div class='del'>-	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG006(pcie_port),</div><div class='del'>-			     pciercx_cfg006.u32);</div><div class='add'>+	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG006(pcie_port), pciercx_cfg006.u32);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Memory-mapped I/O BAR (PCIERCn_CFG008)</div><div class='hunk'>@@ -473,8 +522,8 @@ static void __cvmx_pcie_rc_initialize_config_space(int pcie_port)</div><div class='ctx'> 	pciercx_cfg008.u32 = 0;</div><div class='ctx'> 	pciercx_cfg008.s.mb_addr = 0x100;</div><div class='ctx'> 	pciercx_cfg008.s.ml_addr = 0;</div><div class='del'>-	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG008(pcie_port),</div><div class='del'>-			     pciercx_cfg008.u32);</div><div class='add'>+	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG008(pcie_port), pciercx_cfg008.u32);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Prefetchable BAR (PCIERCn_CFG009,PCIERCn_CFG010,PCIERCn_CFG011)</div><div class='hunk'>@@ -482,72 +531,51 @@ static void __cvmx_pcie_rc_initialize_config_space(int pcie_port)</div><div class='ctx'> 	 * PCIERCn_CFG011[UMEM_LIMIT],PCIERCn_CFG009[LMEM_LIMIT] &lt;</div><div class='ctx'> 	 * PCIERCn_CFG010[UMEM_BASE],PCIERCn_CFG009[LMEM_BASE]</div><div class='ctx'> 	 */</div><div class='del'>-	pciercx_cfg009.u32 =</div><div class='del'>-		cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG009(pcie_port));</div><div class='del'>-	pciercx_cfg010.u32 =</div><div class='del'>-		cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG010(pcie_port));</div><div class='del'>-	pciercx_cfg011.u32 =</div><div class='del'>-		cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG011(pcie_port));</div><div class='add'>+	pciercx_cfg009.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG009(pcie_port));</div><div class='add'>+	pciercx_cfg010.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG010(pcie_port));</div><div class='add'>+	pciercx_cfg011.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG011(pcie_port));</div><div class='ctx'> 	pciercx_cfg009.s.lmem_base = 0x100;</div><div class='ctx'> 	pciercx_cfg009.s.lmem_limit = 0;</div><div class='ctx'> 	pciercx_cfg010.s.umem_base = 0x100;</div><div class='ctx'> 	pciercx_cfg011.s.umem_limit = 0;</div><div class='del'>-	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG009(pcie_port),</div><div class='del'>-			     pciercx_cfg009.u32);</div><div class='del'>-	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG010(pcie_port),</div><div class='del'>-			     pciercx_cfg010.u32);</div><div class='del'>-	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG011(pcie_port),</div><div class='del'>-			     pciercx_cfg011.u32);</div><div class='add'>+	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG009(pcie_port), pciercx_cfg009.u32);</div><div class='add'>+	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG010(pcie_port), pciercx_cfg010.u32);</div><div class='add'>+	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG011(pcie_port), pciercx_cfg011.u32);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * System Error Interrupt Enables (PCIERCn_CFG035[SECEE,SEFEE,SENFEE])</div><div class='ctx'> 	 * PME Interrupt Enables (PCIERCn_CFG035[PMEIE])</div><div class='del'>-	 */</div><div class='del'>-	pciercx_cfg035.u32 =</div><div class='del'>-		cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG035(pcie_port));</div><div class='del'>-	/* System error on correctable error enable. */</div><div class='del'>-	pciercx_cfg035.s.secee = 1;</div><div class='del'>-	/* System error on fatal error enable. */</div><div class='del'>-	pciercx_cfg035.s.sefee = 1;</div><div class='del'>-	/* System error on non-fatal error enable. */</div><div class='del'>-	pciercx_cfg035.s.senfee = 1;</div><div class='del'>-	/* PME interrupt enable. */</div><div class='del'>-	pciercx_cfg035.s.pmeie = 1;</div><div class='del'>-	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG035(pcie_port),</div><div class='del'>-			     pciercx_cfg035.u32);</div><div class='add'>+	*/</div><div class='add'>+	pciercx_cfg035.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG035(pcie_port));</div><div class='add'>+	pciercx_cfg035.s.secee = 1; /* System error on correctable error enable. */</div><div class='add'>+	pciercx_cfg035.s.sefee = 1; /* System error on fatal error enable. */</div><div class='add'>+	pciercx_cfg035.s.senfee = 1; /* System error on non-fatal error enable. */</div><div class='add'>+	pciercx_cfg035.s.pmeie = 1; /* PME interrupt enable. */</div><div class='add'>+	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG035(pcie_port), pciercx_cfg035.u32);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Advanced Error Recovery Interrupt Enables</div><div class='ctx'> 	 * (PCIERCn_CFG075[CERE,NFERE,FERE])</div><div class='ctx'> 	 */</div><div class='del'>-	pciercx_cfg075.u32 =</div><div class='del'>-		cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG075(pcie_port));</div><div class='del'>-	/* Correctable error reporting enable. */</div><div class='del'>-	pciercx_cfg075.s.cere = 1;</div><div class='del'>-	/* Non-fatal error reporting enable. */</div><div class='del'>-	pciercx_cfg075.s.nfere = 1;</div><div class='del'>-	/* Fatal error reporting enable. */</div><div class='del'>-	pciercx_cfg075.s.fere = 1;</div><div class='del'>-	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG075(pcie_port),</div><div class='del'>-			     pciercx_cfg075.u32);</div><div class='add'>+	pciercx_cfg075.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG075(pcie_port));</div><div class='add'>+	pciercx_cfg075.s.cere = 1; /* Correctable error reporting enable. */</div><div class='add'>+	pciercx_cfg075.s.nfere = 1; /* Non-fatal error reporting enable. */</div><div class='add'>+	pciercx_cfg075.s.fere = 1; /* Fatal error reporting enable. */</div><div class='add'>+	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG075(pcie_port), pciercx_cfg075.u32);</div><div class='ctx'> </div><div class='del'>-	/* HP Interrupt Enables (PCIERCn_CFG034[HPINT_EN],</div><div class='add'>+	/*</div><div class='add'>+	 * HP Interrupt Enables (PCIERCn_CFG034[HPINT_EN],</div><div class='ctx'> 	 * PCIERCn_CFG034[DLLS_EN,CCINT_EN])</div><div class='ctx'> 	 */</div><div class='del'>-	pciercx_cfg034.u32 =</div><div class='del'>-		cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG034(pcie_port));</div><div class='del'>-	/* Hot-plug interrupt enable. */</div><div class='del'>-	pciercx_cfg034.s.hpint_en = 1;</div><div class='del'>-	/* Data Link Layer state changed enable */</div><div class='del'>-	pciercx_cfg034.s.dlls_en = 1;</div><div class='del'>-	/* Command completed interrupt enable. */</div><div class='del'>-	pciercx_cfg034.s.ccint_en = 1;</div><div class='del'>-	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG034(pcie_port),</div><div class='del'>-			     pciercx_cfg034.u32);</div><div class='add'>+	pciercx_cfg034.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG034(pcie_port));</div><div class='add'>+	pciercx_cfg034.s.hpint_en = 1; /* Hot-plug interrupt enable. */</div><div class='add'>+	pciercx_cfg034.s.dlls_en = 1; /* Data Link Layer state changed enable */</div><div class='add'>+	pciercx_cfg034.s.ccint_en = 1; /* Command completed interrupt enable. */</div><div class='add'>+	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG034(pcie_port), pciercx_cfg034.u32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Initialize a host mode PCIe link. This function takes a PCIe</div><div class='add'>+ * Initialize a host mode PCIe gen 1 link. This function takes a PCIe</div><div class='ctx'>  * port from reset to a link up state. Software can then begin</div><div class='ctx'>  * configuring the rest of the link.</div><div class='ctx'>  *</div><div class='hunk'>@@ -555,7 +583,7 @@ static void __cvmx_pcie_rc_initialize_config_space(int pcie_port)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns Zero on success</div><div class='ctx'>  */</div><div class='del'>-static int __cvmx_pcie_rc_initialize_link(int pcie_port)</div><div class='add'>+static int __cvmx_pcie_rc_initialize_link_gen1(int pcie_port)</div><div class='ctx'> {</div><div class='ctx'> 	uint64_t start_cycle;</div><div class='ctx'> 	union cvmx_pescx_ctl_status pescx_ctl_status;</div><div class='hunk'>@@ -564,18 +592,15 @@ static int __cvmx_pcie_rc_initialize_link(int pcie_port)</div><div class='ctx'> 	union cvmx_pciercx_cfg448 pciercx_cfg448;</div><div class='ctx'> </div><div class='ctx'> 	/* Set the lane width */</div><div class='del'>-	pciercx_cfg452.u32 =</div><div class='del'>-	    cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG452(pcie_port));</div><div class='add'>+	pciercx_cfg452.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG452(pcie_port));</div><div class='ctx'> 	pescx_ctl_status.u64 = cvmx_read_csr(CVMX_PESCX_CTL_STATUS(pcie_port));</div><div class='del'>-	if (pescx_ctl_status.s.qlm_cfg == 0) {</div><div class='add'>+	if (pescx_ctl_status.s.qlm_cfg == 0)</div><div class='ctx'> 		/* We're in 8 lane (56XX) or 4 lane (54XX) mode */</div><div class='ctx'> 		pciercx_cfg452.s.lme = 0xf;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		/* We're in 4 lane (56XX) or 2 lane (52XX) mode */</div><div class='ctx'> 		pciercx_cfg452.s.lme = 0x7;</div><div class='del'>-	}</div><div class='del'>-	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG452(pcie_port),</div><div class='del'>-			     pciercx_cfg452.u32);</div><div class='add'>+	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG452(pcie_port), pciercx_cfg452.u32);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * CN52XX pass 1.x has an errata where length mismatches on UR</div><div class='hunk'>@@ -584,19 +609,15 @@ static int __cvmx_pcie_rc_initialize_link(int pcie_port)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (OCTEON_IS_MODEL(OCTEON_CN52XX_PASS1_X)) {</div><div class='ctx'> 		union cvmx_pciercx_cfg455 pciercx_cfg455;</div><div class='del'>-		pciercx_cfg455.u32 =</div><div class='del'>-		    cvmx_pcie_cfgx_read(pcie_port,</div><div class='del'>-					CVMX_PCIERCX_CFG455(pcie_port));</div><div class='add'>+		pciercx_cfg455.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG455(pcie_port));</div><div class='ctx'> 		pciercx_cfg455.s.m_cpl_len_err = 1;</div><div class='del'>-		cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG455(pcie_port),</div><div class='del'>-				     pciercx_cfg455.u32);</div><div class='add'>+		cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG455(pcie_port), pciercx_cfg455.u32);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Lane swap needs to be manually enabled for CN52XX */</div><div class='ctx'> 	if (OCTEON_IS_MODEL(OCTEON_CN52XX) &amp;&amp; (pcie_port == 1)) {</div><div class='ctx'> 		pescx_ctl_status.s.lane_swp = 1;</div><div class='del'>-		cvmx_write_csr(CVMX_PESCX_CTL_STATUS(pcie_port),</div><div class='del'>-			       pescx_ctl_status.u64);</div><div class='add'>+		cvmx_write_csr(CVMX_PESCX_CTL_STATUS(pcie_port), pescx_ctl_status.u64);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Bring up the link */</div><div class='hunk'>@@ -612,24 +633,18 @@ static int __cvmx_pcie_rc_initialize_link(int pcie_port)</div><div class='ctx'> 		__cvmx_helper_errata_qlm_disable_2nd_order_cdr(0);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for the link to come up */</div><div class='del'>-	cvmx_dprintf("PCIe: Waiting for port %d link\n", pcie_port);</div><div class='ctx'> 	start_cycle = cvmx_get_cycle();</div><div class='ctx'> 	do {</div><div class='del'>-		if (cvmx_get_cycle() - start_cycle &gt;</div><div class='del'>-		    2 * cvmx_sysinfo_get()-&gt;cpu_clock_hz) {</div><div class='del'>-			cvmx_dprintf("PCIe: Port %d link timeout\n",</div><div class='del'>-				     pcie_port);</div><div class='add'>+		if (cvmx_get_cycle() - start_cycle &gt; 2 * octeon_get_clock_rate()) {</div><div class='add'>+			cvmx_dprintf("PCIe: Port %d link timeout\n", pcie_port);</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 		cvmx_wait(10000);</div><div class='del'>-		pciercx_cfg032.u32 =</div><div class='del'>-		    cvmx_pcie_cfgx_read(pcie_port,</div><div class='del'>-					CVMX_PCIERCX_CFG032(pcie_port));</div><div class='add'>+		pciercx_cfg032.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG032(pcie_port));</div><div class='ctx'> 	} while (pciercx_cfg032.s.dlla == 0);</div><div class='ctx'> </div><div class='del'>-	/* Display the link status */</div><div class='del'>-	cvmx_dprintf("PCIe: Port %d link active, %d lanes\n", pcie_port,</div><div class='del'>-		     pciercx_cfg032.s.nlw);</div><div class='add'>+	/* Clear all pending errors */</div><div class='add'>+	cvmx_write_csr(CVMX_PEXP_NPEI_INT_SUM, cvmx_read_csr(CVMX_PEXP_NPEI_INT_SUM));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Update the Replay Time Limit. Empirically, some PCIe</div><div class='hunk'>@@ -639,8 +654,7 @@ static int __cvmx_pcie_rc_initialize_link(int pcie_port)</div><div class='ctx'> 	 * our actual 256 byte MPS. The numbers below are directly</div><div class='ctx'> 	 * from the PCIe spec table 3-4.</div><div class='ctx'> 	 */</div><div class='del'>-	pciercx_cfg448.u32 =</div><div class='del'>-	    cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG448(pcie_port));</div><div class='add'>+	pciercx_cfg448.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG448(pcie_port));</div><div class='ctx'> 	switch (pciercx_cfg032.s.nlw) {</div><div class='ctx'> 	case 1:		/* 1 lane */</div><div class='ctx'> 		pciercx_cfg448.s.rtl = 1677;</div><div class='hunk'>@@ -655,21 +669,28 @@ static int __cvmx_pcie_rc_initialize_link(int pcie_port)</div><div class='ctx'> 		pciercx_cfg448.s.rtl = 258;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG448(pcie_port),</div><div class='del'>-			     pciercx_cfg448.u32);</div><div class='add'>+	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG448(pcie_port), pciercx_cfg448.u32);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __cvmx_increment_ba(union cvmx_sli_mem_access_subidx *pmas)</div><div class='add'>+{</div><div class='add'>+	if (OCTEON_IS_MODEL(OCTEON_CN68XX))</div><div class='add'>+		pmas-&gt;cn68xx.ba++;</div><div class='add'>+	else</div><div class='add'>+		pmas-&gt;cn63xx.ba++;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * Initialize a PCIe port for use in host(RC) mode. It doesn't</div><div class='add'>+ * Initialize a PCIe gen 1 port for use in host(RC) mode. It doesn't</div><div class='ctx'>  * enumerate the bus.</div><div class='ctx'>  *</div><div class='ctx'>  * @pcie_port: PCIe port to initialize</div><div class='ctx'>  *</div><div class='ctx'>  * Returns Zero on success</div><div class='ctx'>  */</div><div class='del'>-static int cvmx_pcie_rc_initialize(int pcie_port)</div><div class='add'>+static int __cvmx_pcie_rc_initialize_gen1(int pcie_port)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int base;</div><div class='hunk'>@@ -682,16 +703,17 @@ static int cvmx_pcie_rc_initialize(int pcie_port)</div><div class='ctx'> 	union cvmx_npei_mem_access_subidx mem_access_subid;</div><div class='ctx'> 	union cvmx_npei_dbg_data npei_dbg_data;</div><div class='ctx'> 	union cvmx_pescx_ctl_status2 pescx_ctl_status2;</div><div class='add'>+	union cvmx_pciercx_cfg032 pciercx_cfg032;</div><div class='ctx'> 	union cvmx_npei_bar1_indexx bar1_index;</div><div class='ctx'> </div><div class='add'>+retry:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make sure we aren't trying to setup a target mode interface</div><div class='ctx'> 	 * in host mode.</div><div class='ctx'> 	 */</div><div class='ctx'> 	npei_ctl_status.u64 = cvmx_read_csr(CVMX_PEXP_NPEI_CTL_STATUS);</div><div class='ctx'> 	if ((pcie_port == 0) &amp;&amp; !npei_ctl_status.s.host_mode) {</div><div class='del'>-		cvmx_dprintf("PCIe: ERROR: cvmx_pcie_rc_initialize() called "</div><div class='del'>-			     "on port0, but port0 is not in host mode\n");</div><div class='add'>+		cvmx_dprintf("PCIe: Port %d in endpoint mode\n", pcie_port);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -702,9 +724,7 @@ static int cvmx_pcie_rc_initialize(int pcie_port)</div><div class='ctx'> 	if (OCTEON_IS_MODEL(OCTEON_CN52XX)) {</div><div class='ctx'> 		npei_dbg_data.u64 = cvmx_read_csr(CVMX_PEXP_NPEI_DBG_DATA);</div><div class='ctx'> 		if ((pcie_port == 1) &amp;&amp; npei_dbg_data.cn52xx.qlm0_link_width) {</div><div class='del'>-			cvmx_dprintf("PCIe: ERROR: cvmx_pcie_rc_initialize() "</div><div class='del'>-				     "called on port1, but port1 is "</div><div class='del'>-				     "disabled\n");</div><div class='add'>+			cvmx_dprintf("PCIe: ERROR: cvmx_pcie_rc_initialize() called on port1, but port1 is disabled\n");</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -733,7 +753,7 @@ static int cvmx_pcie_rc_initialize(int pcie_port)</div><div class='ctx'> 		 * the board. As a workaround for this bug, we bring</div><div class='ctx'> 		 * both PCIe ports out of reset at the same time</div><div class='ctx'> 		 * instead of on separate calls. So for port 0, we</div><div class='del'>-		 * bring both out of reset and do nothing on port 1.</div><div class='add'>+		 * bring both out of reset and do nothing on port 1</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (pcie_port == 0) {</div><div class='ctx'> 			ciu_soft_prst.u64 = cvmx_read_csr(CVMX_CIU_SOFT_PRST);</div><div class='hunk'>@@ -746,13 +766,10 @@ static int cvmx_pcie_rc_initialize(int pcie_port)</div><div class='ctx'> 			if (ciu_soft_prst.s.soft_prst == 0) {</div><div class='ctx'> 				/* Reset the ports */</div><div class='ctx'> 				ciu_soft_prst.s.soft_prst = 1;</div><div class='del'>-				cvmx_write_csr(CVMX_CIU_SOFT_PRST,</div><div class='del'>-					       ciu_soft_prst.u64);</div><div class='del'>-				ciu_soft_prst.u64 =</div><div class='del'>-				    cvmx_read_csr(CVMX_CIU_SOFT_PRST1);</div><div class='add'>+				cvmx_write_csr(CVMX_CIU_SOFT_PRST, ciu_soft_prst.u64);</div><div class='add'>+				ciu_soft_prst.u64 = cvmx_read_csr(CVMX_CIU_SOFT_PRST1);</div><div class='ctx'> 				ciu_soft_prst.s.soft_prst = 1;</div><div class='del'>-				cvmx_write_csr(CVMX_CIU_SOFT_PRST1,</div><div class='del'>-					       ciu_soft_prst.u64);</div><div class='add'>+				cvmx_write_csr(CVMX_CIU_SOFT_PRST1, ciu_soft_prst.u64);</div><div class='ctx'> 				/* Wait until pcie resets the ports. */</div><div class='ctx'> 				udelay(2000);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -782,11 +799,9 @@ static int cvmx_pcie_rc_initialize(int pcie_port)</div><div class='ctx'> 			/* Reset the port */</div><div class='ctx'> 			ciu_soft_prst.s.soft_prst = 1;</div><div class='ctx'> 			if (pcie_port)</div><div class='del'>-				cvmx_write_csr(CVMX_CIU_SOFT_PRST1,</div><div class='del'>-					       ciu_soft_prst.u64);</div><div class='add'>+				cvmx_write_csr(CVMX_CIU_SOFT_PRST1, ciu_soft_prst.u64);</div><div class='ctx'> 			else</div><div class='del'>-				cvmx_write_csr(CVMX_CIU_SOFT_PRST,</div><div class='del'>-					       ciu_soft_prst.u64);</div><div class='add'>+				cvmx_write_csr(CVMX_CIU_SOFT_PRST, ciu_soft_prst.u64);</div><div class='ctx'> 			/* Wait until pcie resets the ports. */</div><div class='ctx'> 			udelay(2000);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -808,25 +823,21 @@ static int cvmx_pcie_rc_initialize(int pcie_port)</div><div class='ctx'> 	 */</div><div class='ctx'> 	cvmx_wait(400000);</div><div class='ctx'> </div><div class='del'>-	/* PESCX_BIST_STATUS2[PCLK_RUN] was missing on pass 1 of CN56XX and</div><div class='del'>-	   CN52XX, so we only probe it on newer chips */</div><div class='del'>-	if (!OCTEON_IS_MODEL(OCTEON_CN56XX_PASS1_X)</div><div class='del'>-	    &amp;&amp; !OCTEON_IS_MODEL(OCTEON_CN52XX_PASS1_X)) {</div><div class='add'>+	/*</div><div class='add'>+	 * PESCX_BIST_STATUS2[PCLK_RUN] was missing on pass 1 of</div><div class='add'>+	 * CN56XX and CN52XX, so we only probe it on newer chips</div><div class='add'>+	 */</div><div class='add'>+	if (!OCTEON_IS_MODEL(OCTEON_CN56XX_PASS1_X) &amp;&amp; !OCTEON_IS_MODEL(OCTEON_CN52XX_PASS1_X)) {</div><div class='ctx'> 		/* Clear PCLK_RUN so we can check if the clock is running */</div><div class='del'>-		pescx_ctl_status2.u64 =</div><div class='del'>-		    cvmx_read_csr(CVMX_PESCX_CTL_STATUS2(pcie_port));</div><div class='add'>+		pescx_ctl_status2.u64 = cvmx_read_csr(CVMX_PESCX_CTL_STATUS2(pcie_port));</div><div class='ctx'> 		pescx_ctl_status2.s.pclk_run = 1;</div><div class='del'>-		cvmx_write_csr(CVMX_PESCX_CTL_STATUS2(pcie_port),</div><div class='del'>-			       pescx_ctl_status2.u64);</div><div class='del'>-		/*</div><div class='del'>-		 * Now that we cleared PCLK_RUN, wait for it to be set</div><div class='del'>-		 * again telling us the clock is running.</div><div class='add'>+		cvmx_write_csr(CVMX_PESCX_CTL_STATUS2(pcie_port), pescx_ctl_status2.u64);</div><div class='add'>+		/* Now that we cleared PCLK_RUN, wait for it to be set</div><div class='add'>+		 * again telling us the clock is running</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (CVMX_WAIT_FOR_FIELD64(CVMX_PESCX_CTL_STATUS2(pcie_port),</div><div class='del'>-					  union cvmx_pescx_ctl_status2,</div><div class='del'>-					  pclk_run, ==, 1, 10000)) {</div><div class='del'>-			cvmx_dprintf("PCIe: Port %d isn't clocked, skipping.\n",</div><div class='del'>-				     pcie_port);</div><div class='add'>+					  union cvmx_pescx_ctl_status2, pclk_run, ==, 1, 10000)) {</div><div class='add'>+			cvmx_dprintf("PCIe: Port %d isn't clocked, skipping.\n", pcie_port);</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -836,30 +847,26 @@ static int cvmx_pcie_rc_initialize(int pcie_port)</div><div class='ctx'> 	 * the board probably hasn't wired the clocks up and the</div><div class='ctx'> 	 * interface should be skipped.</div><div class='ctx'> 	 */</div><div class='del'>-	pescx_ctl_status2.u64 =</div><div class='del'>-	    cvmx_read_csr(CVMX_PESCX_CTL_STATUS2(pcie_port));</div><div class='add'>+	pescx_ctl_status2.u64 = cvmx_read_csr(CVMX_PESCX_CTL_STATUS2(pcie_port));</div><div class='ctx'> 	if (pescx_ctl_status2.s.pcierst) {</div><div class='del'>-		cvmx_dprintf("PCIe: Port %d stuck in reset, skipping.\n",</div><div class='del'>-			     pcie_port);</div><div class='add'>+		cvmx_dprintf("PCIe: Port %d stuck in reset, skipping.\n", pcie_port);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Check BIST2 status. If any bits are set skip this interface. This</div><div class='del'>-	 * is an attempt to catch PCIE-813 on pass 1 parts.</div><div class='add'>+	 * Check BIST2 status. If any bits are set skip this</div><div class='add'>+	 * interface. This is an attempt to catch PCIE-813 on pass 1</div><div class='add'>+	 * parts.</div><div class='ctx'> 	 */</div><div class='del'>-	pescx_bist_status2.u64 =</div><div class='del'>-	    cvmx_read_csr(CVMX_PESCX_BIST_STATUS2(pcie_port));</div><div class='add'>+	pescx_bist_status2.u64 = cvmx_read_csr(CVMX_PESCX_BIST_STATUS2(pcie_port));</div><div class='ctx'> 	if (pescx_bist_status2.u64) {</div><div class='del'>-		cvmx_dprintf("PCIe: Port %d BIST2 failed. Most likely this "</div><div class='del'>-			     "port isn't hooked up, skipping.\n",</div><div class='add'>+		cvmx_dprintf("PCIe: Port %d BIST2 failed. Most likely this port isn't hooked up, skipping.\n",</div><div class='ctx'> 			     pcie_port);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check BIST status */</div><div class='del'>-	pescx_bist_status.u64 =</div><div class='del'>-	    cvmx_read_csr(CVMX_PESCX_BIST_STATUS(pcie_port));</div><div class='add'>+	pescx_bist_status.u64 = cvmx_read_csr(CVMX_PESCX_BIST_STATUS(pcie_port));</div><div class='ctx'> 	if (pescx_bist_status.u64)</div><div class='ctx'> 		cvmx_dprintf("PCIe: BIST FAILED for port %d (0x%016llx)\n",</div><div class='ctx'> 			     pcie_port, CAST64(pescx_bist_status.u64));</div><div class='hunk'>@@ -868,50 +875,37 @@ static int cvmx_pcie_rc_initialize(int pcie_port)</div><div class='ctx'> 	__cvmx_pcie_rc_initialize_config_space(pcie_port);</div><div class='ctx'> </div><div class='ctx'> 	/* Bring the link up */</div><div class='del'>-	if (__cvmx_pcie_rc_initialize_link(pcie_port)) {</div><div class='del'>-		cvmx_dprintf</div><div class='del'>-		    ("PCIe: ERROR: cvmx_pcie_rc_initialize_link() failed\n");</div><div class='add'>+	if (__cvmx_pcie_rc_initialize_link_gen1(pcie_port)) {</div><div class='add'>+		cvmx_dprintf("PCIe: Failed to initialize port %d, probably the slot is empty\n",</div><div class='add'>+			     pcie_port);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Store merge control (NPEI_MEM_ACCESS_CTL[TIMER,MAX_WORD]) */</div><div class='ctx'> 	npei_mem_access_ctl.u64 = cvmx_read_csr(CVMX_PEXP_NPEI_MEM_ACCESS_CTL);</div><div class='del'>-	/* Allow 16 words to combine */</div><div class='del'>-	npei_mem_access_ctl.s.max_word = 0;</div><div class='del'>-	/* Wait up to 127 cycles for more data */</div><div class='del'>-	npei_mem_access_ctl.s.timer = 127;</div><div class='add'>+	npei_mem_access_ctl.s.max_word = 0;     /* Allow 16 words to combine */</div><div class='add'>+	npei_mem_access_ctl.s.timer = 127;      /* Wait up to 127 cycles for more data */</div><div class='ctx'> 	cvmx_write_csr(CVMX_PEXP_NPEI_MEM_ACCESS_CTL, npei_mem_access_ctl.u64);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup Mem access SubDIDs */</div><div class='ctx'> 	mem_access_subid.u64 = 0;</div><div class='del'>-	/* Port the request is sent to. */</div><div class='del'>-	mem_access_subid.s.port = pcie_port;</div><div class='del'>-	/* Due to an errata on pass 1 chips, no merging is allowed. */</div><div class='del'>-	mem_access_subid.s.nmerge = 1;</div><div class='del'>-	/* Endian-swap for Reads. */</div><div class='del'>-	mem_access_subid.s.esr = 1;</div><div class='del'>-	/* Endian-swap for Writes. */</div><div class='del'>-	mem_access_subid.s.esw = 1;</div><div class='del'>-	/* No Snoop for Reads. */</div><div class='del'>-	mem_access_subid.s.nsr = 1;</div><div class='del'>-	/* No Snoop for Writes. */</div><div class='del'>-	mem_access_subid.s.nsw = 1;</div><div class='del'>-	/* Disable Relaxed Ordering for Reads. */</div><div class='del'>-	mem_access_subid.s.ror = 0;</div><div class='del'>-	/* Disable Relaxed Ordering for Writes. */</div><div class='del'>-	mem_access_subid.s.row = 0;</div><div class='del'>-	/* PCIe Address Bits &lt;63:34&gt;. */</div><div class='del'>-	mem_access_subid.s.ba = 0;</div><div class='add'>+	mem_access_subid.s.port = pcie_port; /* Port the request is sent to. */</div><div class='add'>+	mem_access_subid.s.nmerge = 1;  /* Due to an errata on pass 1 chips, no merging is allowed. */</div><div class='add'>+	mem_access_subid.s.esr = 1;	/* Endian-swap for Reads. */</div><div class='add'>+	mem_access_subid.s.esw = 1;	/* Endian-swap for Writes. */</div><div class='add'>+	mem_access_subid.s.nsr = 0;	/* Enable Snooping for Reads. Octeon doesn't care, but devices might want this more conservative setting */</div><div class='add'>+	mem_access_subid.s.nsw = 0;	/* Enable Snoop for Writes. */</div><div class='add'>+	mem_access_subid.s.ror = 0;	/* Disable Relaxed Ordering for Reads. */</div><div class='add'>+	mem_access_subid.s.row = 0;	/* Disable Relaxed Ordering for Writes. */</div><div class='add'>+	mem_access_subid.s.ba = 0;	/* PCIe Adddress Bits &lt;63:34&gt;. */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Setup mem access 12-15 for port 0, 16-19 for port 1,</div><div class='ctx'> 	 * supplying 36 bits of address space.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 12 + pcie_port * 4; i &lt; 16 + pcie_port * 4; i++) {</div><div class='del'>-		cvmx_write_csr(CVMX_PEXP_NPEI_MEM_ACCESS_SUBIDX(i),</div><div class='del'>-			       mem_access_subid.u64);</div><div class='del'>-		/* Set each SUBID to extend the addressable range */</div><div class='del'>-		mem_access_subid.s.ba += 1;</div><div class='add'>+		cvmx_write_csr(CVMX_PEXP_NPEI_MEM_ACCESS_SUBIDX(i), mem_access_subid.u64);</div><div class='add'>+		mem_access_subid.s.ba += 1; /* Set each SUBID to extend the addressable range */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -927,7 +921,7 @@ static int cvmx_pcie_rc_initialize(int pcie_port)</div><div class='ctx'> 	/* Set Octeon's BAR0 to decode 0-16KB. It overlaps with Bar2 */</div><div class='ctx'> 	cvmx_write_csr(CVMX_PESCX_P2N_BAR0_START(pcie_port), 0);</div><div class='ctx'> </div><div class='del'>-	/* BAR1 follows BAR2 with a gap. */</div><div class='add'>+	/* BAR1 follows BAR2 with a gap so it has the same address as for gen2. */</div><div class='ctx'> 	cvmx_write_csr(CVMX_PESCX_P2N_BAR1_START(pcie_port), CVMX_PCIE_BAR1_RC_BASE);</div><div class='ctx'> </div><div class='ctx'> 	bar1_index.u32 = 0;</div><div class='hunk'>@@ -992,14 +986,474 @@ static int cvmx_pcie_rc_initialize(int pcie_port)</div><div class='ctx'> 		npei_ctl_port.s.waitl_com = 0;</div><div class='ctx'> 		cvmx_write_csr(CVMX_PEXP_NPEI_CTL_PORT0, npei_ctl_port.u64);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Both pass 1 and pass 2 of CN52XX and CN56XX have an errata</div><div class='add'>+	 * that causes TLP ordering to not be preserved after multiple</div><div class='add'>+	 * PCIe port resets. This code detects this fault and corrects</div><div class='add'>+	 * it by aligning the TLP counters properly. Another link</div><div class='add'>+	 * reset is then performed. See PCIE-13340</div><div class='add'>+	 */</div><div class='add'>+	if (OCTEON_IS_MODEL(OCTEON_CN56XX_PASS2_X) ||</div><div class='add'>+	    OCTEON_IS_MODEL(OCTEON_CN52XX_PASS2_X) ||</div><div class='add'>+	    OCTEON_IS_MODEL(OCTEON_CN56XX_PASS1_X) ||</div><div class='add'>+	    OCTEON_IS_MODEL(OCTEON_CN52XX_PASS1_X)) {</div><div class='add'>+		union cvmx_npei_dbg_data dbg_data;</div><div class='add'>+		int old_in_fif_p_count;</div><div class='add'>+		int in_fif_p_count;</div><div class='add'>+		int out_p_count;</div><div class='add'>+		int in_p_offset = (OCTEON_IS_MODEL(OCTEON_CN52XX_PASS1_X) || OCTEON_IS_MODEL(OCTEON_CN56XX_PASS1_X)) ? 4 : 1;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Choose a write address of 1MB. It should be</div><div class='add'>+		 * harmless as all bars haven't been setup.</div><div class='add'>+		 */</div><div class='add'>+		uint64_t write_address = (cvmx_pcie_get_mem_base_address(pcie_port) + 0x100000) | (1ull&lt;&lt;63);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Make sure at least in_p_offset have been executed before we try and</div><div class='add'>+		 * read in_fif_p_count</div><div class='add'>+		 */</div><div class='add'>+		i = in_p_offset;</div><div class='add'>+		while (i--) {</div><div class='add'>+			cvmx_write64_uint32(write_address, 0);</div><div class='add'>+			cvmx_wait(10000);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Read the IN_FIF_P_COUNT from the debug</div><div class='add'>+		 * select. IN_FIF_P_COUNT can be unstable sometimes so</div><div class='add'>+		 * read it twice with a write between the reads.  This</div><div class='add'>+		 * way we can tell the value is good as it will</div><div class='add'>+		 * increment by one due to the write</div><div class='add'>+		 */</div><div class='add'>+		cvmx_write_csr(CVMX_PEXP_NPEI_DBG_SELECT, (pcie_port) ? 0xd7fc : 0xcffc);</div><div class='add'>+		cvmx_read_csr(CVMX_PEXP_NPEI_DBG_SELECT);</div><div class='add'>+		do {</div><div class='add'>+			dbg_data.u64 = cvmx_read_csr(CVMX_PEXP_NPEI_DBG_DATA);</div><div class='add'>+			old_in_fif_p_count = dbg_data.s.data &amp; 0xff;</div><div class='add'>+			cvmx_write64_uint32(write_address, 0);</div><div class='add'>+			cvmx_wait(10000);</div><div class='add'>+			dbg_data.u64 = cvmx_read_csr(CVMX_PEXP_NPEI_DBG_DATA);</div><div class='add'>+			in_fif_p_count = dbg_data.s.data &amp; 0xff;</div><div class='add'>+		} while (in_fif_p_count != ((old_in_fif_p_count+1) &amp; 0xff));</div><div class='add'>+</div><div class='add'>+		/* Update in_fif_p_count for it's offset with respect to out_p_count */</div><div class='add'>+		in_fif_p_count = (in_fif_p_count + in_p_offset) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+		/* Read the OUT_P_COUNT from the debug select */</div><div class='add'>+		cvmx_write_csr(CVMX_PEXP_NPEI_DBG_SELECT, (pcie_port) ? 0xd00f : 0xc80f);</div><div class='add'>+		cvmx_read_csr(CVMX_PEXP_NPEI_DBG_SELECT);</div><div class='add'>+		dbg_data.u64 = cvmx_read_csr(CVMX_PEXP_NPEI_DBG_DATA);</div><div class='add'>+		out_p_count = (dbg_data.s.data&gt;&gt;1) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+		/* Check that the two counters are aligned */</div><div class='add'>+		if (out_p_count != in_fif_p_count) {</div><div class='add'>+			cvmx_dprintf("PCIe: Port %d aligning TLP counters as workaround to maintain ordering\n", pcie_port);</div><div class='add'>+			while (in_fif_p_count != 0) {</div><div class='add'>+				cvmx_write64_uint32(write_address, 0);</div><div class='add'>+				cvmx_wait(10000);</div><div class='add'>+				in_fif_p_count = (in_fif_p_count + 1) &amp; 0xff;</div><div class='add'>+			}</div><div class='add'>+			/*</div><div class='add'>+			 * The EBH5200 board swapped the PCIe reset</div><div class='add'>+			 * lines on the board. This means we must</div><div class='add'>+			 * bring both links down and up, which will</div><div class='add'>+			 * cause the PCIe0 to need alignment</div><div class='add'>+			 * again. Lots of messages will be displayed,</div><div class='add'>+			 * but everything should work</div><div class='add'>+			 */</div><div class='add'>+			if ((cvmx_sysinfo_get()-&gt;board_type == CVMX_BOARD_TYPE_EBH5200) &amp;&amp;</div><div class='add'>+				(pcie_port == 1))</div><div class='add'>+				cvmx_pcie_rc_initialize(0);</div><div class='add'>+			/* Rety bringing this port up */</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Display the link status */</div><div class='add'>+	pciercx_cfg032.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG032(pcie_port));</div><div class='add'>+	cvmx_dprintf("PCIe: Port %d link active, %d lanes\n", pcie_port, pciercx_cfg032.s.nlw);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+  * Initialize a host mode PCIe gen 2 link. This function takes a PCIe</div><div class='add'>+ * port from reset to a link up state. Software can then begin</div><div class='add'>+ * configuring the rest of the link.</div><div class='add'>+ *</div><div class='add'>+ * @pcie_port: PCIe port to initialize</div><div class='add'>+ *</div><div class='add'>+ * Return Zero on success.</div><div class='add'>+ */</div><div class='add'>+static int __cvmx_pcie_rc_initialize_link_gen2(int pcie_port)</div><div class='add'>+{</div><div class='add'>+	uint64_t start_cycle;</div><div class='add'>+	union cvmx_pemx_ctl_status pem_ctl_status;</div><div class='add'>+	union cvmx_pciercx_cfg032 pciercx_cfg032;</div><div class='add'>+	union cvmx_pciercx_cfg448 pciercx_cfg448;</div><div class='ctx'> </div><div class='del'>-/* Above was cvmx-pcie.c, below original pcie.c */</div><div class='add'>+	/* Bring up the link */</div><div class='add'>+	pem_ctl_status.u64 = cvmx_read_csr(CVMX_PEMX_CTL_STATUS(pcie_port));</div><div class='add'>+	pem_ctl_status.s.lnk_enb = 1;</div><div class='add'>+	cvmx_write_csr(CVMX_PEMX_CTL_STATUS(pcie_port), pem_ctl_status.u64);</div><div class='add'>+</div><div class='add'>+	/* Wait for the link to come up */</div><div class='add'>+	start_cycle = cvmx_get_cycle();</div><div class='add'>+	do {</div><div class='add'>+		if (cvmx_get_cycle() - start_cycle &gt;  octeon_get_clock_rate())</div><div class='add'>+			return -1;</div><div class='add'>+		cvmx_wait(10000);</div><div class='add'>+		pciercx_cfg032.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG032(pcie_port));</div><div class='add'>+	} while ((pciercx_cfg032.s.dlla == 0) || (pciercx_cfg032.s.lt == 1));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Update the Replay Time Limit. Empirically, some PCIe</div><div class='add'>+	 * devices take a little longer to respond than expected under</div><div class='add'>+	 * load. As a workaround for this we configure the Replay Time</div><div class='add'>+	 * Limit to the value expected for a 512 byte MPS instead of</div><div class='add'>+	 * our actual 256 byte MPS. The numbers below are directly</div><div class='add'>+	 * from the PCIe spec table 3-4</div><div class='add'>+	 */</div><div class='add'>+	pciercx_cfg448.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG448(pcie_port));</div><div class='add'>+	switch (pciercx_cfg032.s.nlw) {</div><div class='add'>+	case 1: /* 1 lane */</div><div class='add'>+		pciercx_cfg448.s.rtl = 1677;</div><div class='add'>+		break;</div><div class='add'>+	case 2: /* 2 lanes */</div><div class='add'>+		pciercx_cfg448.s.rtl = 867;</div><div class='add'>+		break;</div><div class='add'>+	case 4: /* 4 lanes */</div><div class='add'>+		pciercx_cfg448.s.rtl = 462;</div><div class='add'>+		break;</div><div class='add'>+	case 8: /* 8 lanes */</div><div class='add'>+		pciercx_cfg448.s.rtl = 258;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG448(pcie_port), pciercx_cfg448.u32);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * Initialize a PCIe gen 2 port for use in host(RC) mode. It doesn't enumerate</div><div class='add'>+ * the bus.</div><div class='add'>+ *</div><div class='add'>+ * @pcie_port: PCIe port to initialize</div><div class='add'>+ *</div><div class='add'>+ * Returns Zero on success.</div><div class='add'>+ */</div><div class='add'>+static int __cvmx_pcie_rc_initialize_gen2(int pcie_port)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	union cvmx_ciu_soft_prst ciu_soft_prst;</div><div class='add'>+	union cvmx_mio_rst_ctlx mio_rst_ctl;</div><div class='add'>+	union cvmx_pemx_bar_ctl pemx_bar_ctl;</div><div class='add'>+	union cvmx_pemx_ctl_status pemx_ctl_status;</div><div class='add'>+	union cvmx_pemx_bist_status pemx_bist_status;</div><div class='add'>+	union cvmx_pemx_bist_status2 pemx_bist_status2;</div><div class='add'>+	union cvmx_pciercx_cfg032 pciercx_cfg032;</div><div class='add'>+	union cvmx_pciercx_cfg515 pciercx_cfg515;</div><div class='add'>+	union cvmx_sli_ctl_portx sli_ctl_portx;</div><div class='add'>+	union cvmx_sli_mem_access_ctl sli_mem_access_ctl;</div><div class='add'>+	union cvmx_sli_mem_access_subidx mem_access_subid;</div><div class='add'>+	union cvmx_sriox_status_reg sriox_status_reg;</div><div class='add'>+	union cvmx_pemx_bar1_indexx bar1_index;</div><div class='add'>+</div><div class='add'>+	if (octeon_has_feature(OCTEON_FEATURE_SRIO)) {</div><div class='add'>+		/* Make sure this interface isn't SRIO */</div><div class='add'>+		if (OCTEON_IS_MODEL(OCTEON_CN66XX)) {</div><div class='add'>+			/*</div><div class='add'>+			 * The CN66XX requires reading the</div><div class='add'>+			 * MIO_QLMX_CFG register to figure out the</div><div class='add'>+			 * port type.</div><div class='add'>+			 */</div><div class='add'>+			union cvmx_mio_qlmx_cfg qlmx_cfg;</div><div class='add'>+			qlmx_cfg.u64 = cvmx_read_csr(CVMX_MIO_QLMX_CFG(pcie_port));</div><div class='add'>+</div><div class='add'>+			if (qlmx_cfg.s.qlm_spd == 15) {</div><div class='add'>+				pr_notice("PCIe: Port %d is disabled, skipping.\n", pcie_port);</div><div class='add'>+				return -1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			switch (qlmx_cfg.s.qlm_spd) {</div><div class='add'>+			case 0x1: /* SRIO 1x4 short */</div><div class='add'>+			case 0x3: /* SRIO 1x4 long */</div><div class='add'>+			case 0x4: /* SRIO 2x2 short */</div><div class='add'>+			case 0x6: /* SRIO 2x2 long */</div><div class='add'>+				pr_notice("PCIe: Port %d is SRIO, skipping.\n", pcie_port);</div><div class='add'>+				return -1;</div><div class='add'>+			case 0x9: /* SGMII */</div><div class='add'>+				pr_notice("PCIe: Port %d is SGMII, skipping.\n", pcie_port);</div><div class='add'>+				return -1;</div><div class='add'>+			case 0xb: /* XAUI */</div><div class='add'>+				pr_notice("PCIe: Port %d is XAUI, skipping.\n", pcie_port);</div><div class='add'>+				return -1;</div><div class='add'>+			case 0x0: /* PCIE gen2 */</div><div class='add'>+			case 0x8: /* PCIE gen2 (alias) */</div><div class='add'>+			case 0x2: /* PCIE gen1 */</div><div class='add'>+			case 0xa: /* PCIE gen1 (alias) */</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				pr_notice("PCIe: Port %d is unknown, skipping.\n", pcie_port);</div><div class='add'>+				return -1;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			sriox_status_reg.u64 = cvmx_read_csr(CVMX_SRIOX_STATUS_REG(pcie_port));</div><div class='add'>+			if (sriox_status_reg.s.srio) {</div><div class='add'>+				pr_notice("PCIe: Port %d is SRIO, skipping.\n", pcie_port);</div><div class='add'>+				return -1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+    /* This code is so that the PCIe analyzer is able to see 63XX traffic */</div><div class='add'>+	pr_notice("PCIE : init for pcie analyzer.\n");</div><div class='add'>+	cvmx_helper_qlm_jtag_init();</div><div class='add'>+	cvmx_helper_qlm_jtag_shift_zeros(pcie_port, 85);</div><div class='add'>+	cvmx_helper_qlm_jtag_shift(pcie_port, 1, 1);</div><div class='add'>+	cvmx_helper_qlm_jtag_shift_zeros(pcie_port, 300-86);</div><div class='add'>+	cvmx_helper_qlm_jtag_shift_zeros(pcie_port, 85);</div><div class='add'>+	cvmx_helper_qlm_jtag_shift(pcie_port, 1, 1);</div><div class='add'>+	cvmx_helper_qlm_jtag_shift_zeros(pcie_port, 300-86);</div><div class='add'>+	cvmx_helper_qlm_jtag_shift_zeros(pcie_port, 85);</div><div class='add'>+	cvmx_helper_qlm_jtag_shift(pcie_port, 1, 1);</div><div class='add'>+	cvmx_helper_qlm_jtag_shift_zeros(pcie_port, 300-86);</div><div class='add'>+	cvmx_helper_qlm_jtag_shift_zeros(pcie_port, 85);</div><div class='add'>+	cvmx_helper_qlm_jtag_shift(pcie_port, 1, 1);</div><div class='add'>+	cvmx_helper_qlm_jtag_shift_zeros(pcie_port, 300-86);</div><div class='add'>+	cvmx_helper_qlm_jtag_update(pcie_port);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Make sure we aren't trying to setup a target mode interface in host mode */</div><div class='add'>+	mio_rst_ctl.u64 = cvmx_read_csr(CVMX_MIO_RST_CTLX(pcie_port));</div><div class='add'>+	if (!mio_rst_ctl.s.host_mode) {</div><div class='add'>+		pr_notice("PCIe: Port %d in endpoint mode.\n", pcie_port);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* CN63XX Pass 1.0 errata G-14395 requires the QLM De-emphasis be programmed */</div><div class='add'>+	if (OCTEON_IS_MODEL(OCTEON_CN63XX_PASS1_0)) {</div><div class='add'>+		if (pcie_port) {</div><div class='add'>+			union cvmx_ciu_qlm1 ciu_qlm;</div><div class='add'>+			ciu_qlm.u64 = cvmx_read_csr(CVMX_CIU_QLM1);</div><div class='add'>+			ciu_qlm.s.txbypass = 1;</div><div class='add'>+			ciu_qlm.s.txdeemph = 5;</div><div class='add'>+			ciu_qlm.s.txmargin = 0x17;</div><div class='add'>+			cvmx_write_csr(CVMX_CIU_QLM1, ciu_qlm.u64);</div><div class='add'>+		} else {</div><div class='add'>+			union cvmx_ciu_qlm0 ciu_qlm;</div><div class='add'>+			ciu_qlm.u64 = cvmx_read_csr(CVMX_CIU_QLM0);</div><div class='add'>+			ciu_qlm.s.txbypass = 1;</div><div class='add'>+			ciu_qlm.s.txdeemph = 5;</div><div class='add'>+			ciu_qlm.s.txmargin = 0x17;</div><div class='add'>+			cvmx_write_csr(CVMX_CIU_QLM0, ciu_qlm.u64);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* Bring the PCIe out of reset */</div><div class='add'>+	if (pcie_port)</div><div class='add'>+		ciu_soft_prst.u64 = cvmx_read_csr(CVMX_CIU_SOFT_PRST1);</div><div class='add'>+	else</div><div class='add'>+		ciu_soft_prst.u64 = cvmx_read_csr(CVMX_CIU_SOFT_PRST);</div><div class='add'>+	/*</div><div class='add'>+	 * After a chip reset the PCIe will also be in reset. If it</div><div class='add'>+	 * isn't, most likely someone is trying to init it again</div><div class='add'>+	 * without a proper PCIe reset</div><div class='add'>+	 */</div><div class='add'>+	if (ciu_soft_prst.s.soft_prst == 0) {</div><div class='add'>+		/* Reset the port */</div><div class='add'>+		ciu_soft_prst.s.soft_prst = 1;</div><div class='add'>+		if (pcie_port)</div><div class='add'>+			cvmx_write_csr(CVMX_CIU_SOFT_PRST1, ciu_soft_prst.u64);</div><div class='add'>+		else</div><div class='add'>+			cvmx_write_csr(CVMX_CIU_SOFT_PRST, ciu_soft_prst.u64);</div><div class='add'>+		/* Wait until pcie resets the ports. */</div><div class='add'>+		udelay(2000);</div><div class='add'>+	}</div><div class='add'>+	if (pcie_port) {</div><div class='add'>+		ciu_soft_prst.u64 = cvmx_read_csr(CVMX_CIU_SOFT_PRST1);</div><div class='add'>+		ciu_soft_prst.s.soft_prst = 0;</div><div class='add'>+		cvmx_write_csr(CVMX_CIU_SOFT_PRST1, ciu_soft_prst.u64);</div><div class='add'>+	} else {</div><div class='add'>+		ciu_soft_prst.u64 = cvmx_read_csr(CVMX_CIU_SOFT_PRST);</div><div class='add'>+		ciu_soft_prst.s.soft_prst = 0;</div><div class='add'>+		cvmx_write_csr(CVMX_CIU_SOFT_PRST, ciu_soft_prst.u64);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait for PCIe reset to complete */</div><div class='add'>+	udelay(1000);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check and make sure PCIe came out of reset. If it doesn't</div><div class='add'>+	 * the board probably hasn't wired the clocks up and the</div><div class='add'>+	 * interface should be skipped.</div><div class='add'>+	 */</div><div class='add'>+	if (CVMX_WAIT_FOR_FIELD64(CVMX_MIO_RST_CTLX(pcie_port), union cvmx_mio_rst_ctlx, rst_done, ==, 1, 10000)) {</div><div class='add'>+		pr_notice("PCIe: Port %d stuck in reset, skipping.\n", pcie_port);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check BIST status */</div><div class='add'>+	pemx_bist_status.u64 = cvmx_read_csr(CVMX_PEMX_BIST_STATUS(pcie_port));</div><div class='add'>+	if (pemx_bist_status.u64)</div><div class='add'>+		pr_notice("PCIe: BIST FAILED for port %d (0x%016llx)\n", pcie_port, CAST64(pemx_bist_status.u64));</div><div class='add'>+	pemx_bist_status2.u64 = cvmx_read_csr(CVMX_PEMX_BIST_STATUS2(pcie_port));</div><div class='add'>+	/* Errata PCIE-14766 may cause the lower 6 bits to be randomly set on CN63XXp1 */</div><div class='add'>+	if (OCTEON_IS_MODEL(OCTEON_CN63XX_PASS1_X))</div><div class='add'>+		pemx_bist_status2.u64 &amp;= ~0x3full;</div><div class='add'>+	if (pemx_bist_status2.u64)</div><div class='add'>+		pr_notice("PCIe: BIST2 FAILED for port %d (0x%016llx)\n", pcie_port, CAST64(pemx_bist_status2.u64));</div><div class='add'>+</div><div class='add'>+	/* Initialize the config space CSRs */</div><div class='add'>+	__cvmx_pcie_rc_initialize_config_space(pcie_port);</div><div class='add'>+</div><div class='add'>+	/* Enable gen2 speed selection */</div><div class='add'>+	pciercx_cfg515.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG515(pcie_port));</div><div class='add'>+	pciercx_cfg515.s.dsc = 1;</div><div class='add'>+	cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG515(pcie_port), pciercx_cfg515.u32);</div><div class='add'>+</div><div class='add'>+	/* Bring the link up */</div><div class='add'>+	if (__cvmx_pcie_rc_initialize_link_gen2(pcie_port)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Some gen1 devices don't handle the gen 2 training</div><div class='add'>+		 * correctly. Disable gen2 and try again with only</div><div class='add'>+		 * gen1</div><div class='add'>+		 */</div><div class='add'>+		union cvmx_pciercx_cfg031 pciercx_cfg031;</div><div class='add'>+		pciercx_cfg031.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG031(pcie_port));</div><div class='add'>+		pciercx_cfg031.s.mls = 1;</div><div class='add'>+		cvmx_pcie_cfgx_write(pcie_port, CVMX_PCIERCX_CFG031(pcie_port), pciercx_cfg031.u32);</div><div class='add'>+		if (__cvmx_pcie_rc_initialize_link_gen2(pcie_port)) {</div><div class='add'>+			pr_notice("PCIe: Link timeout on port %d, probably the slot is empty\n", pcie_port);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Store merge control (SLI_MEM_ACCESS_CTL[TIMER,MAX_WORD]) */</div><div class='add'>+	sli_mem_access_ctl.u64 = cvmx_read_csr(CVMX_PEXP_SLI_MEM_ACCESS_CTL);</div><div class='add'>+	sli_mem_access_ctl.s.max_word = 0;	/* Allow 16 words to combine */</div><div class='add'>+	sli_mem_access_ctl.s.timer = 127;	/* Wait up to 127 cycles for more data */</div><div class='add'>+	cvmx_write_csr(CVMX_PEXP_SLI_MEM_ACCESS_CTL, sli_mem_access_ctl.u64);</div><div class='add'>+</div><div class='add'>+	/* Setup Mem access SubDIDs */</div><div class='add'>+	mem_access_subid.u64 = 0;</div><div class='add'>+	mem_access_subid.s.port = pcie_port; /* Port the request is sent to. */</div><div class='add'>+	mem_access_subid.s.nmerge = 0;  /* Allow merging as it works on CN6XXX. */</div><div class='add'>+	mem_access_subid.s.esr = 1;     /* Endian-swap for Reads. */</div><div class='add'>+	mem_access_subid.s.esw = 1;     /* Endian-swap for Writes. */</div><div class='add'>+	mem_access_subid.s.wtype = 0;   /* "No snoop" and "Relaxed ordering" are not set */</div><div class='add'>+	mem_access_subid.s.rtype = 0;   /* "No snoop" and "Relaxed ordering" are not set */</div><div class='add'>+	/* PCIe Adddress Bits &lt;63:34&gt;. */</div><div class='add'>+	if (OCTEON_IS_MODEL(OCTEON_CN68XX))</div><div class='add'>+		mem_access_subid.cn68xx.ba = 0;</div><div class='add'>+	else</div><div class='add'>+		mem_access_subid.cn63xx.ba = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup mem access 12-15 for port 0, 16-19 for port 1,</div><div class='add'>+	 * supplying 36 bits of address space.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 12 + pcie_port * 4; i &lt; 16 + pcie_port * 4; i++) {</div><div class='add'>+		cvmx_write_csr(CVMX_PEXP_SLI_MEM_ACCESS_SUBIDX(i), mem_access_subid.u64);</div><div class='add'>+		/* Set each SUBID to extend the addressable range */</div><div class='add'>+		__cvmx_increment_ba(&amp;mem_access_subid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable the peer to peer forwarding register. This must be</div><div class='add'>+	 * setup by the OS after it enumerates the bus and assigns</div><div class='add'>+	 * addresses to the PCIe busses.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		cvmx_write_csr(CVMX_PEMX_P2P_BARX_START(i, pcie_port), -1);</div><div class='add'>+		cvmx_write_csr(CVMX_PEMX_P2P_BARX_END(i, pcie_port), -1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set Octeon's BAR0 to decode 0-16KB. It overlaps with Bar2 */</div><div class='add'>+	cvmx_write_csr(CVMX_PEMX_P2N_BAR0_START(pcie_port), 0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set Octeon's BAR2 to decode 0-2^41. Bar0 and Bar1 take</div><div class='add'>+	 * precedence where they overlap. It also overlaps with the</div><div class='add'>+	 * device addresses, so make sure the peer to peer forwarding</div><div class='add'>+	 * is set right.</div><div class='add'>+	 */</div><div class='add'>+	cvmx_write_csr(CVMX_PEMX_P2N_BAR2_START(pcie_port), 0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Setup BAR2 attributes</div><div class='add'>+	 * Relaxed Ordering (NPEI_CTL_PORTn[PTLP_RO,CTLP_RO, WAIT_COM])</div><div class='add'>+	 * - PTLP_RO,CTLP_RO should normally be set (except for debug).</div><div class='add'>+	 * - WAIT_COM=0 will likely work for all applications.</div><div class='add'>+	 * Load completion relaxed ordering (NPEI_CTL_PORTn[WAITL_COM])</div><div class='add'>+	 */</div><div class='add'>+	pemx_bar_ctl.u64 = cvmx_read_csr(CVMX_PEMX_BAR_CTL(pcie_port));</div><div class='add'>+	pemx_bar_ctl.s.bar1_siz = 3;  /* 256MB BAR1*/</div><div class='add'>+	pemx_bar_ctl.s.bar2_enb = 1;</div><div class='add'>+	pemx_bar_ctl.s.bar2_esx = 1;</div><div class='add'>+	pemx_bar_ctl.s.bar2_cax = 0;</div><div class='add'>+	cvmx_write_csr(CVMX_PEMX_BAR_CTL(pcie_port), pemx_bar_ctl.u64);</div><div class='add'>+	sli_ctl_portx.u64 = cvmx_read_csr(CVMX_PEXP_SLI_CTL_PORTX(pcie_port));</div><div class='add'>+	sli_ctl_portx.s.ptlp_ro = 1;</div><div class='add'>+	sli_ctl_portx.s.ctlp_ro = 1;</div><div class='add'>+	sli_ctl_portx.s.wait_com = 0;</div><div class='add'>+	sli_ctl_portx.s.waitl_com = 0;</div><div class='add'>+	cvmx_write_csr(CVMX_PEXP_SLI_CTL_PORTX(pcie_port), sli_ctl_portx.u64);</div><div class='add'>+</div><div class='add'>+	/* BAR1 follows BAR2 */</div><div class='add'>+	cvmx_write_csr(CVMX_PEMX_P2N_BAR1_START(pcie_port), CVMX_PCIE_BAR1_RC_BASE);</div><div class='add'>+</div><div class='add'>+	bar1_index.u64 = 0;</div><div class='add'>+	bar1_index.s.addr_idx = (CVMX_PCIE_BAR1_PHYS_BASE &gt;&gt; 22);</div><div class='add'>+	bar1_index.s.ca = 1;       /* Not Cached */</div><div class='add'>+	bar1_index.s.end_swp = 1;  /* Endian Swap mode */</div><div class='add'>+	bar1_index.s.addr_v = 1;   /* Valid entry */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		cvmx_write_csr(CVMX_PEMX_BAR1_INDEXX(i, pcie_port), bar1_index.u64);</div><div class='add'>+		/* 256MB / 16 &gt;&gt; 22 == 4 */</div><div class='add'>+		bar1_index.s.addr_idx += (((1ull &lt;&lt; 28) / 16ull) &gt;&gt; 22);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Allow config retries for 250ms. Count is based off the 5Ghz</div><div class='add'>+	 * SERDES clock.</div><div class='add'>+	 */</div><div class='add'>+	pemx_ctl_status.u64 = cvmx_read_csr(CVMX_PEMX_CTL_STATUS(pcie_port));</div><div class='add'>+	pemx_ctl_status.s.cfg_rtry = 250 * 5000000 / 0x10000;</div><div class='add'>+	cvmx_write_csr(CVMX_PEMX_CTL_STATUS(pcie_port), pemx_ctl_status.u64);</div><div class='add'>+</div><div class='add'>+	/* Display the link status */</div><div class='add'>+	pciercx_cfg032.u32 = cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG032(pcie_port));</div><div class='add'>+	pr_notice("PCIe: Port %d link active, %d lanes, speed gen%d\n", pcie_port, pciercx_cfg032.s.nlw, pciercx_cfg032.s.ls);</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 a PCIe port for use in host(RC) mode. It doesn't enumerate the bus.</div><div class='add'>+ *</div><div class='add'>+ * @pcie_port: PCIe port to initialize</div><div class='add'>+ *</div><div class='add'>+ * Returns Zero on success</div><div class='add'>+ */</div><div class='add'>+static int cvmx_pcie_rc_initialize(int pcie_port)</div><div class='add'>+{</div><div class='add'>+	int result;</div><div class='add'>+	if (octeon_has_feature(OCTEON_FEATURE_NPEI))</div><div class='add'>+		result = __cvmx_pcie_rc_initialize_gen1(pcie_port);</div><div class='add'>+	else</div><div class='add'>+		result = __cvmx_pcie_rc_initialize_gen2(pcie_port);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Above was cvmx-pcie.c, below original pcie.c */</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * Map a PCI device to the appropriate interrupt line</div><div class='ctx'>  *</div><div class='ctx'>  * @dev:    The Linux PCI device structure for the device to map</div><div class='hunk'>@@ -1027,11 +1481,12 @@ int __init octeon_pcie_pcibios_map_irq(const struct pci_dev *dev,</div><div class='ctx'> 		 */</div><div class='ctx'> 		while (dev-&gt;bus &amp;&amp; dev-&gt;bus-&gt;parent)</div><div class='ctx'> 			dev = to_pci_dev(dev-&gt;bus-&gt;bridge);</div><div class='del'>-		/* If the root bus is number 0 and the PEX 8114 is the</div><div class='add'>+		/*</div><div class='add'>+		 * If the root bus is number 0 and the PEX 8114 is the</div><div class='ctx'> 		 * root, assume we are behind the miswired bus. We</div><div class='ctx'> 		 * need to correct the swizzle level by two. Yuck.</div><div class='ctx'> 		 */</div><div class='del'>-		if ((dev-&gt;bus-&gt;number == 0) &amp;&amp;</div><div class='add'>+		if ((dev-&gt;bus-&gt;number == 1) &amp;&amp;</div><div class='ctx'> 		    (dev-&gt;vendor == 0x10b5) &amp;&amp; (dev-&gt;device == 0x8114)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * The pin field is one based, not zero. We</div><div class='hunk'>@@ -1048,39 +1503,73 @@ int __init octeon_pcie_pcibios_map_irq(const struct pci_dev *dev,</div><div class='ctx'> 	return pin - 1 + OCTEON_IRQ_PCI_INT0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+static  void set_cfg_read_retry(u32 retry_cnt)</div><div class='add'>+{</div><div class='add'>+	union cvmx_pemx_ctl_status pemx_ctl;</div><div class='add'>+	pemx_ctl.u64 = cvmx_read_csr(CVMX_PEMX_CTL_STATUS(1));</div><div class='add'>+	pemx_ctl.s.cfg_rtry = retry_cnt;</div><div class='add'>+	cvmx_write_csr(CVMX_PEMX_CTL_STATUS(1), pemx_ctl.u64);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static u32 disable_cfg_read_retry(void)</div><div class='add'>+{</div><div class='add'>+	u32 retry_cnt;</div><div class='add'>+</div><div class='add'>+	union cvmx_pemx_ctl_status pemx_ctl;</div><div class='add'>+	pemx_ctl.u64 = cvmx_read_csr(CVMX_PEMX_CTL_STATUS(1));</div><div class='add'>+	retry_cnt =  pemx_ctl.s.cfg_rtry;</div><div class='add'>+	pemx_ctl.s.cfg_rtry = 0;</div><div class='add'>+	cvmx_write_csr(CVMX_PEMX_CTL_STATUS(1), pemx_ctl.u64);</div><div class='add'>+	return retry_cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int is_cfg_retry(void)</div><div class='add'>+{</div><div class='add'>+	union cvmx_pemx_int_sum pemx_int_sum;</div><div class='add'>+	pemx_int_sum.u64 = cvmx_read_csr(CVMX_PEMX_INT_SUM(1));</div><div class='add'>+	if (pemx_int_sum.s.crs_dr)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Read a value from configuration space</div><div class='ctx'>  *</div><div class='del'>- * @bus:</div><div class='del'>- * @devfn:</div><div class='del'>- * @reg:</div><div class='del'>- * @size:</div><div class='del'>- * @val:</div><div class='del'>- * Returns</div><div class='ctx'>  */</div><div class='del'>-static inline int octeon_pcie_read_config(int pcie_port, struct pci_bus *bus,</div><div class='del'>-					  unsigned int devfn, int reg, int size,</div><div class='del'>-					  u32 *val)</div><div class='add'>+static int octeon_pcie_read_config(unsigned int pcie_port, struct pci_bus *bus,</div><div class='add'>+				   unsigned int devfn, int reg, int size,</div><div class='add'>+				   u32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	union octeon_cvmemctl cvmmemctl;</div><div class='ctx'> 	union octeon_cvmemctl cvmmemctl_save;</div><div class='ctx'> 	int bus_number = bus-&gt;number;</div><div class='add'>+	int cfg_retry = 0;</div><div class='add'>+	int retry_cnt = 0;</div><div class='add'>+	int max_retry_cnt = 10;</div><div class='add'>+	u32 cfg_retry_cnt = 0;</div><div class='ctx'> </div><div class='add'>+	cvmmemctl_save.u64 = 0;</div><div class='add'>+	BUG_ON(pcie_port &gt;= ARRAY_SIZE(enable_pcie_bus_num_war));</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For the top level bus make sure our hardware bus number</div><div class='del'>-	 * matches the software one.</div><div class='add'>+	 * matches the software one</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (bus-&gt;parent == NULL) {</div><div class='del'>-		union cvmx_pciercx_cfg006 pciercx_cfg006;</div><div class='del'>-		pciercx_cfg006.u32 = cvmx_pcie_cfgx_read(pcie_port,</div><div class='del'>-			CVMX_PCIERCX_CFG006(pcie_port));</div><div class='del'>-		if (pciercx_cfg006.s.pbnum != bus_number) {</div><div class='del'>-			pciercx_cfg006.s.pbnum = bus_number;</div><div class='del'>-			pciercx_cfg006.s.sbnum = bus_number;</div><div class='del'>-			pciercx_cfg006.s.subbnum = bus_number;</div><div class='del'>-			cvmx_pcie_cfgx_write(pcie_port,</div><div class='del'>-				CVMX_PCIERCX_CFG006(pcie_port),</div><div class='del'>-				pciercx_cfg006.u32);</div><div class='add'>+		if (enable_pcie_bus_num_war[pcie_port])</div><div class='add'>+			bus_number = 0;</div><div class='add'>+		else {</div><div class='add'>+			union cvmx_pciercx_cfg006 pciercx_cfg006;</div><div class='add'>+			pciercx_cfg006.u32 = cvmx_pcie_cfgx_read(pcie_port,</div><div class='add'>+					     CVMX_PCIERCX_CFG006(pcie_port));</div><div class='add'>+			if (pciercx_cfg006.s.pbnum != bus_number) {</div><div class='add'>+				pciercx_cfg006.s.pbnum = bus_number;</div><div class='add'>+				pciercx_cfg006.s.sbnum = bus_number;</div><div class='add'>+				pciercx_cfg006.s.subbnum = bus_number;</div><div class='add'>+				cvmx_pcie_cfgx_write(pcie_port,</div><div class='add'>+					    CVMX_PCIERCX_CFG006(pcie_port),</div><div class='add'>+					    pciercx_cfg006.u32);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1116,29 +1605,52 @@ static inline int octeon_pcie_read_config(int pcie_port, struct pci_bus *bus,</div><div class='ctx'> 		 */</div><div class='ctx'> #if 1</div><div class='ctx'> 		/* Use this option if you aren't using either slot */</div><div class='del'>-		if (bus_number == 1)</div><div class='add'>+		if (bus_number == 2)</div><div class='ctx'> 			return PCIBIOS_FUNC_NOT_SUPPORTED;</div><div class='ctx'> #elif 0</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Use this option if you are using the first slot but</div><div class='ctx'> 		 * not the second.</div><div class='ctx'> 		 */</div><div class='del'>-		if ((bus_number == 1) &amp;&amp; (devfn &gt;&gt; 3 != 2))</div><div class='add'>+		if ((bus_number == 2) &amp;&amp; (devfn &gt;&gt; 3 != 2))</div><div class='ctx'> 			return PCIBIOS_FUNC_NOT_SUPPORTED;</div><div class='ctx'> #elif 0</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Use this option if you are using the second slot</div><div class='ctx'> 		 * but not the first.</div><div class='ctx'> 		 */</div><div class='del'>-		if ((bus_number == 1) &amp;&amp; (devfn &gt;&gt; 3 != 3))</div><div class='add'>+		if ((bus_number == 2) &amp;&amp; (devfn &gt;&gt; 3 != 3))</div><div class='ctx'> 			return PCIBIOS_FUNC_NOT_SUPPORTED;</div><div class='ctx'> #elif 0</div><div class='ctx'> 		/* Use this opion if you are using both slots */</div><div class='del'>-		if ((bus_number == 1) &amp;&amp;</div><div class='add'>+		if ((bus_number == 2) &amp;&amp;</div><div class='ctx'> 		    !((devfn == (2 &lt;&lt; 3)) || (devfn == (3 &lt;&lt; 3))))</div><div class='ctx'> 			return PCIBIOS_FUNC_NOT_SUPPORTED;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+		/* The following #if gives a more complicated example. This is</div><div class='add'>+		   the required checks for running a Nitrox CN16XX-NHBX in the</div><div class='add'>+		   slot of the EBH5600. This card has a PLX PCIe bridge with</div><div class='add'>+		   four Nitrox PLX parts behind it */</div><div class='add'>+#if 0</div><div class='add'>+		/* PLX bridge with 4 ports */</div><div class='add'>+		if ((bus_number == 4) &amp;&amp;</div><div class='add'>+		    !((devfn &gt;&gt; 3 &gt;= 1) &amp;&amp; (devfn &gt;&gt; 3 &lt;= 4)))</div><div class='add'>+			return PCIBIOS_FUNC_NOT_SUPPORTED;</div><div class='add'>+		/* Nitrox behind PLX 1 */</div><div class='add'>+		if ((bus_number == 5) &amp;&amp; (devfn &gt;&gt; 3 != 0))</div><div class='add'>+			return PCIBIOS_FUNC_NOT_SUPPORTED;</div><div class='add'>+		/* Nitrox behind PLX 2 */</div><div class='add'>+		if ((bus_number == 6) &amp;&amp; (devfn &gt;&gt; 3 != 0))</div><div class='add'>+			return PCIBIOS_FUNC_NOT_SUPPORTED;</div><div class='add'>+		/* Nitrox behind PLX 3 */</div><div class='add'>+		if ((bus_number == 7) &amp;&amp; (devfn &gt;&gt; 3 != 0))</div><div class='add'>+			return PCIBIOS_FUNC_NOT_SUPPORTED;</div><div class='add'>+		/* Nitrox behind PLX 4 */</div><div class='add'>+		if ((bus_number == 8) &amp;&amp; (devfn &gt;&gt; 3 != 0))</div><div class='add'>+			return PCIBIOS_FUNC_NOT_SUPPORTED;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Shorten the DID timeout so bus errors for PCIe</div><div class='ctx'> 		 * config reads from non existent devices happen</div><div class='hunk'>@@ -1152,26 +1664,48 @@ static inline int octeon_pcie_read_config(int pcie_port, struct pci_bus *bus,</div><div class='ctx'> 		__write_64bit_c0_register($11, 7, cvmmemctl.u64);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (size) {</div><div class='del'>-	case 4:</div><div class='del'>-		*val = cvmx_pcie_config_read32(pcie_port, bus_number,</div><div class='del'>-					       devfn &gt;&gt; 3, devfn &amp; 0x7, reg);</div><div class='add'>+	if ((OCTEON_IS_MODEL(OCTEON_CN63XX)) &amp;&amp; (enable_pcie_14459_war))</div><div class='add'>+		cfg_retry_cnt = disable_cfg_read_retry();</div><div class='add'>+</div><div class='add'>+	pr_debug("pcie_cfg_rd port=%d b=%d devfn=0x%03x reg=0x%03x"</div><div class='add'>+		 " size=%d ", pcie_port, bus_number, devfn, reg, size);</div><div class='add'>+	do {</div><div class='add'>+		switch (size) {</div><div class='add'>+		case 4:</div><div class='add'>+			*val = cvmx_pcie_config_read32(pcie_port, bus_number,</div><div class='add'>+				devfn &gt;&gt; 3, devfn &amp; 0x7, reg);</div><div class='ctx'> 		break;</div><div class='del'>-	case 2:</div><div class='del'>-		*val = cvmx_pcie_config_read16(pcie_port, bus_number,</div><div class='del'>-					       devfn &gt;&gt; 3, devfn &amp; 0x7, reg);</div><div class='add'>+		case 2:</div><div class='add'>+			*val = cvmx_pcie_config_read16(pcie_port, bus_number,</div><div class='add'>+				devfn &gt;&gt; 3, devfn &amp; 0x7, reg);</div><div class='ctx'> 		break;</div><div class='del'>-	case 1:</div><div class='del'>-		*val = cvmx_pcie_config_read8(pcie_port, bus_number, devfn &gt;&gt; 3,</div><div class='del'>-					      devfn &amp; 0x7, reg);</div><div class='add'>+		case 1:</div><div class='add'>+			*val = cvmx_pcie_config_read8(pcie_port, bus_number,</div><div class='add'>+				devfn &gt;&gt; 3, devfn &amp; 0x7, reg);</div><div class='ctx'> 		break;</div><div class='del'>-	default:</div><div class='del'>-		return PCIBIOS_FUNC_NOT_SUPPORTED;</div><div class='del'>-	}</div><div class='add'>+		default:</div><div class='add'>+			if (OCTEON_IS_MODEL(OCTEON_CN63XX))</div><div class='add'>+				set_cfg_read_retry(cfg_retry_cnt);</div><div class='add'>+			return PCIBIOS_FUNC_NOT_SUPPORTED;</div><div class='add'>+		}</div><div class='add'>+		if ((OCTEON_IS_MODEL(OCTEON_CN63XX)) &amp;&amp;</div><div class='add'>+			(enable_pcie_14459_war)) {</div><div class='add'>+			cfg_retry = is_cfg_retry();</div><div class='add'>+			retry_cnt++;</div><div class='add'>+			if (retry_cnt &gt; max_retry_cnt) {</div><div class='add'>+				pr_err(" pcie cfg_read retries failed. retry_cnt=%d\n",</div><div class='add'>+				       retry_cnt);</div><div class='add'>+				cfg_retry = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} while (cfg_retry);</div><div class='ctx'> </div><div class='add'>+	if ((OCTEON_IS_MODEL(OCTEON_CN63XX)) &amp;&amp; (enable_pcie_14459_war))</div><div class='add'>+		set_cfg_read_retry(cfg_retry_cnt);</div><div class='add'>+	pr_debug("val=%08x  : tries=%02d\n", *val, retry_cnt);</div><div class='ctx'> 	if (OCTEON_IS_MODEL(OCTEON_CN56XX_PASS1) ||</div><div class='ctx'> 	    OCTEON_IS_MODEL(OCTEON_CN56XX_PASS1_1))</div><div class='del'>-		__write_64bit_c0_register($11, 7, cvmmemctl_save.u64);</div><div class='add'>+		write_c0_cvmmemctl(cvmmemctl_save.u64);</div><div class='ctx'> 	return PCIBIOS_SUCCESSFUL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1187,42 +1721,56 @@ static int octeon_pcie1_read_config(struct pci_bus *bus, unsigned int devfn,</div><div class='ctx'> 	return octeon_pcie_read_config(1, bus, devfn, reg, size, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int octeon_dummy_read_config(struct pci_bus *bus, unsigned int devfn,</div><div class='add'>+				    int reg, int size, u32 *val)</div><div class='add'>+{</div><div class='add'>+	return PCIBIOS_FUNC_NOT_SUPPORTED;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Write a value to PCI configuration space</div><div class='del'>- *</div><div class='del'>- * @bus:</div><div class='del'>- * @devfn:</div><div class='del'>- * @reg:</div><div class='del'>- * @size:</div><div class='del'>- * @val:</div><div class='del'>- * Returns</div><div class='ctx'>  */</div><div class='del'>-static inline int octeon_pcie_write_config(int pcie_port, struct pci_bus *bus,</div><div class='del'>-					   unsigned int devfn, int reg,</div><div class='del'>-					   int size, u32 val)</div><div class='add'>+static int octeon_pcie_write_config(unsigned int pcie_port, struct pci_bus *bus,</div><div class='add'>+				    unsigned int devfn, int reg,</div><div class='add'>+				    int size, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	int bus_number = bus-&gt;number;</div><div class='ctx'> </div><div class='add'>+	BUG_ON(pcie_port &gt;= ARRAY_SIZE(enable_pcie_bus_num_war));</div><div class='add'>+</div><div class='add'>+	if ((bus-&gt;parent == NULL) &amp;&amp; (enable_pcie_bus_num_war[pcie_port]))</div><div class='add'>+		bus_number = 0;</div><div class='add'>+</div><div class='add'>+	pr_debug("pcie_cfg_wr port=%d b=%d devfn=0x%03x"</div><div class='add'>+		 " reg=0x%03x size=%d val=%08x\n", pcie_port, bus_number, devfn,</div><div class='add'>+		 reg, size, val);</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	switch (size) {</div><div class='ctx'> 	case 4:</div><div class='ctx'> 		cvmx_pcie_config_write32(pcie_port, bus_number, devfn &gt;&gt; 3,</div><div class='ctx'> 					 devfn &amp; 0x7, reg, val);</div><div class='del'>-		return PCIBIOS_SUCCESSFUL;</div><div class='add'>+		break;</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		cvmx_pcie_config_write16(pcie_port, bus_number, devfn &gt;&gt; 3,</div><div class='ctx'> 					 devfn &amp; 0x7, reg, val);</div><div class='del'>-		return PCIBIOS_SUCCESSFUL;</div><div class='add'>+		break;</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		cvmx_pcie_config_write8(pcie_port, bus_number, devfn &gt;&gt; 3,</div><div class='ctx'> 					devfn &amp; 0x7, reg, val);</div><div class='del'>-		return PCIBIOS_SUCCESSFUL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return PCIBIOS_FUNC_NOT_SUPPORTED;</div><div class='ctx'> 	}</div><div class='ctx'> #if PCI_CONFIG_SPACE_DELAY</div><div class='add'>+	/*</div><div class='add'>+	 * Delay on writes so that devices have time to come up. Some</div><div class='add'>+	 * bridges need this to allow time for the secondary busses to</div><div class='add'>+	 * work</div><div class='add'>+	 */</div><div class='ctx'> 	udelay(PCI_CONFIG_SPACE_DELAY);</div><div class='ctx'> #endif</div><div class='del'>-	return PCIBIOS_FUNC_NOT_SUPPORTED;</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int octeon_pcie0_write_config(struct pci_bus *bus, unsigned int devfn,</div><div class='hunk'>@@ -1237,6 +1785,12 @@ static int octeon_pcie1_write_config(struct pci_bus *bus, unsigned int devfn,</div><div class='ctx'> 	return octeon_pcie_write_config(1, bus, devfn, reg, size, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int octeon_dummy_write_config(struct pci_bus *bus, unsigned int devfn,</div><div class='add'>+				     int reg, int size, u32 val)</div><div class='add'>+{</div><div class='add'>+	return PCIBIOS_FUNC_NOT_SUPPORTED;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct pci_ops octeon_pcie0_ops = {</div><div class='ctx'> 	octeon_pcie0_read_config,</div><div class='ctx'> 	octeon_pcie0_write_config,</div><div class='hunk'>@@ -1279,6 +1833,35 @@ static struct pci_controller octeon_pcie1_controller = {</div><div class='ctx'> 	.io_resource = &amp;octeon_pcie1_io_resource,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct pci_ops octeon_dummy_ops = {</div><div class='add'>+	octeon_dummy_read_config,</div><div class='add'>+	octeon_dummy_write_config,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource octeon_dummy_mem_resource = {</div><div class='add'>+	.name = "Virtual PCIe MEM",</div><div class='add'>+	.flags = IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource octeon_dummy_io_resource = {</div><div class='add'>+	.name = "Virtual PCIe IO",</div><div class='add'>+	.flags = IORESOURCE_IO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pci_controller octeon_dummy_controller = {</div><div class='add'>+	.pci_ops = &amp;octeon_dummy_ops,</div><div class='add'>+	.mem_resource = &amp;octeon_dummy_mem_resource,</div><div class='add'>+	.io_resource = &amp;octeon_dummy_io_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int device_needs_bus_num_war(uint32_t deviceid)</div><div class='add'>+{</div><div class='add'>+#define IDT_VENDOR_ID 0x111d</div><div class='add'>+</div><div class='add'>+	if ((deviceid  &amp; 0xffff) == IDT_VENDOR_ID)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Initialize the Octeon PCIe controllers</div><div class='hunk'>@@ -1287,19 +1870,27 @@ static struct pci_controller octeon_pcie1_controller = {</div><div class='ctx'>  */</div><div class='ctx'> static int __init octeon_pcie_setup(void)</div><div class='ctx'> {</div><div class='del'>-	union cvmx_npei_ctl_status npei_ctl_status;</div><div class='ctx'> 	int result;</div><div class='add'>+	int host_mode;</div><div class='add'>+	int srio_war15205 = 0, port;</div><div class='add'>+	union cvmx_sli_ctl_portx sli_ctl_portx;</div><div class='add'>+	union cvmx_sriox_status_reg sriox_status_reg;</div><div class='ctx'> </div><div class='ctx'> 	/* These chips don't have PCIe */</div><div class='ctx'> 	if (!octeon_has_feature(OCTEON_FEATURE_PCIE))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/* No PCIe simulation */</div><div class='add'>+	if (octeon_is_simulation())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Disable PCI if instructed on the command line */</div><div class='add'>+	if (pcie_disable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* Point pcibios_map_irq() to the PCIe version of it */</div><div class='ctx'> 	octeon_pcibios_map_irq = octeon_pcie_pcibios_map_irq;</div><div class='ctx'> </div><div class='del'>-	/* Use the PCIe based DMA mappings */</div><div class='del'>-	octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_PCIE;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * PCIe I/O range. It is based on port 0 but includes up until</div><div class='ctx'> 	 * port 1's end.</div><div class='hunk'>@@ -1310,11 +1901,43 @@ static int __init octeon_pcie_setup(void)</div><div class='ctx'> 		cvmx_pcie_get_io_base_address(1) -</div><div class='ctx'> 		cvmx_pcie_get_io_base_address(0) + cvmx_pcie_get_io_size(1) - 1;</div><div class='ctx'> </div><div class='del'>-	npei_ctl_status.u64 = cvmx_read_csr(CVMX_PEXP_NPEI_CTL_STATUS);</div><div class='del'>-	if (npei_ctl_status.s.host_mode) {</div><div class='add'>+	/*</div><div class='add'>+	 * Create a dummy PCIe controller to swallow up bus 0. IDT bridges</div><div class='add'>+	 * don't work if the primary bus number is zero. Here we add a fake</div><div class='add'>+	 * PCIe controller that the kernel will give bus 0. This allows</div><div class='add'>+	 * us to not change the normal kernel bus enumeration</div><div class='add'>+	 */</div><div class='add'>+	octeon_dummy_controller.io_map_base = -1;</div><div class='add'>+	octeon_dummy_controller.mem_resource-&gt;start = (1ull&lt;&lt;48);</div><div class='add'>+	octeon_dummy_controller.mem_resource-&gt;end = (1ull&lt;&lt;48);</div><div class='add'>+	register_pci_controller(&amp;octeon_dummy_controller);</div><div class='add'>+</div><div class='add'>+	if (octeon_has_feature(OCTEON_FEATURE_NPEI)) {</div><div class='add'>+		union cvmx_npei_ctl_status npei_ctl_status;</div><div class='add'>+		npei_ctl_status.u64 = cvmx_read_csr(CVMX_PEXP_NPEI_CTL_STATUS);</div><div class='add'>+		host_mode = npei_ctl_status.s.host_mode;</div><div class='add'>+		octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_PCIE;</div><div class='add'>+	} else {</div><div class='add'>+		union cvmx_mio_rst_ctlx mio_rst_ctl;</div><div class='add'>+		mio_rst_ctl.u64 = cvmx_read_csr(CVMX_MIO_RST_CTLX(0));</div><div class='add'>+		host_mode = mio_rst_ctl.s.host_mode;</div><div class='add'>+		octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_PCIE2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (host_mode) {</div><div class='ctx'> 		pr_notice("PCIe: Initializing port 0\n");</div><div class='add'>+		/* CN63XX pass 1_x/2.0 errata PCIe-15205 */</div><div class='add'>+		if (OCTEON_IS_MODEL(OCTEON_CN63XX_PASS1_X) ||</div><div class='add'>+			OCTEON_IS_MODEL(OCTEON_CN63XX_PASS2_0)) {</div><div class='add'>+			sriox_status_reg.u64 = cvmx_read_csr(CVMX_SRIOX_STATUS_REG(0));</div><div class='add'>+			if (sriox_status_reg.s.srio) {</div><div class='add'>+				srio_war15205 += 1;      /* Port is SRIO */</div><div class='add'>+				port = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		result = cvmx_pcie_rc_initialize(0);</div><div class='ctx'> 		if (result == 0) {</div><div class='add'>+			uint32_t device0;</div><div class='ctx'> 			/* Memory offsets are physical addresses */</div><div class='ctx'> 			octeon_pcie0_controller.mem_offset =</div><div class='ctx'> 				cvmx_pcie_get_mem_base_address(0);</div><div class='hunk'>@@ -1343,60 +1966,134 @@ static int __init octeon_pcie_setup(void)</div><div class='ctx'> 			octeon_pcie0_controller.io_resource-&gt;start = 4 &lt;&lt; 10;</div><div class='ctx'> 			octeon_pcie0_controller.io_resource-&gt;end =</div><div class='ctx'> 				cvmx_pcie_get_io_size(0) - 1;</div><div class='add'>+			msleep(100); /* Some devices need extra time */</div><div class='ctx'> 			register_pci_controller(&amp;octeon_pcie0_controller);</div><div class='add'>+			device0 = cvmx_pcie_config_read32(0, 0, 0, 0, 0);</div><div class='add'>+			enable_pcie_bus_num_war[0] =</div><div class='add'>+				device_needs_bus_num_war(device0);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pr_notice("PCIe: Port 0 in endpoint mode, skipping.\n");</div><div class='add'>+		/* CN63XX pass 1_x/2.0 errata PCIe-15205 */</div><div class='add'>+		if (OCTEON_IS_MODEL(OCTEON_CN63XX_PASS1_X) ||</div><div class='add'>+			OCTEON_IS_MODEL(OCTEON_CN63XX_PASS2_0)) {</div><div class='add'>+			srio_war15205 += 1;</div><div class='add'>+			port = 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Skip the 2nd port on CN52XX if port 0 is in 4 lane mode */</div><div class='del'>-	if (OCTEON_IS_MODEL(OCTEON_CN52XX)) {</div><div class='del'>-		union cvmx_npei_dbg_data npei_dbg_data;</div><div class='del'>-		npei_dbg_data.u64 = cvmx_read_csr(CVMX_PEXP_NPEI_DBG_DATA);</div><div class='del'>-		if (npei_dbg_data.cn52xx.qlm0_link_width)</div><div class='del'>-			return 0;</div><div class='add'>+	if (octeon_has_feature(OCTEON_FEATURE_NPEI)) {</div><div class='add'>+		host_mode = 1;</div><div class='add'>+		/* Skip the 2nd port on CN52XX if port 0 is in 4 lane mode */</div><div class='add'>+		if (OCTEON_IS_MODEL(OCTEON_CN52XX)) {</div><div class='add'>+			union cvmx_npei_dbg_data dbg_data;</div><div class='add'>+			dbg_data.u64 = cvmx_read_csr(CVMX_PEXP_NPEI_DBG_DATA);</div><div class='add'>+			if (dbg_data.cn52xx.qlm0_link_width)</div><div class='add'>+				host_mode = 0;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		union cvmx_mio_rst_ctlx mio_rst_ctl;</div><div class='add'>+		mio_rst_ctl.u64 = cvmx_read_csr(CVMX_MIO_RST_CTLX(1));</div><div class='add'>+		host_mode = mio_rst_ctl.s.host_mode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_notice("PCIe: Initializing port 1\n");</div><div class='del'>-	result = cvmx_pcie_rc_initialize(1);</div><div class='del'>-	if (result == 0) {</div><div class='del'>-		/* Memory offsets are physical addresses */</div><div class='del'>-		octeon_pcie1_controller.mem_offset =</div><div class='del'>-			cvmx_pcie_get_mem_base_address(1);</div><div class='del'>-		/* IO offsets are Mips virtual addresses */</div><div class='del'>-		octeon_pcie1_controller.io_map_base =</div><div class='del'>-			CVMX_ADD_IO_SEG(cvmx_pcie_get_io_base_address(1));</div><div class='del'>-		octeon_pcie1_controller.io_offset =</div><div class='del'>-			cvmx_pcie_get_io_base_address(1) -</div><div class='del'>-			cvmx_pcie_get_io_base_address(0);</div><div class='del'>-		/*</div><div class='del'>-		 * To keep things similar to PCI, we start device</div><div class='del'>-		 * addresses at the same place as PCI uisng big bar</div><div class='del'>-		 * support. This normally translates to 4GB-256MB,</div><div class='del'>-		 * which is the same as most x86 PCs.</div><div class='del'>-		 */</div><div class='del'>-		octeon_pcie1_controller.mem_resource-&gt;start =</div><div class='del'>-			cvmx_pcie_get_mem_base_address(1) + (4ul &lt;&lt; 30) -</div><div class='del'>-			(OCTEON_PCI_BAR1_HOLE_SIZE &lt;&lt; 20);</div><div class='del'>-		octeon_pcie1_controller.mem_resource-&gt;end =</div><div class='del'>-			cvmx_pcie_get_mem_base_address(1) +</div><div class='del'>-			cvmx_pcie_get_mem_size(1) - 1;</div><div class='del'>-		/*</div><div class='del'>-		 * Ports must be above 16KB for the ISA bus filtering</div><div class='del'>-		 * in the PCI-X to PCI bridge.</div><div class='del'>-		 */</div><div class='del'>-		octeon_pcie1_controller.io_resource-&gt;start =</div><div class='del'>-			cvmx_pcie_get_io_base_address(1) -</div><div class='del'>-			cvmx_pcie_get_io_base_address(0);</div><div class='del'>-		octeon_pcie1_controller.io_resource-&gt;end =</div><div class='del'>-			octeon_pcie1_controller.io_resource-&gt;start +</div><div class='del'>-			cvmx_pcie_get_io_size(1) - 1;</div><div class='del'>-		register_pci_controller(&amp;octeon_pcie1_controller);</div><div class='add'>+	if (host_mode) {</div><div class='add'>+		pr_notice("PCIe: Initializing port 1\n");</div><div class='add'>+		/* CN63XX pass 1_x/2.0 errata PCIe-15205 */</div><div class='add'>+		if (OCTEON_IS_MODEL(OCTEON_CN63XX_PASS1_X) ||</div><div class='add'>+			OCTEON_IS_MODEL(OCTEON_CN63XX_PASS2_0)) {</div><div class='add'>+			sriox_status_reg.u64 = cvmx_read_csr(CVMX_SRIOX_STATUS_REG(1));</div><div class='add'>+			if (sriox_status_reg.s.srio) {</div><div class='add'>+				srio_war15205 += 1;      /* Port is SRIO */</div><div class='add'>+				port = 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		result = cvmx_pcie_rc_initialize(1);</div><div class='add'>+		if (result == 0) {</div><div class='add'>+			uint32_t device0;</div><div class='add'>+			/* Memory offsets are physical addresses */</div><div class='add'>+			octeon_pcie1_controller.mem_offset =</div><div class='add'>+				cvmx_pcie_get_mem_base_address(1);</div><div class='add'>+			/*</div><div class='add'>+			 * To calculate the address for accessing the 2nd PCIe device,</div><div class='add'>+			 * either 'io_map_base' (pci_iomap()), or 'mips_io_port_base'</div><div class='add'>+			 * (ioport_map()) value is added to</div><div class='add'>+			 * pci_resource_start(dev,bar)). The 'mips_io_port_base' is set</div><div class='add'>+			 * only once based on first PCIe. Also changing 'io_map_base'</div><div class='add'>+			 * based on first slot's value so that both the routines will</div><div class='add'>+			 * work properly.</div><div class='add'>+			 */</div><div class='add'>+			octeon_pcie1_controller.io_map_base =</div><div class='add'>+				CVMX_ADD_IO_SEG(cvmx_pcie_get_io_base_address(0));</div><div class='add'>+			/* IO offsets are Mips virtual addresses */</div><div class='add'>+			octeon_pcie1_controller.io_offset =</div><div class='add'>+				cvmx_pcie_get_io_base_address(1) -</div><div class='add'>+				cvmx_pcie_get_io_base_address(0);</div><div class='add'>+			/*</div><div class='add'>+			 * To keep things similar to PCI, we start device</div><div class='add'>+			 * addresses at the same place as PCI uisng big bar</div><div class='add'>+			 * support. This normally translates to 4GB-256MB,</div><div class='add'>+			 * which is the same as most x86 PCs.</div><div class='add'>+			 */</div><div class='add'>+			octeon_pcie1_controller.mem_resource-&gt;start =</div><div class='add'>+				cvmx_pcie_get_mem_base_address(1) + (4ul &lt;&lt; 30) -</div><div class='add'>+				(OCTEON_PCI_BAR1_HOLE_SIZE &lt;&lt; 20);</div><div class='add'>+			octeon_pcie1_controller.mem_resource-&gt;end =</div><div class='add'>+				cvmx_pcie_get_mem_base_address(1) +</div><div class='add'>+				cvmx_pcie_get_mem_size(1) - 1;</div><div class='add'>+			/*</div><div class='add'>+			 * Ports must be above 16KB for the ISA bus filtering</div><div class='add'>+			 * in the PCI-X to PCI bridge.</div><div class='add'>+			 */</div><div class='add'>+			octeon_pcie1_controller.io_resource-&gt;start =</div><div class='add'>+				cvmx_pcie_get_io_base_address(1) -</div><div class='add'>+				cvmx_pcie_get_io_base_address(0);</div><div class='add'>+			octeon_pcie1_controller.io_resource-&gt;end =</div><div class='add'>+				octeon_pcie1_controller.io_resource-&gt;start +</div><div class='add'>+				cvmx_pcie_get_io_size(1) - 1;</div><div class='add'>+			msleep(100); /* Some devices need extra time */</div><div class='add'>+			register_pci_controller(&amp;octeon_pcie1_controller);</div><div class='add'>+			device0 = cvmx_pcie_config_read32(1, 0, 0, 0, 0);</div><div class='add'>+			enable_pcie_bus_num_war[1] =</div><div class='add'>+				device_needs_bus_num_war(device0);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		pr_notice("PCIe: Port 1 not in root complex mode, skipping.\n");</div><div class='add'>+		/* CN63XX pass 1_x/2.0 errata PCIe-15205  */</div><div class='add'>+		if (OCTEON_IS_MODEL(OCTEON_CN63XX_PASS1_X) ||</div><div class='add'>+			OCTEON_IS_MODEL(OCTEON_CN63XX_PASS2_0)) {</div><div class='add'>+			srio_war15205 += 1;</div><div class='add'>+			port = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * CN63XX pass 1_x/2.0 errata PCIe-15205 requires setting all</div><div class='add'>+	 * of SRIO MACs SLI_CTL_PORT*[INT*_MAP] to similar value and</div><div class='add'>+	 * all of PCIe Macs SLI_CTL_PORT*[INT*_MAP] to different value</div><div class='add'>+	 * from the previous set values</div><div class='add'>+	 */</div><div class='add'>+	if (OCTEON_IS_MODEL(OCTEON_CN63XX_PASS1_X) ||</div><div class='add'>+		OCTEON_IS_MODEL(OCTEON_CN63XX_PASS2_0)) {</div><div class='add'>+		if (srio_war15205 == 1) {</div><div class='add'>+			sli_ctl_portx.u64 = cvmx_read_csr(CVMX_PEXP_SLI_CTL_PORTX(port));</div><div class='add'>+			sli_ctl_portx.s.inta_map = 1;</div><div class='add'>+			sli_ctl_portx.s.intb_map = 1;</div><div class='add'>+			sli_ctl_portx.s.intc_map = 1;</div><div class='add'>+			sli_ctl_portx.s.intd_map = 1;</div><div class='add'>+			cvmx_write_csr(CVMX_PEXP_SLI_CTL_PORTX(port), sli_ctl_portx.u64);</div><div class='add'>+</div><div class='add'>+			sli_ctl_portx.u64 = cvmx_read_csr(CVMX_PEXP_SLI_CTL_PORTX(!port));</div><div class='add'>+			sli_ctl_portx.s.inta_map = 0;</div><div class='add'>+			sli_ctl_portx.s.intb_map = 0;</div><div class='add'>+			sli_ctl_portx.s.intc_map = 0;</div><div class='add'>+			sli_ctl_portx.s.intd_map = 0;</div><div class='add'>+			cvmx_write_csr(CVMX_PEXP_SLI_CTL_PORTX(!port), sli_ctl_portx.u64);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	octeon_pci_dma_init();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> arch_initcall(octeon_pcie_setup);</div><div class='head'>diff --git a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c<br/>index c841f083a7f5..bb57ed9ea2bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c</a></div><div class='hunk'>@@ -149,7 +149,7 @@ static int msp_hwbutton_register(struct hwbutton_interrupt *hirq)</div><div class='ctx'> 		CIC_EXT_SET_ACTIVE_HI(cic_ext, hirq-&gt;eirq);</div><div class='ctx'> 	*CIC_EXT_CFG_REG = cic_ext;</div><div class='ctx'> </div><div class='del'>-	return request_irq(hirq-&gt;irq, hwbutton_handler, IRQF_DISABLED,</div><div class='add'>+	return request_irq(hirq-&gt;irq, hwbutton_handler, 0,</div><div class='ctx'> 			   hirq-&gt;name, hirq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/pmc-sierra/msp71xx/msp_setup.c b/arch/mips/pmc-sierra/msp71xx/msp_setup.c<br/>index 655308a4e1cd..7a834b2f8a5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/msp71xx/msp_setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pmc-sierra/msp71xx/msp_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/msp71xx/msp_setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pmc-sierra/msp71xx/msp_setup.c</a></div><div class='hunk'>@@ -209,7 +209,7 @@ void __init prom_init(void)</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* we don't recognize the machine */</div><div class='ctx'> 		mips_machtype  = MACH_UNKNOWN;</div><div class='del'>-		panic("***Bogosity factor five***, exiting\n");</div><div class='add'>+		panic("***Bogosity factor five***, exiting");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/pmc-sierra/msp71xx/msp_smp.c b/arch/mips/pmc-sierra/msp71xx/msp_smp.c<br/>index bec17901ff03..10170580a2de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/msp71xx/msp_smp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pmc-sierra/msp71xx/msp_smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/msp71xx/msp_smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pmc-sierra/msp71xx/msp_smp.c</a></div><div class='hunk'>@@ -51,13 +51,13 @@ static irqreturn_t ipi_call_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction irq_resched = {</div><div class='ctx'> 	.handler	= ipi_resched_interrupt,</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_PERCPU,</div><div class='add'>+	.flags		= IRQF_PERCPU,</div><div class='ctx'> 	.name		= "IPI_resched"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction irq_call = {</div><div class='ctx'> 	.handler	= ipi_call_interrupt,</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_PERCPU,</div><div class='add'>+	.flags		= IRQF_PERCPU,</div><div class='ctx'> 	.name		= "IPI_call"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/pnx8550/common/int.c b/arch/mips/pnx8550/common/int.c<br/>index 1ebe22bdadc8..ec684b8c3f79 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pnx8550/common/int.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pnx8550/common/int.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pnx8550/common/int.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pnx8550/common/int.c</a></div><div class='hunk'>@@ -167,13 +167,13 @@ static struct irq_chip level_irq_type = {</div><div class='ctx'> </div><div class='ctx'> static struct irqaction gic_action = {</div><div class='ctx'> 	.handler =	no_action,</div><div class='del'>-	.flags =	IRQF_DISABLED | IRQF_NO_THREAD,</div><div class='add'>+	.flags =	IRQF_NO_THREAD,</div><div class='ctx'> 	.name =		"GIC",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction timer_action = {</div><div class='ctx'> 	.handler =	no_action,</div><div class='del'>-	.flags =	IRQF_DISABLED | IRQF_TIMER,</div><div class='add'>+	.flags =	IRQF_TIMER,</div><div class='ctx'> 	.name =		"Timer",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/pnx8550/common/time.c b/arch/mips/pnx8550/common/time.c<br/>index 8836c6203df0..831d6b369e9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pnx8550/common/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/pnx8550/common/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pnx8550/common/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/pnx8550/common/time.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@ static irqreturn_t pnx8xxx_timer_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction pnx8xxx_timer_irq = {</div><div class='ctx'> 	.handler	= pnx8xxx_timer_interrupt,</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_PERCPU | IRQF_TIMER,</div><div class='add'>+	.flags		= IRQF_PERCPU | IRQF_TIMER,</div><div class='ctx'> 	.name		= "pnx8xxx_timer",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -72,7 +72,7 @@ static irqreturn_t monotonic_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction monotonic_irqaction = {</div><div class='ctx'> 	.handler = monotonic_interrupt,</div><div class='del'>-	.flags = IRQF_DISABLED | IRQF_TIMER,</div><div class='add'>+	.flags = IRQF_TIMER,</div><div class='ctx'> 	.name = "Monotonic timer",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/sgi-ip22/Makefile b/arch/mips/sgi-ip22/Makefile<br/>index cc538493cae1..411cda9ee030 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sgi-ip22/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/sgi-ip22/Makefile</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-y	+= ip22-mc.o ip22-hpc.o ip22-int.o ip22-time.o ip22-nvram.o \</div><div class='del'>-	   ip22-platform.o ip22-reset.o ip22-setup.o</div><div class='add'>+	   ip22-platform.o ip22-reset.o ip22-setup.o ip22-gio.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SGI_IP22) += ip22-berr.o</div><div class='ctx'> obj-$(CONFIG_SGI_IP28) += ip28-berr.o</div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-gio.c b/arch/mips/sgi-ip22/ip22-gio.c<br/>new file mode 100644<br/>index 000000000000..f5ebc092aed5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-gio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/sgi-ip22/ip22-gio.c</a></div><div class='hunk'>@@ -0,0 +1,428 @@</div><div class='add'>+#include &lt;linux/export.h&gt;</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/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/addrspace.h&gt;</div><div class='add'>+#include &lt;asm/paccess.h&gt;</div><div class='add'>+#include &lt;asm/gio_device.h&gt;</div><div class='add'>+#include &lt;asm/sgi/gio.h&gt;</div><div class='add'>+#include &lt;asm/sgi/hpc3.h&gt;</div><div class='add'>+#include &lt;asm/sgi/mc.h&gt;</div><div class='add'>+#include &lt;asm/sgi/ip22.h&gt;</div><div class='add'>+</div><div class='add'>+static struct bus_type gio_bus_type;</div><div class='add'>+</div><div class='add'>+static struct {</div><div class='add'>+	const char *name;</div><div class='add'>+	__u8       id;</div><div class='add'>+} gio_name_table[] = {</div><div class='add'>+	{ .name = "SGI Impact", .id = 0x10 },</div><div class='add'>+	{ .name = "Phobos G160", .id = 0x35 },</div><div class='add'>+	/* fake IDs */</div><div class='add'>+	{ .name = "SGI Newport", .id = 0x7e },</div><div class='add'>+	{ .name = "SGI GR2/GR3", .id = 0x7f },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct device gio_bus = {</div><div class='add'>+	.init_name = "gio",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * gio_match_device - Tell if an of_device structure has a matching</div><div class='add'>+ * gio_match structure</div><div class='add'>+ * @ids: array of of device match structures to search in</div><div class='add'>+ * @dev: the of device structure to match against</div><div class='add'>+ *</div><div class='add'>+ * Used by a driver to check whether an of_device present in the</div><div class='add'>+ * system is in its list of supported devices.</div><div class='add'>+ */</div><div class='add'>+const struct gio_device_id *gio_match_device(const struct gio_device_id *match,</div><div class='add'>+		     const struct gio_device *dev)</div><div class='add'>+{</div><div class='add'>+	const struct gio_device_id *ids;</div><div class='add'>+</div><div class='add'>+	for (ids = match; ids-&gt;id != 0xff; ids++)</div><div class='add'>+		if (ids-&gt;id == dev-&gt;id.id)</div><div class='add'>+			return ids;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(gio_match_device);</div><div class='add'>+</div><div class='add'>+struct gio_device *gio_dev_get(struct gio_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device *tmp;</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		return NULL;</div><div class='add'>+	tmp = get_device(&amp;dev-&gt;dev);</div><div class='add'>+	if (tmp)</div><div class='add'>+		return to_gio_device(tmp);</div><div class='add'>+	else</div><div class='add'>+		return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(gio_dev_get);</div><div class='add'>+</div><div class='add'>+void gio_dev_put(struct gio_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev)</div><div class='add'>+		put_device(&amp;dev-&gt;dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(gio_dev_put);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * gio_release_dev - free an gio device structure when all users of it are finished.</div><div class='add'>+ * @dev: device that's been disconnected</div><div class='add'>+ *</div><div class='add'>+ * Will be called only by the device core when all users of this gio device are</div><div class='add'>+ * done.</div><div class='add'>+ */</div><div class='add'>+void gio_release_dev(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct gio_device *giodev;</div><div class='add'>+</div><div class='add'>+	giodev = to_gio_device(dev);</div><div class='add'>+	kfree(giodev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(gio_release_dev);</div><div class='add'>+</div><div class='add'>+int gio_device_register(struct gio_device *giodev)</div><div class='add'>+{</div><div class='add'>+	giodev-&gt;dev.bus = &amp;gio_bus_type;</div><div class='add'>+	giodev-&gt;dev.parent = &amp;gio_bus;</div><div class='add'>+	return device_register(&amp;giodev-&gt;dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(gio_device_register);</div><div class='add'>+</div><div class='add'>+void gio_device_unregister(struct gio_device *giodev)</div><div class='add'>+{</div><div class='add'>+	device_unregister(&amp;giodev-&gt;dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(gio_device_unregister);</div><div class='add'>+</div><div class='add'>+static int gio_bus_match(struct device *dev, struct device_driver *drv)</div><div class='add'>+{</div><div class='add'>+	struct gio_device *gio_dev = to_gio_device(dev);</div><div class='add'>+	struct gio_driver *gio_drv = to_gio_driver(drv);</div><div class='add'>+</div><div class='add'>+	return gio_match_device(gio_drv-&gt;id_table, gio_dev) != NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gio_device_probe(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int error = -ENODEV;</div><div class='add'>+	struct gio_driver *drv;</div><div class='add'>+	struct gio_device *gio_dev;</div><div class='add'>+	const struct gio_device_id *match;</div><div class='add'>+</div><div class='add'>+	drv = to_gio_driver(dev-&gt;driver);</div><div class='add'>+	gio_dev = to_gio_device(dev);</div><div class='add'>+</div><div class='add'>+	if (!drv-&gt;probe)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	gio_dev_get(gio_dev);</div><div class='add'>+</div><div class='add'>+	match = gio_match_device(drv-&gt;id_table, gio_dev);</div><div class='add'>+	if (match)</div><div class='add'>+		error = drv-&gt;probe(gio_dev, match);</div><div class='add'>+	if (error)</div><div class='add'>+		gio_dev_put(gio_dev);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gio_device_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct gio_device *gio_dev = to_gio_device(dev);</div><div class='add'>+	struct gio_driver *drv = to_gio_driver(dev-&gt;driver);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;driver &amp;&amp; drv-&gt;remove)</div><div class='add'>+		drv-&gt;remove(gio_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gio_device_suspend(struct device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct gio_device *gio_dev = to_gio_device(dev);</div><div class='add'>+	struct gio_driver *drv = to_gio_driver(dev-&gt;driver);</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;driver &amp;&amp; drv-&gt;suspend)</div><div class='add'>+		error = drv-&gt;suspend(gio_dev, state);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gio_device_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct gio_device *gio_dev = to_gio_device(dev);</div><div class='add'>+	struct gio_driver *drv = to_gio_driver(dev-&gt;driver);</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;driver &amp;&amp; drv-&gt;resume)</div><div class='add'>+		error = drv-&gt;resume(gio_dev);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gio_device_shutdown(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct gio_device *gio_dev = to_gio_device(dev);</div><div class='add'>+	struct gio_driver *drv = to_gio_driver(dev-&gt;driver);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;driver &amp;&amp; drv-&gt;shutdown)</div><div class='add'>+		drv-&gt;shutdown(gio_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t modalias_show(struct device *dev, struct device_attribute *a,</div><div class='add'>+			     char *buf)</div><div class='add'>+{</div><div class='add'>+	struct gio_device *gio_dev = to_gio_device(dev);</div><div class='add'>+	int len = snprintf(buf, PAGE_SIZE, "gio:%x\n", gio_dev-&gt;id.id);</div><div class='add'>+</div><div class='add'>+	return (len &gt;= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t name_show(struct device *dev,</div><div class='add'>+			 struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct gio_device *giodev;</div><div class='add'>+</div><div class='add'>+	giodev = to_gio_device(dev);</div><div class='add'>+	return sprintf(buf, "%s", giodev-&gt;name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t id_show(struct device *dev,</div><div class='add'>+		       struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct gio_device *giodev;</div><div class='add'>+</div><div class='add'>+	giodev = to_gio_device(dev);</div><div class='add'>+	return sprintf(buf, "%x", giodev-&gt;id.id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_attribute gio_dev_attrs[] = {</div><div class='add'>+	__ATTR_RO(modalias),</div><div class='add'>+	__ATTR_RO(name),</div><div class='add'>+	__ATTR_RO(id),</div><div class='add'>+	__ATTR_NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int gio_device_uevent(struct device *dev, struct kobj_uevent_env *env)</div><div class='add'>+{</div><div class='add'>+	struct gio_device *gio_dev = to_gio_device(dev);</div><div class='add'>+</div><div class='add'>+	add_uevent_var(env, "MODALIAS=gio:%x", gio_dev-&gt;id.id);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int gio_register_driver(struct gio_driver *drv)</div><div class='add'>+{</div><div class='add'>+	/* initialize common driver fields */</div><div class='add'>+	if (!drv-&gt;driver.name)</div><div class='add'>+		drv-&gt;driver.name = drv-&gt;name;</div><div class='add'>+	if (!drv-&gt;driver.owner)</div><div class='add'>+		drv-&gt;driver.owner = drv-&gt;owner;</div><div class='add'>+	drv-&gt;driver.bus = &amp;gio_bus_type;</div><div class='add'>+</div><div class='add'>+	/* register with core */</div><div class='add'>+	return driver_register(&amp;drv-&gt;driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(gio_register_driver);</div><div class='add'>+</div><div class='add'>+void gio_unregister_driver(struct gio_driver *drv)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;drv-&gt;driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(gio_unregister_driver);</div><div class='add'>+</div><div class='add'>+void gio_set_master(struct gio_device *dev)</div><div class='add'>+{</div><div class='add'>+	u32 tmp = sgimc-&gt;giopar;</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;slotno) {</div><div class='add'>+	case 0:</div><div class='add'>+		tmp |= SGIMC_GIOPAR_MASTERGFX;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		tmp |= SGIMC_GIOPAR_MASTEREXP0;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		tmp |= SGIMC_GIOPAR_MASTEREXP1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	sgimc-&gt;giopar = tmp;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(gio_set_master);</div><div class='add'>+</div><div class='add'>+void ip22_gio_set_64bit(int slotno)</div><div class='add'>+{</div><div class='add'>+	u32 tmp = sgimc-&gt;giopar;</div><div class='add'>+</div><div class='add'>+	switch (slotno) {</div><div class='add'>+	case 0:</div><div class='add'>+		tmp |= SGIMC_GIOPAR_GFX64;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		tmp |= SGIMC_GIOPAR_EXP064;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		tmp |= SGIMC_GIOPAR_EXP164;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	sgimc-&gt;giopar = tmp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ip22_gio_id(unsigned long addr, u32 *res)</div><div class='add'>+{</div><div class='add'>+	u8 tmp8;</div><div class='add'>+	u8 tmp16;</div><div class='add'>+	u32 tmp32;</div><div class='add'>+	u8 *ptr8;</div><div class='add'>+	u16 *ptr16;</div><div class='add'>+	u32 *ptr32;</div><div class='add'>+</div><div class='add'>+	ptr32 = (void *)CKSEG1ADDR(addr);</div><div class='add'>+	if (!get_dbe(tmp32, ptr32)) {</div><div class='add'>+		/*</div><div class='add'>+		 * We got no DBE, but this doesn't mean anything.</div><div class='add'>+		 * If GIO is pipelined (which can't be disabled</div><div class='add'>+		 * for GFX slot) we don't get a DBE, but we see</div><div class='add'>+		 * the transfer size as data. So we do an 8bit</div><div class='add'>+		 * and a 16bit access and check whether the common</div><div class='add'>+		 * data matches</div><div class='add'>+		 */</div><div class='add'>+		ptr8 = (void *)CKSEG1ADDR(addr + 3);</div><div class='add'>+		get_dbe(tmp8, ptr8);</div><div class='add'>+		ptr16 = (void *)CKSEG1ADDR(addr + 2);</div><div class='add'>+		get_dbe(tmp16, ptr16);</div><div class='add'>+		if (tmp8 == (tmp16 &amp; 0xff) &amp;&amp;</div><div class='add'>+		    tmp8 == (tmp32 &amp; 0xff) &amp;&amp;</div><div class='add'>+		    tmp16 == (tmp32 &amp; 0xffff)) {</div><div class='add'>+			*res = tmp32;</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0; /* nothing here */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HQ2_MYSTERY_OFFS       0x6A07C</div><div class='add'>+#define NEWPORT_USTATUS_OFFS   0xF133C</div><div class='add'>+</div><div class='add'>+static int ip22_is_gr2(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	u32 *ptr;</div><div class='add'>+</div><div class='add'>+	/* HQ2 only allows 32bit accesses */</div><div class='add'>+	ptr = (void *)CKSEG1ADDR(addr + HQ2_MYSTERY_OFFS);</div><div class='add'>+	if (!get_dbe(tmp, ptr)) {</div><div class='add'>+		if (tmp == 0xdeadbeef)</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'>+static void ip22_check_gio(int slotno, unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	const char *name = "Unknown";</div><div class='add'>+	struct gio_device *gio_dev;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	__u8 id;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* first look for GR2/GR3 by checking mystery register */</div><div class='add'>+	if (ip22_is_gr2(addr))</div><div class='add'>+		tmp = 0x7f;</div><div class='add'>+	else {</div><div class='add'>+		if (!ip22_gio_id(addr, &amp;tmp)) {</div><div class='add'>+			/*</div><div class='add'>+			 * no GIO signature at start address of slot, but</div><div class='add'>+			 * Newport doesn't have one, so let's check usea</div><div class='add'>+			 * status register</div><div class='add'>+			 */</div><div class='add'>+			if (ip22_gio_id(addr + NEWPORT_USTATUS_OFFS, &amp;tmp))</div><div class='add'>+				tmp = 0x7e;</div><div class='add'>+			else</div><div class='add'>+				tmp = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (tmp) {</div><div class='add'>+		id = GIO_ID(tmp);</div><div class='add'>+		if (tmp &amp; GIO_32BIT_ID) {</div><div class='add'>+			if (tmp &amp; GIO_64BIT_IFACE)</div><div class='add'>+				ip22_gio_set_64bit(slotno);</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(gio_name_table); i++) {</div><div class='add'>+			if (id == gio_name_table[i].id) {</div><div class='add'>+				name = gio_name_table[i].name;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		printk(KERN_INFO "GIO: slot %d : %s (id %x)\n",</div><div class='add'>+		       slotno, name, id);</div><div class='add'>+		gio_dev = kzalloc(sizeof *gio_dev, GFP_KERNEL);</div><div class='add'>+		gio_dev-&gt;name = name;</div><div class='add'>+		gio_dev-&gt;slotno = slotno;</div><div class='add'>+		gio_dev-&gt;id.id = id;</div><div class='add'>+		gio_dev-&gt;resource.start = addr;</div><div class='add'>+		gio_dev-&gt;resource.end = addr + 0x3fffff;</div><div class='add'>+		gio_dev-&gt;resource.flags = IORESOURCE_MEM;</div><div class='add'>+		dev_set_name(&amp;gio_dev-&gt;dev, "%d", slotno);</div><div class='add'>+		gio_device_register(gio_dev);</div><div class='add'>+	} else</div><div class='add'>+		printk(KERN_INFO "GIO: slot %d : Empty\n", slotno);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bus_type gio_bus_type = {</div><div class='add'>+	.name      = "gio",</div><div class='add'>+	.dev_attrs = gio_dev_attrs,</div><div class='add'>+	.match     = gio_bus_match,</div><div class='add'>+	.probe     = gio_device_probe,</div><div class='add'>+	.remove    = gio_device_remove,</div><div class='add'>+	.suspend   = gio_device_suspend,</div><div class='add'>+	.resume    = gio_device_resume,</div><div class='add'>+	.shutdown  = gio_device_shutdown,</div><div class='add'>+	.uevent    = gio_device_uevent,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource gio_bus_resource = {</div><div class='add'>+	.start = GIO_SLOT_GFX_BASE,</div><div class='add'>+	.end   = GIO_SLOT_GFX_BASE + 0x9fffff,</div><div class='add'>+	.name  = "GIO Bus",</div><div class='add'>+	.flags = IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init ip22_gio_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int pbdma __maybe_unused;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = device_register(&amp;gio_bus);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = bus_register(&amp;gio_bus_type);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		request_resource(&amp;iomem_resource, &amp;gio_bus_resource);</div><div class='add'>+		printk(KERN_INFO "GIO: Probing bus...\n");</div><div class='add'>+</div><div class='add'>+		if (ip22_is_fullhouse() ||</div><div class='add'>+		    !get_dbe(pbdma, (unsigned int *)&amp;hpc3c1-&gt;pbdma[1])) {</div><div class='add'>+			/* Indigo2 and ChallengeS */</div><div class='add'>+			ip22_check_gio(0, GIO_SLOT_GFX_BASE);</div><div class='add'>+			ip22_check_gio(1, GIO_SLOT_EXP0_BASE);</div><div class='add'>+		} else {</div><div class='add'>+			/* Indy */</div><div class='add'>+			ip22_check_gio(0, GIO_SLOT_GFX_BASE);</div><div class='add'>+			ip22_check_gio(1, GIO_SLOT_EXP0_BASE);</div><div class='add'>+			ip22_check_gio(2, GIO_SLOT_EXP1_BASE);</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		device_unregister(&amp;gio_bus);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(ip22_gio_init);</div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c<br/>index f72c336ea27b..3f2b7633f946 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-int.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sgi-ip22/ip22-int.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-int.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/sgi-ip22/ip22-int.c</a></div><div class='hunk'>@@ -155,32 +155,32 @@ static void __irq_entry indy_buserror_irq(void)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction local0_cascade = {</div><div class='ctx'> 	.handler	= no_action,</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_NO_THREAD,</div><div class='add'>+	.flags		= IRQF_NO_THREAD,</div><div class='ctx'> 	.name		= "local0 cascade",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction local1_cascade = {</div><div class='ctx'> 	.handler	= no_action,</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_NO_THREAD,</div><div class='add'>+	.flags		= IRQF_NO_THREAD,</div><div class='ctx'> 	.name		= "local1 cascade",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction buserr = {</div><div class='ctx'> 	.handler	= no_action,</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_NO_THREAD,</div><div class='add'>+	.flags		= IRQF_NO_THREAD,</div><div class='ctx'> 	.name		= "Bus Error",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction map0_cascade = {</div><div class='ctx'> 	.handler	= no_action,</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_NO_THREAD,</div><div class='add'>+	.flags		= IRQF_NO_THREAD,</div><div class='ctx'> 	.name		= "mapable0 cascade",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef USE_LIO3_IRQ</div><div class='ctx'> static struct irqaction map1_cascade = {</div><div class='ctx'> 	.handler	= no_action,</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_NO_THREAD,</div><div class='add'>+	.flags		= IRQF_NO_THREAD,</div><div class='ctx'> 	.name		= "mapable1 cascade",</div><div class='ctx'> };</div><div class='ctx'> #define SGI_INTERRUPTS	SGINT_END</div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-mc.c b/arch/mips/sgi-ip22/ip22-mc.c<br/>index d22262ee6853..75ada8a9713b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-mc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sgi-ip22/ip22-mc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-mc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/sgi-ip22/ip22-mc.c</a></div><div class='hunk'>@@ -139,11 +139,11 @@ void __init sgimc_init(void)</div><div class='ctx'> 	 *         zero.</div><div class='ctx'> 	 */</div><div class='ctx'> 	/* don't touch parity settings for IP28 */</div><div class='del'>-#ifndef CONFIG_SGI_IP28</div><div class='ctx'> 	tmp = sgimc-&gt;cpuctrl0;</div><div class='del'>-	tmp |= (SGIMC_CCTRL0_EPERRGIO | SGIMC_CCTRL0_EPERRMEM |</div><div class='del'>-		SGIMC_CCTRL0_R4KNOCHKPARR);</div><div class='add'>+#ifndef CONFIG_SGI_IP28</div><div class='add'>+	tmp |= SGIMC_CCTRL0_EPERRGIO | SGIMC_CCTRL0_EPERRMEM;</div><div class='ctx'> #endif</div><div class='add'>+	tmp |= SGIMC_CCTRL0_R4KNOCHKPARR;</div><div class='ctx'> 	sgimc-&gt;cpuctrl0 = tmp;</div><div class='ctx'> </div><div class='ctx'> 	/* Step 3: Setup the MC write buffer depth, this is controlled</div><div class='hunk'>@@ -178,7 +178,8 @@ void __init sgimc_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	/* First the basic invariants across all GIO64 implementations. */</div><div class='del'>-	tmp = SGIMC_GIOPAR_HPC64;	/* All 1st HPC's interface at 64bits */</div><div class='add'>+	tmp = sgimc-&gt;giopar &amp; SGIMC_GIOPAR_GFX64; /* keep gfx 64bit settings */</div><div class='add'>+	tmp |= SGIMC_GIOPAR_HPC64;	/* All 1st HPC's interface at 64bits */</div><div class='ctx'> 	tmp |= SGIMC_GIOPAR_ONEBUS;	/* Only one physical GIO bus exists */</div><div class='ctx'> </div><div class='ctx'> 	if (ip22_is_fullhouse()) {</div><div class='hunk'>@@ -193,7 +194,6 @@ void __init sgimc_init(void)</div><div class='ctx'> 			tmp |= SGIMC_GIOPAR_PLINEEXP0;	/* exp[01] pipelined */</div><div class='ctx'> 			tmp |= SGIMC_GIOPAR_PLINEEXP1;</div><div class='ctx'> 			tmp |= SGIMC_GIOPAR_MASTEREISA;	/* EISA masters */</div><div class='del'>-			tmp |= SGIMC_GIOPAR_GFX64;	/* GFX at 64 bits */</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Guiness specific settings. */</div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-setup.c b/arch/mips/sgi-ip22/ip22-setup.c<br/>index 5e6621349471..c7bdfe43df5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sgi-ip22/ip22-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/sgi-ip22/ip22-setup.c</a></div><div class='hunk'>@@ -26,9 +26,6 @@</div><div class='ctx'> #include &lt;asm/sgi/hpc3.h&gt;</div><div class='ctx'> #include &lt;asm/sgi/ip22.h&gt;</div><div class='ctx'> </div><div class='del'>-unsigned long sgi_gfxaddr;</div><div class='del'>-EXPORT_SYMBOL_GPL(sgi_gfxaddr);</div><div class='del'>-</div><div class='ctx'> extern void ip22_be_init(void) __init;</div><div class='ctx'> </div><div class='ctx'> void __init plat_mem_setup(void)</div><div class='hunk'>@@ -78,22 +75,4 @@ void __init plat_mem_setup(void)</div><div class='ctx'> 		prom_flags |= PROM_FLAG_USE_AS_CONSOLE;</div><div class='ctx'> 		add_preferred_console("arc", 0, NULL);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_VT) &amp;&amp; defined(CONFIG_SGI_NEWPORT_CONSOLE)</div><div class='del'>-	{</div><div class='del'>-		ULONG *gfxinfo;</div><div class='del'>-		ULONG * (*__vec)(void) = (void *) (long)</div><div class='del'>-			*((_PULONG *)(long)((PROMBLOCK)-&gt;pvector + 0x20));</div><div class='del'>-</div><div class='del'>-		gfxinfo = __vec();</div><div class='del'>-		sgi_gfxaddr = ((gfxinfo[1] &gt;= 0xa0000000</div><div class='del'>-			       &amp;&amp; gfxinfo[1] &lt;= 0xc0000000)</div><div class='del'>-			       ? gfxinfo[1] - 0xa0000000 : 0);</div><div class='del'>-</div><div class='del'>-		/* newport addresses? */</div><div class='del'>-		if (sgi_gfxaddr == 0x1f0f0000 || sgi_gfxaddr == 0x1f4f0000) {</div><div class='del'>-			conswitchp = &amp;newport_con;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/sgi-ip27/Kconfig b/arch/mips/sgi-ip27/Kconfig<br/>index bc5e9769bb73..4b2ea282b9c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sgi-ip27/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/sgi-ip27/Kconfig</a></div><div class='hunk'>@@ -1,9 +1,3 @@</div><div class='del'>-#config SGI_SN0_XXL</div><div class='del'>-#	bool "IP27 XXL"</div><div class='del'>-#	depends on SGI_IP27</div><div class='del'>-#	  This options adds support for userspace processes up to 16TB size.</div><div class='del'>-#	  Normally the limit is just .5TB.</div><div class='del'>-</div><div class='ctx'> choice</div><div class='ctx'> 	prompt "Node addressing mode"</div><div class='ctx'> 	depends on SGI_IP27</div><div class='head'>diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c<br/>index f90dce315e04..23642238c689 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sgi-ip27/ip27-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/sgi-ip27/ip27-irq.c</a></div><div class='hunk'>@@ -73,7 +73,7 @@ static inline int alloc_level(int cpu, int irq)</div><div class='ctx'> </div><div class='ctx'> 	level = find_first_zero_bit(hub-&gt;irq_alloc_mask, LEVELS_PER_SLICE);</div><div class='ctx'> 	if (level &gt;= LEVELS_PER_SLICE)</div><div class='del'>-		panic("Cpu %d flooded with devices\n", cpu);</div><div class='add'>+		panic("Cpu %d flooded with devices", cpu);</div><div class='ctx'> </div><div class='ctx'> 	__set_bit(level, hub-&gt;irq_alloc_mask);</div><div class='ctx'> 	si-&gt;level_to_irq[level] = irq;</div><div class='hunk'>@@ -96,7 +96,7 @@ static inline int find_level(cpuid_t *cpunum, int irq)</div><div class='ctx'> 			}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	panic("Could not identify cpu/level for irq %d\n", irq);</div><div class='add'>+	panic("Could not identify cpu/level for irq %d", irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -116,7 +116,7 @@ static int ms1bit(unsigned long x)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This code is unnecessarily complex, because we do IRQF_DISABLED</div><div class='add'>+ * This code is unnecessarily complex, because we do</div><div class='ctx'>  * intr enabling. Basically, once we grab the set of intrs we need</div><div class='ctx'>  * to service, we must mask _all_ these interrupts; firstly, to make</div><div class='ctx'>  * sure the same intr does not intr again, causing recursion that</div><div class='head'>diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c<br/>index ef74f3267f91..13cfeab50528 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-timer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sgi-ip27/ip27-timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/sgi-ip27/ip27-timer.c</a></div><div class='hunk'>@@ -91,7 +91,7 @@ static irqreturn_t hub_rt_counter_handler(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> struct irqaction hub_rt_irqaction = {</div><div class='ctx'> 	.handler	= hub_rt_counter_handler,</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_PERCPU | IRQF_TIMER,</div><div class='add'>+	.flags		= IRQF_PERCPU | IRQF_TIMER,</div><div class='ctx'> 	.name		= "hub-rt",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c<br/>index c65ea76d56c7..a092860d5196 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip32/ip32-irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sgi-ip32/ip32-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip32/ip32-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/sgi-ip32/ip32-irq.c</a></div><div class='hunk'>@@ -113,13 +113,11 @@ extern irqreturn_t crime_cpuerr_intr(int irq, void *dev_id);</div><div class='ctx'> </div><div class='ctx'> static struct irqaction memerr_irq = {</div><div class='ctx'> 	.handler = crime_memerr_intr,</div><div class='del'>-	.flags = IRQF_DISABLED,</div><div class='ctx'> 	.name = "CRIME memory error",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction cpuerr_irq = {</div><div class='ctx'> 	.handler = crime_cpuerr_intr,</div><div class='del'>-	.flags = IRQF_DISABLED,</div><div class='ctx'> 	.name = "CRIME CPU error",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/sibyte/Kconfig b/arch/mips/sibyte/Kconfig<br/>index 3e639bda43f7..3cd937e0e9a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sibyte/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sibyte/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sibyte/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/sibyte/Kconfig</a></div><div class='hunk'>@@ -71,7 +71,6 @@ config SIBYTE_SB1xxx_SOC</div><div class='ctx'> 	bool</div><div class='ctx'> 	select DMA_COHERENT</div><div class='ctx'> 	select IRQ_CPU</div><div class='del'>-	select SIBYTE_CFE</div><div class='ctx'> 	select SWAP_IO_SPACE</div><div class='ctx'> 	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_64BIT_KERNEL</div><div class='head'>diff --git a/arch/mips/sni/irq.c b/arch/mips/sni/irq.c<br/>index e8e72bb3a9af..5a4ec75382e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sni/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sni/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sni/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/sni/irq.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@ static irqreturn_t sni_isa_irq_handler(int dummy, void *p)</div><div class='ctx'> struct irqaction sni_isa_irq = {</div><div class='ctx'> 	.handler = sni_isa_irq_handler,</div><div class='ctx'> 	.name = "ISA",</div><div class='del'>-	.flags = IRQF_SHARED | IRQF_DISABLED</div><div class='add'>+	.flags = IRQF_SHARED</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/mips/sni/time.c b/arch/mips/sni/time.c<br/>index ec0be14996a4..494c9e7847aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sni/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/sni/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sni/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/sni/time.c</a></div><div class='hunk'>@@ -68,7 +68,7 @@ static irqreturn_t a20r_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction a20r_irqaction = {</div><div class='ctx'> 	.handler	= a20r_interrupt,</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_PERCPU | IRQF_TIMER,</div><div class='add'>+	.flags		= IRQF_PERCPU | IRQF_TIMER,</div><div class='ctx'> 	.name		= "a20r-timer",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/txx9/generic/7segled.c b/arch/mips/txx9/generic/7segled.c<br/>index 7f8416f86222..8e93b2122524 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/7segled.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/txx9/generic/7segled.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/7segled.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/txx9/generic/7segled.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  * (C) Copyright TOSHIBA CORPORATION 2005-2007</div><div class='ctx'>  * All Rights Reserved.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/map_to_7segment.h&gt;</div><div class='ctx'> #include &lt;asm/txx9/generic.h&gt;</div><div class='hunk'>@@ -37,8 +37,8 @@ int txx9_7segled_putc(unsigned int pos, char c)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t ascii_store(struct sys_device *dev,</div><div class='del'>-			   struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t ascii_store(struct device *dev,</div><div class='add'>+			   struct device_attribute *attr,</div><div class='ctx'> 			   const char *buf, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int ch = dev-&gt;id;</div><div class='hunk'>@@ -46,8 +46,8 @@ static ssize_t ascii_store(struct sys_device *dev,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t raw_store(struct sys_device *dev,</div><div class='del'>-			 struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t raw_store(struct device *dev,</div><div class='add'>+			 struct device_attribute *attr,</div><div class='ctx'> 			 const char *buf, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int ch = dev-&gt;id;</div><div class='hunk'>@@ -55,19 +55,19 @@ static ssize_t raw_store(struct sys_device *dev,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(ascii, 0200, NULL, ascii_store);</div><div class='del'>-static SYSDEV_ATTR(raw, 0200, NULL, raw_store);</div><div class='add'>+static DEVICE_ATTR(ascii, 0200, NULL, ascii_store);</div><div class='add'>+static DEVICE_ATTR(raw, 0200, NULL, raw_store);</div><div class='ctx'> </div><div class='del'>-static ssize_t map_seg7_show(struct sysdev_class *class,</div><div class='del'>-			     struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t map_seg7_show(struct device *dev,</div><div class='add'>+			     struct device_attribute *attr,</div><div class='ctx'> 			     char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(buf, &amp;txx9_seg7map, sizeof(txx9_seg7map));</div><div class='ctx'> 	return sizeof(txx9_seg7map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t map_seg7_store(struct sysdev_class *class,</div><div class='del'>-			      struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t map_seg7_store(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr,</div><div class='ctx'> 			      const char *buf, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	if (size != sizeof(txx9_seg7map))</div><div class='hunk'>@@ -76,10 +76,11 @@ static ssize_t map_seg7_store(struct sysdev_class *class,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(map_seg7, 0600, map_seg7_show, map_seg7_store);</div><div class='add'>+static DEVICE_ATTR(map_seg7, 0600, map_seg7_show, map_seg7_store);</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class tx_7segled_sysdev_class = {</div><div class='del'>-	.name	= "7segled",</div><div class='add'>+static struct bus_type tx_7segled_subsys = {</div><div class='add'>+	.name		= "7segled",</div><div class='add'>+	.dev_name	= "7segled",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init tx_7segled_init_sysfs(void)</div><div class='hunk'>@@ -87,26 +88,25 @@ static int __init tx_7segled_init_sysfs(void)</div><div class='ctx'> 	int error, i;</div><div class='ctx'> 	if (!tx_7segled_num)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	error = sysdev_class_register(&amp;tx_7segled_sysdev_class);</div><div class='add'>+	error = subsys_system_register(&amp;tx_7segled_subsys, NULL);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='del'>-	error = sysdev_class_create_file(&amp;tx_7segled_sysdev_class,</div><div class='del'>-					 &amp;attr_map_seg7);</div><div class='add'>+	error = device_create_file(tx_7segled_subsys.dev_root, &amp;dev_attr_map_seg7);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	for (i = 0; i &lt; tx_7segled_num; i++) {</div><div class='del'>-		struct sys_device *dev;</div><div class='add'>+		struct device *dev;</div><div class='ctx'> 		dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='ctx'> 		if (!dev) {</div><div class='ctx'> 			error = -ENODEV;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		dev-&gt;id = i;</div><div class='del'>-		dev-&gt;cls = &amp;tx_7segled_sysdev_class;</div><div class='del'>-		error = sysdev_register(dev);</div><div class='add'>+		dev-&gt;dev = &amp;tx_7segled_subsys;</div><div class='add'>+		error = device_register(dev);</div><div class='ctx'> 		if (!error) {</div><div class='del'>-			sysdev_create_file(dev, &amp;attr_ascii);</div><div class='del'>-			sysdev_create_file(dev, &amp;attr_raw);</div><div class='add'>+			device_create_file(dev, &amp;dev_attr_ascii);</div><div class='add'>+			device_create_file(dev, &amp;dev_attr_raw);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return error;</div><div class='head'>diff --git a/arch/mips/txx9/generic/pci.c b/arch/mips/txx9/generic/pci.c<br/>index 85a87de17eb4..682efb0c108d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/txx9/generic/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/txx9/generic/pci.c</a></div><div class='hunk'>@@ -262,7 +262,7 @@ txx9_i8259_irq_setup(int irq)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	init_i8259_irqs();</div><div class='del'>-	err = request_irq(irq, &amp;i8259_interrupt, IRQF_DISABLED|IRQF_SHARED,</div><div class='add'>+	err = request_irq(irq, &amp;i8259_interrupt, IRQF_SHARED,</div><div class='ctx'> 			  "cascade(i8259)", (void *)(long)irq);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		printk(KERN_INFO "PCI-ISA bridge PIC (irq %d)\n", irq);</div><div class='head'>diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c<br/>index ec38e00b2559..ae77a7916c03 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/txx9/generic/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/txx9/generic/setup.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='hunk'>@@ -897,10 +897,13 @@ void __init txx9_aclc_init(unsigned long baseaddr, int irq,</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class txx9_sramc_sysdev_class;</div><div class='add'>+static struct bus_type txx9_sramc_subsys = {</div><div class='add'>+	.name = "txx9_sram",</div><div class='add'>+	.dev_name = "txx9_sram",</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-struct txx9_sramc_sysdev {</div><div class='del'>-	struct sys_device dev;</div><div class='add'>+struct txx9_sramc_dev {</div><div class='add'>+	struct device dev;</div><div class='ctx'> 	struct bin_attribute bindata_attr;</div><div class='ctx'> 	void __iomem *base;</div><div class='ctx'> };</div><div class='hunk'>@@ -909,7 +912,7 @@ static ssize_t txx9_sram_read(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 			      struct bin_attribute *bin_attr,</div><div class='ctx'> 			      char *buf, loff_t pos, size_t size)</div><div class='ctx'> {</div><div class='del'>-	struct txx9_sramc_sysdev *dev = bin_attr-&gt;private;</div><div class='add'>+	struct txx9_sramc_dev *dev = bin_attr-&gt;private;</div><div class='ctx'> 	size_t ramsize = bin_attr-&gt;size;</div><div class='ctx'> </div><div class='ctx'> 	if (pos &gt;= ramsize)</div><div class='hunk'>@@ -924,7 +927,7 @@ static ssize_t txx9_sram_write(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 			       struct bin_attribute *bin_attr,</div><div class='ctx'> 			       char *buf, loff_t pos, size_t size)</div><div class='ctx'> {</div><div class='del'>-	struct txx9_sramc_sysdev *dev = bin_attr-&gt;private;</div><div class='add'>+	struct txx9_sramc_dev *dev = bin_attr-&gt;private;</div><div class='ctx'> 	size_t ramsize = bin_attr-&gt;size;</div><div class='ctx'> </div><div class='ctx'> 	if (pos &gt;= ramsize)</div><div class='hunk'>@@ -937,18 +940,13 @@ static ssize_t txx9_sram_write(struct file *filp, struct kobject *kobj,</div><div class='ctx'> </div><div class='ctx'> void __init txx9_sramc_init(struct resource *r)</div><div class='ctx'> {</div><div class='del'>-	struct txx9_sramc_sysdev *dev;</div><div class='add'>+	struct txx9_sramc_dev *dev;</div><div class='ctx'> 	size_t size;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!txx9_sramc_sysdev_class.name) {</div><div class='del'>-		txx9_sramc_sysdev_class.name = "txx9_sram";</div><div class='del'>-		err = sysdev_class_register(&amp;txx9_sramc_sysdev_class);</div><div class='del'>-		if (err) {</div><div class='del'>-			txx9_sramc_sysdev_class.name = NULL;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	err = subsys_system_register(&amp;txx9_sramc_subsys, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		return;</div><div class='ctx'> 	dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -956,7 +954,7 @@ void __init txx9_sramc_init(struct resource *r)</div><div class='ctx'> 	dev-&gt;base = ioremap(r-&gt;start, size);</div><div class='ctx'> 	if (!dev-&gt;base)</div><div class='ctx'> 		goto exit;</div><div class='del'>-	dev-&gt;dev.cls = &amp;txx9_sramc_sysdev_class;</div><div class='add'>+	dev-&gt;dev.bus = &amp;txx9_sramc_subsys;</div><div class='ctx'> 	sysfs_bin_attr_init(&amp;dev-&gt;bindata_attr);</div><div class='ctx'> 	dev-&gt;bindata_attr.attr.name = "bindata";</div><div class='ctx'> 	dev-&gt;bindata_attr.attr.mode = S_IRUSR | S_IWUSR;</div><div class='hunk'>@@ -964,12 +962,12 @@ void __init txx9_sramc_init(struct resource *r)</div><div class='ctx'> 	dev-&gt;bindata_attr.write = txx9_sram_write;</div><div class='ctx'> 	dev-&gt;bindata_attr.size = size;</div><div class='ctx'> 	dev-&gt;bindata_attr.private = dev;</div><div class='del'>-	err = sysdev_register(&amp;dev-&gt;dev);</div><div class='add'>+	err = device_register(&amp;dev-&gt;dev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	err = sysfs_create_bin_file(&amp;dev-&gt;dev.kobj, &amp;dev-&gt;bindata_attr);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		sysdev_unregister(&amp;dev-&gt;dev);</div><div class='add'>+		device_unregister(&amp;dev-&gt;dev);</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> 	return;</div><div class='head'>diff --git a/arch/mips/txx9/generic/setup_tx4939.c b/arch/mips/txx9/generic/setup_tx4939.c<br/>index ba3cec3155df..6567895d1f59 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/setup_tx4939.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mips/txx9/generic/setup_tx4939.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/txx9/generic/setup_tx4939.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mips/txx9/generic/setup_tx4939.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='head'>diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig<br/>index 438db84a1f7c..8f1c40d5817e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mn10300/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mn10300/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mn10300/Kconfig</a></div><div class='hunk'>@@ -252,6 +252,7 @@ config PCI</div><div class='ctx'> 	bool "Use PCI"</div><div class='ctx'> 	depends on MN10300_UNIT_ASB2305</div><div class='ctx'> 	default y</div><div class='add'>+	select GENERIC_PCI_IOMAP</div><div class='ctx'> 	help</div><div class='ctx'> 	  Some systems (such as the ASB2305) have PCI onboard. If you have one</div><div class='ctx'> 	  of these boards and you wish to use the PCI facilities, say Y here.</div><div class='head'>diff --git a/arch/mn10300/include/asm/exceptions.h b/arch/mn10300/include/asm/exceptions.h<br/>index ca3e20508c77..95a4d42c3a06 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mn10300/include/asm/exceptions.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/include/asm/exceptions.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mn10300/include/asm/exceptions.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mn10300/include/asm/exceptions.h</a></div><div class='hunk'>@@ -110,7 +110,7 @@ extern asmlinkage void nmi_handler(void);</div><div class='ctx'> extern asmlinkage void misalignment(struct pt_regs *, enum exception_code);</div><div class='ctx'> </div><div class='ctx'> extern void die(const char *, struct pt_regs *, enum exception_code)</div><div class='del'>-	ATTRIB_NORET;</div><div class='add'>+	__noreturn;</div><div class='ctx'> </div><div class='ctx'> extern int die_if_no_fixup(const char *, struct pt_regs *, enum exception_code);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mn10300/include/asm/io.h b/arch/mn10300/include/asm/io.h<br/>index 787255da744e..139df8c53de8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mn10300/include/asm/io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/include/asm/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mn10300/include/asm/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mn10300/include/asm/io.h</a></div><div class='hunk'>@@ -229,7 +229,6 @@ static inline void outsl(unsigned long addr, const void *buffer, int count)</div><div class='ctx'> </div><div class='ctx'> /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */</div><div class='ctx'> struct pci_dev;</div><div class='del'>-extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);</div><div class='ctx'> static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='hunk'>@@ -251,15 +250,15 @@ static inline void *phys_to_virt(unsigned long address)</div><div class='ctx'> /*</div><div class='ctx'>  * Change "struct page" to physical address.</div><div class='ctx'>  */</div><div class='del'>-static inline void *__ioremap(unsigned long offset, unsigned long size,</div><div class='del'>-			      unsigned long flags)</div><div class='add'>+static inline void __iomem *__ioremap(unsigned long offset, unsigned long size,</div><div class='add'>+				      unsigned long flags)</div><div class='ctx'> {</div><div class='del'>-	return (void *) offset;</div><div class='add'>+	return (void __iomem *) offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *ioremap(unsigned long offset, unsigned long size)</div><div class='add'>+static inline void __iomem *ioremap(unsigned long offset, unsigned long size)</div><div class='ctx'> {</div><div class='del'>-	return (void *) offset;</div><div class='add'>+	return (void __iomem *) offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -267,14 +266,14 @@ static inline void *ioremap(unsigned long offset, unsigned long size)</div><div class='ctx'>  * area.  it's useful if some control registers are in such an area and write</div><div class='ctx'>  * combining or read caching is not desirable:</div><div class='ctx'>  */</div><div class='del'>-static inline void *ioremap_nocache(unsigned long offset, unsigned long size)</div><div class='add'>+static inline void __iomem *ioremap_nocache(unsigned long offset, unsigned long size)</div><div class='ctx'> {</div><div class='del'>-	return (void *) (offset | 0x20000000);</div><div class='add'>+	return (void __iomem *) (offset | 0x20000000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define ioremap_wc ioremap_nocache</div><div class='ctx'> </div><div class='del'>-static inline void iounmap(void *addr)</div><div class='add'>+static inline void iounmap(void __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mn10300/include/asm/ipcbuf.h b/arch/mn10300/include/asm/ipcbuf.h<br/>index f6f63d448272..84c7e51cb6d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mn10300/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/include/asm/ipcbuf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mn10300/include/asm/ipcbuf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mn10300/include/asm/ipcbuf.h</a></div><div class='hunk'>@@ -1,29 +1 @@</div><div class='del'>-#ifndef _ASM_IPCBUF_H</div><div class='del'>-#define _ASM_IPCBUF_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The ipc64_perm structure for MN10300 architecture.</div><div class='del'>- * Note extra padding because this structure is passed back and forth</div><div class='del'>- * between kernel and user space.</div><div class='del'>- *</div><div class='del'>- * Pad space is left for:</div><div class='del'>- * - 32-bit mode_t and seq</div><div class='del'>- * - 2 miscellaneous 32-bit values</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct ipc64_perm</div><div class='del'>-{</div><div class='del'>-	__kernel_key_t		key;</div><div class='del'>-	__kernel_uid32_t	uid;</div><div class='del'>-	__kernel_gid32_t	gid;</div><div class='del'>-	__kernel_uid32_t	cuid;</div><div class='del'>-	__kernel_gid32_t	cgid;</div><div class='del'>-	__kernel_mode_t		mode;</div><div class='del'>-	unsigned short		__pad1;</div><div class='del'>-	unsigned short		seq;</div><div class='del'>-	unsigned short		__pad2;</div><div class='del'>-	unsigned long		__unused1;</div><div class='del'>-	unsigned long		__unused2;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_IPCBUF_H */</div><div class='add'>+#include &lt;asm-generic/ipcbuf.h&gt;</div><div class='head'>diff --git a/arch/mn10300/include/asm/param.h b/arch/mn10300/include/asm/param.h<br/>index 789b1df41fcb..02a0ca6f13ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mn10300/include/asm/param.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/include/asm/param.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mn10300/include/asm/param.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mn10300/include/asm/param.h</a></div><div class='hunk'>@@ -11,24 +11,8 @@</div><div class='ctx'> #ifndef _ASM_PARAM_H</div><div class='ctx'> #define _ASM_PARAM_H</div><div class='ctx'> </div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-#define HZ		CONFIG_HZ	/* Internal kernel timer frequency */</div><div class='del'>-#define USER_HZ		100		/* .. some user interfaces are in</div><div class='del'>-					 * "ticks" */</div><div class='del'>-#define CLOCKS_PER_SEC	(USER_HZ)	/* like times() */</div><div class='del'>-#endif</div><div class='add'>+#include &lt;asm-generic/param.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef HZ</div><div class='del'>-#define HZ		100</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define EXEC_PAGESIZE	4096</div><div class='del'>-</div><div class='del'>-#ifndef NOGROUP</div><div class='del'>-#define NOGROUP		(-1)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define MAXHOSTNAMELEN	64	/* max length of hostname */</div><div class='ctx'> #define COMMAND_LINE_SIZE 256</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_PARAM_H */</div><div class='head'>diff --git a/arch/mn10300/include/asm/socket.h b/arch/mn10300/include/asm/socket.h<br/>index 4e60c4281288..876356d78522 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mn10300/include/asm/socket.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/include/asm/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mn10300/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mn10300/include/asm/socket.h</a></div><div class='hunk'>@@ -62,4 +62,7 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_RXQ_OVFL             40</div><div class='ctx'> </div><div class='add'>+#define SO_WIFI_STATUS		41</div><div class='add'>+#define SCM_WIFI_STATUS		SO_WIFI_STATUS</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_SOCKET_H */</div><div class='head'>diff --git a/arch/mn10300/include/asm/thread_info.h b/arch/mn10300/include/asm/thread_info.h<br/>index 87c213002d4c..28cf52100baa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mn10300/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mn10300/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mn10300/include/asm/thread_info.h</a></div><div class='hunk'>@@ -165,7 +165,6 @@ extern void free_thread_info(struct thread_info *);</div><div class='ctx'> #define TIF_RESTORE_SIGMASK	5	/* restore signal mask in do_signal() */</div><div class='ctx'> #define TIF_POLLING_NRFLAG	16	/* true if poll_idle() is polling TIF_NEED_RESCHED */</div><div class='ctx'> #define TIF_MEMDIE		17	/* is terminating due to OOM killer */</div><div class='del'>-#define TIF_FREEZE		18	/* freezing for suspend */</div><div class='ctx'> </div><div class='ctx'> #define _TIF_SYSCALL_TRACE	+(1 &lt;&lt; TIF_SYSCALL_TRACE)</div><div class='ctx'> #define _TIF_NOTIFY_RESUME	+(1 &lt;&lt; TIF_NOTIFY_RESUME)</div><div class='hunk'>@@ -174,7 +173,6 @@ extern void free_thread_info(struct thread_info *);</div><div class='ctx'> #define _TIF_SINGLESTEP		+(1 &lt;&lt; TIF_SINGLESTEP)</div><div class='ctx'> #define _TIF_RESTORE_SIGMASK	+(1 &lt;&lt; TIF_RESTORE_SIGMASK)</div><div class='ctx'> #define _TIF_POLLING_NRFLAG	+(1 &lt;&lt; TIF_POLLING_NRFLAG)</div><div class='del'>-#define _TIF_FREEZE		+(1 &lt;&lt; TIF_FREEZE)</div><div class='ctx'> </div><div class='ctx'> #define _TIF_WORK_MASK		0x0000FFFE	/* work to do on interrupt/exception return */</div><div class='ctx'> #define _TIF_ALLWORK_MASK	0x0000FFFF	/* work to do on any return to u-space */</div><div class='head'>diff --git a/arch/mn10300/include/asm/types.h b/arch/mn10300/include/asm/types.h<br/>index c1833eb192e3..713d4ba108a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mn10300/include/asm/types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/include/asm/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mn10300/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mn10300/include/asm/types.h</a></div><div class='hunk'>@@ -13,12 +13,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/int-ll64.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-</div><div class='del'>-typedef unsigned short umode_t;</div><div class='del'>-</div><div class='del'>-#endif /* __ASSEMBLY__ */</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * These aren't exported outside the kernel to avoid name space clashes</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/mn10300/unit-asb2305/Makefile b/arch/mn10300/unit-asb2305/Makefile<br/>index 0551022225b3..cbc5abaa939a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mn10300/unit-asb2305/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/unit-asb2305/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mn10300/unit-asb2305/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mn10300/unit-asb2305/Makefile</a></div><div class='hunk'>@@ -5,4 +5,4 @@</div><div class='ctx'> ###############################################################################</div><div class='ctx'> obj-y   := unit-init.o leds.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_PCI) += pci.o pci-asb2305.o pci-irq.o pci-iomap.o</div><div class='add'>+obj-$(CONFIG_PCI) += pci.o pci-asb2305.o pci-irq.o</div><div class='head'>diff --git a/arch/mn10300/unit-asb2305/pci-asb2305.c b/arch/mn10300/unit-asb2305/pci-asb2305.c<br/>index 8e6763e6f250..c4e2e79281e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mn10300/unit-asb2305/pci-asb2305.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/unit-asb2305/pci-asb2305.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mn10300/unit-asb2305/pci-asb2305.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mn10300/unit-asb2305/pci-asb2305.c</a></div><div class='hunk'>@@ -213,28 +213,6 @@ void __init pcibios_resource_survey(void)</div><div class='ctx'> 	pcibios_allocate_resources(1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *  If we set up a device for bus mastering, we need to check the latency</div><div class='del'>- *  timer as certain crappy BIOSes forget to set it properly.</div><div class='del'>- */</div><div class='del'>-unsigned int pcibios_max_latency = 255;</div><div class='del'>-</div><div class='del'>-void pcibios_set_master(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	u8 lat;</div><div class='del'>-</div><div class='del'>-	pci_read_config_byte(dev, PCI_LATENCY_TIMER, &amp;lat);</div><div class='del'>-</div><div class='del'>-	if (lat &lt; 16)</div><div class='del'>-		lat = (64 &lt;= pcibios_max_latency) ? 64 : pcibios_max_latency;</div><div class='del'>-	else if (lat &gt; pcibios_max_latency)</div><div class='del'>-		lat = pcibios_max_latency;</div><div class='del'>-	else</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,</div><div class='ctx'> 			enum pci_mmap_state mmap_state, int write_combine)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/mn10300/unit-asb2305/pci-asb2305.h b/arch/mn10300/unit-asb2305/pci-asb2305.h<br/>index c3fa294b6e28..1194fe486b01 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mn10300/unit-asb2305/pci-asb2305.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/unit-asb2305/pci-asb2305.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mn10300/unit-asb2305/pci-asb2305.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mn10300/unit-asb2305/pci-asb2305.h</a></div><div class='hunk'>@@ -31,8 +31,6 @@ extern unsigned int pci_probe;</div><div class='ctx'> </div><div class='ctx'> /* pci-asb2305.c */</div><div class='ctx'> </div><div class='del'>-extern unsigned int pcibios_max_latency;</div><div class='del'>-</div><div class='ctx'> extern void pcibios_resource_survey(void);</div><div class='ctx'> </div><div class='ctx'> /* pci.c */</div><div class='head'>diff --git a/arch/mn10300/unit-asb2305/pci-iomap.c b/arch/mn10300/unit-asb2305/pci-iomap.c<br/>deleted file mode 100644<br/>index c1a8d8f941fd..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mn10300/unit-asb2305/pci-iomap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/unit-asb2305/pci-iomap.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-/* ASB2305 PCI I/O mapping handler</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.</div><div class='del'>- * Written by David Howells (dhowells@redhat.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public Licence</div><div class='del'>- * as published by the Free Software Foundation; either version</div><div class='del'>- * 2 of the Licence, or (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Create a virtual mapping cookie for a PCI BAR (memory or IO)</div><div class='del'>- */</div><div class='del'>-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)</div><div class='del'>-{</div><div class='del'>-	resource_size_t start = pci_resource_start(dev, bar);</div><div class='del'>-	resource_size_t len = pci_resource_len(dev, bar);</div><div class='del'>-	unsigned long flags = pci_resource_flags(dev, bar);</div><div class='del'>-</div><div class='del'>-	if (!len || !start)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if ((flags &amp; IORESOURCE_IO) || (flags &amp; IORESOURCE_MEM))</div><div class='del'>-		return (void __iomem *) start;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(pci_iomap);</div><div class='head'>diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c<br/>index a4954fe82094..a7c5f08ca9f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mn10300/unit-asb2305/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/mn10300/unit-asb2305/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mn10300/unit-asb2305/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/mn10300/unit-asb2305/pci.c</a></div><div class='hunk'>@@ -380,11 +380,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev;</div><div class='ctx'> </div><div class='del'>-	if (bus-&gt;number == 0) {</div><div class='del'>-		bus-&gt;resource[0] = &amp;pci_ioport_resource;</div><div class='del'>-		bus-&gt;resource[1] = &amp;pci_iomem_resource;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (bus-&gt;self) {</div><div class='ctx'> 		pci_read_bridge_bases(bus);</div><div class='ctx'> 		pcibios_fixup_device_resources(bus-&gt;self);</div><div class='hunk'>@@ -402,6 +397,8 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)</div><div class='ctx'>  */</div><div class='ctx'> static int __init pcibios_init(void)</div><div class='ctx'> {</div><div class='add'>+	LIST_HEAD(resources);</div><div class='add'>+</div><div class='ctx'> 	ioport_resource.start	= 0xA0000000;</div><div class='ctx'> 	ioport_resource.end	= 0xDFFFFFFF;</div><div class='ctx'> 	iomem_resource.start	= 0xA0000000;</div><div class='hunk'>@@ -423,7 +420,10 @@ static int __init pcibios_init(void)</div><div class='ctx'> 	printk(KERN_INFO "PCI: Probing PCI hardware [mempage %08x]\n",</div><div class='ctx'> 	       MEM_PAGING_REG);</div><div class='ctx'> </div><div class='del'>-	pci_root_bus = pci_scan_bus(0, &amp;pci_direct_ampci, NULL);</div><div class='add'>+	pci_add_resource(&amp;resources, &amp;pci_ioport_resource);</div><div class='add'>+	pci_add_resource(&amp;resources, &amp;pci_iomem_resource);</div><div class='add'>+	pci_root_bus = pci_scan_root_bus(NULL, 0, &amp;pci_direct_ampci, NULL,</div><div class='add'>+					 &amp;resources);</div><div class='ctx'> </div><div class='ctx'> 	pcibios_irq_init();</div><div class='ctx'> 	pcibios_fixup_irqs();</div><div class='head'>diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig<br/>index e518a5a4cf4c..bc428b5f126c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/openrisc/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/openrisc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/openrisc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/openrisc/Kconfig</a></div><div class='hunk'>@@ -15,6 +15,7 @@ config OPENRISC</div><div class='ctx'> 	select GENERIC_IRQ_PROBE</div><div class='ctx'> 	select GENERIC_IRQ_SHOW</div><div class='ctx'> 	select GENERIC_IOMAP</div><div class='add'>+	select GENERIC_CPU_DEVICES</div><div class='ctx'> </div><div class='ctx'> config MMU</div><div class='ctx'> 	def_bool y</div><div class='hunk'>@@ -38,9 +39,6 @@ config RWSEM_XCHGADD_ALGORITHM</div><div class='ctx'> config GENERIC_HWEIGHT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config GENERIC_IOMAP</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config NO_IOPORT</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='head'>diff --git a/arch/openrisc/boot/Makefile b/arch/openrisc/boot/Makefile<br/>index 98ca185097a5..09958358601a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/openrisc/boot/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/openrisc/boot/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/openrisc/boot/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/openrisc/boot/Makefile</a></div><div class='hunk'>@@ -11,5 +11,5 @@ clean-files := *.dtb.S</div><div class='ctx'> </div><div class='ctx'> #DTC_FLAGS ?= -p 1024</div><div class='ctx'> </div><div class='del'>-$(obj)/%.dtb: $(src)/dts/%.dts</div><div class='del'>-	$(call cmd,dtc)</div><div class='add'>+$(obj)/%.dtb: $(src)/dts/%.dts FORCE</div><div class='add'>+	$(call if_changed_dep,dtc)</div><div class='head'>diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig<br/>index fdfd8be29e95..242a1b7ac759 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/parisc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/parisc/Kconfig</a></div><div class='hunk'>@@ -14,6 +14,7 @@ config PARISC</div><div class='ctx'> 	select GENERIC_ATOMIC64 if !64BIT</div><div class='ctx'> 	select HAVE_GENERIC_HARDIRQS</div><div class='ctx'> 	select GENERIC_IRQ_PROBE</div><div class='add'>+	select GENERIC_PCI_IOMAP</div><div class='ctx'> 	select IRQ_PER_CPU</div><div class='ctx'> 	select ARCH_HAVE_NMI_SAFE_CMPXCHG</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/hpux/sys_hpux.c b/arch/parisc/hpux/sys_hpux.c<br/>index 6ab9580b0b00..d9dc6cd3b7d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/hpux/sys_hpux.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/parisc/hpux/sys_hpux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/hpux/sys_hpux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/parisc/hpux/sys_hpux.c</a></div><div class='hunk'>@@ -136,16 +136,9 @@ struct hpux_ustat {</div><div class='ctx'>  */</div><div class='ctx'> static int hpux_ustat(dev_t dev, struct hpux_ustat __user *ubuf)</div><div class='ctx'> {</div><div class='del'>-	struct super_block *s;</div><div class='ctx'> 	struct hpux_ustat tmp;  /* Changed to hpux_ustat */</div><div class='ctx'> 	struct kstatfs sbuf;</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-</div><div class='del'>-	s = user_get_super(dev);</div><div class='del'>-	if (s == NULL)</div><div class='del'>-		goto out;</div><div class='del'>-	err = statfs_by_dentry(s-&gt;s_root, &amp;sbuf);</div><div class='del'>-	drop_super(s);</div><div class='add'>+	int err = vfs_ustat(dev, &amp;sbuf);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/include/asm/processor.h b/arch/parisc/include/asm/processor.h<br/>index 9ce66e9d1c2b..7213ec9e594c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/include/asm/processor.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/parisc/include/asm/processor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/include/asm/processor.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/parisc/include/asm/processor.h</a></div><div class='hunk'>@@ -196,7 +196,6 @@ typedef unsigned int elf_caddr_t;</div><div class='ctx'> 	/* offset pc for priv. level */			\</div><div class='ctx'> 	pc |= 3;					\</div><div class='ctx'> 							\</div><div class='del'>-	set_fs(USER_DS);				\</div><div class='ctx'> 	regs-&gt;iasq[0] = spaceid;			\</div><div class='ctx'> 	regs-&gt;iasq[1] = spaceid;			\</div><div class='ctx'> 	regs-&gt;iaoq[0] = pc;				\</div><div class='hunk'>@@ -299,7 +298,6 @@ on downward growing arches, it looks like this:</div><div class='ctx'> 	elf_addr_t pc = (elf_addr_t)new_pc | 3;		\</div><div class='ctx'> 	elf_caddr_t *argv = (elf_caddr_t *)bprm-&gt;exec + 1;	\</div><div class='ctx'> 							\</div><div class='del'>-	set_fs(USER_DS);				\</div><div class='ctx'> 	regs-&gt;iasq[0] = spaceid;			\</div><div class='ctx'> 	regs-&gt;iasq[1] = spaceid;			\</div><div class='ctx'> 	regs-&gt;iaoq[0] = pc;				\</div><div class='head'>diff --git a/arch/parisc/include/asm/socket.h b/arch/parisc/include/asm/socket.h<br/>index 225b7d6a1a0a..d28c51b61067 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/include/asm/socket.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/parisc/include/asm/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/parisc/include/asm/socket.h</a></div><div class='hunk'>@@ -61,6 +61,9 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_RXQ_OVFL             0x4021</div><div class='ctx'> </div><div class='add'>+#define SO_WIFI_STATUS		0x4022</div><div class='add'>+#define SCM_WIFI_STATUS		SO_WIFI_STATUS</div><div class='add'>+</div><div class='ctx'> /* O_NONBLOCK clashes with the bits used for socket types.  Therefore we</div><div class='ctx'>  * have to define SOCK_NONBLOCK to a different value here.</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/parisc/include/asm/thread_info.h b/arch/parisc/include/asm/thread_info.h<br/>index aa8de727e90b..6d9c7c7973d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/parisc/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/parisc/include/asm/thread_info.h</a></div><div class='hunk'>@@ -58,7 +58,6 @@ struct thread_info {</div><div class='ctx'> #define TIF_32BIT               4       /* 32 bit binary */</div><div class='ctx'> #define TIF_MEMDIE		5	/* is terminating due to OOM killer */</div><div class='ctx'> #define TIF_RESTORE_SIGMASK	6	/* restore saved signal mask */</div><div class='del'>-#define TIF_FREEZE		7	/* is freezing for suspend */</div><div class='ctx'> #define TIF_NOTIFY_RESUME	8	/* callback before returning to user */</div><div class='ctx'> #define TIF_SINGLESTEP		9	/* single stepping? */</div><div class='ctx'> #define TIF_BLOCKSTEP		10	/* branch stepping? */</div><div class='hunk'>@@ -69,7 +68,6 @@ struct thread_info {</div><div class='ctx'> #define _TIF_POLLING_NRFLAG	(1 &lt;&lt; TIF_POLLING_NRFLAG)</div><div class='ctx'> #define _TIF_32BIT		(1 &lt;&lt; TIF_32BIT)</div><div class='ctx'> #define _TIF_RESTORE_SIGMASK	(1 &lt;&lt; TIF_RESTORE_SIGMASK)</div><div class='del'>-#define _TIF_FREEZE		(1 &lt;&lt; TIF_FREEZE)</div><div class='ctx'> #define _TIF_NOTIFY_RESUME	(1 &lt;&lt; TIF_NOTIFY_RESUME)</div><div class='ctx'> #define _TIF_SINGLESTEP		(1 &lt;&lt; TIF_SINGLESTEP)</div><div class='ctx'> #define _TIF_BLOCKSTEP		(1 &lt;&lt; TIF_BLOCKSTEP)</div><div class='head'>diff --git a/arch/parisc/include/asm/types.h b/arch/parisc/include/asm/types.h<br/>index 80e415c9936d..8866f9bbdeaf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/include/asm/types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/parisc/include/asm/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/parisc/include/asm/types.h</a></div><div class='hunk'>@@ -3,10 +3,4 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/int-ll64.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-</div><div class='del'>-typedef unsigned short umode_t;</div><div class='del'>-</div><div class='del'>-#endif /* __ASSEMBLY__ */</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c<br/>index 4b4b9181a1a0..62c60b87d039 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/process.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/parisc/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/process.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/parisc/kernel/process.c</a></div><div class='hunk'>@@ -192,7 +192,6 @@ void flush_thread(void)</div><div class='ctx'> 	/* Only needs to handle fpu stuff or perf monitors.</div><div class='ctx'> 	** REVISIT: several arches implement a "lazy fpu state".</div><div class='ctx'> 	*/</div><div class='del'>-	set_fs(USER_DS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void release_thread(struct task_struct *dead_task)</div><div class='head'>diff --git a/arch/parisc/lib/iomap.c b/arch/parisc/lib/iomap.c<br/>index 8f470c93b16d..fb8e10a4fb39 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/lib/iomap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/parisc/lib/iomap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/lib/iomap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/parisc/lib/iomap.c</a></div><div class='hunk'>@@ -436,28 +436,6 @@ void ioport_unmap(void __iomem *addr)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */</div><div class='del'>-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)</div><div class='del'>-{</div><div class='del'>-	resource_size_t start = pci_resource_start(dev, bar);</div><div class='del'>-	resource_size_t len = pci_resource_len(dev, bar);</div><div class='del'>-	unsigned long flags = pci_resource_flags(dev, bar);</div><div class='del'>-</div><div class='del'>-	if (!len || !start)</div><div class='del'>-		return NULL;</div><div class='del'>-	if (maxlen &amp;&amp; len &gt; maxlen)</div><div class='del'>-		len = maxlen;</div><div class='del'>-	if (flags &amp; IORESOURCE_IO)</div><div class='del'>-		return ioport_map(start, len);</div><div class='del'>-	if (flags &amp; IORESOURCE_MEM) {</div><div class='del'>-		if (flags &amp; IORESOURCE_CACHEABLE)</div><div class='del'>-			return ioremap(start, len);</div><div class='del'>-		return ioremap_nocache(start, len);</div><div class='del'>-	}</div><div class='del'>-	/* What? */</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void pci_iounmap(struct pci_dev *dev, void __iomem * addr)</div><div class='ctx'> {</div><div class='ctx'> 	if (!INDIRECT_ADDR(addr)) {</div><div class='hunk'>@@ -483,5 +461,4 @@ EXPORT_SYMBOL(iowrite16_rep);</div><div class='ctx'> EXPORT_SYMBOL(iowrite32_rep);</div><div class='ctx'> EXPORT_SYMBOL(ioport_map);</div><div class='ctx'> EXPORT_SYMBOL(ioport_unmap);</div><div class='del'>-EXPORT_SYMBOL(pci_iomap);</div><div class='ctx'> EXPORT_SYMBOL(pci_iounmap);</div><div class='head'>diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig<br/>index ead0bc68439d..1919634a9b32 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/Kconfig</a></div><div class='hunk'>@@ -87,6 +87,10 @@ config ARCH_HAS_ILOG2_U64</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y if 64BIT</div><div class='ctx'> </div><div class='add'>+config ARCH_HAS_CPU_IDLE_WAIT</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> config GENERIC_HWEIGHT</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='hunk'>@@ -133,6 +137,7 @@ config PPC</div><div class='ctx'> 	select IRQ_PER_CPU</div><div class='ctx'> 	select GENERIC_IRQ_SHOW</div><div class='ctx'> 	select GENERIC_IRQ_SHOW_LEVEL</div><div class='add'>+	select IRQ_FORCED_THREADING</div><div class='ctx'> 	select HAVE_RCU_TABLE_FREE if SMP</div><div class='ctx'> 	select HAVE_SYSCALL_TRACEPOINTS</div><div class='ctx'> 	select HAVE_BPF_JIT if (PPC64 &amp;&amp; NET)</div><div class='hunk'>@@ -363,8 +368,9 @@ config KEXEC</div><div class='ctx'> </div><div class='ctx'> config CRASH_DUMP</div><div class='ctx'> 	bool "Build a kdump crash kernel"</div><div class='del'>-	depends on PPC64 || 6xx || FSL_BOOKE</div><div class='del'>-	select RELOCATABLE if PPC64 || FSL_BOOKE</div><div class='add'>+	depends on PPC64 || 6xx || FSL_BOOKE || (44x &amp;&amp; !SMP &amp;&amp; !PPC_47x)</div><div class='add'>+	select RELOCATABLE if PPC64 || 44x</div><div class='add'>+	select DYNAMIC_MEMSTART if FSL_BOOKE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Build a kernel suitable for use as a kdump capture kernel.</div><div class='ctx'> 	  The same kernel binary can be used as production kernel and dump</div><div class='hunk'>@@ -685,6 +691,10 @@ config FSL_LBC</div><div class='ctx'> 	  controller.  Also contains some common code used by</div><div class='ctx'> 	  drivers for specific local bus peripherals.</div><div class='ctx'> </div><div class='add'>+config FSL_IFC</div><div class='add'>+	bool</div><div class='add'>+        depends on FSL_SOC</div><div class='add'>+</div><div class='ctx'> config FSL_GTM</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on PPC_83xx || QUICC_ENGINE || CPM2</div><div class='hunk'>@@ -708,6 +718,7 @@ config PCI</div><div class='ctx'> 	default PCI_PERMEDIA if !4xx &amp;&amp; !CPM2 &amp;&amp; !8xx</div><div class='ctx'> 	default PCI_QSPAN if !4xx &amp;&amp; !CPM2 &amp;&amp; 8xx</div><div class='ctx'> 	select ARCH_SUPPORTS_MSI</div><div class='add'>+	select GENERIC_PCI_IOMAP</div><div class='ctx'> 	help</div><div class='ctx'> 	  Find out whether your system includes a PCI bus. PCI is the name of</div><div class='ctx'> 	  a bus system, i.e. the way the CPU talks to the other stuff inside</div><div class='hunk'>@@ -770,6 +781,10 @@ source "drivers/rapidio/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='add'>+config NONSTATIC_KERNEL</div><div class='add'>+	bool</div><div class='add'>+	default n</div><div class='add'>+</div><div class='ctx'> menu "Advanced setup"</div><div class='ctx'> 	depends on PPC32</div><div class='ctx'> </div><div class='hunk'>@@ -819,13 +834,32 @@ config LOWMEM_CAM_NUM</div><div class='ctx'> 	int "Number of CAMs to use to map low memory" if LOWMEM_CAM_NUM_BOOL</div><div class='ctx'> 	default 3</div><div class='ctx'> </div><div class='add'>+config DYNAMIC_MEMSTART</div><div class='add'>+	bool "Enable page aligned dynamic load address for kernel (EXPERIMENTAL)"</div><div class='add'>+	depends on EXPERIMENTAL &amp;&amp; ADVANCED_OPTIONS &amp;&amp; FLATMEM &amp;&amp; (FSL_BOOKE || 44x)</div><div class='add'>+	select NONSTATIC_KERNEL</div><div class='add'>+	help</div><div class='add'>+	  This option enables the kernel to be loaded at any page aligned</div><div class='add'>+	  physical address. The kernel creates a mapping from KERNELBASE to </div><div class='add'>+	  the address where the kernel is loaded. The page size here implies</div><div class='add'>+	  the TLB page size of the mapping for kernel on the particular platform.</div><div class='add'>+	  Please refer to the init code for finding the TLB page size.</div><div class='add'>+</div><div class='add'>+	  DYNAMIC_MEMSTART is an easy way of implementing pseudo-RELOCATABLE</div><div class='add'>+	  kernel image, where the only restriction is the page aligned kernel</div><div class='add'>+	  load address. When this option is enabled, the compile time physical </div><div class='add'>+	  address CONFIG_PHYSICAL_START is ignored.</div><div class='add'>+</div><div class='add'>+	  This option is overridden by CONFIG_RELOCATABLE</div><div class='add'>+</div><div class='ctx'> config RELOCATABLE</div><div class='ctx'> 	bool "Build a relocatable kernel (EXPERIMENTAL)"</div><div class='del'>-	depends on EXPERIMENTAL &amp;&amp; ADVANCED_OPTIONS &amp;&amp; FLATMEM &amp;&amp; (FSL_BOOKE || PPC_47x)</div><div class='add'>+	depends on EXPERIMENTAL &amp;&amp; ADVANCED_OPTIONS &amp;&amp; FLATMEM &amp;&amp; 44x</div><div class='add'>+	select NONSTATIC_KERNEL</div><div class='ctx'> 	help</div><div class='ctx'> 	  This builds a kernel image that is capable of running at the</div><div class='del'>-	  location the kernel is loaded at (some alignment restrictions may</div><div class='del'>-	  exist).</div><div class='add'>+	  location the kernel is loaded at, without any alignment restrictions.</div><div class='add'>+	  This feature is a superset of DYNAMIC_MEMSTART and hence overrides it.</div><div class='ctx'> </div><div class='ctx'> 	  One use is for the kexec on panic case where the recovery kernel</div><div class='ctx'> 	  must live at a different physical address than the primary</div><div class='hunk'>@@ -835,7 +869,11 @@ config RELOCATABLE</div><div class='ctx'> 	  it has been loaded at and the compile time physical addresses</div><div class='ctx'> 	  CONFIG_PHYSICAL_START is ignored.  However CONFIG_PHYSICAL_START</div><div class='ctx'> 	  setting can still be useful to bootwrappers that need to know the</div><div class='del'>-	  load location of the kernel (eg. u-boot/mkimage).</div><div class='add'>+	  load address of the kernel (eg. u-boot/mkimage).</div><div class='add'>+</div><div class='add'>+config RELOCATABLE_PPC32</div><div class='add'>+	def_bool y</div><div class='add'>+	depends on PPC32 &amp;&amp; RELOCATABLE</div><div class='ctx'> </div><div class='ctx'> config PAGE_OFFSET_BOOL</div><div class='ctx'> 	bool "Set custom page offset address"</div><div class='hunk'>@@ -865,7 +903,7 @@ config KERNEL_START_BOOL</div><div class='ctx'> config KERNEL_START</div><div class='ctx'> 	hex "Virtual address of kernel base" if KERNEL_START_BOOL</div><div class='ctx'> 	default PAGE_OFFSET if PAGE_OFFSET_BOOL</div><div class='del'>-	default "0xc2000000" if CRASH_DUMP &amp;&amp; !RELOCATABLE</div><div class='add'>+	default "0xc2000000" if CRASH_DUMP &amp;&amp; !NONSTATIC_KERNEL</div><div class='ctx'> 	default "0xc0000000"</div><div class='ctx'> </div><div class='ctx'> config PHYSICAL_START_BOOL</div><div class='hunk'>@@ -878,7 +916,7 @@ config PHYSICAL_START_BOOL</div><div class='ctx'> </div><div class='ctx'> config PHYSICAL_START</div><div class='ctx'> 	hex "Physical address where the kernel is loaded" if PHYSICAL_START_BOOL</div><div class='del'>-	default "0x02000000" if PPC_STD_MMU &amp;&amp; CRASH_DUMP &amp;&amp; !RELOCATABLE</div><div class='add'>+	default "0x02000000" if PPC_STD_MMU &amp;&amp; CRASH_DUMP &amp;&amp; !NONSTATIC_KERNEL</div><div class='ctx'> 	default "0x00000000"</div><div class='ctx'> </div><div class='ctx'> config PHYSICAL_ALIGN</div><div class='hunk'>@@ -924,6 +962,7 @@ endmenu</div><div class='ctx'> if PPC64</div><div class='ctx'> config RELOCATABLE</div><div class='ctx'> 	bool "Build a relocatable kernel"</div><div class='add'>+	select NONSTATIC_KERNEL</div><div class='ctx'> 	help</div><div class='ctx'> 	  This builds a kernel image that is capable of running anywhere</div><div class='ctx'> 	  in the RMA (real memory area) at any 16k-aligned base address.</div><div class='head'>diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug<br/>index 1b8a9c905cf7..4ccb2a009f74 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/Kconfig.debug?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/Kconfig.debug</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/Kconfig.debug?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/Kconfig.debug</a></div><div class='hunk'>@@ -336,4 +336,16 @@ config PPC_EARLY_DEBUG_CPM_ADDR</div><div class='ctx'> 	  platform probing is done, all platforms selected must</div><div class='ctx'> 	  share the same address.</div><div class='ctx'> </div><div class='add'>+config STRICT_DEVMEM</div><div class='add'>+	def_bool y</div><div class='add'>+	prompt "Filter access to /dev/mem"</div><div class='add'>+	help</div><div class='add'>+	  This option restricts access to /dev/mem.  If this option is</div><div class='add'>+	  disabled, you allow userspace access to all memory, including</div><div class='add'>+	  kernel and userspace memory. Accidental memory access is likely</div><div class='add'>+	  to be disastrous.</div><div class='add'>+	  Memory access is required for experts who want to debug the kernel.</div><div class='add'>+</div><div class='add'>+	  If you are unsure, say Y.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile<br/>index 70ba0c0a1223..b8b105c01c64 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/Makefile</a></div><div class='hunk'>@@ -63,9 +63,9 @@ override CC	+= -m$(CONFIG_WORD_SIZE)</div><div class='ctx'> override AR	:= GNUTARGET=elf$(CONFIG_WORD_SIZE)-powerpc $(AR)</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-LDFLAGS_vmlinux-yy := -Bstatic</div><div class='del'>-LDFLAGS_vmlinux-$(CONFIG_PPC64)$(CONFIG_RELOCATABLE) := -pie</div><div class='del'>-LDFLAGS_vmlinux	:= $(LDFLAGS_vmlinux-yy)</div><div class='add'>+LDFLAGS_vmlinux-y := -Bstatic</div><div class='add'>+LDFLAGS_vmlinux-$(CONFIG_RELOCATABLE) := -pie</div><div class='add'>+LDFLAGS_vmlinux	:= $(LDFLAGS_vmlinux-y)</div><div class='ctx'> </div><div class='ctx'> CFLAGS-$(CONFIG_PPC64)	:= -mminimal-toc -mtraceback=no -mcall-aixdesc</div><div class='ctx'> CFLAGS-$(CONFIG_PPC32)	:= -ffixed-r2 -mmultiple</div><div class='hunk'>@@ -131,8 +131,7 @@ KBUILD_CFLAGS		+= -mno-sched-epilog</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> cpu-as-$(CONFIG_4xx)		+= -Wa,-m405</div><div class='del'>-cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec</div><div class='del'>-cpu-as-$(CONFIG_POWER4)		+= -Wa,-maltivec</div><div class='add'>+cpu-as-$(CONFIG_ALTIVEC)	+= -Wa,-maltivec</div><div class='ctx'> cpu-as-$(CONFIG_E500)		+= -Wa,-me500</div><div class='ctx'> cpu-as-$(CONFIG_E200)		+= -Wa,-me200</div><div class='ctx'> </div><div class='hunk'>@@ -166,7 +165,7 @@ all: zImage</div><div class='ctx'> </div><div class='ctx'> # With make 3.82 we cannot mix normal and wildcard targets</div><div class='ctx'> BOOT_TARGETS1 := zImage zImage.initrd uImage</div><div class='del'>-BOOT_TARGETS2 := zImage% dtbImage% treeImage.% cuImage.% simpleImage.%</div><div class='add'>+BOOT_TARGETS2 := zImage% dtbImage% treeImage.% cuImage.% simpleImage.% uImage.%</div><div class='ctx'> </div><div class='ctx'> PHONY += $(BOOT_TARGETS1) $(BOOT_TARGETS2)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile<br/>index 72ee8c1fba48..8844a17ce8ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/Makefile</a></div><div class='hunk'>@@ -45,6 +45,7 @@ $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405</div><div class='ctx'> $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405</div><div class='ctx'> $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405</div><div class='ctx'> $(obj)/treeboot-iss4xx.o: BOOTCFLAGS += -mcpu=405</div><div class='add'>+$(obj)/treeboot-currituck.o: BOOTCFLAGS += -mcpu=405</div><div class='ctx'> $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -79,7 +80,8 @@ src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c</div><div class='ctx'> 		cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \</div><div class='ctx'> 		virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \</div><div class='ctx'> 		cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c \</div><div class='del'>-		gamecube-head.S gamecube.c wii-head.S wii.c treeboot-iss4xx.c</div><div class='add'>+		gamecube-head.S gamecube.c wii-head.S wii.c treeboot-iss4xx.c \</div><div class='add'>+		treeboot-currituck.c</div><div class='ctx'> src-boot := $(src-wlib) $(src-plat) empty.c</div><div class='ctx'> </div><div class='ctx'> src-boot := $(addprefix $(obj)/, $(src-boot))</div><div class='hunk'>@@ -199,6 +201,7 @@ image-$(CONFIG_EP405)			+= dtbImage.ep405</div><div class='ctx'> image-$(CONFIG_HOTFOOT)			+= cuImage.hotfoot</div><div class='ctx'> image-$(CONFIG_WALNUT)			+= treeImage.walnut</div><div class='ctx'> image-$(CONFIG_ACADIA)			+= cuImage.acadia</div><div class='add'>+image-$(CONFIG_OBS600)			+= uImage.obs600</div><div class='ctx'> </div><div class='ctx'> # Board ports in arch/powerpc/platform/44x/Kconfig</div><div class='ctx'> image-$(CONFIG_EBONY)			+= treeImage.ebony cuImage.ebony</div><div class='hunk'>@@ -212,6 +215,7 @@ image-$(CONFIG_WARP)			+= cuImage.warp</div><div class='ctx'> image-$(CONFIG_YOSEMITE)		+= cuImage.yosemite</div><div class='ctx'> image-$(CONFIG_ISS4xx)			+= treeImage.iss4xx \</div><div class='ctx'> 					   treeImage.iss4xx-mpic</div><div class='add'>+image-$(CONFIG_CURRITUCK)			+= treeImage.currituck</div><div class='ctx'> </div><div class='ctx'> # Board ports in arch/powerpc/platform/8xx/Kconfig</div><div class='ctx'> image-$(CONFIG_MPC86XADS)		+= cuImage.mpc866ads</div><div class='hunk'>@@ -316,6 +320,12 @@ $(obj)/zImage.iseries: vmlinux</div><div class='ctx'> $(obj)/uImage: vmlinux $(wrapperbits)</div><div class='ctx'> 	$(call if_changed,wrap,uboot)</div><div class='ctx'> </div><div class='add'>+$(obj)/uImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)</div><div class='add'>+	$(call if_changed,wrap,uboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)</div><div class='add'>+</div><div class='add'>+$(obj)/uImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)</div><div class='add'>+	$(call if_changed,wrap,uboot-$*,,$(obj)/$*.dtb)</div><div class='add'>+</div><div class='ctx'> $(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)</div><div class='ctx'> 	$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)</div><div class='ctx'> </div><div class='hunk'>@@ -335,8 +345,8 @@ $(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)</div><div class='ctx'> 	$(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb)</div><div class='ctx'> </div><div class='ctx'> # Rule to build device tree blobs</div><div class='del'>-$(obj)/%.dtb: $(src)/dts/%.dts</div><div class='del'>-	$(call cmd,dtc)</div><div class='add'>+$(obj)/%.dtb: $(src)/dts/%.dts FORCE</div><div class='add'>+	$(call if_changed_dep,dtc)</div><div class='ctx'> </div><div class='ctx'> # If there isn't a platform selected then just strip the vmlinux.</div><div class='ctx'> ifeq (,$(image-y))</div><div class='head'>diff --git a/arch/powerpc/boot/dcr.h b/arch/powerpc/boot/dcr.h<br/>index 645a7c964e5f..cc73f7a95e26 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dcr.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dcr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dcr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dcr.h</a></div><div class='hunk'>@@ -9,6 +9,12 @@</div><div class='ctx'> 	})</div><div class='ctx'> #define mtdcr(rn, val) \</div><div class='ctx'> 	asm volatile("mtdcr %0,%1" : : "i"(rn), "r"(val))</div><div class='add'>+#define mfdcrx(rn) \</div><div class='add'>+	({	\</div><div class='add'>+		unsigned long rval; \</div><div class='add'>+		asm volatile("mfdcrx %0,%1" : "=r"(rval) : "r"(rn)); \</div><div class='add'>+		rval; \</div><div class='add'>+	})</div><div class='ctx'> </div><div class='ctx'> /* 440GP/440GX SDRAM controller DCRs */</div><div class='ctx'> #define DCRN_SDRAM0_CFGADDR				0x010</div><div class='head'>diff --git a/arch/powerpc/boot/div64.S b/arch/powerpc/boot/div64.S<br/>index d271ab542673..bbcb8a4cc121 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/div64.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/div64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/div64.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/div64.S</a></div><div class='hunk'>@@ -57,3 +57,55 @@ __div64_32:</div><div class='ctx'> 	stw	r8,4(r3)</div><div class='ctx'> 	mr	r3,r6		# return the remainder in r3</div><div class='ctx'> 	blr</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Extended precision shifts.</div><div class='add'>+ *</div><div class='add'>+ * Updated to be valid for shift counts from 0 to 63 inclusive.</div><div class='add'>+ * -- Gabriel</div><div class='add'>+ *</div><div class='add'>+ * R3/R4 has 64 bit value</div><div class='add'>+ * R5    has shift count</div><div class='add'>+ * result in R3/R4</div><div class='add'>+ *</div><div class='add'>+ *  ashrdi3: arithmetic right shift (sign propagation)	</div><div class='add'>+ *  lshrdi3: logical right shift</div><div class='add'>+ *  ashldi3: left shift</div><div class='add'>+ */</div><div class='add'>+	.globl __ashrdi3</div><div class='add'>+__ashrdi3:</div><div class='add'>+	subfic	r6,r5,32</div><div class='add'>+	srw	r4,r4,r5	# LSW = count &gt; 31 ? 0 : LSW &gt;&gt; count</div><div class='add'>+	addi	r7,r5,32	# could be xori, or addi with -32</div><div class='add'>+	slw	r6,r3,r6	# t1 = count &gt; 31 ? 0 : MSW &lt;&lt; (32-count)</div><div class='add'>+	rlwinm	r8,r7,0,32	# t3 = (count &lt; 32) ? 32 : 0</div><div class='add'>+	sraw	r7,r3,r7	# t2 = MSW &gt;&gt; (count-32)</div><div class='add'>+	or	r4,r4,r6	# LSW |= t1</div><div class='add'>+	slw	r7,r7,r8	# t2 = (count &lt; 32) ? 0 : t2</div><div class='add'>+	sraw	r3,r3,r5	# MSW = MSW &gt;&gt; count</div><div class='add'>+	or	r4,r4,r7	# LSW |= t2</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+	.globl __ashldi3</div><div class='add'>+__ashldi3:</div><div class='add'>+	subfic	r6,r5,32</div><div class='add'>+	slw	r3,r3,r5	# MSW = count &gt; 31 ? 0 : MSW &lt;&lt; count</div><div class='add'>+	addi	r7,r5,32	# could be xori, or addi with -32</div><div class='add'>+	srw	r6,r4,r6	# t1 = count &gt; 31 ? 0 : LSW &gt;&gt; (32-count)</div><div class='add'>+	slw	r7,r4,r7	# t2 = count &lt; 32 ? 0 : LSW &lt;&lt; (count-32)</div><div class='add'>+	or	r3,r3,r6	# MSW |= t1</div><div class='add'>+	slw	r4,r4,r5	# LSW = LSW &lt;&lt; count</div><div class='add'>+	or	r3,r3,r7	# MSW |= t2</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+	.globl __lshrdi3</div><div class='add'>+__lshrdi3:</div><div class='add'>+	subfic	r6,r5,32</div><div class='add'>+	srw	r4,r4,r5	# LSW = count &gt; 31 ? 0 : LSW &gt;&gt; count</div><div class='add'>+	addi	r7,r5,32	# could be xori, or addi with -32</div><div class='add'>+	slw	r6,r3,r6	# t1 = count &gt; 31 ? 0 : MSW &lt;&lt; (32-count)</div><div class='add'>+	srw	r7,r3,r7	# t2 = count &lt; 32 ? 0 : MSW &gt;&gt; (count-32)</div><div class='add'>+	or	r4,r4,r6	# LSW |= t1</div><div class='add'>+	srw	r3,r3,r5	# MSW = MSW &gt;&gt; count</div><div class='add'>+	or	r4,r4,r7	# LSW |= t2</div><div class='add'>+	blr</div><div class='head'>diff --git a/arch/powerpc/boot/dts/asp834x-redboot.dts b/arch/powerpc/boot/dts/asp834x-redboot.dts<br/>index 261d10c4534b..227290db866d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/asp834x-redboot.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/asp834x-redboot.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/asp834x-redboot.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/asp834x-redboot.dts</a></div><div class='hunk'>@@ -256,7 +256,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;400000000&gt;;</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -266,7 +266,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;400000000&gt;;</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/currituck.dts b/arch/powerpc/boot/dts/currituck.dts<br/>new file mode 100644<br/>index 000000000000..b801dd06e573<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/currituck.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/currituck.dts</a></div><div class='hunk'>@@ -0,0 +1,237 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Source for IBM Embedded PPC 476 Platform</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2011 Tony Breeds IBM Corporation</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2.  This program is licensed "as is" without</div><div class='add'>+ * any warranty of any kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+/memreserve/ 0x01f00000 0x00100000;	// spin table</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	model = "ibm,currituck";</div><div class='add'>+	compatible = "ibm,currituck";</div><div class='add'>+	dcr-parent = &lt;&amp;{/cpus/cpu@0}&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;UART0;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			model = "PowerPC,476";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			clock-frequency = &lt;1600000000&gt;; // 1.6 GHz</div><div class='add'>+			timebase-frequency = &lt;100000000&gt;; // 100Mhz</div><div class='add'>+			i-cache-line-size = &lt;32&gt;;</div><div class='add'>+			d-cache-line-size = &lt;32&gt;;</div><div class='add'>+			i-cache-size = &lt;32768&gt;;</div><div class='add'>+			d-cache-size = &lt;32768&gt;;</div><div class='add'>+			dcr-controller;</div><div class='add'>+			dcr-access-method = "native";</div><div class='add'>+			status = "ok";</div><div class='add'>+		};</div><div class='add'>+		cpu@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			model = "PowerPC,476";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			clock-frequency = &lt;1600000000&gt;; // 1.6 GHz</div><div class='add'>+			timebase-frequency = &lt;100000000&gt;; // 100Mhz</div><div class='add'>+			i-cache-line-size = &lt;32&gt;;</div><div class='add'>+			d-cache-line-size = &lt;32&gt;;</div><div class='add'>+			i-cache-size = &lt;32768&gt;;</div><div class='add'>+			d-cache-size = &lt;32768&gt;;</div><div class='add'>+			dcr-controller;</div><div class='add'>+			dcr-access-method = "native";</div><div class='add'>+			status = "disabled";</div><div class='add'>+			enable-method = "spin-table";</div><div class='add'>+			cpu-release-addr = &lt;0x0 0x01f00000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x0 0x0 0x0 0x0&gt;; // filled in by zImage</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	MPIC: interrupt-controller {</div><div class='add'>+		compatible = "chrp,open-pic";</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		dcr-reg = &lt;0xffc00000 0x00040000&gt;;</div><div class='add'>+		#address-cells = &lt;0&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	plb {</div><div class='add'>+		compatible = "ibm,plb6";</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'>+		clock-frequency = &lt;200000000&gt;; // 200Mhz</div><div class='add'>+</div><div class='add'>+		POB0: opb {</div><div class='add'>+			compatible = "ibm,opb-4xx", "ibm,opb";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			/* Wish there was a nicer way of specifying a full</div><div class='add'>+			 * 32-bit range</div><div class='add'>+			 */</div><div class='add'>+			ranges = &lt;0x00000000 0x00000200 0x00000000 0x80000000</div><div class='add'>+				  0x80000000 0x00000200 0x80000000 0x80000000&gt;;</div><div class='add'>+			clock-frequency = &lt;100000000&gt;;</div><div class='add'>+</div><div class='add'>+			UART0: serial@10000000 {</div><div class='add'>+				device_type = "serial";</div><div class='add'>+				compatible = "ns16750", "ns16550";</div><div class='add'>+				reg = &lt;0x10000000 0x00000008&gt;;</div><div class='add'>+				virtual-reg = &lt;0xe1000000&gt;;</div><div class='add'>+				clock-frequency = &lt;1851851&gt;; // PCIe refclk/MCGC0_CTL[UART]</div><div class='add'>+				current-speed = &lt;115200&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;MPIC&gt;;</div><div class='add'>+				interrupts = &lt;34 2&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			IIC0: i2c@00000000 {</div><div class='add'>+				compatible = "ibm,iic-currituck", "ibm,iic";</div><div class='add'>+				reg = &lt;0x0 0x00000014&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;MPIC&gt;;</div><div class='add'>+				interrupts = &lt;79 2&gt;;</div><div class='add'>+				#address-cells = &lt;1&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+                                rtc@68 {</div><div class='add'>+                                        compatible = "stm,m41t80", "m41st85";</div><div class='add'>+                                        reg = &lt;0x68&gt;;</div><div class='add'>+                                };</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		PCIE0: pciex@10100000000 {		// 4xGBIF1</div><div class='add'>+			device_type = "pci";</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			#address-cells = &lt;3&gt;;</div><div class='add'>+			compatible = "ibm,plb-pciex-476fpe", "ibm,plb-pciex";</div><div class='add'>+			primary;</div><div class='add'>+			port = &lt;0x0&gt;; /* port number */</div><div class='add'>+			reg = &lt;0x00000101 0x00000000 0x0 0x10000000		/* Config space access */</div><div class='add'>+			       0x00000100 0x00000000 0x0 0x00001000&gt;;	/* UTL Registers space access */</div><div class='add'>+			dcr-reg = &lt;0x80 0x20&gt;;</div><div class='add'>+</div><div class='add'>+//                                pci_space  &lt; pci_addr          &gt; &lt; cpu_addr          &gt; &lt; size       &gt;</div><div class='add'>+			ranges = &lt;0x02000000 0x00000000 0x80000000 0x00000110 0x80000000 0x0 0x80000000</div><div class='add'>+			          0x01000000 0x0        0x0        0x00000140 0x0        0x0 0x00010000&gt;;</div><div class='add'>+</div><div class='add'>+			/* Inbound starting at 0 to memsize filled in by zImage */</div><div class='add'>+			dma-ranges = &lt;0x42000000 0x0 0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='add'>+</div><div class='add'>+			/* This drives busses 0 to 0xf */</div><div class='add'>+			bus-range = &lt;0x0 0xf&gt;;</div><div class='add'>+</div><div class='add'>+			/* Legacy interrupts (note the weird polarity, the bridge seems</div><div class='add'>+			 * to invert PCIe legacy interrupts).</div><div class='add'>+			 * We are de-swizzling here because the numbers are actually for</div><div class='add'>+			 * port of the root complex virtual P2P bridge. But I want</div><div class='add'>+			 * to avoid putting a node for it in the tree, so the numbers</div><div class='add'>+			 * below are basically de-swizzled numbers.</div><div class='add'>+			 * The real slot is on idsel 0, so the swizzling is 1:1</div><div class='add'>+			 */</div><div class='add'>+			interrupt-map-mask = &lt;0x0 0x0 0x0 0x7&gt;;</div><div class='add'>+			interrupt-map = &lt;</div><div class='add'>+				0x0 0x0 0x0 0x1 &amp;MPIC 46 0x2 /* int A */</div><div class='add'>+				0x0 0x0 0x0 0x2 &amp;MPIC 47 0x2 /* int B */</div><div class='add'>+				0x0 0x0 0x0 0x3 &amp;MPIC 48 0x2 /* int C */</div><div class='add'>+				0x0 0x0 0x0 0x4 &amp;MPIC 49 0x2 /* int D */&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		PCIE1: pciex@30100000000 {		// 4xGBIF0</div><div class='add'>+			device_type = "pci";</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			#address-cells = &lt;3&gt;;</div><div class='add'>+			compatible = "ibm,plb-pciex-476fpe", "ibm,plb-pciex";</div><div class='add'>+			primary;</div><div class='add'>+			port = &lt;0x1&gt;; /* port number */</div><div class='add'>+			reg = &lt;0x00000301 0x00000000 0x0 0x10000000		/* Config space access */</div><div class='add'>+			       0x00000300 0x00000000 0x0 0x00001000&gt;;	/* UTL Registers space access */</div><div class='add'>+			dcr-reg = &lt;0x60 0x20&gt;;</div><div class='add'>+</div><div class='add'>+			ranges = &lt;0x02000000 0x00000000 0x80000000 0x00000310 0x80000000 0x0 0x80000000</div><div class='add'>+			          0x01000000 0x0        0x0        0x00000340 0x0        0x0 0x00010000&gt;;</div><div class='add'>+</div><div class='add'>+			/* Inbound starting at 0 to memsize filled in by zImage */</div><div class='add'>+			dma-ranges = &lt;0x42000000 0x0 0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='add'>+</div><div class='add'>+			/* This drives busses 0 to 0xf */</div><div class='add'>+			bus-range = &lt;0x0 0xf&gt;;</div><div class='add'>+</div><div class='add'>+			/* Legacy interrupts (note the weird polarity, the bridge seems</div><div class='add'>+			 * to invert PCIe legacy interrupts).</div><div class='add'>+			 * We are de-swizzling here because the numbers are actually for</div><div class='add'>+			 * port of the root complex virtual P2P bridge. But I want</div><div class='add'>+			 * to avoid putting a node for it in the tree, so the numbers</div><div class='add'>+			 * below are basically de-swizzled numbers.</div><div class='add'>+			 * The real slot is on idsel 0, so the swizzling is 1:1</div><div class='add'>+			 */</div><div class='add'>+			interrupt-map-mask = &lt;0x0 0x0 0x0 0x7&gt;;</div><div class='add'>+			interrupt-map = &lt;</div><div class='add'>+				0x0 0x0 0x0 0x1 &amp;MPIC 38 0x2 /* int A */</div><div class='add'>+				0x0 0x0 0x0 0x2 &amp;MPIC 39 0x2 /* int B */</div><div class='add'>+				0x0 0x0 0x0 0x3 &amp;MPIC 40 0x2 /* int C */</div><div class='add'>+				0x0 0x0 0x0 0x4 &amp;MPIC 41 0x2 /* int D */&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		PCIE2: pciex@38100000000 {		// 2xGBIF0</div><div class='add'>+			device_type = "pci";</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			#address-cells = &lt;3&gt;;</div><div class='add'>+			compatible = "ibm,plb-pciex-476fpe", "ibm,plb-pciex";</div><div class='add'>+			primary;</div><div class='add'>+			port = &lt;0x2&gt;; /* port number */</div><div class='add'>+			reg = &lt;0x00000381 0x00000000 0x0 0x10000000		/* Config space access */</div><div class='add'>+			       0x00000380 0x00000000 0x0 0x00001000&gt;;	/* UTL Registers space access */</div><div class='add'>+			dcr-reg = &lt;0xA0 0x20&gt;;</div><div class='add'>+</div><div class='add'>+			ranges = &lt;0x02000000 0x00000000 0x80000000 0x00000390 0x80000000 0x0 0x80000000</div><div class='add'>+			          0x01000000 0x0        0x0        0x000003C0 0x0        0x0 0x00010000&gt;;</div><div class='add'>+</div><div class='add'>+			/* Inbound starting at 0 to memsize filled in by zImage */</div><div class='add'>+			dma-ranges = &lt;0x42000000 0x0 0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='add'>+</div><div class='add'>+			/* This drives busses 0 to 0xf */</div><div class='add'>+			bus-range = &lt;0x0 0xf&gt;;</div><div class='add'>+</div><div class='add'>+			/* Legacy interrupts (note the weird polarity, the bridge seems</div><div class='add'>+			 * to invert PCIe legacy interrupts).</div><div class='add'>+			 * We are de-swizzling here because the numbers are actually for</div><div class='add'>+			 * port of the root complex virtual P2P bridge. But I want</div><div class='add'>+			 * to avoid putting a node for it in the tree, so the numbers</div><div class='add'>+			 * below are basically de-swizzled numbers.</div><div class='add'>+			 * The real slot is on idsel 0, so the swizzling is 1:1</div><div class='add'>+			 */</div><div class='add'>+			interrupt-map-mask = &lt;0x0 0x0 0x0 0x7&gt;;</div><div class='add'>+			interrupt-map = &lt;</div><div class='add'>+				0x0 0x0 0x0 0x1 &amp;MPIC 54 0x2 /* int A */</div><div class='add'>+				0x0 0x0 0x0 0x2 &amp;MPIC 55 0x2 /* int B */</div><div class='add'>+				0x0 0x0 0x0 0x3 &amp;MPIC 56 0x2 /* int C */</div><div class='add'>+				0x0 0x0 0x0 0x4 &amp;MPIC 57 0x2 /* int D */&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		linux,stdout-path = &amp;UART0;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi<br/>new file mode 100644<br/>index 000000000000..89af62637707<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi</a></div><div class='hunk'>@@ -0,0 +1,248 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC8536 Silicon/SoC Device Tree Source (post include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;lbc {</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,mpc8536-elbc", "fsl,elbc", "simple-bus";</div><div class='add'>+	interrupts = &lt;19 2 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x8000 */</div><div class='add'>+&amp;pci0 {</div><div class='add'>+	compatible = "fsl,mpc8540-pci";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	interrupts = &lt;24 0x2 0 0&gt;;</div><div class='add'>+	bus-range = &lt;0 0xff&gt;;</div><div class='add'>+	#interrupt-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x9000 */</div><div class='add'>+&amp;pci1 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;25 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;25 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x4 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x5 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x6 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x7 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0xa000 */</div><div class='add'>+&amp;pci2 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;26 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;26 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0xb000 */</div><div class='add'>+&amp;pci3 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;27 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;27 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x8 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x9 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0xa 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0xb 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+&amp;soc {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "soc";</div><div class='add'>+	compatible = "fsl,mpc8536-immr", "simple-bus";</div><div class='add'>+	bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='add'>+</div><div class='add'>+	ecm-law@0 {</div><div class='add'>+		compatible = "fsl,ecm-law";</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+		fsl,num-laws = &lt;12&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ecm@1000 {</div><div class='add'>+		compatible = "fsl,mpc8536-ecm", "fsl,ecm";</div><div class='add'>+		reg = &lt;0x1000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;17 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory-controller@2000 {</div><div class='add'>+		compatible = "fsl,mpc8536-memory-controller";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;18 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-i2c-0.dtsi"</div><div class='add'>+/include/ "pq3-i2c-1.dtsi"</div><div class='add'>+/include/ "pq3-duart-0.dtsi"</div><div class='add'>+</div><div class='add'>+/include/ "pq3-espi-0.dtsi"</div><div class='add'>+	spi@7000 {</div><div class='add'>+		fsl,espi-num-chipselects = &lt;4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-gpio-0.dtsi"</div><div class='add'>+</div><div class='add'>+	/* mark compat w/8572 to get some erratum treatment */</div><div class='add'>+	gpio-controller@f000 {</div><div class='add'>+		compatible = "fsl,mpc8572-gpio", "fsl,pq3-gpio";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sata@18000 {</div><div class='add'>+		compatible = "fsl,mpc8536-sata", "fsl,pq-sata";</div><div class='add'>+		reg = &lt;0x18000 0x1000&gt;;</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+		interrupts = &lt;74 0x2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sata@19000 {</div><div class='add'>+		compatible = "fsl,mpc8536-sata", "fsl,pq-sata";</div><div class='add'>+		reg = &lt;0x19000 0x1000&gt;;</div><div class='add'>+		cell-index = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;41 0x2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	L2: l2-cache-controller@20000 {</div><div class='add'>+		compatible = "fsl,mpc8536-l2-cache-controller";</div><div class='add'>+		reg = &lt;0x20000 0x1000&gt;;</div><div class='add'>+		cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='add'>+		cache-size = &lt;0x80000&gt;; // L2, 512K</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-dma-0.dtsi"</div><div class='add'>+/include/ "pq3-etsec1-0.dtsi"</div><div class='add'>+/include/ "pq3-etsec1-timer-0.dtsi"</div><div class='add'>+</div><div class='add'>+	usb@22000 {</div><div class='add'>+		compatible = "fsl,mpc8536-usb2-mph", "fsl-usb2-mph";</div><div class='add'>+		reg = &lt;0x22000 0x1000&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		interrupts = &lt;28 0x2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb@23000 {</div><div class='add'>+		compatible = "fsl,mpc8536-usb2-mph", "fsl-usb2-mph";</div><div class='add'>+		reg = &lt;0x23000 0x1000&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		interrupts = &lt;46 0x2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ptp_clock@24e00 {</div><div class='add'>+		interrupts = &lt;68 2 0 0 69 2 0 0 70 2 0 0 71 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec1-2.dtsi"</div><div class='add'>+</div><div class='add'>+	ethernet@26000 {</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb@2b000 {</div><div class='add'>+		compatible = "fsl,mpc8536-usb2-dr", "fsl-usb2-dr";</div><div class='add'>+		reg = &lt;0x2b000 0x1000&gt;;</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		interrupts = &lt;60 0x2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-esdhc-0.dtsi"</div><div class='add'>+/include/ "pq3-sec3.0-0.dtsi"</div><div class='add'>+/include/ "pq3-mpic.dtsi"</div><div class='add'>+/include/ "pq3-mpic-timer-B.dtsi"</div><div class='add'>+</div><div class='add'>+	global-utilities@e0000 {</div><div class='add'>+		compatible = "fsl,mpc8536-guts";</div><div class='add'>+		reg = &lt;0xe0000 0x1000&gt;;</div><div class='add'>+		fsl,has-rstcr;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi b/arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi<br/>new file mode 100644<br/>index 000000000000..7de45a784df6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi</a></div><div class='hunk'>@@ -0,0 +1,63 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC8536 Silicon/SoC Device Tree Source (pre include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,MPC8536";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;serial0;</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+		ethernet0 = &amp;enet0;</div><div class='add'>+		ethernet1 = &amp;enet2;</div><div class='add'>+		pci0 = &amp;pci0;</div><div class='add'>+		pci1 = &amp;pci1;</div><div class='add'>+		pci2 = &amp;pci2;</div><div class='add'>+		pci3 = &amp;pci3;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		PowerPC,8536@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/mpc8544si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8544si-post.dtsi<br/>new file mode 100644<br/>index 000000000000..b68eb119faef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/mpc8544si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/mpc8544si-post.dtsi</a></div><div class='hunk'>@@ -0,0 +1,191 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC8544 Silicon/SoC Device Tree Source (post include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;lbc {</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,mpc8544-lbc", "fsl,pq3-localbus", "simple-bus";</div><div class='add'>+	interrupts = &lt;19 2 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x8000 */</div><div class='add'>+&amp;pci0 {</div><div class='add'>+	compatible = "fsl,mpc8540-pci";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	interrupts = &lt;24 0x2 0 0&gt;;</div><div class='add'>+	bus-range = &lt;0 0xff&gt;;</div><div class='add'>+	#interrupt-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x9000 */</div><div class='add'>+&amp;pci1 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;25 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;25 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x4 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x5 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x6 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x7 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0xa000 */</div><div class='add'>+&amp;pci2 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;26 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;26 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0xb000 */</div><div class='add'>+&amp;pci3 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;27 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;27 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x8 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x9 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0xa 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0xb 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;soc {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "soc";</div><div class='add'>+	compatible = "fsl,mpc8544-immr", "simple-bus";</div><div class='add'>+	bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='add'>+</div><div class='add'>+	ecm-law@0 {</div><div class='add'>+		compatible = "fsl,ecm-law";</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+		fsl,num-laws = &lt;10&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ecm@1000 {</div><div class='add'>+		compatible = "fsl,mpc8544-ecm", "fsl,ecm";</div><div class='add'>+		reg = &lt;0x1000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;17 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory-controller@2000 {</div><div class='add'>+		compatible = "fsl,mpc8544-memory-controller";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;18 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-i2c-0.dtsi"</div><div class='add'>+/include/ "pq3-i2c-1.dtsi"</div><div class='add'>+/include/ "pq3-duart-0.dtsi"</div><div class='add'>+</div><div class='add'>+	L2: l2-cache-controller@20000 {</div><div class='add'>+		compatible = "fsl,mpc8544-l2-cache-controller";</div><div class='add'>+		reg = &lt;0x20000 0x1000&gt;;</div><div class='add'>+		cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='add'>+		cache-size = &lt;0x40000&gt;; // L2, 256K</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-dma-0.dtsi"</div><div class='add'>+/include/ "pq3-etsec1-0.dtsi"</div><div class='add'>+/include/ "pq3-etsec1-2.dtsi"</div><div class='add'>+</div><div class='add'>+	ethernet@26000 {</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-sec2.1-0.dtsi"</div><div class='add'>+/include/ "pq3-mpic.dtsi"</div><div class='add'>+</div><div class='add'>+	global-utilities@e0000 {</div><div class='add'>+		compatible = "fsl,mpc8544-guts";</div><div class='add'>+		reg = &lt;0xe0000 0x1000&gt;;</div><div class='add'>+		fsl,has-rstcr;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi b/arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi<br/>new file mode 100644<br/>index 000000000000..8777f9239d9e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi</a></div><div class='hunk'>@@ -0,0 +1,63 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC8544 Silicon/SoC Device Tree Source (pre include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,MPC8544";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;serial0;</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+		ethernet0 = &amp;enet0;</div><div class='add'>+		ethernet1 = &amp;enet2;</div><div class='add'>+		pci0 = &amp;pci0;</div><div class='add'>+		pci1 = &amp;pci1;</div><div class='add'>+		pci2 = &amp;pci2;</div><div class='add'>+		pci3 = &amp;pci3;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		PowerPC,8544@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi<br/>new file mode 100644<br/>index 000000000000..9d8023a69d7d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi</a></div><div class='hunk'>@@ -0,0 +1,143 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC8548 Silicon/SoC Device Tree Source (post include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;lbc {</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,mpc8548-lbc", "fsl,pq3-localbus", "simple-bus";</div><div class='add'>+	interrupts = &lt;19 2 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x8000 */</div><div class='add'>+&amp;pci0 {</div><div class='add'>+	compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	interrupts = &lt;24 0x2 0 0&gt;;</div><div class='add'>+	bus-range = &lt;0 0xff&gt;;</div><div class='add'>+	#interrupt-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x9000 */</div><div class='add'>+&amp;pci1 {</div><div class='add'>+	compatible = "fsl,mpc8540-pci";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	interrupts = &lt;25 0x2 0 0&gt;;</div><div class='add'>+	bus-range = &lt;0 0xff&gt;;</div><div class='add'>+	#interrupt-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0xa000 */</div><div class='add'>+&amp;pci2 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;26 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;26 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;soc {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "soc";</div><div class='add'>+	compatible = "fsl,mpc8548-immr", "simple-bus";</div><div class='add'>+	bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='add'>+</div><div class='add'>+	ecm-law@0 {</div><div class='add'>+		compatible = "fsl,ecm-law";</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+		fsl,num-laws = &lt;10&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ecm@1000 {</div><div class='add'>+		compatible = "fsl,mpc8548-ecm", "fsl,ecm";</div><div class='add'>+		reg = &lt;0x1000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;17 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory-controller@2000 {</div><div class='add'>+		compatible = "fsl,mpc8548-memory-controller";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;18 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-i2c-0.dtsi"</div><div class='add'>+/include/ "pq3-i2c-1.dtsi"</div><div class='add'>+/include/ "pq3-duart-0.dtsi"</div><div class='add'>+</div><div class='add'>+	L2: l2-cache-controller@20000 {</div><div class='add'>+		compatible = "fsl,mpc8548-l2-cache-controller";</div><div class='add'>+		reg = &lt;0x20000 0x1000&gt;;</div><div class='add'>+		cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='add'>+		cache-size = &lt;0x80000&gt;; // L2, 512K</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-dma-0.dtsi"</div><div class='add'>+/include/ "pq3-etsec1-0.dtsi"</div><div class='add'>+/include/ "pq3-etsec1-1.dtsi"</div><div class='add'>+/include/ "pq3-etsec1-2.dtsi"</div><div class='add'>+/include/ "pq3-etsec1-3.dtsi"</div><div class='add'>+</div><div class='add'>+/include/ "pq3-sec2.1-0.dtsi"</div><div class='add'>+/include/ "pq3-mpic.dtsi"</div><div class='add'>+</div><div class='add'>+	global-utilities@e0000 {</div><div class='add'>+		compatible = "fsl,mpc8548-guts";</div><div class='add'>+		reg = &lt;0xe0000 0x1000&gt;;</div><div class='add'>+		fsl,has-rstcr;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi b/arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi<br/>new file mode 100644<br/>index 000000000000..289f1218d755<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC8548 Silicon/SoC Device Tree Source (pre include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,MPC8548";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;serial0;</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+		ethernet0 = &amp;enet0;</div><div class='add'>+		ethernet1 = &amp;enet2;</div><div class='add'>+		pci0 = &amp;pci0;</div><div class='add'>+		pci1 = &amp;pci1;</div><div class='add'>+		pci2 = &amp;pci2;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		PowerPC,8548@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi<br/>new file mode 100644<br/>index 000000000000..64e7075a9cd4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi</a></div><div class='hunk'>@@ -0,0 +1,270 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC8568 Silicon/SoC Device Tree Source (post include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;lbc {</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,mpc8568-localbus", "fsl,pq3-localbus", "simple-bus";</div><div class='add'>+	interrupts = &lt;19 2 0 0&gt;;</div><div class='add'>+	sleep = &lt;&amp;pmc 0x08000000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x8000 */</div><div class='add'>+&amp;pci0 {</div><div class='add'>+	compatible = "fsl,mpc8540-pci";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	interrupts = &lt;24 0x2 0 0&gt;;</div><div class='add'>+	bus-range = &lt;0 0xff&gt;;</div><div class='add'>+	#interrupt-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	sleep = &lt;&amp;pmc 0x80000000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0xa000 */</div><div class='add'>+&amp;pci1 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;26 2 0 0&gt;;</div><div class='add'>+	sleep = &lt;&amp;pmc 0x20000000&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;26 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;rio {</div><div class='add'>+	compatible = "fsl,srio";</div><div class='add'>+	interrupts = &lt;48 2 0 0&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	fsl,srio-rmu-handle = &lt;&amp;rmu&gt;;</div><div class='add'>+	sleep = &lt;&amp;pmc 0x00080000&gt;;</div><div class='add'>+	ranges;</div><div class='add'>+</div><div class='add'>+	port1 {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;soc {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "soc";</div><div class='add'>+	compatible = "fsl,mpc8568-immr", "simple-bus";</div><div class='add'>+	bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='add'>+</div><div class='add'>+	ecm-law@0 {</div><div class='add'>+		compatible = "fsl,ecm-law";</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+		fsl,num-laws = &lt;10&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ecm@1000 {</div><div class='add'>+		compatible = "fsl,mpc8568-ecm", "fsl,ecm";</div><div class='add'>+		reg = &lt;0x1000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;17 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory-controller@2000 {</div><div class='add'>+		compatible = "fsl,mpc8568-memory-controller";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;18 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c-sleep-nexus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		sleep = &lt;&amp;pmc 0x00000004&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+/include/ "pq3-i2c-0.dtsi"</div><div class='add'>+/include/ "pq3-i2c-1.dtsi"</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	duart-sleep-nexus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		sleep = &lt;&amp;pmc 0x00000002&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+/include/ "pq3-duart-0.dtsi"</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	L2: l2-cache-controller@20000 {</div><div class='add'>+		compatible = "fsl,mpc8568-l2-cache-controller";</div><div class='add'>+		reg = &lt;0x20000 0x1000&gt;;</div><div class='add'>+		cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='add'>+		cache-size = &lt;0x80000&gt;; // L2, 512K</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-dma-0.dtsi"</div><div class='add'>+	dma@21300 {</div><div class='add'>+		sleep = &lt;&amp;pmc 0x00000400&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec1-0.dtsi"</div><div class='add'>+	ethernet@24000 {</div><div class='add'>+		sleep = &lt;&amp;pmc 0x00000080&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec1-1.dtsi"</div><div class='add'>+	ethernet@25000 {</div><div class='add'>+		sleep = &lt;&amp;pmc 0x00000040&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	par_io@e0100 {</div><div class='add'>+		reg = &lt;0xe0100 0x100&gt;;</div><div class='add'>+		device_type = "par_io";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-sec2.1-0.dtsi"</div><div class='add'>+	crypto@30000 {</div><div class='add'>+		sleep = &lt;&amp;pmc 0x01000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-mpic.dtsi"</div><div class='add'>+/include/ "pq3-rmu-0.dtsi"</div><div class='add'>+	rmu@d3000 {</div><div class='add'>+		sleep = &lt;&amp;pmc 0x00040000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	global-utilities@e0000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "fsl,mpc8568-guts", "fsl,mpc8548-guts";</div><div class='add'>+		reg = &lt;0xe0000 0x1000&gt;;</div><div class='add'>+		ranges = &lt;0 0xe0000 0x1000&gt;;</div><div class='add'>+		fsl,has-rstcr;</div><div class='add'>+</div><div class='add'>+		pmc: power@70 {</div><div class='add'>+			compatible = "fsl,mpc8568-pmc",</div><div class='add'>+				     "fsl,mpc8548-pmc";</div><div class='add'>+			reg = &lt;0x70 0x20&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;qe {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "qe";</div><div class='add'>+	compatible = "fsl,qe";</div><div class='add'>+	sleep = &lt;&amp;pmc 0x00000800&gt;;</div><div class='add'>+	brg-frequency = &lt;0&gt;;</div><div class='add'>+	bus-frequency = &lt;396000000&gt;;</div><div class='add'>+	fsl,qe-num-riscs = &lt;2&gt;;</div><div class='add'>+	fsl,qe-num-snums = &lt;28&gt;;</div><div class='add'>+</div><div class='add'>+	qeic: interrupt-controller@80 {</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		compatible = "fsl,qe-ic";</div><div class='add'>+		#address-cells = &lt;0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0x80 0x80&gt;;</div><div class='add'>+		interrupts = &lt;46 2 0 0 46 2 0 0&gt;; //high:30 low:30</div><div class='add'>+		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi@4c0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "fsl,spi";</div><div class='add'>+		reg = &lt;0x4c0 0x40&gt;;</div><div class='add'>+		cell-index = &lt;0&gt;;</div><div class='add'>+		interrupts = &lt;2&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi@500 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+		compatible = "fsl,spi";</div><div class='add'>+		reg = &lt;0x500 0x40&gt;;</div><div class='add'>+		interrupts = &lt;1&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ucc@2000 {</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0x2000 0x200&gt;;</div><div class='add'>+		interrupts = &lt;32&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ucc@3000 {</div><div class='add'>+		cell-index = &lt;2&gt;;</div><div class='add'>+		reg = &lt;0x3000 0x200&gt;;</div><div class='add'>+		interrupts = &lt;33&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	muram@10000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "fsl,qe-muram", "fsl,cpm-muram";</div><div class='add'>+		ranges = &lt;0x0 0x10000 0x10000&gt;;</div><div class='add'>+</div><div class='add'>+		data-only@0 {</div><div class='add'>+			compatible = "fsl,qe-muram-data",</div><div class='add'>+				     "fsl,cpm-muram-data";</div><div class='add'>+			reg = &lt;0x0 0x10000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi b/arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi<br/>new file mode 100644<br/>index 000000000000..eacd62c5fe6c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC8568 Silicon/SoC Device Tree Source (pre include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,MPC8568";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;serial0;</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+		ethernet0 = &amp;enet0;</div><div class='add'>+		ethernet1 = &amp;enet1;</div><div class='add'>+		ethernet2 = &amp;enet2;</div><div class='add'>+		ethernet3 = &amp;enet3;</div><div class='add'>+		pci0 = &amp;pci0;</div><div class='add'>+		pci1 = &amp;pci1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		PowerPC,8568@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+			sleep = &lt;&amp;pmc 0x00008000	// core</div><div class='add'>+				 &amp;pmc 0x00004000&gt;;	// timebase</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi<br/>new file mode 100644<br/>index 000000000000..3e6346a4a183<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi</a></div><div class='hunk'>@@ -0,0 +1,304 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC8569 Silicon/SoC Device Tree Source (post include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;lbc {</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,mpc8569-elbc", "fsl,elbc", "simple-bus";</div><div class='add'>+	interrupts = &lt;19 2 0 0&gt;;</div><div class='add'>+	sleep = &lt;&amp;pmc 0x08000000&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0xa000 */</div><div class='add'>+&amp;pci1 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;26 2 0 0&gt;;</div><div class='add'>+	sleep = &lt;&amp;pmc 0x20000000&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;26 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;rio {</div><div class='add'>+	compatible = "fsl,srio";</div><div class='add'>+	interrupts = &lt;48 2 0 0&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	fsl,srio-rmu-handle = &lt;&amp;rmu&gt;;</div><div class='add'>+	sleep = &lt;&amp;pmc 0x00080000&gt;;</div><div class='add'>+	ranges;</div><div class='add'>+</div><div class='add'>+	port1 {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	port2 {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		cell-index = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;soc {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "soc";</div><div class='add'>+	compatible = "fsl,mpc8569-immr", "simple-bus";</div><div class='add'>+	bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='add'>+</div><div class='add'>+	ecm-law@0 {</div><div class='add'>+		compatible = "fsl,ecm-law";</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+		fsl,num-laws = &lt;10&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ecm@1000 {</div><div class='add'>+		compatible = "fsl,mpc8569-ecm", "fsl,ecm";</div><div class='add'>+		reg = &lt;0x1000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;17 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory-controller@2000 {</div><div class='add'>+		compatible = "fsl,mpc8569-memory-controller";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;18 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i2c-sleep-nexus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		sleep = &lt;&amp;pmc 0x00000004&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+/include/ "pq3-i2c-0.dtsi"</div><div class='add'>+/include/ "pq3-i2c-1.dtsi"</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	duart-sleep-nexus {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "simple-bus";</div><div class='add'>+		sleep = &lt;&amp;pmc 0x00000002&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+/include/ "pq3-duart-0.dtsi"</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	L2: l2-cache-controller@20000 {</div><div class='add'>+		compatible = "fsl,mpc8569-l2-cache-controller";</div><div class='add'>+		reg = &lt;0x20000 0x1000&gt;;</div><div class='add'>+		cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='add'>+		cache-size = &lt;0x80000&gt;; // L2, 512K</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-dma-0.dtsi"</div><div class='add'>+/include/ "pq3-esdhc-0.dtsi"</div><div class='add'>+	sdhc@2e000 {</div><div class='add'>+		sleep = &lt;&amp;pmc 0x00200000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	par_io@e0100 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0xe0100 0x100&gt;;</div><div class='add'>+		ranges = &lt;0x0 0xe0100 0x100&gt;;</div><div class='add'>+		device_type = "par_io";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-sec3.1-0.dtsi"</div><div class='add'>+	crypto@30000 {</div><div class='add'>+		sleep = &lt;&amp;pmc 0x01000000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-mpic.dtsi"</div><div class='add'>+/include/ "pq3-rmu-0.dtsi"</div><div class='add'>+	rmu@d3000 {</div><div class='add'>+		sleep = &lt;&amp;pmc 0x00040000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	global-utilities@e0000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "fsl,mpc8569-guts", "fsl,mpc8548-guts";</div><div class='add'>+		reg = &lt;0xe0000 0x1000&gt;;</div><div class='add'>+		ranges = &lt;0 0xe0000 0x1000&gt;;</div><div class='add'>+		fsl,has-rstcr;</div><div class='add'>+</div><div class='add'>+		pmc: power@70 {</div><div class='add'>+			compatible = "fsl,mpc8569-pmc",</div><div class='add'>+				     "fsl,mpc8548-pmc";</div><div class='add'>+			reg = &lt;0x70 0x20&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;qe {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "qe";</div><div class='add'>+	compatible = "fsl,qe";</div><div class='add'>+	sleep = &lt;&amp;pmc 0x00000800&gt;;</div><div class='add'>+	brg-frequency = &lt;0&gt;;</div><div class='add'>+	bus-frequency = &lt;0&gt;;</div><div class='add'>+	fsl,qe-num-riscs = &lt;4&gt;;</div><div class='add'>+	fsl,qe-num-snums = &lt;46&gt;;</div><div class='add'>+</div><div class='add'>+	qeic: interrupt-controller@80 {</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		compatible = "fsl,qe-ic";</div><div class='add'>+		#address-cells = &lt;0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0x80 0x80&gt;;</div><div class='add'>+		interrupts = &lt;46 2 0 0 46 2 0 0&gt;; //high:30 low:30</div><div class='add'>+		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	timer@440 {</div><div class='add'>+		compatible = "fsl,mpc8569-qe-gtm",</div><div class='add'>+			     "fsl,qe-gtm", "fsl,gtm";</div><div class='add'>+		reg = &lt;0x440 0x40&gt;;</div><div class='add'>+		interrupts = &lt;12 13 14 15&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='add'>+		/* Filled in by U-Boot */</div><div class='add'>+		clock-frequency = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi@4c0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "fsl,mpc8569-qe-spi", "fsl,spi";</div><div class='add'>+		reg = &lt;0x4c0 0x40&gt;;</div><div class='add'>+		cell-index = &lt;0&gt;;</div><div class='add'>+		interrupts = &lt;2&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi@500 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+		compatible = "fsl,spi";</div><div class='add'>+		reg = &lt;0x500 0x40&gt;;</div><div class='add'>+		interrupts = &lt;1&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb@6c0 {</div><div class='add'>+		compatible = "fsl,mpc8569-qe-usb",</div><div class='add'>+			     "fsl,mpc8323-qe-usb";</div><div class='add'>+		reg = &lt;0x6c0 0x40 0x8b00 0x100&gt;;</div><div class='add'>+		interrupts = &lt;11&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ucc@2000 {</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0x2000 0x200&gt;;</div><div class='add'>+		interrupts = &lt;32&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ucc@2200 {</div><div class='add'>+		cell-index = &lt;3&gt;;</div><div class='add'>+		reg = &lt;0x2200 0x200&gt;;</div><div class='add'>+		interrupts = &lt;34&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ucc@3000 {</div><div class='add'>+		cell-index = &lt;2&gt;;</div><div class='add'>+		reg = &lt;0x3000 0x200&gt;;</div><div class='add'>+		interrupts = &lt;33&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ucc@3200 {</div><div class='add'>+		cell-index = &lt;4&gt;;</div><div class='add'>+		reg = &lt;0x3200 0x200&gt;;</div><div class='add'>+		interrupts = &lt;35&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ucc@3400 {</div><div class='add'>+		cell-index = &lt;6&gt;;</div><div class='add'>+		reg = &lt;0x3400 0x200&gt;;</div><div class='add'>+		interrupts = &lt;41&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ucc@3600 {</div><div class='add'>+		cell-index = &lt;8&gt;;</div><div class='add'>+		reg = &lt;0x3600 0x200&gt;;</div><div class='add'>+		interrupts = &lt;43&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	muram@10000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "fsl,qe-muram", "fsl,cpm-muram";</div><div class='add'>+		ranges = &lt;0x0 0x10000 0x20000&gt;;</div><div class='add'>+</div><div class='add'>+		data-only@0 {</div><div class='add'>+			compatible = "fsl,qe-muram-data",</div><div class='add'>+				     "fsl,cpm-muram-data";</div><div class='add'>+			reg = &lt;0x0 0x20000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi b/arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi<br/>new file mode 100644<br/>index 000000000000..b07064d11930<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC8569 Silicon/SoC Device Tree Source (pre include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,MPC8569";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;serial0;</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+		ethernet0 = &amp;enet0;</div><div class='add'>+		ethernet1 = &amp;enet1;</div><div class='add'>+		ethernet2 = &amp;enet2;</div><div class='add'>+		ethernet3 = &amp;enet3;</div><div class='add'>+		pci1 = &amp;pci1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		PowerPC,8569@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+			sleep = &lt;&amp;pmc 0x00008000	// core</div><div class='add'>+				 &amp;pmc 0x00004000&gt;;	// timebase</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi<br/>new file mode 100644<br/>index 000000000000..d44e25a48734<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi</a></div><div class='hunk'>@@ -0,0 +1,196 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC8572 Silicon/SoC Device Tree Source (post include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;lbc {</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,mpc8572-elbc", "fsl,elbc", "simple-bus";</div><div class='add'>+	interrupts = &lt;19 2 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x8000 */</div><div class='add'>+&amp;pci0 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;24 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;24 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x8 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x9 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0xa 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0xb 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x9000 */</div><div class='add'>+&amp;pci1 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;25 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;25 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x4 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x5 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x6 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x7 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0xa000 */</div><div class='add'>+&amp;pci2 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;26 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;26 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;soc {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "soc";</div><div class='add'>+	compatible = "fsl,mpc8572-immr", "simple-bus";</div><div class='add'>+	bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='add'>+</div><div class='add'>+	ecm-law@0 {</div><div class='add'>+		compatible = "fsl,ecm-law";</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+		fsl,num-laws = &lt;12&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ecm@1000 {</div><div class='add'>+		compatible = "fsl,mpc8572-ecm", "fsl,ecm";</div><div class='add'>+		reg = &lt;0x1000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;17 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory-controller@2000 {</div><div class='add'>+		compatible = "fsl,mpc8572-memory-controller";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;18 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory-controller@6000 {</div><div class='add'>+		compatible = "fsl,mpc8572-memory-controller";</div><div class='add'>+		reg = &lt;0x6000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;18 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-i2c-0.dtsi"</div><div class='add'>+/include/ "pq3-i2c-1.dtsi"</div><div class='add'>+/include/ "pq3-duart-0.dtsi"</div><div class='add'>+/include/ "pq3-dma-1.dtsi"</div><div class='add'>+/include/ "pq3-gpio-0.dtsi"</div><div class='add'>+	gpio-controller@f000 {</div><div class='add'>+		compatible = "fsl,mpc8572-gpio", "fsl,pq3-gpio";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	L2: l2-cache-controller@20000 {</div><div class='add'>+		compatible = "fsl,mpc8572-l2-cache-controller";</div><div class='add'>+		reg = &lt;0x20000 0x1000&gt;;</div><div class='add'>+		cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='add'>+		cache-size = &lt;0x100000&gt;; // L2,1M</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-dma-0.dtsi"</div><div class='add'>+/include/ "pq3-etsec1-0.dtsi"</div><div class='add'>+/include/ "pq3-etsec1-timer-0.dtsi"</div><div class='add'>+</div><div class='add'>+	ptp_clock@24e00 {</div><div class='add'>+		interrupts = &lt;68 2 0 0 69 2 0 0 70 2 0 0 71 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec1-1.dtsi"</div><div class='add'>+/include/ "pq3-etsec1-2.dtsi"</div><div class='add'>+/include/ "pq3-etsec1-3.dtsi"</div><div class='add'>+/include/ "pq3-sec3.0-0.dtsi"</div><div class='add'>+/include/ "pq3-mpic.dtsi"</div><div class='add'>+/include/ "pq3-mpic-timer-B.dtsi"</div><div class='add'>+</div><div class='add'>+	global-utilities@e0000 {</div><div class='add'>+		compatible = "fsl,mpc8572-guts";</div><div class='add'>+		reg = &lt;0xe0000 0x1000&gt;;</div><div class='add'>+		fsl,has-rstcr;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi b/arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi<br/>new file mode 100644<br/>index 000000000000..ca188326c2ca<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi</a></div><div class='hunk'>@@ -0,0 +1,70 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC8572 Silicon/SoC Device Tree Source (pre include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,MPC8572";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;serial0;</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+		ethernet0 = &amp;enet0;</div><div class='add'>+		ethernet1 = &amp;enet1;</div><div class='add'>+		ethernet2 = &amp;enet2;</div><div class='add'>+		ethernet3 = &amp;enet3;</div><div class='add'>+		pci0 = &amp;pci0;</div><div class='add'>+		pci1 = &amp;pci1;</div><div class='add'>+		pci2 = &amp;pci2;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		PowerPC,8572@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		PowerPC,8572@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x1&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi<br/>new file mode 100644<br/>index 000000000000..bd9e163c764b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p1010si-post.dtsi</a></div><div class='hunk'>@@ -0,0 +1,198 @@</div><div class='add'>+/*</div><div class='add'>+ * P1010/P1014 Silicon/SoC Device Tree Source (post include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;ifc {</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,ifc", "simple-bus";</div><div class='add'>+	interrupts = &lt;16 2 0 0 19 2 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x9000 */</div><div class='add'>+&amp;pci0 {</div><div class='add'>+	compatible = "fsl,p1010-pcie", "fsl,qoriq-pcie-v2.3", "fsl,qoriq-pcie-v2.2";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x4 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x5 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x6 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x7 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0xa000 */</div><div class='add'>+&amp;pci1 {</div><div class='add'>+	compatible = "fsl,p1010-pcie", "fsl,qoriq-pcie-v2.3", "fsl,qoriq-pcie-v2.2";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;soc {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "soc";</div><div class='add'>+	compatible = "fsl,p1010-immr", "simple-bus";</div><div class='add'>+	bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='add'>+</div><div class='add'>+	ecm-law@0 {</div><div class='add'>+		compatible = "fsl,ecm-law";</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+		fsl,num-laws = &lt;12&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ecm@1000 {</div><div class='add'>+		compatible = "fsl,p1010-ecm", "fsl,ecm";</div><div class='add'>+		reg = &lt;0x1000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory-controller@2000 {</div><div class='add'>+		compatible = "fsl,p1010-memory-controller";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-i2c-0.dtsi"</div><div class='add'>+/include/ "pq3-i2c-1.dtsi"</div><div class='add'>+/include/ "pq3-duart-0.dtsi"</div><div class='add'>+/include/ "pq3-espi-0.dtsi"</div><div class='add'>+	spi0: spi@7000 {</div><div class='add'>+		fsl,espi-num-chipselects = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-gpio-0.dtsi"</div><div class='add'>+/include/ "pq3-sata2-0.dtsi"</div><div class='add'>+/include/ "pq3-sata2-1.dtsi"</div><div class='add'>+</div><div class='add'>+	can0: can@1c000 {</div><div class='add'>+		compatible = "fsl,p1010-flexcan";</div><div class='add'>+		reg = &lt;0x1c000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;48 0x2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	can1: can@1d000 {</div><div class='add'>+		compatible = "fsl,p1010-flexcan";</div><div class='add'>+		reg = &lt;0x1d000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;61 0x2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	L2: l2-cache-controller@20000 {</div><div class='add'>+		compatible = "fsl,p1010-l2-cache-controller",</div><div class='add'>+				"fsl,p1014-l2-cache-controller";</div><div class='add'>+		reg = &lt;0x20000 0x1000&gt;;</div><div class='add'>+		cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='add'>+		cache-size = &lt;0x40000&gt;; // L2,256K</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-dma-0.dtsi"</div><div class='add'>+/include/ "pq3-usb2-dr-0.dtsi"</div><div class='add'>+/include/ "pq3-esdhc-0.dtsi"</div><div class='add'>+	sdhc@2e000 {</div><div class='add'>+		fsl,sdhci-auto-cmd12;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-sec4.4-0.dtsi"</div><div class='add'>+/include/ "pq3-mpic.dtsi"</div><div class='add'>+/include/ "pq3-mpic-timer-B.dtsi"</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec2-0.dtsi"</div><div class='add'>+	enet0: ethernet@b0000 {</div><div class='add'>+		queue-group@b0000 {</div><div class='add'>+			fsl,rx-bit-map = &lt;0xff&gt;;</div><div class='add'>+			fsl,tx-bit-map = &lt;0xff&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec2-1.dtsi"</div><div class='add'>+	enet1: ethernet@b1000 {</div><div class='add'>+		queue-group@b1000 {</div><div class='add'>+			fsl,rx-bit-map = &lt;0xff&gt;;</div><div class='add'>+			fsl,tx-bit-map = &lt;0xff&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec2-2.dtsi"</div><div class='add'>+	enet2: ethernet@b2000 {</div><div class='add'>+		queue-group@b2000 {</div><div class='add'>+			fsl,rx-bit-map = &lt;0xff&gt;;</div><div class='add'>+			fsl,tx-bit-map = &lt;0xff&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	global-utilities@e0000 {</div><div class='add'>+		compatible = "fsl,p1010-guts";</div><div class='add'>+		reg = &lt;0xe0000 0x1000&gt;;</div><div class='add'>+		fsl,has-rstcr;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi<br/>new file mode 100644<br/>index 000000000000..7354a8f90ea5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+/*</div><div class='add'>+ * P1010/P1014 Silicon/SoC Device Tree Source (pre include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,P1010";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;serial0;</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+		ethernet0 = &amp;enet0;</div><div class='add'>+		ethernet1 = &amp;enet1;</div><div class='add'>+		ethernet2 = &amp;enet2;</div><div class='add'>+		pci0 = &amp;pci0;</div><div class='add'>+		pci1 = &amp;pci1;</div><div class='add'>+		can0 = &amp;can0;</div><div class='add'>+		can1 = &amp;can1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		PowerPC,P1010@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p1020si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1020si-post.dtsi<br/>new file mode 100644<br/>index 000000000000..fc924c5ffebe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p1020si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p1020si-post.dtsi</a></div><div class='hunk'>@@ -0,0 +1,174 @@</div><div class='add'>+/*</div><div class='add'>+ * P1020/P1011 Silicon/SoC Device Tree Source (post include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;lbc {</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,p1020-elbc", "fsl,elbc", "simple-bus";</div><div class='add'>+	interrupts = &lt;19 2 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x9000 */</div><div class='add'>+&amp;pci0 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x4 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x5 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x6 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x7 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0xa000 */</div><div class='add'>+&amp;pci1 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;soc {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "soc";</div><div class='add'>+	compatible = "fsl,p1020-immr", "simple-bus";</div><div class='add'>+	bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='add'>+</div><div class='add'>+	ecm-law@0 {</div><div class='add'>+		compatible = "fsl,ecm-law";</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+		fsl,num-laws = &lt;12&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ecm@1000 {</div><div class='add'>+		compatible = "fsl,p1020-ecm", "fsl,ecm";</div><div class='add'>+		reg = &lt;0x1000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory-controller@2000 {</div><div class='add'>+		compatible = "fsl,p1020-memory-controller";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-i2c-0.dtsi"</div><div class='add'>+/include/ "pq3-i2c-1.dtsi"</div><div class='add'>+/include/ "pq3-duart-0.dtsi"</div><div class='add'>+</div><div class='add'>+/include/ "pq3-espi-0.dtsi"</div><div class='add'>+	spi@7000 {</div><div class='add'>+		fsl,espi-num-chipselects = &lt;4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-gpio-0.dtsi"</div><div class='add'>+</div><div class='add'>+	L2: l2-cache-controller@20000 {</div><div class='add'>+		compatible = "fsl,p1020-l2-cache-controller";</div><div class='add'>+		reg = &lt;0x20000 0x1000&gt;;</div><div class='add'>+		cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='add'>+		cache-size = &lt;0x40000&gt;; // L2,256K</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-dma-0.dtsi"</div><div class='add'>+/include/ "pq3-usb2-dr-0.dtsi"</div><div class='add'>+/include/ "pq3-usb2-dr-1.dtsi"</div><div class='add'>+</div><div class='add'>+/include/ "pq3-esdhc-0.dtsi"</div><div class='add'>+/include/ "pq3-sec3.3-0.dtsi"</div><div class='add'>+</div><div class='add'>+/include/ "pq3-mpic.dtsi"</div><div class='add'>+/include/ "pq3-mpic-timer-B.dtsi"</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec2-0.dtsi"</div><div class='add'>+	enet0: enet0_grp2: ethernet@b0000 {</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec2-1.dtsi"</div><div class='add'>+	enet1: enet1_grp2: ethernet@b1000 {</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec2-2.dtsi"</div><div class='add'>+	enet2: enet2_grp2: ethernet@b2000 {</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	global-utilities@e0000 {</div><div class='add'>+		compatible = "fsl,p1020-guts";</div><div class='add'>+		reg = &lt;0xe0000 0x1000&gt;;</div><div class='add'>+		fsl,has-rstcr;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec2-grp2-0.dtsi"</div><div class='add'>+/include/ "pq3-etsec2-grp2-1.dtsi"</div><div class='add'>+/include/ "pq3-etsec2-grp2-2.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi<br/>new file mode 100644<br/>index 000000000000..6f0376e554eb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+/*</div><div class='add'>+ * P1020/P1011 Silicon/SoC Device Tree Source (pre include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,P1020";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;serial0;</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+		ethernet0 = &amp;enet0;</div><div class='add'>+		ethernet1 = &amp;enet1;</div><div class='add'>+		ethernet2 = &amp;enet2;</div><div class='add'>+		pci0 = &amp;pci0;</div><div class='add'>+		pci1 = &amp;pci1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		PowerPC,P1020@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		PowerPC,P1020@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x1&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p1021si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1021si-post.dtsi<br/>new file mode 100644<br/>index 000000000000..38ba54d1e32e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p1021si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p1021si-post.dtsi</a></div><div class='hunk'>@@ -0,0 +1,225 @@</div><div class='add'>+/*</div><div class='add'>+ * P1021/P1012 Silicon/SoC Device Tree Source (post include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;lbc {</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,p1021-elbc", "fsl,elbc", "simple-bus";</div><div class='add'>+	interrupts = &lt;19 2 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x9000 */</div><div class='add'>+&amp;pci0 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x4 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x5 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x6 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x7 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0xa000 */</div><div class='add'>+&amp;pci1 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;soc {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "soc";</div><div class='add'>+	compatible = "fsl,p1021-immr", "simple-bus";</div><div class='add'>+	bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='add'>+</div><div class='add'>+	ecm-law@0 {</div><div class='add'>+		compatible = "fsl,ecm-law";</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+		fsl,num-laws = &lt;12&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ecm@1000 {</div><div class='add'>+		compatible = "fsl,p1021-ecm", "fsl,ecm";</div><div class='add'>+		reg = &lt;0x1000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory-controller@2000 {</div><div class='add'>+		compatible = "fsl,p1021-memory-controller";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-i2c-0.dtsi"</div><div class='add'>+/include/ "pq3-i2c-1.dtsi"</div><div class='add'>+/include/ "pq3-duart-0.dtsi"</div><div class='add'>+</div><div class='add'>+/include/ "pq3-espi-0.dtsi"</div><div class='add'>+	spi@7000 {</div><div class='add'>+		fsl,espi-num-chipselects = &lt;4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-gpio-0.dtsi"</div><div class='add'>+</div><div class='add'>+	L2: l2-cache-controller@20000 {</div><div class='add'>+		compatible = "fsl,p1021-l2-cache-controller";</div><div class='add'>+		reg = &lt;0x20000 0x1000&gt;;</div><div class='add'>+		cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='add'>+		cache-size = &lt;0x40000&gt;; // L2,256K</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-dma-0.dtsi"</div><div class='add'>+/include/ "pq3-usb2-dr-0.dtsi"</div><div class='add'>+</div><div class='add'>+/include/ "pq3-esdhc-0.dtsi"</div><div class='add'>+/include/ "pq3-sec3.3-0.dtsi"</div><div class='add'>+</div><div class='add'>+/include/ "pq3-mpic.dtsi"</div><div class='add'>+/include/ "pq3-mpic-timer-B.dtsi"</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec2-0.dtsi"</div><div class='add'>+	enet0: enet0_grp2: ethernet@b0000 {</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec2-1.dtsi"</div><div class='add'>+	enet1: enet1_grp2: ethernet@b1000 {</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec2-2.dtsi"</div><div class='add'>+	enet2: enet2_grp2: ethernet@b2000 {</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	global-utilities@e0000 {</div><div class='add'>+		compatible = "fsl,p1021-guts";</div><div class='add'>+		reg = &lt;0xe0000 0x1000&gt;;</div><div class='add'>+		fsl,has-rstcr;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;qe {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "qe";</div><div class='add'>+	compatible = "fsl,qe";</div><div class='add'>+	fsl,qe-num-riscs = &lt;1&gt;;</div><div class='add'>+	fsl,qe-num-snums = &lt;28&gt;;</div><div class='add'>+</div><div class='add'>+	qeic: interrupt-controller@80 {</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		compatible = "fsl,qe-ic";</div><div class='add'>+		#address-cells = &lt;0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0x80 0x80&gt;;</div><div class='add'>+		interrupts = &lt;63 2 0 0 60 2 0 0&gt;; //high:47 low:44</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ucc@2000 {</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0x2000 0x200&gt;;</div><div class='add'>+		interrupts = &lt;32&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio@2120 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		reg = &lt;0x2120 0x18&gt;;</div><div class='add'>+		compatible = "fsl,ucc-mdio";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ucc@2400 {</div><div class='add'>+		cell-index = &lt;5&gt;;</div><div class='add'>+		reg = &lt;0x2400 0x200&gt;;</div><div class='add'>+		interrupts = &lt;40&gt;;</div><div class='add'>+		interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	muram@10000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "fsl,qe-muram", "fsl,cpm-muram";</div><div class='add'>+		ranges = &lt;0x0 0x10000 0x6000&gt;;</div><div class='add'>+</div><div class='add'>+		data-only@0 {</div><div class='add'>+			compatible = "fsl,qe-muram-data",</div><div class='add'>+			"fsl,cpm-muram-data";</div><div class='add'>+			reg = &lt;0x0 0x6000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec2-grp2-0.dtsi"</div><div class='add'>+/include/ "pq3-etsec2-grp2-1.dtsi"</div><div class='add'>+/include/ "pq3-etsec2-grp2-2.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi<br/>new file mode 100644<br/>index 000000000000..4abd54bc3308<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+/*</div><div class='add'>+ * P1021/P1012 Silicon/SoC Device Tree Source (pre include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,P1021";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;serial0;</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+		ethernet0 = &amp;enet0;</div><div class='add'>+		ethernet1 = &amp;enet1;</div><div class='add'>+		ethernet2 = &amp;enet2;</div><div class='add'>+		pci0 = &amp;pci0;</div><div class='add'>+		pci1 = &amp;pci1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		PowerPC,P1021@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		PowerPC,P1021@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x1&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi<br/>new file mode 100644<br/>index 000000000000..16239b199d0a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p1022si-post.dtsi</a></div><div class='hunk'>@@ -0,0 +1,235 @@</div><div class='add'>+/*</div><div class='add'>+ * P1022/P1013 Silicon/SoC Device Tree Source (post include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;lbc {</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,p1022-elbc", "fsl,elbc", "simple-bus";</div><div class='add'>+	interrupts = &lt;19 2 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x9000 */</div><div class='add'>+&amp;pci0 {</div><div class='add'>+	compatible = "fsl,p1022-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x4 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x5 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x6 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x7 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0xa000 */</div><div class='add'>+&amp;pci1 {</div><div class='add'>+	compatible = "fsl,p1022-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0xb000 */</div><div class='add'>+&amp;pci2 {</div><div class='add'>+	compatible = "fsl,p1022-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x8 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x9 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0xa 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0xb 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;soc {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "soc";</div><div class='add'>+	compatible = "fsl,p1022-immr", "simple-bus";</div><div class='add'>+	bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='add'>+</div><div class='add'>+	ecm-law@0 {</div><div class='add'>+		compatible = "fsl,ecm-law";</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+		fsl,num-laws = &lt;12&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ecm@1000 {</div><div class='add'>+		compatible = "fsl,p1022-ecm", "fsl,ecm";</div><div class='add'>+		reg = &lt;0x1000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory-controller@2000 {</div><div class='add'>+		compatible = "fsl,p1022-memory-controller";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-i2c-0.dtsi"</div><div class='add'>+/include/ "pq3-i2c-1.dtsi"</div><div class='add'>+/include/ "pq3-duart-0.dtsi"</div><div class='add'>+/include/ "pq3-espi-0.dtsi"</div><div class='add'>+	spi@7000 {</div><div class='add'>+		fsl,espi-num-chipselects = &lt;4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-dma-1.dtsi"</div><div class='add'>+	dma@c300 {</div><div class='add'>+		dma00: dma-channel@0 {</div><div class='add'>+			compatible = "fsl,ssi-dma-channel";</div><div class='add'>+		};</div><div class='add'>+		dma01: dma-channel@80 {</div><div class='add'>+			compatible = "fsl,ssi-dma-channel";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-gpio-0.dtsi"</div><div class='add'>+</div><div class='add'>+	display@10000 {</div><div class='add'>+		compatible = "fsl,diu", "fsl,p1022-diu";</div><div class='add'>+		reg = &lt;0x10000 1000&gt;;</div><div class='add'>+		interrupts = &lt;64 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ssi@15000 {</div><div class='add'>+		compatible = "fsl,mpc8610-ssi";</div><div class='add'>+		cell-index = &lt;0&gt;;</div><div class='add'>+		reg = &lt;0x15000 0x100&gt;;</div><div class='add'>+		interrupts = &lt;75 2 0 0&gt;;</div><div class='add'>+		fsl,playback-dma = &lt;&amp;dma00&gt;;</div><div class='add'>+		fsl,capture-dma = &lt;&amp;dma01&gt;;</div><div class='add'>+		fsl,fifo-depth = &lt;15&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-sata2-0.dtsi"</div><div class='add'>+/include/ "pq3-sata2-1.dtsi"</div><div class='add'>+</div><div class='add'>+	L2: l2-cache-controller@20000 {</div><div class='add'>+		compatible = "fsl,p1022-l2-cache-controller";</div><div class='add'>+		reg = &lt;0x20000 0x1000&gt;;</div><div class='add'>+		cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='add'>+		cache-size = &lt;0x40000&gt;; // L2,256K</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-dma-0.dtsi"</div><div class='add'>+/include/ "pq3-usb2-dr-0.dtsi"</div><div class='add'>+/include/ "pq3-usb2-dr-1.dtsi"</div><div class='add'>+</div><div class='add'>+/include/ "pq3-esdhc-0.dtsi"</div><div class='add'>+	sdhc@2e000 {</div><div class='add'>+		fsl,sdhci-auto-cmd12;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-sec3.3-0.dtsi"</div><div class='add'>+/include/ "pq3-mpic.dtsi"</div><div class='add'>+/include/ "pq3-mpic-timer-B.dtsi"</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec2-0.dtsi"</div><div class='add'>+	enet0: enet0_grp2: ethernet@b0000 {</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec2-1.dtsi"</div><div class='add'>+	enet1: enet1_grp2: ethernet@b1000 {</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	global-utilities@e0000 {</div><div class='add'>+		compatible = "fsl,p1022-guts";</div><div class='add'>+		reg = &lt;0xe0000 0x1000&gt;;</div><div class='add'>+		fsl,has-rstcr;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	power@e0070{</div><div class='add'>+		compatible = "fsl,mpc8536-pmc", "fsl,mpc8548-pmc";</div><div class='add'>+		reg = &lt;0xe0070 0x20&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec2-grp2-0.dtsi"</div><div class='add'>+/include/ "pq3-etsec2-grp2-1.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi<br/>new file mode 100644<br/>index 000000000000..e930f4f7ca89<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+/*</div><div class='add'>+ * P1022/P1013 Silicon/SoC Device Tree Source (pre include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,P1022";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;serial0;</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+		ethernet0 = &amp;enet0;</div><div class='add'>+		ethernet1 = &amp;enet1;</div><div class='add'>+		pci0 = &amp;pci0;</div><div class='add'>+		pci1 = &amp;pci1;</div><div class='add'>+		pci2 = &amp;pci2;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		PowerPC,P1022@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		PowerPC,P1022@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x1&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p1023si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1023si-post.dtsi<br/>new file mode 100644<br/>index 000000000000..b06bb4cc1fe8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p1023si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p1023si-post.dtsi</a></div><div class='hunk'>@@ -0,0 +1,224 @@</div><div class='add'>+/*</div><div class='add'>+ * P1023/P1017 Silicon/SoC Device Tree Source (post include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;lbc {</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,p1023-elbc", "fsl,elbc", "simple-bus";</div><div class='add'>+	interrupts = &lt;19 2 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0xa000 */</div><div class='add'>+&amp;pci0 {</div><div class='add'>+	compatible = "fsl,p1023-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0x0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x9000 */</div><div class='add'>+&amp;pci1 {</div><div class='add'>+	compatible = "fsl,p1023-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0xb000 */</div><div class='add'>+&amp;pci2 {</div><div class='add'>+	compatible = "fsl,p1023-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0x0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;soc {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "soc";</div><div class='add'>+	compatible = "fsl,p1023-immr", "simple-bus";</div><div class='add'>+	bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='add'>+</div><div class='add'>+	ecm-law@0 {</div><div class='add'>+		compatible = "fsl,ecm-law";</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+		fsl,num-laws = &lt;12&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ecm@1000 {</div><div class='add'>+		compatible = "fsl,p1023-ecm", "fsl,ecm";</div><div class='add'>+		reg = &lt;0x1000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory-controller@2000 {</div><div class='add'>+		compatible = "fsl,p1023-memory-controller";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-i2c-0.dtsi"</div><div class='add'>+/include/ "pq3-i2c-1.dtsi"</div><div class='add'>+/include/ "pq3-duart-0.dtsi"</div><div class='add'>+</div><div class='add'>+/include/ "pq3-espi-0.dtsi"</div><div class='add'>+	spi@7000 {</div><div class='add'>+		fsl,espi-num-chipselects = &lt;4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-gpio-0.dtsi"</div><div class='add'>+</div><div class='add'>+	L2: l2-cache-controller@20000 {</div><div class='add'>+		compatible = "fsl,p1023-l2-cache-controller";</div><div class='add'>+		reg = &lt;0x20000 0x1000&gt;;</div><div class='add'>+		cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='add'>+		cache-size = &lt;0x40000&gt;; // L2,256K</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-dma-0.dtsi"</div><div class='add'>+/include/ "pq3-usb2-dr-0.dtsi"</div><div class='add'>+</div><div class='add'>+	crypto: crypto@300000 {</div><div class='add'>+		compatible = "fsl,sec-v4.2", "fsl,sec-v4.0";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0x30000 0x10000&gt;;</div><div class='add'>+		ranges = &lt;0 0x30000 0x10000&gt;;</div><div class='add'>+		interrupts = &lt;58 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+		sec_jr0: jr@1000 {</div><div class='add'>+			compatible = "fsl,sec-v4.2-job-ring",</div><div class='add'>+				     "fsl,sec-v4.0-job-ring";</div><div class='add'>+			reg = &lt;0x1000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;45 2 0 0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sec_jr1: jr@2000 {</div><div class='add'>+			compatible = "fsl,sec-v4.2-job-ring",</div><div class='add'>+				     "fsl,sec-v4.0-job-ring";</div><div class='add'>+			reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;45 2 0 0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sec_jr2: jr@3000 {</div><div class='add'>+			compatible = "fsl,sec-v4.2-job-ring",</div><div class='add'>+				     "fsl,sec-v4.0-job-ring";</div><div class='add'>+			reg = &lt;0x3000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;57 2 0 0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		sec_jr3: jr@4000 {</div><div class='add'>+			compatible = "fsl,sec-v4.2-job-ring",</div><div class='add'>+				     "fsl,sec-v4.0-job-ring";</div><div class='add'>+			reg = &lt;0x4000 0x1000&gt;;</div><div class='add'>+			interrupts = &lt;57 2 0 0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rtic@6000 {</div><div class='add'>+			compatible = "fsl,sec-v4.2-rtic",</div><div class='add'>+				     "fsl,sec-v4.0-rtic";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			reg = &lt;0x6000 0x100&gt;;</div><div class='add'>+			ranges = &lt;0x0 0x6100 0xe00&gt;;</div><div class='add'>+</div><div class='add'>+			rtic_a: rtic-a@0 {</div><div class='add'>+				compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='add'>+					     "fsl,sec-v4.0-rtic-memory";</div><div class='add'>+				reg = &lt;0x00 0x20 0x100 0x80&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			rtic_b: rtic-b@20 {</div><div class='add'>+				compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='add'>+					     "fsl,sec-v4.0-rtic-memory";</div><div class='add'>+				reg = &lt;0x20 0x20 0x200 0x80&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			rtic_c: rtic-c@40 {</div><div class='add'>+				compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='add'>+					     "fsl,sec-v4.0-rtic-memory";</div><div class='add'>+				reg = &lt;0x40 0x20 0x300 0x80&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			rtic_d: rtic-d@60 {</div><div class='add'>+				compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='add'>+					     "fsl,sec-v4.0-rtic-memory";</div><div class='add'>+				reg = &lt;0x60 0x20 0x500 0x80&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-mpic.dtsi"</div><div class='add'>+/include/ "pq3-mpic-timer-B.dtsi"</div><div class='add'>+</div><div class='add'>+	global-utilities@e0000 {</div><div class='add'>+		compatible = "fsl,p1023-guts";</div><div class='add'>+		reg = &lt;0xe0000 0x1000&gt;;</div><div class='add'>+		fsl,has-rstcr;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi<br/>new file mode 100644<br/>index 000000000000..ac45f6d93385<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi</a></div><div class='hunk'>@@ -0,0 +1,76 @@</div><div class='add'>+/*</div><div class='add'>+ * P1023/P1017 Silicon/SoC Device Tree Source (pre include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,P1023";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;serial0;</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+		pci0 = &amp;pci0;</div><div class='add'>+		pci1 = &amp;pci1;</div><div class='add'>+		pci2 = &amp;pci2;</div><div class='add'>+</div><div class='add'>+		crypto = &amp;crypto;</div><div class='add'>+		sec_jr0 = &amp;sec_jr0;</div><div class='add'>+		sec_jr1 = &amp;sec_jr1;</div><div class='add'>+		sec_jr2 = &amp;sec_jr2;</div><div class='add'>+		sec_jr3 = &amp;sec_jr3;</div><div class='add'>+		rtic_a = &amp;rtic_a;</div><div class='add'>+		rtic_b = &amp;rtic_b;</div><div class='add'>+		rtic_c = &amp;rtic_c;</div><div class='add'>+		rtic_d = &amp;rtic_d;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		PowerPC,P1023@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		PowerPC,P1023@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x1&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p2020si-post.dtsi b/arch/powerpc/boot/dts/fsl/p2020si-post.dtsi<br/>new file mode 100644<br/>index 000000000000..c041050561a7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p2020si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p2020si-post.dtsi</a></div><div class='hunk'>@@ -0,0 +1,194 @@</div><div class='add'>+/*</div><div class='add'>+ * P2020/P2010 Silicon/SoC Device Tree Source (post include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;lbc {</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,p2020-elbc", "fsl,elbc", "simple-bus";</div><div class='add'>+	interrupts = &lt;19 2 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0xa000 */</div><div class='add'>+&amp;pci0 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;26 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;26 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x9000 */</div><div class='add'>+&amp;pci1 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;25 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;25 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x4 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x5 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0x6 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0x7 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x8000 */</div><div class='add'>+&amp;pci2 {</div><div class='add'>+	compatible = "fsl,mpc8548-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 255&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;24 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;24 2 0 0&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0x0 0x0 0x1 &amp;mpic 0x8 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x2 &amp;mpic 0x9 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x3 &amp;mpic 0xa 0x1 0x0 0x0</div><div class='add'>+			0000 0x0 0x0 0x4 &amp;mpic 0xb 0x1 0x0 0x0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;soc {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "soc";</div><div class='add'>+	compatible = "fsl,p2020-immr", "simple-bus";</div><div class='add'>+	bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='add'>+</div><div class='add'>+	ecm-law@0 {</div><div class='add'>+		compatible = "fsl,ecm-law";</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+		fsl,num-laws = &lt;12&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ecm@1000 {</div><div class='add'>+		compatible = "fsl,p2020-ecm", "fsl,ecm";</div><div class='add'>+		reg = &lt;0x1000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;17 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory-controller@2000 {</div><div class='add'>+		compatible = "fsl,p2020-memory-controller";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;18 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-i2c-0.dtsi"</div><div class='add'>+/include/ "pq3-i2c-1.dtsi"</div><div class='add'>+/include/ "pq3-duart-0.dtsi"</div><div class='add'>+/include/ "pq3-espi-0.dtsi"</div><div class='add'>+	spi0: spi@7000 {</div><div class='add'>+		fsl,espi-num-chipselects = &lt;4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-dma-1.dtsi"</div><div class='add'>+/include/ "pq3-gpio-0.dtsi"</div><div class='add'>+</div><div class='add'>+	L2: l2-cache-controller@20000 {</div><div class='add'>+		compatible = "fsl,p2020-l2-cache-controller";</div><div class='add'>+		reg = &lt;0x20000 0x1000&gt;;</div><div class='add'>+		cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='add'>+		cache-size = &lt;0x80000&gt;; // L2,512K</div><div class='add'>+		interrupts = &lt;16 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "pq3-dma-0.dtsi"</div><div class='add'>+/include/ "pq3-usb2-dr-0.dtsi"</div><div class='add'>+/include/ "pq3-etsec1-0.dtsi"</div><div class='add'>+/include/ "pq3-etsec1-timer-0.dtsi"</div><div class='add'>+</div><div class='add'>+	ptp_clock@24e00 {</div><div class='add'>+		interrupts = &lt;68 2 0 0 69 2 0 0 70 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/include/ "pq3-etsec1-1.dtsi"</div><div class='add'>+/include/ "pq3-etsec1-2.dtsi"</div><div class='add'>+/include/ "pq3-esdhc-0.dtsi"</div><div class='add'>+/include/ "pq3-sec3.1-0.dtsi"</div><div class='add'>+/include/ "pq3-mpic.dtsi"</div><div class='add'>+/include/ "pq3-mpic-timer-B.dtsi"</div><div class='add'>+</div><div class='add'>+	global-utilities@e0000 {</div><div class='add'>+		compatible = "fsl,p2020-guts";</div><div class='add'>+		reg = &lt;0xe0000 0x1000&gt;;</div><div class='add'>+		fsl,has-rstcr;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi<br/>new file mode 100644<br/>index 000000000000..3213288641d1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+/*</div><div class='add'>+ * P2020/P2010 Silicon/SoC Device Tree Source (pre include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,P2020";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		serial0 = &amp;serial0;</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+		ethernet0 = &amp;enet0;</div><div class='add'>+		ethernet1 = &amp;enet1;</div><div class='add'>+		ethernet2 = &amp;enet2;</div><div class='add'>+		pci0 = &amp;pci0;</div><div class='add'>+		pci1 = &amp;pci1;</div><div class='add'>+		pci2 = &amp;pci2;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		PowerPC,P2020@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		PowerPC,P2020@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0x1&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi b/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi<br/>new file mode 100644<br/>index 000000000000..234a399ddeb2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p2041si-post.dtsi</a></div><div class='hunk'>@@ -0,0 +1,325 @@</div><div class='add'>+/*</div><div class='add'>+ * P2041/P2040 Silicon/SoC Device Tree Source (post include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;lbc {</div><div class='add'>+	compatible = "fsl,p2041-elbc", "fsl,elbc", "simple-bus";</div><div class='add'>+	interrupts = &lt;25 2 0 0&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x200000 */</div><div class='add'>+&amp;pci0 {</div><div class='add'>+	compatible = "fsl,p2041-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0x0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 1 15&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 1 15&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0 0 1 &amp;mpic 40 1 0 0</div><div class='add'>+			0000 0 0 2 &amp;mpic 1 1 0 0</div><div class='add'>+			0000 0 0 3 &amp;mpic 2 1 0 0</div><div class='add'>+			0000 0 0 4 &amp;mpic 3 1 0 0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x201000 */</div><div class='add'>+&amp;pci1 {</div><div class='add'>+	compatible = "fsl,p2041-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 1 14&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 1 14&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0 0 1 &amp;mpic 41 1 0 0</div><div class='add'>+			0000 0 0 2 &amp;mpic 5 1 0 0</div><div class='add'>+			0000 0 0 3 &amp;mpic 6 1 0 0</div><div class='add'>+			0000 0 0 4 &amp;mpic 7 1 0 0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x202000 */</div><div class='add'>+&amp;pci2 {</div><div class='add'>+	compatible = "fsl,p2041-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0x0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 1 13&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 1 13&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0 0 1 &amp;mpic 42 1 0 0</div><div class='add'>+			0000 0 0 2 &amp;mpic 9 1 0 0</div><div class='add'>+			0000 0 0 3 &amp;mpic 10 1 0 0</div><div class='add'>+			0000 0 0 4 &amp;mpic 11 1 0 0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;rio {</div><div class='add'>+	compatible = "fsl,srio";</div><div class='add'>+	interrupts = &lt;16 2 1 11&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'>+	port1 {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	port2 {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		cell-index = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;dcsr {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,dcsr", "simple-bus";</div><div class='add'>+</div><div class='add'>+	dcsr-epu@0 {</div><div class='add'>+		compatible = "fsl,dcsr-epu";</div><div class='add'>+		interrupts = &lt;52 2 0 0</div><div class='add'>+			      84 2 0 0</div><div class='add'>+			      85 2 0 0&gt;;</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-npc {</div><div class='add'>+		compatible = "fsl,dcsr-npc";</div><div class='add'>+		reg = &lt;0x1000 0x1000 0x1000000 0x8000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-nxc@2000 {</div><div class='add'>+		compatible = "fsl,dcsr-nxc";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-corenet {</div><div class='add'>+		compatible = "fsl,dcsr-corenet";</div><div class='add'>+		reg = &lt;0x8000 0x1000 0xB0000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-dpaa@9000 {</div><div class='add'>+		compatible = "fsl,p2041-dcsr-dpaa", "fsl,dcsr-dpaa";</div><div class='add'>+		reg = &lt;0x9000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-ocn@11000 {</div><div class='add'>+		compatible = "fsl,p2041-dcsr-ocn", "fsl,dcsr-ocn";</div><div class='add'>+		reg = &lt;0x11000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-ddr@12000 {</div><div class='add'>+		compatible = "fsl,dcsr-ddr";</div><div class='add'>+		dev-handle = &lt;&amp;ddr1&gt;;</div><div class='add'>+		reg = &lt;0x12000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-nal@18000 {</div><div class='add'>+		compatible = "fsl,p2041-dcsr-nal", "fsl,dcsr-nal";</div><div class='add'>+		reg = &lt;0x18000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-rcpm@22000 {</div><div class='add'>+		compatible = "fsl,p2041-dcsr-rcpm", "fsl,dcsr-rcpm";</div><div class='add'>+		reg = &lt;0x22000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@40000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu0&gt;;</div><div class='add'>+		reg = &lt;0x40000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@41000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu1&gt;;</div><div class='add'>+		reg = &lt;0x41000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@42000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu2&gt;;</div><div class='add'>+		reg = &lt;0x42000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@43000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu3&gt;;</div><div class='add'>+		reg = &lt;0x43000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;soc {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "soc";</div><div class='add'>+	compatible = "simple-bus";</div><div class='add'>+</div><div class='add'>+	soc-sram-error {</div><div class='add'>+		compatible = "fsl,soc-sram-error";</div><div class='add'>+		interrupts = &lt;16 2 1 29&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	corenet-law@0 {</div><div class='add'>+		compatible = "fsl,corenet-law";</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+		fsl,num-laws = &lt;32&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ddr1: memory-controller@8000 {</div><div class='add'>+		compatible = "fsl,qoriq-memory-controller-v4.5", "fsl,qoriq-memory-controller";</div><div class='add'>+		reg = &lt;0x8000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 23&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpc: l3-cache-controller@10000 {</div><div class='add'>+		compatible = "fsl,p2041-l3-cache-controller", "fsl,p4080-l3-cache-controller", "cache";</div><div class='add'>+		reg = &lt;0x10000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 27&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	corenet-cf@18000 {</div><div class='add'>+		compatible = "fsl,corenet-cf";</div><div class='add'>+		reg = &lt;0x18000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 31&gt;;</div><div class='add'>+		fsl,ccf-num-csdids = &lt;32&gt;;</div><div class='add'>+		fsl,ccf-num-snoopids = &lt;32&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	iommu@20000 {</div><div class='add'>+		compatible = "fsl,pamu-v1.0", "fsl,pamu";</div><div class='add'>+		reg = &lt;0x20000 0x4000&gt;;</div><div class='add'>+		interrupts = &lt;</div><div class='add'>+			24 2 0 0</div><div class='add'>+			16 2 1 30&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-mpic.dtsi"</div><div class='add'>+</div><div class='add'>+	guts: global-utilities@e0000 {</div><div class='add'>+		compatible = "fsl,qoriq-device-config-1.0";</div><div class='add'>+		reg = &lt;0xe0000 0xe00&gt;;</div><div class='add'>+		fsl,has-rstcr;</div><div class='add'>+		#sleep-cells = &lt;1&gt;;</div><div class='add'>+		fsl,liodn-bits = &lt;12&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pins: global-utilities@e0e00 {</div><div class='add'>+		compatible = "fsl,qoriq-pin-control-1.0";</div><div class='add'>+		reg = &lt;0xe0e00 0x200&gt;;</div><div class='add'>+		#sleep-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	clockgen: global-utilities@e1000 {</div><div class='add'>+		compatible = "fsl,p2041-clockgen", "fsl,qoriq-clockgen-1.0";</div><div class='add'>+		reg = &lt;0xe1000 0x1000&gt;;</div><div class='add'>+		clock-frequency = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rcpm: global-utilities@e2000 {</div><div class='add'>+		compatible = "fsl,qoriq-rcpm-1.0";</div><div class='add'>+		reg = &lt;0xe2000 0x1000&gt;;</div><div class='add'>+		#sleep-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sfp: sfp@e8000 {</div><div class='add'>+		compatible = "fsl,p2041-sfp", "fsl,qoriq-sfp-1.0";</div><div class='add'>+		reg	   = &lt;0xe8000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serdes: serdes@ea000 {</div><div class='add'>+		compatible = "fsl,p2041-serdes";</div><div class='add'>+		reg	   = &lt;0xea000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-dma-0.dtsi"</div><div class='add'>+/include/ "qoriq-dma-1.dtsi"</div><div class='add'>+/include/ "qoriq-espi-0.dtsi"</div><div class='add'>+	spi@110000 {</div><div class='add'>+		fsl,espi-num-chipselects = &lt;4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-esdhc-0.dtsi"</div><div class='add'>+	sdhc@114000 {</div><div class='add'>+		sdhci,auto-cmd12;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-i2c-0.dtsi"</div><div class='add'>+/include/ "qoriq-i2c-1.dtsi"</div><div class='add'>+/include/ "qoriq-duart-0.dtsi"</div><div class='add'>+/include/ "qoriq-duart-1.dtsi"</div><div class='add'>+/include/ "qoriq-gpio-0.dtsi"</div><div class='add'>+/include/ "qoriq-usb2-mph-0.dtsi"</div><div class='add'>+		usb0: usb@210000 {</div><div class='add'>+			phy_type = "utmi";</div><div class='add'>+			port0;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-usb2-dr-0.dtsi"</div><div class='add'>+		usb1: usb@211000 {</div><div class='add'>+			dr_mode = "host";</div><div class='add'>+			phy_type = "utmi";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-sata2-0.dtsi"</div><div class='add'>+/include/ "qoriq-sata2-1.dtsi"</div><div class='add'>+/include/ "qoriq-sec4.2-0.dtsi"</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi<br/>new file mode 100644<br/>index 000000000000..2d0a40d6b10f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi</a></div><div class='hunk'>@@ -0,0 +1,111 @@</div><div class='add'>+/*</div><div class='add'>+ * P2041 Silicon/SoC Device Tree Source (pre include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,P2041";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		ccsr = &amp;soc;</div><div class='add'>+		dcsr = &amp;dcsr;</div><div class='add'>+</div><div class='add'>+		serial0 = &amp;serial0;</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+		serial2 = &amp;serial2;</div><div class='add'>+		serial3 = &amp;serial3;</div><div class='add'>+		pci0 = &amp;pci0;</div><div class='add'>+		pci1 = &amp;pci1;</div><div class='add'>+		pci2 = &amp;pci2;</div><div class='add'>+		usb0 = &amp;usb0;</div><div class='add'>+		usb1 = &amp;usb1;</div><div class='add'>+		dma0 = &amp;dma0;</div><div class='add'>+		dma1 = &amp;dma1;</div><div class='add'>+		sdhc = &amp;sdhc;</div><div class='add'>+		msi0 = &amp;msi0;</div><div class='add'>+		msi1 = &amp;msi1;</div><div class='add'>+		msi2 = &amp;msi2;</div><div class='add'>+</div><div class='add'>+		crypto = &amp;crypto;</div><div class='add'>+		sec_jr0 = &amp;sec_jr0;</div><div class='add'>+		sec_jr1 = &amp;sec_jr1;</div><div class='add'>+		sec_jr2 = &amp;sec_jr2;</div><div class='add'>+		sec_jr3 = &amp;sec_jr3;</div><div class='add'>+		rtic_a = &amp;rtic_a;</div><div class='add'>+		rtic_b = &amp;rtic_b;</div><div class='add'>+		rtic_c = &amp;rtic_c;</div><div class='add'>+		rtic_d = &amp;rtic_d;</div><div class='add'>+		sec_mon = &amp;sec_mon;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		cpu0: PowerPC,e500mc@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_0&gt;;</div><div class='add'>+			L2_0: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu1: PowerPC,e500mc@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_1&gt;;</div><div class='add'>+			L2_1: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu2: PowerPC,e500mc@2 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;2&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_2&gt;;</div><div class='add'>+			L2_2: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu3: PowerPC,e500mc@3 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;3&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_3&gt;;</div><div class='add'>+			L2_3: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi b/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi<br/>new file mode 100644<br/>index 000000000000..d41d08de7f7e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p3041si-post.dtsi</a></div><div class='hunk'>@@ -0,0 +1,352 @@</div><div class='add'>+/*</div><div class='add'>+ * P3041 Silicon/SoC Device Tree Source (post include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;lbc {</div><div class='add'>+	compatible = "fsl,p3041-elbc", "fsl,elbc", "simple-bus";</div><div class='add'>+	interrupts = &lt;25 2 0 0&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x200000 */</div><div class='add'>+&amp;pci0 {</div><div class='add'>+	compatible = "fsl,p3041-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0x0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 1 15&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 1 15&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0 0 1 &amp;mpic 40 1 0 0</div><div class='add'>+			0000 0 0 2 &amp;mpic 1 1 0 0</div><div class='add'>+			0000 0 0 3 &amp;mpic 2 1 0 0</div><div class='add'>+			0000 0 0 4 &amp;mpic 3 1 0 0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x201000 */</div><div class='add'>+&amp;pci1 {</div><div class='add'>+	compatible = "fsl,p3041-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 1 14&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 1 14&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0 0 1 &amp;mpic 41 1 0 0</div><div class='add'>+			0000 0 0 2 &amp;mpic 5 1 0 0</div><div class='add'>+			0000 0 0 3 &amp;mpic 6 1 0 0</div><div class='add'>+			0000 0 0 4 &amp;mpic 7 1 0 0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x202000 */</div><div class='add'>+&amp;pci2 {</div><div class='add'>+	compatible = "fsl,p3041-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0x0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 1 13&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 1 13&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0 0 1 &amp;mpic 42 1 0 0</div><div class='add'>+			0000 0 0 2 &amp;mpic 9 1 0 0</div><div class='add'>+			0000 0 0 3 &amp;mpic 10 1 0 0</div><div class='add'>+			0000 0 0 4 &amp;mpic 11 1 0 0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x203000 */</div><div class='add'>+&amp;pci3 {</div><div class='add'>+	compatible = "fsl,p3041-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0x0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 1 12&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 1 12&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0 0 1 &amp;mpic 43 1 0 0</div><div class='add'>+			0000 0 0 2 &amp;mpic 0 1 0 0</div><div class='add'>+			0000 0 0 3 &amp;mpic 4 1 0 0</div><div class='add'>+			0000 0 0 4 &amp;mpic 8 1 0 0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;rio {</div><div class='add'>+	compatible = "fsl,srio";</div><div class='add'>+	interrupts = &lt;16 2 1 11&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'>+	port1 {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	port2 {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		cell-index = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;dcsr {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,dcsr", "simple-bus";</div><div class='add'>+</div><div class='add'>+	dcsr-epu@0 {</div><div class='add'>+		compatible = "fsl,dcsr-epu";</div><div class='add'>+		interrupts = &lt;52 2 0 0</div><div class='add'>+			      84 2 0 0</div><div class='add'>+			      85 2 0 0&gt;;</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-npc {</div><div class='add'>+		compatible = "fsl,dcsr-npc";</div><div class='add'>+		reg = &lt;0x1000 0x1000 0x1000000 0x8000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-nxc@2000 {</div><div class='add'>+		compatible = "fsl,dcsr-nxc";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-corenet {</div><div class='add'>+		compatible = "fsl,dcsr-corenet";</div><div class='add'>+		reg = &lt;0x8000 0x1000 0xB0000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-dpaa@9000 {</div><div class='add'>+		compatible = "fsl,p3041-dcsr-dpaa", "fsl,dcsr-dpaa";</div><div class='add'>+		reg = &lt;0x9000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-ocn@11000 {</div><div class='add'>+		compatible = "fsl,p3041-dcsr-ocn", "fsl,dcsr-ocn";</div><div class='add'>+		reg = &lt;0x11000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-ddr@12000 {</div><div class='add'>+		compatible = "fsl,dcsr-ddr";</div><div class='add'>+		dev-handle = &lt;&amp;ddr1&gt;;</div><div class='add'>+		reg = &lt;0x12000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-nal@18000 {</div><div class='add'>+		compatible = "fsl,p3041-dcsr-nal", "fsl,dcsr-nal";</div><div class='add'>+		reg = &lt;0x18000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-rcpm@22000 {</div><div class='add'>+		compatible = "fsl,p3041-dcsr-rcpm", "fsl,dcsr-rcpm";</div><div class='add'>+		reg = &lt;0x22000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@40000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu0&gt;;</div><div class='add'>+		reg = &lt;0x40000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@41000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu1&gt;;</div><div class='add'>+		reg = &lt;0x41000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@42000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu2&gt;;</div><div class='add'>+		reg = &lt;0x42000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@43000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu3&gt;;</div><div class='add'>+		reg = &lt;0x43000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;soc {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "soc";</div><div class='add'>+	compatible = "simple-bus";</div><div class='add'>+</div><div class='add'>+	soc-sram-error {</div><div class='add'>+		compatible = "fsl,soc-sram-error";</div><div class='add'>+		interrupts = &lt;16 2 1 29&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	corenet-law@0 {</div><div class='add'>+		compatible = "fsl,corenet-law";</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+		fsl,num-laws = &lt;32&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ddr1: memory-controller@8000 {</div><div class='add'>+		compatible = "fsl,qoriq-memory-controller-v4.5", "fsl,qoriq-memory-controller";</div><div class='add'>+		reg = &lt;0x8000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 23&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpc: l3-cache-controller@10000 {</div><div class='add'>+		compatible = "fsl,p3041-l3-cache-controller", "fsl,p4080-l3-cache-controller", "cache";</div><div class='add'>+		reg = &lt;0x10000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 27&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	corenet-cf@18000 {</div><div class='add'>+		compatible = "fsl,corenet-cf";</div><div class='add'>+		reg = &lt;0x18000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 31&gt;;</div><div class='add'>+		fsl,ccf-num-csdids = &lt;32&gt;;</div><div class='add'>+		fsl,ccf-num-snoopids = &lt;32&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	iommu@20000 {</div><div class='add'>+		compatible = "fsl,pamu-v1.0", "fsl,pamu";</div><div class='add'>+		reg = &lt;0x20000 0x4000&gt;;</div><div class='add'>+		interrupts = &lt;</div><div class='add'>+			24 2 0 0</div><div class='add'>+			16 2 1 30&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-mpic.dtsi"</div><div class='add'>+</div><div class='add'>+	guts: global-utilities@e0000 {</div><div class='add'>+		compatible = "fsl,qoriq-device-config-1.0";</div><div class='add'>+		reg = &lt;0xe0000 0xe00&gt;;</div><div class='add'>+		fsl,has-rstcr;</div><div class='add'>+		#sleep-cells = &lt;1&gt;;</div><div class='add'>+		fsl,liodn-bits = &lt;12&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pins: global-utilities@e0e00 {</div><div class='add'>+		compatible = "fsl,qoriq-pin-control-1.0";</div><div class='add'>+		reg = &lt;0xe0e00 0x200&gt;;</div><div class='add'>+		#sleep-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	clockgen: global-utilities@e1000 {</div><div class='add'>+		compatible = "fsl,p3041-clockgen", "fsl,qoriq-clockgen-1.0";</div><div class='add'>+		reg = &lt;0xe1000 0x1000&gt;;</div><div class='add'>+		clock-frequency = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rcpm: global-utilities@e2000 {</div><div class='add'>+		compatible = "fsl,qoriq-rcpm-1.0";</div><div class='add'>+		reg = &lt;0xe2000 0x1000&gt;;</div><div class='add'>+		#sleep-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sfp: sfp@e8000 {</div><div class='add'>+		compatible = "fsl,p3041-sfp", "fsl,qoriq-sfp-1.0";</div><div class='add'>+		reg	   = &lt;0xe8000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serdes: serdes@ea000 {</div><div class='add'>+		compatible = "fsl,p3041-serdes";</div><div class='add'>+		reg	   = &lt;0xea000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-dma-0.dtsi"</div><div class='add'>+/include/ "qoriq-dma-1.dtsi"</div><div class='add'>+/include/ "qoriq-espi-0.dtsi"</div><div class='add'>+	spi@110000 {</div><div class='add'>+		fsl,espi-num-chipselects = &lt;4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-esdhc-0.dtsi"</div><div class='add'>+	sdhc@114000 {</div><div class='add'>+		sdhci,auto-cmd12;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-i2c-0.dtsi"</div><div class='add'>+/include/ "qoriq-i2c-1.dtsi"</div><div class='add'>+/include/ "qoriq-duart-0.dtsi"</div><div class='add'>+/include/ "qoriq-duart-1.dtsi"</div><div class='add'>+/include/ "qoriq-gpio-0.dtsi"</div><div class='add'>+/include/ "qoriq-usb2-mph-0.dtsi"</div><div class='add'>+		usb0: usb@210000 {</div><div class='add'>+			phy_type = "utmi";</div><div class='add'>+			port0;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-usb2-dr-0.dtsi"</div><div class='add'>+		usb1: usb@211000 {</div><div class='add'>+			dr_mode = "host";</div><div class='add'>+			phy_type = "utmi";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-sata2-0.dtsi"</div><div class='add'>+/include/ "qoriq-sata2-1.dtsi"</div><div class='add'>+/include/ "qoriq-sec4.2-0.dtsi"</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi<br/>new file mode 100644<br/>index 000000000000..136def3536b6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi</a></div><div class='hunk'>@@ -0,0 +1,112 @@</div><div class='add'>+/*</div><div class='add'>+ * P3041 Silicon/SoC Device Tree Source (pre include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,P3041";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		ccsr = &amp;soc;</div><div class='add'>+		dcsr = &amp;dcsr;</div><div class='add'>+</div><div class='add'>+		serial0 = &amp;serial0;</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+		serial2 = &amp;serial2;</div><div class='add'>+		serial3 = &amp;serial3;</div><div class='add'>+		pci0 = &amp;pci0;</div><div class='add'>+		pci1 = &amp;pci1;</div><div class='add'>+		pci2 = &amp;pci2;</div><div class='add'>+		pci3 = &amp;pci3;</div><div class='add'>+		usb0 = &amp;usb0;</div><div class='add'>+		usb1 = &amp;usb1;</div><div class='add'>+		dma0 = &amp;dma0;</div><div class='add'>+		dma1 = &amp;dma1;</div><div class='add'>+		sdhc = &amp;sdhc;</div><div class='add'>+		msi0 = &amp;msi0;</div><div class='add'>+		msi1 = &amp;msi1;</div><div class='add'>+		msi2 = &amp;msi2;</div><div class='add'>+</div><div class='add'>+		crypto = &amp;crypto;</div><div class='add'>+		sec_jr0 = &amp;sec_jr0;</div><div class='add'>+		sec_jr1 = &amp;sec_jr1;</div><div class='add'>+		sec_jr2 = &amp;sec_jr2;</div><div class='add'>+		sec_jr3 = &amp;sec_jr3;</div><div class='add'>+		rtic_a = &amp;rtic_a;</div><div class='add'>+		rtic_b = &amp;rtic_b;</div><div class='add'>+		rtic_c = &amp;rtic_c;</div><div class='add'>+		rtic_d = &amp;rtic_d;</div><div class='add'>+		sec_mon = &amp;sec_mon;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		cpu0: PowerPC,e500mc@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_0&gt;;</div><div class='add'>+			L2_0: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu1: PowerPC,e500mc@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_1&gt;;</div><div class='add'>+			L2_1: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu2: PowerPC,e500mc@2 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;2&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_2&gt;;</div><div class='add'>+			L2_2: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu3: PowerPC,e500mc@3 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;3&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_3&gt;;</div><div class='add'>+			L2_3: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p3060si-post.dtsi b/arch/powerpc/boot/dts/fsl/p3060si-post.dtsi<br/>new file mode 100644<br/>index 000000000000..a63edd195ae5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p3060si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p3060si-post.dtsi</a></div><div class='hunk'>@@ -0,0 +1,296 @@</div><div class='add'>+/*</div><div class='add'>+ * P3060 Silicon/SoC Device Tree Source (post include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;lbc {</div><div class='add'>+	compatible = "fsl,p3060-elbc", "fsl,elbc", "simple-bus";</div><div class='add'>+	interrupts = &lt;25 2 0 0&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x200000 */</div><div class='add'>+&amp;pci0 {</div><div class='add'>+	compatible = "fsl,p3060-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0x0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 1 15&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 1 15&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0 0 1 &amp;mpic 40 1 0 0</div><div class='add'>+			0000 0 0 2 &amp;mpic 1 1 0 0</div><div class='add'>+			0000 0 0 3 &amp;mpic 2 1 0 0</div><div class='add'>+			0000 0 0 4 &amp;mpic 3 1 0 0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x201000 */</div><div class='add'>+&amp;pci1 {</div><div class='add'>+	compatible = "fsl,p3060-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 1 14&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 1 14&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0 0 1 &amp;mpic 41 1 0 0</div><div class='add'>+			0000 0 0 2 &amp;mpic 5 1 0 0</div><div class='add'>+			0000 0 0 3 &amp;mpic 6 1 0 0</div><div class='add'>+			0000 0 0 4 &amp;mpic 7 1 0 0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;rio {</div><div class='add'>+	compatible = "fsl,srio";</div><div class='add'>+	interrupts = &lt;16 2 1 11&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	fsl,srio-rmu-handle = &lt;&amp;rmu&gt;;</div><div class='add'>+	ranges;</div><div class='add'>+</div><div class='add'>+	port1 {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	port2 {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		cell-index = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;dcsr {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,dcsr", "simple-bus";</div><div class='add'>+</div><div class='add'>+	dcsr-epu@0 {</div><div class='add'>+		compatible = "fsl,dcsr-epu";</div><div class='add'>+		interrupts = &lt;52 2 0 0</div><div class='add'>+			      84 2 0 0</div><div class='add'>+			      85 2 0 0&gt;;</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-npc {</div><div class='add'>+		compatible = "fsl,dcsr-npc";</div><div class='add'>+		reg = &lt;0x1000 0x1000 0x1000000 0x8000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-nxc@2000 {</div><div class='add'>+		compatible = "fsl,dcsr-nxc";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-corenet {</div><div class='add'>+		compatible = "fsl,dcsr-corenet";</div><div class='add'>+		reg = &lt;0x8000 0x1000 0xB0000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-dpaa@9000 {</div><div class='add'>+		compatible = "fsl,p3060-dcsr-dpaa", "fsl,dcsr-dpaa";</div><div class='add'>+		reg = &lt;0x9000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-ocn@11000 {</div><div class='add'>+		compatible = "fsl,p3060-dcsr-ocn", "fsl,dcsr-ocn";</div><div class='add'>+		reg = &lt;0x11000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-ddr@12000 {</div><div class='add'>+		compatible = "fsl,dcsr-ddr";</div><div class='add'>+		dev-handle = &lt;&amp;ddr1&gt;;</div><div class='add'>+		reg = &lt;0x12000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-nal@18000 {</div><div class='add'>+		compatible = "fsl,p3060-dcsr-nal", "fsl,dcsr-nal";</div><div class='add'>+		reg = &lt;0x18000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-rcpm@22000 {</div><div class='add'>+		compatible = "fsl,p3060-dcsr-rcpm", "fsl,dcsr-rcpm";</div><div class='add'>+		reg = &lt;0x22000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@40000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu0&gt;;</div><div class='add'>+		reg = &lt;0x40000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@41000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu1&gt;;</div><div class='add'>+		reg = &lt;0x41000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@44000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu4&gt;;</div><div class='add'>+		reg = &lt;0x44000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@45000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu5&gt;;</div><div class='add'>+		reg = &lt;0x45000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@46000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu6&gt;;</div><div class='add'>+		reg = &lt;0x46000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@47000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu7&gt;;</div><div class='add'>+		reg = &lt;0x47000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;soc {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "soc";</div><div class='add'>+	compatible = "simple-bus";</div><div class='add'>+</div><div class='add'>+	soc-sram-error {</div><div class='add'>+		compatible = "fsl,soc-sram-error";</div><div class='add'>+		interrupts = &lt;16 2 1 29&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	corenet-law@0 {</div><div class='add'>+		compatible = "fsl,corenet-law";</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+		fsl,num-laws = &lt;32&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ddr1: memory-controller@8000 {</div><div class='add'>+		compatible = "fsl,qoriq-memory-controller-v4.4", "fsl,qoriq-memory-controller";</div><div class='add'>+		reg = &lt;0x8000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 23&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpc: l3-cache-controller@10000 {</div><div class='add'>+		compatible = "fsl,p3060-l3-cache-controller", "cache";</div><div class='add'>+		reg = &lt;0x10000 0x1000</div><div class='add'>+		       0x11000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 27</div><div class='add'>+			      16 2 1 26&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	corenet-cf@18000 {</div><div class='add'>+		compatible = "fsl,corenet-cf";</div><div class='add'>+		reg = &lt;0x18000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 31&gt;;</div><div class='add'>+		fsl,ccf-num-csdids = &lt;32&gt;;</div><div class='add'>+		fsl,ccf-num-snoopids = &lt;32&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	iommu@20000 {</div><div class='add'>+		compatible = "fsl,pamu-v1.0", "fsl,pamu";</div><div class='add'>+		reg = &lt;0x20000 0x5000&gt;;</div><div class='add'>+		interrupts = &lt;</div><div class='add'>+			24 2 0 0</div><div class='add'>+			16 2 1 30&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-rmu-0.dtsi"</div><div class='add'>+/include/ "qoriq-mpic.dtsi"</div><div class='add'>+</div><div class='add'>+	guts: global-utilities@e0000 {</div><div class='add'>+		compatible = "fsl,qoriq-device-config-1.0";</div><div class='add'>+		reg = &lt;0xe0000 0xe00&gt;;</div><div class='add'>+		fsl,has-rstcr;</div><div class='add'>+		#sleep-cells = &lt;1&gt;;</div><div class='add'>+		fsl,liodn-bits = &lt;12&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pins: global-utilities@e0e00 {</div><div class='add'>+		compatible = "fsl,qoriq-pin-control-1.0";</div><div class='add'>+		reg = &lt;0xe0e00 0x200&gt;;</div><div class='add'>+		#sleep-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	clockgen: global-utilities@e1000 {</div><div class='add'>+		compatible = "fsl,p3060-clockgen", "fsl,qoriq-clockgen-1.0";</div><div class='add'>+		reg = &lt;0xe1000 0x1000&gt;;</div><div class='add'>+		clock-frequency = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rcpm: global-utilities@e2000 {</div><div class='add'>+		compatible = "fsl,qoriq-rcpm-1.0";</div><div class='add'>+		reg = &lt;0xe2000 0x1000&gt;;</div><div class='add'>+		#sleep-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sfp: sfp@e8000 {</div><div class='add'>+		compatible = "fsl,p3060-sfp", "fsl,qoriq-sfp-1.0";</div><div class='add'>+		reg	   = &lt;0xe8000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serdes: serdes@ea000 {</div><div class='add'>+		compatible = "fsl,p3060-serdes";</div><div class='add'>+		reg	   = &lt;0xea000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-dma-0.dtsi"</div><div class='add'>+/include/ "qoriq-dma-1.dtsi"</div><div class='add'>+/include/ "qoriq-espi-0.dtsi"</div><div class='add'>+	spi@110000 {</div><div class='add'>+		fsl,espi-num-chipselects = &lt;4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-i2c-0.dtsi"</div><div class='add'>+/include/ "qoriq-i2c-1.dtsi"</div><div class='add'>+/include/ "qoriq-duart-0.dtsi"</div><div class='add'>+/include/ "qoriq-duart-1.dtsi"</div><div class='add'>+/include/ "qoriq-gpio-0.dtsi"</div><div class='add'>+/include/ "qoriq-usb2-mph-0.dtsi"</div><div class='add'>+/include/ "qoriq-usb2-dr-0.dtsi"</div><div class='add'>+/include/ "qoriq-sec4.1-0.dtsi"</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p3060si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p3060si-pre.dtsi<br/>new file mode 100644<br/>index 000000000000..00c8e70e7b90<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p3060si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p3060si-pre.dtsi</a></div><div class='hunk'>@@ -0,0 +1,125 @@</div><div class='add'>+/*</div><div class='add'>+ * P3060 Silicon/SoC Device Tree Source (pre include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,P3060";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		ccsr = &amp;soc;</div><div class='add'>+		dcsr = &amp;dcsr;</div><div class='add'>+</div><div class='add'>+		serial0 = &amp;serial0;</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+		serial2 = &amp;serial2;</div><div class='add'>+		serial3 = &amp;serial3;</div><div class='add'>+		pci0 = &amp;pci0;</div><div class='add'>+		pci1 = &amp;pci1;</div><div class='add'>+		usb0 = &amp;usb0;</div><div class='add'>+		usb1 = &amp;usb1;</div><div class='add'>+		dma0 = &amp;dma0;</div><div class='add'>+		dma1 = &amp;dma1;</div><div class='add'>+		msi0 = &amp;msi0;</div><div class='add'>+		msi1 = &amp;msi1;</div><div class='add'>+		msi2 = &amp;msi2;</div><div class='add'>+</div><div class='add'>+		crypto = &amp;crypto;</div><div class='add'>+		sec_jr0 = &amp;sec_jr0;</div><div class='add'>+		sec_jr1 = &amp;sec_jr1;</div><div class='add'>+		sec_jr2 = &amp;sec_jr2;</div><div class='add'>+		sec_jr3 = &amp;sec_jr3;</div><div class='add'>+		rtic_a = &amp;rtic_a;</div><div class='add'>+		rtic_b = &amp;rtic_b;</div><div class='add'>+		rtic_c = &amp;rtic_c;</div><div class='add'>+		rtic_d = &amp;rtic_d;</div><div class='add'>+		sec_mon = &amp;sec_mon;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		cpu0: PowerPC,e500mc@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_0&gt;;</div><div class='add'>+			L2_0: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu1: PowerPC,e500mc@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_1&gt;;</div><div class='add'>+			L2_1: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu4: PowerPC,e500mc@4 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;4&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_4&gt;;</div><div class='add'>+			L2_4: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu5: PowerPC,e500mc@5 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;5&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_5&gt;;</div><div class='add'>+			L2_5: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu6: PowerPC,e500mc@6 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;6&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_6&gt;;</div><div class='add'>+			L2_6: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu7: PowerPC,e500mc@7 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;7&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_7&gt;;</div><div class='add'>+			L2_7: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi b/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi<br/>new file mode 100644<br/>index 000000000000..8d35d2c1f694<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p4080si-post.dtsi</a></div><div class='hunk'>@@ -0,0 +1,350 @@</div><div class='add'>+/*</div><div class='add'>+ * P4080/P4040 Silicon/SoC Device Tree Source (post include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;lbc {</div><div class='add'>+	compatible = "fsl,p4080-elbc", "fsl,elbc", "simple-bus";</div><div class='add'>+	interrupts = &lt;25 2 0 0&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x200000 */</div><div class='add'>+&amp;pci0 {</div><div class='add'>+	compatible = "fsl,p4080-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0x0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 1 15&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 1 15&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0 0 1 &amp;mpic 40 1 0 0</div><div class='add'>+			0000 0 0 2 &amp;mpic 1 1 0 0</div><div class='add'>+			0000 0 0 3 &amp;mpic 2 1 0 0</div><div class='add'>+			0000 0 0 4 &amp;mpic 3 1 0 0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x201000 */</div><div class='add'>+&amp;pci1 {</div><div class='add'>+	compatible = "fsl,p4080-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 1 14&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 1 14&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0 0 1 &amp;mpic 41 1 0 0</div><div class='add'>+			0000 0 0 2 &amp;mpic 5 1 0 0</div><div class='add'>+			0000 0 0 3 &amp;mpic 6 1 0 0</div><div class='add'>+			0000 0 0 4 &amp;mpic 7 1 0 0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x202000 */</div><div class='add'>+&amp;pci2 {</div><div class='add'>+	compatible = "fsl,p4080-pcie";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0x0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 1 13&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 1 13&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0 0 1 &amp;mpic 42 1 0 0</div><div class='add'>+			0000 0 0 2 &amp;mpic 9 1 0 0</div><div class='add'>+			0000 0 0 3 &amp;mpic 10 1 0 0</div><div class='add'>+			0000 0 0 4 &amp;mpic 11 1 0 0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;rio {</div><div class='add'>+	compatible = "fsl,srio";</div><div class='add'>+	interrupts = &lt;16 2 1 11&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	fsl,srio-rmu-handle = &lt;&amp;rmu&gt;;</div><div class='add'>+	ranges;</div><div class='add'>+</div><div class='add'>+	port1 {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	port2 {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		cell-index = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;dcsr {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,dcsr", "simple-bus";</div><div class='add'>+</div><div class='add'>+	dcsr-epu@0 {</div><div class='add'>+		compatible = "fsl,dcsr-epu";</div><div class='add'>+		interrupts = &lt;52 2 0 0</div><div class='add'>+			      84 2 0 0</div><div class='add'>+			      85 2 0 0&gt;;</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-npc {</div><div class='add'>+		compatible = "fsl,dcsr-npc";</div><div class='add'>+		reg = &lt;0x1000 0x1000 0x1000000 0x8000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-nxc@2000 {</div><div class='add'>+		compatible = "fsl,dcsr-nxc";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-corenet {</div><div class='add'>+		compatible = "fsl,dcsr-corenet";</div><div class='add'>+		reg = &lt;0x8000 0x1000 0xB0000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-dpaa@9000 {</div><div class='add'>+		compatible = "fsl,p4080-dcsr-dpaa", "fsl,dcsr-dpaa";</div><div class='add'>+		reg = &lt;0x9000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-ocn@11000 {</div><div class='add'>+		compatible = "fsl,p4080-dcsr-ocn", "fsl,dcsr-ocn";</div><div class='add'>+		reg = &lt;0x11000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-ddr@12000 {</div><div class='add'>+		compatible = "fsl,dcsr-ddr";</div><div class='add'>+		dev-handle = &lt;&amp;ddr1&gt;;</div><div class='add'>+		reg = &lt;0x12000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-ddr@13000 {</div><div class='add'>+		compatible = "fsl,dcsr-ddr";</div><div class='add'>+		dev-handle = &lt;&amp;ddr2&gt;;</div><div class='add'>+		reg = &lt;0x13000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-nal@18000 {</div><div class='add'>+		compatible = "fsl,p4080-dcsr-nal", "fsl,dcsr-nal";</div><div class='add'>+		reg = &lt;0x18000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-rcpm@22000 {</div><div class='add'>+		compatible = "fsl,p4080-dcsr-rcpm", "fsl,dcsr-rcpm";</div><div class='add'>+		reg = &lt;0x22000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@40000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu0&gt;;</div><div class='add'>+		reg = &lt;0x40000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@41000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu1&gt;;</div><div class='add'>+		reg = &lt;0x41000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@42000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu2&gt;;</div><div class='add'>+		reg = &lt;0x42000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@43000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu3&gt;;</div><div class='add'>+		reg = &lt;0x43000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@44000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu4&gt;;</div><div class='add'>+		reg = &lt;0x44000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@45000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu5&gt;;</div><div class='add'>+		reg = &lt;0x45000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@46000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu6&gt;;</div><div class='add'>+		reg = &lt;0x46000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@47000 {</div><div class='add'>+		compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu7&gt;;</div><div class='add'>+		reg = &lt;0x47000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;soc {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "soc";</div><div class='add'>+	compatible = "simple-bus";</div><div class='add'>+</div><div class='add'>+	soc-sram-error {</div><div class='add'>+		compatible = "fsl,soc-sram-error";</div><div class='add'>+		interrupts = &lt;16 2 1 29&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	corenet-law@0 {</div><div class='add'>+		compatible = "fsl,corenet-law";</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+		fsl,num-laws = &lt;32&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ddr1: memory-controller@8000 {</div><div class='add'>+		compatible = "fsl,qoriq-memory-controller-v4.4", "fsl,qoriq-memory-controller";</div><div class='add'>+		reg = &lt;0x8000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 23&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ddr2: memory-controller@9000 {</div><div class='add'>+		compatible = "fsl,qoriq-memory-controller-v4.4","fsl,qoriq-memory-controller";</div><div class='add'>+		reg = &lt;0x9000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 22&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpc: l3-cache-controller@10000 {</div><div class='add'>+		compatible = "fsl,p4080-l3-cache-controller", "cache";</div><div class='add'>+		reg = &lt;0x10000 0x1000</div><div class='add'>+		       0x11000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 27</div><div class='add'>+			      16 2 1 26&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	corenet-cf@18000 {</div><div class='add'>+		compatible = "fsl,corenet-cf";</div><div class='add'>+		reg = &lt;0x18000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 31&gt;;</div><div class='add'>+		fsl,ccf-num-csdids = &lt;32&gt;;</div><div class='add'>+		fsl,ccf-num-snoopids = &lt;32&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	iommu@20000 {</div><div class='add'>+		compatible = "fsl,pamu-v1.0", "fsl,pamu";</div><div class='add'>+		reg = &lt;0x20000 0x5000&gt;;</div><div class='add'>+		interrupts = &lt;</div><div class='add'>+			24 2 0 0</div><div class='add'>+			16 2 1 30&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-rmu-0.dtsi"</div><div class='add'>+/include/ "qoriq-mpic.dtsi"</div><div class='add'>+</div><div class='add'>+	guts: global-utilities@e0000 {</div><div class='add'>+		compatible = "fsl,qoriq-device-config-1.0";</div><div class='add'>+		reg = &lt;0xe0000 0xe00&gt;;</div><div class='add'>+		fsl,has-rstcr;</div><div class='add'>+		#sleep-cells = &lt;1&gt;;</div><div class='add'>+		fsl,liodn-bits = &lt;12&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pins: global-utilities@e0e00 {</div><div class='add'>+		compatible = "fsl,qoriq-pin-control-1.0";</div><div class='add'>+		reg = &lt;0xe0e00 0x200&gt;;</div><div class='add'>+		#sleep-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	clockgen: global-utilities@e1000 {</div><div class='add'>+		compatible = "fsl,p4080-clockgen", "fsl,qoriq-clockgen-1.0";</div><div class='add'>+		reg = &lt;0xe1000 0x1000&gt;;</div><div class='add'>+		clock-frequency = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rcpm: global-utilities@e2000 {</div><div class='add'>+		compatible = "fsl,qoriq-rcpm-1.0";</div><div class='add'>+		reg = &lt;0xe2000 0x1000&gt;;</div><div class='add'>+		#sleep-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sfp: sfp@e8000 {</div><div class='add'>+		compatible = "fsl,p4080-sfp", "fsl,qoriq-sfp-1.0";</div><div class='add'>+		reg	   = &lt;0xe8000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serdes: serdes@ea000 {</div><div class='add'>+		compatible = "fsl,p4080-serdes";</div><div class='add'>+		reg	   = &lt;0xea000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-dma-0.dtsi"</div><div class='add'>+/include/ "qoriq-dma-1.dtsi"</div><div class='add'>+/include/ "qoriq-espi-0.dtsi"</div><div class='add'>+	spi@110000 {</div><div class='add'>+		fsl,espi-num-chipselects = &lt;4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-esdhc-0.dtsi"</div><div class='add'>+	sdhc@114000 {</div><div class='add'>+		voltage-ranges = &lt;3300 3300&gt;;</div><div class='add'>+		sdhci,auto-cmd12;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-i2c-0.dtsi"</div><div class='add'>+/include/ "qoriq-i2c-1.dtsi"</div><div class='add'>+/include/ "qoriq-duart-0.dtsi"</div><div class='add'>+/include/ "qoriq-duart-1.dtsi"</div><div class='add'>+/include/ "qoriq-gpio-0.dtsi"</div><div class='add'>+/include/ "qoriq-usb2-mph-0.dtsi"</div><div class='add'>+/include/ "qoriq-usb2-dr-0.dtsi"</div><div class='add'>+/include/ "qoriq-sec4.0-0.dtsi"</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi<br/>new file mode 100644<br/>index 000000000000..b9556ee3a639<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi</a></div><div class='hunk'>@@ -0,0 +1,143 @@</div><div class='add'>+/*</div><div class='add'>+ * P4080/P4040 Silicon/SoC Device Tree Source (pre include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,P4080";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		ccsr = &amp;soc;</div><div class='add'>+		dcsr = &amp;dcsr;</div><div class='add'>+</div><div class='add'>+		serial0 = &amp;serial0;</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+		serial2 = &amp;serial2;</div><div class='add'>+		serial3 = &amp;serial3;</div><div class='add'>+		pci0 = &amp;pci0;</div><div class='add'>+		pci1 = &amp;pci1;</div><div class='add'>+		pci2 = &amp;pci2;</div><div class='add'>+		usb0 = &amp;usb0;</div><div class='add'>+		usb1 = &amp;usb1;</div><div class='add'>+		dma0 = &amp;dma0;</div><div class='add'>+		dma1 = &amp;dma1;</div><div class='add'>+		sdhc = &amp;sdhc;</div><div class='add'>+		msi0 = &amp;msi0;</div><div class='add'>+		msi1 = &amp;msi1;</div><div class='add'>+		msi2 = &amp;msi2;</div><div class='add'>+</div><div class='add'>+		crypto = &amp;crypto;</div><div class='add'>+		sec_jr0 = &amp;sec_jr0;</div><div class='add'>+		sec_jr1 = &amp;sec_jr1;</div><div class='add'>+		sec_jr2 = &amp;sec_jr2;</div><div class='add'>+		sec_jr3 = &amp;sec_jr3;</div><div class='add'>+		rtic_a = &amp;rtic_a;</div><div class='add'>+		rtic_b = &amp;rtic_b;</div><div class='add'>+		rtic_c = &amp;rtic_c;</div><div class='add'>+		rtic_d = &amp;rtic_d;</div><div class='add'>+		sec_mon = &amp;sec_mon;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		cpu0: PowerPC,e500mc@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_0&gt;;</div><div class='add'>+			L2_0: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu1: PowerPC,e500mc@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_1&gt;;</div><div class='add'>+			L2_1: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu2: PowerPC,e500mc@2 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;2&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_2&gt;;</div><div class='add'>+			L2_2: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu3: PowerPC,e500mc@3 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;3&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_3&gt;;</div><div class='add'>+			L2_3: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu4: PowerPC,e500mc@4 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;4&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_4&gt;;</div><div class='add'>+			L2_4: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu5: PowerPC,e500mc@5 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;5&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_5&gt;;</div><div class='add'>+			L2_5: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu6: PowerPC,e500mc@6 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;6&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_6&gt;;</div><div class='add'>+			L2_6: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu7: PowerPC,e500mc@7 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;7&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_7&gt;;</div><div class='add'>+			L2_7: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi b/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi<br/>new file mode 100644<br/>index 000000000000..914074b91a85<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p5020si-post.dtsi</a></div><div class='hunk'>@@ -0,0 +1,355 @@</div><div class='add'>+/*</div><div class='add'>+ * P5020/5010 Silicon/SoC Device Tree Source (post include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;lbc {</div><div class='add'>+	compatible = "fsl,p5020-elbc", "fsl,elbc", "simple-bus";</div><div class='add'>+	interrupts = &lt;25 2 0 0&gt;;</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x200000 */</div><div class='add'>+&amp;pci0 {</div><div class='add'>+	compatible = "fsl,p5020-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0x0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 1 15&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 1 15&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0 0 1 &amp;mpic 40 1 0 0</div><div class='add'>+			0000 0 0 2 &amp;mpic 1 1 0 0</div><div class='add'>+			0000 0 0 3 &amp;mpic 2 1 0 0</div><div class='add'>+			0000 0 0 4 &amp;mpic 3 1 0 0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x201000 */</div><div class='add'>+&amp;pci1 {</div><div class='add'>+	compatible = "fsl,p5020-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 1 14&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 1 14&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0 0 1 &amp;mpic 41 1 0 0</div><div class='add'>+			0000 0 0 2 &amp;mpic 5 1 0 0</div><div class='add'>+			0000 0 0 3 &amp;mpic 6 1 0 0</div><div class='add'>+			0000 0 0 4 &amp;mpic 7 1 0 0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x202000 */</div><div class='add'>+&amp;pci2 {</div><div class='add'>+	compatible = "fsl,p5020-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0x0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 1 13&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 1 13&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0 0 1 &amp;mpic 42 1 0 0</div><div class='add'>+			0000 0 0 2 &amp;mpic 9 1 0 0</div><div class='add'>+			0000 0 0 3 &amp;mpic 10 1 0 0</div><div class='add'>+			0000 0 0 4 &amp;mpic 11 1 0 0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* controller at 0x203000 */</div><div class='add'>+&amp;pci3 {</div><div class='add'>+	compatible = "fsl,p5020-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='add'>+	device_type = "pci";</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	#address-cells = &lt;3&gt;;</div><div class='add'>+	bus-range = &lt;0x0 0xff&gt;;</div><div class='add'>+	clock-frequency = &lt;33333333&gt;;</div><div class='add'>+	interrupts = &lt;16 2 1 12&gt;;</div><div class='add'>+	pcie@0 {</div><div class='add'>+		reg = &lt;0 0 0 0 0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		#address-cells = &lt;3&gt;;</div><div class='add'>+		device_type = "pci";</div><div class='add'>+		interrupts = &lt;16 2 1 12&gt;;</div><div class='add'>+		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x0 */</div><div class='add'>+			0000 0 0 1 &amp;mpic 43 1 0 0</div><div class='add'>+			0000 0 0 2 &amp;mpic 0 1 0 0</div><div class='add'>+			0000 0 0 3 &amp;mpic 4 1 0 0</div><div class='add'>+			0000 0 0 4 &amp;mpic 8 1 0 0</div><div class='add'>+			&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;rio {</div><div class='add'>+	compatible = "fsl,srio";</div><div class='add'>+	interrupts = &lt;16 2 1 11&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'>+	port1 {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	port2 {</div><div class='add'>+		#address-cells = &lt;2&gt;;</div><div class='add'>+		#size-cells = &lt;2&gt;;</div><div class='add'>+		cell-index = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;dcsr {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,dcsr", "simple-bus";</div><div class='add'>+</div><div class='add'>+	dcsr-epu@0 {</div><div class='add'>+		compatible = "fsl,dcsr-epu";</div><div class='add'>+		interrupts = &lt;52 2 0 0</div><div class='add'>+			      84 2 0 0</div><div class='add'>+			      85 2 0 0&gt;;</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-npc {</div><div class='add'>+		compatible = "fsl,dcsr-npc";</div><div class='add'>+		reg = &lt;0x1000 0x1000 0x1000000 0x8000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-nxc@2000 {</div><div class='add'>+		compatible = "fsl,dcsr-nxc";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-corenet {</div><div class='add'>+		compatible = "fsl,dcsr-corenet";</div><div class='add'>+		reg = &lt;0x8000 0x1000 0xB0000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-dpaa@9000 {</div><div class='add'>+		compatible = "fsl,p5020-dcsr-dpaa", "fsl,dcsr-dpaa";</div><div class='add'>+		reg = &lt;0x9000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-ocn@11000 {</div><div class='add'>+		compatible = "fsl,p5020-dcsr-ocn", "fsl,dcsr-ocn";</div><div class='add'>+		reg = &lt;0x11000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-ddr@12000 {</div><div class='add'>+		compatible = "fsl,dcsr-ddr";</div><div class='add'>+		dev-handle = &lt;&amp;ddr1&gt;;</div><div class='add'>+		reg = &lt;0x12000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-ddr@13000 {</div><div class='add'>+		compatible = "fsl,dcsr-ddr";</div><div class='add'>+		dev-handle = &lt;&amp;ddr2&gt;;</div><div class='add'>+		reg = &lt;0x13000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-nal@18000 {</div><div class='add'>+		compatible = "fsl,p5020-dcsr-nal", "fsl,dcsr-nal";</div><div class='add'>+		reg = &lt;0x18000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-rcpm@22000 {</div><div class='add'>+		compatible = "fsl,p5020-dcsr-rcpm", "fsl,dcsr-rcpm";</div><div class='add'>+		reg = &lt;0x22000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@40000 {</div><div class='add'>+		compatible = "fsl,dcsr-e5500-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu0&gt;;</div><div class='add'>+		reg = &lt;0x40000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+	dcsr-cpu-sb-proxy@41000 {</div><div class='add'>+		compatible = "fsl,dcsr-e5500-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='add'>+		cpu-handle = &lt;&amp;cpu1&gt;;</div><div class='add'>+		reg = &lt;0x41000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;soc {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "soc";</div><div class='add'>+	compatible = "simple-bus";</div><div class='add'>+</div><div class='add'>+	soc-sram-error {</div><div class='add'>+		compatible = "fsl,soc-sram-error";</div><div class='add'>+		interrupts = &lt;16 2 1 29&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	corenet-law@0 {</div><div class='add'>+		compatible = "fsl,corenet-law";</div><div class='add'>+		reg = &lt;0x0 0x1000&gt;;</div><div class='add'>+		fsl,num-laws = &lt;32&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ddr1: memory-controller@8000 {</div><div class='add'>+		compatible = "fsl,qoriq-memory-controller-v4.5", "fsl,qoriq-memory-controller";</div><div class='add'>+		reg = &lt;0x8000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 23&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ddr2: memory-controller@9000 {</div><div class='add'>+		compatible = "fsl,qoriq-memory-controller-v4.5","fsl,qoriq-memory-controller";</div><div class='add'>+		reg = &lt;0x9000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 22&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpc: l3-cache-controller@10000 {</div><div class='add'>+		compatible = "fsl,p5020-l3-cache-controller", "fsl,p4080-l3-cache-controller", "cache";</div><div class='add'>+		reg = &lt;0x10000 0x1000</div><div class='add'>+		       0x11000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 27</div><div class='add'>+			      16 2 1 26&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	corenet-cf@18000 {</div><div class='add'>+		compatible = "fsl,corenet-cf";</div><div class='add'>+		reg = &lt;0x18000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 31&gt;;</div><div class='add'>+		fsl,ccf-num-csdids = &lt;32&gt;;</div><div class='add'>+		fsl,ccf-num-snoopids = &lt;32&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	iommu@20000 {</div><div class='add'>+		compatible = "fsl,pamu-v1.0", "fsl,pamu";</div><div class='add'>+		reg = &lt;0x20000 0x4000&gt;;</div><div class='add'>+		interrupts = &lt;</div><div class='add'>+			24 2 0 0</div><div class='add'>+			16 2 1 30&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-mpic.dtsi"</div><div class='add'>+</div><div class='add'>+	guts: global-utilities@e0000 {</div><div class='add'>+		compatible = "fsl,qoriq-device-config-1.0";</div><div class='add'>+		reg = &lt;0xe0000 0xe00&gt;;</div><div class='add'>+		fsl,has-rstcr;</div><div class='add'>+		#sleep-cells = &lt;1&gt;;</div><div class='add'>+		fsl,liodn-bits = &lt;12&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pins: global-utilities@e0e00 {</div><div class='add'>+		compatible = "fsl,qoriq-pin-control-1.0";</div><div class='add'>+		reg = &lt;0xe0e00 0x200&gt;;</div><div class='add'>+		#sleep-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	clockgen: global-utilities@e1000 {</div><div class='add'>+		compatible = "fsl,p5020-clockgen", "fsl,qoriq-clockgen-1.0";</div><div class='add'>+		reg = &lt;0xe1000 0x1000&gt;;</div><div class='add'>+		clock-frequency = &lt;0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rcpm: global-utilities@e2000 {</div><div class='add'>+		compatible = "fsl,qoriq-rcpm-1.0";</div><div class='add'>+		reg = &lt;0xe2000 0x1000&gt;;</div><div class='add'>+		#sleep-cells = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sfp: sfp@e8000 {</div><div class='add'>+		compatible = "fsl,p5020-sfp", "fsl,qoriq-sfp-1.0";</div><div class='add'>+		reg	   = &lt;0xe8000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	serdes: serdes@ea000 {</div><div class='add'>+		compatible = "fsl,p5020-serdes";</div><div class='add'>+		reg	   = &lt;0xea000 0x1000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-dma-0.dtsi"</div><div class='add'>+/include/ "qoriq-dma-1.dtsi"</div><div class='add'>+/include/ "qoriq-espi-0.dtsi"</div><div class='add'>+	spi@110000 {</div><div class='add'>+		fsl,espi-num-chipselects = &lt;4&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-esdhc-0.dtsi"</div><div class='add'>+	sdhc@114000 {</div><div class='add'>+		sdhci,auto-cmd12;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-i2c-0.dtsi"</div><div class='add'>+/include/ "qoriq-i2c-1.dtsi"</div><div class='add'>+/include/ "qoriq-duart-0.dtsi"</div><div class='add'>+/include/ "qoriq-duart-1.dtsi"</div><div class='add'>+/include/ "qoriq-gpio-0.dtsi"</div><div class='add'>+/include/ "qoriq-usb2-mph-0.dtsi"</div><div class='add'>+		usb0: usb@210000 {</div><div class='add'>+			phy_type = "utmi";</div><div class='add'>+			port0;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-usb2-dr-0.dtsi"</div><div class='add'>+		usb1: usb@211000 {</div><div class='add'>+			dr_mode = "host";</div><div class='add'>+			phy_type = "utmi";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+/include/ "qoriq-sata2-0.dtsi"</div><div class='add'>+/include/ "qoriq-sata2-1.dtsi"</div><div class='add'>+/include/ "qoriq-sec4.2-0.dtsi"</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi<br/>new file mode 100644<br/>index 000000000000..ae823a47584e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi</a></div><div class='hunk'>@@ -0,0 +1,96 @@</div><div class='add'>+/*</div><div class='add'>+ * P5020/P5010 Silicon/SoC Device Tree Source (pre include)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+/ {</div><div class='add'>+	compatible = "fsl,P5020";</div><div class='add'>+	#address-cells = &lt;2&gt;;</div><div class='add'>+	#size-cells = &lt;2&gt;;</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		ccsr = &amp;soc;</div><div class='add'>+		dcsr = &amp;dcsr;</div><div class='add'>+</div><div class='add'>+		serial0 = &amp;serial0;</div><div class='add'>+		serial1 = &amp;serial1;</div><div class='add'>+		serial2 = &amp;serial2;</div><div class='add'>+		serial3 = &amp;serial3;</div><div class='add'>+		pci0 = &amp;pci0;</div><div class='add'>+		pci1 = &amp;pci1;</div><div class='add'>+		pci2 = &amp;pci2;</div><div class='add'>+		pci3 = &amp;pci3;</div><div class='add'>+		usb0 = &amp;usb0;</div><div class='add'>+		usb1 = &amp;usb1;</div><div class='add'>+		dma0 = &amp;dma0;</div><div class='add'>+		dma1 = &amp;dma1;</div><div class='add'>+		sdhc = &amp;sdhc;</div><div class='add'>+		msi0 = &amp;msi0;</div><div class='add'>+		msi1 = &amp;msi1;</div><div class='add'>+		msi2 = &amp;msi2;</div><div class='add'>+</div><div class='add'>+		crypto = &amp;crypto;</div><div class='add'>+		sec_jr0 = &amp;sec_jr0;</div><div class='add'>+		sec_jr1 = &amp;sec_jr1;</div><div class='add'>+		sec_jr2 = &amp;sec_jr2;</div><div class='add'>+		sec_jr3 = &amp;sec_jr3;</div><div class='add'>+		rtic_a = &amp;rtic_a;</div><div class='add'>+		rtic_b = &amp;rtic_b;</div><div class='add'>+		rtic_c = &amp;rtic_c;</div><div class='add'>+		rtic_d = &amp;rtic_d;</div><div class='add'>+		sec_mon = &amp;sec_mon;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		cpu0: PowerPC,e5500@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_0&gt;;</div><div class='add'>+			L2_0: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		cpu1: PowerPC,e5500@1 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			next-level-cache = &lt;&amp;L2_1&gt;;</div><div class='add'>+			L2_1: l2-cache {</div><div class='add'>+				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-dma-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-dma-0.dtsi<br/>new file mode 100644<br/>index 000000000000..b5b37ad30e75<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-dma-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-dma-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 DMA device tree stub [ controller @ offset 0x21000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+dma@21300 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,eloplus-dma";</div><div class='add'>+	reg = &lt;0x21300 0x4&gt;;</div><div class='add'>+	ranges = &lt;0x0 0x21100 0x200&gt;;</div><div class='add'>+	cell-index = &lt;0&gt;;</div><div class='add'>+	dma-channel@0 {</div><div class='add'>+		compatible = "fsl,eloplus-dma-channel";</div><div class='add'>+		reg = &lt;0x0 0x80&gt;;</div><div class='add'>+		cell-index = &lt;0&gt;;</div><div class='add'>+		interrupts = &lt;20 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+	dma-channel@80 {</div><div class='add'>+		compatible = "fsl,eloplus-dma-channel";</div><div class='add'>+		reg = &lt;0x80 0x80&gt;;</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+		interrupts = &lt;21 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+	dma-channel@100 {</div><div class='add'>+		compatible = "fsl,eloplus-dma-channel";</div><div class='add'>+		reg = &lt;0x100 0x80&gt;;</div><div class='add'>+		cell-index = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;22 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+	dma-channel@180 {</div><div class='add'>+		compatible = "fsl,eloplus-dma-channel";</div><div class='add'>+		reg = &lt;0x180 0x80&gt;;</div><div class='add'>+		cell-index = &lt;3&gt;;</div><div class='add'>+		interrupts = &lt;23 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-dma-1.dtsi b/arch/powerpc/boot/dts/fsl/pq3-dma-1.dtsi<br/>new file mode 100644<br/>index 000000000000..28cb8a55d807<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-dma-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-dma-1.dtsi</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 DMA device tree stub [ controller @ offset 0xc300 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+dma@c300 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,eloplus-dma";</div><div class='add'>+	reg = &lt;0xc300 0x4&gt;;</div><div class='add'>+	ranges = &lt;0x0 0xc100 0x200&gt;;</div><div class='add'>+	cell-index = &lt;1&gt;;</div><div class='add'>+	dma-channel@0 {</div><div class='add'>+		compatible = "fsl,eloplus-dma-channel";</div><div class='add'>+		reg = &lt;0x0 0x80&gt;;</div><div class='add'>+		cell-index = &lt;0&gt;;</div><div class='add'>+		interrupts = &lt;76 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+	dma-channel@80 {</div><div class='add'>+		compatible = "fsl,eloplus-dma-channel";</div><div class='add'>+		reg = &lt;0x80 0x80&gt;;</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+		interrupts = &lt;77 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+	dma-channel@100 {</div><div class='add'>+		compatible = "fsl,eloplus-dma-channel";</div><div class='add'>+		reg = &lt;0x100 0x80&gt;;</div><div class='add'>+		cell-index = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;78 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+	dma-channel@180 {</div><div class='add'>+		compatible = "fsl,eloplus-dma-channel";</div><div class='add'>+		reg = &lt;0x180 0x80&gt;;</div><div class='add'>+		cell-index = &lt;3&gt;;</div><div class='add'>+		interrupts = &lt;79 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-duart-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-duart-0.dtsi<br/>new file mode 100644<br/>index 000000000000..5e268fdb9d1f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-duart-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-duart-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 DUART device tree stub [ controller @ offset 0x4000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+serial0: serial@4500 {</div><div class='add'>+	cell-index = &lt;0&gt;;</div><div class='add'>+	device_type = "serial";</div><div class='add'>+	compatible = "fsl,ns16550", "ns16550";</div><div class='add'>+	reg = &lt;0x4500 0x100&gt;;</div><div class='add'>+	clock-frequency = &lt;0&gt;;</div><div class='add'>+	interrupts = &lt;42 2 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+serial1: serial@4600 {</div><div class='add'>+	cell-index = &lt;1&gt;;</div><div class='add'>+	device_type = "serial";</div><div class='add'>+	compatible = "fsl,ns16550", "ns16550";</div><div class='add'>+	reg = &lt;0x4600 0x100&gt;;</div><div class='add'>+	clock-frequency = &lt;0&gt;;</div><div class='add'>+	interrupts = &lt;42 2 0 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-esdhc-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-esdhc-0.dtsi<br/>new file mode 100644<br/>index 000000000000..5743433e278e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-esdhc-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-esdhc-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 eSDHC device tree stub [ controller @ offset 0x2e000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+sdhc@2e000 {</div><div class='add'>+	compatible = "fsl,esdhc";</div><div class='add'>+	reg = &lt;0x2e000 0x1000&gt;;</div><div class='add'>+	interrupts = &lt;72 0x2 0 0&gt;;</div><div class='add'>+	/* Filled in by U-Boot */</div><div class='add'>+	clock-frequency = &lt;0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-espi-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-espi-0.dtsi<br/>new file mode 100644<br/>index 000000000000..75854b2e0391<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-espi-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-espi-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 eSPI device tree stub [ controller @ offset 0x7000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+spi@7000 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	compatible = "fsl,mpc8536-espi";</div><div class='add'>+	reg = &lt;0x7000 0x1000&gt;;</div><div class='add'>+	interrupts = &lt;59 0x2 0 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi<br/>new file mode 100644<br/>index 000000000000..a1979ae334a7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 eTSEC device tree stub [ @ offsets 0x24000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+ethernet@24000 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	cell-index = &lt;0&gt;;</div><div class='add'>+	device_type = "network";</div><div class='add'>+	model = "eTSEC";</div><div class='add'>+	compatible = "gianfar";</div><div class='add'>+	reg = &lt;0x24000 0x1000&gt;;</div><div class='add'>+	ranges = &lt;0x0 0x24000 0x1000&gt;;</div><div class='add'>+	local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='add'>+	interrupts = &lt;29 2 0 0 30 2 0 0 34 2 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+mdio@24520 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	compatible = "fsl,gianfar-mdio";</div><div class='add'>+	reg = &lt;0x24520 0x20&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-etsec1-1.dtsi b/arch/powerpc/boot/dts/fsl/pq3-etsec1-1.dtsi<br/>new file mode 100644<br/>index 000000000000..4c4fdde1ec2a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-etsec1-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-etsec1-1.dtsi</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 eTSEC device tree stub [ @ offsets 0x25000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+ethernet@25000 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	cell-index = &lt;1&gt;;</div><div class='add'>+	device_type = "network";</div><div class='add'>+	model = "eTSEC";</div><div class='add'>+	compatible = "gianfar";</div><div class='add'>+	reg = &lt;0x25000 0x1000&gt;;</div><div class='add'>+	ranges = &lt;0x0 0x25000 0x1000&gt;;</div><div class='add'>+	local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='add'>+	interrupts = &lt;35 2 0 0 36 2 0 0 40 2 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+mdio@25520 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	compatible = "fsl,gianfar-tbi";</div><div class='add'>+	reg = &lt;0x25520 0x20&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-etsec1-2.dtsi b/arch/powerpc/boot/dts/fsl/pq3-etsec1-2.dtsi<br/>new file mode 100644<br/>index 000000000000..4b8ab438668a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-etsec1-2.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-etsec1-2.dtsi</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 eTSEC device tree stub [ @ offsets 0x26000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+ethernet@26000 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	cell-index = &lt;2&gt;;</div><div class='add'>+	device_type = "network";</div><div class='add'>+	model = "eTSEC";</div><div class='add'>+	compatible = "gianfar";</div><div class='add'>+	reg = &lt;0x26000 0x1000&gt;;</div><div class='add'>+	ranges = &lt;0x0 0x26000 0x1000&gt;;</div><div class='add'>+	local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='add'>+	interrupts = &lt;31 2 0 0 32 2 0 0 33 2 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+mdio@26520 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	compatible = "fsl,gianfar-tbi";</div><div class='add'>+	reg = &lt;0x26520 0x20&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-etsec1-3.dtsi b/arch/powerpc/boot/dts/fsl/pq3-etsec1-3.dtsi<br/>new file mode 100644<br/>index 000000000000..40c9137729ae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-etsec1-3.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-etsec1-3.dtsi</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 eTSEC device tree stub [ @ offsets 0x27000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+ethernet@27000 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	cell-index = &lt;3&gt;;</div><div class='add'>+	device_type = "network";</div><div class='add'>+	model = "eTSEC";</div><div class='add'>+	compatible = "gianfar";</div><div class='add'>+	reg = &lt;0x27000 0x1000&gt;;</div><div class='add'>+	ranges = &lt;0x0 0x27000 0x1000&gt;;</div><div class='add'>+	local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='add'>+	interrupts = &lt;37 2 0 0 38 2 0 0 39 2 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+mdio@27520 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	compatible = "fsl,gianfar-tbi";</div><div class='add'>+	reg = &lt;0x27520 0x20&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-etsec1-timer-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-etsec1-timer-0.dtsi<br/>new file mode 100644<br/>index 000000000000..efe2ca04bce8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-etsec1-timer-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-etsec1-timer-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 eTSEC Timer (IEEE 1588) device tree stub [ @ offsets 0x24e00 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+ptp_clock@24e00 {</div><div class='add'>+	compatible = "fsl,etsec-ptp";</div><div class='add'>+	reg = &lt;0x24e00 0xb0&gt;;</div><div class='add'>+	interrupts = &lt;68 2 0 0 69 2 0 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi<br/>new file mode 100644<br/>index 000000000000..1382fec9e8c5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 eTSEC2 device tree stub [ @ offsets 0x24000/0xb0000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+mdio@24000 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	compatible = "fsl,etsec2-mdio";</div><div class='add'>+	reg = &lt;0x24000 0x1000 0xb0030 0x4&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+ethernet@b0000 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "network";</div><div class='add'>+	model = "eTSEC";</div><div class='add'>+	compatible = "fsl,etsec2";</div><div class='add'>+	fsl,num_rx_queues = &lt;0x8&gt;;</div><div class='add'>+	fsl,num_tx_queues = &lt;0x8&gt;;</div><div class='add'>+	fsl,magic-packet;</div><div class='add'>+	local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='add'>+</div><div class='add'>+	queue-group@b0000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0xb0000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;29 2 0 0 30 2 0 0 34 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi b/arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi<br/>new file mode 100644<br/>index 000000000000..221cd2ea5b31<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 eTSEC2 device tree stub [ @ offsets 0x25000/0xb1000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+mdio@25000 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	compatible = "fsl,etsec2-tbi";</div><div class='add'>+	reg = &lt;0x25000 0x1000 0xb1030 0x4&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+ethernet@b1000 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "network";</div><div class='add'>+	model = "eTSEC";</div><div class='add'>+	compatible = "fsl,etsec2";</div><div class='add'>+	fsl,num_rx_queues = &lt;0x8&gt;;</div><div class='add'>+	fsl,num_tx_queues = &lt;0x8&gt;;</div><div class='add'>+	fsl,magic-packet;</div><div class='add'>+	local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='add'>+</div><div class='add'>+	queue-group@b1000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0xb1000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;35 2 0 0 36 2 0 0 40 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi b/arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi<br/>new file mode 100644<br/>index 000000000000..61456c317609<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi</a></div><div class='hunk'>@@ -0,0 +1,59 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 eTSEC2 device tree stub [ @ offsets 0x26000/0xb2000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+mdio@26000 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	compatible = "fsl,etsec2-tbi";</div><div class='add'>+	reg = &lt;0x26000 0x1000 0xb1030 0x4&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+ethernet@b2000 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	device_type = "network";</div><div class='add'>+	model = "eTSEC";</div><div class='add'>+	compatible = "fsl,etsec2";</div><div class='add'>+	fsl,num_rx_queues = &lt;0x8&gt;;</div><div class='add'>+	fsl,num_tx_queues = &lt;0x8&gt;;</div><div class='add'>+	fsl,magic-packet;</div><div class='add'>+	local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='add'>+</div><div class='add'>+	queue-group@b2000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0xb2000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;31 2 0 0 32 2 0 0 33 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-0.dtsi<br/>new file mode 100644<br/>index 000000000000..034ab8fac22f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 eTSEC2 Group 2 device tree stub [ @ offsets 0xb4000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;enet0_grp2 {</div><div class='add'>+	queue-group@b4000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0xb4000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;17 2 0 0 18 2 0 0 24 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-1.dtsi b/arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-1.dtsi<br/>new file mode 100644<br/>index 000000000000..3be9ba3b374e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-1.dtsi</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 eTSEC2 Group 2 device tree stub [ @ offsets 0xb5000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;enet1_grp2 {</div><div class='add'>+	queue-group@b5000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0xb5000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;51 2 0 0 52 2 0 0 67 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-2.dtsi b/arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-2.dtsi<br/>new file mode 100644<br/>index 000000000000..02a33457048c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-2.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-2.dtsi</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 eTSEC2 Group 2 device tree stub [ @ offsets 0xb6000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;enet2_grp2 {</div><div class='add'>+	queue-group@b6000 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0xb6000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;25 2 0 0 26 2 0 0 27 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi<br/>new file mode 100644<br/>index 000000000000..72a3ef5945c1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 GPIO device tree stub [ controller @ offset 0xf000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+gpio-controller@f000 {</div><div class='add'>+	#gpio-cells = &lt;2&gt;;</div><div class='add'>+	compatible = "fsl,pq3-gpio";</div><div class='add'>+	reg = &lt;0xf000 0x100&gt;;</div><div class='add'>+	interrupts = &lt;47 0x2 0 0&gt;;</div><div class='add'>+	gpio-controller;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-i2c-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-i2c-0.dtsi<br/>new file mode 100644<br/>index 000000000000..d1dd6fb82a78<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-i2c-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-i2c-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 I2C device tree stub [ controller @ offset 0x3000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+i2c@3000 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	cell-index = &lt;0&gt;;</div><div class='add'>+	compatible = "fsl-i2c";</div><div class='add'>+	reg = &lt;0x3000 0x100&gt;;</div><div class='add'>+	interrupts = &lt;43 2 0 0&gt;;</div><div class='add'>+	dfsrr;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-i2c-1.dtsi b/arch/powerpc/boot/dts/fsl/pq3-i2c-1.dtsi<br/>new file mode 100644<br/>index 000000000000..a9bd803e2090<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-i2c-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-i2c-1.dtsi</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 I2C device tree stub [ controller @ offset 0x3100 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+i2c@3100 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	cell-index = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl-i2c";</div><div class='add'>+	reg = &lt;0x3100 0x100&gt;;</div><div class='add'>+	interrupts = &lt;43 2 0 0&gt;;</div><div class='add'>+	dfsrr;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-mpic-timer-B.dtsi b/arch/powerpc/boot/dts/fsl/pq3-mpic-timer-B.dtsi<br/>new file mode 100644<br/>index 000000000000..8734cffae1a1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-mpic-timer-B.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-mpic-timer-B.dtsi</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 MPIC Timer (Group B) device tree stub [ controller @ offset 0x42100 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+timer@42100 {</div><div class='add'>+	compatible = "fsl,mpic-global-timer";</div><div class='add'>+	reg = &lt;0x42100 0x100 0x42300 4&gt;;</div><div class='add'>+	interrupts = &lt;4 0 3 0</div><div class='add'>+		      5 0 3 0</div><div class='add'>+		      6 0 3 0</div><div class='add'>+		      7 0 3 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi b/arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi<br/>new file mode 100644<br/>index 000000000000..5c8046065844<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 MPIC device tree stub [ controller @ offset 0x40000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+mpic: pic@40000 {</div><div class='add'>+	interrupt-controller;</div><div class='add'>+	#address-cells = &lt;0&gt;;</div><div class='add'>+	#interrupt-cells = &lt;4&gt;;</div><div class='add'>+	reg = &lt;0x40000 0x40000&gt;;</div><div class='add'>+	compatible = "fsl,mpic";</div><div class='add'>+	device_type = "open-pic";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+timer@41100 {</div><div class='add'>+	compatible = "fsl,mpic-global-timer";</div><div class='add'>+	reg = &lt;0x41100 0x100 0x41300 4&gt;;</div><div class='add'>+	interrupts = &lt;0 0 3 0</div><div class='add'>+		      1 0 3 0</div><div class='add'>+		      2 0 3 0</div><div class='add'>+		      3 0 3 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+msi@41600 {</div><div class='add'>+	compatible = "fsl,mpic-msi";</div><div class='add'>+	reg = &lt;0x41600 0x80&gt;;</div><div class='add'>+	msi-available-ranges = &lt;0 0x100&gt;;</div><div class='add'>+	interrupts = &lt;</div><div class='add'>+		0xe0 0 0 0</div><div class='add'>+		0xe1 0 0 0</div><div class='add'>+		0xe2 0 0 0</div><div class='add'>+		0xe3 0 0 0</div><div class='add'>+		0xe4 0 0 0</div><div class='add'>+		0xe5 0 0 0</div><div class='add'>+		0xe6 0 0 0</div><div class='add'>+		0xe7 0 0 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi<br/>new file mode 100644<br/>index 000000000000..587ca9ffad7d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 RIO Message Unit device tree stub [ controller @ offset 0xd3000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+rmu: rmu@d3000 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,srio-rmu";</div><div class='add'>+	reg = &lt;0xd3000 0x500&gt;;</div><div class='add'>+	ranges = &lt;0x0 0xd3000 0x500&gt;;</div><div class='add'>+</div><div class='add'>+	message-unit@0 {</div><div class='add'>+		compatible = "fsl,srio-msg-unit";</div><div class='add'>+		reg = &lt;0x0 0x100&gt;;</div><div class='add'>+		interrupts = &lt;</div><div class='add'>+			53 2 0 0 /* msg1_tx_irq */</div><div class='add'>+			54 2 0 0&gt;;/* msg1_rx_irq */</div><div class='add'>+	};</div><div class='add'>+	message-unit@100 {</div><div class='add'>+		compatible = "fsl,srio-msg-unit";</div><div class='add'>+		reg = &lt;0x100 0x100&gt;;</div><div class='add'>+		interrupts = &lt;</div><div class='add'>+			55 2 0 0  /* msg2_tx_irq */</div><div class='add'>+			56 2 0 0&gt;;/* msg2_rx_irq */</div><div class='add'>+	};</div><div class='add'>+	doorbell-unit@400 {</div><div class='add'>+		compatible = "fsl,srio-dbell-unit";</div><div class='add'>+		reg = &lt;0x400 0x80&gt;;</div><div class='add'>+		interrupts = &lt;</div><div class='add'>+			49 2 0 0  /* bell_outb_irq */</div><div class='add'>+			50 2 0 0&gt;;/* bell_inb_irq */</div><div class='add'>+	};</div><div class='add'>+	port-write-unit@4e0 {</div><div class='add'>+		compatible = "fsl,srio-port-write-unit";</div><div class='add'>+		reg = &lt;0x4e0 0x20&gt;;</div><div class='add'>+		interrupts = &lt;48 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-sata2-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-sata2-0.dtsi<br/>new file mode 100644<br/>index 000000000000..3c28dd08d38b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-sata2-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-sata2-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 SATAv2 device tree stub [ controller @ offset 0x18000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+sata@18000 {</div><div class='add'>+	compatible = "fsl,pq-sata-v2";</div><div class='add'>+	reg = &lt;0x18000 0x1000&gt;;</div><div class='add'>+	cell-index = &lt;1&gt;;</div><div class='add'>+	interrupts = &lt;74 0x2 0 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-sata2-1.dtsi b/arch/powerpc/boot/dts/fsl/pq3-sata2-1.dtsi<br/>new file mode 100644<br/>index 000000000000..eefaf2855e3b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-sata2-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-sata2-1.dtsi</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 SATAv2 device tree stub [ controller @ offset 0x19000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+sata@19000 {</div><div class='add'>+	compatible = "fsl,pq-sata-v2";</div><div class='add'>+	reg = &lt;0x19000 0x1000&gt;;</div><div class='add'>+	cell-index = &lt;2&gt;;</div><div class='add'>+	interrupts = &lt;41 0x2 0 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-sec2.1-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-sec2.1-0.dtsi<br/>new file mode 100644<br/>index 000000000000..02a5c7ae72d0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-sec2.1-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-sec2.1-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 Sec/Crypto 2.1 device tree stub [ controller @ offset 0x30000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+crypto@30000 {</div><div class='add'>+	compatible = "fsl,sec2.1", "fsl,sec2.0";</div><div class='add'>+	reg = &lt;0x30000 0x10000&gt;;</div><div class='add'>+	interrupts = &lt;45 2 0 0&gt;;</div><div class='add'>+	fsl,num-channels = &lt;4&gt;;</div><div class='add'>+	fsl,channel-fifo-len = &lt;24&gt;;</div><div class='add'>+	fsl,exec-units-mask = &lt;0xfe&gt;;</div><div class='add'>+	fsl,descriptor-types-mask = &lt;0x12b0ebf&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-sec3.0-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-sec3.0-0.dtsi<br/>new file mode 100644<br/>index 000000000000..bba1ba44ccf0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-sec3.0-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-sec3.0-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,45 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 Sec/Crypto 3.0 device tree stub [ controller @ offset 0x30000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+crypto@30000 {</div><div class='add'>+	compatible = "fsl,sec3.0",</div><div class='add'>+		     "fsl,sec2.4", "fsl,sec2.2", "fsl,sec2.1",</div><div class='add'>+		     "fsl,sec2.0";</div><div class='add'>+	reg = &lt;0x30000 0x10000&gt;;</div><div class='add'>+	interrupts = &lt;45 2 0 0 58 2 0 0&gt;;</div><div class='add'>+	fsl,num-channels = &lt;4&gt;;</div><div class='add'>+	fsl,channel-fifo-len = &lt;24&gt;;</div><div class='add'>+	fsl,exec-units-mask = &lt;0x9fe&gt;;</div><div class='add'>+	fsl,descriptor-types-mask = &lt;0x3ab0ebf&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-sec3.1-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-sec3.1-0.dtsi<br/>new file mode 100644<br/>index 000000000000..8f0a5669bee5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-sec3.1-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-sec3.1-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,45 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 Sec/Crypto 3.1 device tree stub [ controller @ offset 0x30000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+crypto@30000 {</div><div class='add'>+	compatible = "fsl,sec3.1", "fsl,sec3.0",</div><div class='add'>+		     "fsl,sec2.4", "fsl,sec2.2", "fsl,sec2.1",</div><div class='add'>+		     "fsl,sec2.0";</div><div class='add'>+	reg = &lt;0x30000 0x10000&gt;;</div><div class='add'>+	interrupts = &lt;45 2 0 0 58 2 0 0&gt;;</div><div class='add'>+	fsl,num-channels = &lt;4&gt;;</div><div class='add'>+	fsl,channel-fifo-len = &lt;24&gt;;</div><div class='add'>+	fsl,exec-units-mask = &lt;0xbfe&gt;;</div><div class='add'>+	fsl,descriptor-types-mask = &lt;0x3ab0ebf&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-sec3.3-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-sec3.3-0.dtsi<br/>new file mode 100644<br/>index 000000000000..c227f2748a24<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-sec3.3-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-sec3.3-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,45 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 Sec/Crypto 3.3 device tree stub [ controller @ offset 0x30000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+crypto@30000 {</div><div class='add'>+	compatible = "fsl,sec3.3", "fsl,sec3.1", "fsl,sec3.0",</div><div class='add'>+		     "fsl,sec2.4", "fsl,sec2.2", "fsl,sec2.1",</div><div class='add'>+		     "fsl,sec2.0";</div><div class='add'>+	reg = &lt;0x30000 0x10000&gt;;</div><div class='add'>+	interrupts = &lt;45 2 0 0 58 2 0 0&gt;;</div><div class='add'>+	fsl,num-channels = &lt;4&gt;;</div><div class='add'>+	fsl,channel-fifo-len = &lt;24&gt;;</div><div class='add'>+	fsl,exec-units-mask = &lt;0x97c&gt;;</div><div class='add'>+	fsl,descriptor-types-mask = &lt;0x3a30abf&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi<br/>new file mode 100644<br/>index 000000000000..bf957a7fca2a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 Sec/Crypto 4.4 device tree stub [ controller @ offset 0x30000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+crypto@30000 {</div><div class='add'>+	compatible = "fsl,sec4.4", "fsl,sec4.0";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	reg		 = &lt;0x30000 0x10000&gt;;</div><div class='add'>+	interrupts	 = &lt;58 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	sec_jr0: jr@1000 {</div><div class='add'>+		compatible = "fsl,sec4.4-job-ring", "fsl,sec4.0-job-ring";</div><div class='add'>+		reg	   = &lt;0x1000 0x1000&gt;;</div><div class='add'>+		interrupts	 = &lt;45 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sec_jr1: jr@2000 {</div><div class='add'>+		compatible = "fsl,sec4.4-job-ring", "fsl,sec4.0-job-ring";</div><div class='add'>+		reg	   = &lt;0x2000 0x1000&gt;;</div><div class='add'>+		interrupts	 = &lt;45 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sec_jr2: jr@3000 {</div><div class='add'>+		compatible = "fsl,sec4.4-job-ring", "fsl,sec4.0-job-ring";</div><div class='add'>+		reg	   = &lt;0x3000 0x1000&gt;;</div><div class='add'>+		interrupts	 = &lt;45 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sec_jr3: jr@4000 {</div><div class='add'>+		compatible = "fsl,sec4.4-job-ring", "fsl,sec4.0-job-ring";</div><div class='add'>+		reg	   = &lt;0x4000 0x1000&gt;;</div><div class='add'>+		interrupts	 = &lt;45 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-usb2-dr-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-usb2-dr-0.dtsi<br/>new file mode 100644<br/>index 000000000000..185ab9dc3ecd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-usb2-dr-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-usb2-dr-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 USB DR device tree stub [ controller @ offset 0x22000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+usb@22000 {</div><div class='add'>+	compatible = "fsl-usb2-dr";</div><div class='add'>+	reg = &lt;0x22000 0x1000&gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	interrupts = &lt;28 0x2 0 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/pq3-usb2-dr-1.dtsi b/arch/powerpc/boot/dts/fsl/pq3-usb2-dr-1.dtsi<br/>new file mode 100644<br/>index 000000000000..fe24cd612fff<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/pq3-usb2-dr-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/pq3-usb2-dr-1.dtsi</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/*</div><div class='add'>+ * PQ3 USB DR device tree stub [ controller @ offset 0x23000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+usb@23000 {</div><div class='add'>+	compatible = "fsl-usb2-dr";</div><div class='add'>+	reg = &lt;0x23000 0x1000&gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	interrupts = &lt;46 0x2 0 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/qoriq-dma-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-dma-0.dtsi<br/>new file mode 100644<br/>index 000000000000..1aebf3ea4ca5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/qoriq-dma-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/qoriq-dma-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+/*</div><div class='add'>+ * QorIQ DMA device tree stub [ controller @ offset 0x100000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+dma0: dma@100300 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,eloplus-dma";</div><div class='add'>+	reg = &lt;0x100300 0x4&gt;;</div><div class='add'>+	ranges = &lt;0x0 0x100100 0x200&gt;;</div><div class='add'>+	cell-index = &lt;0&gt;;</div><div class='add'>+	dma-channel@0 {</div><div class='add'>+		compatible = "fsl,eloplus-dma-channel";</div><div class='add'>+		reg = &lt;0x0 0x80&gt;;</div><div class='add'>+		cell-index = &lt;0&gt;;</div><div class='add'>+		interrupts = &lt;28 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+	dma-channel@80 {</div><div class='add'>+		compatible = "fsl,eloplus-dma-channel";</div><div class='add'>+		reg = &lt;0x80 0x80&gt;;</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+		interrupts = &lt;29 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+	dma-channel@100 {</div><div class='add'>+		compatible = "fsl,eloplus-dma-channel";</div><div class='add'>+		reg = &lt;0x100 0x80&gt;;</div><div class='add'>+		cell-index = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;30 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+	dma-channel@180 {</div><div class='add'>+		compatible = "fsl,eloplus-dma-channel";</div><div class='add'>+		reg = &lt;0x180 0x80&gt;;</div><div class='add'>+		cell-index = &lt;3&gt;;</div><div class='add'>+		interrupts = &lt;31 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/qoriq-dma-1.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-dma-1.dtsi<br/>new file mode 100644<br/>index 000000000000..ecf5e180fe79<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/qoriq-dma-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/qoriq-dma-1.dtsi</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+/*</div><div class='add'>+ * QorIQ DMA device tree stub [ controller @ offset 0x101000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+dma1: dma@101300 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,eloplus-dma";</div><div class='add'>+	reg = &lt;0x101300 0x4&gt;;</div><div class='add'>+	ranges = &lt;0x0 0x101100 0x200&gt;;</div><div class='add'>+	cell-index = &lt;1&gt;;</div><div class='add'>+	dma-channel@0 {</div><div class='add'>+		compatible = "fsl,eloplus-dma-channel";</div><div class='add'>+		reg = &lt;0x0 0x80&gt;;</div><div class='add'>+		cell-index = &lt;0&gt;;</div><div class='add'>+		interrupts = &lt;32 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+	dma-channel@80 {</div><div class='add'>+		compatible = "fsl,eloplus-dma-channel";</div><div class='add'>+		reg = &lt;0x80 0x80&gt;;</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+		interrupts = &lt;33 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+	dma-channel@100 {</div><div class='add'>+		compatible = "fsl,eloplus-dma-channel";</div><div class='add'>+		reg = &lt;0x100 0x80&gt;;</div><div class='add'>+		cell-index = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;34 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+	dma-channel@180 {</div><div class='add'>+		compatible = "fsl,eloplus-dma-channel";</div><div class='add'>+		reg = &lt;0x180 0x80&gt;;</div><div class='add'>+		cell-index = &lt;3&gt;;</div><div class='add'>+		interrupts = &lt;35 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/qoriq-duart-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-duart-0.dtsi<br/>new file mode 100644<br/>index 000000000000..225c07b4e8ab<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/qoriq-duart-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/qoriq-duart-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+/*</div><div class='add'>+ * QorIQ DUART device tree stub [ controller @ offset 0x11c000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+serial0: serial@11c500 {</div><div class='add'>+	cell-index = &lt;0&gt;;</div><div class='add'>+	device_type = "serial";</div><div class='add'>+	compatible = "fsl,ns16550", "ns16550";</div><div class='add'>+	reg = &lt;0x11c500 0x100&gt;;</div><div class='add'>+	clock-frequency = &lt;0&gt;;</div><div class='add'>+	interrupts = &lt;36 2 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+serial1: serial@11c600 {</div><div class='add'>+	cell-index = &lt;1&gt;;</div><div class='add'>+	device_type = "serial";</div><div class='add'>+	compatible = "fsl,ns16550", "ns16550";</div><div class='add'>+	reg = &lt;0x11c600 0x100&gt;;</div><div class='add'>+	clock-frequency = &lt;0&gt;;</div><div class='add'>+	interrupts = &lt;36 2 0 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/qoriq-duart-1.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-duart-1.dtsi<br/>new file mode 100644<br/>index 000000000000..d23233a56b91<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/qoriq-duart-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/qoriq-duart-1.dtsi</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+/*</div><div class='add'>+ * QorIQ DUART device tree stub [ controller @ offset 0x11d000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+serial2: serial@11d500 {</div><div class='add'>+	cell-index = &lt;2&gt;;</div><div class='add'>+	device_type = "serial";</div><div class='add'>+	compatible = "fsl,ns16550", "ns16550";</div><div class='add'>+	reg = &lt;0x11d500 0x100&gt;;</div><div class='add'>+	clock-frequency = &lt;0&gt;;</div><div class='add'>+	interrupts = &lt;37 2 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+serial3: serial@11d600 {</div><div class='add'>+	cell-index = &lt;3&gt;;</div><div class='add'>+	device_type = "serial";</div><div class='add'>+	compatible = "fsl,ns16550", "ns16550";</div><div class='add'>+	reg = &lt;0x11d600 0x100&gt;;</div><div class='add'>+	clock-frequency = &lt;0&gt;;</div><div class='add'>+	interrupts = &lt;37 2 0 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/qoriq-esdhc-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-esdhc-0.dtsi<br/>new file mode 100644<br/>index 000000000000..20835ae216c7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/qoriq-esdhc-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/qoriq-esdhc-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+/*</div><div class='add'>+ * QorIQ eSDHC device tree stub [ controller @ offset 0x114000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+sdhc: sdhc@114000 {</div><div class='add'>+	compatible = "fsl,esdhc";</div><div class='add'>+	reg = &lt;0x114000 0x1000&gt;;</div><div class='add'>+	interrupts = &lt;48 2 0 0&gt;;</div><div class='add'>+	clock-frequency = &lt;0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/qoriq-espi-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-espi-0.dtsi<br/>new file mode 100644<br/>index 000000000000..6db06975e095<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/qoriq-espi-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/qoriq-espi-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/*</div><div class='add'>+ * QorIQ eSPI device tree stub [ controller @ offset 0x110000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+spi@110000 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	compatible = "fsl,mpc8536-espi";</div><div class='add'>+	reg = &lt;0x110000 0x1000&gt;;</div><div class='add'>+	interrupts = &lt;53 0x2 0 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/qoriq-gpio-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-gpio-0.dtsi<br/>new file mode 100644<br/>index 000000000000..cf714f5f68bc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/qoriq-gpio-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/qoriq-gpio-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/*</div><div class='add'>+ * QorIQ GPIO device tree stub [ controller @ offset 0x130000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+gpio0: gpio@130000 {</div><div class='add'>+	compatible = "fsl,qoriq-gpio";</div><div class='add'>+	reg = &lt;0x130000 0x1000&gt;;</div><div class='add'>+	interrupts = &lt;55 2 0 0&gt;;</div><div class='add'>+	#gpio-cells = &lt;2&gt;;</div><div class='add'>+	gpio-controller;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/qoriq-i2c-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-i2c-0.dtsi<br/>new file mode 100644<br/>index 000000000000..5f9bf7debe4c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/qoriq-i2c-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/qoriq-i2c-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/*</div><div class='add'>+ * QorIQ I2C device tree stub [ controller @ offset 0x118000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+i2c@118000 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	cell-index = &lt;0&gt;;</div><div class='add'>+	compatible = "fsl-i2c";</div><div class='add'>+	reg = &lt;0x118000 0x100&gt;;</div><div class='add'>+	interrupts = &lt;38 2 0 0&gt;;</div><div class='add'>+	dfsrr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+i2c@118100 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	cell-index = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl-i2c";</div><div class='add'>+	reg = &lt;0x118100 0x100&gt;;</div><div class='add'>+	interrupts = &lt;38 2 0 0&gt;;</div><div class='add'>+	dfsrr;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/qoriq-i2c-1.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-i2c-1.dtsi<br/>new file mode 100644<br/>index 000000000000..7989bf5eeb53<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/qoriq-i2c-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/qoriq-i2c-1.dtsi</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/*</div><div class='add'>+ * QorIQ I2C device tree stub [ controller @ offset 0x119000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+i2c@119000 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	cell-index = &lt;2&gt;;</div><div class='add'>+	compatible = "fsl-i2c";</div><div class='add'>+	reg = &lt;0x119000 0x100&gt;;</div><div class='add'>+	interrupts = &lt;39 2 0 0&gt;;</div><div class='add'>+	dfsrr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+i2c@119100 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	cell-index = &lt;3&gt;;</div><div class='add'>+	compatible = "fsl-i2c";</div><div class='add'>+	reg = &lt;0x119100 0x100&gt;;</div><div class='add'>+	interrupts = &lt;39 2 0 0&gt;;</div><div class='add'>+	dfsrr;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/qoriq-mpic.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-mpic.dtsi<br/>new file mode 100644<br/>index 000000000000..b9bada6a87dc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/qoriq-mpic.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/qoriq-mpic.dtsi</a></div><div class='hunk'>@@ -0,0 +1,106 @@</div><div class='add'>+/*</div><div class='add'>+ * QorIQ MPIC device tree stub [ controller @ offset 0x40000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+mpic: pic@40000 {</div><div class='add'>+	interrupt-controller;</div><div class='add'>+	#address-cells = &lt;0&gt;;</div><div class='add'>+	#interrupt-cells = &lt;4&gt;;</div><div class='add'>+	reg = &lt;0x40000 0x40000&gt;;</div><div class='add'>+	compatible = "fsl,mpic", "chrp,open-pic";</div><div class='add'>+	device_type = "open-pic";</div><div class='add'>+	clock-frequency = &lt;0x0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+timer@41100 {</div><div class='add'>+	compatible = "fsl,mpic-global-timer";</div><div class='add'>+	reg = &lt;0x41100 0x100 0x41300 4&gt;;</div><div class='add'>+	interrupts = &lt;0 0 3 0</div><div class='add'>+		      1 0 3 0</div><div class='add'>+		      2 0 3 0</div><div class='add'>+		      3 0 3 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+msi0: msi@41600 {</div><div class='add'>+	compatible = "fsl,mpic-msi";</div><div class='add'>+	reg = &lt;0x41600 0x200&gt;;</div><div class='add'>+	msi-available-ranges = &lt;0 0x100&gt;;</div><div class='add'>+	interrupts = &lt;</div><div class='add'>+		0xe0 0 0 0</div><div class='add'>+		0xe1 0 0 0</div><div class='add'>+		0xe2 0 0 0</div><div class='add'>+		0xe3 0 0 0</div><div class='add'>+		0xe4 0 0 0</div><div class='add'>+		0xe5 0 0 0</div><div class='add'>+		0xe6 0 0 0</div><div class='add'>+		0xe7 0 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+msi1: msi@41800 {</div><div class='add'>+	compatible = "fsl,mpic-msi";</div><div class='add'>+	reg = &lt;0x41800 0x200&gt;;</div><div class='add'>+	msi-available-ranges = &lt;0 0x100&gt;;</div><div class='add'>+	interrupts = &lt;</div><div class='add'>+		0xe8 0 0 0</div><div class='add'>+		0xe9 0 0 0</div><div class='add'>+		0xea 0 0 0</div><div class='add'>+		0xeb 0 0 0</div><div class='add'>+		0xec 0 0 0</div><div class='add'>+		0xed 0 0 0</div><div class='add'>+		0xee 0 0 0</div><div class='add'>+		0xef 0 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+msi2: msi@41a00 {</div><div class='add'>+	compatible = "fsl,mpic-msi";</div><div class='add'>+	reg = &lt;0x41a00 0x200&gt;;</div><div class='add'>+	msi-available-ranges = &lt;0 0x100&gt;;</div><div class='add'>+	interrupts = &lt;</div><div class='add'>+		0xf0 0 0 0</div><div class='add'>+		0xf1 0 0 0</div><div class='add'>+		0xf2 0 0 0</div><div class='add'>+		0xf3 0 0 0</div><div class='add'>+		0xf4 0 0 0</div><div class='add'>+		0xf5 0 0 0</div><div class='add'>+		0xf6 0 0 0</div><div class='add'>+		0xf7 0 0 0&gt;;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+timer@42100 {</div><div class='add'>+	compatible = "fsl,mpic-global-timer";</div><div class='add'>+	reg = &lt;0x42100 0x100 0x42300 4&gt;;</div><div class='add'>+	interrupts = &lt;4 0 3 0</div><div class='add'>+		      5 0 3 0</div><div class='add'>+		      6 0 3 0</div><div class='add'>+		      7 0 3 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/qoriq-rmu-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-rmu-0.dtsi<br/>new file mode 100644<br/>index 000000000000..ca7fec792e53<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/qoriq-rmu-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/qoriq-rmu-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+/*</div><div class='add'>+ * QorIQ RIO Message Unit device tree stub [ controller @ offset 0xd3000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+rmu: rmu@d3000 {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	compatible = "fsl,srio-rmu";</div><div class='add'>+	reg = &lt;0xd3000 0x500&gt;;</div><div class='add'>+	ranges = &lt;0x0 0xd3000 0x500&gt;;</div><div class='add'>+</div><div class='add'>+	message-unit@0 {</div><div class='add'>+		compatible = "fsl,srio-msg-unit";</div><div class='add'>+		reg = &lt;0x0 0x100&gt;;</div><div class='add'>+		interrupts = &lt;</div><div class='add'>+			60 2 0 0  /* msg1_tx_irq */</div><div class='add'>+			61 2 0 0&gt;;/* msg1_rx_irq */</div><div class='add'>+	};</div><div class='add'>+	message-unit@100 {</div><div class='add'>+		compatible = "fsl,srio-msg-unit";</div><div class='add'>+		reg = &lt;0x100 0x100&gt;;</div><div class='add'>+		interrupts = &lt;</div><div class='add'>+			62 2 0 0  /* msg2_tx_irq */</div><div class='add'>+			63 2 0 0&gt;;/* msg2_rx_irq */</div><div class='add'>+	};</div><div class='add'>+	doorbell-unit@400 {</div><div class='add'>+		compatible = "fsl,srio-dbell-unit";</div><div class='add'>+		reg = &lt;0x400 0x80&gt;;</div><div class='add'>+		interrupts = &lt;</div><div class='add'>+			56 2 0 0  /* bell_outb_irq */</div><div class='add'>+			57 2 0 0&gt;;/* bell_inb_irq */</div><div class='add'>+	};</div><div class='add'>+	port-write-unit@4e0 {</div><div class='add'>+		compatible = "fsl,srio-port-write-unit";</div><div class='add'>+		reg = &lt;0x4e0 0x20&gt;;</div><div class='add'>+		interrupts = &lt;16 2 1 11&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/qoriq-sata2-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-sata2-0.dtsi<br/>new file mode 100644<br/>index 000000000000..b642047fdecf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/qoriq-sata2-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/qoriq-sata2-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+/*</div><div class='add'>+ * QorIQ SATAv2 device tree stub [ controller @ offset 0x220000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+sata@220000 {</div><div class='add'>+	compatible = "fsl,pq-sata-v2";</div><div class='add'>+	reg = &lt;0x220000 0x1000&gt;;</div><div class='add'>+	interrupts = &lt;68 0x2 0 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/qoriq-sata2-1.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-sata2-1.dtsi<br/>new file mode 100644<br/>index 000000000000..c57370259750<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/qoriq-sata2-1.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/qoriq-sata2-1.dtsi</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+/*</div><div class='add'>+ * QorIQ SATAv2 device tree stub [ controller @ offset 0x221000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+sata@221000 {</div><div class='add'>+	compatible = "fsl,pq-sata-v2";</div><div class='add'>+	reg = &lt;0x221000 0x1000&gt;;</div><div class='add'>+	interrupts = &lt;69 0x2 0 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/qoriq-sec4.0-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-sec4.0-0.dtsi<br/>new file mode 100644<br/>index 000000000000..0cbbac329539<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/qoriq-sec4.0-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/qoriq-sec4.0-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,100 @@</div><div class='add'>+/*</div><div class='add'>+ * QorIQ Sec/Crypto 4.0 device tree stub [ controller @ offset 0x300000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+crypto: crypto@300000 {</div><div class='add'>+	compatible = "fsl,sec-v4.0";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	reg = &lt;0x300000 0x10000&gt;;</div><div class='add'>+	ranges = &lt;0 0x300000 0x10000&gt;;</div><div class='add'>+	interrupts = &lt;92 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	sec_jr0: jr@1000 {</div><div class='add'>+		compatible = "fsl,sec-v4.0-job-ring";</div><div class='add'>+		reg = &lt;0x1000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;88 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sec_jr1: jr@2000 {</div><div class='add'>+		compatible = "fsl,sec-v4.0-job-ring";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;89 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sec_jr2: jr@3000 {</div><div class='add'>+		compatible = "fsl,sec-v4.0-job-ring";</div><div class='add'>+		reg = &lt;0x3000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;90 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sec_jr3: jr@4000 {</div><div class='add'>+		compatible = "fsl,sec-v4.0-job-ring";</div><div class='add'>+		reg = &lt;0x4000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;91 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rtic@6000 {</div><div class='add'>+		compatible = "fsl,sec-v4.0-rtic";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0x6000 0x100&gt;;</div><div class='add'>+		ranges = &lt;0x0 0x6100 0xe00&gt;;</div><div class='add'>+</div><div class='add'>+		rtic_a: rtic-a@0 {</div><div class='add'>+			compatible = "fsl,sec-v4.0-rtic-memory";</div><div class='add'>+			reg = &lt;0x00 0x20 0x100 0x80&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rtic_b: rtic-b@20 {</div><div class='add'>+			compatible = "fsl,sec-v4.0-rtic-memory";</div><div class='add'>+			reg = &lt;0x20 0x20 0x200 0x80&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rtic_c: rtic-c@40 {</div><div class='add'>+			compatible = "fsl,sec-v4.0-rtic-memory";</div><div class='add'>+			reg = &lt;0x40 0x20 0x300 0x80&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rtic_d: rtic-d@60 {</div><div class='add'>+			compatible = "fsl,sec-v4.0-rtic-memory";</div><div class='add'>+			reg = &lt;0x60 0x20 0x500 0x80&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+sec_mon: sec_mon@314000 {</div><div class='add'>+	compatible = "fsl,sec-v4.0-mon";</div><div class='add'>+	reg = &lt;0x314000 0x1000&gt;;</div><div class='add'>+	interrupts = &lt;93 2 0 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/qoriq-sec4.1-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-sec4.1-0.dtsi<br/>new file mode 100644<br/>index 000000000000..3308986bba0d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/qoriq-sec4.1-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/qoriq-sec4.1-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+/*</div><div class='add'>+ * QorIQ Sec/Crypto 4.1 device tree stub [ controller @ offset 0x300000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+crypto: crypto@300000 {</div><div class='add'>+	compatible = "fsl,sec-v4.1", "fsl,sec-v4.0";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	reg		 = &lt;0x300000 0x10000&gt;;</div><div class='add'>+	ranges		 = &lt;0 0x300000 0x10000&gt;;</div><div class='add'>+	interrupts	 = &lt;92 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	sec_jr0: jr@1000 {</div><div class='add'>+		compatible = "fsl,sec-v4.1-job-ring",</div><div class='add'>+			     "fsl,sec-v4.0-job-ring";</div><div class='add'>+		reg = &lt;0x1000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;88 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sec_jr1: jr@2000 {</div><div class='add'>+		compatible = "fsl,sec-v4.1-job-ring",</div><div class='add'>+			     "fsl,sec-v4.0-job-ring";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;89 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sec_jr2: jr@3000 {</div><div class='add'>+		compatible = "fsl,sec-v4.1-job-ring",</div><div class='add'>+			     "fsl,sec-v4.0-job-ring";</div><div class='add'>+		reg = &lt;0x3000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;90 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sec_jr3: jr@4000 {</div><div class='add'>+		compatible = "fsl,sec-v4.1-job-ring",</div><div class='add'>+			     "fsl,sec-v4.0-job-ring";</div><div class='add'>+		reg = &lt;0x4000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;91 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rtic@6000 {</div><div class='add'>+		compatible = "fsl,sec-v4.1-rtic",</div><div class='add'>+			     "fsl,sec-v4.0-rtic";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0x6000 0x100&gt;;</div><div class='add'>+		ranges = &lt;0x0 0x6100 0xe00&gt;;</div><div class='add'>+</div><div class='add'>+		rtic_a: rtic-a@0 {</div><div class='add'>+			compatible = "fsl,sec-v4.1-rtic-memory",</div><div class='add'>+				     "fsl,sec-v4.0-rtic-memory";</div><div class='add'>+			reg = &lt;0x00 0x20 0x100 0x80&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rtic_b: rtic-b@20 {</div><div class='add'>+			compatible = "fsl,sec-v4.1-rtic-memory",</div><div class='add'>+				     "fsl,sec-v4.0-rtic-memory";</div><div class='add'>+			reg = &lt;0x20 0x20 0x200 0x80&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rtic_c: rtic-c@40 {</div><div class='add'>+			compatible = "fsl,sec-v4.1-rtic-memory",</div><div class='add'>+				     "fsl,sec-v4.0-rtic-memory";</div><div class='add'>+			reg = &lt;0x40 0x20 0x300 0x80&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rtic_d: rtic-d@60 {</div><div class='add'>+			compatible = "fsl,sec-v4.1-rtic-memory",</div><div class='add'>+				     "fsl,sec-v4.0-rtic-memory";</div><div class='add'>+			reg = &lt;0x60 0x20 0x500 0x80&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+sec_mon: sec_mon@314000 {</div><div class='add'>+	compatible = "fsl,sec-v4.1-mon", "fsl,sec-v4.0-mon";</div><div class='add'>+	reg = &lt;0x314000 0x1000&gt;;</div><div class='add'>+	interrupts = &lt;93 2 0 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/qoriq-sec4.2-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-sec4.2-0.dtsi<br/>new file mode 100644<br/>index 000000000000..7990e0d3d6f2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/qoriq-sec4.2-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/qoriq-sec4.2-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+/*</div><div class='add'>+ * QorIQ Sec/Crypto 4.2 device tree stub [ controller @ offset 0x300000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+crypto: crypto@300000 {</div><div class='add'>+	compatible = "fsl,sec-v4.2", "fsl,sec-v4.0";</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	reg		 = &lt;0x300000 0x10000&gt;;</div><div class='add'>+	ranges		 = &lt;0 0x300000 0x10000&gt;;</div><div class='add'>+	interrupts	 = &lt;92 2 0 0&gt;;</div><div class='add'>+</div><div class='add'>+	sec_jr0: jr@1000 {</div><div class='add'>+		compatible = "fsl,sec-v4.2-job-ring",</div><div class='add'>+			     "fsl,sec-v4.0-job-ring";</div><div class='add'>+		reg = &lt;0x1000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;88 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sec_jr1: jr@2000 {</div><div class='add'>+		compatible = "fsl,sec-v4.2-job-ring",</div><div class='add'>+			     "fsl,sec-v4.0-job-ring";</div><div class='add'>+		reg = &lt;0x2000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;89 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sec_jr2: jr@3000 {</div><div class='add'>+		compatible = "fsl,sec-v4.2-job-ring",</div><div class='add'>+			     "fsl,sec-v4.0-job-ring";</div><div class='add'>+		reg = &lt;0x3000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;90 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sec_jr3: jr@4000 {</div><div class='add'>+		compatible = "fsl,sec-v4.2-job-ring",</div><div class='add'>+			     "fsl,sec-v4.0-job-ring";</div><div class='add'>+		reg = &lt;0x4000 0x1000&gt;;</div><div class='add'>+		interrupts = &lt;91 2 0 0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rtic@6000 {</div><div class='add'>+		compatible = "fsl,sec-v4.2-rtic",</div><div class='add'>+			     "fsl,sec-v4.0-rtic";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		reg = &lt;0x6000 0x100&gt;;</div><div class='add'>+		ranges = &lt;0x0 0x6100 0xe00&gt;;</div><div class='add'>+</div><div class='add'>+		rtic_a: rtic-a@0 {</div><div class='add'>+			compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='add'>+				     "fsl,sec-v4.0-rtic-memory";</div><div class='add'>+			reg = &lt;0x00 0x20 0x100 0x80&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rtic_b: rtic-b@20 {</div><div class='add'>+			compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='add'>+				     "fsl,sec-v4.0-rtic-memory";</div><div class='add'>+			reg = &lt;0x20 0x20 0x200 0x80&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rtic_c: rtic-c@40 {</div><div class='add'>+			compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='add'>+				     "fsl,sec-v4.0-rtic-memory";</div><div class='add'>+			reg = &lt;0x40 0x20 0x300 0x80&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		rtic_d: rtic-d@60 {</div><div class='add'>+			compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='add'>+				     "fsl,sec-v4.0-rtic-memory";</div><div class='add'>+			reg = &lt;0x60 0x20 0x500 0x80&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+sec_mon: sec_mon@314000 {</div><div class='add'>+	compatible = "fsl,sec-v4.2-mon", "fsl,sec-v4.0-mon";</div><div class='add'>+	reg = &lt;0x314000 0x1000&gt;;</div><div class='add'>+	interrupts = &lt;93 2 0 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/qoriq-usb2-dr-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-usb2-dr-0.dtsi<br/>new file mode 100644<br/>index 000000000000..4dd6f84c239c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/qoriq-usb2-dr-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/qoriq-usb2-dr-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/*</div><div class='add'>+ * QorIQ USB DR device tree stub [ controller @ offset 0x211000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+usb@211000 {</div><div class='add'>+	compatible = "fsl,mpc85xx-usb2-dr", "fsl-usb2-dr";</div><div class='add'>+	reg = &lt;0x211000 0x1000&gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	interrupts = &lt;45 0x2 0 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/fsl/qoriq-usb2-mph-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-usb2-mph-0.dtsi<br/>new file mode 100644<br/>index 000000000000..f053835aa1c7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/fsl/qoriq-usb2-mph-0.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/fsl/qoriq-usb2-mph-0.dtsi</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/*</div><div class='add'>+ * QorIQ USB Host device tree stub [ controller @ offset 0x210000 ]</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+usb@210000 {</div><div class='add'>+	compatible = "fsl,mpc85xx-usb2-mph", "fsl-usb2-mph";</div><div class='add'>+	reg = &lt;0x210000 0x1000&gt;;</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;0&gt;;</div><div class='add'>+	interrupts = &lt;44 0x2 0 0&gt;;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/gef_ppc9a.dts b/arch/powerpc/boot/dts/gef_ppc9a.dts<br/>index 2266bbb303d0..38dcb96c8e26 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/gef_ppc9a.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/gef_ppc9a.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/gef_ppc9a.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/gef_ppc9a.dts</a></div><div class='hunk'>@@ -339,7 +339,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;0x2a 0x2&gt;;</div><div class='hunk'>@@ -349,7 +349,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;0x1c 0x2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/gef_sbc310.dts b/arch/powerpc/boot/dts/gef_sbc310.dts<br/>index 429e87d9acef..5ab8932d09b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/gef_sbc310.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/gef_sbc310.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/gef_sbc310.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/gef_sbc310.dts</a></div><div class='hunk'>@@ -337,7 +337,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;0x2a 0x2&gt;;</div><div class='hunk'>@@ -347,7 +347,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;0x1c 0x2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/gef_sbc610.dts b/arch/powerpc/boot/dts/gef_sbc610.dts<br/>index d81201ac2cad..d5341f5741aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/gef_sbc610.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/gef_sbc610.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/gef_sbc610.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/gef_sbc610.dts</a></div><div class='hunk'>@@ -337,7 +337,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;0x2a 0x2&gt;;</div><div class='hunk'>@@ -347,7 +347,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;0x1c 0x2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/klondike.dts b/arch/powerpc/boot/dts/klondike.dts<br/>new file mode 100644<br/>index 000000000000..8c9429033618<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/klondike.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/klondike.dts</a></div><div class='hunk'>@@ -0,0 +1,227 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree for Klondike (APM8018X) board.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2010, Applied Micro Circuits Corporation</div><div class='add'>+ * Author: Tanmay Inamdar &lt;tinamdar@apm.com&gt;</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; either version 2 of</div><div class='add'>+ * the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,</div><div class='add'>+ * MA 02111-1307 USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	model = "apm,klondike";</div><div class='add'>+	compatible = "apm,klondike";</div><div class='add'>+	dcr-parent = &lt;&amp;{/cpus/cpu@0}&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		ethernet0 = &amp;EMAC0;</div><div class='add'>+		ethernet1 = &amp;EMAC1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			model = "PowerPC,apm8018x";</div><div class='add'>+			reg = &lt;0x00000000&gt;;</div><div class='add'>+			clock-frequency = &lt;300000000&gt;; /* Filled in by U-Boot */</div><div class='add'>+			timebase-frequency = &lt;300000000&gt;; /* Filled in by U-Boot */</div><div class='add'>+			i-cache-line-size = &lt;32&gt;;</div><div class='add'>+			d-cache-line-size = &lt;32&gt;;</div><div class='add'>+			i-cache-size = &lt;16384&gt;; /* 16 kB */</div><div class='add'>+			d-cache-size = &lt;16384&gt;; /* 16 kB */</div><div class='add'>+			dcr-controller;</div><div class='add'>+			dcr-access-method = "native";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x00000000 0x20000000&gt;; /* Filled in by U-Boot */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	UIC0: interrupt-controller {</div><div class='add'>+		compatible = "ibm,uic";</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		cell-index = &lt;0&gt;;</div><div class='add'>+		dcr-reg = &lt;0x0c0 0x010&gt;;</div><div class='add'>+		#address-cells = &lt;0&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	UIC1: interrupt-controller1 {</div><div class='add'>+		compatible = "ibm,uic";</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+		dcr-reg = &lt;0x0d0 0x010&gt;;</div><div class='add'>+		#address-cells = &lt;0&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;0x1e 0x4 0x1f 0x4&gt;; /* cascade */</div><div class='add'>+		interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	UIC2: interrupt-controller2 {</div><div class='add'>+		compatible = "ibm,uic";</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		cell-index = &lt;2&gt;;</div><div class='add'>+		dcr-reg = &lt;0x0e0 0x010&gt;;</div><div class='add'>+		#address-cells = &lt;0&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;0x0a 0x4 0x0b 0x4&gt;; /* cascade */</div><div class='add'>+		interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	UIC3: interrupt-controller3 {</div><div class='add'>+		compatible = "ibm,uic";</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		cell-index = &lt;3&gt;;</div><div class='add'>+		dcr-reg = &lt;0x0f0 0x010&gt;;</div><div class='add'>+		#address-cells = &lt;0&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;0x10 0x4 0x11 0x4&gt;; /* cascade */</div><div class='add'>+		interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	plb {</div><div class='add'>+		compatible = "ibm,plb4";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+		clock-frequency = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+</div><div class='add'>+		SDRAM0: memory-controller {</div><div class='add'>+			compatible = "ibm,sdram-apm8018x";</div><div class='add'>+			dcr-reg = &lt;0x010 0x002&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		MAL0: mcmal {</div><div class='add'>+			compatible = "ibm,mcmal2";</div><div class='add'>+			dcr-reg = &lt;0x180 0x062&gt;;</div><div class='add'>+			num-tx-chans = &lt;2&gt;;</div><div class='add'>+			num-rx-chans = &lt;16&gt;;</div><div class='add'>+			#address-cells = &lt;0&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;UIC1&gt;;</div><div class='add'>+			interrupts = &lt;/*TXEOB*/   0x6 0x4</div><div class='add'>+					/*RXEOB*/ 0x7 0x4</div><div class='add'>+					/*SERR*/  0x1 0x4</div><div class='add'>+					/*TXDE*/  0x2 0x4</div><div class='add'>+					/*RXDE*/  0x3 0x4&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		POB0: opb {</div><div class='add'>+			compatible = "ibm,opb";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges = &lt;0x20000000 0x20000000 0x30000000</div><div class='add'>+				  0x50000000 0x50000000 0x10000000</div><div class='add'>+				  0x60000000 0x60000000 0x10000000</div><div class='add'>+				  0xFE000000 0xFE000000 0x00010000&gt;;</div><div class='add'>+			dcr-reg = &lt;0x100 0x020&gt;;</div><div class='add'>+			clock-frequency = &lt;300000000&gt;; /* Filled in by U-Boot */</div><div class='add'>+</div><div class='add'>+			RGMII0: emac-rgmii@400a2000 {</div><div class='add'>+				compatible = "ibm,rgmii";</div><div class='add'>+				reg = &lt;0x400a2000 0x00000010&gt;;</div><div class='add'>+				has-mdio;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			TAH0: emac-tah@400a3000 {</div><div class='add'>+				compatible = "ibm,tah";</div><div class='add'>+				reg = &lt;0x400a3000 0x100&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			TAH1: emac-tah@400a4000 {</div><div class='add'>+				compatible = "ibm,tah";</div><div class='add'>+				reg = &lt;0x400a4000 0x100&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			EMAC0: ethernet@400a0000 {</div><div class='add'>+				compatible = "ibm,emac4", "ibm-emac4sync";</div><div class='add'>+				interrupt-parent = &lt;&amp;EMAC0&gt;;</div><div class='add'>+				interrupts = &lt;0x0&gt;;</div><div class='add'>+				#interrupt-cells = &lt;1&gt;;</div><div class='add'>+				#address-cells = &lt;0&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				interrupt-map = &lt;/*Status*/ 0x0 &amp;UIC0 0x13 0x4&gt;;</div><div class='add'>+				reg = &lt;0x400a0000 0x00000100&gt;;</div><div class='add'>+				local-mac-address = [000000000000]; /* Filled in by U-Boot */</div><div class='add'>+				mal-device = &lt;&amp;MAL0&gt;;</div><div class='add'>+				mal-tx-channel = &lt;0x0&gt;;</div><div class='add'>+				mal-rx-channel = &lt;0x0&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='add'>+				max-frame-size = &lt;9000&gt;;</div><div class='add'>+				rx-fifo-size = &lt;4096&gt;;</div><div class='add'>+				tx-fifo-size = &lt;2048&gt;;</div><div class='add'>+				phy-mode = "rgmii";</div><div class='add'>+				phy-address = &lt;0x2&gt;;</div><div class='add'>+				turbo = "no";</div><div class='add'>+				phy-map = &lt;0x00000000&gt;;</div><div class='add'>+				rgmii-device = &lt;&amp;RGMII0&gt;;</div><div class='add'>+				rgmii-channel = &lt;0&gt;;</div><div class='add'>+				tah-device = &lt;&amp;TAH0&gt;;</div><div class='add'>+				tah-channel = &lt;0&gt;;</div><div class='add'>+				has-inverted-stacr-oc;</div><div class='add'>+				has-new-stacr-staopc;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			EMAC1: ethernet@400a1000 {</div><div class='add'>+				compatible = "ibm,emac4", "ibm-emac4sync";</div><div class='add'>+				status = "disabled";</div><div class='add'>+				interrupt-parent = &lt;&amp;EMAC1&gt;;</div><div class='add'>+				interrupts = &lt;0x0&gt;;</div><div class='add'>+				#interrupt-cells = &lt;1&gt;;</div><div class='add'>+				#address-cells = &lt;0&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				interrupt-map = &lt;/*Status*/ 0x0 &amp;UIC0 0x14 0x4&gt;;</div><div class='add'>+				reg = &lt;0x400a1000 0x00000100&gt;;</div><div class='add'>+				local-mac-address = [000000000000]; /* Filled in by U-Boot */</div><div class='add'>+				mal-device = &lt;&amp;MAL0&gt;;</div><div class='add'>+				mal-tx-channel = &lt;1&gt;;</div><div class='add'>+				mal-rx-channel = &lt;8&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='add'>+				max-frame-size = &lt;9000&gt;;</div><div class='add'>+				rx-fifo-size = &lt;4096&gt;;</div><div class='add'>+				tx-fifo-size = &lt;2048&gt;;</div><div class='add'>+				phy-mode = "rgmii";</div><div class='add'>+				phy-address = &lt;0x3&gt;;</div><div class='add'>+				turbo = "no";</div><div class='add'>+				phy-map = &lt;0x00000000&gt;;</div><div class='add'>+				rgmii-device = &lt;&amp;RGMII0&gt;;</div><div class='add'>+				rgmii-channel = &lt;1&gt;;</div><div class='add'>+				tah-device = &lt;&amp;TAH1&gt;;</div><div class='add'>+				tah-channel = &lt;0&gt;;</div><div class='add'>+				has-inverted-stacr-oc;</div><div class='add'>+				has-new-stacr-staopc;</div><div class='add'>+				mdio-device = &lt;&amp;EMAC0&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chosen {</div><div class='add'>+		linux,stdout-path = "/plb/opb/serial@50001000";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/kmeter1.dts b/arch/powerpc/boot/dts/kmeter1.dts<br/>index d16bae1230f7..983aee185793 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/kmeter1.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/kmeter1.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/kmeter1.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/kmeter1.dts</a></div><div class='hunk'>@@ -80,7 +80,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;264000000&gt;;</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/kuroboxHD.dts b/arch/powerpc/boot/dts/kuroboxHD.dts<br/>index 8d725d10882f..0a4545159e80 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/kuroboxHD.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/kuroboxHD.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/kuroboxHD.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/kuroboxHD.dts</a></div><div class='hunk'>@@ -84,7 +84,7 @@ XXXX add flash parts, rtc, ??</div><div class='ctx'> 		serial0: serial@80004500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x80004500 0x8&gt;;</div><div class='ctx'> 			clock-frequency = &lt;97553800&gt;;</div><div class='ctx'> 			current-speed = &lt;9600&gt;;</div><div class='hunk'>@@ -95,7 +95,7 @@ XXXX add flash parts, rtc, ??</div><div class='ctx'> 		serial1: serial@80004600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x80004600 0x8&gt;;</div><div class='ctx'> 			clock-frequency = &lt;97553800&gt;;</div><div class='ctx'> 			current-speed = &lt;57600&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/kuroboxHG.dts b/arch/powerpc/boot/dts/kuroboxHG.dts<br/>index b13a11eb81b0..0e758b347cdb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/kuroboxHG.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/kuroboxHG.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/kuroboxHG.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/kuroboxHG.dts</a></div><div class='hunk'>@@ -84,7 +84,7 @@ XXXX add flash parts, rtc, ??</div><div class='ctx'> 		serial0: serial@80004500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x80004500 0x8&gt;;</div><div class='ctx'> 			clock-frequency = &lt;130041000&gt;;</div><div class='ctx'> 			current-speed = &lt;9600&gt;;</div><div class='hunk'>@@ -95,7 +95,7 @@ XXXX add flash parts, rtc, ??</div><div class='ctx'> 		serial1: serial@80004600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x80004600 0x8&gt;;</div><div class='ctx'> 			clock-frequency = &lt;130041000&gt;;</div><div class='ctx'> 			current-speed = &lt;57600&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8308_p1m.dts b/arch/powerpc/boot/dts/mpc8308_p1m.dts<br/>index 697b3f6b78bf..22b0832b6c31 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8308_p1m.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8308_p1m.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8308_p1m.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8308_p1m.dts</a></div><div class='hunk'>@@ -233,7 +233,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;133333333&gt;;</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -243,7 +243,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;133333333&gt;;</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8308rdb.dts b/arch/powerpc/boot/dts/mpc8308rdb.dts<br/>index a0bd1881081e..f66d10d95a8d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8308rdb.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8308rdb.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8308rdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8308rdb.dts</a></div><div class='hunk'>@@ -208,7 +208,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;133333333&gt;;</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -218,7 +218,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;133333333&gt;;</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts<br/>index ac1eb320c7b4..1c836c6c5be6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8313erdb.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8313erdb.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8313erdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8313erdb.dts</a></div><div class='hunk'>@@ -261,7 +261,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -271,7 +271,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts<br/>index 4dd08c322979..811848e93aef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8315erdb.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8315erdb.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8315erdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8315erdb.dts</a></div><div class='hunk'>@@ -265,7 +265,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;133333333&gt;;</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -275,7 +275,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;133333333&gt;;</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts<br/>index 05ad8c98e527..da9c72ddc343 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc832x_mds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc832x_mds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc832x_mds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc832x_mds.dts</a></div><div class='hunk'>@@ -105,7 +105,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -115,7 +115,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts<br/>index f4fadb23ad6f..ff7b15b340a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc832x_rdb.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc832x_rdb.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc832x_rdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc832x_rdb.dts</a></div><div class='hunk'>@@ -83,7 +83,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -93,7 +93,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts<br/>index 505dc842d808..2608679d0d4a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8349emitx.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8349emitx.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8349emitx.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8349emitx.dts</a></div><div class='hunk'>@@ -283,7 +283,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;		// from bootloader</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -293,7 +293,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;		// from bootloader</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts<br/>index eb732115f016..6cd044d8fb89 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8349emitxgp.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8349emitxgp.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8349emitxgp.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8349emitxgp.dts</a></div><div class='hunk'>@@ -189,7 +189,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;		// from bootloader</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -199,7 +199,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;		// from bootloader</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts<br/>index 230febb9b72f..4552864082c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc834x_mds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc834x_mds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc834x_mds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc834x_mds.dts</a></div><div class='hunk'>@@ -242,7 +242,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -252,7 +252,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts<br/>index 45cfa1c50a2a..c0e450a551bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc836x_mds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc836x_mds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc836x_mds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc836x_mds.dts</a></div><div class='hunk'>@@ -136,7 +136,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;264000000&gt;;</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -146,7 +146,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;264000000&gt;;</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc836x_rdk.dts b/arch/powerpc/boot/dts/mpc836x_rdk.dts<br/>index bdf4459677b1..b6e9aec1d860 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc836x_rdk.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc836x_rdk.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc836x_rdk.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc836x_rdk.dts</a></div><div class='hunk'>@@ -102,7 +102,7 @@</div><div class='ctx'> </div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;9 8&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='hunk'>@@ -112,7 +112,7 @@</div><div class='ctx'> </div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;10 8&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;ipic&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts<br/>index 855782c5e5ec..cfccef57cd1d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8377_mds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8377_mds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8377_mds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8377_mds.dts</a></div><div class='hunk'>@@ -276,7 +276,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -286,7 +286,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts<br/>index dbc1b988b29d..353deff1b7f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8377_rdb.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8377_rdb.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8377_rdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8377_rdb.dts</a></div><div class='hunk'>@@ -321,7 +321,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -331,7 +331,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8377_wlan.dts b/arch/powerpc/boot/dts/mpc8377_wlan.dts<br/>index 9ea783056969..ef4a305a0d0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8377_wlan.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8377_wlan.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8377_wlan.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8377_wlan.dts</a></div><div class='hunk'>@@ -304,7 +304,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -314,7 +314,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8378_mds.dts b/arch/powerpc/boot/dts/mpc8378_mds.dts<br/>index f70cf6000839..538fcb927337 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8378_mds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8378_mds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8378_mds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8378_mds.dts</a></div><div class='hunk'>@@ -315,7 +315,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -325,7 +325,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts<br/>index 3447eb9f6e88..32333a908f3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8378_rdb.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8378_rdb.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8378_rdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8378_rdb.dts</a></div><div class='hunk'>@@ -321,7 +321,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -331,7 +331,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts<br/>index 645ec51cc6e1..5387092fdfb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8379_mds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8379_mds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8379_mds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8379_mds.dts</a></div><div class='hunk'>@@ -313,7 +313,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -323,7 +323,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts<br/>index 15560c619b04..46224c2430ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8379_rdb.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8379_rdb.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8379_rdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8379_rdb.dts</a></div><div class='hunk'>@@ -319,7 +319,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -329,7 +329,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8536ds.dts b/arch/powerpc/boot/dts/mpc8536ds.dts<br/>index a75c10eed269..c15881574fdc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8536ds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8536ds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8536ds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8536ds.dts</a></div><div class='hunk'>@@ -9,24 +9,11 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/dts-v1/;</div><div class='add'>+/include/ "fsl/mpc8536si-pre.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,mpc8536ds";</div><div class='ctx'> 	compatible = "fsl,mpc8536ds";</div><div class='del'>-	#address-cells = &lt;2&gt;;</div><div class='del'>-	#size-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		ethernet0 = &amp;enet0;</div><div class='del'>-		ethernet1 = &amp;enet1;</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		serial1 = &amp;serial1;</div><div class='del'>-		pci0 = &amp;pci0;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-		pci2 = &amp;pci2;</div><div class='del'>-		pci3 = &amp;pci3;</div><div class='del'>-	};</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='ctx'> 		#cpus = &lt;1&gt;;</div><div class='hunk'>@@ -45,403 +32,34 @@</div><div class='ctx'> 		reg = &lt;0 0 0 0&gt;;	// Filled by U-Boot</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc@ffe00000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		ranges = &lt;0x0 0 0xffe00000 0x100000&gt;;</div><div class='del'>-		bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='del'>-</div><div class='del'>-		ecm-law@0 {</div><div class='del'>-			compatible = "fsl,ecm-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;12&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ecm@1000 {</div><div class='del'>-			compatible = "fsl,mpc8536-ecm", "fsl,ecm";</div><div class='del'>-			reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;17 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		memory-controller@2000 {</div><div class='del'>-			compatible = "fsl,mpc8536-memory-controller";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;18 0x2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		L2: l2-cache-controller@20000 {</div><div class='del'>-			compatible = "fsl,mpc8536-l2-cache-controller";</div><div class='del'>-			reg = &lt;0x20000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 0x2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@3000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@3100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-			rtc@68 {</div><div class='del'>-				compatible = "dallas,ds3232";</div><div class='del'>-				reg = &lt;0x68&gt;;</div><div class='del'>-				interrupts = &lt;0 0x1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi@7000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,mpc8536-espi";</div><div class='del'>-			reg = &lt;0x7000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;59 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			fsl,espi-num-chipselects = &lt;4&gt;;</div><div class='del'>-</div><div class='del'>-			flash@0 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "spansion,s25sl12801";</div><div class='del'>-				reg = &lt;0&gt;;</div><div class='del'>-				spi-max-frequency = &lt;40000000&gt;;</div><div class='del'>-				partition@u-boot {</div><div class='del'>-					label = "u-boot";</div><div class='del'>-					reg = &lt;0x00000000 0x00100000&gt;;</div><div class='del'>-					read-only;</div><div class='del'>-				};</div><div class='del'>-				partition@kernel {</div><div class='del'>-					label = "kernel";</div><div class='del'>-					reg = &lt;0x00100000 0x00500000&gt;;</div><div class='del'>-					read-only;</div><div class='del'>-				};</div><div class='del'>-				partition@dtb {</div><div class='del'>-					label = "dtb";</div><div class='del'>-					reg = &lt;0x00600000 0x00100000&gt;;</div><div class='del'>-					read-only;</div><div class='del'>-				};</div><div class='del'>-				partition@fs {</div><div class='del'>-					label = "file system";</div><div class='del'>-					reg = &lt;0x00700000 0x00900000&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-			flash@1 {</div><div class='del'>-				compatible = "spansion,s25sl12801";</div><div class='del'>-				reg = &lt;1&gt;;</div><div class='del'>-				spi-max-frequency = &lt;40000000&gt;;</div><div class='del'>-			};</div><div class='del'>-			flash@2 {</div><div class='del'>-				compatible = "spansion,s25sl12801";</div><div class='del'>-				reg = &lt;2&gt;;</div><div class='del'>-				spi-max-frequency = &lt;40000000&gt;;</div><div class='del'>-			};</div><div class='del'>-			flash@3 {</div><div class='del'>-				compatible = "spansion,s25sl12801";</div><div class='del'>-				reg = &lt;3&gt;;</div><div class='del'>-				spi-max-frequency = &lt;40000000&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma@21300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,mpc8536-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x21300 4&gt;;</div><div class='del'>-			ranges = &lt;0 0x21100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,mpc8536-dma-channel",</div><div class='del'>-					     "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;20 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,mpc8536-dma-channel",</div><div class='del'>-					     "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;21 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,mpc8536-dma-channel",</div><div class='del'>-					     "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;22 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,mpc8536-dma-channel",</div><div class='del'>-					     "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;23 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb@22000 {</div><div class='del'>-			compatible = "fsl,mpc8536-usb2-mph", "fsl-usb2-mph";</div><div class='del'>-			reg = &lt;0x22000 0x1000&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;28 0x2&gt;;</div><div class='del'>-			phy_type = "ulpi";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb@23000 {</div><div class='del'>-			compatible = "fsl,mpc8536-usb2-mph", "fsl-usb2-mph";</div><div class='del'>-			reg = &lt;0x23000 0x1000&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;46 0x2&gt;;</div><div class='del'>-			phy_type = "ulpi";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet0: ethernet@24000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x24000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x24000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;29 2 30 2 34 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy1&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-mdio";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				phy0: ethernet-phy@0 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;10 0x1&gt;;</div><div class='del'>-					reg = &lt;0&gt;;</div><div class='del'>-					device_type = "ethernet-phy";</div><div class='del'>-				};</div><div class='del'>-				phy1: ethernet-phy@1 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;10 0x1&gt;;</div><div class='del'>-					reg = &lt;1&gt;;</div><div class='del'>-					device_type = "ethernet-phy";</div><div class='del'>-				};</div><div class='del'>-				tbi0: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet1: ethernet@26000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x26000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x26000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;31 2 32 2 33 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi1&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy0&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-tbi";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				tbi1: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb@2b000 {</div><div class='del'>-			compatible = "fsl,mpc8536-usb2-dr", "fsl-usb2-dr";</div><div class='del'>-			reg = &lt;0x2b000 0x1000&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;60 0x2&gt;;</div><div class='del'>-			dr_mode = "peripheral";</div><div class='del'>-			phy_type = "ulpi";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sdhci@2e000 {</div><div class='del'>-			compatible = "fsl,mpc8536-esdhc", "fsl,esdhc";</div><div class='del'>-			reg = &lt;0x2e000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;72 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			clock-frequency = &lt;250000000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial0: serial@4500 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial1: serial@4600 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		crypto@30000 {</div><div class='del'>-			compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",</div><div class='del'>-				     "fsl,sec2.1", "fsl,sec2.0";</div><div class='del'>-			reg = &lt;0x30000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;45 2 58 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			fsl,num-channels = &lt;4&gt;;</div><div class='del'>-			fsl,channel-fifo-len = &lt;24&gt;;</div><div class='del'>-			fsl,exec-units-mask = &lt;0x9fe&gt;;</div><div class='del'>-			fsl,descriptor-types-mask = &lt;0x3ab0ebf&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sata@18000 {</div><div class='del'>-			compatible = "fsl,mpc8536-sata", "fsl,pq-sata";</div><div class='del'>-			reg = &lt;0x18000 0x1000&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			interrupts = &lt;74 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sata@19000 {</div><div class='del'>-			compatible = "fsl,mpc8536-sata", "fsl,pq-sata";</div><div class='del'>-			reg = &lt;0x19000 0x1000&gt;;</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			interrupts = &lt;41 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		global-utilities@e0000 {	//global utilities block</div><div class='del'>-			compatible = "fsl,mpc8548-guts";</div><div class='del'>-			reg = &lt;0xe0000 0x1000&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-			big-endian;</div><div class='del'>-		};</div><div class='add'>+	lbc: localbus@ffe05000 {</div><div class='add'>+		reg = &lt;0 0xffe05000 0 0x1000&gt;;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		msi@41600 {</div><div class='del'>-			compatible = "fsl,mpc8536-msi", "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x80&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0</div><div class='del'>-				0xe1 0</div><div class='del'>-				0xe2 0</div><div class='del'>-				0xe3 0</div><div class='del'>-				0xe4 0</div><div class='del'>-				0xe5 0</div><div class='del'>-				0xe6 0</div><div class='del'>-				0xe7 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='add'>+	board_soc: soc: soc@ffe00000 {</div><div class='add'>+		ranges = &lt;0x0 0 0xffe00000 0x100000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci0: pci@ffe08000 {</div><div class='del'>-		compatible = "fsl,mpc8540-pci";</div><div class='del'>-		device_type = "pci";</div><div class='add'>+		reg = &lt;0 0xffe08000 0 0x1000&gt;;</div><div class='add'>+		ranges = &lt;0x02000000 0 0x80000000 0 0x80000000 0 0x10000000</div><div class='add'>+			  0x01000000 0 0x00000000 0 0xffc00000 0 0x00010000&gt;;</div><div class='add'>+		clock-frequency = &lt;66666666&gt;;</div><div class='ctx'> 		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='ctx'> 		interrupt-map = &lt;</div><div class='ctx'> </div><div class='ctx'> 			/* IDSEL 0x11 J17 Slot 1 */</div><div class='del'>-			0x8800 0 0 1 &amp;mpic 1 1</div><div class='del'>-			0x8800 0 0 2 &amp;mpic 2 1</div><div class='del'>-			0x8800 0 0 3 &amp;mpic 3 1</div><div class='del'>-			0x8800 0 0 4 &amp;mpic 4 1&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;24 0x2&gt;;</div><div class='del'>-		bus-range = &lt;0 0xff&gt;;</div><div class='del'>-		ranges = &lt;0x02000000 0 0x80000000 0 0x80000000 0 0x10000000</div><div class='del'>-			  0x01000000 0 0x00000000 0 0xffc00000 0 0x00010000&gt;;</div><div class='del'>-		clock-frequency = &lt;66666666&gt;;</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0 0xffe08000 0 0x1000&gt;;</div><div class='add'>+			0x8800 0 0 1 &amp;mpic 1 1 0 0</div><div class='add'>+			0x8800 0 0 2 &amp;mpic 2 1 0 0</div><div class='add'>+			0x8800 0 0 3 &amp;mpic 3 1 0 0</div><div class='add'>+			0x8800 0 0 4 &amp;mpic 4 1 0 0&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci1: pcie@ffe09000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt;0 0xffe09000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 0xff&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0 0x98000000 0 0x98000000 0 0x08000000</div><div class='ctx'> 			  0x01000000 0 0x00000000 0 0xffc20000 0 0x00010000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;25 0x2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0 0 1 &amp;mpic 4 1</div><div class='del'>-			0000 0 0 2 &amp;mpic 5 1</div><div class='del'>-			0000 0 0 3 &amp;mpic 6 1</div><div class='del'>-			0000 0 0 4 &amp;mpic 7 1</div><div class='del'>-			&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0x98000000</div><div class='ctx'> 				  0x02000000 0 0x98000000</div><div class='ctx'> 				  0 0x08000000</div><div class='hunk'>@@ -453,31 +71,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci2: pcie@ffe0a000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt;0 0xffe0a000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 0xff&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0 0x90000000 0 0x90000000 0 0x08000000</div><div class='ctx'> 			  0x01000000 0 0x00000000 0 0xffc10000 0 0x00010000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;26 0x2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0 0 1 &amp;mpic 0 1</div><div class='del'>-			0000 0 0 2 &amp;mpic 1 1</div><div class='del'>-			0000 0 0 3 &amp;mpic 2 1</div><div class='del'>-			0000 0 0 4 &amp;mpic 3 1</div><div class='del'>-			&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0x90000000</div><div class='ctx'> 				  0x02000000 0 0x90000000</div><div class='ctx'> 				  0 0x08000000</div><div class='hunk'>@@ -489,32 +86,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci3: pcie@ffe0b000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt;0 0xffe0b000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 0xff&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0 0xa0000000 0 0xa0000000 0 0x20000000</div><div class='ctx'> 			  0x01000000 0 0x00000000 0 0xffc30000 0 0x00010000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;27 0x2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0 0 1 &amp;mpic 8 1</div><div class='del'>-			0000 0 0 2 &amp;mpic 9 1</div><div class='del'>-			0000 0 0 3 &amp;mpic 10 1</div><div class='del'>-			0000 0 0 4 &amp;mpic 11 1</div><div class='del'>-			&gt;;</div><div class='del'>-</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xa0000000</div><div class='ctx'> 				  0x02000000 0 0xa0000000</div><div class='ctx'> 				  0 0x20000000</div><div class='hunk'>@@ -525,3 +100,6 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "fsl/mpc8536si-post.dtsi"</div><div class='add'>+/include/ "mpc8536ds.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8536ds.dtsi b/arch/powerpc/boot/dts/mpc8536ds.dtsi<br/>new file mode 100644<br/>index 000000000000..1462e4cf49d7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8536ds.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8536ds.dtsi</a></div><div class='hunk'>@@ -0,0 +1,141 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC8536DS Device Tree Source stub (no addresses or top-level ranges)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;board_soc {</div><div class='add'>+	i2c@3100 {</div><div class='add'>+		rtc@68 {</div><div class='add'>+			compatible = "dallas,ds3232";</div><div class='add'>+			reg = &lt;0x68&gt;;</div><div class='add'>+			interrupts = &lt;0 0x1 0 0&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi@7000 {</div><div class='add'>+		flash@0 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "spansion,s25sl12801";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			spi-max-frequency = &lt;40000000&gt;;</div><div class='add'>+			partition@u-boot {</div><div class='add'>+				label = "u-boot";</div><div class='add'>+				reg = &lt;0x00000000 0x00100000&gt;;</div><div class='add'>+				read-only;</div><div class='add'>+			};</div><div class='add'>+			partition@kernel {</div><div class='add'>+				label = "kernel";</div><div class='add'>+				reg = &lt;0x00100000 0x00500000&gt;;</div><div class='add'>+				read-only;</div><div class='add'>+			};</div><div class='add'>+			partition@dtb {</div><div class='add'>+				label = "dtb";</div><div class='add'>+				reg = &lt;0x00600000 0x00100000&gt;;</div><div class='add'>+				read-only;</div><div class='add'>+			};</div><div class='add'>+			partition@fs {</div><div class='add'>+				label = "file system";</div><div class='add'>+				reg = &lt;0x00700000 0x00900000&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		flash@1 {</div><div class='add'>+			compatible = "spansion,s25sl12801";</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			spi-max-frequency = &lt;40000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		flash@2 {</div><div class='add'>+			compatible = "spansion,s25sl12801";</div><div class='add'>+			reg = &lt;2&gt;;</div><div class='add'>+			spi-max-frequency = &lt;40000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		flash@3 {</div><div class='add'>+			compatible = "spansion,s25sl12801";</div><div class='add'>+			reg = &lt;3&gt;;</div><div class='add'>+			spi-max-frequency = &lt;40000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb@22000 {</div><div class='add'>+		phy_type = "ulpi";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb@23000 {</div><div class='add'>+		phy_type = "ulpi";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	enet0: ethernet@24000 {</div><div class='add'>+		tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='add'>+		phy-handle = &lt;&amp;phy1&gt;;</div><div class='add'>+		phy-connection-type = "rgmii-id";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio@24520 {</div><div class='add'>+		phy0: ethernet-phy@0 {</div><div class='add'>+			interrupts = &lt;10 0x1 0 0&gt;;</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			device_type = "ethernet-phy";</div><div class='add'>+		};</div><div class='add'>+		phy1: ethernet-phy@1 {</div><div class='add'>+			interrupts = &lt;10 0x1 0 0&gt;;</div><div class='add'>+			reg = &lt;1&gt;;</div><div class='add'>+			device_type = "ethernet-phy";</div><div class='add'>+		};</div><div class='add'>+		tbi0: tbi-phy@11 {</div><div class='add'>+			reg = &lt;0x11&gt;;</div><div class='add'>+			device_type = "tbi-phy";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	enet2: ethernet@26000 {</div><div class='add'>+		tbi-handle = &lt;&amp;tbi1&gt;;</div><div class='add'>+		phy-handle = &lt;&amp;phy0&gt;;</div><div class='add'>+		phy-connection-type = "rgmii-id";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio@26520 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		compatible = "fsl,gianfar-tbi";</div><div class='add'>+		reg = &lt;0x26520 0x20&gt;;</div><div class='add'>+</div><div class='add'>+		tbi1: tbi-phy@11 {</div><div class='add'>+			reg = &lt;0x11&gt;;</div><div class='add'>+			device_type = "tbi-phy";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb@2b000 {</div><div class='add'>+		dr_mode = "peripheral";</div><div class='add'>+		phy_type = "ulpi";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8536ds_36b.dts b/arch/powerpc/boot/dts/mpc8536ds_36b.dts<br/>index d95b26021e62..8f4b929b1d1d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8536ds_36b.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8536ds_36b.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8536ds_36b.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8536ds_36b.dts</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * MPC8536 DS Device Tree Source</div><div class='add'>+ * MPC8536DS Device Tree Source (36-bit address map)</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2008-2009 Freescale Semiconductor, Inc.</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,24 +9,11 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/dts-v1/;</div><div class='add'>+/include/ "fsl/mpc8536si-pre.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,mpc8536ds";</div><div class='ctx'> 	compatible = "fsl,mpc8536ds";</div><div class='del'>-	#address-cells = &lt;2&gt;;</div><div class='del'>-	#size-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		ethernet0 = &amp;enet0;</div><div class='del'>-		ethernet1 = &amp;enet1;</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		serial1 = &amp;serial1;</div><div class='del'>-		pci0 = &amp;pci0;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-		pci2 = &amp;pci2;</div><div class='del'>-		pci3 = &amp;pci3;</div><div class='del'>-	};</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='ctx'> 		#cpus = &lt;1&gt;;</div><div class='hunk'>@@ -45,351 +32,34 @@</div><div class='ctx'> 		reg = &lt;0 0 0 0&gt;;	// Filled by U-Boot</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc@fffe00000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		ranges = &lt;0x0 0xf 0xffe00000 0x100000&gt;;</div><div class='del'>-		bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='del'>-</div><div class='del'>-		ecm-law@0 {</div><div class='del'>-			compatible = "fsl,ecm-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;12&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ecm@1000 {</div><div class='del'>-			compatible = "fsl,mpc8536-ecm", "fsl,ecm";</div><div class='del'>-			reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;17 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		memory-controller@2000 {</div><div class='del'>-			compatible = "fsl,mpc8536-memory-controller";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;18 0x2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		L2: l2-cache-controller@20000 {</div><div class='del'>-			compatible = "fsl,mpc8536-l2-cache-controller";</div><div class='del'>-			reg = &lt;0x20000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 0x2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@3000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@3100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-			rtc@68 {</div><div class='del'>-				compatible = "dallas,ds3232";</div><div class='del'>-				reg = &lt;0x68&gt;;</div><div class='del'>-				interrupts = &lt;0 0x1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma@21300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,mpc8536-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x21300 4&gt;;</div><div class='del'>-			ranges = &lt;0 0x21100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,mpc8536-dma-channel",</div><div class='del'>-					     "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;20 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,mpc8536-dma-channel",</div><div class='del'>-					     "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;21 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,mpc8536-dma-channel",</div><div class='del'>-					     "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;22 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,mpc8536-dma-channel",</div><div class='del'>-					     "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;23 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb@22000 {</div><div class='del'>-			compatible = "fsl,mpc8536-usb2-mph", "fsl-usb2-mph";</div><div class='del'>-			reg = &lt;0x22000 0x1000&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;28 0x2&gt;;</div><div class='del'>-			phy_type = "ulpi";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb@23000 {</div><div class='del'>-			compatible = "fsl,mpc8536-usb2-mph", "fsl-usb2-mph";</div><div class='del'>-			reg = &lt;0x23000 0x1000&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;46 0x2&gt;;</div><div class='del'>-			phy_type = "ulpi";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet0: ethernet@24000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x24000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x24000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;29 2 30 2 34 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy1&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-mdio";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				phy0: ethernet-phy@0 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;10 0x1&gt;;</div><div class='del'>-					reg = &lt;0&gt;;</div><div class='del'>-					device_type = "ethernet-phy";</div><div class='del'>-				};</div><div class='del'>-				phy1: ethernet-phy@1 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;10 0x1&gt;;</div><div class='del'>-					reg = &lt;1&gt;;</div><div class='del'>-					device_type = "ethernet-phy";</div><div class='del'>-				};</div><div class='del'>-				tbi0: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet1: ethernet@26000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x26000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x26000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;31 2 32 2 33 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi1&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy0&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-tbi";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				tbi1: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb@2b000 {</div><div class='del'>-			compatible = "fsl,mpc8536-usb2-dr", "fsl-usb2-dr";</div><div class='del'>-			reg = &lt;0x2b000 0x1000&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;60 0x2&gt;;</div><div class='del'>-			dr_mode = "peripheral";</div><div class='del'>-			phy_type = "ulpi";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sdhci@2e000 {</div><div class='del'>-			compatible = "fsl,mpc8536-esdhc", "fsl,esdhc";</div><div class='del'>-			reg = &lt;0x2e000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;72 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			clock-frequency = &lt;250000000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial0: serial@4500 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial1: serial@4600 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		crypto@30000 {</div><div class='del'>-			compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",</div><div class='del'>-				     "fsl,sec2.1", "fsl,sec2.0";</div><div class='del'>-			reg = &lt;0x30000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;45 2 58 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			fsl,num-channels = &lt;4&gt;;</div><div class='del'>-			fsl,channel-fifo-len = &lt;24&gt;;</div><div class='del'>-			fsl,exec-units-mask = &lt;0x9fe&gt;;</div><div class='del'>-			fsl,descriptor-types-mask = &lt;0x3ab0ebf&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sata@18000 {</div><div class='del'>-			compatible = "fsl,mpc8536-sata", "fsl,pq-sata";</div><div class='del'>-			reg = &lt;0x18000 0x1000&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			interrupts = &lt;74 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sata@19000 {</div><div class='del'>-			compatible = "fsl,mpc8536-sata", "fsl,pq-sata";</div><div class='del'>-			reg = &lt;0x19000 0x1000&gt;;</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			interrupts = &lt;41 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		global-utilities@e0000 {	//global utilities block</div><div class='del'>-			compatible = "fsl,mpc8548-guts";</div><div class='del'>-			reg = &lt;0xe0000 0x1000&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-			big-endian;</div><div class='del'>-		};</div><div class='add'>+	lbc: localbus@ffe05000 {</div><div class='add'>+		reg = &lt;0 0xffe05000 0 0x1000&gt;;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		msi@41600 {</div><div class='del'>-			compatible = "fsl,mpc8536-msi", "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x80&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0</div><div class='del'>-				0xe1 0</div><div class='del'>-				0xe2 0</div><div class='del'>-				0xe3 0</div><div class='del'>-				0xe4 0</div><div class='del'>-				0xe5 0</div><div class='del'>-				0xe6 0</div><div class='del'>-				0xe7 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='add'>+	board_soc: soc: soc@fffe00000 {</div><div class='add'>+		ranges = &lt;0x0 0xf 0xffe00000 0x100000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	pci0: pci@fffe08000 {</div><div class='del'>-		compatible = "fsl,mpc8540-pci";</div><div class='del'>-		device_type = "pci";</div><div class='add'>+	pci0: pci@ffe08000 {</div><div class='add'>+		reg = &lt;0xf 0xffe08000 0 0x1000&gt;;</div><div class='add'>+		ranges = &lt;0x02000000 0 0xf0000000 0xc 0x00000000 0 0x10000000</div><div class='add'>+			  0x01000000 0 0x00000000 0xf 0xffc00000 0 0x00010000&gt;;</div><div class='add'>+		clock-frequency = &lt;66666666&gt;;</div><div class='ctx'> 		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='ctx'> 		interrupt-map = &lt;</div><div class='ctx'> </div><div class='ctx'> 			/* IDSEL 0x11 J17 Slot 1 */</div><div class='del'>-			0x8800 0 0 1 &amp;mpic 1 1</div><div class='del'>-			0x8800 0 0 2 &amp;mpic 2 1</div><div class='del'>-			0x8800 0 0 3 &amp;mpic 3 1</div><div class='del'>-			0x8800 0 0 4 &amp;mpic 4 1&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;24 0x2&gt;;</div><div class='del'>-		bus-range = &lt;0 0xff&gt;;</div><div class='del'>-		ranges = &lt;0x02000000 0 0xf0000000 0xc 0x00000000 0 0x10000000</div><div class='del'>-			  0x01000000 0 0x00000000 0xf 0xffc00000 0 0x00010000&gt;;</div><div class='del'>-		clock-frequency = &lt;66666666&gt;;</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xf 0xffe08000 0 0x1000&gt;;</div><div class='add'>+			0x8800 0 0 1 &amp;mpic 1 1 0 0</div><div class='add'>+			0x8800 0 0 2 &amp;mpic 2 1 0 0</div><div class='add'>+			0x8800 0 0 3 &amp;mpic 3 1 0 0</div><div class='add'>+			0x8800 0 0 4 &amp;mpic 4 1 0 0&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	pci1: pcie@fffe09000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='add'>+	pci1: pcie@ffe09000 {</div><div class='ctx'> 		reg = &lt;0xf 0xffe09000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 0xff&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0 0xf8000000 0xc 0x18000000 0 0x08000000</div><div class='ctx'> 			  0x01000000 0 0x00000000 0xf 0xffc20000 0 0x00010000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;25 0x2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0 0 1 &amp;mpic 4 1</div><div class='del'>-			0000 0 0 2 &amp;mpic 5 1</div><div class='del'>-			0000 0 0 3 &amp;mpic 6 1</div><div class='del'>-			0000 0 0 4 &amp;mpic 7 1</div><div class='del'>-			&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xf8000000</div><div class='ctx'> 				  0x02000000 0 0xf8000000</div><div class='ctx'> 				  0 0x08000000</div><div class='hunk'>@@ -401,31 +71,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci2: pcie@fffe0a000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt;0xf 0xffe0a000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 0xff&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0 0xf8000000 0xc 0x10000000 0 0x08000000</div><div class='ctx'> 			  0x01000000 0 0x00000000 0xf 0xffc10000 0 0x00010000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;26 0x2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0 0 1 &amp;mpic 0 1</div><div class='del'>-			0000 0 0 2 &amp;mpic 1 1</div><div class='del'>-			0000 0 0 3 &amp;mpic 2 1</div><div class='del'>-			0000 0 0 4 &amp;mpic 3 1</div><div class='del'>-			&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xf8000000</div><div class='ctx'> 				  0x02000000 0 0xf8000000</div><div class='ctx'> 				  0 0x08000000</div><div class='hunk'>@@ -437,32 +86,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci3: pcie@fffe0b000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt;0xf 0xffe0b000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 0xff&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0 0xe0000000 0xc 0x20000000 0 0x20000000</div><div class='ctx'> 			  0x01000000 0 0x00000000 0xf 0xffc30000 0 0x00010000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;27 0x2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0 0 1 &amp;mpic 8 1</div><div class='del'>-			0000 0 0 2 &amp;mpic 9 1</div><div class='del'>-			0000 0 0 3 &amp;mpic 10 1</div><div class='del'>-			0000 0 0 4 &amp;mpic 11 1</div><div class='del'>-			&gt;;</div><div class='del'>-</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xe0000000</div><div class='ctx'> 				  0x02000000 0 0xe0000000</div><div class='ctx'> 				  0 0x20000000</div><div class='hunk'>@@ -473,3 +100,6 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "fsl/mpc8536si-post.dtsi"</div><div class='add'>+/include/ "mpc8536ds.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts<br/>index 8d1bf0fd9268..f99fb110c97f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8540ads.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8540ads.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8540ads.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8540ads.dts</a></div><div class='hunk'>@@ -243,7 +243,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;; 	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;; 	// should we fill in in uboot?</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='hunk'>@@ -253,7 +253,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;; 	// should we fill in in uboot?</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts<br/>index 87ff96549fac..0f5e93912799 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8541cds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8541cds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8541cds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8541cds.dts</a></div><div class='hunk'>@@ -209,7 +209,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;; 	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;; 	// should we fill in in uboot?</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='hunk'>@@ -219,7 +219,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;; 	// should we fill in in uboot?</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts<br/>index d793968743c9..e934987e882b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8544ds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8544ds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8544ds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8544ds.dts</a></div><div class='hunk'>@@ -9,339 +9,52 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/dts-v1/;</div><div class='add'>+/include/ "fsl/mpc8544si-pre.dtsi"</div><div class='add'>+</div><div class='ctx'> / {</div><div class='ctx'> 	model = "MPC8544DS";</div><div class='ctx'> 	compatible = "MPC8544DS", "MPC85xxDS";</div><div class='del'>-	#address-cells = &lt;1&gt;;</div><div class='del'>-	#size-cells = &lt;1&gt;;</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		ethernet0 = &amp;enet0;</div><div class='del'>-		ethernet1 = &amp;enet1;</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		serial1 = &amp;serial1;</div><div class='del'>-		pci0 = &amp;pci0;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-		pci2 = &amp;pci2;</div><div class='del'>-		pci3 = &amp;pci3;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cpus {</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'>-		PowerPC,8544@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x0&gt;;</div><div class='del'>-			d-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			i-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			d-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			i-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			timebase-frequency = &lt;0&gt;;</div><div class='del'>-			bus-frequency = &lt;0&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='ctx'> 		device_type = "memory";</div><div class='del'>-		reg = &lt;0x0 0x0&gt;;	// Filled by U-Boot</div><div class='add'>+		reg = &lt;0 0 0 0&gt;;	// Filled by U-Boot</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc8544@e0000000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-</div><div class='del'>-		ranges = &lt;0x0 0xe0000000 0x100000&gt;;</div><div class='del'>-		bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='del'>-</div><div class='del'>-		ecm-law@0 {</div><div class='del'>-			compatible = "fsl,ecm-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;10&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ecm@1000 {</div><div class='del'>-			compatible = "fsl,mpc8544-ecm", "fsl,ecm";</div><div class='del'>-			reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;17 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		memory-controller@2000 {</div><div class='del'>-			compatible = "fsl,mpc8544-memory-controller";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;18 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		L2: l2-cache-controller@20000 {</div><div class='del'>-			compatible = "fsl,mpc8544-l2-cache-controller";</div><div class='del'>-			reg = &lt;0x20000 0x1000&gt;;</div><div class='del'>-			cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			cache-size = &lt;0x40000&gt;;	// L2, 256K</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@3000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@3100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma@21300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,mpc8544-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x21300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x21100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,mpc8544-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;20 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,mpc8544-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;21 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,mpc8544-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;22 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,mpc8544-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;23 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet0: ethernet@24000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "TSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x24000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x24000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;29 2 30 2 34 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy0&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-mdio";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				phy0: ethernet-phy@0 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;10 1&gt;;</div><div class='del'>-					reg = &lt;0x0&gt;;</div><div class='del'>-					device_type = "ethernet-phy";</div><div class='del'>-				};</div><div class='del'>-				phy1: ethernet-phy@1 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;10 1&gt;;</div><div class='del'>-					reg = &lt;0x1&gt;;</div><div class='del'>-					device_type = "ethernet-phy";</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				tbi0: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet1: ethernet@26000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "TSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x26000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x26000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;31 2 32 2 33 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy1&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi1&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-tbi";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				tbi1: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial0: serial@4500 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial1: serial@4600 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		global-utilities@e0000 {	//global utilities block</div><div class='del'>-			compatible = "fsl,mpc8548-guts";</div><div class='del'>-			reg = &lt;0xe0000 0x1000&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		crypto@30000 {</div><div class='del'>-			compatible = "fsl,sec2.1", "fsl,sec2.0";</div><div class='del'>-			reg = &lt;0x30000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;45 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			fsl,num-channels = &lt;4&gt;;</div><div class='del'>-			fsl,channel-fifo-len = &lt;24&gt;;</div><div class='del'>-			fsl,exec-units-mask = &lt;0xfe&gt;;</div><div class='del'>-			fsl,descriptor-types-mask = &lt;0x12b0ebf&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-		};</div><div class='add'>+	lbc: localbus@e0005000 {</div><div class='add'>+		reg = &lt;0 0xe0005000 0 0x1000&gt;;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		msi@41600 {</div><div class='del'>-			compatible = "fsl,mpc8544-msi", "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x80&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0</div><div class='del'>-				0xe1 0</div><div class='del'>-				0xe2 0</div><div class='del'>-				0xe3 0</div><div class='del'>-				0xe4 0</div><div class='del'>-				0xe5 0</div><div class='del'>-				0xe6 0</div><div class='del'>-				0xe7 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='add'>+	board_soc: soc: soc8544@e0000000 {</div><div class='add'>+		ranges = &lt;0x0 0x0 0xe0000000 0x100000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci0: pci@e0008000 {</div><div class='del'>-		compatible = "fsl,mpc8540-pci";</div><div class='del'>-		device_type = "pci";</div><div class='add'>+		reg = &lt;0 0xe0008000 0 0x1000&gt;;</div><div class='add'>+		ranges = &lt;0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000</div><div class='add'>+			  0x1000000 0x0 0x00000000 0 0xe1000000 0x0 0x10000&gt;;</div><div class='add'>+		clock-frequency = &lt;66666666&gt;;</div><div class='ctx'> 		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='ctx'> 		interrupt-map = &lt;</div><div class='ctx'> </div><div class='ctx'> 			/* IDSEL 0x11 J17 Slot 1 */</div><div class='del'>-			0x8800 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8800 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8800 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8800 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='add'>+			0x8800 0x0 0x0 0x1 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0x8800 0x0 0x0 0x2 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x8800 0x0 0x0 0x3 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x8800 0x0 0x0 0x4 &amp;mpic 0x1 0x1 0 0</div><div class='ctx'> </div><div class='ctx'> 			/* IDSEL 0x12 J16 Slot 2 */</div><div class='ctx'> </div><div class='del'>-			0x9000 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9000 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			0x9000 0x0 0x0 0x4 &amp;mpic 0x1 0x1&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;24 2&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0xc0000000 0xc0000000 0x0 0x20000000</div><div class='del'>-			  0x1000000 0x0 0x0 0xe1000000 0x0 0x10000&gt;;</div><div class='del'>-		clock-frequency = &lt;66666666&gt;;</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008000 0x1000&gt;;</div><div class='add'>+			0x9000 0x0 0x0 0x1 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x9000 0x0 0x0 0x2 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x9000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0x9000 0x0 0x0 0x4 &amp;mpic 0x1 0x1 0 0&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci1: pcie@e0009000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0009000 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000</div><div class='del'>-			  0x1000000 0x0 0x0 0xe1010000 0x0 0x10000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;25 2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x4 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x5 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x6 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x7 0x1</div><div class='del'>-			&gt;;</div><div class='add'>+		reg = &lt;0x0 0xe0009000 0x0 0x1000&gt;;</div><div class='add'>+		ranges = &lt;0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000</div><div class='add'>+			  0x1000000 0x0 0x00000000 0 0xe1010000 0x0 0x10000&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0x80000000</div><div class='ctx'> 				  0x2000000 0x0 0x80000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -353,31 +66,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci2: pcie@e000a000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe000a000 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000</div><div class='del'>-			  0x1000000 0x0 0x0 0xe1020000 0x0 0x10000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;26 2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1</div><div class='del'>-			&gt;;</div><div class='add'>+		reg = &lt;0x0 0xe000a000 0x0 0x1000&gt;;</div><div class='add'>+		ranges = &lt;0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x10000000</div><div class='add'>+			  0x1000000 0x0 0x00000000 0 0xe1020000 0x0 0x10000&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x0 0x10000000</div><div class='hunk'>@@ -388,44 +80,11 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	pci3: pcie@e000b000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe000b000 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0xb0000000 0xb0000000 0x0 0x100000</div><div class='del'>-			  0x1000000 0x0 0x0 0xb0100000 0x0 0x100000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;27 2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xff00 0x0 0x0 0x1&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			// IDSEL 0x1c  USB</div><div class='del'>-			0xe000 0x0 0x0 0x1 &amp;i8259 0xc 0x2</div><div class='del'>-			0xe100 0x0 0x0 0x2 &amp;i8259 0x9 0x2</div><div class='del'>-			0xe200 0x0 0x0 0x3 &amp;i8259 0xa 0x2</div><div class='del'>-			0xe300 0x0 0x0 0x4 &amp;i8259 0xb 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x1d  Audio</div><div class='del'>-			0xe800 0x0 0x0 0x1 &amp;i8259 0x6 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x1e Legacy</div><div class='del'>-			0xf000 0x0 0x0 0x1 &amp;i8259 0x7 0x2</div><div class='del'>-			0xf100 0x0 0x0 0x1 &amp;i8259 0x7 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x1f IDE/SATA</div><div class='del'>-			0xf800 0x0 0x0 0x1 &amp;i8259 0xe 0x2</div><div class='del'>-			0xf900 0x0 0x0 0x1 &amp;i8259 0x5 0x2</div><div class='del'>-		&gt;;</div><div class='del'>-</div><div class='add'>+	board_pci3: pci3: pcie@e000b000 {</div><div class='add'>+		reg = &lt;0x0 0xe000b000 0x0 0x1000&gt;;</div><div class='add'>+		ranges = &lt;0x2000000 0x0 0xb0000000 0 0xb0000000 0x0 0x100000</div><div class='add'>+			  0x1000000 0x0 0x00000000 0 0xb0100000 0x0 0x100000&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xb0000000</div><div class='ctx'> 				  0x2000000 0x0 0xb0000000</div><div class='ctx'> 				  0x0 0x100000</div><div class='hunk'>@@ -433,70 +92,14 @@</div><div class='ctx'> 				  0x1000000 0x0 0x0</div><div class='ctx'> 				  0x1000000 0x0 0x0</div><div class='ctx'> 				  0x0 0x100000&gt;;</div><div class='del'>-</div><div class='del'>-			uli1575@0 {</div><div class='del'>-				reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-				#size-cells = &lt;2&gt;;</div><div class='del'>-				#address-cells = &lt;3&gt;;</div><div class='del'>-				ranges = &lt;0x2000000 0x0 0xb0000000</div><div class='del'>-					  0x2000000 0x0 0xb0000000</div><div class='del'>-					  0x0 0x100000</div><div class='del'>-</div><div class='del'>-					  0x1000000 0x0 0x0</div><div class='del'>-					  0x1000000 0x0 0x0</div><div class='del'>-					  0x0 0x100000&gt;;</div><div class='del'>-				isa@1e {</div><div class='del'>-					device_type = "isa";</div><div class='del'>-					#interrupt-cells = &lt;2&gt;;</div><div class='del'>-					#size-cells = &lt;1&gt;;</div><div class='del'>-					#address-cells = &lt;2&gt;;</div><div class='del'>-					reg = &lt;0xf000 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-					ranges = &lt;0x1 0x0</div><div class='del'>-						  0x1000000 0x0 0x0</div><div class='del'>-						  0x1000&gt;;</div><div class='del'>-					interrupt-parent = &lt;&amp;i8259&gt;;</div><div class='del'>-</div><div class='del'>-					i8259: interrupt-controller@20 {</div><div class='del'>-						reg = &lt;0x1 0x20 0x2</div><div class='del'>-						       0x1 0xa0 0x2</div><div class='del'>-						       0x1 0x4d0 0x2&gt;;</div><div class='del'>-						interrupt-controller;</div><div class='del'>-						device_type = "interrupt-controller";</div><div class='del'>-						#address-cells = &lt;0&gt;;</div><div class='del'>-						#interrupt-cells = &lt;2&gt;;</div><div class='del'>-						compatible = "chrp,iic";</div><div class='del'>-						interrupts = &lt;9 2&gt;;</div><div class='del'>-						interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					};</div><div class='del'>-</div><div class='del'>-					i8042@60 {</div><div class='del'>-						#size-cells = &lt;0&gt;;</div><div class='del'>-						#address-cells = &lt;1&gt;;</div><div class='del'>-						reg = &lt;0x1 0x60 0x1 0x1 0x64 0x1&gt;;</div><div class='del'>-						interrupts = &lt;1 3 12 3&gt;;</div><div class='del'>-						interrupt-parent = &lt;&amp;i8259&gt;;</div><div class='del'>-</div><div class='del'>-						keyboard@0 {</div><div class='del'>-							reg = &lt;0x0&gt;;</div><div class='del'>-							compatible = "pnpPNP,303";</div><div class='del'>-						};</div><div class='del'>-</div><div class='del'>-						mouse@1 {</div><div class='del'>-							reg = &lt;0x1&gt;;</div><div class='del'>-							compatible = "pnpPNP,f03";</div><div class='del'>-						};</div><div class='del'>-					};</div><div class='del'>-</div><div class='del'>-					rtc@70 {</div><div class='del'>-						compatible = "pnpPNP,b00";</div><div class='del'>-						reg = &lt;0x1 0x70 0x2&gt;;</div><div class='del'>-					};</div><div class='del'>-</div><div class='del'>-					gpio@400 {</div><div class='del'>-						reg = &lt;0x1 0x400 0x80&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mpc8544ds.dtsi must be last to ensure board_pci3 overrides pci3 settings</div><div class='add'>+ * for interrupt-map &amp; interrupt-map-mask</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/include/ "fsl/mpc8544si-post.dtsi"</div><div class='add'>+/include/ "mpc8544ds.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8544ds.dtsi b/arch/powerpc/boot/dts/mpc8544ds.dtsi<br/>new file mode 100644<br/>index 000000000000..270f64b90f4e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8544ds.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8544ds.dtsi</a></div><div class='hunk'>@@ -0,0 +1,161 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC8544DS Device Tree Source stub (no addresses or top-level ranges)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;board_soc {</div><div class='add'>+	enet0: ethernet@24000 {</div><div class='add'>+		phy-handle = &lt;&amp;phy0&gt;;</div><div class='add'>+		tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='add'>+		phy-connection-type = "rgmii-id";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio@24520 {</div><div class='add'>+		phy0: ethernet-phy@0 {</div><div class='add'>+			interrupts = &lt;10 1 0 0&gt;;</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+			device_type = "ethernet-phy";</div><div class='add'>+		};</div><div class='add'>+		phy1: ethernet-phy@1 {</div><div class='add'>+			interrupts = &lt;10 1 0 0&gt;;</div><div class='add'>+			reg = &lt;0x1&gt;;</div><div class='add'>+			device_type = "ethernet-phy";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		tbi0: tbi-phy@11 {</div><div class='add'>+			reg = &lt;0x11&gt;;</div><div class='add'>+			device_type = "tbi-phy";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	enet2: ethernet@26000 {</div><div class='add'>+		phy-handle = &lt;&amp;phy1&gt;;</div><div class='add'>+		tbi-handle = &lt;&amp;tbi1&gt;;</div><div class='add'>+		phy-connection-type = "rgmii-id";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio@26520 {</div><div class='add'>+		tbi1: tbi-phy@11 {</div><div class='add'>+			reg = &lt;0x11&gt;;</div><div class='add'>+			device_type = "tbi-phy";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;board_pci3 {</div><div class='add'>+	pcie@0 {</div><div class='add'>+		interrupt-map-mask = &lt;0xff00 0x0 0x0 0x7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			// IDSEL 0x1c  USB</div><div class='add'>+			0xe000 0x0 0x0 0x1 &amp;i8259 0xc 0x2</div><div class='add'>+			0xe100 0x0 0x0 0x2 &amp;i8259 0x9 0x2</div><div class='add'>+			0xe200 0x0 0x0 0x3 &amp;i8259 0xa 0x2</div><div class='add'>+			0xe300 0x0 0x0 0x4 &amp;i8259 0xb 0x2</div><div class='add'>+</div><div class='add'>+			// IDSEL 0x1d  Audio</div><div class='add'>+			0xe800 0x0 0x0 0x1 &amp;i8259 0x6 0x2</div><div class='add'>+</div><div class='add'>+			// IDSEL 0x1e Legacy</div><div class='add'>+			0xf000 0x0 0x0 0x1 &amp;i8259 0x7 0x2</div><div class='add'>+			0xf100 0x0 0x0 0x1 &amp;i8259 0x7 0x2</div><div class='add'>+</div><div class='add'>+			// IDSEL 0x1f IDE/SATA</div><div class='add'>+			0xf800 0x0 0x0 0x1 &amp;i8259 0xe 0x2</div><div class='add'>+			0xf900 0x0 0x0 0x1 &amp;i8259 0x5 0x2</div><div class='add'>+			&gt;;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		uli1575@0 {</div><div class='add'>+			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			#address-cells = &lt;3&gt;;</div><div class='add'>+			ranges = &lt;0x2000000 0x0 0xb0000000</div><div class='add'>+				  0x2000000 0x0 0xb0000000</div><div class='add'>+				  0x0 0x100000</div><div class='add'>+</div><div class='add'>+				  0x1000000 0x0 0x0</div><div class='add'>+				  0x1000000 0x0 0x0</div><div class='add'>+				  0x0 0x100000&gt;;</div><div class='add'>+			isa@1e {</div><div class='add'>+				device_type = "isa";</div><div class='add'>+				#interrupt-cells = &lt;2&gt;;</div><div class='add'>+				#size-cells = &lt;1&gt;;</div><div class='add'>+				#address-cells = &lt;2&gt;;</div><div class='add'>+				reg = &lt;0xf000 0x0 0x0 0x0 0x0&gt;;</div><div class='add'>+				ranges = &lt;0x1 0x0 0x1000000 0x0 0x0</div><div class='add'>+					  0x1000&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;i8259&gt;;</div><div class='add'>+</div><div class='add'>+				i8259: interrupt-controller@20 {</div><div class='add'>+					reg = &lt;0x1 0x20 0x2</div><div class='add'>+					       0x1 0xa0 0x2</div><div class='add'>+					       0x1 0x4d0 0x2&gt;;</div><div class='add'>+					interrupt-controller;</div><div class='add'>+					device_type = "interrupt-controller";</div><div class='add'>+					#address-cells = &lt;0&gt;;</div><div class='add'>+					#interrupt-cells = &lt;2&gt;;</div><div class='add'>+					compatible = "chrp,iic";</div><div class='add'>+					interrupts = &lt;9 2 0 0&gt;;</div><div class='add'>+					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				i8042@60 {</div><div class='add'>+					#size-cells = &lt;0&gt;;</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					reg = &lt;0x1 0x60 0x1 0x1 0x64 0x1&gt;;</div><div class='add'>+					interrupts = &lt;1 3 12 3&gt;;</div><div class='add'>+					interrupt-parent =</div><div class='add'>+						&lt;&amp;i8259&gt;;</div><div class='add'>+</div><div class='add'>+					keyboard@0 {</div><div class='add'>+						reg = &lt;0x0&gt;;</div><div class='add'>+						compatible = "pnpPNP,303";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					mouse@1 {</div><div class='add'>+						reg = &lt;0x1&gt;;</div><div class='add'>+						compatible = "pnpPNP,f03";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				rtc@70 {</div><div class='add'>+					compatible = "pnpPNP,b00";</div><div class='add'>+					reg = &lt;0x1 0x70 0x2&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				gpio@400 {</div><div class='add'>+					reg = &lt;0x1 0x400 0x80&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/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts<br/>index a17a5572fb73..07b8dae0f46e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8548cds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8548cds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8548cds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8548cds.dts</a></div><div class='hunk'>@@ -9,13 +9,11 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/dts-v1/;</div><div class='add'>+/include/ "fsl/mpc8548si-pre.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "MPC8548CDS";</div><div class='ctx'> 	compatible = "MPC8548CDS", "MPC85xxCDS";</div><div class='del'>-	#address-cells = &lt;1&gt;;</div><div class='del'>-	#size-cells = &lt;1&gt;;</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='ctx'> 		ethernet0 = &amp;enet0;</div><div class='hunk'>@@ -29,76 +27,19 @@</div><div class='ctx'> 		pci2 = &amp;pci2;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	cpus {</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'>-		PowerPC,8548@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x0&gt;;</div><div class='del'>-			d-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			i-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			d-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			i-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			timebase-frequency = &lt;0&gt;;	//  33 MHz, from uboot</div><div class='del'>-			bus-frequency = &lt;0&gt;;	// 166 MHz</div><div class='del'>-			clock-frequency = &lt;0&gt;;	// 825 MHz, from uboot</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	memory {</div><div class='ctx'> 		device_type = "memory";</div><div class='del'>-		reg = &lt;0x0 0x8000000&gt;;	// 128M at 0x0</div><div class='add'>+		reg = &lt;0 0 0x0 0x8000000&gt;;	// 128M at 0x0</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc8548@e0000000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		ranges = &lt;0x0 0xe0000000 0x100000&gt;;</div><div class='del'>-		bus-frequency = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-		ecm-law@0 {</div><div class='del'>-			compatible = "fsl,ecm-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;10&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ecm@1000 {</div><div class='del'>-			compatible = "fsl,mpc8548-ecm", "fsl,ecm";</div><div class='del'>-			reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;17 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		memory-controller@2000 {</div><div class='del'>-			compatible = "fsl,mpc8548-memory-controller";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;18 2&gt;;</div><div class='del'>-		};</div><div class='add'>+	lbc: localbus@e0005000 {</div><div class='add'>+		reg = &lt;0 0xe0005000 0 0x1000&gt;;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-		L2: l2-cache-controller@20000 {</div><div class='del'>-			compatible = "fsl,mpc8548-l2-cache-controller";</div><div class='del'>-			reg = &lt;0x20000 0x1000&gt;;</div><div class='del'>-			cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			cache-size = &lt;0x80000&gt;;	// L2, 512K</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-		};</div><div class='add'>+	soc: soc8548@e0000000 {</div><div class='add'>+		ranges = &lt;0 0x0 0xe0000000 0x100000&gt;;</div><div class='ctx'> </div><div class='ctx'> 		i2c@3000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-</div><div class='ctx'> 			eeprom@50 {</div><div class='ctx'> 				compatible = "atmel,24c64";</div><div class='ctx'> 				reg = &lt;0x50&gt;;</div><div class='hunk'>@@ -116,351 +57,178 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		i2c@3100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-</div><div class='ctx'> 			eeprom@50 {</div><div class='ctx'> 				compatible = "atmel,24c64";</div><div class='ctx'> 				reg = &lt;0x50&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		dma@21300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,mpc8548-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x21300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x21100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,mpc8548-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;20 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,mpc8548-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;21 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,mpc8548-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;22 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,mpc8548-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;23 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		enet0: ethernet@24000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x24000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x24000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;29 2 30 2 34 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> 			tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='ctx'> 			phy-handle = &lt;&amp;phy0&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-mdio";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				phy0: ethernet-phy@0 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;5 1&gt;;</div><div class='del'>-					reg = &lt;0x0&gt;;</div><div class='del'>-					device_type = "ethernet-phy";</div><div class='del'>-				};</div><div class='del'>-				phy1: ethernet-phy@1 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;5 1&gt;;</div><div class='del'>-					reg = &lt;0x1&gt;;</div><div class='del'>-					device_type = "ethernet-phy";</div><div class='del'>-				};</div><div class='del'>-				phy2: ethernet-phy@2 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;5 1&gt;;</div><div class='del'>-					reg = &lt;0x2&gt;;</div><div class='del'>-					device_type = "ethernet-phy";</div><div class='del'>-				};</div><div class='del'>-				phy3: ethernet-phy@3 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;5 1&gt;;</div><div class='del'>-					reg = &lt;0x3&gt;;</div><div class='del'>-					device_type = "ethernet-phy";</div><div class='del'>-				};</div><div class='del'>-				tbi0: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='add'>+		mdio@24520 {</div><div class='add'>+			phy0: ethernet-phy@0 {</div><div class='add'>+				interrupts = &lt;5 1 0 0&gt;;</div><div class='add'>+				reg = &lt;0x0&gt;;</div><div class='add'>+				device_type = "ethernet-phy";</div><div class='add'>+			};</div><div class='add'>+			phy1: ethernet-phy@1 {</div><div class='add'>+				interrupts = &lt;5 1 0 0&gt;;</div><div class='add'>+				reg = &lt;0x1&gt;;</div><div class='add'>+				device_type = "ethernet-phy";</div><div class='add'>+			};</div><div class='add'>+			phy2: ethernet-phy@2 {</div><div class='add'>+				interrupts = &lt;5 1 0 0&gt;;</div><div class='add'>+				reg = &lt;0x2&gt;;</div><div class='add'>+				device_type = "ethernet-phy";</div><div class='add'>+			};</div><div class='add'>+			phy3: ethernet-phy@3 {</div><div class='add'>+				interrupts = &lt;5 1 0 0&gt;;</div><div class='add'>+				reg = &lt;0x3&gt;;</div><div class='add'>+				device_type = "ethernet-phy";</div><div class='add'>+			};</div><div class='add'>+			tbi0: tbi-phy@11 {</div><div class='add'>+				reg = &lt;0x11&gt;;</div><div class='add'>+				device_type = "tbi-phy";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		enet1: ethernet@25000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x25000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x25000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;35 2 36 2 40 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> 			tbi-handle = &lt;&amp;tbi1&gt;;</div><div class='ctx'> 			phy-handle = &lt;&amp;phy1&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-tbi";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				tbi1: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='add'>+		mdio@25520 {</div><div class='add'>+			tbi1: tbi-phy@11 {</div><div class='add'>+				reg = &lt;0x11&gt;;</div><div class='add'>+				device_type = "tbi-phy";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		enet2: ethernet@26000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x26000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x26000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;31 2 32 2 33 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> 			tbi-handle = &lt;&amp;tbi2&gt;;</div><div class='ctx'> 			phy-handle = &lt;&amp;phy2&gt;;</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-tbi";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				tbi2: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='add'>+		mdio@26520 {</div><div class='add'>+			tbi2: tbi-phy@11 {</div><div class='add'>+				reg = &lt;0x11&gt;;</div><div class='add'>+				device_type = "tbi-phy";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		enet3: ethernet@27000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;3&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x27000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x27000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;37 2 38 2 39 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> 			tbi-handle = &lt;&amp;tbi3&gt;;</div><div class='ctx'> 			phy-handle = &lt;&amp;phy3&gt;;</div><div class='del'>-</div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-tbi";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				tbi3: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial0: serial@4500 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4500 0x100&gt;;	// reg base, size</div><div class='del'>-			clock-frequency = &lt;0&gt;;	// should we fill in in uboot?</div><div class='del'>-			interrupts = &lt;42 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial1: serial@4600 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4600 0x100&gt;;	// reg base, size</div><div class='del'>-			clock-frequency = &lt;0&gt;;	// should we fill in in uboot?</div><div class='del'>-			interrupts = &lt;42 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		global-utilities@e0000 {	//global utilities reg</div><div class='del'>-			compatible = "fsl,mpc8548-guts";</div><div class='del'>-			reg = &lt;0xe0000 0x1000&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		crypto@30000 {</div><div class='del'>-			compatible = "fsl,sec2.1", "fsl,sec2.0";</div><div class='del'>-			reg = &lt;0x30000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;45 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			fsl,num-channels = &lt;4&gt;;</div><div class='del'>-			fsl,channel-fifo-len = &lt;24&gt;;</div><div class='del'>-			fsl,exec-units-mask = &lt;0xfe&gt;;</div><div class='del'>-			fsl,descriptor-types-mask = &lt;0x12b0ebf&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='add'>+		mdio@27520 {</div><div class='add'>+			tbi3: tbi-phy@11 {</div><div class='add'>+				reg = &lt;0x11&gt;;</div><div class='add'>+				device_type = "tbi-phy";</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci0: pci@e0008000 {</div><div class='add'>+		reg = &lt;0 0xe0008000 0 0x1000&gt;;</div><div class='add'>+		ranges = &lt;0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x10000000</div><div class='add'>+			  0x1000000 0x0 0x00000000 0 0xe2000000 0x0 0x800000&gt;;</div><div class='add'>+		clock-frequency = &lt;66666666&gt;;</div><div class='ctx'> 		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='ctx'> 		interrupt-map = &lt;</div><div class='ctx'> 			/* IDSEL 0x4 (PCIX Slot 2) */</div><div class='del'>-			0x2000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-			0x2000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			0x2000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			0x2000 0x0 0x0 0x4 &amp;mpic 0x3 0x1</div><div class='add'>+			0x2000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0 0</div><div class='add'>+			0x2000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+			0x2000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0x2000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0 0</div><div class='ctx'> </div><div class='ctx'> 			/* IDSEL 0x5 (PCIX Slot 3) */</div><div class='del'>-			0x2800 0x0 0x0 0x1 &amp;mpic 0x1 0x1</div><div class='del'>-			0x2800 0x0 0x0 0x2 &amp;mpic 0x2 0x1</div><div class='del'>-			0x2800 0x0 0x0 0x3 &amp;mpic 0x3 0x1</div><div class='del'>-			0x2800 0x0 0x0 0x4 &amp;mpic 0x0 0x1</div><div class='add'>+			0x2800 0x0 0x0 0x1 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+			0x2800 0x0 0x0 0x2 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0x2800 0x0 0x0 0x3 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x2800 0x0 0x0 0x4 &amp;mpic 0x0 0x1 0 0</div><div class='ctx'> </div><div class='ctx'> 			/* IDSEL 0x6 (PCIX Slot 4) */</div><div class='del'>-			0x3000 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x3000 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x3000 0x0 0x0 0x3 &amp;mpic 0x0 0x1</div><div class='del'>-			0x3000 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='add'>+			0x3000 0x0 0x0 0x1 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0x3000 0x0 0x0 0x2 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x3000 0x0 0x0 0x3 &amp;mpic 0x0 0x1 0 0</div><div class='add'>+			0x3000 0x0 0x0 0x4 &amp;mpic 0x1 0x1 0 0</div><div class='ctx'> </div><div class='ctx'> 			/* IDSEL 0x8 (PCIX Slot 5) */</div><div class='del'>-			0x4000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-			0x4000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			0x4000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			0x4000 0x0 0x0 0x4 &amp;mpic 0x3 0x1</div><div class='add'>+			0x4000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0 0</div><div class='add'>+			0x4000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+			0x4000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0x4000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0 0</div><div class='ctx'> </div><div class='ctx'> 			/* IDSEL 0xC (Tsi310 bridge) */</div><div class='del'>-			0x6000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-			0x6000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			0x6000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			0x6000 0x0 0x0 0x4 &amp;mpic 0x3 0x1</div><div class='add'>+			0x6000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0 0</div><div class='add'>+			0x6000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+			0x6000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0x6000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0 0</div><div class='ctx'> </div><div class='ctx'> 			/* IDSEL 0x14 (Slot 2) */</div><div class='del'>-			0xa000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-			0xa000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			0xa000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			0xa000 0x0 0x0 0x4 &amp;mpic 0x3 0x1</div><div class='add'>+			0xa000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0 0</div><div class='add'>+			0xa000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+			0xa000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0xa000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0 0</div><div class='ctx'> </div><div class='ctx'> 			/* IDSEL 0x15 (Slot 3) */</div><div class='del'>-			0xa800 0x0 0x0 0x1 &amp;mpic 0x1 0x1</div><div class='del'>-			0xa800 0x0 0x0 0x2 &amp;mpic 0x2 0x1</div><div class='del'>-			0xa800 0x0 0x0 0x3 &amp;mpic 0x3 0x1</div><div class='del'>-			0xa800 0x0 0x0 0x4 &amp;mpic 0x0 0x1</div><div class='add'>+			0xa800 0x0 0x0 0x1 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+			0xa800 0x0 0x0 0x2 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0xa800 0x0 0x0 0x3 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0xa800 0x0 0x0 0x4 &amp;mpic 0x0 0x1 0 0</div><div class='ctx'> </div><div class='ctx'> 			/* IDSEL 0x16 (Slot 4) */</div><div class='del'>-			0xb000 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0xb000 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0xb000 0x0 0x0 0x3 &amp;mpic 0x0 0x1</div><div class='del'>-			0xb000 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='add'>+			0xb000 0x0 0x0 0x1 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0xb000 0x0 0x0 0x2 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0xb000 0x0 0x0 0x3 &amp;mpic 0x0 0x1 0 0</div><div class='add'>+			0xb000 0x0 0x0 0x4 &amp;mpic 0x1 0x1 0 0</div><div class='ctx'> </div><div class='ctx'> 			/* IDSEL 0x18 (Slot 5) */</div><div class='del'>-			0xc000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-			0xc000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			0xc000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			0xc000 0x0 0x0 0x4 &amp;mpic 0x3 0x1</div><div class='add'>+			0xc000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0 0</div><div class='add'>+			0xc000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+			0xc000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0xc000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0 0</div><div class='ctx'> </div><div class='ctx'> 			/* IDSEL 0x1C (Tsi310 bridge PCI primary) */</div><div class='del'>-			0xe000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-			0xe000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			0xe000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			0xe000 0x0 0x0 0x4 &amp;mpic 0x3 0x1&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;24 2&gt;;</div><div class='del'>-		bus-range = &lt;0 0&gt;;</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0x80000000 0x80000000 0x0 0x10000000</div><div class='del'>-			  0x1000000 0x0 0x0 0xe2000000 0x0 0x800000&gt;;</div><div class='del'>-		clock-frequency = &lt;66666666&gt;;</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008000 0x1000&gt;;</div><div class='del'>-		compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";</div><div class='del'>-		device_type = "pci";</div><div class='add'>+			0xe000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0 0</div><div class='add'>+			0xe000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+			0xe000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0xe000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0 0&gt;;</div><div class='ctx'> </div><div class='ctx'> 		pci_bridge@1c {</div><div class='ctx'> 			interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='ctx'> 			interrupt-map = &lt;</div><div class='ctx'> </div><div class='ctx'> 				/* IDSEL 0x00 (PrPMC Site) */</div><div class='del'>-				0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-				0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-				0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-				0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1</div><div class='add'>+				0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0 0</div><div class='add'>+				0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+				0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+				0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0 0</div><div class='ctx'> </div><div class='ctx'> 				/* IDSEL 0x04 (VIA chip) */</div><div class='del'>-				0x2000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-				0x2000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-				0x2000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-				0x2000 0x0 0x0 0x4 &amp;mpic 0x3 0x1</div><div class='add'>+				0x2000 0x0 0x0 0x1 &amp;mpic 0x0 0x1 0 0</div><div class='add'>+				0x2000 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+				0x2000 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+				0x2000 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0 0</div><div class='ctx'> </div><div class='ctx'> 				/* IDSEL 0x05 (8139) */</div><div class='del'>-				0x2800 0x0 0x0 0x1 &amp;mpic 0x1 0x1</div><div class='add'>+				0x2800 0x0 0x0 0x1 &amp;mpic 0x1 0x1 0 0</div><div class='ctx'> </div><div class='ctx'> 				/* IDSEL 0x06 (Slot 6) */</div><div class='del'>-				0x3000 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-				0x3000 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-				0x3000 0x0 0x0 0x3 &amp;mpic 0x0 0x1</div><div class='del'>-				0x3000 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='add'>+				0x3000 0x0 0x0 0x1 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+				0x3000 0x0 0x0 0x2 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+				0x3000 0x0 0x0 0x3 &amp;mpic 0x0 0x1 0 0</div><div class='add'>+				0x3000 0x0 0x0 0x4 &amp;mpic 0x1 0x1 0 0</div><div class='ctx'> </div><div class='ctx'> 				/* IDESL 0x07 (Slot 7) */</div><div class='del'>-				0x3800 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-				0x3800 0x0 0x0 0x2 &amp;mpic 0x0 0x1</div><div class='del'>-				0x3800 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-				0x3800 0x0 0x0 0x4 &amp;mpic 0x2 0x1&gt;;</div><div class='add'>+				0x3800 0x0 0x0 0x1 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+				0x3800 0x0 0x0 0x2 &amp;mpic 0x0 0x1 0 0</div><div class='add'>+				0x3800 0x0 0x0 0x3 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+				0x3800 0x0 0x0 0x4 &amp;mpic 0x2 0x1 0 0&gt;;</div><div class='ctx'> </div><div class='ctx'> 			reg = &lt;0xe000 0x0 0x0 0x0 0x0&gt;;</div><div class='ctx'> 			#interrupt-cells = &lt;1&gt;;</div><div class='hunk'>@@ -492,7 +260,7 @@</div><div class='ctx'> 					#address-cells = &lt;0&gt;;</div><div class='ctx'> 					#interrupt-cells = &lt;2&gt;;</div><div class='ctx'> 					compatible = "chrp,iic";</div><div class='del'>-					interrupts = &lt;0 1&gt;;</div><div class='add'>+					interrupts = &lt;0 1 0 0&gt;;</div><div class='ctx'> 					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> </div><div class='hunk'>@@ -505,56 +273,25 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci1: pci@e0009000 {</div><div class='add'>+		reg = &lt;0 0xe0009000 0 0x1000&gt;;</div><div class='add'>+		ranges = &lt;0x2000000 0x0 0x90000000 0 0x90000000 0x0 0x10000000</div><div class='add'>+			  0x1000000 0x0 0x00000000 0 0xe2800000 0x0 0x800000&gt;;</div><div class='add'>+		clock-frequency = &lt;66666666&gt;;</div><div class='ctx'> 		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='ctx'> 		interrupt-map = &lt;</div><div class='ctx'> </div><div class='ctx'> 			/* IDSEL 0x15 */</div><div class='del'>-			0xa800 0x0 0x0 0x1 &amp;mpic 0xb 0x1</div><div class='del'>-			0xa800 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			0xa800 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			0xa800 0x0 0x0 0x4 &amp;mpic 0x3 0x1&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;25 2&gt;;</div><div class='del'>-		bus-range = &lt;0 0&gt;;</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0x90000000 0x90000000 0x0 0x10000000</div><div class='del'>-			  0x1000000 0x0 0x0 0xe2800000 0x0 0x800000&gt;;</div><div class='del'>-		clock-frequency = &lt;66666666&gt;;</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0009000 0x1000&gt;;</div><div class='del'>-		compatible = "fsl,mpc8540-pci";</div><div class='del'>-		device_type = "pci";</div><div class='add'>+			0xa800 0x0 0x0 0x1 &amp;mpic 0xb 0x1 0 0</div><div class='add'>+			0xa800 0x0 0x0 0x2 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+			0xa800 0x0 0x0 0x3 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0xa800 0x0 0x0 0x4 &amp;mpic 0x3 0x1 0 0&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci2: pcie@e000a000 {</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x0 (PEX) */</div><div class='del'>-			00000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-			00000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			00000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			00000 0x0 0x0 0x4 &amp;mpic 0x3 0x1&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;26 2&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000</div><div class='del'>-			  0x1000000 0x0 0x0 0xe3000000 0x0 0x100000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe000a000 0x1000&gt;;</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='add'>+		reg = &lt;0 0xe000a000 0 0x1000&gt;;</div><div class='add'>+		ranges = &lt;0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000</div><div class='add'>+			  0x1000000 0x0 0x00000000 0 0xe3000000 0x0 0x100000&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -565,3 +302,5 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "fsl/mpc8548si-post.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts<br/>index 5c5614f9eb17..fe10438613d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8555cds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8555cds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8555cds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8555cds.dts</a></div><div class='hunk'>@@ -209,7 +209,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;; 	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;; 	// should we fill in in uboot?</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='hunk'>@@ -219,7 +219,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;; 	// should we fill in in uboot?</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts<br/>index 647daf8e7291..09598bb5d443 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8568mds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8568mds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8568mds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8568mds.dts</a></div><div class='hunk'>@@ -9,60 +9,25 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/dts-v1/;</div><div class='add'>+/include/ "fsl/mpc8568si-pre.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "MPC8568EMDS";</div><div class='ctx'> 	compatible = "MPC8568EMDS", "MPC85xxMDS";</div><div class='del'>-	#address-cells = &lt;1&gt;;</div><div class='del'>-	#size-cells = &lt;1&gt;;</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='del'>-		ethernet0 = &amp;enet0;</div><div class='del'>-		ethernet1 = &amp;enet1;</div><div class='del'>-		ethernet2 = &amp;enet2;</div><div class='del'>-		ethernet3 = &amp;enet3;</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		serial1 = &amp;serial1;</div><div class='ctx'> 		pci0 = &amp;pci0;</div><div class='ctx'> 		pci1 = &amp;pci1;</div><div class='del'>-		rapidio0 = &amp;rio0;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cpus {</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'>-		PowerPC,8568@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x0&gt;;</div><div class='del'>-			d-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			i-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			d-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			i-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			sleep = &lt;&amp;pmc 0x00008000	// core</div><div class='del'>-				 &amp;pmc 0x00004000&gt;;	// timebase</div><div class='del'>-			timebase-frequency = &lt;0&gt;;</div><div class='del'>-			bus-frequency = &lt;0&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='add'>+		rapidio0 = &amp;rio;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='ctx'> 		device_type = "memory";</div><div class='del'>-		reg = &lt;0x0 0x10000000&gt;;</div><div class='add'>+		reg = &lt;0x0 0x0 0x0 0x0&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	localbus@e0005000 {</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		compatible = "fsl,mpc8568-localbus", "fsl,pq3-localbus",</div><div class='del'>-			     "simple-bus";</div><div class='del'>-		reg = &lt;0xe0005000 0x1000&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;19 2&gt;;</div><div class='del'>-</div><div class='add'>+	lbc: localbus@e0005000 {</div><div class='add'>+		reg = &lt;0x0 0xe0005000 0x0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x0 0x0 0xfe000000 0x02000000</div><div class='ctx'> 			  0x1 0x0 0xf8000000 0x00008000</div><div class='ctx'> 			  0x2 0x0 0xf0000000 0x04000000</div><div class='hunk'>@@ -104,288 +69,65 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc8568@e0000000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		ranges = &lt;0x0 0xe0000000 0x100000&gt;;</div><div class='del'>-		bus-frequency = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-		ecm-law@0 {</div><div class='del'>-			compatible = "fsl,ecm-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;10&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ecm@1000 {</div><div class='del'>-			compatible = "fsl,mpc8568-ecm", "fsl,ecm";</div><div class='del'>-			reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;17 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		memory-controller@2000 {</div><div class='del'>-			compatible = "fsl,mpc8568-memory-controller";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;18 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		L2: l2-cache-controller@20000 {</div><div class='del'>-			compatible = "fsl,mpc8568-l2-cache-controller";</div><div class='del'>-			reg = &lt;0x20000 0x1000&gt;;</div><div class='del'>-			cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			cache-size = &lt;0x80000&gt;;	// L2, 512K</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-		};</div><div class='add'>+	soc: soc8568@e0000000 {</div><div class='add'>+		ranges = &lt;0x0 0x0 0xe0000000 0x100000&gt;;</div><div class='ctx'> </div><div class='ctx'> 		i2c-sleep-nexus {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "simple-bus";</div><div class='del'>-			sleep = &lt;&amp;pmc 0x00000004&gt;;</div><div class='del'>-			ranges;</div><div class='del'>-</div><div class='ctx'> 			i2c@3000 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl-i2c";</div><div class='del'>-				reg = &lt;0x3000 0x100&gt;;</div><div class='del'>-				interrupts = &lt;43 2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				dfsrr;</div><div class='del'>-</div><div class='ctx'> 				rtc@68 {</div><div class='ctx'> 					compatible = "dallas,ds1374";</div><div class='ctx'> 					reg = &lt;0x68&gt;;</div><div class='del'>-					interrupts = &lt;3 1&gt;;</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+					interrupts = &lt;3 1 0 0&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-			i2c@3100 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				compatible = "fsl-i2c";</div><div class='del'>-				reg = &lt;0x3100 0x100&gt;;</div><div class='del'>-				interrupts = &lt;43 2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				dfsrr;</div><div class='del'>-			};</div><div class='add'>+		enet0: ethernet@24000 {</div><div class='add'>+			tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='add'>+			phy-handle = &lt;&amp;phy2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		dma@21300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,mpc8568-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x21300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x21100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			sleep = &lt;&amp;pmc 0x00000400&gt;;</div><div class='del'>-</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,mpc8568-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;20 2&gt;;</div><div class='add'>+		mdio@24520 {</div><div class='add'>+			phy0: ethernet-phy@7 {</div><div class='add'>+				interrupts = &lt;1 1 0 0&gt;;</div><div class='add'>+				reg = &lt;0x7&gt;;</div><div class='add'>+				device_type = "ethernet-phy";</div><div class='ctx'> 			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,mpc8568-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;21 2&gt;;</div><div class='add'>+			phy1: ethernet-phy@1 {</div><div class='add'>+				interrupts = &lt;2 1 0 0&gt;;</div><div class='add'>+				reg = &lt;0x1&gt;;</div><div class='add'>+				device_type = "ethernet-phy";</div><div class='ctx'> 			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,mpc8568-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;22 2&gt;;</div><div class='add'>+			phy2: ethernet-phy@2 {</div><div class='add'>+				interrupts = &lt;1 1 0 0&gt;;</div><div class='add'>+				reg = &lt;0x2&gt;;</div><div class='add'>+				device_type = "ethernet-phy";</div><div class='ctx'> 			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,mpc8568-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;23 2&gt;;</div><div class='add'>+			phy3: ethernet-phy@3 {</div><div class='add'>+				interrupts = &lt;2 1 0 0&gt;;</div><div class='add'>+				reg = &lt;0x3&gt;;</div><div class='add'>+				device_type = "ethernet-phy";</div><div class='ctx'> 			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet0: ethernet@24000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x24000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x24000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>- 			interrupts = &lt;29 2 30 2 34 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy2&gt;;</div><div class='del'>-			sleep = &lt;&amp;pmc 0x00000080&gt;;</div><div class='del'>-</div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-mdio";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				phy0: ethernet-phy@7 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;1 1&gt;;</div><div class='del'>-					reg = &lt;0x7&gt;;</div><div class='del'>-					device_type = "ethernet-phy";</div><div class='del'>-				};</div><div class='del'>-				phy1: ethernet-phy@1 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;2 1&gt;;</div><div class='del'>-					reg = &lt;0x1&gt;;</div><div class='del'>-					device_type = "ethernet-phy";</div><div class='del'>-				};</div><div class='del'>-				phy2: ethernet-phy@2 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;1 1&gt;;</div><div class='del'>-					reg = &lt;0x2&gt;;</div><div class='del'>-					device_type = "ethernet-phy";</div><div class='del'>-				};</div><div class='del'>-				phy3: ethernet-phy@3 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;2 1&gt;;</div><div class='del'>-					reg = &lt;0x3&gt;;</div><div class='del'>-					device_type = "ethernet-phy";</div><div class='del'>-				};</div><div class='del'>-				tbi0: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='add'>+			tbi0: tbi-phy@11 {</div><div class='add'>+				reg = &lt;0x11&gt;;</div><div class='add'>+				device_type = "tbi-phy";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		enet1: ethernet@25000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x25000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x25000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>- 			interrupts = &lt;35 2 36 2 40 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> 			tbi-handle = &lt;&amp;tbi1&gt;;</div><div class='ctx'> 			phy-handle = &lt;&amp;phy3&gt;;</div><div class='ctx'> 			sleep = &lt;&amp;pmc 0x00000040&gt;;</div><div class='del'>-</div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-tbi";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				tbi1: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		duart-sleep-nexus {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "simple-bus";</div><div class='del'>-			sleep = &lt;&amp;pmc 0x00000002&gt;;</div><div class='del'>-			ranges;</div><div class='del'>-</div><div class='del'>-			serial0: serial@4500 {</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				device_type = "serial";</div><div class='del'>-				compatible = "ns16550";</div><div class='del'>-				reg = &lt;0x4500 0x100&gt;;</div><div class='del'>-				clock-frequency = &lt;0&gt;;</div><div class='del'>-				interrupts = &lt;42 2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			serial1: serial@4600 {</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				device_type = "serial";</div><div class='del'>-				compatible = "ns16550";</div><div class='del'>-				reg = &lt;0x4600 0x100&gt;;</div><div class='del'>-				clock-frequency = &lt;0&gt;;</div><div class='del'>-				interrupts = &lt;42 2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+		mdio@25520 {</div><div class='add'>+			tbi1: tbi-phy@11 {</div><div class='add'>+				reg = &lt;0x11&gt;;</div><div class='add'>+				device_type = "tbi-phy";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		global-utilities@e0000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,mpc8568-guts", "fsl,mpc8548-guts";</div><div class='del'>-			reg = &lt;0xe0000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0 0xe0000 0x1000&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='del'>-</div><div class='del'>-			pmc: power@70 {</div><div class='del'>-				compatible = "fsl,mpc8568-pmc",</div><div class='del'>-					     "fsl,mpc8548-pmc";</div><div class='del'>-				reg = &lt;0x70 0x20&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		crypto@30000 {</div><div class='del'>-			compatible = "fsl,sec2.1", "fsl,sec2.0";</div><div class='del'>-			reg = &lt;0x30000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;45 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			fsl,num-channels = &lt;4&gt;;</div><div class='del'>-			fsl,channel-fifo-len = &lt;24&gt;;</div><div class='del'>-			fsl,exec-units-mask = &lt;0xfe&gt;;</div><div class='del'>-			fsl,descriptor-types-mask = &lt;0x12b0ebf&gt;;</div><div class='del'>-			sleep = &lt;&amp;pmc 0x01000000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi@41600 {</div><div class='del'>-			compatible = "fsl,mpc8568-msi", "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x80&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0</div><div class='del'>-				0xe1 0</div><div class='del'>-				0xe2 0</div><div class='del'>-				0xe3 0</div><div class='del'>-				0xe4 0</div><div class='del'>-				0xe5 0</div><div class='del'>-				0xe6 0</div><div class='del'>-				0xe7 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		par_io@e0100 {</div><div class='del'>-			reg = &lt;0xe0100 0x100&gt;;</div><div class='del'>-			device_type = "par_io";</div><div class='ctx'> 			num-ports = &lt;7&gt;;</div><div class='ctx'> </div><div class='ctx'> 			pio1: ucc_pin@01 {</div><div class='hunk'>@@ -448,57 +190,21 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	qe@e0080000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "qe";</div><div class='del'>-		compatible = "fsl,qe";</div><div class='del'>-		ranges = &lt;0x0 0xe0080000 0x40000&gt;;</div><div class='del'>-		reg = &lt;0xe0080000 0x480&gt;;</div><div class='del'>-		sleep = &lt;&amp;pmc 0x00000800&gt;;</div><div class='del'>-		brg-frequency = &lt;0&gt;;</div><div class='del'>-		bus-frequency = &lt;396000000&gt;;</div><div class='del'>-		fsl,qe-num-riscs = &lt;2&gt;;</div><div class='del'>-		fsl,qe-num-snums = &lt;28&gt;;</div><div class='del'>-</div><div class='del'>-		muram@10000 {</div><div class='del'>- 			#address-cells = &lt;1&gt;;</div><div class='del'>- 			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,qe-muram", "fsl,cpm-muram";</div><div class='del'>-			ranges = &lt;0x0 0x10000 0x10000&gt;;</div><div class='del'>-</div><div class='del'>-			data-only@0 {</div><div class='del'>-				compatible = "fsl,qe-muram-data",</div><div class='del'>-					     "fsl,cpm-muram-data";</div><div class='del'>-				reg = &lt;0x0 0x10000&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='add'>+	qe: qe@e0080000 {</div><div class='add'>+		ranges = &lt;0x0 0x0 0xe0080000 0x40000&gt;;</div><div class='add'>+		reg = &lt;0x0 0xe0080000 0x0 0x480&gt;;</div><div class='ctx'> </div><div class='ctx'> 		spi@4c0 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,spi";</div><div class='del'>-			reg = &lt;0x4c0 0x40&gt;;</div><div class='del'>-			interrupts = &lt;2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='ctx'> 			mode = "cpu";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		spi@500 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,spi";</div><div class='del'>-			reg = &lt;0x500 0x40&gt;;</div><div class='del'>-			interrupts = &lt;1&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='ctx'> 			mode = "cpu";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		enet2: ucc@2000 {</div><div class='ctx'> 			device_type = "network";</div><div class='ctx'> 			compatible = "ucc_geth";</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			reg = &lt;0x2000 0x200&gt;;</div><div class='del'>-			interrupts = &lt;32&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='ctx'> 			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='ctx'> 			rx-clock-name = "none";</div><div class='ctx'> 			tx-clock-name = "clk16";</div><div class='hunk'>@@ -510,10 +216,6 @@</div><div class='ctx'> 		enet3: ucc@3000 {</div><div class='ctx'> 			device_type = "network";</div><div class='ctx'> 			compatible = "ucc_geth";</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			reg = &lt;0x3000 0x200&gt;;</div><div class='del'>-			interrupts = &lt;33&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='ctx'> 			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='ctx'> 			rx-clock-name = "none";</div><div class='ctx'> 			tx-clock-name = "clk16";</div><div class='hunk'>@@ -532,102 +234,57 @@</div><div class='ctx'> 			 * gianfar's MDIO bus */</div><div class='ctx'> 			qe_phy0: ethernet-phy@07 {</div><div class='ctx'> 				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;1 1&gt;;</div><div class='add'>+				interrupts = &lt;1 1 0 0&gt;;</div><div class='ctx'> 				reg = &lt;0x7&gt;;</div><div class='ctx'> 				device_type = "ethernet-phy";</div><div class='ctx'> 			};</div><div class='ctx'> 			qe_phy1: ethernet-phy@01 {</div><div class='ctx'> 				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;2 1&gt;;</div><div class='add'>+				interrupts = &lt;2 1 0 0&gt;;</div><div class='ctx'> 				reg = &lt;0x1&gt;;</div><div class='ctx'> 				device_type = "ethernet-phy";</div><div class='ctx'> 			};</div><div class='ctx'> 			qe_phy2: ethernet-phy@02 {</div><div class='ctx'> 				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;1 1&gt;;</div><div class='add'>+				interrupts = &lt;1 1 0 0&gt;;</div><div class='ctx'> 				reg = &lt;0x2&gt;;</div><div class='ctx'> 				device_type = "ethernet-phy";</div><div class='ctx'> 			};</div><div class='ctx'> 			qe_phy3: ethernet-phy@03 {</div><div class='ctx'> 				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;2 1&gt;;</div><div class='add'>+				interrupts = &lt;2 1 0 0&gt;;</div><div class='ctx'> 				reg = &lt;0x3&gt;;</div><div class='ctx'> 				device_type = "ethernet-phy";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		qeic: interrupt-controller@80 {</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			compatible = "fsl,qe-ic";</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			reg = &lt;0x80 0x80&gt;;</div><div class='del'>-			big-endian;</div><div class='del'>-			interrupts = &lt;46 2 46 2&gt;; //high:30 low:30</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci0: pci@e0008000 {</div><div class='add'>+		reg = &lt;0x0 0xe0008000 0x0 0x1000&gt;;</div><div class='add'>+		ranges = &lt;0x2000000 0x0 0x80000000 0x0 0x80000000 0x0 0x20000000</div><div class='add'>+			  0x1000000 0x0 0x00000000 0x0 0xe2000000 0x0 0x800000&gt;;</div><div class='add'>+		clock-frequency = &lt;66666666&gt;;</div><div class='ctx'> 		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='ctx'> 		interrupt-map = &lt;</div><div class='ctx'> 			/* IDSEL 0x12 AD18 */</div><div class='del'>-			0x9000 0x0 0x0 0x1 &amp;mpic 0x5 0x1</div><div class='del'>-			0x9000 0x0 0x0 0x2 &amp;mpic 0x6 0x1</div><div class='del'>-			0x9000 0x0 0x0 0x3 &amp;mpic 0x7 0x1</div><div class='del'>-			0x9000 0x0 0x0 0x4 &amp;mpic 0x4 0x1</div><div class='add'>+			0x9000 0x0 0x0 0x1 &amp;mpic 0x5 0x1 0 0</div><div class='add'>+			0x9000 0x0 0x0 0x2 &amp;mpic 0x6 0x1 0 0</div><div class='add'>+			0x9000 0x0 0x0 0x3 &amp;mpic 0x7 0x1 0 0</div><div class='add'>+			0x9000 0x0 0x0 0x4 &amp;mpic 0x4 0x1 0 0</div><div class='ctx'> </div><div class='ctx'> 			/* IDSEL 0x13 AD19 */</div><div class='del'>-			0x9800 0x0 0x0 0x1 &amp;mpic 0x6 0x1</div><div class='del'>-			0x9800 0x0 0x0 0x2 &amp;mpic 0x7 0x1</div><div class='del'>-			0x9800 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9800 0x0 0x0 0x4 &amp;mpic 0x5 0x1&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;24 2&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000</div><div class='del'>-			  0x1000000 0x0 0x0 0xe2000000 0x0 0x800000&gt;;</div><div class='del'>-		sleep = &lt;&amp;pmc 0x80000000&gt;;</div><div class='del'>-		clock-frequency = &lt;66666666&gt;;</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe0008000 0x1000&gt;;</div><div class='del'>-		compatible = "fsl,mpc8540-pci";</div><div class='del'>-		device_type = "pci";</div><div class='add'>+			0x9800 0x0 0x0 0x1 &amp;mpic 0x6 0x1 0 0</div><div class='add'>+			0x9800 0x0 0x0 0x2 &amp;mpic 0x7 0x1 0 0</div><div class='add'>+			0x9800 0x0 0x0 0x3 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x9800 0x0 0x0 0x4 &amp;mpic 0x5 0x1 0 0&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	/* PCI Express */</div><div class='ctx'> 	pci1: pcie@e000a000 {</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x0 (PEX) */</div><div class='del'>-			00000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-			00000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			00000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			00000 0x0 0x0 0x4 &amp;mpic 0x3 0x1&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;26 2&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000</div><div class='del'>-			  0x1000000 0x0 0x0 0xe2800000 0x0 0x800000&gt;;</div><div class='del'>-		sleep = &lt;&amp;pmc 0x20000000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe000a000 0x1000&gt;;</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='add'>+		ranges = &lt;0x2000000 0x0 0xa0000000 0x0 0xa0000000 0x0 0x10000000</div><div class='add'>+			  0x1000000 0x0 0x00000000 0x0 0xe2800000 0x0 0x800000&gt;;</div><div class='add'>+		reg = &lt;0x0 0xe000a000 0x0 0x1000&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x0 0x10000000</div><div class='hunk'>@@ -638,22 +295,11 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	rio0: rapidio@e00c00000 {</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		compatible = "fsl,mpc8568-rapidio", "fsl,rapidio-delta";</div><div class='del'>-		reg = &lt;0xe00c0000 0x20000&gt;;</div><div class='del'>-		ranges = &lt;0x0 0x0 0xc0000000 0x0 0x20000000&gt;;</div><div class='del'>-		interrupts = &lt;48 2 /* error     */</div><div class='del'>-			      49 2 /* bell_outb */</div><div class='del'>-			      50 2 /* bell_inb  */</div><div class='del'>-			      53 2 /* msg1_tx   */</div><div class='del'>-			      54 2 /* msg1_rx   */</div><div class='del'>-			      55 2 /* msg2_tx   */</div><div class='del'>-			      56 2 /* msg2_rx   */&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		sleep = &lt;&amp;pmc 0x00080000   /* controller */</div><div class='del'>-			 &amp;pmc 0x00040000&gt;; /* message unit */</div><div class='add'>+	rio: rapidio@e00c00000 {</div><div class='add'>+		reg = &lt;0x0 0xe00c0000 0x0 0x20000&gt;;</div><div class='add'>+		port1 {</div><div class='add'>+			ranges = &lt;0x0 0x0 0x0 0xc0000000 0x0 0x20000000&gt;;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	leds {</div><div class='hunk'>@@ -672,3 +318,5 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "fsl/mpc8568si-post.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8569mds.dts b/arch/powerpc/boot/dts/mpc8569mds.dts<br/>index 8b72eaff5b03..7e283c891b7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8569mds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8569mds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8569mds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8569mds.dts</a></div><div class='hunk'>@@ -9,66 +9,36 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/dts-v1/;</div><div class='add'>+/include/ "fsl/mpc8569si-pre.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "MPC8569EMDS";</div><div class='ctx'> 	compatible = "fsl,MPC8569EMDS";</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='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		serial1 = &amp;serial1;</div><div class='del'>-		ethernet0 = &amp;enet0;</div><div class='del'>-		ethernet1 = &amp;enet1;</div><div class='ctx'> 		ethernet2 = &amp;enet2;</div><div class='ctx'> 		ethernet3 = &amp;enet3;</div><div class='ctx'> 		ethernet5 = &amp;enet5;</div><div class='ctx'> 		ethernet7 = &amp;enet7;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-		rapidio0 = &amp;rio0;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cpus {</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'>-		PowerPC,8569@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x0&gt;;</div><div class='del'>-			d-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			i-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			d-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			i-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			sleep = &lt;&amp;pmc 0x00008000	// core</div><div class='del'>-				 &amp;pmc 0x00004000&gt;;	// timebase</div><div class='del'>-			timebase-frequency = &lt;0&gt;;</div><div class='del'>-			bus-frequency = &lt;0&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='add'>+		rapidio0 = &amp;rio;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	localbus@e0005000 {</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		compatible = "fsl,mpc8569-elbc", "fsl,elbc", "simple-bus";</div><div class='del'>-		reg = &lt;0xe0005000 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;19 2&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		sleep = &lt;&amp;pmc 0x08000000&gt;;</div><div class='del'>-</div><div class='del'>-		ranges = &lt;0x0 0x0 0xfe000000 0x02000000</div><div class='del'>-			  0x1 0x0 0xf8000000 0x00008000</div><div class='del'>-			  0x2 0x0 0xf0000000 0x04000000</div><div class='del'>-			  0x3 0x0 0xfc000000 0x00008000</div><div class='del'>-			  0x4 0x0 0xf8008000 0x00008000</div><div class='del'>-			  0x5 0x0 0xf8010000 0x00008000&gt;;</div><div class='add'>+	lbc: localbus@e0005000 {</div><div class='add'>+		reg = &lt;0x0 0xe0005000 0x0 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+		ranges = &lt;0x0 0x0 0x0 0xfe000000 0x02000000</div><div class='add'>+			  0x1 0x0 0x0 0xf8000000 0x00008000</div><div class='add'>+			  0x2 0x0 0x0 0xf0000000 0x04000000</div><div class='add'>+			  0x3 0x0 0x0 0xfc000000 0x00008000</div><div class='add'>+			  0x4 0x0 0x0 0xf8008000 0x00008000</div><div class='add'>+			  0x5 0x0 0x0 0xf8010000 0x00008000&gt;;</div><div class='ctx'> </div><div class='ctx'> 		nor@0,0 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -133,220 +103,25 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc@e0000000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "fsl,mpc8569-immr", "simple-bus";</div><div class='del'>-		ranges = &lt;0x0 0xe0000000 0x100000&gt;;</div><div class='del'>-		bus-frequency = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-		ecm-law@0 {</div><div class='del'>-			compatible = "fsl,ecm-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;10&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ecm@1000 {</div><div class='del'>-			compatible = "fsl,mpc8569-ecm", "fsl,ecm";</div><div class='del'>-			reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;17 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		memory-controller@2000 {</div><div class='del'>-			compatible = "fsl,mpc8569-memory-controller";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;18 2&gt;;</div><div class='del'>-		};</div><div class='add'>+	soc: soc@e0000000 {</div><div class='add'>+		ranges = &lt;0x0 0x0 0xe0000000 0x100000&gt;;</div><div class='ctx'> </div><div class='ctx'> 		i2c-sleep-nexus {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "simple-bus";</div><div class='del'>-			sleep = &lt;&amp;pmc 0x00000004&gt;;</div><div class='del'>-			ranges;</div><div class='del'>-</div><div class='ctx'> 			i2c@3000 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl-i2c";</div><div class='del'>-				reg = &lt;0x3000 0x100&gt;;</div><div class='del'>-				interrupts = &lt;43 2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				dfsrr;</div><div class='del'>-</div><div class='ctx'> 				rtc@68 {</div><div class='ctx'> 					compatible = "dallas,ds1374";</div><div class='ctx'> 					reg = &lt;0x68&gt;;</div><div class='del'>-					interrupts = &lt;3 1&gt;;</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+					interrupts = &lt;3 1 0 0&gt;;</div><div class='ctx'> 				};</div><div class='ctx'> 			};</div><div class='del'>-</div><div class='del'>-			i2c@3100 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				compatible = "fsl-i2c";</div><div class='del'>-				reg = &lt;0x3100 0x100&gt;;</div><div class='del'>-				interrupts = &lt;43 2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				dfsrr;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		duart-sleep-nexus {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "simple-bus";</div><div class='del'>-			sleep = &lt;&amp;pmc 0x00000002&gt;;</div><div class='del'>-			ranges;</div><div class='del'>-</div><div class='del'>-			serial0: serial@4500 {</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				device_type = "serial";</div><div class='del'>-				compatible = "ns16550";</div><div class='del'>-				reg = &lt;0x4500 0x100&gt;;</div><div class='del'>-				clock-frequency = &lt;0&gt;;</div><div class='del'>-				interrupts = &lt;42 2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			serial1: serial@4600 {</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				device_type = "serial";</div><div class='del'>-				compatible = "ns16550";</div><div class='del'>-				reg = &lt;0x4600 0x100&gt;;</div><div class='del'>-				clock-frequency = &lt;0&gt;;</div><div class='del'>-				interrupts = &lt;42 2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		L2: l2-cache-controller@20000 {</div><div class='del'>-			compatible = "fsl,mpc8569-l2-cache-controller";</div><div class='del'>-			reg = &lt;0x20000 0x1000&gt;;</div><div class='del'>-			cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			cache-size = &lt;0x80000&gt;;	// L2, 512K</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		dma@21300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,mpc8569-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x21300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x21100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,mpc8569-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;20 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,mpc8569-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;21 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,mpc8569-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;22 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,mpc8569-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;23 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sdhci@2e000 {</div><div class='del'>-			compatible = "fsl,mpc8569-esdhc", "fsl,esdhc";</div><div class='del'>-			reg = &lt;0x2e000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;72 0x8&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			sleep = &lt;&amp;pmc 0x00200000&gt;;</div><div class='del'>-			/* Filled in by U-Boot */</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='add'>+		sdhc@2e000 {</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 			sdhci,1-bit-only;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		crypto@30000 {</div><div class='del'>-			compatible = "fsl,sec3.1", "fsl,sec3.0", "fsl,sec2.4",</div><div class='del'>-				"fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";</div><div class='del'>-			reg = &lt;0x30000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;45 2 58 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			fsl,num-channels = &lt;4&gt;;</div><div class='del'>-			fsl,channel-fifo-len = &lt;24&gt;;</div><div class='del'>-			fsl,exec-units-mask = &lt;0xbfe&gt;;</div><div class='del'>-			fsl,descriptor-types-mask = &lt;0x3ab0ebf&gt;;</div><div class='del'>-			sleep = &lt;&amp;pmc 0x01000000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi@41600 {</div><div class='del'>-			compatible = "fsl,mpc8568-msi", "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x80&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0</div><div class='del'>-				0xe1 0</div><div class='del'>-				0xe2 0</div><div class='del'>-				0xe3 0</div><div class='del'>-				0xe4 0</div><div class='del'>-				0xe5 0</div><div class='del'>-				0xe6 0</div><div class='del'>-				0xe7 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		global-utilities@e0000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,mpc8569-guts", "fsl,mpc8548-guts";</div><div class='del'>-			reg = &lt;0xe0000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0 0xe0000 0x1000&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='del'>-</div><div class='del'>-			pmc: power@70 {</div><div class='del'>-				compatible = "fsl,mpc8569-pmc",</div><div class='del'>-					     "fsl,mpc8548-pmc";</div><div class='del'>-				reg = &lt;0x70 0x20&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		par_io@e0100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			reg = &lt;0xe0100 0x100&gt;;</div><div class='del'>-			ranges = &lt;0x0 0xe0100 0x100&gt;;</div><div class='del'>-			device_type = "par_io";</div><div class='ctx'> 			num-ports = &lt;7&gt;;</div><div class='ctx'> </div><div class='ctx'> 			qe_pio_e: gpio-controller@80 {</div><div class='hunk'>@@ -447,47 +222,11 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	qe@e0080000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "qe";</div><div class='del'>-		compatible = "fsl,qe";</div><div class='del'>-		ranges = &lt;0x0 0xe0080000 0x40000&gt;;</div><div class='del'>-		reg = &lt;0xe0080000 0x480&gt;;</div><div class='del'>-		sleep = &lt;&amp;pmc 0x00000800&gt;;</div><div class='del'>-		brg-frequency = &lt;0&gt;;</div><div class='del'>-		bus-frequency = &lt;0&gt;;</div><div class='del'>-		fsl,qe-num-riscs = &lt;4&gt;;</div><div class='del'>-		fsl,qe-num-snums = &lt;46&gt;;</div><div class='del'>-</div><div class='del'>-		qeic: interrupt-controller@80 {</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			compatible = "fsl,qe-ic";</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			reg = &lt;0x80 0x80&gt;;</div><div class='del'>-			interrupts = &lt;46 2 46 2&gt;; //high:30 low:30</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		timer@440 {</div><div class='del'>-			compatible = "fsl,mpc8569-qe-gtm",</div><div class='del'>-				     "fsl,qe-gtm", "fsl,gtm";</div><div class='del'>-			reg = &lt;0x440 0x40&gt;;</div><div class='del'>-			interrupts = &lt;12 13 14 15&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='del'>-			/* Filled in by U-Boot */</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-		};</div><div class='add'>+	qe: qe@e0080000 {</div><div class='add'>+		ranges = &lt;0x0 0x0 0xe0080000 0x40000&gt;;</div><div class='add'>+		reg = &lt;0x0 0xe0080000 0x0 0x480&gt;;</div><div class='ctx'> </div><div class='ctx'> 		spi@4c0 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,mpc8569-qe-spi", "fsl,spi";</div><div class='del'>-			reg = &lt;0x4c0 0x40&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='ctx'> 			gpios = &lt;&amp;qe_pio_e 30 0&gt;;</div><div class='ctx'> 			mode = "cpu-qe";</div><div class='ctx'> </div><div class='hunk'>@@ -499,20 +238,10 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		spi@500 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,spi";</div><div class='del'>-			reg = &lt;0x500 0x40&gt;;</div><div class='del'>-			interrupts = &lt;1&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='ctx'> 			mode = "cpu";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		usb@6c0 {</div><div class='del'>-			compatible = "fsl,mpc8569-qe-usb",</div><div class='del'>-				     "fsl,mpc8323-qe-usb";</div><div class='del'>-			reg = &lt;0x6c0 0x40 0x8b00 0x100&gt;;</div><div class='del'>-			interrupts = &lt;11&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='ctx'> 			fsl,fullspeed-clock = "clk5";</div><div class='ctx'> 			fsl,lowspeed-clock = "brg10";</div><div class='ctx'> 			gpios = &lt;&amp;qe_pio_f 3 0   /* USBOE */</div><div class='hunk'>@@ -527,10 +256,6 @@</div><div class='ctx'> 		enet0: ucc@2000 {</div><div class='ctx'> 			device_type = "network";</div><div class='ctx'> 			compatible = "ucc_geth";</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			reg = &lt;0x2000 0x200&gt;;</div><div class='del'>-			interrupts = &lt;32&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='ctx'> 			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='ctx'> 			rx-clock-name = "none";</div><div class='ctx'> 			tx-clock-name = "clk12";</div><div class='hunk'>@@ -548,35 +273,33 @@</div><div class='ctx'> </div><div class='ctx'> 			qe_phy0: ethernet-phy@07 {</div><div class='ctx'> 				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;1 1&gt;;</div><div class='add'>+				interrupts = &lt;1 1 0 0&gt;;</div><div class='ctx'> 				reg = &lt;0x7&gt;;</div><div class='ctx'> 				device_type = "ethernet-phy";</div><div class='ctx'> 			};</div><div class='ctx'> 			qe_phy1: ethernet-phy@01 {</div><div class='ctx'> 				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;2 1&gt;;</div><div class='add'>+				interrupts = &lt;2 1 0 0&gt;;</div><div class='ctx'> 				reg = &lt;0x1&gt;;</div><div class='ctx'> 				device_type = "ethernet-phy";</div><div class='ctx'> 			};</div><div class='ctx'> 			qe_phy2: ethernet-phy@02 {</div><div class='ctx'> 				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;3 1&gt;;</div><div class='add'>+				interrupts = &lt;3 1 0 0&gt;;</div><div class='ctx'> 				reg = &lt;0x2&gt;;</div><div class='ctx'> 				device_type = "ethernet-phy";</div><div class='ctx'> 			};</div><div class='ctx'> 			qe_phy3: ethernet-phy@03 {</div><div class='ctx'> 				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;4 1&gt;;</div><div class='add'>+				interrupts = &lt;4 1 0 0&gt;;</div><div class='ctx'> 				reg = &lt;0x3&gt;;</div><div class='ctx'> 				device_type = "ethernet-phy";</div><div class='ctx'> 			};</div><div class='ctx'> 			qe_phy5: ethernet-phy@04 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> 				reg = &lt;0x04&gt;;</div><div class='ctx'> 				device_type = "ethernet-phy";</div><div class='ctx'> 			};</div><div class='ctx'> 			qe_phy7: ethernet-phy@06 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> 				reg = &lt;0x6&gt;;</div><div class='ctx'> 				device_type = "ethernet-phy";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -610,10 +333,6 @@</div><div class='ctx'> 		enet2: ucc@2200 {</div><div class='ctx'> 			device_type = "network";</div><div class='ctx'> 			compatible = "ucc_geth";</div><div class='del'>-			cell-index = &lt;3&gt;;</div><div class='del'>-			reg = &lt;0x2200 0x200&gt;;</div><div class='del'>-			interrupts = &lt;34&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='ctx'> 			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='ctx'> 			rx-clock-name = "none";</div><div class='ctx'> 			tx-clock-name = "clk12";</div><div class='hunk'>@@ -637,10 +356,6 @@</div><div class='ctx'> 		enet1: ucc@3000 {</div><div class='ctx'> 			device_type = "network";</div><div class='ctx'> 			compatible = "ucc_geth";</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			reg = &lt;0x3000 0x200&gt;;</div><div class='del'>-			interrupts = &lt;33&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='ctx'> 			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='ctx'> 			rx-clock-name = "none";</div><div class='ctx'> 			tx-clock-name = "clk17";</div><div class='hunk'>@@ -664,10 +379,6 @@</div><div class='ctx'> 		enet3: ucc@3200 {</div><div class='ctx'> 			device_type = "network";</div><div class='ctx'> 			compatible = "ucc_geth";</div><div class='del'>-			cell-index = &lt;4&gt;;</div><div class='del'>-			reg = &lt;0x3200 0x200&gt;;</div><div class='del'>-			interrupts = &lt;35&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='ctx'> 			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='ctx'> 			rx-clock-name = "none";</div><div class='ctx'> 			tx-clock-name = "clk17";</div><div class='hunk'>@@ -691,10 +402,6 @@</div><div class='ctx'> 		enet5: ucc@3400 {</div><div class='ctx'> 			device_type = "network";</div><div class='ctx'> 			compatible = "ucc_geth";</div><div class='del'>-			cell-index = &lt;6&gt;;</div><div class='del'>-			reg = &lt;0x3400 0x200&gt;;</div><div class='del'>-			interrupts = &lt;41&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='ctx'> 			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='ctx'> 			rx-clock-name = "none";</div><div class='ctx'> 			tx-clock-name = "none";</div><div class='hunk'>@@ -706,10 +413,6 @@</div><div class='ctx'> 		enet7: ucc@3600 {</div><div class='ctx'> 			device_type = "network";</div><div class='ctx'> 			compatible = "ucc_geth";</div><div class='del'>-			cell-index = &lt;8&gt;;</div><div class='del'>-			reg = &lt;0x3600 0x200&gt;;</div><div class='del'>-			interrupts = &lt;43&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='ctx'> 			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='ctx'> 			rx-clock-name = "none";</div><div class='ctx'> 			tx-clock-name = "none";</div><div class='hunk'>@@ -717,50 +420,14 @@</div><div class='ctx'> 			phy-handle = &lt;&amp;qe_phy7&gt;;</div><div class='ctx'> 			phy-connection-type = "sgmii";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		muram@10000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,qe-muram", "fsl,cpm-muram";</div><div class='del'>-			ranges = &lt;0x0 0x10000 0x20000&gt;;</div><div class='del'>-</div><div class='del'>-			data-only@0 {</div><div class='del'>-				compatible = "fsl,qe-muram-data",</div><div class='del'>-					     "fsl,cpm-muram-data";</div><div class='del'>-				reg = &lt;0x0 0x20000&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	/* PCI Express */</div><div class='ctx'> 	pci1: pcie@e000a000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xe000a000 0x1000&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 (PEX) */</div><div class='del'>-			00000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-			00000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			00000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			00000 0x0 0x0 0x4 &amp;mpic 0x3 0x1&gt;;</div><div class='del'>-</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;26 2&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000</div><div class='del'>-			  0x1000000 0x0 0x00000000 0xe2800000 0x0 0x00800000&gt;;</div><div class='del'>-		sleep = &lt;&amp;pmc 0x20000000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='add'>+		reg = &lt;0x0 0xe000a000 0x0 0x1000&gt;;</div><div class='add'>+		ranges = &lt;0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x10000000</div><div class='add'>+			  0x1000000 0x0 0x00000000 0 0xe2800000 0x0 0x00800000&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x0 0x10000000</div><div class='hunk'>@@ -771,20 +438,15 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	rio0: rapidio@e00c00000 {</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		compatible = "fsl,mpc8569-rapidio", "fsl,rapidio-delta";</div><div class='del'>-		reg = &lt;0xe00c0000 0x20000&gt;;</div><div class='del'>-		ranges = &lt;0x0 0x0 0xc0000000 0x0 0x20000000&gt;;</div><div class='del'>-		interrupts = &lt;48 2 /* error     */</div><div class='del'>-			      49 2 /* bell_outb */</div><div class='del'>-			      50 2 /* bell_inb  */</div><div class='del'>-			      53 2 /* msg1_tx   */</div><div class='del'>-			      54 2 /* msg1_rx   */</div><div class='del'>-			      55 2 /* msg2_tx   */</div><div class='del'>-			      56 2 /* msg2_rx   */&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		sleep = &lt;&amp;pmc 0x00080000&gt;;</div><div class='add'>+	rio: rapidio@e00c00000 {</div><div class='add'>+		reg = &lt;0x0 0xe00c0000 0x0 0x20000&gt;;</div><div class='add'>+		port1 {</div><div class='add'>+			ranges = &lt;0x0 0x0 0x0 0xc0000000 0x0 0x20000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		port2 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "fsl/mpc8569si-post.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts<br/>index f6c04d25e916..0c9f2955deb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8572ds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8572ds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8572ds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8572ds.dts</a></div><div class='hunk'>@@ -9,67 +9,18 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/dts-v1/;</div><div class='add'>+/include/ "fsl/mpc8572si-pre.dtsi"</div><div class='add'>+</div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,MPC8572DS";</div><div class='ctx'> 	compatible = "fsl,MPC8572DS";</div><div class='del'>-	#address-cells = &lt;2&gt;;</div><div class='del'>-	#size-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		ethernet0 = &amp;enet0;</div><div class='del'>-		ethernet1 = &amp;enet1;</div><div class='del'>-		ethernet2 = &amp;enet2;</div><div class='del'>-		ethernet3 = &amp;enet3;</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		serial1 = &amp;serial1;</div><div class='del'>-		pci0 = &amp;pci0;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-		pci2 = &amp;pci2;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cpus {</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'>-		PowerPC,8572@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x0&gt;;</div><div class='del'>-			d-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			i-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			d-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			i-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			timebase-frequency = &lt;0&gt;;</div><div class='del'>-			bus-frequency = &lt;0&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		PowerPC,8572@1 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x1&gt;;</div><div class='del'>-			d-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			i-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			d-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			i-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			timebase-frequency = &lt;0&gt;;</div><div class='del'>-			bus-frequency = &lt;0&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	localbus@ffe05000 {</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		compatible = "fsl,mpc8572-elbc", "fsl,elbc", "simple-bus";</div><div class='add'>+	board_lbc: lbc: localbus@ffe05000 {</div><div class='ctx'> 		reg = &lt;0 0xffe05000 0 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;19 2&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> </div><div class='ctx'> 		ranges = &lt;0x0 0x0 0x0 0xe8000000 0x08000000</div><div class='ctx'> 			  0x1 0x0 0x0 0xe0000000 0x08000000</div><div class='hunk'>@@ -78,601 +29,17 @@</div><div class='ctx'> 			  0x4 0x0 0x0 0xffa40000 0x00040000</div><div class='ctx'> 			  0x5 0x0 0x0 0xffa80000 0x00040000</div><div class='ctx'> 			  0x6 0x0 0x0 0xffac0000 0x00040000&gt;;</div><div class='del'>-</div><div class='del'>-		nor@0,0 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "cfi-flash";</div><div class='del'>-			reg = &lt;0x0 0x0 0x8000000&gt;;</div><div class='del'>-			bank-width = &lt;2&gt;;</div><div class='del'>-			device-width = &lt;1&gt;;</div><div class='del'>-</div><div class='del'>-			ramdisk@0 {</div><div class='del'>-				reg = &lt;0x0 0x03000000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			diagnostic@3000000 {</div><div class='del'>-				reg = &lt;0x03000000 0x00e00000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			dink@3e00000 {</div><div class='del'>-				reg = &lt;0x03e00000 0x00200000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			kernel@4000000 {</div><div class='del'>-				reg = &lt;0x04000000 0x00400000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			jffs2@4400000 {</div><div class='del'>-				reg = &lt;0x04400000 0x03b00000&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			dtb@7f00000 {</div><div class='del'>-				reg = &lt;0x07f00000 0x00080000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			u-boot@7f80000 {</div><div class='del'>-				reg = &lt;0x07f80000 0x00080000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		nand@2,0 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,mpc8572-fcm-nand",</div><div class='del'>-				     "fsl,elbc-fcm-nand";</div><div class='del'>-			reg = &lt;0x2 0x0 0x40000&gt;;</div><div class='del'>-</div><div class='del'>-			u-boot@0 {</div><div class='del'>-				reg = &lt;0x0 0x02000000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			jffs2@2000000 {</div><div class='del'>-				reg = &lt;0x02000000 0x10000000&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			ramdisk@12000000 {</div><div class='del'>-				reg = &lt;0x12000000 0x08000000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			kernel@1a000000 {</div><div class='del'>-				reg = &lt;0x1a000000 0x04000000&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			dtb@1e000000 {</div><div class='del'>-				reg = &lt;0x1e000000 0x01000000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			empty@1f000000 {</div><div class='del'>-				reg = &lt;0x1f000000 0x21000000&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		nand@4,0 {</div><div class='del'>-			compatible = "fsl,mpc8572-fcm-nand",</div><div class='del'>-				     "fsl,elbc-fcm-nand";</div><div class='del'>-			reg = &lt;0x4 0x0 0x40000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		nand@5,0 {</div><div class='del'>-			compatible = "fsl,mpc8572-fcm-nand",</div><div class='del'>-				     "fsl,elbc-fcm-nand";</div><div class='del'>-			reg = &lt;0x5 0x0 0x40000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		nand@6,0 {</div><div class='del'>-			compatible = "fsl,mpc8572-fcm-nand",</div><div class='del'>-				     "fsl,elbc-fcm-nand";</div><div class='del'>-			reg = &lt;0x6 0x0 0x40000&gt;;</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc8572@ffe00000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "simple-bus";</div><div class='add'>+	board_soc: soc: soc8572@ffe00000 {</div><div class='ctx'> 		ranges = &lt;0x0 0 0xffe00000 0x100000&gt;;</div><div class='del'>-		bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='del'>-</div><div class='del'>-		ecm-law@0 {</div><div class='del'>-			compatible = "fsl,ecm-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;12&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ecm@1000 {</div><div class='del'>-			compatible = "fsl,mpc8572-ecm", "fsl,ecm";</div><div class='del'>-			reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;17 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		memory-controller@2000 {</div><div class='del'>-			compatible = "fsl,mpc8572-memory-controller";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;18 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		memory-controller@6000 {</div><div class='del'>-			compatible = "fsl,mpc8572-memory-controller";</div><div class='del'>-			reg = &lt;0x6000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;18 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		L2: l2-cache-controller@20000 {</div><div class='del'>-			compatible = "fsl,mpc8572-l2-cache-controller";</div><div class='del'>-			reg = &lt;0x20000 0x1000&gt;;</div><div class='del'>-			cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			cache-size = &lt;0x100000&gt;; // L2, 1M</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@3000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@3100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma@c300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,mpc8572-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0xc300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0xc100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;76 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;77 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;78 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;79 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma@21300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,mpc8572-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x21300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x21100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;20 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;21 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;22 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;23 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ptp_clock@24E00 {</div><div class='del'>-			compatible = "fsl,etsec-ptp";</div><div class='del'>-			reg = &lt;0x24E00 0xB0&gt;;</div><div class='del'>-			interrupts = &lt;68 2 69 2 70 2 71 2&gt;;</div><div class='del'>-			interrupt-parent = &lt; &amp;mpic &gt;;</div><div class='del'>-			fsl,tclk-period = &lt;5&gt;;</div><div class='del'>-			fsl,tmr-prsc = &lt;200&gt;;</div><div class='del'>-			fsl,tmr-add = &lt;0xAAAAAAAB&gt;;</div><div class='del'>-			fsl,tmr-fiper1 = &lt;0x3B9AC9FB&gt;;</div><div class='del'>-			fsl,tmr-fiper2 = &lt;0x3B9AC9FB&gt;;</div><div class='del'>-			fsl,max-adj = &lt;499999999&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet0: ethernet@24000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x24000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x24000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;29 2 30 2 34 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy0&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-mdio";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				phy0: ethernet-phy@0 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;10 1&gt;;</div><div class='del'>-					reg = &lt;0x0&gt;;</div><div class='del'>-				};</div><div class='del'>-				phy1: ethernet-phy@1 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;10 1&gt;;</div><div class='del'>-					reg = &lt;0x1&gt;;</div><div class='del'>-				};</div><div class='del'>-				phy2: ethernet-phy@2 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;10 1&gt;;</div><div class='del'>-					reg = &lt;0x2&gt;;</div><div class='del'>-				};</div><div class='del'>-				phy3: ethernet-phy@3 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;10 1&gt;;</div><div class='del'>-					reg = &lt;0x3&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				tbi0: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet1: ethernet@25000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x25000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x25000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;35 2 36 2 40 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi1&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy1&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-tbi";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				tbi1: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet2: ethernet@26000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x26000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x26000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;31 2 32 2 33 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi2&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy2&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-tbi";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				tbi2: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet3: ethernet@27000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;3&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x27000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x27000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;37 2 38 2 39 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi3&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy3&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-tbi";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				tbi3: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial0: serial@4500 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial1: serial@4600 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		global-utilities@e0000 {	//global utilities block</div><div class='del'>-			compatible = "fsl,mpc8572-guts";</div><div class='del'>-			reg = &lt;0xe0000 0x1000&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi@41600 {</div><div class='del'>-			compatible = "fsl,mpc8572-msi", "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x80&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0</div><div class='del'>-				0xe1 0</div><div class='del'>-				0xe2 0</div><div class='del'>-				0xe3 0</div><div class='del'>-				0xe4 0</div><div class='del'>-				0xe5 0</div><div class='del'>-				0xe6 0</div><div class='del'>-				0xe7 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		crypto@30000 {</div><div class='del'>-			compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",</div><div class='del'>-				     "fsl,sec2.1", "fsl,sec2.0";</div><div class='del'>-			reg = &lt;0x30000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;45 2 58 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			fsl,num-channels = &lt;4&gt;;</div><div class='del'>-			fsl,channel-fifo-len = &lt;24&gt;;</div><div class='del'>-			fsl,exec-units-mask = &lt;0x9fe&gt;;</div><div class='del'>-			fsl,descriptor-types-mask = &lt;0x3ab0ebf&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	pci0: pcie@ffe08000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='add'>+	board_pci0: pci0: pcie@ffe08000 {</div><div class='ctx'> 		reg = &lt;0 0xffe08000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x00010000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;24 2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xff00 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x11 func 0 - PCI slot 1 */</div><div class='del'>-			0x8800 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8800 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8800 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8800 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 1 - PCI slot 1 */</div><div class='del'>-			0x8900 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8900 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8900 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8900 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 2 - PCI slot 1 */</div><div class='del'>-			0x8a00 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8a00 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8a00 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8a00 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 3 - PCI slot 1 */</div><div class='del'>-			0x8b00 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8b00 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8b00 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8b00 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 4 - PCI slot 1 */</div><div class='del'>-			0x8c00 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8c00 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8c00 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8c00 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 5 - PCI slot 1 */</div><div class='del'>-			0x8d00 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8d00 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8d00 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8d00 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 6 - PCI slot 1 */</div><div class='del'>-			0x8e00 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8e00 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8e00 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8e00 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 7 - PCI slot 1 */</div><div class='del'>-			0x8f00 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8f00 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8f00 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8f00 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 0 - PCI slot 2 */</div><div class='del'>-			0x9000 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9000 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9000 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9000 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 1 - PCI slot 2 */</div><div class='del'>-			0x9100 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9100 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9100 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9100 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 2 - PCI slot 2 */</div><div class='del'>-			0x9200 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9200 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9200 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9200 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 3 - PCI slot 2 */</div><div class='del'>-			0x9300 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9300 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9300 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9300 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 4 - PCI slot 2 */</div><div class='del'>-			0x9400 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9400 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9400 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9400 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 5 - PCI slot 2 */</div><div class='del'>-			0x9500 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9500 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9500 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9500 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 6 - PCI slot 2 */</div><div class='del'>-			0x9600 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9600 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9600 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9600 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 7 - PCI slot 2 */</div><div class='del'>-			0x9700 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9700 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9700 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9700 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x1c  USB</div><div class='del'>-			0xe000 0x0 0x0 0x1 &amp;i8259 0xc 0x2</div><div class='del'>-			0xe100 0x0 0x0 0x2 &amp;i8259 0x9 0x2</div><div class='del'>-			0xe200 0x0 0x0 0x3 &amp;i8259 0xa 0x2</div><div class='del'>-			0xe300 0x0 0x0 0x4 &amp;i8259 0xb 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x1d  Audio</div><div class='del'>-			0xe800 0x0 0x0 0x1 &amp;i8259 0x6 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x1e Legacy</div><div class='del'>-			0xf000 0x0 0x0 0x1 &amp;i8259 0x7 0x2</div><div class='del'>-			0xf100 0x0 0x0 0x1 &amp;i8259 0x7 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x1f IDE/SATA</div><div class='del'>-			0xf800 0x0 0x0 0x1 &amp;i8259 0xe 0x2</div><div class='del'>-			0xf900 0x0 0x0 0x1 &amp;i8259 0x5 0x2</div><div class='del'>-</div><div class='del'>-			&gt;;</div><div class='del'>-</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0x80000000</div><div class='ctx'> 				  0x2000000 0x0 0x80000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -680,99 +47,14 @@</div><div class='ctx'> 				  0x1000000 0x0 0x0</div><div class='ctx'> 				  0x1000000 0x0 0x0</div><div class='ctx'> 				  0x0 0x10000&gt;;</div><div class='del'>-			uli1575@0 {</div><div class='del'>-				reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-				#size-cells = &lt;2&gt;;</div><div class='del'>-				#address-cells = &lt;3&gt;;</div><div class='del'>-				ranges = &lt;0x2000000 0x0 0x80000000</div><div class='del'>-					  0x2000000 0x0 0x80000000</div><div class='del'>-					  0x0 0x20000000</div><div class='del'>-</div><div class='del'>-					  0x1000000 0x0 0x0</div><div class='del'>-					  0x1000000 0x0 0x0</div><div class='del'>-					  0x0 0x10000&gt;;</div><div class='del'>-				isa@1e {</div><div class='del'>-					device_type = "isa";</div><div class='del'>-					#interrupt-cells = &lt;2&gt;;</div><div class='del'>-					#size-cells = &lt;1&gt;;</div><div class='del'>-					#address-cells = &lt;2&gt;;</div><div class='del'>-					reg = &lt;0xf000 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-					ranges = &lt;0x1 0x0 0x1000000 0x0 0x0</div><div class='del'>-						  0x1000&gt;;</div><div class='del'>-					interrupt-parent = &lt;&amp;i8259&gt;;</div><div class='del'>-</div><div class='del'>-					i8259: interrupt-controller@20 {</div><div class='del'>-						reg = &lt;0x1 0x20 0x2</div><div class='del'>-						       0x1 0xa0 0x2</div><div class='del'>-						       0x1 0x4d0 0x2&gt;;</div><div class='del'>-						interrupt-controller;</div><div class='del'>-						device_type = "interrupt-controller";</div><div class='del'>-						#address-cells = &lt;0&gt;;</div><div class='del'>-						#interrupt-cells = &lt;2&gt;;</div><div class='del'>-						compatible = "chrp,iic";</div><div class='del'>-						interrupts = &lt;9 2&gt;;</div><div class='del'>-						interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					};</div><div class='del'>-</div><div class='del'>-					i8042@60 {</div><div class='del'>-						#size-cells = &lt;0&gt;;</div><div class='del'>-						#address-cells = &lt;1&gt;;</div><div class='del'>-						reg = &lt;0x1 0x60 0x1 0x1 0x64 0x1&gt;;</div><div class='del'>-						interrupts = &lt;1 3 12 3&gt;;</div><div class='del'>-						interrupt-parent =</div><div class='del'>-							&lt;&amp;i8259&gt;;</div><div class='del'>-</div><div class='del'>-						keyboard@0 {</div><div class='del'>-							reg = &lt;0x0&gt;;</div><div class='del'>-							compatible = "pnpPNP,303";</div><div class='del'>-						};</div><div class='del'>-</div><div class='del'>-						mouse@1 {</div><div class='del'>-							reg = &lt;0x1&gt;;</div><div class='del'>-							compatible = "pnpPNP,f03";</div><div class='del'>-						};</div><div class='del'>-					};</div><div class='del'>-</div><div class='del'>-					rtc@70 {</div><div class='del'>-						compatible = "pnpPNP,b00";</div><div class='del'>-						reg = &lt;0x1 0x70 0x2&gt;;</div><div class='del'>-					};</div><div class='del'>-</div><div class='del'>-					gpio@400 {</div><div class='del'>-						reg = &lt;0x1 0x400 0x80&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci1: pcie@ffe09000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt;0 0xffe09000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x00010000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;25 2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x4 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x5 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x6 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x7 0x1</div><div class='del'>-			&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -784,31 +66,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci2: pcie@ffe0a000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt;0 0xffe0a000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x00010000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;26 2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1</div><div class='del'>-			&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xc0000000</div><div class='ctx'> 				  0x2000000 0x0 0xc0000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -819,3 +80,11 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mpc8572ds.dtsi must be last to ensure board_pci0 overrides pci0 settings</div><div class='add'>+ * for interrupt-map &amp; interrupt-map-mask</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/include/ "fsl/mpc8572si-post.dtsi"</div><div class='add'>+/include/ "mpc8572ds.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8572ds.dtsi b/arch/powerpc/boot/dts/mpc8572ds.dtsi<br/>new file mode 100644<br/>index 000000000000..c3d4fac0532a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8572ds.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8572ds.dtsi</a></div><div class='hunk'>@@ -0,0 +1,397 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC8572DS Device Tree Source stub (no addresses or top-level ranges)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;board_lbc {</div><div class='add'>+	nor@0,0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "cfi-flash";</div><div class='add'>+		reg = &lt;0x0 0x0 0x8000000&gt;;</div><div class='add'>+		bank-width = &lt;2&gt;;</div><div class='add'>+		device-width = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		ramdisk@0 {</div><div class='add'>+			reg = &lt;0x0 0x03000000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		diagnostic@3000000 {</div><div class='add'>+			reg = &lt;0x03000000 0x00e00000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dink@3e00000 {</div><div class='add'>+			reg = &lt;0x03e00000 0x00200000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		kernel@4000000 {</div><div class='add'>+			reg = &lt;0x04000000 0x00400000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		jffs2@4400000 {</div><div class='add'>+			reg = &lt;0x04400000 0x03b00000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dtb@7f00000 {</div><div class='add'>+			reg = &lt;0x07f00000 0x00080000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		u-boot@7f80000 {</div><div class='add'>+			reg = &lt;0x07f80000 0x00080000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	nand@2,0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "fsl,mpc8572-fcm-nand",</div><div class='add'>+			     "fsl,elbc-fcm-nand";</div><div class='add'>+		reg = &lt;0x2 0x0 0x40000&gt;;</div><div class='add'>+</div><div class='add'>+		u-boot@0 {</div><div class='add'>+			reg = &lt;0x0 0x02000000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		jffs2@2000000 {</div><div class='add'>+			reg = &lt;0x02000000 0x10000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ramdisk@12000000 {</div><div class='add'>+			reg = &lt;0x12000000 0x08000000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		kernel@1a000000 {</div><div class='add'>+			reg = &lt;0x1a000000 0x04000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dtb@1e000000 {</div><div class='add'>+			reg = &lt;0x1e000000 0x01000000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		empty@1f000000 {</div><div class='add'>+			reg = &lt;0x1f000000 0x21000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	nand@4,0 {</div><div class='add'>+		compatible = "fsl,mpc8572-fcm-nand",</div><div class='add'>+			     "fsl,elbc-fcm-nand";</div><div class='add'>+		reg = &lt;0x4 0x0 0x40000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	nand@5,0 {</div><div class='add'>+		compatible = "fsl,mpc8572-fcm-nand",</div><div class='add'>+			     "fsl,elbc-fcm-nand";</div><div class='add'>+		reg = &lt;0x5 0x0 0x40000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	nand@6,0 {</div><div class='add'>+		compatible = "fsl,mpc8572-fcm-nand",</div><div class='add'>+			     "fsl,elbc-fcm-nand";</div><div class='add'>+		reg = &lt;0x6 0x0 0x40000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;board_soc {</div><div class='add'>+	enet0: ethernet@24000 {</div><div class='add'>+		tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='add'>+		phy-handle = &lt;&amp;phy0&gt;;</div><div class='add'>+		phy-connection-type = "rgmii-id";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio@24520 {</div><div class='add'>+		phy0: ethernet-phy@0 {</div><div class='add'>+			interrupts = &lt;10 1 0 0&gt;;</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+		};</div><div class='add'>+		phy1: ethernet-phy@1 {</div><div class='add'>+			interrupts = &lt;10 1 0 0&gt;;</div><div class='add'>+			reg = &lt;0x1&gt;;</div><div class='add'>+		};</div><div class='add'>+		phy2: ethernet-phy@2 {</div><div class='add'>+			interrupts = &lt;10 1 0 0&gt;;</div><div class='add'>+			reg = &lt;0x2&gt;;</div><div class='add'>+		};</div><div class='add'>+		phy3: ethernet-phy@3 {</div><div class='add'>+			interrupts = &lt;10 1 0 0&gt;;</div><div class='add'>+			reg = &lt;0x3&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		tbi0: tbi-phy@11 {</div><div class='add'>+			reg = &lt;0x11&gt;;</div><div class='add'>+			device_type = "tbi-phy";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ptp_clock@24e00 {</div><div class='add'>+		fsl,tclk-period = &lt;5&gt;;</div><div class='add'>+		fsl,tmr-prsc = &lt;200&gt;;</div><div class='add'>+		fsl,tmr-add = &lt;0xAAAAAAAB&gt;;</div><div class='add'>+		fsl,tmr-fiper1 = &lt;0x3B9AC9FB&gt;;</div><div class='add'>+		fsl,tmr-fiper2 = &lt;0x3B9AC9FB&gt;;</div><div class='add'>+		fsl,max-adj = &lt;499999999&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	enet1: ethernet@25000 {</div><div class='add'>+		tbi-handle = &lt;&amp;tbi1&gt;;</div><div class='add'>+		phy-handle = &lt;&amp;phy1&gt;;</div><div class='add'>+		phy-connection-type = "rgmii-id";</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio@25520 {</div><div class='add'>+		tbi1: tbi-phy@11 {</div><div class='add'>+			reg = &lt;0x11&gt;;</div><div class='add'>+			device_type = "tbi-phy";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	enet2: ethernet@26000 {</div><div class='add'>+		tbi-handle = &lt;&amp;tbi2&gt;;</div><div class='add'>+		phy-handle = &lt;&amp;phy2&gt;;</div><div class='add'>+		phy-connection-type = "rgmii-id";</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+	mdio@26520 {</div><div class='add'>+		tbi2: tbi-phy@11 {</div><div class='add'>+			reg = &lt;0x11&gt;;</div><div class='add'>+			device_type = "tbi-phy";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	enet3: ethernet@27000 {</div><div class='add'>+		tbi-handle = &lt;&amp;tbi3&gt;;</div><div class='add'>+		phy-handle = &lt;&amp;phy3&gt;;</div><div class='add'>+		phy-connection-type = "rgmii-id";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio@27520 {</div><div class='add'>+		tbi3: tbi-phy@11 {</div><div class='add'>+			reg = &lt;0x11&gt;;</div><div class='add'>+			device_type = "tbi-phy";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;board_pci0 {</div><div class='add'>+	pcie@0 {</div><div class='add'>+		interrupt-map-mask = &lt;0xff00 0x0 0x0 0x7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+			/* IDSEL 0x11 func 0 - PCI slot 1 */</div><div class='add'>+			0x8800 0x0 0x0 0x1 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0x8800 0x0 0x0 0x2 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x8800 0x0 0x0 0x3 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x8800 0x0 0x0 0x4 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+</div><div class='add'>+			/* IDSEL 0x11 func 1 - PCI slot 1 */</div><div class='add'>+			0x8900 0x0 0x0 0x1 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0x8900 0x0 0x0 0x2 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x8900 0x0 0x0 0x3 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x8900 0x0 0x0 0x4 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+</div><div class='add'>+			/* IDSEL 0x11 func 2 - PCI slot 1 */</div><div class='add'>+			0x8a00 0x0 0x0 0x1 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0x8a00 0x0 0x0 0x2 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x8a00 0x0 0x0 0x3 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x8a00 0x0 0x0 0x4 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+</div><div class='add'>+			/* IDSEL 0x11 func 3 - PCI slot 1 */</div><div class='add'>+			0x8b00 0x0 0x0 0x1 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0x8b00 0x0 0x0 0x2 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x8b00 0x0 0x0 0x3 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x8b00 0x0 0x0 0x4 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+</div><div class='add'>+			/* IDSEL 0x11 func 4 - PCI slot 1 */</div><div class='add'>+			0x8c00 0x0 0x0 0x1 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0x8c00 0x0 0x0 0x2 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x8c00 0x0 0x0 0x3 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x8c00 0x0 0x0 0x4 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+</div><div class='add'>+			/* IDSEL 0x11 func 5 - PCI slot 1 */</div><div class='add'>+			0x8d00 0x0 0x0 0x1 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0x8d00 0x0 0x0 0x2 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x8d00 0x0 0x0 0x3 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x8d00 0x0 0x0 0x4 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+</div><div class='add'>+			/* IDSEL 0x11 func 6 - PCI slot 1 */</div><div class='add'>+			0x8e00 0x0 0x0 0x1 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0x8e00 0x0 0x0 0x2 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x8e00 0x0 0x0 0x3 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x8e00 0x0 0x0 0x4 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+</div><div class='add'>+			/* IDSEL 0x11 func 7 - PCI slot 1 */</div><div class='add'>+			0x8f00 0x0 0x0 0x1 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+			0x8f00 0x0 0x0 0x2 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x8f00 0x0 0x0 0x3 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x8f00 0x0 0x0 0x4 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+</div><div class='add'>+			/* IDSEL 0x12 func 0 - PCI slot 2 */</div><div class='add'>+			0x9000 0x0 0x0 0x1 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x9000 0x0 0x0 0x2 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x9000 0x0 0x0 0x3 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+			0x9000 0x0 0x0 0x4 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+</div><div class='add'>+			/* IDSEL 0x12 func 1 - PCI slot 2 */</div><div class='add'>+			0x9100 0x0 0x0 0x1 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x9100 0x0 0x0 0x2 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x9100 0x0 0x0 0x3 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+			0x9100 0x0 0x0 0x4 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+</div><div class='add'>+			/* IDSEL 0x12 func 2 - PCI slot 2 */</div><div class='add'>+			0x9200 0x0 0x0 0x1 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x9200 0x0 0x0 0x2 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x9200 0x0 0x0 0x3 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+			0x9200 0x0 0x0 0x4 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+</div><div class='add'>+			/* IDSEL 0x12 func 3 - PCI slot 2 */</div><div class='add'>+			0x9300 0x0 0x0 0x1 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x9300 0x0 0x0 0x2 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x9300 0x0 0x0 0x3 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+			0x9300 0x0 0x0 0x4 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+</div><div class='add'>+			/* IDSEL 0x12 func 4 - PCI slot 2 */</div><div class='add'>+			0x9400 0x0 0x0 0x1 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x9400 0x0 0x0 0x2 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x9400 0x0 0x0 0x3 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+			0x9400 0x0 0x0 0x4 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+</div><div class='add'>+			/* IDSEL 0x12 func 5 - PCI slot 2 */</div><div class='add'>+			0x9500 0x0 0x0 0x1 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x9500 0x0 0x0 0x2 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x9500 0x0 0x0 0x3 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+			0x9500 0x0 0x0 0x4 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+</div><div class='add'>+			/* IDSEL 0x12 func 6 - PCI slot 2 */</div><div class='add'>+			0x9600 0x0 0x0 0x1 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x9600 0x0 0x0 0x2 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x9600 0x0 0x0 0x3 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+			0x9600 0x0 0x0 0x4 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+</div><div class='add'>+			/* IDSEL 0x12 func 7 - PCI slot 2 */</div><div class='add'>+			0x9700 0x0 0x0 0x1 &amp;mpic 0x3 0x1 0 0</div><div class='add'>+			0x9700 0x0 0x0 0x2 &amp;mpic 0x4 0x1 0 0</div><div class='add'>+			0x9700 0x0 0x0 0x3 &amp;mpic 0x1 0x1 0 0</div><div class='add'>+			0x9700 0x0 0x0 0x4 &amp;mpic 0x2 0x1 0 0</div><div class='add'>+</div><div class='add'>+			// IDSEL 0x1c  USB</div><div class='add'>+			0xe000 0x0 0x0 0x1 &amp;i8259 0xc 0x2</div><div class='add'>+			0xe100 0x0 0x0 0x2 &amp;i8259 0x9 0x2</div><div class='add'>+			0xe200 0x0 0x0 0x3 &amp;i8259 0xa 0x2</div><div class='add'>+			0xe300 0x0 0x0 0x4 &amp;i8259 0xb 0x2</div><div class='add'>+</div><div class='add'>+			// IDSEL 0x1d  Audio</div><div class='add'>+			0xe800 0x0 0x0 0x1 &amp;i8259 0x6 0x2</div><div class='add'>+</div><div class='add'>+			// IDSEL 0x1e Legacy</div><div class='add'>+			0xf000 0x0 0x0 0x1 &amp;i8259 0x7 0x2</div><div class='add'>+			0xf100 0x0 0x0 0x1 &amp;i8259 0x7 0x2</div><div class='add'>+</div><div class='add'>+			// IDSEL 0x1f IDE/SATA</div><div class='add'>+			0xf800 0x0 0x0 0x1 &amp;i8259 0xe 0x2</div><div class='add'>+			0xf900 0x0 0x0 0x1 &amp;i8259 0x5 0x2</div><div class='add'>+			&gt;;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		uli1575@0 {</div><div class='add'>+			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			#address-cells = &lt;3&gt;;</div><div class='add'>+			ranges = &lt;0x2000000 0x0 0x80000000</div><div class='add'>+				  0x2000000 0x0 0x80000000</div><div class='add'>+				  0x0 0x20000000</div><div class='add'>+</div><div class='add'>+				  0x1000000 0x0 0x0</div><div class='add'>+				  0x1000000 0x0 0x0</div><div class='add'>+				  0x0 0x10000&gt;;</div><div class='add'>+			isa@1e {</div><div class='add'>+				device_type = "isa";</div><div class='add'>+				#interrupt-cells = &lt;2&gt;;</div><div class='add'>+				#size-cells = &lt;1&gt;;</div><div class='add'>+				#address-cells = &lt;2&gt;;</div><div class='add'>+				reg = &lt;0xf000 0x0 0x0 0x0 0x0&gt;;</div><div class='add'>+				ranges = &lt;0x1 0x0 0x1000000 0x0 0x0</div><div class='add'>+					  0x1000&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;i8259&gt;;</div><div class='add'>+</div><div class='add'>+				i8259: interrupt-controller@20 {</div><div class='add'>+					reg = &lt;0x1 0x20 0x2</div><div class='add'>+					       0x1 0xa0 0x2</div><div class='add'>+					       0x1 0x4d0 0x2&gt;;</div><div class='add'>+					interrupt-controller;</div><div class='add'>+					device_type = "interrupt-controller";</div><div class='add'>+					#address-cells = &lt;0&gt;;</div><div class='add'>+					#interrupt-cells = &lt;2&gt;;</div><div class='add'>+					compatible = "chrp,iic";</div><div class='add'>+					interrupts = &lt;9 2 0 0&gt;;</div><div class='add'>+					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				i8042@60 {</div><div class='add'>+					#size-cells = &lt;0&gt;;</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					reg = &lt;0x1 0x60 0x1 0x1 0x64 0x1&gt;;</div><div class='add'>+					interrupts = &lt;1 3 12 3&gt;;</div><div class='add'>+					interrupt-parent =</div><div class='add'>+						&lt;&amp;i8259&gt;;</div><div class='add'>+</div><div class='add'>+					keyboard@0 {</div><div class='add'>+						reg = &lt;0x0&gt;;</div><div class='add'>+						compatible = "pnpPNP,303";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					mouse@1 {</div><div class='add'>+						reg = &lt;0x1&gt;;</div><div class='add'>+						compatible = "pnpPNP,f03";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				rtc@70 {</div><div class='add'>+					compatible = "pnpPNP,b00";</div><div class='add'>+					reg = &lt;0x1 0x70 0x2&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				gpio@400 {</div><div class='add'>+					reg = &lt;0x1 0x400 0x80&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/arch/powerpc/boot/dts/mpc8572ds_36b.dts b/arch/powerpc/boot/dts/mpc8572ds_36b.dts<br/>index f6365db3b97d..6c3d0b305e1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8572ds_36b.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8572ds_36b.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8572ds_36b.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8572ds_36b.dts</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * MPC8572 DS Device Tree Source</div><div class='add'>+ * MPC8572DS Device Tree Source (36-bit address map)</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2007-2009 Freescale Semiconductor Inc.</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,67 +9,18 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/dts-v1/;</div><div class='add'>+/include/ "fsl/mpc8572si-pre.dtsi"</div><div class='add'>+</div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,MPC8572DS";</div><div class='ctx'> 	compatible = "fsl,MPC8572DS";</div><div class='del'>-	#address-cells = &lt;2&gt;;</div><div class='del'>-	#size-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		ethernet0 = &amp;enet0;</div><div class='del'>-		ethernet1 = &amp;enet1;</div><div class='del'>-		ethernet2 = &amp;enet2;</div><div class='del'>-		ethernet3 = &amp;enet3;</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		serial1 = &amp;serial1;</div><div class='del'>-		pci0 = &amp;pci0;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-		pci2 = &amp;pci2;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cpus {</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'>-		PowerPC,8572@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x0&gt;;</div><div class='del'>-			d-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			i-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			d-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			i-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			timebase-frequency = &lt;0&gt;;</div><div class='del'>-			bus-frequency = &lt;0&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		PowerPC,8572@1 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x1&gt;;</div><div class='del'>-			d-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			i-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			d-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			i-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			timebase-frequency = &lt;0&gt;;</div><div class='del'>-			bus-frequency = &lt;0&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	localbus@fffe05000 {</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		compatible = "fsl,mpc8572-elbc", "fsl,elbc", "simple-bus";</div><div class='add'>+	board_lbc: lbc: localbus@fffe05000 {</div><div class='ctx'> 		reg = &lt;0xf 0xffe05000 0 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;19 2&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> </div><div class='ctx'> 		ranges = &lt;0x0 0x0 0xf 0xe8000000 0x08000000</div><div class='ctx'> 			  0x1 0x0 0xf 0xe0000000 0x08000000</div><div class='hunk'>@@ -78,588 +29,17 @@</div><div class='ctx'> 			  0x4 0x0 0xf 0xffa40000 0x00040000</div><div class='ctx'> 			  0x5 0x0 0xf 0xffa80000 0x00040000</div><div class='ctx'> 			  0x6 0x0 0xf 0xffac0000 0x00040000&gt;;</div><div class='del'>-</div><div class='del'>-		nor@0,0 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "cfi-flash";</div><div class='del'>-			reg = &lt;0x0 0x0 0x8000000&gt;;</div><div class='del'>-			bank-width = &lt;2&gt;;</div><div class='del'>-			device-width = &lt;1&gt;;</div><div class='del'>-</div><div class='del'>-			ramdisk@0 {</div><div class='del'>-				reg = &lt;0x0 0x03000000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			diagnostic@3000000 {</div><div class='del'>-				reg = &lt;0x03000000 0x00e00000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			dink@3e00000 {</div><div class='del'>-				reg = &lt;0x03e00000 0x00200000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			kernel@4000000 {</div><div class='del'>-				reg = &lt;0x04000000 0x00400000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			jffs2@4400000 {</div><div class='del'>-				reg = &lt;0x04400000 0x03b00000&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			dtb@7f00000 {</div><div class='del'>-				reg = &lt;0x07f00000 0x00080000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			u-boot@7f80000 {</div><div class='del'>-				reg = &lt;0x07f80000 0x00080000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		nand@2,0 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,mpc8572-fcm-nand",</div><div class='del'>-				     "fsl,elbc-fcm-nand";</div><div class='del'>-			reg = &lt;0x2 0x0 0x40000&gt;;</div><div class='del'>-</div><div class='del'>-			u-boot@0 {</div><div class='del'>-				reg = &lt;0x0 0x02000000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			jffs2@2000000 {</div><div class='del'>-				reg = &lt;0x02000000 0x10000000&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			ramdisk@12000000 {</div><div class='del'>-				reg = &lt;0x12000000 0x08000000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			kernel@1a000000 {</div><div class='del'>-				reg = &lt;0x1a000000 0x04000000&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			dtb@1e000000 {</div><div class='del'>-				reg = &lt;0x1e000000 0x01000000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			empty@1f000000 {</div><div class='del'>-				reg = &lt;0x1f000000 0x21000000&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		nand@4,0 {</div><div class='del'>-			compatible = "fsl,mpc8572-fcm-nand",</div><div class='del'>-				     "fsl,elbc-fcm-nand";</div><div class='del'>-			reg = &lt;0x4 0x0 0x40000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		nand@5,0 {</div><div class='del'>-			compatible = "fsl,mpc8572-fcm-nand",</div><div class='del'>-				     "fsl,elbc-fcm-nand";</div><div class='del'>-			reg = &lt;0x5 0x0 0x40000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		nand@6,0 {</div><div class='del'>-			compatible = "fsl,mpc8572-fcm-nand",</div><div class='del'>-				     "fsl,elbc-fcm-nand";</div><div class='del'>-			reg = &lt;0x6 0x0 0x40000&gt;;</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc8572@fffe00000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "simple-bus";</div><div class='add'>+	board_soc: soc: soc8572@fffe00000 {</div><div class='ctx'> 		ranges = &lt;0x0 0xf 0xffe00000 0x100000&gt;;</div><div class='del'>-		bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='del'>-</div><div class='del'>-		ecm-law@0 {</div><div class='del'>-			compatible = "fsl,ecm-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;12&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ecm@1000 {</div><div class='del'>-			compatible = "fsl,mpc8572-ecm", "fsl,ecm";</div><div class='del'>-			reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;17 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		memory-controller@2000 {</div><div class='del'>-			compatible = "fsl,mpc8572-memory-controller";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;18 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		memory-controller@6000 {</div><div class='del'>-			compatible = "fsl,mpc8572-memory-controller";</div><div class='del'>-			reg = &lt;0x6000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;18 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		L2: l2-cache-controller@20000 {</div><div class='del'>-			compatible = "fsl,mpc8572-l2-cache-controller";</div><div class='del'>-			reg = &lt;0x20000 0x1000&gt;;</div><div class='del'>-			cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			cache-size = &lt;0x100000&gt;; // L2, 1M</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@3000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@3100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma@c300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,mpc8572-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0xc300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0xc100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;76 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;77 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;78 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;79 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma@21300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,mpc8572-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x21300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x21100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;20 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;21 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;22 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;23 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet0: ethernet@24000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x24000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x24000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;29 2 30 2 34 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy0&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-mdio";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				phy0: ethernet-phy@0 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;10 1&gt;;</div><div class='del'>-					reg = &lt;0x0&gt;;</div><div class='del'>-				};</div><div class='del'>-				phy1: ethernet-phy@1 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;10 1&gt;;</div><div class='del'>-					reg = &lt;0x1&gt;;</div><div class='del'>-				};</div><div class='del'>-				phy2: ethernet-phy@2 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;10 1&gt;;</div><div class='del'>-					reg = &lt;0x2&gt;;</div><div class='del'>-				};</div><div class='del'>-				phy3: ethernet-phy@3 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;10 1&gt;;</div><div class='del'>-					reg = &lt;0x3&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				tbi0: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet1: ethernet@25000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x25000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x25000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;35 2 36 2 40 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi1&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy1&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-tbi";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				tbi1: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet2: ethernet@26000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x26000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x26000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;31 2 32 2 33 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi2&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy2&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-tbi";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				tbi2: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet3: ethernet@27000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;3&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x27000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x27000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;37 2 38 2 39 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi3&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy3&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-tbi";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				tbi3: tbi-phy@11 {</div><div class='del'>-					reg = &lt;0x11&gt;;</div><div class='del'>-					device_type = "tbi-phy";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial0: serial@4500 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial1: serial@4600 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		global-utilities@e0000 {	//global utilities block</div><div class='del'>-			compatible = "fsl,mpc8572-guts";</div><div class='del'>-			reg = &lt;0xe0000 0x1000&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi@41600 {</div><div class='del'>-			compatible = "fsl,mpc8572-msi", "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x80&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0</div><div class='del'>-				0xe1 0</div><div class='del'>-				0xe2 0</div><div class='del'>-				0xe3 0</div><div class='del'>-				0xe4 0</div><div class='del'>-				0xe5 0</div><div class='del'>-				0xe6 0</div><div class='del'>-				0xe7 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		crypto@30000 {</div><div class='del'>-			compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",</div><div class='del'>-				     "fsl,sec2.1", "fsl,sec2.0";</div><div class='del'>-			reg = &lt;0x30000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;45 2 58 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			fsl,num-channels = &lt;4&gt;;</div><div class='del'>-			fsl,channel-fifo-len = &lt;24&gt;;</div><div class='del'>-			fsl,exec-units-mask = &lt;0x9fe&gt;;</div><div class='del'>-			fsl,descriptor-types-mask = &lt;0x3ab0ebf&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	pci0: pcie@fffe08000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='add'>+	board_pci0: pci0: pcie@fffe08000 {</div><div class='ctx'> 		reg = &lt;0xf 0xffe08000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0xe0000000 0xc 0x00000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0xf 0xffc00000 0x0 0x00010000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;24 2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xff00 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x11 func 0 - PCI slot 1 */</div><div class='del'>-			0x8800 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8800 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8800 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8800 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 1 - PCI slot 1 */</div><div class='del'>-			0x8900 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8900 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8900 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8900 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 2 - PCI slot 1 */</div><div class='del'>-			0x8a00 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8a00 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8a00 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8a00 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 3 - PCI slot 1 */</div><div class='del'>-			0x8b00 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8b00 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8b00 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8b00 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 4 - PCI slot 1 */</div><div class='del'>-			0x8c00 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8c00 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8c00 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8c00 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 5 - PCI slot 1 */</div><div class='del'>-			0x8d00 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8d00 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8d00 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8d00 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 6 - PCI slot 1 */</div><div class='del'>-			0x8e00 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8e00 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8e00 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8e00 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 7 - PCI slot 1 */</div><div class='del'>-			0x8f00 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8f00 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8f00 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8f00 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 0 - PCI slot 2 */</div><div class='del'>-			0x9000 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9000 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9000 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9000 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 1 - PCI slot 2 */</div><div class='del'>-			0x9100 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9100 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9100 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9100 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 2 - PCI slot 2 */</div><div class='del'>-			0x9200 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9200 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9200 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9200 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 3 - PCI slot 2 */</div><div class='del'>-			0x9300 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9300 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9300 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9300 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 4 - PCI slot 2 */</div><div class='del'>-			0x9400 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9400 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9400 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9400 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 5 - PCI slot 2 */</div><div class='del'>-			0x9500 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9500 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9500 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9500 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 6 - PCI slot 2 */</div><div class='del'>-			0x9600 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9600 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9600 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9600 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 7 - PCI slot 2 */</div><div class='del'>-			0x9700 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9700 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9700 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9700 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x1c  USB</div><div class='del'>-			0xe000 0x0 0x0 0x1 &amp;i8259 0xc 0x2</div><div class='del'>-			0xe100 0x0 0x0 0x2 &amp;i8259 0x9 0x2</div><div class='del'>-			0xe200 0x0 0x0 0x3 &amp;i8259 0xa 0x2</div><div class='del'>-			0xe300 0x0 0x0 0x4 &amp;i8259 0xb 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x1d  Audio</div><div class='del'>-			0xe800 0x0 0x0 0x1 &amp;i8259 0x6 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x1e Legacy</div><div class='del'>-			0xf000 0x0 0x0 0x1 &amp;i8259 0x7 0x2</div><div class='del'>-			0xf100 0x0 0x0 0x1 &amp;i8259 0x7 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x1f IDE/SATA</div><div class='del'>-			0xf800 0x0 0x0 0x1 &amp;i8259 0xe 0x2</div><div class='del'>-			0xf900 0x0 0x0 0x1 &amp;i8259 0x5 0x2</div><div class='del'>-</div><div class='del'>-			&gt;;</div><div class='del'>-</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xe0000000</div><div class='ctx'> 				  0x2000000 0x0 0xe0000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -667,99 +47,14 @@</div><div class='ctx'> 				  0x1000000 0x0 0x0</div><div class='ctx'> 				  0x1000000 0x0 0x0</div><div class='ctx'> 				  0x0 0x10000&gt;;</div><div class='del'>-			uli1575@0 {</div><div class='del'>-				reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-				#size-cells = &lt;2&gt;;</div><div class='del'>-				#address-cells = &lt;3&gt;;</div><div class='del'>-				ranges = &lt;0x2000000 0x0 0xe0000000</div><div class='del'>-					  0x2000000 0x0 0xe0000000</div><div class='del'>-					  0x0 0x20000000</div><div class='del'>-</div><div class='del'>-					  0x1000000 0x0 0x0</div><div class='del'>-					  0x1000000 0x0 0x0</div><div class='del'>-					  0x0 0x10000&gt;;</div><div class='del'>-				isa@1e {</div><div class='del'>-					device_type = "isa";</div><div class='del'>-					#interrupt-cells = &lt;2&gt;;</div><div class='del'>-					#size-cells = &lt;1&gt;;</div><div class='del'>-					#address-cells = &lt;2&gt;;</div><div class='del'>-					reg = &lt;0xf000 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-					ranges = &lt;0x1 0x0 0x1000000 0x0 0x0</div><div class='del'>-						  0x1000&gt;;</div><div class='del'>-					interrupt-parent = &lt;&amp;i8259&gt;;</div><div class='del'>-</div><div class='del'>-					i8259: interrupt-controller@20 {</div><div class='del'>-						reg = &lt;0x1 0x20 0x2</div><div class='del'>-						       0x1 0xa0 0x2</div><div class='del'>-						       0x1 0x4d0 0x2&gt;;</div><div class='del'>-						interrupt-controller;</div><div class='del'>-						device_type = "interrupt-controller";</div><div class='del'>-						#address-cells = &lt;0&gt;;</div><div class='del'>-						#interrupt-cells = &lt;2&gt;;</div><div class='del'>-						compatible = "chrp,iic";</div><div class='del'>-						interrupts = &lt;9 2&gt;;</div><div class='del'>-						interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					};</div><div class='del'>-</div><div class='del'>-					i8042@60 {</div><div class='del'>-						#size-cells = &lt;0&gt;;</div><div class='del'>-						#address-cells = &lt;1&gt;;</div><div class='del'>-						reg = &lt;0x1 0x60 0x1 0x1 0x64 0x1&gt;;</div><div class='del'>-						interrupts = &lt;1 3 12 3&gt;;</div><div class='del'>-						interrupt-parent =</div><div class='del'>-							&lt;&amp;i8259&gt;;</div><div class='del'>-</div><div class='del'>-						keyboard@0 {</div><div class='del'>-							reg = &lt;0x0&gt;;</div><div class='del'>-							compatible = "pnpPNP,303";</div><div class='del'>-						};</div><div class='del'>-</div><div class='del'>-						mouse@1 {</div><div class='del'>-							reg = &lt;0x1&gt;;</div><div class='del'>-							compatible = "pnpPNP,f03";</div><div class='del'>-						};</div><div class='del'>-					};</div><div class='del'>-</div><div class='del'>-					rtc@70 {</div><div class='del'>-						compatible = "pnpPNP,b00";</div><div class='del'>-						reg = &lt;0x1 0x70 0x2&gt;;</div><div class='del'>-					};</div><div class='del'>-</div><div class='del'>-					gpio@400 {</div><div class='del'>-						reg = &lt;0x1 0x400 0x80&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci1: pcie@fffe09000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt;0xf 0xffe09000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0xf 0xffc10000 0x0 0x00010000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;25 2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x4 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x5 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x6 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x7 0x1</div><div class='del'>-			&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xe0000000</div><div class='ctx'> 				  0x2000000 0x0 0xe0000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -771,31 +66,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci2: pcie@fffe0a000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt;0xf 0xffe0a000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0xe0000000 0xc 0x40000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0xf 0xffc20000 0x0 0x00010000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;26 2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1</div><div class='del'>-			&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xe0000000</div><div class='ctx'> 				  0x2000000 0x0 0xe0000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -806,3 +80,11 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mpc8572ds.dtsi must be last to ensure board_pci0 overrides pci0 settings</div><div class='add'>+ * for interrupt-map &amp; interrupt-map-mask</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/include/ "fsl/mpc8572si-post.dtsi"</div><div class='add'>+/include/ "mpc8572ds.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts b/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts<br/>index 3375c2ab0c32..d34d12712125 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts</a></div><div class='hunk'>@@ -14,494 +14,69 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/dts-v1/;</div><div class='add'>+/include/ "mpc8572ds.dts"</div><div class='add'>+</div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,MPC8572DS";</div><div class='ctx'> 	compatible = "fsl,MPC8572DS", "fsl,MPC8572DS-CAMP";</div><div class='del'>-	#address-cells = &lt;1&gt;;</div><div class='del'>-	#size-cells = &lt;1&gt;;</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		ethernet0 = &amp;enet0;</div><div class='del'>-		ethernet1 = &amp;enet1;</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		pci0 = &amp;pci0;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-	};</div><div class='ctx'> </div><div class='ctx'> 	cpus {</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='ctx'> 		PowerPC,8572@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x0&gt;;</div><div class='del'>-			d-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			i-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			d-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			i-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			timebase-frequency = &lt;0&gt;;</div><div class='del'>-			bus-frequency = &lt;0&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='add'>+		PowerPC,8572@1 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='del'>-		device_type = "memory";</div><div class='del'>-		reg = &lt;0x0 0x0&gt;;	// Filled by U-Boot</div><div class='add'>+	localbus@ffe05000 {</div><div class='add'>+		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	soc8572@ffe00000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		ranges = &lt;0x0 0xffe00000 0x100000&gt;;</div><div class='del'>-		bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='del'>-</div><div class='del'>-		ecm-law@0 {</div><div class='del'>-			compatible = "fsl,ecm-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;12&gt;;</div><div class='add'>+		serial@4600 {</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		ecm@1000 {</div><div class='del'>-			compatible = "fsl,mpc8572-ecm", "fsl,ecm";</div><div class='del'>-			reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;17 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+		dma@c300 {</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		memory-controller@2000 {</div><div class='del'>-			compatible = "fsl,mpc8572-memory-controller";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;18 2&gt;;</div><div class='add'>+		gpio-controller@f000 {</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		memory-controller@6000 {</div><div class='del'>-			compatible = "fsl,mpc8572-memory-controller";</div><div class='del'>-			reg = &lt;0x6000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;18 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		L2: l2-cache-controller@20000 {</div><div class='del'>-			compatible = "fsl,mpc8572-l2-cache-controller";</div><div class='del'>-			reg = &lt;0x20000 0x1000&gt;;</div><div class='del'>-			cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='add'>+		l2-cache-controller@20000 {</div><div class='ctx'> 			cache-size = &lt;0x80000&gt;;	// L2, 512K</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		i2c@3000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='add'>+		ethernet@26000 {</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		i2c@3100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='add'>+		mdio@26520 {</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		dma@21300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,mpc8572-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x21300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x21100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;20 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;21 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;22 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;23 2&gt;;</div><div class='del'>-			};</div><div class='add'>+		ethernet@27000 {</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		enet0: ethernet@24000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x24000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x24000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;29 2 30 2 34 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy0&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-			mdio@520 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;0&gt;;</div><div class='del'>-				compatible = "fsl,gianfar-mdio";</div><div class='del'>-				reg = &lt;0x520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-				phy0: ethernet-phy@0 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;10 1&gt;;</div><div class='del'>-					reg = &lt;0x0&gt;;</div><div class='del'>-				};</div><div class='del'>-				phy1: ethernet-phy@1 {</div><div class='del'>-					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					interrupts = &lt;10 1&gt;;</div><div class='del'>-					reg = &lt;0x1&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='add'>+		mdio@27520 {</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		enet1: ethernet@25000 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x25000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;35 2 36 2 40 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy1&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial0: serial@4500 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='add'>+		pic@40000 {</div><div class='add'>+			protected-sources = &lt;</div><div class='add'>+			31 32 33 37 38 39       /* enet2 enet3 */</div><div class='add'>+			76 77 78 79 26 42	/* dma2 pci2 serial*/</div><div class='add'>+			0xe4 0xe5 0xe6 0xe7	/* msi */</div><div class='add'>+			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		msi@41600 {</div><div class='del'>-			compatible = "fsl,mpc8572-msi", "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x80&gt;;</div><div class='ctx'> 			msi-available-ranges = &lt;0 0x80&gt;;</div><div class='ctx'> 			interrupts = &lt;</div><div class='ctx'> 				0xe0 0</div><div class='ctx'> 				0xe1 0</div><div class='ctx'> 				0xe2 0</div><div class='ctx'> 				0xe3 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		global-utilities@e0000 {	//global utilities block</div><div class='del'>-			compatible = "fsl,mpc8572-guts";</div><div class='del'>-			reg = &lt;0xe0000 0x1000&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		crypto@30000 {</div><div class='del'>-			compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",</div><div class='del'>-				     "fsl,sec2.1", "fsl,sec2.0";</div><div class='del'>-			reg = &lt;0x30000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;45 2 58 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			fsl,num-channels = &lt;4&gt;;</div><div class='del'>-			fsl,channel-fifo-len = &lt;24&gt;;</div><div class='del'>-			fsl,exec-units-mask = &lt;0x9fe&gt;;</div><div class='del'>-			fsl,descriptor-types-mask = &lt;0x3ab0ebf&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-			protected-sources = &lt;</div><div class='del'>-			31 32 33 37 38 39       /* enet2 enet3 */</div><div class='del'>-			76 77 78 79 26 42	/* dma2 pci2 serial*/</div><div class='del'>-			0xe4 0xe5 0xe6 0xe7	/* msi */</div><div class='del'>-			&gt;;</div><div class='ctx'> 		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci0: pcie@ffe08000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xffe08000 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000</div><div class='del'>-			  0x1000000 0x0 0x0 0xffc00000 0x0 0x10000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;24 2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xff00 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x11 func 0 - PCI slot 1 */</div><div class='del'>-			0x8800 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8800 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8800 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8800 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 1 - PCI slot 1 */</div><div class='del'>-			0x8900 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8900 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8900 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8900 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 2 - PCI slot 1 */</div><div class='del'>-			0x8a00 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8a00 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8a00 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8a00 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 3 - PCI slot 1 */</div><div class='del'>-			0x8b00 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8b00 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8b00 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8b00 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 4 - PCI slot 1 */</div><div class='del'>-			0x8c00 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8c00 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8c00 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8c00 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 5 - PCI slot 1 */</div><div class='del'>-			0x8d00 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8d00 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8d00 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8d00 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 6 - PCI slot 1 */</div><div class='del'>-			0x8e00 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8e00 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8e00 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8e00 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x11 func 7 - PCI slot 1 */</div><div class='del'>-			0x8f00 0x0 0x0 0x1 &amp;mpic 0x2 0x1</div><div class='del'>-			0x8f00 0x0 0x0 0x2 &amp;mpic 0x3 0x1</div><div class='del'>-			0x8f00 0x0 0x0 0x3 &amp;mpic 0x4 0x1</div><div class='del'>-			0x8f00 0x0 0x0 0x4 &amp;mpic 0x1 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 0 - PCI slot 2 */</div><div class='del'>-			0x9000 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9000 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9000 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9000 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 1 - PCI slot 2 */</div><div class='del'>-			0x9100 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9100 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9100 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9100 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 2 - PCI slot 2 */</div><div class='del'>-			0x9200 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9200 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9200 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9200 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 3 - PCI slot 2 */</div><div class='del'>-			0x9300 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9300 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9300 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9300 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 4 - PCI slot 2 */</div><div class='del'>-			0x9400 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9400 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9400 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9400 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 5 - PCI slot 2 */</div><div class='del'>-			0x9500 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9500 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9500 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9500 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 6 - PCI slot 2 */</div><div class='del'>-			0x9600 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9600 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9600 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9600 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			/* IDSEL 0x12 func 7 - PCI slot 2 */</div><div class='del'>-			0x9700 0x0 0x0 0x1 &amp;mpic 0x3 0x1</div><div class='del'>-			0x9700 0x0 0x0 0x2 &amp;mpic 0x4 0x1</div><div class='del'>-			0x9700 0x0 0x0 0x3 &amp;mpic 0x1 0x1</div><div class='del'>-			0x9700 0x0 0x0 0x4 &amp;mpic 0x2 0x1</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x1c  USB</div><div class='del'>-			0xe000 0x0 0x0 0x1 &amp;i8259 0xc 0x2</div><div class='del'>-			0xe100 0x0 0x0 0x2 &amp;i8259 0x9 0x2</div><div class='del'>-			0xe200 0x0 0x0 0x3 &amp;i8259 0xa 0x2</div><div class='del'>-			0xe300 0x0 0x0 0x4 &amp;i8259 0xb 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x1d  Audio</div><div class='del'>-			0xe800 0x0 0x0 0x1 &amp;i8259 0x6 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x1e Legacy</div><div class='del'>-			0xf000 0x0 0x0 0x1 &amp;i8259 0x7 0x2</div><div class='del'>-			0xf100 0x0 0x0 0x1 &amp;i8259 0x7 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x1f IDE/SATA</div><div class='del'>-			0xf800 0x0 0x0 0x1 &amp;i8259 0xe 0x2</div><div class='del'>-			0xf900 0x0 0x0 0x1 &amp;i8259 0x5 0x2</div><div class='del'>-</div><div class='del'>-			&gt;;</div><div class='del'>-</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			ranges = &lt;0x2000000 0x0 0x80000000</div><div class='del'>-				  0x2000000 0x0 0x80000000</div><div class='del'>-				  0x0 0x20000000</div><div class='del'>-</div><div class='del'>-				  0x1000000 0x0 0x0</div><div class='del'>-				  0x1000000 0x0 0x0</div><div class='del'>-				  0x0 0x10000&gt;;</div><div class='del'>-			uli1575@0 {</div><div class='del'>-				reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-				#size-cells = &lt;2&gt;;</div><div class='del'>-				#address-cells = &lt;3&gt;;</div><div class='del'>-				ranges = &lt;0x2000000 0x0 0x80000000</div><div class='del'>-					  0x2000000 0x0 0x80000000</div><div class='del'>-					  0x0 0x20000000</div><div class='del'>-</div><div class='del'>-					  0x1000000 0x0 0x0</div><div class='del'>-					  0x1000000 0x0 0x0</div><div class='del'>-					  0x0 0x10000&gt;;</div><div class='del'>-				isa@1e {</div><div class='del'>-					device_type = "isa";</div><div class='del'>-					#interrupt-cells = &lt;2&gt;;</div><div class='del'>-					#size-cells = &lt;1&gt;;</div><div class='del'>-					#address-cells = &lt;2&gt;;</div><div class='del'>-					reg = &lt;0xf000 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-					ranges = &lt;0x1 0x0 0x1000000 0x0 0x0</div><div class='del'>-						  0x1000&gt;;</div><div class='del'>-					interrupt-parent = &lt;&amp;i8259&gt;;</div><div class='del'>-</div><div class='del'>-					i8259: interrupt-controller@20 {</div><div class='del'>-						reg = &lt;0x1 0x20 0x2</div><div class='del'>-						       0x1 0xa0 0x2</div><div class='del'>-						       0x1 0x4d0 0x2&gt;;</div><div class='del'>-						interrupt-controller;</div><div class='del'>-						device_type = "interrupt-controller";</div><div class='del'>-						#address-cells = &lt;0&gt;;</div><div class='del'>-						#interrupt-cells = &lt;2&gt;;</div><div class='del'>-						compatible = "chrp,iic";</div><div class='del'>-						interrupts = &lt;9 2&gt;;</div><div class='del'>-						interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					};</div><div class='del'>-</div><div class='del'>-					i8042@60 {</div><div class='del'>-						#size-cells = &lt;0&gt;;</div><div class='del'>-						#address-cells = &lt;1&gt;;</div><div class='del'>-						reg = &lt;0x1 0x60 0x1 0x1 0x64 0x1&gt;;</div><div class='del'>-						interrupts = &lt;1 3 12 3&gt;;</div><div class='del'>-						interrupt-parent =</div><div class='del'>-							&lt;&amp;i8259&gt;;</div><div class='del'>-</div><div class='del'>-						keyboard@0 {</div><div class='del'>-							reg = &lt;0x0&gt;;</div><div class='del'>-							compatible = "pnpPNP,303";</div><div class='del'>-						};</div><div class='del'>-</div><div class='del'>-						mouse@1 {</div><div class='del'>-							reg = &lt;0x1&gt;;</div><div class='del'>-							compatible = "pnpPNP,f03";</div><div class='del'>-						};</div><div class='del'>-					};</div><div class='del'>-</div><div class='del'>-					rtc@70 {</div><div class='del'>-						compatible = "pnpPNP,b00";</div><div class='del'>-						reg = &lt;0x1 0x70 0x2&gt;;</div><div class='del'>-					};</div><div class='del'>-</div><div class='del'>-					gpio@400 {</div><div class='del'>-						reg = &lt;0x1 0x400 0x80&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='add'>+		timer@42100 {</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='del'>-	pci1: pcie@ffe09000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xffe09000 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000</div><div class='del'>-			  0x1000000 0x0 0x0 0xffc10000 0x0 0x10000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;25 2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x4 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x5 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x6 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x7 0x1</div><div class='del'>-			&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			ranges = &lt;0x2000000 0x0 0xa0000000</div><div class='del'>-				  0x2000000 0x0 0xa0000000</div><div class='del'>-				  0x0 0x20000000</div><div class='del'>-</div><div class='del'>-				  0x1000000 0x0 0x0</div><div class='del'>-				  0x1000000 0x0 0x0</div><div class='del'>-				  0x0 0x10000&gt;;</div><div class='del'>-		};</div><div class='add'>+	pcie@ffe0a000 {</div><div class='add'>+		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts b/arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts<br/>index e7b477f6a3fe..d6a8fafc0d0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts</a></div><div class='hunk'>@@ -15,169 +15,74 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/dts-v1/;</div><div class='add'>+/include/ "mpc8572ds.dts"</div><div class='add'>+</div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,MPC8572DS";</div><div class='ctx'> 	compatible = "fsl,MPC8572DS", "fsl,MPC8572DS-CAMP";</div><div class='del'>-	#address-cells = &lt;1&gt;;</div><div class='del'>-	#size-cells = &lt;1&gt;;</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		ethernet2 = &amp;enet2;</div><div class='del'>-		ethernet3 = &amp;enet3;</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		pci2 = &amp;pci2;</div><div class='del'>-	};</div><div class='ctx'> </div><div class='ctx'> 	cpus {</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='add'>+		PowerPC,8572@0 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='ctx'> 		PowerPC,8572@1 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x1&gt;;</div><div class='del'>-			d-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			i-cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			d-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			i-cache-size = &lt;0x8000&gt;;		// L1, 32K</div><div class='del'>-			timebase-frequency = &lt;0&gt;;</div><div class='del'>-			bus-frequency = &lt;0&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='del'>-		device_type = "memory";</div><div class='del'>-		reg = &lt;0x0 0x0&gt;;	// Filled by U-Boot</div><div class='add'>+	localbus@ffe05000 {</div><div class='add'>+		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	soc8572@ffe00000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		ranges = &lt;0x0 0xffe00000 0x100000&gt;;</div><div class='del'>-		bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='del'>-</div><div class='del'>-		L2: l2-cache-controller@20000 {</div><div class='del'>-			compatible = "fsl,mpc8572-l2-cache-controller";</div><div class='del'>-			reg = &lt;0x20000 0x1000&gt;;</div><div class='del'>-			cache-line-size = &lt;32&gt;; // 32 bytes</div><div class='del'>-			cache-size = &lt;0x80000&gt;; // L2, 512K</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+		ecm-law@0 {</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		dma@c300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,mpc8572-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0xc300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0xc100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;76 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;77 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;78 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,mpc8572-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;79 2&gt;;</div><div class='del'>-			};</div><div class='add'>+		ecm@1000 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+		memory-controller@2000 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+		memory-controller@6000 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+		i2c@3000 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+		i2c@3100 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+		serial@4500 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+		gpio-controller@f000 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+		l2-cache-controller@20000 {</div><div class='add'>+			cache-size = &lt;0x80000&gt;;	// L2, 512K</div><div class='add'>+		};</div><div class='add'>+		dma@21300 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+		ethernet@24000 {</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='ctx'> 		mdio@24520 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,gianfar-mdio";</div><div class='del'>-			reg = &lt;0x24520 0x20&gt;;</div><div class='del'>-</div><div class='del'>-			phy2: ethernet-phy@2 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				reg = &lt;0x2&gt;;</div><div class='del'>-			};</div><div class='del'>-			phy3: ethernet-phy@3 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				reg = &lt;0x3&gt;;</div><div class='del'>-			};</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		enet2: ethernet@26000 {</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x26000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;31 2 32 2 33 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy2&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='add'>+		ptp_clock@24e00 {</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		enet3: ethernet@27000 {</div><div class='del'>-			cell-index = &lt;3&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x27000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;37 2 38 2 39 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy3&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='add'>+		ethernet@25000 {</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		msi@41600 {</div><div class='del'>-			compatible = "fsl,mpc8572-msi", "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x80&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0x80 0x80&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe4 0</div><div class='del'>-				0xe5 0</div><div class='del'>-				0xe6 0</div><div class='del'>-				0xe7 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+		mdio@25520 {</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		serial0: serial@4600 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='add'>+		crypto@30000 {</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='add'>+		pic@40000 {</div><div class='ctx'> 			protected-sources = &lt;</div><div class='ctx'> 			18 16 10 42 45 58	/* MEM L2 mdio serial crypto */</div><div class='ctx'> 			29 30 34 35 36 40	/* enet0 enet1 */</div><div class='hunk'>@@ -189,41 +94,25 @@</div><div class='ctx'> 			0xe0 0xe1 0xe2 0xe3	/* msi */</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci2: pcie@ffe0a000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0xffe0a000 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0xc0000000 0xc0000000 0x0 0x20000000</div><div class='del'>-			  0x1000000 0x0 0x0 0xffc20000 0x0 0x10000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;26 2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1</div><div class='del'>-			&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			ranges = &lt;0x2000000 0x0 0xc0000000</div><div class='del'>-				  0x2000000 0x0 0xc0000000</div><div class='del'>-				  0x0 0x20000000</div><div class='del'>-</div><div class='del'>-				  0x1000000 0x0 0x0</div><div class='del'>-				  0x1000000 0x0 0x0</div><div class='del'>-				  0x0 0x10000&gt;;</div><div class='add'>+		timer@41100 {</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='add'>+		msi@41600 {</div><div class='add'>+			msi-available-ranges = &lt;0x80 0x80&gt;;</div><div class='add'>+			interrupts = &lt;</div><div class='add'>+				0xe4 0</div><div class='add'>+				0xe5 0</div><div class='add'>+				0xe6 0</div><div class='add'>+				0xe7 0&gt;;</div><div class='add'>+		};</div><div class='add'>+		global-utilities@e0000 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+	pcie@ffe08000 {</div><div class='add'>+		status = "disabled";</div><div class='add'>+	};</div><div class='add'>+	pcie@ffe09000 {</div><div class='add'>+		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts<br/>index 83c3218cb4da..6a109a0ceac9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8610_hpcd.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8610_hpcd.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8610_hpcd.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8610_hpcd.dts</a></div><div class='hunk'>@@ -175,7 +175,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='hunk'>@@ -186,7 +186,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts<br/>index 848320e4d3c4..1e8666ccbed8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8641_hpcn.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8641_hpcn.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8641_hpcn.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8641_hpcn.dts</a></div><div class='hunk'>@@ -26,13 +26,6 @@</div><div class='ctx'> 		serial1 = &amp;serial1;</div><div class='ctx'> 		pci0 = &amp;pci0;</div><div class='ctx'> 		pci1 = &amp;pci1;</div><div class='del'>-/*</div><div class='del'>- * Only one of Rapid IO or PCI can be present due to HW limitations and</div><div class='del'>- * due to the fact that the 2 now share address space in the new memory</div><div class='del'>- * map.  The most likely case is that we have PCI, so comment out the</div><div class='del'>- * rapidio node.  Leave it here for reference.</div><div class='del'>- */</div><div class='del'>-		/* rapidio0 = &amp;rapidio0; */</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='hunk'>@@ -335,7 +328,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='hunk'>@@ -345,7 +338,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;28 2&gt;;</div><div class='hunk'>@@ -361,6 +354,41 @@</div><div class='ctx'> 			device_type = "open-pic";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='add'>+		rmu: rmu@d3000 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "fsl,srio-rmu";</div><div class='add'>+			reg = &lt;0xd3000 0x500&gt;;</div><div class='add'>+			ranges = &lt;0x0 0xd3000 0x500&gt;;</div><div class='add'>+</div><div class='add'>+			message-unit@0 {</div><div class='add'>+				compatible = "fsl,srio-msg-unit";</div><div class='add'>+				reg = &lt;0x0 0x100&gt;;</div><div class='add'>+				interrupts = &lt;</div><div class='add'>+					53 2 /* msg1_tx_irq */</div><div class='add'>+					54 2&gt;;/* msg1_rx_irq */</div><div class='add'>+			};</div><div class='add'>+			message-unit@100 {</div><div class='add'>+				compatible = "fsl,srio-msg-unit";</div><div class='add'>+				reg = &lt;0x100 0x100&gt;;</div><div class='add'>+				interrupts = &lt;</div><div class='add'>+					55 2  /* msg2_tx_irq */</div><div class='add'>+					56 2&gt;;/* msg2_rx_irq */</div><div class='add'>+			};</div><div class='add'>+			doorbell-unit@400 {</div><div class='add'>+				compatible = "fsl,srio-dbell-unit";</div><div class='add'>+				reg = &lt;0x400 0x80&gt;;</div><div class='add'>+				interrupts = &lt;</div><div class='add'>+					49 2  /* bell_outb_irq */</div><div class='add'>+					50 2&gt;;/* bell_inb_irq */</div><div class='add'>+			};</div><div class='add'>+			port-write-unit@4e0 {</div><div class='add'>+				compatible = "fsl,srio-port-write-unit";</div><div class='add'>+				reg = &lt;0x4e0 0x20&gt;;</div><div class='add'>+				interrupts = &lt;48 2&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		global-utilities@e0000 {</div><div class='ctx'> 			compatible = "fsl,mpc8641-guts";</div><div class='ctx'> 			reg = &lt;0xe0000 0x1000&gt;;</div><div class='hunk'>@@ -612,16 +640,27 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> /*</div><div class='del'>-	rapidio0: rapidio@ffec0000 {</div><div class='add'>+ * Only one of Rapid IO or PCI can be present due to HW limitations and</div><div class='add'>+ * due to the fact that the 2 now share address space in the new memory</div><div class='add'>+ * map.  The most likely case is that we have PCI, so comment out the</div><div class='add'>+ * rapidio node.  Leave it here for reference.</div><div class='add'>+</div><div class='add'>+	rapidio@ffec0000 {</div><div class='add'>+		reg = &lt;0xffec0000 0x11000&gt;;</div><div class='add'>+		compatible = "fsl,srio";</div><div class='add'>+		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+		interrupts = &lt;48 2&gt;;</div><div class='ctx'> 		#address-cells = &lt;2&gt;;</div><div class='ctx'> 		#size-cells = &lt;2&gt;;</div><div class='del'>-		compatible = "fsl,rapidio-delta";</div><div class='del'>-		reg = &lt;0xffec0000 0x20000&gt;;</div><div class='del'>-		ranges = &lt;0 0 0x80000000 0 0x20000000&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		// err_irq bell_outb_irq bell_inb_irq</div><div class='del'>-		//	msg1_tx_irq msg1_rx_irq	msg2_tx_irq msg2_rx_irq</div><div class='del'>-		interrupts = &lt;48 2 49 2 50 2 53 2 54 2 55 2 56 2&gt;;</div><div class='add'>+		fsl,srio-rmu-handle = &lt;&amp;rmu&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+</div><div class='add'>+		port1 {</div><div class='add'>+			#address-cells = &lt;2&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			cell-index = &lt;1&gt;;</div><div class='add'>+			ranges = &lt;0 0 0x80000000 0 0x20000000&gt;;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts b/arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts<br/>index 8be8e701e1d3..fd4cd4da60b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts</a></div><div class='hunk'>@@ -328,7 +328,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='hunk'>@@ -338,7 +338,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;28 2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/obs600.dts b/arch/powerpc/boot/dts/obs600.dts<br/>new file mode 100644<br/>index 000000000000..18e7d79ee4c3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/obs600.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/obs600.dts</a></div><div class='hunk'>@@ -0,0 +1,314 @@</div><div class='add'>+/*</div><div class='add'>+ * Device Tree Source for PlatHome OpenBlockS 600 (405EX)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Ben Herrenschmidt, IBM Corp.</div><div class='add'>+ *</div><div class='add'>+ * Based on Kilauea by:</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2007-2009 DENX Software Engineering, Stefan Roese &lt;sr@denx.de&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2.  This program is licensed "as is" without</div><div class='add'>+ * any warranty of any kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/dts-v1/;</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	#address-cells = &lt;1&gt;;</div><div class='add'>+	#size-cells = &lt;1&gt;;</div><div class='add'>+	model = "PlatHome,OpenBlockS 600";</div><div class='add'>+	compatible = "plathome,obs600";</div><div class='add'>+	dcr-parent = &lt;&amp;{/cpus/cpu@0}&gt;;</div><div class='add'>+</div><div class='add'>+	aliases {</div><div class='add'>+		ethernet0 = &amp;EMAC0;</div><div class='add'>+		ethernet1 = &amp;EMAC1;</div><div class='add'>+		serial0 = &amp;UART0;</div><div class='add'>+		serial1 = &amp;UART1;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpus {</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'>+		cpu@0 {</div><div class='add'>+			device_type = "cpu";</div><div class='add'>+			model = "PowerPC,405EX";</div><div class='add'>+			reg = &lt;0x00000000&gt;;</div><div class='add'>+			clock-frequency = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+			timebase-frequency = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+			i-cache-line-size = &lt;32&gt;;</div><div class='add'>+			d-cache-line-size = &lt;32&gt;;</div><div class='add'>+			i-cache-size = &lt;16384&gt;; /* 16 kB */</div><div class='add'>+			d-cache-size = &lt;16384&gt;; /* 16 kB */</div><div class='add'>+			dcr-controller;</div><div class='add'>+			dcr-access-method = "native";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+		reg = &lt;0x00000000 0x00000000&gt;; /* Filled in by U-Boot */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	UIC0: interrupt-controller {</div><div class='add'>+		compatible = "ibm,uic-405ex", "ibm,uic";</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		cell-index = &lt;0&gt;;</div><div class='add'>+		dcr-reg = &lt;0x0c0 0x009&gt;;</div><div class='add'>+		#address-cells = &lt;0&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	UIC1: interrupt-controller1 {</div><div class='add'>+		compatible = "ibm,uic-405ex","ibm,uic";</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		cell-index = &lt;1&gt;;</div><div class='add'>+		dcr-reg = &lt;0x0d0 0x009&gt;;</div><div class='add'>+		#address-cells = &lt;0&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;0x1e 0x4 0x1f 0x4&gt;; /* cascade */</div><div class='add'>+		interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	UIC2: interrupt-controller2 {</div><div class='add'>+		compatible = "ibm,uic-405ex","ibm,uic";</div><div class='add'>+		interrupt-controller;</div><div class='add'>+		cell-index = &lt;2&gt;;</div><div class='add'>+		dcr-reg = &lt;0x0e0 0x009&gt;;</div><div class='add'>+		#address-cells = &lt;0&gt;;</div><div class='add'>+		#size-cells = &lt;0&gt;;</div><div class='add'>+		#interrupt-cells = &lt;2&gt;;</div><div class='add'>+		interrupts = &lt;0x1c 0x4 0x1d 0x4&gt;; /* cascade */</div><div class='add'>+		interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	CPM0: cpm {</div><div class='add'>+		compatible = "ibm,cpm";</div><div class='add'>+		dcr-access-method = "native";</div><div class='add'>+		dcr-reg = &lt;0x0b0 0x003&gt;;</div><div class='add'>+		unused-units = &lt;0x00000000&gt;;</div><div class='add'>+		idle-doze = &lt;0x02000000&gt;;</div><div class='add'>+		standby = &lt;0xe3e74800&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	plb {</div><div class='add'>+		compatible = "ibm,plb-405ex", "ibm,plb4";</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		ranges;</div><div class='add'>+		clock-frequency = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+</div><div class='add'>+		SDRAM0: memory-controller {</div><div class='add'>+			compatible = "ibm,sdram-405ex", "ibm,sdram-4xx-ddr2";</div><div class='add'>+			dcr-reg = &lt;0x010 0x002&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;UIC2&gt;;</div><div class='add'>+			interrupts = &lt;0x5 0x4	/* ECC DED Error */</div><div class='add'>+				      0x6 0x4&gt;;	/* ECC SEC Error */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		CRYPTO: crypto@ef700000 {</div><div class='add'>+			compatible = "amcc,ppc405ex-crypto", "amcc,ppc4xx-crypto";</div><div class='add'>+			reg = &lt;0xef700000 0x80400&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='add'>+			interrupts = &lt;0x17 0x2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		MAL0: mcmal {</div><div class='add'>+			compatible = "ibm,mcmal-405ex", "ibm,mcmal2";</div><div class='add'>+			dcr-reg = &lt;0x180 0x062&gt;;</div><div class='add'>+			num-tx-chans = &lt;2&gt;;</div><div class='add'>+			num-rx-chans = &lt;2&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;MAL0&gt;;</div><div class='add'>+			interrupts = &lt;0x0 0x1 0x2 0x3 0x4&gt;;</div><div class='add'>+			#interrupt-cells = &lt;1&gt;;</div><div class='add'>+			#address-cells = &lt;0&gt;;</div><div class='add'>+			#size-cells = &lt;0&gt;;</div><div class='add'>+			interrupt-map = &lt;/*TXEOB*/ 0x0 &amp;UIC0 0xa 0x4</div><div class='add'>+					/*RXEOB*/ 0x1 &amp;UIC0 0xb 0x4</div><div class='add'>+					/*SERR*/  0x2 &amp;UIC1 0x0 0x4</div><div class='add'>+					/*TXDE*/  0x3 &amp;UIC1 0x1 0x4</div><div class='add'>+					/*RXDE*/  0x4 &amp;UIC1 0x2 0x4&gt;;</div><div class='add'>+			interrupt-map-mask = &lt;0xffffffff&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		POB0: opb {</div><div class='add'>+			compatible = "ibm,opb-405ex", "ibm,opb";</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			ranges = &lt;0x80000000 0x80000000 0x10000000</div><div class='add'>+				  0xef600000 0xef600000 0x00a00000</div><div class='add'>+				  0xf0000000 0xf0000000 0x10000000&gt;;</div><div class='add'>+			dcr-reg = &lt;0x0a0 0x005&gt;;</div><div class='add'>+			clock-frequency = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+</div><div class='add'>+			EBC0: ebc {</div><div class='add'>+				compatible = "ibm,ebc-405ex", "ibm,ebc";</div><div class='add'>+				dcr-reg = &lt;0x012 0x002&gt;;</div><div class='add'>+				#address-cells = &lt;2&gt;;</div><div class='add'>+				#size-cells = &lt;1&gt;;</div><div class='add'>+				clock-frequency = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+				/* ranges property is supplied by U-Boot */</div><div class='add'>+				interrupts = &lt;0x5 0x1&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;UIC1&gt;;</div><div class='add'>+</div><div class='add'>+				nor_flash@0,0 {</div><div class='add'>+					compatible = "amd,s29gl512n", "cfi-flash";</div><div class='add'>+					bank-width = &lt;2&gt;;</div><div class='add'>+					reg = &lt;0x00000000 0x00000000 0x08000000&gt;;</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					#size-cells = &lt;1&gt;;</div><div class='add'>+					partition@0 {</div><div class='add'>+						label = "kernel + initrd";</div><div class='add'>+						reg = &lt;0x00000000 0x03de0000&gt;;</div><div class='add'>+					};</div><div class='add'>+					partition@3de0000 {</div><div class='add'>+						label = "user config area";</div><div class='add'>+						reg = &lt;0x03de0000 0x00080000&gt;;</div><div class='add'>+					};</div><div class='add'>+					partition@3e60000 {</div><div class='add'>+						label = "user program area";</div><div class='add'>+						reg = &lt;0x03e60000 0x04000000&gt;;</div><div class='add'>+					};</div><div class='add'>+					partition@7e60000 {</div><div class='add'>+						label = "flat device tree";</div><div class='add'>+						reg = &lt;0x07e60000 0x00080000&gt;;</div><div class='add'>+					};</div><div class='add'>+					partition@7ee0000 {</div><div class='add'>+						label = "test program";</div><div class='add'>+						reg = &lt;0x07ee0000 0x00080000&gt;;</div><div class='add'>+					};</div><div class='add'>+					partition@7f60000 {</div><div class='add'>+						label = "u-boot env";</div><div class='add'>+						reg = &lt;0x07f60000 0x00040000&gt;;</div><div class='add'>+					};</div><div class='add'>+					partition@7fa0000 {</div><div class='add'>+						label = "u-boot";</div><div class='add'>+						reg = &lt;0x07fa0000 0x00060000&gt;;</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			UART0: serial@ef600200 {</div><div class='add'>+				device_type = "serial";</div><div class='add'>+				compatible = "ns16550";</div><div class='add'>+				reg = &lt;0xef600200 0x00000008&gt;;</div><div class='add'>+				virtual-reg = &lt;0xef600200&gt;;</div><div class='add'>+				clock-frequency = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+				current-speed = &lt;0&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='add'>+				interrupts = &lt;0x1a 0x4&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			UART1: serial@ef600300 {</div><div class='add'>+				device_type = "serial";</div><div class='add'>+				compatible = "ns16550";</div><div class='add'>+				reg = &lt;0xef600300 0x00000008&gt;;</div><div class='add'>+				virtual-reg = &lt;0xef600300&gt;;</div><div class='add'>+				clock-frequency = &lt;0&gt;; /* Filled in by U-Boot */</div><div class='add'>+				current-speed = &lt;0&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='add'>+				interrupts = &lt;0x1 0x4&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			IIC0: i2c@ef600400 {</div><div class='add'>+				compatible = "ibm,iic-405ex", "ibm,iic";</div><div class='add'>+				reg = &lt;0xef600400 0x00000014&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='add'>+				interrupts = &lt;0x2 0x4&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'>+				rtc@68 {</div><div class='add'>+					compatible = "dallas,ds1340";</div><div class='add'>+					reg = &lt;0x68&gt;;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			IIC1: i2c@ef600500 {</div><div class='add'>+				compatible = "ibm,iic-405ex", "ibm,iic";</div><div class='add'>+				reg = &lt;0xef600500 0x00000014&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;UIC0&gt;;</div><div class='add'>+				interrupts = &lt;0x7 0x4&gt;;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			RGMII0: emac-rgmii@ef600b00 {</div><div class='add'>+				compatible = "ibm,rgmii-405ex", "ibm,rgmii";</div><div class='add'>+				reg = &lt;0xef600b00 0x00000104&gt;;</div><div class='add'>+				has-mdio;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			EMAC0: ethernet@ef600900 {</div><div class='add'>+				linux,network-index = &lt;0x0&gt;;</div><div class='add'>+				device_type = "network";</div><div class='add'>+				compatible = "ibm,emac-405ex", "ibm,emac4sync";</div><div class='add'>+				interrupt-parent = &lt;&amp;EMAC0&gt;;</div><div class='add'>+				interrupts = &lt;0x0 0x1&gt;;</div><div class='add'>+				#interrupt-cells = &lt;1&gt;;</div><div class='add'>+				#address-cells = &lt;0&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				interrupt-map = &lt;/*Status*/ 0x0 &amp;UIC0 0x18 0x4</div><div class='add'>+						/*Wake*/  0x1 &amp;UIC1 0x1d 0x4&gt;;</div><div class='add'>+				reg = &lt;0xef600900 0x000000c4&gt;;</div><div class='add'>+				local-mac-address = [000000000000]; /* Filled in by U-Boot */</div><div class='add'>+				mal-device = &lt;&amp;MAL0&gt;;</div><div class='add'>+				mal-tx-channel = &lt;0&gt;;</div><div class='add'>+				mal-rx-channel = &lt;0&gt;;</div><div class='add'>+				cell-index = &lt;0&gt;;</div><div class='add'>+				max-frame-size = &lt;9000&gt;;</div><div class='add'>+				rx-fifo-size = &lt;4096&gt;;</div><div class='add'>+				tx-fifo-size = &lt;2048&gt;;</div><div class='add'>+				rx-fifo-size-gige = &lt;16384&gt;;</div><div class='add'>+				tx-fifo-size-gige = &lt;16384&gt;;</div><div class='add'>+				phy-mode = "rgmii";</div><div class='add'>+				phy-map = &lt;0x00000000&gt;;</div><div class='add'>+				rgmii-device = &lt;&amp;RGMII0&gt;;</div><div class='add'>+				rgmii-channel = &lt;0&gt;;</div><div class='add'>+				has-inverted-stacr-oc;</div><div class='add'>+				has-new-stacr-staopc;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			EMAC1: ethernet@ef600a00 {</div><div class='add'>+				linux,network-index = &lt;0x1&gt;;</div><div class='add'>+				device_type = "network";</div><div class='add'>+				compatible = "ibm,emac-405ex", "ibm,emac4sync";</div><div class='add'>+				interrupt-parent = &lt;&amp;EMAC1&gt;;</div><div class='add'>+				interrupts = &lt;0x0 0x1&gt;;</div><div class='add'>+				#interrupt-cells = &lt;1&gt;;</div><div class='add'>+				#address-cells = &lt;0&gt;;</div><div class='add'>+				#size-cells = &lt;0&gt;;</div><div class='add'>+				interrupt-map = &lt;/*Status*/ 0x0 &amp;UIC0 0x19 0x4</div><div class='add'>+						/*Wake*/  0x1 &amp;UIC1 0x1f 0x4&gt;;</div><div class='add'>+				reg = &lt;0xef600a00 0x000000c4&gt;;</div><div class='add'>+				local-mac-address = [000000000000]; /* Filled in by U-Boot */</div><div class='add'>+				mal-device = &lt;&amp;MAL0&gt;;</div><div class='add'>+				mal-tx-channel = &lt;1&gt;;</div><div class='add'>+				mal-rx-channel = &lt;1&gt;;</div><div class='add'>+				cell-index = &lt;1&gt;;</div><div class='add'>+				max-frame-size = &lt;9000&gt;;</div><div class='add'>+				rx-fifo-size = &lt;4096&gt;;</div><div class='add'>+				tx-fifo-size = &lt;2048&gt;;</div><div class='add'>+				rx-fifo-size-gige = &lt;16384&gt;;</div><div class='add'>+				tx-fifo-size-gige = &lt;16384&gt;;</div><div class='add'>+				phy-mode = "rgmii";</div><div class='add'>+				phy-map = &lt;0x00000000&gt;;</div><div class='add'>+				rgmii-device = &lt;&amp;RGMII0&gt;;</div><div class='add'>+				rgmii-channel = &lt;1&gt;;</div><div class='add'>+				has-inverted-stacr-oc;</div><div class='add'>+				has-new-stacr-staopc;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			GPIO: gpio@ef600800 {</div><div class='add'>+				device_type = "gpio";</div><div class='add'>+				compatible = "ibm,gpio-405ex", "ibm,ppc4xx-gpio";</div><div class='add'>+				reg = &lt;0xef600800 0x50&gt;;</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+        chosen {</div><div class='add'>+                linux,stdout-path = "/plb/opb/serial@ef600200";</div><div class='add'>+        };</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p1010rdb.dts b/arch/powerpc/boot/dts/p1010rdb.dts<br/>index d6c669c888e9..b868d22984e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1010rdb.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1010rdb.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1010rdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p1010rdb.dts</a></div><div class='hunk'>@@ -9,230 +9,33 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "p1010si.dtsi"</div><div class='add'>+/include/ "fsl/p1010si-pre.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,P1010RDB";</div><div class='ctx'> 	compatible = "fsl,P1010RDB";</div><div class='ctx'> </div><div class='del'>-	aliases {</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		serial1 = &amp;serial1;</div><div class='del'>-		ethernet0 = &amp;enet0;</div><div class='del'>-		ethernet1 = &amp;enet1;</div><div class='del'>-		ethernet2 = &amp;enet2;</div><div class='del'>-		pci0 = &amp;pci0;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-		can0 = &amp;can0;</div><div class='del'>-		can1 = &amp;can1;</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	memory {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	ifc@ffe1e000 {</div><div class='add'>+	board_ifc: ifc: ifc@ffe1e000 {</div><div class='ctx'> 		/* NOR, NAND Flashes and CPLD on board */</div><div class='ctx'> 		ranges = &lt;0x0 0x0 0x0 0xee000000 0x02000000</div><div class='ctx'> 			  0x1 0x0 0x0 0xff800000 0x00010000</div><div class='ctx'> 			  0x3 0x0 0x0 0xffb00000 0x00000020&gt;;</div><div class='del'>-</div><div class='del'>-		nor@0,0 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "cfi-flash";</div><div class='del'>-			reg = &lt;0x0 0x0 0x2000000&gt;;</div><div class='del'>-			bank-width = &lt;2&gt;;</div><div class='del'>-			device-width = &lt;1&gt;;</div><div class='del'>-</div><div class='del'>-			partition@40000 {</div><div class='del'>-				/* 256KB for DTB Image */</div><div class='del'>-				reg = &lt;0x00040000 0x00040000&gt;;</div><div class='del'>-				label = "NOR DTB Image";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			partition@80000 {</div><div class='del'>-				/* 7 MB for Linux Kernel Image */</div><div class='del'>-				reg = &lt;0x00080000 0x00700000&gt;;</div><div class='del'>-				label = "NOR Linux Kernel Image";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			partition@800000 {</div><div class='del'>-				/* 20MB for JFFS2 based Root file System */</div><div class='del'>-				reg = &lt;0x00800000 0x01400000&gt;;</div><div class='del'>-				label = "NOR JFFS2 Root File System";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			partition@1f00000 {</div><div class='del'>-				/* This location must not be altered  */</div><div class='del'>-				/* 512KB for u-boot Bootloader Image */</div><div class='del'>-				/* 512KB for u-boot Environment Variables */</div><div class='del'>-				reg = &lt;0x01f00000 0x00100000&gt;;</div><div class='del'>-				label = "NOR U-Boot Image";</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		nand@1,0 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,ifc-nand";</div><div class='del'>-			reg = &lt;0x1 0x0 0x10000&gt;;</div><div class='del'>-</div><div class='del'>-			partition@0 {</div><div class='del'>-				/* This location must not be altered  */</div><div class='del'>-				/* 1MB for u-boot Bootloader Image */</div><div class='del'>-				reg = &lt;0x0 0x00100000&gt;;</div><div class='del'>-				label = "NAND U-Boot Image";</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			partition@100000 {</div><div class='del'>-				/* 1MB for DTB Image */</div><div class='del'>-				reg = &lt;0x00100000 0x00100000&gt;;</div><div class='del'>-				label = "NAND DTB Image";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			partition@200000 {</div><div class='del'>-				/* 4MB for Linux Kernel Image */</div><div class='del'>-				reg = &lt;0x00200000 0x00400000&gt;;</div><div class='del'>-				label = "NAND Linux Kernel Image";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			partition@600000 {</div><div class='del'>-				/* 4MB for Compressed Root file System Image */</div><div class='del'>-				reg = &lt;0x00600000 0x00400000&gt;;</div><div class='del'>-				label = "NAND Compressed RFS Image";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			partition@a00000 {</div><div class='del'>-				/* 15MB for JFFS2 based Root file System */</div><div class='del'>-				reg = &lt;0x00a00000 0x00f00000&gt;;</div><div class='del'>-				label = "NAND JFFS2 Root File System";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			partition@1900000 {</div><div class='del'>-				/* 7MB for User Area */</div><div class='del'>-				reg = &lt;0x01900000 0x00700000&gt;;</div><div class='del'>-				label = "NAND User area";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cpld@3,0 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,p1010rdb-cpld";</div><div class='del'>-			reg = &lt;0x3 0x0 0x0000020&gt;;</div><div class='del'>-			bank-width = &lt;1&gt;;</div><div class='del'>-			device-width = &lt;1&gt;;</div><div class='del'>-		};</div><div class='add'>+		reg = &lt;0x0 0xffe1e000 0 0x2000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc@ffe00000 {</div><div class='del'>-		spi@7000 {</div><div class='del'>-			flash@0 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "spansion,s25sl12801";</div><div class='del'>-				reg = &lt;0&gt;;</div><div class='del'>-				spi-max-frequency = &lt;50000000&gt;;</div><div class='del'>-</div><div class='del'>-				partition@0 {</div><div class='del'>-					/* 1MB for u-boot Bootloader Image */</div><div class='del'>-					/* 1MB for Environment */</div><div class='del'>-					reg = &lt;0x0 0x00100000&gt;;</div><div class='del'>-					label = "SPI Flash U-Boot Image";</div><div class='del'>-					read-only;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				partition@100000 {</div><div class='del'>-					/* 512KB for DTB Image */</div><div class='del'>-					reg = &lt;0x00100000 0x00080000&gt;;</div><div class='del'>-					label = "SPI Flash DTB Image";</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				partition@180000 {</div><div class='del'>-					/* 4MB for Linux Kernel Image */</div><div class='del'>-					reg = &lt;0x00180000 0x00400000&gt;;</div><div class='del'>-					label = "SPI Flash Linux Kernel Image";</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				partition@580000 {</div><div class='del'>-					/* 4MB for Compressed RFS Image */</div><div class='del'>-					reg = &lt;0x00580000 0x00400000&gt;;</div><div class='del'>-					label = "SPI Flash Compressed RFSImage";</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				partition@980000 {</div><div class='del'>-					/* 6.5MB for JFFS2 based RFS */</div><div class='del'>-					reg = &lt;0x00980000 0x00680000&gt;;</div><div class='del'>-					label = "SPI Flash JFFS2 RFS";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb@22000 {</div><div class='del'>-			phy_type = "utmi";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@24000 {</div><div class='del'>-			phy0: ethernet-phy@0 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;3 1&gt;;</div><div class='del'>-				reg = &lt;0x1&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			phy1: ethernet-phy@1 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;2 1&gt;;</div><div class='del'>-				reg = &lt;0x0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			phy2: ethernet-phy@2 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;2 1&gt;;</div><div class='del'>-				reg = &lt;0x2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet0: ethernet@b0000 {</div><div class='del'>-			phy-handle = &lt;&amp;phy0&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet1: ethernet@b1000 {</div><div class='del'>-			phy-handle = &lt;&amp;phy1&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='del'>-			phy-connection-type = "sgmii";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet2: ethernet@b2000 {</div><div class='del'>-			phy-handle = &lt;&amp;phy2&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi1&gt;;</div><div class='del'>-			phy-connection-type = "sgmii";</div><div class='del'>-		};</div><div class='add'>+	board_soc: soc: soc@ffe00000 {</div><div class='add'>+		ranges = &lt;0x0 0x0 0xffe00000 0x100000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci0: pcie@ffe09000 {</div><div class='add'>+		reg = &lt;0 0xffe09000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-			interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x4 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x5 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x6 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x7 0x1</div><div class='del'>-			&gt;;</div><div class='del'>-</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -244,24 +47,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci1: pcie@ffe0a000 {</div><div class='add'>+		reg = &lt;0 0xffe0a000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-			interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x4 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x5 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x6 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x7 0x1</div><div class='del'>-			&gt;;</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0x80000000</div><div class='ctx'> 				  0x2000000 0x0 0x80000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -272,3 +61,6 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "p1010rdb.dtsi"</div><div class='add'>+/include/ "fsl/p1010si-post.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p1010rdb.dtsi b/arch/powerpc/boot/dts/p1010rdb.dtsi<br/>new file mode 100644<br/>index 000000000000..d4c4a7730285<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1010rdb.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p1010rdb.dtsi</a></div><div class='hunk'>@@ -0,0 +1,234 @@</div><div class='add'>+/*</div><div class='add'>+ * P1010 RDB Device Tree Source stub (no addresses or top-level ranges)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;board_ifc {</div><div class='add'>+	nor@0,0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "cfi-flash";</div><div class='add'>+		reg = &lt;0x0 0x0 0x2000000&gt;;</div><div class='add'>+		bank-width = &lt;2&gt;;</div><div class='add'>+		device-width = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		partition@40000 {</div><div class='add'>+			/* 256KB for DTB Image */</div><div class='add'>+			reg = &lt;0x00040000 0x00040000&gt;;</div><div class='add'>+			label = "NOR DTB Image";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@80000 {</div><div class='add'>+			/* 7 MB for Linux Kernel Image */</div><div class='add'>+			reg = &lt;0x00080000 0x00700000&gt;;</div><div class='add'>+			label = "NOR Linux Kernel Image";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@800000 {</div><div class='add'>+			/* 20MB for JFFS2 based Root file System */</div><div class='add'>+			reg = &lt;0x00800000 0x01400000&gt;;</div><div class='add'>+			label = "NOR JFFS2 Root File System";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@1f00000 {</div><div class='add'>+			/* This location must not be altered  */</div><div class='add'>+			/* 512KB for u-boot Bootloader Image */</div><div class='add'>+			/* 512KB for u-boot Environment Variables */</div><div class='add'>+			reg = &lt;0x01f00000 0x00100000&gt;;</div><div class='add'>+			label = "NOR U-Boot Image";</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	nand@1,0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "fsl,ifc-nand";</div><div class='add'>+		reg = &lt;0x1 0x0 0x10000&gt;;</div><div class='add'>+</div><div class='add'>+		partition@0 {</div><div class='add'>+			/* This location must not be altered  */</div><div class='add'>+			/* 1MB for u-boot Bootloader Image */</div><div class='add'>+			reg = &lt;0x0 0x00100000&gt;;</div><div class='add'>+			label = "NAND U-Boot Image";</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@100000 {</div><div class='add'>+			/* 1MB for DTB Image */</div><div class='add'>+			reg = &lt;0x00100000 0x00100000&gt;;</div><div class='add'>+			label = "NAND DTB Image";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@200000 {</div><div class='add'>+			/* 4MB for Linux Kernel Image */</div><div class='add'>+			reg = &lt;0x00200000 0x00400000&gt;;</div><div class='add'>+			label = "NAND Linux Kernel Image";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@600000 {</div><div class='add'>+			/* 4MB for Compressed Root file System Image */</div><div class='add'>+			reg = &lt;0x00600000 0x00400000&gt;;</div><div class='add'>+			label = "NAND Compressed RFS Image";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@a00000 {</div><div class='add'>+			/* 15MB for JFFS2 based Root file System */</div><div class='add'>+			reg = &lt;0x00a00000 0x00f00000&gt;;</div><div class='add'>+			label = "NAND JFFS2 Root File System";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@1900000 {</div><div class='add'>+			/* 7MB for User Area */</div><div class='add'>+			reg = &lt;0x01900000 0x00700000&gt;;</div><div class='add'>+			label = "NAND User area";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cpld@3,0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "fsl,p1010rdb-cpld";</div><div class='add'>+		reg = &lt;0x3 0x0 0x0000020&gt;;</div><div class='add'>+		bank-width = &lt;1&gt;;</div><div class='add'>+		device-width = &lt;1&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;board_soc {</div><div class='add'>+	i2c@3000 {</div><div class='add'>+		rtc@68 {</div><div class='add'>+			compatible = "pericom,pt7c4338";</div><div class='add'>+			reg = &lt;0x68&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi@7000 {</div><div class='add'>+		flash@0 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "spansion,s25sl12801";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			spi-max-frequency = &lt;50000000&gt;;</div><div class='add'>+</div><div class='add'>+			partition@0 {</div><div class='add'>+				/* 1MB for u-boot Bootloader Image */</div><div class='add'>+				/* 1MB for Environment */</div><div class='add'>+				reg = &lt;0x0 0x00100000&gt;;</div><div class='add'>+				label = "SPI Flash U-Boot Image";</div><div class='add'>+				read-only;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			partition@100000 {</div><div class='add'>+				/* 512KB for DTB Image */</div><div class='add'>+				reg = &lt;0x00100000 0x00080000&gt;;</div><div class='add'>+				label = "SPI Flash DTB Image";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			partition@180000 {</div><div class='add'>+				/* 4MB for Linux Kernel Image */</div><div class='add'>+				reg = &lt;0x00180000 0x00400000&gt;;</div><div class='add'>+				label = "SPI Flash Linux Kernel Image";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			partition@580000 {</div><div class='add'>+				/* 4MB for Compressed RFS Image */</div><div class='add'>+				reg = &lt;0x00580000 0x00400000&gt;;</div><div class='add'>+				label = "SPI Flash Compressed RFSImage";</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			partition@980000 {</div><div class='add'>+				/* 6.5MB for JFFS2 based RFS */</div><div class='add'>+				reg = &lt;0x00980000 0x00680000&gt;;</div><div class='add'>+				label = "SPI Flash JFFS2 RFS";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb@22000 {</div><div class='add'>+		phy_type = "utmi";</div><div class='add'>+		dr_mode = "host";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio@24000 {</div><div class='add'>+		phy0: ethernet-phy@0 {</div><div class='add'>+			interrupts = &lt;3 1 0 0&gt;;</div><div class='add'>+			reg = &lt;0x1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		phy1: ethernet-phy@1 {</div><div class='add'>+			interrupts = &lt;2 1 0 0&gt;;</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		phy2: ethernet-phy@2 {</div><div class='add'>+			interrupts = &lt;2 1 0 0&gt;;</div><div class='add'>+			reg = &lt;0x2&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		tbi-phy@3 {</div><div class='add'>+			device-type = "tbi-phy";</div><div class='add'>+			reg = &lt;0x3&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio@25000 {</div><div class='add'>+		tbi0: tbi-phy@11 {</div><div class='add'>+			reg = &lt;0x11&gt;;</div><div class='add'>+			device_type = "tbi-phy";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio@26000 {</div><div class='add'>+		tbi1: tbi-phy@11 {</div><div class='add'>+			reg = &lt;0x11&gt;;</div><div class='add'>+			device_type = "tbi-phy";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	enet0: ethernet@b0000 {</div><div class='add'>+		phy-handle = &lt;&amp;phy0&gt;;</div><div class='add'>+		phy-connection-type = "rgmii-id";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	enet1: ethernet@b1000 {</div><div class='add'>+		phy-handle = &lt;&amp;phy1&gt;;</div><div class='add'>+		tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='add'>+		phy-connection-type = "sgmii";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	enet2: ethernet@b2000 {</div><div class='add'>+		phy-handle = &lt;&amp;phy2&gt;;</div><div class='add'>+		tbi-handle = &lt;&amp;tbi1&gt;;</div><div class='add'>+		phy-connection-type = "sgmii";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p1010rdb_36b.dts b/arch/powerpc/boot/dts/p1010rdb_36b.dts<br/>new file mode 100644<br/>index 000000000000..64776f4a4651<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1010rdb_36b.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p1010rdb_36b.dts</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+/*</div><div class='add'>+ * P1010 RDB Device Tree Source (36-bit address map)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/include/ "fsl/p1010si-pre.dtsi"</div><div class='add'>+</div><div class='add'>+/ {</div><div class='add'>+	model = "fsl,P1010RDB";</div><div class='add'>+	compatible = "fsl,P1010RDB";</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	board_ifc: ifc: ifc@fffe1e000 {</div><div class='add'>+		/* NOR, NAND Flashes and CPLD on board */</div><div class='add'>+		ranges = &lt;0x0 0x0 0xf 0xee000000 0x02000000</div><div class='add'>+			  0x1 0x0 0xf 0xff800000 0x00010000</div><div class='add'>+			  0x3 0x0 0xf 0xffb00000 0x00000020&gt;;</div><div class='add'>+		reg = &lt;0xf 0xffe1e000 0 0x2000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	board_soc: soc: soc@fffe00000 {</div><div class='add'>+		ranges = &lt;0x0 0xf 0xffe00000 0x100000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pci0: pcie@fffe09000 {</div><div class='add'>+		reg = &lt;0xf 0xffe09000 0 0x1000&gt;;</div><div class='add'>+		ranges = &lt;0x2000000 0x0 0xc0000000 0xc 0x20000000 0x0 0x20000000</div><div class='add'>+			  0x1000000 0x0 0x00000000 0xf 0xffc10000 0x0 0x10000&gt;;</div><div class='add'>+		pcie@0 {</div><div class='add'>+			ranges = &lt;0x2000000 0x0 0xc0000000</div><div class='add'>+				  0x2000000 0x0 0xc0000000</div><div class='add'>+				  0x0 0x20000000</div><div class='add'>+</div><div class='add'>+				  0x1000000 0x0 0x0</div><div class='add'>+				  0x1000000 0x0 0x0</div><div class='add'>+				  0x0 0x100000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pci1: pcie@fffe0a000 {</div><div class='add'>+		reg = &lt;0xf 0xffe0a000 0 0x1000&gt;;</div><div class='add'>+		ranges = &lt;0x2000000 0x0 0xc0000000 0xc 0x20000000 0x0 0x20000000</div><div class='add'>+			  0x1000000 0x0 0x00000000 0xf 0xffc10000 0x0 0x10000&gt;;</div><div class='add'>+		pcie@0 {</div><div class='add'>+			ranges = &lt;0x2000000 0x0 0xc0000000</div><div class='add'>+				  0x2000000 0x0 0xc0000000</div><div class='add'>+				  0x0 0x20000000</div><div class='add'>+</div><div class='add'>+				  0x1000000 0x0 0x0</div><div class='add'>+				  0x1000000 0x0 0x0</div><div class='add'>+				  0x0 0x100000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/include/ "p1010rdb.dtsi"</div><div class='add'>+/include/ "fsl/p1010si-post.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p1010si.dtsi b/arch/powerpc/boot/dts/p1010si.dtsi<br/>deleted file mode 100644<br/>index cabe0a453ae6..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1010si.dtsi?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1010si.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,374 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * P1010si Device Tree Source</div><div class='del'>- *</div><div class='del'>- * Copyright 2011 Freescale Semiconductor Inc.</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='del'>-/dts-v1/;</div><div class='del'>-/ {</div><div class='del'>-	compatible = "fsl,P1010";</div><div class='del'>-	#address-cells = &lt;2&gt;;</div><div class='del'>-	#size-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-	cpus {</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'>-		PowerPC,P1010@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	ifc@ffe1e000 {</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		compatible = "fsl,ifc", "simple-bus";</div><div class='del'>-		reg = &lt;0x0 0xffe1e000 0 0x2000&gt;;</div><div class='del'>-		interrupts = &lt;16 2 19 2&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	soc@ffe00000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "fsl,p1010-immr", "simple-bus";</div><div class='del'>-		ranges = &lt;0x0  0x0 0xffe00000 0x100000&gt;;</div><div class='del'>-		bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='del'>-</div><div class='del'>-		ecm-law@0 {</div><div class='del'>-			compatible = "fsl,ecm-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;12&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ecm@1000 {</div><div class='del'>-			compatible = "fsl,p1010-ecm", "fsl,ecm";</div><div class='del'>-			reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		memory-controller@2000 {</div><div class='del'>-			compatible = "fsl,p1010-memory-controller";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@3000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@3100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial0: serial@4500 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial1: serial@4600 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi@7000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,mpc8536-espi";</div><div class='del'>-			reg = &lt;0x7000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;59 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			fsl,espi-num-chipselects = &lt;1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpio: gpio-controller@f000 {</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-			compatible = "fsl,mpc8572-gpio";</div><div class='del'>-			reg = &lt;0xf000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;47 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			gpio-controller;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sata@18000 {</div><div class='del'>-			compatible = "fsl,pq-sata-v2";</div><div class='del'>-			reg = &lt;0x18000 0x1000&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			interrupts = &lt;74 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sata@19000 {</div><div class='del'>-			compatible = "fsl,pq-sata-v2";</div><div class='del'>-			reg = &lt;0x19000 0x1000&gt;;</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			interrupts = &lt;41 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		can0: can@1c000 {</div><div class='del'>-			compatible = "fsl,p1010-flexcan";</div><div class='del'>-			reg = &lt;0x1c000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;48 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		can1: can@1d000 {</div><div class='del'>-			compatible = "fsl,p1010-flexcan";</div><div class='del'>-			reg = &lt;0x1d000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;61 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		L2: l2-cache-controller@20000 {</div><div class='del'>-			compatible = "fsl,p1010-l2-cache-controller",</div><div class='del'>-					"fsl,p1014-l2-cache-controller";</div><div class='del'>-			reg = &lt;0x20000 0x1000&gt;;</div><div class='del'>-			cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			cache-size = &lt;0x40000&gt;; // L2,256K</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma@21300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,p1010-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x21300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x21100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,p1010-dma-channel", "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;20 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,p1010-dma-channel", "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;21 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,p1010-dma-channel", "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;22 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,p1010-dma-channel", "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;23 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb@22000 {</div><div class='del'>-			compatible = "fsl-usb2-dr";</div><div class='del'>-			reg = &lt;0x22000 0x1000&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;28 0x2&gt;;</div><div class='del'>-			dr_mode = "host";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@24000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,etsec2-mdio";</div><div class='del'>-			reg = &lt;0x24000 0x1000 0xb0030 0x4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@25000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,etsec2-tbi";</div><div class='del'>-			reg = &lt;0x25000 0x1000 0xb1030 0x4&gt;;</div><div class='del'>-			tbi0: tbi-phy@11 {</div><div class='del'>-				reg = &lt;0x11&gt;;</div><div class='del'>-				device_type = "tbi-phy";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@26000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,etsec2-tbi";</div><div class='del'>-			reg = &lt;0x26000 0x1000 0xb1030 0x4&gt;;</div><div class='del'>-			tbi1: tbi-phy@11 {</div><div class='del'>-				reg = &lt;0x11&gt;;</div><div class='del'>-				device_type = "tbi-phy";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sdhci@2e000 {</div><div class='del'>-			compatible = "fsl,esdhc";</div><div class='del'>-			reg = &lt;0x2e000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;72 0x8&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			/* Filled in by U-Boot */</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			fsl,sdhci-auto-cmd12;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet0: ethernet@b0000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "fsl,etsec2";</div><div class='del'>-			fsl,num_rx_queues = &lt;0x8&gt;;</div><div class='del'>-			fsl,num_tx_queues = &lt;0x8&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-</div><div class='del'>-			queue-group@0 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xb0000 0x1000&gt;;</div><div class='del'>-				fsl,rx-bit-map = &lt;0xff&gt;;</div><div class='del'>-				fsl,tx-bit-map = &lt;0xff&gt;;</div><div class='del'>-				interrupts = &lt;29 2 30 2 34 2&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet1: ethernet@b1000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "fsl,etsec2";</div><div class='del'>-			fsl,num_rx_queues = &lt;0x8&gt;;</div><div class='del'>-			fsl,num_tx_queues = &lt;0x8&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-</div><div class='del'>-			queue-group@0 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xb1000 0x1000&gt;;</div><div class='del'>-				fsl,rx-bit-map = &lt;0xff&gt;;</div><div class='del'>-				fsl,tx-bit-map = &lt;0xff&gt;;</div><div class='del'>-				interrupts = &lt;35 2 36 2 40 2&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet2: ethernet@b2000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "fsl,etsec2";</div><div class='del'>-			fsl,num_rx_queues = &lt;0x8&gt;;</div><div class='del'>-			fsl,num_tx_queues = &lt;0x8&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-</div><div class='del'>-			queue-group@0 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xb2000 0x1000&gt;;</div><div class='del'>-				fsl,rx-bit-map = &lt;0xff&gt;;</div><div class='del'>-				fsl,tx-bit-map = &lt;0xff&gt;;</div><div class='del'>-				interrupts = &lt;31 2 32 2 33 2&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi@41600 {</div><div class='del'>-			compatible = "fsl,p1010-msi", "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x80&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0</div><div class='del'>-				0xe1 0</div><div class='del'>-				0xe2 0</div><div class='del'>-				0xe3 0</div><div class='del'>-				0xe4 0</div><div class='del'>-				0xe5 0</div><div class='del'>-				0xe6 0</div><div class='del'>-				0xe7 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		global-utilities@e0000 {	//global utilities block</div><div class='del'>-			compatible = "fsl,p1010-guts";</div><div class='del'>-			reg = &lt;0xe0000 0x1000&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci0: pcie@ffe09000 {</div><div class='del'>-		compatible = "fsl,p1010-pcie", "fsl,qoriq-pcie-v2.3", "fsl,qoriq-pcie-v2.2";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0 0xffe09000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;16 2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci1: pcie@ffe0a000 {</div><div class='del'>-		compatible = "fsl,p1010-pcie", "fsl,qoriq-pcie-v2.3", "fsl,qoriq-pcie-v2.2";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0 0xffe0a000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;16 2&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p1020rdb.dts b/arch/powerpc/boot/dts/p1020rdb.dts<br/>index d6a8ae458137..518bf99b1f50 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1020rdb.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1020rdb.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1020rdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p1020rdb.dts</a></div><div class='hunk'>@@ -9,267 +9,33 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "p1020si.dtsi"</div><div class='del'>-</div><div class='add'>+/include/ "fsl/p1020si-pre.dtsi"</div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,P1020RDB";</div><div class='ctx'> 	compatible = "fsl,P1020RDB";</div><div class='ctx'> </div><div class='del'>-	aliases {</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		serial1 = &amp;serial1;</div><div class='del'>-		ethernet0 = &amp;enet0;</div><div class='del'>-		ethernet1 = &amp;enet1;</div><div class='del'>-		ethernet2 = &amp;enet2;</div><div class='del'>-		pci0 = &amp;pci0;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	memory {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	localbus@ffe05000 {</div><div class='add'>+	board_lbc: lbc: localbus@ffe05000 {</div><div class='add'>+		reg = &lt;0 0xffe05000 0 0x1000&gt;;</div><div class='ctx'> </div><div class='ctx'> 		/* NOR, NAND Flashes and Vitesse 5 port L2 switch */</div><div class='ctx'> 		ranges = &lt;0x0 0x0 0x0 0xef000000 0x01000000</div><div class='ctx'> 			  0x1 0x0 0x0 0xffa00000 0x00040000</div><div class='ctx'> 			  0x2 0x0 0x0 0xffb00000 0x00020000&gt;;</div><div class='del'>-</div><div class='del'>-		nor@0,0 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "cfi-flash";</div><div class='del'>-			reg = &lt;0x0 0x0 0x1000000&gt;;</div><div class='del'>-			bank-width = &lt;2&gt;;</div><div class='del'>-			device-width = &lt;1&gt;;</div><div class='del'>-</div><div class='del'>-			partition@0 {</div><div class='del'>-				/* This location must not be altered  */</div><div class='del'>-				/* 256KB for Vitesse 7385 Switch firmware */</div><div class='del'>-				reg = &lt;0x0 0x00040000&gt;;</div><div class='del'>-				label = "NOR (RO) Vitesse-7385 Firmware";</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			partition@40000 {</div><div class='del'>-				/* 256KB for DTB Image */</div><div class='del'>-				reg = &lt;0x00040000 0x00040000&gt;;</div><div class='del'>-				label = "NOR (RO) DTB Image";</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			partition@80000 {</div><div class='del'>-				/* 3.5 MB for Linux Kernel Image */</div><div class='del'>-				reg = &lt;0x00080000 0x00380000&gt;;</div><div class='del'>-				label = "NOR (RO) Linux Kernel Image";</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			partition@400000 {</div><div class='del'>-				/* 11MB for JFFS2 based Root file System */</div><div class='del'>-				reg = &lt;0x00400000 0x00b00000&gt;;</div><div class='del'>-				label = "NOR (RW) JFFS2 Root File System";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			partition@f00000 {</div><div class='del'>-				/* This location must not be altered  */</div><div class='del'>-				/* 512KB for u-boot Bootloader Image */</div><div class='del'>-				/* 512KB for u-boot Environment Variables */</div><div class='del'>-				reg = &lt;0x00f00000 0x00100000&gt;;</div><div class='del'>-				label = "NOR (RO) U-Boot Image";</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		nand@1,0 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,p1020-fcm-nand",</div><div class='del'>-				     "fsl,elbc-fcm-nand";</div><div class='del'>-			reg = &lt;0x1 0x0 0x40000&gt;;</div><div class='del'>-</div><div class='del'>-			partition@0 {</div><div class='del'>-				/* This location must not be altered  */</div><div class='del'>-				/* 1MB for u-boot Bootloader Image */</div><div class='del'>-				reg = &lt;0x0 0x00100000&gt;;</div><div class='del'>-				label = "NAND (RO) U-Boot Image";</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			partition@100000 {</div><div class='del'>-				/* 1MB for DTB Image */</div><div class='del'>-				reg = &lt;0x00100000 0x00100000&gt;;</div><div class='del'>-				label = "NAND (RO) DTB Image";</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			partition@200000 {</div><div class='del'>-				/* 4MB for Linux Kernel Image */</div><div class='del'>-				reg = &lt;0x00200000 0x00400000&gt;;</div><div class='del'>-				label = "NAND (RO) Linux Kernel Image";</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			partition@600000 {</div><div class='del'>-				/* 4MB for Compressed Root file System Image */</div><div class='del'>-				reg = &lt;0x00600000 0x00400000&gt;;</div><div class='del'>-				label = "NAND (RO) Compressed RFS Image";</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			partition@a00000 {</div><div class='del'>-				/* 7MB for JFFS2 based Root file System */</div><div class='del'>-				reg = &lt;0x00a00000 0x00700000&gt;;</div><div class='del'>-				label = "NAND (RW) JFFS2 Root File System";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			partition@1100000 {</div><div class='del'>-				/* 15MB for JFFS2 based Root file System */</div><div class='del'>-				reg = &lt;0x01100000 0x00f00000&gt;;</div><div class='del'>-				label = "NAND (RW) Writable User area";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		L2switch@2,0 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "vitesse-7385";</div><div class='del'>-			reg = &lt;0x2 0x0 0x20000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc@ffe00000 {</div><div class='del'>-		i2c@3000 {</div><div class='del'>-			rtc@68 {</div><div class='del'>-				compatible = "dallas,ds1339";</div><div class='del'>-				reg = &lt;0x68&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi@7000 {</div><div class='del'>-</div><div class='del'>-			fsl_m25p80@0 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "fsl,espi-flash";</div><div class='del'>-				reg = &lt;0&gt;;</div><div class='del'>-				linux,modalias = "fsl_m25p80";</div><div class='del'>-				modal = "s25sl128b";</div><div class='del'>-				spi-max-frequency = &lt;50000000&gt;;</div><div class='del'>-				mode = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-				partition@0 {</div><div class='del'>-					/* 512KB for u-boot Bootloader Image */</div><div class='del'>-					reg = &lt;0x0 0x00080000&gt;;</div><div class='del'>-					label = "SPI (RO) U-Boot Image";</div><div class='del'>-					read-only;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				partition@80000 {</div><div class='del'>-					/* 512KB for DTB Image */</div><div class='del'>-					reg = &lt;0x00080000 0x00080000&gt;;</div><div class='del'>-					label = "SPI (RO) DTB Image";</div><div class='del'>-					read-only;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				partition@100000 {</div><div class='del'>-					/* 4MB for Linux Kernel Image */</div><div class='del'>-					reg = &lt;0x00100000 0x00400000&gt;;</div><div class='del'>-					label = "SPI (RO) Linux Kernel Image";</div><div class='del'>-					read-only;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				partition@500000 {</div><div class='del'>-					/* 4MB for Compressed RFS Image */</div><div class='del'>-					reg = &lt;0x00500000 0x00400000&gt;;</div><div class='del'>-					label = "SPI (RO) Compressed RFS Image";</div><div class='del'>-					read-only;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				partition@900000 {</div><div class='del'>-					/* 7MB for JFFS2 based RFS */</div><div class='del'>-					reg = &lt;0x00900000 0x00700000&gt;;</div><div class='del'>-					label = "SPI (RW) JFFS2 RFS";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@24000 {</div><div class='del'>-</div><div class='del'>-			phy0: ethernet-phy@0 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;3 1&gt;;</div><div class='del'>-				reg = &lt;0x0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			phy1: ethernet-phy@1 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;2 1&gt;;</div><div class='del'>-				reg = &lt;0x1&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@25000 {</div><div class='del'>-</div><div class='del'>-			tbi0: tbi-phy@11 {</div><div class='del'>-				reg = &lt;0x11&gt;;</div><div class='del'>-				device_type = "tbi-phy";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet0: ethernet@b0000 {</div><div class='del'>-			fixed-link = &lt;1 1 1000 0 0&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet1: ethernet@b1000 {</div><div class='del'>-			phy-handle = &lt;&amp;phy0&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='del'>-			phy-connection-type = "sgmii";</div><div class='del'>-</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet2: ethernet@b2000 {</div><div class='del'>-			phy-handle = &lt;&amp;phy1&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb@22000 {</div><div class='del'>-			phy_type = "ulpi";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* USB2 is shared with localbus, so it must be disabled</div><div class='del'>-		   by default. We can't put 'status = "disabled";' here</div><div class='del'>-		   since U-Boot doesn't clear the status property when</div><div class='del'>-		   it enables USB2. OTOH, U-Boot does create a new node</div><div class='del'>-		   when there isn't any. So, just comment it out.</div><div class='del'>-		usb@23000 {</div><div class='del'>-			phy_type = "ulpi";</div><div class='del'>-		};</div><div class='del'>-		*/</div><div class='del'>-</div><div class='add'>+	board_soc: soc: soc@ffe00000 {</div><div class='add'>+		ranges = &lt;0x0 0x0 0xffe00000 0x100000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci0: pcie@ffe09000 {</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x4 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x5 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x6 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x7 0x1</div><div class='del'>-			&gt;;</div><div class='add'>+		reg = &lt;0 0xffe09000 0 0x1000&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -281,21 +47,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci1: pcie@ffe0a000 {</div><div class='add'>+		reg = &lt;0 0xffe0a000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1</div><div class='del'>-			&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0x80000000</div><div class='ctx'> 				  0x2000000 0x0 0x80000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -306,3 +61,6 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "p1020rdb.dtsi"</div><div class='add'>+/include/ "fsl/p1020si-post.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p1020rdb.dtsi b/arch/powerpc/boot/dts/p1020rdb.dtsi<br/>new file mode 100644<br/>index 000000000000..b5bd86f4baf2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1020rdb.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p1020rdb.dtsi</a></div><div class='hunk'>@@ -0,0 +1,247 @@</div><div class='add'>+/*</div><div class='add'>+ * P1020 RDB Device Tree Source stub (no addresses or top-level ranges)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;board_lbc {</div><div class='add'>+	nor@0,0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "cfi-flash";</div><div class='add'>+		reg = &lt;0x0 0x0 0x1000000&gt;;</div><div class='add'>+		bank-width = &lt;2&gt;;</div><div class='add'>+		device-width = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		partition@0 {</div><div class='add'>+			/* This location must not be altered  */</div><div class='add'>+			/* 256KB for Vitesse 7385 Switch firmware */</div><div class='add'>+			reg = &lt;0x0 0x00040000&gt;;</div><div class='add'>+			label = "NOR (RO) Vitesse-7385 Firmware";</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@40000 {</div><div class='add'>+			/* 256KB for DTB Image */</div><div class='add'>+			reg = &lt;0x00040000 0x00040000&gt;;</div><div class='add'>+			label = "NOR (RO) DTB Image";</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@80000 {</div><div class='add'>+			/* 3.5 MB for Linux Kernel Image */</div><div class='add'>+			reg = &lt;0x00080000 0x00380000&gt;;</div><div class='add'>+			label = "NOR (RO) Linux Kernel Image";</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@400000 {</div><div class='add'>+			/* 11MB for JFFS2 based Root file System */</div><div class='add'>+			reg = &lt;0x00400000 0x00b00000&gt;;</div><div class='add'>+			label = "NOR (RW) JFFS2 Root File System";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@f00000 {</div><div class='add'>+			/* This location must not be altered  */</div><div class='add'>+			/* 512KB for u-boot Bootloader Image */</div><div class='add'>+			/* 512KB for u-boot Environment Variables */</div><div class='add'>+			reg = &lt;0x00f00000 0x00100000&gt;;</div><div class='add'>+			label = "NOR (RO) U-Boot Image";</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	nand@1,0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "fsl,p1020-fcm-nand",</div><div class='add'>+			     "fsl,elbc-fcm-nand";</div><div class='add'>+		reg = &lt;0x1 0x0 0x40000&gt;;</div><div class='add'>+</div><div class='add'>+		partition@0 {</div><div class='add'>+			/* This location must not be altered  */</div><div class='add'>+			/* 1MB for u-boot Bootloader Image */</div><div class='add'>+			reg = &lt;0x0 0x00100000&gt;;</div><div class='add'>+			label = "NAND (RO) U-Boot Image";</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@100000 {</div><div class='add'>+			/* 1MB for DTB Image */</div><div class='add'>+			reg = &lt;0x00100000 0x00100000&gt;;</div><div class='add'>+			label = "NAND (RO) DTB Image";</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@200000 {</div><div class='add'>+			/* 4MB for Linux Kernel Image */</div><div class='add'>+			reg = &lt;0x00200000 0x00400000&gt;;</div><div class='add'>+			label = "NAND (RO) Linux Kernel Image";</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@600000 {</div><div class='add'>+			/* 4MB for Compressed Root file System Image */</div><div class='add'>+			reg = &lt;0x00600000 0x00400000&gt;;</div><div class='add'>+			label = "NAND (RO) Compressed RFS Image";</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@a00000 {</div><div class='add'>+			/* 7MB for JFFS2 based Root file System */</div><div class='add'>+			reg = &lt;0x00a00000 0x00700000&gt;;</div><div class='add'>+			label = "NAND (RW) JFFS2 Root File System";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		partition@1100000 {</div><div class='add'>+			/* 15MB for JFFS2 based Root file System */</div><div class='add'>+			reg = &lt;0x01100000 0x00f00000&gt;;</div><div class='add'>+			label = "NAND (RW) Writable User area";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	L2switch@2,0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "vitesse-7385";</div><div class='add'>+		reg = &lt;0x2 0x0 0x20000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;board_soc {</div><div class='add'>+	i2c@3000 {</div><div class='add'>+		rtc@68 {</div><div class='add'>+			compatible = "dallas,ds1339";</div><div class='add'>+			reg = &lt;0x68&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	spi@7000 {</div><div class='add'>+		flash@0 {</div><div class='add'>+			#address-cells = &lt;1&gt;;</div><div class='add'>+			#size-cells = &lt;1&gt;;</div><div class='add'>+			compatible = "spansion,s25sl12801";</div><div class='add'>+			reg = &lt;0&gt;;</div><div class='add'>+			spi-max-frequency = &lt;40000000&gt;; /* input clock */</div><div class='add'>+</div><div class='add'>+			partition@u-boot {</div><div class='add'>+				/* 512KB for u-boot Bootloader Image */</div><div class='add'>+				reg = &lt;0x0 0x00080000&gt;;</div><div class='add'>+				label = "u-boot";</div><div class='add'>+				read-only;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			partition@dtb {</div><div class='add'>+				/* 512KB for DTB Image */</div><div class='add'>+				reg = &lt;0x00080000 0x00080000&gt;;</div><div class='add'>+				label = "dtb";</div><div class='add'>+				read-only;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			partition@kernel {</div><div class='add'>+				/* 4MB for Linux Kernel Image */</div><div class='add'>+				reg = &lt;0x00100000 0x00400000&gt;;</div><div class='add'>+				label = "kernel";</div><div class='add'>+				read-only;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			partition@fs {</div><div class='add'>+				/* 4MB for Compressed RFS Image */</div><div class='add'>+				reg = &lt;0x00500000 0x00400000&gt;;</div><div class='add'>+				label = "file system";</div><div class='add'>+				read-only;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			partition@jffs-fs {</div><div class='add'>+				/* 7MB for JFFS2 based RFS */</div><div class='add'>+				reg = &lt;0x00900000 0x00700000&gt;;</div><div class='add'>+				label = "file system jffs2";</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	usb@22000 {</div><div class='add'>+		phy_type = "ulpi";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* USB2 is shared with localbus, so it must be disabled</div><div class='add'>+	   by default. We can't put 'status = "disabled";' here</div><div class='add'>+	   since U-Boot doesn't clear the status property when</div><div class='add'>+	   it enables USB2. OTOH, U-Boot does create a new node</div><div class='add'>+	   when there isn't any. So, just comment it out.</div><div class='add'>+	usb@23000 {</div><div class='add'>+		phy_type = "ulpi";</div><div class='add'>+	};</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	mdio@24000 {</div><div class='add'>+		phy0: ethernet-phy@0 {</div><div class='add'>+			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+			interrupts = &lt;3 1&gt;;</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		phy1: ethernet-phy@1 {</div><div class='add'>+			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+			interrupts = &lt;2 1&gt;;</div><div class='add'>+			reg = &lt;0x1&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		tbi-phy@2 {</div><div class='add'>+			device_type = "tbi-phy";</div><div class='add'>+			reg = &lt;0x2&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio@25000 {</div><div class='add'>+		tbi0: tbi-phy@11 {</div><div class='add'>+			reg = &lt;0x11&gt;;</div><div class='add'>+			device_type = "tbi-phy";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	enet0: ethernet@b0000 {</div><div class='add'>+		fixed-link = &lt;1 1 1000 0 0&gt;;</div><div class='add'>+		phy-connection-type = "rgmii-id";</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	enet1: ethernet@b1000 {</div><div class='add'>+		phy-handle = &lt;&amp;phy0&gt;;</div><div class='add'>+		tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='add'>+		phy-connection-type = "sgmii";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	enet2: ethernet@b2000 {</div><div class='add'>+		phy-handle = &lt;&amp;phy1&gt;;</div><div class='add'>+		phy-connection-type = "rgmii-id";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p1020rdb_36b.dts b/arch/powerpc/boot/dts/p1020rdb_36b.dts<br/>new file mode 100644<br/>index 000000000000..bdbdb6097e57<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1020rdb_36b.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p1020rdb_36b.dts</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+/*</div><div class='add'>+ * P1020 RDB Device Tree Source (36-bit address map)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2009-2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/include/ "fsl/p1020si-pre.dtsi"</div><div class='add'>+/ {</div><div class='add'>+	model = "fsl,P1020RDB";</div><div class='add'>+	compatible = "fsl,P1020RDB";</div><div class='add'>+</div><div class='add'>+	memory {</div><div class='add'>+		device_type = "memory";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	board_lbc: lbc: localbus@fffe05000 {</div><div class='add'>+		reg = &lt;0xf 0xffe05000 0 0x1000&gt;;</div><div class='add'>+</div><div class='add'>+		/* NOR, NAND Flashes and Vitesse 5 port L2 switch */</div><div class='add'>+		ranges = &lt;0x0 0x0 0xf 0xef000000 0x01000000</div><div class='add'>+			  0x1 0x0 0xf 0xffa00000 0x00040000</div><div class='add'>+			  0x2 0x0 0xf 0xffb00000 0x00020000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	board_soc: soc: soc@fffe00000 {</div><div class='add'>+		ranges = &lt;0x0 0xf 0xffe00000 0x100000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pci0: pcie@fffe09000 {</div><div class='add'>+		reg = &lt;0xf 0xffe09000 0 0x1000&gt;;</div><div class='add'>+		ranges = &lt;0x2000000 0x0 0xc0000000 0xc 0x20000000 0x0 0x20000000</div><div class='add'>+			  0x1000000 0x0 0x00000000 0xf 0xffc10000 0x0 0x10000&gt;;</div><div class='add'>+		pcie@0 {</div><div class='add'>+			ranges = &lt;0x2000000 0x0 0xc0000000</div><div class='add'>+				  0x2000000 0x0 0xc0000000</div><div class='add'>+				  0x0 0x20000000</div><div class='add'>+</div><div class='add'>+				  0x1000000 0x0 0x0</div><div class='add'>+				  0x1000000 0x0 0x0</div><div class='add'>+				  0x0 0x100000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pci1: pcie@fffe0a000 {</div><div class='add'>+		reg = &lt;0xf 0xffe0a000 0 0x1000&gt;;</div><div class='add'>+		ranges = &lt;0x2000000 0x0 0x80000000 0xc 0x00000000 0x0 0x20000000</div><div class='add'>+			  0x1000000 0x0 0x00000000 0xf 0xffc00000 0x0 0x10000&gt;;</div><div class='add'>+		pcie@0 {</div><div class='add'>+			ranges = &lt;0x2000000 0x0 0x80000000</div><div class='add'>+				  0x2000000 0x0 0x80000000</div><div class='add'>+				  0x0 0x20000000</div><div class='add'>+</div><div class='add'>+				  0x1000000 0x0 0x0</div><div class='add'>+				  0x1000000 0x0 0x0</div><div class='add'>+				  0x0 0x100000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/include/ "p1020rdb.dtsi"</div><div class='add'>+/include/ "fsl/p1020si-post.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p1020rdb_camp_core0.dts b/arch/powerpc/boot/dts/p1020rdb_camp_core0.dts<br/>index f0bf7f42f097..41b4585c5da8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1020rdb_camp_core0.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1020rdb_camp_core0.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1020rdb_camp_core0.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p1020rdb_camp_core0.dts</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "p1020si.dtsi"</div><div class='add'>+/include/ "p1020rdb.dts"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,P1020RDB";</div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='ctx'> 		PowerPC,P1020@1 {</div><div class='del'>-		status = "disabled";</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -45,169 +45,19 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	soc@ffe00000 {</div><div class='del'>-		i2c@3000 {</div><div class='del'>-			rtc@68 {</div><div class='del'>-				compatible = "dallas,ds1339";</div><div class='del'>-				reg = &lt;0x68&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		spi@7000 {</div><div class='del'>-			fsl_m25p80@0 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "fsl,espi-flash";</div><div class='del'>-				reg = &lt;0&gt;;</div><div class='del'>-				linux,modalias = "fsl_m25p80";</div><div class='del'>-				spi-max-frequency = &lt;40000000&gt;;</div><div class='del'>-</div><div class='del'>-				partition@0 {</div><div class='del'>-					/* 512KB for u-boot Bootloader Image */</div><div class='del'>-					reg = &lt;0x0 0x00080000&gt;;</div><div class='del'>-					label = "SPI (RO) U-Boot Image";</div><div class='del'>-					read-only;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				partition@80000 {</div><div class='del'>-					/* 512KB for DTB Image */</div><div class='del'>-					reg = &lt;0x00080000 0x00080000&gt;;</div><div class='del'>-					label = "SPI (RO) DTB Image";</div><div class='del'>-					read-only;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				partition@100000 {</div><div class='del'>-					/* 4MB for Linux Kernel Image */</div><div class='del'>-					reg = &lt;0x00100000 0x00400000&gt;;</div><div class='del'>-					label = "SPI (RO) Linux Kernel Image";</div><div class='del'>-					read-only;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				partition@500000 {</div><div class='del'>-					/* 4MB for Compressed RFS Image */</div><div class='del'>-					reg = &lt;0x00500000 0x00400000&gt;;</div><div class='del'>-					label = "SPI (RO) Compressed RFS Image";</div><div class='del'>-					read-only;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				partition@900000 {</div><div class='del'>-					/* 7MB for JFFS2 based RFS */</div><div class='del'>-					reg = &lt;0x00900000 0x00700000&gt;;</div><div class='del'>-					label = "SPI (RW) JFFS2 RFS";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@24000 {</div><div class='del'>-			phy0: ethernet-phy@0 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;3 1&gt;;</div><div class='del'>-				reg = &lt;0x0&gt;;</div><div class='del'>-			};</div><div class='del'>-			phy1: ethernet-phy@1 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;2 1&gt;;</div><div class='del'>-				reg = &lt;0x1&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@25000 {</div><div class='del'>-			tbi0: tbi-phy@11 {</div><div class='del'>-				reg = &lt;0x11&gt;;</div><div class='del'>-				device_type = "tbi-phy";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		enet0: ethernet@b0000 {</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		enet1: ethernet@b1000 {</div><div class='del'>-			phy-handle = &lt;&amp;phy0&gt;;</div><div class='del'>-			tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='del'>-			phy-connection-type = "sgmii";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet2: ethernet@b2000 {</div><div class='del'>-			phy-handle = &lt;&amp;phy1&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb@22000 {</div><div class='del'>-			phy_type = "ulpi";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* USB2 is shared with localbus, so it must be disabled</div><div class='del'>-		   by default. We can't put 'status = "disabled";' here</div><div class='del'>-		   since U-Boot doesn't clear the status property when</div><div class='del'>-		   it enables USB2. OTOH, U-Boot does create a new node</div><div class='del'>-		   when there isn't any. So, just comment it out.</div><div class='del'>-		usb@23000 {</div><div class='del'>-			phy_type = "ulpi";</div><div class='del'>-		};</div><div class='del'>-		*/</div><div class='del'>-</div><div class='ctx'> 		mpic: pic@40000 {</div><div class='ctx'> 			protected-sources = &lt;</div><div class='ctx'> 			42 29 30 34	/* serial1, enet0-queue-group0 */</div><div class='ctx'> 			17 18 24 45	/* enet0-queue-group1, crypto */</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci0: pcie@ffe09000 {</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000</div><div class='del'>-			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x4 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x5 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x6 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x7 0x1</div><div class='del'>-			&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			ranges = &lt;0x2000000 0x0 0xa0000000</div><div class='del'>-				  0x2000000 0x0 0xa0000000</div><div class='del'>-				  0x0 0x20000000</div><div class='del'>-</div><div class='del'>-				  0x1000000 0x0 0x0</div><div class='del'>-				  0x1000000 0x0 0x0</div><div class='del'>-				  0x0 0x100000&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci1: pcie@ffe0a000 {</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000</div><div class='del'>-			  0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1</div><div class='del'>-			&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			ranges = &lt;0x2000000 0x0 0x80000000</div><div class='del'>-				  0x2000000 0x0 0x80000000</div><div class='del'>-				  0x0 0x20000000</div><div class='del'>-</div><div class='del'>-				  0x1000000 0x0 0x0</div><div class='del'>-				  0x1000000 0x0 0x0</div><div class='del'>-				  0x0 0x100000&gt;;</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p1020rdb_camp_core1.dts b/arch/powerpc/boot/dts/p1020rdb_camp_core1.dts<br/>index 6ec02204a44e..517453821884 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1020rdb_camp_core1.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1020rdb_camp_core1.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1020rdb_camp_core1.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p1020rdb_camp_core1.dts</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "p1020si.dtsi"</div><div class='add'>+/include/ "p1020rdb.dts"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,P1020RDB";</div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> </div><div class='ctx'> 	cpus {</div><div class='ctx'> 		PowerPC,P1020@0 {</div><div class='del'>-		status = "disabled";</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -85,12 +85,6 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		enet0: ethernet@b0000 {</div><div class='del'>-			fixed-link = &lt;1 1 1000 0 0&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		enet1: ethernet@b1000 {</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -135,7 +129,6 @@</div><div class='ctx'> 		global-utilities@e0000 {	//global utilities block</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci0: pcie@ffe09000 {</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p1020si.dtsi b/arch/powerpc/boot/dts/p1020si.dtsi<br/>deleted file mode 100644<br/>index 5c5acb66c3fc..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1020si.dtsi?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1020si.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,377 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * P1020si Device Tree Source</div><div class='del'>- *</div><div class='del'>- * Copyright 2011 Freescale Semiconductor Inc.</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='del'>-/dts-v1/;</div><div class='del'>-/ {</div><div class='del'>-	compatible = "fsl,P1020";</div><div class='del'>-	#address-cells = &lt;2&gt;;</div><div class='del'>-	#size-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-	cpus {</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'>-		PowerPC,P1020@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		PowerPC,P1020@1 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x1&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	localbus@ffe05000 {</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		compatible = "fsl,p1020-elbc", "fsl,elbc", "simple-bus";</div><div class='del'>-		reg = &lt;0 0xffe05000 0 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;19 2&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	soc@ffe00000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "fsl,p1020-immr", "simple-bus";</div><div class='del'>-		ranges = &lt;0x0  0x0 0xffe00000 0x100000&gt;;</div><div class='del'>-		bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='del'>-</div><div class='del'>-		ecm-law@0 {</div><div class='del'>-			compatible = "fsl,ecm-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;12&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ecm@1000 {</div><div class='del'>-			compatible = "fsl,p1020-ecm", "fsl,ecm";</div><div class='del'>-			reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		memory-controller@2000 {</div><div class='del'>-			compatible = "fsl,p1020-memory-controller";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@3000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@3100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial0: serial@4500 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial1: serial@4600 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi@7000 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,espi";</div><div class='del'>-			reg = &lt;0x7000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;59 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			mode = "cpu";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpio: gpio-controller@f000 {</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-			compatible = "fsl,mpc8572-gpio";</div><div class='del'>-			reg = &lt;0xf000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;47 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			gpio-controller;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		L2: l2-cache-controller@20000 {</div><div class='del'>-			compatible = "fsl,p1020-l2-cache-controller";</div><div class='del'>-			reg = &lt;0x20000 0x1000&gt;;</div><div class='del'>-			cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			cache-size = &lt;0x40000&gt;; // L2,256K</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma@21300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x21300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x21100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;20 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;21 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;22 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;23 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@24000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,etsec2-mdio";</div><div class='del'>-			reg = &lt;0x24000 0x1000 0xb0030 0x4&gt;;</div><div class='del'>-</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@25000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,etsec2-tbi";</div><div class='del'>-			reg = &lt;0x25000 0x1000 0xb1030 0x4&gt;;</div><div class='del'>-</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet0: ethernet@b0000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "fsl,etsec2";</div><div class='del'>-			fsl,num_rx_queues = &lt;0x8&gt;;</div><div class='del'>-			fsl,num_tx_queues = &lt;0x8&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-</div><div class='del'>-			queue-group@0 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xb0000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;29 2 30 2 34 2&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			queue-group@1 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xb4000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;17 2 18 2 24 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet1: ethernet@b1000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "fsl,etsec2";</div><div class='del'>-			fsl,num_rx_queues = &lt;0x8&gt;;</div><div class='del'>-			fsl,num_tx_queues = &lt;0x8&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-</div><div class='del'>-			queue-group@0 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xb1000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;35 2 36 2 40 2&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			queue-group@1 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xb5000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;51 2 52 2 67 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet2: ethernet@b2000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "fsl,etsec2";</div><div class='del'>-			fsl,num_rx_queues = &lt;0x8&gt;;</div><div class='del'>-			fsl,num_tx_queues = &lt;0x8&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-</div><div class='del'>-			queue-group@0 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xb2000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;31 2 32 2 33 2&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			queue-group@1 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xb6000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;25 2 26 2 27 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb@22000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-usb2-dr";</div><div class='del'>-			reg = &lt;0x22000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;28 0x2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* USB2 is shared with localbus, so it must be disabled</div><div class='del'>-		   by default. We can't put 'status = "disabled";' here</div><div class='del'>-		   since U-Boot doesn't clear the status property when</div><div class='del'>-		   it enables USB2. OTOH, U-Boot does create a new node</div><div class='del'>-		   when there isn't any. So, just comment it out.</div><div class='del'>-		usb@23000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-usb2-dr";</div><div class='del'>-			reg = &lt;0x23000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;46 0x2&gt;;</div><div class='del'>-			phy_type = "ulpi";</div><div class='del'>-		};</div><div class='del'>-		*/</div><div class='del'>-</div><div class='del'>-		sdhci@2e000 {</div><div class='del'>-			compatible = "fsl,p1020-esdhc", "fsl,esdhc";</div><div class='del'>-			reg = &lt;0x2e000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;72 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			/* Filled in by U-Boot */</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		crypto@30000 {</div><div class='del'>-			compatible = "fsl,sec3.1", "fsl,sec3.0", "fsl,sec2.4",</div><div class='del'>-				     "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";</div><div class='del'>-			reg = &lt;0x30000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;45 2 58 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			fsl,num-channels = &lt;4&gt;;</div><div class='del'>-			fsl,channel-fifo-len = &lt;24&gt;;</div><div class='del'>-			fsl,exec-units-mask = &lt;0xbfe&gt;;</div><div class='del'>-			fsl,descriptor-types-mask = &lt;0x3ab0ebf&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi@41600 {</div><div class='del'>-			compatible = "fsl,p1020-msi", "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x80&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0</div><div class='del'>-				0xe1 0</div><div class='del'>-				0xe2 0</div><div class='del'>-				0xe3 0</div><div class='del'>-				0xe4 0</div><div class='del'>-				0xe5 0</div><div class='del'>-				0xe6 0</div><div class='del'>-				0xe7 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		global-utilities@e0000 {	//global utilities block</div><div class='del'>-			compatible = "fsl,p1020-guts","fsl,p2020-guts";</div><div class='del'>-			reg = &lt;0xe0000 0x1000&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci0: pcie@ffe09000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0 0xffe09000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;16 2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci1: pcie@ffe0a000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0 0xffe0a000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;16 2&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p1021mds.dts b/arch/powerpc/boot/dts/p1021mds.dts<br/>index ad5b85269004..d9540791e434 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1021mds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1021mds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1021mds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p1021mds.dts</a></div><div class='hunk'>@@ -9,53 +9,22 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/dts-v1/;</div><div class='add'>+/include/ "fsl/p1021si-pre.dtsi"</div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,P1021";</div><div class='ctx'> 	compatible = "fsl,P1021MDS";</div><div class='del'>-	#address-cells = &lt;2&gt;;</div><div class='del'>-	#size-cells = &lt;2&gt;;</div><div class='ctx'> </div><div class='ctx'> 	aliases {</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		serial1 = &amp;serial1;</div><div class='del'>-		ethernet0 = &amp;enet0;</div><div class='del'>-		ethernet1 = &amp;enet1;</div><div class='del'>-		ethernet2 = &amp;enet2;</div><div class='ctx'> 		ethernet3 = &amp;enet3;</div><div class='ctx'> 		ethernet4 = &amp;enet4;</div><div class='del'>-		pci0 = &amp;pci0;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cpus {</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'>-		PowerPC,P1021@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		PowerPC,P1021@1 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x1&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	localbus@ffe05000 {</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		compatible = "fsl,p1021-elbc", "fsl,elbc", "simple-bus";</div><div class='del'>-		reg = &lt;0 0xffe05000 0 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;19 2&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+	lbc: localbus@ffe05000 {</div><div class='add'>+		reg = &lt;0x0 0xffe05000 0x0 0x1000&gt;;</div><div class='ctx'> </div><div class='ctx'> 		/* NAND Flash, BCSR, PMC0/1*/</div><div class='ctx'> 		ranges = &lt;0x0 0x0 0x0 0xfc000000 0x02000000</div><div class='hunk'>@@ -138,99 +107,26 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc@ffe00000 {</div><div class='del'>-</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='add'>+	soc: soc@ffe00000 {</div><div class='ctx'> 		compatible = "fsl,p1021-immr", "simple-bus";</div><div class='del'>-		ranges = &lt;0x0  0x0 0xffe00000 0x100000&gt;;</div><div class='del'>-		bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='del'>-</div><div class='del'>-		ecm-law@0 {</div><div class='del'>-			compatible = "fsl,ecm-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;12&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ecm@1000 {</div><div class='del'>-			compatible = "fsl,p1021-ecm", "fsl,ecm";</div><div class='del'>-			reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		memory-controller@2000 {</div><div class='del'>-			compatible = "fsl,p1021-memory-controller";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-		};</div><div class='add'>+		ranges = &lt;0x0 0x0 0xffe00000 0x100000&gt;;</div><div class='ctx'> </div><div class='ctx'> 		i2c@3000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='ctx'> 			rtc@68 {</div><div class='ctx'> 				compatible = "dallas,ds1374";</div><div class='ctx'> 				reg = &lt;0x68&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		i2c@3100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial0: serial@4500 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial1: serial@4600 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		spi@7000 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,espi";</div><div class='del'>-			reg = &lt;0x7000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;59 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			espi,num-ss-bits = &lt;4&gt;;</div><div class='del'>-			mode = "cpu";</div><div class='del'>-</div><div class='del'>-			fsl_m25p80@0 {</div><div class='add'>+</div><div class='add'>+			flash@0 {</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "fsl,espi-flash";</div><div class='add'>+				compatible = "spansion,s25sl12801";</div><div class='ctx'> 				reg = &lt;0&gt;;</div><div class='del'>-				linux,modalias = "fsl_m25p80";</div><div class='ctx'> 				spi-max-frequency = &lt;40000000&gt;; /* input clock */</div><div class='add'>+</div><div class='ctx'> 				partition@u-boot {</div><div class='ctx'> 					label = "u-boot-spi";</div><div class='ctx'> 					reg = &lt;0x00000000 0x00100000&gt;;</div><div class='hunk'>@@ -253,237 +149,49 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		gpio: gpio-controller@f000 {</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-			compatible = "fsl,mpc8572-gpio";</div><div class='del'>-			reg = &lt;0xf000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;47 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			gpio-controller;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		L2: l2-cache-controller@20000 {</div><div class='del'>-			compatible = "fsl,p1021-l2-cache-controller";</div><div class='del'>-			reg = &lt;0x20000 0x1000&gt;;</div><div class='del'>-			cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			cache-size = &lt;0x40000&gt;; // L2,256K</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma@21300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x21300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x21100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;20 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;21 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;22 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;23 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		usb@22000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-usb2-dr";</div><div class='del'>-			reg = &lt;0x22000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;28 0x2&gt;;</div><div class='ctx'> 			phy_type = "ulpi";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		 mdio@24000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,etsec2-mdio";</div><div class='del'>-			reg = &lt;0x24000 0x1000 0xb0030 0x4&gt;;</div><div class='del'>-</div><div class='add'>+		mdio@24000 {</div><div class='ctx'> 			phy0: ethernet-phy@0 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;1 1&gt;;</div><div class='add'>+				interrupts = &lt;1 1 0 0&gt;;</div><div class='ctx'> 				reg = &lt;0x0&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			phy1: ethernet-phy@1 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;2 1&gt;;</div><div class='add'>+				interrupts = &lt;2 1 0 0&gt;;</div><div class='ctx'> 				reg = &lt;0x1&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 			phy4: ethernet-phy@4 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> 				reg = &lt;0x4&gt;;</div><div class='ctx'> 			};</div><div class='add'>+			tbi-phy@5 {</div><div class='add'>+				device_type = "tbi-phy";</div><div class='add'>+				reg = &lt;0x5&gt;;</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		mdio@25000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,etsec2-tbi";</div><div class='del'>-			reg = &lt;0x25000 0x1000 0xb1030 0x4&gt;;</div><div class='ctx'> 			tbi0: tbi-phy@11 {</div><div class='ctx'> 				reg = &lt;0x11&gt;;</div><div class='ctx'> 				device_type = "tbi-phy";</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		enet0: ethernet@B0000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "fsl,etsec2";</div><div class='del'>-			fsl,num_rx_queues = &lt;0x8&gt;;</div><div class='del'>-			fsl,num_tx_queues = &lt;0x8&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+		ethernet@b0000 {</div><div class='ctx'> 			phy-handle = &lt;&amp;phy0&gt;;</div><div class='ctx'> 			phy-connection-type = "rgmii-id";</div><div class='del'>-			queue-group@0{</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xB0000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;29 2 30 2 34 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			queue-group@1{</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xB4000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;17 2 18 2 24 2&gt;;</div><div class='del'>-			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		enet1: ethernet@B1000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "fsl,etsec2";</div><div class='del'>-			fsl,num_rx_queues = &lt;0x8&gt;;</div><div class='del'>-			fsl,num_tx_queues = &lt;0x8&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+		ethernet@b1000 {</div><div class='ctx'> 			phy-handle = &lt;&amp;phy4&gt;;</div><div class='ctx'> 			tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='ctx'> 			phy-connection-type = "sgmii";</div><div class='del'>-			queue-group@0{</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xB1000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;35 2 36 2 40 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			queue-group@1{</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xB5000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;51 2 52 2 67 2&gt;;</div><div class='del'>-			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		enet2: ethernet@B2000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "fsl,etsec2";</div><div class='del'>-			fsl,num_rx_queues = &lt;0x8&gt;;</div><div class='del'>-			fsl,num_tx_queues = &lt;0x8&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+		ethernet@b2000 {</div><div class='ctx'> 			phy-handle = &lt;&amp;phy1&gt;;</div><div class='ctx'> 			phy-connection-type = "rgmii-id";</div><div class='del'>-			queue-group@0{</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xB2000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;31 2 32 2 33 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			queue-group@1{</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xB6000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;25 2 26 2 27 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sdhci@2e000 {</div><div class='del'>-			compatible = "fsl,p1021-esdhc", "fsl,esdhc";</div><div class='del'>-			reg = &lt;0x2e000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;72 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			/* Filled in by U-Boot */</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		crypto@30000 {</div><div class='del'>-			compatible = "fsl,sec3.3", "fsl,sec3.1",</div><div class='del'>-				     "fsl,sec3.0", "fsl,sec2.4",</div><div class='del'>-				     "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";</div><div class='del'>-			reg = &lt;0x30000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;45 2 58 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			fsl,num-channels = &lt;4&gt;;</div><div class='del'>-			fsl,channel-fifo-len = &lt;24&gt;;</div><div class='del'>-			fsl,exec-units-mask = &lt;0x97c&gt;;</div><div class='del'>-			fsl,descriptor-types-mask = &lt;0x3a30abf&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi@41600 {</div><div class='del'>-			compatible = "fsl,p1021-msi", "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x80&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0</div><div class='del'>-				0xe1 0</div><div class='del'>-				0xe2 0</div><div class='del'>-				0xe3 0</div><div class='del'>-				0xe4 0</div><div class='del'>-				0xe5 0</div><div class='del'>-				0xe6 0</div><div class='del'>-				0xe7 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		global-utilities@e0000 {	//global utilities block</div><div class='del'>-			compatible = "fsl,p1021-guts";</div><div class='del'>-			reg = &lt;0xe0000 0x1000&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		par_io@e0100 {</div><div class='hunk'>@@ -499,8 +207,7 @@</div><div class='ctx'> 					0x1  0x13 0x1  0x0  0x1  0x0    /* QE_MUX_MDC */</div><div class='ctx'> 					0x1  0x14 0x3  0x0  0x1  0x0    /* QE_MUX_MDIO */</div><div class='ctx'> 					0x0  0x17 0x2  0x0  0x2  0x0    /* CLK12 */</div><div class='del'>-					0x0  0x18 0x2  0x0  0x1  0x0    /* CLK9</div><div class='del'>-*/</div><div class='add'>+					0x0  0x18 0x2  0x0  0x1  0x0    /* CLK9 */</div><div class='ctx'> 					0x0  0x7  0x1  0x0  0x2  0x0    /* ENET1_TXD0_SER1_TXD0 */</div><div class='ctx'> 					0x0  0x9  0x1  0x0  0x2  0x0    /* ENET1_TXD1_SER1_TXD1 */</div><div class='ctx'> 					0x0  0xb  0x1  0x0  0x2  0x0    /* ENET1_TXD2_SER1_TXD2 */</div><div class='hunk'>@@ -535,31 +242,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci0: pcie@ffe09000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt;0 0xffe09000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;16 2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0 0 1 &amp;mpic 4 1</div><div class='del'>-			0000 0 0 2 &amp;mpic 5 1</div><div class='del'>-			0000 0 0 3 &amp;mpic 6 1</div><div class='del'>-			0000 0 0 4 &amp;mpic 7 1</div><div class='del'>-			&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -571,31 +257,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci1: pcie@ffe0a000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt;0 0xffe0a000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x10000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;16 2&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0 0 1 &amp;mpic 0 1</div><div class='del'>-			0000 0 0 2 &amp;mpic 1 1</div><div class='del'>-			0000 0 0 3 &amp;mpic 2 1</div><div class='del'>-			0000 0 0 4 &amp;mpic 3 1</div><div class='del'>-			&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xc0000000</div><div class='ctx'> 				  0x2000000 0x0 0xc0000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -606,36 +271,16 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	qe@ffe80000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "qe";</div><div class='del'>-		compatible = "fsl,qe";</div><div class='add'>+	qe: qe@ffe80000 {</div><div class='ctx'> 		ranges = &lt;0x0 0x0 0xffe80000 0x40000&gt;;</div><div class='ctx'> 		reg = &lt;0 0xffe80000 0 0x480&gt;;</div><div class='ctx'> 		brg-frequency = &lt;0&gt;;</div><div class='ctx'> 		bus-frequency = &lt;0&gt;;</div><div class='del'>-		fsl,qe-num-riscs = &lt;1&gt;;</div><div class='del'>-		fsl,qe-num-snums = &lt;28&gt;;</div><div class='ctx'> 		status = "disabled"; /* no firmware loaded */</div><div class='ctx'> </div><div class='del'>-		qeic: interrupt-controller@80 {</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			compatible = "fsl,qe-ic";</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			reg = &lt;0x80 0x80&gt;;</div><div class='del'>-			interrupts = &lt;63 2 60 2&gt;; //high:47 low:44</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		enet3: ucc@2000 {</div><div class='ctx'> 			device_type = "network";</div><div class='ctx'> 			compatible = "ucc_geth";</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			reg = &lt;0x2000 0x200&gt;;</div><div class='del'>-			interrupts = &lt;32&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='ctx'> 			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='ctx'> 			rx-clock-name = "clk12";</div><div class='ctx'> 			tx-clock-name = "clk9";</div><div class='hunk'>@@ -645,20 +290,15 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		mdio@2120 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			reg = &lt;0x2120 0x18&gt;;</div><div class='del'>-			compatible = "fsl,ucc-mdio";</div><div class='del'>-</div><div class='ctx'> 			qe_phy0: ethernet-phy@0 {</div><div class='ctx'> 				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;4 1&gt;;</div><div class='add'>+				interrupts = &lt;4 1 0 0&gt;;</div><div class='ctx'> 				reg = &lt;0x0&gt;;</div><div class='ctx'> 				device_type = "ethernet-phy";</div><div class='ctx'> 			};</div><div class='ctx'> 			qe_phy1: ethernet-phy@03 {</div><div class='ctx'> 				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;5 1&gt;;</div><div class='add'>+				interrupts = &lt;5 1 0 0&gt;;</div><div class='ctx'> 				reg = &lt;0x3&gt;;</div><div class='ctx'> 				device_type = "ethernet-phy";</div><div class='ctx'> 			};</div><div class='hunk'>@@ -671,10 +311,6 @@</div><div class='ctx'> 		enet4: ucc@2400 {</div><div class='ctx'> 			device_type = "network";</div><div class='ctx'> 			compatible = "ucc_geth";</div><div class='del'>-			cell-index = &lt;5&gt;;</div><div class='del'>-			reg = &lt;0x2400 0x200&gt;;</div><div class='del'>-			interrupts = &lt;40&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;qeic&gt;;</div><div class='ctx'> 			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='ctx'> 			rx-clock-name = "none";</div><div class='ctx'> 			tx-clock-name = "clk13";</div><div class='hunk'>@@ -682,18 +318,7 @@</div><div class='ctx'> 			phy-handle = &lt;&amp;qe_phy1&gt;;</div><div class='ctx'> 			phy-connection-type = "rmii";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		muram@10000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,qe-muram", "fsl,cpm-muram";</div><div class='del'>-			ranges = &lt;0x0 0x10000 0x6000&gt;;</div><div class='del'>-</div><div class='del'>-			data-only@0 {</div><div class='del'>-				compatible = "fsl,qe-muram-data",</div><div class='del'>-				"fsl,cpm-muram-data";</div><div class='del'>-				reg = &lt;0x0 0x6000&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "fsl/p1021si-post.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p1022ds.dts b/arch/powerpc/boot/dts/p1022ds.dts<br/>index b9b8719a6204..ef95717db4bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1022ds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1022ds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1022ds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p1022ds.dts</a></div><div class='hunk'>@@ -8,57 +8,36 @@</div><div class='ctx'>  * kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/dts-v1/;</div><div class='add'>+/include/ "fsl/p1022si-pre.dtsi"</div><div class='ctx'> / {</div><div class='del'>-	model = "fsl,P1022";</div><div class='add'>+	model = "fsl,P1022DS";</div><div class='ctx'> 	compatible = "fsl,P1022DS";</div><div class='del'>-	#address-cells = &lt;2&gt;;</div><div class='del'>-	#size-cells = &lt;2&gt;;</div><div class='del'>-	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		ethernet0 = &amp;enet0;</div><div class='del'>-		ethernet1 = &amp;enet1;</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		serial1 = &amp;serial1;</div><div class='del'>-		pci0 = &amp;pci0;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-		pci2 = &amp;pci2;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cpus {</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'>-		PowerPC,P1022@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		PowerPC,P1022@1 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x1&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	localbus@fffe05000 {</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		compatible = "fsl,p1022-elbc", "fsl,elbc", "simple-bus";</div><div class='del'>-		reg = &lt;0 0xffe05000 0 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;19 2 0 0&gt;;</div><div class='del'>-</div><div class='add'>+	lbc: localbus@fffe05000 {</div><div class='add'>+		reg = &lt;0xf 0xffe05000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x0 0x0 0xf 0xe8000000 0x08000000</div><div class='ctx'> 			  0x1 0x0 0xf 0xe0000000 0x08000000</div><div class='del'>-			  0x2 0x0 0x0 0xffa00000 0x00040000</div><div class='add'>+			  0x2 0x0 0xf 0xff800000 0x00040000</div><div class='ctx'> 			  0x3 0x0 0xf 0xffdf0000 0x00008000&gt;;</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * This node is used to access the pixis via "indirect" mode,</div><div class='add'>+		 * which is done by writing the pixis register index to chip</div><div class='add'>+		 * select 0 and the value to/from chip select 1.  Indirect</div><div class='add'>+		 * mode is the only way to access the pixis when DIU video</div><div class='add'>+		 * is enabled.  Note that this assumes that the first column</div><div class='add'>+		 * of the 'ranges' property above is the chip select number.</div><div class='add'>+		 */</div><div class='add'>+		board-control@0,0 {</div><div class='add'>+			compatible = "fsl,p1022ds-indirect-pixis";</div><div class='add'>+			reg = &lt;0x0 0x0 1	/* CS0 */</div><div class='add'>+			       0x1 0x0 1&gt;;	/* CS1 */</div><div class='add'>+		};</div><div class='add'>+</div><div class='ctx'> 		nor@0,0 {</div><div class='ctx'> 			#address-cells = &lt;1&gt;;</div><div class='ctx'> 			#size-cells = &lt;1&gt;;</div><div class='hunk'>@@ -161,51 +140,10 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc@fffe00000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "fsl,p1022-immr", "simple-bus";</div><div class='add'>+	soc: soc@fffe00000 {</div><div class='ctx'> 		ranges = &lt;0x0 0xf 0xffe00000 0x100000&gt;;</div><div class='del'>-		bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='del'>-</div><div class='del'>-		ecm-law@0 {</div><div class='del'>-			compatible = "fsl,ecm-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;12&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ecm@1000 {</div><div class='del'>-			compatible = "fsl,p1022-ecm", "fsl,ecm";</div><div class='del'>-			reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		memory-controller@2000 {</div><div class='del'>-			compatible = "fsl,p1022-memory-controller";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@3000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='ctx'> </div><div class='ctx'> 		i2c@3100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-</div><div class='ctx'> 			wm8776:codec@1a {</div><div class='ctx'> 				compatible = "wlf,wm8776";</div><div class='ctx'> 				reg = &lt;0x1a&gt;;</div><div class='hunk'>@@ -216,41 +154,14 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		serial0: serial@4500 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial1: serial@4600 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		spi@7000 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,espi";</div><div class='del'>-			reg = &lt;0x7000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;59 0x2 0 0&gt;;</div><div class='del'>-			espi,num-ss-bits = &lt;4&gt;;</div><div class='del'>-			mode = "cpu";</div><div class='del'>-</div><div class='del'>-			fsl_m25p80@0 {</div><div class='add'>+			flash@0 {</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "fsl,espi-flash";</div><div class='add'>+				compatible = "spansion,s25sl12801";</div><div class='ctx'> 				reg = &lt;0&gt;;</div><div class='del'>-				linux,modalias = "fsl_m25p80";</div><div class='ctx'> 				spi-max-frequency = &lt;40000000&gt;; /* input clock */</div><div class='add'>+</div><div class='ctx'> 				partition@0 {</div><div class='ctx'> 					label = "u-boot-spi";</div><div class='ctx'> 					reg = &lt;0x00000000 0x00100000&gt;;</div><div class='hunk'>@@ -274,115 +185,20 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		ssi@15000 {</div><div class='del'>-			compatible = "fsl,mpc8610-ssi";</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			reg = &lt;0x15000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;75 2 0 0&gt;;</div><div class='ctx'> 			fsl,mode = "i2s-slave";</div><div class='ctx'> 			codec-handle = &lt;&amp;wm8776&gt;;</div><div class='del'>-			fsl,playback-dma = &lt;&amp;dma00&gt;;</div><div class='del'>-			fsl,capture-dma = &lt;&amp;dma01&gt;;</div><div class='del'>-			fsl,fifo-depth = &lt;15&gt;;</div><div class='ctx'> 			fsl,ssi-asynchronous;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		dma@c300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0xc300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0xc100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			dma00: dma-channel@0 {</div><div class='del'>-				compatible = "fsl,ssi-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupts = &lt;76 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma01: dma-channel@80 {</div><div class='del'>-				compatible = "fsl,ssi-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupts = &lt;77 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupts = &lt;78 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupts = &lt;79 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpio: gpio-controller@f000 {</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-			compatible = "fsl,mpc8572-gpio";</div><div class='del'>-			reg = &lt;0xf000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;47 0x2 0 0&gt;;</div><div class='del'>-			gpio-controller;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		L2: l2-cache-controller@20000 {</div><div class='del'>-			compatible = "fsl,p1022-l2-cache-controller";</div><div class='del'>-			reg = &lt;0x20000 0x1000&gt;;</div><div class='del'>-			cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			cache-size = &lt;0x40000&gt;; // L2, 256K</div><div class='del'>-			interrupts = &lt;16 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma@21300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x21300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x21100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupts = &lt;20 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupts = &lt;21 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupts = &lt;22 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupts = &lt;23 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		usb@22000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-usb2-dr";</div><div class='del'>-			reg = &lt;0x22000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;28 0x2 0 0&gt;;</div><div class='ctx'> 			phy_type = "ulpi";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		mdio@24000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,etsec2-mdio";</div><div class='del'>-			reg = &lt;0x24000 0x1000 0xb0030 0x4&gt;;</div><div class='add'>+		usb@23000 {</div><div class='add'>+			status = "disabled";</div><div class='add'>+		};</div><div class='ctx'> </div><div class='add'>+		mdio@24000 {</div><div class='ctx'> 			phy0: ethernet-phy@0 {</div><div class='ctx'> 				interrupts = &lt;3 1 0 0&gt;;</div><div class='ctx'> 				reg = &lt;0x1&gt;;</div><div class='hunk'>@@ -391,189 +207,28 @@</div><div class='ctx'> 				interrupts = &lt;9 1 0 0&gt;;</div><div class='ctx'> 				reg = &lt;0x2&gt;;</div><div class='ctx'> 			};</div><div class='add'>+			tbi-phy@2 {</div><div class='add'>+				device_type = "tbi-phy";</div><div class='add'>+				reg = &lt;0x2&gt;;</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		mdio@25000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,etsec2-mdio";</div><div class='del'>-			reg = &lt;0x25000 0x1000 0xb1030 0x4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet0: ethernet@B0000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "fsl,etsec2";</div><div class='del'>-			fsl,num_rx_queues = &lt;0x8&gt;;</div><div class='del'>-			fsl,num_tx_queues = &lt;0x8&gt;;</div><div class='del'>-			fsl,magic-packet;</div><div class='del'>-			fsl,wake-on-filer;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='add'>+		ethernet@b0000 {</div><div class='ctx'> 			phy-handle = &lt;&amp;phy0&gt;;</div><div class='ctx'> 			phy-connection-type = "rgmii-id";</div><div class='del'>-			queue-group@0{</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xB0000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;29 2 0 0 30 2 0 0 34 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			queue-group@1{</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xB4000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;17 2 0 0 18 2 0 0 24 2 0 0&gt;;</div><div class='del'>-			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		enet1: ethernet@B1000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "fsl,etsec2";</div><div class='del'>-			fsl,num_rx_queues = &lt;0x8&gt;;</div><div class='del'>-			fsl,num_tx_queues = &lt;0x8&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='add'>+		ethernet@b1000 {</div><div class='ctx'> 			phy-handle = &lt;&amp;phy1&gt;;</div><div class='ctx'> 			phy-connection-type = "rgmii-id";</div><div class='del'>-			queue-group@0{</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xB1000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;35 2 0 0 36 2 0 0 40 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			queue-group@1{</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0xB5000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;51 2 0 0 52 2 0 0 67 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sdhci@2e000 {</div><div class='del'>-			compatible = "fsl,p1022-esdhc", "fsl,esdhc";</div><div class='del'>-			reg = &lt;0x2e000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;72 0x2 0 0&gt;;</div><div class='del'>-			fsl,sdhci-auto-cmd12;</div><div class='del'>-			/* Filled in by U-Boot */</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		crypto@30000 {</div><div class='del'>-			compatible = "fsl,sec3.3", "fsl,sec3.1", "fsl,sec3.0",</div><div class='del'>-				     "fsl,sec2.4", "fsl,sec2.2", "fsl,sec2.1",</div><div class='del'>-				     "fsl,sec2.0";</div><div class='del'>-			reg = &lt;0x30000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;45 2 0 0 58 2 0 0&gt;;</div><div class='del'>-			fsl,num-channels = &lt;4&gt;;</div><div class='del'>-			fsl,channel-fifo-len = &lt;24&gt;;</div><div class='del'>-			fsl,exec-units-mask = &lt;0x97c&gt;;</div><div class='del'>-			fsl,descriptor-types-mask = &lt;0x3a30abf&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sata@18000 {</div><div class='del'>-			compatible = "fsl,p1022-sata", "fsl,pq-sata-v2";</div><div class='del'>-			reg = &lt;0x18000 0x1000&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			interrupts = &lt;74 0x2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sata@19000 {</div><div class='del'>-			compatible = "fsl,p1022-sata", "fsl,pq-sata-v2";</div><div class='del'>-			reg = &lt;0x19000 0x1000&gt;;</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			interrupts = &lt;41 0x2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		power@e0070{</div><div class='del'>-			compatible = "fsl,mpc8536-pmc", "fsl,mpc8548-pmc";</div><div class='del'>-			reg = &lt;0xe0070 0x20&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		display@10000 {</div><div class='del'>-			compatible = "fsl,diu", "fsl,p1022-diu";</div><div class='del'>-			reg = &lt;0x10000 1000&gt;;</div><div class='del'>-			interrupts = &lt;64 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		timer@41100 {</div><div class='del'>-			compatible = "fsl,mpic-global-timer";</div><div class='del'>-			reg = &lt;0x41100 0x100 0x41300 4&gt;;</div><div class='del'>-			interrupts = &lt;0 0 3 0</div><div class='del'>-			              1 0 3 0</div><div class='del'>-			              2 0 3 0</div><div class='del'>-			              3 0 3 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		timer@42100 {</div><div class='del'>-			compatible = "fsl,mpic-global-timer";</div><div class='del'>-			reg = &lt;0x42100 0x100 0x42300 4&gt;;</div><div class='del'>-			interrupts = &lt;4 0 3 0</div><div class='del'>-			              5 0 3 0</div><div class='del'>-			              6 0 3 0</div><div class='del'>-			              7 0 3 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;4&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "fsl,mpic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi@41600 {</div><div class='del'>-			compatible = "fsl,p1022-msi", "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x80&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0 0 0</div><div class='del'>-				0xe1 0 0 0</div><div class='del'>-				0xe2 0 0 0</div><div class='del'>-				0xe3 0 0 0</div><div class='del'>-				0xe4 0 0 0</div><div class='del'>-				0xe5 0 0 0</div><div class='del'>-				0xe6 0 0 0</div><div class='del'>-				0xe7 0 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		global-utilities@e0000 {	//global utilities block</div><div class='del'>-			compatible = "fsl,p1022-guts";</div><div class='del'>-			reg = &lt;0xe0000 0x1000&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci0: pcie@fffe09000 {</div><div class='del'>-		compatible = "fsl,p1022-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt;0xf 0xffe09000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0xa0000000 0xc 0x20000000 0x0 0x20000000</div><div class='add'>+		ranges = &lt;0x2000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0xf 0xffc10000 0x0 0x10000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupts = &lt;16 2 0 0&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0 0 1 &amp;mpic 4 1</div><div class='del'>-			0000 0 0 2 &amp;mpic 5 1</div><div class='del'>-			0000 0 0 3 &amp;mpic 6 1</div><div class='del'>-			0000 0 0 4 &amp;mpic 7 1</div><div class='del'>-			&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xe0000000</div><div class='ctx'> 				  0x2000000 0x0 0xe0000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -585,30 +240,11 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci1: pcie@fffe0a000 {</div><div class='del'>-		compatible = "fsl,p1022-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt;0xf 0xffe0a000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0xc0000000 0xc 0x40000000 0x0 0x20000000</div><div class='add'>+		ranges = &lt;0x2000000 0x0 0xe0000000 0xc 0x40000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0xf 0xffc20000 0x0 0x10000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupts = &lt;16 2 0 0&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0 0 1 &amp;mpic 0 1</div><div class='del'>-			0000 0 0 2 &amp;mpic 1 1</div><div class='del'>-			0000 0 0 3 &amp;mpic 2 1</div><div class='del'>-			0000 0 0 4 &amp;mpic 3 1</div><div class='del'>-			&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='ctx'> 			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xe0000000</div><div class='ctx'> 				  0x2000000 0x0 0xe0000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -619,32 +255,11 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	pci2: pcie@fffe0b000 {</div><div class='del'>-		compatible = "fsl,p1022-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt;0xf 0xffe0b000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0x80000000 0xc 0x00000000 0x0 0x20000000</div><div class='add'>+		ranges = &lt;0x2000000 0x0 0xe0000000 0xc 0x00000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0xf 0xffc00000 0x0 0x10000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupts = &lt;16 2 0 0&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0 0 1 &amp;mpic 8 1</div><div class='del'>-			0000 0 0 2 &amp;mpic 9 1</div><div class='del'>-			0000 0 0 3 &amp;mpic 10 1</div><div class='del'>-			0000 0 0 4 &amp;mpic 11 1</div><div class='del'>-			&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xe0000000</div><div class='ctx'> 				  0x2000000 0x0 0xe0000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -655,3 +270,5 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "fsl/p1022si-post.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p1023rds.dts b/arch/powerpc/boot/dts/p1023rds.dts<br/>index d3b478242ea9..beb6cb12e59d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1023rds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p1023rds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p1023rds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p1023rds.dts</a></div><div class='hunk'>@@ -34,137 +34,30 @@</div><div class='ctx'>  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/dts-v1/;</div><div class='add'>+/include/ "fsl/p1023si-pre.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,P1023";</div><div class='ctx'> 	compatible = "fsl,P1023RDS";</div><div class='ctx'> 	#address-cells = &lt;2&gt;;</div><div class='ctx'> 	#size-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		serial1 = &amp;serial1;</div><div class='del'>-		pci0 = &amp;pci0;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-		pci2 = &amp;pci2;</div><div class='del'>-</div><div class='del'>-		crypto = &amp;crypto;</div><div class='del'>-		sec_jr0 = &amp;sec_jr0;</div><div class='del'>-		sec_jr1 = &amp;sec_jr1;</div><div class='del'>-		sec_jr2 = &amp;sec_jr2;</div><div class='del'>-		sec_jr3 = &amp;sec_jr3;</div><div class='del'>-		rtic_a = &amp;rtic_a;</div><div class='del'>-		rtic_b = &amp;rtic_b;</div><div class='del'>-		rtic_c = &amp;rtic_c;</div><div class='del'>-		rtic_d = &amp;rtic_d;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cpus {</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'>-		cpu0: PowerPC,P1023@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cpu1: PowerPC,P1023@1 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x1&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='add'>+	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> </div><div class='ctx'> 	memory {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc@ff600000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "fsl,p1023-immr", "simple-bus";</div><div class='add'>+	soc: soc@ff600000 {</div><div class='ctx'> 		ranges = &lt;0x0 0x0 0xff600000 0x200000&gt;;</div><div class='del'>-		bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='del'>-</div><div class='del'>-		ecm-law@0 {</div><div class='del'>-			compatible = "fsl,ecm-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;12&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ecm@1000 {</div><div class='del'>-			compatible = "fsl,p1023-ecm", "fsl,ecm";</div><div class='del'>-			reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		memory-controller@2000 {</div><div class='del'>-			compatible = "fsl,p1023-memory-controller";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-		};</div><div class='ctx'> </div><div class='ctx'> 		i2c@3000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='ctx'> 			rtc@68 {</div><div class='ctx'> 				compatible = "dallas,ds1374";</div><div class='ctx'> 				reg = &lt;0x68&gt;;</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		i2c@3100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial0: serial@4500 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial1: serial@4600 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		spi@7000 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,p1023-espi", "fsl,mpc8536-espi";</div><div class='del'>-			reg = &lt;0x7000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;59 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			fsl,espi-num-chipselects = &lt;4&gt;;</div><div class='del'>-</div><div class='ctx'> 			fsl_dataflash@0 {</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;1&gt;;</div><div class='hunk'>@@ -186,197 +79,14 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		gpio: gpio-controller@f000 {</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-			compatible = "fsl,qoriq-gpio";</div><div class='del'>-			reg = &lt;0xf000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;47 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			gpio-controller;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		L2: l2-cache-controller@20000 {</div><div class='del'>-			compatible = "fsl,p1023-l2-cache-controller";</div><div class='del'>-			reg = &lt;0x20000 0x1000&gt;;</div><div class='del'>-			cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			cache-size = &lt;0x40000&gt;; // L2,256K</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma@21300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x21300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x21100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;20 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;21 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;22 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;23 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		usb@22000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-usb2-dr";</div><div class='del'>-			reg = &lt;0x22000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;28 0x2&gt;;</div><div class='ctx'> 			dr_mode = "host";</div><div class='ctx'> 			phy_type = "ulpi";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-		crypto: crypto@300000 {</div><div class='del'>-			compatible = "fsl,sec-v4.2", "fsl,sec-v4.0";</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			reg = &lt;0x30000 0x10000&gt;;</div><div class='del'>-			ranges = &lt;0 0x30000 0x10000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;58 2&gt;;</div><div class='del'>-</div><div class='del'>-			sec_jr0: jr@1000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-job-ring",</div><div class='del'>-					     "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;45 2&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sec_jr1: jr@2000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-job-ring",</div><div class='del'>-					     "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;45 2&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sec_jr2: jr@3000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-job-ring",</div><div class='del'>-					     "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x3000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;57 2&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sec_jr3: jr@4000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-job-ring",</div><div class='del'>-					     "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x4000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;57 2&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			rtic@6000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-rtic",</div><div class='del'>-					     "fsl,sec-v4.0-rtic";</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0x6000 0x100&gt;;</div><div class='del'>-				ranges = &lt;0x0 0x6100 0xe00&gt;;</div><div class='del'>-</div><div class='del'>-				rtic_a: rtic-a@0 {</div><div class='del'>-					compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='del'>-						     "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x00 0x20 0x100 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				rtic_b: rtic-b@20 {</div><div class='del'>-					compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='del'>-						     "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x20 0x20 0x200 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				rtic_c: rtic-c@40 {</div><div class='del'>-					compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='del'>-						     "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x40 0x20 0x300 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				rtic_d: rtic-d@60 {</div><div class='del'>-					compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='del'>-						     "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x60 0x20 0x500 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		power@e0070{</div><div class='del'>-			compatible = "fsl,mpc8536-pmc", "fsl,mpc8548-pmc",</div><div class='del'>-			             "fsl,p1022-pmc";</div><div class='del'>-			reg = &lt;0xe0070 0x20&gt;;</div><div class='del'>-			etsec1_clk: soc-clk@B0{</div><div class='del'>-				fsl,pmcdr-mask = &lt;0x00000080&gt;;</div><div class='del'>-			};</div><div class='del'>-			etsec2_clk: soc-clk@B1{</div><div class='del'>-				fsl,pmcdr-mask = &lt;0x00000040&gt;;</div><div class='del'>-			};</div><div class='del'>-			etsec3_clk: soc-clk@B2{</div><div class='del'>-				fsl,pmcdr-mask = &lt;0x00000020&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi@41600 {</div><div class='del'>-			compatible = "fsl,p1023-msi", "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x80&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0</div><div class='del'>-				0xe1 0</div><div class='del'>-				0xe2 0</div><div class='del'>-				0xe3 0</div><div class='del'>-				0xe4 0</div><div class='del'>-				0xe5 0</div><div class='del'>-				0xe6 0</div><div class='del'>-				0xe7 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		global-utilities@e0000 {	//global utilities block</div><div class='del'>-			compatible = "fsl,p1023-guts";</div><div class='del'>-			reg = &lt;0xe0000 0x1000&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='del'>-		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	localbus@ff605000 {</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		compatible = "fsl,p1023-elbc", "fsl,elbc", "simple-bus";</div><div class='add'>+	lbc: localbus@ff605000 {</div><div class='ctx'> 		reg = &lt;0 0xff605000 0 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;19 2&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='ctx'> </div><div class='ctx'> 		/* NOR Flash, BCSR */</div><div class='ctx'> 		ranges = &lt;0x0 0x0 0x0 0xee000000 0x02000000</div><div class='hunk'>@@ -428,34 +138,18 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci0: pcie@ff60a000 {</div><div class='del'>-		compatible = "fsl,p1023-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='del'>-		cell-index = &lt;1&gt;;</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt;0 0xff60a000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x10000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;16 2&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='ctx'> 			/* IRQ[0:3] are pulled up on board, set to active-low */</div><div class='add'>+			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='ctx'> 			interrupt-map = &lt;</div><div class='ctx'> 				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 0 1</div><div class='del'>-				0000 0 0 2 &amp;mpic 1 1</div><div class='del'>-				0000 0 0 3 &amp;mpic 2 1</div><div class='del'>-				0000 0 0 4 &amp;mpic 3 1</div><div class='add'>+				0000 0 0 1 &amp;mpic 0 1 0 0</div><div class='add'>+				0000 0 0 2 &amp;mpic 1 1 0 0</div><div class='add'>+				0000 0 0 3 &amp;mpic 2 1 0 0</div><div class='add'>+				0000 0 0 4 &amp;mpic 3 1 0 0</div><div class='ctx'> 				&gt;;</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xc0000000</div><div class='ctx'> 				  0x2000000 0x0 0xc0000000</div><div class='hunk'>@@ -467,38 +161,22 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	pci1: pcie@ff609000 {</div><div class='del'>-		compatible = "fsl,p1023-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='del'>-		cell-index = &lt;2&gt;;</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='add'>+	board_pci1: pci1: pcie@ff609000 {</div><div class='ctx'> 		reg = &lt;0 0xff609000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;16 2&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * IRQ[4:6] only for PCIe, set to active-high,</div><div class='ctx'> 			 * IRQ[7] is pulled up on board, set to active-low</div><div class='ctx'> 			 */</div><div class='add'>+			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='ctx'> 			interrupt-map = &lt;</div><div class='ctx'> 				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 4 2</div><div class='del'>-				0000 0 0 2 &amp;mpic 5 2</div><div class='del'>-				0000 0 0 3 &amp;mpic 6 2</div><div class='del'>-				0000 0 0 4 &amp;mpic 7 1</div><div class='add'>+				0000 0 0 1 &amp;mpic 4 2 0 0</div><div class='add'>+				0000 0 0 2 &amp;mpic 5 2 0 0</div><div class='add'>+				0000 0 0 3 &amp;mpic 6 2 0 0</div><div class='add'>+				0000 0 0 4 &amp;mpic 7 1 0 0</div><div class='ctx'> 				&gt;;</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x2000000 0x0 0xa0000000</div><div class='hunk'>@@ -511,37 +189,21 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci2: pcie@ff60b000 {</div><div class='del'>-		cell-index = &lt;3&gt;;</div><div class='del'>-		compatible = "fsl,p1023-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='ctx'> 		reg = &lt;0 0xff60b000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;16 2&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * IRQ[8:10] are pulled up on board, set to active-low</div><div class='ctx'> 			 * IRQ[11] only for PCIe, set to active-high,</div><div class='ctx'> 			 */</div><div class='add'>+			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='ctx'> 			interrupt-map = &lt;</div><div class='ctx'> 				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 8 1</div><div class='del'>-				0000 0 0 2 &amp;mpic 9 1</div><div class='del'>-				0000 0 0 3 &amp;mpic 10 1</div><div class='del'>-				0000 0 0 4 &amp;mpic 11 2</div><div class='add'>+				0000 0 0 1 &amp;mpic 8 1 0 0</div><div class='add'>+				0000 0 0 2 &amp;mpic 9 1 0 0</div><div class='add'>+				0000 0 0 3 &amp;mpic 10 1 0 0</div><div class='add'>+				0000 0 0 4 &amp;mpic 11 2 0 0</div><div class='ctx'> 				&gt;;</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0x80000000</div><div class='ctx'> 				  0x2000000 0x0 0x80000000</div><div class='hunk'>@@ -553,3 +215,5 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "fsl/p1023si-post.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p2020ds.dts b/arch/powerpc/boot/dts/p2020ds.dts<br/>index 66f03d6477b2..237310cc7e6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p2020ds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p2020ds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p2020ds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p2020ds.dts</a></div><div class='hunk'>@@ -9,30 +9,17 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "p2020si.dtsi"</div><div class='add'>+/include/ "fsl/p2020si-pre.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,P2020DS";</div><div class='ctx'> 	compatible = "fsl,P2020DS";</div><div class='ctx'> </div><div class='del'>-	aliases {</div><div class='del'>-		ethernet0 = &amp;enet0;</div><div class='del'>-		ethernet1 = &amp;enet1;</div><div class='del'>-		ethernet2 = &amp;enet2;</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		serial1 = &amp;serial1;</div><div class='del'>-		pci0 = &amp;pci0;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-		pci2 = &amp;pci2;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> 	memory {</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	localbus@ffe05000 {</div><div class='del'>-		compatible = "fsl,elbc", "simple-bus";</div><div class='add'>+	board_lbc: lbc: localbus@ffe05000 {</div><div class='ctx'> 		ranges = &lt;0x0 0x0 0x0 0xe8000000 0x08000000</div><div class='ctx'> 			  0x1 0x0 0x0 0xe0000000 0x08000000</div><div class='ctx'> 			  0x2 0x0 0x0 0xffa00000 0x00040000</div><div class='hunk'>@@ -40,203 +27,18 @@</div><div class='ctx'> 			  0x4 0x0 0x0 0xffa40000 0x00040000</div><div class='ctx'> 			  0x5 0x0 0x0 0xffa80000 0x00040000</div><div class='ctx'> 			  0x6 0x0 0x0 0xffac0000 0x00040000&gt;;</div><div class='del'>-</div><div class='del'>-		nor@0,0 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "cfi-flash";</div><div class='del'>-			reg = &lt;0x0 0x0 0x8000000&gt;;</div><div class='del'>-			bank-width = &lt;2&gt;;</div><div class='del'>-			device-width = &lt;1&gt;;</div><div class='del'>-</div><div class='del'>-			ramdisk@0 {</div><div class='del'>-				reg = &lt;0x0 0x03000000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			diagnostic@3000000 {</div><div class='del'>-				reg = &lt;0x03000000 0x00e00000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			dink@3e00000 {</div><div class='del'>-				reg = &lt;0x03e00000 0x00200000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			kernel@4000000 {</div><div class='del'>-				reg = &lt;0x04000000 0x00400000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			jffs2@4400000 {</div><div class='del'>-				reg = &lt;0x04400000 0x03b00000&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			dtb@7f00000 {</div><div class='del'>-				reg = &lt;0x07f00000 0x00080000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			u-boot@7f80000 {</div><div class='del'>-				reg = &lt;0x07f80000 0x00080000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		nand@2,0 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,elbc-fcm-nand";</div><div class='del'>-			reg = &lt;0x2 0x0 0x40000&gt;;</div><div class='del'>-</div><div class='del'>-			u-boot@0 {</div><div class='del'>-				reg = &lt;0x0 0x02000000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			jffs2@2000000 {</div><div class='del'>-				reg = &lt;0x02000000 0x10000000&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			ramdisk@12000000 {</div><div class='del'>-				reg = &lt;0x12000000 0x08000000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			kernel@1a000000 {</div><div class='del'>-				reg = &lt;0x1a000000 0x04000000&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			dtb@1e000000 {</div><div class='del'>-				reg = &lt;0x1e000000 0x01000000&gt;;</div><div class='del'>-				read-only;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			empty@1f000000 {</div><div class='del'>-				reg = &lt;0x1f000000 0x21000000&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		board-control@3,0 {</div><div class='del'>-			compatible = "fsl,p2020ds-fpga", "fsl,fpga-ngpixis";</div><div class='del'>-			reg = &lt;0x3 0x0 0x30&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		nand@4,0 {</div><div class='del'>-			compatible = "fsl,elbc-fcm-nand";</div><div class='del'>-			reg = &lt;0x4 0x0 0x40000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		nand@5,0 {</div><div class='del'>-			compatible = "fsl,elbc-fcm-nand";</div><div class='del'>-			reg = &lt;0x5 0x0 0x40000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		nand@6,0 {</div><div class='del'>-			compatible = "fsl,elbc-fcm-nand";</div><div class='del'>-			reg = &lt;0x6 0x0 0x40000&gt;;</div><div class='del'>-		};</div><div class='add'>+		reg = &lt;0 0xffe05000 0 0x1000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc@ffe00000 {</div><div class='del'>-</div><div class='del'>-		usb@22000 {</div><div class='del'>-			phy_type = "ulpi";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@24520 {</div><div class='del'>-			phy0: ethernet-phy@0 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;3 1&gt;;</div><div class='del'>-				reg = &lt;0x0&gt;;</div><div class='del'>-			};</div><div class='del'>-			phy1: ethernet-phy@1 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;3 1&gt;;</div><div class='del'>-				reg = &lt;0x1&gt;;</div><div class='del'>-			};</div><div class='del'>-			phy2: ethernet-phy@2 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;3 1&gt;;</div><div class='del'>-				reg = &lt;0x2&gt;;</div><div class='del'>-			};</div><div class='del'>-			tbi0: tbi-phy@11 {</div><div class='del'>-				reg = &lt;0x11&gt;;</div><div class='del'>-				device_type = "tbi-phy";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@25520 {</div><div class='del'>-			tbi1: tbi-phy@11 {</div><div class='del'>-				reg = &lt;0x11&gt;;</div><div class='del'>-				device_type = "tbi-phy";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@26520 {</div><div class='del'>-			tbi2: tbi-phy@11 {</div><div class='del'>-				reg = &lt;0x11&gt;;</div><div class='del'>-				device_type = "tbi-phy";</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ptp_clock@24E00 {</div><div class='del'>-			compatible = "fsl,etsec-ptp";</div><div class='del'>-			reg = &lt;0x24E00 0xB0&gt;;</div><div class='del'>-			interrupts = &lt;68 2 69 2 70 2&gt;;</div><div class='del'>-			interrupt-parent = &lt; &amp;mpic &gt;;</div><div class='del'>-			fsl,tclk-period = &lt;5&gt;;</div><div class='del'>-			fsl,tmr-prsc = &lt;200&gt;;</div><div class='del'>-			fsl,tmr-add = &lt;0xCCCCCCCD&gt;;</div><div class='del'>-			fsl,tmr-fiper1 = &lt;0x3B9AC9FB&gt;;</div><div class='del'>-			fsl,tmr-fiper2 = &lt;0x0001869B&gt;;</div><div class='del'>-			fsl,max-adj = &lt;249999999&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet0: ethernet@24000 {</div><div class='del'>-			tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy0&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet1: ethernet@25000 {</div><div class='del'>-			tbi-handle = &lt;&amp;tbi1&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy1&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet2: ethernet@26000 {</div><div class='del'>-			tbi-handle = &lt;&amp;tbi2&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy2&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		msi@41600 {</div><div class='del'>-			compatible = "fsl,mpic-msi";</div><div class='del'>-		};</div><div class='add'>+	board_soc: soc: soc@ffe00000 {</div><div class='add'>+		ranges = &lt;0x0 0x0 0xffe00000 0x100000&gt;;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	pci0: pcie@ffe08000 {</div><div class='add'>+	pci2: pcie@ffe08000 {</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x8 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x9 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0xa 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0xb 0x1</div><div class='del'>-			&gt;;</div><div class='add'>+		reg = &lt;0 0xffe08000 0 0x1000&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0x80000000</div><div class='ctx'> 				  0x2000000 0x0 0x80000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -247,61 +49,11 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	pci1: pcie@ffe09000 {</div><div class='add'>+	board_pci1: pci1: pcie@ffe09000 {</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xff00 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x11 func 0 - PCI slot 1</div><div class='del'>-			0x8800 0x0 0x0 0x1 &amp;i8259 0x9 0x2</div><div class='del'>-			0x8800 0x0 0x0 0x2 &amp;i8259 0xa 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x11 func 1 - PCI slot 1</div><div class='del'>-			0x8900 0x0 0x0 0x1 &amp;i8259 0x9 0x2</div><div class='del'>-			0x8900 0x0 0x0 0x2 &amp;i8259 0xa 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x11 func 2 - PCI slot 1</div><div class='del'>-			0x8a00 0x0 0x0 0x1 &amp;i8259 0x9 0x2</div><div class='del'>-			0x8a00 0x0 0x0 0x2 &amp;i8259 0xa 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x11 func 3 - PCI slot 1</div><div class='del'>-			0x8b00 0x0 0x0 0x1 &amp;i8259 0x9 0x2</div><div class='del'>-			0x8b00 0x0 0x0 0x2 &amp;i8259 0xa 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x11 func 4 - PCI slot 1</div><div class='del'>-			0x8c00 0x0 0x0 0x1 &amp;i8259 0x9 0x2</div><div class='del'>-			0x8c00 0x0 0x0 0x2 &amp;i8259 0xa 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x11 func 5 - PCI slot 1</div><div class='del'>-			0x8d00 0x0 0x0 0x1 &amp;i8259 0x9 0x2</div><div class='del'>-			0x8d00 0x0 0x0 0x2 &amp;i8259 0xa 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x11 func 6 - PCI slot 1</div><div class='del'>-			0x8e00 0x0 0x0 0x1 &amp;i8259 0x9 0x2</div><div class='del'>-			0x8e00 0x0 0x0 0x2 &amp;i8259 0xa 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x11 func 7 - PCI slot 1</div><div class='del'>-			0x8f00 0x0 0x0 0x1 &amp;i8259 0x9 0x2</div><div class='del'>-			0x8f00 0x0 0x0 0x2 &amp;i8259 0xa 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x1d  Audio</div><div class='del'>-			0xe800 0x0 0x0 0x1 &amp;i8259 0x6 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x1e Legacy</div><div class='del'>-			0xf000 0x0 0x0 0x1 &amp;i8259 0x7 0x2</div><div class='del'>-			0xf100 0x0 0x0 0x1 &amp;i8259 0x7 0x2</div><div class='del'>-</div><div class='del'>-			// IDSEL 0x1f IDE/SATA</div><div class='del'>-			0xf800 0x0 0x0 0x1 &amp;i8259 0xe 0x2</div><div class='del'>-			0xf900 0x0 0x0 0x1 &amp;i8259 0x5 0x2</div><div class='del'>-			&gt;;</div><div class='del'>-</div><div class='add'>+		reg = &lt;0 0xffe09000 0 0x1000&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -309,89 +61,14 @@</div><div class='ctx'> 				  0x1000000 0x0 0x0</div><div class='ctx'> 				  0x1000000 0x0 0x0</div><div class='ctx'> 				  0x0 0x10000&gt;;</div><div class='del'>-			uli1575@0 {</div><div class='del'>-				reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-				#size-cells = &lt;2&gt;;</div><div class='del'>-				#address-cells = &lt;3&gt;;</div><div class='del'>-				ranges = &lt;0x2000000 0x0 0xa0000000</div><div class='del'>-					  0x2000000 0x0 0xa0000000</div><div class='del'>-					  0x0 0x20000000</div><div class='del'>-</div><div class='del'>-					  0x1000000 0x0 0x0</div><div class='del'>-					  0x1000000 0x0 0x0</div><div class='del'>-					  0x0 0x10000&gt;;</div><div class='del'>-				isa@1e {</div><div class='del'>-					device_type = "isa";</div><div class='del'>-					#interrupt-cells = &lt;2&gt;;</div><div class='del'>-					#size-cells = &lt;1&gt;;</div><div class='del'>-					#address-cells = &lt;2&gt;;</div><div class='del'>-					reg = &lt;0xf000 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-					ranges = &lt;0x1 0x0 0x1000000 0x0 0x0</div><div class='del'>-						  0x1000&gt;;</div><div class='del'>-					interrupt-parent = &lt;&amp;i8259&gt;;</div><div class='del'>-</div><div class='del'>-					i8259: interrupt-controller@20 {</div><div class='del'>-						reg = &lt;0x1 0x20 0x2</div><div class='del'>-						       0x1 0xa0 0x2</div><div class='del'>-						       0x1 0x4d0 0x2&gt;;</div><div class='del'>-						interrupt-controller;</div><div class='del'>-						device_type = "interrupt-controller";</div><div class='del'>-						#address-cells = &lt;0&gt;;</div><div class='del'>-						#interrupt-cells = &lt;2&gt;;</div><div class='del'>-						compatible = "chrp,iic";</div><div class='del'>-						interrupts = &lt;4 1&gt;;</div><div class='del'>-						interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-					};</div><div class='del'>-</div><div class='del'>-					i8042@60 {</div><div class='del'>-						#size-cells = &lt;0&gt;;</div><div class='del'>-						#address-cells = &lt;1&gt;;</div><div class='del'>-						reg = &lt;0x1 0x60 0x1 0x1 0x64 0x1&gt;;</div><div class='del'>-						interrupts = &lt;1 3 12 3&gt;;</div><div class='del'>-						interrupt-parent =</div><div class='del'>-							&lt;&amp;i8259&gt;;</div><div class='del'>-</div><div class='del'>-						keyboard@0 {</div><div class='del'>-							reg = &lt;0x0&gt;;</div><div class='del'>-							compatible = "pnpPNP,303";</div><div class='del'>-						};</div><div class='del'>-</div><div class='del'>-						mouse@1 {</div><div class='del'>-							reg = &lt;0x1&gt;;</div><div class='del'>-							compatible = "pnpPNP,f03";</div><div class='del'>-						};</div><div class='del'>-					};</div><div class='del'>-</div><div class='del'>-					rtc@70 {</div><div class='del'>-						compatible = "pnpPNP,b00";</div><div class='del'>-						reg = &lt;0x1 0x70 0x2&gt;;</div><div class='del'>-					};</div><div class='del'>-</div><div class='del'>-					gpio@400 {</div><div class='del'>-						reg = &lt;0x1 0x400 0x80&gt;;</div><div class='del'>-					};</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	pci2: pcie@ffe0a000 {</div><div class='add'>+	pci0: pcie@ffe0a000 {</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x10000&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1</div><div class='del'>-			&gt;;</div><div class='add'>+		reg = &lt;0 0xffe0a000 0 0x1000&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xc0000000</div><div class='ctx'> 				  0x2000000 0x0 0xc0000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -402,3 +79,11 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * p2020ds.dtsi must be last to ensure board_pci0 overrides pci0 settings</div><div class='add'>+ * for interrupt-map &amp; interrupt-map-mask</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/include/ "fsl/p2020si-post.dtsi"</div><div class='add'>+/include/ "p2020ds.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p2020ds.dtsi b/arch/powerpc/boot/dts/p2020ds.dtsi<br/>new file mode 100644<br/>index 000000000000..c1cf6cef4dd6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p2020ds.dtsi?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p2020ds.dtsi</a></div><div class='hunk'>@@ -0,0 +1,316 @@</div><div class='add'>+/*</div><div class='add'>+ * P2020DS Device Tree Source stub (no addresses or top-level ranges)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions are met:</div><div class='add'>+ *     * Redistributions of source code must retain the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer.</div><div class='add'>+ *     * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *       notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *       documentation and/or other materials provided with the distribution.</div><div class='add'>+ *     * Neither the name of Freescale Semiconductor nor the</div><div class='add'>+ *       names of its contributors may be used to endorse or promote products</div><div class='add'>+ *       derived from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") as published by the Free Software</div><div class='add'>+ * Foundation, either version 2 of that License or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='add'>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='add'>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='add'>+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='add'>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='add'>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='add'>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='add'>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='add'>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+&amp;board_lbc {</div><div class='add'>+	nor@0,0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "cfi-flash";</div><div class='add'>+		reg = &lt;0x0 0x0 0x8000000&gt;;</div><div class='add'>+		bank-width = &lt;2&gt;;</div><div class='add'>+		device-width = &lt;1&gt;;</div><div class='add'>+</div><div class='add'>+		ramdisk@0 {</div><div class='add'>+			reg = &lt;0x0 0x03000000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		diagnostic@3000000 {</div><div class='add'>+			reg = &lt;0x03000000 0x00e00000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dink@3e00000 {</div><div class='add'>+			reg = &lt;0x03e00000 0x00200000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		kernel@4000000 {</div><div class='add'>+			reg = &lt;0x04000000 0x00400000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		jffs2@4400000 {</div><div class='add'>+			reg = &lt;0x04400000 0x03b00000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dtb@7f00000 {</div><div class='add'>+			reg = &lt;0x07f00000 0x00080000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		u-boot@7f80000 {</div><div class='add'>+			reg = &lt;0x07f80000 0x00080000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	nand@2,0 {</div><div class='add'>+		#address-cells = &lt;1&gt;;</div><div class='add'>+		#size-cells = &lt;1&gt;;</div><div class='add'>+		compatible = "fsl,elbc-fcm-nand";</div><div class='add'>+		reg = &lt;0x2 0x0 0x40000&gt;;</div><div class='add'>+</div><div class='add'>+		u-boot@0 {</div><div class='add'>+			reg = &lt;0x0 0x02000000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		jffs2@2000000 {</div><div class='add'>+			reg = &lt;0x02000000 0x10000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ramdisk@12000000 {</div><div class='add'>+			reg = &lt;0x12000000 0x08000000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		kernel@1a000000 {</div><div class='add'>+			reg = &lt;0x1a000000 0x04000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		dtb@1e000000 {</div><div class='add'>+			reg = &lt;0x1e000000 0x01000000&gt;;</div><div class='add'>+			read-only;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		empty@1f000000 {</div><div class='add'>+			reg = &lt;0x1f000000 0x21000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	board-control@3,0 {</div><div class='add'>+		compatible = "fsl,p2020ds-fpga", "fsl,fpga-ngpixis";</div><div class='add'>+		reg = &lt;0x3 0x0 0x30&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	nand@4,0 {</div><div class='add'>+		compatible = "fsl,elbc-fcm-nand";</div><div class='add'>+		reg = &lt;0x4 0x0 0x40000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	nand@5,0 {</div><div class='add'>+		compatible = "fsl,elbc-fcm-nand";</div><div class='add'>+		reg = &lt;0x5 0x0 0x40000&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	nand@6,0 {</div><div class='add'>+		compatible = "fsl,elbc-fcm-nand";</div><div class='add'>+		reg = &lt;0x6 0x0 0x40000&gt;;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;board_soc {</div><div class='add'>+	usb@22000 {</div><div class='add'>+		phy_type = "ulpi";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio@24520 {</div><div class='add'>+		phy0: ethernet-phy@0 {</div><div class='add'>+			interrupts = &lt;3 1 0 0&gt;;</div><div class='add'>+			reg = &lt;0x0&gt;;</div><div class='add'>+		};</div><div class='add'>+		phy1: ethernet-phy@1 {</div><div class='add'>+			interrupts = &lt;3 1 0 0&gt;;</div><div class='add'>+			reg = &lt;0x1&gt;;</div><div class='add'>+		};</div><div class='add'>+		phy2: ethernet-phy@2 {</div><div class='add'>+			interrupts = &lt;3 1 0 0&gt;;</div><div class='add'>+			reg = &lt;0x2&gt;;</div><div class='add'>+		};</div><div class='add'>+		tbi0: tbi-phy@11 {</div><div class='add'>+			reg = &lt;0x11&gt;;</div><div class='add'>+			device_type = "tbi-phy";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio@25520 {</div><div class='add'>+		tbi1: tbi-phy@11 {</div><div class='add'>+			reg = &lt;0x11&gt;;</div><div class='add'>+			device_type = "tbi-phy";</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mdio@26520 {</div><div class='add'>+		tbi2: tbi-phy@11 {</div><div class='add'>+			reg = &lt;0x11&gt;;</div><div class='add'>+			device_type = "tbi-phy";</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ptp_clock@24e00 {</div><div class='add'>+		fsl,tclk-period = &lt;5&gt;;</div><div class='add'>+		fsl,tmr-prsc = &lt;200&gt;;</div><div class='add'>+		fsl,tmr-add = &lt;0xCCCCCCCD&gt;;</div><div class='add'>+		fsl,tmr-fiper1 = &lt;0x3B9AC9FB&gt;;</div><div class='add'>+		fsl,tmr-fiper2 = &lt;0x0001869B&gt;;</div><div class='add'>+		fsl,max-adj = &lt;249999999&gt;;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	enet0: ethernet@24000 {</div><div class='add'>+		tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='add'>+		phy-handle = &lt;&amp;phy0&gt;;</div><div class='add'>+		phy-connection-type = "rgmii-id";</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	enet1: ethernet@25000 {</div><div class='add'>+		tbi-handle = &lt;&amp;tbi1&gt;;</div><div class='add'>+		phy-handle = &lt;&amp;phy1&gt;;</div><div class='add'>+		phy-connection-type = "rgmii-id";</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	enet2: ethernet@26000 {</div><div class='add'>+		tbi-handle = &lt;&amp;tbi2&gt;;</div><div class='add'>+		phy-handle = &lt;&amp;phy2&gt;;</div><div class='add'>+		phy-connection-type = "rgmii-id";</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+&amp;board_pci1 {</div><div class='add'>+	pcie@0 {</div><div class='add'>+		interrupt-map-mask = &lt;0xff00 0x0 0x0 0x7&gt;;</div><div class='add'>+		interrupt-map = &lt;</div><div class='add'>+</div><div class='add'>+			// IDSEL 0x11 func 0 - PCI slot 1</div><div class='add'>+			0x8800 0x0 0x0 0x1 &amp;i8259 0x9 0x2</div><div class='add'>+			0x8800 0x0 0x0 0x2 &amp;i8259 0xa 0x2</div><div class='add'>+</div><div class='add'>+			// IDSEL 0x11 func 1 - PCI slot 1</div><div class='add'>+			0x8900 0x0 0x0 0x1 &amp;i8259 0x9 0x2</div><div class='add'>+			0x8900 0x0 0x0 0x2 &amp;i8259 0xa 0x2</div><div class='add'>+</div><div class='add'>+			// IDSEL 0x11 func 2 - PCI slot 1</div><div class='add'>+			0x8a00 0x0 0x0 0x1 &amp;i8259 0x9 0x2</div><div class='add'>+			0x8a00 0x0 0x0 0x2 &amp;i8259 0xa 0x2</div><div class='add'>+</div><div class='add'>+			// IDSEL 0x11 func 3 - PCI slot 1</div><div class='add'>+			0x8b00 0x0 0x0 0x1 &amp;i8259 0x9 0x2</div><div class='add'>+			0x8b00 0x0 0x0 0x2 &amp;i8259 0xa 0x2</div><div class='add'>+</div><div class='add'>+			// IDSEL 0x11 func 4 - PCI slot 1</div><div class='add'>+			0x8c00 0x0 0x0 0x1 &amp;i8259 0x9 0x2</div><div class='add'>+			0x8c00 0x0 0x0 0x2 &amp;i8259 0xa 0x2</div><div class='add'>+</div><div class='add'>+			// IDSEL 0x11 func 5 - PCI slot 1</div><div class='add'>+			0x8d00 0x0 0x0 0x1 &amp;i8259 0x9 0x2</div><div class='add'>+			0x8d00 0x0 0x0 0x2 &amp;i8259 0xa 0x2</div><div class='add'>+</div><div class='add'>+			// IDSEL 0x11 func 6 - PCI slot 1</div><div class='add'>+			0x8e00 0x0 0x0 0x1 &amp;i8259 0x9 0x2</div><div class='add'>+			0x8e00 0x0 0x0 0x2 &amp;i8259 0xa 0x2</div><div class='add'>+</div><div class='add'>+			// IDSEL 0x11 func 7 - PCI slot 1</div><div class='add'>+			0x8f00 0x0 0x0 0x1 &amp;i8259 0x9 0x2</div><div class='add'>+			0x8f00 0x0 0x0 0x2 &amp;i8259 0xa 0x2</div><div class='add'>+</div><div class='add'>+			// IDSEL 0x1d  Audio</div><div class='add'>+			0xe800 0x0 0x0 0x1 &amp;i8259 0x6 0x2</div><div class='add'>+</div><div class='add'>+			// IDSEL 0x1e Legacy</div><div class='add'>+			0xf000 0x0 0x0 0x1 &amp;i8259 0x7 0x2</div><div class='add'>+			0xf100 0x0 0x0 0x1 &amp;i8259 0x7 0x2</div><div class='add'>+</div><div class='add'>+			// IDSEL 0x1f IDE/SATA</div><div class='add'>+			0xf800 0x0 0x0 0x1 &amp;i8259 0xe 0x2</div><div class='add'>+			0xf900 0x0 0x0 0x1 &amp;i8259 0x5 0x2</div><div class='add'>+			&gt;;</div><div class='add'>+</div><div class='add'>+		uli1575@0 {</div><div class='add'>+			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='add'>+			#size-cells = &lt;2&gt;;</div><div class='add'>+			#address-cells = &lt;3&gt;;</div><div class='add'>+			ranges = &lt;0x2000000 0x0 0xa0000000</div><div class='add'>+				  0x2000000 0x0 0xa0000000</div><div class='add'>+				  0x0 0x20000000</div><div class='add'>+</div><div class='add'>+				  0x1000000 0x0 0x0</div><div class='add'>+				  0x1000000 0x0 0x0</div><div class='add'>+				  0x0 0x10000&gt;;</div><div class='add'>+			isa@1e {</div><div class='add'>+				device_type = "isa";</div><div class='add'>+				#interrupt-cells = &lt;2&gt;;</div><div class='add'>+				#size-cells = &lt;1&gt;;</div><div class='add'>+				#address-cells = &lt;2&gt;;</div><div class='add'>+				reg = &lt;0xf000 0x0 0x0 0x0 0x0&gt;;</div><div class='add'>+				ranges = &lt;0x1 0x0 0x1000000 0x0 0x0</div><div class='add'>+					  0x1000&gt;;</div><div class='add'>+				interrupt-parent = &lt;&amp;i8259&gt;;</div><div class='add'>+</div><div class='add'>+				i8259: interrupt-controller@20 {</div><div class='add'>+					reg = &lt;0x1 0x20 0x2</div><div class='add'>+					       0x1 0xa0 0x2</div><div class='add'>+					       0x1 0x4d0 0x2&gt;;</div><div class='add'>+					interrupt-controller;</div><div class='add'>+					device_type = "interrupt-controller";</div><div class='add'>+					#address-cells = &lt;0&gt;;</div><div class='add'>+					#interrupt-cells = &lt;2&gt;;</div><div class='add'>+					compatible = "chrp,iic";</div><div class='add'>+					interrupts = &lt;4 1 0 0&gt;;</div><div class='add'>+					interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				i8042@60 {</div><div class='add'>+					#size-cells = &lt;0&gt;;</div><div class='add'>+					#address-cells = &lt;1&gt;;</div><div class='add'>+					reg = &lt;0x1 0x60 0x1 0x1 0x64 0x1&gt;;</div><div class='add'>+					interrupts = &lt;1 3 12 3&gt;;</div><div class='add'>+					interrupt-parent =</div><div class='add'>+						&lt;&amp;i8259&gt;;</div><div class='add'>+</div><div class='add'>+					keyboard@0 {</div><div class='add'>+						reg = &lt;0x0&gt;;</div><div class='add'>+						compatible = "pnpPNP,303";</div><div class='add'>+					};</div><div class='add'>+</div><div class='add'>+					mouse@1 {</div><div class='add'>+						reg = &lt;0x1&gt;;</div><div class='add'>+						compatible = "pnpPNP,f03";</div><div class='add'>+					};</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				rtc@70 {</div><div class='add'>+					compatible = "pnpPNP,b00";</div><div class='add'>+					reg = &lt;0x1 0x70 0x2&gt;;</div><div class='add'>+				};</div><div class='add'>+</div><div class='add'>+				gpio@400 {</div><div class='add'>+					reg = &lt;0x1 0x400 0x80&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/arch/powerpc/boot/dts/p2020rdb.dts b/arch/powerpc/boot/dts/p2020rdb.dts<br/>index 1d7a05f3021e..26759a591712 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p2020rdb.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p2020rdb.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p2020rdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p2020rdb.dts</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "p2020si.dtsi"</div><div class='add'>+/include/ "fsl/p2020si-pre.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,P2020RDB";</div><div class='hunk'>@@ -29,7 +29,8 @@</div><div class='ctx'> 		device_type = "memory";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	localbus@ffe05000 {</div><div class='add'>+	lbc: localbus@ffe05000 {</div><div class='add'>+		reg = &lt;0 0xffe05000 0 0x1000&gt;;</div><div class='ctx'> </div><div class='ctx'> 		/* NOR and NAND Flashes */</div><div class='ctx'> 		ranges = &lt;0x0 0x0 0x0 0xef000000 0x01000000</div><div class='hunk'>@@ -140,7 +141,9 @@</div><div class='ctx'> </div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	soc@ffe00000 {</div><div class='add'>+	soc: soc@ffe00000 {</div><div class='add'>+		ranges = &lt;0x0 0x0 0xffe00000 0x100000&gt;;</div><div class='add'>+</div><div class='ctx'> 		i2c@3000 {</div><div class='ctx'> 			rtc@68 {</div><div class='ctx'> 				compatible = "dallas,ds1339";</div><div class='hunk'>@@ -148,17 +151,13 @@</div><div class='ctx'> 			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-	spi@7000 {</div><div class='del'>-</div><div class='del'>-		fsl_m25p80@0 {</div><div class='add'>+		spi@7000 {</div><div class='add'>+			flash@0 {</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='ctx'> 				#size-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "fsl,espi-flash";</div><div class='add'>+				compatible = "spansion,s25sl12801";</div><div class='ctx'> 				reg = &lt;0&gt;;</div><div class='del'>-				linux,modalias = "fsl_m25p80";</div><div class='del'>-				modal = "s25sl128b";</div><div class='ctx'> 				spi-max-frequency = &lt;50000000&gt;;</div><div class='del'>-				mode = &lt;0&gt;;</div><div class='ctx'> </div><div class='ctx'> 				partition@0 {</div><div class='ctx'> 					/* 512KB for u-boot Bootloader Image */</div><div class='hunk'>@@ -202,15 +201,17 @@</div><div class='ctx'> </div><div class='ctx'> 		mdio@24520 {</div><div class='ctx'> 			phy0: ethernet-phy@0 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;3 1&gt;;</div><div class='add'>+				interrupts = &lt;3 1 0 0&gt;;</div><div class='ctx'> 				reg = &lt;0x0&gt;;</div><div class='del'>-				};</div><div class='add'>+			};</div><div class='ctx'> 			phy1: ethernet-phy@1 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;3 1&gt;;</div><div class='add'>+				interrupts = &lt;3 1 0 0&gt;;</div><div class='ctx'> 				reg = &lt;0x1&gt;;</div><div class='del'>-				};</div><div class='add'>+			};</div><div class='add'>+			tbi-phy@2 {</div><div class='add'>+				device_type = "tbi-phy";</div><div class='add'>+				reg = &lt;0x2&gt;;</div><div class='add'>+			};</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		mdio@25520 {</div><div class='hunk'>@@ -224,11 +225,7 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		ptp_clock@24E00 {</div><div class='del'>-			compatible = "fsl,etsec-ptp";</div><div class='del'>-			reg = &lt;0x24E00 0xB0&gt;;</div><div class='del'>-			interrupts = &lt;68 2 69 2 70 2&gt;;</div><div class='del'>-			interrupt-parent = &lt; &amp;mpic &gt;;</div><div class='add'>+		ptp_clock@24e00 {</div><div class='ctx'> 			fsl,tclk-period = &lt;5&gt;;</div><div class='ctx'> 			fsl,tmr-prsc = &lt;200&gt;;</div><div class='ctx'> 			fsl,tmr-add = &lt;0xCCCCCCCD&gt;;</div><div class='hunk'>@@ -252,29 +249,18 @@</div><div class='ctx'> 			phy-handle = &lt;&amp;phy1&gt;;</div><div class='ctx'> 			phy-connection-type = "rgmii-id";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci0: pcie@ffe08000 {</div><div class='add'>+		reg = &lt;0 0xffe08000 0 0x1000&gt;;</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci1: pcie@ffe09000 {</div><div class='add'>+		reg = &lt;0 0xffe09000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x4 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x5 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x6 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x7 0x1</div><div class='del'>-			&gt;;</div><div class='del'>-			pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='add'>+		pcie@0 {</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x2000000 0x0 0xa0000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -286,21 +272,10 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci2: pcie@ffe0a000 {</div><div class='add'>+		reg = &lt;0 0xffe0a000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000</div><div class='ctx'> 			  0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1</div><div class='del'>-			&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='ctx'> 			ranges = &lt;0x2000000 0x0 0x80000000</div><div class='ctx'> 				  0x2000000 0x0 0x80000000</div><div class='ctx'> 				  0x0 0x20000000</div><div class='hunk'>@@ -311,3 +286,5 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "fsl/p2020si-post.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p2020rdb_camp_core0.dts b/arch/powerpc/boot/dts/p2020rdb_camp_core0.dts<br/>index fc8ddddfccb6..66aac864c4cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p2020rdb_camp_core0.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p2020rdb_camp_core0.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p2020rdb_camp_core0.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p2020rdb_camp_core0.dts</a></div><div class='hunk'>@@ -14,28 +14,16 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "p2020si.dtsi"</div><div class='add'>+/include/ "p2020rdb.dts"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,P2020RDB";</div><div class='ctx'> 	compatible = "fsl,P2020RDB", "fsl,MPC85XXRDB-CAMP";</div><div class='ctx'> </div><div class='del'>-	aliases {</div><div class='del'>-		ethernet1 = &amp;enet1;</div><div class='del'>-		ethernet2 = &amp;enet2;</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		pci0 = &amp;pci0;</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	cpus {</div><div class='ctx'> 		PowerPC,P2020@1 {</div><div class='del'>-		status = "disabled";</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	memory {</div><div class='del'>-		device_type = "memory";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	localbus@ffe05000 {</div><div class='hunk'>@@ -43,115 +31,18 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	soc@ffe00000 {</div><div class='del'>-		i2c@3000 {</div><div class='del'>-			rtc@68 {</div><div class='del'>-				compatible = "dallas,ds1339";</div><div class='del'>-				reg = &lt;0x68&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		spi@7000 {</div><div class='del'>-</div><div class='del'>-			fsl_m25p80@0 {</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				compatible = "fsl,espi-flash";</div><div class='del'>-				reg = &lt;0&gt;;</div><div class='del'>-				linux,modalias = "fsl_m25p80";</div><div class='del'>-				modal = "s25sl128b";</div><div class='del'>-				spi-max-frequency = &lt;50000000&gt;;</div><div class='del'>-				mode = &lt;0&gt;;</div><div class='del'>-</div><div class='del'>-				partition@0 {</div><div class='del'>-					/* 512KB for u-boot Bootloader Image */</div><div class='del'>-					reg = &lt;0x0 0x00080000&gt;;</div><div class='del'>-					label = "SPI (RO) U-Boot Image";</div><div class='del'>-					read-only;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				partition@80000 {</div><div class='del'>-					/* 512KB for DTB Image */</div><div class='del'>-					reg = &lt;0x00080000 0x00080000&gt;;</div><div class='del'>-					label = "SPI (RO) DTB Image";</div><div class='del'>-					read-only;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				partition@100000 {</div><div class='del'>-					/* 4MB for Linux Kernel Image */</div><div class='del'>-					reg = &lt;0x00100000 0x00400000&gt;;</div><div class='del'>-					label = "SPI (RO) Linux Kernel Image";</div><div class='del'>-					read-only;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				partition@500000 {</div><div class='del'>-					/* 4MB for Compressed RFS Image */</div><div class='del'>-					reg = &lt;0x00500000 0x00400000&gt;;</div><div class='del'>-					label = "SPI (RO) Compressed RFS Image";</div><div class='del'>-					read-only;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				partition@900000 {</div><div class='del'>-					/* 7MB for JFFS2 based RFS */</div><div class='del'>-					reg = &lt;0x00900000 0x00700000&gt;;</div><div class='del'>-					label = "SPI (RW) JFFS2 RFS";</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		dma@c300 {</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		usb@22000 {</div><div class='del'>-			phy_type = "ulpi";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@24520 {</div><div class='del'>-</div><div class='del'>-			phy0: ethernet-phy@0 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;3 1&gt;;</div><div class='del'>-				reg = &lt;0x0&gt;;</div><div class='del'>-			};</div><div class='del'>-			phy1: ethernet-phy@1 {</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;3 1&gt;;</div><div class='del'>-				reg = &lt;0x1&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@25520 {</div><div class='del'>-			tbi0: tbi-phy@11 {</div><div class='del'>-				reg = &lt;0x11&gt;;</div><div class='del'>-				device_type = "tbi-phy";</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@26520 {</div><div class='del'>-			status = "disabled";</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		enet0: ethernet@24000 {</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		enet1: ethernet@25000 {</div><div class='del'>-			tbi-handle = &lt;&amp;tbi0&gt;;</div><div class='del'>-			phy-handle = &lt;&amp;phy0&gt;;</div><div class='del'>-			phy-connection-type = "sgmii";</div><div class='del'>-</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet2: ethernet@26000 {</div><div class='del'>-			phy-handle = &lt;&amp;phy1&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> 		mpic: pic@40000 {</div><div class='ctx'> 			protected-sources = &lt;</div><div class='ctx'> 			42 76 77 78 79 /* serial1 , dma2 */</div><div class='hunk'>@@ -164,40 +55,12 @@</div><div class='ctx'> 		msi@41600 {</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pci0: pcie@ffe08000 {</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	pci1: pcie@ffe09000 {</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000</div><div class='del'>-			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x4 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x5 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x6 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x7 0x1</div><div class='del'>-			&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			ranges = &lt;0x2000000 0x0 0xa0000000</div><div class='del'>-				  0x2000000 0x0 0xa0000000</div><div class='del'>-				  0x0 0x20000000</div><div class='del'>-</div><div class='del'>-				  0x1000000 0x0 0x0</div><div class='del'>-				  0x1000000 0x0 0x0</div><div class='del'>-				  0x0 0x100000&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	pci2: pcie@ffe0a000 {</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p2020rdb_camp_core1.dts b/arch/powerpc/boot/dts/p2020rdb_camp_core1.dts<br/>index 261c34ba45ec..9bd8ef493dd2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p2020rdb_camp_core1.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p2020rdb_camp_core1.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p2020rdb_camp_core1.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p2020rdb_camp_core1.dts</a></div><div class='hunk'>@@ -15,28 +15,18 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "p2020si.dtsi"</div><div class='add'>+/include/ "p2020rdb.dts"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,P2020RDB";</div><div class='ctx'> 	compatible = "fsl,P2020RDB", "fsl,MPC85XXRDB-CAMP";</div><div class='ctx'> </div><div class='del'>-	aliases {</div><div class='del'>-		ethernet0 = &amp;enet0;</div><div class='del'>-		serial0 = &amp;serial1;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	cpus {</div><div class='ctx'> 		PowerPC,P2020@0 {</div><div class='del'>-		status = "disabled";</div><div class='add'>+			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	memory {</div><div class='del'>-		device_type = "memory";</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	localbus@ffe05000 {</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='hunk'>@@ -70,55 +60,10 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		dma@c300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0xc300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0xc100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;76 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;77 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;78 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;79 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		gpio: gpio-controller@f000 {</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		L2: l2-cache-controller@20000 {</div><div class='del'>-			compatible = "fsl,p2020-l2-cache-controller";</div><div class='del'>-			reg = &lt;0x20000 0x1000&gt;;</div><div class='del'>-			cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			cache-size = &lt;0x80000&gt;; // L2,512K</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		dma@21300 {</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -139,12 +84,6 @@</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		enet0: ethernet@24000 {</div><div class='del'>-			fixed-link = &lt;1 1 1000 0 0&gt;;</div><div class='del'>-			phy-connection-type = "rgmii-id";</div><div class='del'>-</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		enet1: ethernet@25000 {</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -170,22 +109,6 @@</div><div class='ctx'> 			&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		msi@41600 {</div><div class='del'>-			compatible = "fsl,p2020-msi", "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x80&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0</div><div class='del'>-				0xe1 0</div><div class='del'>-				0xe2 0</div><div class='del'>-				0xe3 0</div><div class='del'>-				0xe4 0</div><div class='del'>-				0xe5 0</div><div class='del'>-				0xe6 0</div><div class='del'>-				0xe7 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='ctx'> 		global-utilities@e0000 {	//global utilities block</div><div class='ctx'> 			status = "disabled";</div><div class='ctx'> 		};</div><div class='hunk'>@@ -199,30 +122,4 @@</div><div class='ctx'> 	pci1: pcie@ffe09000 {</div><div class='ctx'> 		status = "disabled";</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='del'>-	pci2: pcie@ffe0a000 {</div><div class='del'>-		ranges = &lt;0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000</div><div class='del'>-			  0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000&gt;;</div><div class='del'>-		interrupt-map-mask = &lt;0xf800 0x0 0x0 0x7&gt;;</div><div class='del'>-		interrupt-map = &lt;</div><div class='del'>-			/* IDSEL 0x0 */</div><div class='del'>-			0000 0x0 0x0 0x1 &amp;mpic 0x0 0x1</div><div class='del'>-			0000 0x0 0x0 0x2 &amp;mpic 0x1 0x1</div><div class='del'>-			0000 0x0 0x0 0x3 &amp;mpic 0x2 0x1</div><div class='del'>-			0000 0x0 0x0 0x4 &amp;mpic 0x3 0x1</div><div class='del'>-			&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0x0 0x0 0x0 0x0 0x0&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			ranges = &lt;0x2000000 0x0 0x80000000</div><div class='del'>-				  0x2000000 0x0 0x80000000</div><div class='del'>-				  0x0 0x20000000</div><div class='del'>-</div><div class='del'>-				  0x1000000 0x0 0x0</div><div class='del'>-				  0x1000000 0x0 0x0</div><div class='del'>-				  0x0 0x100000&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p2020si.dtsi b/arch/powerpc/boot/dts/p2020si.dtsi<br/>deleted file mode 100644<br/>index 6def17f265d3..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p2020si.dtsi?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p2020si.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,382 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * P2020 Device Tree Source</div><div class='del'>- *</div><div class='del'>- * Copyright 2011 Freescale Semiconductor Inc.</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='del'>-/dts-v1/;</div><div class='del'>-/ {</div><div class='del'>-	compatible = "fsl,P2020";</div><div class='del'>-	#address-cells = &lt;2&gt;;</div><div class='del'>-	#size-cells = &lt;2&gt;;</div><div class='del'>-</div><div class='del'>-	cpus {</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'>-		PowerPC,P2020@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		PowerPC,P2020@1 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0x1&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	localbus@ffe05000 {</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		compatible = "fsl,p2020-elbc", "fsl,elbc", "simple-bus";</div><div class='del'>-		reg = &lt;0 0xffe05000 0 0x1000&gt;;</div><div class='del'>-		interrupts = &lt;19 2&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	soc@ffe00000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "fsl,p2020-immr", "simple-bus";</div><div class='del'>-		ranges = &lt;0x0  0x0 0xffe00000 0x100000&gt;;</div><div class='del'>-		bus-frequency = &lt;0&gt;;		// Filled out by uboot.</div><div class='del'>-</div><div class='del'>-		ecm-law@0 {</div><div class='del'>-			compatible = "fsl,ecm-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;12&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ecm@1000 {</div><div class='del'>-			compatible = "fsl,p2020-ecm", "fsl,ecm";</div><div class='del'>-			reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;17 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		memory-controller@2000 {</div><div class='del'>-			compatible = "fsl,p2020-memory-controller";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;18 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@3000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@3100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x3100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;43 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial0: serial@4500 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial1: serial@4600 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x4600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;42 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi@7000 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,espi";</div><div class='del'>-			reg = &lt;0x7000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;59 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			mode = "cpu";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma@c300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0xc300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0xc100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;76 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;77 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;78 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;79 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpio: gpio-controller@f000 {</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-			compatible = "fsl,mpc8572-gpio";</div><div class='del'>-			reg = &lt;0xf000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;47 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			gpio-controller;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		L2: l2-cache-controller@20000 {</div><div class='del'>-			compatible = "fsl,p2020-l2-cache-controller";</div><div class='del'>-			reg = &lt;0x20000 0x1000&gt;;</div><div class='del'>-			cache-line-size = &lt;32&gt;;	// 32 bytes</div><div class='del'>-			cache-size = &lt;0x80000&gt;; // L2,512K</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;16 2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma@21300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x21300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x21100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;20 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;21 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;22 2&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;23 2&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb@22000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-usb2-dr";</div><div class='del'>-			reg = &lt;0x22000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;28 0x2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@24520 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,gianfar-mdio";</div><div class='del'>-			reg = &lt;0x24520 0x20&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@25520 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,gianfar-tbi";</div><div class='del'>-			reg = &lt;0x26520 0x20&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mdio@26520 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,gianfar-tbi";</div><div class='del'>-			reg = &lt;0x520 0x20&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet0: ethernet@24000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x24000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x24000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;29 2 30 2 34 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet1: ethernet@25000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x25000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x25000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;35 2 36 2 40 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enet2: ethernet@26000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			device_type = "network";</div><div class='del'>-			model = "eTSEC";</div><div class='del'>-			compatible = "gianfar";</div><div class='del'>-			reg = &lt;0x26000 0x1000&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x26000 0x1000&gt;;</div><div class='del'>-			local-mac-address = [ 00 00 00 00 00 00 ];</div><div class='del'>-			interrupts = &lt;31 2 32 2 33 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sdhci@2e000 {</div><div class='del'>-			compatible = "fsl,p2020-esdhc", "fsl,esdhc";</div><div class='del'>-			reg = &lt;0x2e000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;72 0x2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			/* Filled in by U-Boot */</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		crypto@30000 {</div><div class='del'>-			compatible = "fsl,sec3.1", "fsl,sec3.0", "fsl,sec2.4",</div><div class='del'>-				     "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";</div><div class='del'>-			reg = &lt;0x30000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;45 2 58 2&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			fsl,num-channels = &lt;4&gt;;</div><div class='del'>-			fsl,channel-fifo-len = &lt;24&gt;;</div><div class='del'>-			fsl,exec-units-mask = &lt;0xbfe&gt;;</div><div class='del'>-			fsl,descriptor-types-mask = &lt;0x3ab0ebf&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;2&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi@41600 {</div><div class='del'>-			compatible = "fsl,p2020-msi", "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x80&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0</div><div class='del'>-				0xe1 0</div><div class='del'>-				0xe2 0</div><div class='del'>-				0xe3 0</div><div class='del'>-				0xe4 0</div><div class='del'>-				0xe5 0</div><div class='del'>-				0xe6 0</div><div class='del'>-				0xe7 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		global-utilities@e0000 {	//global utilities block</div><div class='del'>-			compatible = "fsl,p2020-guts";</div><div class='del'>-			reg = &lt;0xe0000 0x1000&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci0: pcie@ffe08000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0 0xffe08000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;24 2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci1: pcie@ffe09000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0 0xffe09000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;25 2&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci2: pcie@ffe0a000 {</div><div class='del'>-		compatible = "fsl,mpc8548-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#interrupt-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		reg = &lt;0 0xffe0a000 0 0x1000&gt;;</div><div class='del'>-		bus-range = &lt;0 255&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-		interrupts = &lt;26 2&gt;;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p2041rdb.dts b/arch/powerpc/boot/dts/p2041rdb.dts<br/>index 79b6895027c0..4f957db01230 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p2041rdb.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p2041rdb.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p2041rdb.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p2041rdb.dts</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'>  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "p2041si.dtsi"</div><div class='add'>+/include/ "fsl/p2041si-pre.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,P2041RDB";</div><div class='hunk'>@@ -50,6 +50,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	soc: soc@ffe000000 {</div><div class='add'>+		ranges = &lt;0x00000000 0xf 0xfe000000 0x1000000&gt;;</div><div class='add'>+		reg = &lt;0xf 0xfe000000 0 0x00001000&gt;;</div><div class='ctx'> 		spi@110000 {</div><div class='ctx'> 			flash@0 {</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -106,7 +108,18 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	localbus@ffe124000 {</div><div class='add'>+	rio: rapidio@ffe0c0000 {</div><div class='add'>+		reg = &lt;0xf 0xfe0c0000 0 0x11000&gt;;</div><div class='add'>+</div><div class='add'>+		port1 {</div><div class='add'>+			ranges = &lt;0 0 0xc 0x20000000 0 0x10000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		port2 {</div><div class='add'>+			ranges = &lt;0 0 0xc 0x30000000 0 0x10000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	lbc: localbus@ffe124000 {</div><div class='ctx'> 		reg = &lt;0xf 0xfe124000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0 0 0xf 0xe8000000 0x08000000&gt;;</div><div class='ctx'> </div><div class='hunk'>@@ -122,6 +135,7 @@</div><div class='ctx'> 		reg = &lt;0xf 0xfe200000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000</div><div class='ctx'> 			  0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000&gt;;</div><div class='add'>+		fsl,msi = &lt;&amp;msi0&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xe0000000</div><div class='ctx'> 				  0x02000000 0 0xe0000000</div><div class='hunk'>@@ -137,6 +151,7 @@</div><div class='ctx'> 		reg = &lt;0xf 0xfe201000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000</div><div class='ctx'> 			  0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000&gt;;</div><div class='add'>+		fsl,msi = &lt;&amp;msi1&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xe0000000</div><div class='ctx'> 				  0x02000000 0 0xe0000000</div><div class='hunk'>@@ -152,6 +167,7 @@</div><div class='ctx'> 		reg = &lt;0xf 0xfe202000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0 0xe0000000 0xc 0x40000000 0 0x20000000</div><div class='ctx'> 			  0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000&gt;;</div><div class='add'>+		fsl,msi = &lt;&amp;msi2&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xe0000000</div><div class='ctx'> 				  0x02000000 0 0xe0000000</div><div class='hunk'>@@ -163,3 +179,5 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "fsl/p2041si-post.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p2041si.dtsi b/arch/powerpc/boot/dts/p2041si.dtsi<br/>deleted file mode 100644<br/>index f7492edd0dfd..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p2041si.dtsi?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p2041si.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,692 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * P2041 Silicon Device Tree Source</div><div class='del'>- *</div><div class='del'>- * Copyright 2011 Freescale Semiconductor Inc.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Freescale Semiconductor nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='del'>- * GNU General Public License ("GPL") as published by the Free Software</div><div class='del'>- * Foundation, either version 2 of that License or (at your option) any</div><div class='del'>- * later version.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='del'>- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='del'>- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='del'>- * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='del'>- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/dts-v1/;</div><div class='del'>-</div><div class='del'>-/ {</div><div class='del'>-	compatible = "fsl,P2041";</div><div class='del'>-	#address-cells = &lt;2&gt;;</div><div class='del'>-	#size-cells = &lt;2&gt;;</div><div class='del'>-	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		ccsr = &amp;soc;</div><div class='del'>-		dcsr = &amp;dcsr;</div><div class='del'>-</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		serial1 = &amp;serial1;</div><div class='del'>-		serial2 = &amp;serial2;</div><div class='del'>-		serial3 = &amp;serial3;</div><div class='del'>-		pci0 = &amp;pci0;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-		pci2 = &amp;pci2;</div><div class='del'>-		usb0 = &amp;usb0;</div><div class='del'>-		usb1 = &amp;usb1;</div><div class='del'>-		dma0 = &amp;dma0;</div><div class='del'>-		dma1 = &amp;dma1;</div><div class='del'>-		sdhc = &amp;sdhc;</div><div class='del'>-		msi0 = &amp;msi0;</div><div class='del'>-		msi1 = &amp;msi1;</div><div class='del'>-		msi2 = &amp;msi2;</div><div class='del'>-</div><div class='del'>-		crypto = &amp;crypto;</div><div class='del'>-		sec_jr0 = &amp;sec_jr0;</div><div class='del'>-		sec_jr1 = &amp;sec_jr1;</div><div class='del'>-		sec_jr2 = &amp;sec_jr2;</div><div class='del'>-		sec_jr3 = &amp;sec_jr3;</div><div class='del'>-		rtic_a = &amp;rtic_a;</div><div class='del'>-		rtic_b = &amp;rtic_b;</div><div class='del'>-		rtic_c = &amp;rtic_c;</div><div class='del'>-		rtic_d = &amp;rtic_d;</div><div class='del'>-		sec_mon = &amp;sec_mon;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cpus {</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'>-		cpu0: PowerPC,e500mc@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_0&gt;;</div><div class='del'>-			L2_0: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu1: PowerPC,e500mc@1 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;1&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_1&gt;;</div><div class='del'>-			L2_1: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu2: PowerPC,e500mc@2 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;2&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_2&gt;;</div><div class='del'>-			L2_2: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu3: PowerPC,e500mc@3 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;3&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_3&gt;;</div><div class='del'>-			L2_3: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	dcsr: dcsr@f00000000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		compatible = "fsl,dcsr", "simple-bus";</div><div class='del'>-</div><div class='del'>-		dcsr-epu@0 {</div><div class='del'>-			compatible = "fsl,dcsr-epu";</div><div class='del'>-			interrupts = &lt;52 2 0 0</div><div class='del'>-				      84 2 0 0</div><div class='del'>-				      85 2 0 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-npc {</div><div class='del'>-			compatible = "fsl,dcsr-npc";</div><div class='del'>-			reg = &lt;0x1000 0x1000 0x1000000 0x8000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-nxc@2000 {</div><div class='del'>-			compatible = "fsl,dcsr-nxc";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-corenet {</div><div class='del'>-			compatible = "fsl,dcsr-corenet";</div><div class='del'>-			reg = &lt;0x8000 0x1000 0xB0000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-dpaa@9000 {</div><div class='del'>-			compatible = "fsl,p2041-dcsr-dpaa", "fsl,dcsr-dpaa";</div><div class='del'>-			reg = &lt;0x9000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-ocn@11000 {</div><div class='del'>-			compatible = "fsl,p2041-dcsr-ocn", "fsl,dcsr-ocn";</div><div class='del'>-			reg = &lt;0x11000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-ddr@12000 {</div><div class='del'>-			compatible = "fsl,dcsr-ddr";</div><div class='del'>-			dev-handle = &lt;&amp;ddr&gt;;</div><div class='del'>-			reg = &lt;0x12000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-nal@18000 {</div><div class='del'>-			compatible = "fsl,p2041-dcsr-nal", "fsl,dcsr-nal";</div><div class='del'>-			reg = &lt;0x18000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-rcpm@22000 {</div><div class='del'>-			compatible = "fsl,p2041-dcsr-rcpm", "fsl,dcsr-rcpm";</div><div class='del'>-			reg = &lt;0x22000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@40000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu0&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@41000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu1&gt;;</div><div class='del'>-			reg = &lt;0x41000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@42000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu2&gt;;</div><div class='del'>-			reg = &lt;0x42000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@43000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu3&gt;;</div><div class='del'>-			reg = &lt;0x43000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	soc: soc@ffe000000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		ranges = &lt;0x00000000 0xf 0xfe000000 0x1000000&gt;;</div><div class='del'>-		reg = &lt;0xf 0xfe000000 0 0x00001000&gt;;</div><div class='del'>-</div><div class='del'>-		soc-sram-error {</div><div class='del'>-			compatible = "fsl,soc-sram-error";</div><div class='del'>-			interrupts = &lt;16 2 1 29&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		corenet-law@0 {</div><div class='del'>-			compatible = "fsl,corenet-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;32&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ddr: memory-controller@8000 {</div><div class='del'>-			compatible = "fsl,qoriq-memory-controller-v4.5", "fsl,qoriq-memory-controller";</div><div class='del'>-			reg = &lt;0x8000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 1 23&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cpc: l3-cache-controller@10000 {</div><div class='del'>-			compatible = "fsl,p2041-l3-cache-controller", "fsl,p4080-l3-cache-controller", "cache";</div><div class='del'>-			reg = &lt;0x10000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 1 27&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		corenet-cf@18000 {</div><div class='del'>-			compatible = "fsl,corenet-cf";</div><div class='del'>-			reg = &lt;0x18000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 1 31&gt;;</div><div class='del'>-			fsl,ccf-num-csdids = &lt;32&gt;;</div><div class='del'>-			fsl,ccf-num-snoopids = &lt;32&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		iommu@20000 {</div><div class='del'>-			compatible = "fsl,pamu-v1.0", "fsl,pamu";</div><div class='del'>-			reg = &lt;0x20000 0x4000&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				24 2 0 0</div><div class='del'>-				16 2 1 30&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;4&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "fsl,mpic", "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi0: msi@41600 {</div><div class='del'>-			compatible = "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x200&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0 0 0</div><div class='del'>-				0xe1 0 0 0</div><div class='del'>-				0xe2 0 0 0</div><div class='del'>-				0xe3 0 0 0</div><div class='del'>-				0xe4 0 0 0</div><div class='del'>-				0xe5 0 0 0</div><div class='del'>-				0xe6 0 0 0</div><div class='del'>-				0xe7 0 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi1: msi@41800 {</div><div class='del'>-			compatible = "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41800 0x200&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe8 0 0 0</div><div class='del'>-				0xe9 0 0 0</div><div class='del'>-				0xea 0 0 0</div><div class='del'>-				0xeb 0 0 0</div><div class='del'>-				0xec 0 0 0</div><div class='del'>-				0xed 0 0 0</div><div class='del'>-				0xee 0 0 0</div><div class='del'>-				0xef 0 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi2: msi@41a00 {</div><div class='del'>-			compatible = "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41a00 0x200&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xf0 0 0 0</div><div class='del'>-				0xf1 0 0 0</div><div class='del'>-				0xf2 0 0 0</div><div class='del'>-				0xf3 0 0 0</div><div class='del'>-				0xf4 0 0 0</div><div class='del'>-				0xf5 0 0 0</div><div class='del'>-				0xf6 0 0 0</div><div class='del'>-				0xf7 0 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		guts: global-utilities@e0000 {</div><div class='del'>-			compatible = "fsl,qoriq-device-config-1.0";</div><div class='del'>-			reg = &lt;0xe0000 0xe00&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='del'>-			#sleep-cells = &lt;1&gt;;</div><div class='del'>-			fsl,liodn-bits = &lt;12&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pins: global-utilities@e0e00 {</div><div class='del'>-			compatible = "fsl,qoriq-pin-control-1.0";</div><div class='del'>-			reg = &lt;0xe0e00 0x200&gt;;</div><div class='del'>-			#sleep-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clockgen: global-utilities@e1000 {</div><div class='del'>-			compatible = "fsl,p2041-clockgen", "fsl,qoriq-clockgen-1.0";</div><div class='del'>-			reg = &lt;0xe1000 0x1000&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		rcpm: global-utilities@e2000 {</div><div class='del'>-			compatible = "fsl,qoriq-rcpm-1.0";</div><div class='del'>-			reg = &lt;0xe2000 0x1000&gt;;</div><div class='del'>-			#sleep-cells = &lt;1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sfp: sfp@e8000 {</div><div class='del'>-			compatible = "fsl,p2041-sfp", "fsl,qoriq-sfp-1.0";</div><div class='del'>-			reg	   = &lt;0xe8000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serdes: serdes@ea000 {</div><div class='del'>-			compatible = "fsl,p2041-serdes";</div><div class='del'>-			reg	   = &lt;0xea000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma0: dma@100300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,p2041-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x100300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x100100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,p2041-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupts = &lt;28 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,p2041-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupts = &lt;29 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,p2041-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupts = &lt;30 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,p2041-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupts = &lt;31 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma1: dma@101300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,p2041-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x101300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x101100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,p2041-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupts = &lt;32 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,p2041-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupts = &lt;33 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,p2041-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupts = &lt;34 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,p2041-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupts = &lt;35 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi@110000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,p2041-espi", "fsl,mpc8536-espi";</div><div class='del'>-			reg = &lt;0x110000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;53 0x2 0 0&gt;;</div><div class='del'>-			fsl,espi-num-chipselects = &lt;4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sdhc: sdhc@114000 {</div><div class='del'>-			compatible = "fsl,p2041-esdhc", "fsl,esdhc";</div><div class='del'>-			reg = &lt;0x114000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;48 2 0 0&gt;;</div><div class='del'>-			sdhci,auto-cmd12;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@118000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x118000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;38 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@118100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x118100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;38 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@119000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x119000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;39 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@119100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;3&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x119100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;39 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial0: serial@11c500 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11c500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;36 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial1: serial@11c600 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11c600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;36 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial2: serial@11d500 {</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11d500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;37 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial3: serial@11d600 {</div><div class='del'>-			cell-index = &lt;3&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11d600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;37 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpio0: gpio@130000 {</div><div class='del'>-			compatible = "fsl,p2041-gpio", "fsl,qoriq-gpio";</div><div class='del'>-			reg = &lt;0x130000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;55 2 0 0&gt;;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-			gpio-controller;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb0: usb@210000 {</div><div class='del'>-			compatible = "fsl,p2041-usb2-mph",</div><div class='del'>-					"fsl,mpc85xx-usb2-mph", "fsl-usb2-mph";</div><div class='del'>-			reg = &lt;0x210000 0x1000&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;44 0x2 0 0&gt;;</div><div class='del'>-			phy_type = "utmi";</div><div class='del'>-			port0;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb1: usb@211000 {</div><div class='del'>-			compatible = "fsl,p2041-usb2-dr",</div><div class='del'>-					"fsl,mpc85xx-usb2-dr", "fsl-usb2-dr";</div><div class='del'>-			reg = &lt;0x211000 0x1000&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;45 0x2 0 0&gt;;</div><div class='del'>-			phy_type = "utmi";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sata@220000 {</div><div class='del'>-			compatible = "fsl,p2041-sata", "fsl,pq-sata-v2";</div><div class='del'>-			reg = &lt;0x220000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;68 0x2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sata@221000 {</div><div class='del'>-			compatible = "fsl,p2041-sata", "fsl,pq-sata-v2";</div><div class='del'>-			reg = &lt;0x221000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;69 0x2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		crypto: crypto@300000 {</div><div class='del'>-			compatible = "fsl,sec-v4.2", "fsl,sec-v4.0";</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			reg = &lt;0x300000 0x10000&gt;;</div><div class='del'>-			ranges = &lt;0 0x300000 0x10000&gt;;</div><div class='del'>-			interrupts = &lt;92 2 0 0&gt;;</div><div class='del'>-</div><div class='del'>-			sec_jr0: jr@1000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-job-ring",</div><div class='del'>-					     "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;88 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sec_jr1: jr@2000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-job-ring",</div><div class='del'>-					     "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;89 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sec_jr2: jr@3000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-job-ring",</div><div class='del'>-					     "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x3000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;90 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sec_jr3: jr@4000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-job-ring",</div><div class='del'>-					     "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x4000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;91 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			rtic@6000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-rtic",</div><div class='del'>-					     "fsl,sec-v4.0-rtic";</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0x6000 0x100&gt;;</div><div class='del'>-				ranges = &lt;0x0 0x6100 0xe00&gt;;</div><div class='del'>-</div><div class='del'>-				rtic_a: rtic-a@0 {</div><div class='del'>-					compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='del'>-						     "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x00 0x20 0x100 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				rtic_b: rtic-b@20 {</div><div class='del'>-					compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='del'>-						     "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x20 0x20 0x200 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				rtic_c: rtic-c@40 {</div><div class='del'>-					compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='del'>-						     "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x40 0x20 0x300 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				rtic_d: rtic-d@60 {</div><div class='del'>-					compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='del'>-						     "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x60 0x20 0x500 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sec_mon: sec_mon@314000 {</div><div class='del'>-			compatible = "fsl,sec-v4.2-mon", "fsl,sec-v4.0-mon";</div><div class='del'>-			reg = &lt;0x314000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;93 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	localbus@ffe124000 {</div><div class='del'>-		compatible = "fsl,p2041-elbc", "fsl,elbc", "simple-bus";</div><div class='del'>-		interrupts = &lt;25 2 0 0&gt;;</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci0: pcie@ffe200000 {</div><div class='del'>-		compatible = "fsl,p2041-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		bus-range = &lt;0x0 0xff&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		fsl,msi = &lt;&amp;msi0&gt;;</div><div class='del'>-		interrupts = &lt;16 2 1 15&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupts = &lt;16 2 1 15&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-			interrupt-map = &lt;</div><div class='del'>-				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 40 1 0 0</div><div class='del'>-				0000 0 0 2 &amp;mpic 1 1 0 0</div><div class='del'>-				0000 0 0 3 &amp;mpic 2 1 0 0</div><div class='del'>-				0000 0 0 4 &amp;mpic 3 1 0 0</div><div class='del'>-				&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci1: pcie@ffe201000 {</div><div class='del'>-		compatible = "fsl,p2041-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		bus-range = &lt;0 0xff&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		fsl,msi = &lt;&amp;msi1&gt;;</div><div class='del'>-		interrupts = &lt;16 2 1 14&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupts = &lt;16 2 1 14&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-			interrupt-map = &lt;</div><div class='del'>-				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 41 1 0 0</div><div class='del'>-				0000 0 0 2 &amp;mpic 5 1 0 0</div><div class='del'>-				0000 0 0 3 &amp;mpic 6 1 0 0</div><div class='del'>-				0000 0 0 4 &amp;mpic 7 1 0 0</div><div class='del'>-				&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci2: pcie@ffe202000 {</div><div class='del'>-		compatible = "fsl,p2041-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		bus-range = &lt;0x0 0xff&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		fsl,msi = &lt;&amp;msi2&gt;;</div><div class='del'>-		interrupts = &lt;16 2 1 13&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupts = &lt;16 2 1 13&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-			interrupt-map = &lt;</div><div class='del'>-				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 42 1 0 0</div><div class='del'>-				0000 0 0 2 &amp;mpic 9 1 0 0</div><div class='del'>-				0000 0 0 3 &amp;mpic 10 1 0 0</div><div class='del'>-				0000 0 0 4 &amp;mpic 11 1 0 0</div><div class='del'>-				&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p3041ds.dts b/arch/powerpc/boot/dts/p3041ds.dts<br/>index bbd113b49a8f..f469145abaeb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p3041ds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p3041ds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p3041ds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p3041ds.dts</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'>  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "p3041si.dtsi"</div><div class='add'>+/include/ "fsl/p3041si-pre.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,P3041DS";</div><div class='hunk'>@@ -50,6 +50,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	soc: soc@ffe000000 {</div><div class='add'>+		ranges = &lt;0x00000000 0xf 0xfe000000 0x1000000&gt;;</div><div class='add'>+		reg = &lt;0xf 0xfe000000 0 0x00001000&gt;;</div><div class='ctx'> 		spi@110000 {</div><div class='ctx'> 			flash@0 {</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -99,7 +101,18 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	localbus@ffe124000 {</div><div class='add'>+	rio: rapidio@ffe0c0000 {</div><div class='add'>+		reg = &lt;0xf 0xfe0c0000 0 0x11000&gt;;</div><div class='add'>+</div><div class='add'>+		port1 {</div><div class='add'>+			ranges = &lt;0 0 0xc 0x20000000 0 0x10000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		port2 {</div><div class='add'>+			ranges = &lt;0 0 0xc 0x30000000 0 0x10000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	lbc: localbus@ffe124000 {</div><div class='ctx'> 		reg = &lt;0xf 0xfe124000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0 0 0xf 0xe8000000 0x08000000</div><div class='ctx'> 			  2 0 0xf 0xffa00000 0x00040000</div><div class='hunk'>@@ -160,6 +173,7 @@</div><div class='ctx'> 		reg = &lt;0xf 0xfe200000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000</div><div class='ctx'> 			  0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000&gt;;</div><div class='add'>+		fsl,msi = &lt;&amp;msi0&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xe0000000</div><div class='ctx'> 				  0x02000000 0 0xe0000000</div><div class='hunk'>@@ -175,6 +189,7 @@</div><div class='ctx'> 		reg = &lt;0xf 0xfe201000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000</div><div class='ctx'> 			  0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000&gt;;</div><div class='add'>+		fsl,msi = &lt;&amp;msi1&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xe0000000</div><div class='ctx'> 				  0x02000000 0 0xe0000000</div><div class='hunk'>@@ -190,6 +205,7 @@</div><div class='ctx'> 		reg = &lt;0xf 0xfe202000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0 0xe0000000 0xc 0x40000000 0 0x20000000</div><div class='ctx'> 			  0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000&gt;;</div><div class='add'>+		fsl,msi = &lt;&amp;msi2&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xe0000000</div><div class='ctx'> 				  0x02000000 0 0xe0000000</div><div class='hunk'>@@ -205,6 +221,7 @@</div><div class='ctx'> 		reg = &lt;0xf 0xfe203000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0 0xe0000000 0xc 0x60000000 0 0x20000000</div><div class='ctx'> 			  0x01000000 0 0x00000000 0xf 0xf8030000 0 0x00010000&gt;;</div><div class='add'>+		fsl,msi = &lt;&amp;msi2&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xe0000000</div><div class='ctx'> 				  0x02000000 0 0xe0000000</div><div class='hunk'>@@ -216,3 +233,5 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "fsl/p3041si-post.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p3041si.dtsi b/arch/powerpc/boot/dts/p3041si.dtsi<br/>deleted file mode 100644<br/>index 87130b732bc7..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p3041si.dtsi?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p3041si.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,729 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * P3041 Silicon Device Tree Source</div><div class='del'>- *</div><div class='del'>- * Copyright 2010-2011 Freescale Semiconductor Inc.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Freescale Semiconductor nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='del'>- * GNU General Public License ("GPL") as published by the Free Software</div><div class='del'>- * Foundation, either version 2 of that License or (at your option) any</div><div class='del'>- * later version.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='del'>- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='del'>- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='del'>- * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='del'>- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/dts-v1/;</div><div class='del'>-</div><div class='del'>-/ {</div><div class='del'>-	compatible = "fsl,P3041";</div><div class='del'>-	#address-cells = &lt;2&gt;;</div><div class='del'>-	#size-cells = &lt;2&gt;;</div><div class='del'>-	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		ccsr = &amp;soc;</div><div class='del'>-		dcsr = &amp;dcsr;</div><div class='del'>-</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		serial1 = &amp;serial1;</div><div class='del'>-		serial2 = &amp;serial2;</div><div class='del'>-		serial3 = &amp;serial3;</div><div class='del'>-		pci0 = &amp;pci0;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-		pci2 = &amp;pci2;</div><div class='del'>-		pci3 = &amp;pci3;</div><div class='del'>-		usb0 = &amp;usb0;</div><div class='del'>-		usb1 = &amp;usb1;</div><div class='del'>-		dma0 = &amp;dma0;</div><div class='del'>-		dma1 = &amp;dma1;</div><div class='del'>-		sdhc = &amp;sdhc;</div><div class='del'>-		msi0 = &amp;msi0;</div><div class='del'>-		msi1 = &amp;msi1;</div><div class='del'>-		msi2 = &amp;msi2;</div><div class='del'>-</div><div class='del'>-		crypto = &amp;crypto;</div><div class='del'>-		sec_jr0 = &amp;sec_jr0;</div><div class='del'>-		sec_jr1 = &amp;sec_jr1;</div><div class='del'>-		sec_jr2 = &amp;sec_jr2;</div><div class='del'>-		sec_jr3 = &amp;sec_jr3;</div><div class='del'>-		rtic_a = &amp;rtic_a;</div><div class='del'>-		rtic_b = &amp;rtic_b;</div><div class='del'>-		rtic_c = &amp;rtic_c;</div><div class='del'>-		rtic_d = &amp;rtic_d;</div><div class='del'>-		sec_mon = &amp;sec_mon;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-		rio0 = &amp;rapidio0;</div><div class='del'>- */</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cpus {</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'>-		cpu0: PowerPC,e500mc@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_0&gt;;</div><div class='del'>-			L2_0: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu1: PowerPC,e500mc@1 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;1&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_1&gt;;</div><div class='del'>-			L2_1: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu2: PowerPC,e500mc@2 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;2&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_2&gt;;</div><div class='del'>-			L2_2: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu3: PowerPC,e500mc@3 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;3&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_3&gt;;</div><div class='del'>-			L2_3: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	dcsr: dcsr@f00000000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		compatible = "fsl,dcsr", "simple-bus";</div><div class='del'>-</div><div class='del'>-		dcsr-epu@0 {</div><div class='del'>-			compatible = "fsl,dcsr-epu";</div><div class='del'>-			interrupts = &lt;52 2 0 0</div><div class='del'>-				      84 2 0 0</div><div class='del'>-				      85 2 0 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-npc {</div><div class='del'>-			compatible = "fsl,dcsr-npc";</div><div class='del'>-			reg = &lt;0x1000 0x1000 0x1000000 0x8000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-nxc@2000 {</div><div class='del'>-			compatible = "fsl,dcsr-nxc";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-corenet {</div><div class='del'>-			compatible = "fsl,dcsr-corenet";</div><div class='del'>-			reg = &lt;0x8000 0x1000 0xB0000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-dpaa@9000 {</div><div class='del'>-			compatible = "fsl,p43041-dcsr-dpaa", "fsl,dcsr-dpaa";</div><div class='del'>-			reg = &lt;0x9000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-ocn@11000 {</div><div class='del'>-			compatible = "fsl,p43041-dcsr-ocn", "fsl,dcsr-ocn";</div><div class='del'>-			reg = &lt;0x11000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-ddr@12000 {</div><div class='del'>-			compatible = "fsl,dcsr-ddr";</div><div class='del'>-			dev-handle = &lt;&amp;ddr&gt;;</div><div class='del'>-			reg = &lt;0x12000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-nal@18000 {</div><div class='del'>-			compatible = "fsl,p43041-dcsr-nal", "fsl,dcsr-nal";</div><div class='del'>-			reg = &lt;0x18000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-rcpm@22000 {</div><div class='del'>-			compatible = "fsl,p43041-dcsr-rcpm", "fsl,dcsr-rcpm";</div><div class='del'>-			reg = &lt;0x22000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@40000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu0&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@41000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu1&gt;;</div><div class='del'>-			reg = &lt;0x41000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@42000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu2&gt;;</div><div class='del'>-			reg = &lt;0x42000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@43000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu3&gt;;</div><div class='del'>-			reg = &lt;0x43000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	soc: soc@ffe000000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		ranges = &lt;0x00000000 0xf 0xfe000000 0x1000000&gt;;</div><div class='del'>-		reg = &lt;0xf 0xfe000000 0 0x00001000&gt;;</div><div class='del'>-</div><div class='del'>-		soc-sram-error {</div><div class='del'>-			compatible = "fsl,soc-sram-error";</div><div class='del'>-			interrupts = &lt;16 2 1 29&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		corenet-law@0 {</div><div class='del'>-			compatible = "fsl,corenet-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;32&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ddr: memory-controller@8000 {</div><div class='del'>-			compatible = "fsl,qoriq-memory-controller-v4.5", "fsl,qoriq-memory-controller";</div><div class='del'>-			reg = &lt;0x8000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 1 23&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cpc: l3-cache-controller@10000 {</div><div class='del'>-			compatible = "fsl,p3041-l3-cache-controller", "fsl,p4080-l3-cache-controller", "cache";</div><div class='del'>-			reg = &lt;0x10000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 1 27&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		corenet-cf@18000 {</div><div class='del'>-			compatible = "fsl,corenet-cf";</div><div class='del'>-			reg = &lt;0x18000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 1 31&gt;;</div><div class='del'>-			fsl,ccf-num-csdids = &lt;32&gt;;</div><div class='del'>-			fsl,ccf-num-snoopids = &lt;32&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		iommu@20000 {</div><div class='del'>-			compatible = "fsl,pamu-v1.0", "fsl,pamu";</div><div class='del'>-			reg = &lt;0x20000 0x4000&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				24 2 0 0</div><div class='del'>-				16 2 1 30&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;4&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "fsl,mpic", "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi0: msi@41600 {</div><div class='del'>-			compatible = "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x200&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0 0 0</div><div class='del'>-				0xe1 0 0 0</div><div class='del'>-				0xe2 0 0 0</div><div class='del'>-				0xe3 0 0 0</div><div class='del'>-				0xe4 0 0 0</div><div class='del'>-				0xe5 0 0 0</div><div class='del'>-				0xe6 0 0 0</div><div class='del'>-				0xe7 0 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi1: msi@41800 {</div><div class='del'>-			compatible = "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41800 0x200&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe8 0 0 0</div><div class='del'>-				0xe9 0 0 0</div><div class='del'>-				0xea 0 0 0</div><div class='del'>-				0xeb 0 0 0</div><div class='del'>-				0xec 0 0 0</div><div class='del'>-				0xed 0 0 0</div><div class='del'>-				0xee 0 0 0</div><div class='del'>-				0xef 0 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi2: msi@41a00 {</div><div class='del'>-			compatible = "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41a00 0x200&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xf0 0 0 0</div><div class='del'>-				0xf1 0 0 0</div><div class='del'>-				0xf2 0 0 0</div><div class='del'>-				0xf3 0 0 0</div><div class='del'>-				0xf4 0 0 0</div><div class='del'>-				0xf5 0 0 0</div><div class='del'>-				0xf6 0 0 0</div><div class='del'>-				0xf7 0 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		guts: global-utilities@e0000 {</div><div class='del'>-			compatible = "fsl,qoriq-device-config-1.0";</div><div class='del'>-			reg = &lt;0xe0000 0xe00&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='del'>-			#sleep-cells = &lt;1&gt;;</div><div class='del'>-			fsl,liodn-bits = &lt;12&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pins: global-utilities@e0e00 {</div><div class='del'>-			compatible = "fsl,qoriq-pin-control-1.0";</div><div class='del'>-			reg = &lt;0xe0e00 0x200&gt;;</div><div class='del'>-			#sleep-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clockgen: global-utilities@e1000 {</div><div class='del'>-			compatible = "fsl,p3041-clockgen", "fsl,qoriq-clockgen-1.0";</div><div class='del'>-			reg = &lt;0xe1000 0x1000&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		rcpm: global-utilities@e2000 {</div><div class='del'>-			compatible = "fsl,qoriq-rcpm-1.0";</div><div class='del'>-			reg = &lt;0xe2000 0x1000&gt;;</div><div class='del'>-			#sleep-cells = &lt;1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sfp: sfp@e8000 {</div><div class='del'>-			compatible = "fsl,p3041-sfp", "fsl,qoriq-sfp-1.0";</div><div class='del'>-			reg	   = &lt;0xe8000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serdes: serdes@ea000 {</div><div class='del'>-			compatible = "fsl,p3041-serdes";</div><div class='del'>-			reg	   = &lt;0xea000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma0: dma@100300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,p3041-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x100300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x100100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,p3041-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupts = &lt;28 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,p3041-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupts = &lt;29 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,p3041-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupts = &lt;30 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,p3041-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupts = &lt;31 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma1: dma@101300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,p3041-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x101300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x101100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,p3041-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupts = &lt;32 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,p3041-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupts = &lt;33 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,p3041-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupts = &lt;34 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,p3041-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupts = &lt;35 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi@110000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,p3041-espi", "fsl,mpc8536-espi";</div><div class='del'>-			reg = &lt;0x110000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;53 0x2 0 0&gt;;</div><div class='del'>-			fsl,espi-num-chipselects = &lt;4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sdhc: sdhc@114000 {</div><div class='del'>-			compatible = "fsl,p3041-esdhc", "fsl,esdhc";</div><div class='del'>-			reg = &lt;0x114000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;48 2 0 0&gt;;</div><div class='del'>-			sdhci,auto-cmd12;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@118000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x118000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;38 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@118100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x118100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;38 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@119000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x119000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;39 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@119100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;3&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x119100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;39 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial0: serial@11c500 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11c500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;36 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial1: serial@11c600 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11c600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;36 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial2: serial@11d500 {</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11d500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;37 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial3: serial@11d600 {</div><div class='del'>-			cell-index = &lt;3&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11d600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;37 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpio0: gpio@130000 {</div><div class='del'>-			compatible = "fsl,p3041-gpio", "fsl,qoriq-gpio";</div><div class='del'>-			reg = &lt;0x130000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;55 2 0 0&gt;;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-			gpio-controller;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb0: usb@210000 {</div><div class='del'>-			compatible = "fsl,p3041-usb2-mph",</div><div class='del'>-					"fsl,mpc85xx-usb2-mph", "fsl-usb2-mph";</div><div class='del'>-			reg = &lt;0x210000 0x1000&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;44 0x2 0 0&gt;;</div><div class='del'>-			phy_type = "utmi";</div><div class='del'>-			port0;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb1: usb@211000 {</div><div class='del'>-			compatible = "fsl,p3041-usb2-dr",</div><div class='del'>-					"fsl,mpc85xx-usb2-dr", "fsl-usb2-dr";</div><div class='del'>-			reg = &lt;0x211000 0x1000&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;45 0x2 0 0&gt;;</div><div class='del'>-			dr_mode = "host";</div><div class='del'>-			phy_type = "utmi";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sata@220000 {</div><div class='del'>-			compatible = "fsl,p3041-sata", "fsl,pq-sata-v2";</div><div class='del'>-			reg = &lt;0x220000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;68 0x2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sata@221000 {</div><div class='del'>-			compatible = "fsl,p3041-sata", "fsl,pq-sata-v2";</div><div class='del'>-			reg = &lt;0x221000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;69 0x2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		crypto: crypto@300000 {</div><div class='del'>-			compatible = "fsl,sec-v4.2", "fsl,sec-v4.0";</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			reg		 = &lt;0x300000 0x10000&gt;;</div><div class='del'>-			ranges		 = &lt;0 0x300000 0x10000&gt;;</div><div class='del'>-			interrupts	 = &lt;92 2 0 0&gt;;</div><div class='del'>-</div><div class='del'>-			sec_jr0: jr@1000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-job-ring",</div><div class='del'>-					     "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;88 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sec_jr1: jr@2000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-job-ring",</div><div class='del'>-					     "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;89 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sec_jr2: jr@3000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-job-ring",</div><div class='del'>-					     "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x3000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;90 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sec_jr3: jr@4000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-job-ring",</div><div class='del'>-					     "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x4000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;91 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			rtic@6000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-rtic",</div><div class='del'>-					     "fsl,sec-v4.0-rtic";</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0x6000 0x100&gt;;</div><div class='del'>-				ranges = &lt;0x0 0x6100 0xe00&gt;;</div><div class='del'>-</div><div class='del'>-				rtic_a: rtic-a@0 {</div><div class='del'>-					compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='del'>-						     "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x00 0x20 0x100 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				rtic_b: rtic-b@20 {</div><div class='del'>-					compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='del'>-						     "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x20 0x20 0x200 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				rtic_c: rtic-c@40 {</div><div class='del'>-					compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='del'>-						     "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x40 0x20 0x300 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				rtic_d: rtic-d@60 {</div><div class='del'>-					compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='del'>-						     "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x60 0x20 0x500 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sec_mon: sec_mon@314000 {</div><div class='del'>-			compatible = "fsl,sec-v4.2-mon", "fsl,sec-v4.0-mon";</div><div class='del'>-			reg = &lt;0x314000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;93 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-	rapidio0: rapidio@ffe0c0000</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-	localbus@ffe124000 {</div><div class='del'>-		compatible = "fsl,p3041-elbc", "fsl,elbc", "simple-bus";</div><div class='del'>-		interrupts = &lt;25 2 0 0&gt;;</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci0: pcie@ffe200000 {</div><div class='del'>-		compatible = "fsl,p3041-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		bus-range = &lt;0x0 0xff&gt;;</div><div class='del'>-		clock-frequency = &lt;0x1fca055&gt;;</div><div class='del'>-		fsl,msi = &lt;&amp;msi0&gt;;</div><div class='del'>-		interrupts = &lt;16 2 1 15&gt;;</div><div class='del'>-</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupts = &lt;16 2 1 15&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-			interrupt-map = &lt;</div><div class='del'>-				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 40 1 0 0</div><div class='del'>-				0000 0 0 2 &amp;mpic 1 1 0 0</div><div class='del'>-				0000 0 0 3 &amp;mpic 2 1 0 0</div><div class='del'>-				0000 0 0 4 &amp;mpic 3 1 0 0</div><div class='del'>-				&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci1: pcie@ffe201000 {</div><div class='del'>-		compatible = "fsl,p3041-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		bus-range = &lt;0 0xff&gt;;</div><div class='del'>-		clock-frequency = &lt;0x1fca055&gt;;</div><div class='del'>-		fsl,msi = &lt;&amp;msi1&gt;;</div><div class='del'>-		interrupts = &lt;16 2 1 14&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupts = &lt;16 2 1 14&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-			interrupt-map = &lt;</div><div class='del'>-				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 41 1 0 0</div><div class='del'>-				0000 0 0 2 &amp;mpic 5 1 0 0</div><div class='del'>-				0000 0 0 3 &amp;mpic 6 1 0 0</div><div class='del'>-				0000 0 0 4 &amp;mpic 7 1 0 0</div><div class='del'>-				&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci2: pcie@ffe202000 {</div><div class='del'>-		compatible = "fsl,p3041-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		bus-range = &lt;0x0 0xff&gt;;</div><div class='del'>-		clock-frequency = &lt;0x1fca055&gt;;</div><div class='del'>-		fsl,msi = &lt;&amp;msi2&gt;;</div><div class='del'>-		interrupts = &lt;16 2 1 13&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupts = &lt;16 2 1 13&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-			interrupt-map = &lt;</div><div class='del'>-				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 42 1 0 0</div><div class='del'>-				0000 0 0 2 &amp;mpic 9 1 0 0</div><div class='del'>-				0000 0 0 3 &amp;mpic 10 1 0 0</div><div class='del'>-				0000 0 0 4 &amp;mpic 11 1 0 0</div><div class='del'>-				&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci3: pcie@ffe203000 {</div><div class='del'>-		compatible = "fsl,p3041-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		bus-range = &lt;0x0 0xff&gt;;</div><div class='del'>-		clock-frequency = &lt;0x1fca055&gt;;</div><div class='del'>-		fsl,msi = &lt;&amp;msi2&gt;;</div><div class='del'>-		interrupts = &lt;16 2 1 12&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupts = &lt;16 2 1 12&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-			interrupt-map = &lt;</div><div class='del'>-				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 43 1 0 0</div><div class='del'>-				0000 0 0 2 &amp;mpic 0 1 0 0</div><div class='del'>-				0000 0 0 3 &amp;mpic 4 1 0 0</div><div class='del'>-				0000 0 0 4 &amp;mpic 8 1 0 0</div><div class='del'>-				&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p3060qds.dts b/arch/powerpc/boot/dts/p3060qds.dts<br/>index 08b9193213e7..529042e4b9a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p3060qds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p3060qds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p3060qds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p3060qds.dts</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'>  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "p3060si.dtsi"</div><div class='add'>+/include/ "fsl/p3060si-pre.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,P3060QDS";</div><div class='hunk'>@@ -50,6 +50,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	soc: soc@ffe000000 {</div><div class='add'>+		ranges = &lt;0x00000000 0xf 0xfe000000 0x1000000&gt;;</div><div class='add'>+		reg = &lt;0xf 0xfe000000 0 0x00001000&gt;;</div><div class='ctx'> 		spi@110000 {</div><div class='ctx'> 			flash@0 {</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -138,7 +140,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	rapidio@ffe0c0000 {</div><div class='add'>+	rio: rapidio@ffe0c0000 {</div><div class='ctx'> 		reg = &lt;0xf 0xfe0c0000 0 0x11000&gt;;</div><div class='ctx'> </div><div class='ctx'> 		port1 {</div><div class='hunk'>@@ -149,7 +151,7 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	localbus@ffe124000 {</div><div class='add'>+	lbc: localbus@ffe124000 {</div><div class='ctx'> 		reg = &lt;0xf 0xfe124000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0 0 0xf 0xe8000000 0x08000000</div><div class='ctx'> 			  2 0 0xf 0xffa00000 0x00040000</div><div class='hunk'>@@ -210,6 +212,7 @@</div><div class='ctx'> 		reg = &lt;0xf 0xfe200000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000</div><div class='ctx'> 			  0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000&gt;;</div><div class='add'>+		fsl,msi = &lt;&amp;msi0&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xe0000000</div><div class='ctx'> 				  0x02000000 0 0xe0000000</div><div class='hunk'>@@ -225,6 +228,7 @@</div><div class='ctx'> 		reg = &lt;0xf 0xfe201000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000</div><div class='ctx'> 			  0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000&gt;;</div><div class='add'>+		fsl,msi = &lt;&amp;msi1&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xe0000000</div><div class='ctx'> 				  0x02000000 0 0xe0000000</div><div class='hunk'>@@ -236,3 +240,5 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "fsl/p3060si-post.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p3060si.dtsi b/arch/powerpc/boot/dts/p3060si.dtsi<br/>deleted file mode 100644<br/>index 68947e157bbc..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p3060si.dtsi?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p3060si.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,719 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * P3060 Silicon Device Tree Source</div><div class='del'>- *</div><div class='del'>- * Copyright 2011 Freescale Semiconductor Inc.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Freescale Semiconductor nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='del'>- * GNU General Public License ("GPL") as published by the Free Software</div><div class='del'>- * Foundation, either version 2 of that License or (at your option) any</div><div class='del'>- * later version.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='del'>- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='del'>- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='del'>- * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='del'>- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/dts-v1/;</div><div class='del'>-</div><div class='del'>-/ {</div><div class='del'>-	compatible = "fsl,P3060";</div><div class='del'>-	#address-cells = &lt;2&gt;;</div><div class='del'>-	#size-cells = &lt;2&gt;;</div><div class='del'>-	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		ccsr = &amp;soc;</div><div class='del'>-		dcsr = &amp;dcsr;</div><div class='del'>-</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		serial1 = &amp;serial1;</div><div class='del'>-		serial2 = &amp;serial2;</div><div class='del'>-		serial3 = &amp;serial3;</div><div class='del'>-		pci0 = &amp;pci0;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-		usb0 = &amp;usb0;</div><div class='del'>-		usb1 = &amp;usb1;</div><div class='del'>-		dma0 = &amp;dma0;</div><div class='del'>-		dma1 = &amp;dma1;</div><div class='del'>-		msi0 = &amp;msi0;</div><div class='del'>-		msi1 = &amp;msi1;</div><div class='del'>-		msi2 = &amp;msi2;</div><div class='del'>-</div><div class='del'>-		crypto = &amp;crypto;</div><div class='del'>-		sec_jr0 = &amp;sec_jr0;</div><div class='del'>-		sec_jr1 = &amp;sec_jr1;</div><div class='del'>-		sec_jr2 = &amp;sec_jr2;</div><div class='del'>-		sec_jr3 = &amp;sec_jr3;</div><div class='del'>-		rtic_a = &amp;rtic_a;</div><div class='del'>-		rtic_b = &amp;rtic_b;</div><div class='del'>-		rtic_c = &amp;rtic_c;</div><div class='del'>-		rtic_d = &amp;rtic_d;</div><div class='del'>-		sec_mon = &amp;sec_mon;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cpus {</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'>-		cpu0: PowerPC,e500mc@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_0&gt;;</div><div class='del'>-			L2_0: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu1: PowerPC,e500mc@1 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;1&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_1&gt;;</div><div class='del'>-			L2_1: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu4: PowerPC,e500mc@4 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;4&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_4&gt;;</div><div class='del'>-			L2_4: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu5: PowerPC,e500mc@5 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;5&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_5&gt;;</div><div class='del'>-			L2_5: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu6: PowerPC,e500mc@6 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;6&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_6&gt;;</div><div class='del'>-			L2_6: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu7: PowerPC,e500mc@7 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;7&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_7&gt;;</div><div class='del'>-			L2_7: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	dcsr: dcsr@f00000000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		compatible = "fsl,dcsr", "simple-bus";</div><div class='del'>-</div><div class='del'>-		dcsr-epu@0 {</div><div class='del'>-			compatible = "fsl,dcsr-epu";</div><div class='del'>-			interrupts = &lt;52 2 0 0</div><div class='del'>-				      84 2 0 0</div><div class='del'>-				      85 2 0 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-npc {</div><div class='del'>-			compatible = "fsl,dcsr-npc";</div><div class='del'>-			reg = &lt;0x1000 0x1000 0x1000000 0x8000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-nxc@2000 {</div><div class='del'>-			compatible = "fsl,dcsr-nxc";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-corenet {</div><div class='del'>-			compatible = "fsl,dcsr-corenet";</div><div class='del'>-			reg = &lt;0x8000 0x1000 0xB0000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-dpaa@9000 {</div><div class='del'>-			compatible = "fsl,p3060-dcsr-dpaa", "fsl,dcsr-dpaa";</div><div class='del'>-			reg = &lt;0x9000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-ocn@11000 {</div><div class='del'>-			compatible = "fsl,p3060-dcsr-ocn", "fsl,dcsr-ocn";</div><div class='del'>-			reg = &lt;0x11000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-ddr@12000 {</div><div class='del'>-			compatible = "fsl,dcsr-ddr";</div><div class='del'>-			dev-handle = &lt;&amp;ddr&gt;;</div><div class='del'>-			reg = &lt;0x12000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-nal@18000 {</div><div class='del'>-			compatible = "fsl,p3060-dcsr-nal", "fsl,dcsr-nal";</div><div class='del'>-			reg = &lt;0x18000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-rcpm@22000 {</div><div class='del'>-			compatible = "fsl,p3060-dcsr-rcpm", "fsl,dcsr-rcpm";</div><div class='del'>-			reg = &lt;0x22000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@40000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu0&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@41000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu1&gt;;</div><div class='del'>-			reg = &lt;0x41000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@44000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu4&gt;;</div><div class='del'>-			reg = &lt;0x44000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@45000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu5&gt;;</div><div class='del'>-			reg = &lt;0x45000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@46000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu6&gt;;</div><div class='del'>-			reg = &lt;0x46000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@47000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu7&gt;;</div><div class='del'>-			reg = &lt;0x47000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	soc: soc@ffe000000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		ranges = &lt;0x00000000 0xf 0xfe000000 0x1000000&gt;;</div><div class='del'>-		reg = &lt;0xf 0xfe000000 0 0x00001000&gt;;</div><div class='del'>-</div><div class='del'>-		soc-sram-error {</div><div class='del'>-			compatible = "fsl,soc-sram-error";</div><div class='del'>-			interrupts = &lt;16 2 1 29&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		corenet-law@0 {</div><div class='del'>-			compatible = "fsl,corenet-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;32&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ddr: memory-controller@8000 {</div><div class='del'>-			compatible = "fsl,qoriq-memory-controller-v4.4", "fsl,qoriq-memory-controller";</div><div class='del'>-			reg = &lt;0x8000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 1 23&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cpc: l3-cache-controller@10000 {</div><div class='del'>-			compatible = "fsl,p3060-l3-cache-controller", "cache";</div><div class='del'>-			reg = &lt;0x10000 0x1000</div><div class='del'>-			       0x11000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 1 27&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		corenet-cf@18000 {</div><div class='del'>-			compatible = "fsl,corenet-cf";</div><div class='del'>-			reg = &lt;0x18000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 1 31&gt;;</div><div class='del'>-			fsl,ccf-num-csdids = &lt;32&gt;;</div><div class='del'>-			fsl,ccf-num-snoopids = &lt;32&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		iommu@20000 {</div><div class='del'>-			compatible = "fsl,pamu-v1.0", "fsl,pamu";</div><div class='del'>-			reg = &lt;0x20000 0x5000&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				24 2 0 0</div><div class='del'>-				16 2 1 30&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;4&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "fsl,mpic", "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi0: msi@41600 {</div><div class='del'>-			compatible = "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x200&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0 0 0</div><div class='del'>-				0xe1 0 0 0</div><div class='del'>-				0xe2 0 0 0</div><div class='del'>-				0xe3 0 0 0</div><div class='del'>-				0xe4 0 0 0</div><div class='del'>-				0xe5 0 0 0</div><div class='del'>-				0xe6 0 0 0</div><div class='del'>-				0xe7 0 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi1: msi@41800 {</div><div class='del'>-			compatible = "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41800 0x200&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe8 0 0 0</div><div class='del'>-				0xe9 0 0 0</div><div class='del'>-				0xea 0 0 0</div><div class='del'>-				0xeb 0 0 0</div><div class='del'>-				0xec 0 0 0</div><div class='del'>-				0xed 0 0 0</div><div class='del'>-				0xee 0 0 0</div><div class='del'>-				0xef 0 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi2: msi@41a00 {</div><div class='del'>-			compatible = "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41a00 0x200&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xf0 0 0 0</div><div class='del'>-				0xf1 0 0 0</div><div class='del'>-				0xf2 0 0 0</div><div class='del'>-				0xf3 0 0 0</div><div class='del'>-				0xf4 0 0 0</div><div class='del'>-				0xf5 0 0 0</div><div class='del'>-				0xf6 0 0 0</div><div class='del'>-				0xf7 0 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		rmu: rmu@d3000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,srio-rmu";</div><div class='del'>-			reg = &lt;0xd3000 0x500&gt;;</div><div class='del'>-			ranges = &lt;0x0 0xd3000 0x500&gt;;</div><div class='del'>-</div><div class='del'>-			message-unit@0 {</div><div class='del'>-				compatible = "fsl,srio-msg-unit";</div><div class='del'>-				reg = &lt;0x0 0x100&gt;;</div><div class='del'>-				interrupts = &lt;</div><div class='del'>-					60 2 0 0  /* msg1_tx_irq */</div><div class='del'>-					61 2 0 0&gt;;/* msg1_rx_irq */</div><div class='del'>-			};</div><div class='del'>-			message-unit@100 {</div><div class='del'>-				compatible = "fsl,srio-msg-unit";</div><div class='del'>-				reg = &lt;0x100 0x100&gt;;</div><div class='del'>-				interrupts = &lt;</div><div class='del'>-					62 2 0 0  /* msg2_tx_irq */</div><div class='del'>-					63 2 0 0&gt;;/* msg2_rx_irq */</div><div class='del'>-			};</div><div class='del'>-			doorbell-unit@400 {</div><div class='del'>-				compatible = "fsl,srio-dbell-unit";</div><div class='del'>-				reg = &lt;0x400 0x80&gt;;</div><div class='del'>-				interrupts = &lt;</div><div class='del'>-					56 2 0 0  /* bell_outb_irq */</div><div class='del'>-					57 2 0 0&gt;;/* bell_inb_irq */</div><div class='del'>-			};</div><div class='del'>-			port-write-unit@4e0 {</div><div class='del'>-				compatible = "fsl,srio-port-write-unit";</div><div class='del'>-				reg = &lt;0x4e0 0x20&gt;;</div><div class='del'>-				interrupts = &lt;16 2 1 11&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		guts: global-utilities@e0000 {</div><div class='del'>-			compatible = "fsl,qoriq-device-config-1.0";</div><div class='del'>-			reg = &lt;0xe0000 0xe00&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='del'>-			#sleep-cells = &lt;1&gt;;</div><div class='del'>-			fsl,liodn-bits = &lt;12&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pins: global-utilities@e0e00 {</div><div class='del'>-			compatible = "fsl,qoriq-pin-control-1.0";</div><div class='del'>-			reg = &lt;0xe0e00 0x200&gt;;</div><div class='del'>-			#sleep-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clockgen: global-utilities@e1000 {</div><div class='del'>-			compatible = "fsl,p3060-clockgen", "fsl,qoriq-clockgen-1.0";</div><div class='del'>-			reg = &lt;0xe1000 0x1000&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		rcpm: global-utilities@e2000 {</div><div class='del'>-			compatible = "fsl,qoriq-rcpm-1.0";</div><div class='del'>-			reg = &lt;0xe2000 0x1000&gt;;</div><div class='del'>-			#sleep-cells = &lt;1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sfp: sfp@e8000 {</div><div class='del'>-			compatible = "fsl,p3060-sfp", "fsl,qoriq-sfp-1.0";</div><div class='del'>-			reg	   = &lt;0xe8000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serdes: serdes@ea000 {</div><div class='del'>-			compatible = "fsl,p3060-serdes";</div><div class='del'>-			reg	   = &lt;0xea000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma0: dma@100300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,p3060-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x100300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x100100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,p3060-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupts = &lt;28 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,p3060-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupts = &lt;29 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,p3060-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupts = &lt;30 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,p3060-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupts = &lt;31 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma1: dma@101300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,p3060-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x101300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x101100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,p3060-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupts = &lt;32 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,p3060-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupts = &lt;33 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,p3060-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupts = &lt;34 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,p3060-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupts = &lt;35 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi@110000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,p3060-espi", "fsl,mpc8536-espi";</div><div class='del'>-			reg = &lt;0x110000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;53 0x2 0 0&gt;;</div><div class='del'>-			fsl,espi-num-chipselects = &lt;4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@118000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x118000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;38 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@118100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x118100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;38 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@119000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x119000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;39 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@119100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;3&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x119100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;39 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial0: serial@11c500 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11c500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;36 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial1: serial@11c600 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11c600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;36 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial2: serial@11d500 {</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11d500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;37 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial3: serial@11d600 {</div><div class='del'>-			cell-index = &lt;3&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11d600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;37 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpio0: gpio@130000 {</div><div class='del'>-			compatible = "fsl,p3060-gpio", "fsl,qoriq-gpio";</div><div class='del'>-			reg = &lt;0x130000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;55 2 0 0&gt;;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-			gpio-controller;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb0: usb@210000 {</div><div class='del'>-			compatible = "fsl,p3060-usb2-mph",</div><div class='del'>-					"fsl,mpc85xx-usb2-mph", "fsl-usb2-mph";</div><div class='del'>-			reg = &lt;0x210000 0x1000&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;44 0x2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb1: usb@211000 {</div><div class='del'>-			compatible = "fsl,p3060-usb2-dr",</div><div class='del'>-					"fsl,mpc85xx-usb2-dr", "fsl-usb2-dr";</div><div class='del'>-			reg = &lt;0x211000 0x1000&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;45 0x2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		crypto: crypto@300000 {</div><div class='del'>-			compatible = "fsl,sec-v4.1", "fsl,sec-v4.0";</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			reg = &lt;0x300000 0x10000&gt;;</div><div class='del'>-			ranges = &lt;0 0x300000 0x10000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;92 2 0 0&gt;;</div><div class='del'>-</div><div class='del'>-			sec_jr0: jr@1000 {</div><div class='del'>-				compatible = "fsl,sec-v4.1-job-ring", "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;88 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sec_jr1: jr@2000 {</div><div class='del'>-				compatible = "fsl,sec-v4.1-job-ring", "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;89 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sec_jr2: jr@3000 {</div><div class='del'>-				compatible = "fsl,sec-v4.1-job-ring", "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x3000 0x1000&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;90 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sec_jr3: jr@4000 {</div><div class='del'>-				compatible = "fsl,sec-v4.1-job-ring", "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x4000 0x1000&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;91 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			rtic@6000 {</div><div class='del'>-				compatible = "fsl,sec-v4.1-rtic", "fsl,sec-v4.0-rtic";</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0x6000 0x100&gt;;</div><div class='del'>-				ranges = &lt;0x0 0x6100 0xe00&gt;;</div><div class='del'>-</div><div class='del'>-				rtic_a: rtic-a@0 {</div><div class='del'>-					compatible = "fsl,sec-v4.1-rtic-memory", "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x00 0x20 0x100 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				rtic_b: rtic-b@20 {</div><div class='del'>-					compatible = "fsl,sec-v4.1-rtic-memory", "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x20 0x20 0x200 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				rtic_c: rtic-c@40 {</div><div class='del'>-					compatible = "fsl,sec-v4.1-rtic-memory", "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x40 0x20 0x300 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				rtic_d: rtic-d@60 {</div><div class='del'>-					compatible = "fsl,sec-v4.1-rtic-memory", "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x60 0x20 0x500 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sec_mon: sec_mon@314000 {</div><div class='del'>-			compatible = "fsl,sec-v4.1-mon", "fsl,sec-v4.0-mon";</div><div class='del'>-			reg = &lt;0x314000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;93 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	rapidio@ffe0c0000 {</div><div class='del'>-		compatible = "fsl,srio";</div><div class='del'>-		interrupts = &lt;16 2 1 11&gt;;</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		fsl,srio-rmu-handle = &lt;&amp;rmu&gt;;</div><div class='del'>-		ranges;</div><div class='del'>-</div><div class='del'>-		port1 {</div><div class='del'>-			#address-cells = &lt;2&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		port2 {</div><div class='del'>-			#address-cells = &lt;2&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	localbus@ffe124000 {</div><div class='del'>-		compatible = "fsl,p3060-elbc", "fsl,elbc", "simple-bus";</div><div class='del'>-		interrupts = &lt;25 2 0 0&gt;;</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci0: pcie@ffe200000 {</div><div class='del'>-		compatible = "fsl,p3060-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		bus-range = &lt;0x0 0xff&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		fsl,msi = &lt;&amp;msi0&gt;;</div><div class='del'>-		interrupts = &lt;16 2 1 15&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupts = &lt;16 2 1 15&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-			interrupt-map = &lt;</div><div class='del'>-				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 40 1 0 0</div><div class='del'>-				0000 0 0 2 &amp;mpic 1 1 0 0</div><div class='del'>-				0000 0 0 3 &amp;mpic 2 1 0 0</div><div class='del'>-				0000 0 0 4 &amp;mpic 3 1 0 0</div><div class='del'>-				&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci1: pcie@ffe201000 {</div><div class='del'>-		compatible = "fsl,p3060-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		bus-range = &lt;0 0xff&gt;;</div><div class='del'>-		clock-frequency = &lt;33333333&gt;;</div><div class='del'>-		fsl,msi = &lt;&amp;msi1&gt;;</div><div class='del'>-		interrupts = &lt;16 2 1 14&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupts = &lt;16 2 1 14&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-			interrupt-map = &lt;</div><div class='del'>-				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 41 1 0 0</div><div class='del'>-				0000 0 0 2 &amp;mpic 5 1 0 0</div><div class='del'>-				0000 0 0 3 &amp;mpic 6 1 0 0</div><div class='del'>-				0000 0 0 4 &amp;mpic 7 1 0 0</div><div class='del'>-				&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p4080ds.dts b/arch/powerpc/boot/dts/p4080ds.dts<br/>index c7916dc28014..6d60e54e50a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p4080ds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p4080ds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p4080ds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p4080ds.dts</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'>  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "p4080si.dtsi"</div><div class='add'>+/include/ "fsl/p4080si-pre.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,P4080DS";</div><div class='hunk'>@@ -50,6 +50,9 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	soc: soc@ffe000000 {</div><div class='add'>+		ranges = &lt;0x00000000 0xf 0xfe000000 0x1000000&gt;;</div><div class='add'>+		reg = &lt;0xf 0xfe000000 0 0x00001000&gt;;</div><div class='add'>+</div><div class='ctx'> 		spi@110000 {</div><div class='ctx'> 			flash@0 {</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -105,12 +108,18 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	rapidio0: rapidio@ffe0c0000 {</div><div class='del'>-		reg = &lt;0xf 0xfe0c0000 0 0x20000&gt;;</div><div class='del'>-		ranges = &lt;0 0 0xc 0x20000000 0 0x01000000&gt;;</div><div class='add'>+	rio: rapidio@ffe0c0000 {</div><div class='add'>+		reg = &lt;0xf 0xfe0c0000 0 0x11000&gt;;</div><div class='add'>+</div><div class='add'>+		port1 {</div><div class='add'>+			ranges = &lt;0 0 0xc 0x20000000 0 0x10000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		port2 {</div><div class='add'>+			ranges = &lt;0 0 0xc 0x30000000 0 0x10000000&gt;;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	localbus@ffe124000 {</div><div class='add'>+	lbc: localbus@ffe124000 {</div><div class='ctx'> 		reg = &lt;0xf 0xfe124000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0 0 0xf 0xe8000000 0x08000000</div><div class='ctx'> 			  3 0 0xf 0xffdf0000 0x00008000&gt;;</div><div class='hunk'>@@ -132,6 +141,7 @@</div><div class='ctx'> 		reg = &lt;0xf 0xfe200000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000</div><div class='ctx'> 			  0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000&gt;;</div><div class='add'>+		fsl,msi = &lt;&amp;msi0&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xe0000000</div><div class='ctx'> 				  0x02000000 0 0xe0000000</div><div class='hunk'>@@ -147,6 +157,7 @@</div><div class='ctx'> 		reg = &lt;0xf 0xfe201000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000</div><div class='ctx'> 			  0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000&gt;;</div><div class='add'>+		fsl,msi = &lt;&amp;msi1&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xe0000000</div><div class='ctx'> 				  0x02000000 0 0xe0000000</div><div class='hunk'>@@ -162,6 +173,7 @@</div><div class='ctx'> 		reg = &lt;0xf 0xfe202000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0 0xe0000000 0xc 0x40000000 0 0x20000000</div><div class='ctx'> 			  0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000&gt;;</div><div class='add'>+		fsl,msi = &lt;&amp;msi2&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xe0000000</div><div class='ctx'> 				  0x02000000 0 0xe0000000</div><div class='hunk'>@@ -174,3 +186,5 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "fsl/p4080si-post.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p4080si.dtsi b/arch/powerpc/boot/dts/p4080si.dtsi<br/>deleted file mode 100644<br/>index f20c01ab2473..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p4080si.dtsi?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p4080si.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,755 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * P4080 Silicon Device Tree Source</div><div class='del'>- *</div><div class='del'>- * Copyright 2009-2011 Freescale Semiconductor Inc.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Freescale Semiconductor nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='del'>- * GNU General Public License ("GPL") as published by the Free Software</div><div class='del'>- * Foundation, either version 2 of that License or (at your option) any</div><div class='del'>- * later version.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='del'>- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='del'>- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='del'>- * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='del'>- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/dts-v1/;</div><div class='del'>-</div><div class='del'>-/ {</div><div class='del'>-	compatible = "fsl,P4080";</div><div class='del'>-	#address-cells = &lt;2&gt;;</div><div class='del'>-	#size-cells = &lt;2&gt;;</div><div class='del'>-	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		ccsr = &amp;soc;</div><div class='del'>-		dcsr = &amp;dcsr;</div><div class='del'>-</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		serial1 = &amp;serial1;</div><div class='del'>-		serial2 = &amp;serial2;</div><div class='del'>-		serial3 = &amp;serial3;</div><div class='del'>-		pci0 = &amp;pci0;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-		pci2 = &amp;pci2;</div><div class='del'>-		usb0 = &amp;usb0;</div><div class='del'>-		usb1 = &amp;usb1;</div><div class='del'>-		dma0 = &amp;dma0;</div><div class='del'>-		dma1 = &amp;dma1;</div><div class='del'>-		sdhc = &amp;sdhc;</div><div class='del'>-		msi0 = &amp;msi0;</div><div class='del'>-		msi1 = &amp;msi1;</div><div class='del'>-		msi2 = &amp;msi2;</div><div class='del'>-</div><div class='del'>-		crypto = &amp;crypto;</div><div class='del'>-		sec_jr0 = &amp;sec_jr0;</div><div class='del'>-		sec_jr1 = &amp;sec_jr1;</div><div class='del'>-		sec_jr2 = &amp;sec_jr2;</div><div class='del'>-		sec_jr3 = &amp;sec_jr3;</div><div class='del'>-		rtic_a = &amp;rtic_a;</div><div class='del'>-		rtic_b = &amp;rtic_b;</div><div class='del'>-		rtic_c = &amp;rtic_c;</div><div class='del'>-		rtic_d = &amp;rtic_d;</div><div class='del'>-		sec_mon = &amp;sec_mon;</div><div class='del'>-</div><div class='del'>-		rio0 = &amp;rapidio0;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cpus {</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'>-		cpu0: PowerPC,e500mc@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_0&gt;;</div><div class='del'>-			L2_0: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu1: PowerPC,e500mc@1 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;1&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_1&gt;;</div><div class='del'>-			L2_1: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu2: PowerPC,e500mc@2 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;2&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_2&gt;;</div><div class='del'>-			L2_2: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu3: PowerPC,e500mc@3 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;3&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_3&gt;;</div><div class='del'>-			L2_3: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu4: PowerPC,e500mc@4 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;4&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_4&gt;;</div><div class='del'>-			L2_4: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu5: PowerPC,e500mc@5 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;5&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_5&gt;;</div><div class='del'>-			L2_5: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu6: PowerPC,e500mc@6 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;6&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_6&gt;;</div><div class='del'>-			L2_6: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu7: PowerPC,e500mc@7 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;7&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_7&gt;;</div><div class='del'>-			L2_7: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	dcsr: dcsr@f00000000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		compatible = "fsl,dcsr", "simple-bus";</div><div class='del'>-</div><div class='del'>-		dcsr-epu@0 {</div><div class='del'>-			compatible = "fsl,dcsr-epu";</div><div class='del'>-			interrupts = &lt;52 2 0 0</div><div class='del'>-				      84 2 0 0</div><div class='del'>-				      85 2 0 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-npc {</div><div class='del'>-			compatible = "fsl,dcsr-npc";</div><div class='del'>-			reg = &lt;0x1000 0x1000 0x1000000 0x8000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-nxc@2000 {</div><div class='del'>-			compatible = "fsl,dcsr-nxc";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-corenet {</div><div class='del'>-			compatible = "fsl,dcsr-corenet";</div><div class='del'>-			reg = &lt;0x8000 0x1000 0xB0000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-dpaa@9000 {</div><div class='del'>-			compatible = "fsl,p4080-dcsr-dpaa", "fsl,dcsr-dpaa";</div><div class='del'>-			reg = &lt;0x9000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-ocn@11000 {</div><div class='del'>-			compatible = "fsl,p4080-dcsr-ocn", "fsl,dcsr-ocn";</div><div class='del'>-			reg = &lt;0x11000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-ddr@12000 {</div><div class='del'>-			compatible = "fsl,dcsr-ddr";</div><div class='del'>-			dev-handle = &lt;&amp;ddr1&gt;;</div><div class='del'>-			reg = &lt;0x12000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-ddr@13000 {</div><div class='del'>-			compatible = "fsl,dcsr-ddr";</div><div class='del'>-			dev-handle = &lt;&amp;ddr2&gt;;</div><div class='del'>-			reg = &lt;0x13000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-nal@18000 {</div><div class='del'>-			compatible = "fsl,p4080-dcsr-nal", "fsl,dcsr-nal";</div><div class='del'>-			reg = &lt;0x18000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-rcpm@22000 {</div><div class='del'>-			compatible = "fsl,p4080-dcsr-rcpm", "fsl,dcsr-rcpm";</div><div class='del'>-			reg = &lt;0x22000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@40000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu0&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@41000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu1&gt;;</div><div class='del'>-			reg = &lt;0x41000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@42000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu2&gt;;</div><div class='del'>-			reg = &lt;0x42000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@43000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu3&gt;;</div><div class='del'>-			reg = &lt;0x43000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@44000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu4&gt;;</div><div class='del'>-			reg = &lt;0x44000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@45000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu5&gt;;</div><div class='del'>-			reg = &lt;0x45000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@46000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu6&gt;;</div><div class='del'>-			reg = &lt;0x46000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@47000 {</div><div class='del'>-			compatible = "fsl,dcsr-e500mc-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu7&gt;;</div><div class='del'>-			reg = &lt;0x47000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	soc: soc@ffe000000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		ranges = &lt;0x00000000 0xf 0xfe000000 0x1000000&gt;;</div><div class='del'>-		reg = &lt;0xf 0xfe000000 0 0x00001000&gt;;</div><div class='del'>-</div><div class='del'>-		soc-sram-error {</div><div class='del'>-			compatible = "fsl,soc-sram-error";</div><div class='del'>-			interrupts = &lt;16 2 1 29&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		corenet-law@0 {</div><div class='del'>-			compatible = "fsl,corenet-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;32&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ddr1: memory-controller@8000 {</div><div class='del'>-			compatible = "fsl,qoriq-memory-controller-v4.4", "fsl,qoriq-memory-controller";</div><div class='del'>-			reg = &lt;0x8000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 1 23&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ddr2: memory-controller@9000 {</div><div class='del'>-			compatible = "fsl,qoriq-memory-controller-v4.4","fsl,qoriq-memory-controller";</div><div class='del'>-			reg = &lt;0x9000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 1 22&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cpc: l3-cache-controller@10000 {</div><div class='del'>-			compatible = "fsl,p4080-l3-cache-controller", "cache";</div><div class='del'>-			reg = &lt;0x10000 0x1000</div><div class='del'>-			       0x11000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 1 27</div><div class='del'>-				      16 2 1 26&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		corenet-cf@18000 {</div><div class='del'>-			compatible = "fsl,corenet-cf";</div><div class='del'>-			reg = &lt;0x18000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 1 31&gt;;</div><div class='del'>-			fsl,ccf-num-csdids = &lt;32&gt;;</div><div class='del'>-			fsl,ccf-num-snoopids = &lt;32&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		iommu@20000 {</div><div class='del'>-			compatible = "fsl,pamu-v1.0", "fsl,pamu";</div><div class='del'>-			reg = &lt;0x20000 0x5000&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				24 2 0 0</div><div class='del'>-				16 2 1 30&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;4&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "fsl,mpic", "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi0: msi@41600 {</div><div class='del'>-			compatible = "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x200&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0 0 0</div><div class='del'>-				0xe1 0 0 0</div><div class='del'>-				0xe2 0 0 0</div><div class='del'>-				0xe3 0 0 0</div><div class='del'>-				0xe4 0 0 0</div><div class='del'>-				0xe5 0 0 0</div><div class='del'>-				0xe6 0 0 0</div><div class='del'>-				0xe7 0 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi1: msi@41800 {</div><div class='del'>-			compatible = "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41800 0x200&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe8 0 0 0</div><div class='del'>-				0xe9 0 0 0</div><div class='del'>-				0xea 0 0 0</div><div class='del'>-				0xeb 0 0 0</div><div class='del'>-				0xec 0 0 0</div><div class='del'>-				0xed 0 0 0</div><div class='del'>-				0xee 0 0 0</div><div class='del'>-				0xef 0 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi2: msi@41a00 {</div><div class='del'>-			compatible = "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41a00 0x200&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xf0 0 0 0</div><div class='del'>-				0xf1 0 0 0</div><div class='del'>-				0xf2 0 0 0</div><div class='del'>-				0xf3 0 0 0</div><div class='del'>-				0xf4 0 0 0</div><div class='del'>-				0xf5 0 0 0</div><div class='del'>-				0xf6 0 0 0</div><div class='del'>-				0xf7 0 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		guts: global-utilities@e0000 {</div><div class='del'>-			compatible = "fsl,qoriq-device-config-1.0";</div><div class='del'>-			reg = &lt;0xe0000 0xe00&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='del'>-			#sleep-cells = &lt;1&gt;;</div><div class='del'>-			fsl,liodn-bits = &lt;12&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pins: global-utilities@e0e00 {</div><div class='del'>-			compatible = "fsl,qoriq-pin-control-1.0";</div><div class='del'>-			reg = &lt;0xe0e00 0x200&gt;;</div><div class='del'>-			#sleep-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clockgen: global-utilities@e1000 {</div><div class='del'>-			compatible = "fsl,p4080-clockgen", "fsl,qoriq-clockgen-1.0";</div><div class='del'>-			reg = &lt;0xe1000 0x1000&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		rcpm: global-utilities@e2000 {</div><div class='del'>-			compatible = "fsl,qoriq-rcpm-1.0";</div><div class='del'>-			reg = &lt;0xe2000 0x1000&gt;;</div><div class='del'>-			#sleep-cells = &lt;1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sfp: sfp@e8000 {</div><div class='del'>-			compatible = "fsl,p4080-sfp", "fsl,qoriq-sfp-1.0";</div><div class='del'>-			reg	   = &lt;0xe8000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serdes: serdes@ea000 {</div><div class='del'>-			compatible = "fsl,p4080-serdes";</div><div class='del'>-			reg	   = &lt;0xea000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma0: dma@100300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,p4080-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x100300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x100100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,p4080-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupts = &lt;28 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,p4080-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupts = &lt;29 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,p4080-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupts = &lt;30 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,p4080-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupts = &lt;31 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma1: dma@101300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,p4080-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x101300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x101100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,p4080-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupts = &lt;32 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,p4080-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupts = &lt;33 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,p4080-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupts = &lt;34 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,p4080-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupts = &lt;35 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi@110000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,p4080-espi", "fsl,mpc8536-espi";</div><div class='del'>-			reg = &lt;0x110000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;53 0x2 0 0&gt;;</div><div class='del'>-			fsl,espi-num-chipselects = &lt;4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sdhc: sdhc@114000 {</div><div class='del'>-			compatible = "fsl,p4080-esdhc", "fsl,esdhc";</div><div class='del'>-			reg = &lt;0x114000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;48 2 0 0&gt;;</div><div class='del'>-			voltage-ranges = &lt;3300 3300&gt;;</div><div class='del'>-			sdhci,auto-cmd12;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@118000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x118000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;38 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@118100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x118100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;38 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@119000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x119000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;39 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@119100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;3&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x119100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;39 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial0: serial@11c500 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11c500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;36 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial1: serial@11c600 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11c600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;36 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial2: serial@11d500 {</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11d500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;37 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial3: serial@11d600 {</div><div class='del'>-			cell-index = &lt;3&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11d600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;37 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpio0: gpio@130000 {</div><div class='del'>-			compatible = "fsl,p4080-gpio", "fsl,qoriq-gpio";</div><div class='del'>-			reg = &lt;0x130000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;55 2 0 0&gt;;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-			gpio-controller;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb0: usb@210000 {</div><div class='del'>-			compatible = "fsl,p4080-usb2-mph",</div><div class='del'>-					"fsl,mpc85xx-usb2-mph", "fsl-usb2-mph";</div><div class='del'>-			reg = &lt;0x210000 0x1000&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;44 0x2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb1: usb@211000 {</div><div class='del'>-			compatible = "fsl,p4080-usb2-dr",</div><div class='del'>-					"fsl,mpc85xx-usb2-dr", "fsl-usb2-dr";</div><div class='del'>-			reg = &lt;0x211000 0x1000&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;45 0x2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		crypto: crypto@300000 {</div><div class='del'>-			compatible = "fsl,sec-v4.0";</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			reg = &lt;0x300000 0x10000&gt;;</div><div class='del'>-			ranges = &lt;0 0x300000 0x10000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;92 2 0 0&gt;;</div><div class='del'>-</div><div class='del'>-			sec_jr0: jr@1000 {</div><div class='del'>-				compatible = "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;88 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sec_jr1: jr@2000 {</div><div class='del'>-				compatible = "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;89 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sec_jr2: jr@3000 {</div><div class='del'>-				compatible = "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x3000 0x1000&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;90 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sec_jr3: jr@4000 {</div><div class='del'>-				compatible = "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x4000 0x1000&gt;;</div><div class='del'>-				interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-				interrupts = &lt;91 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			rtic@6000 {</div><div class='del'>-				compatible = "fsl,sec-v4.0-rtic";</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0x6000 0x100&gt;;</div><div class='del'>-				ranges = &lt;0x0 0x6100 0xe00&gt;;</div><div class='del'>-</div><div class='del'>-				rtic_a: rtic-a@0 {</div><div class='del'>-					compatible = "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x00 0x20 0x100 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				rtic_b: rtic-b@20 {</div><div class='del'>-					compatible = "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x20 0x20 0x200 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				rtic_c: rtic-c@40 {</div><div class='del'>-					compatible = "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x40 0x20 0x300 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				rtic_d: rtic-d@60 {</div><div class='del'>-					compatible = "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x60 0x20 0x500 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sec_mon: sec_mon@314000 {</div><div class='del'>-			compatible = "fsl,sec-v4.0-mon";</div><div class='del'>-			reg = &lt;0x314000 0x1000&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			interrupts = &lt;93 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	rapidio0: rapidio@ffe0c0000 {</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		compatible = "fsl,rapidio-delta";</div><div class='del'>-		interrupts = &lt;</div><div class='del'>-			16 2 1 11 /* err_irq */</div><div class='del'>-			56 2 0 0  /* bell_outb_irq */</div><div class='del'>-			57 2 0 0  /* bell_inb_irq */</div><div class='del'>-			60 2 0 0  /* msg1_tx_irq */</div><div class='del'>-			61 2 0 0  /* msg1_rx_irq */</div><div class='del'>-			62 2 0 0  /* msg2_tx_irq */</div><div class='del'>-			63 2 0 0&gt;; /* msg2_rx_irq */</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	localbus@ffe124000 {</div><div class='del'>-		compatible = "fsl,p4080-elbc", "fsl,elbc", "simple-bus";</div><div class='del'>-		interrupts = &lt;25 2 0 0&gt;;</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci0: pcie@ffe200000 {</div><div class='del'>-		compatible = "fsl,p4080-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		bus-range = &lt;0x0 0xff&gt;;</div><div class='del'>-		clock-frequency = &lt;0x1fca055&gt;;</div><div class='del'>-		fsl,msi = &lt;&amp;msi0&gt;;</div><div class='del'>-		interrupts = &lt;16 2 1 15&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupts = &lt;16 2 1 15&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-			interrupt-map = &lt;</div><div class='del'>-				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 40 1 0 0</div><div class='del'>-				0000 0 0 2 &amp;mpic 1 1 0 0</div><div class='del'>-				0000 0 0 3 &amp;mpic 2 1 0 0</div><div class='del'>-				0000 0 0 4 &amp;mpic 3 1 0 0</div><div class='del'>-				&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci1: pcie@ffe201000 {</div><div class='del'>-		compatible = "fsl,p4080-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		bus-range = &lt;0 0xff&gt;;</div><div class='del'>-		clock-frequency = &lt;0x1fca055&gt;;</div><div class='del'>-		fsl,msi = &lt;&amp;msi1&gt;;</div><div class='del'>-		interrupts = &lt;16 2 1 14&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupts = &lt;16 2 1 14&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-			interrupt-map = &lt;</div><div class='del'>-				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 41 1 0 0</div><div class='del'>-				0000 0 0 2 &amp;mpic 5 1 0 0</div><div class='del'>-				0000 0 0 3 &amp;mpic 6 1 0 0</div><div class='del'>-				0000 0 0 4 &amp;mpic 7 1 0 0</div><div class='del'>-				&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci2: pcie@ffe202000 {</div><div class='del'>-		compatible = "fsl,p4080-pcie";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		bus-range = &lt;0x0 0xff&gt;;</div><div class='del'>-		clock-frequency = &lt;0x1fca055&gt;;</div><div class='del'>-		fsl,msi = &lt;&amp;msi2&gt;;</div><div class='del'>-		interrupts = &lt;16 2 1 13&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupts = &lt;16 2 1 13&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-			interrupt-map = &lt;</div><div class='del'>-				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 42 1 0 0</div><div class='del'>-				0000 0 0 2 &amp;mpic 9 1 0 0</div><div class='del'>-				0000 0 0 3 &amp;mpic 10 1 0 0</div><div class='del'>-				0000 0 0 4 &amp;mpic 11 1 0 0</div><div class='del'>-				&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p5020ds.dts b/arch/powerpc/boot/dts/p5020ds.dts<br/>index e6d40999ccd7..1c250684c902 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p5020ds.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p5020ds.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p5020ds.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/p5020ds.dts</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'>  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/include/ "p5020si.dtsi"</div><div class='add'>+/include/ "fsl/p5020si-pre.dtsi"</div><div class='ctx'> </div><div class='ctx'> / {</div><div class='ctx'> 	model = "fsl,P5020DS";</div><div class='hunk'>@@ -50,6 +50,8 @@</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	soc: soc@ffe000000 {</div><div class='add'>+		ranges = &lt;0x00000000 0xf 0xfe000000 0x1000000&gt;;</div><div class='add'>+		reg = &lt;0xf 0xfe000000 0 0x00001000&gt;;</div><div class='ctx'> 		spi@110000 {</div><div class='ctx'> 			flash@0 {</div><div class='ctx'> 				#address-cells = &lt;1&gt;;</div><div class='hunk'>@@ -99,7 +101,18 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	localbus@ffe124000 {</div><div class='add'>+	rio: rapidio@ffe0c0000 {</div><div class='add'>+		reg = &lt;0xf 0xfe0c0000 0 0x11000&gt;;</div><div class='add'>+</div><div class='add'>+		port1 {</div><div class='add'>+			ranges = &lt;0 0 0xc 0x20000000 0 0x10000000&gt;;</div><div class='add'>+		};</div><div class='add'>+		port2 {</div><div class='add'>+			ranges = &lt;0 0 0xc 0x30000000 0 0x10000000&gt;;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	lbc: localbus@ffe124000 {</div><div class='ctx'> 		reg = &lt;0xf 0xfe124000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0 0 0xf 0xe8000000 0x08000000</div><div class='ctx'> 			  2 0 0xf 0xffa00000 0x00040000</div><div class='hunk'>@@ -160,7 +173,7 @@</div><div class='ctx'> 		reg = &lt;0xf 0xfe200000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000</div><div class='ctx'> 			  0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000&gt;;</div><div class='del'>-</div><div class='add'>+		fsl,msi = &lt;&amp;msi0&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xe0000000</div><div class='ctx'> 				  0x02000000 0 0xe0000000</div><div class='hunk'>@@ -176,6 +189,7 @@</div><div class='ctx'> 		reg = &lt;0xf 0xfe201000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000</div><div class='ctx'> 			  0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000&gt;;</div><div class='add'>+		fsl,msi = &lt;&amp;msi1&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xe0000000</div><div class='ctx'> 				  0x02000000 0 0xe0000000</div><div class='hunk'>@@ -191,6 +205,7 @@</div><div class='ctx'> 		reg = &lt;0xf 0xfe202000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0 0xe0000000 0xc 0x40000000 0 0x20000000</div><div class='ctx'> 			  0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000&gt;;</div><div class='add'>+		fsl,msi = &lt;&amp;msi2&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xe0000000</div><div class='ctx'> 				  0x02000000 0 0xe0000000</div><div class='hunk'>@@ -206,6 +221,7 @@</div><div class='ctx'> 		reg = &lt;0xf 0xfe203000 0 0x1000&gt;;</div><div class='ctx'> 		ranges = &lt;0x02000000 0 0xe0000000 0xc 0x60000000 0 0x20000000</div><div class='ctx'> 			  0x01000000 0 0x00000000 0xf 0xf8030000 0 0x00010000&gt;;</div><div class='add'>+		fsl,msi = &lt;&amp;msi2&gt;;</div><div class='ctx'> 		pcie@0 {</div><div class='ctx'> 			ranges = &lt;0x02000000 0 0xe0000000</div><div class='ctx'> 				  0x02000000 0 0xe0000000</div><div class='hunk'>@@ -217,3 +233,5 @@</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/include/ "fsl/p5020si-post.dtsi"</div><div class='head'>diff --git a/arch/powerpc/boot/dts/p5020si.dtsi b/arch/powerpc/boot/dts/p5020si.dtsi<br/>deleted file mode 100644<br/>index e7948ad71fa3..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/p5020si.dtsi?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/p5020si.dtsi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,716 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * P5020 Silicon Device Tree Source</div><div class='del'>- *</div><div class='del'>- * Copyright 2010-2011 Freescale Semiconductor Inc.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Freescale Semiconductor nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='del'>- * GNU General Public License ("GPL") as published by the Free Software</div><div class='del'>- * Foundation, either version 2 of that License or (at your option) any</div><div class='del'>- * later version.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='del'>- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='del'>- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='del'>- * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='del'>- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/dts-v1/;</div><div class='del'>-</div><div class='del'>-/ {</div><div class='del'>-	compatible = "fsl,P5020";</div><div class='del'>-	#address-cells = &lt;2&gt;;</div><div class='del'>-	#size-cells = &lt;2&gt;;</div><div class='del'>-	interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-</div><div class='del'>-	aliases {</div><div class='del'>-		ccsr = &amp;soc;</div><div class='del'>-		dcsr = &amp;dcsr;</div><div class='del'>-</div><div class='del'>-		serial0 = &amp;serial0;</div><div class='del'>-		serial1 = &amp;serial1;</div><div class='del'>-		serial2 = &amp;serial2;</div><div class='del'>-		serial3 = &amp;serial3;</div><div class='del'>-		pci0 = &amp;pci0;</div><div class='del'>-		pci1 = &amp;pci1;</div><div class='del'>-		pci2 = &amp;pci2;</div><div class='del'>-		pci3 = &amp;pci3;</div><div class='del'>-		usb0 = &amp;usb0;</div><div class='del'>-		usb1 = &amp;usb1;</div><div class='del'>-		dma0 = &amp;dma0;</div><div class='del'>-		dma1 = &amp;dma1;</div><div class='del'>-		sdhc = &amp;sdhc;</div><div class='del'>-		msi0 = &amp;msi0;</div><div class='del'>-		msi1 = &amp;msi1;</div><div class='del'>-		msi2 = &amp;msi2;</div><div class='del'>-</div><div class='del'>-		crypto = &amp;crypto;</div><div class='del'>-		sec_jr0 = &amp;sec_jr0;</div><div class='del'>-		sec_jr1 = &amp;sec_jr1;</div><div class='del'>-		sec_jr2 = &amp;sec_jr2;</div><div class='del'>-		sec_jr3 = &amp;sec_jr3;</div><div class='del'>-		rtic_a = &amp;rtic_a;</div><div class='del'>-		rtic_b = &amp;rtic_b;</div><div class='del'>-		rtic_c = &amp;rtic_c;</div><div class='del'>-		rtic_d = &amp;rtic_d;</div><div class='del'>-		sec_mon = &amp;sec_mon;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-		rio0 = &amp;rapidio0;</div><div class='del'>- */</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cpus {</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'>-		cpu0: PowerPC,e5500@0 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;0&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_0&gt;;</div><div class='del'>-			L2_0: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-		cpu1: PowerPC,e5500@1 {</div><div class='del'>-			device_type = "cpu";</div><div class='del'>-			reg = &lt;1&gt;;</div><div class='del'>-			next-level-cache = &lt;&amp;L2_1&gt;;</div><div class='del'>-			L2_1: l2-cache {</div><div class='del'>-				next-level-cache = &lt;&amp;cpc&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	dcsr: dcsr@f00000000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		compatible = "fsl,dcsr", "simple-bus";</div><div class='del'>-</div><div class='del'>-		dcsr-epu@0 {</div><div class='del'>-			compatible = "fsl,dcsr-epu";</div><div class='del'>-			interrupts = &lt;52 2 0 0</div><div class='del'>-				      84 2 0 0</div><div class='del'>-				      85 2 0 0&gt;;</div><div class='del'>-			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-npc {</div><div class='del'>-			compatible = "fsl,dcsr-npc";</div><div class='del'>-			reg = &lt;0x1000 0x1000 0x1000000 0x8000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-nxc@2000 {</div><div class='del'>-			compatible = "fsl,dcsr-nxc";</div><div class='del'>-			reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-corenet {</div><div class='del'>-			compatible = "fsl,dcsr-corenet";</div><div class='del'>-			reg = &lt;0x8000 0x1000 0xB0000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-dpaa@9000 {</div><div class='del'>-			compatible = "fsl,p5020-dcsr-dpaa", "fsl,dcsr-dpaa";</div><div class='del'>-			reg = &lt;0x9000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-ocn@11000 {</div><div class='del'>-			compatible = "fsl,p5020-dcsr-ocn", "fsl,dcsr-ocn";</div><div class='del'>-			reg = &lt;0x11000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-ddr@12000 {</div><div class='del'>-			compatible = "fsl,dcsr-ddr";</div><div class='del'>-			dev-handle = &lt;&amp;ddr1&gt;;</div><div class='del'>-			reg = &lt;0x12000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-ddr@13000 {</div><div class='del'>-			compatible = "fsl,dcsr-ddr";</div><div class='del'>-			dev-handle = &lt;&amp;ddr2&gt;;</div><div class='del'>-			reg = &lt;0x13000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-nal@18000 {</div><div class='del'>-			compatible = "fsl,p5020-dcsr-nal", "fsl,dcsr-nal";</div><div class='del'>-			reg = &lt;0x18000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-rcpm@22000 {</div><div class='del'>-			compatible = "fsl,p5020-dcsr-rcpm", "fsl,dcsr-rcpm";</div><div class='del'>-			reg = &lt;0x22000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@40000 {</div><div class='del'>-			compatible = "fsl,dcsr-e5500-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu0&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-		dcsr-cpu-sb-proxy@41000 {</div><div class='del'>-			compatible = "fsl,dcsr-e5500-sb-proxy", "fsl,dcsr-cpu-sb-proxy";</div><div class='del'>-			cpu-handle = &lt;&amp;cpu1&gt;;</div><div class='del'>-			reg = &lt;0x41000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	soc: soc@ffe000000 {</div><div class='del'>-		#address-cells = &lt;1&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-		device_type = "soc";</div><div class='del'>-		compatible = "simple-bus";</div><div class='del'>-		ranges = &lt;0x00000000 0xf 0xfe000000 0x1000000&gt;;</div><div class='del'>-		reg = &lt;0xf 0xfe000000 0 0x00001000&gt;;</div><div class='del'>-</div><div class='del'>-		soc-sram-error {</div><div class='del'>-			compatible = "fsl,soc-sram-error";</div><div class='del'>-			interrupts = &lt;16 2 1 29&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		corenet-law@0 {</div><div class='del'>-			compatible = "fsl,corenet-law";</div><div class='del'>-			reg = &lt;0x0 0x1000&gt;;</div><div class='del'>-			fsl,num-laws = &lt;32&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ddr1: memory-controller@8000 {</div><div class='del'>-			compatible = "fsl,qoriq-memory-controller-v4.5", "fsl,qoriq-memory-controller";</div><div class='del'>-			reg = &lt;0x8000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 1 23&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		ddr2: memory-controller@9000 {</div><div class='del'>-			compatible = "fsl,qoriq-memory-controller-v4.5", "fsl,qoriq-memory-controller";</div><div class='del'>-			reg = &lt;0x9000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 1 22&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cpc: l3-cache-controller@10000 {</div><div class='del'>-			compatible = "fsl,p5020-l3-cache-controller", "fsl,p4080-l3-cache-controller", "cache";</div><div class='del'>-			reg = &lt;0x10000 0x1000</div><div class='del'>-			       0x11000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 1 27</div><div class='del'>-				      16 2 1 26&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		corenet-cf@18000 {</div><div class='del'>-			compatible = "fsl,corenet-cf";</div><div class='del'>-			reg = &lt;0x18000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;16 2 1 31&gt;;</div><div class='del'>-			fsl,ccf-num-csdids = &lt;32&gt;;</div><div class='del'>-			fsl,ccf-num-snoopids = &lt;32&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		iommu@20000 {</div><div class='del'>-			compatible = "fsl,pamu-v1.0", "fsl,pamu";</div><div class='del'>-			reg = &lt;0x20000 0x4000&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				24 2 0 0</div><div class='del'>-				16 2 1 30&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		mpic: pic@40000 {</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupt-controller;</div><div class='del'>-			#address-cells = &lt;0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;4&gt;;</div><div class='del'>-			reg = &lt;0x40000 0x40000&gt;;</div><div class='del'>-			compatible = "fsl,mpic", "chrp,open-pic";</div><div class='del'>-			device_type = "open-pic";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi0: msi@41600 {</div><div class='del'>-			compatible = "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41600 0x200&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe0 0 0 0</div><div class='del'>-				0xe1 0 0 0</div><div class='del'>-				0xe2 0 0 0</div><div class='del'>-				0xe3 0 0 0</div><div class='del'>-				0xe4 0 0 0</div><div class='del'>-				0xe5 0 0 0</div><div class='del'>-				0xe6 0 0 0</div><div class='del'>-				0xe7 0 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi1: msi@41800 {</div><div class='del'>-			compatible = "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41800 0x200&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xe8 0 0 0</div><div class='del'>-				0xe9 0 0 0</div><div class='del'>-				0xea 0 0 0</div><div class='del'>-				0xeb 0 0 0</div><div class='del'>-				0xec 0 0 0</div><div class='del'>-				0xed 0 0 0</div><div class='del'>-				0xee 0 0 0</div><div class='del'>-				0xef 0 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		msi2: msi@41a00 {</div><div class='del'>-			compatible = "fsl,mpic-msi";</div><div class='del'>-			reg = &lt;0x41a00 0x200&gt;;</div><div class='del'>-			msi-available-ranges = &lt;0 0x100&gt;;</div><div class='del'>-			interrupts = &lt;</div><div class='del'>-				0xf0 0 0 0</div><div class='del'>-				0xf1 0 0 0</div><div class='del'>-				0xf2 0 0 0</div><div class='del'>-				0xf3 0 0 0</div><div class='del'>-				0xf4 0 0 0</div><div class='del'>-				0xf5 0 0 0</div><div class='del'>-				0xf6 0 0 0</div><div class='del'>-				0xf7 0 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		guts: global-utilities@e0000 {</div><div class='del'>-			compatible = "fsl,qoriq-device-config-1.0";</div><div class='del'>-			reg = &lt;0xe0000 0xe00&gt;;</div><div class='del'>-			fsl,has-rstcr;</div><div class='del'>-			#sleep-cells = &lt;1&gt;;</div><div class='del'>-			fsl,liodn-bits = &lt;12&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pins: global-utilities@e0e00 {</div><div class='del'>-			compatible = "fsl,qoriq-pin-control-1.0";</div><div class='del'>-			reg = &lt;0xe0e00 0x200&gt;;</div><div class='del'>-			#sleep-cells = &lt;2&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		clockgen: global-utilities@e1000 {</div><div class='del'>-			compatible = "fsl,p5020-clockgen", "fsl,qoriq-clockgen-1.0";</div><div class='del'>-			reg = &lt;0xe1000 0x1000&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		rcpm: global-utilities@e2000 {</div><div class='del'>-			compatible = "fsl,qoriq-rcpm-1.0";</div><div class='del'>-			reg = &lt;0xe2000 0x1000&gt;;</div><div class='del'>-			#sleep-cells = &lt;1&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sfp: sfp@e8000 {</div><div class='del'>-			compatible = "fsl,p5020-sfp", "fsl,qoriq-sfp-1.0";</div><div class='del'>-			reg	   = &lt;0xe8000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serdes: serdes@ea000 {</div><div class='del'>-			compatible = "fsl,p5020-serdes";</div><div class='del'>-			reg	   = &lt;0xea000 0x1000&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma0: dma@100300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,p5020-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x100300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x100100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,p5020-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupts = &lt;28 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,p5020-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupts = &lt;29 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,p5020-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupts = &lt;30 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,p5020-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupts = &lt;31 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dma1: dma@101300 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl,p5020-dma", "fsl,eloplus-dma";</div><div class='del'>-			reg = &lt;0x101300 0x4&gt;;</div><div class='del'>-			ranges = &lt;0x0 0x101100 0x200&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			dma-channel@0 {</div><div class='del'>-				compatible = "fsl,p5020-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x0 0x80&gt;;</div><div class='del'>-				cell-index = &lt;0&gt;;</div><div class='del'>-				interrupts = &lt;32 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@80 {</div><div class='del'>-				compatible = "fsl,p5020-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x80 0x80&gt;;</div><div class='del'>-				cell-index = &lt;1&gt;;</div><div class='del'>-				interrupts = &lt;33 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@100 {</div><div class='del'>-				compatible = "fsl,p5020-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x100 0x80&gt;;</div><div class='del'>-				cell-index = &lt;2&gt;;</div><div class='del'>-				interrupts = &lt;34 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-			dma-channel@180 {</div><div class='del'>-				compatible = "fsl,p5020-dma-channel",</div><div class='del'>-						"fsl,eloplus-dma-channel";</div><div class='del'>-				reg = &lt;0x180 0x80&gt;;</div><div class='del'>-				cell-index = &lt;3&gt;;</div><div class='del'>-				interrupts = &lt;35 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		spi@110000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl,p5020-espi", "fsl,mpc8536-espi";</div><div class='del'>-			reg = &lt;0x110000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;53 0x2 0 0&gt;;</div><div class='del'>-			fsl,espi-num-chipselects = &lt;4&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sdhc: sdhc@114000 {</div><div class='del'>-			compatible = "fsl,p5020-esdhc", "fsl,esdhc";</div><div class='del'>-			reg = &lt;0x114000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;48 2 0 0&gt;;</div><div class='del'>-			sdhci,auto-cmd12;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@118000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x118000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;38 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@118100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x118100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;38 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@119000 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x119000 0x100&gt;;</div><div class='del'>-			interrupts = &lt;39 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		i2c@119100 {</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			cell-index = &lt;3&gt;;</div><div class='del'>-			compatible = "fsl-i2c";</div><div class='del'>-			reg = &lt;0x119100 0x100&gt;;</div><div class='del'>-			interrupts = &lt;39 2 0 0&gt;;</div><div class='del'>-			dfsrr;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial0: serial@11c500 {</div><div class='del'>-			cell-index = &lt;0&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11c500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;36 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial1: serial@11c600 {</div><div class='del'>-			cell-index = &lt;1&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11c600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;36 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial2: serial@11d500 {</div><div class='del'>-			cell-index = &lt;2&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11d500 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;37 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		serial3: serial@11d600 {</div><div class='del'>-			cell-index = &lt;3&gt;;</div><div class='del'>-			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='del'>-			reg = &lt;0x11d600 0x100&gt;;</div><div class='del'>-			clock-frequency = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;37 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gpio0: gpio@130000 {</div><div class='del'>-			compatible = "fsl,p5020-gpio", "fsl,qoriq-gpio";</div><div class='del'>-			reg = &lt;0x130000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;55 2 0 0&gt;;</div><div class='del'>-			#gpio-cells = &lt;2&gt;;</div><div class='del'>-			gpio-controller;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb0: usb@210000 {</div><div class='del'>-			compatible = "fsl,p5020-usb2-mph",</div><div class='del'>-					"fsl,mpc85xx-usb2-mph", "fsl-usb2-mph";</div><div class='del'>-			reg = &lt;0x210000 0x1000&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;44 0x2 0 0&gt;;</div><div class='del'>-			phy_type = "utmi";</div><div class='del'>-			port0;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		usb1: usb@211000 {</div><div class='del'>-			compatible = "fsl,p5020-usb2-dr",</div><div class='del'>-					"fsl,mpc85xx-usb2-dr", "fsl-usb2-dr";</div><div class='del'>-			reg = &lt;0x211000 0x1000&gt;;</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;0&gt;;</div><div class='del'>-			interrupts = &lt;45 0x2 0 0&gt;;</div><div class='del'>-			dr_mode = "host";</div><div class='del'>-			phy_type = "utmi";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sata@220000 {</div><div class='del'>-			compatible = "fsl,p5020-sata", "fsl,pq-sata-v2";</div><div class='del'>-			reg = &lt;0x220000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;68 0x2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sata@221000 {</div><div class='del'>-			compatible = "fsl,p5020-sata", "fsl,pq-sata-v2";</div><div class='del'>-			reg = &lt;0x221000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;69 0x2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		crypto: crypto@300000 {</div><div class='del'>-			compatible = "fsl,sec-v4.2", "fsl,sec-v4.0";</div><div class='del'>-			#address-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;1&gt;;</div><div class='del'>-			reg		 = &lt;0x300000 0x10000&gt;;</div><div class='del'>-			ranges		 = &lt;0 0x300000 0x10000&gt;;</div><div class='del'>-			interrupts	 = &lt;92 2 0 0&gt;;</div><div class='del'>-</div><div class='del'>-			sec_jr0: jr@1000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-job-ring",</div><div class='del'>-					     "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x1000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;88 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sec_jr1: jr@2000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-job-ring",</div><div class='del'>-					     "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x2000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;89 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sec_jr2: jr@3000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-job-ring",</div><div class='del'>-					     "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x3000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;90 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			sec_jr3: jr@4000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-job-ring",</div><div class='del'>-					     "fsl,sec-v4.0-job-ring";</div><div class='del'>-				reg = &lt;0x4000 0x1000&gt;;</div><div class='del'>-				interrupts = &lt;91 2 0 0&gt;;</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			rtic@6000 {</div><div class='del'>-				compatible = "fsl,sec-v4.2-rtic",</div><div class='del'>-					     "fsl,sec-v4.0-rtic";</div><div class='del'>-				#address-cells = &lt;1&gt;;</div><div class='del'>-				#size-cells = &lt;1&gt;;</div><div class='del'>-				reg = &lt;0x6000 0x100&gt;;</div><div class='del'>-				ranges = &lt;0x0 0x6100 0xe00&gt;;</div><div class='del'>-</div><div class='del'>-				rtic_a: rtic-a@0 {</div><div class='del'>-					compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='del'>-						     "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x00 0x20 0x100 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				rtic_b: rtic-b@20 {</div><div class='del'>-					compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='del'>-						     "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x20 0x20 0x200 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				rtic_c: rtic-c@40 {</div><div class='del'>-					compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='del'>-						     "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x40 0x20 0x300 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-</div><div class='del'>-				rtic_d: rtic-d@60 {</div><div class='del'>-					compatible = "fsl,sec-v4.2-rtic-memory",</div><div class='del'>-						     "fsl,sec-v4.0-rtic-memory";</div><div class='del'>-					reg = &lt;0x60 0x20 0x500 0x80&gt;;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		sec_mon: sec_mon@314000 {</div><div class='del'>-			compatible = "fsl,sec-v4.2-mon", "fsl,sec-v4.0-mon";</div><div class='del'>-			reg = &lt;0x314000 0x1000&gt;;</div><div class='del'>-			interrupts = &lt;93 2 0 0&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-	rapidio0: rapidio@ffe0c0000</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-	localbus@ffe124000 {</div><div class='del'>-		compatible = "fsl,p5020-elbc", "fsl,elbc", "simple-bus";</div><div class='del'>-		interrupts = &lt;25 2 0 0&gt;;</div><div class='del'>-		#address-cells = &lt;2&gt;;</div><div class='del'>-		#size-cells = &lt;1&gt;;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci0: pcie@ffe200000 {</div><div class='del'>-		compatible = "fsl,p5020-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		bus-range = &lt;0x0 0xff&gt;;</div><div class='del'>-		clock-frequency = &lt;0x1fca055&gt;;</div><div class='del'>-		fsl,msi = &lt;&amp;msi0&gt;;</div><div class='del'>-		interrupts = &lt;16 2 1 15&gt;;</div><div class='del'>-</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupts = &lt;16 2 1 15&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-			interrupt-map = &lt;</div><div class='del'>-				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 40 1 0 0</div><div class='del'>-				0000 0 0 2 &amp;mpic 1 1 0 0</div><div class='del'>-				0000 0 0 3 &amp;mpic 2 1 0 0</div><div class='del'>-				0000 0 0 4 &amp;mpic 3 1 0 0</div><div class='del'>-				&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci1: pcie@ffe201000 {</div><div class='del'>-		compatible = "fsl,p5020-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		bus-range = &lt;0 0xff&gt;;</div><div class='del'>-		clock-frequency = &lt;0x1fca055&gt;;</div><div class='del'>-		fsl,msi = &lt;&amp;msi1&gt;;</div><div class='del'>-		interrupts = &lt;16 2 1 14&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupts = &lt;16 2 1 14&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-			interrupt-map = &lt;</div><div class='del'>-				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 41 1 0 0</div><div class='del'>-				0000 0 0 2 &amp;mpic 5 1 0 0</div><div class='del'>-				0000 0 0 3 &amp;mpic 6 1 0 0</div><div class='del'>-				0000 0 0 4 &amp;mpic 7 1 0 0</div><div class='del'>-				&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci2: pcie@ffe202000 {</div><div class='del'>-		compatible = "fsl,p5020-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		bus-range = &lt;0x0 0xff&gt;;</div><div class='del'>-		clock-frequency = &lt;0x1fca055&gt;;</div><div class='del'>-		fsl,msi = &lt;&amp;msi2&gt;;</div><div class='del'>-		interrupts = &lt;16 2 1 13&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupts = &lt;16 2 1 13&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-			interrupt-map = &lt;</div><div class='del'>-				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 42 1 0 0</div><div class='del'>-				0000 0 0 2 &amp;mpic 9 1 0 0</div><div class='del'>-				0000 0 0 3 &amp;mpic 10 1 0 0</div><div class='del'>-				0000 0 0 4 &amp;mpic 11 1 0 0</div><div class='del'>-				&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	pci3: pcie@ffe203000 {</div><div class='del'>-		compatible = "fsl,p5020-pcie", "fsl,qoriq-pcie-v2.2";</div><div class='del'>-		device_type = "pci";</div><div class='del'>-		#size-cells = &lt;2&gt;;</div><div class='del'>-		#address-cells = &lt;3&gt;;</div><div class='del'>-		bus-range = &lt;0x0 0xff&gt;;</div><div class='del'>-		clock-frequency = &lt;0x1fca055&gt;;</div><div class='del'>-		fsl,msi = &lt;&amp;msi2&gt;;</div><div class='del'>-		interrupts = &lt;16 2 1 12&gt;;</div><div class='del'>-		pcie@0 {</div><div class='del'>-			reg = &lt;0 0 0 0 0&gt;;</div><div class='del'>-			#interrupt-cells = &lt;1&gt;;</div><div class='del'>-			#size-cells = &lt;2&gt;;</div><div class='del'>-			#address-cells = &lt;3&gt;;</div><div class='del'>-			device_type = "pci";</div><div class='del'>-			interrupts = &lt;16 2 1 12&gt;;</div><div class='del'>-			interrupt-map-mask = &lt;0xf800 0 0 7&gt;;</div><div class='del'>-			interrupt-map = &lt;</div><div class='del'>-				/* IDSEL 0x0 */</div><div class='del'>-				0000 0 0 1 &amp;mpic 43 1 0 0</div><div class='del'>-				0000 0 0 2 &amp;mpic 0 1 0 0</div><div class='del'>-				0000 0 0 3 &amp;mpic 4 1 0 0</div><div class='del'>-				0000 0 0 4 &amp;mpic 8 1 0 0</div><div class='del'>-				&gt;;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/arch/powerpc/boot/dts/sbc8349.dts b/arch/powerpc/boot/dts/sbc8349.dts<br/>index 0dc90f9bd814..b1e45a8537a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/sbc8349.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/sbc8349.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/sbc8349.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/sbc8349.dts</a></div><div class='hunk'>@@ -222,7 +222,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;9 0x8&gt;;</div><div class='hunk'>@@ -232,7 +232,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;10 0x8&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/sbc8548.dts b/arch/powerpc/boot/dts/sbc8548.dts<br/>index 94a332251710..77be77116c2e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/sbc8548.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/sbc8548.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/sbc8548.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/sbc8548.dts</a></div><div class='hunk'>@@ -316,7 +316,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;	// should we fill in in uboot?</div><div class='ctx'> 			interrupts = &lt;0x2a 0x2&gt;;</div><div class='hunk'>@@ -326,7 +326,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;	// should we fill in in uboot?</div><div class='ctx'> 			interrupts = &lt;0x2a 0x2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/sbc8641d.dts b/arch/powerpc/boot/dts/sbc8641d.dts<br/>index ee5538feb455..56bebce87842 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/sbc8641d.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/sbc8641d.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/sbc8641d.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/sbc8641d.dts</a></div><div class='hunk'>@@ -347,7 +347,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='hunk'>@@ -357,7 +357,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;28 2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/socrates.dts b/arch/powerpc/boot/dts/socrates.dts<br/>index 38c35404bdc3..134a5ff917e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/socrates.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/socrates.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/socrates.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/socrates.dts</a></div><div class='hunk'>@@ -199,7 +199,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='hunk'>@@ -209,7 +209,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/storcenter.dts b/arch/powerpc/boot/dts/storcenter.dts<br/>index eab680ce10da..2a555738517e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/storcenter.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/storcenter.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/storcenter.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/storcenter.dts</a></div><div class='hunk'>@@ -74,7 +74,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x20&gt;;</div><div class='ctx'> 			clock-frequency = &lt;97553800&gt;; /* Hz */</div><div class='ctx'> 			current-speed = &lt;115200&gt;;</div><div class='hunk'>@@ -85,7 +85,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x20&gt;;</div><div class='ctx'> 			clock-frequency = &lt;97553800&gt;; /* Hz */</div><div class='ctx'> 			current-speed = &lt;9600&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/stxssa8555.dts b/arch/powerpc/boot/dts/stxssa8555.dts<br/>index 49efd44057d7..4f166b01c1b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/stxssa8555.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/stxssa8555.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/stxssa8555.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/stxssa8555.dts</a></div><div class='hunk'>@@ -210,7 +210,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;; 	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;; 	// should we fill in in uboot?</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='hunk'>@@ -220,7 +220,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;; 	// should we fill in in uboot?</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/tqm8540.dts b/arch/powerpc/boot/dts/tqm8540.dts<br/>index 0a4cedbdcb55..ed264d9ae356 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/tqm8540.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/tqm8540.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/tqm8540.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/tqm8540.dts</a></div><div class='hunk'>@@ -250,7 +250,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;; 	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;; 	// should we fill in in uboot?</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='hunk'>@@ -260,7 +260,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;; 	// should we fill in in uboot?</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/tqm8541.dts b/arch/powerpc/boot/dts/tqm8541.dts<br/>index f49d09181312..925242115814 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/tqm8541.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/tqm8541.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/tqm8541.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/tqm8541.dts</a></div><div class='hunk'>@@ -224,7 +224,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;; 	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;; 	// should we fill in in uboot?</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='hunk'>@@ -234,7 +234,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;; 	// should we fill in in uboot?</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/tqm8548-bigflash.dts b/arch/powerpc/boot/dts/tqm8548-bigflash.dts<br/>index 9452c3c05114..6e1ac50852a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/tqm8548-bigflash.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/tqm8548-bigflash.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/tqm8548-bigflash.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/tqm8548-bigflash.dts</a></div><div class='hunk'>@@ -305,7 +305,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;	// should we fill in in uboot?</div><div class='ctx'> 			current-speed = &lt;115200&gt;;</div><div class='hunk'>@@ -316,7 +316,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;	// should we fill in in uboot?</div><div class='ctx'> 			current-speed = &lt;115200&gt;;</div><div class='hunk'>@@ -352,7 +352,7 @@</div><div class='ctx'> 		ranges = &lt;</div><div class='ctx'> 			0 0x0 0xfc000000 0x04000000	// NOR FLASH bank 1</div><div class='ctx'> 			1 0x0 0xf8000000 0x08000000	// NOR FLASH bank 0</div><div class='del'>-			2 0x0 0xa3000000 0x00008000	// CAN (2 x i82527)</div><div class='add'>+			2 0x0 0xa3000000 0x00008000	// CAN (2 x CC770)</div><div class='ctx'> 			3 0x0 0xa3010000 0x00008000	// NAND FLASH</div><div class='ctx'> </div><div class='ctx'> 		&gt;;</div><div class='hunk'>@@ -393,18 +393,27 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		/* Note: CAN support needs be enabled in U-Boot */</div><div class='del'>-		can0@2,0 {</div><div class='del'>-			compatible = "intel,82527"; // Bosch CC770</div><div class='add'>+		can@2,0 {</div><div class='add'>+			compatible = "bosch,cc770"; // Bosch CC770</div><div class='ctx'> 			reg = &lt;2 0x0 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;4 1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+			bosch,external-clock-frequency = &lt;16000000&gt;;</div><div class='add'>+			bosch,disconnect-rx1-input;</div><div class='add'>+			bosch,disconnect-tx1-output;</div><div class='add'>+			bosch,iso-low-speed-mux;</div><div class='add'>+			bosch,clock-out-frequency = &lt;16000000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		can1@2,100 {</div><div class='del'>-			compatible = "intel,82527"; // Bosch CC770</div><div class='add'>+		can@2,100 {</div><div class='add'>+			compatible = "bosch,cc770"; // Bosch CC770</div><div class='ctx'> 			reg = &lt;2 0x100 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;4 1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+			bosch,external-clock-frequency = &lt;16000000&gt;;</div><div class='add'>+			bosch,disconnect-rx1-input;</div><div class='add'>+			bosch,disconnect-tx1-output;</div><div class='add'>+			bosch,iso-low-speed-mux;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		/* Note: NAND support needs to be enabled in U-Boot */</div><div class='head'>diff --git a/arch/powerpc/boot/dts/tqm8548.dts b/arch/powerpc/boot/dts/tqm8548.dts<br/>index 619776f72c90..161e75eac7f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/tqm8548.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/tqm8548.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/tqm8548.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/tqm8548.dts</a></div><div class='hunk'>@@ -305,7 +305,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;	// should we fill in in uboot?</div><div class='ctx'> 			current-speed = &lt;115200&gt;;</div><div class='hunk'>@@ -316,7 +316,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;	// should we fill in in uboot?</div><div class='ctx'> 			current-speed = &lt;115200&gt;;</div><div class='hunk'>@@ -352,7 +352,7 @@</div><div class='ctx'> 		ranges = &lt;</div><div class='ctx'> 			0 0x0 0xfc000000 0x04000000	// NOR FLASH bank 1</div><div class='ctx'> 			1 0x0 0xf8000000 0x08000000	// NOR FLASH bank 0</div><div class='del'>-			2 0x0 0xe3000000 0x00008000	// CAN (2 x i82527)</div><div class='add'>+			2 0x0 0xe3000000 0x00008000	// CAN (2 x CC770)</div><div class='ctx'> 			3 0x0 0xe3010000 0x00008000	// NAND FLASH</div><div class='ctx'> </div><div class='ctx'> 		&gt;;</div><div class='hunk'>@@ -393,18 +393,27 @@</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		/* Note: CAN support needs be enabled in U-Boot */</div><div class='del'>-		can0@2,0 {</div><div class='del'>-			compatible = "intel,82527"; // Bosch CC770</div><div class='add'>+		can@2,0 {</div><div class='add'>+			compatible = "bosch,cc770"; // Bosch CC770</div><div class='ctx'> 			reg = &lt;2 0x0 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;4 1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+			bosch,external-clock-frequency = &lt;16000000&gt;;</div><div class='add'>+			bosch,disconnect-rx1-input;</div><div class='add'>+			bosch,disconnect-tx1-output;</div><div class='add'>+			bosch,iso-low-speed-mux;</div><div class='add'>+			bosch,clock-out-frequency = &lt;16000000&gt;;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		can1@2,100 {</div><div class='del'>-			compatible = "intel,82527"; // Bosch CC770</div><div class='add'>+		can@2,100 {</div><div class='add'>+			compatible = "bosch,cc770"; // Bosch CC770</div><div class='ctx'> 			reg = &lt;2 0x100 0x100&gt;;</div><div class='ctx'> 			interrupts = &lt;4 1&gt;;</div><div class='ctx'> 			interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+			bosch,external-clock-frequency = &lt;16000000&gt;;</div><div class='add'>+			bosch,disconnect-rx1-input;</div><div class='add'>+			bosch,disconnect-tx1-output;</div><div class='add'>+			bosch,iso-low-speed-mux;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		/* Note: NAND support needs to be enabled in U-Boot */</div><div class='head'>diff --git a/arch/powerpc/boot/dts/tqm8555.dts b/arch/powerpc/boot/dts/tqm8555.dts<br/>index 81bad8cd3756..aa6ff0d3dd9a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/tqm8555.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/tqm8555.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/tqm8555.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/tqm8555.dts</a></div><div class='hunk'>@@ -224,7 +224,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;; 	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;; 	// should we fill in in uboot?</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='hunk'>@@ -234,7 +234,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;	// reg base, size</div><div class='ctx'> 			clock-frequency = &lt;0&gt;; 	// should we fill in in uboot?</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/tqm8xx.dts b/arch/powerpc/boot/dts/tqm8xx.dts<br/>index f6da7ec49a8e..c3dba2518d8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/tqm8xx.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/tqm8xx.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/tqm8xx.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/tqm8xx.dts</a></div><div class='hunk'>@@ -57,6 +57,7 @@</div><div class='ctx'> </div><div class='ctx'> 		ranges = &lt;</div><div class='ctx'> 			0x0 0x0 0x40000000 0x800000</div><div class='add'>+			0x3 0x0 0xc0000000 0x200</div><div class='ctx'> 		&gt;;</div><div class='ctx'> </div><div class='ctx'> 		flash@0,0 {</div><div class='hunk'>@@ -67,6 +68,30 @@</div><div class='ctx'> 			bank-width = &lt;4&gt;;</div><div class='ctx'> 			device-width = &lt;2&gt;;</div><div class='ctx'> 		};</div><div class='add'>+</div><div class='add'>+		/* Note: CAN support needs be enabled in U-Boot */</div><div class='add'>+		can@3,0 {</div><div class='add'>+			compatible = "intc,82527";</div><div class='add'>+			reg = &lt;3 0x0 0x80&gt;;</div><div class='add'>+			interrupts = &lt;8 1&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;PIC&gt;;</div><div class='add'>+			bosch,external-clock-frequency = &lt;16000000&gt;;</div><div class='add'>+			bosch,disconnect-rx1-input;</div><div class='add'>+			bosch,disconnect-tx1-output;</div><div class='add'>+			bosch,iso-low-speed-mux;</div><div class='add'>+			bosch,clock-out-frequency = &lt;16000000&gt;;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		can@3,100 {</div><div class='add'>+			compatible = "intc,82527";</div><div class='add'>+			reg = &lt;3 0x100 0x80&gt;;</div><div class='add'>+			interrupts = &lt;8 1&gt;;</div><div class='add'>+			interrupt-parent = &lt;&amp;PIC&gt;;</div><div class='add'>+			bosch,external-clock-frequency = &lt;16000000&gt;;</div><div class='add'>+			bosch,disconnect-rx1-input;</div><div class='add'>+			bosch,disconnect-tx1-output;</div><div class='add'>+			bosch,iso-low-speed-mux;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	soc@fff00000 {</div><div class='head'>diff --git a/arch/powerpc/boot/dts/xcalibur1501.dts b/arch/powerpc/boot/dts/xcalibur1501.dts<br/>index ac0a617b4299..cc00f4ddd9a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/xcalibur1501.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/xcalibur1501.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/xcalibur1501.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/xcalibur1501.dts</a></div><div class='hunk'>@@ -531,7 +531,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='hunk'>@@ -542,7 +542,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/xpedite5200.dts b/arch/powerpc/boot/dts/xpedite5200.dts<br/>index c41a80c55e47..8fd7b7031357 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/xpedite5200.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/xpedite5200.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/xpedite5200.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/xpedite5200.dts</a></div><div class='hunk'>@@ -333,7 +333,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			current-speed = &lt;115200&gt;;</div><div class='hunk'>@@ -344,7 +344,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			current-speed = &lt;115200&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/xpedite5200_xmon.dts b/arch/powerpc/boot/dts/xpedite5200_xmon.dts<br/>index c0efcbb45137..0baa8283d08c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/xpedite5200_xmon.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/xpedite5200_xmon.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/xpedite5200_xmon.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/xpedite5200_xmon.dts</a></div><div class='hunk'>@@ -337,7 +337,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			current-speed = &lt;9600&gt;;</div><div class='hunk'>@@ -348,7 +348,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			current-speed = &lt;9600&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/xpedite5301.dts b/arch/powerpc/boot/dts/xpedite5301.dts<br/>index db7faf5ebb39..53c1c6a9752f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/xpedite5301.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/xpedite5301.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/xpedite5301.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/xpedite5301.dts</a></div><div class='hunk'>@@ -441,7 +441,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='hunk'>@@ -452,7 +452,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/xpedite5330.dts b/arch/powerpc/boot/dts/xpedite5330.dts<br/>index c364ca6ff7d0..215225983150 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/xpedite5330.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/xpedite5330.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/xpedite5330.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/xpedite5330.dts</a></div><div class='hunk'>@@ -477,7 +477,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='hunk'>@@ -488,7 +488,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/dts/xpedite5370.dts b/arch/powerpc/boot/dts/xpedite5370.dts<br/>index 7a8a4afd56cf..11dbda10d756 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/xpedite5370.dts?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/dts/xpedite5370.dts</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/dts/xpedite5370.dts?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/dts/xpedite5370.dts</a></div><div class='hunk'>@@ -439,7 +439,7 @@</div><div class='ctx'> 		serial0: serial@4500 {</div><div class='ctx'> 			cell-index = &lt;0&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4500 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='hunk'>@@ -450,7 +450,7 @@</div><div class='ctx'> 		serial1: serial@4600 {</div><div class='ctx'> 			cell-index = &lt;1&gt;;</div><div class='ctx'> 			device_type = "serial";</div><div class='del'>-			compatible = "ns16550";</div><div class='add'>+			compatible = "fsl,ns16550", "ns16550";</div><div class='ctx'> 			reg = &lt;0x4600 0x100&gt;;</div><div class='ctx'> 			clock-frequency = &lt;0&gt;;</div><div class='ctx'> 			interrupts = &lt;42 2&gt;;</div><div class='head'>diff --git a/arch/powerpc/boot/treeboot-currituck.c b/arch/powerpc/boot/treeboot-currituck.c<br/>new file mode 100644<br/>index 000000000000..925ae43b7467<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/treeboot-currituck.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/treeboot-currituck.c</a></div><div class='hunk'>@@ -0,0 +1,119 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2011 Tony Breeds IBM Corporation</div><div class='add'>+ *</div><div class='add'>+ * Based on earlier code:</div><div class='add'>+ *   Copyright (C) Paul Mackerras 1997.</div><div class='add'>+ *</div><div class='add'>+ *   Matt Porter &lt;mporter@kernel.crashing.org&gt;</div><div class='add'>+ *   Copyright 2002-2005 MontaVista Software Inc.</div><div class='add'>+ *</div><div class='add'>+ *   Eugene Surovegin &lt;eugene.surovegin@zultys.com&gt; or &lt;ebs@ebshome.net&gt;</div><div class='add'>+ *   Copyright (c) 2003, 2004 Zultys Technologies</div><div class='add'>+ *</div><div class='add'>+ *    Copyright 2007 David Gibson, IBM Corporation.</div><div class='add'>+ *    Copyright 2010 Ben. Herrenschmidt, IBM Corporation.</div><div class='add'>+ *    Copyright © 2011 David Kleikamp IBM Corporation</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'>+#include &lt;stdarg.h&gt;</div><div class='add'>+#include &lt;stddef.h&gt;</div><div class='add'>+#include "types.h"</div><div class='add'>+#include "elf.h"</div><div class='add'>+#include "string.h"</div><div class='add'>+#include "stdio.h"</div><div class='add'>+#include "page.h"</div><div class='add'>+#include "ops.h"</div><div class='add'>+#include "reg.h"</div><div class='add'>+#include "io.h"</div><div class='add'>+#include "dcr.h"</div><div class='add'>+#include "4xx.h"</div><div class='add'>+#include "44x.h"</div><div class='add'>+#include "libfdt.h"</div><div class='add'>+</div><div class='add'>+BSS_STACK(4096);</div><div class='add'>+</div><div class='add'>+#define MAX_RANKS	0x4</div><div class='add'>+#define DDR3_MR0CF	0x80010011U</div><div class='add'>+</div><div class='add'>+static unsigned long long ibm_currituck_memsize;</div><div class='add'>+static unsigned long long ibm_currituck_detect_memsize(void)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+	unsigned i;</div><div class='add'>+	unsigned long long memsize = 0;</div><div class='add'>+</div><div class='add'>+	for(i = 0; i &lt; MAX_RANKS; i++){</div><div class='add'>+		reg = mfdcrx(DDR3_MR0CF + i);</div><div class='add'>+</div><div class='add'>+		if (!(reg &amp; 1))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		reg &amp;= 0x0000f000;</div><div class='add'>+		reg &gt;&gt;= 12;</div><div class='add'>+		memsize += (0x800000ULL &lt;&lt; reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return memsize;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ibm_currituck_fixups(void)</div><div class='add'>+{</div><div class='add'>+	void *devp = finddevice("/");</div><div class='add'>+	u32 dma_ranges[7];</div><div class='add'>+</div><div class='add'>+	dt_fixup_memory(0x0ULL,  ibm_currituck_memsize);</div><div class='add'>+</div><div class='add'>+	while ((devp = find_node_by_devtype(devp, "pci"))) {</div><div class='add'>+		if (getprop(devp, "dma-ranges", dma_ranges, sizeof(dma_ranges)) &lt; 0) {</div><div class='add'>+			printf("%s: Failed to get dma-ranges\r\n", __func__);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dma_ranges[5] = ibm_currituck_memsize &gt;&gt; 32;</div><div class='add'>+		dma_ranges[6] = ibm_currituck_memsize &amp; 0xffffffffUL;</div><div class='add'>+</div><div class='add'>+		setprop(devp, "dma-ranges", dma_ranges, sizeof(dma_ranges));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SPRN_PIR	0x11E	/* Processor Indentification Register */</div><div class='add'>+void platform_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long end_of_ram, avail_ram;</div><div class='add'>+	u32 pir_reg;</div><div class='add'>+	int node, size;</div><div class='add'>+	const u32 *timebase;</div><div class='add'>+</div><div class='add'>+	ibm_currituck_memsize = ibm_currituck_detect_memsize();</div><div class='add'>+	if (ibm_currituck_memsize &gt;&gt; 32)</div><div class='add'>+		end_of_ram = ~0UL;</div><div class='add'>+	else</div><div class='add'>+		end_of_ram = ibm_currituck_memsize;</div><div class='add'>+	avail_ram = end_of_ram - (unsigned long)_end;</div><div class='add'>+</div><div class='add'>+	simple_alloc_init(_end, avail_ram, 128, 64);</div><div class='add'>+	platform_ops.fixups = ibm_currituck_fixups;</div><div class='add'>+	platform_ops.exit = ibm44x_dbcr_reset;</div><div class='add'>+	pir_reg = mfspr(SPRN_PIR);</div><div class='add'>+</div><div class='add'>+	/* Make sure FDT blob is sane */</div><div class='add'>+	if (fdt_check_header(_dtb_start) != 0)</div><div class='add'>+		fatal("Invalid device tree blob\n");</div><div class='add'>+</div><div class='add'>+	node = fdt_node_offset_by_prop_value(_dtb_start, -1, "device_type",</div><div class='add'>+	                                     "cpu", sizeof("cpu"));</div><div class='add'>+	if (!node)</div><div class='add'>+		fatal("Cannot find cpu node\n");</div><div class='add'>+	timebase = fdt_getprop(_dtb_start, node, "timebase-frequency", &amp;size);</div><div class='add'>+	if (timebase &amp;&amp; (size == 4))</div><div class='add'>+		timebase_period_ns = 1000000000 / *timebase;</div><div class='add'>+</div><div class='add'>+	fdt_set_boot_cpuid_phys(_dtb_start, pir_reg);</div><div class='add'>+	fdt_init(_dtb_start);</div><div class='add'>+</div><div class='add'>+	serial_console_init();</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper<br/>index c74531af72c0..f090e6d2907e 100755<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/wrapper?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/boot/wrapper</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/wrapper?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/boot/wrapper</a></div><div class='hunk'>@@ -163,7 +163,7 @@ coff)</div><div class='ctx'>     link_address='0x500000'</div><div class='ctx'>     pie=</div><div class='ctx'>     ;;</div><div class='del'>-miboot|uboot)</div><div class='add'>+miboot|uboot*)</div><div class='ctx'>     # miboot and U-boot want just the bare bits, not an ELF binary</div><div class='ctx'>     ext=bin</div><div class='ctx'>     objflags="-O binary"</div><div class='hunk'>@@ -244,6 +244,9 @@ gamecube|wii)</div><div class='ctx'>     link_address='0x600000'</div><div class='ctx'>     platformo="$object/$platform-head.o $object/$platform.o"</div><div class='ctx'>     ;;</div><div class='add'>+treeboot-currituck)</div><div class='add'>+    link_address='0x1000000'</div><div class='add'>+    ;;</div><div class='ctx'> treeboot-iss4xx-mpic)</div><div class='ctx'>     platformo="$object/treeboot-iss4xx.o"</div><div class='ctx'>     ;;</div><div class='hunk'>@@ -257,6 +260,8 @@ vmz="$tmpdir/`basename \"$kernel\"`.$ext"</div><div class='ctx'> if [ -z "$cacheit" -o ! -f "$vmz$gzip" -o "$vmz$gzip" -ot "$kernel" ]; then</div><div class='ctx'>     ${CROSS}objcopy $objflags "$kernel" "$vmz.$$"</div><div class='ctx'> </div><div class='add'>+    strip_size=$(stat -c %s $vmz.$$)</div><div class='add'>+</div><div class='ctx'>     if [ -n "$gzip" ]; then</div><div class='ctx'>         gzip -n -f -9 "$vmz.$$"</div><div class='ctx'>     fi</div><div class='hunk'>@@ -266,6 +271,24 @@ if [ -z "$cacheit" -o ! -f "$vmz$gzip" -o "$vmz$gzip" -ot "$kernel" ]; then</div><div class='ctx'>     else</div><div class='ctx'> 	vmz="$vmz.$$"</div><div class='ctx'>     fi</div><div class='add'>+else</div><div class='add'>+    # Calculate the vmlinux.strip size</div><div class='add'>+    ${CROSS}objcopy $objflags "$kernel" "$vmz.$$"</div><div class='add'>+    strip_size=$(stat -c %s $vmz.$$)</div><div class='add'>+    rm -f $vmz.$$</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+# Round the size to next higher MB limit</div><div class='add'>+round_size=$(((strip_size + 0xfffff) &amp; 0xfff00000))</div><div class='add'>+</div><div class='add'>+round_size=0x$(printf "%x" $round_size)</div><div class='add'>+link_addr=$(printf "%d" $link_address)</div><div class='add'>+</div><div class='add'>+if [ $link_addr -lt $strip_size ]; then</div><div class='add'>+    echo "INFO: Uncompressed kernel (size 0x$(printf "%x\n" $strip_size))" \</div><div class='add'>+		"overlaps the address of the wrapper($link_address)"</div><div class='add'>+    echo "INFO: Fixing the link_address of wrapper to ($round_size)"</div><div class='add'>+    link_address=$round_size</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='ctx'> vmz="$vmz$gzip"</div><div class='hunk'>@@ -291,6 +314,26 @@ uboot)</div><div class='ctx'>     fi</div><div class='ctx'>     exit 0</div><div class='ctx'>     ;;</div><div class='add'>+uboot-obs600)</div><div class='add'>+    rm -f "$ofile"</div><div class='add'>+    # obs600 wants a multi image with an initrd, so we need to put a fake</div><div class='add'>+    # one in even when building a "normal" image.</div><div class='add'>+    if [ -n "$initrd" ]; then</div><div class='add'>+	real_rd="$initrd"</div><div class='add'>+    else</div><div class='add'>+	real_rd=`mktemp`</div><div class='add'>+	echo "\0" &gt;&gt;"$real_rd"</div><div class='add'>+    fi</div><div class='add'>+    ${MKIMAGE} -A ppc -O linux -T multi -C gzip -a $membase -e $membase \</div><div class='add'>+	$uboot_version -d "$vmz":"$real_rd":"$dtb" "$ofile"</div><div class='add'>+    if [ -z "$initrd" ]; then</div><div class='add'>+	rm -f "$real_rd"</div><div class='add'>+    fi</div><div class='add'>+    if [ -z "$cacheit" ]; then</div><div class='add'>+	rm -f "$vmz"</div><div class='add'>+    fi</div><div class='add'>+    exit 0</div><div class='add'>+    ;;</div><div class='ctx'> esac</div><div class='ctx'> </div><div class='ctx'> addsec() {</div><div class='head'>diff --git a/arch/powerpc/configs/40x/klondike_defconfig b/arch/powerpc/configs/40x/klondike_defconfig<br/>new file mode 100644<br/>index 000000000000..c0d228dc73dc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/40x/klondike_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/configs/40x/klondike_defconfig</a></div><div class='hunk'>@@ -0,0 +1,55 @@</div><div class='add'>+CONFIG_40x=y</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_SYSFS_DEPRECATED=y</div><div class='add'>+CONFIG_SYSFS_DEPRECATED_V2=y</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_WALNUT is not set</div><div class='add'>+CONFIG_APM8018X=y</div><div class='add'>+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set</div><div class='add'>+CONFIG_MATH_EMULATION=y</div><div class='add'>+# CONFIG_MIGRATION is not set</div><div class='add'>+# CONFIG_SUSPEND is not set</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_PROC_DEVICETREE=y</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+CONFIG_CHR_DEV_SG=y</div><div class='add'>+CONFIG_SCSI_SAS_ATTRS=y</div><div class='add'>+# CONFIG_INPUT is not set</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+# CONFIG_UNIX98_PTYS is not set</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+# CONFIG_DEVKMEM is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+# CONFIG_IOMMU_SUPPORT is not set</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set</div><div class='add'>+CONFIG_EXT4_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+CONFIG_CRAMFS=y</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=y</div><div class='add'>+CONFIG_NLS_ASCII=y</div><div class='add'>+CONFIG_NLS_ISO8859_1=y</div><div class='add'>+CONFIG_NLS_UTF8=y</div><div class='add'>+CONFIG_AVERAGE=y</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_SCHED_DEBUG is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+# CONFIG_FTRACE is not set</div><div class='head'>diff --git a/arch/powerpc/configs/40x/obs600_defconfig b/arch/powerpc/configs/40x/obs600_defconfig<br/>new file mode 100644<br/>index 000000000000..91c110dad2d6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/40x/obs600_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/configs/40x/obs600_defconfig</a></div><div class='hunk'>@@ -0,0 +1,83 @@</div><div class='add'>+CONFIG_40x=y</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_EXPERT=y</div><div class='add'>+CONFIG_KALLSYMS_ALL=y</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+# CONFIG_WALNUT is not set</div><div class='add'>+CONFIG_OBS600=y</div><div class='add'>+CONFIG_NO_HZ=y</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+CONFIG_MATH_EMULATION=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_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_INET_XFRM_MODE_TRANSPORT is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_CONNECTOR=y</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+CONFIG_MTD_OF_PARTS=y</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+CONFIG_MTD_JEDECPROBE=y</div><div class='add'>+CONFIG_MTD_CFI_AMDSTD=y</div><div class='add'>+CONFIG_MTD_PHYSMAP_OF=y</div><div class='add'>+CONFIG_MTD_NAND=y</div><div class='add'>+CONFIG_MTD_NAND_NDFC=y</div><div class='add'>+CONFIG_PROC_DEVICETREE=y</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+CONFIG_IBM_EMAC=y</div><div class='add'>+CONFIG_IBM_EMAC_RXB=256</div><div class='add'>+CONFIG_IBM_EMAC_TXB=256</div><div class='add'>+# CONFIG_INPUT is not set</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_EXTENDED=y</div><div class='add'>+CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='add'>+CONFIG_SERIAL_OF_PLATFORM=y</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+CONFIG_I2C_IBM_IIC=y</div><div class='add'>+CONFIG_SENSORS_LM75=y</div><div class='add'>+CONFIG_THERMAL=y</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_DRV_DS1307=y</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+CONFIG_CRAMFS=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+CONFIG_DEBUG_FS=y</div><div class='add'>+CONFIG_DETECT_HUNG_TASK=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+CONFIG_CRYPTO_PCBC=y</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_ANSI_CPRNG is not set</div><div class='head'>diff --git a/arch/powerpc/configs/44x/currituck_defconfig b/arch/powerpc/configs/44x/currituck_defconfig<br/>new file mode 100644<br/>index 000000000000..4192322f8a7f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/currituck_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/configs/44x/currituck_defconfig</a></div><div class='hunk'>@@ -0,0 +1,110 @@</div><div class='add'>+CONFIG_44x=y</div><div class='add'>+CONFIG_SMP=y</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+CONFIG_SPARSE_IRQ=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_EXPERT=y</div><div class='add'>+CONFIG_KALLSYMS_ALL=y</div><div class='add'>+CONFIG_PROFILING=y</div><div class='add'>+CONFIG_OPROFILE=y</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_BLK_DEV_BSG is not set</div><div class='add'>+CONFIG_PPC_47x=y</div><div class='add'>+# CONFIG_EBONY is not set</div><div class='add'>+CONFIG_CURRITUCK=y</div><div class='add'>+CONFIG_HIGHMEM=y</div><div class='add'>+CONFIG_HZ_100=y</div><div class='add'>+CONFIG_MATH_EMULATION=y</div><div class='add'>+CONFIG_IRQ_ALL_CPUS=y</div><div class='add'>+CONFIG_CMDLINE_BOOL=y</div><div class='add'>+CONFIG_CMDLINE=""</div><div class='add'>+# CONFIG_SUSPEND is not set</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_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_INET_XFRM_MODE_TRANSPORT is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_BEET is not set</div><div class='add'>+# CONFIG_INET_LRO is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_DEVTMPFS=y</div><div class='add'>+CONFIG_DEVTMPFS_MOUNT=y</div><div class='add'>+CONFIG_CONNECTOR=y</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+CONFIG_MTD_JEDECPROBE=y</div><div class='add'>+CONFIG_MTD_CFI_AMDSTD=y</div><div class='add'>+CONFIG_MTD_PHYSMAP_OF=y</div><div class='add'>+CONFIG_PROC_DEVICETREE=y</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=35000</div><div class='add'>+# CONFIG_SCSI_PROC_FS is not set</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+# CONFIG_SCSI_LOWLEVEL is not set</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+# CONFIG_SATA_PMP is not set</div><div class='add'>+CONFIG_SATA_SIL24=y</div><div class='add'>+# CONFIG_ATA_SFF is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+CONFIG_E1000E=y</div><div class='add'>+# CONFIG_NETDEV_10000 is not set</div><div class='add'>+# CONFIG_INPUT is not set</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_EXTENDED=y</div><div class='add'>+CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='add'>+CONFIG_SERIAL_OF_PLATFORM=y</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_IBM_IIC=y</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+CONFIG_THERMAL=y</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+CONFIG_USB_DEBUG=y</div><div class='add'>+CONFIG_USB_EHCI_HCD=y</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_DRV_M41T80=y</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set</div><div class='add'>+CONFIG_EXT3_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_EXT3_FS_SECURITY=y</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+CONFIG_CRAMFS=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+CONFIG_NFS_V3_ACL=y</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_NLS_DEFAULT="n"</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+CONFIG_DEBUG_FS=y</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+CONFIG_DETECT_HUNG_TASK=y</div><div class='add'>+CONFIG_DEBUG_INFO=y</div><div class='add'>+CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='add'>+CONFIG_XMON=y</div><div class='add'>+CONFIG_XMON_DEFAULT=y</div><div class='add'>+CONFIG_PPC_EARLY_DEBUG=y</div><div class='add'>+CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0x10000000</div><div class='add'>+CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x200</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+CONFIG_CRYPTO_CBC=y</div><div class='add'>+CONFIG_CRYPTO_ECB=y</div><div class='add'>+CONFIG_CRYPTO_PCBC=y</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_ANSI_CPRNG is not set</div><div class='add'>+# CONFIG_CRYPTO_HW is not set</div><div class='head'>diff --git a/arch/powerpc/configs/44x/iss476-smp_defconfig b/arch/powerpc/configs/44x/iss476-smp_defconfig<br/>index a6eb6ad05b2d..ca00cf750d3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/iss476-smp_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/44x/iss476-smp_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/44x/iss476-smp_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/configs/44x/iss476-smp_defconfig</a></div><div class='hunk'>@@ -25,7 +25,8 @@ CONFIG_CMDLINE_BOOL=y</div><div class='ctx'> CONFIG_CMDLINE="root=/dev/issblk0"</div><div class='ctx'> # CONFIG_PCI is not set</div><div class='ctx'> CONFIG_ADVANCED_OPTIONS=y</div><div class='del'>-CONFIG_RELOCATABLE=y</div><div class='add'>+CONFIG_NONSTATIC_KERNEL=y</div><div class='add'>+CONFIG_DYNAMIC_MEMSTART=y</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> CONFIG_UNIX=y</div><div class='head'>diff --git a/arch/powerpc/configs/chroma_defconfig b/arch/powerpc/configs/chroma_defconfig<br/>new file mode 100644<br/>index 000000000000..acf7fb280464<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/chroma_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/configs/chroma_defconfig</a></div><div class='hunk'>@@ -0,0 +1,307 @@</div><div class='add'>+CONFIG_PPC64=y</div><div class='add'>+CONFIG_PPC_BOOK3E_64=y</div><div class='add'>+# CONFIG_VIRT_CPU_ACCOUNTING is not set</div><div class='add'>+CONFIG_SMP=y</div><div class='add'>+CONFIG_NR_CPUS=256</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+CONFIG_TASKSTATS=y</div><div class='add'>+CONFIG_TASK_DELAY_ACCT=y</div><div class='add'>+CONFIG_TASK_XACCT=y</div><div class='add'>+CONFIG_TASK_IO_ACCOUNTING=y</div><div class='add'>+CONFIG_AUDIT=y</div><div class='add'>+CONFIG_AUDITSYSCALL=y</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=19</div><div class='add'>+CONFIG_CGROUPS=y</div><div class='add'>+CONFIG_CGROUP_DEVICE=y</div><div class='add'>+CONFIG_CPUSETS=y</div><div class='add'>+CONFIG_CGROUP_CPUACCT=y</div><div class='add'>+CONFIG_RESOURCE_COUNTERS=y</div><div class='add'>+CONFIG_CGROUP_MEM_RES_CTLR=y</div><div class='add'>+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+CONFIG_RELAY=y</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_RD_BZIP2=y</div><div class='add'>+CONFIG_RD_LZMA=y</div><div class='add'>+CONFIG_INITRAMFS_COMPRESSION_GZIP=y</div><div class='add'>+CONFIG_KALLSYMS_ALL=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_PERF_COUNTERS=y</div><div class='add'>+CONFIG_PROFILING=y</div><div class='add'>+CONFIG_OPROFILE=y</div><div class='add'>+CONFIG_KPROBES=y</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_FORCE_LOAD=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='add'>+CONFIG_MODVERSIONS=y</div><div class='add'>+CONFIG_MODULE_SRCVERSION_ALL=y</div><div class='add'>+CONFIG_SCOM_DEBUGFS=y</div><div class='add'>+CONFIG_PPC_A2_DD2=y</div><div class='add'>+CONFIG_KVM_GUEST=y</div><div class='add'>+CONFIG_NO_HZ=y</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+CONFIG_HZ_100=y</div><div class='add'>+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set</div><div class='add'>+CONFIG_BINFMT_MISC=y</div><div class='add'>+CONFIG_NUMA=y</div><div class='add'>+# CONFIG_MIGRATION is not set</div><div class='add'>+CONFIG_PPC_64K_PAGES=y</div><div class='add'>+CONFIG_SCHED_SMT=y</div><div class='add'>+CONFIG_CMDLINE_BOOL=y</div><div class='add'>+CONFIG_CMDLINE=""</div><div class='add'>+# CONFIG_SECCOMP is not set</div><div class='add'>+CONFIG_PCIEPORTBUS=y</div><div class='add'>+# CONFIG_PCIEASPM is not set</div><div class='add'>+CONFIG_PCI_MSI=y</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM_USER=m</div><div class='add'>+CONFIG_XFRM_SUB_POLICY=y</div><div class='add'>+CONFIG_XFRM_STATISTICS=y</div><div class='add'>+CONFIG_NET_KEY=m</div><div class='add'>+CONFIG_NET_KEY_MIGRATE=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_ROUTE_MULTIPATH=y</div><div class='add'>+CONFIG_IP_ROUTE_VERBOSE=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_NET_IPIP=y</div><div class='add'>+CONFIG_IP_MROUTE=y</div><div class='add'>+CONFIG_IP_PIMSM_V1=y</div><div class='add'>+CONFIG_IP_PIMSM_V2=y</div><div class='add'>+CONFIG_SYN_COOKIES=y</div><div class='add'>+CONFIG_INET_AH=m</div><div class='add'>+CONFIG_INET_ESP=m</div><div class='add'>+CONFIG_INET_IPCOMP=m</div><div class='add'>+CONFIG_IPV6=y</div><div class='add'>+CONFIG_IPV6_PRIVACY=y</div><div class='add'>+CONFIG_IPV6_ROUTER_PREF=y</div><div class='add'>+CONFIG_IPV6_ROUTE_INFO=y</div><div class='add'>+CONFIG_IPV6_OPTIMISTIC_DAD=y</div><div class='add'>+CONFIG_INET6_AH=y</div><div class='add'>+CONFIG_INET6_ESP=y</div><div class='add'>+CONFIG_INET6_IPCOMP=y</div><div class='add'>+CONFIG_IPV6_MIP6=y</div><div class='add'>+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=y</div><div class='add'>+CONFIG_IPV6_TUNNEL=y</div><div class='add'>+CONFIG_IPV6_MULTIPLE_TABLES=y</div><div class='add'>+CONFIG_IPV6_SUBTREES=y</div><div class='add'>+CONFIG_IPV6_MROUTE=y</div><div class='add'>+CONFIG_IPV6_PIMSM_V2=y</div><div class='add'>+CONFIG_NETFILTER=y</div><div class='add'>+CONFIG_NF_CONNTRACK=m</div><div class='add'>+CONFIG_NF_CONNTRACK_EVENTS=y</div><div class='add'>+CONFIG_NF_CT_PROTO_UDPLITE=m</div><div class='add'>+CONFIG_NF_CONNTRACK_FTP=m</div><div class='add'>+CONFIG_NF_CONNTRACK_IRC=m</div><div class='add'>+CONFIG_NF_CONNTRACK_TFTP=m</div><div class='add'>+CONFIG_NF_CT_NETLINK=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_MARK=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_NFLOG=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_DCCP=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_DSCP=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_ESP=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_HELPER=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_LENGTH=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_LIMIT=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_MAC=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_MARK=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_OWNER=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_POLICY=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_RATEEST=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_RECENT=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_SCTP=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_TIME=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_U32=m</div><div class='add'>+CONFIG_NF_CONNTRACK_IPV4=m</div><div class='add'>+CONFIG_IP_NF_QUEUE=m</div><div class='add'>+CONFIG_IP_NF_IPTABLES=m</div><div class='add'>+CONFIG_IP_NF_MATCH_AH=m</div><div class='add'>+CONFIG_IP_NF_MATCH_ECN=m</div><div class='add'>+CONFIG_IP_NF_MATCH_TTL=m</div><div class='add'>+CONFIG_IP_NF_FILTER=m</div><div class='add'>+CONFIG_IP_NF_TARGET_REJECT=m</div><div class='add'>+CONFIG_IP_NF_TARGET_LOG=m</div><div class='add'>+CONFIG_IP_NF_TARGET_ULOG=m</div><div class='add'>+CONFIG_NF_NAT=m</div><div class='add'>+CONFIG_IP_NF_TARGET_MASQUERADE=m</div><div class='add'>+CONFIG_IP_NF_TARGET_NETMAP=m</div><div class='add'>+CONFIG_IP_NF_TARGET_REDIRECT=m</div><div class='add'>+CONFIG_NET_TCPPROBE=y</div><div class='add'>+# CONFIG_WIRELESS is not set</div><div class='add'>+CONFIG_NET_9P=y</div><div class='add'>+CONFIG_NET_9P_DEBUG=y</div><div class='add'>+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"</div><div class='add'>+CONFIG_DEVTMPFS=y</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+CONFIG_MTD_CFI_ADV_OPTIONS=y</div><div class='add'>+CONFIG_MTD_CFI_LE_BYTE_SWAP=y</div><div class='add'>+CONFIG_MTD_CFI_INTELEXT=y</div><div class='add'>+CONFIG_MTD_CFI_AMDSTD=y</div><div class='add'>+CONFIG_MTD_CFI_STAA=y</div><div class='add'>+CONFIG_MTD_PHYSMAP_OF=y</div><div class='add'>+CONFIG_PROC_DEVICETREE=y</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+CONFIG_BLK_DEV_CRYPTOLOOP=y</div><div class='add'>+CONFIG_BLK_DEV_NBD=m</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=65536</div><div class='add'>+CONFIG_CDROM_PKTCDVD=y</div><div class='add'>+CONFIG_MISC_DEVICES=y</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+CONFIG_BLK_DEV_SR=y</div><div class='add'>+CONFIG_BLK_DEV_SR_VENDOR=y</div><div class='add'>+CONFIG_CHR_DEV_SG=y</div><div class='add'>+CONFIG_SCSI_MULTI_LUN=y</div><div class='add'>+CONFIG_SCSI_CONSTANTS=y</div><div class='add'>+CONFIG_SCSI_SPI_ATTRS=y</div><div class='add'>+CONFIG_SCSI_FC_ATTRS=y</div><div class='add'>+CONFIG_SCSI_ISCSI_ATTRS=m</div><div class='add'>+CONFIG_SCSI_SAS_ATTRS=m</div><div class='add'>+CONFIG_SCSI_SRP_ATTRS=y</div><div class='add'>+CONFIG_ATA=y</div><div class='add'>+CONFIG_SATA_AHCI=y</div><div class='add'>+CONFIG_SATA_SIL24=y</div><div class='add'>+CONFIG_SATA_MV=y</div><div class='add'>+CONFIG_SATA_SIL=y</div><div class='add'>+CONFIG_PATA_CMD64X=y</div><div class='add'>+CONFIG_PATA_MARVELL=y</div><div class='add'>+CONFIG_PATA_SIL680=y</div><div class='add'>+CONFIG_MD=y</div><div class='add'>+CONFIG_BLK_DEV_MD=y</div><div class='add'>+CONFIG_MD_LINEAR=y</div><div class='add'>+CONFIG_BLK_DEV_DM=y</div><div class='add'>+CONFIG_DM_CRYPT=y</div><div class='add'>+CONFIG_DM_SNAPSHOT=y</div><div class='add'>+CONFIG_DM_MIRROR=y</div><div class='add'>+CONFIG_DM_ZERO=y</div><div class='add'>+CONFIG_DM_UEVENT=y</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+CONFIG_TUN=y</div><div class='add'>+CONFIG_E1000E=y</div><div class='add'>+CONFIG_TIGON3=y</div><div class='add'>+# CONFIG_WLAN is not set</div><div class='add'>+# CONFIG_INPUT is not set</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='add'>+CONFIG_RAW_DRIVER=y</div><div class='add'>+CONFIG_MAX_RAW_DEVS=1024</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_VGA_ARB is not set</div><div class='add'>+# CONFIG_USB_SUPPORT is not set</div><div class='add'>+CONFIG_EDAC=y</div><div class='add'>+CONFIG_EDAC_MM_EDAC=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_DRV_DS1511=y</div><div class='add'>+CONFIG_RTC_DRV_DS1553=y</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+CONFIG_EXT2_FS_XATTR=y</div><div class='add'>+CONFIG_EXT2_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_EXT2_FS_SECURITY=y</div><div class='add'>+CONFIG_EXT2_FS_XIP=y</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set</div><div class='add'>+CONFIG_EXT3_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_EXT3_FS_SECURITY=y</div><div class='add'>+CONFIG_EXT4_FS=y</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='add'>+CONFIG_FUSE_FS=y</div><div class='add'>+CONFIG_ISO9660_FS=y</div><div class='add'>+CONFIG_JOLIET=y</div><div class='add'>+CONFIG_ZISOFS=y</div><div class='add'>+CONFIG_UDF_FS=m</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+CONFIG_TMPFS_POSIX_ACL=y</div><div class='add'>+CONFIG_CONFIGFS_FS=m</div><div class='add'>+CONFIG_CRAMFS=y</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+CONFIG_NFS_V3_ACL=y</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_NFS_V4_1=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_CIFS=y</div><div class='add'>+CONFIG_CIFS_WEAK_PW_HASH=y</div><div class='add'>+CONFIG_CIFS_XATTR=y</div><div class='add'>+CONFIG_CIFS_POSIX=y</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=y</div><div class='add'>+CONFIG_NLS_ASCII=y</div><div class='add'>+CONFIG_NLS_ISO8859_1=y</div><div class='add'>+CONFIG_CRC_CCITT=m</div><div class='add'>+CONFIG_CRC_T10DIF=y</div><div class='add'>+CONFIG_LIBCRC32C=m</div><div class='add'>+CONFIG_PRINTK_TIME=y</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+CONFIG_STRIP_ASM_SYMS=y</div><div class='add'>+CONFIG_DETECT_HUNG_TASK=y</div><div class='add'>+# CONFIG_SCHED_DEBUG is not set</div><div class='add'>+CONFIG_DEBUG_INFO=y</div><div class='add'>+CONFIG_FTRACE_SYSCALLS=y</div><div class='add'>+CONFIG_PPC_EMULATED_STATS=y</div><div class='add'>+CONFIG_XMON=y</div><div class='add'>+CONFIG_XMON_DEFAULT=y</div><div class='add'>+CONFIG_VIRQ_DEBUG=y</div><div class='add'>+CONFIG_PPC_EARLY_DEBUG=y</div><div class='add'>+CONFIG_KEYS_DEBUG_PROC_KEYS=y</div><div class='add'>+CONFIG_CRYPTO_NULL=m</div><div class='add'>+CONFIG_CRYPTO_TEST=m</div><div class='add'>+CONFIG_CRYPTO_CCM=m</div><div class='add'>+CONFIG_CRYPTO_GCM=m</div><div class='add'>+CONFIG_CRYPTO_PCBC=m</div><div class='add'>+CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_SHA256=m</div><div class='add'>+CONFIG_CRYPTO_SHA512=m</div><div class='add'>+CONFIG_CRYPTO_TGR192=m</div><div class='add'>+CONFIG_CRYPTO_WP512=m</div><div class='add'>+CONFIG_CRYPTO_AES=m</div><div class='add'>+CONFIG_CRYPTO_ANUBIS=m</div><div class='add'>+CONFIG_CRYPTO_BLOWFISH=m</div><div class='add'>+CONFIG_CRYPTO_CAST5=m</div><div class='add'>+CONFIG_CRYPTO_CAST6=m</div><div class='add'>+CONFIG_CRYPTO_KHAZAD=m</div><div class='add'>+CONFIG_CRYPTO_SALSA20=m</div><div class='add'>+CONFIG_CRYPTO_SERPENT=m</div><div class='add'>+CONFIG_CRYPTO_TEA=m</div><div class='add'>+CONFIG_CRYPTO_TWOFISH=m</div><div class='add'>+CONFIG_CRYPTO_LZO=m</div><div class='add'>+# CONFIG_CRYPTO_ANSI_CPRNG is not set</div><div class='add'>+CONFIG_VIRTUALIZATION=y</div><div class='head'>diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig<br/>index f087de6ec03f..f8aef205d222 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/corenet32_smp_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/corenet32_smp_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/corenet32_smp_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/configs/corenet32_smp_defconfig</a></div><div class='hunk'>@@ -37,6 +37,8 @@ CONFIG_FSL_LBC=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCIEPORTBUS=y</div><div class='ctx'> # CONFIG_PCIEASPM is not set</div><div class='add'>+CONFIG_RAPIDIO=y</div><div class='add'>+CONFIG_FSL_RIO=y</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> CONFIG_UNIX=y</div><div class='hunk'>@@ -94,17 +96,17 @@ CONFIG_SATA_SIL24=y</div><div class='ctx'> CONFIG_SATA_SIL=y</div><div class='ctx'> CONFIG_PATA_SIL680=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-CONFIG_VITESSE_PHY=y</div><div class='del'>-CONFIG_FIXED_PHY=y</div><div class='del'>-CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_FSL_PQ_MDIO=y</div><div class='ctx'> CONFIG_E1000=y</div><div class='ctx'> CONFIG_E1000E=y</div><div class='del'>-CONFIG_FSL_PQ_MDIO=y</div><div class='add'>+CONFIG_VITESSE_PHY=y</div><div class='add'>+CONFIG_FIXED_PHY=y</div><div class='ctx'> # CONFIG_INPUT_MOUSEDEV is not set</div><div class='ctx'> # CONFIG_INPUT_KEYBOARD is not set</div><div class='ctx'> # CONFIG_INPUT_MOUSE is not set</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_LEGACY_PTYS is not set</div><div class='add'>+CONFIG_PPC_EPAPR_HV_BYTECHAN=y</div><div class='ctx'> CONFIG_SERIAL_8250=y</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='ctx'> CONFIG_SERIAL_8250_EXTENDED=y</div><div class='hunk'>@@ -155,6 +157,7 @@ CONFIG_VFAT_FS=y</div><div class='ctx'> CONFIG_NTFS_FS=y</div><div class='ctx'> CONFIG_PROC_KCORE=y</div><div class='ctx'> CONFIG_TMPFS=y</div><div class='add'>+CONFIG_HUGETLBFS=y</div><div class='ctx'> CONFIG_JFFS2_FS=y</div><div class='ctx'> CONFIG_CRAMFS=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='head'>diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig<br/>index 782822c32d15..7ed8d4cf2719 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/corenet64_smp_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/corenet64_smp_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/corenet64_smp_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/configs/corenet64_smp_defconfig</a></div><div class='hunk'>@@ -23,6 +23,8 @@ CONFIG_P5020_DS=y</div><div class='ctx'> CONFIG_NO_HZ=y</div><div class='ctx'> CONFIG_HIGH_RES_TIMERS=y</div><div class='ctx'> CONFIG_BINFMT_MISC=m</div><div class='add'>+CONFIG_RAPIDIO=y</div><div class='add'>+CONFIG_FSL_RIO=y</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> CONFIG_UNIX=y</div><div class='hunk'>@@ -57,7 +59,6 @@ CONFIG_MISC_DEVICES=y</div><div class='ctx'> CONFIG_EEPROM_LEGACY=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_DUMMY=y</div><div class='del'>-CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_INPUT_FF_MEMLESS=m</div><div class='ctx'> # CONFIG_INPUT_MOUSEDEV is not set</div><div class='ctx'> # CONFIG_INPUT_KEYBOARD is not set</div><div class='hunk'>@@ -81,6 +82,7 @@ CONFIG_EXT3_FS=y</div><div class='ctx'> # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set</div><div class='ctx'> CONFIG_PROC_KCORE=y</div><div class='ctx'> CONFIG_TMPFS=y</div><div class='add'>+CONFIG_HUGETLBFS=y</div><div class='ctx'> # CONFIG_MISC_FILESYSTEMS 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/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig<br/>index a1e5a178a4ac..f37a2ab48881 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc85xx_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/mpc85xx_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc85xx_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/configs/mpc85xx_defconfig</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='ctx'> CONFIG_PPC_85xx=y</div><div class='del'>-CONFIG_PHYS_64BIT=y</div><div class='ctx'> CONFIG_EXPERIMENTAL=y</div><div class='ctx'> CONFIG_SYSVIPC=y</div><div class='ctx'> CONFIG_POSIX_MQUEUE=y</div><div class='hunk'>@@ -93,15 +92,14 @@ CONFIG_SATA_FSL=y</div><div class='ctx'> CONFIG_PATA_ALI=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_DUMMY=y</div><div class='add'>+CONFIG_FS_ENET=y</div><div class='add'>+CONFIG_UCC_GETH=y</div><div class='add'>+CONFIG_GIANFAR=y</div><div class='ctx'> CONFIG_MARVELL_PHY=y</div><div class='ctx'> CONFIG_DAVICOM_PHY=y</div><div class='ctx'> CONFIG_CICADA_PHY=y</div><div class='ctx'> CONFIG_VITESSE_PHY=y</div><div class='ctx'> CONFIG_FIXED_PHY=y</div><div class='del'>-CONFIG_NET_ETHERNET=y</div><div class='del'>-CONFIG_FS_ENET=y</div><div class='del'>-CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_UCC_GETH=y</div><div class='ctx'> CONFIG_INPUT_FF_MEMLESS=m</div><div class='ctx'> # CONFIG_INPUT_MOUSEDEV is not set</div><div class='ctx'> # CONFIG_INPUT_KEYBOARD is not set</div><div class='hunk'>@@ -120,6 +118,9 @@ CONFIG_NVRAM=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_CPM=m</div><div class='ctx'> CONFIG_I2C_MPC=y</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+CONFIG_SPI_FSL_SPI=y</div><div class='add'>+CONFIG_SPI_FSL_ESPI=y</div><div class='ctx'> CONFIG_GPIO_MPC8XXX=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='hunk'>@@ -163,6 +164,10 @@ CONFIG_USB_OHCI_HCD=y</div><div class='ctx'> CONFIG_USB_OHCI_HCD_PPC_OF_BE=y</div><div class='ctx'> CONFIG_USB_OHCI_HCD_PPC_OF_LE=y</div><div class='ctx'> CONFIG_USB_STORAGE=y</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+CONFIG_MMC_SDHCI=y</div><div class='add'>+CONFIG_MMC_SDHCI_PLTFM=y</div><div class='add'>+CONFIG_MMC_SDHCI_OF_ESDHC=y</div><div class='ctx'> CONFIG_EDAC=y</div><div class='ctx'> CONFIG_EDAC_MM_EDAC=y</div><div class='ctx'> CONFIG_RTC_CLASS=y</div><div class='hunk'>@@ -182,6 +187,7 @@ CONFIG_VFAT_FS=y</div><div class='ctx'> CONFIG_NTFS_FS=y</div><div class='ctx'> CONFIG_PROC_KCORE=y</div><div class='ctx'> CONFIG_TMPFS=y</div><div class='add'>+CONFIG_HUGETLBFS=y</div><div class='ctx'> CONFIG_ADFS_FS=m</div><div class='ctx'> CONFIG_AFFS_FS=m</div><div class='ctx'> CONFIG_HFS_FS=m</div><div class='hunk'>@@ -213,4 +219,5 @@ CONFIG_CRYPTO_SHA256=y</div><div class='ctx'> CONFIG_CRYPTO_SHA512=y</div><div class='ctx'> CONFIG_CRYPTO_AES=y</div><div class='ctx'> # CONFIG_CRYPTO_ANSI_CPRNG is not set</div><div class='add'>+CONFIG_CRYPTO_DEV_FSL_CAAM=y</div><div class='ctx'> CONFIG_CRYPTO_DEV_TALITOS=y</div><div class='head'>diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig<br/>index dd1e41386c4c..abdcd317cda7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc85xx_smp_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/mpc85xx_smp_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc85xx_smp_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/configs/mpc85xx_smp_defconfig</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='ctx'> CONFIG_PPC_85xx=y</div><div class='del'>-CONFIG_PHYS_64BIT=y</div><div class='ctx'> CONFIG_SMP=y</div><div class='ctx'> CONFIG_NR_CPUS=8</div><div class='ctx'> CONFIG_EXPERIMENTAL=y</div><div class='hunk'>@@ -26,6 +25,7 @@ CONFIG_MPC85xx_MDS=y</div><div class='ctx'> CONFIG_MPC8536_DS=y</div><div class='ctx'> CONFIG_MPC85xx_DS=y</div><div class='ctx'> CONFIG_MPC85xx_RDB=y</div><div class='add'>+CONFIG_P1010_RDB=y</div><div class='ctx'> CONFIG_P1022_DS=y</div><div class='ctx'> CONFIG_P1023_RDS=y</div><div class='ctx'> CONFIG_SOCRATES=y</div><div class='hunk'>@@ -94,15 +94,14 @@ CONFIG_SATA_FSL=y</div><div class='ctx'> CONFIG_PATA_ALI=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_DUMMY=y</div><div class='add'>+CONFIG_FS_ENET=y</div><div class='add'>+CONFIG_UCC_GETH=y</div><div class='add'>+CONFIG_GIANFAR=y</div><div class='ctx'> CONFIG_MARVELL_PHY=y</div><div class='ctx'> CONFIG_DAVICOM_PHY=y</div><div class='ctx'> CONFIG_CICADA_PHY=y</div><div class='ctx'> CONFIG_VITESSE_PHY=y</div><div class='ctx'> CONFIG_FIXED_PHY=y</div><div class='del'>-CONFIG_NET_ETHERNET=y</div><div class='del'>-CONFIG_FS_ENET=y</div><div class='del'>-CONFIG_GIANFAR=y</div><div class='del'>-CONFIG_UCC_GETH=y</div><div class='ctx'> CONFIG_INPUT_FF_MEMLESS=m</div><div class='ctx'> # CONFIG_INPUT_MOUSEDEV is not set</div><div class='ctx'> # CONFIG_INPUT_KEYBOARD is not set</div><div class='hunk'>@@ -121,6 +120,9 @@ CONFIG_NVRAM=y</div><div class='ctx'> CONFIG_I2C=y</div><div class='ctx'> CONFIG_I2C_CPM=m</div><div class='ctx'> CONFIG_I2C_MPC=y</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+CONFIG_SPI_FSL_SPI=y</div><div class='add'>+CONFIG_SPI_FSL_ESPI=y</div><div class='ctx'> CONFIG_GPIO_MPC8XXX=y</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='ctx'> CONFIG_VIDEO_OUTPUT_CONTROL=y</div><div class='hunk'>@@ -164,6 +166,10 @@ CONFIG_USB_OHCI_HCD=y</div><div class='ctx'> CONFIG_USB_OHCI_HCD_PPC_OF_BE=y</div><div class='ctx'> CONFIG_USB_OHCI_HCD_PPC_OF_LE=y</div><div class='ctx'> CONFIG_USB_STORAGE=y</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+CONFIG_MMC_SDHCI=y</div><div class='add'>+CONFIG_MMC_SDHCI_PLTFM=y</div><div class='add'>+CONFIG_MMC_SDHCI_OF_ESDHC=y</div><div class='ctx'> CONFIG_EDAC=y</div><div class='ctx'> CONFIG_EDAC_MM_EDAC=y</div><div class='ctx'> CONFIG_RTC_CLASS=y</div><div class='hunk'>@@ -183,6 +189,7 @@ CONFIG_VFAT_FS=y</div><div class='ctx'> CONFIG_NTFS_FS=y</div><div class='ctx'> CONFIG_PROC_KCORE=y</div><div class='ctx'> CONFIG_TMPFS=y</div><div class='add'>+CONFIG_HUGETLBFS=y</div><div class='ctx'> CONFIG_ADFS_FS=m</div><div class='ctx'> CONFIG_AFFS_FS=m</div><div class='ctx'> CONFIG_HFS_FS=m</div><div class='hunk'>@@ -214,4 +221,5 @@ CONFIG_CRYPTO_SHA256=y</div><div class='ctx'> CONFIG_CRYPTO_SHA512=y</div><div class='ctx'> CONFIG_CRYPTO_AES=y</div><div class='ctx'> # CONFIG_CRYPTO_ANSI_CPRNG is not set</div><div class='add'>+CONFIG_CRYPTO_DEV_FSL_CAAM=y</div><div class='ctx'> CONFIG_CRYPTO_DEV_TALITOS=y</div><div class='head'>diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig<br/>index 535711fcb13c..2156e077859b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/ppc64_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/ppc64_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/ppc64_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/configs/ppc64_defconfig</a></div><div class='hunk'>@@ -390,6 +390,11 @@ CONFIG_HUGETLBFS=y</div><div class='ctx'> CONFIG_HFS_FS=m</div><div class='ctx'> CONFIG_HFSPLUS_FS=m</div><div class='ctx'> CONFIG_CRAMFS=m</div><div class='add'>+CONFIG_SQUASHFS=m</div><div class='add'>+CONFIG_SQUASHFS_XATTR=y</div><div class='add'>+CONFIG_SQUASHFS_ZLIB=y</div><div class='add'>+CONFIG_SQUASHFS_LZO=y</div><div class='add'>+CONFIG_SQUASHFS_XZ=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> CONFIG_NFS_V3_ACL=y</div><div class='head'>diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig<br/>index 185c292b0f1c..ded867871e97 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/ps3_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/ps3_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/ps3_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/configs/ps3_defconfig</a></div><div class='hunk'>@@ -6,10 +6,10 @@ CONFIG_NR_CPUS=2</div><div class='ctx'> CONFIG_EXPERIMENTAL=y</div><div class='ctx'> CONFIG_SYSVIPC=y</div><div class='ctx'> CONFIG_POSIX_MQUEUE=y</div><div class='del'>-CONFIG_NAMESPACES=y</div><div class='add'>+CONFIG_SPARSE_IRQ=y</div><div class='ctx'> CONFIG_BLK_DEV_INITRD=y</div><div class='del'>-CONFIG_EXPERT=y</div><div class='del'>-CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='ctx'> # CONFIG_PERF_EVENTS is not set</div><div class='ctx'> # CONFIG_COMPAT_BRK is not set</div><div class='ctx'> CONFIG_SLAB=y</div><div class='hunk'>@@ -17,6 +17,7 @@ CONFIG_PROFILING=y</div><div class='ctx'> CONFIG_OPROFILE=m</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_PPC_POWERNV is not set</div><div class='ctx'> # CONFIG_PPC_PSERIES is not set</div><div class='ctx'> # CONFIG_PPC_PMAC is not set</div><div class='ctx'> CONFIG_PPC_PS3=y</div><div class='hunk'>@@ -27,14 +28,14 @@ CONFIG_PS3_VRAM=m</div><div class='ctx'> CONFIG_PS3_LPM=m</div><div class='ctx'> # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set</div><div class='ctx'> CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set</div><div class='ctx'> CONFIG_BINFMT_MISC=y</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='del'>-CONFIG_SPARSE_IRQ=y</div><div class='ctx'> # CONFIG_SPARSEMEM_VMEMMAP is not set</div><div class='ctx'> CONFIG_SCHED_SMT=y</div><div class='ctx'> CONFIG_CMDLINE_BOOL=y</div><div class='ctx'> CONFIG_CMDLINE=""</div><div class='del'>-CONFIG_PM=y</div><div class='add'>+CONFIG_PM_RUNTIME=y</div><div class='ctx'> CONFIG_PM_DEBUG=y</div><div class='ctx'> # CONFIG_SECCOMP is not set</div><div class='ctx'> # CONFIG_PCI is not set</div><div class='hunk'>@@ -81,20 +82,23 @@ CONFIG_SCSI_MULTI_LUN=y</div><div class='ctx'> CONFIG_MD=y</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-CONFIG_NET_ETHERNET=y</div><div class='add'>+# CONFIG_NET_VENDOR_BROADCOM is not set</div><div class='add'>+# CONFIG_NET_VENDOR_CHELSIO is not set</div><div class='add'>+# CONFIG_NET_VENDOR_INTEL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_MARVELL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_MICREL is not set</div><div class='add'>+# CONFIG_NET_VENDOR_NATSEMI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SEEQ is not set</div><div class='add'>+# CONFIG_NET_VENDOR_STMICRO is not set</div><div class='ctx'> CONFIG_GELIC_NET=y</div><div class='ctx'> CONFIG_GELIC_WIRELESS=y</div><div class='del'>-# CONFIG_NETDEV_10000 is not set</div><div class='add'>+# CONFIG_NET_VENDOR_XILINX is not set</div><div class='ctx'> CONFIG_USB_USBNET=m</div><div class='ctx'> # CONFIG_USB_NET_CDCETHER is not set</div><div class='add'>+# CONFIG_USB_NET_CDC_NCM is not set</div><div class='ctx'> # CONFIG_USB_NET_NET1080 is not set</div><div class='ctx'> # CONFIG_USB_NET_CDC_SUBSET is not set</div><div class='ctx'> # CONFIG_USB_NET_ZAURUS is not set</div><div class='del'>-CONFIG_PPP=m</div><div class='del'>-CONFIG_PPP_MULTILINK=y</div><div class='del'>-CONFIG_PPP_ASYNC=m</div><div class='del'>-CONFIG_PPP_DEFLATE=m</div><div class='del'>-CONFIG_PPPOE=m</div><div class='ctx'> CONFIG_INPUT_FF_MEMLESS=m</div><div class='ctx'> # CONFIG_INPUT_MOUSEDEV_PSAUX is not set</div><div class='ctx'> CONFIG_INPUT_JOYDEV=m</div><div class='hunk'>@@ -135,22 +139,21 @@ CONFIG_USB=m</div><div class='ctx'> CONFIG_USB_ANNOUNCE_NEW_DEVICES=y</div><div class='ctx'> CONFIG_USB_DEVICEFS=y</div><div class='ctx'> # CONFIG_USB_DEVICE_CLASS is not set</div><div class='add'>+CONFIG_USB_SUSPEND=y</div><div class='ctx'> CONFIG_USB_MON=m</div><div class='ctx'> CONFIG_USB_EHCI_HCD=m</div><div class='del'>-CONFIG_USB_EHCI_TT_NEWSCHED=y</div><div class='ctx'> # CONFIG_USB_EHCI_HCD_PPC_OF is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=m</div><div class='ctx'> CONFIG_USB_STORAGE=m</div><div class='ctx'> CONFIG_RTC_CLASS=y</div><div class='del'>-CONFIG_RTC_DRV_PS3=m</div><div class='add'>+CONFIG_RTC_DRV_PS3=y</div><div class='add'>+# CONFIG_IOMMU_SUPPORT is not set</div><div class='ctx'> CONFIG_EXT2_FS=m</div><div class='ctx'> CONFIG_EXT3_FS=m</div><div class='ctx'> # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set</div><div class='ctx'> CONFIG_EXT4_FS=y</div><div class='del'>-CONFIG_INOTIFY=y</div><div class='ctx'> CONFIG_QUOTA=y</div><div class='ctx'> CONFIG_QFMT_V2=y</div><div class='del'>-CONFIG_AUTOFS_FS=m</div><div class='ctx'> CONFIG_AUTOFS4_FS=m</div><div class='ctx'> CONFIG_ISO9660_FS=m</div><div class='ctx'> CONFIG_JOLIET=y</div><div class='hunk'>@@ -167,19 +170,17 @@ CONFIG_CIFS=m</div><div class='ctx'> CONFIG_NLS=y</div><div class='ctx'> CONFIG_NLS_CODEPAGE_437=y</div><div class='ctx'> CONFIG_NLS_ISO8859_1=y</div><div class='add'>+CONFIG_CRC_CCITT=m</div><div class='ctx'> CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='del'>-CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_DETECT_HUNG_TASK=y</div><div class='ctx'> CONFIG_PROVE_LOCKING=y</div><div class='ctx'> CONFIG_DEBUG_LOCKDEP=y</div><div class='del'>-CONFIG_DEBUG_SPINLOCK_SLEEP=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> CONFIG_DEBUG_WRITECOUNT=y</div><div class='ctx'> CONFIG_DEBUG_MEMORY_INIT=y</div><div class='ctx'> CONFIG_DEBUG_LIST=y</div><div class='del'>-# CONFIG_RCU_CPU_STALL_DETECTOR is not set</div><div class='ctx'> CONFIG_SYSCTL_SYSCALL_CHECK=y</div><div class='ctx'> # CONFIG_FTRACE is not set</div><div class='ctx'> CONFIG_DEBUG_STACKOVERFLOW=y</div><div class='head'>diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig<br/>index a72f2415a647..30e7d0d20e49 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/pseries_defconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/configs/pseries_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/pseries_defconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/configs/pseries_defconfig</a></div><div class='hunk'>@@ -304,6 +304,11 @@ CONFIG_PROC_KCORE=y</div><div class='ctx'> CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_HUGETLBFS=y</div><div class='ctx'> CONFIG_CRAMFS=m</div><div class='add'>+CONFIG_SQUASHFS=m</div><div class='add'>+CONFIG_SQUASHFS_XATTR=y</div><div class='add'>+CONFIG_SQUASHFS_ZLIB=y</div><div class='add'>+CONFIG_SQUASHFS_LZO=y</div><div class='add'>+CONFIG_SQUASHFS_XZ=y</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='ctx'> CONFIG_NFS_V3_ACL=y</div><div class='head'>diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild<br/>index d51df17c7e6f..7e313f1ed183 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/Kbuild?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/Kbuild</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/Kbuild?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/Kbuild</a></div><div class='hunk'>@@ -34,3 +34,5 @@ header-y += termios.h</div><div class='ctx'> header-y += types.h</div><div class='ctx'> header-y += ucontext.h</div><div class='ctx'> header-y += unistd.h</div><div class='add'>+</div><div class='add'>+generic-y += rwsem.h</div><div class='head'>diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h<br/>index e30442c539ce..ad55a1ccb9fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/cputable.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/cputable.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/cputable.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/cputable.h</a></div><div class='hunk'>@@ -201,6 +201,7 @@ extern const char *powerpc_base_platform;</div><div class='ctx'> #define CPU_FTR_POPCNTB			LONG_ASM_CONST(0x0400000000000000)</div><div class='ctx'> #define CPU_FTR_POPCNTD			LONG_ASM_CONST(0x0800000000000000)</div><div class='ctx'> #define CPU_FTR_ICSWX			LONG_ASM_CONST(0x1000000000000000)</div><div class='add'>+#define CPU_FTR_VMX_COPY		LONG_ASM_CONST(0x2000000000000000)</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='hunk'>@@ -425,7 +426,7 @@ extern const char *powerpc_base_platform;</div><div class='ctx'> 	    CPU_FTR_PURR | CPU_FTR_SPURR | CPU_FTR_REAL_LE | \</div><div class='ctx'> 	    CPU_FTR_DSCR | CPU_FTR_SAO  | CPU_FTR_ASYM_SMT | \</div><div class='ctx'> 	    CPU_FTR_STCX_CHECKS_ADDRESS | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \</div><div class='del'>-	    CPU_FTR_ICSWX | CPU_FTR_CFAR | CPU_FTR_HVMODE)</div><div class='add'>+	    CPU_FTR_ICSWX | CPU_FTR_CFAR | CPU_FTR_HVMODE | CPU_FTR_VMX_COPY)</div><div class='ctx'> #define CPU_FTRS_CELL	(CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \</div><div class='ctx'> 	    CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \</div><div class='ctx'> 	    CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \</div><div class='hunk'>@@ -437,7 +438,7 @@ extern const char *powerpc_base_platform;</div><div class='ctx'> #define CPU_FTRS_COMPATIBLE	(CPU_FTR_USE_TB | CPU_FTR_PPCAS_ARCH_V2)</div><div class='ctx'> </div><div class='ctx'> #define CPU_FTRS_A2 (CPU_FTR_USE_TB | CPU_FTR_SMT | CPU_FTR_DBELL | \</div><div class='del'>-		     CPU_FTR_NOEXECUTE | CPU_FTR_NODSISRALIGN)</div><div class='add'>+		     CPU_FTR_NOEXECUTE | CPU_FTR_NODSISRALIGN | CPU_FTR_ICSWX)</div><div class='ctx'> </div><div class='ctx'> #ifdef __powerpc64__</div><div class='ctx'> #ifdef CONFIG_PPC_BOOK3E</div><div class='head'>diff --git a/arch/powerpc/include/asm/cputime.h b/arch/powerpc/include/asm/cputime.h<br/>index 6ec1c380a4d6..487d46ff68a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/cputime.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/cputime.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/cputime.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/cputime.h</a></div><div class='hunk'>@@ -110,11 +110,11 @@ static inline u64 cputime64_to_jiffies64(const cputime_t ct)</div><div class='ctx'> /*</div><div class='ctx'>  * Convert cputime &lt;-&gt; microseconds</div><div class='ctx'>  */</div><div class='del'>-extern u64 __cputime_msec_factor;</div><div class='add'>+extern u64 __cputime_usec_factor;</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long cputime_to_usecs(const cputime_t ct)</div><div class='ctx'> {</div><div class='del'>-	return mulhdu((__force u64) ct, __cputime_msec_factor) * USEC_PER_MSEC;</div><div class='add'>+	return mulhdu((__force u64) ct, __cputime_usec_factor);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline cputime_t usecs_to_cputime(const unsigned long us)</div><div class='hunk'>@@ -127,7 +127,7 @@ static inline cputime_t usecs_to_cputime(const unsigned long us)</div><div class='ctx'> 	sec = us / 1000000;</div><div class='ctx'> 	if (ct) {</div><div class='ctx'> 		ct *= tb_ticks_per_sec;</div><div class='del'>-		do_div(ct, 1000);</div><div class='add'>+		do_div(ct, 1000000);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (sec)</div><div class='ctx'> 		ct += (cputime_t) sec * tb_ticks_per_sec;</div><div class='head'>diff --git a/arch/powerpc/include/asm/fsl_ifc.h b/arch/powerpc/include/asm/fsl_ifc.h<br/>new file mode 100644<br/>index 000000000000..b955012939a2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/fsl_ifc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/fsl_ifc.h</a></div><div class='hunk'>@@ -0,0 +1,834 @@</div><div class='add'>+/* Freescale Integrated Flash Controller</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor, Inc</div><div class='add'>+ *</div><div class='add'>+ * Author: Dipen Dudhat &lt;dipen.dudhat@freescale.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'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ASM_FSL_IFC_H</div><div class='add'>+#define __ASM_FSL_IFC_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+</div><div class='add'>+#define FSL_IFC_BANK_COUNT 4</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CSPR - Chip Select Property Register</div><div class='add'>+ */</div><div class='add'>+#define CSPR_BA				0xFFFF0000</div><div class='add'>+#define CSPR_BA_SHIFT			16</div><div class='add'>+#define CSPR_PORT_SIZE			0x00000180</div><div class='add'>+#define CSPR_PORT_SIZE_SHIFT		7</div><div class='add'>+/* Port Size 8 bit */</div><div class='add'>+#define CSPR_PORT_SIZE_8		0x00000080</div><div class='add'>+/* Port Size 16 bit */</div><div class='add'>+#define CSPR_PORT_SIZE_16		0x00000100</div><div class='add'>+/* Port Size 32 bit */</div><div class='add'>+#define CSPR_PORT_SIZE_32		0x00000180</div><div class='add'>+/* Write Protect */</div><div class='add'>+#define CSPR_WP				0x00000040</div><div class='add'>+#define CSPR_WP_SHIFT			6</div><div class='add'>+/* Machine Select */</div><div class='add'>+#define CSPR_MSEL			0x00000006</div><div class='add'>+#define CSPR_MSEL_SHIFT			1</div><div class='add'>+/* NOR */</div><div class='add'>+#define CSPR_MSEL_NOR			0x00000000</div><div class='add'>+/* NAND */</div><div class='add'>+#define CSPR_MSEL_NAND			0x00000002</div><div class='add'>+/* GPCM */</div><div class='add'>+#define CSPR_MSEL_GPCM			0x00000004</div><div class='add'>+/* Bank Valid */</div><div class='add'>+#define CSPR_V				0x00000001</div><div class='add'>+#define CSPR_V_SHIFT			0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Address Mask Register</div><div class='add'>+ */</div><div class='add'>+#define IFC_AMASK_MASK			0xFFFF0000</div><div class='add'>+#define IFC_AMASK_SHIFT			16</div><div class='add'>+#define IFC_AMASK(n)			(IFC_AMASK_MASK &lt;&lt; \</div><div class='add'>+					(__ilog2(n) - IFC_AMASK_SHIFT))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Chip Select Option Register IFC_NAND Machine</div><div class='add'>+ */</div><div class='add'>+/* Enable ECC Encoder */</div><div class='add'>+#define CSOR_NAND_ECC_ENC_EN		0x80000000</div><div class='add'>+#define CSOR_NAND_ECC_MODE_MASK		0x30000000</div><div class='add'>+/* 4 bit correction per 520 Byte sector */</div><div class='add'>+#define CSOR_NAND_ECC_MODE_4		0x00000000</div><div class='add'>+/* 8 bit correction per 528 Byte sector */</div><div class='add'>+#define CSOR_NAND_ECC_MODE_8		0x10000000</div><div class='add'>+/* Enable ECC Decoder */</div><div class='add'>+#define CSOR_NAND_ECC_DEC_EN		0x04000000</div><div class='add'>+/* Row Address Length */</div><div class='add'>+#define CSOR_NAND_RAL_MASK		0x01800000</div><div class='add'>+#define CSOR_NAND_RAL_SHIFT		20</div><div class='add'>+#define CSOR_NAND_RAL_1			0x00000000</div><div class='add'>+#define CSOR_NAND_RAL_2			0x00800000</div><div class='add'>+#define CSOR_NAND_RAL_3			0x01000000</div><div class='add'>+#define CSOR_NAND_RAL_4			0x01800000</div><div class='add'>+/* Page Size 512b, 2k, 4k */</div><div class='add'>+#define CSOR_NAND_PGS_MASK		0x00180000</div><div class='add'>+#define CSOR_NAND_PGS_SHIFT		16</div><div class='add'>+#define CSOR_NAND_PGS_512		0x00000000</div><div class='add'>+#define CSOR_NAND_PGS_2K		0x00080000</div><div class='add'>+#define CSOR_NAND_PGS_4K		0x00100000</div><div class='add'>+/* Spare region Size */</div><div class='add'>+#define CSOR_NAND_SPRZ_MASK		0x0000E000</div><div class='add'>+#define CSOR_NAND_SPRZ_SHIFT		13</div><div class='add'>+#define CSOR_NAND_SPRZ_16		0x00000000</div><div class='add'>+#define CSOR_NAND_SPRZ_64		0x00002000</div><div class='add'>+#define CSOR_NAND_SPRZ_128		0x00004000</div><div class='add'>+#define CSOR_NAND_SPRZ_210		0x00006000</div><div class='add'>+#define CSOR_NAND_SPRZ_218		0x00008000</div><div class='add'>+#define CSOR_NAND_SPRZ_224		0x0000A000</div><div class='add'>+/* Pages Per Block */</div><div class='add'>+#define CSOR_NAND_PB_MASK		0x00000700</div><div class='add'>+#define CSOR_NAND_PB_SHIFT		8</div><div class='add'>+#define CSOR_NAND_PB(n)		((__ilog2(n) - 5) &lt;&lt; CSOR_NAND_PB_SHIFT)</div><div class='add'>+/* Time for Read Enable High to Output High Impedance */</div><div class='add'>+#define CSOR_NAND_TRHZ_MASK		0x0000001C</div><div class='add'>+#define CSOR_NAND_TRHZ_SHIFT		2</div><div class='add'>+#define CSOR_NAND_TRHZ_20		0x00000000</div><div class='add'>+#define CSOR_NAND_TRHZ_40		0x00000004</div><div class='add'>+#define CSOR_NAND_TRHZ_60		0x00000008</div><div class='add'>+#define CSOR_NAND_TRHZ_80		0x0000000C</div><div class='add'>+#define CSOR_NAND_TRHZ_100		0x00000010</div><div class='add'>+/* Buffer control disable */</div><div class='add'>+#define CSOR_NAND_BCTLD			0x00000001</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Chip Select Option Register - NOR Flash Mode</div><div class='add'>+ */</div><div class='add'>+/* Enable Address shift Mode */</div><div class='add'>+#define CSOR_NOR_ADM_SHFT_MODE_EN	0x80000000</div><div class='add'>+/* Page Read Enable from NOR device */</div><div class='add'>+#define CSOR_NOR_PGRD_EN		0x10000000</div><div class='add'>+/* AVD Toggle Enable during Burst Program */</div><div class='add'>+#define CSOR_NOR_AVD_TGL_PGM_EN		0x01000000</div><div class='add'>+/* Address Data Multiplexing Shift */</div><div class='add'>+#define CSOR_NOR_ADM_MASK		0x0003E000</div><div class='add'>+#define CSOR_NOR_ADM_SHIFT_SHIFT	13</div><div class='add'>+#define CSOR_NOR_ADM_SHIFT(n)	((n) &lt;&lt; CSOR_NOR_ADM_SHIFT_SHIFT)</div><div class='add'>+/* Type of the NOR device hooked */</div><div class='add'>+#define CSOR_NOR_NOR_MODE_AYSNC_NOR	0x00000000</div><div class='add'>+#define CSOR_NOR_NOR_MODE_AVD_NOR	0x00000020</div><div class='add'>+/* Time for Read Enable High to Output High Impedance */</div><div class='add'>+#define CSOR_NOR_TRHZ_MASK		0x0000001C</div><div class='add'>+#define CSOR_NOR_TRHZ_SHIFT		2</div><div class='add'>+#define CSOR_NOR_TRHZ_20		0x00000000</div><div class='add'>+#define CSOR_NOR_TRHZ_40		0x00000004</div><div class='add'>+#define CSOR_NOR_TRHZ_60		0x00000008</div><div class='add'>+#define CSOR_NOR_TRHZ_80		0x0000000C</div><div class='add'>+#define CSOR_NOR_TRHZ_100		0x00000010</div><div class='add'>+/* Buffer control disable */</div><div class='add'>+#define CSOR_NOR_BCTLD			0x00000001</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Chip Select Option Register - GPCM Mode</div><div class='add'>+ */</div><div class='add'>+/* GPCM Mode - Normal */</div><div class='add'>+#define CSOR_GPCM_GPMODE_NORMAL		0x00000000</div><div class='add'>+/* GPCM Mode - GenericASIC */</div><div class='add'>+#define CSOR_GPCM_GPMODE_ASIC		0x80000000</div><div class='add'>+/* Parity Mode odd/even */</div><div class='add'>+#define CSOR_GPCM_PARITY_EVEN		0x40000000</div><div class='add'>+/* Parity Checking enable/disable */</div><div class='add'>+#define CSOR_GPCM_PAR_EN		0x20000000</div><div class='add'>+/* GPCM Timeout Count */</div><div class='add'>+#define CSOR_GPCM_GPTO_MASK		0x0F000000</div><div class='add'>+#define CSOR_GPCM_GPTO_SHIFT		24</div><div class='add'>+#define CSOR_GPCM_GPTO(n)	((__ilog2(n) - 8) &lt;&lt; CSOR_GPCM_GPTO_SHIFT)</div><div class='add'>+/* GPCM External Access Termination mode for read access */</div><div class='add'>+#define CSOR_GPCM_RGETA_EXT		0x00080000</div><div class='add'>+/* GPCM External Access Termination mode for write access */</div><div class='add'>+#define CSOR_GPCM_WGETA_EXT		0x00040000</div><div class='add'>+/* Address Data Multiplexing Shift */</div><div class='add'>+#define CSOR_GPCM_ADM_MASK		0x0003E000</div><div class='add'>+#define CSOR_GPCM_ADM_SHIFT_SHIFT	13</div><div class='add'>+#define CSOR_GPCM_ADM_SHIFT(n)	((n) &lt;&lt; CSOR_GPCM_ADM_SHIFT_SHIFT)</div><div class='add'>+/* Generic ASIC Parity error indication delay */</div><div class='add'>+#define CSOR_GPCM_GAPERRD_MASK		0x00000180</div><div class='add'>+#define CSOR_GPCM_GAPERRD_SHIFT		7</div><div class='add'>+#define CSOR_GPCM_GAPERRD(n)	(((n) - 1) &lt;&lt; CSOR_GPCM_GAPERRD_SHIFT)</div><div class='add'>+/* Time for Read Enable High to Output High Impedance */</div><div class='add'>+#define CSOR_GPCM_TRHZ_MASK		0x0000001C</div><div class='add'>+#define CSOR_GPCM_TRHZ_20		0x00000000</div><div class='add'>+#define CSOR_GPCM_TRHZ_40		0x00000004</div><div class='add'>+#define CSOR_GPCM_TRHZ_60		0x00000008</div><div class='add'>+#define CSOR_GPCM_TRHZ_80		0x0000000C</div><div class='add'>+#define CSOR_GPCM_TRHZ_100		0x00000010</div><div class='add'>+/* Buffer control disable */</div><div class='add'>+#define CSOR_GPCM_BCTLD			0x00000001</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Ready Busy Status Register (RB_STAT)</div><div class='add'>+ */</div><div class='add'>+/* CSn is READY */</div><div class='add'>+#define IFC_RB_STAT_READY_CS0		0x80000000</div><div class='add'>+#define IFC_RB_STAT_READY_CS1		0x40000000</div><div class='add'>+#define IFC_RB_STAT_READY_CS2		0x20000000</div><div class='add'>+#define IFC_RB_STAT_READY_CS3		0x10000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * General Control Register (GCR)</div><div class='add'>+ */</div><div class='add'>+#define IFC_GCR_MASK			0x8000F800</div><div class='add'>+/* reset all IFC hardware */</div><div class='add'>+#define IFC_GCR_SOFT_RST_ALL		0x80000000</div><div class='add'>+/* Turnaroud Time of external buffer */</div><div class='add'>+#define IFC_GCR_TBCTL_TRN_TIME		0x0000F800</div><div class='add'>+#define IFC_GCR_TBCTL_TRN_TIME_SHIFT	11</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Common Event and Error Status Register (CM_EVTER_STAT)</div><div class='add'>+ */</div><div class='add'>+/* Chip select error */</div><div class='add'>+#define IFC_CM_EVTER_STAT_CSER		0x80000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Common Event and Error Enable Register (CM_EVTER_EN)</div><div class='add'>+ */</div><div class='add'>+/* Chip select error checking enable */</div><div class='add'>+#define IFC_CM_EVTER_EN_CSEREN		0x80000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Common Event and Error Interrupt Enable Register (CM_EVTER_INTR_EN)</div><div class='add'>+ */</div><div class='add'>+/* Chip select error interrupt enable */</div><div class='add'>+#define IFC_CM_EVTER_INTR_EN_CSERIREN	0x80000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Common Transfer Error Attribute Register-0 (CM_ERATTR0)</div><div class='add'>+ */</div><div class='add'>+/* transaction type of error Read/Write */</div><div class='add'>+#define IFC_CM_ERATTR0_ERTYP_READ	0x80000000</div><div class='add'>+#define IFC_CM_ERATTR0_ERAID		0x0FF00000</div><div class='add'>+#define IFC_CM_ERATTR0_ERAID_SHIFT	20</div><div class='add'>+#define IFC_CM_ERATTR0_ESRCID		0x0000FF00</div><div class='add'>+#define IFC_CM_ERATTR0_ESRCID_SHIFT	8</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clock Control Register (CCR)</div><div class='add'>+ */</div><div class='add'>+#define IFC_CCR_MASK			0x0F0F8800</div><div class='add'>+/* Clock division ratio */</div><div class='add'>+#define IFC_CCR_CLK_DIV_MASK		0x0F000000</div><div class='add'>+#define IFC_CCR_CLK_DIV_SHIFT		24</div><div class='add'>+#define IFC_CCR_CLK_DIV(n)		((n-1) &lt;&lt; IFC_CCR_CLK_DIV_SHIFT)</div><div class='add'>+/* IFC Clock Delay */</div><div class='add'>+#define IFC_CCR_CLK_DLY_MASK		0x000F0000</div><div class='add'>+#define IFC_CCR_CLK_DLY_SHIFT		16</div><div class='add'>+#define IFC_CCR_CLK_DLY(n)		((n) &lt;&lt; IFC_CCR_CLK_DLY_SHIFT)</div><div class='add'>+/* Invert IFC clock before sending out */</div><div class='add'>+#define IFC_CCR_INV_CLK_EN		0x00008000</div><div class='add'>+/* Fedback IFC Clock */</div><div class='add'>+#define IFC_CCR_FB_IFC_CLK_SEL		0x00000800</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clock Status Register (CSR)</div><div class='add'>+ */</div><div class='add'>+/* Clk is stable */</div><div class='add'>+#define IFC_CSR_CLK_STAT_STABLE		0x80000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IFC_NAND Machine Specific Registers</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='add'>+ * NAND Configuration Register (NCFGR)</div><div class='add'>+ */</div><div class='add'>+/* Auto Boot Mode */</div><div class='add'>+#define IFC_NAND_NCFGR_BOOT		0x80000000</div><div class='add'>+/* Addressing Mode-ROW0+n/COL0 */</div><div class='add'>+#define IFC_NAND_NCFGR_ADDR_MODE_RC0	0x00000000</div><div class='add'>+/* Addressing Mode-ROW0+n/COL0+n */</div><div class='add'>+#define IFC_NAND_NCFGR_ADDR_MODE_RC1	0x00400000</div><div class='add'>+/* Number of loop iterations of FIR sequences for multi page operations */</div><div class='add'>+#define IFC_NAND_NCFGR_NUM_LOOP_MASK	0x0000F000</div><div class='add'>+#define IFC_NAND_NCFGR_NUM_LOOP_SHIFT	12</div><div class='add'>+#define IFC_NAND_NCFGR_NUM_LOOP(n)	((n) &lt;&lt; IFC_NAND_NCFGR_NUM_LOOP_SHIFT)</div><div class='add'>+/* Number of wait cycles */</div><div class='add'>+#define IFC_NAND_NCFGR_NUM_WAIT_MASK	0x000000FF</div><div class='add'>+#define IFC_NAND_NCFGR_NUM_WAIT_SHIFT	0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NAND Flash Command Registers (NAND_FCR0/NAND_FCR1)</div><div class='add'>+ */</div><div class='add'>+/* General purpose FCM flash command bytes CMD0-CMD7 */</div><div class='add'>+#define IFC_NAND_FCR0_CMD0		0xFF000000</div><div class='add'>+#define IFC_NAND_FCR0_CMD0_SHIFT	24</div><div class='add'>+#define IFC_NAND_FCR0_CMD1		0x00FF0000</div><div class='add'>+#define IFC_NAND_FCR0_CMD1_SHIFT	16</div><div class='add'>+#define IFC_NAND_FCR0_CMD2		0x0000FF00</div><div class='add'>+#define IFC_NAND_FCR0_CMD2_SHIFT	8</div><div class='add'>+#define IFC_NAND_FCR0_CMD3		0x000000FF</div><div class='add'>+#define IFC_NAND_FCR0_CMD3_SHIFT	0</div><div class='add'>+#define IFC_NAND_FCR1_CMD4		0xFF000000</div><div class='add'>+#define IFC_NAND_FCR1_CMD4_SHIFT	24</div><div class='add'>+#define IFC_NAND_FCR1_CMD5		0x00FF0000</div><div class='add'>+#define IFC_NAND_FCR1_CMD5_SHIFT	16</div><div class='add'>+#define IFC_NAND_FCR1_CMD6		0x0000FF00</div><div class='add'>+#define IFC_NAND_FCR1_CMD6_SHIFT	8</div><div class='add'>+#define IFC_NAND_FCR1_CMD7		0x000000FF</div><div class='add'>+#define IFC_NAND_FCR1_CMD7_SHIFT	0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flash ROW and COL Address Register (ROWn, COLn)</div><div class='add'>+ */</div><div class='add'>+/* Main/spare region locator */</div><div class='add'>+#define IFC_NAND_COL_MS			0x80000000</div><div class='add'>+/* Column Address */</div><div class='add'>+#define IFC_NAND_COL_CA_MASK		0x00000FFF</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NAND Flash Byte Count Register (NAND_BC)</div><div class='add'>+ */</div><div class='add'>+/* Byte Count for read/Write */</div><div class='add'>+#define IFC_NAND_BC			0x000001FF</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NAND Flash Instruction Registers (NAND_FIR0/NAND_FIR1/NAND_FIR2)</div><div class='add'>+ */</div><div class='add'>+/* NAND Machine specific opcodes OP0-OP14*/</div><div class='add'>+#define IFC_NAND_FIR0_OP0		0xFC000000</div><div class='add'>+#define IFC_NAND_FIR0_OP0_SHIFT		26</div><div class='add'>+#define IFC_NAND_FIR0_OP1		0x03F00000</div><div class='add'>+#define IFC_NAND_FIR0_OP1_SHIFT		20</div><div class='add'>+#define IFC_NAND_FIR0_OP2		0x000FC000</div><div class='add'>+#define IFC_NAND_FIR0_OP2_SHIFT		14</div><div class='add'>+#define IFC_NAND_FIR0_OP3		0x00003F00</div><div class='add'>+#define IFC_NAND_FIR0_OP3_SHIFT		8</div><div class='add'>+#define IFC_NAND_FIR0_OP4		0x000000FC</div><div class='add'>+#define IFC_NAND_FIR0_OP4_SHIFT		2</div><div class='add'>+#define IFC_NAND_FIR1_OP5		0xFC000000</div><div class='add'>+#define IFC_NAND_FIR1_OP5_SHIFT		26</div><div class='add'>+#define IFC_NAND_FIR1_OP6		0x03F00000</div><div class='add'>+#define IFC_NAND_FIR1_OP6_SHIFT		20</div><div class='add'>+#define IFC_NAND_FIR1_OP7		0x000FC000</div><div class='add'>+#define IFC_NAND_FIR1_OP7_SHIFT		14</div><div class='add'>+#define IFC_NAND_FIR1_OP8		0x00003F00</div><div class='add'>+#define IFC_NAND_FIR1_OP8_SHIFT		8</div><div class='add'>+#define IFC_NAND_FIR1_OP9		0x000000FC</div><div class='add'>+#define IFC_NAND_FIR1_OP9_SHIFT		2</div><div class='add'>+#define IFC_NAND_FIR2_OP10		0xFC000000</div><div class='add'>+#define IFC_NAND_FIR2_OP10_SHIFT	26</div><div class='add'>+#define IFC_NAND_FIR2_OP11		0x03F00000</div><div class='add'>+#define IFC_NAND_FIR2_OP11_SHIFT	20</div><div class='add'>+#define IFC_NAND_FIR2_OP12		0x000FC000</div><div class='add'>+#define IFC_NAND_FIR2_OP12_SHIFT	14</div><div class='add'>+#define IFC_NAND_FIR2_OP13		0x00003F00</div><div class='add'>+#define IFC_NAND_FIR2_OP13_SHIFT	8</div><div class='add'>+#define IFC_NAND_FIR2_OP14		0x000000FC</div><div class='add'>+#define IFC_NAND_FIR2_OP14_SHIFT	2</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Instruction opcodes to be programmed</div><div class='add'>+ * in FIR registers- 6bits</div><div class='add'>+ */</div><div class='add'>+enum ifc_nand_fir_opcodes {</div><div class='add'>+	IFC_FIR_OP_NOP,</div><div class='add'>+	IFC_FIR_OP_CA0,</div><div class='add'>+	IFC_FIR_OP_CA1,</div><div class='add'>+	IFC_FIR_OP_CA2,</div><div class='add'>+	IFC_FIR_OP_CA3,</div><div class='add'>+	IFC_FIR_OP_RA0,</div><div class='add'>+	IFC_FIR_OP_RA1,</div><div class='add'>+	IFC_FIR_OP_RA2,</div><div class='add'>+	IFC_FIR_OP_RA3,</div><div class='add'>+	IFC_FIR_OP_CMD0,</div><div class='add'>+	IFC_FIR_OP_CMD1,</div><div class='add'>+	IFC_FIR_OP_CMD2,</div><div class='add'>+	IFC_FIR_OP_CMD3,</div><div class='add'>+	IFC_FIR_OP_CMD4,</div><div class='add'>+	IFC_FIR_OP_CMD5,</div><div class='add'>+	IFC_FIR_OP_CMD6,</div><div class='add'>+	IFC_FIR_OP_CMD7,</div><div class='add'>+	IFC_FIR_OP_CW0,</div><div class='add'>+	IFC_FIR_OP_CW1,</div><div class='add'>+	IFC_FIR_OP_CW2,</div><div class='add'>+	IFC_FIR_OP_CW3,</div><div class='add'>+	IFC_FIR_OP_CW4,</div><div class='add'>+	IFC_FIR_OP_CW5,</div><div class='add'>+	IFC_FIR_OP_CW6,</div><div class='add'>+	IFC_FIR_OP_CW7,</div><div class='add'>+	IFC_FIR_OP_WBCD,</div><div class='add'>+	IFC_FIR_OP_RBCD,</div><div class='add'>+	IFC_FIR_OP_BTRD,</div><div class='add'>+	IFC_FIR_OP_RDSTAT,</div><div class='add'>+	IFC_FIR_OP_NWAIT,</div><div class='add'>+	IFC_FIR_OP_WFR,</div><div class='add'>+	IFC_FIR_OP_SBRD,</div><div class='add'>+	IFC_FIR_OP_UA,</div><div class='add'>+	IFC_FIR_OP_RB,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NAND Chip Select Register (NAND_CSEL)</div><div class='add'>+ */</div><div class='add'>+#define IFC_NAND_CSEL			0x0C000000</div><div class='add'>+#define IFC_NAND_CSEL_SHIFT		26</div><div class='add'>+#define IFC_NAND_CSEL_CS0		0x00000000</div><div class='add'>+#define IFC_NAND_CSEL_CS1		0x04000000</div><div class='add'>+#define IFC_NAND_CSEL_CS2		0x08000000</div><div class='add'>+#define IFC_NAND_CSEL_CS3		0x0C000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NAND Operation Sequence Start (NANDSEQ_STRT)</div><div class='add'>+ */</div><div class='add'>+/* NAND Flash Operation Start */</div><div class='add'>+#define IFC_NAND_SEQ_STRT_FIR_STRT	0x80000000</div><div class='add'>+/* Automatic Erase */</div><div class='add'>+#define IFC_NAND_SEQ_STRT_AUTO_ERS	0x00800000</div><div class='add'>+/* Automatic Program */</div><div class='add'>+#define IFC_NAND_SEQ_STRT_AUTO_PGM	0x00100000</div><div class='add'>+/* Automatic Copyback */</div><div class='add'>+#define IFC_NAND_SEQ_STRT_AUTO_CPB	0x00020000</div><div class='add'>+/* Automatic Read Operation */</div><div class='add'>+#define IFC_NAND_SEQ_STRT_AUTO_RD	0x00004000</div><div class='add'>+/* Automatic Status Read */</div><div class='add'>+#define IFC_NAND_SEQ_STRT_AUTO_STAT_RD	0x00000800</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NAND Event and Error Status Register (NAND_EVTER_STAT)</div><div class='add'>+ */</div><div class='add'>+/* Operation Complete */</div><div class='add'>+#define IFC_NAND_EVTER_STAT_OPC		0x80000000</div><div class='add'>+/* Flash Timeout Error */</div><div class='add'>+#define IFC_NAND_EVTER_STAT_FTOER	0x08000000</div><div class='add'>+/* Write Protect Error */</div><div class='add'>+#define IFC_NAND_EVTER_STAT_WPER	0x04000000</div><div class='add'>+/* ECC Error */</div><div class='add'>+#define IFC_NAND_EVTER_STAT_ECCER	0x02000000</div><div class='add'>+/* RCW Load Done */</div><div class='add'>+#define IFC_NAND_EVTER_STAT_RCW_DN	0x00008000</div><div class='add'>+/* Boot Loadr Done */</div><div class='add'>+#define IFC_NAND_EVTER_STAT_BOOT_DN	0x00004000</div><div class='add'>+/* Bad Block Indicator search select */</div><div class='add'>+#define IFC_NAND_EVTER_STAT_BBI_SRCH_SE	0x00000800</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NAND Flash Page Read Completion Event Status Register</div><div class='add'>+ * (PGRDCMPL_EVT_STAT)</div><div class='add'>+ */</div><div class='add'>+#define PGRDCMPL_EVT_STAT_MASK		0xFFFF0000</div><div class='add'>+/* Small Page 0-15 Done */</div><div class='add'>+#define PGRDCMPL_EVT_STAT_SECTION_SP(n)	(1 &lt;&lt; (31 - (n)))</div><div class='add'>+/* Large Page(2K) 0-3 Done */</div><div class='add'>+#define PGRDCMPL_EVT_STAT_LP_2K(n)	(0xF &lt;&lt; (28 - (n)*4))</div><div class='add'>+/* Large Page(4K) 0-1 Done */</div><div class='add'>+#define PGRDCMPL_EVT_STAT_LP_4K(n)	(0xFF &lt;&lt; (24 - (n)*8))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NAND Event and Error Enable Register (NAND_EVTER_EN)</div><div class='add'>+ */</div><div class='add'>+/* Operation complete event enable */</div><div class='add'>+#define IFC_NAND_EVTER_EN_OPC_EN	0x80000000</div><div class='add'>+/* Page read complete event enable */</div><div class='add'>+#define IFC_NAND_EVTER_EN_PGRDCMPL_EN	0x20000000</div><div class='add'>+/* Flash Timeout error enable */</div><div class='add'>+#define IFC_NAND_EVTER_EN_FTOER_EN	0x08000000</div><div class='add'>+/* Write Protect error enable */</div><div class='add'>+#define IFC_NAND_EVTER_EN_WPER_EN	0x04000000</div><div class='add'>+/* ECC error logging enable */</div><div class='add'>+#define IFC_NAND_EVTER_EN_ECCER_EN	0x02000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NAND Event and Error Interrupt Enable Register (NAND_EVTER_INTR_EN)</div><div class='add'>+ */</div><div class='add'>+/* Enable interrupt for operation complete */</div><div class='add'>+#define IFC_NAND_EVTER_INTR_OPCIR_EN		0x80000000</div><div class='add'>+/* Enable interrupt for Page read complete */</div><div class='add'>+#define IFC_NAND_EVTER_INTR_PGRDCMPLIR_EN	0x20000000</div><div class='add'>+/* Enable interrupt for Flash timeout error */</div><div class='add'>+#define IFC_NAND_EVTER_INTR_FTOERIR_EN		0x08000000</div><div class='add'>+/* Enable interrupt for Write protect error */</div><div class='add'>+#define IFC_NAND_EVTER_INTR_WPERIR_EN		0x04000000</div><div class='add'>+/* Enable interrupt for ECC error*/</div><div class='add'>+#define IFC_NAND_EVTER_INTR_ECCERIR_EN		0x02000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NAND Transfer Error Attribute Register-0 (NAND_ERATTR0)</div><div class='add'>+ */</div><div class='add'>+#define IFC_NAND_ERATTR0_MASK		0x0C080000</div><div class='add'>+/* Error on CS0-3 for NAND */</div><div class='add'>+#define IFC_NAND_ERATTR0_ERCS_CS0	0x00000000</div><div class='add'>+#define IFC_NAND_ERATTR0_ERCS_CS1	0x04000000</div><div class='add'>+#define IFC_NAND_ERATTR0_ERCS_CS2	0x08000000</div><div class='add'>+#define IFC_NAND_ERATTR0_ERCS_CS3	0x0C000000</div><div class='add'>+/* Transaction type of error Read/Write */</div><div class='add'>+#define IFC_NAND_ERATTR0_ERTTYPE_READ	0x00080000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NAND Flash Status Register (NAND_FSR)</div><div class='add'>+ */</div><div class='add'>+/* First byte of data read from read status op */</div><div class='add'>+#define IFC_NAND_NFSR_RS0		0xFF000000</div><div class='add'>+/* Second byte of data read from read status op */</div><div class='add'>+#define IFC_NAND_NFSR_RS1		0x00FF0000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ECC Error Status Registers (ECCSTAT0-ECCSTAT3)</div><div class='add'>+ */</div><div class='add'>+/* Number of ECC errors on sector n (n = 0-15) */</div><div class='add'>+#define IFC_NAND_ECCSTAT0_ERRCNT_SECTOR0_MASK	0x0F000000</div><div class='add'>+#define IFC_NAND_ECCSTAT0_ERRCNT_SECTOR0_SHIFT	24</div><div class='add'>+#define IFC_NAND_ECCSTAT0_ERRCNT_SECTOR1_MASK	0x000F0000</div><div class='add'>+#define IFC_NAND_ECCSTAT0_ERRCNT_SECTOR1_SHIFT	16</div><div class='add'>+#define IFC_NAND_ECCSTAT0_ERRCNT_SECTOR2_MASK	0x00000F00</div><div class='add'>+#define IFC_NAND_ECCSTAT0_ERRCNT_SECTOR2_SHIFT	8</div><div class='add'>+#define IFC_NAND_ECCSTAT0_ERRCNT_SECTOR3_MASK	0x0000000F</div><div class='add'>+#define IFC_NAND_ECCSTAT0_ERRCNT_SECTOR3_SHIFT	0</div><div class='add'>+#define IFC_NAND_ECCSTAT1_ERRCNT_SECTOR4_MASK	0x0F000000</div><div class='add'>+#define IFC_NAND_ECCSTAT1_ERRCNT_SECTOR4_SHIFT	24</div><div class='add'>+#define IFC_NAND_ECCSTAT1_ERRCNT_SECTOR5_MASK	0x000F0000</div><div class='add'>+#define IFC_NAND_ECCSTAT1_ERRCNT_SECTOR5_SHIFT	16</div><div class='add'>+#define IFC_NAND_ECCSTAT1_ERRCNT_SECTOR6_MASK	0x00000F00</div><div class='add'>+#define IFC_NAND_ECCSTAT1_ERRCNT_SECTOR6_SHIFT	8</div><div class='add'>+#define IFC_NAND_ECCSTAT1_ERRCNT_SECTOR7_MASK	0x0000000F</div><div class='add'>+#define IFC_NAND_ECCSTAT1_ERRCNT_SECTOR7_SHIFT	0</div><div class='add'>+#define IFC_NAND_ECCSTAT2_ERRCNT_SECTOR8_MASK	0x0F000000</div><div class='add'>+#define IFC_NAND_ECCSTAT2_ERRCNT_SECTOR8_SHIFT	24</div><div class='add'>+#define IFC_NAND_ECCSTAT2_ERRCNT_SECTOR9_MASK	0x000F0000</div><div class='add'>+#define IFC_NAND_ECCSTAT2_ERRCNT_SECTOR9_SHIFT	16</div><div class='add'>+#define IFC_NAND_ECCSTAT2_ERRCNT_SECTOR10_MASK	0x00000F00</div><div class='add'>+#define IFC_NAND_ECCSTAT2_ERRCNT_SECTOR10_SHIFT	8</div><div class='add'>+#define IFC_NAND_ECCSTAT2_ERRCNT_SECTOR11_MASK	0x0000000F</div><div class='add'>+#define IFC_NAND_ECCSTAT2_ERRCNT_SECTOR11_SHIFT	0</div><div class='add'>+#define IFC_NAND_ECCSTAT3_ERRCNT_SECTOR12_MASK	0x0F000000</div><div class='add'>+#define IFC_NAND_ECCSTAT3_ERRCNT_SECTOR12_SHIFT	24</div><div class='add'>+#define IFC_NAND_ECCSTAT3_ERRCNT_SECTOR13_MASK	0x000F0000</div><div class='add'>+#define IFC_NAND_ECCSTAT3_ERRCNT_SECTOR13_SHIFT	16</div><div class='add'>+#define IFC_NAND_ECCSTAT3_ERRCNT_SECTOR14_MASK	0x00000F00</div><div class='add'>+#define IFC_NAND_ECCSTAT3_ERRCNT_SECTOR14_SHIFT	8</div><div class='add'>+#define IFC_NAND_ECCSTAT3_ERRCNT_SECTOR15_MASK	0x0000000F</div><div class='add'>+#define IFC_NAND_ECCSTAT3_ERRCNT_SECTOR15_SHIFT	0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NAND Control Register (NANDCR)</div><div class='add'>+ */</div><div class='add'>+#define IFC_NAND_NCR_FTOCNT_MASK	0x1E000000</div><div class='add'>+#define IFC_NAND_NCR_FTOCNT_SHIFT	25</div><div class='add'>+#define IFC_NAND_NCR_FTOCNT(n)	((_ilog2(n) - 8)  &lt;&lt; IFC_NAND_NCR_FTOCNT_SHIFT)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NAND_AUTOBOOT_TRGR</div><div class='add'>+ */</div><div class='add'>+/* Trigger RCW load */</div><div class='add'>+#define IFC_NAND_AUTOBOOT_TRGR_RCW_LD	0x80000000</div><div class='add'>+/* Trigget Auto Boot */</div><div class='add'>+#define IFC_NAND_AUTOBOOT_TRGR_BOOT_LD	0x20000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NAND_MDR</div><div class='add'>+ */</div><div class='add'>+/* 1st read data byte when opcode SBRD */</div><div class='add'>+#define IFC_NAND_MDR_RDATA0		0xFF000000</div><div class='add'>+/* 2nd read data byte when opcode SBRD */</div><div class='add'>+#define IFC_NAND_MDR_RDATA1		0x00FF0000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NOR Machine Specific Registers</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='add'>+ * NOR Event and Error Status Register (NOR_EVTER_STAT)</div><div class='add'>+ */</div><div class='add'>+/* NOR Command Sequence Operation Complete */</div><div class='add'>+#define IFC_NOR_EVTER_STAT_OPC_NOR	0x80000000</div><div class='add'>+/* Write Protect Error */</div><div class='add'>+#define IFC_NOR_EVTER_STAT_WPER		0x04000000</div><div class='add'>+/* Command Sequence Timeout Error */</div><div class='add'>+#define IFC_NOR_EVTER_STAT_STOER	0x01000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NOR Event and Error Enable Register (NOR_EVTER_EN)</div><div class='add'>+ */</div><div class='add'>+/* NOR Command Seq complete event enable */</div><div class='add'>+#define IFC_NOR_EVTER_EN_OPCEN_NOR	0x80000000</div><div class='add'>+/* Write Protect Error Checking Enable */</div><div class='add'>+#define IFC_NOR_EVTER_EN_WPEREN		0x04000000</div><div class='add'>+/* Timeout Error Enable */</div><div class='add'>+#define IFC_NOR_EVTER_EN_STOEREN	0x01000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NOR Event and Error Interrupt Enable Register (NOR_EVTER_INTR_EN)</div><div class='add'>+ */</div><div class='add'>+/* Enable interrupt for OPC complete */</div><div class='add'>+#define IFC_NOR_EVTER_INTR_OPCEN_NOR	0x80000000</div><div class='add'>+/* Enable interrupt for write protect error */</div><div class='add'>+#define IFC_NOR_EVTER_INTR_WPEREN	0x04000000</div><div class='add'>+/* Enable interrupt for timeout error */</div><div class='add'>+#define IFC_NOR_EVTER_INTR_STOEREN	0x01000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NOR Transfer Error Attribute Register-0 (NOR_ERATTR0)</div><div class='add'>+ */</div><div class='add'>+/* Source ID for error transaction */</div><div class='add'>+#define IFC_NOR_ERATTR0_ERSRCID		0xFF000000</div><div class='add'>+/* AXI ID for error transation */</div><div class='add'>+#define IFC_NOR_ERATTR0_ERAID		0x000FF000</div><div class='add'>+/* Chip select corresponds to NOR error */</div><div class='add'>+#define IFC_NOR_ERATTR0_ERCS_CS0	0x00000000</div><div class='add'>+#define IFC_NOR_ERATTR0_ERCS_CS1	0x00000010</div><div class='add'>+#define IFC_NOR_ERATTR0_ERCS_CS2	0x00000020</div><div class='add'>+#define IFC_NOR_ERATTR0_ERCS_CS3	0x00000030</div><div class='add'>+/* Type of transaction read/write */</div><div class='add'>+#define IFC_NOR_ERATTR0_ERTYPE_READ	0x00000001</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NOR Transfer Error Attribute Register-2 (NOR_ERATTR2)</div><div class='add'>+ */</div><div class='add'>+#define IFC_NOR_ERATTR2_ER_NUM_PHASE_EXP	0x000F0000</div><div class='add'>+#define IFC_NOR_ERATTR2_ER_NUM_PHASE_PER	0x00000F00</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NOR Control Register (NORCR)</div><div class='add'>+ */</div><div class='add'>+#define IFC_NORCR_MASK			0x0F0F0000</div><div class='add'>+/* No. of Address/Data Phase */</div><div class='add'>+#define IFC_NORCR_NUM_PHASE_MASK	0x0F000000</div><div class='add'>+#define IFC_NORCR_NUM_PHASE_SHIFT	24</div><div class='add'>+#define IFC_NORCR_NUM_PHASE(n)	((n-1) &lt;&lt; IFC_NORCR_NUM_PHASE_SHIFT)</div><div class='add'>+/* Sequence Timeout Count */</div><div class='add'>+#define IFC_NORCR_STOCNT_MASK		0x000F0000</div><div class='add'>+#define IFC_NORCR_STOCNT_SHIFT		16</div><div class='add'>+#define IFC_NORCR_STOCNT(n)	((__ilog2(n) - 8) &lt;&lt; IFC_NORCR_STOCNT_SHIFT)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GPCM Machine specific registers</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='add'>+ * GPCM Event and Error Status Register (GPCM_EVTER_STAT)</div><div class='add'>+ */</div><div class='add'>+/* Timeout error */</div><div class='add'>+#define IFC_GPCM_EVTER_STAT_TOER	0x04000000</div><div class='add'>+/* Parity error */</div><div class='add'>+#define IFC_GPCM_EVTER_STAT_PER		0x01000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GPCM Event and Error Enable Register (GPCM_EVTER_EN)</div><div class='add'>+ */</div><div class='add'>+/* Timeout error enable */</div><div class='add'>+#define IFC_GPCM_EVTER_EN_TOER_EN	0x04000000</div><div class='add'>+/* Parity error enable */</div><div class='add'>+#define IFC_GPCM_EVTER_EN_PER_EN	0x01000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GPCM Event and Error Interrupt Enable Register (GPCM_EVTER_INTR_EN)</div><div class='add'>+ */</div><div class='add'>+/* Enable Interrupt for timeout error */</div><div class='add'>+#define IFC_GPCM_EEIER_TOERIR_EN	0x04000000</div><div class='add'>+/* Enable Interrupt for Parity error */</div><div class='add'>+#define IFC_GPCM_EEIER_PERIR_EN		0x01000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GPCM Transfer Error Attribute Register-0 (GPCM_ERATTR0)</div><div class='add'>+ */</div><div class='add'>+/* Source ID for error transaction */</div><div class='add'>+#define IFC_GPCM_ERATTR0_ERSRCID	0xFF000000</div><div class='add'>+/* AXI ID for error transaction */</div><div class='add'>+#define IFC_GPCM_ERATTR0_ERAID		0x000FF000</div><div class='add'>+/* Chip select corresponds to GPCM error */</div><div class='add'>+#define IFC_GPCM_ERATTR0_ERCS_CS0	0x00000000</div><div class='add'>+#define IFC_GPCM_ERATTR0_ERCS_CS1	0x00000040</div><div class='add'>+#define IFC_GPCM_ERATTR0_ERCS_CS2	0x00000080</div><div class='add'>+#define IFC_GPCM_ERATTR0_ERCS_CS3	0x000000C0</div><div class='add'>+/* Type of transaction read/Write */</div><div class='add'>+#define IFC_GPCM_ERATTR0_ERTYPE_READ	0x00000001</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GPCM Transfer Error Attribute Register-2 (GPCM_ERATTR2)</div><div class='add'>+ */</div><div class='add'>+/* On which beat of address/data parity error is observed */</div><div class='add'>+#define IFC_GPCM_ERATTR2_PERR_BEAT		0x00000C00</div><div class='add'>+/* Parity Error on byte */</div><div class='add'>+#define IFC_GPCM_ERATTR2_PERR_BYTE		0x000000F0</div><div class='add'>+/* Parity Error reported in addr or data phase */</div><div class='add'>+#define IFC_GPCM_ERATTR2_PERR_DATA_PHASE	0x00000001</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GPCM Status Register (GPCM_STAT)</div><div class='add'>+ */</div><div class='add'>+#define IFC_GPCM_STAT_BSY		0x80000000  /* GPCM is busy */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IFC Controller NAND Machine registers</div><div class='add'>+ */</div><div class='add'>+struct fsl_ifc_nand {</div><div class='add'>+	__be32 ncfgr;</div><div class='add'>+	u32 res1[0x4];</div><div class='add'>+	__be32 nand_fcr0;</div><div class='add'>+	__be32 nand_fcr1;</div><div class='add'>+	u32 res2[0x8];</div><div class='add'>+	__be32 row0;</div><div class='add'>+	u32 res3;</div><div class='add'>+	__be32 col0;</div><div class='add'>+	u32 res4;</div><div class='add'>+	__be32 row1;</div><div class='add'>+	u32 res5;</div><div class='add'>+	__be32 col1;</div><div class='add'>+	u32 res6;</div><div class='add'>+	__be32 row2;</div><div class='add'>+	u32 res7;</div><div class='add'>+	__be32 col2;</div><div class='add'>+	u32 res8;</div><div class='add'>+	__be32 row3;</div><div class='add'>+	u32 res9;</div><div class='add'>+	__be32 col3;</div><div class='add'>+	u32 res10[0x24];</div><div class='add'>+	__be32 nand_fbcr;</div><div class='add'>+	u32 res11;</div><div class='add'>+	__be32 nand_fir0;</div><div class='add'>+	__be32 nand_fir1;</div><div class='add'>+	__be32 nand_fir2;</div><div class='add'>+	u32 res12[0x10];</div><div class='add'>+	__be32 nand_csel;</div><div class='add'>+	u32 res13;</div><div class='add'>+	__be32 nandseq_strt;</div><div class='add'>+	u32 res14;</div><div class='add'>+	__be32 nand_evter_stat;</div><div class='add'>+	u32 res15;</div><div class='add'>+	__be32 pgrdcmpl_evt_stat;</div><div class='add'>+	u32 res16[0x2];</div><div class='add'>+	__be32 nand_evter_en;</div><div class='add'>+	u32 res17[0x2];</div><div class='add'>+	__be32 nand_evter_intr_en;</div><div class='add'>+	u32 res18[0x2];</div><div class='add'>+	__be32 nand_erattr0;</div><div class='add'>+	__be32 nand_erattr1;</div><div class='add'>+	u32 res19[0x10];</div><div class='add'>+	__be32 nand_fsr;</div><div class='add'>+	u32 res20;</div><div class='add'>+	__be32 nand_eccstat[4];</div><div class='add'>+	u32 res21[0x20];</div><div class='add'>+	__be32 nanndcr;</div><div class='add'>+	u32 res22[0x2];</div><div class='add'>+	__be32 nand_autoboot_trgr;</div><div class='add'>+	u32 res23;</div><div class='add'>+	__be32 nand_mdr;</div><div class='add'>+	u32 res24[0x5C];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IFC controller NOR Machine registers</div><div class='add'>+ */</div><div class='add'>+struct fsl_ifc_nor {</div><div class='add'>+	__be32 nor_evter_stat;</div><div class='add'>+	u32 res1[0x2];</div><div class='add'>+	__be32 nor_evter_en;</div><div class='add'>+	u32 res2[0x2];</div><div class='add'>+	__be32 nor_evter_intr_en;</div><div class='add'>+	u32 res3[0x2];</div><div class='add'>+	__be32 nor_erattr0;</div><div class='add'>+	__be32 nor_erattr1;</div><div class='add'>+	__be32 nor_erattr2;</div><div class='add'>+	u32 res4[0x4];</div><div class='add'>+	__be32 norcr;</div><div class='add'>+	u32 res5[0xEF];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IFC controller GPCM Machine registers</div><div class='add'>+ */</div><div class='add'>+struct fsl_ifc_gpcm {</div><div class='add'>+	__be32 gpcm_evter_stat;</div><div class='add'>+	u32 res1[0x2];</div><div class='add'>+	__be32 gpcm_evter_en;</div><div class='add'>+	u32 res2[0x2];</div><div class='add'>+	__be32 gpcm_evter_intr_en;</div><div class='add'>+	u32 res3[0x2];</div><div class='add'>+	__be32 gpcm_erattr0;</div><div class='add'>+	__be32 gpcm_erattr1;</div><div class='add'>+	__be32 gpcm_erattr2;</div><div class='add'>+	__be32 gpcm_stat;</div><div class='add'>+	u32 res4[0x1F3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IFC Controller Registers</div><div class='add'>+ */</div><div class='add'>+struct fsl_ifc_regs {</div><div class='add'>+	__be32 ifc_rev;</div><div class='add'>+	u32 res1[0x3];</div><div class='add'>+	struct {</div><div class='add'>+		__be32 cspr;</div><div class='add'>+		u32 res2[0x2];</div><div class='add'>+	} cspr_cs[FSL_IFC_BANK_COUNT];</div><div class='add'>+	u32 res3[0x18];</div><div class='add'>+	struct {</div><div class='add'>+		__be32 amask;</div><div class='add'>+		u32 res4[0x2];</div><div class='add'>+	} amask_cs[FSL_IFC_BANK_COUNT];</div><div class='add'>+	u32 res5[0x18];</div><div class='add'>+	struct {</div><div class='add'>+		__be32 csor;</div><div class='add'>+		u32 res6[0x2];</div><div class='add'>+	} csor_cs[FSL_IFC_BANK_COUNT];</div><div class='add'>+	u32 res7[0x18];</div><div class='add'>+	struct {</div><div class='add'>+		__be32 ftim[4];</div><div class='add'>+		u32 res8[0x8];</div><div class='add'>+	} ftim_cs[FSL_IFC_BANK_COUNT];</div><div class='add'>+	u32 res9[0x60];</div><div class='add'>+	__be32 rb_stat;</div><div class='add'>+	u32 res10[0x2];</div><div class='add'>+	__be32 ifc_gcr;</div><div class='add'>+	u32 res11[0x2];</div><div class='add'>+	__be32 cm_evter_stat;</div><div class='add'>+	u32 res12[0x2];</div><div class='add'>+	__be32 cm_evter_en;</div><div class='add'>+	u32 res13[0x2];</div><div class='add'>+	__be32 cm_evter_intr_en;</div><div class='add'>+	u32 res14[0x2];</div><div class='add'>+	__be32 cm_erattr0;</div><div class='add'>+	__be32 cm_erattr1;</div><div class='add'>+	u32 res15[0x2];</div><div class='add'>+	__be32 ifc_ccr;</div><div class='add'>+	__be32 ifc_csr;</div><div class='add'>+	u32 res16[0x2EB];</div><div class='add'>+	struct fsl_ifc_nand ifc_nand;</div><div class='add'>+	struct fsl_ifc_nor ifc_nor;</div><div class='add'>+	struct fsl_ifc_gpcm ifc_gpcm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern unsigned int convert_ifc_address(phys_addr_t addr_base);</div><div class='add'>+extern int fsl_ifc_find(phys_addr_t addr_base);</div><div class='add'>+</div><div class='add'>+/* overview of the fsl ifc controller */</div><div class='add'>+</div><div class='add'>+struct fsl_ifc_ctrl {</div><div class='add'>+	/* device info */</div><div class='add'>+	struct device			*dev;</div><div class='add'>+	struct fsl_ifc_regs __iomem	*regs;</div><div class='add'>+	int				irq;</div><div class='add'>+	int				nand_irq;</div><div class='add'>+	spinlock_t			lock;</div><div class='add'>+	void				*nand;</div><div class='add'>+</div><div class='add'>+	u32 nand_stat;</div><div class='add'>+	wait_queue_head_t nand_wait;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct fsl_ifc_ctrl *fsl_ifc_ctrl_dev;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_FSL_IFC_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h<br/>index 8a0b5ece8f76..420b45368fcf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/fsl_lbc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/fsl_lbc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/fsl_lbc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/fsl_lbc.h</a></div><div class='hunk'>@@ -238,8 +238,6 @@ struct fsl_lbc_regs {</div><div class='ctx'> #define FPAR_LP_CI_SHIFT      0</div><div class='ctx'> 	__be32 fbcr;            /**&lt; Flash Byte Count Register */</div><div class='ctx'> #define FBCR_BC      0x00000FFF</div><div class='del'>-	u8 res11[0x8];</div><div class='del'>-	u8 res8[0xF00];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -294,6 +292,11 @@ struct fsl_lbc_ctrl {</div><div class='ctx'> </div><div class='ctx'> 	/* status read from LTESR by irq handler */</div><div class='ctx'> 	unsigned int			irq_status;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SUSPEND</div><div class='add'>+	/* save regs when system go to deep-sleep */</div><div class='add'>+	struct fsl_lbc_regs		*saved_regs;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern int fsl_upm_run_pattern(struct fsl_upm *upm, void __iomem *io_base,</div><div class='head'>diff --git a/arch/powerpc/include/asm/hugetlb.h b/arch/powerpc/include/asm/hugetlb.h<br/>index 86004930a78e..dfdb95bc59a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/hugetlb.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/hugetlb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/hugetlb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/hugetlb.h</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern struct kmem_cache *hugepte_cache;</div><div class='del'>-extern void __init reserve_hugetlb_gpages(void);</div><div class='ctx'> </div><div class='ctx'> static inline pte_t *hugepd_page(hugepd_t hpd)</div><div class='ctx'> {</div><div class='hunk'>@@ -22,14 +21,14 @@ static inline pte_t *hugepte_offset(hugepd_t *hpdp, unsigned long addr,</div><div class='ctx'> 				    unsigned pdshift)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='del'>-	 * On 32-bit, we have multiple higher-level table entries that point to</div><div class='del'>-	 * the same hugepte.  Just use the first one since they're all</div><div class='add'>+	 * On FSL BookE, we have multiple higher-level table entries that</div><div class='add'>+	 * point to the same hugepte.  Just use the first one since they're all</div><div class='ctx'> 	 * identical.  So for that case, idx=0.</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned long idx = 0;</div><div class='ctx'> </div><div class='ctx'> 	pte_t *dir = hugepd_page(*hpdp);</div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='add'>+#ifndef CONFIG_PPC_FSL_BOOK3E</div><div class='ctx'> 	idx = (addr &amp; ((1UL &lt;&lt; pdshift) - 1)) &gt;&gt; hugepd_shift(*hpdp);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -53,7 +52,8 @@ static inline int is_hugepage_only_range(struct mm_struct *mm,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-void book3e_hugetlb_preload(struct mm_struct *mm, unsigned long ea, pte_t pte);</div><div class='add'>+void book3e_hugetlb_preload(struct vm_area_struct *vma, unsigned long ea,</div><div class='add'>+			    pte_t pte);</div><div class='ctx'> void flush_hugetlb_page(struct vm_area_struct *vma, unsigned long vmaddr);</div><div class='ctx'> </div><div class='ctx'> void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr,</div><div class='hunk'>@@ -124,7 +124,17 @@ static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,</div><div class='ctx'> 					     unsigned long addr, pte_t *ptep,</div><div class='ctx'> 					     pte_t pte, int dirty)</div><div class='ctx'> {</div><div class='add'>+#ifdef HUGETLB_NEED_PRELOAD</div><div class='add'>+	/*</div><div class='add'>+	 * The "return 1" forces a call of update_mmu_cache, which will write a</div><div class='add'>+	 * TLB entry.  Without this, platforms that don't do a write of the TLB</div><div class='add'>+	 * entry in the TLB miss handler asm will fault ad infinitum.</div><div class='add'>+	 */</div><div class='add'>+	ptep_set_access_flags(vma, addr, ptep, pte, dirty);</div><div class='add'>+	return 1;</div><div class='add'>+#else</div><div class='ctx'> 	return ptep_set_access_flags(vma, addr, ptep, pte, dirty);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline pte_t huge_ptep_get(pte_t *ptep)</div><div class='hunk'>@@ -142,14 +152,24 @@ static inline void arch_release_hugepage(struct page *page)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else /* ! CONFIG_HUGETLB_PAGE */</div><div class='del'>-static inline void reserve_hugetlb_gpages(void)</div><div class='del'>-{</div><div class='del'>-	pr_err("Cannot reserve gpages without hugetlb enabled\n");</div><div class='del'>-}</div><div class='ctx'> static inline void flush_hugetlb_page(struct vm_area_struct *vma,</div><div class='ctx'> 				      unsigned long vmaddr)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+#endif /* CONFIG_HUGETLB_PAGE */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FSL Book3E platforms require special gpage handling - the gpages</div><div class='add'>+ * are reserved early in the boot process by memblock instead of via</div><div class='add'>+ * the .dts as on IBM platforms.</div><div class='add'>+ */</div><div class='add'>+#if defined(CONFIG_HUGETLB_PAGE) &amp;&amp; defined(CONFIG_PPC_FSL_BOOK3E)</div><div class='add'>+extern void __init reserve_hugetlb_gpages(void);</div><div class='add'>+#else</div><div class='add'>+static inline void reserve_hugetlb_gpages(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_POWERPC_HUGETLB_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h<br/>index 45698d55cd6a..a3855b81eada 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/io.h</a></div><div class='hunk'>@@ -394,7 +394,7 @@ __do_out_asm(_rec_outl, "stwbrx")</div><div class='ctx'> #endif /* CONFIG_PPC32 */</div><div class='ctx'> </div><div class='ctx'> /* The "__do_*" operations below provide the actual "base" implementation</div><div class='del'>- * for each of the defined acccessor. Some of them use the out_* functions</div><div class='add'>+ * for each of the defined accessors. Some of them use the out_* functions</div><div class='ctx'>  * directly, some of them still use EEH, though we might change that in the</div><div class='ctx'>  * future. Those macros below provide the necessary argument swapping and</div><div class='ctx'>  * handling of the IO base for PIO.</div><div class='head'>diff --git a/arch/powerpc/include/asm/kdump.h b/arch/powerpc/include/asm/kdump.h<br/>index bffd062adf79..c9776202d7ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/kdump.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/kdump.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/kdump.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/kdump.h</a></div><div class='hunk'>@@ -32,11 +32,11 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_CRASH_DUMP) &amp;&amp; !defined(CONFIG_RELOCATABLE)</div><div class='add'>+#if defined(CONFIG_CRASH_DUMP) &amp;&amp; !defined(CONFIG_NONSTATIC_KERNEL)</div><div class='ctx'> extern void reserve_kdump_trampoline(void);</div><div class='ctx'> extern void setup_kdump_trampoline(void);</div><div class='ctx'> #else</div><div class='del'>-/* !CRASH_DUMP || RELOCATABLE */</div><div class='add'>+/* !CRASH_DUMP || !NONSTATIC_KERNEL */</div><div class='ctx'> static inline void reserve_kdump_trampoline(void) { ; }</div><div class='ctx'> static inline void setup_kdump_trampoline(void) { ; }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h<br/>index f921eb121d39..16d7e33d35e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/kexec.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/kexec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/kexec.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/kexec.h</a></div><div class='hunk'>@@ -49,7 +49,6 @@</div><div class='ctx'> #define KEXEC_STATE_REAL_MODE 2</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> </div><div class='ctx'> typedef void (*crash_shutdown_t)(void);</div><div class='hunk'>@@ -73,11 +72,6 @@ extern void kexec_smp_wait(void);	/* get and clear naca physid, wait for</div><div class='ctx'> 					  master to copy new code to 0 */</div><div class='ctx'> extern int crashing_cpu;</div><div class='ctx'> extern void crash_send_ipi(void (*crash_ipi_callback)(struct pt_regs *));</div><div class='del'>-extern cpumask_t cpus_in_sr;</div><div class='del'>-static inline int kexec_sr_activated(int cpu)</div><div class='del'>-{</div><div class='del'>-	return cpumask_test_cpu(cpu, &amp;cpus_in_sr);</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> struct kimage;</div><div class='ctx'> struct pt_regs;</div><div class='hunk'>@@ -94,7 +88,6 @@ extern void reserve_crashkernel(void);</div><div class='ctx'> extern void machine_kexec_mask_interrupts(void);</div><div class='ctx'> </div><div class='ctx'> #else /* !CONFIG_KEXEC */</div><div class='del'>-static inline int kexec_sr_activated(int cpu) { return 0; }</div><div class='ctx'> static inline void crash_kexec_secondary(struct pt_regs *regs) { }</div><div class='ctx'> </div><div class='ctx'> static inline int overlaps_crashkernel(unsigned long start, unsigned long size)</div><div class='head'>diff --git a/arch/powerpc/include/asm/keylargo.h b/arch/powerpc/include/asm/keylargo.h<br/>index d8520ef121f9..fc195d0b3c34 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/keylargo.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/keylargo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/keylargo.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/keylargo.h</a></div><div class='hunk'>@@ -51,7 +51,7 @@</div><div class='ctx'> </div><div class='ctx'> #define KL_GPIO_SOUND_POWER		(KEYLARGO_GPIO_0+0x05)</div><div class='ctx'> </div><div class='del'>-/* Hrm... this one is only to be used on Pismo. It seeem to also</div><div class='add'>+/* Hrm... this one is only to be used on Pismo. It seems to also</div><div class='ctx'>  * control the timebase enable on other machines. Still to be</div><div class='ctx'>  * experimented... --BenH.</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/powerpc/include/asm/kvm.h b/arch/powerpc/include/asm/kvm.h<br/>index 0ad432bc81d6..f7727d91ac6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/kvm.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/kvm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/kvm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/kvm.h</a></div><div class='hunk'>@@ -170,8 +170,8 @@ struct kvm_sregs {</div><div class='ctx'> 			} ppc64;</div><div class='ctx'> 			struct {</div><div class='ctx'> 				__u32 sr[16];</div><div class='del'>-				__u64 ibat[8]; </div><div class='del'>-				__u64 dbat[8]; </div><div class='add'>+				__u64 ibat[8];</div><div class='add'>+				__u64 dbat[8];</div><div class='ctx'> 			} ppc32;</div><div class='ctx'> 		} s;</div><div class='ctx'> 		struct {</div><div class='head'>diff --git a/arch/powerpc/include/asm/lv1call.h b/arch/powerpc/include/asm/lv1call.h<br/>index f77c708c67a0..233f9ecae761 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/lv1call.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/lv1call.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/lv1call.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/lv1call.h</a></div><div class='hunk'>@@ -231,7 +231,7 @@ LV1_CALL(allocate_memory,                               4, 2,   0 )</div><div class='ctx'> LV1_CALL(write_htab_entry,                              4, 0,   1 )</div><div class='ctx'> LV1_CALL(construct_virtual_address_space,               3, 2,   2 )</div><div class='ctx'> LV1_CALL(invalidate_htab_entries,                       5, 0,   3 )</div><div class='del'>-LV1_CALL(get_virtual_address_space_id_of_ppe,           1, 1,   4 )</div><div class='add'>+LV1_CALL(get_virtual_address_space_id_of_ppe,           0, 1,   4 )</div><div class='ctx'> LV1_CALL(query_logical_partition_address_region_info,   1, 5,   6 )</div><div class='ctx'> LV1_CALL(select_virtual_address_space,                  1, 0,   7 )</div><div class='ctx'> LV1_CALL(pause,                                         1, 0,   9 )</div><div class='hunk'>@@ -264,7 +264,7 @@ LV1_CALL(configure_execution_time_variable,             1, 0,  77 )</div><div class='ctx'> LV1_CALL(get_spe_irq_outlet,                            2, 1,  78 )</div><div class='ctx'> LV1_CALL(set_spe_privilege_state_area_1_register,       3, 0,  79 )</div><div class='ctx'> LV1_CALL(create_repository_node,                        6, 0,  90 )</div><div class='del'>-LV1_CALL(get_repository_node_value,                     5, 2,  91 )</div><div class='add'>+LV1_CALL(read_repository_node,                          5, 2,  91 )</div><div class='ctx'> LV1_CALL(modify_repository_node_value,                  6, 0,  92 )</div><div class='ctx'> LV1_CALL(remove_repository_node,                        4, 0,  93 )</div><div class='ctx'> LV1_CALL(read_htab_entries,                             2, 5,  95 )</div><div class='hunk'>@@ -276,7 +276,7 @@ LV1_CALL(construct_io_irq_outlet,                       1, 1, 120 )</div><div class='ctx'> LV1_CALL(destruct_io_irq_outlet,                        1, 0, 121 )</div><div class='ctx'> LV1_CALL(map_htab,                                      1, 1, 122 )</div><div class='ctx'> LV1_CALL(unmap_htab,                                    1, 0, 123 )</div><div class='del'>-LV1_CALL(get_version_info,                              0, 1, 127 )</div><div class='add'>+LV1_CALL(get_version_info,                              0, 2, 127 )</div><div class='ctx'> LV1_CALL(insert_htab_entry,                             6, 3, 158 )</div><div class='ctx'> LV1_CALL(read_virtual_uart,                             3, 1, 162 )</div><div class='ctx'> LV1_CALL(write_virtual_uart,                            3, 1, 163 )</div><div class='hunk'>@@ -294,9 +294,9 @@ LV1_CALL(unmap_device_dma_region,                       4, 0, 177 )</div><div class='ctx'> LV1_CALL(net_add_multicast_address,                     4, 0, 185 )</div><div class='ctx'> LV1_CALL(net_remove_multicast_address,                  4, 0, 186 )</div><div class='ctx'> LV1_CALL(net_start_tx_dma,                              4, 0, 187 )</div><div class='del'>-LV1_CALL(net_stop_tx_dma,                               3, 0, 188 )</div><div class='add'>+LV1_CALL(net_stop_tx_dma,                               2, 0, 188 )</div><div class='ctx'> LV1_CALL(net_start_rx_dma,                              4, 0, 189 )</div><div class='del'>-LV1_CALL(net_stop_rx_dma,                               3, 0, 190 )</div><div class='add'>+LV1_CALL(net_stop_rx_dma,                               2, 0, 190 )</div><div class='ctx'> LV1_CALL(net_set_interrupt_status_indicator,            4, 0, 191 )</div><div class='ctx'> LV1_CALL(net_set_interrupt_mask,                        4, 0, 193 )</div><div class='ctx'> LV1_CALL(net_control,                                   6, 2, 194 )</div><div class='head'>diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h<br/>index b540d6fcedd6..bf37931d1ad6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/machdep.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/machdep.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/machdep.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/machdep.h</a></div><div class='hunk'>@@ -213,6 +213,9 @@ struct machdep_calls {</div><div class='ctx'> 	 * allow assignment/enabling of the device. */</div><div class='ctx'> 	int  (*pcibios_enable_device_hook)(struct pci_dev *);</div><div class='ctx'> </div><div class='add'>+	/* Called after scan and before resource survey */</div><div class='add'>+	void (*pcibios_fixup_phb)(struct pci_controller *hose);</div><div class='add'>+</div><div class='ctx'> 	/* Called to shutdown machine specific hardware not already controlled</div><div class='ctx'> 	 * by other drivers.</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/arch/powerpc/include/asm/mmu-book3e.h b/arch/powerpc/include/asm/mmu-book3e.h<br/>index 0260ea5ec3c2..f5f89cafebd0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mmu-book3e.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/mmu-book3e.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mmu-book3e.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/mmu-book3e.h</a></div><div class='hunk'>@@ -214,6 +214,10 @@ typedef struct {</div><div class='ctx'> 	unsigned int	id;</div><div class='ctx'> 	unsigned int	active;</div><div class='ctx'> 	unsigned long	vdso_base;</div><div class='add'>+#ifdef CONFIG_PPC_ICSWX</div><div class='add'>+	struct spinlock *cop_lockp;	/* guard cop related stuff */</div><div class='add'>+	unsigned long acop;		/* mask of enabled coprocessor types */</div><div class='add'>+#endif /* CONFIG_PPC_ICSWX */</div><div class='ctx'> #ifdef CONFIG_PPC_MM_SLICES</div><div class='ctx'> 	u64 low_slices_psize;   /* SLB page size encodings */</div><div class='ctx'> 	u64 high_slices_psize;  /* 4 bits per slice for now */</div><div class='hunk'>@@ -254,6 +258,13 @@ extern int mmu_vmemmap_psize;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> extern unsigned long linear_map_top;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 64-bit booke platforms don't load the tlb in the tlb miss handler code.</div><div class='add'>+ * HUGETLB_NEED_PRELOAD handles this - it causes huge_ptep_set_access_flags to</div><div class='add'>+ * return 1, indicating that the tlb requires preloading.</div><div class='add'>+ */</div><div class='add'>+#define HUGETLB_NEED_PRELOAD</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* !__ASSEMBLY__ */</div><div class='head'>diff --git a/arch/powerpc/include/asm/mmu-hash64.h b/arch/powerpc/include/asm/mmu-hash64.h<br/>index db645ec842bd..412ba493cb98 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mmu-hash64.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/mmu-hash64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mmu-hash64.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/mmu-hash64.h</a></div><div class='hunk'>@@ -312,10 +312,9 @@ extern void slb_set_size(u16 size);</div><div class='ctx'>  * (i.e. everything above 0xC000000000000000), except the very top</div><div class='ctx'>  * segment, which simplifies several things.</div><div class='ctx'>  *</div><div class='del'>- * 	- We allow for 15 significant bits of ESID and 20 bits of</div><div class='del'>- * context for user addresses.  i.e. 8T (43 bits) of address space for</div><div class='del'>- * up to 1M contexts (although the page table structure and context</div><div class='del'>- * allocation will need changes to take advantage of this).</div><div class='add'>+ *	- We allow for 16 significant bits of ESID and 19 bits of</div><div class='add'>+ * context for user addresses.  i.e. 16T (44 bits) of address space for</div><div class='add'>+ * up to half a million contexts.</div><div class='ctx'>  *</div><div class='ctx'>  * 	- The scramble function gives robust scattering in the hash</div><div class='ctx'>  * table (at least based on some initial results).  The previous</div><div class='head'>diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h<br/>index e6fae49e0b74..67b4d9837236 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mpic.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/mpic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/mpic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/mpic.h</a></div><div class='hunk'>@@ -251,6 +251,9 @@ struct mpic_irq_save {</div><div class='ctx'> /* The instance data of a given MPIC */</div><div class='ctx'> struct mpic</div><div class='ctx'> {</div><div class='add'>+	/* The OpenFirmware dt node for this MPIC */</div><div class='add'>+	struct device_node *node;</div><div class='add'>+</div><div class='ctx'> 	/* The remapper for this MPIC */</div><div class='ctx'> 	struct irq_host		*irqhost;</div><div class='ctx'> </div><div class='hunk'>@@ -293,6 +296,9 @@ struct mpic</div><div class='ctx'> 	/* Register access method */</div><div class='ctx'> 	enum mpic_reg_type	reg_type;</div><div class='ctx'> </div><div class='add'>+	/* The physical base address of the MPIC */</div><div class='add'>+	phys_addr_t paddr;</div><div class='add'>+</div><div class='ctx'> 	/* The various ioremap'ed bases */</div><div class='ctx'> 	struct mpic_reg_bank	gregs;</div><div class='ctx'> 	struct mpic_reg_bank	tmregs;</div><div class='hunk'>@@ -331,11 +337,11 @@ struct mpic</div><div class='ctx'>  * Note setting any ID (leaving those bits to 0) means standard MPIC</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* This is the primary controller, only that one has IPIs and</div><div class='del'>- * has afinity control. A non-primary MPIC always uses CPU0</div><div class='del'>- * registers only</div><div class='add'>+/*</div><div class='add'>+ * This is a secondary ("chained") controller; it only uses the CPU0</div><div class='add'>+ * registers.  Primary controllers have IPIs and affinity control.</div><div class='ctx'>  */</div><div class='del'>-#define MPIC_PRIMARY			0x00000001</div><div class='add'>+#define MPIC_SECONDARY			0x00000001</div><div class='ctx'> </div><div class='ctx'> /* Set this for a big-endian MPIC */</div><div class='ctx'> #define MPIC_BIG_ENDIAN			0x00000002</div><div class='head'>diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h<br/>index 2893e8f5406d..a4b28f165b6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/opal.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/opal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/opal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/opal.h</a></div><div class='hunk'>@@ -109,6 +109,14 @@ extern int opal_enter_rtas(struct rtas_args *args,</div><div class='ctx'> #define OPAL_PCI_MAP_PE_DMA_WINDOW		44</div><div class='ctx'> #define OPAL_PCI_MAP_PE_DMA_WINDOW_REAL		45</div><div class='ctx'> #define OPAL_PCI_RESET				49</div><div class='add'>+#define OPAL_PCI_GET_HUB_DIAG_DATA		50</div><div class='add'>+#define OPAL_PCI_GET_PHB_DIAG_DATA		51</div><div class='add'>+#define OPAL_PCI_FENCE_PHB			52</div><div class='add'>+#define OPAL_PCI_REINIT				53</div><div class='add'>+#define OPAL_PCI_MASK_PE_ERROR			54</div><div class='add'>+#define OPAL_SET_SLOT_LED_STATUS		55</div><div class='add'>+#define OPAL_GET_EPOW_STATUS			56</div><div class='add'>+#define OPAL_SET_SYSTEM_ATTENTION_LED		57</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='hunk'>@@ -169,7 +177,11 @@ enum OpalPendingState {</div><div class='ctx'> 	OPAL_EVENT_NVRAM = 0x2,</div><div class='ctx'> 	OPAL_EVENT_RTC = 0x4,</div><div class='ctx'> 	OPAL_EVENT_CONSOLE_OUTPUT = 0x8,</div><div class='del'>-	OPAL_EVENT_CONSOLE_INPUT = 0x10</div><div class='add'>+	OPAL_EVENT_CONSOLE_INPUT = 0x10,</div><div class='add'>+	OPAL_EVENT_ERROR_LOG_AVAIL = 0x20,</div><div class='add'>+	OPAL_EVENT_ERROR_LOG = 0x40,</div><div class='add'>+	OPAL_EVENT_EPOW = 0x80,</div><div class='add'>+	OPAL_EVENT_LED_STATUS = 0x100</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Machine check related definitions */</div><div class='hunk'>@@ -258,13 +270,49 @@ enum OpalPeAction {</div><div class='ctx'> 	OPAL_MAP_PE = 1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum OpalPeltvAction {</div><div class='add'>+	OPAL_REMOVE_PE_FROM_DOMAIN = 0,</div><div class='add'>+	OPAL_ADD_PE_TO_DOMAIN = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum OpalMveEnableAction {</div><div class='add'>+	OPAL_DISABLE_MVE = 0,</div><div class='add'>+	OPAL_ENABLE_MVE = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum OpalPciResetAndReinitScope {</div><div class='ctx'> 	OPAL_PHB_COMPLETE = 1, OPAL_PCI_LINK = 2, OPAL_PHB_ERROR = 3,</div><div class='ctx'> 	OPAL_PCI_HOT_RESET = 4, OPAL_PCI_FUNDAMENTAL_RESET = 5,</div><div class='del'>-	OPAL_PCI_IODA_RESET = 6,</div><div class='add'>+	OPAL_PCI_IODA_TABLE_RESET = 6,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum OpalPciResetState {</div><div class='add'>+	OPAL_DEASSERT_RESET = 0,</div><div class='add'>+	OPAL_ASSERT_RESET = 1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum OpalPciResetState { OPAL_DEASSERT_RESET = 0, OPAL_ASSERT_RESET = 1 };</div><div class='add'>+enum OpalPciMaskAction {</div><div class='add'>+	OPAL_UNMASK_ERROR_TYPE = 0,</div><div class='add'>+	OPAL_MASK_ERROR_TYPE = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum OpalSlotLedType {</div><div class='add'>+	OPAL_SLOT_LED_ID_TYPE = 0,</div><div class='add'>+	OPAL_SLOT_LED_FAULT_TYPE = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum OpalLedAction {</div><div class='add'>+	OPAL_TURN_OFF_LED = 0,</div><div class='add'>+	OPAL_TURN_ON_LED = 1,</div><div class='add'>+	OPAL_QUERY_LED_STATE_AFTER_BUSY = 2</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum OpalEpowStatus {</div><div class='add'>+	OPAL_EPOW_NONE = 0,</div><div class='add'>+	OPAL_EPOW_UPS = 1,</div><div class='add'>+	OPAL_EPOW_OVER_AMBIENT_TEMP = 2,</div><div class='add'>+	OPAL_EPOW_OVER_INTERNAL_TEMP = 3</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct opal_machine_check_event {</div><div class='ctx'> 	enum OpalMCE_Version	version:8;	/* 0x00 */</div><div class='hunk'>@@ -314,8 +362,74 @@ struct opal_machine_check_event {</div><div class='ctx'> 	} u;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * This structure defines the overlay which will be used to store PHB error</div><div class='add'>+ * data upon request.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	OPAL_P7IOC_NUM_PEST_REGS = 128,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct OpalIoP7IOCPhbErrorData {</div><div class='add'>+	uint32_t brdgCtl;</div><div class='add'>+</div><div class='add'>+	// P7IOC utl regs</div><div class='add'>+	uint32_t portStatusReg;</div><div class='add'>+	uint32_t rootCmplxStatus;</div><div class='add'>+	uint32_t busAgentStatus;</div><div class='add'>+</div><div class='add'>+	// P7IOC cfg regs</div><div class='add'>+	uint32_t deviceStatus;</div><div class='add'>+	uint32_t slotStatus;</div><div class='add'>+	uint32_t linkStatus;</div><div class='add'>+	uint32_t devCmdStatus;</div><div class='add'>+	uint32_t devSecStatus;</div><div class='add'>+</div><div class='add'>+	// cfg AER regs</div><div class='add'>+	uint32_t rootErrorStatus;</div><div class='add'>+	uint32_t uncorrErrorStatus;</div><div class='add'>+	uint32_t corrErrorStatus;</div><div class='add'>+	uint32_t tlpHdr1;</div><div class='add'>+	uint32_t tlpHdr2;</div><div class='add'>+	uint32_t tlpHdr3;</div><div class='add'>+	uint32_t tlpHdr4;</div><div class='add'>+	uint32_t sourceId;</div><div class='add'>+</div><div class='add'>+	uint32_t rsv3;</div><div class='add'>+</div><div class='add'>+	// Record data about the call to allocate a buffer.</div><div class='add'>+	uint64_t errorClass;</div><div class='add'>+	uint64_t correlator;</div><div class='add'>+</div><div class='add'>+	//P7IOC MMIO Error Regs</div><div class='add'>+	uint64_t p7iocPlssr;                // n120</div><div class='add'>+	uint64_t p7iocCsr;                  // n110</div><div class='add'>+	uint64_t lemFir;                    // nC00</div><div class='add'>+	uint64_t lemErrorMask;              // nC18</div><div class='add'>+	uint64_t lemWOF;                    // nC40</div><div class='add'>+	uint64_t phbErrorStatus;            // nC80</div><div class='add'>+	uint64_t phbFirstErrorStatus;       // nC88</div><div class='add'>+	uint64_t phbErrorLog0;              // nCC0</div><div class='add'>+	uint64_t phbErrorLog1;              // nCC8</div><div class='add'>+	uint64_t mmioErrorStatus;           // nD00</div><div class='add'>+	uint64_t mmioFirstErrorStatus;      // nD08</div><div class='add'>+	uint64_t mmioErrorLog0;             // nD40</div><div class='add'>+	uint64_t mmioErrorLog1;             // nD48</div><div class='add'>+	uint64_t dma0ErrorStatus;           // nD80</div><div class='add'>+	uint64_t dma0FirstErrorStatus;      // nD88</div><div class='add'>+	uint64_t dma0ErrorLog0;             // nDC0</div><div class='add'>+	uint64_t dma0ErrorLog1;             // nDC8</div><div class='add'>+	uint64_t dma1ErrorStatus;           // nE00</div><div class='add'>+	uint64_t dma1FirstErrorStatus;      // nE08</div><div class='add'>+	uint64_t dma1ErrorLog0;             // nE40</div><div class='add'>+	uint64_t dma1ErrorLog1;             // nE48</div><div class='add'>+	uint64_t pestA[OPAL_P7IOC_NUM_PEST_REGS];</div><div class='add'>+	uint64_t pestB[OPAL_P7IOC_NUM_PEST_REGS];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> typedef struct oppanel_line {</div><div class='del'>-	/* XXX */</div><div class='add'>+	const char * 	line;</div><div class='add'>+	uint64_t 	line_len;</div><div class='ctx'> } oppanel_line_t;</div><div class='ctx'> </div><div class='ctx'> /* API functions */</div><div class='hunk'>@@ -413,6 +527,15 @@ int64_t opal_pci_map_pe_dma_window_real(uint64_t phb_id, uint16_t pe_number,</div><div class='ctx'> 					uint64_t pci_mem_size);</div><div class='ctx'> int64_t opal_pci_reset(uint64_t phb_id, uint8_t reset_scope, uint8_t assert_state);</div><div class='ctx'> </div><div class='add'>+int64_t opal_pci_get_hub_diag_data(uint64_t hub_id, void *diag_buffer, uint64_t diag_buffer_len);</div><div class='add'>+int64_t opal_pci_get_phb_diag_data(uint64_t phb_id, void *diag_buffer, uint64_t diag_buffer_len);</div><div class='add'>+int64_t opal_pci_fence_phb(uint64_t phb_id);</div><div class='add'>+int64_t opal_pci_reinit(uint64_t phb_id, uint8_t reinit_scope);</div><div class='add'>+int64_t opal_pci_mask_pe_error(uint64_t phb_id, uint16_t pe_number, uint8_t error_type, uint8_t mask_action);</div><div class='add'>+int64_t opal_set_slot_led_status(uint64_t phb_id, uint64_t slot_id, uint8_t led_type, uint8_t led_action);</div><div class='add'>+int64_t opal_get_epow_status(uint64_t *status);</div><div class='add'>+int64_t opal_set_system_attention_led(uint8_t led_action);</div><div class='add'>+</div><div class='ctx'> /* Internal functions */</div><div class='ctx'> extern int early_init_dt_scan_opal(unsigned long node, const char *uname, int depth, void *data);</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 17722c73ba2e..269c05a36d91 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/paca.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/paca.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/paca.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/paca.h</a></div><div class='hunk'>@@ -135,6 +135,7 @@ struct paca_struct {</div><div class='ctx'> 	u8 hard_enabled;		/* set if irqs are enabled in MSR */</div><div class='ctx'> 	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='add'>+	u8 nap_state_lost;		/* NV GPR values lost in power7_idle */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_POWERNV</div><div class='ctx'> 	/* Pointer to OPAL machine check event structure set by the</div><div class='head'>diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h<br/>index dd9c4fd038e0..f072e974f8a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/page.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/page.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/page.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/page.h</a></div><div class='hunk'>@@ -92,20 +92,34 @@ extern unsigned int HPAGE_SHIFT;</div><div class='ctx'> #define PAGE_OFFSET	ASM_CONST(CONFIG_PAGE_OFFSET)</div><div class='ctx'> #define LOAD_OFFSET	ASM_CONST((CONFIG_KERNEL_START-CONFIG_PHYSICAL_START))</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_RELOCATABLE)</div><div class='add'>+#if defined(CONFIG_NONSTATIC_KERNEL)</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='ctx'> extern phys_addr_t memstart_addr;</div><div class='ctx'> extern phys_addr_t kernstart_addr;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RELOCATABLE_PPC32</div><div class='add'>+extern long long virt_phys_offset;</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#endif /* __ASSEMBLY__ */</div><div class='ctx'> #define PHYSICAL_START	kernstart_addr</div><div class='del'>-#else</div><div class='add'>+</div><div class='add'>+#else	/* !CONFIG_NONSTATIC_KERNEL */</div><div class='ctx'> #define PHYSICAL_START	ASM_CONST(CONFIG_PHYSICAL_START)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* See Description below for VIRT_PHYS_OFFSET */</div><div class='add'>+#ifdef CONFIG_RELOCATABLE_PPC32</div><div class='add'>+#define VIRT_PHYS_OFFSET virt_phys_offset</div><div class='add'>+#else</div><div class='add'>+#define VIRT_PHYS_OFFSET (KERNELBASE - PHYSICAL_START)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> #define MEMORY_START	0UL</div><div class='del'>-#elif defined(CONFIG_RELOCATABLE)</div><div class='add'>+#elif defined(CONFIG_NONSTATIC_KERNEL)</div><div class='ctx'> #define MEMORY_START	memstart_addr</div><div class='ctx'> #else</div><div class='ctx'> #define MEMORY_START	(PHYSICAL_START + PAGE_OFFSET - KERNELBASE)</div><div class='hunk'>@@ -125,12 +139,77 @@ extern phys_addr_t kernstart_addr;</div><div class='ctx'>  * determine MEMORY_START until then.  However we can determine PHYSICAL_START</div><div class='ctx'>  * from information at hand (program counter, TLB lookup).</div><div class='ctx'>  *</div><div class='add'>+ * On BookE with RELOCATABLE (RELOCATABLE_PPC32)</div><div class='add'>+ *</div><div class='add'>+ *   With RELOCATABLE_PPC32,  we support loading the kernel at any physical </div><div class='add'>+ *   address without any restriction on the page alignment.</div><div class='add'>+ *</div><div class='add'>+ *   We find the runtime address of _stext and relocate ourselves based on </div><div class='add'>+ *   the following calculation:</div><div class='add'>+ *</div><div class='add'>+ *  	  virtual_base = ALIGN_DOWN(KERNELBASE,256M) +</div><div class='add'>+ *  				MODULO(_stext.run,256M)</div><div class='add'>+ *   and create the following mapping:</div><div class='add'>+ *</div><div class='add'>+ * 	  ALIGN_DOWN(_stext.run,256M) =&gt; ALIGN_DOWN(KERNELBASE,256M)</div><div class='add'>+ *</div><div class='add'>+ *   When we process relocations, we cannot depend on the</div><div class='add'>+ *   existing equation for the __va()/__pa() translations:</div><div class='add'>+ *</div><div class='add'>+ * 	   __va(x) = (x)  - PHYSICAL_START + KERNELBASE</div><div class='add'>+ *</div><div class='add'>+ *   Where:</div><div class='add'>+ *   	 PHYSICAL_START = kernstart_addr = Physical address of _stext</div><div class='add'>+ *  	 KERNELBASE = Compiled virtual address of _stext.</div><div class='add'>+ *</div><div class='add'>+ *   This formula holds true iff, kernel load address is TLB page aligned.</div><div class='add'>+ *</div><div class='add'>+ *   In our case, we need to also account for the shift in the kernel Virtual </div><div class='add'>+ *   address.</div><div class='add'>+ *</div><div class='add'>+ *   E.g.,</div><div class='add'>+ *</div><div class='add'>+ *   Let the kernel be loaded at 64MB and KERNELBASE be 0xc0000000 (same as PAGE_OFFSET).</div><div class='add'>+ *   In this case, we would be mapping 0 to 0xc0000000, and kernstart_addr = 64M</div><div class='add'>+ *</div><div class='add'>+ *   Now __va(1MB) = (0x100000) - (0x4000000) + 0xc0000000</div><div class='add'>+ *                 = 0xbc100000 , which is wrong.</div><div class='add'>+ *</div><div class='add'>+ *   Rather, it should be : 0xc0000000 + 0x100000 = 0xc0100000</div><div class='add'>+ *      	according to our mapping.</div><div class='add'>+ *</div><div class='add'>+ *   Hence we use the following formula to get the translations right:</div><div class='add'>+ *</div><div class='add'>+ * 	  __va(x) = (x) - [ PHYSICAL_START - Effective KERNELBASE ]</div><div class='add'>+ *</div><div class='add'>+ * 	  Where :</div><div class='add'>+ * 		PHYSICAL_START = dynamic load address.(kernstart_addr variable)</div><div class='add'>+ * 		Effective KERNELBASE = virtual_base =</div><div class='add'>+ * 				     = ALIGN_DOWN(KERNELBASE,256M) +</div><div class='add'>+ * 						MODULO(PHYSICAL_START,256M)</div><div class='add'>+ *</div><div class='add'>+ * 	To make the cost of __va() / __pa() more light weight, we introduce</div><div class='add'>+ * 	a new variable virt_phys_offset, which will hold :</div><div class='add'>+ *</div><div class='add'>+ * 	virt_phys_offset = Effective KERNELBASE - PHYSICAL_START</div><div class='add'>+ * 			 = ALIGN_DOWN(KERNELBASE,256M) - </div><div class='add'>+ * 			 	ALIGN_DOWN(PHYSICALSTART,256M)</div><div class='add'>+ *</div><div class='add'>+ * 	Hence :</div><div class='add'>+ *</div><div class='add'>+ * 	__va(x) = x - PHYSICAL_START + Effective KERNELBASE</div><div class='add'>+ * 		= x + virt_phys_offset</div><div class='add'>+ *</div><div class='add'>+ * 		and</div><div class='add'>+ * 	__pa(x) = x + PHYSICAL_START - Effective KERNELBASE</div><div class='add'>+ * 		= x - virt_phys_offset</div><div class='add'>+ * 		</div><div class='ctx'>  * On non-Book-E PPC64 PAGE_OFFSET and MEMORY_START are constants so use</div><div class='ctx'>  * the other definitions for __va &amp; __pa.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_BOOKE</div><div class='del'>-#define __va(x) ((void *)(unsigned long)((phys_addr_t)(x) - PHYSICAL_START + KERNELBASE))</div><div class='del'>-#define __pa(x) ((unsigned long)(x) + PHYSICAL_START - KERNELBASE)</div><div class='add'>+#define __va(x) ((void *)(unsigned long)((phys_addr_t)(x) + VIRT_PHYS_OFFSET))</div><div class='add'>+#define __pa(x) ((unsigned long)(x) - VIRT_PHYS_OFFSET)</div><div class='ctx'> #else</div><div class='ctx'> #define __va(x) ((void *)(unsigned long)((phys_addr_t)(x) + PAGE_OFFSET - MEMORY_START))</div><div class='ctx'> #define __pa(x) ((unsigned long)(x) - PAGE_OFFSET + MEMORY_START)</div><div class='hunk'>@@ -290,6 +369,7 @@ extern void clear_user_page(void *page, unsigned long vaddr, struct page *pg);</div><div class='ctx'> extern void copy_user_page(void *to, void *from, unsigned long vaddr,</div><div class='ctx'> 		struct page *p);</div><div class='ctx'> extern int page_is_ram(unsigned long pfn);</div><div class='add'>+extern int devmem_is_allowed(unsigned long pfn);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_SMLPAR</div><div class='ctx'> void arch_free_page(struct page *page, int order);</div><div class='head'>diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h<br/>index fb40ede6bc0d..fed85e6290e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/page_64.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/page_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/page_64.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/page_64.h</a></div><div class='hunk'>@@ -130,7 +130,9 @@ do {						\</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HUGETLB_PAGE</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC_MM_SLICES</div><div class='ctx'> #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif /* !CONFIG_HUGETLB_PAGE */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h<br/>index 56b879ab3a40..5d487657322e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pci-bridge.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/pci-bridge.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pci-bridge.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/pci-bridge.h</a></div><div class='hunk'>@@ -153,8 +153,8 @@ struct pci_dn {</div><div class='ctx'> </div><div class='ctx'> 	int	pci_ext_config_space;	/* for pci devices */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_EEH</div><div class='ctx'> 	struct	pci_dev *pcidev;	/* back-pointer to the pci device */</div><div class='add'>+#ifdef CONFIG_EEH</div><div class='ctx'> 	int	class_code;		/* pci device class */</div><div class='ctx'> 	int	eeh_mode;		/* See eeh.h for possible EEH_MODEs */</div><div class='ctx'> 	int	eeh_config_addr;</div><div class='hunk'>@@ -164,6 +164,10 @@ struct pci_dn {</div><div class='ctx'> 	int	eeh_false_positives;	/* # times this device reported #ff's */</div><div class='ctx'> 	u32	config_space[16];	/* saved PCI config space */</div><div class='ctx'> #endif</div><div class='add'>+#define IODA_INVALID_PE		(-1)</div><div class='add'>+#ifdef CONFIG_PPC_POWERNV</div><div class='add'>+	int	pe_number;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Get the pointer to a device_node's pci_dn */</div><div class='hunk'>@@ -222,7 +226,6 @@ extern void pci_process_bridge_OF_ranges(struct pci_controller *hose,</div><div class='ctx'> /* Allocate &amp; free a PCI host bridge structure */</div><div class='ctx'> extern struct pci_controller *pcibios_alloc_controller(struct device_node *dev);</div><div class='ctx'> extern void pcibios_free_controller(struct pci_controller *phb);</div><div class='del'>-extern void pcibios_setup_phb_resources(struct pci_controller *hose);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> extern int pcibios_vaddr_is_ioport(void __iomem *address);</div><div class='head'>diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h<br/>index 49c3de582be0..f54b3d26ce9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pci.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/pci.h</a></div><div class='hunk'>@@ -46,11 +46,6 @@ struct pci_dev;</div><div class='ctx'> #define pcibios_assign_all_busses() \</div><div class='ctx'> 	(pci_has_flag(PCI_REASSIGN_ALL_BUS))</div><div class='ctx'> </div><div class='del'>-static inline void pcibios_set_master(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	/* No special bus mastering setup handling */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void pcibios_penalize_isa_irq(int irq, int active)</div><div class='ctx'> {</div><div class='ctx'> 	/* We don't do dynamic PCI IRQ allocation */</div><div class='hunk'>@@ -184,8 +179,6 @@ extern void of_scan_pci_bridge(struct pci_dev *dev);</div><div class='ctx'> extern void of_scan_bus(struct device_node *node, struct pci_bus *bus);</div><div class='ctx'> extern void of_rescan_bus(struct device_node *node, struct pci_bus *bus);</div><div class='ctx'> </div><div class='del'>-extern int pci_read_irq_line(struct pci_dev *dev);</div><div class='del'>-</div><div class='ctx'> struct file;</div><div class='ctx'> extern pgprot_t	pci_phys_mem_access_prot(struct file *file,</div><div class='ctx'> 					 unsigned long pfn,</div><div class='head'>diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h<br/>index 88b0bd925a8b..2e0e4110f7ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pgtable.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/pgtable.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/pgtable.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/pgtable.h</a></div><div class='hunk'>@@ -170,6 +170,9 @@ extern int ptep_set_access_flags(struct vm_area_struct *vma, unsigned long addre</div><div class='ctx'> #define pgprot_cached_wthru(prot) (__pgprot((pgprot_val(prot) &amp; ~_PAGE_CACHE_CTL) | \</div><div class='ctx'> 				            _PAGE_COHERENT | _PAGE_WRITETHRU))</div><div class='ctx'> </div><div class='add'>+#define pgprot_cached_noncoherent(prot) \</div><div class='add'>+		(__pgprot(pgprot_val(prot) &amp; ~_PAGE_CACHE_CTL))</div><div class='add'>+</div><div class='ctx'> #define pgprot_writecombine pgprot_noncached_wc</div><div class='ctx'> </div><div class='ctx'> struct file;</div><div class='head'>diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h<br/>index eb11a446720e..b585bff1a022 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/processor.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/processor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/processor.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/processor.h</a></div><div class='hunk'>@@ -382,6 +382,9 @@ static inline unsigned long get_clean_sp(struct pt_regs *regs, int is_32)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+extern unsigned long cpuidle_disable;</div><div class='add'>+enum idle_boot_override {IDLE_NO_OVERRIDE = 0, IDLE_POWERSAVE_OFF};</div><div class='add'>+</div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> #endif /* _ASM_POWERPC_PROCESSOR_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h<br/>index 48223f9b8728..78a205162fd7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ptrace.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/ptrace.h</a></div><div class='hunk'>@@ -86,7 +86,18 @@ struct pt_regs {</div><div class='ctx'> #define instruction_pointer(regs) ((regs)-&gt;nip)</div><div class='ctx'> #define user_stack_pointer(regs) ((regs)-&gt;gpr[1])</div><div class='ctx'> #define kernel_stack_pointer(regs) ((regs)-&gt;gpr[1])</div><div class='del'>-#define regs_return_value(regs) ((regs)-&gt;gpr[3])</div><div class='add'>+static inline int is_syscall_success(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return !(regs-&gt;ccr &amp; 0x10000000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline long regs_return_value(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	if (is_syscall_success(regs))</div><div class='add'>+		return regs-&gt;gpr[3];</div><div class='add'>+	else</div><div class='add'>+		return -regs-&gt;gpr[3];</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> extern unsigned long profile_pc(struct pt_regs *regs);</div><div class='head'>diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h<br/>index 559da199edb5..7fdc2c0b7fa0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/reg.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/reg.h</a></div><div class='hunk'>@@ -951,6 +951,7 @@</div><div class='ctx'> #define PVR_403GCX	0x00201400</div><div class='ctx'> #define PVR_405GP	0x40110000</div><div class='ctx'> #define PVR_476		0x11a52000</div><div class='add'>+#define PVR_476FPE	0x7ff50000</div><div class='ctx'> #define PVR_STB03XXX	0x40310000</div><div class='ctx'> #define PVR_NP405H	0x41410000</div><div class='ctx'> #define PVR_NP405L	0x41610000</div><div class='head'>diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h<br/>index 03c48e819c8e..500fe1dc43e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/reg_booke.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/reg_booke.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/reg_booke.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/reg_booke.h</a></div><div class='hunk'>@@ -187,6 +187,10 @@</div><div class='ctx'> #define SPRN_CSRR1	SPRN_SRR3 /* Critical Save and Restore Register 1 */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC_ICSWX</div><div class='add'>+#define SPRN_HACOP	0x15F	/* Hypervisor Available Coprocessor Register */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Bit definitions for CCR1. */</div><div class='ctx'> #define	CCR1_DPC	0x00000100 /* Disable L1 I-Cache/D-Cache parity checking */</div><div class='ctx'> #define	CCR1_TCS	0x00000080 /* Timer Clock Select */</div><div class='head'>diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h<br/>index 41f69ae79d4e..01c143bb77ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/rtas.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/rtas.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/rtas.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/rtas.h</a></div><div class='hunk'>@@ -245,6 +245,12 @@ extern int early_init_dt_scan_rtas(unsigned long node,</div><div class='ctx'> </div><div class='ctx'> extern void pSeries_log_error(char *buf, unsigned int err_type, int fatal);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC_RTAS_DAEMON</div><div class='add'>+extern void rtas_cancel_event_scan(void);</div><div class='add'>+#else</div><div class='add'>+static inline void rtas_cancel_event_scan(void) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Error types logged.  */</div><div class='ctx'> #define ERR_FLAG_ALREADY_LOGGED	0x0</div><div class='ctx'> #define ERR_FLAG_BOOT		0x1 	/* log was pulled from NVRAM on boot */</div><div class='hunk'>@@ -307,5 +313,17 @@ static inline u32 rtas_config_addr(int busno, int devfn, int reg)</div><div class='ctx'> extern void __cpuinit rtas_give_timebase(void);</div><div class='ctx'> extern void __cpuinit rtas_take_timebase(void);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC_RTAS</div><div class='add'>+static inline int page_is_rtas_user_buf(unsigned long pfn)</div><div class='add'>+{</div><div class='add'>+	unsigned long paddr = (pfn &lt;&lt; PAGE_SHIFT);</div><div class='add'>+	if (paddr &gt;= rtas_rmo_buf &amp;&amp; paddr &lt; (rtas_rmo_buf + RTAS_RMOBUF_MAX))</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int page_is_rtas_user_buf(unsigned long pfn) { return 0;}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> #endif /* _POWERPC_RTAS_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/rwsem.h b/arch/powerpc/include/asm/rwsem.h<br/>deleted file mode 100644<br/>index bb1e2cdeb9bf..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/rwsem.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/rwsem.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,132 +0,0 @@</div><div class='del'>-#ifndef _ASM_POWERPC_RWSEM_H</div><div class='del'>-#define _ASM_POWERPC_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'>-#ifdef __KERNEL__</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * R/W semaphores for PPC using the stuff in lib/rwsem.c.</div><div class='del'>- * Adapted largely from include/asm-i386/rwsem.h</div><div class='del'>- * by Paul Mackerras &lt;paulus@samba.org&gt;.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * the semaphore definition</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_PPC64</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'>-static inline void __down_read(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(atomic_long_inc_return((atomic_long_t *)&amp;sem-&gt;count) &lt;= 0))</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_trylock(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	long tmp;</div><div class='del'>-</div><div class='del'>-	while ((tmp = sem-&gt;count) &gt;= 0) {</div><div class='del'>-		if (tmp == cmpxchg(&amp;sem-&gt;count, tmp,</div><div class='del'>-				   tmp + RWSEM_ACTIVE_READ_BIAS)) {</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'>- * lock for writing</div><div class='del'>- */</div><div class='del'>-static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)</div><div class='del'>-{</div><div class='del'>-	long tmp;</div><div class='del'>-</div><div class='del'>-	tmp = atomic_long_add_return(RWSEM_ACTIVE_WRITE_BIAS,</div><div class='del'>-				     (atomic_long_t *)&amp;sem-&gt;count);</div><div class='del'>-	if (unlikely(tmp != RWSEM_ACTIVE_WRITE_BIAS))</div><div class='del'>-		rwsem_down_write_failed(sem);</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_nested(sem, 0);</div><div class='del'>-}</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 tmp;</div><div class='del'>-</div><div class='del'>-	tmp = cmpxchg(&amp;sem-&gt;count, RWSEM_UNLOCKED_VALUE,</div><div class='del'>-		      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'>- * 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'>-</div><div class='del'>-	tmp = atomic_long_dec_return((atomic_long_t *)&amp;sem-&gt;count);</div><div class='del'>-	if (unlikely(tmp &lt; -1 &amp;&amp; (tmp &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 __up_write(struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(atomic_long_sub_return(RWSEM_ACTIVE_WRITE_BIAS,</div><div class='del'>-				 (atomic_long_t *)&amp;sem-&gt;count) &lt; 0))</div><div class='del'>-		rwsem_wake(sem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * implement atomic add functionality</div><div class='del'>- */</div><div class='del'>-static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	atomic_long_add(delta, (atomic_long_t *)&amp;sem-&gt;count);</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 tmp;</div><div class='del'>-</div><div class='del'>-	tmp = atomic_long_add_return(-RWSEM_WAITING_BIAS,</div><div class='del'>-				     (atomic_long_t *)&amp;sem-&gt;count);</div><div class='del'>-	if (tmp &lt; 0)</div><div class='del'>-		rwsem_downgrade_wake(sem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * implement exchange and add functionality</div><div class='del'>- */</div><div class='del'>-static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)</div><div class='del'>-{</div><div class='del'>-	return atomic_long_add_return(delta, (atomic_long_t *)&amp;sem-&gt;count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif	/* __KERNEL__ */</div><div class='del'>-#endif	/* _ASM_POWERPC_RWSEM_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/socket.h b/arch/powerpc/include/asm/socket.h<br/>index 866f7606da68..2fc2af8fbf59 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/socket.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/socket.h</a></div><div class='hunk'>@@ -69,4 +69,7 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_RXQ_OVFL             40</div><div class='ctx'> </div><div class='add'>+#define SO_WIFI_STATUS		41</div><div class='add'>+#define SCM_WIFI_STATUS		SO_WIFI_STATUS</div><div class='add'>+</div><div class='ctx'> #endif	/* _ASM_POWERPC_SOCKET_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/spu.h b/arch/powerpc/include/asm/spu.h<br/>index 4e360bd4a35a..93f280e23279 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/spu.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/spu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/spu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/spu.h</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define LS_SIZE (256 * 1024)</div><div class='hunk'>@@ -166,7 +166,7 @@ struct spu {</div><div class='ctx'> 	/* beat only */</div><div class='ctx'> 	u64 shadow_int_mask_RW[3];</div><div class='ctx'> </div><div class='del'>-	struct sys_device sysdev;</div><div class='add'>+	struct device dev;</div><div class='ctx'> </div><div class='ctx'> 	int has_mem_affinity;</div><div class='ctx'> 	struct list_head aff_list;</div><div class='hunk'>@@ -237,7 +237,7 @@ extern long spu_sys_callback(struct spu_syscall_block *s);</div><div class='ctx'> struct file;</div><div class='ctx'> struct spufs_calls {</div><div class='ctx'> 	long (*create_thread)(const char __user *name,</div><div class='del'>-					unsigned int flags, mode_t mode,</div><div class='add'>+					unsigned int flags, umode_t mode,</div><div class='ctx'> 					struct file *neighbor);</div><div class='ctx'> 	long (*spu_run)(struct file *filp, __u32 __user *unpc,</div><div class='ctx'> 						__u32 __user *ustatus);</div><div class='hunk'>@@ -270,11 +270,11 @@ struct spufs_calls {</div><div class='ctx'> int register_spu_syscalls(struct spufs_calls *calls);</div><div class='ctx'> void unregister_spu_syscalls(struct spufs_calls *calls);</div><div class='ctx'> </div><div class='del'>-int spu_add_sysdev_attr(struct sysdev_attribute *attr);</div><div class='del'>-void spu_remove_sysdev_attr(struct sysdev_attribute *attr);</div><div class='add'>+int spu_add_dev_attr(struct device_attribute *attr);</div><div class='add'>+void spu_remove_dev_attr(struct device_attribute *attr);</div><div class='ctx'> </div><div class='del'>-int spu_add_sysdev_attr_group(struct attribute_group *attrs);</div><div class='del'>-void spu_remove_sysdev_attr_group(struct attribute_group *attrs);</div><div class='add'>+int spu_add_dev_attr_group(struct attribute_group *attrs);</div><div class='add'>+void spu_remove_dev_attr_group(struct attribute_group *attrs);</div><div class='ctx'> </div><div class='ctx'> int spu_handle_mm_fault(struct mm_struct *mm, unsigned long ea,</div><div class='ctx'> 		unsigned long dsisr, unsigned *flt);</div><div class='head'>diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h<br/>index e30a13d1ee76..c377457d1b89 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/system.h</a></div><div class='hunk'>@@ -193,8 +193,8 @@ extern void cacheable_memzero(void *p, unsigned int nb);</div><div class='ctx'> extern void *cacheable_memcpy(void *, const void *, unsigned int);</div><div class='ctx'> extern int do_page_fault(struct pt_regs *, unsigned long, unsigned long);</div><div class='ctx'> extern void bad_page_fault(struct pt_regs *, unsigned long, int);</div><div class='del'>-extern int die(const char *, struct pt_regs *, long);</div><div class='ctx'> extern void _exception(int, struct pt_regs *, int, unsigned long);</div><div class='add'>+extern void die(const char *, struct pt_regs *, long);</div><div class='ctx'> extern void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BOOKE_WDT</div><div class='hunk'>@@ -221,6 +221,15 @@ extern unsigned long klimit;</div><div class='ctx'> extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);</div><div class='ctx'> </div><div class='ctx'> extern int powersave_nap;	/* set if nap mode can be used in idle loop */</div><div class='add'>+void cpu_idle_wait(void);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PSERIES_IDLE</div><div class='add'>+extern void update_smt_snooze_delay(int snooze);</div><div class='add'>+extern int pseries_notify_cpuidle_add_cpu(int cpu);</div><div class='add'>+#else</div><div class='add'>+static inline void update_smt_snooze_delay(int snooze) {}</div><div class='add'>+static inline int pseries_notify_cpuidle_add_cpu(int cpu) { return 0; }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Atomic exchange</div><div class='head'>diff --git a/arch/powerpc/include/asm/tce.h b/arch/powerpc/include/asm/tce.h<br/>index f663634cccc9..743f36b38e5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/tce.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/tce.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/tce.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/tce.h</a></div><div class='hunk'>@@ -26,10 +26,14 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Tces come in two formats, one for the virtual bus and a different</div><div class='del'>- * format for PCI</div><div class='add'>+ * format for PCI.  PCI TCEs can have hardware or software maintianed</div><div class='add'>+ * coherency.</div><div class='ctx'>  */</div><div class='del'>-#define TCE_VB  0</div><div class='del'>-#define TCE_PCI 1</div><div class='add'>+#define TCE_VB			0</div><div class='add'>+#define TCE_PCI			1</div><div class='add'>+#define TCE_PCI_SWINV_CREATE	2</div><div class='add'>+#define TCE_PCI_SWINV_FREE	4</div><div class='add'>+#define TCE_PCI_SWINV_PAIR	8</div><div class='ctx'> </div><div class='ctx'> /* TCE page size is 4096 bytes (1 &lt;&lt; 12) */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h<br/>index 836f231ec1f0..964714940961 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/thread_info.h</a></div><div class='hunk'>@@ -109,7 +109,6 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define TIF_RESTOREALL		11	/* Restore all regs (implies NOERROR) */</div><div class='ctx'> #define TIF_NOERROR		12	/* Force successful syscall return */</div><div class='ctx'> #define TIF_NOTIFY_RESUME	13	/* callback before returning to user */</div><div class='del'>-#define TIF_FREEZE		14	/* Freezing for suspend */</div><div class='ctx'> #define TIF_SYSCALL_TRACEPOINT	15	/* syscall tracepoint instrumentation */</div><div class='ctx'> #define TIF_RUNLATCH		16	/* Is the runlatch enabled? */</div><div class='ctx'> </div><div class='hunk'>@@ -127,7 +126,6 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define _TIF_RESTOREALL		(1&lt;&lt;TIF_RESTOREALL)</div><div class='ctx'> #define _TIF_NOERROR		(1&lt;&lt;TIF_NOERROR)</div><div class='ctx'> #define _TIF_NOTIFY_RESUME	(1&lt;&lt;TIF_NOTIFY_RESUME)</div><div class='del'>-#define _TIF_FREEZE		(1&lt;&lt;TIF_FREEZE)</div><div class='ctx'> #define _TIF_SYSCALL_TRACEPOINT	(1&lt;&lt;TIF_SYSCALL_TRACEPOINT)</div><div class='ctx'> #define _TIF_RUNLATCH		(1&lt;&lt;TIF_RUNLATCH)</div><div class='ctx'> #define _TIF_SYSCALL_T_OR_A	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \</div><div class='head'>diff --git a/arch/powerpc/include/asm/time.h b/arch/powerpc/include/asm/time.h<br/>index fe6f7c2c9c68..7eb10fb96cd0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/time.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/time.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/time.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/time.h</a></div><div class='hunk'>@@ -219,5 +219,7 @@ DECLARE_PER_CPU(struct cpu_usage, cpu_usage_array);</div><div class='ctx'> extern void secondary_cpu_time_init(void);</div><div class='ctx'> extern void iSeries_time_init_early(void);</div><div class='ctx'> </div><div class='add'>+DECLARE_PER_CPU(u64, decrementers_next_tb);</div><div class='add'>+</div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> #endif /* __POWERPC_TIME_H */</div><div class='head'>diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h<br/>index 1e104af08483..c97185885c6d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/topology.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/topology.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/topology.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/topology.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-struct sys_device;</div><div class='add'>+struct device;</div><div class='ctx'> struct device_node;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='hunk'>@@ -86,19 +86,19 @@ extern int __node_distance(int, int);</div><div class='ctx'> </div><div class='ctx'> extern void __init dump_numa_cpu_topology(void);</div><div class='ctx'> </div><div class='del'>-extern int sysfs_add_device_to_node(struct sys_device *dev, int nid);</div><div class='del'>-extern void sysfs_remove_device_from_node(struct sys_device *dev, int nid);</div><div class='add'>+extern int sysfs_add_device_to_node(struct device *dev, int nid);</div><div class='add'>+extern void sysfs_remove_device_from_node(struct device *dev, int nid);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> static inline void dump_numa_cpu_topology(void) {}</div><div class='ctx'> </div><div class='del'>-static inline int sysfs_add_device_to_node(struct sys_device *dev, int nid)</div><div class='add'>+static inline int sysfs_add_device_to_node(struct device *dev, int nid)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void sysfs_remove_device_from_node(struct sys_device *dev,</div><div class='add'>+static inline void sysfs_remove_device_from_node(struct device *dev,</div><div class='ctx'> 						int nid)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/include/asm/types.h b/arch/powerpc/include/asm/types.h<br/>index 8947b9827bc4..0abf7f2c6df9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/include/asm/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/include/asm/types.h</a></div><div class='hunk'>@@ -5,8 +5,11 @@</div><div class='ctx'>  * This is here because we used to use l64 for 64bit powerpc</div><div class='ctx'>  * and we don't want to impact user mode with our change to ll64</div><div class='ctx'>  * in the kernel.</div><div class='add'>+ *</div><div class='add'>+ * However, some user programs are fine with this.  They can</div><div class='add'>+ * flag __SANE_USERSPACE_TYPES__ to get int-ll64.h here.</div><div class='ctx'>  */</div><div class='del'>-#if defined(__powerpc64__) &amp;&amp; !defined(__KERNEL__)</div><div class='add'>+#if !defined(__SANE_USERSPACE_TYPES__) &amp;&amp; defined(__powerpc64__) &amp;&amp; !defined(__KERNEL__)</div><div class='ctx'> # include &lt;asm-generic/int-l64.h&gt;</div><div class='ctx'> #else</div><div class='ctx'> # include &lt;asm-generic/int-ll64.h&gt;</div><div class='hunk'>@@ -27,12 +30,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifdef __powerpc64__</div><div class='del'>-typedef unsigned int umode_t;</div><div class='del'>-#else</div><div class='del'>-typedef unsigned short umode_t;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> typedef struct {</div><div class='ctx'> 	__u32 u[4];</div><div class='ctx'> } __attribute__((aligned(16))) __vector128;</div><div class='head'>diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile<br/>index ce4f7f179117..ee728e433aa2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/Makefile</a></div><div class='hunk'>@@ -85,6 +85,8 @@ extra-$(CONFIG_FSL_BOOKE)	:= head_fsl_booke.o</div><div class='ctx'> extra-$(CONFIG_8xx)		:= head_8xx.o</div><div class='ctx'> extra-y				+= vmlinux.lds</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_RELOCATABLE_PPC32)	+= reloc_32.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_PPC32)		+= entry_32.o setup_32.o</div><div class='ctx'> obj-$(CONFIG_PPC64)		+= dma-iommu.o iommu.o</div><div class='ctx'> obj-$(CONFIG_KGDB)		+= kgdb.o</div><div class='head'>diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c<br/>index 7c5324f1ec9c..04caee7d9bc1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/asm-offsets.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/asm-offsets.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -208,6 +208,7 @@ int main(void)</div><div class='ctx'> 	DEFINE(PACA_USER_TIME, offsetof(struct paca_struct, user_time));</div><div class='ctx'> 	DEFINE(PACA_SYSTEM_TIME, offsetof(struct paca_struct, system_time));</div><div class='ctx'> 	DEFINE(PACA_TRAP_SAVE, offsetof(struct paca_struct, trap_save));</div><div class='add'>+	DEFINE(PACA_NAPSTATELOST, offsetof(struct paca_struct, nap_state_lost));</div><div class='ctx'> #endif /* CONFIG_PPC64 */</div><div class='ctx'> </div><div class='ctx'> 	/* RTAS */</div><div class='head'>diff --git a/arch/powerpc/kernel/cacheinfo.c b/arch/powerpc/kernel/cacheinfo.c<br/>index a3c684b4c862..92c6b008dd2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/cacheinfo.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/cacheinfo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/cacheinfo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/cacheinfo.c</a></div><div class='hunk'>@@ -451,15 +451,15 @@ out:</div><div class='ctx'> static struct cache_dir *__cpuinit cacheinfo_create_cache_dir(unsigned int cpu_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct cache_dir *cache_dir;</div><div class='del'>-	struct sys_device *sysdev;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> 	struct kobject *kobj = NULL;</div><div class='ctx'> </div><div class='del'>-	sysdev = get_cpu_sysdev(cpu_id);</div><div class='del'>-	WARN_ONCE(!sysdev, "no sysdev for CPU %i\n", cpu_id);</div><div class='del'>-	if (!sysdev)</div><div class='add'>+	dev = get_cpu_device(cpu_id);</div><div class='add'>+	WARN_ONCE(!dev, "no dev for CPU %i\n", cpu_id);</div><div class='add'>+	if (!dev)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	kobj = kobject_create_and_add("cache", &amp;sysdev-&gt;kobj);</div><div class='add'>+	kobj = kobject_create_and_add("cache", &amp;dev-&gt;kobj);</div><div class='ctx'> 	if (!kobj)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/cpu_setup_a2.S b/arch/powerpc/kernel/cpu_setup_a2.S<br/>index 7f818feaa7a5..ebc62f42a237 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/cpu_setup_a2.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/cpu_setup_a2.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/cpu_setup_a2.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/cpu_setup_a2.S</a></div><div class='hunk'>@@ -41,11 +41,16 @@ _GLOBAL(__setup_cpu_a2)</div><div class='ctx'> 	 * core local but doing it always won't hurt</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_WSP_COPRO</div><div class='add'>+#ifdef CONFIG_PPC_ICSWX</div><div class='ctx'> 	/* Make sure ACOP starts out as zero */</div><div class='ctx'> 	li	r3,0</div><div class='ctx'> 	mtspr   SPRN_ACOP,r3</div><div class='ctx'> </div><div class='add'>+	/* Skip the following if we are in Guest mode */</div><div class='add'>+	mfmsr	r3</div><div class='add'>+	andis.	r0,r3,MSR_GS@h</div><div class='add'>+	bne	_icswx_skip_guest</div><div class='add'>+</div><div class='ctx'> 	/* Enable icswx instruction */</div><div class='ctx'> 	mfspr   r3,SPRN_A2_CCR2</div><div class='ctx'> 	ori     r3,r3,A2_CCR2_ENABLE_ICSWX</div><div class='hunk'>@@ -54,7 +59,8 @@ _GLOBAL(__setup_cpu_a2)</div><div class='ctx'> 	/* Unmask all CTs in HACOP */</div><div class='ctx'> 	li      r3,-1</div><div class='ctx'> 	mtspr   SPRN_HACOP,r3</div><div class='del'>-#endif /* CONFIG_PPC_WSP_COPRO */</div><div class='add'>+_icswx_skip_guest:</div><div class='add'>+#endif /* CONFIG_PPC_ICSWX */</div><div class='ctx'> </div><div class='ctx'> 	/* Enable doorbell */</div><div class='ctx'> 	mfspr   r3,SPRN_A2_CCR2</div><div class='head'>diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c<br/>index edae5bb06f1f..81db9e2a8a20 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/cputable.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/cputable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/cputable.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/cputable.c</a></div><div class='hunk'>@@ -1505,6 +1505,19 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.machine_check		= machine_check_4xx,</div><div class='ctx'> 		.platform		= "ppc405",</div><div class='ctx'> 	},</div><div class='add'>+	{	/* APM8018X */</div><div class='add'>+		.pvr_mask		= 0xffff0000,</div><div class='add'>+		.pvr_value		= 0x7ff11432,</div><div class='add'>+		.cpu_name		= "APM8018X",</div><div class='add'>+		.cpu_features		= CPU_FTRS_40X,</div><div class='add'>+		.cpu_user_features	= PPC_FEATURE_32 |</div><div class='add'>+			PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,</div><div class='add'>+		.mmu_features		= MMU_FTR_TYPE_40x,</div><div class='add'>+		.icache_bsize		= 32,</div><div class='add'>+		.dcache_bsize		= 32,</div><div class='add'>+		.machine_check		= machine_check_4xx,</div><div class='add'>+		.platform		= "ppc405",</div><div class='add'>+	},</div><div class='ctx'> 	{	/* default match */</div><div class='ctx'> 		.pvr_mask		= 0x00000000,</div><div class='ctx'> 		.pvr_value		= 0x00000000,</div><div class='hunk'>@@ -1830,6 +1843,20 @@ static struct cpu_spec __initdata cpu_specs[] = {</div><div class='ctx'> 		.machine_check		= machine_check_47x,</div><div class='ctx'> 		.platform		= "ppc470",</div><div class='ctx'> 	},</div><div class='add'>+	{ /* 476fpe */</div><div class='add'>+		.pvr_mask		= 0xffff0000,</div><div class='add'>+		.pvr_value		= 0x7ff50000,</div><div class='add'>+		.cpu_name		= "476fpe",</div><div class='add'>+		.cpu_features		= CPU_FTRS_47X | CPU_FTR_476_DD2,</div><div class='add'>+		.cpu_user_features	= COMMON_USER_BOOKE |</div><div class='add'>+			PPC_FEATURE_HAS_FPU,</div><div class='add'>+		.mmu_features		= MMU_FTR_TYPE_47x |</div><div class='add'>+			MMU_FTR_USE_TLBIVAX_BCAST | MMU_FTR_LOCK_BCAST_INVAL,</div><div class='add'>+		.icache_bsize		= 32,</div><div class='add'>+		.dcache_bsize		= 128,</div><div class='add'>+		.machine_check		= machine_check_47x,</div><div class='add'>+		.platform		= "ppc470",</div><div class='add'>+	},</div><div class='ctx'> 	{ /* 476 iss */</div><div class='ctx'> 		.pvr_mask		= 0xffff0000,</div><div class='ctx'> 		.pvr_value		= 0x00050000,</div><div class='head'>diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c<br/>index d879809d5c45..28be3452e67a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/crash.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/crash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/crash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/crash.c</a></div><div class='hunk'>@@ -10,85 +10,85 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#undef DEBUG</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/kexec.h&gt;</div><div class='del'>-#include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/crash_dump.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/elf.h&gt;</div><div class='del'>-#include &lt;linux/elfcore.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/memblock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/kexec.h&gt;</div><div class='ctx'> #include &lt;asm/kdump.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/firmware.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/setjmp.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-#include &lt;asm/udbg.h&gt;</div><div class='del'>-#define DBG(fmt...) udbg_printf(fmt)</div><div class='del'>-#else</div><div class='del'>-#define DBG(fmt...)</div><div class='del'>-#endif</div><div class='add'>+/*</div><div class='add'>+ * The primary CPU waits a while for all secondary CPUs to enter. This is to</div><div class='add'>+ * avoid sending an IPI if the secondary CPUs are entering</div><div class='add'>+ * crash_kexec_secondary on their own (eg via a system reset).</div><div class='add'>+ *</div><div class='add'>+ * The secondary timeout has to be longer than the primary. Both timeouts are</div><div class='add'>+ * in milliseconds.</div><div class='add'>+ */</div><div class='add'>+#define PRIMARY_TIMEOUT		500</div><div class='add'>+#define SECONDARY_TIMEOUT	1000</div><div class='ctx'> </div><div class='del'>-/* This keeps a track of which one is crashing cpu. */</div><div class='add'>+#define IPI_TIMEOUT		10000</div><div class='add'>+#define REAL_MODE_TIMEOUT	10000</div><div class='add'>+</div><div class='add'>+/* This keeps a track of which one is the crashing cpu. */</div><div class='ctx'> int crashing_cpu = -1;</div><div class='del'>-static cpumask_t cpus_in_crash = CPU_MASK_NONE;</div><div class='del'>-cpumask_t cpus_in_sr = CPU_MASK_NONE;</div><div class='add'>+static atomic_t cpus_in_crash;</div><div class='add'>+static int time_to_dump;</div><div class='ctx'> </div><div class='ctx'> #define CRASH_HANDLER_MAX 3</div><div class='ctx'> /* NULL terminated list of shutdown handles */</div><div class='ctx'> static crash_shutdown_t crash_shutdown_handles[CRASH_HANDLER_MAX+1];</div><div class='ctx'> static DEFINE_SPINLOCK(crash_handlers_lock);</div><div class='ctx'> </div><div class='add'>+static unsigned long crash_shutdown_buf[JMP_BUF_LEN];</div><div class='add'>+static int crash_shutdown_cpu = -1;</div><div class='add'>+</div><div class='add'>+static int handle_fault(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	if (crash_shutdown_cpu == smp_processor_id())</div><div class='add'>+		longjmp(crash_shutdown_buf, 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-static atomic_t enter_on_soft_reset = ATOMIC_INIT(0);</div><div class='ctx'> </div><div class='ctx'> void crash_ipi_callback(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='add'>+	static cpumask_t cpus_state_saved = CPU_MASK_NONE;</div><div class='add'>+</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 	if (!cpu_online(cpu))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	hard_irq_disable();</div><div class='del'>-	if (!cpumask_test_cpu(cpu, &amp;cpus_in_crash))</div><div class='add'>+	if (!cpumask_test_cpu(cpu, &amp;cpus_state_saved)) {</div><div class='ctx'> 		crash_save_cpu(regs, cpu);</div><div class='del'>-	cpumask_set_cpu(cpu, &amp;cpus_in_crash);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Entered via soft-reset - could be the kdump</div><div class='del'>-	 * process is invoked using soft-reset or user activated</div><div class='del'>-	 * it if some CPU did not respond to an IPI.</div><div class='del'>-	 * For soft-reset, the secondary CPU can enter this func</div><div class='del'>-	 * twice. 1 - using IPI, and 2. soft-reset.</div><div class='del'>-	 * Tell the kexec CPU that entered via soft-reset and ready</div><div class='del'>-	 * to go down.</div><div class='del'>-	 */</div><div class='del'>-	if (cpumask_test_cpu(cpu, &amp;cpus_in_sr)) {</div><div class='del'>-		cpumask_clear_cpu(cpu, &amp;cpus_in_sr);</div><div class='del'>-		atomic_inc(&amp;enter_on_soft_reset);</div><div class='add'>+		cpumask_set_cpu(cpu, &amp;cpus_state_saved);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	atomic_inc(&amp;cpus_in_crash);</div><div class='add'>+	smp_mb__after_atomic_inc();</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Starting the kdump boot.</div><div class='ctx'> 	 * This barrier is needed to make sure that all CPUs are stopped.</div><div class='del'>-	 * If not, soft-reset will be invoked to bring other CPUs.</div><div class='ctx'> 	 */</div><div class='del'>-	while (!cpumask_test_cpu(crashing_cpu, &amp;cpus_in_crash))</div><div class='add'>+	while (!time_to_dump)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> </div><div class='ctx'> 	if (ppc_md.kexec_cpu_down)</div><div class='hunk'>@@ -103,106 +103,99 @@ void crash_ipi_callback(struct pt_regs *regs)</div><div class='ctx'> 	/* NOTREACHED */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Wait until all CPUs are entered via soft-reset.</div><div class='del'>- */</div><div class='del'>-static void crash_soft_reset_check(int cpu)</div><div class='del'>-{</div><div class='del'>-	unsigned int ncpus = num_online_cpus() - 1;/* Excluding the panic cpu */</div><div class='del'>-</div><div class='del'>-	cpumask_clear_cpu(cpu, &amp;cpus_in_sr);</div><div class='del'>-	while (atomic_read(&amp;enter_on_soft_reset) != ncpus)</div><div class='del'>-		cpu_relax();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static void crash_kexec_prepare_cpus(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int msecs;</div><div class='del'>-</div><div class='ctx'> 	unsigned int ncpus = num_online_cpus() - 1;/* Excluding the panic cpu */</div><div class='add'>+	int tries = 0;</div><div class='add'>+	int (*old_handler)(struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+	printk(KERN_EMERG "Sending IPI to other CPUs\n");</div><div class='ctx'> </div><div class='ctx'> 	crash_send_ipi(crash_ipi_callback);</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> </div><div class='add'>+again:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * FIXME: Until we will have the way to stop other CPUs reliably,</div><div class='ctx'> 	 * the crash CPU will send an IPI and wait for other CPUs to</div><div class='ctx'> 	 * respond.</div><div class='del'>-	 * Delay of at least 10 seconds.</div><div class='ctx'> 	 */</div><div class='del'>-	printk(KERN_EMERG "Sending IPI to other cpus...\n");</div><div class='del'>-	msecs = 10000;</div><div class='del'>-	while ((cpumask_weight(&amp;cpus_in_crash) &lt; ncpus) &amp;&amp; (--msecs &gt; 0)) {</div><div class='del'>-		cpu_relax();</div><div class='add'>+	msecs = IPI_TIMEOUT;</div><div class='add'>+	while ((atomic_read(&amp;cpus_in_crash) &lt; ncpus) &amp;&amp; (--msecs &gt; 0))</div><div class='ctx'> 		mdelay(1);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Would it be better to replace the trap vector here? */</div><div class='ctx'> </div><div class='add'>+	if (atomic_read(&amp;cpus_in_crash) &gt;= ncpus) {</div><div class='add'>+		printk(KERN_EMERG "IPI complete\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_EMERG "ERROR: %d cpu(s) not responding\n",</div><div class='add'>+		ncpus - atomic_read(&amp;cpus_in_crash));</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * FIXME: In case if we do not get all CPUs, one possibility: ask the</div><div class='del'>-	 * user to do soft reset such that we get all.</div><div class='del'>-	 * Soft-reset will be used until better mechanism is implemented.</div><div class='add'>+	 * If we have a panic timeout set then we can't wait indefinitely</div><div class='add'>+	 * for someone to activate system reset. We also give up on the</div><div class='add'>+	 * second time through if system reset fail to work.</div><div class='ctx'> 	 */</div><div class='del'>-	if (cpumask_weight(&amp;cpus_in_crash) &lt; ncpus) {</div><div class='del'>-		printk(KERN_EMERG "done waiting: %d cpu(s) not responding\n",</div><div class='del'>-			ncpus - cpumask_weight(&amp;cpus_in_crash));</div><div class='del'>-		printk(KERN_EMERG "Activate soft-reset to stop other cpu(s)\n");</div><div class='del'>-		cpumask_clear(&amp;cpus_in_sr);</div><div class='del'>-		atomic_set(&amp;enter_on_soft_reset, 0);</div><div class='del'>-		while (cpumask_weight(&amp;cpus_in_crash) &lt; ncpus)</div><div class='del'>-			cpu_relax();</div><div class='del'>-	}</div><div class='add'>+	if ((panic_timeout &gt; 0) || (tries &gt; 0))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * Make sure all CPUs are entered via soft-reset if the kdump is</div><div class='del'>-	 * invoked using soft-reset.</div><div class='add'>+	 * A system reset will cause all CPUs to take an 0x100 exception.</div><div class='add'>+	 * The primary CPU returns here via setjmp, and the secondary</div><div class='add'>+	 * CPUs reexecute the crash_kexec_secondary path.</div><div class='ctx'> 	 */</div><div class='del'>-	if (cpumask_test_cpu(cpu, &amp;cpus_in_sr))</div><div class='del'>-		crash_soft_reset_check(cpu);</div><div class='del'>-	/* Leave the IPI callback set */</div><div class='add'>+	old_handler = __debugger;</div><div class='add'>+	__debugger = handle_fault;</div><div class='add'>+	crash_shutdown_cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	if (setjmp(crash_shutdown_buf) == 0) {</div><div class='add'>+		printk(KERN_EMERG "Activate system reset (dumprestart) "</div><div class='add'>+				  "to stop other cpu(s)\n");</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * A system reset will force all CPUs to execute the</div><div class='add'>+		 * crash code again. We need to reset cpus_in_crash so we</div><div class='add'>+		 * wait for everyone to do this.</div><div class='add'>+		 */</div><div class='add'>+		atomic_set(&amp;cpus_in_crash, 0);</div><div class='add'>+		smp_mb();</div><div class='add'>+</div><div class='add'>+		while (atomic_read(&amp;cpus_in_crash) &lt; ncpus)</div><div class='add'>+			cpu_relax();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	crash_shutdown_cpu = -1;</div><div class='add'>+	__debugger = old_handler;</div><div class='add'>+</div><div class='add'>+	tries++;</div><div class='add'>+	goto again;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This function will be called by secondary cpus or by kexec cpu</div><div class='del'>- * if soft-reset is activated to stop some CPUs.</div><div class='add'>+ * This function will be called by secondary cpus.</div><div class='ctx'>  */</div><div class='ctx'> void crash_kexec_secondary(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	int cpu = smp_processor_id();</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	int msecs = 5;</div><div class='add'>+	int msecs = SECONDARY_TIMEOUT;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='del'>-	/* Wait 5ms if the kexec CPU is not entered yet. */</div><div class='add'>+</div><div class='add'>+	/* Wait for the primary crash CPU to signal its progress */</div><div class='ctx'> 	while (crashing_cpu &lt; 0) {</div><div class='ctx'> 		if (--msecs &lt; 0) {</div><div class='del'>-			/*</div><div class='del'>-			 * Either kdump image is not loaded or</div><div class='del'>-			 * kdump process is not started - Probably xmon</div><div class='del'>-			 * exited using 'x'(exit and recover) or</div><div class='del'>-			 * kexec_should_crash() failed for all running tasks.</div><div class='del'>-			 */</div><div class='del'>-			cpumask_clear_cpu(cpu, &amp;cpus_in_sr);</div><div class='add'>+			/* No response, kdump image may not have been loaded */</div><div class='ctx'> 			local_irq_restore(flags);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		mdelay(1);</div><div class='del'>-		cpu_relax();</div><div class='del'>-	}</div><div class='del'>-	if (cpu == crashing_cpu) {</div><div class='del'>-		/*</div><div class='del'>-		 * Panic CPU will enter this func only via soft-reset.</div><div class='del'>-		 * Wait until all secondary CPUs entered and</div><div class='del'>-		 * then start kexec boot.</div><div class='del'>-		 */</div><div class='del'>-		crash_soft_reset_check(cpu);</div><div class='del'>-		cpumask_set_cpu(crashing_cpu, &amp;cpus_in_crash);</div><div class='del'>-		if (ppc_md.kexec_cpu_down)</div><div class='del'>-			ppc_md.kexec_cpu_down(1, 0);</div><div class='del'>-		machine_kexec(kexec_crash_image);</div><div class='del'>-		/* NOTREACHED */</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	crash_ipi_callback(regs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -211,7 +204,7 @@ void crash_kexec_secondary(struct pt_regs *regs)</div><div class='ctx'> static void crash_kexec_prepare_cpus(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='del'>-	 * move the secondarys to us so that we can copy</div><div class='add'>+	 * move the secondaries to us so that we can copy</div><div class='ctx'> 	 * the new kernel 0-0x100 safely</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * do this if kexec in setup.c ?</div><div class='hunk'>@@ -225,7 +218,6 @@ static void crash_kexec_prepare_cpus(int cpu)</div><div class='ctx'> </div><div class='ctx'> void crash_kexec_secondary(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	cpumask_clear(&amp;cpus_in_sr);</div><div class='ctx'> }</div><div class='ctx'> #endif	/* CONFIG_SMP */</div><div class='ctx'> </div><div class='hunk'>@@ -236,7 +228,7 @@ static void crash_kexec_wait_realmode(int cpu)</div><div class='ctx'> 	unsigned int msecs;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	msecs = 10000;</div><div class='add'>+	msecs = REAL_MODE_TIMEOUT;</div><div class='ctx'> 	for (i=0; i &lt; nr_cpu_ids &amp;&amp; msecs &gt; 0; i++) {</div><div class='ctx'> 		if (i == cpu)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -308,22 +300,11 @@ int crash_shutdown_unregister(crash_shutdown_t handler)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(crash_shutdown_unregister);</div><div class='ctx'> </div><div class='del'>-static unsigned long crash_shutdown_buf[JMP_BUF_LEN];</div><div class='del'>-static int crash_shutdown_cpu = -1;</div><div class='del'>-</div><div class='del'>-static int handle_fault(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	if (crash_shutdown_cpu == smp_processor_id())</div><div class='del'>-		longjmp(crash_shutdown_buf, 1);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void default_machine_crash_shutdown(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int (*old_handler)(struct pt_regs *regs);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This function is only called after the system</div><div class='ctx'> 	 * has panicked or is otherwise in a critical state.</div><div class='hunk'>@@ -341,15 +322,26 @@ void default_machine_crash_shutdown(struct pt_regs *regs)</div><div class='ctx'> 	 * such that another IPI will not be sent.</div><div class='ctx'> 	 */</div><div class='ctx'> 	crashing_cpu = smp_processor_id();</div><div class='del'>-	crash_save_cpu(regs, crashing_cpu);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we came in via system reset, wait a while for the secondary</div><div class='add'>+	 * CPUs to enter.</div><div class='add'>+	 */</div><div class='add'>+	if (TRAP(regs) == 0x100)</div><div class='add'>+		mdelay(PRIMARY_TIMEOUT);</div><div class='add'>+</div><div class='ctx'> 	crash_kexec_prepare_cpus(crashing_cpu);</div><div class='del'>-	cpumask_set_cpu(crashing_cpu, &amp;cpus_in_crash);</div><div class='add'>+</div><div class='add'>+	crash_save_cpu(regs, crashing_cpu);</div><div class='add'>+</div><div class='add'>+	time_to_dump = 1;</div><div class='add'>+</div><div class='ctx'> 	crash_kexec_wait_realmode(crashing_cpu);</div><div class='ctx'> </div><div class='ctx'> 	machine_kexec_mask_interrupts();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Call registered shutdown routines savely.  Swap out</div><div class='add'>+	 * Call registered shutdown routines safely.  Swap out</div><div class='ctx'> 	 * __debugger_fault_handler, and replace on exit.</div><div class='ctx'> 	 */</div><div class='ctx'> 	old_handler = __debugger_fault_handler;</div><div class='head'>diff --git a/arch/powerpc/kernel/crash_dump.c b/arch/powerpc/kernel/crash_dump.c<br/>index 424afb6b8fba..b3ba5163eae2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/crash_dump.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/crash_dump.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/crash_dump.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/crash_dump.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #define DBG(fmt...)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_RELOCATABLE</div><div class='add'>+#ifndef CONFIG_NONSTATIC_KERNEL</div><div class='ctx'> void __init reserve_kdump_trampoline(void)</div><div class='ctx'> {</div><div class='ctx'> 	memblock_reserve(0, KDUMP_RESERVE_LIMIT);</div><div class='hunk'>@@ -67,7 +67,7 @@ void __init setup_kdump_trampoline(void)</div><div class='ctx'> </div><div class='ctx'> 	DBG(" &lt;- setup_kdump_trampoline()\n");</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_RELOCATABLE */</div><div class='add'>+#endif /* CONFIG_NONSTATIC_KERNEL */</div><div class='ctx'> </div><div class='ctx'> static int __init parse_savemaxmem(char *p)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S<br/>index cf9c69b9189c..d4be7bb3dbdf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/exceptions-64s.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/exceptions-64s.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/exceptions-64s.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/exceptions-64s.S</a></div><div class='hunk'>@@ -65,7 +65,7 @@ BEGIN_FTR_SECTION</div><div class='ctx'> 	lbz	r0,PACAPROCSTART(r13)</div><div class='ctx'> 	cmpwi	r0,0x80</div><div class='ctx'> 	bne	1f</div><div class='del'>-	li	r0,0</div><div class='add'>+	li	r0,1</div><div class='ctx'> 	stb	r0,PACAPROCSTART(r13)</div><div class='ctx'> 	b	kvm_start_guest</div><div class='ctx'> 1:</div><div class='head'>diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S<br/>index b725dab0f88a..7dd2981bcc50 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/head_44x.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/head_44x.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/head_44x.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/head_44x.S</a></div><div class='hunk'>@@ -64,6 +64,35 @@ _ENTRY(_start);</div><div class='ctx'> 	mr	r31,r3		/* save device tree ptr */</div><div class='ctx'> 	li	r24,0		/* CPU number */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_RELOCATABLE</div><div class='add'>+/*</div><div class='add'>+ * Relocate ourselves to the current runtime address.</div><div class='add'>+ * This is called only by the Boot CPU.</div><div class='add'>+ * "relocate" is called with our current runtime virutal</div><div class='add'>+ * address.</div><div class='add'>+ * r21 will be loaded with the physical runtime address of _stext</div><div class='add'>+ */</div><div class='add'>+	bl	0f				/* Get our runtime address */</div><div class='add'>+0:	mflr	r21				/* Make it accessible */</div><div class='add'>+	addis	r21,r21,(_stext - 0b)@ha</div><div class='add'>+	addi	r21,r21,(_stext - 0b)@l 	/* Get our current runtime base */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We have the runtime (virutal) address of our base.</div><div class='add'>+	 * We calculate our shift of offset from a 256M page.</div><div class='add'>+	 * We could map the 256M page we belong to at PAGE_OFFSET and</div><div class='add'>+	 * get going from there.</div><div class='add'>+	 */</div><div class='add'>+	lis	r4,KERNELBASE@h</div><div class='add'>+	ori	r4,r4,KERNELBASE@l</div><div class='add'>+	rlwinm	r6,r21,0,4,31			/* r6 = PHYS_START % 256M */</div><div class='add'>+	rlwinm	r5,r4,0,4,31			/* r5 = KERNELBASE % 256M */</div><div class='add'>+	subf	r3,r5,r6			/* r3 = r6 - r5 */</div><div class='add'>+	add	r3,r4,r3			/* Required Virutal Address */</div><div class='add'>+</div><div class='add'>+	bl	relocate</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	bl	init_cpu_state</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -88,6 +117,65 @@ _ENTRY(_start);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_RELOCATABLE</div><div class='ctx'> 	/*</div><div class='add'>+	 * Relocatable kernel support based on processing of dynamic</div><div class='add'>+	 * relocation entries.</div><div class='add'>+	 *</div><div class='add'>+	 * r25 will contain RPN/ERPN for the start address of memory</div><div class='add'>+	 * r21 will contain the current offset of _stext</div><div class='add'>+	 */</div><div class='add'>+	lis	r3,kernstart_addr@ha</div><div class='add'>+	la	r3,kernstart_addr@l(r3)</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Compute the kernstart_addr.</div><div class='add'>+	 * kernstart_addr =&gt; (r6,r8)</div><div class='add'>+	 * kernstart_addr &amp; ~0xfffffff =&gt; (r6,r7)</div><div class='add'>+	 */</div><div class='add'>+	rlwinm	r6,r25,0,28,31	/* ERPN. Bits 32-35 of Address */</div><div class='add'>+	rlwinm	r7,r25,0,0,3	/* RPN - assuming 256 MB page size */</div><div class='add'>+	rlwinm	r8,r21,0,4,31	/* r8 = (_stext &amp; 0xfffffff) */</div><div class='add'>+	or	r8,r7,r8	/* Compute the lower 32bit of kernstart_addr */</div><div class='add'>+</div><div class='add'>+	/* Store kernstart_addr */</div><div class='add'>+	stw	r6,0(r3)	/* higher 32bit */</div><div class='add'>+	stw	r8,4(r3)	/* lower 32bit  */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Compute the virt_phys_offset :</div><div class='add'>+	 * virt_phys_offset = stext.run - kernstart_addr</div><div class='add'>+	 *</div><div class='add'>+	 * stext.run = (KERNELBASE &amp; ~0xfffffff) + (kernstart_addr &amp; 0xfffffff)</div><div class='add'>+	 * When we relocate, we have :</div><div class='add'>+	 *</div><div class='add'>+	 *	(kernstart_addr &amp; 0xfffffff) = (stext.run &amp; 0xfffffff)</div><div class='add'>+	 *</div><div class='add'>+	 * hence:</div><div class='add'>+	 *  virt_phys_offset = (KERNELBASE &amp; ~0xfffffff) - (kernstart_addr &amp; ~0xfffffff)</div><div class='add'>+	 *</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* KERNELBASE&amp;~0xfffffff =&gt; (r4,r5) */</div><div class='add'>+	li	r4, 0		/* higer 32bit */</div><div class='add'>+	lis	r5,KERNELBASE@h</div><div class='add'>+	rlwinm	r5,r5,0,0,3	/* Align to 256M, lower 32bit */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 64bit subtraction.</div><div class='add'>+	 */</div><div class='add'>+	subfc	r5,r7,r5</div><div class='add'>+	subfe	r4,r6,r4</div><div class='add'>+</div><div class='add'>+	/* Store virt_phys_offset */</div><div class='add'>+	lis	r3,virt_phys_offset@ha</div><div class='add'>+	la	r3,virt_phys_offset@l(r3)</div><div class='add'>+</div><div class='add'>+	stw	r4,0(r3)</div><div class='add'>+	stw	r5,4(r3)</div><div class='add'>+</div><div class='add'>+#elif defined(CONFIG_DYNAMIC_MEMSTART)</div><div class='add'>+	/*</div><div class='add'>+	 * Mapping based, page aligned dynamic kernel loading.</div><div class='add'>+	 *</div><div class='ctx'> 	 * r25 will contain RPN/ERPN for the start address of memory</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Add the difference between KERNELBASE and PAGE_OFFSET to the</div><div class='hunk'>@@ -732,6 +820,8 @@ _GLOBAL(init_cpu_state)</div><div class='ctx'> 	/* We use the PVR to differenciate 44x cores from 476 */</div><div class='ctx'> 	mfspr	r3,SPRN_PVR</div><div class='ctx'> 	srwi	r3,r3,16</div><div class='add'>+	cmplwi	cr0,r3,PVR_476FPE@h</div><div class='add'>+	beq	head_start_47x</div><div class='ctx'> 	cmplwi	cr0,r3,PVR_476@h</div><div class='ctx'> 	beq	head_start_47x</div><div class='ctx'> 	cmplwi	cr0,r3,PVR_476_ISS@h</div><div class='hunk'>@@ -800,12 +890,29 @@ skpinv:	addi	r4,r4,1				/* Increment */</div><div class='ctx'> /*</div><div class='ctx'>  * Configure and load pinned entry into TLB slot 63.</div><div class='ctx'>  */</div><div class='add'>+#ifdef CONFIG_NONSTATIC_KERNEL</div><div class='add'>+	/*</div><div class='add'>+	 * In case of a NONSTATIC_KERNEL we reuse the TLB XLAT</div><div class='add'>+	 * entries of the initial mapping set by the boot loader.</div><div class='add'>+	 * The XLAT entry is stored in r25</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Read the XLAT entry for our current mapping */</div><div class='add'>+	tlbre	r25,r23,PPC44x_TLB_XLAT</div><div class='add'>+</div><div class='add'>+	lis	r3,KERNELBASE@h</div><div class='add'>+	ori	r3,r3,KERNELBASE@l</div><div class='add'>+</div><div class='add'>+	/* Use our current RPN entry */</div><div class='add'>+	mr	r4,r25</div><div class='add'>+#else</div><div class='ctx'> </div><div class='ctx'> 	lis	r3,PAGE_OFFSET@h</div><div class='ctx'> 	ori	r3,r3,PAGE_OFFSET@l</div><div class='ctx'> </div><div class='ctx'> 	/* Kernel is at the base of RAM */</div><div class='ctx'> 	li r4, 0			/* Load the kernel physical address */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Load the kernel PID = 0 */</div><div class='ctx'> 	li	r0,0</div><div class='head'>diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S<br/>index 9f5d210ddf3f..d5d78c4ceef6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/head_fsl_booke.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/head_fsl_booke.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/head_fsl_booke.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/head_fsl_booke.S</a></div><div class='hunk'>@@ -197,7 +197,7 @@ _ENTRY(__early_start)</div><div class='ctx'> </div><div class='ctx'> 	bl	early_init</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RELOCATABLE</div><div class='add'>+#ifdef CONFIG_DYNAMIC_MEMSTART</div><div class='ctx'> 	lis	r3,kernstart_addr@ha</div><div class='ctx'> 	la	r3,kernstart_addr@l(r3)</div><div class='ctx'> #ifdef CONFIG_PHYS_64BIT</div><div class='head'>diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c<br/>index 9c3cd490b1bd..0a48bf5db6c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/idle.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/idle.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/idle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/idle.c</a></div><div class='hunk'>@@ -39,19 +39,17 @@</div><div class='ctx'> #define cpu_should_die()	0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+unsigned long cpuidle_disable = IDLE_NO_OVERRIDE;</div><div class='add'>+EXPORT_SYMBOL(cpuidle_disable);</div><div class='add'>+</div><div class='ctx'> static int __init powersave_off(char *arg)</div><div class='ctx'> {</div><div class='ctx'> 	ppc_md.power_save = NULL;</div><div class='add'>+	cpuidle_disable = IDLE_POWERSAVE_OFF;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> __setup("powersave=off", powersave_off);</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PPC_PSERIES) &amp;&amp; defined(CONFIG_TRACEPOINTS)</div><div class='del'>-static const bool idle_uses_rcu = 1;</div><div class='del'>-#else</div><div class='del'>-static const bool idle_uses_rcu;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The body of the idle task.</div><div class='ctx'>  */</div><div class='hunk'>@@ -63,8 +61,7 @@ void cpu_idle(void)</div><div class='ctx'> 	set_thread_flag(TIF_POLLING_NRFLAG);</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		tick_nohz_idle_enter();</div><div class='del'>-		if (!idle_uses_rcu)</div><div class='del'>-			rcu_idle_enter();</div><div class='add'>+		rcu_idle_enter();</div><div class='ctx'> </div><div class='ctx'> 		while (!need_resched() &amp;&amp; !cpu_should_die()) {</div><div class='ctx'> 			ppc64_runlatch_off();</div><div class='hunk'>@@ -102,8 +99,7 @@ void cpu_idle(void)</div><div class='ctx'> </div><div class='ctx'> 		HMT_medium();</div><div class='ctx'> 		ppc64_runlatch_on();</div><div class='del'>-		if (!idle_uses_rcu)</div><div class='del'>-			rcu_idle_exit();</div><div class='add'>+		rcu_idle_exit();</div><div class='ctx'> 		tick_nohz_idle_exit();</div><div class='ctx'> 		preempt_enable_no_resched();</div><div class='ctx'> 		if (cpu_should_die())</div><div class='hunk'>@@ -113,6 +109,29 @@ void cpu_idle(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * cpu_idle_wait - Used to ensure that all the CPUs come out of the old</div><div class='add'>+ * idle loop and start using the new idle loop.</div><div class='add'>+ * Required while changing idle handler on SMP systems.</div><div class='add'>+ * Caller must have changed idle handler to the new value before the call.</div><div class='add'>+ * This window may be larger on shared systems.</div><div class='add'>+ */</div><div class='add'>+void cpu_idle_wait(void)</div><div class='add'>+{</div><div class='add'>+	int cpu;</div><div class='add'>+	smp_mb();</div><div class='add'>+</div><div class='add'>+	/* kick all the CPUs so that they exit out of old idle routine */</div><div class='add'>+	get_online_cpus();</div><div class='add'>+	for_each_online_cpu(cpu) {</div><div class='add'>+		if (cpu != smp_processor_id())</div><div class='add'>+			smp_send_reschedule(cpu);</div><div class='add'>+	}</div><div class='add'>+	put_online_cpus();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(cpu_idle_wait);</div><div class='add'>+</div><div class='ctx'> int powersave_nap;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='head'>diff --git a/arch/powerpc/kernel/idle_power7.S b/arch/powerpc/kernel/idle_power7.S<br/>index 3a70845a51c7..fcdff198da4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/idle_power7.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/idle_power7.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/idle_power7.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/idle_power7.S</a></div><div class='hunk'>@@ -54,6 +54,7 @@ _GLOBAL(power7_idle)</div><div class='ctx'> 	li	r0,0</div><div class='ctx'> 	stb	r0,PACASOFTIRQEN(r13)	/* we'll hard-enable shortly */</div><div class='ctx'> 	stb	r0,PACAHARDIRQEN(r13)</div><div class='add'>+	stb	r0,PACA_NAPSTATELOST(r13)</div><div class='ctx'> </div><div class='ctx'> 	/* Continue saving state */</div><div class='ctx'> 	SAVE_GPR(2, r1)</div><div class='hunk'>@@ -86,6 +87,9 @@ _GLOBAL(power7_wakeup_loss)</div><div class='ctx'> 	rfid</div><div class='ctx'> </div><div class='ctx'> _GLOBAL(power7_wakeup_noloss)</div><div class='add'>+	lbz	r0,PACA_NAPSTATELOST(r13)</div><div class='add'>+	cmpwi	r0,0</div><div class='add'>+	bne	.power7_wakeup_loss</div><div class='ctx'> 	ld	r1,PACAR1(r13)</div><div class='ctx'> 	ld	r4,_MSR(r1)</div><div class='ctx'> 	ld	r5,_NIP(r1)</div><div class='head'>diff --git a/arch/powerpc/kernel/iomap.c b/arch/powerpc/kernel/iomap.c<br/>index 262791807397..97a3715ac8bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/iomap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/iomap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/iomap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/iomap.c</a></div><div class='hunk'>@@ -119,24 +119,6 @@ EXPORT_SYMBOL(ioport_map);</div><div class='ctx'> EXPORT_SYMBOL(ioport_unmap);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)</div><div class='del'>-{</div><div class='del'>-	resource_size_t start = pci_resource_start(dev, bar);</div><div class='del'>-	resource_size_t len = pci_resource_len(dev, bar);</div><div class='del'>-	unsigned long flags = pci_resource_flags(dev, bar);</div><div class='del'>-</div><div class='del'>-	if (!len)</div><div class='del'>-		return NULL;</div><div class='del'>-	if (max &amp;&amp; len &gt; max)</div><div class='del'>-		len = max;</div><div class='del'>-	if (flags &amp; IORESOURCE_IO)</div><div class='del'>-		return ioport_map(start, len);</div><div class='del'>-	if (flags &amp; IORESOURCE_MEM)</div><div class='del'>-		return ioremap(start, len);</div><div class='del'>-	/* What? */</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void pci_iounmap(struct pci_dev *dev, void __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'> 	if (isa_vaddr_is_ioport(addr))</div><div class='hunk'>@@ -146,6 +128,5 @@ void pci_iounmap(struct pci_dev *dev, void __iomem *addr)</div><div class='ctx'> 	iounmap(addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(pci_iomap);</div><div class='ctx'> EXPORT_SYMBOL(pci_iounmap);</div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='head'>diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c<br/>index 5c3c46948d94..701d4aceb4f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/irq.c</a></div><div class='hunk'>@@ -115,6 +115,15 @@ static inline notrace void set_soft_enabled(unsigned long enable)</div><div class='ctx'> 	: : "r" (enable), "i" (offsetof(struct paca_struct, soft_enabled)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline notrace void decrementer_check_overflow(void)</div><div class='add'>+{</div><div class='add'>+	u64 now = get_tb_or_rtc();</div><div class='add'>+	u64 *next_tb = &amp;__get_cpu_var(decrementers_next_tb);</div><div class='add'>+</div><div class='add'>+	if (now &gt;= *next_tb)</div><div class='add'>+		set_dec(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> notrace void arch_local_irq_restore(unsigned long en)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -164,24 +173,21 @@ notrace void arch_local_irq_restore(unsigned long en)</div><div class='ctx'> 	 */</div><div class='ctx'> 	local_paca-&gt;hard_enabled = en;</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_BOOKE</div><div class='del'>-	/* On server, re-trigger the decrementer if it went negative since</div><div class='del'>-	 * some processors only trigger on edge transitions of the sign bit.</div><div class='del'>-	 *</div><div class='del'>-	 * BookE has a level sensitive decrementer (latches in TSR) so we</div><div class='del'>-	 * don't need that</div><div class='add'>+	/*</div><div class='add'>+	 * Trigger the decrementer if we have a pending event. Some processors</div><div class='add'>+	 * only trigger on edge transitions of the sign bit. We might also</div><div class='add'>+	 * have disabled interrupts long enough that the decrementer wrapped</div><div class='add'>+	 * to positive.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((int)mfspr(SPRN_DEC) &lt; 0)</div><div class='del'>-		mtspr(SPRN_DEC, 1);</div><div class='del'>-#endif /* CONFIG_BOOKE */</div><div class='add'>+	decrementer_check_overflow();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Force the delivery of pending soft-disabled interrupts on PS3.</div><div class='ctx'> 	 * Any HV call will have this side effect.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (firmware_has_feature(FW_FEATURE_PS3_LV1)) {</div><div class='del'>-		u64 tmp;</div><div class='del'>-		lv1_get_version_info(&amp;tmp);</div><div class='add'>+		u64 tmp, tmp2;</div><div class='add'>+		lv1_get_version_info(&amp;tmp, &amp;tmp2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	__hard_irq_enable();</div><div class='head'>diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c<br/>index c7b5afeecaf2..3fea3689527e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/legacy_serial.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/legacy_serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/legacy_serial.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/legacy_serial.c</a></div><div class='hunk'>@@ -441,6 +441,9 @@ static void __init fixup_port_irq(int index,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	port-&gt;irq = virq;</div><div class='add'>+</div><div class='add'>+	if (of_device_is_compatible(np, "fsl,ns16550"))</div><div class='add'>+		port-&gt;handle_irq = fsl8250_handle_irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init fixup_port_pio(int index,</div><div class='head'>diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c<br/>index 84daabe2fcba..578f35f18723 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/lparcfg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/lparcfg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/lparcfg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/lparcfg.c</a></div><div class='hunk'>@@ -783,7 +783,7 @@ static const struct file_operations lparcfg_fops = {</div><div class='ctx'> static int __init lparcfg_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_dir_entry *ent;</div><div class='del'>-	mode_t mode = S_IRUSR | S_IRGRP | S_IROTH;</div><div class='add'>+	umode_t mode = S_IRUSR | S_IRGRP | S_IROTH;</div><div class='ctx'> </div><div class='ctx'> 	/* Allow writing if we have FW_FEATURE_SPLPAR */</div><div class='ctx'> 	if (firmware_has_feature(FW_FEATURE_SPLPAR) &amp;&amp;</div><div class='head'>diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c<br/>index a2158a395d96..c957b1202bdc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/machine_kexec.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/machine_kexec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/machine_kexec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/machine_kexec.c</a></div><div class='hunk'>@@ -125,7 +125,7 @@ void __init reserve_crashkernel(void)</div><div class='ctx'> </div><div class='ctx'> 	crash_size = resource_size(&amp;crashk_res);</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_RELOCATABLE</div><div class='add'>+#ifndef CONFIG_NONSTATIC_KERNEL</div><div class='ctx'> 	if (crashk_res.start != KDUMP_KERNELBASE)</div><div class='ctx'> 		printk("Crash kernel location must be 0x%x\n",</div><div class='ctx'> 				KDUMP_KERNELBASE);</div><div class='head'>diff --git a/arch/powerpc/kernel/machine_kexec_32.c b/arch/powerpc/kernel/machine_kexec_32.c<br/>index e63f2e7d2efb..affe5dcce7f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/machine_kexec_32.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/machine_kexec_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/machine_kexec_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/machine_kexec_32.c</a></div><div class='hunk'>@@ -16,10 +16,10 @@</div><div class='ctx'> #include &lt;asm/hw_irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-typedef NORET_TYPE void (*relocate_new_kernel_t)(</div><div class='add'>+typedef void (*relocate_new_kernel_t)(</div><div class='ctx'> 				unsigned long indirection_page,</div><div class='ctx'> 				unsigned long reboot_code_buffer,</div><div class='del'>-				unsigned long start_address) ATTRIB_NORET;</div><div class='add'>+				unsigned long start_address) __noreturn;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This is a generic machine_kexec function suitable at least for</div><div class='head'>diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c<br/>index 26ccbf77dd41..d7f609086a99 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/machine_kexec_64.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/machine_kexec_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/machine_kexec_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/machine_kexec_64.c</a></div><div class='hunk'>@@ -307,9 +307,9 @@ static union thread_union kexec_stack __init_task_data =</div><div class='ctx'> struct paca_struct kexec_paca;</div><div class='ctx'> </div><div class='ctx'> /* Our assembly helper, in kexec_stub.S */</div><div class='del'>-extern NORET_TYPE void kexec_sequence(void *newstack, unsigned long start,</div><div class='del'>-					void *image, void *control,</div><div class='del'>-					void (*clear_all)(void)) ATTRIB_NORET;</div><div class='add'>+extern void kexec_sequence(void *newstack, unsigned long start,</div><div class='add'>+			   void *image, void *control,</div><div class='add'>+			   void (*clear_all)(void)) __noreturn;</div><div class='ctx'> </div><div class='ctx'> /* too late to fail here */</div><div class='ctx'> void default_machine_kexec(struct kimage *image)</div><div class='head'>diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c<br/>index 458ed3bee663..cce98d76e905 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pci-common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/pci-common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pci-common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/pci-common.c</a></div><div class='hunk'>@@ -214,7 +214,7 @@ char __devinit *pcibios_setup(char *str)</div><div class='ctx'>  * If the interrupt is used, then gets the interrupt line from the</div><div class='ctx'>  * openfirmware and sets it in the pci_dev and pci_config line.</div><div class='ctx'>  */</div><div class='del'>-int pci_read_irq_line(struct pci_dev *pci_dev)</div><div class='add'>+static int pci_read_irq_line(struct pci_dev *pci_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct of_irq oirq;</div><div class='ctx'> 	unsigned int virq;</div><div class='hunk'>@@ -283,7 +283,6 @@ int pci_read_irq_line(struct pci_dev *pci_dev)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(pci_read_irq_line);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Platform support for /proc/bus/pci/X/Y mmap()s,</div><div class='hunk'>@@ -921,18 +920,22 @@ static void __devinit pcibios_fixup_resources(struct pci_dev *dev)</div><div class='ctx'> 		struct resource *res = dev-&gt;resource + i;</div><div class='ctx'> 		if (!res-&gt;flags)</div><div class='ctx'> 			continue;</div><div class='del'>-		/* On platforms that have PCI_PROBE_ONLY set, we don't</div><div class='del'>-		 * consider 0 as an unassigned BAR value. It's technically</div><div class='del'>-		 * a valid value, but linux doesn't like it... so when we can</div><div class='del'>-		 * re-assign things, we do so, but if we can't, we keep it</div><div class='del'>-		 * around and hope for the best...</div><div class='add'>+</div><div class='add'>+		/* If we're going to re-assign everything, we mark all resources</div><div class='add'>+		 * as unset (and 0-base them). In addition, we mark BARs starting</div><div class='add'>+		 * at 0 as unset as well, except if PCI_PROBE_ONLY is also set</div><div class='add'>+		 * since in that case, we don't want to re-assign anything</div><div class='ctx'> 		 */</div><div class='del'>-		if (res-&gt;start == 0 &amp;&amp; !pci_has_flag(PCI_PROBE_ONLY)) {</div><div class='del'>-			pr_debug("PCI:%s Resource %d %016llx-%016llx [%x] is unassigned\n",</div><div class='del'>-				 pci_name(dev), i,</div><div class='del'>-				 (unsigned long long)res-&gt;start,</div><div class='del'>-				 (unsigned long long)res-&gt;end,</div><div class='del'>-				 (unsigned int)res-&gt;flags);</div><div class='add'>+		if (pci_has_flag(PCI_REASSIGN_ALL_RSRC) ||</div><div class='add'>+		    (res-&gt;start == 0 &amp;&amp; !pci_has_flag(PCI_PROBE_ONLY))) {</div><div class='add'>+			/* Only print message if not re-assigning */</div><div class='add'>+			if (!pci_has_flag(PCI_REASSIGN_ALL_RSRC))</div><div class='add'>+				pr_debug("PCI:%s Resource %d %016llx-%016llx [%x] "</div><div class='add'>+					 "is unassigned\n",</div><div class='add'>+					 pci_name(dev), i,</div><div class='add'>+					 (unsigned long long)res-&gt;start,</div><div class='add'>+					 (unsigned long long)res-&gt;end,</div><div class='add'>+					 (unsigned int)res-&gt;flags);</div><div class='ctx'> 			res-&gt;end -= res-&gt;start;</div><div class='ctx'> 			res-&gt;start = 0;</div><div class='ctx'> 			res-&gt;flags |= IORESOURCE_UNSET;</div><div class='hunk'>@@ -1042,6 +1045,16 @@ static void __devinit pcibios_fixup_bridge(struct pci_bus *bus)</div><div class='ctx'> 		if (i &gt;= 3 &amp;&amp; bus-&gt;self-&gt;transparent)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		/* If we are going to re-assign everything, mark the resource</div><div class='add'>+		 * as unset and move it down to 0</div><div class='add'>+		 */</div><div class='add'>+		if (pci_has_flag(PCI_REASSIGN_ALL_RSRC)) {</div><div class='add'>+			res-&gt;flags |= IORESOURCE_UNSET;</div><div class='add'>+			res-&gt;end -= res-&gt;start;</div><div class='add'>+			res-&gt;start = 0;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		pr_debug("PCI:%s Bus rsrc %d %016llx-%016llx [%x] fixup...\n",</div><div class='ctx'> 			 pci_name(dev), i,</div><div class='ctx'> 			 (unsigned long long)res-&gt;start,\</div><div class='hunk'>@@ -1118,6 +1131,11 @@ void __devinit pcibios_setup_bus_devices(struct pci_bus *bus)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void pcibios_set_master(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	/* No special bus mastering setup handling */</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __devinit pcibios_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> {</div><div class='ctx'> 	/* When called from the generic PCI probe, read PCI&lt;-&gt;PCI bridge</div><div class='hunk'>@@ -1262,18 +1280,15 @@ void pcibios_allocate_bus_resources(struct pci_bus *bus)</div><div class='ctx'> 	pci_bus_for_each_resource(bus, res, i) {</div><div class='ctx'> 		if (!res || !res-&gt;flags || res-&gt;start &gt; res-&gt;end || res-&gt;parent)</div><div class='ctx'> 			continue;</div><div class='add'>+</div><div class='add'>+		/* If the resource was left unset at this point, we clear it */</div><div class='add'>+		if (res-&gt;flags &amp; IORESOURCE_UNSET)</div><div class='add'>+			goto clear_resource;</div><div class='add'>+</div><div class='ctx'> 		if (bus-&gt;parent == NULL)</div><div class='ctx'> 			pr = (res-&gt;flags &amp; IORESOURCE_IO) ?</div><div class='ctx'> 				&amp;ioport_resource : &amp;iomem_resource;</div><div class='ctx'> 		else {</div><div class='del'>-			/* Don't bother with non-root busses when</div><div class='del'>-			 * re-assigning all resources. We clear the</div><div class='del'>-			 * resource flags as if they were colliding</div><div class='del'>-			 * and as such ensure proper re-allocation</div><div class='del'>-			 * later.</div><div class='del'>-			 */</div><div class='del'>-			if (pci_has_flag(PCI_REASSIGN_ALL_RSRC))</div><div class='del'>-				goto clear_resource;</div><div class='ctx'> 			pr = pci_find_parent_resource(bus-&gt;self, res);</div><div class='ctx'> 			if (pr == res) {</div><div class='ctx'> 				/* this happens when the generic PCI</div><div class='hunk'>@@ -1304,9 +1319,9 @@ void pcibios_allocate_bus_resources(struct pci_bus *bus)</div><div class='ctx'> 			if (reparent_resources(pr, res) == 0)</div><div class='ctx'> 				continue;</div><div class='ctx'> 		}</div><div class='del'>-		printk(KERN_WARNING "PCI: Cannot allocate resource region "</div><div class='del'>-		       "%d of PCI bridge %d, will remap\n", i, bus-&gt;number);</div><div class='del'>-clear_resource:</div><div class='add'>+		pr_warning("PCI: Cannot allocate resource region "</div><div class='add'>+			   "%d of PCI bridge %d, will remap\n", i, bus-&gt;number);</div><div class='add'>+	clear_resource:</div><div class='ctx'> 		res-&gt;start = res-&gt;end = 0;</div><div class='ctx'> 		res-&gt;flags = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1451,16 +1466,11 @@ void __init pcibios_resource_survey(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_bus *b;</div><div class='ctx'> </div><div class='del'>-	/* Allocate and assign resources. If we re-assign everything, then</div><div class='del'>-	 * we skip the allocate phase</div><div class='del'>-	 */</div><div class='add'>+	/* Allocate and assign resources */</div><div class='ctx'> 	list_for_each_entry(b, &amp;pci_root_buses, node)</div><div class='ctx'> 		pcibios_allocate_bus_resources(b);</div><div class='del'>-</div><div class='del'>-	if (!pci_has_flag(PCI_REASSIGN_ALL_RSRC)) {</div><div class='del'>-		pcibios_allocate_resources(0);</div><div class='del'>-		pcibios_allocate_resources(1);</div><div class='del'>-	}</div><div class='add'>+	pcibios_allocate_resources(0);</div><div class='add'>+	pcibios_allocate_resources(1);</div><div class='ctx'> </div><div class='ctx'> 	/* Before we start assigning unassigned resource, we try to reserve</div><div class='ctx'> 	 * the low IO area and the VGA memory area if they intersect the</div><div class='hunk'>@@ -1555,14 +1565,13 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)</div><div class='ctx'> 	return pci_enable_resources(dev, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __devinit pcibios_setup_phb_resources(struct pci_controller *hose)</div><div class='add'>+static void __devinit pcibios_setup_phb_resources(struct pci_controller *hose, struct list_head *resources)</div><div class='ctx'> {</div><div class='del'>-	struct pci_bus *bus = hose-&gt;bus;</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Hookup PHB IO resource */</div><div class='del'>-	bus-&gt;resource[0] = res = &amp;hose-&gt;io_resource;</div><div class='add'>+	res = &amp;hose-&gt;io_resource;</div><div class='ctx'> </div><div class='ctx'> 	if (!res-&gt;flags) {</div><div class='ctx'> 		printk(KERN_WARNING "PCI: I/O resource not set for host"</div><div class='hunk'>@@ -1580,6 +1589,7 @@ void __devinit pcibios_setup_phb_resources(struct pci_controller *hose)</div><div class='ctx'> 		 (unsigned long long)res-&gt;start,</div><div class='ctx'> 		 (unsigned long long)res-&gt;end,</div><div class='ctx'> 		 (unsigned long)res-&gt;flags);</div><div class='add'>+	pci_add_resource(resources, res);</div><div class='ctx'> </div><div class='ctx'> 	/* Hookup PHB Memory resources */</div><div class='ctx'> 	for (i = 0; i &lt; 3; ++i) {</div><div class='hunk'>@@ -1597,12 +1607,12 @@ void __devinit pcibios_setup_phb_resources(struct pci_controller *hose)</div><div class='ctx'> 			res-&gt;flags = IORESOURCE_MEM;</div><div class='ctx'> #endif /* CONFIG_PPC32 */</div><div class='ctx'> 		}</div><div class='del'>-		bus-&gt;resource[i+1] = res;</div><div class='ctx'> </div><div class='ctx'> 		pr_debug("PCI: PHB MEM resource %d = %016llx-%016llx [%lx]\n", i,</div><div class='ctx'> 			 (unsigned long long)res-&gt;start,</div><div class='ctx'> 			 (unsigned long long)res-&gt;end,</div><div class='ctx'> 			 (unsigned long)res-&gt;flags);</div><div class='add'>+		pci_add_resource(resources, res);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("PCI: PHB MEM offset     = %016llx\n",</div><div class='hunk'>@@ -1696,6 +1706,7 @@ struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus)</div><div class='ctx'>  */</div><div class='ctx'> void __devinit pcibios_scan_phb(struct pci_controller *hose)</div><div class='ctx'> {</div><div class='add'>+	LIST_HEAD(resources);</div><div class='ctx'> 	struct pci_bus *bus;</div><div class='ctx'> 	struct device_node *node = hose-&gt;dn;</div><div class='ctx'> 	int mode;</div><div class='hunk'>@@ -1703,22 +1714,24 @@ void __devinit pcibios_scan_phb(struct pci_controller *hose)</div><div class='ctx'> 	pr_debug("PCI: Scanning PHB %s\n",</div><div class='ctx'> 		 node ? node-&gt;full_name : "&lt;NO NAME&gt;");</div><div class='ctx'> </div><div class='add'>+	/* Get some IO space for the new PHB */</div><div class='add'>+	pcibios_setup_phb_io_space(hose);</div><div class='add'>+</div><div class='add'>+	/* Wire up PHB bus resources */</div><div class='add'>+	pcibios_setup_phb_resources(hose, &amp;resources);</div><div class='add'>+</div><div class='ctx'> 	/* Create an empty bus for the toplevel */</div><div class='del'>-	bus = pci_create_bus(hose-&gt;parent, hose-&gt;first_busno, hose-&gt;ops, hose);</div><div class='add'>+	bus = pci_create_root_bus(hose-&gt;parent, hose-&gt;first_busno,</div><div class='add'>+				  hose-&gt;ops, hose, &amp;resources);</div><div class='ctx'> 	if (bus == NULL) {</div><div class='ctx'> 		pr_err("Failed to create bus for PCI domain %04x\n",</div><div class='ctx'> 			hose-&gt;global_number);</div><div class='add'>+		pci_free_resource_list(&amp;resources);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	bus-&gt;secondary = hose-&gt;first_busno;</div><div class='ctx'> 	hose-&gt;bus = bus;</div><div class='ctx'> </div><div class='del'>-	/* Get some IO space for the new PHB */</div><div class='del'>-	pcibios_setup_phb_io_space(hose);</div><div class='del'>-</div><div class='del'>-	/* Wire up PHB bus resources */</div><div class='del'>-	pcibios_setup_phb_resources(hose);</div><div class='del'>-</div><div class='ctx'> 	/* Get probe mode and perform scan */</div><div class='ctx'> 	mode = PCI_PROBE_NORMAL;</div><div class='ctx'> 	if (node &amp;&amp; ppc_md.pci_probe_mode)</div><div class='hunk'>@@ -1732,6 +1745,12 @@ void __devinit pcibios_scan_phb(struct pci_controller *hose)</div><div class='ctx'> 	if (mode == PCI_PROBE_NORMAL)</div><div class='ctx'> 		hose-&gt;last_busno = bus-&gt;subordinate = pci_scan_child_bus(bus);</div><div class='ctx'> </div><div class='add'>+	/* Platform gets a chance to do some global fixups before</div><div class='add'>+	 * we proceed to resource allocation</div><div class='add'>+	 */</div><div class='add'>+	if (ppc_md.pcibios_fixup_phb)</div><div class='add'>+		ppc_md.pcibios_fixup_phb(hose);</div><div class='add'>+</div><div class='ctx'> 	/* Configure PCI Express settings */</div><div class='ctx'> 	if (bus &amp;&amp; !pci_has_flag(PCI_PROBE_ONLY)) {</div><div class='ctx'> 		struct pci_bus *child;</div><div class='hunk'>@@ -1747,10 +1766,13 @@ void __devinit pcibios_scan_phb(struct pci_controller *hose)</div><div class='ctx'> static void fixup_hide_host_resource_fsl(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i, class = dev-&gt;class &gt;&gt; 8;</div><div class='add'>+	/* When configured as agent, programing interface = 1 */</div><div class='add'>+	int prog_if = dev-&gt;class &amp; 0xf;</div><div class='ctx'> </div><div class='ctx'> 	if ((class == PCI_CLASS_PROCESSOR_POWERPC ||</div><div class='ctx'> 	     class == PCI_CLASS_BRIDGE_OTHER) &amp;&amp;</div><div class='ctx'> 		(dev-&gt;hdr_type == PCI_HEADER_TYPE_NORMAL) &amp;&amp;</div><div class='add'>+		(prog_if == 0) &amp;&amp;</div><div class='ctx'> 		(dev-&gt;bus-&gt;parent == NULL)) {</div><div class='ctx'> 		for (i = 0; i &lt; DEVICE_COUNT_RESOURCE; i++) {</div><div class='ctx'> 			dev-&gt;resource[i].start = 0;</div><div class='head'>diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c<br/>index bcf4bf9e72d9..3318d39b7d4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pci_64.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/pci_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pci_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/pci_64.c</a></div><div class='hunk'>@@ -131,30 +131,13 @@ EXPORT_SYMBOL_GPL(pcibios_unmap_io_space);</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_HOTPLUG */</div><div class='ctx'> </div><div class='del'>-int __devinit pcibios_map_io_space(struct pci_bus *bus)</div><div class='add'>+static int __devinit pcibios_map_phb_io_space(struct pci_controller *hose)</div><div class='ctx'> {</div><div class='ctx'> 	struct vm_struct *area;</div><div class='ctx'> 	unsigned long phys_page;</div><div class='ctx'> 	unsigned long size_page;</div><div class='ctx'> 	unsigned long io_virt_offset;</div><div class='del'>-	struct pci_controller *hose;</div><div class='del'>-</div><div class='del'>-	WARN_ON(bus == NULL);</div><div class='del'>-</div><div class='del'>-	/* If this not a PHB, nothing to do, page tables still exist and</div><div class='del'>-	 * thus HPTEs will be faulted in when needed</div><div class='del'>-	 */</div><div class='del'>-	if (bus-&gt;self) {</div><div class='del'>-		pr_debug("IO mapping for PCI-PCI bridge %s\n",</div><div class='del'>-			 pci_name(bus-&gt;self));</div><div class='del'>-		pr_debug("  virt=0x%016llx...0x%016llx\n",</div><div class='del'>-			 bus-&gt;resource[0]-&gt;start + _IO_BASE,</div><div class='del'>-			 bus-&gt;resource[0]-&gt;end + _IO_BASE);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	/* Get the host bridge */</div><div class='del'>-	hose = pci_bus_to_host(bus);</div><div class='ctx'> 	phys_page = _ALIGN_DOWN(hose-&gt;io_base_phys, PAGE_SIZE);</div><div class='ctx'> 	size_page = _ALIGN_UP(hose-&gt;pci_io_size, PAGE_SIZE);</div><div class='ctx'> </div><div class='hunk'>@@ -198,11 +181,30 @@ int __devinit pcibios_map_io_space(struct pci_bus *bus)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int __devinit pcibios_map_io_space(struct pci_bus *bus)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(bus == NULL);</div><div class='add'>+</div><div class='add'>+	/* If this not a PHB, nothing to do, page tables still exist and</div><div class='add'>+	 * thus HPTEs will be faulted in when needed</div><div class='add'>+	 */</div><div class='add'>+	if (bus-&gt;self) {</div><div class='add'>+		pr_debug("IO mapping for PCI-PCI bridge %s\n",</div><div class='add'>+			 pci_name(bus-&gt;self));</div><div class='add'>+		pr_debug("  virt=0x%016llx...0x%016llx\n",</div><div class='add'>+			 bus-&gt;resource[0]-&gt;start + _IO_BASE,</div><div class='add'>+			 bus-&gt;resource[0]-&gt;end + _IO_BASE);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return pcibios_map_phb_io_space(pci_bus_to_host(bus));</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(pcibios_map_io_space);</div><div class='ctx'> </div><div class='ctx'> void __devinit pcibios_setup_phb_io_space(struct pci_controller *hose)</div><div class='ctx'> {</div><div class='del'>-	pcibios_map_io_space(hose-&gt;bus);</div><div class='add'>+	pcibios_map_phb_io_space(hose);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define IOBASE_BRIDGE_NUMBER	0</div><div class='head'>diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c<br/>index 4e69deb89b37..dd9e4a04bf79 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pci_dn.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/pci_dn.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pci_dn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/pci_dn.c</a></div><div class='hunk'>@@ -50,6 +50,9 @@ void * __devinit update_dn_pci_info(struct device_node *dn, void *data)</div><div class='ctx'> 	dn-&gt;data = pdn;</div><div class='ctx'> 	pdn-&gt;node = dn;</div><div class='ctx'> 	pdn-&gt;phb = phb;</div><div class='add'>+#ifdef CONFIG_PPC_POWERNV</div><div class='add'>+	pdn-&gt;pe_number = IODA_INVALID_PE;</div><div class='add'>+#endif</div><div class='ctx'> 	regs = of_get_property(dn, "reg", NULL);</div><div class='ctx'> 	if (regs) {</div><div class='ctx'> 		/* First register entry is addr (00BBSS00)  */</div><div class='head'>diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c<br/>index 6457574c0b2f..ebe5766781aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/process.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/process.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/process.c</a></div><div class='hunk'>@@ -584,16 +584,32 @@ static struct regbit {</div><div class='ctx'> 	unsigned long bit;</div><div class='ctx'> 	const char *name;</div><div class='ctx'> } msr_bits[] = {</div><div class='add'>+#if defined(CONFIG_PPC64) &amp;&amp; !defined(CONFIG_BOOKE)</div><div class='add'>+	{MSR_SF,	"SF"},</div><div class='add'>+	{MSR_HV,	"HV"},</div><div class='add'>+#endif</div><div class='add'>+	{MSR_VEC,	"VEC"},</div><div class='add'>+	{MSR_VSX,	"VSX"},</div><div class='add'>+#ifdef CONFIG_BOOKE</div><div class='add'>+	{MSR_CE,	"CE"},</div><div class='add'>+#endif</div><div class='ctx'> 	{MSR_EE,	"EE"},</div><div class='ctx'> 	{MSR_PR,	"PR"},</div><div class='ctx'> 	{MSR_FP,	"FP"},</div><div class='del'>-	{MSR_VEC,	"VEC"},</div><div class='del'>-	{MSR_VSX,	"VSX"},</div><div class='ctx'> 	{MSR_ME,	"ME"},</div><div class='del'>-	{MSR_CE,	"CE"},</div><div class='add'>+#ifdef CONFIG_BOOKE</div><div class='ctx'> 	{MSR_DE,	"DE"},</div><div class='add'>+#else</div><div class='add'>+	{MSR_SE,	"SE"},</div><div class='add'>+	{MSR_BE,	"BE"},</div><div class='add'>+#endif</div><div class='ctx'> 	{MSR_IR,	"IR"},</div><div class='ctx'> 	{MSR_DR,	"DR"},</div><div class='add'>+	{MSR_PMM,	"PMM"},</div><div class='add'>+#ifndef CONFIG_BOOKE</div><div class='add'>+	{MSR_RI,	"RI"},</div><div class='add'>+	{MSR_LE,	"LE"},</div><div class='add'>+#endif</div><div class='ctx'> 	{0,		NULL}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c<br/>index cc584865b3df..eca626ea3f23 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/prom_init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/prom_init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/prom_init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/prom_init.c</a></div><div class='hunk'>@@ -742,7 +742,7 @@ static unsigned char ibm_architecture_vec[] = {</div><div class='ctx'> 	W(0xffffffff),			/* virt_base */</div><div class='ctx'> 	W(0xffffffff),			/* virt_size */</div><div class='ctx'> 	W(0xffffffff),			/* load_base */</div><div class='del'>-	W(64),				/* 64MB min RMA */</div><div class='add'>+	W(256),				/* 256MB min RMA */</div><div class='ctx'> 	W(0xffffffff),			/* full client load */</div><div class='ctx'> 	0,				/* min RMA percentage of total RAM */</div><div class='ctx'> 	48,				/* max log_2(hash table size) */</div><div class='hunk'>@@ -1224,14 +1224,6 @@ static void __init prom_init_mem(void)</div><div class='ctx'> </div><div class='ctx'> 	RELOC(alloc_bottom) = PAGE_ALIGN((unsigned long)&amp;RELOC(_end) + 0x4000);</div><div class='ctx'> </div><div class='del'>-	/* Check if we have an initrd after the kernel, if we do move our bottom</div><div class='del'>-	 * point to after it</div><div class='del'>-	 */</div><div class='del'>-	if (RELOC(prom_initrd_start)) {</div><div class='del'>-		if (RELOC(prom_initrd_end) &gt; RELOC(alloc_bottom))</div><div class='del'>-			RELOC(alloc_bottom) = PAGE_ALIGN(RELOC(prom_initrd_end));</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If prom_memory_limit is set we reduce the upper limits *except* for</div><div class='ctx'> 	 * alloc_top_high. This must be the real top of RAM so we can put</div><div class='hunk'>@@ -1269,6 +1261,15 @@ static void __init prom_init_mem(void)</div><div class='ctx'> 	RELOC(alloc_top) = RELOC(rmo_top);</div><div class='ctx'> 	RELOC(alloc_top_high) = RELOC(ram_top);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Check if we have an initrd after the kernel but still inside</div><div class='add'>+	 * the RMO.  If we do move our bottom point to after it.</div><div class='add'>+	 */</div><div class='add'>+	if (RELOC(prom_initrd_start) &amp;&amp;</div><div class='add'>+	    RELOC(prom_initrd_start) &lt; RELOC(rmo_top) &amp;&amp;</div><div class='add'>+	    RELOC(prom_initrd_end) &gt; RELOC(alloc_bottom))</div><div class='add'>+		RELOC(alloc_bottom) = PAGE_ALIGN(RELOC(prom_initrd_end));</div><div class='add'>+</div><div class='ctx'> 	prom_printf("memory layout at init:\n");</div><div class='ctx'> 	prom_printf("  memory_limit : %x (16 MB aligned)\n", RELOC(prom_memory_limit));</div><div class='ctx'> 	prom_printf("  alloc_bottom : %x\n", RELOC(alloc_bottom));</div><div class='hunk'>@@ -2079,7 +2080,7 @@ static void __init prom_check_displays(void)</div><div class='ctx'> 		/* Setup a usable color table when the appropriate</div><div class='ctx'> 		 * method is available. Should update this to set-colors */</div><div class='ctx'> 		clut = RELOC(default_colors);</div><div class='del'>-		for (i = 0; i &lt; 32; i++, clut += 3)</div><div class='add'>+		for (i = 0; i &lt; 16; i++, clut += 3)</div><div class='ctx'> 			if (prom_set_color(ih, i, clut[0], clut[1],</div><div class='ctx'> 					   clut[2]) != 0)</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -2844,7 +2845,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,</div><div class='ctx'> 	RELOC(of_platform) = prom_find_machine_type();</div><div class='ctx'> 	prom_printf("Detected machine type: %x\n", RELOC(of_platform));</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_RELOCATABLE</div><div class='add'>+#ifndef CONFIG_NONSTATIC_KERNEL</div><div class='ctx'> 	/* Bail if this is a kdump kernel. */</div><div class='ctx'> 	if (PHYSICAL_START &gt; 0)</div><div class='ctx'> 		prom_panic("Error: You can't boot a kdump kernel from OF!\n");</div><div class='hunk'>@@ -2969,9 +2970,11 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * in case stdin is USB and still active on IBM machines...</div><div class='ctx'> 	 * Unfortunately quiesce crashes on some powermacs if we have</div><div class='del'>-	 * closed stdin already (in particular the powerbook 101).</div><div class='add'>+	 * closed stdin already (in particular the powerbook 101). It</div><div class='add'>+	 * appears that the OPAL version of OFW doesn't like it either.</div><div class='ctx'> 	 */</div><div class='del'>-	if (RELOC(of_platform) != PLATFORM_POWERMAC)</div><div class='add'>+	if (RELOC(of_platform) != PLATFORM_POWERMAC &amp;&amp;</div><div class='add'>+	    RELOC(of_platform) != PLATFORM_OPAL)</div><div class='ctx'> 		prom_close_stdin();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2987,8 +2990,12 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,</div><div class='ctx'> 	 * is common to us and kexec</div><div class='ctx'> 	 */</div><div class='ctx'> 	hdr = RELOC(dt_header_start);</div><div class='del'>-	prom_printf("returning from prom_init\n");</div><div class='del'>-	prom_debug("-&gt;dt_header_start=0x%x\n", hdr);</div><div class='add'>+</div><div class='add'>+	/* Don't print anything after quiesce under OPAL, it crashes OFW */</div><div class='add'>+	if (RELOC(of_platform) != PLATFORM_OPAL) {</div><div class='add'>+		prom_printf("returning from prom_init\n");</div><div class='add'>+		prom_debug("-&gt;dt_header_start=0x%x\n", hdr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC32</div><div class='ctx'> 	reloc_got2(-offset);</div><div class='head'>diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c<br/>index 5de73dbd15c7..5b43325402bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/ptrace.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/ptrace.c</a></div><div class='hunk'>@@ -1724,22 +1724,20 @@ long do_syscall_trace_enter(struct pt_regs *regs)</div><div class='ctx'> 	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))</div><div class='ctx'> 		trace_sys_enter(regs, regs-&gt;gpr[0]);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context)) {</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='del'>-		if (!is_32bit_task())</div><div class='del'>-			audit_syscall_entry(AUDIT_ARCH_PPC64,</div><div class='del'>-					    regs-&gt;gpr[0],</div><div class='del'>-					    regs-&gt;gpr[3], regs-&gt;gpr[4],</div><div class='del'>-					    regs-&gt;gpr[5], regs-&gt;gpr[6]);</div><div class='del'>-		else</div><div class='add'>+	if (!is_32bit_task())</div><div class='add'>+		audit_syscall_entry(AUDIT_ARCH_PPC64,</div><div class='add'>+				    regs-&gt;gpr[0],</div><div class='add'>+				    regs-&gt;gpr[3], regs-&gt;gpr[4],</div><div class='add'>+				    regs-&gt;gpr[5], regs-&gt;gpr[6]);</div><div class='add'>+	else</div><div class='ctx'> #endif</div><div class='del'>-			audit_syscall_entry(AUDIT_ARCH_PPC,</div><div class='del'>-					    regs-&gt;gpr[0],</div><div class='del'>-					    regs-&gt;gpr[3] &amp; 0xffffffff,</div><div class='del'>-					    regs-&gt;gpr[4] &amp; 0xffffffff,</div><div class='del'>-					    regs-&gt;gpr[5] &amp; 0xffffffff,</div><div class='del'>-					    regs-&gt;gpr[6] &amp; 0xffffffff);</div><div class='del'>-	}</div><div class='add'>+		audit_syscall_entry(AUDIT_ARCH_PPC,</div><div class='add'>+				    regs-&gt;gpr[0],</div><div class='add'>+				    regs-&gt;gpr[3] &amp; 0xffffffff,</div><div class='add'>+				    regs-&gt;gpr[4] &amp; 0xffffffff,</div><div class='add'>+				    regs-&gt;gpr[5] &amp; 0xffffffff,</div><div class='add'>+				    regs-&gt;gpr[6] &amp; 0xffffffff);</div><div class='ctx'> </div><div class='ctx'> 	return ret ?: regs-&gt;gpr[0];</div><div class='ctx'> }</div><div class='hunk'>@@ -1748,9 +1746,7 @@ void do_syscall_trace_leave(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	int step;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context))</div><div class='del'>-		audit_syscall_exit((regs-&gt;ccr&amp;0x10000000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,</div><div class='del'>-				   regs-&gt;result);</div><div class='add'>+	audit_syscall_exit(regs);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))</div><div class='ctx'> 		trace_sys_exit(regs, regs-&gt;result);</div><div class='head'>diff --git a/arch/powerpc/kernel/reloc_32.S b/arch/powerpc/kernel/reloc_32.S<br/>new file mode 100644<br/>index 000000000000..ef46ba6e094f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/reloc_32.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/reloc_32.S</a></div><div class='hunk'>@@ -0,0 +1,208 @@</div><div class='add'>+/*</div><div class='add'>+ * Code to process dynamic relocations for PPC32.</div><div class='add'>+ *</div><div class='add'>+ * Copyrights (C) IBM Corporation, 2011.</div><div class='add'>+ *	Author: Suzuki Poulose &lt;suzuki@in.ibm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  - Based on ppc64 code - reloc_64.S</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'>+</div><div class='add'>+#include &lt;asm/ppc_asm.h&gt;</div><div class='add'>+</div><div class='add'>+/* Dynamic section table entry tags */</div><div class='add'>+DT_RELA = 7			/* Tag for Elf32_Rela section */</div><div class='add'>+DT_RELASZ = 8			/* Size of the Rela relocs */</div><div class='add'>+DT_RELAENT = 9			/* Size of one Rela reloc entry */</div><div class='add'>+</div><div class='add'>+STN_UNDEF = 0			/* Undefined symbol index */</div><div class='add'>+STB_LOCAL = 0			/* Local binding for the symbol */</div><div class='add'>+</div><div class='add'>+R_PPC_ADDR16_LO = 4		/* Lower half of (S+A) */</div><div class='add'>+R_PPC_ADDR16_HI = 5		/* Upper half of (S+A) */</div><div class='add'>+R_PPC_ADDR16_HA = 6		/* High Adjusted (S+A) */</div><div class='add'>+R_PPC_RELATIVE = 22</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * r3 = desired final address</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+_GLOBAL(relocate)</div><div class='add'>+</div><div class='add'>+	mflr	r0		/* Save our LR */</div><div class='add'>+	bl	0f		/* Find our current runtime address */</div><div class='add'>+0:	mflr	r12		/* Make it accessible */</div><div class='add'>+	mtlr	r0</div><div class='add'>+</div><div class='add'>+	lwz	r11, (p_dyn - 0b)(r12)</div><div class='add'>+	add	r11, r11, r12	/* runtime address of .dynamic section */</div><div class='add'>+	lwz	r9, (p_rela - 0b)(r12)</div><div class='add'>+	add	r9, r9, r12	/* runtime address of .rela.dyn section */</div><div class='add'>+	lwz	r10, (p_st - 0b)(r12)</div><div class='add'>+	add	r10, r10, r12	/* runtime address of _stext section */</div><div class='add'>+	lwz	r13, (p_sym - 0b)(r12)</div><div class='add'>+	add	r13, r13, r12	/* runtime address of .dynsym section */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Scan the dynamic section for RELA, RELASZ entries</div><div class='add'>+	 */</div><div class='add'>+	li	r6, 0</div><div class='add'>+	li	r7, 0</div><div class='add'>+	li	r8, 0</div><div class='add'>+1:	lwz	r5, 0(r11)	/* ELF_Dyn.d_tag */</div><div class='add'>+	cmpwi	r5, 0		/* End of ELF_Dyn[] */</div><div class='add'>+	beq	eodyn</div><div class='add'>+	cmpwi	r5, DT_RELA</div><div class='add'>+	bne	relasz</div><div class='add'>+	lwz	r7, 4(r11)	/* r7 = rela.link */</div><div class='add'>+	b	skip</div><div class='add'>+relasz:</div><div class='add'>+	cmpwi	r5, DT_RELASZ</div><div class='add'>+	bne	relaent</div><div class='add'>+	lwz	r8, 4(r11)	/* r8 = Total Rela relocs size */</div><div class='add'>+	b	skip</div><div class='add'>+relaent:</div><div class='add'>+	cmpwi	r5, DT_RELAENT</div><div class='add'>+	bne	skip</div><div class='add'>+	lwz	r6, 4(r11)	/* r6 = Size of one Rela reloc */</div><div class='add'>+skip:</div><div class='add'>+	addi	r11, r11, 8</div><div class='add'>+	b	1b</div><div class='add'>+eodyn:				/* End of Dyn Table scan */</div><div class='add'>+</div><div class='add'>+	/* Check if we have found all the entries */</div><div class='add'>+	cmpwi	r7, 0</div><div class='add'>+	beq	done</div><div class='add'>+	cmpwi	r8, 0</div><div class='add'>+	beq	done</div><div class='add'>+	cmpwi	r6, 0</div><div class='add'>+	beq	done</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Work out the current offset from the link time address of .rela</div><div class='add'>+	 * section.</div><div class='add'>+	 *  cur_offset[r7] = rela.run[r9] - rela.link [r7]</div><div class='add'>+	 *  _stext.link[r12] = _stext.run[r10] - cur_offset[r7]</div><div class='add'>+	 *  final_offset[r3] = _stext.final[r3] - _stext.link[r12]</div><div class='add'>+	 */</div><div class='add'>+	subf	r7, r7, r9	/* cur_offset */</div><div class='add'>+	subf	r12, r7, r10</div><div class='add'>+	subf	r3, r12, r3	/* final_offset */</div><div class='add'>+</div><div class='add'>+	subf	r8, r6, r8	/* relaz -= relaent */</div><div class='add'>+	/*</div><div class='add'>+	 * Scan through the .rela table and process each entry</div><div class='add'>+	 * r9	- points to the current .rela table entry</div><div class='add'>+	 * r13	- points to the symbol table</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if we have a relocation based on symbol</div><div class='add'>+	 * r5 will hold the value of the symbol.</div><div class='add'>+	 */</div><div class='add'>+applyrela:</div><div class='add'>+	lwz	r4, 4(r9)		/* r4 = rela.r_info */</div><div class='add'>+	srwi	r5, r4, 8		/* ELF32_R_SYM(r_info) */</div><div class='add'>+	cmpwi	r5, STN_UNDEF	/* sym == STN_UNDEF ? */</div><div class='add'>+	beq	get_type	/* value = 0 */</div><div class='add'>+	/* Find the value of the symbol at index(r5) */</div><div class='add'>+	slwi	r5, r5, 4		/* r5 = r5 * sizeof(Elf32_Sym) */</div><div class='add'>+	add	r12, r13, r5	/* r12 = &amp;__dyn_sym[Index] */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * GNU ld has a bug, where dynamic relocs based on</div><div class='add'>+	 * STB_LOCAL symbols, the value should be assumed</div><div class='add'>+	 * to be zero. - Alan Modra</div><div class='add'>+	 */</div><div class='add'>+	/* XXX: Do we need to check if we are using GNU ld ? */</div><div class='add'>+	lbz	r5, 12(r12)	/* r5 = dyn_sym[Index].st_info */</div><div class='add'>+	extrwi	r5, r5, 4, 24	/* r5 = ELF32_ST_BIND(r5) */</div><div class='add'>+	cmpwi	r5, STB_LOCAL	/* st_value = 0, ld bug */</div><div class='add'>+	beq	get_type	/* We have r5 = 0 */</div><div class='add'>+	lwz	r5, 4(r12)	/* r5 = __dyn_sym[Index].st_value */</div><div class='add'>+</div><div class='add'>+get_type:</div><div class='add'>+	/* Load the relocation type to r4 */</div><div class='add'>+	extrwi	r4, r4, 8, 24	/* r4 = ELF32_R_TYPE(r_info) = ((char*)r4)[3] */</div><div class='add'>+</div><div class='add'>+	/* R_PPC_RELATIVE */</div><div class='add'>+	cmpwi	r4, R_PPC_RELATIVE</div><div class='add'>+	bne	hi16</div><div class='add'>+	lwz	r4, 0(r9)	/* r_offset */</div><div class='add'>+	lwz	r0, 8(r9)	/* r_addend */</div><div class='add'>+	add	r0, r0, r3	/* final addend */</div><div class='add'>+	stwx	r0, r4, r7	/* memory[r4+r7]) = (u32)r0 */</div><div class='add'>+	b	nxtrela		/* continue */</div><div class='add'>+</div><div class='add'>+	/* R_PPC_ADDR16_HI */</div><div class='add'>+hi16:</div><div class='add'>+	cmpwi	r4, R_PPC_ADDR16_HI</div><div class='add'>+	bne	ha16</div><div class='add'>+	lwz	r4, 0(r9)	/* r_offset */</div><div class='add'>+	lwz	r0, 8(r9)	/* r_addend */</div><div class='add'>+	add	r0, r0, r3</div><div class='add'>+	add	r0, r0, r5	/* r0 = (S+A+Offset) */</div><div class='add'>+	extrwi	r0, r0, 16, 0	/* r0 = (r0 &gt;&gt; 16) */</div><div class='add'>+	b	store_half</div><div class='add'>+</div><div class='add'>+	/* R_PPC_ADDR16_HA */</div><div class='add'>+ha16:</div><div class='add'>+	cmpwi	r4, R_PPC_ADDR16_HA</div><div class='add'>+	bne	lo16</div><div class='add'>+	lwz	r4, 0(r9)	/* r_offset */</div><div class='add'>+	lwz	r0, 8(r9)	/* r_addend */</div><div class='add'>+	add	r0, r0, r3</div><div class='add'>+	add	r0, r0, r5	/* r0 = (S+A+Offset) */</div><div class='add'>+	extrwi	r5, r0, 1, 16	/* Extract bit 16 */</div><div class='add'>+	extrwi	r0, r0, 16, 0	/* r0 = (r0 &gt;&gt; 16) */</div><div class='add'>+	add	r0, r0, r5	/* Add it to r0 */</div><div class='add'>+	b	store_half</div><div class='add'>+</div><div class='add'>+	/* R_PPC_ADDR16_LO */</div><div class='add'>+lo16:</div><div class='add'>+	cmpwi	r4, R_PPC_ADDR16_LO</div><div class='add'>+	bne	nxtrela</div><div class='add'>+	lwz	r4, 0(r9)	/* r_offset */</div><div class='add'>+	lwz	r0, 8(r9)	/* r_addend */</div><div class='add'>+	add	r0, r0, r3</div><div class='add'>+	add	r0, r0, r5	/* r0 = (S+A+Offset) */</div><div class='add'>+	extrwi	r0, r0, 16, 16	/* r0 &amp;= 0xffff */</div><div class='add'>+	/* Fall through to */</div><div class='add'>+</div><div class='add'>+	/* Store half word */</div><div class='add'>+store_half:</div><div class='add'>+	sthx	r0, r4, r7	/* memory[r4+r7] = (u16)r0 */</div><div class='add'>+</div><div class='add'>+nxtrela:</div><div class='add'>+	/*</div><div class='add'>+	 * We have to flush the modified instructions to the</div><div class='add'>+	 * main storage from the d-cache. And also, invalidate the</div><div class='add'>+	 * cached instructions in i-cache which has been modified.</div><div class='add'>+	 *</div><div class='add'>+	 * We delay the sync / isync operation till the end, since</div><div class='add'>+	 * we won't be executing the modified instructions until</div><div class='add'>+	 * we return from here.</div><div class='add'>+	 */</div><div class='add'>+	dcbst	r4,r7</div><div class='add'>+	sync			/* Ensure the data is flushed before icbi */</div><div class='add'>+	icbi	r4,r7</div><div class='add'>+	cmpwi	r8, 0		/* relasz = 0 ? */</div><div class='add'>+	ble	done</div><div class='add'>+	add	r9, r9, r6	/* move to next entry in the .rela table */</div><div class='add'>+	subf	r8, r6, r8	/* relasz -= relaent */</div><div class='add'>+	b	applyrela</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	sync			/* Wait for the flush to finish */</div><div class='add'>+	isync			/* Discard prefetched instructions */</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+p_dyn:		.long	__dynamic_start - 0b</div><div class='add'>+p_rela:		.long	__rela_dyn_start - 0b</div><div class='add'>+p_sym:		.long	__dynamic_symtab - 0b</div><div class='add'>+p_st:		.long	_stext - 0b</div><div class='head'>diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c<br/>index e037c7494fd8..4174b4b23246 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/rtas_flash.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/rtas_flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/rtas_flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/rtas_flash.c</a></div><div class='hunk'>@@ -568,6 +568,12 @@ static void rtas_flash_firmware(int reboot_type)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Just before starting the firmware flash, cancel the event scan work</div><div class='add'>+	 * to avoid any soft lockup issues.</div><div class='add'>+	 */</div><div class='add'>+	rtas_cancel_event_scan();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * NOTE: the "first" block must be under 4GB, so we create</div><div class='ctx'> 	 * an entry with no data blocks in the reserved buffer in</div><div class='ctx'> 	 * the kernel data segment.</div><div class='head'>diff --git a/arch/powerpc/kernel/rtasd.c b/arch/powerpc/kernel/rtasd.c<br/>index 481ef064c8f1..1045ff49cc6d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/rtasd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/rtasd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/rtasd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/rtasd.c</a></div><div class='hunk'>@@ -472,6 +472,13 @@ static void start_event_scan(void)</div><div class='ctx'> 				 &amp;event_scan_work, event_scan_delay);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Cancel the rtas event scan work */</div><div class='add'>+void rtas_cancel_event_scan(void)</div><div class='add'>+{</div><div class='add'>+	cancel_delayed_work_sync(&amp;event_scan_work);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(rtas_cancel_event_scan);</div><div class='add'>+</div><div class='ctx'> static int __init rtas_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_dir_entry *entry;</div><div class='head'>diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c<br/>index fb9bb46e7e88..4cb8f1e9d044 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/setup_64.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/setup_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/setup_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/setup_64.c</a></div><div class='hunk'>@@ -35,6 +35,8 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/lockdep.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='add'>+#include &lt;linux/hugetlb.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/kdump.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='hunk'>@@ -64,6 +66,7 @@</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/code-patching.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_ppc.h&gt;</div><div class='add'>+#include &lt;asm/hugetlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "setup.h"</div><div class='ctx'> </div><div class='hunk'>@@ -217,6 +220,13 @@ void __init early_setup(unsigned long dt_ptr)</div><div class='ctx'> 	/* Initialize the hash table or TLB handling */</div><div class='ctx'> 	early_init_mmu();</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Reserve any gigantic pages requested on the command line.</div><div class='add'>+	 * memblock needs to have been initialized by the time this is</div><div class='add'>+	 * called since this will reserve memory.</div><div class='add'>+	 */</div><div class='add'>+	reserve_hugetlb_gpages();</div><div class='add'>+</div><div class='ctx'> 	DBG(" &lt;- early_setup()\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c<br/>index 6df70907d60a..46695febc09f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/smp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/smp.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/topology.h&gt;</div><div class='hunk'>@@ -187,7 +187,8 @@ int smp_request_message_ipi(int virq, int msg)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	err = request_irq(virq, smp_ipi_action[msg], IRQF_PERCPU,</div><div class='add'>+	err = request_irq(virq, smp_ipi_action[msg],</div><div class='add'>+			  IRQF_PERCPU | IRQF_NO_THREAD,</div><div class='ctx'> 			  smp_ipi_name[msg], 0);</div><div class='ctx'> 	WARN(err &lt; 0, "unable to request_irq %d for %s (rc %d)\n",</div><div class='ctx'> 		virq, smp_ipi_name[msg], err);</div><div class='head'>diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c<br/>index ce035c1905f0..883e74c0d1b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/sysfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/sysfs.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/pmc.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cacheinfo.h"</div><div class='ctx'> </div><div class='hunk'>@@ -37,12 +38,12 @@ static DEFINE_PER_CPU(struct cpu, cpu_devices);</div><div class='ctx'> /* Time in microseconds we delay before sleeping in the idle loop */</div><div class='ctx'> DEFINE_PER_CPU(long, smt_snooze_delay) = { 100 };</div><div class='ctx'> </div><div class='del'>-static ssize_t store_smt_snooze_delay(struct sys_device *dev,</div><div class='del'>-				      struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t store_smt_snooze_delay(struct device *dev,</div><div class='add'>+				      struct device_attribute *attr,</div><div class='ctx'> 				      const char *buf,</div><div class='ctx'> 				      size_t count)</div><div class='ctx'> {</div><div class='del'>-	struct cpu *cpu = container_of(dev, struct cpu, sysdev);</div><div class='add'>+	struct cpu *cpu = container_of(dev, struct cpu, dev);</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> 	long snooze;</div><div class='ctx'> </div><div class='hunk'>@@ -50,21 +51,22 @@ static ssize_t store_smt_snooze_delay(struct sys_device *dev,</div><div class='ctx'> 	if (ret != 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	per_cpu(smt_snooze_delay, cpu-&gt;sysdev.id) = snooze;</div><div class='add'>+	per_cpu(smt_snooze_delay, cpu-&gt;dev.id) = snooze;</div><div class='add'>+	update_smt_snooze_delay(snooze);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_smt_snooze_delay(struct sys_device *dev,</div><div class='del'>-				     struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t show_smt_snooze_delay(struct device *dev,</div><div class='add'>+				     struct device_attribute *attr,</div><div class='ctx'> 				     char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct cpu *cpu = container_of(dev, struct cpu, sysdev);</div><div class='add'>+	struct cpu *cpu = container_of(dev, struct cpu, dev);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%ld\n", per_cpu(smt_snooze_delay, cpu-&gt;sysdev.id));</div><div class='add'>+	return sprintf(buf, "%ld\n", per_cpu(smt_snooze_delay, cpu-&gt;dev.id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(smt_snooze_delay, 0644, show_smt_snooze_delay,</div><div class='add'>+static DEVICE_ATTR(smt_snooze_delay, 0644, show_smt_snooze_delay,</div><div class='ctx'> 		   store_smt_snooze_delay);</div><div class='ctx'> </div><div class='ctx'> static int __init setup_smt_snooze_delay(char *str)</div><div class='hunk'>@@ -117,25 +119,25 @@ static void write_##NAME(void *val) \</div><div class='ctx'> 	ppc_enable_pmcs(); \</div><div class='ctx'> 	mtspr(ADDRESS, *(unsigned long *)val);	\</div><div class='ctx'> } \</div><div class='del'>-static ssize_t show_##NAME(struct sys_device *dev, \</div><div class='del'>-			struct sysdev_attribute *attr, \</div><div class='add'>+static ssize_t show_##NAME(struct device *dev, \</div><div class='add'>+			struct device_attribute *attr, \</div><div class='ctx'> 			char *buf) \</div><div class='ctx'> { \</div><div class='del'>-	struct cpu *cpu = container_of(dev, struct cpu, sysdev); \</div><div class='add'>+	struct cpu *cpu = container_of(dev, struct cpu, dev); \</div><div class='ctx'> 	unsigned long val; \</div><div class='del'>-	smp_call_function_single(cpu-&gt;sysdev.id, read_##NAME, &amp;val, 1);	\</div><div class='add'>+	smp_call_function_single(cpu-&gt;dev.id, read_##NAME, &amp;val, 1);	\</div><div class='ctx'> 	return sprintf(buf, "%lx\n", val); \</div><div class='ctx'> } \</div><div class='ctx'> static ssize_t __used \</div><div class='del'>-	store_##NAME(struct sys_device *dev, struct sysdev_attribute *attr, \</div><div class='add'>+	store_##NAME(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 cpu *cpu = container_of(dev, struct cpu, sysdev); \</div><div class='add'>+	struct cpu *cpu = container_of(dev, struct cpu, dev); \</div><div class='ctx'> 	unsigned long val; \</div><div class='ctx'> 	int ret = sscanf(buf, "%lx", &amp;val); \</div><div class='ctx'> 	if (ret != 1) \</div><div class='ctx'> 		return -EINVAL; \</div><div class='del'>-	smp_call_function_single(cpu-&gt;sysdev.id, write_##NAME, &amp;val, 1); \</div><div class='add'>+	smp_call_function_single(cpu-&gt;dev.id, write_##NAME, &amp;val, 1); \</div><div class='ctx'> 	return count; \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -177,23 +179,25 @@ SYSFS_PMCSETUP(mmcra, SPRN_MMCRA);</div><div class='ctx'> SYSFS_PMCSETUP(purr, SPRN_PURR);</div><div class='ctx'> SYSFS_PMCSETUP(spurr, SPRN_SPURR);</div><div class='ctx'> SYSFS_PMCSETUP(dscr, SPRN_DSCR);</div><div class='add'>+SYSFS_PMCSETUP(pir, SPRN_PIR);</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(mmcra, 0600, show_mmcra, store_mmcra);</div><div class='del'>-static SYSDEV_ATTR(spurr, 0600, show_spurr, NULL);</div><div class='del'>-static SYSDEV_ATTR(dscr, 0600, show_dscr, store_dscr);</div><div class='del'>-static SYSDEV_ATTR(purr, 0600, show_purr, store_purr);</div><div class='add'>+static DEVICE_ATTR(mmcra, 0600, show_mmcra, store_mmcra);</div><div class='add'>+static DEVICE_ATTR(spurr, 0600, show_spurr, NULL);</div><div class='add'>+static DEVICE_ATTR(dscr, 0600, show_dscr, store_dscr);</div><div class='add'>+static DEVICE_ATTR(purr, 0600, show_purr, store_purr);</div><div class='add'>+static DEVICE_ATTR(pir, 0400, show_pir, NULL);</div><div class='ctx'> </div><div class='ctx'> unsigned long dscr_default = 0;</div><div class='ctx'> EXPORT_SYMBOL(dscr_default);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_dscr_default(struct sysdev_class *class,</div><div class='del'>-		struct sysdev_class_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_dscr_default(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%lx\n", dscr_default);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t __used store_dscr_default(struct sysdev_class *class,</div><div class='del'>-		struct sysdev_class_attribute *attr, const char *buf,</div><div class='add'>+static ssize_t __used store_dscr_default(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, const char *buf,</div><div class='ctx'> 		size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long val;</div><div class='hunk'>@@ -207,15 +211,14 @@ static ssize_t __used store_dscr_default(struct sysdev_class *class,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(dscr_default, 0600,</div><div class='add'>+static DEVICE_ATTR(dscr_default, 0600,</div><div class='ctx'> 		show_dscr_default, store_dscr_default);</div><div class='ctx'> </div><div class='ctx'> static void sysfs_create_dscr_default(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_DSCR))</div><div class='del'>-		err = sysfs_create_file(&amp;cpu_sysdev_class.kset.kobj,</div><div class='del'>-			&amp;attr_dscr_default.attr);</div><div class='add'>+		err = device_create_file(cpu_subsys.dev_root, &amp;dev_attr_dscr_default);</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PPC64 */</div><div class='ctx'> </div><div class='hunk'>@@ -259,72 +262,72 @@ SYSFS_PMCSETUP(tsr3, SPRN_PA6T_TSR3);</div><div class='ctx'> #endif /* HAS_PPC_PMC_PA6T */</div><div class='ctx'> </div><div class='ctx'> #ifdef HAS_PPC_PMC_IBM</div><div class='del'>-static struct sysdev_attribute ibm_common_attrs[] = {</div><div class='del'>-	_SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),</div><div class='del'>-	_SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),</div><div class='add'>+static struct device_attribute ibm_common_attrs[] = {</div><div class='add'>+	__ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),</div><div class='add'>+	__ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),</div><div class='ctx'> };</div><div class='ctx'> #endif /* HAS_PPC_PMC_G4 */</div><div class='ctx'> </div><div class='ctx'> #ifdef HAS_PPC_PMC_G4</div><div class='del'>-static struct sysdev_attribute g4_common_attrs[] = {</div><div class='del'>-	_SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),</div><div class='del'>-	_SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),</div><div class='del'>-	_SYSDEV_ATTR(mmcr2, 0600, show_mmcr2, store_mmcr2),</div><div class='add'>+static struct device_attribute g4_common_attrs[] = {</div><div class='add'>+	__ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),</div><div class='add'>+	__ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),</div><div class='add'>+	__ATTR(mmcr2, 0600, show_mmcr2, store_mmcr2),</div><div class='ctx'> };</div><div class='ctx'> #endif /* HAS_PPC_PMC_G4 */</div><div class='ctx'> </div><div class='del'>-static struct sysdev_attribute classic_pmc_attrs[] = {</div><div class='del'>-	_SYSDEV_ATTR(pmc1, 0600, show_pmc1, store_pmc1),</div><div class='del'>-	_SYSDEV_ATTR(pmc2, 0600, show_pmc2, store_pmc2),</div><div class='del'>-	_SYSDEV_ATTR(pmc3, 0600, show_pmc3, store_pmc3),</div><div class='del'>-	_SYSDEV_ATTR(pmc4, 0600, show_pmc4, store_pmc4),</div><div class='del'>-	_SYSDEV_ATTR(pmc5, 0600, show_pmc5, store_pmc5),</div><div class='del'>-	_SYSDEV_ATTR(pmc6, 0600, show_pmc6, store_pmc6),</div><div class='add'>+static struct device_attribute classic_pmc_attrs[] = {</div><div class='add'>+	__ATTR(pmc1, 0600, show_pmc1, store_pmc1),</div><div class='add'>+	__ATTR(pmc2, 0600, show_pmc2, store_pmc2),</div><div class='add'>+	__ATTR(pmc3, 0600, show_pmc3, store_pmc3),</div><div class='add'>+	__ATTR(pmc4, 0600, show_pmc4, store_pmc4),</div><div class='add'>+	__ATTR(pmc5, 0600, show_pmc5, store_pmc5),</div><div class='add'>+	__ATTR(pmc6, 0600, show_pmc6, store_pmc6),</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='del'>-	_SYSDEV_ATTR(pmc7, 0600, show_pmc7, store_pmc7),</div><div class='del'>-	_SYSDEV_ATTR(pmc8, 0600, show_pmc8, store_pmc8),</div><div class='add'>+	__ATTR(pmc7, 0600, show_pmc7, store_pmc7),</div><div class='add'>+	__ATTR(pmc8, 0600, show_pmc8, store_pmc8),</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef HAS_PPC_PMC_PA6T</div><div class='del'>-static struct sysdev_attribute pa6t_attrs[] = {</div><div class='del'>-	_SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),</div><div class='del'>-	_SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),</div><div class='del'>-	_SYSDEV_ATTR(pmc0, 0600, show_pa6t_pmc0, store_pa6t_pmc0),</div><div class='del'>-	_SYSDEV_ATTR(pmc1, 0600, show_pa6t_pmc1, store_pa6t_pmc1),</div><div class='del'>-	_SYSDEV_ATTR(pmc2, 0600, show_pa6t_pmc2, store_pa6t_pmc2),</div><div class='del'>-	_SYSDEV_ATTR(pmc3, 0600, show_pa6t_pmc3, store_pa6t_pmc3),</div><div class='del'>-	_SYSDEV_ATTR(pmc4, 0600, show_pa6t_pmc4, store_pa6t_pmc4),</div><div class='del'>-	_SYSDEV_ATTR(pmc5, 0600, show_pa6t_pmc5, store_pa6t_pmc5),</div><div class='add'>+static struct device_attribute pa6t_attrs[] = {</div><div class='add'>+	__ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),</div><div class='add'>+	__ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),</div><div class='add'>+	__ATTR(pmc0, 0600, show_pa6t_pmc0, store_pa6t_pmc0),</div><div class='add'>+	__ATTR(pmc1, 0600, show_pa6t_pmc1, store_pa6t_pmc1),</div><div class='add'>+	__ATTR(pmc2, 0600, show_pa6t_pmc2, store_pa6t_pmc2),</div><div class='add'>+	__ATTR(pmc3, 0600, show_pa6t_pmc3, store_pa6t_pmc3),</div><div class='add'>+	__ATTR(pmc4, 0600, show_pa6t_pmc4, store_pa6t_pmc4),</div><div class='add'>+	__ATTR(pmc5, 0600, show_pa6t_pmc5, store_pa6t_pmc5),</div><div class='ctx'> #ifdef CONFIG_DEBUG_KERNEL</div><div class='del'>-	_SYSDEV_ATTR(hid0, 0600, show_hid0, store_hid0),</div><div class='del'>-	_SYSDEV_ATTR(hid1, 0600, show_hid1, store_hid1),</div><div class='del'>-	_SYSDEV_ATTR(hid4, 0600, show_hid4, store_hid4),</div><div class='del'>-	_SYSDEV_ATTR(hid5, 0600, show_hid5, store_hid5),</div><div class='del'>-	_SYSDEV_ATTR(ima0, 0600, show_ima0, store_ima0),</div><div class='del'>-	_SYSDEV_ATTR(ima1, 0600, show_ima1, store_ima1),</div><div class='del'>-	_SYSDEV_ATTR(ima2, 0600, show_ima2, store_ima2),</div><div class='del'>-	_SYSDEV_ATTR(ima3, 0600, show_ima3, store_ima3),</div><div class='del'>-	_SYSDEV_ATTR(ima4, 0600, show_ima4, store_ima4),</div><div class='del'>-	_SYSDEV_ATTR(ima5, 0600, show_ima5, store_ima5),</div><div class='del'>-	_SYSDEV_ATTR(ima6, 0600, show_ima6, store_ima6),</div><div class='del'>-	_SYSDEV_ATTR(ima7, 0600, show_ima7, store_ima7),</div><div class='del'>-	_SYSDEV_ATTR(ima8, 0600, show_ima8, store_ima8),</div><div class='del'>-	_SYSDEV_ATTR(ima9, 0600, show_ima9, store_ima9),</div><div class='del'>-	_SYSDEV_ATTR(imaat, 0600, show_imaat, store_imaat),</div><div class='del'>-	_SYSDEV_ATTR(btcr, 0600, show_btcr, store_btcr),</div><div class='del'>-	_SYSDEV_ATTR(pccr, 0600, show_pccr, store_pccr),</div><div class='del'>-	_SYSDEV_ATTR(rpccr, 0600, show_rpccr, store_rpccr),</div><div class='del'>-	_SYSDEV_ATTR(der, 0600, show_der, store_der),</div><div class='del'>-	_SYSDEV_ATTR(mer, 0600, show_mer, store_mer),</div><div class='del'>-	_SYSDEV_ATTR(ber, 0600, show_ber, store_ber),</div><div class='del'>-	_SYSDEV_ATTR(ier, 0600, show_ier, store_ier),</div><div class='del'>-	_SYSDEV_ATTR(sier, 0600, show_sier, store_sier),</div><div class='del'>-	_SYSDEV_ATTR(siar, 0600, show_siar, store_siar),</div><div class='del'>-	_SYSDEV_ATTR(tsr0, 0600, show_tsr0, store_tsr0),</div><div class='del'>-	_SYSDEV_ATTR(tsr1, 0600, show_tsr1, store_tsr1),</div><div class='del'>-	_SYSDEV_ATTR(tsr2, 0600, show_tsr2, store_tsr2),</div><div class='del'>-	_SYSDEV_ATTR(tsr3, 0600, show_tsr3, store_tsr3),</div><div class='add'>+	__ATTR(hid0, 0600, show_hid0, store_hid0),</div><div class='add'>+	__ATTR(hid1, 0600, show_hid1, store_hid1),</div><div class='add'>+	__ATTR(hid4, 0600, show_hid4, store_hid4),</div><div class='add'>+	__ATTR(hid5, 0600, show_hid5, store_hid5),</div><div class='add'>+	__ATTR(ima0, 0600, show_ima0, store_ima0),</div><div class='add'>+	__ATTR(ima1, 0600, show_ima1, store_ima1),</div><div class='add'>+	__ATTR(ima2, 0600, show_ima2, store_ima2),</div><div class='add'>+	__ATTR(ima3, 0600, show_ima3, store_ima3),</div><div class='add'>+	__ATTR(ima4, 0600, show_ima4, store_ima4),</div><div class='add'>+	__ATTR(ima5, 0600, show_ima5, store_ima5),</div><div class='add'>+	__ATTR(ima6, 0600, show_ima6, store_ima6),</div><div class='add'>+	__ATTR(ima7, 0600, show_ima7, store_ima7),</div><div class='add'>+	__ATTR(ima8, 0600, show_ima8, store_ima8),</div><div class='add'>+	__ATTR(ima9, 0600, show_ima9, store_ima9),</div><div class='add'>+	__ATTR(imaat, 0600, show_imaat, store_imaat),</div><div class='add'>+	__ATTR(btcr, 0600, show_btcr, store_btcr),</div><div class='add'>+	__ATTR(pccr, 0600, show_pccr, store_pccr),</div><div class='add'>+	__ATTR(rpccr, 0600, show_rpccr, store_rpccr),</div><div class='add'>+	__ATTR(der, 0600, show_der, store_der),</div><div class='add'>+	__ATTR(mer, 0600, show_mer, store_mer),</div><div class='add'>+	__ATTR(ber, 0600, show_ber, store_ber),</div><div class='add'>+	__ATTR(ier, 0600, show_ier, store_ier),</div><div class='add'>+	__ATTR(sier, 0600, show_sier, store_sier),</div><div class='add'>+	__ATTR(siar, 0600, show_siar, store_siar),</div><div class='add'>+	__ATTR(tsr0, 0600, show_tsr0, store_tsr0),</div><div class='add'>+	__ATTR(tsr1, 0600, show_tsr1, store_tsr1),</div><div class='add'>+	__ATTR(tsr2, 0600, show_tsr2, store_tsr2),</div><div class='add'>+	__ATTR(tsr3, 0600, show_tsr3, store_tsr3),</div><div class='ctx'> #endif /* CONFIG_DEBUG_KERNEL */</div><div class='ctx'> };</div><div class='ctx'> #endif /* HAS_PPC_PMC_PA6T */</div><div class='hunk'>@@ -333,14 +336,14 @@ static struct sysdev_attribute pa6t_attrs[] = {</div><div class='ctx'> static void __cpuinit register_cpu_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpu *c = &amp;per_cpu(cpu_devices, cpu);</div><div class='del'>-	struct sys_device *s = &amp;c-&gt;sysdev;</div><div class='del'>-	struct sysdev_attribute *attrs, *pmc_attrs;</div><div class='add'>+	struct device *s = &amp;c-&gt;dev;</div><div class='add'>+	struct device_attribute *attrs, *pmc_attrs;</div><div class='ctx'> 	int i, nattrs;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> 	if (!firmware_has_feature(FW_FEATURE_ISERIES) &amp;&amp;</div><div class='ctx'> 			cpu_has_feature(CPU_FTR_SMT))</div><div class='del'>-		sysdev_create_file(s, &amp;attr_smt_snooze_delay);</div><div class='add'>+		device_create_file(s, &amp;dev_attr_smt_snooze_delay);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* PMC stuff */</div><div class='hunk'>@@ -348,14 +351,14 @@ static void __cpuinit register_cpu_online(unsigned int cpu)</div><div class='ctx'> #ifdef HAS_PPC_PMC_IBM</div><div class='ctx'> 	case PPC_PMC_IBM:</div><div class='ctx'> 		attrs = ibm_common_attrs;</div><div class='del'>-		nattrs = sizeof(ibm_common_attrs) / sizeof(struct sysdev_attribute);</div><div class='add'>+		nattrs = sizeof(ibm_common_attrs) / sizeof(struct device_attribute);</div><div class='ctx'> 		pmc_attrs = classic_pmc_attrs;</div><div class='ctx'> 		break;</div><div class='ctx'> #endif /* HAS_PPC_PMC_IBM */</div><div class='ctx'> #ifdef HAS_PPC_PMC_G4</div><div class='ctx'> 	case PPC_PMC_G4:</div><div class='ctx'> 		attrs = g4_common_attrs;</div><div class='del'>-		nattrs = sizeof(g4_common_attrs) / sizeof(struct sysdev_attribute);</div><div class='add'>+		nattrs = sizeof(g4_common_attrs) / sizeof(struct device_attribute);</div><div class='ctx'> 		pmc_attrs = classic_pmc_attrs;</div><div class='ctx'> 		break;</div><div class='ctx'> #endif /* HAS_PPC_PMC_G4 */</div><div class='hunk'>@@ -363,7 +366,7 @@ static void __cpuinit register_cpu_online(unsigned int cpu)</div><div class='ctx'> 	case PPC_PMC_PA6T:</div><div class='ctx'> 		/* PA Semi starts counting at PMC0 */</div><div class='ctx'> 		attrs = pa6t_attrs;</div><div class='del'>-		nattrs = sizeof(pa6t_attrs) / sizeof(struct sysdev_attribute);</div><div class='add'>+		nattrs = sizeof(pa6t_attrs) / sizeof(struct device_attribute);</div><div class='ctx'> 		pmc_attrs = NULL;</div><div class='ctx'> 		break;</div><div class='ctx'> #endif /* HAS_PPC_PMC_PA6T */</div><div class='hunk'>@@ -374,24 +377,27 @@ static void __cpuinit register_cpu_online(unsigned int cpu)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nattrs; i++)</div><div class='del'>-		sysdev_create_file(s, &amp;attrs[i]);</div><div class='add'>+		device_create_file(s, &amp;attrs[i]);</div><div class='ctx'> </div><div class='ctx'> 	if (pmc_attrs)</div><div class='ctx'> 		for (i = 0; i &lt; cur_cpu_spec-&gt;num_pmcs; i++)</div><div class='del'>-			sysdev_create_file(s, &amp;pmc_attrs[i]);</div><div class='add'>+			device_create_file(s, &amp;pmc_attrs[i]);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_MMCRA))</div><div class='del'>-		sysdev_create_file(s, &amp;attr_mmcra);</div><div class='add'>+		device_create_file(s, &amp;dev_attr_mmcra);</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_PURR))</div><div class='del'>-		sysdev_create_file(s, &amp;attr_purr);</div><div class='add'>+		device_create_file(s, &amp;dev_attr_purr);</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_SPURR))</div><div class='del'>-		sysdev_create_file(s, &amp;attr_spurr);</div><div class='add'>+		device_create_file(s, &amp;dev_attr_spurr);</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_DSCR))</div><div class='del'>-		sysdev_create_file(s, &amp;attr_dscr);</div><div class='add'>+		device_create_file(s, &amp;dev_attr_dscr);</div><div class='add'>+</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_PPCAS_ARCH_V2))</div><div class='add'>+		device_create_file(s, &amp;dev_attr_pir);</div><div class='ctx'> #endif /* CONFIG_PPC64 */</div><div class='ctx'> </div><div class='ctx'> 	cacheinfo_cpu_online(cpu);</div><div class='hunk'>@@ -401,8 +407,8 @@ static void __cpuinit register_cpu_online(unsigned int cpu)</div><div class='ctx'> static void unregister_cpu_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpu *c = &amp;per_cpu(cpu_devices, cpu);</div><div class='del'>-	struct sys_device *s = &amp;c-&gt;sysdev;</div><div class='del'>-	struct sysdev_attribute *attrs, *pmc_attrs;</div><div class='add'>+	struct device *s = &amp;c-&gt;dev;</div><div class='add'>+	struct device_attribute *attrs, *pmc_attrs;</div><div class='ctx'> 	int i, nattrs;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!c-&gt;hotpluggable);</div><div class='hunk'>@@ -410,7 +416,7 @@ static void unregister_cpu_online(unsigned int cpu)</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> 	if (!firmware_has_feature(FW_FEATURE_ISERIES) &amp;&amp;</div><div class='ctx'> 			cpu_has_feature(CPU_FTR_SMT))</div><div class='del'>-		sysdev_remove_file(s, &amp;attr_smt_snooze_delay);</div><div class='add'>+		device_remove_file(s, &amp;dev_attr_smt_snooze_delay);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* PMC stuff */</div><div class='hunk'>@@ -418,14 +424,14 @@ static void unregister_cpu_online(unsigned int cpu)</div><div class='ctx'> #ifdef HAS_PPC_PMC_IBM</div><div class='ctx'> 	case PPC_PMC_IBM:</div><div class='ctx'> 		attrs = ibm_common_attrs;</div><div class='del'>-		nattrs = sizeof(ibm_common_attrs) / sizeof(struct sysdev_attribute);</div><div class='add'>+		nattrs = sizeof(ibm_common_attrs) / sizeof(struct device_attribute);</div><div class='ctx'> 		pmc_attrs = classic_pmc_attrs;</div><div class='ctx'> 		break;</div><div class='ctx'> #endif /* HAS_PPC_PMC_IBM */</div><div class='ctx'> #ifdef HAS_PPC_PMC_G4</div><div class='ctx'> 	case PPC_PMC_G4:</div><div class='ctx'> 		attrs = g4_common_attrs;</div><div class='del'>-		nattrs = sizeof(g4_common_attrs) / sizeof(struct sysdev_attribute);</div><div class='add'>+		nattrs = sizeof(g4_common_attrs) / sizeof(struct device_attribute);</div><div class='ctx'> 		pmc_attrs = classic_pmc_attrs;</div><div class='ctx'> 		break;</div><div class='ctx'> #endif /* HAS_PPC_PMC_G4 */</div><div class='hunk'>@@ -433,7 +439,7 @@ static void unregister_cpu_online(unsigned int cpu)</div><div class='ctx'> 	case PPC_PMC_PA6T:</div><div class='ctx'> 		/* PA Semi starts counting at PMC0 */</div><div class='ctx'> 		attrs = pa6t_attrs;</div><div class='del'>-		nattrs = sizeof(pa6t_attrs) / sizeof(struct sysdev_attribute);</div><div class='add'>+		nattrs = sizeof(pa6t_attrs) / sizeof(struct device_attribute);</div><div class='ctx'> 		pmc_attrs = NULL;</div><div class='ctx'> 		break;</div><div class='ctx'> #endif /* HAS_PPC_PMC_PA6T */</div><div class='hunk'>@@ -444,24 +450,27 @@ static void unregister_cpu_online(unsigned int cpu)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nattrs; i++)</div><div class='del'>-		sysdev_remove_file(s, &amp;attrs[i]);</div><div class='add'>+		device_remove_file(s, &amp;attrs[i]);</div><div class='ctx'> </div><div class='ctx'> 	if (pmc_attrs)</div><div class='ctx'> 		for (i = 0; i &lt; cur_cpu_spec-&gt;num_pmcs; i++)</div><div class='del'>-			sysdev_remove_file(s, &amp;pmc_attrs[i]);</div><div class='add'>+			device_remove_file(s, &amp;pmc_attrs[i]);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_MMCRA))</div><div class='del'>-		sysdev_remove_file(s, &amp;attr_mmcra);</div><div class='add'>+		device_remove_file(s, &amp;dev_attr_mmcra);</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_PURR))</div><div class='del'>-		sysdev_remove_file(s, &amp;attr_purr);</div><div class='add'>+		device_remove_file(s, &amp;dev_attr_purr);</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_SPURR))</div><div class='del'>-		sysdev_remove_file(s, &amp;attr_spurr);</div><div class='add'>+		device_remove_file(s, &amp;dev_attr_spurr);</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_DSCR))</div><div class='del'>-		sysdev_remove_file(s, &amp;attr_dscr);</div><div class='add'>+		device_remove_file(s, &amp;dev_attr_dscr);</div><div class='add'>+</div><div class='add'>+	if (cpu_has_feature(CPU_FTR_PPCAS_ARCH_V2))</div><div class='add'>+		device_remove_file(s, &amp;dev_attr_pir);</div><div class='ctx'> #endif /* CONFIG_PPC64 */</div><div class='ctx'> </div><div class='ctx'> 	cacheinfo_cpu_offline(cpu);</div><div class='hunk'>@@ -513,70 +522,70 @@ static struct notifier_block __cpuinitdata sysfs_cpu_nb = {</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(cpu_mutex);</div><div class='ctx'> </div><div class='del'>-int cpu_add_sysdev_attr(struct sysdev_attribute *attr)</div><div class='add'>+int cpu_add_dev_attr(struct device_attribute *attr)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;cpu_mutex);</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='del'>-		sysdev_create_file(get_cpu_sysdev(cpu), attr);</div><div class='add'>+		device_create_file(get_cpu_device(cpu), attr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;cpu_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpu_add_sysdev_attr);</div><div class='add'>+EXPORT_SYMBOL_GPL(cpu_add_dev_attr);</div><div class='ctx'> </div><div class='del'>-int cpu_add_sysdev_attr_group(struct attribute_group *attrs)</div><div class='add'>+int cpu_add_dev_attr_group(struct attribute_group *attrs)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='del'>-	struct sys_device *sysdev;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;cpu_mutex);</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='del'>-		sysdev = get_cpu_sysdev(cpu);</div><div class='del'>-		ret = sysfs_create_group(&amp;sysdev-&gt;kobj, attrs);</div><div class='add'>+		dev = get_cpu_device(cpu);</div><div class='add'>+		ret = sysfs_create_group(&amp;dev-&gt;kobj, attrs);</div><div class='ctx'> 		WARN_ON(ret != 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;cpu_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpu_add_sysdev_attr_group);</div><div class='add'>+EXPORT_SYMBOL_GPL(cpu_add_dev_attr_group);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-void cpu_remove_sysdev_attr(struct sysdev_attribute *attr)</div><div class='add'>+void cpu_remove_dev_attr(struct device_attribute *attr)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;cpu_mutex);</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='del'>-		sysdev_remove_file(get_cpu_sysdev(cpu), attr);</div><div class='add'>+		device_remove_file(get_cpu_device(cpu), attr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;cpu_mutex);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpu_remove_sysdev_attr);</div><div class='add'>+EXPORT_SYMBOL_GPL(cpu_remove_dev_attr);</div><div class='ctx'> </div><div class='del'>-void cpu_remove_sysdev_attr_group(struct attribute_group *attrs)</div><div class='add'>+void cpu_remove_dev_attr_group(struct attribute_group *attrs)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='del'>-	struct sys_device *sysdev;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;cpu_mutex);</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='del'>-		sysdev = get_cpu_sysdev(cpu);</div><div class='del'>-		sysfs_remove_group(&amp;sysdev-&gt;kobj, attrs);</div><div class='add'>+		dev = get_cpu_device(cpu);</div><div class='add'>+		sysfs_remove_group(&amp;dev-&gt;kobj, attrs);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;cpu_mutex);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(cpu_remove_sysdev_attr_group);</div><div class='add'>+EXPORT_SYMBOL_GPL(cpu_remove_dev_attr_group);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* NUMA stuff */</div><div class='hunk'>@@ -590,18 +599,18 @@ static void register_nodes(void)</div><div class='ctx'> 		register_one_node(i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int sysfs_add_device_to_node(struct sys_device *dev, int nid)</div><div class='add'>+int sysfs_add_device_to_node(struct device *dev, int nid)</div><div class='ctx'> {</div><div class='ctx'> 	struct node *node = &amp;node_devices[nid];</div><div class='del'>-	return sysfs_create_link(&amp;node-&gt;sysdev.kobj, &amp;dev-&gt;kobj,</div><div class='add'>+	return sysfs_create_link(&amp;node-&gt;dev.kobj, &amp;dev-&gt;kobj,</div><div class='ctx'> 			kobject_name(&amp;dev-&gt;kobj));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(sysfs_add_device_to_node);</div><div class='ctx'> </div><div class='del'>-void sysfs_remove_device_from_node(struct sys_device *dev, int nid)</div><div class='add'>+void sysfs_remove_device_from_node(struct device *dev, int nid)</div><div class='ctx'> {</div><div class='ctx'> 	struct node *node = &amp;node_devices[nid];</div><div class='del'>-	sysfs_remove_link(&amp;node-&gt;sysdev.kobj, kobject_name(&amp;dev-&gt;kobj));</div><div class='add'>+	sysfs_remove_link(&amp;node-&gt;dev.kobj, kobject_name(&amp;dev-&gt;kobj));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(sysfs_remove_device_from_node);</div><div class='ctx'> </div><div class='hunk'>@@ -614,14 +623,14 @@ static void register_nodes(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Only valid if CPU is present. */</div><div class='del'>-static ssize_t show_physical_id(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_physical_id(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct cpu *cpu = container_of(dev, struct cpu, sysdev);</div><div class='add'>+	struct cpu *cpu = container_of(dev, struct cpu, dev);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%d\n", get_hard_smp_processor_id(cpu-&gt;sysdev.id));</div><div class='add'>+	return sprintf(buf, "%d\n", get_hard_smp_processor_id(cpu-&gt;dev.id));</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_ATTR(physical_id, 0444, show_physical_id, NULL);</div><div class='add'>+static DEVICE_ATTR(physical_id, 0444, show_physical_id, NULL);</div><div class='ctx'> </div><div class='ctx'> static int __init topology_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -646,7 +655,7 @@ static int __init topology_init(void)</div><div class='ctx'> 		if (cpu_online(cpu) || c-&gt;hotpluggable) {</div><div class='ctx'> 			register_cpu(c, cpu);</div><div class='ctx'> </div><div class='del'>-			sysdev_create_file(&amp;c-&gt;sysdev, &amp;attr_physical_id);</div><div class='add'>+			device_create_file(&amp;c-&gt;dev, &amp;dev_attr_physical_id);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (cpu_online(cpu))</div><div class='head'>diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c<br/>index 522bb1dfc353..567dd7c3ac2a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/time.c</a></div><div class='hunk'>@@ -86,8 +86,6 @@ static struct clocksource clocksource_rtc = {</div><div class='ctx'> 	.rating       = 400,</div><div class='ctx'> 	.flags        = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='ctx'> 	.mask         = CLOCKSOURCE_MASK(64),</div><div class='del'>-	.shift        = 22,</div><div class='del'>-	.mult         = 0,	/* To be filled in */</div><div class='ctx'> 	.read         = rtc_read,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -97,8 +95,6 @@ static struct clocksource clocksource_timebase = {</div><div class='ctx'> 	.rating       = 400,</div><div class='ctx'> 	.flags        = CLOCK_SOURCE_IS_CONTINUOUS,</div><div class='ctx'> 	.mask         = CLOCKSOURCE_MASK(64),</div><div class='del'>-	.shift        = 22,</div><div class='del'>-	.mult         = 0,	/* To be filled in */</div><div class='ctx'> 	.read         = timebase_read,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -110,22 +106,16 @@ static void decrementer_set_mode(enum clock_event_mode mode,</div><div class='ctx'> 				 struct clock_event_device *dev);</div><div class='ctx'> </div><div class='ctx'> static struct clock_event_device decrementer_clockevent = {</div><div class='del'>-       .name           = "decrementer",</div><div class='del'>-       .rating         = 200,</div><div class='del'>-       .shift          = 0,	/* To be filled in */</div><div class='del'>-       .mult           = 0,	/* To be filled in */</div><div class='del'>-       .irq            = 0,</div><div class='del'>-       .set_next_event = decrementer_set_next_event,</div><div class='del'>-       .set_mode       = decrementer_set_mode,</div><div class='del'>-       .features       = CLOCK_EVT_FEAT_ONESHOT,</div><div class='add'>+	.name           = "decrementer",</div><div class='add'>+	.rating         = 200,</div><div class='add'>+	.irq            = 0,</div><div class='add'>+	.set_next_event = decrementer_set_next_event,</div><div class='add'>+	.set_mode       = decrementer_set_mode,</div><div class='add'>+	.features       = CLOCK_EVT_FEAT_ONESHOT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct decrementer_clock {</div><div class='del'>-	struct clock_event_device event;</div><div class='del'>-	u64 next_tb;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static DEFINE_PER_CPU(struct decrementer_clock, decrementers);</div><div class='add'>+DEFINE_PER_CPU(u64, decrementers_next_tb);</div><div class='add'>+static DEFINE_PER_CPU(struct clock_event_device, decrementers);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_ISERIES</div><div class='ctx'> static unsigned long __initdata iSeries_recal_titan;</div><div class='hunk'>@@ -168,13 +158,13 @@ EXPORT_SYMBOL_GPL(ppc_tb_freq);</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='ctx'> /*</div><div class='ctx'>  * Factors for converting from cputime_t (timebase ticks) to</div><div class='del'>- * jiffies, milliseconds, seconds, and clock_t (1/USER_HZ seconds).</div><div class='add'>+ * jiffies, microseconds, seconds, and clock_t (1/USER_HZ seconds).</div><div class='ctx'>  * These are all stored as 0.64 fixed-point binary fractions.</div><div class='ctx'>  */</div><div class='ctx'> u64 __cputime_jiffies_factor;</div><div class='ctx'> EXPORT_SYMBOL(__cputime_jiffies_factor);</div><div class='del'>-u64 __cputime_msec_factor;</div><div class='del'>-EXPORT_SYMBOL(__cputime_msec_factor);</div><div class='add'>+u64 __cputime_usec_factor;</div><div class='add'>+EXPORT_SYMBOL(__cputime_usec_factor);</div><div class='ctx'> u64 __cputime_sec_factor;</div><div class='ctx'> EXPORT_SYMBOL(__cputime_sec_factor);</div><div class='ctx'> u64 __cputime_clockt_factor;</div><div class='hunk'>@@ -192,8 +182,8 @@ static void calc_cputime_factors(void)</div><div class='ctx'> </div><div class='ctx'> 	div128_by_32(HZ, 0, tb_ticks_per_sec, &amp;res);</div><div class='ctx'> 	__cputime_jiffies_factor = res.result_low;</div><div class='del'>-	div128_by_32(1000, 0, tb_ticks_per_sec, &amp;res);</div><div class='del'>-	__cputime_msec_factor = res.result_low;</div><div class='add'>+	div128_by_32(1000000, 0, tb_ticks_per_sec, &amp;res);</div><div class='add'>+	__cputime_usec_factor = res.result_low;</div><div class='ctx'> 	div128_by_32(1, 0, tb_ticks_per_sec, &amp;res);</div><div class='ctx'> 	__cputime_sec_factor = res.result_low;</div><div class='ctx'> 	div128_by_32(USER_HZ, 0, tb_ticks_per_sec, &amp;res);</div><div class='hunk'>@@ -441,7 +431,7 @@ EXPORT_SYMBOL(profile_pc);</div><div class='ctx'> /* </div><div class='ctx'>  * This function recalibrates the timebase based on the 49-bit time-of-day</div><div class='ctx'>  * value in the Titan chip.  The Titan is much more accurate than the value</div><div class='del'>- * returned by the service processor for the timebase frequency.  </div><div class='add'>+ * returned by the service processor for the timebase frequency.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int __init iSeries_tb_recal(void)</div><div class='hunk'>@@ -576,9 +566,8 @@ void arch_irq_work_raise(void)</div><div class='ctx'> void timer_interrupt(struct pt_regs * regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct pt_regs *old_regs;</div><div class='del'>-	struct decrementer_clock *decrementer =  &amp;__get_cpu_var(decrementers);</div><div class='del'>-	struct clock_event_device *evt = &amp;decrementer-&gt;event;</div><div class='del'>-	u64 now;</div><div class='add'>+	u64 *next_tb = &amp;__get_cpu_var(decrementers_next_tb);</div><div class='add'>+	struct clock_event_device *evt = &amp;__get_cpu_var(decrementers);</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure a positive value is written to the decrementer, or else</div><div class='ctx'> 	 * some CPUs will continue to take decrementer exceptions.</div><div class='hunk'>@@ -613,16 +602,9 @@ void timer_interrupt(struct pt_regs * regs)</div><div class='ctx'> 		get_lppaca()-&gt;int_dword.fields.decr_int = 0;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	now = get_tb_or_rtc();</div><div class='del'>-	if (now &gt;= decrementer-&gt;next_tb) {</div><div class='del'>-		decrementer-&gt;next_tb = ~(u64)0;</div><div class='del'>-		if (evt-&gt;event_handler)</div><div class='del'>-			evt-&gt;event_handler(evt);</div><div class='del'>-	} else {</div><div class='del'>-		now = decrementer-&gt;next_tb - now;</div><div class='del'>-		if (now &lt;= DECREMENTER_MAX)</div><div class='del'>-			set_dec((int)now);</div><div class='del'>-	}</div><div class='add'>+	*next_tb = ~(u64)0;</div><div class='add'>+	if (evt-&gt;event_handler)</div><div class='add'>+		evt-&gt;event_handler(evt);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_ISERIES</div><div class='ctx'> 	if (firmware_has_feature(FW_FEATURE_ISERIES) &amp;&amp; hvlpevent_is_pending())</div><div class='hunk'>@@ -650,9 +632,9 @@ static void generic_suspend_disable_irqs(void)</div><div class='ctx'> 	 * with suspending.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	set_dec(0x7fffffff);</div><div class='add'>+	set_dec(DECREMENTER_MAX);</div><div class='ctx'> 	local_irq_disable();</div><div class='del'>-	set_dec(0x7fffffff);</div><div class='add'>+	set_dec(DECREMENTER_MAX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void generic_suspend_enable_irqs(void)</div><div class='hunk'>@@ -824,9 +806,8 @@ void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,</div><div class='ctx'> 	++vdso_data-&gt;tb_update_count;</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> </div><div class='del'>-	/* XXX this assumes clock-&gt;shift == 22 */</div><div class='del'>-	/* 4611686018 ~= 2^(20+64-22) / 1e9 */</div><div class='del'>-	new_tb_to_xs = (u64) mult * 4611686018ULL;</div><div class='add'>+	/* 19342813113834067 ~= 2^(20+64) / 1e9 */</div><div class='add'>+	new_tb_to_xs = (u64) mult * (19342813113834067ULL &gt;&gt; clock-&gt;shift);</div><div class='ctx'> 	new_stamp_xsec = (u64) wall_time-&gt;tv_nsec * XSEC_PER_SEC;</div><div class='ctx'> 	do_div(new_stamp_xsec, 1000000000);</div><div class='ctx'> 	new_stamp_xsec += (u64) wall_time-&gt;tv_sec * XSEC_PER_SEC;</div><div class='hunk'>@@ -877,9 +858,7 @@ static void __init clocksource_init(void)</div><div class='ctx'> 	else</div><div class='ctx'> 		clock = &amp;clocksource_timebase;</div><div class='ctx'> </div><div class='del'>-	clock-&gt;mult = clocksource_hz2mult(tb_ticks_per_sec, clock-&gt;shift);</div><div class='del'>-</div><div class='del'>-	if (clocksource_register(clock)) {</div><div class='add'>+	if (clocksource_register_hz(clock, tb_ticks_per_sec)) {</div><div class='ctx'> 		printk(KERN_ERR "clocksource: %s is already registered\n",</div><div class='ctx'> 		       clock-&gt;name);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -892,7 +871,7 @@ static void __init clocksource_init(void)</div><div class='ctx'> static int decrementer_set_next_event(unsigned long evt,</div><div class='ctx'> 				      struct clock_event_device *dev)</div><div class='ctx'> {</div><div class='del'>-	__get_cpu_var(decrementers).next_tb = get_tb_or_rtc() + evt;</div><div class='add'>+	__get_cpu_var(decrementers_next_tb) = get_tb_or_rtc() + evt;</div><div class='ctx'> 	set_dec(evt);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -904,34 +883,9 @@ static void decrementer_set_mode(enum clock_event_mode mode,</div><div class='ctx'> 		decrementer_set_next_event(DECREMENTER_MAX, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline uint64_t div_sc64(unsigned long ticks, unsigned long nsec,</div><div class='del'>-				int shift)</div><div class='del'>-{</div><div class='del'>-	uint64_t tmp = ((uint64_t)ticks) &lt;&lt; shift;</div><div class='del'>-</div><div class='del'>-	do_div(tmp, nsec);</div><div class='del'>-	return tmp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init setup_clockevent_multiplier(unsigned long hz)</div><div class='del'>-{</div><div class='del'>-	u64 mult, shift = 32;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		mult = div_sc64(hz, NSEC_PER_SEC, shift);</div><div class='del'>-		if (mult &amp;&amp; (mult &gt;&gt; 32UL) == 0UL)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		shift--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	decrementer_clockevent.shift = shift;</div><div class='del'>-	decrementer_clockevent.mult = mult;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void register_decrementer_clockevent(int cpu)</div><div class='ctx'> {</div><div class='del'>-	struct clock_event_device *dec = &amp;per_cpu(decrementers, cpu).event;</div><div class='add'>+	struct clock_event_device *dec = &amp;per_cpu(decrementers, cpu);</div><div class='ctx'> </div><div class='ctx'> 	*dec = decrementer_clockevent;</div><div class='ctx'> 	dec-&gt;cpumask = cpumask_of(cpu);</div><div class='hunk'>@@ -946,7 +900,8 @@ static void __init init_decrementer_clockevent(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='ctx'> </div><div class='del'>-	setup_clockevent_multiplier(ppc_tb_freq);</div><div class='add'>+	clockevents_calc_mult_shift(&amp;decrementer_clockevent, ppc_tb_freq, 4);</div><div class='add'>+</div><div class='ctx'> 	decrementer_clockevent.max_delta_ns =</div><div class='ctx'> 		clockevent_delta2ns(DECREMENTER_MAX, &amp;decrementer_clockevent);</div><div class='ctx'> 	decrementer_clockevent.min_delta_ns =</div><div class='hunk'>@@ -1014,10 +969,10 @@ void __init time_init(void)</div><div class='ctx'> 	boot_tb = get_tb_or_rtc();</div><div class='ctx'> </div><div class='ctx'> 	/* If platform provided a timezone (pmac), we correct the time */</div><div class='del'>-        if (timezone_offset) {</div><div class='add'>+	if (timezone_offset) {</div><div class='ctx'> 		sys_tz.tz_minuteswest = -timezone_offset / 60;</div><div class='ctx'> 		sys_tz.tz_dsttime = 0;</div><div class='del'>-        }</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	vdso_data-&gt;tb_update_count = 0;</div><div class='ctx'> 	vdso_data-&gt;tb_ticks_per_sec = tb_ticks_per_sec;</div><div class='head'>diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c<br/>index 5459d148a0f6..c091527efd89 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/traps.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/traps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/traps.c</a></div><div class='hunk'>@@ -98,18 +98,14 @@ static void pmac_backlight_unblank(void)</div><div class='ctx'> static inline void pmac_backlight_unblank(void) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int die(const char *str, struct pt_regs *regs, long err)</div><div class='add'>+static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;</div><div class='add'>+static int die_owner = -1;</div><div class='add'>+static unsigned int die_nest_count;</div><div class='add'>+static int die_counter;</div><div class='add'>+</div><div class='add'>+static unsigned __kprobes long oops_begin(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	static struct {</div><div class='del'>-		raw_spinlock_t lock;</div><div class='del'>-		u32 lock_owner;</div><div class='del'>-		int lock_owner_depth;</div><div class='del'>-	} die = {</div><div class='del'>-		.lock =			__RAW_SPIN_LOCK_UNLOCKED(die.lock),</div><div class='del'>-		.lock_owner =		-1,</div><div class='del'>-		.lock_owner_depth =	0</div><div class='del'>-	};</div><div class='del'>-	static int die_counter;</div><div class='add'>+	int cpu;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (debugger(regs))</div><div class='hunk'>@@ -117,66 +113,109 @@ int die(const char *str, struct pt_regs *regs, long err)</div><div class='ctx'> </div><div class='ctx'> 	oops_enter();</div><div class='ctx'> </div><div class='del'>-	if (die.lock_owner != raw_smp_processor_id()) {</div><div class='del'>-		console_verbose();</div><div class='del'>-		raw_spin_lock_irqsave(&amp;die.lock, flags);</div><div class='del'>-		die.lock_owner = smp_processor_id();</div><div class='del'>-		die.lock_owner_depth = 0;</div><div class='del'>-		bust_spinlocks(1);</div><div class='del'>-		if (machine_is(powermac))</div><div class='del'>-			pmac_backlight_unblank();</div><div class='del'>-	} else {</div><div class='del'>-		local_save_flags(flags);</div><div class='add'>+	/* racy, but better than risking deadlock. */</div><div class='add'>+	raw_local_irq_save(flags);</div><div class='add'>+	cpu = smp_processor_id();</div><div class='add'>+	if (!arch_spin_trylock(&amp;die_lock)) {</div><div class='add'>+		if (cpu == die_owner)</div><div class='add'>+			/* nested oops. should stop eventually */;</div><div class='add'>+		else</div><div class='add'>+			arch_spin_lock(&amp;die_lock);</div><div class='ctx'> 	}</div><div class='add'>+	die_nest_count++;</div><div class='add'>+	die_owner = cpu;</div><div class='add'>+	console_verbose();</div><div class='add'>+	bust_spinlocks(1);</div><div class='add'>+	if (machine_is(powermac))</div><div class='add'>+		pmac_backlight_unblank();</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (++die.lock_owner_depth &lt; 3) {</div><div class='del'>-		printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter);</div><div class='del'>-#ifdef CONFIG_PREEMPT</div><div class='del'>-		printk("PREEMPT ");</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-		printk("SMP NR_CPUS=%d ", NR_CPUS);</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_DEBUG_PAGEALLOC</div><div class='del'>-		printk("DEBUG_PAGEALLOC ");</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_NUMA</div><div class='del'>-		printk("NUMA ");</div><div class='del'>-#endif</div><div class='del'>-		printk("%s\n", ppc_md.name ? ppc_md.name : "");</div><div class='add'>+static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,</div><div class='add'>+			       int signr)</div><div class='add'>+{</div><div class='add'>+	bust_spinlocks(0);</div><div class='add'>+	die_owner = -1;</div><div class='add'>+	add_taint(TAINT_DIE);</div><div class='add'>+	die_nest_count--;</div><div class='add'>+	oops_exit();</div><div class='add'>+	printk("\n");</div><div class='add'>+	if (!die_nest_count)</div><div class='add'>+		/* Nest count reaches zero, release the lock. */</div><div class='add'>+		arch_spin_unlock(&amp;die_lock);</div><div class='add'>+	raw_local_irq_restore(flags);</div><div class='ctx'> </div><div class='del'>-		if (notify_die(DIE_OOPS, str, regs, err, 255,</div><div class='del'>-			       SIGSEGV) == NOTIFY_STOP)</div><div class='del'>-			return 1;</div><div class='add'>+	/*</div><div class='add'>+	 * A system reset (0x100) is a request to dump, so we always send</div><div class='add'>+	 * it through the crashdump code.</div><div class='add'>+	 */</div><div class='add'>+	if (kexec_should_crash(current) || (TRAP(regs) == 0x100)) {</div><div class='add'>+		crash_kexec(regs);</div><div class='ctx'> </div><div class='del'>-		print_modules();</div><div class='del'>-		show_regs(regs);</div><div class='del'>-	} else {</div><div class='del'>-		printk("Recursive die() failure, output suppressed\n");</div><div class='add'>+		/*</div><div class='add'>+		 * We aren't the primary crash CPU. We need to send it</div><div class='add'>+		 * to a holding pattern to avoid it ending up in the panic</div><div class='add'>+		 * code.</div><div class='add'>+		 */</div><div class='add'>+		crash_kexec_secondary(regs);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bust_spinlocks(0);</div><div class='del'>-	die.lock_owner = -1;</div><div class='del'>-	add_taint(TAINT_DIE);</div><div class='del'>-	raw_spin_unlock_irqrestore(&amp;die.lock, flags);</div><div class='add'>+	if (!signr)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (kexec_should_crash(current) ||</div><div class='del'>-		kexec_sr_activated(smp_processor_id()))</div><div class='del'>-		crash_kexec(regs);</div><div class='del'>-	crash_kexec_secondary(regs);</div><div class='add'>+	/*</div><div class='add'>+	 * While our oops output is serialised by a spinlock, output</div><div class='add'>+	 * from panic() called below can race and corrupt it. If we</div><div class='add'>+	 * know we are going to panic, delay for 1 second so we have a</div><div class='add'>+	 * chance to get clean backtraces from all CPUs that are oopsing.</div><div class='add'>+	 */</div><div class='add'>+	if (in_interrupt() || panic_on_oops || !current-&gt;pid ||</div><div class='add'>+	    is_global_init(current)) {</div><div class='add'>+		mdelay(MSEC_PER_SEC);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (in_interrupt())</div><div class='ctx'> 		panic("Fatal exception in interrupt");</div><div class='del'>-</div><div class='ctx'> 	if (panic_on_oops)</div><div class='ctx'> 		panic("Fatal exception");</div><div class='add'>+	do_exit(signr);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	oops_exit();</div><div class='del'>-	do_exit(err);</div><div class='add'>+static int __kprobes __die(const char *str, struct pt_regs *regs, long err)</div><div class='add'>+{</div><div class='add'>+	printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter);</div><div class='add'>+#ifdef CONFIG_PREEMPT</div><div class='add'>+	printk("PREEMPT ");</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	printk("SMP NR_CPUS=%d ", NR_CPUS);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_DEBUG_PAGEALLOC</div><div class='add'>+	printk("DEBUG_PAGEALLOC ");</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_NUMA</div><div class='add'>+	printk("NUMA ");</div><div class='add'>+#endif</div><div class='add'>+	printk("%s\n", ppc_md.name ? ppc_md.name : "");</div><div class='add'>+</div><div class='add'>+	if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV) == NOTIFY_STOP)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	print_modules();</div><div class='add'>+	show_regs(regs);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void die(const char *str, struct pt_regs *regs, long err)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags = oops_begin(regs);</div><div class='add'>+</div><div class='add'>+	if (__die(str, regs, err))</div><div class='add'>+		err = 0;</div><div class='add'>+	oops_end(flags, regs, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void user_single_step_siginfo(struct task_struct *tsk,</div><div class='ctx'> 				struct pt_regs *regs, siginfo_t *info)</div><div class='ctx'> {</div><div class='hunk'>@@ -195,10 +234,11 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)</div><div class='ctx'> 			"at %016lx nip %016lx lr %016lx code %x\n";</div><div class='ctx'> </div><div class='ctx'> 	if (!user_mode(regs)) {</div><div class='del'>-		if (die("Exception in kernel mode", regs, signr))</div><div class='del'>-			return;</div><div class='del'>-	} else if (show_unhandled_signals &amp;&amp;</div><div class='del'>-		   unhandled_signal(current, signr)) {</div><div class='add'>+		die("Exception in kernel mode", regs, signr);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (show_unhandled_signals &amp;&amp; unhandled_signal(current, signr)) {</div><div class='ctx'> 		printk_ratelimited(regs-&gt;msr &amp; MSR_64BIT ? fmt64 : fmt32,</div><div class='ctx'> 				   current-&gt;comm, current-&gt;pid, signr,</div><div class='ctx'> 				   addr, regs-&gt;nip, regs-&gt;link, code);</div><div class='hunk'>@@ -220,25 +260,8 @@ void system_reset_exception(struct pt_regs *regs)</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='del'>-	cpumask_set_cpu(smp_processor_id(), &amp;cpus_in_sr);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	die("System Reset", regs, SIGABRT);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Some CPUs when released from the debugger will execute this path.</div><div class='del'>-	 * These CPUs entered the debugger via a soft-reset. If the CPU was</div><div class='del'>-	 * hung before entering the debugger it will return to the hung</div><div class='del'>-	 * state when exiting this function.  This causes a problem in</div><div class='del'>-	 * kdump since the hung CPU(s) will not respond to the IPI sent</div><div class='del'>-	 * from kdump. To prevent the problem we call crash_kexec_secondary()</div><div class='del'>-	 * here. If a kdump had not been initiated or we exit the debugger</div><div class='del'>-	 * with the "exit and recover" command (x) crash_kexec_secondary()</div><div class='del'>-	 * will return after 5ms and the CPU returns to its previous state.</div><div class='del'>-	 */</div><div class='del'>-	crash_kexec_secondary(regs);</div><div class='del'>-</div><div class='ctx'> 	/* Must die if the interrupt is not recoverable */</div><div class='ctx'> 	if (!(regs-&gt;msr &amp; MSR_RI))</div><div class='ctx'> 		panic("Unrecoverable System Reset");</div><div class='head'>diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c<br/>index f65af61996bd..8b086299ba25 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/vio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/vio.c</a></div><div class='hunk'>@@ -1406,7 +1406,6 @@ static struct bus_type vio_bus_type = {</div><div class='ctx'> 	.match = vio_bus_match,</div><div class='ctx'> 	.probe = vio_bus_probe,</div><div class='ctx'> 	.remove = vio_bus_remove,</div><div class='del'>-	.pm = GENERIC_SUBSYS_PM_OPS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S<br/>index 920276c0f6a1..710a54005dfb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vmlinux.lds.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vmlinux.lds.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -170,7 +170,13 @@ SECTIONS</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_RELOCATABLE</div><div class='ctx'> 	. = ALIGN(8);</div><div class='del'>-	.dynsym : AT(ADDR(.dynsym) - LOAD_OFFSET) { *(.dynsym) }</div><div class='add'>+	.dynsym : AT(ADDR(.dynsym) - LOAD_OFFSET)</div><div class='add'>+	{</div><div class='add'>+#ifdef CONFIG_RELOCATABLE_PPC32</div><div class='add'>+		__dynamic_symtab = .;</div><div class='add'>+#endif</div><div class='add'>+		*(.dynsym)</div><div class='add'>+	}</div><div class='ctx'> 	.dynstr : AT(ADDR(.dynstr) - LOAD_OFFSET) { *(.dynstr) }</div><div class='ctx'> 	.dynamic : AT(ADDR(.dynamic) - LOAD_OFFSET)</div><div class='ctx'> 	{</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c<br/>index a459479995c6..e41ac6f7dcf1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kvm/book3s.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kvm/book3s.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kvm/book3s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kvm/book3s.c</a></div><div class='hunk'>@@ -498,7 +498,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,</div><div class='ctx'> </div><div class='ctx'> 	/* If nothing is dirty, don't bother messing with page tables. */</div><div class='ctx'> 	if (is_dirty) {</div><div class='del'>-		memslot = &amp;kvm-&gt;memslots-&gt;memslots[log-&gt;slot];</div><div class='add'>+		memslot = id_to_memslot(kvm-&gt;memslots, log-&gt;slot);</div><div class='ctx'> </div><div class='ctx'> 		ga = memslot-&gt;base_gfn &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 		ga_end = ga + (memslot-&gt;npages &lt;&lt; PAGE_SHIFT);</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s_hv_builtin.c<br/>index 286f13d601cf..a795a13f4a70 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kvm/book3s_hv_builtin.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kvm/book3s_hv_builtin.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kvm/book3s_hv_builtin.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kvm/book3s_hv_builtin.c</a></div><div class='hunk'>@@ -86,7 +86,7 @@ static inline int lpcr_rmls(unsigned long rma_size)</div><div class='ctx'>  * to allocate contiguous physical memory for the real memory</div><div class='ctx'>  * areas for guests.</div><div class='ctx'>  */</div><div class='del'>-void kvm_rma_init(void)</div><div class='add'>+void __init kvm_rma_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long i;</div><div class='ctx'> 	unsigned long j, npages;</div><div class='head'>diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S<br/>index 44d8829334ab..5c8b26183f50 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kvm/book3s_hv_rmhandlers.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/kvm/book3s_hv_rmhandlers.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kvm/book3s_hv_rmhandlers.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/kvm/book3s_hv_rmhandlers.S</a></div><div class='hunk'>@@ -112,6 +112,9 @@ kvm_start_guest:</div><div class='ctx'> 	stbcix	r0, r5, r6		/* clear it */</div><div class='ctx'> 	stwcix	r8, r5, r7		/* EOI it */</div><div class='ctx'> </div><div class='add'>+	/* NV GPR values from power7_idle() will no longer be valid */</div><div class='add'>+	stb	r0, PACA_NAPSTATELOST(r13)</div><div class='add'>+</div><div class='ctx'> .global kvmppc_hv_entry</div><div class='ctx'> kvmppc_hv_entry:</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile<br/>index 166a6a0ad544..7735a2c2e6d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/lib/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/lib/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/lib/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/lib/Makefile</a></div><div class='hunk'>@@ -16,13 +16,15 @@ obj-$(CONFIG_HAS_IOMEM)	+= devres.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PPC64)	+= copypage_64.o copyuser_64.o \</div><div class='ctx'> 			   memcpy_64.o usercopy_64.o mem_64.o string.o \</div><div class='del'>-			   checksum_wrappers_64.o hweight_64.o</div><div class='add'>+			   checksum_wrappers_64.o hweight_64.o \</div><div class='add'>+			   copyuser_power7.o</div><div class='ctx'> obj-$(CONFIG_XMON)	+= sstep.o ldstfp.o</div><div class='ctx'> obj-$(CONFIG_KPROBES)	+= sstep.o ldstfp.o</div><div class='ctx'> obj-$(CONFIG_HAVE_HW_BREAKPOINT)	+= sstep.o ldstfp.o</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_PPC64),y)</div><div class='ctx'> obj-$(CONFIG_SMP)	+= locks.o</div><div class='add'>+obj-$(CONFIG_ALTIVEC)	+= copyuser_power7_vmx.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o</div><div class='head'>diff --git a/arch/powerpc/lib/copyuser_64.S b/arch/powerpc/lib/copyuser_64.S<br/>index 578b625d6a3c..773d38f90aaa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/lib/copyuser_64.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/lib/copyuser_64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/lib/copyuser_64.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/lib/copyuser_64.S</a></div><div class='hunk'>@@ -11,6 +11,12 @@</div><div class='ctx'> </div><div class='ctx'> 	.align	7</div><div class='ctx'> _GLOBAL(__copy_tofrom_user)</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='add'>+	nop</div><div class='add'>+FTR_SECTION_ELSE</div><div class='add'>+	b	__copy_tofrom_user_power7</div><div class='add'>+ALT_FTR_SECTION_END_IFCLR(CPU_FTR_VMX_COPY)</div><div class='add'>+_GLOBAL(__copy_tofrom_user_base)</div><div class='ctx'> 	/* first check for a whole page copy on a page boundary */</div><div class='ctx'> 	cmpldi	cr1,r5,16</div><div class='ctx'> 	cmpdi	cr6,r5,4096</div><div class='head'>diff --git a/arch/powerpc/lib/copyuser_power7.S b/arch/powerpc/lib/copyuser_power7.S<br/>new file mode 100644<br/>index 000000000000..497db7b23bb1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/lib/copyuser_power7.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/lib/copyuser_power7.S</a></div><div class='hunk'>@@ -0,0 +1,683 @@</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'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) IBM Corporation, 2011</div><div class='add'>+ *</div><div class='add'>+ * Author: Anton Blanchard &lt;anton@au.ibm.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;asm/ppc_asm.h&gt;</div><div class='add'>+</div><div class='add'>+#define STACKFRAMESIZE	256</div><div class='add'>+#define STK_REG(i)	(112 + ((i)-14)*8)</div><div class='add'>+</div><div class='add'>+	.macro err1</div><div class='add'>+100:</div><div class='add'>+	.section __ex_table,"a"</div><div class='add'>+	.align 3</div><div class='add'>+	.llong 100b,.Ldo_err1</div><div class='add'>+	.previous</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro err2</div><div class='add'>+200:</div><div class='add'>+	.section __ex_table,"a"</div><div class='add'>+	.align 3</div><div class='add'>+	.llong 200b,.Ldo_err2</div><div class='add'>+	.previous</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ALTIVEC</div><div class='add'>+	.macro err3</div><div class='add'>+300:</div><div class='add'>+	.section __ex_table,"a"</div><div class='add'>+	.align 3</div><div class='add'>+	.llong 300b,.Ldo_err3</div><div class='add'>+	.previous</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro err4</div><div class='add'>+400:</div><div class='add'>+	.section __ex_table,"a"</div><div class='add'>+	.align 3</div><div class='add'>+	.llong 400b,.Ldo_err4</div><div class='add'>+	.previous</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.Ldo_err4:</div><div class='add'>+	ld	r16,STK_REG(r16)(r1)</div><div class='add'>+	ld	r15,STK_REG(r15)(r1)</div><div class='add'>+	ld	r14,STK_REG(r14)(r1)</div><div class='add'>+.Ldo_err3:</div><div class='add'>+	bl	.exit_vmx_copy</div><div class='add'>+	ld	r0,STACKFRAMESIZE+16(r1)</div><div class='add'>+	mtlr	r0</div><div class='add'>+	b	.Lexit</div><div class='add'>+#endif /* CONFIG_ALTIVEC */</div><div class='add'>+</div><div class='add'>+.Ldo_err2:</div><div class='add'>+	ld	r22,STK_REG(r22)(r1)</div><div class='add'>+	ld	r21,STK_REG(r21)(r1)</div><div class='add'>+	ld	r20,STK_REG(r20)(r1)</div><div class='add'>+	ld	r19,STK_REG(r19)(r1)</div><div class='add'>+	ld	r18,STK_REG(r18)(r1)</div><div class='add'>+	ld	r17,STK_REG(r17)(r1)</div><div class='add'>+	ld	r16,STK_REG(r16)(r1)</div><div class='add'>+	ld	r15,STK_REG(r15)(r1)</div><div class='add'>+	ld	r14,STK_REG(r14)(r1)</div><div class='add'>+.Lexit:</div><div class='add'>+	addi	r1,r1,STACKFRAMESIZE</div><div class='add'>+.Ldo_err1:</div><div class='add'>+	ld	r3,48(r1)</div><div class='add'>+	ld	r4,56(r1)</div><div class='add'>+	ld	r5,64(r1)</div><div class='add'>+	b	__copy_tofrom_user_base</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+_GLOBAL(__copy_tofrom_user_power7)</div><div class='add'>+#ifdef CONFIG_ALTIVEC</div><div class='add'>+	cmpldi	r5,16</div><div class='add'>+	cmpldi	cr1,r5,4096</div><div class='add'>+</div><div class='add'>+	std	r3,48(r1)</div><div class='add'>+	std	r4,56(r1)</div><div class='add'>+	std	r5,64(r1)</div><div class='add'>+</div><div class='add'>+	blt	.Lshort_copy</div><div class='add'>+	bgt	cr1,.Lvmx_copy</div><div class='add'>+#else</div><div class='add'>+	cmpldi	r5,16</div><div class='add'>+</div><div class='add'>+	std	r3,48(r1)</div><div class='add'>+	std	r4,56(r1)</div><div class='add'>+	std	r5,64(r1)</div><div class='add'>+</div><div class='add'>+	blt	.Lshort_copy</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+.Lnonvmx_copy:</div><div class='add'>+	/* Get the source 8B aligned */</div><div class='add'>+	neg	r6,r4</div><div class='add'>+	mtocrf	0x01,r6</div><div class='add'>+	clrldi	r6,r6,(64-3)</div><div class='add'>+</div><div class='add'>+	bf	cr7*4+3,1f</div><div class='add'>+err1;	lbz	r0,0(r4)</div><div class='add'>+	addi	r4,r4,1</div><div class='add'>+err1;	stb	r0,0(r3)</div><div class='add'>+	addi	r3,r3,1</div><div class='add'>+</div><div class='add'>+1:	bf	cr7*4+2,2f</div><div class='add'>+err1;	lhz	r0,0(r4)</div><div class='add'>+	addi	r4,r4,2</div><div class='add'>+err1;	sth	r0,0(r3)</div><div class='add'>+	addi	r3,r3,2</div><div class='add'>+</div><div class='add'>+2:	bf	cr7*4+1,3f</div><div class='add'>+err1;	lwz	r0,0(r4)</div><div class='add'>+	addi	r4,r4,4</div><div class='add'>+err1;	stw	r0,0(r3)</div><div class='add'>+	addi	r3,r3,4</div><div class='add'>+</div><div class='add'>+3:	sub	r5,r5,r6</div><div class='add'>+	cmpldi	r5,128</div><div class='add'>+	blt	5f</div><div class='add'>+</div><div class='add'>+	mflr	r0</div><div class='add'>+	stdu	r1,-STACKFRAMESIZE(r1)</div><div class='add'>+	std	r14,STK_REG(r14)(r1)</div><div class='add'>+	std	r15,STK_REG(r15)(r1)</div><div class='add'>+	std	r16,STK_REG(r16)(r1)</div><div class='add'>+	std	r17,STK_REG(r17)(r1)</div><div class='add'>+	std	r18,STK_REG(r18)(r1)</div><div class='add'>+	std	r19,STK_REG(r19)(r1)</div><div class='add'>+	std	r20,STK_REG(r20)(r1)</div><div class='add'>+	std	r21,STK_REG(r21)(r1)</div><div class='add'>+	std	r22,STK_REG(r22)(r1)</div><div class='add'>+	std	r0,STACKFRAMESIZE+16(r1)</div><div class='add'>+</div><div class='add'>+	srdi	r6,r5,7</div><div class='add'>+	mtctr	r6</div><div class='add'>+</div><div class='add'>+	/* Now do cacheline (128B) sized loads and stores. */</div><div class='add'>+	.align	5</div><div class='add'>+4:</div><div class='add'>+err2;	ld	r0,0(r4)</div><div class='add'>+err2;	ld	r6,8(r4)</div><div class='add'>+err2;	ld	r7,16(r4)</div><div class='add'>+err2;	ld	r8,24(r4)</div><div class='add'>+err2;	ld	r9,32(r4)</div><div class='add'>+err2;	ld	r10,40(r4)</div><div class='add'>+err2;	ld	r11,48(r4)</div><div class='add'>+err2;	ld	r12,56(r4)</div><div class='add'>+err2;	ld	r14,64(r4)</div><div class='add'>+err2;	ld	r15,72(r4)</div><div class='add'>+err2;	ld	r16,80(r4)</div><div class='add'>+err2;	ld	r17,88(r4)</div><div class='add'>+err2;	ld	r18,96(r4)</div><div class='add'>+err2;	ld	r19,104(r4)</div><div class='add'>+err2;	ld	r20,112(r4)</div><div class='add'>+err2;	ld	r21,120(r4)</div><div class='add'>+	addi	r4,r4,128</div><div class='add'>+err2;	std	r0,0(r3)</div><div class='add'>+err2;	std	r6,8(r3)</div><div class='add'>+err2;	std	r7,16(r3)</div><div class='add'>+err2;	std	r8,24(r3)</div><div class='add'>+err2;	std	r9,32(r3)</div><div class='add'>+err2;	std	r10,40(r3)</div><div class='add'>+err2;	std	r11,48(r3)</div><div class='add'>+err2;	std	r12,56(r3)</div><div class='add'>+err2;	std	r14,64(r3)</div><div class='add'>+err2;	std	r15,72(r3)</div><div class='add'>+err2;	std	r16,80(r3)</div><div class='add'>+err2;	std	r17,88(r3)</div><div class='add'>+err2;	std	r18,96(r3)</div><div class='add'>+err2;	std	r19,104(r3)</div><div class='add'>+err2;	std	r20,112(r3)</div><div class='add'>+err2;	std	r21,120(r3)</div><div class='add'>+	addi	r3,r3,128</div><div class='add'>+	bdnz	4b</div><div class='add'>+</div><div class='add'>+	clrldi	r5,r5,(64-7)</div><div class='add'>+</div><div class='add'>+	ld	r14,STK_REG(r14)(r1)</div><div class='add'>+	ld	r15,STK_REG(r15)(r1)</div><div class='add'>+	ld	r16,STK_REG(r16)(r1)</div><div class='add'>+	ld	r17,STK_REG(r17)(r1)</div><div class='add'>+	ld	r18,STK_REG(r18)(r1)</div><div class='add'>+	ld	r19,STK_REG(r19)(r1)</div><div class='add'>+	ld	r20,STK_REG(r20)(r1)</div><div class='add'>+	ld	r21,STK_REG(r21)(r1)</div><div class='add'>+	ld	r22,STK_REG(r22)(r1)</div><div class='add'>+	addi	r1,r1,STACKFRAMESIZE</div><div class='add'>+</div><div class='add'>+	/* Up to 127B to go */</div><div class='add'>+5:	srdi	r6,r5,4</div><div class='add'>+	mtocrf	0x01,r6</div><div class='add'>+</div><div class='add'>+6:	bf	cr7*4+1,7f</div><div class='add'>+err1;	ld	r0,0(r4)</div><div class='add'>+err1;	ld	r6,8(r4)</div><div class='add'>+err1;	ld	r7,16(r4)</div><div class='add'>+err1;	ld	r8,24(r4)</div><div class='add'>+err1;	ld	r9,32(r4)</div><div class='add'>+err1;	ld	r10,40(r4)</div><div class='add'>+err1;	ld	r11,48(r4)</div><div class='add'>+err1;	ld	r12,56(r4)</div><div class='add'>+	addi	r4,r4,64</div><div class='add'>+err1;	std	r0,0(r3)</div><div class='add'>+err1;	std	r6,8(r3)</div><div class='add'>+err1;	std	r7,16(r3)</div><div class='add'>+err1;	std	r8,24(r3)</div><div class='add'>+err1;	std	r9,32(r3)</div><div class='add'>+err1;	std	r10,40(r3)</div><div class='add'>+err1;	std	r11,48(r3)</div><div class='add'>+err1;	std	r12,56(r3)</div><div class='add'>+	addi	r3,r3,64</div><div class='add'>+</div><div class='add'>+	/* Up to 63B to go */</div><div class='add'>+7:	bf	cr7*4+2,8f</div><div class='add'>+err1;	ld	r0,0(r4)</div><div class='add'>+err1;	ld	r6,8(r4)</div><div class='add'>+err1;	ld	r7,16(r4)</div><div class='add'>+err1;	ld	r8,24(r4)</div><div class='add'>+	addi	r4,r4,32</div><div class='add'>+err1;	std	r0,0(r3)</div><div class='add'>+err1;	std	r6,8(r3)</div><div class='add'>+err1;	std	r7,16(r3)</div><div class='add'>+err1;	std	r8,24(r3)</div><div class='add'>+	addi	r3,r3,32</div><div class='add'>+</div><div class='add'>+	/* Up to 31B to go */</div><div class='add'>+8:	bf	cr7*4+3,9f</div><div class='add'>+err1;	ld	r0,0(r4)</div><div class='add'>+err1;	ld	r6,8(r4)</div><div class='add'>+	addi	r4,r4,16</div><div class='add'>+err1;	std	r0,0(r3)</div><div class='add'>+err1;	std	r6,8(r3)</div><div class='add'>+	addi	r3,r3,16</div><div class='add'>+</div><div class='add'>+9:	clrldi	r5,r5,(64-4)</div><div class='add'>+</div><div class='add'>+	/* Up to 15B to go */</div><div class='add'>+.Lshort_copy:</div><div class='add'>+	mtocrf	0x01,r5</div><div class='add'>+	bf	cr7*4+0,12f</div><div class='add'>+err1;	lwz	r0,0(r4)	/* Less chance of a reject with word ops */</div><div class='add'>+err1;	lwz	r6,4(r4)</div><div class='add'>+	addi	r4,r4,8</div><div class='add'>+err1;	stw	r0,0(r3)</div><div class='add'>+err1;	stw	r6,4(r3)</div><div class='add'>+	addi	r3,r3,8</div><div class='add'>+</div><div class='add'>+12:	bf	cr7*4+1,13f</div><div class='add'>+err1;	lwz	r0,0(r4)</div><div class='add'>+	addi	r4,r4,4</div><div class='add'>+err1;	stw	r0,0(r3)</div><div class='add'>+	addi	r3,r3,4</div><div class='add'>+</div><div class='add'>+13:	bf	cr7*4+2,14f</div><div class='add'>+err1;	lhz	r0,0(r4)</div><div class='add'>+	addi	r4,r4,2</div><div class='add'>+err1;	sth	r0,0(r3)</div><div class='add'>+	addi	r3,r3,2</div><div class='add'>+</div><div class='add'>+14:	bf	cr7*4+3,15f</div><div class='add'>+err1;	lbz	r0,0(r4)</div><div class='add'>+err1;	stb	r0,0(r3)</div><div class='add'>+</div><div class='add'>+15:	li	r3,0</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+.Lunwind_stack_nonvmx_copy:</div><div class='add'>+	addi	r1,r1,STACKFRAMESIZE</div><div class='add'>+	b	.Lnonvmx_copy</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ALTIVEC</div><div class='add'>+.Lvmx_copy:</div><div class='add'>+	mflr	r0</div><div class='add'>+	std	r0,16(r1)</div><div class='add'>+	stdu	r1,-STACKFRAMESIZE(r1)</div><div class='add'>+	bl	.enter_vmx_copy</div><div class='add'>+	cmpwi	r3,0</div><div class='add'>+	ld	r0,STACKFRAMESIZE+16(r1)</div><div class='add'>+	ld	r3,STACKFRAMESIZE+48(r1)</div><div class='add'>+	ld	r4,STACKFRAMESIZE+56(r1)</div><div class='add'>+	ld	r5,STACKFRAMESIZE+64(r1)</div><div class='add'>+	mtlr	r0</div><div class='add'>+</div><div class='add'>+	beq	.Lunwind_stack_nonvmx_copy</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If source and destination are not relatively aligned we use a</div><div class='add'>+	 * slower permute loop.</div><div class='add'>+	 */</div><div class='add'>+	xor	r6,r4,r3</div><div class='add'>+	rldicl.	r6,r6,0,(64-4)</div><div class='add'>+	bne	.Lvmx_unaligned_copy</div><div class='add'>+</div><div class='add'>+	/* Get the destination 16B aligned */</div><div class='add'>+	neg	r6,r3</div><div class='add'>+	mtocrf	0x01,r6</div><div class='add'>+	clrldi	r6,r6,(64-4)</div><div class='add'>+</div><div class='add'>+	bf	cr7*4+3,1f</div><div class='add'>+err3;	lbz	r0,0(r4)</div><div class='add'>+	addi	r4,r4,1</div><div class='add'>+err3;	stb	r0,0(r3)</div><div class='add'>+	addi	r3,r3,1</div><div class='add'>+</div><div class='add'>+1:	bf	cr7*4+2,2f</div><div class='add'>+err3;	lhz	r0,0(r4)</div><div class='add'>+	addi	r4,r4,2</div><div class='add'>+err3;	sth	r0,0(r3)</div><div class='add'>+	addi	r3,r3,2</div><div class='add'>+</div><div class='add'>+2:	bf	cr7*4+1,3f</div><div class='add'>+err3;	lwz	r0,0(r4)</div><div class='add'>+	addi	r4,r4,4</div><div class='add'>+err3;	stw	r0,0(r3)</div><div class='add'>+	addi	r3,r3,4</div><div class='add'>+</div><div class='add'>+3:	bf	cr7*4+0,4f</div><div class='add'>+err3;	ld	r0,0(r4)</div><div class='add'>+	addi	r4,r4,8</div><div class='add'>+err3;	std	r0,0(r3)</div><div class='add'>+	addi	r3,r3,8</div><div class='add'>+</div><div class='add'>+4:	sub	r5,r5,r6</div><div class='add'>+</div><div class='add'>+	/* Get the desination 128B aligned */</div><div class='add'>+	neg	r6,r3</div><div class='add'>+	srdi	r7,r6,4</div><div class='add'>+	mtocrf	0x01,r7</div><div class='add'>+	clrldi	r6,r6,(64-7)</div><div class='add'>+</div><div class='add'>+	li	r9,16</div><div class='add'>+	li	r10,32</div><div class='add'>+	li	r11,48</div><div class='add'>+</div><div class='add'>+	bf	cr7*4+3,5f</div><div class='add'>+err3;	lvx	vr1,r0,r4</div><div class='add'>+	addi	r4,r4,16</div><div class='add'>+err3;	stvx	vr1,r0,r3</div><div class='add'>+	addi	r3,r3,16</div><div class='add'>+</div><div class='add'>+5:	bf	cr7*4+2,6f</div><div class='add'>+err3;	lvx	vr1,r0,r4</div><div class='add'>+err3;	lvx	vr0,r4,r9</div><div class='add'>+	addi	r4,r4,32</div><div class='add'>+err3;	stvx	vr1,r0,r3</div><div class='add'>+err3;	stvx	vr0,r3,r9</div><div class='add'>+	addi	r3,r3,32</div><div class='add'>+</div><div class='add'>+6:	bf	cr7*4+1,7f</div><div class='add'>+err3;	lvx	vr3,r0,r4</div><div class='add'>+err3;	lvx	vr2,r4,r9</div><div class='add'>+err3;	lvx	vr1,r4,r10</div><div class='add'>+err3;	lvx	vr0,r4,r11</div><div class='add'>+	addi	r4,r4,64</div><div class='add'>+err3;	stvx	vr3,r0,r3</div><div class='add'>+err3;	stvx	vr2,r3,r9</div><div class='add'>+err3;	stvx	vr1,r3,r10</div><div class='add'>+err3;	stvx	vr0,r3,r11</div><div class='add'>+	addi	r3,r3,64</div><div class='add'>+</div><div class='add'>+7:	sub	r5,r5,r6</div><div class='add'>+	srdi	r6,r5,7</div><div class='add'>+</div><div class='add'>+	std	r14,STK_REG(r14)(r1)</div><div class='add'>+	std	r15,STK_REG(r15)(r1)</div><div class='add'>+	std	r16,STK_REG(r16)(r1)</div><div class='add'>+</div><div class='add'>+	li	r12,64</div><div class='add'>+	li	r14,80</div><div class='add'>+	li	r15,96</div><div class='add'>+	li	r16,112</div><div class='add'>+</div><div class='add'>+	mtctr	r6</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now do cacheline sized loads and stores. By this stage the</div><div class='add'>+	 * cacheline stores are also cacheline aligned.</div><div class='add'>+	 */</div><div class='add'>+	.align	5</div><div class='add'>+8:</div><div class='add'>+err4;	lvx	vr7,r0,r4</div><div class='add'>+err4;	lvx	vr6,r4,r9</div><div class='add'>+err4;	lvx	vr5,r4,r10</div><div class='add'>+err4;	lvx	vr4,r4,r11</div><div class='add'>+err4;	lvx	vr3,r4,r12</div><div class='add'>+err4;	lvx	vr2,r4,r14</div><div class='add'>+err4;	lvx	vr1,r4,r15</div><div class='add'>+err4;	lvx	vr0,r4,r16</div><div class='add'>+	addi	r4,r4,128</div><div class='add'>+err4;	stvx	vr7,r0,r3</div><div class='add'>+err4;	stvx	vr6,r3,r9</div><div class='add'>+err4;	stvx	vr5,r3,r10</div><div class='add'>+err4;	stvx	vr4,r3,r11</div><div class='add'>+err4;	stvx	vr3,r3,r12</div><div class='add'>+err4;	stvx	vr2,r3,r14</div><div class='add'>+err4;	stvx	vr1,r3,r15</div><div class='add'>+err4;	stvx	vr0,r3,r16</div><div class='add'>+	addi	r3,r3,128</div><div class='add'>+	bdnz	8b</div><div class='add'>+</div><div class='add'>+	ld	r14,STK_REG(r14)(r1)</div><div class='add'>+	ld	r15,STK_REG(r15)(r1)</div><div class='add'>+	ld	r16,STK_REG(r16)(r1)</div><div class='add'>+</div><div class='add'>+	/* Up to 127B to go */</div><div class='add'>+	clrldi	r5,r5,(64-7)</div><div class='add'>+	srdi	r6,r5,4</div><div class='add'>+	mtocrf	0x01,r6</div><div class='add'>+</div><div class='add'>+	bf	cr7*4+1,9f</div><div class='add'>+err3;	lvx	vr3,r0,r4</div><div class='add'>+err3;	lvx	vr2,r4,r9</div><div class='add'>+err3;	lvx	vr1,r4,r10</div><div class='add'>+err3;	lvx	vr0,r4,r11</div><div class='add'>+	addi	r4,r4,64</div><div class='add'>+err3;	stvx	vr3,r0,r3</div><div class='add'>+err3;	stvx	vr2,r3,r9</div><div class='add'>+err3;	stvx	vr1,r3,r10</div><div class='add'>+err3;	stvx	vr0,r3,r11</div><div class='add'>+	addi	r3,r3,64</div><div class='add'>+</div><div class='add'>+9:	bf	cr7*4+2,10f</div><div class='add'>+err3;	lvx	vr1,r0,r4</div><div class='add'>+err3;	lvx	vr0,r4,r9</div><div class='add'>+	addi	r4,r4,32</div><div class='add'>+err3;	stvx	vr1,r0,r3</div><div class='add'>+err3;	stvx	vr0,r3,r9</div><div class='add'>+	addi	r3,r3,32</div><div class='add'>+</div><div class='add'>+10:	bf	cr7*4+3,11f</div><div class='add'>+err3;	lvx	vr1,r0,r4</div><div class='add'>+	addi	r4,r4,16</div><div class='add'>+err3;	stvx	vr1,r0,r3</div><div class='add'>+	addi	r3,r3,16</div><div class='add'>+</div><div class='add'>+	/* Up to 15B to go */</div><div class='add'>+11:	clrldi	r5,r5,(64-4)</div><div class='add'>+	mtocrf	0x01,r5</div><div class='add'>+	bf	cr7*4+0,12f</div><div class='add'>+err3;	ld	r0,0(r4)</div><div class='add'>+	addi	r4,r4,8</div><div class='add'>+err3;	std	r0,0(r3)</div><div class='add'>+	addi	r3,r3,8</div><div class='add'>+</div><div class='add'>+12:	bf	cr7*4+1,13f</div><div class='add'>+err3;	lwz	r0,0(r4)</div><div class='add'>+	addi	r4,r4,4</div><div class='add'>+err3;	stw	r0,0(r3)</div><div class='add'>+	addi	r3,r3,4</div><div class='add'>+</div><div class='add'>+13:	bf	cr7*4+2,14f</div><div class='add'>+err3;	lhz	r0,0(r4)</div><div class='add'>+	addi	r4,r4,2</div><div class='add'>+err3;	sth	r0,0(r3)</div><div class='add'>+	addi	r3,r3,2</div><div class='add'>+</div><div class='add'>+14:	bf	cr7*4+3,15f</div><div class='add'>+err3;	lbz	r0,0(r4)</div><div class='add'>+err3;	stb	r0,0(r3)</div><div class='add'>+</div><div class='add'>+15:	addi	r1,r1,STACKFRAMESIZE</div><div class='add'>+	b	.exit_vmx_copy		/* tail call optimise */</div><div class='add'>+</div><div class='add'>+.Lvmx_unaligned_copy:</div><div class='add'>+	/* Get the destination 16B aligned */</div><div class='add'>+	neg	r6,r3</div><div class='add'>+	mtocrf	0x01,r6</div><div class='add'>+	clrldi	r6,r6,(64-4)</div><div class='add'>+</div><div class='add'>+	bf	cr7*4+3,1f</div><div class='add'>+err3;	lbz	r0,0(r4)</div><div class='add'>+	addi	r4,r4,1</div><div class='add'>+err3;	stb	r0,0(r3)</div><div class='add'>+	addi	r3,r3,1</div><div class='add'>+</div><div class='add'>+1:	bf	cr7*4+2,2f</div><div class='add'>+err3;	lhz	r0,0(r4)</div><div class='add'>+	addi	r4,r4,2</div><div class='add'>+err3;	sth	r0,0(r3)</div><div class='add'>+	addi	r3,r3,2</div><div class='add'>+</div><div class='add'>+2:	bf	cr7*4+1,3f</div><div class='add'>+err3;	lwz	r0,0(r4)</div><div class='add'>+	addi	r4,r4,4</div><div class='add'>+err3;	stw	r0,0(r3)</div><div class='add'>+	addi	r3,r3,4</div><div class='add'>+</div><div class='add'>+3:	bf	cr7*4+0,4f</div><div class='add'>+err3;	lwz	r0,0(r4)	/* Less chance of a reject with word ops */</div><div class='add'>+err3;	lwz	r7,4(r4)</div><div class='add'>+	addi	r4,r4,8</div><div class='add'>+err3;	stw	r0,0(r3)</div><div class='add'>+err3;	stw	r7,4(r3)</div><div class='add'>+	addi	r3,r3,8</div><div class='add'>+</div><div class='add'>+4:	sub	r5,r5,r6</div><div class='add'>+</div><div class='add'>+	/* Get the desination 128B aligned */</div><div class='add'>+	neg	r6,r3</div><div class='add'>+	srdi	r7,r6,4</div><div class='add'>+	mtocrf	0x01,r7</div><div class='add'>+	clrldi	r6,r6,(64-7)</div><div class='add'>+</div><div class='add'>+	li	r9,16</div><div class='add'>+	li	r10,32</div><div class='add'>+	li	r11,48</div><div class='add'>+</div><div class='add'>+	lvsl	vr16,0,r4	/* Setup permute control vector */</div><div class='add'>+err3;	lvx	vr0,0,r4</div><div class='add'>+	addi	r4,r4,16</div><div class='add'>+</div><div class='add'>+	bf	cr7*4+3,5f</div><div class='add'>+err3;	lvx	vr1,r0,r4</div><div class='add'>+	vperm	vr8,vr0,vr1,vr16</div><div class='add'>+	addi	r4,r4,16</div><div class='add'>+err3;	stvx	vr8,r0,r3</div><div class='add'>+	addi	r3,r3,16</div><div class='add'>+	vor	vr0,vr1,vr1</div><div class='add'>+</div><div class='add'>+5:	bf	cr7*4+2,6f</div><div class='add'>+err3;	lvx	vr1,r0,r4</div><div class='add'>+	vperm	vr8,vr0,vr1,vr16</div><div class='add'>+err3;	lvx	vr0,r4,r9</div><div class='add'>+	vperm	vr9,vr1,vr0,vr16</div><div class='add'>+	addi	r4,r4,32</div><div class='add'>+err3;	stvx	vr8,r0,r3</div><div class='add'>+err3;	stvx	vr9,r3,r9</div><div class='add'>+	addi	r3,r3,32</div><div class='add'>+</div><div class='add'>+6:	bf	cr7*4+1,7f</div><div class='add'>+err3;	lvx	vr3,r0,r4</div><div class='add'>+	vperm	vr8,vr0,vr3,vr16</div><div class='add'>+err3;	lvx	vr2,r4,r9</div><div class='add'>+	vperm	vr9,vr3,vr2,vr16</div><div class='add'>+err3;	lvx	vr1,r4,r10</div><div class='add'>+	vperm	vr10,vr2,vr1,vr16</div><div class='add'>+err3;	lvx	vr0,r4,r11</div><div class='add'>+	vperm	vr11,vr1,vr0,vr16</div><div class='add'>+	addi	r4,r4,64</div><div class='add'>+err3;	stvx	vr8,r0,r3</div><div class='add'>+err3;	stvx	vr9,r3,r9</div><div class='add'>+err3;	stvx	vr10,r3,r10</div><div class='add'>+err3;	stvx	vr11,r3,r11</div><div class='add'>+	addi	r3,r3,64</div><div class='add'>+</div><div class='add'>+7:	sub	r5,r5,r6</div><div class='add'>+	srdi	r6,r5,7</div><div class='add'>+</div><div class='add'>+	std	r14,STK_REG(r14)(r1)</div><div class='add'>+	std	r15,STK_REG(r15)(r1)</div><div class='add'>+	std	r16,STK_REG(r16)(r1)</div><div class='add'>+</div><div class='add'>+	li	r12,64</div><div class='add'>+	li	r14,80</div><div class='add'>+	li	r15,96</div><div class='add'>+	li	r16,112</div><div class='add'>+</div><div class='add'>+	mtctr	r6</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now do cacheline sized loads and stores. By this stage the</div><div class='add'>+	 * cacheline stores are also cacheline aligned.</div><div class='add'>+	 */</div><div class='add'>+	.align	5</div><div class='add'>+8:</div><div class='add'>+err4;	lvx	vr7,r0,r4</div><div class='add'>+	vperm	vr8,vr0,vr7,vr16</div><div class='add'>+err4;	lvx	vr6,r4,r9</div><div class='add'>+	vperm	vr9,vr7,vr6,vr16</div><div class='add'>+err4;	lvx	vr5,r4,r10</div><div class='add'>+	vperm	vr10,vr6,vr5,vr16</div><div class='add'>+err4;	lvx	vr4,r4,r11</div><div class='add'>+	vperm	vr11,vr5,vr4,vr16</div><div class='add'>+err4;	lvx	vr3,r4,r12</div><div class='add'>+	vperm	vr12,vr4,vr3,vr16</div><div class='add'>+err4;	lvx	vr2,r4,r14</div><div class='add'>+	vperm	vr13,vr3,vr2,vr16</div><div class='add'>+err4;	lvx	vr1,r4,r15</div><div class='add'>+	vperm	vr14,vr2,vr1,vr16</div><div class='add'>+err4;	lvx	vr0,r4,r16</div><div class='add'>+	vperm	vr15,vr1,vr0,vr16</div><div class='add'>+	addi	r4,r4,128</div><div class='add'>+err4;	stvx	vr8,r0,r3</div><div class='add'>+err4;	stvx	vr9,r3,r9</div><div class='add'>+err4;	stvx	vr10,r3,r10</div><div class='add'>+err4;	stvx	vr11,r3,r11</div><div class='add'>+err4;	stvx	vr12,r3,r12</div><div class='add'>+err4;	stvx	vr13,r3,r14</div><div class='add'>+err4;	stvx	vr14,r3,r15</div><div class='add'>+err4;	stvx	vr15,r3,r16</div><div class='add'>+	addi	r3,r3,128</div><div class='add'>+	bdnz	8b</div><div class='add'>+</div><div class='add'>+	ld	r14,STK_REG(r14)(r1)</div><div class='add'>+	ld	r15,STK_REG(r15)(r1)</div><div class='add'>+	ld	r16,STK_REG(r16)(r1)</div><div class='add'>+</div><div class='add'>+	/* Up to 127B to go */</div><div class='add'>+	clrldi	r5,r5,(64-7)</div><div class='add'>+	srdi	r6,r5,4</div><div class='add'>+	mtocrf	0x01,r6</div><div class='add'>+</div><div class='add'>+	bf	cr7*4+1,9f</div><div class='add'>+err3;	lvx	vr3,r0,r4</div><div class='add'>+	vperm	vr8,vr0,vr3,vr16</div><div class='add'>+err3;	lvx	vr2,r4,r9</div><div class='add'>+	vperm	vr9,vr3,vr2,vr16</div><div class='add'>+err3;	lvx	vr1,r4,r10</div><div class='add'>+	vperm	vr10,vr2,vr1,vr16</div><div class='add'>+err3;	lvx	vr0,r4,r11</div><div class='add'>+	vperm	vr11,vr1,vr0,vr16</div><div class='add'>+	addi	r4,r4,64</div><div class='add'>+err3;	stvx	vr8,r0,r3</div><div class='add'>+err3;	stvx	vr9,r3,r9</div><div class='add'>+err3;	stvx	vr10,r3,r10</div><div class='add'>+err3;	stvx	vr11,r3,r11</div><div class='add'>+	addi	r3,r3,64</div><div class='add'>+</div><div class='add'>+9:	bf	cr7*4+2,10f</div><div class='add'>+err3;	lvx	vr1,r0,r4</div><div class='add'>+	vperm	vr8,vr0,vr1,vr16</div><div class='add'>+err3;	lvx	vr0,r4,r9</div><div class='add'>+	vperm	vr9,vr1,vr0,vr16</div><div class='add'>+	addi	r4,r4,32</div><div class='add'>+err3;	stvx	vr8,r0,r3</div><div class='add'>+err3;	stvx	vr9,r3,r9</div><div class='add'>+	addi	r3,r3,32</div><div class='add'>+</div><div class='add'>+10:	bf	cr7*4+3,11f</div><div class='add'>+err3;	lvx	vr1,r0,r4</div><div class='add'>+	vperm	vr8,vr0,vr1,vr16</div><div class='add'>+	addi	r4,r4,16</div><div class='add'>+err3;	stvx	vr8,r0,r3</div><div class='add'>+	addi	r3,r3,16</div><div class='add'>+</div><div class='add'>+	/* Up to 15B to go */</div><div class='add'>+11:	clrldi	r5,r5,(64-4)</div><div class='add'>+	addi	r4,r4,-16	/* Unwind the +16 load offset */</div><div class='add'>+	mtocrf	0x01,r5</div><div class='add'>+	bf	cr7*4+0,12f</div><div class='add'>+err3;	lwz	r0,0(r4)	/* Less chance of a reject with word ops */</div><div class='add'>+err3;	lwz	r6,4(r4)</div><div class='add'>+	addi	r4,r4,8</div><div class='add'>+err3;	stw	r0,0(r3)</div><div class='add'>+err3;	stw	r6,4(r3)</div><div class='add'>+	addi	r3,r3,8</div><div class='add'>+</div><div class='add'>+12:	bf	cr7*4+1,13f</div><div class='add'>+err3;	lwz	r0,0(r4)</div><div class='add'>+	addi	r4,r4,4</div><div class='add'>+err3;	stw	r0,0(r3)</div><div class='add'>+	addi	r3,r3,4</div><div class='add'>+</div><div class='add'>+13:	bf	cr7*4+2,14f</div><div class='add'>+err3;	lhz	r0,0(r4)</div><div class='add'>+	addi	r4,r4,2</div><div class='add'>+err3;	sth	r0,0(r3)</div><div class='add'>+	addi	r3,r3,2</div><div class='add'>+</div><div class='add'>+14:	bf	cr7*4+3,15f</div><div class='add'>+err3;	lbz	r0,0(r4)</div><div class='add'>+err3;	stb	r0,0(r3)</div><div class='add'>+</div><div class='add'>+15:	addi	r1,r1,STACKFRAMESIZE</div><div class='add'>+	b	.exit_vmx_copy		/* tail call optimise */</div><div class='add'>+#endif /* CONFiG_ALTIVEC */</div><div class='head'>diff --git a/arch/powerpc/lib/copyuser_power7_vmx.c b/arch/powerpc/lib/copyuser_power7_vmx.c<br/>new file mode 100644<br/>index 000000000000..6e1efadac48b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/lib/copyuser_power7_vmx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/lib/copyuser_power7_vmx.c</a></div><div class='hunk'>@@ -0,0 +1,50 @@</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'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) IBM Corporation, 2011</div><div class='add'>+ *</div><div class='add'>+ * Authors: Sukadev Bhattiprolu &lt;sukadev@linux.vnet.ibm.com&gt;</div><div class='add'>+ *          Anton Blanchard &lt;anton@au.ibm.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/hardirq.h&gt;</div><div class='add'>+</div><div class='add'>+int enter_vmx_copy(void)</div><div class='add'>+{</div><div class='add'>+	if (in_interrupt())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* This acts as preempt_disable() as well and will make</div><div class='add'>+	 * enable_kernel_altivec(). We need to disable page faults</div><div class='add'>+	 * as they can call schedule and thus make us lose the VMX</div><div class='add'>+	 * context. So on page faults, we just fail which will cause</div><div class='add'>+	 * a fallback to the normal non-vmx copy.</div><div class='add'>+	 */</div><div class='add'>+	pagefault_disable();</div><div class='add'>+</div><div class='add'>+	enable_kernel_altivec();</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function must return 0 because we tail call optimise when calling</div><div class='add'>+ * from __copy_tofrom_user_power7 which returns 0 on success.</div><div class='add'>+ */</div><div class='add'>+int exit_vmx_copy(void)</div><div class='add'>+{</div><div class='add'>+	pagefault_enable();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/mm/44x_mmu.c b/arch/powerpc/mm/44x_mmu.c<br/>index f60e006d90c3..388b95e1a009 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/44x_mmu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/44x_mmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/44x_mmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/mm/44x_mmu.c</a></div><div class='hunk'>@@ -78,11 +78,7 @@ static void __init ppc44x_pin_tlb(unsigned int virt, unsigned int phys)</div><div class='ctx'> 		"tlbwe	%1,%3,%5\n"</div><div class='ctx'> 		"tlbwe	%0,%3,%6\n"</div><div class='ctx'> 	:</div><div class='del'>-#ifdef CONFIG_PPC47x</div><div class='del'>-	: "r" (PPC47x_TLB2_S_RWX),</div><div class='del'>-#else</div><div class='ctx'> 	: "r" (PPC44x_TLB_SW | PPC44x_TLB_SR | PPC44x_TLB_SX | PPC44x_TLB_G),</div><div class='del'>-#endif</div><div class='ctx'> 	  "r" (phys),</div><div class='ctx'> 	  "r" (virt | PPC44x_TLB_VALID | PPC44x_TLB_256M),</div><div class='ctx'> 	  "r" (entry),</div><div class='hunk'>@@ -221,7 +217,7 @@ void setup_initial_memory_limit(phys_addr_t first_memblock_base,</div><div class='ctx'> {</div><div class='ctx'> 	u64 size;</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_RELOCATABLE</div><div class='add'>+#ifndef CONFIG_NONSTATIC_KERNEL</div><div class='ctx'> 	/* We don't currently support the first MEMBLOCK not mapping 0</div><div class='ctx'> 	 * physical on those processors</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile<br/>index 991ee813d2a8..3787b61f7d20 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/mm/Makefile</a></div><div class='hunk'>@@ -21,6 +21,8 @@ obj-$(CONFIG_PPC_STD_MMU_32)	+= ppc_mmu_32.o</div><div class='ctx'> obj-$(CONFIG_PPC_STD_MMU)	+= hash_low_$(CONFIG_WORD_SIZE).o \</div><div class='ctx'> 				   tlb_hash$(CONFIG_WORD_SIZE).o \</div><div class='ctx'> 				   mmu_context_hash$(CONFIG_WORD_SIZE).o</div><div class='add'>+obj-$(CONFIG_PPC_ICSWX)		+= icswx.o</div><div class='add'>+obj-$(CONFIG_PPC_ICSWX_PID)	+= icswx_pid.o</div><div class='ctx'> obj-$(CONFIG_40x)		+= 40x_mmu.o</div><div class='ctx'> obj-$(CONFIG_44x)		+= 44x_mmu.o</div><div class='ctx'> obj-$(CONFIG_PPC_FSL_BOOK3E)	+= fsl_booke_mmu.o</div><div class='head'>diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c<br/>index 5efe8c96d37f..2f0d1b032a89 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/fault.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/fault.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/fault.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/mm/fault.c</a></div><div class='hunk'>@@ -44,6 +44,8 @@</div><div class='ctx'> #include &lt;asm/siginfo.h&gt;</div><div class='ctx'> #include &lt;mm/mmu_decl.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "icswx.h"</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_KPROBES</div><div class='ctx'> static inline int notify_page_fault(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='hunk'>@@ -143,6 +145,21 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,</div><div class='ctx'> 	is_write = error_code &amp; ESR_DST;</div><div class='ctx'> #endif /* CONFIG_4xx || CONFIG_BOOKE */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC_ICSWX</div><div class='add'>+	/*</div><div class='add'>+	 * we need to do this early because this "data storage</div><div class='add'>+	 * interrupt" does not update the DAR/DEAR so we don't want to</div><div class='add'>+	 * look at it</div><div class='add'>+	 */</div><div class='add'>+	if (error_code &amp; ICSWX_DSI_UCT) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		ret = acop_handle_fault(regs, address, error_code);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (notify_page_fault(regs))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/mm/hugetlbpage-book3e.c b/arch/powerpc/mm/hugetlbpage-book3e.c<br/>index 343ad0b87261..3bc700655fc8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/hugetlbpage-book3e.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/hugetlbpage-book3e.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/hugetlbpage-book3e.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/mm/hugetlbpage-book3e.c</a></div><div class='hunk'>@@ -37,31 +37,32 @@ static inline int book3e_tlb_exists(unsigned long ea, unsigned long pid)</div><div class='ctx'> 	return found;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void book3e_hugetlb_preload(struct mm_struct *mm, unsigned long ea, pte_t pte)</div><div class='add'>+void book3e_hugetlb_preload(struct vm_area_struct *vma, unsigned long ea,</div><div class='add'>+			    pte_t pte)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long mas1, mas2;</div><div class='ctx'> 	u64 mas7_3;</div><div class='ctx'> 	unsigned long psize, tsize, shift;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	struct mm_struct *mm;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='del'>-	int index, lz, ncams;</div><div class='del'>-	struct vm_area_struct *vma;</div><div class='add'>+	int index, ncams;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(is_kernel_addr(ea)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	mm = vma-&gt;vm_mm;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PPC_MM_SLICES</div><div class='del'>-	psize = mmu_get_tsize(get_slice_psize(mm, ea));</div><div class='del'>-	tsize = mmu_get_psize(psize);</div><div class='add'>+	psize = get_slice_psize(mm, ea);</div><div class='add'>+	tsize = mmu_get_tsize(psize);</div><div class='ctx'> 	shift = mmu_psize_defs[psize].shift;</div><div class='ctx'> #else</div><div class='del'>-	vma = find_vma(mm, ea);</div><div class='del'>-	psize = vma_mmu_pagesize(vma);	/* returns actual size in bytes */</div><div class='del'>-	asm (PPC_CNTLZL "%0,%1" : "=r" (lz) : "r" (psize));</div><div class='del'>-	shift = 31 - lz;</div><div class='del'>-	tsize = 21 - lz;</div><div class='add'>+	psize = vma_mmu_pagesize(vma);</div><div class='add'>+	shift = __ilog2(psize);</div><div class='add'>+	tsize = shift - 10;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c<br/>index 8558b572e55d..a8b3cc7d90fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/hugetlbpage.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/hugetlbpage.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/hugetlbpage.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/mm/hugetlbpage.c</a></div><div class='hunk'>@@ -29,22 +29,22 @@ unsigned int HPAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Tracks gpages after the device tree is scanned and before the</div><div class='del'>- * huge_boot_pages list is ready.  On 64-bit implementations, this is</div><div class='del'>- * just used to track 16G pages and so is a single array.  32-bit</div><div class='del'>- * implementations may have more than one gpage size due to limitations</div><div class='del'>- * of the memory allocators, so we need multiple arrays</div><div class='add'>+ * huge_boot_pages list is ready.  On non-Freescale implementations, this is</div><div class='add'>+ * just used to track 16G pages and so is a single array.  FSL-based</div><div class='add'>+ * implementations may have more than one gpage size, so we need multiple</div><div class='add'>+ * arrays</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='del'>-#define MAX_NUMBER_GPAGES	1024</div><div class='del'>-static u64 gpage_freearray[MAX_NUMBER_GPAGES];</div><div class='del'>-static unsigned nr_gpages;</div><div class='del'>-#else</div><div class='add'>+#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='ctx'> #define MAX_NUMBER_GPAGES	128</div><div class='ctx'> struct psize_gpages {</div><div class='ctx'> 	u64 gpage_list[MAX_NUMBER_GPAGES];</div><div class='ctx'> 	unsigned int nr_gpages;</div><div class='ctx'> };</div><div class='ctx'> static struct psize_gpages gpage_freearray[MMU_PAGE_COUNT];</div><div class='add'>+#else</div><div class='add'>+#define MAX_NUMBER_GPAGES	1024</div><div class='add'>+static u64 gpage_freearray[MAX_NUMBER_GPAGES];</div><div class='add'>+static unsigned nr_gpages;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static inline int shift_to_mmu_psize(unsigned int shift)</div><div class='hunk'>@@ -115,12 +115,12 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,</div><div class='ctx'> 	struct kmem_cache *cachep;</div><div class='ctx'> 	pte_t *new;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='del'>-	cachep = PGT_CACHE(pdshift - pshift);</div><div class='del'>-#else</div><div class='add'>+#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int num_hugepd = 1 &lt;&lt; (pshift - pdshift);</div><div class='ctx'> 	cachep = hugepte_cache;</div><div class='add'>+#else</div><div class='add'>+	cachep = PGT_CACHE(pdshift - pshift);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	new = kmem_cache_zalloc(cachep, GFP_KERNEL|__GFP_REPEAT);</div><div class='hunk'>@@ -132,12 +132,7 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;mm-&gt;page_table_lock);</div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='del'>-	if (!hugepd_none(*hpdp))</div><div class='del'>-		kmem_cache_free(cachep, new);</div><div class='del'>-	else</div><div class='del'>-		hpdp-&gt;pd = ((unsigned long)new &amp; ~PD_HUGE) | pshift;</div><div class='del'>-#else</div><div class='add'>+#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have multiple higher-level entries that point to the same</div><div class='ctx'> 	 * actual pte location.  Fill in each as we go and backtrack on error.</div><div class='hunk'>@@ -156,11 +151,28 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,</div><div class='ctx'> 			hpdp-&gt;pd = 0;</div><div class='ctx'> 		kmem_cache_free(cachep, new);</div><div class='ctx'> 	}</div><div class='add'>+#else</div><div class='add'>+	if (!hugepd_none(*hpdp))</div><div class='add'>+		kmem_cache_free(cachep, new);</div><div class='add'>+	else</div><div class='add'>+		hpdp-&gt;pd = ((unsigned long)new &amp; ~PD_HUGE) | pshift;</div><div class='ctx'> #endif</div><div class='ctx'> 	spin_unlock(&amp;mm-&gt;page_table_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * These macros define how to determine which level of the page table holds</div><div class='add'>+ * the hpdp.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='add'>+#define HUGEPD_PGD_SHIFT PGDIR_SHIFT</div><div class='add'>+#define HUGEPD_PUD_SHIFT PUD_SHIFT</div><div class='add'>+#else</div><div class='add'>+#define HUGEPD_PGD_SHIFT PUD_SHIFT</div><div class='add'>+#define HUGEPD_PUD_SHIFT PMD_SHIFT</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz)</div><div class='ctx'> {</div><div class='ctx'> 	pgd_t *pg;</div><div class='hunk'>@@ -173,12 +185,13 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz</div><div class='ctx'> 	addr &amp;= ~(sz-1);</div><div class='ctx'> </div><div class='ctx'> 	pg = pgd_offset(mm, addr);</div><div class='del'>-	if (pshift &gt;= PUD_SHIFT) {</div><div class='add'>+</div><div class='add'>+	if (pshift &gt;= HUGEPD_PGD_SHIFT) {</div><div class='ctx'> 		hpdp = (hugepd_t *)pg;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pdshift = PUD_SHIFT;</div><div class='ctx'> 		pu = pud_alloc(mm, pg, addr);</div><div class='del'>-		if (pshift &gt;= PMD_SHIFT) {</div><div class='add'>+		if (pshift &gt;= HUGEPD_PUD_SHIFT) {</div><div class='ctx'> 			hpdp = (hugepd_t *)pu;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			pdshift = PMD_SHIFT;</div><div class='hunk'>@@ -198,7 +211,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz</div><div class='ctx'> 	return hugepte_offset(hpdp, addr, pdshift);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC32</div><div class='add'>+#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='ctx'> /* Build list of addresses of gigantic pages.  This function is used in early</div><div class='ctx'>  * boot before the buddy or bootmem allocator is setup.</div><div class='ctx'>  */</div><div class='hunk'>@@ -318,7 +331,7 @@ void __init reserve_hugetlb_gpages(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else /* PPC64 */</div><div class='add'>+#else /* !PPC_FSL_BOOK3E */</div><div class='ctx'> </div><div class='ctx'> /* Build list of addresses of gigantic pages.  This function is used in early</div><div class='ctx'>  * boot before the buddy or bootmem allocator is setup.</div><div class='hunk'>@@ -356,7 +369,7 @@ int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC32</div><div class='add'>+#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='ctx'> #define HUGEPD_FREELIST_SIZE \</div><div class='ctx'> 	((PAGE_SIZE - sizeof(struct hugepd_freelist)) / sizeof(pte_t))</div><div class='ctx'> </div><div class='hunk'>@@ -416,11 +429,11 @@ static void free_hugepd_range(struct mmu_gather *tlb, hugepd_t *hpdp, int pdshif</div><div class='ctx'> 	unsigned long pdmask = ~((1UL &lt;&lt; pdshift) - 1);</div><div class='ctx'> 	unsigned int num_hugepd = 1;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='del'>-	unsigned int shift = hugepd_shift(*hpdp);</div><div class='del'>-#else</div><div class='del'>-	/* Note: On 32-bit the hpdp may be the first of several */</div><div class='add'>+#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='add'>+	/* Note: On fsl the hpdp may be the first of several */</div><div class='ctx'> 	num_hugepd = (1 &lt;&lt; (hugepd_shift(*hpdp) - pdshift));</div><div class='add'>+#else</div><div class='add'>+	unsigned int shift = hugepd_shift(*hpdp);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	start &amp;= pdmask;</div><div class='hunk'>@@ -438,10 +451,11 @@ static void free_hugepd_range(struct mmu_gather *tlb, hugepd_t *hpdp, int pdshif</div><div class='ctx'> 		hpdp-&gt;pd = 0;</div><div class='ctx'> </div><div class='ctx'> 	tlb-&gt;need_flush = 1;</div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='del'>-	pgtable_free_tlb(tlb, hugepte, pdshift - shift);</div><div class='del'>-#else</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='ctx'> 	hugepd_free(tlb, hugepte);</div><div class='add'>+#else</div><div class='add'>+	pgtable_free_tlb(tlb, hugepte, pdshift - shift);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -454,14 +468,23 @@ static void hugetlb_free_pmd_range(struct mmu_gather *tlb, pud_t *pud,</div><div class='ctx'> 	unsigned long start;</div><div class='ctx'> </div><div class='ctx'> 	start = addr;</div><div class='del'>-	pmd = pmd_offset(pud, addr);</div><div class='ctx'> 	do {</div><div class='add'>+		pmd = pmd_offset(pud, addr);</div><div class='ctx'> 		next = pmd_addr_end(addr, end);</div><div class='ctx'> 		if (pmd_none(*pmd))</div><div class='ctx'> 			continue;</div><div class='add'>+#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='add'>+		/*</div><div class='add'>+		 * Increment next by the size of the huge mapping since</div><div class='add'>+		 * there may be more than one entry at this level for a</div><div class='add'>+		 * single hugepage, but all of them point to</div><div class='add'>+		 * the same kmem cache that holds the hugepte.</div><div class='add'>+		 */</div><div class='add'>+		next = addr + (1 &lt;&lt; hugepd_shift(*(hugepd_t *)pmd));</div><div class='add'>+#endif</div><div class='ctx'> 		free_hugepd_range(tlb, (hugepd_t *)pmd, PMD_SHIFT,</div><div class='ctx'> 				  addr, next, floor, ceiling);</div><div class='del'>-	} while (pmd++, addr = next, addr != end);</div><div class='add'>+	} while (addr = next, addr != end);</div><div class='ctx'> </div><div class='ctx'> 	start &amp;= PUD_MASK;</div><div class='ctx'> 	if (start &lt; floor)</div><div class='hunk'>@@ -488,8 +511,8 @@ static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,</div><div class='ctx'> 	unsigned long start;</div><div class='ctx'> </div><div class='ctx'> 	start = addr;</div><div class='del'>-	pud = pud_offset(pgd, addr);</div><div class='ctx'> 	do {</div><div class='add'>+		pud = pud_offset(pgd, addr);</div><div class='ctx'> 		next = pud_addr_end(addr, end);</div><div class='ctx'> 		if (!is_hugepd(pud)) {</div><div class='ctx'> 			if (pud_none_or_clear_bad(pud))</div><div class='hunk'>@@ -497,10 +520,19 @@ static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,</div><div class='ctx'> 			hugetlb_free_pmd_range(tlb, pud, addr, next, floor,</div><div class='ctx'> 					       ceiling);</div><div class='ctx'> 		} else {</div><div class='add'>+#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='add'>+			/*</div><div class='add'>+			 * Increment next by the size of the huge mapping since</div><div class='add'>+			 * there may be more than one entry at this level for a</div><div class='add'>+			 * single hugepage, but all of them point to</div><div class='add'>+			 * the same kmem cache that holds the hugepte.</div><div class='add'>+			 */</div><div class='add'>+			next = addr + (1 &lt;&lt; hugepd_shift(*(hugepd_t *)pud));</div><div class='add'>+#endif</div><div class='ctx'> 			free_hugepd_range(tlb, (hugepd_t *)pud, PUD_SHIFT,</div><div class='ctx'> 					  addr, next, floor, ceiling);</div><div class='ctx'> 		}</div><div class='del'>-	} while (pud++, addr = next, addr != end);</div><div class='add'>+	} while (addr = next, addr != end);</div><div class='ctx'> </div><div class='ctx'> 	start &amp;= PGDIR_MASK;</div><div class='ctx'> 	if (start &lt; floor)</div><div class='hunk'>@@ -555,12 +587,12 @@ void hugetlb_free_pgd_range(struct mmu_gather *tlb,</div><div class='ctx'> 				continue;</div><div class='ctx'> 			hugetlb_free_pud_range(tlb, pgd, addr, next, floor, ceiling);</div><div class='ctx'> 		} else {</div><div class='del'>-#ifdef CONFIG_PPC32</div><div class='add'>+#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Increment next by the size of the huge mapping since</div><div class='del'>-			 * on 32-bit there may be more than one entry at the pgd</div><div class='del'>-			 * level for a single hugepage, but all of them point to</div><div class='del'>-			 * the same kmem cache that holds the hugepte.</div><div class='add'>+			 * there may be more than one entry at the pgd level</div><div class='add'>+			 * for a single hugepage, but all of them point to the</div><div class='add'>+			 * same kmem cache that holds the hugepte.</div><div class='ctx'> 			 */</div><div class='ctx'> 			next = addr + (1 &lt;&lt; hugepd_shift(*(hugepd_t *)pgd));</div><div class='ctx'> #endif</div><div class='hunk'>@@ -698,19 +730,17 @@ int gup_hugepd(hugepd_t *hugepd, unsigned pdshift,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC_MM_SLICES</div><div class='ctx'> unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,</div><div class='ctx'> 					unsigned long len, unsigned long pgoff,</div><div class='ctx'> 					unsigned long flags)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PPC_MM_SLICES</div><div class='ctx'> 	struct hstate *hstate = hstate_file(file);</div><div class='ctx'> 	int mmu_psize = shift_to_mmu_psize(huge_page_shift(hstate));</div><div class='ctx'> </div><div class='ctx'> 	return slice_get_unmapped_area(addr, len, flags, mmu_psize, 1, 0);</div><div class='del'>-#else</div><div class='del'>-	return get_unmapped_area(file, addr, len, pgoff, flags);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> unsigned long vma_mmu_pagesize(struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='hunk'>@@ -784,7 +814,7 @@ static int __init hugepage_setup_sz(char *str)</div><div class='ctx'> }</div><div class='ctx'> __setup("hugepagesz=", hugepage_setup_sz);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_FSL_BOOKE</div><div class='add'>+#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='ctx'> struct kmem_cache *hugepte_cache;</div><div class='ctx'> static int __init hugetlbpage_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/mm/icswx.c b/arch/powerpc/mm/icswx.c<br/>new file mode 100644<br/>index 000000000000..5d9a59eaad93<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/icswx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/mm/icswx.c</a></div><div class='hunk'>@@ -0,0 +1,273 @@</div><div class='add'>+/*</div><div class='add'>+ *  ICSWX and ACOP Management</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2011 Anton Blanchard, IBM Corp. &lt;anton@samba.org&gt;</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'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#include "icswx.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The processor and its L2 cache cause the icswx instruction to</div><div class='add'>+ * generate a COP_REQ transaction on PowerBus. The transaction has no</div><div class='add'>+ * address, and the processor does not perform an MMU access to</div><div class='add'>+ * authenticate the transaction. The command portion of the PowerBus</div><div class='add'>+ * COP_REQ transaction includes the LPAR_ID (LPID) and the coprocessor</div><div class='add'>+ * Process ID (PID), which the coprocessor compares to the authorized</div><div class='add'>+ * LPID and PID held in the coprocessor, to determine if the process</div><div class='add'>+ * is authorized to generate the transaction.  The data of the COP_REQ</div><div class='add'>+ * transaction is 128-byte or less in size and is placed in cacheable</div><div class='add'>+ * memory on a 128-byte cache line boundary.</div><div class='add'>+ *</div><div class='add'>+ * The task to use a coprocessor should use use_cop() to mark the use</div><div class='add'>+ * of the Coprocessor Type (CT) and context switching. On a server</div><div class='add'>+ * class processor, the PID register is used only for coprocessor</div><div class='add'>+ * management + * and so a coprocessor PID is allocated before</div><div class='add'>+ * executing icswx + * instruction. Drop_cop() is used to free the</div><div class='add'>+ * coprocessor PID.</div><div class='add'>+ *</div><div class='add'>+ * Example:</div><div class='add'>+ * Host Fabric Interface (HFI) is a PowerPC network coprocessor.</div><div class='add'>+ * Each HFI have multiple windows. Each HFI window serves as a</div><div class='add'>+ * network device sending to and receiving from HFI network.</div><div class='add'>+ * HFI immediate send function uses icswx instruction. The immediate</div><div class='add'>+ * send function allows small (single cache-line) packets be sent</div><div class='add'>+ * without using the regular HFI send FIFO and doorbell, which are</div><div class='add'>+ * much slower than immediate send.</div><div class='add'>+ *</div><div class='add'>+ * For each task intending to use HFI immediate send, the HFI driver</div><div class='add'>+ * calls use_cop() to obtain a coprocessor PID for the task.</div><div class='add'>+ * The HFI driver then allocate a free HFI window and save the</div><div class='add'>+ * coprocessor PID to the HFI window to allow the task to use the</div><div class='add'>+ * HFI window.</div><div class='add'>+ *</div><div class='add'>+ * The HFI driver repeatedly creates immediate send packets and</div><div class='add'>+ * issues icswx instruction to send data through the HFI window.</div><div class='add'>+ * The HFI compares the coprocessor PID in the CPU PID register</div><div class='add'>+ * to the PID held in the HFI window to determine if the transaction</div><div class='add'>+ * is allowed.</div><div class='add'>+ *</div><div class='add'>+ * When the task to release the HFI window, the HFI driver calls</div><div class='add'>+ * drop_cop() to release the coprocessor PID.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void switch_cop(struct mm_struct *next)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_ICSWX_PID</div><div class='add'>+	mtspr(SPRN_PID, next-&gt;context.cop_pid);</div><div class='add'>+#endif</div><div class='add'>+	mtspr(SPRN_ACOP, next-&gt;context.acop);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Start using a coprocessor.</div><div class='add'>+ * @acop: mask of coprocessor to be used.</div><div class='add'>+ * @mm: The mm the coprocessor to associate with. Most likely current mm.</div><div class='add'>+ *</div><div class='add'>+ * Return a positive PID if successful. Negative errno otherwise.</div><div class='add'>+ * The returned PID will be fed to the coprocessor to determine if an</div><div class='add'>+ * icswx transaction is authenticated.</div><div class='add'>+ */</div><div class='add'>+int use_cop(unsigned long acop, struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!cpu_has_feature(CPU_FTR_ICSWX))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!mm || !acop)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* The page_table_lock ensures mm_users won't change under us */</div><div class='add'>+	spin_lock(&amp;mm-&gt;page_table_lock);</div><div class='add'>+	spin_lock(mm-&gt;context.cop_lockp);</div><div class='add'>+</div><div class='add'>+	ret = get_cop_pid(mm);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* update acop */</div><div class='add'>+	mm-&gt;context.acop |= acop;</div><div class='add'>+</div><div class='add'>+	sync_cop(mm);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If this is a threaded process then there might be other threads</div><div class='add'>+	 * running. We need to send an IPI to force them to pick up any</div><div class='add'>+	 * change in PID and ACOP.</div><div class='add'>+	 */</div><div class='add'>+	if (atomic_read(&amp;mm-&gt;mm_users) &gt; 1)</div><div class='add'>+		smp_call_function(sync_cop, mm, 1);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(mm-&gt;context.cop_lockp);</div><div class='add'>+	spin_unlock(&amp;mm-&gt;page_table_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(use_cop);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Stop using a coprocessor.</div><div class='add'>+ * @acop: mask of coprocessor to be stopped.</div><div class='add'>+ * @mm: The mm the coprocessor associated with.</div><div class='add'>+ */</div><div class='add'>+void drop_cop(unsigned long acop, struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	int free_pid;</div><div class='add'>+</div><div class='add'>+	if (!cpu_has_feature(CPU_FTR_ICSWX))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!mm))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* The page_table_lock ensures mm_users won't change under us */</div><div class='add'>+	spin_lock(&amp;mm-&gt;page_table_lock);</div><div class='add'>+	spin_lock(mm-&gt;context.cop_lockp);</div><div class='add'>+</div><div class='add'>+	mm-&gt;context.acop &amp;= ~acop;</div><div class='add'>+</div><div class='add'>+	free_pid = disable_cop_pid(mm);</div><div class='add'>+	sync_cop(mm);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If this is a threaded process then there might be other threads</div><div class='add'>+	 * running. We need to send an IPI to force them to pick up any</div><div class='add'>+	 * change in PID and ACOP.</div><div class='add'>+	 */</div><div class='add'>+	if (atomic_read(&amp;mm-&gt;mm_users) &gt; 1)</div><div class='add'>+		smp_call_function(sync_cop, mm, 1);</div><div class='add'>+</div><div class='add'>+	if (free_pid != COP_PID_NONE)</div><div class='add'>+		free_cop_pid(free_pid);</div><div class='add'>+</div><div class='add'>+	spin_unlock(mm-&gt;context.cop_lockp);</div><div class='add'>+	spin_unlock(&amp;mm-&gt;page_table_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(drop_cop);</div><div class='add'>+</div><div class='add'>+static int acop_use_cop(int ct)</div><div class='add'>+{</div><div class='add'>+	/* todo */</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get the instruction word at the NIP</div><div class='add'>+ */</div><div class='add'>+static u32 acop_get_inst(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	u32 inst;</div><div class='add'>+	u32 __user *p;</div><div class='add'>+</div><div class='add'>+	p = (u32 __user *)regs-&gt;nip;</div><div class='add'>+	if (!access_ok(VERIFY_READ, p, sizeof(*p)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (__get_user(inst, p))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return inst;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * @regs: regsiters at time of interrupt</div><div class='add'>+ * @address: storage address</div><div class='add'>+ * @error_code: Fault code, usually the DSISR or ESR depending on</div><div class='add'>+ *		processor type</div><div class='add'>+ *</div><div class='add'>+ * Return 0 if we are able to resolve the data storage fault that</div><div class='add'>+ * results from a CT miss in the ACOP register.</div><div class='add'>+ */</div><div class='add'>+int acop_handle_fault(struct pt_regs *regs, unsigned long address,</div><div class='add'>+		      unsigned long error_code)</div><div class='add'>+{</div><div class='add'>+	int ct;</div><div class='add'>+	u32 inst = 0;</div><div class='add'>+</div><div class='add'>+	if (!cpu_has_feature(CPU_FTR_ICSWX)) {</div><div class='add'>+		pr_info("No coprocessors available");</div><div class='add'>+		_exception(SIGILL, regs, ILL_ILLOPN, address);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!user_mode(regs)) {</div><div class='add'>+		/* this could happen if the HV denies the</div><div class='add'>+		 * kernel access, for now we just die */</div><div class='add'>+		die("ICSWX from kernel failed", regs, SIGSEGV);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Some implementations leave us a hint for the CT */</div><div class='add'>+	ct = ICSWX_GET_CT_HINT(error_code);</div><div class='add'>+	if (ct &lt; 0) {</div><div class='add'>+		/* we have to peek at the instruction word to figure out CT */</div><div class='add'>+		u32 ccw;</div><div class='add'>+		u32 rs;</div><div class='add'>+</div><div class='add'>+		inst = acop_get_inst(regs);</div><div class='add'>+		if (inst == 0)</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		rs = (inst &gt;&gt; (31 - 10)) &amp; 0x1f;</div><div class='add'>+		ccw = regs-&gt;gpr[rs];</div><div class='add'>+		ct = (ccw &gt;&gt; 16) &amp; 0x3f;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!acop_use_cop(ct))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* at this point the CT is unknown to the system */</div><div class='add'>+	pr_warn("%s[%d]: Coprocessor %d is unavailable",</div><div class='add'>+		current-&gt;comm, current-&gt;pid, ct);</div><div class='add'>+</div><div class='add'>+	/* get inst if we don't already have it */</div><div class='add'>+	if (inst == 0) {</div><div class='add'>+		inst = acop_get_inst(regs);</div><div class='add'>+		if (inst == 0)</div><div class='add'>+			return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if the instruction is the "record form" */</div><div class='add'>+	if (inst &amp; 1) {</div><div class='add'>+		/*</div><div class='add'>+		 * the instruction is "record" form so we can reject</div><div class='add'>+		 * using CR0</div><div class='add'>+		 */</div><div class='add'>+		regs-&gt;ccr &amp;= ~(0xful &lt;&lt; 28);</div><div class='add'>+		regs-&gt;ccr |= ICSWX_RC_NOT_FOUND &lt;&lt; 28;</div><div class='add'>+</div><div class='add'>+		/* Move on to the next instruction */</div><div class='add'>+		regs-&gt;nip += 4;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * There is no architected mechanism to report a bad</div><div class='add'>+		 * CT so we could either SIGILL or report nothing.</div><div class='add'>+		 * Since the non-record version should only bu used</div><div class='add'>+		 * for "hints" or "don't care" we should probably do</div><div class='add'>+		 * nothing.  However, I could see how some people</div><div class='add'>+		 * might want an SIGILL so it here if you want it.</div><div class='add'>+		 */</div><div class='add'>+#ifdef CONFIG_PPC_ICSWX_USE_SIGILL</div><div class='add'>+		_exception(SIGILL, regs, ILL_ILLOPN, address);</div><div class='add'>+#else</div><div class='add'>+		regs-&gt;nip += 4;</div><div class='add'>+#endif</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(acop_handle_fault);</div><div class='head'>diff --git a/arch/powerpc/mm/icswx.h b/arch/powerpc/mm/icswx.h<br/>new file mode 100644<br/>index 000000000000..42176bd0884c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/icswx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/mm/icswx.h</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+#ifndef _ARCH_POWERPC_MM_ICSWX_H_</div><div class='add'>+#define _ARCH_POWERPC_MM_ICSWX_H_</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  ICSWX and ACOP Management</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2011 Anton Blanchard, IBM Corp. &lt;anton@samba.org&gt;</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'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mmu_context.h&gt;</div><div class='add'>+</div><div class='add'>+/* also used to denote that PIDs are not used */</div><div class='add'>+#define COP_PID_NONE 0</div><div class='add'>+</div><div class='add'>+static inline void sync_cop(void *arg)</div><div class='add'>+{</div><div class='add'>+	struct mm_struct *mm = arg;</div><div class='add'>+</div><div class='add'>+	if (mm == current-&gt;active_mm)</div><div class='add'>+		switch_cop(current-&gt;active_mm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC_ICSWX_PID</div><div class='add'>+extern int get_cop_pid(struct mm_struct *mm);</div><div class='add'>+extern int disable_cop_pid(struct mm_struct *mm);</div><div class='add'>+extern void free_cop_pid(int free_pid);</div><div class='add'>+#else</div><div class='add'>+#define get_cop_pid(m) (COP_PID_NONE)</div><div class='add'>+#define disable_cop_pid(m) (COP_PID_NONE)</div><div class='add'>+#define free_cop_pid(p)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These are implementation bits for architected registers.  If this</div><div class='add'>+ * ever becomes architecture the should be moved to reg.h et. al.</div><div class='add'>+ */</div><div class='add'>+/* UCT is the same bit for Server and Embedded */</div><div class='add'>+#define ICSWX_DSI_UCT		0x00004000  /* Unavailable Coprocessor Type */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC_BOOK3E</div><div class='add'>+/* Embedded implementation gives us no hints as to what the CT is */</div><div class='add'>+#define ICSWX_GET_CT_HINT(x) (-1)</div><div class='add'>+#else</div><div class='add'>+/* Server implementation contains the CT value in the DSISR */</div><div class='add'>+#define ICSWX_DSISR_CTMASK	0x00003f00</div><div class='add'>+#define ICSWX_GET_CT_HINT(x)	(((x) &amp; ICSWX_DSISR_CTMASK) &gt;&gt; 8)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define ICSWX_RC_STARTED	0x8	/* The request has been started */</div><div class='add'>+#define ICSWX_RC_NOT_IDLE	0x4	/* No coprocessor found idle */</div><div class='add'>+#define ICSWX_RC_NOT_FOUND	0x2	/* No coprocessor found */</div><div class='add'>+#define ICSWX_RC_UNDEFINED	0x1	/* Reserved */</div><div class='add'>+</div><div class='add'>+extern int acop_handle_fault(struct pt_regs *regs, unsigned long address,</div><div class='add'>+			     unsigned long error_code);</div><div class='add'>+#endif /* !_ARCH_POWERPC_MM_ICSWX_H_ */</div><div class='head'>diff --git a/arch/powerpc/mm/icswx_pid.c b/arch/powerpc/mm/icswx_pid.c<br/>new file mode 100644<br/>index 000000000000..91e30eb7d054<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/icswx_pid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/mm/icswx_pid.c</a></div><div class='hunk'>@@ -0,0 +1,87 @@</div><div class='add'>+/*</div><div class='add'>+ *  ICSWX and ACOP/PID Management</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2011 Anton Blanchard, IBM Corp. &lt;anton@samba.org&gt;</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'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/idr.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include "icswx.h"</div><div class='add'>+</div><div class='add'>+#define COP_PID_MIN (COP_PID_NONE + 1)</div><div class='add'>+#define COP_PID_MAX (0xFFFF)</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(mmu_context_acop_lock);</div><div class='add'>+static DEFINE_IDA(cop_ida);</div><div class='add'>+</div><div class='add'>+static int new_cop_pid(struct ida *ida, int min_id, int max_id,</div><div class='add'>+		       spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	int index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+again:</div><div class='add'>+	if (!ida_pre_get(ida, GFP_KERNEL))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock(lock);</div><div class='add'>+	err = ida_get_new_above(ida, min_id, &amp;index);</div><div class='add'>+	spin_unlock(lock);</div><div class='add'>+</div><div class='add'>+	if (err == -EAGAIN)</div><div class='add'>+		goto again;</div><div class='add'>+	else if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (index &gt; max_id) {</div><div class='add'>+		spin_lock(lock);</div><div class='add'>+		ida_remove(ida, index);</div><div class='add'>+		spin_unlock(lock);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int get_cop_pid(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	int pid;</div><div class='add'>+</div><div class='add'>+	if (mm-&gt;context.cop_pid == COP_PID_NONE) {</div><div class='add'>+		pid = new_cop_pid(&amp;cop_ida, COP_PID_MIN, COP_PID_MAX,</div><div class='add'>+				  &amp;mmu_context_acop_lock);</div><div class='add'>+		if (pid &gt;= 0)</div><div class='add'>+			mm-&gt;context.cop_pid = pid;</div><div class='add'>+	}</div><div class='add'>+	return mm-&gt;context.cop_pid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int disable_cop_pid(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	int free_pid = COP_PID_NONE;</div><div class='add'>+</div><div class='add'>+	if ((!mm-&gt;context.acop) &amp;&amp; (mm-&gt;context.cop_pid != COP_PID_NONE)) {</div><div class='add'>+		free_pid = mm-&gt;context.cop_pid;</div><div class='add'>+		mm-&gt;context.cop_pid = COP_PID_NONE;</div><div class='add'>+	}</div><div class='add'>+	return free_pid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void free_cop_pid(int free_pid)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;mmu_context_acop_lock);</div><div class='add'>+	ida_remove(&amp;cop_ida, free_pid);</div><div class='add'>+	spin_unlock(&amp;mmu_context_acop_lock);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c<br/>index 58861fa1220e..6157be2a7049 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/init_32.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/init_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/init_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/mm/init_32.c</a></div><div class='hunk'>@@ -65,6 +65,13 @@ phys_addr_t memstart_addr = (phys_addr_t)~0ull;</div><div class='ctx'> EXPORT_SYMBOL(memstart_addr);</div><div class='ctx'> phys_addr_t kernstart_addr;</div><div class='ctx'> EXPORT_SYMBOL(kernstart_addr);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RELOCATABLE_PPC32</div><div class='add'>+/* Used in __va()/__pa() */</div><div class='add'>+long long virt_phys_offset;</div><div class='add'>+EXPORT_SYMBOL(virt_phys_offset);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> phys_addr_t lowmem_end_addr;</div><div class='ctx'> </div><div class='ctx'> int boot_mapsize;</div><div class='head'>diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c<br/>index 8e2eb6611b0b..d974b79a3068 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/mem.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/mem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/mem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/mm/mem.c</a></div><div class='hunk'>@@ -51,6 +51,7 @@</div><div class='ctx'> #include &lt;asm/vdso.h&gt;</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='ctx'> #include &lt;asm/swiotlb.h&gt;</div><div class='add'>+#include &lt;asm/rtas.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mmu_decl.h"</div><div class='ctx'> </div><div class='hunk'>@@ -553,7 +554,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,</div><div class='ctx'> #if (defined(CONFIG_PPC_BOOK3E_64) || defined(CONFIG_PPC_FSL_BOOK3E)) \</div><div class='ctx'> 	&amp;&amp; defined(CONFIG_HUGETLB_PAGE)</div><div class='ctx'> 	if (is_vm_hugetlb_page(vma))</div><div class='del'>-		book3e_hugetlb_preload(vma-&gt;vm_mm, address, *ptep);</div><div class='add'>+		book3e_hugetlb_preload(vma, address, *ptep);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -585,3 +586,23 @@ static int add_system_ram_resources(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> subsys_initcall(add_system_ram_resources);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_STRICT_DEVMEM</div><div class='add'>+/*</div><div class='add'>+ * devmem_is_allowed(): check to see if /dev/mem access to a certain address</div><div class='add'>+ * is valid. The argument is a physical page number.</div><div class='add'>+ *</div><div class='add'>+ * Access has to be given to non-kernel-ram areas as well, these contain the</div><div class='add'>+ * PCI mmio resources as well as potential bios/acpi data regions.</div><div class='add'>+ */</div><div class='add'>+int devmem_is_allowed(unsigned long pfn)</div><div class='add'>+{</div><div class='add'>+	if (iomem_is_exclusive(pfn &lt;&lt; PAGE_SHIFT))</div><div class='add'>+		return 0;</div><div class='add'>+	if (!page_is_ram(pfn))</div><div class='add'>+		return 1;</div><div class='add'>+	if (page_is_rtas_user_buf(pfn))</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_STRICT_DEVMEM */</div><div class='head'>diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c<br/>index 5a783d8e8e8e..67a42ed0d2fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/mmap_64.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/mmap_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/mmap_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/mm/mmap_64.c</a></div><div class='hunk'>@@ -53,14 +53,6 @@ static inline int mmap_is_legacy(void)</div><div class='ctx'> 	return sysctl_legacy_va_layout;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Since get_random_int() returns the same value within a 1 jiffy window,</div><div class='del'>- * we will almost always get the same randomisation for the stack and mmap</div><div class='del'>- * region. This will mean the relative distance between stack and mmap will</div><div class='del'>- * be the same.</div><div class='del'>- *</div><div class='del'>- * To avoid this we can shift the randomness by 1 bit.</div><div class='del'>- */</div><div class='ctx'> static unsigned long mmap_rnd(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long rnd = 0;</div><div class='hunk'>@@ -68,11 +60,11 @@ static unsigned long mmap_rnd(void)</div><div class='ctx'> 	if (current-&gt;flags &amp; PF_RANDOMIZE) {</div><div class='ctx'> 		/* 8MB for 32bit, 1GB for 64bit */</div><div class='ctx'> 		if (is_32bit_task())</div><div class='del'>-			rnd = (long)(get_random_int() % (1&lt;&lt;(22-PAGE_SHIFT)));</div><div class='add'>+			rnd = (long)(get_random_int() % (1&lt;&lt;(23-PAGE_SHIFT)));</div><div class='ctx'> 		else</div><div class='del'>-			rnd = (long)(get_random_int() % (1&lt;&lt;(29-PAGE_SHIFT)));</div><div class='add'>+			rnd = (long)(get_random_int() % (1&lt;&lt;(30-PAGE_SHIFT)));</div><div class='ctx'> 	}</div><div class='del'>-	return (rnd &lt;&lt; PAGE_SHIFT) * 2;</div><div class='add'>+	return rnd &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long mmap_base(void)</div><div class='head'>diff --git a/arch/powerpc/mm/mmu_context_hash64.c b/arch/powerpc/mm/mmu_context_hash64.c<br/>index ca988a3d5fb2..40677aa0190e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/mmu_context_hash64.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/mmu_context_hash64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/mmu_context_hash64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/mm/mmu_context_hash64.c</a></div><div class='hunk'>@@ -24,200 +24,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_ICSWX</div><div class='del'>-/*</div><div class='del'>- * The processor and its L2 cache cause the icswx instruction to</div><div class='del'>- * generate a COP_REQ transaction on PowerBus. The transaction has</div><div class='del'>- * no address, and the processor does not perform an MMU access</div><div class='del'>- * to authenticate the transaction. The command portion of the</div><div class='del'>- * PowerBus COP_REQ transaction includes the LPAR_ID (LPID) and</div><div class='del'>- * the coprocessor Process ID (PID), which the coprocessor compares</div><div class='del'>- * to the authorized LPID and PID held in the coprocessor, to determine</div><div class='del'>- * if the process is authorized to generate the transaction.</div><div class='del'>- * The data of the COP_REQ transaction is 128-byte or less and is</div><div class='del'>- * placed in cacheable memory on a 128-byte cache line boundary.</div><div class='del'>- *</div><div class='del'>- * The task to use a coprocessor should use use_cop() to allocate</div><div class='del'>- * a coprocessor PID before executing icswx instruction. use_cop()</div><div class='del'>- * also enables the coprocessor context switching. Drop_cop() is</div><div class='del'>- * used to free the coprocessor PID.</div><div class='del'>- *</div><div class='del'>- * Example:</div><div class='del'>- * Host Fabric Interface (HFI) is a PowerPC network coprocessor.</div><div class='del'>- * Each HFI have multiple windows. Each HFI window serves as a</div><div class='del'>- * network device sending to and receiving from HFI network.</div><div class='del'>- * HFI immediate send function uses icswx instruction. The immediate</div><div class='del'>- * send function allows small (single cache-line) packets be sent</div><div class='del'>- * without using the regular HFI send FIFO and doorbell, which are</div><div class='del'>- * much slower than immediate send.</div><div class='del'>- *</div><div class='del'>- * For each task intending to use HFI immediate send, the HFI driver</div><div class='del'>- * calls use_cop() to obtain a coprocessor PID for the task.</div><div class='del'>- * The HFI driver then allocate a free HFI window and save the</div><div class='del'>- * coprocessor PID to the HFI window to allow the task to use the</div><div class='del'>- * HFI window.</div><div class='del'>- *</div><div class='del'>- * The HFI driver repeatedly creates immediate send packets and</div><div class='del'>- * issues icswx instruction to send data through the HFI window.</div><div class='del'>- * The HFI compares the coprocessor PID in the CPU PID register</div><div class='del'>- * to the PID held in the HFI window to determine if the transaction</div><div class='del'>- * is allowed.</div><div class='del'>- *</div><div class='del'>- * When the task to release the HFI window, the HFI driver calls</div><div class='del'>- * drop_cop() to release the coprocessor PID.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define COP_PID_NONE 0</div><div class='del'>-#define COP_PID_MIN (COP_PID_NONE + 1)</div><div class='del'>-#define COP_PID_MAX (0xFFFF)</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(mmu_context_acop_lock);</div><div class='del'>-static DEFINE_IDA(cop_ida);</div><div class='del'>-</div><div class='del'>-void switch_cop(struct mm_struct *next)</div><div class='del'>-{</div><div class='del'>-	mtspr(SPRN_PID, next-&gt;context.cop_pid);</div><div class='del'>-	mtspr(SPRN_ACOP, next-&gt;context.acop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int new_cop_pid(struct ida *ida, int min_id, int max_id,</div><div class='del'>-		       spinlock_t *lock)</div><div class='del'>-{</div><div class='del'>-	int index;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-again:</div><div class='del'>-	if (!ida_pre_get(ida, GFP_KERNEL))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	spin_lock(lock);</div><div class='del'>-	err = ida_get_new_above(ida, min_id, &amp;index);</div><div class='del'>-	spin_unlock(lock);</div><div class='del'>-</div><div class='del'>-	if (err == -EAGAIN)</div><div class='del'>-		goto again;</div><div class='del'>-	else if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (index &gt; max_id) {</div><div class='del'>-		spin_lock(lock);</div><div class='del'>-		ida_remove(ida, index);</div><div class='del'>-		spin_unlock(lock);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return index;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sync_cop(void *arg)</div><div class='del'>-{</div><div class='del'>-	struct mm_struct *mm = arg;</div><div class='del'>-</div><div class='del'>-	if (mm == current-&gt;active_mm)</div><div class='del'>-		switch_cop(current-&gt;active_mm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Start using a coprocessor.</div><div class='del'>- * @acop: mask of coprocessor to be used.</div><div class='del'>- * @mm: The mm the coprocessor to associate with. Most likely current mm.</div><div class='del'>- *</div><div class='del'>- * Return a positive PID if successful. Negative errno otherwise.</div><div class='del'>- * The returned PID will be fed to the coprocessor to determine if an</div><div class='del'>- * icswx transaction is authenticated.</div><div class='del'>- */</div><div class='del'>-int use_cop(unsigned long acop, struct mm_struct *mm)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!cpu_has_feature(CPU_FTR_ICSWX))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (!mm || !acop)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* The page_table_lock ensures mm_users won't change under us */</div><div class='del'>-	spin_lock(&amp;mm-&gt;page_table_lock);</div><div class='del'>-	spin_lock(mm-&gt;context.cop_lockp);</div><div class='del'>-</div><div class='del'>-	if (mm-&gt;context.cop_pid == COP_PID_NONE) {</div><div class='del'>-		ret = new_cop_pid(&amp;cop_ida, COP_PID_MIN, COP_PID_MAX,</div><div class='del'>-				  &amp;mmu_context_acop_lock);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		mm-&gt;context.cop_pid = ret;</div><div class='del'>-	}</div><div class='del'>-	mm-&gt;context.acop |= acop;</div><div class='del'>-</div><div class='del'>-	sync_cop(mm);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If this is a threaded process then there might be other threads</div><div class='del'>-	 * running. We need to send an IPI to force them to pick up any</div><div class='del'>-	 * change in PID and ACOP.</div><div class='del'>-	 */</div><div class='del'>-	if (atomic_read(&amp;mm-&gt;mm_users) &gt; 1)</div><div class='del'>-		smp_call_function(sync_cop, mm, 1);</div><div class='del'>-</div><div class='del'>-	ret = mm-&gt;context.cop_pid;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	spin_unlock(mm-&gt;context.cop_lockp);</div><div class='del'>-	spin_unlock(&amp;mm-&gt;page_table_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(use_cop);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Stop using a coprocessor.</div><div class='del'>- * @acop: mask of coprocessor to be stopped.</div><div class='del'>- * @mm: The mm the coprocessor associated with.</div><div class='del'>- */</div><div class='del'>-void drop_cop(unsigned long acop, struct mm_struct *mm)</div><div class='del'>-{</div><div class='del'>-	int free_pid = COP_PID_NONE;</div><div class='del'>-</div><div class='del'>-	if (!cpu_has_feature(CPU_FTR_ICSWX))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON_ONCE(!mm))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* The page_table_lock ensures mm_users won't change under us */</div><div class='del'>-	spin_lock(&amp;mm-&gt;page_table_lock);</div><div class='del'>-	spin_lock(mm-&gt;context.cop_lockp);</div><div class='del'>-</div><div class='del'>-	mm-&gt;context.acop &amp;= ~acop;</div><div class='del'>-</div><div class='del'>-	if ((!mm-&gt;context.acop) &amp;&amp; (mm-&gt;context.cop_pid != COP_PID_NONE)) {</div><div class='del'>-		free_pid = mm-&gt;context.cop_pid;</div><div class='del'>-		mm-&gt;context.cop_pid = COP_PID_NONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sync_cop(mm);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If this is a threaded process then there might be other threads</div><div class='del'>-	 * running. We need to send an IPI to force them to pick up any</div><div class='del'>-	 * change in PID and ACOP.</div><div class='del'>-	 */</div><div class='del'>-	if (atomic_read(&amp;mm-&gt;mm_users) &gt; 1)</div><div class='del'>-		smp_call_function(sync_cop, mm, 1);</div><div class='del'>-</div><div class='del'>-	if (free_pid != COP_PID_NONE) {</div><div class='del'>-		spin_lock(&amp;mmu_context_acop_lock);</div><div class='del'>-		ida_remove(&amp;cop_ida, free_pid);</div><div class='del'>-		spin_unlock(&amp;mmu_context_acop_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock(mm-&gt;context.cop_lockp);</div><div class='del'>-	spin_unlock(&amp;mm-&gt;page_table_lock);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(drop_cop);</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_PPC_ICSWX */</div><div class='add'>+#include "icswx.h"</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(mmu_context_lock);</div><div class='ctx'> static DEFINE_IDA(mmu_context_ida);</div><div class='head'>diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c<br/>index e6eea0ac80c8..3feefc3842a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/numa.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/numa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/numa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/mm/numa.c</a></div><div class='hunk'>@@ -58,7 +58,7 @@ static int distance_lookup_table[MAX_NUMNODES][MAX_DISTANCE_REF_POINTS];</div><div class='ctx'>  * Allocate node_to_cpumask_map based on number of available nodes</div><div class='ctx'>  * Requires node_possible_map to be valid.</div><div class='ctx'>  *</div><div class='del'>- * Note: node_to_cpumask() is not valid until after this is done.</div><div class='add'>+ * Note: cpumask_of_node() is not valid until after this is done.</div><div class='ctx'>  */</div><div class='ctx'> static void __init setup_node_to_cpumask_map(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -386,7 +386,7 @@ static void __init get_n_mem_cells(int *n_addr_cells, int *n_size_cells)</div><div class='ctx'> 	of_node_put(memory);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned long __devinit read_n_cells(int n, const unsigned int **buf)</div><div class='add'>+static unsigned long read_n_cells(int n, const unsigned int **buf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long result = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -501,7 +501,7 @@ static int of_get_assoc_arrays(struct device_node *memory,</div><div class='ctx'> 	aa-&gt;n_arrays = *prop++;</div><div class='ctx'> 	aa-&gt;array_sz = *prop++;</div><div class='ctx'> </div><div class='del'>-	/* Now that we know the number of arrrays and size of each array,</div><div class='add'>+	/* Now that we know the number of arrays and size of each array,</div><div class='ctx'> 	 * revalidate the size of the property read in.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (len &lt; (aa-&gt;n_arrays * aa-&gt;array_sz + 2) * sizeof(unsigned int))</div><div class='hunk'>@@ -947,7 +947,7 @@ static struct notifier_block __cpuinitdata ppc64_numa_nb = {</div><div class='ctx'> 	.priority = 1 /* Must run before sched domains notifier. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void mark_reserved_regions_for_nid(int nid)</div><div class='add'>+static void __init mark_reserved_regions_for_nid(int nid)</div><div class='ctx'> {</div><div class='ctx'> 	struct pglist_data *node = NODE_DATA(nid);</div><div class='ctx'> 	struct memblock_region *reg;</div><div class='hunk'>@@ -1440,7 +1440,7 @@ int arch_update_cpu_topology(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu, nid, old_nid;</div><div class='ctx'> 	unsigned int associativity[VPHN_ASSOC_BUFSIZE] = {0};</div><div class='del'>-	struct sys_device *sysdev;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> </div><div class='ctx'> 	for_each_cpu(cpu,&amp;cpu_associativity_changes_mask) {</div><div class='ctx'> 		vphn_get_associativity(cpu, associativity);</div><div class='hunk'>@@ -1461,9 +1461,9 @@ int arch_update_cpu_topology(void)</div><div class='ctx'> 		register_cpu_under_node(cpu, nid);</div><div class='ctx'> 		put_online_cpus();</div><div class='ctx'> </div><div class='del'>-		sysdev = get_cpu_sysdev(cpu);</div><div class='del'>-		if (sysdev)</div><div class='del'>-			kobject_uevent(&amp;sysdev-&gt;kobj, KOBJ_CHANGE);</div><div class='add'>+		dev = get_cpu_device(cpu);</div><div class='add'>+		if (dev)</div><div class='add'>+			kobject_uevent(&amp;dev-&gt;kobj, KOBJ_CHANGE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='head'>diff --git a/arch/powerpc/mm/tlb_low_64e.S b/arch/powerpc/mm/tlb_low_64e.S<br/>index dc4a5f385e41..ff672bd8fea9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/tlb_low_64e.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/tlb_low_64e.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/tlb_low_64e.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/mm/tlb_low_64e.S</a></div><div class='hunk'>@@ -94,11 +94,11 @@</div><div class='ctx'> </div><div class='ctx'> 	srdi	r15,r16,60		/* get region */</div><div class='ctx'> 	rldicl.	r10,r16,64-PGTABLE_EADDR_SIZE,PGTABLE_EADDR_SIZE+4</div><div class='del'>-	bne-	dtlb_miss_fault_bolted</div><div class='add'>+	bne-	dtlb_miss_fault_bolted	/* Bail if fault addr is invalid */</div><div class='ctx'> </div><div class='ctx'> 	rlwinm	r10,r11,32-19,27,27</div><div class='ctx'> 	rlwimi	r10,r11,32-16,19,19</div><div class='del'>-	cmpwi	r15,0</div><div class='add'>+	cmpwi	r15,0			/* user vs kernel check */</div><div class='ctx'> 	ori	r10,r10,_PAGE_PRESENT</div><div class='ctx'> 	oris	r11,r10,_PAGE_ACCESSED@h</div><div class='ctx'> </div><div class='hunk'>@@ -120,44 +120,38 @@ tlb_miss_common_bolted:</div><div class='ctx'> 	rldicl	r15,r16,64-PGDIR_SHIFT+3,64-PGD_INDEX_SIZE-3</div><div class='ctx'> 	cmpldi	cr0,r14,0</div><div class='ctx'> 	clrrdi	r15,r15,3</div><div class='del'>-	beq	tlb_miss_fault_bolted</div><div class='add'>+	beq	tlb_miss_fault_bolted	/* No PGDIR, bail */</div><div class='ctx'> </div><div class='ctx'> BEGIN_MMU_FTR_SECTION</div><div class='ctx'> 	/* Set the TLB reservation and search for existing entry. Then load</div><div class='ctx'> 	 * the entry.</div><div class='ctx'> 	 */</div><div class='ctx'> 	PPC_TLBSRX_DOT(0,r16)</div><div class='del'>-	ldx	r14,r14,r15</div><div class='del'>-	beq	normal_tlb_miss_done</div><div class='add'>+	ldx	r14,r14,r15		/* grab pgd entry */</div><div class='add'>+	beq	normal_tlb_miss_done	/* tlb exists already, bail */</div><div class='ctx'> MMU_FTR_SECTION_ELSE</div><div class='del'>-	ldx	r14,r14,r15</div><div class='add'>+	ldx	r14,r14,r15		/* grab pgd entry */</div><div class='ctx'> ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_USE_TLBRSRV)</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_PPC_64K_PAGES</div><div class='ctx'> 	rldicl	r15,r16,64-PUD_SHIFT+3,64-PUD_INDEX_SIZE-3</div><div class='ctx'> 	clrrdi	r15,r15,3</div><div class='del'>-</div><div class='del'>-	cmpldi	cr0,r14,0</div><div class='del'>-	beq	tlb_miss_fault_bolted</div><div class='del'>-</div><div class='del'>-	ldx	r14,r14,r15</div><div class='add'>+	cmpdi	cr0,r14,0</div><div class='add'>+	bge	tlb_miss_fault_bolted	/* Bad pgd entry or hugepage; bail */</div><div class='add'>+	ldx	r14,r14,r15		/* grab pud entry */</div><div class='ctx'> #endif /* CONFIG_PPC_64K_PAGES */</div><div class='ctx'> </div><div class='ctx'> 	rldicl	r15,r16,64-PMD_SHIFT+3,64-PMD_INDEX_SIZE-3</div><div class='ctx'> 	clrrdi	r15,r15,3</div><div class='del'>-</div><div class='del'>-	cmpldi	cr0,r14,0</div><div class='del'>-	beq	tlb_miss_fault_bolted</div><div class='del'>-</div><div class='del'>-	ldx	r14,r14,r15</div><div class='add'>+	cmpdi	cr0,r14,0</div><div class='add'>+	bge	tlb_miss_fault_bolted</div><div class='add'>+	ldx	r14,r14,r15		/* Grab pmd entry */</div><div class='ctx'> </div><div class='ctx'> 	rldicl	r15,r16,64-PAGE_SHIFT+3,64-PTE_INDEX_SIZE-3</div><div class='ctx'> 	clrrdi	r15,r15,3</div><div class='del'>-</div><div class='del'>-	cmpldi	cr0,r14,0</div><div class='del'>-	beq	tlb_miss_fault_bolted</div><div class='del'>-</div><div class='del'>-	ldx	r14,r14,r15</div><div class='add'>+	cmpdi	cr0,r14,0</div><div class='add'>+	bge	tlb_miss_fault_bolted</div><div class='add'>+	ldx	r14,r14,r15		/* Grab PTE, normal (!huge) page */</div><div class='ctx'> </div><div class='ctx'> 	/* Check if required permissions are met */</div><div class='ctx'> 	andc.	r15,r11,r14</div><div class='head'>diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c<br/>index 573ba3b69d1f..df32a838dcfa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/tlb_nohash.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/mm/tlb_nohash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/tlb_nohash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/mm/tlb_nohash.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'>  * indirect page table entries.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_PPC_BOOK3E_MMU</div><div class='del'>-#ifdef CONFIG_FSL_BOOKE</div><div class='add'>+#ifdef CONFIG_PPC_FSL_BOOK3E</div><div class='ctx'> struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT] = {</div><div class='ctx'> 	[MMU_PAGE_4K] = {</div><div class='ctx'> 		.shift	= 12,</div><div class='head'>diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig<br/>index 153022971daa..a392d12dd21f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/40x/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/40x/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/40x/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/40x/Kconfig</a></div><div class='hunk'>@@ -1,19 +1,3 @@</div><div class='del'>-#config BUBINGA</div><div class='del'>-#	bool "Bubinga"</div><div class='del'>-#	depends on 40x</div><div class='del'>-#	default n</div><div class='del'>-#	select 405EP</div><div class='del'>-#	help</div><div class='del'>-#	  This option enables support for the IBM 405EP evaluation board.</div><div class='del'>-</div><div class='del'>-#config CPCI405</div><div class='del'>-#	bool "CPCI405"</div><div class='del'>-#	depends on 40x</div><div class='del'>-#	default n</div><div class='del'>-#	select 405GP</div><div class='del'>-#	help</div><div class='del'>-#	  This option enables support for the CPCI405 board.</div><div class='del'>-</div><div class='ctx'> config ACADIA</div><div class='ctx'> 	bool "Acadia"</div><div class='ctx'> 	depends on 40x</div><div class='hunk'>@@ -65,14 +49,6 @@ config MAKALU</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the AMCC PPC405EX board.</div><div class='ctx'> </div><div class='del'>-#config SYCAMORE</div><div class='del'>-#	bool "Sycamore"</div><div class='del'>-#	depends on 40x</div><div class='del'>-#	default n</div><div class='del'>-#	select 405GPR</div><div class='del'>-#	help</div><div class='del'>-#	  This option enables support for the IBM PPC405GPr evaluation board.</div><div class='del'>-</div><div class='ctx'> config WALNUT</div><div class='ctx'> 	bool "Walnut"</div><div class='ctx'> 	depends on 40x</div><div class='hunk'>@@ -100,6 +76,16 @@ config XILINX_VIRTEX_GENERIC_BOARD</div><div class='ctx'> 	  Most Virtex designs should use this unless it needs to do some</div><div class='ctx'> 	  special configuration at board probe time.</div><div class='ctx'> </div><div class='add'>+config OBS600</div><div class='add'>+	bool "OpenBlockS 600"</div><div class='add'>+	depends on 40x</div><div class='add'>+	default n</div><div class='add'>+	select 405EX</div><div class='add'>+	select PPC40x_SIMPLE</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for PlatHome OpenBlockS 600 server</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> config PPC40x_SIMPLE</div><div class='ctx'> 	bool "Simple PowerPC 40x board support"</div><div class='ctx'> 	depends on 40x</div><div class='hunk'>@@ -173,16 +159,11 @@ config IBM405_ERR77</div><div class='ctx'> config IBM405_ERR51</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='del'>-#config BIOS_FIXUP</div><div class='del'>-#	bool</div><div class='del'>-#	depends on BUBINGA || EP405 || SYCAMORE || WALNUT</div><div class='del'>-#	default y</div><div class='del'>-</div><div class='del'>-#config PPC4xx_DMA</div><div class='del'>-#	bool "PPC4xx DMA controller support"</div><div class='del'>-#	depends on 4xx</div><div class='del'>-</div><div class='del'>-#config PPC4xx_EDMA</div><div class='del'>-#	bool</div><div class='del'>-#	depends on !STB03xxx &amp;&amp; PPC4xx_DMA</div><div class='del'>-#	default y</div><div class='add'>+config APM8018X</div><div class='add'>+	bool "APM8018X"</div><div class='add'>+	depends on 40x</div><div class='add'>+	default n</div><div class='add'>+	select PPC40x_SIMPLE</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for the AppliedMicro APM8018X evaluation</div><div class='add'>+	  board.</div><div class='head'>diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c<br/>index e8dd5c5df7d9..97612068fae3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/40x/ppc40x_simple.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/40x/ppc40x_simple.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/40x/ppc40x_simple.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/40x/ppc40x_simple.c</a></div><div class='hunk'>@@ -55,7 +55,9 @@ static const char *board[] __initdata = {</div><div class='ctx'> 	"amcc,haleakala",</div><div class='ctx'> 	"amcc,kilauea",</div><div class='ctx'> 	"amcc,makalu",</div><div class='del'>-	"est,hotfoot"</div><div class='add'>+	"apm,klondike",</div><div class='add'>+	"est,hotfoot",</div><div class='add'>+	"plathome,obs600"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ppc40x_probe(void)</div><div class='head'>diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig<br/>index 762322ce24a9..fcf6bf2ceee9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/44x/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/44x/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/44x/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/44x/Kconfig</a></div><div class='hunk'>@@ -75,7 +75,7 @@ config KATMAI</div><div class='ctx'> 	select PCI</div><div class='ctx'> 	select PPC4xx_PCI_EXPRESS</div><div class='ctx'> 	select PCI_MSI</div><div class='del'>-	select PCC4xx_MSI</div><div class='add'>+	select PPC4xx_MSI</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the AMCC PPC440SPe evaluation board.</div><div class='ctx'> </div><div class='hunk'>@@ -186,6 +186,16 @@ config ISS4xx</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the IBM ISS simulation environment</div><div class='ctx'> </div><div class='add'>+config CURRITUCK</div><div class='add'>+	bool "IBM Currituck (476fpe) Support"</div><div class='add'>+	depends on PPC_47x</div><div class='add'>+	default n</div><div class='add'>+	select SWIOTLB</div><div class='add'>+	select 476FPE</div><div class='add'>+	select PPC4xx_PCI_EXPRESS</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for the IBM Currituck (476fpe) evaluation board</div><div class='add'>+</div><div class='ctx'> config ICON</div><div class='ctx'> 	bool "Icon"</div><div class='ctx'> 	depends on 44x</div><div class='hunk'>@@ -197,22 +207,6 @@ config ICON</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the AMCC PPC440SPe evaluation board.</div><div class='ctx'> </div><div class='del'>-#config LUAN</div><div class='del'>-#	bool "Luan"</div><div class='del'>-#	depends on 44x</div><div class='del'>-#	default n</div><div class='del'>-#	select 440SP</div><div class='del'>-#	help</div><div class='del'>-#	  This option enables support for the IBM PPC440SP evaluation board.</div><div class='del'>-</div><div class='del'>-#config OCOTEA</div><div class='del'>-#	bool "Ocotea"</div><div class='del'>-#	depends on 44x</div><div class='del'>-#	default n</div><div class='del'>-#	select 440GX</div><div class='del'>-#	help</div><div class='del'>-#	  This option enables support for the IBM PPC440GX evaluation board.</div><div class='del'>-</div><div class='ctx'> config XILINX_VIRTEX440_GENERIC_BOARD</div><div class='ctx'> 	bool "Generic Xilinx Virtex 5 FXT board support"</div><div class='ctx'> 	depends on 44x</div><div class='hunk'>@@ -308,6 +302,10 @@ config 460SX</div><div class='ctx'> 	select IBM_EMAC_ZMII</div><div class='ctx'> 	select IBM_EMAC_TAH</div><div class='ctx'> </div><div class='add'>+config 476FPE</div><div class='add'>+	bool</div><div class='add'>+	select PPC_FPU</div><div class='add'>+</div><div class='ctx'> config APM821xx</div><div class='ctx'> 	bool</div><div class='ctx'> 	select PPC_FPU</div><div class='head'>diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile<br/>index 553db6007217..d03833abec09 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/44x/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/44x/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/44x/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/44x/Makefile</a></div><div class='hunk'>@@ -10,3 +10,4 @@ obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o</div><div class='ctx'> obj-$(CONFIG_XILINX_ML510) += virtex_ml510.o</div><div class='ctx'> obj-$(CONFIG_ISS4xx)	+= iss4xx.o</div><div class='ctx'> obj-$(CONFIG_CANYONLANDS)+= canyonlands.o</div><div class='add'>+obj-$(CONFIG_CURRITUCK)	+= currituck.o</div><div class='head'>diff --git a/arch/powerpc/platforms/44x/currituck.c b/arch/powerpc/platforms/44x/currituck.c<br/>new file mode 100644<br/>index 000000000000..3f6229b5dee0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/44x/currituck.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/44x/currituck.c</a></div><div class='hunk'>@@ -0,0 +1,204 @@</div><div class='add'>+/*</div><div class='add'>+ * Currituck board specific routines</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2011 Tony Breeds IBM Corporation</div><div class='add'>+ *</div><div class='add'>+ * Based on earlier code:</div><div class='add'>+ *    Matt Porter &lt;mporter@kernel.crashing.org&gt;</div><div class='add'>+ *    Copyright 2002-2005 MontaVista Software Inc.</div><div class='add'>+ *</div><div class='add'>+ *    Eugene Surovegin &lt;eugene.surovegin@zultys.com&gt; or &lt;ebs@ebshome.net&gt;</div><div class='add'>+ *    Copyright (c) 2003-2005 Zultys Technologies</div><div class='add'>+ *</div><div class='add'>+ *    Rewritten and ported to the merged powerpc tree:</div><div class='add'>+ *    Copyright 2007 David Gibson &lt;dwg@au1.ibm.com&gt;, IBM Corporation.</div><div class='add'>+ *    Copyright © 2011 David Kliekamp IBM Corporation</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/memblock.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/rtc.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/udbg.h&gt;</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/uic.h&gt;</div><div class='add'>+#include &lt;asm/ppc4xx.h&gt;</div><div class='add'>+#include &lt;asm/mpic.h&gt;</div><div class='add'>+#include &lt;asm/mmu.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+static __initdata struct of_device_id ppc47x_of_bus[] = {</div><div class='add'>+	{ .compatible = "ibm,plb4", },</div><div class='add'>+	{ .compatible = "ibm,plb6", },</div><div class='add'>+	{ .compatible = "ibm,opb", },</div><div class='add'>+	{ .compatible = "ibm,ebc", },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The EEPROM is missing and the default values are bogus.  This forces USB in</div><div class='add'>+ * to EHCI mode */</div><div class='add'>+static void __devinit quirk_ppc_currituck_usb_fixup(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	if (of_machine_is_compatible("ibm,currituck")) {</div><div class='add'>+		pci_write_config_dword(dev, 0xe0, 0x0114231f);</div><div class='add'>+		pci_write_config_dword(dev, 0xe4, 0x00006c40);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+DECLARE_PCI_FIXUP_HEADER(0x1033, 0x0035, quirk_ppc_currituck_usb_fixup);</div><div class='add'>+</div><div class='add'>+static int __init ppc47x_device_probe(void)</div><div class='add'>+{</div><div class='add'>+	of_platform_bus_probe(NULL, ppc47x_of_bus, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+machine_device_initcall(ppc47x, ppc47x_device_probe);</div><div class='add'>+</div><div class='add'>+/* We can have either UICs or MPICs */</div><div class='add'>+static void __init ppc47x_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	/* Find top level interrupt controller */</div><div class='add'>+	for_each_node_with_property(np, "interrupt-controller") {</div><div class='add'>+		if (of_get_property(np, "interrupts", NULL) == NULL)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (np == NULL)</div><div class='add'>+		panic("Can't find top level interrupt controller");</div><div class='add'>+</div><div class='add'>+	/* Check type and do appropriate initialization */</div><div class='add'>+	if (of_device_is_compatible(np, "chrp,open-pic")) {</div><div class='add'>+		/* The MPIC driver will get everything it needs from the</div><div class='add'>+		 * device-tree, just pass 0 to all arguments</div><div class='add'>+		 */</div><div class='add'>+		struct mpic *mpic =</div><div class='add'>+			mpic_alloc(np, 0, 0, 0, 0, " MPIC     ");</div><div class='add'>+		BUG_ON(mpic == NULL);</div><div class='add'>+		mpic_init(mpic);</div><div class='add'>+		ppc_md.get_irq = mpic_get_irq;</div><div class='add'>+	} else</div><div class='add'>+		panic("Unrecognized top level interrupt controller");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+static void __cpuinit smp_ppc47x_setup_cpu(int cpu)</div><div class='add'>+{</div><div class='add'>+	mpic_setup_this_cpu();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __cpuinit smp_ppc47x_kick_cpu(int cpu)</div><div class='add'>+{</div><div class='add'>+	struct device_node *cpunode = of_get_cpu_node(cpu, NULL);</div><div class='add'>+	const u64 *spin_table_addr_prop;</div><div class='add'>+	u32 *spin_table;</div><div class='add'>+	extern void start_secondary_47x(void);</div><div class='add'>+</div><div class='add'>+	BUG_ON(cpunode == NULL);</div><div class='add'>+</div><div class='add'>+	/* Assume spin table. We could test for the enable-method in</div><div class='add'>+	 * the device-tree but currently there's little point as it's</div><div class='add'>+	 * our only supported method</div><div class='add'>+	 */</div><div class='add'>+	spin_table_addr_prop =</div><div class='add'>+		of_get_property(cpunode, "cpu-release-addr", NULL);</div><div class='add'>+</div><div class='add'>+	if (spin_table_addr_prop == NULL) {</div><div class='add'>+		pr_err("CPU%d: Can't start, missing cpu-release-addr !\n",</div><div class='add'>+		       cpu);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Assume it's mapped as part of the linear mapping. This is a bit</div><div class='add'>+	 * fishy but will work fine for now</div><div class='add'>+	 *</div><div class='add'>+	 * XXX: Is there any reason to assume differently?</div><div class='add'>+	 */</div><div class='add'>+	spin_table = (u32 *)__va(*spin_table_addr_prop);</div><div class='add'>+	pr_debug("CPU%d: Spin table mapped at %p\n", cpu, spin_table);</div><div class='add'>+</div><div class='add'>+	spin_table[3] = cpu;</div><div class='add'>+	smp_wmb();</div><div class='add'>+	spin_table[1] = __pa(start_secondary_47x);</div><div class='add'>+	mb();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct smp_ops_t ppc47x_smp_ops = {</div><div class='add'>+	.probe		= smp_mpic_probe,</div><div class='add'>+	.message_pass	= smp_mpic_message_pass,</div><div class='add'>+	.setup_cpu	= smp_ppc47x_setup_cpu,</div><div class='add'>+	.kick_cpu	= smp_ppc47x_kick_cpu,</div><div class='add'>+	.give_timebase	= smp_generic_give_timebase,</div><div class='add'>+	.take_timebase	= smp_generic_take_timebase,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init ppc47x_smp_init(void)</div><div class='add'>+{</div><div class='add'>+	if (mmu_has_feature(MMU_FTR_TYPE_47x))</div><div class='add'>+		smp_ops = &amp;ppc47x_smp_ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_SMP */</div><div class='add'>+static void __init ppc47x_smp_init(void) { }</div><div class='add'>+#endif /* CONFIG_SMP */</div><div class='add'>+</div><div class='add'>+static void __init ppc47x_setup_arch(void)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	/* No need to check the DMA config as we /know/ our windows are all of</div><div class='add'>+ 	 * RAM.  Lets hope that doesn't change */</div><div class='add'>+#ifdef CONFIG_SWIOTLB</div><div class='add'>+	if (memblock_end_of_DRAM() &gt; 0xffffffff) {</div><div class='add'>+		ppc_swiotlb_enable = 1;</div><div class='add'>+		set_pci_dma_ops(&amp;swiotlb_dma_ops);</div><div class='add'>+		ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	ppc47x_smp_init();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called very early, MMU is off, device-tree isn't unflattened</div><div class='add'>+ */</div><div class='add'>+static int __init ppc47x_probe(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long root = of_get_flat_dt_root();</div><div class='add'>+</div><div class='add'>+	if (!of_flat_dt_is_compatible(root, "ibm,currituck"))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Use USB controller should have been hardware swizzled but it wasn't :( */</div><div class='add'>+static void ppc47x_pci_irq_fixup(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;vendor == 0x1033 &amp;&amp; (dev-&gt;device == 0x0035 ||</div><div class='add'>+	                              dev-&gt;device == 0x00e0)) {</div><div class='add'>+		dev-&gt;irq = irq_create_mapping(NULL, 47);</div><div class='add'>+		pr_info("%s: Mapping irq 47 %d\n", __func__, dev-&gt;irq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+define_machine(ppc47x) {</div><div class='add'>+	.name			= "PowerPC 47x",</div><div class='add'>+	.probe			= ppc47x_probe,</div><div class='add'>+	.progress		= udbg_progress,</div><div class='add'>+	.init_IRQ		= ppc47x_init_irq,</div><div class='add'>+	.setup_arch		= ppc47x_setup_arch,</div><div class='add'>+	.pci_irq_fixup		= ppc47x_pci_irq_fixup,</div><div class='add'>+	.restart		= ppc4xx_reset_system,</div><div class='add'>+	.calibrate_decr		= generic_calibrate_decr,</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/platforms/44x/iss4xx.c b/arch/powerpc/platforms/44x/iss4xx.c<br/>index 19395f18b1db..5b8cdbb82f80 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/44x/iss4xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/44x/iss4xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/44x/iss4xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/44x/iss4xx.c</a></div><div class='hunk'>@@ -71,7 +71,7 @@ static void __init iss4xx_init_irq(void)</div><div class='ctx'> 		/* The MPIC driver will get everything it needs from the</div><div class='ctx'> 		 * device-tree, just pass 0 to all arguments</div><div class='ctx'> 		 */</div><div class='del'>-		struct mpic *mpic = mpic_alloc(np, 0, MPIC_PRIMARY, 0, 0,</div><div class='add'>+		struct mpic *mpic = mpic_alloc(np, 0, 0, 0, 0,</div><div class='ctx'> 					       " MPIC     ");</div><div class='ctx'> 		BUG_ON(mpic == NULL);</div><div class='ctx'> 		mpic_init(mpic);</div><div class='head'>diff --git a/arch/powerpc/platforms/512x/Kconfig b/arch/powerpc/platforms/512x/Kconfig<br/>index b3ebce1aec07..c16999802ecf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/512x/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/512x/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/512x/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/512x/Kconfig</a></div><div class='hunk'>@@ -12,7 +12,6 @@ config MPC5121_ADS</div><div class='ctx'> 	bool "Freescale MPC5121E ADS"</div><div class='ctx'> 	depends on PPC_MPC512x</div><div class='ctx'> 	select DEFAULT_UIMAGE</div><div class='del'>-	select MPC5121_ADS_CPLD</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the MPC5121E ADS board.</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/asp834x.c b/arch/powerpc/platforms/83xx/asp834x.c<br/>index aa0d84d22585..464ea8e0292d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/asp834x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/asp834x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/asp834x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/83xx/asp834x.c</a></div><div class='hunk'>@@ -36,38 +36,7 @@ static void __init asp834x_setup_arch(void)</div><div class='ctx'> 	mpc834x_usb_cfg();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init asp834x_init_IRQ(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "ipic");</div><div class='del'>-	if (!np)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ipic_init(np, 0);</div><div class='del'>-</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='del'>-	/* Initialize the default interrupt mapping priorities,</div><div class='del'>-	 * in case the boot rom changed something on us.</div><div class='del'>-	 */</div><div class='del'>-	ipic_set_default_priority();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct __initdata of_device_id asp8347_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init asp8347_declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, asp8347_ids, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(asp834x, asp8347_declare_of_platform_devices);</div><div class='add'>+machine_device_initcall(asp834x, mpc83xx_declare_of_platform_devices);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called very early, MMU is off, device-tree isn't unflattened</div><div class='hunk'>@@ -82,7 +51,7 @@ define_machine(asp834x) {</div><div class='ctx'> 	.name			= "ASP8347E",</div><div class='ctx'> 	.probe			= asp834x_probe,</div><div class='ctx'> 	.setup_arch		= asp834x_setup_arch,</div><div class='del'>-	.init_IRQ		= asp834x_init_IRQ,</div><div class='add'>+	.init_IRQ		= mpc83xx_ipic_init_IRQ,</div><div class='ctx'> 	.get_irq		= ipic_get_irq,</div><div class='ctx'> 	.restart		= mpc83xx_restart,</div><div class='ctx'> 	.time_init		= mpc83xx_time_init,</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/km83xx.c b/arch/powerpc/platforms/83xx/km83xx.c<br/>index c55129f5760a..65eb792a0d00 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/km83xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/km83xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/km83xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/83xx/km83xx.c</a></div><div class='hunk'>@@ -51,15 +51,14 @@</div><div class='ctx'>  */</div><div class='ctx'> static void __init mpc83xx_km_setup_arch(void)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_QUICC_ENGINE</div><div class='ctx'> 	struct device_node *np;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if (ppc_md.progress)</div><div class='ctx'> 		ppc_md.progress("kmpbec83xx_setup_arch()", 0);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")</div><div class='del'>-		mpc83xx_add_bridge(np);</div><div class='del'>-#endif</div><div class='add'>+	mpc83xx_setup_pci();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_QUICC_ENGINE</div><div class='ctx'> 	qe_reset();</div><div class='hunk'>@@ -122,54 +121,7 @@ static void __init mpc83xx_km_setup_arch(void)</div><div class='ctx'> #endif				/* CONFIG_QUICC_ENGINE */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id kmpbec83xx_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .type = "qe", },</div><div class='del'>-	{ .compatible = "fsl,qe", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init kmeter_declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	/* Publish the QE devices */</div><div class='del'>-	of_platform_bus_probe(NULL, kmpbec83xx_ids, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(mpc83xx_km, kmeter_declare_of_platform_devices);</div><div class='del'>-</div><div class='del'>-static void __init mpc83xx_km_init_IRQ(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	np = of_find_compatible_node(NULL, NULL, "fsl,pq2pro-pic");</div><div class='del'>-	if (!np) {</div><div class='del'>-		np = of_find_node_by_type(NULL, "ipic");</div><div class='del'>-		if (!np)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ipic_init(np, 0);</div><div class='del'>-</div><div class='del'>-	/* Initialize the default interrupt mapping priorities,</div><div class='del'>-	 * in case the boot rom changed something on us.</div><div class='del'>-	 */</div><div class='del'>-	ipic_set_default_priority();</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_QUICC_ENGINE</div><div class='del'>-	np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");</div><div class='del'>-	if (!np) {</div><div class='del'>-		np = of_find_node_by_type(NULL, "qeic");</div><div class='del'>-		if (!np)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-#endif				/* CONFIG_QUICC_ENGINE */</div><div class='del'>-}</div><div class='add'>+machine_device_initcall(mpc83xx_km, mpc83xx_declare_of_platform_devices);</div><div class='ctx'> </div><div class='ctx'> /* list of the supported boards */</div><div class='ctx'> static char *board[] __initdata = {</div><div class='hunk'>@@ -198,7 +150,7 @@ define_machine(mpc83xx_km) {</div><div class='ctx'> 	.name		= "mpc83xx-km-platform",</div><div class='ctx'> 	.probe		= mpc83xx_km_probe,</div><div class='ctx'> 	.setup_arch	= mpc83xx_km_setup_arch,</div><div class='del'>-	.init_IRQ	= mpc83xx_km_init_IRQ,</div><div class='add'>+	.init_IRQ	= mpc83xx_ipic_and_qe_init_IRQ,</div><div class='ctx'> 	.get_irq	= ipic_get_irq,</div><div class='ctx'> 	.restart	= mpc83xx_restart,</div><div class='ctx'> 	.time_init	= mpc83xx_time_init,</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/misc.c b/arch/powerpc/platforms/83xx/misc.c<br/>index f01806c940e1..125336f750c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/misc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/misc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/83xx/misc.c</a></div><div class='hunk'>@@ -11,10 +11,15 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hw_irq.h&gt;</div><div class='add'>+#include &lt;asm/ipic.h&gt;</div><div class='add'>+#include &lt;asm/qe_ic.h&gt;</div><div class='ctx'> #include &lt;sysdev/fsl_soc.h&gt;</div><div class='add'>+#include &lt;sysdev/fsl_pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mpc83xx.h"</div><div class='ctx'> </div><div class='hunk'>@@ -65,3 +70,75 @@ long __init mpc83xx_time_init(void)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void __init mpc83xx_ipic_init_IRQ(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	/* looking for fsl,pq2pro-pic which is asl compatible with fsl,ipic */</div><div class='add'>+	np = of_find_compatible_node(NULL, NULL, "fsl,ipic");</div><div class='add'>+	if (!np)</div><div class='add'>+		np = of_find_node_by_type(NULL, "ipic");</div><div class='add'>+	if (!np)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ipic_init(np, 0);</div><div class='add'>+</div><div class='add'>+	of_node_put(np);</div><div class='add'>+</div><div class='add'>+	/* Initialize the default interrupt mapping priorities,</div><div class='add'>+	 * in case the boot rom changed something on us.</div><div class='add'>+	 */</div><div class='add'>+	ipic_set_default_priority();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_QUICC_ENGINE</div><div class='add'>+void __init mpc83xx_qe_init_IRQ(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");</div><div class='add'>+	if (!np) {</div><div class='add'>+		np = of_find_node_by_type(NULL, "qeic");</div><div class='add'>+		if (!np)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+	qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);</div><div class='add'>+	of_node_put(np);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init mpc83xx_ipic_and_qe_init_IRQ(void)</div><div class='add'>+{</div><div class='add'>+	mpc83xx_ipic_init_IRQ();</div><div class='add'>+	mpc83xx_qe_init_IRQ();</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_QUICC_ENGINE */</div><div class='add'>+</div><div class='add'>+static struct of_device_id __initdata of_bus_ids[] = {</div><div class='add'>+	{ .type = "soc", },</div><div class='add'>+	{ .compatible = "soc", },</div><div class='add'>+	{ .compatible = "simple-bus" },</div><div class='add'>+	{ .compatible = "gianfar" },</div><div class='add'>+	{ .compatible = "gpio-leds", },</div><div class='add'>+	{ .type = "qe", },</div><div class='add'>+	{ .compatible = "fsl,qe", },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init mpc83xx_declare_of_platform_devices(void)</div><div class='add'>+{</div><div class='add'>+	of_platform_bus_probe(NULL, of_bus_ids, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+void __init mpc83xx_setup_pci(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")</div><div class='add'>+		mpc83xx_add_bridge(np);</div><div class='add'>+	for_each_compatible_node(np, "pci", "fsl,mpc8314-pcie")</div><div class='add'>+		mpc83xx_add_bridge(np);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc830x_rdb.c b/arch/powerpc/platforms/83xx/mpc830x_rdb.c<br/>index d0c4e15b7794..4f2d9fea77b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc830x_rdb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc830x_rdb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc830x_rdb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/83xx/mpc830x_rdb.c</a></div><div class='hunk'>@@ -27,36 +27,13 @@</div><div class='ctx'>  */</div><div class='ctx'> static void __init mpc830x_rdb_setup_arch(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	struct device_node *np;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (ppc_md.progress)</div><div class='ctx'> 		ppc_md.progress("mpc830x_rdb_setup_arch()", 0);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	for_each_compatible_node(np, "pci", "fsl,mpc8308-pcie")</div><div class='del'>-		mpc83xx_add_bridge(np);</div><div class='del'>-#endif</div><div class='add'>+	mpc83xx_setup_pci();</div><div class='ctx'> 	mpc831x_usb_cfg();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init mpc830x_rdb_init_IRQ(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "ipic");</div><div class='del'>-	if (!np)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ipic_init(np, 0);</div><div class='del'>-</div><div class='del'>-	/* Initialize the default interrupt mapping priorities,</div><div class='del'>-	 * in case the boot rom changed something on us.</div><div class='del'>-	 */</div><div class='del'>-	ipic_set_default_priority();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const char *board[] __initdata = {</div><div class='ctx'> 	"MPC8308RDB",</div><div class='ctx'> 	"fsl,mpc8308rdb",</div><div class='hunk'>@@ -72,24 +49,13 @@ static int __init mpc830x_rdb_probe(void)</div><div class='ctx'> 	return of_flat_dt_match(of_get_flat_dt_root(), board);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id __initdata of_bus_ids[] = {</div><div class='del'>-	{ .compatible = "simple-bus" },</div><div class='del'>-	{ .compatible = "gianfar" },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, of_bus_ids, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(mpc830x_rdb, declare_of_platform_devices);</div><div class='add'>+machine_device_initcall(mpc830x_rdb, mpc83xx_declare_of_platform_devices);</div><div class='ctx'> </div><div class='ctx'> define_machine(mpc830x_rdb) {</div><div class='ctx'> 	.name			= "MPC830x RDB",</div><div class='ctx'> 	.probe			= mpc830x_rdb_probe,</div><div class='ctx'> 	.setup_arch		= mpc830x_rdb_setup_arch,</div><div class='del'>-	.init_IRQ		= mpc830x_rdb_init_IRQ,</div><div class='add'>+	.init_IRQ		= mpc83xx_ipic_init_IRQ,</div><div class='ctx'> 	.get_irq		= ipic_get_irq,</div><div class='ctx'> 	.restart		= mpc83xx_restart,</div><div class='ctx'> 	.time_init		= mpc83xx_time_init,</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/arch/powerpc/platforms/83xx/mpc831x_rdb.c<br/>index f859ead49a8d..fa25977c52de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc831x_rdb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc831x_rdb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc831x_rdb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/83xx/mpc831x_rdb.c</a></div><div class='hunk'>@@ -28,38 +28,13 @@</div><div class='ctx'>  */</div><div class='ctx'> static void __init mpc831x_rdb_setup_arch(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	struct device_node *np;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (ppc_md.progress)</div><div class='ctx'> 		ppc_md.progress("mpc831x_rdb_setup_arch()", 0);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")</div><div class='del'>-		mpc83xx_add_bridge(np);</div><div class='del'>-	for_each_compatible_node(np, "pci", "fsl,mpc8314-pcie")</div><div class='del'>-		mpc83xx_add_bridge(np);</div><div class='del'>-#endif</div><div class='add'>+	mpc83xx_setup_pci();</div><div class='ctx'> 	mpc831x_usb_cfg();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init mpc831x_rdb_init_IRQ(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "ipic");</div><div class='del'>-	if (!np)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ipic_init(np, 0);</div><div class='del'>-</div><div class='del'>-	/* Initialize the default interrupt mapping priorities,</div><div class='del'>-	 * in case the boot rom changed something on us.</div><div class='del'>-	 */</div><div class='del'>-	ipic_set_default_priority();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const char *board[] __initdata = {</div><div class='ctx'> 	"MPC8313ERDB",</div><div class='ctx'> 	"fsl,mpc8315erdb",</div><div class='hunk'>@@ -74,25 +49,13 @@ static int __init mpc831x_rdb_probe(void)</div><div class='ctx'> 	return of_flat_dt_match(of_get_flat_dt_root(), board);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id __initdata of_bus_ids[] = {</div><div class='del'>-	{ .compatible = "simple-bus" },</div><div class='del'>-	{ .compatible = "gianfar" },</div><div class='del'>-	{ .compatible = "gpio-leds", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, of_bus_ids, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(mpc831x_rdb, declare_of_platform_devices);</div><div class='add'>+machine_device_initcall(mpc831x_rdb, mpc83xx_declare_of_platform_devices);</div><div class='ctx'> </div><div class='ctx'> define_machine(mpc831x_rdb) {</div><div class='ctx'> 	.name			= "MPC831x RDB",</div><div class='ctx'> 	.probe			= mpc831x_rdb_probe,</div><div class='ctx'> 	.setup_arch		= mpc831x_rdb_setup_arch,</div><div class='del'>-	.init_IRQ		= mpc831x_rdb_init_IRQ,</div><div class='add'>+	.init_IRQ		= mpc83xx_ipic_init_IRQ,</div><div class='ctx'> 	.get_irq		= ipic_get_irq,</div><div class='ctx'> 	.restart		= mpc83xx_restart,</div><div class='ctx'> 	.time_init		= mpc83xx_time_init,</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c<br/>index 32a52896822f..e36bc611dd6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc832x_mds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc832x_mds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc832x_mds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/83xx/mpc832x_mds.c</a></div><div class='hunk'>@@ -72,10 +72,7 @@ static void __init mpc832x_sys_setup_arch(void)</div><div class='ctx'> 		of_node_put(np);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")</div><div class='del'>-		mpc83xx_add_bridge(np);</div><div class='del'>-#endif</div><div class='add'>+	mpc83xx_setup_pci();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_QUICC_ENGINE</div><div class='ctx'> 	qe_reset();</div><div class='hunk'>@@ -101,51 +98,7 @@ static void __init mpc832x_sys_setup_arch(void)</div><div class='ctx'> #endif				/* CONFIG_QUICC_ENGINE */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id mpc832x_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .type = "qe", },</div><div class='del'>-	{ .compatible = "fsl,qe", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init mpc832x_declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	/* Publish the QE devices */</div><div class='del'>-	of_platform_bus_probe(NULL, mpc832x_ids, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(mpc832x_mds, mpc832x_declare_of_platform_devices);</div><div class='del'>-</div><div class='del'>-static void __init mpc832x_sys_init_IRQ(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "ipic");</div><div class='del'>-	if (!np)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ipic_init(np, 0);</div><div class='del'>-</div><div class='del'>-	/* Initialize the default interrupt mapping priorities,</div><div class='del'>-	 * in case the boot rom changed something on us.</div><div class='del'>-	 */</div><div class='del'>-	ipic_set_default_priority();</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_QUICC_ENGINE</div><div class='del'>-	np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");</div><div class='del'>-	if (!np) {</div><div class='del'>-		np = of_find_node_by_type(NULL, "qeic");</div><div class='del'>-		if (!np)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-#endif				/* CONFIG_QUICC_ENGINE */</div><div class='del'>-}</div><div class='add'>+machine_device_initcall(mpc832x_mds, mpc83xx_declare_of_platform_devices);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called very early, MMU is off, device-tree isn't unflattened</div><div class='hunk'>@@ -161,7 +114,7 @@ define_machine(mpc832x_mds) {</div><div class='ctx'> 	.name 		= "MPC832x MDS",</div><div class='ctx'> 	.probe 		= mpc832x_sys_probe,</div><div class='ctx'> 	.setup_arch 	= mpc832x_sys_setup_arch,</div><div class='del'>-	.init_IRQ 	= mpc832x_sys_init_IRQ,</div><div class='add'>+	.init_IRQ	= mpc83xx_ipic_and_qe_init_IRQ,</div><div class='ctx'> 	.get_irq 	= ipic_get_irq,</div><div class='ctx'> 	.restart 	= mpc83xx_restart,</div><div class='ctx'> 	.time_init 	= mpc83xx_time_init,</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c<br/>index 17f99745f0e4..eff5baabc3fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc832x_rdb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc832x_rdb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc832x_rdb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/83xx/mpc832x_rdb.c</a></div><div class='hunk'>@@ -193,17 +193,14 @@ machine_device_initcall(mpc832x_rdb, mpc832x_spi_init);</div><div class='ctx'>  */</div><div class='ctx'> static void __init mpc832x_rdb_setup_arch(void)</div><div class='ctx'> {</div><div class='del'>-#if defined(CONFIG_PCI) || defined(CONFIG_QUICC_ENGINE)</div><div class='add'>+#if defined(CONFIG_QUICC_ENGINE)</div><div class='ctx'> 	struct device_node *np;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (ppc_md.progress)</div><div class='ctx'> 		ppc_md.progress("mpc832x_rdb_setup_arch()", 0);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")</div><div class='del'>-		mpc83xx_add_bridge(np);</div><div class='del'>-#endif</div><div class='add'>+	mpc83xx_setup_pci();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_QUICC_ENGINE</div><div class='ctx'> 	qe_reset();</div><div class='hunk'>@@ -218,52 +215,7 @@ static void __init mpc832x_rdb_setup_arch(void)</div><div class='ctx'> #endif				/* CONFIG_QUICC_ENGINE */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id mpc832x_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .type = "qe", },</div><div class='del'>-	{ .compatible = "fsl,qe", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init mpc832x_declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	/* Publish the QE devices */</div><div class='del'>-	of_platform_bus_probe(NULL, mpc832x_ids, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(mpc832x_rdb, mpc832x_declare_of_platform_devices);</div><div class='del'>-</div><div class='del'>-static void __init mpc832x_rdb_init_IRQ(void)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "ipic");</div><div class='del'>-	if (!np)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ipic_init(np, 0);</div><div class='del'>-</div><div class='del'>-	/* Initialize the default interrupt mapping priorities,</div><div class='del'>-	 * in case the boot rom changed something on us.</div><div class='del'>-	 */</div><div class='del'>-	ipic_set_default_priority();</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_QUICC_ENGINE</div><div class='del'>-	np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");</div><div class='del'>-	if (!np) {</div><div class='del'>-		np = of_find_node_by_type(NULL, "qeic");</div><div class='del'>-		if (!np)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-#endif				/* CONFIG_QUICC_ENGINE */</div><div class='del'>-}</div><div class='add'>+machine_device_initcall(mpc832x_rdb, mpc83xx_declare_of_platform_devices);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called very early, MMU is off, device-tree isn't unflattened</div><div class='hunk'>@@ -279,7 +231,7 @@ define_machine(mpc832x_rdb) {</div><div class='ctx'> 	.name		= "MPC832x RDB",</div><div class='ctx'> 	.probe		= mpc832x_rdb_probe,</div><div class='ctx'> 	.setup_arch	= mpc832x_rdb_setup_arch,</div><div class='del'>-	.init_IRQ	= mpc832x_rdb_init_IRQ,</div><div class='add'>+	.init_IRQ	= mpc83xx_ipic_and_qe_init_IRQ,</div><div class='ctx'> 	.get_irq	= ipic_get_irq,</div><div class='ctx'> 	.restart	= mpc83xx_restart,</div><div class='ctx'> 	.time_init	= mpc83xx_time_init,</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c<br/>index 6b45969567d4..39849dd1b5bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc834x_itx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc834x_itx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc834x_itx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/83xx/mpc834x_itx.c</a></div><div class='hunk'>@@ -41,13 +41,12 @@</div><div class='ctx'> </div><div class='ctx'> static struct of_device_id __initdata mpc834x_itx_ids[] = {</div><div class='ctx'> 	{ .compatible = "fsl,pq2pro-localbus", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init mpc834x_itx_declare_of_platform_devices(void)</div><div class='ctx'> {</div><div class='add'>+	mpc83xx_declare_of_platform_devices();</div><div class='ctx'> 	return of_platform_bus_probe(NULL, mpc834x_itx_ids, NULL);</div><div class='ctx'> }</div><div class='ctx'> machine_device_initcall(mpc834x_itx, mpc834x_itx_declare_of_platform_devices);</div><div class='hunk'>@@ -59,37 +58,14 @@ machine_device_initcall(mpc834x_itx, mpc834x_itx_declare_of_platform_devices);</div><div class='ctx'>  */</div><div class='ctx'> static void __init mpc834x_itx_setup_arch(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	struct device_node *np;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (ppc_md.progress)</div><div class='ctx'> 		ppc_md.progress("mpc834x_itx_setup_arch()", 0);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")</div><div class='del'>-		mpc83xx_add_bridge(np);</div><div class='del'>-#endif</div><div class='add'>+	mpc83xx_setup_pci();</div><div class='ctx'> </div><div class='ctx'> 	mpc834x_usb_cfg();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init mpc834x_itx_init_IRQ(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "ipic");</div><div class='del'>-	if (!np)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ipic_init(np, 0);</div><div class='del'>-</div><div class='del'>-	/* Initialize the default interrupt mapping priorities,</div><div class='del'>-	 * in case the boot rom changed something on us.</div><div class='del'>-	 */</div><div class='del'>-	ipic_set_default_priority();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Called very early, MMU is off, device-tree isn't unflattened</div><div class='ctx'>  */</div><div class='hunk'>@@ -104,7 +80,7 @@ define_machine(mpc834x_itx) {</div><div class='ctx'> 	.name			= "MPC834x ITX",</div><div class='ctx'> 	.probe			= mpc834x_itx_probe,</div><div class='ctx'> 	.setup_arch		= mpc834x_itx_setup_arch,</div><div class='del'>-	.init_IRQ		= mpc834x_itx_init_IRQ,</div><div class='add'>+	.init_IRQ		= mpc83xx_ipic_init_IRQ,</div><div class='ctx'> 	.get_irq		= ipic_get_irq,</div><div class='ctx'> 	.restart		= mpc83xx_restart,</div><div class='ctx'> 	.time_init		= mpc83xx_time_init,</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc834x_mds.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c<br/>index 041c5177e737..5828d8e97c37 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc834x_mds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc834x_mds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc834x_mds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/83xx/mpc834x_mds.c</a></div><div class='hunk'>@@ -77,51 +77,15 @@ static int mpc834xemds_usb_cfg(void)</div><div class='ctx'>  */</div><div class='ctx'> static void __init mpc834x_mds_setup_arch(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	struct device_node *np;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (ppc_md.progress)</div><div class='ctx'> 		ppc_md.progress("mpc834x_mds_setup_arch()", 0);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")</div><div class='del'>-		mpc83xx_add_bridge(np);</div><div class='del'>-#endif</div><div class='add'>+	mpc83xx_setup_pci();</div><div class='ctx'> </div><div class='ctx'> 	mpc834xemds_usb_cfg();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init mpc834x_mds_init_IRQ(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "ipic");</div><div class='del'>-	if (!np)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ipic_init(np, 0);</div><div class='del'>-</div><div class='del'>-	/* Initialize the default interrupt mapping priorities,</div><div class='del'>-	 * in case the boot rom changed something on us.</div><div class='del'>-	 */</div><div class='del'>-	ipic_set_default_priority();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct of_device_id mpc834x_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init mpc834x_declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, mpc834x_ids, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(mpc834x_mds, mpc834x_declare_of_platform_devices);</div><div class='add'>+machine_device_initcall(mpc834x_mds, mpc83xx_declare_of_platform_devices);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called very early, MMU is off, device-tree isn't unflattened</div><div class='hunk'>@@ -137,7 +101,7 @@ define_machine(mpc834x_mds) {</div><div class='ctx'> 	.name			= "MPC834x MDS",</div><div class='ctx'> 	.probe			= mpc834x_mds_probe,</div><div class='ctx'> 	.setup_arch		= mpc834x_mds_setup_arch,</div><div class='del'>-	.init_IRQ		= mpc834x_mds_init_IRQ,</div><div class='add'>+	.init_IRQ		= mpc83xx_ipic_init_IRQ,</div><div class='ctx'> 	.get_irq		= ipic_get_irq,</div><div class='ctx'> 	.restart		= mpc83xx_restart,</div><div class='ctx'> 	.time_init		= mpc83xx_time_init,</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c<br/>index 934cc8c46bbc..ad8e4bcd7d55 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc836x_mds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc836x_mds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc836x_mds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/83xx/mpc836x_mds.c</a></div><div class='hunk'>@@ -80,10 +80,7 @@ static void __init mpc836x_mds_setup_arch(void)</div><div class='ctx'> 		of_node_put(np);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")</div><div class='del'>-		mpc83xx_add_bridge(np);</div><div class='del'>-#endif</div><div class='add'>+	mpc83xx_setup_pci();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_QUICC_ENGINE</div><div class='ctx'> 	qe_reset();</div><div class='hunk'>@@ -144,23 +141,7 @@ static void __init mpc836x_mds_setup_arch(void)</div><div class='ctx'> #endif				/* CONFIG_QUICC_ENGINE */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id mpc836x_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .type = "qe", },</div><div class='del'>-	{ .compatible = "fsl,qe", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init mpc836x_declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	/* Publish the QE devices */</div><div class='del'>-	of_platform_bus_probe(NULL, mpc836x_ids, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(mpc836x_mds, mpc836x_declare_of_platform_devices);</div><div class='add'>+machine_device_initcall(mpc836x_mds, mpc83xx_declare_of_platform_devices);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_QE_USB</div><div class='ctx'> static int __init mpc836x_usb_cfg(void)</div><div class='hunk'>@@ -226,34 +207,6 @@ err:</div><div class='ctx'> machine_arch_initcall(mpc836x_mds, mpc836x_usb_cfg);</div><div class='ctx'> #endif /* CONFIG_QE_USB */</div><div class='ctx'> </div><div class='del'>-static void __init mpc836x_mds_init_IRQ(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "ipic");</div><div class='del'>-	if (!np)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ipic_init(np, 0);</div><div class='del'>-</div><div class='del'>-	/* Initialize the default interrupt mapping priorities,</div><div class='del'>-	 * in case the boot rom changed something on us.</div><div class='del'>-	 */</div><div class='del'>-	ipic_set_default_priority();</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_QUICC_ENGINE</div><div class='del'>-	np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");</div><div class='del'>-	if (!np) {</div><div class='del'>-		np = of_find_node_by_type(NULL, "qeic");</div><div class='del'>-		if (!np)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-#endif				/* CONFIG_QUICC_ENGINE */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Called very early, MMU is off, device-tree isn't unflattened</div><div class='ctx'>  */</div><div class='hunk'>@@ -268,7 +221,7 @@ define_machine(mpc836x_mds) {</div><div class='ctx'> 	.name		= "MPC836x MDS",</div><div class='ctx'> 	.probe		= mpc836x_mds_probe,</div><div class='ctx'> 	.setup_arch	= mpc836x_mds_setup_arch,</div><div class='del'>-	.init_IRQ	= mpc836x_mds_init_IRQ,</div><div class='add'>+	.init_IRQ	= mpc83xx_ipic_and_qe_init_IRQ,</div><div class='ctx'> 	.get_irq	= ipic_get_irq,</div><div class='ctx'> 	.restart	= mpc83xx_restart,</div><div class='ctx'> 	.time_init	= mpc83xx_time_init,</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc836x_rdk.c b/arch/powerpc/platforms/83xx/mpc836x_rdk.c<br/>index b0090aac9642..f8769d713d61 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc836x_rdk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc836x_rdk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc836x_rdk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/83xx/mpc836x_rdk.c</a></div><div class='hunk'>@@ -27,61 +27,19 @@</div><div class='ctx'> </div><div class='ctx'> #include "mpc83xx.h"</div><div class='ctx'> </div><div class='del'>-static struct of_device_id __initdata mpc836x_rdk_ids[] = {</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init mpc836x_rdk_declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	return of_platform_bus_probe(NULL, mpc836x_rdk_ids, NULL);</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(mpc836x_rdk, mpc836x_rdk_declare_of_platform_devices);</div><div class='add'>+machine_device_initcall(mpc836x_rdk, mpc83xx_declare_of_platform_devices);</div><div class='ctx'> </div><div class='ctx'> static void __init mpc836x_rdk_setup_arch(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	struct device_node *np;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (ppc_md.progress)</div><div class='ctx'> 		ppc_md.progress("mpc836x_rdk_setup_arch()", 0);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")</div><div class='del'>-		mpc83xx_add_bridge(np);</div><div class='del'>-#endif</div><div class='add'>+	mpc83xx_setup_pci();</div><div class='ctx'> #ifdef CONFIG_QUICC_ENGINE</div><div class='ctx'> 	qe_reset();</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init mpc836x_rdk_init_IRQ(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	np = of_find_compatible_node(NULL, NULL, "fsl,ipic");</div><div class='del'>-	if (!np)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ipic_init(np, 0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Initialize the default interrupt mapping priorities,</div><div class='del'>-	 * in case the boot rom changed something on us.</div><div class='del'>-	 */</div><div class='del'>-	ipic_set_default_priority();</div><div class='del'>-	of_node_put(np);</div><div class='del'>-#ifdef CONFIG_QUICC_ENGINE</div><div class='del'>-	np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");</div><div class='del'>-	if (!np)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Called very early, MMU is off, device-tree isn't unflattened.</div><div class='ctx'>  */</div><div class='hunk'>@@ -96,7 +54,7 @@ define_machine(mpc836x_rdk) {</div><div class='ctx'> 	.name		= "MPC836x RDK",</div><div class='ctx'> 	.probe		= mpc836x_rdk_probe,</div><div class='ctx'> 	.setup_arch	= mpc836x_rdk_setup_arch,</div><div class='del'>-	.init_IRQ	= mpc836x_rdk_init_IRQ,</div><div class='add'>+	.init_IRQ	= mpc83xx_ipic_and_qe_init_IRQ,</div><div class='ctx'> 	.get_irq	= ipic_get_irq,</div><div class='ctx'> 	.restart	= mpc83xx_restart,</div><div class='ctx'> 	.time_init	= mpc83xx_time_init,</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc837x_mds.c b/arch/powerpc/platforms/83xx/mpc837x_mds.c<br/>index 83068322abd1..e53a60b6c863 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc837x_mds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc837x_mds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc837x_mds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/83xx/mpc837x_mds.c</a></div><div class='hunk'>@@ -79,54 +79,14 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> static void __init mpc837x_mds_setup_arch(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	struct device_node *np;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (ppc_md.progress)</div><div class='ctx'> 		ppc_md.progress("mpc837x_mds_setup_arch()", 0);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")</div><div class='del'>-		mpc83xx_add_bridge(np);</div><div class='del'>-	for_each_compatible_node(np, "pci", "fsl,mpc8314-pcie")</div><div class='del'>-		mpc83xx_add_bridge(np);</div><div class='del'>-#endif</div><div class='add'>+	mpc83xx_setup_pci();</div><div class='ctx'> 	mpc837xmds_usb_cfg();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id mpc837x_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init mpc837x_declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	/* Publish platform_device */</div><div class='del'>-	of_platform_bus_probe(NULL, mpc837x_ids, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(mpc837x_mds, mpc837x_declare_of_platform_devices);</div><div class='del'>-</div><div class='del'>-static void __init mpc837x_mds_init_IRQ(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	np = of_find_compatible_node(NULL, NULL, "fsl,ipic");</div><div class='del'>-	if (!np)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ipic_init(np, 0);</div><div class='del'>-</div><div class='del'>-	/* Initialize the default interrupt mapping priorities,</div><div class='del'>-	 * in case the boot rom changed something on us.</div><div class='del'>-	 */</div><div class='del'>-	ipic_set_default_priority();</div><div class='del'>-}</div><div class='add'>+machine_device_initcall(mpc837x_mds, mpc83xx_declare_of_platform_devices);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called very early, MMU is off, device-tree isn't unflattened</div><div class='hunk'>@@ -142,7 +102,7 @@ define_machine(mpc837x_mds) {</div><div class='ctx'> 	.name			= "MPC837x MDS",</div><div class='ctx'> 	.probe			= mpc837x_mds_probe,</div><div class='ctx'> 	.setup_arch		= mpc837x_mds_setup_arch,</div><div class='del'>-	.init_IRQ		= mpc837x_mds_init_IRQ,</div><div class='add'>+	.init_IRQ		= mpc83xx_ipic_init_IRQ,</div><div class='ctx'> 	.get_irq		= ipic_get_irq,</div><div class='ctx'> 	.restart		= mpc83xx_restart,</div><div class='ctx'> 	.time_init		= mpc83xx_time_init,</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc837x_rdb.c b/arch/powerpc/platforms/83xx/mpc837x_rdb.c<br/>index 7bafbf2ec0f9..16c9c9cbbb7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc837x_rdb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc837x_rdb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc837x_rdb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/83xx/mpc837x_rdb.c</a></div><div class='hunk'>@@ -50,56 +50,15 @@ static void mpc837x_rdb_sd_cfg(void)</div><div class='ctx'>  */</div><div class='ctx'> static void __init mpc837x_rdb_setup_arch(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	struct device_node *np;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (ppc_md.progress)</div><div class='ctx'> 		ppc_md.progress("mpc837x_rdb_setup_arch()", 0);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")</div><div class='del'>-		mpc83xx_add_bridge(np);</div><div class='del'>-	for_each_compatible_node(np, "pci", "fsl,mpc8314-pcie")</div><div class='del'>-		mpc83xx_add_bridge(np);</div><div class='del'>-#endif</div><div class='add'>+	mpc83xx_setup_pci();</div><div class='ctx'> 	mpc837x_usb_cfg();</div><div class='ctx'> 	mpc837x_rdb_sd_cfg();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id mpc837x_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{ .compatible = "gpio-leds", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init mpc837x_declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	/* Publish platform_device */</div><div class='del'>-	of_platform_bus_probe(NULL, mpc837x_ids, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(mpc837x_rdb, mpc837x_declare_of_platform_devices);</div><div class='del'>-</div><div class='del'>-static void __init mpc837x_rdb_init_IRQ(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	np = of_find_compatible_node(NULL, NULL, "fsl,ipic");</div><div class='del'>-	if (!np)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ipic_init(np, 0);</div><div class='del'>-</div><div class='del'>-	/* Initialize the default interrupt mapping priorities,</div><div class='del'>-	 * in case the boot rom changed something on us.</div><div class='del'>-	 */</div><div class='del'>-	ipic_set_default_priority();</div><div class='del'>-}</div><div class='add'>+machine_device_initcall(mpc837x_rdb, mpc83xx_declare_of_platform_devices);</div><div class='ctx'> </div><div class='ctx'> static const char *board[] __initdata = {</div><div class='ctx'> 	"fsl,mpc8377rdb",</div><div class='hunk'>@@ -121,7 +80,7 @@ define_machine(mpc837x_rdb) {</div><div class='ctx'> 	.name			= "MPC837x RDB/WLAN",</div><div class='ctx'> 	.probe			= mpc837x_rdb_probe,</div><div class='ctx'> 	.setup_arch		= mpc837x_rdb_setup_arch,</div><div class='del'>-	.init_IRQ		= mpc837x_rdb_init_IRQ,</div><div class='add'>+	.init_IRQ		= mpc83xx_ipic_init_IRQ,</div><div class='ctx'> 	.get_irq		= ipic_get_irq,</div><div class='ctx'> 	.restart		= mpc83xx_restart,</div><div class='ctx'> 	.time_init		= mpc83xx_time_init,</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc83xx.h b/arch/powerpc/platforms/83xx/mpc83xx.h<br/>index 82a434510d83..0cf74d7ea1c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc83xx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/mpc83xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc83xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/83xx/mpc83xx.h</a></div><div class='hunk'>@@ -70,5 +70,21 @@ extern long mpc83xx_time_init(void);</div><div class='ctx'> extern int mpc837x_usb_cfg(void);</div><div class='ctx'> extern int mpc834x_usb_cfg(void);</div><div class='ctx'> extern int mpc831x_usb_cfg(void);</div><div class='add'>+extern void mpc83xx_ipic_init_IRQ(void);</div><div class='add'>+#ifdef CONFIG_QUICC_ENGINE</div><div class='add'>+extern void mpc83xx_qe_init_IRQ(void);</div><div class='add'>+extern void mpc83xx_ipic_and_qe_init_IRQ(void);</div><div class='add'>+#else</div><div class='add'>+static inline void __init mpc83xx_qe_init_IRQ(void) {}</div><div class='add'>+#define mpc83xx_ipic_and_qe_init_IRQ mpc83xx_ipic_init_IRQ</div><div class='add'>+#endif /* CONFIG_QUICC_ENGINE */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+extern void mpc83xx_setup_pci(void);</div><div class='add'>+#else</div><div class='add'>+#define mpc83xx_setup_pci()	do {} while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+extern int mpc83xx_declare_of_platform_devices(void);</div><div class='ctx'> </div><div class='ctx'> #endif				/* __MPC83XX_H__ */</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/sbc834x.c b/arch/powerpc/platforms/83xx/sbc834x.c<br/>index af41d8c810a8..8a81d7640b1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/sbc834x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/83xx/sbc834x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/sbc834x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/83xx/sbc834x.c</a></div><div class='hunk'>@@ -48,52 +48,13 @@</div><div class='ctx'>  */</div><div class='ctx'> static void __init sbc834x_setup_arch(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	struct device_node *np;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (ppc_md.progress)</div><div class='ctx'> 		ppc_md.progress("sbc834x_setup_arch()", 0);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")</div><div class='del'>-		mpc83xx_add_bridge(np);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='add'>+	mpc83xx_setup_pci();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init sbc834x_init_IRQ(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "ipic");</div><div class='del'>-	if (!np)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ipic_init(np, 0);</div><div class='del'>-</div><div class='del'>-	/* Initialize the default interrupt mapping priorities,</div><div class='del'>-	 * in case the boot rom changed something on us.</div><div class='del'>-	 */</div><div class='del'>-	ipic_set_default_priority();</div><div class='del'>-</div><div class='del'>-	of_node_put(np);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct __initdata of_device_id sbc834x_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init sbc834x_declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, sbc834x_ids, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(sbc834x, sbc834x_declare_of_platform_devices);</div><div class='add'>+machine_device_initcall(sbc834x, mpc83xx_declare_of_platform_devices);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called very early, MMU is off, device-tree isn't unflattened</div><div class='hunk'>@@ -102,14 +63,14 @@ static int __init sbc834x_probe(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long root = of_get_flat_dt_root();</div><div class='ctx'> </div><div class='del'>-	return of_flat_dt_is_compatible(root, "SBC834x");</div><div class='add'>+	return of_flat_dt_is_compatible(root, "SBC834xE");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> define_machine(sbc834x) {</div><div class='del'>-	.name			= "SBC834x",</div><div class='add'>+	.name			= "SBC834xE",</div><div class='ctx'> 	.probe			= sbc834x_probe,</div><div class='ctx'> 	.setup_arch		= sbc834x_setup_arch,</div><div class='del'>-	.init_IRQ		= sbc834x_init_IRQ,</div><div class='add'>+	.init_IRQ		= mpc83xx_ipic_init_IRQ,</div><div class='ctx'> 	.get_irq		= ipic_get_irq,</div><div class='ctx'> 	.restart		= mpc83xx_restart,</div><div class='ctx'> 	.time_init		= mpc83xx_time_init,</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile<br/>index bc5acb95917a..9cb2d4320dcc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/Makefile</a></div><div class='hunk'>@@ -3,6 +3,8 @@</div><div class='ctx'> #</div><div class='ctx'> obj-$(CONFIG_SMP) += smp.o</div><div class='ctx'> </div><div class='add'>+obj-y += common.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o</div><div class='ctx'> obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o</div><div class='ctx'> obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/common.c b/arch/powerpc/platforms/85xx/common.c<br/>new file mode 100644<br/>index 000000000000..9fef5302adc1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/common.c</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+/*</div><div class='add'>+ * Routines common to most mpc85xx-based boards.</div><div class='add'>+ *</div><div class='add'>+ * This is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sysdev/cpm2_pic.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mpc85xx.h"</div><div class='add'>+</div><div class='add'>+static struct of_device_id __initdata mpc85xx_common_ids[] = {</div><div class='add'>+	{ .type = "soc", },</div><div class='add'>+	{ .compatible = "soc", },</div><div class='add'>+	{ .compatible = "simple-bus", },</div><div class='add'>+	{ .name = "cpm", },</div><div class='add'>+	{ .name = "localbus", },</div><div class='add'>+	{ .compatible = "gianfar", },</div><div class='add'>+	{ .compatible = "fsl,qe", },</div><div class='add'>+	{ .compatible = "fsl,cpm2", },</div><div class='add'>+	{ .compatible = "fsl,srio", },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init mpc85xx_common_publish_devices(void)</div><div class='add'>+{</div><div class='add'>+	return of_platform_bus_probe(NULL, mpc85xx_common_ids, NULL);</div><div class='add'>+}</div><div class='add'>+#ifdef CONFIG_CPM2</div><div class='add'>+static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct irq_chip *chip = irq_desc_get_chip(desc);</div><div class='add'>+	int cascade_irq;</div><div class='add'>+</div><div class='add'>+	while ((cascade_irq = cpm2_get_irq()) &gt;= 0)</div><div class='add'>+		generic_handle_irq(cascade_irq);</div><div class='add'>+</div><div class='add'>+	chip-&gt;irq_eoi(&amp;desc-&gt;irq_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void __init mpc85xx_cpm2_pic_init(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	int irq;</div><div class='add'>+</div><div class='add'>+	/* Setup CPM2 PIC */</div><div class='add'>+	np = of_find_compatible_node(NULL, NULL, "fsl,cpm2-pic");</div><div class='add'>+	if (np == NULL) {</div><div class='add'>+		printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	irq = irq_of_parse_and_map(np, 0);</div><div class='add'>+	if (irq == NO_IRQ) {</div><div class='add'>+		of_node_put(np);</div><div class='add'>+		printk(KERN_ERR "PIC init: got no IRQ for cpm cascade\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cpm2_pic_init(np);</div><div class='add'>+	of_node_put(np);</div><div class='add'>+	irq_set_chained_handler(irq, cpm2_cascade);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/corenet_ds.c b/arch/powerpc/platforms/85xx/corenet_ds.c<br/>index 802ad110b757..07e3e6c47371 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/corenet_ds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/corenet_ds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/corenet_ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/corenet_ds.c</a></div><div class='hunk'>@@ -31,32 +31,18 @@</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #include &lt;sysdev/fsl_soc.h&gt;</div><div class='ctx'> #include &lt;sysdev/fsl_pci.h&gt;</div><div class='add'>+#include "smp.h"</div><div class='ctx'> </div><div class='ctx'> void __init corenet_ds_pic_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpic *mpic;</div><div class='del'>-	struct resource r;</div><div class='del'>-	struct device_node *np = NULL;</div><div class='del'>-	unsigned int flags = MPIC_PRIMARY | MPIC_BIG_ENDIAN |</div><div class='add'>+	unsigned int flags = MPIC_BIG_ENDIAN |</div><div class='ctx'> 				MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU;</div><div class='ctx'> </div><div class='del'>-	np = of_find_node_by_type(np, "open-pic");</div><div class='del'>-</div><div class='del'>-	if (np == NULL) {</div><div class='del'>-		printk(KERN_ERR "Could not find open-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (of_address_to_resource(np, 0, &amp;r)) {</div><div class='del'>-		printk(KERN_ERR "Failed to map mpic register space\n");</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (ppc_md.get_irq == mpic_get_coreint_irq)</div><div class='ctx'> 		flags |= MPIC_ENABLE_COREINT;</div><div class='ctx'> </div><div class='del'>-	mpic = mpic_alloc(np, r.start, flags, 0, 256, " OpenPIC  ");</div><div class='add'>+	mpic = mpic_alloc(NULL, 0, flags, 0, 256, " OpenPIC  ");</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='ctx'> </div><div class='ctx'> 	mpic_init(mpic);</div><div class='hunk'>@@ -65,10 +51,6 @@ void __init corenet_ds_pic_init(void)</div><div class='ctx'> /*</div><div class='ctx'>  * Setup the architecture</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-void __init mpc85xx_smp_init(void);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> void __init corenet_ds_setup_arch(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='hunk'>@@ -77,9 +59,7 @@ void __init corenet_ds_setup_arch(void)</div><div class='ctx'> #endif</div><div class='ctx'> 	dma_addr_t max = 0xffffffff;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> 	mpc85xx_smp_init();</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> 	for_each_node_by_type(np, "pci") {</div><div class='hunk'>@@ -112,7 +92,7 @@ static const struct of_device_id of_device_ids[] __devinitconst = {</div><div class='ctx'> 		.compatible	= "simple-bus"</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.compatible	= "fsl,rapidio-delta",</div><div class='add'>+		.compatible	= "fsl,srio",</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible	= "fsl,p4080-pcie",</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/ksi8560.c b/arch/powerpc/platforms/85xx/ksi8560.c<br/>index c46f9359be15..20f75d7819c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/ksi8560.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/ksi8560.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/ksi8560.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/ksi8560.c</a></div><div class='hunk'>@@ -35,6 +35,7 @@</div><div class='ctx'> #include &lt;asm/cpm2.h&gt;</div><div class='ctx'> #include &lt;sysdev/cpm2_pic.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "mpc85xx.h"</div><div class='ctx'> </div><div class='ctx'> #define KSI8560_CPLD_HVR		0x04 /* Hardware Version Register */</div><div class='ctx'> #define KSI8560_CPLD_PVR		0x08 /* PLD Version Register */</div><div class='hunk'>@@ -54,60 +55,15 @@ static void machine_restart(char *cmd)</div><div class='ctx'> 	for (;;);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)</div><div class='del'>-{</div><div class='del'>-	struct irq_chip *chip = irq_desc_get_chip(desc);</div><div class='del'>-	int cascade_irq;</div><div class='del'>-</div><div class='del'>-	while ((cascade_irq = cpm2_get_irq()) &gt;= 0)</div><div class='del'>-		generic_handle_irq(cascade_irq);</div><div class='del'>-</div><div class='del'>-	chip-&gt;irq_eoi(&amp;desc-&gt;irq_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __init ksi8560_pic_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct mpic *mpic;</div><div class='del'>-	struct resource r;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-#ifdef CONFIG_CPM2</div><div class='del'>-	int irq;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "open-pic");</div><div class='del'>-</div><div class='del'>-	if (np == NULL) {</div><div class='del'>-		printk(KERN_ERR "Could not find open-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (of_address_to_resource(np, 0, &amp;r)) {</div><div class='del'>-		printk(KERN_ERR "Could not map mpic register space\n");</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mpic = mpic_alloc(np, r.start,</div><div class='del'>-			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,</div><div class='add'>+	struct mpic *mpic = mpic_alloc(NULL, 0,</div><div class='add'>+			MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,</div><div class='ctx'> 			0, 256, " OpenPIC  ");</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CPM2</div><div class='del'>-	/* Setup CPM2 PIC */</div><div class='del'>-	np = of_find_compatible_node(NULL, NULL, "fsl,cpm2-pic");</div><div class='del'>-	if (np == NULL) {</div><div class='del'>-		printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	irq = irq_of_parse_and_map(np, 0);</div><div class='del'>-</div><div class='del'>-	cpm2_pic_init(np);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-	irq_set_chained_handler(irq, cpm2_cascade);</div><div class='del'>-#endif</div><div class='add'>+	mpc85xx_cpm2_pic_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPM2</div><div class='hunk'>@@ -215,22 +171,7 @@ static void ksi8560_show_cpuinfo(struct seq_file *m)</div><div class='ctx'> 	seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 &gt;&gt; 24) &amp; 0x3f));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id __initdata of_bus_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .type = "simple-bus", },</div><div class='del'>-	{ .name = "cpm", },</div><div class='del'>-	{ .name = "localbus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, of_bus_ids, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(ksi8560, declare_of_platform_devices);</div><div class='add'>+machine_device_initcall(ksi8560, mpc85xx_common_publish_devices);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called very early, device-tree isn't unflattened</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/mpc8536_ds.c b/arch/powerpc/platforms/85xx/mpc8536_ds.c<br/>index f79f2f102141..cf266826682e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc8536_ds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/mpc8536_ds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc8536_ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/mpc8536_ds.c</a></div><div class='hunk'>@@ -32,31 +32,15 @@</div><div class='ctx'> #include &lt;sysdev/fsl_soc.h&gt;</div><div class='ctx'> #include &lt;sysdev/fsl_pci.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "mpc85xx.h"</div><div class='add'>+</div><div class='ctx'> void __init mpc8536_ds_pic_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct mpic *mpic;</div><div class='del'>-	struct resource r;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "open-pic");</div><div class='del'>-	if (np == NULL) {</div><div class='del'>-		printk(KERN_ERR "Could not find open-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (of_address_to_resource(np, 0, &amp;r)) {</div><div class='del'>-		printk(KERN_ERR "Failed to map mpic register space\n");</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mpic = mpic_alloc(np, r.start,</div><div class='del'>-			  MPIC_PRIMARY | MPIC_WANTS_RESET |</div><div class='add'>+	struct mpic *mpic = mpic_alloc(NULL, 0,</div><div class='add'>+			  MPIC_WANTS_RESET |</div><div class='ctx'> 			  MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS,</div><div class='ctx'> 			0, 256, " OpenPIC  ");</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -104,19 +88,7 @@ static void __init mpc8536_ds_setup_arch(void)</div><div class='ctx'> 	printk("MPC8536 DS board from Freescale Semiconductor\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id __initdata mpc8536_ds_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init mpc8536_ds_publish_devices(void)</div><div class='del'>-{</div><div class='del'>-	return of_platform_bus_probe(NULL, mpc8536_ds_ids, NULL);</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(mpc8536_ds, mpc8536_ds_publish_devices);</div><div class='add'>+machine_device_initcall(mpc8536_ds, mpc85xx_common_publish_devices);</div><div class='ctx'> </div><div class='ctx'> machine_arch_initcall(mpc8536_ds, swiotlb_setup_bus_notifier);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/mpc85xx.h b/arch/powerpc/platforms/85xx/mpc85xx.h<br/>new file mode 100644<br/>index 000000000000..2aa7c5dc2c7f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/mpc85xx.h</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+#ifndef MPC85xx_H</div><div class='add'>+#define MPC85xx_H</div><div class='add'>+extern int mpc85xx_common_publish_devices(void);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPM2</div><div class='add'>+extern void mpc85xx_cpm2_pic_init(void);</div><div class='add'>+#else</div><div class='add'>+static inline void __init mpc85xx_cpm2_pic_init(void) {}</div><div class='add'>+#endif /* CONFIG_CPM2 */</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c<br/>index 3b2c9bb66199..3bebb5173bfc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_ads.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/mpc85xx_ads.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_ads.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/mpc85xx_ads.c</a></div><div class='hunk'>@@ -35,6 +35,8 @@</div><div class='ctx'> #include &lt;sysdev/cpm2_pic.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#include "mpc85xx.h"</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> static int mpc85xx_exclude_device(struct pci_controller *hose,</div><div class='ctx'> 				   u_char bus, u_char devfn)</div><div class='hunk'>@@ -46,63 +48,15 @@ static int mpc85xx_exclude_device(struct pci_controller *hose,</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CPM2</div><div class='del'>-</div><div class='del'>-static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)</div><div class='del'>-{</div><div class='del'>-	struct irq_chip *chip = irq_desc_get_chip(desc);</div><div class='del'>-	int cascade_irq;</div><div class='del'>-</div><div class='del'>-	while ((cascade_irq = cpm2_get_irq()) &gt;= 0)</div><div class='del'>-		generic_handle_irq(cascade_irq);</div><div class='del'>-</div><div class='del'>-	chip-&gt;irq_eoi(&amp;desc-&gt;irq_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_CPM2 */</div><div class='del'>-</div><div class='ctx'> static void __init mpc85xx_ads_pic_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct mpic *mpic;</div><div class='del'>-	struct resource r;</div><div class='del'>-	struct device_node *np = NULL;</div><div class='del'>-#ifdef CONFIG_CPM2</div><div class='del'>-	int irq;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(np, "open-pic");</div><div class='del'>-	if (!np) {</div><div class='del'>-		printk(KERN_ERR "Could not find open-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (of_address_to_resource(np, 0, &amp;r)) {</div><div class='del'>-		printk(KERN_ERR "Could not map mpic register space\n");</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mpic = mpic_alloc(np, r.start,</div><div class='del'>-			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,</div><div class='add'>+	struct mpic *mpic = mpic_alloc(NULL, 0,</div><div class='add'>+			MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,</div><div class='ctx'> 			0, 256, " OpenPIC  ");</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CPM2</div><div class='del'>-	/* Setup CPM2 PIC */</div><div class='del'>-	np = of_find_compatible_node(NULL, NULL, "fsl,cpm2-pic");</div><div class='del'>-	if (np == NULL) {</div><div class='del'>-		printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	irq = irq_of_parse_and_map(np, 0);</div><div class='del'>-</div><div class='del'>-	cpm2_pic_init(np);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-	irq_set_chained_handler(irq, cpm2_cascade);</div><div class='del'>-#endif</div><div class='add'>+	mpc85xx_cpm2_pic_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -221,23 +175,7 @@ static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)</div><div class='ctx'> 	seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 &gt;&gt; 24) &amp; 0x3f));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id __initdata of_bus_ids[] = {</div><div class='del'>-	{ .name = "soc", },</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .name = "cpm", },</div><div class='del'>-	{ .name = "localbus", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, of_bus_ids, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(mpc85xx_ads, declare_of_platform_devices);</div><div class='add'>+machine_device_initcall(mpc85xx_ads, mpc85xx_common_publish_devices);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called very early, device-tree isn't unflattened</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c<br/>index 66cb8d64079f..40f03da616a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_cds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/mpc85xx_cds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_cds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/mpc85xx_cds.c</a></div><div class='hunk'>@@ -46,6 +46,8 @@</div><div class='ctx'> #include &lt;sysdev/fsl_soc.h&gt;</div><div class='ctx'> #include &lt;sysdev/fsl_pci.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "mpc85xx.h"</div><div class='add'>+</div><div class='ctx'> /* CADMUS info */</div><div class='ctx'> /* xxx - galak, move into device tree */</div><div class='ctx'> #define CADMUS_BASE (0xf8004000)</div><div class='hunk'>@@ -177,7 +179,7 @@ static irqreturn_t mpc85xx_8259_cascade_action(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction mpc85xxcds_8259_irqaction = {</div><div class='ctx'> 	.handler = mpc85xx_8259_cascade_action,</div><div class='del'>-	.flags = IRQF_SHARED,</div><div class='add'>+	.flags = IRQF_SHARED | IRQF_NO_THREAD,</div><div class='ctx'> 	.name = "8259 cascade",</div><div class='ctx'> };</div><div class='ctx'> #endif /* PPC_I8259 */</div><div class='hunk'>@@ -186,30 +188,10 @@ static struct irqaction mpc85xxcds_8259_irqaction = {</div><div class='ctx'> static void __init mpc85xx_cds_pic_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpic *mpic;</div><div class='del'>-	struct resource r;</div><div class='del'>-	struct device_node *np = NULL;</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(np, "open-pic");</div><div class='del'>-</div><div class='del'>-	if (np == NULL) {</div><div class='del'>-		printk(KERN_ERR "Could not find open-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (of_address_to_resource(np, 0, &amp;r)) {</div><div class='del'>-		printk(KERN_ERR "Failed to map mpic register space\n");</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mpic = mpic_alloc(np, r.start,</div><div class='del'>-			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,</div><div class='add'>+	mpic = mpic_alloc(NULL, 0,</div><div class='add'>+			MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,</div><div class='ctx'> 			0, 256, " OpenPIC  ");</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='del'>-</div><div class='del'>-	/* Return the mpic node */</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -330,19 +312,7 @@ static int __init mpc85xx_cds_probe(void)</div><div class='ctx'>         return of_flat_dt_is_compatible(root, "MPC85xxCDS");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id __initdata of_bus_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	return of_platform_bus_probe(NULL, of_bus_ids, NULL);</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(mpc85xx_cds, declare_of_platform_devices);</div><div class='add'>+machine_device_initcall(mpc85xx_cds, mpc85xx_common_publish_devices);</div><div class='ctx'> </div><div class='ctx'> define_machine(mpc85xx_cds) {</div><div class='ctx'> 	.name		= "MPC85xx CDS",</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c<br/>index 1b9a8cf1873a..eefbb91e1d61 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_ds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/mpc85xx_ds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/mpc85xx_ds.c</a></div><div class='hunk'>@@ -35,6 +35,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;sysdev/fsl_soc.h&gt;</div><div class='ctx'> #include &lt;sysdev/fsl_pci.h&gt;</div><div class='add'>+#include "smp.h"</div><div class='add'>+</div><div class='add'>+#include "mpc85xx.h"</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='hunk'>@@ -60,43 +63,27 @@ static void mpc85xx_8259_cascade(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> void __init mpc85xx_ds_pic_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpic *mpic;</div><div class='del'>-	struct resource r;</div><div class='del'>-	struct device_node *np;</div><div class='ctx'> #ifdef CONFIG_PPC_I8259</div><div class='add'>+	struct device_node *np;</div><div class='ctx'> 	struct device_node *cascade_node = NULL;</div><div class='ctx'> 	int cascade_irq;</div><div class='ctx'> #endif</div><div class='ctx'> 	unsigned long root = of_get_flat_dt_root();</div><div class='ctx'> </div><div class='del'>-	np = of_find_node_by_type(NULL, "open-pic");</div><div class='del'>-	if (np == NULL) {</div><div class='del'>-		printk(KERN_ERR "Could not find open-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (of_address_to_resource(np, 0, &amp;r)) {</div><div class='del'>-		printk(KERN_ERR "Failed to map mpic register space\n");</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (of_flat_dt_is_compatible(root, "fsl,MPC8572DS-CAMP")) {</div><div class='del'>-		mpic = mpic_alloc(np, r.start,</div><div class='del'>-			MPIC_PRIMARY |</div><div class='add'>+		mpic = mpic_alloc(NULL, 0,</div><div class='ctx'> 			MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |</div><div class='ctx'> 			MPIC_SINGLE_DEST_CPU,</div><div class='ctx'> 			0, 256, " OpenPIC  ");</div><div class='ctx'> 	} else {</div><div class='del'>-		mpic = mpic_alloc(np, r.start,</div><div class='del'>-			  MPIC_PRIMARY | MPIC_WANTS_RESET |</div><div class='add'>+		mpic = mpic_alloc(NULL, 0,</div><div class='add'>+			  MPIC_WANTS_RESET |</div><div class='ctx'> 			  MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |</div><div class='ctx'> 			  MPIC_SINGLE_DEST_CPU,</div><div class='ctx'> 			0, 256, " OpenPIC  ");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_I8259</div><div class='hunk'>@@ -152,9 +139,6 @@ static int mpc85xx_exclude_device(struct pci_controller *hose,</div><div class='ctx'> /*</div><div class='ctx'>  * Setup the architecture</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-extern void __init mpc85xx_smp_init(void);</div><div class='del'>-#endif</div><div class='ctx'> static void __init mpc85xx_ds_setup_arch(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='hunk'>@@ -187,9 +171,7 @@ static void __init mpc85xx_ds_setup_arch(void)</div><div class='ctx'> 	ppc_md.pci_exclude_device = mpc85xx_exclude_device;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> 	mpc85xx_smp_init();</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SWIOTLB</div><div class='ctx'> 	if (memblock_end_of_DRAM() &gt; max) {</div><div class='hunk'>@@ -219,21 +201,9 @@ static int __init mpc8544_ds_probe(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id __initdata mpc85xxds_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init mpc85xxds_publish_devices(void)</div><div class='del'>-{</div><div class='del'>-	return of_platform_bus_probe(NULL, mpc85xxds_ids, NULL);</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(mpc8544_ds, mpc85xxds_publish_devices);</div><div class='del'>-machine_device_initcall(mpc8572_ds, mpc85xxds_publish_devices);</div><div class='del'>-machine_device_initcall(p2020_ds, mpc85xxds_publish_devices);</div><div class='add'>+machine_device_initcall(mpc8544_ds, mpc85xx_common_publish_devices);</div><div class='add'>+machine_device_initcall(mpc8572_ds, mpc85xx_common_publish_devices);</div><div class='add'>+machine_device_initcall(p2020_ds, mpc85xx_common_publish_devices);</div><div class='ctx'> </div><div class='ctx'> machine_arch_initcall(mpc8544_ds, swiotlb_setup_bus_notifier);</div><div class='ctx'> machine_arch_initcall(mpc8572_ds, swiotlb_setup_bus_notifier);</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c<br/>index a23a3ff634c5..1d15a0cd2c82 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_mds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/mpc85xx_mds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_mds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/mpc85xx_mds.c</a></div><div class='hunk'>@@ -51,6 +51,9 @@</div><div class='ctx'> #include &lt;asm/qe_ic.h&gt;</div><div class='ctx'> #include &lt;asm/mpic.h&gt;</div><div class='ctx'> #include &lt;asm/swiotlb.h&gt;</div><div class='add'>+#include "smp.h"</div><div class='add'>+</div><div class='add'>+#include "mpc85xx.h"</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> #ifdef DEBUG</div><div class='hunk'>@@ -153,30 +156,7 @@ static int mpc8568_mds_phy_fixups(struct phy_device *phydev)</div><div class='ctx'>  * Setup the architecture</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-extern void __init mpc85xx_smp_init(void);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_QUICC_ENGINE</div><div class='del'>-static struct of_device_id mpc85xx_qe_ids[] __initdata = {</div><div class='del'>-	{ .type = "qe", },</div><div class='del'>-	{ .compatible = "fsl,qe", },</div><div class='del'>-	{ },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __init mpc85xx_publish_qe_devices(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	np = of_find_compatible_node(NULL, NULL, "fsl,qe");</div><div class='del'>-	if (!of_device_is_available(np)) {</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	of_platform_bus_probe(NULL, mpc85xx_qe_ids, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __init mpc85xx_mds_reset_ucc_phys(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np;</div><div class='hunk'>@@ -347,7 +327,6 @@ static void __init mpc85xx_mds_qeic_init(void)</div><div class='ctx'> 	of_node_put(np);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static void __init mpc85xx_publish_qe_devices(void) { }</div><div class='ctx'> static void __init mpc85xx_mds_qe_init(void) { }</div><div class='ctx'> static void __init mpc85xx_mds_qeic_init(void) { }</div><div class='ctx'> #endif	/* CONFIG_QUICC_ENGINE */</div><div class='hunk'>@@ -381,9 +360,7 @@ static void __init mpc85xx_mds_setup_arch(void)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> 	mpc85xx_smp_init();</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	mpc85xx_mds_qe_init();</div><div class='ctx'> </div><div class='hunk'>@@ -429,24 +406,11 @@ machine_arch_initcall(mpc8568_mds, board_fixups);</div><div class='ctx'> machine_arch_initcall(mpc8569_mds, board_fixups);</div><div class='ctx'> </div><div class='ctx'> static struct of_device_id mpc85xx_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{ .compatible = "fsl,rapidio-delta", },</div><div class='ctx'> 	{ .compatible = "fsl,mpc8548-guts", },</div><div class='ctx'> 	{ .compatible = "gpio-leds", },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct of_device_id p1021_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int __init mpc85xx_publish_devices(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (machine_is(mpc8568_mds))</div><div class='hunk'>@@ -454,23 +418,15 @@ static int __init mpc85xx_publish_devices(void)</div><div class='ctx'> 	if (machine_is(mpc8569_mds))</div><div class='ctx'> 		simple_gpiochip_init("fsl,mpc8569mds-bcsr-gpio");</div><div class='ctx'> </div><div class='add'>+	mpc85xx_common_publish_devices();</div><div class='ctx'> 	of_platform_bus_probe(NULL, mpc85xx_ids, NULL);</div><div class='del'>-	mpc85xx_publish_qe_devices();</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 p1021_publish_devices(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, p1021_ids, NULL);</div><div class='del'>-	mpc85xx_publish_qe_devices();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> machine_device_initcall(mpc8568_mds, mpc85xx_publish_devices);</div><div class='ctx'> machine_device_initcall(mpc8569_mds, mpc85xx_publish_devices);</div><div class='del'>-machine_device_initcall(p1021_mds, p1021_publish_devices);</div><div class='add'>+machine_device_initcall(p1021_mds, mpc85xx_common_publish_devices);</div><div class='ctx'> </div><div class='ctx'> machine_arch_initcall(mpc8568_mds, swiotlb_setup_bus_notifier);</div><div class='ctx'> machine_arch_initcall(mpc8569_mds, swiotlb_setup_bus_notifier);</div><div class='hunk'>@@ -478,26 +434,11 @@ machine_arch_initcall(p1021_mds, swiotlb_setup_bus_notifier);</div><div class='ctx'> </div><div class='ctx'> static void __init mpc85xx_mds_pic_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct mpic *mpic;</div><div class='del'>-	struct resource r;</div><div class='del'>-	struct device_node *np = NULL;</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "open-pic");</div><div class='del'>-	if (!np)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (of_address_to_resource(np, 0, &amp;r)) {</div><div class='del'>-		printk(KERN_ERR "Failed to map mpic register space\n");</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mpic = mpic_alloc(np, r.start,</div><div class='del'>-			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |</div><div class='add'>+	struct mpic *mpic = mpic_alloc(NULL, 0,</div><div class='add'>+			MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |</div><div class='ctx'> 			MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU,</div><div class='ctx'> 			0, 256, " OpenPIC  ");</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='del'>-	of_node_put(np);</div><div class='ctx'> </div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> 	mpc85xx_mds_qeic_init();</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c<br/>index f5ff9110c97e..ccf520e890be 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_rdb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/mpc85xx_rdb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_rdb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/mpc85xx_rdb.c</a></div><div class='hunk'>@@ -29,6 +29,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;sysdev/fsl_soc.h&gt;</div><div class='ctx'> #include &lt;sysdev/fsl_pci.h&gt;</div><div class='add'>+#include "smp.h"</div><div class='add'>+</div><div class='add'>+#include "mpc85xx.h"</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='hunk'>@@ -42,49 +45,28 @@</div><div class='ctx'> void __init mpc85xx_rdb_pic_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpic *mpic;</div><div class='del'>-	struct resource r;</div><div class='del'>-	struct device_node *np;</div><div class='ctx'> 	unsigned long root = of_get_flat_dt_root();</div><div class='ctx'> </div><div class='del'>-	np = of_find_node_by_type(NULL, "open-pic");</div><div class='del'>-	if (np == NULL) {</div><div class='del'>-		printk(KERN_ERR "Could not find open-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (of_address_to_resource(np, 0, &amp;r)) {</div><div class='del'>-		printk(KERN_ERR "Failed to map mpic register space\n");</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (of_flat_dt_is_compatible(root, "fsl,MPC85XXRDB-CAMP")) {</div><div class='del'>-		mpic = mpic_alloc(np, r.start,</div><div class='del'>-			MPIC_PRIMARY |</div><div class='add'>+		mpic = mpic_alloc(NULL, 0,</div><div class='ctx'> 			MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |</div><div class='ctx'> 			MPIC_SINGLE_DEST_CPU,</div><div class='ctx'> 			0, 256, " OpenPIC  ");</div><div class='ctx'> 	} else {</div><div class='del'>-		mpic = mpic_alloc(np, r.start,</div><div class='del'>-		  MPIC_PRIMARY | MPIC_WANTS_RESET |</div><div class='add'>+		mpic = mpic_alloc(NULL, 0,</div><div class='add'>+		  MPIC_WANTS_RESET |</div><div class='ctx'> 		  MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |</div><div class='ctx'> 		  MPIC_SINGLE_DEST_CPU,</div><div class='ctx'> 		  0, 256, " OpenPIC  ");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='ctx'> 	mpic_init(mpic);</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Setup the architecture</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-extern void __init mpc85xx_smp_init(void);</div><div class='del'>-#endif</div><div class='ctx'> static void __init mpc85xx_rdb_setup_arch(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='hunk'>@@ -102,27 +84,12 @@ static void __init mpc85xx_rdb_setup_arch(void)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> 	mpc85xx_smp_init();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	printk(KERN_INFO "MPC85xx RDB board from Freescale Semiconductor\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id __initdata mpc85xxrdb_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init mpc85xxrdb_publish_devices(void)</div><div class='del'>-{</div><div class='del'>-	return of_platform_bus_probe(NULL, mpc85xxrdb_ids, NULL);</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(p2020_rdb, mpc85xxrdb_publish_devices);</div><div class='del'>-machine_device_initcall(p1020_rdb, mpc85xxrdb_publish_devices);</div><div class='add'>+machine_device_initcall(p2020_rdb, mpc85xx_common_publish_devices);</div><div class='add'>+machine_device_initcall(p1020_rdb, mpc85xx_common_publish_devices);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called very early, device-tree isn't unflattened</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/p1010rdb.c b/arch/powerpc/platforms/85xx/p1010rdb.c<br/>index d7387fa7f534..538bc3f57e9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/p1010rdb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/p1010rdb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/p1010rdb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/p1010rdb.c</a></div><div class='hunk'>@@ -28,33 +28,18 @@</div><div class='ctx'> #include &lt;sysdev/fsl_soc.h&gt;</div><div class='ctx'> #include &lt;sysdev/fsl_pci.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "mpc85xx.h"</div><div class='add'>+</div><div class='ctx'> void __init p1010_rdb_pic_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct mpic *mpic;</div><div class='del'>-	struct resource r;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "open-pic");</div><div class='del'>-	if (np == NULL) {</div><div class='del'>-		printk(KERN_ERR "Could not find open-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (of_address_to_resource(np, 0, &amp;r)) {</div><div class='del'>-		printk(KERN_ERR "Failed to map mpic register space\n");</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mpic = mpic_alloc(np, r.start, MPIC_PRIMARY | MPIC_WANTS_RESET |</div><div class='del'>-	  MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU,</div><div class='add'>+	struct mpic *mpic = mpic_alloc(NULL, 0,</div><div class='add'>+	  MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |</div><div class='add'>+	  MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU,</div><div class='ctx'> 	  0, 256, " OpenPIC  ");</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='del'>-	of_node_put(np);</div><div class='ctx'> </div><div class='ctx'> 	mpic_init(mpic);</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -81,18 +66,7 @@ static void __init p1010_rdb_setup_arch(void)</div><div class='ctx'> 	printk(KERN_INFO "P1010 RDB board from Freescale Semiconductor\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id __initdata p1010rdb_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init p1010rdb_publish_devices(void)</div><div class='del'>-{</div><div class='del'>-	return of_platform_bus_probe(NULL, p1010rdb_ids, NULL);</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(p1010_rdb, p1010rdb_publish_devices);</div><div class='add'>+machine_device_initcall(p1010_rdb, mpc85xx_common_publish_devices);</div><div class='ctx'> machine_arch_initcall(p1010_rdb, swiotlb_setup_bus_notifier);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c<br/>index fda15716fada..bb3d84f4046f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/p1022_ds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/p1022_ds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/p1022_ds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/p1022_ds.c</a></div><div class='hunk'>@@ -26,6 +26,9 @@</div><div class='ctx'> #include &lt;sysdev/fsl_soc.h&gt;</div><div class='ctx'> #include &lt;sysdev/fsl_pci.h&gt;</div><div class='ctx'> #include &lt;asm/fsl_guts.h&gt;</div><div class='add'>+#include "smp.h"</div><div class='add'>+</div><div class='add'>+#include "mpc85xx.h"</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)</div><div class='ctx'> </div><div class='hunk'>@@ -238,38 +241,15 @@ p1022ds_valid_monitor_port(enum fsl_diu_monitor_port port)</div><div class='ctx'> </div><div class='ctx'> void __init p1022_ds_pic_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct mpic *mpic;</div><div class='del'>-	struct resource r;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "open-pic");</div><div class='del'>-	if (!np) {</div><div class='del'>-		pr_err("Could not find open-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (of_address_to_resource(np, 0, &amp;r)) {</div><div class='del'>-		pr_err("Failed to map mpic register space\n");</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mpic = mpic_alloc(np, r.start,</div><div class='del'>-		MPIC_PRIMARY | MPIC_WANTS_RESET |</div><div class='add'>+	struct mpic *mpic = mpic_alloc(NULL, 0,</div><div class='add'>+		MPIC_WANTS_RESET |</div><div class='ctx'> 		MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |</div><div class='ctx'> 		MPIC_SINGLE_DEST_CPU,</div><div class='ctx'> 		0, 256, " OpenPIC  ");</div><div class='del'>-</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-void __init mpc85xx_smp_init(void);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Setup the architecture</div><div class='ctx'>  */</div><div class='hunk'>@@ -309,9 +289,7 @@ static void __init p1022_ds_setup_arch(void)</div><div class='ctx'> 	diu_ops.valid_monitor_port	= p1022ds_valid_monitor_port;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> 	mpc85xx_smp_init();</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SWIOTLB</div><div class='ctx'> 	if (memblock_end_of_DRAM() &gt; max) {</div><div class='hunk'>@@ -325,10 +303,6 @@ static void __init p1022_ds_setup_arch(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct of_device_id __initdata p1022_ds_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='ctx'> 	/* So that the DMA channel nodes can be probed individually: */</div><div class='ctx'> 	{ .compatible = "fsl,eloplus-dma", },</div><div class='ctx'> 	{},</div><div class='hunk'>@@ -336,6 +310,7 @@ static struct of_device_id __initdata p1022_ds_ids[] = {</div><div class='ctx'> </div><div class='ctx'> static int __init p1022_ds_publish_devices(void)</div><div class='ctx'> {</div><div class='add'>+	mpc85xx_common_publish_devices();</div><div class='ctx'> 	return of_platform_bus_probe(NULL, p1022_ds_ids, NULL);</div><div class='ctx'> }</div><div class='ctx'> machine_device_initcall(p1022_ds, p1022_ds_publish_devices);</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/p1023_rds.c b/arch/powerpc/platforms/85xx/p1023_rds.c<br/>index 835e0b335bfa..d951e7027bb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/p1023_rds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/p1023_rds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/p1023_rds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/p1023_rds.c</a></div><div class='hunk'>@@ -30,19 +30,18 @@</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/udbg.h&gt;</div><div class='ctx'> #include &lt;asm/mpic.h&gt;</div><div class='add'>+#include "smp.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;sysdev/fsl_soc.h&gt;</div><div class='ctx'> #include &lt;sysdev/fsl_pci.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "mpc85xx.h"</div><div class='add'>+</div><div class='ctx'> /* ************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Setup the architecture</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-void __init mpc85xx_smp_init(void);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static void __init mpc85xx_rds_setup_arch(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np;</div><div class='hunk'>@@ -87,53 +86,19 @@ static void __init mpc85xx_rds_setup_arch(void)</div><div class='ctx'> 		fsl_add_bridge(np, 0);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> 	mpc85xx_smp_init();</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct of_device_id p1023_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int __init p1023_publish_devices(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, p1023_ids, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-machine_device_initcall(p1023_rds, p1023_publish_devices);</div><div class='add'>+machine_device_initcall(p1023_rds, mpc85xx_common_publish_devices);</div><div class='ctx'> </div><div class='ctx'> static void __init mpc85xx_rds_pic_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct mpic *mpic;</div><div class='del'>-	struct resource r;</div><div class='del'>-	struct device_node *np = NULL;</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "open-pic");</div><div class='del'>-	if (!np) {</div><div class='del'>-		printk(KERN_ERR "Could not find open-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (of_address_to_resource(np, 0, &amp;r)) {</div><div class='del'>-		printk(KERN_ERR "Failed to map mpic register space\n");</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mpic = mpic_alloc(np, r.start,</div><div class='del'>-		MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |</div><div class='add'>+	struct mpic *mpic = mpic_alloc(NULL, 0,</div><div class='add'>+		MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |</div><div class='ctx'> 		MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU,</div><div class='ctx'> 		0, 256, " OpenPIC  ");</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='del'>-	of_node_put(np);</div><div class='ctx'> </div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/sbc8548.c b/arch/powerpc/platforms/85xx/sbc8548.c<br/>index 14632a971225..184a50784617 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/sbc8548.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/sbc8548.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/sbc8548.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/sbc8548.c</a></div><div class='hunk'>@@ -48,35 +48,16 @@</div><div class='ctx'> #include &lt;sysdev/fsl_soc.h&gt;</div><div class='ctx'> #include &lt;sysdev/fsl_pci.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "mpc85xx.h"</div><div class='add'>+</div><div class='ctx'> static int sbc_rev;</div><div class='ctx'> </div><div class='ctx'> static void __init sbc8548_pic_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct mpic *mpic;</div><div class='del'>-	struct resource r;</div><div class='del'>-	struct device_node *np = NULL;</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(np, "open-pic");</div><div class='del'>-</div><div class='del'>-	if (np == NULL) {</div><div class='del'>-		printk(KERN_ERR "Could not find open-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (of_address_to_resource(np, 0, &amp;r)) {</div><div class='del'>-		printk(KERN_ERR "Failed to map mpic register space\n");</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mpic = mpic_alloc(np, r.start,</div><div class='del'>-			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,</div><div class='add'>+	struct mpic *mpic = mpic_alloc(NULL, 0,</div><div class='add'>+			MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,</div><div class='ctx'> 			0, 256, " OpenPIC  ");</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='del'>-</div><div class='del'>-	/* Return the mpic node */</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -149,21 +130,7 @@ static void sbc8548_show_cpuinfo(struct seq_file *m)</div><div class='ctx'> 	seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 &gt;&gt; 24) &amp; 0x3f));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id __initdata of_bus_ids[] = {</div><div class='del'>-	{ .name = "soc", },</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, of_bus_ids, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(sbc8548, declare_of_platform_devices);</div><div class='add'>+machine_device_initcall(sbc8548, mpc85xx_common_publish_devices);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called very early, device-tree isn't unflattened</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/sbc8560.c b/arch/powerpc/platforms/85xx/sbc8560.c<br/>index cebd786dc334..940752e93051 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/sbc8560.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/sbc8560.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/sbc8560.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/sbc8560.c</a></div><div class='hunk'>@@ -32,68 +32,22 @@</div><div class='ctx'> #include &lt;sysdev/fsl_soc.h&gt;</div><div class='ctx'> #include &lt;sysdev/fsl_pci.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "mpc85xx.h"</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_CPM2</div><div class='ctx'> #include &lt;asm/cpm2.h&gt;</div><div class='ctx'> #include &lt;sysdev/cpm2_pic.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CPM2</div><div class='del'>-</div><div class='del'>-static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)</div><div class='del'>-{</div><div class='del'>-	struct irq_chip *chip = irq_desc_get_chip(desc);</div><div class='del'>-	int cascade_irq;</div><div class='del'>-</div><div class='del'>-	while ((cascade_irq = cpm2_get_irq()) &gt;= 0)</div><div class='del'>-		generic_handle_irq(cascade_irq);</div><div class='del'>-</div><div class='del'>-	chip-&gt;irq_eoi(&amp;desc-&gt;irq_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_CPM2 */</div><div class='del'>-</div><div class='ctx'> static void __init sbc8560_pic_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct mpic *mpic;</div><div class='del'>-	struct resource r;</div><div class='del'>-	struct device_node *np = NULL;</div><div class='del'>-#ifdef CONFIG_CPM2</div><div class='del'>-	int irq;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(np, "open-pic");</div><div class='del'>-	if (!np) {</div><div class='del'>-		printk(KERN_ERR "Could not find open-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (of_address_to_resource(np, 0, &amp;r)) {</div><div class='del'>-		printk(KERN_ERR "Could not map mpic register space\n");</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mpic = mpic_alloc(np, r.start,</div><div class='del'>-			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,</div><div class='add'>+	struct mpic *mpic = mpic_alloc(NULL, 0,</div><div class='add'>+			MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,</div><div class='ctx'> 			0, 256, " OpenPIC  ");</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CPM2</div><div class='del'>-	/* Setup CPM2 PIC */</div><div class='del'>-	np = of_find_compatible_node(NULL, NULL, "fsl,cpm2-pic");</div><div class='del'>-	if (np == NULL) {</div><div class='del'>-		printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	irq = irq_of_parse_and_map(np, 0);</div><div class='del'>-</div><div class='del'>-	cpm2_pic_init(np);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-	irq_set_chained_handler(irq, cpm2_cascade);</div><div class='del'>-#endif</div><div class='add'>+	mpc85xx_cpm2_pic_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -208,23 +162,7 @@ static void sbc8560_show_cpuinfo(struct seq_file *m)</div><div class='ctx'> 	seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 &gt;&gt; 24) &amp; 0x3f));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id __initdata of_bus_ids[] = {</div><div class='del'>-	{ .name = "soc", },</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .name = "cpm", },</div><div class='del'>-	{ .name = "localbus", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, of_bus_ids, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(sbc8560, declare_of_platform_devices);</div><div class='add'>+machine_device_initcall(sbc8560, mpc85xx_common_publish_devices);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called very early, device-tree isn't unflattened</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c<br/>index 2df4785ffd4e..ff4249044a3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/smp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/smp.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;sysdev/fsl_soc.h&gt;</div><div class='ctx'> #include &lt;sysdev/mpic.h&gt;</div><div class='add'>+#include "smp.h"</div><div class='ctx'> </div><div class='ctx'> extern void __early_start(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/smp.h b/arch/powerpc/platforms/85xx/smp.h<br/>new file mode 100644<br/>index 000000000000..e2b44933ff19<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/smp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/smp.h</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+#ifndef POWERPC_85XX_SMP_H_</div><div class='add'>+#define POWERPC_85XX_SMP_H_ 1</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+void __init mpc85xx_smp_init(void);</div><div class='add'>+#else</div><div class='add'>+static inline void mpc85xx_smp_init(void)</div><div class='add'>+{</div><div class='add'>+	/* Nothing to do */</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* not POWERPC_85XX_SMP_H_ */</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/socrates.c b/arch/powerpc/platforms/85xx/socrates.c<br/>index 747d8fb3ab82..18f635906b27 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/socrates.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/socrates.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/socrates.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/socrates.c</a></div><div class='hunk'>@@ -41,32 +41,17 @@</div><div class='ctx'> #include &lt;sysdev/fsl_soc.h&gt;</div><div class='ctx'> #include &lt;sysdev/fsl_pci.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "mpc85xx.h"</div><div class='ctx'> #include "socrates_fpga_pic.h"</div><div class='ctx'> </div><div class='ctx'> static void __init socrates_pic_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct mpic *mpic;</div><div class='del'>-	struct resource r;</div><div class='ctx'> 	struct device_node *np;</div><div class='ctx'> </div><div class='del'>-	np = of_find_node_by_type(NULL, "open-pic");</div><div class='del'>-	if (!np) {</div><div class='del'>-		printk(KERN_ERR "Could not find open-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (of_address_to_resource(np, 0, &amp;r)) {</div><div class='del'>-		printk(KERN_ERR "Could not map mpic register space\n");</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mpic = mpic_alloc(np, r.start,</div><div class='del'>-			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,</div><div class='add'>+	struct mpic *mpic = mpic_alloc(NULL, 0,</div><div class='add'>+			MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,</div><div class='ctx'> 			0, 256, " OpenPIC  ");</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> </div><div class='ctx'> 	np = of_find_compatible_node(NULL, NULL, "abb,socrates-fpga-pic");</div><div class='hunk'>@@ -96,17 +81,7 @@ static void __init socrates_setup_arch(void)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id __initdata socrates_of_bus_ids[] = {</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init socrates_publish_devices(void)</div><div class='del'>-{</div><div class='del'>-	return of_platform_bus_probe(NULL, socrates_of_bus_ids, NULL);</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(socrates, socrates_publish_devices);</div><div class='add'>+machine_device_initcall(socrates, mpc85xx_common_publish_devices);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called very early, device-tree isn't unflattened</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/stx_gp3.c b/arch/powerpc/platforms/85xx/stx_gp3.c<br/>index 5387e9f06bdb..e9e5234b4e76 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/stx_gp3.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/stx_gp3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/stx_gp3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/stx_gp3.c</a></div><div class='hunk'>@@ -40,70 +40,21 @@</div><div class='ctx'> #include &lt;sysdev/fsl_soc.h&gt;</div><div class='ctx'> #include &lt;sysdev/fsl_pci.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "mpc85xx.h"</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_CPM2</div><div class='ctx'> #include &lt;asm/cpm2.h&gt;</div><div class='del'>-#include &lt;sysdev/cpm2_pic.h&gt;</div><div class='del'>-</div><div class='del'>-static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)</div><div class='del'>-{</div><div class='del'>-	struct irq_chip *chip = irq_desc_get_chip(desc);</div><div class='del'>-	int cascade_irq;</div><div class='del'>-</div><div class='del'>-	while ((cascade_irq = cpm2_get_irq()) &gt;= 0)</div><div class='del'>-		generic_handle_irq(cascade_irq);</div><div class='del'>-</div><div class='del'>-	chip-&gt;irq_eoi(&amp;desc-&gt;irq_data);</div><div class='del'>-}</div><div class='ctx'> #endif /* CONFIG_CPM2 */</div><div class='ctx'> </div><div class='ctx'> static void __init stx_gp3_pic_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct mpic *mpic;</div><div class='del'>-	struct resource r;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-#ifdef CONFIG_CPM2</div><div class='del'>-	int irq;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "open-pic");</div><div class='del'>-	if (!np) {</div><div class='del'>-		printk(KERN_ERR "Could not find open-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (of_address_to_resource(np, 0, &amp;r)) {</div><div class='del'>-		printk(KERN_ERR "Could not map mpic register space\n");</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mpic = mpic_alloc(np, r.start,</div><div class='del'>-			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,</div><div class='add'>+	struct mpic *mpic = mpic_alloc(NULL, 0,</div><div class='add'>+			MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,</div><div class='ctx'> 			0, 256, " OpenPIC  ");</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CPM2</div><div class='del'>-	/* Setup CPM2 PIC */</div><div class='del'>-	np = of_find_compatible_node(NULL, NULL, "fsl,cpm2-pic");</div><div class='del'>-	if (np == NULL) {</div><div class='del'>-		printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	irq = irq_of_parse_and_map(np, 0);</div><div class='del'>-</div><div class='del'>-	if (irq == NO_IRQ) {</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		printk(KERN_ERR "PIC init: got no IRQ for cpm cascade\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cpm2_pic_init(np);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-	irq_set_chained_handler(irq, cpm2_cascade);</div><div class='del'>-#endif</div><div class='add'>+	mpc85xx_cpm2_pic_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -144,19 +95,7 @@ static void stx_gp3_show_cpuinfo(struct seq_file *m)</div><div class='ctx'> 	seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 &gt;&gt; 24) &amp; 0x3f));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id __initdata of_bus_ids[] = {</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, of_bus_ids, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(stx_gp3, declare_of_platform_devices);</div><div class='add'>+machine_device_initcall(stx_gp3, mpc85xx_common_publish_devices);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called very early, device-tree isn't unflattened</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c<br/>index 325de772725a..bf7c89fb75bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/tqm85xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/tqm85xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/tqm85xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/tqm85xx.c</a></div><div class='hunk'>@@ -38,70 +38,21 @@</div><div class='ctx'> #include &lt;sysdev/fsl_soc.h&gt;</div><div class='ctx'> #include &lt;sysdev/fsl_pci.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "mpc85xx.h"</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_CPM2</div><div class='ctx'> #include &lt;asm/cpm2.h&gt;</div><div class='del'>-#include &lt;sysdev/cpm2_pic.h&gt;</div><div class='del'>-</div><div class='del'>-static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)</div><div class='del'>-{</div><div class='del'>-	struct irq_chip *chip = irq_desc_get_chip(desc);</div><div class='del'>-	int cascade_irq;</div><div class='del'>-</div><div class='del'>-	while ((cascade_irq = cpm2_get_irq()) &gt;= 0)</div><div class='del'>-		generic_handle_irq(cascade_irq);</div><div class='del'>-</div><div class='del'>-	chip-&gt;irq_eoi(&amp;desc-&gt;irq_data);</div><div class='del'>-}</div><div class='ctx'> #endif /* CONFIG_CPM2 */</div><div class='ctx'> </div><div class='ctx'> static void __init tqm85xx_pic_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct mpic *mpic;</div><div class='del'>-	struct resource r;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-#ifdef CONFIG_CPM2</div><div class='del'>-	int irq;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "open-pic");</div><div class='del'>-	if (!np) {</div><div class='del'>-		printk(KERN_ERR "Could not find open-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (of_address_to_resource(np, 0, &amp;r)) {</div><div class='del'>-		printk(KERN_ERR "Could not map mpic register space\n");</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mpic = mpic_alloc(np, r.start,</div><div class='del'>-			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,</div><div class='add'>+	struct mpic *mpic = mpic_alloc(NULL, 0,</div><div class='add'>+			MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,</div><div class='ctx'> 			0, 256, " OpenPIC  ");</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CPM2</div><div class='del'>-	/* Setup CPM2 PIC */</div><div class='del'>-	np = of_find_compatible_node(NULL, NULL, "fsl,cpm2-pic");</div><div class='del'>-	if (np == NULL) {</div><div class='del'>-		printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	irq = irq_of_parse_and_map(np, 0);</div><div class='del'>-</div><div class='del'>-	if (irq == NO_IRQ) {</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		printk(KERN_ERR "PIC init: got no IRQ for cpm cascade\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cpm2_pic_init(np);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-	irq_set_chained_handler(irq, cpm2_cascade);</div><div class='del'>-#endif</div><div class='add'>+	mpc85xx_cpm2_pic_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -173,19 +124,7 @@ static void __init tqm85xx_ti1520_fixup(struct pci_dev *pdev)</div><div class='ctx'> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_1520,</div><div class='ctx'> 		tqm85xx_ti1520_fixup);</div><div class='ctx'> </div><div class='del'>-static struct of_device_id __initdata of_bus_ids[] = {</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init declare_of_platform_devices(void)</div><div class='del'>-{</div><div class='del'>-	of_platform_bus_probe(NULL, of_bus_ids, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(tqm85xx, declare_of_platform_devices);</div><div class='add'>+machine_device_initcall(tqm85xx, mpc85xx_common_publish_devices);</div><div class='ctx'> </div><div class='ctx'> static const char *board[] __initdata = {</div><div class='ctx'> 	"tqc,tqm8540",</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/xes_mpc85xx.c b/arch/powerpc/platforms/85xx/xes_mpc85xx.c<br/>index a9dc5e795123..3a69f8b77de6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/xes_mpc85xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/85xx/xes_mpc85xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/xes_mpc85xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/85xx/xes_mpc85xx.c</a></div><div class='hunk'>@@ -32,6 +32,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;sysdev/fsl_soc.h&gt;</div><div class='ctx'> #include &lt;sysdev/fsl_pci.h&gt;</div><div class='add'>+#include "smp.h"</div><div class='add'>+</div><div class='add'>+#include "mpc85xx.h"</div><div class='ctx'> </div><div class='ctx'> /* A few bit definitions needed for fixups on some boards */</div><div class='ctx'> #define MPC85xx_L2CTL_L2E		0x80000000 /* L2 enable */</div><div class='hunk'>@@ -40,29 +43,11 @@</div><div class='ctx'> </div><div class='ctx'> void __init xes_mpc85xx_pic_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct mpic *mpic;</div><div class='del'>-	struct resource r;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "open-pic");</div><div class='del'>-	if (np == NULL) {</div><div class='del'>-		printk(KERN_ERR "Could not find open-pic node\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (of_address_to_resource(np, 0, &amp;r)) {</div><div class='del'>-		printk(KERN_ERR "Failed to map mpic register space\n");</div><div class='del'>-		of_node_put(np);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mpic = mpic_alloc(np, r.start,</div><div class='del'>-			  MPIC_PRIMARY | MPIC_WANTS_RESET |</div><div class='add'>+	struct mpic *mpic = mpic_alloc(NULL, 0,</div><div class='add'>+			  MPIC_WANTS_RESET |</div><div class='ctx'> 			  MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS,</div><div class='ctx'> 			0, 256, " OpenPIC  ");</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -136,9 +121,6 @@ static int primary_phb_addr;</div><div class='ctx'> /*</div><div class='ctx'>  * Setup the architecture</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-extern void __init mpc85xx_smp_init(void);</div><div class='del'>-#endif</div><div class='ctx'> static void __init xes_mpc85xx_setup_arch(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='hunk'>@@ -172,26 +154,12 @@ static void __init xes_mpc85xx_setup_arch(void)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> 	mpc85xx_smp_init();</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct of_device_id __initdata xes_mpc85xx_ids[] = {</div><div class='del'>-	{ .type = "soc", },</div><div class='del'>-	{ .compatible = "soc", },</div><div class='del'>-	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "gianfar", },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init xes_mpc85xx_publish_devices(void)</div><div class='del'>-{</div><div class='del'>-	return of_platform_bus_probe(NULL, xes_mpc85xx_ids, NULL);</div><div class='del'>-}</div><div class='del'>-machine_device_initcall(xes_mpc8572, xes_mpc85xx_publish_devices);</div><div class='del'>-machine_device_initcall(xes_mpc8548, xes_mpc85xx_publish_devices);</div><div class='del'>-machine_device_initcall(xes_mpc8540, xes_mpc85xx_publish_devices);</div><div class='add'>+machine_device_initcall(xes_mpc8572, mpc85xx_common_publish_devices);</div><div class='add'>+machine_device_initcall(xes_mpc8548, mpc85xx_common_publish_devices);</div><div class='add'>+machine_device_initcall(xes_mpc8540, mpc85xx_common_publish_devices);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Called very early, device-tree isn't unflattened</div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c<br/>index b11c3535f350..569262ca499a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/86xx/mpc86xx_hpcn.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/86xx/mpc86xx_hpcn.c</a></div><div class='hunk'>@@ -161,7 +161,7 @@ mpc86xx_time_init(void)</div><div class='ctx'> </div><div class='ctx'> static __initdata struct of_device_id of_bus_ids[] = {</div><div class='ctx'> 	{ .compatible = "simple-bus", },</div><div class='del'>-	{ .compatible = "fsl,rapidio-delta", },</div><div class='add'>+	{ .compatible = "fsl,srio", },</div><div class='ctx'> 	{ .compatible = "gianfar", },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/pic.c b/arch/powerpc/platforms/86xx/pic.c<br/>index 8ef8960abda6..52bbfa031531 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/86xx/pic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/86xx/pic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/86xx/pic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/86xx/pic.c</a></div><div class='hunk'>@@ -31,26 +31,16 @@ static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> </div><div class='ctx'> void __init mpc86xx_init_irq(void)</div><div class='ctx'> {</div><div class='del'>-	struct mpic *mpic;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	struct resource res;</div><div class='ctx'> #ifdef CONFIG_PPC_I8259</div><div class='add'>+	struct device_node *np;</div><div class='ctx'> 	struct device_node *cascade_node = NULL;</div><div class='ctx'> 	int cascade_irq;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/* Determine PIC address. */</div><div class='del'>-	np = of_find_node_by_type(NULL, "open-pic");</div><div class='del'>-	if (np == NULL)</div><div class='del'>-		return;</div><div class='del'>-	of_address_to_resource(np, 0, &amp;res);</div><div class='del'>-</div><div class='del'>-	mpic = mpic_alloc(np, res.start,</div><div class='del'>-			MPIC_PRIMARY | MPIC_WANTS_RESET |</div><div class='del'>-			MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |</div><div class='del'>-			MPIC_SINGLE_DEST_CPU,</div><div class='add'>+	struct mpic *mpic = mpic_alloc(NULL, 0,</div><div class='add'>+			MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |</div><div class='add'>+			MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU,</div><div class='ctx'> 			0, 256, " MPIC     ");</div><div class='del'>-	of_node_put(np);</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='ctx'> </div><div class='ctx'> 	mpic_init(mpic);</div><div class='head'>diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig<br/>index 3fe6d927ad70..0cfb46d54b8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/Kconfig</a></div><div class='hunk'>@@ -175,9 +175,6 @@ config PPC_INDIRECT_MMIO</div><div class='ctx'> config PPC_IO_WORKAROUNDS</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='del'>-config GENERIC_IOMAP</div><div class='del'>-	bool</div><div class='del'>-</div><div class='ctx'> source "drivers/cpufreq/Kconfig"</div><div class='ctx'> </div><div class='ctx'> menu "CPU Frequency drivers"</div><div class='hunk'>@@ -211,6 +208,12 @@ config PPC_PASEMI_CPUFREQ</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='add'>+menu "CPUIdle driver"</div><div class='add'>+</div><div class='add'>+source "drivers/cpuidle/Kconfig"</div><div class='add'>+</div><div class='add'>+endmenu</div><div class='add'>+</div><div class='ctx'> config PPC601_SYNC_FIX</div><div class='ctx'> 	bool "Workarounds for PPC601 bugs"</div><div class='ctx'> 	depends on 6xx &amp;&amp; (PPC_PREP || PPC_PMAC)</div><div class='head'>diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype<br/>index fbecae0fbb49..425db18580a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/Kconfig.cputype?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/Kconfig.cputype</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/Kconfig.cputype?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/Kconfig.cputype</a></div><div class='hunk'>@@ -174,7 +174,6 @@ config BOOKE</div><div class='ctx'> config FSL_BOOKE</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on (E200 || E500) &amp;&amp; PPC32</div><div class='del'>-	select SYS_SUPPORTS_HUGETLBFS if PHYS_64BIT</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='ctx'> # this is for common code between PPC32 &amp; PPC64 FSL BOOKE</div><div class='hunk'>@@ -182,6 +181,7 @@ config PPC_FSL_BOOK3E</div><div class='ctx'> 	bool</div><div class='ctx'> 	select FSL_EMB_PERFMON</div><div class='ctx'> 	select PPC_SMP_MUXED_IPI</div><div class='add'>+	select SYS_SUPPORTS_HUGETLBFS if PHYS_64BIT || PPC64</div><div class='ctx'> 	default y if FSL_BOOKE</div><div class='ctx'> </div><div class='ctx'> config PTE_64BIT</div><div class='hunk'>@@ -236,7 +236,7 @@ config VSX</div><div class='ctx'> </div><div class='ctx'> config PPC_ICSWX</div><div class='ctx'> 	bool "Support for PowerPC icswx coprocessor instruction"</div><div class='del'>-	depends on POWER4</div><div class='add'>+	depends on POWER4 || PPC_A2</div><div class='ctx'> 	default n</div><div class='ctx'> 	---help---</div><div class='ctx'> </div><div class='hunk'>@@ -252,6 +252,25 @@ config PPC_ICSWX</div><div class='ctx'> </div><div class='ctx'> 	  If in doubt, say N here.</div><div class='ctx'> </div><div class='add'>+config PPC_ICSWX_PID</div><div class='add'>+	bool "icswx requires direct PID management"</div><div class='add'>+	depends on PPC_ICSWX &amp;&amp; POWER4</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	  The PID register in server is used explicitly for ICSWX.  In</div><div class='add'>+	  embedded systems PID managment is done by the system.</div><div class='add'>+</div><div class='add'>+config PPC_ICSWX_USE_SIGILL</div><div class='add'>+	bool "Should a bad CT cause a SIGILL?"</div><div class='add'>+	depends on PPC_ICSWX</div><div class='add'>+	default n</div><div class='add'>+	---help---</div><div class='add'>+	  Should a bad CT used for "non-record form ICSWX" cause an</div><div class='add'>+	  illegal intruction signal or should it be silent as</div><div class='add'>+	  architected.</div><div class='add'>+</div><div class='add'>+	  If in doubt, say N here.</div><div class='add'>+</div><div class='ctx'> config SPE</div><div class='ctx'> 	bool "SPE Support"</div><div class='ctx'> 	depends on E200 || (E500 &amp;&amp; !PPC_E500MC)</div><div class='hunk'>@@ -290,7 +309,7 @@ config PPC_BOOK3E_MMU</div><div class='ctx'> </div><div class='ctx'> config PPC_MM_SLICES</div><div class='ctx'> 	bool</div><div class='del'>-	default y if (PPC64 &amp;&amp; HUGETLB_PAGE) || (PPC_STD_MMU_64 &amp;&amp; PPC_64K_PAGES)</div><div class='add'>+	default y if (!PPC_FSL_BOOK3E &amp;&amp; PPC64 &amp;&amp; HUGETLB_PAGE) || (PPC_STD_MMU_64 &amp;&amp; PPC_64K_PAGES)</div><div class='ctx'> 	default n</div><div class='ctx'> </div><div class='ctx'> config VIRT_CPU_ACCOUNTING</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/cbe_thermal.c b/arch/powerpc/platforms/cell/cbe_thermal.c<br/>index 4d4c8c169124..94560db788bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/cbe_thermal.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/cell/cbe_thermal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/cbe_thermal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/cell/cbe_thermal.c</a></div><div class='hunk'>@@ -46,7 +46,7 @@</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/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/spu.h&gt;</div><div class='hunk'>@@ -59,8 +59,8 @@</div><div class='ctx'> #define TEMP_MIN 65</div><div class='ctx'> #define TEMP_MAX 125</div><div class='ctx'> </div><div class='del'>-#define SYSDEV_PREFIX_ATTR(_prefix,_name,_mode)			\</div><div class='del'>-struct sysdev_attribute attr_ ## _prefix ## _ ## _name = {	\</div><div class='add'>+#define DEVICE_PREFIX_ATTR(_prefix,_name,_mode)			\</div><div class='add'>+struct device_attribute attr_ ## _prefix ## _ ## _name = {	\</div><div class='ctx'> 	.attr = { .name = __stringify(_name), .mode = _mode },	\</div><div class='ctx'> 	.show	= _prefix ## _show_ ## _name,			\</div><div class='ctx'> 	.store	= _prefix ## _store_ ## _name,			\</div><div class='hunk'>@@ -76,36 +76,36 @@ static inline u8 temp_to_reg(u8 temp)</div><div class='ctx'> 	return ((temp - TEMP_MIN) &gt;&gt; 1) &amp; 0x3f;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct cbe_pmd_regs __iomem *get_pmd_regs(struct sys_device *sysdev)</div><div class='add'>+static struct cbe_pmd_regs __iomem *get_pmd_regs(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct spu *spu;</div><div class='ctx'> </div><div class='del'>-	spu = container_of(sysdev, struct spu, sysdev);</div><div class='add'>+	spu = container_of(dev, struct spu, dev);</div><div class='ctx'> </div><div class='ctx'> 	return cbe_get_pmd_regs(spu_devnode(spu));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* returns the value for a given spu in a given register */</div><div class='del'>-static u8 spu_read_register_value(struct sys_device *sysdev, union spe_reg __iomem *reg)</div><div class='add'>+static u8 spu_read_register_value(struct device *dev, union spe_reg __iomem *reg)</div><div class='ctx'> {</div><div class='ctx'> 	union spe_reg value;</div><div class='ctx'> 	struct spu *spu;</div><div class='ctx'> </div><div class='del'>-	spu = container_of(sysdev, struct spu, sysdev);</div><div class='add'>+	spu = container_of(dev, struct spu, dev);</div><div class='ctx'> 	value.val = in_be64(&amp;reg-&gt;val);</div><div class='ctx'> </div><div class='ctx'> 	return value.spe[spu-&gt;spe_id];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t spu_show_temp(struct sys_device *sysdev, struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t spu_show_temp(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	u8 value;</div><div class='ctx'> 	struct cbe_pmd_regs __iomem *pmd_regs;</div><div class='ctx'> </div><div class='del'>-	pmd_regs = get_pmd_regs(sysdev);</div><div class='add'>+	pmd_regs = get_pmd_regs(dev);</div><div class='ctx'> </div><div class='del'>-	value = spu_read_register_value(sysdev, &amp;pmd_regs-&gt;ts_ctsr1);</div><div class='add'>+	value = spu_read_register_value(dev, &amp;pmd_regs-&gt;ts_ctsr1);</div><div class='ctx'> </div><div class='ctx'> 	return sprintf(buf, "%d\n", reg_to_temp(value));</div><div class='ctx'> }</div><div class='hunk'>@@ -147,48 +147,48 @@ static ssize_t store_throttle(struct cbe_pmd_regs __iomem *pmd_regs, const char</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t spu_show_throttle_end(struct sys_device *sysdev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t spu_show_throttle_end(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return show_throttle(get_pmd_regs(sysdev), buf, 0);</div><div class='add'>+	return show_throttle(get_pmd_regs(dev), buf, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t spu_show_throttle_begin(struct sys_device *sysdev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t spu_show_throttle_begin(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return show_throttle(get_pmd_regs(sysdev), buf, 8);</div><div class='add'>+	return show_throttle(get_pmd_regs(dev), buf, 8);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t spu_show_throttle_full_stop(struct sys_device *sysdev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t spu_show_throttle_full_stop(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return show_throttle(get_pmd_regs(sysdev), buf, 16);</div><div class='add'>+	return show_throttle(get_pmd_regs(dev), buf, 16);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t spu_store_throttle_end(struct sys_device *sysdev,</div><div class='del'>-			struct sysdev_attribute *attr, const char *buf, size_t size)</div><div class='add'>+static ssize_t spu_store_throttle_end(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, const char *buf, size_t size)</div><div class='ctx'> {</div><div class='del'>-	return store_throttle(get_pmd_regs(sysdev), buf, size, 0);</div><div class='add'>+	return store_throttle(get_pmd_regs(dev), buf, size, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t spu_store_throttle_begin(struct sys_device *sysdev,</div><div class='del'>-			struct sysdev_attribute *attr, const char *buf, size_t size)</div><div class='add'>+static ssize_t spu_store_throttle_begin(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, const char *buf, size_t size)</div><div class='ctx'> {</div><div class='del'>-	return store_throttle(get_pmd_regs(sysdev), buf, size, 8);</div><div class='add'>+	return store_throttle(get_pmd_regs(dev), buf, size, 8);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t spu_store_throttle_full_stop(struct sys_device *sysdev,</div><div class='del'>-			struct sysdev_attribute *attr, const char *buf, size_t size)</div><div class='add'>+static ssize_t spu_store_throttle_full_stop(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, const char *buf, size_t size)</div><div class='ctx'> {</div><div class='del'>-	return store_throttle(get_pmd_regs(sysdev), buf, size, 16);</div><div class='add'>+	return store_throttle(get_pmd_regs(dev), buf, size, 16);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t ppe_show_temp(struct sys_device *sysdev, char *buf, int pos)</div><div class='add'>+static ssize_t ppe_show_temp(struct device *dev, char *buf, int pos)</div><div class='ctx'> {</div><div class='ctx'> 	struct cbe_pmd_regs __iomem *pmd_regs;</div><div class='ctx'> 	u64 value;</div><div class='ctx'> </div><div class='del'>-	pmd_regs = cbe_get_cpu_pmd_regs(sysdev-&gt;id);</div><div class='add'>+	pmd_regs = cbe_get_cpu_pmd_regs(dev-&gt;id);</div><div class='ctx'> 	value = in_be64(&amp;pmd_regs-&gt;ts_ctsr2);</div><div class='ctx'> </div><div class='ctx'> 	value = (value &gt;&gt; pos) &amp; 0x3f;</div><div class='hunk'>@@ -199,64 +199,64 @@ static ssize_t ppe_show_temp(struct sys_device *sysdev, char *buf, int pos)</div><div class='ctx'> </div><div class='ctx'> /* shows the temperature of the DTS on the PPE,</div><div class='ctx'>  * located near the linear thermal sensor */</div><div class='del'>-static ssize_t ppe_show_temp0(struct sys_device *sysdev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t ppe_show_temp0(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return ppe_show_temp(sysdev, buf, 32);</div><div class='add'>+	return ppe_show_temp(dev, buf, 32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* shows the temperature of the second DTS on the PPE */</div><div class='del'>-static ssize_t ppe_show_temp1(struct sys_device *sysdev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t ppe_show_temp1(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return ppe_show_temp(sysdev, buf, 0);</div><div class='add'>+	return ppe_show_temp(dev, buf, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t ppe_show_throttle_end(struct sys_device *sysdev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t ppe_show_throttle_end(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return show_throttle(cbe_get_cpu_pmd_regs(sysdev-&gt;id), buf, 32);</div><div class='add'>+	return show_throttle(cbe_get_cpu_pmd_regs(dev-&gt;id), buf, 32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t ppe_show_throttle_begin(struct sys_device *sysdev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t ppe_show_throttle_begin(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return show_throttle(cbe_get_cpu_pmd_regs(sysdev-&gt;id), buf, 40);</div><div class='add'>+	return show_throttle(cbe_get_cpu_pmd_regs(dev-&gt;id), buf, 40);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t ppe_show_throttle_full_stop(struct sys_device *sysdev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t ppe_show_throttle_full_stop(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return show_throttle(cbe_get_cpu_pmd_regs(sysdev-&gt;id), buf, 48);</div><div class='add'>+	return show_throttle(cbe_get_cpu_pmd_regs(dev-&gt;id), buf, 48);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t ppe_store_throttle_end(struct sys_device *sysdev,</div><div class='del'>-			struct sysdev_attribute *attr, const char *buf, size_t size)</div><div class='add'>+static ssize_t ppe_store_throttle_end(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, const char *buf, size_t size)</div><div class='ctx'> {</div><div class='del'>-	return store_throttle(cbe_get_cpu_pmd_regs(sysdev-&gt;id), buf, size, 32);</div><div class='add'>+	return store_throttle(cbe_get_cpu_pmd_regs(dev-&gt;id), buf, size, 32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t ppe_store_throttle_begin(struct sys_device *sysdev,</div><div class='del'>-			struct sysdev_attribute *attr, const char *buf, size_t size)</div><div class='add'>+static ssize_t ppe_store_throttle_begin(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, const char *buf, size_t size)</div><div class='ctx'> {</div><div class='del'>-	return store_throttle(cbe_get_cpu_pmd_regs(sysdev-&gt;id), buf, size, 40);</div><div class='add'>+	return store_throttle(cbe_get_cpu_pmd_regs(dev-&gt;id), buf, size, 40);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t ppe_store_throttle_full_stop(struct sys_device *sysdev,</div><div class='del'>-			struct sysdev_attribute *attr, const char *buf, size_t size)</div><div class='add'>+static ssize_t ppe_store_throttle_full_stop(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, const char *buf, size_t size)</div><div class='ctx'> {</div><div class='del'>-	return store_throttle(cbe_get_cpu_pmd_regs(sysdev-&gt;id), buf, size, 48);</div><div class='add'>+	return store_throttle(cbe_get_cpu_pmd_regs(dev-&gt;id), buf, size, 48);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct sysdev_attribute attr_spu_temperature = {</div><div class='add'>+static struct device_attribute attr_spu_temperature = {</div><div class='ctx'> 	.attr = {.name = "temperature", .mode = 0400 },</div><div class='ctx'> 	.show = spu_show_temp,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static SYSDEV_PREFIX_ATTR(spu, throttle_end, 0600);</div><div class='del'>-static SYSDEV_PREFIX_ATTR(spu, throttle_begin, 0600);</div><div class='del'>-static SYSDEV_PREFIX_ATTR(spu, throttle_full_stop, 0600);</div><div class='add'>+static DEVICE_PREFIX_ATTR(spu, throttle_end, 0600);</div><div class='add'>+static DEVICE_PREFIX_ATTR(spu, throttle_begin, 0600);</div><div class='add'>+static DEVICE_PREFIX_ATTR(spu, throttle_full_stop, 0600);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct attribute *spu_attributes[] = {</div><div class='hunk'>@@ -272,19 +272,19 @@ static struct attribute_group spu_attribute_group = {</div><div class='ctx'> 	.attrs	= spu_attributes,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sysdev_attribute attr_ppe_temperature0 = {</div><div class='add'>+static struct device_attribute attr_ppe_temperature0 = {</div><div class='ctx'> 	.attr = {.name = "temperature0", .mode = 0400 },</div><div class='ctx'> 	.show = ppe_show_temp0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sysdev_attribute attr_ppe_temperature1 = {</div><div class='add'>+static struct device_attribute attr_ppe_temperature1 = {</div><div class='ctx'> 	.attr = {.name = "temperature1", .mode = 0400 },</div><div class='ctx'> 	.show = ppe_show_temp1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static SYSDEV_PREFIX_ATTR(ppe, throttle_end, 0600);</div><div class='del'>-static SYSDEV_PREFIX_ATTR(ppe, throttle_begin, 0600);</div><div class='del'>-static SYSDEV_PREFIX_ATTR(ppe, throttle_full_stop, 0600);</div><div class='add'>+static DEVICE_PREFIX_ATTR(ppe, throttle_end, 0600);</div><div class='add'>+static DEVICE_PREFIX_ATTR(ppe, throttle_begin, 0600);</div><div class='add'>+static DEVICE_PREFIX_ATTR(ppe, throttle_full_stop, 0600);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *ppe_attributes[] = {</div><div class='ctx'> 	&amp;attr_ppe_temperature0.attr,</div><div class='hunk'>@@ -307,7 +307,7 @@ static int __init init_default_values(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='ctx'> 	struct cbe_pmd_regs __iomem *pmd_regs;</div><div class='del'>-	struct sys_device *sysdev;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> 	union ppe_spe_reg tpr;</div><div class='ctx'> 	union spe_reg str1;</div><div class='ctx'> 	u64 str2;</div><div class='hunk'>@@ -349,14 +349,14 @@ static int __init init_default_values(void)</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu (cpu) {</div><div class='ctx'> 		pr_debug("processing cpu %d\n", cpu);</div><div class='del'>-		sysdev = get_cpu_sysdev(cpu);</div><div class='add'>+		dev = get_cpu_device(cpu);</div><div class='ctx'> </div><div class='del'>-		if (!sysdev) {</div><div class='del'>-			pr_info("invalid sysdev pointer for cbe_thermal\n");</div><div class='add'>+		if (!dev) {</div><div class='add'>+			pr_info("invalid dev pointer for cbe_thermal\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pmd_regs = cbe_get_cpu_pmd_regs(sysdev-&gt;id);</div><div class='add'>+		pmd_regs = cbe_get_cpu_pmd_regs(dev-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 		if (!pmd_regs) {</div><div class='ctx'> 			pr_info("invalid CBE regs pointer for cbe_thermal\n");</div><div class='hunk'>@@ -379,8 +379,8 @@ static int __init thermal_init(void)</div><div class='ctx'> 	int rc = init_default_values();</div><div class='ctx'> </div><div class='ctx'> 	if (rc == 0) {</div><div class='del'>-		spu_add_sysdev_attr_group(&amp;spu_attribute_group);</div><div class='del'>-		cpu_add_sysdev_attr_group(&amp;ppe_attribute_group);</div><div class='add'>+		spu_add_dev_attr_group(&amp;spu_attribute_group);</div><div class='add'>+		cpu_add_dev_attr_group(&amp;ppe_attribute_group);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -389,8 +389,8 @@ module_init(thermal_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit thermal_exit(void)</div><div class='ctx'> {</div><div class='del'>-	spu_remove_sysdev_attr_group(&amp;spu_attribute_group);</div><div class='del'>-	cpu_remove_sysdev_attr_group(&amp;ppe_attribute_group);</div><div class='add'>+	spu_remove_dev_attr_group(&amp;spu_attribute_group);</div><div class='add'>+	cpu_remove_dev_attr_group(&amp;ppe_attribute_group);</div><div class='ctx'> }</div><div class='ctx'> module_exit(thermal_exit);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c<br/>index 592c3d51b817..ae9fc7bc17d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/iommu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/cell/iommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/iommu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/cell/iommu.c</a></div><div class='hunk'>@@ -1037,6 +1037,8 @@ static int __init cell_iommu_fixed_mapping_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* The fixed mapping is only supported on axon machines */</div><div class='ctx'> 	np = of_find_node_by_name(NULL, "axon");</div><div class='add'>+	of_node_put(np);</div><div class='add'>+</div><div class='ctx'> 	if (!np) {</div><div class='ctx'> 		pr_debug("iommu: fixed mapping disabled, no axons found\n");</div><div class='ctx'> 		return -1;</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c<br/>index 0fc9b7256126..62002a7edfed 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/cell/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/cell/setup.c</a></div><div class='hunk'>@@ -184,24 +184,10 @@ static int __init cell_publish_devices(void)</div><div class='ctx'> }</div><div class='ctx'> machine_subsys_initcall(cell, cell_publish_devices);</div><div class='ctx'> </div><div class='del'>-static void cell_mpic_cascade(unsigned int irq, struct irq_desc *desc)</div><div class='del'>-{</div><div class='del'>-	struct irq_chip *chip = irq_desc_get_chip(desc);</div><div class='del'>-	struct mpic *mpic = irq_desc_get_handler_data(desc);</div><div class='del'>-	unsigned int virq;</div><div class='del'>-</div><div class='del'>-	virq = mpic_get_one_irq(mpic);</div><div class='del'>-	if (virq != NO_IRQ)</div><div class='del'>-		generic_handle_irq(virq);</div><div class='del'>-</div><div class='del'>-	chip-&gt;irq_eoi(&amp;desc-&gt;irq_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __init mpic_init_IRQ(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *dn;</div><div class='ctx'> 	struct mpic *mpic;</div><div class='del'>-	unsigned int virq;</div><div class='ctx'> </div><div class='ctx'> 	for (dn = NULL;</div><div class='ctx'> 	     (dn = of_find_node_by_name(dn, "interrupt-controller"));) {</div><div class='hunk'>@@ -211,19 +197,10 @@ static void __init mpic_init_IRQ(void)</div><div class='ctx'> 		/* The MPIC driver will get everything it needs from the</div><div class='ctx'> 		 * device-tree, just pass 0 to all arguments</div><div class='ctx'> 		 */</div><div class='del'>-		mpic = mpic_alloc(dn, 0, 0, 0, 0, " MPIC     ");</div><div class='add'>+		mpic = mpic_alloc(dn, 0, MPIC_SECONDARY, 0, 0, " MPIC     ");</div><div class='ctx'> 		if (mpic == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		mpic_init(mpic);</div><div class='del'>-</div><div class='del'>-		virq = irq_of_parse_and_map(dn, 0);</div><div class='del'>-		if (virq == NO_IRQ)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		printk(KERN_INFO "%s : hooking up to IRQ %d\n",</div><div class='del'>-		       dn-&gt;full_name, virq);</div><div class='del'>-		irq_set_handler_data(virq, mpic);</div><div class='del'>-		irq_set_chained_handler(virq, cell_mpic_cascade);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c<br/>index f5c5c762d5a3..4a255cf8cd17 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/smp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/cell/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/cell/smp.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c<br/>index e94d3ecdd8bb..8b1213993b10 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spu_base.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/cell/spu_base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spu_base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/cell/spu_base.c</a></div><div class='hunk'>@@ -519,31 +519,32 @@ void spu_init_channels(struct spu *spu)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(spu_init_channels);</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class spu_sysdev_class = {</div><div class='add'>+static struct bus_type spu_subsys = {</div><div class='ctx'> 	.name = "spu",</div><div class='add'>+	.dev_name = "spu",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int spu_add_sysdev_attr(struct sysdev_attribute *attr)</div><div class='add'>+int spu_add_dev_attr(struct device_attribute *attr)</div><div class='ctx'> {</div><div class='ctx'> 	struct spu *spu;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;spu_full_list_mutex);</div><div class='ctx'> 	list_for_each_entry(spu, &amp;spu_full_list, full_list)</div><div class='del'>-		sysdev_create_file(&amp;spu-&gt;sysdev, attr);</div><div class='add'>+		device_create_file(&amp;spu-&gt;dev, attr);</div><div class='ctx'> 	mutex_unlock(&amp;spu_full_list_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_add_sysdev_attr);</div><div class='add'>+EXPORT_SYMBOL_GPL(spu_add_dev_attr);</div><div class='ctx'> </div><div class='del'>-int spu_add_sysdev_attr_group(struct attribute_group *attrs)</div><div class='add'>+int spu_add_dev_attr_group(struct attribute_group *attrs)</div><div class='ctx'> {</div><div class='ctx'> 	struct spu *spu;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;spu_full_list_mutex);</div><div class='ctx'> 	list_for_each_entry(spu, &amp;spu_full_list, full_list) {</div><div class='del'>-		rc = sysfs_create_group(&amp;spu-&gt;sysdev.kobj, attrs);</div><div class='add'>+		rc = sysfs_create_group(&amp;spu-&gt;dev.kobj, attrs);</div><div class='ctx'> </div><div class='ctx'> 		/* we're in trouble here, but try unwinding anyway */</div><div class='ctx'> 		if (rc) {</div><div class='hunk'>@@ -552,7 +553,7 @@ int spu_add_sysdev_attr_group(struct attribute_group *attrs)</div><div class='ctx'> </div><div class='ctx'> 			list_for_each_entry_continue_reverse(spu,</div><div class='ctx'> 					&amp;spu_full_list, full_list)</div><div class='del'>-				sysfs_remove_group(&amp;spu-&gt;sysdev.kobj, attrs);</div><div class='add'>+				sysfs_remove_group(&amp;spu-&gt;dev.kobj, attrs);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -561,45 +562,45 @@ int spu_add_sysdev_attr_group(struct attribute_group *attrs)</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_add_sysdev_attr_group);</div><div class='add'>+EXPORT_SYMBOL_GPL(spu_add_dev_attr_group);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-void spu_remove_sysdev_attr(struct sysdev_attribute *attr)</div><div class='add'>+void spu_remove_dev_attr(struct device_attribute *attr)</div><div class='ctx'> {</div><div class='ctx'> 	struct spu *spu;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;spu_full_list_mutex);</div><div class='ctx'> 	list_for_each_entry(spu, &amp;spu_full_list, full_list)</div><div class='del'>-		sysdev_remove_file(&amp;spu-&gt;sysdev, attr);</div><div class='add'>+		device_remove_file(&amp;spu-&gt;dev, attr);</div><div class='ctx'> 	mutex_unlock(&amp;spu_full_list_mutex);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_remove_sysdev_attr);</div><div class='add'>+EXPORT_SYMBOL_GPL(spu_remove_dev_attr);</div><div class='ctx'> </div><div class='del'>-void spu_remove_sysdev_attr_group(struct attribute_group *attrs)</div><div class='add'>+void spu_remove_dev_attr_group(struct attribute_group *attrs)</div><div class='ctx'> {</div><div class='ctx'> 	struct spu *spu;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;spu_full_list_mutex);</div><div class='ctx'> 	list_for_each_entry(spu, &amp;spu_full_list, full_list)</div><div class='del'>-		sysfs_remove_group(&amp;spu-&gt;sysdev.kobj, attrs);</div><div class='add'>+		sysfs_remove_group(&amp;spu-&gt;dev.kobj, attrs);</div><div class='ctx'> 	mutex_unlock(&amp;spu_full_list_mutex);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_remove_sysdev_attr_group);</div><div class='add'>+EXPORT_SYMBOL_GPL(spu_remove_dev_attr_group);</div><div class='ctx'> </div><div class='del'>-static int spu_create_sysdev(struct spu *spu)</div><div class='add'>+static int spu_create_dev(struct spu *spu)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	spu-&gt;sysdev.id = spu-&gt;number;</div><div class='del'>-	spu-&gt;sysdev.cls = &amp;spu_sysdev_class;</div><div class='del'>-	ret = sysdev_register(&amp;spu-&gt;sysdev);</div><div class='add'>+	spu-&gt;dev.id = spu-&gt;number;</div><div class='add'>+	spu-&gt;dev.bus = &amp;spu_subsys;</div><div class='add'>+	ret = device_register(&amp;spu-&gt;dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_ERR "Can't register SPU %d with sysfs\n",</div><div class='ctx'> 				spu-&gt;number);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sysfs_add_device_to_node(&amp;spu-&gt;sysdev, spu-&gt;node);</div><div class='add'>+	sysfs_add_device_to_node(&amp;spu-&gt;dev, spu-&gt;node);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -635,7 +636,7 @@ static int __init create_spu(void *data)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_destroy;</div><div class='ctx'> </div><div class='del'>-	ret = spu_create_sysdev(spu);</div><div class='add'>+	ret = spu_create_dev(spu);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_free_irqs;</div><div class='ctx'> </div><div class='hunk'>@@ -692,10 +693,10 @@ static unsigned long long spu_acct_time(struct spu *spu,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static ssize_t spu_stat_show(struct sys_device *sysdev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t spu_stat_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct spu *spu = container_of(sysdev, struct spu, sysdev);</div><div class='add'>+	struct spu *spu = container_of(dev, struct spu, dev);</div><div class='ctx'> </div><div class='ctx'> 	return sprintf(buf, "%s %llu %llu %llu %llu "</div><div class='ctx'> 		      "%llu %llu %llu %llu %llu %llu %llu %llu\n",</div><div class='hunk'>@@ -714,7 +715,7 @@ static ssize_t spu_stat_show(struct sys_device *sysdev,</div><div class='ctx'> 		spu-&gt;stats.libassist);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(stat, 0644, spu_stat_show, NULL);</div><div class='add'>+static DEVICE_ATTR(stat, 0644, spu_stat_show, NULL);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KEXEC</div><div class='ctx'> </div><div class='hunk'>@@ -813,8 +814,8 @@ static int __init init_spu_base(void)</div><div class='ctx'> 	if (!spu_management_ops)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* create sysdev class for spus */</div><div class='del'>-	ret = sysdev_class_register(&amp;spu_sysdev_class);</div><div class='add'>+	/* create system subsystem for spus */</div><div class='add'>+	ret = subsys_system_register(&amp;spu_subsys, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -823,7 +824,7 @@ static int __init init_spu_base(void)</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: Error initializing spus\n",</div><div class='ctx'> 			__func__);</div><div class='del'>-		goto out_unregister_sysdev_class;</div><div class='add'>+		goto out_unregister_subsys;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret &gt; 0)</div><div class='hunk'>@@ -833,15 +834,15 @@ static int __init init_spu_base(void)</div><div class='ctx'> 	xmon_register_spus(&amp;spu_full_list);</div><div class='ctx'> 	crash_register_spus(&amp;spu_full_list);</div><div class='ctx'> 	mutex_unlock(&amp;spu_full_list_mutex);</div><div class='del'>-	spu_add_sysdev_attr(&amp;attr_stat);</div><div class='add'>+	spu_add_dev_attr(&amp;dev_attr_stat);</div><div class='ctx'> 	register_syscore_ops(&amp;spu_syscore_ops);</div><div class='ctx'> </div><div class='ctx'> 	spu_init_affinity();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- out_unregister_sysdev_class:</div><div class='del'>-	sysdev_class_unregister(&amp;spu_sysdev_class);</div><div class='add'>+ out_unregister_subsys:</div><div class='add'>+	bus_unregister(&amp;spu_subsys);</div><div class='ctx'>  out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spu_syscalls.c b/arch/powerpc/platforms/cell/spu_syscalls.c<br/>index 75530d99eda6..714bbfc3162c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spu_syscalls.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/cell/spu_syscalls.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spu_syscalls.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/cell/spu_syscalls.c</a></div><div class='hunk'>@@ -65,8 +65,8 @@ static inline void spufs_calls_put(struct spufs_calls *calls) { }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_SPU_FS_MODULE */</div><div class='ctx'> </div><div class='del'>-asmlinkage long sys_spu_create(const char __user *name,</div><div class='del'>-		unsigned int flags, mode_t mode, int neighbor_fd)</div><div class='add'>+SYSCALL_DEFINE4(spu_create, const char __user *, name, unsigned int, flags,</div><div class='add'>+	umode_t, mode, int, neighbor_fd)</div><div class='ctx'> {</div><div class='ctx'> 	long ret;</div><div class='ctx'> 	struct file *neighbor;</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c<br/>index e481f6b9a789..d4a094ca96f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/inode.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/cell/spufs/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/cell/spufs/inode.c</a></div><div class='hunk'>@@ -74,7 +74,6 @@ spufs_alloc_inode(struct super_block *sb)</div><div class='ctx'> static void spufs_i_callback(struct rcu_head *head)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = container_of(head, struct inode, i_rcu);</div><div class='del'>-	INIT_LIST_HEAD(&amp;inode-&gt;i_dentry);</div><div class='ctx'> 	kmem_cache_free(spufs_inode_cache, SPUFS_I(inode));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -92,7 +91,7 @@ spufs_init_once(void *p)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct inode *</div><div class='del'>-spufs_new_inode(struct super_block *sb, int mode)</div><div class='add'>+spufs_new_inode(struct super_block *sb, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> </div><div class='hunk'>@@ -124,7 +123,7 @@ spufs_setattr(struct dentry *dentry, struct iattr *attr)</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> spufs_new_file(struct super_block *sb, struct dentry *dentry,</div><div class='del'>-		const struct file_operations *fops, int mode,</div><div class='add'>+		const struct file_operations *fops, umode_t mode,</div><div class='ctx'> 		size_t size, struct spu_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct inode_operations spufs_file_iops = {</div><div class='hunk'>@@ -194,7 +193,7 @@ static int spufs_rmdir(struct inode *parent, struct dentry *dir)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int spufs_fill_dir(struct dentry *dir,</div><div class='del'>-		const struct spufs_tree_descr *files, int mode,</div><div class='add'>+		const struct spufs_tree_descr *files, umode_t mode,</div><div class='ctx'> 		struct spu_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry, *tmp;</div><div class='hunk'>@@ -264,7 +263,7 @@ EXPORT_SYMBOL_GPL(spufs_context_fops);</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> spufs_mkdir(struct inode *dir, struct dentry *dentry, unsigned int flags,</div><div class='del'>-		int mode)</div><div class='add'>+		umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -447,7 +446,7 @@ spufs_set_affinity(unsigned int flags, struct spu_context *ctx,</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> spufs_create_context(struct inode *inode, struct dentry *dentry,</div><div class='del'>-			struct vfsmount *mnt, int flags, int mode,</div><div class='add'>+			struct vfsmount *mnt, int flags, umode_t mode,</div><div class='ctx'> 			struct file *aff_filp)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -521,7 +520,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-spufs_mkgang(struct inode *dir, struct dentry *dentry, int mode)</div><div class='add'>+spufs_mkgang(struct inode *dir, struct dentry *dentry, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -584,7 +583,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int spufs_create_gang(struct inode *inode,</div><div class='ctx'> 			struct dentry *dentry,</div><div class='del'>-			struct vfsmount *mnt, int mode)</div><div class='add'>+			struct vfsmount *mnt, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -612,7 +611,7 @@ out:</div><div class='ctx'> static struct file_system_type spufs_type;</div><div class='ctx'> </div><div class='ctx'> long spufs_create(struct path *path, struct dentry *dentry,</div><div class='del'>-		unsigned int flags, mode_t mode, struct file *filp)</div><div class='add'>+		unsigned int flags, umode_t mode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h<br/>index 099245f230b2..67852ade4c01 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/spufs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/cell/spufs/spufs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/spufs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/cell/spufs/spufs.h</a></div><div class='hunk'>@@ -237,7 +237,7 @@ struct spufs_inode_info {</div><div class='ctx'> struct spufs_tree_descr {</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	const struct file_operations *ops;</div><div class='del'>-	int mode;</div><div class='add'>+	umode_t mode;</div><div class='ctx'> 	size_t size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -249,7 +249,7 @@ extern const struct spufs_tree_descr spufs_dir_debug_contents[];</div><div class='ctx'> extern struct spufs_calls spufs_calls;</div><div class='ctx'> long spufs_run_spu(struct spu_context *ctx, u32 *npc, u32 *status);</div><div class='ctx'> long spufs_create(struct path *nd, struct dentry *dentry, unsigned int flags,</div><div class='del'>-			mode_t mode, struct file *filp);</div><div class='add'>+			umode_t mode, struct file *filp);</div><div class='ctx'> /* ELF coredump callbacks for writing SPU ELF notes */</div><div class='ctx'> extern int spufs_coredump_extra_notes_size(void);</div><div class='ctx'> extern int spufs_coredump_extra_notes_write(struct file *file, loff_t *foffset);</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/syscalls.c b/arch/powerpc/platforms/cell/spufs/syscalls.c<br/>index 71a5b5207266..8591bb62d7fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/syscalls.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/cell/spufs/syscalls.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/syscalls.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/cell/spufs/syscalls.c</a></div><div class='hunk'>@@ -60,7 +60,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long do_spu_create(const char __user *pathname, unsigned int flags,</div><div class='del'>-		mode_t mode, struct file *neighbor)</div><div class='add'>+		umode_t mode, struct file *neighbor)</div><div class='ctx'> {</div><div class='ctx'> 	struct path path;</div><div class='ctx'> 	struct dentry *dentry;</div><div class='head'>diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c<br/>index 122786498419..f1f17bb2c33c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/chrp/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/chrp/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/chrp/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/chrp/setup.c</a></div><div class='hunk'>@@ -435,8 +435,7 @@ static void __init chrp_find_openpic(void)</div><div class='ctx'> 	if (len &gt; 1)</div><div class='ctx'> 		isu_size = iranges[3];</div><div class='ctx'> </div><div class='del'>-	chrp_mpic = mpic_alloc(np, opaddr, MPIC_PRIMARY,</div><div class='del'>-			       isu_size, 0, " MPIC    ");</div><div class='add'>+	chrp_mpic = mpic_alloc(np, opaddr, 0, isu_size, 0, " MPIC    ");</div><div class='ctx'> 	if (chrp_mpic == NULL) {</div><div class='ctx'> 		printk(KERN_ERR "Failed to allocate MPIC structure\n");</div><div class='ctx'> 		goto bail;</div><div class='head'>diff --git a/arch/powerpc/platforms/embedded6xx/holly.c b/arch/powerpc/platforms/embedded6xx/holly.c<br/>index 2e9bcf6444c8..9cfcf20c0560 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/embedded6xx/holly.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/embedded6xx/holly.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/embedded6xx/holly.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/embedded6xx/holly.c</a></div><div class='hunk'>@@ -148,30 +148,14 @@ static void __init holly_setup_arch(void)</div><div class='ctx'> static void __init holly_init_IRQ(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpic *mpic;</div><div class='del'>-	phys_addr_t mpic_paddr = 0;</div><div class='del'>-	struct device_node *tsi_pic;</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> 	unsigned int cascade_pci_irq;</div><div class='ctx'> 	struct device_node *tsi_pci;</div><div class='ctx'> 	struct device_node *cascade_node = NULL;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	tsi_pic = of_find_node_by_type(NULL, "open-pic");</div><div class='del'>-	if (tsi_pic) {</div><div class='del'>-		unsigned int size;</div><div class='del'>-		const void *prop = of_get_property(tsi_pic, "reg", &amp;size);</div><div class='del'>-		mpic_paddr = of_translate_address(tsi_pic, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mpic_paddr == 0) {</div><div class='del'>-		printk(KERN_ERR "%s: No tsi108 PIC found !\n", __func__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pr_debug("%s: tsi108 pic phys_addr = 0x%x\n", __func__, (u32) mpic_paddr);</div><div class='del'>-</div><div class='del'>-	mpic = mpic_alloc(tsi_pic, mpic_paddr,</div><div class='del'>-			MPIC_PRIMARY | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET |</div><div class='add'>+	mpic = mpic_alloc(NULL, 0,</div><div class='add'>+			MPIC_BIG_ENDIAN | MPIC_WANTS_RESET |</div><div class='ctx'> 			MPIC_SPV_EOI | MPIC_NO_PTHROU_DIS | MPIC_REGSET_TSI108,</div><div class='ctx'> 			24,</div><div class='ctx'> 			NR_IRQS-4, /* num_sources used */</div><div class='hunk'>@@ -179,7 +163,7 @@ static void __init holly_init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='ctx'> </div><div class='del'>-	mpic_assign_isu(mpic, 0, mpic_paddr + 0x100);</div><div class='add'>+	mpic_assign_isu(mpic, 0, mpic-&gt;paddr + 0x100);</div><div class='ctx'> </div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> </div><div class='hunk'>@@ -204,7 +188,6 @@ static void __init holly_init_IRQ(void)</div><div class='ctx'> #endif</div><div class='ctx'> 	/* Configure MPIC outputs to CPU0 */</div><div class='ctx'> 	tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);</div><div class='del'>-	of_node_put(tsi_pic);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void holly_show_cpuinfo(struct seq_file *m)</div><div class='head'>diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c<br/>index 244f997de791..bcfad92c9cec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/embedded6xx/linkstation.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/embedded6xx/linkstation.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/embedded6xx/linkstation.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/embedded6xx/linkstation.c</a></div><div class='hunk'>@@ -81,29 +81,19 @@ static void __init linkstation_setup_arch(void)</div><div class='ctx'> static void __init linkstation_init_IRQ(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpic *mpic;</div><div class='del'>-	struct device_node *dnp;</div><div class='del'>-	const u32 *prop;</div><div class='del'>-	int size;</div><div class='del'>-	phys_addr_t paddr;</div><div class='ctx'> </div><div class='del'>-	dnp = of_find_node_by_type(NULL, "open-pic");</div><div class='del'>-	if (dnp == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	prop = of_get_property(dnp, "reg", &amp;size);</div><div class='del'>-	paddr = (phys_addr_t)of_translate_address(dnp, prop);</div><div class='del'>-</div><div class='del'>-	mpic = mpic_alloc(dnp, paddr, MPIC_PRIMARY | MPIC_WANTS_RESET, 4, 32, " EPIC     ");</div><div class='add'>+	mpic = mpic_alloc(NULL, 0, MPIC_WANTS_RESET,</div><div class='add'>+			4, 32, " EPIC     ");</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* PCI IRQs */</div><div class='del'>-	mpic_assign_isu(mpic, 0, paddr + 0x10200);</div><div class='add'>+	mpic_assign_isu(mpic, 0, mpic-&gt;paddr + 0x10200);</div><div class='ctx'> </div><div class='ctx'> 	/* I2C */</div><div class='del'>-	mpic_assign_isu(mpic, 1, paddr + 0x11000);</div><div class='add'>+	mpic_assign_isu(mpic, 1, mpic-&gt;paddr + 0x11000);</div><div class='ctx'> </div><div class='ctx'> 	/* ttyS0, ttyS1 */</div><div class='del'>-	mpic_assign_isu(mpic, 2, paddr + 0x11100);</div><div class='add'>+	mpic_assign_isu(mpic, 2, mpic-&gt;paddr + 0x11100);</div><div class='ctx'> </div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c<br/>index f8f33e16c6b6..f3350d786f5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c</a></div><div class='hunk'>@@ -102,31 +102,14 @@ static void __init mpc7448_hpc2_setup_arch(void)</div><div class='ctx'> static void __init mpc7448_hpc2_init_IRQ(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpic *mpic;</div><div class='del'>-	phys_addr_t mpic_paddr = 0;</div><div class='del'>-	struct device_node *tsi_pic;</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> 	unsigned int cascade_pci_irq;</div><div class='ctx'> 	struct device_node *tsi_pci;</div><div class='ctx'> 	struct device_node *cascade_node = NULL;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	tsi_pic = of_find_node_by_type(NULL, "open-pic");</div><div class='del'>-	if (tsi_pic) {</div><div class='del'>-		unsigned int size;</div><div class='del'>-		const void *prop = of_get_property(tsi_pic, "reg", &amp;size);</div><div class='del'>-		mpic_paddr = of_translate_address(tsi_pic, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mpic_paddr == 0) {</div><div class='del'>-		printk("%s: No tsi108 PIC found !\n", __func__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DBG("%s: tsi108 pic phys_addr = 0x%x\n", __func__,</div><div class='del'>-	    (u32) mpic_paddr);</div><div class='del'>-</div><div class='del'>-	mpic = mpic_alloc(tsi_pic, mpic_paddr,</div><div class='del'>-			MPIC_PRIMARY | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET |</div><div class='add'>+	mpic = mpic_alloc(NULL, 0,</div><div class='add'>+			MPIC_BIG_ENDIAN | MPIC_WANTS_RESET |</div><div class='ctx'> 			MPIC_SPV_EOI | MPIC_NO_PTHROU_DIS | MPIC_REGSET_TSI108,</div><div class='ctx'> 			24,</div><div class='ctx'> 			NR_IRQS-4, /* num_sources used */</div><div class='hunk'>@@ -134,7 +117,7 @@ static void __init mpc7448_hpc2_init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='ctx'> </div><div class='del'>-	mpic_assign_isu(mpic, 0, mpic_paddr + 0x100);</div><div class='add'>+	mpic_assign_isu(mpic, 0, mpic-&gt;paddr + 0x100);</div><div class='ctx'> </div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> </div><div class='hunk'>@@ -159,7 +142,6 @@ static void __init mpc7448_hpc2_init_IRQ(void)</div><div class='ctx'> #endif</div><div class='ctx'> 	/* Configure MPIC outputs to CPU0 */</div><div class='ctx'> 	tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);</div><div class='del'>-	of_node_put(tsi_pic);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mpc7448_hpc2_show_cpuinfo(struct seq_file *m)</div><div class='head'>diff --git a/arch/powerpc/platforms/embedded6xx/storcenter.c b/arch/powerpc/platforms/embedded6xx/storcenter.c<br/>index f1eebcae9bf0..afa638834965 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/embedded6xx/storcenter.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/embedded6xx/storcenter.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/embedded6xx/storcenter.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/embedded6xx/storcenter.c</a></div><div class='hunk'>@@ -83,35 +83,17 @@ static void __init storcenter_setup_arch(void)</div><div class='ctx'> static void __init storcenter_init_IRQ(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpic *mpic;</div><div class='del'>-	struct device_node *dnp;</div><div class='del'>-	const void *prop;</div><div class='del'>-	int size;</div><div class='del'>-	phys_addr_t paddr;</div><div class='del'>-</div><div class='del'>-	dnp = of_find_node_by_type(NULL, "open-pic");</div><div class='del'>-	if (dnp == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	prop = of_get_property(dnp, "reg", &amp;size);</div><div class='del'>-	if (prop == NULL) {</div><div class='del'>-		of_node_put(dnp);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	paddr = (phys_addr_t)of_translate_address(dnp, prop);</div><div class='del'>-	mpic = mpic_alloc(dnp, paddr, MPIC_PRIMARY | MPIC_WANTS_RESET,</div><div class='del'>-			16, 32, " OpenPIC  ");</div><div class='del'>-</div><div class='del'>-	of_node_put(dnp);</div><div class='ctx'> </div><div class='add'>+	mpic = mpic_alloc(NULL, 0, MPIC_WANTS_RESET,</div><div class='add'>+			16, 32, " OpenPIC  ");</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * 16 Serial Interrupts followed by 16 Internal Interrupts.</div><div class='ctx'> 	 * I2C is the second internal, so it is at 17, 0x11020.</div><div class='ctx'> 	 */</div><div class='del'>-	mpic_assign_isu(mpic, 0, paddr + 0x10200);</div><div class='del'>-	mpic_assign_isu(mpic, 1, paddr + 0x11000);</div><div class='add'>+	mpic_assign_isu(mpic, 0, mpic-&gt;paddr + 0x10200);</div><div class='add'>+	mpic_assign_isu(mpic, 1, mpic-&gt;paddr + 0x11000);</div><div class='ctx'> </div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/smp.c b/arch/powerpc/platforms/iseries/smp.c<br/>index 7e2a5515ed76..02df49fb59f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/smp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/iseries/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/iseries/smp.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c<br/>index dd2e48b28508..401e3f3f74c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/maple/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/maple/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/maple/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/maple/pci.c</a></div><div class='hunk'>@@ -207,6 +207,54 @@ static volatile void __iomem *u3_ht_cfg_access(struct pci_controller* hose,</div><div class='ctx'> 		return hose-&gt;cfg_data + u3_ht_cfa1(bus, devfn, offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int u3_ht_root_read_config(struct pci_controller *hose, u8 offset,</div><div class='add'>+				  int len, u32 *val)</div><div class='add'>+{</div><div class='add'>+	volatile void __iomem *addr;</div><div class='add'>+</div><div class='add'>+	addr = hose-&gt;cfg_addr;</div><div class='add'>+	addr += ((offset &amp; ~3) &lt;&lt; 2) + (4 - len - (offset &amp; 3));</div><div class='add'>+</div><div class='add'>+	switch (len) {</div><div class='add'>+	case 1:</div><div class='add'>+		*val = in_8(addr);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		*val = in_be16(addr);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		*val = in_be32(addr);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int u3_ht_root_write_config(struct pci_controller *hose, u8 offset,</div><div class='add'>+				  int len, u32 val)</div><div class='add'>+{</div><div class='add'>+	volatile void __iomem *addr;</div><div class='add'>+</div><div class='add'>+	addr = hose-&gt;cfg_addr + ((offset &amp; ~3) &lt;&lt; 2) + (4 - len - (offset &amp; 3));</div><div class='add'>+</div><div class='add'>+	if (offset &gt;= PCI_BASE_ADDRESS_0 &amp;&amp; offset &lt; PCI_CAPABILITY_LIST)</div><div class='add'>+		return PCIBIOS_SUCCESSFUL;</div><div class='add'>+</div><div class='add'>+	switch (len) {</div><div class='add'>+	case 1:</div><div class='add'>+		out_8(addr, val);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		out_be16(addr, val);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		out_be32(addr, val);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int u3_ht_read_config(struct pci_bus *bus, unsigned int devfn,</div><div class='ctx'> 			     int offset, int len, u32 *val)</div><div class='ctx'> {</div><div class='hunk'>@@ -217,6 +265,9 @@ static int u3_ht_read_config(struct pci_bus *bus, unsigned int devfn,</div><div class='ctx'> 	if (hose == NULL)</div><div class='ctx'> 		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='ctx'> </div><div class='add'>+	if (bus-&gt;number == hose-&gt;first_busno &amp;&amp; devfn == PCI_DEVFN(0, 0))</div><div class='add'>+		return u3_ht_root_read_config(hose, offset, len, val);</div><div class='add'>+</div><div class='ctx'> 	if (offset &gt; 0xff)</div><div class='ctx'> 		return PCIBIOS_BAD_REGISTER_NUMBER;</div><div class='ctx'> </div><div class='hunk'>@@ -252,6 +303,9 @@ static int u3_ht_write_config(struct pci_bus *bus, unsigned int devfn,</div><div class='ctx'> 	if (hose == NULL)</div><div class='ctx'> 		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='ctx'> </div><div class='add'>+	if (bus-&gt;number == hose-&gt;first_busno &amp;&amp; devfn == PCI_DEVFN(0, 0))</div><div class='add'>+		return u3_ht_root_write_config(hose, offset, len, val);</div><div class='add'>+</div><div class='ctx'> 	if (offset &gt; 0xff)</div><div class='ctx'> 		return PCIBIOS_BAD_REGISTER_NUMBER;</div><div class='ctx'> </div><div class='hunk'>@@ -428,6 +482,7 @@ static void __init setup_u3_ht(struct pci_controller* hose)</div><div class='ctx'> 	 * reg_property and using some accessor functions instead</div><div class='ctx'> 	 */</div><div class='ctx'> 	hose-&gt;cfg_data = ioremap(0xf2000000, 0x02000000);</div><div class='add'>+	hose-&gt;cfg_addr = ioremap(0xf8070000, 0x1000);</div><div class='ctx'> </div><div class='ctx'> 	hose-&gt;first_busno = 0;</div><div class='ctx'> 	hose-&gt;last_busno = 0xef;</div><div class='head'>diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c<br/>index 4c372047c94e..0bcbfe7b2c55 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/maple/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/maple/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/maple/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/maple/setup.c</a></div><div class='hunk'>@@ -221,7 +221,7 @@ static void __init maple_init_IRQ(void)</div><div class='ctx'> 	unsigned long openpic_addr = 0;</div><div class='ctx'> 	int naddr, n, i, opplen, has_isus = 0;</div><div class='ctx'> 	struct mpic *mpic;</div><div class='del'>-	unsigned int flags = MPIC_PRIMARY;</div><div class='add'>+	unsigned int flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Locate MPIC in the device-tree. Note that there is a bug</div><div class='ctx'> 	 * in Maple device-tree where the type of the controller is</div><div class='head'>diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c<br/>index 6f3558210554..98b7a7c13176 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pasemi/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pasemi/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pasemi/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/pasemi/setup.c</a></div><div class='hunk'>@@ -224,7 +224,7 @@ static __init void pas_init_IRQ(void)</div><div class='ctx'> 	openpic_addr = of_read_number(opprop, naddr);</div><div class='ctx'> 	printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr);</div><div class='ctx'> </div><div class='del'>-	mpic_flags = MPIC_PRIMARY | MPIC_LARGE_VECTORS | MPIC_NO_BIAS;</div><div class='add'>+	mpic_flags = MPIC_LARGE_VECTORS | MPIC_NO_BIAS;</div><div class='ctx'> </div><div class='ctx'> 	nmiprop = of_get_property(mpic_node, "nmi-source", NULL);</div><div class='ctx'> 	if (nmiprop)</div><div class='hunk'>@@ -234,7 +234,7 @@ static __init void pas_init_IRQ(void)</div><div class='ctx'> 			  mpic_flags, 0, 0, "PASEMI-OPIC");</div><div class='ctx'> 	BUG_ON(!mpic);</div><div class='ctx'> </div><div class='del'>-	mpic_assign_isu(mpic, 0, openpic_addr + 0x10000);</div><div class='add'>+	mpic_assign_isu(mpic, 0, mpic-&gt;paddr + 0x10000);</div><div class='ctx'> 	mpic_init(mpic);</div><div class='ctx'> 	/* The NMI/MCK source needs to be prio 15 */</div><div class='ctx'> 	if (nmiprop) {</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c<br/>index 04af5f48b4eb..1fc386a23f18 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/cpufreq_32.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powermac/cpufreq_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/cpufreq_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/powermac/cpufreq_32.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/pmu.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c<br/>index 901bfbddc3dd..7761aabfc293 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/pic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powermac/pic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/pic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/powermac/pic.c</a></div><div class='hunk'>@@ -52,13 +52,8 @@ struct device_node *of_irq_dflt_pic;</div><div class='ctx'> /* Default addresses */</div><div class='ctx'> static volatile struct pmac_irq_hw __iomem *pmac_irq_hw[4];</div><div class='ctx'> </div><div class='del'>-#define GC_LEVEL_MASK		0x3ff00000</div><div class='del'>-#define OHARE_LEVEL_MASK	0x1ff00000</div><div class='del'>-#define HEATHROW_LEVEL_MASK	0x1ff00000</div><div class='del'>-</div><div class='ctx'> static int max_irqs;</div><div class='ctx'> static int max_real_irqs;</div><div class='del'>-static u32 level_mask[4];</div><div class='ctx'> </div><div class='ctx'> static DEFINE_RAW_SPINLOCK(pmac_pic_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -217,8 +212,7 @@ static irqreturn_t gatwick_action(int cpl, void *dev_id)</div><div class='ctx'> 	for (irq = max_irqs; (irq -= 32) &gt;= max_real_irqs; ) {</div><div class='ctx'> 		int i = irq &gt;&gt; 5;</div><div class='ctx'> 		bits = in_le32(&amp;pmac_irq_hw[i]-&gt;event) | ppc_lost_interrupts[i];</div><div class='del'>-		/* We must read level interrupts from the level register */</div><div class='del'>-		bits |= (in_le32(&amp;pmac_irq_hw[i]-&gt;level) &amp; level_mask[i]);</div><div class='add'>+		bits |= in_le32(&amp;pmac_irq_hw[i]-&gt;level);</div><div class='ctx'> 		bits &amp;= ppc_cached_irq_mask[i];</div><div class='ctx'> 		if (bits == 0)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -248,8 +242,7 @@ static unsigned int pmac_pic_get_irq(void)</div><div class='ctx'> 	for (irq = max_real_irqs; (irq -= 32) &gt;= 0; ) {</div><div class='ctx'> 		int i = irq &gt;&gt; 5;</div><div class='ctx'> 		bits = in_le32(&amp;pmac_irq_hw[i]-&gt;event) | ppc_lost_interrupts[i];</div><div class='del'>-		/* We must read level interrupts from the level register */</div><div class='del'>-		bits |= (in_le32(&amp;pmac_irq_hw[i]-&gt;level) &amp; level_mask[i]);</div><div class='add'>+		bits |= in_le32(&amp;pmac_irq_hw[i]-&gt;level);</div><div class='ctx'> 		bits &amp;= ppc_cached_irq_mask[i];</div><div class='ctx'> 		if (bits == 0)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -284,19 +277,14 @@ static int pmac_pic_host_match(struct irq_host *h, struct device_node *node)</div><div class='ctx'> static int pmac_pic_host_map(struct irq_host *h, unsigned int virq,</div><div class='ctx'> 			     irq_hw_number_t hw)</div><div class='ctx'> {</div><div class='del'>-	int level;</div><div class='del'>-</div><div class='ctx'> 	if (hw &gt;= max_irqs)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Mark level interrupts, set delayed disable for edge ones and set</div><div class='ctx'> 	 * handlers</div><div class='ctx'> 	 */</div><div class='del'>-	level = !!(level_mask[hw &gt;&gt; 5] &amp; (1UL &lt;&lt; (hw &amp; 0x1f)));</div><div class='del'>-	if (level)</div><div class='del'>-		irq_set_status_flags(virq, IRQ_LEVEL);</div><div class='del'>-	irq_set_chip_and_handler(virq, &amp;pmac_pic,</div><div class='del'>-				 level ? handle_level_irq : handle_edge_irq);</div><div class='add'>+	irq_set_status_flags(virq, IRQ_LEVEL);</div><div class='add'>+	irq_set_chip_and_handler(virq, &amp;pmac_pic, handle_level_irq);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -334,21 +322,14 @@ static void __init pmac_pic_probe_oldstyle(void)</div><div class='ctx'> </div><div class='ctx'> 	if ((master = of_find_node_by_name(NULL, "gc")) != NULL) {</div><div class='ctx'> 		max_irqs = max_real_irqs = 32;</div><div class='del'>-		level_mask[0] = GC_LEVEL_MASK;</div><div class='ctx'> 	} else if ((master = of_find_node_by_name(NULL, "ohare")) != NULL) {</div><div class='ctx'> 		max_irqs = max_real_irqs = 32;</div><div class='del'>-		level_mask[0] = OHARE_LEVEL_MASK;</div><div class='del'>-</div><div class='ctx'> 		/* We might have a second cascaded ohare */</div><div class='ctx'> 		slave = of_find_node_by_name(NULL, "pci106b,7");</div><div class='del'>-		if (slave) {</div><div class='add'>+		if (slave)</div><div class='ctx'> 			max_irqs = 64;</div><div class='del'>-			level_mask[1] = OHARE_LEVEL_MASK;</div><div class='del'>-		}</div><div class='ctx'> 	} else if ((master = of_find_node_by_name(NULL, "mac-io")) != NULL) {</div><div class='ctx'> 		max_irqs = max_real_irqs = 64;</div><div class='del'>-		level_mask[0] = HEATHROW_LEVEL_MASK;</div><div class='del'>-		level_mask[1] = 0;</div><div class='ctx'> </div><div class='ctx'> 		/* We might have a second cascaded heathrow */</div><div class='ctx'> 		slave = of_find_node_by_name(master, "mac-io");</div><div class='hunk'>@@ -363,11 +344,8 @@ static void __init pmac_pic_probe_oldstyle(void)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* We found a slave */</div><div class='del'>-		if (slave) {</div><div class='add'>+		if (slave)</div><div class='ctx'> 			max_irqs = 128;</div><div class='del'>-			level_mask[2] = HEATHROW_LEVEL_MASK;</div><div class='del'>-			level_mask[3] = 0;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	BUG_ON(master == NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -464,18 +442,6 @@ int of_irq_map_oldworld(struct device_node *device, int index,</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PPC32 */</div><div class='ctx'> </div><div class='del'>-static void pmac_u3_cascade(unsigned int irq, struct irq_desc *desc)</div><div class='del'>-{</div><div class='del'>-	struct irq_chip *chip = irq_desc_get_chip(desc);</div><div class='del'>-	struct mpic *mpic = irq_desc_get_handler_data(desc);</div><div class='del'>-	unsigned int cascade_irq = mpic_get_one_irq(mpic);</div><div class='del'>-</div><div class='del'>-	if (cascade_irq != NO_IRQ)</div><div class='del'>-		generic_handle_irq(cascade_irq);</div><div class='del'>-</div><div class='del'>-	chip-&gt;irq_eoi(&amp;desc-&gt;irq_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __init pmac_pic_setup_mpic_nmi(struct mpic *mpic)</div><div class='ctx'> {</div><div class='ctx'> #if defined(CONFIG_XMON) &amp;&amp; defined(CONFIG_PPC32)</div><div class='hunk'>@@ -498,14 +464,8 @@ static struct mpic * __init pmac_setup_one_mpic(struct device_node *np,</div><div class='ctx'> 						int master)</div><div class='ctx'> {</div><div class='ctx'> 	const char *name = master ? " MPIC 1   " : " MPIC 2   ";</div><div class='del'>-	struct resource r;</div><div class='ctx'> 	struct mpic *mpic;</div><div class='del'>-	unsigned int flags = master ? MPIC_PRIMARY : 0;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	rc = of_address_to_resource(np, 0, &amp;r);</div><div class='del'>-	if (rc)</div><div class='del'>-		return NULL;</div><div class='add'>+	unsigned int flags = master ? 0 : MPIC_SECONDARY;</div><div class='ctx'> </div><div class='ctx'> 	pmac_call_feature(PMAC_FTR_ENABLE_MPIC, np, 0, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -519,7 +479,7 @@ static struct mpic * __init pmac_setup_one_mpic(struct device_node *np,</div><div class='ctx'> 	if (master &amp;&amp; (flags &amp; MPIC_BIG_ENDIAN))</div><div class='ctx'> 		flags |= MPIC_U3_HT_IRQS;</div><div class='ctx'> </div><div class='del'>-	mpic = mpic_alloc(np, r.start, flags, 0, 0, name);</div><div class='add'>+	mpic = mpic_alloc(np, 0, flags, 0, 0, name);</div><div class='ctx'> 	if (mpic == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -532,7 +492,6 @@ static int __init pmac_pic_probe_mpic(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpic *mpic1, *mpic2;</div><div class='ctx'> 	struct device_node *np, *master = NULL, *slave = NULL;</div><div class='del'>-	unsigned int cascade;</div><div class='ctx'> </div><div class='ctx'> 	/* We can have up to 2 MPICs cascaded */</div><div class='ctx'> 	for (np = NULL; (np = of_find_node_by_type(np, "open-pic"))</div><div class='hunk'>@@ -568,27 +527,14 @@ static int __init pmac_pic_probe_mpic(void)</div><div class='ctx'> </div><div class='ctx'> 	of_node_put(master);</div><div class='ctx'> </div><div class='del'>-	/* No slave, let's go out */</div><div class='del'>-	if (slave == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Get/Map slave interrupt */</div><div class='del'>-	cascade = irq_of_parse_and_map(slave, 0);</div><div class='del'>-	if (cascade == NO_IRQ) {</div><div class='del'>-		printk(KERN_ERR "Failed to map cascade IRQ\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mpic2 = pmac_setup_one_mpic(slave, 0);</div><div class='del'>-	if (mpic2 == NULL) {</div><div class='del'>-		printk(KERN_ERR "Failed to setup slave MPIC\n");</div><div class='add'>+	/* Set up a cascaded controller, if present */</div><div class='add'>+	if (slave) {</div><div class='add'>+		mpic2 = pmac_setup_one_mpic(slave, 0);</div><div class='add'>+		if (mpic2 == NULL)</div><div class='add'>+			printk(KERN_ERR "Failed to setup slave MPIC\n");</div><div class='ctx'> 		of_node_put(slave);</div><div class='del'>-		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	irq_set_handler_data(cascade, mpic2);</div><div class='del'>-	irq_set_chained_handler(cascade, pmac_u3_cascade);</div><div class='ctx'> </div><div class='del'>-	of_node_put(slave);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c<br/>index 96580b189ec2..970ea1de4298 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powermac/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/powermac/setup.c</a></div><div class='hunk'>@@ -494,11 +494,15 @@ static int __init pmac_declare_of_platform_devices(void)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	np = of_find_node_by_name(NULL, "valkyrie");</div><div class='del'>-	if (np)</div><div class='add'>+	if (np) {</div><div class='ctx'> 		of_platform_device_create(np, "valkyrie", NULL);</div><div class='add'>+		of_node_put(np);</div><div class='add'>+	}</div><div class='ctx'> 	np = of_find_node_by_name(NULL, "platinum");</div><div class='del'>-	if (np)</div><div class='add'>+	if (np) {</div><div class='ctx'> 		of_platform_device_create(np, "platinum", NULL);</div><div class='add'>+		of_node_put(np);</div><div class='add'>+	}</div><div class='ctx'>         np = of_find_node_by_type(NULL, "smu");</div><div class='ctx'>         if (np) {</div><div class='ctx'> 		of_platform_device_create(np, "smu", NULL);</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c<br/>index 9b6a820bdd7d..44d769258ebf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/smp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powermac/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/powermac/smp.c</a></div><div class='hunk'>@@ -200,7 +200,7 @@ static int psurge_secondary_ipi_init(void)</div><div class='ctx'> </div><div class='ctx'> 	if (psurge_secondary_virq)</div><div class='ctx'> 		rc = request_irq(psurge_secondary_virq, psurge_ipi_intr,</div><div class='del'>-			IRQF_PERCPU, "IPI", NULL);</div><div class='add'>+			IRQF_PERCPU | IRQF_NO_THREAD, "IPI", NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		pr_err("Failed to setup secondary cpu IPI\n");</div><div class='hunk'>@@ -408,13 +408,13 @@ static int __init smp_psurge_kick_cpu(int nr)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction psurge_irqaction = {</div><div class='ctx'> 	.handler = psurge_ipi_intr,</div><div class='del'>-	.flags = IRQF_PERCPU,</div><div class='add'>+	.flags = IRQF_PERCPU | IRQF_NO_THREAD,</div><div class='ctx'> 	.name = "primary IPI",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init smp_psurge_setup_cpu(int cpu_nr)</div><div class='ctx'> {</div><div class='del'>-	if (cpu_nr != 0)</div><div class='add'>+	if (cpu_nr != 0 || !psurge_start)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* reset the entry point so if we get another intr we won't</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/Makefile b/arch/powerpc/platforms/powernv/Makefile<br/>index 31853008b418..bcc3cb48a44e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powernv/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powernv/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powernv/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/powernv/Makefile</a></div><div class='hunk'>@@ -2,4 +2,4 @@ obj-y			+= setup.o opal-takeover.o opal-wrappers.o opal.o</div><div class='ctx'> obj-y			+= opal-rtc.o opal-nvram.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SMP)	+= smp.o</div><div class='del'>-obj-$(CONFIG_PCI)	+= pci.o pci-p5ioc2.o</div><div class='add'>+obj-$(CONFIG_PCI)	+= pci.o pci-p5ioc2.o pci-ioda.o</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/opal-wrappers.S b/arch/powerpc/platforms/powernv/opal-wrappers.S<br/>index 4a3f46d8533e..3bb07e5e43cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powernv/opal-wrappers.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powernv/opal-wrappers.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powernv/opal-wrappers.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/powernv/opal-wrappers.S</a></div><div class='hunk'>@@ -99,3 +99,11 @@ OPAL_CALL(opal_write_oppanel,			OPAL_WRITE_OPPANEL);</div><div class='ctx'> OPAL_CALL(opal_pci_map_pe_dma_window,		OPAL_PCI_MAP_PE_DMA_WINDOW);</div><div class='ctx'> OPAL_CALL(opal_pci_map_pe_dma_window_real,	OPAL_PCI_MAP_PE_DMA_WINDOW_REAL);</div><div class='ctx'> OPAL_CALL(opal_pci_reset,			OPAL_PCI_RESET);</div><div class='add'>+OPAL_CALL(opal_pci_get_hub_diag_data,		OPAL_PCI_GET_HUB_DIAG_DATA);</div><div class='add'>+OPAL_CALL(opal_pci_get_phb_diag_data,		OPAL_PCI_GET_PHB_DIAG_DATA);</div><div class='add'>+OPAL_CALL(opal_pci_fence_phb,			OPAL_PCI_FENCE_PHB);</div><div class='add'>+OPAL_CALL(opal_pci_reinit,			OPAL_PCI_REINIT);</div><div class='add'>+OPAL_CALL(opal_pci_mask_pe_error,		OPAL_PCI_MASK_PE_ERROR);</div><div class='add'>+OPAL_CALL(opal_set_slot_led_status,		OPAL_SET_SLOT_LED_STATUS);</div><div class='add'>+OPAL_CALL(opal_get_epow_status,			OPAL_GET_EPOW_STATUS);</div><div class='add'>+OPAL_CALL(opal_set_system_attention_led,	OPAL_SET_SYSTEM_ATTENTION_LED);</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c<br/>new file mode 100644<br/>index 000000000000..f31162cfdaa9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powernv/pci-ioda.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/powernv/pci-ioda.c</a></div><div class='hunk'>@@ -0,0 +1,1330 @@</div><div class='add'>+/*</div><div class='add'>+ * Support PCI/PCIe on PowerNV platforms</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Benjamin Herrenschmidt, IBM Corp.</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'>+</div><div class='add'>+#undef DEBUG</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/msi.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/sections.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/pci-bridge.h&gt;</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/ppc-pci.h&gt;</div><div class='add'>+#include &lt;asm/opal.h&gt;</div><div class='add'>+#include &lt;asm/iommu.h&gt;</div><div class='add'>+#include &lt;asm/tce.h&gt;</div><div class='add'>+#include &lt;asm/abs_addr.h&gt;</div><div class='add'>+</div><div class='add'>+#include "powernv.h"</div><div class='add'>+#include "pci.h"</div><div class='add'>+</div><div class='add'>+struct resource_wrap {</div><div class='add'>+	struct list_head	link;</div><div class='add'>+	resource_size_t		size;</div><div class='add'>+	resource_size_t		align;</div><div class='add'>+	struct pci_dev		*dev;	/* Set if it's a device */</div><div class='add'>+	struct pci_bus		*bus;	/* Set if it's a bridge */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __pe_printk(const char *level, const struct pnv_ioda_pe *pe,</div><div class='add'>+		       struct va_format *vaf)</div><div class='add'>+{</div><div class='add'>+	char pfix[32];</div><div class='add'>+</div><div class='add'>+	if (pe-&gt;pdev)</div><div class='add'>+		strlcpy(pfix, dev_name(&amp;pe-&gt;pdev-&gt;dev), sizeof(pfix));</div><div class='add'>+	else</div><div class='add'>+		sprintf(pfix, "%04x:%02x     ",</div><div class='add'>+			pci_domain_nr(pe-&gt;pbus), pe-&gt;pbus-&gt;number);</div><div class='add'>+	return printk("pci %s%s: [PE# %.3d] %pV", level, pfix, pe-&gt;pe_number, vaf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define define_pe_printk_level(func, kern_level)		\</div><div class='add'>+static int func(const struct pnv_ioda_pe *pe, const char *fmt, ...)	\</div><div class='add'>+{								\</div><div class='add'>+	struct va_format vaf;					\</div><div class='add'>+	va_list args;						\</div><div class='add'>+	int r;							\</div><div class='add'>+								\</div><div class='add'>+	va_start(args, fmt);					\</div><div class='add'>+								\</div><div class='add'>+	vaf.fmt = fmt;						\</div><div class='add'>+	vaf.va = &amp;args;						\</div><div class='add'>+								\</div><div class='add'>+	r = __pe_printk(kern_level, pe, &amp;vaf);			\</div><div class='add'>+	va_end(args);						\</div><div class='add'>+								\</div><div class='add'>+	return r;						\</div><div class='add'>+}								\</div><div class='add'>+</div><div class='add'>+define_pe_printk_level(pe_err, KERN_ERR);</div><div class='add'>+define_pe_printk_level(pe_warn, KERN_WARNING);</div><div class='add'>+define_pe_printk_level(pe_info, KERN_INFO);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Calculate resource usage &amp; alignment requirement of a single</div><div class='add'>+ * device. This will also assign all resources within the device</div><div class='add'>+ * for a given type starting at 0 for the biggest one and then</div><div class='add'>+ * assigning in decreasing order of size.</div><div class='add'>+ */</div><div class='add'>+static void __devinit pnv_ioda_calc_dev(struct pci_dev *dev, unsigned int flags,</div><div class='add'>+					resource_size_t *size,</div><div class='add'>+					resource_size_t *align)</div><div class='add'>+{</div><div class='add'>+	resource_size_t start;</div><div class='add'>+	struct resource *r;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	pr_devel("  -&gt; CDR %s\n", pci_name(dev));</div><div class='add'>+</div><div class='add'>+	*size = *align = 0;</div><div class='add'>+</div><div class='add'>+	/* Clear the resources out and mark them all unset */</div><div class='add'>+	for (i = 0; i &lt;= PCI_ROM_RESOURCE; i++) {</div><div class='add'>+		r = &amp;dev-&gt;resource[i];</div><div class='add'>+		if (!(r-&gt;flags &amp; flags))</div><div class='add'>+		    continue;</div><div class='add'>+		if (r-&gt;start) {</div><div class='add'>+			r-&gt;end -= r-&gt;start;</div><div class='add'>+			r-&gt;start = 0;</div><div class='add'>+		}</div><div class='add'>+		r-&gt;flags |= IORESOURCE_UNSET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We currently keep all memory resources together, we</div><div class='add'>+	 * will handle prefetch &amp; 64-bit separately in the future</div><div class='add'>+	 * but for now we stick everybody in M32</div><div class='add'>+	 */</div><div class='add'>+	start = 0;</div><div class='add'>+	for (;;) {</div><div class='add'>+		resource_size_t max_size = 0;</div><div class='add'>+		int max_no = -1;</div><div class='add'>+</div><div class='add'>+		/* Find next biggest resource */</div><div class='add'>+		for (i = 0; i &lt;= PCI_ROM_RESOURCE; i++) {</div><div class='add'>+			r = &amp;dev-&gt;resource[i];</div><div class='add'>+			if (!(r-&gt;flags &amp; IORESOURCE_UNSET) ||</div><div class='add'>+			    !(r-&gt;flags &amp; flags))</div><div class='add'>+				continue;</div><div class='add'>+			if (resource_size(r) &gt; max_size) {</div><div class='add'>+				max_size = resource_size(r);</div><div class='add'>+				max_no = i;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (max_no &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		r = &amp;dev-&gt;resource[max_no];</div><div class='add'>+		if (max_size &gt; *align)</div><div class='add'>+			*align = max_size;</div><div class='add'>+		*size += max_size;</div><div class='add'>+		r-&gt;start = start;</div><div class='add'>+		start += max_size;</div><div class='add'>+		r-&gt;end = r-&gt;start + max_size - 1;</div><div class='add'>+		r-&gt;flags &amp;= ~IORESOURCE_UNSET;</div><div class='add'>+		pr_devel("  -&gt;     R%d %016llx..%016llx\n",</div><div class='add'>+			 max_no, r-&gt;start, r-&gt;end);</div><div class='add'>+	}</div><div class='add'>+	pr_devel("  &lt;- CDR %s size=%llx align=%llx\n",</div><div class='add'>+		 pci_name(dev), *size, *align);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Allocate a resource "wrap" for a given device or bridge and</div><div class='add'>+ * insert it at the right position in the sorted list</div><div class='add'>+ */</div><div class='add'>+static void __devinit pnv_ioda_add_wrap(struct list_head *list,</div><div class='add'>+					struct pci_bus *bus,</div><div class='add'>+					struct pci_dev *dev,</div><div class='add'>+					resource_size_t size,</div><div class='add'>+					resource_size_t align)</div><div class='add'>+{</div><div class='add'>+	struct resource_wrap *w1, *w = kzalloc(sizeof(*w), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	w-&gt;size = size;</div><div class='add'>+	w-&gt;align = align;</div><div class='add'>+	w-&gt;dev = dev;</div><div class='add'>+	w-&gt;bus = bus;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(w1, list, link) {</div><div class='add'>+		if (w1-&gt;align &lt; align) {</div><div class='add'>+			list_add_tail(&amp;w-&gt;link, &amp;w1-&gt;link);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	list_add_tail(&amp;w-&gt;link, list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Offset device resources of a given type */</div><div class='add'>+static void __devinit pnv_ioda_offset_dev(struct pci_dev *dev,</div><div class='add'>+					  unsigned int flags,</div><div class='add'>+					  resource_size_t offset)</div><div class='add'>+{</div><div class='add'>+	struct resource *r;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	pr_devel("  -&gt; ODR %s [%x] +%016llx\n", pci_name(dev), flags, offset);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= PCI_ROM_RESOURCE; i++) {</div><div class='add'>+		r = &amp;dev-&gt;resource[i];</div><div class='add'>+		if (r-&gt;flags &amp; flags) {</div><div class='add'>+			dev-&gt;resource[i].start += offset;</div><div class='add'>+			dev-&gt;resource[i].end += offset;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_devel("  &lt;- ODR %s [%x] +%016llx\n", pci_name(dev), flags, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Offset bus resources (&amp; all children) of a given type */</div><div class='add'>+static void __devinit pnv_ioda_offset_bus(struct pci_bus *bus,</div><div class='add'>+					  unsigned int flags,</div><div class='add'>+					  resource_size_t offset)</div><div class='add'>+{</div><div class='add'>+	struct resource *r;</div><div class='add'>+	struct pci_dev *dev;</div><div class='add'>+	struct pci_bus *cbus;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	pr_devel("  -&gt; OBR %s [%x] +%016llx\n",</div><div class='add'>+		 bus-&gt;self ? pci_name(bus-&gt;self) : "root", flags, offset);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		r = bus-&gt;resource[i];</div><div class='add'>+		if (r &amp;&amp; (r-&gt;flags &amp; flags)) {</div><div class='add'>+			bus-&gt;resource[i]-&gt;start += offset;</div><div class='add'>+			bus-&gt;resource[i]-&gt;end += offset;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	list_for_each_entry(dev, &amp;bus-&gt;devices, bus_list)</div><div class='add'>+		pnv_ioda_offset_dev(dev, flags, offset);</div><div class='add'>+	list_for_each_entry(cbus, &amp;bus-&gt;children, node)</div><div class='add'>+		pnv_ioda_offset_bus(cbus, flags, offset);</div><div class='add'>+</div><div class='add'>+	pr_devel("  &lt;- OBR %s [%x]\n",</div><div class='add'>+		 bus-&gt;self ? pci_name(bus-&gt;self) : "root", flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This is the guts of our IODA resource allocation. This is called</div><div class='add'>+ * recursively for each bus in the system. It calculates all the</div><div class='add'>+ * necessary size and requirements for children and assign them</div><div class='add'>+ * resources such that:</div><div class='add'>+ *</div><div class='add'>+ *   - Each function fits in it's own contiguous set of IO/M32</div><div class='add'>+ *     segment</div><div class='add'>+ *</div><div class='add'>+ *   - All segments behind a P2P bridge are contiguous and obey</div><div class='add'>+ *     alignment constraints of those bridges</div><div class='add'>+ */</div><div class='add'>+static void __devinit pnv_ioda_calc_bus(struct pci_bus *bus, unsigned int flags,</div><div class='add'>+					resource_size_t *size,</div><div class='add'>+					resource_size_t *align)</div><div class='add'>+{</div><div class='add'>+	struct pci_controller *hose = pci_bus_to_host(bus);</div><div class='add'>+	struct pnv_phb *phb = hose-&gt;private_data;</div><div class='add'>+	resource_size_t dev_size, dev_align, start;</div><div class='add'>+	resource_size_t min_align, min_balign;</div><div class='add'>+	struct pci_dev *cdev;</div><div class='add'>+	struct pci_bus *cbus;</div><div class='add'>+	struct list_head head;</div><div class='add'>+	struct resource_wrap *w;</div><div class='add'>+	unsigned int bres;</div><div class='add'>+</div><div class='add'>+	*size = *align = 0;</div><div class='add'>+</div><div class='add'>+	pr_devel("-&gt; CBR %s [%x]\n",</div><div class='add'>+		 bus-&gt;self ? pci_name(bus-&gt;self) : "root", flags);</div><div class='add'>+</div><div class='add'>+	/* Calculate alignment requirements based on the type</div><div class='add'>+	 * of resource we are working on</div><div class='add'>+	 */</div><div class='add'>+	if (flags &amp; IORESOURCE_IO) {</div><div class='add'>+		bres = 0;</div><div class='add'>+		min_align = phb-&gt;ioda.io_segsize;</div><div class='add'>+		min_balign = 0x1000;</div><div class='add'>+	} else {</div><div class='add'>+		bres = 1;</div><div class='add'>+		min_align = phb-&gt;ioda.m32_segsize;</div><div class='add'>+		min_balign = 0x100000;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Gather all our children resources ordered by alignment */</div><div class='add'>+	INIT_LIST_HEAD(&amp;head);</div><div class='add'>+</div><div class='add'>+	/*   - Busses */</div><div class='add'>+	list_for_each_entry(cbus, &amp;bus-&gt;children, node) {</div><div class='add'>+		pnv_ioda_calc_bus(cbus, flags, &amp;dev_size, &amp;dev_align);</div><div class='add'>+		pnv_ioda_add_wrap(&amp;head, cbus, NULL, dev_size, dev_align);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*   - Devices */</div><div class='add'>+	list_for_each_entry(cdev, &amp;bus-&gt;devices, bus_list) {</div><div class='add'>+		pnv_ioda_calc_dev(cdev, flags, &amp;dev_size, &amp;dev_align);</div><div class='add'>+		/* Align them to segment size */</div><div class='add'>+		if (dev_align &lt; min_align)</div><div class='add'>+			dev_align = min_align;</div><div class='add'>+		pnv_ioda_add_wrap(&amp;head, NULL, cdev, dev_size, dev_align);</div><div class='add'>+	}</div><div class='add'>+	if (list_empty(&amp;head))</div><div class='add'>+		goto empty;</div><div class='add'>+</div><div class='add'>+	/* Now we can do two things: assign offsets to them within that</div><div class='add'>+	 * level and get our total alignment &amp; size requirements. The</div><div class='add'>+	 * assignment algorithm is going to be uber-trivial for now, we</div><div class='add'>+	 * can try to be smarter later at filling out holes.</div><div class='add'>+	 */</div><div class='add'>+	start = bus-&gt;self ? 0 : bus-&gt;resource[bres]-&gt;start;</div><div class='add'>+</div><div class='add'>+	/* Don't hand out IO 0 */</div><div class='add'>+	if ((flags &amp; IORESOURCE_IO) &amp;&amp; !bus-&gt;self)</div><div class='add'>+		start += 0x1000;</div><div class='add'>+</div><div class='add'>+	while(!list_empty(&amp;head)) {</div><div class='add'>+		w = list_first_entry(&amp;head, struct resource_wrap, link);</div><div class='add'>+		list_del(&amp;w-&gt;link);</div><div class='add'>+		if (w-&gt;size) {</div><div class='add'>+			if (start) {</div><div class='add'>+				start = ALIGN(start, w-&gt;align);</div><div class='add'>+				if (w-&gt;dev)</div><div class='add'>+					pnv_ioda_offset_dev(w-&gt;dev,flags,start);</div><div class='add'>+				else if (w-&gt;bus)</div><div class='add'>+					pnv_ioda_offset_bus(w-&gt;bus,flags,start);</div><div class='add'>+			}</div><div class='add'>+			if (w-&gt;align &gt; *align)</div><div class='add'>+				*align = w-&gt;align;</div><div class='add'>+		}</div><div class='add'>+		start += w-&gt;size;</div><div class='add'>+		kfree(w);</div><div class='add'>+	}</div><div class='add'>+	*size = start;</div><div class='add'>+</div><div class='add'>+	/* Align and setup bridge resources */</div><div class='add'>+	*align = max_t(resource_size_t, *align,</div><div class='add'>+		       max_t(resource_size_t, min_align, min_balign));</div><div class='add'>+	*size = ALIGN(*size,</div><div class='add'>+		      max_t(resource_size_t, min_align, min_balign));</div><div class='add'>+ empty:</div><div class='add'>+	/* Only setup P2P's, not the PHB itself */</div><div class='add'>+	if (bus-&gt;self) {</div><div class='add'>+		WARN_ON(bus-&gt;resource[bres] == NULL);</div><div class='add'>+		bus-&gt;resource[bres]-&gt;start = 0;</div><div class='add'>+		bus-&gt;resource[bres]-&gt;flags = (*size) ? flags : 0;</div><div class='add'>+		bus-&gt;resource[bres]-&gt;end = (*size) ? (*size - 1) : 0;</div><div class='add'>+</div><div class='add'>+		/* Clear prefetch bus resources for now */</div><div class='add'>+		bus-&gt;resource[2]-&gt;flags = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_devel("&lt;- CBR %s [%x] *size=%016llx *align=%016llx\n",</div><div class='add'>+		 bus-&gt;self ? pci_name(bus-&gt;self) : "root", flags,*size,*align);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pci_dn *pnv_ioda_get_pdn(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	np = pci_device_to_OF_node(dev);</div><div class='add'>+	if (!np)</div><div class='add'>+		return NULL;</div><div class='add'>+	return PCI_DN(np);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit pnv_ioda_setup_pe_segments(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct pci_controller *hose = pci_bus_to_host(dev-&gt;bus);</div><div class='add'>+	struct pnv_phb *phb = hose-&gt;private_data;</div><div class='add'>+	struct pci_dn *pdn = pnv_ioda_get_pdn(dev);</div><div class='add'>+	unsigned int pe, i;</div><div class='add'>+	resource_size_t pos;</div><div class='add'>+	struct resource io_res;</div><div class='add'>+	struct resource m32_res;</div><div class='add'>+	struct pci_bus_region region;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* Anything not referenced in the device-tree gets PE#0 */</div><div class='add'>+	pe = pdn ? pdn-&gt;pe_number : 0;</div><div class='add'>+</div><div class='add'>+	/* Calculate the device min/max */</div><div class='add'>+	io_res.start = m32_res.start = (resource_size_t)-1;</div><div class='add'>+	io_res.end = m32_res.end = 0;</div><div class='add'>+	io_res.flags = IORESOURCE_IO;</div><div class='add'>+	m32_res.flags = IORESOURCE_MEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= PCI_ROM_RESOURCE; i++) {</div><div class='add'>+		struct resource *r = NULL;</div><div class='add'>+		if (dev-&gt;resource[i].flags &amp; IORESOURCE_IO)</div><div class='add'>+			r = &amp;io_res;</div><div class='add'>+		if (dev-&gt;resource[i].flags &amp; IORESOURCE_MEM)</div><div class='add'>+			r = &amp;m32_res;</div><div class='add'>+		if (!r)</div><div class='add'>+			continue;</div><div class='add'>+		if (dev-&gt;resource[i].start &lt; r-&gt;start)</div><div class='add'>+			r-&gt;start = dev-&gt;resource[i].start;</div><div class='add'>+		if (dev-&gt;resource[i].end &gt; r-&gt;end)</div><div class='add'>+			r-&gt;end = dev-&gt;resource[i].end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup IO segments */</div><div class='add'>+	if (io_res.start &lt; io_res.end) {</div><div class='add'>+		pcibios_resource_to_bus(dev, &amp;region, &amp;io_res);</div><div class='add'>+		pos = region.start;</div><div class='add'>+		i = pos / phb-&gt;ioda.io_segsize;</div><div class='add'>+		while(i &lt; phb-&gt;ioda.total_pe &amp;&amp; pos &lt;= region.end) {</div><div class='add'>+			if (phb-&gt;ioda.io_segmap[i]) {</div><div class='add'>+				pr_err("%s: Trying to use IO seg #%d which is"</div><div class='add'>+				       " already used by PE# %d\n",</div><div class='add'>+				       pci_name(dev), i,</div><div class='add'>+				       phb-&gt;ioda.io_segmap[i]);</div><div class='add'>+				/* XXX DO SOMETHING TO DISABLE DEVICE ? */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			phb-&gt;ioda.io_segmap[i] = pe;</div><div class='add'>+			rc = opal_pci_map_pe_mmio_window(phb-&gt;opal_id, pe,</div><div class='add'>+							 OPAL_IO_WINDOW_TYPE,</div><div class='add'>+							 0, i);</div><div class='add'>+			if (rc != OPAL_SUCCESS) {</div><div class='add'>+				pr_err("%s: OPAL error %d setting up mapping"</div><div class='add'>+				       " for IO seg# %d\n",</div><div class='add'>+				       pci_name(dev), rc, i);</div><div class='add'>+				/* XXX DO SOMETHING TO DISABLE DEVICE ? */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			pos += phb-&gt;ioda.io_segsize;</div><div class='add'>+			i++;</div><div class='add'>+		};</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup M32 segments */</div><div class='add'>+	if (m32_res.start &lt; m32_res.end) {</div><div class='add'>+		pcibios_resource_to_bus(dev, &amp;region, &amp;m32_res);</div><div class='add'>+		pos = region.start;</div><div class='add'>+		i = pos / phb-&gt;ioda.m32_segsize;</div><div class='add'>+		while(i &lt; phb-&gt;ioda.total_pe &amp;&amp; pos &lt;= region.end) {</div><div class='add'>+			if (phb-&gt;ioda.m32_segmap[i]) {</div><div class='add'>+				pr_err("%s: Trying to use M32 seg #%d which is"</div><div class='add'>+				       " already used by PE# %d\n",</div><div class='add'>+				       pci_name(dev), i,</div><div class='add'>+				       phb-&gt;ioda.m32_segmap[i]);</div><div class='add'>+				/* XXX DO SOMETHING TO DISABLE DEVICE ? */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			phb-&gt;ioda.m32_segmap[i] = pe;</div><div class='add'>+			rc = opal_pci_map_pe_mmio_window(phb-&gt;opal_id, pe,</div><div class='add'>+							 OPAL_M32_WINDOW_TYPE,</div><div class='add'>+							 0, i);</div><div class='add'>+			if (rc != OPAL_SUCCESS) {</div><div class='add'>+				pr_err("%s: OPAL error %d setting up mapping"</div><div class='add'>+				       " for M32 seg# %d\n",</div><div class='add'>+				       pci_name(dev), rc, i);</div><div class='add'>+				/* XXX DO SOMETHING TO DISABLE DEVICE ? */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			pos += phb-&gt;ioda.m32_segsize;</div><div class='add'>+			i++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check if a resource still fits in the total IO or M32 range</div><div class='add'>+ * for a given PHB</div><div class='add'>+ */</div><div class='add'>+static int __devinit pnv_ioda_resource_fit(struct pci_controller *hose,</div><div class='add'>+					   struct resource *r)</div><div class='add'>+{</div><div class='add'>+	struct resource *bounds;</div><div class='add'>+</div><div class='add'>+	if (r-&gt;flags &amp; IORESOURCE_IO)</div><div class='add'>+		bounds = &amp;hose-&gt;io_resource;</div><div class='add'>+	else if (r-&gt;flags &amp; IORESOURCE_MEM)</div><div class='add'>+		bounds = &amp;hose-&gt;mem_resources[0];</div><div class='add'>+	else</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (r-&gt;start &gt;= bounds-&gt;start &amp;&amp; r-&gt;end &lt;= bounds-&gt;end)</div><div class='add'>+		return 1;</div><div class='add'>+	r-&gt;flags = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit pnv_ioda_update_resources(struct pci_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct pci_controller *hose = pci_bus_to_host(bus);</div><div class='add'>+	struct pci_bus *cbus;</div><div class='add'>+	struct pci_dev *cdev;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* We used to clear all device enables here. However it looks like</div><div class='add'>+	 * clearing MEM enable causes Obsidian (IPR SCS) to go bonkers,</div><div class='add'>+	 * and shoot fatal errors to the PHB which in turns fences itself</div><div class='add'>+	 * and we can't recover from that ... yet. So for now, let's leave</div><div class='add'>+	 * the enables as-is and hope for the best.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Check if bus resources fit in our IO or M32 range */</div><div class='add'>+	for (i = 0; bus-&gt;self &amp;&amp; (i &lt; 2); i++) {</div><div class='add'>+		struct resource *r = bus-&gt;resource[i];</div><div class='add'>+		if (r &amp;&amp; !pnv_ioda_resource_fit(hose, r))</div><div class='add'>+			pr_err("%s: Bus %d resource %d disabled, no room\n",</div><div class='add'>+			       pci_name(bus-&gt;self), bus-&gt;number, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update self if it's not a PHB */</div><div class='add'>+	if (bus-&gt;self)</div><div class='add'>+		pci_setup_bridge(bus);</div><div class='add'>+</div><div class='add'>+	/* Update child devices */</div><div class='add'>+	list_for_each_entry(cdev, &amp;bus-&gt;devices, bus_list) {</div><div class='add'>+		/* Check if resource fits, if not, disabled it */</div><div class='add'>+		for (i = 0; i &lt;= PCI_ROM_RESOURCE; i++) {</div><div class='add'>+			struct resource *r = &amp;cdev-&gt;resource[i];</div><div class='add'>+			if (!pnv_ioda_resource_fit(hose, r))</div><div class='add'>+				pr_err("%s: Resource %d disabled, no room\n",</div><div class='add'>+				       pci_name(cdev), i);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Assign segments */</div><div class='add'>+		pnv_ioda_setup_pe_segments(cdev);</div><div class='add'>+</div><div class='add'>+		/* Update HW BARs */</div><div class='add'>+		for (i = 0; i &lt;= PCI_ROM_RESOURCE; i++)</div><div class='add'>+			pci_update_resource(cdev, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update child busses */</div><div class='add'>+	list_for_each_entry(cbus, &amp;bus-&gt;children, node)</div><div class='add'>+		pnv_ioda_update_resources(cbus);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit pnv_ioda_alloc_pe(struct pnv_phb *phb)</div><div class='add'>+{</div><div class='add'>+	unsigned long pe;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		pe = find_next_zero_bit(phb-&gt;ioda.pe_alloc,</div><div class='add'>+					phb-&gt;ioda.total_pe, 0);</div><div class='add'>+		if (pe &gt;= phb-&gt;ioda.total_pe)</div><div class='add'>+			return IODA_INVALID_PE;</div><div class='add'>+	} while(test_and_set_bit(pe, phb-&gt;ioda.pe_alloc));</div><div class='add'>+</div><div class='add'>+	phb-&gt;ioda.pe_array[pe].pe_number = pe;</div><div class='add'>+	return pe;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit pnv_ioda_free_pe(struct pnv_phb *phb, int pe)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(phb-&gt;ioda.pe_array[pe].pdev);</div><div class='add'>+</div><div class='add'>+	memset(&amp;phb-&gt;ioda.pe_array[pe], 0, sizeof(struct pnv_ioda_pe));</div><div class='add'>+	clear_bit(pe, phb-&gt;ioda.pe_alloc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Currently those 2 are only used when MSIs are enabled, this will change</div><div class='add'>+ * but in the meantime, we need to protect them to avoid warnings</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_PCI_MSI</div><div class='add'>+static struct pnv_ioda_pe * __devinit __pnv_ioda_get_one_pe(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct pci_controller *hose = pci_bus_to_host(dev-&gt;bus);</div><div class='add'>+	struct pnv_phb *phb = hose-&gt;private_data;</div><div class='add'>+	struct pci_dn *pdn = pnv_ioda_get_pdn(dev);</div><div class='add'>+</div><div class='add'>+	if (!pdn)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (pdn-&gt;pe_number == IODA_INVALID_PE)</div><div class='add'>+		return NULL;</div><div class='add'>+	return &amp;phb-&gt;ioda.pe_array[pdn-&gt;pe_number];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pnv_ioda_pe * __devinit pnv_ioda_get_pe(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct pnv_ioda_pe *pe = __pnv_ioda_get_one_pe(dev);</div><div class='add'>+</div><div class='add'>+	while (!pe &amp;&amp; dev-&gt;bus-&gt;self) {</div><div class='add'>+		dev = dev-&gt;bus-&gt;self;</div><div class='add'>+		pe = __pnv_ioda_get_one_pe(dev);</div><div class='add'>+		if (pe)</div><div class='add'>+			pe = pe-&gt;bus_pe;</div><div class='add'>+	}</div><div class='add'>+	return pe;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PCI_MSI */</div><div class='add'>+</div><div class='add'>+static int __devinit pnv_ioda_configure_pe(struct pnv_phb *phb,</div><div class='add'>+					   struct pnv_ioda_pe *pe)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *parent;</div><div class='add'>+	uint8_t bcomp, dcomp, fcomp;</div><div class='add'>+	long rc, rid_end, rid;</div><div class='add'>+</div><div class='add'>+	/* Bus validation ? */</div><div class='add'>+	if (pe-&gt;pbus) {</div><div class='add'>+		int count;</div><div class='add'>+</div><div class='add'>+		dcomp = OPAL_IGNORE_RID_DEVICE_NUMBER;</div><div class='add'>+		fcomp = OPAL_IGNORE_RID_FUNCTION_NUMBER;</div><div class='add'>+		parent = pe-&gt;pbus-&gt;self;</div><div class='add'>+		count = pe-&gt;pbus-&gt;subordinate - pe-&gt;pbus-&gt;secondary + 1;</div><div class='add'>+		switch(count) {</div><div class='add'>+		case  1: bcomp = OpalPciBusAll;		break;</div><div class='add'>+		case  2: bcomp = OpalPciBus7Bits;	break;</div><div class='add'>+		case  4: bcomp = OpalPciBus6Bits;	break;</div><div class='add'>+		case  8: bcomp = OpalPciBus5Bits;	break;</div><div class='add'>+		case 16: bcomp = OpalPciBus4Bits;	break;</div><div class='add'>+		case 32: bcomp = OpalPciBus3Bits;	break;</div><div class='add'>+		default:</div><div class='add'>+			pr_err("%s: Number of subordinate busses %d"</div><div class='add'>+			       " unsupported\n",</div><div class='add'>+			       pci_name(pe-&gt;pbus-&gt;self), count);</div><div class='add'>+			/* Do an exact match only */</div><div class='add'>+			bcomp = OpalPciBusAll;</div><div class='add'>+		}</div><div class='add'>+		rid_end = pe-&gt;rid + (count &lt;&lt; 8);</div><div class='add'>+	} else {</div><div class='add'>+		parent = pe-&gt;pdev-&gt;bus-&gt;self;</div><div class='add'>+		bcomp = OpalPciBusAll;</div><div class='add'>+		dcomp = OPAL_COMPARE_RID_DEVICE_NUMBER;</div><div class='add'>+		fcomp = OPAL_COMPARE_RID_FUNCTION_NUMBER;</div><div class='add'>+		rid_end = pe-&gt;rid + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Associate PE in PELT */</div><div class='add'>+	rc = opal_pci_set_pe(phb-&gt;opal_id, pe-&gt;pe_number, pe-&gt;rid,</div><div class='add'>+			     bcomp, dcomp, fcomp, OPAL_MAP_PE);</div><div class='add'>+	if (rc) {</div><div class='add'>+		pe_err(pe, "OPAL error %ld trying to setup PELT table\n", rc);</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+	opal_pci_eeh_freeze_clear(phb-&gt;opal_id, pe-&gt;pe_number,</div><div class='add'>+				  OPAL_EEH_ACTION_CLEAR_FREEZE_ALL);</div><div class='add'>+</div><div class='add'>+	/* Add to all parents PELT-V */</div><div class='add'>+	while (parent) {</div><div class='add'>+		struct pci_dn *pdn = pnv_ioda_get_pdn(parent);</div><div class='add'>+		if (pdn &amp;&amp; pdn-&gt;pe_number != IODA_INVALID_PE) {</div><div class='add'>+			rc = opal_pci_set_peltv(phb-&gt;opal_id, pdn-&gt;pe_number,</div><div class='add'>+						pe-&gt;pe_number, OPAL_ADD_PE_TO_DOMAIN);</div><div class='add'>+			/* XXX What to do in case of error ? */</div><div class='add'>+		}</div><div class='add'>+		parent = parent-&gt;bus-&gt;self;</div><div class='add'>+	}</div><div class='add'>+	/* Setup reverse map */</div><div class='add'>+	for (rid = pe-&gt;rid; rid &lt; rid_end; rid++)</div><div class='add'>+		phb-&gt;ioda.pe_rmap[rid] = pe-&gt;pe_number;</div><div class='add'>+</div><div class='add'>+	/* Setup one MVTs on IODA1 */</div><div class='add'>+	if (phb-&gt;type == PNV_PHB_IODA1) {</div><div class='add'>+		pe-&gt;mve_number = pe-&gt;pe_number;</div><div class='add'>+		rc = opal_pci_set_mve(phb-&gt;opal_id, pe-&gt;mve_number,</div><div class='add'>+				      pe-&gt;pe_number);</div><div class='add'>+		if (rc) {</div><div class='add'>+			pe_err(pe, "OPAL error %ld setting up MVE %d\n",</div><div class='add'>+			       rc, pe-&gt;mve_number);</div><div class='add'>+			pe-&gt;mve_number = -1;</div><div class='add'>+		} else {</div><div class='add'>+			rc = opal_pci_set_mve_enable(phb-&gt;opal_id,</div><div class='add'>+						     pe-&gt;mve_number, OPAL_ENABLE_MVE);</div><div class='add'>+			if (rc) {</div><div class='add'>+				pe_err(pe, "OPAL error %ld enabling MVE %d\n",</div><div class='add'>+				       rc, pe-&gt;mve_number);</div><div class='add'>+				pe-&gt;mve_number = -1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else if (phb-&gt;type == PNV_PHB_IODA2)</div><div class='add'>+		pe-&gt;mve_number = 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 __devinit pnv_ioda_link_pe_by_weight(struct pnv_phb *phb,</div><div class='add'>+						 struct pnv_ioda_pe *pe)</div><div class='add'>+{</div><div class='add'>+	struct pnv_ioda_pe *lpe;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(lpe, &amp;phb-&gt;ioda.pe_list, link) {</div><div class='add'>+		if (lpe-&gt;dma_weight &lt; pe-&gt;dma_weight) {</div><div class='add'>+			list_add_tail(&amp;pe-&gt;link, &amp;lpe-&gt;link);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	list_add_tail(&amp;pe-&gt;link, &amp;phb-&gt;ioda.pe_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int pnv_ioda_dma_weight(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	/* This is quite simplistic. The "base" weight of a device</div><div class='add'>+	 * is 10. 0 means no DMA is to be accounted for it.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* If it's a bridge, no DMA */</div><div class='add'>+	if (dev-&gt;hdr_type != PCI_HEADER_TYPE_NORMAL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Reduce the weight of slow USB controllers */</div><div class='add'>+	if (dev-&gt;class == PCI_CLASS_SERIAL_USB_UHCI ||</div><div class='add'>+	    dev-&gt;class == PCI_CLASS_SERIAL_USB_OHCI ||</div><div class='add'>+	    dev-&gt;class == PCI_CLASS_SERIAL_USB_EHCI)</div><div class='add'>+		return 3;</div><div class='add'>+</div><div class='add'>+	/* Increase the weight of RAID (includes Obsidian) */</div><div class='add'>+	if ((dev-&gt;class &gt;&gt; 8) == PCI_CLASS_STORAGE_RAID)</div><div class='add'>+		return 15;</div><div class='add'>+</div><div class='add'>+	/* Default */</div><div class='add'>+	return 10;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pnv_ioda_pe * __devinit pnv_ioda_setup_dev_PE(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct pci_controller *hose = pci_bus_to_host(dev-&gt;bus);</div><div class='add'>+	struct pnv_phb *phb = hose-&gt;private_data;</div><div class='add'>+	struct pci_dn *pdn = pnv_ioda_get_pdn(dev);</div><div class='add'>+	struct pnv_ioda_pe *pe;</div><div class='add'>+	int pe_num;</div><div class='add'>+</div><div class='add'>+	if (!pdn) {</div><div class='add'>+		pr_err("%s: Device tree node not associated properly\n",</div><div class='add'>+			   pci_name(dev));</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	if (pdn-&gt;pe_number != IODA_INVALID_PE)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* PE#0 has been pre-set */</div><div class='add'>+	if (dev-&gt;bus-&gt;number == 0)</div><div class='add'>+		pe_num = 0;</div><div class='add'>+	else</div><div class='add'>+		pe_num = pnv_ioda_alloc_pe(phb);</div><div class='add'>+	if (pe_num == IODA_INVALID_PE) {</div><div class='add'>+		pr_warning("%s: Not enough PE# available, disabling device\n",</div><div class='add'>+			   pci_name(dev));</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* NOTE: We get only one ref to the pci_dev for the pdn, not for the</div><div class='add'>+	 * pointer in the PE data structure, both should be destroyed at the</div><div class='add'>+	 * same time. However, this needs to be looked at more closely again</div><div class='add'>+	 * once we actually start removing things (Hotplug, SR-IOV, ...)</div><div class='add'>+	 *</div><div class='add'>+	 * At some point we want to remove the PDN completely anyways</div><div class='add'>+	 */</div><div class='add'>+	pe = &amp;phb-&gt;ioda.pe_array[pe_num];</div><div class='add'>+	pci_dev_get(dev);</div><div class='add'>+	pdn-&gt;pcidev = dev;</div><div class='add'>+	pdn-&gt;pe_number = pe_num;</div><div class='add'>+	pe-&gt;pdev = dev;</div><div class='add'>+	pe-&gt;pbus = NULL;</div><div class='add'>+	pe-&gt;tce32_seg = -1;</div><div class='add'>+	pe-&gt;mve_number = -1;</div><div class='add'>+	pe-&gt;rid = dev-&gt;bus-&gt;number &lt;&lt; 8 | pdn-&gt;devfn;</div><div class='add'>+</div><div class='add'>+	pe_info(pe, "Associated device to PE\n");</div><div class='add'>+</div><div class='add'>+	if (pnv_ioda_configure_pe(phb, pe)) {</div><div class='add'>+		/* XXX What do we do here ? */</div><div class='add'>+		if (pe_num)</div><div class='add'>+			pnv_ioda_free_pe(phb, pe_num);</div><div class='add'>+		pdn-&gt;pe_number = IODA_INVALID_PE;</div><div class='add'>+		pe-&gt;pdev = NULL;</div><div class='add'>+		pci_dev_put(dev);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Assign a DMA weight to the device */</div><div class='add'>+	pe-&gt;dma_weight = pnv_ioda_dma_weight(dev);</div><div class='add'>+	if (pe-&gt;dma_weight != 0) {</div><div class='add'>+		phb-&gt;ioda.dma_weight += pe-&gt;dma_weight;</div><div class='add'>+		phb-&gt;ioda.dma_pe_count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Link the PE */</div><div class='add'>+	pnv_ioda_link_pe_by_weight(phb, pe);</div><div class='add'>+</div><div class='add'>+	return pe;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pnv_ioda_setup_same_PE(struct pci_bus *bus, struct pnv_ioda_pe *pe)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *dev;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dev, &amp;bus-&gt;devices, bus_list) {</div><div class='add'>+		struct pci_dn *pdn = pnv_ioda_get_pdn(dev);</div><div class='add'>+</div><div class='add'>+		if (pdn == NULL) {</div><div class='add'>+			pr_warn("%s: No device node associated with device !\n",</div><div class='add'>+				pci_name(dev));</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		pci_dev_get(dev);</div><div class='add'>+		pdn-&gt;pcidev = dev;</div><div class='add'>+		pdn-&gt;pe_number = pe-&gt;pe_number;</div><div class='add'>+		pe-&gt;dma_weight += pnv_ioda_dma_weight(dev);</div><div class='add'>+		if (dev-&gt;subordinate)</div><div class='add'>+			pnv_ioda_setup_same_PE(dev-&gt;subordinate, pe);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit pnv_ioda_setup_bus_PE(struct pci_dev *dev,</div><div class='add'>+					    struct pnv_ioda_pe *ppe)</div><div class='add'>+{</div><div class='add'>+	struct pci_controller *hose = pci_bus_to_host(dev-&gt;bus);</div><div class='add'>+	struct pnv_phb *phb = hose-&gt;private_data;</div><div class='add'>+	struct pci_bus *bus = dev-&gt;subordinate;</div><div class='add'>+	struct pnv_ioda_pe *pe;</div><div class='add'>+	int pe_num;</div><div class='add'>+</div><div class='add'>+	if (!bus) {</div><div class='add'>+		pr_warning("%s: Bridge without a subordinate bus !\n",</div><div class='add'>+			   pci_name(dev));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	pe_num = pnv_ioda_alloc_pe(phb);</div><div class='add'>+	if (pe_num == IODA_INVALID_PE) {</div><div class='add'>+		pr_warning("%s: Not enough PE# available, disabling bus\n",</div><div class='add'>+			   pci_name(dev));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pe = &amp;phb-&gt;ioda.pe_array[pe_num];</div><div class='add'>+	ppe-&gt;bus_pe = pe;</div><div class='add'>+	pe-&gt;pbus = bus;</div><div class='add'>+	pe-&gt;pdev = NULL;</div><div class='add'>+	pe-&gt;tce32_seg = -1;</div><div class='add'>+	pe-&gt;mve_number = -1;</div><div class='add'>+	pe-&gt;rid = bus-&gt;secondary &lt;&lt; 8;</div><div class='add'>+	pe-&gt;dma_weight = 0;</div><div class='add'>+</div><div class='add'>+	pe_info(pe, "Secondary busses %d..%d associated with PE\n",</div><div class='add'>+		bus-&gt;secondary, bus-&gt;subordinate);</div><div class='add'>+</div><div class='add'>+	if (pnv_ioda_configure_pe(phb, pe)) {</div><div class='add'>+		/* XXX What do we do here ? */</div><div class='add'>+		if (pe_num)</div><div class='add'>+			pnv_ioda_free_pe(phb, pe_num);</div><div class='add'>+		pe-&gt;pbus = NULL;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Associate it with all child devices */</div><div class='add'>+	pnv_ioda_setup_same_PE(bus, pe);</div><div class='add'>+</div><div class='add'>+	/* Account for one DMA PE if at least one DMA capable device exist</div><div class='add'>+	 * below the bridge</div><div class='add'>+	 */</div><div class='add'>+	if (pe-&gt;dma_weight != 0) {</div><div class='add'>+		phb-&gt;ioda.dma_weight += pe-&gt;dma_weight;</div><div class='add'>+		phb-&gt;ioda.dma_pe_count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Link the PE */</div><div class='add'>+	pnv_ioda_link_pe_by_weight(phb, pe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit pnv_ioda_setup_PEs(struct pci_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *dev;</div><div class='add'>+	struct pnv_ioda_pe *pe;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dev, &amp;bus-&gt;devices, bus_list) {</div><div class='add'>+		pe = pnv_ioda_setup_dev_PE(dev);</div><div class='add'>+		if (pe == NULL)</div><div class='add'>+			continue;</div><div class='add'>+		/* Leaving the PCIe domain ... single PE# */</div><div class='add'>+		if (dev-&gt;pcie_type == PCI_EXP_TYPE_PCI_BRIDGE)</div><div class='add'>+			pnv_ioda_setup_bus_PE(dev, pe);</div><div class='add'>+		else if (dev-&gt;subordinate)</div><div class='add'>+			pnv_ioda_setup_PEs(dev-&gt;subordinate);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit pnv_pci_ioda_dma_dev_setup(struct pnv_phb *phb,</div><div class='add'>+						 struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	/* We delay DMA setup after we have assigned all PE# */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit pnv_ioda_setup_bus_dma(struct pnv_ioda_pe *pe,</div><div class='add'>+					     struct pci_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *dev;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dev, &amp;bus-&gt;devices, bus_list) {</div><div class='add'>+		set_iommu_table_base(&amp;dev-&gt;dev, &amp;pe-&gt;tce32_table);</div><div class='add'>+		if (dev-&gt;subordinate)</div><div class='add'>+			pnv_ioda_setup_bus_dma(pe, dev-&gt;subordinate);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit pnv_pci_ioda_setup_dma_pe(struct pnv_phb *phb,</div><div class='add'>+						struct pnv_ioda_pe *pe,</div><div class='add'>+						unsigned int base,</div><div class='add'>+						unsigned int segs)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct page *tce_mem = NULL;</div><div class='add'>+	const __be64 *swinvp;</div><div class='add'>+	struct iommu_table *tbl;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int64_t rc;</div><div class='add'>+	void *addr;</div><div class='add'>+</div><div class='add'>+	/* 256M DMA window, 4K TCE pages, 8 bytes TCE */</div><div class='add'>+#define TCE32_TABLE_SIZE	((0x10000000 / 0x1000) * 8)</div><div class='add'>+</div><div class='add'>+	/* XXX FIXME: Handle 64-bit only DMA devices */</div><div class='add'>+	/* XXX FIXME: Provide 64-bit DMA facilities &amp; non-4K TCE tables etc.. */</div><div class='add'>+	/* XXX FIXME: Allocate multi-level tables on PHB3 */</div><div class='add'>+</div><div class='add'>+	/* We shouldn't already have a 32-bit DMA associated */</div><div class='add'>+	if (WARN_ON(pe-&gt;tce32_seg &gt;= 0))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Grab a 32-bit TCE table */</div><div class='add'>+	pe-&gt;tce32_seg = base;</div><div class='add'>+	pe_info(pe, " Setting up 32-bit TCE table at %08x..%08x\n",</div><div class='add'>+		(base &lt;&lt; 28), ((base + segs) &lt;&lt; 28) - 1);</div><div class='add'>+</div><div class='add'>+	/* XXX Currently, we allocate one big contiguous table for the</div><div class='add'>+	 * TCEs. We only really need one chunk per 256M of TCE space</div><div class='add'>+	 * (ie per segment) but that's an optimization for later, it</div><div class='add'>+	 * requires some added smarts with our get/put_tce implementation</div><div class='add'>+	 */</div><div class='add'>+	tce_mem = alloc_pages_node(phb-&gt;hose-&gt;node, GFP_KERNEL,</div><div class='add'>+				   get_order(TCE32_TABLE_SIZE * segs));</div><div class='add'>+	if (!tce_mem) {</div><div class='add'>+		pe_err(pe, " Failed to allocate a 32-bit TCE memory\n");</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	addr = page_address(tce_mem);</div><div class='add'>+	memset(addr, 0, TCE32_TABLE_SIZE * segs);</div><div class='add'>+</div><div class='add'>+	/* Configure HW */</div><div class='add'>+	for (i = 0; i &lt; segs; i++) {</div><div class='add'>+		rc = opal_pci_map_pe_dma_window(phb-&gt;opal_id,</div><div class='add'>+					      pe-&gt;pe_number,</div><div class='add'>+					      base + i, 1,</div><div class='add'>+					      __pa(addr) + TCE32_TABLE_SIZE * i,</div><div class='add'>+					      TCE32_TABLE_SIZE, 0x1000);</div><div class='add'>+		if (rc) {</div><div class='add'>+			pe_err(pe, " Failed to configure 32-bit TCE table,"</div><div class='add'>+			       " err %ld\n", rc);</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup linux iommu table */</div><div class='add'>+	tbl = &amp;pe-&gt;tce32_table;</div><div class='add'>+	pnv_pci_setup_iommu_table(tbl, addr, TCE32_TABLE_SIZE * segs,</div><div class='add'>+				  base &lt;&lt; 28);</div><div class='add'>+</div><div class='add'>+	/* OPAL variant of P7IOC SW invalidated TCEs */</div><div class='add'>+	swinvp = of_get_property(phb-&gt;hose-&gt;dn, "ibm,opal-tce-kill", NULL);</div><div class='add'>+	if (swinvp) {</div><div class='add'>+		/* We need a couple more fields -- an address and a data</div><div class='add'>+		 * to or.  Since the bus is only printed out on table free</div><div class='add'>+		 * errors, and on the first pass the data will be a relative</div><div class='add'>+		 * bus number, print that out instead.</div><div class='add'>+		 */</div><div class='add'>+		tbl-&gt;it_busno = 0;</div><div class='add'>+		tbl-&gt;it_index = (unsigned long)ioremap(be64_to_cpup(swinvp), 8);</div><div class='add'>+		tbl-&gt;it_type = TCE_PCI_SWINV_CREATE | TCE_PCI_SWINV_FREE</div><div class='add'>+			| TCE_PCI_SWINV_PAIR;</div><div class='add'>+	}</div><div class='add'>+	iommu_init_table(tbl, phb-&gt;hose-&gt;node);</div><div class='add'>+</div><div class='add'>+	if (pe-&gt;pdev)</div><div class='add'>+		set_iommu_table_base(&amp;pe-&gt;pdev-&gt;dev, tbl);</div><div class='add'>+	else</div><div class='add'>+		pnv_ioda_setup_bus_dma(pe, pe-&gt;pbus);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+ fail:</div><div class='add'>+	/* XXX Failure: Try to fallback to 64-bit only ? */</div><div class='add'>+	if (pe-&gt;tce32_seg &gt;= 0)</div><div class='add'>+		pe-&gt;tce32_seg = -1;</div><div class='add'>+	if (tce_mem)</div><div class='add'>+		__free_pages(tce_mem, get_order(TCE32_TABLE_SIZE * segs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit pnv_ioda_setup_dma(struct pnv_phb *phb)</div><div class='add'>+{</div><div class='add'>+	struct pci_controller *hose = phb-&gt;hose;</div><div class='add'>+	unsigned int residual, remaining, segs, tw, base;</div><div class='add'>+	struct pnv_ioda_pe *pe;</div><div class='add'>+</div><div class='add'>+	/* If we have more PE# than segments available, hand out one</div><div class='add'>+	 * per PE until we run out and let the rest fail. If not,</div><div class='add'>+	 * then we assign at least one segment per PE, plus more based</div><div class='add'>+	 * on the amount of devices under that PE</div><div class='add'>+	 */</div><div class='add'>+	if (phb-&gt;ioda.dma_pe_count &gt; phb-&gt;ioda.tce32_count)</div><div class='add'>+		residual = 0;</div><div class='add'>+	else</div><div class='add'>+		residual = phb-&gt;ioda.tce32_count -</div><div class='add'>+			phb-&gt;ioda.dma_pe_count;</div><div class='add'>+</div><div class='add'>+	pr_info("PCI: Domain %04x has %ld available 32-bit DMA segments\n",</div><div class='add'>+		hose-&gt;global_number, phb-&gt;ioda.tce32_count);</div><div class='add'>+	pr_info("PCI: %d PE# for a total weight of %d\n",</div><div class='add'>+		phb-&gt;ioda.dma_pe_count, phb-&gt;ioda.dma_weight);</div><div class='add'>+</div><div class='add'>+	/* Walk our PE list and configure their DMA segments, hand them</div><div class='add'>+	 * out one base segment plus any residual segments based on</div><div class='add'>+	 * weight</div><div class='add'>+	 */</div><div class='add'>+	remaining = phb-&gt;ioda.tce32_count;</div><div class='add'>+	tw = phb-&gt;ioda.dma_weight;</div><div class='add'>+	base = 0;</div><div class='add'>+	list_for_each_entry(pe, &amp;phb-&gt;ioda.pe_list, link) {</div><div class='add'>+		if (!pe-&gt;dma_weight)</div><div class='add'>+			continue;</div><div class='add'>+		if (!remaining) {</div><div class='add'>+			pe_warn(pe, "No DMA32 resources available\n");</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		segs = 1;</div><div class='add'>+		if (residual) {</div><div class='add'>+			segs += ((pe-&gt;dma_weight * residual)  + (tw / 2)) / tw;</div><div class='add'>+			if (segs &gt; remaining)</div><div class='add'>+				segs = remaining;</div><div class='add'>+		}</div><div class='add'>+		pe_info(pe, "DMA weight %d, assigned %d DMA32 segments\n",</div><div class='add'>+			pe-&gt;dma_weight, segs);</div><div class='add'>+		pnv_pci_ioda_setup_dma_pe(phb, pe, base, segs);</div><div class='add'>+		remaining -= segs;</div><div class='add'>+		base += segs;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI_MSI</div><div class='add'>+static int pnv_pci_ioda_msi_setup(struct pnv_phb *phb, struct pci_dev *dev,</div><div class='add'>+				  unsigned int hwirq, unsigned int is_64,</div><div class='add'>+				  struct msi_msg *msg)</div><div class='add'>+{</div><div class='add'>+	struct pnv_ioda_pe *pe = pnv_ioda_get_pe(dev);</div><div class='add'>+	unsigned int xive_num = hwirq - phb-&gt;msi_base;</div><div class='add'>+	uint64_t addr64;</div><div class='add'>+	uint32_t addr32, data;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* No PE assigned ? bail out ... no MSI for you ! */</div><div class='add'>+	if (pe == NULL)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	/* Check if we have an MVE */</div><div class='add'>+	if (pe-&gt;mve_number &lt; 0)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	/* Assign XIVE to PE */</div><div class='add'>+	rc = opal_pci_set_xive_pe(phb-&gt;opal_id, pe-&gt;pe_number, xive_num);</div><div class='add'>+	if (rc) {</div><div class='add'>+		pr_warn("%s: OPAL error %d setting XIVE %d PE\n",</div><div class='add'>+			pci_name(dev), rc, xive_num);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_64) {</div><div class='add'>+		rc = opal_get_msi_64(phb-&gt;opal_id, pe-&gt;mve_number, xive_num, 1,</div><div class='add'>+				     &amp;addr64, &amp;data);</div><div class='add'>+		if (rc) {</div><div class='add'>+			pr_warn("%s: OPAL error %d getting 64-bit MSI data\n",</div><div class='add'>+				pci_name(dev), rc);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+		msg-&gt;address_hi = addr64 &gt;&gt; 32;</div><div class='add'>+		msg-&gt;address_lo = addr64 &amp; 0xfffffffful;</div><div class='add'>+	} else {</div><div class='add'>+		rc = opal_get_msi_32(phb-&gt;opal_id, pe-&gt;mve_number, xive_num, 1,</div><div class='add'>+				     &amp;addr32, &amp;data);</div><div class='add'>+		if (rc) {</div><div class='add'>+			pr_warn("%s: OPAL error %d getting 32-bit MSI data\n",</div><div class='add'>+				pci_name(dev), rc);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+		msg-&gt;address_hi = 0;</div><div class='add'>+		msg-&gt;address_lo = addr32;</div><div class='add'>+	}</div><div class='add'>+	msg-&gt;data = data;</div><div class='add'>+</div><div class='add'>+	pr_devel("%s: %s-bit MSI on hwirq %x (xive #%d),"</div><div class='add'>+		 " address=%x_%08x data=%x PE# %d\n",</div><div class='add'>+		 pci_name(dev), is_64 ? "64" : "32", hwirq, xive_num,</div><div class='add'>+		 msg-&gt;address_hi, msg-&gt;address_lo, data, pe-&gt;pe_number);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pnv_pci_init_ioda_msis(struct pnv_phb *phb)</div><div class='add'>+{</div><div class='add'>+	unsigned int bmap_size;</div><div class='add'>+	const __be32 *prop = of_get_property(phb-&gt;hose-&gt;dn,</div><div class='add'>+					     "ibm,opal-msi-ranges", NULL);</div><div class='add'>+	if (!prop) {</div><div class='add'>+		/* BML Fallback */</div><div class='add'>+		prop = of_get_property(phb-&gt;hose-&gt;dn, "msi-ranges", NULL);</div><div class='add'>+	}</div><div class='add'>+	if (!prop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	phb-&gt;msi_base = be32_to_cpup(prop);</div><div class='add'>+	phb-&gt;msi_count = be32_to_cpup(prop + 1);</div><div class='add'>+	bmap_size = BITS_TO_LONGS(phb-&gt;msi_count) * sizeof(unsigned long);</div><div class='add'>+	phb-&gt;msi_map = zalloc_maybe_bootmem(bmap_size, GFP_KERNEL);</div><div class='add'>+	if (!phb-&gt;msi_map) {</div><div class='add'>+		pr_err("PCI %d: Failed to allocate MSI bitmap !\n",</div><div class='add'>+		       phb-&gt;hose-&gt;global_number);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	phb-&gt;msi_setup = pnv_pci_ioda_msi_setup;</div><div class='add'>+	phb-&gt;msi32_support = 1;</div><div class='add'>+	pr_info("  Allocated bitmap for %d MSIs (base IRQ 0x%x)\n",</div><div class='add'>+		phb-&gt;msi_count, phb-&gt;msi_base);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void pnv_pci_init_ioda_msis(struct pnv_phb *phb) { }</div><div class='add'>+#endif /* CONFIG_PCI_MSI */</div><div class='add'>+</div><div class='add'>+/* This is the starting point of our IODA specific resource</div><div class='add'>+ * allocation process</div><div class='add'>+ */</div><div class='add'>+static void __devinit pnv_pci_ioda_fixup_phb(struct pci_controller *hose)</div><div class='add'>+{</div><div class='add'>+	resource_size_t size, align;</div><div class='add'>+	struct pci_bus *child;</div><div class='add'>+</div><div class='add'>+	/* Associate PEs per functions */</div><div class='add'>+	pnv_ioda_setup_PEs(hose-&gt;bus);</div><div class='add'>+</div><div class='add'>+	/* Calculate all resources */</div><div class='add'>+	pnv_ioda_calc_bus(hose-&gt;bus, IORESOURCE_IO, &amp;size, &amp;align);</div><div class='add'>+	pnv_ioda_calc_bus(hose-&gt;bus, IORESOURCE_MEM, &amp;size, &amp;align);</div><div class='add'>+</div><div class='add'>+	/* Apply then to HW */</div><div class='add'>+	pnv_ioda_update_resources(hose-&gt;bus);</div><div class='add'>+</div><div class='add'>+	/* Setup DMA */</div><div class='add'>+	pnv_ioda_setup_dma(hose-&gt;private_data);</div><div class='add'>+</div><div class='add'>+	/* Configure PCI Express settings */</div><div class='add'>+	list_for_each_entry(child, &amp;hose-&gt;bus-&gt;children, node) {</div><div class='add'>+		struct pci_dev *self = child-&gt;self;</div><div class='add'>+		if (!self)</div><div class='add'>+			continue;</div><div class='add'>+		pcie_bus_configure_settings(child, self-&gt;pcie_mpss);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Prevent enabling devices for which we couldn't properly</div><div class='add'>+ * assign a PE</div><div class='add'>+ */</div><div class='add'>+static int __devinit pnv_pci_enable_device_hook(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct pci_dn *pdn = pnv_ioda_get_pdn(dev);</div><div class='add'>+</div><div class='add'>+	if (!pdn || pdn-&gt;pe_number == IODA_INVALID_PE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 pnv_ioda_bdfn_to_pe(struct pnv_phb *phb, struct pci_bus *bus,</div><div class='add'>+			       u32 devfn)</div><div class='add'>+{</div><div class='add'>+	return phb-&gt;ioda.pe_rmap[(bus-&gt;number &lt;&lt; 8) | devfn];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init pnv_pci_init_ioda1_phb(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct pci_controller *hose;</div><div class='add'>+	static int primary = 1;</div><div class='add'>+	struct pnv_phb *phb;</div><div class='add'>+	unsigned long size, m32map_off, iomap_off, pemap_off;</div><div class='add'>+	const u64 *prop64;</div><div class='add'>+	u64 phb_id;</div><div class='add'>+	void *aux;</div><div class='add'>+	long rc;</div><div class='add'>+</div><div class='add'>+	pr_info(" Initializing IODA OPAL PHB %s\n", np-&gt;full_name);</div><div class='add'>+</div><div class='add'>+	prop64 = of_get_property(np, "ibm,opal-phbid", NULL);</div><div class='add'>+	if (!prop64) {</div><div class='add'>+		pr_err("  Missing \"ibm,opal-phbid\" property !\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	phb_id = be64_to_cpup(prop64);</div><div class='add'>+	pr_debug("  PHB-ID  : 0x%016llx\n", phb_id);</div><div class='add'>+</div><div class='add'>+	phb = alloc_bootmem(sizeof(struct pnv_phb));</div><div class='add'>+	if (phb) {</div><div class='add'>+		memset(phb, 0, sizeof(struct pnv_phb));</div><div class='add'>+		phb-&gt;hose = hose = pcibios_alloc_controller(np);</div><div class='add'>+	}</div><div class='add'>+	if (!phb || !phb-&gt;hose) {</div><div class='add'>+		pr_err("PCI: Failed to allocate PCI controller for %s\n",</div><div class='add'>+		       np-&gt;full_name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;phb-&gt;lock);</div><div class='add'>+	/* XXX Use device-tree */</div><div class='add'>+	hose-&gt;first_busno = 0;</div><div class='add'>+	hose-&gt;last_busno = 0xff;</div><div class='add'>+	hose-&gt;private_data = phb;</div><div class='add'>+	phb-&gt;opal_id = phb_id;</div><div class='add'>+	phb-&gt;type = PNV_PHB_IODA1;</div><div class='add'>+</div><div class='add'>+	/* Detect specific models for error handling */</div><div class='add'>+	if (of_device_is_compatible(np, "ibm,p7ioc-pciex"))</div><div class='add'>+		phb-&gt;model = PNV_PHB_MODEL_P7IOC;</div><div class='add'>+	else</div><div class='add'>+		phb-&gt;model = PNV_PHB_MODEL_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	/* We parse "ranges" now since we need to deduce the register base</div><div class='add'>+	 * from the IO base</div><div class='add'>+	 */</div><div class='add'>+	pci_process_bridge_OF_ranges(phb-&gt;hose, np, primary);</div><div class='add'>+	primary = 0;</div><div class='add'>+</div><div class='add'>+	/* Magic formula from Milton */</div><div class='add'>+	phb-&gt;regs = of_iomap(np, 0);</div><div class='add'>+	if (phb-&gt;regs == NULL)</div><div class='add'>+		pr_err("  Failed to map registers !\n");</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* XXX This is hack-a-thon. This needs to be changed so that:</div><div class='add'>+	 *  - we obtain stuff like PE# etc... from device-tree</div><div class='add'>+	 *  - we properly re-allocate M32 ourselves</div><div class='add'>+	 *    (the OFW one isn't very good)</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Initialize more IODA stuff */</div><div class='add'>+	phb-&gt;ioda.total_pe = 128;</div><div class='add'>+</div><div class='add'>+	phb-&gt;ioda.m32_size = resource_size(&amp;hose-&gt;mem_resources[0]);</div><div class='add'>+	/* OFW Has already off top 64k of M32 space (MSI space) */</div><div class='add'>+	phb-&gt;ioda.m32_size += 0x10000;</div><div class='add'>+</div><div class='add'>+	phb-&gt;ioda.m32_segsize = phb-&gt;ioda.m32_size / phb-&gt;ioda.total_pe;</div><div class='add'>+	phb-&gt;ioda.m32_pci_base = hose-&gt;mem_resources[0].start -</div><div class='add'>+		hose-&gt;pci_mem_offset;</div><div class='add'>+	phb-&gt;ioda.io_size = hose-&gt;pci_io_size;</div><div class='add'>+	phb-&gt;ioda.io_segsize = phb-&gt;ioda.io_size / phb-&gt;ioda.total_pe;</div><div class='add'>+	phb-&gt;ioda.io_pci_base = 0; /* XXX calculate this ? */</div><div class='add'>+</div><div class='add'>+	/* Allocate aux data &amp; arrays */</div><div class='add'>+	size = _ALIGN_UP(phb-&gt;ioda.total_pe / 8, sizeof(unsigned long));</div><div class='add'>+	m32map_off = size;</div><div class='add'>+	size += phb-&gt;ioda.total_pe;</div><div class='add'>+	iomap_off = size;</div><div class='add'>+	size += phb-&gt;ioda.total_pe;</div><div class='add'>+	pemap_off = size;</div><div class='add'>+	size += phb-&gt;ioda.total_pe * sizeof(struct pnv_ioda_pe);</div><div class='add'>+	aux = alloc_bootmem(size);</div><div class='add'>+	memset(aux, 0, size);</div><div class='add'>+	phb-&gt;ioda.pe_alloc = aux;</div><div class='add'>+	phb-&gt;ioda.m32_segmap = aux + m32map_off;</div><div class='add'>+	phb-&gt;ioda.io_segmap = aux + iomap_off;</div><div class='add'>+	phb-&gt;ioda.pe_array = aux + pemap_off;</div><div class='add'>+	set_bit(0, phb-&gt;ioda.pe_alloc);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;phb-&gt;ioda.pe_list);</div><div class='add'>+</div><div class='add'>+	/* Calculate how many 32-bit TCE segments we have */</div><div class='add'>+	phb-&gt;ioda.tce32_count = phb-&gt;ioda.m32_pci_base &gt;&gt; 28;</div><div class='add'>+</div><div class='add'>+	/* Clear unusable m64 */</div><div class='add'>+	hose-&gt;mem_resources[1].flags = 0;</div><div class='add'>+	hose-&gt;mem_resources[1].start = 0;</div><div class='add'>+	hose-&gt;mem_resources[1].end = 0;</div><div class='add'>+	hose-&gt;mem_resources[2].flags = 0;</div><div class='add'>+	hose-&gt;mem_resources[2].start = 0;</div><div class='add'>+	hose-&gt;mem_resources[2].end = 0;</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+	rc = opal_pci_set_phb_mem_window(opal-&gt;phb_id,</div><div class='add'>+					 window_type,</div><div class='add'>+					 window_num,</div><div class='add'>+					 starting_real_address,</div><div class='add'>+					 starting_pci_address,</div><div class='add'>+					 segment_size);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	pr_info("  %d PE's M32: 0x%x [segment=0x%x] IO: 0x%x [segment=0x%x]\n",</div><div class='add'>+		phb-&gt;ioda.total_pe,</div><div class='add'>+		phb-&gt;ioda.m32_size, phb-&gt;ioda.m32_segsize,</div><div class='add'>+		phb-&gt;ioda.io_size, phb-&gt;ioda.io_segsize);</div><div class='add'>+</div><div class='add'>+	if (phb-&gt;regs)  {</div><div class='add'>+		pr_devel(" BUID     = 0x%016llx\n", in_be64(phb-&gt;regs + 0x100));</div><div class='add'>+		pr_devel(" PHB2_CR  = 0x%016llx\n", in_be64(phb-&gt;regs + 0x160));</div><div class='add'>+		pr_devel(" IO_BAR   = 0x%016llx\n", in_be64(phb-&gt;regs + 0x170));</div><div class='add'>+		pr_devel(" IO_BAMR  = 0x%016llx\n", in_be64(phb-&gt;regs + 0x178));</div><div class='add'>+		pr_devel(" IO_SAR   = 0x%016llx\n", in_be64(phb-&gt;regs + 0x180));</div><div class='add'>+		pr_devel(" M32_BAR  = 0x%016llx\n", in_be64(phb-&gt;regs + 0x190));</div><div class='add'>+		pr_devel(" M32_BAMR = 0x%016llx\n", in_be64(phb-&gt;regs + 0x198));</div><div class='add'>+		pr_devel(" M32_SAR  = 0x%016llx\n", in_be64(phb-&gt;regs + 0x1a0));</div><div class='add'>+	}</div><div class='add'>+	phb-&gt;hose-&gt;ops = &amp;pnv_pci_ops;</div><div class='add'>+</div><div class='add'>+	/* Setup RID -&gt; PE mapping function */</div><div class='add'>+	phb-&gt;bdfn_to_pe = pnv_ioda_bdfn_to_pe;</div><div class='add'>+</div><div class='add'>+	/* Setup TCEs */</div><div class='add'>+	phb-&gt;dma_dev_setup = pnv_pci_ioda_dma_dev_setup;</div><div class='add'>+</div><div class='add'>+	/* Setup MSI support */</div><div class='add'>+	pnv_pci_init_ioda_msis(phb);</div><div class='add'>+</div><div class='add'>+	/* We set both probe_only and PCI_REASSIGN_ALL_RSRC. This is an</div><div class='add'>+	 * odd combination which essentially means that we skip all resource</div><div class='add'>+	 * fixups and assignments in the generic code, and do it all</div><div class='add'>+	 * ourselves here</div><div class='add'>+	 */</div><div class='add'>+	pci_probe_only = 1;</div><div class='add'>+	ppc_md.pcibios_fixup_phb = pnv_pci_ioda_fixup_phb;</div><div class='add'>+	ppc_md.pcibios_enable_device_hook = pnv_pci_enable_device_hook;</div><div class='add'>+	pci_add_flags(PCI_REASSIGN_ALL_RSRC);</div><div class='add'>+</div><div class='add'>+	/* Reset IODA tables to a clean state */</div><div class='add'>+	rc = opal_pci_reset(phb_id, OPAL_PCI_IODA_TABLE_RESET, OPAL_ASSERT_RESET);</div><div class='add'>+	if (rc)</div><div class='add'>+		pr_warning("  OPAL Error %ld performing IODA table reset !\n", rc);</div><div class='add'>+	opal_pci_set_pe(phb_id, 0, 0, 7, 1, 1 , OPAL_MAP_PE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init pnv_pci_init_ioda_hub(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct device_node *phbn;</div><div class='add'>+	const u64 *prop64;</div><div class='add'>+	u64 hub_id;</div><div class='add'>+</div><div class='add'>+	pr_info("Probing IODA IO-Hub %s\n", np-&gt;full_name);</div><div class='add'>+</div><div class='add'>+	prop64 = of_get_property(np, "ibm,opal-hubid", NULL);</div><div class='add'>+	if (!prop64) {</div><div class='add'>+		pr_err(" Missing \"ibm,opal-hubid\" property !\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	hub_id = be64_to_cpup(prop64);</div><div class='add'>+	pr_devel(" HUB-ID : 0x%016llx\n", hub_id);</div><div class='add'>+</div><div class='add'>+	/* Count child PHBs */</div><div class='add'>+	for_each_child_of_node(np, phbn) {</div><div class='add'>+		/* Look for IODA1 PHBs */</div><div class='add'>+		if (of_device_is_compatible(phbn, "ibm,ioda-phb"))</div><div class='add'>+			pnv_pci_init_ioda1_phb(phbn);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/pci-p5ioc2.c b/arch/powerpc/platforms/powernv/pci-p5ioc2.c<br/>index 4c80f7c77d56..264967770c3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powernv/pci-p5ioc2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powernv/pci-p5ioc2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powernv/pci-p5ioc2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/powernv/pci-p5ioc2.c</a></div><div class='hunk'>@@ -137,6 +137,7 @@ static void __init pnv_pci_init_p5ioc2_phb(struct device_node *np,</div><div class='ctx'> 	phb-&gt;hose-&gt;private_data = phb;</div><div class='ctx'> 	phb-&gt;opal_id = phb_id;</div><div class='ctx'> 	phb-&gt;type = PNV_PHB_P5IOC2;</div><div class='add'>+	phb-&gt;model = PNV_PHB_MODEL_P5IOC2;</div><div class='ctx'> </div><div class='ctx'> 	phb-&gt;regs = of_iomap(np, 0);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c<br/>index 85bb66d7f933..a70bc1e385eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powernv/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powernv/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powernv/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/powernv/pci.c</a></div><div class='hunk'>@@ -144,6 +144,112 @@ static void pnv_teardown_msi_irqs(struct pci_dev *pdev)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PCI_MSI */</div><div class='ctx'> </div><div class='add'>+static void pnv_pci_dump_p7ioc_diag_data(struct pnv_phb *phb)</div><div class='add'>+{</div><div class='add'>+	struct OpalIoP7IOCPhbErrorData *data = &amp;phb-&gt;diag.p7ioc;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	pr_info("PHB %d diagnostic data:\n", phb-&gt;hose-&gt;global_number);</div><div class='add'>+</div><div class='add'>+	pr_info("  brdgCtl              = 0x%08x\n", data-&gt;brdgCtl);</div><div class='add'>+</div><div class='add'>+	pr_info("  portStatusReg        = 0x%08x\n", data-&gt;portStatusReg);</div><div class='add'>+	pr_info("  rootCmplxStatus      = 0x%08x\n", data-&gt;rootCmplxStatus);</div><div class='add'>+	pr_info("  busAgentStatus       = 0x%08x\n", data-&gt;busAgentStatus);</div><div class='add'>+</div><div class='add'>+	pr_info("  deviceStatus         = 0x%08x\n", data-&gt;deviceStatus);</div><div class='add'>+	pr_info("  slotStatus           = 0x%08x\n", data-&gt;slotStatus);</div><div class='add'>+	pr_info("  linkStatus           = 0x%08x\n", data-&gt;linkStatus);</div><div class='add'>+	pr_info("  devCmdStatus         = 0x%08x\n", data-&gt;devCmdStatus);</div><div class='add'>+	pr_info("  devSecStatus         = 0x%08x\n", data-&gt;devSecStatus);</div><div class='add'>+</div><div class='add'>+	pr_info("  rootErrorStatus      = 0x%08x\n", data-&gt;rootErrorStatus);</div><div class='add'>+	pr_info("  uncorrErrorStatus    = 0x%08x\n", data-&gt;uncorrErrorStatus);</div><div class='add'>+	pr_info("  corrErrorStatus      = 0x%08x\n", data-&gt;corrErrorStatus);</div><div class='add'>+	pr_info("  tlpHdr1              = 0x%08x\n", data-&gt;tlpHdr1);</div><div class='add'>+	pr_info("  tlpHdr2              = 0x%08x\n", data-&gt;tlpHdr2);</div><div class='add'>+	pr_info("  tlpHdr3              = 0x%08x\n", data-&gt;tlpHdr3);</div><div class='add'>+	pr_info("  tlpHdr4              = 0x%08x\n", data-&gt;tlpHdr4);</div><div class='add'>+	pr_info("  sourceId             = 0x%08x\n", data-&gt;sourceId);</div><div class='add'>+</div><div class='add'>+	pr_info("  errorClass           = 0x%016llx\n", data-&gt;errorClass);</div><div class='add'>+	pr_info("  correlator           = 0x%016llx\n", data-&gt;correlator);</div><div class='add'>+</div><div class='add'>+	pr_info("  p7iocPlssr           = 0x%016llx\n", data-&gt;p7iocPlssr);</div><div class='add'>+	pr_info("  p7iocCsr             = 0x%016llx\n", data-&gt;p7iocCsr);</div><div class='add'>+	pr_info("  lemFir               = 0x%016llx\n", data-&gt;lemFir);</div><div class='add'>+	pr_info("  lemErrorMask         = 0x%016llx\n", data-&gt;lemErrorMask);</div><div class='add'>+	pr_info("  lemWOF               = 0x%016llx\n", data-&gt;lemWOF);</div><div class='add'>+	pr_info("  phbErrorStatus       = 0x%016llx\n", data-&gt;phbErrorStatus);</div><div class='add'>+	pr_info("  phbFirstErrorStatus  = 0x%016llx\n", data-&gt;phbFirstErrorStatus);</div><div class='add'>+	pr_info("  phbErrorLog0         = 0x%016llx\n", data-&gt;phbErrorLog0);</div><div class='add'>+	pr_info("  phbErrorLog1         = 0x%016llx\n", data-&gt;phbErrorLog1);</div><div class='add'>+	pr_info("  mmioErrorStatus      = 0x%016llx\n", data-&gt;mmioErrorStatus);</div><div class='add'>+	pr_info("  mmioFirstErrorStatus = 0x%016llx\n", data-&gt;mmioFirstErrorStatus);</div><div class='add'>+	pr_info("  mmioErrorLog0        = 0x%016llx\n", data-&gt;mmioErrorLog0);</div><div class='add'>+	pr_info("  mmioErrorLog1        = 0x%016llx\n", data-&gt;mmioErrorLog1);</div><div class='add'>+	pr_info("  dma0ErrorStatus      = 0x%016llx\n", data-&gt;dma0ErrorStatus);</div><div class='add'>+	pr_info("  dma0FirstErrorStatus = 0x%016llx\n", data-&gt;dma0FirstErrorStatus);</div><div class='add'>+	pr_info("  dma0ErrorLog0        = 0x%016llx\n", data-&gt;dma0ErrorLog0);</div><div class='add'>+	pr_info("  dma0ErrorLog1        = 0x%016llx\n", data-&gt;dma0ErrorLog1);</div><div class='add'>+	pr_info("  dma1ErrorStatus      = 0x%016llx\n", data-&gt;dma1ErrorStatus);</div><div class='add'>+	pr_info("  dma1FirstErrorStatus = 0x%016llx\n", data-&gt;dma1FirstErrorStatus);</div><div class='add'>+	pr_info("  dma1ErrorLog0        = 0x%016llx\n", data-&gt;dma1ErrorLog0);</div><div class='add'>+	pr_info("  dma1ErrorLog1        = 0x%016llx\n", data-&gt;dma1ErrorLog1);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; OPAL_P7IOC_NUM_PEST_REGS; i++) {</div><div class='add'>+		if ((data-&gt;pestA[i] &gt;&gt; 63) == 0 &amp;&amp;</div><div class='add'>+		    (data-&gt;pestB[i] &gt;&gt; 63) == 0)</div><div class='add'>+			continue;</div><div class='add'>+		pr_info("  PE[%3d] PESTA        = 0x%016llx\n", i, data-&gt;pestA[i]);</div><div class='add'>+		pr_info("          PESTB        = 0x%016llx\n", data-&gt;pestB[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pnv_pci_dump_phb_diag_data(struct pnv_phb *phb)</div><div class='add'>+{</div><div class='add'>+	switch(phb-&gt;model) {</div><div class='add'>+	case PNV_PHB_MODEL_P7IOC:</div><div class='add'>+		pnv_pci_dump_p7ioc_diag_data(phb);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_warning("PCI %d: Can't decode this PHB diag data\n",</div><div class='add'>+			   phb-&gt;hose-&gt;global_number);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pnv_pci_handle_eeh_config(struct pnv_phb *phb, u32 pe_no)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags, rc;</div><div class='add'>+	int has_diag;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;phb-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	rc = opal_pci_get_phb_diag_data(phb-&gt;opal_id, phb-&gt;diag.blob, PNV_PCI_DIAG_BUF_SIZE);</div><div class='add'>+	has_diag = (rc == OPAL_SUCCESS);</div><div class='add'>+</div><div class='add'>+	rc = opal_pci_eeh_freeze_clear(phb-&gt;opal_id, pe_no,</div><div class='add'>+				       OPAL_EEH_ACTION_CLEAR_FREEZE_ALL);</div><div class='add'>+	if (rc) {</div><div class='add'>+		pr_warning("PCI %d: Failed to clear EEH freeze state"</div><div class='add'>+			   " for PE#%d, err %ld\n",</div><div class='add'>+			   phb-&gt;hose-&gt;global_number, pe_no, rc);</div><div class='add'>+</div><div class='add'>+		/* For now, let's only display the diag buffer when we fail to clear</div><div class='add'>+		 * the EEH status. We'll do more sensible things later when we have</div><div class='add'>+		 * proper EEH support. We need to make sure we don't pollute ourselves</div><div class='add'>+		 * with the normal errors generated when probing empty slots</div><div class='add'>+		 */</div><div class='add'>+		if (has_diag)</div><div class='add'>+			pnv_pci_dump_phb_diag_data(phb);</div><div class='add'>+		else</div><div class='add'>+			pr_warning("PCI %d: No diag data available\n",</div><div class='add'>+				   phb-&gt;hose-&gt;global_number);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;phb-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void pnv_pci_config_check_eeh(struct pnv_phb *phb, struct pci_bus *bus,</div><div class='ctx'> 				     u32 bdfn)</div><div class='ctx'> {</div><div class='hunk'>@@ -165,15 +271,8 @@ static void pnv_pci_config_check_eeh(struct pnv_phb *phb, struct pci_bus *bus,</div><div class='ctx'> 	}</div><div class='ctx'> 	cfg_dbg(" -&gt; EEH check, bdfn=%04x PE%d fstate=%x\n",</div><div class='ctx'> 		bdfn, pe_no, fstate);</div><div class='del'>-	if (fstate != 0) {</div><div class='del'>-		rc = opal_pci_eeh_freeze_clear(phb-&gt;opal_id, pe_no,</div><div class='del'>-					      OPAL_EEH_ACTION_CLEAR_FREEZE_ALL);</div><div class='del'>-		if (rc) {</div><div class='del'>-			pr_warning("PCI %d: Failed to clear EEH freeze state"</div><div class='del'>-				   " for PE#%d, err %lld\n",</div><div class='del'>-				   phb-&gt;hose-&gt;global_number, pe_no, rc);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (fstate != 0)</div><div class='add'>+		pnv_pci_handle_eeh_config(phb, pe_no);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pnv_pci_read_config(struct pci_bus *bus,</div><div class='hunk'>@@ -257,12 +356,54 @@ struct pci_ops pnv_pci_ops = {</div><div class='ctx'> 	.write = pnv_pci_write_config,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static void pnv_tce_invalidate(struct iommu_table *tbl,</div><div class='add'>+			       u64 *startp, u64 *endp)</div><div class='add'>+{</div><div class='add'>+	u64 __iomem *invalidate = (u64 __iomem *)tbl-&gt;it_index;</div><div class='add'>+	unsigned long start, end, inc;</div><div class='add'>+</div><div class='add'>+	start = __pa(startp);</div><div class='add'>+	end = __pa(endp);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* BML uses this case for p6/p7/galaxy2: Shift addr and put in node */</div><div class='add'>+	if (tbl-&gt;it_busno) {</div><div class='add'>+		start &lt;&lt;= 12;</div><div class='add'>+		end &lt;&lt;= 12;</div><div class='add'>+		inc = 128 &lt;&lt; 12;</div><div class='add'>+		start |= tbl-&gt;it_busno;</div><div class='add'>+		end |= tbl-&gt;it_busno;</div><div class='add'>+	}</div><div class='add'>+	/* p7ioc-style invalidation, 2 TCEs per write */</div><div class='add'>+	else if (tbl-&gt;it_type &amp; TCE_PCI_SWINV_PAIR) {</div><div class='add'>+		start |= (1ull &lt;&lt; 63);</div><div class='add'>+		end |= (1ull &lt;&lt; 63);</div><div class='add'>+		inc = 16;</div><div class='add'>+	}</div><div class='add'>+	/* Default (older HW) */</div><div class='add'>+	else</div><div class='add'>+		inc = 128;</div><div class='add'>+</div><div class='add'>+	end |= inc - 1;		/* round up end to be different than start */</div><div class='add'>+</div><div class='add'>+	mb(); /* Ensure above stores are visible */</div><div class='add'>+	while (start &lt;= end) {</div><div class='add'>+		__raw_writeq(start, invalidate);</div><div class='add'>+		start += inc;</div><div class='add'>+	}</div><div class='add'>+	/* The iommu layer will do another mb() for us on build() and</div><div class='add'>+	 * we don't care on free()</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static int pnv_tce_build(struct iommu_table *tbl, long index, long npages,</div><div class='ctx'> 			 unsigned long uaddr, enum dma_data_direction direction,</div><div class='ctx'> 			 struct dma_attrs *attrs)</div><div class='ctx'> {</div><div class='ctx'> 	u64 proto_tce;</div><div class='del'>-	u64 *tcep;</div><div class='add'>+	u64 *tcep, *tces;</div><div class='ctx'> 	u64 rpn;</div><div class='ctx'> </div><div class='ctx'> 	proto_tce = TCE_PCI_READ; // Read allowed</div><div class='hunk'>@@ -270,25 +411,33 @@ static int pnv_tce_build(struct iommu_table *tbl, long index, long npages,</div><div class='ctx'> 	if (direction != DMA_TO_DEVICE)</div><div class='ctx'> 		proto_tce |= TCE_PCI_WRITE;</div><div class='ctx'> </div><div class='del'>-	tcep = ((u64 *)tbl-&gt;it_base) + index;</div><div class='add'>+	tces = tcep = ((u64 *)tbl-&gt;it_base) + index - tbl-&gt;it_offset;</div><div class='add'>+	rpn = __pa(uaddr) &gt;&gt; TCE_SHIFT;</div><div class='ctx'> </div><div class='del'>-	while (npages--) {</div><div class='del'>-		/* can't move this out since we might cross LMB boundary */</div><div class='del'>-		rpn = (virt_to_abs(uaddr)) &gt;&gt; TCE_SHIFT;</div><div class='del'>-		*tcep = proto_tce | (rpn &amp; TCE_RPN_MASK) &lt;&lt; TCE_RPN_SHIFT;</div><div class='add'>+	while (npages--)</div><div class='add'>+		*(tcep++) = proto_tce | (rpn++ &lt;&lt; TCE_RPN_SHIFT);</div><div class='add'>+</div><div class='add'>+	/* Some implementations won't cache invalid TCEs and thus may not</div><div class='add'>+	 * need that flush. We'll probably turn it_type into a bit mask</div><div class='add'>+	 * of flags if that becomes the case</div><div class='add'>+	 */</div><div class='add'>+	if (tbl-&gt;it_type &amp; TCE_PCI_SWINV_CREATE)</div><div class='add'>+		pnv_tce_invalidate(tbl, tces, tcep - 1);</div><div class='ctx'> </div><div class='del'>-		uaddr += TCE_PAGE_SIZE;</div><div class='del'>-		tcep++;</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pnv_tce_free(struct iommu_table *tbl, long index, long npages)</div><div class='ctx'> {</div><div class='del'>-	u64 *tcep = ((u64 *)tbl-&gt;it_base) + index;</div><div class='add'>+	u64 *tcep, *tces;</div><div class='add'>+</div><div class='add'>+	tces = tcep = ((u64 *)tbl-&gt;it_base) + index - tbl-&gt;it_offset;</div><div class='ctx'> </div><div class='ctx'> 	while (npages--)</div><div class='ctx'> 		*(tcep++) = 0;</div><div class='add'>+</div><div class='add'>+	if (tbl-&gt;it_type &amp; TCE_PCI_SWINV_FREE)</div><div class='add'>+		pnv_tce_invalidate(tbl, tces, tcep - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void pnv_pci_setup_iommu_table(struct iommu_table *tbl,</div><div class='hunk'>@@ -308,13 +457,14 @@ static struct iommu_table * __devinit</div><div class='ctx'> pnv_pci_setup_bml_iommu(struct pci_controller *hose)</div><div class='ctx'> {</div><div class='ctx'> 	struct iommu_table *tbl;</div><div class='del'>-	const __be64 *basep;</div><div class='add'>+	const __be64 *basep, *swinvp;</div><div class='ctx'> 	const __be32 *sizep;</div><div class='ctx'> </div><div class='ctx'> 	basep = of_get_property(hose-&gt;dn, "linux,tce-base", NULL);</div><div class='ctx'> 	sizep = of_get_property(hose-&gt;dn, "linux,tce-size", NULL);</div><div class='ctx'> 	if (basep == NULL || sizep == NULL) {</div><div class='del'>-		pr_err("PCI: %s has missing tce entries !\n", hose-&gt;dn-&gt;full_name);</div><div class='add'>+		pr_err("PCI: %s has missing tce entries !\n",</div><div class='add'>+		       hose-&gt;dn-&gt;full_name);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	tbl = kzalloc_node(sizeof(struct iommu_table), GFP_KERNEL, hose-&gt;node);</div><div class='hunk'>@@ -323,6 +473,15 @@ pnv_pci_setup_bml_iommu(struct pci_controller *hose)</div><div class='ctx'> 	pnv_pci_setup_iommu_table(tbl, __va(be64_to_cpup(basep)),</div><div class='ctx'> 				  be32_to_cpup(sizep), 0);</div><div class='ctx'> 	iommu_init_table(tbl, hose-&gt;node);</div><div class='add'>+</div><div class='add'>+	/* Deal with SW invalidated TCEs when needed (BML way) */</div><div class='add'>+	swinvp = of_get_property(hose-&gt;dn, "linux,tce-sw-invalidate-info",</div><div class='add'>+				 NULL);</div><div class='add'>+	if (swinvp) {</div><div class='add'>+		tbl-&gt;it_busno = swinvp[1];</div><div class='add'>+		tbl-&gt;it_index = (unsigned long)ioremap(swinvp[0], 8);</div><div class='add'>+		tbl-&gt;it_type = TCE_PCI_SWINV_CREATE | TCE_PCI_SWINV_FREE;</div><div class='add'>+	}</div><div class='ctx'> 	return tbl;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -356,6 +515,13 @@ static void __devinit pnv_pci_dma_dev_setup(struct pci_dev *pdev)</div><div class='ctx'> 		pnv_pci_dma_fallback_setup(hose, pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Fixup wrong class code in p7ioc root complex */</div><div class='add'>+static void __devinit pnv_p7ioc_rc_quirk(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;class = PCI_CLASS_BRIDGE_PCI &lt;&lt; 8;</div><div class='add'>+}</div><div class='add'>+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_IBM, 0x3b9, pnv_p7ioc_rc_quirk);</div><div class='add'>+</div><div class='ctx'> static int pnv_pci_probe_mode(struct pci_bus *bus)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_controller *hose = pci_bus_to_host(bus);</div><div class='hunk'>@@ -400,12 +566,24 @@ void __init pnv_pci_init(void)</div><div class='ctx'> 		init_pci_config_tokens();</div><div class='ctx'> 		find_and_init_phbs();</div><div class='ctx'> #endif /* CONFIG_PPC_POWERNV_RTAS */</div><div class='del'>-	} else {</div><div class='del'>-		/* OPAL is here, do our normal stuff */</div><div class='add'>+	}</div><div class='add'>+	/* OPAL is here, do our normal stuff */</div><div class='add'>+	else {</div><div class='add'>+		int found_ioda = 0;</div><div class='add'>+</div><div class='add'>+		/* Look for IODA IO-Hubs. We don't support mixing IODA</div><div class='add'>+		 * and p5ioc2 due to the need to change some global</div><div class='add'>+		 * probing flags</div><div class='add'>+		 */</div><div class='add'>+		for_each_compatible_node(np, NULL, "ibm,ioda-hub") {</div><div class='add'>+			pnv_pci_init_ioda_hub(np);</div><div class='add'>+			found_ioda = 1;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* Look for p5ioc2 IO-Hubs */</div><div class='del'>-		for_each_compatible_node(np, NULL, "ibm,p5ioc2")</div><div class='del'>-			pnv_pci_init_p5ioc2_hub(np);</div><div class='add'>+		if (!found_ioda)</div><div class='add'>+			for_each_compatible_node(np, NULL, "ibm,p5ioc2")</div><div class='add'>+				pnv_pci_init_p5ioc2_hub(np);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the linkage between OF nodes and PHBs */</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/pci.h b/arch/powerpc/platforms/powernv/pci.h<br/>index d4dbc4950936..8bc479634643 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powernv/pci.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powernv/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powernv/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/powernv/pci.h</a></div><div class='hunk'>@@ -9,9 +9,63 @@ enum pnv_phb_type {</div><div class='ctx'> 	PNV_PHB_IODA2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Precise PHB model for error management */</div><div class='add'>+enum pnv_phb_model {</div><div class='add'>+	PNV_PHB_MODEL_UNKNOWN,</div><div class='add'>+	PNV_PHB_MODEL_P5IOC2,</div><div class='add'>+	PNV_PHB_MODEL_P7IOC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PNV_PCI_DIAG_BUF_SIZE	4096</div><div class='add'>+</div><div class='add'>+/* Data associated with a PE, including IOMMU tracking etc.. */</div><div class='add'>+struct pnv_ioda_pe {</div><div class='add'>+	/* A PE can be associated with a single device or an</div><div class='add'>+	 * entire bus (&amp; children). In the former case, pdev</div><div class='add'>+	 * is populated, in the later case, pbus is.</div><div class='add'>+	 */</div><div class='add'>+	struct pci_dev		*pdev;</div><div class='add'>+	struct pci_bus		*pbus;</div><div class='add'>+</div><div class='add'>+	/* Effective RID (device RID for a device PE and base bus</div><div class='add'>+	 * RID with devfn 0 for a bus PE)</div><div class='add'>+	 */</div><div class='add'>+	unsigned int		rid;</div><div class='add'>+</div><div class='add'>+	/* PE number */</div><div class='add'>+	unsigned int		pe_number;</div><div class='add'>+</div><div class='add'>+	/* "Weight" assigned to the PE for the sake of DMA resource</div><div class='add'>+	 * allocations</div><div class='add'>+	 */</div><div class='add'>+	unsigned int		dma_weight;</div><div class='add'>+</div><div class='add'>+	/* This is a PCI-E -&gt; PCI-X bridge, this points to the</div><div class='add'>+	 * corresponding bus PE</div><div class='add'>+	 */</div><div class='add'>+	struct pnv_ioda_pe	*bus_pe;</div><div class='add'>+</div><div class='add'>+	/* "Base" iommu table, ie, 4K TCEs, 32-bit DMA */</div><div class='add'>+	int			tce32_seg;</div><div class='add'>+	int			tce32_segcount;</div><div class='add'>+	struct iommu_table	tce32_table;</div><div class='add'>+</div><div class='add'>+	/* XXX TODO: Add support for additional 64-bit iommus */</div><div class='add'>+</div><div class='add'>+	/* MSIs. MVE index is identical for for 32 and 64 bit MSI</div><div class='add'>+	 * and -1 if not supported. (It's actually identical to the</div><div class='add'>+	 * PE number)</div><div class='add'>+	 */</div><div class='add'>+	int			mve_number;</div><div class='add'>+</div><div class='add'>+	/* Link in list of PE#s */</div><div class='add'>+	struct list_head	link;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct pnv_phb {</div><div class='ctx'> 	struct pci_controller	*hose;</div><div class='ctx'> 	enum pnv_phb_type	type;</div><div class='add'>+	enum pnv_phb_model	model;</div><div class='ctx'> 	u64			opal_id;</div><div class='ctx'> 	void __iomem		*regs;</div><div class='ctx'> 	spinlock_t		lock;</div><div class='hunk'>@@ -34,7 +88,52 @@ struct pnv_phb {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			struct iommu_table iommu_table;</div><div class='ctx'> 		} p5ioc2;</div><div class='add'>+</div><div class='add'>+		struct {</div><div class='add'>+			/* Global bridge info */</div><div class='add'>+			unsigned int		total_pe;</div><div class='add'>+			unsigned int		m32_size;</div><div class='add'>+			unsigned int		m32_segsize;</div><div class='add'>+			unsigned int		m32_pci_base;</div><div class='add'>+			unsigned int		io_size;</div><div class='add'>+			unsigned int		io_segsize;</div><div class='add'>+			unsigned int		io_pci_base;</div><div class='add'>+</div><div class='add'>+			/* PE allocation bitmap */</div><div class='add'>+			unsigned long		*pe_alloc;</div><div class='add'>+</div><div class='add'>+			/* M32 &amp; IO segment maps */</div><div class='add'>+			unsigned int		*m32_segmap;</div><div class='add'>+			unsigned int		*io_segmap;</div><div class='add'>+			struct pnv_ioda_pe	*pe_array;</div><div class='add'>+</div><div class='add'>+			/* Reverse map of PEs, will have to extend if</div><div class='add'>+			 * we are to support more than 256 PEs, indexed</div><div class='add'>+			 * bus { bus, devfn }</div><div class='add'>+			 */</div><div class='add'>+			unsigned char		pe_rmap[0x10000];</div><div class='add'>+</div><div class='add'>+			/* 32-bit TCE tables allocation */</div><div class='add'>+			unsigned long		tce32_count;</div><div class='add'>+</div><div class='add'>+			/* Total "weight" for the sake of DMA resources</div><div class='add'>+			 * allocation</div><div class='add'>+			 */</div><div class='add'>+			unsigned int		dma_weight;</div><div class='add'>+			unsigned int		dma_pe_count;</div><div class='add'>+</div><div class='add'>+			/* Sorted list of used PE's, sorted at</div><div class='add'>+			 * boot for resource allocation purposes</div><div class='add'>+			 */</div><div class='add'>+			struct list_head	pe_list;</div><div class='add'>+		} ioda;</div><div class='ctx'> 	};</div><div class='add'>+</div><div class='add'>+	/* PHB status structure */</div><div class='add'>+	union {</div><div class='add'>+		unsigned char			blob[PNV_PCI_DIAG_BUF_SIZE];</div><div class='add'>+		struct OpalIoP7IOCPhbErrorData	p7ioc;</div><div class='add'>+	} diag;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct pci_ops pnv_pci_ops;</div><div class='hunk'>@@ -43,6 +142,7 @@ extern void pnv_pci_setup_iommu_table(struct iommu_table *tbl,</div><div class='ctx'> 				      void *tce_mem, u64 tce_size,</div><div class='ctx'> 				      u64 dma_offset);</div><div class='ctx'> extern void pnv_pci_init_p5ioc2_hub(struct device_node *np);</div><div class='add'>+extern void pnv_pci_init_ioda_hub(struct device_node *np);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #endif /* __POWERNV_PCI_H */</div><div class='head'>diff --git a/arch/powerpc/platforms/powernv/smp.c b/arch/powerpc/platforms/powernv/smp.c<br/>index e87736685243..17210c526c52 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powernv/smp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/powernv/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powernv/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/powernv/smp.c</a></div><div class='hunk'>@@ -75,7 +75,7 @@ int __devinit pnv_smp_kick_cpu(int nr)</div><div class='ctx'> 	/* On OPAL v2 the CPU are still spinning inside OPAL itself,</div><div class='ctx'> 	 * get them back now</div><div class='ctx'> 	 */</div><div class='del'>-	if (firmware_has_feature(FW_FEATURE_OPALv2)) {</div><div class='add'>+	if (!paca[nr].cpu_start &amp;&amp; firmware_has_feature(FW_FEATURE_OPALv2)) {</div><div class='ctx'> 		pr_devel("OPAL: Starting CPU %d (HW 0x%x)...\n", nr, pcpu);</div><div class='ctx'> 		rc = opal_start_cpu(pcpu, start_here);</div><div class='ctx'> 		if (rc != OPAL_SUCCESS)</div><div class='head'>diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c<br/>index 1d6f4f478fe2..617efa12a3a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/ps3/interrupt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/ps3/interrupt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/ps3/interrupt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/ps3/interrupt.c</a></div><div class='hunk'>@@ -31,18 +31,18 @@</div><div class='ctx'> </div><div class='ctx'> #if defined(DEBUG)</div><div class='ctx'> #define DBG udbg_printf</div><div class='add'>+#define FAIL udbg_printf</div><div class='ctx'> #else</div><div class='del'>-#define DBG pr_debug</div><div class='add'>+#define DBG pr_devel</div><div class='add'>+#define FAIL pr_debug</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct ps3_bmp - a per cpu irq status and mask bitmap structure</div><div class='ctx'>  * @status: 256 bit status bitmap indexed by plug</div><div class='del'>- * @unused_1:</div><div class='add'>+ * @unused_1: Alignment</div><div class='ctx'>  * @mask: 256 bit mask bitmap indexed by plug</div><div class='del'>- * @unused_2:</div><div class='del'>- * @lock:</div><div class='del'>- * @ipi_debug_brk_mask:</div><div class='add'>+ * @unused_2: Alignment</div><div class='ctx'>  *</div><div class='ctx'>  * The HV maintains per SMT thread mappings of HV outlet to HV plug on</div><div class='ctx'>  * behalf of the guest.  These mappings are implemented as 256 bit guest</div><div class='hunk'>@@ -73,21 +73,24 @@ struct ps3_bmp {</div><div class='ctx'> 		unsigned long mask;</div><div class='ctx'> 		u64 unused_2[3];</div><div class='ctx'> 	};</div><div class='del'>-	u64 ipi_debug_brk_mask;</div><div class='del'>-	spinlock_t lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct ps3_private - a per cpu data structure</div><div class='ctx'>  * @bmp: ps3_bmp structure</div><div class='add'>+ * @bmp_lock: Syncronize access to bmp.</div><div class='add'>+ * @ipi_debug_brk_mask: Mask for debug break IPIs</div><div class='ctx'>  * @ppe_id: HV logical_ppe_id</div><div class='ctx'>  * @thread_id: HV thread_id</div><div class='add'>+ * @ipi_mask: Mask of IPI virqs</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct ps3_private {</div><div class='ctx'> 	struct ps3_bmp bmp __attribute__ ((aligned (PS3_BMP_MINALIGN)));</div><div class='add'>+	spinlock_t bmp_lock;</div><div class='ctx'> 	u64 ppe_id;</div><div class='ctx'> 	u64 thread_id;</div><div class='add'>+	unsigned long ipi_debug_brk_mask;</div><div class='ctx'> 	unsigned long ipi_mask;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -105,7 +108,7 @@ static void ps3_chip_mask(struct irq_data *d)</div><div class='ctx'> 	struct ps3_private *pd = irq_data_get_irq_chip_data(d);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s:%d: thread_id %llu, virq %d\n", __func__, __LINE__,</div><div class='add'>+	DBG("%s:%d: thread_id %llu, virq %d\n", __func__, __LINE__,</div><div class='ctx'> 		pd-&gt;thread_id, d-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='hunk'>@@ -126,7 +129,7 @@ static void ps3_chip_unmask(struct irq_data *d)</div><div class='ctx'> 	struct ps3_private *pd = irq_data_get_irq_chip_data(d);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s:%d: thread_id %llu, virq %d\n", __func__, __LINE__,</div><div class='add'>+	DBG("%s:%d: thread_id %llu, virq %d\n", __func__, __LINE__,</div><div class='ctx'> 		pd-&gt;thread_id, d-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='hunk'>@@ -190,19 +193,19 @@ static int ps3_virq_setup(enum ps3_cpu_binding cpu, unsigned long outlet,</div><div class='ctx'> 	*virq = irq_create_mapping(NULL, outlet);</div><div class='ctx'> </div><div class='ctx'> 	if (*virq == NO_IRQ) {</div><div class='del'>-		pr_debug("%s:%d: irq_create_mapping failed: outlet %lu\n",</div><div class='add'>+		FAIL("%s:%d: irq_create_mapping failed: outlet %lu\n",</div><div class='ctx'> 			__func__, __LINE__, outlet);</div><div class='ctx'> 		result = -ENOMEM;</div><div class='ctx'> 		goto fail_create;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s:%d: outlet %lu =&gt; cpu %u, virq %u\n", __func__, __LINE__,</div><div class='add'>+	DBG("%s:%d: outlet %lu =&gt; cpu %u, virq %u\n", __func__, __LINE__,</div><div class='ctx'> 		outlet, cpu, *virq);</div><div class='ctx'> </div><div class='ctx'> 	result = irq_set_chip_data(*virq, pd);</div><div class='ctx'> </div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_debug("%s:%d: irq_set_chip_data failed\n",</div><div class='add'>+		FAIL("%s:%d: irq_set_chip_data failed\n",</div><div class='ctx'> 			__func__, __LINE__);</div><div class='ctx'> 		goto fail_set;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -228,13 +231,13 @@ static int ps3_virq_destroy(unsigned int virq)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ps3_private *pd = irq_get_chip_data(virq);</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__,</div><div class='add'>+	DBG("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__,</div><div class='ctx'> 		__LINE__, pd-&gt;ppe_id, pd-&gt;thread_id, virq);</div><div class='ctx'> </div><div class='ctx'> 	irq_set_chip_data(virq, NULL);</div><div class='ctx'> 	irq_dispose_mapping(virq);</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s:%d &lt;-\n", __func__, __LINE__);</div><div class='add'>+	DBG("%s:%d &lt;-\n", __func__, __LINE__);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -257,7 +260,7 @@ int ps3_irq_plug_setup(enum ps3_cpu_binding cpu, unsigned long outlet,</div><div class='ctx'> 	result = ps3_virq_setup(cpu, outlet, virq);</div><div class='ctx'> </div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_debug("%s:%d: ps3_virq_setup failed\n", __func__, __LINE__);</div><div class='add'>+		FAIL("%s:%d: ps3_virq_setup failed\n", __func__, __LINE__);</div><div class='ctx'> 		goto fail_setup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -269,7 +272,7 @@ int ps3_irq_plug_setup(enum ps3_cpu_binding cpu, unsigned long outlet,</div><div class='ctx'> 		outlet, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_info("%s:%d: lv1_connect_irq_plug_ext failed: %s\n",</div><div class='add'>+		FAIL("%s:%d: lv1_connect_irq_plug_ext failed: %s\n",</div><div class='ctx'> 		__func__, __LINE__, ps3_result(result));</div><div class='ctx'> 		result = -EPERM;</div><div class='ctx'> 		goto fail_connect;</div><div class='hunk'>@@ -298,7 +301,7 @@ int ps3_irq_plug_destroy(unsigned int virq)</div><div class='ctx'> 	int result;</div><div class='ctx'> 	const struct ps3_private *pd = irq_get_chip_data(virq);</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__,</div><div class='add'>+	DBG("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__,</div><div class='ctx'> 		__LINE__, pd-&gt;ppe_id, pd-&gt;thread_id, virq);</div><div class='ctx'> </div><div class='ctx'> 	ps3_chip_mask(irq_get_irq_data(virq));</div><div class='hunk'>@@ -306,7 +309,7 @@ int ps3_irq_plug_destroy(unsigned int virq)</div><div class='ctx'> 	result = lv1_disconnect_irq_plug_ext(pd-&gt;ppe_id, pd-&gt;thread_id, virq);</div><div class='ctx'> </div><div class='ctx'> 	if (result)</div><div class='del'>-		pr_info("%s:%d: lv1_disconnect_irq_plug_ext failed: %s\n",</div><div class='add'>+		FAIL("%s:%d: lv1_disconnect_irq_plug_ext failed: %s\n",</div><div class='ctx'> 		__func__, __LINE__, ps3_result(result));</div><div class='ctx'> </div><div class='ctx'> 	ps3_virq_destroy(virq);</div><div class='hunk'>@@ -334,7 +337,7 @@ int ps3_event_receive_port_setup(enum ps3_cpu_binding cpu, unsigned int *virq)</div><div class='ctx'> 	result = lv1_construct_event_receive_port(&amp;outlet);</div><div class='ctx'> </div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_debug("%s:%d: lv1_construct_event_receive_port failed: %s\n",</div><div class='add'>+		FAIL("%s:%d: lv1_construct_event_receive_port failed: %s\n",</div><div class='ctx'> 			__func__, __LINE__, ps3_result(result));</div><div class='ctx'> 		*virq = NO_IRQ;</div><div class='ctx'> 		return result;</div><div class='hunk'>@@ -360,14 +363,14 @@ int ps3_event_receive_port_destroy(unsigned int virq)</div><div class='ctx'> {</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='del'>-	pr_debug(" -&gt; %s:%d virq %u\n", __func__, __LINE__, virq);</div><div class='add'>+	DBG(" -&gt; %s:%d virq %u\n", __func__, __LINE__, virq);</div><div class='ctx'> </div><div class='ctx'> 	ps3_chip_mask(irq_get_irq_data(virq));</div><div class='ctx'> </div><div class='ctx'> 	result = lv1_destruct_event_receive_port(virq_to_hw(virq));</div><div class='ctx'> </div><div class='ctx'> 	if (result)</div><div class='del'>-		pr_debug("%s:%d: lv1_destruct_event_receive_port failed: %s\n",</div><div class='add'>+		FAIL("%s:%d: lv1_destruct_event_receive_port failed: %s\n",</div><div class='ctx'> 			__func__, __LINE__, ps3_result(result));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -375,7 +378,7 @@ int ps3_event_receive_port_destroy(unsigned int virq)</div><div class='ctx'> 	 * calls from interrupt context (smp_call_function) when kexecing.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	pr_debug(" &lt;- %s:%d\n", __func__, __LINE__);</div><div class='add'>+	DBG(" &lt;- %s:%d\n", __func__, __LINE__);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -411,7 +414,7 @@ int ps3_sb_event_receive_port_setup(struct ps3_system_bus_device *dev,</div><div class='ctx'> 		dev-&gt;dev_id, virq_to_hw(*virq), dev-&gt;interrupt_id);</div><div class='ctx'> </div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_debug("%s:%d: lv1_connect_interrupt_event_receive_port"</div><div class='add'>+		FAIL("%s:%d: lv1_connect_interrupt_event_receive_port"</div><div class='ctx'> 			" failed: %s\n", __func__, __LINE__,</div><div class='ctx'> 			ps3_result(result));</div><div class='ctx'> 		ps3_event_receive_port_destroy(*virq);</div><div class='hunk'>@@ -419,7 +422,7 @@ int ps3_sb_event_receive_port_setup(struct ps3_system_bus_device *dev,</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s:%d: interrupt_id %u, virq %u\n", __func__, __LINE__,</div><div class='add'>+	DBG("%s:%d: interrupt_id %u, virq %u\n", __func__, __LINE__,</div><div class='ctx'> 		dev-&gt;interrupt_id, *virq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -433,14 +436,14 @@ int ps3_sb_event_receive_port_destroy(struct ps3_system_bus_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='del'>-	pr_debug(" -&gt; %s:%d: interrupt_id %u, virq %u\n", __func__, __LINE__,</div><div class='add'>+	DBG(" -&gt; %s:%d: interrupt_id %u, virq %u\n", __func__, __LINE__,</div><div class='ctx'> 		dev-&gt;interrupt_id, virq);</div><div class='ctx'> </div><div class='ctx'> 	result = lv1_disconnect_interrupt_event_receive_port(dev-&gt;bus_id,</div><div class='ctx'> 		dev-&gt;dev_id, virq_to_hw(virq), dev-&gt;interrupt_id);</div><div class='ctx'> </div><div class='ctx'> 	if (result)</div><div class='del'>-		pr_debug("%s:%d: lv1_disconnect_interrupt_event_receive_port"</div><div class='add'>+		FAIL("%s:%d: lv1_disconnect_interrupt_event_receive_port"</div><div class='ctx'> 			" failed: %s\n", __func__, __LINE__,</div><div class='ctx'> 			ps3_result(result));</div><div class='ctx'> </div><div class='hunk'>@@ -455,7 +458,7 @@ int ps3_sb_event_receive_port_destroy(struct ps3_system_bus_device *dev,</div><div class='ctx'> 	result = ps3_virq_destroy(virq);</div><div class='ctx'> 	BUG_ON(result);</div><div class='ctx'> </div><div class='del'>-	pr_debug(" &lt;- %s:%d\n", __func__, __LINE__);</div><div class='add'>+	DBG(" &lt;- %s:%d\n", __func__, __LINE__);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ps3_sb_event_receive_port_destroy);</div><div class='hunk'>@@ -480,7 +483,7 @@ int ps3_io_irq_setup(enum ps3_cpu_binding cpu, unsigned int interrupt_id,</div><div class='ctx'> 	result = lv1_construct_io_irq_outlet(interrupt_id, &amp;outlet);</div><div class='ctx'> </div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_debug("%s:%d: lv1_construct_io_irq_outlet failed: %s\n",</div><div class='add'>+		FAIL("%s:%d: lv1_construct_io_irq_outlet failed: %s\n",</div><div class='ctx'> 			__func__, __LINE__, ps3_result(result));</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -510,7 +513,7 @@ int ps3_io_irq_destroy(unsigned int virq)</div><div class='ctx'> 	result = lv1_destruct_io_irq_outlet(outlet);</div><div class='ctx'> </div><div class='ctx'> 	if (result)</div><div class='del'>-		pr_debug("%s:%d: lv1_destruct_io_irq_outlet failed: %s\n",</div><div class='add'>+		FAIL("%s:%d: lv1_destruct_io_irq_outlet failed: %s\n",</div><div class='ctx'> 			__func__, __LINE__, ps3_result(result));</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='hunk'>@@ -542,7 +545,7 @@ int ps3_vuart_irq_setup(enum ps3_cpu_binding cpu, void* virt_addr_bmp,</div><div class='ctx'> 	result = lv1_configure_virtual_uart_irq(lpar_addr, &amp;outlet);</div><div class='ctx'> </div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_debug("%s:%d: lv1_configure_virtual_uart_irq failed: %s\n",</div><div class='add'>+		FAIL("%s:%d: lv1_configure_virtual_uart_irq failed: %s\n",</div><div class='ctx'> 			__func__, __LINE__, ps3_result(result));</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -562,7 +565,7 @@ int ps3_vuart_irq_destroy(unsigned int virq)</div><div class='ctx'> 	result = lv1_deconfigure_virtual_uart_irq();</div><div class='ctx'> </div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_debug("%s:%d: lv1_configure_virtual_uart_irq failed: %s\n",</div><div class='add'>+		FAIL("%s:%d: lv1_configure_virtual_uart_irq failed: %s\n",</div><div class='ctx'> 			__func__, __LINE__, ps3_result(result));</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -595,7 +598,7 @@ int ps3_spe_irq_setup(enum ps3_cpu_binding cpu, unsigned long spe_id,</div><div class='ctx'> 	result = lv1_get_spe_irq_outlet(spe_id, class, &amp;outlet);</div><div class='ctx'> </div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_debug("%s:%d: lv1_get_spe_irq_outlet failed: %s\n",</div><div class='add'>+		FAIL("%s:%d: lv1_get_spe_irq_outlet failed: %s\n",</div><div class='ctx'> 			__func__, __LINE__, ps3_result(result));</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -626,7 +629,7 @@ int ps3_spe_irq_destroy(unsigned int virq)</div><div class='ctx'> static void _dump_64_bmp(const char *header, const u64 *p, unsigned cpu,</div><div class='ctx'> 	const char* func, int line)</div><div class='ctx'> {</div><div class='del'>-	pr_debug("%s:%d: %s %u {%04lx_%04lx_%04lx_%04lx}\n",</div><div class='add'>+	pr_debug("%s:%d: %s %u {%04llx_%04llx_%04llx_%04llx}\n",</div><div class='ctx'> 		func, line, header, cpu,</div><div class='ctx'> 		*p &gt;&gt; 48, (*p &gt;&gt; 32) &amp; 0xffff, (*p &gt;&gt; 16) &amp; 0xffff,</div><div class='ctx'> 		*p &amp; 0xffff);</div><div class='hunk'>@@ -635,7 +638,7 @@ static void _dump_64_bmp(const char *header, const u64 *p, unsigned cpu,</div><div class='ctx'> static void __maybe_unused _dump_256_bmp(const char *header,</div><div class='ctx'> 	const u64 *p, unsigned cpu, const char* func, int line)</div><div class='ctx'> {</div><div class='del'>-	pr_debug("%s:%d: %s %u {%016lx:%016lx:%016lx:%016lx}\n",</div><div class='add'>+	pr_debug("%s:%d: %s %u {%016llx:%016llx:%016llx:%016llx}\n",</div><div class='ctx'> 		func, line, header, cpu, p[0], p[1], p[2], p[3]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -644,10 +647,10 @@ static void _dump_bmp(struct ps3_private* pd, const char* func, int line)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;pd-&gt;bmp.lock, flags);</div><div class='add'>+	spin_lock_irqsave(&amp;pd-&gt;bmp_lock, flags);</div><div class='ctx'> 	_dump_64_bmp("stat", &amp;pd-&gt;bmp.status, pd-&gt;thread_id, func, line);</div><div class='del'>-	_dump_64_bmp("mask", &amp;pd-&gt;bmp.mask, pd-&gt;thread_id, func, line);</div><div class='del'>-	spin_unlock_irqrestore(&amp;pd-&gt;bmp.lock, flags);</div><div class='add'>+	_dump_64_bmp("mask", (u64*)&amp;pd-&gt;bmp.mask, pd-&gt;thread_id, func, line);</div><div class='add'>+	spin_unlock_irqrestore(&amp;pd-&gt;bmp_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define dump_mask(_x) _dump_mask(_x, __func__, __LINE__)</div><div class='hunk'>@@ -656,9 +659,9 @@ static void __maybe_unused _dump_mask(struct ps3_private *pd,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;pd-&gt;bmp.lock, flags);</div><div class='del'>-	_dump_64_bmp("mask", &amp;pd-&gt;bmp.mask, pd-&gt;thread_id, func, line);</div><div class='del'>-	spin_unlock_irqrestore(&amp;pd-&gt;bmp.lock, flags);</div><div class='add'>+	spin_lock_irqsave(&amp;pd-&gt;bmp_lock, flags);</div><div class='add'>+	_dump_64_bmp("mask", (u64*)&amp;pd-&gt;bmp.mask, pd-&gt;thread_id, func, line);</div><div class='add'>+	spin_unlock_irqrestore(&amp;pd-&gt;bmp_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static void dump_bmp(struct ps3_private* pd) {};</div><div class='hunk'>@@ -667,7 +670,7 @@ static void dump_bmp(struct ps3_private* pd) {};</div><div class='ctx'> static int ps3_host_map(struct irq_host *h, unsigned int virq,</div><div class='ctx'> 	irq_hw_number_t hwirq)</div><div class='ctx'> {</div><div class='del'>-	pr_debug("%s:%d: hwirq %lu, virq %u\n", __func__, __LINE__, hwirq,</div><div class='add'>+	DBG("%s:%d: hwirq %lu, virq %u\n", __func__, __LINE__, hwirq,</div><div class='ctx'> 		virq);</div><div class='ctx'> </div><div class='ctx'> 	irq_set_chip_and_handler(virq, &amp;ps3_irq_chip, handle_fasteoi_irq);</div><div class='hunk'>@@ -690,10 +693,10 @@ void __init ps3_register_ipi_debug_brk(unsigned int cpu, unsigned int virq)</div><div class='ctx'> {</div><div class='ctx'> 	struct ps3_private *pd = &amp;per_cpu(ps3_private, cpu);</div><div class='ctx'> </div><div class='del'>-	pd-&gt;bmp.ipi_debug_brk_mask = 0x8000000000000000UL &gt;&gt; virq;</div><div class='add'>+	set_bit(63 - virq, &amp;pd-&gt;ipi_debug_brk_mask);</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s:%d: cpu %u, virq %u, mask %llxh\n", __func__, __LINE__,</div><div class='del'>-		cpu, virq, pd-&gt;bmp.ipi_debug_brk_mask);</div><div class='add'>+	DBG("%s:%d: cpu %u, virq %u, mask %lxh\n", __func__, __LINE__,</div><div class='add'>+		cpu, virq, pd-&gt;ipi_debug_brk_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init ps3_register_ipi_irq(unsigned int cpu, unsigned int virq)</div><div class='hunk'>@@ -714,14 +717,14 @@ static unsigned int ps3_get_irq(void)</div><div class='ctx'> </div><div class='ctx'> 	/* check for ipi break first to stop this cpu ASAP */</div><div class='ctx'> </div><div class='del'>-	if (x &amp; pd-&gt;bmp.ipi_debug_brk_mask)</div><div class='del'>-		x &amp;= pd-&gt;bmp.ipi_debug_brk_mask;</div><div class='add'>+	if (x &amp; pd-&gt;ipi_debug_brk_mask)</div><div class='add'>+		x &amp;= pd-&gt;ipi_debug_brk_mask;</div><div class='ctx'> </div><div class='ctx'> 	asm volatile("cntlzd %0,%1" : "=r" (plug) : "r" (x));</div><div class='ctx'> 	plug &amp;= 0x3f;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(plug == NO_IRQ)) {</div><div class='del'>-		pr_debug("%s:%d: no plug found: thread_id %llu\n", __func__,</div><div class='add'>+		DBG("%s:%d: no plug found: thread_id %llu\n", __func__,</div><div class='ctx'> 			__LINE__, pd-&gt;thread_id);</div><div class='ctx'> 		dump_bmp(&amp;per_cpu(ps3_private, 0));</div><div class='ctx'> 		dump_bmp(&amp;per_cpu(ps3_private, 1));</div><div class='hunk'>@@ -760,9 +763,9 @@ void __init ps3_init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 		lv1_get_logical_ppe_id(&amp;pd-&gt;ppe_id);</div><div class='ctx'> 		pd-&gt;thread_id = get_hard_smp_processor_id(cpu);</div><div class='del'>-		spin_lock_init(&amp;pd-&gt;bmp.lock);</div><div class='add'>+		spin_lock_init(&amp;pd-&gt;bmp_lock);</div><div class='ctx'> </div><div class='del'>-		pr_debug("%s:%d: ppe_id %llu, thread_id %llu, bmp %lxh\n",</div><div class='add'>+		DBG("%s:%d: ppe_id %llu, thread_id %llu, bmp %lxh\n",</div><div class='ctx'> 			__func__, __LINE__, pd-&gt;ppe_id, pd-&gt;thread_id,</div><div class='ctx'> 			ps3_mm_phys_to_lpar(__pa(&amp;pd-&gt;bmp)));</div><div class='ctx'> </div><div class='hunk'>@@ -770,7 +773,7 @@ void __init ps3_init_IRQ(void)</div><div class='ctx'> 			pd-&gt;thread_id, ps3_mm_phys_to_lpar(__pa(&amp;pd-&gt;bmp)));</div><div class='ctx'> </div><div class='ctx'> 		if (result)</div><div class='del'>-			pr_debug("%s:%d: lv1_configure_irq_state_bitmap failed:"</div><div class='add'>+			FAIL("%s:%d: lv1_configure_irq_state_bitmap failed:"</div><div class='ctx'> 				" %s\n", __func__, __LINE__,</div><div class='ctx'> 				ps3_result(result));</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/powerpc/platforms/ps3/repository.c b/arch/powerpc/platforms/ps3/repository.c<br/>index ca40f6afd35d..7bdfea336f5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/ps3/repository.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/ps3/repository.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/ps3/repository.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/ps3/repository.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@ static void _dump_field(const char *hdr, u64 n, const char *func, int line)</div><div class='ctx'> 		s[i] = (in[i] &lt;= 126 &amp;&amp; in[i] &gt;= 32) ? in[i] : '.';</div><div class='ctx'> 	s[i] = 0;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s:%d: %s%016llx : %s\n", func, line, hdr, n, s);</div><div class='add'>+	pr_devel("%s:%d: %s%016llx : %s\n", func, line, hdr, n, s);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -53,7 +53,7 @@ static void _dump_field(const char *hdr, u64 n, const char *func, int line)</div><div class='ctx'> static void _dump_node_name(unsigned int lpar_id, u64 n1, u64 n2, u64 n3,</div><div class='ctx'> 	u64 n4, const char *func, int line)</div><div class='ctx'> {</div><div class='del'>-	pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);</div><div class='add'>+	pr_devel("%s:%d: lpar: %u\n", func, line, lpar_id);</div><div class='ctx'> 	_dump_field("n1: ", n1, func, line);</div><div class='ctx'> 	_dump_field("n2: ", n2, func, line);</div><div class='ctx'> 	_dump_field("n3: ", n3, func, line);</div><div class='hunk'>@@ -65,13 +65,13 @@ static void _dump_node_name(unsigned int lpar_id, u64 n1, u64 n2, u64 n3,</div><div class='ctx'> static void _dump_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,</div><div class='ctx'> 	u64 v1, u64 v2, const char *func, int line)</div><div class='ctx'> {</div><div class='del'>-	pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);</div><div class='add'>+	pr_devel("%s:%d: lpar: %u\n", func, line, lpar_id);</div><div class='ctx'> 	_dump_field("n1: ", n1, func, line);</div><div class='ctx'> 	_dump_field("n2: ", n2, func, line);</div><div class='ctx'> 	_dump_field("n3: ", n3, func, line);</div><div class='ctx'> 	_dump_field("n4: ", n4, func, line);</div><div class='del'>-	pr_debug("%s:%d: v1: %016llx\n", func, line, v1);</div><div class='del'>-	pr_debug("%s:%d: v2: %016llx\n", func, line, v2);</div><div class='add'>+	pr_devel("%s:%d: v1: %016llx\n", func, line, v1);</div><div class='add'>+	pr_devel("%s:%d: v2: %016llx\n", func, line, v2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -131,11 +131,11 @@ static int read_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,</div><div class='ctx'> 		lpar_id = id;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	result = lv1_get_repository_node_value(lpar_id, n1, n2, n3, n4, &amp;v1,</div><div class='add'>+	result = lv1_read_repository_node(lpar_id, n1, n2, n3, n4, &amp;v1,</div><div class='ctx'> 		&amp;v2);</div><div class='ctx'> </div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_debug("%s:%d: lv1_get_repository_node_value failed: %s\n",</div><div class='add'>+		pr_warn("%s:%d: lv1_read_repository_node failed: %s\n",</div><div class='ctx'> 			__func__, __LINE__, ps3_result(result));</div><div class='ctx'> 		dump_node_name(lpar_id, n1, n2, n3, n4);</div><div class='ctx'> 		return -ENOENT;</div><div class='hunk'>@@ -149,10 +149,10 @@ static int read_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,</div><div class='ctx'> 		*_v2 = v2;</div><div class='ctx'> </div><div class='ctx'> 	if (v1 &amp;&amp; !_v1)</div><div class='del'>-		pr_debug("%s:%d: warning: discarding non-zero v1: %016llx\n",</div><div class='add'>+		pr_devel("%s:%d: warning: discarding non-zero v1: %016llx\n",</div><div class='ctx'> 			__func__, __LINE__, v1);</div><div class='ctx'> 	if (v2 &amp;&amp; !_v2)</div><div class='del'>-		pr_debug("%s:%d: warning: discarding non-zero v2: %016llx\n",</div><div class='add'>+		pr_devel("%s:%d: warning: discarding non-zero v2: %016llx\n",</div><div class='ctx'> 			__func__, __LINE__, v2);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -323,16 +323,16 @@ int ps3_repository_find_device(struct ps3_repository_device *repo)</div><div class='ctx'> 	result = ps3_repository_read_bus_num_dev(tmp.bus_index, &amp;num_dev);</div><div class='ctx'> </div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_debug("%s:%d read_bus_num_dev failed\n", __func__, __LINE__);</div><div class='add'>+		pr_devel("%s:%d read_bus_num_dev failed\n", __func__, __LINE__);</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s:%d: bus_type %u, bus_index %u, bus_id %llu, num_dev %u\n",</div><div class='add'>+	pr_devel("%s:%d: bus_type %u, bus_index %u, bus_id %llu, num_dev %u\n",</div><div class='ctx'> 		__func__, __LINE__, tmp.bus_type, tmp.bus_index, tmp.bus_id,</div><div class='ctx'> 		num_dev);</div><div class='ctx'> </div><div class='ctx'> 	if (tmp.dev_index &gt;= num_dev) {</div><div class='del'>-		pr_debug("%s:%d: no device found\n", __func__, __LINE__);</div><div class='add'>+		pr_devel("%s:%d: no device found\n", __func__, __LINE__);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -340,7 +340,7 @@ int ps3_repository_find_device(struct ps3_repository_device *repo)</div><div class='ctx'> 		&amp;tmp.dev_type);</div><div class='ctx'> </div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_debug("%s:%d read_dev_type failed\n", __func__, __LINE__);</div><div class='add'>+		pr_devel("%s:%d read_dev_type failed\n", __func__, __LINE__);</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -348,12 +348,12 @@ int ps3_repository_find_device(struct ps3_repository_device *repo)</div><div class='ctx'> 		&amp;tmp.dev_id);</div><div class='ctx'> </div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_debug("%s:%d ps3_repository_read_dev_id failed\n", __func__,</div><div class='add'>+		pr_devel("%s:%d ps3_repository_read_dev_id failed\n", __func__,</div><div class='ctx'> 		__LINE__);</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s:%d: found: dev_type %u, dev_index %u, dev_id %llu\n",</div><div class='add'>+	pr_devel("%s:%d: found: dev_type %u, dev_index %u, dev_id %llu\n",</div><div class='ctx'> 		__func__, __LINE__, tmp.dev_type, tmp.dev_index, tmp.dev_id);</div><div class='ctx'> </div><div class='ctx'> 	*repo = tmp;</div><div class='hunk'>@@ -367,14 +367,14 @@ int ps3_repository_find_device_by_id(struct ps3_repository_device *repo,</div><div class='ctx'> 	struct ps3_repository_device tmp;</div><div class='ctx'> 	unsigned int num_dev;</div><div class='ctx'> </div><div class='del'>-	pr_debug(" -&gt; %s:%u: find device by id %llu:%llu\n", __func__, __LINE__,</div><div class='add'>+	pr_devel(" -&gt; %s:%u: find device by id %llu:%llu\n", __func__, __LINE__,</div><div class='ctx'> 		 bus_id, dev_id);</div><div class='ctx'> </div><div class='ctx'> 	for (tmp.bus_index = 0; tmp.bus_index &lt; 10; tmp.bus_index++) {</div><div class='ctx'> 		result = ps3_repository_read_bus_id(tmp.bus_index,</div><div class='ctx'> 						    &amp;tmp.bus_id);</div><div class='ctx'> 		if (result) {</div><div class='del'>-			pr_debug("%s:%u read_bus_id(%u) failed\n", __func__,</div><div class='add'>+			pr_devel("%s:%u read_bus_id(%u) failed\n", __func__,</div><div class='ctx'> 				 __LINE__, tmp.bus_index);</div><div class='ctx'> 			return result;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -382,23 +382,23 @@ int ps3_repository_find_device_by_id(struct ps3_repository_device *repo,</div><div class='ctx'> 		if (tmp.bus_id == bus_id)</div><div class='ctx'> 			goto found_bus;</div><div class='ctx'> </div><div class='del'>-		pr_debug("%s:%u: skip, bus_id %llu\n", __func__, __LINE__,</div><div class='add'>+		pr_devel("%s:%u: skip, bus_id %llu\n", __func__, __LINE__,</div><div class='ctx'> 			 tmp.bus_id);</div><div class='ctx'> 	}</div><div class='del'>-	pr_debug(" &lt;- %s:%u: bus not found\n", __func__, __LINE__);</div><div class='add'>+	pr_devel(" &lt;- %s:%u: bus not found\n", __func__, __LINE__);</div><div class='ctx'> 	return result;</div><div class='ctx'> </div><div class='ctx'> found_bus:</div><div class='ctx'> 	result = ps3_repository_read_bus_type(tmp.bus_index, &amp;tmp.bus_type);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_debug("%s:%u read_bus_type(%u) failed\n", __func__,</div><div class='add'>+		pr_devel("%s:%u read_bus_type(%u) failed\n", __func__,</div><div class='ctx'> 			 __LINE__, tmp.bus_index);</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	result = ps3_repository_read_bus_num_dev(tmp.bus_index, &amp;num_dev);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_debug("%s:%u read_bus_num_dev failed\n", __func__,</div><div class='add'>+		pr_devel("%s:%u read_bus_num_dev failed\n", __func__,</div><div class='ctx'> 			 __LINE__);</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -408,7 +408,7 @@ found_bus:</div><div class='ctx'> 						    tmp.dev_index,</div><div class='ctx'> 						    &amp;tmp.dev_id);</div><div class='ctx'> 		if (result) {</div><div class='del'>-			pr_debug("%s:%u read_dev_id(%u:%u) failed\n", __func__,</div><div class='add'>+			pr_devel("%s:%u read_dev_id(%u:%u) failed\n", __func__,</div><div class='ctx'> 				 __LINE__, tmp.bus_index, tmp.dev_index);</div><div class='ctx'> 			return result;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -416,21 +416,21 @@ found_bus:</div><div class='ctx'> 		if (tmp.dev_id == dev_id)</div><div class='ctx'> 			goto found_dev;</div><div class='ctx'> </div><div class='del'>-		pr_debug("%s:%u: skip, dev_id %llu\n", __func__, __LINE__,</div><div class='add'>+		pr_devel("%s:%u: skip, dev_id %llu\n", __func__, __LINE__,</div><div class='ctx'> 			 tmp.dev_id);</div><div class='ctx'> 	}</div><div class='del'>-	pr_debug(" &lt;- %s:%u: dev not found\n", __func__, __LINE__);</div><div class='add'>+	pr_devel(" &lt;- %s:%u: dev not found\n", __func__, __LINE__);</div><div class='ctx'> 	return result;</div><div class='ctx'> </div><div class='ctx'> found_dev:</div><div class='ctx'> 	result = ps3_repository_read_dev_type(tmp.bus_index, tmp.dev_index,</div><div class='ctx'> 					      &amp;tmp.dev_type);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_debug("%s:%u read_dev_type failed\n", __func__, __LINE__);</div><div class='add'>+		pr_devel("%s:%u read_dev_type failed\n", __func__, __LINE__);</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_debug(" &lt;- %s:%u: found: type (%u:%u) index (%u:%u) id (%llu:%llu)\n",</div><div class='add'>+	pr_devel(" &lt;- %s:%u: found: type (%u:%u) index (%u:%u) id (%llu:%llu)\n",</div><div class='ctx'> 		 __func__, __LINE__, tmp.bus_type, tmp.dev_type, tmp.bus_index,</div><div class='ctx'> 		 tmp.dev_index, tmp.bus_id, tmp.dev_id);</div><div class='ctx'> 	*repo = tmp;</div><div class='hunk'>@@ -443,18 +443,18 @@ int __devinit ps3_repository_find_devices(enum ps3_bus_type bus_type,</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	struct ps3_repository_device repo;</div><div class='ctx'> </div><div class='del'>-	pr_debug(" -&gt; %s:%d: find bus_type %u\n", __func__, __LINE__, bus_type);</div><div class='add'>+	pr_devel(" -&gt; %s:%d: find bus_type %u\n", __func__, __LINE__, bus_type);</div><div class='ctx'> </div><div class='ctx'> 	repo.bus_type = bus_type;</div><div class='ctx'> 	result = ps3_repository_find_bus(repo.bus_type, 0, &amp;repo.bus_index);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_debug(" &lt;- %s:%u: bus not found\n", __func__, __LINE__);</div><div class='add'>+		pr_devel(" &lt;- %s:%u: bus not found\n", __func__, __LINE__);</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	result = ps3_repository_read_bus_id(repo.bus_index, &amp;repo.bus_id);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_debug("%s:%d read_bus_id(%u) failed\n", __func__, __LINE__,</div><div class='add'>+		pr_devel("%s:%d read_bus_id(%u) failed\n", __func__, __LINE__,</div><div class='ctx'> 			 repo.bus_index);</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -469,13 +469,13 @@ int __devinit ps3_repository_find_devices(enum ps3_bus_type bus_type,</div><div class='ctx'> </div><div class='ctx'> 		result = callback(&amp;repo);</div><div class='ctx'> 		if (result) {</div><div class='del'>-			pr_debug("%s:%d: abort at callback\n", __func__,</div><div class='add'>+			pr_devel("%s:%d: abort at callback\n", __func__,</div><div class='ctx'> 				__LINE__);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_debug(" &lt;- %s:%d\n", __func__, __LINE__);</div><div class='add'>+	pr_devel(" &lt;- %s:%d\n", __func__, __LINE__);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -489,7 +489,7 @@ int ps3_repository_find_bus(enum ps3_bus_type bus_type, unsigned int from,</div><div class='ctx'> 	for (i = from; i &lt; 10; i++) {</div><div class='ctx'> 		error = ps3_repository_read_bus_type(i, &amp;type);</div><div class='ctx'> 		if (error) {</div><div class='del'>-			pr_debug("%s:%d read_bus_type failed\n",</div><div class='add'>+			pr_devel("%s:%d read_bus_type failed\n",</div><div class='ctx'> 				__func__, __LINE__);</div><div class='ctx'> 			*bus_index = UINT_MAX;</div><div class='ctx'> 			return error;</div><div class='hunk'>@@ -509,7 +509,7 @@ int ps3_repository_find_interrupt(const struct ps3_repository_device *repo,</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	unsigned int res_index;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s:%d: find intr_type %u\n", __func__, __LINE__, intr_type);</div><div class='add'>+	pr_devel("%s:%d: find intr_type %u\n", __func__, __LINE__, intr_type);</div><div class='ctx'> </div><div class='ctx'> 	*interrupt_id = UINT_MAX;</div><div class='ctx'> </div><div class='hunk'>@@ -521,7 +521,7 @@ int ps3_repository_find_interrupt(const struct ps3_repository_device *repo,</div><div class='ctx'> 			repo-&gt;dev_index, res_index, &amp;t, &amp;id);</div><div class='ctx'> </div><div class='ctx'> 		if (result) {</div><div class='del'>-			pr_debug("%s:%d read_dev_intr failed\n",</div><div class='add'>+			pr_devel("%s:%d read_dev_intr failed\n",</div><div class='ctx'> 				__func__, __LINE__);</div><div class='ctx'> 			return result;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -535,7 +535,7 @@ int ps3_repository_find_interrupt(const struct ps3_repository_device *repo,</div><div class='ctx'> 	if (res_index == 10)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s:%d: found intr_type %u at res_index %u\n",</div><div class='add'>+	pr_devel("%s:%d: found intr_type %u at res_index %u\n",</div><div class='ctx'> 		__func__, __LINE__, intr_type, res_index);</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='hunk'>@@ -547,7 +547,7 @@ int ps3_repository_find_reg(const struct ps3_repository_device *repo,</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	unsigned int res_index;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s:%d: find reg_type %u\n", __func__, __LINE__, reg_type);</div><div class='add'>+	pr_devel("%s:%d: find reg_type %u\n", __func__, __LINE__, reg_type);</div><div class='ctx'> </div><div class='ctx'> 	*bus_addr = *len = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -560,7 +560,7 @@ int ps3_repository_find_reg(const struct ps3_repository_device *repo,</div><div class='ctx'> 			repo-&gt;dev_index, res_index, &amp;t, &amp;a, &amp;l);</div><div class='ctx'> </div><div class='ctx'> 		if (result) {</div><div class='del'>-			pr_debug("%s:%d read_dev_reg failed\n",</div><div class='add'>+			pr_devel("%s:%d read_dev_reg failed\n",</div><div class='ctx'> 				__func__, __LINE__);</div><div class='ctx'> 			return result;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -575,7 +575,7 @@ int ps3_repository_find_reg(const struct ps3_repository_device *repo,</div><div class='ctx'> 	if (res_index == 10)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s:%d: found reg_type %u at res_index %u\n",</div><div class='add'>+	pr_devel("%s:%d: found reg_type %u at res_index %u\n",</div><div class='ctx'> 		__func__, __LINE__, reg_type, res_index);</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='hunk'>@@ -1009,7 +1009,7 @@ int ps3_repository_dump_resource_info(const struct ps3_repository_device *repo)</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	unsigned int res_index;</div><div class='ctx'> </div><div class='del'>-	pr_debug(" -&gt; %s:%d: (%u:%u)\n", __func__, __LINE__,</div><div class='add'>+	pr_devel(" -&gt; %s:%d: (%u:%u)\n", __func__, __LINE__,</div><div class='ctx'> 		repo-&gt;bus_index, repo-&gt;dev_index);</div><div class='ctx'> </div><div class='ctx'> 	for (res_index = 0; res_index &lt; 10; res_index++) {</div><div class='hunk'>@@ -1021,13 +1021,13 @@ int ps3_repository_dump_resource_info(const struct ps3_repository_device *repo)</div><div class='ctx'> </div><div class='ctx'> 		if (result) {</div><div class='ctx'> 			if (result !=  LV1_NO_ENTRY)</div><div class='del'>-				pr_debug("%s:%d ps3_repository_read_dev_intr"</div><div class='add'>+				pr_devel("%s:%d ps3_repository_read_dev_intr"</div><div class='ctx'> 					" (%u:%u) failed\n", __func__, __LINE__,</div><div class='ctx'> 					repo-&gt;bus_index, repo-&gt;dev_index);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pr_debug("%s:%d (%u:%u) intr_type %u, interrupt_id %u\n",</div><div class='add'>+		pr_devel("%s:%d (%u:%u) intr_type %u, interrupt_id %u\n",</div><div class='ctx'> 			__func__, __LINE__, repo-&gt;bus_index, repo-&gt;dev_index,</div><div class='ctx'> 			intr_type, interrupt_id);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1042,18 +1042,18 @@ int ps3_repository_dump_resource_info(const struct ps3_repository_device *repo)</div><div class='ctx'> </div><div class='ctx'> 		if (result) {</div><div class='ctx'> 			if (result !=  LV1_NO_ENTRY)</div><div class='del'>-				pr_debug("%s:%d ps3_repository_read_dev_reg"</div><div class='add'>+				pr_devel("%s:%d ps3_repository_read_dev_reg"</div><div class='ctx'> 					" (%u:%u) failed\n", __func__, __LINE__,</div><div class='ctx'> 					repo-&gt;bus_index, repo-&gt;dev_index);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pr_debug("%s:%d (%u:%u) reg_type %u, bus_addr %lxh, len %lxh\n",</div><div class='add'>+		pr_devel("%s:%d (%u:%u) reg_type %u, bus_addr %llxh, len %llxh\n",</div><div class='ctx'> 			__func__, __LINE__, repo-&gt;bus_index, repo-&gt;dev_index,</div><div class='ctx'> 			reg_type, bus_addr, len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_debug(" &lt;- %s:%d\n", __func__, __LINE__);</div><div class='add'>+	pr_devel(" &lt;- %s:%d\n", __func__, __LINE__);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1063,22 +1063,22 @@ static int dump_stor_dev_info(struct ps3_repository_device *repo)</div><div class='ctx'> 	unsigned int num_regions, region_index;</div><div class='ctx'> 	u64 port, blk_size, num_blocks;</div><div class='ctx'> </div><div class='del'>-	pr_debug(" -&gt; %s:%d: (%u:%u)\n", __func__, __LINE__,</div><div class='add'>+	pr_devel(" -&gt; %s:%d: (%u:%u)\n", __func__, __LINE__,</div><div class='ctx'> 		repo-&gt;bus_index, repo-&gt;dev_index);</div><div class='ctx'> </div><div class='ctx'> 	result = ps3_repository_read_stor_dev_info(repo-&gt;bus_index,</div><div class='ctx'> 		repo-&gt;dev_index, &amp;port, &amp;blk_size, &amp;num_blocks, &amp;num_regions);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		pr_debug("%s:%d ps3_repository_read_stor_dev_info"</div><div class='add'>+		pr_devel("%s:%d ps3_repository_read_stor_dev_info"</div><div class='ctx'> 			" (%u:%u) failed\n", __func__, __LINE__,</div><div class='ctx'> 			repo-&gt;bus_index, repo-&gt;dev_index);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s:%d  (%u:%u): port %lu, blk_size %lu, num_blocks "</div><div class='del'>-		 "%lu, num_regions %u\n",</div><div class='del'>-		 __func__, __LINE__, repo-&gt;bus_index, repo-&gt;dev_index, port,</div><div class='del'>-		 blk_size, num_blocks, num_regions);</div><div class='add'>+	pr_devel("%s:%d  (%u:%u): port %llu, blk_size %llu, num_blocks "</div><div class='add'>+		 "%llu, num_regions %u\n",</div><div class='add'>+		 __func__, __LINE__, repo-&gt;bus_index, repo-&gt;dev_index,</div><div class='add'>+		port, blk_size, num_blocks, num_regions);</div><div class='ctx'> </div><div class='ctx'> 	for (region_index = 0; region_index &lt; num_regions; region_index++) {</div><div class='ctx'> 		unsigned int region_id;</div><div class='hunk'>@@ -1088,19 +1088,20 @@ static int dump_stor_dev_info(struct ps3_repository_device *repo)</div><div class='ctx'> 			repo-&gt;dev_index, region_index, &amp;region_id,</div><div class='ctx'> 			&amp;region_start, &amp;region_size);</div><div class='ctx'> 		if (result) {</div><div class='del'>-			 pr_debug("%s:%d ps3_repository_read_stor_dev_region"</div><div class='add'>+			 pr_devel("%s:%d ps3_repository_read_stor_dev_region"</div><div class='ctx'> 				  " (%u:%u) failed\n", __func__, __LINE__,</div><div class='ctx'> 				  repo-&gt;bus_index, repo-&gt;dev_index);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pr_debug("%s:%d (%u:%u) region_id %u, start %lxh, size %lxh\n",</div><div class='add'>+		pr_devel("%s:%d (%u:%u) region_id %u, start %lxh, size %lxh\n",</div><div class='ctx'> 			__func__, __LINE__, repo-&gt;bus_index, repo-&gt;dev_index,</div><div class='del'>-			region_id, region_start, region_size);</div><div class='add'>+			region_id, (unsigned long)region_start,</div><div class='add'>+			(unsigned long)region_size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	pr_debug(" &lt;- %s:%d\n", __func__, __LINE__);</div><div class='add'>+	pr_devel(" &lt;- %s:%d\n", __func__, __LINE__);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1109,7 +1110,7 @@ static int dump_device_info(struct ps3_repository_device *repo,</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='del'>-	pr_debug(" -&gt; %s:%d: bus_%u\n", __func__, __LINE__, repo-&gt;bus_index);</div><div class='add'>+	pr_devel(" -&gt; %s:%d: bus_%u\n", __func__, __LINE__, repo-&gt;bus_index);</div><div class='ctx'> </div><div class='ctx'> 	for (repo-&gt;dev_index = 0; repo-&gt;dev_index &lt; num_dev;</div><div class='ctx'> 		repo-&gt;dev_index++) {</div><div class='hunk'>@@ -1118,7 +1119,7 @@ static int dump_device_info(struct ps3_repository_device *repo,</div><div class='ctx'> 			repo-&gt;dev_index, &amp;repo-&gt;dev_type);</div><div class='ctx'> </div><div class='ctx'> 		if (result) {</div><div class='del'>-			pr_debug("%s:%d ps3_repository_read_dev_type"</div><div class='add'>+			pr_devel("%s:%d ps3_repository_read_dev_type"</div><div class='ctx'> 				" (%u:%u) failed\n", __func__, __LINE__,</div><div class='ctx'> 				repo-&gt;bus_index, repo-&gt;dev_index);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1128,15 +1129,15 @@ static int dump_device_info(struct ps3_repository_device *repo,</div><div class='ctx'> 			repo-&gt;dev_index, &amp;repo-&gt;dev_id);</div><div class='ctx'> </div><div class='ctx'> 		if (result) {</div><div class='del'>-			pr_debug("%s:%d ps3_repository_read_dev_id"</div><div class='add'>+			pr_devel("%s:%d ps3_repository_read_dev_id"</div><div class='ctx'> 				" (%u:%u) failed\n", __func__, __LINE__,</div><div class='ctx'> 				repo-&gt;bus_index, repo-&gt;dev_index);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pr_debug("%s:%d  (%u:%u): dev_type %u, dev_id %lu\n", __func__,</div><div class='add'>+		pr_devel("%s:%d  (%u:%u): dev_type %u, dev_id %lu\n", __func__,</div><div class='ctx'> 			__LINE__, repo-&gt;bus_index, repo-&gt;dev_index,</div><div class='del'>-			repo-&gt;dev_type, repo-&gt;dev_id);</div><div class='add'>+			repo-&gt;dev_type, (unsigned long)repo-&gt;dev_id);</div><div class='ctx'> </div><div class='ctx'> 		ps3_repository_dump_resource_info(repo);</div><div class='ctx'> </div><div class='hunk'>@@ -1144,7 +1145,7 @@ static int dump_device_info(struct ps3_repository_device *repo,</div><div class='ctx'> 			dump_stor_dev_info(repo);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_debug(" &lt;- %s:%d\n", __func__, __LINE__);</div><div class='add'>+	pr_devel(" &lt;- %s:%d\n", __func__, __LINE__);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1153,7 +1154,7 @@ int ps3_repository_dump_bus_info(void)</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	struct ps3_repository_device repo;</div><div class='ctx'> </div><div class='del'>-	pr_debug(" -&gt; %s:%d\n", __func__, __LINE__);</div><div class='add'>+	pr_devel(" -&gt; %s:%d\n", __func__, __LINE__);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;repo, 0, sizeof(repo));</div><div class='ctx'> </div><div class='hunk'>@@ -1164,7 +1165,7 @@ int ps3_repository_dump_bus_info(void)</div><div class='ctx'> 			&amp;repo.bus_type);</div><div class='ctx'> </div><div class='ctx'> 		if (result) {</div><div class='del'>-			pr_debug("%s:%d read_bus_type(%u) failed\n",</div><div class='add'>+			pr_devel("%s:%d read_bus_type(%u) failed\n",</div><div class='ctx'> 				__func__, __LINE__, repo.bus_index);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1173,32 +1174,32 @@ int ps3_repository_dump_bus_info(void)</div><div class='ctx'> 			&amp;repo.bus_id);</div><div class='ctx'> </div><div class='ctx'> 		if (result) {</div><div class='del'>-			pr_debug("%s:%d read_bus_id(%u) failed\n",</div><div class='add'>+			pr_devel("%s:%d read_bus_id(%u) failed\n",</div><div class='ctx'> 				__func__, __LINE__, repo.bus_index);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (repo.bus_index != repo.bus_id)</div><div class='del'>-			pr_debug("%s:%d bus_index != bus_id\n",</div><div class='add'>+			pr_devel("%s:%d bus_index != bus_id\n",</div><div class='ctx'> 				__func__, __LINE__);</div><div class='ctx'> </div><div class='ctx'> 		result = ps3_repository_read_bus_num_dev(repo.bus_index,</div><div class='ctx'> 			&amp;num_dev);</div><div class='ctx'> </div><div class='ctx'> 		if (result) {</div><div class='del'>-			pr_debug("%s:%d read_bus_num_dev(%u) failed\n",</div><div class='add'>+			pr_devel("%s:%d read_bus_num_dev(%u) failed\n",</div><div class='ctx'> 				__func__, __LINE__, repo.bus_index);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pr_debug("%s:%d bus_%u: bus_type %u, bus_id %lu, num_dev %u\n",</div><div class='add'>+		pr_devel("%s:%d bus_%u: bus_type %u, bus_id %lu, num_dev %u\n",</div><div class='ctx'> 			__func__, __LINE__, repo.bus_index, repo.bus_type,</div><div class='del'>-			repo.bus_id, num_dev);</div><div class='add'>+			(unsigned long)repo.bus_id, num_dev);</div><div class='ctx'> </div><div class='ctx'> 		dump_device_info(&amp;repo, num_dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_debug(" &lt;- %s:%d\n", __func__, __LINE__);</div><div class='add'>+	pr_devel(" &lt;- %s:%d\n", __func__, __LINE__);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c<br/>index e8ec1b2bfffd..2d664c5a83b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/ps3/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/ps3/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/ps3/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/ps3/setup.c</a></div><div class='hunk'>@@ -193,10 +193,12 @@ static int ps3_set_dabr(unsigned long dabr)</div><div class='ctx'> </div><div class='ctx'> static void __init ps3_setup_arch(void)</div><div class='ctx'> {</div><div class='add'>+	u64 tmp;</div><div class='ctx'> </div><div class='ctx'> 	DBG(" -&gt; %s:%d\n", __func__, __LINE__);</div><div class='ctx'> </div><div class='del'>-	lv1_get_version_info(&amp;ps3_firmware_version.raw);</div><div class='add'>+	lv1_get_version_info(&amp;ps3_firmware_version.raw, &amp;tmp);</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_INFO "PS3 firmware version %u.%u.%u\n",</div><div class='ctx'> 	       ps3_firmware_version.major, ps3_firmware_version.minor,</div><div class='ctx'> 	       ps3_firmware_version.rev);</div><div class='head'>diff --git a/arch/powerpc/platforms/ps3/smp.c b/arch/powerpc/platforms/ps3/smp.c<br/>index efc1cd8c034a..4b35166229fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/ps3/smp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/ps3/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/ps3/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/ps3/smp.c</a></div><div class='hunk'>@@ -57,7 +57,7 @@ static void ps3_smp_message_pass(int cpu, int msg)</div><div class='ctx'> 			" (%d)\n", __func__, __LINE__, cpu, msg, result);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ps3_smp_probe(void)</div><div class='add'>+static int __init ps3_smp_probe(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c<br/>index 451fad1c92a8..e17fa1432d80 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/ps3/spu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/ps3/spu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/ps3/spu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/ps3/spu.c</a></div><div class='hunk'>@@ -154,7 +154,7 @@ static unsigned long get_vas_id(void)</div><div class='ctx'> 	u64 id;</div><div class='ctx'> </div><div class='ctx'> 	lv1_get_logical_ppe_id(&amp;id);</div><div class='del'>-	lv1_get_virtual_address_space_id_of_ppe(id, &amp;id);</div><div class='add'>+	lv1_get_virtual_address_space_id_of_ppe(&amp;id);</div><div class='ctx'> </div><div class='ctx'> 	return id;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig<br/>index c81f6bb9c10f..ae7b6d41fed3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/pseries/Kconfig</a></div><div class='hunk'>@@ -120,3 +120,12 @@ config DTL</div><div class='ctx'> 	  which are accessible through a debugfs file.</div><div class='ctx'> </div><div class='ctx'> 	  Say N if you are unsure.</div><div class='add'>+</div><div class='add'>+config PSERIES_IDLE</div><div class='add'>+	tristate "Cpuidle driver for pSeries platforms"</div><div class='add'>+	depends on CPU_IDLE</div><div class='add'>+	depends on PPC_PSERIES</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Select this option to enable processor idle state management</div><div class='add'>+	  through cpuidle subsystem.</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile<br/>index 3556e402cbf5..236db46b4078 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/pseries/Makefile</a></div><div class='hunk'>@@ -22,6 +22,7 @@ obj-$(CONFIG_PHYP_DUMP)		+= phyp_dump.o</div><div class='ctx'> obj-$(CONFIG_CMM)		+= cmm.o</div><div class='ctx'> obj-$(CONFIG_DTL)		+= dtl.o</div><div class='ctx'> obj-$(CONFIG_IO_EVENT_IRQ)	+= io_event_irq.o</div><div class='add'>+obj-$(CONFIG_PSERIES_IDLE)	+= processor_idle.o</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_PPC_PSERIES),y)</div><div class='ctx'> obj-$(CONFIG_SUSPEND)		+= suspend.o</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c<br/>index 3cafc306b971..c638535753df 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/cmm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/cmm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/cmm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/pseries/cmm.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/stringify.h&gt;</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='ctx'> #include &lt;asm/hvcall.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='hunk'>@@ -65,7 +65,7 @@ static unsigned int oom_kb = CMM_OOM_KB;</div><div class='ctx'> static unsigned int cmm_debug = CMM_DEBUG;</div><div class='ctx'> static unsigned int cmm_disabled = CMM_DISABLE;</div><div class='ctx'> static unsigned long min_mem_mb = CMM_MIN_MEM_MB;</div><div class='del'>-static struct sys_device cmm_sysdev;</div><div class='add'>+static struct device cmm_dev;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Brian King &lt;brking@linux.vnet.ibm.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("IBM System p Collaborative Memory Manager");</div><div class='hunk'>@@ -347,25 +347,25 @@ static int cmm_thread(void *dummy)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define CMM_SHOW(name, format, args...)			\</div><div class='del'>-	static ssize_t show_##name(struct sys_device *dev,	\</div><div class='del'>-				   struct sysdev_attribute *attr,	\</div><div class='add'>+	static ssize_t show_##name(struct device *dev,	\</div><div class='add'>+				   struct device_attribute *attr,	\</div><div class='ctx'> 				   char *buf)			\</div><div class='ctx'> 	{							\</div><div class='ctx'> 		return sprintf(buf, format, ##args);		\</div><div class='ctx'> 	}							\</div><div class='del'>-	static SYSDEV_ATTR(name, S_IRUGO, show_##name, NULL)</div><div class='add'>+	static DEVICE_ATTR(name, S_IRUGO, show_##name, NULL)</div><div class='ctx'> </div><div class='ctx'> CMM_SHOW(loaned_kb, "%lu\n", PAGES2KB(loaned_pages));</div><div class='ctx'> CMM_SHOW(loaned_target_kb, "%lu\n", PAGES2KB(loaned_pages_target));</div><div class='ctx'> </div><div class='del'>-static ssize_t show_oom_pages(struct sys_device *dev,</div><div class='del'>-			      struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_oom_pages(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%lu\n", PAGES2KB(oom_freed_pages));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_oom_pages(struct sys_device *dev,</div><div class='del'>-			       struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t store_oom_pages(struct device *dev,</div><div class='add'>+			       struct device_attribute *attr,</div><div class='ctx'> 			       const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long val = simple_strtoul (buf, NULL, 10);</div><div class='hunk'>@@ -379,17 +379,18 @@ static ssize_t store_oom_pages(struct sys_device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(oom_freed_kb, S_IWUSR| S_IRUGO,</div><div class='add'>+static DEVICE_ATTR(oom_freed_kb, S_IWUSR | S_IRUGO,</div><div class='ctx'> 		   show_oom_pages, store_oom_pages);</div><div class='ctx'> </div><div class='del'>-static struct sysdev_attribute *cmm_attrs[] = {</div><div class='del'>-	&amp;attr_loaned_kb,</div><div class='del'>-	&amp;attr_loaned_target_kb,</div><div class='del'>-	&amp;attr_oom_freed_kb,</div><div class='add'>+static struct device_attribute *cmm_attrs[] = {</div><div class='add'>+	&amp;dev_attr_loaned_kb,</div><div class='add'>+	&amp;dev_attr_loaned_target_kb,</div><div class='add'>+	&amp;dev_attr_oom_freed_kb,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class cmm_sysdev_class = {</div><div class='add'>+static struct bus_type cmm_subsys = {</div><div class='ctx'> 	.name = "cmm",</div><div class='add'>+	.dev_name = "cmm",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -398,21 +399,21 @@ static struct sysdev_class cmm_sysdev_class = {</div><div class='ctx'>  * Return value:</div><div class='ctx'>  * 	0 on success / other on failure</div><div class='ctx'>  **/</div><div class='del'>-static int cmm_sysfs_register(struct sys_device *sysdev)</div><div class='add'>+static int cmm_sysfs_register(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i, rc;</div><div class='ctx'> </div><div class='del'>-	if ((rc = sysdev_class_register(&amp;cmm_sysdev_class)))</div><div class='add'>+	if ((rc = subsys_system_register(&amp;cmm_subsys, NULL)))</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	sysdev-&gt;id = 0;</div><div class='del'>-	sysdev-&gt;cls = &amp;cmm_sysdev_class;</div><div class='add'>+	dev-&gt;id = 0;</div><div class='add'>+	dev-&gt;bus = &amp;cmm_subsys;</div><div class='ctx'> </div><div class='del'>-	if ((rc = sysdev_register(sysdev)))</div><div class='del'>-		goto class_unregister;</div><div class='add'>+	if ((rc = device_register(dev)))</div><div class='add'>+		goto subsys_unregister;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(cmm_attrs); i++) {</div><div class='del'>-		if ((rc = sysdev_create_file(sysdev, cmm_attrs[i])))</div><div class='add'>+		if ((rc = device_create_file(dev, cmm_attrs[i])))</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -420,10 +421,10 @@ static int cmm_sysfs_register(struct sys_device *sysdev)</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='ctx'> 	while (--i &gt;= 0)</div><div class='del'>-		sysdev_remove_file(sysdev, cmm_attrs[i]);</div><div class='del'>-	sysdev_unregister(sysdev);</div><div class='del'>-class_unregister:</div><div class='del'>-	sysdev_class_unregister(&amp;cmm_sysdev_class);</div><div class='add'>+		device_remove_file(dev, cmm_attrs[i]);</div><div class='add'>+	device_unregister(dev);</div><div class='add'>+subsys_unregister:</div><div class='add'>+	bus_unregister(&amp;cmm_subsys);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -431,14 +432,14 @@ class_unregister:</div><div class='ctx'>  * cmm_unregister_sysfs - Unregister from sysfs</div><div class='ctx'>  *</div><div class='ctx'>  **/</div><div class='del'>-static void cmm_unregister_sysfs(struct sys_device *sysdev)</div><div class='add'>+static void cmm_unregister_sysfs(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(cmm_attrs); i++)</div><div class='del'>-		sysdev_remove_file(sysdev, cmm_attrs[i]);</div><div class='del'>-	sysdev_unregister(sysdev);</div><div class='del'>-	sysdev_class_unregister(&amp;cmm_sysdev_class);</div><div class='add'>+		device_remove_file(dev, cmm_attrs[i]);</div><div class='add'>+	device_unregister(dev);</div><div class='add'>+	bus_unregister(&amp;cmm_subsys);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -657,7 +658,7 @@ static int cmm_init(void)</div><div class='ctx'> 	if ((rc = register_reboot_notifier(&amp;cmm_reboot_nb)))</div><div class='ctx'> 		goto out_oom_notifier;</div><div class='ctx'> </div><div class='del'>-	if ((rc = cmm_sysfs_register(&amp;cmm_sysdev)))</div><div class='add'>+	if ((rc = cmm_sysfs_register(&amp;cmm_dev)))</div><div class='ctx'> 		goto out_reboot_notifier;</div><div class='ctx'> </div><div class='ctx'> 	if (register_memory_notifier(&amp;cmm_mem_nb) ||</div><div class='hunk'>@@ -678,7 +679,7 @@ static int cmm_init(void)</div><div class='ctx'> out_unregister_notifier:</div><div class='ctx'> 	unregister_memory_notifier(&amp;cmm_mem_nb);</div><div class='ctx'> 	unregister_memory_isolate_notifier(&amp;cmm_mem_isolate_nb);</div><div class='del'>-	cmm_unregister_sysfs(&amp;cmm_sysdev);</div><div class='add'>+	cmm_unregister_sysfs(&amp;cmm_dev);</div><div class='ctx'> out_reboot_notifier:</div><div class='ctx'> 	unregister_reboot_notifier(&amp;cmm_reboot_nb);</div><div class='ctx'> out_oom_notifier:</div><div class='hunk'>@@ -701,7 +702,7 @@ static void cmm_exit(void)</div><div class='ctx'> 	unregister_memory_notifier(&amp;cmm_mem_nb);</div><div class='ctx'> 	unregister_memory_isolate_notifier(&amp;cmm_mem_isolate_nb);</div><div class='ctx'> 	cmm_free_pages(loaned_pages);</div><div class='del'>-	cmm_unregister_sysfs(&amp;cmm_sysdev);</div><div class='add'>+	cmm_unregister_sysfs(&amp;cmm_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/hvCall.S b/arch/powerpc/platforms/pseries/hvCall.S<br/>index fd05fdee576a..3ce73d0052b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/hvCall.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/hvCall.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/hvCall.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/pseries/hvCall.S</a></div><div class='hunk'>@@ -36,6 +36,7 @@ BEGIN_FTR_SECTION;						\</div><div class='ctx'> 	b	1f;						\</div><div class='ctx'> END_FTR_SECTION(0, 1);						\</div><div class='ctx'> 	ld      r12,hcall_tracepoint_refcount@toc(r2);		\</div><div class='add'>+	std	r12,32(r1);					\</div><div class='ctx'> 	cmpdi	r12,0;						\</div><div class='ctx'> 	beq+	1f;						\</div><div class='ctx'> 	mflr	r0;						\</div><div class='hunk'>@@ -74,7 +75,7 @@ END_FTR_SECTION(0, 1);						\</div><div class='ctx'> BEGIN_FTR_SECTION;						\</div><div class='ctx'> 	b	1f;						\</div><div class='ctx'> END_FTR_SECTION(0, 1);						\</div><div class='del'>-	ld      r12,hcall_tracepoint_refcount@toc(r2);		\</div><div class='add'>+	ld      r12,32(r1);					\</div><div class='ctx'> 	cmpdi	r12,0;						\</div><div class='ctx'> 	beq+	1f;						\</div><div class='ctx'> 	mflr	r0;						\</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/hvCall_inst.c b/arch/powerpc/platforms/pseries/hvCall_inst.c<br/>index f106662f4381..c9311cfdfcac 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/hvCall_inst.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/hvCall_inst.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/hvCall_inst.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/pseries/hvCall_inst.c</a></div><div class='hunk'>@@ -109,7 +109,7 @@ static void probe_hcall_entry(void *ignored, unsigned long opcode, unsigned long</div><div class='ctx'> 	if (opcode &gt; MAX_HCALL_OPCODE)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	h = &amp;get_cpu_var(hcall_stats)[opcode / 4];</div><div class='add'>+	h = &amp;__get_cpu_var(hcall_stats)[opcode / 4];</div><div class='ctx'> 	h-&gt;tb_start = mftb();</div><div class='ctx'> 	h-&gt;purr_start = mfspr(SPRN_PURR);</div><div class='ctx'> }</div><div class='hunk'>@@ -126,8 +126,6 @@ static void probe_hcall_exit(void *ignored, unsigned long opcode, unsigned long</div><div class='ctx'> 	h-&gt;num_calls++;</div><div class='ctx'> 	h-&gt;tb_total += mftb() - h-&gt;tb_start;</div><div class='ctx'> 	h-&gt;purr_total += mfspr(SPRN_PURR) - h-&gt;purr_start;</div><div class='del'>-</div><div class='del'>-	put_cpu_var(hcall_stats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init hcall_inst_init(void)</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c<br/>index b719d9709730..c442f2b1980f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/iommu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/iommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/iommu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/pseries/iommu.c</a></div><div class='hunk'>@@ -52,13 +52,42 @@</div><div class='ctx'> #include "plpar_wrappers.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+static void tce_invalidate_pSeries_sw(struct iommu_table *tbl,</div><div class='add'>+				      u64 *startp, u64 *endp)</div><div class='add'>+{</div><div class='add'>+	u64 __iomem *invalidate = (u64 __iomem *)tbl-&gt;it_index;</div><div class='add'>+	unsigned long start, end, inc;</div><div class='add'>+</div><div class='add'>+	start = __pa(startp);</div><div class='add'>+	end = __pa(endp);</div><div class='add'>+	inc = L1_CACHE_BYTES; /* invalidate a cacheline of TCEs at a time */</div><div class='add'>+</div><div class='add'>+	/* If this is non-zero, change the format.  We shift the</div><div class='add'>+	 * address and or in the magic from the device tree. */</div><div class='add'>+	if (tbl-&gt;it_busno) {</div><div class='add'>+		start &lt;&lt;= 12;</div><div class='add'>+		end &lt;&lt;= 12;</div><div class='add'>+		inc &lt;&lt;= 12;</div><div class='add'>+		start |= tbl-&gt;it_busno;</div><div class='add'>+		end |= tbl-&gt;it_busno;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	end |= inc - 1; /* round up end to be different than start */</div><div class='add'>+</div><div class='add'>+	mb(); /* Make sure TCEs in memory are written */</div><div class='add'>+	while (start &lt;= end) {</div><div class='add'>+		out_be64(invalidate, start);</div><div class='add'>+		start += inc;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int tce_build_pSeries(struct iommu_table *tbl, long index,</div><div class='ctx'> 			      long npages, unsigned long uaddr,</div><div class='ctx'> 			      enum dma_data_direction direction,</div><div class='ctx'> 			      struct dma_attrs *attrs)</div><div class='ctx'> {</div><div class='ctx'> 	u64 proto_tce;</div><div class='del'>-	u64 *tcep;</div><div class='add'>+	u64 *tcep, *tces;</div><div class='ctx'> 	u64 rpn;</div><div class='ctx'> </div><div class='ctx'> 	proto_tce = TCE_PCI_READ; // Read allowed</div><div class='hunk'>@@ -66,7 +95,7 @@ static int tce_build_pSeries(struct iommu_table *tbl, long index,</div><div class='ctx'> 	if (direction != DMA_TO_DEVICE)</div><div class='ctx'> 		proto_tce |= TCE_PCI_WRITE;</div><div class='ctx'> </div><div class='del'>-	tcep = ((u64 *)tbl-&gt;it_base) + index;</div><div class='add'>+	tces = tcep = ((u64 *)tbl-&gt;it_base) + index;</div><div class='ctx'> </div><div class='ctx'> 	while (npages--) {</div><div class='ctx'> 		/* can't move this out since we might cross MEMBLOCK boundary */</div><div class='hunk'>@@ -76,18 +105,24 @@ static int tce_build_pSeries(struct iommu_table *tbl, long index,</div><div class='ctx'> 		uaddr += TCE_PAGE_SIZE;</div><div class='ctx'> 		tcep++;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (tbl-&gt;it_type == TCE_PCI_SWINV_CREATE)</div><div class='add'>+		tce_invalidate_pSeries_sw(tbl, tces, tcep - 1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void tce_free_pSeries(struct iommu_table *tbl, long index, long npages)</div><div class='ctx'> {</div><div class='del'>-	u64 *tcep;</div><div class='add'>+	u64 *tcep, *tces;</div><div class='ctx'> </div><div class='del'>-	tcep = ((u64 *)tbl-&gt;it_base) + index;</div><div class='add'>+	tces = tcep = ((u64 *)tbl-&gt;it_base) + index;</div><div class='ctx'> </div><div class='ctx'> 	while (npages--)</div><div class='ctx'> 		*(tcep++) = 0;</div><div class='add'>+</div><div class='add'>+	if (tbl-&gt;it_type == TCE_PCI_SWINV_FREE)</div><div class='add'>+		tce_invalidate_pSeries_sw(tbl, tces, tcep - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long tce_get_pseries(struct iommu_table *tbl, long index)</div><div class='hunk'>@@ -425,7 +460,7 @@ static void iommu_table_setparms(struct pci_controller *phb,</div><div class='ctx'> 				 struct iommu_table *tbl)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *node;</div><div class='del'>-	const unsigned long *basep;</div><div class='add'>+	const unsigned long *basep, *sw_inval;</div><div class='ctx'> 	const u32 *sizep;</div><div class='ctx'> </div><div class='ctx'> 	node = phb-&gt;dn;</div><div class='hunk'>@@ -462,6 +497,22 @@ static void iommu_table_setparms(struct pci_controller *phb,</div><div class='ctx'> 	tbl-&gt;it_index = 0;</div><div class='ctx'> 	tbl-&gt;it_blocksize = 16;</div><div class='ctx'> 	tbl-&gt;it_type = TCE_PCI;</div><div class='add'>+</div><div class='add'>+	sw_inval = of_get_property(node, "linux,tce-sw-invalidate-info", NULL);</div><div class='add'>+	if (sw_inval) {</div><div class='add'>+		/*</div><div class='add'>+		 * This property contains information on how to</div><div class='add'>+		 * invalidate the TCE entry.  The first property is</div><div class='add'>+		 * the base MMIO address used to invalidate entries.</div><div class='add'>+		 * The second property tells us the format of the TCE</div><div class='add'>+		 * invalidate (whether it needs to be shifted) and</div><div class='add'>+		 * some magic routing info to add to our invalidate</div><div class='add'>+		 * command.</div><div class='add'>+		 */</div><div class='add'>+		tbl-&gt;it_index = (unsigned long) ioremap(sw_inval[0], 8);</div><div class='add'>+		tbl-&gt;it_busno = sw_inval[1]; /* overload this with magic */</div><div class='add'>+		tbl-&gt;it_type = TCE_PCI_SWINV_CREATE | TCE_PCI_SWINV_FREE;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c<br/>index 52d429be6c76..7bc73af6c7b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/lpar.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/lpar.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/lpar.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/pseries/lpar.c</a></div><div class='hunk'>@@ -546,6 +546,13 @@ void __trace_hcall_entry(unsigned long opcode, unsigned long *args)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned int *depth;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * We cannot call tracepoints inside RCU idle regions which</div><div class='add'>+	 * means we must not trace H_CEDE.</div><div class='add'>+	 */</div><div class='add'>+	if (opcode == H_CEDE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> </div><div class='ctx'> 	depth = &amp;__get_cpu_var(hcall_trace_depth);</div><div class='hunk'>@@ -554,9 +561,8 @@ void __trace_hcall_entry(unsigned long opcode, unsigned long *args)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	(*depth)++;</div><div class='add'>+	preempt_disable();</div><div class='ctx'> 	trace_hcall_entry(opcode, args);</div><div class='del'>-	if (opcode == H_CEDE)</div><div class='del'>-		rcu_idle_enter();</div><div class='ctx'> 	(*depth)--;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -569,6 +575,9 @@ void __trace_hcall_exit(long opcode, unsigned long retval,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned int *depth;</div><div class='ctx'> </div><div class='add'>+	if (opcode == H_CEDE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> </div><div class='ctx'> 	depth = &amp;__get_cpu_var(hcall_trace_depth);</div><div class='hunk'>@@ -577,9 +586,8 @@ void __trace_hcall_exit(long opcode, unsigned long retval,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	(*depth)++;</div><div class='del'>-	if (opcode == H_CEDE)</div><div class='del'>-		rcu_idle_exit();</div><div class='ctx'> 	trace_hcall_exit(opcode, retval, retbuf);</div><div class='add'>+	preempt_enable();</div><div class='ctx'> 	(*depth)--;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c<br/>index a76b22844d18..36f957f31842 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/nvram.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/nvram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/nvram.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/pseries/nvram.c</a></div><div class='hunk'>@@ -625,6 +625,8 @@ static void oops_to_nvram(struct kmsg_dumper *dumper,</div><div class='ctx'> {</div><div class='ctx'> 	static unsigned int oops_count = 0;</div><div class='ctx'> 	static bool panicking = false;</div><div class='add'>+	static DEFINE_SPINLOCK(lock);</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	size_t text_len;</div><div class='ctx'> 	unsigned int err_type = ERR_TYPE_KERNEL_PANIC_GZ;</div><div class='ctx'> 	int rc = -1;</div><div class='hunk'>@@ -636,7 +638,6 @@ static void oops_to_nvram(struct kmsg_dumper *dumper,</div><div class='ctx'> 		/* These are almost always orderly shutdowns. */</div><div class='ctx'> 		return;</div><div class='ctx'> 	case KMSG_DUMP_OOPS:</div><div class='del'>-	case KMSG_DUMP_KEXEC:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case KMSG_DUMP_PANIC:</div><div class='ctx'> 		panicking = true;</div><div class='hunk'>@@ -655,6 +656,9 @@ static void oops_to_nvram(struct kmsg_dumper *dumper,</div><div class='ctx'> 	if (clobbering_unread_rtas_event())</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (!spin_trylock_irqsave(&amp;lock, flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (big_oops_buf) {</div><div class='ctx'> 		text_len = capture_last_msgs(old_msgs, old_len,</div><div class='ctx'> 			new_msgs, new_len, big_oops_buf, big_oops_buf_sz);</div><div class='hunk'>@@ -670,4 +674,6 @@ static void oops_to_nvram(struct kmsg_dumper *dumper,</div><div class='ctx'> </div><div class='ctx'> 	(void) nvram_write_os_partition(&amp;oops_log_partition, oops_buf,</div><div class='ctx'> 		(int) (sizeof(*oops_len) + *oops_len), err_type, ++oops_count);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;lock, flags);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/processor_idle.c b/arch/powerpc/platforms/pseries/processor_idle.c<br/>new file mode 100644<br/>index 000000000000..085fd3f45ad2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/processor_idle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/pseries/processor_idle.c</a></div><div class='hunk'>@@ -0,0 +1,329 @@</div><div class='add'>+/*</div><div class='add'>+ *  processor_idle - idle state cpuidle driver.</div><div class='add'>+ *  Adapted from drivers/idle/intel_idle.c and</div><div class='add'>+ *  drivers/acpi/processor_idle.c</div><div class='add'>+ *</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/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/cpuidle.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/paca.h&gt;</div><div class='add'>+#include &lt;asm/reg.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/firmware.h&gt;</div><div class='add'>+</div><div class='add'>+#include "plpar_wrappers.h"</div><div class='add'>+#include "pseries.h"</div><div class='add'>+</div><div class='add'>+struct cpuidle_driver pseries_idle_driver = {</div><div class='add'>+	.name =		"pseries_idle",</div><div class='add'>+	.owner =	THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MAX_IDLE_STATE_COUNT	2</div><div class='add'>+</div><div class='add'>+static int max_idle_state = MAX_IDLE_STATE_COUNT - 1;</div><div class='add'>+static struct cpuidle_device __percpu *pseries_cpuidle_devices;</div><div class='add'>+static struct cpuidle_state *cpuidle_state_table;</div><div class='add'>+</div><div class='add'>+void update_smt_snooze_delay(int snooze)</div><div class='add'>+{</div><div class='add'>+	struct cpuidle_driver *drv = cpuidle_get_driver();</div><div class='add'>+	if (drv)</div><div class='add'>+		drv-&gt;states[0].target_residency = snooze;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void idle_loop_prolog(unsigned long *in_purr, ktime_t *kt_before)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	*kt_before = ktime_get_real();</div><div class='add'>+	*in_purr = mfspr(SPRN_PURR);</div><div class='add'>+	/*</div><div class='add'>+	 * Indicate to the HV that we are idle. Now would be</div><div class='add'>+	 * a good time to find other work to dispatch.</div><div class='add'>+	 */</div><div class='add'>+	get_lppaca()-&gt;idle = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline  s64 idle_loop_epilog(unsigned long in_purr, ktime_t kt_before)</div><div class='add'>+{</div><div class='add'>+	get_lppaca()-&gt;wait_state_cycles += mfspr(SPRN_PURR) - in_purr;</div><div class='add'>+	get_lppaca()-&gt;idle = 0;</div><div class='add'>+</div><div class='add'>+	return ktime_to_us(ktime_sub(ktime_get_real(), kt_before));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snooze_loop(struct cpuidle_device *dev,</div><div class='add'>+			struct cpuidle_driver *drv,</div><div class='add'>+			int index)</div><div class='add'>+{</div><div class='add'>+	unsigned long in_purr;</div><div class='add'>+	ktime_t kt_before;</div><div class='add'>+	unsigned long start_snooze;</div><div class='add'>+	long snooze = drv-&gt;states[0].target_residency;</div><div class='add'>+</div><div class='add'>+	idle_loop_prolog(&amp;in_purr, &amp;kt_before);</div><div class='add'>+</div><div class='add'>+	if (snooze) {</div><div class='add'>+		start_snooze = get_tb() + snooze * tb_ticks_per_usec;</div><div class='add'>+		local_irq_enable();</div><div class='add'>+		set_thread_flag(TIF_POLLING_NRFLAG);</div><div class='add'>+</div><div class='add'>+		while ((snooze &lt; 0) || (get_tb() &lt; start_snooze)) {</div><div class='add'>+			if (need_resched() || cpu_is_offline(dev-&gt;cpu))</div><div class='add'>+				goto out;</div><div class='add'>+			ppc64_runlatch_off();</div><div class='add'>+			HMT_low();</div><div class='add'>+			HMT_very_low();</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		HMT_medium();</div><div class='add'>+		clear_thread_flag(TIF_POLLING_NRFLAG);</div><div class='add'>+		smp_mb();</div><div class='add'>+		local_irq_disable();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	HMT_medium();</div><div class='add'>+	dev-&gt;last_residency =</div><div class='add'>+		(int)idle_loop_epilog(in_purr, kt_before);</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dedicated_cede_loop(struct cpuidle_device *dev,</div><div class='add'>+				struct cpuidle_driver *drv,</div><div class='add'>+				int index)</div><div class='add'>+{</div><div class='add'>+	unsigned long in_purr;</div><div class='add'>+	ktime_t kt_before;</div><div class='add'>+</div><div class='add'>+	idle_loop_prolog(&amp;in_purr, &amp;kt_before);</div><div class='add'>+	get_lppaca()-&gt;donate_dedicated_cpu = 1;</div><div class='add'>+</div><div class='add'>+	ppc64_runlatch_off();</div><div class='add'>+	HMT_medium();</div><div class='add'>+	cede_processor();</div><div class='add'>+</div><div class='add'>+	get_lppaca()-&gt;donate_dedicated_cpu = 0;</div><div class='add'>+	dev-&gt;last_residency =</div><div class='add'>+		(int)idle_loop_epilog(in_purr, kt_before);</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int shared_cede_loop(struct cpuidle_device *dev,</div><div class='add'>+			struct cpuidle_driver *drv,</div><div class='add'>+			int index)</div><div class='add'>+{</div><div class='add'>+	unsigned long in_purr;</div><div class='add'>+	ktime_t kt_before;</div><div class='add'>+</div><div class='add'>+	idle_loop_prolog(&amp;in_purr, &amp;kt_before);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Yield the processor to the hypervisor.  We return if</div><div class='add'>+	 * an external interrupt occurs (which are driven prior</div><div class='add'>+	 * to returning here) or if a prod occurs from another</div><div class='add'>+	 * processor. When returning here, external interrupts</div><div class='add'>+	 * are enabled.</div><div class='add'>+	 */</div><div class='add'>+	cede_processor();</div><div class='add'>+</div><div class='add'>+	dev-&gt;last_residency =</div><div class='add'>+		(int)idle_loop_epilog(in_purr, kt_before);</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * States for dedicated partition case.</div><div class='add'>+ */</div><div class='add'>+static struct cpuidle_state dedicated_states[MAX_IDLE_STATE_COUNT] = {</div><div class='add'>+	{ /* Snooze */</div><div class='add'>+		.name = "snooze",</div><div class='add'>+		.desc = "snooze",</div><div class='add'>+		.flags = CPUIDLE_FLAG_TIME_VALID,</div><div class='add'>+		.exit_latency = 0,</div><div class='add'>+		.target_residency = 0,</div><div class='add'>+		.enter = &amp;snooze_loop },</div><div class='add'>+	{ /* CEDE */</div><div class='add'>+		.name = "CEDE",</div><div class='add'>+		.desc = "CEDE",</div><div class='add'>+		.flags = CPUIDLE_FLAG_TIME_VALID,</div><div class='add'>+		.exit_latency = 1,</div><div class='add'>+		.target_residency = 10,</div><div class='add'>+		.enter = &amp;dedicated_cede_loop },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * States for shared partition case.</div><div class='add'>+ */</div><div class='add'>+static struct cpuidle_state shared_states[MAX_IDLE_STATE_COUNT] = {</div><div class='add'>+	{ /* Shared Cede */</div><div class='add'>+		.name = "Shared Cede",</div><div class='add'>+		.desc = "Shared Cede",</div><div class='add'>+		.flags = CPUIDLE_FLAG_TIME_VALID,</div><div class='add'>+		.exit_latency = 0,</div><div class='add'>+		.target_residency = 0,</div><div class='add'>+		.enter = &amp;shared_cede_loop },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int pseries_notify_cpuidle_add_cpu(int cpu)</div><div class='add'>+{</div><div class='add'>+	struct cpuidle_device *dev =</div><div class='add'>+			per_cpu_ptr(pseries_cpuidle_devices, cpu);</div><div class='add'>+	if (dev &amp;&amp; cpuidle_get_driver()) {</div><div class='add'>+		cpuidle_disable_device(dev);</div><div class='add'>+		cpuidle_enable_device(dev);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * pseries_cpuidle_driver_init()</div><div class='add'>+ */</div><div class='add'>+static int pseries_cpuidle_driver_init(void)</div><div class='add'>+{</div><div class='add'>+	int idle_state;</div><div class='add'>+	struct cpuidle_driver *drv = &amp;pseries_idle_driver;</div><div class='add'>+</div><div class='add'>+	drv-&gt;state_count = 0;</div><div class='add'>+</div><div class='add'>+	for (idle_state = 0; idle_state &lt; MAX_IDLE_STATE_COUNT; ++idle_state) {</div><div class='add'>+</div><div class='add'>+		if (idle_state &gt; max_idle_state)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* is the state not enabled? */</div><div class='add'>+		if (cpuidle_state_table[idle_state].enter == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		drv-&gt;states[drv-&gt;state_count] =	/* structure copy */</div><div class='add'>+			cpuidle_state_table[idle_state];</div><div class='add'>+</div><div class='add'>+		if (cpuidle_state_table == dedicated_states)</div><div class='add'>+			drv-&gt;states[drv-&gt;state_count].target_residency =</div><div class='add'>+				__get_cpu_var(smt_snooze_delay);</div><div class='add'>+</div><div class='add'>+		drv-&gt;state_count += 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'>+/* pseries_idle_devices_uninit(void)</div><div class='add'>+ * unregister cpuidle devices and de-allocate memory</div><div class='add'>+ */</div><div class='add'>+static void pseries_idle_devices_uninit(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct cpuidle_device *dev;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		dev = per_cpu_ptr(pseries_cpuidle_devices, i);</div><div class='add'>+		cpuidle_unregister_device(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	free_percpu(pseries_cpuidle_devices);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* pseries_idle_devices_init()</div><div class='add'>+ * allocate, initialize and register cpuidle device</div><div class='add'>+ */</div><div class='add'>+static int pseries_idle_devices_init(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct cpuidle_driver *drv = &amp;pseries_idle_driver;</div><div class='add'>+	struct cpuidle_device *dev;</div><div class='add'>+</div><div class='add'>+	pseries_cpuidle_devices = alloc_percpu(struct cpuidle_device);</div><div class='add'>+	if (pseries_cpuidle_devices == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		dev = per_cpu_ptr(pseries_cpuidle_devices, i);</div><div class='add'>+		dev-&gt;state_count = drv-&gt;state_count;</div><div class='add'>+		dev-&gt;cpu = i;</div><div class='add'>+		if (cpuidle_register_device(dev)) {</div><div class='add'>+			printk(KERN_DEBUG \</div><div class='add'>+				"cpuidle_register_device %d failed!\n", i);</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'>+ * pseries_idle_probe()</div><div class='add'>+ * Choose state table for shared versus dedicated partition</div><div class='add'>+ */</div><div class='add'>+static int pseries_idle_probe(void)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (!firmware_has_feature(FW_FEATURE_SPLPAR))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (cpuidle_disable != IDLE_NO_OVERRIDE)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (max_idle_state == 0) {</div><div class='add'>+		printk(KERN_DEBUG "pseries processor idle disabled.\n");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (get_lppaca()-&gt;shared_proc)</div><div class='add'>+		cpuidle_state_table = shared_states;</div><div class='add'>+	else</div><div class='add'>+		cpuidle_state_table = dedicated_states;</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 pseries_processor_idle_init(void)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	retval = pseries_idle_probe();</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	pseries_cpuidle_driver_init();</div><div class='add'>+	retval = cpuidle_register_driver(&amp;pseries_idle_driver);</div><div class='add'>+	if (retval) {</div><div class='add'>+		printk(KERN_DEBUG "Registration of pseries driver failed.\n");</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = pseries_idle_devices_init();</div><div class='add'>+	if (retval) {</div><div class='add'>+		pseries_idle_devices_uninit();</div><div class='add'>+		cpuidle_unregister_driver(&amp;pseries_idle_driver);</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG "pseries_idle_driver registered\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit pseries_processor_idle_exit(void)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	pseries_idle_devices_uninit();</div><div class='add'>+	cpuidle_unregister_driver(&amp;pseries_idle_driver);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(pseries_processor_idle_init);</div><div class='add'>+module_exit(pseries_processor_idle_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Deepthi Dharwar &lt;deepthi@linux.vnet.ibm.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Cpuidle driver for POWER");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h<br/>index 24c7162f11d9..9a3dda07566f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/pseries.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/pseries.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/pseries.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/pseries/pseries.h</a></div><div class='hunk'>@@ -57,4 +57,7 @@ extern struct device_node *dlpar_configure_connector(u32);</div><div class='ctx'> extern int dlpar_attach_node(struct device_node *);</div><div class='ctx'> extern int dlpar_detach_node(struct device_node *);</div><div class='ctx'> </div><div class='add'>+/* Snooze Delay, pseries_idle */</div><div class='add'>+DECLARE_PER_CPU(long, smt_snooze_delay);</div><div class='add'>+</div><div class='ctx'> #endif /* _PSERIES_PSERIES_H */</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/pseries_energy.c b/arch/powerpc/platforms/pseries/pseries_energy.c<br/>index c8b3c69fe891..af281dce510a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/pseries_energy.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/pseries_energy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/pseries_energy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/pseries/pseries_energy.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;asm/cputhreads.h&gt;</div><div class='hunk'>@@ -184,7 +184,7 @@ static ssize_t get_best_energy_list(char *page, int activate)</div><div class='ctx'> 	return s-page;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t get_best_energy_data(struct sys_device *dev,</div><div class='add'>+static ssize_t get_best_energy_data(struct device *dev,</div><div class='ctx'> 					char *page, int activate)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -207,26 +207,26 @@ static ssize_t get_best_energy_data(struct sys_device *dev,</div><div class='ctx'> </div><div class='ctx'> /* Wrapper functions */</div><div class='ctx'> </div><div class='del'>-static ssize_t cpu_activate_hint_list_show(struct sysdev_class *class,</div><div class='del'>-			struct sysdev_class_attribute *attr, char *page)</div><div class='add'>+static ssize_t cpu_activate_hint_list_show(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *page)</div><div class='ctx'> {</div><div class='ctx'> 	return get_best_energy_list(page, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t cpu_deactivate_hint_list_show(struct sysdev_class *class,</div><div class='del'>-			struct sysdev_class_attribute *attr, char *page)</div><div class='add'>+static ssize_t cpu_deactivate_hint_list_show(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *page)</div><div class='ctx'> {</div><div class='ctx'> 	return get_best_energy_list(page, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t percpu_activate_hint_show(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *page)</div><div class='add'>+static ssize_t percpu_activate_hint_show(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *page)</div><div class='ctx'> {</div><div class='ctx'> 	return get_best_energy_data(dev, page, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t percpu_deactivate_hint_show(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *page)</div><div class='add'>+static ssize_t percpu_deactivate_hint_show(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *page)</div><div class='ctx'> {</div><div class='ctx'> 	return get_best_energy_data(dev, page, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -241,48 +241,48 @@ static ssize_t percpu_deactivate_hint_show(struct sys_device *dev,</div><div class='ctx'>  *	Per-cpu value of the hint</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-struct sysdev_class_attribute attr_cpu_activate_hint_list =</div><div class='del'>-		_SYSDEV_CLASS_ATTR(pseries_activate_hint_list, 0444,</div><div class='add'>+struct device_attribute attr_cpu_activate_hint_list =</div><div class='add'>+		__ATTR(pseries_activate_hint_list, 0444,</div><div class='ctx'> 		cpu_activate_hint_list_show, NULL);</div><div class='ctx'> </div><div class='del'>-struct sysdev_class_attribute attr_cpu_deactivate_hint_list =</div><div class='del'>-		_SYSDEV_CLASS_ATTR(pseries_deactivate_hint_list, 0444,</div><div class='add'>+struct device_attribute attr_cpu_deactivate_hint_list =</div><div class='add'>+		__ATTR(pseries_deactivate_hint_list, 0444,</div><div class='ctx'> 		cpu_deactivate_hint_list_show, NULL);</div><div class='ctx'> </div><div class='del'>-struct sysdev_attribute attr_percpu_activate_hint =</div><div class='del'>-		_SYSDEV_ATTR(pseries_activate_hint, 0444,</div><div class='add'>+struct device_attribute attr_percpu_activate_hint =</div><div class='add'>+		__ATTR(pseries_activate_hint, 0444,</div><div class='ctx'> 		percpu_activate_hint_show, NULL);</div><div class='ctx'> </div><div class='del'>-struct sysdev_attribute attr_percpu_deactivate_hint =</div><div class='del'>-		_SYSDEV_ATTR(pseries_deactivate_hint, 0444,</div><div class='add'>+struct device_attribute attr_percpu_deactivate_hint =</div><div class='add'>+		__ATTR(pseries_deactivate_hint, 0444,</div><div class='ctx'> 		percpu_deactivate_hint_show, NULL);</div><div class='ctx'> </div><div class='ctx'> static int __init pseries_energy_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu, err;</div><div class='del'>-	struct sys_device *cpu_sys_dev;</div><div class='add'>+	struct device *cpu_dev;</div><div class='ctx'> </div><div class='ctx'> 	if (!check_for_h_best_energy()) {</div><div class='ctx'> 		printk(KERN_INFO "Hypercall H_BEST_ENERGY not supported\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Create the sysfs files */</div><div class='del'>-	err = sysfs_create_file(&amp;cpu_sysdev_class.kset.kobj,</div><div class='del'>-				&amp;attr_cpu_activate_hint_list.attr);</div><div class='add'>+	err = device_create_file(cpu_subsys.dev_root,</div><div class='add'>+				&amp;attr_cpu_activate_hint_list);</div><div class='ctx'> 	if (!err)</div><div class='del'>-		err = sysfs_create_file(&amp;cpu_sysdev_class.kset.kobj,</div><div class='del'>-				&amp;attr_cpu_deactivate_hint_list.attr);</div><div class='add'>+		err = device_create_file(cpu_subsys.dev_root,</div><div class='add'>+				&amp;attr_cpu_deactivate_hint_list);</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='del'>-		cpu_sys_dev = get_cpu_sysdev(cpu);</div><div class='del'>-		err = sysfs_create_file(&amp;cpu_sys_dev-&gt;kobj,</div><div class='del'>-				&amp;attr_percpu_activate_hint.attr);</div><div class='add'>+		cpu_dev = get_cpu_device(cpu);</div><div class='add'>+		err = device_create_file(cpu_dev,</div><div class='add'>+				&amp;attr_percpu_activate_hint);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='del'>-		err = sysfs_create_file(&amp;cpu_sys_dev-&gt;kobj,</div><div class='del'>-				&amp;attr_percpu_deactivate_hint.attr);</div><div class='add'>+		err = device_create_file(cpu_dev,</div><div class='add'>+				&amp;attr_percpu_deactivate_hint);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -298,23 +298,20 @@ static int __init pseries_energy_init(void)</div><div class='ctx'> static void __exit pseries_energy_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='del'>-	struct sys_device *cpu_sys_dev;</div><div class='add'>+	struct device *cpu_dev;</div><div class='ctx'> </div><div class='ctx'> 	if (!sysfs_entries)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Remove the sysfs files */</div><div class='del'>-	sysfs_remove_file(&amp;cpu_sysdev_class.kset.kobj,</div><div class='del'>-				&amp;attr_cpu_activate_hint_list.attr);</div><div class='del'>-</div><div class='del'>-	sysfs_remove_file(&amp;cpu_sysdev_class.kset.kobj,</div><div class='del'>-				&amp;attr_cpu_deactivate_hint_list.attr);</div><div class='add'>+	device_remove_file(cpu_subsys.dev_root, &amp;attr_cpu_activate_hint_list);</div><div class='add'>+	device_remove_file(cpu_subsys.dev_root, &amp;attr_cpu_deactivate_hint_list);</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='del'>-		cpu_sys_dev = get_cpu_sysdev(cpu);</div><div class='del'>-		sysfs_remove_file(&amp;cpu_sys_dev-&gt;kobj,</div><div class='add'>+		cpu_dev = get_cpu_device(cpu);</div><div class='add'>+		sysfs_remove_file(&amp;cpu_dev-&gt;kobj,</div><div class='ctx'> 				&amp;attr_percpu_activate_hint.attr);</div><div class='del'>-		sysfs_remove_file(&amp;cpu_sys_dev-&gt;kobj,</div><div class='add'>+		sysfs_remove_file(&amp;cpu_dev-&gt;kobj,</div><div class='ctx'> 				&amp;attr_percpu_deactivate_hint.attr);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c<br/>index c3408ca8855e..f79f1278dfca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/pseries/setup.c</a></div><div class='hunk'>@@ -39,6 +39,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/root_dev.h&gt;</div><div class='add'>+#include &lt;linux/cpuidle.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='hunk'>@@ -74,9 +75,6 @@ EXPORT_SYMBOL(CMO_PageSize);</div><div class='ctx'> </div><div class='ctx'> int fwnmi_active;  /* TRUE if an FWNMI handler is present */</div><div class='ctx'> </div><div class='del'>-static void pseries_shared_idle_sleep(void);</div><div class='del'>-static void pseries_dedicated_idle_sleep(void);</div><div class='del'>-</div><div class='ctx'> static struct device_node *pSeries_mpic_node;</div><div class='ctx'> </div><div class='ctx'> static void pSeries_show_cpuinfo(struct seq_file *m)</div><div class='hunk'>@@ -192,8 +190,7 @@ static void __init pseries_mpic_init_IRQ(void)</div><div class='ctx'> 	BUG_ON(openpic_addr == 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the openpic driver */</div><div class='del'>-	mpic = mpic_alloc(pSeries_mpic_node, openpic_addr,</div><div class='del'>-			  MPIC_PRIMARY,</div><div class='add'>+	mpic = mpic_alloc(pSeries_mpic_node, openpic_addr, 0,</div><div class='ctx'> 			  16, 250, /* isu size, irq count */</div><div class='ctx'> 			  " MPIC     ");</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='hunk'>@@ -352,8 +349,25 @@ static int alloc_dispatch_log_kmem_cache(void)</div><div class='ctx'> }</div><div class='ctx'> early_initcall(alloc_dispatch_log_kmem_cache);</div><div class='ctx'> </div><div class='add'>+static void pSeries_idle(void)</div><div class='add'>+{</div><div class='add'>+	/* This would call on the cpuidle framework, and the back-end pseries</div><div class='add'>+	 * driver to  go to idle states</div><div class='add'>+	 */</div><div class='add'>+	if (cpuidle_idle_call()) {</div><div class='add'>+		/* On error, execute default handler</div><div class='add'>+		 * to go into low thread priority and possibly</div><div class='add'>+		 * low power mode.</div><div class='add'>+		 */</div><div class='add'>+		HMT_low();</div><div class='add'>+		HMT_very_low();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init pSeries_setup_arch(void)</div><div class='ctx'> {</div><div class='add'>+	panic_timeout = 10;</div><div class='add'>+</div><div class='ctx'> 	/* Discover PIC type and setup ppc_md accordingly */</div><div class='ctx'> 	pseries_discover_pic();</div><div class='ctx'> </div><div class='hunk'>@@ -374,18 +388,9 @@ static void __init pSeries_setup_arch(void)</div><div class='ctx'> </div><div class='ctx'> 	pSeries_nvram_init();</div><div class='ctx'> </div><div class='del'>-	/* Choose an idle loop */</div><div class='ctx'> 	if (firmware_has_feature(FW_FEATURE_SPLPAR)) {</div><div class='ctx'> 		vpa_init(boot_cpuid);</div><div class='del'>-		if (get_lppaca()-&gt;shared_proc) {</div><div class='del'>-			printk(KERN_DEBUG "Using shared processor idle loop\n");</div><div class='del'>-			ppc_md.power_save = pseries_shared_idle_sleep;</div><div class='del'>-		} else {</div><div class='del'>-			printk(KERN_DEBUG "Using dedicated idle loop\n");</div><div class='del'>-			ppc_md.power_save = pseries_dedicated_idle_sleep;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_DEBUG "Using default idle loop\n");</div><div class='add'>+		ppc_md.power_save = pSeries_idle;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='hunk'>@@ -586,80 +591,6 @@ static int __init pSeries_probe(void)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-DECLARE_PER_CPU(long, smt_snooze_delay);</div><div class='del'>-</div><div class='del'>-static void pseries_dedicated_idle_sleep(void)</div><div class='del'>-{ </div><div class='del'>-	unsigned int cpu = smp_processor_id();</div><div class='del'>-	unsigned long start_snooze;</div><div class='del'>-	unsigned long in_purr, out_purr;</div><div class='del'>-	long snooze = __get_cpu_var(smt_snooze_delay);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Indicate to the HV that we are idle. Now would be</div><div class='del'>-	 * a good time to find other work to dispatch.</div><div class='del'>-	 */</div><div class='del'>-	get_lppaca()-&gt;idle = 1;</div><div class='del'>-	get_lppaca()-&gt;donate_dedicated_cpu = 1;</div><div class='del'>-	in_purr = mfspr(SPRN_PURR);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We come in with interrupts disabled, and need_resched()</div><div class='del'>-	 * has been checked recently.  If we should poll for a little</div><div class='del'>-	 * while, do so.</div><div class='del'>-	 */</div><div class='del'>-	if (snooze) {</div><div class='del'>-		start_snooze = get_tb() + snooze * tb_ticks_per_usec;</div><div class='del'>-		local_irq_enable();</div><div class='del'>-		set_thread_flag(TIF_POLLING_NRFLAG);</div><div class='del'>-</div><div class='del'>-		while ((snooze &lt; 0) || (get_tb() &lt; start_snooze)) {</div><div class='del'>-			if (need_resched() || cpu_is_offline(cpu))</div><div class='del'>-				goto out;</div><div class='del'>-			ppc64_runlatch_off();</div><div class='del'>-			HMT_low();</div><div class='del'>-			HMT_very_low();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		HMT_medium();</div><div class='del'>-		clear_thread_flag(TIF_POLLING_NRFLAG);</div><div class='del'>-		smp_mb();</div><div class='del'>-		local_irq_disable();</div><div class='del'>-		if (need_resched() || cpu_is_offline(cpu))</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cede_processor();</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	HMT_medium();</div><div class='del'>-	out_purr = mfspr(SPRN_PURR);</div><div class='del'>-	get_lppaca()-&gt;wait_state_cycles += out_purr - in_purr;</div><div class='del'>-	get_lppaca()-&gt;donate_dedicated_cpu = 0;</div><div class='del'>-	get_lppaca()-&gt;idle = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pseries_shared_idle_sleep(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Indicate to the HV that we are idle. Now would be</div><div class='del'>-	 * a good time to find other work to dispatch.</div><div class='del'>-	 */</div><div class='del'>-	get_lppaca()-&gt;idle = 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Yield the processor to the hypervisor.  We return if</div><div class='del'>-	 * an external interrupt occurs (which are driven prior</div><div class='del'>-	 * to returning here) or if a prod occurs from another</div><div class='del'>-	 * processor. When returning here, external interrupts</div><div class='del'>-	 * are enabled.</div><div class='del'>-	 */</div><div class='del'>-	cede_processor();</div><div class='del'>-</div><div class='del'>-	get_lppaca()-&gt;idle = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int pSeries_pci_probe_mode(struct pci_bus *bus)</div><div class='ctx'> {</div><div class='ctx'> 	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c<br/>index 26e93fd4c62b..eadba9521a35 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/smp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/pseries/smp.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='hunk'>@@ -148,6 +148,7 @@ static void __devinit smp_xics_setup_cpu(int cpu)</div><div class='ctx'> 	set_cpu_current_state(cpu, CPU_STATE_ONLINE);</div><div class='ctx'> 	set_default_offline_state(cpu);</div><div class='ctx'> #endif</div><div class='add'>+	pseries_notify_cpuidle_add_cpu(cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __devinit smp_pSeries_kick_cpu(int nr)</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c<br/>index d3de0849f296..b84a8b2238dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/suspend.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/pseries/suspend.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/suspend.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/pseries/suspend.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;asm/rtas.h&gt;</div><div class='ctx'> </div><div class='ctx'> static u64 stream_id;</div><div class='del'>-static struct sys_device suspend_sysdev;</div><div class='add'>+static struct device suspend_dev;</div><div class='ctx'> static DECLARE_COMPLETION(suspend_work);</div><div class='ctx'> static struct rtas_suspend_me_data suspend_data;</div><div class='ctx'> static atomic_t suspending;</div><div class='hunk'>@@ -110,8 +110,8 @@ static int pseries_prepare_late(void)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * store_hibernate - Initiate partition hibernation</div><div class='del'>- * @classdev:	sysdev class struct</div><div class='del'>- * @attr:		class device attribute struct</div><div class='add'>+ * @dev:		subsys root device</div><div class='add'>+ * @attr:		device attribute struct</div><div class='ctx'>  * @buf:		buffer</div><div class='ctx'>  * @count:		buffer size</div><div class='ctx'>  *</div><div class='hunk'>@@ -121,8 +121,8 @@ static int pseries_prepare_late(void)</div><div class='ctx'>  * Return value:</div><div class='ctx'>  * 	number of bytes printed to buffer / other on failure</div><div class='ctx'>  **/</div><div class='del'>-static ssize_t store_hibernate(struct sysdev_class *classdev,</div><div class='del'>-			       struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t store_hibernate(struct device *dev,</div><div class='add'>+			       struct device_attribute *attr,</div><div class='ctx'> 			       const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -148,10 +148,11 @@ static ssize_t store_hibernate(struct sysdev_class *classdev,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(hibernate, S_IWUSR, NULL, store_hibernate);</div><div class='add'>+static DEVICE_ATTR(hibernate, S_IWUSR, NULL, store_hibernate);</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class suspend_sysdev_class = {</div><div class='add'>+static struct bus_type suspend_subsys = {</div><div class='ctx'> 	.name = "power",</div><div class='add'>+	.dev_name = "power",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct platform_suspend_ops pseries_suspend_ops = {</div><div class='hunk'>@@ -167,23 +168,23 @@ static const struct platform_suspend_ops pseries_suspend_ops = {</div><div class='ctx'>  * Return value:</div><div class='ctx'>  * 	0 on success / other on failure</div><div class='ctx'>  **/</div><div class='del'>-static int pseries_suspend_sysfs_register(struct sys_device *sysdev)</div><div class='add'>+static int pseries_suspend_sysfs_register(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if ((rc = sysdev_class_register(&amp;suspend_sysdev_class)))</div><div class='add'>+	if ((rc = subsys_system_register(&amp;suspend_subsys, NULL)))</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	sysdev-&gt;id = 0;</div><div class='del'>-	sysdev-&gt;cls = &amp;suspend_sysdev_class;</div><div class='add'>+	dev-&gt;id = 0;</div><div class='add'>+	dev-&gt;bus = &amp;suspend_subsys;</div><div class='ctx'> </div><div class='del'>-	if ((rc = sysdev_class_create_file(&amp;suspend_sysdev_class, &amp;attr_hibernate)))</div><div class='del'>-		goto class_unregister;</div><div class='add'>+	if ((rc = device_create_file(suspend_subsys.dev_root, &amp;dev_attr_hibernate)))</div><div class='add'>+		goto subsys_unregister;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-class_unregister:</div><div class='del'>-	sysdev_class_unregister(&amp;suspend_sysdev_class);</div><div class='add'>+subsys_unregister:</div><div class='add'>+	bus_unregister(&amp;suspend_subsys);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -204,7 +205,7 @@ static int __init pseries_suspend_init(void)</div><div class='ctx'> 	if (suspend_data.token == RTAS_UNKNOWN_SERVICE)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if ((rc = pseries_suspend_sysfs_register(&amp;suspend_sysdev)))</div><div class='add'>+	if ((rc = pseries_suspend_sysfs_register(&amp;suspend_dev)))</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	ppc_md.suspend_disable_cpu = pseries_suspend_cpu;</div><div class='head'>diff --git a/arch/powerpc/platforms/wsp/Kconfig b/arch/powerpc/platforms/wsp/Kconfig<br/>index bd560c786ed6..57d22a2f4ba9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/wsp/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/wsp/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/wsp/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/wsp/Kconfig</a></div><div class='hunk'>@@ -1,20 +1,28 @@</div><div class='ctx'> config PPC_WSP</div><div class='ctx'> 	bool</div><div class='ctx'> 	select PPC_A2</div><div class='add'>+	select GENERIC_TBSYNC</div><div class='add'>+	select PPC_ICSWX</div><div class='ctx'> 	select PPC_SCOM</div><div class='ctx'> 	select PPC_XICS</div><div class='ctx'> 	select PPC_ICP_NATIVE</div><div class='ctx'> 	select PCI</div><div class='ctx'> 	select PPC_IO_WORKAROUNDS if PCI</div><div class='ctx'> 	select PPC_INDIRECT_PIO if PCI</div><div class='add'>+	select PPC_WSP_COPRO</div><div class='ctx'> 	default n</div><div class='ctx'> </div><div class='ctx'> menu "WSP platform selection"</div><div class='ctx'> 	depends on PPC_BOOK3E_64</div><div class='ctx'> </div><div class='ctx'> config PPC_PSR2</div><div class='del'>-	bool "PSR-2 platform"</div><div class='del'>-	select GENERIC_TBSYNC</div><div class='add'>+	bool "PowerEN System Reference Platform 2"</div><div class='add'>+	select EPAPR_BOOT</div><div class='add'>+	select PPC_WSP</div><div class='add'>+	default y</div><div class='add'>+</div><div class='add'>+config PPC_CHROMA</div><div class='add'>+	bool "PowerEN PCIe Chroma Card"</div><div class='ctx'> 	select EPAPR_BOOT</div><div class='ctx'> 	select PPC_WSP</div><div class='ctx'> 	default y</div><div class='head'>diff --git a/arch/powerpc/platforms/wsp/Makefile b/arch/powerpc/platforms/wsp/Makefile<br/>index a1486b436f02..56817ac98fc9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/wsp/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/wsp/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/wsp/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/wsp/Makefile</a></div><div class='hunk'>@@ -1,8 +1,10 @@</div><div class='ctx'> ccflags-y			+= -mno-minimal-toc</div><div class='ctx'> </div><div class='del'>-obj-y				+= setup.o ics.o</div><div class='del'>-obj-$(CONFIG_PPC_PSR2)		+= psr2.o opb_pic.o</div><div class='add'>+obj-y				+= setup.o ics.o wsp.o</div><div class='add'>+obj-$(CONFIG_PPC_PSR2)		+= psr2.o</div><div class='add'>+obj-$(CONFIG_PPC_CHROMA)	+= chroma.o h8.o</div><div class='add'>+obj-$(CONFIG_PPC_WSP)		+= opb_pic.o</div><div class='ctx'> obj-$(CONFIG_PPC_WSP)		+= scom_wsp.o</div><div class='ctx'> obj-$(CONFIG_SMP)		+= smp.o scom_smp.o</div><div class='ctx'> obj-$(CONFIG_PCI)		+= wsp_pci.o</div><div class='del'>-obj-$(CONFIG_PCI_MSI)		+= msi.o
\ No newline at end of file</div><div class='add'>+obj-$(CONFIG_PCI_MSI)		+= msi.o</div><div class='head'>diff --git a/arch/powerpc/platforms/wsp/chroma.c b/arch/powerpc/platforms/wsp/chroma.c<br/>new file mode 100644<br/>index 000000000000..ca6fa26f6e63<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/wsp/chroma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/wsp/chroma.c</a></div><div class='hunk'>@@ -0,0 +1,56 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008-2011, IBM Corporation</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'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/init.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/mm.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/udbg.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ics.h"</div><div class='add'>+#include "wsp.h"</div><div class='add'>+</div><div class='add'>+void __init chroma_setup_arch(void)</div><div class='add'>+{</div><div class='add'>+	wsp_setup_arch();</div><div class='add'>+	wsp_setup_h8();</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init chroma_probe(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long root = of_get_flat_dt_root();</div><div class='add'>+</div><div class='add'>+	if (!of_flat_dt_is_compatible(root, "ibm,wsp-chroma"))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+define_machine(chroma_md) {</div><div class='add'>+	.name			= "Chroma PCIe",</div><div class='add'>+	.probe			= chroma_probe,</div><div class='add'>+	.setup_arch		= chroma_setup_arch,</div><div class='add'>+	.restart		= wsp_h8_restart,</div><div class='add'>+	.power_off		= wsp_h8_power_off,</div><div class='add'>+	.halt			= wsp_halt,</div><div class='add'>+	.calibrate_decr		= generic_calibrate_decr,</div><div class='add'>+	.init_IRQ		= wsp_setup_irq,</div><div class='add'>+	.progress		= udbg_progress,</div><div class='add'>+	.power_save		= book3e_idle,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+machine_arch_initcall(chroma_md, wsp_probe_devices);</div><div class='head'>diff --git a/arch/powerpc/platforms/wsp/h8.c b/arch/powerpc/platforms/wsp/h8.c<br/>new file mode 100644<br/>index 000000000000..d18e6cc19df3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/wsp/h8.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/wsp/h8.c</a></div><div class='hunk'>@@ -0,0 +1,134 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008-2011, IBM Corporation</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'>+</div><div class='add'>+#include &lt;linux/kernel.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'>+</div><div class='add'>+#include "wsp.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The UART connection to the H8 is over ttyS1 which is just a 16550.</div><div class='add'>+ * We assume that FW has it setup right and no one messes with it.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static u8 __iomem *h8;</div><div class='add'>+</div><div class='add'>+#define RBR 0		/* Receiver Buffer Register */</div><div class='add'>+#define THR 0		/* Transmitter Holding Register */</div><div class='add'>+#define LSR 5		/* Line Status Register */</div><div class='add'>+#define LSR_DR 0x01	/* LSR value for Data-Ready */</div><div class='add'>+#define LSR_THRE 0x20	/* LSR value for Transmitter-Holding-Register-Empty */</div><div class='add'>+static void wsp_h8_putc(int c)</div><div class='add'>+{</div><div class='add'>+	u8 lsr;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		lsr = readb(h8 + LSR);</div><div class='add'>+	} while ((lsr &amp; LSR_THRE) != LSR_THRE);</div><div class='add'>+	writeb(c, h8 + THR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wsp_h8_getc(void)</div><div class='add'>+{</div><div class='add'>+	u8 lsr;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		lsr = readb(h8 + LSR);</div><div class='add'>+	} while ((lsr &amp; LSR_DR) != LSR_DR);</div><div class='add'>+</div><div class='add'>+	return readb(h8 + RBR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wsp_h8_puts(const char *s, int sz)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sz; i++) {</div><div class='add'>+		wsp_h8_putc(s[i]);</div><div class='add'>+</div><div class='add'>+		/* no flow control so wait for echo */</div><div class='add'>+		wsp_h8_getc();</div><div class='add'>+	}</div><div class='add'>+	wsp_h8_putc('\r');</div><div class='add'>+	wsp_h8_putc('\n');</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wsp_h8_terminal_cmd(const char *cmd, int sz)</div><div class='add'>+{</div><div class='add'>+	hard_irq_disable();</div><div class='add'>+	wsp_h8_puts(cmd, sz);</div><div class='add'>+	/* should never return, but just in case */</div><div class='add'>+	for (;;)</div><div class='add'>+		continue;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void wsp_h8_restart(char *cmd)</div><div class='add'>+{</div><div class='add'>+	static const char restart[] = "warm-reset";</div><div class='add'>+</div><div class='add'>+	(void)cmd;</div><div class='add'>+	wsp_h8_terminal_cmd(restart, sizeof(restart) - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void wsp_h8_power_off(void)</div><div class='add'>+{</div><div class='add'>+	static const char off[] = "power-off";</div><div class='add'>+</div><div class='add'>+	wsp_h8_terminal_cmd(off, sizeof(off) - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __iomem *wsp_h8_getaddr(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *aliases;</div><div class='add'>+	struct device_node *uart;</div><div class='add'>+	struct property *path;</div><div class='add'>+	void __iomem *va = NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * there is nothing in the devtree to tell us which is mapped</div><div class='add'>+	 * to the H8, but se know it is the second serial port.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	aliases = of_find_node_by_path("/aliases");</div><div class='add'>+	if (aliases == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	path = of_find_property(aliases, "serial1", NULL);</div><div class='add'>+	if (path == NULL)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	uart = of_find_node_by_path(path-&gt;value);</div><div class='add'>+	if (uart == NULL)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	va = of_iomap(uart, 0);</div><div class='add'>+</div><div class='add'>+	/* remove it so no one messes with it */</div><div class='add'>+	of_detach_node(uart);</div><div class='add'>+	of_node_put(uart);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	of_node_put(aliases);</div><div class='add'>+</div><div class='add'>+	return va;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init wsp_setup_h8(void)</div><div class='add'>+{</div><div class='add'>+	h8 = wsp_h8_getaddr();</div><div class='add'>+</div><div class='add'>+	/* Devtree change? lets hard map it anyway */</div><div class='add'>+	if (h8 == NULL) {</div><div class='add'>+		pr_warn("UART to H8 could not be found");</div><div class='add'>+		h8 = ioremap(0xffc0008000ULL, 0x100);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/platforms/wsp/opb_pic.c b/arch/powerpc/platforms/wsp/opb_pic.c<br/>index be05631a3c1c..19f353dfcd03 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/wsp/opb_pic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/wsp/opb_pic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/wsp/opb_pic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/wsp/opb_pic.c</a></div><div class='hunk'>@@ -320,7 +320,8 @@ void __init opb_pic_init(void)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Attach opb interrupt handler to new virtual IRQ */</div><div class='del'>-		rc = request_irq(virq, opb_irq_handler, 0, "OPB LS Cascade", opb);</div><div class='add'>+		rc = request_irq(virq, opb_irq_handler, IRQF_NO_THREAD,</div><div class='add'>+				 "OPB LS Cascade", opb);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			printk("opb: request_irq failed: %d\n", rc);</div><div class='ctx'> 			continue;</div><div class='head'>diff --git a/arch/powerpc/platforms/wsp/psr2.c b/arch/powerpc/platforms/wsp/psr2.c<br/>index 166f2e4b4bee..0c1ae06d0be1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/wsp/psr2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/wsp/psr2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/wsp/psr2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/wsp/psr2.c</a></div><div class='hunk'>@@ -14,10 +14,10 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/time.h&gt;</div><div class='ctx'> #include &lt;asm/udbg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ics.h"</div><div class='hunk'>@@ -27,7 +27,8 @@</div><div class='ctx'> static void psr2_spin(void)</div><div class='ctx'> {</div><div class='ctx'> 	hard_irq_disable();</div><div class='del'>-	for (;;) ;</div><div class='add'>+	for (;;)</div><div class='add'>+		continue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void psr2_restart(char *cmd)</div><div class='hunk'>@@ -35,65 +36,32 @@ static void psr2_restart(char *cmd)</div><div class='ctx'> 	psr2_spin();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int psr2_probe_devices(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	/* Our RTC is a ds1500. It seems to be programatically compatible</div><div class='del'>-	 * with the ds1511 for which we have a driver so let's use that</div><div class='del'>-	 */</div><div class='del'>-	np = of_find_compatible_node(NULL, NULL, "dallas,ds1500");</div><div class='del'>-	if (np != NULL) {</div><div class='del'>-		struct resource res;</div><div class='del'>-		if (of_address_to_resource(np, 0, &amp;res) == 0)</div><div class='del'>-			platform_device_register_simple("ds1511", 0, &amp;res, 1);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-machine_arch_initcall(psr2_md, psr2_probe_devices);</div><div class='del'>-</div><div class='del'>-static void __init psr2_setup_arch(void)</div><div class='del'>-{</div><div class='del'>-	/* init to some ~sane value until calibrate_delay() runs */</div><div class='del'>-	loops_per_jiffy = 50000000;</div><div class='del'>-</div><div class='del'>-	scom_init_wsp();</div><div class='del'>-</div><div class='del'>-	/* Setup SMP callback */</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	a2_setup_smp();</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	wsp_setup_pci();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __init psr2_probe(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long root = of_get_flat_dt_root();</div><div class='ctx'> </div><div class='add'>+	if (of_flat_dt_is_compatible(root, "ibm,wsp-chroma")) {</div><div class='add'>+		/* chroma systems also claim they are psr2s */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!of_flat_dt_is_compatible(root, "ibm,psr2"))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init psr2_init_irq(void)</div><div class='del'>-{</div><div class='del'>-	wsp_init_irq();</div><div class='del'>-	opb_pic_init();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> define_machine(psr2_md) {</div><div class='ctx'> 	.name			= "PSR2 A2",</div><div class='ctx'> 	.probe			= psr2_probe,</div><div class='del'>-	.setup_arch		= psr2_setup_arch,</div><div class='add'>+	.setup_arch		= wsp_setup_arch,</div><div class='ctx'> 	.restart		= psr2_restart,</div><div class='ctx'> 	.power_off		= psr2_spin,</div><div class='ctx'> 	.halt			= psr2_spin,</div><div class='ctx'> 	.calibrate_decr		= generic_calibrate_decr,</div><div class='del'>-	.init_IRQ		= psr2_init_irq,</div><div class='add'>+	.init_IRQ		= wsp_setup_irq,</div><div class='ctx'> 	.progress		= udbg_progress,</div><div class='ctx'> 	.power_save		= book3e_idle,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+machine_arch_initcall(psr2_md, wsp_probe_devices);</div><div class='head'>diff --git a/arch/powerpc/platforms/wsp/wsp.c b/arch/powerpc/platforms/wsp/wsp.c<br/>new file mode 100644<br/>index 000000000000..d25cc96c21b8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/wsp/wsp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/wsp/wsp.c</a></div><div class='hunk'>@@ -0,0 +1,115 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008-2011, IBM Corporation</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'>+</div><div class='add'>+#include &lt;linux/kernel.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/smp.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/scom.h&gt;</div><div class='add'>+</div><div class='add'>+#include "wsp.h"</div><div class='add'>+#include "ics.h"</div><div class='add'>+</div><div class='add'>+#define WSP_SOC_COMPATIBLE	"ibm,wsp-soc"</div><div class='add'>+#define PBIC_COMPATIBLE		"ibm,wsp-pbic"</div><div class='add'>+#define COPRO_COMPATIBLE	"ibm,wsp-coprocessor"</div><div class='add'>+</div><div class='add'>+static int __init wsp_probe_buses(void)</div><div class='add'>+{</div><div class='add'>+	static __initdata struct of_device_id bus_ids[] = {</div><div class='add'>+		/*</div><div class='add'>+		 * every node in between needs to be here or you won't</div><div class='add'>+		 * find it</div><div class='add'>+		 */</div><div class='add'>+		{ .compatible = WSP_SOC_COMPATIBLE, },</div><div class='add'>+		{ .compatible = PBIC_COMPATIBLE, },</div><div class='add'>+		{ .compatible = COPRO_COMPATIBLE, },</div><div class='add'>+		{},</div><div class='add'>+	};</div><div class='add'>+	of_platform_bus_probe(NULL, bus_ids, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init wsp_setup_arch(void)</div><div class='add'>+{</div><div class='add'>+	/* init to some ~sane value until calibrate_delay() runs */</div><div class='add'>+	loops_per_jiffy = 50000000;</div><div class='add'>+</div><div class='add'>+	scom_init_wsp();</div><div class='add'>+</div><div class='add'>+	/* Setup SMP callback */</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	a2_setup_smp();</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	wsp_setup_pci();</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init wsp_setup_irq(void)</div><div class='add'>+{</div><div class='add'>+	wsp_init_irq();</div><div class='add'>+	opb_pic_init();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int __init wsp_probe_devices(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	/* Our RTC is a ds1500. It seems to be programatically compatible</div><div class='add'>+	 * with the ds1511 for which we have a driver so let's use that</div><div class='add'>+	 */</div><div class='add'>+	np = of_find_compatible_node(NULL, NULL, "dallas,ds1500");</div><div class='add'>+	if (np != NULL) {</div><div class='add'>+		struct resource res;</div><div class='add'>+		if (of_address_to_resource(np, 0, &amp;res) == 0)</div><div class='add'>+			platform_device_register_simple("ds1511", 0, &amp;res, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wsp_probe_buses();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void wsp_halt(void)</div><div class='add'>+{</div><div class='add'>+	u64 val;</div><div class='add'>+	scom_map_t m;</div><div class='add'>+	struct device_node *dn;</div><div class='add'>+	struct device_node *mine;</div><div class='add'>+	struct device_node *me;</div><div class='add'>+</div><div class='add'>+	me = of_get_cpu_node(smp_processor_id(), NULL);</div><div class='add'>+	mine = scom_find_parent(me);</div><div class='add'>+</div><div class='add'>+	/* This will halt all the A2s but not power off the chip */</div><div class='add'>+	for_each_node_with_property(dn, "scom-controller") {</div><div class='add'>+		if (dn == mine)</div><div class='add'>+			continue;</div><div class='add'>+		m = scom_map(dn, 0, 1);</div><div class='add'>+</div><div class='add'>+		/* read-modify-write it so the HW probe does not get</div><div class='add'>+		 * confused */</div><div class='add'>+		val = scom_read(m, 0);</div><div class='add'>+		val |= 1;</div><div class='add'>+		scom_write(m, 0, val);</div><div class='add'>+		scom_unmap(m);</div><div class='add'>+	}</div><div class='add'>+	m = scom_map(mine, 0, 1);</div><div class='add'>+	val = scom_read(m, 0);</div><div class='add'>+	val |= 1;</div><div class='add'>+	scom_write(m, 0, val);</div><div class='add'>+	/* should never return */</div><div class='add'>+	scom_unmap(m);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/platforms/wsp/wsp.h b/arch/powerpc/platforms/wsp/wsp.h<br/>index 33479818f62a..10c1d1fff362 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/wsp/wsp.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/platforms/wsp/wsp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/wsp/wsp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/platforms/wsp/wsp.h</a></div><div class='hunk'>@@ -6,15 +6,25 @@</div><div class='ctx'> /* Devtree compatible strings for major devices */</div><div class='ctx'> #define PCIE_COMPATIBLE     "ibm,wsp-pciex"</div><div class='ctx'> </div><div class='add'>+extern void wsp_setup_arch(void);</div><div class='add'>+extern void wsp_setup_irq(void);</div><div class='add'>+extern int wsp_probe_devices(void);</div><div class='add'>+extern void wsp_halt(void);</div><div class='add'>+</div><div class='ctx'> extern void wsp_setup_pci(void);</div><div class='ctx'> extern void scom_init_wsp(void);</div><div class='ctx'> </div><div class='ctx'> extern void a2_setup_smp(void);</div><div class='ctx'> extern int a2_scom_startup_cpu(unsigned int lcpu, int thr_idx,</div><div class='ctx'> 			       struct device_node *np);</div><div class='del'>-int smp_a2_cpu_bootable(unsigned int nr);</div><div class='del'>-int __devinit smp_a2_kick_cpu(int nr);</div><div class='add'>+extern int smp_a2_cpu_bootable(unsigned int nr);</div><div class='add'>+extern int __devinit smp_a2_kick_cpu(int nr);</div><div class='add'>+</div><div class='add'>+extern void opb_pic_init(void);</div><div class='ctx'> </div><div class='del'>-void opb_pic_init(void);</div><div class='add'>+/* chroma specific managment */</div><div class='add'>+extern void wsp_h8_restart(char *cmd);</div><div class='add'>+extern void wsp_h8_power_off(void);</div><div class='add'>+extern void __init wsp_setup_h8(void);</div><div class='ctx'> </div><div class='ctx'> #endif /*  __WSP_H */</div><div class='head'>diff --git a/arch/powerpc/relocs_check.pl b/arch/powerpc/relocs_check.pl<br/>index d2571096c3e9..7f5b83808862 100755<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/relocs_check.pl?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/relocs_check.pl</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/relocs_check.pl?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/relocs_check.pl</a></div><div class='hunk'>@@ -32,8 +32,18 @@ while (&lt;FD&gt;) {</div><div class='ctx'> 	next if (!/\s+R_/);</div><div class='ctx'> </div><div class='ctx'> 	# These relocations are okay</div><div class='del'>-	next if (/R_PPC64_RELATIVE/ or /R_PPC64_NONE/ or</div><div class='del'>-	         /R_PPC64_ADDR64\s+mach_/);</div><div class='add'>+	# On PPC64:</div><div class='add'>+	# 	R_PPC64_RELATIVE, R_PPC64_NONE, R_PPC64_ADDR64</div><div class='add'>+	# On PPC:</div><div class='add'>+	# 	R_PPC_RELATIVE, R_PPC_ADDR16_HI, </div><div class='add'>+	# 	R_PPC_ADDR16_HA,R_PPC_ADDR16_LO,</div><div class='add'>+	# 	R_PPC_NONE</div><div class='add'>+</div><div class='add'>+	next if (/\bR_PPC64_RELATIVE\b/ or /\bR_PPC64_NONE\b/ or</div><div class='add'>+	         /\bR_PPC64_ADDR64\s+mach_/);</div><div class='add'>+	next if (/\bR_PPC_ADDR16_LO\b/ or /\bR_PPC_ADDR16_HI\b/ or</div><div class='add'>+		 /\bR_PPC_ADDR16_HA\b/ or /\bR_PPC_RELATIVE\b/ or</div><div class='add'>+		 /\bR_PPC_NONE\b/);</div><div class='ctx'> </div><div class='ctx'> 	# If we see this type of relcoation it's an idication that</div><div class='ctx'> 	# we /may/ be using an old version of binutils.</div><div class='head'>diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile<br/>index 84e13253aec5..5e37b4717864 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/Makefile</a></div><div class='hunk'>@@ -17,10 +17,11 @@ obj-$(CONFIG_FSL_SOC)		+= fsl_soc.o</div><div class='ctx'> obj-$(CONFIG_FSL_PCI)		+= fsl_pci.o $(fsl-msi-obj-y)</div><div class='ctx'> obj-$(CONFIG_FSL_PMC)		+= fsl_pmc.o</div><div class='ctx'> obj-$(CONFIG_FSL_LBC)		+= fsl_lbc.o</div><div class='add'>+obj-$(CONFIG_FSL_IFC)		+= fsl_ifc.o</div><div class='ctx'> obj-$(CONFIG_FSL_GTM)		+= fsl_gtm.o</div><div class='ctx'> obj-$(CONFIG_FSL_85XX_CACHE_SRAM)	+= fsl_85xx_l2ctlr.o fsl_85xx_cache_sram.o</div><div class='ctx'> obj-$(CONFIG_SIMPLE_GPIO)	+= simple_gpio.o</div><div class='del'>-obj-$(CONFIG_FSL_RIO)		+= fsl_rio.o</div><div class='add'>+obj-$(CONFIG_FSL_RIO)		+= fsl_rio.o fsl_rmu.o</div><div class='ctx'> obj-$(CONFIG_TSI108_BRIDGE)	+= tsi108_pci.o tsi108_dev.o</div><div class='ctx'> obj-$(CONFIG_QUICC_ENGINE)	+= qe_lib/</div><div class='ctx'> obj-$(CONFIG_PPC_BESTCOMM)	+= bestcomm/</div><div class='head'>diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c<br/>index ba4271919062..1c16141c031c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/axonram.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/axonram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/axonram.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/axonram.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_ifc.c b/arch/powerpc/sysdev/fsl_ifc.c<br/>new file mode 100644<br/>index 000000000000..b31f19f61031<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/fsl_ifc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/fsl_ifc.c</a></div><div class='hunk'>@@ -0,0 +1,310 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2011 Freescale Semiconductor, Inc</div><div class='add'>+ *</div><div class='add'>+ * Freescale Integrated Flash Controller</div><div class='add'>+ *</div><div class='add'>+ * Author: Dipen Dudhat &lt;Dipen.Dudhat@freescale.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</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/kernel.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/slab.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/of_device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/fsl_ifc.h&gt;</div><div class='add'>+</div><div class='add'>+struct fsl_ifc_ctrl *fsl_ifc_ctrl_dev;</div><div class='add'>+EXPORT_SYMBOL(fsl_ifc_ctrl_dev);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * convert_ifc_address - convert the base address</div><div class='add'>+ * @addr_base:	base address of the memory bank</div><div class='add'>+ */</div><div class='add'>+unsigned int convert_ifc_address(phys_addr_t addr_base)</div><div class='add'>+{</div><div class='add'>+	return addr_base &amp; CSPR_BA;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(convert_ifc_address);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * fsl_ifc_find - find IFC bank</div><div class='add'>+ * @addr_base:	base address of the memory bank</div><div class='add'>+ *</div><div class='add'>+ * This function walks IFC banks comparing "Base address" field of the CSPR</div><div class='add'>+ * registers with the supplied addr_base argument. When bases match this</div><div class='add'>+ * function returns bank number (starting with 0), otherwise it returns</div><div class='add'>+ * appropriate errno value.</div><div class='add'>+ */</div><div class='add'>+int fsl_ifc_find(phys_addr_t addr_base)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	if (!fsl_ifc_ctrl_dev || !fsl_ifc_ctrl_dev-&gt;regs)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(fsl_ifc_ctrl_dev-&gt;regs-&gt;cspr_cs); i++) {</div><div class='add'>+		__be32 cspr = in_be32(&amp;fsl_ifc_ctrl_dev-&gt;regs-&gt;cspr_cs[i].cspr);</div><div class='add'>+		if (cspr &amp; CSPR_V &amp;&amp; (cspr &amp; CSPR_BA) ==</div><div class='add'>+				convert_ifc_address(addr_base))</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fsl_ifc_find);</div><div class='add'>+</div><div class='add'>+static int __devinit fsl_ifc_ctrl_init(struct fsl_ifc_ctrl *ctrl)</div><div class='add'>+{</div><div class='add'>+	struct fsl_ifc_regs __iomem *ifc = ctrl-&gt;regs;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clear all the common status and event registers</div><div class='add'>+	 */</div><div class='add'>+	if (in_be32(&amp;ifc-&gt;cm_evter_stat) &amp; IFC_CM_EVTER_STAT_CSER)</div><div class='add'>+		out_be32(&amp;ifc-&gt;cm_evter_stat, IFC_CM_EVTER_STAT_CSER);</div><div class='add'>+</div><div class='add'>+	/* enable all error and events */</div><div class='add'>+	out_be32(&amp;ifc-&gt;cm_evter_en, IFC_CM_EVTER_EN_CSEREN);</div><div class='add'>+</div><div class='add'>+	/* enable all error and event interrupts */</div><div class='add'>+	out_be32(&amp;ifc-&gt;cm_evter_intr_en, IFC_CM_EVTER_INTR_EN_CSERIREN);</div><div class='add'>+	out_be32(&amp;ifc-&gt;cm_erattr0, 0x0);</div><div class='add'>+	out_be32(&amp;ifc-&gt;cm_erattr1, 0x0);</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_ifc_ctrl_remove(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fsl_ifc_ctrl *ctrl = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	free_irq(ctrl-&gt;nand_irq, ctrl);</div><div class='add'>+	free_irq(ctrl-&gt;irq, ctrl);</div><div class='add'>+</div><div class='add'>+	irq_dispose_mapping(ctrl-&gt;nand_irq);</div><div class='add'>+	irq_dispose_mapping(ctrl-&gt;irq);</div><div class='add'>+</div><div class='add'>+	iounmap(ctrl-&gt;regs);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='add'>+	kfree(ctrl);</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'>+ * NAND events are split between an operational interrupt which only</div><div class='add'>+ * receives OPC, and an error interrupt that receives everything else,</div><div class='add'>+ * including non-NAND errors.  Whichever interrupt gets to it first</div><div class='add'>+ * records the status and wakes the wait queue.</div><div class='add'>+ */</div><div class='add'>+static DEFINE_SPINLOCK(nand_irq_lock);</div><div class='add'>+</div><div class='add'>+static u32 check_nand_stat(struct fsl_ifc_ctrl *ctrl)</div><div class='add'>+{</div><div class='add'>+	struct fsl_ifc_regs __iomem *ifc = ctrl-&gt;regs;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 stat;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;nand_irq_lock, flags);</div><div class='add'>+</div><div class='add'>+	stat = in_be32(&amp;ifc-&gt;ifc_nand.nand_evter_stat);</div><div class='add'>+	if (stat) {</div><div class='add'>+		out_be32(&amp;ifc-&gt;ifc_nand.nand_evter_stat, stat);</div><div class='add'>+		ctrl-&gt;nand_stat = stat;</div><div class='add'>+		wake_up(&amp;ctrl-&gt;nand_wait);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;nand_irq_lock, flags);</div><div class='add'>+</div><div class='add'>+	return stat;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t fsl_ifc_nand_irq(int irqno, void *data)</div><div class='add'>+{</div><div class='add'>+	struct fsl_ifc_ctrl *ctrl = data;</div><div class='add'>+</div><div class='add'>+	if (check_nand_stat(ctrl))</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'>+/*</div><div class='add'>+ * NOTE: This interrupt is used to report ifc events of various kinds,</div><div class='add'>+ * such as transaction errors on the chipselects.</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t fsl_ifc_ctrl_irq(int irqno, void *data)</div><div class='add'>+{</div><div class='add'>+	struct fsl_ifc_ctrl *ctrl = data;</div><div class='add'>+	struct fsl_ifc_regs __iomem *ifc = ctrl-&gt;regs;</div><div class='add'>+	u32 err_axiid, err_srcid, status, cs_err, err_addr;</div><div class='add'>+	irqreturn_t ret = IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	/* read for chip select error */</div><div class='add'>+	cs_err = in_be32(&amp;ifc-&gt;cm_evter_stat);</div><div class='add'>+	if (cs_err) {</div><div class='add'>+		dev_err(ctrl-&gt;dev, "transaction sent to IFC is not mapped to"</div><div class='add'>+				"any memory bank 0x%08X\n", cs_err);</div><div class='add'>+		/* clear the chip select error */</div><div class='add'>+		out_be32(&amp;ifc-&gt;cm_evter_stat, IFC_CM_EVTER_STAT_CSER);</div><div class='add'>+</div><div class='add'>+		/* read error attribute registers print the error information */</div><div class='add'>+		status = in_be32(&amp;ifc-&gt;cm_erattr0);</div><div class='add'>+		err_addr = in_be32(&amp;ifc-&gt;cm_erattr1);</div><div class='add'>+</div><div class='add'>+		if (status &amp; IFC_CM_ERATTR0_ERTYP_READ)</div><div class='add'>+			dev_err(ctrl-&gt;dev, "Read transaction error"</div><div class='add'>+				"CM_ERATTR0 0x%08X\n", status);</div><div class='add'>+		else</div><div class='add'>+			dev_err(ctrl-&gt;dev, "Write transaction error"</div><div class='add'>+				"CM_ERATTR0 0x%08X\n", status);</div><div class='add'>+</div><div class='add'>+		err_axiid = (status &amp; IFC_CM_ERATTR0_ERAID) &gt;&gt;</div><div class='add'>+					IFC_CM_ERATTR0_ERAID_SHIFT;</div><div class='add'>+		dev_err(ctrl-&gt;dev, "AXI ID of the error"</div><div class='add'>+					"transaction 0x%08X\n", err_axiid);</div><div class='add'>+</div><div class='add'>+		err_srcid = (status &amp; IFC_CM_ERATTR0_ESRCID) &gt;&gt;</div><div class='add'>+					IFC_CM_ERATTR0_ESRCID_SHIFT;</div><div class='add'>+		dev_err(ctrl-&gt;dev, "SRC ID of the error"</div><div class='add'>+					"transaction 0x%08X\n", err_srcid);</div><div class='add'>+</div><div class='add'>+		dev_err(ctrl-&gt;dev, "Transaction Address corresponding to error"</div><div class='add'>+					"ERADDR 0x%08X\n", err_addr);</div><div class='add'>+</div><div class='add'>+		ret = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (check_nand_stat(ctrl))</div><div class='add'>+		ret = IRQ_HANDLED;</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'>+ * fsl_ifc_ctrl_probe</div><div class='add'>+ *</div><div class='add'>+ * called by device layer when it finds a device matching</div><div class='add'>+ * one our driver can handled. This code allocates all of</div><div class='add'>+ * the resources needed for the controller only.  The</div><div class='add'>+ * resources for the NAND banks themselves are allocated</div><div class='add'>+ * in the chip probe function.</div><div class='add'>+*/</div><div class='add'>+static int __devinit fsl_ifc_ctrl_probe(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;dev-&gt;dev, "Freescale Integrated Flash Controller\n");</div><div class='add'>+</div><div class='add'>+	fsl_ifc_ctrl_dev = kzalloc(sizeof(*fsl_ifc_ctrl_dev), GFP_KERNEL);</div><div class='add'>+	if (!fsl_ifc_ctrl_dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, fsl_ifc_ctrl_dev);</div><div class='add'>+</div><div class='add'>+	/* IOMAP the entire IFC region */</div><div class='add'>+	fsl_ifc_ctrl_dev-&gt;regs = of_iomap(dev-&gt;dev.of_node, 0);</div><div class='add'>+	if (!fsl_ifc_ctrl_dev-&gt;regs) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "failed to get memory region\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get the Controller level irq */</div><div class='add'>+	fsl_ifc_ctrl_dev-&gt;irq = irq_of_parse_and_map(dev-&gt;dev.of_node, 0);</div><div class='add'>+	if (fsl_ifc_ctrl_dev-&gt;irq == NO_IRQ) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "failed to get irq resource "</div><div class='add'>+							"for IFC\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get the nand machine irq */</div><div class='add'>+	fsl_ifc_ctrl_dev-&gt;nand_irq =</div><div class='add'>+			irq_of_parse_and_map(dev-&gt;dev.of_node, 1);</div><div class='add'>+	if (fsl_ifc_ctrl_dev-&gt;nand_irq == NO_IRQ) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "failed to get irq resource "</div><div class='add'>+						"for NAND Machine\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fsl_ifc_ctrl_dev-&gt;dev = &amp;dev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	ret = fsl_ifc_ctrl_init(fsl_ifc_ctrl_dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;fsl_ifc_ctrl_dev-&gt;nand_wait);</div><div class='add'>+</div><div class='add'>+	ret = request_irq(fsl_ifc_ctrl_dev-&gt;irq, fsl_ifc_ctrl_irq, IRQF_SHARED,</div><div class='add'>+			  "fsl-ifc", fsl_ifc_ctrl_dev);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "failed to install irq (%d)\n",</div><div class='add'>+			fsl_ifc_ctrl_dev-&gt;irq);</div><div class='add'>+		goto err_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = request_irq(fsl_ifc_ctrl_dev-&gt;nand_irq, fsl_ifc_nand_irq, 0,</div><div class='add'>+			  "fsl-ifc-nand", fsl_ifc_ctrl_dev);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "failed to install irq (%d)\n",</div><div class='add'>+			fsl_ifc_ctrl_dev-&gt;nand_irq);</div><div class='add'>+		goto err_nandirq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_nandirq:</div><div class='add'>+	free_irq(fsl_ifc_ctrl_dev-&gt;nand_irq, fsl_ifc_ctrl_dev);</div><div class='add'>+	irq_dispose_mapping(fsl_ifc_ctrl_dev-&gt;nand_irq);</div><div class='add'>+err_irq:</div><div class='add'>+	free_irq(fsl_ifc_ctrl_dev-&gt;irq, fsl_ifc_ctrl_dev);</div><div class='add'>+	irq_dispose_mapping(fsl_ifc_ctrl_dev-&gt;irq);</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id fsl_ifc_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "fsl,ifc",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver fsl_ifc_ctrl_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "fsl-ifc",</div><div class='add'>+		.of_match_table = fsl_ifc_match,</div><div class='add'>+	},</div><div class='add'>+	.probe       = fsl_ifc_ctrl_probe,</div><div class='add'>+	.remove      = fsl_ifc_ctrl_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(fsl_ifc_ctrl_driver);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Freescale Semiconductor");</div><div class='add'>+MODULE_DESCRIPTION("Freescale Integrated Flash Controller driver");</div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c<br/>index d5c3c90ee698..483126d7b3c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/fsl_lbc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/fsl_lbc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/fsl_lbc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/fsl_lbc.c</a></div><div class='hunk'>@@ -332,6 +332,38 @@ err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SUSPEND</div><div class='add'>+</div><div class='add'>+/* save lbc registers */</div><div class='add'>+static int fsl_lbc_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct fsl_lbc_ctrl *ctrl = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+	struct fsl_lbc_regs __iomem *lbc = ctrl-&gt;regs;</div><div class='add'>+</div><div class='add'>+	ctrl-&gt;saved_regs = kmalloc(sizeof(struct fsl_lbc_regs), GFP_KERNEL);</div><div class='add'>+	if (!ctrl-&gt;saved_regs)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	_memcpy_fromio(ctrl-&gt;saved_regs, lbc, sizeof(struct fsl_lbc_regs));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* restore lbc registers */</div><div class='add'>+static int fsl_lbc_resume(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct fsl_lbc_ctrl *ctrl = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+	struct fsl_lbc_regs __iomem *lbc = ctrl-&gt;regs;</div><div class='add'>+</div><div class='add'>+	if (ctrl-&gt;saved_regs) {</div><div class='add'>+		_memcpy_toio(lbc, ctrl-&gt;saved_regs,</div><div class='add'>+				sizeof(struct fsl_lbc_regs));</div><div class='add'>+		kfree(ctrl-&gt;saved_regs);</div><div class='add'>+		ctrl-&gt;saved_regs = NULL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_SUSPEND */</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id fsl_lbc_match[] = {</div><div class='ctx'> 	{ .compatible = "fsl,elbc", },</div><div class='ctx'> 	{ .compatible = "fsl,pq3-localbus", },</div><div class='hunk'>@@ -346,6 +378,10 @@ static struct platform_driver fsl_lbc_ctrl_driver = {</div><div class='ctx'> 		.of_match_table = fsl_lbc_match,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = fsl_lbc_ctrl_probe,</div><div class='add'>+#ifdef CONFIG_SUSPEND</div><div class='add'>+	.suspend     = fsl_lbc_suspend,</div><div class='add'>+	.resume      = fsl_lbc_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init fsl_lbc_init(void)</div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c<br/>index e5c344d336ea..ecb5c1946d22 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/fsl_msi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/fsl_msi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/fsl_msi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/fsl_msi.c</a></div><div class='hunk'>@@ -23,6 +23,8 @@</div><div class='ctx'> #include &lt;asm/hw_irq.h&gt;</div><div class='ctx'> #include &lt;asm/ppc-pci.h&gt;</div><div class='ctx'> #include &lt;asm/mpic.h&gt;</div><div class='add'>+#include &lt;asm/fsl_hcalls.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "fsl_msi.h"</div><div class='ctx'> #include "fsl_pci.h"</div><div class='ctx'> </div><div class='hunk'>@@ -148,14 +150,49 @@ static void fsl_compose_msi_msg(struct pci_dev *pdev, int hwirq,</div><div class='ctx'> </div><div class='ctx'> static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)</div><div class='ctx'> {</div><div class='add'>+	struct pci_controller *hose = pci_bus_to_host(pdev-&gt;bus);</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	phandle phandle = 0;</div><div class='ctx'> 	int rc, hwirq = -ENOMEM;</div><div class='ctx'> 	unsigned int virq;</div><div class='ctx'> 	struct msi_desc *entry;</div><div class='ctx'> 	struct msi_msg msg;</div><div class='ctx'> 	struct fsl_msi *msi_data;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If the PCI node has an fsl,msi property, then we need to use it</div><div class='add'>+	 * to find the specific MSI.</div><div class='add'>+	 */</div><div class='add'>+	np = of_parse_phandle(hose-&gt;dn, "fsl,msi", 0);</div><div class='add'>+	if (np) {</div><div class='add'>+		if (of_device_is_compatible(np, "fsl,mpic-msi") ||</div><div class='add'>+		    of_device_is_compatible(np, "fsl,vmpic-msi"))</div><div class='add'>+			phandle = np-&gt;phandle;</div><div class='add'>+		else {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+				"node %s has an invalid fsl,msi phandle %u\n",</div><div class='add'>+				hose-&gt;dn-&gt;full_name, np-&gt;phandle);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry(entry, &amp;pdev-&gt;msi_list, list) {</div><div class='add'>+		/*</div><div class='add'>+		 * Loop over all the MSI devices until we find one that has an</div><div class='add'>+		 * available interrupt.</div><div class='add'>+		 */</div><div class='ctx'> 		list_for_each_entry(msi_data, &amp;msi_head, list) {</div><div class='add'>+			/*</div><div class='add'>+			 * If the PCI node has an fsl,msi property, then we</div><div class='add'>+			 * restrict our search to the corresponding MSI node.</div><div class='add'>+			 * The simplest way is to skip over MSI nodes with the</div><div class='add'>+			 * wrong phandle. Under the Freescale hypervisor, this</div><div class='add'>+			 * has the additional benefit of skipping over MSI</div><div class='add'>+			 * nodes that are not mapped in the PAMU.</div><div class='add'>+			 */</div><div class='add'>+			if (phandle &amp;&amp; (phandle != msi_data-&gt;phandle))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='ctx'> 			hwirq = msi_bitmap_alloc_hwirqs(&amp;msi_data-&gt;bitmap, 1);</div><div class='ctx'> 			if (hwirq &gt;= 0)</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -163,16 +200,14 @@ static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)</div><div class='ctx'> </div><div class='ctx'> 		if (hwirq &lt; 0) {</div><div class='ctx'> 			rc = hwirq;</div><div class='del'>-			pr_debug("%s: fail allocating msi interrupt\n",</div><div class='del'>-					__func__);</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "could not allocate MSI interrupt\n");</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		virq = irq_create_mapping(msi_data-&gt;irqhost, hwirq);</div><div class='ctx'> </div><div class='ctx'> 		if (virq == NO_IRQ) {</div><div class='del'>-			pr_debug("%s: fail mapping hwirq 0x%x\n",</div><div class='del'>-					__func__, hwirq);</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "fail mapping hwirq %i\n", hwirq);</div><div class='ctx'> 			msi_bitmap_free_hwirqs(&amp;msi_data-&gt;bitmap, hwirq, 1);</div><div class='ctx'> 			rc = -ENOSPC;</div><div class='ctx'> 			goto out_free;</div><div class='hunk'>@@ -201,6 +236,7 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 	u32 intr_index;</div><div class='ctx'> 	u32 have_shift = 0;</div><div class='ctx'> 	struct fsl_msi_cascade_data *cascade_data;</div><div class='add'>+	unsigned int ret;</div><div class='ctx'> </div><div class='ctx'> 	cascade_data = irq_get_handler_data(irq);</div><div class='ctx'> 	msi_data = cascade_data-&gt;msi_data;</div><div class='hunk'>@@ -232,6 +268,14 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 	case FSL_PIC_IP_IPIC:</div><div class='ctx'> 		msir_value = fsl_msi_read(msi_data-&gt;msi_regs, msir_index * 0x4);</div><div class='ctx'> 		break;</div><div class='add'>+	case FSL_PIC_IP_VMPIC:</div><div class='add'>+		ret = fh_vmpic_get_msir(virq_to_hw(irq), &amp;msir_value);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_err("fsl-msi: fh_vmpic_get_msir() failed for "</div><div class='add'>+			       "irq %u (ret=%u)\n", irq, ret);</div><div class='add'>+			msir_value = 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (msir_value) {</div><div class='hunk'>@@ -249,6 +293,7 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> </div><div class='ctx'> 	switch (msi_data-&gt;feature &amp; FSL_PIC_IP_MASK) {</div><div class='ctx'> 	case FSL_PIC_IP_MPIC:</div><div class='add'>+	case FSL_PIC_IP_VMPIC:</div><div class='ctx'> 		chip-&gt;irq_eoi(idata);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FSL_PIC_IP_IPIC:</div><div class='hunk'>@@ -278,7 +323,8 @@ static int fsl_of_msi_remove(struct platform_device *ofdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (msi-&gt;bitmap.bitmap)</div><div class='ctx'> 		msi_bitmap_free(&amp;msi-&gt;bitmap);</div><div class='del'>-	iounmap(msi-&gt;msi_regs);</div><div class='add'>+	if ((msi-&gt;feature &amp; FSL_PIC_IP_MASK) != FSL_PIC_IP_VMPIC)</div><div class='add'>+		iounmap(msi-&gt;msi_regs);</div><div class='ctx'> 	kfree(msi);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -350,25 +396,37 @@ static int __devinit fsl_of_msi_probe(struct platform_device *dev)</div><div class='ctx'> 		goto error_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Get the MSI reg base */</div><div class='del'>-	err = of_address_to_resource(dev-&gt;dev.of_node, 0, &amp;res);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;dev-&gt;dev, "%s resource error!\n",</div><div class='add'>+	/*</div><div class='add'>+	 * Under the Freescale hypervisor, the msi nodes don't have a 'reg'</div><div class='add'>+	 * property.  Instead, we use hypercalls to access the MSI.</div><div class='add'>+	 */</div><div class='add'>+	if ((features-&gt;fsl_pic_ip &amp; FSL_PIC_IP_MASK) != FSL_PIC_IP_VMPIC) {</div><div class='add'>+		err = of_address_to_resource(dev-&gt;dev.of_node, 0, &amp;res);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "invalid resource for node %s\n",</div><div class='ctx'> 				dev-&gt;dev.of_node-&gt;full_name);</div><div class='del'>-		goto error_out;</div><div class='del'>-	}</div><div class='add'>+			goto error_out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	msi-&gt;msi_regs = ioremap(res.start, resource_size(&amp;res));</div><div class='del'>-	if (!msi-&gt;msi_regs) {</div><div class='del'>-		dev_err(&amp;dev-&gt;dev, "ioremap problem failed\n");</div><div class='del'>-		goto error_out;</div><div class='add'>+		msi-&gt;msi_regs = ioremap(res.start, resource_size(&amp;res));</div><div class='add'>+		if (!msi-&gt;msi_regs) {</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "could not map node %s\n",</div><div class='add'>+				dev-&gt;dev.of_node-&gt;full_name);</div><div class='add'>+			goto error_out;</div><div class='add'>+		}</div><div class='add'>+		msi-&gt;msiir_offset =</div><div class='add'>+			features-&gt;msiir_offset + (res.start &amp; 0xfffff);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	msi-&gt;feature = features-&gt;fsl_pic_ip;</div><div class='ctx'> </div><div class='ctx'> 	msi-&gt;irqhost-&gt;host_data = msi;</div><div class='ctx'> </div><div class='del'>-	msi-&gt;msiir_offset = features-&gt;msiir_offset + (res.start &amp; 0xfffff);</div><div class='add'>+	/*</div><div class='add'>+	 * Remember the phandle, so that we can match with any PCI nodes</div><div class='add'>+	 * that have an "fsl,msi" property.</div><div class='add'>+	 */</div><div class='add'>+	msi-&gt;phandle = dev-&gt;dev.of_node-&gt;phandle;</div><div class='ctx'> </div><div class='ctx'> 	rc = fsl_msi_init_allocator(msi);</div><div class='ctx'> 	if (rc) {</div><div class='hunk'>@@ -437,6 +495,11 @@ static const struct fsl_msi_feature ipic_msi_feature = {</div><div class='ctx'> 	.msiir_offset = 0x38,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct fsl_msi_feature vmpic_msi_feature = {</div><div class='add'>+	.fsl_pic_ip = FSL_PIC_IP_VMPIC,</div><div class='add'>+	.msiir_offset = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id fsl_of_msi_ids[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "fsl,mpic-msi",</div><div class='hunk'>@@ -446,6 +509,10 @@ static const struct of_device_id fsl_of_msi_ids[] = {</div><div class='ctx'> 		.compatible = "fsl,ipic-msi",</div><div class='ctx'> 		.data = (void *)&amp;ipic_msi_feature,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "fsl,vmpic-msi",</div><div class='add'>+		.data = (void *)&amp;vmpic_msi_feature,</div><div class='add'>+	},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_msi.h b/arch/powerpc/sysdev/fsl_msi.h<br/>index 1313abbc5200..f6c646a52541 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/fsl_msi.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/fsl_msi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/fsl_msi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/fsl_msi.h</a></div><div class='hunk'>@@ -13,15 +13,17 @@</div><div class='ctx'> #ifndef _POWERPC_SYSDEV_FSL_MSI_H</div><div class='ctx'> #define _POWERPC_SYSDEV_FSL_MSI_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;asm/msi_bitmap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define NR_MSI_REG		8</div><div class='ctx'> #define IRQS_PER_MSI_REG	32</div><div class='ctx'> #define NR_MSI_IRQS	(NR_MSI_REG * IRQS_PER_MSI_REG)</div><div class='ctx'> </div><div class='del'>-#define FSL_PIC_IP_MASK	0x0000000F</div><div class='del'>-#define FSL_PIC_IP_MPIC	0x00000001</div><div class='del'>-#define FSL_PIC_IP_IPIC	0x00000002</div><div class='add'>+#define FSL_PIC_IP_MASK   0x0000000F</div><div class='add'>+#define FSL_PIC_IP_MPIC   0x00000001</div><div class='add'>+#define FSL_PIC_IP_IPIC   0x00000002</div><div class='add'>+#define FSL_PIC_IP_VMPIC  0x00000003</div><div class='ctx'> </div><div class='ctx'> struct fsl_msi {</div><div class='ctx'> 	struct irq_host *irqhost;</div><div class='hunk'>@@ -36,6 +38,8 @@ struct fsl_msi {</div><div class='ctx'> 	struct msi_bitmap bitmap;</div><div class='ctx'> </div><div class='ctx'> 	struct list_head list;          /* support multiple MSI banks */</div><div class='add'>+</div><div class='add'>+	phandle phandle;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* _POWERPC_SYSDEV_FSL_MSI_H */</div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c<br/>index 4ce547e00473..3b61e8cf3421 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/fsl_pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/fsl_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/fsl_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/fsl_pci.c</a></div><div class='hunk'>@@ -65,6 +65,30 @@ static int __init fsl_pcie_check_link(struct pci_controller *hose)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_FSL_SOC_BOOKE) || defined(CONFIG_PPC_86xx)</div><div class='add'>+</div><div class='add'>+#define MAX_PHYS_ADDR_BITS	40</div><div class='add'>+static u64 pci64_dma_offset = 1ull &lt;&lt; MAX_PHYS_ADDR_BITS;</div><div class='add'>+</div><div class='add'>+static int fsl_pci_dma_set_mask(struct device *dev, u64 dma_mask)</div><div class='add'>+{</div><div class='add'>+	if (!dev-&gt;dma_mask || !dma_supported(dev, dma_mask))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Fixup PCI devices that are able to DMA to above the physical</div><div class='add'>+	 * address width of the SoC such that we can address any internal</div><div class='add'>+	 * SoC address from across PCI if needed</div><div class='add'>+	 */</div><div class='add'>+	if ((dev-&gt;bus == &amp;pci_bus_type) &amp;&amp;</div><div class='add'>+	    dma_mask &gt;= DMA_BIT_MASK(MAX_PHYS_ADDR_BITS)) {</div><div class='add'>+		set_dma_ops(dev, &amp;dma_direct_ops);</div><div class='add'>+		set_dma_offset(dev, pci64_dma_offset);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*dev-&gt;dma_mask = dma_mask;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init setup_one_atmu(struct ccsr_pci __iomem *pci,</div><div class='ctx'> 	unsigned int index, const struct resource *res,</div><div class='ctx'> 	resource_size_t offset)</div><div class='hunk'>@@ -113,6 +137,8 @@ static void __init setup_pci_atmu(struct pci_controller *hose,</div><div class='ctx'> 	u32 piwar = PIWAR_EN | PIWAR_PF | PIWAR_TGI_LOCAL |</div><div class='ctx'> 			PIWAR_READ_SNOOP | PIWAR_WRITE_SNOOP;</div><div class='ctx'> 	char *name = hose-&gt;dn-&gt;full_name;</div><div class='add'>+	const u64 *reg;</div><div class='add'>+	int len;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("PCI memory map start 0x%016llx, size 0x%016llx\n",</div><div class='ctx'> 		 (u64)rsrc-&gt;start, (u64)resource_size(rsrc));</div><div class='hunk'>@@ -205,6 +231,33 @@ static void __init setup_pci_atmu(struct pci_controller *hose,</div><div class='ctx'> </div><div class='ctx'> 	/* Setup inbound mem window */</div><div class='ctx'> 	mem = memblock_end_of_DRAM();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The msi-address-64 property, if it exists, indicates the physical</div><div class='add'>+	 * address of the MSIIR register.  Normally, this register is located</div><div class='add'>+	 * inside CCSR, so the ATMU that covers all of CCSR is used. But if</div><div class='add'>+	 * this property exists, then we normally need to create a new ATMU</div><div class='add'>+	 * for it.  For now, however, we cheat.  The only entity that creates</div><div class='add'>+	 * this property is the Freescale hypervisor, and the address is</div><div class='add'>+	 * specified in the partition configuration.  Typically, the address</div><div class='add'>+	 * is located in the page immediately after the end of DDR.  If so, we</div><div class='add'>+	 * can avoid allocating a new ATMU by extending the DDR ATMU by one</div><div class='add'>+	 * page.</div><div class='add'>+	 */</div><div class='add'>+	reg = of_get_property(hose-&gt;dn, "msi-address-64", &amp;len);</div><div class='add'>+	if (reg &amp;&amp; (len == sizeof(u64))) {</div><div class='add'>+		u64 address = be64_to_cpup(reg);</div><div class='add'>+</div><div class='add'>+		if ((address &gt;= mem) &amp;&amp; (address &lt; (mem + PAGE_SIZE))) {</div><div class='add'>+			pr_info("%s: extending DDR ATMU to cover MSIIR", name);</div><div class='add'>+			mem += PAGE_SIZE;</div><div class='add'>+		} else {</div><div class='add'>+			/* TODO: Create a new ATMU for MSIIR */</div><div class='add'>+			pr_warn("%s: msi-address-64 address of %llx is "</div><div class='add'>+				"unsupported\n", name, address);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	sz = min(mem, paddr_lo);</div><div class='ctx'> 	mem_log = __ilog2_u64(sz);</div><div class='ctx'> </div><div class='hunk'>@@ -228,6 +281,37 @@ static void __init setup_pci_atmu(struct pci_controller *hose,</div><div class='ctx'> </div><div class='ctx'> 		hose-&gt;dma_window_base_cur = 0x00000000;</div><div class='ctx'> 		hose-&gt;dma_window_size = (resource_size_t)sz;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * if we have &gt;4G of memory setup second PCI inbound window to</div><div class='add'>+		 * let devices that are 64-bit address capable to work w/o</div><div class='add'>+		 * SWIOTLB and access the full range of memory</div><div class='add'>+		 */</div><div class='add'>+		if (sz != mem) {</div><div class='add'>+			mem_log = __ilog2_u64(mem);</div><div class='add'>+</div><div class='add'>+			/* Size window up if we dont fit in exact power-of-2 */</div><div class='add'>+			if ((1ull &lt;&lt; mem_log) != mem)</div><div class='add'>+				mem_log++;</div><div class='add'>+</div><div class='add'>+			piwar = (piwar &amp; ~PIWAR_SZ_MASK) | (mem_log - 1);</div><div class='add'>+</div><div class='add'>+			/* Setup inbound memory window */</div><div class='add'>+			out_be32(&amp;pci-&gt;piw[win_idx].pitar,  0x00000000);</div><div class='add'>+			out_be32(&amp;pci-&gt;piw[win_idx].piwbear,</div><div class='add'>+					pci64_dma_offset &gt;&gt; 44);</div><div class='add'>+			out_be32(&amp;pci-&gt;piw[win_idx].piwbar,</div><div class='add'>+					pci64_dma_offset &gt;&gt; 12);</div><div class='add'>+			out_be32(&amp;pci-&gt;piw[win_idx].piwar,  piwar);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * install our own dma_set_mask handler to fixup dma_ops</div><div class='add'>+			 * and dma_offset</div><div class='add'>+			 */</div><div class='add'>+			ppc_md.dma_set_mask = fsl_pci_dma_set_mask;</div><div class='add'>+</div><div class='add'>+			pr_info("%s: Setup 64-bit PCI DMA window\n", name);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u64 paddr = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c<br/>index 22ffccd8bef5..a4c4f4a932d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/fsl_rio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/fsl_rio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/fsl_rio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/fsl_rio.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  * - Added Port-Write message handling</div><div class='ctx'>  * - Added Machine Check exception handling</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2007, 2008, 2010 Freescale Semiconductor, Inc.</div><div class='add'>+ * Copyright (C) 2007, 2008, 2010, 2011 Freescale Semiconductor, Inc.</div><div class='ctx'>  * Zhang Wei &lt;wei.zhang@freescale.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2005 MontaVista Software, Inc.</div><div class='hunk'>@@ -28,240 +28,33 @@</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/rio.h&gt;</div><div class='del'>-#include &lt;linux/rio_drv.h&gt;</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/kfifo.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#undef DEBUG_PW	/* Port-Write debugging */</div><div class='add'>+#include "fsl_rio.h"</div><div class='ctx'> </div><div class='del'>-/* RapidIO definition irq, which read from OF-tree */</div><div class='del'>-#define IRQ_RIO_BELL(m)		(((struct rio_priv *)(m-&gt;priv))-&gt;bellirq)</div><div class='del'>-#define IRQ_RIO_TX(m)		(((struct rio_priv *)(m-&gt;priv))-&gt;txirq)</div><div class='del'>-#define IRQ_RIO_RX(m)		(((struct rio_priv *)(m-&gt;priv))-&gt;rxirq)</div><div class='del'>-#define IRQ_RIO_PW(m)		(((struct rio_priv *)(m-&gt;priv))-&gt;pwirq)</div><div class='del'>-</div><div class='del'>-#define IPWSR_CLEAR		0x98</div><div class='del'>-#define OMSR_CLEAR		0x1cb3</div><div class='del'>-#define IMSR_CLEAR		0x491</div><div class='del'>-#define IDSR_CLEAR		0x91</div><div class='del'>-#define ODSR_CLEAR		0x1c00</div><div class='del'>-#define LTLEECSR_ENABLE_ALL	0xFFC000FC</div><div class='del'>-#define ESCSR_CLEAR		0x07120204</div><div class='del'>-#define IECSR_CLEAR		0x80000000</div><div class='add'>+#undef DEBUG_PW	/* Port-Write debugging */</div><div class='ctx'> </div><div class='ctx'> #define RIO_PORT1_EDCSR		0x0640</div><div class='ctx'> #define RIO_PORT2_EDCSR		0x0680</div><div class='ctx'> #define RIO_PORT1_IECSR		0x10130</div><div class='ctx'> #define RIO_PORT2_IECSR		0x101B0</div><div class='del'>-#define RIO_IM0SR		0x13064</div><div class='del'>-#define RIO_IM1SR		0x13164</div><div class='del'>-#define RIO_OM0SR		0x13004</div><div class='del'>-#define RIO_OM1SR		0x13104</div><div class='del'>-</div><div class='del'>-#define RIO_ATMU_REGS_OFFSET	0x10c00</div><div class='del'>-#define RIO_P_MSG_REGS_OFFSET	0x11000</div><div class='del'>-#define RIO_S_MSG_REGS_OFFSET	0x13000</div><div class='add'>+</div><div class='ctx'> #define RIO_GCCSR		0x13c</div><div class='ctx'> #define RIO_ESCSR		0x158</div><div class='add'>+#define ESCSR_CLEAR		0x07120204</div><div class='ctx'> #define RIO_PORT2_ESCSR		0x178</div><div class='ctx'> #define RIO_CCSR		0x15c</div><div class='del'>-#define RIO_LTLEDCSR		0x0608</div><div class='ctx'> #define RIO_LTLEDCSR_IER	0x80000000</div><div class='ctx'> #define RIO_LTLEDCSR_PRT	0x01000000</div><div class='del'>-#define RIO_LTLEECSR		0x060c</div><div class='del'>-#define RIO_EPWISR		0x10010</div><div class='add'>+#define IECSR_CLEAR		0x80000000</div><div class='ctx'> #define RIO_ISR_AACR		0x10120</div><div class='ctx'> #define RIO_ISR_AACR_AA		0x1	/* Accept All ID */</div><div class='del'>-#define RIO_MAINT_WIN_SIZE	0x400000</div><div class='del'>-#define RIO_DBELL_WIN_SIZE	0x1000</div><div class='del'>-</div><div class='del'>-#define RIO_MSG_OMR_MUI		0x00000002</div><div class='del'>-#define RIO_MSG_OSR_TE		0x00000080</div><div class='del'>-#define RIO_MSG_OSR_QOI		0x00000020</div><div class='del'>-#define RIO_MSG_OSR_QFI		0x00000010</div><div class='del'>-#define RIO_MSG_OSR_MUB		0x00000004</div><div class='del'>-#define RIO_MSG_OSR_EOMI	0x00000002</div><div class='del'>-#define RIO_MSG_OSR_QEI		0x00000001</div><div class='del'>-</div><div class='del'>-#define RIO_MSG_IMR_MI		0x00000002</div><div class='del'>-#define RIO_MSG_ISR_TE		0x00000080</div><div class='del'>-#define RIO_MSG_ISR_QFI		0x00000010</div><div class='del'>-#define RIO_MSG_ISR_DIQI	0x00000001</div><div class='del'>-</div><div class='del'>-#define RIO_IPWMR_SEN		0x00100000</div><div class='del'>-#define RIO_IPWMR_QFIE		0x00000100</div><div class='del'>-#define RIO_IPWMR_EIE		0x00000020</div><div class='del'>-#define RIO_IPWMR_CQ		0x00000002</div><div class='del'>-#define RIO_IPWMR_PWE		0x00000001</div><div class='del'>-</div><div class='del'>-#define RIO_IPWSR_QF		0x00100000</div><div class='del'>-#define RIO_IPWSR_TE		0x00000080</div><div class='del'>-#define RIO_IPWSR_QFI		0x00000010</div><div class='del'>-#define RIO_IPWSR_PWD		0x00000008</div><div class='del'>-#define RIO_IPWSR_PWB		0x00000004</div><div class='del'>-</div><div class='del'>-/* EPWISR Error match value */</div><div class='del'>-#define RIO_EPWISR_PINT1	0x80000000</div><div class='del'>-#define RIO_EPWISR_PINT2	0x40000000</div><div class='del'>-#define RIO_EPWISR_MU		0x00000002</div><div class='del'>-#define RIO_EPWISR_PW		0x00000001</div><div class='del'>-</div><div class='del'>-#define RIO_MSG_DESC_SIZE	32</div><div class='del'>-#define RIO_MSG_BUFFER_SIZE	4096</div><div class='del'>-#define RIO_MIN_TX_RING_SIZE	2</div><div class='del'>-#define RIO_MAX_TX_RING_SIZE	2048</div><div class='del'>-#define RIO_MIN_RX_RING_SIZE	2</div><div class='del'>-#define RIO_MAX_RX_RING_SIZE	2048</div><div class='del'>-</div><div class='del'>-#define DOORBELL_DMR_DI		0x00000002</div><div class='del'>-#define DOORBELL_DSR_TE		0x00000080</div><div class='del'>-#define DOORBELL_DSR_QFI	0x00000010</div><div class='del'>-#define DOORBELL_DSR_DIQI	0x00000001</div><div class='del'>-#define DOORBELL_TID_OFFSET	0x02</div><div class='del'>-#define DOORBELL_SID_OFFSET	0x04</div><div class='del'>-#define DOORBELL_INFO_OFFSET	0x06</div><div class='del'>-</div><div class='del'>-#define DOORBELL_MESSAGE_SIZE	0x08</div><div class='del'>-#define DBELL_SID(x)		(*(u16 *)(x + DOORBELL_SID_OFFSET))</div><div class='del'>-#define DBELL_TID(x)		(*(u16 *)(x + DOORBELL_TID_OFFSET))</div><div class='del'>-#define DBELL_INF(x)		(*(u16 *)(x + DOORBELL_INFO_OFFSET))</div><div class='del'>-</div><div class='del'>-struct rio_atmu_regs {</div><div class='del'>-	u32 rowtar;</div><div class='del'>-	u32 rowtear;</div><div class='del'>-	u32 rowbar;</div><div class='del'>-	u32 pad2;</div><div class='del'>-	u32 rowar;</div><div class='del'>-	u32 pad3[3];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct rio_msg_regs {</div><div class='del'>-	u32 omr;	/* 0xD_3000 - Outbound message 0 mode register */</div><div class='del'>-	u32 osr;	/* 0xD_3004 - Outbound message 0 status register */</div><div class='del'>-	u32 pad1;</div><div class='del'>-	u32 odqdpar;	/* 0xD_300C - Outbound message 0 descriptor queue</div><div class='del'>-			   dequeue pointer address register */</div><div class='del'>-	u32 pad2;</div><div class='del'>-	u32 osar;	/* 0xD_3014 - Outbound message 0 source address</div><div class='del'>-			   register */</div><div class='del'>-	u32 odpr;	/* 0xD_3018 - Outbound message 0 destination port</div><div class='del'>-			   register */</div><div class='del'>-	u32 odatr;	/* 0xD_301C - Outbound message 0 destination attributes</div><div class='del'>-			   Register*/</div><div class='del'>-	u32 odcr;	/* 0xD_3020 - Outbound message 0 double-word count</div><div class='del'>-			   register */</div><div class='del'>-	u32 pad3;</div><div class='del'>-	u32 odqepar;	/* 0xD_3028 - Outbound message 0 descriptor queue</div><div class='del'>-			   enqueue pointer address register */</div><div class='del'>-	u32 pad4[13];</div><div class='del'>-	u32 imr;	/* 0xD_3060 - Inbound message 0 mode register */</div><div class='del'>-	u32 isr;	/* 0xD_3064 - Inbound message 0 status register */</div><div class='del'>-	u32 pad5;</div><div class='del'>-	u32 ifqdpar;	/* 0xD_306C - Inbound message 0 frame queue dequeue</div><div class='del'>-			   pointer address register*/</div><div class='del'>-	u32 pad6;</div><div class='del'>-	u32 ifqepar;	/* 0xD_3074 - Inbound message 0 frame queue enqueue</div><div class='del'>-			   pointer address register */</div><div class='del'>-	u32 pad7[226];</div><div class='del'>-	u32 odmr;	/* 0xD_3400 - Outbound doorbell mode register */</div><div class='del'>-	u32 odsr;	/* 0xD_3404 - Outbound doorbell status register */</div><div class='del'>-	u32 res0[4];</div><div class='del'>-	u32 oddpr;	/* 0xD_3418 - Outbound doorbell destination port</div><div class='del'>-			   register */</div><div class='del'>-	u32 oddatr;	/* 0xD_341c - Outbound doorbell destination attributes</div><div class='del'>-			   register */</div><div class='del'>-	u32 res1[3];</div><div class='del'>-	u32 odretcr;	/* 0xD_342C - Outbound doorbell retry error threshold</div><div class='del'>-			   configuration register */</div><div class='del'>-	u32 res2[12];</div><div class='del'>-	u32 dmr;	/* 0xD_3460 - Inbound doorbell mode register */</div><div class='del'>-	u32 dsr;	/* 0xD_3464 - Inbound doorbell status register */</div><div class='del'>-	u32 pad8;</div><div class='del'>-	u32 dqdpar;	/* 0xD_346C - Inbound doorbell queue dequeue Pointer</div><div class='del'>-			   address register */</div><div class='del'>-	u32 pad9;</div><div class='del'>-	u32 dqepar;	/* 0xD_3474 - Inbound doorbell Queue enqueue pointer</div><div class='del'>-			   address register */</div><div class='del'>-	u32 pad10[26];</div><div class='del'>-	u32 pwmr;	/* 0xD_34E0 - Inbound port-write mode register */</div><div class='del'>-	u32 pwsr;	/* 0xD_34E4 - Inbound port-write status register */</div><div class='del'>-	u32 epwqbar;	/* 0xD_34E8 - Extended Port-Write Queue Base Address</div><div class='del'>-			   register */</div><div class='del'>-	u32 pwqbar;	/* 0xD_34EC - Inbound port-write queue base address</div><div class='del'>-			   register */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct rio_tx_desc {</div><div class='del'>-	u32 res1;</div><div class='del'>-	u32 saddr;</div><div class='del'>-	u32 dport;</div><div class='del'>-	u32 dattr;</div><div class='del'>-	u32 res2;</div><div class='del'>-	u32 res3;</div><div class='del'>-	u32 dwcnt;</div><div class='del'>-	u32 res4;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct rio_dbell_ring {</div><div class='del'>-	void *virt;</div><div class='del'>-	dma_addr_t phys;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct rio_msg_tx_ring {</div><div class='del'>-	void *virt;</div><div class='del'>-	dma_addr_t phys;</div><div class='del'>-	void *virt_buffer[RIO_MAX_TX_RING_SIZE];</div><div class='del'>-	dma_addr_t phys_buffer[RIO_MAX_TX_RING_SIZE];</div><div class='del'>-	int tx_slot;</div><div class='del'>-	int size;</div><div class='del'>-	void *dev_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct rio_msg_rx_ring {</div><div class='del'>-	void *virt;</div><div class='del'>-	dma_addr_t phys;</div><div class='del'>-	void *virt_buffer[RIO_MAX_RX_RING_SIZE];</div><div class='del'>-	int rx_slot;</div><div class='del'>-	int size;</div><div class='del'>-	void *dev_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct rio_port_write_msg {</div><div class='del'>-	void *virt;</div><div class='del'>-	dma_addr_t phys;</div><div class='del'>-	u32 msg_count;</div><div class='del'>-	u32 err_count;</div><div class='del'>-	u32 discard_count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct rio_priv {</div><div class='del'>-	struct device *dev;</div><div class='del'>-	void __iomem *regs_win;</div><div class='del'>-	struct rio_atmu_regs __iomem *atmu_regs;</div><div class='del'>-	struct rio_atmu_regs __iomem *maint_atmu_regs;</div><div class='del'>-	struct rio_atmu_regs __iomem *dbell_atmu_regs;</div><div class='del'>-	void __iomem *dbell_win;</div><div class='del'>-	void __iomem *maint_win;</div><div class='del'>-	struct rio_msg_regs __iomem *msg_regs;</div><div class='del'>-	struct rio_dbell_ring dbell_ring;</div><div class='del'>-	struct rio_msg_tx_ring msg_tx_ring;</div><div class='del'>-	struct rio_msg_rx_ring msg_rx_ring;</div><div class='del'>-	struct rio_port_write_msg port_write_msg;</div><div class='del'>-	int bellirq;</div><div class='del'>-	int txirq;</div><div class='del'>-	int rxirq;</div><div class='del'>-	int pwirq;</div><div class='del'>-	struct work_struct pw_work;</div><div class='del'>-	struct kfifo pw_fifo;</div><div class='del'>-	spinlock_t pw_fifo_lock;</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> #define __fsl_read_rio_config(x, addr, err, op)		\</div><div class='ctx'> 	__asm__ __volatile__(				\</div><div class='hunk'>@@ -279,7 +72,12 @@ struct rio_priv {</div><div class='ctx'> 		: "=r" (err), "=r" (x)			\</div><div class='ctx'> 		: "b" (addr), "i" (-EFAULT), "0" (err))</div><div class='ctx'> </div><div class='del'>-static void __iomem *rio_regs_win;</div><div class='add'>+void __iomem *rio_regs_win;</div><div class='add'>+void __iomem *rmu_regs_win;</div><div class='add'>+resource_size_t rio_law_start;</div><div class='add'>+</div><div class='add'>+struct fsl_rio_dbell *dbell;</div><div class='add'>+struct fsl_rio_pw *pw;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_E500</div><div class='ctx'> int fsl_rio_mcheck_exception(struct pt_regs *regs)</div><div class='hunk'>@@ -311,42 +109,6 @@ EXPORT_SYMBOL_GPL(fsl_rio_mcheck_exception);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * fsl_rio_doorbell_send - Send a MPC85xx doorbell message</div><div class='del'>- * @mport: RapidIO master port info</div><div class='del'>- * @index: ID of RapidIO interface</div><div class='del'>- * @destid: Destination ID of target device</div><div class='del'>- * @data: 16-bit info field of RapidIO doorbell message</div><div class='del'>- *</div><div class='del'>- * Sends a MPC85xx doorbell message. Returns %0 on success or</div><div class='del'>- * %-EINVAL on failure.</div><div class='del'>- */</div><div class='del'>-static int fsl_rio_doorbell_send(struct rio_mport *mport,</div><div class='del'>-				int index, u16 destid, u16 data)</div><div class='del'>-{</div><div class='del'>-	struct rio_priv *priv = mport-&gt;priv;</div><div class='del'>-	pr_debug("fsl_doorbell_send: index %d destid %4.4x data %4.4x\n",</div><div class='del'>-		 index, destid, data);</div><div class='del'>-	switch (mport-&gt;phy_type) {</div><div class='del'>-	case RIO_PHY_PARALLEL:</div><div class='del'>-		out_be32(&amp;priv-&gt;dbell_atmu_regs-&gt;rowtar, destid &lt;&lt; 22);</div><div class='del'>-		out_be16(priv-&gt;dbell_win, data);</div><div class='del'>-		break;</div><div class='del'>-	case RIO_PHY_SERIAL:</div><div class='del'>-		/* In the serial version silicons, such as MPC8548, MPC8641,</div><div class='del'>-		 * below operations is must be.</div><div class='del'>-		 */</div><div class='del'>-		out_be32(&amp;priv-&gt;msg_regs-&gt;odmr, 0x00000000);</div><div class='del'>-		out_be32(&amp;priv-&gt;msg_regs-&gt;odretcr, 0x00000004);</div><div class='del'>-		out_be32(&amp;priv-&gt;msg_regs-&gt;oddpr, destid &lt;&lt; 16);</div><div class='del'>-		out_be32(&amp;priv-&gt;msg_regs-&gt;oddatr, data);</div><div class='del'>-		out_be32(&amp;priv-&gt;msg_regs-&gt;odmr, 0x00000001);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * fsl_local_config_read - Generate a MPC85xx local config space read</div><div class='ctx'>  * @mport: RapidIO master port info</div><div class='ctx'>  * @index: ID of RapdiIO interface</div><div class='hunk'>@@ -384,8 +146,8 @@ static int fsl_local_config_write(struct rio_mport *mport,</div><div class='ctx'> {</div><div class='ctx'> 	struct rio_priv *priv = mport-&gt;priv;</div><div class='ctx'> 	pr_debug</div><div class='del'>-	    ("fsl_local_config_write: index %d offset %8.8x data %8.8x\n",</div><div class='del'>-	     index, offset, data);</div><div class='add'>+		("fsl_local_config_write: index %d offset %8.8x data %8.8x\n",</div><div class='add'>+		index, offset, data);</div><div class='ctx'> 	out_be32(priv-&gt;regs_win + offset, data);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -413,8 +175,9 @@ fsl_rio_config_read(struct rio_mport *mport, int index, u16 destid,</div><div class='ctx'> 	u32 rval, err = 0;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug</div><div class='del'>-	    ("fsl_rio_config_read: index %d destid %d hopcount %d offset %8.8x len %d\n",</div><div class='del'>-	     index, destid, hopcount, offset, len);</div><div class='add'>+		("fsl_rio_config_read:"</div><div class='add'>+		" index %d destid %d hopcount %d offset %8.8x len %d\n",</div><div class='add'>+		index, destid, hopcount, offset, len);</div><div class='ctx'> </div><div class='ctx'> 	/* 16MB maintenance window possible */</div><div class='ctx'> 	/* allow only aligned access to maintenance registers */</div><div class='hunk'>@@ -423,7 +186,7 @@ fsl_rio_config_read(struct rio_mport *mport, int index, u16 destid,</div><div class='ctx'> </div><div class='ctx'> 	out_be32(&amp;priv-&gt;maint_atmu_regs-&gt;rowtar,</div><div class='ctx'> 		 (destid &lt;&lt; 22) | (hopcount &lt;&lt; 12) | (offset &gt;&gt; 12));</div><div class='del'>-	out_be32(&amp;priv-&gt;maint_atmu_regs-&gt;rowtear,  (destid &gt;&gt; 10));</div><div class='add'>+	out_be32(&amp;priv-&gt;maint_atmu_regs-&gt;rowtear, (destid &gt;&gt; 10));</div><div class='ctx'> </div><div class='ctx'> 	data = (u8 *) priv-&gt;maint_win + (offset &amp; (RIO_MAINT_WIN_SIZE - 1));</div><div class='ctx'> 	switch (len) {</div><div class='hunk'>@@ -470,8 +233,9 @@ fsl_rio_config_write(struct rio_mport *mport, int index, u16 destid,</div><div class='ctx'> 	struct rio_priv *priv = mport-&gt;priv;</div><div class='ctx'> 	u8 *data;</div><div class='ctx'> 	pr_debug</div><div class='del'>-	    ("fsl_rio_config_write: index %d destid %d hopcount %d offset %8.8x len %d val %8.8x\n",</div><div class='del'>-	     index, destid, hopcount, offset, len, val);</div><div class='add'>+		("fsl_rio_config_write:"</div><div class='add'>+		" index %d destid %d hopcount %d offset %8.8x len %d val %8.8x\n",</div><div class='add'>+		index, destid, hopcount, offset, len, val);</div><div class='ctx'> </div><div class='ctx'> 	/* 16MB maintenance windows possible */</div><div class='ctx'> 	/* allow only aligned access to maintenance registers */</div><div class='hunk'>@@ -480,7 +244,7 @@ fsl_rio_config_write(struct rio_mport *mport, int index, u16 destid,</div><div class='ctx'> </div><div class='ctx'> 	out_be32(&amp;priv-&gt;maint_atmu_regs-&gt;rowtar,</div><div class='ctx'> 		 (destid &lt;&lt; 22) | (hopcount &lt;&lt; 12) | (offset &gt;&gt; 12));</div><div class='del'>-	out_be32(&amp;priv-&gt;maint_atmu_regs-&gt;rowtear,  (destid &gt;&gt; 10));</div><div class='add'>+	out_be32(&amp;priv-&gt;maint_atmu_regs-&gt;rowtear, (destid &gt;&gt; 10));</div><div class='ctx'> </div><div class='ctx'> 	data = (u8 *) priv-&gt;maint_win + (offset &amp; (RIO_MAINT_WIN_SIZE - 1));</div><div class='ctx'> 	switch (len) {</div><div class='hunk'>@@ -500,590 +264,7 @@ fsl_rio_config_write(struct rio_mport *mport, int index, u16 destid,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * fsl_add_outb_message - Add message to the MPC85xx outbound message queue</div><div class='del'>- * @mport: Master port with outbound message queue</div><div class='del'>- * @rdev: Target of outbound message</div><div class='del'>- * @mbox: Outbound mailbox</div><div class='del'>- * @buffer: Message to add to outbound queue</div><div class='del'>- * @len: Length of message</div><div class='del'>- *</div><div class='del'>- * Adds the @buffer message to the MPC85xx outbound message queue. Returns</div><div class='del'>- * %0 on success or %-EINVAL on failure.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-fsl_add_outb_message(struct rio_mport *mport, struct rio_dev *rdev, int mbox,</div><div class='del'>-			void *buffer, size_t len)</div><div class='del'>-{</div><div class='del'>-	struct rio_priv *priv = mport-&gt;priv;</div><div class='del'>-	u32 omr;</div><div class='del'>-	struct rio_tx_desc *desc = (struct rio_tx_desc *)priv-&gt;msg_tx_ring.virt</div><div class='del'>-					+ priv-&gt;msg_tx_ring.tx_slot;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	pr_debug("RIO: fsl_add_outb_message(): destid %4.4x mbox %d buffer " \</div><div class='del'>-		 "%8.8x len %8.8x\n", rdev-&gt;destid, mbox, (int)buffer, len);</div><div class='del'>-</div><div class='del'>-	if ((len &lt; 8) || (len &gt; RIO_MAX_MSG_SIZE)) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Copy and clear rest of buffer */</div><div class='del'>-	memcpy(priv-&gt;msg_tx_ring.virt_buffer[priv-&gt;msg_tx_ring.tx_slot], buffer,</div><div class='del'>-			len);</div><div class='del'>-	if (len &lt; (RIO_MAX_MSG_SIZE - 4))</div><div class='del'>-		memset(priv-&gt;msg_tx_ring.virt_buffer[priv-&gt;msg_tx_ring.tx_slot]</div><div class='del'>-				+ len, 0, RIO_MAX_MSG_SIZE - len);</div><div class='del'>-</div><div class='del'>-	switch (mport-&gt;phy_type) {</div><div class='del'>-	case RIO_PHY_PARALLEL:</div><div class='del'>-		/* Set mbox field for message */</div><div class='del'>-		desc-&gt;dport = mbox &amp; 0x3;</div><div class='del'>-</div><div class='del'>-		/* Enable EOMI interrupt, set priority, and set destid */</div><div class='del'>-		desc-&gt;dattr = 0x28000000 | (rdev-&gt;destid &lt;&lt; 2);</div><div class='del'>-		break;</div><div class='del'>-	case RIO_PHY_SERIAL:</div><div class='del'>-		/* Set mbox field for message, and set destid */</div><div class='del'>-		desc-&gt;dport = (rdev-&gt;destid &lt;&lt; 16) | (mbox &amp; 0x3);</div><div class='del'>-</div><div class='del'>-		/* Enable EOMI interrupt and priority */</div><div class='del'>-		desc-&gt;dattr = 0x28000000;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set transfer size aligned to next power of 2 (in double words) */</div><div class='del'>-	desc-&gt;dwcnt = is_power_of_2(len) ? len : 1 &lt;&lt; get_bitmask_order(len);</div><div class='del'>-</div><div class='del'>-	/* Set snooping and source buffer address */</div><div class='del'>-	desc-&gt;saddr = 0x00000004</div><div class='del'>-		| priv-&gt;msg_tx_ring.phys_buffer[priv-&gt;msg_tx_ring.tx_slot];</div><div class='del'>-</div><div class='del'>-	/* Increment enqueue pointer */</div><div class='del'>-	omr = in_be32(&amp;priv-&gt;msg_regs-&gt;omr);</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;omr, omr | RIO_MSG_OMR_MUI);</div><div class='del'>-</div><div class='del'>-	/* Go to next descriptor */</div><div class='del'>-	if (++priv-&gt;msg_tx_ring.tx_slot == priv-&gt;msg_tx_ring.size)</div><div class='del'>-		priv-&gt;msg_tx_ring.tx_slot = 0;</div><div class='del'>-</div><div class='del'>-      out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * fsl_rio_tx_handler - MPC85xx outbound message interrupt handler</div><div class='del'>- * @irq: Linux interrupt number</div><div class='del'>- * @dev_instance: Pointer to interrupt-specific data</div><div class='del'>- *</div><div class='del'>- * Handles outbound message interrupts. Executes a register outbound</div><div class='del'>- * mailbox event handler and acks the interrupt occurrence.</div><div class='del'>- */</div><div class='del'>-static irqreturn_t</div><div class='del'>-fsl_rio_tx_handler(int irq, void *dev_instance)</div><div class='del'>-{</div><div class='del'>-	int osr;</div><div class='del'>-	struct rio_mport *port = (struct rio_mport *)dev_instance;</div><div class='del'>-	struct rio_priv *priv = port-&gt;priv;</div><div class='del'>-</div><div class='del'>-	osr = in_be32(&amp;priv-&gt;msg_regs-&gt;osr);</div><div class='del'>-</div><div class='del'>-	if (osr &amp; RIO_MSG_OSR_TE) {</div><div class='del'>-		pr_info("RIO: outbound message transmission error\n");</div><div class='del'>-		out_be32(&amp;priv-&gt;msg_regs-&gt;osr, RIO_MSG_OSR_TE);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (osr &amp; RIO_MSG_OSR_QOI) {</div><div class='del'>-		pr_info("RIO: outbound message queue overflow\n");</div><div class='del'>-		out_be32(&amp;priv-&gt;msg_regs-&gt;osr, RIO_MSG_OSR_QOI);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (osr &amp; RIO_MSG_OSR_EOMI) {</div><div class='del'>-		u32 dqp = in_be32(&amp;priv-&gt;msg_regs-&gt;odqdpar);</div><div class='del'>-		int slot = (dqp - priv-&gt;msg_tx_ring.phys) &gt;&gt; 5;</div><div class='del'>-		port-&gt;outb_msg[0].mcback(port, priv-&gt;msg_tx_ring.dev_id, -1,</div><div class='del'>-				slot);</div><div class='del'>-</div><div class='del'>-		/* Ack the end-of-message interrupt */</div><div class='del'>-		out_be32(&amp;priv-&gt;msg_regs-&gt;osr, RIO_MSG_OSR_EOMI);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-      out:</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * fsl_open_outb_mbox - Initialize MPC85xx outbound mailbox</div><div class='del'>- * @mport: Master port implementing the outbound message unit</div><div class='del'>- * @dev_id: Device specific pointer to pass on event</div><div class='del'>- * @mbox: Mailbox to open</div><div class='del'>- * @entries: Number of entries in the outbound mailbox ring</div><div class='del'>- *</div><div class='del'>- * Initializes buffer ring, request the outbound message interrupt,</div><div class='del'>- * and enables the outbound message unit. Returns %0 on success and</div><div class='del'>- * %-EINVAL or %-ENOMEM on failure.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-fsl_open_outb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entries)</div><div class='del'>-{</div><div class='del'>-	int i, j, rc = 0;</div><div class='del'>-	struct rio_priv *priv = mport-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if ((entries &lt; RIO_MIN_TX_RING_SIZE) ||</div><div class='del'>-	    (entries &gt; RIO_MAX_TX_RING_SIZE) || (!is_power_of_2(entries))) {</div><div class='del'>-		rc = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Initialize shadow copy ring */</div><div class='del'>-	priv-&gt;msg_tx_ring.dev_id = dev_id;</div><div class='del'>-	priv-&gt;msg_tx_ring.size = entries;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;msg_tx_ring.size; i++) {</div><div class='del'>-		priv-&gt;msg_tx_ring.virt_buffer[i] =</div><div class='del'>-			dma_alloc_coherent(priv-&gt;dev, RIO_MSG_BUFFER_SIZE,</div><div class='del'>-				&amp;priv-&gt;msg_tx_ring.phys_buffer[i], GFP_KERNEL);</div><div class='del'>-		if (!priv-&gt;msg_tx_ring.virt_buffer[i]) {</div><div class='del'>-			rc = -ENOMEM;</div><div class='del'>-			for (j = 0; j &lt; priv-&gt;msg_tx_ring.size; j++)</div><div class='del'>-				if (priv-&gt;msg_tx_ring.virt_buffer[j])</div><div class='del'>-					dma_free_coherent(priv-&gt;dev,</div><div class='del'>-							RIO_MSG_BUFFER_SIZE,</div><div class='del'>-							priv-&gt;msg_tx_ring.</div><div class='del'>-							virt_buffer[j],</div><div class='del'>-							priv-&gt;msg_tx_ring.</div><div class='del'>-							phys_buffer[j]);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Initialize outbound message descriptor ring */</div><div class='del'>-	priv-&gt;msg_tx_ring.virt = dma_alloc_coherent(priv-&gt;dev,</div><div class='del'>-				priv-&gt;msg_tx_ring.size * RIO_MSG_DESC_SIZE,</div><div class='del'>-				&amp;priv-&gt;msg_tx_ring.phys, GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;msg_tx_ring.virt) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto out_dma;</div><div class='del'>-	}</div><div class='del'>-	memset(priv-&gt;msg_tx_ring.virt, 0,</div><div class='del'>-			priv-&gt;msg_tx_ring.size * RIO_MSG_DESC_SIZE);</div><div class='del'>-	priv-&gt;msg_tx_ring.tx_slot = 0;</div><div class='del'>-</div><div class='del'>-	/* Point dequeue/enqueue pointers at first entry in ring */</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;odqdpar, priv-&gt;msg_tx_ring.phys);</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;odqepar, priv-&gt;msg_tx_ring.phys);</div><div class='del'>-</div><div class='del'>-	/* Configure for snooping */</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;osar, 0x00000004);</div><div class='del'>-</div><div class='del'>-	/* Clear interrupt status */</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;osr, 0x000000b3);</div><div class='del'>-</div><div class='del'>-	/* Hook up outbound message handler */</div><div class='del'>-	rc = request_irq(IRQ_RIO_TX(mport), fsl_rio_tx_handler, 0,</div><div class='del'>-			 "msg_tx", (void *)mport);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		goto out_irq;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Configure outbound message unit</div><div class='del'>-	 *      Snooping</div><div class='del'>-	 *      Interrupts (all enabled, except QEIE)</div><div class='del'>-	 *      Chaining mode</div><div class='del'>-	 *      Disable</div><div class='del'>-	 */</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;omr, 0x00100220);</div><div class='del'>-</div><div class='del'>-	/* Set number of entries */</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;omr,</div><div class='del'>-		 in_be32(&amp;priv-&gt;msg_regs-&gt;omr) |</div><div class='del'>-		 ((get_bitmask_order(entries) - 2) &lt;&lt; 12));</div><div class='del'>-</div><div class='del'>-	/* Now enable the unit */</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;omr, in_be32(&amp;priv-&gt;msg_regs-&gt;omr) | 0x1);</div><div class='del'>-</div><div class='del'>-      out:</div><div class='del'>-	return rc;</div><div class='del'>-</div><div class='del'>-      out_irq:</div><div class='del'>-	dma_free_coherent(priv-&gt;dev,</div><div class='del'>-			  priv-&gt;msg_tx_ring.size * RIO_MSG_DESC_SIZE,</div><div class='del'>-			  priv-&gt;msg_tx_ring.virt, priv-&gt;msg_tx_ring.phys);</div><div class='del'>-</div><div class='del'>-      out_dma:</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;msg_tx_ring.size; i++)</div><div class='del'>-		dma_free_coherent(priv-&gt;dev, RIO_MSG_BUFFER_SIZE,</div><div class='del'>-				  priv-&gt;msg_tx_ring.virt_buffer[i],</div><div class='del'>-				  priv-&gt;msg_tx_ring.phys_buffer[i]);</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'>- * fsl_close_outb_mbox - Shut down MPC85xx outbound mailbox</div><div class='del'>- * @mport: Master port implementing the outbound message unit</div><div class='del'>- * @mbox: Mailbox to close</div><div class='del'>- *</div><div class='del'>- * Disables the outbound message unit, free all buffers, and</div><div class='del'>- * frees the outbound message interrupt.</div><div class='del'>- */</div><div class='del'>-static void fsl_close_outb_mbox(struct rio_mport *mport, int mbox)</div><div class='del'>-{</div><div class='del'>-	struct rio_priv *priv = mport-&gt;priv;</div><div class='del'>-	/* Disable inbound message unit */</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;omr, 0);</div><div class='del'>-</div><div class='del'>-	/* Free ring */</div><div class='del'>-	dma_free_coherent(priv-&gt;dev,</div><div class='del'>-			  priv-&gt;msg_tx_ring.size * RIO_MSG_DESC_SIZE,</div><div class='del'>-			  priv-&gt;msg_tx_ring.virt, priv-&gt;msg_tx_ring.phys);</div><div class='del'>-</div><div class='del'>-	/* Free interrupt */</div><div class='del'>-	free_irq(IRQ_RIO_TX(mport), (void *)mport);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * fsl_rio_rx_handler - MPC85xx inbound message interrupt handler</div><div class='del'>- * @irq: Linux interrupt number</div><div class='del'>- * @dev_instance: Pointer to interrupt-specific data</div><div class='del'>- *</div><div class='del'>- * Handles inbound message interrupts. Executes a registered inbound</div><div class='del'>- * mailbox event handler and acks the interrupt occurrence.</div><div class='del'>- */</div><div class='del'>-static irqreturn_t</div><div class='del'>-fsl_rio_rx_handler(int irq, void *dev_instance)</div><div class='del'>-{</div><div class='del'>-	int isr;</div><div class='del'>-	struct rio_mport *port = (struct rio_mport *)dev_instance;</div><div class='del'>-	struct rio_priv *priv = port-&gt;priv;</div><div class='del'>-</div><div class='del'>-	isr = in_be32(&amp;priv-&gt;msg_regs-&gt;isr);</div><div class='del'>-</div><div class='del'>-	if (isr &amp; RIO_MSG_ISR_TE) {</div><div class='del'>-		pr_info("RIO: inbound message reception error\n");</div><div class='del'>-		out_be32((void *)&amp;priv-&gt;msg_regs-&gt;isr, RIO_MSG_ISR_TE);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* XXX Need to check/dispatch until queue empty */</div><div class='del'>-	if (isr &amp; RIO_MSG_ISR_DIQI) {</div><div class='del'>-		/*</div><div class='del'>-		 * We implement *only* mailbox 0, but can receive messages</div><div class='del'>-		 * for any mailbox/letter to that mailbox destination. So,</div><div class='del'>-		 * make the callback with an unknown/invalid mailbox number</div><div class='del'>-		 * argument.</div><div class='del'>-		 */</div><div class='del'>-		port-&gt;inb_msg[0].mcback(port, priv-&gt;msg_rx_ring.dev_id, -1, -1);</div><div class='del'>-</div><div class='del'>-		/* Ack the queueing interrupt */</div><div class='del'>-		out_be32(&amp;priv-&gt;msg_regs-&gt;isr, RIO_MSG_ISR_DIQI);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-      out:</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * fsl_open_inb_mbox - Initialize MPC85xx inbound mailbox</div><div class='del'>- * @mport: Master port implementing the inbound message unit</div><div class='del'>- * @dev_id: Device specific pointer to pass on event</div><div class='del'>- * @mbox: Mailbox to open</div><div class='del'>- * @entries: Number of entries in the inbound mailbox ring</div><div class='del'>- *</div><div class='del'>- * Initializes buffer ring, request the inbound message interrupt,</div><div class='del'>- * and enables the inbound message unit. Returns %0 on success</div><div class='del'>- * and %-EINVAL or %-ENOMEM on failure.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-fsl_open_inb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entries)</div><div class='del'>-{</div><div class='del'>-	int i, rc = 0;</div><div class='del'>-	struct rio_priv *priv = mport-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if ((entries &lt; RIO_MIN_RX_RING_SIZE) ||</div><div class='del'>-	    (entries &gt; RIO_MAX_RX_RING_SIZE) || (!is_power_of_2(entries))) {</div><div class='del'>-		rc = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Initialize client buffer ring */</div><div class='del'>-	priv-&gt;msg_rx_ring.dev_id = dev_id;</div><div class='del'>-	priv-&gt;msg_rx_ring.size = entries;</div><div class='del'>-	priv-&gt;msg_rx_ring.rx_slot = 0;</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;msg_rx_ring.size; i++)</div><div class='del'>-		priv-&gt;msg_rx_ring.virt_buffer[i] = NULL;</div><div class='del'>-</div><div class='del'>-	/* Initialize inbound message ring */</div><div class='del'>-	priv-&gt;msg_rx_ring.virt = dma_alloc_coherent(priv-&gt;dev,</div><div class='del'>-				priv-&gt;msg_rx_ring.size * RIO_MAX_MSG_SIZE,</div><div class='del'>-				&amp;priv-&gt;msg_rx_ring.phys, GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;msg_rx_ring.virt) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Point dequeue/enqueue pointers at first entry in ring */</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;ifqdpar, (u32) priv-&gt;msg_rx_ring.phys);</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;ifqepar, (u32) priv-&gt;msg_rx_ring.phys);</div><div class='del'>-</div><div class='del'>-	/* Clear interrupt status */</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;isr, 0x00000091);</div><div class='del'>-</div><div class='del'>-	/* Hook up inbound message handler */</div><div class='del'>-	rc = request_irq(IRQ_RIO_RX(mport), fsl_rio_rx_handler, 0,</div><div class='del'>-			 "msg_rx", (void *)mport);</div><div class='del'>-	if (rc &lt; 0) {</div><div class='del'>-		dma_free_coherent(priv-&gt;dev, RIO_MSG_BUFFER_SIZE,</div><div class='del'>-				  priv-&gt;msg_tx_ring.virt_buffer[i],</div><div class='del'>-				  priv-&gt;msg_tx_ring.phys_buffer[i]);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Configure inbound message unit:</div><div class='del'>-	 *      Snooping</div><div class='del'>-	 *      4KB max message size</div><div class='del'>-	 *      Unmask all interrupt sources</div><div class='del'>-	 *      Disable</div><div class='del'>-	 */</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;imr, 0x001b0060);</div><div class='del'>-</div><div class='del'>-	/* Set number of queue entries */</div><div class='del'>-	setbits32(&amp;priv-&gt;msg_regs-&gt;imr, (get_bitmask_order(entries) - 2) &lt;&lt; 12);</div><div class='del'>-</div><div class='del'>-	/* Now enable the unit */</div><div class='del'>-	setbits32(&amp;priv-&gt;msg_regs-&gt;imr, 0x1);</div><div class='del'>-</div><div class='del'>-      out:</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * fsl_close_inb_mbox - Shut down MPC85xx inbound mailbox</div><div class='del'>- * @mport: Master port implementing the inbound message unit</div><div class='del'>- * @mbox: Mailbox to close</div><div class='del'>- *</div><div class='del'>- * Disables the inbound message unit, free all buffers, and</div><div class='del'>- * frees the inbound message interrupt.</div><div class='del'>- */</div><div class='del'>-static void fsl_close_inb_mbox(struct rio_mport *mport, int mbox)</div><div class='del'>-{</div><div class='del'>-	struct rio_priv *priv = mport-&gt;priv;</div><div class='del'>-	/* Disable inbound message unit */</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;imr, 0);</div><div class='del'>-</div><div class='del'>-	/* Free ring */</div><div class='del'>-	dma_free_coherent(priv-&gt;dev, priv-&gt;msg_rx_ring.size * RIO_MAX_MSG_SIZE,</div><div class='del'>-			  priv-&gt;msg_rx_ring.virt, priv-&gt;msg_rx_ring.phys);</div><div class='del'>-</div><div class='del'>-	/* Free interrupt */</div><div class='del'>-	free_irq(IRQ_RIO_RX(mport), (void *)mport);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * fsl_add_inb_buffer - Add buffer to the MPC85xx inbound message queue</div><div class='del'>- * @mport: Master port implementing the inbound message unit</div><div class='del'>- * @mbox: Inbound mailbox number</div><div class='del'>- * @buf: Buffer to add to inbound queue</div><div class='del'>- *</div><div class='del'>- * Adds the @buf buffer to the MPC85xx inbound message queue. Returns</div><div class='del'>- * %0 on success or %-EINVAL on failure.</div><div class='del'>- */</div><div class='del'>-static int fsl_add_inb_buffer(struct rio_mport *mport, int mbox, void *buf)</div><div class='del'>-{</div><div class='del'>-	int rc = 0;</div><div class='del'>-	struct rio_priv *priv = mport-&gt;priv;</div><div class='del'>-</div><div class='del'>-	pr_debug("RIO: fsl_add_inb_buffer(), msg_rx_ring.rx_slot %d\n",</div><div class='del'>-		 priv-&gt;msg_rx_ring.rx_slot);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;msg_rx_ring.virt_buffer[priv-&gt;msg_rx_ring.rx_slot]) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "RIO: error adding inbound buffer %d, buffer exists\n",</div><div class='del'>-		       priv-&gt;msg_rx_ring.rx_slot);</div><div class='del'>-		rc = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;msg_rx_ring.virt_buffer[priv-&gt;msg_rx_ring.rx_slot] = buf;</div><div class='del'>-	if (++priv-&gt;msg_rx_ring.rx_slot == priv-&gt;msg_rx_ring.size)</div><div class='del'>-		priv-&gt;msg_rx_ring.rx_slot = 0;</div><div class='del'>-</div><div class='del'>-      out:</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * fsl_get_inb_message - Fetch inbound message from the MPC85xx message unit</div><div class='del'>- * @mport: Master port implementing the inbound message unit</div><div class='del'>- * @mbox: Inbound mailbox number</div><div class='del'>- *</div><div class='del'>- * Gets the next available inbound message from the inbound message queue.</div><div class='del'>- * A pointer to the message is returned on success or NULL on failure.</div><div class='del'>- */</div><div class='del'>-static void *fsl_get_inb_message(struct rio_mport *mport, int mbox)</div><div class='del'>-{</div><div class='del'>-	struct rio_priv *priv = mport-&gt;priv;</div><div class='del'>-	u32 phys_buf, virt_buf;</div><div class='del'>-	void *buf = NULL;</div><div class='del'>-	int buf_idx;</div><div class='del'>-</div><div class='del'>-	phys_buf = in_be32(&amp;priv-&gt;msg_regs-&gt;ifqdpar);</div><div class='del'>-</div><div class='del'>-	/* If no more messages, then bail out */</div><div class='del'>-	if (phys_buf == in_be32(&amp;priv-&gt;msg_regs-&gt;ifqepar))</div><div class='del'>-		goto out2;</div><div class='del'>-</div><div class='del'>-	virt_buf = (u32) priv-&gt;msg_rx_ring.virt + (phys_buf</div><div class='del'>-						- priv-&gt;msg_rx_ring.phys);</div><div class='del'>-	buf_idx = (phys_buf - priv-&gt;msg_rx_ring.phys) / RIO_MAX_MSG_SIZE;</div><div class='del'>-	buf = priv-&gt;msg_rx_ring.virt_buffer[buf_idx];</div><div class='del'>-</div><div class='del'>-	if (!buf) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "RIO: inbound message copy failed, no buffers\n");</div><div class='del'>-		goto out1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Copy max message size, caller is expected to allocate that big */</div><div class='del'>-	memcpy(buf, (void *)virt_buf, RIO_MAX_MSG_SIZE);</div><div class='del'>-</div><div class='del'>-	/* Clear the available buffer */</div><div class='del'>-	priv-&gt;msg_rx_ring.virt_buffer[buf_idx] = NULL;</div><div class='del'>-</div><div class='del'>-      out1:</div><div class='del'>-	setbits32(&amp;priv-&gt;msg_regs-&gt;imr, RIO_MSG_IMR_MI);</div><div class='del'>-</div><div class='del'>-      out2:</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * fsl_rio_dbell_handler - MPC85xx doorbell interrupt handler</div><div class='del'>- * @irq: Linux interrupt number</div><div class='del'>- * @dev_instance: Pointer to interrupt-specific data</div><div class='del'>- *</div><div class='del'>- * Handles doorbell interrupts. Parses a list of registered</div><div class='del'>- * doorbell event handlers and executes a matching event handler.</div><div class='del'>- */</div><div class='del'>-static irqreturn_t</div><div class='del'>-fsl_rio_dbell_handler(int irq, void *dev_instance)</div><div class='del'>-{</div><div class='del'>-	int dsr;</div><div class='del'>-	struct rio_mport *port = (struct rio_mport *)dev_instance;</div><div class='del'>-	struct rio_priv *priv = port-&gt;priv;</div><div class='del'>-</div><div class='del'>-	dsr = in_be32(&amp;priv-&gt;msg_regs-&gt;dsr);</div><div class='del'>-</div><div class='del'>-	if (dsr &amp; DOORBELL_DSR_TE) {</div><div class='del'>-		pr_info("RIO: doorbell reception error\n");</div><div class='del'>-		out_be32(&amp;priv-&gt;msg_regs-&gt;dsr, DOORBELL_DSR_TE);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dsr &amp; DOORBELL_DSR_QFI) {</div><div class='del'>-		pr_info("RIO: doorbell queue full\n");</div><div class='del'>-		out_be32(&amp;priv-&gt;msg_regs-&gt;dsr, DOORBELL_DSR_QFI);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* XXX Need to check/dispatch until queue empty */</div><div class='del'>-	if (dsr &amp; DOORBELL_DSR_DIQI) {</div><div class='del'>-		u32 dmsg =</div><div class='del'>-		    (u32) priv-&gt;dbell_ring.virt +</div><div class='del'>-		    (in_be32(&amp;priv-&gt;msg_regs-&gt;dqdpar) &amp; 0xfff);</div><div class='del'>-		struct rio_dbell *dbell;</div><div class='del'>-		int found = 0;</div><div class='del'>-</div><div class='del'>-		pr_debug</div><div class='del'>-		    ("RIO: processing doorbell, sid %2.2x tid %2.2x info %4.4x\n",</div><div class='del'>-		     DBELL_SID(dmsg), DBELL_TID(dmsg), DBELL_INF(dmsg));</div><div class='del'>-</div><div class='del'>-		list_for_each_entry(dbell, &amp;port-&gt;dbells, node) {</div><div class='del'>-			if ((dbell-&gt;res-&gt;start &lt;= DBELL_INF(dmsg)) &amp;&amp;</div><div class='del'>-			    (dbell-&gt;res-&gt;end &gt;= DBELL_INF(dmsg))) {</div><div class='del'>-				found = 1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (found) {</div><div class='del'>-			dbell-&gt;dinb(port, dbell-&gt;dev_id, DBELL_SID(dmsg), DBELL_TID(dmsg),</div><div class='del'>-				    DBELL_INF(dmsg));</div><div class='del'>-		} else {</div><div class='del'>-			pr_debug</div><div class='del'>-			    ("RIO: spurious doorbell, sid %2.2x tid %2.2x info %4.4x\n",</div><div class='del'>-			     DBELL_SID(dmsg), DBELL_TID(dmsg), DBELL_INF(dmsg));</div><div class='del'>-		}</div><div class='del'>-		setbits32(&amp;priv-&gt;msg_regs-&gt;dmr, DOORBELL_DMR_DI);</div><div class='del'>-		out_be32(&amp;priv-&gt;msg_regs-&gt;dsr, DOORBELL_DSR_DIQI);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-      out:</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * fsl_rio_doorbell_init - MPC85xx doorbell interface init</div><div class='del'>- * @mport: Master port implementing the inbound doorbell unit</div><div class='del'>- *</div><div class='del'>- * Initializes doorbell unit hardware and inbound DMA buffer</div><div class='del'>- * ring. Called from fsl_rio_setup(). Returns %0 on success</div><div class='del'>- * or %-ENOMEM on failure.</div><div class='del'>- */</div><div class='del'>-static int fsl_rio_doorbell_init(struct rio_mport *mport)</div><div class='del'>-{</div><div class='del'>-	struct rio_priv *priv = mport-&gt;priv;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	/* Map outbound doorbell window immediately after maintenance window */</div><div class='del'>-	priv-&gt;dbell_win = ioremap(mport-&gt;iores.start + RIO_MAINT_WIN_SIZE,</div><div class='del'>-			    RIO_DBELL_WIN_SIZE);</div><div class='del'>-	if (!priv-&gt;dbell_win) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "RIO: unable to map outbound doorbell window\n");</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Initialize inbound doorbells */</div><div class='del'>-	priv-&gt;dbell_ring.virt = dma_alloc_coherent(priv-&gt;dev, 512 *</div><div class='del'>-		    DOORBELL_MESSAGE_SIZE, &amp;priv-&gt;dbell_ring.phys, GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;dbell_ring.virt) {</div><div class='del'>-		printk(KERN_ERR "RIO: unable allocate inbound doorbell ring\n");</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		iounmap(priv-&gt;dbell_win);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Point dequeue/enqueue pointers at first entry in ring */</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;dqdpar, (u32) priv-&gt;dbell_ring.phys);</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;dqepar, (u32) priv-&gt;dbell_ring.phys);</div><div class='del'>-</div><div class='del'>-	/* Clear interrupt status */</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;dsr, 0x00000091);</div><div class='del'>-</div><div class='del'>-	/* Hook up doorbell handler */</div><div class='del'>-	rc = request_irq(IRQ_RIO_BELL(mport), fsl_rio_dbell_handler, 0,</div><div class='del'>-			 "dbell_rx", (void *)mport);</div><div class='del'>-	if (rc &lt; 0) {</div><div class='del'>-		iounmap(priv-&gt;dbell_win);</div><div class='del'>-		dma_free_coherent(priv-&gt;dev, 512 * DOORBELL_MESSAGE_SIZE,</div><div class='del'>-				  priv-&gt;dbell_ring.virt, priv-&gt;dbell_ring.phys);</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "MPC85xx RIO: unable to request inbound doorbell irq");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Configure doorbells for snooping, 512 entries, and enable */</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;dmr, 0x00108161);</div><div class='del'>-</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 port_error_handler(struct rio_mport *port, int offset)</div><div class='add'>+void fsl_rio_port_error_handler(int offset)</div><div class='ctx'> {</div><div class='ctx'> 	/*XXX: Error recovery is not implemented, we just clear errors */</div><div class='ctx'> 	out_be32((u32 *)(rio_regs_win + RIO_LTLEDCSR), 0);</div><div class='hunk'>@@ -1098,263 +279,6 @@ static void port_error_handler(struct rio_mport *port, int offset)</div><div class='ctx'> 		out_be32((u32 *)(rio_regs_win + RIO_PORT2_ESCSR), ESCSR_CLEAR);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static void msg_unit_error_handler(struct rio_mport *port)</div><div class='del'>-{</div><div class='del'>-	struct rio_priv *priv = port-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/*XXX: Error recovery is not implemented, we just clear errors */</div><div class='del'>-	out_be32((u32 *)(rio_regs_win + RIO_LTLEDCSR), 0);</div><div class='del'>-</div><div class='del'>-	out_be32((u32 *)(rio_regs_win + RIO_IM0SR), IMSR_CLEAR);</div><div class='del'>-	out_be32((u32 *)(rio_regs_win + RIO_IM1SR), IMSR_CLEAR);</div><div class='del'>-	out_be32((u32 *)(rio_regs_win + RIO_OM0SR), OMSR_CLEAR);</div><div class='del'>-	out_be32((u32 *)(rio_regs_win + RIO_OM1SR), OMSR_CLEAR);</div><div class='del'>-</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;odsr, ODSR_CLEAR);</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;dsr, IDSR_CLEAR);</div><div class='del'>-</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;pwsr, IPWSR_CLEAR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * fsl_rio_port_write_handler - MPC85xx port write interrupt handler</div><div class='del'>- * @irq: Linux interrupt number</div><div class='del'>- * @dev_instance: Pointer to interrupt-specific data</div><div class='del'>- *</div><div class='del'>- * Handles port write interrupts. Parses a list of registered</div><div class='del'>- * port write event handlers and executes a matching event handler.</div><div class='del'>- */</div><div class='del'>-static irqreturn_t</div><div class='del'>-fsl_rio_port_write_handler(int irq, void *dev_instance)</div><div class='del'>-{</div><div class='del'>-	u32 ipwmr, ipwsr;</div><div class='del'>-	struct rio_mport *port = (struct rio_mport *)dev_instance;</div><div class='del'>-	struct rio_priv *priv = port-&gt;priv;</div><div class='del'>-	u32 epwisr, tmp;</div><div class='del'>-</div><div class='del'>-	epwisr = in_be32(priv-&gt;regs_win + RIO_EPWISR);</div><div class='del'>-	if (!(epwisr &amp; RIO_EPWISR_PW))</div><div class='del'>-		goto pw_done;</div><div class='del'>-</div><div class='del'>-	ipwmr = in_be32(&amp;priv-&gt;msg_regs-&gt;pwmr);</div><div class='del'>-	ipwsr = in_be32(&amp;priv-&gt;msg_regs-&gt;pwsr);</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG_PW</div><div class='del'>-	pr_debug("PW Int-&gt;IPWMR: 0x%08x IPWSR: 0x%08x (", ipwmr, ipwsr);</div><div class='del'>-	if (ipwsr &amp; RIO_IPWSR_QF)</div><div class='del'>-		pr_debug(" QF");</div><div class='del'>-	if (ipwsr &amp; RIO_IPWSR_TE)</div><div class='del'>-		pr_debug(" TE");</div><div class='del'>-	if (ipwsr &amp; RIO_IPWSR_QFI)</div><div class='del'>-		pr_debug(" QFI");</div><div class='del'>-	if (ipwsr &amp; RIO_IPWSR_PWD)</div><div class='del'>-		pr_debug(" PWD");</div><div class='del'>-	if (ipwsr &amp; RIO_IPWSR_PWB)</div><div class='del'>-		pr_debug(" PWB");</div><div class='del'>-	pr_debug(" )\n");</div><div class='del'>-#endif</div><div class='del'>-	/* Schedule deferred processing if PW was received */</div><div class='del'>-	if (ipwsr &amp; RIO_IPWSR_QFI) {</div><div class='del'>-		/* Save PW message (if there is room in FIFO),</div><div class='del'>-		 * otherwise discard it.</div><div class='del'>-		 */</div><div class='del'>-		if (kfifo_avail(&amp;priv-&gt;pw_fifo) &gt;= RIO_PW_MSG_SIZE) {</div><div class='del'>-			priv-&gt;port_write_msg.msg_count++;</div><div class='del'>-			kfifo_in(&amp;priv-&gt;pw_fifo, priv-&gt;port_write_msg.virt,</div><div class='del'>-				 RIO_PW_MSG_SIZE);</div><div class='del'>-		} else {</div><div class='del'>-			priv-&gt;port_write_msg.discard_count++;</div><div class='del'>-			pr_debug("RIO: ISR Discarded Port-Write Msg(s) (%d)\n",</div><div class='del'>-				 priv-&gt;port_write_msg.discard_count);</div><div class='del'>-		}</div><div class='del'>-		/* Clear interrupt and issue Clear Queue command. This allows</div><div class='del'>-		 * another port-write to be received.</div><div class='del'>-		 */</div><div class='del'>-		out_be32(&amp;priv-&gt;msg_regs-&gt;pwsr,	RIO_IPWSR_QFI);</div><div class='del'>-		out_be32(&amp;priv-&gt;msg_regs-&gt;pwmr, ipwmr | RIO_IPWMR_CQ);</div><div class='del'>-</div><div class='del'>-		schedule_work(&amp;priv-&gt;pw_work);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((ipwmr &amp; RIO_IPWMR_EIE) &amp;&amp; (ipwsr &amp; RIO_IPWSR_TE)) {</div><div class='del'>-		priv-&gt;port_write_msg.err_count++;</div><div class='del'>-		pr_debug("RIO: Port-Write Transaction Err (%d)\n",</div><div class='del'>-			 priv-&gt;port_write_msg.err_count);</div><div class='del'>-		/* Clear Transaction Error: port-write controller should be</div><div class='del'>-		 * disabled when clearing this error</div><div class='del'>-		 */</div><div class='del'>-		out_be32(&amp;priv-&gt;msg_regs-&gt;pwmr, ipwmr &amp; ~RIO_IPWMR_PWE);</div><div class='del'>-		out_be32(&amp;priv-&gt;msg_regs-&gt;pwsr,	RIO_IPWSR_TE);</div><div class='del'>-		out_be32(&amp;priv-&gt;msg_regs-&gt;pwmr, ipwmr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ipwsr &amp; RIO_IPWSR_PWD) {</div><div class='del'>-		priv-&gt;port_write_msg.discard_count++;</div><div class='del'>-		pr_debug("RIO: Port Discarded Port-Write Msg(s) (%d)\n",</div><div class='del'>-			 priv-&gt;port_write_msg.discard_count);</div><div class='del'>-		out_be32(&amp;priv-&gt;msg_regs-&gt;pwsr, RIO_IPWSR_PWD);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-pw_done:</div><div class='del'>-	if (epwisr &amp; RIO_EPWISR_PINT1) {</div><div class='del'>-		tmp = in_be32(priv-&gt;regs_win + RIO_LTLEDCSR);</div><div class='del'>-		pr_debug("RIO_LTLEDCSR = 0x%x\n", tmp);</div><div class='del'>-		port_error_handler(port, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (epwisr &amp; RIO_EPWISR_PINT2) {</div><div class='del'>-		tmp = in_be32(priv-&gt;regs_win + RIO_LTLEDCSR);</div><div class='del'>-		pr_debug("RIO_LTLEDCSR = 0x%x\n", tmp);</div><div class='del'>-		port_error_handler(port, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (epwisr &amp; RIO_EPWISR_MU) {</div><div class='del'>-		tmp = in_be32(priv-&gt;regs_win + RIO_LTLEDCSR);</div><div class='del'>-		pr_debug("RIO_LTLEDCSR = 0x%x\n", tmp);</div><div class='del'>-		msg_unit_error_handler(port);</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 void fsl_pw_dpc(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct rio_priv *priv = container_of(work, struct rio_priv, pw_work);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u32 msg_buffer[RIO_PW_MSG_SIZE/sizeof(u32)];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Process port-write messages</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;pw_fifo_lock, flags);</div><div class='del'>-	while (kfifo_out(&amp;priv-&gt;pw_fifo, (unsigned char *)msg_buffer,</div><div class='del'>-			 RIO_PW_MSG_SIZE)) {</div><div class='del'>-		/* Process one message */</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;pw_fifo_lock, flags);</div><div class='del'>-#ifdef DEBUG_PW</div><div class='del'>-		{</div><div class='del'>-		u32 i;</div><div class='del'>-		pr_debug("%s : Port-Write Message:", __func__);</div><div class='del'>-		for (i = 0; i &lt; RIO_PW_MSG_SIZE/sizeof(u32); i++) {</div><div class='del'>-			if ((i%4) == 0)</div><div class='del'>-				pr_debug("\n0x%02x: 0x%08x", i*4,</div><div class='del'>-					 msg_buffer[i]);</div><div class='del'>-			else</div><div class='del'>-				pr_debug(" 0x%08x", msg_buffer[i]);</div><div class='del'>-		}</div><div class='del'>-		pr_debug("\n");</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		/* Pass the port-write message to RIO core for processing */</div><div class='del'>-		rio_inb_pwrite_handler((union rio_pw_msg *)msg_buffer);</div><div class='del'>-		spin_lock_irqsave(&amp;priv-&gt;pw_fifo_lock, flags);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;pw_fifo_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * fsl_rio_pw_enable - enable/disable port-write interface init</div><div class='del'>- * @mport: Master port implementing the port write unit</div><div class='del'>- * @enable:    1=enable; 0=disable port-write message handling</div><div class='del'>- */</div><div class='del'>-static int fsl_rio_pw_enable(struct rio_mport *mport, int enable)</div><div class='del'>-{</div><div class='del'>-	struct rio_priv *priv = mport-&gt;priv;</div><div class='del'>-	u32 rval;</div><div class='del'>-</div><div class='del'>-	rval = in_be32(&amp;priv-&gt;msg_regs-&gt;pwmr);</div><div class='del'>-</div><div class='del'>-	if (enable)</div><div class='del'>-		rval |= RIO_IPWMR_PWE;</div><div class='del'>-	else</div><div class='del'>-		rval &amp;= ~RIO_IPWMR_PWE;</div><div class='del'>-</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;pwmr, rval);</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'>- * fsl_rio_port_write_init - MPC85xx port write interface init</div><div class='del'>- * @mport: Master port implementing the port write unit</div><div class='del'>- *</div><div class='del'>- * Initializes port write unit hardware and DMA buffer</div><div class='del'>- * ring. Called from fsl_rio_setup(). Returns %0 on success</div><div class='del'>- * or %-ENOMEM on failure.</div><div class='del'>- */</div><div class='del'>-static int fsl_rio_port_write_init(struct rio_mport *mport)</div><div class='del'>-{</div><div class='del'>-	struct rio_priv *priv = mport-&gt;priv;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	/* Following configurations require a disabled port write controller */</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;pwmr,</div><div class='del'>-		 in_be32(&amp;priv-&gt;msg_regs-&gt;pwmr) &amp; ~RIO_IPWMR_PWE);</div><div class='del'>-</div><div class='del'>-	/* Initialize port write */</div><div class='del'>-	priv-&gt;port_write_msg.virt = dma_alloc_coherent(priv-&gt;dev,</div><div class='del'>-					RIO_PW_MSG_SIZE,</div><div class='del'>-					&amp;priv-&gt;port_write_msg.phys, GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;port_write_msg.virt) {</div><div class='del'>-		pr_err("RIO: unable allocate port write queue\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;port_write_msg.err_count = 0;</div><div class='del'>-	priv-&gt;port_write_msg.discard_count = 0;</div><div class='del'>-</div><div class='del'>-	/* Point dequeue/enqueue pointers at first entry */</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;epwqbar, 0);</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;pwqbar, (u32) priv-&gt;port_write_msg.phys);</div><div class='del'>-</div><div class='del'>-	pr_debug("EIPWQBAR: 0x%08x IPWQBAR: 0x%08x\n",</div><div class='del'>-		 in_be32(&amp;priv-&gt;msg_regs-&gt;epwqbar),</div><div class='del'>-		 in_be32(&amp;priv-&gt;msg_regs-&gt;pwqbar));</div><div class='del'>-</div><div class='del'>-	/* Clear interrupt status IPWSR */</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;pwsr,</div><div class='del'>-		 (RIO_IPWSR_TE | RIO_IPWSR_QFI | RIO_IPWSR_PWD));</div><div class='del'>-</div><div class='del'>-	/* Configure port write contoller for snooping enable all reporting,</div><div class='del'>-	   clear queue full */</div><div class='del'>-	out_be32(&amp;priv-&gt;msg_regs-&gt;pwmr,</div><div class='del'>-		 RIO_IPWMR_SEN | RIO_IPWMR_QFIE | RIO_IPWMR_EIE | RIO_IPWMR_CQ);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Hook up port-write handler */</div><div class='del'>-	rc = request_irq(IRQ_RIO_PW(mport), fsl_rio_port_write_handler,</div><div class='del'>-			IRQF_SHARED, "port-write", (void *)mport);</div><div class='del'>-	if (rc &lt; 0) {</div><div class='del'>-		pr_err("MPC85xx RIO: unable to request inbound doorbell irq");</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	/* Enable Error Interrupt */</div><div class='del'>-	out_be32((u32 *)(rio_regs_win + RIO_LTLEECSR), LTLEECSR_ENABLE_ALL);</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;pw_work, fsl_pw_dpc);</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;pw_fifo_lock);</div><div class='del'>-	if (kfifo_alloc(&amp;priv-&gt;pw_fifo, RIO_PW_MSG_SIZE * 32, GFP_KERNEL)) {</div><div class='del'>-		pr_err("FIFO allocation failed\n");</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto err_out_irq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pr_debug("IPWMR: 0x%08x IPWSR: 0x%08x\n",</div><div class='del'>-		 in_be32(&amp;priv-&gt;msg_regs-&gt;pwmr),</div><div class='del'>-		 in_be32(&amp;priv-&gt;msg_regs-&gt;pwsr));</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-</div><div class='del'>-err_out_irq:</div><div class='del'>-	free_irq(IRQ_RIO_PW(mport), (void *)mport);</div><div class='del'>-err_out:</div><div class='del'>-	dma_free_coherent(priv-&gt;dev, RIO_PW_MSG_SIZE,</div><div class='del'>-			  priv-&gt;port_write_msg.virt,</div><div class='del'>-			  priv-&gt;port_write_msg.phys);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void fsl_rio_info(struct device *dev, u32 ccsr)</div><div class='ctx'> {</div><div class='ctx'> 	const char *str;</div><div class='hunk'>@@ -1411,16 +335,21 @@ int fsl_rio_setup(struct platform_device *dev)</div><div class='ctx'> 	struct rio_mport *port;</div><div class='ctx'> 	struct rio_priv *priv;</div><div class='ctx'> 	int rc = 0;</div><div class='del'>-	const u32 *dt_range, *cell;</div><div class='del'>-	struct resource regs;</div><div class='add'>+	const u32 *dt_range, *cell, *port_index;</div><div class='add'>+	u32 active_ports = 0;</div><div class='add'>+	struct resource regs, rmu_regs;</div><div class='add'>+	struct device_node *np, *rmu_node;</div><div class='ctx'> 	int rlen;</div><div class='ctx'> 	u32 ccsr;</div><div class='del'>-	u64 law_start, law_size;</div><div class='add'>+	u64 range_start, range_size;</div><div class='ctx'> 	int paw, aw, sw;</div><div class='add'>+	u32 i;</div><div class='add'>+	static int tmp;</div><div class='add'>+	struct device_node *rmu_np[MAX_MSG_UNIT_NUM] = {NULL};</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;dev.of_node) {</div><div class='ctx'> 		dev_err(&amp;dev-&gt;dev, "Device OF-Node is NULL");</div><div class='del'>-		return -EFAULT;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rc = of_address_to_resource(dev-&gt;dev.of_node, 0, &amp;regs);</div><div class='hunk'>@@ -1429,37 +358,17 @@ int fsl_rio_setup(struct platform_device *dev)</div><div class='ctx'> 				dev-&gt;dev.of_node-&gt;full_name);</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='del'>-	dev_info(&amp;dev-&gt;dev, "Of-device full name %s\n", dev-&gt;dev.of_node-&gt;full_name);</div><div class='add'>+	dev_info(&amp;dev-&gt;dev, "Of-device full name %s\n",</div><div class='add'>+			dev-&gt;dev.of_node-&gt;full_name);</div><div class='ctx'> 	dev_info(&amp;dev-&gt;dev, "Regs: %pR\n", &amp;regs);</div><div class='ctx'> </div><div class='del'>-	dt_range = of_get_property(dev-&gt;dev.of_node, "ranges", &amp;rlen);</div><div class='del'>-	if (!dt_range) {</div><div class='del'>-		dev_err(&amp;dev-&gt;dev, "Can't get %s property 'ranges'\n",</div><div class='del'>-				dev-&gt;dev.of_node-&gt;full_name);</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	rio_regs_win = ioremap(regs.start, resource_size(&amp;regs));</div><div class='add'>+	if (!rio_regs_win) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Unable to map rio register window\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err_rio_regs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Get node address wide */</div><div class='del'>-	cell = of_get_property(dev-&gt;dev.of_node, "#address-cells", NULL);</div><div class='del'>-	if (cell)</div><div class='del'>-		aw = *cell;</div><div class='del'>-	else</div><div class='del'>-		aw = of_n_addr_cells(dev-&gt;dev.of_node);</div><div class='del'>-	/* Get node size wide */</div><div class='del'>-	cell = of_get_property(dev-&gt;dev.of_node, "#size-cells", NULL);</div><div class='del'>-	if (cell)</div><div class='del'>-		sw = *cell;</div><div class='del'>-	else</div><div class='del'>-		sw = of_n_size_cells(dev-&gt;dev.of_node);</div><div class='del'>-	/* Get parent address wide wide */</div><div class='del'>-	paw = of_n_addr_cells(dev-&gt;dev.of_node);</div><div class='del'>-</div><div class='del'>-	law_start = of_read_number(dt_range + aw, paw);</div><div class='del'>-	law_size = of_read_number(dt_range + aw + paw, sw);</div><div class='del'>-</div><div class='del'>-	dev_info(&amp;dev-&gt;dev, "LAW start 0x%016llx, size 0x%016llx.\n",</div><div class='del'>-			law_start, law_size);</div><div class='del'>-</div><div class='ctx'> 	ops = kzalloc(sizeof(struct rio_ops), GFP_KERNEL);</div><div class='ctx'> 	if (!ops) {</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='hunk'>@@ -1479,143 +388,257 @@ int fsl_rio_setup(struct platform_device *dev)</div><div class='ctx'> 	ops-&gt;add_inb_buffer = fsl_add_inb_buffer;</div><div class='ctx'> 	ops-&gt;get_inb_message = fsl_get_inb_message;</div><div class='ctx'> </div><div class='del'>-	port = kzalloc(sizeof(struct rio_mport), GFP_KERNEL);</div><div class='del'>-	if (!port) {</div><div class='add'>+	rmu_node = of_parse_phandle(dev-&gt;dev.of_node, "fsl,srio-rmu-handle", 0);</div><div class='add'>+	if (!rmu_node)</div><div class='add'>+		goto err_rmu;</div><div class='add'>+	rc = of_address_to_resource(rmu_node, 0, &amp;rmu_regs);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Can't get %s property 'reg'\n",</div><div class='add'>+				rmu_node-&gt;full_name);</div><div class='add'>+		goto err_rmu;</div><div class='add'>+	}</div><div class='add'>+	rmu_regs_win = ioremap(rmu_regs.start, resource_size(&amp;rmu_regs));</div><div class='add'>+	if (!rmu_regs_win) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Unable to map rmu register window\n");</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='del'>-		goto err_port;</div><div class='add'>+		goto err_rmu;</div><div class='add'>+	}</div><div class='add'>+	for_each_compatible_node(np, NULL, "fsl,srio-msg-unit") {</div><div class='add'>+		rmu_np[tmp] = np;</div><div class='add'>+		tmp++;</div><div class='ctx'> 	}</div><div class='del'>-	port-&gt;index = 0;</div><div class='ctx'> </div><div class='del'>-	priv = kzalloc(sizeof(struct rio_priv), GFP_KERNEL);</div><div class='del'>-	if (!priv) {</div><div class='del'>-		printk(KERN_ERR "Can't alloc memory for 'priv'\n");</div><div class='add'>+	/*set up doobell node*/</div><div class='add'>+	np = of_find_compatible_node(NULL, NULL, "fsl,srio-dbell-unit");</div><div class='add'>+	if (!np) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto err_dbell;</div><div class='add'>+	}</div><div class='add'>+	dbell = kzalloc(sizeof(struct fsl_rio_dbell), GFP_KERNEL);</div><div class='add'>+	if (!(dbell)) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Can't alloc memory for 'fsl_rio_dbell'\n");</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='del'>-		goto err_priv;</div><div class='add'>+		goto err_dbell;</div><div class='ctx'> 	}</div><div class='add'>+	dbell-&gt;dev = &amp;dev-&gt;dev;</div><div class='add'>+	dbell-&gt;bellirq = irq_of_parse_and_map(np, 1);</div><div class='add'>+	dev_info(&amp;dev-&gt;dev, "bellirq: %d\n", dbell-&gt;bellirq);</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;port-&gt;dbells);</div><div class='del'>-	port-&gt;iores.start = law_start;</div><div class='del'>-	port-&gt;iores.end = law_start + law_size - 1;</div><div class='del'>-	port-&gt;iores.flags = IORESOURCE_MEM;</div><div class='del'>-	port-&gt;iores.name = "rio_io_win";</div><div class='del'>-</div><div class='del'>-	if (request_resource(&amp;iomem_resource, &amp;port-&gt;iores) &lt; 0) {</div><div class='del'>-		dev_err(&amp;dev-&gt;dev, "RIO: Error requesting master port region"</div><div class='del'>-			" 0x%016llx-0x%016llx\n",</div><div class='del'>-			(u64)port-&gt;iores.start, (u64)port-&gt;iores.end);</div><div class='del'>-			rc = -ENOMEM;</div><div class='del'>-			goto err_res;</div><div class='add'>+	aw = of_n_addr_cells(np);</div><div class='add'>+	dt_range = of_get_property(np, "reg", &amp;rlen);</div><div class='add'>+	if (!dt_range) {</div><div class='add'>+		pr_err("%s: unable to find 'reg' property\n",</div><div class='add'>+			np-&gt;full_name);</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err_pw;</div><div class='ctx'> 	}</div><div class='add'>+	range_start = of_read_number(dt_range, aw);</div><div class='add'>+	dbell-&gt;dbell_regs = (struct rio_dbell_regs *)(rmu_regs_win +</div><div class='add'>+				(u32)range_start);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;pwirq   = irq_of_parse_and_map(dev-&gt;dev.of_node, 0);</div><div class='del'>-	priv-&gt;bellirq = irq_of_parse_and_map(dev-&gt;dev.of_node, 2);</div><div class='del'>-	priv-&gt;txirq = irq_of_parse_and_map(dev-&gt;dev.of_node, 3);</div><div class='del'>-	priv-&gt;rxirq = irq_of_parse_and_map(dev-&gt;dev.of_node, 4);</div><div class='del'>-	dev_info(&amp;dev-&gt;dev, "pwirq: %d, bellirq: %d, txirq: %d, rxirq %d\n",</div><div class='del'>-		 priv-&gt;pwirq, priv-&gt;bellirq, priv-&gt;txirq, priv-&gt;rxirq);</div><div class='del'>-</div><div class='del'>-	rio_init_dbell_res(&amp;port-&gt;riores[RIO_DOORBELL_RESOURCE], 0, 0xffff);</div><div class='del'>-	rio_init_mbox_res(&amp;port-&gt;riores[RIO_INB_MBOX_RESOURCE], 0, 0);</div><div class='del'>-	rio_init_mbox_res(&amp;port-&gt;riores[RIO_OUTB_MBOX_RESOURCE], 0, 0);</div><div class='del'>-	strcpy(port-&gt;name, "RIO0 mport");</div><div class='del'>-</div><div class='del'>-	priv-&gt;dev = &amp;dev-&gt;dev;</div><div class='del'>-</div><div class='del'>-	port-&gt;ops = ops;</div><div class='del'>-	port-&gt;priv = priv;</div><div class='del'>-	port-&gt;phys_efptr = 0x100;</div><div class='del'>-</div><div class='del'>-	priv-&gt;regs_win = ioremap(regs.start, resource_size(&amp;regs));</div><div class='del'>-	rio_regs_win = priv-&gt;regs_win;</div><div class='del'>-</div><div class='del'>-	/* Probe the master port phy type */</div><div class='del'>-	ccsr = in_be32(priv-&gt;regs_win + RIO_CCSR);</div><div class='del'>-	port-&gt;phy_type = (ccsr &amp; 1) ? RIO_PHY_SERIAL : RIO_PHY_PARALLEL;</div><div class='del'>-	dev_info(&amp;dev-&gt;dev, "RapidIO PHY type: %s\n",</div><div class='del'>-			(port-&gt;phy_type == RIO_PHY_PARALLEL) ? "parallel" :</div><div class='del'>-			((port-&gt;phy_type == RIO_PHY_SERIAL) ? "serial" :</div><div class='del'>-			 "unknown"));</div><div class='del'>-	/* Checking the port training status */</div><div class='del'>-	if (in_be32((priv-&gt;regs_win + RIO_ESCSR)) &amp; 1) {</div><div class='del'>-		dev_err(&amp;dev-&gt;dev, "Port is not ready. "</div><div class='del'>-				   "Try to restart connection...\n");</div><div class='del'>-		switch (port-&gt;phy_type) {</div><div class='del'>-		case RIO_PHY_SERIAL:</div><div class='add'>+	/*set up port write node*/</div><div class='add'>+	np = of_find_compatible_node(NULL, NULL, "fsl,srio-port-write-unit");</div><div class='add'>+	if (!np) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto err_pw;</div><div class='add'>+	}</div><div class='add'>+	pw = kzalloc(sizeof(struct fsl_rio_pw), GFP_KERNEL);</div><div class='add'>+	if (!(pw)) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Can't alloc memory for 'fsl_rio_pw'\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err_pw;</div><div class='add'>+	}</div><div class='add'>+	pw-&gt;dev = &amp;dev-&gt;dev;</div><div class='add'>+	pw-&gt;pwirq = irq_of_parse_and_map(np, 0);</div><div class='add'>+	dev_info(&amp;dev-&gt;dev, "pwirq: %d\n", pw-&gt;pwirq);</div><div class='add'>+	aw = of_n_addr_cells(np);</div><div class='add'>+	dt_range = of_get_property(np, "reg", &amp;rlen);</div><div class='add'>+	if (!dt_range) {</div><div class='add'>+		pr_err("%s: unable to find 'reg' property\n",</div><div class='add'>+			np-&gt;full_name);</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	range_start = of_read_number(dt_range, aw);</div><div class='add'>+	pw-&gt;pw_regs = (struct rio_pw_regs *)(rmu_regs_win + (u32)range_start);</div><div class='add'>+</div><div class='add'>+	/*set up ports node*/</div><div class='add'>+	for_each_child_of_node(dev-&gt;dev.of_node, np) {</div><div class='add'>+		port_index = of_get_property(np, "cell-index", NULL);</div><div class='add'>+		if (!port_index) {</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "Can't get %s property 'cell-index'\n",</div><div class='add'>+					np-&gt;full_name);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dt_range = of_get_property(np, "ranges", &amp;rlen);</div><div class='add'>+		if (!dt_range) {</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "Can't get %s property 'ranges'\n",</div><div class='add'>+					np-&gt;full_name);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Get node address wide */</div><div class='add'>+		cell = of_get_property(np, "#address-cells", NULL);</div><div class='add'>+		if (cell)</div><div class='add'>+			aw = *cell;</div><div class='add'>+		else</div><div class='add'>+			aw = of_n_addr_cells(np);</div><div class='add'>+		/* Get node size wide */</div><div class='add'>+		cell = of_get_property(np, "#size-cells", NULL);</div><div class='add'>+		if (cell)</div><div class='add'>+			sw = *cell;</div><div class='add'>+		else</div><div class='add'>+			sw = of_n_size_cells(np);</div><div class='add'>+		/* Get parent address wide wide */</div><div class='add'>+		paw = of_n_addr_cells(np);</div><div class='add'>+		range_start = of_read_number(dt_range + aw, paw);</div><div class='add'>+		range_size = of_read_number(dt_range + aw + paw, sw);</div><div class='add'>+</div><div class='add'>+		dev_info(&amp;dev-&gt;dev, "%s: LAW start 0x%016llx, size 0x%016llx.\n",</div><div class='add'>+				np-&gt;full_name, range_start, range_size);</div><div class='add'>+</div><div class='add'>+		port = kzalloc(sizeof(struct rio_mport), GFP_KERNEL);</div><div class='add'>+		if (!port)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		i = *port_index - 1;</div><div class='add'>+		port-&gt;index = (unsigned char)i;</div><div class='add'>+</div><div class='add'>+		priv = kzalloc(sizeof(struct rio_priv), GFP_KERNEL);</div><div class='add'>+		if (!priv) {</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "Can't alloc memory for 'priv'\n");</div><div class='add'>+			kfree(port);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		INIT_LIST_HEAD(&amp;port-&gt;dbells);</div><div class='add'>+		port-&gt;iores.start = range_start;</div><div class='add'>+		port-&gt;iores.end = port-&gt;iores.start + range_size - 1;</div><div class='add'>+		port-&gt;iores.flags = IORESOURCE_MEM;</div><div class='add'>+		port-&gt;iores.name = "rio_io_win";</div><div class='add'>+</div><div class='add'>+		if (request_resource(&amp;iomem_resource, &amp;port-&gt;iores) &lt; 0) {</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "RIO: Error requesting master port region"</div><div class='add'>+				" 0x%016llx-0x%016llx\n",</div><div class='add'>+				(u64)port-&gt;iores.start, (u64)port-&gt;iores.end);</div><div class='add'>+				kfree(priv);</div><div class='add'>+				kfree(port);</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+		sprintf(port-&gt;name, "RIO mport %d", i);</div><div class='add'>+</div><div class='add'>+		priv-&gt;dev = &amp;dev-&gt;dev;</div><div class='add'>+		port-&gt;ops = ops;</div><div class='add'>+		port-&gt;priv = priv;</div><div class='add'>+		port-&gt;phys_efptr = 0x100;</div><div class='add'>+		priv-&gt;regs_win = rio_regs_win;</div><div class='add'>+</div><div class='add'>+		/* Probe the master port phy type */</div><div class='add'>+		ccsr = in_be32(priv-&gt;regs_win + RIO_CCSR + i*0x20);</div><div class='add'>+		port-&gt;phy_type = (ccsr &amp; 1) ? RIO_PHY_SERIAL : RIO_PHY_PARALLEL;</div><div class='add'>+		if (port-&gt;phy_type == RIO_PHY_PARALLEL) {</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "RIO: Parallel PHY type, unsupported port type!\n");</div><div class='add'>+			release_resource(&amp;port-&gt;iores);</div><div class='add'>+			kfree(priv);</div><div class='add'>+			kfree(port);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		dev_info(&amp;dev-&gt;dev, "RapidIO PHY type: Serial\n");</div><div class='add'>+		/* Checking the port training status */</div><div class='add'>+		if (in_be32((priv-&gt;regs_win + RIO_ESCSR + i*0x20)) &amp; 1) {</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "Port %d is not ready. "</div><div class='add'>+			"Try to restart connection...\n", i);</div><div class='ctx'> 			/* Disable ports */</div><div class='del'>-			out_be32(priv-&gt;regs_win + RIO_CCSR, 0);</div><div class='add'>+			out_be32(priv-&gt;regs_win</div><div class='add'>+				+ RIO_CCSR + i*0x20, 0);</div><div class='ctx'> 			/* Set 1x lane */</div><div class='del'>-			setbits32(priv-&gt;regs_win + RIO_CCSR, 0x02000000);</div><div class='add'>+			setbits32(priv-&gt;regs_win</div><div class='add'>+				+ RIO_CCSR + i*0x20, 0x02000000);</div><div class='ctx'> 			/* Enable ports */</div><div class='del'>-			setbits32(priv-&gt;regs_win + RIO_CCSR, 0x00600000);</div><div class='del'>-			break;</div><div class='del'>-		case RIO_PHY_PARALLEL:</div><div class='del'>-			/* Disable ports */</div><div class='del'>-			out_be32(priv-&gt;regs_win + RIO_CCSR, 0x22000000);</div><div class='del'>-			/* Enable ports */</div><div class='del'>-			out_be32(priv-&gt;regs_win + RIO_CCSR, 0x44000000);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		msleep(100);</div><div class='del'>-		if (in_be32((priv-&gt;regs_win + RIO_ESCSR)) &amp; 1) {</div><div class='del'>-			dev_err(&amp;dev-&gt;dev, "Port restart failed.\n");</div><div class='del'>-			rc = -ENOLINK;</div><div class='del'>-			goto err;</div><div class='add'>+			setbits32(priv-&gt;regs_win</div><div class='add'>+				+ RIO_CCSR + i*0x20, 0x00600000);</div><div class='add'>+			msleep(100);</div><div class='add'>+			if (in_be32((priv-&gt;regs_win</div><div class='add'>+					+ RIO_ESCSR + i*0x20)) &amp; 1) {</div><div class='add'>+				dev_err(&amp;dev-&gt;dev,</div><div class='add'>+					"Port %d restart failed.\n", i);</div><div class='add'>+				release_resource(&amp;port-&gt;iores);</div><div class='add'>+				kfree(priv);</div><div class='add'>+				kfree(port);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			dev_info(&amp;dev-&gt;dev, "Port %d restart success!\n", i);</div><div class='ctx'> 		}</div><div class='del'>-		dev_info(&amp;dev-&gt;dev, "Port restart success!\n");</div><div class='del'>-	}</div><div class='del'>-	fsl_rio_info(&amp;dev-&gt;dev, ccsr);</div><div class='add'>+		fsl_rio_info(&amp;dev-&gt;dev, ccsr);</div><div class='ctx'> </div><div class='del'>-	port-&gt;sys_size = (in_be32((priv-&gt;regs_win + RIO_PEF_CAR))</div><div class='add'>+		port-&gt;sys_size = (in_be32((priv-&gt;regs_win + RIO_PEF_CAR))</div><div class='ctx'> 					&amp; RIO_PEF_CTLS) &gt;&gt; 4;</div><div class='del'>-	dev_info(&amp;dev-&gt;dev, "RapidIO Common Transport System size: %d\n",</div><div class='del'>-			port-&gt;sys_size ? 65536 : 256);</div><div class='add'>+		dev_info(&amp;dev-&gt;dev, "RapidIO Common Transport System size: %d\n",</div><div class='add'>+				port-&gt;sys_size ? 65536 : 256);</div><div class='add'>+</div><div class='add'>+		if (rio_register_mport(port)) {</div><div class='add'>+			release_resource(&amp;port-&gt;iores);</div><div class='add'>+			kfree(priv);</div><div class='add'>+			kfree(port);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (port-&gt;host_deviceid &gt;= 0)</div><div class='add'>+			out_be32(priv-&gt;regs_win + RIO_GCCSR, RIO_PORT_GEN_HOST |</div><div class='add'>+				RIO_PORT_GEN_MASTER | RIO_PORT_GEN_DISCOVERED);</div><div class='add'>+		else</div><div class='add'>+			out_be32(priv-&gt;regs_win + RIO_GCCSR,</div><div class='add'>+				RIO_PORT_GEN_MASTER);</div><div class='add'>+</div><div class='add'>+		priv-&gt;atmu_regs = (struct rio_atmu_regs *)(priv-&gt;regs_win</div><div class='add'>+			+ ((i == 0) ? RIO_ATMU_REGS_PORT1_OFFSET :</div><div class='add'>+			RIO_ATMU_REGS_PORT2_OFFSET));</div><div class='ctx'> </div><div class='del'>-	if (rio_register_mport(port))</div><div class='add'>+		priv-&gt;maint_atmu_regs = priv-&gt;atmu_regs + 1;</div><div class='add'>+</div><div class='add'>+		/* Set to receive any dist ID for serial RapidIO controller. */</div><div class='add'>+		if (port-&gt;phy_type == RIO_PHY_SERIAL)</div><div class='add'>+			out_be32((priv-&gt;regs_win</div><div class='add'>+				+ RIO_ISR_AACR + i*0x80), RIO_ISR_AACR_AA);</div><div class='add'>+</div><div class='add'>+		/* Configure maintenance transaction window */</div><div class='add'>+		out_be32(&amp;priv-&gt;maint_atmu_regs-&gt;rowbar,</div><div class='add'>+			port-&gt;iores.start &gt;&gt; 12);</div><div class='add'>+		out_be32(&amp;priv-&gt;maint_atmu_regs-&gt;rowar,</div><div class='add'>+			 0x80077000 | (ilog2(RIO_MAINT_WIN_SIZE) - 1));</div><div class='add'>+</div><div class='add'>+		priv-&gt;maint_win = ioremap(port-&gt;iores.start,</div><div class='add'>+				RIO_MAINT_WIN_SIZE);</div><div class='add'>+</div><div class='add'>+		rio_law_start = range_start;</div><div class='add'>+</div><div class='add'>+		fsl_rio_setup_rmu(port, rmu_np[i]);</div><div class='add'>+</div><div class='add'>+		dbell-&gt;mport[i] = port;</div><div class='add'>+</div><div class='add'>+		active_ports++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!active_ports) {</div><div class='add'>+		rc = -ENOLINK;</div><div class='ctx'> 		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (port-&gt;host_deviceid &gt;= 0)</div><div class='del'>-		out_be32(priv-&gt;regs_win + RIO_GCCSR, RIO_PORT_GEN_HOST |</div><div class='del'>-			RIO_PORT_GEN_MASTER | RIO_PORT_GEN_DISCOVERED);</div><div class='del'>-	else</div><div class='del'>-		out_be32(priv-&gt;regs_win + RIO_GCCSR, 0x00000000);</div><div class='del'>-</div><div class='del'>-	priv-&gt;atmu_regs = (struct rio_atmu_regs *)(priv-&gt;regs_win</div><div class='del'>-					+ RIO_ATMU_REGS_OFFSET);</div><div class='del'>-	priv-&gt;maint_atmu_regs = priv-&gt;atmu_regs + 1;</div><div class='del'>-	priv-&gt;dbell_atmu_regs = priv-&gt;atmu_regs + 2;</div><div class='del'>-	priv-&gt;msg_regs = (struct rio_msg_regs *)(priv-&gt;regs_win +</div><div class='del'>-				((port-&gt;phy_type == RIO_PHY_SERIAL) ?</div><div class='del'>-				RIO_S_MSG_REGS_OFFSET : RIO_P_MSG_REGS_OFFSET));</div><div class='del'>-</div><div class='del'>-	/* Set to receive any dist ID for serial RapidIO controller. */</div><div class='del'>-	if (port-&gt;phy_type == RIO_PHY_SERIAL)</div><div class='del'>-		out_be32((priv-&gt;regs_win + RIO_ISR_AACR), RIO_ISR_AACR_AA);</div><div class='del'>-</div><div class='del'>-	/* Configure maintenance transaction window */</div><div class='del'>-	out_be32(&amp;priv-&gt;maint_atmu_regs-&gt;rowbar, law_start &gt;&gt; 12);</div><div class='del'>-	out_be32(&amp;priv-&gt;maint_atmu_regs-&gt;rowar,</div><div class='del'>-		 0x80077000 | (ilog2(RIO_MAINT_WIN_SIZE) - 1));</div><div class='del'>-</div><div class='del'>-	priv-&gt;maint_win = ioremap(law_start, RIO_MAINT_WIN_SIZE);</div><div class='del'>-</div><div class='del'>-	/* Configure outbound doorbell window */</div><div class='del'>-	out_be32(&amp;priv-&gt;dbell_atmu_regs-&gt;rowbar,</div><div class='del'>-			(law_start + RIO_MAINT_WIN_SIZE) &gt;&gt; 12);</div><div class='del'>-	out_be32(&amp;priv-&gt;dbell_atmu_regs-&gt;rowar, 0x8004200b);	/* 4k */</div><div class='del'>-	fsl_rio_doorbell_init(port);</div><div class='del'>-	fsl_rio_port_write_init(port);</div><div class='add'>+	fsl_rio_doorbell_init(dbell);</div><div class='add'>+	fsl_rio_port_write_init(pw);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> err:</div><div class='del'>-	iounmap(priv-&gt;regs_win);</div><div class='del'>-	release_resource(&amp;port-&gt;iores);</div><div class='del'>-err_res:</div><div class='del'>-	kfree(priv);</div><div class='del'>-err_priv:</div><div class='del'>-	kfree(port);</div><div class='del'>-err_port:</div><div class='add'>+	kfree(pw);</div><div class='add'>+err_pw:</div><div class='add'>+	kfree(dbell);</div><div class='add'>+err_dbell:</div><div class='add'>+	iounmap(rmu_regs_win);</div><div class='add'>+err_rmu:</div><div class='ctx'> 	kfree(ops);</div><div class='ctx'> err_ops:</div><div class='add'>+	iounmap(rio_regs_win);</div><div class='add'>+err_rio_regs:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1631,7 +654,7 @@ static int __devinit fsl_of_rio_rpn_probe(struct platform_device *dev)</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id fsl_of_rio_rpn_ids[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.compatible = "fsl,rapidio-delta",</div><div class='add'>+		.compatible = "fsl,srio",</div><div class='ctx'> 	},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_rio.h b/arch/powerpc/sysdev/fsl_rio.h<br/>new file mode 100644<br/>index 000000000000..ae8e27405a0d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/fsl_rio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/fsl_rio.h</a></div><div class='hunk'>@@ -0,0 +1,135 @@</div><div class='add'>+/*</div><div class='add'>+ * Freescale MPC85xx/MPC86xx RapidIO support</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2009 Sysgo AG</div><div class='add'>+ * Thomas Moll &lt;thomas.moll@sysgo.com&gt;</div><div class='add'>+ * - fixed maintenance access routines, check for aligned access</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2009 Integrated Device Technology, Inc.</div><div class='add'>+ * Alex Bounine &lt;alexandre.bounine@idt.com&gt;</div><div class='add'>+ * - Added Port-Write message handling</div><div class='add'>+ * - Added Machine Check exception handling</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007, 2008, 2010, 2011 Freescale Semiconductor, Inc.</div><div class='add'>+ * Zhang Wei &lt;wei.zhang@freescale.com&gt;</div><div class='add'>+ * Lian Minghuan-B31939 &lt;Minghuan.Lian@freescale.com&gt;</div><div class='add'>+ * Liu Gang &lt;Gang.Liu@freescale.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2005 MontaVista Software, Inc.</div><div class='add'>+ * Matt Porter &lt;mporter@kernel.crashing.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __FSL_RIO_H</div><div class='add'>+#define __FSL_RIO_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/rio.h&gt;</div><div class='add'>+#include &lt;linux/rio_drv.h&gt;</div><div class='add'>+#include &lt;linux/kfifo.h&gt;</div><div class='add'>+</div><div class='add'>+#define RIO_REGS_WIN(mport)	(((struct rio_priv *)(mport-&gt;priv))-&gt;regs_win)</div><div class='add'>+</div><div class='add'>+#define RIO_MAINT_WIN_SIZE	0x400000</div><div class='add'>+#define RIO_LTLEDCSR		0x0608</div><div class='add'>+</div><div class='add'>+#define DOORBELL_ROWAR_EN	0x80000000</div><div class='add'>+#define DOORBELL_ROWAR_TFLOWLV	0x08000000 /* highest priority level */</div><div class='add'>+#define DOORBELL_ROWAR_PCI	0x02000000 /* PCI window */</div><div class='add'>+#define DOORBELL_ROWAR_NREAD	0x00040000 /* NREAD */</div><div class='add'>+#define DOORBELL_ROWAR_MAINTRD	0x00070000  /* maintenance read */</div><div class='add'>+#define DOORBELL_ROWAR_RES	0x00002000 /* wrtpy: reserverd */</div><div class='add'>+#define DOORBELL_ROWAR_MAINTWD	0x00007000</div><div class='add'>+#define DOORBELL_ROWAR_SIZE	0x0000000b /* window size is 4k */</div><div class='add'>+</div><div class='add'>+#define RIO_ATMU_REGS_PORT1_OFFSET	0x10c00</div><div class='add'>+#define RIO_ATMU_REGS_PORT2_OFFSET	0x10e00</div><div class='add'>+#define RIO_S_DBELL_REGS_OFFSET	0x13400</div><div class='add'>+#define RIO_S_PW_REGS_OFFSET	0x134e0</div><div class='add'>+#define RIO_ATMU_REGS_DBELL_OFFSET	0x10C40</div><div class='add'>+</div><div class='add'>+#define MAX_MSG_UNIT_NUM	2</div><div class='add'>+#define MAX_PORT_NUM		4</div><div class='add'>+</div><div class='add'>+struct rio_atmu_regs {</div><div class='add'>+	 u32 rowtar;</div><div class='add'>+	 u32 rowtear;</div><div class='add'>+	 u32 rowbar;</div><div class='add'>+	 u32 pad1;</div><div class='add'>+	 u32 rowar;</div><div class='add'>+	 u32 pad2[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rio_dbell_ring {</div><div class='add'>+	void *virt;</div><div class='add'>+	dma_addr_t phys;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rio_port_write_msg {</div><div class='add'>+	 void *virt;</div><div class='add'>+	 dma_addr_t phys;</div><div class='add'>+	 u32 msg_count;</div><div class='add'>+	 u32 err_count;</div><div class='add'>+	 u32 discard_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fsl_rio_dbell {</div><div class='add'>+	struct rio_mport *mport[MAX_PORT_NUM];</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct rio_dbell_regs __iomem *dbell_regs;</div><div class='add'>+	struct rio_dbell_ring dbell_ring;</div><div class='add'>+	int bellirq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fsl_rio_pw {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct rio_pw_regs __iomem *pw_regs;</div><div class='add'>+	struct rio_port_write_msg port_write_msg;</div><div class='add'>+	int pwirq;</div><div class='add'>+	struct work_struct pw_work;</div><div class='add'>+	struct kfifo pw_fifo;</div><div class='add'>+	spinlock_t pw_fifo_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rio_priv {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	void __iomem *regs_win;</div><div class='add'>+	struct rio_atmu_regs __iomem *atmu_regs;</div><div class='add'>+	struct rio_atmu_regs __iomem *maint_atmu_regs;</div><div class='add'>+	void __iomem *maint_win;</div><div class='add'>+	void *rmm_handle; /* RapidIO message manager(unit) Handle */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern void __iomem *rio_regs_win;</div><div class='add'>+extern void __iomem *rmu_regs_win;</div><div class='add'>+</div><div class='add'>+extern resource_size_t rio_law_start;</div><div class='add'>+</div><div class='add'>+extern struct fsl_rio_dbell *dbell;</div><div class='add'>+extern struct fsl_rio_pw *pw;</div><div class='add'>+</div><div class='add'>+extern int fsl_rio_setup_rmu(struct rio_mport *mport,</div><div class='add'>+	struct device_node *node);</div><div class='add'>+extern int fsl_rio_port_write_init(struct fsl_rio_pw *pw);</div><div class='add'>+extern int fsl_rio_pw_enable(struct rio_mport *mport, int enable);</div><div class='add'>+extern void fsl_rio_port_error_handler(int offset);</div><div class='add'>+extern int fsl_rio_doorbell_init(struct fsl_rio_dbell *dbell);</div><div class='add'>+</div><div class='add'>+extern int fsl_rio_doorbell_send(struct rio_mport *mport,</div><div class='add'>+				int index, u16 destid, u16 data);</div><div class='add'>+extern int fsl_add_outb_message(struct rio_mport *mport,</div><div class='add'>+	struct rio_dev *rdev,</div><div class='add'>+	int mbox, void *buffer, size_t len);</div><div class='add'>+extern int fsl_open_outb_mbox(struct rio_mport *mport,</div><div class='add'>+	void *dev_id, int mbox, int entries);</div><div class='add'>+extern void fsl_close_outb_mbox(struct rio_mport *mport, int mbox);</div><div class='add'>+extern int fsl_open_inb_mbox(struct rio_mport *mport,</div><div class='add'>+	void *dev_id, int mbox, int entries);</div><div class='add'>+extern void fsl_close_inb_mbox(struct rio_mport *mport, int mbox);</div><div class='add'>+extern int fsl_add_inb_buffer(struct rio_mport *mport, int mbox, void *buf);</div><div class='add'>+extern void *fsl_get_inb_message(struct rio_mport *mport, int mbox);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_rmu.c b/arch/powerpc/sysdev/fsl_rmu.c<br/>new file mode 100644<br/>index 000000000000..15485789e9db<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/fsl_rmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/fsl_rmu.c</a></div><div class='hunk'>@@ -0,0 +1,1104 @@</div><div class='add'>+/*</div><div class='add'>+ * Freescale MPC85xx/MPC86xx RapidIO RMU support</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2009 Sysgo AG</div><div class='add'>+ * Thomas Moll &lt;thomas.moll@sysgo.com&gt;</div><div class='add'>+ * - fixed maintenance access routines, check for aligned access</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2009 Integrated Device Technology, Inc.</div><div class='add'>+ * Alex Bounine &lt;alexandre.bounine@idt.com&gt;</div><div class='add'>+ * - Added Port-Write message handling</div><div class='add'>+ * - Added Machine Check exception handling</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007, 2008, 2010, 2011 Freescale Semiconductor, Inc.</div><div class='add'>+ * Zhang Wei &lt;wei.zhang@freescale.com&gt;</div><div class='add'>+ * Lian Minghuan-B31939 &lt;Minghuan.Lian@freescale.com&gt;</div><div class='add'>+ * Liu Gang &lt;Gang.Liu@freescale.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2005 MontaVista Software, Inc.</div><div class='add'>+ * Matt Porter &lt;mporter@kernel.crashing.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include "fsl_rio.h"</div><div class='add'>+</div><div class='add'>+#define GET_RMM_HANDLE(mport) \</div><div class='add'>+		(((struct rio_priv *)(mport-&gt;priv))-&gt;rmm_handle)</div><div class='add'>+</div><div class='add'>+/* RapidIO definition irq, which read from OF-tree */</div><div class='add'>+#define IRQ_RIO_PW(m)		(((struct fsl_rio_pw *)(m))-&gt;pwirq)</div><div class='add'>+#define IRQ_RIO_BELL(m) (((struct fsl_rio_dbell *)(m))-&gt;bellirq)</div><div class='add'>+#define IRQ_RIO_TX(m) (((struct fsl_rmu *)(GET_RMM_HANDLE(m)))-&gt;txirq)</div><div class='add'>+#define IRQ_RIO_RX(m) (((struct fsl_rmu *)(GET_RMM_HANDLE(m)))-&gt;rxirq)</div><div class='add'>+</div><div class='add'>+#define RIO_MIN_TX_RING_SIZE	2</div><div class='add'>+#define RIO_MAX_TX_RING_SIZE	2048</div><div class='add'>+#define RIO_MIN_RX_RING_SIZE	2</div><div class='add'>+#define RIO_MAX_RX_RING_SIZE	2048</div><div class='add'>+</div><div class='add'>+#define RIO_IPWMR_SEN		0x00100000</div><div class='add'>+#define RIO_IPWMR_QFIE		0x00000100</div><div class='add'>+#define RIO_IPWMR_EIE		0x00000020</div><div class='add'>+#define RIO_IPWMR_CQ		0x00000002</div><div class='add'>+#define RIO_IPWMR_PWE		0x00000001</div><div class='add'>+</div><div class='add'>+#define RIO_IPWSR_QF		0x00100000</div><div class='add'>+#define RIO_IPWSR_TE		0x00000080</div><div class='add'>+#define RIO_IPWSR_QFI		0x00000010</div><div class='add'>+#define RIO_IPWSR_PWD		0x00000008</div><div class='add'>+#define RIO_IPWSR_PWB		0x00000004</div><div class='add'>+</div><div class='add'>+#define RIO_EPWISR		0x10010</div><div class='add'>+/* EPWISR Error match value */</div><div class='add'>+#define RIO_EPWISR_PINT1	0x80000000</div><div class='add'>+#define RIO_EPWISR_PINT2	0x40000000</div><div class='add'>+#define RIO_EPWISR_MU		0x00000002</div><div class='add'>+#define RIO_EPWISR_PW		0x00000001</div><div class='add'>+</div><div class='add'>+#define IPWSR_CLEAR		0x98</div><div class='add'>+#define OMSR_CLEAR		0x1cb3</div><div class='add'>+#define IMSR_CLEAR		0x491</div><div class='add'>+#define IDSR_CLEAR		0x91</div><div class='add'>+#define ODSR_CLEAR		0x1c00</div><div class='add'>+#define LTLEECSR_ENABLE_ALL	0xFFC000FC</div><div class='add'>+#define RIO_LTLEECSR		0x060c</div><div class='add'>+</div><div class='add'>+#define RIO_IM0SR		0x64</div><div class='add'>+#define RIO_IM1SR		0x164</div><div class='add'>+#define RIO_OM0SR		0x4</div><div class='add'>+#define RIO_OM1SR		0x104</div><div class='add'>+</div><div class='add'>+#define RIO_DBELL_WIN_SIZE	0x1000</div><div class='add'>+</div><div class='add'>+#define RIO_MSG_OMR_MUI		0x00000002</div><div class='add'>+#define RIO_MSG_OSR_TE		0x00000080</div><div class='add'>+#define RIO_MSG_OSR_QOI		0x00000020</div><div class='add'>+#define RIO_MSG_OSR_QFI		0x00000010</div><div class='add'>+#define RIO_MSG_OSR_MUB		0x00000004</div><div class='add'>+#define RIO_MSG_OSR_EOMI	0x00000002</div><div class='add'>+#define RIO_MSG_OSR_QEI		0x00000001</div><div class='add'>+</div><div class='add'>+#define RIO_MSG_IMR_MI		0x00000002</div><div class='add'>+#define RIO_MSG_ISR_TE		0x00000080</div><div class='add'>+#define RIO_MSG_ISR_QFI		0x00000010</div><div class='add'>+#define RIO_MSG_ISR_DIQI	0x00000001</div><div class='add'>+</div><div class='add'>+#define RIO_MSG_DESC_SIZE	32</div><div class='add'>+#define RIO_MSG_BUFFER_SIZE	4096</div><div class='add'>+</div><div class='add'>+#define DOORBELL_DMR_DI		0x00000002</div><div class='add'>+#define DOORBELL_DSR_TE		0x00000080</div><div class='add'>+#define DOORBELL_DSR_QFI	0x00000010</div><div class='add'>+#define DOORBELL_DSR_DIQI	0x00000001</div><div class='add'>+#define DOORBELL_TID_OFFSET	0x02</div><div class='add'>+#define DOORBELL_SID_OFFSET	0x04</div><div class='add'>+#define DOORBELL_INFO_OFFSET	0x06</div><div class='add'>+</div><div class='add'>+#define DOORBELL_MESSAGE_SIZE	0x08</div><div class='add'>+#define DBELL_SID(x)		(*(u16 *)(x + DOORBELL_SID_OFFSET))</div><div class='add'>+#define DBELL_TID(x)		(*(u16 *)(x + DOORBELL_TID_OFFSET))</div><div class='add'>+#define DBELL_INF(x)		(*(u16 *)(x + DOORBELL_INFO_OFFSET))</div><div class='add'>+</div><div class='add'>+struct rio_msg_regs {</div><div class='add'>+	u32 omr;</div><div class='add'>+	u32 osr;</div><div class='add'>+	u32 pad1;</div><div class='add'>+	u32 odqdpar;</div><div class='add'>+	u32 pad2;</div><div class='add'>+	u32 osar;</div><div class='add'>+	u32 odpr;</div><div class='add'>+	u32 odatr;</div><div class='add'>+	u32 odcr;</div><div class='add'>+	u32 pad3;</div><div class='add'>+	u32 odqepar;</div><div class='add'>+	u32 pad4[13];</div><div class='add'>+	u32 imr;</div><div class='add'>+	u32 isr;</div><div class='add'>+	u32 pad5;</div><div class='add'>+	u32 ifqdpar;</div><div class='add'>+	u32 pad6;</div><div class='add'>+	u32 ifqepar;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rio_dbell_regs {</div><div class='add'>+	u32 odmr;</div><div class='add'>+	u32 odsr;</div><div class='add'>+	u32 pad1[4];</div><div class='add'>+	u32 oddpr;</div><div class='add'>+	u32 oddatr;</div><div class='add'>+	u32 pad2[3];</div><div class='add'>+	u32 odretcr;</div><div class='add'>+	u32 pad3[12];</div><div class='add'>+	u32 dmr;</div><div class='add'>+	u32 dsr;</div><div class='add'>+	u32 pad4;</div><div class='add'>+	u32 dqdpar;</div><div class='add'>+	u32 pad5;</div><div class='add'>+	u32 dqepar;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rio_pw_regs {</div><div class='add'>+	u32 pwmr;</div><div class='add'>+	u32 pwsr;</div><div class='add'>+	u32 epwqbar;</div><div class='add'>+	u32 pwqbar;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct rio_tx_desc {</div><div class='add'>+	u32 pad1;</div><div class='add'>+	u32 saddr;</div><div class='add'>+	u32 dport;</div><div class='add'>+	u32 dattr;</div><div class='add'>+	u32 pad2;</div><div class='add'>+	u32 pad3;</div><div class='add'>+	u32 dwcnt;</div><div class='add'>+	u32 pad4;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rio_msg_tx_ring {</div><div class='add'>+	void *virt;</div><div class='add'>+	dma_addr_t phys;</div><div class='add'>+	void *virt_buffer[RIO_MAX_TX_RING_SIZE];</div><div class='add'>+	dma_addr_t phys_buffer[RIO_MAX_TX_RING_SIZE];</div><div class='add'>+	int tx_slot;</div><div class='add'>+	int size;</div><div class='add'>+	void *dev_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rio_msg_rx_ring {</div><div class='add'>+	void *virt;</div><div class='add'>+	dma_addr_t phys;</div><div class='add'>+	void *virt_buffer[RIO_MAX_RX_RING_SIZE];</div><div class='add'>+	int rx_slot;</div><div class='add'>+	int size;</div><div class='add'>+	void *dev_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fsl_rmu {</div><div class='add'>+	struct rio_msg_regs __iomem *msg_regs;</div><div class='add'>+	struct rio_msg_tx_ring msg_tx_ring;</div><div class='add'>+	struct rio_msg_rx_ring msg_rx_ring;</div><div class='add'>+	int txirq;</div><div class='add'>+	int rxirq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fsl_rio_tx_handler - MPC85xx outbound message interrupt handler</div><div class='add'>+ * @irq: Linux interrupt number</div><div class='add'>+ * @dev_instance: Pointer to interrupt-specific data</div><div class='add'>+ *</div><div class='add'>+ * Handles outbound message interrupts. Executes a register outbound</div><div class='add'>+ * mailbox event handler and acks the interrupt occurrence.</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t</div><div class='add'>+fsl_rio_tx_handler(int irq, void *dev_instance)</div><div class='add'>+{</div><div class='add'>+	int osr;</div><div class='add'>+	struct rio_mport *port = (struct rio_mport *)dev_instance;</div><div class='add'>+	struct fsl_rmu *rmu = GET_RMM_HANDLE(port);</div><div class='add'>+</div><div class='add'>+	osr = in_be32(&amp;rmu-&gt;msg_regs-&gt;osr);</div><div class='add'>+</div><div class='add'>+	if (osr &amp; RIO_MSG_OSR_TE) {</div><div class='add'>+		pr_info("RIO: outbound message transmission error\n");</div><div class='add'>+		out_be32(&amp;rmu-&gt;msg_regs-&gt;osr, RIO_MSG_OSR_TE);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (osr &amp; RIO_MSG_OSR_QOI) {</div><div class='add'>+		pr_info("RIO: outbound message queue overflow\n");</div><div class='add'>+		out_be32(&amp;rmu-&gt;msg_regs-&gt;osr, RIO_MSG_OSR_QOI);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (osr &amp; RIO_MSG_OSR_EOMI) {</div><div class='add'>+		u32 dqp = in_be32(&amp;rmu-&gt;msg_regs-&gt;odqdpar);</div><div class='add'>+		int slot = (dqp - rmu-&gt;msg_tx_ring.phys) &gt;&gt; 5;</div><div class='add'>+		if (port-&gt;outb_msg[0].mcback != NULL) {</div><div class='add'>+			port-&gt;outb_msg[0].mcback(port, rmu-&gt;msg_tx_ring.dev_id,</div><div class='add'>+					-1,</div><div class='add'>+					slot);</div><div class='add'>+		}</div><div class='add'>+		/* Ack the end-of-message interrupt */</div><div class='add'>+		out_be32(&amp;rmu-&gt;msg_regs-&gt;osr, RIO_MSG_OSR_EOMI);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fsl_rio_rx_handler - MPC85xx inbound message interrupt handler</div><div class='add'>+ * @irq: Linux interrupt number</div><div class='add'>+ * @dev_instance: Pointer to interrupt-specific data</div><div class='add'>+ *</div><div class='add'>+ * Handles inbound message interrupts. Executes a registered inbound</div><div class='add'>+ * mailbox event handler and acks the interrupt occurrence.</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t</div><div class='add'>+fsl_rio_rx_handler(int irq, void *dev_instance)</div><div class='add'>+{</div><div class='add'>+	int isr;</div><div class='add'>+	struct rio_mport *port = (struct rio_mport *)dev_instance;</div><div class='add'>+	struct fsl_rmu *rmu = GET_RMM_HANDLE(port);</div><div class='add'>+</div><div class='add'>+	isr = in_be32(&amp;rmu-&gt;msg_regs-&gt;isr);</div><div class='add'>+</div><div class='add'>+	if (isr &amp; RIO_MSG_ISR_TE) {</div><div class='add'>+		pr_info("RIO: inbound message reception error\n");</div><div class='add'>+		out_be32((void *)&amp;rmu-&gt;msg_regs-&gt;isr, RIO_MSG_ISR_TE);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* XXX Need to check/dispatch until queue empty */</div><div class='add'>+	if (isr &amp; RIO_MSG_ISR_DIQI) {</div><div class='add'>+		/*</div><div class='add'>+		* Can receive messages for any mailbox/letter to that</div><div class='add'>+		* mailbox destination. So, make the callback with an</div><div class='add'>+		* unknown/invalid mailbox number argument.</div><div class='add'>+		*/</div><div class='add'>+		if (port-&gt;inb_msg[0].mcback != NULL)</div><div class='add'>+			port-&gt;inb_msg[0].mcback(port, rmu-&gt;msg_rx_ring.dev_id,</div><div class='add'>+				-1,</div><div class='add'>+				-1);</div><div class='add'>+</div><div class='add'>+		/* Ack the queueing interrupt */</div><div class='add'>+		out_be32(&amp;rmu-&gt;msg_regs-&gt;isr, RIO_MSG_ISR_DIQI);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fsl_rio_dbell_handler - MPC85xx doorbell interrupt handler</div><div class='add'>+ * @irq: Linux interrupt number</div><div class='add'>+ * @dev_instance: Pointer to interrupt-specific data</div><div class='add'>+ *</div><div class='add'>+ * Handles doorbell interrupts. Parses a list of registered</div><div class='add'>+ * doorbell event handlers and executes a matching event handler.</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t</div><div class='add'>+fsl_rio_dbell_handler(int irq, void *dev_instance)</div><div class='add'>+{</div><div class='add'>+	int dsr;</div><div class='add'>+	struct fsl_rio_dbell *fsl_dbell = (struct fsl_rio_dbell *)dev_instance;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dsr = in_be32(&amp;fsl_dbell-&gt;dbell_regs-&gt;dsr);</div><div class='add'>+</div><div class='add'>+	if (dsr &amp; DOORBELL_DSR_TE) {</div><div class='add'>+		pr_info("RIO: doorbell reception error\n");</div><div class='add'>+		out_be32(&amp;fsl_dbell-&gt;dbell_regs-&gt;dsr, DOORBELL_DSR_TE);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dsr &amp; DOORBELL_DSR_QFI) {</div><div class='add'>+		pr_info("RIO: doorbell queue full\n");</div><div class='add'>+		out_be32(&amp;fsl_dbell-&gt;dbell_regs-&gt;dsr, DOORBELL_DSR_QFI);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* XXX Need to check/dispatch until queue empty */</div><div class='add'>+	if (dsr &amp; DOORBELL_DSR_DIQI) {</div><div class='add'>+		u32 dmsg =</div><div class='add'>+			(u32) fsl_dbell-&gt;dbell_ring.virt +</div><div class='add'>+			(in_be32(&amp;fsl_dbell-&gt;dbell_regs-&gt;dqdpar) &amp; 0xfff);</div><div class='add'>+		struct rio_dbell *dbell;</div><div class='add'>+		int found = 0;</div><div class='add'>+</div><div class='add'>+		pr_debug</div><div class='add'>+			("RIO: processing doorbell,"</div><div class='add'>+			" sid %2.2x tid %2.2x info %4.4x\n",</div><div class='add'>+			DBELL_SID(dmsg), DBELL_TID(dmsg), DBELL_INF(dmsg));</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; MAX_PORT_NUM; i++) {</div><div class='add'>+			if (fsl_dbell-&gt;mport[i]) {</div><div class='add'>+				list_for_each_entry(dbell,</div><div class='add'>+					&amp;fsl_dbell-&gt;mport[i]-&gt;dbells, node) {</div><div class='add'>+					if ((dbell-&gt;res-&gt;start</div><div class='add'>+						&lt;= DBELL_INF(dmsg))</div><div class='add'>+						&amp;&amp; (dbell-&gt;res-&gt;end</div><div class='add'>+						&gt;= DBELL_INF(dmsg))) {</div><div class='add'>+						found = 1;</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				if (found &amp;&amp; dbell-&gt;dinb) {</div><div class='add'>+					dbell-&gt;dinb(fsl_dbell-&gt;mport[i],</div><div class='add'>+						dbell-&gt;dev_id, DBELL_SID(dmsg),</div><div class='add'>+						DBELL_TID(dmsg),</div><div class='add'>+						DBELL_INF(dmsg));</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 (!found) {</div><div class='add'>+			pr_debug</div><div class='add'>+				("RIO: spurious doorbell,"</div><div class='add'>+				" sid %2.2x tid %2.2x info %4.4x\n",</div><div class='add'>+				DBELL_SID(dmsg), DBELL_TID(dmsg),</div><div class='add'>+				DBELL_INF(dmsg));</div><div class='add'>+		}</div><div class='add'>+		setbits32(&amp;fsl_dbell-&gt;dbell_regs-&gt;dmr, DOORBELL_DMR_DI);</div><div class='add'>+		out_be32(&amp;fsl_dbell-&gt;dbell_regs-&gt;dsr, DOORBELL_DSR_DIQI);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void msg_unit_error_handler(void)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	/*XXX: Error recovery is not implemented, we just clear errors */</div><div class='add'>+	out_be32((u32 *)(rio_regs_win + RIO_LTLEDCSR), 0);</div><div class='add'>+</div><div class='add'>+	out_be32((u32 *)(rmu_regs_win + RIO_IM0SR), IMSR_CLEAR);</div><div class='add'>+	out_be32((u32 *)(rmu_regs_win + RIO_IM1SR), IMSR_CLEAR);</div><div class='add'>+	out_be32((u32 *)(rmu_regs_win + RIO_OM0SR), OMSR_CLEAR);</div><div class='add'>+	out_be32((u32 *)(rmu_regs_win + RIO_OM1SR), OMSR_CLEAR);</div><div class='add'>+</div><div class='add'>+	out_be32(&amp;dbell-&gt;dbell_regs-&gt;odsr, ODSR_CLEAR);</div><div class='add'>+	out_be32(&amp;dbell-&gt;dbell_regs-&gt;dsr, IDSR_CLEAR);</div><div class='add'>+</div><div class='add'>+	out_be32(&amp;pw-&gt;pw_regs-&gt;pwsr, IPWSR_CLEAR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fsl_rio_port_write_handler - MPC85xx port write interrupt handler</div><div class='add'>+ * @irq: Linux interrupt number</div><div class='add'>+ * @dev_instance: Pointer to interrupt-specific data</div><div class='add'>+ *</div><div class='add'>+ * Handles port write interrupts. Parses a list of registered</div><div class='add'>+ * port write event handlers and executes a matching event handler.</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t</div><div class='add'>+fsl_rio_port_write_handler(int irq, void *dev_instance)</div><div class='add'>+{</div><div class='add'>+	u32 ipwmr, ipwsr;</div><div class='add'>+	struct fsl_rio_pw *pw = (struct fsl_rio_pw *)dev_instance;</div><div class='add'>+	u32 epwisr, tmp;</div><div class='add'>+</div><div class='add'>+	epwisr = in_be32(rio_regs_win + RIO_EPWISR);</div><div class='add'>+	if (!(epwisr &amp; RIO_EPWISR_PW))</div><div class='add'>+		goto pw_done;</div><div class='add'>+</div><div class='add'>+	ipwmr = in_be32(&amp;pw-&gt;pw_regs-&gt;pwmr);</div><div class='add'>+	ipwsr = in_be32(&amp;pw-&gt;pw_regs-&gt;pwsr);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG_PW</div><div class='add'>+	pr_debug("PW Int-&gt;IPWMR: 0x%08x IPWSR: 0x%08x (", ipwmr, ipwsr);</div><div class='add'>+	if (ipwsr &amp; RIO_IPWSR_QF)</div><div class='add'>+		pr_debug(" QF");</div><div class='add'>+	if (ipwsr &amp; RIO_IPWSR_TE)</div><div class='add'>+		pr_debug(" TE");</div><div class='add'>+	if (ipwsr &amp; RIO_IPWSR_QFI)</div><div class='add'>+		pr_debug(" QFI");</div><div class='add'>+	if (ipwsr &amp; RIO_IPWSR_PWD)</div><div class='add'>+		pr_debug(" PWD");</div><div class='add'>+	if (ipwsr &amp; RIO_IPWSR_PWB)</div><div class='add'>+		pr_debug(" PWB");</div><div class='add'>+	pr_debug(" )\n");</div><div class='add'>+#endif</div><div class='add'>+	/* Schedule deferred processing if PW was received */</div><div class='add'>+	if (ipwsr &amp; RIO_IPWSR_QFI) {</div><div class='add'>+		/* Save PW message (if there is room in FIFO),</div><div class='add'>+		 * otherwise discard it.</div><div class='add'>+		 */</div><div class='add'>+		if (kfifo_avail(&amp;pw-&gt;pw_fifo) &gt;= RIO_PW_MSG_SIZE) {</div><div class='add'>+			pw-&gt;port_write_msg.msg_count++;</div><div class='add'>+			kfifo_in(&amp;pw-&gt;pw_fifo, pw-&gt;port_write_msg.virt,</div><div class='add'>+				 RIO_PW_MSG_SIZE);</div><div class='add'>+		} else {</div><div class='add'>+			pw-&gt;port_write_msg.discard_count++;</div><div class='add'>+			pr_debug("RIO: ISR Discarded Port-Write Msg(s) (%d)\n",</div><div class='add'>+				 pw-&gt;port_write_msg.discard_count);</div><div class='add'>+		}</div><div class='add'>+		/* Clear interrupt and issue Clear Queue command. This allows</div><div class='add'>+		 * another port-write to be received.</div><div class='add'>+		 */</div><div class='add'>+		out_be32(&amp;pw-&gt;pw_regs-&gt;pwsr,	RIO_IPWSR_QFI);</div><div class='add'>+		out_be32(&amp;pw-&gt;pw_regs-&gt;pwmr, ipwmr | RIO_IPWMR_CQ);</div><div class='add'>+</div><div class='add'>+		schedule_work(&amp;pw-&gt;pw_work);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((ipwmr &amp; RIO_IPWMR_EIE) &amp;&amp; (ipwsr &amp; RIO_IPWSR_TE)) {</div><div class='add'>+		pw-&gt;port_write_msg.err_count++;</div><div class='add'>+		pr_debug("RIO: Port-Write Transaction Err (%d)\n",</div><div class='add'>+			 pw-&gt;port_write_msg.err_count);</div><div class='add'>+		/* Clear Transaction Error: port-write controller should be</div><div class='add'>+		 * disabled when clearing this error</div><div class='add'>+		 */</div><div class='add'>+		out_be32(&amp;pw-&gt;pw_regs-&gt;pwmr, ipwmr &amp; ~RIO_IPWMR_PWE);</div><div class='add'>+		out_be32(&amp;pw-&gt;pw_regs-&gt;pwsr,	RIO_IPWSR_TE);</div><div class='add'>+		out_be32(&amp;pw-&gt;pw_regs-&gt;pwmr, ipwmr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ipwsr &amp; RIO_IPWSR_PWD) {</div><div class='add'>+		pw-&gt;port_write_msg.discard_count++;</div><div class='add'>+		pr_debug("RIO: Port Discarded Port-Write Msg(s) (%d)\n",</div><div class='add'>+			 pw-&gt;port_write_msg.discard_count);</div><div class='add'>+		out_be32(&amp;pw-&gt;pw_regs-&gt;pwsr, RIO_IPWSR_PWD);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+pw_done:</div><div class='add'>+	if (epwisr &amp; RIO_EPWISR_PINT1) {</div><div class='add'>+		tmp = in_be32(rio_regs_win + RIO_LTLEDCSR);</div><div class='add'>+		pr_debug("RIO_LTLEDCSR = 0x%x\n", tmp);</div><div class='add'>+		fsl_rio_port_error_handler(0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (epwisr &amp; RIO_EPWISR_PINT2) {</div><div class='add'>+		tmp = in_be32(rio_regs_win + RIO_LTLEDCSR);</div><div class='add'>+		pr_debug("RIO_LTLEDCSR = 0x%x\n", tmp);</div><div class='add'>+		fsl_rio_port_error_handler(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (epwisr &amp; RIO_EPWISR_MU) {</div><div class='add'>+		tmp = in_be32(rio_regs_win + RIO_LTLEDCSR);</div><div class='add'>+		pr_debug("RIO_LTLEDCSR = 0x%x\n", tmp);</div><div class='add'>+		msg_unit_error_handler();</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 fsl_pw_dpc(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct fsl_rio_pw *pw = container_of(work, struct fsl_rio_pw, pw_work);</div><div class='add'>+	u32 msg_buffer[RIO_PW_MSG_SIZE/sizeof(u32)];</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Process port-write messages</div><div class='add'>+	 */</div><div class='add'>+	while (kfifo_out_spinlocked(&amp;pw-&gt;pw_fifo, (unsigned char *)msg_buffer,</div><div class='add'>+			 RIO_PW_MSG_SIZE, &amp;pw-&gt;pw_fifo_lock)) {</div><div class='add'>+		/* Process one message */</div><div class='add'>+#ifdef DEBUG_PW</div><div class='add'>+		{</div><div class='add'>+		u32 i;</div><div class='add'>+		pr_debug("%s : Port-Write Message:", __func__);</div><div class='add'>+		for (i = 0; i &lt; RIO_PW_MSG_SIZE/sizeof(u32); i++) {</div><div class='add'>+			if ((i%4) == 0)</div><div class='add'>+				pr_debug("\n0x%02x: 0x%08x", i*4,</div><div class='add'>+					 msg_buffer[i]);</div><div class='add'>+			else</div><div class='add'>+				pr_debug(" 0x%08x", msg_buffer[i]);</div><div class='add'>+		}</div><div class='add'>+		pr_debug("\n");</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+		/* Pass the port-write message to RIO core for processing */</div><div class='add'>+		rio_inb_pwrite_handler((union rio_pw_msg *)msg_buffer);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fsl_rio_pw_enable - enable/disable port-write interface init</div><div class='add'>+ * @mport: Master port implementing the port write unit</div><div class='add'>+ * @enable:    1=enable; 0=disable port-write message handling</div><div class='add'>+ */</div><div class='add'>+int fsl_rio_pw_enable(struct rio_mport *mport, int enable)</div><div class='add'>+{</div><div class='add'>+	u32 rval;</div><div class='add'>+</div><div class='add'>+	rval = in_be32(&amp;pw-&gt;pw_regs-&gt;pwmr);</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		rval |= RIO_IPWMR_PWE;</div><div class='add'>+	else</div><div class='add'>+		rval &amp;= ~RIO_IPWMR_PWE;</div><div class='add'>+</div><div class='add'>+	out_be32(&amp;pw-&gt;pw_regs-&gt;pwmr, rval);</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'>+ * fsl_rio_port_write_init - MPC85xx port write interface init</div><div class='add'>+ * @mport: Master port implementing the port write unit</div><div class='add'>+ *</div><div class='add'>+ * Initializes port write unit hardware and DMA buffer</div><div class='add'>+ * ring. Called from fsl_rio_setup(). Returns %0 on success</div><div class='add'>+ * or %-ENOMEM on failure.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int fsl_rio_port_write_init(struct fsl_rio_pw *pw)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	/* Following configurations require a disabled port write controller */</div><div class='add'>+	out_be32(&amp;pw-&gt;pw_regs-&gt;pwmr,</div><div class='add'>+		 in_be32(&amp;pw-&gt;pw_regs-&gt;pwmr) &amp; ~RIO_IPWMR_PWE);</div><div class='add'>+</div><div class='add'>+	/* Initialize port write */</div><div class='add'>+	pw-&gt;port_write_msg.virt = dma_alloc_coherent(pw-&gt;dev,</div><div class='add'>+					RIO_PW_MSG_SIZE,</div><div class='add'>+					&amp;pw-&gt;port_write_msg.phys, GFP_KERNEL);</div><div class='add'>+	if (!pw-&gt;port_write_msg.virt) {</div><div class='add'>+		pr_err("RIO: unable allocate port write queue\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pw-&gt;port_write_msg.err_count = 0;</div><div class='add'>+	pw-&gt;port_write_msg.discard_count = 0;</div><div class='add'>+</div><div class='add'>+	/* Point dequeue/enqueue pointers at first entry */</div><div class='add'>+	out_be32(&amp;pw-&gt;pw_regs-&gt;epwqbar, 0);</div><div class='add'>+	out_be32(&amp;pw-&gt;pw_regs-&gt;pwqbar, (u32) pw-&gt;port_write_msg.phys);</div><div class='add'>+</div><div class='add'>+	pr_debug("EIPWQBAR: 0x%08x IPWQBAR: 0x%08x\n",</div><div class='add'>+		 in_be32(&amp;pw-&gt;pw_regs-&gt;epwqbar),</div><div class='add'>+		 in_be32(&amp;pw-&gt;pw_regs-&gt;pwqbar));</div><div class='add'>+</div><div class='add'>+	/* Clear interrupt status IPWSR */</div><div class='add'>+	out_be32(&amp;pw-&gt;pw_regs-&gt;pwsr,</div><div class='add'>+		 (RIO_IPWSR_TE | RIO_IPWSR_QFI | RIO_IPWSR_PWD));</div><div class='add'>+</div><div class='add'>+	/* Configure port write contoller for snooping enable all reporting,</div><div class='add'>+	   clear queue full */</div><div class='add'>+	out_be32(&amp;pw-&gt;pw_regs-&gt;pwmr,</div><div class='add'>+		 RIO_IPWMR_SEN | RIO_IPWMR_QFIE | RIO_IPWMR_EIE | RIO_IPWMR_CQ);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* Hook up port-write handler */</div><div class='add'>+	rc = request_irq(IRQ_RIO_PW(pw), fsl_rio_port_write_handler,</div><div class='add'>+			IRQF_SHARED, "port-write", (void *)pw);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		pr_err("MPC85xx RIO: unable to request inbound doorbell irq");</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+	/* Enable Error Interrupt */</div><div class='add'>+	out_be32((u32 *)(rio_regs_win + RIO_LTLEECSR), LTLEECSR_ENABLE_ALL);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;pw-&gt;pw_work, fsl_pw_dpc);</div><div class='add'>+	spin_lock_init(&amp;pw-&gt;pw_fifo_lock);</div><div class='add'>+	if (kfifo_alloc(&amp;pw-&gt;pw_fifo, RIO_PW_MSG_SIZE * 32, GFP_KERNEL)) {</div><div class='add'>+		pr_err("FIFO allocation failed\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err_out_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("IPWMR: 0x%08x IPWSR: 0x%08x\n",</div><div class='add'>+		 in_be32(&amp;pw-&gt;pw_regs-&gt;pwmr),</div><div class='add'>+		 in_be32(&amp;pw-&gt;pw_regs-&gt;pwsr));</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+</div><div class='add'>+err_out_irq:</div><div class='add'>+	free_irq(IRQ_RIO_PW(pw), (void *)pw);</div><div class='add'>+err_out:</div><div class='add'>+	dma_free_coherent(pw-&gt;dev, RIO_PW_MSG_SIZE,</div><div class='add'>+		pw-&gt;port_write_msg.virt,</div><div class='add'>+		pw-&gt;port_write_msg.phys);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fsl_rio_doorbell_send - Send a MPC85xx doorbell message</div><div class='add'>+ * @mport: RapidIO master port info</div><div class='add'>+ * @index: ID of RapidIO interface</div><div class='add'>+ * @destid: Destination ID of target device</div><div class='add'>+ * @data: 16-bit info field of RapidIO doorbell message</div><div class='add'>+ *</div><div class='add'>+ * Sends a MPC85xx doorbell message. Returns %0 on success or</div><div class='add'>+ * %-EINVAL on failure.</div><div class='add'>+ */</div><div class='add'>+int fsl_rio_doorbell_send(struct rio_mport *mport,</div><div class='add'>+				int index, u16 destid, u16 data)</div><div class='add'>+{</div><div class='add'>+	pr_debug("fsl_doorbell_send: index %d destid %4.4x data %4.4x\n",</div><div class='add'>+		 index, destid, data);</div><div class='add'>+</div><div class='add'>+	/* In the serial version silicons, such as MPC8548, MPC8641,</div><div class='add'>+	 * below operations is must be.</div><div class='add'>+	 */</div><div class='add'>+	out_be32(&amp;dbell-&gt;dbell_regs-&gt;odmr, 0x00000000);</div><div class='add'>+	out_be32(&amp;dbell-&gt;dbell_regs-&gt;odretcr, 0x00000004);</div><div class='add'>+	out_be32(&amp;dbell-&gt;dbell_regs-&gt;oddpr, destid &lt;&lt; 16);</div><div class='add'>+	out_be32(&amp;dbell-&gt;dbell_regs-&gt;oddatr, (index &lt;&lt; 20) | data);</div><div class='add'>+	out_be32(&amp;dbell-&gt;dbell_regs-&gt;odmr, 0x00000001);</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'>+ * fsl_add_outb_message - Add message to the MPC85xx outbound message queue</div><div class='add'>+ * @mport: Master port with outbound message queue</div><div class='add'>+ * @rdev: Target of outbound message</div><div class='add'>+ * @mbox: Outbound mailbox</div><div class='add'>+ * @buffer: Message to add to outbound queue</div><div class='add'>+ * @len: Length of message</div><div class='add'>+ *</div><div class='add'>+ * Adds the @buffer message to the MPC85xx outbound message queue. Returns</div><div class='add'>+ * %0 on success or %-EINVAL on failure.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+fsl_add_outb_message(struct rio_mport *mport, struct rio_dev *rdev, int mbox,</div><div class='add'>+			void *buffer, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct fsl_rmu *rmu = GET_RMM_HANDLE(mport);</div><div class='add'>+	u32 omr;</div><div class='add'>+	struct rio_tx_desc *desc = (struct rio_tx_desc *)rmu-&gt;msg_tx_ring.virt</div><div class='add'>+					+ rmu-&gt;msg_tx_ring.tx_slot;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	pr_debug("RIO: fsl_add_outb_message(): destid %4.4x mbox %d buffer " \</div><div class='add'>+		 "%8.8x len %8.8x\n", rdev-&gt;destid, mbox, (int)buffer, len);</div><div class='add'>+	if ((len &lt; 8) || (len &gt; RIO_MAX_MSG_SIZE)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy and clear rest of buffer */</div><div class='add'>+	memcpy(rmu-&gt;msg_tx_ring.virt_buffer[rmu-&gt;msg_tx_ring.tx_slot], buffer,</div><div class='add'>+			len);</div><div class='add'>+	if (len &lt; (RIO_MAX_MSG_SIZE - 4))</div><div class='add'>+		memset(rmu-&gt;msg_tx_ring.virt_buffer[rmu-&gt;msg_tx_ring.tx_slot]</div><div class='add'>+				+ len, 0, RIO_MAX_MSG_SIZE - len);</div><div class='add'>+</div><div class='add'>+	/* Set mbox field for message, and set destid */</div><div class='add'>+	desc-&gt;dport = (rdev-&gt;destid &lt;&lt; 16) | (mbox &amp; 0x3);</div><div class='add'>+</div><div class='add'>+	/* Enable EOMI interrupt and priority */</div><div class='add'>+	desc-&gt;dattr = 0x28000000 | ((mport-&gt;index) &lt;&lt; 20);</div><div class='add'>+</div><div class='add'>+	/* Set transfer size aligned to next power of 2 (in double words) */</div><div class='add'>+	desc-&gt;dwcnt = is_power_of_2(len) ? len : 1 &lt;&lt; get_bitmask_order(len);</div><div class='add'>+</div><div class='add'>+	/* Set snooping and source buffer address */</div><div class='add'>+	desc-&gt;saddr = 0x00000004</div><div class='add'>+		| rmu-&gt;msg_tx_ring.phys_buffer[rmu-&gt;msg_tx_ring.tx_slot];</div><div class='add'>+</div><div class='add'>+	/* Increment enqueue pointer */</div><div class='add'>+	omr = in_be32(&amp;rmu-&gt;msg_regs-&gt;omr);</div><div class='add'>+	out_be32(&amp;rmu-&gt;msg_regs-&gt;omr, omr | RIO_MSG_OMR_MUI);</div><div class='add'>+</div><div class='add'>+	/* Go to next descriptor */</div><div class='add'>+	if (++rmu-&gt;msg_tx_ring.tx_slot == rmu-&gt;msg_tx_ring.size)</div><div class='add'>+		rmu-&gt;msg_tx_ring.tx_slot = 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'>+ * fsl_open_outb_mbox - Initialize MPC85xx outbound mailbox</div><div class='add'>+ * @mport: Master port implementing the outbound message unit</div><div class='add'>+ * @dev_id: Device specific pointer to pass on event</div><div class='add'>+ * @mbox: Mailbox to open</div><div class='add'>+ * @entries: Number of entries in the outbound mailbox ring</div><div class='add'>+ *</div><div class='add'>+ * Initializes buffer ring, request the outbound message interrupt,</div><div class='add'>+ * and enables the outbound message unit. Returns %0 on success and</div><div class='add'>+ * %-EINVAL or %-ENOMEM on failure.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+fsl_open_outb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entries)</div><div class='add'>+{</div><div class='add'>+	int i, j, rc = 0;</div><div class='add'>+	struct rio_priv *priv = mport-&gt;priv;</div><div class='add'>+	struct fsl_rmu *rmu = GET_RMM_HANDLE(mport);</div><div class='add'>+</div><div class='add'>+	if ((entries &lt; RIO_MIN_TX_RING_SIZE) ||</div><div class='add'>+		(entries &gt; RIO_MAX_TX_RING_SIZE) || (!is_power_of_2(entries))) {</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize shadow copy ring */</div><div class='add'>+	rmu-&gt;msg_tx_ring.dev_id = dev_id;</div><div class='add'>+	rmu-&gt;msg_tx_ring.size = entries;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rmu-&gt;msg_tx_ring.size; i++) {</div><div class='add'>+		rmu-&gt;msg_tx_ring.virt_buffer[i] =</div><div class='add'>+			dma_alloc_coherent(priv-&gt;dev, RIO_MSG_BUFFER_SIZE,</div><div class='add'>+				&amp;rmu-&gt;msg_tx_ring.phys_buffer[i], GFP_KERNEL);</div><div class='add'>+		if (!rmu-&gt;msg_tx_ring.virt_buffer[i]) {</div><div class='add'>+			rc = -ENOMEM;</div><div class='add'>+			for (j = 0; j &lt; rmu-&gt;msg_tx_ring.size; j++)</div><div class='add'>+				if (rmu-&gt;msg_tx_ring.virt_buffer[j])</div><div class='add'>+					dma_free_coherent(priv-&gt;dev,</div><div class='add'>+							RIO_MSG_BUFFER_SIZE,</div><div class='add'>+							rmu-&gt;msg_tx_ring.</div><div class='add'>+							virt_buffer[j],</div><div class='add'>+							rmu-&gt;msg_tx_ring.</div><div class='add'>+							phys_buffer[j]);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize outbound message descriptor ring */</div><div class='add'>+	rmu-&gt;msg_tx_ring.virt = dma_alloc_coherent(priv-&gt;dev,</div><div class='add'>+				rmu-&gt;msg_tx_ring.size * RIO_MSG_DESC_SIZE,</div><div class='add'>+				&amp;rmu-&gt;msg_tx_ring.phys, GFP_KERNEL);</div><div class='add'>+	if (!rmu-&gt;msg_tx_ring.virt) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto out_dma;</div><div class='add'>+	}</div><div class='add'>+	memset(rmu-&gt;msg_tx_ring.virt, 0,</div><div class='add'>+			rmu-&gt;msg_tx_ring.size * RIO_MSG_DESC_SIZE);</div><div class='add'>+	rmu-&gt;msg_tx_ring.tx_slot = 0;</div><div class='add'>+</div><div class='add'>+	/* Point dequeue/enqueue pointers at first entry in ring */</div><div class='add'>+	out_be32(&amp;rmu-&gt;msg_regs-&gt;odqdpar, rmu-&gt;msg_tx_ring.phys);</div><div class='add'>+	out_be32(&amp;rmu-&gt;msg_regs-&gt;odqepar, rmu-&gt;msg_tx_ring.phys);</div><div class='add'>+</div><div class='add'>+	/* Configure for snooping */</div><div class='add'>+	out_be32(&amp;rmu-&gt;msg_regs-&gt;osar, 0x00000004);</div><div class='add'>+</div><div class='add'>+	/* Clear interrupt status */</div><div class='add'>+	out_be32(&amp;rmu-&gt;msg_regs-&gt;osr, 0x000000b3);</div><div class='add'>+</div><div class='add'>+	/* Hook up outbound message handler */</div><div class='add'>+	rc = request_irq(IRQ_RIO_TX(mport), fsl_rio_tx_handler, 0,</div><div class='add'>+			 "msg_tx", (void *)mport);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		goto out_irq;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Configure outbound message unit</div><div class='add'>+	 *      Snooping</div><div class='add'>+	 *      Interrupts (all enabled, except QEIE)</div><div class='add'>+	 *      Chaining mode</div><div class='add'>+	 *      Disable</div><div class='add'>+	 */</div><div class='add'>+	out_be32(&amp;rmu-&gt;msg_regs-&gt;omr, 0x00100220);</div><div class='add'>+</div><div class='add'>+	/* Set number of entries */</div><div class='add'>+	out_be32(&amp;rmu-&gt;msg_regs-&gt;omr,</div><div class='add'>+		 in_be32(&amp;rmu-&gt;msg_regs-&gt;omr) |</div><div class='add'>+		 ((get_bitmask_order(entries) - 2) &lt;&lt; 12));</div><div class='add'>+</div><div class='add'>+	/* Now enable the unit */</div><div class='add'>+	out_be32(&amp;rmu-&gt;msg_regs-&gt;omr, in_be32(&amp;rmu-&gt;msg_regs-&gt;omr) | 0x1);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return rc;</div><div class='add'>+</div><div class='add'>+out_irq:</div><div class='add'>+	dma_free_coherent(priv-&gt;dev,</div><div class='add'>+		rmu-&gt;msg_tx_ring.size * RIO_MSG_DESC_SIZE,</div><div class='add'>+		rmu-&gt;msg_tx_ring.virt, rmu-&gt;msg_tx_ring.phys);</div><div class='add'>+</div><div class='add'>+out_dma:</div><div class='add'>+	for (i = 0; i &lt; rmu-&gt;msg_tx_ring.size; i++)</div><div class='add'>+		dma_free_coherent(priv-&gt;dev, RIO_MSG_BUFFER_SIZE,</div><div class='add'>+		rmu-&gt;msg_tx_ring.virt_buffer[i],</div><div class='add'>+		rmu-&gt;msg_tx_ring.phys_buffer[i]);</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'>+ * fsl_close_outb_mbox - Shut down MPC85xx outbound mailbox</div><div class='add'>+ * @mport: Master port implementing the outbound message unit</div><div class='add'>+ * @mbox: Mailbox to close</div><div class='add'>+ *</div><div class='add'>+ * Disables the outbound message unit, free all buffers, and</div><div class='add'>+ * frees the outbound message interrupt.</div><div class='add'>+ */</div><div class='add'>+void fsl_close_outb_mbox(struct rio_mport *mport, int mbox)</div><div class='add'>+{</div><div class='add'>+	struct rio_priv *priv = mport-&gt;priv;</div><div class='add'>+	struct fsl_rmu *rmu = GET_RMM_HANDLE(mport);</div><div class='add'>+</div><div class='add'>+	/* Disable inbound message unit */</div><div class='add'>+	out_be32(&amp;rmu-&gt;msg_regs-&gt;omr, 0);</div><div class='add'>+</div><div class='add'>+	/* Free ring */</div><div class='add'>+	dma_free_coherent(priv-&gt;dev,</div><div class='add'>+	rmu-&gt;msg_tx_ring.size * RIO_MSG_DESC_SIZE,</div><div class='add'>+	rmu-&gt;msg_tx_ring.virt, rmu-&gt;msg_tx_ring.phys);</div><div class='add'>+</div><div class='add'>+	/* Free interrupt */</div><div class='add'>+	free_irq(IRQ_RIO_TX(mport), (void *)mport);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fsl_open_inb_mbox - Initialize MPC85xx inbound mailbox</div><div class='add'>+ * @mport: Master port implementing the inbound message unit</div><div class='add'>+ * @dev_id: Device specific pointer to pass on event</div><div class='add'>+ * @mbox: Mailbox to open</div><div class='add'>+ * @entries: Number of entries in the inbound mailbox ring</div><div class='add'>+ *</div><div class='add'>+ * Initializes buffer ring, request the inbound message interrupt,</div><div class='add'>+ * and enables the inbound message unit. Returns %0 on success</div><div class='add'>+ * and %-EINVAL or %-ENOMEM on failure.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+fsl_open_inb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entries)</div><div class='add'>+{</div><div class='add'>+	int i, rc = 0;</div><div class='add'>+	struct rio_priv *priv = mport-&gt;priv;</div><div class='add'>+	struct fsl_rmu *rmu = GET_RMM_HANDLE(mport);</div><div class='add'>+</div><div class='add'>+	if ((entries &lt; RIO_MIN_RX_RING_SIZE) ||</div><div class='add'>+		(entries &gt; RIO_MAX_RX_RING_SIZE) || (!is_power_of_2(entries))) {</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize client buffer ring */</div><div class='add'>+	rmu-&gt;msg_rx_ring.dev_id = dev_id;</div><div class='add'>+	rmu-&gt;msg_rx_ring.size = entries;</div><div class='add'>+	rmu-&gt;msg_rx_ring.rx_slot = 0;</div><div class='add'>+	for (i = 0; i &lt; rmu-&gt;msg_rx_ring.size; i++)</div><div class='add'>+		rmu-&gt;msg_rx_ring.virt_buffer[i] = NULL;</div><div class='add'>+</div><div class='add'>+	/* Initialize inbound message ring */</div><div class='add'>+	rmu-&gt;msg_rx_ring.virt = dma_alloc_coherent(priv-&gt;dev,</div><div class='add'>+				rmu-&gt;msg_rx_ring.size * RIO_MAX_MSG_SIZE,</div><div class='add'>+				&amp;rmu-&gt;msg_rx_ring.phys, GFP_KERNEL);</div><div class='add'>+	if (!rmu-&gt;msg_rx_ring.virt) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Point dequeue/enqueue pointers at first entry in ring */</div><div class='add'>+	out_be32(&amp;rmu-&gt;msg_regs-&gt;ifqdpar, (u32) rmu-&gt;msg_rx_ring.phys);</div><div class='add'>+	out_be32(&amp;rmu-&gt;msg_regs-&gt;ifqepar, (u32) rmu-&gt;msg_rx_ring.phys);</div><div class='add'>+</div><div class='add'>+	/* Clear interrupt status */</div><div class='add'>+	out_be32(&amp;rmu-&gt;msg_regs-&gt;isr, 0x00000091);</div><div class='add'>+</div><div class='add'>+	/* Hook up inbound message handler */</div><div class='add'>+	rc = request_irq(IRQ_RIO_RX(mport), fsl_rio_rx_handler, 0,</div><div class='add'>+			 "msg_rx", (void *)mport);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dma_free_coherent(priv-&gt;dev, RIO_MSG_BUFFER_SIZE,</div><div class='add'>+			rmu-&gt;msg_tx_ring.virt_buffer[i],</div><div class='add'>+			rmu-&gt;msg_tx_ring.phys_buffer[i]);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Configure inbound message unit:</div><div class='add'>+	 *      Snooping</div><div class='add'>+	 *      4KB max message size</div><div class='add'>+	 *      Unmask all interrupt sources</div><div class='add'>+	 *      Disable</div><div class='add'>+	 */</div><div class='add'>+	out_be32(&amp;rmu-&gt;msg_regs-&gt;imr, 0x001b0060);</div><div class='add'>+</div><div class='add'>+	/* Set number of queue entries */</div><div class='add'>+	setbits32(&amp;rmu-&gt;msg_regs-&gt;imr, (get_bitmask_order(entries) - 2) &lt;&lt; 12);</div><div class='add'>+</div><div class='add'>+	/* Now enable the unit */</div><div class='add'>+	setbits32(&amp;rmu-&gt;msg_regs-&gt;imr, 0x1);</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'>+/**</div><div class='add'>+ * fsl_close_inb_mbox - Shut down MPC85xx inbound mailbox</div><div class='add'>+ * @mport: Master port implementing the inbound message unit</div><div class='add'>+ * @mbox: Mailbox to close</div><div class='add'>+ *</div><div class='add'>+ * Disables the inbound message unit, free all buffers, and</div><div class='add'>+ * frees the inbound message interrupt.</div><div class='add'>+ */</div><div class='add'>+void fsl_close_inb_mbox(struct rio_mport *mport, int mbox)</div><div class='add'>+{</div><div class='add'>+	struct rio_priv *priv = mport-&gt;priv;</div><div class='add'>+	struct fsl_rmu *rmu = GET_RMM_HANDLE(mport);</div><div class='add'>+</div><div class='add'>+	/* Disable inbound message unit */</div><div class='add'>+	out_be32(&amp;rmu-&gt;msg_regs-&gt;imr, 0);</div><div class='add'>+</div><div class='add'>+	/* Free ring */</div><div class='add'>+	dma_free_coherent(priv-&gt;dev, rmu-&gt;msg_rx_ring.size * RIO_MAX_MSG_SIZE,</div><div class='add'>+	rmu-&gt;msg_rx_ring.virt, rmu-&gt;msg_rx_ring.phys);</div><div class='add'>+</div><div class='add'>+	/* Free interrupt */</div><div class='add'>+	free_irq(IRQ_RIO_RX(mport), (void *)mport);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fsl_add_inb_buffer - Add buffer to the MPC85xx inbound message queue</div><div class='add'>+ * @mport: Master port implementing the inbound message unit</div><div class='add'>+ * @mbox: Inbound mailbox number</div><div class='add'>+ * @buf: Buffer to add to inbound queue</div><div class='add'>+ *</div><div class='add'>+ * Adds the @buf buffer to the MPC85xx inbound message queue. Returns</div><div class='add'>+ * %0 on success or %-EINVAL on failure.</div><div class='add'>+ */</div><div class='add'>+int fsl_add_inb_buffer(struct rio_mport *mport, int mbox, void *buf)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+	struct fsl_rmu *rmu = GET_RMM_HANDLE(mport);</div><div class='add'>+</div><div class='add'>+	pr_debug("RIO: fsl_add_inb_buffer(), msg_rx_ring.rx_slot %d\n",</div><div class='add'>+		 rmu-&gt;msg_rx_ring.rx_slot);</div><div class='add'>+</div><div class='add'>+	if (rmu-&gt;msg_rx_ring.virt_buffer[rmu-&gt;msg_rx_ring.rx_slot]) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"RIO: error adding inbound buffer %d, buffer exists\n",</div><div class='add'>+			rmu-&gt;msg_rx_ring.rx_slot);</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rmu-&gt;msg_rx_ring.virt_buffer[rmu-&gt;msg_rx_ring.rx_slot] = buf;</div><div class='add'>+	if (++rmu-&gt;msg_rx_ring.rx_slot == rmu-&gt;msg_rx_ring.size)</div><div class='add'>+		rmu-&gt;msg_rx_ring.rx_slot = 0;</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'>+/**</div><div class='add'>+ * fsl_get_inb_message - Fetch inbound message from the MPC85xx message unit</div><div class='add'>+ * @mport: Master port implementing the inbound message unit</div><div class='add'>+ * @mbox: Inbound mailbox number</div><div class='add'>+ *</div><div class='add'>+ * Gets the next available inbound message from the inbound message queue.</div><div class='add'>+ * A pointer to the message is returned on success or NULL on failure.</div><div class='add'>+ */</div><div class='add'>+void *fsl_get_inb_message(struct rio_mport *mport, int mbox)</div><div class='add'>+{</div><div class='add'>+	struct fsl_rmu *rmu = GET_RMM_HANDLE(mport);</div><div class='add'>+	u32 phys_buf, virt_buf;</div><div class='add'>+	void *buf = NULL;</div><div class='add'>+	int buf_idx;</div><div class='add'>+</div><div class='add'>+	phys_buf = in_be32(&amp;rmu-&gt;msg_regs-&gt;ifqdpar);</div><div class='add'>+</div><div class='add'>+	/* If no more messages, then bail out */</div><div class='add'>+	if (phys_buf == in_be32(&amp;rmu-&gt;msg_regs-&gt;ifqepar))</div><div class='add'>+		goto out2;</div><div class='add'>+</div><div class='add'>+	virt_buf = (u32) rmu-&gt;msg_rx_ring.virt + (phys_buf</div><div class='add'>+						- rmu-&gt;msg_rx_ring.phys);</div><div class='add'>+	buf_idx = (phys_buf - rmu-&gt;msg_rx_ring.phys) / RIO_MAX_MSG_SIZE;</div><div class='add'>+	buf = rmu-&gt;msg_rx_ring.virt_buffer[buf_idx];</div><div class='add'>+</div><div class='add'>+	if (!buf) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"RIO: inbound message copy failed, no buffers\n");</div><div class='add'>+		goto out1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy max message size, caller is expected to allocate that big */</div><div class='add'>+	memcpy(buf, (void *)virt_buf, RIO_MAX_MSG_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Clear the available buffer */</div><div class='add'>+	rmu-&gt;msg_rx_ring.virt_buffer[buf_idx] = NULL;</div><div class='add'>+</div><div class='add'>+out1:</div><div class='add'>+	setbits32(&amp;rmu-&gt;msg_regs-&gt;imr, RIO_MSG_IMR_MI);</div><div class='add'>+</div><div class='add'>+out2:</div><div class='add'>+	return buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fsl_rio_doorbell_init - MPC85xx doorbell interface init</div><div class='add'>+ * @mport: Master port implementing the inbound doorbell unit</div><div class='add'>+ *</div><div class='add'>+ * Initializes doorbell unit hardware and inbound DMA buffer</div><div class='add'>+ * ring. Called from fsl_rio_setup(). Returns %0 on success</div><div class='add'>+ * or %-ENOMEM on failure.</div><div class='add'>+ */</div><div class='add'>+int fsl_rio_doorbell_init(struct fsl_rio_dbell *dbell)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	/* Initialize inbound doorbells */</div><div class='add'>+	dbell-&gt;dbell_ring.virt = dma_alloc_coherent(dbell-&gt;dev, 512 *</div><div class='add'>+		DOORBELL_MESSAGE_SIZE, &amp;dbell-&gt;dbell_ring.phys, GFP_KERNEL);</div><div class='add'>+	if (!dbell-&gt;dbell_ring.virt) {</div><div class='add'>+		printk(KERN_ERR "RIO: unable allocate inbound doorbell ring\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Point dequeue/enqueue pointers at first entry in ring */</div><div class='add'>+	out_be32(&amp;dbell-&gt;dbell_regs-&gt;dqdpar, (u32) dbell-&gt;dbell_ring.phys);</div><div class='add'>+	out_be32(&amp;dbell-&gt;dbell_regs-&gt;dqepar, (u32) dbell-&gt;dbell_ring.phys);</div><div class='add'>+</div><div class='add'>+	/* Clear interrupt status */</div><div class='add'>+	out_be32(&amp;dbell-&gt;dbell_regs-&gt;dsr, 0x00000091);</div><div class='add'>+</div><div class='add'>+	/* Hook up doorbell handler */</div><div class='add'>+	rc = request_irq(IRQ_RIO_BELL(dbell), fsl_rio_dbell_handler, 0,</div><div class='add'>+			 "dbell_rx", (void *)dbell);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dma_free_coherent(dbell-&gt;dev, 512 * DOORBELL_MESSAGE_SIZE,</div><div class='add'>+			 dbell-&gt;dbell_ring.virt, dbell-&gt;dbell_ring.phys);</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+			"MPC85xx RIO: unable to request inbound doorbell irq");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure doorbells for snooping, 512 entries, and enable */</div><div class='add'>+	out_be32(&amp;dbell-&gt;dbell_regs-&gt;dmr, 0x00108161);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int fsl_rio_setup_rmu(struct rio_mport *mport, struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	struct rio_priv *priv;</div><div class='add'>+	struct fsl_rmu *rmu;</div><div class='add'>+	u64 msg_start;</div><div class='add'>+	const u32 *msg_addr;</div><div class='add'>+	int mlen;</div><div class='add'>+	int aw;</div><div class='add'>+</div><div class='add'>+	if (!mport || !mport-&gt;priv)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	priv = mport-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!node) {</div><div class='add'>+		dev_warn(priv-&gt;dev, "Can't get %s property 'fsl,rmu'\n",</div><div class='add'>+			priv-&gt;dev-&gt;of_node-&gt;full_name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rmu = kzalloc(sizeof(struct fsl_rmu), GFP_KERNEL);</div><div class='add'>+	if (!rmu)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	aw = of_n_addr_cells(node);</div><div class='add'>+	msg_addr = of_get_property(node, "reg", &amp;mlen);</div><div class='add'>+	if (!msg_addr) {</div><div class='add'>+		pr_err("%s: unable to find 'reg' property of message-unit\n",</div><div class='add'>+			node-&gt;full_name);</div><div class='add'>+		kfree(rmu);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	msg_start = of_read_number(msg_addr, aw);</div><div class='add'>+</div><div class='add'>+	rmu-&gt;msg_regs = (struct rio_msg_regs *)</div><div class='add'>+			(rmu_regs_win + (u32)msg_start);</div><div class='add'>+</div><div class='add'>+	rmu-&gt;txirq = irq_of_parse_and_map(node, 0);</div><div class='add'>+	rmu-&gt;rxirq = irq_of_parse_and_map(node, 1);</div><div class='add'>+	printk(KERN_INFO "%s: txirq: %d, rxirq %d\n",</div><div class='add'>+		node-&gt;full_name, rmu-&gt;txirq, rmu-&gt;rxirq);</div><div class='add'>+</div><div class='add'>+	priv-&gt;rmm_handle = rmu;</div><div class='add'>+</div><div class='add'>+	rio_init_dbell_res(&amp;mport-&gt;riores[RIO_DOORBELL_RESOURCE], 0, 0xffff);</div><div class='add'>+	rio_init_mbox_res(&amp;mport-&gt;riores[RIO_INB_MBOX_RESOURCE], 0, 0);</div><div class='add'>+	rio_init_mbox_res(&amp;mport-&gt;riores[RIO_OUTB_MBOX_RESOURCE], 0, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c<br/>index 8c7e8528e7c4..4e9ccb1015de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/mpic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/mpic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/mpic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/mpic.c</a></div><div class='hunk'>@@ -154,7 +154,7 @@ static inline unsigned int mpic_processor_id(struct mpic *mpic)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu = 0;</div><div class='ctx'> </div><div class='del'>-	if (mpic-&gt;flags &amp; MPIC_PRIMARY)</div><div class='add'>+	if (!(mpic-&gt;flags &amp; MPIC_SECONDARY))</div><div class='ctx'> 		cpu = hard_smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 	return cpu;</div><div class='hunk'>@@ -315,29 +315,25 @@ static void _mpic_map_mmio(struct mpic *mpic, phys_addr_t phys_addr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_DCR</div><div class='del'>-static void _mpic_map_dcr(struct mpic *mpic, struct device_node *node,</div><div class='del'>-			  struct mpic_reg_bank *rb,</div><div class='add'>+static void _mpic_map_dcr(struct mpic *mpic, struct mpic_reg_bank *rb,</div><div class='ctx'> 			  unsigned int offset, unsigned int size)</div><div class='ctx'> {</div><div class='del'>-	const u32 *dbasep;</div><div class='del'>-</div><div class='del'>-	dbasep = of_get_property(node, "dcr-reg", NULL);</div><div class='del'>-</div><div class='del'>-	rb-&gt;dhost = dcr_map(node, *dbasep + offset, size);</div><div class='add'>+	phys_addr_t phys_addr = dcr_resource_start(mpic-&gt;node, 0);</div><div class='add'>+	rb-&gt;dhost = dcr_map(mpic-&gt;node, phys_addr + offset, size);</div><div class='ctx'> 	BUG_ON(!DCR_MAP_OK(rb-&gt;dhost));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void mpic_map(struct mpic *mpic, struct device_node *node,</div><div class='add'>+static inline void mpic_map(struct mpic *mpic,</div><div class='ctx'> 			    phys_addr_t phys_addr, struct mpic_reg_bank *rb,</div><div class='ctx'> 			    unsigned int offset, unsigned int size)</div><div class='ctx'> {</div><div class='ctx'> 	if (mpic-&gt;flags &amp; MPIC_USES_DCR)</div><div class='del'>-		_mpic_map_dcr(mpic, node, rb, offset, size);</div><div class='add'>+		_mpic_map_dcr(mpic, rb, offset, size);</div><div class='ctx'> 	else</div><div class='ctx'> 		_mpic_map_mmio(mpic, phys_addr, rb, offset, size);</div><div class='ctx'> }</div><div class='ctx'> #else /* CONFIG_PPC_DCR */</div><div class='del'>-#define mpic_map(m,n,p,b,o,s)	_mpic_map_mmio(m,p,b,o,s)</div><div class='add'>+#define mpic_map(m,p,b,o,s)	_mpic_map_mmio(m,p,b,o,s)</div><div class='ctx'> #endif /* !CONFIG_PPC_DCR */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -901,7 +897,7 @@ int mpic_set_irq_type(struct irq_data *d, unsigned int flow_type)</div><div class='ctx'> 	if (vold != vnew)</div><div class='ctx'> 		mpic_irq_write(src, MPIC_INFO(IRQ_VECTOR_PRI), vnew);</div><div class='ctx'> </div><div class='del'>-	return IRQ_SET_MASK_OK_NOCOPY;;</div><div class='add'>+	return IRQ_SET_MASK_OK_NOCOPY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mpic_set_vector(unsigned int virq, unsigned int vector)</div><div class='hunk'>@@ -990,7 +986,7 @@ static int mpic_host_map(struct irq_host *h, unsigned int virq,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	else if (hw &gt;= mpic-&gt;ipi_vecs[0]) {</div><div class='del'>-		WARN_ON(!(mpic-&gt;flags &amp; MPIC_PRIMARY));</div><div class='add'>+		WARN_ON(mpic-&gt;flags &amp; MPIC_SECONDARY);</div><div class='ctx'> </div><div class='ctx'> 		DBG("mpic: mapping as IPI\n");</div><div class='ctx'> 		irq_set_chip_data(virq, mpic);</div><div class='hunk'>@@ -1001,7 +997,7 @@ static int mpic_host_map(struct irq_host *h, unsigned int virq,</div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='ctx'> 	if (hw &gt;= mpic-&gt;timer_vecs[0] &amp;&amp; hw &lt;= mpic-&gt;timer_vecs[7]) {</div><div class='del'>-		WARN_ON(!(mpic-&gt;flags &amp; MPIC_PRIMARY));</div><div class='add'>+		WARN_ON(mpic-&gt;flags &amp; MPIC_SECONDARY);</div><div class='ctx'> </div><div class='ctx'> 		DBG("mpic: mapping as timer\n");</div><div class='ctx'> 		irq_set_chip_data(virq, mpic);</div><div class='hunk'>@@ -1115,17 +1111,28 @@ static int mpic_host_xlate(struct irq_host *h, struct device_node *ct,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* IRQ handler for a secondary MPIC cascaded from another IRQ controller */</div><div class='add'>+static void mpic_cascade(unsigned int irq, struct irq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct irq_chip *chip = irq_desc_get_chip(desc);</div><div class='add'>+	struct mpic *mpic = irq_desc_get_handler_data(desc);</div><div class='add'>+	unsigned int virq;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!(mpic-&gt;flags &amp; MPIC_SECONDARY));</div><div class='add'>+</div><div class='add'>+	virq = mpic_get_one_irq(mpic);</div><div class='add'>+	if (virq != NO_IRQ)</div><div class='add'>+		generic_handle_irq(virq);</div><div class='add'>+</div><div class='add'>+	chip-&gt;irq_eoi(&amp;desc-&gt;irq_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct irq_host_ops mpic_host_ops = {</div><div class='ctx'> 	.match = mpic_host_match,</div><div class='ctx'> 	.map = mpic_host_map,</div><div class='ctx'> 	.xlate = mpic_host_xlate,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int mpic_reset_prohibited(struct device_node *node)</div><div class='del'>-{</div><div class='del'>-	return node &amp;&amp; of_get_property(node, "pic-no-reset", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Exported functions</div><div class='ctx'>  */</div><div class='hunk'>@@ -1137,27 +1144,60 @@ struct mpic * __init mpic_alloc(struct device_node *node,</div><div class='ctx'> 				unsigned int irq_count,</div><div class='ctx'> 				const char *name)</div><div class='ctx'> {</div><div class='del'>-	struct mpic	*mpic;</div><div class='del'>-	u32		greg_feature;</div><div class='del'>-	const char	*vers;</div><div class='del'>-	int		i;</div><div class='del'>-	int		intvec_top;</div><div class='del'>-	u64		paddr = phys_addr;</div><div class='add'>+	int i, psize, intvec_top;</div><div class='add'>+	struct mpic *mpic;</div><div class='add'>+	u32 greg_feature;</div><div class='add'>+	const char *vers;</div><div class='add'>+	const u32 *psrc;</div><div class='add'>+</div><div class='add'>+	/* Default MPIC search parameters */</div><div class='add'>+	static const struct of_device_id __initconst mpic_device_id[] = {</div><div class='add'>+		{ .type	      = "open-pic", },</div><div class='add'>+		{ .compatible = "open-pic", },</div><div class='add'>+		{},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we were not passed a device-tree node, then perform the default</div><div class='add'>+	 * search for standardized a standardized OpenPIC.</div><div class='add'>+	 */</div><div class='add'>+	if (node) {</div><div class='add'>+		node = of_node_get(node);</div><div class='add'>+	} else {</div><div class='add'>+		node = of_find_matching_node(NULL, mpic_device_id);</div><div class='add'>+		if (!node)</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Pick the physical address from the device tree if unspecified */</div><div class='add'>+	if (!phys_addr) {</div><div class='add'>+		/* Check if it is DCR-based */</div><div class='add'>+		if (of_get_property(node, "dcr-reg", NULL)) {</div><div class='add'>+			flags |= MPIC_USES_DCR;</div><div class='add'>+		} else {</div><div class='add'>+			struct resource r;</div><div class='add'>+			if (of_address_to_resource(node, 0, &amp;r))</div><div class='add'>+				goto err_of_node_put;</div><div class='add'>+			phys_addr = r.start;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mpic = kzalloc(sizeof(struct mpic), GFP_KERNEL);</div><div class='ctx'> 	if (mpic == NULL)</div><div class='del'>-		return NULL;</div><div class='add'>+		goto err_of_node_put;</div><div class='ctx'> </div><div class='ctx'> 	mpic-&gt;name = name;</div><div class='add'>+	mpic-&gt;node = node;</div><div class='add'>+	mpic-&gt;paddr = phys_addr;</div><div class='ctx'> </div><div class='ctx'> 	mpic-&gt;hc_irq = mpic_irq_chip;</div><div class='ctx'> 	mpic-&gt;hc_irq.name = name;</div><div class='del'>-	if (flags &amp; MPIC_PRIMARY)</div><div class='add'>+	if (!(flags &amp; MPIC_SECONDARY))</div><div class='ctx'> 		mpic-&gt;hc_irq.irq_set_affinity = mpic_set_affinity;</div><div class='ctx'> #ifdef CONFIG_MPIC_U3_HT_IRQS</div><div class='ctx'> 	mpic-&gt;hc_ht_irq = mpic_irq_ht_chip;</div><div class='ctx'> 	mpic-&gt;hc_ht_irq.name = name;</div><div class='del'>-	if (flags &amp; MPIC_PRIMARY)</div><div class='add'>+	if (!(flags &amp; MPIC_SECONDARY))</div><div class='ctx'> 		mpic-&gt;hc_ht_irq.irq_set_affinity = mpic_set_affinity;</div><div class='ctx'> #endif /* CONFIG_MPIC_U3_HT_IRQS */</div><div class='ctx'> </div><div class='hunk'>@@ -1194,28 +1234,22 @@ struct mpic * __init mpic_alloc(struct device_node *node,</div><div class='ctx'> 	mpic-&gt;spurious_vec  = intvec_top;</div><div class='ctx'> </div><div class='ctx'> 	/* Check for "big-endian" in device-tree */</div><div class='del'>-	if (node &amp;&amp; of_get_property(node, "big-endian", NULL) != NULL)</div><div class='add'>+	if (of_get_property(mpic-&gt;node, "big-endian", NULL) != NULL)</div><div class='ctx'> 		mpic-&gt;flags |= MPIC_BIG_ENDIAN;</div><div class='del'>-	if (node &amp;&amp; of_device_is_compatible(node, "fsl,mpic"))</div><div class='add'>+	if (of_device_is_compatible(mpic-&gt;node, "fsl,mpic"))</div><div class='ctx'> 		mpic-&gt;flags |= MPIC_FSL;</div><div class='ctx'> </div><div class='ctx'> 	/* Look for protected sources */</div><div class='del'>-	if (node) {</div><div class='del'>-		int psize;</div><div class='del'>-		unsigned int bits, mapsize;</div><div class='del'>-		const u32 *psrc =</div><div class='del'>-			of_get_property(node, "protected-sources", &amp;psize);</div><div class='del'>-		if (psrc) {</div><div class='del'>-			psize /= 4;</div><div class='del'>-			bits = intvec_top + 1;</div><div class='del'>-			mapsize = BITS_TO_LONGS(bits) * sizeof(unsigned long);</div><div class='del'>-			mpic-&gt;protected = kzalloc(mapsize, GFP_KERNEL);</div><div class='del'>-			BUG_ON(mpic-&gt;protected == NULL);</div><div class='del'>-			for (i = 0; i &lt; psize; i++) {</div><div class='del'>-				if (psrc[i] &gt; intvec_top)</div><div class='del'>-					continue;</div><div class='del'>-				__set_bit(psrc[i], mpic-&gt;protected);</div><div class='del'>-			}</div><div class='add'>+	psrc = of_get_property(mpic-&gt;node, "protected-sources", &amp;psize);</div><div class='add'>+	if (psrc) {</div><div class='add'>+		/* Allocate a bitmap with one bit per interrupt */</div><div class='add'>+		unsigned int mapsize = BITS_TO_LONGS(intvec_top + 1);</div><div class='add'>+		mpic-&gt;protected = kzalloc(mapsize*sizeof(long), GFP_KERNEL);</div><div class='add'>+		BUG_ON(mpic-&gt;protected == NULL);</div><div class='add'>+		for (i = 0; i &lt; psize/sizeof(u32); i++) {</div><div class='add'>+			if (psrc[i] &gt; intvec_top)</div><div class='add'>+				continue;</div><div class='add'>+			__set_bit(psrc[i], mpic-&gt;protected);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1224,42 +1258,32 @@ struct mpic * __init mpic_alloc(struct device_node *node,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* default register type */</div><div class='del'>-	mpic-&gt;reg_type = (flags &amp; MPIC_BIG_ENDIAN) ?</div><div class='del'>-		mpic_access_mmio_be : mpic_access_mmio_le;</div><div class='del'>-</div><div class='del'>-	/* If no physical address is passed in, a device-node is mandatory */</div><div class='del'>-	BUG_ON(paddr == 0 &amp;&amp; node == NULL);</div><div class='add'>+	if (flags &amp; MPIC_BIG_ENDIAN)</div><div class='add'>+		mpic-&gt;reg_type = mpic_access_mmio_be;</div><div class='add'>+	else</div><div class='add'>+		mpic-&gt;reg_type = mpic_access_mmio_le;</div><div class='ctx'> </div><div class='del'>-	/* If no physical address passed in, check if it's dcr based */</div><div class='del'>-	if (paddr == 0 &amp;&amp; of_get_property(node, "dcr-reg", NULL) != NULL) {</div><div class='add'>+	/*</div><div class='add'>+	 * An MPIC with a "dcr-reg" property must be accessed that way, but</div><div class='add'>+	 * only if the kernel includes DCR support.</div><div class='add'>+	 */</div><div class='ctx'> #ifdef CONFIG_PPC_DCR</div><div class='del'>-		mpic-&gt;flags |= MPIC_USES_DCR;</div><div class='add'>+	if (flags &amp; MPIC_USES_DCR)</div><div class='ctx'> 		mpic-&gt;reg_type = mpic_access_dcr;</div><div class='ctx'> #else</div><div class='del'>-		BUG();</div><div class='del'>-#endif /* CONFIG_PPC_DCR */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the MPIC is not DCR based, and no physical address was passed</div><div class='del'>-	 * in, try to obtain one</div><div class='del'>-	 */</div><div class='del'>-	if (paddr == 0 &amp;&amp; !(mpic-&gt;flags &amp; MPIC_USES_DCR)) {</div><div class='del'>-		const u32 *reg = of_get_property(node, "reg", NULL);</div><div class='del'>-		BUG_ON(reg == NULL);</div><div class='del'>-		paddr = of_translate_address(node, reg);</div><div class='del'>-		BUG_ON(paddr == OF_BAD_ADDR);</div><div class='del'>-	}</div><div class='add'>+	BUG_ON(flags &amp; MPIC_USES_DCR);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Map the global registers */</div><div class='del'>-	mpic_map(mpic, node, paddr, &amp;mpic-&gt;gregs, MPIC_INFO(GREG_BASE), 0x1000);</div><div class='del'>-	mpic_map(mpic, node, paddr, &amp;mpic-&gt;tmregs, MPIC_INFO(TIMER_BASE), 0x1000);</div><div class='add'>+	mpic_map(mpic, mpic-&gt;paddr, &amp;mpic-&gt;gregs, MPIC_INFO(GREG_BASE), 0x1000);</div><div class='add'>+	mpic_map(mpic, mpic-&gt;paddr, &amp;mpic-&gt;tmregs, MPIC_INFO(TIMER_BASE), 0x1000);</div><div class='ctx'> </div><div class='ctx'> 	/* Reset */</div><div class='ctx'> </div><div class='ctx'> 	/* When using a device-node, reset requests are only honored if the MPIC</div><div class='ctx'> 	 * is allowed to reset.</div><div class='ctx'> 	 */</div><div class='del'>-	if (mpic_reset_prohibited(node))</div><div class='add'>+	if (of_get_property(mpic-&gt;node, "pic-no-reset", NULL))</div><div class='ctx'> 		mpic-&gt;flags |= MPIC_NO_RESET;</div><div class='ctx'> </div><div class='ctx'> 	if ((flags &amp; MPIC_WANTS_RESET) &amp;&amp; !(mpic-&gt;flags &amp; MPIC_NO_RESET)) {</div><div class='hunk'>@@ -1307,7 +1331,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,</div><div class='ctx'> 	for_each_possible_cpu(i) {</div><div class='ctx'> 		unsigned int cpu = get_hard_smp_processor_id(i);</div><div class='ctx'> </div><div class='del'>-		mpic_map(mpic, node, paddr, &amp;mpic-&gt;cpuregs[cpu],</div><div class='add'>+		mpic_map(mpic, mpic-&gt;paddr, &amp;mpic-&gt;cpuregs[cpu],</div><div class='ctx'> 			 MPIC_INFO(CPU_BASE) + cpu * MPIC_INFO(CPU_STRIDE),</div><div class='ctx'> 			 0x1000);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1315,16 +1339,21 @@ struct mpic * __init mpic_alloc(struct device_node *node,</div><div class='ctx'> 	/* Initialize main ISU if none provided */</div><div class='ctx'> 	if (mpic-&gt;isu_size == 0) {</div><div class='ctx'> 		mpic-&gt;isu_size = mpic-&gt;num_sources;</div><div class='del'>-		mpic_map(mpic, node, paddr, &amp;mpic-&gt;isus[0],</div><div class='add'>+		mpic_map(mpic, mpic-&gt;paddr, &amp;mpic-&gt;isus[0],</div><div class='ctx'> 			 MPIC_INFO(IRQ_BASE), MPIC_INFO(IRQ_STRIDE) * mpic-&gt;isu_size);</div><div class='ctx'> 	}</div><div class='ctx'> 	mpic-&gt;isu_shift = 1 + __ilog2(mpic-&gt;isu_size - 1);</div><div class='ctx'> 	mpic-&gt;isu_mask = (1 &lt;&lt; mpic-&gt;isu_shift) - 1;</div><div class='ctx'> </div><div class='del'>-	mpic-&gt;irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR,</div><div class='add'>+	mpic-&gt;irqhost = irq_alloc_host(mpic-&gt;node, IRQ_HOST_MAP_LINEAR,</div><div class='ctx'> 				       isu_size ? isu_size : mpic-&gt;num_sources,</div><div class='ctx'> 				       &amp;mpic_host_ops,</div><div class='ctx'> 				       flags &amp; MPIC_LARGE_VECTORS ? 2048 : 256);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * FIXME: The code leaks the MPIC object and mappings here; this</div><div class='add'>+	 * is very unlikely to fail but it ought to be fixed anyways.</div><div class='add'>+	 */</div><div class='ctx'> 	if (mpic-&gt;irqhost == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1347,19 +1376,23 @@ struct mpic * __init mpic_alloc(struct device_node *node,</div><div class='ctx'> 	}</div><div class='ctx'> 	printk(KERN_INFO "mpic: Setting up MPIC \"%s\" version %s at %llx,"</div><div class='ctx'> 	       " max %d CPUs\n",</div><div class='del'>-	       name, vers, (unsigned long long)paddr, num_possible_cpus());</div><div class='add'>+	       name, vers, (unsigned long long)mpic-&gt;paddr, num_possible_cpus());</div><div class='ctx'> 	printk(KERN_INFO "mpic: ISU size: %d, shift: %d, mask: %x\n",</div><div class='ctx'> 	       mpic-&gt;isu_size, mpic-&gt;isu_shift, mpic-&gt;isu_mask);</div><div class='ctx'> </div><div class='ctx'> 	mpic-&gt;next = mpics;</div><div class='ctx'> 	mpics = mpic;</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; MPIC_PRIMARY) {</div><div class='add'>+	if (!(flags &amp; MPIC_SECONDARY)) {</div><div class='ctx'> 		mpic_primary = mpic;</div><div class='ctx'> 		irq_set_default_host(mpic-&gt;irqhost);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return mpic;</div><div class='add'>+</div><div class='add'>+err_of_node_put:</div><div class='add'>+	of_node_put(node);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init mpic_assign_isu(struct mpic *mpic, unsigned int isu_num,</div><div class='hunk'>@@ -1369,7 +1402,7 @@ void __init mpic_assign_isu(struct mpic *mpic, unsigned int isu_num,</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(isu_num &gt;= MPIC_MAX_ISU);</div><div class='ctx'> </div><div class='del'>-	mpic_map(mpic, mpic-&gt;irqhost-&gt;of_node,</div><div class='add'>+	mpic_map(mpic,</div><div class='ctx'> 		 paddr, &amp;mpic-&gt;isus[isu_num], 0,</div><div class='ctx'> 		 MPIC_INFO(IRQ_STRIDE) * mpic-&gt;isu_size);</div><div class='ctx'> </div><div class='hunk'>@@ -1385,8 +1418,7 @@ void __init mpic_set_default_senses(struct mpic *mpic, u8 *senses, int count)</div><div class='ctx'> </div><div class='ctx'> void __init mpic_init(struct mpic *mpic)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	int cpu;</div><div class='add'>+	int i, cpu;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(mpic-&gt;num_sources == 0);</div><div class='ctx'> </div><div class='hunk'>@@ -1424,7 +1456,7 @@ void __init mpic_init(struct mpic *mpic)</div><div class='ctx'> </div><div class='ctx'> 	/* Do the HT PIC fixups on U3 broken mpic */</div><div class='ctx'> 	DBG("MPIC flags: %x\n", mpic-&gt;flags);</div><div class='del'>-	if ((mpic-&gt;flags &amp; MPIC_U3_HT_IRQS) &amp;&amp; (mpic-&gt;flags &amp; MPIC_PRIMARY)) {</div><div class='add'>+	if ((mpic-&gt;flags &amp; MPIC_U3_HT_IRQS) &amp;&amp; !(mpic-&gt;flags &amp; MPIC_SECONDARY)) {</div><div class='ctx'> 		mpic_scan_ht_pics(mpic);</div><div class='ctx'> 		mpic_u3msi_init(mpic);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1471,6 +1503,17 @@ void __init mpic_init(struct mpic *mpic)</div><div class='ctx'> 				  GFP_KERNEL);</div><div class='ctx'> 	BUG_ON(mpic-&gt;save_data == NULL);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	/* Check if this MPIC is chained from a parent interrupt controller */</div><div class='add'>+	if (mpic-&gt;flags &amp; MPIC_SECONDARY) {</div><div class='add'>+		int virq = irq_of_parse_and_map(mpic-&gt;node, 0);</div><div class='add'>+		if (virq != NO_IRQ) {</div><div class='add'>+			printk(KERN_INFO "%s: hooking up to IRQ %d\n",</div><div class='add'>+					mpic-&gt;node-&gt;full_name, virq);</div><div class='add'>+			irq_set_handler_data(virq, mpic);</div><div class='add'>+			irq_set_chained_handler(virq, &amp;mpic_cascade);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init mpic_set_clk_ratio(struct mpic *mpic, u32 clock_ratio)</div><div class='head'>diff --git a/arch/powerpc/sysdev/ppc4xx_cpm.c b/arch/powerpc/sysdev/ppc4xx_cpm.c<br/>index 73b86cc5ea74..82e2cfe35c62 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/ppc4xx_cpm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/ppc4xx_cpm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/ppc4xx_cpm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/ppc4xx_cpm.c</a></div><div class='hunk'>@@ -179,12 +179,12 @@ static struct kobj_attribute cpm_idle_attr =</div><div class='ctx'> </div><div class='ctx'> static void cpm_idle_config_sysfs(void)</div><div class='ctx'> {</div><div class='del'>-	struct sys_device *sys_dev;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> 	unsigned long ret;</div><div class='ctx'> </div><div class='del'>-	sys_dev = get_cpu_sysdev(0);</div><div class='add'>+	dev = get_cpu_device(0);</div><div class='ctx'> </div><div class='del'>-	ret = sysfs_create_file(&amp;sys_dev-&gt;kobj,</div><div class='add'>+	ret = sysfs_create_file(&amp;dev-&gt;kobj,</div><div class='ctx'> 				&amp;cpm_idle_attr.attr);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='head'>diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c<br/>index 862f11b3821e..4f05f7542346 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/ppc4xx_pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/ppc4xx_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/ppc4xx_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/ppc4xx_pci.c</a></div><div class='hunk'>@@ -185,9 +185,15 @@ static int __init ppc4xx_parse_dma_ranges(struct pci_controller *hose,</div><div class='ctx'>  out:</div><div class='ctx'> 	dma_offset_set = 1;</div><div class='ctx'> 	pci_dram_offset = res-&gt;start;</div><div class='add'>+	hose-&gt;dma_window_base_cur = res-&gt;start;</div><div class='add'>+	hose-&gt;dma_window_size = resource_size(res);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "4xx PCI DMA offset set to 0x%08lx\n",</div><div class='ctx'> 	       pci_dram_offset);</div><div class='add'>+	printk(KERN_INFO "4xx PCI DMA window base to 0x%016llx\n",</div><div class='add'>+	       (unsigned long long)hose-&gt;dma_window_base_cur);</div><div class='add'>+	printk(KERN_INFO "DMA window size 0x%016llx\n",</div><div class='add'>+	       (unsigned long long)hose-&gt;dma_window_size);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -647,6 +653,7 @@ static unsigned int ppc4xx_pciex_port_count;</div><div class='ctx'> </div><div class='ctx'> struct ppc4xx_pciex_hwops</div><div class='ctx'> {</div><div class='add'>+	bool want_sdr;</div><div class='ctx'> 	int (*core_init)(struct device_node *np);</div><div class='ctx'> 	int (*port_init_hw)(struct ppc4xx_pciex_port *port);</div><div class='ctx'> 	int (*setup_utl)(struct ppc4xx_pciex_port *port);</div><div class='hunk'>@@ -916,6 +923,7 @@ static int ppc440speB_pciex_init_utl(struct ppc4xx_pciex_port *port)</div><div class='ctx'> </div><div class='ctx'> static struct ppc4xx_pciex_hwops ppc440speA_pcie_hwops __initdata =</div><div class='ctx'> {</div><div class='add'>+	.want_sdr	= true,</div><div class='ctx'> 	.core_init	= ppc440spe_pciex_core_init,</div><div class='ctx'> 	.port_init_hw	= ppc440speA_pciex_init_port_hw,</div><div class='ctx'> 	.setup_utl	= ppc440speA_pciex_init_utl,</div><div class='hunk'>@@ -924,6 +932,7 @@ static struct ppc4xx_pciex_hwops ppc440speA_pcie_hwops __initdata =</div><div class='ctx'> </div><div class='ctx'> static struct ppc4xx_pciex_hwops ppc440speB_pcie_hwops __initdata =</div><div class='ctx'> {</div><div class='add'>+	.want_sdr	= true,</div><div class='ctx'> 	.core_init	= ppc440spe_pciex_core_init,</div><div class='ctx'> 	.port_init_hw	= ppc440speB_pciex_init_port_hw,</div><div class='ctx'> 	.setup_utl	= ppc440speB_pciex_init_utl,</div><div class='hunk'>@@ -1034,6 +1043,7 @@ static int ppc460ex_pciex_init_utl(struct ppc4xx_pciex_port *port)</div><div class='ctx'> </div><div class='ctx'> static struct ppc4xx_pciex_hwops ppc460ex_pcie_hwops __initdata =</div><div class='ctx'> {</div><div class='add'>+	.want_sdr	= true,</div><div class='ctx'> 	.core_init	= ppc460ex_pciex_core_init,</div><div class='ctx'> 	.port_init_hw	= ppc460ex_pciex_init_port_hw,</div><div class='ctx'> 	.setup_utl	= ppc460ex_pciex_init_utl,</div><div class='hunk'>@@ -1181,6 +1191,7 @@ done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ppc4xx_pciex_hwops ppc460sx_pcie_hwops __initdata = {</div><div class='add'>+	.want_sdr	= true,</div><div class='ctx'> 	.core_init	= ppc460sx_pciex_core_init,</div><div class='ctx'> 	.port_init_hw	= ppc460sx_pciex_init_port_hw,</div><div class='ctx'> 	.setup_utl	= ppc460sx_pciex_init_utl,</div><div class='hunk'>@@ -1276,6 +1287,7 @@ static int ppc405ex_pciex_init_utl(struct ppc4xx_pciex_port *port)</div><div class='ctx'> </div><div class='ctx'> static struct ppc4xx_pciex_hwops ppc405ex_pcie_hwops __initdata =</div><div class='ctx'> {</div><div class='add'>+	.want_sdr	= true,</div><div class='ctx'> 	.core_init	= ppc405ex_pciex_core_init,</div><div class='ctx'> 	.port_init_hw	= ppc405ex_pciex_init_port_hw,</div><div class='ctx'> 	.setup_utl	= ppc405ex_pciex_init_utl,</div><div class='hunk'>@@ -1284,6 +1296,52 @@ static struct ppc4xx_pciex_hwops ppc405ex_pcie_hwops __initdata =</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_40x */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_476FPE</div><div class='add'>+static int __init ppc_476fpe_pciex_core_init(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	return 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init ppc_476fpe_pciex_check_link(struct ppc4xx_pciex_port *port)</div><div class='add'>+{</div><div class='add'>+	u32 timeout_ms = 20;</div><div class='add'>+	u32 val = 0, mask = (PECFG_TLDLP_LNKUP|PECFG_TLDLP_PRESENT);</div><div class='add'>+	void __iomem *mbase = ioremap(port-&gt;cfg_space.start + 0x10000000,</div><div class='add'>+	                              0x1000);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "PCIE%d: Checking link...\n", port-&gt;index);</div><div class='add'>+</div><div class='add'>+	if (mbase == NULL) {</div><div class='add'>+		printk(KERN_WARNING "PCIE%d: failed to get cfg space\n",</div><div class='add'>+		                    port-&gt;index);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+		</div><div class='add'>+	while (timeout_ms--) {</div><div class='add'>+		val = in_le32(mbase + PECFG_TLDLP);</div><div class='add'>+</div><div class='add'>+		if ((val &amp; mask) == mask)</div><div class='add'>+			break;</div><div class='add'>+		msleep(10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (val &amp; PECFG_TLDLP_PRESENT) {</div><div class='add'>+		printk(KERN_INFO "PCIE%d: link is up !\n", port-&gt;index);</div><div class='add'>+		port-&gt;link = 1;</div><div class='add'>+	} else</div><div class='add'>+		printk(KERN_WARNING "PCIE%d: Link up failed\n", port-&gt;index);</div><div class='add'>+</div><div class='add'>+	iounmap(mbase);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ppc4xx_pciex_hwops ppc_476fpe_pcie_hwops __initdata =</div><div class='add'>+{</div><div class='add'>+	.core_init	= ppc_476fpe_pciex_core_init,</div><div class='add'>+	.check_link	= ppc_476fpe_pciex_check_link,</div><div class='add'>+};</div><div class='add'>+#endif /* CONFIG_476FPE */</div><div class='add'>+</div><div class='ctx'> /* Check that the core has been initied and if not, do it */</div><div class='ctx'> static int __init ppc4xx_pciex_check_core_init(struct device_node *np)</div><div class='ctx'> {</div><div class='hunk'>@@ -1309,6 +1367,10 @@ static int __init ppc4xx_pciex_check_core_init(struct device_node *np)</div><div class='ctx'> 	if (of_device_is_compatible(np, "ibm,plb-pciex-405ex"))</div><div class='ctx'> 		ppc4xx_pciex_hwops = &amp;ppc405ex_pcie_hwops;</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_476FPE</div><div class='add'>+	if (of_device_is_compatible(np, "ibm,plb-pciex-476fpe"))</div><div class='add'>+		ppc4xx_pciex_hwops = &amp;ppc_476fpe_pcie_hwops;</div><div class='add'>+#endif</div><div class='ctx'> 	if (ppc4xx_pciex_hwops == NULL) {</div><div class='ctx'> 		printk(KERN_WARNING "PCIE: unknown host type %s\n",</div><div class='ctx'> 		       np-&gt;full_name);</div><div class='hunk'>@@ -1617,6 +1679,10 @@ static int __init ppc4xx_setup_one_pciex_POM(struct ppc4xx_pciex_port	*port,</div><div class='ctx'> 			dcr_write(port-&gt;dcrs, DCRO_PEGPL_OMR1MSKL,</div><div class='ctx'> 				sa | DCRO_PEGPL_460SX_OMR1MSKL_UOT</div><div class='ctx'> 					| DCRO_PEGPL_OMRxMSKL_VAL);</div><div class='add'>+		else if (of_device_is_compatible(port-&gt;node, "ibm,plb-pciex-476fpe"))</div><div class='add'>+			dcr_write(port-&gt;dcrs, DCRO_PEGPL_OMR1MSKL,</div><div class='add'>+				sa | DCRO_PEGPL_476FPE_OMR1MSKL_UOT</div><div class='add'>+					| DCRO_PEGPL_OMRxMSKL_VAL);</div><div class='ctx'> 		else</div><div class='ctx'> 			dcr_write(port-&gt;dcrs, DCRO_PEGPL_OMR1MSKL,</div><div class='ctx'> 				sa | DCRO_PEGPL_OMR1MSKL_UOT</div><div class='hunk'>@@ -1739,9 +1805,10 @@ static void __init ppc4xx_configure_pciex_PIMs(struct ppc4xx_pciex_port *port,</div><div class='ctx'> 		/* Calculate window size */</div><div class='ctx'> 		sa = (0xffffffffffffffffull &lt;&lt; ilog2(size));</div><div class='ctx'> 		if (res-&gt;flags &amp; IORESOURCE_PREFETCH)</div><div class='del'>-			sa |= 0x8;</div><div class='add'>+			sa |= PCI_BASE_ADDRESS_MEM_PREFETCH;</div><div class='ctx'> </div><div class='del'>-		if (of_device_is_compatible(port-&gt;node, "ibm,plb-pciex-460sx"))</div><div class='add'>+		if (of_device_is_compatible(port-&gt;node, "ibm,plb-pciex-460sx") ||</div><div class='add'>+		    of_device_is_compatible(port-&gt;node, "ibm,plb-pciex-476fpe"))</div><div class='ctx'> 			sa |= PCI_BASE_ADDRESS_MEM_TYPE_64;</div><div class='ctx'> </div><div class='ctx'> 		out_le32(mbase + PECFG_BAR0HMPA, RES_TO_U32_HIGH(sa));</div><div class='hunk'>@@ -1972,13 +2039,15 @@ static void __init ppc4xx_probe_pciex_bridge(struct device_node *np)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	port-&gt;node = of_node_get(np);</div><div class='del'>-	pval = of_get_property(np, "sdr-base", NULL);</div><div class='del'>-	if (pval == NULL) {</div><div class='del'>-		printk(KERN_ERR "PCIE: missing sdr-base for %s\n",</div><div class='del'>-		       np-&gt;full_name);</div><div class='del'>-		return;</div><div class='add'>+	if (ppc4xx_pciex_hwops-&gt;want_sdr) {</div><div class='add'>+		pval = of_get_property(np, "sdr-base", NULL);</div><div class='add'>+		if (pval == NULL) {</div><div class='add'>+			printk(KERN_ERR "PCIE: missing sdr-base for %s\n",</div><div class='add'>+			       np-&gt;full_name);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		port-&gt;sdr_base = *pval;</div><div class='ctx'> 	}</div><div class='del'>-	port-&gt;sdr_base = *pval;</div><div class='ctx'> </div><div class='ctx'> 	/* Check if device_type property is set to "pci" or "pci-endpoint".</div><div class='ctx'> 	 * Resulting from this setup this PCIe port will be configured</div><div class='head'>diff --git a/arch/powerpc/sysdev/ppc4xx_pci.h b/arch/powerpc/sysdev/ppc4xx_pci.h<br/>index 32ce763a375a..bb4821938ab1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/ppc4xx_pci.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/ppc4xx_pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/ppc4xx_pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/ppc4xx_pci.h</a></div><div class='hunk'>@@ -476,6 +476,13 @@</div><div class='ctx'> #define DCRO_PEGPL_OMR1MSKL_UOT	 0x00000002</div><div class='ctx'> #define DCRO_PEGPL_OMR3MSKL_IO	 0x00000002</div><div class='ctx'> </div><div class='add'>+/* 476FPE */</div><div class='add'>+#define PCCFG_LCPA			0x270</div><div class='add'>+#define PECFG_TLDLP			0x3F8</div><div class='add'>+#define PECFG_TLDLP_LNKUP		0x00000008</div><div class='add'>+#define PECFG_TLDLP_PRESENT		0x00000010</div><div class='add'>+#define DCRO_PEGPL_476FPE_OMR1MSKL_UOT	 0x00000004</div><div class='add'>+</div><div class='ctx'> /* SDR Bit Mappings */</div><div class='ctx'> #define PESDRx_RCSSET_HLDPLB	0x10000000</div><div class='ctx'> #define PESDRx_RCSSET_RSTGU	0x01000000</div><div class='head'>diff --git a/arch/powerpc/sysdev/qe_lib/gpio.c b/arch/powerpc/sysdev/qe_lib/gpio.c<br/>index e23f23cf9f5c..521e67a49dc4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/qe_lib/gpio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/qe_lib/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/qe_lib/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/qe_lib/gpio.c</a></div><div class='hunk'>@@ -139,14 +139,10 @@ struct qe_pin {</div><div class='ctx'> struct qe_pin *qe_pin_request(struct device_node *np, int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct qe_pin *qe_pin;</div><div class='del'>-	struct device_node *gpio_np;</div><div class='ctx'> 	struct gpio_chip *gc;</div><div class='ctx'> 	struct of_mm_gpio_chip *mm_gc;</div><div class='ctx'> 	struct qe_gpio_chip *qe_gc;</div><div class='ctx'> 	int err;</div><div class='del'>-	int size;</div><div class='del'>-	const void *gpio_spec;</div><div class='del'>-	const u32 *gpio_cells;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	qe_pin = kzalloc(sizeof(*qe_pin), GFP_KERNEL);</div><div class='hunk'>@@ -155,45 +151,25 @@ struct qe_pin *qe_pin_request(struct device_node *np, int index)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = of_parse_phandles_with_args(np, "gpios", "#gpio-cells", index,</div><div class='del'>-					  &amp;gpio_np, &amp;gpio_spec);</div><div class='del'>-	if (err) {</div><div class='del'>-		pr_debug("%s: can't parse gpios property\n", __func__);</div><div class='add'>+	err = of_get_gpio(np, index);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err0;</div><div class='add'>+	gc = gpio_to_chip(err);</div><div class='add'>+	if (WARN_ON(!gc))</div><div class='ctx'> 		goto err0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (!of_device_is_compatible(gpio_np, "fsl,mpc8323-qe-pario-bank")) {</div><div class='add'>+	if (!of_device_is_compatible(gc-&gt;of_node, "fsl,mpc8323-qe-pario-bank")) {</div><div class='ctx'> 		pr_debug("%s: tried to get a non-qe pin\n", __func__);</div><div class='ctx'> 		err = -EINVAL;</div><div class='del'>-		goto err1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gc = of_node_to_gpiochip(gpio_np);</div><div class='del'>-	if (!gc) {</div><div class='del'>-		pr_debug("%s: gpio controller %s isn't registered\n",</div><div class='del'>-			 np-&gt;full_name, gpio_np-&gt;full_name);</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto err1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gpio_cells = of_get_property(gpio_np, "#gpio-cells", &amp;size);</div><div class='del'>-	if (!gpio_cells || size != sizeof(*gpio_cells) ||</div><div class='del'>-			*gpio_cells != gc-&gt;of_gpio_n_cells) {</div><div class='del'>-		pr_debug("%s: wrong #gpio-cells for %s\n",</div><div class='del'>-			 np-&gt;full_name, gpio_np-&gt;full_name);</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto err1;</div><div class='add'>+		goto err0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = gc-&gt;of_xlate(gc, np, gpio_spec, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto err1;</div><div class='del'>-</div><div class='ctx'> 	mm_gc = to_of_mm_gpio_chip(gc);</div><div class='ctx'> 	qe_gc = to_qe_gpio_chip(mm_gc);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;qe_gc-&gt;lock, flags);</div><div class='ctx'> </div><div class='add'>+	err -= gc-&gt;base;</div><div class='ctx'> 	if (test_and_set_bit(QE_PIN_REQUESTED, &amp;qe_gc-&gt;pin_flags[err]) == 0) {</div><div class='ctx'> 		qe_pin-&gt;controller = qe_gc;</div><div class='ctx'> 		qe_pin-&gt;num = err;</div><div class='hunk'>@@ -206,8 +182,6 @@ struct qe_pin *qe_pin_request(struct device_node *np, int index)</div><div class='ctx'> </div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		return qe_pin;</div><div class='del'>-err1:</div><div class='del'>-	of_node_put(gpio_np);</div><div class='ctx'> err0:</div><div class='ctx'> 	kfree(qe_pin);</div><div class='ctx'> 	pr_debug("%s failed with status %d\n", __func__, err);</div><div class='head'>diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/arch/powerpc/sysdev/qe_lib/qe_ic.c<br/>index 18e75ca19fe6..73034bd203c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/qe_lib/qe_ic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/qe_lib/qe_ic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/qe_lib/qe_ic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/qe_lib/qe_ic.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -484,13 +483,14 @@ int qe_ic_set_high_priority(unsigned int virq, unsigned int priority, int high)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class qe_ic_sysclass = {</div><div class='add'>+static struct bus_type qe_ic_subsys = {</div><div class='ctx'> 	.name = "qe_ic",</div><div class='add'>+	.dev_name = "qe_ic",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sys_device device_qe_ic = {</div><div class='add'>+static struct device device_qe_ic = {</div><div class='ctx'> 	.id = 0,</div><div class='del'>-	.cls = &amp;qe_ic_sysclass,</div><div class='add'>+	.bus = &amp;qe_ic_subsys,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init init_qe_ic_sysfs(void)</div><div class='hunk'>@@ -499,12 +499,12 @@ static int __init init_qe_ic_sysfs(void)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_DEBUG "Registering qe_ic with sysfs...\n");</div><div class='ctx'> </div><div class='del'>-	rc = sysdev_class_register(&amp;qe_ic_sysclass);</div><div class='add'>+	rc = subsys_system_register(&amp;qe_ic_subsys, NULL);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		printk(KERN_ERR "Failed registering qe_ic sys class\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	rc = sysdev_register(&amp;device_qe_ic);</div><div class='add'>+	rc = device_register(&amp;device_qe_ic);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		printk(KERN_ERR "Failed registering qe_ic sys device\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='head'>diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c<br/>index 3330feca7502..063c901b1265 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/uic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/uic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/uic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/uic.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='head'>diff --git a/arch/powerpc/sysdev/xics/icp-hv.c b/arch/powerpc/sysdev/xics/icp-hv.c<br/>index 9518d367a64f..253dce98c16e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/xics/icp-hv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/xics/icp-hv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/xics/icp-hv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/xics/icp-hv.c</a></div><div class='hunk'>@@ -27,33 +27,50 @@ static inline unsigned int icp_hv_get_xirr(unsigned char cppr)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long retbuf[PLPAR_HCALL_BUFSIZE];</div><div class='ctx'> 	long rc;</div><div class='add'>+	unsigned int ret = XICS_IRQ_SPURIOUS;</div><div class='ctx'> </div><div class='ctx'> 	rc = plpar_hcall(H_XIRR, retbuf, cppr);</div><div class='del'>-	if (rc != H_SUCCESS)</div><div class='del'>-		panic(" bad return code xirr - rc = %lx\n", rc);</div><div class='del'>-	return (unsigned int)retbuf[0];</div><div class='del'>-}</div><div class='add'>+	if (rc == H_SUCCESS) {</div><div class='add'>+		ret = (unsigned int)retbuf[0];</div><div class='add'>+	} else {</div><div class='add'>+		pr_err("%s: bad return code xirr cppr=0x%x returned %ld\n",</div><div class='add'>+			__func__, cppr, rc);</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static inline void icp_hv_set_xirr(unsigned int value)</div><div class='del'>-{</div><div class='del'>-	long rc = plpar_hcall_norets(H_EOI, value);</div><div class='del'>-	if (rc != H_SUCCESS)</div><div class='del'>-		panic("bad return code EOI - rc = %ld, value=%x\n", rc, value);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void icp_hv_set_cppr(u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	long rc = plpar_hcall_norets(H_CPPR, value);</div><div class='del'>-	if (rc != H_SUCCESS)</div><div class='del'>-		panic("bad return code cppr - rc = %lx\n", rc);</div><div class='add'>+	if (rc != H_SUCCESS) {</div><div class='add'>+		pr_err("%s: bad return code cppr cppr=0x%x returned %ld\n",</div><div class='add'>+			__func__, value, rc);</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void icp_hv_set_xirr(unsigned int value)</div><div class='add'>+{</div><div class='add'>+	long rc = plpar_hcall_norets(H_EOI, value);</div><div class='add'>+	if (rc != H_SUCCESS) {</div><div class='add'>+		pr_err("%s: bad return code eoi xirr=0x%x returned %ld\n",</div><div class='add'>+			__func__, value, rc);</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		icp_hv_set_cppr(value &gt;&gt; 24);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void icp_hv_set_qirr(int n_cpu , u8 value)</div><div class='ctx'> {</div><div class='del'>-	long rc = plpar_hcall_norets(H_IPI, get_hard_smp_processor_id(n_cpu),</div><div class='del'>-				     value);</div><div class='del'>-	if (rc != H_SUCCESS)</div><div class='del'>-		panic("bad return code qirr - rc = %lx\n", rc);</div><div class='add'>+	int hw_cpu = get_hard_smp_processor_id(n_cpu);</div><div class='add'>+	long rc = plpar_hcall_norets(H_IPI, hw_cpu, value);</div><div class='add'>+	if (rc != H_SUCCESS) {</div><div class='add'>+		pr_err("%s: bad return code qirr cpu=%d hw_cpu=%d mfrr=0x%x "</div><div class='add'>+			"returned %ld\n", __func__, n_cpu, hw_cpu, value, rc);</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void icp_hv_eoi(struct irq_data *d)</div><div class='head'>diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c<br/>index 63762c672a03..d72eda6a4c05 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/xics/xics-common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/sysdev/xics/xics-common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/xics/xics-common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/sysdev/xics/xics-common.c</a></div><div class='hunk'>@@ -137,7 +137,7 @@ static void xics_request_ipi(void)</div><div class='ctx'> 	 * IPIs are marked IRQF_PERCPU. The handler was set in map.</div><div class='ctx'> 	 */</div><div class='ctx'> 	BUG_ON(request_irq(ipi, icp_ops-&gt;ipi_action,</div><div class='del'>-			   IRQF_PERCPU, "IPI", NULL));</div><div class='add'>+			   IRQF_PERCPU | IRQF_NO_THREAD, "IPI", NULL));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __init xics_smp_probe(void)</div><div class='head'>diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c<br/>index 03a217ae3be0..cb95eea74d3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/xmon/xmon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/powerpc/xmon/xmon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/xmon/xmon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/powerpc/xmon/xmon.c</a></div><div class='hunk'>@@ -228,13 +228,11 @@ Commands:\n\</div><div class='ctx'>   t	print backtrace\n\</div><div class='ctx'>   x	exit monitor and recover\n\</div><div class='ctx'>   X	exit monitor and dont recover\n"</div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='add'>+#if defined(CONFIG_PPC64) &amp;&amp; !defined(CONFIG_PPC_BOOK3E)</div><div class='ctx'> "  u	dump segment table or SLB\n"</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_PPC_STD_MMU_32</div><div class='add'>+#elif defined(CONFIG_PPC_STD_MMU_32)</div><div class='ctx'> "  u	dump segment registers\n"</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_44x</div><div class='add'>+#elif defined(CONFIG_44x) || defined(CONFIG_PPC_BOOK3E)</div><div class='ctx'> "  u	dump TLB\n"</div><div class='ctx'> #endif</div><div class='ctx'> "  ?	help\n"</div><div class='hunk'>@@ -340,7 +338,7 @@ int cpus_are_in_xmon(void)</div><div class='ctx'> </div><div class='ctx'> static inline int unrecoverable_excp(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-#if defined(CONFIG_4xx) || defined(CONFIG_BOOK3E)</div><div class='add'>+#if defined(CONFIG_4xx) || defined(CONFIG_PPC_BOOK3E)</div><div class='ctx'> 	/* We have no MSR_RI bit on 4xx or Book3e, so we simply return false */</div><div class='ctx'> 	return 0;</div><div class='ctx'> #else</div><div class='hunk'>@@ -885,13 +883,11 @@ cmds(struct pt_regs *excp)</div><div class='ctx'> 		case 'u':</div><div class='ctx'> 			dump_segments();</div><div class='ctx'> 			break;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_4xx</div><div class='add'>+#elif defined(CONFIG_4xx)</div><div class='ctx'> 		case 'u':</div><div class='ctx'> 			dump_tlb_44x();</div><div class='ctx'> 			break;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_PPC_BOOK3E</div><div class='add'>+#elif defined(CONFIG_PPC_BOOK3E)</div><div class='ctx'> 		case 'u':</div><div class='ctx'> 			dump_tlb_book3e();</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/arch/s390/Kbuild b/arch/s390/Kbuild<br/>index ae4b01060edd..9858476fa0fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/Kbuild?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/Kbuild</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/Kbuild?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/Kbuild</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='del'>-obj-y += kernel/</div><div class='del'>-obj-y += mm/</div><div class='del'>-obj-y += crypto/</div><div class='del'>-obj-y += appldata/</div><div class='del'>-obj-y += hypfs/</div><div class='del'>-obj-y += kvm/</div><div class='add'>+obj-y				+= kernel/</div><div class='add'>+obj-y				+= mm/</div><div class='add'>+obj-$(CONFIG_KVM)		+= kvm/</div><div class='add'>+obj-$(CONFIG_CRYPTO_HW)		+= crypto/</div><div class='add'>+obj-$(CONFIG_S390_HYPFS_FS)	+= hypfs/</div><div class='add'>+obj-$(CONFIG_APPLDATA_BASE)	+= appldata/</div><div class='add'>+obj-$(CONFIG_MATHEMU)		+= math-emu/</div><div class='head'>diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig<br/>index d48ede334434..d1727584230a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/Kconfig</a></div><div class='hunk'>@@ -87,7 +87,6 @@ config S390</div><div class='ctx'> 	select HAVE_KERNEL_LZMA</div><div class='ctx'> 	select HAVE_KERNEL_LZO</div><div class='ctx'> 	select HAVE_KERNEL_XZ</div><div class='del'>-	select HAVE_GET_USER_PAGES_FAST</div><div class='ctx'> 	select HAVE_ARCH_MUTEX_CPU_RELAX</div><div class='ctx'> 	select HAVE_ARCH_JUMP_LABEL if !MARCH_G5</div><div class='ctx'> 	select HAVE_RCU_TABLE_FREE if SMP</div><div class='hunk'>@@ -194,18 +193,13 @@ config HOTPLUG_CPU</div><div class='ctx'> 	  Say N if you want to disable CPU hotplug.</div><div class='ctx'> </div><div class='ctx'> config SCHED_MC</div><div class='del'>-	def_bool y</div><div class='del'>-	prompt "Multi-core scheduler support"</div><div class='del'>-	depends on SMP</div><div class='del'>-	help</div><div class='del'>-	  Multi-core scheduler support improves the CPU scheduler's decision</div><div class='del'>-	  making when dealing with multi-core CPU chips at a cost of slightly</div><div class='del'>-	  increased overhead in some places.</div><div class='add'>+	def_bool n</div><div class='ctx'> </div><div class='ctx'> config SCHED_BOOK</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	prompt "Book scheduler support"</div><div class='del'>-	depends on SMP &amp;&amp; SCHED_MC</div><div class='add'>+	depends on SMP</div><div class='add'>+	select SCHED_MC</div><div class='ctx'> 	help</div><div class='ctx'> 	  Book scheduler support improves the CPU scheduler's decision making</div><div class='ctx'> 	  when dealing with machines that have several books.</div><div class='head'>diff --git a/arch/s390/Makefile b/arch/s390/Makefile<br/>index 27a0b5df5ead..e9f353341693 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/Makefile</a></div><div class='hunk'>@@ -99,7 +99,6 @@ core-y		+= arch/s390/</div><div class='ctx'> </div><div class='ctx'> libs-y		+= arch/s390/lib/</div><div class='ctx'> drivers-y	+= drivers/s390/</div><div class='del'>-drivers-$(CONFIG_MATHEMU) += arch/s390/math-emu/</div><div class='ctx'> </div><div class='ctx'> # must be linked after kernel</div><div class='ctx'> drivers-$(CONFIG_OPROFILE)	+= arch/s390/oprofile/</div><div class='head'>diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile<br/>index 635d677d3281..f2737a005afc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/boot/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/boot/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/boot/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/boot/Makefile</a></div><div class='hunk'>@@ -23,4 +23,4 @@ $(obj)/compressed/vmlinux: FORCE</div><div class='ctx'> </div><div class='ctx'> install: $(CONFIGURE) $(obj)/image</div><div class='ctx'> 	sh -x  $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/image \</div><div class='del'>-	      System.map Kerntypes "$(INSTALL_PATH)"</div><div class='add'>+	      System.map "$(INSTALL_PATH)"</div><div class='head'>diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c<br/>index 481f4f76f664..8a2a887478cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/hypfs/inode.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/hypfs/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/hypfs/inode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/hypfs/inode.c</a></div><div class='hunk'>@@ -97,7 +97,7 @@ static void hypfs_delete_tree(struct dentry *root)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct inode *hypfs_make_inode(struct super_block *sb, int mode)</div><div class='add'>+static struct inode *hypfs_make_inode(struct super_block *sb, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *ret = new_inode(sb);</div><div class='ctx'> </div><div class='hunk'>@@ -107,7 +107,7 @@ static struct inode *hypfs_make_inode(struct super_block *sb, int mode)</div><div class='ctx'> 		ret-&gt;i_uid = hypfs_info-&gt;uid;</div><div class='ctx'> 		ret-&gt;i_gid = hypfs_info-&gt;gid;</div><div class='ctx'> 		ret-&gt;i_atime = ret-&gt;i_mtime = ret-&gt;i_ctime = CURRENT_TIME;</div><div class='del'>-		if (mode &amp; S_IFDIR)</div><div class='add'>+		if (S_ISDIR(mode))</div><div class='ctx'> 			set_nlink(ret, 2);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -259,9 +259,9 @@ static int hypfs_parse_options(char *options, struct super_block *sb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hypfs_show_options(struct seq_file *s, struct vfsmount *mnt)</div><div class='add'>+static int hypfs_show_options(struct seq_file *s, struct dentry *root)</div><div class='ctx'> {</div><div class='del'>-	struct hypfs_sb_info *hypfs_info = mnt-&gt;mnt_sb-&gt;s_fs_info;</div><div class='add'>+	struct hypfs_sb_info *hypfs_info = root-&gt;d_sb-&gt;s_fs_info;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(s, ",uid=%u", hypfs_info-&gt;uid);</div><div class='ctx'> 	seq_printf(s, ",gid=%u", hypfs_info-&gt;gid);</div><div class='hunk'>@@ -333,7 +333,7 @@ static void hypfs_kill_super(struct super_block *sb)</div><div class='ctx'> </div><div class='ctx'> static struct dentry *hypfs_create_file(struct super_block *sb,</div><div class='ctx'> 					struct dentry *parent, const char *name,</div><div class='del'>-					char *data, mode_t mode)</div><div class='add'>+					char *data, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -350,13 +350,13 @@ static struct dentry *hypfs_create_file(struct super_block *sb,</div><div class='ctx'> 		dentry = ERR_PTR(-ENOMEM);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='del'>-	if (mode &amp; S_IFREG) {</div><div class='add'>+	if (S_ISREG(mode)) {</div><div class='ctx'> 		inode-&gt;i_fop = &amp;hypfs_file_ops;</div><div class='ctx'> 		if (data)</div><div class='ctx'> 			inode-&gt;i_size = strlen(data);</div><div class='ctx'> 		else</div><div class='ctx'> 			inode-&gt;i_size = 0;</div><div class='del'>-	} else if (mode &amp; S_IFDIR) {</div><div class='add'>+	} else if (S_ISDIR(mode)) {</div><div class='ctx'> 		inode-&gt;i_op = &amp;simple_dir_inode_operations;</div><div class='ctx'> 		inode-&gt;i_fop = &amp;simple_dir_operations;</div><div class='ctx'> 		inc_nlink(parent-&gt;d_inode);</div><div class='head'>diff --git a/arch/s390/include/asm/chpid.h b/arch/s390/include/asm/chpid.h<br/>index fc71d8a6709b..8e88e2221771 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/chpid.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/chpid.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/chpid.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/chpid.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _ASM_S390_CHPID_H</div><div class='del'>-#define _ASM_S390_CHPID_H _ASM_S390_CHPID_H</div><div class='add'>+#define _ASM_S390_CHPID_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/arch/s390/include/asm/debug.h b/arch/s390/include/asm/debug.h<br/>index 18124b75a7ab..9d88db1f55d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/debug.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/debug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/debug.h</a></div><div class='hunk'>@@ -73,7 +73,7 @@ typedef struct debug_info {</div><div class='ctx'> 	struct dentry* debugfs_entries[DEBUG_MAX_VIEWS];</div><div class='ctx'> 	struct debug_view* views[DEBUG_MAX_VIEWS];	</div><div class='ctx'> 	char name[DEBUG_MAX_NAME_LEN];</div><div class='del'>-	mode_t mode;</div><div class='add'>+	umode_t mode;</div><div class='ctx'> } debug_info_t;</div><div class='ctx'> </div><div class='ctx'> typedef int (debug_header_proc_t) (debug_info_t* id,</div><div class='hunk'>@@ -124,7 +124,7 @@ debug_info_t *debug_register(const char *name, int pages, int nr_areas,</div><div class='ctx'>                              int buf_size);</div><div class='ctx'> </div><div class='ctx'> debug_info_t *debug_register_mode(const char *name, int pages, int nr_areas,</div><div class='del'>-				  int buf_size, mode_t mode, uid_t uid,</div><div class='add'>+				  int buf_size, umode_t mode, uid_t uid,</div><div class='ctx'> 				  gid_t gid);</div><div class='ctx'> </div><div class='ctx'> void debug_unregister(debug_info_t* id);</div><div class='head'>diff --git a/arch/s390/include/asm/itcw.h b/arch/s390/include/asm/itcw.h<br/>index a9bc5c36b32a..fb1bedd3dc0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/itcw.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/itcw.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/itcw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/itcw.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _ASM_S390_ITCW_H</div><div class='del'>-#define _ASM_S390_ITCW_H _ASM_S390_ITCW_H</div><div class='add'>+#define _ASM_S390_ITCW_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/fcx.h&gt;</div><div class='head'>diff --git a/arch/s390/include/asm/kdebug.h b/arch/s390/include/asm/kdebug.h<br/>index 40db27cd6e60..5c1abd47612a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/kdebug.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/kdebug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/kdebug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/kdebug.h</a></div><div class='hunk'>@@ -22,6 +22,6 @@ enum die_val {</div><div class='ctx'> 	DIE_NMI_IPI,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern void die(const char *, struct pt_regs *, long);</div><div class='add'>+extern void die(struct pt_regs *, const char *);</div><div class='ctx'> </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 9e13c7d56cc1..707f2306725b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/lowcore.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/lowcore.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/lowcore.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/lowcore.h</a></div><div class='hunk'>@@ -97,47 +97,52 @@ struct _lowcore {</div><div class='ctx'> 	__u32	gpregs_save_area[16];		/* 0x0180 */</div><div class='ctx'> 	__u32	cregs_save_area[16];		/* 0x01c0 */</div><div class='ctx'> </div><div class='add'>+	/* Save areas. */</div><div class='add'>+	__u32	save_area_sync[8];		/* 0x0200 */</div><div class='add'>+	__u32	save_area_async[8];		/* 0x0220 */</div><div class='add'>+	__u32	save_area_restart[1];		/* 0x0240 */</div><div class='add'>+	__u8	pad_0x0244[0x0248-0x0244];	/* 0x0244 */</div><div class='add'>+</div><div class='ctx'> 	/* Return psws. */</div><div class='del'>-	__u32	save_area[16];			/* 0x0200 */</div><div class='del'>-	psw_t	return_psw;			/* 0x0240 */</div><div class='del'>-	psw_t	return_mcck_psw;		/* 0x0248 */</div><div class='add'>+	psw_t	return_psw;			/* 0x0248 */</div><div class='add'>+	psw_t	return_mcck_psw;		/* 0x0250 */</div><div class='ctx'> </div><div class='ctx'> 	/* CPU time accounting values */</div><div class='del'>-	__u64	sync_enter_timer;		/* 0x0250 */</div><div class='del'>-	__u64	async_enter_timer;		/* 0x0258 */</div><div class='del'>-	__u64	mcck_enter_timer;		/* 0x0260 */</div><div class='del'>-	__u64	exit_timer;			/* 0x0268 */</div><div class='del'>-	__u64	user_timer;			/* 0x0270 */</div><div class='del'>-	__u64	system_timer;			/* 0x0278 */</div><div class='del'>-	__u64	steal_timer;			/* 0x0280 */</div><div class='del'>-	__u64	last_update_timer;		/* 0x0288 */</div><div class='del'>-	__u64	last_update_clock;		/* 0x0290 */</div><div class='add'>+	__u64	sync_enter_timer;		/* 0x0258 */</div><div class='add'>+	__u64	async_enter_timer;		/* 0x0260 */</div><div class='add'>+	__u64	mcck_enter_timer;		/* 0x0268 */</div><div class='add'>+	__u64	exit_timer;			/* 0x0270 */</div><div class='add'>+	__u64	user_timer;			/* 0x0278 */</div><div class='add'>+	__u64	system_timer;			/* 0x0280 */</div><div class='add'>+	__u64	steal_timer;			/* 0x0288 */</div><div class='add'>+	__u64	last_update_timer;		/* 0x0290 */</div><div class='add'>+	__u64	last_update_clock;		/* 0x0298 */</div><div class='ctx'> </div><div class='ctx'> 	/* Current process. */</div><div class='del'>-	__u32	current_task;			/* 0x0298 */</div><div class='del'>-	__u32	thread_info;			/* 0x029c */</div><div class='del'>-	__u32	kernel_stack;			/* 0x02a0 */</div><div class='add'>+	__u32	current_task;			/* 0x02a0 */</div><div class='add'>+	__u32	thread_info;			/* 0x02a4 */</div><div class='add'>+	__u32	kernel_stack;			/* 0x02a8 */</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupt and panic stack. */</div><div class='del'>-	__u32	async_stack;			/* 0x02a4 */</div><div class='del'>-	__u32	panic_stack;			/* 0x02a8 */</div><div class='add'>+	__u32	async_stack;			/* 0x02ac */</div><div class='add'>+	__u32	panic_stack;			/* 0x02b0 */</div><div class='ctx'> </div><div class='ctx'> 	/* Address space pointer. */</div><div class='del'>-	__u32	kernel_asce;			/* 0x02ac */</div><div class='del'>-	__u32	user_asce;			/* 0x02b0 */</div><div class='del'>-	__u32	current_pid;			/* 0x02b4 */</div><div class='add'>+	__u32	kernel_asce;			/* 0x02b4 */</div><div class='add'>+	__u32	user_asce;			/* 0x02b8 */</div><div class='add'>+	__u32	current_pid;			/* 0x02bc */</div><div class='ctx'> </div><div class='ctx'> 	/* SMP info area */</div><div class='del'>-	__u32	cpu_nr;				/* 0x02b8 */</div><div class='del'>-	__u32	softirq_pending;		/* 0x02bc */</div><div class='del'>-	__u32	percpu_offset;			/* 0x02c0 */</div><div class='del'>-	__u32	ext_call_fast;			/* 0x02c4 */</div><div class='del'>-	__u64	int_clock;			/* 0x02c8 */</div><div class='del'>-	__u64	mcck_clock;			/* 0x02d0 */</div><div class='del'>-	__u64	clock_comparator;		/* 0x02d8 */</div><div class='del'>-	__u32	machine_flags;			/* 0x02e0 */</div><div class='del'>-	__u32	ftrace_func;			/* 0x02e4 */</div><div class='del'>-	__u8	pad_0x02e8[0x0300-0x02e8];	/* 0x02e8 */</div><div class='add'>+	__u32	cpu_nr;				/* 0x02c0 */</div><div class='add'>+	__u32	softirq_pending;		/* 0x02c4 */</div><div class='add'>+	__u32	percpu_offset;			/* 0x02c8 */</div><div class='add'>+	__u32	ext_call_fast;			/* 0x02cc */</div><div class='add'>+	__u64	int_clock;			/* 0x02d0 */</div><div class='add'>+	__u64	mcck_clock;			/* 0x02d8 */</div><div class='add'>+	__u64	clock_comparator;		/* 0x02e0 */</div><div class='add'>+	__u32	machine_flags;			/* 0x02e8 */</div><div class='add'>+	__u32	ftrace_func;			/* 0x02ec */</div><div class='add'>+	__u8	pad_0x02f8[0x0300-0x02f0];	/* 0x02f0 */</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupt response block */</div><div class='ctx'> 	__u8	irb[64];			/* 0x0300 */</div><div class='hunk'>@@ -229,57 +234,62 @@ struct _lowcore {</div><div class='ctx'> 	psw_t	mcck_new_psw;			/* 0x01e0 */</div><div class='ctx'> 	psw_t	io_new_psw;			/* 0x01f0 */</div><div class='ctx'> </div><div class='del'>-	/* Entry/exit save area &amp; return psws. */</div><div class='del'>-	__u64	save_area[16];			/* 0x0200 */</div><div class='del'>-	psw_t	return_psw;			/* 0x0280 */</div><div class='del'>-	psw_t	return_mcck_psw;		/* 0x0290 */</div><div class='add'>+	/* Save areas. */</div><div class='add'>+	__u64	save_area_sync[8];		/* 0x0200 */</div><div class='add'>+	__u64	save_area_async[8];		/* 0x0240 */</div><div class='add'>+	__u64	save_area_restart[1];		/* 0x0280 */</div><div class='add'>+	__u8	pad_0x0288[0x0290-0x0288];	/* 0x0288 */</div><div class='add'>+</div><div class='add'>+	/* Return psws. */</div><div class='add'>+	psw_t	return_psw;			/* 0x0290 */</div><div class='add'>+	psw_t	return_mcck_psw;		/* 0x02a0 */</div><div class='ctx'> </div><div class='ctx'> 	/* CPU accounting and timing values. */</div><div class='del'>-	__u64	sync_enter_timer;		/* 0x02a0 */</div><div class='del'>-	__u64	async_enter_timer;		/* 0x02a8 */</div><div class='del'>-	__u64	mcck_enter_timer;		/* 0x02b0 */</div><div class='del'>-	__u64	exit_timer;			/* 0x02b8 */</div><div class='del'>-	__u64	user_timer;			/* 0x02c0 */</div><div class='del'>-	__u64	system_timer;			/* 0x02c8 */</div><div class='del'>-	__u64	steal_timer;			/* 0x02d0 */</div><div class='del'>-	__u64	last_update_timer;		/* 0x02d8 */</div><div class='del'>-	__u64	last_update_clock;		/* 0x02e0 */</div><div class='add'>+	__u64	sync_enter_timer;		/* 0x02b0 */</div><div class='add'>+	__u64	async_enter_timer;		/* 0x02b8 */</div><div class='add'>+	__u64	mcck_enter_timer;		/* 0x02c0 */</div><div class='add'>+	__u64	exit_timer;			/* 0x02c8 */</div><div class='add'>+	__u64	user_timer;			/* 0x02d0 */</div><div class='add'>+	__u64	system_timer;			/* 0x02d8 */</div><div class='add'>+	__u64	steal_timer;			/* 0x02e0 */</div><div class='add'>+	__u64	last_update_timer;		/* 0x02e8 */</div><div class='add'>+	__u64	last_update_clock;		/* 0x02f0 */</div><div class='ctx'> </div><div class='ctx'> 	/* Current process. */</div><div class='del'>-	__u64	current_task;			/* 0x02e8 */</div><div class='del'>-	__u64	thread_info;			/* 0x02f0 */</div><div class='del'>-	__u64	kernel_stack;			/* 0x02f8 */</div><div class='add'>+	__u64	current_task;			/* 0x02f8 */</div><div class='add'>+	__u64	thread_info;			/* 0x0300 */</div><div class='add'>+	__u64	kernel_stack;			/* 0x0308 */</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupt and panic stack. */</div><div class='del'>-	__u64	async_stack;			/* 0x0300 */</div><div class='del'>-	__u64	panic_stack;			/* 0x0308 */</div><div class='add'>+	__u64	async_stack;			/* 0x0310 */</div><div class='add'>+	__u64	panic_stack;			/* 0x0318 */</div><div class='ctx'> </div><div class='ctx'> 	/* Address space pointer. */</div><div class='del'>-	__u64	kernel_asce;			/* 0x0310 */</div><div class='del'>-	__u64	user_asce;			/* 0x0318 */</div><div class='del'>-	__u64	current_pid;			/* 0x0320 */</div><div class='add'>+	__u64	kernel_asce;			/* 0x0320 */</div><div class='add'>+	__u64	user_asce;			/* 0x0328 */</div><div class='add'>+	__u64	current_pid;			/* 0x0330 */</div><div class='ctx'> </div><div class='ctx'> 	/* SMP info area */</div><div class='del'>-	__u32	cpu_nr;				/* 0x0328 */</div><div class='del'>-	__u32	softirq_pending;		/* 0x032c */</div><div class='del'>-	__u64	percpu_offset;			/* 0x0330 */</div><div class='del'>-	__u64	ext_call_fast;			/* 0x0338 */</div><div class='del'>-	__u64	int_clock;			/* 0x0340 */</div><div class='del'>-	__u64	mcck_clock;			/* 0x0348 */</div><div class='del'>-	__u64	clock_comparator;		/* 0x0350 */</div><div class='del'>-	__u64	vdso_per_cpu_data;		/* 0x0358 */</div><div class='del'>-	__u64	machine_flags;			/* 0x0360 */</div><div class='del'>-	__u64	ftrace_func;			/* 0x0368 */</div><div class='del'>-	__u64	gmap;				/* 0x0370 */</div><div class='del'>-	__u64	cmf_hpp;			/* 0x0378 */</div><div class='add'>+	__u32	cpu_nr;				/* 0x0338 */</div><div class='add'>+	__u32	softirq_pending;		/* 0x033c */</div><div class='add'>+	__u64	percpu_offset;			/* 0x0340 */</div><div class='add'>+	__u64	ext_call_fast;			/* 0x0348 */</div><div class='add'>+	__u64	int_clock;			/* 0x0350 */</div><div class='add'>+	__u64	mcck_clock;			/* 0x0358 */</div><div class='add'>+	__u64	clock_comparator;		/* 0x0360 */</div><div class='add'>+	__u64	vdso_per_cpu_data;		/* 0x0368 */</div><div class='add'>+	__u64	machine_flags;			/* 0x0370 */</div><div class='add'>+	__u64	ftrace_func;			/* 0x0378 */</div><div class='add'>+	__u64	gmap;				/* 0x0380 */</div><div class='add'>+	__u8	pad_0x0388[0x0400-0x0388];	/* 0x0388 */</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupt response block. */</div><div class='del'>-	__u8	irb[64];			/* 0x0380 */</div><div class='add'>+	__u8	irb[64];			/* 0x0400 */</div><div class='ctx'> </div><div class='ctx'> 	/* Per cpu primary space access list */</div><div class='del'>-	__u32	paste[16];			/* 0x03c0 */</div><div class='add'>+	__u32	paste[16];			/* 0x0440 */</div><div class='ctx'> </div><div class='del'>-	__u8	pad_0x0400[0x0e00-0x0400];	/* 0x0400 */</div><div class='add'>+	__u8	pad_0x0480[0x0e00-0x0480];	/* 0x0480 */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * 0xe00 contains the address of the IPL Parameter Information</div><div class='head'>diff --git a/arch/s390/include/asm/mman.h b/arch/s390/include/asm/mman.h<br/>index 4e9c8ae0a637..d49760e63506 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/mman.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/mman.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/mman.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/mman.h</a></div><div class='hunk'>@@ -11,9 +11,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/mman.h&gt;</div><div class='ctx'> </div><div class='del'>-#if defined(__KERNEL__) &amp;&amp; !defined(__ASSEMBLY__) &amp;&amp; defined(CONFIG_64BIT)</div><div class='add'>+#if defined(__KERNEL__)</div><div class='add'>+#if !defined(__ASSEMBLY__) &amp;&amp; defined(CONFIG_64BIT)</div><div class='ctx'> int s390_mmap_check(unsigned long addr, unsigned long len);</div><div class='ctx'> #define arch_mmap_check(addr,len,flags)	s390_mmap_check(addr,len)</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif /* __S390_MMAN_H__ */</div><div class='head'>diff --git a/arch/s390/include/asm/percpu.h b/arch/s390/include/asm/percpu.h<br/>index 5325c89a5843..0fbd1899c7b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/percpu.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/percpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/percpu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/percpu.h</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #define ARCH_NEEDS_WEAK_PER_CPU</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define arch_irqsafe_cpu_to_op(pcp, val, op)				\</div><div class='add'>+#define arch_this_cpu_to_op(pcp, val, op)				\</div><div class='ctx'> do {									\</div><div class='ctx'> 	typedef typeof(pcp) pcp_op_T__;					\</div><div class='ctx'> 	pcp_op_T__ old__, new__, prev__;				\</div><div class='hunk'>@@ -41,27 +41,27 @@ do {									\</div><div class='ctx'> 	preempt_enable();						\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-#define irqsafe_cpu_add_1(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, +)</div><div class='del'>-#define irqsafe_cpu_add_2(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, +)</div><div class='del'>-#define irqsafe_cpu_add_4(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, +)</div><div class='del'>-#define irqsafe_cpu_add_8(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, +)</div><div class='add'>+#define this_cpu_add_1(pcp, val) arch_this_cpu_to_op(pcp, val, +)</div><div class='add'>+#define this_cpu_add_2(pcp, val) arch_this_cpu_to_op(pcp, val, +)</div><div class='add'>+#define this_cpu_add_4(pcp, val) arch_this_cpu_to_op(pcp, val, +)</div><div class='add'>+#define this_cpu_add_8(pcp, val) arch_this_cpu_to_op(pcp, val, +)</div><div class='ctx'> </div><div class='del'>-#define irqsafe_cpu_and_1(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, &amp;)</div><div class='del'>-#define irqsafe_cpu_and_2(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, &amp;)</div><div class='del'>-#define irqsafe_cpu_and_4(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, &amp;)</div><div class='del'>-#define irqsafe_cpu_and_8(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, &amp;)</div><div class='add'>+#define this_cpu_and_1(pcp, val) arch_this_cpu_to_op(pcp, val, &amp;)</div><div class='add'>+#define this_cpu_and_2(pcp, val) arch_this_cpu_to_op(pcp, val, &amp;)</div><div class='add'>+#define this_cpu_and_4(pcp, val) arch_this_cpu_to_op(pcp, val, &amp;)</div><div class='add'>+#define this_cpu_and_8(pcp, val) arch_this_cpu_to_op(pcp, val, &amp;)</div><div class='ctx'> </div><div class='del'>-#define irqsafe_cpu_or_1(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, |)</div><div class='del'>-#define irqsafe_cpu_or_2(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, |)</div><div class='del'>-#define irqsafe_cpu_or_4(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, |)</div><div class='del'>-#define irqsafe_cpu_or_8(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, |)</div><div class='add'>+#define this_cpu_or_1(pcp, val) arch_this_cpu_to_op(pcp, val, |)</div><div class='add'>+#define this_cpu_or_2(pcp, val) arch_this_cpu_to_op(pcp, val, |)</div><div class='add'>+#define this_cpu_or_4(pcp, val) arch_this_cpu_to_op(pcp, val, |)</div><div class='add'>+#define this_cpu_or_8(pcp, val) arch_this_cpu_to_op(pcp, val, |)</div><div class='ctx'> </div><div class='del'>-#define irqsafe_cpu_xor_1(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, ^)</div><div class='del'>-#define irqsafe_cpu_xor_2(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, ^)</div><div class='del'>-#define irqsafe_cpu_xor_4(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, ^)</div><div class='del'>-#define irqsafe_cpu_xor_8(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, ^)</div><div class='add'>+#define this_cpu_xor_1(pcp, val) arch_this_cpu_to_op(pcp, val, ^)</div><div class='add'>+#define this_cpu_xor_2(pcp, val) arch_this_cpu_to_op(pcp, val, ^)</div><div class='add'>+#define this_cpu_xor_4(pcp, val) arch_this_cpu_to_op(pcp, val, ^)</div><div class='add'>+#define this_cpu_xor_8(pcp, val) arch_this_cpu_to_op(pcp, val, ^)</div><div class='ctx'> </div><div class='del'>-#define arch_irqsafe_cpu_cmpxchg(pcp, oval, nval)			\</div><div class='add'>+#define arch_this_cpu_cmpxchg(pcp, oval, nval)			\</div><div class='ctx'> ({									\</div><div class='ctx'> 	typedef typeof(pcp) pcp_op_T__;					\</div><div class='ctx'> 	pcp_op_T__ ret__;						\</div><div class='hunk'>@@ -79,10 +79,10 @@ do {									\</div><div class='ctx'> 	ret__;								\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-#define irqsafe_cpu_cmpxchg_1(pcp, oval, nval) arch_irqsafe_cpu_cmpxchg(pcp, oval, nval)</div><div class='del'>-#define irqsafe_cpu_cmpxchg_2(pcp, oval, nval) arch_irqsafe_cpu_cmpxchg(pcp, oval, nval)</div><div class='del'>-#define irqsafe_cpu_cmpxchg_4(pcp, oval, nval) arch_irqsafe_cpu_cmpxchg(pcp, oval, nval)</div><div class='del'>-#define irqsafe_cpu_cmpxchg_8(pcp, oval, nval) arch_irqsafe_cpu_cmpxchg(pcp, oval, nval)</div><div class='add'>+#define this_cpu_cmpxchg_1(pcp, oval, nval) arch_this_cpu_cmpxchg(pcp, oval, nval)</div><div class='add'>+#define this_cpu_cmpxchg_2(pcp, oval, nval) arch_this_cpu_cmpxchg(pcp, oval, nval)</div><div class='add'>+#define this_cpu_cmpxchg_4(pcp, oval, nval) arch_this_cpu_cmpxchg(pcp, oval, nval)</div><div class='add'>+#define this_cpu_cmpxchg_8(pcp, oval, nval) arch_this_cpu_cmpxchg(pcp, oval, nval)</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/percpu.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h<br/>index 4f289ff0b7fe..011358c1b18e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/pgtable.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/pgtable.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/pgtable.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/pgtable.h</a></div><div class='hunk'>@@ -128,28 +128,11 @@ static inline int is_zero_pfn(unsigned long pfn)</div><div class='ctx'>  * effect, this also makes sure that 64 bit module code cannot be used</div><div class='ctx'>  * as system call address.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> extern unsigned long VMALLOC_START;</div><div class='add'>+extern unsigned long VMALLOC_END;</div><div class='add'>+extern struct page *vmemmap;</div><div class='ctx'> </div><div class='del'>-#ifndef __s390x__</div><div class='del'>-#define VMALLOC_SIZE	(96UL &lt;&lt; 20)</div><div class='del'>-#define VMALLOC_END	0x7e000000UL</div><div class='del'>-#define VMEM_MAP_END	0x80000000UL</div><div class='del'>-#else /* __s390x__ */</div><div class='del'>-#define VMALLOC_SIZE	(128UL &lt;&lt; 30)</div><div class='del'>-#define VMALLOC_END	0x3e000000000UL</div><div class='del'>-#define VMEM_MAP_END	0x40000000000UL</div><div class='del'>-#endif /* __s390x__ */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * VMEM_MAX_PHYS is the highest physical address that can be added to the 1:1</div><div class='del'>- * mapping. This needs to be calculated at compile time since the size of the</div><div class='del'>- * VMEM_MAP is static but the size of struct page can change.</div><div class='del'>- */</div><div class='del'>-#define VMEM_MAX_PAGES	((VMEM_MAP_END - VMALLOC_END) / sizeof(struct page))</div><div class='del'>-#define VMEM_MAX_PFN	min(VMALLOC_START &gt;&gt; PAGE_SHIFT, VMEM_MAX_PAGES)</div><div class='del'>-#define VMEM_MAX_PHYS	((VMEM_MAX_PFN &lt;&lt; PAGE_SHIFT) &amp; ~((16 &lt;&lt; 20) - 1))</div><div class='del'>-#define vmemmap		((struct page *) VMALLOC_END)</div><div class='add'>+#define VMEM_MAX_PHYS ((unsigned long) vmemmap)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * A 31 bit pagetable entry of S390 has following format:</div><div class='head'>diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h<br/>index 5f33d37d032c..d25843a6a915 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/processor.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/processor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/processor.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/processor.h</a></div><div class='hunk'>@@ -80,8 +80,6 @@ struct thread_struct {</div><div class='ctx'> 	unsigned int  acrs[NUM_ACRS];</div><div class='ctx'>         unsigned long ksp;              /* kernel stack pointer             */</div><div class='ctx'> 	mm_segment_t mm_segment;</div><div class='del'>-        unsigned long prot_addr;        /* address of protection-excep.     */</div><div class='del'>-        unsigned int trap_no;</div><div class='ctx'> 	unsigned long gmap_addr;	/* address of last gmap fault. */</div><div class='ctx'> 	struct per_regs per_user;	/* User specified PER registers */</div><div class='ctx'> 	struct per_event per_event;	/* Cause of the last PER trap */</div><div class='hunk'>@@ -238,7 +236,7 @@ static inline unsigned long __rewind_psw(psw_t psw, unsigned long ilc)</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 ATTRIB_NORET disabled_wait(unsigned long code)</div><div class='add'>+static inline void __noreturn disabled_wait(unsigned long code)</div><div class='ctx'> {</div><div class='ctx'>         unsigned long ctl_buf;</div><div class='ctx'>         psw_t dw_psw;</div><div class='head'>diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h<br/>index a65846340d51..aeb77f017985 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/ptrace.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/ptrace.h</a></div><div class='hunk'>@@ -324,7 +324,8 @@ struct pt_regs</div><div class='ctx'> 	psw_t psw;</div><div class='ctx'> 	unsigned long gprs[NUM_GPRS];</div><div class='ctx'> 	unsigned long orig_gpr2;</div><div class='del'>-	unsigned int svc_code;</div><div class='add'>+	unsigned int int_code;</div><div class='add'>+	unsigned long int_parm_long;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -540,9 +541,13 @@ struct user_regs_struct</div><div class='ctx'> #define user_mode(regs) (((regs)-&gt;psw.mask &amp; PSW_MASK_PSTATE) != 0)</div><div class='ctx'> #define instruction_pointer(regs) ((regs)-&gt;psw.addr &amp; PSW_ADDR_INSN)</div><div class='ctx'> #define user_stack_pointer(regs)((regs)-&gt;gprs[15])</div><div class='del'>-#define regs_return_value(regs)((regs)-&gt;gprs[2])</div><div class='ctx'> #define profile_pc(regs) instruction_pointer(regs)</div><div class='ctx'> </div><div class='add'>+static inline long regs_return_value(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return regs-&gt;gprs[2];</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int regs_query_register_offset(const char *name);</div><div class='ctx'> const char *regs_query_register_name(unsigned int offset);</div><div class='ctx'> unsigned long regs_get_register(struct pt_regs *regs, unsigned int offset);</div><div class='head'>diff --git a/arch/s390/include/asm/qdio.h b/arch/s390/include/asm/qdio.h<br/>index e63d13dd3bf5..d75c8e78f7e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/qdio.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/qdio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/qdio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/qdio.h</a></div><div class='hunk'>@@ -352,7 +352,7 @@ typedef void qdio_handler_t(struct ccw_device *, unsigned int, int,</div><div class='ctx'>  * @no_output_qs: number of output queues</div><div class='ctx'>  * @input_handler: handler to be called for input queues</div><div class='ctx'>  * @output_handler: handler to be called for output queues</div><div class='del'>- * @queue_start_poll: polling handlers (one per input queue or NULL)</div><div class='add'>+ * @queue_start_poll_array: polling handlers (one per input queue or NULL)</div><div class='ctx'>  * @int_parm: interruption parameter</div><div class='ctx'>  * @input_sbal_addr_array:  address of no_input_qs * 128 pointers</div><div class='ctx'>  * @output_sbal_addr_array: address of no_output_qs * 128 pointers</div><div class='hunk'>@@ -372,7 +372,8 @@ struct qdio_initialize {</div><div class='ctx'> 	unsigned int no_output_qs;</div><div class='ctx'> 	qdio_handler_t *input_handler;</div><div class='ctx'> 	qdio_handler_t *output_handler;</div><div class='del'>-	void (**queue_start_poll) (struct ccw_device *, int, unsigned long);</div><div class='add'>+	void (**queue_start_poll_array) (struct ccw_device *, int,</div><div class='add'>+					  unsigned long);</div><div class='ctx'> 	int scan_threshold;</div><div class='ctx'> 	unsigned long int_parm;</div><div class='ctx'> 	void **input_sbal_addr_array;</div><div class='head'>diff --git a/arch/s390/include/asm/sigp.h b/arch/s390/include/asm/sigp.h<br/>index e3bffd4e2d66..7040b8567cd0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/sigp.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/sigp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/sigp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/sigp.h</a></div><div class='hunk'>@@ -56,6 +56,7 @@ enum {</div><div class='ctx'> 	ec_schedule = 0,</div><div class='ctx'> 	ec_call_function,</div><div class='ctx'> 	ec_call_function_single,</div><div class='add'>+	ec_stop_cpu,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/s390/include/asm/smp.h b/arch/s390/include/asm/smp.h<br/>index ab47a69fdf07..c32e9123b40c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/smp.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/smp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/smp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/smp.h</a></div><div class='hunk'>@@ -23,7 +23,6 @@ extern void __cpu_die (unsigned int cpu);</div><div class='ctx'> extern int __cpu_up (unsigned int cpu);</div><div class='ctx'> </div><div class='ctx'> extern struct mutex smp_cpu_state_mutex;</div><div class='del'>-extern int smp_cpu_polarization[];</div><div class='ctx'> </div><div class='ctx'> extern void arch_send_call_function_single_ipi(int cpu);</div><div class='ctx'> extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);</div><div class='head'>diff --git a/arch/s390/include/asm/socket.h b/arch/s390/include/asm/socket.h<br/>index fdff1e995c73..67b5c1b14b51 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/socket.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/socket.h</a></div><div class='hunk'>@@ -70,4 +70,7 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_RXQ_OVFL             40</div><div class='ctx'> </div><div class='add'>+#define SO_WIFI_STATUS		41</div><div class='add'>+#define SCM_WIFI_STATUS		SO_WIFI_STATUS</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_SOCKET_H */</div><div class='head'>diff --git a/arch/s390/include/asm/sparsemem.h b/arch/s390/include/asm/sparsemem.h<br/>index 545d219e6a2d..0fb34027d3f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/sparsemem.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/sparsemem.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/sparsemem.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/sparsemem.h</a></div><div class='hunk'>@@ -4,8 +4,8 @@</div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='ctx'> </div><div class='ctx'> #define SECTION_SIZE_BITS	28</div><div class='del'>-#define MAX_PHYSADDR_BITS	42</div><div class='del'>-#define MAX_PHYSMEM_BITS	42</div><div class='add'>+#define MAX_PHYSADDR_BITS	46</div><div class='add'>+#define MAX_PHYSMEM_BITS	46</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/include/asm/syscall.h b/arch/s390/include/asm/syscall.h<br/>index b239ff53b189..fb214dd9b7e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/syscall.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/syscall.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/syscall.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/syscall.h</a></div><div class='hunk'>@@ -27,7 +27,7 @@ static inline long syscall_get_nr(struct task_struct *task,</div><div class='ctx'> 				  struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	return test_tsk_thread_flag(task, TIF_SYSCALL) ?</div><div class='del'>-		(regs-&gt;svc_code &amp; 0xffff) : -1;</div><div class='add'>+		(regs-&gt;int_code &amp; 0xffff) : -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void syscall_rollback(struct task_struct *task,</div><div class='head'>diff --git a/arch/s390/include/asm/system.h b/arch/s390/include/asm/system.h<br/>index ef573c1d71a7..d73cc6b60000 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/system.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/system.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/system.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/system.h</a></div><div class='hunk'>@@ -20,8 +20,6 @@</div><div class='ctx'> </div><div class='ctx'> struct task_struct;</div><div class='ctx'> </div><div class='del'>-extern int sysctl_userprocess_debug;</div><div class='del'>-</div><div class='ctx'> extern struct task_struct *__switch_to(void *, void *);</div><div class='ctx'> extern void update_per_regs(struct task_struct *task);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h<br/>index a23183423b14..a73038155e0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/thread_info.h</a></div><div class='hunk'>@@ -102,7 +102,6 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define TIF_MEMDIE		18	/* is terminating due to OOM killer */</div><div class='ctx'> #define TIF_RESTORE_SIGMASK	19	/* restore signal mask in do_signal() */</div><div class='ctx'> #define TIF_SINGLE_STEP		20	/* This task is single stepped */</div><div class='del'>-#define TIF_FREEZE		21	/* thread is freezing for suspend */</div><div class='ctx'> </div><div class='ctx'> #define _TIF_SYSCALL		(1&lt;&lt;TIF_SYSCALL)</div><div class='ctx'> #define _TIF_NOTIFY_RESUME	(1&lt;&lt;TIF_NOTIFY_RESUME)</div><div class='hunk'>@@ -119,7 +118,6 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define _TIF_POLLING_NRFLAG	(1&lt;&lt;TIF_POLLING_NRFLAG)</div><div class='ctx'> #define _TIF_31BIT		(1&lt;&lt;TIF_31BIT)</div><div class='ctx'> #define _TIF_SINGLE_STEP	(1&lt;&lt;TIF_SINGLE_STEP)</div><div class='del'>-#define _TIF_FREEZE		(1&lt;&lt;TIF_FREEZE)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='ctx'> #define is_32bit_task()		(test_thread_flag(TIF_31BIT))</div><div class='head'>diff --git a/arch/s390/include/asm/topology.h b/arch/s390/include/asm/topology.h<br/>index 005d77d8ae2a..0837de80c351 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/topology.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/topology.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/topology.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/topology.h</a></div><div class='hunk'>@@ -4,6 +4,10 @@</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;asm/sysinfo.h&gt;</div><div class='ctx'> </div><div class='add'>+struct cpu;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SCHED_BOOK</div><div class='add'>+</div><div class='ctx'> extern unsigned char cpu_core_id[NR_CPUS];</div><div class='ctx'> extern cpumask_t cpu_core_map[NR_CPUS];</div><div class='ctx'> </div><div class='hunk'>@@ -16,8 +20,6 @@ static inline const struct cpumask *cpu_coregroup_mask(int cpu)</div><div class='ctx'> #define topology_core_cpumask(cpu)	(&amp;cpu_core_map[cpu])</div><div class='ctx'> #define mc_capable()			(1)</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SCHED_BOOK</div><div class='del'>-</div><div class='ctx'> extern unsigned char cpu_book_id[NR_CPUS];</div><div class='ctx'> extern cpumask_t cpu_book_map[NR_CPUS];</div><div class='ctx'> </div><div class='hunk'>@@ -29,19 +31,45 @@ static inline const struct cpumask *cpu_book_mask(int cpu)</div><div class='ctx'> #define topology_book_id(cpu)		(cpu_book_id[cpu])</div><div class='ctx'> #define topology_book_cpumask(cpu)	(&amp;cpu_book_map[cpu])</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_SCHED_BOOK */</div><div class='del'>-</div><div class='add'>+int topology_cpu_init(struct cpu *);</div><div class='ctx'> int topology_set_cpu_management(int fc);</div><div class='ctx'> void topology_schedule_update(void);</div><div class='ctx'> void store_topology(struct sysinfo_15_1_x *info);</div><div class='add'>+void topology_expect_change(void);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_SCHED_BOOK */</div><div class='add'>+</div><div class='add'>+static inline void topology_schedule_update(void) { }</div><div class='add'>+static inline int topology_cpu_init(struct cpu *cpu) { return 0; }</div><div class='add'>+static inline void topology_expect_change(void) { }</div><div class='ctx'> </div><div class='del'>-#define POLARIZATION_UNKNWN	(-1)</div><div class='add'>+#endif /* CONFIG_SCHED_BOOK */</div><div class='add'>+</div><div class='add'>+#define POLARIZATION_UNKNOWN	(-1)</div><div class='ctx'> #define POLARIZATION_HRZ	(0)</div><div class='ctx'> #define POLARIZATION_VL		(1)</div><div class='ctx'> #define POLARIZATION_VM		(2)</div><div class='ctx'> #define POLARIZATION_VH		(3)</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='add'>+extern int cpu_polarization[];</div><div class='add'>+</div><div class='add'>+static inline void cpu_set_polarization(int cpu, int val)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SCHED_BOOK</div><div class='add'>+	cpu_polarization[cpu] = val;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int cpu_read_polarization(int cpu)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SCHED_BOOK</div><div class='add'>+	return cpu_polarization[cpu];</div><div class='add'>+#else</div><div class='add'>+	return POLARIZATION_HRZ;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SCHED_BOOK</div><div class='ctx'> void s390_init_cpu_topology(void);</div><div class='ctx'> #else</div><div class='ctx'> static inline void s390_init_cpu_topology(void)</div><div class='head'>diff --git a/arch/s390/include/asm/types.h b/arch/s390/include/asm/types.h<br/>index eeb52ccf499f..05ebbcdbbf6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/types.h</a></div><div class='hunk'>@@ -13,8 +13,6 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='del'>-typedef unsigned short umode_t;</div><div class='del'>-</div><div class='ctx'> /* A address type so that arithmetic can be done on it &amp; it can be upgraded to</div><div class='ctx'>    64 bit when necessary </div><div class='ctx'> */</div><div class='head'>diff --git a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h<br/>index 58de4c91c333..8a8008fe7b8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/include/asm/unistd.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/include/asm/unistd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/include/asm/unistd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/include/asm/unistd.h</a></div><div class='hunk'>@@ -398,6 +398,7 @@</div><div class='ctx'> #define __ARCH_WANT_SYS_SIGNAL</div><div class='ctx'> #define __ARCH_WANT_SYS_UTIME</div><div class='ctx'> #define __ARCH_WANT_SYS_SOCKETCALL</div><div class='add'>+#define __ARCH_WANT_SYS_IPC</div><div class='ctx'> #define __ARCH_WANT_SYS_FADVISE64</div><div class='ctx'> #define __ARCH_WANT_SYS_GETPGRP</div><div class='ctx'> #define __ARCH_WANT_SYS_LLSEEK</div><div class='head'>diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile<br/>index dd4f07640919..7d9ec924e7e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/Makefile</a></div><div class='hunk'>@@ -32,7 +32,8 @@ extra-y				+= head.o init_task.o vmlinux.lds</div><div class='ctx'> extra-y				+= $(if $(CONFIG_64BIT),head64.o,head31.o)</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MODULES)		+= s390_ksyms.o module.o</div><div class='del'>-obj-$(CONFIG_SMP)		+= smp.o topology.o</div><div class='add'>+obj-$(CONFIG_SMP)		+= smp.o</div><div class='add'>+obj-$(CONFIG_SCHED_BOOK)	+= topology.o</div><div class='ctx'> obj-$(CONFIG_SMP)		+= $(if $(CONFIG_64BIT),switch_cpu64.o, \</div><div class='ctx'> 							switch_cpu.o)</div><div class='ctx'> obj-$(CONFIG_HIBERNATION)	+= suspend.o swsusp_asm64.o</div><div class='head'>diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c<br/>index 751318765e2e..6e6a72e66d60 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/asm-offsets.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/asm-offsets.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -45,7 +45,8 @@ int main(void)</div><div class='ctx'> 	DEFINE(__PT_PSW, offsetof(struct pt_regs, psw));</div><div class='ctx'> 	DEFINE(__PT_GPRS, offsetof(struct pt_regs, gprs));</div><div class='ctx'> 	DEFINE(__PT_ORIG_GPR2, offsetof(struct pt_regs, orig_gpr2));</div><div class='del'>-	DEFINE(__PT_SVC_CODE, offsetof(struct pt_regs, svc_code));</div><div class='add'>+	DEFINE(__PT_INT_CODE, offsetof(struct pt_regs, int_code));</div><div class='add'>+	DEFINE(__PT_INT_PARM_LONG, offsetof(struct pt_regs, int_parm_long));</div><div class='ctx'> 	DEFINE(__PT_SIZE, sizeof(struct pt_regs));</div><div class='ctx'> 	BLANK();</div><div class='ctx'> 	DEFINE(__SF_BACKCHAIN, offsetof(struct stack_frame, back_chain));</div><div class='hunk'>@@ -108,7 +109,9 @@ int main(void)</div><div class='ctx'> 	DEFINE(__LC_PGM_NEW_PSW, offsetof(struct _lowcore, program_new_psw));</div><div class='ctx'> 	DEFINE(__LC_MCK_NEW_PSW, offsetof(struct _lowcore, mcck_new_psw));</div><div class='ctx'> 	DEFINE(__LC_IO_NEW_PSW, offsetof(struct _lowcore, io_new_psw));</div><div class='del'>-	DEFINE(__LC_SAVE_AREA, offsetof(struct _lowcore, save_area));</div><div class='add'>+	DEFINE(__LC_SAVE_AREA_SYNC, offsetof(struct _lowcore, save_area_sync));</div><div class='add'>+	DEFINE(__LC_SAVE_AREA_ASYNC, offsetof(struct _lowcore, save_area_async));</div><div class='add'>+	DEFINE(__LC_SAVE_AREA_RESTART, offsetof(struct _lowcore, save_area_restart));</div><div class='ctx'> 	DEFINE(__LC_RETURN_PSW, offsetof(struct _lowcore, return_psw));</div><div class='ctx'> 	DEFINE(__LC_RETURN_MCCK_PSW, offsetof(struct _lowcore, return_mcck_psw));</div><div class='ctx'> 	DEFINE(__LC_SYNC_ENTER_TIMER, offsetof(struct _lowcore, sync_enter_timer));</div><div class='hunk'>@@ -150,7 +153,6 @@ int main(void)</div><div class='ctx'> 	DEFINE(__LC_LAST_BREAK, offsetof(struct _lowcore, breaking_event_addr));</div><div class='ctx'> 	DEFINE(__LC_VDSO_PER_CPU, offsetof(struct _lowcore, vdso_per_cpu_data));</div><div class='ctx'> 	DEFINE(__LC_GMAP, offsetof(struct _lowcore, gmap));</div><div class='del'>-	DEFINE(__LC_CMF_HPP, offsetof(struct _lowcore, cmf_hpp));</div><div class='ctx'> 	DEFINE(__GMAP_ASCE, offsetof(struct gmap, asce));</div><div class='ctx'> #endif /* CONFIG_32BIT */</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/s390/kernel/base.S b/arch/s390/kernel/base.S<br/>index f8828d38fa6e..3aa4d00aaf50 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/base.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/base.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/base.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/base.S</a></div><div class='hunk'>@@ -33,7 +33,7 @@ s390_base_mcck_handler_fn:</div><div class='ctx'> 	.previous</div><div class='ctx'> </div><div class='ctx'> ENTRY(s390_base_ext_handler)</div><div class='del'>-	stmg	%r0,%r15,__LC_SAVE_AREA</div><div class='add'>+	stmg	%r0,%r15,__LC_SAVE_AREA_ASYNC</div><div class='ctx'> 	basr	%r13,0</div><div class='ctx'> 0:	aghi	%r15,-STACK_FRAME_OVERHEAD</div><div class='ctx'> 	larl	%r1,s390_base_ext_handler_fn</div><div class='hunk'>@@ -41,7 +41,7 @@ ENTRY(s390_base_ext_handler)</div><div class='ctx'> 	ltgr	%r1,%r1</div><div class='ctx'> 	jz	1f</div><div class='ctx'> 	basr	%r14,%r1</div><div class='del'>-1:	lmg	%r0,%r15,__LC_SAVE_AREA</div><div class='add'>+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='ctx'> </div><div class='hunk'>@@ -53,7 +53,7 @@ s390_base_ext_handler_fn:</div><div class='ctx'> 	.previous</div><div class='ctx'> </div><div class='ctx'> ENTRY(s390_base_pgm_handler)</div><div class='del'>-	stmg	%r0,%r15,__LC_SAVE_AREA</div><div class='add'>+	stmg	%r0,%r15,__LC_SAVE_AREA_SYNC</div><div class='ctx'> 	basr	%r13,0</div><div class='ctx'> 0:	aghi	%r15,-STACK_FRAME_OVERHEAD</div><div class='ctx'> 	larl	%r1,s390_base_pgm_handler_fn</div><div class='hunk'>@@ -61,7 +61,7 @@ ENTRY(s390_base_pgm_handler)</div><div class='ctx'> 	ltgr	%r1,%r1</div><div class='ctx'> 	jz	1f</div><div class='ctx'> 	basr	%r14,%r1</div><div class='del'>-	lmg	%r0,%r15,__LC_SAVE_AREA</div><div class='add'>+	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='ctx'> </div><div class='hunk'>@@ -142,7 +142,7 @@ s390_base_mcck_handler_fn:</div><div class='ctx'> 	.previous</div><div class='ctx'> </div><div class='ctx'> ENTRY(s390_base_ext_handler)</div><div class='del'>-	stm	%r0,%r15,__LC_SAVE_AREA</div><div class='add'>+	stm	%r0,%r15,__LC_SAVE_AREA_ASYNC</div><div class='ctx'> 	basr	%r13,0</div><div class='ctx'> 0:	ahi	%r15,-STACK_FRAME_OVERHEAD</div><div class='ctx'> 	l	%r1,2f-0b(%r13)</div><div class='hunk'>@@ -150,7 +150,7 @@ ENTRY(s390_base_ext_handler)</div><div class='ctx'> 	ltr	%r1,%r1</div><div class='ctx'> 	jz	1f</div><div class='ctx'> 	basr	%r14,%r1</div><div class='del'>-1:	lm	%r0,%r15,__LC_SAVE_AREA</div><div class='add'>+1:	lm	%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'> 	lpsw	__LC_EXT_OLD_PSW</div><div class='ctx'> </div><div class='hunk'>@@ -164,7 +164,7 @@ s390_base_ext_handler_fn:</div><div class='ctx'> 	.previous</div><div class='ctx'> </div><div class='ctx'> ENTRY(s390_base_pgm_handler)</div><div class='del'>-	stm	%r0,%r15,__LC_SAVE_AREA</div><div class='add'>+	stm	%r0,%r15,__LC_SAVE_AREA_SYNC</div><div class='ctx'> 	basr	%r13,0</div><div class='ctx'> 0:	ahi	%r15,-STACK_FRAME_OVERHEAD</div><div class='ctx'> 	l	%r1,2f-0b(%r13)</div><div class='hunk'>@@ -172,7 +172,7 @@ ENTRY(s390_base_pgm_handler)</div><div class='ctx'> 	ltr	%r1,%r1</div><div class='ctx'> 	jz	1f</div><div class='ctx'> 	basr	%r14,%r1</div><div class='del'>-	lm	%r0,%r15,__LC_SAVE_AREA</div><div class='add'>+	lm	%r0,%r15,__LC_SAVE_AREA_SYNC</div><div class='ctx'> 	lpsw	__LC_PGM_OLD_PSW</div><div class='ctx'> </div><div class='ctx'> 1:	lpsw	disabled_wait_psw-0b(%r13)</div><div class='head'>diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c<br/>index 84a982898448..ab64bdbab2ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/compat_linux.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/compat_linux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/compat_linux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/compat_linux.c</a></div><div class='hunk'>@@ -278,9 +278,6 @@ asmlinkage long sys32_ipc(u32 call, int first, int second, int third, u32 ptr)</div><div class='ctx'> {</div><div class='ctx'> 	if (call &gt;&gt; 16)		/* hack for backward compatibility */</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	call &amp;= 0xffff;</div><div class='del'>-</div><div class='ctx'> 	switch (call) {</div><div class='ctx'> 	case SEMTIMEDOP:</div><div class='ctx'> 		return compat_sys_semtimedop(first, compat_ptr(ptr),</div><div class='head'>diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c<br/>index 4f68c81d3ffa..6fe78c2f95d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/compat_signal.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/compat_signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/compat_signal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/compat_signal.c</a></div><div class='hunk'>@@ -501,8 +501,12 @@ static int setup_frame32(int sig, struct k_sigaction *ka,</div><div class='ctx'> </div><div class='ctx'> 	/* We forgot to include these in the sigcontext.</div><div class='ctx'> 	   To avoid breaking binary compatibility, they are passed as args. */</div><div class='del'>-	regs-&gt;gprs[4] = current-&gt;thread.trap_no;</div><div class='del'>-	regs-&gt;gprs[5] = current-&gt;thread.prot_addr;</div><div class='add'>+	if (sig == SIGSEGV || sig == SIGBUS || sig == SIGILL ||</div><div class='add'>+	    sig == SIGTRAP || sig == SIGFPE) {</div><div class='add'>+		/* set extra registers only for synchronous signals */</div><div class='add'>+		regs-&gt;gprs[4] = regs-&gt;int_code &amp; 127;</div><div class='add'>+		regs-&gt;gprs[5] = regs-&gt;int_parm_long;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Place signal number on stack to allow backtrace from handler.  */</div><div class='ctx'> 	if (__put_user(regs-&gt;gprs[2], (int __force __user *) &amp;frame-&gt;signo))</div><div class='hunk'>@@ -544,9 +548,9 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 	/* Set up to return from userspace.  If provided, use a stub</div><div class='ctx'> 	   already in userspace.  */</div><div class='ctx'> 	if (ka-&gt;sa.sa_flags &amp; SA_RESTORER) {</div><div class='del'>-		regs-&gt;gprs[14] = (__u64) ka-&gt;sa.sa_restorer;</div><div class='add'>+		regs-&gt;gprs[14] = (__u64) ka-&gt;sa.sa_restorer | PSW32_ADDR_AMODE;</div><div class='ctx'> 	} else {</div><div class='del'>-		regs-&gt;gprs[14] = (__u64) frame-&gt;retcode;</div><div class='add'>+		regs-&gt;gprs[14] = (__u64) frame-&gt;retcode | PSW32_ADDR_AMODE;</div><div class='ctx'> 		err |= __put_user(S390_SYSCALL_OPCODE | __NR_rt_sigreturn,</div><div class='ctx'> 				  (u16 __force __user *)(frame-&gt;retcode));</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c<br/>index 5ad6bc078bfd..6848828b962e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/debug.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/debug.c</a></div><div class='hunk'>@@ -74,7 +74,7 @@ static ssize_t debug_input(struct file *file, const char __user *user_buf,</div><div class='ctx'> static int debug_open(struct inode *inode, struct file *file);</div><div class='ctx'> static int debug_close(struct inode *inode, struct file *file);</div><div class='ctx'> static debug_info_t *debug_info_create(const char *name, int pages_per_area,</div><div class='del'>-			int nr_areas, int buf_size, mode_t mode);</div><div class='add'>+			int nr_areas, int buf_size, umode_t mode);</div><div class='ctx'> static void debug_info_get(debug_info_t *);</div><div class='ctx'> static void debug_info_put(debug_info_t *);</div><div class='ctx'> static int debug_prolog_level_fn(debug_info_t * id,</div><div class='hunk'>@@ -330,7 +330,7 @@ debug_info_free(debug_info_t* db_info){</div><div class='ctx'> </div><div class='ctx'> static debug_info_t*</div><div class='ctx'> debug_info_create(const char *name, int pages_per_area, int nr_areas,</div><div class='del'>-		  int buf_size, mode_t mode)</div><div class='add'>+		  int buf_size, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	debug_info_t* rc;</div><div class='ctx'> </div><div class='hunk'>@@ -688,7 +688,7 @@ debug_close(struct inode *inode, struct file *file)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> debug_info_t *debug_register_mode(const char *name, int pages_per_area,</div><div class='del'>-				  int nr_areas, int buf_size, mode_t mode,</div><div class='add'>+				  int nr_areas, int buf_size, umode_t mode,</div><div class='ctx'> 				  uid_t uid, gid_t gid)</div><div class='ctx'> {</div><div class='ctx'> 	debug_info_t *rc = NULL;</div><div class='hunk'>@@ -1090,7 +1090,7 @@ debug_register_view(debug_info_t * id, struct debug_view *view)</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	mode_t mode;</div><div class='add'>+	umode_t mode;</div><div class='ctx'> 	struct dentry *pde;</div><div class='ctx'> </div><div class='ctx'> 	if (!id)</div><div class='head'>diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c<br/>index 45df6d456aa1..e2f847599c8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/dis.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/dis.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/dis.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/dis.c</a></div><div class='hunk'>@@ -1578,10 +1578,15 @@ void show_code(struct pt_regs *regs)</div><div class='ctx'> 	ptr += sprintf(ptr, "%s Code:", mode);</div><div class='ctx'> 	hops = 0;</div><div class='ctx'> 	while (start &lt; end &amp;&amp; hops &lt; 8) {</div><div class='del'>-		*ptr++ = (start == 32) ? '&gt;' : ' ';</div><div class='add'>+		opsize = insn_length(code[start]);</div><div class='add'>+		if  (start + opsize == 32)</div><div class='add'>+			*ptr++ = '#';</div><div class='add'>+		else if (start == 32)</div><div class='add'>+			*ptr++ = '&gt;';</div><div class='add'>+		else</div><div class='add'>+			*ptr++ = ' ';</div><div class='ctx'> 		addr = regs-&gt;psw.addr + start - 32;</div><div class='ctx'> 		ptr += sprintf(ptr, ONELONG, addr);</div><div class='del'>-		opsize = insn_length(code[start]);</div><div class='ctx'> 		if (start + opsize &gt;= end)</div><div class='ctx'> 			break;</div><div class='ctx'> 		for (i = 0; i &lt; opsize; i++)</div><div class='head'>diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c<br/>index c9ffe0025197..52098d6dfaa7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/early.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/early.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/early.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/early.c</a></div><div class='hunk'>@@ -434,18 +434,22 @@ static void __init append_to_cmdline(size_t (*ipl_data)(char *, size_t))</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init setup_boot_command_line(void)</div><div class='add'>+static inline int has_ebcdic_char(const char *str)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	/* convert arch command line to ascii */</div><div class='del'>-	for (i = 0; i &lt; ARCH_COMMAND_LINE_SIZE; i++)</div><div class='del'>-		if (COMMAND_LINE[i] &amp; 0x80)</div><div class='del'>-			break;</div><div class='del'>-	if (i &lt; ARCH_COMMAND_LINE_SIZE)</div><div class='del'>-		EBCASC(COMMAND_LINE, ARCH_COMMAND_LINE_SIZE);</div><div class='del'>-	COMMAND_LINE[ARCH_COMMAND_LINE_SIZE-1] = 0;</div><div class='add'>+	for (i = 0; str[i]; i++)</div><div class='add'>+		if (str[i] &amp; 0x80)</div><div class='add'>+			return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static void __init setup_boot_command_line(void)</div><div class='add'>+{</div><div class='add'>+	COMMAND_LINE[ARCH_COMMAND_LINE_SIZE - 1] = 0;</div><div class='add'>+	/* convert arch command line to ascii if necessary */</div><div class='add'>+	if (has_ebcdic_char(COMMAND_LINE))</div><div class='add'>+		EBCASC(COMMAND_LINE, ARCH_COMMAND_LINE_SIZE);</div><div class='ctx'> 	/* copy arch command line */</div><div class='ctx'> 	strlcpy(boot_command_line, strstrip(COMMAND_LINE),</div><div class='ctx'> 		ARCH_COMMAND_LINE_SIZE);</div><div class='head'>diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S<br/>index b13157057e02..3705700ed374 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/entry.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/entry.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/entry.S</a></div><div class='hunk'>@@ -19,32 +19,22 @@</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Stack layout for the system_call stack entry.</div><div class='del'>- * The first few entries are identical to the user_regs_struct.</div><div class='del'>- */</div><div class='del'>-SP_PTREGS    =	STACK_FRAME_OVERHEAD</div><div class='del'>-SP_ARGS      =	STACK_FRAME_OVERHEAD + __PT_ARGS</div><div class='del'>-SP_PSW	     =	STACK_FRAME_OVERHEAD + __PT_PSW</div><div class='del'>-SP_R0	     =	STACK_FRAME_OVERHEAD + __PT_GPRS</div><div class='del'>-SP_R1	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 4</div><div class='del'>-SP_R2	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 8</div><div class='del'>-SP_R3	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 12</div><div class='del'>-SP_R4	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 16</div><div class='del'>-SP_R5	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 20</div><div class='del'>-SP_R6	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 24</div><div class='del'>-SP_R7	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 28</div><div class='del'>-SP_R8	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 32</div><div class='del'>-SP_R9	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 36</div><div class='del'>-SP_R10	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 40</div><div class='del'>-SP_R11	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 44</div><div class='del'>-SP_R12	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 48</div><div class='del'>-SP_R13	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 52</div><div class='del'>-SP_R14	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 56</div><div class='del'>-SP_R15	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 60</div><div class='del'>-SP_ORIG_R2   =	STACK_FRAME_OVERHEAD + __PT_ORIG_GPR2</div><div class='del'>-SP_SVC_CODE  =	STACK_FRAME_OVERHEAD + __PT_SVC_CODE</div><div class='del'>-SP_SIZE      =	STACK_FRAME_OVERHEAD + __PT_SIZE</div><div class='add'>+__PT_R0      =	__PT_GPRS</div><div class='add'>+__PT_R1      =	__PT_GPRS + 4</div><div class='add'>+__PT_R2      =	__PT_GPRS + 8</div><div class='add'>+__PT_R3      =	__PT_GPRS + 12</div><div class='add'>+__PT_R4      =	__PT_GPRS + 16</div><div class='add'>+__PT_R5      =	__PT_GPRS + 20</div><div class='add'>+__PT_R6      =	__PT_GPRS + 24</div><div class='add'>+__PT_R7      =	__PT_GPRS + 28</div><div class='add'>+__PT_R8      =	__PT_GPRS + 32</div><div class='add'>+__PT_R9      =	__PT_GPRS + 36</div><div class='add'>+__PT_R10     =	__PT_GPRS + 40</div><div class='add'>+__PT_R11     =	__PT_GPRS + 44</div><div class='add'>+__PT_R12     =	__PT_GPRS + 48</div><div class='add'>+__PT_R13     =	__PT_GPRS + 524</div><div class='add'>+__PT_R14     =	__PT_GPRS + 56</div><div class='add'>+__PT_R15     =	__PT_GPRS + 60</div><div class='ctx'> </div><div class='ctx'> _TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \</div><div class='ctx'> 		 _TIF_MCCK_PENDING | _TIF_PER_TRAP )</div><div class='hunk'>@@ -58,133 +48,91 @@ STACK_SIZE  = 1 &lt;&lt; STACK_SHIFT</div><div class='ctx'> </div><div class='ctx'> #define BASED(name) name-system_call(%r13)</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='ctx'> 	.macro	TRACE_IRQS_ON</div><div class='add'>+#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='ctx'> 	basr	%r2,%r0</div><div class='del'>-	l	%r1,BASED(.Ltrace_irq_on_caller)</div><div class='del'>-	basr	%r14,%r1</div><div class='add'>+	l	%r1,BASED(.Lhardirqs_on)</div><div class='add'>+	basr	%r14,%r1		# call trace_hardirqs_on_caller</div><div class='add'>+#endif</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro	TRACE_IRQS_OFF</div><div class='add'>+#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='ctx'> 	basr	%r2,%r0</div><div class='del'>-	l	%r1,BASED(.Ltrace_irq_off_caller)</div><div class='del'>-	basr	%r14,%r1</div><div class='del'>-	.endm</div><div class='del'>-#else</div><div class='del'>-#define TRACE_IRQS_ON</div><div class='del'>-#define TRACE_IRQS_OFF</div><div class='add'>+	l	%r1,BASED(.Lhardirqs_off)</div><div class='add'>+	basr	%r14,%r1		# call trace_hardirqs_off_caller</div><div class='ctx'> #endif</div><div class='add'>+	.endm</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_LOCKDEP</div><div class='ctx'> 	.macro	LOCKDEP_SYS_EXIT</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# returning to user ?</div><div class='del'>-	jz	0f</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+	tm	__PT_PSW+1(%r11),0x01	# returning to user ?</div><div class='add'>+	jz	.+10</div><div class='ctx'> 	l	%r1,BASED(.Llockdep_sys_exit)</div><div class='del'>-	basr	%r14,%r1</div><div class='del'>-0:</div><div class='del'>-	.endm</div><div class='del'>-#else</div><div class='del'>-#define LOCKDEP_SYS_EXIT</div><div class='add'>+	basr	%r14,%r1		# call lockdep_sys_exit</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Register usage in interrupt handlers:</div><div class='del'>- *    R9  - pointer to current task structure</div><div class='del'>- *    R13 - pointer to literal pool</div><div class='del'>- *    R14 - return register for function calls</div><div class='del'>- *    R15 - kernel stack pointer</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-	.macro	UPDATE_VTIME lc_from,lc_to,lc_sum</div><div class='del'>-	lm	%r10,%r11,\lc_from</div><div class='del'>-	sl	%r10,\lc_to</div><div class='del'>-	sl	%r11,\lc_to+4</div><div class='del'>-	bc	3,BASED(0f)</div><div class='del'>-	sl	%r10,BASED(.Lc_1)</div><div class='del'>-0:	al	%r10,\lc_sum</div><div class='del'>-	al	%r11,\lc_sum+4</div><div class='del'>-	bc	12,BASED(1f)</div><div class='del'>-	al	%r10,BASED(.Lc_1)</div><div class='del'>-1:	stm	%r10,%r11,\lc_sum</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro	SAVE_ALL_SVC psworg,savearea</div><div class='del'>-	stm	%r12,%r15,\savearea</div><div class='del'>-	l	%r13,__LC_SVC_NEW_PSW+4	# load &amp;system_call to %r13</div><div class='del'>-	l	%r15,__LC_KERNEL_STACK	# problem state -&gt; load ksp</div><div class='del'>-	s	%r15,BASED(.Lc_spsize)	# make room for registers &amp; psw</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro	SAVE_ALL_BASE savearea</div><div class='del'>-	stm	%r12,%r15,\savearea</div><div class='del'>-	l	%r13,__LC_SVC_NEW_PSW+4	# load &amp;system_call to %r13</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro	SAVE_ALL_PGM psworg,savearea</div><div class='del'>-	tm	\psworg+1,0x01		# test problem state bit</div><div class='add'>+	.macro	CHECK_STACK stacksize,savearea</div><div class='ctx'> #ifdef CONFIG_CHECK_STACK</div><div class='del'>-	bnz	BASED(1f)</div><div class='del'>-	tml	%r15,STACK_SIZE - CONFIG_STACK_GUARD</div><div class='del'>-	bnz	BASED(2f)</div><div class='del'>-	la	%r12,\psworg</div><div class='del'>-	b	BASED(stack_overflow)</div><div class='del'>-#else</div><div class='del'>-	bz	BASED(2f)</div><div class='add'>+	tml	%r15,\stacksize - CONFIG_STACK_GUARD</div><div class='add'>+	la	%r14,\savearea</div><div class='add'>+	jz	stack_overflow</div><div class='ctx'> #endif</div><div class='del'>-1:	l	%r15,__LC_KERNEL_STACK	# problem state -&gt; load ksp</div><div class='del'>-2:	s	%r15,BASED(.Lc_spsize)	# make room for registers &amp; psw</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro	SAVE_ALL_ASYNC psworg,savearea</div><div class='del'>-	stm	%r12,%r15,\savearea</div><div class='del'>-	l	%r13,__LC_SVC_NEW_PSW+4	# load &amp;system_call to %r13</div><div class='del'>-	la	%r12,\psworg</div><div class='del'>-	tm	\psworg+1,0x01		# test problem state bit</div><div class='del'>-	bnz	BASED(1f)		# from user -&gt; load async stack</div><div class='del'>-	clc	\psworg+4(4),BASED(.Lcritical_end)</div><div class='del'>-	bhe	BASED(0f)</div><div class='del'>-	clc	\psworg+4(4),BASED(.Lcritical_start)</div><div class='del'>-	bl	BASED(0f)</div><div class='del'>-	l	%r14,BASED(.Lcleanup_critical)</div><div class='del'>-	basr	%r14,%r14</div><div class='del'>-	tm	1(%r12),0x01		# retest problem state after cleanup</div><div class='del'>-	bnz	BASED(1f)</div><div class='del'>-0:	l	%r14,__LC_ASYNC_STACK	# are we already on the async stack ?</div><div class='add'>+	.macro	SWITCH_ASYNC savearea,stack,shift</div><div class='add'>+	tmh	%r8,0x0001		# interrupting from user ?</div><div class='add'>+	jnz	1f</div><div class='add'>+	lr	%r14,%r9</div><div class='add'>+	sl	%r14,BASED(.Lcritical_start)</div><div class='add'>+	cl	%r14,BASED(.Lcritical_length)</div><div class='add'>+	jhe	0f</div><div class='add'>+	la	%r11,\savearea		# inside critical section, do cleanup</div><div class='add'>+	bras	%r14,cleanup_critical</div><div class='add'>+	tmh	%r8,0x0001		# retest problem state after cleanup</div><div class='add'>+	jnz	1f</div><div class='add'>+0:	l	%r14,\stack		# are we already on the target stack?</div><div class='ctx'> 	slr	%r14,%r15</div><div class='del'>-	sra	%r14,STACK_SHIFT</div><div class='del'>-#ifdef CONFIG_CHECK_STACK</div><div class='del'>-	bnz	BASED(1f)</div><div class='del'>-	tml	%r15,STACK_SIZE - CONFIG_STACK_GUARD</div><div class='del'>-	bnz	BASED(2f)</div><div class='del'>-	b	BASED(stack_overflow)</div><div class='del'>-#else</div><div class='del'>-	bz	BASED(2f)</div><div class='del'>-#endif</div><div class='del'>-1:	l	%r15,__LC_ASYNC_STACK</div><div class='del'>-2:	s	%r15,BASED(.Lc_spsize)	# make room for registers &amp; psw</div><div class='add'>+	sra	%r14,\shift</div><div class='add'>+	jnz	1f</div><div class='add'>+	CHECK_STACK 1&lt;&lt;\shift,\savearea</div><div class='add'>+	j	2f</div><div class='add'>+1:	l	%r15,\stack		# load target stack</div><div class='add'>+2:	ahi	%r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='add'>+	la	%r11,STACK_FRAME_OVERHEAD(%r15)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro	CREATE_STACK_FRAME savearea</div><div class='del'>-	xc	__SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)</div><div class='del'>-	st	%r2,SP_ORIG_R2(%r15)	# store original content of gpr 2</div><div class='del'>-	mvc	SP_R12(16,%r15),\savearea # move %r12-%r15 to stack</div><div class='del'>-	stm	%r0,%r11,SP_R0(%r15)	# store gprs %r0-%r11 to kernel stack</div><div class='add'>+	.macro	ADD64 high,low,timer</div><div class='add'>+	al	\high,\timer</div><div class='add'>+	al	\low,\timer+4</div><div class='add'>+	brc	12,.+8</div><div class='add'>+	ahi	\high,1</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro	RESTORE_ALL psworg,sync</div><div class='del'>-	mvc	\psworg(8),SP_PSW(%r15) # move user PSW to lowcore</div><div class='del'>-	.if !\sync</div><div class='del'>-	ni	\psworg+1,0xfd		# clear wait state bit</div><div class='del'>-	.endif</div><div class='del'>-	lm	%r0,%r15,SP_R0(%r15)	# load gprs 0-15 of user</div><div class='del'>-	stpt	__LC_EXIT_TIMER</div><div class='del'>-	lpsw	\psworg			# back to caller</div><div class='add'>+	.macro	SUB64 high,low,timer</div><div class='add'>+	sl	\high,\timer</div><div class='add'>+	sl	\low,\timer+4</div><div class='add'>+	brc	3,.+8</div><div class='add'>+	ahi	\high,-1</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro	UPDATE_VTIME high,low,enter_timer</div><div class='add'>+	lm	\high,\low,__LC_EXIT_TIMER</div><div class='add'>+	SUB64	\high,\low,\enter_timer</div><div class='add'>+	ADD64	\high,\low,__LC_USER_TIMER</div><div class='add'>+	stm	\high,\low,__LC_USER_TIMER</div><div class='add'>+	lm	\high,\low,__LC_LAST_UPDATE_TIMER</div><div class='add'>+	SUB64	\high,\low,__LC_EXIT_TIMER</div><div class='add'>+	ADD64	\high,\low,__LC_SYSTEM_TIMER</div><div class='add'>+	stm	\high,\low,__LC_SYSTEM_TIMER</div><div class='add'>+	mvc	__LC_LAST_UPDATE_TIMER(8),\enter_timer</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro REENABLE_IRQS</div><div class='del'>-	mvc	__SF_EMPTY(1,%r15),SP_PSW(%r15)</div><div class='del'>-	ni	__SF_EMPTY(%r15),0xbf</div><div class='del'>-	ssm	__SF_EMPTY(%r15)</div><div class='add'>+	st	%r8,__LC_RETURN_PSW</div><div class='add'>+	ni	__LC_RETURN_PSW,0xbf</div><div class='add'>+	ssm	__LC_RETURN_PSW</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.section .kprobes.text, "ax"</div><div class='hunk'>@@ -197,14 +145,13 @@ STACK_SIZE  = 1 &lt;&lt; STACK_SHIFT</div><div class='ctx'>  *  gpr2 = prev</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(__switch_to)</div><div class='del'>-	basr	%r1,0</div><div class='del'>-0:	l	%r4,__THREAD_info(%r2)		# get thread_info of prev</div><div class='add'>+	l	%r4,__THREAD_info(%r2)		# get thread_info of prev</div><div class='ctx'> 	l	%r5,__THREAD_info(%r3)		# get thread_info of next</div><div class='ctx'> 	tm	__TI_flags+3(%r4),_TIF_MCCK_PENDING # machine check pending?</div><div class='del'>-	bz	1f-0b(%r1)</div><div class='add'>+	jz	0f</div><div class='ctx'> 	ni	__TI_flags+3(%r4),255-_TIF_MCCK_PENDING	# clear flag in prev</div><div class='ctx'> 	oi	__TI_flags+3(%r5),_TIF_MCCK_PENDING	# set it in next</div><div class='del'>-1:	stm	%r6,%r15,__SF_GPRS(%r15)	# store gprs of prev task</div><div class='add'>+0:	stm	%r6,%r15,__SF_GPRS(%r15)	# store gprs of prev task</div><div class='ctx'> 	st	%r15,__THREAD_ksp(%r2)		# store kernel stack of prev</div><div class='ctx'> 	l	%r15,__THREAD_ksp(%r3)		# load kernel stack of next</div><div class='ctx'> 	lctl	%c4,%c4,__TASK_pid(%r3)		# load pid to control reg. 4</div><div class='hunk'>@@ -224,48 +171,55 @@ __critical_start:</div><div class='ctx'> </div><div class='ctx'> ENTRY(system_call)</div><div class='ctx'> 	stpt	__LC_SYNC_ENTER_TIMER</div><div class='del'>-sysc_saveall:</div><div class='del'>-	SAVE_ALL_SVC __LC_SVC_OLD_PSW,__LC_SAVE_AREA</div><div class='del'>-	CREATE_STACK_FRAME __LC_SAVE_AREA</div><div class='del'>-	l	%r12,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='del'>-	mvc	SP_PSW(8,%r15),__LC_SVC_OLD_PSW</div><div class='del'>-	mvc	SP_SVC_CODE(4,%r15),__LC_SVC_ILC</div><div class='del'>-	oi	__TI_flags+3(%r12),_TIF_SYSCALL</div><div class='add'>+sysc_stm:</div><div class='add'>+	stm	%r8,%r15,__LC_SAVE_AREA_SYNC</div><div class='add'>+	l	%r12,__LC_THREAD_INFO</div><div class='add'>+	l	%r13,__LC_SVC_NEW_PSW+4</div><div class='add'>+sysc_per:</div><div class='add'>+	l	%r15,__LC_KERNEL_STACK</div><div class='add'>+	ahi	%r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='add'>+	la	%r11,STACK_FRAME_OVERHEAD(%r15)	# pointer to pt_regs</div><div class='ctx'> sysc_vtime:</div><div class='del'>-	UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER</div><div class='del'>-sysc_stime:</div><div class='del'>-	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER</div><div class='del'>-sysc_update:</div><div class='del'>-	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER</div><div class='add'>+	UPDATE_VTIME %r8,%r9,__LC_SYNC_ENTER_TIMER</div><div class='add'>+	stm	%r0,%r7,__PT_R0(%r11)</div><div class='add'>+	mvc	__PT_R8(32,%r11),__LC_SAVE_AREA_SYNC</div><div class='add'>+	mvc	__PT_PSW(8,%r11),__LC_SVC_OLD_PSW</div><div class='add'>+	mvc	__PT_INT_CODE(4,%r11),__LC_SVC_ILC</div><div class='ctx'> sysc_do_svc:</div><div class='del'>-	xr	%r7,%r7</div><div class='del'>-	icm	%r7,3,SP_SVC_CODE+2(%r15)# load svc number and test for svc 0</div><div class='del'>-	bnz	BASED(sysc_nr_ok)	# svc number &gt; 0</div><div class='add'>+	oi	__TI_flags+3(%r12),_TIF_SYSCALL</div><div class='add'>+	lh	%r8,__PT_INT_CODE+2(%r11)</div><div class='add'>+	sla	%r8,2				# shift and test for svc0</div><div class='add'>+	jnz	sysc_nr_ok</div><div class='ctx'> 	# svc 0: system call number in %r1</div><div class='ctx'> 	cl	%r1,BASED(.Lnr_syscalls)</div><div class='del'>-	bnl	BASED(sysc_nr_ok)</div><div class='del'>-	sth	%r1,SP_SVC_CODE+2(%r15)</div><div class='del'>-	lr	%r7,%r1 	  # copy svc number to %r7</div><div class='add'>+	jnl	sysc_nr_ok</div><div class='add'>+	sth	%r1,__PT_INT_CODE+2(%r11)</div><div class='add'>+	lr	%r8,%r1</div><div class='add'>+	sla	%r8,2</div><div class='ctx'> sysc_nr_ok:</div><div class='del'>-	sll	%r7,2		  # svc number *4</div><div class='del'>-	l	%r10,BASED(.Lsysc_table)</div><div class='add'>+	l	%r10,BASED(.Lsys_call_table)	# 31 bit system call table</div><div class='add'>+	xc	__SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)</div><div class='add'>+	st	%r2,__PT_ORIG_GPR2(%r11)</div><div class='add'>+	st	%r7,STACK_FRAME_OVERHEAD(%r15)</div><div class='add'>+	l	%r9,0(%r8,%r10)			# get system call addr.</div><div class='ctx'> 	tm	__TI_flags+2(%r12),_TIF_TRACE &gt;&gt; 8</div><div class='del'>-	mvc	SP_ARGS(4,%r15),SP_R7(%r15)</div><div class='del'>-	l	%r8,0(%r7,%r10)	  # get system call addr.</div><div class='del'>-	bnz	BASED(sysc_tracesys)</div><div class='del'>-	basr	%r14,%r8	  # call sys_xxxx</div><div class='del'>-	st	%r2,SP_R2(%r15)   # store return value (change R2 on stack)</div><div class='add'>+	jnz	sysc_tracesys</div><div class='add'>+	basr	%r14,%r9			# call sys_xxxx</div><div class='add'>+	st	%r2,__PT_R2(%r11)		# store return value</div><div class='ctx'> </div><div class='ctx'> sysc_return:</div><div class='ctx'> 	LOCKDEP_SYS_EXIT</div><div class='ctx'> sysc_tif:</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# returning to user ?</div><div class='del'>-	bno	BASED(sysc_restore)</div><div class='add'>+	tm	__PT_PSW+1(%r11),0x01		# returning to user ?</div><div class='add'>+	jno	sysc_restore</div><div class='ctx'> 	tm	__TI_flags+3(%r12),_TIF_WORK_SVC</div><div class='del'>-	bnz	BASED(sysc_work)  # there is work to do (signals etc.)</div><div class='add'>+	jnz	sysc_work			# check for work</div><div class='ctx'> 	ni	__TI_flags+3(%r12),255-_TIF_SYSCALL</div><div class='ctx'> sysc_restore:</div><div class='del'>-	RESTORE_ALL __LC_RETURN_PSW,1</div><div class='add'>+	mvc	__LC_RETURN_PSW(8),__PT_PSW(%r11)</div><div class='add'>+	stpt	__LC_EXIT_TIMER</div><div class='add'>+	lm	%r0,%r15,__PT_R0(%r11)</div><div class='add'>+	lpsw	__LC_RETURN_PSW</div><div class='ctx'> sysc_done:</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -273,16 +227,16 @@ sysc_done:</div><div class='ctx'> #</div><div class='ctx'> sysc_work:</div><div class='ctx'> 	tm	__TI_flags+3(%r12),_TIF_MCCK_PENDING</div><div class='del'>-	bo	BASED(sysc_mcck_pending)</div><div class='add'>+	jo	sysc_mcck_pending</div><div class='ctx'> 	tm	__TI_flags+3(%r12),_TIF_NEED_RESCHED</div><div class='del'>-	bo	BASED(sysc_reschedule)</div><div class='add'>+	jo	sysc_reschedule</div><div class='ctx'> 	tm	__TI_flags+3(%r12),_TIF_SIGPENDING</div><div class='del'>-	bo	BASED(sysc_sigpending)</div><div class='add'>+	jo	sysc_sigpending</div><div class='ctx'> 	tm	__TI_flags+3(%r12),_TIF_NOTIFY_RESUME</div><div class='del'>-	bo	BASED(sysc_notify_resume)</div><div class='add'>+	jo	sysc_notify_resume</div><div class='ctx'> 	tm	__TI_flags+3(%r12),_TIF_PER_TRAP</div><div class='del'>-	bo	BASED(sysc_singlestep)</div><div class='del'>-	b	BASED(sysc_return)	# beware of critical section cleanup</div><div class='add'>+	jo	sysc_singlestep</div><div class='add'>+	j	sysc_return		# beware of critical section cleanup</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # _TIF_NEED_RESCHED is set, call schedule</div><div class='hunk'>@@ -290,13 +244,13 @@ sysc_work:</div><div class='ctx'> sysc_reschedule:</div><div class='ctx'> 	l	%r1,BASED(.Lschedule)</div><div class='ctx'> 	la	%r14,BASED(sysc_return)</div><div class='del'>-	br	%r1			# call scheduler</div><div class='add'>+	br	%r1			# call schedule</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # _TIF_MCCK_PENDING is set, call handler</div><div class='ctx'> #</div><div class='ctx'> sysc_mcck_pending:</div><div class='del'>-	l	%r1,BASED(.Ls390_handle_mcck)</div><div class='add'>+	l	%r1,BASED(.Lhandle_mcck)</div><div class='ctx'> 	la	%r14,BASED(sysc_return)</div><div class='ctx'> 	br	%r1			# TIF bit will be cleared by handler</div><div class='ctx'> </div><div class='hunk'>@@ -305,23 +259,24 @@ sysc_mcck_pending:</div><div class='ctx'> #</div><div class='ctx'> sysc_sigpending:</div><div class='ctx'> 	ni	__TI_flags+3(%r12),255-_TIF_PER_TRAP # clear TIF_PER_TRAP</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='add'>+	lr	%r2,%r11		# pass pointer to pt_regs</div><div class='ctx'> 	l	%r1,BASED(.Ldo_signal)</div><div class='ctx'> 	basr	%r14,%r1		# call do_signal</div><div class='ctx'> 	tm	__TI_flags+3(%r12),_TIF_SYSCALL</div><div class='del'>-	bno	BASED(sysc_return)</div><div class='del'>-	lm	%r2,%r6,SP_R2(%r15)	# load svc arguments</div><div class='del'>-	xr	%r7,%r7			# svc 0 returns -ENOSYS</div><div class='del'>-	clc	SP_SVC_CODE+2(2,%r15),BASED(.Lnr_syscalls+2)</div><div class='del'>-	bnl	BASED(sysc_nr_ok)	# invalid svc number -&gt; do svc 0</div><div class='del'>-	icm	%r7,3,SP_SVC_CODE+2(%r15)# load new svc number</div><div class='del'>-	b	BASED(sysc_nr_ok)	# restart svc</div><div class='add'>+	jno	sysc_return</div><div class='add'>+	lm	%r2,%r7,__PT_R2(%r11)	# load svc arguments</div><div class='add'>+	xr	%r8,%r8			# svc 0 returns -ENOSYS</div><div class='add'>+	clc	__PT_INT_CODE+2(2,%r11),BASED(.Lnr_syscalls+2)</div><div class='add'>+	jnl	sysc_nr_ok		# invalid svc number -&gt; do svc 0</div><div class='add'>+	lh	%r8,__PT_INT_CODE+2(%r11)	# load new svc number</div><div class='add'>+	sla	%r8,2</div><div class='add'>+	j	sysc_nr_ok		# restart svc</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # _TIF_NOTIFY_RESUME is set, call do_notify_resume</div><div class='ctx'> #</div><div class='ctx'> sysc_notify_resume:</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='add'>+	lr	%r2,%r11		# pass pointer to pt_regs</div><div class='ctx'> 	l	%r1,BASED(.Ldo_notify_resume)</div><div class='ctx'> 	la	%r14,BASED(sysc_return)</div><div class='ctx'> 	br	%r1			# call do_notify_resume</div><div class='hunk'>@@ -331,56 +286,57 @@ sysc_notify_resume:</div><div class='ctx'> #</div><div class='ctx'> sysc_singlestep:</div><div class='ctx'> 	ni	__TI_flags+3(%r12),255-(_TIF_SYSCALL | _TIF_PER_TRAP)</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# address of register-save area</div><div class='del'>-	l	%r1,BASED(.Lhandle_per)	# load adr. of per handler</div><div class='del'>-	la	%r14,BASED(sysc_return)	# load adr. of system return</div><div class='del'>-	br	%r1			# branch to do_per_trap</div><div class='add'>+	lr	%r2,%r11		# pass pointer to pt_regs</div><div class='add'>+	l	%r1,BASED(.Ldo_per_trap)</div><div class='add'>+	la	%r14,BASED(sysc_return)</div><div class='add'>+	br	%r1			# call do_per_trap</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # call tracehook_report_syscall_entry/tracehook_report_syscall_exit before</div><div class='ctx'> # and after the system call</div><div class='ctx'> #</div><div class='ctx'> sysc_tracesys:</div><div class='del'>-	l	%r1,BASED(.Ltrace_entry)</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='add'>+	l	%r1,BASED(.Ltrace_enter)</div><div class='add'>+	lr	%r2,%r11		# pass pointer to pt_regs</div><div class='ctx'> 	la	%r3,0</div><div class='ctx'> 	xr	%r0,%r0</div><div class='del'>-	icm	%r0,3,SP_SVC_CODE(%r15)</div><div class='del'>-	st	%r0,SP_R2(%r15)</div><div class='del'>-	basr	%r14,%r1</div><div class='add'>+	icm	%r0,3,__PT_INT_CODE+2(%r11)</div><div class='add'>+	st	%r0,__PT_R2(%r11)</div><div class='add'>+	basr	%r14,%r1		# call do_syscall_trace_enter</div><div class='ctx'> 	cl	%r2,BASED(.Lnr_syscalls)</div><div class='del'>-	bnl	BASED(sysc_tracenogo)</div><div class='del'>-	lr	%r7,%r2</div><div class='del'>-	sll	%r7,2			# svc number *4</div><div class='del'>-	l	%r8,0(%r7,%r10)</div><div class='add'>+	jnl	sysc_tracenogo</div><div class='add'>+	lr	%r8,%r2</div><div class='add'>+	sll	%r8,2</div><div class='add'>+	l	%r9,0(%r8,%r10)</div><div class='ctx'> sysc_tracego:</div><div class='del'>-	lm	%r3,%r6,SP_R3(%r15)</div><div class='del'>-	mvc	SP_ARGS(4,%r15),SP_R7(%r15)</div><div class='del'>-	l	%r2,SP_ORIG_R2(%r15)</div><div class='del'>-	basr	%r14,%r8		# call sys_xxx</div><div class='del'>-	st	%r2,SP_R2(%r15)		# store return value</div><div class='add'>+	lm	%r3,%r7,__PT_R3(%r11)</div><div class='add'>+	st	%r7,STACK_FRAME_OVERHEAD(%r15)</div><div class='add'>+	l	%r2,__PT_ORIG_GPR2(%r11)</div><div class='add'>+	basr	%r14,%r9		# call sys_xxx</div><div class='add'>+	st	%r2,__PT_R2(%r11)	# store return value</div><div class='ctx'> sysc_tracenogo:</div><div class='ctx'> 	tm	__TI_flags+2(%r12),_TIF_TRACE &gt;&gt; 8</div><div class='del'>-	bz	BASED(sysc_return)</div><div class='add'>+	jz	sysc_return</div><div class='ctx'> 	l	%r1,BASED(.Ltrace_exit)</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='add'>+	lr	%r2,%r11		# pass pointer to pt_regs</div><div class='ctx'> 	la	%r14,BASED(sysc_return)</div><div class='del'>-	br	%r1</div><div class='add'>+	br	%r1			# call do_syscall_trace_exit</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='ctx'> #</div><div class='ctx'> ENTRY(ret_from_fork)</div><div class='add'>+	la	%r11,STACK_FRAME_OVERHEAD(%r15)</div><div class='add'>+	l	%r12,__LC_THREAD_INFO</div><div class='ctx'> 	l	%r13,__LC_SVC_NEW_PSW+4</div><div class='del'>-	l	%r12,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# forking a kernel thread ?</div><div class='del'>-	bo	BASED(0f)</div><div class='del'>-	st	%r15,SP_R15(%r15)	# store stack pointer for new kthread</div><div class='del'>-0:	l	%r1,BASED(.Lschedtail)</div><div class='del'>-	basr	%r14,%r1</div><div class='add'>+	tm	__PT_PSW+1(%r11),0x01	# forking a kernel thread ?</div><div class='add'>+	jo	0f</div><div class='add'>+	st	%r15,__PT_R15(%r11)	# store stack pointer for new kthread</div><div class='add'>+0:	l	%r1,BASED(.Lschedule_tail)</div><div class='add'>+	basr	%r14,%r1		# call schedule_tail</div><div class='ctx'> 	TRACE_IRQS_ON</div><div class='del'>-	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts</div><div class='del'>-	b	BASED(sysc_tracenogo)</div><div class='add'>+	ssm	__LC_SVC_NEW_PSW	# reenable interrupts</div><div class='add'>+	j	sysc_tracenogo</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # kernel_execve function needs to deal with pt_regs that is not</div><div class='hunk'>@@ -390,153 +346,98 @@ ENTRY(kernel_execve)</div><div class='ctx'> 	stm	%r12,%r15,48(%r15)</div><div class='ctx'> 	lr	%r14,%r15</div><div class='ctx'> 	l	%r13,__LC_SVC_NEW_PSW+4</div><div class='del'>-	s	%r15,BASED(.Lc_spsize)</div><div class='add'>+	ahi	%r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='ctx'> 	st	%r14,__SF_BACKCHAIN(%r15)</div><div class='del'>-	la	%r12,SP_PTREGS(%r15)</div><div class='add'>+	la	%r12,STACK_FRAME_OVERHEAD(%r15)</div><div class='ctx'> 	xc	0(__PT_SIZE,%r12),0(%r12)</div><div class='ctx'> 	l	%r1,BASED(.Ldo_execve)</div><div class='ctx'> 	lr	%r5,%r12</div><div class='del'>-	basr	%r14,%r1</div><div class='add'>+	basr	%r14,%r1		# call do_execve</div><div class='ctx'> 	ltr	%r2,%r2</div><div class='del'>-	be	BASED(0f)</div><div class='del'>-	a	%r15,BASED(.Lc_spsize)</div><div class='add'>+	je	0f</div><div class='add'>+	ahi	%r15,(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='ctx'> 	lm	%r12,%r15,48(%r15)</div><div class='ctx'> 	br	%r14</div><div class='ctx'> 	# execve succeeded.</div><div class='del'>-0:	stnsm	__SF_EMPTY(%r15),0xfc	# disable interrupts</div><div class='add'>+0:	ssm	__LC_PGM_NEW_PSW	# disable I/O and ext. interrupts</div><div class='ctx'> 	l	%r15,__LC_KERNEL_STACK	# load ksp</div><div class='del'>-	s	%r15,BASED(.Lc_spsize)	# make room for registers &amp; psw</div><div class='del'>-	mvc	SP_PTREGS(__PT_SIZE,%r15),0(%r12)	# copy pt_regs</div><div class='add'>+	ahi	%r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='add'>+	la	%r11,STACK_FRAME_OVERHEAD(%r15)</div><div class='add'>+	mvc	0(__PT_SIZE,%r11),0(%r12)	# copy pt_regs</div><div class='ctx'> 	l	%r12,__LC_THREAD_INFO</div><div class='ctx'> 	xc	__SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)</div><div class='del'>-	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts</div><div class='add'>+	ssm	__LC_SVC_NEW_PSW	# reenable interrupts</div><div class='ctx'> 	l	%r1,BASED(.Lexecve_tail)</div><div class='del'>-	basr	%r14,%r1</div><div class='del'>-	b	BASED(sysc_return)</div><div class='add'>+	basr	%r14,%r1		# call execve_tail</div><div class='add'>+	j	sysc_return</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Program check handler routine</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> ENTRY(pgm_check_handler)</div><div class='del'>-/*</div><div class='del'>- * First we need to check for a special case:</div><div class='del'>- * Single stepping an instruction that disables the PER event mask will</div><div class='del'>- * cause a PER event AFTER the mask has been set. Example: SVC or LPSW.</div><div class='del'>- * For a single stepped SVC the program check handler gets control after</div><div class='del'>- * the SVC new PSW has been loaded. But we want to execute the SVC first and</div><div class='del'>- * then handle the PER event. Therefore we update the SVC old PSW to point</div><div class='del'>- * to the pgm_check_handler and branch to the SVC handler after we checked</div><div class='del'>- * if we have to load the kernel stack register.</div><div class='del'>- * For every other possible cause for PER event without the PER mask set</div><div class='del'>- * we just ignore the PER event (FIXME: is there anything we have to do</div><div class='del'>- * for LPSW?).</div><div class='del'>- */</div><div class='ctx'> 	stpt	__LC_SYNC_ENTER_TIMER</div><div class='del'>-	SAVE_ALL_BASE __LC_SAVE_AREA</div><div class='del'>-	tm	__LC_PGM_INT_CODE+1,0x80 # check whether we got a per exception</div><div class='del'>-	bnz	BASED(pgm_per)		# got per exception -&gt; special case</div><div class='del'>-	SAVE_ALL_PGM __LC_PGM_OLD_PSW,__LC_SAVE_AREA</div><div class='del'>-	CREATE_STACK_FRAME __LC_SAVE_AREA</div><div class='del'>-	mvc	SP_PSW(8,%r15),__LC_PGM_OLD_PSW</div><div class='del'>-	l	%r12,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='del'>-	bz	BASED(pgm_no_vtime)</div><div class='del'>-	UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER</div><div class='del'>-	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER</div><div class='del'>-	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER</div><div class='del'>-pgm_no_vtime:</div><div class='del'>-	l	%r3,__LC_PGM_ILC	# load program interruption code</div><div class='del'>-	l	%r4,__LC_TRANS_EXC_CODE</div><div class='del'>-	REENABLE_IRQS</div><div class='del'>-	la	%r8,0x7f</div><div class='del'>-	nr	%r8,%r3</div><div class='del'>-	sll	%r8,2</div><div class='del'>-	l	%r1,BASED(.Ljump_table)</div><div class='del'>-	l	%r1,0(%r8,%r1)		# load address of handler routine</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# address of register-save area</div><div class='del'>-	basr	%r14,%r1		# branch to interrupt-handler</div><div class='del'>-pgm_exit:</div><div class='del'>-	b	BASED(sysc_return)</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# handle per exception</div><div class='del'>-#</div><div class='del'>-pgm_per:</div><div class='del'>-	tm	__LC_PGM_OLD_PSW,0x40	# test if per event recording is on</div><div class='del'>-	bnz	BASED(pgm_per_std)	# ok, normal per event from user space</div><div class='del'>-# ok its one of the special cases, now we need to find out which one</div><div class='del'>-	clc	__LC_PGM_OLD_PSW(8),__LC_SVC_NEW_PSW</div><div class='del'>-	be	BASED(pgm_svcper)</div><div class='del'>-# no interesting special case, ignore PER event</div><div class='del'>-	lm	%r12,%r15,__LC_SAVE_AREA</div><div class='del'>-	lpsw	0x28</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Normal per exception</div><div class='del'>-#</div><div class='del'>-pgm_per_std:</div><div class='del'>-	SAVE_ALL_PGM __LC_PGM_OLD_PSW,__LC_SAVE_AREA</div><div class='del'>-	CREATE_STACK_FRAME __LC_SAVE_AREA</div><div class='del'>-	mvc	SP_PSW(8,%r15),__LC_PGM_OLD_PSW</div><div class='del'>-	l	%r12,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='del'>-	bz	BASED(pgm_no_vtime2)</div><div class='del'>-	UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER</div><div class='del'>-	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER</div><div class='del'>-	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER</div><div class='del'>-pgm_no_vtime2:</div><div class='add'>+	stm	%r8,%r15,__LC_SAVE_AREA_SYNC</div><div class='add'>+	l	%r12,__LC_THREAD_INFO</div><div class='add'>+	l	%r13,__LC_SVC_NEW_PSW+4</div><div class='add'>+	lm	%r8,%r9,__LC_PGM_OLD_PSW</div><div class='add'>+	tmh	%r8,0x0001		# test problem state bit</div><div class='add'>+	jnz	1f			# -&gt; fault in user space</div><div class='add'>+	tmh	%r8,0x4000		# PER bit set in old PSW ?</div><div class='add'>+	jnz	0f			# -&gt; enabled, can't be a double fault</div><div class='add'>+	tm	__LC_PGM_ILC+3,0x80	# check for per exception</div><div class='add'>+	jnz	pgm_svcper		# -&gt; single stepped svc</div><div class='add'>+0:	CHECK_STACK STACK_SIZE,__LC_SAVE_AREA_SYNC</div><div class='add'>+	j	2f</div><div class='add'>+1:	UPDATE_VTIME %r14,%r15,__LC_SYNC_ENTER_TIMER</div><div class='add'>+	l	%r15,__LC_KERNEL_STACK</div><div class='add'>+2:	ahi	%r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='add'>+	la	%r11,STACK_FRAME_OVERHEAD(%r15)</div><div class='add'>+	stm	%r0,%r7,__PT_R0(%r11)</div><div class='add'>+	mvc	__PT_R8(32,%r11),__LC_SAVE_AREA_SYNC</div><div class='add'>+	stm	%r8,%r9,__PT_PSW(%r11)</div><div class='add'>+	mvc	__PT_INT_CODE(4,%r11),__LC_PGM_ILC</div><div class='add'>+	mvc	__PT_INT_PARM_LONG(4,%r11),__LC_TRANS_EXC_CODE</div><div class='add'>+	tm	__LC_PGM_ILC+3,0x80	# check for per exception</div><div class='add'>+	jz	0f</div><div class='ctx'> 	l	%r1,__TI_task(%r12)</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# kernel per event ?</div><div class='del'>-	bz	BASED(kernel_per)</div><div class='del'>-	mvc	__THREAD_per_cause(2,%r1),__LC_PER_CAUSE</div><div class='add'>+	tmh	%r8,0x0001		# kernel per event ?</div><div class='add'>+	jz	pgm_kprobe</div><div class='add'>+	oi	__TI_flags+3(%r12),_TIF_PER_TRAP</div><div class='ctx'> 	mvc	__THREAD_per_address(4,%r1),__LC_PER_ADDRESS</div><div class='add'>+	mvc	__THREAD_per_cause(2,%r1),__LC_PER_CAUSE</div><div class='ctx'> 	mvc	__THREAD_per_paid(1,%r1),__LC_PER_PAID</div><div class='del'>-	oi	__TI_flags+3(%r12),_TIF_PER_TRAP # set TIF_PER_TRAP</div><div class='del'>-	l	%r3,__LC_PGM_ILC	# load program interruption code</div><div class='del'>-	l	%r4,__LC_TRANS_EXC_CODE</div><div class='del'>-	REENABLE_IRQS</div><div class='del'>-	la	%r8,0x7f</div><div class='del'>-	nr	%r8,%r3 		# clear per-event-bit and ilc</div><div class='del'>-	be	BASED(pgm_exit2)	# only per or per+check ?</div><div class='del'>-	sll	%r8,2</div><div class='add'>+0:	REENABLE_IRQS</div><div class='add'>+	xc	__SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)</div><div class='ctx'> 	l	%r1,BASED(.Ljump_table)</div><div class='del'>-	l	%r1,0(%r8,%r1)		# load address of handler routine</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# address of register-save area</div><div class='add'>+	la	%r10,0x7f</div><div class='add'>+	n	%r10,__PT_INT_CODE(%r11)</div><div class='add'>+	je	sysc_return</div><div class='add'>+	sll	%r10,2</div><div class='add'>+	l	%r1,0(%r10,%r1)		# load address of handler routine</div><div class='add'>+	lr	%r2,%r11		# pass pointer to pt_regs</div><div class='ctx'> 	basr	%r14,%r1		# branch to interrupt-handler</div><div class='del'>-pgm_exit2:</div><div class='del'>-	b	BASED(sysc_return)</div><div class='add'>+	j	sysc_return</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# it was a single stepped SVC that is causing all the trouble</div><div class='add'>+# PER event in supervisor state, must be kprobes</div><div class='ctx'> #</div><div class='del'>-pgm_svcper:</div><div class='del'>-	SAVE_ALL_PGM __LC_SVC_OLD_PSW,__LC_SAVE_AREA</div><div class='del'>-	CREATE_STACK_FRAME __LC_SAVE_AREA</div><div class='del'>-	l	%r12,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='del'>-	mvc	SP_PSW(8,%r15),__LC_SVC_OLD_PSW</div><div class='del'>-	mvc	SP_SVC_CODE(4,%r15),__LC_SVC_ILC</div><div class='del'>-	oi	__TI_flags+3(%r12),(_TIF_SYSCALL | _TIF_PER_TRAP)</div><div class='del'>-	UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER</div><div class='del'>-	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER</div><div class='del'>-	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER</div><div class='del'>-	l	%r8,__TI_task(%r12)</div><div class='del'>-	mvc	__THREAD_per_cause(2,%r8),__LC_PER_CAUSE</div><div class='del'>-	mvc	__THREAD_per_address(4,%r8),__LC_PER_ADDRESS</div><div class='del'>-	mvc	__THREAD_per_paid(1,%r8),__LC_PER_PAID</div><div class='del'>-	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts</div><div class='del'>-	lm	%r2,%r6,SP_R2(%r15)	# load svc arguments</div><div class='del'>-	b	BASED(sysc_do_svc)</div><div class='add'>+pgm_kprobe:</div><div class='add'>+	REENABLE_IRQS</div><div class='add'>+	xc	__SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)</div><div class='add'>+	l	%r1,BASED(.Ldo_per_trap)</div><div class='add'>+	lr	%r2,%r11		# pass pointer to pt_regs</div><div class='add'>+	basr	%r14,%r1		# call do_per_trap</div><div class='add'>+	j	sysc_return</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# per was called from kernel, must be kprobes</div><div class='add'>+# single stepped system call</div><div class='ctx'> #</div><div class='del'>-kernel_per:</div><div class='del'>-	REENABLE_IRQS</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# address of register-save area</div><div class='del'>-	l	%r1,BASED(.Lhandle_per)	# load adr. of per handler</div><div class='del'>-	basr	%r14,%r1		# branch to do_single_step</div><div class='del'>-	b	BASED(pgm_exit)</div><div class='add'>+pgm_svcper:</div><div class='add'>+	oi	__TI_flags+3(%r12),_TIF_PER_TRAP</div><div class='add'>+	mvc	__LC_RETURN_PSW(4),__LC_SVC_NEW_PSW</div><div class='add'>+	mvc	__LC_RETURN_PSW+4(4),BASED(.Lsysc_per)</div><div class='add'>+	lpsw	__LC_RETURN_PSW		# branch to sysc_per and enable irqs</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * IO interrupt handler routine</div><div class='hunk'>@@ -545,28 +446,35 @@ kernel_per:</div><div class='ctx'> ENTRY(io_int_handler)</div><div class='ctx'> 	stck	__LC_INT_CLOCK</div><div class='ctx'> 	stpt	__LC_ASYNC_ENTER_TIMER</div><div class='del'>-	SAVE_ALL_ASYNC __LC_IO_OLD_PSW,__LC_SAVE_AREA+16</div><div class='del'>-	CREATE_STACK_FRAME __LC_SAVE_AREA+16</div><div class='del'>-	mvc	SP_PSW(8,%r15),0(%r12)	# move user PSW to stack</div><div class='del'>-	l	%r12,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='del'>-	bz	BASED(io_no_vtime)</div><div class='del'>-	UPDATE_VTIME __LC_EXIT_TIMER,__LC_ASYNC_ENTER_TIMER,__LC_USER_TIMER</div><div class='del'>-	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER</div><div class='del'>-	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_ASYNC_ENTER_TIMER</div><div class='del'>-io_no_vtime:</div><div class='add'>+	stm	%r8,%r15,__LC_SAVE_AREA_ASYNC</div><div class='add'>+	l	%r12,__LC_THREAD_INFO</div><div class='add'>+	l	%r13,__LC_SVC_NEW_PSW+4</div><div class='add'>+	lm	%r8,%r9,__LC_IO_OLD_PSW</div><div class='add'>+	tmh	%r8,0x0001		# interrupting from user ?</div><div class='add'>+	jz	io_skip</div><div class='add'>+	UPDATE_VTIME %r14,%r15,__LC_ASYNC_ENTER_TIMER</div><div class='add'>+io_skip:</div><div class='add'>+	SWITCH_ASYNC __LC_SAVE_AREA_ASYNC,__LC_ASYNC_STACK,STACK_SHIFT</div><div class='add'>+	stm	%r0,%r7,__PT_R0(%r11)</div><div class='add'>+	mvc	__PT_R8(32,%r11),__LC_SAVE_AREA_ASYNC</div><div class='add'>+	stm	%r8,%r9,__PT_PSW(%r11)</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='del'>-	l	%r1,BASED(.Ldo_IRQ)	# load address of do_IRQ</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# address of register-save area</div><div class='del'>-	basr	%r14,%r1		# branch to standard irq handler</div><div class='add'>+	xc	__SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)</div><div class='add'>+	l	%r1,BASED(.Ldo_IRQ)</div><div class='add'>+	lr	%r2,%r11		# pass pointer to pt_regs</div><div class='add'>+	basr	%r14,%r1		# call do_IRQ</div><div class='ctx'> io_return:</div><div class='ctx'> 	LOCKDEP_SYS_EXIT</div><div class='ctx'> 	TRACE_IRQS_ON</div><div class='ctx'> io_tif:</div><div class='ctx'> 	tm	__TI_flags+3(%r12),_TIF_WORK_INT</div><div class='del'>-	bnz	BASED(io_work)		# there is work to do (signals etc.)</div><div class='add'>+	jnz	io_work			# there is work to do (signals etc.)</div><div class='ctx'> io_restore:</div><div class='del'>-	RESTORE_ALL __LC_RETURN_PSW,0</div><div class='add'>+	mvc	__LC_RETURN_PSW(8),__PT_PSW(%r11)</div><div class='add'>+	ni	__LC_RETURN_PSW+1,0xfd	# clean wait state bit</div><div class='add'>+	stpt	__LC_EXIT_TIMER</div><div class='add'>+	lm	%r0,%r15,__PT_R0(%r11)</div><div class='add'>+	lpsw	__LC_RETURN_PSW</div><div class='ctx'> io_done:</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -577,28 +485,29 @@ io_done:</div><div class='ctx'> # Before any work can be done, a switch to the kernel stack is required.</div><div class='ctx'> #</div><div class='ctx'> io_work:</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# returning to user ?</div><div class='del'>-	bo	BASED(io_work_user)	# yes -&gt; do resched &amp; signal</div><div class='add'>+	tm	__PT_PSW+1(%r11),0x01	# returning to user ?</div><div class='add'>+	jo	io_work_user		# yes -&gt; do resched &amp; signal</div><div class='ctx'> #ifdef CONFIG_PREEMPT</div><div class='ctx'> 	# check for preemptive scheduling</div><div class='ctx'> 	icm	%r0,15,__TI_precount(%r12)</div><div class='del'>-	bnz	BASED(io_restore)	# preemption disabled</div><div class='add'>+	jnz	io_restore		# preemption disabled</div><div class='ctx'> 	tm	__TI_flags+3(%r12),_TIF_NEED_RESCHED</div><div class='del'>-	bno	BASED(io_restore)</div><div class='add'>+	jno	io_restore</div><div class='ctx'> 	# switch to kernel stack</div><div class='del'>-	l	%r1,SP_R15(%r15)</div><div class='del'>-	s	%r1,BASED(.Lc_spsize)</div><div class='del'>-	mvc	SP_PTREGS(__PT_SIZE,%r1),SP_PTREGS(%r15)</div><div class='del'>-	xc	__SF_BACKCHAIN(4,%r1),__SF_BACKCHAIN(%r1) # clear back chain</div><div class='add'>+	l	%r1,__PT_R15(%r11)</div><div class='add'>+	ahi	%r1,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='add'>+	mvc	STACK_FRAME_OVERHEAD(__PT_SIZE,%r1),0(%r11)</div><div class='add'>+	xc	__SF_BACKCHAIN(4,%r1),__SF_BACKCHAIN(%r1)</div><div class='add'>+	la	%r11,STACK_FRAME_OVERHEAD(%r1)</div><div class='ctx'> 	lr	%r15,%r1</div><div class='ctx'> 	# TRACE_IRQS_ON already done at io_return, call</div><div class='ctx'> 	# TRACE_IRQS_OFF to keep things symmetrical</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='del'>-	l	%r1,BASED(.Lpreempt_schedule_irq)</div><div class='add'>+	l	%r1,BASED(.Lpreempt_irq)</div><div class='ctx'> 	basr	%r14,%r1		# call preempt_schedule_irq</div><div class='del'>-	b	BASED(io_return)</div><div class='add'>+	j	io_return</div><div class='ctx'> #else</div><div class='del'>-	b	BASED(io_restore)</div><div class='add'>+	j	io_restore</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -606,9 +515,10 @@ io_work:</div><div class='ctx'> #</div><div class='ctx'> io_work_user:</div><div class='ctx'> 	l	%r1,__LC_KERNEL_STACK</div><div class='del'>-	s	%r1,BASED(.Lc_spsize)</div><div class='del'>-	mvc	SP_PTREGS(__PT_SIZE,%r1),SP_PTREGS(%r15)</div><div class='del'>-	xc	__SF_BACKCHAIN(4,%r1),__SF_BACKCHAIN(%r1) # clear back chain</div><div class='add'>+	ahi	%r1,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='add'>+	mvc	STACK_FRAME_OVERHEAD(__PT_SIZE,%r1),0(%r11)</div><div class='add'>+	xc	__SF_BACKCHAIN(4,%r1),__SF_BACKCHAIN(%r1)</div><div class='add'>+	la	%r11,STACK_FRAME_OVERHEAD(%r1)</div><div class='ctx'> 	lr	%r15,%r1</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -618,24 +528,24 @@ io_work_user:</div><div class='ctx'> #</div><div class='ctx'> io_work_tif:</div><div class='ctx'> 	tm	__TI_flags+3(%r12),_TIF_MCCK_PENDING</div><div class='del'>-	bo	BASED(io_mcck_pending)</div><div class='add'>+	jo	io_mcck_pending</div><div class='ctx'> 	tm	__TI_flags+3(%r12),_TIF_NEED_RESCHED</div><div class='del'>-	bo	BASED(io_reschedule)</div><div class='add'>+	jo	io_reschedule</div><div class='ctx'> 	tm	__TI_flags+3(%r12),_TIF_SIGPENDING</div><div class='del'>-	bo	BASED(io_sigpending)</div><div class='add'>+	jo	io_sigpending</div><div class='ctx'> 	tm	__TI_flags+3(%r12),_TIF_NOTIFY_RESUME</div><div class='del'>-	bo	BASED(io_notify_resume)</div><div class='del'>-	b	BASED(io_return)	# beware of critical section cleanup</div><div class='add'>+	jo	io_notify_resume</div><div class='add'>+	j	io_return		# beware of critical section cleanup</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # _TIF_MCCK_PENDING is set, call handler</div><div class='ctx'> #</div><div class='ctx'> io_mcck_pending:</div><div class='ctx'> 	# TRACE_IRQS_ON already done at io_return</div><div class='del'>-	l	%r1,BASED(.Ls390_handle_mcck)</div><div class='add'>+	l	%r1,BASED(.Lhandle_mcck)</div><div class='ctx'> 	basr	%r14,%r1		# TIF bit will be cleared by handler</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='del'>-	b	BASED(io_return)</div><div class='add'>+	j	io_return</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # _TIF_NEED_RESCHED is set, call schedule</div><div class='hunk'>@@ -643,37 +553,37 @@ io_mcck_pending:</div><div class='ctx'> io_reschedule:</div><div class='ctx'> 	# TRACE_IRQS_ON already done at io_return</div><div class='ctx'> 	l	%r1,BASED(.Lschedule)</div><div class='del'>-	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts</div><div class='add'>+	ssm	__LC_SVC_NEW_PSW	# reenable interrupts</div><div class='ctx'> 	basr	%r14,%r1		# call scheduler</div><div class='del'>-	stnsm	__SF_EMPTY(%r15),0xfc	# disable I/O and ext. interrupts</div><div class='add'>+	ssm	__LC_PGM_NEW_PSW	# disable I/O and ext. interrupts</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='del'>-	b	BASED(io_return)</div><div class='add'>+	j	io_return</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # _TIF_SIGPENDING is set, call do_signal</div><div class='ctx'> #</div><div class='ctx'> io_sigpending:</div><div class='ctx'> 	# TRACE_IRQS_ON already done at io_return</div><div class='del'>-	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='ctx'> 	l	%r1,BASED(.Ldo_signal)</div><div class='add'>+	ssm	__LC_SVC_NEW_PSW	# reenable interrupts</div><div class='add'>+	lr	%r2,%r11		# pass pointer to pt_regs</div><div class='ctx'> 	basr	%r14,%r1		# call do_signal</div><div class='del'>-	stnsm	__SF_EMPTY(%r15),0xfc	# disable I/O and ext. interrupts</div><div class='add'>+	ssm	__LC_PGM_NEW_PSW	# disable I/O and ext. interrupts</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='del'>-	b	BASED(io_return)</div><div class='add'>+	j	io_return</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # _TIF_SIGPENDING is set, call do_signal</div><div class='ctx'> #</div><div class='ctx'> io_notify_resume:</div><div class='ctx'> 	# TRACE_IRQS_ON already done at io_return</div><div class='del'>-	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='ctx'> 	l	%r1,BASED(.Ldo_notify_resume)</div><div class='del'>-	basr	%r14,%r1		# call do_signal</div><div class='del'>-	stnsm	__SF_EMPTY(%r15),0xfc	# disable I/O and ext. interrupts</div><div class='add'>+	ssm	__LC_SVC_NEW_PSW	# reenable interrupts</div><div class='add'>+	lr	%r2,%r11		# pass pointer to pt_regs</div><div class='add'>+	basr	%r14,%r1		# call do_notify_resume</div><div class='add'>+	ssm	__LC_PGM_NEW_PSW	# disable I/O and ext. interrupts</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='del'>-	b	BASED(io_return)</div><div class='add'>+	j	io_return</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * External interrupt handler routine</div><div class='hunk'>@@ -682,23 +592,25 @@ io_notify_resume:</div><div class='ctx'> ENTRY(ext_int_handler)</div><div class='ctx'> 	stck	__LC_INT_CLOCK</div><div class='ctx'> 	stpt	__LC_ASYNC_ENTER_TIMER</div><div class='del'>-	SAVE_ALL_ASYNC __LC_EXT_OLD_PSW,__LC_SAVE_AREA+16</div><div class='del'>-	CREATE_STACK_FRAME __LC_SAVE_AREA+16</div><div class='del'>-	mvc	SP_PSW(8,%r15),0(%r12)	# move user PSW to stack</div><div class='del'>-	l	%r12,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='del'>-	bz	BASED(ext_no_vtime)</div><div class='del'>-	UPDATE_VTIME __LC_EXIT_TIMER,__LC_ASYNC_ENTER_TIMER,__LC_USER_TIMER</div><div class='del'>-	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER</div><div class='del'>-	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_ASYNC_ENTER_TIMER</div><div class='del'>-ext_no_vtime:</div><div class='add'>+	stm	%r8,%r15,__LC_SAVE_AREA_ASYNC</div><div class='add'>+	l	%r12,__LC_THREAD_INFO</div><div class='add'>+	l	%r13,__LC_SVC_NEW_PSW+4</div><div class='add'>+	lm	%r8,%r9,__LC_EXT_OLD_PSW</div><div class='add'>+	tmh	%r8,0x0001		# interrupting from user ?</div><div class='add'>+	jz	ext_skip</div><div class='add'>+	UPDATE_VTIME %r14,%r15,__LC_ASYNC_ENTER_TIMER</div><div class='add'>+ext_skip:</div><div class='add'>+	SWITCH_ASYNC __LC_SAVE_AREA_ASYNC,__LC_ASYNC_STACK,STACK_SHIFT</div><div class='add'>+	stm	%r0,%r7,__PT_R0(%r11)</div><div class='add'>+	mvc	__PT_R8(32,%r11),__LC_SAVE_AREA_ASYNC</div><div class='add'>+	stm	%r8,%r9,__PT_PSW(%r11)</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# address of register-save area</div><div class='add'>+	lr	%r2,%r11		# pass pointer to pt_regs</div><div class='ctx'> 	l	%r3,__LC_CPU_ADDRESS	# get cpu address + interruption code</div><div class='ctx'> 	l	%r4,__LC_EXT_PARAMS	# get external parameters</div><div class='ctx'> 	l	%r1,BASED(.Ldo_extint)</div><div class='del'>-	basr	%r14,%r1</div><div class='del'>-	b	BASED(io_return)</div><div class='add'>+	basr	%r14,%r1		# call do_extint</div><div class='add'>+	j	io_return</div><div class='ctx'> </div><div class='ctx'> __critical_end:</div><div class='ctx'> </div><div class='hunk'>@@ -710,82 +622,74 @@ ENTRY(mcck_int_handler)</div><div class='ctx'> 	stck	__LC_MCCK_CLOCK</div><div class='ctx'> 	spt	__LC_CPU_TIMER_SAVE_AREA	# revalidate cpu timer</div><div class='ctx'> 	lm	%r0,%r15,__LC_GPREGS_SAVE_AREA	# revalidate gprs</div><div class='del'>-	SAVE_ALL_BASE __LC_SAVE_AREA+32</div><div class='del'>-	la	%r12,__LC_MCK_OLD_PSW</div><div class='add'>+	l	%r12,__LC_THREAD_INFO</div><div class='add'>+	l	%r13,__LC_SVC_NEW_PSW+4</div><div class='add'>+	lm	%r8,%r9,__LC_MCK_OLD_PSW</div><div class='ctx'> 	tm	__LC_MCCK_CODE,0x80	# system damage?</div><div class='del'>-	bo	BASED(mcck_int_main)	# yes -&gt; rest of mcck code invalid</div><div class='del'>-	mvc	__LC_MCCK_ENTER_TIMER(8),__LC_CPU_TIMER_SAVE_AREA</div><div class='add'>+	jo	mcck_panic		# yes -&gt; rest of mcck code invalid</div><div class='add'>+	la	%r14,__LC_CPU_TIMER_SAVE_AREA</div><div class='add'>+	mvc	__LC_MCCK_ENTER_TIMER(8),0(%r14)</div><div class='ctx'> 	tm	__LC_MCCK_CODE+5,0x02	# stored cpu timer value valid?</div><div class='del'>-	bo	BASED(1f)</div><div class='add'>+	jo	3f</div><div class='ctx'> 	la	%r14,__LC_SYNC_ENTER_TIMER</div><div class='ctx'> 	clc	0(8,%r14),__LC_ASYNC_ENTER_TIMER</div><div class='del'>-	bl	BASED(0f)</div><div class='add'>+	jl	0f</div><div class='ctx'> 	la	%r14,__LC_ASYNC_ENTER_TIMER</div><div class='ctx'> 0:	clc	0(8,%r14),__LC_EXIT_TIMER</div><div class='del'>-	bl	BASED(0f)</div><div class='add'>+	jl	1f</div><div class='ctx'> 	la	%r14,__LC_EXIT_TIMER</div><div class='del'>-0:	clc	0(8,%r14),__LC_LAST_UPDATE_TIMER</div><div class='del'>-	bl	BASED(0f)</div><div class='add'>+1:	clc	0(8,%r14),__LC_LAST_UPDATE_TIMER</div><div class='add'>+	jl	2f</div><div class='ctx'> 	la	%r14,__LC_LAST_UPDATE_TIMER</div><div class='del'>-0:	spt	0(%r14)</div><div class='add'>+2:	spt	0(%r14)</div><div class='ctx'> 	mvc	__LC_MCCK_ENTER_TIMER(8),0(%r14)</div><div class='del'>-1:	tm	__LC_MCCK_CODE+2,0x09	# mwp + ia of old psw valid?</div><div class='del'>-	bno	BASED(mcck_int_main)	# no -&gt; skip cleanup critical</div><div class='del'>-	tm	__LC_MCK_OLD_PSW+1,0x01	# test problem state bit</div><div class='del'>-	bnz	BASED(mcck_int_main)	# from user -&gt; load async stack</div><div class='del'>-	clc	__LC_MCK_OLD_PSW+4(4),BASED(.Lcritical_end)</div><div class='del'>-	bhe	BASED(mcck_int_main)</div><div class='del'>-	clc	__LC_MCK_OLD_PSW+4(4),BASED(.Lcritical_start)</div><div class='del'>-	bl	BASED(mcck_int_main)</div><div class='del'>-	l	%r14,BASED(.Lcleanup_critical)</div><div class='del'>-	basr	%r14,%r14</div><div class='del'>-mcck_int_main:</div><div class='del'>-	l	%r14,__LC_PANIC_STACK	# are we already on the panic stack?</div><div class='del'>-	slr	%r14,%r15</div><div class='del'>-	sra	%r14,PAGE_SHIFT</div><div class='del'>-	be	BASED(0f)</div><div class='del'>-	l	%r15,__LC_PANIC_STACK	# load panic stack</div><div class='del'>-0:	s	%r15,BASED(.Lc_spsize)	# make room for registers &amp; psw</div><div class='del'>-	CREATE_STACK_FRAME __LC_SAVE_AREA+32</div><div class='del'>-	mvc	SP_PSW(8,%r15),0(%r12)</div><div class='del'>-	l	%r12,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='del'>-	tm	__LC_MCCK_CODE+2,0x08	# mwp of old psw valid?</div><div class='del'>-	bno	BASED(mcck_no_vtime)	# no -&gt; skip cleanup critical</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='del'>-	bz	BASED(mcck_no_vtime)</div><div class='del'>-	UPDATE_VTIME __LC_EXIT_TIMER,__LC_MCCK_ENTER_TIMER,__LC_USER_TIMER</div><div class='del'>-	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER</div><div class='del'>-	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_MCCK_ENTER_TIMER</div><div class='del'>-mcck_no_vtime:</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='del'>-	l	%r1,BASED(.Ls390_mcck)</div><div class='del'>-	basr	%r14,%r1		# call machine check handler</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# returning to user ?</div><div class='del'>-	bno	BASED(mcck_return)</div><div class='add'>+3:	tm	__LC_MCCK_CODE+2,0x09	# mwp + ia of old psw valid?</div><div class='add'>+	jno	mcck_panic		# no -&gt; skip cleanup critical</div><div class='add'>+	tm	%r8,0x0001		# interrupting from user ?</div><div class='add'>+	jz	mcck_skip</div><div class='add'>+	UPDATE_VTIME %r14,%r15,__LC_MCCK_ENTER_TIMER</div><div class='add'>+mcck_skip:</div><div class='add'>+	SWITCH_ASYNC __LC_GPREGS_SAVE_AREA+32,__LC_PANIC_STACK,PAGE_SHIFT</div><div class='add'>+	mvc	__PT_R0(64,%r11),__LC_GPREGS_SAVE_AREA</div><div class='add'>+	stm	%r8,%r9,__PT_PSW(%r11)</div><div class='add'>+	xc	__SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)</div><div class='add'>+	l	%r1,BASED(.Ldo_machine_check)</div><div class='add'>+	lr	%r2,%r11		# pass pointer to pt_regs</div><div class='add'>+	basr	%r14,%r1		# call s390_do_machine_check</div><div class='add'>+	tm	__PT_PSW+1(%r11),0x01	# returning to user ?</div><div class='add'>+	jno	mcck_return</div><div class='ctx'> 	l	%r1,__LC_KERNEL_STACK	# switch to kernel stack</div><div class='del'>-	s	%r1,BASED(.Lc_spsize)</div><div class='del'>-	mvc	SP_PTREGS(__PT_SIZE,%r1),SP_PTREGS(%r15)</div><div class='del'>-	xc	__SF_BACKCHAIN(4,%r1),__SF_BACKCHAIN(%r1) # clear back chain</div><div class='add'>+	ahi	%r1,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='add'>+	mvc	STACK_FRAME_OVERHEAD(__PT_SIZE,%r1),0(%r11)</div><div class='add'>+	xc	__SF_BACKCHAIN(4,%r1),__SF_BACKCHAIN(%r1)</div><div class='add'>+	la	%r11,STACK_FRAME_OVERHEAD(%r15)</div><div class='ctx'> 	lr	%r15,%r1</div><div class='del'>-	stosm	__SF_EMPTY(%r15),0x04	# turn dat on</div><div class='add'>+	ssm	__LC_PGM_NEW_PSW	# turn dat on, keep irqs off</div><div class='ctx'> 	tm	__TI_flags+3(%r12),_TIF_MCCK_PENDING</div><div class='del'>-	bno	BASED(mcck_return)</div><div class='add'>+	jno	mcck_return</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='del'>-	l	%r1,BASED(.Ls390_handle_mcck)</div><div class='del'>-	basr	%r14,%r1		# call machine check handler</div><div class='add'>+	l	%r1,BASED(.Lhandle_mcck)</div><div class='add'>+	basr	%r14,%r1		# call s390_handle_mcck</div><div class='ctx'> 	TRACE_IRQS_ON</div><div class='ctx'> mcck_return:</div><div class='del'>-	mvc	__LC_RETURN_MCCK_PSW(8),SP_PSW(%r15) # move return PSW</div><div class='add'>+	mvc	__LC_RETURN_MCCK_PSW(8),__PT_PSW(%r11) # move return PSW</div><div class='ctx'> 	ni	__LC_RETURN_MCCK_PSW+1,0xfd # clear wait state bit</div><div class='ctx'> 	tm	__LC_RETURN_MCCK_PSW+1,0x01 # returning to user ?</div><div class='del'>-	bno	BASED(0f)</div><div class='del'>-	lm	%r0,%r15,SP_R0(%r15)	# load gprs 0-15</div><div class='add'>+	jno	0f</div><div class='add'>+	lm	%r0,%r15,__PT_R0(%r11)</div><div class='ctx'> 	stpt	__LC_EXIT_TIMER</div><div class='del'>-	lpsw	__LC_RETURN_MCCK_PSW	# back to caller</div><div class='del'>-0:	lm	%r0,%r15,SP_R0(%r15)	# load gprs 0-15</div><div class='del'>-	lpsw	__LC_RETURN_MCCK_PSW	# back to caller</div><div class='add'>+	lpsw	__LC_RETURN_MCCK_PSW</div><div class='add'>+0:	lm	%r0,%r15,__PT_R0(%r11)</div><div class='add'>+	lpsw	__LC_RETURN_MCCK_PSW</div><div class='ctx'> </div><div class='del'>-	RESTORE_ALL __LC_RETURN_MCCK_PSW,0</div><div class='add'>+mcck_panic:</div><div class='add'>+	l	%r14,__LC_PANIC_STACK</div><div class='add'>+	slr	%r14,%r15</div><div class='add'>+	sra	%r14,PAGE_SHIFT</div><div class='add'>+	jz	0f</div><div class='add'>+	l	%r15,__LC_PANIC_STACK</div><div class='add'>+0:	ahi	%r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='add'>+	j	mcck_skip</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Restart interruption handler, kick starter for additional CPUs</div><div class='hunk'>@@ -799,18 +703,18 @@ restart_base:</div><div class='ctx'> 	stck	__LC_LAST_UPDATE_CLOCK</div><div class='ctx'> 	mvc	__LC_LAST_UPDATE_TIMER(8),restart_vtime-restart_base(%r1)</div><div class='ctx'> 	mvc	__LC_EXIT_TIMER(8),restart_vtime-restart_base(%r1)</div><div class='del'>-	l	%r15,__LC_SAVE_AREA+60	# load ksp</div><div class='add'>+	l	%r15,__LC_GPREGS_SAVE_AREA+60 # load ksp</div><div class='ctx'> 	lctl	%c0,%c15,__LC_CREGS_SAVE_AREA # get new ctl regs</div><div class='ctx'> 	lam	%a0,%a15,__LC_AREGS_SAVE_AREA</div><div class='del'>-	lm	%r6,%r15,__SF_GPRS(%r15) # load registers from clone</div><div class='add'>+	lm	%r6,%r15,__SF_GPRS(%r15)# load registers from clone</div><div class='ctx'> 	l	%r1,__LC_THREAD_INFO</div><div class='ctx'> 	mvc	__LC_USER_TIMER(8),__TI_user_timer(%r1)</div><div class='ctx'> 	mvc	__LC_SYSTEM_TIMER(8),__TI_system_timer(%r1)</div><div class='ctx'> 	xc	__LC_STEAL_TIMER(8),__LC_STEAL_TIMER</div><div class='del'>-	stosm	__SF_EMPTY(%r15),0x04	# now we can turn dat on</div><div class='add'>+	ssm	__LC_PGM_NEW_PSW	# turn dat on, keep irqs off</div><div class='ctx'> 	basr	%r14,0</div><div class='ctx'> 	l	%r14,restart_addr-.(%r14)</div><div class='del'>-	basr	%r14,%r14		# branch to start_secondary</div><div class='add'>+	basr	%r14,%r14		# call start_secondary</div><div class='ctx'> restart_addr:</div><div class='ctx'> 	.long	start_secondary</div><div class='ctx'> 	.align	8</div><div class='hunk'>@@ -835,19 +739,19 @@ restart_go:</div><div class='ctx'> # PSW restart interrupt handler</div><div class='ctx'> #</div><div class='ctx'> ENTRY(psw_restart_int_handler)</div><div class='del'>-	st	%r15,__LC_SAVE_AREA+48(%r0)	# save r15</div><div class='add'>+	st	%r15,__LC_SAVE_AREA_RESTART</div><div class='ctx'> 	basr	%r15,0</div><div class='ctx'> 0:	l	%r15,.Lrestart_stack-0b(%r15)	# load restart stack</div><div class='ctx'> 	l	%r15,0(%r15)</div><div class='del'>-	ahi	%r15,-SP_SIZE			# make room for pt_regs</div><div class='del'>-	stm	%r0,%r14,SP_R0(%r15)		# store gprs %r0-%r14 to stack</div><div class='del'>-	mvc	SP_R15(4,%r15),__LC_SAVE_AREA+48(%r0)# store saved %r15 to stack</div><div class='del'>-	mvc	SP_PSW(8,%r15),__LC_RST_OLD_PSW(%r0) # store restart old psw</div><div class='del'>-	xc	__SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15) # set backchain to 0</div><div class='add'>+	ahi	%r15,-__PT_SIZE			# create pt_regs on stack</div><div class='add'>+	stm	%r0,%r14,__PT_R0(%r15)</div><div class='add'>+	mvc	__PT_R15(4,%r15),__LC_SAVE_AREA_RESTART</div><div class='add'>+	mvc	__PT_PSW(8,%r15),__LC_RST_OLD_PSW # store restart old psw</div><div class='add'>+	ahi	%r15,-STACK_FRAME_OVERHEAD</div><div class='add'>+	xc	__SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)</div><div class='ctx'> 	basr	%r14,0</div><div class='ctx'> 1:	l	%r14,.Ldo_restart-1b(%r14)</div><div class='ctx'> 	basr	%r14,%r14</div><div class='del'>-</div><div class='ctx'> 	basr	%r14,0				# load disabled wait PSW if</div><div class='ctx'> 2:	lpsw	restart_psw_crash-2b(%r14)	# do_restart returns</div><div class='ctx'> 	.align 4</div><div class='hunk'>@@ -869,215 +773,174 @@ restart_psw_crash:</div><div class='ctx'>  */</div><div class='ctx'> stack_overflow:</div><div class='ctx'> 	l	%r15,__LC_PANIC_STACK	# change to panic stack</div><div class='del'>-	sl	%r15,BASED(.Lc_spsize)</div><div class='del'>-	mvc	SP_PSW(8,%r15),0(%r12)	# move user PSW to stack</div><div class='del'>-	stm	%r0,%r11,SP_R0(%r15)	# store gprs %r0-%r11 to kernel stack</div><div class='del'>-	la	%r1,__LC_SAVE_AREA</div><div class='del'>-	ch	%r12,BASED(.L0x020)	# old psw addr == __LC_SVC_OLD_PSW ?</div><div class='del'>-	be	BASED(0f)</div><div class='del'>-	ch	%r12,BASED(.L0x028)	# old psw addr == __LC_PGM_OLD_PSW ?</div><div class='del'>-	be	BASED(0f)</div><div class='del'>-	la	%r1,__LC_SAVE_AREA+16</div><div class='del'>-0:	mvc	SP_R12(16,%r15),0(%r1)	# move %r12-%r15 to stack</div><div class='del'>-	xc	__SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15) # clear back chain</div><div class='del'>-	l	%r1,BASED(1f)		# branch to kernel_stack_overflow</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='del'>-	br	%r1</div><div class='add'>+	ahi	%r15,-__PT_SIZE		# create pt_regs</div><div class='add'>+	stm	%r0,%r7,__PT_R0(%r15)</div><div class='add'>+	stm	%r8,%r9,__PT_PSW(%r15)</div><div class='add'>+	mvc	__PT_R8(32,%r11),0(%r14)</div><div class='add'>+	lr	%r15,%r11</div><div class='add'>+	ahi	%r15,-STACK_FRAME_OVERHEAD</div><div class='add'>+	l	%r1,BASED(1f)</div><div class='add'>+	xc	__SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)</div><div class='add'>+	lr	%r2,%r11		# pass pointer to pt_regs</div><div class='add'>+	br	%r1			# branch to kernel_stack_overflow</div><div class='ctx'> 1:	.long	kernel_stack_overflow</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-cleanup_table_system_call:</div><div class='del'>-	.long	system_call + 0x80000000, sysc_do_svc + 0x80000000</div><div class='del'>-cleanup_table_sysc_tif:</div><div class='del'>-	.long	sysc_tif + 0x80000000, sysc_restore + 0x80000000</div><div class='del'>-cleanup_table_sysc_restore:</div><div class='del'>-	.long	sysc_restore + 0x80000000, sysc_done + 0x80000000</div><div class='del'>-cleanup_table_io_tif:</div><div class='del'>-	.long	io_tif + 0x80000000, io_restore + 0x80000000</div><div class='del'>-cleanup_table_io_restore:</div><div class='del'>-	.long	io_restore + 0x80000000, io_done + 0x80000000</div><div class='add'>+cleanup_table:</div><div class='add'>+	.long	system_call + 0x80000000</div><div class='add'>+	.long	sysc_do_svc + 0x80000000</div><div class='add'>+	.long	sysc_tif + 0x80000000</div><div class='add'>+	.long	sysc_restore + 0x80000000</div><div class='add'>+	.long	sysc_done + 0x80000000</div><div class='add'>+	.long	io_tif + 0x80000000</div><div class='add'>+	.long	io_restore + 0x80000000</div><div class='add'>+	.long	io_done + 0x80000000</div><div class='ctx'> </div><div class='ctx'> cleanup_critical:</div><div class='del'>-	clc	4(4,%r12),BASED(cleanup_table_system_call)</div><div class='del'>-	bl	BASED(0f)</div><div class='del'>-	clc	4(4,%r12),BASED(cleanup_table_system_call+4)</div><div class='del'>-	bl	BASED(cleanup_system_call)</div><div class='del'>-0:</div><div class='del'>-	clc	4(4,%r12),BASED(cleanup_table_sysc_tif)</div><div class='del'>-	bl	BASED(0f)</div><div class='del'>-	clc	4(4,%r12),BASED(cleanup_table_sysc_tif+4)</div><div class='del'>-	bl	BASED(cleanup_sysc_tif)</div><div class='del'>-0:</div><div class='del'>-	clc	4(4,%r12),BASED(cleanup_table_sysc_restore)</div><div class='del'>-	bl	BASED(0f)</div><div class='del'>-	clc	4(4,%r12),BASED(cleanup_table_sysc_restore+4)</div><div class='del'>-	bl	BASED(cleanup_sysc_restore)</div><div class='del'>-0:</div><div class='del'>-	clc	4(4,%r12),BASED(cleanup_table_io_tif)</div><div class='del'>-	bl	BASED(0f)</div><div class='del'>-	clc	4(4,%r12),BASED(cleanup_table_io_tif+4)</div><div class='del'>-	bl	BASED(cleanup_io_tif)</div><div class='del'>-0:</div><div class='del'>-	clc	4(4,%r12),BASED(cleanup_table_io_restore)</div><div class='del'>-	bl	BASED(0f)</div><div class='del'>-	clc	4(4,%r12),BASED(cleanup_table_io_restore+4)</div><div class='del'>-	bl	BASED(cleanup_io_restore)</div><div class='del'>-0:</div><div class='del'>-	br	%r14</div><div class='add'>+	cl	%r9,BASED(cleanup_table)	# system_call</div><div class='add'>+	jl	0f</div><div class='add'>+	cl	%r9,BASED(cleanup_table+4)	# sysc_do_svc</div><div class='add'>+	jl	cleanup_system_call</div><div class='add'>+	cl	%r9,BASED(cleanup_table+8)	# sysc_tif</div><div class='add'>+	jl	0f</div><div class='add'>+	cl	%r9,BASED(cleanup_table+12)	# sysc_restore</div><div class='add'>+	jl	cleanup_sysc_tif</div><div class='add'>+	cl	%r9,BASED(cleanup_table+16)	# sysc_done</div><div class='add'>+	jl	cleanup_sysc_restore</div><div class='add'>+	cl	%r9,BASED(cleanup_table+20)	# io_tif</div><div class='add'>+	jl	0f</div><div class='add'>+	cl	%r9,BASED(cleanup_table+24)	# io_restore</div><div class='add'>+	jl	cleanup_io_tif</div><div class='add'>+	cl	%r9,BASED(cleanup_table+28)	# io_done</div><div class='add'>+	jl	cleanup_io_restore</div><div class='add'>+0:	br	%r14</div><div class='ctx'> </div><div class='ctx'> cleanup_system_call:</div><div class='del'>-	mvc	__LC_RETURN_PSW(8),0(%r12)</div><div class='del'>-	clc	__LC_RETURN_PSW+4(4),BASED(cleanup_system_call_insn+4)</div><div class='del'>-	bh	BASED(0f)</div><div class='del'>-	mvc	__LC_SYNC_ENTER_TIMER(8),__LC_MCCK_ENTER_TIMER</div><div class='del'>-	c	%r12,BASED(.Lmck_old_psw)</div><div class='del'>-	be	BASED(0f)</div><div class='add'>+	# check if stpt has been executed</div><div class='add'>+	cl	%r9,BASED(cleanup_system_call_insn)</div><div class='add'>+	jh	0f</div><div class='ctx'> 	mvc	__LC_SYNC_ENTER_TIMER(8),__LC_ASYNC_ENTER_TIMER</div><div class='del'>-0:	c	%r12,BASED(.Lmck_old_psw)</div><div class='del'>-	la	%r12,__LC_SAVE_AREA+32</div><div class='del'>-	be	BASED(0f)</div><div class='del'>-	la	%r12,__LC_SAVE_AREA+16</div><div class='del'>-0:	clc	__LC_RETURN_PSW+4(4),BASED(cleanup_system_call_insn+8)</div><div class='del'>-	bhe	BASED(cleanup_vtime)</div><div class='del'>-	clc	__LC_RETURN_PSW+4(4),BASED(cleanup_system_call_insn)</div><div class='del'>-	bh	BASED(0f)</div><div class='del'>-	mvc	__LC_SAVE_AREA(16),0(%r12)</div><div class='del'>-0:	st	%r13,4(%r12)</div><div class='del'>-	l	%r15,__LC_KERNEL_STACK	# problem state -&gt; load ksp</div><div class='del'>-	s	%r15,BASED(.Lc_spsize)	# make room for registers &amp; psw</div><div class='del'>-	st	%r15,12(%r12)</div><div class='del'>-	CREATE_STACK_FRAME __LC_SAVE_AREA</div><div class='del'>-	mvc	0(4,%r12),__LC_THREAD_INFO</div><div class='del'>-	l	%r12,__LC_THREAD_INFO</div><div class='del'>-	mvc	SP_PSW(8,%r15),__LC_SVC_OLD_PSW</div><div class='del'>-	mvc	SP_SVC_CODE(4,%r15),__LC_SVC_ILC</div><div class='del'>-	oi	__TI_flags+3(%r12),_TIF_SYSCALL</div><div class='del'>-cleanup_vtime:</div><div class='del'>-	clc	__LC_RETURN_PSW+4(4),BASED(cleanup_system_call_insn+12)</div><div class='del'>-	bhe	BASED(cleanup_stime)</div><div class='del'>-	UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER</div><div class='del'>-cleanup_stime:</div><div class='del'>-	clc	__LC_RETURN_PSW+4(4),BASED(cleanup_system_call_insn+16)</div><div class='del'>-	bh	BASED(cleanup_update)</div><div class='del'>-	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER</div><div class='del'>-cleanup_update:</div><div class='add'>+	chi	%r11,__LC_SAVE_AREA_ASYNC</div><div class='add'>+	je	0f</div><div class='add'>+	mvc	__LC_SYNC_ENTER_TIMER(8),__LC_MCCK_ENTER_TIMER</div><div class='add'>+0:	# check if stm has been executed</div><div class='add'>+	cl	%r9,BASED(cleanup_system_call_insn+4)</div><div class='add'>+	jh	0f</div><div class='add'>+	mvc	__LC_SAVE_AREA_SYNC(32),0(%r11)</div><div class='add'>+0:	# set up saved registers r12, and r13</div><div class='add'>+	st	%r12,16(%r11)		# r12 thread-info pointer</div><div class='add'>+	st	%r13,20(%r11)		# r13 literal-pool pointer</div><div class='add'>+	# check if the user time calculation has been done</div><div class='add'>+	cl	%r9,BASED(cleanup_system_call_insn+8)</div><div class='add'>+	jh	0f</div><div class='add'>+	l	%r10,__LC_EXIT_TIMER</div><div class='add'>+	l	%r15,__LC_EXIT_TIMER+4</div><div class='add'>+	SUB64	%r10,%r15,__LC_SYNC_ENTER_TIMER</div><div class='add'>+	ADD64	%r10,%r15,__LC_USER_TIMER</div><div class='add'>+	st	%r10,__LC_USER_TIMER</div><div class='add'>+	st	%r15,__LC_USER_TIMER+4</div><div class='add'>+0:	# check if the system time calculation has been done</div><div class='add'>+	cl	%r9,BASED(cleanup_system_call_insn+12)</div><div class='add'>+	jh	0f</div><div class='add'>+	l	%r10,__LC_LAST_UPDATE_TIMER</div><div class='add'>+	l	%r15,__LC_LAST_UPDATE_TIMER+4</div><div class='add'>+	SUB64	%r10,%r15,__LC_EXIT_TIMER</div><div class='add'>+	ADD64	%r10,%r15,__LC_SYSTEM_TIMER</div><div class='add'>+	st	%r10,__LC_SYSTEM_TIMER</div><div class='add'>+	st	%r15,__LC_SYSTEM_TIMER+4</div><div class='add'>+0:	# update accounting time stamp</div><div class='ctx'> 	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER</div><div class='del'>-	mvc	__LC_RETURN_PSW+4(4),BASED(cleanup_table_system_call+4)</div><div class='del'>-	la	%r12,__LC_RETURN_PSW</div><div class='add'>+	# set up saved register 11</div><div class='add'>+	l	%r15,__LC_KERNEL_STACK</div><div class='add'>+	ahi	%r15,-__PT_SIZE</div><div class='add'>+	st	%r15,12(%r11)		# r11 pt_regs pointer</div><div class='add'>+	# fill pt_regs</div><div class='add'>+	mvc	__PT_R8(32,%r15),__LC_SAVE_AREA_SYNC</div><div class='add'>+	stm	%r0,%r7,__PT_R0(%r15)</div><div class='add'>+	mvc	__PT_PSW(8,%r15),__LC_SVC_OLD_PSW</div><div class='add'>+	mvc	__PT_INT_CODE(4,%r15),__LC_SVC_ILC</div><div class='add'>+	# setup saved register 15</div><div class='add'>+	ahi	%r15,-STACK_FRAME_OVERHEAD</div><div class='add'>+	st	%r15,28(%r11)		# r15 stack pointer</div><div class='add'>+	# set new psw address and exit</div><div class='add'>+	l	%r9,BASED(cleanup_table+4)	# sysc_do_svc + 0x80000000</div><div class='ctx'> 	br	%r14</div><div class='ctx'> cleanup_system_call_insn:</div><div class='del'>-	.long	sysc_saveall + 0x80000000</div><div class='ctx'> 	.long	system_call + 0x80000000</div><div class='del'>-	.long	sysc_vtime + 0x80000000</div><div class='del'>-	.long	sysc_stime + 0x80000000</div><div class='del'>-	.long	sysc_update + 0x80000000</div><div class='add'>+	.long	sysc_stm + 0x80000000</div><div class='add'>+	.long	sysc_vtime + 0x80000000 + 36</div><div class='add'>+	.long	sysc_vtime + 0x80000000 + 76</div><div class='ctx'> </div><div class='ctx'> cleanup_sysc_tif:</div><div class='del'>-	mvc	__LC_RETURN_PSW(4),0(%r12)</div><div class='del'>-	mvc	__LC_RETURN_PSW+4(4),BASED(cleanup_table_sysc_tif)</div><div class='del'>-	la	%r12,__LC_RETURN_PSW</div><div class='add'>+	l	%r9,BASED(cleanup_table+8)	# sysc_tif + 0x80000000</div><div class='ctx'> 	br	%r14</div><div class='ctx'> </div><div class='ctx'> cleanup_sysc_restore:</div><div class='del'>-	clc	4(4,%r12),BASED(cleanup_sysc_restore_insn)</div><div class='del'>-	be	BASED(2f)</div><div class='del'>-	mvc	__LC_EXIT_TIMER(8),__LC_MCCK_ENTER_TIMER</div><div class='del'>-	c	%r12,BASED(.Lmck_old_psw)</div><div class='del'>-	be	BASED(0f)</div><div class='del'>-	mvc	__LC_EXIT_TIMER(8),__LC_ASYNC_ENTER_TIMER</div><div class='del'>-0:	clc	4(4,%r12),BASED(cleanup_sysc_restore_insn+4)</div><div class='del'>-	be	BASED(2f)</div><div class='del'>-	mvc	__LC_RETURN_PSW(8),SP_PSW(%r15)</div><div class='del'>-	c	%r12,BASED(.Lmck_old_psw)</div><div class='del'>-	la	%r12,__LC_SAVE_AREA+32</div><div class='del'>-	be	BASED(1f)</div><div class='del'>-	la	%r12,__LC_SAVE_AREA+16</div><div class='del'>-1:	mvc	0(16,%r12),SP_R12(%r15)</div><div class='del'>-	lm	%r0,%r11,SP_R0(%r15)</div><div class='del'>-	l	%r15,SP_R15(%r15)</div><div class='del'>-2:	la	%r12,__LC_RETURN_PSW</div><div class='add'>+	cl	%r9,BASED(cleanup_sysc_restore_insn)</div><div class='add'>+	jhe	0f</div><div class='add'>+	l	%r9,12(%r11)		# get saved pointer to pt_regs</div><div class='add'>+	mvc	__LC_RETURN_PSW(8),__PT_PSW(%r9)</div><div class='add'>+	mvc	0(32,%r11),__PT_R8(%r9)</div><div class='add'>+	lm	%r0,%r7,__PT_R0(%r9)</div><div class='add'>+0:	lm	%r8,%r9,__LC_RETURN_PSW</div><div class='ctx'> 	br	%r14</div><div class='ctx'> cleanup_sysc_restore_insn:</div><div class='ctx'> 	.long	sysc_done - 4 + 0x80000000</div><div class='del'>-	.long	sysc_done - 8 + 0x80000000</div><div class='ctx'> </div><div class='ctx'> cleanup_io_tif:</div><div class='del'>-	mvc	__LC_RETURN_PSW(4),0(%r12)</div><div class='del'>-	mvc	__LC_RETURN_PSW+4(4),BASED(cleanup_table_io_tif)</div><div class='del'>-	la	%r12,__LC_RETURN_PSW</div><div class='add'>+	l	%r9,BASED(cleanup_table+20)	# io_tif + 0x80000000</div><div class='ctx'> 	br	%r14</div><div class='ctx'> </div><div class='ctx'> cleanup_io_restore:</div><div class='del'>-	clc	4(4,%r12),BASED(cleanup_io_restore_insn)</div><div class='del'>-	be	BASED(1f)</div><div class='del'>-	mvc	__LC_EXIT_TIMER(8),__LC_MCCK_ENTER_TIMER</div><div class='del'>-	clc	4(4,%r12),BASED(cleanup_io_restore_insn+4)</div><div class='del'>-	be	BASED(1f)</div><div class='del'>-	mvc	__LC_RETURN_PSW(8),SP_PSW(%r15)</div><div class='del'>-	mvc	__LC_SAVE_AREA+32(16),SP_R12(%r15)</div><div class='del'>-	lm	%r0,%r11,SP_R0(%r15)</div><div class='del'>-	l	%r15,SP_R15(%r15)</div><div class='del'>-1:	la	%r12,__LC_RETURN_PSW</div><div class='add'>+	cl	%r9,BASED(cleanup_io_restore_insn)</div><div class='add'>+	jhe	0f</div><div class='add'>+	l	%r9,12(%r11)		# get saved r11 pointer to pt_regs</div><div class='add'>+	mvc	__LC_RETURN_PSW(8),__PT_PSW(%r9)</div><div class='add'>+	ni	__LC_RETURN_PSW+1,0xfd	# clear wait state bit</div><div class='add'>+	mvc	0(32,%r11),__PT_R8(%r9)</div><div class='add'>+	lm	%r0,%r7,__PT_R0(%r9)</div><div class='add'>+0:	lm	%r8,%r9,__LC_RETURN_PSW</div><div class='ctx'> 	br	%r14</div><div class='ctx'> cleanup_io_restore_insn:</div><div class='ctx'> 	.long	io_done - 4 + 0x80000000</div><div class='del'>-	.long	io_done - 8 + 0x80000000</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Integer constants</div><div class='ctx'>  */</div><div class='del'>-		.align	4</div><div class='del'>-.Lc_spsize:	.long	SP_SIZE</div><div class='del'>-.Lc_overhead:	.long	STACK_FRAME_OVERHEAD</div><div class='del'>-.Lnr_syscalls:	.long	NR_syscalls</div><div class='del'>-.L0x018:	.short	0x018</div><div class='del'>-.L0x020:	.short	0x020</div><div class='del'>-.L0x028:	.short	0x028</div><div class='del'>-.L0x030:	.short	0x030</div><div class='del'>-.L0x038:	.short	0x038</div><div class='del'>-.Lc_1:		.long	1</div><div class='add'>+	.align	4</div><div class='add'>+.Lnr_syscalls:		.long	NR_syscalls</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Symbol constants</div><div class='ctx'>  */</div><div class='del'>-.Ls390_mcck:	.long	s390_do_machine_check</div><div class='del'>-.Ls390_handle_mcck:</div><div class='del'>-		.long	s390_handle_mcck</div><div class='del'>-.Lmck_old_psw:	.long	__LC_MCK_OLD_PSW</div><div class='del'>-.Ldo_IRQ:	.long	do_IRQ</div><div class='del'>-.Ldo_extint:	.long	do_extint</div><div class='del'>-.Ldo_signal:	.long	do_signal</div><div class='del'>-.Ldo_notify_resume:</div><div class='del'>-		.long	do_notify_resume</div><div class='del'>-.Lhandle_per:	.long	do_per_trap</div><div class='del'>-.Ldo_execve:	.long	do_execve</div><div class='del'>-.Lexecve_tail:	.long	execve_tail</div><div class='del'>-.Ljump_table:	.long	pgm_check_table</div><div class='del'>-.Lschedule:	.long	schedule</div><div class='add'>+.Ldo_machine_check:	.long	s390_do_machine_check</div><div class='add'>+.Lhandle_mcck:		.long	s390_handle_mcck</div><div class='add'>+.Ldo_IRQ:		.long	do_IRQ</div><div class='add'>+.Ldo_extint:		.long	do_extint</div><div class='add'>+.Ldo_signal:		.long	do_signal</div><div class='add'>+.Ldo_notify_resume:	.long	do_notify_resume</div><div class='add'>+.Ldo_per_trap:		.long	do_per_trap</div><div class='add'>+.Ldo_execve:		.long	do_execve</div><div class='add'>+.Lexecve_tail:		.long	execve_tail</div><div class='add'>+.Ljump_table:		.long	pgm_check_table</div><div class='add'>+.Lschedule:		.long	schedule</div><div class='ctx'> #ifdef CONFIG_PREEMPT</div><div class='del'>-.Lpreempt_schedule_irq:</div><div class='del'>-		.long	preempt_schedule_irq</div><div class='add'>+.Lpreempt_irq:		.long	preempt_schedule_irq</div><div class='ctx'> #endif</div><div class='del'>-.Ltrace_entry:	.long	do_syscall_trace_enter</div><div class='del'>-.Ltrace_exit:	.long	do_syscall_trace_exit</div><div class='del'>-.Lschedtail:	.long	schedule_tail</div><div class='del'>-.Lsysc_table:	.long	sys_call_table</div><div class='add'>+.Ltrace_enter:		.long	do_syscall_trace_enter</div><div class='add'>+.Ltrace_exit:		.long	do_syscall_trace_exit</div><div class='add'>+.Lschedule_tail:	.long	schedule_tail</div><div class='add'>+.Lsys_call_table:	.long	sys_call_table</div><div class='add'>+.Lsysc_per:		.long	sysc_per + 0x80000000</div><div class='ctx'> #ifdef CONFIG_TRACE_IRQFLAGS</div><div class='del'>-.Ltrace_irq_on_caller:</div><div class='del'>-		.long	trace_hardirqs_on_caller</div><div class='del'>-.Ltrace_irq_off_caller:</div><div class='del'>-		.long	trace_hardirqs_off_caller</div><div class='add'>+.Lhardirqs_on:		.long	trace_hardirqs_on_caller</div><div class='add'>+.Lhardirqs_off:		.long	trace_hardirqs_off_caller</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_LOCKDEP</div><div class='del'>-.Llockdep_sys_exit:</div><div class='del'>-		.long	lockdep_sys_exit</div><div class='add'>+.Llockdep_sys_exit:	.long	lockdep_sys_exit</div><div class='ctx'> #endif</div><div class='del'>-.Lcritical_start:</div><div class='del'>-		.long	__critical_start + 0x80000000</div><div class='del'>-.Lcritical_end:</div><div class='del'>-		.long	__critical_end + 0x80000000</div><div class='del'>-.Lcleanup_critical:</div><div class='del'>-		.long	cleanup_critical</div><div class='add'>+.Lcritical_start:	.long	__critical_start + 0x80000000</div><div class='add'>+.Lcritical_length:	.long	__critical_end - __critical_start</div><div class='ctx'> </div><div class='ctx'> 		.section .rodata, "a"</div><div class='ctx'> #define SYSCALL(esa,esame,emu)	.long esa</div><div class='head'>diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h<br/>index ef8fb1d6e8d7..bf538aaf407d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/entry.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/entry.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/entry.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/entry.h</a></div><div class='hunk'>@@ -6,15 +6,15 @@</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-extern void (*pgm_check_table[128])(struct pt_regs *, long, unsigned long);</div><div class='add'>+extern void (*pgm_check_table[128])(struct pt_regs *);</div><div class='ctx'> extern void *restart_stack;</div><div class='ctx'> </div><div class='ctx'> asmlinkage long do_syscall_trace_enter(struct pt_regs *regs);</div><div class='ctx'> asmlinkage void do_syscall_trace_exit(struct pt_regs *regs);</div><div class='ctx'> </div><div class='del'>-void do_protection_exception(struct pt_regs *, long, unsigned long);</div><div class='del'>-void do_dat_exception(struct pt_regs *, long, unsigned long);</div><div class='del'>-void do_asce_exception(struct pt_regs *, long, unsigned long);</div><div class='add'>+void do_protection_exception(struct pt_regs *regs);</div><div class='add'>+void do_dat_exception(struct pt_regs *regs);</div><div class='add'>+void do_asce_exception(struct pt_regs *regs);</div><div class='ctx'> </div><div class='ctx'> void do_per_trap(struct pt_regs *regs);</div><div class='ctx'> void syscall_trace(struct pt_regs *regs, int entryexit);</div><div class='hunk'>@@ -28,7 +28,7 @@ void do_extint(struct pt_regs *regs, unsigned int, unsigned int, unsigned long);</div><div class='ctx'> void do_restart(void);</div><div class='ctx'> int __cpuinit start_secondary(void *cpuvoid);</div><div class='ctx'> void __init startup_init(void);</div><div class='del'>-void die(const char * str, struct pt_regs * regs, long err);</div><div class='add'>+void die(struct pt_regs *regs, const char *str);</div><div class='ctx'> </div><div class='ctx'> void __init time_init(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S<br/>index 83a93747e2fd..412a7b8783d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/entry64.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/entry64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/entry64.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/entry64.S</a></div><div class='hunk'>@@ -19,32 +19,22 @@</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Stack layout for the system_call stack entry.</div><div class='del'>- * The first few entries are identical to the user_regs_struct.</div><div class='del'>- */</div><div class='del'>-SP_PTREGS    =	STACK_FRAME_OVERHEAD</div><div class='del'>-SP_ARGS      =	STACK_FRAME_OVERHEAD + __PT_ARGS</div><div class='del'>-SP_PSW	     =	STACK_FRAME_OVERHEAD + __PT_PSW</div><div class='del'>-SP_R0	     =	STACK_FRAME_OVERHEAD + __PT_GPRS</div><div class='del'>-SP_R1	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 8</div><div class='del'>-SP_R2	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 16</div><div class='del'>-SP_R3	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 24</div><div class='del'>-SP_R4	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 32</div><div class='del'>-SP_R5	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 40</div><div class='del'>-SP_R6	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 48</div><div class='del'>-SP_R7	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 56</div><div class='del'>-SP_R8	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 64</div><div class='del'>-SP_R9	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 72</div><div class='del'>-SP_R10	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 80</div><div class='del'>-SP_R11	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 88</div><div class='del'>-SP_R12	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 96</div><div class='del'>-SP_R13	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 104</div><div class='del'>-SP_R14	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 112</div><div class='del'>-SP_R15	     =	STACK_FRAME_OVERHEAD + __PT_GPRS + 120</div><div class='del'>-SP_ORIG_R2   =	STACK_FRAME_OVERHEAD + __PT_ORIG_GPR2</div><div class='del'>-SP_SVC_CODE  =	STACK_FRAME_OVERHEAD + __PT_SVC_CODE</div><div class='del'>-SP_SIZE      =	STACK_FRAME_OVERHEAD + __PT_SIZE</div><div class='add'>+__PT_R0      =	__PT_GPRS</div><div class='add'>+__PT_R1      =	__PT_GPRS + 8</div><div class='add'>+__PT_R2      =	__PT_GPRS + 16</div><div class='add'>+__PT_R3      =	__PT_GPRS + 24</div><div class='add'>+__PT_R4      =	__PT_GPRS + 32</div><div class='add'>+__PT_R5      =	__PT_GPRS + 40</div><div class='add'>+__PT_R6      =	__PT_GPRS + 48</div><div class='add'>+__PT_R7      =	__PT_GPRS + 56</div><div class='add'>+__PT_R8      =	__PT_GPRS + 64</div><div class='add'>+__PT_R9      =	__PT_GPRS + 72</div><div class='add'>+__PT_R10     =	__PT_GPRS + 80</div><div class='add'>+__PT_R11     =	__PT_GPRS + 88</div><div class='add'>+__PT_R12     =	__PT_GPRS + 96</div><div class='add'>+__PT_R13     =	__PT_GPRS + 104</div><div class='add'>+__PT_R14     =	__PT_GPRS + 112</div><div class='add'>+__PT_R15     =	__PT_GPRS + 120</div><div class='ctx'> </div><div class='ctx'> STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER</div><div class='ctx'> STACK_SIZE  = 1 &lt;&lt; STACK_SHIFT</div><div class='hunk'>@@ -59,154 +49,103 @@ _TIF_EXIT_SIE = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_MCCK_PENDING)</div><div class='ctx'> </div><div class='ctx'> #define BASED(name) name-system_call(%r13)</div><div class='ctx'> </div><div class='del'>-	.macro SPP newpp</div><div class='del'>-#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)</div><div class='del'>-	tm	__LC_MACHINE_FLAGS+6,0x20	# MACHINE_FLAG_SPP</div><div class='del'>-	jz	.+8</div><div class='del'>-	.insn	s,0xb2800000,\newpp</div><div class='del'>-#endif</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro	HANDLE_SIE_INTERCEPT</div><div class='del'>-#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)</div><div class='del'>-	tm	__TI_flags+6(%r12),_TIF_SIE&gt;&gt;8</div><div class='del'>-	jz	0f</div><div class='del'>-	SPP	__LC_CMF_HPP			# set host id</div><div class='del'>-	clc	SP_PSW+8(8,%r15),BASED(.Lsie_loop)</div><div class='del'>-	jl	0f</div><div class='del'>-	clc	SP_PSW+8(8,%r15),BASED(.Lsie_done)</div><div class='del'>-	jhe	0f</div><div class='del'>-	mvc	SP_PSW+8(8,%r15),BASED(.Lsie_loop)</div><div class='del'>-0:</div><div class='del'>-#endif</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='ctx'> 	.macro	TRACE_IRQS_ON</div><div class='add'>+#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='ctx'> 	basr	%r2,%r0</div><div class='ctx'> 	brasl	%r14,trace_hardirqs_on_caller</div><div class='add'>+#endif</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro	TRACE_IRQS_OFF</div><div class='add'>+#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='ctx'> 	basr	%r2,%r0</div><div class='ctx'> 	brasl	%r14,trace_hardirqs_off_caller</div><div class='del'>-	.endm</div><div class='del'>-#else</div><div class='del'>-#define TRACE_IRQS_ON</div><div class='del'>-#define TRACE_IRQS_OFF</div><div class='ctx'> #endif</div><div class='add'>+	.endm</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_LOCKDEP</div><div class='ctx'> 	.macro	LOCKDEP_SYS_EXIT</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# returning to user ?</div><div class='del'>-	jz	0f</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+	tm	__PT_PSW+1(%r11),0x01	# returning to user ?</div><div class='add'>+	jz	.+10</div><div class='ctx'> 	brasl	%r14,lockdep_sys_exit</div><div class='del'>-0:</div><div class='del'>-	.endm</div><div class='del'>-#else</div><div class='del'>-#define LOCKDEP_SYS_EXIT</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-	.macro	UPDATE_VTIME lc_from,lc_to,lc_sum</div><div class='del'>-	lg	%r10,\lc_from</div><div class='del'>-	slg	%r10,\lc_to</div><div class='del'>-	alg	%r10,\lc_sum</div><div class='del'>-	stg	%r10,\lc_sum</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Register usage in interrupt handlers:</div><div class='del'>- *    R9  - pointer to current task structure</div><div class='del'>- *    R13 - pointer to literal pool</div><div class='del'>- *    R14 - return register for function calls</div><div class='del'>- *    R15 - kernel stack pointer</div><div class='del'>- */</div><div class='add'>+	.macro SPP newpp</div><div class='add'>+#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)</div><div class='add'>+	tm	__LC_MACHINE_FLAGS+6,0x20	# MACHINE_FLAG_SPP</div><div class='add'>+	jz	.+8</div><div class='add'>+	.insn	s,0xb2800000,\newpp</div><div class='add'>+#endif</div><div class='add'>+	.endm</div><div class='ctx'> </div><div class='del'>-	.macro	SAVE_ALL_SVC psworg,savearea</div><div class='del'>-	stmg	%r11,%r15,\savearea</div><div class='del'>-	lg	%r15,__LC_KERNEL_STACK	# problem state -&gt; load ksp</div><div class='del'>-	aghi	%r15,-SP_SIZE		# make room for registers &amp; psw</div><div class='del'>-	lg	%r11,__LC_LAST_BREAK</div><div class='add'>+	.macro	HANDLE_SIE_INTERCEPT scratch</div><div class='add'>+#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)</div><div class='add'>+	tm	__TI_flags+6(%r12),_TIF_SIE&gt;&gt;8</div><div class='add'>+	jz	.+42</div><div class='add'>+	tm	__LC_MACHINE_FLAGS+6,0x20	# MACHINE_FLAG_SPP</div><div class='add'>+	jz	.+8</div><div class='add'>+	.insn	s,0xb2800000,BASED(.Lhost_id)	# set host id</div><div class='add'>+	lgr	\scratch,%r9</div><div class='add'>+	slg	\scratch,BASED(.Lsie_loop)</div><div class='add'>+	clg	\scratch,BASED(.Lsie_length)</div><div class='add'>+	jhe	.+10</div><div class='add'>+	lg	%r9,BASED(.Lsie_loop)</div><div class='add'>+#endif</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro	SAVE_ALL_PGM psworg,savearea</div><div class='del'>-	stmg	%r11,%r15,\savearea</div><div class='del'>-	tm	\psworg+1,0x01		# test problem state bit</div><div class='add'>+	.macro	CHECK_STACK stacksize,savearea</div><div class='ctx'> #ifdef CONFIG_CHECK_STACK</div><div class='del'>-	jnz	1f</div><div class='del'>-	tml	%r15,STACK_SIZE - CONFIG_STACK_GUARD</div><div class='del'>-	jnz	2f</div><div class='del'>-	la	%r12,\psworg</div><div class='del'>-	j	stack_overflow</div><div class='del'>-#else</div><div class='del'>-	jz	2f</div><div class='add'>+	tml	%r15,\stacksize - CONFIG_STACK_GUARD</div><div class='add'>+	lghi	%r14,\savearea</div><div class='add'>+	jz	stack_overflow</div><div class='ctx'> #endif</div><div class='del'>-1:	lg	%r15,__LC_KERNEL_STACK	# problem state -&gt; load ksp</div><div class='del'>-2:	aghi	%r15,-SP_SIZE		# make room for registers &amp; psw</div><div class='del'>-	larl	%r13,system_call</div><div class='del'>-	lg	%r11,__LC_LAST_BREAK</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro	SAVE_ALL_ASYNC psworg,savearea</div><div class='del'>-	stmg	%r11,%r15,\savearea</div><div class='del'>-	larl	%r13,system_call</div><div class='del'>-	lg	%r11,__LC_LAST_BREAK</div><div class='del'>-	la	%r12,\psworg</div><div class='del'>-	tm	\psworg+1,0x01		# test problem state bit</div><div class='del'>-	jnz	1f			# from user -&gt; load kernel stack</div><div class='del'>-	clc	\psworg+8(8),BASED(.Lcritical_end)</div><div class='add'>+	.macro	SWITCH_ASYNC savearea,stack,shift</div><div class='add'>+	tmhh	%r8,0x0001		# interrupting from user ?</div><div class='add'>+	jnz	1f</div><div class='add'>+	lgr	%r14,%r9</div><div class='add'>+	slg	%r14,BASED(.Lcritical_start)</div><div class='add'>+	clg	%r14,BASED(.Lcritical_length)</div><div class='ctx'> 	jhe	0f</div><div class='del'>-	clc	\psworg+8(8),BASED(.Lcritical_start)</div><div class='del'>-	jl	0f</div><div class='add'>+	lghi	%r11,\savearea		# inside critical section, do cleanup</div><div class='ctx'> 	brasl	%r14,cleanup_critical</div><div class='del'>-	tm	1(%r12),0x01		# retest problem state after cleanup</div><div class='add'>+	tmhh	%r8,0x0001		# retest problem state after cleanup</div><div class='ctx'> 	jnz	1f</div><div class='del'>-0:	lg	%r14,__LC_ASYNC_STACK	# are we already on the async. stack ?</div><div class='add'>+0:	lg	%r14,\stack		# are we already on the target stack?</div><div class='ctx'> 	slgr	%r14,%r15</div><div class='del'>-	srag	%r14,%r14,STACK_SHIFT</div><div class='del'>-#ifdef CONFIG_CHECK_STACK</div><div class='add'>+	srag	%r14,%r14,\shift</div><div class='ctx'> 	jnz	1f</div><div class='del'>-	tml	%r15,STACK_SIZE - CONFIG_STACK_GUARD</div><div class='del'>-	jnz	2f</div><div class='del'>-	j	stack_overflow</div><div class='del'>-#else</div><div class='del'>-	jz	2f</div><div class='del'>-#endif</div><div class='del'>-1:	lg	%r15,__LC_ASYNC_STACK	# load async stack</div><div class='del'>-2:	aghi	%r15,-SP_SIZE		# make room for registers &amp; psw</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro	CREATE_STACK_FRAME savearea</div><div class='del'>-	xc	__SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)</div><div class='del'>-	stg	%r2,SP_ORIG_R2(%r15)	# store original content of gpr 2</div><div class='del'>-	mvc	SP_R11(40,%r15),\savearea # move %r11-%r15 to stack</div><div class='del'>-	stmg	%r0,%r10,SP_R0(%r15)	# store gprs %r0-%r10 to kernel stack</div><div class='add'>+	CHECK_STACK 1&lt;&lt;\shift,\savearea</div><div class='add'>+	j	2f</div><div class='add'>+1:	lg	%r15,\stack		# load target stack</div><div class='add'>+2:	aghi	%r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='add'>+	la	%r11,STACK_FRAME_OVERHEAD(%r15)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro	RESTORE_ALL psworg,sync</div><div class='del'>-	mvc	\psworg(16),SP_PSW(%r15) # move user PSW to lowcore</div><div class='del'>-	.if !\sync</div><div class='del'>-	ni	\psworg+1,0xfd		# clear wait state bit</div><div class='del'>-	.endif</div><div class='del'>-	lg	%r14,__LC_VDSO_PER_CPU</div><div class='del'>-	lmg	%r0,%r13,SP_R0(%r15)	# load gprs 0-13 of user</div><div class='del'>-	stpt	__LC_EXIT_TIMER</div><div class='del'>-	mvc	__VDSO_ECTG_BASE(16,%r14),__LC_EXIT_TIMER</div><div class='del'>-	lmg	%r14,%r15,SP_R14(%r15)	# load grps 14-15 of user</div><div class='del'>-	lpswe	\psworg			# back to caller</div><div class='add'>+	.macro UPDATE_VTIME scratch,enter_timer</div><div class='add'>+	lg	\scratch,__LC_EXIT_TIMER</div><div class='add'>+	slg	\scratch,\enter_timer</div><div class='add'>+	alg	\scratch,__LC_USER_TIMER</div><div class='add'>+	stg	\scratch,__LC_USER_TIMER</div><div class='add'>+	lg	\scratch,__LC_LAST_UPDATE_TIMER</div><div class='add'>+	slg	\scratch,__LC_EXIT_TIMER</div><div class='add'>+	alg	\scratch,__LC_SYSTEM_TIMER</div><div class='add'>+	stg	\scratch,__LC_SYSTEM_TIMER</div><div class='add'>+	mvc	__LC_LAST_UPDATE_TIMER(8),\enter_timer</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro	LAST_BREAK</div><div class='del'>-	srag	%r10,%r11,23</div><div class='del'>-	jz	0f</div><div class='del'>-	stg	%r11,__TI_last_break(%r12)</div><div class='del'>-0:</div><div class='add'>+	.macro	LAST_BREAK scratch</div><div class='add'>+	srag	\scratch,%r10,23</div><div class='add'>+	jz	.+10</div><div class='add'>+	stg	%r10,__TI_last_break(%r12)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro REENABLE_IRQS</div><div class='del'>-	mvc	__SF_EMPTY(1,%r15),SP_PSW(%r15)</div><div class='del'>-	ni	__SF_EMPTY(%r15),0xbf</div><div class='del'>-	ssm	__SF_EMPTY(%r15)</div><div class='add'>+	stg	%r8,__LC_RETURN_PSW</div><div class='add'>+	ni	__LC_RETURN_PSW,0xbf</div><div class='add'>+	ssm	__LC_RETURN_PSW</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.section .kprobes.text, "ax"</div><div class='hunk'>@@ -245,55 +184,66 @@ __critical_start:</div><div class='ctx'> </div><div class='ctx'> ENTRY(system_call)</div><div class='ctx'> 	stpt	__LC_SYNC_ENTER_TIMER</div><div class='del'>-sysc_saveall:</div><div class='del'>-	SAVE_ALL_SVC __LC_SVC_OLD_PSW,__LC_SAVE_AREA</div><div class='del'>-	CREATE_STACK_FRAME __LC_SAVE_AREA</div><div class='del'>-	lg	%r12,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='del'>-	mvc	SP_PSW(16,%r15),__LC_SVC_OLD_PSW</div><div class='del'>-	mvc	SP_SVC_CODE(4,%r15),__LC_SVC_ILC</div><div class='del'>-	oi	__TI_flags+7(%r12),_TIF_SYSCALL</div><div class='add'>+sysc_stmg:</div><div class='add'>+	stmg	%r8,%r15,__LC_SAVE_AREA_SYNC</div><div class='add'>+	lg	%r10,__LC_LAST_BREAK</div><div class='add'>+	lg	%r12,__LC_THREAD_INFO</div><div class='add'>+	larl	%r13,system_call</div><div class='add'>+sysc_per:</div><div class='add'>+	lg	%r15,__LC_KERNEL_STACK</div><div class='add'>+	aghi	%r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='add'>+	la	%r11,STACK_FRAME_OVERHEAD(%r15)	# pointer to pt_regs</div><div class='ctx'> sysc_vtime:</div><div class='del'>-	UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER</div><div class='del'>-sysc_stime:</div><div class='del'>-	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER</div><div class='del'>-sysc_update:</div><div class='del'>-	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER</div><div class='del'>-	LAST_BREAK</div><div class='add'>+	UPDATE_VTIME %r13,__LC_SYNC_ENTER_TIMER</div><div class='add'>+	LAST_BREAK %r13</div><div class='add'>+	stmg	%r0,%r7,__PT_R0(%r11)</div><div class='add'>+	mvc	__PT_R8(64,%r11),__LC_SAVE_AREA_SYNC</div><div class='add'>+	mvc	__PT_PSW(16,%r11),__LC_SVC_OLD_PSW</div><div class='add'>+	mvc	__PT_INT_CODE(4,%r11),__LC_SVC_ILC</div><div class='ctx'> sysc_do_svc:</div><div class='del'>-	llgh	%r7,SP_SVC_CODE+2(%r15)</div><div class='del'>-	slag	%r7,%r7,2	# shift and test for svc 0</div><div class='add'>+	oi	__TI_flags+7(%r12),_TIF_SYSCALL</div><div class='add'>+	llgh	%r8,__PT_INT_CODE+2(%r11)</div><div class='add'>+	slag	%r8,%r8,2			# shift and test for svc 0</div><div class='ctx'> 	jnz	sysc_nr_ok</div><div class='ctx'> 	# svc 0: system call number in %r1</div><div class='del'>-	llgfr	%r1,%r1		# clear high word in r1</div><div class='add'>+	llgfr	%r1,%r1				# clear high word in r1</div><div class='ctx'> 	cghi	%r1,NR_syscalls</div><div class='ctx'> 	jnl	sysc_nr_ok</div><div class='del'>-	sth	%r1,SP_SVC_CODE+2(%r15)</div><div class='del'>-	slag	%r7,%r1,2	# shift and test for svc 0</div><div class='add'>+	sth	%r1,__PT_INT_CODE+2(%r11)</div><div class='add'>+	slag	%r8,%r1,2</div><div class='ctx'> sysc_nr_ok:</div><div class='del'>-	larl	%r10,sys_call_table</div><div class='add'>+	larl	%r10,sys_call_table		# 64 bit system call table</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-	tm	__TI_flags+5(%r12),(_TIF_31BIT&gt;&gt;16)  # running in 31 bit mode ?</div><div class='add'>+	tm	__TI_flags+5(%r12),(_TIF_31BIT&gt;&gt;16)</div><div class='ctx'> 	jno	sysc_noemu</div><div class='del'>-	larl	%r10,sys_call_table_emu  # use 31 bit emulation system calls</div><div class='add'>+	larl	%r10,sys_call_table_emu		# 31 bit system call table</div><div class='ctx'> sysc_noemu:</div><div class='ctx'> #endif</div><div class='add'>+	xc	__SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)</div><div class='add'>+	stg	%r2,__PT_ORIG_GPR2(%r11)</div><div class='add'>+	stg	%r7,STACK_FRAME_OVERHEAD(%r15)</div><div class='add'>+	lgf	%r9,0(%r8,%r10)			# get system call add.</div><div class='ctx'> 	tm	__TI_flags+6(%r12),_TIF_TRACE &gt;&gt; 8</div><div class='del'>-	mvc	SP_ARGS(8,%r15),SP_R7(%r15)</div><div class='del'>-	lgf	%r8,0(%r7,%r10) # load address of system call routine</div><div class='ctx'> 	jnz	sysc_tracesys</div><div class='del'>-	basr	%r14,%r8	# call sys_xxxx</div><div class='del'>-	stg	%r2,SP_R2(%r15) # store return value (change R2 on stack)</div><div class='add'>+	basr	%r14,%r9			# call sys_xxxx</div><div class='add'>+	stg	%r2,__PT_R2(%r11)		# store return value</div><div class='ctx'> </div><div class='ctx'> sysc_return:</div><div class='ctx'> 	LOCKDEP_SYS_EXIT</div><div class='ctx'> sysc_tif:</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# returning to user ?</div><div class='add'>+	tm	__PT_PSW+1(%r11),0x01		# returning to user ?</div><div class='ctx'> 	jno	sysc_restore</div><div class='ctx'> 	tm	__TI_flags+7(%r12),_TIF_WORK_SVC</div><div class='del'>-	jnz	sysc_work	# there is work to do (signals etc.)</div><div class='add'>+	jnz	sysc_work			# check for work</div><div class='ctx'> 	ni	__TI_flags+7(%r12),255-_TIF_SYSCALL</div><div class='ctx'> sysc_restore:</div><div class='del'>-	RESTORE_ALL __LC_RETURN_PSW,1</div><div class='add'>+	lg	%r14,__LC_VDSO_PER_CPU</div><div class='add'>+	lmg	%r0,%r10,__PT_R0(%r11)</div><div class='add'>+	mvc	__LC_RETURN_PSW(16),__PT_PSW(%r11)</div><div class='add'>+	stpt	__LC_EXIT_TIMER</div><div class='add'>+	mvc	__VDSO_ECTG_BASE(16,%r14),__LC_EXIT_TIMER</div><div class='add'>+	lmg	%r11,%r15,__PT_R11(%r11)</div><div class='add'>+	lpswe	__LC_RETURN_PSW</div><div class='ctx'> sysc_done:</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -317,7 +267,7 @@ sysc_work:</div><div class='ctx'> #</div><div class='ctx'> sysc_reschedule:</div><div class='ctx'> 	larl	%r14,sysc_return</div><div class='del'>-	jg	schedule		# return point is sysc_return</div><div class='add'>+	jg	schedule</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # _TIF_MCCK_PENDING is set, call handler</div><div class='hunk'>@@ -331,33 +281,33 @@ sysc_mcck_pending:</div><div class='ctx'> #</div><div class='ctx'> sysc_sigpending:</div><div class='ctx'> 	ni	__TI_flags+7(%r12),255-_TIF_PER_TRAP # clear TIF_PER_TRAP</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='del'>-	brasl	%r14,do_signal		# call do_signal</div><div class='add'>+	lgr	%r2,%r11		# pass pointer to pt_regs</div><div class='add'>+	brasl	%r14,do_signal</div><div class='ctx'> 	tm	__TI_flags+7(%r12),_TIF_SYSCALL</div><div class='ctx'> 	jno	sysc_return</div><div class='del'>-	lmg	%r2,%r6,SP_R2(%r15)	# load svc arguments</div><div class='del'>-	lghi	%r7,0			# svc 0 returns -ENOSYS</div><div class='del'>-	lh	%r1,SP_SVC_CODE+2(%r15)	# load new svc number</div><div class='add'>+	lmg	%r2,%r7,__PT_R2(%r11)	# load svc arguments</div><div class='add'>+	lghi	%r8,0			# svc 0 returns -ENOSYS</div><div class='add'>+	lh	%r1,__PT_INT_CODE+2(%r11)	# load new svc number</div><div class='ctx'> 	cghi	%r1,NR_syscalls</div><div class='ctx'> 	jnl	sysc_nr_ok		# invalid svc number -&gt; do svc 0</div><div class='del'>-	slag	%r7,%r1,2</div><div class='add'>+	slag	%r8,%r1,2</div><div class='ctx'> 	j	sysc_nr_ok		# restart svc</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # _TIF_NOTIFY_RESUME is set, call do_notify_resume</div><div class='ctx'> #</div><div class='ctx'> sysc_notify_resume:</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='add'>+	lgr	%r2,%r11		# pass pointer to pt_regs</div><div class='ctx'> 	larl	%r14,sysc_return</div><div class='del'>-	jg	do_notify_resume	# call do_notify_resume</div><div class='add'>+	jg	do_notify_resume</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # _TIF_PER_TRAP is set, call do_per_trap</div><div class='ctx'> #</div><div class='ctx'> sysc_singlestep:</div><div class='ctx'> 	ni	__TI_flags+7(%r12),255-(_TIF_SYSCALL | _TIF_PER_TRAP)</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# address of register-save area</div><div class='del'>-	larl	%r14,sysc_return	# load adr. of system return</div><div class='add'>+	lgr	%r2,%r11		# pass pointer to pt_regs</div><div class='add'>+	larl	%r14,sysc_return</div><div class='ctx'> 	jg	do_per_trap</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -365,41 +315,41 @@ sysc_singlestep:</div><div class='ctx'> # and after the system call</div><div class='ctx'> #</div><div class='ctx'> sysc_tracesys:</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='add'>+	lgr	%r2,%r11		# pass pointer to pt_regs</div><div class='ctx'> 	la	%r3,0</div><div class='del'>-	llgh	%r0,SP_SVC_CODE+2(%r15)</div><div class='del'>-	stg	%r0,SP_R2(%r15)</div><div class='add'>+	llgh	%r0,__PT_INT_CODE+2(%r11)</div><div class='add'>+	stg	%r0,__PT_R2(%r11)</div><div class='ctx'> 	brasl	%r14,do_syscall_trace_enter</div><div class='ctx'> 	lghi	%r0,NR_syscalls</div><div class='ctx'> 	clgr	%r0,%r2</div><div class='ctx'> 	jnh	sysc_tracenogo</div><div class='del'>-	sllg	%r7,%r2,2		# svc number *4</div><div class='del'>-	lgf	%r8,0(%r7,%r10)</div><div class='add'>+	sllg	%r8,%r2,2</div><div class='add'>+	lgf	%r9,0(%r8,%r10)</div><div class='ctx'> sysc_tracego:</div><div class='del'>-	lmg	%r3,%r6,SP_R3(%r15)</div><div class='del'>-	mvc	SP_ARGS(8,%r15),SP_R7(%r15)</div><div class='del'>-	lg	%r2,SP_ORIG_R2(%r15)</div><div class='del'>-	basr	%r14,%r8		# call sys_xxx</div><div class='del'>-	stg	%r2,SP_R2(%r15)		# store return value</div><div class='add'>+	lmg	%r3,%r7,__PT_R3(%r11)</div><div class='add'>+	stg	%r7,STACK_FRAME_OVERHEAD(%r15)</div><div class='add'>+	lg	%r2,__PT_ORIG_GPR2(%r11)</div><div class='add'>+	basr	%r14,%r9		# call sys_xxx</div><div class='add'>+	stg	%r2,__PT_R2(%r11)	# store return value</div><div class='ctx'> sysc_tracenogo:</div><div class='ctx'> 	tm	__TI_flags+6(%r12),_TIF_TRACE &gt;&gt; 8</div><div class='ctx'> 	jz	sysc_return</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='del'>-	larl	%r14,sysc_return	# return point is sysc_return</div><div class='add'>+	lgr	%r2,%r11		# pass pointer to pt_regs</div><div class='add'>+	larl	%r14,sysc_return</div><div class='ctx'> 	jg	do_syscall_trace_exit</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='ctx'> #</div><div class='ctx'> ENTRY(ret_from_fork)</div><div class='del'>-	lg	%r13,__LC_SVC_NEW_PSW+8</div><div class='del'>-	lg	%r12,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# forking a kernel thread ?</div><div class='add'>+	la	%r11,STACK_FRAME_OVERHEAD(%r15)</div><div class='add'>+	lg	%r12,__LC_THREAD_INFO</div><div class='add'>+	tm	__PT_PSW+1(%r11),0x01	# forking a kernel thread ?</div><div class='ctx'> 	jo	0f</div><div class='del'>-	stg	%r15,SP_R15(%r15)	# store stack pointer for new kthread</div><div class='add'>+	stg	%r15,__PT_R15(%r11)	# store stack pointer for new kthread</div><div class='ctx'> 0:	brasl	%r14,schedule_tail</div><div class='ctx'> 	TRACE_IRQS_ON</div><div class='del'>-	stosm	24(%r15),0x03		# reenable interrupts</div><div class='add'>+	ssm	__LC_SVC_NEW_PSW	# reenable interrupts</div><div class='ctx'> 	j	sysc_tracenogo</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -409,26 +359,26 @@ ENTRY(ret_from_fork)</div><div class='ctx'> ENTRY(kernel_execve)</div><div class='ctx'> 	stmg	%r12,%r15,96(%r15)</div><div class='ctx'> 	lgr	%r14,%r15</div><div class='del'>-	aghi	%r15,-SP_SIZE</div><div class='add'>+	aghi	%r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='ctx'> 	stg	%r14,__SF_BACKCHAIN(%r15)</div><div class='del'>-	la	%r12,SP_PTREGS(%r15)</div><div class='add'>+	la	%r12,STACK_FRAME_OVERHEAD(%r15)</div><div class='ctx'> 	xc	0(__PT_SIZE,%r12),0(%r12)</div><div class='ctx'> 	lgr	%r5,%r12</div><div class='ctx'> 	brasl	%r14,do_execve</div><div class='ctx'> 	ltgfr	%r2,%r2</div><div class='ctx'> 	je	0f</div><div class='del'>-	aghi	%r15,SP_SIZE</div><div class='add'>+	aghi	%r15,(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='ctx'> 	lmg	%r12,%r15,96(%r15)</div><div class='ctx'> 	br	%r14</div><div class='ctx'> 	# execve succeeded.</div><div class='del'>-0:	stnsm	__SF_EMPTY(%r15),0xfc	# disable interrupts</div><div class='add'>+0:	ssm	__LC_PGM_NEW_PSW	# disable I/O and ext. interrupts</div><div class='ctx'> 	lg	%r15,__LC_KERNEL_STACK	# load ksp</div><div class='del'>-	aghi	%r15,-SP_SIZE		# make room for registers &amp; psw</div><div class='del'>-	lg	%r13,__LC_SVC_NEW_PSW+8</div><div class='del'>-	mvc	SP_PTREGS(__PT_SIZE,%r15),0(%r12)	# copy pt_regs</div><div class='add'>+	aghi	%r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='add'>+	la	%r11,STACK_FRAME_OVERHEAD(%r15)</div><div class='add'>+	mvc	0(__PT_SIZE,%r11),0(%r12)	# copy pt_regs</div><div class='ctx'> 	lg	%r12,__LC_THREAD_INFO</div><div class='ctx'> 	xc	__SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)</div><div class='del'>-	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts</div><div class='add'>+	ssm	__LC_SVC_NEW_PSW	# reenable interrupts</div><div class='ctx'> 	brasl	%r14,execve_tail</div><div class='ctx'> 	j	sysc_return</div><div class='ctx'> </div><div class='hunk'>@@ -437,127 +387,72 @@ ENTRY(kernel_execve)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> ENTRY(pgm_check_handler)</div><div class='del'>-/*</div><div class='del'>- * First we need to check for a special case:</div><div class='del'>- * Single stepping an instruction that disables the PER event mask will</div><div class='del'>- * cause a PER event AFTER the mask has been set. Example: SVC or LPSW.</div><div class='del'>- * For a single stepped SVC the program check handler gets control after</div><div class='del'>- * the SVC new PSW has been loaded. But we want to execute the SVC first and</div><div class='del'>- * then handle the PER event. Therefore we update the SVC old PSW to point</div><div class='del'>- * to the pgm_check_handler and branch to the SVC handler after we checked</div><div class='del'>- * if we have to load the kernel stack register.</div><div class='del'>- * For every other possible cause for PER event without the PER mask set</div><div class='del'>- * we just ignore the PER event (FIXME: is there anything we have to do</div><div class='del'>- * for LPSW?).</div><div class='del'>- */</div><div class='ctx'> 	stpt	__LC_SYNC_ENTER_TIMER</div><div class='del'>-	tm	__LC_PGM_INT_CODE+1,0x80 # check whether we got a per exception</div><div class='del'>-	jnz	pgm_per 		 # got per exception -&gt; special case</div><div class='del'>-	SAVE_ALL_PGM __LC_PGM_OLD_PSW,__LC_SAVE_AREA</div><div class='del'>-	CREATE_STACK_FRAME __LC_SAVE_AREA</div><div class='del'>-	mvc	SP_PSW(16,%r15),__LC_PGM_OLD_PSW</div><div class='del'>-	lg	%r12,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='del'>-	HANDLE_SIE_INTERCEPT</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='del'>-	jz	pgm_no_vtime</div><div class='del'>-	UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER</div><div class='del'>-	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER</div><div class='del'>-	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER</div><div class='del'>-	LAST_BREAK</div><div class='del'>-pgm_no_vtime:</div><div class='del'>-	stg	%r11,SP_ARGS(%r15)</div><div class='del'>-	lgf	%r3,__LC_PGM_ILC	# load program interruption code</div><div class='del'>-	lg	%r4,__LC_TRANS_EXC_CODE</div><div class='del'>-	REENABLE_IRQS</div><div class='del'>-	lghi	%r8,0x7f</div><div class='del'>-	ngr	%r8,%r3</div><div class='del'>-	sll	%r8,3</div><div class='del'>-	larl	%r1,pgm_check_table</div><div class='del'>-	lg	%r1,0(%r8,%r1)		# load address of handler routine</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# address of register-save area</div><div class='del'>-	basr	%r14,%r1		# branch to interrupt-handler</div><div class='del'>-pgm_exit:</div><div class='del'>-	j	sysc_return</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# handle per exception</div><div class='del'>-#</div><div class='del'>-pgm_per:</div><div class='del'>-	tm	__LC_PGM_OLD_PSW,0x40	# test if per event recording is on</div><div class='del'>-	jnz	pgm_per_std		# ok, normal per event from user space</div><div class='del'>-# ok its one of the special cases, now we need to find out which one</div><div class='del'>-	clc	__LC_PGM_OLD_PSW(16),__LC_SVC_NEW_PSW</div><div class='del'>-	je	pgm_svcper</div><div class='del'>-# no interesting special case, ignore PER event</div><div class='del'>-	lpswe	__LC_PGM_OLD_PSW</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Normal per exception</div><div class='del'>-#</div><div class='del'>-pgm_per_std:</div><div class='del'>-	SAVE_ALL_PGM __LC_PGM_OLD_PSW,__LC_SAVE_AREA</div><div class='del'>-	CREATE_STACK_FRAME __LC_SAVE_AREA</div><div class='del'>-	mvc	SP_PSW(16,%r15),__LC_PGM_OLD_PSW</div><div class='del'>-	lg	%r12,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='del'>-	HANDLE_SIE_INTERCEPT</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='del'>-	jz	pgm_no_vtime2</div><div class='del'>-	UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER</div><div class='del'>-	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER</div><div class='del'>-	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER</div><div class='del'>-	LAST_BREAK</div><div class='del'>-pgm_no_vtime2:</div><div class='add'>+	stmg	%r8,%r15,__LC_SAVE_AREA_SYNC</div><div class='add'>+	lg	%r10,__LC_LAST_BREAK</div><div class='add'>+	lg	%r12,__LC_THREAD_INFO</div><div class='add'>+	larl	%r13,system_call</div><div class='add'>+	lmg	%r8,%r9,__LC_PGM_OLD_PSW</div><div class='add'>+	HANDLE_SIE_INTERCEPT %r14</div><div class='add'>+	tmhh	%r8,0x0001		# test problem state bit</div><div class='add'>+	jnz	1f			# -&gt; fault in user space</div><div class='add'>+	tmhh	%r8,0x4000		# PER bit set in old PSW ?</div><div class='add'>+	jnz	0f			# -&gt; enabled, can't be a double fault</div><div class='add'>+	tm	__LC_PGM_ILC+3,0x80	# check for per exception</div><div class='add'>+	jnz	pgm_svcper		# -&gt; single stepped svc</div><div class='add'>+0:	CHECK_STACK STACK_SIZE,__LC_SAVE_AREA_SYNC</div><div class='add'>+	j	2f</div><div class='add'>+1:	UPDATE_VTIME %r14,__LC_SYNC_ENTER_TIMER</div><div class='add'>+	LAST_BREAK %r14</div><div class='add'>+	lg	%r15,__LC_KERNEL_STACK</div><div class='add'>+2:	aghi	%r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='add'>+	la	%r11,STACK_FRAME_OVERHEAD(%r15)</div><div class='add'>+	stmg	%r0,%r7,__PT_R0(%r11)</div><div class='add'>+	mvc	__PT_R8(64,%r11),__LC_SAVE_AREA_SYNC</div><div class='add'>+	stmg	%r8,%r9,__PT_PSW(%r11)</div><div class='add'>+	mvc	__PT_INT_CODE(4,%r11),__LC_PGM_ILC</div><div class='add'>+	mvc	__PT_INT_PARM_LONG(8,%r11),__LC_TRANS_EXC_CODE</div><div class='add'>+	stg	%r10,__PT_ARGS(%r11)</div><div class='add'>+	tm	__LC_PGM_ILC+3,0x80	# check for per exception</div><div class='add'>+	jz	0f</div><div class='ctx'> 	lg	%r1,__TI_task(%r12)</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# kernel per event ?</div><div class='del'>-	jz	kernel_per</div><div class='del'>-	mvc	__THREAD_per_cause(2,%r1),__LC_PER_CAUSE</div><div class='add'>+	tmhh	%r8,0x0001		# kernel per event ?</div><div class='add'>+	jz	pgm_kprobe</div><div class='add'>+	oi	__TI_flags+7(%r12),_TIF_PER_TRAP</div><div class='ctx'> 	mvc	__THREAD_per_address(8,%r1),__LC_PER_ADDRESS</div><div class='add'>+	mvc	__THREAD_per_cause(2,%r1),__LC_PER_CAUSE</div><div class='ctx'> 	mvc	__THREAD_per_paid(1,%r1),__LC_PER_PAID</div><div class='del'>-	oi	__TI_flags+7(%r12),_TIF_PER_TRAP # set TIF_PER_TRAP</div><div class='del'>-	lgf	%r3,__LC_PGM_ILC	# load program interruption code</div><div class='del'>-	lg	%r4,__LC_TRANS_EXC_CODE</div><div class='del'>-	REENABLE_IRQS</div><div class='del'>-	lghi	%r8,0x7f</div><div class='del'>-	ngr	%r8,%r3			# clear per-event-bit and ilc</div><div class='del'>-	je	pgm_exit2</div><div class='del'>-	sll	%r8,3</div><div class='add'>+0:	REENABLE_IRQS</div><div class='add'>+	xc	__SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)</div><div class='ctx'> 	larl	%r1,pgm_check_table</div><div class='del'>-	lg	%r1,0(%r8,%r1)		# load address of handler routine</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# address of register-save area</div><div class='add'>+	llgh	%r10,__PT_INT_CODE+2(%r11)</div><div class='add'>+	nill	%r10,0x007f</div><div class='add'>+	sll	%r10,3</div><div class='add'>+	je	sysc_return</div><div class='add'>+	lg	%r1,0(%r10,%r1)		# load address of handler routine</div><div class='add'>+	lgr	%r2,%r11		# pass pointer to pt_regs</div><div class='ctx'> 	basr	%r14,%r1		# branch to interrupt-handler</div><div class='del'>-pgm_exit2:</div><div class='ctx'> 	j	sysc_return</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# it was a single stepped SVC that is causing all the trouble</div><div class='add'>+# PER event in supervisor state, must be kprobes</div><div class='ctx'> #</div><div class='del'>-pgm_svcper:</div><div class='del'>-	SAVE_ALL_PGM __LC_SVC_OLD_PSW,__LC_SAVE_AREA</div><div class='del'>-	CREATE_STACK_FRAME __LC_SAVE_AREA</div><div class='del'>-	lg	%r12,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='del'>-	mvc	SP_PSW(16,%r15),__LC_SVC_OLD_PSW</div><div class='del'>-	mvc	SP_SVC_CODE(4,%r15),__LC_SVC_ILC</div><div class='del'>-	oi	__TI_flags+7(%r12),(_TIF_SYSCALL | _TIF_PER_TRAP)</div><div class='del'>-	UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER</div><div class='del'>-	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER</div><div class='del'>-	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER</div><div class='del'>-	LAST_BREAK</div><div class='del'>-	lg	%r8,__TI_task(%r12)</div><div class='del'>-	mvc	__THREAD_per_cause(2,%r8),__LC_PER_CAUSE</div><div class='del'>-	mvc	__THREAD_per_address(8,%r8),__LC_PER_ADDRESS</div><div class='del'>-	mvc	__THREAD_per_paid(1,%r8),__LC_PER_PAID</div><div class='del'>-	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts</div><div class='del'>-	lmg	%r2,%r6,SP_R2(%r15)	# load svc arguments</div><div class='del'>-	j	sysc_do_svc</div><div class='add'>+pgm_kprobe:</div><div class='add'>+	REENABLE_IRQS</div><div class='add'>+	xc	__SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)</div><div class='add'>+	lgr	%r2,%r11		# pass pointer to pt_regs</div><div class='add'>+	brasl	%r14,do_per_trap</div><div class='add'>+	j	sysc_return</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# per was called from kernel, must be kprobes</div><div class='add'>+# single stepped system call</div><div class='ctx'> #</div><div class='del'>-kernel_per:</div><div class='del'>-	REENABLE_IRQS</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# address of register-save area</div><div class='del'>-	brasl	%r14,do_per_trap</div><div class='del'>-	j	pgm_exit</div><div class='add'>+pgm_svcper:</div><div class='add'>+	oi	__TI_flags+7(%r12),_TIF_PER_TRAP</div><div class='add'>+	mvc	__LC_RETURN_PSW(8),__LC_SVC_NEW_PSW</div><div class='add'>+	larl	%r14,sysc_per</div><div class='add'>+	stg	%r14,__LC_RETURN_PSW+8</div><div class='add'>+	lpswe	__LC_RETURN_PSW		# branch to sysc_per and enable irqs</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * IO interrupt handler routine</div><div class='hunk'>@@ -565,21 +460,25 @@ kernel_per:</div><div class='ctx'> ENTRY(io_int_handler)</div><div class='ctx'> 	stck	__LC_INT_CLOCK</div><div class='ctx'> 	stpt	__LC_ASYNC_ENTER_TIMER</div><div class='del'>-	SAVE_ALL_ASYNC __LC_IO_OLD_PSW,__LC_SAVE_AREA+40</div><div class='del'>-	CREATE_STACK_FRAME __LC_SAVE_AREA+40</div><div class='del'>-	mvc	SP_PSW(16,%r15),0(%r12)	# move user PSW to stack</div><div class='del'>-	lg	%r12,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='del'>-	HANDLE_SIE_INTERCEPT</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='del'>-	jz	io_no_vtime</div><div class='del'>-	UPDATE_VTIME __LC_EXIT_TIMER,__LC_ASYNC_ENTER_TIMER,__LC_USER_TIMER</div><div class='del'>-	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER</div><div class='del'>-	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_ASYNC_ENTER_TIMER</div><div class='del'>-	LAST_BREAK</div><div class='del'>-io_no_vtime:</div><div class='add'>+	stmg	%r8,%r15,__LC_SAVE_AREA_ASYNC</div><div class='add'>+	lg	%r10,__LC_LAST_BREAK</div><div class='add'>+	lg	%r12,__LC_THREAD_INFO</div><div class='add'>+	larl	%r13,system_call</div><div class='add'>+	lmg	%r8,%r9,__LC_IO_OLD_PSW</div><div class='add'>+	HANDLE_SIE_INTERCEPT %r14</div><div class='add'>+	SWITCH_ASYNC __LC_SAVE_AREA_ASYNC,__LC_ASYNC_STACK,STACK_SHIFT</div><div class='add'>+	tmhh	%r8,0x0001		# interrupting from user?</div><div class='add'>+	jz	io_skip</div><div class='add'>+	UPDATE_VTIME %r14,__LC_ASYNC_ENTER_TIMER</div><div class='add'>+	LAST_BREAK %r14</div><div class='add'>+io_skip:</div><div class='add'>+	stmg	%r0,%r7,__PT_R0(%r11)</div><div class='add'>+	mvc	__PT_R8(64,%r11),__LC_SAVE_AREA_ASYNC</div><div class='add'>+	stmg	%r8,%r9,__PT_PSW(%r11)</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# address of register-save area</div><div class='del'>-	brasl	%r14,do_IRQ		# call standard irq handler</div><div class='add'>+	xc	__SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)</div><div class='add'>+	lgr	%r2,%r11		# pass pointer to pt_regs</div><div class='add'>+	brasl	%r14,do_IRQ</div><div class='ctx'> io_return:</div><div class='ctx'> 	LOCKDEP_SYS_EXIT</div><div class='ctx'> 	TRACE_IRQS_ON</div><div class='hunk'>@@ -587,7 +486,14 @@ io_tif:</div><div class='ctx'> 	tm	__TI_flags+7(%r12),_TIF_WORK_INT</div><div class='ctx'> 	jnz	io_work 		# there is work to do (signals etc.)</div><div class='ctx'> io_restore:</div><div class='del'>-	RESTORE_ALL __LC_RETURN_PSW,0</div><div class='add'>+	lg	%r14,__LC_VDSO_PER_CPU</div><div class='add'>+	lmg	%r0,%r10,__PT_R0(%r11)</div><div class='add'>+	mvc	__LC_RETURN_PSW(16),__PT_PSW(%r11)</div><div class='add'>+	ni	__LC_RETURN_PSW+1,0xfd	# clear wait state bit</div><div class='add'>+	stpt	__LC_EXIT_TIMER</div><div class='add'>+	mvc	__VDSO_ECTG_BASE(16,%r14),__LC_EXIT_TIMER</div><div class='add'>+	lmg	%r11,%r15,__PT_R11(%r11)</div><div class='add'>+	lpswe	__LC_RETURN_PSW</div><div class='ctx'> io_done:</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -600,7 +506,7 @@ io_done:</div><div class='ctx'> # Before any work can be done, a switch to the kernel stack is required.</div><div class='ctx'> #</div><div class='ctx'> io_work:</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# returning to user ?</div><div class='add'>+	tm	__PT_PSW+1(%r11),0x01	# returning to user ?</div><div class='ctx'> 	jo	io_work_user		# yes -&gt; do resched &amp; signal</div><div class='ctx'> #ifdef CONFIG_PREEMPT</div><div class='ctx'> 	# check for preemptive scheduling</div><div class='hunk'>@@ -609,10 +515,11 @@ io_work:</div><div class='ctx'> 	tm	__TI_flags+7(%r12),_TIF_NEED_RESCHED</div><div class='ctx'> 	jno	io_restore</div><div class='ctx'> 	# switch to kernel stack</div><div class='del'>-	lg	%r1,SP_R15(%r15)</div><div class='del'>-	aghi	%r1,-SP_SIZE</div><div class='del'>-	mvc	SP_PTREGS(__PT_SIZE,%r1),SP_PTREGS(%r15)</div><div class='del'>-	xc	__SF_BACKCHAIN(8,%r1),__SF_BACKCHAIN(%r1) # clear back chain</div><div class='add'>+	lg	%r1,__PT_R15(%r11)</div><div class='add'>+	aghi	%r1,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='add'>+	mvc	STACK_FRAME_OVERHEAD(__PT_SIZE,%r1),0(%r11)</div><div class='add'>+	xc	__SF_BACKCHAIN(8,%r1),__SF_BACKCHAIN(%r1)</div><div class='add'>+	la	%r11,STACK_FRAME_OVERHEAD(%r1)</div><div class='ctx'> 	lgr	%r15,%r1</div><div class='ctx'> 	# TRACE_IRQS_ON already done at io_return, call</div><div class='ctx'> 	# TRACE_IRQS_OFF to keep things symmetrical</div><div class='hunk'>@@ -628,9 +535,10 @@ io_work:</div><div class='ctx'> #</div><div class='ctx'> io_work_user:</div><div class='ctx'> 	lg	%r1,__LC_KERNEL_STACK</div><div class='del'>-	aghi	%r1,-SP_SIZE</div><div class='del'>-	mvc	SP_PTREGS(__PT_SIZE,%r1),SP_PTREGS(%r15)</div><div class='del'>-	xc	__SF_BACKCHAIN(8,%r1),__SF_BACKCHAIN(%r1) # clear back chain</div><div class='add'>+	aghi	%r1,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='add'>+	mvc	STACK_FRAME_OVERHEAD(__PT_SIZE,%r1),0(%r11)</div><div class='add'>+	xc	__SF_BACKCHAIN(8,%r1),__SF_BACKCHAIN(%r1)</div><div class='add'>+	la	%r11,STACK_FRAME_OVERHEAD(%r1)</div><div class='ctx'> 	lgr	%r15,%r1</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -663,9 +571,9 @@ io_mcck_pending:</div><div class='ctx'> #</div><div class='ctx'> io_reschedule:</div><div class='ctx'> 	# TRACE_IRQS_ON already done at io_return</div><div class='del'>-	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts</div><div class='add'>+	ssm	__LC_SVC_NEW_PSW	# reenable interrupts</div><div class='ctx'> 	brasl	%r14,schedule		# call scheduler</div><div class='del'>-	stnsm	__SF_EMPTY(%r15),0xfc	# disable I/O and ext. interrupts</div><div class='add'>+	ssm	__LC_PGM_NEW_PSW	# disable I/O and ext. interrupts</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='ctx'> 	j	io_return</div><div class='ctx'> </div><div class='hunk'>@@ -674,10 +582,10 @@ io_reschedule:</div><div class='ctx'> #</div><div class='ctx'> io_sigpending:</div><div class='ctx'> 	# TRACE_IRQS_ON already done at io_return</div><div class='del'>-	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='del'>-	brasl	%r14,do_signal		# call do_signal</div><div class='del'>-	stnsm	__SF_EMPTY(%r15),0xfc	# disable I/O and ext. interrupts</div><div class='add'>+	ssm	__LC_SVC_NEW_PSW	# reenable interrupts</div><div class='add'>+	lgr	%r2,%r11		# pass pointer to pt_regs</div><div class='add'>+	brasl	%r14,do_signal</div><div class='add'>+	ssm	__LC_PGM_NEW_PSW	# disable I/O and ext. interrupts</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='ctx'> 	j	io_return</div><div class='ctx'> </div><div class='hunk'>@@ -686,10 +594,10 @@ io_sigpending:</div><div class='ctx'> #</div><div class='ctx'> io_notify_resume:</div><div class='ctx'> 	# TRACE_IRQS_ON already done at io_return</div><div class='del'>-	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='del'>-	brasl	%r14,do_notify_resume	# call do_notify_resume</div><div class='del'>-	stnsm	__SF_EMPTY(%r15),0xfc	# disable I/O and ext. interrupts</div><div class='add'>+	ssm	__LC_SVC_NEW_PSW	# reenable interrupts</div><div class='add'>+	lgr	%r2,%r11		# pass pointer to pt_regs</div><div class='add'>+	brasl	%r14,do_notify_resume</div><div class='add'>+	ssm	__LC_PGM_NEW_PSW	# disable I/O and ext. interrupts</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='ctx'> 	j	io_return</div><div class='ctx'> </div><div class='hunk'>@@ -699,21 +607,24 @@ io_notify_resume:</div><div class='ctx'> ENTRY(ext_int_handler)</div><div class='ctx'> 	stck	__LC_INT_CLOCK</div><div class='ctx'> 	stpt	__LC_ASYNC_ENTER_TIMER</div><div class='del'>-	SAVE_ALL_ASYNC __LC_EXT_OLD_PSW,__LC_SAVE_AREA+40</div><div class='del'>-	CREATE_STACK_FRAME __LC_SAVE_AREA+40</div><div class='del'>-	mvc	SP_PSW(16,%r15),0(%r12)	# move user PSW to stack</div><div class='del'>-	lg	%r12,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='del'>-	HANDLE_SIE_INTERCEPT</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='del'>-	jz	ext_no_vtime</div><div class='del'>-	UPDATE_VTIME __LC_EXIT_TIMER,__LC_ASYNC_ENTER_TIMER,__LC_USER_TIMER</div><div class='del'>-	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER</div><div class='del'>-	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_ASYNC_ENTER_TIMER</div><div class='del'>-	LAST_BREAK</div><div class='del'>-ext_no_vtime:</div><div class='add'>+	stmg	%r8,%r15,__LC_SAVE_AREA_ASYNC</div><div class='add'>+	lg	%r10,__LC_LAST_BREAK</div><div class='add'>+	lg	%r12,__LC_THREAD_INFO</div><div class='add'>+	larl	%r13,system_call</div><div class='add'>+	lmg	%r8,%r9,__LC_EXT_OLD_PSW</div><div class='add'>+	HANDLE_SIE_INTERCEPT %r14</div><div class='add'>+	SWITCH_ASYNC __LC_SAVE_AREA_ASYNC,__LC_ASYNC_STACK,STACK_SHIFT</div><div class='add'>+	tmhh	%r8,0x0001		# interrupting from user ?</div><div class='add'>+	jz	ext_skip</div><div class='add'>+	UPDATE_VTIME %r14,__LC_ASYNC_ENTER_TIMER</div><div class='add'>+	LAST_BREAK %r14</div><div class='add'>+ext_skip:</div><div class='add'>+	stmg	%r0,%r7,__PT_R0(%r11)</div><div class='add'>+	mvc	__PT_R8(64,%r11),__LC_SAVE_AREA_ASYNC</div><div class='add'>+	stmg	%r8,%r9,__PT_PSW(%r11)</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='ctx'> 	lghi	%r1,4096</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# address of register-save area</div><div class='add'>+	lgr	%r2,%r11		# pass pointer to pt_regs</div><div class='ctx'> 	llgf	%r3,__LC_CPU_ADDRESS	# get cpu address + interruption code</div><div class='ctx'> 	llgf	%r4,__LC_EXT_PARAMS	# get external parameter</div><div class='ctx'> 	lg	%r5,__LC_EXT_PARAMS2-4096(%r1)	# get 64 bit external parameter</div><div class='hunk'>@@ -730,81 +641,77 @@ ENTRY(mcck_int_handler)</div><div class='ctx'> 	la	%r1,4095		# revalidate r1</div><div class='ctx'> 	spt	__LC_CPU_TIMER_SAVE_AREA-4095(%r1)	# revalidate cpu timer</div><div class='ctx'> 	lmg	%r0,%r15,__LC_GPREGS_SAVE_AREA-4095(%r1)# revalidate gprs</div><div class='del'>-	stmg	%r11,%r15,__LC_SAVE_AREA+80</div><div class='add'>+	lg	%r10,__LC_LAST_BREAK</div><div class='add'>+	lg	%r12,__LC_THREAD_INFO</div><div class='ctx'> 	larl	%r13,system_call</div><div class='del'>-	lg	%r11,__LC_LAST_BREAK</div><div class='del'>-	la	%r12,__LC_MCK_OLD_PSW</div><div class='add'>+	lmg	%r8,%r9,__LC_MCK_OLD_PSW</div><div class='add'>+	HANDLE_SIE_INTERCEPT %r14</div><div class='ctx'> 	tm	__LC_MCCK_CODE,0x80	# system damage?</div><div class='del'>-	jo	mcck_int_main		# yes -&gt; rest of mcck code invalid</div><div class='del'>-	la	%r14,4095</div><div class='del'>-	mvc	__LC_MCCK_ENTER_TIMER(8),__LC_CPU_TIMER_SAVE_AREA-4095(%r14)</div><div class='add'>+	jo	mcck_panic		# yes -&gt; rest of mcck code invalid</div><div class='add'>+	lghi	%r14,__LC_CPU_TIMER_SAVE_AREA</div><div class='add'>+	mvc	__LC_MCCK_ENTER_TIMER(8),0(%r14)</div><div class='ctx'> 	tm	__LC_MCCK_CODE+5,0x02	# stored cpu timer value valid?</div><div class='del'>-	jo	1f</div><div class='add'>+	jo	3f</div><div class='ctx'> 	la	%r14,__LC_SYNC_ENTER_TIMER</div><div class='ctx'> 	clc	0(8,%r14),__LC_ASYNC_ENTER_TIMER</div><div class='ctx'> 	jl	0f</div><div class='ctx'> 	la	%r14,__LC_ASYNC_ENTER_TIMER</div><div class='ctx'> 0:	clc	0(8,%r14),__LC_EXIT_TIMER</div><div class='del'>-	jl	0f</div><div class='add'>+	jl	1f</div><div class='ctx'> 	la	%r14,__LC_EXIT_TIMER</div><div class='del'>-0:	clc	0(8,%r14),__LC_LAST_UPDATE_TIMER</div><div class='del'>-	jl	0f</div><div class='add'>+1:	clc	0(8,%r14),__LC_LAST_UPDATE_TIMER</div><div class='add'>+	jl	2f</div><div class='ctx'> 	la	%r14,__LC_LAST_UPDATE_TIMER</div><div class='del'>-0:	spt	0(%r14)</div><div class='add'>+2:	spt	0(%r14)</div><div class='ctx'> 	mvc	__LC_MCCK_ENTER_TIMER(8),0(%r14)</div><div class='del'>-1:	tm	__LC_MCCK_CODE+2,0x09	# mwp + ia of old psw valid?</div><div class='del'>-	jno	mcck_int_main		# no -&gt; skip cleanup critical</div><div class='del'>-	tm	__LC_MCK_OLD_PSW+1,0x01 # test problem state bit</div><div class='del'>-	jnz	mcck_int_main		# from user -&gt; load kernel stack</div><div class='del'>-	clc	__LC_MCK_OLD_PSW+8(8),BASED(.Lcritical_end)</div><div class='del'>-	jhe	mcck_int_main</div><div class='del'>-	clc	__LC_MCK_OLD_PSW+8(8),BASED(.Lcritical_start)</div><div class='del'>-	jl	mcck_int_main</div><div class='del'>-	brasl	%r14,cleanup_critical</div><div class='del'>-mcck_int_main:</div><div class='del'>-	lg	%r14,__LC_PANIC_STACK	# are we already on the panic stack?</div><div class='del'>-	slgr	%r14,%r15</div><div class='del'>-	srag	%r14,%r14,PAGE_SHIFT</div><div class='del'>-	jz	0f</div><div class='del'>-	lg	%r15,__LC_PANIC_STACK	# load panic stack</div><div class='del'>-0:	aghi	%r15,-SP_SIZE		# make room for registers &amp; psw</div><div class='del'>-	CREATE_STACK_FRAME __LC_SAVE_AREA+80</div><div class='del'>-	mvc	SP_PSW(16,%r15),0(%r12)</div><div class='del'>-	lg	%r12,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='del'>-	tm	__LC_MCCK_CODE+2,0x08	# mwp of old psw valid?</div><div class='del'>-	jno	mcck_no_vtime		# no -&gt; no timer update</div><div class='del'>-	HANDLE_SIE_INTERCEPT</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='del'>-	jz	mcck_no_vtime</div><div class='del'>-	UPDATE_VTIME __LC_EXIT_TIMER,__LC_MCCK_ENTER_TIMER,__LC_USER_TIMER</div><div class='del'>-	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER</div><div class='del'>-	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_MCCK_ENTER_TIMER</div><div class='del'>-	LAST_BREAK</div><div class='del'>-mcck_no_vtime:</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='add'>+3:	tm	__LC_MCCK_CODE+2,0x09	# mwp + ia of old psw valid?</div><div class='add'>+	jno	mcck_panic		# no -&gt; skip cleanup critical</div><div class='add'>+	SWITCH_ASYNC __LC_GPREGS_SAVE_AREA+64,__LC_PANIC_STACK,PAGE_SHIFT</div><div class='add'>+	tm	%r8,0x0001		# interrupting from user ?</div><div class='add'>+	jz	mcck_skip</div><div class='add'>+	UPDATE_VTIME %r14,__LC_MCCK_ENTER_TIMER</div><div class='add'>+	LAST_BREAK %r14</div><div class='add'>+mcck_skip:</div><div class='add'>+	lghi	%r14,__LC_GPREGS_SAVE_AREA</div><div class='add'>+	mvc	__PT_R0(128,%r11),0(%r14)</div><div class='add'>+	stmg	%r8,%r9,__PT_PSW(%r11)</div><div class='add'>+	xc	__SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)</div><div class='add'>+	lgr	%r2,%r11		# pass pointer to pt_regs</div><div class='ctx'> 	brasl	%r14,s390_do_machine_check</div><div class='del'>-	tm	SP_PSW+1(%r15),0x01	# returning to user ?</div><div class='add'>+	tm	__PT_PSW+1(%r11),0x01	# returning to user ?</div><div class='ctx'> 	jno	mcck_return</div><div class='ctx'> 	lg	%r1,__LC_KERNEL_STACK	# switch to kernel stack</div><div class='del'>-	aghi	%r1,-SP_SIZE</div><div class='del'>-	mvc	SP_PTREGS(__PT_SIZE,%r1),SP_PTREGS(%r15)</div><div class='del'>-	xc	__SF_BACKCHAIN(8,%r1),__SF_BACKCHAIN(%r1) # clear back chain</div><div class='add'>+	aghi	%r1,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='add'>+	mvc	STACK_FRAME_OVERHEAD(__PT_SIZE,%r1),0(%r11)</div><div class='add'>+	xc	__SF_BACKCHAIN(8,%r1),__SF_BACKCHAIN(%r1)</div><div class='add'>+	la	%r11,STACK_FRAME_OVERHEAD(%r1)</div><div class='ctx'> 	lgr	%r15,%r1</div><div class='del'>-	stosm	__SF_EMPTY(%r15),0x04	# turn dat on</div><div class='add'>+	ssm	__LC_PGM_NEW_PSW	# turn dat on, keep irqs off</div><div class='ctx'> 	tm	__TI_flags+7(%r12),_TIF_MCCK_PENDING</div><div class='ctx'> 	jno	mcck_return</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='ctx'> 	brasl	%r14,s390_handle_mcck</div><div class='ctx'> 	TRACE_IRQS_ON</div><div class='ctx'> mcck_return:</div><div class='del'>-	mvc	__LC_RETURN_MCCK_PSW(16),SP_PSW(%r15) # move return PSW</div><div class='add'>+	lg	%r14,__LC_VDSO_PER_CPU</div><div class='add'>+	lmg	%r0,%r10,__PT_R0(%r11)</div><div class='add'>+	mvc	__LC_RETURN_MCCK_PSW(16),__PT_PSW(%r11) # move return PSW</div><div class='ctx'> 	ni	__LC_RETURN_MCCK_PSW+1,0xfd # clear wait state bit</div><div class='del'>-	lmg	%r0,%r15,SP_R0(%r15)	# load gprs 0-15</div><div class='ctx'> 	tm	__LC_RETURN_MCCK_PSW+1,0x01 # returning to user ?</div><div class='ctx'> 	jno	0f</div><div class='ctx'> 	stpt	__LC_EXIT_TIMER</div><div class='del'>-0:	lpswe	__LC_RETURN_MCCK_PSW	# back to caller</div><div class='del'>-mcck_done:</div><div class='add'>+	mvc	__VDSO_ECTG_BASE(16,%r14),__LC_EXIT_TIMER</div><div class='add'>+0:	lmg	%r11,%r15,__PT_R11(%r11)</div><div class='add'>+	lpswe	__LC_RETURN_MCCK_PSW</div><div class='add'>+</div><div class='add'>+mcck_panic:</div><div class='add'>+	lg	%r14,__LC_PANIC_STACK</div><div class='add'>+	slgr	%r14,%r15</div><div class='add'>+	srag	%r14,%r14,PAGE_SHIFT</div><div class='add'>+	jz	0f</div><div class='add'>+	lg	%r15,__LC_PANIC_STACK</div><div class='add'>+0:	aghi	%r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)</div><div class='add'>+	j	mcck_skip</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Restart interruption handler, kick starter for additional CPUs</div><div class='hunk'>@@ -818,17 +725,18 @@ restart_base:</div><div class='ctx'> 	stck	__LC_LAST_UPDATE_CLOCK</div><div class='ctx'> 	mvc	__LC_LAST_UPDATE_TIMER(8),restart_vtime-restart_base(%r1)</div><div class='ctx'> 	mvc	__LC_EXIT_TIMER(8),restart_vtime-restart_base(%r1)</div><div class='del'>-	lg	%r15,__LC_SAVE_AREA+120 # load ksp</div><div class='add'>+	lghi	%r10,__LC_GPREGS_SAVE_AREA</div><div class='add'>+	lg	%r15,120(%r10)		# load ksp</div><div class='ctx'> 	lghi	%r10,__LC_CREGS_SAVE_AREA</div><div class='del'>-	lctlg	%c0,%c15,0(%r10) # get new ctl regs</div><div class='add'>+	lctlg	%c0,%c15,0(%r10)	# get new ctl regs</div><div class='ctx'> 	lghi	%r10,__LC_AREGS_SAVE_AREA</div><div class='ctx'> 	lam	%a0,%a15,0(%r10)</div><div class='del'>-	lmg	%r6,%r15,__SF_GPRS(%r15) # load registers from clone</div><div class='add'>+	lmg	%r6,%r15,__SF_GPRS(%r15)# load registers from clone</div><div class='ctx'> 	lg	%r1,__LC_THREAD_INFO</div><div class='ctx'> 	mvc	__LC_USER_TIMER(8),__TI_user_timer(%r1)</div><div class='ctx'> 	mvc	__LC_SYSTEM_TIMER(8),__TI_system_timer(%r1)</div><div class='ctx'> 	xc	__LC_STEAL_TIMER(8),__LC_STEAL_TIMER</div><div class='del'>-	stosm	__SF_EMPTY(%r15),0x04	# now we can turn dat on</div><div class='add'>+	ssm	__LC_PGM_NEW_PSW	# turn dat on, keep irqs off</div><div class='ctx'> 	brasl	%r14,start_secondary</div><div class='ctx'> 	.align	8</div><div class='ctx'> restart_vtime:</div><div class='hunk'>@@ -852,16 +760,16 @@ restart_go:</div><div class='ctx'> # PSW restart interrupt handler</div><div class='ctx'> #</div><div class='ctx'> ENTRY(psw_restart_int_handler)</div><div class='del'>-	stg	%r15,__LC_SAVE_AREA+120(%r0)	# save r15</div><div class='add'>+	stg	%r15,__LC_SAVE_AREA_RESTART</div><div class='ctx'> 	larl	%r15,restart_stack		# load restart stack</div><div class='ctx'> 	lg	%r15,0(%r15)</div><div class='del'>-	aghi	%r15,-SP_SIZE			# make room for pt_regs</div><div class='del'>-	stmg	%r0,%r14,SP_R0(%r15)		# store gprs %r0-%r14 to stack</div><div class='del'>-	mvc	SP_R15(8,%r15),__LC_SAVE_AREA+120(%r0)# store saved %r15 to stack</div><div class='del'>-	mvc	SP_PSW(16,%r15),__LC_RST_OLD_PSW(%r0)# store restart old psw</div><div class='del'>-	xc	__SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15) # set backchain to 0</div><div class='add'>+	aghi	%r15,-__PT_SIZE			# create pt_regs on stack</div><div class='add'>+	stmg	%r0,%r14,__PT_R0(%r15)</div><div class='add'>+	mvc	__PT_R15(8,%r15),__LC_SAVE_AREA_RESTART</div><div class='add'>+	mvc	__PT_PSW(16,%r15),__LC_RST_OLD_PSW # store restart old psw</div><div class='add'>+	aghi	%r15,-STACK_FRAME_OVERHEAD</div><div class='add'>+	xc	__SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)</div><div class='ctx'> 	brasl	%r14,do_restart</div><div class='del'>-</div><div class='ctx'> 	larl	%r14,restart_psw_crash		# load disabled wait PSW if</div><div class='ctx'> 	lpswe	0(%r14)				# do_restart returns</div><div class='ctx'> 	.align 8</div><div class='hunk'>@@ -877,172 +785,153 @@ restart_psw_crash:</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='ctx'> stack_overflow:</div><div class='del'>-	lg	%r15,__LC_PANIC_STACK	# change to panic stack</div><div class='del'>-	aghi	%r15,-SP_SIZE</div><div class='del'>-	mvc	SP_PSW(16,%r15),0(%r12)	# move user PSW to stack</div><div class='del'>-	stmg	%r0,%r10,SP_R0(%r15)	# store gprs %r0-%r10 to kernel stack</div><div class='del'>-	la	%r1,__LC_SAVE_AREA</div><div class='del'>-	chi	%r12,__LC_SVC_OLD_PSW</div><div class='del'>-	je	0f</div><div class='del'>-	chi	%r12,__LC_PGM_OLD_PSW</div><div class='del'>-	je	0f</div><div class='del'>-	la	%r1,__LC_SAVE_AREA+40</div><div class='del'>-0:	mvc	SP_R11(40,%r15),0(%r1)	# move %r11-%r15 to stack</div><div class='del'>-	mvc	SP_ARGS(8,%r15),__LC_LAST_BREAK</div><div class='del'>-	xc	__SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15) # clear back chain</div><div class='del'>-	la	%r2,SP_PTREGS(%r15)	# load pt_regs</div><div class='add'>+	lg	%r11,__LC_PANIC_STACK	# change to panic stack</div><div class='add'>+	aghi	%r11,-__PT_SIZE		# create pt_regs</div><div class='add'>+	stmg	%r0,%r7,__PT_R0(%r11)</div><div class='add'>+	stmg	%r8,%r9,__PT_PSW(%r11)</div><div class='add'>+	mvc	__PT_R8(64,%r11),0(%r14)</div><div class='add'>+	stg	%r10,__PT_ORIG_GPR2(%r11) # store last break to orig_gpr2</div><div class='add'>+	lgr	%r15,%r11</div><div class='add'>+	aghi	%r15,-STACK_FRAME_OVERHEAD</div><div class='add'>+	xc	__SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)</div><div class='add'>+	lgr	%r2,%r11		# pass pointer to pt_regs</div><div class='ctx'> 	jg	kernel_stack_overflow</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-cleanup_table_system_call:</div><div class='del'>-	.quad	system_call, sysc_do_svc</div><div class='del'>-cleanup_table_sysc_tif:</div><div class='del'>-	.quad	sysc_tif, sysc_restore</div><div class='del'>-cleanup_table_sysc_restore:</div><div class='del'>-	.quad	sysc_restore, sysc_done</div><div class='del'>-cleanup_table_io_tif:</div><div class='del'>-	.quad	io_tif, io_restore</div><div class='del'>-cleanup_table_io_restore:</div><div class='del'>-	.quad	io_restore, io_done</div><div class='add'>+	.align	8</div><div class='add'>+cleanup_table:</div><div class='add'>+	.quad	system_call</div><div class='add'>+	.quad	sysc_do_svc</div><div class='add'>+	.quad	sysc_tif</div><div class='add'>+	.quad	sysc_restore</div><div class='add'>+	.quad	sysc_done</div><div class='add'>+	.quad	io_tif</div><div class='add'>+	.quad	io_restore</div><div class='add'>+	.quad	io_done</div><div class='ctx'> </div><div class='ctx'> cleanup_critical:</div><div class='del'>-	clc	8(8,%r12),BASED(cleanup_table_system_call)</div><div class='add'>+	clg	%r9,BASED(cleanup_table)	# system_call</div><div class='ctx'> 	jl	0f</div><div class='del'>-	clc	8(8,%r12),BASED(cleanup_table_system_call+8)</div><div class='add'>+	clg	%r9,BASED(cleanup_table+8)	# sysc_do_svc</div><div class='ctx'> 	jl	cleanup_system_call</div><div class='del'>-0:</div><div class='del'>-	clc	8(8,%r12),BASED(cleanup_table_sysc_tif)</div><div class='add'>+	clg	%r9,BASED(cleanup_table+16)	# sysc_tif</div><div class='ctx'> 	jl	0f</div><div class='del'>-	clc	8(8,%r12),BASED(cleanup_table_sysc_tif+8)</div><div class='add'>+	clg	%r9,BASED(cleanup_table+24)	# sysc_restore</div><div class='ctx'> 	jl	cleanup_sysc_tif</div><div class='del'>-0:</div><div class='del'>-	clc	8(8,%r12),BASED(cleanup_table_sysc_restore)</div><div class='del'>-	jl	0f</div><div class='del'>-	clc	8(8,%r12),BASED(cleanup_table_sysc_restore+8)</div><div class='add'>+	clg	%r9,BASED(cleanup_table+32)	# sysc_done</div><div class='ctx'> 	jl	cleanup_sysc_restore</div><div class='del'>-0:</div><div class='del'>-	clc	8(8,%r12),BASED(cleanup_table_io_tif)</div><div class='add'>+	clg	%r9,BASED(cleanup_table+40)	# io_tif</div><div class='ctx'> 	jl	0f</div><div class='del'>-	clc	8(8,%r12),BASED(cleanup_table_io_tif+8)</div><div class='add'>+	clg	%r9,BASED(cleanup_table+48)	# io_restore</div><div class='ctx'> 	jl	cleanup_io_tif</div><div class='del'>-0:</div><div class='del'>-	clc	8(8,%r12),BASED(cleanup_table_io_restore)</div><div class='del'>-	jl	0f</div><div class='del'>-	clc	8(8,%r12),BASED(cleanup_table_io_restore+8)</div><div class='add'>+	clg	%r9,BASED(cleanup_table+56)	# io_done</div><div class='ctx'> 	jl	cleanup_io_restore</div><div class='del'>-0:</div><div class='del'>-	br	%r14</div><div class='add'>+0:	br	%r14</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> cleanup_system_call:</div><div class='del'>-	mvc	__LC_RETURN_PSW(16),0(%r12)</div><div class='del'>-	clc	__LC_RETURN_PSW+8(8),BASED(cleanup_system_call_insn+8)</div><div class='add'>+	# check if stpt has been executed</div><div class='add'>+	clg	%r9,BASED(cleanup_system_call_insn)</div><div class='ctx'> 	jh	0f</div><div class='del'>-	mvc	__LC_SYNC_ENTER_TIMER(8),__LC_MCCK_ENTER_TIMER</div><div class='del'>-	cghi	%r12,__LC_MCK_OLD_PSW</div><div class='del'>-	je	0f</div><div class='ctx'> 	mvc	__LC_SYNC_ENTER_TIMER(8),__LC_ASYNC_ENTER_TIMER</div><div class='del'>-0:	cghi	%r12,__LC_MCK_OLD_PSW</div><div class='del'>-	la	%r12,__LC_SAVE_AREA+80</div><div class='add'>+	cghi	%r11,__LC_SAVE_AREA_ASYNC</div><div class='ctx'> 	je	0f</div><div class='del'>-	la	%r12,__LC_SAVE_AREA+40</div><div class='del'>-0:	clc	__LC_RETURN_PSW+8(8),BASED(cleanup_system_call_insn+16)</div><div class='del'>-	jhe	cleanup_vtime</div><div class='del'>-	clc	__LC_RETURN_PSW+8(8),BASED(cleanup_system_call_insn)</div><div class='add'>+	mvc	__LC_SYNC_ENTER_TIMER(8),__LC_MCCK_ENTER_TIMER</div><div class='add'>+0:	# check if stmg has been executed</div><div class='add'>+	clg	%r9,BASED(cleanup_system_call_insn+8)</div><div class='ctx'> 	jh	0f</div><div class='del'>-	mvc	__LC_SAVE_AREA(40),0(%r12)</div><div class='del'>-0:	lg	%r15,__LC_KERNEL_STACK	# problem state -&gt; load ksp</div><div class='del'>-	aghi	%r15,-SP_SIZE		# make room for registers &amp; psw</div><div class='del'>-	stg	%r15,32(%r12)</div><div class='del'>-	stg	%r11,0(%r12)</div><div class='del'>-	CREATE_STACK_FRAME __LC_SAVE_AREA</div><div class='del'>-	mvc	8(8,%r12),__LC_THREAD_INFO</div><div class='del'>-	lg	%r12,__LC_THREAD_INFO</div><div class='del'>-	mvc	SP_PSW(16,%r15),__LC_SVC_OLD_PSW</div><div class='del'>-	mvc	SP_SVC_CODE(4,%r15),__LC_SVC_ILC</div><div class='del'>-	oi	__TI_flags+7(%r12),_TIF_SYSCALL</div><div class='del'>-cleanup_vtime:</div><div class='del'>-	clc	__LC_RETURN_PSW+8(8),BASED(cleanup_system_call_insn+24)</div><div class='del'>-	jhe	cleanup_stime</div><div class='del'>-	UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER</div><div class='del'>-cleanup_stime:</div><div class='del'>-	clc	__LC_RETURN_PSW+8(8),BASED(cleanup_system_call_insn+32)</div><div class='del'>-	jh	cleanup_update</div><div class='del'>-	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER</div><div class='del'>-cleanup_update:</div><div class='add'>+	mvc	__LC_SAVE_AREA_SYNC(64),0(%r11)</div><div class='add'>+0:	# check if base register setup + TIF bit load has been done</div><div class='add'>+	clg	%r9,BASED(cleanup_system_call_insn+16)</div><div class='add'>+	jhe	0f</div><div class='add'>+	# set up saved registers r10 and r12</div><div class='add'>+	stg	%r10,16(%r11)		# r10 last break</div><div class='add'>+	stg	%r12,32(%r11)		# r12 thread-info pointer</div><div class='add'>+0:	# check if the user time update has been done</div><div class='add'>+	clg	%r9,BASED(cleanup_system_call_insn+24)</div><div class='add'>+	jh	0f</div><div class='add'>+	lg	%r15,__LC_EXIT_TIMER</div><div class='add'>+	slg	%r15,__LC_SYNC_ENTER_TIMER</div><div class='add'>+	alg	%r15,__LC_USER_TIMER</div><div class='add'>+	stg	%r15,__LC_USER_TIMER</div><div class='add'>+0:	# check if the system time update has been done</div><div class='add'>+	clg	%r9,BASED(cleanup_system_call_insn+32)</div><div class='add'>+	jh	0f</div><div class='add'>+	lg	%r15,__LC_LAST_UPDATE_TIMER</div><div class='add'>+	slg	%r15,__LC_EXIT_TIMER</div><div class='add'>+	alg	%r15,__LC_SYSTEM_TIMER</div><div class='add'>+	stg	%r15,__LC_SYSTEM_TIMER</div><div class='add'>+0:	# update accounting time stamp</div><div class='ctx'> 	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER</div><div class='del'>-	srag	%r12,%r11,23</div><div class='del'>-	lg	%r12,__LC_THREAD_INFO</div><div class='add'>+	# do LAST_BREAK</div><div class='add'>+	lg	%r9,16(%r11)</div><div class='add'>+	srag	%r9,%r9,23</div><div class='ctx'> 	jz	0f</div><div class='del'>-	stg	%r11,__TI_last_break(%r12)</div><div class='del'>-0:	mvc	__LC_RETURN_PSW+8(8),BASED(cleanup_table_system_call+8)</div><div class='del'>-	la	%r12,__LC_RETURN_PSW</div><div class='add'>+	mvc	__TI_last_break(8,%r12),16(%r11)</div><div class='add'>+0:	# set up saved register r11</div><div class='add'>+	lg	%r15,__LC_KERNEL_STACK</div><div class='add'>+	aghi	%r15,-__PT_SIZE</div><div class='add'>+	stg	%r15,24(%r11)		# r11 pt_regs pointer</div><div class='add'>+	# fill pt_regs</div><div class='add'>+	mvc	__PT_R8(64,%r15),__LC_SAVE_AREA_SYNC</div><div class='add'>+	stmg	%r0,%r7,__PT_R0(%r15)</div><div class='add'>+	mvc	__PT_PSW(16,%r15),__LC_SVC_OLD_PSW</div><div class='add'>+	mvc	__PT_INT_CODE(4,%r15),__LC_SVC_ILC</div><div class='add'>+	# setup saved register r15</div><div class='add'>+	aghi	%r15,-STACK_FRAME_OVERHEAD</div><div class='add'>+	stg	%r15,56(%r11)		# r15 stack pointer</div><div class='add'>+	# set new psw address and exit</div><div class='add'>+	larl	%r9,sysc_do_svc</div><div class='ctx'> 	br	%r14</div><div class='ctx'> cleanup_system_call_insn:</div><div class='del'>-	.quad	sysc_saveall</div><div class='ctx'> 	.quad	system_call</div><div class='del'>-	.quad	sysc_vtime</div><div class='del'>-	.quad	sysc_stime</div><div class='del'>-	.quad	sysc_update</div><div class='add'>+	.quad	sysc_stmg</div><div class='add'>+	.quad	sysc_per</div><div class='add'>+	.quad	sysc_vtime+18</div><div class='add'>+	.quad	sysc_vtime+42</div><div class='ctx'> </div><div class='ctx'> cleanup_sysc_tif:</div><div class='del'>-	mvc	__LC_RETURN_PSW(8),0(%r12)</div><div class='del'>-	mvc	__LC_RETURN_PSW+8(8),BASED(cleanup_table_sysc_tif)</div><div class='del'>-	la	%r12,__LC_RETURN_PSW</div><div class='add'>+	larl	%r9,sysc_tif</div><div class='ctx'> 	br	%r14</div><div class='ctx'> </div><div class='ctx'> cleanup_sysc_restore:</div><div class='del'>-	clc	8(8,%r12),BASED(cleanup_sysc_restore_insn)</div><div class='del'>-	je	2f</div><div class='del'>-	clc	8(8,%r12),BASED(cleanup_sysc_restore_insn+8)</div><div class='del'>-	jhe	0f</div><div class='del'>-	mvc	__LC_EXIT_TIMER(8),__LC_MCCK_ENTER_TIMER</div><div class='del'>-	cghi	%r12,__LC_MCK_OLD_PSW</div><div class='add'>+	clg	%r9,BASED(cleanup_sysc_restore_insn)</div><div class='ctx'> 	je	0f</div><div class='del'>-	mvc	__LC_EXIT_TIMER(8),__LC_ASYNC_ENTER_TIMER</div><div class='del'>-0:	mvc	__LC_RETURN_PSW(16),SP_PSW(%r15)</div><div class='del'>-	cghi	%r12,__LC_MCK_OLD_PSW</div><div class='del'>-	la	%r12,__LC_SAVE_AREA+80</div><div class='del'>-	je	1f</div><div class='del'>-	la	%r12,__LC_SAVE_AREA+40</div><div class='del'>-1:	mvc	0(40,%r12),SP_R11(%r15)</div><div class='del'>-	lmg	%r0,%r10,SP_R0(%r15)</div><div class='del'>-	lg	%r15,SP_R15(%r15)</div><div class='del'>-2:	la	%r12,__LC_RETURN_PSW</div><div class='add'>+	lg	%r9,24(%r11)		# get saved pointer to pt_regs</div><div class='add'>+	mvc	__LC_RETURN_PSW(16),__PT_PSW(%r9)</div><div class='add'>+	mvc	0(64,%r11),__PT_R8(%r9)</div><div class='add'>+	lmg	%r0,%r7,__PT_R0(%r9)</div><div class='add'>+0:	lmg	%r8,%r9,__LC_RETURN_PSW</div><div class='ctx'> 	br	%r14</div><div class='ctx'> cleanup_sysc_restore_insn:</div><div class='ctx'> 	.quad	sysc_done - 4</div><div class='del'>-	.quad	sysc_done - 16</div><div class='ctx'> </div><div class='ctx'> cleanup_io_tif:</div><div class='del'>-	mvc	__LC_RETURN_PSW(8),0(%r12)</div><div class='del'>-	mvc	__LC_RETURN_PSW+8(8),BASED(cleanup_table_io_tif)</div><div class='del'>-	la	%r12,__LC_RETURN_PSW</div><div class='add'>+	larl	%r9,io_tif</div><div class='ctx'> 	br	%r14</div><div class='ctx'> </div><div class='ctx'> cleanup_io_restore:</div><div class='del'>-	clc	8(8,%r12),BASED(cleanup_io_restore_insn)</div><div class='del'>-	je	1f</div><div class='del'>-	clc	8(8,%r12),BASED(cleanup_io_restore_insn+8)</div><div class='del'>-	jhe	0f</div><div class='del'>-	mvc	__LC_EXIT_TIMER(8),__LC_MCCK_ENTER_TIMER</div><div class='del'>-0:	mvc	__LC_RETURN_PSW(16),SP_PSW(%r15)</div><div class='del'>-	mvc	__LC_SAVE_AREA+80(40),SP_R11(%r15)</div><div class='del'>-	lmg	%r0,%r10,SP_R0(%r15)</div><div class='del'>-	lg	%r15,SP_R15(%r15)</div><div class='del'>-1:	la	%r12,__LC_RETURN_PSW</div><div class='add'>+	clg	%r9,BASED(cleanup_io_restore_insn)</div><div class='add'>+	je	0f</div><div class='add'>+	lg	%r9,24(%r11)		# get saved r11 pointer to pt_regs</div><div class='add'>+	mvc	__LC_RETURN_PSW(16),__PT_PSW(%r9)</div><div class='add'>+	ni	__LC_RETURN_PSW+1,0xfd	# clear wait state bit</div><div class='add'>+	mvc	0(64,%r11),__PT_R8(%r9)</div><div class='add'>+	lmg	%r0,%r7,__PT_R0(%r9)</div><div class='add'>+0:	lmg	%r8,%r9,__LC_RETURN_PSW</div><div class='ctx'> 	br	%r14</div><div class='ctx'> cleanup_io_restore_insn:</div><div class='ctx'> 	.quad	io_done - 4</div><div class='del'>-	.quad	io_done - 16</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Integer constants</div><div class='ctx'>  */</div><div class='del'>-		.align	4</div><div class='add'>+	.align	8</div><div class='ctx'> .Lcritical_start:</div><div class='del'>-		.quad	__critical_start</div><div class='del'>-.Lcritical_end:</div><div class='del'>-		.quad	__critical_end</div><div class='add'>+	.quad	__critical_start</div><div class='add'>+.Lcritical_length:</div><div class='add'>+	.quad	__critical_end - __critical_start</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)</div><div class='ctx'> /*</div><div class='hunk'>@@ -1054,6 +943,7 @@ ENTRY(sie64a)</div><div class='ctx'> 	stmg	%r6,%r14,__SF_GPRS(%r15)	# save kernel registers</div><div class='ctx'> 	stg	%r2,__SF_EMPTY(%r15)		# save control block pointer</div><div class='ctx'> 	stg	%r3,__SF_EMPTY+8(%r15)		# save guest register save area</div><div class='add'>+	xc	__SF_EMPTY+16(8,%r15),__SF_EMPTY+16(%r15) # host id == 0</div><div class='ctx'> 	lmg	%r0,%r13,0(%r3)			# load guest gprs 0-13</div><div class='ctx'> 	lg	%r14,__LC_THREAD_INFO		# pointer thread_info struct</div><div class='ctx'> 	oi	__TI_flags+6(%r14),_TIF_SIE&gt;&gt;8</div><div class='hunk'>@@ -1070,7 +960,7 @@ sie_gmap:</div><div class='ctx'> 	SPP	__SF_EMPTY(%r15)		# set guest id</div><div class='ctx'> 	sie	0(%r14)</div><div class='ctx'> sie_done:</div><div class='del'>-	SPP	__LC_CMF_HPP			# set host id</div><div class='add'>+	SPP	__SF_EMPTY+16(%r15)		# set host id</div><div class='ctx'> 	lg	%r14,__LC_THREAD_INFO		# pointer thread_info struct</div><div class='ctx'> sie_exit:</div><div class='ctx'> 	lctlg	%c1,%c1,__LC_USER_ASCE		# load primary asce</div><div class='hunk'>@@ -1093,8 +983,10 @@ sie_fault:</div><div class='ctx'> 	.align	8</div><div class='ctx'> .Lsie_loop:</div><div class='ctx'> 	.quad	sie_loop</div><div class='del'>-.Lsie_done:</div><div class='del'>-	.quad	sie_done</div><div class='add'>+.Lsie_length:</div><div class='add'>+	.quad	sie_done - sie_loop</div><div class='add'>+.Lhost_id:</div><div class='add'>+	.quad	0</div><div class='ctx'> </div><div class='ctx'> 	.section __ex_table,"a"</div><div class='ctx'> 	.quad	sie_loop,sie_fault</div><div class='head'>diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S<br/>index 900068d2bf92..c27a0727f930 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/head.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/head.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/head.S</a></div><div class='hunk'>@@ -329,8 +329,8 @@ iplstart:</div><div class='ctx'> #</div><div class='ctx'> # reset files in VM reader</div><div class='ctx'> #</div><div class='del'>-	stidp	__LC_SAVE_AREA		# store cpuid</div><div class='del'>-	tm	__LC_SAVE_AREA,0xff	# running VM ?</div><div class='add'>+	stidp	__LC_SAVE_AREA_SYNC	# store cpuid</div><div class='add'>+	tm	__LC_SAVE_AREA_SYNC,0xff# running VM ?</div><div class='ctx'> 	bno	.Lnoreset</div><div class='ctx'> 	la	%r2,.Lreset</div><div class='ctx'> 	lhi	%r3,26</div><div class='head'>diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c<br/>index 3cd0f25ab015..47b168fb29c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/machine_kexec.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/machine_kexec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/machine_kexec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/machine_kexec.c</a></div><div class='hunk'>@@ -208,6 +208,7 @@ void machine_kexec_cleanup(struct kimage *image)</div><div class='ctx'> void arch_crash_save_vmcoreinfo(void)</div><div class='ctx'> {</div><div class='ctx'> 	VMCOREINFO_SYMBOL(lowcore_ptr);</div><div class='add'>+	VMCOREINFO_SYMBOL(high_memory);</div><div class='ctx'> 	VMCOREINFO_LENGTH(lowcore_ptr, NR_CPUS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/kernel/mem_detect.c b/arch/s390/kernel/mem_detect.c<br/>index 19b4568f4cee..22d502e885ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/mem_detect.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/mem_detect.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/mem_detect.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/mem_detect.c</a></div><div class='hunk'>@@ -64,70 +64,82 @@ void detect_memory_layout(struct mem_chunk chunk[])</div><div class='ctx'> EXPORT_SYMBOL(detect_memory_layout);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Move memory chunks array from index "from" to index "to"</div><div class='add'>+ */</div><div class='add'>+static void mem_chunk_move(struct mem_chunk chunk[], int to, int from)</div><div class='add'>+{</div><div class='add'>+	int cnt = MEMORY_CHUNKS - to;</div><div class='add'>+</div><div class='add'>+	memmove(&amp;chunk[to], &amp;chunk[from], cnt * sizeof(struct mem_chunk));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize memory chunk</div><div class='add'>+ */</div><div class='add'>+static void mem_chunk_init(struct mem_chunk *chunk, unsigned long addr,</div><div class='add'>+			   unsigned long size, int type)</div><div class='add'>+{</div><div class='add'>+	chunk-&gt;type = type;</div><div class='add'>+	chunk-&gt;addr = addr;</div><div class='add'>+	chunk-&gt;size = size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Create memory hole with given address, size, and type</div><div class='ctx'>  */</div><div class='del'>-void create_mem_hole(struct mem_chunk chunks[], unsigned long addr,</div><div class='add'>+void create_mem_hole(struct mem_chunk chunk[], unsigned long addr,</div><div class='ctx'> 		     unsigned long size, int type)</div><div class='ctx'> {</div><div class='del'>-	unsigned long start, end, new_size;</div><div class='del'>-	int i;</div><div class='add'>+	unsigned long lh_start, lh_end, lh_size, ch_start, ch_end, ch_size;</div><div class='add'>+	int i, ch_type;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MEMORY_CHUNKS; i++) {</div><div class='del'>-		if (chunks[i].size == 0)</div><div class='del'>-			continue;</div><div class='del'>-		if (addr + size &lt; chunks[i].addr)</div><div class='del'>-			continue;</div><div class='del'>-		if (addr &gt;= chunks[i].addr + chunks[i].size)</div><div class='add'>+		if (chunk[i].size == 0)</div><div class='ctx'> 			continue;</div><div class='del'>-		start = max(addr, chunks[i].addr);</div><div class='del'>-		end = min(addr + size, chunks[i].addr + chunks[i].size);</div><div class='del'>-		new_size = end - start;</div><div class='del'>-		if (new_size == 0)</div><div class='del'>-			continue;</div><div class='del'>-		if (start == chunks[i].addr &amp;&amp;</div><div class='del'>-		    end == chunks[i].addr + chunks[i].size) {</div><div class='del'>-			/* Remove chunk */</div><div class='del'>-			chunks[i].type = type;</div><div class='del'>-		} else if (start == chunks[i].addr) {</div><div class='del'>-			/* Make chunk smaller at start */</div><div class='del'>-			if (i &gt;= MEMORY_CHUNKS - 1)</div><div class='del'>-				panic("Unable to create memory hole");</div><div class='del'>-			memmove(&amp;chunks[i + 1], &amp;chunks[i],</div><div class='del'>-				sizeof(struct mem_chunk) *</div><div class='del'>-				(MEMORY_CHUNKS - (i + 1)));</div><div class='del'>-			chunks[i + 1].addr = chunks[i].addr + new_size;</div><div class='del'>-			chunks[i + 1].size = chunks[i].size - new_size;</div><div class='del'>-			chunks[i].size = new_size;</div><div class='del'>-			chunks[i].type = type;</div><div class='del'>-			i += 1;</div><div class='del'>-		} else if (end == chunks[i].addr + chunks[i].size) {</div><div class='del'>-			/* Make chunk smaller at end */</div><div class='del'>-			if (i &gt;= MEMORY_CHUNKS - 1)</div><div class='del'>-				panic("Unable to create memory hole");</div><div class='del'>-			memmove(&amp;chunks[i + 1], &amp;chunks[i],</div><div class='del'>-				sizeof(struct mem_chunk) *</div><div class='del'>-				(MEMORY_CHUNKS - (i + 1)));</div><div class='del'>-			chunks[i + 1].addr = start;</div><div class='del'>-			chunks[i + 1].size = new_size;</div><div class='del'>-			chunks[i + 1].type = type;</div><div class='del'>-			chunks[i].size -= new_size;</div><div class='add'>+</div><div class='add'>+		/* Define chunk properties */</div><div class='add'>+		ch_start = chunk[i].addr;</div><div class='add'>+		ch_size = chunk[i].size;</div><div class='add'>+		ch_end = ch_start + ch_size - 1;</div><div class='add'>+		ch_type = chunk[i].type;</div><div class='add'>+</div><div class='add'>+		/* Is memory chunk hit by memory hole? */</div><div class='add'>+		if (addr + size &lt;= ch_start)</div><div class='add'>+			continue; /* No: memory hole in front of chunk */</div><div class='add'>+		if (addr &gt; ch_end)</div><div class='add'>+			continue; /* No: memory hole after chunk */</div><div class='add'>+</div><div class='add'>+		/* Yes: Define local hole properties */</div><div class='add'>+		lh_start = max(addr, chunk[i].addr);</div><div class='add'>+		lh_end = min(addr + size - 1, ch_end);</div><div class='add'>+		lh_size = lh_end - lh_start + 1;</div><div class='add'>+</div><div class='add'>+		if (lh_start == ch_start &amp;&amp; lh_end == ch_end) {</div><div class='add'>+			/* Hole covers complete memory chunk */</div><div class='add'>+			mem_chunk_init(&amp;chunk[i], lh_start, lh_size, type);</div><div class='add'>+		} else if (lh_end == ch_end) {</div><div class='add'>+			/* Hole starts in memory chunk and convers chunk end */</div><div class='add'>+			mem_chunk_move(chunk, i + 1, i);</div><div class='add'>+			mem_chunk_init(&amp;chunk[i], ch_start, ch_size - lh_size,</div><div class='add'>+				       ch_type);</div><div class='add'>+			mem_chunk_init(&amp;chunk[i + 1], lh_start, lh_size, type);</div><div class='ctx'> 			i += 1;</div><div class='add'>+		} else if (lh_start == ch_start) {</div><div class='add'>+			/* Hole ends in memory chunk */</div><div class='add'>+			mem_chunk_move(chunk, i + 1, i);</div><div class='add'>+			mem_chunk_init(&amp;chunk[i], lh_start, lh_size, type);</div><div class='add'>+			mem_chunk_init(&amp;chunk[i + 1], lh_end + 1,</div><div class='add'>+				       ch_size - lh_size, ch_type);</div><div class='add'>+			break;</div><div class='ctx'> 		} else {</div><div class='del'>-			/* Create memory hole */</div><div class='del'>-			if (i &gt;= MEMORY_CHUNKS - 2)</div><div class='del'>-				panic("Unable to create memory hole");</div><div class='del'>-			memmove(&amp;chunks[i + 2], &amp;chunks[i],</div><div class='del'>-				sizeof(struct mem_chunk) *</div><div class='del'>-				(MEMORY_CHUNKS - (i + 2)));</div><div class='del'>-			chunks[i + 1].addr = addr;</div><div class='del'>-			chunks[i + 1].size = size;</div><div class='del'>-			chunks[i + 1].type = type;</div><div class='del'>-			chunks[i + 2].addr = addr + size;</div><div class='del'>-			chunks[i + 2].size =</div><div class='del'>-				chunks[i].addr + chunks[i].size - (addr + size);</div><div class='del'>-			chunks[i + 2].type = chunks[i].type;</div><div class='del'>-			chunks[i].size = addr - chunks[i].addr;</div><div class='del'>-			i += 2;</div><div class='add'>+			/* Hole splits memory chunk */</div><div class='add'>+			mem_chunk_move(chunk, i + 2, i);</div><div class='add'>+			mem_chunk_init(&amp;chunk[i], ch_start,</div><div class='add'>+				       lh_start - ch_start, ch_type);</div><div class='add'>+			mem_chunk_init(&amp;chunk[i + 1], lh_start, lh_size, type);</div><div class='add'>+			mem_chunk_init(&amp;chunk[i + 2], lh_end + 1,</div><div class='add'>+				       ch_end - lh_end, ch_type);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c<br/>index fab88431a06f..0fd2e863e114 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/nmi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/nmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/nmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/nmi.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@ struct mcck_struct {</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU(struct mcck_struct, cpu_mcck);</div><div class='ctx'> </div><div class='del'>-static NORET_TYPE void s390_handle_damage(char *msg)</div><div class='add'>+static void s390_handle_damage(char *msg)</div><div class='ctx'> {</div><div class='ctx'> 	smp_send_stop();</div><div class='ctx'> 	disabled_wait((unsigned long) __builtin_return_address(0));</div><div class='head'>diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c<br/>index 573bc29551ef..9d82ed4bcb27 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/ptrace.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/ptrace.c</a></div><div class='hunk'>@@ -740,20 +740,17 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)</div><div class='ctx'> 	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))</div><div class='ctx'> 		trace_sys_enter(regs, regs-&gt;gprs[2]);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context))</div><div class='del'>-		audit_syscall_entry(is_compat_task() ?</div><div class='del'>-					AUDIT_ARCH_S390 : AUDIT_ARCH_S390X,</div><div class='del'>-				    regs-&gt;gprs[2], regs-&gt;orig_gpr2,</div><div class='del'>-				    regs-&gt;gprs[3], regs-&gt;gprs[4],</div><div class='del'>-				    regs-&gt;gprs[5]);</div><div class='add'>+	audit_syscall_entry(is_compat_task() ?</div><div class='add'>+				AUDIT_ARCH_S390 : AUDIT_ARCH_S390X,</div><div class='add'>+			    regs-&gt;gprs[2], regs-&gt;orig_gpr2,</div><div class='add'>+			    regs-&gt;gprs[3], regs-&gt;gprs[4],</div><div class='add'>+			    regs-&gt;gprs[5]);</div><div class='ctx'> 	return ret ?: regs-&gt;gprs[2];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> asmlinkage void do_syscall_trace_exit(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(current-&gt;audit_context))</div><div class='del'>-		audit_syscall_exit(AUDITSC_RESULT(regs-&gt;gprs[2]),</div><div class='del'>-				   regs-&gt;gprs[2]);</div><div class='add'>+	audit_syscall_exit(regs);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))</div><div class='ctx'> 		trace_sys_exit(regs, regs-&gt;gprs[2]);</div><div class='head'>diff --git a/arch/s390/kernel/reipl64.S b/arch/s390/kernel/reipl64.S<br/>index 732a793ec53a..36b32658fb24 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/reipl64.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/reipl64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/reipl64.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/reipl64.S</a></div><div class='hunk'>@@ -17,11 +17,11 @@</div><div class='ctx'> #</div><div class='ctx'> ENTRY(store_status)</div><div class='ctx'> 	/* Save register one and load save area base */</div><div class='del'>-	stg	%r1,__LC_SAVE_AREA+120(%r0)</div><div class='add'>+	stg	%r1,__LC_SAVE_AREA_RESTART</div><div class='ctx'> 	lghi	%r1,SAVE_AREA_BASE</div><div class='ctx'> 	/* General purpose registers */</div><div class='ctx'> 	stmg	%r0,%r15,__LC_GPREGS_SAVE_AREA-SAVE_AREA_BASE(%r1)</div><div class='del'>-	lg	%r2,__LC_SAVE_AREA+120(%r0)</div><div class='add'>+	lg	%r2,__LC_SAVE_AREA_RESTART</div><div class='ctx'> 	stg	%r2,__LC_GPREGS_SAVE_AREA-SAVE_AREA_BASE+8(%r1)</div><div class='ctx'> 	/* Control registers */</div><div class='ctx'> 	stctg	%c0,%c15,__LC_CREGS_SAVE_AREA-SAVE_AREA_BASE(%r1)</div><div class='head'>diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c<br/>index f11d1b037c50..354de0763eff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/setup.c</a></div><div class='hunk'>@@ -95,6 +95,15 @@ struct mem_chunk __initdata memory_chunk[MEMORY_CHUNKS];</div><div class='ctx'> int __initdata memory_end_set;</div><div class='ctx'> unsigned long __initdata memory_end;</div><div class='ctx'> </div><div class='add'>+unsigned long VMALLOC_START;</div><div class='add'>+EXPORT_SYMBOL(VMALLOC_START);</div><div class='add'>+</div><div class='add'>+unsigned long VMALLOC_END;</div><div class='add'>+EXPORT_SYMBOL(VMALLOC_END);</div><div class='add'>+</div><div class='add'>+struct page *vmemmap;</div><div class='add'>+EXPORT_SYMBOL(vmemmap);</div><div class='add'>+</div><div class='ctx'> /* An array with a pointer to the lowcore of every CPU. */</div><div class='ctx'> struct _lowcore *lowcore_ptr[NR_CPUS];</div><div class='ctx'> EXPORT_SYMBOL(lowcore_ptr);</div><div class='hunk'>@@ -278,6 +287,15 @@ static int __init early_parse_mem(char *p)</div><div class='ctx'> }</div><div class='ctx'> early_param("mem", early_parse_mem);</div><div class='ctx'> </div><div class='add'>+static int __init parse_vmalloc(char *arg)</div><div class='add'>+{</div><div class='add'>+	if (!arg)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	VMALLOC_END = (memparse(arg, &amp;arg) + PAGE_SIZE - 1) &amp; PAGE_MASK;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("vmalloc", parse_vmalloc);</div><div class='add'>+</div><div class='ctx'> unsigned int user_mode = HOME_SPACE_MODE;</div><div class='ctx'> EXPORT_SYMBOL_GPL(user_mode);</div><div class='ctx'> </div><div class='hunk'>@@ -383,7 +401,6 @@ setup_lowcore(void)</div><div class='ctx'> 		__ctl_set_bit(14, 29);</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='del'>-	lc-&gt;cmf_hpp = -1ULL;</div><div class='ctx'> 	lc-&gt;vdso_per_cpu_data = (unsigned long) &amp;lc-&gt;paste[0];</div><div class='ctx'> #endif</div><div class='ctx'> 	lc-&gt;sync_enter_timer = S390_lowcore.sync_enter_timer;</div><div class='hunk'>@@ -479,8 +496,7 @@ EXPORT_SYMBOL_GPL(real_memory_size);</div><div class='ctx'> </div><div class='ctx'> static void __init setup_memory_end(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long memory_size;</div><div class='del'>-	unsigned long max_mem;</div><div class='add'>+	unsigned long vmax, vmalloc_size, tmp;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -490,12 +506,9 @@ static void __init setup_memory_end(void)</div><div class='ctx'> 		memory_end_set = 1;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	memory_size = 0;</div><div class='add'>+	real_memory_size = 0;</div><div class='ctx'> 	memory_end &amp;= PAGE_MASK;</div><div class='ctx'> </div><div class='del'>-	max_mem = memory_end ? min(VMEM_MAX_PHYS, memory_end) : VMEM_MAX_PHYS;</div><div class='del'>-	memory_end = min(max_mem, memory_end);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make sure all chunks are MAX_ORDER aligned so we don't need the</div><div class='ctx'> 	 * extra checks that HOLES_IN_ZONE would require.</div><div class='hunk'>@@ -515,23 +528,48 @@ static void __init setup_memory_end(void)</div><div class='ctx'> 			chunk-&gt;addr = start;</div><div class='ctx'> 			chunk-&gt;size = end - start;</div><div class='ctx'> 		}</div><div class='add'>+		real_memory_size = max(real_memory_size,</div><div class='add'>+				       chunk-&gt;addr + chunk-&gt;size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Choose kernel address space layout: 2, 3, or 4 levels. */</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+	vmalloc_size = VMALLOC_END ?: 128UL &lt;&lt; 30;</div><div class='add'>+	tmp = (memory_end ?: real_memory_size) / PAGE_SIZE;</div><div class='add'>+	tmp = tmp * (sizeof(struct page) + PAGE_SIZE) + vmalloc_size;</div><div class='add'>+	if (tmp &lt;= (1UL &lt;&lt; 42))</div><div class='add'>+		vmax = 1UL &lt;&lt; 42;	/* 3-level kernel page table */</div><div class='add'>+	else</div><div class='add'>+		vmax = 1UL &lt;&lt; 53;	/* 4-level kernel page table */</div><div class='add'>+#else</div><div class='add'>+	vmalloc_size = VMALLOC_END ?: 96UL &lt;&lt; 20;</div><div class='add'>+	vmax = 1UL &lt;&lt; 31;		/* 2-level kernel page table */</div><div class='add'>+#endif</div><div class='add'>+	/* vmalloc area is at the end of the kernel address space. */</div><div class='add'>+	VMALLOC_END = vmax;</div><div class='add'>+	VMALLOC_START = vmax - vmalloc_size;</div><div class='add'>+</div><div class='add'>+	/* Split remaining virtual space between 1:1 mapping &amp; vmemmap array */</div><div class='add'>+	tmp = VMALLOC_START / (PAGE_SIZE + sizeof(struct page));</div><div class='add'>+	tmp = VMALLOC_START - tmp * sizeof(struct page);</div><div class='add'>+	tmp &amp;= ~((vmax &gt;&gt; 11) - 1);	/* align to page table level */</div><div class='add'>+	tmp = min(tmp, 1UL &lt;&lt; MAX_PHYSMEM_BITS);</div><div class='add'>+	vmemmap = (struct page *) tmp;</div><div class='add'>+</div><div class='add'>+	/* Take care that memory_end is set and &lt;= vmemmap */</div><div class='add'>+	memory_end = min(memory_end ?: real_memory_size, tmp);</div><div class='add'>+</div><div class='add'>+	/* Fixup memory chunk array to fit into 0..memory_end */</div><div class='ctx'> 	for (i = 0; i &lt; MEMORY_CHUNKS; i++) {</div><div class='ctx'> 		struct mem_chunk *chunk = &amp;memory_chunk[i];</div><div class='ctx'> </div><div class='del'>-		real_memory_size = max(real_memory_size,</div><div class='del'>-				       chunk-&gt;addr + chunk-&gt;size);</div><div class='del'>-		if (chunk-&gt;addr &gt;= max_mem) {</div><div class='add'>+		if (chunk-&gt;addr &gt;= memory_end) {</div><div class='ctx'> 			memset(chunk, 0, sizeof(*chunk));</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		if (chunk-&gt;addr + chunk-&gt;size &gt; max_mem)</div><div class='del'>-			chunk-&gt;size = max_mem - chunk-&gt;addr;</div><div class='del'>-		memory_size = max(memory_size, chunk-&gt;addr + chunk-&gt;size);</div><div class='add'>+		if (chunk-&gt;addr + chunk-&gt;size &gt; memory_end)</div><div class='add'>+			chunk-&gt;size = memory_end - chunk-&gt;addr;</div><div class='ctx'> 	}</div><div class='del'>-	if (!memory_end)</div><div class='del'>-		memory_end = memory_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void *restart_stack __attribute__((__section__(".data")));</div><div class='hunk'>@@ -655,7 +693,6 @@ static int __init verify_crash_base(unsigned long crash_base,</div><div class='ctx'> static void __init reserve_kdump_bootmem(unsigned long addr, unsigned long size,</div><div class='ctx'> 					 int type)</div><div class='ctx'> {</div><div class='del'>-</div><div class='ctx'> 	create_mem_hole(memory_chunk, addr, size, type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c<br/>index 7f6f9f354545..a8ba840294ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/signal.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/signal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/signal.c</a></div><div class='hunk'>@@ -302,9 +302,13 @@ static int setup_frame(int sig, struct k_sigaction *ka,</div><div class='ctx'> </div><div class='ctx'> 	/* We forgot to include these in the sigcontext.</div><div class='ctx'> 	   To avoid breaking binary compatibility, they are passed as args. */</div><div class='del'>-	regs-&gt;gprs[4] = current-&gt;thread.trap_no;</div><div class='del'>-	regs-&gt;gprs[5] = current-&gt;thread.prot_addr;</div><div class='del'>-	regs-&gt;gprs[6] = task_thread_info(current)-&gt;last_break;</div><div class='add'>+	if (sig == SIGSEGV || sig == SIGBUS || sig == SIGILL ||</div><div class='add'>+	    sig == SIGTRAP || sig == SIGFPE) {</div><div class='add'>+		/* set extra registers only for synchronous signals */</div><div class='add'>+		regs-&gt;gprs[4] = regs-&gt;int_code &amp; 127;</div><div class='add'>+		regs-&gt;gprs[5] = regs-&gt;int_parm_long;</div><div class='add'>+		regs-&gt;gprs[6] = task_thread_info(current)-&gt;last_break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Place signal number on stack to allow backtrace from handler.  */</div><div class='ctx'> 	if (__put_user(regs-&gt;gprs[2], (int __user *) &amp;frame-&gt;signo))</div><div class='hunk'>@@ -434,13 +438,13 @@ void do_signal(struct pt_regs *regs)</div><div class='ctx'> 	 * call information.</div><div class='ctx'> 	 */</div><div class='ctx'> 	current_thread_info()-&gt;system_call =</div><div class='del'>-		test_thread_flag(TIF_SYSCALL) ? regs-&gt;svc_code : 0;</div><div class='add'>+		test_thread_flag(TIF_SYSCALL) ? regs-&gt;int_code : 0;</div><div class='ctx'> 	signr = get_signal_to_deliver(&amp;info, &amp;ka, regs, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (signr &gt; 0) {</div><div class='ctx'> 		/* Whee!  Actually deliver the signal.  */</div><div class='ctx'> 		if (current_thread_info()-&gt;system_call) {</div><div class='del'>-			regs-&gt;svc_code = current_thread_info()-&gt;system_call;</div><div class='add'>+			regs-&gt;int_code = current_thread_info()-&gt;system_call;</div><div class='ctx'> 			/* Check for system call restarting. */</div><div class='ctx'> 			switch (regs-&gt;gprs[2]) {</div><div class='ctx'> 			case -ERESTART_RESTARTBLOCK:</div><div class='hunk'>@@ -457,7 +461,7 @@ void do_signal(struct pt_regs *regs)</div><div class='ctx'> 				regs-&gt;gprs[2] = regs-&gt;orig_gpr2;</div><div class='ctx'> 				regs-&gt;psw.addr =</div><div class='ctx'> 					__rewind_psw(regs-&gt;psw,</div><div class='del'>-						     regs-&gt;svc_code &gt;&gt; 16);</div><div class='add'>+						     regs-&gt;int_code &gt;&gt; 16);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -488,11 +492,11 @@ void do_signal(struct pt_regs *regs)</div><div class='ctx'> 	/* No handlers present - check for system call restart */</div><div class='ctx'> 	clear_thread_flag(TIF_SYSCALL);</div><div class='ctx'> 	if (current_thread_info()-&gt;system_call) {</div><div class='del'>-		regs-&gt;svc_code = current_thread_info()-&gt;system_call;</div><div class='add'>+		regs-&gt;int_code = current_thread_info()-&gt;system_call;</div><div class='ctx'> 		switch (regs-&gt;gprs[2]) {</div><div class='ctx'> 		case -ERESTART_RESTARTBLOCK:</div><div class='ctx'> 			/* Restart with sys_restart_syscall */</div><div class='del'>-			regs-&gt;svc_code = __NR_restart_syscall;</div><div class='add'>+			regs-&gt;int_code = __NR_restart_syscall;</div><div class='ctx'> 		/* fallthrough */</div><div class='ctx'> 		case -ERESTARTNOHAND:</div><div class='ctx'> 		case -ERESTARTSYS:</div><div class='head'>diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c<br/>index 3ea872890da2..2398ce6b15ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/smp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/smp.c</a></div><div class='hunk'>@@ -69,9 +69,7 @@ enum s390_cpu_state {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> DEFINE_MUTEX(smp_cpu_state_mutex);</div><div class='del'>-int smp_cpu_polarization[NR_CPUS];</div><div class='ctx'> static int smp_cpu_state[NR_CPUS];</div><div class='del'>-static int cpu_management;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU(struct cpu, cpu_devices);</div><div class='ctx'> </div><div class='hunk'>@@ -149,29 +147,59 @@ void smp_switch_to_ipl_cpu(void (*func)(void *), void *data)</div><div class='ctx'> 	sp -= sizeof(struct pt_regs);</div><div class='ctx'> 	regs = (struct pt_regs *) sp;</div><div class='ctx'> 	memcpy(&amp;regs-&gt;gprs, &amp;current_lc-&gt;gpregs_save_area, sizeof(regs-&gt;gprs));</div><div class='del'>-	regs-&gt;psw = lc-&gt;psw_save_area;</div><div class='add'>+	regs-&gt;psw = current_lc-&gt;psw_save_area;</div><div class='ctx'> 	sp -= STACK_FRAME_OVERHEAD;</div><div class='ctx'> 	sf = (struct stack_frame *) sp;</div><div class='del'>-	sf-&gt;back_chain = regs-&gt;gprs[15];</div><div class='add'>+	sf-&gt;back_chain = 0;</div><div class='ctx'> 	smp_switch_to_cpu(func, data, sp, stap(), __cpu_logical_map[0]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void smp_stop_cpu(void)</div><div class='add'>+{</div><div class='add'>+	while (sigp(smp_processor_id(), sigp_stop) == sigp_busy)</div><div class='add'>+		cpu_relax();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void smp_send_stop(void)</div><div class='ctx'> {</div><div class='del'>-	int cpu, rc;</div><div class='add'>+	cpumask_t cpumask;</div><div class='add'>+	int cpu;</div><div class='add'>+	u64 end;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable all interrupts/machine checks */</div><div class='ctx'> 	__load_psw_mask(psw_kernel_bits | PSW_MASK_DAT);</div><div class='ctx'> 	trace_hardirqs_off();</div><div class='ctx'> </div><div class='del'>-	/* stop all processors */</div><div class='del'>-	for_each_online_cpu(cpu) {</div><div class='del'>-		if (cpu == smp_processor_id())</div><div class='del'>-			continue;</div><div class='del'>-		do {</div><div class='del'>-			rc = sigp(cpu, sigp_stop);</div><div class='del'>-		} while (rc == sigp_busy);</div><div class='add'>+	cpumask_copy(&amp;cpumask, cpu_online_mask);</div><div class='add'>+	cpumask_clear_cpu(smp_processor_id(), &amp;cpumask);</div><div class='add'>+</div><div class='add'>+	if (oops_in_progress) {</div><div class='add'>+		/*</div><div class='add'>+		 * Give the other cpus the opportunity to complete</div><div class='add'>+		 * outstanding interrupts before stopping them.</div><div class='add'>+		 */</div><div class='add'>+		end = get_clock() + (1000000UL &lt;&lt; 12);</div><div class='add'>+		for_each_cpu(cpu, &amp;cpumask) {</div><div class='add'>+			set_bit(ec_stop_cpu, (unsigned long *)</div><div class='add'>+				&amp;lowcore_ptr[cpu]-&gt;ext_call_fast);</div><div class='add'>+			while (sigp(cpu, sigp_emergency_signal) == sigp_busy &amp;&amp;</div><div class='add'>+			       get_clock() &lt; end)</div><div class='add'>+				cpu_relax();</div><div class='add'>+		}</div><div class='add'>+		while (get_clock() &lt; end) {</div><div class='add'>+			for_each_cpu(cpu, &amp;cpumask)</div><div class='add'>+				if (cpu_stopped(cpu))</div><div class='add'>+					cpumask_clear_cpu(cpu, &amp;cpumask);</div><div class='add'>+			if (cpumask_empty(&amp;cpumask))</div><div class='add'>+				break;</div><div class='add'>+			cpu_relax();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	/* stop all processors */</div><div class='add'>+	for_each_cpu(cpu, &amp;cpumask) {</div><div class='add'>+		while (sigp(cpu, sigp_stop) == sigp_busy)</div><div class='add'>+			cpu_relax();</div><div class='ctx'> 		while (!cpu_stopped(cpu))</div><div class='ctx'> 			cpu_relax();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -187,7 +215,7 @@ static void do_ext_call_interrupt(unsigned int ext_int_code,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long bits;</div><div class='ctx'> </div><div class='del'>-	if (ext_int_code == 0x1202)</div><div class='add'>+	if ((ext_int_code &amp; 0xffff) == 0x1202)</div><div class='ctx'> 		kstat_cpu(smp_processor_id()).irqs[EXTINT_EXC]++;</div><div class='ctx'> 	else</div><div class='ctx'> 		kstat_cpu(smp_processor_id()).irqs[EXTINT_EMS]++;</div><div class='hunk'>@@ -196,6 +224,9 @@ static void do_ext_call_interrupt(unsigned int ext_int_code,</div><div class='ctx'> 	 */</div><div class='ctx'> 	bits = xchg(&amp;S390_lowcore.ext_call_fast, 0);</div><div class='ctx'> </div><div class='add'>+	if (test_bit(ec_stop_cpu, &amp;bits))</div><div class='add'>+		smp_stop_cpu();</div><div class='add'>+</div><div class='ctx'> 	if (test_bit(ec_schedule, &amp;bits))</div><div class='ctx'> 		scheduler_ipi();</div><div class='ctx'> </div><div class='hunk'>@@ -204,6 +235,7 @@ static void do_ext_call_interrupt(unsigned int ext_int_code,</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(ec_call_function_single, &amp;bits))</div><div class='ctx'> 		generic_smp_call_function_single_interrupt();</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -369,7 +401,7 @@ static int smp_rescan_cpus_sigp(cpumask_t avail)</div><div class='ctx'> 		if (cpu_known(cpu_id))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		__cpu_logical_map[logical_cpu] = cpu_id;</div><div class='del'>-		smp_cpu_polarization[logical_cpu] = POLARIZATION_UNKNWN;</div><div class='add'>+		cpu_set_polarization(logical_cpu, POLARIZATION_UNKNOWN);</div><div class='ctx'> 		if (!cpu_stopped(logical_cpu))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		set_cpu_present(logical_cpu, true);</div><div class='hunk'>@@ -403,7 +435,7 @@ static int smp_rescan_cpus_sclp(cpumask_t avail)</div><div class='ctx'> 		if (cpu_known(cpu_id))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		__cpu_logical_map[logical_cpu] = cpu_id;</div><div class='del'>-		smp_cpu_polarization[logical_cpu] = POLARIZATION_UNKNWN;</div><div class='add'>+		cpu_set_polarization(logical_cpu, POLARIZATION_UNKNOWN);</div><div class='ctx'> 		set_cpu_present(logical_cpu, true);</div><div class='ctx'> 		if (cpu &gt;= info-&gt;configured)</div><div class='ctx'> 			smp_cpu_state[logical_cpu] = CPU_STATE_STANDBY;</div><div class='hunk'>@@ -656,7 +688,7 @@ int __cpuinit __cpu_up(unsigned int cpu)</div><div class='ctx'> 				     - sizeof(struct stack_frame));</div><div class='ctx'> 	memset(sf, 0, sizeof(struct stack_frame));</div><div class='ctx'> 	sf-&gt;gprs[9] = (unsigned long) sf;</div><div class='del'>-	cpu_lowcore-&gt;save_area[15] = (unsigned long) sf;</div><div class='add'>+	cpu_lowcore-&gt;gpregs_save_area[15] = (unsigned long) sf;</div><div class='ctx'> 	__ctl_store(cpu_lowcore-&gt;cregs_save_area, 0, 15);</div><div class='ctx'> 	atomic_inc(&amp;init_mm.context.attach_count);</div><div class='ctx'> 	asm volatile(</div><div class='hunk'>@@ -806,7 +838,7 @@ void __init smp_prepare_boot_cpu(void)</div><div class='ctx'> 	S390_lowcore.percpu_offset = __per_cpu_offset[0];</div><div class='ctx'> 	current_set[0] = current;</div><div class='ctx'> 	smp_cpu_state[0] = CPU_STATE_CONFIGURED;</div><div class='del'>-	smp_cpu_polarization[0] = POLARIZATION_UNKNWN;</div><div class='add'>+	cpu_set_polarization(0, POLARIZATION_UNKNOWN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init smp_cpus_done(unsigned int max_cpus)</div><div class='hunk'>@@ -831,8 +863,8 @@ int setup_profiling_timer(unsigned int multiplier)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-static ssize_t cpu_configure_show(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t cpu_configure_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t count;</div><div class='ctx'> </div><div class='hunk'>@@ -842,8 +874,8 @@ static ssize_t cpu_configure_show(struct sys_device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t cpu_configure_store(struct sys_device *dev,</div><div class='del'>-				  struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t cpu_configure_store(struct device *dev,</div><div class='add'>+				  struct device_attribute *attr,</div><div class='ctx'> 				  const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = dev-&gt;id;</div><div class='hunk'>@@ -868,7 +900,8 @@ static ssize_t cpu_configure_store(struct sys_device *dev,</div><div class='ctx'> 			rc = sclp_cpu_deconfigure(__cpu_logical_map[cpu]);</div><div class='ctx'> 			if (!rc) {</div><div class='ctx'> 				smp_cpu_state[cpu] = CPU_STATE_STANDBY;</div><div class='del'>-				smp_cpu_polarization[cpu] = POLARIZATION_UNKNWN;</div><div class='add'>+				cpu_set_polarization(cpu, POLARIZATION_UNKNOWN);</div><div class='add'>+				topology_expect_change();</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -877,7 +910,8 @@ static ssize_t cpu_configure_store(struct sys_device *dev,</div><div class='ctx'> 			rc = sclp_cpu_configure(__cpu_logical_map[cpu]);</div><div class='ctx'> 			if (!rc) {</div><div class='ctx'> 				smp_cpu_state[cpu] = CPU_STATE_CONFIGURED;</div><div class='del'>-				smp_cpu_polarization[cpu] = POLARIZATION_UNKNWN;</div><div class='add'>+				cpu_set_polarization(cpu, POLARIZATION_UNKNOWN);</div><div class='add'>+				topology_expect_change();</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -889,52 +923,21 @@ out:</div><div class='ctx'> 	put_online_cpus();</div><div class='ctx'> 	return rc ? rc : count;</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_ATTR(configure, 0644, cpu_configure_show, cpu_configure_store);</div><div class='add'>+static DEVICE_ATTR(configure, 0644, cpu_configure_show, cpu_configure_store);</div><div class='ctx'> #endif /* CONFIG_HOTPLUG_CPU */</div><div class='ctx'> </div><div class='del'>-static ssize_t cpu_polarization_show(struct sys_device *dev,</div><div class='del'>-				     struct sysdev_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	int cpu = dev-&gt;id;</div><div class='del'>-	ssize_t count;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;smp_cpu_state_mutex);</div><div class='del'>-	switch (smp_cpu_polarization[cpu]) {</div><div class='del'>-	case POLARIZATION_HRZ:</div><div class='del'>-		count = sprintf(buf, "horizontal\n");</div><div class='del'>-		break;</div><div class='del'>-	case POLARIZATION_VL:</div><div class='del'>-		count = sprintf(buf, "vertical:low\n");</div><div class='del'>-		break;</div><div class='del'>-	case POLARIZATION_VM:</div><div class='del'>-		count = sprintf(buf, "vertical:medium\n");</div><div class='del'>-		break;</div><div class='del'>-	case POLARIZATION_VH:</div><div class='del'>-		count = sprintf(buf, "vertical:high\n");</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		count = sprintf(buf, "unknown\n");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;smp_cpu_state_mutex);</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-static SYSDEV_ATTR(polarization, 0444, cpu_polarization_show, NULL);</div><div class='del'>-</div><div class='del'>-static ssize_t show_cpu_address(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_cpu_address(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%d\n", __cpu_logical_map[dev-&gt;id]);</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_ATTR(address, 0444, show_cpu_address, NULL);</div><div class='del'>-</div><div class='add'>+static DEVICE_ATTR(address, 0444, show_cpu_address, NULL);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *cpu_common_attrs[] = {</div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-	&amp;attr_configure.attr,</div><div class='add'>+	&amp;dev_attr_configure.attr,</div><div class='ctx'> #endif</div><div class='del'>-	&amp;attr_address.attr,</div><div class='del'>-	&amp;attr_polarization.attr,</div><div class='add'>+	&amp;dev_attr_address.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -942,8 +945,8 @@ static struct attribute_group cpu_common_attr_group = {</div><div class='ctx'> 	.attrs = cpu_common_attrs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static ssize_t show_capability(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_capability(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int capability;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -953,10 +956,10 @@ static ssize_t show_capability(struct sys_device *dev,</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	return sprintf(buf, "%u\n", capability);</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_ATTR(capability, 0444, show_capability, NULL);</div><div class='add'>+static DEVICE_ATTR(capability, 0444, show_capability, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_idle_count(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_idle_count(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct s390_idle_data *idle;</div><div class='ctx'> 	unsigned long long idle_count;</div><div class='hunk'>@@ -976,10 +979,10 @@ repeat:</div><div class='ctx'> 		goto repeat;</div><div class='ctx'> 	return sprintf(buf, "%llu\n", idle_count);</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_ATTR(idle_count, 0444, show_idle_count, NULL);</div><div class='add'>+static DEVICE_ATTR(idle_count, 0444, show_idle_count, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_idle_time(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_idle_time(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct s390_idle_data *idle;</div><div class='ctx'> 	unsigned long long now, idle_time, idle_enter;</div><div class='hunk'>@@ -1001,12 +1004,12 @@ repeat:</div><div class='ctx'> 		goto repeat;</div><div class='ctx'> 	return sprintf(buf, "%llu\n", idle_time &gt;&gt; 12);</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_ATTR(idle_time_us, 0444, show_idle_time, NULL);</div><div class='add'>+static DEVICE_ATTR(idle_time_us, 0444, show_idle_time, NULL);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *cpu_online_attrs[] = {</div><div class='del'>-	&amp;attr_capability.attr,</div><div class='del'>-	&amp;attr_idle_count.attr,</div><div class='del'>-	&amp;attr_idle_time_us.attr,</div><div class='add'>+	&amp;dev_attr_capability.attr,</div><div class='add'>+	&amp;dev_attr_idle_count.attr,</div><div class='add'>+	&amp;dev_attr_idle_time_us.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1019,7 +1022,7 @@ static int __cpuinit smp_cpu_notify(struct notifier_block *self,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu = (unsigned int)(long)hcpu;</div><div class='ctx'> 	struct cpu *c = &amp;per_cpu(cpu_devices, cpu);</div><div class='del'>-	struct sys_device *s = &amp;c-&gt;sysdev;</div><div class='add'>+	struct device *s = &amp;c-&gt;dev;</div><div class='ctx'> 	struct s390_idle_data *idle;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1045,7 +1048,7 @@ static struct notifier_block __cpuinitdata smp_cpu_nb = {</div><div class='ctx'> static int __devinit smp_add_present_cpu(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpu *c = &amp;per_cpu(cpu_devices, cpu);</div><div class='del'>-	struct sys_device *s = &amp;c-&gt;sysdev;</div><div class='add'>+	struct device *s = &amp;c-&gt;dev;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;hotpluggable = 1;</div><div class='hunk'>@@ -1055,11 +1058,20 @@ static int __devinit smp_add_present_cpu(int cpu)</div><div class='ctx'> 	rc = sysfs_create_group(&amp;s-&gt;kobj, &amp;cpu_common_attr_group);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out_cpu;</div><div class='del'>-	if (!cpu_online(cpu))</div><div class='del'>-		goto out;</div><div class='del'>-	rc = sysfs_create_group(&amp;s-&gt;kobj, &amp;cpu_online_attr_group);</div><div class='del'>-	if (!rc)</div><div class='del'>-		return 0;</div><div class='add'>+	if (cpu_online(cpu)) {</div><div class='add'>+		rc = sysfs_create_group(&amp;s-&gt;kobj, &amp;cpu_online_attr_group);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto out_online;</div><div class='add'>+	}</div><div class='add'>+	rc = topology_cpu_init(c);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out_topology;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_topology:</div><div class='add'>+	if (cpu_online(cpu))</div><div class='add'>+		sysfs_remove_group(&amp;s-&gt;kobj, &amp;cpu_online_attr_group);</div><div class='add'>+out_online:</div><div class='ctx'> 	sysfs_remove_group(&amp;s-&gt;kobj, &amp;cpu_common_attr_group);</div><div class='ctx'> out_cpu:</div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='hunk'>@@ -1098,8 +1110,8 @@ out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t __ref rescan_store(struct sysdev_class *class,</div><div class='del'>-				  struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t __ref rescan_store(struct device *dev,</div><div class='add'>+				  struct device_attribute *attr,</div><div class='ctx'> 				  const char *buf,</div><div class='ctx'> 				  size_t count)</div><div class='ctx'> {</div><div class='hunk'>@@ -1108,64 +1120,19 @@ static ssize_t __ref rescan_store(struct sysdev_class *class,</div><div class='ctx'> 	rc = smp_rescan_cpus();</div><div class='ctx'> 	return rc ? rc : count;</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_CLASS_ATTR(rescan, 0200, NULL, rescan_store);</div><div class='add'>+static DEVICE_ATTR(rescan, 0200, NULL, rescan_store);</div><div class='ctx'> #endif /* CONFIG_HOTPLUG_CPU */</div><div class='ctx'> </div><div class='del'>-static ssize_t dispatching_show(struct sysdev_class *class,</div><div class='del'>-				struct sysdev_class_attribute *attr,</div><div class='del'>-				char *buf)</div><div class='del'>-{</div><div class='del'>-	ssize_t count;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;smp_cpu_state_mutex);</div><div class='del'>-	count = sprintf(buf, "%d\n", cpu_management);</div><div class='del'>-	mutex_unlock(&amp;smp_cpu_state_mutex);</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t dispatching_store(struct sysdev_class *dev,</div><div class='del'>-				 struct sysdev_class_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 val, rc;</div><div class='del'>-	char delim;</div><div class='del'>-</div><div class='del'>-	if (sscanf(buf, "%d %c", &amp;val, &amp;delim) != 1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (val != 0 &amp;&amp; val != 1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	rc = 0;</div><div class='del'>-	get_online_cpus();</div><div class='del'>-	mutex_lock(&amp;smp_cpu_state_mutex);</div><div class='del'>-	if (cpu_management == val)</div><div class='del'>-		goto out;</div><div class='del'>-	rc = topology_set_cpu_management(val);</div><div class='del'>-	if (!rc)</div><div class='del'>-		cpu_management = val;</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;smp_cpu_state_mutex);</div><div class='del'>-	put_online_cpus();</div><div class='del'>-	return rc ? rc : count;</div><div class='del'>-}</div><div class='del'>-static SYSDEV_CLASS_ATTR(dispatching, 0644, dispatching_show,</div><div class='del'>-			 dispatching_store);</div><div class='del'>-</div><div class='del'>-static int __init topology_init(void)</div><div class='add'>+static int __init s390_smp_init(void)</div><div class='ctx'> {</div><div class='del'>-	int cpu;</div><div class='del'>-	int rc;</div><div class='add'>+	int cpu, rc;</div><div class='ctx'> </div><div class='ctx'> 	register_cpu_notifier(&amp;smp_cpu_nb);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-	rc = sysdev_class_create_file(&amp;cpu_sysdev_class, &amp;attr_rescan);</div><div class='add'>+	rc = device_create_file(cpu_subsys.dev_root, &amp;dev_attr_rescan);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> #endif</div><div class='del'>-	rc = sysdev_class_create_file(&amp;cpu_sysdev_class, &amp;attr_dispatching);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='ctx'> 	for_each_present_cpu(cpu) {</div><div class='ctx'> 		rc = smp_add_present_cpu(cpu);</div><div class='ctx'> 		if (rc)</div><div class='hunk'>@@ -1173,4 +1140,4 @@ static int __init topology_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-subsys_initcall(topology_init);</div><div class='add'>+subsys_initcall(s390_smp_init);</div><div class='head'>diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c<br/>index 476081440df9..78ea1948ff51 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/sys_s390.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/sys_s390.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/sys_s390.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/sys_s390.c</a></div><div class='hunk'>@@ -60,74 +60,22 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * sys_ipc() is the de-multiplexer for the SysV IPC calls..</div><div class='del'>- *</div><div class='del'>- * This is really horribly ugly.</div><div class='add'>+ * sys_ipc() is the de-multiplexer for the SysV IPC calls.</div><div class='ctx'>  */</div><div class='ctx'> SYSCALL_DEFINE5(s390_ipc, uint, call, int, first, unsigned long, second,</div><div class='ctx'> 		unsigned long, third, void __user *, ptr)</div><div class='ctx'> {</div><div class='del'>-        struct ipc_kludge tmp;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-        switch (call) {</div><div class='del'>-        case SEMOP:</div><div class='del'>-		return sys_semtimedop(first, (struct sembuf __user *)ptr,</div><div class='del'>-				       (unsigned)second, NULL);</div><div class='del'>-	case SEMTIMEDOP:</div><div class='del'>-		return sys_semtimedop(first, (struct sembuf __user *)ptr,</div><div class='del'>-				       (unsigned)second,</div><div class='del'>-				       (const struct timespec __user *) third);</div><div class='del'>-        case SEMGET:</div><div class='del'>-                return sys_semget(first, (int)second, third);</div><div class='del'>-        case SEMCTL: {</div><div class='del'>-                union semun fourth;</div><div class='del'>-                if (!ptr)</div><div class='del'>-                        return -EINVAL;</div><div class='del'>-                if (get_user(fourth.__pad, (void __user * __user *) ptr))</div><div class='del'>-                        return -EFAULT;</div><div class='del'>-                return sys_semctl(first, (int)second, third, fourth);</div><div class='del'>-        }</div><div class='del'>-        case MSGSND:</div><div class='del'>-		return sys_msgsnd (first, (struct msgbuf __user *) ptr,</div><div class='del'>-                                   (size_t)second, third);</div><div class='del'>-		break;</div><div class='del'>-        case MSGRCV:</div><div class='del'>-                if (!ptr)</div><div class='del'>-                        return -EINVAL;</div><div class='del'>-                if (copy_from_user (&amp;tmp, (struct ipc_kludge __user *) ptr,</div><div class='del'>-                                    sizeof (struct ipc_kludge)))</div><div class='del'>-                        return -EFAULT;</div><div class='del'>-                return sys_msgrcv (first, tmp.msgp,</div><div class='del'>-                                   (size_t)second, tmp.msgtyp, third);</div><div class='del'>-        case MSGGET:</div><div class='del'>-                return sys_msgget((key_t)first, (int)second);</div><div class='del'>-        case MSGCTL:</div><div class='del'>-                return sys_msgctl(first, (int)second,</div><div class='del'>-				   (struct msqid_ds __user *)ptr);</div><div class='del'>-</div><div class='del'>-	case SHMAT: {</div><div class='del'>-		ulong raddr;</div><div class='del'>-		ret = do_shmat(first, (char __user *)ptr,</div><div class='del'>-				(int)second, &amp;raddr);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		return put_user (raddr, (ulong __user *) third);</div><div class='del'>-		break;</div><div class='del'>-        }</div><div class='del'>-	case SHMDT:</div><div class='del'>-		return sys_shmdt ((char __user *)ptr);</div><div class='del'>-	case SHMGET:</div><div class='del'>-		return sys_shmget(first, (size_t)second, third);</div><div class='del'>-	case SHMCTL:</div><div class='del'>-		return sys_shmctl(first, (int)second,</div><div class='del'>-                                   (struct shmid_ds __user *) ptr);</div><div class='del'>-	default:</div><div class='del'>-		return -ENOSYS;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='add'>+	if (call &gt;&gt; 16)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	/* The s390 sys_ipc variant has only five parameters instead of six</div><div class='add'>+	 * like the generic variant. The only difference is the handling of</div><div class='add'>+	 * the SEMTIMEDOP subcall where on s390 the third parameter is used</div><div class='add'>+	 * as a pointer to a struct timespec where the generic variant uses</div><div class='add'>+	 * the fifth parameter.</div><div class='add'>+	 * Therefore we can call the generic variant by simply passing the</div><div class='add'>+	 * third parameter also as fifth parameter.</div><div class='add'>+	 */</div><div class='add'>+	return sys_ipc(call, first, second, third, ptr, third);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='head'>diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c<br/>index ebbfab3c6e5a..fa02f443f5f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/time.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/stop_machine.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -1116,34 +1116,35 @@ out_unlock:</div><div class='ctx'> /*</div><div class='ctx'>  * Sysfs interface functions</div><div class='ctx'>  */</div><div class='del'>-static struct sysdev_class etr_sysclass = {</div><div class='del'>-	.name	= "etr",</div><div class='add'>+static struct bus_type etr_subsys = {</div><div class='add'>+	.name		= "etr",</div><div class='add'>+	.dev_name	= "etr",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sys_device etr_port0_dev = {</div><div class='add'>+static struct device etr_port0_dev = {</div><div class='ctx'> 	.id	= 0,</div><div class='del'>-	.cls	= &amp;etr_sysclass,</div><div class='add'>+	.bus	= &amp;etr_subsys,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sys_device etr_port1_dev = {</div><div class='add'>+static struct device etr_port1_dev = {</div><div class='ctx'> 	.id	= 1,</div><div class='del'>-	.cls	= &amp;etr_sysclass,</div><div class='add'>+	.bus	= &amp;etr_subsys,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ETR class attributes</div><div class='add'>+ * ETR subsys attributes</div><div class='ctx'>  */</div><div class='del'>-static ssize_t etr_stepping_port_show(struct sysdev_class *class,</div><div class='del'>-					struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t etr_stepping_port_show(struct device *dev,</div><div class='add'>+					struct device_attribute *attr,</div><div class='ctx'> 					char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%i\n", etr_port0.esw.p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(stepping_port, 0400, etr_stepping_port_show, NULL);</div><div class='add'>+static DEVICE_ATTR(stepping_port, 0400, etr_stepping_port_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t etr_stepping_mode_show(struct sysdev_class *class,</div><div class='del'>-				      	struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t etr_stepping_mode_show(struct device *dev,</div><div class='add'>+					struct device_attribute *attr,</div><div class='ctx'> 					char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	char *mode_str;</div><div class='hunk'>@@ -1157,12 +1158,12 @@ static ssize_t etr_stepping_mode_show(struct sysdev_class *class,</div><div class='ctx'> 	return sprintf(buf, "%s\n", mode_str);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(stepping_mode, 0400, etr_stepping_mode_show, NULL);</div><div class='add'>+static DEVICE_ATTR(stepping_mode, 0400, etr_stepping_mode_show, NULL);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ETR port attributes</div><div class='ctx'>  */</div><div class='del'>-static inline struct etr_aib *etr_aib_from_dev(struct sys_device *dev)</div><div class='add'>+static inline struct etr_aib *etr_aib_from_dev(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (dev == &amp;etr_port0_dev)</div><div class='ctx'> 		return etr_port0_online ? &amp;etr_port0 : NULL;</div><div class='hunk'>@@ -1170,8 +1171,8 @@ static inline struct etr_aib *etr_aib_from_dev(struct sys_device *dev)</div><div class='ctx'> 		return etr_port1_online ? &amp;etr_port1 : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t etr_online_show(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t etr_online_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='ctx'> 				char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int online;</div><div class='hunk'>@@ -1180,8 +1181,8 @@ static ssize_t etr_online_show(struct sys_device *dev,</div><div class='ctx'> 	return sprintf(buf, "%i\n", online);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t etr_online_store(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t etr_online_store(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='ctx'> 				const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int value;</div><div class='hunk'>@@ -1218,20 +1219,20 @@ out:</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(online, 0600, etr_online_show, etr_online_store);</div><div class='add'>+static DEVICE_ATTR(online, 0600, etr_online_show, etr_online_store);</div><div class='ctx'> </div><div class='del'>-static ssize_t etr_stepping_control_show(struct sys_device *dev,</div><div class='del'>-					struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t etr_stepping_control_show(struct device *dev,</div><div class='add'>+					struct device_attribute *attr,</div><div class='ctx'> 					char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%i\n", (dev == &amp;etr_port0_dev) ?</div><div class='ctx'> 		       etr_eacr.e0 : etr_eacr.e1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(stepping_control, 0400, etr_stepping_control_show, NULL);</div><div class='add'>+static DEVICE_ATTR(stepping_control, 0400, etr_stepping_control_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t etr_mode_code_show(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t etr_mode_code_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	if (!etr_port0_online &amp;&amp; !etr_port1_online)</div><div class='ctx'> 		/* Status word is not uptodate if both ports are offline. */</div><div class='hunk'>@@ -1240,10 +1241,10 @@ static ssize_t etr_mode_code_show(struct sys_device *dev,</div><div class='ctx'> 		       etr_port0.esw.psc0 : etr_port0.esw.psc1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(state_code, 0400, etr_mode_code_show, NULL);</div><div class='add'>+static DEVICE_ATTR(state_code, 0400, etr_mode_code_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t etr_untuned_show(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t etr_untuned_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct etr_aib *aib = etr_aib_from_dev(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1252,10 +1253,10 @@ static ssize_t etr_untuned_show(struct sys_device *dev,</div><div class='ctx'> 	return sprintf(buf, "%i\n", aib-&gt;edf1.u);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(untuned, 0400, etr_untuned_show, NULL);</div><div class='add'>+static DEVICE_ATTR(untuned, 0400, etr_untuned_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t etr_network_id_show(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t etr_network_id_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct etr_aib *aib = etr_aib_from_dev(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1264,10 +1265,10 @@ static ssize_t etr_network_id_show(struct sys_device *dev,</div><div class='ctx'> 	return sprintf(buf, "%i\n", aib-&gt;edf1.net_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(network, 0400, etr_network_id_show, NULL);</div><div class='add'>+static DEVICE_ATTR(network, 0400, etr_network_id_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t etr_id_show(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t etr_id_show(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct etr_aib *aib = etr_aib_from_dev(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1276,10 +1277,10 @@ static ssize_t etr_id_show(struct sys_device *dev,</div><div class='ctx'> 	return sprintf(buf, "%i\n", aib-&gt;edf1.etr_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(id, 0400, etr_id_show, NULL);</div><div class='add'>+static DEVICE_ATTR(id, 0400, etr_id_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t etr_port_number_show(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t etr_port_number_show(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct etr_aib *aib = etr_aib_from_dev(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1288,10 +1289,10 @@ static ssize_t etr_port_number_show(struct sys_device *dev,</div><div class='ctx'> 	return sprintf(buf, "%i\n", aib-&gt;edf1.etr_pn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(port, 0400, etr_port_number_show, NULL);</div><div class='add'>+static DEVICE_ATTR(port, 0400, etr_port_number_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t etr_coupled_show(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t etr_coupled_show(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct etr_aib *aib = etr_aib_from_dev(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1300,10 +1301,10 @@ static ssize_t etr_coupled_show(struct sys_device *dev,</div><div class='ctx'> 	return sprintf(buf, "%i\n", aib-&gt;edf3.c);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(coupled, 0400, etr_coupled_show, NULL);</div><div class='add'>+static DEVICE_ATTR(coupled, 0400, etr_coupled_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t etr_local_time_show(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t etr_local_time_show(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct etr_aib *aib = etr_aib_from_dev(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1312,10 +1313,10 @@ static ssize_t etr_local_time_show(struct sys_device *dev,</div><div class='ctx'> 	return sprintf(buf, "%i\n", aib-&gt;edf3.blto);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(local_time, 0400, etr_local_time_show, NULL);</div><div class='add'>+static DEVICE_ATTR(local_time, 0400, etr_local_time_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t etr_utc_offset_show(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t etr_utc_offset_show(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct etr_aib *aib = etr_aib_from_dev(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1324,64 +1325,64 @@ static ssize_t etr_utc_offset_show(struct sys_device *dev,</div><div class='ctx'> 	return sprintf(buf, "%i\n", aib-&gt;edf3.buo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(utc_offset, 0400, etr_utc_offset_show, NULL);</div><div class='add'>+static DEVICE_ATTR(utc_offset, 0400, etr_utc_offset_show, NULL);</div><div class='ctx'> </div><div class='del'>-static struct sysdev_attribute *etr_port_attributes[] = {</div><div class='del'>-	&amp;attr_online,</div><div class='del'>-	&amp;attr_stepping_control,</div><div class='del'>-	&amp;attr_state_code,</div><div class='del'>-	&amp;attr_untuned,</div><div class='del'>-	&amp;attr_network,</div><div class='del'>-	&amp;attr_id,</div><div class='del'>-	&amp;attr_port,</div><div class='del'>-	&amp;attr_coupled,</div><div class='del'>-	&amp;attr_local_time,</div><div class='del'>-	&amp;attr_utc_offset,</div><div class='add'>+static struct device_attribute *etr_port_attributes[] = {</div><div class='add'>+	&amp;dev_attr_online,</div><div class='add'>+	&amp;dev_attr_stepping_control,</div><div class='add'>+	&amp;dev_attr_state_code,</div><div class='add'>+	&amp;dev_attr_untuned,</div><div class='add'>+	&amp;dev_attr_network,</div><div class='add'>+	&amp;dev_attr_id,</div><div class='add'>+	&amp;dev_attr_port,</div><div class='add'>+	&amp;dev_attr_coupled,</div><div class='add'>+	&amp;dev_attr_local_time,</div><div class='add'>+	&amp;dev_attr_utc_offset,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init etr_register_port(struct sys_device *dev)</div><div class='add'>+static int __init etr_register_port(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct sysdev_attribute **attr;</div><div class='add'>+	struct device_attribute **attr;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = sysdev_register(dev);</div><div class='add'>+	rc = device_register(dev);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	for (attr = etr_port_attributes; *attr; attr++) {</div><div class='del'>-		rc = sysdev_create_file(dev, *attr);</div><div class='add'>+		rc = device_create_file(dev, *attr);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto out_unreg;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> out_unreg:</div><div class='ctx'> 	for (; attr &gt;= etr_port_attributes; attr--)</div><div class='del'>-		sysdev_remove_file(dev, *attr);</div><div class='del'>-	sysdev_unregister(dev);</div><div class='add'>+		device_remove_file(dev, *attr);</div><div class='add'>+	device_unregister(dev);</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init etr_unregister_port(struct sys_device *dev)</div><div class='add'>+static void __init etr_unregister_port(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct sysdev_attribute **attr;</div><div class='add'>+	struct device_attribute **attr;</div><div class='ctx'> </div><div class='ctx'> 	for (attr = etr_port_attributes; *attr; attr++)</div><div class='del'>-		sysdev_remove_file(dev, *attr);</div><div class='del'>-	sysdev_unregister(dev);</div><div class='add'>+		device_remove_file(dev, *attr);</div><div class='add'>+	device_unregister(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init etr_init_sysfs(void)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = sysdev_class_register(&amp;etr_sysclass);</div><div class='add'>+	rc = subsys_system_register(&amp;etr_subsys, NULL);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out;</div><div class='del'>-	rc = sysdev_class_create_file(&amp;etr_sysclass, &amp;attr_stepping_port);</div><div class='add'>+	rc = device_create_file(etr_subsys.dev_root, &amp;dev_attr_stepping_port);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		goto out_unreg_class;</div><div class='del'>-	rc = sysdev_class_create_file(&amp;etr_sysclass, &amp;attr_stepping_mode);</div><div class='add'>+		goto out_unreg_subsys;</div><div class='add'>+	rc = device_create_file(etr_subsys.dev_root, &amp;dev_attr_stepping_mode);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out_remove_stepping_port;</div><div class='ctx'> 	rc = etr_register_port(&amp;etr_port0_dev);</div><div class='hunk'>@@ -1395,11 +1396,11 @@ static int __init etr_init_sysfs(void)</div><div class='ctx'> out_remove_port0:</div><div class='ctx'> 	etr_unregister_port(&amp;etr_port0_dev);</div><div class='ctx'> out_remove_stepping_mode:</div><div class='del'>-	sysdev_class_remove_file(&amp;etr_sysclass, &amp;attr_stepping_mode);</div><div class='add'>+	device_remove_file(etr_subsys.dev_root, &amp;dev_attr_stepping_mode);</div><div class='ctx'> out_remove_stepping_port:</div><div class='del'>-	sysdev_class_remove_file(&amp;etr_sysclass, &amp;attr_stepping_port);</div><div class='del'>-out_unreg_class:</div><div class='del'>-	sysdev_class_unregister(&amp;etr_sysclass);</div><div class='add'>+	device_remove_file(etr_subsys.dev_root, &amp;dev_attr_stepping_port);</div><div class='add'>+out_unreg_subsys:</div><div class='add'>+	bus_unregister(&amp;etr_subsys);</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -1599,14 +1600,15 @@ out_unlock:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * STP class sysfs interface functions</div><div class='add'>+ * STP subsys sysfs interface functions</div><div class='ctx'>  */</div><div class='del'>-static struct sysdev_class stp_sysclass = {</div><div class='del'>-	.name	= "stp",</div><div class='add'>+static struct bus_type stp_subsys = {</div><div class='add'>+	.name		= "stp",</div><div class='add'>+	.dev_name	= "stp",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static ssize_t stp_ctn_id_show(struct sysdev_class *class,</div><div class='del'>-				struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t stp_ctn_id_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='ctx'> 				char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	if (!stp_online)</div><div class='hunk'>@@ -1615,10 +1617,10 @@ static ssize_t stp_ctn_id_show(struct sysdev_class *class,</div><div class='ctx'> 		       *(unsigned long long *) stp_info.ctnid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(ctn_id, 0400, stp_ctn_id_show, NULL);</div><div class='add'>+static DEVICE_ATTR(ctn_id, 0400, stp_ctn_id_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t stp_ctn_type_show(struct sysdev_class *class,</div><div class='del'>-				struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t stp_ctn_type_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='ctx'> 				char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	if (!stp_online)</div><div class='hunk'>@@ -1626,10 +1628,10 @@ static ssize_t stp_ctn_type_show(struct sysdev_class *class,</div><div class='ctx'> 	return sprintf(buf, "%i\n", stp_info.ctn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(ctn_type, 0400, stp_ctn_type_show, NULL);</div><div class='add'>+static DEVICE_ATTR(ctn_type, 0400, stp_ctn_type_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t stp_dst_offset_show(struct sysdev_class *class,</div><div class='del'>-				   struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t stp_dst_offset_show(struct device *dev,</div><div class='add'>+				   struct device_attribute *attr,</div><div class='ctx'> 				   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	if (!stp_online || !(stp_info.vbits &amp; 0x2000))</div><div class='hunk'>@@ -1637,10 +1639,10 @@ static ssize_t stp_dst_offset_show(struct sysdev_class *class,</div><div class='ctx'> 	return sprintf(buf, "%i\n", (int)(s16) stp_info.dsto);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(dst_offset, 0400, stp_dst_offset_show, NULL);</div><div class='add'>+static DEVICE_ATTR(dst_offset, 0400, stp_dst_offset_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t stp_leap_seconds_show(struct sysdev_class *class,</div><div class='del'>-					struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t stp_leap_seconds_show(struct device *dev,</div><div class='add'>+					struct device_attribute *attr,</div><div class='ctx'> 					char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	if (!stp_online || !(stp_info.vbits &amp; 0x8000))</div><div class='hunk'>@@ -1648,10 +1650,10 @@ static ssize_t stp_leap_seconds_show(struct sysdev_class *class,</div><div class='ctx'> 	return sprintf(buf, "%i\n", (int)(s16) stp_info.leaps);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(leap_seconds, 0400, stp_leap_seconds_show, NULL);</div><div class='add'>+static DEVICE_ATTR(leap_seconds, 0400, stp_leap_seconds_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t stp_stratum_show(struct sysdev_class *class,</div><div class='del'>-				struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t stp_stratum_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='ctx'> 				char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	if (!stp_online)</div><div class='hunk'>@@ -1659,10 +1661,10 @@ static ssize_t stp_stratum_show(struct sysdev_class *class,</div><div class='ctx'> 	return sprintf(buf, "%i\n", (int)(s16) stp_info.stratum);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(stratum, 0400, stp_stratum_show, NULL);</div><div class='add'>+static DEVICE_ATTR(stratum, 0400, stp_stratum_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t stp_time_offset_show(struct sysdev_class *class,</div><div class='del'>-				struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t stp_time_offset_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='ctx'> 				char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	if (!stp_online || !(stp_info.vbits &amp; 0x0800))</div><div class='hunk'>@@ -1670,10 +1672,10 @@ static ssize_t stp_time_offset_show(struct sysdev_class *class,</div><div class='ctx'> 	return sprintf(buf, "%i\n", (int) stp_info.tto);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(time_offset, 0400, stp_time_offset_show, NULL);</div><div class='add'>+static DEVICE_ATTR(time_offset, 0400, stp_time_offset_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t stp_time_zone_offset_show(struct sysdev_class *class,</div><div class='del'>-				struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t stp_time_zone_offset_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='ctx'> 				char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	if (!stp_online || !(stp_info.vbits &amp; 0x4000))</div><div class='hunk'>@@ -1681,11 +1683,11 @@ static ssize_t stp_time_zone_offset_show(struct sysdev_class *class,</div><div class='ctx'> 	return sprintf(buf, "%i\n", (int)(s16) stp_info.tzo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(time_zone_offset, 0400,</div><div class='add'>+static DEVICE_ATTR(time_zone_offset, 0400,</div><div class='ctx'> 			 stp_time_zone_offset_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t stp_timing_mode_show(struct sysdev_class *class,</div><div class='del'>-				struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t stp_timing_mode_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='ctx'> 				char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	if (!stp_online)</div><div class='hunk'>@@ -1693,10 +1695,10 @@ static ssize_t stp_timing_mode_show(struct sysdev_class *class,</div><div class='ctx'> 	return sprintf(buf, "%i\n", stp_info.tmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(timing_mode, 0400, stp_timing_mode_show, NULL);</div><div class='add'>+static DEVICE_ATTR(timing_mode, 0400, stp_timing_mode_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t stp_timing_state_show(struct sysdev_class *class,</div><div class='del'>-				struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t stp_timing_state_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='ctx'> 				char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	if (!stp_online)</div><div class='hunk'>@@ -1704,17 +1706,17 @@ static ssize_t stp_timing_state_show(struct sysdev_class *class,</div><div class='ctx'> 	return sprintf(buf, "%i\n", stp_info.tst);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(timing_state, 0400, stp_timing_state_show, NULL);</div><div class='add'>+static DEVICE_ATTR(timing_state, 0400, stp_timing_state_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t stp_online_show(struct sysdev_class *class,</div><div class='del'>-				struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t stp_online_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='ctx'> 				char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%i\n", stp_online);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t stp_online_store(struct sysdev_class *class,</div><div class='del'>-				struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t stp_online_store(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='ctx'> 				const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int value;</div><div class='hunk'>@@ -1736,47 +1738,47 @@ static ssize_t stp_online_store(struct sysdev_class *class,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Can't use SYSDEV_CLASS_ATTR because the attribute should be named</div><div class='del'>- * stp/online but attr_online already exists in this file ..</div><div class='add'>+ * Can't use DEVICE_ATTR because the attribute should be named</div><div class='add'>+ * stp/online but dev_attr_online already exists in this file ..</div><div class='ctx'>  */</div><div class='del'>-static struct sysdev_class_attribute attr_stp_online = {</div><div class='add'>+static struct device_attribute dev_attr_stp_online = {</div><div class='ctx'> 	.attr = { .name = "online", .mode = 0600 },</div><div class='ctx'> 	.show	= stp_online_show,</div><div class='ctx'> 	.store	= stp_online_store,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class_attribute *stp_attributes[] = {</div><div class='del'>-	&amp;attr_ctn_id,</div><div class='del'>-	&amp;attr_ctn_type,</div><div class='del'>-	&amp;attr_dst_offset,</div><div class='del'>-	&amp;attr_leap_seconds,</div><div class='del'>-	&amp;attr_stp_online,</div><div class='del'>-	&amp;attr_stratum,</div><div class='del'>-	&amp;attr_time_offset,</div><div class='del'>-	&amp;attr_time_zone_offset,</div><div class='del'>-	&amp;attr_timing_mode,</div><div class='del'>-	&amp;attr_timing_state,</div><div class='add'>+static struct device_attribute *stp_attributes[] = {</div><div class='add'>+	&amp;dev_attr_ctn_id,</div><div class='add'>+	&amp;dev_attr_ctn_type,</div><div class='add'>+	&amp;dev_attr_dst_offset,</div><div class='add'>+	&amp;dev_attr_leap_seconds,</div><div class='add'>+	&amp;dev_attr_stp_online,</div><div class='add'>+	&amp;dev_attr_stratum,</div><div class='add'>+	&amp;dev_attr_time_offset,</div><div class='add'>+	&amp;dev_attr_time_zone_offset,</div><div class='add'>+	&amp;dev_attr_timing_mode,</div><div class='add'>+	&amp;dev_attr_timing_state,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init stp_init_sysfs(void)</div><div class='ctx'> {</div><div class='del'>-	struct sysdev_class_attribute **attr;</div><div class='add'>+	struct device_attribute **attr;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = sysdev_class_register(&amp;stp_sysclass);</div><div class='add'>+	rc = subsys_system_register(&amp;stp_subsys, NULL);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	for (attr = stp_attributes; *attr; attr++) {</div><div class='del'>-		rc = sysdev_class_create_file(&amp;stp_sysclass, *attr);</div><div class='add'>+		rc = device_create_file(stp_subsys.dev_root, *attr);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto out_unreg;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> out_unreg:</div><div class='ctx'> 	for (; attr &gt;= stp_attributes; attr--)</div><div class='del'>-		sysdev_class_remove_file(&amp;stp_sysclass, *attr);</div><div class='del'>-	sysdev_class_unregister(&amp;stp_sysclass);</div><div class='add'>+		device_remove_file(stp_subsys.dev_root, *attr);</div><div class='add'>+	bus_unregister(&amp;stp_subsys);</div><div class='ctx'> out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c<br/>index fdb5b8cb260f..7370a41948ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/topology.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/topology.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/topology.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/topology.c</a></div><div class='hunk'>@@ -1,22 +1,22 @@</div><div class='ctx'> /*</div><div class='del'>- *    Copyright IBM Corp. 2007</div><div class='add'>+ *    Copyright IBM Corp. 2007,2011</div><div class='ctx'>  *    Author(s): Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define KMSG_COMPONENT "cpu"</div><div class='ctx'> #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/cpuset.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='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='del'>-#include &lt;linux/cpuset.h&gt;</div><div class='del'>-#include &lt;asm/delay.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PTF_HORIZONTAL	(0UL)</div><div class='ctx'> #define PTF_VERTICAL	(1UL)</div><div class='hunk'>@@ -31,7 +31,6 @@ struct mask_info {</div><div class='ctx'> static int topology_enabled = 1;</div><div class='ctx'> static void topology_work_fn(struct work_struct *work);</div><div class='ctx'> static struct sysinfo_15_1_x *tl_info;</div><div class='del'>-static struct timer_list topology_timer;</div><div class='ctx'> static void set_topology_timer(void);</div><div class='ctx'> static DECLARE_WORK(topology_work, topology_work_fn);</div><div class='ctx'> /* topology_lock protects the core linked list */</div><div class='hunk'>@@ -41,11 +40,12 @@ static struct mask_info core_info;</div><div class='ctx'> cpumask_t cpu_core_map[NR_CPUS];</div><div class='ctx'> unsigned char cpu_core_id[NR_CPUS];</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SCHED_BOOK</div><div class='ctx'> static struct mask_info book_info;</div><div class='ctx'> cpumask_t cpu_book_map[NR_CPUS];</div><div class='ctx'> unsigned char cpu_book_id[NR_CPUS];</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+/* smp_cpu_state_mutex must be held when accessing this array */</div><div class='add'>+int cpu_polarization[NR_CPUS];</div><div class='ctx'> </div><div class='ctx'> static cpumask_t cpu_group_map(struct mask_info *info, unsigned int cpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -71,7 +71,7 @@ static cpumask_t cpu_group_map(struct mask_info *info, unsigned int cpu)</div><div class='ctx'> static struct mask_info *add_cpus_to_mask(struct topology_cpu *tl_cpu,</div><div class='ctx'> 					  struct mask_info *book,</div><div class='ctx'> 					  struct mask_info *core,</div><div class='del'>-					  int z10)</div><div class='add'>+					  int one_core_per_cpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu;</div><div class='ctx'> </div><div class='hunk'>@@ -85,18 +85,16 @@ static struct mask_info *add_cpus_to_mask(struct topology_cpu *tl_cpu,</div><div class='ctx'> 		for_each_present_cpu(lcpu) {</div><div class='ctx'> 			if (cpu_logical_map(lcpu) != rcpu)</div><div class='ctx'> 				continue;</div><div class='del'>-#ifdef CONFIG_SCHED_BOOK</div><div class='ctx'> 			cpumask_set_cpu(lcpu, &amp;book-&gt;mask);</div><div class='ctx'> 			cpu_book_id[lcpu] = book-&gt;id;</div><div class='del'>-#endif</div><div class='ctx'> 			cpumask_set_cpu(lcpu, &amp;core-&gt;mask);</div><div class='del'>-			if (z10) {</div><div class='add'>+			if (one_core_per_cpu) {</div><div class='ctx'> 				cpu_core_id[lcpu] = rcpu;</div><div class='ctx'> 				core = core-&gt;next;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				cpu_core_id[lcpu] = core-&gt;id;</div><div class='ctx'> 			}</div><div class='del'>-			smp_cpu_polarization[lcpu] = tl_cpu-&gt;pp;</div><div class='add'>+			cpu_set_polarization(lcpu, tl_cpu-&gt;pp);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return core;</div><div class='hunk'>@@ -111,13 +109,11 @@ static void clear_masks(void)</div><div class='ctx'> 		cpumask_clear(&amp;info-&gt;mask);</div><div class='ctx'> 		info = info-&gt;next;</div><div class='ctx'> 	}</div><div class='del'>-#ifdef CONFIG_SCHED_BOOK</div><div class='ctx'> 	info = &amp;book_info;</div><div class='ctx'> 	while (info) {</div><div class='ctx'> 		cpumask_clear(&amp;info-&gt;mask);</div><div class='ctx'> 		info = info-&gt;next;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static union topology_entry *next_tle(union topology_entry *tle)</div><div class='hunk'>@@ -127,66 +123,75 @@ static union topology_entry *next_tle(union topology_entry *tle)</div><div class='ctx'> 	return (union topology_entry *)((struct topology_container *)tle + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tl_to_cores(struct sysinfo_15_1_x *info)</div><div class='add'>+static void __tl_to_cores_generic(struct sysinfo_15_1_x *info)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_SCHED_BOOK</div><div class='del'>-	struct mask_info *book = &amp;book_info;</div><div class='del'>-	struct cpuid cpu_id;</div><div class='del'>-#else</div><div class='del'>-	struct mask_info *book = NULL;</div><div class='del'>-#endif</div><div class='ctx'> 	struct mask_info *core = &amp;core_info;</div><div class='add'>+	struct mask_info *book = &amp;book_info;</div><div class='ctx'> 	union topology_entry *tle, *end;</div><div class='del'>-	int z10 = 0;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SCHED_BOOK</div><div class='del'>-	get_cpu_id(&amp;cpu_id);</div><div class='del'>-	z10 = cpu_id.machine == 0x2097 || cpu_id.machine == 0x2098;</div><div class='del'>-#endif</div><div class='del'>-	spin_lock_irq(&amp;topology_lock);</div><div class='del'>-	clear_masks();</div><div class='ctx'> 	tle = info-&gt;tle;</div><div class='ctx'> 	end = (union topology_entry *)((unsigned long)info + info-&gt;length);</div><div class='ctx'> 	while (tle &lt; end) {</div><div class='del'>-#ifdef CONFIG_SCHED_BOOK</div><div class='del'>-		if (z10) {</div><div class='del'>-			switch (tle-&gt;nl) {</div><div class='del'>-			case 1:</div><div class='del'>-				book = book-&gt;next;</div><div class='del'>-				book-&gt;id = tle-&gt;container.id;</div><div class='del'>-				break;</div><div class='del'>-			case 0:</div><div class='del'>-				core = add_cpus_to_mask(&amp;tle-&gt;cpu, book, core, z10);</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				clear_masks();</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			tle = next_tle(tle);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='ctx'> 		switch (tle-&gt;nl) {</div><div class='del'>-#ifdef CONFIG_SCHED_BOOK</div><div class='ctx'> 		case 2:</div><div class='ctx'> 			book = book-&gt;next;</div><div class='ctx'> 			book-&gt;id = tle-&gt;container.id;</div><div class='ctx'> 			break;</div><div class='del'>-#endif</div><div class='ctx'> 		case 1:</div><div class='ctx'> 			core = core-&gt;next;</div><div class='ctx'> 			core-&gt;id = tle-&gt;container.id;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0:</div><div class='del'>-			add_cpus_to_mask(&amp;tle-&gt;cpu, book, core, z10);</div><div class='add'>+			add_cpus_to_mask(&amp;tle-&gt;cpu, book, core, 0);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			clear_masks();</div><div class='del'>-			goto out;</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		tle = next_tle(tle);</div><div class='ctx'> 	}</div><div class='del'>-out:</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __tl_to_cores_z10(struct sysinfo_15_1_x *info)</div><div class='add'>+{</div><div class='add'>+	struct mask_info *core = &amp;core_info;</div><div class='add'>+	struct mask_info *book = &amp;book_info;</div><div class='add'>+	union topology_entry *tle, *end;</div><div class='add'>+</div><div class='add'>+	tle = info-&gt;tle;</div><div class='add'>+	end = (union topology_entry *)((unsigned long)info + info-&gt;length);</div><div class='add'>+	while (tle &lt; end) {</div><div class='add'>+		switch (tle-&gt;nl) {</div><div class='add'>+		case 1:</div><div class='add'>+			book = book-&gt;next;</div><div class='add'>+			book-&gt;id = tle-&gt;container.id;</div><div class='add'>+			break;</div><div class='add'>+		case 0:</div><div class='add'>+			core = add_cpus_to_mask(&amp;tle-&gt;cpu, book, core, 1);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			clear_masks();</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		tle = next_tle(tle);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tl_to_cores(struct sysinfo_15_1_x *info)</div><div class='add'>+{</div><div class='add'>+	struct cpuid cpu_id;</div><div class='add'>+</div><div class='add'>+	get_cpu_id(&amp;cpu_id);</div><div class='add'>+	spin_lock_irq(&amp;topology_lock);</div><div class='add'>+	clear_masks();</div><div class='add'>+	switch (cpu_id.machine) {</div><div class='add'>+	case 0x2097:</div><div class='add'>+	case 0x2098:</div><div class='add'>+		__tl_to_cores_z10(info);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		__tl_to_cores_generic(info);</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock_irq(&amp;topology_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -196,7 +201,7 @@ static void topology_update_polarization_simple(void)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;smp_cpu_state_mutex);</div><div class='ctx'> 	for_each_possible_cpu(cpu)</div><div class='del'>-		smp_cpu_polarization[cpu] = POLARIZATION_HRZ;</div><div class='add'>+		cpu_set_polarization(cpu, POLARIZATION_HRZ);</div><div class='ctx'> 	mutex_unlock(&amp;smp_cpu_state_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -215,8 +220,7 @@ static int ptf(unsigned long fc)</div><div class='ctx'> </div><div class='ctx'> int topology_set_cpu_management(int fc)</div><div class='ctx'> {</div><div class='del'>-	int cpu;</div><div class='del'>-	int rc;</div><div class='add'>+	int cpu, rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!MACHINE_HAS_TOPOLOGY)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -227,7 +231,7 @@ int topology_set_cpu_management(int fc)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	for_each_possible_cpu(cpu)</div><div class='del'>-		smp_cpu_polarization[cpu] = POLARIZATION_UNKNWN;</div><div class='add'>+		cpu_set_polarization(cpu, POLARIZATION_UNKNOWN);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -239,29 +243,25 @@ static void update_cpu_core_map(void)</div><div class='ctx'> 	spin_lock_irqsave(&amp;topology_lock, flags);</div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='ctx'> 		cpu_core_map[cpu] = cpu_group_map(&amp;core_info, cpu);</div><div class='del'>-#ifdef CONFIG_SCHED_BOOK</div><div class='ctx'> 		cpu_book_map[cpu] = cpu_group_map(&amp;book_info, cpu);</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;topology_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void store_topology(struct sysinfo_15_1_x *info)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_SCHED_BOOK</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = stsi(info, 15, 1, 3);</div><div class='ctx'> 	if (rc != -ENOSYS)</div><div class='ctx'> 		return;</div><div class='del'>-#endif</div><div class='ctx'> 	stsi(info, 15, 1, 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int arch_update_cpu_topology(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct sysinfo_15_1_x *info = tl_info;</div><div class='del'>-	struct sys_device *sysdev;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	if (!MACHINE_HAS_TOPOLOGY) {</div><div class='hunk'>@@ -273,8 +273,8 @@ int arch_update_cpu_topology(void)</div><div class='ctx'> 	tl_to_cores(info);</div><div class='ctx'> 	update_cpu_core_map();</div><div class='ctx'> 	for_each_online_cpu(cpu) {</div><div class='del'>-		sysdev = get_cpu_sysdev(cpu);</div><div class='del'>-		kobject_uevent(&amp;sysdev-&gt;kobj, KOBJ_CHANGE);</div><div class='add'>+		dev = get_cpu_device(cpu);</div><div class='add'>+		kobject_uevent(&amp;dev-&gt;kobj, KOBJ_CHANGE);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -296,12 +296,30 @@ static void topology_timer_fn(unsigned long ignored)</div><div class='ctx'> 	set_topology_timer();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct timer_list topology_timer =</div><div class='add'>+	TIMER_DEFERRED_INITIALIZER(topology_timer_fn, 0, 0);</div><div class='add'>+</div><div class='add'>+static atomic_t topology_poll = ATOMIC_INIT(0);</div><div class='add'>+</div><div class='ctx'> static void set_topology_timer(void)</div><div class='ctx'> {</div><div class='del'>-	topology_timer.function = topology_timer_fn;</div><div class='del'>-	topology_timer.data = 0;</div><div class='del'>-	topology_timer.expires = jiffies + 60 * HZ;</div><div class='del'>-	add_timer(&amp;topology_timer);</div><div class='add'>+	if (atomic_add_unless(&amp;topology_poll, -1, 0))</div><div class='add'>+		mod_timer(&amp;topology_timer, jiffies + HZ / 10);</div><div class='add'>+	else</div><div class='add'>+		mod_timer(&amp;topology_timer, jiffies + HZ * 60);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void topology_expect_change(void)</div><div class='add'>+{</div><div class='add'>+	if (!MACHINE_HAS_TOPOLOGY)</div><div class='add'>+		return;</div><div class='add'>+	/* This is racy, but it doesn't matter since it is just a heuristic.</div><div class='add'>+	 * Worst case is that we poll in a higher frequency for a bit longer.</div><div class='add'>+	 */</div><div class='add'>+	if (atomic_read(&amp;topology_poll) &gt; 60)</div><div class='add'>+		return;</div><div class='add'>+	atomic_add(60, &amp;topology_poll);</div><div class='add'>+	set_topology_timer();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init early_parse_topology(char *p)</div><div class='hunk'>@@ -313,23 +331,6 @@ static int __init early_parse_topology(char *p)</div><div class='ctx'> }</div><div class='ctx'> early_param("topology", early_parse_topology);</div><div class='ctx'> </div><div class='del'>-static int __init init_topology_update(void)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	rc = 0;</div><div class='del'>-	if (!MACHINE_HAS_TOPOLOGY) {</div><div class='del'>-		topology_update_polarization_simple();</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	init_timer_deferrable(&amp;topology_timer);</div><div class='del'>-	set_topology_timer();</div><div class='del'>-out:</div><div class='del'>-	update_cpu_core_map();</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-__initcall(init_topology_update);</div><div class='del'>-</div><div class='ctx'> static void __init alloc_masks(struct sysinfo_15_1_x *info,</div><div class='ctx'> 			       struct mask_info *mask, int offset)</div><div class='ctx'> {</div><div class='hunk'>@@ -357,10 +358,108 @@ void __init s390_init_cpu_topology(void)</div><div class='ctx'> 	store_topology(info);</div><div class='ctx'> 	pr_info("The CPU configuration topology of the machine is:");</div><div class='ctx'> 	for (i = 0; i &lt; TOPOLOGY_NR_MAG; i++)</div><div class='del'>-		printk(" %d", info-&gt;mag[i]);</div><div class='del'>-	printk(" / %d\n", info-&gt;mnest);</div><div class='add'>+		printk(KERN_CONT " %d", info-&gt;mag[i]);</div><div class='add'>+	printk(KERN_CONT " / %d\n", info-&gt;mnest);</div><div class='ctx'> 	alloc_masks(info, &amp;core_info, 1);</div><div class='del'>-#ifdef CONFIG_SCHED_BOOK</div><div class='ctx'> 	alloc_masks(info, &amp;book_info, 2);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int cpu_management;</div><div class='add'>+</div><div class='add'>+static ssize_t dispatching_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'>+	ssize_t count;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;smp_cpu_state_mutex);</div><div class='add'>+	count = sprintf(buf, "%d\n", cpu_management);</div><div class='add'>+	mutex_unlock(&amp;smp_cpu_state_mutex);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t dispatching_store(struct device *dev,</div><div class='add'>+				 struct device_attribute *attr,</div><div class='add'>+				 const char *buf,</div><div class='add'>+				 size_t count)</div><div class='add'>+{</div><div class='add'>+	int val, rc;</div><div class='add'>+	char delim;</div><div class='add'>+</div><div class='add'>+	if (sscanf(buf, "%d %c", &amp;val, &amp;delim) != 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (val != 0 &amp;&amp; val != 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	rc = 0;</div><div class='add'>+	get_online_cpus();</div><div class='add'>+	mutex_lock(&amp;smp_cpu_state_mutex);</div><div class='add'>+	if (cpu_management == val)</div><div class='add'>+		goto out;</div><div class='add'>+	rc = topology_set_cpu_management(val);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out;</div><div class='add'>+	cpu_management = val;</div><div class='add'>+	topology_expect_change();</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;smp_cpu_state_mutex);</div><div class='add'>+	put_online_cpus();</div><div class='add'>+	return rc ? rc : count;</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(dispatching, 0644, dispatching_show,</div><div class='add'>+			 dispatching_store);</div><div class='add'>+</div><div class='add'>+static ssize_t cpu_polarization_show(struct device *dev,</div><div class='add'>+				     struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	int cpu = dev-&gt;id;</div><div class='add'>+	ssize_t count;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;smp_cpu_state_mutex);</div><div class='add'>+	switch (cpu_read_polarization(cpu)) {</div><div class='add'>+	case POLARIZATION_HRZ:</div><div class='add'>+		count = sprintf(buf, "horizontal\n");</div><div class='add'>+		break;</div><div class='add'>+	case POLARIZATION_VL:</div><div class='add'>+		count = sprintf(buf, "vertical:low\n");</div><div class='add'>+		break;</div><div class='add'>+	case POLARIZATION_VM:</div><div class='add'>+		count = sprintf(buf, "vertical:medium\n");</div><div class='add'>+		break;</div><div class='add'>+	case POLARIZATION_VH:</div><div class='add'>+		count = sprintf(buf, "vertical:high\n");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		count = sprintf(buf, "unknown\n");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;smp_cpu_state_mutex);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(polarization, 0444, cpu_polarization_show, NULL);</div><div class='add'>+</div><div class='add'>+static struct attribute *topology_cpu_attrs[] = {</div><div class='add'>+	&amp;dev_attr_polarization.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute_group topology_cpu_attr_group = {</div><div class='add'>+	.attrs = topology_cpu_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int topology_cpu_init(struct cpu *cpu)</div><div class='add'>+{</div><div class='add'>+	return sysfs_create_group(&amp;cpu-&gt;dev.kobj, &amp;topology_cpu_attr_group);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init topology_init(void)</div><div class='add'>+{</div><div class='add'>+	if (!MACHINE_HAS_TOPOLOGY) {</div><div class='add'>+		topology_update_polarization_simple();</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	set_topology_timer();</div><div class='add'>+out:</div><div class='add'>+	update_cpu_core_map();</div><div class='add'>+	return device_create_file(cpu_subsys.dev_root, &amp;dev_attr_dispatching);</div><div class='add'>+}</div><div class='add'>+device_initcall(topology_init);</div><div class='head'>diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c<br/>index a9807dd86276..5ce3750b181f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/traps.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/traps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/kernel/traps.c</a></div><div class='hunk'>@@ -43,9 +43,9 @@</div><div class='ctx'> #include &lt;asm/debug.h&gt;</div><div class='ctx'> #include "entry.h"</div><div class='ctx'> </div><div class='del'>-void (*pgm_check_table[128])(struct pt_regs *, long, unsigned long);</div><div class='add'>+void (*pgm_check_table[128])(struct pt_regs *regs);</div><div class='ctx'> </div><div class='del'>-int show_unhandled_signals;</div><div class='add'>+int show_unhandled_signals = 1;</div><div class='ctx'> </div><div class='ctx'> #define stack_pointer ({ void **sp; asm("la %0,0(15)" : "=&amp;d" (sp)); sp; })</div><div class='ctx'> </div><div class='hunk'>@@ -234,7 +234,7 @@ void show_regs(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(die_lock);</div><div class='ctx'> </div><div class='del'>-void die(const char * str, struct pt_regs * regs, long err)</div><div class='add'>+void die(struct pt_regs *regs, const char *str)</div><div class='ctx'> {</div><div class='ctx'> 	static int die_counter;</div><div class='ctx'> </div><div class='hunk'>@@ -243,7 +243,7 @@ void die(const char * str, struct pt_regs * regs, long err)</div><div class='ctx'> 	console_verbose();</div><div class='ctx'> 	spin_lock_irq(&amp;die_lock);</div><div class='ctx'> 	bust_spinlocks(1);</div><div class='del'>-	printk("%s: %04lx [#%d] ", str, err &amp; 0xffff, ++die_counter);</div><div class='add'>+	printk("%s: %04x [#%d] ", str, regs-&gt;int_code &amp; 0xffff, ++die_counter);</div><div class='ctx'> #ifdef CONFIG_PREEMPT</div><div class='ctx'> 	printk("PREEMPT ");</div><div class='ctx'> #endif</div><div class='hunk'>@@ -254,7 +254,7 @@ void die(const char * str, struct pt_regs * regs, long err)</div><div class='ctx'> 	printk("DEBUG_PAGEALLOC");</div><div class='ctx'> #endif</div><div class='ctx'> 	printk("\n");</div><div class='del'>-	notify_die(DIE_OOPS, str, regs, err, current-&gt;thread.trap_no, SIGSEGV);</div><div class='add'>+	notify_die(DIE_OOPS, str, regs, 0, regs-&gt;int_code &amp; 0xffff, SIGSEGV);</div><div class='ctx'> 	show_regs(regs);</div><div class='ctx'> 	bust_spinlocks(0);</div><div class='ctx'> 	add_taint(TAINT_DIE);</div><div class='hunk'>@@ -267,8 +267,7 @@ void die(const char * str, struct pt_regs * regs, long err)</div><div class='ctx'> 	do_exit(SIGSEGV);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void inline report_user_fault(struct pt_regs *regs, long int_code,</div><div class='del'>-				     int signr)</div><div class='add'>+static inline void report_user_fault(struct pt_regs *regs, int signr)</div><div class='ctx'> {</div><div class='ctx'> 	if ((task_pid_nr(current) &gt; 1) &amp;&amp; !show_unhandled_signals)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -276,7 +275,7 @@ static void inline report_user_fault(struct pt_regs *regs, long int_code,</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (!printk_ratelimit())</div><div class='ctx'> 		return;</div><div class='del'>-	printk("User process fault: interruption code 0x%lX ", int_code);</div><div class='add'>+	printk("User process fault: interruption code 0x%X ", regs-&gt;int_code);</div><div class='ctx'> 	print_vma_addr("in ", regs-&gt;psw.addr &amp; PSW_ADDR_INSN);</div><div class='ctx'> 	printk("\n");</div><div class='ctx'> 	show_regs(regs);</div><div class='hunk'>@@ -287,19 +286,28 @@ int is_valid_bugaddr(unsigned long addr)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __kprobes do_trap(long pgm_int_code, int signr, char *str,</div><div class='del'>-				     struct pt_regs *regs, siginfo_t *info)</div><div class='add'>+static inline void __user *get_psw_address(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	if (notify_die(DIE_TRAP, str, regs, pgm_int_code,</div><div class='del'>-		       pgm_int_code, signr) == NOTIFY_STOP)</div><div class='add'>+	return (void __user *)</div><div class='add'>+		((regs-&gt;psw.addr - (regs-&gt;int_code &gt;&gt; 16)) &amp; PSW_ADDR_INSN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __kprobes do_trap(struct pt_regs *regs,</div><div class='add'>+			      int si_signo, int si_code, char *str)</div><div class='add'>+{</div><div class='add'>+	siginfo_t info;</div><div class='add'>+</div><div class='add'>+	if (notify_die(DIE_TRAP, str, regs, 0,</div><div class='add'>+		       regs-&gt;int_code, si_signo) == NOTIFY_STOP)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'>         if (regs-&gt;psw.mask &amp; PSW_MASK_PSTATE) {</div><div class='del'>-                struct task_struct *tsk = current;</div><div class='del'>-</div><div class='del'>-		tsk-&gt;thread.trap_no = pgm_int_code &amp; 0xffff;</div><div class='del'>-		force_sig_info(signr, info, tsk);</div><div class='del'>-		report_user_fault(regs, pgm_int_code, signr);</div><div class='add'>+		info.si_signo = si_signo;</div><div class='add'>+		info.si_errno = 0;</div><div class='add'>+		info.si_code = si_code;</div><div class='add'>+		info.si_addr = get_psw_address(regs);</div><div class='add'>+		force_sig_info(si_signo, &amp;info, current);</div><div class='add'>+		report_user_fault(regs, si_signo);</div><div class='ctx'>         } else {</div><div class='ctx'>                 const struct exception_table_entry *fixup;</div><div class='ctx'>                 fixup = search_exception_tables(regs-&gt;psw.addr &amp; PSW_ADDR_INSN);</div><div class='hunk'>@@ -311,18 +319,11 @@ static inline void __kprobes do_trap(long pgm_int_code, int signr, char *str,</div><div class='ctx'> 			btt = report_bug(regs-&gt;psw.addr &amp; PSW_ADDR_INSN, regs);</div><div class='ctx'> 			if (btt == BUG_TRAP_TYPE_WARN)</div><div class='ctx'> 				return;</div><div class='del'>-			die(str, regs, pgm_int_code);</div><div class='add'>+			die(regs, str);</div><div class='ctx'> 		}</div><div class='ctx'>         }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __user *get_psw_address(struct pt_regs *regs,</div><div class='del'>-					   long pgm_int_code)</div><div class='del'>-{</div><div class='del'>-	return (void __user *)</div><div class='del'>-		((regs-&gt;psw.addr - (pgm_int_code &gt;&gt; 16)) &amp; PSW_ADDR_INSN);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __kprobes do_per_trap(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	siginfo_t info;</div><div class='hunk'>@@ -339,26 +340,19 @@ void __kprobes do_per_trap(struct pt_regs *regs)</div><div class='ctx'> 	force_sig_info(SIGTRAP, &amp;info, current);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void default_trap_handler(struct pt_regs *regs, long pgm_int_code,</div><div class='del'>-				 unsigned long trans_exc_code)</div><div class='add'>+static void default_trap_handler(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'>         if (regs-&gt;psw.mask &amp; PSW_MASK_PSTATE) {</div><div class='del'>-		report_user_fault(regs, pgm_int_code, SIGSEGV);</div><div class='add'>+		report_user_fault(regs, SIGSEGV);</div><div class='ctx'> 		do_exit(SIGSEGV);</div><div class='ctx'> 	} else</div><div class='del'>-		die("Unknown program exception", regs, pgm_int_code);</div><div class='add'>+		die(regs, "Unknown program exception");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define DO_ERROR_INFO(name, signr, sicode, str) \</div><div class='del'>-static void name(struct pt_regs *regs, long pgm_int_code, \</div><div class='del'>-		 unsigned long trans_exc_code) \</div><div class='add'>+static void name(struct pt_regs *regs) \</div><div class='ctx'> { \</div><div class='del'>-        siginfo_t info; \</div><div class='del'>-        info.si_signo = signr; \</div><div class='del'>-        info.si_errno = 0; \</div><div class='del'>-        info.si_code = sicode; \</div><div class='del'>-	info.si_addr = get_psw_address(regs, pgm_int_code); \</div><div class='del'>-	do_trap(pgm_int_code, signr, str, regs, &amp;info);	    \</div><div class='add'>+	do_trap(regs, signr, sicode, str); \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> DO_ERROR_INFO(addressing_exception, SIGILL, ILL_ILLADR,</div><div class='hunk'>@@ -388,42 +382,34 @@ DO_ERROR_INFO(special_op_exception, SIGILL, ILL_ILLOPN,</div><div class='ctx'> DO_ERROR_INFO(translation_exception, SIGILL, ILL_ILLOPN,</div><div class='ctx'> 	      "translation exception")</div><div class='ctx'> </div><div class='del'>-static inline void do_fp_trap(struct pt_regs *regs, void __user *location,</div><div class='del'>-			      int fpc, long pgm_int_code)</div><div class='add'>+static inline void do_fp_trap(struct pt_regs *regs, int fpc)</div><div class='ctx'> {</div><div class='del'>-	siginfo_t si;</div><div class='del'>-</div><div class='del'>-	si.si_signo = SIGFPE;</div><div class='del'>-	si.si_errno = 0;</div><div class='del'>-	si.si_addr = location;</div><div class='del'>-	si.si_code = 0;</div><div class='add'>+	int si_code = 0;</div><div class='ctx'> 	/* FPC[2] is Data Exception Code */</div><div class='ctx'> 	if ((fpc &amp; 0x00000300) == 0) {</div><div class='ctx'> 		/* bits 6 and 7 of DXC are 0 iff IEEE exception */</div><div class='ctx'> 		if (fpc &amp; 0x8000) /* invalid fp operation */</div><div class='del'>-			si.si_code = FPE_FLTINV;</div><div class='add'>+			si_code = FPE_FLTINV;</div><div class='ctx'> 		else if (fpc &amp; 0x4000) /* div by 0 */</div><div class='del'>-			si.si_code = FPE_FLTDIV;</div><div class='add'>+			si_code = FPE_FLTDIV;</div><div class='ctx'> 		else if (fpc &amp; 0x2000) /* overflow */</div><div class='del'>-			si.si_code = FPE_FLTOVF;</div><div class='add'>+			si_code = FPE_FLTOVF;</div><div class='ctx'> 		else if (fpc &amp; 0x1000) /* underflow */</div><div class='del'>-			si.si_code = FPE_FLTUND;</div><div class='add'>+			si_code = FPE_FLTUND;</div><div class='ctx'> 		else if (fpc &amp; 0x0800) /* inexact */</div><div class='del'>-			si.si_code = FPE_FLTRES;</div><div class='add'>+			si_code = FPE_FLTRES;</div><div class='ctx'> 	}</div><div class='del'>-	do_trap(pgm_int_code, SIGFPE,</div><div class='del'>-		"floating point exception", regs, &amp;si);</div><div class='add'>+	do_trap(regs, SIGFPE, si_code, "floating point exception");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __kprobes illegal_op(struct pt_regs *regs, long pgm_int_code,</div><div class='del'>-				 unsigned long trans_exc_code)</div><div class='add'>+static void __kprobes illegal_op(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	siginfo_t info;</div><div class='ctx'>         __u8 opcode[6];</div><div class='ctx'> 	__u16 __user *location;</div><div class='ctx'> 	int signal = 0;</div><div class='ctx'> </div><div class='del'>-	location = get_psw_address(regs, pgm_int_code);</div><div class='add'>+	location = get_psw_address(regs);</div><div class='ctx'> </div><div class='ctx'> 	if (regs-&gt;psw.mask &amp; PSW_MASK_PSTATE) {</div><div class='ctx'> 		if (get_user(*((__u16 *) opcode), (__u16 __user *) location))</div><div class='hunk'>@@ -467,44 +453,31 @@ static void __kprobes illegal_op(struct pt_regs *regs, long pgm_int_code,</div><div class='ctx'> 		 * If we get an illegal op in kernel mode, send it through the</div><div class='ctx'> 		 * kprobes notifier. If kprobes doesn't pick it up, SIGILL</div><div class='ctx'> 		 */</div><div class='del'>-		if (notify_die(DIE_BPT, "bpt", regs, pgm_int_code,</div><div class='add'>+		if (notify_die(DIE_BPT, "bpt", regs, 0,</div><div class='ctx'> 			       3, SIGTRAP) != NOTIFY_STOP)</div><div class='ctx'> 			signal = SIGILL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MATHEMU</div><div class='ctx'>         if (signal == SIGFPE)</div><div class='del'>-		do_fp_trap(regs, location,</div><div class='del'>-			   current-&gt;thread.fp_regs.fpc, pgm_int_code);</div><div class='del'>-        else if (signal == SIGSEGV) {</div><div class='del'>-		info.si_signo = signal;</div><div class='del'>-		info.si_errno = 0;</div><div class='del'>-		info.si_code = SEGV_MAPERR;</div><div class='del'>-		info.si_addr = (void __user *) location;</div><div class='del'>-		do_trap(pgm_int_code, signal,</div><div class='del'>-			"user address fault", regs, &amp;info);</div><div class='del'>-	} else</div><div class='add'>+		do_fp_trap(regs, current-&gt;thread.fp_regs.fpc);</div><div class='add'>+	else if (signal == SIGSEGV)</div><div class='add'>+		do_trap(regs, signal, SEGV_MAPERR, "user address fault");</div><div class='add'>+	else</div><div class='ctx'> #endif</div><div class='del'>-        if (signal) {</div><div class='del'>-		info.si_signo = signal;</div><div class='del'>-		info.si_errno = 0;</div><div class='del'>-		info.si_code = ILL_ILLOPC;</div><div class='del'>-		info.si_addr = (void __user *) location;</div><div class='del'>-		do_trap(pgm_int_code, signal,</div><div class='del'>-			"illegal operation", regs, &amp;info);</div><div class='del'>-	}</div><div class='add'>+	if (signal)</div><div class='add'>+		do_trap(regs, signal, ILL_ILLOPC, "illegal operation");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MATHEMU</div><div class='del'>-void specification_exception(struct pt_regs *regs, long pgm_int_code,</div><div class='del'>-			     unsigned long trans_exc_code)</div><div class='add'>+void specification_exception(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'>         __u8 opcode[6];</div><div class='ctx'> 	__u16 __user *location = NULL;</div><div class='ctx'> 	int signal = 0;</div><div class='ctx'> </div><div class='del'>-	location = (__u16 __user *) get_psw_address(regs, pgm_int_code);</div><div class='add'>+	location = (__u16 __user *) get_psw_address(regs);</div><div class='ctx'> </div><div class='ctx'>         if (regs-&gt;psw.mask &amp; PSW_MASK_PSTATE) {</div><div class='ctx'> 		get_user(*((__u16 *) opcode), location);</div><div class='hunk'>@@ -539,30 +512,21 @@ void specification_exception(struct pt_regs *regs, long pgm_int_code,</div><div class='ctx'> 		signal = SIGILL;</div><div class='ctx'> </div><div class='ctx'>         if (signal == SIGFPE)</div><div class='del'>-		do_fp_trap(regs, location,</div><div class='del'>-			   current-&gt;thread.fp_regs.fpc, pgm_int_code);</div><div class='del'>-        else if (signal) {</div><div class='del'>-		siginfo_t info;</div><div class='del'>-		info.si_signo = signal;</div><div class='del'>-		info.si_errno = 0;</div><div class='del'>-		info.si_code = ILL_ILLOPN;</div><div class='del'>-		info.si_addr = location;</div><div class='del'>-		do_trap(pgm_int_code, signal,</div><div class='del'>-			"specification exception", regs, &amp;info);</div><div class='del'>-	}</div><div class='add'>+		do_fp_trap(regs, current-&gt;thread.fp_regs.fpc);</div><div class='add'>+	else if (signal)</div><div class='add'>+		do_trap(regs, signal, ILL_ILLOPN, "specification exception");</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> DO_ERROR_INFO(specification_exception, SIGILL, ILL_ILLOPN,</div><div class='ctx'> 	      "specification exception");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void data_exception(struct pt_regs *regs, long pgm_int_code,</div><div class='del'>-			   unsigned long trans_exc_code)</div><div class='add'>+static void data_exception(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	__u16 __user *location;</div><div class='ctx'> 	int signal = 0;</div><div class='ctx'> </div><div class='del'>-	location = get_psw_address(regs, pgm_int_code);</div><div class='add'>+	location = get_psw_address(regs);</div><div class='ctx'> </div><div class='ctx'> 	if (MACHINE_HAS_IEEE)</div><div class='ctx'> 		asm volatile("stfpc %0" : "=m" (current-&gt;thread.fp_regs.fpc));</div><div class='hunk'>@@ -627,32 +591,18 @@ static void data_exception(struct pt_regs *regs, long pgm_int_code,</div><div class='ctx'> 	else</div><div class='ctx'> 		signal = SIGILL;</div><div class='ctx'>         if (signal == SIGFPE)</div><div class='del'>-		do_fp_trap(regs, location,</div><div class='del'>-			   current-&gt;thread.fp_regs.fpc, pgm_int_code);</div><div class='del'>-        else if (signal) {</div><div class='del'>-		siginfo_t info;</div><div class='del'>-		info.si_signo = signal;</div><div class='del'>-		info.si_errno = 0;</div><div class='del'>-		info.si_code = ILL_ILLOPN;</div><div class='del'>-		info.si_addr = location;</div><div class='del'>-		do_trap(pgm_int_code, signal, "data exception", regs, &amp;info);</div><div class='del'>-	}</div><div class='add'>+		do_fp_trap(regs, current-&gt;thread.fp_regs.fpc);</div><div class='add'>+	else if (signal)</div><div class='add'>+		do_trap(regs, signal, ILL_ILLOPN, "data exception");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void space_switch_exception(struct pt_regs *regs, long pgm_int_code,</div><div class='del'>-				   unsigned long trans_exc_code)</div><div class='add'>+static void space_switch_exception(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-        siginfo_t info;</div><div class='del'>-</div><div class='ctx'> 	/* Set user psw back to home space mode. */</div><div class='ctx'> 	if (regs-&gt;psw.mask &amp; PSW_MASK_PSTATE)</div><div class='ctx'> 		regs-&gt;psw.mask |= PSW_ASC_HOME;</div><div class='ctx'> 	/* Send SIGILL. */</div><div class='del'>-        info.si_signo = SIGILL;</div><div class='del'>-        info.si_errno = 0;</div><div class='del'>-        info.si_code = ILL_PRVOPC;</div><div class='del'>-	info.si_addr = get_psw_address(regs, pgm_int_code);</div><div class='del'>-	do_trap(pgm_int_code, SIGILL, "space switch event", regs, &amp;info);</div><div class='add'>+	do_trap(regs, SIGILL, ILL_PRVOPC, "space switch event");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __kprobes kernel_stack_overflow(struct pt_regs * regs)</div><div class='head'>diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c<br/>index a9a301866b3c..354dd39073ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/mm/fault.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/mm/fault.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/mm/fault.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/mm/fault.c</a></div><div class='hunk'>@@ -125,8 +125,7 @@ static inline int user_space_fault(unsigned long trans_exc_code)</div><div class='ctx'> 	return trans_exc_code != 3;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void report_user_fault(struct pt_regs *regs, long int_code,</div><div class='del'>-				     int signr, unsigned long address)</div><div class='add'>+static inline void report_user_fault(struct pt_regs *regs, long signr)</div><div class='ctx'> {</div><div class='ctx'> 	if ((task_pid_nr(current) &gt; 1) &amp;&amp; !show_unhandled_signals)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -134,10 +133,12 @@ static inline void report_user_fault(struct pt_regs *regs, long int_code,</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (!printk_ratelimit())</div><div class='ctx'> 		return;</div><div class='del'>-	printk("User process fault: interruption code 0x%lX ", int_code);</div><div class='add'>+	printk(KERN_ALERT "User process fault: interruption code 0x%X ",</div><div class='add'>+	       regs-&gt;int_code);</div><div class='ctx'> 	print_vma_addr(KERN_CONT "in ", regs-&gt;psw.addr &amp; PSW_ADDR_INSN);</div><div class='del'>-	printk("\n");</div><div class='del'>-	printk("failing address: %lX\n", address);</div><div class='add'>+	printk(KERN_CONT "\n");</div><div class='add'>+	printk(KERN_ALERT "failing address: %lX\n",</div><div class='add'>+	       regs-&gt;int_parm_long &amp; __FAIL_ADDR_MASK);</div><div class='ctx'> 	show_regs(regs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -145,24 +146,18 @@ static inline void report_user_fault(struct pt_regs *regs, long int_code,</div><div class='ctx'>  * Send SIGSEGV to task.  This is an external routine</div><div class='ctx'>  * to keep the stack usage of do_page_fault small.</div><div class='ctx'>  */</div><div class='del'>-static noinline void do_sigsegv(struct pt_regs *regs, long int_code,</div><div class='del'>-				int si_code, unsigned long trans_exc_code)</div><div class='add'>+static noinline void do_sigsegv(struct pt_regs *regs, int si_code)</div><div class='ctx'> {</div><div class='ctx'> 	struct siginfo si;</div><div class='del'>-	unsigned long address;</div><div class='ctx'> </div><div class='del'>-	address = trans_exc_code &amp; __FAIL_ADDR_MASK;</div><div class='del'>-	current-&gt;thread.prot_addr = address;</div><div class='del'>-	current-&gt;thread.trap_no = int_code;</div><div class='del'>-	report_user_fault(regs, int_code, SIGSEGV, address);</div><div class='add'>+	report_user_fault(regs, SIGSEGV);</div><div class='ctx'> 	si.si_signo = SIGSEGV;</div><div class='ctx'> 	si.si_code = si_code;</div><div class='del'>-	si.si_addr = (void __user *) address;</div><div class='add'>+	si.si_addr = (void __user *)(regs-&gt;int_parm_long &amp; __FAIL_ADDR_MASK);</div><div class='ctx'> 	force_sig_info(SIGSEGV, &amp;si, current);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline void do_no_context(struct pt_regs *regs, long int_code,</div><div class='del'>-				   unsigned long trans_exc_code)</div><div class='add'>+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'> 	unsigned long address;</div><div class='hunk'>@@ -178,55 +173,48 @@ static noinline void do_no_context(struct pt_regs *regs, long int_code,</div><div class='ctx'> 	 * Oops. The kernel tried to access some bad page. We'll have to</div><div class='ctx'> 	 * terminate things with extreme prejudice.</div><div class='ctx'> 	 */</div><div class='del'>-	address = trans_exc_code &amp; __FAIL_ADDR_MASK;</div><div class='del'>-	if (!user_space_fault(trans_exc_code))</div><div class='add'>+	address = regs-&gt;int_parm_long &amp; __FAIL_ADDR_MASK;</div><div class='add'>+	if (!user_space_fault(regs-&gt;int_parm_long))</div><div class='ctx'> 		printk(KERN_ALERT "Unable to handle kernel pointer dereference"</div><div class='ctx'> 		       " at virtual kernel address %p\n", (void *)address);</div><div class='ctx'> 	else</div><div class='ctx'> 		printk(KERN_ALERT "Unable to handle kernel paging request"</div><div class='ctx'> 		       " at virtual user address %p\n", (void *)address);</div><div class='ctx'> </div><div class='del'>-	die("Oops", regs, int_code);</div><div class='add'>+	die(regs, "Oops");</div><div class='ctx'> 	do_exit(SIGKILL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline void do_low_address(struct pt_regs *regs, long int_code,</div><div class='del'>-				    unsigned long trans_exc_code)</div><div class='add'>+static noinline void do_low_address(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	/* Low-address protection hit in kernel mode means</div><div class='ctx'> 	   NULL pointer write access in kernel mode.  */</div><div class='ctx'> 	if (regs-&gt;psw.mask &amp; PSW_MASK_PSTATE) {</div><div class='ctx'> 		/* Low-address protection hit in user mode 'cannot happen'. */</div><div class='del'>-		die ("Low-address protection", regs, int_code);</div><div class='add'>+		die (regs, "Low-address protection");</div><div class='ctx'> 		do_exit(SIGKILL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	do_no_context(regs, int_code, trans_exc_code);</div><div class='add'>+	do_no_context(regs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline void do_sigbus(struct pt_regs *regs, long int_code,</div><div class='del'>-			       unsigned long trans_exc_code)</div><div class='add'>+static noinline void do_sigbus(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *tsk = current;</div><div class='del'>-	unsigned long address;</div><div class='ctx'> 	struct siginfo si;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Send a sigbus, regardless of whether we were in kernel</div><div class='ctx'> 	 * or user mode.</div><div class='ctx'> 	 */</div><div class='del'>-	address = trans_exc_code &amp; __FAIL_ADDR_MASK;</div><div class='del'>-	tsk-&gt;thread.prot_addr = address;</div><div class='del'>-	tsk-&gt;thread.trap_no = int_code;</div><div class='ctx'> 	si.si_signo = SIGBUS;</div><div class='ctx'> 	si.si_errno = 0;</div><div class='ctx'> 	si.si_code = BUS_ADRERR;</div><div class='del'>-	si.si_addr = (void __user *) address;</div><div class='add'>+	si.si_addr = (void __user *)(regs-&gt;int_parm_long &amp; __FAIL_ADDR_MASK);</div><div class='ctx'> 	force_sig_info(SIGBUS, &amp;si, tsk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static noinline void do_fault_error(struct pt_regs *regs, long int_code,</div><div class='del'>-				    unsigned long trans_exc_code, int fault)</div><div class='add'>+static noinline void do_fault_error(struct pt_regs *regs, int fault)</div><div class='ctx'> {</div><div class='ctx'> 	int si_code;</div><div class='ctx'> </div><div class='hunk'>@@ -238,24 +226,24 @@ static noinline void do_fault_error(struct pt_regs *regs, long int_code,</div><div class='ctx'> 			/* User mode accesses just cause a SIGSEGV */</div><div class='ctx'> 			si_code = (fault == VM_FAULT_BADMAP) ?</div><div class='ctx'> 				SEGV_MAPERR : SEGV_ACCERR;</div><div class='del'>-			do_sigsegv(regs, int_code, si_code, trans_exc_code);</div><div class='add'>+			do_sigsegv(regs, si_code);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	case VM_FAULT_BADCONTEXT:</div><div class='del'>-		do_no_context(regs, int_code, trans_exc_code);</div><div class='add'>+		do_no_context(regs);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default: /* fault &amp; VM_FAULT_ERROR */</div><div class='ctx'> 		if (fault &amp; VM_FAULT_OOM) {</div><div class='ctx'> 			if (!(regs-&gt;psw.mask &amp; PSW_MASK_PSTATE))</div><div class='del'>-				do_no_context(regs, int_code, trans_exc_code);</div><div class='add'>+				do_no_context(regs);</div><div class='ctx'> 			else</div><div class='ctx'> 				pagefault_out_of_memory();</div><div class='ctx'> 		} else if (fault &amp; VM_FAULT_SIGBUS) {</div><div class='ctx'> 			/* Kernel mode? Handle exceptions or die */</div><div class='ctx'> 			if (!(regs-&gt;psw.mask &amp; PSW_MASK_PSTATE))</div><div class='del'>-				do_no_context(regs, int_code, trans_exc_code);</div><div class='add'>+				do_no_context(regs);</div><div class='ctx'> 			else</div><div class='del'>-				do_sigbus(regs, int_code, trans_exc_code);</div><div class='add'>+				do_sigbus(regs);</div><div class='ctx'> 		} else</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -273,12 +261,12 @@ static noinline void do_fault_error(struct pt_regs *regs, long int_code,</div><div class='ctx'>  *   11       Page translation     -&gt;  Not present       (nullification)</div><div class='ctx'>  *   3b       Region third trans.  -&gt;  Not present       (nullification)</div><div class='ctx'>  */</div><div class='del'>-static inline int do_exception(struct pt_regs *regs, int access,</div><div class='del'>-			       unsigned long trans_exc_code)</div><div class='add'>+static inline int do_exception(struct pt_regs *regs, int access)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *tsk;</div><div class='ctx'> 	struct mm_struct *mm;</div><div class='ctx'> 	struct vm_area_struct *vma;</div><div class='add'>+	unsigned long trans_exc_code;</div><div class='ctx'> 	unsigned long address;</div><div class='ctx'> 	unsigned int flags;</div><div class='ctx'> 	int fault;</div><div class='hunk'>@@ -288,6 +276,7 @@ static inline int do_exception(struct pt_regs *regs, int access,</div><div class='ctx'> </div><div class='ctx'> 	tsk = current;</div><div class='ctx'> 	mm = tsk-&gt;mm;</div><div class='add'>+	trans_exc_code = regs-&gt;int_parm_long;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Verify that the fault happened in user space, that</div><div class='hunk'>@@ -387,45 +376,46 @@ out:</div><div class='ctx'> 	return fault;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __kprobes do_protection_exception(struct pt_regs *regs, long pgm_int_code,</div><div class='del'>-				       unsigned long trans_exc_code)</div><div class='add'>+void __kprobes do_protection_exception(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='add'>+	unsigned long trans_exc_code;</div><div class='ctx'> 	int fault;</div><div class='ctx'> </div><div class='add'>+	trans_exc_code = regs-&gt;int_parm_long;</div><div class='ctx'> 	/* Protection exception is suppressing, decrement psw address. */</div><div class='del'>-	regs-&gt;psw.addr = __rewind_psw(regs-&gt;psw, pgm_int_code &gt;&gt; 16);</div><div class='add'>+	regs-&gt;psw.addr = __rewind_psw(regs-&gt;psw, regs-&gt;int_code &gt;&gt; 16);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check for low-address protection.  This needs to be treated</div><div class='ctx'> 	 * as a special case because the translation exception code</div><div class='ctx'> 	 * field is not guaranteed to contain valid data in this case.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (unlikely(!(trans_exc_code &amp; 4))) {</div><div class='del'>-		do_low_address(regs, pgm_int_code, trans_exc_code);</div><div class='add'>+		do_low_address(regs);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	fault = do_exception(regs, VM_WRITE, trans_exc_code);</div><div class='add'>+	fault = do_exception(regs, VM_WRITE);</div><div class='ctx'> 	if (unlikely(fault))</div><div class='del'>-		do_fault_error(regs, 4, trans_exc_code, fault);</div><div class='add'>+		do_fault_error(regs, fault);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __kprobes do_dat_exception(struct pt_regs *regs, long pgm_int_code,</div><div class='del'>-				unsigned long trans_exc_code)</div><div class='add'>+void __kprobes do_dat_exception(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	int access, fault;</div><div class='ctx'> </div><div class='ctx'> 	access = VM_READ | VM_EXEC | VM_WRITE;</div><div class='del'>-	fault = do_exception(regs, access, trans_exc_code);</div><div class='add'>+	fault = do_exception(regs, access);</div><div class='ctx'> 	if (unlikely(fault))</div><div class='del'>-		do_fault_error(regs, pgm_int_code &amp; 255, trans_exc_code, fault);</div><div class='add'>+		do_fault_error(regs, fault);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='del'>-void __kprobes do_asce_exception(struct pt_regs *regs, long pgm_int_code,</div><div class='del'>-				 unsigned long trans_exc_code)</div><div class='add'>+void __kprobes do_asce_exception(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct mm_struct *mm = current-&gt;mm;</div><div class='ctx'> 	struct vm_area_struct *vma;</div><div class='add'>+	unsigned long trans_exc_code;</div><div class='ctx'> </div><div class='add'>+	trans_exc_code = regs-&gt;int_parm_long;</div><div class='ctx'> 	if (unlikely(!user_space_fault(trans_exc_code) || in_atomic() || !mm))</div><div class='ctx'> 		goto no_context;</div><div class='ctx'> </div><div class='hunk'>@@ -440,12 +430,12 @@ void __kprobes do_asce_exception(struct pt_regs *regs, long pgm_int_code,</div><div class='ctx'> </div><div class='ctx'> 	/* User mode accesses just cause a SIGSEGV */</div><div class='ctx'> 	if (regs-&gt;psw.mask &amp; PSW_MASK_PSTATE) {</div><div class='del'>-		do_sigsegv(regs, pgm_int_code, SEGV_MAPERR, trans_exc_code);</div><div class='add'>+		do_sigsegv(regs, SEGV_MAPERR);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> no_context:</div><div class='del'>-	do_no_context(regs, pgm_int_code, trans_exc_code);</div><div class='add'>+	do_no_context(regs);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -459,14 +449,15 @@ int __handle_fault(unsigned long uaddr, unsigned long pgm_int_code, int write)</div><div class='ctx'> 		regs.psw.mask |= PSW_MASK_IO | PSW_MASK_EXT;</div><div class='ctx'> 	regs.psw.addr = (unsigned long) __builtin_return_address(0);</div><div class='ctx'> 	regs.psw.addr |= PSW_ADDR_AMODE;</div><div class='del'>-	uaddr &amp;= PAGE_MASK;</div><div class='add'>+	regs.int_code = pgm_int_code;</div><div class='add'>+	regs.int_parm_long = (uaddr &amp; PAGE_MASK) | 2;</div><div class='ctx'> 	access = write ? VM_WRITE : VM_READ;</div><div class='del'>-	fault = do_exception(&amp;regs, access, uaddr | 2);</div><div class='add'>+	fault = do_exception(&amp;regs, access);</div><div class='ctx'> 	if (unlikely(fault)) {</div><div class='ctx'> 		if (fault &amp; VM_FAULT_OOM)</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		else if (fault &amp; VM_FAULT_SIGBUS)</div><div class='del'>-			do_sigbus(&amp;regs, pgm_int_code, uaddr);</div><div class='add'>+			do_sigbus(&amp;regs);</div><div class='ctx'> 	}</div><div class='ctx'> 	return fault ? -EFAULT : 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -509,7 +500,7 @@ int pfault_init(void)</div><div class='ctx'> 		.reserved = __PF_RES_FIELD };</div><div class='ctx'>         int rc;</div><div class='ctx'> </div><div class='del'>-	if (!MACHINE_IS_VM || pfault_disable)</div><div class='add'>+	if (pfault_disable)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	asm volatile(</div><div class='ctx'> 		"	diag	%1,%0,0x258\n"</div><div class='hunk'>@@ -530,7 +521,7 @@ void pfault_fini(void)</div><div class='ctx'> 		.refversn = 2,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (!MACHINE_IS_VM || pfault_disable)</div><div class='add'>+	if (pfault_disable)</div><div class='ctx'> 		return;</div><div class='ctx'> 	asm volatile(</div><div class='ctx'> 		"	diag	%0,0,0x258\n"</div><div class='hunk'>@@ -643,8 +634,6 @@ static int __init pfault_irq_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (!MACHINE_IS_VM)</div><div class='del'>-		return 0;</div><div class='ctx'> 	rc = register_external_interrupt(0x2603, pfault_interrupt);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out_extint;</div><div class='head'>diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c<br/>index d4b9fb4d0042..5d633019d8f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/mm/init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/mm/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/mm/init.c</a></div><div class='hunk'>@@ -93,18 +93,22 @@ static unsigned long setup_zero_pages(void)</div><div class='ctx'> void __init paging_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long max_zone_pfns[MAX_NR_ZONES];</div><div class='del'>-	unsigned long pgd_type;</div><div class='add'>+	unsigned long pgd_type, asce_bits;</div><div class='ctx'> </div><div class='ctx'> 	init_mm.pgd = swapper_pg_dir;</div><div class='del'>-	S390_lowcore.kernel_asce = __pa(init_mm.pgd) &amp; PAGE_MASK;</div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='del'>-	/* A three level page table (4TB) is enough for the kernel space. */</div><div class='del'>-	S390_lowcore.kernel_asce |= _ASCE_TYPE_REGION3 | _ASCE_TABLE_LENGTH;</div><div class='del'>-	pgd_type = _REGION3_ENTRY_EMPTY;</div><div class='add'>+	if (VMALLOC_END &gt; (1UL &lt;&lt; 42)) {</div><div class='add'>+		asce_bits = _ASCE_TYPE_REGION2 | _ASCE_TABLE_LENGTH;</div><div class='add'>+		pgd_type = _REGION2_ENTRY_EMPTY;</div><div class='add'>+	} else {</div><div class='add'>+		asce_bits = _ASCE_TYPE_REGION3 | _ASCE_TABLE_LENGTH;</div><div class='add'>+		pgd_type = _REGION3_ENTRY_EMPTY;</div><div class='add'>+	}</div><div class='ctx'> #else</div><div class='del'>-	S390_lowcore.kernel_asce |= _ASCE_TABLE_LENGTH;</div><div class='add'>+	asce_bits = _ASCE_TABLE_LENGTH;</div><div class='ctx'> 	pgd_type = _SEGMENT_ENTRY_EMPTY;</div><div class='ctx'> #endif</div><div class='add'>+	S390_lowcore.kernel_asce = (__pa(init_mm.pgd) &amp; PAGE_MASK) | asce_bits;</div><div class='ctx'> 	clear_table((unsigned long *) init_mm.pgd, pgd_type,</div><div class='ctx'> 		    sizeof(unsigned long)*2048);</div><div class='ctx'> 	vmem_map_init();</div><div class='head'>diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c<br/>index 301c84d3b542..9a4d02f64f16 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/mm/pgtable.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/s390/mm/pgtable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/mm/pgtable.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/s390/mm/pgtable.c</a></div><div class='hunk'>@@ -33,17 +33,6 @@</div><div class='ctx'> #define FRAG_MASK	0x03</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-unsigned long VMALLOC_START = VMALLOC_END - VMALLOC_SIZE;</div><div class='del'>-EXPORT_SYMBOL(VMALLOC_START);</div><div class='del'>-</div><div class='del'>-static int __init parse_vmalloc(char *arg)</div><div class='del'>-{</div><div class='del'>-	if (!arg)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	VMALLOC_START = (VMALLOC_END - memparse(arg, &amp;arg)) &amp; PAGE_MASK;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-early_param("vmalloc", parse_vmalloc);</div><div class='ctx'> </div><div class='ctx'> unsigned long *crst_table_alloc(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='hunk'>@@ -267,7 +256,10 @@ static int gmap_alloc_table(struct gmap *gmap,</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	unsigned long *new;</div><div class='ctx'> </div><div class='add'>+	/* since we dont free the gmap table until gmap_free we can unlock */</div><div class='add'>+	spin_unlock(&amp;gmap-&gt;mm-&gt;page_table_lock);</div><div class='ctx'> 	page = alloc_pages(GFP_KERNEL, ALLOC_ORDER);</div><div class='add'>+	spin_lock(&amp;gmap-&gt;mm-&gt;page_table_lock);</div><div class='ctx'> 	if (!page)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	new = (unsigned long *) page_to_phys(page);</div><div class='head'>diff --git a/arch/score/Kconfig b/arch/score/Kconfig<br/>index 8b0c9464aa9d..4b285779ac05 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/score/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/score/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/score/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/score/Kconfig</a></div><div class='hunk'>@@ -4,9 +4,11 @@ config SCORE</div><div class='ctx'>        def_bool y</div><div class='ctx'>        select HAVE_GENERIC_HARDIRQS</div><div class='ctx'>        select GENERIC_IRQ_SHOW</div><div class='add'>+       select GENERIC_IOMAP</div><div class='ctx'>        select HAVE_MEMBLOCK</div><div class='ctx'>        select HAVE_MEMBLOCK_NODE_MAP</div><div class='ctx'>        select ARCH_DISCARD_MEMBLOCK</div><div class='add'>+       select GENERIC_CPU_DEVICES</div><div class='ctx'> </div><div class='ctx'> choice</div><div class='ctx'> 	prompt "System type"</div><div class='hunk'>@@ -36,9 +38,6 @@ endmenu</div><div class='ctx'> config CPU_SCORE7</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='del'>-config GENERIC_IOMAP</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config NO_DMA</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='head'>diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig<br/>index 47a2f1c2cb0d..3c8db65c89e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/Kconfig</a></div><div class='hunk'>@@ -85,9 +85,6 @@ config GENERIC_GPIO</div><div class='ctx'> config GENERIC_CALIBRATE_DELAY</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='del'>-config GENERIC_IOMAP</div><div class='del'>-	bool</div><div class='del'>-</div><div class='ctx'> config GENERIC_CLOCKEVENTS</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='hunk'>@@ -861,6 +858,7 @@ config PCI</div><div class='ctx'> 	bool "PCI support"</div><div class='ctx'> 	depends on SYS_SUPPORTS_PCI</div><div class='ctx'> 	select PCI_DOMAINS</div><div class='add'>+	select GENERIC_PCI_IOMAP</div><div class='ctx'> 	help</div><div class='ctx'> 	  Find out whether you have a PCI motherboard. PCI is the name of a</div><div class='ctx'> 	  bus system, i.e. the way the CPU talks to the other stuff inside</div><div class='head'>diff --git a/arch/sh/boards/board-magicpanelr2.c b/arch/sh/boards/board-magicpanelr2.c<br/>index 93f5039099b7..b2ca1d9948fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/board-magicpanelr2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/boards/board-magicpanelr2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/board-magicpanelr2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/boards/board-magicpanelr2.c</a></div><div class='hunk'>@@ -25,9 +25,6 @@</div><div class='ctx'> </div><div class='ctx'> #define LAN9115_READY	(__raw_readl(0xA8000084UL) &amp; 0x00000001UL)</div><div class='ctx'> </div><div class='del'>-/* Prefer cmdline over RedBoot */</div><div class='del'>-static const char *probes[] = { "cmdlinepart", "RedBoot", NULL };</div><div class='del'>-</div><div class='ctx'> /* Wait until reset finished. Timeout is 100ms. */</div><div class='ctx'> static int __init ethernet_reset_finished(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -293,8 +290,6 @@ static struct platform_device heartbeat_device = {</div><div class='ctx'> 	.resource	= heartbeat_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct mtd_partition *parsed_partitions;</div><div class='del'>-</div><div class='ctx'> static struct mtd_partition mpr2_partitions[] = {</div><div class='ctx'> 	/* Reserved for bootloader, read-only */</div><div class='ctx'> 	{</div><div class='hunk'>@@ -318,6 +313,8 @@ static struct mtd_partition mpr2_partitions[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct physmap_flash_data flash_data = {</div><div class='add'>+	.parts		= mpr2_partitions,</div><div class='add'>+	.nr_parts	= ARRAY_SIZE(mpr2_partitions),</div><div class='ctx'> 	.width		= 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -337,32 +334,6 @@ static struct platform_device flash_device = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct mtd_info *flash_mtd;</div><div class='del'>-</div><div class='del'>-static struct map_info mpr2_flash_map = {</div><div class='del'>-	.name = "Magic Panel R2 Flash",</div><div class='del'>-	.size = 0x2000000UL,</div><div class='del'>-	.bankwidth = 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __init set_mtd_partitions(void)</div><div class='del'>-{</div><div class='del'>-	int nr_parts = 0;</div><div class='del'>-</div><div class='del'>-	simple_map_init(&amp;mpr2_flash_map);</div><div class='del'>-	flash_mtd = do_map_probe("cfi_probe", &amp;mpr2_flash_map);</div><div class='del'>-	nr_parts = parse_mtd_partitions(flash_mtd, probes,</div><div class='del'>-					&amp;parsed_partitions, 0);</div><div class='del'>-	/* If there is no partition table, used the hard coded table */</div><div class='del'>-	if (nr_parts &lt;= 0) {</div><div class='del'>-		flash_data.parts = mpr2_partitions;</div><div class='del'>-		flash_data.nr_parts = ARRAY_SIZE(mpr2_partitions);</div><div class='del'>-	} else {</div><div class='del'>-		flash_data.nr_parts = nr_parts;</div><div class='del'>-		flash_data.parts = parsed_partitions;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Add all resources to the platform_device</div><div class='ctx'>  */</div><div class='hunk'>@@ -376,7 +347,6 @@ static struct platform_device *mpr2_devices[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> static int __init mpr2_devices_setup(void)</div><div class='ctx'> {</div><div class='del'>-	set_mtd_partitions();</div><div class='ctx'> 	return platform_add_devices(mpr2_devices, ARRAY_SIZE(mpr2_devices));</div><div class='ctx'> }</div><div class='ctx'> device_initcall(mpr2_devices_setup);</div><div class='head'>diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c<br/>index 895e337c79b6..0838154dd216 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/board-sh7757lcr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/boards/board-sh7757lcr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/board-sh7757lcr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/boards/board-sh7757lcr.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/mmc/sh_mmcif.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/sh_mobile_sdhi.h&gt;</div><div class='ctx'> #include &lt;linux/sh_eth.h&gt;</div><div class='add'>+#include &lt;linux/usb/renesas_usbhs.h&gt;</div><div class='ctx'> #include &lt;cpu/sh7757.h&gt;</div><div class='ctx'> #include &lt;asm/heartbeat.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -264,6 +265,43 @@ static struct platform_device sdhi_device = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int usbhs0_get_id(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	return USBHS_GADGET;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct renesas_usbhs_platform_info usb0_data = {</div><div class='add'>+	.platform_callback = {</div><div class='add'>+		.get_id = usbhs0_get_id,</div><div class='add'>+	},</div><div class='add'>+	.driver_param = {</div><div class='add'>+		.buswait_bwait = 5,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource usb0_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= 0xfe450000,</div><div class='add'>+		.end	= 0xfe4501ff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= 50,</div><div class='add'>+		.end	= 50,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device usb0_device = {</div><div class='add'>+	.name		= "renesas_usbhs",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data		= &amp;usb0_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= ARRAY_SIZE(usb0_resources),</div><div class='add'>+	.resource	= usb0_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device *sh7757lcr_devices[] __initdata = {</div><div class='ctx'> 	&amp;heartbeat_device,</div><div class='ctx'> 	&amp;sh7757_eth0_device,</div><div class='hunk'>@@ -272,6 +310,7 @@ static struct platform_device *sh7757lcr_devices[] __initdata = {</div><div class='ctx'> 	&amp;sh7757_eth_giga1_device,</div><div class='ctx'> 	&amp;sh_mmcif_device,</div><div class='ctx'> 	&amp;sdhi_device,</div><div class='add'>+	&amp;usb0_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct flash_platform_data spi_flash_data = {</div><div class='head'>diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c<br/>index 7030f4c8cf11..6418e95c2b6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-ap325rxa/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/boards/mach-ap325rxa/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-ap325rxa/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/boards/mach-ap325rxa/setup.c</a></div><div class='hunk'>@@ -207,7 +207,7 @@ static struct sh_mobile_lcdc_info lcdc_info = {</div><div class='ctx'> 	.clock_source = LCDC_CLK_EXTERNAL,</div><div class='ctx'> 	.ch[0] = {</div><div class='ctx'> 		.chan = LCDC_CHAN_MAINLCD,</div><div class='del'>-		.bpp = 16,</div><div class='add'>+		.fourcc = V4L2_PIX_FMT_RGB565,</div><div class='ctx'> 		.interface_type = RGB18,</div><div class='ctx'> 		.clock_divider = 1,</div><div class='ctx'> 		.lcd_cfg = ap325rxa_lcdc_modes,</div><div class='hunk'>@@ -249,9 +249,6 @@ static struct platform_device lcdc_device = {</div><div class='ctx'> 	.dev		= {</div><div class='ctx'> 		.platform_data	= &amp;lcdc_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_LCDC,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void camera_power(int val)</div><div class='hunk'>@@ -424,9 +421,6 @@ static struct platform_device ceu_device = {</div><div class='ctx'> 	.dev		= {</div><div class='ctx'> 		.platform_data	= &amp;sh_mobile_ceu_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_CEU,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource sdhi0_cn3_resources[] = {</div><div class='hunk'>@@ -454,9 +448,6 @@ static struct platform_device sdhi0_cn3_device = {</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.platform_data = &amp;sdhi0_cn3_data,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_SDHI0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource sdhi1_cn7_resources[] = {</div><div class='hunk'>@@ -484,9 +475,6 @@ static struct platform_device sdhi1_cn7_device = {</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.platform_data = &amp;sdhi1_cn7_data,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_SDHI1,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {</div><div class='head'>diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c<br/>index 92ddce4b3456..033ef2ba621f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-ecovec24/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/boards/mach-ecovec24/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-ecovec24/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/boards/mach-ecovec24/setup.c</a></div><div class='hunk'>@@ -156,9 +156,6 @@ static struct platform_device sh_eth_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.num_resources = ARRAY_SIZE(sh_eth_resources),</div><div class='ctx'> 	.resource = sh_eth_resources,</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_ETHER,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* USB0 host */</div><div class='hunk'>@@ -278,9 +275,6 @@ static struct platform_device usbhs_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(usbhs_resources),</div><div class='ctx'> 	.resource	= usbhs_resources,</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_USB1,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* LCDC */</div><div class='hunk'>@@ -330,7 +324,7 @@ static struct sh_mobile_lcdc_info lcdc_info = {</div><div class='ctx'> 	.ch[0] = {</div><div class='ctx'> 		.interface_type = RGB18,</div><div class='ctx'> 		.chan = LCDC_CHAN_MAINLCD,</div><div class='del'>-		.bpp = 16,</div><div class='add'>+		.fourcc = V4L2_PIX_FMT_RGB565,</div><div class='ctx'> 		.lcd_size_cfg = { /* 7.0 inch */</div><div class='ctx'> 			.width = 152,</div><div class='ctx'> 			.height = 91,</div><div class='hunk'>@@ -366,9 +360,6 @@ static struct platform_device lcdc_device = {</div><div class='ctx'> 	.dev		= {</div><div class='ctx'> 		.platform_data	= &amp;lcdc_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_LCDC,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* CEU0 */</div><div class='hunk'>@@ -400,9 +391,6 @@ static struct platform_device ceu0_device = {</div><div class='ctx'> 	.dev	= {</div><div class='ctx'> 		.platform_data	= &amp;sh_mobile_ceu0_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_CEU0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* CEU1 */</div><div class='hunk'>@@ -434,9 +422,6 @@ static struct platform_device ceu1_device = {</div><div class='ctx'> 	.dev	= {</div><div class='ctx'> 		.platform_data	= &amp;sh_mobile_ceu1_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_CEU1,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* I2C device */</div><div class='hunk'>@@ -491,9 +476,6 @@ static struct platform_device keysc_device = {</div><div class='ctx'> 	.dev	= {</div><div class='ctx'> 		.platform_data	= &amp;keysc_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_KEYSC,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* TouchScreen */</div><div class='hunk'>@@ -568,9 +550,6 @@ static struct platform_device sdhi0_device = {</div><div class='ctx'> 	.dev	= {</div><div class='ctx'> 		.platform_data	= &amp;sdhi0_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_SDHI0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if !defined(CONFIG_MMC_SH_MMCIF) &amp;&amp; !defined(CONFIG_MMC_SH_MMCIF_MODULE)</div><div class='hunk'>@@ -608,9 +587,6 @@ static struct platform_device sdhi1_device = {</div><div class='ctx'> 	.dev	= {</div><div class='ctx'> 		.platform_data	= &amp;sdhi1_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_SDHI1,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_MMC_SH_MMCIF */</div><div class='ctx'> </div><div class='hunk'>@@ -676,9 +652,6 @@ static struct platform_device msiof0_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(msiof0_resources),</div><div class='ctx'> 	.resource	= msiof0_resources,</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_MSIOF0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='hunk'>@@ -818,9 +791,6 @@ static struct platform_device fsi_device = {</div><div class='ctx'> 	.dev	= {</div><div class='ctx'> 		.platform_data	= &amp;fsi_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_SPU, /* FSI needs SPU hwblk */</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* IrDA */</div><div class='hunk'>@@ -882,9 +852,6 @@ static struct platform_device vou_device = {</div><div class='ctx'> 	.dev		= {</div><div class='ctx'> 		.platform_data	= &amp;sh_vou_pdata,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata	= {</div><div class='del'>-		.hwblk_id	= HWBLK_VOU,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MMC_SH_MMCIF) || defined(CONFIG_MMC_SH_MMCIF_MODULE)</div><div class='hunk'>@@ -936,9 +903,6 @@ static struct platform_device sh_mmcif_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(sh_mmcif_resources),</div><div class='ctx'> 	.resource	= sh_mmcif_resources,</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_MMC,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c<br/>index f65271a8d075..2a18b06abdaf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-kfr2r09/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/boards/mach-kfr2r09/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-kfr2r09/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/boards/mach-kfr2r09/setup.c</a></div><div class='hunk'>@@ -122,9 +122,6 @@ static struct platform_device kfr2r09_sh_keysc_device = {</div><div class='ctx'> 	.dev	= {</div><div class='ctx'> 		.platform_data	= &amp;kfr2r09_sh_keysc_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_KEYSC,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct fb_videomode kfr2r09_lcdc_modes[] = {</div><div class='hunk'>@@ -146,7 +143,7 @@ static struct sh_mobile_lcdc_info kfr2r09_sh_lcdc_info = {</div><div class='ctx'> 	.clock_source = LCDC_CLK_BUS,</div><div class='ctx'> 	.ch[0] = {</div><div class='ctx'> 		.chan = LCDC_CHAN_MAINLCD,</div><div class='del'>-		.bpp = 16,</div><div class='add'>+		.fourcc = V4L2_PIX_FMT_RGB565,</div><div class='ctx'> 		.interface_type = SYS18,</div><div class='ctx'> 		.clock_divider = 6,</div><div class='ctx'> 		.flags = LCDC_FLAGS_DWPOL,</div><div class='hunk'>@@ -191,9 +188,6 @@ static struct platform_device kfr2r09_sh_lcdc_device = {</div><div class='ctx'> 	.dev	= {</div><div class='ctx'> 		.platform_data	= &amp;kfr2r09_sh_lcdc_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_LCDC,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct r8a66597_platdata kfr2r09_usb0_gadget_data = {</div><div class='hunk'>@@ -254,9 +248,6 @@ static struct platform_device kfr2r09_ceu_device = {</div><div class='ctx'> 	.dev	= {</div><div class='ctx'> 		.platform_data	= &amp;sh_mobile_ceu_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_CEU0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct i2c_board_info kfr2r09_i2c_camera = {</div><div class='hunk'>@@ -377,9 +368,6 @@ static struct platform_device kfr2r09_sh_sdhi0_device = {</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.platform_data	= &amp;sh7724_sdhi0_data,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_SDHI0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *kfr2r09_devices[] __initdata = {</div><div class='head'>diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c<br/>index e4c81195929c..68c3d6f42896 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-migor/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/boards/mach-migor/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-migor/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/boards/mach-migor/setup.c</a></div><div class='hunk'>@@ -99,9 +99,6 @@ static struct platform_device sh_keysc_device = {</div><div class='ctx'> 	.dev	= {</div><div class='ctx'> 		.platform_data	= &amp;sh_keysc_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_KEYSC,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mtd_partition migor_nor_flash_partitions[] =</div><div class='hunk'>@@ -244,7 +241,7 @@ static struct sh_mobile_lcdc_info sh_mobile_lcdc_info = {</div><div class='ctx'> 	.clock_source = LCDC_CLK_BUS,</div><div class='ctx'> 	.ch[0] = {</div><div class='ctx'> 		.chan = LCDC_CHAN_MAINLCD,</div><div class='del'>-		.bpp = 16,</div><div class='add'>+		.fourcc = V4L2_PIX_FMT_RGB565,</div><div class='ctx'> 		.interface_type = RGB16,</div><div class='ctx'> 		.clock_divider = 2,</div><div class='ctx'> 		.lcd_cfg = migor_lcd_modes,</div><div class='hunk'>@@ -258,7 +255,7 @@ static struct sh_mobile_lcdc_info sh_mobile_lcdc_info = {</div><div class='ctx'> 	.clock_source = LCDC_CLK_PERIPHERAL,</div><div class='ctx'> 	.ch[0] = {</div><div class='ctx'> 		.chan = LCDC_CHAN_MAINLCD,</div><div class='del'>-		.bpp = 16,</div><div class='add'>+		.fourcc = V4L2_PIX_FMT_RGB565,</div><div class='ctx'> 		.interface_type = SYS16A,</div><div class='ctx'> 		.clock_divider = 10,</div><div class='ctx'> 		.lcd_cfg = migor_lcd_modes,</div><div class='hunk'>@@ -300,9 +297,6 @@ static struct platform_device migor_lcdc_device = {</div><div class='ctx'> 	.dev	= {</div><div class='ctx'> 		.platform_data	= &amp;sh_mobile_lcdc_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_LCDC,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk *camera_clk;</div><div class='hunk'>@@ -390,9 +384,6 @@ static struct platform_device migor_ceu_device = {</div><div class='ctx'> 	.dev	= {</div><div class='ctx'> 		.platform_data	= &amp;sh_mobile_ceu_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_CEU,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource sdhi_cn9_resources[] = {</div><div class='hunk'>@@ -421,9 +412,6 @@ static struct platform_device sdhi_cn9_device = {</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.platform_data	= &amp;sh7724_sdhi_data,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_SDHI,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct i2c_board_info migor_i2c_devices[] = {</div><div class='head'>diff --git a/arch/sh/boards/mach-rsk/setup.c b/arch/sh/boards/mach-rsk/setup.c<br/>index a5c0df785bfe..895f030070d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-rsk/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/boards/mach-rsk/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-rsk/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/boards/mach-rsk/setup.c</a></div><div class='hunk'>@@ -15,12 +15,12 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='del'>-#ifdef CONFIG_MTD</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='add'>+static const char *part_probes[] = { "cmdlinepart", NULL };</div><div class='add'>+</div><div class='ctx'> static struct mtd_partition rsk_partitions[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name		= "Bootloader",</div><div class='hunk'>@@ -39,9 +39,10 @@ static struct mtd_partition rsk_partitions[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct physmap_flash_data flash_data = {</div><div class='del'>-	.parts		= rsk_partitions,</div><div class='del'>-	.nr_parts	= ARRAY_SIZE(rsk_partitions),</div><div class='del'>-	.width		= 2,</div><div class='add'>+	.parts			= rsk_partitions,</div><div class='add'>+	.nr_parts		= ARRAY_SIZE(rsk_partitions),</div><div class='add'>+	.width			= 2,</div><div class='add'>+	.part_probe_types	= part_probes,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource flash_resource = {</div><div class='hunk'>@@ -60,44 +61,12 @@ static struct platform_device flash_device = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MTD</div><div class='del'>-static const char *probes[] = { "cmdlinepart", NULL };</div><div class='del'>-</div><div class='del'>-static struct map_info rsk_flash_map = {</div><div class='del'>-	.name		= "RSK+ Flash",</div><div class='del'>-	.size		= 0x400000,</div><div class='del'>-	.bankwidth	= 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct mtd_info *flash_mtd;</div><div class='del'>-</div><div class='del'>-static struct mtd_partition *parsed_partitions;</div><div class='del'>-</div><div class='del'>-static void __init set_mtd_partitions(void)</div><div class='del'>-{</div><div class='del'>-	int nr_parts = 0;</div><div class='del'>-</div><div class='del'>-	simple_map_init(&amp;rsk_flash_map);</div><div class='del'>-	flash_mtd = do_map_probe("cfi_probe", &amp;rsk_flash_map);</div><div class='del'>-	nr_parts = parse_mtd_partitions(flash_mtd, probes,</div><div class='del'>-					&amp;parsed_partitions, 0);</div><div class='del'>-	/* If there is no partition table, used the hard coded table */</div><div class='del'>-	if (nr_parts &gt; 0) {</div><div class='del'>-		flash_data.nr_parts = nr_parts;</div><div class='del'>-		flash_data.parts = parsed_partitions;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void set_mtd_partitions(void) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static struct platform_device *rsk_devices[] __initdata = {</div><div class='ctx'> 	&amp;flash_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init rsk_devices_setup(void)</div><div class='ctx'> {</div><div class='del'>-	set_mtd_partitions();</div><div class='ctx'> 	return platform_add_devices(rsk_devices,</div><div class='ctx'> 				    ARRAY_SIZE(rsk_devices));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/boards/mach-se/7722/setup.c b/arch/sh/boards/mach-se/7722/setup.c<br/>index 80a4e571b310..e1963fecd761 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7722/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/boards/mach-se/7722/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7722/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/boards/mach-se/7722/setup.c</a></div><div class='hunk'>@@ -127,9 +127,6 @@ static struct platform_device sh_keysc_device = {</div><div class='ctx'> 	.dev	= {</div><div class='ctx'> 		.platform_data	= &amp;sh_keysc_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_KEYSC,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *se7722_devices[] __initdata = {</div><div class='head'>diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c<br/>index b747c0ab9264..036fe1adaef1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7724/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/boards/mach-se/7724/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mach-se/7724/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/boards/mach-se/7724/setup.c</a></div><div class='hunk'>@@ -179,7 +179,7 @@ static struct sh_mobile_lcdc_info lcdc_info = {</div><div class='ctx'> 	.clock_source = LCDC_CLK_EXTERNAL,</div><div class='ctx'> 	.ch[0] = {</div><div class='ctx'> 		.chan = LCDC_CHAN_MAINLCD,</div><div class='del'>-		.bpp = 16,</div><div class='add'>+		.fourcc = V4L2_PIX_FMT_RGB565,</div><div class='ctx'> 		.clock_divider = 1,</div><div class='ctx'> 		.lcd_size_cfg = { /* 7.0 inch */</div><div class='ctx'> 			.width = 152,</div><div class='hunk'>@@ -210,9 +210,6 @@ static struct platform_device lcdc_device = {</div><div class='ctx'> 	.dev		= {</div><div class='ctx'> 		.platform_data	= &amp;lcdc_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_LCDC,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* CEU0 */</div><div class='hunk'>@@ -244,9 +241,6 @@ static struct platform_device ceu0_device = {</div><div class='ctx'> 	.dev	= {</div><div class='ctx'> 		.platform_data	= &amp;sh_mobile_ceu0_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_CEU0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* CEU1 */</div><div class='hunk'>@@ -278,9 +272,6 @@ static struct platform_device ceu1_device = {</div><div class='ctx'> 	.dev	= {</div><div class='ctx'> 		.platform_data	= &amp;sh_mobile_ceu1_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_CEU1,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* FSI */</div><div class='hunk'>@@ -310,13 +301,22 @@ static struct platform_device fsi_device = {</div><div class='ctx'> 	.dev	= {</div><div class='ctx'> 		.platform_data	= &amp;fsi_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_SPU, /* FSI needs SPU hwblk */</div><div class='del'>-	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct fsi_ak4642_info fsi_ak4642_info = {</div><div class='add'>+	.name		= "AK4642",</div><div class='add'>+	.card		= "FSIA-AK4642",</div><div class='add'>+	.cpu_dai	= "fsia-dai",</div><div class='add'>+	.codec		= "ak4642-codec.0-0012",</div><div class='add'>+	.platform	= "sh_fsi.0",</div><div class='add'>+	.id		= FSI_PORT_A,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device fsi_ak4642_device = {</div><div class='del'>-	.name		= "sh_fsi_a_ak4642",</div><div class='add'>+	.name	= "fsi-ak4642-audio",</div><div class='add'>+	.dev	= {</div><div class='add'>+		.platform_data	= &amp;fsi_ak4642_info,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* KEYSC in SoC (Needs SW33-2 set to ON) */</div><div class='hunk'>@@ -355,9 +355,6 @@ static struct platform_device keysc_device = {</div><div class='ctx'> 	.dev	= {</div><div class='ctx'> 		.platform_data	= &amp;keysc_info,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_KEYSC,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* SH Eth */</div><div class='hunk'>@@ -386,9 +383,6 @@ static struct platform_device sh_eth_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.num_resources = ARRAY_SIZE(sh_eth_resources),</div><div class='ctx'> 	.resource = sh_eth_resources,</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_ETHER,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct r8a66597_platdata sh7724_usb0_host_data = {</div><div class='hunk'>@@ -418,9 +412,6 @@ static struct platform_device sh7724_usb0_host_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(sh7724_usb0_host_resources),</div><div class='ctx'> 	.resource	= sh7724_usb0_host_resources,</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_USB0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct r8a66597_platdata sh7724_usb1_gadget_data = {</div><div class='hunk'>@@ -479,9 +470,6 @@ static struct platform_device sdhi0_cn7_device = {</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.platform_data	= &amp;sh7724_sdhi0_data,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_SDHI0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource sdhi1_cn8_resources[] = {</div><div class='hunk'>@@ -511,9 +499,6 @@ static struct platform_device sdhi1_cn8_device = {</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.platform_data	= &amp;sh7724_sdhi1_data,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_SDHI1,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* IrDA */</div><div class='hunk'>@@ -576,9 +561,6 @@ static struct platform_device vou_device = {</div><div class='ctx'> 	.dev		= {</div><div class='ctx'> 		.platform_data	= &amp;sh_vou_pdata,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata	= {</div><div class='del'>-		.hwblk_id	= HWBLK_VOU,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *ms7724se_devices[] __initdata = {</div><div class='head'>diff --git a/arch/sh/drivers/dma/dma-sysfs.c b/arch/sh/drivers/dma/dma-sysfs.c<br/>index 83cc704770d7..b1cb2715ad6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/dma/dma-sysfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/drivers/dma/dma-sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/dma/dma-sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/drivers/dma/dma-sysfs.c</a></div><div class='hunk'>@@ -12,18 +12,19 @@</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/stat.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class dma_sysclass = {</div><div class='add'>+static struct bus_type dma_subsys = {</div><div class='ctx'> 	.name = "dma",</div><div class='add'>+	.dev_name = "dma",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static ssize_t dma_show_devices(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t dma_show_devices(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t len = 0;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -43,29 +44,29 @@ static ssize_t dma_show_devices(struct sys_device *dev,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(devices, S_IRUGO, dma_show_devices, NULL);</div><div class='add'>+static DEVICE_ATTR(devices, S_IRUGO, dma_show_devices, NULL);</div><div class='ctx'> </div><div class='del'>-static int __init dma_sysclass_init(void)</div><div class='add'>+static int __init dma_subsys_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = sysdev_class_register(&amp;dma_sysclass);</div><div class='add'>+	ret = subsys_system_register(&amp;dma_subsys, NULL);</div><div class='ctx'> 	if (unlikely(ret))</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return sysfs_create_file(&amp;dma_sysclass.kset.kobj, &amp;attr_devices.attr);</div><div class='add'>+	return device_create_file(dma_subsys.dev_root, &amp;dev_attr_devices.attr);</div><div class='ctx'> }</div><div class='del'>-postcore_initcall(dma_sysclass_init);</div><div class='add'>+postcore_initcall(dma_subsys_init);</div><div class='ctx'> </div><div class='del'>-static ssize_t dma_show_dev_id(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t dma_show_dev_id(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_channel *channel = to_dma_channel(dev);</div><div class='ctx'> 	return sprintf(buf, "%s\n", channel-&gt;dev_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t dma_store_dev_id(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t dma_store_dev_id(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='ctx'> 				const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_channel *channel = to_dma_channel(dev);</div><div class='hunk'>@@ -73,10 +74,10 @@ static ssize_t dma_store_dev_id(struct sys_device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(dev_id, S_IRUGO | S_IWUSR, dma_show_dev_id, dma_store_dev_id);</div><div class='add'>+static DEVICE_ATTR(dev_id, S_IRUGO | S_IWUSR, dma_show_dev_id, dma_store_dev_id);</div><div class='ctx'> </div><div class='del'>-static ssize_t dma_store_config(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t dma_store_config(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='ctx'> 				const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_channel *channel = to_dma_channel(dev);</div><div class='hunk'>@@ -88,17 +89,17 @@ static ssize_t dma_store_config(struct sys_device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(config, S_IWUSR, NULL, dma_store_config);</div><div class='add'>+static DEVICE_ATTR(config, S_IWUSR, NULL, dma_store_config);</div><div class='ctx'> </div><div class='del'>-static ssize_t dma_show_mode(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t dma_show_mode(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_channel *channel = to_dma_channel(dev);</div><div class='ctx'> 	return sprintf(buf, "0x%08x\n", channel-&gt;mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t dma_store_mode(struct sys_device *dev,</div><div class='del'>-			      struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t dma_store_mode(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr,</div><div class='ctx'> 			      const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_channel *channel = to_dma_channel(dev);</div><div class='hunk'>@@ -106,38 +107,38 @@ static ssize_t dma_store_mode(struct sys_device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(mode, S_IRUGO | S_IWUSR, dma_show_mode, dma_store_mode);</div><div class='add'>+static DEVICE_ATTR(mode, S_IRUGO | S_IWUSR, dma_show_mode, dma_store_mode);</div><div class='ctx'> </div><div class='ctx'> #define dma_ro_attr(field, fmt)						\</div><div class='del'>-static ssize_t dma_show_##field(struct sys_device *dev, 		\</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)\</div><div class='add'>+static ssize_t dma_show_##field(struct device *dev,		\</div><div class='add'>+				struct device_attribute *attr, char *buf)\</div><div class='ctx'> {									\</div><div class='ctx'> 	struct dma_channel *channel = to_dma_channel(dev);		\</div><div class='ctx'> 	return sprintf(buf, fmt, channel-&gt;field);			\</div><div class='ctx'> }									\</div><div class='del'>-static SYSDEV_ATTR(field, S_IRUGO, dma_show_##field, NULL);</div><div class='add'>+static DEVICE_ATTR(field, S_IRUGO, dma_show_##field, NULL);</div><div class='ctx'> </div><div class='ctx'> dma_ro_attr(count, "0x%08x\n");</div><div class='ctx'> dma_ro_attr(flags, "0x%08lx\n");</div><div class='ctx'> </div><div class='ctx'> int dma_create_sysfs_files(struct dma_channel *chan, struct dma_info *info)</div><div class='ctx'> {</div><div class='del'>-	struct sys_device *dev = &amp;chan-&gt;dev;</div><div class='add'>+	struct device *dev = &amp;chan-&gt;dev;</div><div class='ctx'> 	char name[16];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;id  = chan-&gt;vchan;</div><div class='del'>-	dev-&gt;cls = &amp;dma_sysclass;</div><div class='add'>+	dev-&gt;bus = &amp;dma_subsys;</div><div class='ctx'> </div><div class='del'>-	ret = sysdev_register(dev);</div><div class='add'>+	ret = device_register(dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret |= sysdev_create_file(dev, &amp;attr_dev_id);</div><div class='del'>-	ret |= sysdev_create_file(dev, &amp;attr_count);</div><div class='del'>-	ret |= sysdev_create_file(dev, &amp;attr_mode);</div><div class='del'>-	ret |= sysdev_create_file(dev, &amp;attr_flags);</div><div class='del'>-	ret |= sysdev_create_file(dev, &amp;attr_config);</div><div class='add'>+	ret |= device_create_file(dev, &amp;dev_attr_dev_id);</div><div class='add'>+	ret |= device_create_file(dev, &amp;dev_attr_count);</div><div class='add'>+	ret |= device_create_file(dev, &amp;dev_attr_mode);</div><div class='add'>+	ret |= device_create_file(dev, &amp;dev_attr_flags);</div><div class='add'>+	ret |= device_create_file(dev, &amp;dev_attr_config);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(ret)) {</div><div class='ctx'> 		dev_err(&amp;info-&gt;pdev-&gt;dev, "Failed creating attrs\n");</div><div class='hunk'>@@ -150,17 +151,17 @@ int dma_create_sysfs_files(struct dma_channel *chan, struct dma_info *info)</div><div class='ctx'> </div><div class='ctx'> void dma_remove_sysfs_files(struct dma_channel *chan, struct dma_info *info)</div><div class='ctx'> {</div><div class='del'>-	struct sys_device *dev = &amp;chan-&gt;dev;</div><div class='add'>+	struct device *dev = &amp;chan-&gt;dev;</div><div class='ctx'> 	char name[16];</div><div class='ctx'> </div><div class='del'>-	sysdev_remove_file(dev, &amp;attr_dev_id);</div><div class='del'>-	sysdev_remove_file(dev, &amp;attr_count);</div><div class='del'>-	sysdev_remove_file(dev, &amp;attr_mode);</div><div class='del'>-	sysdev_remove_file(dev, &amp;attr_flags);</div><div class='del'>-	sysdev_remove_file(dev, &amp;attr_config);</div><div class='add'>+	device_remove_file(dev, &amp;dev_attr_dev_id);</div><div class='add'>+	device_remove_file(dev, &amp;dev_attr_count);</div><div class='add'>+	device_remove_file(dev, &amp;dev_attr_mode);</div><div class='add'>+	device_remove_file(dev, &amp;dev_attr_flags);</div><div class='add'>+	device_remove_file(dev, &amp;dev_attr_config);</div><div class='ctx'> </div><div class='ctx'> 	snprintf(name, sizeof(name), "dma%d", chan-&gt;chan);</div><div class='ctx'> 	sysfs_remove_link(&amp;info-&gt;pdev-&gt;dev.kobj, name);</div><div class='ctx'> </div><div class='del'>-	sysdev_unregister(dev);</div><div class='add'>+	device_unregister(dev);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c<br/>index c2691afe8f79..8f18dd090a66 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/drivers/pci/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/drivers/pci/pci.c</a></div><div class='hunk'>@@ -36,9 +36,15 @@ static void __devinit pcibios_scanbus(struct pci_channel *hose)</div><div class='ctx'> {</div><div class='ctx'> 	static int next_busno;</div><div class='ctx'> 	static int need_domain_info;</div><div class='add'>+	LIST_HEAD(resources);</div><div class='add'>+	int i;</div><div class='ctx'> 	struct pci_bus *bus;</div><div class='ctx'> </div><div class='del'>-	bus = pci_scan_bus(next_busno, hose-&gt;pci_ops, hose);</div><div class='add'>+	for (i = 0; i &lt; hose-&gt;nr_resources; i++)</div><div class='add'>+		pci_add_resource(&amp;resources, hose-&gt;resources + i);</div><div class='add'>+</div><div class='add'>+	bus = pci_scan_root_bus(NULL, next_busno, hose-&gt;pci_ops, hose,</div><div class='add'>+				&amp;resources);</div><div class='ctx'> 	hose-&gt;bus = bus;</div><div class='ctx'> </div><div class='ctx'> 	need_domain_info = need_domain_info || hose-&gt;index;</div><div class='hunk'>@@ -55,6 +61,8 @@ static void __devinit pcibios_scanbus(struct pci_channel *hose)</div><div class='ctx'> 		pci_bus_size_bridges(bus);</div><div class='ctx'> 		pci_bus_assign_resources(bus);</div><div class='ctx'> 		pci_enable_bridges(bus);</div><div class='add'>+	} else {</div><div class='add'>+		pci_free_resource_list(&amp;resources);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -162,16 +170,8 @@ static void pcibios_fixup_device_resources(struct pci_dev *dev,</div><div class='ctx'>  */</div><div class='ctx'> void __devinit pcibios_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *dev = bus-&gt;self;</div><div class='add'>+	struct pci_dev *dev;</div><div class='ctx'> 	struct list_head *ln;</div><div class='del'>-	struct pci_channel *hose = bus-&gt;sysdata;</div><div class='del'>-</div><div class='del'>-	if (!dev) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; hose-&gt;nr_resources; i++)</div><div class='del'>-			bus-&gt;resource[i] = hose-&gt;resources + i;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	for (ln = bus-&gt;devices.next; ln != &amp;bus-&gt;devices; ln = ln-&gt;next) {</div><div class='ctx'> 		dev = pci_dev_b(ln);</div><div class='hunk'>@@ -243,27 +243,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)</div><div class='ctx'> 	return pci_enable_resources(dev, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *  If we set up a device for bus mastering, we need to check and set</div><div class='del'>- *  the latency timer as it may not be properly set.</div><div class='del'>- */</div><div class='del'>-static unsigned int pcibios_max_latency = 255;</div><div class='del'>-</div><div class='del'>-void pcibios_set_master(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	u8 lat;</div><div class='del'>-	pci_read_config_byte(dev, PCI_LATENCY_TIMER, &amp;lat);</div><div class='del'>-	if (lat &lt; 16)</div><div class='del'>-		lat = (64 &lt;= pcibios_max_latency) ? 64 : pcibios_max_latency;</div><div class='del'>-	else if (lat &gt; pcibios_max_latency)</div><div class='del'>-		lat = pcibios_max_latency;</div><div class='del'>-	else</div><div class='del'>-		return;</div><div class='del'>-	printk(KERN_INFO "PCI: Setting latency timer of device %s to %d\n",</div><div class='del'>-	       pci_name(dev), lat);</div><div class='del'>-	pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __init pcibios_update_irq(struct pci_dev *dev, int irq)</div><div class='ctx'> {</div><div class='ctx'> 	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);</div><div class='hunk'>@@ -393,29 +372,6 @@ static void __iomem *ioport_map_pci(struct pci_dev *dev,</div><div class='ctx'> 	return (void __iomem *)(chan-&gt;io_map_base + port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)</div><div class='del'>-{</div><div class='del'>-	resource_size_t start = pci_resource_start(dev, bar);</div><div class='del'>-	resource_size_t len = pci_resource_len(dev, bar);</div><div class='del'>-	unsigned long flags = pci_resource_flags(dev, bar);</div><div class='del'>-</div><div class='del'>-	if (unlikely(!len || !start))</div><div class='del'>-		return NULL;</div><div class='del'>-	if (maxlen &amp;&amp; len &gt; maxlen)</div><div class='del'>-		len = maxlen;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; IORESOURCE_IO)</div><div class='del'>-		return ioport_map_pci(dev, start, len);</div><div class='del'>-	if (flags &amp; IORESOURCE_MEM) {</div><div class='del'>-		if (flags &amp; IORESOURCE_CACHEABLE)</div><div class='del'>-			return ioremap(start, len);</div><div class='del'>-		return ioremap_nocache(start, len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(pci_iomap);</div><div class='del'>-</div><div class='ctx'> void pci_iounmap(struct pci_dev *dev, void __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'> 	iounmap(addr);</div><div class='head'>diff --git a/arch/sh/include/asm/device.h b/arch/sh/include/asm/device.h<br/>index b16debfe8c1e..a1c9c0daec10 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/include/asm/device.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/include/asm/device.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/device.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/include/asm/device.h</a></div><div class='hunk'>@@ -14,15 +14,5 @@ int platform_resource_setup_memory(struct platform_device *pdev,</div><div class='ctx'> </div><div class='ctx'> void plat_early_device_setup(void);</div><div class='ctx'> </div><div class='del'>-#define PDEV_ARCHDATA_FLAG_INIT 0</div><div class='del'>-#define PDEV_ARCHDATA_FLAG_IDLE 1</div><div class='del'>-#define PDEV_ARCHDATA_FLAG_SUSP 2</div><div class='del'>-</div><div class='ctx'> struct pdev_archdata {</div><div class='del'>-	int hwblk_id;</div><div class='del'>-#ifdef CONFIG_PM_RUNTIME</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct list_head entry;</div><div class='del'>-	struct mutex mutex;</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/sh/include/asm/dma.h b/arch/sh/include/asm/dma.h<br/>index 07373a074090..6aa2080c0065 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/include/asm/dma.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/include/asm/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/dma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/include/asm/dma.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@</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/sched.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;cpu/dma.h&gt;</div><div class='ctx'> #include &lt;asm-generic/dma.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -91,7 +91,7 @@ struct dma_channel {</div><div class='ctx'> </div><div class='ctx'> 	wait_queue_head_t wait_queue;</div><div class='ctx'> </div><div class='del'>-	struct sys_device dev;</div><div class='add'>+	struct device dev;</div><div class='ctx'> 	void *priv_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/include/asm/hwblk.h b/arch/sh/include/asm/hwblk.h<br/>deleted file mode 100644<br/>index 855e945c6199..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/include/asm/hwblk.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/include/asm/hwblk.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,70 +0,0 @@</div><div class='del'>-#ifndef __ASM_SH_HWBLK_H</div><div class='del'>-#define __ASM_SH_HWBLK_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm/clock.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-#define HWBLK_CNT_USAGE 0</div><div class='del'>-#define HWBLK_CNT_IDLE 1</div><div class='del'>-#define HWBLK_CNT_DEVICES 2</div><div class='del'>-#define HWBLK_CNT_NR 3</div><div class='del'>-</div><div class='del'>-#define HWBLK_AREA_FLAG_PARENT (1 &lt;&lt; 0) /* valid parent */</div><div class='del'>-</div><div class='del'>-#define HWBLK_AREA(_flags, _parent)		\</div><div class='del'>-{						\</div><div class='del'>-	.flags = _flags,			\</div><div class='del'>-	.parent = _parent,			\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct hwblk_area {</div><div class='del'>-	int cnt[HWBLK_CNT_NR];</div><div class='del'>-	unsigned char parent;</div><div class='del'>-	unsigned char flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define HWBLK(_mstp, _bit, _area)		\</div><div class='del'>-{						\</div><div class='del'>-	.mstp = (void __iomem *)_mstp,		\</div><div class='del'>-	.bit = _bit,				\</div><div class='del'>-	.area = _area,				\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct hwblk {</div><div class='del'>-	void __iomem *mstp;</div><div class='del'>-	unsigned char bit;</div><div class='del'>-	unsigned char area;</div><div class='del'>-	int cnt[HWBLK_CNT_NR];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct hwblk_info {</div><div class='del'>-	struct hwblk_area *areas;</div><div class='del'>-	int nr_areas;</div><div class='del'>-	struct hwblk *hwblks;</div><div class='del'>-	int nr_hwblks;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Should be defined by processor-specific code */</div><div class='del'>-int arch_hwblk_init(void);</div><div class='del'>-int arch_hwblk_sleep_mode(void);</div><div class='del'>-</div><div class='del'>-int hwblk_register(struct hwblk_info *info);</div><div class='del'>-int hwblk_init(void);</div><div class='del'>-</div><div class='del'>-void hwblk_enable(struct hwblk_info *info, int hwblk);</div><div class='del'>-void hwblk_disable(struct hwblk_info *info, int hwblk);</div><div class='del'>-</div><div class='del'>-void hwblk_cnt_inc(struct hwblk_info *info, int hwblk, int cnt);</div><div class='del'>-void hwblk_cnt_dec(struct hwblk_info *info, int hwblk, int cnt);</div><div class='del'>-</div><div class='del'>-/* allow clocks to enable and disable hardware blocks */</div><div class='del'>-#define SH_HWBLK_CLK(_hwblk, _parent, _flags)	\</div><div class='del'>-[_hwblk] = {					\</div><div class='del'>-	.parent		= _parent,		\</div><div class='del'>-	.arch_flags	= _hwblk,		\</div><div class='del'>-	.flags		= _flags,		\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int sh_hwblk_clk_register(struct clk *clks, int nr);</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_SH_HWBLK_H */</div><div class='head'>diff --git a/arch/sh/include/asm/ptrace_32.h b/arch/sh/include/asm/ptrace_32.h<br/>index 6c2239cca1a2..2d3e906aa722 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/include/asm/ptrace_32.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/include/asm/ptrace_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/ptrace_32.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/include/asm/ptrace_32.h</a></div><div class='hunk'>@@ -76,7 +76,10 @@ struct pt_dspregs {</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> #define MAX_REG_OFFSET		offsetof(struct pt_regs, tra)</div><div class='del'>-#define regs_return_value(_regs)	((_regs)-&gt;regs[0])</div><div class='add'>+static inline long regs_return_value(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return regs-&gt;regs[0];</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/include/asm/ptrace_64.h b/arch/sh/include/asm/ptrace_64.h<br/>index bf9be7764d69..eb3fcceaf64b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/include/asm/ptrace_64.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/include/asm/ptrace_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/ptrace_64.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/include/asm/ptrace_64.h</a></div><div class='hunk'>@@ -13,7 +13,10 @@ struct pt_regs {</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> #define MAX_REG_OFFSET		offsetof(struct pt_regs, tregs[7])</div><div class='del'>-#define regs_return_value(_regs)	((_regs)-&gt;regs[3])</div><div class='add'>+static inline long regs_return_value(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return regs-&gt;regs[3];</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/include/asm/thread_info.h b/arch/sh/include/asm/thread_info.h<br/>index ea2d5089de1e..20ee40af16e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/include/asm/thread_info.h</a></div><div class='hunk'>@@ -122,7 +122,6 @@ extern void init_thread_xstate(void);</div><div class='ctx'> #define TIF_SYSCALL_TRACEPOINT	8	/* for ftrace syscall instrumentation */</div><div class='ctx'> #define TIF_POLLING_NRFLAG	17	/* true if poll_idle() is polling 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	/* Freezing for suspend */</div><div class='ctx'> </div><div class='ctx'> #define _TIF_SYSCALL_TRACE	(1 &lt;&lt; TIF_SYSCALL_TRACE)</div><div class='ctx'> #define _TIF_SIGPENDING		(1 &lt;&lt; TIF_SIGPENDING)</div><div class='hunk'>@@ -133,7 +132,6 @@ extern void init_thread_xstate(void);</div><div class='ctx'> #define _TIF_NOTIFY_RESUME	(1 &lt;&lt; TIF_NOTIFY_RESUME)</div><div class='ctx'> #define _TIF_SYSCALL_TRACEPOINT	(1 &lt;&lt; TIF_SYSCALL_TRACEPOINT)</div><div class='ctx'> #define _TIF_POLLING_NRFLAG	(1 &lt;&lt; TIF_POLLING_NRFLAG)</div><div class='del'>-#define _TIF_FREEZE		(1 &lt;&lt; TIF_FREEZE)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * _TIF_ALLWORK_MASK and _TIF_WORK_MASK need to fit within 2 bytes, or we</div><div class='head'>diff --git a/arch/sh/include/cpu-sh4/cpu/sh7722.h b/arch/sh/include/cpu-sh4/cpu/sh7722.h<br/>index bd0622788d64..3bb74e534d0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/sh7722.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/include/cpu-sh4/cpu/sh7722.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/sh7722.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/include/cpu-sh4/cpu/sh7722.h</a></div><div class='hunk'>@@ -222,14 +222,11 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	HWBLK_UNKNOWN = 0,</div><div class='del'>-	HWBLK_TLB, HWBLK_IC, HWBLK_OC, HWBLK_URAM, HWBLK_XYMEM,</div><div class='del'>-	HWBLK_INTC, HWBLK_DMAC, HWBLK_SHYWAY, HWBLK_HUDI,</div><div class='del'>-	HWBLK_UBC, HWBLK_TMU, HWBLK_CMT, HWBLK_RWDT, HWBLK_FLCTL,</div><div class='del'>-	HWBLK_SCIF0, HWBLK_SCIF1, HWBLK_SCIF2, HWBLK_SIO,</div><div class='del'>-	HWBLK_SIOF0, HWBLK_SIOF1, HWBLK_IIC, HWBLK_RTC,</div><div class='del'>-	HWBLK_TPU, HWBLK_IRDA, HWBLK_SDHI, HWBLK_SIM, HWBLK_KEYSC,</div><div class='del'>-	HWBLK_TSIF, HWBLK_USBF, HWBLK_2DG, HWBLK_SIU, HWBLK_VOU,</div><div class='add'>+	HWBLK_URAM, HWBLK_XYMEM,</div><div class='add'>+	HWBLK_TMU, HWBLK_CMT, HWBLK_RWDT, HWBLK_FLCTL,</div><div class='add'>+	HWBLK_SCIF0, HWBLK_SCIF1, HWBLK_SCIF2, HWBLK_IIC, HWBLK_RTC,</div><div class='add'>+	HWBLK_SDHI, HWBLK_KEYSC,</div><div class='add'>+	HWBLK_USBF, HWBLK_2DG, HWBLK_SIU, HWBLK_VOU,</div><div class='ctx'> 	HWBLK_JPU, HWBLK_BEU, HWBLK_CEU, HWBLK_VEU, HWBLK_VPU,</div><div class='ctx'> 	HWBLK_LCDC,</div><div class='ctx'> 	HWBLK_NR,</div><div class='head'>diff --git a/arch/sh/include/cpu-sh4/cpu/sh7723.h b/arch/sh/include/cpu-sh4/cpu/sh7723.h<br/>index 9b36fae72324..6fae50cb1e94 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/sh7723.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/include/cpu-sh4/cpu/sh7723.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/sh7723.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/include/cpu-sh4/cpu/sh7723.h</a></div><div class='hunk'>@@ -266,10 +266,9 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	HWBLK_UNKNOWN = 0,</div><div class='ctx'> 	HWBLK_TLB, HWBLK_IC, HWBLK_OC, HWBLK_L2C, HWBLK_ILMEM, HWBLK_FPU,</div><div class='ctx'> 	HWBLK_INTC, HWBLK_DMAC0, HWBLK_SHYWAY,</div><div class='del'>-	HWBLK_HUDI, HWBLK_DBG, HWBLK_UBC, HWBLK_SUBC,</div><div class='add'>+	HWBLK_HUDI, HWBLK_UBC,</div><div class='ctx'> 	HWBLK_TMU0, HWBLK_CMT, HWBLK_RWDT, HWBLK_DMAC1, HWBLK_TMU1,</div><div class='ctx'> 	HWBLK_FLCTL,</div><div class='ctx'> 	HWBLK_SCIF0, HWBLK_SCIF1, HWBLK_SCIF2,</div><div class='head'>diff --git a/arch/sh/include/cpu-sh4/cpu/sh7724.h b/arch/sh/include/cpu-sh4/cpu/sh7724.h<br/>index cbc47e6bcab5..38859f96d4e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/sh7724.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/include/cpu-sh4/cpu/sh7724.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/include/cpu-sh4/cpu/sh7724.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/include/cpu-sh4/cpu/sh7724.h</a></div><div class='hunk'>@@ -268,10 +268,9 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	HWBLK_UNKNOWN = 0,</div><div class='ctx'> 	HWBLK_TLB, HWBLK_IC, HWBLK_OC, HWBLK_RSMEM, HWBLK_ILMEM, HWBLK_L2C,</div><div class='ctx'> 	HWBLK_FPU, HWBLK_INTC, HWBLK_DMAC0, HWBLK_SHYWAY,</div><div class='del'>-	HWBLK_HUDI, HWBLK_DBG, HWBLK_UBC,</div><div class='add'>+	HWBLK_HUDI, HWBLK_UBC,</div><div class='ctx'> 	HWBLK_TMU0, HWBLK_CMT, HWBLK_RWDT, HWBLK_DMAC1, HWBLK_TMU1,</div><div class='ctx'> 	HWBLK_SCIF0, HWBLK_SCIF1, HWBLK_SCIF2, HWBLK_SCIF3,</div><div class='ctx'> 	HWBLK_SCIF4, HWBLK_SCIF5, HWBLK_MSIOF0, HWBLK_MSIOF1,</div><div class='hunk'>@@ -314,5 +313,6 @@ enum {</div><div class='ctx'> </div><div class='ctx'> extern struct clk sh7724_fsimcka_clk;</div><div class='ctx'> extern struct clk sh7724_fsimckb_clk;</div><div class='add'>+extern struct clk sh7724_dv_clki;</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_SH7724_H__ */</div><div class='head'>diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile<br/>index ae95935d93cd..fa58bfd30d82 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/cpu/Makefile</a></div><div class='hunk'>@@ -18,4 +18,4 @@ obj-$(CONFIG_ARCH_SHMOBILE)	+= shmobile/</div><div class='ctx'> obj-$(CONFIG_SH_ADC)		+= adc.o</div><div class='ctx'> obj-$(CONFIG_SH_CLK_CPG_LEGACY)	+= clock-cpg.o</div><div class='ctx'> </div><div class='del'>-obj-y	+= irq/ init.o clock.o fpu.o hwblk.o proc.o</div><div class='add'>+obj-y	+= irq/ init.o clock.o fpu.o proc.o</div><div class='head'>diff --git a/arch/sh/kernel/cpu/hwblk.c b/arch/sh/kernel/cpu/hwblk.c<br/>deleted file mode 100644<br/>index 3e985aae5d91..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/hwblk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/hwblk.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,159 +0,0 @@</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;asm/suspend.h&gt;</div><div class='del'>-#include &lt;asm/hwblk.h&gt;</div><div class='del'>-#include &lt;asm/clock.h&gt;</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(hwblk_lock);</div><div class='del'>-</div><div class='del'>-static void hwblk_area_mod_cnt(struct hwblk_info *info,</div><div class='del'>-			       int area, int counter, int value, int goal)</div><div class='del'>-{</div><div class='del'>-	struct hwblk_area *hap = info-&gt;areas + area;</div><div class='del'>-</div><div class='del'>-	hap-&gt;cnt[counter] += value;</div><div class='del'>-</div><div class='del'>-	if (hap-&gt;cnt[counter] != goal)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (hap-&gt;flags &amp; HWBLK_AREA_FLAG_PARENT)</div><div class='del'>-		hwblk_area_mod_cnt(info, hap-&gt;parent, counter, value, goal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int __hwblk_mod_cnt(struct hwblk_info *info, int hwblk,</div><div class='del'>-			  int counter, int value, int goal)</div><div class='del'>-{</div><div class='del'>-	struct hwblk *hp = info-&gt;hwblks + hwblk;</div><div class='del'>-</div><div class='del'>-	hp-&gt;cnt[counter] += value;</div><div class='del'>-	if (hp-&gt;cnt[counter] == goal)</div><div class='del'>-		hwblk_area_mod_cnt(info, hp-&gt;area, counter, value, goal);</div><div class='del'>-</div><div class='del'>-	return hp-&gt;cnt[counter];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hwblk_mod_cnt(struct hwblk_info *info, int hwblk,</div><div class='del'>-			  int counter, int value, int goal)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;hwblk_lock, flags);</div><div class='del'>-	__hwblk_mod_cnt(info, hwblk, counter, value, goal);</div><div class='del'>-	spin_unlock_irqrestore(&amp;hwblk_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void hwblk_cnt_inc(struct hwblk_info *info, int hwblk, int counter)</div><div class='del'>-{</div><div class='del'>-	hwblk_mod_cnt(info, hwblk, counter, 1, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void hwblk_cnt_dec(struct hwblk_info *info, int hwblk, int counter)</div><div class='del'>-{</div><div class='del'>-	hwblk_mod_cnt(info, hwblk, counter, -1, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void hwblk_enable(struct hwblk_info *info, int hwblk)</div><div class='del'>-{</div><div class='del'>-	struct hwblk *hp = info-&gt;hwblks + hwblk;</div><div class='del'>-	unsigned long tmp;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;hwblk_lock, flags);</div><div class='del'>-</div><div class='del'>-	ret = __hwblk_mod_cnt(info, hwblk, HWBLK_CNT_USAGE, 1, 1);</div><div class='del'>-	if (ret == 1) {</div><div class='del'>-		tmp = __raw_readl(hp-&gt;mstp);</div><div class='del'>-		tmp &amp;= ~(1 &lt;&lt; hp-&gt;bit);</div><div class='del'>-		__raw_writel(tmp, hp-&gt;mstp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;hwblk_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void hwblk_disable(struct hwblk_info *info, int hwblk)</div><div class='del'>-{</div><div class='del'>-	struct hwblk *hp = info-&gt;hwblks + hwblk;</div><div class='del'>-	unsigned long tmp;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;hwblk_lock, flags);</div><div class='del'>-</div><div class='del'>-	ret = __hwblk_mod_cnt(info, hwblk, HWBLK_CNT_USAGE, -1, 0);</div><div class='del'>-	if (ret == 0) {</div><div class='del'>-		tmp = __raw_readl(hp-&gt;mstp);</div><div class='del'>-		tmp |= 1 &lt;&lt; hp-&gt;bit;</div><div class='del'>-		__raw_writel(tmp, hp-&gt;mstp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;hwblk_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct hwblk_info *hwblk_info;</div><div class='del'>-</div><div class='del'>-int __init hwblk_register(struct hwblk_info *info)</div><div class='del'>-{</div><div class='del'>-	hwblk_info = info;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init __weak arch_hwblk_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __weak arch_hwblk_sleep_mode(void)</div><div class='del'>-{</div><div class='del'>-	return SUSP_SH_SLEEP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init hwblk_init(void)</div><div class='del'>-{</div><div class='del'>-	return arch_hwblk_init();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* allow clocks to enable and disable hardware blocks */</div><div class='del'>-static int sh_hwblk_clk_enable(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	if (!hwblk_info)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	hwblk_enable(hwblk_info, clk-&gt;arch_flags);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sh_hwblk_clk_disable(struct clk *clk)</div><div class='del'>-{</div><div class='del'>-	if (hwblk_info)</div><div class='del'>-		hwblk_disable(hwblk_info, clk-&gt;arch_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct clk_ops sh_hwblk_clk_ops = {</div><div class='del'>-	.enable		= sh_hwblk_clk_enable,</div><div class='del'>-	.disable	= sh_hwblk_clk_disable,</div><div class='del'>-	.recalc		= followparent_recalc,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int __init sh_hwblk_clk_register(struct clk *clks, int nr)</div><div class='del'>-{</div><div class='del'>-	struct clk *clkp;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int k;</div><div class='del'>-</div><div class='del'>-	for (k = 0; !ret &amp;&amp; (k &lt; nr); k++) {</div><div class='del'>-		clkp = clks + k;</div><div class='del'>-</div><div class='del'>-		/* skip over clocks using hwblk 0 (HWBLK_UNKNOWN) */</div><div class='del'>-		if (!clkp-&gt;arch_flags)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		clkp-&gt;ops = &amp;sh_hwblk_clk_ops;</div><div class='del'>-		ret |= clk_register(clkp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c<br/>index f0907995b4c9..0a47bd3e7bee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4/sq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4/sq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4/sq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/cpu/sh4/sq.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/bitmap.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.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/slab.h&gt;</div><div class='hunk'>@@ -337,9 +337,9 @@ static struct kobj_type ktype_percpu_entry = {</div><div class='ctx'> 	.default_attrs	= sq_sysfs_attrs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit sq_sysdev_add(struct sys_device *sysdev)</div><div class='add'>+static int sq_dev_add(struct device *dev, struct subsys_interface *sif)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cpu = sysdev-&gt;id;</div><div class='add'>+	unsigned int cpu = dev-&gt;id;</div><div class='ctx'> 	struct kobject *kobj;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='hunk'>@@ -348,25 +348,27 @@ static int __devinit sq_sysdev_add(struct sys_device *sysdev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	kobj = sq_kobject[cpu];</div><div class='del'>-	error = kobject_init_and_add(kobj, &amp;ktype_percpu_entry, &amp;sysdev-&gt;kobj,</div><div class='add'>+	error = kobject_init_and_add(kobj, &amp;ktype_percpu_entry, &amp;dev-&gt;kobj,</div><div class='ctx'> 				     "%s", "sq");</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		kobject_uevent(kobj, KOBJ_ADD);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit sq_sysdev_remove(struct sys_device *sysdev)</div><div class='add'>+static int sq_dev_remove(struct device *dev, struct subsys_interface *sif)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cpu = sysdev-&gt;id;</div><div class='add'>+	unsigned int cpu = dev-&gt;id;</div><div class='ctx'> 	struct kobject *kobj = sq_kobject[cpu];</div><div class='ctx'> </div><div class='ctx'> 	kobject_put(kobj);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver sq_sysdev_driver = {</div><div class='del'>-	.add		= sq_sysdev_add,</div><div class='del'>-	.remove		= __devexit_p(sq_sysdev_remove),</div><div class='add'>+static struct subsys_interface sq_interface = {</div><div class='add'>+	.name		= "sq",</div><div class='add'>+	.subsys		= &amp;cpu_subsys,</div><div class='add'>+	.add_dev	= sq_dev_add,</div><div class='add'>+	.remove_dev	= sq_dev_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init sq_api_init(void)</div><div class='hunk'>@@ -386,7 +388,7 @@ static int __init sq_api_init(void)</div><div class='ctx'> 	if (unlikely(!sq_bitmap))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = sysdev_driver_register(&amp;cpu_sysdev_class, &amp;sq_sysdev_driver);</div><div class='add'>+	ret = subsys_interface_register(&amp;sq_interface);</div><div class='ctx'> 	if (unlikely(ret != 0))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -401,7 +403,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> static void __exit sq_api_exit(void)</div><div class='ctx'> {</div><div class='del'>-	sysdev_driver_unregister(&amp;cpu_sysdev_class, &amp;sq_sysdev_driver);</div><div class='add'>+	subsys_interface_unregister(&amp;sq_interface);</div><div class='ctx'> 	kfree(sq_bitmap);</div><div class='ctx'> 	kmem_cache_destroy(sq_cache);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/Makefile b/arch/sh/kernel/cpu/sh4a/Makefile<br/>index c57fb287011e..0b22d108f4c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/cpu/sh4a/Makefile</a></div><div class='hunk'>@@ -27,9 +27,9 @@ clock-$(CONFIG_CPU_SUBTYPE_SH7780)	:= clock-sh7780.o</div><div class='ctx'> clock-$(CONFIG_CPU_SUBTYPE_SH7785)	:= clock-sh7785.o</div><div class='ctx'> clock-$(CONFIG_CPU_SUBTYPE_SH7786)	:= clock-sh7786.o</div><div class='ctx'> clock-$(CONFIG_CPU_SUBTYPE_SH7343)	:= clock-sh7343.o</div><div class='del'>-clock-$(CONFIG_CPU_SUBTYPE_SH7722)	:= clock-sh7722.o hwblk-sh7722.o</div><div class='del'>-clock-$(CONFIG_CPU_SUBTYPE_SH7723)	:= clock-sh7723.o hwblk-sh7723.o</div><div class='del'>-clock-$(CONFIG_CPU_SUBTYPE_SH7724)	:= clock-sh7724.o hwblk-sh7724.o</div><div class='add'>+clock-$(CONFIG_CPU_SUBTYPE_SH7722)	:= clock-sh7722.o</div><div class='add'>+clock-$(CONFIG_CPU_SUBTYPE_SH7723)	:= clock-sh7723.o</div><div class='add'>+clock-$(CONFIG_CPU_SUBTYPE_SH7724)	:= clock-sh7724.o</div><div class='ctx'> clock-$(CONFIG_CPU_SUBTYPE_SH7366)	:= clock-sh7366.o</div><div class='ctx'> clock-$(CONFIG_CPU_SUBTYPE_SHX3)	:= clock-shx3.o</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c<br/>index c9a48088ad47..212c72ef959c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/clock-sh7722.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/clock-sh7722.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/clock-sh7722.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/cpu/sh4a/clock-sh7722.c</a></div><div class='hunk'>@@ -22,8 +22,8 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/clkdev.h&gt;</div><div class='add'>+#include &lt;linux/sh_clk.h&gt;</div><div class='ctx'> #include &lt;asm/clock.h&gt;</div><div class='del'>-#include &lt;asm/hwblk.h&gt;</div><div class='ctx'> #include &lt;cpu/sh7722.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SH7722 registers */</div><div class='hunk'>@@ -33,6 +33,9 @@</div><div class='ctx'> #define SCLKBCR		0xa415000c</div><div class='ctx'> #define IRDACLKCR	0xa4150018</div><div class='ctx'> #define PLLCR		0xa4150024</div><div class='add'>+#define MSTPCR0		0xa4150030</div><div class='add'>+#define MSTPCR1		0xa4150034</div><div class='add'>+#define MSTPCR2		0xa4150038</div><div class='ctx'> #define DLLFRQ		0xa4150050</div><div class='ctx'> </div><div class='ctx'> /* Fixed 32 KHz root clock for RTC and Power Management purposes */</div><div class='hunk'>@@ -148,31 +151,31 @@ struct clk div6_clks[DIV6_NR] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk mstp_clks[HWBLK_NR] = {</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_URAM, &amp;div4_clks[DIV4_U], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_XYMEM, &amp;div4_clks[DIV4_B], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_TMU, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_CMT, &amp;r_clk, 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_RWDT, &amp;r_clk, 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_FLCTL, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SCIF0, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SCIF1, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SCIF2, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_IIC, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_RTC, &amp;r_clk, 0),</div><div class='del'>-</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SDHI, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_KEYSC, &amp;r_clk, 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_USBF, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_2DG, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SIU, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_VOU, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_JPU, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_BEU, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_CEU, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_VEU, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_VPU, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_LCDC, &amp;div4_clks[DIV4_P], 0),</div><div class='add'>+	[HWBLK_URAM]  = SH_CLK_MSTP32(&amp;div4_clks[DIV4_U], MSTPCR0, 28, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_XYMEM] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B], MSTPCR0, 26, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_TMU]   = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P], MSTPCR0, 15, 0),</div><div class='add'>+	[HWBLK_CMT]   = SH_CLK_MSTP32(&amp;r_clk,		  MSTPCR0, 14, 0),</div><div class='add'>+	[HWBLK_RWDT]  = SH_CLK_MSTP32(&amp;r_clk,		  MSTPCR0, 13, 0),</div><div class='add'>+	[HWBLK_FLCTL] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P], MSTPCR0, 10, 0),</div><div class='add'>+	[HWBLK_SCIF0] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P], MSTPCR0, 7, 0),</div><div class='add'>+	[HWBLK_SCIF1] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P], MSTPCR0, 6, 0),</div><div class='add'>+	[HWBLK_SCIF2] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P], MSTPCR0, 5, 0),</div><div class='add'>+</div><div class='add'>+	[HWBLK_IIC]   = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P], MSTPCR1, 9, 0),</div><div class='add'>+	[HWBLK_RTC]   = SH_CLK_MSTP32(&amp;r_clk,		  MSTPCR1, 8, 0),</div><div class='add'>+</div><div class='add'>+	[HWBLK_SDHI]  = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P], MSTPCR2, 18, 0),</div><div class='add'>+	[HWBLK_KEYSC] = SH_CLK_MSTP32(&amp;r_clk,		  MSTPCR2, 14, 0),</div><div class='add'>+	[HWBLK_USBF]  = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P], MSTPCR2, 11, 0),</div><div class='add'>+	[HWBLK_2DG]   = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B], MSTPCR2, 9, 0),</div><div class='add'>+	[HWBLK_SIU]   = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B], MSTPCR2, 8, 0),</div><div class='add'>+	[HWBLK_JPU]   = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B], MSTPCR2, 6, 0),</div><div class='add'>+	[HWBLK_VOU]   = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B], MSTPCR2, 5, 0),</div><div class='add'>+	[HWBLK_BEU]   = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B], MSTPCR2, 4, 0),</div><div class='add'>+	[HWBLK_CEU]   = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B], MSTPCR2, 3, 0),</div><div class='add'>+	[HWBLK_VEU]   = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B], MSTPCR2, 2, 0),</div><div class='add'>+	[HWBLK_VPU]   = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B], MSTPCR2, 1, 0),</div><div class='add'>+	[HWBLK_LCDC]  = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P], MSTPCR2, 0, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk_lookup lookups[] = {</div><div class='hunk'>@@ -205,27 +208,27 @@ static struct clk_lookup lookups[] = {</div><div class='ctx'> 	CLKDEV_ICK_ID("tmu_fck", "sh_tmu.2", &amp;mstp_clks[HWBLK_TMU]),</div><div class='ctx'> </div><div class='ctx'> 	CLKDEV_CON_ID("cmt_fck", &amp;mstp_clks[HWBLK_CMT]),</div><div class='del'>-	CLKDEV_CON_ID("rwdt0", &amp;mstp_clks[HWBLK_RWDT]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-wdt.0", &amp;mstp_clks[HWBLK_RWDT]),</div><div class='ctx'> 	CLKDEV_CON_ID("flctl0", &amp;mstp_clks[HWBLK_FLCTL]),</div><div class='ctx'> </div><div class='del'>-	CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &amp;mstp_clks[HWBLK_SCIF0]),</div><div class='del'>-	CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &amp;mstp_clks[HWBLK_SCIF1]),</div><div class='del'>-	CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &amp;mstp_clks[HWBLK_SCIF2]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.0", &amp;mstp_clks[HWBLK_SCIF0]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.1", &amp;mstp_clks[HWBLK_SCIF1]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.2", &amp;mstp_clks[HWBLK_SCIF2]),</div><div class='ctx'> </div><div class='ctx'> 	CLKDEV_DEV_ID("i2c-sh_mobile.0", &amp;mstp_clks[HWBLK_IIC]),</div><div class='ctx'> 	CLKDEV_CON_ID("rtc0", &amp;mstp_clks[HWBLK_RTC]),</div><div class='del'>-	CLKDEV_CON_ID("sdhi0", &amp;mstp_clks[HWBLK_SDHI]),</div><div class='del'>-	CLKDEV_CON_ID("keysc0", &amp;mstp_clks[HWBLK_KEYSC]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_mobile_sdhi.0", &amp;mstp_clks[HWBLK_SDHI]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_keysc.0", &amp;mstp_clks[HWBLK_KEYSC]),</div><div class='ctx'> 	CLKDEV_CON_ID("usbf0", &amp;mstp_clks[HWBLK_USBF]),</div><div class='ctx'> 	CLKDEV_CON_ID("2dg0", &amp;mstp_clks[HWBLK_2DG]),</div><div class='del'>-	CLKDEV_CON_ID("siu0", &amp;mstp_clks[HWBLK_SIU]),</div><div class='del'>-	CLKDEV_CON_ID("vou0", &amp;mstp_clks[HWBLK_VOU]),</div><div class='add'>+	CLKDEV_DEV_ID("siu-pcm-audio", &amp;mstp_clks[HWBLK_SIU]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-vou.0", &amp;mstp_clks[HWBLK_VOU]),</div><div class='ctx'> 	CLKDEV_CON_ID("jpu0", &amp;mstp_clks[HWBLK_JPU]),</div><div class='ctx'> 	CLKDEV_CON_ID("beu0", &amp;mstp_clks[HWBLK_BEU]),</div><div class='del'>-	CLKDEV_CON_ID("ceu0", &amp;mstp_clks[HWBLK_CEU]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_mobile_ceu.0", &amp;mstp_clks[HWBLK_CEU]),</div><div class='ctx'> 	CLKDEV_CON_ID("veu0", &amp;mstp_clks[HWBLK_VEU]),</div><div class='ctx'> 	CLKDEV_CON_ID("vpu0", &amp;mstp_clks[HWBLK_VPU]),</div><div class='del'>-	CLKDEV_CON_ID("lcdc0", &amp;mstp_clks[HWBLK_LCDC]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &amp;mstp_clks[HWBLK_LCDC]),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int __init arch_clk_init(void)</div><div class='hunk'>@@ -258,7 +261,7 @@ int __init arch_clk_init(void)</div><div class='ctx'> 		ret = sh_clk_div6_register(div6_clks, DIV6_NR);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = sh_hwblk_clk_register(mstp_clks, HWBLK_NR);</div><div class='add'>+		ret = sh_clk_mstp32_register(mstp_clks, HWBLK_NR);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7723.c b/arch/sh/kernel/cpu/sh4a/clock-sh7723.c<br/>index 3cc3827380e3..2f8c9179da47 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/clock-sh7723.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/clock-sh7723.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/clock-sh7723.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/cpu/sh4a/clock-sh7723.c</a></div><div class='hunk'>@@ -23,8 +23,8 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/clkdev.h&gt;</div><div class='add'>+#include &lt;linux/sh_clk.h&gt;</div><div class='ctx'> #include &lt;asm/clock.h&gt;</div><div class='del'>-#include &lt;asm/hwblk.h&gt;</div><div class='ctx'> #include &lt;cpu/sh7723.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SH7723 registers */</div><div class='hunk'>@@ -34,6 +34,9 @@</div><div class='ctx'> #define SCLKBCR		0xa415000c</div><div class='ctx'> #define IRDACLKCR	0xa4150018</div><div class='ctx'> #define PLLCR		0xa4150024</div><div class='add'>+#define MSTPCR0		0xa4150030</div><div class='add'>+#define MSTPCR1		0xa4150034</div><div class='add'>+#define MSTPCR2		0xa4150038</div><div class='ctx'> #define DLLFRQ		0xa4150050</div><div class='ctx'> </div><div class='ctx'> /* Fixed 32 KHz root clock for RTC and Power Management purposes */</div><div class='hunk'>@@ -149,55 +152,55 @@ struct clk div6_clks[DIV6_NR] = {</div><div class='ctx'> </div><div class='ctx'> static struct clk mstp_clks[] = {</div><div class='ctx'> 	/* See page 60 of Datasheet V1.0: Overview -&gt; Block Diagram */</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_TLB, &amp;div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_IC, &amp;div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_OC, &amp;div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_L2C, &amp;div4_clks[DIV4_SH], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_ILMEM, &amp;div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_FPU, &amp;div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_INTC, &amp;div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_DMAC0, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SHYWAY, &amp;div4_clks[DIV4_SH], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_HUDI, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_UBC, &amp;div4_clks[DIV4_I], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_TMU0, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_CMT, &amp;r_clk, 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_RWDT, &amp;r_clk, 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_DMAC1, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_TMU1, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_FLCTL, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SCIF0, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SCIF1, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SCIF2, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SCIF3, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SCIF4, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SCIF5, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_MSIOF0, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_MSIOF1, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_MERAM, &amp;div4_clks[DIV4_SH], 0),</div><div class='del'>-</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_IIC, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_RTC, &amp;r_clk, 0),</div><div class='del'>-</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_ATAPI, &amp;div4_clks[DIV4_SH], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_ADC, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_TPU, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_IRDA, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_TSIF, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_ICB, &amp;div4_clks[DIV4_B], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SDHI0, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SDHI1, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_KEYSC, &amp;r_clk, 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_USB, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_2DG, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SIU, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_VEU2H1, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_VOU, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_BEU, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_CEU, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_VEU2H0, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_VPU, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_LCDC, &amp;div4_clks[DIV4_B], 0),</div><div class='add'>+	[HWBLK_TLB]    = SH_CLK_MSTP32(&amp;div4_clks[DIV4_I],  MSTPCR0, 31, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_IC]     = SH_CLK_MSTP32(&amp;div4_clks[DIV4_I],  MSTPCR0, 30, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_OC]     = SH_CLK_MSTP32(&amp;div4_clks[DIV4_I],  MSTPCR0, 29, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_L2C]    = SH_CLK_MSTP32(&amp;div4_clks[DIV4_SH], MSTPCR0, 28, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_ILMEM]  = SH_CLK_MSTP32(&amp;div4_clks[DIV4_I],  MSTPCR0, 27, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_FPU]    = SH_CLK_MSTP32(&amp;div4_clks[DIV4_I],  MSTPCR0, 24, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_INTC]   = SH_CLK_MSTP32(&amp;div4_clks[DIV4_I],  MSTPCR0, 22, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_DMAC0]  = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR0, 21, 0),</div><div class='add'>+	[HWBLK_SHYWAY] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_SH], MSTPCR0, 20, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_HUDI]   = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],  MSTPCR0, 19, 0),</div><div class='add'>+	[HWBLK_UBC]    = SH_CLK_MSTP32(&amp;div4_clks[DIV4_I],  MSTPCR0, 17, 0),</div><div class='add'>+	[HWBLK_TMU0]   = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],  MSTPCR0, 15, 0),</div><div class='add'>+	[HWBLK_CMT]    = SH_CLK_MSTP32(&amp;r_clk,		    MSTPCR0, 14, 0),</div><div class='add'>+	[HWBLK_RWDT]   = SH_CLK_MSTP32(&amp;r_clk,		    MSTPCR0, 13, 0),</div><div class='add'>+	[HWBLK_DMAC1]  = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR0, 12, 0),</div><div class='add'>+	[HWBLK_TMU1]   = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],  MSTPCR0, 11, 0),</div><div class='add'>+	[HWBLK_FLCTL]  = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],  MSTPCR0, 10, 0),</div><div class='add'>+	[HWBLK_SCIF0]  = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],  MSTPCR0, 9, 0),</div><div class='add'>+	[HWBLK_SCIF1]  = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],  MSTPCR0, 8, 0),</div><div class='add'>+	[HWBLK_SCIF2]  = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],  MSTPCR0, 7, 0),</div><div class='add'>+	[HWBLK_SCIF3]  = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR0, 6, 0),</div><div class='add'>+	[HWBLK_SCIF4]  = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR0, 5, 0),</div><div class='add'>+	[HWBLK_SCIF5]  = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR0, 4, 0),</div><div class='add'>+	[HWBLK_MSIOF0] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR0, 2, 0),</div><div class='add'>+	[HWBLK_MSIOF1] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR0, 1, 0),</div><div class='add'>+	[HWBLK_MERAM]  = SH_CLK_MSTP32(&amp;div4_clks[DIV4_SH], MSTPCR0, 0, 0),</div><div class='add'>+</div><div class='add'>+	[HWBLK_IIC]    = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],  MSTPCR1, 9, 0),</div><div class='add'>+	[HWBLK_RTC]    = SH_CLK_MSTP32(&amp;r_clk,		    MSTPCR1, 8, 0),</div><div class='add'>+</div><div class='add'>+	[HWBLK_ATAPI]  = SH_CLK_MSTP32(&amp;div4_clks[DIV4_SH], MSTPCR2, 28, 0),</div><div class='add'>+	[HWBLK_ADC]    = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],  MSTPCR2, 27, 0),</div><div class='add'>+	[HWBLK_TPU]    = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR2, 25, 0),</div><div class='add'>+	[HWBLK_IRDA]   = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],  MSTPCR2, 24, 0),</div><div class='add'>+	[HWBLK_TSIF]   = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR2, 22, 0),</div><div class='add'>+	[HWBLK_ICB]    = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR2, 21, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_SDHI0]  = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR2, 18, 0),</div><div class='add'>+	[HWBLK_SDHI1]  = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR2, 17, 0),</div><div class='add'>+	[HWBLK_KEYSC]  = SH_CLK_MSTP32(&amp;r_clk,		    MSTPCR2, 14, 0),</div><div class='add'>+	[HWBLK_USB]    = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR2, 11, 0),</div><div class='add'>+	[HWBLK_2DG]    = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR2, 10, 0),</div><div class='add'>+	[HWBLK_SIU]    = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR2, 8, 0),</div><div class='add'>+	[HWBLK_VEU2H1] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR2, 6, 0),</div><div class='add'>+	[HWBLK_VOU]    = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR2, 5, 0),</div><div class='add'>+	[HWBLK_BEU]    = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR2, 4, 0),</div><div class='add'>+	[HWBLK_CEU]    = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR2, 3, 0),</div><div class='add'>+	[HWBLK_VEU2H0] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR2, 2, 0),</div><div class='add'>+	[HWBLK_VPU]    = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR2, 1, 0),</div><div class='add'>+	[HWBLK_LCDC]   = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR2, 0, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk_lookup lookups[] = {</div><div class='hunk'>@@ -229,80 +232,17 @@ static struct clk_lookup lookups[] = {</div><div class='ctx'> 	CLKDEV_CON_ID("ilmem0", &amp;mstp_clks[HWBLK_ILMEM]),</div><div class='ctx'> 	CLKDEV_CON_ID("fpu0", &amp;mstp_clks[HWBLK_FPU]),</div><div class='ctx'> 	CLKDEV_CON_ID("intc0", &amp;mstp_clks[HWBLK_INTC]),</div><div class='del'>-	CLKDEV_CON_ID("dmac0", &amp;mstp_clks[HWBLK_DMAC0]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-dma-engine.0", &amp;mstp_clks[HWBLK_DMAC0]),</div><div class='ctx'> 	CLKDEV_CON_ID("sh0", &amp;mstp_clks[HWBLK_SHYWAY]),</div><div class='ctx'> 	CLKDEV_CON_ID("hudi0", &amp;mstp_clks[HWBLK_HUDI]),</div><div class='ctx'> 	CLKDEV_CON_ID("ubc0", &amp;mstp_clks[HWBLK_UBC]),</div><div class='del'>-	{</div><div class='del'>-		/* TMU0 */</div><div class='del'>-		.dev_id		= "sh_tmu.0",</div><div class='del'>-		.con_id		= "tmu_fck",</div><div class='del'>-		.clk		= &amp;mstp_clks[HWBLK_TMU0],</div><div class='del'>-	}, {</div><div class='del'>-		/* TMU1 */</div><div class='del'>-		.dev_id		= "sh_tmu.1",</div><div class='del'>-		.con_id		= "tmu_fck",</div><div class='del'>-		.clk		= &amp;mstp_clks[HWBLK_TMU0],</div><div class='del'>-	}, {</div><div class='del'>-		/* TMU2 */</div><div class='del'>-		.dev_id		= "sh_tmu.2",</div><div class='del'>-		.con_id		= "tmu_fck",</div><div class='del'>-		.clk		= &amp;mstp_clks[HWBLK_TMU0],</div><div class='del'>-	},</div><div class='ctx'> 	CLKDEV_CON_ID("cmt_fck", &amp;mstp_clks[HWBLK_CMT]),</div><div class='del'>-	CLKDEV_CON_ID("rwdt0", &amp;mstp_clks[HWBLK_RWDT]),</div><div class='del'>-	CLKDEV_CON_ID("dmac1", &amp;mstp_clks[HWBLK_DMAC1]),</div><div class='del'>-	{</div><div class='del'>-		/* TMU3 */</div><div class='del'>-		.dev_id		= "sh_tmu.3",</div><div class='del'>-		.con_id		= "tmu_fck",</div><div class='del'>-		.clk		= &amp;mstp_clks[HWBLK_TMU1],</div><div class='del'>-	}, {</div><div class='del'>-		/* TMU4 */</div><div class='del'>-		.dev_id		= "sh_tmu.4",</div><div class='del'>-		.con_id		= "tmu_fck",</div><div class='del'>-		.clk		= &amp;mstp_clks[HWBLK_TMU1],</div><div class='del'>-	}, {</div><div class='del'>-		/* TMU5 */</div><div class='del'>-		.dev_id		= "sh_tmu.5",</div><div class='del'>-		.con_id		= "tmu_fck",</div><div class='del'>-		.clk		= &amp;mstp_clks[HWBLK_TMU1],</div><div class='del'>-	},</div><div class='add'>+	CLKDEV_DEV_ID("sh-wdt.0", &amp;mstp_clks[HWBLK_RWDT]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-dma-engine.1", &amp;mstp_clks[HWBLK_DMAC1]),</div><div class='ctx'> 	CLKDEV_CON_ID("flctl0", &amp;mstp_clks[HWBLK_FLCTL]),</div><div class='del'>-	{</div><div class='del'>-		/* SCIF0 */</div><div class='del'>-		.dev_id		= "sh-sci.0",</div><div class='del'>-		.con_id		= "sci_fck",</div><div class='del'>-		.clk		= &amp;mstp_clks[HWBLK_SCIF0],</div><div class='del'>-	}, {</div><div class='del'>-		/* SCIF1 */</div><div class='del'>-		.dev_id		= "sh-sci.1",</div><div class='del'>-		.con_id		= "sci_fck",</div><div class='del'>-		.clk		= &amp;mstp_clks[HWBLK_SCIF1],</div><div class='del'>-	}, {</div><div class='del'>-		/* SCIF2 */</div><div class='del'>-		.dev_id		= "sh-sci.2",</div><div class='del'>-		.con_id		= "sci_fck",</div><div class='del'>-		.clk		= &amp;mstp_clks[HWBLK_SCIF2],</div><div class='del'>-	}, {</div><div class='del'>-		/* SCIF3 */</div><div class='del'>-		.dev_id		= "sh-sci.3",</div><div class='del'>-		.con_id		= "sci_fck",</div><div class='del'>-		.clk		= &amp;mstp_clks[HWBLK_SCIF3],</div><div class='del'>-	}, {</div><div class='del'>-		/* SCIF4 */</div><div class='del'>-		.dev_id		= "sh-sci.4",</div><div class='del'>-		.con_id		= "sci_fck",</div><div class='del'>-		.clk		= &amp;mstp_clks[HWBLK_SCIF4],</div><div class='del'>-	}, {</div><div class='del'>-		/* SCIF5 */</div><div class='del'>-		.dev_id		= "sh-sci.5",</div><div class='del'>-		.con_id		= "sci_fck",</div><div class='del'>-		.clk		= &amp;mstp_clks[HWBLK_SCIF5],</div><div class='del'>-	},</div><div class='del'>-	CLKDEV_CON_ID("msiof0", &amp;mstp_clks[HWBLK_MSIOF0]),</div><div class='del'>-	CLKDEV_CON_ID("msiof1", &amp;mstp_clks[HWBLK_MSIOF1]),</div><div class='del'>-	CLKDEV_CON_ID("meram0", &amp;mstp_clks[HWBLK_MERAM]),</div><div class='add'>+	CLKDEV_DEV_ID("spi_sh_msiof.0", &amp;mstp_clks[HWBLK_MSIOF0]),</div><div class='add'>+	CLKDEV_DEV_ID("spi_sh_msiof.1", &amp;mstp_clks[HWBLK_MSIOF1]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_mobile_meram.0", &amp;mstp_clks[HWBLK_MERAM]),</div><div class='ctx'> 	CLKDEV_DEV_ID("i2c-sh_mobile.0", &amp;mstp_clks[HWBLK_IIC]),</div><div class='ctx'> 	CLKDEV_CON_ID("rtc0", &amp;mstp_clks[HWBLK_RTC]),</div><div class='ctx'> 	CLKDEV_CON_ID("atapi0", &amp;mstp_clks[HWBLK_ATAPI]),</div><div class='hunk'>@@ -311,19 +251,34 @@ static struct clk_lookup lookups[] = {</div><div class='ctx'> 	CLKDEV_CON_ID("irda0", &amp;mstp_clks[HWBLK_IRDA]),</div><div class='ctx'> 	CLKDEV_CON_ID("tsif0", &amp;mstp_clks[HWBLK_TSIF]),</div><div class='ctx'> 	CLKDEV_CON_ID("icb0", &amp;mstp_clks[HWBLK_ICB]),</div><div class='del'>-	CLKDEV_CON_ID("sdhi0", &amp;mstp_clks[HWBLK_SDHI0]),</div><div class='del'>-	CLKDEV_CON_ID("sdhi1", &amp;mstp_clks[HWBLK_SDHI1]),</div><div class='del'>-	CLKDEV_CON_ID("keysc0", &amp;mstp_clks[HWBLK_KEYSC]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_mobile_sdhi.0", &amp;mstp_clks[HWBLK_SDHI0]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_mobile_sdhi.1", &amp;mstp_clks[HWBLK_SDHI1]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_keysc.0", &amp;mstp_clks[HWBLK_KEYSC]),</div><div class='ctx'> 	CLKDEV_CON_ID("usb0", &amp;mstp_clks[HWBLK_USB]),</div><div class='ctx'> 	CLKDEV_CON_ID("2dg0", &amp;mstp_clks[HWBLK_2DG]),</div><div class='del'>-	CLKDEV_CON_ID("siu0", &amp;mstp_clks[HWBLK_SIU]),</div><div class='add'>+	CLKDEV_DEV_ID("siu-pcm-audio", &amp;mstp_clks[HWBLK_SIU]),</div><div class='ctx'> 	CLKDEV_CON_ID("veu1", &amp;mstp_clks[HWBLK_VEU2H1]),</div><div class='del'>-	CLKDEV_CON_ID("vou0", &amp;mstp_clks[HWBLK_VOU]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-vou.0", &amp;mstp_clks[HWBLK_VOU]),</div><div class='ctx'> 	CLKDEV_CON_ID("beu0", &amp;mstp_clks[HWBLK_BEU]),</div><div class='del'>-	CLKDEV_CON_ID("ceu0", &amp;mstp_clks[HWBLK_CEU]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_mobile_ceu.0", &amp;mstp_clks[HWBLK_CEU]),</div><div class='ctx'> 	CLKDEV_CON_ID("veu0", &amp;mstp_clks[HWBLK_VEU2H0]),</div><div class='ctx'> 	CLKDEV_CON_ID("vpu0", &amp;mstp_clks[HWBLK_VPU]),</div><div class='del'>-	CLKDEV_CON_ID("lcdc0", &amp;mstp_clks[HWBLK_LCDC]),</div><div class='add'>+</div><div class='add'>+	CLKDEV_ICK_ID("tmu_fck", "sh_tmu.0", &amp;mstp_clks[HWBLK_TMU0]),</div><div class='add'>+	CLKDEV_ICK_ID("tmu_fck", "sh_tmu.1", &amp;mstp_clks[HWBLK_TMU0]),</div><div class='add'>+	CLKDEV_ICK_ID("tmu_fck", "sh_tmu.2", &amp;mstp_clks[HWBLK_TMU0]),</div><div class='add'>+	CLKDEV_ICK_ID("tmu_fck", "sh_tmu.3", &amp;mstp_clks[HWBLK_TMU1]),</div><div class='add'>+	CLKDEV_ICK_ID("tmu_fck", "sh_tmu.4", &amp;mstp_clks[HWBLK_TMU1]),</div><div class='add'>+	CLKDEV_ICK_ID("tmu_fck", "sh_tmu.5", &amp;mstp_clks[HWBLK_TMU1]),</div><div class='add'>+</div><div class='add'>+	CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &amp;mstp_clks[HWBLK_SCIF0]),</div><div class='add'>+	CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &amp;mstp_clks[HWBLK_SCIF1]),</div><div class='add'>+	CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &amp;mstp_clks[HWBLK_SCIF2]),</div><div class='add'>+	CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &amp;mstp_clks[HWBLK_SCIF3]),</div><div class='add'>+	CLKDEV_ICK_ID("sci_fck", "sh-sci.4", &amp;mstp_clks[HWBLK_SCIF4]),</div><div class='add'>+	CLKDEV_ICK_ID("sci_fck", "sh-sci.5", &amp;mstp_clks[HWBLK_SCIF5]),</div><div class='add'>+</div><div class='add'>+	CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &amp;mstp_clks[HWBLK_LCDC]),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int __init arch_clk_init(void)</div><div class='hunk'>@@ -356,7 +311,7 @@ int __init arch_clk_init(void)</div><div class='ctx'> 		ret = sh_clk_div6_register(div6_clks, DIV6_NR);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = sh_hwblk_clk_register(mstp_clks, HWBLK_NR);</div><div class='add'>+		ret = sh_clk_mstp32_register(mstp_clks, HWBLK_NR);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c<br/>index 8668f557e0ac..b3c039a5064a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/clock-sh7724.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/clock-sh7724.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/clock-sh7724.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/cpu/sh4a/clock-sh7724.c</a></div><div class='hunk'>@@ -23,8 +23,8 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/clkdev.h&gt;</div><div class='add'>+#include &lt;linux/sh_clk.h&gt;</div><div class='ctx'> #include &lt;asm/clock.h&gt;</div><div class='del'>-#include &lt;asm/hwblk.h&gt;</div><div class='ctx'> #include &lt;cpu/sh7724.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SH7724 registers */</div><div class='hunk'>@@ -35,6 +35,9 @@</div><div class='ctx'> #define FCLKBCR		0xa415000c</div><div class='ctx'> #define IRDACLKCR	0xa4150018</div><div class='ctx'> #define PLLCR		0xa4150024</div><div class='add'>+#define MSTPCR0		0xa4150030</div><div class='add'>+#define MSTPCR1		0xa4150034</div><div class='add'>+#define MSTPCR2		0xa4150038</div><div class='ctx'> #define SPUCLKCR	0xa415003c</div><div class='ctx'> #define FLLFRQ		0xa4150050</div><div class='ctx'> #define LSTATS		0xa4150060</div><div class='hunk'>@@ -111,13 +114,16 @@ static struct clk div3_clk = {</div><div class='ctx'> 	.parent		= &amp;pll_clk,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* External input clock (pin name: FSIMCKA/FSIMCKB ) */</div><div class='add'>+/* External input clock (pin name: FSIMCKA/FSIMCKB/DV_CLKI ) */</div><div class='ctx'> struct clk sh7724_fsimcka_clk = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct clk sh7724_fsimckb_clk = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct clk sh7724_dv_clki = {</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct clk *main_clks[] = {</div><div class='ctx'> 	&amp;r_clk,</div><div class='ctx'> 	&amp;extal_clk,</div><div class='hunk'>@@ -126,6 +132,7 @@ static struct clk *main_clks[] = {</div><div class='ctx'> 	&amp;div3_clk,</div><div class='ctx'> 	&amp;sh7724_fsimcka_clk,</div><div class='ctx'> 	&amp;sh7724_fsimckb_clk,</div><div class='add'>+	&amp;sh7724_dv_clki,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void div4_kick(struct clk *clk)</div><div class='hunk'>@@ -163,17 +170,20 @@ struct clk div4_clks[DIV4_NR] = {</div><div class='ctx'> 	[DIV4_M1] = DIV4(FRQCRB, 4, 0x2f7c, CLK_ENABLE_ON_INIT),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum { DIV6_V, DIV6_I, DIV6_S, DIV6_NR };</div><div class='add'>+enum { DIV6_V, DIV6_I, DIV6_S, DIV6_FA, DIV6_FB, DIV6_NR };</div><div class='ctx'> </div><div class='del'>-static struct clk div6_clks[DIV6_NR] = {</div><div class='del'>-	[DIV6_V] = SH_CLK_DIV6(&amp;div3_clk, VCLKCR, 0),</div><div class='del'>-	[DIV6_I] = SH_CLK_DIV6(&amp;div3_clk, IRDACLKCR, 0),</div><div class='del'>-	[DIV6_S] = SH_CLK_DIV6(&amp;div3_clk, SPUCLKCR, CLK_ENABLE_ON_INIT),</div><div class='add'>+/* Indices are important - they are the actual src selecting values */</div><div class='add'>+static struct clk *common_parent[] = {</div><div class='add'>+	[0] = &amp;div3_clk,</div><div class='add'>+	[1] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum { DIV6_FA, DIV6_FB, DIV6_REPARENT_NR };</div><div class='add'>+static struct clk *vclkcr_parent[8] = {</div><div class='add'>+	[0] = &amp;div3_clk,</div><div class='add'>+	[2] = &amp;sh7724_dv_clki,</div><div class='add'>+	[4] = &amp;extal_clk,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-/* Indices are important - they are the actual src selecting values */</div><div class='ctx'> static struct clk *fclkacr_parent[] = {</div><div class='ctx'> 	[0] = &amp;div3_clk,</div><div class='ctx'> 	[1] = NULL,</div><div class='hunk'>@@ -188,68 +198,74 @@ static struct clk *fclkbcr_parent[] = {</div><div class='ctx'> 	[3] = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct clk div6_reparent_clks[DIV6_REPARENT_NR] = {</div><div class='del'>-	[DIV6_FA] = SH_CLK_DIV6_EXT(&amp;div3_clk, FCLKACR, 0,</div><div class='add'>+static struct clk div6_clks[DIV6_NR] = {</div><div class='add'>+	[DIV6_V] = SH_CLK_DIV6_EXT(VCLKCR, 0,</div><div class='add'>+			vclkcr_parent, ARRAY_SIZE(vclkcr_parent), 12, 3),</div><div class='add'>+	[DIV6_I] = SH_CLK_DIV6_EXT(IRDACLKCR, 0,</div><div class='add'>+			common_parent, ARRAY_SIZE(common_parent), 6, 1),</div><div class='add'>+	[DIV6_S] = SH_CLK_DIV6_EXT(SPUCLKCR, CLK_ENABLE_ON_INIT,</div><div class='add'>+			common_parent, ARRAY_SIZE(common_parent), 6, 1),</div><div class='add'>+	[DIV6_FA] = SH_CLK_DIV6_EXT(FCLKACR, 0,</div><div class='ctx'> 				      fclkacr_parent, ARRAY_SIZE(fclkacr_parent), 6, 2),</div><div class='del'>-	[DIV6_FB] = SH_CLK_DIV6_EXT(&amp;div3_clk, FCLKBCR, 0,</div><div class='add'>+	[DIV6_FB] = SH_CLK_DIV6_EXT(FCLKBCR, 0,</div><div class='ctx'> 				      fclkbcr_parent, ARRAY_SIZE(fclkbcr_parent), 6, 2),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk mstp_clks[HWBLK_NR] = {</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_TLB, &amp;div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_IC, &amp;div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_OC, &amp;div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_RSMEM, &amp;div4_clks[DIV4_B], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_ILMEM, &amp;div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_L2C, &amp;div4_clks[DIV4_SH], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_FPU, &amp;div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_INTC, &amp;div4_clks[DIV4_P], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_DMAC0, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SHYWAY, &amp;div4_clks[DIV4_SH], CLK_ENABLE_ON_INIT),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_HUDI, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_UBC, &amp;div4_clks[DIV4_I], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_TMU0, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_CMT, &amp;r_clk, 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_RWDT, &amp;r_clk, 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_DMAC1, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_TMU1, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SCIF0, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SCIF1, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SCIF2, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SCIF3, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SCIF4, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SCIF5, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_MSIOF0, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_MSIOF1, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_KEYSC, &amp;r_clk, 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_RTC, &amp;r_clk, 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_IIC0, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_IIC1, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_MMC, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_ETHER, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_ATAPI, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_TPU, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_IRDA, &amp;div4_clks[DIV4_P], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_TSIF, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_USB1, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_USB0, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_2DG, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SDHI0, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SDHI1, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_VEU1, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_CEU1, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_BEU1, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_2DDMAC, &amp;div4_clks[DIV4_SH], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_SPU, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_JPU, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_VOU, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_BEU0, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_CEU0, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_VEU0, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_VPU, &amp;div4_clks[DIV4_B], 0),</div><div class='del'>-	SH_HWBLK_CLK(HWBLK_LCDC, &amp;div4_clks[DIV4_B], 0),</div><div class='add'>+	[HWBLK_TLB] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_I],	    MSTPCR0, 31, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_IC] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_I],	    MSTPCR0, 30, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_OC] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_I],	    MSTPCR0, 29, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_RSMEM] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],   MSTPCR0, 28, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_ILMEM] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_I],   MSTPCR0, 27, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_L2C] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_SH],    MSTPCR0, 26, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_FPU] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_I],	    MSTPCR0, 24, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_INTC] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],    MSTPCR0, 22, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_DMAC0] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],   MSTPCR0, 21, 0),</div><div class='add'>+	[HWBLK_SHYWAY] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_SH], MSTPCR0, 20, CLK_ENABLE_ON_INIT),</div><div class='add'>+	[HWBLK_HUDI] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],    MSTPCR0, 19, 0),</div><div class='add'>+	[HWBLK_UBC] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_I],     MSTPCR0, 17, 0),</div><div class='add'>+	[HWBLK_TMU0] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],    MSTPCR0, 15, 0),</div><div class='add'>+	[HWBLK_CMT] = SH_CLK_MSTP32(&amp;r_clk,		    MSTPCR0, 14, 0),</div><div class='add'>+	[HWBLK_RWDT] = SH_CLK_MSTP32(&amp;r_clk,		    MSTPCR0, 13, 0),</div><div class='add'>+	[HWBLK_DMAC1] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],   MSTPCR0, 12, 0),</div><div class='add'>+	[HWBLK_TMU1] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],    MSTPCR0, 10, 0),</div><div class='add'>+	[HWBLK_SCIF0] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],   MSTPCR0, 9, 0),</div><div class='add'>+	[HWBLK_SCIF1] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],   MSTPCR0, 8, 0),</div><div class='add'>+	[HWBLK_SCIF2] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],   MSTPCR0, 7, 0),</div><div class='add'>+	[HWBLK_SCIF3] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],   MSTPCR0, 6, 0),</div><div class='add'>+	[HWBLK_SCIF4] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],   MSTPCR0, 5, 0),</div><div class='add'>+	[HWBLK_SCIF5] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],   MSTPCR0, 4, 0),</div><div class='add'>+	[HWBLK_MSIOF0] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR0, 2, 0),</div><div class='add'>+	[HWBLK_MSIOF1] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],  MSTPCR0, 1, 0),</div><div class='add'>+</div><div class='add'>+	[HWBLK_KEYSC] = SH_CLK_MSTP32(&amp;r_clk,		    MSTPCR1, 12, 0),</div><div class='add'>+	[HWBLK_RTC] = SH_CLK_MSTP32(&amp;r_clk,		    MSTPCR1, 11, 0),</div><div class='add'>+	[HWBLK_IIC0] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],    MSTPCR1, 9, 0),</div><div class='add'>+	[HWBLK_IIC1] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],    MSTPCR1, 8, 0),</div><div class='add'>+</div><div class='add'>+	[HWBLK_MMC] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],	    MSTPCR2, 29, 0),</div><div class='add'>+	[HWBLK_ETHER] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],   MSTPCR2, 28, 0),</div><div class='add'>+	[HWBLK_ATAPI] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],   MSTPCR2, 26, 0),</div><div class='add'>+	[HWBLK_TPU] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],	    MSTPCR2, 25, 0),</div><div class='add'>+	[HWBLK_IRDA] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_P],    MSTPCR2, 24, 0),</div><div class='add'>+	[HWBLK_TSIF] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],    MSTPCR2, 22, 0),</div><div class='add'>+	[HWBLK_USB1] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],    MSTPCR2, 21, 0),</div><div class='add'>+	[HWBLK_USB0] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],    MSTPCR2, 20, 0),</div><div class='add'>+	[HWBLK_2DG] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],	    MSTPCR2, 19, 0),</div><div class='add'>+	[HWBLK_SDHI0] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],   MSTPCR2, 18, 0),</div><div class='add'>+	[HWBLK_SDHI1] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],   MSTPCR2, 17, 0),</div><div class='add'>+	[HWBLK_VEU1] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],    MSTPCR2, 15, 0),</div><div class='add'>+	[HWBLK_CEU1] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],    MSTPCR2, 13, 0),</div><div class='add'>+	[HWBLK_BEU1] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],    MSTPCR2, 12, 0),</div><div class='add'>+	[HWBLK_2DDMAC] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_SH], MSTPCR2, 10, 0),</div><div class='add'>+	[HWBLK_SPU] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],	    MSTPCR2, 9, 0),</div><div class='add'>+	[HWBLK_JPU] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],	    MSTPCR2, 6, 0),</div><div class='add'>+	[HWBLK_VOU] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],	    MSTPCR2, 5, 0),</div><div class='add'>+	[HWBLK_BEU0] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],    MSTPCR2, 4, 0),</div><div class='add'>+	[HWBLK_CEU0] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],    MSTPCR2, 3, 0),</div><div class='add'>+	[HWBLK_VEU0] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],    MSTPCR2, 2, 0),</div><div class='add'>+	[HWBLK_VPU] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],	    MSTPCR2, 1, 0),</div><div class='add'>+	[HWBLK_LCDC] = SH_CLK_MSTP32(&amp;div4_clks[DIV4_B],    MSTPCR2, 0, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk_lookup lookups[] = {</div><div class='hunk'>@@ -269,8 +285,8 @@ static struct clk_lookup lookups[] = {</div><div class='ctx'> </div><div class='ctx'> 	/* DIV6 clocks */</div><div class='ctx'> 	CLKDEV_CON_ID("video_clk", &amp;div6_clks[DIV6_V]),</div><div class='del'>-	CLKDEV_CON_ID("fsia_clk", &amp;div6_reparent_clks[DIV6_FA]),</div><div class='del'>-	CLKDEV_CON_ID("fsib_clk", &amp;div6_reparent_clks[DIV6_FB]),</div><div class='add'>+	CLKDEV_CON_ID("fsia_clk", &amp;div6_clks[DIV6_FA]),</div><div class='add'>+	CLKDEV_CON_ID("fsib_clk", &amp;div6_clks[DIV6_FB]),</div><div class='ctx'> 	CLKDEV_CON_ID("irda_clk", &amp;div6_clks[DIV6_I]),</div><div class='ctx'> 	CLKDEV_CON_ID("spu_clk", &amp;div6_clks[DIV6_S]),</div><div class='ctx'> </div><div class='hunk'>@@ -283,7 +299,7 @@ static struct clk_lookup lookups[] = {</div><div class='ctx'> 	CLKDEV_CON_ID("l2c0", &amp;mstp_clks[HWBLK_L2C]),</div><div class='ctx'> 	CLKDEV_CON_ID("fpu0", &amp;mstp_clks[HWBLK_FPU]),</div><div class='ctx'> 	CLKDEV_CON_ID("intc0", &amp;mstp_clks[HWBLK_INTC]),</div><div class='del'>-	CLKDEV_CON_ID("dmac0", &amp;mstp_clks[HWBLK_DMAC0]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-dma-engine.0", &amp;mstp_clks[HWBLK_DMAC0]),</div><div class='ctx'> 	CLKDEV_CON_ID("sh0", &amp;mstp_clks[HWBLK_SHYWAY]),</div><div class='ctx'> 	CLKDEV_CON_ID("hudi0", &amp;mstp_clks[HWBLK_HUDI]),</div><div class='ctx'> 	CLKDEV_CON_ID("ubc0", &amp;mstp_clks[HWBLK_UBC]),</div><div class='hunk'>@@ -294,26 +310,26 @@ static struct clk_lookup lookups[] = {</div><div class='ctx'> 	CLKDEV_ICK_ID("tmu_fck", "sh_tmu.3", &amp;mstp_clks[HWBLK_TMU1]),</div><div class='ctx'> </div><div class='ctx'> 	CLKDEV_CON_ID("cmt_fck", &amp;mstp_clks[HWBLK_CMT]),</div><div class='del'>-	CLKDEV_CON_ID("rwdt0", &amp;mstp_clks[HWBLK_RWDT]),</div><div class='del'>-	CLKDEV_CON_ID("dmac1", &amp;mstp_clks[HWBLK_DMAC1]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-wdt.0", &amp;mstp_clks[HWBLK_RWDT]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-dma-engine.1", &amp;mstp_clks[HWBLK_DMAC1]),</div><div class='ctx'> </div><div class='ctx'> 	CLKDEV_ICK_ID("tmu_fck", "sh_tmu.4", &amp;mstp_clks[HWBLK_TMU1]),</div><div class='ctx'> 	CLKDEV_ICK_ID("tmu_fck", "sh_tmu.5", &amp;mstp_clks[HWBLK_TMU1]),</div><div class='del'>-	CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &amp;mstp_clks[HWBLK_SCIF0]),</div><div class='del'>-	CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &amp;mstp_clks[HWBLK_SCIF1]),</div><div class='del'>-	CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &amp;mstp_clks[HWBLK_SCIF2]),</div><div class='del'>-	CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &amp;mstp_clks[HWBLK_SCIF3]),</div><div class='del'>-	CLKDEV_ICK_ID("sci_fck", "sh-sci.4", &amp;mstp_clks[HWBLK_SCIF4]),</div><div class='del'>-	CLKDEV_ICK_ID("sci_fck", "sh-sci.5", &amp;mstp_clks[HWBLK_SCIF5]),</div><div class='del'>-</div><div class='del'>-	CLKDEV_CON_ID("msiof0", &amp;mstp_clks[HWBLK_MSIOF0]),</div><div class='del'>-	CLKDEV_CON_ID("msiof1", &amp;mstp_clks[HWBLK_MSIOF1]),</div><div class='del'>-	CLKDEV_CON_ID("keysc0", &amp;mstp_clks[HWBLK_KEYSC]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.0", &amp;mstp_clks[HWBLK_SCIF0]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.1", &amp;mstp_clks[HWBLK_SCIF1]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.2", &amp;mstp_clks[HWBLK_SCIF2]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.3", &amp;mstp_clks[HWBLK_SCIF3]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.4", &amp;mstp_clks[HWBLK_SCIF4]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-sci.5", &amp;mstp_clks[HWBLK_SCIF5]),</div><div class='add'>+</div><div class='add'>+	CLKDEV_DEV_ID("spi_sh_msiof.0", &amp;mstp_clks[HWBLK_MSIOF0]),</div><div class='add'>+	CLKDEV_DEV_ID("spi_sh_msiof.1", &amp;mstp_clks[HWBLK_MSIOF1]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_keysc.0", &amp;mstp_clks[HWBLK_KEYSC]),</div><div class='ctx'> 	CLKDEV_CON_ID("rtc0", &amp;mstp_clks[HWBLK_RTC]),</div><div class='ctx'> 	CLKDEV_DEV_ID("i2c-sh_mobile.0", &amp;mstp_clks[HWBLK_IIC0]),</div><div class='ctx'> 	CLKDEV_DEV_ID("i2c-sh_mobile.1", &amp;mstp_clks[HWBLK_IIC1]),</div><div class='del'>-	CLKDEV_CON_ID("mmc0", &amp;mstp_clks[HWBLK_MMC]),</div><div class='del'>-	CLKDEV_CON_ID("eth0", &amp;mstp_clks[HWBLK_ETHER]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_mmcif.0", &amp;mstp_clks[HWBLK_MMC]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-eth.0", &amp;mstp_clks[HWBLK_ETHER]),</div><div class='ctx'> 	CLKDEV_CON_ID("atapi0", &amp;mstp_clks[HWBLK_ATAPI]),</div><div class='ctx'> 	CLKDEV_CON_ID("tpu0", &amp;mstp_clks[HWBLK_TPU]),</div><div class='ctx'> 	CLKDEV_CON_ID("irda0", &amp;mstp_clks[HWBLK_IRDA]),</div><div class='hunk'>@@ -321,20 +337,20 @@ static struct clk_lookup lookups[] = {</div><div class='ctx'> 	CLKDEV_CON_ID("usb1", &amp;mstp_clks[HWBLK_USB1]),</div><div class='ctx'> 	CLKDEV_CON_ID("usb0", &amp;mstp_clks[HWBLK_USB0]),</div><div class='ctx'> 	CLKDEV_CON_ID("2dg0", &amp;mstp_clks[HWBLK_2DG]),</div><div class='del'>-	CLKDEV_CON_ID("sdhi0", &amp;mstp_clks[HWBLK_SDHI0]),</div><div class='del'>-	CLKDEV_CON_ID("sdhi1", &amp;mstp_clks[HWBLK_SDHI1]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_mobile_sdhi.0", &amp;mstp_clks[HWBLK_SDHI0]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_mobile_sdhi.1", &amp;mstp_clks[HWBLK_SDHI1]),</div><div class='ctx'> 	CLKDEV_CON_ID("veu1", &amp;mstp_clks[HWBLK_VEU1]),</div><div class='del'>-	CLKDEV_CON_ID("ceu1", &amp;mstp_clks[HWBLK_CEU1]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_mobile_ceu.1", &amp;mstp_clks[HWBLK_CEU1]),</div><div class='ctx'> 	CLKDEV_CON_ID("beu1", &amp;mstp_clks[HWBLK_BEU1]),</div><div class='ctx'> 	CLKDEV_CON_ID("2ddmac0", &amp;mstp_clks[HWBLK_2DDMAC]),</div><div class='ctx'> 	CLKDEV_CON_ID("spu0", &amp;mstp_clks[HWBLK_SPU]),</div><div class='ctx'> 	CLKDEV_CON_ID("jpu0", &amp;mstp_clks[HWBLK_JPU]),</div><div class='del'>-	CLKDEV_CON_ID("vou0", &amp;mstp_clks[HWBLK_VOU]),</div><div class='add'>+	CLKDEV_DEV_ID("sh-vou.0", &amp;mstp_clks[HWBLK_VOU]),</div><div class='ctx'> 	CLKDEV_CON_ID("beu0", &amp;mstp_clks[HWBLK_BEU0]),</div><div class='del'>-	CLKDEV_CON_ID("ceu0", &amp;mstp_clks[HWBLK_CEU0]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_mobile_ceu.0", &amp;mstp_clks[HWBLK_CEU0]),</div><div class='ctx'> 	CLKDEV_CON_ID("veu0", &amp;mstp_clks[HWBLK_VEU0]),</div><div class='ctx'> 	CLKDEV_CON_ID("vpu0", &amp;mstp_clks[HWBLK_VPU]),</div><div class='del'>-	CLKDEV_CON_ID("lcdc0", &amp;mstp_clks[HWBLK_LCDC]),</div><div class='add'>+	CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &amp;mstp_clks[HWBLK_LCDC]),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int __init arch_clk_init(void)</div><div class='hunk'>@@ -356,13 +372,10 @@ int __init arch_clk_init(void)</div><div class='ctx'> 		ret = sh_clk_div4_register(div4_clks, DIV4_NR, &amp;div4_table);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = sh_clk_div6_register(div6_clks, DIV6_NR);</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = sh_clk_div6_reparent_register(div6_reparent_clks, DIV6_REPARENT_NR);</div><div class='add'>+		ret = sh_clk_div6_reparent_register(div6_clks, DIV6_NR);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = sh_hwblk_clk_register(mstp_clks, HWBLK_NR);</div><div class='add'>+		ret = sh_clk_mstp32_register(mstp_clks, HWBLK_NR);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7757.c b/arch/sh/kernel/cpu/sh4a/clock-sh7757.c<br/>index 19222dae8233..0fbff1422f54 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/clock-sh7757.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/clock-sh7757.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/clock-sh7757.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/cpu/sh4a/clock-sh7757.c</a></div><div class='hunk'>@@ -129,7 +129,7 @@ static struct clk_lookup lookups[] = {</div><div class='ctx'> 	CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &amp;mstp_clks[MSTP110]),</div><div class='ctx'> </div><div class='ctx'> 	CLKDEV_CON_ID("usb_fck", &amp;mstp_clks[MSTP103]),</div><div class='del'>-	CLKDEV_CON_ID("usb0", &amp;mstp_clks[MSTP102]),</div><div class='add'>+	CLKDEV_DEV_ID("renesas_usbhs.0", &amp;mstp_clks[MSTP102]),</div><div class='ctx'> 	CLKDEV_CON_ID("mmc0", &amp;mstp_clks[MSTP220]),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c b/arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c<br/>deleted file mode 100644<br/>index a288b5d92341..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,106 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c</div><div class='del'>- *</div><div class='del'>- * SH7722 hardware block support</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 Magnus Damm</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='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'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/suspend.h&gt;</div><div class='del'>-#include &lt;asm/hwblk.h&gt;</div><div class='del'>-#include &lt;cpu/sh7722.h&gt;</div><div class='del'>-</div><div class='del'>-/* SH7722 registers */</div><div class='del'>-#define MSTPCR0		0xa4150030</div><div class='del'>-#define MSTPCR1		0xa4150034</div><div class='del'>-#define MSTPCR2		0xa4150038</div><div class='del'>-</div><div class='del'>-/* SH7722 Power Domains */</div><div class='del'>-enum { CORE_AREA, SUB_AREA, CORE_AREA_BM };</div><div class='del'>-static struct hwblk_area sh7722_hwblk_area[] = {</div><div class='del'>-	[CORE_AREA] = HWBLK_AREA(0, 0),</div><div class='del'>-	[CORE_AREA_BM] = HWBLK_AREA(HWBLK_AREA_FLAG_PARENT, CORE_AREA),</div><div class='del'>-	[SUB_AREA] = HWBLK_AREA(0, 0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Table mapping HWBLK to Module Stop Bit and Power Domain */</div><div class='del'>-static struct hwblk sh7722_hwblk[HWBLK_NR] = {</div><div class='del'>-	[HWBLK_TLB] = HWBLK(MSTPCR0, 31, CORE_AREA),</div><div class='del'>-	[HWBLK_IC] = HWBLK(MSTPCR0, 30, CORE_AREA),</div><div class='del'>-	[HWBLK_OC] = HWBLK(MSTPCR0, 29, CORE_AREA),</div><div class='del'>-	[HWBLK_URAM] = HWBLK(MSTPCR0, 28, CORE_AREA),</div><div class='del'>-	[HWBLK_XYMEM] = HWBLK(MSTPCR0, 26, CORE_AREA),</div><div class='del'>-	[HWBLK_INTC] = HWBLK(MSTPCR0, 22, CORE_AREA),</div><div class='del'>-	[HWBLK_DMAC] = HWBLK(MSTPCR0, 21, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_SHYWAY] = HWBLK(MSTPCR0, 20, CORE_AREA),</div><div class='del'>-	[HWBLK_HUDI] = HWBLK(MSTPCR0, 19, CORE_AREA),</div><div class='del'>-	[HWBLK_UBC] = HWBLK(MSTPCR0, 17, CORE_AREA),</div><div class='del'>-	[HWBLK_TMU] = HWBLK(MSTPCR0, 15, CORE_AREA),</div><div class='del'>-	[HWBLK_CMT] = HWBLK(MSTPCR0, 14, SUB_AREA),</div><div class='del'>-	[HWBLK_RWDT] = HWBLK(MSTPCR0, 13, SUB_AREA),</div><div class='del'>-	[HWBLK_FLCTL] = HWBLK(MSTPCR0, 10, CORE_AREA),</div><div class='del'>-	[HWBLK_SCIF0] = HWBLK(MSTPCR0, 7, CORE_AREA),</div><div class='del'>-	[HWBLK_SCIF1] = HWBLK(MSTPCR0, 6, CORE_AREA),</div><div class='del'>-	[HWBLK_SCIF2] = HWBLK(MSTPCR0, 5, CORE_AREA),</div><div class='del'>-	[HWBLK_SIO] = HWBLK(MSTPCR0, 3, CORE_AREA),</div><div class='del'>-	[HWBLK_SIOF0] = HWBLK(MSTPCR0, 2, CORE_AREA),</div><div class='del'>-	[HWBLK_SIOF1] = HWBLK(MSTPCR0, 1, CORE_AREA),</div><div class='del'>-</div><div class='del'>-	[HWBLK_IIC] = HWBLK(MSTPCR1, 9, CORE_AREA),</div><div class='del'>-	[HWBLK_RTC] = HWBLK(MSTPCR1, 8, SUB_AREA),</div><div class='del'>-</div><div class='del'>-	[HWBLK_TPU] = HWBLK(MSTPCR2, 25, CORE_AREA),</div><div class='del'>-	[HWBLK_IRDA] = HWBLK(MSTPCR2, 24, CORE_AREA),</div><div class='del'>-	[HWBLK_SDHI] = HWBLK(MSTPCR2, 18, CORE_AREA),</div><div class='del'>-	[HWBLK_SIM] = HWBLK(MSTPCR2, 16, CORE_AREA),</div><div class='del'>-	[HWBLK_KEYSC] = HWBLK(MSTPCR2, 14, SUB_AREA),</div><div class='del'>-	[HWBLK_TSIF] = HWBLK(MSTPCR2, 13, SUB_AREA),</div><div class='del'>-	[HWBLK_USBF] = HWBLK(MSTPCR2, 11, CORE_AREA),</div><div class='del'>-	[HWBLK_2DG] = HWBLK(MSTPCR2, 9, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_SIU] = HWBLK(MSTPCR2, 8, CORE_AREA),</div><div class='del'>-	[HWBLK_JPU] = HWBLK(MSTPCR2, 6, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_VOU] = HWBLK(MSTPCR2, 5, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_BEU] = HWBLK(MSTPCR2, 4, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_CEU] = HWBLK(MSTPCR2, 3, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_VEU] = HWBLK(MSTPCR2, 2, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_VPU] = HWBLK(MSTPCR2, 1, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_LCDC] = HWBLK(MSTPCR2, 0, CORE_AREA_BM),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hwblk_info sh7722_hwblk_info = {</div><div class='del'>-	.areas = sh7722_hwblk_area,</div><div class='del'>-	.nr_areas = ARRAY_SIZE(sh7722_hwblk_area),</div><div class='del'>-	.hwblks = sh7722_hwblk,</div><div class='del'>-	.nr_hwblks = ARRAY_SIZE(sh7722_hwblk),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int arch_hwblk_sleep_mode(void)</div><div class='del'>-{</div><div class='del'>-	if (!sh7722_hwblk_area[CORE_AREA].cnt[HWBLK_CNT_USAGE])</div><div class='del'>-		return SUSP_SH_STANDBY | SUSP_SH_SF;</div><div class='del'>-</div><div class='del'>-	if (!sh7722_hwblk_area[CORE_AREA_BM].cnt[HWBLK_CNT_USAGE])</div><div class='del'>-		return SUSP_SH_SLEEP | SUSP_SH_SF;</div><div class='del'>-</div><div class='del'>-	return SUSP_SH_SLEEP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init arch_hwblk_init(void)</div><div class='del'>-{</div><div class='del'>-	return hwblk_register(&amp;sh7722_hwblk_info);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/hwblk-sh7723.c b/arch/sh/kernel/cpu/sh4a/hwblk-sh7723.c<br/>deleted file mode 100644<br/>index a7f4684d2032..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/hwblk-sh7723.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/hwblk-sh7723.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,117 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/sh/kernel/cpu/sh4a/hwblk-sh7723.c</div><div class='del'>- *</div><div class='del'>- * SH7723 hardware block support</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 Magnus Damm</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='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'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/suspend.h&gt;</div><div class='del'>-#include &lt;asm/hwblk.h&gt;</div><div class='del'>-#include &lt;cpu/sh7723.h&gt;</div><div class='del'>-</div><div class='del'>-/* SH7723 registers */</div><div class='del'>-#define MSTPCR0		0xa4150030</div><div class='del'>-#define MSTPCR1		0xa4150034</div><div class='del'>-#define MSTPCR2		0xa4150038</div><div class='del'>-</div><div class='del'>-/* SH7723 Power Domains */</div><div class='del'>-enum { CORE_AREA, SUB_AREA, CORE_AREA_BM };</div><div class='del'>-static struct hwblk_area sh7723_hwblk_area[] = {</div><div class='del'>-	[CORE_AREA] = HWBLK_AREA(0, 0),</div><div class='del'>-	[CORE_AREA_BM] = HWBLK_AREA(HWBLK_AREA_FLAG_PARENT, CORE_AREA),</div><div class='del'>-	[SUB_AREA] = HWBLK_AREA(0, 0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Table mapping HWBLK to Module Stop Bit and Power Domain */</div><div class='del'>-static struct hwblk sh7723_hwblk[HWBLK_NR] = {</div><div class='del'>-	[HWBLK_TLB] = HWBLK(MSTPCR0, 31, CORE_AREA),</div><div class='del'>-	[HWBLK_IC] = HWBLK(MSTPCR0, 30, CORE_AREA),</div><div class='del'>-	[HWBLK_OC] = HWBLK(MSTPCR0, 29, CORE_AREA),</div><div class='del'>-	[HWBLK_L2C] = HWBLK(MSTPCR0, 28, CORE_AREA),</div><div class='del'>-	[HWBLK_ILMEM] = HWBLK(MSTPCR0, 27, CORE_AREA),</div><div class='del'>-	[HWBLK_FPU] = HWBLK(MSTPCR0, 24, CORE_AREA),</div><div class='del'>-	[HWBLK_INTC] = HWBLK(MSTPCR0, 22, CORE_AREA),</div><div class='del'>-	[HWBLK_DMAC0] = HWBLK(MSTPCR0, 21, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_SHYWAY] = HWBLK(MSTPCR0, 20, CORE_AREA),</div><div class='del'>-	[HWBLK_HUDI] = HWBLK(MSTPCR0, 19, CORE_AREA),</div><div class='del'>-	[HWBLK_DBG] = HWBLK(MSTPCR0, 18, CORE_AREA),</div><div class='del'>-	[HWBLK_UBC] = HWBLK(MSTPCR0, 17, CORE_AREA),</div><div class='del'>-	[HWBLK_SUBC] = HWBLK(MSTPCR0, 16, CORE_AREA),</div><div class='del'>-	[HWBLK_TMU0] = HWBLK(MSTPCR0, 15, CORE_AREA),</div><div class='del'>-	[HWBLK_CMT] = HWBLK(MSTPCR0, 14, SUB_AREA),</div><div class='del'>-	[HWBLK_RWDT] = HWBLK(MSTPCR0, 13, SUB_AREA),</div><div class='del'>-	[HWBLK_DMAC1] = HWBLK(MSTPCR0, 12, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_TMU1] = HWBLK(MSTPCR0, 11, CORE_AREA),</div><div class='del'>-	[HWBLK_FLCTL] = HWBLK(MSTPCR0, 10, CORE_AREA),</div><div class='del'>-	[HWBLK_SCIF0] = HWBLK(MSTPCR0, 9, CORE_AREA),</div><div class='del'>-	[HWBLK_SCIF1] = HWBLK(MSTPCR0, 8, CORE_AREA),</div><div class='del'>-	[HWBLK_SCIF2] = HWBLK(MSTPCR0, 7, CORE_AREA),</div><div class='del'>-	[HWBLK_SCIF3] = HWBLK(MSTPCR0, 6, CORE_AREA),</div><div class='del'>-	[HWBLK_SCIF4] = HWBLK(MSTPCR0, 5, CORE_AREA),</div><div class='del'>-	[HWBLK_SCIF5] = HWBLK(MSTPCR0, 4, CORE_AREA),</div><div class='del'>-	[HWBLK_MSIOF0] = HWBLK(MSTPCR0, 2, CORE_AREA),</div><div class='del'>-	[HWBLK_MSIOF1] = HWBLK(MSTPCR0, 1, CORE_AREA),</div><div class='del'>-	[HWBLK_MERAM] = HWBLK(MSTPCR0, 0, CORE_AREA),</div><div class='del'>-</div><div class='del'>-	[HWBLK_IIC] = HWBLK(MSTPCR1, 9, CORE_AREA),</div><div class='del'>-	[HWBLK_RTC] = HWBLK(MSTPCR1, 8, SUB_AREA),</div><div class='del'>-</div><div class='del'>-	[HWBLK_ATAPI] = HWBLK(MSTPCR2, 28, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_ADC] = HWBLK(MSTPCR2, 27, CORE_AREA),</div><div class='del'>-	[HWBLK_TPU] = HWBLK(MSTPCR2, 25, CORE_AREA),</div><div class='del'>-	[HWBLK_IRDA] = HWBLK(MSTPCR2, 24, CORE_AREA),</div><div class='del'>-	[HWBLK_TSIF] = HWBLK(MSTPCR2, 22, CORE_AREA),</div><div class='del'>-	[HWBLK_ICB] = HWBLK(MSTPCR2, 21, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_SDHI0] = HWBLK(MSTPCR2, 18, CORE_AREA),</div><div class='del'>-	[HWBLK_SDHI1] = HWBLK(MSTPCR2, 17, CORE_AREA),</div><div class='del'>-	[HWBLK_KEYSC] = HWBLK(MSTPCR2, 14, SUB_AREA),</div><div class='del'>-	[HWBLK_USB] = HWBLK(MSTPCR2, 11, CORE_AREA),</div><div class='del'>-	[HWBLK_2DG] = HWBLK(MSTPCR2, 10, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_SIU] = HWBLK(MSTPCR2, 8, CORE_AREA),</div><div class='del'>-	[HWBLK_VEU2H1] = HWBLK(MSTPCR2, 6, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_VOU] = HWBLK(MSTPCR2, 5, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_BEU] = HWBLK(MSTPCR2, 4, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_CEU] = HWBLK(MSTPCR2, 3, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_VEU2H0] = HWBLK(MSTPCR2, 2, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_VPU] = HWBLK(MSTPCR2, 1, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_LCDC] = HWBLK(MSTPCR2, 0, CORE_AREA_BM),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hwblk_info sh7723_hwblk_info = {</div><div class='del'>-	.areas = sh7723_hwblk_area,</div><div class='del'>-	.nr_areas = ARRAY_SIZE(sh7723_hwblk_area),</div><div class='del'>-	.hwblks = sh7723_hwblk,</div><div class='del'>-	.nr_hwblks = ARRAY_SIZE(sh7723_hwblk),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int arch_hwblk_sleep_mode(void)</div><div class='del'>-{</div><div class='del'>-	if (!sh7723_hwblk_area[CORE_AREA].cnt[HWBLK_CNT_USAGE])</div><div class='del'>-		return SUSP_SH_STANDBY | SUSP_SH_SF;</div><div class='del'>-</div><div class='del'>-	if (!sh7723_hwblk_area[CORE_AREA_BM].cnt[HWBLK_CNT_USAGE])</div><div class='del'>-		return SUSP_SH_SLEEP | SUSP_SH_SF;</div><div class='del'>-</div><div class='del'>-	return SUSP_SH_SLEEP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init arch_hwblk_init(void)</div><div class='del'>-{</div><div class='del'>-	return hwblk_register(&amp;sh7723_hwblk_info);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/hwblk-sh7724.c b/arch/sh/kernel/cpu/sh4a/hwblk-sh7724.c<br/>deleted file mode 100644<br/>index 1613ad6013c3..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/hwblk-sh7724.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/hwblk-sh7724.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,121 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/sh/kernel/cpu/sh4a/hwblk-sh7724.c</div><div class='del'>- *</div><div class='del'>- * SH7724 hardware block support</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 Magnus Damm</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='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'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/suspend.h&gt;</div><div class='del'>-#include &lt;asm/hwblk.h&gt;</div><div class='del'>-#include &lt;cpu/sh7724.h&gt;</div><div class='del'>-</div><div class='del'>-/* SH7724 registers */</div><div class='del'>-#define MSTPCR0		0xa4150030</div><div class='del'>-#define MSTPCR1		0xa4150034</div><div class='del'>-#define MSTPCR2		0xa4150038</div><div class='del'>-</div><div class='del'>-/* SH7724 Power Domains */</div><div class='del'>-enum { CORE_AREA, SUB_AREA, CORE_AREA_BM };</div><div class='del'>-static struct hwblk_area sh7724_hwblk_area[] = {</div><div class='del'>-	[CORE_AREA] = HWBLK_AREA(0, 0),</div><div class='del'>-	[CORE_AREA_BM] = HWBLK_AREA(HWBLK_AREA_FLAG_PARENT, CORE_AREA),</div><div class='del'>-	[SUB_AREA] = HWBLK_AREA(0, 0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Table mapping HWBLK to Module Stop Bit and Power Domain */</div><div class='del'>-static struct hwblk sh7724_hwblk[HWBLK_NR] = {</div><div class='del'>-	[HWBLK_TLB] = HWBLK(MSTPCR0, 31, CORE_AREA),</div><div class='del'>-	[HWBLK_IC] = HWBLK(MSTPCR0, 30, CORE_AREA),</div><div class='del'>-	[HWBLK_OC] = HWBLK(MSTPCR0, 29, CORE_AREA),</div><div class='del'>-	[HWBLK_RSMEM] = HWBLK(MSTPCR0, 28, CORE_AREA),</div><div class='del'>-	[HWBLK_ILMEM] = HWBLK(MSTPCR0, 27, CORE_AREA),</div><div class='del'>-	[HWBLK_L2C] = HWBLK(MSTPCR0, 26, CORE_AREA),</div><div class='del'>-	[HWBLK_FPU] = HWBLK(MSTPCR0, 24, CORE_AREA),</div><div class='del'>-	[HWBLK_INTC] = HWBLK(MSTPCR0, 22, CORE_AREA),</div><div class='del'>-	[HWBLK_DMAC0] = HWBLK(MSTPCR0, 21, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_SHYWAY] = HWBLK(MSTPCR0, 20, CORE_AREA),</div><div class='del'>-	[HWBLK_HUDI] = HWBLK(MSTPCR0, 19, CORE_AREA),</div><div class='del'>-	[HWBLK_DBG] = HWBLK(MSTPCR0, 18, CORE_AREA),</div><div class='del'>-	[HWBLK_UBC] = HWBLK(MSTPCR0, 17, CORE_AREA),</div><div class='del'>-	[HWBLK_TMU0] = HWBLK(MSTPCR0, 15, CORE_AREA),</div><div class='del'>-	[HWBLK_CMT] = HWBLK(MSTPCR0, 14, SUB_AREA),</div><div class='del'>-	[HWBLK_RWDT] = HWBLK(MSTPCR0, 13, SUB_AREA),</div><div class='del'>-	[HWBLK_DMAC1] = HWBLK(MSTPCR0, 12, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_TMU1] = HWBLK(MSTPCR0, 10, CORE_AREA),</div><div class='del'>-	[HWBLK_SCIF0] = HWBLK(MSTPCR0, 9, CORE_AREA),</div><div class='del'>-	[HWBLK_SCIF1] = HWBLK(MSTPCR0, 8, CORE_AREA),</div><div class='del'>-	[HWBLK_SCIF2] = HWBLK(MSTPCR0, 7, CORE_AREA),</div><div class='del'>-	[HWBLK_SCIF3] = HWBLK(MSTPCR0, 6, CORE_AREA),</div><div class='del'>-	[HWBLK_SCIF4] = HWBLK(MSTPCR0, 5, CORE_AREA),</div><div class='del'>-	[HWBLK_SCIF5] = HWBLK(MSTPCR0, 4, CORE_AREA),</div><div class='del'>-	[HWBLK_MSIOF0] = HWBLK(MSTPCR0, 2, CORE_AREA),</div><div class='del'>-	[HWBLK_MSIOF1] = HWBLK(MSTPCR0, 1, CORE_AREA),</div><div class='del'>-</div><div class='del'>-	[HWBLK_KEYSC] = HWBLK(MSTPCR1, 12, SUB_AREA),</div><div class='del'>-	[HWBLK_RTC] = HWBLK(MSTPCR1, 11, SUB_AREA),</div><div class='del'>-	[HWBLK_IIC0] = HWBLK(MSTPCR1, 9, CORE_AREA),</div><div class='del'>-	[HWBLK_IIC1] = HWBLK(MSTPCR1, 8, CORE_AREA),</div><div class='del'>-</div><div class='del'>-	[HWBLK_MMC] = HWBLK(MSTPCR2, 29, CORE_AREA),</div><div class='del'>-	[HWBLK_ETHER] = HWBLK(MSTPCR2, 28, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_ATAPI] = HWBLK(MSTPCR2, 26, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_TPU] = HWBLK(MSTPCR2, 25, CORE_AREA),</div><div class='del'>-	[HWBLK_IRDA] = HWBLK(MSTPCR2, 24, CORE_AREA),</div><div class='del'>-	[HWBLK_TSIF] = HWBLK(MSTPCR2, 22, CORE_AREA),</div><div class='del'>-	[HWBLK_USB1] = HWBLK(MSTPCR2, 21, CORE_AREA),</div><div class='del'>-	[HWBLK_USB0] = HWBLK(MSTPCR2, 20, CORE_AREA),</div><div class='del'>-	[HWBLK_2DG] = HWBLK(MSTPCR2, 19, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_SDHI0] = HWBLK(MSTPCR2, 18, CORE_AREA),</div><div class='del'>-	[HWBLK_SDHI1] = HWBLK(MSTPCR2, 17, CORE_AREA),</div><div class='del'>-	[HWBLK_VEU1] = HWBLK(MSTPCR2, 15, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_CEU1] = HWBLK(MSTPCR2, 13, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_BEU1] = HWBLK(MSTPCR2, 12, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_2DDMAC] = HWBLK(MSTPCR2, 10, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_SPU] = HWBLK(MSTPCR2, 9, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_JPU] = HWBLK(MSTPCR2, 6, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_VOU] = HWBLK(MSTPCR2, 5, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_BEU0] = HWBLK(MSTPCR2, 4, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_CEU0] = HWBLK(MSTPCR2, 3, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_VEU0] = HWBLK(MSTPCR2, 2, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_VPU] = HWBLK(MSTPCR2, 1, CORE_AREA_BM),</div><div class='del'>-	[HWBLK_LCDC] = HWBLK(MSTPCR2, 0, CORE_AREA_BM),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hwblk_info sh7724_hwblk_info = {</div><div class='del'>-	.areas = sh7724_hwblk_area,</div><div class='del'>-	.nr_areas = ARRAY_SIZE(sh7724_hwblk_area),</div><div class='del'>-	.hwblks = sh7724_hwblk,</div><div class='del'>-	.nr_hwblks = ARRAY_SIZE(sh7724_hwblk),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int arch_hwblk_sleep_mode(void)</div><div class='del'>-{</div><div class='del'>-	if (!sh7724_hwblk_area[CORE_AREA].cnt[HWBLK_CNT_USAGE])</div><div class='del'>-		return SUSP_SH_STANDBY | SUSP_SH_SF;</div><div class='del'>-</div><div class='del'>-	if (!sh7724_hwblk_area[CORE_AREA_BM].cnt[HWBLK_CNT_USAGE])</div><div class='del'>-		return SUSP_SH_SLEEP | SUSP_SH_SF;</div><div class='del'>-</div><div class='del'>-	return SUSP_SH_SLEEP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init arch_hwblk_init(void)</div><div class='del'>-{</div><div class='del'>-	return hwblk_register(&amp;sh7724_hwblk_info);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c<br/>index 278a0e572158..8420d4bc8bfc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/setup-sh7722.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/setup-sh7722.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/setup-sh7722.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/cpu/sh4a/setup-sh7722.c</a></div><div class='hunk'>@@ -146,7 +146,7 @@ static struct resource sh7722_dmae_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		/* DMA error IRQ */</div><div class='add'>+		.name	= "error_irq",</div><div class='ctx'> 		.start	= 78,</div><div class='ctx'> 		.end	= 78,</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ,</div><div class='hunk'>@@ -173,9 +173,6 @@ struct platform_device dma_device = {</div><div class='ctx'> 	.dev		= {</div><div class='ctx'> 		.platform_data	= &amp;dma_platform_data,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_DMAC,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Serial */</div><div class='hunk'>@@ -264,9 +261,6 @@ static struct platform_device rtc_device = {</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(rtc_resources),</div><div class='ctx'> 	.resource	= rtc_resources,</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_RTC,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct m66592_platdata usbf_platdata = {</div><div class='hunk'>@@ -297,9 +291,6 @@ static struct platform_device usbf_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(usbf_resources),</div><div class='ctx'> 	.resource	= usbf_resources,</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_USBF,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource iic_resources[] = {</div><div class='hunk'>@@ -321,9 +312,6 @@ static struct platform_device iic_device = {</div><div class='ctx'> 	.id             = 0, /* "i2c0" clock */</div><div class='ctx'> 	.num_resources  = ARRAY_SIZE(iic_resources),</div><div class='ctx'> 	.resource       = iic_resources,</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_IIC,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct uio_info vpu_platform_data = {</div><div class='hunk'>@@ -352,9 +340,6 @@ static struct platform_device vpu_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= vpu_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(vpu_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_VPU,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct uio_info veu_platform_data = {</div><div class='hunk'>@@ -383,9 +368,6 @@ static struct platform_device veu_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= veu_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(veu_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_VEU,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct uio_info jpu_platform_data = {</div><div class='hunk'>@@ -414,9 +396,6 @@ static struct platform_device jpu_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= jpu_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(jpu_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_JPU,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sh_timer_config cmt_platform_data = {</div><div class='hunk'>@@ -446,9 +425,6 @@ static struct platform_device cmt_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= cmt_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(cmt_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_CMT,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sh_timer_config tmu0_platform_data = {</div><div class='hunk'>@@ -477,9 +453,6 @@ static struct platform_device tmu0_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= tmu0_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(tmu0_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_TMU,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sh_timer_config tmu1_platform_data = {</div><div class='hunk'>@@ -508,9 +481,6 @@ static struct platform_device tmu1_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= tmu1_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(tmu1_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_TMU,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sh_timer_config tmu2_platform_data = {</div><div class='hunk'>@@ -538,9 +508,6 @@ static struct platform_device tmu2_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= tmu2_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(tmu2_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_TMU,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct siu_platform siu_platform_data = {</div><div class='hunk'>@@ -571,9 +538,6 @@ static struct platform_device siu_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= siu_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(siu_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_SIU,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *sh7722_devices[] __initdata = {</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c<br/>index 3c2810d8f72e..a188c9ea4393 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/setup-sh7723.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/setup-sh7723.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/setup-sh7723.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/cpu/sh4a/setup-sh7723.c</a></div><div class='hunk'>@@ -158,9 +158,6 @@ static struct platform_device vpu_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= vpu_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(vpu_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_VPU,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct uio_info veu0_platform_data = {</div><div class='hunk'>@@ -189,9 +186,6 @@ static struct platform_device veu0_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= veu0_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(veu0_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_VEU2H0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct uio_info veu1_platform_data = {</div><div class='hunk'>@@ -220,9 +214,6 @@ static struct platform_device veu1_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= veu1_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(veu1_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_VEU2H1,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sh_timer_config cmt_platform_data = {</div><div class='hunk'>@@ -252,9 +243,6 @@ static struct platform_device cmt_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= cmt_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(cmt_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_CMT,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sh_timer_config tmu0_platform_data = {</div><div class='hunk'>@@ -283,9 +271,6 @@ static struct platform_device tmu0_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= tmu0_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(tmu0_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_TMU0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sh_timer_config tmu1_platform_data = {</div><div class='hunk'>@@ -314,9 +299,6 @@ static struct platform_device tmu1_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= tmu1_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(tmu1_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_TMU0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sh_timer_config tmu2_platform_data = {</div><div class='hunk'>@@ -344,9 +326,6 @@ static struct platform_device tmu2_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= tmu2_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(tmu2_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_TMU0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sh_timer_config tmu3_platform_data = {</div><div class='hunk'>@@ -374,9 +353,6 @@ static struct platform_device tmu3_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= tmu3_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(tmu3_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_TMU1,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sh_timer_config tmu4_platform_data = {</div><div class='hunk'>@@ -404,9 +380,6 @@ static struct platform_device tmu4_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= tmu4_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(tmu4_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_TMU1,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sh_timer_config tmu5_platform_data = {</div><div class='hunk'>@@ -434,9 +407,6 @@ static struct platform_device tmu5_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= tmu5_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(tmu5_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_TMU1,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource rtc_resources[] = {</div><div class='hunk'>@@ -467,9 +437,6 @@ static struct platform_device rtc_device = {</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(rtc_resources),</div><div class='ctx'> 	.resource	= rtc_resources,</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_RTC,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct r8a66597_platdata r8a66597_data = {</div><div class='hunk'>@@ -499,9 +466,6 @@ static struct platform_device sh7723_usb_host_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(sh7723_usb_host_resources),</div><div class='ctx'> 	.resource	= sh7723_usb_host_resources,</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_USB,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource iic_resources[] = {</div><div class='hunk'>@@ -523,9 +487,6 @@ static struct platform_device iic_device = {</div><div class='ctx'> 	.id             = 0, /* "i2c0" clock */</div><div class='ctx'> 	.num_resources  = ARRAY_SIZE(iic_resources),</div><div class='ctx'> 	.resource       = iic_resources,</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_IIC,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *sh7723_devices[] __initdata = {</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c<br/>index a37dd72c3671..4c671cfe68aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/setup-sh7724.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/setup-sh7724.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/setup-sh7724.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/cpu/sh4a/setup-sh7724.c</a></div><div class='hunk'>@@ -214,7 +214,7 @@ static struct resource sh7724_dmae0_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		/* DMA error IRQ */</div><div class='add'>+		.name	= "error_irq",</div><div class='ctx'> 		.start	= 78,</div><div class='ctx'> 		.end	= 78,</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ,</div><div class='hunk'>@@ -248,7 +248,7 @@ static struct resource sh7724_dmae1_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		/* DMA error IRQ */</div><div class='add'>+		.name	= "error_irq",</div><div class='ctx'> 		.start	= 74,</div><div class='ctx'> 		.end	= 74,</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ,</div><div class='hunk'>@@ -275,9 +275,6 @@ static struct platform_device dma0_device = {</div><div class='ctx'> 	.dev		= {</div><div class='ctx'> 		.platform_data	= &amp;dma_platform_data,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_DMAC0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device dma1_device = {</div><div class='hunk'>@@ -288,9 +285,6 @@ static struct platform_device dma1_device = {</div><div class='ctx'> 	.dev		= {</div><div class='ctx'> 		.platform_data	= &amp;dma_platform_data,</div><div class='ctx'> 	},</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_DMAC1,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Serial */</div><div class='hunk'>@@ -434,9 +428,6 @@ static struct platform_device rtc_device = {</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(rtc_resources),</div><div class='ctx'> 	.resource	= rtc_resources,</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_RTC,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* I2C0 */</div><div class='hunk'>@@ -459,9 +450,6 @@ static struct platform_device iic0_device = {</div><div class='ctx'> 	.id             = 0, /* "i2c0" clock */</div><div class='ctx'> 	.num_resources  = ARRAY_SIZE(iic0_resources),</div><div class='ctx'> 	.resource       = iic0_resources,</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_IIC0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* I2C1 */</div><div class='hunk'>@@ -484,9 +472,6 @@ static struct platform_device iic1_device = {</div><div class='ctx'> 	.id             = 1, /* "i2c1" clock */</div><div class='ctx'> 	.num_resources  = ARRAY_SIZE(iic1_resources),</div><div class='ctx'> 	.resource       = iic1_resources,</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_IIC1,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* VPU */</div><div class='hunk'>@@ -516,9 +501,6 @@ static struct platform_device vpu_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= vpu_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(vpu_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_VPU,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* VEU0 */</div><div class='hunk'>@@ -548,9 +530,6 @@ static struct platform_device veu0_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= veu0_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(veu0_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_VEU0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* VEU1 */</div><div class='hunk'>@@ -580,9 +559,6 @@ static struct platform_device veu1_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= veu1_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(veu1_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_VEU1,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* BEU0 */</div><div class='hunk'>@@ -612,9 +588,6 @@ static struct platform_device beu0_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= beu0_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(beu0_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_BEU0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* BEU1 */</div><div class='hunk'>@@ -644,9 +617,6 @@ static struct platform_device beu1_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= beu1_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(beu1_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_BEU1,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sh_timer_config cmt_platform_data = {</div><div class='hunk'>@@ -676,9 +646,6 @@ static struct platform_device cmt_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= cmt_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(cmt_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_CMT,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sh_timer_config tmu0_platform_data = {</div><div class='hunk'>@@ -707,9 +674,6 @@ static struct platform_device tmu0_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= tmu0_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(tmu0_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_TMU0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sh_timer_config tmu1_platform_data = {</div><div class='hunk'>@@ -738,9 +702,6 @@ static struct platform_device tmu1_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= tmu1_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(tmu1_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_TMU0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sh_timer_config tmu2_platform_data = {</div><div class='hunk'>@@ -768,9 +729,6 @@ static struct platform_device tmu2_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= tmu2_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(tmu2_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_TMU0,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -799,9 +757,6 @@ static struct platform_device tmu3_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= tmu3_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(tmu3_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_TMU1,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sh_timer_config tmu4_platform_data = {</div><div class='hunk'>@@ -829,9 +784,6 @@ static struct platform_device tmu4_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= tmu4_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(tmu4_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_TMU1,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sh_timer_config tmu5_platform_data = {</div><div class='hunk'>@@ -859,9 +811,6 @@ static struct platform_device tmu5_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= tmu5_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(tmu5_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_TMU1,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* JPU */</div><div class='hunk'>@@ -891,9 +840,6 @@ static struct platform_device jpu_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= jpu_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(jpu_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_JPU,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* SPU2DSP0 */</div><div class='hunk'>@@ -923,9 +869,6 @@ static struct platform_device spu0_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= spu0_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(spu0_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_SPU,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* SPU2DSP1 */</div><div class='hunk'>@@ -955,9 +898,6 @@ static struct platform_device spu1_device = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.resource	= spu1_resources,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(spu1_resources),</div><div class='del'>-	.archdata = {</div><div class='del'>-		.hwblk_id = HWBLK_SPU,</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *sh7724_devices[] __initdata = {</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c<br/>index 05559295d2ca..a7b2da6b3a1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/setup-sh7757.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/setup-sh7757.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/setup-sh7757.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/cpu/sh4a/setup-sh7757.c</a></div><div class='hunk'>@@ -465,6 +465,7 @@ static struct resource sh7757_dmae0_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.name	= "error_irq",</div><div class='ctx'> 		.start	= 34,</div><div class='ctx'> 		.end	= 34,</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_SHAREABLE,</div><div class='hunk'>@@ -486,7 +487,7 @@ static struct resource sh7757_dmae1_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		/* DMA error */</div><div class='add'>+		.name	= "error_irq",</div><div class='ctx'> 		.start	= 34,</div><div class='ctx'> 		.end	= 34,</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_SHAREABLE,</div><div class='hunk'>@@ -556,7 +557,7 @@ static struct resource sh7757_dmae2_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		/* DMA error */</div><div class='add'>+		.name	= "error_irq",</div><div class='ctx'> 		.start	= 323,</div><div class='ctx'> 		.end	= 323,</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ,</div><div class='hunk'>@@ -590,7 +591,7 @@ static struct resource sh7757_dmae3_resources[] = {</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		/* DMA error */</div><div class='add'>+		.name	= "error_irq",</div><div class='ctx'> 		.start	= 324,</div><div class='ctx'> 		.end	= 324,</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ,</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c<br/>index 3d4d2075c19a..d431b0052d0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/setup-sh7780.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/setup-sh7780.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/setup-sh7780.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/cpu/sh4a/setup-sh7780.c</a></div><div class='hunk'>@@ -322,6 +322,7 @@ static struct resource sh7780_dmae0_resources[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		/* Real DMA error IRQ is 38, and channel IRQs are 34-37, 44-45 */</div><div class='add'>+		.name	= "error_irq",</div><div class='ctx'> 		.start	= 34,</div><div class='ctx'> 		.end	= 34,</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_SHAREABLE,</div><div class='hunk'>@@ -338,6 +339,7 @@ static struct resource sh7780_dmae1_resources[] = {</div><div class='ctx'> 	/* DMAC1 has no DMARS */</div><div class='ctx'> 	{</div><div class='ctx'> 		/* Real DMA error IRQ is 38, and channel IRQs are 46-47, 92-95 */</div><div class='add'>+		.name	= "error_irq",</div><div class='ctx'> 		.start	= 46,</div><div class='ctx'> 		.end	= 46,</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_SHAREABLE,</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c<br/>index b29e6340414a..81588ef15a6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/setup-sh7785.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/setup-sh7785.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/setup-sh7785.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/cpu/sh4a/setup-sh7785.c</a></div><div class='hunk'>@@ -376,6 +376,7 @@ static struct resource sh7785_dmae0_resources[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		/* Real DMA error IRQ is 39, and channel IRQs are 33-38 */</div><div class='add'>+		.name	= "error_irq",</div><div class='ctx'> 		.start	= 33,</div><div class='ctx'> 		.end	= 33,</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_SHAREABLE,</div><div class='hunk'>@@ -392,6 +393,7 @@ static struct resource sh7785_dmae1_resources[] = {</div><div class='ctx'> 	/* DMAC1 has no DMARS */</div><div class='ctx'> 	{</div><div class='ctx'> 		/* Real DMA error IRQ is 58, and channel IRQs are 52-57 */</div><div class='add'>+		.name	= "error_irq",</div><div class='ctx'> 		.start	= 52,</div><div class='ctx'> 		.end	= 52,</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_SHAREABLE,</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c<br/>index dd5e709f9821..599022d73b28 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/setup-sh7786.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/sh4a/setup-sh7786.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4a/setup-sh7786.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/cpu/sh4a/setup-sh7786.c</a></div><div class='hunk'>@@ -518,7 +518,7 @@ static struct resource dmac0_resources[] = {</div><div class='ctx'> 		.end	= 0xfe00900b,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	}, {</div><div class='del'>-		/* DMA error IRQ */</div><div class='add'>+		.name	= "error_irq",</div><div class='ctx'> 		.start	= evt2irq(0x5c0),</div><div class='ctx'> 		.end	= evt2irq(0x5c0),</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ,</div><div class='head'>diff --git a/arch/sh/kernel/cpu/shmobile/Makefile b/arch/sh/kernel/cpu/shmobile/Makefile<br/>index a39f88ea1a85..e8a5111e848a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/shmobile/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/shmobile/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/shmobile/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/cpu/shmobile/Makefile</a></div><div class='hunk'>@@ -5,4 +5,3 @@</div><div class='ctx'> # Power Management &amp; Sleep mode</div><div class='ctx'> obj-$(CONFIG_PM)	+= pm.o sleep.o</div><div class='ctx'> obj-$(CONFIG_CPU_IDLE)	+= cpuidle.o</div><div class='del'>-obj-$(CONFIG_PM_RUNTIME)	+= pm_runtime.o</div><div class='head'>diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c<br/>index 1cc257c9b1e3..6d62eb40e750 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/shmobile/cpuidle.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/shmobile/cpuidle.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/shmobile/cpuidle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/cpu/shmobile/cpuidle.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;asm/suspend.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/hwblk.h&gt;</div><div class='ctx'> </div><div class='ctx'> static unsigned long cpuidle_mode[] = {</div><div class='ctx'> 	SUSP_SH_SLEEP, /* regular sleep mode */</div><div class='hunk'>@@ -29,7 +28,7 @@ static int cpuidle_sleep_enter(struct cpuidle_device *dev,</div><div class='ctx'> 				struct cpuidle_driver *drv,</div><div class='ctx'> 				int index)</div><div class='ctx'> {</div><div class='del'>-	unsigned long allowed_mode = arch_hwblk_sleep_mode();</div><div class='add'>+	unsigned long allowed_mode = SUSP_SH_SLEEP;</div><div class='ctx'> 	ktime_t before, after;</div><div class='ctx'> 	int requested_state = index;</div><div class='ctx'> 	int allowed_state;</div><div class='head'>diff --git a/arch/sh/kernel/cpu/shmobile/pm_runtime.c b/arch/sh/kernel/cpu/shmobile/pm_runtime.c<br/>deleted file mode 100644<br/>index bf280c812d2f..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/shmobile/pm_runtime.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/cpu/shmobile/pm_runtime.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,319 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/sh/kernel/cpu/shmobile/pm_runtime.c</div><div class='del'>- *</div><div class='del'>- * Runtime PM support code for SuperH Mobile</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2009 Magnus Damm</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.  See the file "COPYING" in the main directory of this archive</div><div class='del'>- * for more details.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/pm_runtime.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;asm/hwblk.h&gt;</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(hwblk_lock);</div><div class='del'>-static LIST_HEAD(hwblk_idle_list);</div><div class='del'>-static struct work_struct hwblk_work;</div><div class='del'>-</div><div class='del'>-extern struct hwblk_info *hwblk_info;</div><div class='del'>-</div><div class='del'>-static void platform_pm_runtime_not_idle(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* remove device from idle list */</div><div class='del'>-	spin_lock_irqsave(&amp;hwblk_lock, flags);</div><div class='del'>-	if (test_bit(PDEV_ARCHDATA_FLAG_IDLE, &amp;pdev-&gt;archdata.flags)) {</div><div class='del'>-		list_del(&amp;pdev-&gt;archdata.entry);</div><div class='del'>-		__clear_bit(PDEV_ARCHDATA_FLAG_IDLE, &amp;pdev-&gt;archdata.flags);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;hwblk_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __platform_pm_runtime_resume(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct device *d = &amp;pdev-&gt;dev;</div><div class='del'>-	struct pdev_archdata *ad = &amp;pdev-&gt;archdata;</div><div class='del'>-	int hwblk = ad-&gt;hwblk_id;</div><div class='del'>-	int ret = -ENOSYS;</div><div class='del'>-</div><div class='del'>-	dev_dbg(d, "__platform_pm_runtime_resume() [%d]\n", hwblk);</div><div class='del'>-</div><div class='del'>-	if (d-&gt;driver) {</div><div class='del'>-		hwblk_enable(hwblk_info, hwblk);</div><div class='del'>-		ret = 0;</div><div class='del'>-</div><div class='del'>-		if (test_bit(PDEV_ARCHDATA_FLAG_SUSP, &amp;ad-&gt;flags)) {</div><div class='del'>-			if (d-&gt;driver-&gt;pm &amp;&amp; d-&gt;driver-&gt;pm-&gt;runtime_resume)</div><div class='del'>-				ret = d-&gt;driver-&gt;pm-&gt;runtime_resume(d);</div><div class='del'>-</div><div class='del'>-			if (!ret)</div><div class='del'>-				clear_bit(PDEV_ARCHDATA_FLAG_SUSP, &amp;ad-&gt;flags);</div><div class='del'>-			else</div><div class='del'>-				hwblk_disable(hwblk_info, hwblk);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_dbg(d, "__platform_pm_runtime_resume() [%d] - returns %d\n",</div><div class='del'>-		hwblk, ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __platform_pm_runtime_suspend(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct device *d = &amp;pdev-&gt;dev;</div><div class='del'>-	struct pdev_archdata *ad = &amp;pdev-&gt;archdata;</div><div class='del'>-	int hwblk = ad-&gt;hwblk_id;</div><div class='del'>-	int ret = -ENOSYS;</div><div class='del'>-</div><div class='del'>-	dev_dbg(d, "__platform_pm_runtime_suspend() [%d]\n", hwblk);</div><div class='del'>-</div><div class='del'>-	if (d-&gt;driver) {</div><div class='del'>-		BUG_ON(!test_bit(PDEV_ARCHDATA_FLAG_IDLE, &amp;ad-&gt;flags));</div><div class='del'>-		ret = 0;</div><div class='del'>-</div><div class='del'>-		if (d-&gt;driver-&gt;pm &amp;&amp; d-&gt;driver-&gt;pm-&gt;runtime_suspend) {</div><div class='del'>-			hwblk_enable(hwblk_info, hwblk);</div><div class='del'>-			ret = d-&gt;driver-&gt;pm-&gt;runtime_suspend(d);</div><div class='del'>-			hwblk_disable(hwblk_info, hwblk);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!ret) {</div><div class='del'>-			set_bit(PDEV_ARCHDATA_FLAG_SUSP, &amp;ad-&gt;flags);</div><div class='del'>-			platform_pm_runtime_not_idle(pdev);</div><div class='del'>-			hwblk_cnt_dec(hwblk_info, hwblk, HWBLK_CNT_IDLE);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_dbg(d, "__platform_pm_runtime_suspend() [%d] - returns %d\n",</div><div class='del'>-		hwblk, ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void platform_pm_runtime_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *pdev;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* go through the idle list and suspend one device at a time */</div><div class='del'>-	do {</div><div class='del'>-		spin_lock_irqsave(&amp;hwblk_lock, flags);</div><div class='del'>-		if (list_empty(&amp;hwblk_idle_list))</div><div class='del'>-			pdev = NULL;</div><div class='del'>-		else</div><div class='del'>-			pdev = list_first_entry(&amp;hwblk_idle_list,</div><div class='del'>-						struct platform_device,</div><div class='del'>-						archdata.entry);</div><div class='del'>-		spin_unlock_irqrestore(&amp;hwblk_lock, flags);</div><div class='del'>-</div><div class='del'>-		if (pdev) {</div><div class='del'>-			mutex_lock(&amp;pdev-&gt;archdata.mutex);</div><div class='del'>-			ret = __platform_pm_runtime_suspend(pdev);</div><div class='del'>-</div><div class='del'>-			/* at this point the platform device may be:</div><div class='del'>-			 * suspended: ret = 0, FLAG_SUSP set, clock stopped</div><div class='del'>-			 * failed: ret &lt; 0, FLAG_IDLE set, clock stopped</div><div class='del'>-			 */</div><div class='del'>-			mutex_unlock(&amp;pdev-&gt;archdata.mutex);</div><div class='del'>-		} else {</div><div class='del'>-			ret = -ENODEV;</div><div class='del'>-		}</div><div class='del'>-	} while (!ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this function gets called from cpuidle context when all devices in the</div><div class='del'>- * main power domain are unused but some are counted as idle, ie the hwblk</div><div class='del'>- * counter values are (HWBLK_CNT_USAGE == 0) &amp;&amp; (HWBLK_CNT_IDLE != 0)</div><div class='del'>- */</div><div class='del'>-void platform_pm_runtime_suspend_idle(void)</div><div class='del'>-{</div><div class='del'>-	queue_work(pm_wq, &amp;hwblk_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int default_platform_runtime_suspend(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct pdev_archdata *ad = &amp;pdev-&gt;archdata;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int hwblk = ad-&gt;hwblk_id;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	dev_dbg(dev, "%s() [%d]\n", __func__, hwblk);</div><div class='del'>-</div><div class='del'>-	/* ignore off-chip platform devices */</div><div class='del'>-	if (!hwblk)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* interrupt context not allowed */</div><div class='del'>-	might_sleep();</div><div class='del'>-</div><div class='del'>-	/* catch misconfigured drivers not starting with resume */</div><div class='del'>-	if (test_bit(PDEV_ARCHDATA_FLAG_INIT, &amp;ad-&gt;flags)) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* serialize */</div><div class='del'>-	mutex_lock(&amp;ad-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	/* disable clock */</div><div class='del'>-	hwblk_disable(hwblk_info, hwblk);</div><div class='del'>-</div><div class='del'>-	/* put device on idle list */</div><div class='del'>-	spin_lock_irqsave(&amp;hwblk_lock, flags);</div><div class='del'>-	list_add_tail(&amp;ad-&gt;entry, &amp;hwblk_idle_list);</div><div class='del'>-	__set_bit(PDEV_ARCHDATA_FLAG_IDLE, &amp;ad-&gt;flags);</div><div class='del'>-	spin_unlock_irqrestore(&amp;hwblk_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* increase idle count */</div><div class='del'>-	hwblk_cnt_inc(hwblk_info, hwblk, HWBLK_CNT_IDLE);</div><div class='del'>-</div><div class='del'>-	/* at this point the platform device is:</div><div class='del'>-	 * idle: ret = 0, FLAG_IDLE set, clock stopped</div><div class='del'>-	 */</div><div class='del'>-	mutex_unlock(&amp;ad-&gt;mutex);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	dev_dbg(dev, "%s() [%d] returns %d\n",</div><div class='del'>-		 __func__, hwblk, ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int default_platform_runtime_resume(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct pdev_archdata *ad = &amp;pdev-&gt;archdata;</div><div class='del'>-	int hwblk = ad-&gt;hwblk_id;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	dev_dbg(dev, "%s() [%d]\n", __func__, hwblk);</div><div class='del'>-</div><div class='del'>-	/* ignore off-chip platform devices */</div><div class='del'>-	if (!hwblk)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* interrupt context not allowed */</div><div class='del'>-	might_sleep();</div><div class='del'>-</div><div class='del'>-	/* serialize */</div><div class='del'>-	mutex_lock(&amp;ad-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	/* make sure device is removed from idle list */</div><div class='del'>-	platform_pm_runtime_not_idle(pdev);</div><div class='del'>-</div><div class='del'>-	/* decrease idle count */</div><div class='del'>-	if (!test_bit(PDEV_ARCHDATA_FLAG_INIT, &amp;pdev-&gt;archdata.flags) &amp;&amp;</div><div class='del'>-	    !test_bit(PDEV_ARCHDATA_FLAG_SUSP, &amp;pdev-&gt;archdata.flags))</div><div class='del'>-		hwblk_cnt_dec(hwblk_info, hwblk, HWBLK_CNT_IDLE);</div><div class='del'>-</div><div class='del'>-	/* resume the device if needed */</div><div class='del'>-	ret = __platform_pm_runtime_resume(pdev);</div><div class='del'>-</div><div class='del'>-	/* the driver has been initialized now, so clear the init flag */</div><div class='del'>-	clear_bit(PDEV_ARCHDATA_FLAG_INIT, &amp;pdev-&gt;archdata.flags);</div><div class='del'>-</div><div class='del'>-	/* at this point the platform device may be:</div><div class='del'>-	 * resumed: ret = 0, flags = 0, clock started</div><div class='del'>-	 * failed: ret &lt; 0, FLAG_SUSP set, clock stopped</div><div class='del'>-	 */</div><div class='del'>-	mutex_unlock(&amp;ad-&gt;mutex);</div><div class='del'>-out:</div><div class='del'>-	dev_dbg(dev, "%s() [%d] returns %d\n",</div><div class='del'>-		__func__, hwblk, ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int default_platform_runtime_idle(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	int hwblk = pdev-&gt;archdata.hwblk_id;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	dev_dbg(dev, "%s() [%d]\n", __func__, hwblk);</div><div class='del'>-</div><div class='del'>-	/* ignore off-chip platform devices */</div><div class='del'>-	if (!hwblk)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* interrupt context not allowed, use pm_runtime_put()! */</div><div class='del'>-	might_sleep();</div><div class='del'>-</div><div class='del'>-	/* suspend synchronously to disable clocks immediately */</div><div class='del'>-	ret = pm_runtime_suspend(dev);</div><div class='del'>-out:</div><div class='del'>-	dev_dbg(dev, "%s() [%d] done!\n", __func__, hwblk);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dev_pm_domain default_pm_domain = {</div><div class='del'>-	.ops = {</div><div class='del'>-		.runtime_suspend = default_platform_runtime_suspend,</div><div class='del'>-		.runtime_resume = default_platform_runtime_resume,</div><div class='del'>-		.runtime_idle = default_platform_runtime_idle,</div><div class='del'>-		USE_PLATFORM_PM_SLEEP_OPS</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int platform_bus_notify(struct notifier_block *nb,</div><div class='del'>-			       unsigned long action, void *data)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = data;</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	int hwblk = pdev-&gt;archdata.hwblk_id;</div><div class='del'>-</div><div class='del'>-	/* ignore off-chip platform devices */</div><div class='del'>-	if (!hwblk)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case BUS_NOTIFY_ADD_DEVICE:</div><div class='del'>-		INIT_LIST_HEAD(&amp;pdev-&gt;archdata.entry);</div><div class='del'>-		mutex_init(&amp;pdev-&gt;archdata.mutex);</div><div class='del'>-		/* platform devices without drivers should be disabled */</div><div class='del'>-		hwblk_enable(hwblk_info, hwblk);</div><div class='del'>-		hwblk_disable(hwblk_info, hwblk);</div><div class='del'>-		/* make sure driver re-inits itself once */</div><div class='del'>-		__set_bit(PDEV_ARCHDATA_FLAG_INIT, &amp;pdev-&gt;archdata.flags);</div><div class='del'>-		dev-&gt;pm_domain = &amp;default_pm_domain;</div><div class='del'>-		break;</div><div class='del'>-	/* TODO: add BUS_NOTIFY_BIND_DRIVER and increase idle count */</div><div class='del'>-	case BUS_NOTIFY_BOUND_DRIVER:</div><div class='del'>-		/* keep track of number of devices in use per hwblk */</div><div class='del'>-		hwblk_cnt_inc(hwblk_info, hwblk, HWBLK_CNT_DEVICES);</div><div class='del'>-		break;</div><div class='del'>-	case BUS_NOTIFY_UNBOUND_DRIVER:</div><div class='del'>-		/* keep track of number of devices in use per hwblk */</div><div class='del'>-		hwblk_cnt_dec(hwblk_info, hwblk, HWBLK_CNT_DEVICES);</div><div class='del'>-		/* make sure driver re-inits itself once */</div><div class='del'>-		__set_bit(PDEV_ARCHDATA_FLAG_INIT, &amp;pdev-&gt;archdata.flags);</div><div class='del'>-		break;</div><div class='del'>-	case BUS_NOTIFY_DEL_DEVICE:</div><div class='del'>-		dev-&gt;pm_domain = NULL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block platform_bus_notifier = {</div><div class='del'>-	.notifier_call = platform_bus_notify</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init sh_pm_runtime_init(void)</div><div class='del'>-{</div><div class='del'>-	INIT_WORK(&amp;hwblk_work, platform_pm_runtime_work);</div><div class='del'>-</div><div class='del'>-	bus_register_notifier(&amp;platform_bus_type, &amp;platform_bus_notifier);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-core_initcall(sh_pm_runtime_init);</div><div class='head'>diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S<br/>index 2b15ae60c3a0..f67601cb3f1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/entry-common.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/entry-common.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/entry-common.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/entry-common.S</a></div><div class='hunk'>@@ -145,6 +145,7 @@ work_notifysig:</div><div class='ctx'> 	 mov	r15, r4</div><div class='ctx'> 	mov	r12, r5		! set arg1(save_r0)</div><div class='ctx'> 	mov	r0, r6</div><div class='add'>+	sti</div><div class='ctx'> 	mov.l	2f, r1</div><div class='ctx'> 	mov.l	3f, r0</div><div class='ctx'> 	jmp	@r1</div><div class='head'>diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c<br/>index aaf6d59c2012..7ec665178125 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/process_32.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/process_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/process_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/process_32.c</a></div><div class='hunk'>@@ -70,7 +70,7 @@ void show_regs(struct pt_regs * regs)</div><div class='ctx'> /*</div><div class='ctx'>  * Create a kernel thread</div><div class='ctx'>  */</div><div class='del'>-ATTRIB_NORET void kernel_thread_helper(void *arg, int (*fn)(void *))</div><div class='add'>+__noreturn void kernel_thread_helper(void *arg, int (*fn)(void *))</div><div class='ctx'> {</div><div class='ctx'> 	do_exit(fn(arg));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c<br/>index 210c1cabcb7f..cbd4e4bb9fc5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/process_64.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/process_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/process_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/process_64.c</a></div><div class='hunk'>@@ -285,7 +285,7 @@ void show_regs(struct pt_regs *regs)</div><div class='ctx'> /*</div><div class='ctx'>  * Create a kernel thread</div><div class='ctx'>  */</div><div class='del'>-ATTRIB_NORET void kernel_thread_helper(void *arg, int (*fn)(void *))</div><div class='add'>+__noreturn void kernel_thread_helper(void *arg, int (*fn)(void *))</div><div class='ctx'> {</div><div class='ctx'> 	do_exit(fn(arg));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c<br/>index 92b3c276339a..a3e651563763 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/ptrace_32.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/ptrace_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/ptrace_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/ptrace_32.c</a></div><div class='hunk'>@@ -518,10 +518,9 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)</div><div class='ctx'> 	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))</div><div class='ctx'> 		trace_sys_enter(regs, regs-&gt;regs[0]);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context))</div><div class='del'>-		audit_syscall_entry(audit_arch(), regs-&gt;regs[3],</div><div class='del'>-				    regs-&gt;regs[4], regs-&gt;regs[5],</div><div class='del'>-				    regs-&gt;regs[6], regs-&gt;regs[7]);</div><div class='add'>+	audit_syscall_entry(audit_arch(), regs-&gt;regs[3],</div><div class='add'>+			    regs-&gt;regs[4], regs-&gt;regs[5],</div><div class='add'>+			    regs-&gt;regs[6], regs-&gt;regs[7]);</div><div class='ctx'> </div><div class='ctx'> 	return ret ?: regs-&gt;regs[0];</div><div class='ctx'> }</div><div class='hunk'>@@ -530,9 +529,7 @@ asmlinkage void do_syscall_trace_leave(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	int step;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context))</div><div class='del'>-		audit_syscall_exit(AUDITSC_RESULT(regs-&gt;regs[0]),</div><div class='del'>-				   regs-&gt;regs[0]);</div><div class='add'>+	audit_syscall_exit(regs);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))</div><div class='ctx'> 		trace_sys_exit(regs, regs-&gt;regs[0]);</div><div class='head'>diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c<br/>index c8f97649f354..3d0080b5c976 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/ptrace_64.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/ptrace_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/ptrace_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/ptrace_64.c</a></div><div class='hunk'>@@ -536,10 +536,9 @@ asmlinkage long long do_syscall_trace_enter(struct pt_regs *regs)</div><div class='ctx'> 	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))</div><div class='ctx'> 		trace_sys_enter(regs, regs-&gt;regs[9]);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context))</div><div class='del'>-		audit_syscall_entry(audit_arch(), regs-&gt;regs[1],</div><div class='del'>-				    regs-&gt;regs[2], regs-&gt;regs[3],</div><div class='del'>-				    regs-&gt;regs[4], regs-&gt;regs[5]);</div><div class='add'>+	audit_syscall_entry(audit_arch(), regs-&gt;regs[1],</div><div class='add'>+			    regs-&gt;regs[2], regs-&gt;regs[3],</div><div class='add'>+			    regs-&gt;regs[4], regs-&gt;regs[5]);</div><div class='ctx'> </div><div class='ctx'> 	return ret ?: regs-&gt;regs[9];</div><div class='ctx'> }</div><div class='hunk'>@@ -548,9 +547,7 @@ asmlinkage void do_syscall_trace_leave(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	int step;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context))</div><div class='del'>-		audit_syscall_exit(AUDITSC_RESULT(regs-&gt;regs[9]),</div><div class='del'>-				   regs-&gt;regs[9]);</div><div class='add'>+	audit_syscall_exit(regs);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))</div><div class='ctx'> 		trace_sys_exit(regs, regs-&gt;regs[9]);</div><div class='head'>diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c<br/>index 579cd2ca358d..a7a55ed43a59 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/signal_32.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/signal_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/signal_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/signal_32.c</a></div><div class='hunk'>@@ -588,9 +588,6 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0)</div><div class='ctx'> 	if (!user_mode(regs))</div><div class='ctx'> 		return;</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'> 	if (current_thread_info()-&gt;status &amp; TS_RESTORE_SIGMASK)</div><div class='ctx'> 		oldset = &amp;current-&gt;saved_sigmask;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -618,7 +615,6 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-no_signal:</div><div class='ctx'> 	/* Did we come from a system call? */</div><div class='ctx'> 	if (regs-&gt;tra &gt;= 0) {</div><div class='ctx'> 		/* Restart the system call - no handlers present */</div><div class='head'>diff --git a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c<br/>index 5a9f1f10ebf4..6b5603fe274b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/signal_64.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/signal_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/signal_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/signal_64.c</a></div><div class='hunk'>@@ -98,9 +98,6 @@ static int do_signal(struct pt_regs *regs, sigset_t *oldset)</div><div class='ctx'> 	if (!user_mode(regs))</div><div class='ctx'> 		return 1;</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'> 	if (current_thread_info()-&gt;status &amp; TS_RESTORE_SIGMASK)</div><div class='ctx'> 		oldset = &amp;current-&gt;saved_sigmask;</div><div class='ctx'> 	else if (!oldset)</div><div class='hunk'>@@ -125,7 +122,6 @@ static int do_signal(struct pt_regs *regs, sigset_t *oldset)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-no_signal:</div><div class='ctx'> 	/* Did we come from a system call? */</div><div class='ctx'> 	if (regs-&gt;syscall_nr &gt;= 0) {</div><div class='ctx'> 		/* Restart the system call - no handlers present */</div><div class='head'>diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c<br/>index 8a0072de2bcc..552c8fcf9416 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/kernel/time.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='ctx'> #include &lt;asm/clock.h&gt;</div><div class='del'>-#include &lt;asm/hwblk.h&gt;</div><div class='ctx'> #include &lt;asm/rtc.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Dummy RTC ops */</div><div class='hunk'>@@ -110,7 +109,6 @@ void __init time_init(void)</div><div class='ctx'> 	if (board_time_init)</div><div class='ctx'> 		board_time_init();</div><div class='ctx'> </div><div class='del'>-	hwblk_init();</div><div class='ctx'> 	clk_init();</div><div class='ctx'> </div><div class='ctx'> 	late_time_init = sh_late_time_init;</div><div class='head'>diff --git a/arch/sh/mm/cache-sh2a.c b/arch/sh/mm/cache-sh2a.c<br/>index 1f51225426a2..ae08cbbfa569 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/mm/cache-sh2a.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sh/mm/cache-sh2a.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/mm/cache-sh2a.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sh/mm/cache-sh2a.c</a></div><div class='hunk'>@@ -15,35 +15,78 @@</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The maximum number of pages we support up to when doing ranged dcache</div><div class='add'>+ * flushing. Anything exceeding this will simply flush the dcache in its</div><div class='add'>+ * entirety.</div><div class='add'>+ */</div><div class='add'>+#define MAX_OCACHE_PAGES	32</div><div class='add'>+#define MAX_ICACHE_PAGES	32</div><div class='add'>+</div><div class='add'>+static void sh2a_flush_oc_line(unsigned long v, int way)</div><div class='add'>+{</div><div class='add'>+	unsigned long addr = (v &amp; 0x000007f0) | (way &lt;&lt; 11);</div><div class='add'>+	unsigned long data;</div><div class='add'>+</div><div class='add'>+	data = __raw_readl(CACHE_OC_ADDRESS_ARRAY | addr);</div><div class='add'>+	if ((data &amp; CACHE_PHYSADDR_MASK) == (v &amp; CACHE_PHYSADDR_MASK)) {</div><div class='add'>+		data &amp;= ~SH_CACHE_UPDATED;</div><div class='add'>+		__raw_writel(data, CACHE_OC_ADDRESS_ARRAY | addr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sh2a_invalidate_line(unsigned long cache_addr, unsigned long v)</div><div class='add'>+{</div><div class='add'>+	/* Set associative bit to hit all ways */</div><div class='add'>+	unsigned long addr = (v &amp; 0x000007f0) | SH_CACHE_ASSOC;</div><div class='add'>+	__raw_writel((addr &amp; CACHE_PHYSADDR_MASK), cache_addr | addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write back the dirty D-caches, but not invalidate them.</div><div class='add'>+ */</div><div class='ctx'> static void sh2a__flush_wback_region(void *start, int size)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_CACHE_WRITEBACK</div><div class='ctx'> 	unsigned long v;</div><div class='ctx'> 	unsigned long begin, end;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	int nr_ways;</div><div class='ctx'> </div><div class='ctx'> 	begin = (unsigned long)start &amp; ~(L1_CACHE_BYTES-1);</div><div class='ctx'> 	end = ((unsigned long)start + size + L1_CACHE_BYTES-1)</div><div class='ctx'> 		&amp; ~(L1_CACHE_BYTES-1);</div><div class='add'>+	nr_ways = current_cpu_data.dcache.ways;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	jump_to_uncached();</div><div class='ctx'> </div><div class='del'>-	for (v = begin; v &lt; end; v+=L1_CACHE_BYTES) {</div><div class='del'>-		unsigned long addr = CACHE_OC_ADDRESS_ARRAY | (v &amp; 0x000007f0);</div><div class='add'>+	/* If there are too many pages then flush the entire cache */</div><div class='add'>+	if (((end - begin) &gt;&gt; PAGE_SHIFT) &gt;= MAX_OCACHE_PAGES) {</div><div class='add'>+		begin = CACHE_OC_ADDRESS_ARRAY;</div><div class='add'>+		end = begin + (nr_ways * current_cpu_data.dcache.way_size);</div><div class='add'>+</div><div class='add'>+		for (v = begin; v &lt; end; v += L1_CACHE_BYTES) {</div><div class='add'>+			unsigned long data = __raw_readl(v);</div><div class='add'>+			if (data &amp; SH_CACHE_UPDATED)</div><div class='add'>+				__raw_writel(data &amp; ~SH_CACHE_UPDATED, v);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='ctx'> 		int way;</div><div class='del'>-		for (way = 0; way &lt; 4; way++) {</div><div class='del'>-			unsigned long data =  __raw_readl(addr | (way &lt;&lt; 11));</div><div class='del'>-			if ((data &amp; CACHE_PHYSADDR_MASK) == (v &amp; CACHE_PHYSADDR_MASK)) {</div><div class='del'>-				data &amp;= ~SH_CACHE_UPDATED;</div><div class='del'>-				__raw_writel(data, addr | (way &lt;&lt; 11));</div><div class='del'>-			}</div><div class='add'>+		for (way = 0; way &lt; nr_ways; way++) {</div><div class='add'>+			for (v = begin; v &lt; end; v += L1_CACHE_BYTES)</div><div class='add'>+				sh2a_flush_oc_line(v, way);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	back_to_cached();</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Write back the dirty D-caches and invalidate them.</div><div class='add'>+ */</div><div class='ctx'> static void sh2a__flush_purge_region(void *start, int size)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long v;</div><div class='hunk'>@@ -58,13 +101,22 @@ static void sh2a__flush_purge_region(void *start, int size)</div><div class='ctx'> 	jump_to_uncached();</div><div class='ctx'> </div><div class='ctx'> 	for (v = begin; v &lt; end; v+=L1_CACHE_BYTES) {</div><div class='del'>-		__raw_writel((v &amp; CACHE_PHYSADDR_MASK),</div><div class='del'>-			  CACHE_OC_ADDRESS_ARRAY | (v &amp; 0x000007f0) | 0x00000008);</div><div class='add'>+#ifdef CONFIG_CACHE_WRITEBACK</div><div class='add'>+		int way;</div><div class='add'>+		int nr_ways = current_cpu_data.dcache.ways;</div><div class='add'>+		for (way = 0; way &lt; nr_ways; way++)</div><div class='add'>+			sh2a_flush_oc_line(v, way);</div><div class='add'>+#endif</div><div class='add'>+		sh2a_invalidate_line(CACHE_OC_ADDRESS_ARRAY, v);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	back_to_cached();</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Invalidate the D-caches, but no write back please</div><div class='add'>+ */</div><div class='ctx'> static void sh2a__flush_invalidate_region(void *start, int size)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long v;</div><div class='hunk'>@@ -74,29 +126,25 @@ static void sh2a__flush_invalidate_region(void *start, int size)</div><div class='ctx'> 	begin = (unsigned long)start &amp; ~(L1_CACHE_BYTES-1);</div><div class='ctx'> 	end = ((unsigned long)start + size + L1_CACHE_BYTES-1)</div><div class='ctx'> 		&amp; ~(L1_CACHE_BYTES-1);</div><div class='add'>+</div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	jump_to_uncached();</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CACHE_WRITEBACK</div><div class='del'>-	__raw_writel(__raw_readl(CCR) | CCR_OCACHE_INVALIDATE, CCR);</div><div class='del'>-	/* I-cache invalidate */</div><div class='del'>-	for (v = begin; v &lt; end; v+=L1_CACHE_BYTES) {</div><div class='del'>-		__raw_writel((v &amp; CACHE_PHYSADDR_MASK),</div><div class='del'>-			  CACHE_IC_ADDRESS_ARRAY | (v &amp; 0x000007f0) | 0x00000008);</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-	for (v = begin; v &lt; end; v+=L1_CACHE_BYTES) {</div><div class='del'>-		__raw_writel((v &amp; CACHE_PHYSADDR_MASK),</div><div class='del'>-			  CACHE_IC_ADDRESS_ARRAY | (v &amp; 0x000007f0) | 0x00000008);</div><div class='del'>-		__raw_writel((v &amp; CACHE_PHYSADDR_MASK),</div><div class='del'>-			  CACHE_OC_ADDRESS_ARRAY | (v &amp; 0x000007f0) | 0x00000008);</div><div class='add'>+	/* If there are too many pages then just blow the cache */</div><div class='add'>+	if (((end - begin) &gt;&gt; PAGE_SHIFT) &gt;= MAX_OCACHE_PAGES) {</div><div class='add'>+		__raw_writel(__raw_readl(CCR) | CCR_OCACHE_INVALIDATE, CCR);</div><div class='add'>+	} else {</div><div class='add'>+		for (v = begin; v &lt; end; v += L1_CACHE_BYTES)</div><div class='add'>+			sh2a_invalidate_line(CACHE_OC_ADDRESS_ARRAY, v);</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	back_to_cached();</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* WBack O-Cache and flush I-Cache */</div><div class='add'>+/*</div><div class='add'>+ * Write back the range of D-cache, and purge the I-cache.</div><div class='add'>+ */</div><div class='ctx'> static void sh2a_flush_icache_range(void *args)</div><div class='ctx'> {</div><div class='ctx'> 	struct flusher_data *data = args;</div><div class='hunk'>@@ -107,23 +155,20 @@ static void sh2a_flush_icache_range(void *args)</div><div class='ctx'> 	start = data-&gt;addr1 &amp; ~(L1_CACHE_BYTES-1);</div><div class='ctx'> 	end = (data-&gt;addr2 + L1_CACHE_BYTES-1) &amp; ~(L1_CACHE_BYTES-1);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CACHE_WRITEBACK</div><div class='add'>+	sh2a__flush_wback_region((void *)start, end-start);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	jump_to_uncached();</div><div class='ctx'> </div><div class='del'>-	for (v = start; v &lt; end; v+=L1_CACHE_BYTES) {</div><div class='del'>-		unsigned long addr = (v &amp; 0x000007f0);</div><div class='del'>-		int way;</div><div class='del'>-		/* O-Cache writeback */</div><div class='del'>-		for (way = 0; way &lt; 4; way++) {</div><div class='del'>-			unsigned long data =  __raw_readl(CACHE_OC_ADDRESS_ARRAY | addr | (way &lt;&lt; 11));</div><div class='del'>-			if ((data &amp; CACHE_PHYSADDR_MASK) == (v &amp; CACHE_PHYSADDR_MASK)) {</div><div class='del'>-				data &amp;= ~SH_CACHE_UPDATED;</div><div class='del'>-				__raw_writel(data, CACHE_OC_ADDRESS_ARRAY | addr | (way &lt;&lt; 11));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		/* I-Cache invalidate */</div><div class='del'>-		__raw_writel(addr,</div><div class='del'>-			  CACHE_IC_ADDRESS_ARRAY | addr | 0x00000008);</div><div class='add'>+	/* I-Cache invalidate */</div><div class='add'>+	/* If there are too many pages then just blow the cache */</div><div class='add'>+	if (((end - start) &gt;&gt; PAGE_SHIFT) &gt;= MAX_ICACHE_PAGES) {</div><div class='add'>+		__raw_writel(__raw_readl(CCR) | CCR_ICACHE_INVALIDATE, CCR);</div><div class='add'>+	} else {</div><div class='add'>+		for (v = start; v &lt; end; v += L1_CACHE_BYTES)</div><div class='add'>+			sh2a_invalidate_line(CACHE_IC_ADDRESS_ARRAY, v);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	back_to_cached();</div><div class='head'>diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig<br/>index 70ae9d81870e..96657992a72e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/Kconfig</a></div><div class='hunk'>@@ -28,9 +28,11 @@ config SPARC</div><div class='ctx'> 	select HAVE_GENERIC_HARDIRQS</div><div class='ctx'> 	select GENERIC_IRQ_SHOW</div><div class='ctx'> 	select USE_GENERIC_SMP_HELPERS if SMP</div><div class='add'>+	select GENERIC_PCI_IOMAP</div><div class='ctx'> </div><div class='ctx'> config SPARC32</div><div class='ctx'> 	def_bool !64BIT</div><div class='add'>+	select GENERIC_ATOMIC64</div><div class='ctx'> </div><div class='ctx'> config SPARC64</div><div class='ctx'> 	def_bool 64BIT</div><div class='hunk'>@@ -383,9 +385,7 @@ config SCHED_MC</div><div class='ctx'> 	  making when dealing with multi-core CPU chips at a cost of slightly</div><div class='ctx'> 	  increased overhead in some places. If unsure say N here.</div><div class='ctx'> </div><div class='del'>-if SPARC64</div><div class='ctx'> source "kernel/Kconfig.preempt"</div><div class='del'>-endif</div><div class='ctx'> </div><div class='ctx'> config CMDLINE_BOOL</div><div class='ctx'> 	bool "Default bootloader kernel arguments"</div><div class='head'>diff --git a/arch/sparc/include/asm/atomic_32.h b/arch/sparc/include/asm/atomic_32.h<br/>index 5c3c8b69884d..9dd0a769fa18 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/atomic_32.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/atomic_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/atomic_32.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/include/asm/atomic_32.h</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef __KERNEL__</div><div class='add'>+#include &lt;asm-generic/atomic64.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -52,112 +52,10 @@ extern void atomic_set(atomic_t *, int);</div><div class='ctx'> #define atomic_dec_and_test(v) (atomic_dec_return(v) == 0)</div><div class='ctx'> #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* This is the old 24-bit implementation.  It's still used internally</div><div class='del'>- * by some sparc-specific code, notably the semaphore implementation.</div><div class='del'>- */</div><div class='del'>-typedef struct { volatile int counter; } atomic24_t;</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_SMP</div><div class='del'>-</div><div class='del'>-#define ATOMIC24_INIT(i)  { (i) }</div><div class='del'>-#define atomic24_read(v)          ((v)-&gt;counter)</div><div class='del'>-#define atomic24_set(v, i)        (((v)-&gt;counter) = i)</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-/* We do the bulk of the actual work out of line in two common</div><div class='del'>- * routines in assembler, see arch/sparc/lib/atomic.S for the</div><div class='del'>- * "fun" details.</div><div class='del'>- *</div><div class='del'>- * For SMP the trick is you embed the spin lock byte within</div><div class='del'>- * the word, use the low byte so signedness is easily retained</div><div class='del'>- * via a quick arithmetic shift.  It looks like this:</div><div class='del'>- *</div><div class='del'>- *	----------------------------------------</div><div class='del'>- *	| signed 24-bit counter value |  lock  |  atomic_t</div><div class='del'>- *	----------------------------------------</div><div class='del'>- *	 31                          8 7      0</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define ATOMIC24_INIT(i)	{ ((i) &lt;&lt; 8) }</div><div class='del'>-</div><div class='del'>-static inline int atomic24_read(const atomic24_t *v)</div><div class='del'>-{</div><div class='del'>-	int ret = v-&gt;counter;</div><div class='del'>-</div><div class='del'>-	while(ret &amp; 0xff)</div><div class='del'>-		ret = v-&gt;counter;</div><div class='del'>-</div><div class='del'>-	return ret &gt;&gt; 8;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define atomic24_set(v, i)	(((v)-&gt;counter) = ((i) &lt;&lt; 8))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline int __atomic24_add(int i, atomic24_t *v)</div><div class='del'>-{</div><div class='del'>-	register volatile int *ptr asm("g1");</div><div class='del'>-	register int increment asm("g2");</div><div class='del'>-	register int tmp1 asm("g3");</div><div class='del'>-	register int tmp2 asm("g4");</div><div class='del'>-	register int tmp3 asm("g7");</div><div class='del'>-</div><div class='del'>-	ptr = &amp;v-&gt;counter;</div><div class='del'>-	increment = i;</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__(</div><div class='del'>-	"mov	%%o7, %%g4\n\t"</div><div class='del'>-	"call	___atomic24_add\n\t"</div><div class='del'>-	" add	%%o7, 8, %%o7\n"</div><div class='del'>-	: "=&amp;r" (increment), "=r" (tmp1), "=r" (tmp2), "=r" (tmp3)</div><div class='del'>-	: "0" (increment), "r" (ptr)</div><div class='del'>-	: "memory", "cc");</div><div class='del'>-</div><div class='del'>-	return increment;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int __atomic24_sub(int i, atomic24_t *v)</div><div class='del'>-{</div><div class='del'>-	register volatile int *ptr asm("g1");</div><div class='del'>-	register int increment asm("g2");</div><div class='del'>-	register int tmp1 asm("g3");</div><div class='del'>-	register int tmp2 asm("g4");</div><div class='del'>-	register int tmp3 asm("g7");</div><div class='del'>-</div><div class='del'>-	ptr = &amp;v-&gt;counter;</div><div class='del'>-	increment = i;</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__(</div><div class='del'>-	"mov	%%o7, %%g4\n\t"</div><div class='del'>-	"call	___atomic24_sub\n\t"</div><div class='del'>-	" add	%%o7, 8, %%o7\n"</div><div class='del'>-	: "=&amp;r" (increment), "=r" (tmp1), "=r" (tmp2), "=r" (tmp3)</div><div class='del'>-	: "0" (increment), "r" (ptr)</div><div class='del'>-	: "memory", "cc");</div><div class='del'>-</div><div class='del'>-	return increment;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define atomic24_add(i, v) ((void)__atomic24_add((i), (v)))</div><div class='del'>-#define atomic24_sub(i, v) ((void)__atomic24_sub((i), (v)))</div><div class='del'>-</div><div class='del'>-#define atomic24_dec_return(v) __atomic24_sub(1, (v))</div><div class='del'>-#define atomic24_inc_return(v) __atomic24_add(1, (v))</div><div class='del'>-</div><div class='del'>-#define atomic24_sub_and_test(i, v) (__atomic24_sub((i), (v)) == 0)</div><div class='del'>-#define atomic24_dec_and_test(v) (__atomic24_sub(1, (v)) == 0)</div><div class='del'>-</div><div class='del'>-#define atomic24_inc(v) ((void)__atomic24_add(1, (v)))</div><div class='del'>-#define atomic24_dec(v) ((void)__atomic24_sub(1, (v)))</div><div class='del'>-</div><div class='del'>-#define atomic24_add_negative(i, v) (__atomic24_add((i), (v)) &lt; 0)</div><div class='del'>-</div><div class='ctx'> /* Atomic operations are already serializing */</div><div class='ctx'> #define smp_mb__before_atomic_dec()	barrier()</div><div class='ctx'> #define smp_mb__after_atomic_dec()	barrier()</div><div class='ctx'> #define smp_mb__before_atomic_inc()	barrier()</div><div class='ctx'> #define smp_mb__after_atomic_inc()	barrier()</div><div class='ctx'> </div><div class='del'>-#endif /* !(__KERNEL__) */</div><div class='del'>-</div><div class='ctx'> #endif /* !(__ARCH_SPARC_ATOMIC__) */</div><div class='head'>diff --git a/arch/sparc/include/asm/io_32.h b/arch/sparc/include/asm/io_32.h<br/>index c2ced21c9dc1..2006e5d359df 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/io_32.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/io_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/io_32.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/include/asm/io_32.h</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/page.h&gt;      /* IO address mapping routines need this */</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm-generic/pci_iomap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define page_to_phys(page)	(page_to_pfn(page) &lt;&lt; PAGE_SHIFT)</div><div class='ctx'> </div><div class='hunk'>@@ -324,7 +325,6 @@ extern void ioport_unmap(void __iomem *);</div><div class='ctx'> </div><div class='ctx'> /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */</div><div class='ctx'> struct pci_dev;</div><div class='del'>-extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);</div><div class='ctx'> extern void pci_iounmap(struct pci_dev *dev, void __iomem *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/sparc/include/asm/io_64.h b/arch/sparc/include/asm/io_64.h<br/>index 9c8965415f0a..9481e5a6fa90 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/io_64.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/io_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/io_64.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/include/asm/io_64.h</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;asm/page.h&gt;      /* IO address mapping routines need this */</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/asi.h&gt;</div><div class='add'>+#include &lt;asm-generic/pci_iomap.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* PC crapola... */</div><div class='ctx'> #define __SLOW_DOWN_IO	do { } while (0)</div><div class='hunk'>@@ -514,7 +515,6 @@ extern void ioport_unmap(void __iomem *);</div><div class='ctx'> </div><div class='ctx'> /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */</div><div class='ctx'> struct pci_dev;</div><div class='del'>-extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);</div><div class='ctx'> extern void pci_iounmap(struct pci_dev *dev, void __iomem *);</div><div class='ctx'> </div><div class='ctx'> static inline int sbus_can_dma_64bit(void)</div><div class='head'>diff --git a/arch/sparc/include/asm/page_32.h b/arch/sparc/include/asm/page_32.h<br/>index 156707b0f18d..bb5c2ac4055d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/page_32.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/page_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/page_32.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/include/asm/page_32.h</a></div><div class='hunk'>@@ -8,14 +8,10 @@</div><div class='ctx'> #ifndef _SPARC_PAGE_H</div><div class='ctx'> #define _SPARC_PAGE_H</div><div class='ctx'> </div><div class='del'>-#define PAGE_SHIFT   12</div><div class='add'>+#include &lt;linux/const.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-/* I have my suspicions... -DaveM */</div><div class='del'>-#define PAGE_SIZE    (1UL &lt;&lt; PAGE_SHIFT)</div><div class='del'>-#else</div><div class='del'>-#define PAGE_SIZE    (1 &lt;&lt; PAGE_SHIFT)</div><div class='del'>-#endif</div><div class='add'>+#define PAGE_SHIFT   12</div><div class='add'>+#define PAGE_SIZE    (_AC(1, UL) &lt;&lt; PAGE_SHIFT)</div><div class='ctx'> #define PAGE_MASK    (~(PAGE_SIZE-1))</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/btfixup.h&gt;</div><div class='head'>diff --git a/arch/sparc/include/asm/pci_32.h b/arch/sparc/include/asm/pci_32.h<br/>index 02939abd356c..6de7f7bf956a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/pci_32.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/pci_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/pci_32.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/include/asm/pci_32.h</a></div><div class='hunk'>@@ -16,11 +16,6 @@</div><div class='ctx'> </div><div class='ctx'> #define PCI_IRQ_NONE		0xffffffff</div><div class='ctx'> </div><div class='del'>-static inline void pcibios_set_master(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	/* No special bus mastering setup handling */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void pcibios_penalize_isa_irq(int irq, int active)</div><div class='ctx'> {</div><div class='ctx'> 	/* We don't do dynamic PCI IRQ allocation */</div><div class='head'>diff --git a/arch/sparc/include/asm/pci_64.h b/arch/sparc/include/asm/pci_64.h<br/>index 2614d96141c9..755a4bb6bcd3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/pci_64.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/pci_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/pci_64.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/include/asm/pci_64.h</a></div><div class='hunk'>@@ -16,11 +16,6 @@</div><div class='ctx'> </div><div class='ctx'> #define PCI_IRQ_NONE		0xffffffff</div><div class='ctx'> </div><div class='del'>-static inline void pcibios_set_master(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	/* No special bus mastering setup handling */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void pcibios_penalize_isa_irq(int irq, int active)</div><div class='ctx'> {</div><div class='ctx'> 	/* We don't do dynamic PCI IRQ allocation */</div><div class='head'>diff --git a/arch/sparc/include/asm/pgtsun4.h b/arch/sparc/include/asm/pgtsun4.h<br/>deleted file mode 100644<br/>index 5a0d661fb82e..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/pgtsun4.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/pgtsun4.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,171 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * pgtsun4.h:  Sun4 specific pgtable.h defines and code.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)</div><div class='del'>- * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)</div><div class='del'>- */</div><div class='del'>-#ifndef _SPARC_PGTSUN4C_H</div><div class='del'>-#define _SPARC_PGTSUN4C_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm/contregs.h&gt;</div><div class='del'>-</div><div class='del'>-/* PMD_SHIFT determines the size of the area a second-level page table can map */</div><div class='del'>-#define SUN4C_PMD_SHIFT       23</div><div class='del'>-</div><div class='del'>-/* PGDIR_SHIFT determines what a third-level page table entry can map */</div><div class='del'>-#define SUN4C_PGDIR_SHIFT       23</div><div class='del'>-#define SUN4C_PGDIR_SIZE        (1UL &lt;&lt; SUN4C_PGDIR_SHIFT)</div><div class='del'>-#define SUN4C_PGDIR_MASK        (~(SUN4C_PGDIR_SIZE-1))</div><div class='del'>-#define SUN4C_PGDIR_ALIGN(addr) (((addr)+SUN4C_PGDIR_SIZE-1)&amp;SUN4C_PGDIR_MASK)</div><div class='del'>-</div><div class='del'>-/* To represent how the sun4c mmu really lays things out. */</div><div class='del'>-#define SUN4C_REAL_PGDIR_SHIFT       18</div><div class='del'>-#define SUN4C_REAL_PGDIR_SIZE        (1UL &lt;&lt; SUN4C_REAL_PGDIR_SHIFT)</div><div class='del'>-#define SUN4C_REAL_PGDIR_MASK        (~(SUN4C_REAL_PGDIR_SIZE-1))</div><div class='del'>-#define SUN4C_REAL_PGDIR_ALIGN(addr) (((addr)+SUN4C_REAL_PGDIR_SIZE-1)&amp;SUN4C_REAL_PGDIR_MASK)</div><div class='del'>-</div><div class='del'>-/* 19 bit PFN on sun4 */</div><div class='del'>-#define SUN4C_PFN_MASK 0x7ffff</div><div class='del'>- </div><div class='del'>-/* Don't increase these unless the structures in sun4c.c are fixed */</div><div class='del'>-#define SUN4C_MAX_SEGMAPS 256</div><div class='del'>-#define SUN4C_MAX_CONTEXTS 16</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * To be efficient, and not have to worry about allocating such</div><div class='del'>- * a huge pgd, we make the kernel sun4c tables each hold 1024</div><div class='del'>- * entries and the pgd similarly just like the i386 tables.</div><div class='del'>- */</div><div class='del'>-#define SUN4C_PTRS_PER_PTE    1024</div><div class='del'>-#define SUN4C_PTRS_PER_PMD    1</div><div class='del'>-#define SUN4C_PTRS_PER_PGD    1024</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Sparc SUN4C pte fields.</div><div class='del'>- */</div><div class='del'>-#define _SUN4C_PAGE_VALID        0x80000000</div><div class='del'>-#define _SUN4C_PAGE_SILENT_READ  0x80000000   /* synonym */</div><div class='del'>-#define _SUN4C_PAGE_DIRTY        0x40000000</div><div class='del'>-#define _SUN4C_PAGE_SILENT_WRITE 0x40000000   /* synonym */</div><div class='del'>-#define _SUN4C_PAGE_PRIV         0x20000000   /* privileged page */</div><div class='del'>-#define _SUN4C_PAGE_NOCACHE      0x10000000   /* non-cacheable page */</div><div class='del'>-#define _SUN4C_PAGE_PRESENT      0x08000000   /* implemented in software */</div><div class='del'>-#define _SUN4C_PAGE_IO           0x04000000   /* I/O page */</div><div class='del'>-#define _SUN4C_PAGE_FILE         0x02000000   /* implemented in software */</div><div class='del'>-#define _SUN4C_PAGE_READ         0x00800000   /* implemented in software */</div><div class='del'>-#define _SUN4C_PAGE_WRITE        0x00400000   /* implemented in software */</div><div class='del'>-#define _SUN4C_PAGE_ACCESSED     0x00200000   /* implemented in software */</div><div class='del'>-#define _SUN4C_PAGE_MODIFIED     0x00100000   /* implemented in software */</div><div class='del'>-</div><div class='del'>-#define _SUN4C_READABLE		(_SUN4C_PAGE_READ|_SUN4C_PAGE_SILENT_READ|\</div><div class='del'>-				 _SUN4C_PAGE_ACCESSED)</div><div class='del'>-#define _SUN4C_WRITEABLE	(_SUN4C_PAGE_WRITE|_SUN4C_PAGE_SILENT_WRITE|\</div><div class='del'>-				 _SUN4C_PAGE_MODIFIED)</div><div class='del'>-</div><div class='del'>-#define _SUN4C_PAGE_CHG_MASK	(0xffff|_SUN4C_PAGE_ACCESSED|_SUN4C_PAGE_MODIFIED)</div><div class='del'>-</div><div class='del'>-#define SUN4C_PAGE_NONE		__pgprot(_SUN4C_PAGE_PRESENT)</div><div class='del'>-#define SUN4C_PAGE_SHARED	__pgprot(_SUN4C_PAGE_PRESENT|_SUN4C_READABLE|\</div><div class='del'>-					 _SUN4C_PAGE_WRITE)</div><div class='del'>-#define SUN4C_PAGE_COPY		__pgprot(_SUN4C_PAGE_PRESENT|_SUN4C_READABLE)</div><div class='del'>-#define SUN4C_PAGE_READONLY	__pgprot(_SUN4C_PAGE_PRESENT|_SUN4C_READABLE)</div><div class='del'>-#define SUN4C_PAGE_KERNEL	__pgprot(_SUN4C_READABLE|_SUN4C_WRITEABLE|\</div><div class='del'>-					 _SUN4C_PAGE_DIRTY|_SUN4C_PAGE_PRIV)</div><div class='del'>-</div><div class='del'>-/* SUN4C swap entry encoding</div><div class='del'>- *</div><div class='del'>- * We use 5 bits for the type and 19 for the offset.  This gives us</div><div class='del'>- * 32 swapfiles of 4GB each.  Encoding looks like:</div><div class='del'>- *</div><div class='del'>- * RRRRRRRRooooooooooooooooooottttt</div><div class='del'>- * fedcba9876543210fedcba9876543210</div><div class='del'>- *</div><div class='del'>- * The top 8 bits are reserved for protection and status bits, especially</div><div class='del'>- * FILE and PRESENT.</div><div class='del'>- */</div><div class='del'>-#define SUN4C_SWP_TYPE_MASK	0x1f</div><div class='del'>-#define SUN4C_SWP_OFF_MASK	0x7ffff</div><div class='del'>-#define SUN4C_SWP_OFF_SHIFT	5</div><div class='del'>-</div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-</div><div class='del'>-static inline unsigned long sun4c_get_synchronous_error(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long sync_err;</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__("lda [%1] %2, %0\n\t" :</div><div class='del'>-			     "=r" (sync_err) :</div><div class='del'>-			     "r" (AC_SYNC_ERR), "i" (ASI_CONTROL));</div><div class='del'>-	return sync_err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned long sun4c_get_synchronous_address(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long sync_addr;</div><div class='del'>-</div><div class='del'>-	__asm__ __volatile__("lda [%1] %2, %0\n\t" :</div><div class='del'>-			     "=r" (sync_addr) :</div><div class='del'>-			     "r" (AC_SYNC_VA), "i" (ASI_CONTROL));</div><div class='del'>-	return sync_addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* SUN4 pte, segmap, and context manipulation */</div><div class='del'>-static inline unsigned long sun4c_get_segmap(unsigned long addr)</div><div class='del'>-{</div><div class='del'>-  register unsigned long entry;</div><div class='del'>-</div><div class='del'>-  __asm__ __volatile__("\n\tlduha [%1] %2, %0\n\t" : </div><div class='del'>-		       "=r" (entry) :</div><div class='del'>-		       "r" (addr), "i" (ASI_SEGMAP));</div><div class='del'>-  return entry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void sun4c_put_segmap(unsigned long addr, unsigned long entry)</div><div class='del'>-{</div><div class='del'>-  __asm__ __volatile__("\n\tstha %1, [%0] %2; nop; nop; nop;\n\t" : :</div><div class='del'>-		       "r" (addr), "r" (entry),</div><div class='del'>-		       "i" (ASI_SEGMAP)</div><div class='del'>-		       : "memory");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned long sun4c_get_pte(unsigned long addr)</div><div class='del'>-{</div><div class='del'>-  register unsigned long entry;</div><div class='del'>-</div><div class='del'>-  __asm__ __volatile__("\n\tlda [%1] %2, %0\n\t" : </div><div class='del'>-		       "=r" (entry) :</div><div class='del'>-		       "r" (addr), "i" (ASI_PTE));</div><div class='del'>-  return entry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void sun4c_put_pte(unsigned long addr, unsigned long entry)</div><div class='del'>-{</div><div class='del'>-  __asm__ __volatile__("\n\tsta %1, [%0] %2; nop; nop; nop;\n\t" : :</div><div class='del'>-		       "r" (addr), </div><div class='del'>-		       "r" ((entry &amp; ~(_SUN4C_PAGE_PRESENT))), "i" (ASI_PTE)</div><div class='del'>-		       : "memory");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sun4c_get_context(void)</div><div class='del'>-{</div><div class='del'>-  register int ctx;</div><div class='del'>-</div><div class='del'>-  __asm__ __volatile__("\n\tlduba [%1] %2, %0\n\t" :</div><div class='del'>-		       "=r" (ctx) :</div><div class='del'>-		       "r" (AC_CONTEXT), "i" (ASI_CONTROL));</div><div class='del'>-</div><div class='del'>-  return ctx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sun4c_set_context(int ctx)</div><div class='del'>-{</div><div class='del'>-  __asm__ __volatile__("\n\tstba %0, [%1] %2; nop; nop; nop;\n\t" : :</div><div class='del'>-		       "r" (ctx), "r" (AC_CONTEXT), "i" (ASI_CONTROL)</div><div class='del'>-		       : "memory");</div><div class='del'>-</div><div class='del'>-  return ctx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* !(__ASSEMBLY__) */</div><div class='del'>-</div><div class='del'>-#endif /* !(_SPARC_PGTSUN4_H) */</div><div class='head'>diff --git a/arch/sparc/include/asm/posix_types.h b/arch/sparc/include/asm/posix_types.h<br/>index 98d6ebb922fb..dbfc1a34b3a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/posix_types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/posix_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/posix_types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/include/asm/posix_types.h</a></div><div class='hunk'>@@ -20,7 +20,6 @@ typedef unsigned int           __kernel_uid_t;</div><div class='ctx'> typedef unsigned int           __kernel_gid_t;</div><div class='ctx'> typedef unsigned long          __kernel_ino_t;</div><div class='ctx'> typedef unsigned int           __kernel_mode_t;</div><div class='del'>-typedef unsigned short         __kernel_umode_t;</div><div class='ctx'> typedef unsigned int           __kernel_nlink_t;</div><div class='ctx'> typedef int                    __kernel_daddr_t;</div><div class='ctx'> typedef long                   __kernel_off_t;</div><div class='hunk'>@@ -55,7 +54,6 @@ typedef unsigned short         __kernel_uid_t;</div><div class='ctx'> typedef unsigned short         __kernel_gid_t;</div><div class='ctx'> typedef unsigned long          __kernel_ino_t;</div><div class='ctx'> typedef unsigned short         __kernel_mode_t;</div><div class='del'>-typedef unsigned short         __kernel_umode_t;</div><div class='ctx'> typedef short                  __kernel_nlink_t;</div><div class='ctx'> typedef long                   __kernel_daddr_t;</div><div class='ctx'> typedef long                   __kernel_off_t;</div><div class='head'>diff --git a/arch/sparc/include/asm/ptrace.h b/arch/sparc/include/asm/ptrace.h<br/>index a0e1bcf843a1..c00c3b5c2806 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/ptrace.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/include/asm/ptrace.h</a></div><div class='hunk'>@@ -207,7 +207,15 @@ do {	current_thread_info()-&gt;syscall_noerror = 1; \</div><div class='ctx'> #define instruction_pointer(regs) ((regs)-&gt;tpc)</div><div class='ctx'> #define instruction_pointer_set(regs, val) ((regs)-&gt;tpc = (val))</div><div class='ctx'> #define user_stack_pointer(regs) ((regs)-&gt;u_regs[UREG_FP])</div><div class='del'>-#define regs_return_value(regs) ((regs)-&gt;u_regs[UREG_I0])</div><div class='add'>+static inline int is_syscall_success(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return !(regs-&gt;tstate &amp; (TSTATE_XCARRY | TSTATE_ICARRY));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline long regs_return_value(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return regs-&gt;u_regs[UREG_I0];</div><div class='add'>+}</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> extern unsigned long profile_pc(struct pt_regs *);</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/sparc/include/asm/siginfo.h b/arch/sparc/include/asm/siginfo.h<br/>index 988e5d8ed11a..215900fce21b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/siginfo.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/siginfo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/siginfo.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/include/asm/siginfo.h</a></div><div class='hunk'>@@ -16,8 +16,6 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/compat.h&gt;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> </div><div class='ctx'> struct compat_siginfo;</div><div class='head'>diff --git a/arch/sparc/include/asm/signal.h b/arch/sparc/include/asm/signal.h<br/>index e49b828a2471..aa42fe30d5b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/signal.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/signal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/signal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/include/asm/signal.h</a></div><div class='hunk'>@@ -143,10 +143,11 @@ struct sigstack {</div><div class='ctx'> #define SA_ONSTACK	_SV_SSTACK</div><div class='ctx'> #define SA_RESTART	_SV_INTR</div><div class='ctx'> #define SA_ONESHOT	_SV_RESET</div><div class='del'>-#define SA_NOMASK	0x20u</div><div class='add'>+#define SA_NODEFER	0x20u</div><div class='ctx'> #define SA_NOCLDWAIT    0x100u</div><div class='ctx'> #define SA_SIGINFO      0x200u</div><div class='ctx'> </div><div class='add'>+#define SA_NOMASK	SA_NODEFER</div><div class='ctx'> </div><div class='ctx'> #define SIG_BLOCK          0x01	/* for blocking signals */</div><div class='ctx'> #define SIG_UNBLOCK        0x02	/* for unblocking signals */</div><div class='head'>diff --git a/arch/sparc/include/asm/socket.h b/arch/sparc/include/asm/socket.h<br/>index 9d3fefcff2f5..8af1b64168b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/socket.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/include/asm/socket.h</a></div><div class='hunk'>@@ -58,6 +58,9 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_RXQ_OVFL             0x0024</div><div class='ctx'> </div><div class='add'>+#define SO_WIFI_STATUS		0x0025</div><div class='add'>+#define SCM_WIFI_STATUS		SO_WIFI_STATUS</div><div class='add'>+</div><div class='ctx'> /* Security levels - as per NRL IPv6 - don't actually do anything */</div><div class='ctx'> #define SO_SECURITY_AUTHENTICATION		0x5001</div><div class='ctx'> #define SO_SECURITY_ENCRYPTION_TRANSPORT	0x5002</div><div class='head'>diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h<br/>index fa5753233410..c2a1080cdd3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/thread_info_32.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/thread_info_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/thread_info_32.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/include/asm/thread_info_32.h</a></div><div class='hunk'>@@ -95,7 +95,7 @@ BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *)</div><div class='ctx'>  * Observe the order of get_free_pages() in alloc_thread_info_node().</div><div class='ctx'>  * The sun4 has 8K stack too, because it's short on memory, and 16K is a waste.</div><div class='ctx'>  */</div><div class='del'>-#define THREAD_SIZE		8192</div><div class='add'>+#define THREAD_SIZE		(2 * PAGE_SIZE)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Offsets in thread_info structure, used in assembly code</div><div class='hunk'>@@ -133,7 +133,6 @@ BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *)</div><div class='ctx'> #define TIF_POLLING_NRFLAG	9	/* true if poll_idle() is polling</div><div class='ctx'> 					 * TIF_NEED_RESCHED */</div><div class='ctx'> #define TIF_MEMDIE		10	/* is terminating due to OOM killer */</div><div class='del'>-#define TIF_FREEZE		11	/* is freezing for suspend */</div><div class='ctx'> </div><div class='ctx'> /* as above, but as bit values */</div><div class='ctx'> #define _TIF_SYSCALL_TRACE	(1&lt;&lt;TIF_SYSCALL_TRACE)</div><div class='hunk'>@@ -147,7 +146,6 @@ BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *)</div><div class='ctx'> #define _TIF_DO_NOTIFY_RESUME_MASK	(_TIF_NOTIFY_RESUME | \</div><div class='ctx'> 					 _TIF_SIGPENDING | \</div><div class='ctx'> 					 _TIF_RESTORE_SIGMASK)</div><div class='del'>-#define _TIF_FREEZE		(1&lt;&lt;TIF_FREEZE)</div><div class='ctx'> </div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h<br/>index 60d86be1a533..01d057fe6a3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/thread_info_64.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/thread_info_64.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/thread_info_64.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/include/asm/thread_info_64.h</a></div><div class='hunk'>@@ -225,7 +225,6 @@ register struct thread_info *current_thread_info_reg asm("g6");</div><div class='ctx'> /* flag bit 12 is available */</div><div class='ctx'> #define TIF_MEMDIE		13	/* is terminating due to OOM killer */</div><div class='ctx'> #define TIF_POLLING_NRFLAG	14</div><div class='del'>-#define TIF_FREEZE		15	/* is freezing for suspend */</div><div class='ctx'> </div><div class='ctx'> #define _TIF_SYSCALL_TRACE	(1&lt;&lt;TIF_SYSCALL_TRACE)</div><div class='ctx'> #define _TIF_NOTIFY_RESUME	(1&lt;&lt;TIF_NOTIFY_RESUME)</div><div class='hunk'>@@ -237,7 +236,6 @@ register struct thread_info *current_thread_info_reg asm("g6");</div><div class='ctx'> #define _TIF_SYSCALL_AUDIT	(1&lt;&lt;TIF_SYSCALL_AUDIT)</div><div class='ctx'> #define _TIF_SYSCALL_TRACEPOINT	(1&lt;&lt;TIF_SYSCALL_TRACEPOINT)</div><div class='ctx'> #define _TIF_POLLING_NRFLAG	(1&lt;&lt;TIF_POLLING_NRFLAG)</div><div class='del'>-#define _TIF_FREEZE		(1&lt;&lt;TIF_FREEZE)</div><div class='ctx'> </div><div class='ctx'> #define _TIF_USER_WORK_MASK	((0xff &lt;&lt; TI_FLAG_WSAVED_SHIFT) | \</div><div class='ctx'> 				 _TIF_DO_NOTIFY_RESUME_MASK | \</div><div class='head'>diff --git a/arch/sparc/include/asm/types.h b/arch/sparc/include/asm/types.h<br/>index 91e5a034f987..383d156cde9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/include/asm/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/include/asm/types.h</a></div><div class='hunk'>@@ -12,12 +12,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/int-ll64.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-</div><div class='del'>-typedef unsigned short umode_t;</div><div class='del'>-</div><div class='del'>-#endif /* __ASSEMBLY__ */</div><div class='del'>-</div><div class='ctx'> #endif /* defined(__sparc__) */</div><div class='ctx'> </div><div class='ctx'> #endif /* defined(_SPARC_TYPES_H) */</div><div class='head'>diff --git a/arch/sparc/kernel/leon_pci.c b/arch/sparc/kernel/leon_pci.c<br/>index f1cf6ef011a7..c7bec25fdb1c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/leon_pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/kernel/leon_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/leon_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/kernel/leon_pci.c</a></div><div class='hunk'>@@ -19,22 +19,22 @@</div><div class='ctx'>  */</div><div class='ctx'> void leon_pci_init(struct platform_device *ofdev, struct leon_pci_info *info)</div><div class='ctx'> {</div><div class='add'>+	LIST_HEAD(resources);</div><div class='ctx'> 	struct pci_bus *root_bus;</div><div class='ctx'> </div><div class='del'>-	root_bus = pci_scan_bus_parented(&amp;ofdev-&gt;dev, 0, info-&gt;ops, info);</div><div class='del'>-	if (root_bus) {</div><div class='del'>-		root_bus-&gt;resource[0] = &amp;info-&gt;io_space;</div><div class='del'>-		root_bus-&gt;resource[1] = &amp;info-&gt;mem_space;</div><div class='del'>-		root_bus-&gt;resource[2] = NULL;</div><div class='del'>-</div><div class='del'>-		/* Init all PCI devices into PCI tree */</div><div class='del'>-		pci_bus_add_devices(root_bus);</div><div class='add'>+	pci_add_resource(&amp;resources, &amp;info-&gt;io_space);</div><div class='add'>+	pci_add_resource(&amp;resources, &amp;info-&gt;mem_space);</div><div class='ctx'> </div><div class='add'>+	root_bus = pci_scan_root_bus(&amp;ofdev-&gt;dev, 0, info-&gt;ops, info,</div><div class='add'>+				     &amp;resources);</div><div class='add'>+	if (root_bus) {</div><div class='ctx'> 		/* Setup IRQs of all devices using custom routines */</div><div class='ctx'> 		pci_fixup_irqs(pci_common_swizzle, info-&gt;map_irq);</div><div class='ctx'> </div><div class='ctx'> 		/* Assign devices with resources */</div><div class='ctx'> 		pci_assign_unassigned_resources();</div><div class='add'>+	} else {</div><div class='add'>+		pci_free_resource_list(&amp;resources);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -83,15 +83,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *pbus)</div><div class='ctx'> 	int i, has_io, has_mem;</div><div class='ctx'> 	u16 cmd;</div><div class='ctx'> </div><div class='del'>-	/* Generic PCI bus probing sets these to point at</div><div class='del'>-	 * &amp;io{port,mem}_resouce which is wrong for us.</div><div class='del'>-	 */</div><div class='del'>-	if (pbus-&gt;self == NULL) {</div><div class='del'>-		pbus-&gt;resource[0] = &amp;info-&gt;io_space;</div><div class='del'>-		pbus-&gt;resource[1] = &amp;info-&gt;mem_space;</div><div class='del'>-		pbus-&gt;resource[2] = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	list_for_each_entry(dev, &amp;pbus-&gt;devices, bus_list) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We can not rely on that the bootloader has enabled I/O</div><div class='head'>diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c<br/>index 31111e35281e..bb8bc2e519ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/kernel/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/kernel/pci.c</a></div><div class='hunk'>@@ -685,23 +685,25 @@ static void __devinit pci_bus_register_of_sysfs(struct pci_bus *bus)</div><div class='ctx'> struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm,</div><div class='ctx'> 					    struct device *parent)</div><div class='ctx'> {</div><div class='add'>+	LIST_HEAD(resources);</div><div class='ctx'> 	struct device_node *node = pbm-&gt;op-&gt;dev.of_node;</div><div class='ctx'> 	struct pci_bus *bus;</div><div class='ctx'> </div><div class='ctx'> 	printk("PCI: Scanning PBM %s\n", node-&gt;full_name);</div><div class='ctx'> </div><div class='del'>-	bus = pci_create_bus(parent, pbm-&gt;pci_first_busno, pbm-&gt;pci_ops, pbm);</div><div class='add'>+	pci_add_resource(&amp;resources, &amp;pbm-&gt;io_space);</div><div class='add'>+	pci_add_resource(&amp;resources, &amp;pbm-&gt;mem_space);</div><div class='add'>+	bus = pci_create_root_bus(parent, pbm-&gt;pci_first_busno, pbm-&gt;pci_ops,</div><div class='add'>+				  pbm, &amp;resources);</div><div class='ctx'> 	if (!bus) {</div><div class='ctx'> 		printk(KERN_ERR "Failed to create bus for %s\n",</div><div class='ctx'> 		       node-&gt;full_name);</div><div class='add'>+		pci_free_resource_list(&amp;resources);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	bus-&gt;secondary = pbm-&gt;pci_first_busno;</div><div class='ctx'> 	bus-&gt;subordinate = pbm-&gt;pci_last_busno;</div><div class='ctx'> </div><div class='del'>-	bus-&gt;resource[0] = &amp;pbm-&gt;io_space;</div><div class='del'>-	bus-&gt;resource[1] = &amp;pbm-&gt;mem_space;</div><div class='del'>-</div><div class='ctx'> 	pci_of_scan_bus(pbm, node, bus);</div><div class='ctx'> 	pci_bus_add_devices(bus);</div><div class='ctx'> 	pci_bus_register_of_sysfs(bus);</div><div class='hunk'>@@ -711,13 +713,6 @@ struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm,</div><div class='ctx'> </div><div class='ctx'> void __devinit pcibios_fixup_bus(struct pci_bus *pbus)</div><div class='ctx'> {</div><div class='del'>-	struct pci_pbm_info *pbm = pbus-&gt;sysdata;</div><div class='del'>-</div><div class='del'>-	/* Generic PCI bus probing sets these to point at</div><div class='del'>-	 * &amp;io{port,mem}_resouce which is wrong for us.</div><div class='del'>-	 */</div><div class='del'>-	pbus-&gt;resource[0] = &amp;pbm-&gt;io_space;</div><div class='del'>-	pbus-&gt;resource[1] = &amp;pbm-&gt;mem_space;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void pcibios_update_irq(struct pci_dev *pdev, int irq)</div><div class='hunk'>@@ -1083,6 +1078,11 @@ void pci_resource_to_user(const struct pci_dev *pdev, int bar,</div><div class='ctx'> 	*end = rp-&gt;end - offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void pcibios_set_master(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	/* No special bus mastering setup handling */</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init pcibios_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	pci_dfl_cache_line_size = 64 &gt;&gt; 2;</div><div class='head'>diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c<br/>index 96ee50a80661..9388844cd88c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/ptrace_64.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/kernel/ptrace_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/ptrace_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/kernel/ptrace_64.c</a></div><div class='hunk'>@@ -1071,32 +1071,22 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)</div><div class='ctx'> 	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))</div><div class='ctx'> 		trace_sys_enter(regs, regs-&gt;u_regs[UREG_G1]);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context) &amp;&amp; !ret)</div><div class='del'>-		audit_syscall_entry((test_thread_flag(TIF_32BIT) ?</div><div class='del'>-				     AUDIT_ARCH_SPARC :</div><div class='del'>-				     AUDIT_ARCH_SPARC64),</div><div class='del'>-				    regs-&gt;u_regs[UREG_G1],</div><div class='del'>-				    regs-&gt;u_regs[UREG_I0],</div><div class='del'>-				    regs-&gt;u_regs[UREG_I1],</div><div class='del'>-				    regs-&gt;u_regs[UREG_I2],</div><div class='del'>-				    regs-&gt;u_regs[UREG_I3]);</div><div class='add'>+	audit_syscall_entry((test_thread_flag(TIF_32BIT) ?</div><div class='add'>+			     AUDIT_ARCH_SPARC :</div><div class='add'>+			     AUDIT_ARCH_SPARC64),</div><div class='add'>+			    regs-&gt;u_regs[UREG_G1],</div><div class='add'>+			    regs-&gt;u_regs[UREG_I0],</div><div class='add'>+			    regs-&gt;u_regs[UREG_I1],</div><div class='add'>+			    regs-&gt;u_regs[UREG_I2],</div><div class='add'>+			    regs-&gt;u_regs[UREG_I3]);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> asmlinkage void syscall_trace_leave(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_AUDITSYSCALL</div><div class='del'>-	if (unlikely(current-&gt;audit_context)) {</div><div class='del'>-		unsigned long tstate = regs-&gt;tstate;</div><div class='del'>-		int result = AUDITSC_SUCCESS;</div><div class='add'>+	audit_syscall_exit(regs);</div><div class='ctx'> </div><div class='del'>-		if (unlikely(tstate &amp; (TSTATE_XCARRY | TSTATE_ICARRY)))</div><div class='del'>-			result = AUDITSC_FAILURE;</div><div class='del'>-</div><div class='del'>-		audit_syscall_exit(result, regs-&gt;u_regs[UREG_I0]);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> 	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))</div><div class='ctx'> 		trace_sys_exit(regs, regs-&gt;u_regs[UREG_G1]);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c<br/>index 75607724d290..3b1bd7c50164 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/smp_64.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/kernel/smp_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/smp_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/kernel/smp_64.c</a></div><div class='hunk'>@@ -840,7 +840,7 @@ static void tsb_sync(void *info)</div><div class='ctx'> 	struct trap_per_cpu *tp = &amp;trap_block[raw_smp_processor_id()];</div><div class='ctx'> 	struct mm_struct *mm = info;</div><div class='ctx'> </div><div class='del'>-	/* It is not valid to test "currrent-&gt;active_mm == mm" here.</div><div class='add'>+	/* It is not valid to test "current-&gt;active_mm == mm" here.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The value of "current" is not changed atomically with</div><div class='ctx'> 	 * switch_mm().  But that's OK, we just need to check the</div><div class='head'>diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c<br/>index 441521ad8a3f..232df9949530 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sys_sparc_64.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/kernel/sys_sparc_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sys_sparc_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/kernel/sys_sparc_64.c</a></div><div class='hunk'>@@ -368,11 +368,11 @@ static unsigned long mmap_rnd(void)</div><div class='ctx'> 	if (current-&gt;flags &amp; PF_RANDOMIZE) {</div><div class='ctx'> 		unsigned long val = get_random_int();</div><div class='ctx'> 		if (test_thread_flag(TIF_32BIT))</div><div class='del'>-			rnd = (val % (1UL &lt;&lt; (22UL-PAGE_SHIFT)));</div><div class='add'>+			rnd = (val % (1UL &lt;&lt; (23UL-PAGE_SHIFT)));</div><div class='ctx'> 		else</div><div class='del'>-			rnd = (val % (1UL &lt;&lt; (29UL-PAGE_SHIFT)));</div><div class='add'>+			rnd = (val % (1UL &lt;&lt; (30UL-PAGE_SHIFT)));</div><div class='ctx'> 	}</div><div class='del'>-	return (rnd &lt;&lt; PAGE_SHIFT) * 2;</div><div class='add'>+	return rnd &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void arch_pick_mmap_layout(struct mm_struct *mm)</div><div class='head'>diff --git a/arch/sparc/kernel/sysfs.c b/arch/sparc/kernel/sysfs.c<br/>index 7408201d7efb..654e8aad3bbe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sysfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/kernel/sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/kernel/sysfs.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  * Copyright (C) 2007 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='hunk'>@@ -16,13 +16,13 @@</div><div class='ctx'> static DEFINE_PER_CPU(struct hv_mmu_statistics, mmu_stats) __attribute__((aligned(64)));</div><div class='ctx'> </div><div class='ctx'> #define SHOW_MMUSTAT_ULONG(NAME) \</div><div class='del'>-static ssize_t show_##NAME(struct sys_device *dev, \</div><div class='del'>-			struct sysdev_attribute *attr, char *buf) \</div><div class='add'>+static ssize_t show_##NAME(struct device *dev, \</div><div class='add'>+			struct device_attribute *attr, char *buf) \</div><div class='ctx'> { \</div><div class='ctx'> 	struct hv_mmu_statistics *p = &amp;per_cpu(mmu_stats, dev-&gt;id); \</div><div class='ctx'> 	return sprintf(buf, "%lu\n", p-&gt;NAME); \</div><div class='ctx'> } \</div><div class='del'>-static SYSDEV_ATTR(NAME, 0444, show_##NAME, NULL)</div><div class='add'>+static DEVICE_ATTR(NAME, 0444, show_##NAME, NULL)</div><div class='ctx'> </div><div class='ctx'> SHOW_MMUSTAT_ULONG(immu_tsb_hits_ctx0_8k_tte);</div><div class='ctx'> SHOW_MMUSTAT_ULONG(immu_tsb_ticks_ctx0_8k_tte);</div><div class='hunk'>@@ -58,38 +58,38 @@ SHOW_MMUSTAT_ULONG(dmmu_tsb_hits_ctxnon0_256mb_tte);</div><div class='ctx'> SHOW_MMUSTAT_ULONG(dmmu_tsb_ticks_ctxnon0_256mb_tte);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *mmu_stat_attrs[] = {</div><div class='del'>-	&amp;attr_immu_tsb_hits_ctx0_8k_tte.attr,</div><div class='del'>-	&amp;attr_immu_tsb_ticks_ctx0_8k_tte.attr,</div><div class='del'>-	&amp;attr_immu_tsb_hits_ctx0_64k_tte.attr,</div><div class='del'>-	&amp;attr_immu_tsb_ticks_ctx0_64k_tte.attr,</div><div class='del'>-	&amp;attr_immu_tsb_hits_ctx0_4mb_tte.attr,</div><div class='del'>-	&amp;attr_immu_tsb_ticks_ctx0_4mb_tte.attr,</div><div class='del'>-	&amp;attr_immu_tsb_hits_ctx0_256mb_tte.attr,</div><div class='del'>-	&amp;attr_immu_tsb_ticks_ctx0_256mb_tte.attr,</div><div class='del'>-	&amp;attr_immu_tsb_hits_ctxnon0_8k_tte.attr,</div><div class='del'>-	&amp;attr_immu_tsb_ticks_ctxnon0_8k_tte.attr,</div><div class='del'>-	&amp;attr_immu_tsb_hits_ctxnon0_64k_tte.attr,</div><div class='del'>-	&amp;attr_immu_tsb_ticks_ctxnon0_64k_tte.attr,</div><div class='del'>-	&amp;attr_immu_tsb_hits_ctxnon0_4mb_tte.attr,</div><div class='del'>-	&amp;attr_immu_tsb_ticks_ctxnon0_4mb_tte.attr,</div><div class='del'>-	&amp;attr_immu_tsb_hits_ctxnon0_256mb_tte.attr,</div><div class='del'>-	&amp;attr_immu_tsb_ticks_ctxnon0_256mb_tte.attr,</div><div class='del'>-	&amp;attr_dmmu_tsb_hits_ctx0_8k_tte.attr,</div><div class='del'>-	&amp;attr_dmmu_tsb_ticks_ctx0_8k_tte.attr,</div><div class='del'>-	&amp;attr_dmmu_tsb_hits_ctx0_64k_tte.attr,</div><div class='del'>-	&amp;attr_dmmu_tsb_ticks_ctx0_64k_tte.attr,</div><div class='del'>-	&amp;attr_dmmu_tsb_hits_ctx0_4mb_tte.attr,</div><div class='del'>-	&amp;attr_dmmu_tsb_ticks_ctx0_4mb_tte.attr,</div><div class='del'>-	&amp;attr_dmmu_tsb_hits_ctx0_256mb_tte.attr,</div><div class='del'>-	&amp;attr_dmmu_tsb_ticks_ctx0_256mb_tte.attr,</div><div class='del'>-	&amp;attr_dmmu_tsb_hits_ctxnon0_8k_tte.attr,</div><div class='del'>-	&amp;attr_dmmu_tsb_ticks_ctxnon0_8k_tte.attr,</div><div class='del'>-	&amp;attr_dmmu_tsb_hits_ctxnon0_64k_tte.attr,</div><div class='del'>-	&amp;attr_dmmu_tsb_ticks_ctxnon0_64k_tte.attr,</div><div class='del'>-	&amp;attr_dmmu_tsb_hits_ctxnon0_4mb_tte.attr,</div><div class='del'>-	&amp;attr_dmmu_tsb_ticks_ctxnon0_4mb_tte.attr,</div><div class='del'>-	&amp;attr_dmmu_tsb_hits_ctxnon0_256mb_tte.attr,</div><div class='del'>-	&amp;attr_dmmu_tsb_ticks_ctxnon0_256mb_tte.attr,</div><div class='add'>+	&amp;dev_attr_immu_tsb_hits_ctx0_8k_tte.attr,</div><div class='add'>+	&amp;dev_attr_immu_tsb_ticks_ctx0_8k_tte.attr,</div><div class='add'>+	&amp;dev_attr_immu_tsb_hits_ctx0_64k_tte.attr,</div><div class='add'>+	&amp;dev_attr_immu_tsb_ticks_ctx0_64k_tte.attr,</div><div class='add'>+	&amp;dev_attr_immu_tsb_hits_ctx0_4mb_tte.attr,</div><div class='add'>+	&amp;dev_attr_immu_tsb_ticks_ctx0_4mb_tte.attr,</div><div class='add'>+	&amp;dev_attr_immu_tsb_hits_ctx0_256mb_tte.attr,</div><div class='add'>+	&amp;dev_attr_immu_tsb_ticks_ctx0_256mb_tte.attr,</div><div class='add'>+	&amp;dev_attr_immu_tsb_hits_ctxnon0_8k_tte.attr,</div><div class='add'>+	&amp;dev_attr_immu_tsb_ticks_ctxnon0_8k_tte.attr,</div><div class='add'>+	&amp;dev_attr_immu_tsb_hits_ctxnon0_64k_tte.attr,</div><div class='add'>+	&amp;dev_attr_immu_tsb_ticks_ctxnon0_64k_tte.attr,</div><div class='add'>+	&amp;dev_attr_immu_tsb_hits_ctxnon0_4mb_tte.attr,</div><div class='add'>+	&amp;dev_attr_immu_tsb_ticks_ctxnon0_4mb_tte.attr,</div><div class='add'>+	&amp;dev_attr_immu_tsb_hits_ctxnon0_256mb_tte.attr,</div><div class='add'>+	&amp;dev_attr_immu_tsb_ticks_ctxnon0_256mb_tte.attr,</div><div class='add'>+	&amp;dev_attr_dmmu_tsb_hits_ctx0_8k_tte.attr,</div><div class='add'>+	&amp;dev_attr_dmmu_tsb_ticks_ctx0_8k_tte.attr,</div><div class='add'>+	&amp;dev_attr_dmmu_tsb_hits_ctx0_64k_tte.attr,</div><div class='add'>+	&amp;dev_attr_dmmu_tsb_ticks_ctx0_64k_tte.attr,</div><div class='add'>+	&amp;dev_attr_dmmu_tsb_hits_ctx0_4mb_tte.attr,</div><div class='add'>+	&amp;dev_attr_dmmu_tsb_ticks_ctx0_4mb_tte.attr,</div><div class='add'>+	&amp;dev_attr_dmmu_tsb_hits_ctx0_256mb_tte.attr,</div><div class='add'>+	&amp;dev_attr_dmmu_tsb_ticks_ctx0_256mb_tte.attr,</div><div class='add'>+	&amp;dev_attr_dmmu_tsb_hits_ctxnon0_8k_tte.attr,</div><div class='add'>+	&amp;dev_attr_dmmu_tsb_ticks_ctxnon0_8k_tte.attr,</div><div class='add'>+	&amp;dev_attr_dmmu_tsb_hits_ctxnon0_64k_tte.attr,</div><div class='add'>+	&amp;dev_attr_dmmu_tsb_ticks_ctxnon0_64k_tte.attr,</div><div class='add'>+	&amp;dev_attr_dmmu_tsb_hits_ctxnon0_4mb_tte.attr,</div><div class='add'>+	&amp;dev_attr_dmmu_tsb_ticks_ctxnon0_4mb_tte.attr,</div><div class='add'>+	&amp;dev_attr_dmmu_tsb_hits_ctxnon0_256mb_tte.attr,</div><div class='add'>+	&amp;dev_attr_dmmu_tsb_ticks_ctxnon0_256mb_tte.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -139,15 +139,15 @@ static unsigned long write_mmustat_enable(unsigned long val)</div><div class='ctx'> 	return sun4v_mmustat_conf(ra, &amp;orig_ra);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_mmustat_enable(struct sys_device *s,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_mmustat_enable(struct device *s,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long val = run_on_cpu(s-&gt;id, read_mmustat_enable, 0);</div><div class='ctx'> 	return sprintf(buf, "%lx\n", val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_mmustat_enable(struct sys_device *s,</div><div class='del'>-			struct sysdev_attribute *attr, const char *buf,</div><div class='add'>+static ssize_t store_mmustat_enable(struct device *s,</div><div class='add'>+			struct device_attribute *attr, const char *buf,</div><div class='ctx'> 			size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long val, err;</div><div class='hunk'>@@ -163,39 +163,39 @@ static ssize_t store_mmustat_enable(struct sys_device *s,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(mmustat_enable, 0644, show_mmustat_enable, store_mmustat_enable);</div><div class='add'>+static DEVICE_ATTR(mmustat_enable, 0644, show_mmustat_enable, store_mmustat_enable);</div><div class='ctx'> </div><div class='ctx'> static int mmu_stats_supported;</div><div class='ctx'> </div><div class='del'>-static int register_mmu_stats(struct sys_device *s)</div><div class='add'>+static int register_mmu_stats(struct device *s)</div><div class='ctx'> {</div><div class='ctx'> 	if (!mmu_stats_supported)</div><div class='ctx'> 		return 0;</div><div class='del'>-	sysdev_create_file(s, &amp;attr_mmustat_enable);</div><div class='add'>+	device_create_file(s, &amp;dev_attr_mmustat_enable);</div><div class='ctx'> 	return sysfs_create_group(&amp;s-&gt;kobj, &amp;mmu_stat_group);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-static void unregister_mmu_stats(struct sys_device *s)</div><div class='add'>+static void unregister_mmu_stats(struct device *s)</div><div class='ctx'> {</div><div class='ctx'> 	if (!mmu_stats_supported)</div><div class='ctx'> 		return;</div><div class='ctx'> 	sysfs_remove_group(&amp;s-&gt;kobj, &amp;mmu_stat_group);</div><div class='del'>-	sysdev_remove_file(s, &amp;attr_mmustat_enable);</div><div class='add'>+	device_remove_file(s, &amp;dev_attr_mmustat_enable);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define SHOW_CPUDATA_ULONG_NAME(NAME, MEMBER) \</div><div class='del'>-static ssize_t show_##NAME(struct sys_device *dev, \</div><div class='del'>-		struct sysdev_attribute *attr, char *buf) \</div><div class='add'>+static ssize_t show_##NAME(struct device *dev, \</div><div class='add'>+		struct device_attribute *attr, char *buf) \</div><div class='ctx'> { \</div><div class='ctx'> 	cpuinfo_sparc *c = &amp;cpu_data(dev-&gt;id); \</div><div class='ctx'> 	return sprintf(buf, "%lu\n", c-&gt;MEMBER); \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define SHOW_CPUDATA_UINT_NAME(NAME, MEMBER) \</div><div class='del'>-static ssize_t show_##NAME(struct sys_device *dev, \</div><div class='del'>-		struct sysdev_attribute *attr, char *buf) \</div><div class='add'>+static ssize_t show_##NAME(struct device *dev, \</div><div class='add'>+		struct device_attribute *attr, char *buf) \</div><div class='ctx'> { \</div><div class='ctx'> 	cpuinfo_sparc *c = &amp;cpu_data(dev-&gt;id); \</div><div class='ctx'> 	return sprintf(buf, "%u\n", c-&gt;MEMBER); \</div><div class='hunk'>@@ -209,14 +209,14 @@ SHOW_CPUDATA_UINT_NAME(l1_icache_line_size, icache_line_size);</div><div class='ctx'> SHOW_CPUDATA_UINT_NAME(l2_cache_size, ecache_size);</div><div class='ctx'> SHOW_CPUDATA_UINT_NAME(l2_cache_line_size, ecache_line_size);</div><div class='ctx'> </div><div class='del'>-static struct sysdev_attribute cpu_core_attrs[] = {</div><div class='del'>-	_SYSDEV_ATTR(clock_tick,          0444, show_clock_tick, NULL),</div><div class='del'>-	_SYSDEV_ATTR(l1_dcache_size,      0444, show_l1_dcache_size, NULL),</div><div class='del'>-	_SYSDEV_ATTR(l1_dcache_line_size, 0444, show_l1_dcache_line_size, NULL),</div><div class='del'>-	_SYSDEV_ATTR(l1_icache_size,      0444, show_l1_icache_size, NULL),</div><div class='del'>-	_SYSDEV_ATTR(l1_icache_line_size, 0444, show_l1_icache_line_size, NULL),</div><div class='del'>-	_SYSDEV_ATTR(l2_cache_size,       0444, show_l2_cache_size, NULL),</div><div class='del'>-	_SYSDEV_ATTR(l2_cache_line_size,  0444, show_l2_cache_line_size, NULL),</div><div class='add'>+static struct device_attribute cpu_core_attrs[] = {</div><div class='add'>+	__ATTR(clock_tick,          0444, show_clock_tick, NULL),</div><div class='add'>+	__ATTR(l1_dcache_size,      0444, show_l1_dcache_size, NULL),</div><div class='add'>+	__ATTR(l1_dcache_line_size, 0444, show_l1_dcache_line_size, NULL),</div><div class='add'>+	__ATTR(l1_icache_size,      0444, show_l1_icache_size, NULL),</div><div class='add'>+	__ATTR(l1_icache_line_size, 0444, show_l1_icache_line_size, NULL),</div><div class='add'>+	__ATTR(l2_cache_size,       0444, show_l2_cache_size, NULL),</div><div class='add'>+	__ATTR(l2_cache_line_size,  0444, show_l2_cache_line_size, NULL),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU(struct cpu, cpu_devices);</div><div class='hunk'>@@ -224,11 +224,11 @@ static DEFINE_PER_CPU(struct cpu, cpu_devices);</div><div class='ctx'> static void register_cpu_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpu *c = &amp;per_cpu(cpu_devices, cpu);</div><div class='del'>-	struct sys_device *s = &amp;c-&gt;sysdev;</div><div class='add'>+	struct device *s = &amp;c-&gt;dev;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(cpu_core_attrs); i++)</div><div class='del'>-		sysdev_create_file(s, &amp;cpu_core_attrs[i]);</div><div class='add'>+		device_create_file(s, &amp;cpu_core_attrs[i]);</div><div class='ctx'> </div><div class='ctx'> 	register_mmu_stats(s);</div><div class='ctx'> }</div><div class='hunk'>@@ -237,12 +237,12 @@ static void register_cpu_online(unsigned int cpu)</div><div class='ctx'> static void unregister_cpu_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpu *c = &amp;per_cpu(cpu_devices, cpu);</div><div class='del'>-	struct sys_device *s = &amp;c-&gt;sysdev;</div><div class='add'>+	struct device *s = &amp;c-&gt;dev;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	unregister_mmu_stats(s);</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(cpu_core_attrs); i++)</div><div class='del'>-		sysdev_remove_file(s, &amp;cpu_core_attrs[i]);</div><div class='add'>+		device_remove_file(s, &amp;cpu_core_attrs[i]);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/lib/atomic_32.S b/arch/sparc/lib/atomic_32.S<br/>index 178cbb8ae1b9..eb6c7359cbd1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/lib/atomic_32.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/lib/atomic_32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/lib/atomic_32.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/lib/atomic_32.S</a></div><div class='hunk'>@@ -40,60 +40,5 @@ ___xchg32_sun4md:</div><div class='ctx'> 	 mov	%g4, %o7</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/* Read asm-sparc/atomic.h carefully to understand how this works for SMP.</div><div class='del'>-	 * Really, some things here for SMP are overly clever, go read the header.</div><div class='del'>-	 */</div><div class='del'>-	.globl	___atomic24_add</div><div class='del'>-___atomic24_add:</div><div class='del'>-	rd	%psr, %g3		! Keep the code small, old way was stupid</div><div class='del'>-	nop; nop; nop;			! Let the bits set</div><div class='del'>-	or	%g3, PSR_PIL, %g7	! Disable interrupts</div><div class='del'>-	wr	%g7, 0x0, %psr		! Set %psr</div><div class='del'>-	nop; nop; nop;			! Let the bits set</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-1:	ldstub	[%g1 + 3], %g7		! Spin on the byte lock for SMP.</div><div class='del'>-	orcc	%g7, 0x0, %g0		! Did we get it?</div><div class='del'>-	bne	1b			! Nope...</div><div class='del'>-	 ld	[%g1], %g7		! Load locked atomic24_t</div><div class='del'>-	sra	%g7, 8, %g7		! Get signed 24-bit integer</div><div class='del'>-	add	%g7, %g2, %g2		! Add in argument</div><div class='del'>-	sll	%g2, 8, %g7		! Transpose back to atomic24_t</div><div class='del'>-	st	%g7, [%g1]		! Clever: This releases the lock as well.</div><div class='del'>-#else</div><div class='del'>-	ld	[%g1], %g7		! Load locked atomic24_t</div><div class='del'>-	add	%g7, %g2, %g2		! Add in argument</div><div class='del'>-	st	%g2, [%g1]		! Store it back</div><div class='del'>-#endif</div><div class='del'>-	wr	%g3, 0x0, %psr		! Restore original PSR_PIL</div><div class='del'>-	nop; nop; nop;			! Let the bits set</div><div class='del'>-	jmpl	%o7, %g0		! NOTE: not + 8, see callers in atomic.h</div><div class='del'>-	 mov	%g4, %o7		! Restore %o7</div><div class='del'>-</div><div class='del'>-	.globl	___atomic24_sub</div><div class='del'>-___atomic24_sub:</div><div class='del'>-	rd	%psr, %g3		! Keep the code small, old way was stupid</div><div class='del'>-	nop; nop; nop;			! Let the bits set</div><div class='del'>-	or	%g3, PSR_PIL, %g7	! Disable interrupts</div><div class='del'>-	wr	%g7, 0x0, %psr		! Set %psr</div><div class='del'>-	nop; nop; nop;			! Let the bits set</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-1:	ldstub	[%g1 + 3], %g7		! Spin on the byte lock for SMP.</div><div class='del'>-	orcc	%g7, 0x0, %g0		! Did we get it?</div><div class='del'>-	bne	1b			! Nope...</div><div class='del'>-	 ld	[%g1], %g7		! Load locked atomic24_t</div><div class='del'>-	sra	%g7, 8, %g7		! Get signed 24-bit integer</div><div class='del'>-	sub	%g7, %g2, %g2		! Subtract argument</div><div class='del'>-	sll	%g2, 8, %g7		! Transpose back to atomic24_t</div><div class='del'>-	st	%g7, [%g1]		! Clever: This releases the lock as well</div><div class='del'>-#else</div><div class='del'>-	ld	[%g1], %g7		! Load locked atomic24_t</div><div class='del'>-	sub	%g7, %g2, %g2		! Subtract argument</div><div class='del'>-	st	%g2, [%g1]		! Store it back</div><div class='del'>-#endif</div><div class='del'>-	wr	%g3, 0x0, %psr		! Restore original PSR_PIL</div><div class='del'>-	nop; nop; nop;			! Let the bits set</div><div class='del'>-	jmpl	%o7, %g0		! NOTE: not + 8, see callers in atomic.h</div><div class='del'>-	 mov	%g4, %o7		! Restore %o7</div><div class='del'>-</div><div class='ctx'> 	.globl  __atomic_end</div><div class='ctx'> __atomic_end:</div><div class='head'>diff --git a/arch/sparc/lib/iomap.c b/arch/sparc/lib/iomap.c<br/>index 9ef37e13a920..c4d42a50ebc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/lib/iomap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/lib/iomap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/lib/iomap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/lib/iomap.c</a></div><div class='hunk'>@@ -18,31 +18,8 @@ void ioport_unmap(void __iomem *addr)</div><div class='ctx'> EXPORT_SYMBOL(ioport_map);</div><div class='ctx'> EXPORT_SYMBOL(ioport_unmap);</div><div class='ctx'> </div><div class='del'>-/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */</div><div class='del'>-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)</div><div class='del'>-{</div><div class='del'>-	resource_size_t start = pci_resource_start(dev, bar);</div><div class='del'>-	resource_size_t len = pci_resource_len(dev, bar);</div><div class='del'>-	unsigned long flags = pci_resource_flags(dev, bar);</div><div class='del'>-</div><div class='del'>-	if (!len || !start)</div><div class='del'>-		return NULL;</div><div class='del'>-	if (maxlen &amp;&amp; len &gt; maxlen)</div><div class='del'>-		len = maxlen;</div><div class='del'>-	if (flags &amp; IORESOURCE_IO)</div><div class='del'>-		return ioport_map(start, len);</div><div class='del'>-	if (flags &amp; IORESOURCE_MEM) {</div><div class='del'>-		if (flags &amp; IORESOURCE_CACHEABLE)</div><div class='del'>-			return ioremap(start, len);</div><div class='del'>-		return ioremap_nocache(start, len);</div><div class='del'>-	}</div><div class='del'>-	/* What? */</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void pci_iounmap(struct pci_dev *dev, void __iomem * addr)</div><div class='ctx'> {</div><div class='ctx'> 	/* nothing to do */</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(pci_iomap);</div><div class='ctx'> EXPORT_SYMBOL(pci_iounmap);</div><div class='head'>diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c<br/>index 1b30bb3bfdb1..f73c2240fe60 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/lib/ksyms.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/sparc/lib/ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/lib/ksyms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/sparc/lib/ksyms.c</a></div><div class='hunk'>@@ -62,8 +62,6 @@ extern void ___rw_read_enter(void);</div><div class='ctx'> extern void ___rw_read_try(void);</div><div class='ctx'> extern void ___rw_read_exit(void);</div><div class='ctx'> extern void ___rw_write_enter(void);</div><div class='del'>-extern void ___atomic24_add(void);</div><div class='del'>-extern void ___atomic24_sub(void);</div><div class='ctx'> </div><div class='ctx'> /* Alias functions whose names begin with "." and export the aliases.</div><div class='ctx'>  * The module references will be fixed up by module_frob_arch_sections.</div><div class='hunk'>@@ -97,10 +95,6 @@ EXPORT_SYMBOL(___rw_read_exit);</div><div class='ctx'> EXPORT_SYMBOL(___rw_write_enter);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Atomic operations. */</div><div class='del'>-EXPORT_SYMBOL(___atomic24_add);</div><div class='del'>-EXPORT_SYMBOL(___atomic24_sub);</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(__ashrdi3);</div><div class='ctx'> EXPORT_SYMBOL(__ashldi3);</div><div class='ctx'> EXPORT_SYMBOL(__lshrdi3);</div><div class='head'>diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig<br/>index 70a0de46cd1b..11270ca22c0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/tile/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/tile/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/tile/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/tile/Kconfig</a></div><div class='hunk'>@@ -321,6 +321,7 @@ config PCI</div><div class='ctx'> 	bool "PCI support"</div><div class='ctx'> 	default y</div><div class='ctx'> 	select PCI_DOMAINS</div><div class='add'>+	select GENERIC_PCI_IOMAP</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Enable PCI root complex support, so PCIe endpoint devices can</div><div class='ctx'> 	  be attached to the Tile chip.  Many, but not all, PCI devices</div><div class='head'>diff --git a/arch/tile/include/asm/io.h b/arch/tile/include/asm/io.h<br/>index c9ea1652af03..d2152deb1f3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/tile/include/asm/io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/tile/include/asm/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/tile/include/asm/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/tile/include/asm/io.h</a></div><div class='hunk'>@@ -204,7 +204,8 @@ static inline long ioport_panic(void)</div><div class='ctx'> </div><div class='ctx'> static inline void __iomem *ioport_map(unsigned long port, unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	return (void __iomem *) ioport_panic();</div><div class='add'>+	pr_info("ioport_map: mapping IO resources is unsupported on tile.\n");</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void ioport_unmap(void __iomem *addr)</div><div class='head'>diff --git a/arch/tile/include/asm/pci.h b/arch/tile/include/asm/pci.h<br/>index 7f03cefed1b9..5d5a635530bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/tile/include/asm/pci.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/tile/include/asm/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/tile/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/tile/include/asm/pci.h</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #define _ASM_TILE_PCI_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;asm-generic/pci_iomap.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Structure of a PCI controller (host bridge)</div><div class='hunk'>@@ -49,7 +50,6 @@ struct pci_controller {</div><div class='ctx'> int __devinit tile_pci_init(void);</div><div class='ctx'> int __devinit pcibios_init(void);</div><div class='ctx'> </div><div class='del'>-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);</div><div class='ctx'> static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) {}</div><div class='ctx'> </div><div class='ctx'> void __devinit pcibios_fixup_bus(struct pci_bus *bus);</div><div class='hunk'>@@ -76,13 +76,6 @@ static inline int pcibios_assign_all_busses(void)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * No special bus mastering setup handling.</div><div class='del'>- */</div><div class='del'>-static inline void pcibios_set_master(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define PCIBIOS_MIN_MEM		0</div><div class='ctx'> #define PCIBIOS_MIN_IO		0</div><div class='ctx'> </div><div class='head'>diff --git a/arch/tile/include/asm/signal.h b/arch/tile/include/asm/signal.h<br/>index 1e1e616783eb..1e5e49aad548 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/tile/include/asm/signal.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/tile/include/asm/signal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/tile/include/asm/signal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/tile/include/asm/signal.h</a></div><div class='hunk'>@@ -23,7 +23,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/signal.h&gt;</div><div class='ctx'> </div><div class='del'>-#if defined(__KERNEL__) &amp;&amp; !defined(__ASSEMBLY__)</div><div class='add'>+#if defined(__KERNEL__)</div><div class='add'>+#if !defined(__ASSEMBLY__)</div><div class='ctx'> struct pt_regs;</div><div class='ctx'> int restore_sigcontext(struct pt_regs *, struct sigcontext __user *);</div><div class='ctx'> int setup_sigcontext(struct sigcontext __user *, struct pt_regs *);</div><div class='hunk'>@@ -33,5 +34,6 @@ void signal_fault(const char *type, struct pt_regs *,</div><div class='ctx'> void trace_unhandled_signal(const char *type, struct pt_regs *regs,</div><div class='ctx'> 			    unsigned long address, int signo);</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_TILE_SIGNAL_H */</div><div class='head'>diff --git a/arch/tile/kernel/machine_kexec.c b/arch/tile/kernel/machine_kexec.c<br/>index e00d7179989e..6255f2eab112 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/tile/kernel/machine_kexec.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/tile/kernel/machine_kexec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/tile/kernel/machine_kexec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/tile/kernel/machine_kexec.c</a></div><div class='hunk'>@@ -248,11 +248,11 @@ static void setup_quasi_va_is_pa(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-NORET_TYPE void machine_kexec(struct kimage *image)</div><div class='add'>+void machine_kexec(struct kimage *image)</div><div class='ctx'> {</div><div class='ctx'> 	void *reboot_code_buffer;</div><div class='del'>-	NORET_TYPE void (*rnk)(unsigned long, void *, unsigned long)</div><div class='del'>-		ATTRIB_NORET;</div><div class='add'>+	void (*rnk)(unsigned long, void *, unsigned long)</div><div class='add'>+		__noreturn;</div><div class='ctx'> </div><div class='ctx'> 	/* Mask all interrupts before starting to reboot. */</div><div class='ctx'> 	interrupt_mask_set_mask(~0ULL);</div><div class='head'>diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c<br/>index 9d610d3fb11e..a1bb59eecc18 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/tile/kernel/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/tile/kernel/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/tile/kernel/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/tile/kernel/pci.c</a></div><div class='hunk'>@@ -395,6 +395,11 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> 	/* Nothing needs to be done. */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void pcibios_set_master(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	/* No special bus mastering setup handling. */</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This can be called from the generic PCI layer, but doesn't need to</div><div class='ctx'>  * do anything.</div><div class='hunk'>@@ -466,27 +471,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)</div><div class='del'>-{</div><div class='del'>-	unsigned long start = pci_resource_start(dev, bar);</div><div class='del'>-	unsigned long len = pci_resource_len(dev, bar);</div><div class='del'>-	unsigned long flags = pci_resource_flags(dev, bar);</div><div class='del'>-</div><div class='del'>-	if (!len)</div><div class='del'>-		return NULL;</div><div class='del'>-	if (max &amp;&amp; len &gt; max)</div><div class='del'>-		len = max;</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; IORESOURCE_MEM)) {</div><div class='del'>-		pr_info("PCI: Trying to map invalid resource %#lx\n", flags);</div><div class='del'>-		start = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (void __iomem *)start;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(pci_iomap);</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /****************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Tile PCI config space read/write routines</div><div class='head'>diff --git a/arch/tile/kernel/sysfs.c b/arch/tile/kernel/sysfs.c<br/>index 602908268093..f862b005eb73 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/tile/kernel/sysfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/tile/kernel/sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/tile/kernel/sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/tile/kernel/sysfs.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'>  * /sys entry support.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -32,55 +32,55 @@ static ssize_t get_hv_confstr(char *page, int query)</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t chip_width_show(struct sysdev_class *dev,</div><div class='del'>-			       struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t chip_width_show(struct device *dev,</div><div class='add'>+			       struct device_attribute *attr,</div><div class='ctx'> 			       char *page)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(page, "%u\n", smp_width);</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_CLASS_ATTR(chip_width, 0444, chip_width_show, NULL);</div><div class='add'>+static DEVICE_ATTR(chip_width, 0444, chip_width_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t chip_height_show(struct sysdev_class *dev,</div><div class='del'>-				struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t chip_height_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='ctx'> 				char *page)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(page, "%u\n", smp_height);</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_CLASS_ATTR(chip_height, 0444, chip_height_show, NULL);</div><div class='add'>+static DEVICE_ATTR(chip_height, 0444, chip_height_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t chip_serial_show(struct sysdev_class *dev,</div><div class='del'>-				struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t chip_serial_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='ctx'> 				char *page)</div><div class='ctx'> {</div><div class='ctx'> 	return get_hv_confstr(page, HV_CONFSTR_CHIP_SERIAL_NUM);</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_CLASS_ATTR(chip_serial, 0444, chip_serial_show, NULL);</div><div class='add'>+static DEVICE_ATTR(chip_serial, 0444, chip_serial_show, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t chip_revision_show(struct sysdev_class *dev,</div><div class='del'>-				  struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t chip_revision_show(struct device *dev,</div><div class='add'>+				  struct device_attribute *attr,</div><div class='ctx'> 				  char *page)</div><div class='ctx'> {</div><div class='ctx'> 	return get_hv_confstr(page, HV_CONFSTR_CHIP_REV);</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_CLASS_ATTR(chip_revision, 0444, chip_revision_show, NULL);</div><div class='add'>+static DEVICE_ATTR(chip_revision, 0444, chip_revision_show, NULL);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static ssize_t type_show(struct sysdev_class *dev,</div><div class='del'>-			    struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t type_show(struct device *dev,</div><div class='add'>+			    struct device_attribute *attr,</div><div class='ctx'> 			    char *page)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(page, "tilera\n");</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_CLASS_ATTR(type, 0444, type_show, NULL);</div><div class='add'>+static DEVICE_ATTR(type, 0444, type_show, NULL);</div><div class='ctx'> </div><div class='ctx'> #define HV_CONF_ATTR(name, conf)					\</div><div class='del'>-	static ssize_t name ## _show(struct sysdev_class *dev,		\</div><div class='del'>-				     struct sysdev_class_attribute *attr, \</div><div class='add'>+	static ssize_t name ## _show(struct device *dev,		\</div><div class='add'>+				     struct device_attribute *attr, \</div><div class='ctx'> 				     char *page)			\</div><div class='ctx'> 	{								\</div><div class='ctx'> 		return get_hv_confstr(page, conf);			\</div><div class='ctx'> 	}								\</div><div class='del'>-	static SYSDEV_CLASS_ATTR(name, 0444, name ## _show, NULL);</div><div class='add'>+	static DEVICE_ATTR(name, 0444, name ## _show, NULL);</div><div class='ctx'> </div><div class='ctx'> HV_CONF_ATTR(version,		HV_CONFSTR_HV_SW_VER)</div><div class='ctx'> HV_CONF_ATTR(config_version,	HV_CONFSTR_HV_CONFIG_VER)</div><div class='hunk'>@@ -96,15 +96,15 @@ HV_CONF_ATTR(mezz_description,	HV_CONFSTR_MEZZ_DESC)</div><div class='ctx'> HV_CONF_ATTR(switch_control,	HV_CONFSTR_SWITCH_CONTROL)</div><div class='ctx'> </div><div class='ctx'> static struct attribute *board_attrs[] = {</div><div class='del'>-	&amp;attr_board_part.attr,</div><div class='del'>-	&amp;attr_board_serial.attr,</div><div class='del'>-	&amp;attr_board_revision.attr,</div><div class='del'>-	&amp;attr_board_description.attr,</div><div class='del'>-	&amp;attr_mezz_part.attr,</div><div class='del'>-	&amp;attr_mezz_serial.attr,</div><div class='del'>-	&amp;attr_mezz_revision.attr,</div><div class='del'>-	&amp;attr_mezz_description.attr,</div><div class='del'>-	&amp;attr_switch_control.attr,</div><div class='add'>+	&amp;dev_attr_board_part.attr,</div><div class='add'>+	&amp;dev_attr_board_serial.attr,</div><div class='add'>+	&amp;dev_attr_board_revision.attr,</div><div class='add'>+	&amp;dev_attr_board_description.attr,</div><div class='add'>+	&amp;dev_attr_mezz_part.attr,</div><div class='add'>+	&amp;dev_attr_mezz_serial.attr,</div><div class='add'>+	&amp;dev_attr_mezz_revision.attr,</div><div class='add'>+	&amp;dev_attr_mezz_description.attr,</div><div class='add'>+	&amp;dev_attr_switch_control.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -151,12 +151,11 @@ hvconfig_bin_read(struct file *filp, struct kobject *kobj,</div><div class='ctx'> </div><div class='ctx'> static int __init create_sysfs_entries(void)</div><div class='ctx'> {</div><div class='del'>-	struct sysdev_class *cls = &amp;cpu_sysdev_class;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> #define create_cpu_attr(name)						\</div><div class='ctx'> 	if (!err)							\</div><div class='del'>-		err = sysfs_create_file(&amp;cls-&gt;kset.kobj, &amp;attr_##name.attr);</div><div class='add'>+		err = device_create_file(cpu_subsys.dev_root, &amp;dev_attr_##name);</div><div class='ctx'> 	create_cpu_attr(chip_width);</div><div class='ctx'> 	create_cpu_attr(chip_height);</div><div class='ctx'> 	create_cpu_attr(chip_serial);</div><div class='hunk'>@@ -164,7 +163,7 @@ static int __init create_sysfs_entries(void)</div><div class='ctx'> </div><div class='ctx'> #define create_hv_attr(name)						\</div><div class='ctx'> 	if (!err)							\</div><div class='del'>-		err = sysfs_create_file(hypervisor_kobj, &amp;attr_##name.attr);</div><div class='add'>+		err = sysfs_create_file(hypervisor_kobj, &amp;dev_attr_##name);</div><div class='ctx'> 	create_hv_attr(type);</div><div class='ctx'> 	create_hv_attr(version);</div><div class='ctx'> 	create_hv_attr(config_version);</div><div class='head'>diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common<br/>index a9234838e8a2..b37ae706af3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/Kconfig.common?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/um/Kconfig.common</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/Kconfig.common?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/um/Kconfig.common</a></div><div class='hunk'>@@ -8,6 +8,7 @@ config UML</div><div class='ctx'> 	default y</div><div class='ctx'> 	select HAVE_GENERIC_HARDIRQS</div><div class='ctx'> 	select GENERIC_IRQ_SHOW</div><div class='add'>+	select GENERIC_CPU_DEVICES</div><div class='ctx'> </div><div class='ctx'> config MMU</div><div class='ctx'> 	bool</div><div class='head'>diff --git a/arch/um/Makefile b/arch/um/Makefile<br/>index 7730af6ec13f..28688e6d96d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/um/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/um/Makefile</a></div><div class='hunk'>@@ -64,7 +64,8 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\</div><div class='ctx'> #This will adjust *FLAGS accordingly to the platform.</div><div class='ctx'> include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)</div><div class='ctx'> </div><div class='del'>-KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include</div><div class='add'>+KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \</div><div class='add'>+		   -I$(HOST_DIR)/include/generated</div><div class='ctx'> </div><div class='ctx'> # -Derrno=kernel_errno - This turns all kernel references to errno into</div><div class='ctx'> # kernel_errno to separate them from the libc errno.  This allows -fno-common</div><div class='hunk'>@@ -96,6 +97,10 @@ endef</div><div class='ctx'> </div><div class='ctx'> KBUILD_KCONFIG := $(HOST_DIR)/um/Kconfig</div><div class='ctx'> </div><div class='add'>+archheaders:</div><div class='add'>+	$(Q)$(MAKE) -C '$(srctree)' KBUILD_SRC= \</div><div class='add'>+		ARCH=$(SUBARCH) O='$(objtree)' archheaders</div><div class='add'>+</div><div class='ctx'> archprepare: include/generated/user_constants.h</div><div class='ctx'> </div><div class='ctx'> LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static</div><div class='hunk'>@@ -135,7 +140,7 @@ archclean:</div><div class='ctx'> </div><div class='ctx'> # Generated files</div><div class='ctx'> </div><div class='del'>-$(HOST_DIR)/um/user-offsets.s: FORCE</div><div class='add'>+$(HOST_DIR)/um/user-offsets.s: __headers FORCE</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=$(HOST_DIR)/um $@</div><div class='ctx'> </div><div class='ctx'> define filechk_gen-asm-offsets</div><div class='head'>diff --git a/arch/um/include/asm/thread_info.h b/arch/um/include/asm/thread_info.h<br/>index 5bd1bad33fab..200c4ab1240c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/um/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/um/include/asm/thread_info.h</a></div><div class='hunk'>@@ -71,7 +71,6 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define TIF_MEMDIE		5	/* is terminating due to OOM killer */</div><div class='ctx'> #define TIF_SYSCALL_AUDIT	6</div><div class='ctx'> #define TIF_RESTORE_SIGMASK	7</div><div class='del'>-#define TIF_FREEZE		16	/* is freezing for suspend */</div><div class='ctx'> </div><div class='ctx'> #define _TIF_SYSCALL_TRACE	(1 &lt;&lt; TIF_SYSCALL_TRACE)</div><div class='ctx'> #define _TIF_SIGPENDING		(1 &lt;&lt; TIF_SIGPENDING)</div><div class='hunk'>@@ -80,6 +79,5 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define _TIF_MEMDIE		(1 &lt;&lt; TIF_MEMDIE)</div><div class='ctx'> #define _TIF_SYSCALL_AUDIT	(1 &lt;&lt; TIF_SYSCALL_AUDIT)</div><div class='ctx'> #define _TIF_RESTORE_SIGMASK	(1 &lt;&lt; TIF_RESTORE_SIGMASK)</div><div class='del'>-#define _TIF_FREEZE		(1 &lt;&lt; TIF_FREEZE)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c<br/>index c9da32b0c707..06b190390505 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/ptrace.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/um/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/um/kernel/ptrace.c</a></div><div class='hunk'>@@ -167,17 +167,15 @@ void syscall_trace(struct uml_pt_regs *regs, int entryexit)</div><div class='ctx'> 	int is_singlestep = (current-&gt;ptrace &amp; PT_DTRACE) &amp;&amp; entryexit;</div><div class='ctx'> 	int tracesysgood;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context)) {</div><div class='del'>-		if (!entryexit)</div><div class='del'>-			audit_syscall_entry(HOST_AUDIT_ARCH,</div><div class='del'>-					    UPT_SYSCALL_NR(regs),</div><div class='del'>-					    UPT_SYSCALL_ARG1(regs),</div><div class='del'>-					    UPT_SYSCALL_ARG2(regs),</div><div class='del'>-					    UPT_SYSCALL_ARG3(regs),</div><div class='del'>-					    UPT_SYSCALL_ARG4(regs));</div><div class='del'>-		else audit_syscall_exit(AUDITSC_RESULT(UPT_SYSCALL_RET(regs)),</div><div class='del'>-					UPT_SYSCALL_RET(regs));</div><div class='del'>-	}</div><div class='add'>+	if (!entryexit)</div><div class='add'>+		audit_syscall_entry(HOST_AUDIT_ARCH,</div><div class='add'>+				    UPT_SYSCALL_NR(regs),</div><div class='add'>+				    UPT_SYSCALL_ARG1(regs),</div><div class='add'>+				    UPT_SYSCALL_ARG2(regs),</div><div class='add'>+				    UPT_SYSCALL_ARG3(regs),</div><div class='add'>+				    UPT_SYSCALL_ARG4(regs));</div><div class='add'>+	else</div><div class='add'>+		audit_syscall_exit(regs);</div><div class='ctx'> </div><div class='ctx'> 	/* Fake a debug trap */</div><div class='ctx'> 	if (is_singlestep)</div><div class='head'>diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig<br/>index 942ed6174f1d..eeb8054c7cd8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/unicore32/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/unicore32/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/unicore32/Kconfig</a></div><div class='hunk'>@@ -12,6 +12,7 @@ config UNICORE32</div><div class='ctx'> 	select GENERIC_IRQ_PROBE</div><div class='ctx'> 	select GENERIC_IRQ_SHOW</div><div class='ctx'> 	select ARCH_WANT_FRAME_POINTERS</div><div class='add'>+	select GENERIC_IOMAP</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'>@@ -30,9 +31,6 @@ config GENERIC_CLOCKEVENTS</div><div class='ctx'> config GENERIC_CSUM</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config GENERIC_IOMAP</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config NO_IOPORT</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='head'>diff --git a/arch/unicore32/include/asm/io.h b/arch/unicore32/include/asm/io.h<br/>index 1a5c5a5eb39c..adddf6d64077 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/unicore32/include/asm/io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/include/asm/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/unicore32/include/asm/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/unicore32/include/asm/io.h</a></div><div class='hunk'>@@ -37,15 +37,9 @@ extern void __uc32_iounmap(volatile void __iomem *addr);</div><div class='ctx'>  */</div><div class='ctx'> #define ioremap(cookie, size)		__uc32_ioremap(cookie, size)</div><div class='ctx'> #define ioremap_cached(cookie, size)	__uc32_ioremap_cached(cookie, size)</div><div class='add'>+#define ioremap_nocache(cookie, size)	__uc32_ioremap(cookie, size)</div><div class='ctx'> #define iounmap(cookie)			__uc32_iounmap(cookie)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Convert a physical pointer to a virtual kernel pointer for /dev/mem</div><div class='del'>- * access</div><div class='del'>- */</div><div class='del'>-#undef xlate_dev_mem_ptr</div><div class='del'>-#define xlate_dev_mem_ptr(p)	__va(p)</div><div class='del'>-</div><div class='ctx'> #define HAVE_ARCH_PIO_SIZE</div><div class='ctx'> #define PIO_OFFSET		(unsigned int)(PCI_IOBASE)</div><div class='ctx'> #define PIO_MASK		(unsigned int)(IO_SPACE_LIMIT)</div><div class='head'>diff --git a/arch/unicore32/include/asm/pci.h b/arch/unicore32/include/asm/pci.h<br/>index c5b28b459535..dd3867727c35 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/unicore32/include/asm/pci.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/include/asm/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/unicore32/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/unicore32/include/asm/pci.h</a></div><div class='hunk'>@@ -17,11 +17,6 @@</div><div class='ctx'> #include &lt;asm-generic/pci.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt; /* for PCIBIOS_MIN_* */</div><div class='ctx'> </div><div class='del'>-static inline void pcibios_set_master(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	/* No special bus mastering setup handling */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void pcibios_penalize_isa_irq(int irq, int active)</div><div class='ctx'> {</div><div class='ctx'> 	/* We don't do dynamic PCI IRQ allocation */</div><div class='head'>diff --git a/arch/unicore32/include/asm/thread_info.h b/arch/unicore32/include/asm/thread_info.h<br/>index c270e9e04861..89f7557583b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/unicore32/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/unicore32/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/unicore32/include/asm/thread_info.h</a></div><div class='hunk'>@@ -135,14 +135,12 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define TIF_NOTIFY_RESUME	2	/* callback before returning to user */</div><div class='ctx'> #define TIF_SYSCALL_TRACE	8</div><div class='ctx'> #define TIF_MEMDIE		18</div><div class='del'>-#define TIF_FREEZE		19</div><div class='ctx'> #define TIF_RESTORE_SIGMASK	20</div><div class='ctx'> </div><div class='ctx'> #define _TIF_SIGPENDING		(1 &lt;&lt; TIF_SIGPENDING)</div><div class='ctx'> #define _TIF_NEED_RESCHED	(1 &lt;&lt; TIF_NEED_RESCHED)</div><div class='ctx'> #define _TIF_NOTIFY_RESUME	(1 &lt;&lt; TIF_NOTIFY_RESUME)</div><div class='ctx'> #define _TIF_SYSCALL_TRACE	(1 &lt;&lt; TIF_SYSCALL_TRACE)</div><div class='del'>-#define _TIF_FREEZE		(1 &lt;&lt; TIF_FREEZE)</div><div class='ctx'> #define _TIF_RESTORE_SIGMASK	(1 &lt;&lt; TIF_RESTORE_SIGMASK)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c<br/>index 4892fbb54ebf..a8f07fe10cad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/unicore32/kernel/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/kernel/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/unicore32/kernel/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/unicore32/kernel/pci.c</a></div><div class='hunk'>@@ -309,6 +309,11 @@ char * __devinit pcibios_setup(char *str)</div><div class='ctx'> 	return str;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void pcibios_set_master(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	/* No special bus mastering setup handling */</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * From arch/i386/kernel/pci-i386.c:</div><div class='ctx'>  *</div><div class='head'>diff --git a/arch/unicore32/kernel/puv3-core.c b/arch/unicore32/kernel/puv3-core.c<br/>index 1a505a787765..254adeecc61a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/unicore32/kernel/puv3-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/kernel/puv3-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/unicore32/kernel/puv3-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/unicore32/kernel/puv3-core.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.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='head'>diff --git a/arch/unicore32/kernel/puv3-nb0916.c b/arch/unicore32/kernel/puv3-nb0916.c<br/>index e731c561ed4e..181108b8ecce 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/unicore32/kernel/puv3-nb0916.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/kernel/puv3-nb0916.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/unicore32/kernel/puv3-nb0916.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/unicore32/kernel/puv3-nb0916.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='hunk'>@@ -124,7 +123,7 @@ int __init mach_nb0916_init(void)</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(gpio_to_irq(GPI_LCD_CASE_OFF),</div><div class='ctx'> 		&amp;nb0916_lcdcaseoff_handler,</div><div class='del'>-		IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='add'>+		IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='ctx'> 		"NB0916 lcd case off", NULL) &lt; 0) {</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_DEBUG "LCD-Case-OFF IRQ %d not available\n",</div><div class='hunk'>@@ -132,7 +131,7 @@ int __init mach_nb0916_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(gpio_to_irq(GPI_OTP_INT), &amp;nb0916_overheat_handler,</div><div class='del'>-		IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='add'>+		IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='ctx'> 		"NB0916 overheating protection", NULL) &lt; 0) {</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_DEBUG "Overheating Protection IRQ %d not available\n",</div><div class='head'>diff --git a/arch/unicore32/kernel/setup.c b/arch/unicore32/kernel/setup.c<br/>index 673d7a89d8ff..87adbf5ebfe0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/unicore32/kernel/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/unicore32/kernel/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/unicore32/kernel/setup.c</a></div><div class='hunk'>@@ -65,7 +65,7 @@ static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;</div><div class='ctx'>  */</div><div class='ctx'> static struct resource mem_res[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name = "Kernel text",</div><div class='add'>+		.name = "Kernel code",</div><div class='ctx'> 		.start = 0,</div><div class='ctx'> 		.end = 0,</div><div class='ctx'> 		.flags = IORESOURCE_MEM</div><div class='head'>diff --git a/arch/unicore32/kernel/signal.c b/arch/unicore32/kernel/signal.c<br/>index b163fca56789..911b549a6df5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/unicore32/kernel/signal.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/unicore32/kernel/signal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/unicore32/kernel/signal.c</a></div><div class='hunk'>@@ -63,10 +63,7 @@ static int restore_sigframe(struct pt_regs *regs, struct sigframe __user *sf)</div><div class='ctx'> 	err = __copy_from_user(&amp;set, &amp;sf-&gt;uc.uc_sigmask, sizeof(set));</div><div class='ctx'> 	if (err == 0) {</div><div class='ctx'> 		sigdelsetmask(&amp;set, ~_BLOCKABLE);</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='ctx'> </div><div class='ctx'> 	err |= __get_user(regs-&gt;UCreg_00, &amp;sf-&gt;uc.uc_mcontext.regs.UCreg_00);</div><div class='hunk'>@@ -321,6 +318,7 @@ static int handle_signal(unsigned long sig, struct k_sigaction *ka,</div><div class='ctx'> {</div><div class='ctx'> 	struct thread_info *thread = current_thread_info();</div><div class='ctx'> 	struct task_struct *tsk = current;</div><div class='add'>+	sigset_t blocked;</div><div class='ctx'> 	int usig = sig;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -372,13 +370,10 @@ static int handle_signal(unsigned long sig, struct k_sigaction *ka,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Block the signal if we were successful.</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock_irq(&amp;tsk-&gt;sighand-&gt;siglock);</div><div class='del'>-	sigorsets(&amp;tsk-&gt;blocked, &amp;tsk-&gt;blocked,</div><div class='del'>-		  &amp;ka-&gt;sa.sa_mask);</div><div class='add'>+	sigorsets(&amp;blocked, &amp;tsk-&gt;blocked, &amp;ka-&gt;sa.sa_mask);</div><div class='ctx'> 	if (!(ka-&gt;sa.sa_flags &amp; SA_NODEFER))</div><div class='del'>-		sigaddset(&amp;tsk-&gt;blocked, sig);</div><div class='del'>-	recalc_sigpending();</div><div class='del'>-	spin_unlock_irq(&amp;tsk-&gt;sighand-&gt;siglock);</div><div class='add'>+		sigaddset(&amp;blocked, sig);</div><div class='add'>+	set_current_blocked(&amp;blocked);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/unicore32/kernel/time.c b/arch/unicore32/kernel/time.c<br/>index 080710c09241..d3824b2ff644 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/unicore32/kernel/time.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/unicore32/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/unicore32/kernel/time.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/unicore32/kernel/time.c</a></div><div class='hunk'>@@ -86,7 +86,7 @@ static struct clocksource cksrc_puv3_oscr = {</div><div class='ctx'> </div><div class='ctx'> static struct irqaction puv3_timer_irq = {</div><div class='ctx'> 	.name		= "ost0",</div><div class='del'>-	.flags		= IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,</div><div class='add'>+	.flags		= IRQF_TIMER | IRQF_IRQPOLL,</div><div class='ctx'> 	.handler	= puv3_ost0_interrupt,</div><div class='ctx'> 	.dev_id		= &amp;ckevt_puv3_osmr0,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/x86/.gitignore b/arch/x86/.gitignore<br/>index 028079065af6..7cab8c08e6d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/.gitignore?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/.gitignore</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/.gitignore?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/.gitignore</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='ctx'> boot/compressed/vmlinux</div><div class='ctx'> tools/test_get_len</div><div class='add'>+tools/insn_sanity</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig<br/>index 5731eb70e0a0..864cc6e6ac8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/Kconfig</a></div><div class='hunk'>@@ -60,8 +60,12 @@ config X86</div><div class='ctx'> 	select PERF_EVENTS</div><div class='ctx'> 	select HAVE_PERF_EVENTS_NMI</div><div class='ctx'> 	select ANON_INODES</div><div class='add'>+	select HAVE_ALIGNED_STRUCT_PAGE if SLUB &amp;&amp; !M386</div><div class='add'>+	select HAVE_CMPXCHG_LOCAL if !M386</div><div class='add'>+	select HAVE_CMPXCHG_DOUBLE</div><div class='ctx'> 	select HAVE_ARCH_KMEMCHECK</div><div class='ctx'> 	select HAVE_USER_RETURN_NOTIFIER</div><div class='add'>+	select ARCH_BINFMT_ELF_RANDOMIZE_PIE</div><div class='ctx'> 	select HAVE_ARCH_JUMP_LABEL</div><div class='ctx'> 	select HAVE_TEXT_POKE_SMP</div><div class='ctx'> 	select HAVE_GENERIC_HARDIRQS</div><div class='hunk'>@@ -77,6 +81,7 @@ config X86</div><div class='ctx'> 	select HAVE_BPF_JIT if (X86_64 &amp;&amp; NET)</div><div class='ctx'> 	select CLKEVT_I8253</div><div class='ctx'> 	select ARCH_HAVE_NMI_SAFE_CMPXCHG</div><div class='add'>+	select GENERIC_IOMAP</div><div class='ctx'> </div><div class='ctx'> config INSTRUCTION_DECODER</div><div class='ctx'> 	def_bool (KPROBES || PERF_EVENTS)</div><div class='hunk'>@@ -120,16 +125,6 @@ config HAVE_LATENCYTOP_SUPPORT</div><div class='ctx'> config MMU</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='del'>-config ZONE_DMA</div><div class='del'>-	bool "DMA memory allocation support" if EXPERT</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  DMA memory allocation support allows devices with less than 32-bit</div><div class='del'>-	  addressing to allocate within the first 16MB of address space.</div><div class='del'>-	  Disable if no such devices will be used.</div><div class='del'>-</div><div class='del'>-	  If unsure, say Y.</div><div class='del'>-</div><div class='ctx'> config SBUS</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='hunk'>@@ -142,9 +137,6 @@ config NEED_SG_DMA_LENGTH</div><div class='ctx'> config GENERIC_ISA_DMA</div><div class='ctx'> 	def_bool ISA_DMA_API</div><div class='ctx'> </div><div class='del'>-config GENERIC_IOMAP</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'>@@ -253,6 +245,16 @@ source "kernel/Kconfig.freezer"</div><div class='ctx'> </div><div class='ctx'> menu "Processor type and features"</div><div class='ctx'> </div><div class='add'>+config ZONE_DMA</div><div class='add'>+	bool "DMA memory allocation support" if EXPERT</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  DMA memory allocation support allows devices with less than 32-bit</div><div class='add'>+	  addressing to allocate within the first 16MB of address space.</div><div class='add'>+	  Disable if no such devices will be used.</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y.</div><div class='add'>+</div><div class='ctx'> source "kernel/time/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config SMP</div><div class='hunk'>@@ -421,12 +423,14 @@ config X86_MRST</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	depends on PCI_GOANY</div><div class='ctx'> 	depends on X86_IO_APIC</div><div class='add'>+	select X86_INTEL_MID</div><div class='add'>+	select SFI</div><div class='add'>+	select DW_APB_TIMER</div><div class='ctx'> 	select APB_TIMER</div><div class='ctx'> 	select I2C</div><div class='ctx'> 	select SPI</div><div class='ctx'> 	select INTEL_SCU_IPC</div><div class='ctx'> 	select X86_PLATFORM_DEVICES</div><div class='del'>-	select X86_INTEL_MID</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin</div><div class='ctx'> 	  Internet Device(MID) platform. Moorestown consists of two chips:</div><div class='hunk'>@@ -435,6 +439,26 @@ config X86_MRST</div><div class='ctx'> 	  nor standard legacy replacement devices/features. e.g. Moorestown does</div><div class='ctx'> 	  not contain i8259, i8254, HPET, legacy BIOS, most of the io ports.</div><div class='ctx'> </div><div class='add'>+config X86_MDFLD</div><div class='add'>+       bool "Medfield MID platform"</div><div class='add'>+	depends on PCI</div><div class='add'>+	depends on PCI_GOANY</div><div class='add'>+	depends on X86_IO_APIC</div><div class='add'>+	select X86_INTEL_MID</div><div class='add'>+	select SFI</div><div class='add'>+	select DW_APB_TIMER</div><div class='add'>+	select APB_TIMER</div><div class='add'>+	select I2C</div><div class='add'>+	select SPI</div><div class='add'>+	select INTEL_SCU_IPC</div><div class='add'>+	select X86_PLATFORM_DEVICES</div><div class='add'>+	---help---</div><div class='add'>+	  Medfield is Intel's Low Power Intel Architecture (LPIA) based Moblin</div><div class='add'>+	  Internet Device(MID) platform. </div><div class='add'>+	  Unlike standard x86 PCs, Medfield does not have many legacy devices</div><div class='add'>+	  nor standard legacy replacement devices/features. e.g. Medfield does</div><div class='add'>+	  not contain i8259, i8254, HPET, legacy BIOS, most of the io ports.</div><div class='add'>+</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> config X86_RDC321X</div><div class='hunk'>@@ -632,7 +656,7 @@ config X86_SUMMIT_NUMA</div><div class='ctx'> </div><div class='ctx'> config X86_CYCLONE_TIMER</div><div class='ctx'> 	def_bool y</div><div class='del'>-	depends on X86_32_NON_STANDARD</div><div class='add'>+	depends on X86_SUMMIT</div><div class='ctx'> </div><div class='ctx'> source "arch/x86/Kconfig.cpu"</div><div class='ctx'> </div><div class='hunk'>@@ -660,9 +684,10 @@ config HPET_EMULATE_RTC</div><div class='ctx'> 	depends on HPET_TIMER &amp;&amp; (RTC=y || RTC=m || RTC_DRV_CMOS=m || RTC_DRV_CMOS=y)</div><div class='ctx'> </div><div class='ctx'> config APB_TIMER</div><div class='del'>-       def_bool y if MRST</div><div class='del'>-       prompt "Langwell APB Timer Support" if X86_MRST</div><div class='add'>+       def_bool y if X86_INTEL_MID</div><div class='add'>+       prompt "Intel MID APB Timer Support" if X86_INTEL_MID</div><div class='ctx'>        select DW_APB_TIMER</div><div class='add'>+       depends on X86_INTEL_MID &amp;&amp; SFI</div><div class='ctx'>        help</div><div class='ctx'>          APB timer is the replacement for 8254, HPET on X86 MID platforms.</div><div class='ctx'>          The APBT provides a stable time base on SMP</div><div class='hunk'>@@ -1490,6 +1515,13 @@ config EFI</div><div class='ctx'> 	  resultant kernel should continue to boot on existing non-EFI</div><div class='ctx'> 	  platforms.</div><div class='ctx'> </div><div class='add'>+config EFI_STUB</div><div class='add'>+       bool "EFI stub support"</div><div class='add'>+       depends on EFI</div><div class='add'>+       ---help---</div><div class='add'>+          This kernel feature allows a bzImage to be loaded directly</div><div class='add'>+	  by EFI firmware without the use of a bootloader.</div><div class='add'>+</div><div class='ctx'> config SECCOMP</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	prompt "Enable seccomp to safely compute untrusted bytecode"</div><div class='hunk'>@@ -1742,7 +1774,7 @@ source "drivers/sfi/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config X86_APM_BOOT</div><div class='ctx'> 	def_bool y</div><div class='del'>-	depends on APM || APM_MODULE</div><div class='add'>+	depends on APM</div><div class='ctx'> </div><div class='ctx'> menuconfig APM</div><div class='ctx'> 	tristate "APM (Advanced Power Management) BIOS support"</div><div class='head'>diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu<br/>index e3ca7e0d858c..3c57033e2211 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/Kconfig.cpu?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/Kconfig.cpu</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/Kconfig.cpu?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/Kconfig.cpu</a></div><div class='hunk'>@@ -309,12 +309,6 @@ config X86_INTERNODE_CACHE_SHIFT</div><div class='ctx'> config X86_CMPXCHG</div><div class='ctx'> 	def_bool X86_64 || (X86_32 &amp;&amp; !M386)</div><div class='ctx'> </div><div class='del'>-config CMPXCHG_LOCAL</div><div class='del'>-	def_bool X86_64 || (X86_32 &amp;&amp; !M386)</div><div class='del'>-</div><div class='del'>-config CMPXCHG_DOUBLE</div><div class='del'>-	def_bool y</div><div class='del'>-</div><div class='ctx'> config X86_L1_CACHE_SHIFT</div><div class='ctx'> 	int</div><div class='ctx'> 	default "7" if MPENTIUM4 || MPSC</div><div class='head'>diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug<br/>index bf56e1793272..e46c2147397f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/Kconfig.debug?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/Kconfig.debug</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/Kconfig.debug?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/Kconfig.debug</a></div><div class='hunk'>@@ -43,9 +43,9 @@ config EARLY_PRINTK</div><div class='ctx'> 	  with klogd/syslogd or the X server. You should normally N here,</div><div class='ctx'> 	  unless you want to debug such a crash.</div><div class='ctx'> </div><div class='del'>-config EARLY_PRINTK_MRST</div><div class='del'>-	bool "Early printk for MRST platform support"</div><div class='del'>-	depends on EARLY_PRINTK &amp;&amp; X86_MRST</div><div class='add'>+config EARLY_PRINTK_INTEL_MID</div><div class='add'>+	bool "Early printk for Intel MID platform support"</div><div class='add'>+	depends on EARLY_PRINTK &amp;&amp; X86_INTEL_MID</div><div class='ctx'> </div><div class='ctx'> config EARLY_PRINTK_DBGP</div><div class='ctx'> 	bool "Early printk via EHCI debug port"</div><div class='hunk'>@@ -63,8 +63,11 @@ config DEBUG_STACKOVERFLOW</div><div class='ctx'> 	bool "Check for stack overflows"</div><div class='ctx'> 	depends on DEBUG_KERNEL</div><div class='ctx'> 	---help---</div><div class='del'>-	  This option will cause messages to be printed if free stack space</div><div class='del'>-	  drops below a certain limit.</div><div class='add'>+	  Say Y here if you want to check the overflows of kernel, IRQ</div><div class='add'>+	  and exception stacks. This option will cause messages of the</div><div class='add'>+	  stacks in detail when free stack space drops below a certain</div><div class='add'>+	  limit.</div><div class='add'>+	  If in doubt, say "N".</div><div class='ctx'> </div><div class='ctx'> config X86_PTDUMP</div><div class='ctx'> 	bool "Export kernel pagetable layout to userspace via debugfs"</div><div class='hunk'>@@ -284,4 +287,16 @@ config DEBUG_STRICT_USER_COPY_CHECKS</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, or if you run an older (pre 4.4) gcc, say N.</div><div class='ctx'> </div><div class='add'>+config DEBUG_NMI_SELFTEST</div><div class='add'>+	bool "NMI Selftest"</div><div class='add'>+	depends on DEBUG_KERNEL &amp;&amp; X86_LOCAL_APIC</div><div class='add'>+	---help---</div><div class='add'>+	  Enabling this option turns on a quick NMI selftest to verify</div><div class='add'>+	  that the NMI behaves correctly.</div><div class='add'>+</div><div class='add'>+	  This might help diagnose strange hangs that rely on NMI to</div><div class='add'>+	  function properly.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/arch/x86/Makefile b/arch/x86/Makefile<br/>index b02e509072a7..209ba1294592 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/Makefile</a></div><div class='hunk'>@@ -118,6 +118,12 @@ KBUILD_CFLAGS += $(mflags-y)</div><div class='ctx'> KBUILD_AFLAGS += $(mflags-y)</div><div class='ctx'> </div><div class='ctx'> ###</div><div class='add'>+# Syscall table generation</div><div class='add'>+</div><div class='add'>+archheaders:</div><div class='add'>+	$(Q)$(MAKE) $(build)=arch/x86/syscalls all</div><div class='add'>+</div><div class='add'>+###</div><div class='ctx'> # Kernel objects</div><div class='ctx'> </div><div class='ctx'> head-y := arch/x86/kernel/head_$(BITS).o</div><div class='head'>diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile<br/>index 09664efb9cee..b123b9a8f5b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/boot/compressed/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/boot/compressed/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/boot/compressed/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/boot/compressed/Makefile</a></div><div class='hunk'>@@ -23,7 +23,15 @@ LDFLAGS_vmlinux := -T</div><div class='ctx'> </div><div class='ctx'> hostprogs-y	:= mkpiggy</div><div class='ctx'> </div><div class='del'>-$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o $(obj)/piggy.o FORCE</div><div class='add'>+VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \</div><div class='add'>+	$(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o \</div><div class='add'>+	$(obj)/piggy.o</div><div class='add'>+</div><div class='add'>+ifeq ($(CONFIG_EFI_STUB), y)</div><div class='add'>+	VMLINUX_OBJS += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+$(obj)/vmlinux: $(VMLINUX_OBJS) FORCE</div><div class='ctx'> 	$(call if_changed,ld)</div><div class='ctx'> 	@:</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c<br/>new file mode 100644<br/>index 000000000000..fec216f4fbc3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/boot/compressed/eboot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/boot/compressed/eboot.c</a></div><div class='hunk'>@@ -0,0 +1,1022 @@</div><div class='add'>+/* -----------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ *   Copyright 2011 Intel Corporation; author Matt Fleming</div><div class='add'>+ *</div><div class='add'>+ *   This file is part of the Linux kernel, and is made available under</div><div class='add'>+ *   the terms of the GNU General Public License version 2.</div><div class='add'>+ *</div><div class='add'>+ * ----------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/efi.h&gt;</div><div class='add'>+#include &lt;asm/efi.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/desc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "eboot.h"</div><div class='add'>+</div><div class='add'>+static efi_system_table_t *sys_table;</div><div class='add'>+</div><div class='add'>+static efi_status_t __get_map(efi_memory_desc_t **map, unsigned long *map_size,</div><div class='add'>+			      unsigned long *desc_size)</div><div class='add'>+{</div><div class='add'>+	efi_memory_desc_t *m = NULL;</div><div class='add'>+	efi_status_t status;</div><div class='add'>+	unsigned long key;</div><div class='add'>+	u32 desc_version;</div><div class='add'>+</div><div class='add'>+	*map_size = sizeof(*m) * 32;</div><div class='add'>+again:</div><div class='add'>+	/*</div><div class='add'>+	 * Add an additional efi_memory_desc_t because we're doing an</div><div class='add'>+	 * allocation which may be in a new descriptor region.</div><div class='add'>+	 */</div><div class='add'>+	*map_size += sizeof(*m);</div><div class='add'>+	status = efi_call_phys3(sys_table-&gt;boottime-&gt;allocate_pool,</div><div class='add'>+				EFI_LOADER_DATA, *map_size, (void **)&amp;m);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	status = efi_call_phys5(sys_table-&gt;boottime-&gt;get_memory_map, map_size,</div><div class='add'>+				m, &amp;key, desc_size, &amp;desc_version);</div><div class='add'>+	if (status == EFI_BUFFER_TOO_SMALL) {</div><div class='add'>+		efi_call_phys1(sys_table-&gt;boottime-&gt;free_pool, m);</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		efi_call_phys1(sys_table-&gt;boottime-&gt;free_pool, m);</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	*map = m;</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate at the highest possible address that is not above 'max'.</div><div class='add'>+ */</div><div class='add'>+static efi_status_t high_alloc(unsigned long size, unsigned long align,</div><div class='add'>+			      unsigned long *addr, unsigned long max)</div><div class='add'>+{</div><div class='add'>+	unsigned long map_size, desc_size;</div><div class='add'>+	efi_memory_desc_t *map;</div><div class='add'>+	efi_status_t status;</div><div class='add'>+	unsigned long nr_pages;</div><div class='add'>+	u64 max_addr = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	status = __get_map(&amp;map, &amp;map_size, &amp;desc_size);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE;</div><div class='add'>+again:</div><div class='add'>+	for (i = 0; i &lt; map_size / desc_size; i++) {</div><div class='add'>+		efi_memory_desc_t *desc;</div><div class='add'>+		unsigned long m = (unsigned long)map;</div><div class='add'>+		u64 start, end;</div><div class='add'>+</div><div class='add'>+		desc = (efi_memory_desc_t *)(m + (i * desc_size));</div><div class='add'>+		if (desc-&gt;type != EFI_CONVENTIONAL_MEMORY)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (desc-&gt;num_pages &lt; nr_pages)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		start = desc-&gt;phys_addr;</div><div class='add'>+		end = start + desc-&gt;num_pages * (1UL &lt;&lt; EFI_PAGE_SHIFT);</div><div class='add'>+</div><div class='add'>+		if ((start + size) &gt; end || (start + size) &gt; max)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (end - size &gt; max)</div><div class='add'>+			end = max;</div><div class='add'>+</div><div class='add'>+		if (round_down(end - size, align) &lt; start)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		start = round_down(end - size, align);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Don't allocate at 0x0. It will confuse code that</div><div class='add'>+		 * checks pointers against NULL.</div><div class='add'>+		 */</div><div class='add'>+		if (start == 0x0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (start &gt; max_addr)</div><div class='add'>+			max_addr = start;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!max_addr)</div><div class='add'>+		status = EFI_NOT_FOUND;</div><div class='add'>+	else {</div><div class='add'>+		status = efi_call_phys4(sys_table-&gt;boottime-&gt;allocate_pages,</div><div class='add'>+					EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA,</div><div class='add'>+					nr_pages, &amp;max_addr);</div><div class='add'>+		if (status != EFI_SUCCESS) {</div><div class='add'>+			max = max_addr;</div><div class='add'>+			max_addr = 0;</div><div class='add'>+			goto again;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*addr = max_addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+free_pool:</div><div class='add'>+	efi_call_phys1(sys_table-&gt;boottime-&gt;free_pool, map);</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate at the lowest possible address.</div><div class='add'>+ */</div><div class='add'>+static efi_status_t low_alloc(unsigned long size, unsigned long align,</div><div class='add'>+			      unsigned long *addr)</div><div class='add'>+{</div><div class='add'>+	unsigned long map_size, desc_size;</div><div class='add'>+	efi_memory_desc_t *map;</div><div class='add'>+	efi_status_t status;</div><div class='add'>+	unsigned long nr_pages;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	status = __get_map(&amp;map, &amp;map_size, &amp;desc_size);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE;</div><div class='add'>+	for (i = 0; i &lt; map_size / desc_size; i++) {</div><div class='add'>+		efi_memory_desc_t *desc;</div><div class='add'>+		unsigned long m = (unsigned long)map;</div><div class='add'>+		u64 start, end;</div><div class='add'>+</div><div class='add'>+		desc = (efi_memory_desc_t *)(m + (i * desc_size));</div><div class='add'>+</div><div class='add'>+		if (desc-&gt;type != EFI_CONVENTIONAL_MEMORY)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (desc-&gt;num_pages &lt; nr_pages)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		start = desc-&gt;phys_addr;</div><div class='add'>+		end = start + desc-&gt;num_pages * (1UL &lt;&lt; EFI_PAGE_SHIFT);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Don't allocate at 0x0. It will confuse code that</div><div class='add'>+		 * checks pointers against NULL. Skip the first 8</div><div class='add'>+		 * bytes so we start at a nice even number.</div><div class='add'>+		 */</div><div class='add'>+		if (start == 0x0)</div><div class='add'>+			start += 8;</div><div class='add'>+</div><div class='add'>+		start = round_up(start, align);</div><div class='add'>+		if ((start + size) &gt; end)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		status = efi_call_phys4(sys_table-&gt;boottime-&gt;allocate_pages,</div><div class='add'>+					EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA,</div><div class='add'>+					nr_pages, &amp;start);</div><div class='add'>+		if (status == EFI_SUCCESS) {</div><div class='add'>+			*addr = start;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i == map_size / desc_size)</div><div class='add'>+		status = EFI_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+free_pool:</div><div class='add'>+	efi_call_phys1(sys_table-&gt;boottime-&gt;free_pool, map);</div><div class='add'>+fail:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void low_free(unsigned long size, unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	unsigned long nr_pages;</div><div class='add'>+</div><div class='add'>+	nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE;</div><div class='add'>+	efi_call_phys2(sys_table-&gt;boottime-&gt;free_pages, addr, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void find_bits(unsigned long mask, u8 *pos, u8 *size)</div><div class='add'>+{</div><div class='add'>+	u8 first, len;</div><div class='add'>+</div><div class='add'>+	first = 0;</div><div class='add'>+	len = 0;</div><div class='add'>+</div><div class='add'>+	if (mask) {</div><div class='add'>+		while (!(mask &amp; 0x1)) {</div><div class='add'>+			mask = mask &gt;&gt; 1;</div><div class='add'>+			first++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		while (mask &amp; 0x1) {</div><div class='add'>+			mask = mask &gt;&gt; 1;</div><div class='add'>+			len++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*pos = first;</div><div class='add'>+	*size = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * See if we have Graphics Output Protocol</div><div class='add'>+ */</div><div class='add'>+static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto,</div><div class='add'>+			      unsigned long size)</div><div class='add'>+{</div><div class='add'>+	struct efi_graphics_output_protocol *gop, *first_gop;</div><div class='add'>+	struct efi_pixel_bitmask pixel_info;</div><div class='add'>+	unsigned long nr_gops;</div><div class='add'>+	efi_status_t status;</div><div class='add'>+	void **gop_handle;</div><div class='add'>+	u16 width, height;</div><div class='add'>+	u32 fb_base, fb_size;</div><div class='add'>+	u32 pixels_per_scan_line;</div><div class='add'>+	int pixel_format;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	status = efi_call_phys3(sys_table-&gt;boottime-&gt;allocate_pool,</div><div class='add'>+				EFI_LOADER_DATA, size, &amp;gop_handle);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	status = efi_call_phys5(sys_table-&gt;boottime-&gt;locate_handle,</div><div class='add'>+				EFI_LOCATE_BY_PROTOCOL, proto,</div><div class='add'>+				NULL, &amp;size, gop_handle);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		goto free_handle;</div><div class='add'>+</div><div class='add'>+	first_gop = NULL;</div><div class='add'>+</div><div class='add'>+	nr_gops = size / sizeof(void *);</div><div class='add'>+	for (i = 0; i &lt; nr_gops; i++) {</div><div class='add'>+		struct efi_graphics_output_mode_info *info;</div><div class='add'>+		efi_guid_t pciio_proto = EFI_PCI_IO_PROTOCOL_GUID;</div><div class='add'>+		void *pciio;</div><div class='add'>+		void *h = gop_handle[i];</div><div class='add'>+</div><div class='add'>+		status = efi_call_phys3(sys_table-&gt;boottime-&gt;handle_protocol,</div><div class='add'>+					h, proto, &amp;gop);</div><div class='add'>+		if (status != EFI_SUCCESS)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		efi_call_phys3(sys_table-&gt;boottime-&gt;handle_protocol,</div><div class='add'>+			       h, &amp;pciio_proto, &amp;pciio);</div><div class='add'>+</div><div class='add'>+		status = efi_call_phys4(gop-&gt;query_mode, gop,</div><div class='add'>+					gop-&gt;mode-&gt;mode, &amp;size, &amp;info);</div><div class='add'>+		if (status == EFI_SUCCESS &amp;&amp; (!first_gop || pciio)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Apple provide GOPs that are not backed by</div><div class='add'>+			 * real hardware (they're used to handle</div><div class='add'>+			 * multiple displays). The workaround is to</div><div class='add'>+			 * search for a GOP implementing the PCIIO</div><div class='add'>+			 * protocol, and if one isn't found, to just</div><div class='add'>+			 * fallback to the first GOP.</div><div class='add'>+			 */</div><div class='add'>+			width = info-&gt;horizontal_resolution;</div><div class='add'>+			height = info-&gt;vertical_resolution;</div><div class='add'>+			fb_base = gop-&gt;mode-&gt;frame_buffer_base;</div><div class='add'>+			fb_size = gop-&gt;mode-&gt;frame_buffer_size;</div><div class='add'>+			pixel_format = info-&gt;pixel_format;</div><div class='add'>+			pixel_info = info-&gt;pixel_information;</div><div class='add'>+			pixels_per_scan_line = info-&gt;pixels_per_scan_line;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Once we've found a GOP supporting PCIIO,</div><div class='add'>+			 * don't bother looking any further.</div><div class='add'>+			 */</div><div class='add'>+			if (pciio)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			first_gop = gop;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Did we find any GOPs? */</div><div class='add'>+	if (!first_gop)</div><div class='add'>+		goto free_handle;</div><div class='add'>+</div><div class='add'>+	/* EFI framebuffer */</div><div class='add'>+	si-&gt;orig_video_isVGA = VIDEO_TYPE_EFI;</div><div class='add'>+</div><div class='add'>+	si-&gt;lfb_width = width;</div><div class='add'>+	si-&gt;lfb_height = height;</div><div class='add'>+	si-&gt;lfb_base = fb_base;</div><div class='add'>+	si-&gt;lfb_size = fb_size;</div><div class='add'>+	si-&gt;pages = 1;</div><div class='add'>+</div><div class='add'>+	if (pixel_format == PIXEL_RGB_RESERVED_8BIT_PER_COLOR) {</div><div class='add'>+		si-&gt;lfb_depth = 32;</div><div class='add'>+		si-&gt;lfb_linelength = pixels_per_scan_line * 4;</div><div class='add'>+		si-&gt;red_size = 8;</div><div class='add'>+		si-&gt;red_pos = 0;</div><div class='add'>+		si-&gt;green_size = 8;</div><div class='add'>+		si-&gt;green_pos = 8;</div><div class='add'>+		si-&gt;blue_size = 8;</div><div class='add'>+		si-&gt;blue_pos = 16;</div><div class='add'>+		si-&gt;rsvd_size = 8;</div><div class='add'>+		si-&gt;rsvd_pos = 24;</div><div class='add'>+	} else if (pixel_format == PIXEL_BGR_RESERVED_8BIT_PER_COLOR) {</div><div class='add'>+		si-&gt;lfb_depth = 32;</div><div class='add'>+		si-&gt;lfb_linelength = pixels_per_scan_line * 4;</div><div class='add'>+		si-&gt;red_size = 8;</div><div class='add'>+		si-&gt;red_pos = 16;</div><div class='add'>+		si-&gt;green_size = 8;</div><div class='add'>+		si-&gt;green_pos = 8;</div><div class='add'>+		si-&gt;blue_size = 8;</div><div class='add'>+		si-&gt;blue_pos = 0;</div><div class='add'>+		si-&gt;rsvd_size = 8;</div><div class='add'>+		si-&gt;rsvd_pos = 24;</div><div class='add'>+	} else if (pixel_format == PIXEL_BIT_MASK) {</div><div class='add'>+		find_bits(pixel_info.red_mask, &amp;si-&gt;red_pos, &amp;si-&gt;red_size);</div><div class='add'>+		find_bits(pixel_info.green_mask, &amp;si-&gt;green_pos,</div><div class='add'>+			  &amp;si-&gt;green_size);</div><div class='add'>+		find_bits(pixel_info.blue_mask, &amp;si-&gt;blue_pos, &amp;si-&gt;blue_size);</div><div class='add'>+		find_bits(pixel_info.reserved_mask, &amp;si-&gt;rsvd_pos,</div><div class='add'>+			  &amp;si-&gt;rsvd_size);</div><div class='add'>+		si-&gt;lfb_depth = si-&gt;red_size + si-&gt;green_size +</div><div class='add'>+			si-&gt;blue_size + si-&gt;rsvd_size;</div><div class='add'>+		si-&gt;lfb_linelength = (pixels_per_scan_line * si-&gt;lfb_depth) / 8;</div><div class='add'>+	} else {</div><div class='add'>+		si-&gt;lfb_depth = 4;</div><div class='add'>+		si-&gt;lfb_linelength = si-&gt;lfb_width / 2;</div><div class='add'>+		si-&gt;red_size = 0;</div><div class='add'>+		si-&gt;red_pos = 0;</div><div class='add'>+		si-&gt;green_size = 0;</div><div class='add'>+		si-&gt;green_pos = 0;</div><div class='add'>+		si-&gt;blue_size = 0;</div><div class='add'>+		si-&gt;blue_pos = 0;</div><div class='add'>+		si-&gt;rsvd_size = 0;</div><div class='add'>+		si-&gt;rsvd_pos = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+free_handle:</div><div class='add'>+	efi_call_phys1(sys_table-&gt;boottime-&gt;free_pool, gop_handle);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * See if we have Universal Graphics Adapter (UGA) protocol</div><div class='add'>+ */</div><div class='add'>+static efi_status_t setup_uga(struct screen_info *si, efi_guid_t *uga_proto,</div><div class='add'>+			      unsigned long size)</div><div class='add'>+{</div><div class='add'>+	struct efi_uga_draw_protocol *uga, *first_uga;</div><div class='add'>+	unsigned long nr_ugas;</div><div class='add'>+	efi_status_t status;</div><div class='add'>+	u32 width, height;</div><div class='add'>+	void **uga_handle = NULL;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	status = efi_call_phys3(sys_table-&gt;boottime-&gt;allocate_pool,</div><div class='add'>+				EFI_LOADER_DATA, size, &amp;uga_handle);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	status = efi_call_phys5(sys_table-&gt;boottime-&gt;locate_handle,</div><div class='add'>+				EFI_LOCATE_BY_PROTOCOL, uga_proto,</div><div class='add'>+				NULL, &amp;size, uga_handle);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		goto free_handle;</div><div class='add'>+</div><div class='add'>+	first_uga = NULL;</div><div class='add'>+</div><div class='add'>+	nr_ugas = size / sizeof(void *);</div><div class='add'>+	for (i = 0; i &lt; nr_ugas; i++) {</div><div class='add'>+		efi_guid_t pciio_proto = EFI_PCI_IO_PROTOCOL_GUID;</div><div class='add'>+		void *handle = uga_handle[i];</div><div class='add'>+		u32 w, h, depth, refresh;</div><div class='add'>+		void *pciio;</div><div class='add'>+</div><div class='add'>+		status = efi_call_phys3(sys_table-&gt;boottime-&gt;handle_protocol,</div><div class='add'>+					handle, uga_proto, &amp;uga);</div><div class='add'>+		if (status != EFI_SUCCESS)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		efi_call_phys3(sys_table-&gt;boottime-&gt;handle_protocol,</div><div class='add'>+			       handle, &amp;pciio_proto, &amp;pciio);</div><div class='add'>+</div><div class='add'>+		status = efi_call_phys5(uga-&gt;get_mode, uga, &amp;w, &amp;h,</div><div class='add'>+					&amp;depth, &amp;refresh);</div><div class='add'>+		if (status == EFI_SUCCESS &amp;&amp; (!first_uga || pciio)) {</div><div class='add'>+			width = w;</div><div class='add'>+			height = h;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Once we've found a UGA supporting PCIIO,</div><div class='add'>+			 * don't bother looking any further.</div><div class='add'>+			 */</div><div class='add'>+			if (pciio)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			first_uga = uga;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!first_uga)</div><div class='add'>+		goto free_handle;</div><div class='add'>+</div><div class='add'>+	/* EFI framebuffer */</div><div class='add'>+	si-&gt;orig_video_isVGA = VIDEO_TYPE_EFI;</div><div class='add'>+</div><div class='add'>+	si-&gt;lfb_depth = 32;</div><div class='add'>+	si-&gt;lfb_width = width;</div><div class='add'>+	si-&gt;lfb_height = height;</div><div class='add'>+</div><div class='add'>+	si-&gt;red_size = 8;</div><div class='add'>+	si-&gt;red_pos = 16;</div><div class='add'>+	si-&gt;green_size = 8;</div><div class='add'>+	si-&gt;green_pos = 8;</div><div class='add'>+	si-&gt;blue_size = 8;</div><div class='add'>+	si-&gt;blue_pos = 0;</div><div class='add'>+	si-&gt;rsvd_size = 8;</div><div class='add'>+	si-&gt;rsvd_pos = 24;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+free_handle:</div><div class='add'>+	efi_call_phys1(sys_table-&gt;boottime-&gt;free_pool, uga_handle);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void setup_graphics(struct boot_params *boot_params)</div><div class='add'>+{</div><div class='add'>+	efi_guid_t graphics_proto = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;</div><div class='add'>+	struct screen_info *si;</div><div class='add'>+	efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID;</div><div class='add'>+	efi_status_t status;</div><div class='add'>+	unsigned long size;</div><div class='add'>+	void **gop_handle = NULL;</div><div class='add'>+	void **uga_handle = NULL;</div><div class='add'>+</div><div class='add'>+	si = &amp;boot_params-&gt;screen_info;</div><div class='add'>+	memset(si, 0, sizeof(*si));</div><div class='add'>+</div><div class='add'>+	size = 0;</div><div class='add'>+	status = efi_call_phys5(sys_table-&gt;boottime-&gt;locate_handle,</div><div class='add'>+				EFI_LOCATE_BY_PROTOCOL, &amp;graphics_proto,</div><div class='add'>+				NULL, &amp;size, gop_handle);</div><div class='add'>+	if (status == EFI_BUFFER_TOO_SMALL)</div><div class='add'>+		status = setup_gop(si, &amp;graphics_proto, size);</div><div class='add'>+</div><div class='add'>+	if (status != EFI_SUCCESS) {</div><div class='add'>+		size = 0;</div><div class='add'>+		status = efi_call_phys5(sys_table-&gt;boottime-&gt;locate_handle,</div><div class='add'>+					EFI_LOCATE_BY_PROTOCOL, &amp;uga_proto,</div><div class='add'>+					NULL, &amp;size, uga_handle);</div><div class='add'>+		if (status == EFI_BUFFER_TOO_SMALL)</div><div class='add'>+			setup_uga(si, &amp;uga_proto, size);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct initrd {</div><div class='add'>+	efi_file_handle_t *handle;</div><div class='add'>+	u64 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check the cmdline for a LILO-style initrd= arguments.</div><div class='add'>+ *</div><div class='add'>+ * We only support loading an initrd from the same filesystem as the</div><div class='add'>+ * kernel image.</div><div class='add'>+ */</div><div class='add'>+static efi_status_t handle_ramdisks(efi_loaded_image_t *image,</div><div class='add'>+				    struct setup_header *hdr)</div><div class='add'>+{</div><div class='add'>+	struct initrd *initrds;</div><div class='add'>+	unsigned long initrd_addr;</div><div class='add'>+	efi_guid_t fs_proto = EFI_FILE_SYSTEM_GUID;</div><div class='add'>+	u64 initrd_total;</div><div class='add'>+	efi_file_io_interface_t *io;</div><div class='add'>+	efi_file_handle_t *fh;</div><div class='add'>+	efi_status_t status;</div><div class='add'>+	int nr_initrds;</div><div class='add'>+	char *str;</div><div class='add'>+	int i, j, k;</div><div class='add'>+</div><div class='add'>+	initrd_addr = 0;</div><div class='add'>+	initrd_total = 0;</div><div class='add'>+</div><div class='add'>+	str = (char *)(unsigned long)hdr-&gt;cmd_line_ptr;</div><div class='add'>+</div><div class='add'>+	j = 0;			/* See close_handles */</div><div class='add'>+</div><div class='add'>+	if (!str || !*str)</div><div class='add'>+		return EFI_SUCCESS;</div><div class='add'>+</div><div class='add'>+	for (nr_initrds = 0; *str; nr_initrds++) {</div><div class='add'>+		str = strstr(str, "initrd=");</div><div class='add'>+		if (!str)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		str += 7;</div><div class='add'>+</div><div class='add'>+		/* Skip any leading slashes */</div><div class='add'>+		while (*str == '/' || *str == '\\')</div><div class='add'>+			str++;</div><div class='add'>+</div><div class='add'>+		while (*str &amp;&amp; *str != ' ' &amp;&amp; *str != '\n')</div><div class='add'>+			str++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!nr_initrds)</div><div class='add'>+		return EFI_SUCCESS;</div><div class='add'>+</div><div class='add'>+	status = efi_call_phys3(sys_table-&gt;boottime-&gt;allocate_pool,</div><div class='add'>+				EFI_LOADER_DATA,</div><div class='add'>+				nr_initrds * sizeof(*initrds),</div><div class='add'>+				&amp;initrds);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	str = (char *)(unsigned long)hdr-&gt;cmd_line_ptr;</div><div class='add'>+	for (i = 0; i &lt; nr_initrds; i++) {</div><div class='add'>+		struct initrd *initrd;</div><div class='add'>+		efi_file_handle_t *h;</div><div class='add'>+		efi_file_info_t *info;</div><div class='add'>+		efi_char16_t filename[256];</div><div class='add'>+		unsigned long info_sz;</div><div class='add'>+		efi_guid_t info_guid = EFI_FILE_INFO_ID;</div><div class='add'>+		efi_char16_t *p;</div><div class='add'>+		u64 file_sz;</div><div class='add'>+</div><div class='add'>+		str = strstr(str, "initrd=");</div><div class='add'>+		if (!str)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		str += 7;</div><div class='add'>+</div><div class='add'>+		initrd = &amp;initrds[i];</div><div class='add'>+		p = filename;</div><div class='add'>+</div><div class='add'>+		/* Skip any leading slashes */</div><div class='add'>+		while (*str == '/' || *str == '\\')</div><div class='add'>+			str++;</div><div class='add'>+</div><div class='add'>+		while (*str &amp;&amp; *str != ' ' &amp;&amp; *str != '\n') {</div><div class='add'>+			if (p &gt;= filename + sizeof(filename))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			*p++ = *str++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*p = '\0';</div><div class='add'>+</div><div class='add'>+		/* Only open the volume once. */</div><div class='add'>+		if (!i) {</div><div class='add'>+			efi_boot_services_t *boottime;</div><div class='add'>+</div><div class='add'>+			boottime = sys_table-&gt;boottime;</div><div class='add'>+</div><div class='add'>+			status = efi_call_phys3(boottime-&gt;handle_protocol,</div><div class='add'>+					image-&gt;device_handle, &amp;fs_proto, &amp;io);</div><div class='add'>+			if (status != EFI_SUCCESS)</div><div class='add'>+				goto free_initrds;</div><div class='add'>+</div><div class='add'>+			status = efi_call_phys2(io-&gt;open_volume, io, &amp;fh);</div><div class='add'>+			if (status != EFI_SUCCESS)</div><div class='add'>+				goto free_initrds;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		status = efi_call_phys5(fh-&gt;open, fh, &amp;h, filename,</div><div class='add'>+					EFI_FILE_MODE_READ, (u64)0);</div><div class='add'>+		if (status != EFI_SUCCESS)</div><div class='add'>+			goto close_handles;</div><div class='add'>+</div><div class='add'>+		initrd-&gt;handle = h;</div><div class='add'>+</div><div class='add'>+		info_sz = 0;</div><div class='add'>+		status = efi_call_phys4(h-&gt;get_info, h, &amp;info_guid,</div><div class='add'>+					&amp;info_sz, NULL);</div><div class='add'>+		if (status != EFI_BUFFER_TOO_SMALL)</div><div class='add'>+			goto close_handles;</div><div class='add'>+</div><div class='add'>+grow:</div><div class='add'>+		status = efi_call_phys3(sys_table-&gt;boottime-&gt;allocate_pool,</div><div class='add'>+					EFI_LOADER_DATA, info_sz, &amp;info);</div><div class='add'>+		if (status != EFI_SUCCESS)</div><div class='add'>+			goto close_handles;</div><div class='add'>+</div><div class='add'>+		status = efi_call_phys4(h-&gt;get_info, h, &amp;info_guid,</div><div class='add'>+					&amp;info_sz, info);</div><div class='add'>+		if (status == EFI_BUFFER_TOO_SMALL) {</div><div class='add'>+			efi_call_phys1(sys_table-&gt;boottime-&gt;free_pool, info);</div><div class='add'>+			goto grow;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		file_sz = info-&gt;file_size;</div><div class='add'>+		efi_call_phys1(sys_table-&gt;boottime-&gt;free_pool, info);</div><div class='add'>+</div><div class='add'>+		if (status != EFI_SUCCESS)</div><div class='add'>+			goto close_handles;</div><div class='add'>+</div><div class='add'>+		initrd-&gt;size = file_sz;</div><div class='add'>+		initrd_total += file_sz;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (initrd_total) {</div><div class='add'>+		unsigned long addr;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Multiple initrd's need to be at consecutive</div><div class='add'>+		 * addresses in memory, so allocate enough memory for</div><div class='add'>+		 * all the initrd's.</div><div class='add'>+		 */</div><div class='add'>+		status = high_alloc(initrd_total, 0x1000,</div><div class='add'>+				   &amp;initrd_addr, hdr-&gt;initrd_addr_max);</div><div class='add'>+		if (status != EFI_SUCCESS)</div><div class='add'>+			goto close_handles;</div><div class='add'>+</div><div class='add'>+		/* We've run out of free low memory. */</div><div class='add'>+		if (initrd_addr &gt; hdr-&gt;initrd_addr_max) {</div><div class='add'>+			status = EFI_INVALID_PARAMETER;</div><div class='add'>+			goto free_initrd_total;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		addr = initrd_addr;</div><div class='add'>+		for (j = 0; j &lt; nr_initrds; j++) {</div><div class='add'>+			u64 size;</div><div class='add'>+</div><div class='add'>+			size = initrds[j].size;</div><div class='add'>+			while (size) {</div><div class='add'>+				u64 chunksize;</div><div class='add'>+				if (size &gt; EFI_READ_CHUNK_SIZE)</div><div class='add'>+					chunksize = EFI_READ_CHUNK_SIZE;</div><div class='add'>+				else</div><div class='add'>+					chunksize = size;</div><div class='add'>+				status = efi_call_phys3(fh-&gt;read,</div><div class='add'>+							initrds[j].handle,</div><div class='add'>+							&amp;chunksize, addr);</div><div class='add'>+				if (status != EFI_SUCCESS)</div><div class='add'>+					goto free_initrd_total;</div><div class='add'>+				addr += chunksize;</div><div class='add'>+				size -= chunksize;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			efi_call_phys1(fh-&gt;close, initrds[j].handle);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	efi_call_phys1(sys_table-&gt;boottime-&gt;free_pool, initrds);</div><div class='add'>+</div><div class='add'>+	hdr-&gt;ramdisk_image = initrd_addr;</div><div class='add'>+	hdr-&gt;ramdisk_size = initrd_total;</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+</div><div class='add'>+free_initrd_total:</div><div class='add'>+	low_free(initrd_total, initrd_addr);</div><div class='add'>+</div><div class='add'>+close_handles:</div><div class='add'>+	for (k = j; k &lt; nr_initrds; k++)</div><div class='add'>+		efi_call_phys1(fh-&gt;close, initrds[k].handle);</div><div class='add'>+free_initrds:</div><div class='add'>+	efi_call_phys1(sys_table-&gt;boottime-&gt;free_pool, initrds);</div><div class='add'>+fail:</div><div class='add'>+	hdr-&gt;ramdisk_image = 0;</div><div class='add'>+	hdr-&gt;ramdisk_size = 0;</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'>+ * Because the x86 boot code expects to be passed a boot_params we</div><div class='add'>+ * need to create one ourselves (usually the bootloader would create</div><div class='add'>+ * one for us).</div><div class='add'>+ */</div><div class='add'>+static efi_status_t make_boot_params(struct boot_params *boot_params,</div><div class='add'>+				     efi_loaded_image_t *image,</div><div class='add'>+				     void *handle)</div><div class='add'>+{</div><div class='add'>+	struct efi_info *efi = &amp;boot_params-&gt;efi_info;</div><div class='add'>+	struct apm_bios_info *bi = &amp;boot_params-&gt;apm_bios_info;</div><div class='add'>+	struct sys_desc_table *sdt = &amp;boot_params-&gt;sys_desc_table;</div><div class='add'>+	struct e820entry *e820_map = &amp;boot_params-&gt;e820_map[0];</div><div class='add'>+	struct e820entry *prev = NULL;</div><div class='add'>+	struct setup_header *hdr = &amp;boot_params-&gt;hdr;</div><div class='add'>+	unsigned long size, key, desc_size, _size;</div><div class='add'>+	efi_memory_desc_t *mem_map;</div><div class='add'>+	void *options = image-&gt;load_options;</div><div class='add'>+	u32 load_options_size = image-&gt;load_options_size / 2; /* ASCII */</div><div class='add'>+	int options_size = 0;</div><div class='add'>+	efi_status_t status;</div><div class='add'>+	__u32 desc_version;</div><div class='add'>+	unsigned long cmdline;</div><div class='add'>+	u8 nr_entries;</div><div class='add'>+	u16 *s2;</div><div class='add'>+	u8 *s1;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	hdr-&gt;type_of_loader = 0x21;</div><div class='add'>+</div><div class='add'>+	/* Convert unicode cmdline to ascii */</div><div class='add'>+	cmdline = 0;</div><div class='add'>+	s2 = (u16 *)options;</div><div class='add'>+</div><div class='add'>+	if (s2) {</div><div class='add'>+		while (*s2 &amp;&amp; *s2 != '\n' &amp;&amp; options_size &lt; load_options_size) {</div><div class='add'>+			s2++;</div><div class='add'>+			options_size++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (options_size) {</div><div class='add'>+			if (options_size &gt; hdr-&gt;cmdline_size)</div><div class='add'>+				options_size = hdr-&gt;cmdline_size;</div><div class='add'>+</div><div class='add'>+			options_size++;	/* NUL termination */</div><div class='add'>+</div><div class='add'>+			status = low_alloc(options_size, 1, &amp;cmdline);</div><div class='add'>+			if (status != EFI_SUCCESS)</div><div class='add'>+				goto fail;</div><div class='add'>+</div><div class='add'>+			s1 = (u8 *)(unsigned long)cmdline;</div><div class='add'>+			s2 = (u16 *)options;</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; options_size - 1; i++)</div><div class='add'>+				*s1++ = *s2++;</div><div class='add'>+</div><div class='add'>+			*s1 = '\0';</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr-&gt;cmd_line_ptr = cmdline;</div><div class='add'>+</div><div class='add'>+	hdr-&gt;ramdisk_image = 0;</div><div class='add'>+	hdr-&gt;ramdisk_size = 0;</div><div class='add'>+</div><div class='add'>+	status = handle_ramdisks(image, hdr);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		goto free_cmdline;</div><div class='add'>+</div><div class='add'>+	setup_graphics(boot_params);</div><div class='add'>+</div><div class='add'>+	/* Clear APM BIOS info */</div><div class='add'>+	memset(bi, 0, sizeof(*bi));</div><div class='add'>+</div><div class='add'>+	memset(sdt, 0, sizeof(*sdt));</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;efi-&gt;efi_loader_signature, EFI_LOADER_SIGNATURE, sizeof(__u32));</div><div class='add'>+</div><div class='add'>+	size = sizeof(*mem_map) * 32;</div><div class='add'>+</div><div class='add'>+again:</div><div class='add'>+	size += sizeof(*mem_map);</div><div class='add'>+	_size = size;</div><div class='add'>+	status = low_alloc(size, 1, (unsigned long *)&amp;mem_map);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		goto free_cmdline;</div><div class='add'>+</div><div class='add'>+	status = efi_call_phys5(sys_table-&gt;boottime-&gt;get_memory_map, &amp;size,</div><div class='add'>+				mem_map, &amp;key, &amp;desc_size, &amp;desc_version);</div><div class='add'>+	if (status == EFI_BUFFER_TOO_SMALL) {</div><div class='add'>+		low_free(_size, (unsigned long)mem_map);</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		goto free_mem_map;</div><div class='add'>+</div><div class='add'>+	efi-&gt;efi_systab = (unsigned long)sys_table;</div><div class='add'>+	efi-&gt;efi_memdesc_size = desc_size;</div><div class='add'>+	efi-&gt;efi_memdesc_version = desc_version;</div><div class='add'>+	efi-&gt;efi_memmap = (unsigned long)mem_map;</div><div class='add'>+	efi-&gt;efi_memmap_size = size;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	efi-&gt;efi_systab_hi = (unsigned long)sys_table &gt;&gt; 32;</div><div class='add'>+	efi-&gt;efi_memmap_hi = (unsigned long)mem_map &gt;&gt; 32;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Might as well exit boot services now */</div><div class='add'>+	status = efi_call_phys2(sys_table-&gt;boottime-&gt;exit_boot_services,</div><div class='add'>+				handle, key);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		goto free_mem_map;</div><div class='add'>+</div><div class='add'>+	/* Historic? */</div><div class='add'>+	boot_params-&gt;alt_mem_k = 32 * 1024;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Convert the EFI memory map to E820.</div><div class='add'>+	 */</div><div class='add'>+	nr_entries = 0;</div><div class='add'>+	for (i = 0; i &lt; size / desc_size; i++) {</div><div class='add'>+		efi_memory_desc_t *d;</div><div class='add'>+		unsigned int e820_type = 0;</div><div class='add'>+		unsigned long m = (unsigned long)mem_map;</div><div class='add'>+</div><div class='add'>+		d = (efi_memory_desc_t *)(m + (i * desc_size));</div><div class='add'>+		switch (d-&gt;type) {</div><div class='add'>+		case EFI_RESERVED_TYPE:</div><div class='add'>+		case EFI_RUNTIME_SERVICES_CODE:</div><div class='add'>+		case EFI_RUNTIME_SERVICES_DATA:</div><div class='add'>+		case EFI_MEMORY_MAPPED_IO:</div><div class='add'>+		case EFI_MEMORY_MAPPED_IO_PORT_SPACE:</div><div class='add'>+		case EFI_PAL_CODE:</div><div class='add'>+			e820_type = E820_RESERVED;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case EFI_UNUSABLE_MEMORY:</div><div class='add'>+			e820_type = E820_UNUSABLE;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case EFI_ACPI_RECLAIM_MEMORY:</div><div class='add'>+			e820_type = E820_ACPI;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case EFI_LOADER_CODE:</div><div class='add'>+		case EFI_LOADER_DATA:</div><div class='add'>+		case EFI_BOOT_SERVICES_CODE:</div><div class='add'>+		case EFI_BOOT_SERVICES_DATA:</div><div class='add'>+		case EFI_CONVENTIONAL_MEMORY:</div><div class='add'>+			e820_type = E820_RAM;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case EFI_ACPI_MEMORY_NVS:</div><div class='add'>+			e820_type = E820_NVS;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Merge adjacent mappings */</div><div class='add'>+		if (prev &amp;&amp; prev-&gt;type == e820_type &amp;&amp;</div><div class='add'>+		    (prev-&gt;addr + prev-&gt;size) == d-&gt;phys_addr)</div><div class='add'>+			prev-&gt;size += d-&gt;num_pages &lt;&lt; 12;</div><div class='add'>+		else {</div><div class='add'>+			e820_map-&gt;addr = d-&gt;phys_addr;</div><div class='add'>+			e820_map-&gt;size = d-&gt;num_pages &lt;&lt; 12;</div><div class='add'>+			e820_map-&gt;type = e820_type;</div><div class='add'>+			prev = e820_map++;</div><div class='add'>+			nr_entries++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	boot_params-&gt;e820_entries = nr_entries;</div><div class='add'>+</div><div class='add'>+	return EFI_SUCCESS;</div><div class='add'>+</div><div class='add'>+free_mem_map:</div><div class='add'>+	low_free(_size, (unsigned long)mem_map);</div><div class='add'>+free_cmdline:</div><div class='add'>+	if (options_size)</div><div class='add'>+		low_free(options_size, hdr-&gt;cmd_line_ptr);</div><div class='add'>+fail:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On success we return a pointer to a boot_params structure, and NULL</div><div class='add'>+ * on failure.</div><div class='add'>+ */</div><div class='add'>+struct boot_params *efi_main(void *handle, efi_system_table_t *_table)</div><div class='add'>+{</div><div class='add'>+	struct boot_params *boot_params;</div><div class='add'>+	unsigned long start, nr_pages;</div><div class='add'>+	struct desc_ptr *gdt, *idt;</div><div class='add'>+	efi_loaded_image_t *image;</div><div class='add'>+	struct setup_header *hdr;</div><div class='add'>+	efi_status_t status;</div><div class='add'>+	efi_guid_t proto = LOADED_IMAGE_PROTOCOL_GUID;</div><div class='add'>+	struct desc_struct *desc;</div><div class='add'>+</div><div class='add'>+	sys_table = _table;</div><div class='add'>+</div><div class='add'>+	/* Check if we were booted by the EFI firmware */</div><div class='add'>+	if (sys_table-&gt;hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	status = efi_call_phys3(sys_table-&gt;boottime-&gt;handle_protocol,</div><div class='add'>+				handle, &amp;proto, (void *)&amp;image);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	status = low_alloc(0x4000, 1, (unsigned long *)&amp;boot_params);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	memset(boot_params, 0x0, 0x4000);</div><div class='add'>+</div><div class='add'>+	/* Copy first two sectors to boot_params */</div><div class='add'>+	memcpy(boot_params, image-&gt;image_base, 1024);</div><div class='add'>+</div><div class='add'>+	hdr = &amp;boot_params-&gt;hdr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The EFI firmware loader could have placed the kernel image</div><div class='add'>+	 * anywhere in memory, but the kernel has various restrictions</div><div class='add'>+	 * on the max physical address it can run at. Attempt to move</div><div class='add'>+	 * the kernel to boot_params.pref_address, or as low as</div><div class='add'>+	 * possible.</div><div class='add'>+	 */</div><div class='add'>+	start = hdr-&gt;pref_address;</div><div class='add'>+	nr_pages = round_up(hdr-&gt;init_size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+	status = efi_call_phys4(sys_table-&gt;boottime-&gt;allocate_pages,</div><div class='add'>+				EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA,</div><div class='add'>+				nr_pages, &amp;start);</div><div class='add'>+	if (status != EFI_SUCCESS) {</div><div class='add'>+		status = low_alloc(hdr-&gt;init_size, hdr-&gt;kernel_alignment,</div><div class='add'>+				   &amp;start);</div><div class='add'>+		if (status != EFI_SUCCESS)</div><div class='add'>+			goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr-&gt;code32_start = (__u32)start;</div><div class='add'>+	hdr-&gt;pref_address = (__u64)(unsigned long)image-&gt;image_base;</div><div class='add'>+</div><div class='add'>+	memcpy((void *)start, image-&gt;image_base, image-&gt;image_size);</div><div class='add'>+</div><div class='add'>+	status = efi_call_phys3(sys_table-&gt;boottime-&gt;allocate_pool,</div><div class='add'>+				EFI_LOADER_DATA, sizeof(*gdt),</div><div class='add'>+				(void **)&amp;gdt);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	gdt-&gt;size = 0x800;</div><div class='add'>+	status = low_alloc(gdt-&gt;size, 8, (unsigned long *)&amp;gdt-&gt;address);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	status = efi_call_phys3(sys_table-&gt;boottime-&gt;allocate_pool,</div><div class='add'>+				EFI_LOADER_DATA, sizeof(*idt),</div><div class='add'>+				(void **)&amp;idt);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	idt-&gt;size = 0;</div><div class='add'>+	idt-&gt;address = 0;</div><div class='add'>+</div><div class='add'>+	status = make_boot_params(boot_params, image, handle);</div><div class='add'>+	if (status != EFI_SUCCESS)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	memset((char *)gdt-&gt;address, 0x0, gdt-&gt;size);</div><div class='add'>+	desc = (struct desc_struct *)gdt-&gt;address;</div><div class='add'>+</div><div class='add'>+	/* The first GDT is a dummy and the second is unused. */</div><div class='add'>+	desc += 2;</div><div class='add'>+</div><div class='add'>+	desc-&gt;limit0 = 0xffff;</div><div class='add'>+	desc-&gt;base0 = 0x0000;</div><div class='add'>+	desc-&gt;base1 = 0x0000;</div><div class='add'>+	desc-&gt;type = SEG_TYPE_CODE | SEG_TYPE_EXEC_READ;</div><div class='add'>+	desc-&gt;s = DESC_TYPE_CODE_DATA;</div><div class='add'>+	desc-&gt;dpl = 0;</div><div class='add'>+	desc-&gt;p = 1;</div><div class='add'>+	desc-&gt;limit = 0xf;</div><div class='add'>+	desc-&gt;avl = 0;</div><div class='add'>+	desc-&gt;l = 0;</div><div class='add'>+	desc-&gt;d = SEG_OP_SIZE_32BIT;</div><div class='add'>+	desc-&gt;g = SEG_GRANULARITY_4KB;</div><div class='add'>+	desc-&gt;base2 = 0x00;</div><div class='add'>+</div><div class='add'>+	desc++;</div><div class='add'>+	desc-&gt;limit0 = 0xffff;</div><div class='add'>+	desc-&gt;base0 = 0x0000;</div><div class='add'>+	desc-&gt;base1 = 0x0000;</div><div class='add'>+	desc-&gt;type = SEG_TYPE_DATA | SEG_TYPE_READ_WRITE;</div><div class='add'>+	desc-&gt;s = DESC_TYPE_CODE_DATA;</div><div class='add'>+	desc-&gt;dpl = 0;</div><div class='add'>+	desc-&gt;p = 1;</div><div class='add'>+	desc-&gt;limit = 0xf;</div><div class='add'>+	desc-&gt;avl = 0;</div><div class='add'>+	desc-&gt;l = 0;</div><div class='add'>+	desc-&gt;d = SEG_OP_SIZE_32BIT;</div><div class='add'>+	desc-&gt;g = SEG_GRANULARITY_4KB;</div><div class='add'>+	desc-&gt;base2 = 0x00;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	/* Task segment value */</div><div class='add'>+	desc++;</div><div class='add'>+	desc-&gt;limit0 = 0x0000;</div><div class='add'>+	desc-&gt;base0 = 0x0000;</div><div class='add'>+	desc-&gt;base1 = 0x0000;</div><div class='add'>+	desc-&gt;type = SEG_TYPE_TSS;</div><div class='add'>+	desc-&gt;s = 0;</div><div class='add'>+	desc-&gt;dpl = 0;</div><div class='add'>+	desc-&gt;p = 1;</div><div class='add'>+	desc-&gt;limit = 0x0;</div><div class='add'>+	desc-&gt;avl = 0;</div><div class='add'>+	desc-&gt;l = 0;</div><div class='add'>+	desc-&gt;d = 0;</div><div class='add'>+	desc-&gt;g = SEG_GRANULARITY_4KB;</div><div class='add'>+	desc-&gt;base2 = 0x00;</div><div class='add'>+#endif /* CONFIG_X86_64 */</div><div class='add'>+</div><div class='add'>+	asm volatile ("lidt %0" : : "m" (*idt));</div><div class='add'>+	asm volatile ("lgdt %0" : : "m" (*gdt));</div><div class='add'>+</div><div class='add'>+	asm volatile("cli");</div><div class='add'>+</div><div class='add'>+	return boot_params;</div><div class='add'>+fail:</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/x86/boot/compressed/eboot.h b/arch/x86/boot/compressed/eboot.h<br/>new file mode 100644<br/>index 000000000000..39251663e65b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/boot/compressed/eboot.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/boot/compressed/eboot.h</a></div><div class='hunk'>@@ -0,0 +1,61 @@</div><div class='add'>+#ifndef BOOT_COMPRESSED_EBOOT_H</div><div class='add'>+#define BOOT_COMPRESSED_EBOOT_H</div><div class='add'>+</div><div class='add'>+#define SEG_TYPE_DATA		(0 &lt;&lt; 3)</div><div class='add'>+#define SEG_TYPE_READ_WRITE	(1 &lt;&lt; 1)</div><div class='add'>+#define SEG_TYPE_CODE		(1 &lt;&lt; 3)</div><div class='add'>+#define SEG_TYPE_EXEC_READ	(1 &lt;&lt; 1)</div><div class='add'>+#define SEG_TYPE_TSS		((1 &lt;&lt; 3) | (1 &lt;&lt; 0))</div><div class='add'>+#define SEG_OP_SIZE_32BIT	(1 &lt;&lt; 0)</div><div class='add'>+#define SEG_GRANULARITY_4KB	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define DESC_TYPE_CODE_DATA	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define EFI_PAGE_SIZE		(1UL &lt;&lt; EFI_PAGE_SHIFT)</div><div class='add'>+#define EFI_READ_CHUNK_SIZE	(1024 * 1024)</div><div class='add'>+</div><div class='add'>+#define PIXEL_RGB_RESERVED_8BIT_PER_COLOR		0</div><div class='add'>+#define PIXEL_BGR_RESERVED_8BIT_PER_COLOR		1</div><div class='add'>+#define PIXEL_BIT_MASK					2</div><div class='add'>+#define PIXEL_BLT_ONLY					3</div><div class='add'>+#define PIXEL_FORMAT_MAX				4</div><div class='add'>+</div><div class='add'>+struct efi_pixel_bitmask {</div><div class='add'>+	u32 red_mask;</div><div class='add'>+	u32 green_mask;</div><div class='add'>+	u32 blue_mask;</div><div class='add'>+	u32 reserved_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct efi_graphics_output_mode_info {</div><div class='add'>+	u32 version;</div><div class='add'>+	u32 horizontal_resolution;</div><div class='add'>+	u32 vertical_resolution;</div><div class='add'>+	int pixel_format;</div><div class='add'>+	struct efi_pixel_bitmask pixel_information;</div><div class='add'>+	u32 pixels_per_scan_line;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct efi_graphics_output_protocol_mode {</div><div class='add'>+	u32 max_mode;</div><div class='add'>+	u32 mode;</div><div class='add'>+	unsigned long info;</div><div class='add'>+	unsigned long size_of_info;</div><div class='add'>+	u64 frame_buffer_base;</div><div class='add'>+	unsigned long frame_buffer_size;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct efi_graphics_output_protocol {</div><div class='add'>+	void *query_mode;</div><div class='add'>+	unsigned long set_mode;</div><div class='add'>+	unsigned long blt;</div><div class='add'>+	struct efi_graphics_output_protocol_mode *mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct efi_uga_draw_protocol {</div><div class='add'>+	void *get_mode;</div><div class='add'>+	void *set_mode;</div><div class='add'>+	void *blt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* BOOT_COMPRESSED_EBOOT_H */</div><div class='head'>diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S<br/>new file mode 100644<br/>index 000000000000..a53440e81d52<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/boot/compressed/efi_stub_32.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/boot/compressed/efi_stub_32.S</a></div><div class='hunk'>@@ -0,0 +1,86 @@</div><div class='add'>+/*</div><div class='add'>+ * EFI call stub for IA32.</div><div class='add'>+ *</div><div class='add'>+ * This stub allows us to make EFI calls in physical mode with interrupts</div><div class='add'>+ * turned off. Note that this implementation is different from the one in</div><div class='add'>+ * arch/x86/platform/efi/efi_stub_32.S because we're _already_ in physical</div><div class='add'>+ * mode at this point.</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/page_types.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * efi_call_phys(void *, ...) is a function with variable parameters.</div><div class='add'>+ * All the callers of this function assure that all the parameters are 4-bytes.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * In gcc calling convention, EBX, ESP, EBP, ESI and EDI are all callee save.</div><div class='add'>+ * So we'd better save all of them at the beginning of this function and restore</div><div class='add'>+ * at the end no matter how many we use, because we can not assure EFI runtime</div><div class='add'>+ * service functions will comply with gcc calling convention, too.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+.text</div><div class='add'>+ENTRY(efi_call_phys)</div><div class='add'>+	/*</div><div class='add'>+	 * 0. The function can only be called in Linux kernel. So CS has been</div><div class='add'>+	 * set to 0x0010, DS and SS have been set to 0x0018. In EFI, I found</div><div class='add'>+	 * the values of these registers are the same. And, the corresponding</div><div class='add'>+	 * GDT entries are identical. So I will do nothing about segment reg</div><div class='add'>+	 * and GDT, but change GDT base register in prelog and epilog.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 1. Because we haven't been relocated by this point we need to</div><div class='add'>+	 * use relative addressing.</div><div class='add'>+	 */</div><div class='add'>+	call	1f</div><div class='add'>+1:	popl	%edx</div><div class='add'>+	subl	$1b, %edx</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 2. Now on the top of stack is the return</div><div class='add'>+	 * address in the caller of efi_call_phys(), then parameter 1,</div><div class='add'>+	 * parameter 2, ..., param n. To make things easy, we save the return</div><div class='add'>+	 * address of efi_call_phys in a global variable.</div><div class='add'>+	 */</div><div class='add'>+	popl	%ecx</div><div class='add'>+	movl	%ecx, saved_return_addr(%edx)</div><div class='add'>+	/* get the function pointer into ECX*/</div><div class='add'>+	popl	%ecx</div><div class='add'>+	movl	%ecx, efi_rt_function_ptr(%edx)</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 3. Call the physical function.</div><div class='add'>+	 */</div><div class='add'>+	call	*%ecx</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 4. Balance the stack. And because EAX contain the return value,</div><div class='add'>+	 * we'd better not clobber it. We need to calculate our address</div><div class='add'>+	 * again because %ecx and %edx are not preserved across EFI function</div><div class='add'>+	 * calls.</div><div class='add'>+	 */</div><div class='add'>+	call	1f</div><div class='add'>+1:	popl	%edx</div><div class='add'>+	subl	$1b, %edx</div><div class='add'>+</div><div class='add'>+	movl	efi_rt_function_ptr(%edx), %ecx</div><div class='add'>+	pushl	%ecx</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 10. Push the saved return address onto the stack and return.</div><div class='add'>+	 */</div><div class='add'>+	movl	saved_return_addr(%edx), %ecx</div><div class='add'>+	pushl	%ecx</div><div class='add'>+	ret</div><div class='add'>+ENDPROC(efi_call_phys)</div><div class='add'>+.previous</div><div class='add'>+</div><div class='add'>+.data</div><div class='add'>+saved_return_addr:</div><div class='add'>+	.long 0</div><div class='add'>+efi_rt_function_ptr:</div><div class='add'>+	.long 0</div><div class='head'>diff --git a/arch/x86/boot/compressed/efi_stub_64.S b/arch/x86/boot/compressed/efi_stub_64.S<br/>new file mode 100644<br/>index 000000000000..cedc60de86eb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/boot/compressed/efi_stub_64.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/boot/compressed/efi_stub_64.S</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+#include "../../platform/efi/efi_stub_64.S"</div><div class='head'>diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S<br/>index 67a655a39ce4..a0559930a180 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/boot/compressed/head_32.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/boot/compressed/head_32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/boot/compressed/head_32.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/boot/compressed/head_32.S</a></div><div class='hunk'>@@ -32,6 +32,28 @@</div><div class='ctx'> </div><div class='ctx'> 	__HEAD</div><div class='ctx'> ENTRY(startup_32)</div><div class='add'>+#ifdef CONFIG_EFI_STUB</div><div class='add'>+	/*</div><div class='add'>+	 * We don't need the return address, so set up the stack so</div><div class='add'>+	 * efi_main() can find its arugments.</div><div class='add'>+	 */</div><div class='add'>+	add	$0x4, %esp</div><div class='add'>+</div><div class='add'>+	call	efi_main</div><div class='add'>+	cmpl	$0, %eax</div><div class='add'>+	je	preferred_addr</div><div class='add'>+	movl	%eax, %esi</div><div class='add'>+	call	1f</div><div class='add'>+1:</div><div class='add'>+	popl	%eax</div><div class='add'>+	subl	$1b, %eax</div><div class='add'>+	subl	BP_pref_address(%esi), %eax</div><div class='add'>+	add	BP_code32_start(%esi), %eax</div><div class='add'>+	leal	preferred_addr(%eax), %eax</div><div class='add'>+	jmp	*%eax</div><div class='add'>+</div><div class='add'>+preferred_addr:</div><div class='add'>+#endif</div><div class='ctx'> 	cld</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Test KEEP_SEGMENTS flag to see if the bootloader is asking</div><div class='head'>diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S<br/>index 35af09d13dc1..558d76ce23bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/boot/compressed/head_64.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/boot/compressed/head_64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/boot/compressed/head_64.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/boot/compressed/head_64.S</a></div><div class='hunk'>@@ -199,6 +199,26 @@ ENTRY(startup_64)</div><div class='ctx'> 	 * an identity mapped page table being provied that maps our</div><div class='ctx'> 	 * entire text+data+bss and hopefully all of memory.</div><div class='ctx'> 	 */</div><div class='add'>+#ifdef CONFIG_EFI_STUB</div><div class='add'>+	pushq	%rsi</div><div class='add'>+	mov	%rcx, %rdi</div><div class='add'>+	mov	%rdx, %rsi</div><div class='add'>+	call	efi_main</div><div class='add'>+	popq	%rsi</div><div class='add'>+	cmpq	$0,%rax</div><div class='add'>+	je	preferred_addr</div><div class='add'>+	movq	%rax,%rsi</div><div class='add'>+	call	1f</div><div class='add'>+1:</div><div class='add'>+	popq	%rax</div><div class='add'>+	subq	$1b, %rax</div><div class='add'>+	subq	BP_pref_address(%rsi), %rax</div><div class='add'>+	add	BP_code32_start(%esi), %eax</div><div class='add'>+	leaq	preferred_addr(%rax), %rax</div><div class='add'>+	jmp	*%rax</div><div class='add'>+</div><div class='add'>+preferred_addr:</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Setup data segments. */</div><div class='ctx'> 	xorl	%eax, %eax</div><div class='head'>diff --git a/arch/x86/boot/compressed/string.c b/arch/x86/boot/compressed/string.c<br/>index 19b3e693cd72..ffb9c5c9d748 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/boot/compressed/string.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/boot/compressed/string.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/boot/compressed/string.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/boot/compressed/string.c</a></div><div class='hunk'>@@ -1,2 +1,11 @@</div><div class='ctx'> #include "misc.h"</div><div class='add'>+</div><div class='add'>+int memcmp(const void *s1, const void *s2, size_t len)</div><div class='add'>+{</div><div class='add'>+	u8 diff;</div><div class='add'>+	asm("repe; cmpsb; setnz %0"</div><div class='add'>+	    : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));</div><div class='add'>+	return diff;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #include "../string.c"</div><div class='head'>diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S<br/>index bdb4d458ec8c..f1bbeeb09148 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/boot/header.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/boot/header.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/boot/header.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/boot/header.S</a></div><div class='hunk'>@@ -45,6 +45,11 @@ SYSSEG		= 0x1000		/* historical load address &gt;&gt; 4 */</div><div class='ctx'> </div><div class='ctx'> 	.global bootsect_start</div><div class='ctx'> bootsect_start:</div><div class='add'>+#ifdef CONFIG_EFI_STUB</div><div class='add'>+	# "MZ", MS-DOS header</div><div class='add'>+	.byte 0x4d</div><div class='add'>+	.byte 0x5a</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	# Normalize the start address</div><div class='ctx'> 	ljmp	$BOOTSEG, $start2</div><div class='hunk'>@@ -79,6 +84,14 @@ bs_die:</div><div class='ctx'> 	# invoke the BIOS reset code...</div><div class='ctx'> 	ljmp	$0xf000,$0xfff0</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_EFI_STUB</div><div class='add'>+	.org	0x3c</div><div class='add'>+	#</div><div class='add'>+	# Offset to the PE header.</div><div class='add'>+	#</div><div class='add'>+	.long	pe_header</div><div class='add'>+#endif /* CONFIG_EFI_STUB */</div><div class='add'>+</div><div class='ctx'> 	.section ".bsdata", "a"</div><div class='ctx'> bugger_off_msg:</div><div class='ctx'> 	.ascii	"Direct booting from floppy is no longer supported.\r\n"</div><div class='hunk'>@@ -87,6 +100,141 @@ bugger_off_msg:</div><div class='ctx'> 	.ascii	"Remove disk and press any key to reboot . . .\r\n"</div><div class='ctx'> 	.byte	0</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_EFI_STUB</div><div class='add'>+pe_header:</div><div class='add'>+	.ascii	"PE"</div><div class='add'>+	.word 	0</div><div class='add'>+</div><div class='add'>+coff_header:</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	.word	0x14c				# i386</div><div class='add'>+#else</div><div class='add'>+	.word	0x8664				# x86-64</div><div class='add'>+#endif</div><div class='add'>+	.word	2				# nr_sections</div><div class='add'>+	.long	0 				# TimeDateStamp</div><div class='add'>+	.long	0				# PointerToSymbolTable</div><div class='add'>+	.long	1				# NumberOfSymbols</div><div class='add'>+	.word	section_table - optional_header	# SizeOfOptionalHeader</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	.word	0x306				# Characteristics.</div><div class='add'>+						# IMAGE_FILE_32BIT_MACHINE |</div><div class='add'>+						# IMAGE_FILE_DEBUG_STRIPPED |</div><div class='add'>+						# IMAGE_FILE_EXECUTABLE_IMAGE |</div><div class='add'>+						# IMAGE_FILE_LINE_NUMS_STRIPPED</div><div class='add'>+#else</div><div class='add'>+	.word	0x206				# Characteristics</div><div class='add'>+						# IMAGE_FILE_DEBUG_STRIPPED |</div><div class='add'>+						# IMAGE_FILE_EXECUTABLE_IMAGE |</div><div class='add'>+						# IMAGE_FILE_LINE_NUMS_STRIPPED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+optional_header:</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	.word	0x10b				# PE32 format</div><div class='add'>+#else</div><div class='add'>+	.word	0x20b 				# PE32+ format</div><div class='add'>+#endif</div><div class='add'>+	.byte	0x02				# MajorLinkerVersion</div><div class='add'>+	.byte	0x14				# MinorLinkerVersion</div><div class='add'>+</div><div class='add'>+	# Filled in by build.c</div><div class='add'>+	.long	0				# SizeOfCode</div><div class='add'>+</div><div class='add'>+	.long	0				# SizeOfInitializedData</div><div class='add'>+	.long	0				# SizeOfUninitializedData</div><div class='add'>+</div><div class='add'>+	# Filled in by build.c</div><div class='add'>+	.long	0x0000				# AddressOfEntryPoint</div><div class='add'>+</div><div class='add'>+	.long	0x0000				# BaseOfCode</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	.long	0				# data</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+extra_header_fields:</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	.long	0				# ImageBase</div><div class='add'>+#else</div><div class='add'>+	.quad	0				# ImageBase</div><div class='add'>+#endif</div><div class='add'>+	.long	0x1000				# SectionAlignment</div><div class='add'>+	.long	0x200				# FileAlignment</div><div class='add'>+	.word	0				# MajorOperatingSystemVersion</div><div class='add'>+	.word	0				# MinorOperatingSystemVersion</div><div class='add'>+	.word	0				# MajorImageVersion</div><div class='add'>+	.word	0				# MinorImageVersion</div><div class='add'>+	.word	0				# MajorSubsystemVersion</div><div class='add'>+	.word	0				# MinorSubsystemVersion</div><div class='add'>+	.long	0				# Win32VersionValue</div><div class='add'>+</div><div class='add'>+	#</div><div class='add'>+	# The size of the bzImage is written in tools/build.c</div><div class='add'>+	#</div><div class='add'>+	.long	0				# SizeOfImage</div><div class='add'>+</div><div class='add'>+	.long	0x200				# SizeOfHeaders</div><div class='add'>+	.long	0				# CheckSum</div><div class='add'>+	.word	0xa				# Subsystem (EFI application)</div><div class='add'>+	.word	0				# DllCharacteristics</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	.long	0				# SizeOfStackReserve</div><div class='add'>+	.long	0				# SizeOfStackCommit</div><div class='add'>+	.long	0				# SizeOfHeapReserve</div><div class='add'>+	.long	0				# SizeOfHeapCommit</div><div class='add'>+#else</div><div class='add'>+	.quad	0				# SizeOfStackReserve</div><div class='add'>+	.quad	0				# SizeOfStackCommit</div><div class='add'>+	.quad	0				# SizeOfHeapReserve</div><div class='add'>+	.quad	0				# SizeOfHeapCommit</div><div class='add'>+#endif</div><div class='add'>+	.long	0				# LoaderFlags</div><div class='add'>+	.long	0x1				# NumberOfRvaAndSizes</div><div class='add'>+</div><div class='add'>+	.quad	0				# ExportTable</div><div class='add'>+	.quad	0				# ImportTable</div><div class='add'>+	.quad	0				# ResourceTable</div><div class='add'>+	.quad	0				# ExceptionTable</div><div class='add'>+	.quad	0				# CertificationTable</div><div class='add'>+	.quad	0				# BaseRelocationTable</div><div class='add'>+</div><div class='add'>+	# Section table</div><div class='add'>+section_table:</div><div class='add'>+	.ascii	".text"</div><div class='add'>+	.byte	0</div><div class='add'>+	.byte	0</div><div class='add'>+	.byte	0</div><div class='add'>+	.long	0</div><div class='add'>+	.long	0x0				# startup_{32,64}</div><div class='add'>+	.long	0				# Size of initialized data</div><div class='add'>+						# on disk</div><div class='add'>+	.long	0x0				# startup_{32,64}</div><div class='add'>+	.long	0				# PointerToRelocations</div><div class='add'>+	.long	0				# PointerToLineNumbers</div><div class='add'>+	.word	0				# NumberOfRelocations</div><div class='add'>+	.word	0				# NumberOfLineNumbers</div><div class='add'>+	.long	0x60500020			# Characteristics (section flags)</div><div class='add'>+</div><div class='add'>+	#</div><div class='add'>+	# The EFI application loader requires a relocation section</div><div class='add'>+	# because EFI applications are relocatable and not having</div><div class='add'>+	# this section seems to confuse it. But since we don't need</div><div class='add'>+	# the loader to fixup any relocs for us just fill it with a</div><div class='add'>+	# single dummy reloc.</div><div class='add'>+	#</div><div class='add'>+	.ascii	".reloc"</div><div class='add'>+	.byte	0</div><div class='add'>+	.byte	0</div><div class='add'>+	.long	reloc_end - reloc_start</div><div class='add'>+	.long	reloc_start</div><div class='add'>+	.long	reloc_end - reloc_start		# SizeOfRawData</div><div class='add'>+	.long	reloc_start			# PointerToRawData</div><div class='add'>+	.long	0				# PointerToRelocations</div><div class='add'>+	.long	0				# PointerToLineNumbers</div><div class='add'>+	.word	0				# NumberOfRelocations</div><div class='add'>+	.word	0				# NumberOfLineNumbers</div><div class='add'>+	.long	0x42100040			# Characteristics (section flags)</div><div class='add'>+#endif /* CONFIG_EFI_STUB */</div><div class='ctx'> </div><div class='ctx'> 	# Kernel attributes; used by setup.  This is part 1 of the</div><div class='ctx'> 	# header, from the old boot sector.</div><div class='hunk'>@@ -318,3 +466,13 @@ die:</div><div class='ctx'> setup_corrupt:</div><div class='ctx'> 	.byte	7</div><div class='ctx'> 	.string	"No setup signature found...\n"</div><div class='add'>+</div><div class='add'>+	.data</div><div class='add'>+dummy:	.long	0</div><div class='add'>+</div><div class='add'>+	.section .reloc</div><div class='add'>+reloc_start:</div><div class='add'>+	.long	dummy - reloc_start</div><div class='add'>+	.long	10</div><div class='add'>+	.word	0</div><div class='add'>+reloc_end:</div><div class='head'>diff --git a/arch/x86/boot/string.c b/arch/x86/boot/string.c<br/>index 3cbc4058dd26..574dedfe2890 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/boot/string.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/boot/string.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/boot/string.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/boot/string.c</a></div><div class='hunk'>@@ -111,3 +111,38 @@ unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int bas</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * strlen - Find the length of a string</div><div class='add'>+ * @s: The string to be sized</div><div class='add'>+ */</div><div class='add'>+size_t strlen(const char *s)</div><div class='add'>+{</div><div class='add'>+	const char *sc;</div><div class='add'>+</div><div class='add'>+	for (sc = s; *sc != '\0'; ++sc)</div><div class='add'>+		/* nothing */;</div><div class='add'>+	return sc - s;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * strstr - Find the first substring in a %NUL terminated string</div><div class='add'>+ * @s1: The string to be searched</div><div class='add'>+ * @s2: The string to search for</div><div class='add'>+ */</div><div class='add'>+char *strstr(const char *s1, const char *s2)</div><div class='add'>+{</div><div class='add'>+	size_t l1, l2;</div><div class='add'>+</div><div class='add'>+	l2 = strlen(s2);</div><div class='add'>+	if (!l2)</div><div class='add'>+		return (char *)s1;</div><div class='add'>+	l1 = strlen(s1);</div><div class='add'>+	while (l1 &gt;= l2) {</div><div class='add'>+		l1--;</div><div class='add'>+		if (!memcmp(s1, s2, l2))</div><div class='add'>+			return (char *)s1;</div><div class='add'>+		s1++;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/x86/boot/tools/build.c b/arch/x86/boot/tools/build.c<br/>index fdc60a0b3c20..4e9bd6bcafa6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/boot/tools/build.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/boot/tools/build.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/boot/tools/build.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/boot/tools/build.c</a></div><div class='hunk'>@@ -135,6 +135,9 @@ static void usage(void)</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char ** argv)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_EFI_STUB</div><div class='add'>+	unsigned int file_sz, pe_header;</div><div class='add'>+#endif</div><div class='ctx'> 	unsigned int i, sz, setup_sectors;</div><div class='ctx'> 	int c;</div><div class='ctx'> 	u32 sys_size;</div><div class='hunk'>@@ -194,6 +197,42 @@ int main(int argc, char ** argv)</div><div class='ctx'> 	buf[0x1f6] = sys_size &gt;&gt; 16;</div><div class='ctx'> 	buf[0x1f7] = sys_size &gt;&gt; 24;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_EFI_STUB</div><div class='add'>+	file_sz = sz + i + ((sys_size * 16) - sz);</div><div class='add'>+</div><div class='add'>+	pe_header = *(unsigned int *)&amp;buf[0x3c];</div><div class='add'>+</div><div class='add'>+	/* Size of code */</div><div class='add'>+	*(unsigned int *)&amp;buf[pe_header + 0x1c] = file_sz;</div><div class='add'>+</div><div class='add'>+	/* Size of image */</div><div class='add'>+	*(unsigned int *)&amp;buf[pe_header + 0x50] = file_sz;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+	/* Address of entry point */</div><div class='add'>+	*(unsigned int *)&amp;buf[pe_header + 0x28] = i;</div><div class='add'>+</div><div class='add'>+	/* .text size */</div><div class='add'>+	*(unsigned int *)&amp;buf[pe_header + 0xb0] = file_sz;</div><div class='add'>+</div><div class='add'>+	/* .text size of initialised data */</div><div class='add'>+	*(unsigned int *)&amp;buf[pe_header + 0xb8] = file_sz;</div><div class='add'>+#else</div><div class='add'>+	/*</div><div class='add'>+	 * Address of entry point. startup_32 is at the beginning and</div><div class='add'>+	 * the 64-bit entry point (startup_64) is always 512 bytes</div><div class='add'>+	 * after.</div><div class='add'>+	 */</div><div class='add'>+	*(unsigned int *)&amp;buf[pe_header + 0x28] = i + 512;</div><div class='add'>+</div><div class='add'>+	/* .text size */</div><div class='add'>+	*(unsigned int *)&amp;buf[pe_header + 0xc0] = file_sz;</div><div class='add'>+</div><div class='add'>+	/* .text size of initialised data */</div><div class='add'>+	*(unsigned int *)&amp;buf[pe_header + 0xc8] = file_sz;</div><div class='add'>+#endif /* CONFIG_X86_32 */</div><div class='add'>+#endif /* CONFIG_EFI_STUB */</div><div class='add'>+</div><div class='ctx'> 	crc = partial_crc32(buf, i, crc);</div><div class='ctx'> 	if (fwrite(buf, 1, i, stdout) != i)</div><div class='ctx'> 		die("Writing setup failed");</div><div class='head'>diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile<br/>index 3537d4b91f74..2b0b9631474b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/crypto/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/crypto/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/crypto/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/crypto/Makefile</a></div><div class='hunk'>@@ -5,12 +5,14 @@</div><div class='ctx'> obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_SALSA20_586) += salsa20-i586.o</div><div class='add'>+obj-$(CONFIG_CRYPTO_SERPENT_SSE2_586) += serpent-sse2-i586.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_BLOWFISH_X86_64) += blowfish-x86_64.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_TWOFISH_X86_64_3WAY) += twofish-x86_64-3way.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_SALSA20_X86_64) += salsa20-x86_64.o</div><div class='add'>+obj-$(CONFIG_CRYPTO_SERPENT_SSE2_X86_64) += serpent-sse2-x86_64.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_AES_NI_INTEL) += aesni-intel.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL) += ghash-clmulni-intel.o</div><div class='ctx'> </div><div class='hunk'>@@ -20,12 +22,14 @@ obj-$(CONFIG_CRYPTO_SHA1_SSSE3) += sha1-ssse3.o</div><div class='ctx'> aes-i586-y := aes-i586-asm_32.o aes_glue.o</div><div class='ctx'> twofish-i586-y := twofish-i586-asm_32.o twofish_glue.o</div><div class='ctx'> salsa20-i586-y := salsa20-i586-asm_32.o salsa20_glue.o</div><div class='add'>+serpent-sse2-i586-y := serpent-sse2-i586-asm_32.o serpent_sse2_glue.o</div><div class='ctx'> </div><div class='ctx'> aes-x86_64-y := aes-x86_64-asm_64.o aes_glue.o</div><div class='ctx'> blowfish-x86_64-y := blowfish-x86_64-asm_64.o blowfish_glue.o</div><div class='ctx'> twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_glue.o</div><div class='ctx'> twofish-x86_64-3way-y := twofish-x86_64-asm_64-3way.o twofish_glue_3way.o</div><div class='ctx'> salsa20-x86_64-y := salsa20-x86_64-asm_64.o salsa20_glue.o</div><div class='add'>+serpent-sse2-x86_64-y := serpent-sse2-x86_64-asm_64.o serpent_sse2_glue.o</div><div class='ctx'> </div><div class='ctx'> aesni-intel-y := aesni-intel_asm.o aesni-intel_glue.o fpu.o</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/crypto/serpent-sse2-i586-asm_32.S b/arch/x86/crypto/serpent-sse2-i586-asm_32.S<br/>new file mode 100644<br/>index 000000000000..4e37677ca851<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/crypto/serpent-sse2-i586-asm_32.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/crypto/serpent-sse2-i586-asm_32.S</a></div><div class='hunk'>@@ -0,0 +1,638 @@</div><div class='add'>+/*</div><div class='add'>+ * Serpent Cipher 4-way parallel algorithm (i586/SSE2)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Jussi Kivilinna &lt;jussi.kivilinna@mbnet.fi&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on crypto/serpent.c by</div><div class='add'>+ *  Copyright (C) 2002 Dag Arne Osvik &lt;osvik@ii.uib.no&gt;</div><div class='add'>+ *                2003 Herbert Valerio Riedel &lt;hvr@gnu.org&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'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307</div><div class='add'>+ * USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+.file "serpent-sse2-i586-asm_32.S"</div><div class='add'>+.text</div><div class='add'>+</div><div class='add'>+#define arg_ctx 4</div><div class='add'>+#define arg_dst 8</div><div class='add'>+#define arg_src 12</div><div class='add'>+#define arg_xor 16</div><div class='add'>+</div><div class='add'>+/**********************************************************************</div><div class='add'>+  4-way SSE2 serpent</div><div class='add'>+ **********************************************************************/</div><div class='add'>+#define CTX %edx</div><div class='add'>+</div><div class='add'>+#define RA %xmm0</div><div class='add'>+#define RB %xmm1</div><div class='add'>+#define RC %xmm2</div><div class='add'>+#define RD %xmm3</div><div class='add'>+#define RE %xmm4</div><div class='add'>+</div><div class='add'>+#define RT0 %xmm5</div><div class='add'>+#define RT1 %xmm6</div><div class='add'>+</div><div class='add'>+#define RNOT %xmm7</div><div class='add'>+</div><div class='add'>+#define get_key(i, j, t) \</div><div class='add'>+	movd (4*(i)+(j))*4(CTX), t; \</div><div class='add'>+	pshufd $0, t, t;</div><div class='add'>+</div><div class='add'>+#define K(x0, x1, x2, x3, x4, i) \</div><div class='add'>+	get_key(i, 0, x4); \</div><div class='add'>+	get_key(i, 1, RT0); \</div><div class='add'>+	get_key(i, 2, RT1); \</div><div class='add'>+	pxor x4,		x0; \</div><div class='add'>+	pxor RT0,		x1; \</div><div class='add'>+	pxor RT1,		x2; \</div><div class='add'>+	get_key(i, 3, x4); \</div><div class='add'>+	pxor x4,		x3;</div><div class='add'>+</div><div class='add'>+#define LK(x0, x1, x2, x3, x4, i) \</div><div class='add'>+	movdqa x0,		x4; \</div><div class='add'>+	pslld $13,		x0; \</div><div class='add'>+	psrld $(32 - 13),	x4; \</div><div class='add'>+	por x4,			x0; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	movdqa x2,		x4; \</div><div class='add'>+	pslld $3,		x2; \</div><div class='add'>+	psrld $(32 - 3),	x4; \</div><div class='add'>+	por x4,			x2; \</div><div class='add'>+	pxor x2,		x1; \</div><div class='add'>+	movdqa x1,		x4; \</div><div class='add'>+	pslld $1,		x1; \</div><div class='add'>+	psrld $(32 - 1),	x4; \</div><div class='add'>+	por x4,			x1; \</div><div class='add'>+	movdqa x0,		x4; \</div><div class='add'>+	pslld $3,		x4; \</div><div class='add'>+	pxor x2,		x3; \</div><div class='add'>+	pxor x4,		x3; \</div><div class='add'>+	movdqa x3,		x4; \</div><div class='add'>+	pslld $7,		x3; \</div><div class='add'>+	psrld $(32 - 7),	x4; \</div><div class='add'>+	por x4,			x3; \</div><div class='add'>+	movdqa x1,		x4; \</div><div class='add'>+	pslld $7,		x4; \</div><div class='add'>+	pxor x1,		x0; \</div><div class='add'>+	pxor x3,		x0; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pxor x4,		x2; \</div><div class='add'>+	movdqa x0,		x4; \</div><div class='add'>+	get_key(i, 1, RT0); \</div><div class='add'>+	pxor RT0,		x1; \</div><div class='add'>+	get_key(i, 3, RT0); \</div><div class='add'>+	pxor RT0,		x3; \</div><div class='add'>+	pslld $5,		x0; \</div><div class='add'>+	psrld $(32 - 5),	x4; \</div><div class='add'>+	por x4,			x0; \</div><div class='add'>+	movdqa x2,		x4; \</div><div class='add'>+	pslld $22,		x2; \</div><div class='add'>+	psrld $(32 - 22),	x4; \</div><div class='add'>+	por x4,			x2; \</div><div class='add'>+	get_key(i, 0, RT0); \</div><div class='add'>+	pxor RT0,		x0; \</div><div class='add'>+	get_key(i, 2, RT0); \</div><div class='add'>+	pxor RT0,		x2;</div><div class='add'>+</div><div class='add'>+#define KL(x0, x1, x2, x3, x4, i) \</div><div class='add'>+	K(x0, x1, x2, x3, x4, i); \</div><div class='add'>+	movdqa x0,		x4; \</div><div class='add'>+	psrld $5,		x0; \</div><div class='add'>+	pslld $(32 - 5),	x4; \</div><div class='add'>+	por x4,			x0; \</div><div class='add'>+	movdqa x2,		x4; \</div><div class='add'>+	psrld $22,		x2; \</div><div class='add'>+	pslld $(32 - 22),	x4; \</div><div class='add'>+	por x4,			x2; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pxor x3,		x0; \</div><div class='add'>+	movdqa x1,		x4; \</div><div class='add'>+	pslld $7,		x4; \</div><div class='add'>+	pxor x1,		x0; \</div><div class='add'>+	pxor x4,		x2; \</div><div class='add'>+	movdqa x1,		x4; \</div><div class='add'>+	psrld $1,		x1; \</div><div class='add'>+	pslld $(32 - 1),	x4; \</div><div class='add'>+	por x4,			x1; \</div><div class='add'>+	movdqa x3,		x4; \</div><div class='add'>+	psrld $7,		x3; \</div><div class='add'>+	pslld $(32 - 7),	x4; \</div><div class='add'>+	por x4,			x3; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	movdqa x0,		x4; \</div><div class='add'>+	pslld $3,		x4; \</div><div class='add'>+	pxor x4,		x3; \</div><div class='add'>+	movdqa x0,		x4; \</div><div class='add'>+	psrld $13,		x0; \</div><div class='add'>+	pslld $(32 - 13),	x4; \</div><div class='add'>+	por x4,			x0; \</div><div class='add'>+	pxor x2,		x1; \</div><div class='add'>+	pxor x2,		x3; \</div><div class='add'>+	movdqa x2,		x4; \</div><div class='add'>+	psrld $3,		x2; \</div><div class='add'>+	pslld $(32 - 3),	x4; \</div><div class='add'>+	por x4,			x2;</div><div class='add'>+</div><div class='add'>+#define S0(x0, x1, x2, x3, x4) \</div><div class='add'>+	movdqa x3,		x4; \</div><div class='add'>+	por x0,			x3; \</div><div class='add'>+	pxor x4,		x0; \</div><div class='add'>+	pxor x2,		x4; \</div><div class='add'>+	pxor RNOT,		x4; \</div><div class='add'>+	pxor x1,		x3; \</div><div class='add'>+	pand x0,		x1; \</div><div class='add'>+	pxor x4,		x1; \</div><div class='add'>+	pxor x0,		x2; \</div><div class='add'>+	pxor x3,		x0; \</div><div class='add'>+	por x0,			x4; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pand x1,		x2; \</div><div class='add'>+	pxor x2,		x3; \</div><div class='add'>+	pxor RNOT,		x1; \</div><div class='add'>+	pxor x4,		x2; \</div><div class='add'>+	pxor x2,		x1;</div><div class='add'>+</div><div class='add'>+#define S1(x0, x1, x2, x3, x4) \</div><div class='add'>+	movdqa x1,		x4; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	pxor x3,		x0; \</div><div class='add'>+	pxor RNOT,		x3; \</div><div class='add'>+	pand x1,		x4; \</div><div class='add'>+	por x1,			x0; \</div><div class='add'>+	pxor x2,		x3; \</div><div class='add'>+	pxor x3,		x0; \</div><div class='add'>+	pxor x3,		x1; \</div><div class='add'>+	pxor x4,		x3; \</div><div class='add'>+	por x4,			x1; \</div><div class='add'>+	pxor x2,		x4; \</div><div class='add'>+	pand x0,		x2; \</div><div class='add'>+	pxor x1,		x2; \</div><div class='add'>+	por x0,			x1; \</div><div class='add'>+	pxor RNOT,		x0; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pxor x1,		x4;</div><div class='add'>+</div><div class='add'>+#define S2(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor RNOT,		x3; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	movdqa x0,		x4; \</div><div class='add'>+	pand x2,		x0; \</div><div class='add'>+	pxor x3,		x0; \</div><div class='add'>+	por x4,			x3; \</div><div class='add'>+	pxor x1,		x2; \</div><div class='add'>+	pxor x1,		x3; \</div><div class='add'>+	pand x0,		x1; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pand x3,		x2; \</div><div class='add'>+	por x1,			x3; \</div><div class='add'>+	pxor RNOT,		x0; \</div><div class='add'>+	pxor x0,		x3; \</div><div class='add'>+	pxor x0,		x4; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	por x2,			x1;</div><div class='add'>+</div><div class='add'>+#define S3(x0, x1, x2, x3, x4) \</div><div class='add'>+	movdqa x1,		x4; \</div><div class='add'>+	pxor x3,		x1; \</div><div class='add'>+	por x0,			x3; \</div><div class='add'>+	pand x0,		x4; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pxor x1,		x2; \</div><div class='add'>+	pand x3,		x1; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	por x4,			x0; \</div><div class='add'>+	pxor x3,		x4; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	pand x3,		x0; \</div><div class='add'>+	pand x4,		x3; \</div><div class='add'>+	pxor x2,		x3; \</div><div class='add'>+	por x1,			x4; \</div><div class='add'>+	pand x1,		x2; \</div><div class='add'>+	pxor x3,		x4; \</div><div class='add'>+	pxor x3,		x0; \</div><div class='add'>+	pxor x2,		x3;</div><div class='add'>+</div><div class='add'>+#define S4(x0, x1, x2, x3, x4) \</div><div class='add'>+	movdqa x3,		x4; \</div><div class='add'>+	pand x0,		x3; \</div><div class='add'>+	pxor x4,		x0; \</div><div class='add'>+	pxor x2,		x3; \</div><div class='add'>+	por x4,			x2; \</div><div class='add'>+	pxor x1,		x0; \</div><div class='add'>+	pxor x3,		x4; \</div><div class='add'>+	por x0,			x2; \</div><div class='add'>+	pxor x1,		x2; \</div><div class='add'>+	pand x0,		x1; \</div><div class='add'>+	pxor x4,		x1; \</div><div class='add'>+	pand x2,		x4; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pxor x0,		x4; \</div><div class='add'>+	por x1,			x3; \</div><div class='add'>+	pxor RNOT,		x1; \</div><div class='add'>+	pxor x0,		x3;</div><div class='add'>+</div><div class='add'>+#define S5(x0, x1, x2, x3, x4) \</div><div class='add'>+	movdqa x1,		x4; \</div><div class='add'>+	por x0,			x1; \</div><div class='add'>+	pxor x1,		x2; \</div><div class='add'>+	pxor RNOT,		x3; \</div><div class='add'>+	pxor x0,		x4; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pand x4,		x1; \</div><div class='add'>+	por x3,			x4; \</div><div class='add'>+	pxor x0,		x4; \</div><div class='add'>+	pand x3,		x0; \</div><div class='add'>+	pxor x3,		x1; \</div><div class='add'>+	pxor x2,		x3; \</div><div class='add'>+	pxor x1,		x0; \</div><div class='add'>+	pand x4,		x2; \</div><div class='add'>+	pxor x2,		x1; \</div><div class='add'>+	pand x0,		x2; \</div><div class='add'>+	pxor x2,		x3;</div><div class='add'>+</div><div class='add'>+#define S6(x0, x1, x2, x3, x4) \</div><div class='add'>+	movdqa x1,		x4; \</div><div class='add'>+	pxor x0,		x3; \</div><div class='add'>+	pxor x2,		x1; \</div><div class='add'>+	pxor x0,		x2; \</div><div class='add'>+	pand x3,		x0; \</div><div class='add'>+	por x3,			x1; \</div><div class='add'>+	pxor RNOT,		x4; \</div><div class='add'>+	pxor x1,		x0; \</div><div class='add'>+	pxor x2,		x1; \</div><div class='add'>+	pxor x4,		x3; \</div><div class='add'>+	pxor x0,		x4; \</div><div class='add'>+	pand x0,		x2; \</div><div class='add'>+	pxor x1,		x4; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pand x1,		x3; \</div><div class='add'>+	pxor x0,		x3; \</div><div class='add'>+	pxor x2,		x1;</div><div class='add'>+</div><div class='add'>+#define S7(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor RNOT,		x1; \</div><div class='add'>+	movdqa x1,		x4; \</div><div class='add'>+	pxor RNOT,		x0; \</div><div class='add'>+	pand x2,		x1; \</div><div class='add'>+	pxor x3,		x1; \</div><div class='add'>+	por x4,			x3; \</div><div class='add'>+	pxor x2,		x4; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pxor x0,		x3; \</div><div class='add'>+	por x1,			x0; \</div><div class='add'>+	pand x0,		x2; \</div><div class='add'>+	pxor x4,		x0; \</div><div class='add'>+	pxor x3,		x4; \</div><div class='add'>+	pand x0,		x3; \</div><div class='add'>+	pxor x1,		x4; \</div><div class='add'>+	pxor x4,		x2; \</div><div class='add'>+	pxor x1,		x3; \</div><div class='add'>+	por x0,			x4; \</div><div class='add'>+	pxor x1,		x4;</div><div class='add'>+</div><div class='add'>+#define SI0(x0, x1, x2, x3, x4) \</div><div class='add'>+	movdqa x3,		x4; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	por x1,			x3; \</div><div class='add'>+	pxor x1,		x4; \</div><div class='add'>+	pxor RNOT,		x0; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pxor x0,		x3; \</div><div class='add'>+	pand x1,		x0; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pand x3,		x2; \</div><div class='add'>+	pxor x4,		x3; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pxor x3,		x1; \</div><div class='add'>+	pand x0,		x3; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pxor x3,		x4;</div><div class='add'>+</div><div class='add'>+#define SI1(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x3,		x1; \</div><div class='add'>+	movdqa x0,		x4; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pxor RNOT,		x2; \</div><div class='add'>+	por x1,			x4; \</div><div class='add'>+	pxor x3,		x4; \</div><div class='add'>+	pand x1,		x3; \</div><div class='add'>+	pxor x2,		x1; \</div><div class='add'>+	pand x4,		x2; \</div><div class='add'>+	pxor x1,		x4; \</div><div class='add'>+	por x3,			x1; \</div><div class='add'>+	pxor x0,		x3; \</div><div class='add'>+	pxor x0,		x2; \</div><div class='add'>+	por x4,			x0; \</div><div class='add'>+	pxor x4,		x2; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	pxor x1,		x4;</div><div class='add'>+</div><div class='add'>+#define SI2(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x1,		x2; \</div><div class='add'>+	movdqa x3,		x4; \</div><div class='add'>+	pxor RNOT,		x3; \</div><div class='add'>+	por x2,			x3; \</div><div class='add'>+	pxor x4,		x2; \</div><div class='add'>+	pxor x0,		x4; \</div><div class='add'>+	pxor x1,		x3; \</div><div class='add'>+	por x2,			x1; \</div><div class='add'>+	pxor x0,		x2; \</div><div class='add'>+	pxor x4,		x1; \</div><div class='add'>+	por x3,			x4; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pxor x2,		x4; \</div><div class='add'>+	pand x1,		x2; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pxor x4,		x3; \</div><div class='add'>+	pxor x0,		x4;</div><div class='add'>+</div><div class='add'>+#define SI3(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x1,		x2; \</div><div class='add'>+	movdqa x1,		x4; \</div><div class='add'>+	pand x2,		x1; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	por x4,			x0; \</div><div class='add'>+	pxor x3,		x4; \</div><div class='add'>+	pxor x3,		x0; \</div><div class='add'>+	por x1,			x3; \</div><div class='add'>+	pxor x2,		x1; \</div><div class='add'>+	pxor x3,		x1; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pand x1,		x3; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	pand x2,		x0; \</div><div class='add'>+	pxor x3,		x4; \</div><div class='add'>+	pxor x0,		x3; \</div><div class='add'>+	pxor x1,		x0;</div><div class='add'>+</div><div class='add'>+#define SI4(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	movdqa x0,		x4; \</div><div class='add'>+	pand x1,		x0; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	por x3,			x2; \</div><div class='add'>+	pxor RNOT,		x4; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pand x4,		x2; \</div><div class='add'>+	pxor x0,		x2; \</div><div class='add'>+	por x4,			x0; \</div><div class='add'>+	pxor x3,		x0; \</div><div class='add'>+	pand x2,		x3; \</div><div class='add'>+	pxor x3,		x4; \</div><div class='add'>+	pxor x1,		x3; \</div><div class='add'>+	pand x0,		x1; \</div><div class='add'>+	pxor x1,		x4; \</div><div class='add'>+	pxor x3,		x0;</div><div class='add'>+</div><div class='add'>+#define SI5(x0, x1, x2, x3, x4) \</div><div class='add'>+	movdqa x1,		x4; \</div><div class='add'>+	por x2,			x1; \</div><div class='add'>+	pxor x4,		x2; \</div><div class='add'>+	pxor x3,		x1; \</div><div class='add'>+	pand x4,		x3; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	por x0,			x3; \</div><div class='add'>+	pxor RNOT,		x0; \</div><div class='add'>+	pxor x2,		x3; \</div><div class='add'>+	por x0,			x2; \</div><div class='add'>+	pxor x1,		x4; \</div><div class='add'>+	pxor x4,		x2; \</div><div class='add'>+	pand x0,		x4; \</div><div class='add'>+	pxor x1,		x0; \</div><div class='add'>+	pxor x3,		x1; \</div><div class='add'>+	pand x2,		x0; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pxor x4,		x2; \</div><div class='add'>+	pxor x3,		x4;</div><div class='add'>+</div><div class='add'>+#define SI6(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	movdqa x0,		x4; \</div><div class='add'>+	pand x3,		x0; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pxor x1,		x3; \</div><div class='add'>+	por x4,			x2; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pand x0,		x3; \</div><div class='add'>+	pxor RNOT,		x0; \</div><div class='add'>+	pxor x1,		x3; \</div><div class='add'>+	pand x2,		x1; \</div><div class='add'>+	pxor x0,		x4; \</div><div class='add'>+	pxor x4,		x3; \</div><div class='add'>+	pxor x2,		x4; \</div><div class='add'>+	pxor x1,		x0; \</div><div class='add'>+	pxor x0,		x2;</div><div class='add'>+</div><div class='add'>+#define SI7(x0, x1, x2, x3, x4) \</div><div class='add'>+	movdqa x3,		x4; \</div><div class='add'>+	pand x0,		x3; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	por x4,			x2; \</div><div class='add'>+	pxor x1,		x4; \</div><div class='add'>+	pxor RNOT,		x0; \</div><div class='add'>+	por x3,			x1; \</div><div class='add'>+	pxor x0,		x4; \</div><div class='add'>+	pand x2,		x0; \</div><div class='add'>+	pxor x1,		x0; \</div><div class='add'>+	pand x2,		x1; \</div><div class='add'>+	pxor x2,		x3; \</div><div class='add'>+	pxor x3,		x4; \</div><div class='add'>+	pand x3,		x2; \</div><div class='add'>+	por x0,			x3; \</div><div class='add'>+	pxor x4,		x1; \</div><div class='add'>+	pxor x4,		x3; \</div><div class='add'>+	pand x0,		x4; \</div><div class='add'>+	pxor x2,		x4;</div><div class='add'>+</div><div class='add'>+#define transpose_4x4(x0, x1, x2, x3, t1, t2, t3) \</div><div class='add'>+	movdqa x2,		t3; \</div><div class='add'>+	movdqa x0,		t1; \</div><div class='add'>+	unpcklps x3,		t3; \</div><div class='add'>+	movdqa x0,		t2; \</div><div class='add'>+	unpcklps x1,		t1; \</div><div class='add'>+	unpckhps x1,		t2; \</div><div class='add'>+	movdqa t3,		x1; \</div><div class='add'>+	unpckhps x3,		x2; \</div><div class='add'>+	movdqa t1,		x0; \</div><div class='add'>+	movhlps t1,		x1; \</div><div class='add'>+	movdqa t2,		t1; \</div><div class='add'>+	movlhps t3,		x0; \</div><div class='add'>+	movlhps x2,		t1; \</div><div class='add'>+	movhlps t2,		x2; \</div><div class='add'>+	movdqa x2,		x3; \</div><div class='add'>+	movdqa t1,		x2;</div><div class='add'>+</div><div class='add'>+#define read_blocks(in, x0, x1, x2, x3, t0, t1, t2) \</div><div class='add'>+	movdqu (0*4*4)(in),	x0; \</div><div class='add'>+	movdqu (1*4*4)(in),	x1; \</div><div class='add'>+	movdqu (2*4*4)(in),	x2; \</div><div class='add'>+	movdqu (3*4*4)(in),	x3; \</div><div class='add'>+	\</div><div class='add'>+	transpose_4x4(x0, x1, x2, x3, t0, t1, t2)</div><div class='add'>+</div><div class='add'>+#define write_blocks(out, x0, x1, x2, x3, t0, t1, t2) \</div><div class='add'>+	transpose_4x4(x0, x1, x2, x3, t0, t1, t2) \</div><div class='add'>+	\</div><div class='add'>+	movdqu x0, (0*4*4)(out); \</div><div class='add'>+	movdqu x1, (1*4*4)(out); \</div><div class='add'>+	movdqu x2, (2*4*4)(out); \</div><div class='add'>+	movdqu x3, (3*4*4)(out);</div><div class='add'>+</div><div class='add'>+#define xor_blocks(out, x0, x1, x2, x3, t0, t1, t2) \</div><div class='add'>+	transpose_4x4(x0, x1, x2, x3, t0, t1, t2) \</div><div class='add'>+	\</div><div class='add'>+	movdqu (0*4*4)(out),	t0; \</div><div class='add'>+	pxor t0,		x0; \</div><div class='add'>+	movdqu x0,		(0*4*4)(out); \</div><div class='add'>+	movdqu (1*4*4)(out),	t0; \</div><div class='add'>+	pxor t0,		x1; \</div><div class='add'>+	movdqu x1,		(1*4*4)(out); \</div><div class='add'>+	movdqu (2*4*4)(out),	t0; \</div><div class='add'>+	pxor t0,		x2; \</div><div class='add'>+	movdqu x2,		(2*4*4)(out); \</div><div class='add'>+	movdqu (3*4*4)(out),	t0; \</div><div class='add'>+	pxor t0,		x3; \</div><div class='add'>+	movdqu x3,		(3*4*4)(out);</div><div class='add'>+</div><div class='add'>+.align 8</div><div class='add'>+.global __serpent_enc_blk_4way</div><div class='add'>+.type   __serpent_enc_blk_4way,@function;</div><div class='add'>+</div><div class='add'>+__serpent_enc_blk_4way:</div><div class='add'>+	/* input:</div><div class='add'>+	 *	arg_ctx(%esp): ctx, CTX</div><div class='add'>+	 *	arg_dst(%esp): dst</div><div class='add'>+	 *	arg_src(%esp): src</div><div class='add'>+	 *	arg_xor(%esp): bool, if true: xor output</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	pcmpeqd RNOT, RNOT;</div><div class='add'>+</div><div class='add'>+	movl arg_ctx(%esp), CTX;</div><div class='add'>+</div><div class='add'>+	movl arg_src(%esp), %eax;</div><div class='add'>+	read_blocks(%eax, RA, RB, RC, RD, RT0, RT1, RE);</div><div class='add'>+</div><div class='add'>+					 K(RA, RB, RC, RD, RE, 0);</div><div class='add'>+	S0(RA, RB, RC, RD, RE);		LK(RC, RB, RD, RA, RE, 1);</div><div class='add'>+	S1(RC, RB, RD, RA, RE);		LK(RE, RD, RA, RC, RB, 2);</div><div class='add'>+	S2(RE, RD, RA, RC, RB);		LK(RB, RD, RE, RC, RA, 3);</div><div class='add'>+	S3(RB, RD, RE, RC, RA);		LK(RC, RA, RD, RB, RE, 4);</div><div class='add'>+	S4(RC, RA, RD, RB, RE);		LK(RA, RD, RB, RE, RC, 5);</div><div class='add'>+	S5(RA, RD, RB, RE, RC);		LK(RC, RA, RD, RE, RB, 6);</div><div class='add'>+	S6(RC, RA, RD, RE, RB);		LK(RD, RB, RA, RE, RC, 7);</div><div class='add'>+	S7(RD, RB, RA, RE, RC);		LK(RC, RA, RE, RD, RB, 8);</div><div class='add'>+	S0(RC, RA, RE, RD, RB);		LK(RE, RA, RD, RC, RB, 9);</div><div class='add'>+	S1(RE, RA, RD, RC, RB);		LK(RB, RD, RC, RE, RA, 10);</div><div class='add'>+	S2(RB, RD, RC, RE, RA);		LK(RA, RD, RB, RE, RC, 11);</div><div class='add'>+	S3(RA, RD, RB, RE, RC);		LK(RE, RC, RD, RA, RB, 12);</div><div class='add'>+	S4(RE, RC, RD, RA, RB);		LK(RC, RD, RA, RB, RE, 13);</div><div class='add'>+	S5(RC, RD, RA, RB, RE);		LK(RE, RC, RD, RB, RA, 14);</div><div class='add'>+	S6(RE, RC, RD, RB, RA);		LK(RD, RA, RC, RB, RE, 15);</div><div class='add'>+	S7(RD, RA, RC, RB, RE);		LK(RE, RC, RB, RD, RA, 16);</div><div class='add'>+	S0(RE, RC, RB, RD, RA);		LK(RB, RC, RD, RE, RA, 17);</div><div class='add'>+	S1(RB, RC, RD, RE, RA);		LK(RA, RD, RE, RB, RC, 18);</div><div class='add'>+	S2(RA, RD, RE, RB, RC);		LK(RC, RD, RA, RB, RE, 19);</div><div class='add'>+	S3(RC, RD, RA, RB, RE);		LK(RB, RE, RD, RC, RA, 20);</div><div class='add'>+	S4(RB, RE, RD, RC, RA);		LK(RE, RD, RC, RA, RB, 21);</div><div class='add'>+	S5(RE, RD, RC, RA, RB);		LK(RB, RE, RD, RA, RC, 22);</div><div class='add'>+	S6(RB, RE, RD, RA, RC);		LK(RD, RC, RE, RA, RB, 23);</div><div class='add'>+	S7(RD, RC, RE, RA, RB);		LK(RB, RE, RA, RD, RC, 24);</div><div class='add'>+	S0(RB, RE, RA, RD, RC);		LK(RA, RE, RD, RB, RC, 25);</div><div class='add'>+	S1(RA, RE, RD, RB, RC);		LK(RC, RD, RB, RA, RE, 26);</div><div class='add'>+	S2(RC, RD, RB, RA, RE);		LK(RE, RD, RC, RA, RB, 27);</div><div class='add'>+	S3(RE, RD, RC, RA, RB);		LK(RA, RB, RD, RE, RC, 28);</div><div class='add'>+	S4(RA, RB, RD, RE, RC);		LK(RB, RD, RE, RC, RA, 29);</div><div class='add'>+	S5(RB, RD, RE, RC, RA);		LK(RA, RB, RD, RC, RE, 30);</div><div class='add'>+	S6(RA, RB, RD, RC, RE);		LK(RD, RE, RB, RC, RA, 31);</div><div class='add'>+	S7(RD, RE, RB, RC, RA);		 K(RA, RB, RC, RD, RE, 32);</div><div class='add'>+</div><div class='add'>+	movl arg_dst(%esp), %eax;</div><div class='add'>+</div><div class='add'>+	cmpb $0, arg_xor(%esp);</div><div class='add'>+	jnz __enc_xor4;</div><div class='add'>+</div><div class='add'>+	write_blocks(%eax, RA, RB, RC, RD, RT0, RT1, RE);</div><div class='add'>+</div><div class='add'>+	ret;</div><div class='add'>+</div><div class='add'>+__enc_xor4:</div><div class='add'>+	xor_blocks(%eax, RA, RB, RC, RD, RT0, RT1, RE);</div><div class='add'>+</div><div class='add'>+	ret;</div><div class='add'>+</div><div class='add'>+.align 8</div><div class='add'>+.global serpent_dec_blk_4way</div><div class='add'>+.type   serpent_dec_blk_4way,@function;</div><div class='add'>+</div><div class='add'>+serpent_dec_blk_4way:</div><div class='add'>+	/* input:</div><div class='add'>+	 *	arg_ctx(%esp): ctx, CTX</div><div class='add'>+	 *	arg_dst(%esp): dst</div><div class='add'>+	 *	arg_src(%esp): src</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	pcmpeqd RNOT, RNOT;</div><div class='add'>+</div><div class='add'>+	movl arg_ctx(%esp), CTX;</div><div class='add'>+</div><div class='add'>+	movl arg_src(%esp), %eax;</div><div class='add'>+	read_blocks(%eax, RA, RB, RC, RD, RT0, RT1, RE);</div><div class='add'>+</div><div class='add'>+					 K(RA, RB, RC, RD, RE, 32);</div><div class='add'>+	SI7(RA, RB, RC, RD, RE);	KL(RB, RD, RA, RE, RC, 31);</div><div class='add'>+	SI6(RB, RD, RA, RE, RC);	KL(RA, RC, RE, RB, RD, 30);</div><div class='add'>+	SI5(RA, RC, RE, RB, RD);	KL(RC, RD, RA, RE, RB, 29);</div><div class='add'>+	SI4(RC, RD, RA, RE, RB);	KL(RC, RA, RB, RE, RD, 28);</div><div class='add'>+	SI3(RC, RA, RB, RE, RD);	KL(RB, RC, RD, RE, RA, 27);</div><div class='add'>+	SI2(RB, RC, RD, RE, RA);	KL(RC, RA, RE, RD, RB, 26);</div><div class='add'>+	SI1(RC, RA, RE, RD, RB);	KL(RB, RA, RE, RD, RC, 25);</div><div class='add'>+	SI0(RB, RA, RE, RD, RC);	KL(RE, RC, RA, RB, RD, 24);</div><div class='add'>+	SI7(RE, RC, RA, RB, RD);	KL(RC, RB, RE, RD, RA, 23);</div><div class='add'>+	SI6(RC, RB, RE, RD, RA);	KL(RE, RA, RD, RC, RB, 22);</div><div class='add'>+	SI5(RE, RA, RD, RC, RB);	KL(RA, RB, RE, RD, RC, 21);</div><div class='add'>+	SI4(RA, RB, RE, RD, RC);	KL(RA, RE, RC, RD, RB, 20);</div><div class='add'>+	SI3(RA, RE, RC, RD, RB);	KL(RC, RA, RB, RD, RE, 19);</div><div class='add'>+	SI2(RC, RA, RB, RD, RE);	KL(RA, RE, RD, RB, RC, 18);</div><div class='add'>+	SI1(RA, RE, RD, RB, RC);	KL(RC, RE, RD, RB, RA, 17);</div><div class='add'>+	SI0(RC, RE, RD, RB, RA);	KL(RD, RA, RE, RC, RB, 16);</div><div class='add'>+	SI7(RD, RA, RE, RC, RB);	KL(RA, RC, RD, RB, RE, 15);</div><div class='add'>+	SI6(RA, RC, RD, RB, RE);	KL(RD, RE, RB, RA, RC, 14);</div><div class='add'>+	SI5(RD, RE, RB, RA, RC);	KL(RE, RC, RD, RB, RA, 13);</div><div class='add'>+	SI4(RE, RC, RD, RB, RA);	KL(RE, RD, RA, RB, RC, 12);</div><div class='add'>+	SI3(RE, RD, RA, RB, RC);	KL(RA, RE, RC, RB, RD, 11);</div><div class='add'>+	SI2(RA, RE, RC, RB, RD);	KL(RE, RD, RB, RC, RA, 10);</div><div class='add'>+	SI1(RE, RD, RB, RC, RA);	KL(RA, RD, RB, RC, RE, 9);</div><div class='add'>+	SI0(RA, RD, RB, RC, RE);	KL(RB, RE, RD, RA, RC, 8);</div><div class='add'>+	SI7(RB, RE, RD, RA, RC);	KL(RE, RA, RB, RC, RD, 7);</div><div class='add'>+	SI6(RE, RA, RB, RC, RD);	KL(RB, RD, RC, RE, RA, 6);</div><div class='add'>+	SI5(RB, RD, RC, RE, RA);	KL(RD, RA, RB, RC, RE, 5);</div><div class='add'>+	SI4(RD, RA, RB, RC, RE);	KL(RD, RB, RE, RC, RA, 4);</div><div class='add'>+	SI3(RD, RB, RE, RC, RA);	KL(RE, RD, RA, RC, RB, 3);</div><div class='add'>+	SI2(RE, RD, RA, RC, RB);	KL(RD, RB, RC, RA, RE, 2);</div><div class='add'>+	SI1(RD, RB, RC, RA, RE);	KL(RE, RB, RC, RA, RD, 1);</div><div class='add'>+	SI0(RE, RB, RC, RA, RD);	 K(RC, RD, RB, RE, RA, 0);</div><div class='add'>+</div><div class='add'>+	movl arg_dst(%esp), %eax;</div><div class='add'>+	write_blocks(%eax, RC, RD, RB, RE, RT0, RT1, RA);</div><div class='add'>+</div><div class='add'>+	ret;</div><div class='head'>diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S<br/>new file mode 100644<br/>index 000000000000..7f24a1540821<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/crypto/serpent-sse2-x86_64-asm_64.S</a></div><div class='hunk'>@@ -0,0 +1,761 @@</div><div class='add'>+/*</div><div class='add'>+ * Serpent Cipher 8-way parallel algorithm (x86_64/SSE2)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Jussi Kivilinna &lt;jussi.kivilinna@mbnet.fi&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on crypto/serpent.c by</div><div class='add'>+ *  Copyright (C) 2002 Dag Arne Osvik &lt;osvik@ii.uib.no&gt;</div><div class='add'>+ *                2003 Herbert Valerio Riedel &lt;hvr@gnu.org&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'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307</div><div class='add'>+ * USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+.file "serpent-sse2-x86_64-asm_64.S"</div><div class='add'>+.text</div><div class='add'>+</div><div class='add'>+#define CTX %rdi</div><div class='add'>+</div><div class='add'>+/**********************************************************************</div><div class='add'>+  8-way SSE2 serpent</div><div class='add'>+ **********************************************************************/</div><div class='add'>+#define RA1 %xmm0</div><div class='add'>+#define RB1 %xmm1</div><div class='add'>+#define RC1 %xmm2</div><div class='add'>+#define RD1 %xmm3</div><div class='add'>+#define RE1 %xmm4</div><div class='add'>+</div><div class='add'>+#define RA2 %xmm5</div><div class='add'>+#define RB2 %xmm6</div><div class='add'>+#define RC2 %xmm7</div><div class='add'>+#define RD2 %xmm8</div><div class='add'>+#define RE2 %xmm9</div><div class='add'>+</div><div class='add'>+#define RNOT %xmm10</div><div class='add'>+</div><div class='add'>+#define RK0 %xmm11</div><div class='add'>+#define RK1 %xmm12</div><div class='add'>+#define RK2 %xmm13</div><div class='add'>+#define RK3 %xmm14</div><div class='add'>+</div><div class='add'>+#define S0_1(x0, x1, x2, x3, x4) \</div><div class='add'>+	movdqa x3,		x4; \</div><div class='add'>+	por x0,			x3; \</div><div class='add'>+	pxor x4,		x0; \</div><div class='add'>+	pxor x2,		x4; \</div><div class='add'>+	pxor RNOT,		x4; \</div><div class='add'>+	pxor x1,		x3; \</div><div class='add'>+	pand x0,		x1; \</div><div class='add'>+	pxor x4,		x1; \</div><div class='add'>+	pxor x0,		x2;</div><div class='add'>+#define S0_2(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x3,		x0; \</div><div class='add'>+	por x0,			x4; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pand x1,		x2; \</div><div class='add'>+	pxor x2,		x3; \</div><div class='add'>+	pxor RNOT,		x1; \</div><div class='add'>+	pxor x4,		x2; \</div><div class='add'>+	pxor x2,		x1;</div><div class='add'>+</div><div class='add'>+#define S1_1(x0, x1, x2, x3, x4) \</div><div class='add'>+	movdqa x1,		x4; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	pxor x3,		x0; \</div><div class='add'>+	pxor RNOT,		x3; \</div><div class='add'>+	pand x1,		x4; \</div><div class='add'>+	por x1,			x0; \</div><div class='add'>+	pxor x2,		x3; \</div><div class='add'>+	pxor x3,		x0; \</div><div class='add'>+	pxor x3,		x1;</div><div class='add'>+#define S1_2(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x4,		x3; \</div><div class='add'>+	por x4,			x1; \</div><div class='add'>+	pxor x2,		x4; \</div><div class='add'>+	pand x0,		x2; \</div><div class='add'>+	pxor x1,		x2; \</div><div class='add'>+	por x0,			x1; \</div><div class='add'>+	pxor RNOT,		x0; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pxor x1,		x4;</div><div class='add'>+</div><div class='add'>+#define S2_1(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor RNOT,		x3; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	movdqa x0,		x4; \</div><div class='add'>+	pand x2,		x0; \</div><div class='add'>+	pxor x3,		x0; \</div><div class='add'>+	por x4,			x3; \</div><div class='add'>+	pxor x1,		x2; \</div><div class='add'>+	pxor x1,		x3; \</div><div class='add'>+	pand x0,		x1;</div><div class='add'>+#define S2_2(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pand x3,		x2; \</div><div class='add'>+	por x1,			x3; \</div><div class='add'>+	pxor RNOT,		x0; \</div><div class='add'>+	pxor x0,		x3; \</div><div class='add'>+	pxor x0,		x4; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	por x2,			x1;</div><div class='add'>+</div><div class='add'>+#define S3_1(x0, x1, x2, x3, x4) \</div><div class='add'>+	movdqa x1,		x4; \</div><div class='add'>+	pxor x3,		x1; \</div><div class='add'>+	por x0,			x3; \</div><div class='add'>+	pand x0,		x4; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pxor x1,		x2; \</div><div class='add'>+	pand x3,		x1; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	por x4,			x0; \</div><div class='add'>+	pxor x3,		x4;</div><div class='add'>+#define S3_2(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	pand x3,		x0; \</div><div class='add'>+	pand x4,		x3; \</div><div class='add'>+	pxor x2,		x3; \</div><div class='add'>+	por x1,			x4; \</div><div class='add'>+	pand x1,		x2; \</div><div class='add'>+	pxor x3,		x4; \</div><div class='add'>+	pxor x3,		x0; \</div><div class='add'>+	pxor x2,		x3;</div><div class='add'>+</div><div class='add'>+#define S4_1(x0, x1, x2, x3, x4) \</div><div class='add'>+	movdqa x3,		x4; \</div><div class='add'>+	pand x0,		x3; \</div><div class='add'>+	pxor x4,		x0; \</div><div class='add'>+	pxor x2,		x3; \</div><div class='add'>+	por x4,			x2; \</div><div class='add'>+	pxor x1,		x0; \</div><div class='add'>+	pxor x3,		x4; \</div><div class='add'>+	por x0,			x2; \</div><div class='add'>+	pxor x1,		x2;</div><div class='add'>+#define S4_2(x0, x1, x2, x3, x4) \</div><div class='add'>+	pand x0,		x1; \</div><div class='add'>+	pxor x4,		x1; \</div><div class='add'>+	pand x2,		x4; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pxor x0,		x4; \</div><div class='add'>+	por x1,			x3; \</div><div class='add'>+	pxor RNOT,		x1; \</div><div class='add'>+	pxor x0,		x3;</div><div class='add'>+</div><div class='add'>+#define S5_1(x0, x1, x2, x3, x4) \</div><div class='add'>+	movdqa x1,		x4; \</div><div class='add'>+	por x0,			x1; \</div><div class='add'>+	pxor x1,		x2; \</div><div class='add'>+	pxor RNOT,		x3; \</div><div class='add'>+	pxor x0,		x4; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pand x4,		x1; \</div><div class='add'>+	por x3,			x4; \</div><div class='add'>+	pxor x0,		x4;</div><div class='add'>+#define S5_2(x0, x1, x2, x3, x4) \</div><div class='add'>+	pand x3,		x0; \</div><div class='add'>+	pxor x3,		x1; \</div><div class='add'>+	pxor x2,		x3; \</div><div class='add'>+	pxor x1,		x0; \</div><div class='add'>+	pand x4,		x2; \</div><div class='add'>+	pxor x2,		x1; \</div><div class='add'>+	pand x0,		x2; \</div><div class='add'>+	pxor x2,		x3;</div><div class='add'>+</div><div class='add'>+#define S6_1(x0, x1, x2, x3, x4) \</div><div class='add'>+	movdqa x1,		x4; \</div><div class='add'>+	pxor x0,		x3; \</div><div class='add'>+	pxor x2,		x1; \</div><div class='add'>+	pxor x0,		x2; \</div><div class='add'>+	pand x3,		x0; \</div><div class='add'>+	por x3,			x1; \</div><div class='add'>+	pxor RNOT,		x4; \</div><div class='add'>+	pxor x1,		x0; \</div><div class='add'>+	pxor x2,		x1;</div><div class='add'>+#define S6_2(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x4,		x3; \</div><div class='add'>+	pxor x0,		x4; \</div><div class='add'>+	pand x0,		x2; \</div><div class='add'>+	pxor x1,		x4; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pand x1,		x3; \</div><div class='add'>+	pxor x0,		x3; \</div><div class='add'>+	pxor x2,		x1;</div><div class='add'>+</div><div class='add'>+#define S7_1(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor RNOT,		x1; \</div><div class='add'>+	movdqa x1,		x4; \</div><div class='add'>+	pxor RNOT,		x0; \</div><div class='add'>+	pand x2,		x1; \</div><div class='add'>+	pxor x3,		x1; \</div><div class='add'>+	por x4,			x3; \</div><div class='add'>+	pxor x2,		x4; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pxor x0,		x3; \</div><div class='add'>+	por x1,			x0;</div><div class='add'>+#define S7_2(x0, x1, x2, x3, x4) \</div><div class='add'>+	pand x0,		x2; \</div><div class='add'>+	pxor x4,		x0; \</div><div class='add'>+	pxor x3,		x4; \</div><div class='add'>+	pand x0,		x3; \</div><div class='add'>+	pxor x1,		x4; \</div><div class='add'>+	pxor x4,		x2; \</div><div class='add'>+	pxor x1,		x3; \</div><div class='add'>+	por x0,			x4; \</div><div class='add'>+	pxor x1,		x4;</div><div class='add'>+</div><div class='add'>+#define SI0_1(x0, x1, x2, x3, x4) \</div><div class='add'>+	movdqa x3,		x4; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	por x1,			x3; \</div><div class='add'>+	pxor x1,		x4; \</div><div class='add'>+	pxor RNOT,		x0; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pxor x0,		x3; \</div><div class='add'>+	pand x1,		x0; \</div><div class='add'>+	pxor x2,		x0;</div><div class='add'>+#define SI0_2(x0, x1, x2, x3, x4) \</div><div class='add'>+	pand x3,		x2; \</div><div class='add'>+	pxor x4,		x3; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pxor x3,		x1; \</div><div class='add'>+	pand x0,		x3; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pxor x3,		x4;</div><div class='add'>+</div><div class='add'>+#define SI1_1(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x3,		x1; \</div><div class='add'>+	movdqa x0,		x4; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pxor RNOT,		x2; \</div><div class='add'>+	por x1,			x4; \</div><div class='add'>+	pxor x3,		x4; \</div><div class='add'>+	pand x1,		x3; \</div><div class='add'>+	pxor x2,		x1; \</div><div class='add'>+	pand x4,		x2;</div><div class='add'>+#define SI1_2(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x1,		x4; \</div><div class='add'>+	por x3,			x1; \</div><div class='add'>+	pxor x0,		x3; \</div><div class='add'>+	pxor x0,		x2; \</div><div class='add'>+	por x4,			x0; \</div><div class='add'>+	pxor x4,		x2; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	pxor x1,		x4;</div><div class='add'>+</div><div class='add'>+#define SI2_1(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x1,		x2; \</div><div class='add'>+	movdqa x3,		x4; \</div><div class='add'>+	pxor RNOT,		x3; \</div><div class='add'>+	por x2,			x3; \</div><div class='add'>+	pxor x4,		x2; \</div><div class='add'>+	pxor x0,		x4; \</div><div class='add'>+	pxor x1,		x3; \</div><div class='add'>+	por x2,			x1; \</div><div class='add'>+	pxor x0,		x2;</div><div class='add'>+#define SI2_2(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x4,		x1; \</div><div class='add'>+	por x3,			x4; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pxor x2,		x4; \</div><div class='add'>+	pand x1,		x2; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pxor x4,		x3; \</div><div class='add'>+	pxor x0,		x4;</div><div class='add'>+</div><div class='add'>+#define SI3_1(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x1,		x2; \</div><div class='add'>+	movdqa x1,		x4; \</div><div class='add'>+	pand x2,		x1; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	por x4,			x0; \</div><div class='add'>+	pxor x3,		x4; \</div><div class='add'>+	pxor x3,		x0; \</div><div class='add'>+	por x1,			x3; \</div><div class='add'>+	pxor x2,		x1;</div><div class='add'>+#define SI3_2(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x3,		x1; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pand x1,		x3; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	pand x2,		x0; \</div><div class='add'>+	pxor x3,		x4; \</div><div class='add'>+	pxor x0,		x3; \</div><div class='add'>+	pxor x1,		x0;</div><div class='add'>+</div><div class='add'>+#define SI4_1(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	movdqa x0,		x4; \</div><div class='add'>+	pand x1,		x0; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	por x3,			x2; \</div><div class='add'>+	pxor RNOT,		x4; \</div><div class='add'>+	pxor x0,		x1; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pand x4,		x2;</div><div class='add'>+#define SI4_2(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x0,		x2; \</div><div class='add'>+	por x4,			x0; \</div><div class='add'>+	pxor x3,		x0; \</div><div class='add'>+	pand x2,		x3; \</div><div class='add'>+	pxor x3,		x4; \</div><div class='add'>+	pxor x1,		x3; \</div><div class='add'>+	pand x0,		x1; \</div><div class='add'>+	pxor x1,		x4; \</div><div class='add'>+	pxor x3,		x0;</div><div class='add'>+</div><div class='add'>+#define SI5_1(x0, x1, x2, x3, x4) \</div><div class='add'>+	movdqa x1,		x4; \</div><div class='add'>+	por x2,			x1; \</div><div class='add'>+	pxor x4,		x2; \</div><div class='add'>+	pxor x3,		x1; \</div><div class='add'>+	pand x4,		x3; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	por x0,			x3; \</div><div class='add'>+	pxor RNOT,		x0; \</div><div class='add'>+	pxor x2,		x3; \</div><div class='add'>+	por x0,			x2;</div><div class='add'>+#define SI5_2(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x1,		x4; \</div><div class='add'>+	pxor x4,		x2; \</div><div class='add'>+	pand x0,		x4; \</div><div class='add'>+	pxor x1,		x0; \</div><div class='add'>+	pxor x3,		x1; \</div><div class='add'>+	pand x2,		x0; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pxor x4,		x2; \</div><div class='add'>+	pxor x3,		x4;</div><div class='add'>+</div><div class='add'>+#define SI6_1(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	movdqa x0,		x4; \</div><div class='add'>+	pand x3,		x0; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	pxor x1,		x3; \</div><div class='add'>+	por x4,			x2; \</div><div class='add'>+	pxor x3,		x2; \</div><div class='add'>+	pand x0,		x3;</div><div class='add'>+#define SI6_2(x0, x1, x2, x3, x4) \</div><div class='add'>+	pxor RNOT,		x0; \</div><div class='add'>+	pxor x1,		x3; \</div><div class='add'>+	pand x2,		x1; \</div><div class='add'>+	pxor x0,		x4; \</div><div class='add'>+	pxor x4,		x3; \</div><div class='add'>+	pxor x2,		x4; \</div><div class='add'>+	pxor x1,		x0; \</div><div class='add'>+	pxor x0,		x2;</div><div class='add'>+</div><div class='add'>+#define SI7_1(x0, x1, x2, x3, x4) \</div><div class='add'>+	movdqa x3,		x4; \</div><div class='add'>+	pand x0,		x3; \</div><div class='add'>+	pxor x2,		x0; \</div><div class='add'>+	por x4,			x2; \</div><div class='add'>+	pxor x1,		x4; \</div><div class='add'>+	pxor RNOT,		x0; \</div><div class='add'>+	por x3,			x1; \</div><div class='add'>+	pxor x0,		x4; \</div><div class='add'>+	pand x2,		x0; \</div><div class='add'>+	pxor x1,		x0;</div><div class='add'>+#define SI7_2(x0, x1, x2, x3, x4) \</div><div class='add'>+	pand x2,		x1; \</div><div class='add'>+	pxor x2,		x3; \</div><div class='add'>+	pxor x3,		x4; \</div><div class='add'>+	pand x3,		x2; \</div><div class='add'>+	por x0,			x3; \</div><div class='add'>+	pxor x4,		x1; \</div><div class='add'>+	pxor x4,		x3; \</div><div class='add'>+	pand x0,		x4; \</div><div class='add'>+	pxor x2,		x4;</div><div class='add'>+</div><div class='add'>+#define get_key(i, j, t) \</div><div class='add'>+	movd (4*(i)+(j))*4(CTX), t; \</div><div class='add'>+	pshufd $0, t, t;</div><div class='add'>+</div><div class='add'>+#define K2(x0, x1, x2, x3, x4, i) \</div><div class='add'>+	get_key(i, 0, RK0); \</div><div class='add'>+	get_key(i, 1, RK1); \</div><div class='add'>+	get_key(i, 2, RK2); \</div><div class='add'>+	get_key(i, 3, RK3); \</div><div class='add'>+	pxor RK0,		x0 ## 1; \</div><div class='add'>+	pxor RK1,		x1 ## 1; \</div><div class='add'>+	pxor RK2,		x2 ## 1; \</div><div class='add'>+	pxor RK3,		x3 ## 1; \</div><div class='add'>+		pxor RK0,		x0 ## 2; \</div><div class='add'>+		pxor RK1,		x1 ## 2; \</div><div class='add'>+		pxor RK2,		x2 ## 2; \</div><div class='add'>+		pxor RK3,		x3 ## 2;</div><div class='add'>+</div><div class='add'>+#define LK2(x0, x1, x2, x3, x4, i) \</div><div class='add'>+	movdqa x0 ## 1,		x4 ## 1; \</div><div class='add'>+	pslld $13,		x0 ## 1; \</div><div class='add'>+	psrld $(32 - 13),	x4 ## 1; \</div><div class='add'>+	por x4 ## 1,		x0 ## 1; \</div><div class='add'>+	pxor x0 ## 1,		x1 ## 1; \</div><div class='add'>+	movdqa x2 ## 1,		x4 ## 1; \</div><div class='add'>+	pslld $3,		x2 ## 1; \</div><div class='add'>+	psrld $(32 - 3),	x4 ## 1; \</div><div class='add'>+	por x4 ## 1,		x2 ## 1; \</div><div class='add'>+	pxor x2 ## 1,		x1 ## 1; \</div><div class='add'>+		movdqa x0 ## 2,		x4 ## 2; \</div><div class='add'>+		pslld $13,		x0 ## 2; \</div><div class='add'>+		psrld $(32 - 13),	x4 ## 2; \</div><div class='add'>+		por x4 ## 2,		x0 ## 2; \</div><div class='add'>+		pxor x0 ## 2,		x1 ## 2; \</div><div class='add'>+		movdqa x2 ## 2,		x4 ## 2; \</div><div class='add'>+		pslld $3,		x2 ## 2; \</div><div class='add'>+		psrld $(32 - 3),	x4 ## 2; \</div><div class='add'>+		por x4 ## 2,		x2 ## 2; \</div><div class='add'>+		pxor x2 ## 2,		x1 ## 2; \</div><div class='add'>+	movdqa x1 ## 1,		x4 ## 1; \</div><div class='add'>+	pslld $1,		x1 ## 1; \</div><div class='add'>+	psrld $(32 - 1),	x4 ## 1; \</div><div class='add'>+	por x4 ## 1,		x1 ## 1; \</div><div class='add'>+	movdqa x0 ## 1,		x4 ## 1; \</div><div class='add'>+	pslld $3,		x4 ## 1; \</div><div class='add'>+	pxor x2 ## 1,		x3 ## 1; \</div><div class='add'>+	pxor x4 ## 1,		x3 ## 1; \</div><div class='add'>+	movdqa x3 ## 1,		x4 ## 1; \</div><div class='add'>+	get_key(i, 1, RK1); \</div><div class='add'>+		movdqa x1 ## 2,		x4 ## 2; \</div><div class='add'>+		pslld $1,		x1 ## 2; \</div><div class='add'>+		psrld $(32 - 1),	x4 ## 2; \</div><div class='add'>+		por x4 ## 2,		x1 ## 2; \</div><div class='add'>+		movdqa x0 ## 2,		x4 ## 2; \</div><div class='add'>+		pslld $3,		x4 ## 2; \</div><div class='add'>+		pxor x2 ## 2,		x3 ## 2; \</div><div class='add'>+		pxor x4 ## 2,		x3 ## 2; \</div><div class='add'>+		movdqa x3 ## 2,		x4 ## 2; \</div><div class='add'>+		get_key(i, 3, RK3); \</div><div class='add'>+	pslld $7,		x3 ## 1; \</div><div class='add'>+	psrld $(32 - 7),	x4 ## 1; \</div><div class='add'>+	por x4 ## 1,		x3 ## 1; \</div><div class='add'>+	movdqa x1 ## 1,		x4 ## 1; \</div><div class='add'>+	pslld $7,		x4 ## 1; \</div><div class='add'>+	pxor x1 ## 1,		x0 ## 1; \</div><div class='add'>+	pxor x3 ## 1,		x0 ## 1; \</div><div class='add'>+	pxor x3 ## 1,		x2 ## 1; \</div><div class='add'>+	pxor x4 ## 1,		x2 ## 1; \</div><div class='add'>+	get_key(i, 0, RK0); \</div><div class='add'>+		pslld $7,		x3 ## 2; \</div><div class='add'>+		psrld $(32 - 7),	x4 ## 2; \</div><div class='add'>+		por x4 ## 2,		x3 ## 2; \</div><div class='add'>+		movdqa x1 ## 2,		x4 ## 2; \</div><div class='add'>+		pslld $7,		x4 ## 2; \</div><div class='add'>+		pxor x1 ## 2,		x0 ## 2; \</div><div class='add'>+		pxor x3 ## 2,		x0 ## 2; \</div><div class='add'>+		pxor x3 ## 2,		x2 ## 2; \</div><div class='add'>+		pxor x4 ## 2,		x2 ## 2; \</div><div class='add'>+		get_key(i, 2, RK2); \</div><div class='add'>+	pxor RK1,		x1 ## 1; \</div><div class='add'>+	pxor RK3,		x3 ## 1; \</div><div class='add'>+	movdqa x0 ## 1,		x4 ## 1; \</div><div class='add'>+	pslld $5,		x0 ## 1; \</div><div class='add'>+	psrld $(32 - 5),	x4 ## 1; \</div><div class='add'>+	por x4 ## 1,		x0 ## 1; \</div><div class='add'>+	movdqa x2 ## 1,		x4 ## 1; \</div><div class='add'>+	pslld $22,		x2 ## 1; \</div><div class='add'>+	psrld $(32 - 22),	x4 ## 1; \</div><div class='add'>+	por x4 ## 1,		x2 ## 1; \</div><div class='add'>+	pxor RK0,		x0 ## 1; \</div><div class='add'>+	pxor RK2,		x2 ## 1; \</div><div class='add'>+		pxor RK1,		x1 ## 2; \</div><div class='add'>+		pxor RK3,		x3 ## 2; \</div><div class='add'>+		movdqa x0 ## 2,		x4 ## 2; \</div><div class='add'>+		pslld $5,		x0 ## 2; \</div><div class='add'>+		psrld $(32 - 5),	x4 ## 2; \</div><div class='add'>+		por x4 ## 2,		x0 ## 2; \</div><div class='add'>+		movdqa x2 ## 2,		x4 ## 2; \</div><div class='add'>+		pslld $22,		x2 ## 2; \</div><div class='add'>+		psrld $(32 - 22),	x4 ## 2; \</div><div class='add'>+		por x4 ## 2,		x2 ## 2; \</div><div class='add'>+		pxor RK0,		x0 ## 2; \</div><div class='add'>+		pxor RK2,		x2 ## 2;</div><div class='add'>+</div><div class='add'>+#define KL2(x0, x1, x2, x3, x4, i) \</div><div class='add'>+	pxor RK0,		x0 ## 1; \</div><div class='add'>+	pxor RK2,		x2 ## 1; \</div><div class='add'>+	movdqa x0 ## 1,		x4 ## 1; \</div><div class='add'>+	psrld $5,		x0 ## 1; \</div><div class='add'>+	pslld $(32 - 5),	x4 ## 1; \</div><div class='add'>+	por x4 ## 1,		x0 ## 1; \</div><div class='add'>+	pxor RK3,		x3 ## 1; \</div><div class='add'>+	pxor RK1,		x1 ## 1; \</div><div class='add'>+	movdqa x2 ## 1,		x4 ## 1; \</div><div class='add'>+	psrld $22,		x2 ## 1; \</div><div class='add'>+	pslld $(32 - 22),	x4 ## 1; \</div><div class='add'>+	por x4 ## 1,		x2 ## 1; \</div><div class='add'>+	pxor x3 ## 1,		x2 ## 1; \</div><div class='add'>+		pxor RK0,		x0 ## 2; \</div><div class='add'>+		pxor RK2,		x2 ## 2; \</div><div class='add'>+		movdqa x0 ## 2,		x4 ## 2; \</div><div class='add'>+		psrld $5,		x0 ## 2; \</div><div class='add'>+		pslld $(32 - 5),	x4 ## 2; \</div><div class='add'>+		por x4 ## 2,		x0 ## 2; \</div><div class='add'>+		pxor RK3,		x3 ## 2; \</div><div class='add'>+		pxor RK1,		x1 ## 2; \</div><div class='add'>+		movdqa x2 ## 2,		x4 ## 2; \</div><div class='add'>+		psrld $22,		x2 ## 2; \</div><div class='add'>+		pslld $(32 - 22),	x4 ## 2; \</div><div class='add'>+		por x4 ## 2,		x2 ## 2; \</div><div class='add'>+		pxor x3 ## 2,		x2 ## 2; \</div><div class='add'>+	pxor x3 ## 1,		x0 ## 1; \</div><div class='add'>+	movdqa x1 ## 1,		x4 ## 1; \</div><div class='add'>+	pslld $7,		x4 ## 1; \</div><div class='add'>+	pxor x1 ## 1,		x0 ## 1; \</div><div class='add'>+	pxor x4 ## 1,		x2 ## 1; \</div><div class='add'>+	movdqa x1 ## 1,		x4 ## 1; \</div><div class='add'>+	psrld $1,		x1 ## 1; \</div><div class='add'>+	pslld $(32 - 1),	x4 ## 1; \</div><div class='add'>+	por x4 ## 1,		x1 ## 1; \</div><div class='add'>+		pxor x3 ## 2,		x0 ## 2; \</div><div class='add'>+		movdqa x1 ## 2,		x4 ## 2; \</div><div class='add'>+		pslld $7,		x4 ## 2; \</div><div class='add'>+		pxor x1 ## 2,		x0 ## 2; \</div><div class='add'>+		pxor x4 ## 2,		x2 ## 2; \</div><div class='add'>+		movdqa x1 ## 2,		x4 ## 2; \</div><div class='add'>+		psrld $1,		x1 ## 2; \</div><div class='add'>+		pslld $(32 - 1),	x4 ## 2; \</div><div class='add'>+		por x4 ## 2,		x1 ## 2; \</div><div class='add'>+	movdqa x3 ## 1,		x4 ## 1; \</div><div class='add'>+	psrld $7,		x3 ## 1; \</div><div class='add'>+	pslld $(32 - 7),	x4 ## 1; \</div><div class='add'>+	por x4 ## 1,		x3 ## 1; \</div><div class='add'>+	pxor x0 ## 1,		x1 ## 1; \</div><div class='add'>+	movdqa x0 ## 1,		x4 ## 1; \</div><div class='add'>+	pslld $3,		x4 ## 1; \</div><div class='add'>+	pxor x4 ## 1,		x3 ## 1; \</div><div class='add'>+	movdqa x0 ## 1,		x4 ## 1; \</div><div class='add'>+		movdqa x3 ## 2,		x4 ## 2; \</div><div class='add'>+		psrld $7,		x3 ## 2; \</div><div class='add'>+		pslld $(32 - 7),	x4 ## 2; \</div><div class='add'>+		por x4 ## 2,		x3 ## 2; \</div><div class='add'>+		pxor x0 ## 2,		x1 ## 2; \</div><div class='add'>+		movdqa x0 ## 2,		x4 ## 2; \</div><div class='add'>+		pslld $3,		x4 ## 2; \</div><div class='add'>+		pxor x4 ## 2,		x3 ## 2; \</div><div class='add'>+		movdqa x0 ## 2,		x4 ## 2; \</div><div class='add'>+	psrld $13,		x0 ## 1; \</div><div class='add'>+	pslld $(32 - 13),	x4 ## 1; \</div><div class='add'>+	por x4 ## 1,		x0 ## 1; \</div><div class='add'>+	pxor x2 ## 1,		x1 ## 1; \</div><div class='add'>+	pxor x2 ## 1,		x3 ## 1; \</div><div class='add'>+	movdqa x2 ## 1,		x4 ## 1; \</div><div class='add'>+	psrld $3,		x2 ## 1; \</div><div class='add'>+	pslld $(32 - 3),	x4 ## 1; \</div><div class='add'>+	por x4 ## 1,		x2 ## 1; \</div><div class='add'>+		psrld $13,		x0 ## 2; \</div><div class='add'>+		pslld $(32 - 13),	x4 ## 2; \</div><div class='add'>+		por x4 ## 2,		x0 ## 2; \</div><div class='add'>+		pxor x2 ## 2,		x1 ## 2; \</div><div class='add'>+		pxor x2 ## 2,		x3 ## 2; \</div><div class='add'>+		movdqa x2 ## 2,		x4 ## 2; \</div><div class='add'>+		psrld $3,		x2 ## 2; \</div><div class='add'>+		pslld $(32 - 3),	x4 ## 2; \</div><div class='add'>+		por x4 ## 2,		x2 ## 2;</div><div class='add'>+</div><div class='add'>+#define S(SBOX, x0, x1, x2, x3, x4) \</div><div class='add'>+	SBOX ## _1(x0 ## 1, x1 ## 1, x2 ## 1, x3 ## 1, x4 ## 1); \</div><div class='add'>+	SBOX ## _2(x0 ## 1, x1 ## 1, x2 ## 1, x3 ## 1, x4 ## 1); \</div><div class='add'>+	SBOX ## _1(x0 ## 2, x1 ## 2, x2 ## 2, x3 ## 2, x4 ## 2); \</div><div class='add'>+	SBOX ## _2(x0 ## 2, x1 ## 2, x2 ## 2, x3 ## 2, x4 ## 2);</div><div class='add'>+</div><div class='add'>+#define SP(SBOX, x0, x1, x2, x3, x4, i) \</div><div class='add'>+	get_key(i, 0, RK0); \</div><div class='add'>+	SBOX ## _1(x0 ## 1, x1 ## 1, x2 ## 1, x3 ## 1, x4 ## 1); \</div><div class='add'>+	get_key(i, 2, RK2); \</div><div class='add'>+	SBOX ## _1(x0 ## 2, x1 ## 2, x2 ## 2, x3 ## 2, x4 ## 2); \</div><div class='add'>+	get_key(i, 3, RK3); \</div><div class='add'>+	SBOX ## _2(x0 ## 1, x1 ## 1, x2 ## 1, x3 ## 1, x4 ## 1); \</div><div class='add'>+	get_key(i, 1, RK1); \</div><div class='add'>+	SBOX ## _2(x0 ## 2, x1 ## 2, x2 ## 2, x3 ## 2, x4 ## 2); \</div><div class='add'>+</div><div class='add'>+#define transpose_4x4(x0, x1, x2, x3, t1, t2, t3) \</div><div class='add'>+	movdqa x2,		t3; \</div><div class='add'>+	movdqa x0,		t1; \</div><div class='add'>+	unpcklps x3,		t3; \</div><div class='add'>+	movdqa x0,		t2; \</div><div class='add'>+	unpcklps x1,		t1; \</div><div class='add'>+	unpckhps x1,		t2; \</div><div class='add'>+	movdqa t3,		x1; \</div><div class='add'>+	unpckhps x3,		x2; \</div><div class='add'>+	movdqa t1,		x0; \</div><div class='add'>+	movhlps t1,		x1; \</div><div class='add'>+	movdqa t2,		t1; \</div><div class='add'>+	movlhps t3,		x0; \</div><div class='add'>+	movlhps x2,		t1; \</div><div class='add'>+	movhlps t2,		x2; \</div><div class='add'>+	movdqa x2,		x3; \</div><div class='add'>+	movdqa t1,		x2;</div><div class='add'>+</div><div class='add'>+#define read_blocks(in, x0, x1, x2, x3, t0, t1, t2) \</div><div class='add'>+	movdqu (0*4*4)(in),	x0; \</div><div class='add'>+	movdqu (1*4*4)(in),	x1; \</div><div class='add'>+	movdqu (2*4*4)(in),	x2; \</div><div class='add'>+	movdqu (3*4*4)(in),	x3; \</div><div class='add'>+	\</div><div class='add'>+	transpose_4x4(x0, x1, x2, x3, t0, t1, t2)</div><div class='add'>+</div><div class='add'>+#define write_blocks(out, x0, x1, x2, x3, t0, t1, t2) \</div><div class='add'>+	transpose_4x4(x0, x1, x2, x3, t0, t1, t2) \</div><div class='add'>+	\</div><div class='add'>+	movdqu x0,		(0*4*4)(out); \</div><div class='add'>+	movdqu x1,		(1*4*4)(out); \</div><div class='add'>+	movdqu x2,		(2*4*4)(out); \</div><div class='add'>+	movdqu x3,		(3*4*4)(out);</div><div class='add'>+</div><div class='add'>+#define xor_blocks(out, x0, x1, x2, x3, t0, t1, t2) \</div><div class='add'>+	transpose_4x4(x0, x1, x2, x3, t0, t1, t2) \</div><div class='add'>+	\</div><div class='add'>+	movdqu (0*4*4)(out),	t0; \</div><div class='add'>+	pxor t0,		x0; \</div><div class='add'>+	movdqu x0,		(0*4*4)(out); \</div><div class='add'>+	movdqu (1*4*4)(out),	t0; \</div><div class='add'>+	pxor t0,		x1; \</div><div class='add'>+	movdqu x1,		(1*4*4)(out); \</div><div class='add'>+	movdqu (2*4*4)(out),	t0; \</div><div class='add'>+	pxor t0,		x2; \</div><div class='add'>+	movdqu x2,		(2*4*4)(out); \</div><div class='add'>+	movdqu (3*4*4)(out),	t0; \</div><div class='add'>+	pxor t0,		x3; \</div><div class='add'>+	movdqu x3,		(3*4*4)(out);</div><div class='add'>+</div><div class='add'>+.align 8</div><div class='add'>+.global __serpent_enc_blk_8way</div><div class='add'>+.type   __serpent_enc_blk_8way,@function;</div><div class='add'>+</div><div class='add'>+__serpent_enc_blk_8way:</div><div class='add'>+	/* input:</div><div class='add'>+	 *	%rdi: ctx, CTX</div><div class='add'>+	 *	%rsi: dst</div><div class='add'>+	 *	%rdx: src</div><div class='add'>+	 *	%rcx: bool, if true: xor output</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	pcmpeqd RNOT, RNOT;</div><div class='add'>+</div><div class='add'>+	leaq (4*4*4)(%rdx), %rax;</div><div class='add'>+	read_blocks(%rdx, RA1, RB1, RC1, RD1, RK0, RK1, RK2);</div><div class='add'>+	read_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);</div><div class='add'>+</div><div class='add'>+						 K2(RA, RB, RC, RD, RE, 0);</div><div class='add'>+	S(S0, RA, RB, RC, RD, RE);		LK2(RC, RB, RD, RA, RE, 1);</div><div class='add'>+	S(S1, RC, RB, RD, RA, RE);		LK2(RE, RD, RA, RC, RB, 2);</div><div class='add'>+	S(S2, RE, RD, RA, RC, RB);		LK2(RB, RD, RE, RC, RA, 3);</div><div class='add'>+	S(S3, RB, RD, RE, RC, RA);		LK2(RC, RA, RD, RB, RE, 4);</div><div class='add'>+	S(S4, RC, RA, RD, RB, RE);		LK2(RA, RD, RB, RE, RC, 5);</div><div class='add'>+	S(S5, RA, RD, RB, RE, RC);		LK2(RC, RA, RD, RE, RB, 6);</div><div class='add'>+	S(S6, RC, RA, RD, RE, RB);		LK2(RD, RB, RA, RE, RC, 7);</div><div class='add'>+	S(S7, RD, RB, RA, RE, RC);		LK2(RC, RA, RE, RD, RB, 8);</div><div class='add'>+	S(S0, RC, RA, RE, RD, RB);		LK2(RE, RA, RD, RC, RB, 9);</div><div class='add'>+	S(S1, RE, RA, RD, RC, RB);		LK2(RB, RD, RC, RE, RA, 10);</div><div class='add'>+	S(S2, RB, RD, RC, RE, RA);		LK2(RA, RD, RB, RE, RC, 11);</div><div class='add'>+	S(S3, RA, RD, RB, RE, RC);		LK2(RE, RC, RD, RA, RB, 12);</div><div class='add'>+	S(S4, RE, RC, RD, RA, RB);		LK2(RC, RD, RA, RB, RE, 13);</div><div class='add'>+	S(S5, RC, RD, RA, RB, RE);		LK2(RE, RC, RD, RB, RA, 14);</div><div class='add'>+	S(S6, RE, RC, RD, RB, RA);		LK2(RD, RA, RC, RB, RE, 15);</div><div class='add'>+	S(S7, RD, RA, RC, RB, RE);		LK2(RE, RC, RB, RD, RA, 16);</div><div class='add'>+	S(S0, RE, RC, RB, RD, RA);		LK2(RB, RC, RD, RE, RA, 17);</div><div class='add'>+	S(S1, RB, RC, RD, RE, RA);		LK2(RA, RD, RE, RB, RC, 18);</div><div class='add'>+	S(S2, RA, RD, RE, RB, RC);		LK2(RC, RD, RA, RB, RE, 19);</div><div class='add'>+	S(S3, RC, RD, RA, RB, RE);		LK2(RB, RE, RD, RC, RA, 20);</div><div class='add'>+	S(S4, RB, RE, RD, RC, RA);		LK2(RE, RD, RC, RA, RB, 21);</div><div class='add'>+	S(S5, RE, RD, RC, RA, RB);		LK2(RB, RE, RD, RA, RC, 22);</div><div class='add'>+	S(S6, RB, RE, RD, RA, RC);		LK2(RD, RC, RE, RA, RB, 23);</div><div class='add'>+	S(S7, RD, RC, RE, RA, RB);		LK2(RB, RE, RA, RD, RC, 24);</div><div class='add'>+	S(S0, RB, RE, RA, RD, RC);		LK2(RA, RE, RD, RB, RC, 25);</div><div class='add'>+	S(S1, RA, RE, RD, RB, RC);		LK2(RC, RD, RB, RA, RE, 26);</div><div class='add'>+	S(S2, RC, RD, RB, RA, RE);		LK2(RE, RD, RC, RA, RB, 27);</div><div class='add'>+	S(S3, RE, RD, RC, RA, RB);		LK2(RA, RB, RD, RE, RC, 28);</div><div class='add'>+	S(S4, RA, RB, RD, RE, RC);		LK2(RB, RD, RE, RC, RA, 29);</div><div class='add'>+	S(S5, RB, RD, RE, RC, RA);		LK2(RA, RB, RD, RC, RE, 30);</div><div class='add'>+	S(S6, RA, RB, RD, RC, RE);		LK2(RD, RE, RB, RC, RA, 31);</div><div class='add'>+	S(S7, RD, RE, RB, RC, RA);		 K2(RA, RB, RC, RD, RE, 32);</div><div class='add'>+</div><div class='add'>+	leaq (4*4*4)(%rsi), %rax;</div><div class='add'>+</div><div class='add'>+	testb %cl, %cl;</div><div class='add'>+	jnz __enc_xor8;</div><div class='add'>+</div><div class='add'>+	write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);</div><div class='add'>+	write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);</div><div class='add'>+</div><div class='add'>+	ret;</div><div class='add'>+</div><div class='add'>+__enc_xor8:</div><div class='add'>+	xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);</div><div class='add'>+	xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);</div><div class='add'>+</div><div class='add'>+	ret;</div><div class='add'>+</div><div class='add'>+.align 8</div><div class='add'>+.global serpent_dec_blk_8way</div><div class='add'>+.type   serpent_dec_blk_8way,@function;</div><div class='add'>+</div><div class='add'>+serpent_dec_blk_8way:</div><div class='add'>+	/* input:</div><div class='add'>+	 *	%rdi: ctx, CTX</div><div class='add'>+	 *	%rsi: dst</div><div class='add'>+	 *	%rdx: src</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	pcmpeqd RNOT, RNOT;</div><div class='add'>+</div><div class='add'>+	leaq (4*4*4)(%rdx), %rax;</div><div class='add'>+	read_blocks(%rdx, RA1, RB1, RC1, RD1, RK0, RK1, RK2);</div><div class='add'>+	read_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);</div><div class='add'>+</div><div class='add'>+						 K2(RA, RB, RC, RD, RE, 32);</div><div class='add'>+	SP(SI7, RA, RB, RC, RD, RE, 31);	KL2(RB, RD, RA, RE, RC, 31);</div><div class='add'>+	SP(SI6, RB, RD, RA, RE, RC, 30);	KL2(RA, RC, RE, RB, RD, 30);</div><div class='add'>+	SP(SI5, RA, RC, RE, RB, RD, 29);	KL2(RC, RD, RA, RE, RB, 29);</div><div class='add'>+	SP(SI4, RC, RD, RA, RE, RB, 28);	KL2(RC, RA, RB, RE, RD, 28);</div><div class='add'>+	SP(SI3, RC, RA, RB, RE, RD, 27);	KL2(RB, RC, RD, RE, RA, 27);</div><div class='add'>+	SP(SI2, RB, RC, RD, RE, RA, 26);	KL2(RC, RA, RE, RD, RB, 26);</div><div class='add'>+	SP(SI1, RC, RA, RE, RD, RB, 25);	KL2(RB, RA, RE, RD, RC, 25);</div><div class='add'>+	SP(SI0, RB, RA, RE, RD, RC, 24);	KL2(RE, RC, RA, RB, RD, 24);</div><div class='add'>+	SP(SI7, RE, RC, RA, RB, RD, 23);	KL2(RC, RB, RE, RD, RA, 23);</div><div class='add'>+	SP(SI6, RC, RB, RE, RD, RA, 22);	KL2(RE, RA, RD, RC, RB, 22);</div><div class='add'>+	SP(SI5, RE, RA, RD, RC, RB, 21);	KL2(RA, RB, RE, RD, RC, 21);</div><div class='add'>+	SP(SI4, RA, RB, RE, RD, RC, 20);	KL2(RA, RE, RC, RD, RB, 20);</div><div class='add'>+	SP(SI3, RA, RE, RC, RD, RB, 19);	KL2(RC, RA, RB, RD, RE, 19);</div><div class='add'>+	SP(SI2, RC, RA, RB, RD, RE, 18);	KL2(RA, RE, RD, RB, RC, 18);</div><div class='add'>+	SP(SI1, RA, RE, RD, RB, RC, 17);	KL2(RC, RE, RD, RB, RA, 17);</div><div class='add'>+	SP(SI0, RC, RE, RD, RB, RA, 16);	KL2(RD, RA, RE, RC, RB, 16);</div><div class='add'>+	SP(SI7, RD, RA, RE, RC, RB, 15);	KL2(RA, RC, RD, RB, RE, 15);</div><div class='add'>+	SP(SI6, RA, RC, RD, RB, RE, 14);	KL2(RD, RE, RB, RA, RC, 14);</div><div class='add'>+	SP(SI5, RD, RE, RB, RA, RC, 13);	KL2(RE, RC, RD, RB, RA, 13);</div><div class='add'>+	SP(SI4, RE, RC, RD, RB, RA, 12);	KL2(RE, RD, RA, RB, RC, 12);</div><div class='add'>+	SP(SI3, RE, RD, RA, RB, RC, 11);	KL2(RA, RE, RC, RB, RD, 11);</div><div class='add'>+	SP(SI2, RA, RE, RC, RB, RD, 10);	KL2(RE, RD, RB, RC, RA, 10);</div><div class='add'>+	SP(SI1, RE, RD, RB, RC, RA, 9);		KL2(RA, RD, RB, RC, RE, 9);</div><div class='add'>+	SP(SI0, RA, RD, RB, RC, RE, 8);		KL2(RB, RE, RD, RA, RC, 8);</div><div class='add'>+	SP(SI7, RB, RE, RD, RA, RC, 7);		KL2(RE, RA, RB, RC, RD, 7);</div><div class='add'>+	SP(SI6, RE, RA, RB, RC, RD, 6);		KL2(RB, RD, RC, RE, RA, 6);</div><div class='add'>+	SP(SI5, RB, RD, RC, RE, RA, 5);		KL2(RD, RA, RB, RC, RE, 5);</div><div class='add'>+	SP(SI4, RD, RA, RB, RC, RE, 4);		KL2(RD, RB, RE, RC, RA, 4);</div><div class='add'>+	SP(SI3, RD, RB, RE, RC, RA, 3);		KL2(RE, RD, RA, RC, RB, 3);</div><div class='add'>+	SP(SI2, RE, RD, RA, RC, RB, 2);		KL2(RD, RB, RC, RA, RE, 2);</div><div class='add'>+	SP(SI1, RD, RB, RC, RA, RE, 1);		KL2(RE, RB, RC, RA, RD, 1);</div><div class='add'>+	S(SI0, RE, RB, RC, RA, RD);		 K2(RC, RD, RB, RE, RA, 0);</div><div class='add'>+</div><div class='add'>+	leaq (4*4*4)(%rsi), %rax;</div><div class='add'>+	write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);</div><div class='add'>+	write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);</div><div class='add'>+</div><div class='add'>+	ret;</div><div class='head'>diff --git a/arch/x86/crypto/serpent_sse2_glue.c b/arch/x86/crypto/serpent_sse2_glue.c<br/>new file mode 100644<br/>index 000000000000..7955a9b76b91<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/crypto/serpent_sse2_glue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/crypto/serpent_sse2_glue.c</a></div><div class='hunk'>@@ -0,0 +1,1070 @@</div><div class='add'>+/*</div><div class='add'>+ * Glue Code for SSE2 assembler versions of Serpent Cipher</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Jussi Kivilinna &lt;jussi.kivilinna@mbnet.fi&gt;</div><div class='add'>+ *</div><div class='add'>+ * Glue code based on aesni-intel_glue.c by:</div><div class='add'>+ *  Copyright (C) 2008, Intel Corp.</div><div class='add'>+ *    Author: Huang Ying &lt;ying.huang@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * CBC &amp; ECB parts based on code (crypto/cbc.c,ecb.c) by:</div><div class='add'>+ *   Copyright (c) 2006 Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</div><div class='add'>+ * CTR part based on code (crypto/ctr.c) by:</div><div class='add'>+ *   (C) Copyright IBM Corp. 2007 - Joy Latten &lt;latten@us.ibm.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'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307</div><div class='add'>+ * USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/hardirq.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;crypto/algapi.h&gt;</div><div class='add'>+#include &lt;crypto/serpent.h&gt;</div><div class='add'>+#include &lt;crypto/cryptd.h&gt;</div><div class='add'>+#include &lt;crypto/b128ops.h&gt;</div><div class='add'>+#include &lt;crypto/ctr.h&gt;</div><div class='add'>+#include &lt;crypto/lrw.h&gt;</div><div class='add'>+#include &lt;crypto/xts.h&gt;</div><div class='add'>+#include &lt;asm/i387.h&gt;</div><div class='add'>+#include &lt;asm/serpent.h&gt;</div><div class='add'>+#include &lt;crypto/scatterwalk.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+</div><div class='add'>+struct async_serpent_ctx {</div><div class='add'>+	struct cryptd_ablkcipher *cryptd_tfm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool serpent_fpu_begin(bool fpu_enabled, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	if (fpu_enabled)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* SSE2 is only used when chunk to be processed is large enough, so</div><div class='add'>+	 * do not enable FPU until it is necessary.</div><div class='add'>+	 */</div><div class='add'>+	if (nbytes &lt; SERPENT_BLOCK_SIZE * SERPENT_PARALLEL_BLOCKS)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	kernel_fpu_begin();</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void serpent_fpu_end(bool fpu_enabled)</div><div class='add'>+{</div><div class='add'>+	if (fpu_enabled)</div><div class='add'>+		kernel_fpu_end();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,</div><div class='add'>+		     bool enc)</div><div class='add'>+{</div><div class='add'>+	bool fpu_enabled = false;</div><div class='add'>+	struct serpent_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	const unsigned int bsize = SERPENT_BLOCK_SIZE;</div><div class='add'>+	unsigned int nbytes;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = blkcipher_walk_virt(desc, walk);</div><div class='add'>+	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='add'>+</div><div class='add'>+	while ((nbytes = walk-&gt;nbytes)) {</div><div class='add'>+		u8 *wsrc = walk-&gt;src.virt.addr;</div><div class='add'>+		u8 *wdst = walk-&gt;dst.virt.addr;</div><div class='add'>+</div><div class='add'>+		fpu_enabled = serpent_fpu_begin(fpu_enabled, nbytes);</div><div class='add'>+</div><div class='add'>+		/* Process multi-block batch */</div><div class='add'>+		if (nbytes &gt;= bsize * SERPENT_PARALLEL_BLOCKS) {</div><div class='add'>+			do {</div><div class='add'>+				if (enc)</div><div class='add'>+					serpent_enc_blk_xway(ctx, wdst, wsrc);</div><div class='add'>+				else</div><div class='add'>+					serpent_dec_blk_xway(ctx, wdst, wsrc);</div><div class='add'>+</div><div class='add'>+				wsrc += bsize * SERPENT_PARALLEL_BLOCKS;</div><div class='add'>+				wdst += bsize * SERPENT_PARALLEL_BLOCKS;</div><div class='add'>+				nbytes -= bsize * SERPENT_PARALLEL_BLOCKS;</div><div class='add'>+			} while (nbytes &gt;= bsize * SERPENT_PARALLEL_BLOCKS);</div><div class='add'>+</div><div class='add'>+			if (nbytes &lt; bsize)</div><div class='add'>+				goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Handle leftovers */</div><div class='add'>+		do {</div><div class='add'>+			if (enc)</div><div class='add'>+				__serpent_encrypt(ctx, wdst, wsrc);</div><div class='add'>+			else</div><div class='add'>+				__serpent_decrypt(ctx, wdst, wsrc);</div><div class='add'>+</div><div class='add'>+			wsrc += bsize;</div><div class='add'>+			wdst += bsize;</div><div class='add'>+			nbytes -= bsize;</div><div class='add'>+		} while (nbytes &gt;= bsize);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+		err = blkcipher_walk_done(desc, walk, nbytes);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	serpent_fpu_end(fpu_enabled);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ecb_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='add'>+		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct blkcipher_walk walk;</div><div class='add'>+</div><div class='add'>+	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='add'>+	return ecb_crypt(desc, &amp;walk, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ecb_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='add'>+		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct blkcipher_walk walk;</div><div class='add'>+</div><div class='add'>+	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='add'>+	return ecb_crypt(desc, &amp;walk, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg blk_ecb_alg = {</div><div class='add'>+	.cra_name		= "__ecb-serpent-sse2",</div><div class='add'>+	.cra_driver_name	= "__driver-ecb-serpent-sse2",</div><div class='add'>+	.cra_priority		= 0,</div><div class='add'>+	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER,</div><div class='add'>+	.cra_blocksize		= SERPENT_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize		= sizeof(struct serpent_ctx),</div><div class='add'>+	.cra_alignmask		= 0,</div><div class='add'>+	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='add'>+	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_list		= LIST_HEAD_INIT(blk_ecb_alg.cra_list),</div><div class='add'>+	.cra_u = {</div><div class='add'>+		.blkcipher = {</div><div class='add'>+			.min_keysize	= SERPENT_MIN_KEY_SIZE,</div><div class='add'>+			.max_keysize	= SERPENT_MAX_KEY_SIZE,</div><div class='add'>+			.setkey		= serpent_setkey,</div><div class='add'>+			.encrypt	= ecb_encrypt,</div><div class='add'>+			.decrypt	= ecb_decrypt,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int __cbc_encrypt(struct blkcipher_desc *desc,</div><div class='add'>+				  struct blkcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	struct serpent_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	const unsigned int bsize = SERPENT_BLOCK_SIZE;</div><div class='add'>+	unsigned int nbytes = walk-&gt;nbytes;</div><div class='add'>+	u128 *src = (u128 *)walk-&gt;src.virt.addr;</div><div class='add'>+	u128 *dst = (u128 *)walk-&gt;dst.virt.addr;</div><div class='add'>+	u128 *iv = (u128 *)walk-&gt;iv;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		u128_xor(dst, src, iv);</div><div class='add'>+		__serpent_encrypt(ctx, (u8 *)dst, (u8 *)dst);</div><div class='add'>+		iv = dst;</div><div class='add'>+</div><div class='add'>+		src += 1;</div><div class='add'>+		dst += 1;</div><div class='add'>+		nbytes -= bsize;</div><div class='add'>+	} while (nbytes &gt;= bsize);</div><div class='add'>+</div><div class='add'>+	u128_xor((u128 *)walk-&gt;iv, (u128 *)walk-&gt;iv, iv);</div><div class='add'>+	return nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cbc_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='add'>+		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct blkcipher_walk walk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='add'>+	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+</div><div class='add'>+	while ((nbytes = walk.nbytes)) {</div><div class='add'>+		nbytes = __cbc_encrypt(desc, &amp;walk);</div><div class='add'>+		err = blkcipher_walk_done(desc, &amp;walk, nbytes);</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 unsigned int __cbc_decrypt(struct blkcipher_desc *desc,</div><div class='add'>+				  struct blkcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	struct serpent_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	const unsigned int bsize = SERPENT_BLOCK_SIZE;</div><div class='add'>+	unsigned int nbytes = walk-&gt;nbytes;</div><div class='add'>+	u128 *src = (u128 *)walk-&gt;src.virt.addr;</div><div class='add'>+	u128 *dst = (u128 *)walk-&gt;dst.virt.addr;</div><div class='add'>+	u128 ivs[SERPENT_PARALLEL_BLOCKS - 1];</div><div class='add'>+	u128 last_iv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Start of the last block. */</div><div class='add'>+	src += nbytes / bsize - 1;</div><div class='add'>+	dst += nbytes / bsize - 1;</div><div class='add'>+</div><div class='add'>+	last_iv = *src;</div><div class='add'>+</div><div class='add'>+	/* Process multi-block batch */</div><div class='add'>+	if (nbytes &gt;= bsize * SERPENT_PARALLEL_BLOCKS) {</div><div class='add'>+		do {</div><div class='add'>+			nbytes -= bsize * (SERPENT_PARALLEL_BLOCKS - 1);</div><div class='add'>+			src -= SERPENT_PARALLEL_BLOCKS - 1;</div><div class='add'>+			dst -= SERPENT_PARALLEL_BLOCKS - 1;</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; SERPENT_PARALLEL_BLOCKS - 1; i++)</div><div class='add'>+				ivs[i] = src[i];</div><div class='add'>+</div><div class='add'>+			serpent_dec_blk_xway(ctx, (u8 *)dst, (u8 *)src);</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; SERPENT_PARALLEL_BLOCKS - 1; i++)</div><div class='add'>+				u128_xor(dst + (i + 1), dst + (i + 1), ivs + i);</div><div class='add'>+</div><div class='add'>+			nbytes -= bsize;</div><div class='add'>+			if (nbytes &lt; bsize)</div><div class='add'>+				goto done;</div><div class='add'>+</div><div class='add'>+			u128_xor(dst, dst, src - 1);</div><div class='add'>+			src -= 1;</div><div class='add'>+			dst -= 1;</div><div class='add'>+		} while (nbytes &gt;= bsize * SERPENT_PARALLEL_BLOCKS);</div><div class='add'>+</div><div class='add'>+		if (nbytes &lt; bsize)</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Handle leftovers */</div><div class='add'>+	for (;;) {</div><div class='add'>+		__serpent_decrypt(ctx, (u8 *)dst, (u8 *)src);</div><div class='add'>+</div><div class='add'>+		nbytes -= bsize;</div><div class='add'>+		if (nbytes &lt; bsize)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		u128_xor(dst, dst, src - 1);</div><div class='add'>+		src -= 1;</div><div class='add'>+		dst -= 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	u128_xor(dst, dst, (u128 *)walk-&gt;iv);</div><div class='add'>+	*(u128 *)walk-&gt;iv = last_iv;</div><div class='add'>+</div><div class='add'>+	return nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='add'>+		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	bool fpu_enabled = false;</div><div class='add'>+	struct blkcipher_walk walk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='add'>+	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='add'>+</div><div class='add'>+	while ((nbytes = walk.nbytes)) {</div><div class='add'>+		fpu_enabled = serpent_fpu_begin(fpu_enabled, nbytes);</div><div class='add'>+		nbytes = __cbc_decrypt(desc, &amp;walk);</div><div class='add'>+		err = blkcipher_walk_done(desc, &amp;walk, nbytes);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	serpent_fpu_end(fpu_enabled);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg blk_cbc_alg = {</div><div class='add'>+	.cra_name		= "__cbc-serpent-sse2",</div><div class='add'>+	.cra_driver_name	= "__driver-cbc-serpent-sse2",</div><div class='add'>+	.cra_priority		= 0,</div><div class='add'>+	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER,</div><div class='add'>+	.cra_blocksize		= SERPENT_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize		= sizeof(struct serpent_ctx),</div><div class='add'>+	.cra_alignmask		= 0,</div><div class='add'>+	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='add'>+	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_list		= LIST_HEAD_INIT(blk_cbc_alg.cra_list),</div><div class='add'>+	.cra_u = {</div><div class='add'>+		.blkcipher = {</div><div class='add'>+			.min_keysize	= SERPENT_MIN_KEY_SIZE,</div><div class='add'>+			.max_keysize	= SERPENT_MAX_KEY_SIZE,</div><div class='add'>+			.setkey		= serpent_setkey,</div><div class='add'>+			.encrypt	= cbc_encrypt,</div><div class='add'>+			.decrypt	= cbc_decrypt,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void u128_to_be128(be128 *dst, const u128 *src)</div><div class='add'>+{</div><div class='add'>+	dst-&gt;a = cpu_to_be64(src-&gt;a);</div><div class='add'>+	dst-&gt;b = cpu_to_be64(src-&gt;b);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void be128_to_u128(u128 *dst, const be128 *src)</div><div class='add'>+{</div><div class='add'>+	dst-&gt;a = be64_to_cpu(src-&gt;a);</div><div class='add'>+	dst-&gt;b = be64_to_cpu(src-&gt;b);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void u128_inc(u128 *i)</div><div class='add'>+{</div><div class='add'>+	i-&gt;b++;</div><div class='add'>+	if (!i-&gt;b)</div><div class='add'>+		i-&gt;a++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ctr_crypt_final(struct blkcipher_desc *desc,</div><div class='add'>+			    struct blkcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	struct serpent_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	u8 *ctrblk = walk-&gt;iv;</div><div class='add'>+	u8 keystream[SERPENT_BLOCK_SIZE];</div><div class='add'>+	u8 *src = walk-&gt;src.virt.addr;</div><div class='add'>+	u8 *dst = walk-&gt;dst.virt.addr;</div><div class='add'>+	unsigned int nbytes = walk-&gt;nbytes;</div><div class='add'>+</div><div class='add'>+	__serpent_encrypt(ctx, keystream, ctrblk);</div><div class='add'>+	crypto_xor(keystream, src, nbytes);</div><div class='add'>+	memcpy(dst, keystream, nbytes);</div><div class='add'>+</div><div class='add'>+	crypto_inc(ctrblk, SERPENT_BLOCK_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int __ctr_crypt(struct blkcipher_desc *desc,</div><div class='add'>+				struct blkcipher_walk *walk)</div><div class='add'>+{</div><div class='add'>+	struct serpent_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	const unsigned int bsize = SERPENT_BLOCK_SIZE;</div><div class='add'>+	unsigned int nbytes = walk-&gt;nbytes;</div><div class='add'>+	u128 *src = (u128 *)walk-&gt;src.virt.addr;</div><div class='add'>+	u128 *dst = (u128 *)walk-&gt;dst.virt.addr;</div><div class='add'>+	u128 ctrblk;</div><div class='add'>+	be128 ctrblocks[SERPENT_PARALLEL_BLOCKS];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	be128_to_u128(&amp;ctrblk, (be128 *)walk-&gt;iv);</div><div class='add'>+</div><div class='add'>+	/* Process multi-block batch */</div><div class='add'>+	if (nbytes &gt;= bsize * SERPENT_PARALLEL_BLOCKS) {</div><div class='add'>+		do {</div><div class='add'>+			/* create ctrblks for parallel encrypt */</div><div class='add'>+			for (i = 0; i &lt; SERPENT_PARALLEL_BLOCKS; i++) {</div><div class='add'>+				if (dst != src)</div><div class='add'>+					dst[i] = src[i];</div><div class='add'>+</div><div class='add'>+				u128_to_be128(&amp;ctrblocks[i], &amp;ctrblk);</div><div class='add'>+				u128_inc(&amp;ctrblk);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			serpent_enc_blk_xway_xor(ctx, (u8 *)dst,</div><div class='add'>+						 (u8 *)ctrblocks);</div><div class='add'>+</div><div class='add'>+			src += SERPENT_PARALLEL_BLOCKS;</div><div class='add'>+			dst += SERPENT_PARALLEL_BLOCKS;</div><div class='add'>+			nbytes -= bsize * SERPENT_PARALLEL_BLOCKS;</div><div class='add'>+		} while (nbytes &gt;= bsize * SERPENT_PARALLEL_BLOCKS);</div><div class='add'>+</div><div class='add'>+		if (nbytes &lt; bsize)</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Handle leftovers */</div><div class='add'>+	do {</div><div class='add'>+		if (dst != src)</div><div class='add'>+			*dst = *src;</div><div class='add'>+</div><div class='add'>+		u128_to_be128(&amp;ctrblocks[0], &amp;ctrblk);</div><div class='add'>+		u128_inc(&amp;ctrblk);</div><div class='add'>+</div><div class='add'>+		__serpent_encrypt(ctx, (u8 *)ctrblocks, (u8 *)ctrblocks);</div><div class='add'>+		u128_xor(dst, dst, (u128 *)ctrblocks);</div><div class='add'>+</div><div class='add'>+		src += 1;</div><div class='add'>+		dst += 1;</div><div class='add'>+		nbytes -= bsize;</div><div class='add'>+	} while (nbytes &gt;= bsize);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	u128_to_be128((be128 *)walk-&gt;iv, &amp;ctrblk);</div><div class='add'>+	return nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='add'>+		     struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	bool fpu_enabled = false;</div><div class='add'>+	struct blkcipher_walk walk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	blkcipher_walk_init(&amp;walk, dst, src, nbytes);</div><div class='add'>+	err = blkcipher_walk_virt_block(desc, &amp;walk, SERPENT_BLOCK_SIZE);</div><div class='add'>+	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='add'>+</div><div class='add'>+	while ((nbytes = walk.nbytes) &gt;= SERPENT_BLOCK_SIZE) {</div><div class='add'>+		fpu_enabled = serpent_fpu_begin(fpu_enabled, nbytes);</div><div class='add'>+		nbytes = __ctr_crypt(desc, &amp;walk);</div><div class='add'>+		err = blkcipher_walk_done(desc, &amp;walk, nbytes);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	serpent_fpu_end(fpu_enabled);</div><div class='add'>+</div><div class='add'>+	if (walk.nbytes) {</div><div class='add'>+		ctr_crypt_final(desc, &amp;walk);</div><div class='add'>+		err = blkcipher_walk_done(desc, &amp;walk, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg blk_ctr_alg = {</div><div class='add'>+	.cra_name		= "__ctr-serpent-sse2",</div><div class='add'>+	.cra_driver_name	= "__driver-ctr-serpent-sse2",</div><div class='add'>+	.cra_priority		= 0,</div><div class='add'>+	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER,</div><div class='add'>+	.cra_blocksize		= 1,</div><div class='add'>+	.cra_ctxsize		= sizeof(struct serpent_ctx),</div><div class='add'>+	.cra_alignmask		= 0,</div><div class='add'>+	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='add'>+	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_list		= LIST_HEAD_INIT(blk_ctr_alg.cra_list),</div><div class='add'>+	.cra_u = {</div><div class='add'>+		.blkcipher = {</div><div class='add'>+			.min_keysize	= SERPENT_MIN_KEY_SIZE,</div><div class='add'>+			.max_keysize	= SERPENT_MAX_KEY_SIZE,</div><div class='add'>+			.ivsize		= SERPENT_BLOCK_SIZE,</div><div class='add'>+			.setkey		= serpent_setkey,</div><div class='add'>+			.encrypt	= ctr_crypt,</div><div class='add'>+			.decrypt	= ctr_crypt,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct crypt_priv {</div><div class='add'>+	struct serpent_ctx *ctx;</div><div class='add'>+	bool fpu_enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void encrypt_callback(void *priv, u8 *srcdst, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	const unsigned int bsize = SERPENT_BLOCK_SIZE;</div><div class='add'>+	struct crypt_priv *ctx = priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;fpu_enabled = serpent_fpu_begin(ctx-&gt;fpu_enabled, nbytes);</div><div class='add'>+</div><div class='add'>+	if (nbytes == bsize * SERPENT_PARALLEL_BLOCKS) {</div><div class='add'>+		serpent_enc_blk_xway(ctx-&gt;ctx, srcdst, srcdst);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nbytes / bsize; i++, srcdst += bsize)</div><div class='add'>+		__serpent_encrypt(ctx-&gt;ctx, srcdst, srcdst);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void decrypt_callback(void *priv, u8 *srcdst, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	const unsigned int bsize = SERPENT_BLOCK_SIZE;</div><div class='add'>+	struct crypt_priv *ctx = priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;fpu_enabled = serpent_fpu_begin(ctx-&gt;fpu_enabled, nbytes);</div><div class='add'>+</div><div class='add'>+	if (nbytes == bsize * SERPENT_PARALLEL_BLOCKS) {</div><div class='add'>+		serpent_dec_blk_xway(ctx-&gt;ctx, srcdst, srcdst);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nbytes / bsize; i++, srcdst += bsize)</div><div class='add'>+		__serpent_decrypt(ctx-&gt;ctx, srcdst, srcdst);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct serpent_lrw_ctx {</div><div class='add'>+	struct lrw_table_ctx lrw_table;</div><div class='add'>+	struct serpent_ctx serpent_ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int lrw_serpent_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+			      unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct serpent_lrw_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = __serpent_setkey(&amp;ctx-&gt;serpent_ctx, key, keylen -</div><div class='add'>+							SERPENT_BLOCK_SIZE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return lrw_init_table(&amp;ctx-&gt;lrw_table, key + keylen -</div><div class='add'>+						SERPENT_BLOCK_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lrw_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='add'>+		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct serpent_lrw_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	be128 buf[SERPENT_PARALLEL_BLOCKS];</div><div class='add'>+	struct crypt_priv crypt_ctx = {</div><div class='add'>+		.ctx = &amp;ctx-&gt;serpent_ctx,</div><div class='add'>+		.fpu_enabled = false,</div><div class='add'>+	};</div><div class='add'>+	struct lrw_crypt_req req = {</div><div class='add'>+		.tbuf = buf,</div><div class='add'>+		.tbuflen = sizeof(buf),</div><div class='add'>+</div><div class='add'>+		.table_ctx = &amp;ctx-&gt;lrw_table,</div><div class='add'>+		.crypt_ctx = &amp;crypt_ctx,</div><div class='add'>+		.crypt_fn = encrypt_callback,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='add'>+	ret = lrw_crypt(desc, dst, src, nbytes, &amp;req);</div><div class='add'>+	serpent_fpu_end(crypt_ctx.fpu_enabled);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lrw_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='add'>+		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct serpent_lrw_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	be128 buf[SERPENT_PARALLEL_BLOCKS];</div><div class='add'>+	struct crypt_priv crypt_ctx = {</div><div class='add'>+		.ctx = &amp;ctx-&gt;serpent_ctx,</div><div class='add'>+		.fpu_enabled = false,</div><div class='add'>+	};</div><div class='add'>+	struct lrw_crypt_req req = {</div><div class='add'>+		.tbuf = buf,</div><div class='add'>+		.tbuflen = sizeof(buf),</div><div class='add'>+</div><div class='add'>+		.table_ctx = &amp;ctx-&gt;lrw_table,</div><div class='add'>+		.crypt_ctx = &amp;crypt_ctx,</div><div class='add'>+		.crypt_fn = decrypt_callback,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='add'>+	ret = lrw_crypt(desc, dst, src, nbytes, &amp;req);</div><div class='add'>+	serpent_fpu_end(crypt_ctx.fpu_enabled);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lrw_exit_tfm(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct serpent_lrw_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	lrw_free_table(&amp;ctx-&gt;lrw_table);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg blk_lrw_alg = {</div><div class='add'>+	.cra_name		= "__lrw-serpent-sse2",</div><div class='add'>+	.cra_driver_name	= "__driver-lrw-serpent-sse2",</div><div class='add'>+	.cra_priority		= 0,</div><div class='add'>+	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER,</div><div class='add'>+	.cra_blocksize		= SERPENT_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize		= sizeof(struct serpent_lrw_ctx),</div><div class='add'>+	.cra_alignmask		= 0,</div><div class='add'>+	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='add'>+	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_list		= LIST_HEAD_INIT(blk_lrw_alg.cra_list),</div><div class='add'>+	.cra_exit		= lrw_exit_tfm,</div><div class='add'>+	.cra_u = {</div><div class='add'>+		.blkcipher = {</div><div class='add'>+			.min_keysize	= SERPENT_MIN_KEY_SIZE +</div><div class='add'>+					  SERPENT_BLOCK_SIZE,</div><div class='add'>+			.max_keysize	= SERPENT_MAX_KEY_SIZE +</div><div class='add'>+					  SERPENT_BLOCK_SIZE,</div><div class='add'>+			.ivsize		= SERPENT_BLOCK_SIZE,</div><div class='add'>+			.setkey		= lrw_serpent_setkey,</div><div class='add'>+			.encrypt	= lrw_encrypt,</div><div class='add'>+			.decrypt	= lrw_decrypt,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct serpent_xts_ctx {</div><div class='add'>+	struct serpent_ctx tweak_ctx;</div><div class='add'>+	struct serpent_ctx crypt_ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int xts_serpent_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+			      unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct serpent_xts_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	u32 *flags = &amp;tfm-&gt;crt_flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* key consists of keys of equal size concatenated, therefore</div><div class='add'>+	 * the length must be even</div><div class='add'>+	 */</div><div class='add'>+	if (keylen % 2) {</div><div class='add'>+		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* first half of xts-key is for crypt */</div><div class='add'>+	err = __serpent_setkey(&amp;ctx-&gt;crypt_ctx, key, keylen / 2);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* second half of xts-key is for tweak */</div><div class='add'>+	return __serpent_setkey(&amp;ctx-&gt;tweak_ctx, key + keylen / 2, keylen / 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xts_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='add'>+		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct serpent_xts_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	be128 buf[SERPENT_PARALLEL_BLOCKS];</div><div class='add'>+	struct crypt_priv crypt_ctx = {</div><div class='add'>+		.ctx = &amp;ctx-&gt;crypt_ctx,</div><div class='add'>+		.fpu_enabled = false,</div><div class='add'>+	};</div><div class='add'>+	struct xts_crypt_req req = {</div><div class='add'>+		.tbuf = buf,</div><div class='add'>+		.tbuflen = sizeof(buf),</div><div class='add'>+</div><div class='add'>+		.tweak_ctx = &amp;ctx-&gt;tweak_ctx,</div><div class='add'>+		.tweak_fn = XTS_TWEAK_CAST(__serpent_encrypt),</div><div class='add'>+		.crypt_ctx = &amp;crypt_ctx,</div><div class='add'>+		.crypt_fn = encrypt_callback,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='add'>+	ret = xts_crypt(desc, dst, src, nbytes, &amp;req);</div><div class='add'>+	serpent_fpu_end(crypt_ctx.fpu_enabled);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xts_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='add'>+		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct serpent_xts_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	be128 buf[SERPENT_PARALLEL_BLOCKS];</div><div class='add'>+	struct crypt_priv crypt_ctx = {</div><div class='add'>+		.ctx = &amp;ctx-&gt;crypt_ctx,</div><div class='add'>+		.fpu_enabled = false,</div><div class='add'>+	};</div><div class='add'>+	struct xts_crypt_req req = {</div><div class='add'>+		.tbuf = buf,</div><div class='add'>+		.tbuflen = sizeof(buf),</div><div class='add'>+</div><div class='add'>+		.tweak_ctx = &amp;ctx-&gt;tweak_ctx,</div><div class='add'>+		.tweak_fn = XTS_TWEAK_CAST(__serpent_encrypt),</div><div class='add'>+		.crypt_ctx = &amp;crypt_ctx,</div><div class='add'>+		.crypt_fn = decrypt_callback,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	desc-&gt;flags &amp;= ~CRYPTO_TFM_REQ_MAY_SLEEP;</div><div class='add'>+	ret = xts_crypt(desc, dst, src, nbytes, &amp;req);</div><div class='add'>+	serpent_fpu_end(crypt_ctx.fpu_enabled);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg blk_xts_alg = {</div><div class='add'>+	.cra_name		= "__xts-serpent-sse2",</div><div class='add'>+	.cra_driver_name	= "__driver-xts-serpent-sse2",</div><div class='add'>+	.cra_priority		= 0,</div><div class='add'>+	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER,</div><div class='add'>+	.cra_blocksize		= SERPENT_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize		= sizeof(struct serpent_xts_ctx),</div><div class='add'>+	.cra_alignmask		= 0,</div><div class='add'>+	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='add'>+	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_list		= LIST_HEAD_INIT(blk_xts_alg.cra_list),</div><div class='add'>+	.cra_u = {</div><div class='add'>+		.blkcipher = {</div><div class='add'>+			.min_keysize	= SERPENT_MIN_KEY_SIZE * 2,</div><div class='add'>+			.max_keysize	= SERPENT_MAX_KEY_SIZE * 2,</div><div class='add'>+			.ivsize		= SERPENT_BLOCK_SIZE,</div><div class='add'>+			.setkey		= xts_serpent_setkey,</div><div class='add'>+			.encrypt	= xts_encrypt,</div><div class='add'>+			.decrypt	= xts_decrypt,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ablk_set_key(struct crypto_ablkcipher *tfm, const u8 *key,</div><div class='add'>+			unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	struct async_serpent_ctx *ctx = crypto_ablkcipher_ctx(tfm);</div><div class='add'>+	struct crypto_ablkcipher *child = &amp;ctx-&gt;cryptd_tfm-&gt;base;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	crypto_ablkcipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	crypto_ablkcipher_set_flags(child, crypto_ablkcipher_get_flags(tfm)</div><div class='add'>+				    &amp; CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	err = crypto_ablkcipher_setkey(child, key, key_len);</div><div class='add'>+	crypto_ablkcipher_set_flags(tfm, crypto_ablkcipher_get_flags(child)</div><div class='add'>+				    &amp; CRYPTO_TFM_RES_MASK);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __ablk_encrypt(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req);</div><div class='add'>+	struct async_serpent_ctx *ctx = crypto_ablkcipher_ctx(tfm);</div><div class='add'>+	struct blkcipher_desc desc;</div><div class='add'>+</div><div class='add'>+	desc.tfm = cryptd_ablkcipher_child(ctx-&gt;cryptd_tfm);</div><div class='add'>+	desc.info = req-&gt;info;</div><div class='add'>+	desc.flags = 0;</div><div class='add'>+</div><div class='add'>+	return crypto_blkcipher_crt(desc.tfm)-&gt;encrypt(</div><div class='add'>+		&amp;desc, req-&gt;dst, req-&gt;src, req-&gt;nbytes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ablk_encrypt(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req);</div><div class='add'>+	struct async_serpent_ctx *ctx = crypto_ablkcipher_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	if (!irq_fpu_usable()) {</div><div class='add'>+		struct ablkcipher_request *cryptd_req =</div><div class='add'>+			ablkcipher_request_ctx(req);</div><div class='add'>+</div><div class='add'>+		memcpy(cryptd_req, req, sizeof(*req));</div><div class='add'>+		ablkcipher_request_set_tfm(cryptd_req, &amp;ctx-&gt;cryptd_tfm-&gt;base);</div><div class='add'>+</div><div class='add'>+		return crypto_ablkcipher_encrypt(cryptd_req);</div><div class='add'>+	} else {</div><div class='add'>+		return __ablk_encrypt(req);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ablk_decrypt(struct ablkcipher_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req);</div><div class='add'>+	struct async_serpent_ctx *ctx = crypto_ablkcipher_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	if (!irq_fpu_usable()) {</div><div class='add'>+		struct ablkcipher_request *cryptd_req =</div><div class='add'>+			ablkcipher_request_ctx(req);</div><div class='add'>+</div><div class='add'>+		memcpy(cryptd_req, req, sizeof(*req));</div><div class='add'>+		ablkcipher_request_set_tfm(cryptd_req, &amp;ctx-&gt;cryptd_tfm-&gt;base);</div><div class='add'>+</div><div class='add'>+		return crypto_ablkcipher_decrypt(cryptd_req);</div><div class='add'>+	} else {</div><div class='add'>+		struct blkcipher_desc desc;</div><div class='add'>+</div><div class='add'>+		desc.tfm = cryptd_ablkcipher_child(ctx-&gt;cryptd_tfm);</div><div class='add'>+		desc.info = req-&gt;info;</div><div class='add'>+		desc.flags = 0;</div><div class='add'>+</div><div class='add'>+		return crypto_blkcipher_crt(desc.tfm)-&gt;decrypt(</div><div class='add'>+			&amp;desc, req-&gt;dst, req-&gt;src, req-&gt;nbytes);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ablk_exit(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct async_serpent_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	cryptd_free_ablkcipher(ctx-&gt;cryptd_tfm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ablk_init_common(struct crypto_tfm *tfm,</div><div class='add'>+			     struct cryptd_ablkcipher *cryptd_tfm)</div><div class='add'>+{</div><div class='add'>+	struct async_serpent_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;cryptd_tfm = cryptd_tfm;</div><div class='add'>+	tfm-&gt;crt_ablkcipher.reqsize = sizeof(struct ablkcipher_request) +</div><div class='add'>+		crypto_ablkcipher_reqsize(&amp;cryptd_tfm-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ablk_ecb_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct cryptd_ablkcipher *cryptd_tfm;</div><div class='add'>+</div><div class='add'>+	cryptd_tfm = cryptd_alloc_ablkcipher("__driver-ecb-serpent-sse2", 0, 0);</div><div class='add'>+	if (IS_ERR(cryptd_tfm))</div><div class='add'>+		return PTR_ERR(cryptd_tfm);</div><div class='add'>+	ablk_init_common(tfm, cryptd_tfm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg ablk_ecb_alg = {</div><div class='add'>+	.cra_name		= "ecb(serpent)",</div><div class='add'>+	.cra_driver_name	= "ecb-serpent-sse2",</div><div class='add'>+	.cra_priority		= 400,</div><div class='add'>+	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='add'>+	.cra_blocksize		= SERPENT_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize		= sizeof(struct async_serpent_ctx),</div><div class='add'>+	.cra_alignmask		= 0,</div><div class='add'>+	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='add'>+	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_list		= LIST_HEAD_INIT(ablk_ecb_alg.cra_list),</div><div class='add'>+	.cra_init		= ablk_ecb_init,</div><div class='add'>+	.cra_exit		= ablk_exit,</div><div class='add'>+	.cra_u = {</div><div class='add'>+		.ablkcipher = {</div><div class='add'>+			.min_keysize	= SERPENT_MIN_KEY_SIZE,</div><div class='add'>+			.max_keysize	= SERPENT_MAX_KEY_SIZE,</div><div class='add'>+			.setkey		= ablk_set_key,</div><div class='add'>+			.encrypt	= ablk_encrypt,</div><div class='add'>+			.decrypt	= ablk_decrypt,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ablk_cbc_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct cryptd_ablkcipher *cryptd_tfm;</div><div class='add'>+</div><div class='add'>+	cryptd_tfm = cryptd_alloc_ablkcipher("__driver-cbc-serpent-sse2", 0, 0);</div><div class='add'>+	if (IS_ERR(cryptd_tfm))</div><div class='add'>+		return PTR_ERR(cryptd_tfm);</div><div class='add'>+	ablk_init_common(tfm, cryptd_tfm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg ablk_cbc_alg = {</div><div class='add'>+	.cra_name		= "cbc(serpent)",</div><div class='add'>+	.cra_driver_name	= "cbc-serpent-sse2",</div><div class='add'>+	.cra_priority		= 400,</div><div class='add'>+	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='add'>+	.cra_blocksize		= SERPENT_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize		= sizeof(struct async_serpent_ctx),</div><div class='add'>+	.cra_alignmask		= 0,</div><div class='add'>+	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='add'>+	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_list		= LIST_HEAD_INIT(ablk_cbc_alg.cra_list),</div><div class='add'>+	.cra_init		= ablk_cbc_init,</div><div class='add'>+	.cra_exit		= ablk_exit,</div><div class='add'>+	.cra_u = {</div><div class='add'>+		.ablkcipher = {</div><div class='add'>+			.min_keysize	= SERPENT_MIN_KEY_SIZE,</div><div class='add'>+			.max_keysize	= SERPENT_MAX_KEY_SIZE,</div><div class='add'>+			.ivsize		= SERPENT_BLOCK_SIZE,</div><div class='add'>+			.setkey		= ablk_set_key,</div><div class='add'>+			.encrypt	= __ablk_encrypt,</div><div class='add'>+			.decrypt	= ablk_decrypt,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ablk_ctr_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct cryptd_ablkcipher *cryptd_tfm;</div><div class='add'>+</div><div class='add'>+	cryptd_tfm = cryptd_alloc_ablkcipher("__driver-ctr-serpent-sse2", 0, 0);</div><div class='add'>+	if (IS_ERR(cryptd_tfm))</div><div class='add'>+		return PTR_ERR(cryptd_tfm);</div><div class='add'>+	ablk_init_common(tfm, cryptd_tfm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg ablk_ctr_alg = {</div><div class='add'>+	.cra_name		= "ctr(serpent)",</div><div class='add'>+	.cra_driver_name	= "ctr-serpent-sse2",</div><div class='add'>+	.cra_priority		= 400,</div><div class='add'>+	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='add'>+	.cra_blocksize		= 1,</div><div class='add'>+	.cra_ctxsize		= sizeof(struct async_serpent_ctx),</div><div class='add'>+	.cra_alignmask		= 0,</div><div class='add'>+	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='add'>+	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_list		= LIST_HEAD_INIT(ablk_ctr_alg.cra_list),</div><div class='add'>+	.cra_init		= ablk_ctr_init,</div><div class='add'>+	.cra_exit		= ablk_exit,</div><div class='add'>+	.cra_u = {</div><div class='add'>+		.ablkcipher = {</div><div class='add'>+			.min_keysize	= SERPENT_MIN_KEY_SIZE,</div><div class='add'>+			.max_keysize	= SERPENT_MAX_KEY_SIZE,</div><div class='add'>+			.ivsize		= SERPENT_BLOCK_SIZE,</div><div class='add'>+			.setkey		= ablk_set_key,</div><div class='add'>+			.encrypt	= ablk_encrypt,</div><div class='add'>+			.decrypt	= ablk_encrypt,</div><div class='add'>+			.geniv		= "chainiv",</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ablk_lrw_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct cryptd_ablkcipher *cryptd_tfm;</div><div class='add'>+</div><div class='add'>+	cryptd_tfm = cryptd_alloc_ablkcipher("__driver-lrw-serpent-sse2", 0, 0);</div><div class='add'>+	if (IS_ERR(cryptd_tfm))</div><div class='add'>+		return PTR_ERR(cryptd_tfm);</div><div class='add'>+	ablk_init_common(tfm, cryptd_tfm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg ablk_lrw_alg = {</div><div class='add'>+	.cra_name		= "lrw(serpent)",</div><div class='add'>+	.cra_driver_name	= "lrw-serpent-sse2",</div><div class='add'>+	.cra_priority		= 400,</div><div class='add'>+	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='add'>+	.cra_blocksize		= SERPENT_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize		= sizeof(struct async_serpent_ctx),</div><div class='add'>+	.cra_alignmask		= 0,</div><div class='add'>+	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='add'>+	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_list		= LIST_HEAD_INIT(ablk_lrw_alg.cra_list),</div><div class='add'>+	.cra_init		= ablk_lrw_init,</div><div class='add'>+	.cra_exit		= ablk_exit,</div><div class='add'>+	.cra_u = {</div><div class='add'>+		.ablkcipher = {</div><div class='add'>+			.min_keysize	= SERPENT_MIN_KEY_SIZE +</div><div class='add'>+					  SERPENT_BLOCK_SIZE,</div><div class='add'>+			.max_keysize	= SERPENT_MAX_KEY_SIZE +</div><div class='add'>+					  SERPENT_BLOCK_SIZE,</div><div class='add'>+			.ivsize		= SERPENT_BLOCK_SIZE,</div><div class='add'>+			.setkey		= ablk_set_key,</div><div class='add'>+			.encrypt	= ablk_encrypt,</div><div class='add'>+			.decrypt	= ablk_decrypt,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ablk_xts_init(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct cryptd_ablkcipher *cryptd_tfm;</div><div class='add'>+</div><div class='add'>+	cryptd_tfm = cryptd_alloc_ablkcipher("__driver-xts-serpent-sse2", 0, 0);</div><div class='add'>+	if (IS_ERR(cryptd_tfm))</div><div class='add'>+		return PTR_ERR(cryptd_tfm);</div><div class='add'>+	ablk_init_common(tfm, cryptd_tfm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg ablk_xts_alg = {</div><div class='add'>+	.cra_name		= "xts(serpent)",</div><div class='add'>+	.cra_driver_name	= "xts-serpent-sse2",</div><div class='add'>+	.cra_priority		= 400,</div><div class='add'>+	.cra_flags		= CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,</div><div class='add'>+	.cra_blocksize		= SERPENT_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize		= sizeof(struct async_serpent_ctx),</div><div class='add'>+	.cra_alignmask		= 0,</div><div class='add'>+	.cra_type		= &amp;crypto_ablkcipher_type,</div><div class='add'>+	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_list		= LIST_HEAD_INIT(ablk_xts_alg.cra_list),</div><div class='add'>+	.cra_init		= ablk_xts_init,</div><div class='add'>+	.cra_exit		= ablk_exit,</div><div class='add'>+	.cra_u = {</div><div class='add'>+		.ablkcipher = {</div><div class='add'>+			.min_keysize	= SERPENT_MIN_KEY_SIZE * 2,</div><div class='add'>+			.max_keysize	= SERPENT_MAX_KEY_SIZE * 2,</div><div class='add'>+			.ivsize		= SERPENT_BLOCK_SIZE,</div><div class='add'>+			.setkey		= ablk_set_key,</div><div class='add'>+			.encrypt	= ablk_encrypt,</div><div class='add'>+			.decrypt	= ablk_decrypt,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init serpent_sse2_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!cpu_has_xmm2) {</div><div class='add'>+		printk(KERN_INFO "SSE2 instructions are not detected.\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = crypto_register_alg(&amp;blk_ecb_alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto blk_ecb_err;</div><div class='add'>+	err = crypto_register_alg(&amp;blk_cbc_alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto blk_cbc_err;</div><div class='add'>+	err = crypto_register_alg(&amp;blk_ctr_alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto blk_ctr_err;</div><div class='add'>+	err = crypto_register_alg(&amp;ablk_ecb_alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ablk_ecb_err;</div><div class='add'>+	err = crypto_register_alg(&amp;ablk_cbc_alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ablk_cbc_err;</div><div class='add'>+	err = crypto_register_alg(&amp;ablk_ctr_alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ablk_ctr_err;</div><div class='add'>+	err = crypto_register_alg(&amp;blk_lrw_alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto blk_lrw_err;</div><div class='add'>+	err = crypto_register_alg(&amp;ablk_lrw_alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ablk_lrw_err;</div><div class='add'>+	err = crypto_register_alg(&amp;blk_xts_alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto blk_xts_err;</div><div class='add'>+	err = crypto_register_alg(&amp;ablk_xts_alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ablk_xts_err;</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+	crypto_unregister_alg(&amp;ablk_xts_alg);</div><div class='add'>+ablk_xts_err:</div><div class='add'>+	crypto_unregister_alg(&amp;blk_xts_alg);</div><div class='add'>+blk_xts_err:</div><div class='add'>+	crypto_unregister_alg(&amp;ablk_lrw_alg);</div><div class='add'>+ablk_lrw_err:</div><div class='add'>+	crypto_unregister_alg(&amp;blk_lrw_alg);</div><div class='add'>+blk_lrw_err:</div><div class='add'>+	crypto_unregister_alg(&amp;ablk_ctr_alg);</div><div class='add'>+ablk_ctr_err:</div><div class='add'>+	crypto_unregister_alg(&amp;ablk_cbc_alg);</div><div class='add'>+ablk_cbc_err:</div><div class='add'>+	crypto_unregister_alg(&amp;ablk_ecb_alg);</div><div class='add'>+ablk_ecb_err:</div><div class='add'>+	crypto_unregister_alg(&amp;blk_ctr_alg);</div><div class='add'>+blk_ctr_err:</div><div class='add'>+	crypto_unregister_alg(&amp;blk_cbc_alg);</div><div class='add'>+blk_cbc_err:</div><div class='add'>+	crypto_unregister_alg(&amp;blk_ecb_alg);</div><div class='add'>+blk_ecb_err:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit serpent_sse2_exit(void)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_alg(&amp;ablk_xts_alg);</div><div class='add'>+	crypto_unregister_alg(&amp;blk_xts_alg);</div><div class='add'>+	crypto_unregister_alg(&amp;ablk_lrw_alg);</div><div class='add'>+	crypto_unregister_alg(&amp;blk_lrw_alg);</div><div class='add'>+	crypto_unregister_alg(&amp;ablk_ctr_alg);</div><div class='add'>+	crypto_unregister_alg(&amp;ablk_cbc_alg);</div><div class='add'>+	crypto_unregister_alg(&amp;ablk_ecb_alg);</div><div class='add'>+	crypto_unregister_alg(&amp;blk_ctr_alg);</div><div class='add'>+	crypto_unregister_alg(&amp;blk_cbc_alg);</div><div class='add'>+	crypto_unregister_alg(&amp;blk_ecb_alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(serpent_sse2_init);</div><div class='add'>+module_exit(serpent_sse2_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Serpent Cipher Algorithm, SSE2 optimized");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("serpent");</div><div class='head'>diff --git a/arch/x86/crypto/twofish_glue_3way.c b/arch/x86/crypto/twofish_glue_3way.c<br/>index 5ede9c444c3e..7fee8c152f93 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/crypto/twofish_glue_3way.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/crypto/twofish_glue_3way.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/crypto/twofish_glue_3way.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/crypto/twofish_glue_3way.c</a></div><div class='hunk'>@@ -32,6 +32,8 @@</div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;crypto/twofish.h&gt;</div><div class='ctx'> #include &lt;crypto/b128ops.h&gt;</div><div class='add'>+#include &lt;crypto/lrw.h&gt;</div><div class='add'>+#include &lt;crypto/xts.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* regular block cipher functions from twofish_x86_64 module */</div><div class='ctx'> asmlinkage void twofish_enc_blk(struct twofish_ctx *ctx, u8 *dst,</div><div class='hunk'>@@ -432,6 +434,209 @@ static struct crypto_alg blk_ctr_alg = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void encrypt_callback(void *priv, u8 *srcdst, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	const unsigned int bsize = TF_BLOCK_SIZE;</div><div class='add'>+	struct twofish_ctx *ctx = priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (nbytes == 3 * bsize) {</div><div class='add'>+		twofish_enc_blk_3way(ctx, srcdst, srcdst);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nbytes / bsize; i++, srcdst += bsize)</div><div class='add'>+		twofish_enc_blk(ctx, srcdst, srcdst);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void decrypt_callback(void *priv, u8 *srcdst, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	const unsigned int bsize = TF_BLOCK_SIZE;</div><div class='add'>+	struct twofish_ctx *ctx = priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (nbytes == 3 * bsize) {</div><div class='add'>+		twofish_dec_blk_3way(ctx, srcdst, srcdst);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nbytes / bsize; i++, srcdst += bsize)</div><div class='add'>+		twofish_dec_blk(ctx, srcdst, srcdst);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct twofish_lrw_ctx {</div><div class='add'>+	struct lrw_table_ctx lrw_table;</div><div class='add'>+	struct twofish_ctx twofish_ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int lrw_twofish_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+			      unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct twofish_lrw_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = __twofish_setkey(&amp;ctx-&gt;twofish_ctx, key, keylen - TF_BLOCK_SIZE,</div><div class='add'>+			       &amp;tfm-&gt;crt_flags);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return lrw_init_table(&amp;ctx-&gt;lrw_table, key + keylen - TF_BLOCK_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lrw_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='add'>+		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct twofish_lrw_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	be128 buf[3];</div><div class='add'>+	struct lrw_crypt_req req = {</div><div class='add'>+		.tbuf = buf,</div><div class='add'>+		.tbuflen = sizeof(buf),</div><div class='add'>+</div><div class='add'>+		.table_ctx = &amp;ctx-&gt;lrw_table,</div><div class='add'>+		.crypt_ctx = &amp;ctx-&gt;twofish_ctx,</div><div class='add'>+		.crypt_fn = encrypt_callback,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return lrw_crypt(desc, dst, src, nbytes, &amp;req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lrw_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='add'>+		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct twofish_lrw_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	be128 buf[3];</div><div class='add'>+	struct lrw_crypt_req req = {</div><div class='add'>+		.tbuf = buf,</div><div class='add'>+		.tbuflen = sizeof(buf),</div><div class='add'>+</div><div class='add'>+		.table_ctx = &amp;ctx-&gt;lrw_table,</div><div class='add'>+		.crypt_ctx = &amp;ctx-&gt;twofish_ctx,</div><div class='add'>+		.crypt_fn = decrypt_callback,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return lrw_crypt(desc, dst, src, nbytes, &amp;req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lrw_exit_tfm(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	struct twofish_lrw_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	lrw_free_table(&amp;ctx-&gt;lrw_table);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg blk_lrw_alg = {</div><div class='add'>+	.cra_name		= "lrw(twofish)",</div><div class='add'>+	.cra_driver_name	= "lrw-twofish-3way",</div><div class='add'>+	.cra_priority		= 300,</div><div class='add'>+	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER,</div><div class='add'>+	.cra_blocksize		= TF_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize		= sizeof(struct twofish_lrw_ctx),</div><div class='add'>+	.cra_alignmask		= 0,</div><div class='add'>+	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='add'>+	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_list		= LIST_HEAD_INIT(blk_lrw_alg.cra_list),</div><div class='add'>+	.cra_exit		= lrw_exit_tfm,</div><div class='add'>+	.cra_u = {</div><div class='add'>+		.blkcipher = {</div><div class='add'>+			.min_keysize	= TF_MIN_KEY_SIZE + TF_BLOCK_SIZE,</div><div class='add'>+			.max_keysize	= TF_MAX_KEY_SIZE + TF_BLOCK_SIZE,</div><div class='add'>+			.ivsize		= TF_BLOCK_SIZE,</div><div class='add'>+			.setkey		= lrw_twofish_setkey,</div><div class='add'>+			.encrypt	= lrw_encrypt,</div><div class='add'>+			.decrypt	= lrw_decrypt,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct twofish_xts_ctx {</div><div class='add'>+	struct twofish_ctx tweak_ctx;</div><div class='add'>+	struct twofish_ctx crypt_ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int xts_twofish_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+			      unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct twofish_xts_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	u32 *flags = &amp;tfm-&gt;crt_flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* key consists of keys of equal size concatenated, therefore</div><div class='add'>+	 * the length must be even</div><div class='add'>+	 */</div><div class='add'>+	if (keylen % 2) {</div><div class='add'>+		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* first half of xts-key is for crypt */</div><div class='add'>+	err = __twofish_setkey(&amp;ctx-&gt;crypt_ctx, key, keylen / 2, flags);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* second half of xts-key is for tweak */</div><div class='add'>+	return __twofish_setkey(&amp;ctx-&gt;tweak_ctx, key + keylen / 2, keylen / 2,</div><div class='add'>+				flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xts_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='add'>+		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct twofish_xts_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	be128 buf[3];</div><div class='add'>+	struct xts_crypt_req req = {</div><div class='add'>+		.tbuf = buf,</div><div class='add'>+		.tbuflen = sizeof(buf),</div><div class='add'>+</div><div class='add'>+		.tweak_ctx = &amp;ctx-&gt;tweak_ctx,</div><div class='add'>+		.tweak_fn = XTS_TWEAK_CAST(twofish_enc_blk),</div><div class='add'>+		.crypt_ctx = &amp;ctx-&gt;crypt_ctx,</div><div class='add'>+		.crypt_fn = encrypt_callback,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return xts_crypt(desc, dst, src, nbytes, &amp;req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xts_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='add'>+		       struct scatterlist *src, unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	struct twofish_xts_ctx *ctx = crypto_blkcipher_ctx(desc-&gt;tfm);</div><div class='add'>+	be128 buf[3];</div><div class='add'>+	struct xts_crypt_req req = {</div><div class='add'>+		.tbuf = buf,</div><div class='add'>+		.tbuflen = sizeof(buf),</div><div class='add'>+</div><div class='add'>+		.tweak_ctx = &amp;ctx-&gt;tweak_ctx,</div><div class='add'>+		.tweak_fn = XTS_TWEAK_CAST(twofish_enc_blk),</div><div class='add'>+		.crypt_ctx = &amp;ctx-&gt;crypt_ctx,</div><div class='add'>+		.crypt_fn = decrypt_callback,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return xts_crypt(desc, dst, src, nbytes, &amp;req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg blk_xts_alg = {</div><div class='add'>+	.cra_name		= "xts(twofish)",</div><div class='add'>+	.cra_driver_name	= "xts-twofish-3way",</div><div class='add'>+	.cra_priority		= 300,</div><div class='add'>+	.cra_flags		= CRYPTO_ALG_TYPE_BLKCIPHER,</div><div class='add'>+	.cra_blocksize		= TF_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize		= sizeof(struct twofish_xts_ctx),</div><div class='add'>+	.cra_alignmask		= 0,</div><div class='add'>+	.cra_type		= &amp;crypto_blkcipher_type,</div><div class='add'>+	.cra_module		= THIS_MODULE,</div><div class='add'>+	.cra_list		= LIST_HEAD_INIT(blk_xts_alg.cra_list),</div><div class='add'>+	.cra_u = {</div><div class='add'>+		.blkcipher = {</div><div class='add'>+			.min_keysize	= TF_MIN_KEY_SIZE * 2,</div><div class='add'>+			.max_keysize	= TF_MAX_KEY_SIZE * 2,</div><div class='add'>+			.ivsize		= TF_BLOCK_SIZE,</div><div class='add'>+			.setkey		= xts_twofish_setkey,</div><div class='add'>+			.encrypt	= xts_encrypt,</div><div class='add'>+			.decrypt	= xts_decrypt,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int __init init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -445,9 +650,20 @@ int __init init(void)</div><div class='ctx'> 	err = crypto_register_alg(&amp;blk_ctr_alg);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto ctr_err;</div><div class='add'>+	err = crypto_register_alg(&amp;blk_lrw_alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto blk_lrw_err;</div><div class='add'>+	err = crypto_register_alg(&amp;blk_xts_alg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto blk_xts_err;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+	crypto_unregister_alg(&amp;blk_xts_alg);</div><div class='add'>+blk_xts_err:</div><div class='add'>+	crypto_unregister_alg(&amp;blk_lrw_alg);</div><div class='add'>+blk_lrw_err:</div><div class='add'>+	crypto_unregister_alg(&amp;blk_ctr_alg);</div><div class='ctx'> ctr_err:</div><div class='ctx'> 	crypto_unregister_alg(&amp;blk_cbc_alg);</div><div class='ctx'> cbc_err:</div><div class='hunk'>@@ -458,6 +674,8 @@ ecb_err:</div><div class='ctx'> </div><div class='ctx'> void __exit fini(void)</div><div class='ctx'> {</div><div class='add'>+	crypto_unregister_alg(&amp;blk_xts_alg);</div><div class='add'>+	crypto_unregister_alg(&amp;blk_lrw_alg);</div><div class='ctx'> 	crypto_unregister_alg(&amp;blk_ctr_alg);</div><div class='ctx'> 	crypto_unregister_alg(&amp;blk_cbc_alg);</div><div class='ctx'> 	crypto_unregister_alg(&amp;blk_ecb_alg);</div><div class='head'>diff --git a/arch/x86/ia32/Makefile b/arch/x86/ia32/Makefile<br/>index 52d0ccfcf6ea..455646e0e532 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/ia32/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/ia32/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/ia32/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/ia32/Makefile</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o</div><div class='add'>+obj-$(CONFIG_IA32_EMULATION) += nosyscall.o syscall_ia32.o</div><div class='ctx'> </div><div class='ctx'> sysv-$(CONFIG_SYSVIPC) := ipc32.o</div><div class='ctx'> obj-$(CONFIG_IA32_EMULATION) += $(sysv-y)</div><div class='head'>diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S<br/>index 3e274564f6bf..e3e734005e19 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/ia32/ia32entry.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/ia32/ia32entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/ia32/ia32entry.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/ia32/ia32entry.S</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='ctx'> #include &lt;asm/irqflags.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Avoid __ASSEMBLER__'ifying &lt;linux/audit.h&gt; just for this.  */</div><div class='ctx'> #include &lt;linux/elf-em.h&gt;</div><div class='hunk'>@@ -27,8 +28,6 @@</div><div class='ctx'> </div><div class='ctx'> 	.section .entry.text, "ax"</div><div class='ctx'> </div><div class='del'>-#define IA32_NR_syscalls ((ia32_syscall_end - ia32_sys_call_table)/8)</div><div class='del'>-</div><div class='ctx'> 	.macro IA32_ARG_FIXUP noebp=0</div><div class='ctx'> 	movl	%edi,%r8d</div><div class='ctx'> 	.if \noebp</div><div class='hunk'>@@ -191,7 +190,7 @@ sysexit_from_sys_call:</div><div class='ctx'> 	movl %ebx,%edx			/* 3rd arg: 1st syscall arg */</div><div class='ctx'> 	movl %eax,%esi			/* 2nd arg: syscall number */</div><div class='ctx'> 	movl $AUDIT_ARCH_I386,%edi	/* 1st arg: audit arch */</div><div class='del'>-	call audit_syscall_entry</div><div class='add'>+	call __audit_syscall_entry</div><div class='ctx'> 	movl RAX-ARGOFFSET(%rsp),%eax	/* reload syscall number */</div><div class='ctx'> 	cmpq $(IA32_NR_syscalls-1),%rax</div><div class='ctx'> 	ja ia32_badsys</div><div class='hunk'>@@ -208,12 +207,13 @@ sysexit_from_sys_call:</div><div class='ctx'> 	TRACE_IRQS_ON</div><div class='ctx'> 	sti</div><div class='ctx'> 	movl %eax,%esi		/* second arg, syscall return value */</div><div class='del'>-	cmpl $0,%eax		/* is it &lt; 0? */</div><div class='del'>-	setl %al		/* 1 if so, 0 if not */</div><div class='add'>+	cmpl $-MAX_ERRNO,%eax	/* is it an error ? */</div><div class='add'>+	jbe 1f</div><div class='add'>+	movslq %eax, %rsi	/* if error sign extend to 64 bits */</div><div class='add'>+1:	setbe %al		/* 1 if error, 0 if not */</div><div class='ctx'> 	movzbl %al,%edi		/* zero-extend that into %edi */</div><div class='del'>-	inc %edi /* first arg, 0-&gt;1(AUDITSC_SUCCESS), 1-&gt;2(AUDITSC_FAILURE) */</div><div class='del'>-	call audit_syscall_exit</div><div class='del'>-	movl RAX-ARGOFFSET(%rsp),%eax	/* reload syscall return value */</div><div class='add'>+	call __audit_syscall_exit</div><div class='add'>+	movq RAX-ARGOFFSET(%rsp),%rax	/* reload syscall return value */</div><div class='ctx'> 	movl $(_TIF_ALLWORK_MASK &amp; ~_TIF_SYSCALL_AUDIT),%edi</div><div class='ctx'> 	cli</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='hunk'>@@ -447,9 +447,6 @@ ia32_badsys:</div><div class='ctx'> 	movq $-ENOSYS,%rax</div><div class='ctx'> 	jmp ia32_sysret</div><div class='ctx'> </div><div class='del'>-quiet_ni_syscall:</div><div class='del'>-	movq $-ENOSYS,%rax</div><div class='del'>-	ret</div><div class='ctx'> 	CFI_ENDPROC</div><div class='ctx'> 	</div><div class='ctx'> 	.macro PTREGSCALL label, func, arg</div><div class='hunk'>@@ -494,357 +491,3 @@ ia32_ptregs_common:</div><div class='ctx'> 	jmp  ia32_sysret	/* misbalances the return cache */</div><div class='ctx'> 	CFI_ENDPROC</div><div class='ctx'> END(ia32_ptregs_common)</div><div class='del'>-</div><div class='del'>-	.section .rodata,"a"</div><div class='del'>-	.align 8</div><div class='del'>-ia32_sys_call_table:</div><div class='del'>-	.quad sys_restart_syscall</div><div class='del'>-	.quad sys_exit</div><div class='del'>-	.quad stub32_fork</div><div class='del'>-	.quad sys_read</div><div class='del'>-	.quad sys_write</div><div class='del'>-	.quad compat_sys_open		/* 5 */</div><div class='del'>-	.quad sys_close</div><div class='del'>-	.quad sys32_waitpid</div><div class='del'>-	.quad sys_creat</div><div class='del'>-	.quad sys_link</div><div class='del'>-	.quad sys_unlink		/* 10 */</div><div class='del'>-	.quad stub32_execve</div><div class='del'>-	.quad sys_chdir</div><div class='del'>-	.quad compat_sys_time</div><div class='del'>-	.quad sys_mknod</div><div class='del'>-	.quad sys_chmod		/* 15 */</div><div class='del'>-	.quad sys_lchown16</div><div class='del'>-	.quad quiet_ni_syscall			/* old break syscall holder */</div><div class='del'>-	.quad sys_stat</div><div class='del'>-	.quad sys32_lseek</div><div class='del'>-	.quad sys_getpid		/* 20 */</div><div class='del'>-	.quad compat_sys_mount	/* mount  */</div><div class='del'>-	.quad sys_oldumount	/* old_umount  */</div><div class='del'>-	.quad sys_setuid16</div><div class='del'>-	.quad sys_getuid16</div><div class='del'>-	.quad compat_sys_stime	/* stime */		/* 25 */</div><div class='del'>-	.quad compat_sys_ptrace	/* ptrace */</div><div class='del'>-	.quad sys_alarm</div><div class='del'>-	.quad sys_fstat	/* (old)fstat */</div><div class='del'>-	.quad sys_pause</div><div class='del'>-	.quad compat_sys_utime	/* 30 */</div><div class='del'>-	.quad quiet_ni_syscall	/* old stty syscall holder */</div><div class='del'>-	.quad quiet_ni_syscall	/* old gtty syscall holder */</div><div class='del'>-	.quad sys_access</div><div class='del'>-	.quad sys_nice	</div><div class='del'>-	.quad quiet_ni_syscall	/* 35 */	/* old ftime syscall holder */</div><div class='del'>-	.quad sys_sync</div><div class='del'>-	.quad sys32_kill</div><div class='del'>-	.quad sys_rename</div><div class='del'>-	.quad sys_mkdir</div><div class='del'>-	.quad sys_rmdir		/* 40 */</div><div class='del'>-	.quad sys_dup</div><div class='del'>-	.quad sys_pipe</div><div class='del'>-	.quad compat_sys_times</div><div class='del'>-	.quad quiet_ni_syscall			/* old prof syscall holder */</div><div class='del'>-	.quad sys_brk		/* 45 */</div><div class='del'>-	.quad sys_setgid16</div><div class='del'>-	.quad sys_getgid16</div><div class='del'>-	.quad sys_signal</div><div class='del'>-	.quad sys_geteuid16</div><div class='del'>-	.quad sys_getegid16	/* 50 */</div><div class='del'>-	.quad sys_acct</div><div class='del'>-	.quad sys_umount			/* new_umount */</div><div class='del'>-	.quad quiet_ni_syscall			/* old lock syscall holder */</div><div class='del'>-	.quad compat_sys_ioctl</div><div class='del'>-	.quad compat_sys_fcntl64		/* 55 */</div><div class='del'>-	.quad quiet_ni_syscall			/* old mpx syscall holder */</div><div class='del'>-	.quad sys_setpgid</div><div class='del'>-	.quad quiet_ni_syscall			/* old ulimit syscall holder */</div><div class='del'>-	.quad sys_olduname</div><div class='del'>-	.quad sys_umask		/* 60 */</div><div class='del'>-	.quad sys_chroot</div><div class='del'>-	.quad compat_sys_ustat</div><div class='del'>-	.quad sys_dup2</div><div class='del'>-	.quad sys_getppid</div><div class='del'>-	.quad sys_getpgrp		/* 65 */</div><div class='del'>-	.quad sys_setsid</div><div class='del'>-	.quad sys32_sigaction</div><div class='del'>-	.quad sys_sgetmask</div><div class='del'>-	.quad sys_ssetmask</div><div class='del'>-	.quad sys_setreuid16	/* 70 */</div><div class='del'>-	.quad sys_setregid16</div><div class='del'>-	.quad sys32_sigsuspend</div><div class='del'>-	.quad compat_sys_sigpending</div><div class='del'>-	.quad sys_sethostname</div><div class='del'>-	.quad compat_sys_setrlimit	/* 75 */</div><div class='del'>-	.quad compat_sys_old_getrlimit	/* old_getrlimit */</div><div class='del'>-	.quad compat_sys_getrusage</div><div class='del'>-	.quad compat_sys_gettimeofday</div><div class='del'>-	.quad compat_sys_settimeofday</div><div class='del'>-	.quad sys_getgroups16	/* 80 */</div><div class='del'>-	.quad sys_setgroups16</div><div class='del'>-	.quad compat_sys_old_select</div><div class='del'>-	.quad sys_symlink</div><div class='del'>-	.quad sys_lstat</div><div class='del'>-	.quad sys_readlink		/* 85 */</div><div class='del'>-	.quad sys_uselib</div><div class='del'>-	.quad sys_swapon</div><div class='del'>-	.quad sys_reboot</div><div class='del'>-	.quad compat_sys_old_readdir</div><div class='del'>-	.quad sys32_mmap		/* 90 */</div><div class='del'>-	.quad sys_munmap</div><div class='del'>-	.quad sys_truncate</div><div class='del'>-	.quad sys_ftruncate</div><div class='del'>-	.quad sys_fchmod</div><div class='del'>-	.quad sys_fchown16		/* 95 */</div><div class='del'>-	.quad sys_getpriority</div><div class='del'>-	.quad sys_setpriority</div><div class='del'>-	.quad quiet_ni_syscall			/* old profil syscall holder */</div><div class='del'>-	.quad compat_sys_statfs</div><div class='del'>-	.quad compat_sys_fstatfs		/* 100 */</div><div class='del'>-	.quad sys_ioperm</div><div class='del'>-	.quad compat_sys_socketcall</div><div class='del'>-	.quad sys_syslog</div><div class='del'>-	.quad compat_sys_setitimer</div><div class='del'>-	.quad compat_sys_getitimer	/* 105 */</div><div class='del'>-	.quad compat_sys_newstat</div><div class='del'>-	.quad compat_sys_newlstat</div><div class='del'>-	.quad compat_sys_newfstat</div><div class='del'>-	.quad sys_uname</div><div class='del'>-	.quad stub32_iopl		/* 110 */</div><div class='del'>-	.quad sys_vhangup</div><div class='del'>-	.quad quiet_ni_syscall	/* old "idle" system call */</div><div class='del'>-	.quad sys32_vm86_warning	/* vm86old */ </div><div class='del'>-	.quad compat_sys_wait4</div><div class='del'>-	.quad sys_swapoff		/* 115 */</div><div class='del'>-	.quad compat_sys_sysinfo</div><div class='del'>-	.quad sys32_ipc</div><div class='del'>-	.quad sys_fsync</div><div class='del'>-	.quad stub32_sigreturn</div><div class='del'>-	.quad stub32_clone		/* 120 */</div><div class='del'>-	.quad sys_setdomainname</div><div class='del'>-	.quad sys_newuname</div><div class='del'>-	.quad sys_modify_ldt</div><div class='del'>-	.quad compat_sys_adjtimex</div><div class='del'>-	.quad sys32_mprotect		/* 125 */</div><div class='del'>-	.quad compat_sys_sigprocmask</div><div class='del'>-	.quad quiet_ni_syscall		/* create_module */</div><div class='del'>-	.quad sys_init_module</div><div class='del'>-	.quad sys_delete_module</div><div class='del'>-	.quad quiet_ni_syscall		/* 130  get_kernel_syms */</div><div class='del'>-	.quad sys32_quotactl</div><div class='del'>-	.quad sys_getpgid</div><div class='del'>-	.quad sys_fchdir</div><div class='del'>-	.quad quiet_ni_syscall	/* bdflush */</div><div class='del'>-	.quad sys_sysfs		/* 135 */</div><div class='del'>-	.quad sys_personality</div><div class='del'>-	.quad quiet_ni_syscall	/* for afs_syscall */</div><div class='del'>-	.quad sys_setfsuid16</div><div class='del'>-	.quad sys_setfsgid16</div><div class='del'>-	.quad sys_llseek		/* 140 */</div><div class='del'>-	.quad compat_sys_getdents</div><div class='del'>-	.quad compat_sys_select</div><div class='del'>-	.quad sys_flock</div><div class='del'>-	.quad sys_msync</div><div class='del'>-	.quad compat_sys_readv		/* 145 */</div><div class='del'>-	.quad compat_sys_writev</div><div class='del'>-	.quad sys_getsid</div><div class='del'>-	.quad sys_fdatasync</div><div class='del'>-	.quad compat_sys_sysctl	/* sysctl */</div><div class='del'>-	.quad sys_mlock		/* 150 */</div><div class='del'>-	.quad sys_munlock</div><div class='del'>-	.quad sys_mlockall</div><div class='del'>-	.quad sys_munlockall</div><div class='del'>-	.quad sys_sched_setparam</div><div class='del'>-	.quad sys_sched_getparam   /* 155 */</div><div class='del'>-	.quad sys_sched_setscheduler</div><div class='del'>-	.quad sys_sched_getscheduler</div><div class='del'>-	.quad sys_sched_yield</div><div class='del'>-	.quad sys_sched_get_priority_max</div><div class='del'>-	.quad sys_sched_get_priority_min  /* 160 */</div><div class='del'>-	.quad sys32_sched_rr_get_interval</div><div class='del'>-	.quad compat_sys_nanosleep</div><div class='del'>-	.quad sys_mremap</div><div class='del'>-	.quad sys_setresuid16</div><div class='del'>-	.quad sys_getresuid16	/* 165 */</div><div class='del'>-	.quad sys32_vm86_warning	/* vm86 */ </div><div class='del'>-	.quad quiet_ni_syscall	/* query_module */</div><div class='del'>-	.quad sys_poll</div><div class='del'>-	.quad quiet_ni_syscall /* old nfsservctl */</div><div class='del'>-	.quad sys_setresgid16	/* 170 */</div><div class='del'>-	.quad sys_getresgid16</div><div class='del'>-	.quad sys_prctl</div><div class='del'>-	.quad stub32_rt_sigreturn</div><div class='del'>-	.quad sys32_rt_sigaction</div><div class='del'>-	.quad sys32_rt_sigprocmask	/* 175 */</div><div class='del'>-	.quad sys32_rt_sigpending</div><div class='del'>-	.quad compat_sys_rt_sigtimedwait</div><div class='del'>-	.quad sys32_rt_sigqueueinfo</div><div class='del'>-	.quad sys_rt_sigsuspend</div><div class='del'>-	.quad sys32_pread		/* 180 */</div><div class='del'>-	.quad sys32_pwrite</div><div class='del'>-	.quad sys_chown16</div><div class='del'>-	.quad sys_getcwd</div><div class='del'>-	.quad sys_capget</div><div class='del'>-	.quad sys_capset</div><div class='del'>-	.quad stub32_sigaltstack</div><div class='del'>-	.quad sys32_sendfile</div><div class='del'>-	.quad quiet_ni_syscall		/* streams1 */</div><div class='del'>-	.quad quiet_ni_syscall		/* streams2 */</div><div class='del'>-	.quad stub32_vfork            /* 190 */</div><div class='del'>-	.quad compat_sys_getrlimit</div><div class='del'>-	.quad sys_mmap_pgoff</div><div class='del'>-	.quad sys32_truncate64</div><div class='del'>-	.quad sys32_ftruncate64</div><div class='del'>-	.quad sys32_stat64		/* 195 */</div><div class='del'>-	.quad sys32_lstat64</div><div class='del'>-	.quad sys32_fstat64</div><div class='del'>-	.quad sys_lchown</div><div class='del'>-	.quad sys_getuid</div><div class='del'>-	.quad sys_getgid		/* 200 */</div><div class='del'>-	.quad sys_geteuid</div><div class='del'>-	.quad sys_getegid</div><div class='del'>-	.quad sys_setreuid</div><div class='del'>-	.quad sys_setregid</div><div class='del'>-	.quad sys_getgroups	/* 205 */</div><div class='del'>-	.quad sys_setgroups</div><div class='del'>-	.quad sys_fchown</div><div class='del'>-	.quad sys_setresuid</div><div class='del'>-	.quad sys_getresuid</div><div class='del'>-	.quad sys_setresgid	/* 210 */</div><div class='del'>-	.quad sys_getresgid</div><div class='del'>-	.quad sys_chown</div><div class='del'>-	.quad sys_setuid</div><div class='del'>-	.quad sys_setgid</div><div class='del'>-	.quad sys_setfsuid		/* 215 */</div><div class='del'>-	.quad sys_setfsgid</div><div class='del'>-	.quad sys_pivot_root</div><div class='del'>-	.quad sys_mincore</div><div class='del'>-	.quad sys_madvise</div><div class='del'>-	.quad compat_sys_getdents64	/* 220 getdents64 */</div><div class='del'>-	.quad compat_sys_fcntl64	</div><div class='del'>-	.quad quiet_ni_syscall		/* tux */</div><div class='del'>-	.quad quiet_ni_syscall    	/* security */</div><div class='del'>-	.quad sys_gettid	</div><div class='del'>-	.quad sys32_readahead	/* 225 */</div><div class='del'>-	.quad sys_setxattr</div><div class='del'>-	.quad sys_lsetxattr</div><div class='del'>-	.quad sys_fsetxattr</div><div class='del'>-	.quad sys_getxattr</div><div class='del'>-	.quad sys_lgetxattr	/* 230 */</div><div class='del'>-	.quad sys_fgetxattr</div><div class='del'>-	.quad sys_listxattr</div><div class='del'>-	.quad sys_llistxattr</div><div class='del'>-	.quad sys_flistxattr</div><div class='del'>-	.quad sys_removexattr	/* 235 */</div><div class='del'>-	.quad sys_lremovexattr</div><div class='del'>-	.quad sys_fremovexattr</div><div class='del'>-	.quad sys_tkill</div><div class='del'>-	.quad sys_sendfile64 </div><div class='del'>-	.quad compat_sys_futex		/* 240 */</div><div class='del'>-	.quad compat_sys_sched_setaffinity</div><div class='del'>-	.quad compat_sys_sched_getaffinity</div><div class='del'>-	.quad sys_set_thread_area</div><div class='del'>-	.quad sys_get_thread_area</div><div class='del'>-	.quad compat_sys_io_setup	/* 245 */</div><div class='del'>-	.quad sys_io_destroy</div><div class='del'>-	.quad compat_sys_io_getevents</div><div class='del'>-	.quad compat_sys_io_submit</div><div class='del'>-	.quad sys_io_cancel</div><div class='del'>-	.quad sys32_fadvise64		/* 250 */</div><div class='del'>-	.quad quiet_ni_syscall 	/* free_huge_pages */</div><div class='del'>-	.quad sys_exit_group</div><div class='del'>-	.quad sys32_lookup_dcookie</div><div class='del'>-	.quad sys_epoll_create</div><div class='del'>-	.quad sys_epoll_ctl		/* 255 */</div><div class='del'>-	.quad sys_epoll_wait</div><div class='del'>-	.quad sys_remap_file_pages</div><div class='del'>-	.quad sys_set_tid_address</div><div class='del'>-	.quad compat_sys_timer_create</div><div class='del'>-	.quad compat_sys_timer_settime	/* 260 */</div><div class='del'>-	.quad compat_sys_timer_gettime</div><div class='del'>-	.quad sys_timer_getoverrun</div><div class='del'>-	.quad sys_timer_delete</div><div class='del'>-	.quad compat_sys_clock_settime</div><div class='del'>-	.quad compat_sys_clock_gettime	/* 265 */</div><div class='del'>-	.quad compat_sys_clock_getres</div><div class='del'>-	.quad compat_sys_clock_nanosleep</div><div class='del'>-	.quad compat_sys_statfs64</div><div class='del'>-	.quad compat_sys_fstatfs64</div><div class='del'>-	.quad sys_tgkill		/* 270 */</div><div class='del'>-	.quad compat_sys_utimes</div><div class='del'>-	.quad sys32_fadvise64_64</div><div class='del'>-	.quad quiet_ni_syscall	/* sys_vserver */</div><div class='del'>-	.quad sys_mbind</div><div class='del'>-	.quad compat_sys_get_mempolicy	/* 275 */</div><div class='del'>-	.quad sys_set_mempolicy</div><div class='del'>-	.quad compat_sys_mq_open</div><div class='del'>-	.quad sys_mq_unlink</div><div class='del'>-	.quad compat_sys_mq_timedsend</div><div class='del'>-	.quad compat_sys_mq_timedreceive	/* 280 */</div><div class='del'>-	.quad compat_sys_mq_notify</div><div class='del'>-	.quad compat_sys_mq_getsetattr</div><div class='del'>-	.quad compat_sys_kexec_load	/* reserved for kexec */</div><div class='del'>-	.quad compat_sys_waitid</div><div class='del'>-	.quad quiet_ni_syscall		/* 285: sys_altroot */</div><div class='del'>-	.quad sys_add_key</div><div class='del'>-	.quad sys_request_key</div><div class='del'>-	.quad sys_keyctl</div><div class='del'>-	.quad sys_ioprio_set</div><div class='del'>-	.quad sys_ioprio_get		/* 290 */</div><div class='del'>-	.quad sys_inotify_init</div><div class='del'>-	.quad sys_inotify_add_watch</div><div class='del'>-	.quad sys_inotify_rm_watch</div><div class='del'>-	.quad sys_migrate_pages</div><div class='del'>-	.quad compat_sys_openat		/* 295 */</div><div class='del'>-	.quad sys_mkdirat</div><div class='del'>-	.quad sys_mknodat</div><div class='del'>-	.quad sys_fchownat</div><div class='del'>-	.quad compat_sys_futimesat</div><div class='del'>-	.quad sys32_fstatat		/* 300 */</div><div class='del'>-	.quad sys_unlinkat</div><div class='del'>-	.quad sys_renameat</div><div class='del'>-	.quad sys_linkat</div><div class='del'>-	.quad sys_symlinkat</div><div class='del'>-	.quad sys_readlinkat		/* 305 */</div><div class='del'>-	.quad sys_fchmodat</div><div class='del'>-	.quad sys_faccessat</div><div class='del'>-	.quad compat_sys_pselect6</div><div class='del'>-	.quad compat_sys_ppoll</div><div class='del'>-	.quad sys_unshare		/* 310 */</div><div class='del'>-	.quad compat_sys_set_robust_list</div><div class='del'>-	.quad compat_sys_get_robust_list</div><div class='del'>-	.quad sys_splice</div><div class='del'>-	.quad sys32_sync_file_range</div><div class='del'>-	.quad sys_tee			/* 315 */</div><div class='del'>-	.quad compat_sys_vmsplice</div><div class='del'>-	.quad compat_sys_move_pages</div><div class='del'>-	.quad sys_getcpu</div><div class='del'>-	.quad sys_epoll_pwait</div><div class='del'>-	.quad compat_sys_utimensat	/* 320 */</div><div class='del'>-	.quad compat_sys_signalfd</div><div class='del'>-	.quad sys_timerfd_create</div><div class='del'>-	.quad sys_eventfd</div><div class='del'>-	.quad sys32_fallocate</div><div class='del'>-	.quad compat_sys_timerfd_settime	/* 325 */</div><div class='del'>-	.quad compat_sys_timerfd_gettime</div><div class='del'>-	.quad compat_sys_signalfd4</div><div class='del'>-	.quad sys_eventfd2</div><div class='del'>-	.quad sys_epoll_create1</div><div class='del'>-	.quad sys_dup3				/* 330 */</div><div class='del'>-	.quad sys_pipe2</div><div class='del'>-	.quad sys_inotify_init1</div><div class='del'>-	.quad compat_sys_preadv</div><div class='del'>-	.quad compat_sys_pwritev</div><div class='del'>-	.quad compat_sys_rt_tgsigqueueinfo	/* 335 */</div><div class='del'>-	.quad sys_perf_event_open</div><div class='del'>-	.quad compat_sys_recvmmsg</div><div class='del'>-	.quad sys_fanotify_init</div><div class='del'>-	.quad sys32_fanotify_mark</div><div class='del'>-	.quad sys_prlimit64		/* 340 */</div><div class='del'>-	.quad sys_name_to_handle_at</div><div class='del'>-	.quad compat_sys_open_by_handle_at</div><div class='del'>-	.quad compat_sys_clock_adjtime</div><div class='del'>-	.quad sys_syncfs</div><div class='del'>-	.quad compat_sys_sendmmsg	/* 345 */</div><div class='del'>-	.quad sys_setns</div><div class='del'>-	.quad compat_sys_process_vm_readv</div><div class='del'>-	.quad compat_sys_process_vm_writev</div><div class='del'>-ia32_syscall_end:</div><div class='head'>diff --git a/arch/x86/ia32/nosyscall.c b/arch/x86/ia32/nosyscall.c<br/>new file mode 100644<br/>index 000000000000..51ecd5b4e787<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/ia32/nosyscall.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/ia32/nosyscall.c</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+</div><div class='add'>+long compat_ni_syscall(void)</div><div class='add'>+{</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/x86/ia32/syscall_ia32.c b/arch/x86/ia32/syscall_ia32.c<br/>new file mode 100644<br/>index 000000000000..4754ba0f5d9f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/ia32/syscall_ia32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/ia32/syscall_ia32.c</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+/* System call table for ia32 emulation. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;linux/sys.h&gt;</div><div class='add'>+#include &lt;linux/cache.h&gt;</div><div class='add'>+#include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+</div><div class='add'>+#define __SYSCALL_I386(nr, sym, compat) extern asmlinkage void compat(void) ;</div><div class='add'>+#include &lt;asm/syscalls_32.h&gt;</div><div class='add'>+#undef __SYSCALL_I386</div><div class='add'>+</div><div class='add'>+#define __SYSCALL_I386(nr, sym, compat) [nr] = compat,</div><div class='add'>+</div><div class='add'>+typedef void (*sys_call_ptr_t)(void);</div><div class='add'>+</div><div class='add'>+extern void compat_ni_syscall(void);</div><div class='add'>+</div><div class='add'>+const sys_call_ptr_t ia32_sys_call_table[__NR_ia32_syscall_max+1] = {</div><div class='add'>+	/*</div><div class='add'>+	 * Smells like a compiler bug -- it doesn't work</div><div class='add'>+	 * when the &amp; below is removed.</div><div class='add'>+	 */</div><div class='add'>+	[0 ... __NR_ia32_syscall_max] = &amp;compat_ni_syscall,</div><div class='add'>+#include &lt;asm/syscalls_32.h&gt;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild<br/>index 6fa90a845e4c..b57e6a43a37a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/Kbuild?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/Kbuild</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/Kbuild?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/Kbuild</a></div><div class='hunk'>@@ -19,7 +19,8 @@ header-y += processor-flags.h</div><div class='ctx'> header-y += ptrace-abi.h</div><div class='ctx'> header-y += sigcontext32.h</div><div class='ctx'> header-y += ucontext.h</div><div class='del'>-header-y += unistd_32.h</div><div class='del'>-header-y += unistd_64.h</div><div class='ctx'> header-y += vm86.h</div><div class='ctx'> header-y += vsyscall.h</div><div class='add'>+</div><div class='add'>+genhdr-y += unistd_32.h</div><div class='add'>+genhdr-y += unistd_64.h</div><div class='head'>diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h<br/>index 8e41071704a5..49ad773f4b9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/amd_nb.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/amd_nb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/amd_nb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/amd_nb.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> #ifndef _ASM_X86_AMD_NB_H</div><div class='ctx'> #define _ASM_X86_AMD_NB_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct amd_nb_bus_dev_range {</div><div class='hunk'>@@ -13,6 +14,7 @@ extern const struct pci_device_id amd_nb_misc_ids[];</div><div class='ctx'> extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[];</div><div class='ctx'> </div><div class='ctx'> extern bool early_is_amd_nb(u32 value);</div><div class='add'>+extern struct resource *amd_get_mmconfig_range(struct resource *res);</div><div class='ctx'> extern int amd_cache_northbridges(void);</div><div class='ctx'> extern void amd_flush_garts(void);</div><div class='ctx'> extern int amd_numa_init(void);</div><div class='head'>diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h<br/>index 24098aafce0d..fa13f0ec2874 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/atomic64_32.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/atomic64_32.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/atomic64_32.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/atomic64_32.h</a></div><div class='hunk'>@@ -82,7 +82,7 @@ static inline void atomic64_set(atomic64_t *v, long long i)</div><div class='ctx'>  *</div><div class='ctx'>  * Atomically reads the value of @v and returns it.</div><div class='ctx'>  */</div><div class='del'>-static inline long long atomic64_read(atomic64_t *v)</div><div class='add'>+static inline long long atomic64_read(const atomic64_t *v)</div><div class='ctx'> {</div><div class='ctx'> 	long long r;</div><div class='ctx'> 	asm volatile(ATOMIC64_ALTERNATIVE(read)</div><div class='head'>diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h<br/>index e020d88ec02d..2f90c51cc49d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/bootparam.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/bootparam.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/bootparam.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/bootparam.h</a></div><div class='hunk'>@@ -64,6 +64,8 @@ struct setup_header {</div><div class='ctx'> 	__u32	payload_offset;</div><div class='ctx'> 	__u32	payload_length;</div><div class='ctx'> 	__u64	setup_data;</div><div class='add'>+	__u64	pref_address;</div><div class='add'>+	__u32	init_size;</div><div class='ctx'> } __attribute__((packed));</div><div class='ctx'> </div><div class='ctx'> struct sys_desc_table {</div><div class='head'>diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h<br/>index f3444f700f36..17c5d4bdee5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/cpufeature.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/cpufeature.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/cpufeature.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/cpufeature.h</a></div><div class='hunk'>@@ -197,7 +197,10 @@</div><div class='ctx'> </div><div class='ctx'> /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */</div><div class='ctx'> #define X86_FEATURE_FSGSBASE	(9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/</div><div class='add'>+#define X86_FEATURE_BMI1	(9*32+ 3) /* 1st group bit manipulation extensions */</div><div class='add'>+#define X86_FEATURE_AVX2	(9*32+ 5) /* AVX2 instructions */</div><div class='ctx'> #define X86_FEATURE_SMEP	(9*32+ 7) /* Supervisor Mode Execution Protection */</div><div class='add'>+#define X86_FEATURE_BMI2	(9*32+ 8) /* 2nd group bit manipulation extensions */</div><div class='ctx'> #define X86_FEATURE_ERMS	(9*32+ 9) /* Enhanced REP MOVSB/STOSB */</div><div class='ctx'> </div><div class='ctx'> #if defined(__KERNEL__) &amp;&amp; !defined(__ASSEMBLY__)</div><div class='head'>diff --git a/arch/x86/include/asm/debugreg.h b/arch/x86/include/asm/debugreg.h<br/>index 078ad0caefc6..b903d5ea3941 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/debugreg.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/debugreg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/debugreg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/debugreg.h</a></div><div class='hunk'>@@ -101,6 +101,28 @@ extern void aout_dump_debugregs(struct user *dump);</div><div class='ctx'> </div><div class='ctx'> extern void hw_breakpoint_restore(void);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+DECLARE_PER_CPU(int, debug_stack_usage);</div><div class='add'>+static inline void debug_stack_usage_inc(void)</div><div class='add'>+{</div><div class='add'>+	__get_cpu_var(debug_stack_usage)++;</div><div class='add'>+}</div><div class='add'>+static inline void debug_stack_usage_dec(void)</div><div class='add'>+{</div><div class='add'>+	__get_cpu_var(debug_stack_usage)--;</div><div class='add'>+}</div><div class='add'>+int is_debug_stack(unsigned long addr);</div><div class='add'>+void debug_stack_set_zero(void);</div><div class='add'>+void debug_stack_reset(void);</div><div class='add'>+#else /* !X86_64 */</div><div class='add'>+static inline int is_debug_stack(unsigned long addr) { return 0; }</div><div class='add'>+static inline void debug_stack_set_zero(void) { }</div><div class='add'>+static inline void debug_stack_reset(void) { }</div><div class='add'>+static inline void debug_stack_usage_inc(void) { }</div><div class='add'>+static inline void debug_stack_usage_dec(void) { }</div><div class='add'>+#endif /* X86_64 */</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #endif	/* __KERNEL__ */</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_X86_DEBUGREG_H */</div><div class='head'>diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h<br/>index 41935fadfdfc..e95822d683f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/desc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/desc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/desc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/desc.h</a></div><div class='hunk'>@@ -35,6 +35,8 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in</div><div class='ctx'> </div><div class='ctx'> extern struct desc_ptr idt_descr;</div><div class='ctx'> extern gate_desc idt_table[];</div><div class='add'>+extern struct desc_ptr nmi_idt_descr;</div><div class='add'>+extern gate_desc nmi_idt_table[];</div><div class='ctx'> </div><div class='ctx'> struct gdt_page {</div><div class='ctx'> 	struct desc_struct gdt[GDT_ENTRIES];</div><div class='hunk'>@@ -307,6 +309,16 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)</div><div class='ctx'> 	desc-&gt;limit = (limit &gt;&gt; 16) &amp; 0xf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+static inline void set_nmi_gate(int gate, void *addr)</div><div class='add'>+{</div><div class='add'>+	gate_desc s;</div><div class='add'>+</div><div class='add'>+	pack_gate(&amp;s, GATE_INTERRUPT, (unsigned long)addr, 0, 0, __KERNEL_CS);</div><div class='add'>+	write_idt_entry(nmi_idt_table, gate, &amp;s);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline void _set_gate(int gate, unsigned type, void *addr,</div><div class='ctx'> 			     unsigned dpl, unsigned ist, unsigned seg)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h<br/>index 7093e4a6a0bc..844f735fd63a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/efi.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/efi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/efi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/efi.h</a></div><div class='hunk'>@@ -3,6 +3,8 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_32</div><div class='ctx'> </div><div class='add'>+#define EFI_LOADER_SIGNATURE	"EL32"</div><div class='add'>+</div><div class='ctx'> extern unsigned long asmlinkage efi_call_phys(void *, ...);</div><div class='ctx'> </div><div class='ctx'> #define efi_call_phys0(f)		efi_call_phys(f)</div><div class='hunk'>@@ -37,6 +39,8 @@ extern unsigned long asmlinkage efi_call_phys(void *, ...);</div><div class='ctx'> </div><div class='ctx'> #else /* !CONFIG_X86_32 */</div><div class='ctx'> </div><div class='add'>+#define EFI_LOADER_SIGNATURE	"EL64"</div><div class='add'>+</div><div class='ctx'> extern u64 efi_call0(void *fp);</div><div class='ctx'> extern u64 efi_call1(void *fp, u64 arg1);</div><div class='ctx'> extern u64 efi_call2(void *fp, u64 arg1, u64 arg2);</div><div class='head'>diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h<br/>index 460c74e4852c..4da3c0c4c974 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/fixmap.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/fixmap.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/fixmap.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/fixmap.h</a></div><div class='hunk'>@@ -117,7 +117,7 @@ enum fixed_addresses {</div><div class='ctx'> #endif</div><div class='ctx'> 	FIX_TEXT_POKE1,	/* reserve 2 pages for text_poke() */</div><div class='ctx'> 	FIX_TEXT_POKE0, /* first page is last, because allocation is backward */</div><div class='del'>-#ifdef	CONFIG_X86_MRST</div><div class='add'>+#ifdef	CONFIG_X86_INTEL_MID</div><div class='ctx'> 	FIX_LNW_VRTC,</div><div class='ctx'> #endif</div><div class='ctx'> 	__end_of_permanent_fixed_addresses,</div><div class='head'>diff --git a/arch/x86/include/asm/ia32_unistd.h b/arch/x86/include/asm/ia32_unistd.h<br/>index 976f6ecd2ce6..b0d5716ca1e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/ia32_unistd.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/ia32_unistd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/ia32_unistd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/ia32_unistd.h</a></div><div class='hunk'>@@ -2,17 +2,10 @@</div><div class='ctx'> #define _ASM_X86_IA32_UNISTD_H</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This file contains the system call numbers of the ia32 port,</div><div class='add'>+ * This file contains the system call numbers of the ia32 compat ABI,</div><div class='ctx'>  * this is for the kernel only.</div><div class='del'>- * Only add syscalls here where some part of the kernel needs to know</div><div class='del'>- * the number. This should be otherwise in sync with asm-x86/unistd_32.h. -AK</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-#define __NR_ia32_restart_syscall 0</div><div class='del'>-#define __NR_ia32_exit		  1</div><div class='del'>-#define __NR_ia32_read		  3</div><div class='del'>-#define __NR_ia32_write		  4</div><div class='del'>-#define __NR_ia32_sigreturn	119</div><div class='del'>-#define __NR_ia32_rt_sigreturn	173</div><div class='add'>+#define __SYSCALL_ia32_NR(x) (x)</div><div class='add'>+#include &lt;asm/unistd_32_ia32.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_X86_IA32_UNISTD_H */</div><div class='head'>diff --git a/arch/x86/include/asm/init.h b/arch/x86/include/asm/init.h<br/>index 8dbe353e41e1..adcc0ae73d09 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/init.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/init.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/init.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/init.h</a></div><div class='hunk'>@@ -5,6 +5,8 @@</div><div class='ctx'> extern void __init early_ioremap_page_table_range_init(void);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+extern void __init zone_sizes_init(void);</div><div class='add'>+</div><div class='ctx'> extern unsigned long __init</div><div class='ctx'> kernel_physical_mapping_init(unsigned long start,</div><div class='ctx'> 			     unsigned long end,</div><div class='head'>diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h<br/>index 345c99cef152..dffc38ee6255 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/iommu.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/iommu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/iommu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/iommu.h</a></div><div class='hunk'>@@ -5,6 +5,7 @@ extern struct dma_map_ops nommu_dma_ops;</div><div class='ctx'> extern int force_iommu, no_iommu;</div><div class='ctx'> extern int iommu_detected;</div><div class='ctx'> extern int iommu_pass_through;</div><div class='add'>+extern int iommu_group_mf;</div><div class='ctx'> </div><div class='ctx'> /* 10 seconds */</div><div class='ctx'> #define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000)</div><div class='head'>diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h<br/>index a026507893e9..ab4092e3214e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/kvm_emulate.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/kvm_emulate.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/kvm_emulate.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/kvm_emulate.h</a></div><div class='hunk'>@@ -181,6 +181,7 @@ struct x86_emulate_ops {</div><div class='ctx'> 	int (*set_dr)(struct x86_emulate_ctxt *ctxt, int dr, ulong value);</div><div class='ctx'> 	int (*set_msr)(struct x86_emulate_ctxt *ctxt, u32 msr_index, u64 data);</div><div class='ctx'> 	int (*get_msr)(struct x86_emulate_ctxt *ctxt, u32 msr_index, u64 *pdata);</div><div class='add'>+	int (*read_pmc)(struct x86_emulate_ctxt *ctxt, u32 pmc, u64 *pdata);</div><div class='ctx'> 	void (*halt)(struct x86_emulate_ctxt *ctxt);</div><div class='ctx'> 	void (*wbinvd)(struct x86_emulate_ctxt *ctxt);</div><div class='ctx'> 	int (*fix_hypercall)(struct x86_emulate_ctxt *ctxt);</div><div class='hunk'>@@ -364,6 +365,7 @@ enum x86_intercept {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len);</div><div class='add'>+bool x86_page_table_writing_insn(struct x86_emulate_ctxt *ctxt);</div><div class='ctx'> #define EMULATION_FAILED -1</div><div class='ctx'> #define EMULATION_OK 0</div><div class='ctx'> #define EMULATION_RESTART 1</div><div class='head'>diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h<br/>index b4973f4dab98..52d6640a5ca1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/kvm_host.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/kvm_host.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/kvm_host.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/kvm_host.h</a></div><div class='hunk'>@@ -16,10 +16,12 @@</div><div class='ctx'> #include &lt;linux/mmu_notifier.h&gt;</div><div class='ctx'> #include &lt;linux/tracepoint.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/irq_work.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kvm.h&gt;</div><div class='ctx'> #include &lt;linux/kvm_para.h&gt;</div><div class='ctx'> #include &lt;linux/kvm_types.h&gt;</div><div class='add'>+#include &lt;linux/perf_event.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pvclock-abi.h&gt;</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='hunk'>@@ -31,6 +33,8 @@</div><div class='ctx'> #define KVM_MEMORY_SLOTS 32</div><div class='ctx'> /* memory slots that does not exposed to userspace */</div><div class='ctx'> #define KVM_PRIVATE_MEM_SLOTS 4</div><div class='add'>+#define KVM_MEM_SLOTS_NUM (KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS)</div><div class='add'>+</div><div class='ctx'> #define KVM_MMIO_SIZE 16</div><div class='ctx'> </div><div class='ctx'> #define KVM_PIO_PAGE_OFFSET 1</div><div class='hunk'>@@ -228,7 +232,7 @@ struct kvm_mmu_page {</div><div class='ctx'> 	 * One bit set per slot which has memory</div><div class='ctx'> 	 * in this shadow page.</div><div class='ctx'> 	 */</div><div class='del'>-	DECLARE_BITMAP(slot_bitmap, KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS);</div><div class='add'>+	DECLARE_BITMAP(slot_bitmap, KVM_MEM_SLOTS_NUM);</div><div class='ctx'> 	bool unsync;</div><div class='ctx'> 	int root_count;          /* Currently serving as active root */</div><div class='ctx'> 	unsigned int unsync_children;</div><div class='hunk'>@@ -239,14 +243,9 @@ struct kvm_mmu_page {</div><div class='ctx'> 	int clear_spte_count;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	struct rcu_head rcu;</div><div class='del'>-};</div><div class='add'>+	int write_flooding_count;</div><div class='ctx'> </div><div class='del'>-struct kvm_pv_mmu_op_buffer {</div><div class='del'>-	void *ptr;</div><div class='del'>-	unsigned len;</div><div class='del'>-	unsigned processed;</div><div class='del'>-	char buf[512] __aligned(sizeof(long));</div><div class='add'>+	struct rcu_head rcu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct kvm_pio_request {</div><div class='hunk'>@@ -294,6 +293,37 @@ struct kvm_mmu {</div><div class='ctx'> 	u64 pdptrs[4]; /* pae */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum pmc_type {</div><div class='add'>+	KVM_PMC_GP = 0,</div><div class='add'>+	KVM_PMC_FIXED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct kvm_pmc {</div><div class='add'>+	enum pmc_type type;</div><div class='add'>+	u8 idx;</div><div class='add'>+	u64 counter;</div><div class='add'>+	u64 eventsel;</div><div class='add'>+	struct perf_event *perf_event;</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct kvm_pmu {</div><div class='add'>+	unsigned nr_arch_gp_counters;</div><div class='add'>+	unsigned nr_arch_fixed_counters;</div><div class='add'>+	unsigned available_event_types;</div><div class='add'>+	u64 fixed_ctr_ctrl;</div><div class='add'>+	u64 global_ctrl;</div><div class='add'>+	u64 global_status;</div><div class='add'>+	u64 global_ovf_ctrl;</div><div class='add'>+	u64 counter_bitmask[2];</div><div class='add'>+	u64 global_ctrl_mask;</div><div class='add'>+	u8 version;</div><div class='add'>+	struct kvm_pmc gp_counters[X86_PMC_MAX_GENERIC];</div><div class='add'>+	struct kvm_pmc fixed_counters[X86_PMC_MAX_FIXED];</div><div class='add'>+	struct irq_work irq_work;</div><div class='add'>+	u64 reprogram_pmi;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct kvm_vcpu_arch {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * rip and regs accesses must go through</div><div class='hunk'>@@ -345,19 +375,10 @@ struct kvm_vcpu_arch {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct kvm_mmu *walk_mmu;</div><div class='ctx'> </div><div class='del'>-	/* only needed in kvm_pv_mmu_op() path, but it's hot so</div><div class='del'>-	 * put it here to avoid allocation */</div><div class='del'>-	struct kvm_pv_mmu_op_buffer mmu_op_buffer;</div><div class='del'>-</div><div class='ctx'> 	struct kvm_mmu_memory_cache mmu_pte_list_desc_cache;</div><div class='ctx'> 	struct kvm_mmu_memory_cache mmu_page_cache;</div><div class='ctx'> 	struct kvm_mmu_memory_cache mmu_page_header_cache;</div><div class='ctx'> </div><div class='del'>-	gfn_t last_pt_write_gfn;</div><div class='del'>-	int   last_pt_write_count;</div><div class='del'>-	u64  *last_pte_updated;</div><div class='del'>-	gfn_t last_pte_gfn;</div><div class='del'>-</div><div class='ctx'> 	struct fpu guest_fpu;</div><div class='ctx'> 	u64 xcr0;</div><div class='ctx'> </div><div class='hunk'>@@ -436,6 +457,8 @@ struct kvm_vcpu_arch {</div><div class='ctx'> 	unsigned access;</div><div class='ctx'> 	gfn_t mmio_gfn;</div><div class='ctx'> </div><div class='add'>+	struct kvm_pmu pmu;</div><div class='add'>+</div><div class='ctx'> 	/* used for guest single stepping over the given code position */</div><div class='ctx'> 	unsigned long singlestep_rip;</div><div class='ctx'> </div><div class='hunk'>@@ -444,6 +467,9 @@ struct kvm_vcpu_arch {</div><div class='ctx'> </div><div class='ctx'> 	cpumask_var_t wbinvd_dirty_mask;</div><div class='ctx'> </div><div class='add'>+	unsigned long last_retry_eip;</div><div class='add'>+	unsigned long last_retry_addr;</div><div class='add'>+</div><div class='ctx'> 	struct {</div><div class='ctx'> 		bool halted;</div><div class='ctx'> 		gfn_t gfns[roundup_pow_of_two(ASYNC_PF_PER_VCPU)];</div><div class='hunk'>@@ -459,7 +485,6 @@ struct kvm_arch {</div><div class='ctx'> 	unsigned int n_requested_mmu_pages;</div><div class='ctx'> 	unsigned int n_max_mmu_pages;</div><div class='ctx'> 	unsigned int indirect_shadow_pages;</div><div class='del'>-	atomic_t invlpg_counter;</div><div class='ctx'> 	struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES];</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Hash table of struct kvm_mmu_page.</div><div class='hunk'>@@ -660,6 +685,8 @@ void kvm_mmu_set_mask_ptes(u64 user_mask, u64 accessed_mask,</div><div class='ctx'> </div><div class='ctx'> int kvm_mmu_reset_context(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_mmu_slot_remove_write_access(struct kvm *kvm, int slot);</div><div class='add'>+int kvm_mmu_rmap_write_protect(struct kvm *kvm, u64 gfn,</div><div class='add'>+			       struct kvm_memory_slot *slot);</div><div class='ctx'> void kvm_mmu_zap_all(struct kvm *kvm);</div><div class='ctx'> unsigned int kvm_mmu_calculate_mmu_pages(struct kvm *kvm);</div><div class='ctx'> void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned int kvm_nr_mmu_pages);</div><div class='hunk'>@@ -668,8 +695,6 @@ int load_pdptrs(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, unsigned long cr3);</div><div class='ctx'> </div><div class='ctx'> int emulator_write_phys(struct kvm_vcpu *vcpu, gpa_t gpa,</div><div class='ctx'> 			  const void *val, int bytes);</div><div class='del'>-int kvm_pv_mmu_op(struct kvm_vcpu *vcpu, unsigned long bytes,</div><div class='del'>-		  gpa_t addr, unsigned long *ret);</div><div class='ctx'> u8 kvm_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn);</div><div class='ctx'> </div><div class='ctx'> extern bool tdp_enabled;</div><div class='hunk'>@@ -692,6 +717,7 @@ enum emulation_result {</div><div class='ctx'> #define EMULTYPE_NO_DECODE	    (1 &lt;&lt; 0)</div><div class='ctx'> #define EMULTYPE_TRAP_UD	    (1 &lt;&lt; 1)</div><div class='ctx'> #define EMULTYPE_SKIP		    (1 &lt;&lt; 2)</div><div class='add'>+#define EMULTYPE_RETRY		    (1 &lt;&lt; 3)</div><div class='ctx'> int x86_emulate_instruction(struct kvm_vcpu *vcpu, unsigned long cr2,</div><div class='ctx'> 			    int emulation_type, void *insn, int insn_len);</div><div class='ctx'> </div><div class='hunk'>@@ -734,6 +760,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data);</div><div class='ctx'> </div><div class='ctx'> unsigned long kvm_get_rflags(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags);</div><div class='add'>+bool kvm_rdpmc(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> void kvm_queue_exception(struct kvm_vcpu *vcpu, unsigned nr);</div><div class='ctx'> void kvm_queue_exception_e(struct kvm_vcpu *vcpu, unsigned nr, u32 error_code);</div><div class='hunk'>@@ -754,13 +781,14 @@ int fx_init(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> void kvm_mmu_flush_tlb(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,</div><div class='del'>-		       const u8 *new, int bytes,</div><div class='del'>-		       bool guest_initiated);</div><div class='add'>+		       const u8 *new, int bytes);</div><div class='add'>+int kvm_mmu_unprotect_page(struct kvm *kvm, gfn_t gfn);</div><div class='ctx'> int kvm_mmu_unprotect_page_virt(struct kvm_vcpu *vcpu, gva_t gva);</div><div class='ctx'> void __kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu);</div><div class='ctx'> int kvm_mmu_load(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_mmu_unload(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_mmu_sync_roots(struct kvm_vcpu *vcpu);</div><div class='add'>+gpa_t translate_nested_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access);</div><div class='ctx'> gpa_t kvm_mmu_gva_to_gpa_read(struct kvm_vcpu *vcpu, gva_t gva,</div><div class='ctx'> 			      struct x86_exception *exception);</div><div class='ctx'> gpa_t kvm_mmu_gva_to_gpa_fetch(struct kvm_vcpu *vcpu, gva_t gva,</div><div class='hunk'>@@ -782,6 +810,11 @@ void kvm_disable_tdp(void);</div><div class='ctx'> int complete_pio(struct kvm_vcpu *vcpu);</div><div class='ctx'> bool kvm_check_iopl(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='add'>+static inline gpa_t translate_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access)</div><div class='add'>+{</div><div class='add'>+	return gpa;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct kvm_mmu_page *page_header(hpa_t shadow_page)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page = pfn_to_page(shadow_page &gt;&gt; PAGE_SHIFT);</div><div class='hunk'>@@ -894,4 +927,17 @@ extern bool kvm_find_async_pf_gfn(struct kvm_vcpu *vcpu, gfn_t gfn);</div><div class='ctx'> </div><div class='ctx'> void kvm_complete_insn_gp(struct kvm_vcpu *vcpu, int err);</div><div class='ctx'> </div><div class='add'>+int kvm_is_in_guest(void);</div><div class='add'>+</div><div class='add'>+void kvm_pmu_init(struct kvm_vcpu *vcpu);</div><div class='add'>+void kvm_pmu_destroy(struct kvm_vcpu *vcpu);</div><div class='add'>+void kvm_pmu_reset(struct kvm_vcpu *vcpu);</div><div class='add'>+void kvm_pmu_cpuid_update(struct kvm_vcpu *vcpu);</div><div class='add'>+bool kvm_pmu_msr(struct kvm_vcpu *vcpu, u32 msr);</div><div class='add'>+int kvm_pmu_get_msr(struct kvm_vcpu *vcpu, u32 msr, u64 *data);</div><div class='add'>+int kvm_pmu_set_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data);</div><div class='add'>+int kvm_pmu_read_pmc(struct kvm_vcpu *vcpu, unsigned pmc, u64 *data);</div><div class='add'>+void kvm_handle_pmu_event(struct kvm_vcpu *vcpu);</div><div class='add'>+void kvm_deliver_pmi(struct kvm_vcpu *vcpu);</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 6add827381c9..6aefb14cbbc5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/mce.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/mce.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/mce.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/mce.h</a></div><div class='hunk'>@@ -151,7 +151,7 @@ static inline void enable_p5_mce(void) {}</div><div class='ctx'> </div><div class='ctx'> void mce_setup(struct mce *m);</div><div class='ctx'> void mce_log(struct mce *m);</div><div class='del'>-DECLARE_PER_CPU(struct sys_device, mce_sysdev);</div><div class='add'>+extern struct device *mce_device[CONFIG_NR_CPUS];</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Maximum banks number.</div><div class='head'>diff --git a/arch/x86/include/asm/mrst.h b/arch/x86/include/asm/mrst.h<br/>index 93f79094c224..0a0a95460434 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/mrst.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/mrst.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/mrst.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/mrst.h</a></div><div class='hunk'>@@ -67,7 +67,7 @@ extern struct console early_mrst_console;</div><div class='ctx'> extern void mrst_early_console_init(void);</div><div class='ctx'> </div><div class='ctx'> extern struct console early_hsu_console;</div><div class='del'>-extern void hsu_early_console_init(void);</div><div class='add'>+extern void hsu_early_console_init(const char *);</div><div class='ctx'> </div><div class='ctx'> extern void intel_scu_devices_create(void);</div><div class='ctx'> extern void intel_scu_devices_destroy(void);</div><div class='head'>diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h<br/>index d498943b906c..df75d07571ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/pci.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/pci.h</a></div><div class='hunk'>@@ -112,19 +112,28 @@ static inline void x86_teardown_msi_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	x86_msi.teardown_msi_irq(irq);</div><div class='ctx'> }</div><div class='add'>+static inline void x86_restore_msi_irqs(struct pci_dev *dev, int irq)</div><div class='add'>+{</div><div class='add'>+	x86_msi.restore_msi_irqs(dev, irq);</div><div class='add'>+}</div><div class='ctx'> #define arch_setup_msi_irqs x86_setup_msi_irqs</div><div class='ctx'> #define arch_teardown_msi_irqs x86_teardown_msi_irqs</div><div class='ctx'> #define arch_teardown_msi_irq x86_teardown_msi_irq</div><div class='add'>+#define arch_restore_msi_irqs x86_restore_msi_irqs</div><div class='ctx'> /* implemented in arch/x86/kernel/apic/io_apic. */</div><div class='ctx'> int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);</div><div class='ctx'> void native_teardown_msi_irq(unsigned int irq);</div><div class='add'>+void native_restore_msi_irqs(struct pci_dev *dev, int irq);</div><div class='ctx'> /* default to the implementation in drivers/lib/msi.c */</div><div class='ctx'> #define HAVE_DEFAULT_MSI_TEARDOWN_IRQS</div><div class='add'>+#define HAVE_DEFAULT_MSI_RESTORE_IRQS</div><div class='ctx'> void default_teardown_msi_irqs(struct pci_dev *dev);</div><div class='add'>+void default_restore_msi_irqs(struct pci_dev *dev, int irq);</div><div class='ctx'> #else</div><div class='ctx'> #define native_setup_msi_irqs		NULL</div><div class='ctx'> #define native_teardown_msi_irq		NULL</div><div class='ctx'> #define default_teardown_msi_irqs	NULL</div><div class='add'>+#define default_restore_msi_irqs	NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define PCI_DMA_BUS_IS_PHYS (dma_ops-&gt;is_phys)</div><div class='head'>diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h<br/>index e38197806853..b3a531746026 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/pci_x86.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/pci_x86.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/pci_x86.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/pci_x86.h</a></div><div class='hunk'>@@ -44,8 +44,6 @@ enum pci_bf_sort_state {</div><div class='ctx'> </div><div class='ctx'> /* pci-i386.c */</div><div class='ctx'> </div><div class='del'>-extern unsigned int pcibios_max_latency;</div><div class='del'>-</div><div class='ctx'> void pcibios_resource_survey(void);</div><div class='ctx'> void pcibios_set_cache_line_size(void);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h<br/>index 529bf07e8067..7a11910a63c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/percpu.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/percpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/percpu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/percpu.h</a></div><div class='hunk'>@@ -414,22 +414,6 @@ do {									\</div><div class='ctx'> #define this_cpu_xchg_2(pcp, nval)	percpu_xchg_op(pcp, nval)</div><div class='ctx'> #define this_cpu_xchg_4(pcp, nval)	percpu_xchg_op(pcp, nval)</div><div class='ctx'> </div><div class='del'>-#define irqsafe_cpu_add_1(pcp, val)	percpu_add_op((pcp), val)</div><div class='del'>-#define irqsafe_cpu_add_2(pcp, val)	percpu_add_op((pcp), val)</div><div class='del'>-#define irqsafe_cpu_add_4(pcp, val)	percpu_add_op((pcp), val)</div><div class='del'>-#define irqsafe_cpu_and_1(pcp, val)	percpu_to_op("and", (pcp), val)</div><div class='del'>-#define irqsafe_cpu_and_2(pcp, val)	percpu_to_op("and", (pcp), val)</div><div class='del'>-#define irqsafe_cpu_and_4(pcp, val)	percpu_to_op("and", (pcp), val)</div><div class='del'>-#define irqsafe_cpu_or_1(pcp, val)	percpu_to_op("or", (pcp), val)</div><div class='del'>-#define irqsafe_cpu_or_2(pcp, val)	percpu_to_op("or", (pcp), val)</div><div class='del'>-#define irqsafe_cpu_or_4(pcp, val)	percpu_to_op("or", (pcp), val)</div><div class='del'>-#define irqsafe_cpu_xor_1(pcp, val)	percpu_to_op("xor", (pcp), val)</div><div class='del'>-#define irqsafe_cpu_xor_2(pcp, val)	percpu_to_op("xor", (pcp), val)</div><div class='del'>-#define irqsafe_cpu_xor_4(pcp, val)	percpu_to_op("xor", (pcp), val)</div><div class='del'>-#define irqsafe_cpu_xchg_1(pcp, nval)	percpu_xchg_op(pcp, nval)</div><div class='del'>-#define irqsafe_cpu_xchg_2(pcp, nval)	percpu_xchg_op(pcp, nval)</div><div class='del'>-#define irqsafe_cpu_xchg_4(pcp, nval)	percpu_xchg_op(pcp, nval)</div><div class='del'>-</div><div class='ctx'> #ifndef CONFIG_M386</div><div class='ctx'> #define __this_cpu_add_return_1(pcp, val) percpu_add_return_op(pcp, val)</div><div class='ctx'> #define __this_cpu_add_return_2(pcp, val) percpu_add_return_op(pcp, val)</div><div class='hunk'>@@ -445,9 +429,6 @@ do {									\</div><div class='ctx'> #define this_cpu_cmpxchg_2(pcp, oval, nval)	percpu_cmpxchg_op(pcp, oval, nval)</div><div class='ctx'> #define this_cpu_cmpxchg_4(pcp, oval, nval)	percpu_cmpxchg_op(pcp, oval, nval)</div><div class='ctx'> </div><div class='del'>-#define irqsafe_cpu_cmpxchg_1(pcp, oval, nval)	percpu_cmpxchg_op(pcp, oval, nval)</div><div class='del'>-#define irqsafe_cpu_cmpxchg_2(pcp, oval, nval)	percpu_cmpxchg_op(pcp, oval, nval)</div><div class='del'>-#define irqsafe_cpu_cmpxchg_4(pcp, oval, nval)	percpu_cmpxchg_op(pcp, oval, nval)</div><div class='ctx'> #endif /* !CONFIG_M386 */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_CMPXCHG64</div><div class='hunk'>@@ -464,7 +445,6 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #define __this_cpu_cmpxchg_double_4	percpu_cmpxchg8b_double</div><div class='ctx'> #define this_cpu_cmpxchg_double_4	percpu_cmpxchg8b_double</div><div class='del'>-#define irqsafe_cpu_cmpxchg_double_4	percpu_cmpxchg8b_double</div><div class='ctx'> #endif /* CONFIG_X86_CMPXCHG64 */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -492,13 +472,6 @@ do {									\</div><div class='ctx'> #define this_cpu_xchg_8(pcp, nval)	percpu_xchg_op(pcp, nval)</div><div class='ctx'> #define this_cpu_cmpxchg_8(pcp, oval, nval)	percpu_cmpxchg_op(pcp, oval, nval)</div><div class='ctx'> </div><div class='del'>-#define irqsafe_cpu_add_8(pcp, val)	percpu_add_op((pcp), val)</div><div class='del'>-#define irqsafe_cpu_and_8(pcp, val)	percpu_to_op("and", (pcp), val)</div><div class='del'>-#define irqsafe_cpu_or_8(pcp, val)	percpu_to_op("or", (pcp), val)</div><div class='del'>-#define irqsafe_cpu_xor_8(pcp, val)	percpu_to_op("xor", (pcp), val)</div><div class='del'>-#define irqsafe_cpu_xchg_8(pcp, nval)	percpu_xchg_op(pcp, nval)</div><div class='del'>-#define irqsafe_cpu_cmpxchg_8(pcp, oval, nval)	percpu_cmpxchg_op(pcp, oval, nval)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Pretty complex macro to generate cmpxchg16 instruction.  The instruction</div><div class='ctx'>  * is not supported on early AMD64 processors so we must be able to emulate</div><div class='hunk'>@@ -521,7 +494,6 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #define __this_cpu_cmpxchg_double_8	percpu_cmpxchg16b_double</div><div class='ctx'> #define this_cpu_cmpxchg_double_8	percpu_cmpxchg16b_double</div><div class='del'>-#define irqsafe_cpu_cmpxchg_double_8	percpu_cmpxchg16b_double</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/include/asm/serpent.h b/arch/x86/include/asm/serpent.h<br/>new file mode 100644<br/>index 000000000000..d3ef63fe0c81<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/serpent.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/serpent.h</a></div><div class='hunk'>@@ -0,0 +1,63 @@</div><div class='add'>+#ifndef ASM_X86_SERPENT_H</div><div class='add'>+#define ASM_X86_SERPENT_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;crypto/serpent.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+</div><div class='add'>+#define SERPENT_PARALLEL_BLOCKS 4</div><div class='add'>+</div><div class='add'>+asmlinkage void __serpent_enc_blk_4way(struct serpent_ctx *ctx, u8 *dst,</div><div class='add'>+				       const u8 *src, bool xor);</div><div class='add'>+asmlinkage void serpent_dec_blk_4way(struct serpent_ctx *ctx, u8 *dst,</div><div class='add'>+				     const u8 *src);</div><div class='add'>+</div><div class='add'>+static inline void serpent_enc_blk_xway(struct serpent_ctx *ctx, u8 *dst,</div><div class='add'>+					const u8 *src)</div><div class='add'>+{</div><div class='add'>+	__serpent_enc_blk_4way(ctx, dst, src, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void serpent_enc_blk_xway_xor(struct serpent_ctx *ctx, u8 *dst,</div><div class='add'>+					    const u8 *src)</div><div class='add'>+{</div><div class='add'>+	__serpent_enc_blk_4way(ctx, dst, src, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void serpent_dec_blk_xway(struct serpent_ctx *ctx, u8 *dst,</div><div class='add'>+					const u8 *src)</div><div class='add'>+{</div><div class='add'>+	serpent_dec_blk_4way(ctx, dst, src);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#define SERPENT_PARALLEL_BLOCKS 8</div><div class='add'>+</div><div class='add'>+asmlinkage void __serpent_enc_blk_8way(struct serpent_ctx *ctx, u8 *dst,</div><div class='add'>+				       const u8 *src, bool xor);</div><div class='add'>+asmlinkage void serpent_dec_blk_8way(struct serpent_ctx *ctx, u8 *dst,</div><div class='add'>+				     const u8 *src);</div><div class='add'>+</div><div class='add'>+static inline void serpent_enc_blk_xway(struct serpent_ctx *ctx, u8 *dst,</div><div class='add'>+				   const u8 *src)</div><div class='add'>+{</div><div class='add'>+	__serpent_enc_blk_8way(ctx, dst, src, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void serpent_enc_blk_xway_xor(struct serpent_ctx *ctx, u8 *dst,</div><div class='add'>+				       const u8 *src)</div><div class='add'>+{</div><div class='add'>+	__serpent_enc_blk_8way(ctx, dst, src, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void serpent_dec_blk_xway(struct serpent_ctx *ctx, u8 *dst,</div><div class='add'>+				   const u8 *src)</div><div class='add'>+{</div><div class='add'>+	serpent_dec_blk_8way(ctx, dst, src);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h<br/>index 9756551ec760..d0f19f9fb846 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/setup.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/setup.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/setup.h</a></div><div class='hunk'>@@ -47,7 +47,7 @@ extern void reserve_standard_io_resources(void);</div><div class='ctx'> extern void i386_reserve_resources(void);</div><div class='ctx'> extern void setup_default_timer_irq(void);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_MRST</div><div class='add'>+#ifdef CONFIG_X86_INTEL_MID</div><div class='ctx'> extern void x86_mrst_early_setup(void);</div><div class='ctx'> #else</div><div class='ctx'> static inline void x86_mrst_early_setup(void) { }</div><div class='head'>diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h<br/>index 73b11bc0ae6f..0434c400287c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/smp.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/smp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/smp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/smp.h</a></div><div class='hunk'>@@ -225,5 +225,11 @@ extern int hard_smp_processor_id(void);</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_X86_LOCAL_APIC */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_NMI_SELFTEST</div><div class='add'>+extern void nmi_selftest(void);</div><div class='add'>+#else</div><div class='add'>+#define nmi_selftest() do { } while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> #endif /* _ASM_X86_SMP_H */</div><div class='head'>diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h<br/>index c4a348f7bd43..d962e5652a73 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/syscall.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/syscall.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/syscall.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/syscall.h</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;asm/asm-offsets.h&gt;	/* For NR_syscalls */</div><div class='ctx'> </div><div class='ctx'> extern const unsigned long sys_call_table[];</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h<br/>index 185b719ec61a..bc817cd8b443 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/thread_info.h</a></div><div class='hunk'>@@ -40,8 +40,8 @@ struct thread_info {</div><div class='ctx'> 						*/</div><div class='ctx'> 	__u8			supervisor_stack[0];</div><div class='ctx'> #endif</div><div class='del'>-	int			sig_on_uaccess_error:1;</div><div class='del'>-	int			uaccess_err:1;	/* uaccess failed */</div><div class='add'>+	unsigned int		sig_on_uaccess_error:1;</div><div class='add'>+	unsigned int		uaccess_err:1;	/* uaccess failed */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define INIT_THREAD_INFO(tsk)			\</div><div class='hunk'>@@ -91,7 +91,6 @@ struct thread_info {</div><div class='ctx'> #define TIF_MEMDIE		20	/* is terminating due to OOM killer */</div><div class='ctx'> #define TIF_DEBUG		21	/* uses debug registers */</div><div class='ctx'> #define TIF_IO_BITMAP		22	/* uses I/O bitmap */</div><div class='del'>-#define TIF_FREEZE		23	/* is freezing for suspend */</div><div class='ctx'> #define TIF_FORCED_TF		24	/* true if TF in eflags artificially */</div><div class='ctx'> #define TIF_BLOCKSTEP		25	/* set when we want DEBUGCTLMSR_BTF */</div><div class='ctx'> #define TIF_LAZY_MMU_UPDATES	27	/* task is updating the mmu lazily */</div><div class='hunk'>@@ -113,7 +112,6 @@ struct thread_info {</div><div class='ctx'> #define _TIF_FORK		(1 &lt;&lt; TIF_FORK)</div><div class='ctx'> #define _TIF_DEBUG		(1 &lt;&lt; TIF_DEBUG)</div><div class='ctx'> #define _TIF_IO_BITMAP		(1 &lt;&lt; TIF_IO_BITMAP)</div><div class='del'>-#define _TIF_FREEZE		(1 &lt;&lt; TIF_FREEZE)</div><div class='ctx'> #define _TIF_FORCED_TF		(1 &lt;&lt; TIF_FORCED_TF)</div><div class='ctx'> #define _TIF_BLOCKSTEP		(1 &lt;&lt; TIF_BLOCKSTEP)</div><div class='ctx'> #define _TIF_LAZY_MMU_UPDATES	(1 &lt;&lt; TIF_LAZY_MMU_UPDATES)</div><div class='head'>diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h<br/>index 800f77c60051..b9676ae37ada 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/topology.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/topology.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/topology.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/topology.h</a></div><div class='hunk'>@@ -172,7 +172,7 @@ static inline void arch_fix_phys_package_id(int num, u32 slot)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct pci_bus;</div><div class='del'>-void x86_pci_root_bus_res_quirks(struct pci_bus *b);</div><div class='add'>+void x86_pci_root_bus_resources(int bus, struct list_head *resources);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> #define mc_capable()	((boot_cpu_data.x86_max_cores &gt; 1) &amp;&amp; \</div><div class='head'>diff --git a/arch/x86/include/asm/unistd.h b/arch/x86/include/asm/unistd.h<br/>index 2a58ed3e51d8..21f77b89e47a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/unistd.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/unistd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/unistd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/unistd.h</a></div><div class='hunk'>@@ -1,13 +1,60 @@</div><div class='add'>+#ifndef _ASM_X86_UNISTD_H</div><div class='add'>+#define _ASM_X86_UNISTD_H 1</div><div class='add'>+</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> # ifdef CONFIG_X86_32</div><div class='del'>-#  include "unistd_32.h"</div><div class='add'>+</div><div class='add'>+#  include &lt;asm/unistd_32.h&gt;</div><div class='add'>+#  define __ARCH_WANT_IPC_PARSE_VERSION</div><div class='add'>+#  define __ARCH_WANT_STAT64</div><div class='add'>+#  define __ARCH_WANT_SYS_IPC</div><div class='add'>+#  define __ARCH_WANT_SYS_OLD_MMAP</div><div class='add'>+#  define __ARCH_WANT_SYS_OLD_SELECT</div><div class='add'>+</div><div class='ctx'> # else</div><div class='del'>-#  include "unistd_64.h"</div><div class='add'>+</div><div class='add'>+#  include &lt;asm/unistd_64.h&gt;</div><div class='add'>+#  define __ARCH_WANT_COMPAT_SYS_TIME</div><div class='add'>+</div><div class='ctx'> # endif</div><div class='add'>+</div><div class='add'>+# define __ARCH_WANT_OLD_READDIR</div><div class='add'>+# define __ARCH_WANT_OLD_STAT</div><div class='add'>+# define __ARCH_WANT_SYS_ALARM</div><div class='add'>+# define __ARCH_WANT_SYS_FADVISE64</div><div class='add'>+# define __ARCH_WANT_SYS_GETHOSTNAME</div><div class='add'>+# define __ARCH_WANT_SYS_GETPGRP</div><div class='add'>+# define __ARCH_WANT_SYS_LLSEEK</div><div class='add'>+# define __ARCH_WANT_SYS_NICE</div><div class='add'>+# define __ARCH_WANT_SYS_OLDUMOUNT</div><div class='add'>+# define __ARCH_WANT_SYS_OLD_GETRLIMIT</div><div class='add'>+# define __ARCH_WANT_SYS_OLD_UNAME</div><div class='add'>+# define __ARCH_WANT_SYS_PAUSE</div><div class='add'>+# define __ARCH_WANT_SYS_RT_SIGACTION</div><div class='add'>+# define __ARCH_WANT_SYS_RT_SIGSUSPEND</div><div class='add'>+# define __ARCH_WANT_SYS_SGETMASK</div><div class='add'>+# define __ARCH_WANT_SYS_SIGNAL</div><div class='add'>+# define __ARCH_WANT_SYS_SIGPENDING</div><div class='add'>+# define __ARCH_WANT_SYS_SIGPROCMASK</div><div class='add'>+# define __ARCH_WANT_SYS_SOCKETCALL</div><div class='add'>+# define __ARCH_WANT_SYS_TIME</div><div class='add'>+# define __ARCH_WANT_SYS_UTIME</div><div class='add'>+# define __ARCH_WANT_SYS_WAITPID</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * "Conditional" syscalls</div><div class='add'>+ *</div><div class='add'>+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),</div><div class='add'>+ * but it doesn't work on all toolchains, so we just do it by hand</div><div class='add'>+ */</div><div class='add'>+# define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> # ifdef __i386__</div><div class='del'>-#  include "unistd_32.h"</div><div class='add'>+#  include &lt;asm/unistd_32.h&gt;</div><div class='ctx'> # else</div><div class='del'>-#  include "unistd_64.h"</div><div class='add'>+#  include &lt;asm/unistd_64.h&gt;</div><div class='ctx'> # endif</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_X86_UNISTD_H */</div><div class='head'>diff --git a/arch/x86/include/asm/unistd_32.h b/arch/x86/include/asm/unistd_32.h<br/>deleted file mode 100644<br/>index 599c77d38f33..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/unistd_32.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/unistd_32.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,401 +0,0 @@</div><div class='del'>-#ifndef _ASM_X86_UNISTD_32_H</div><div class='del'>-#define _ASM_X86_UNISTD_32_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This file contains the system call numbers.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define __NR_restart_syscall      0</div><div class='del'>-#define __NR_exit		  1</div><div class='del'>-#define __NR_fork		  2</div><div class='del'>-#define __NR_read		  3</div><div class='del'>-#define __NR_write		  4</div><div class='del'>-#define __NR_open		  5</div><div class='del'>-#define __NR_close		  6</div><div class='del'>-#define __NR_waitpid		  7</div><div class='del'>-#define __NR_creat		  8</div><div class='del'>-#define __NR_link		  9</div><div class='del'>-#define __NR_unlink		 10</div><div class='del'>-#define __NR_execve		 11</div><div class='del'>-#define __NR_chdir		 12</div><div class='del'>-#define __NR_time		 13</div><div class='del'>-#define __NR_mknod		 14</div><div class='del'>-#define __NR_chmod		 15</div><div class='del'>-#define __NR_lchown		 16</div><div class='del'>-#define __NR_break		 17</div><div class='del'>-#define __NR_oldstat		 18</div><div class='del'>-#define __NR_lseek		 19</div><div class='del'>-#define __NR_getpid		 20</div><div class='del'>-#define __NR_mount		 21</div><div class='del'>-#define __NR_umount		 22</div><div class='del'>-#define __NR_setuid		 23</div><div class='del'>-#define __NR_getuid		 24</div><div class='del'>-#define __NR_stime		 25</div><div class='del'>-#define __NR_ptrace		 26</div><div class='del'>-#define __NR_alarm		 27</div><div class='del'>-#define __NR_oldfstat		 28</div><div class='del'>-#define __NR_pause		 29</div><div class='del'>-#define __NR_utime		 30</div><div class='del'>-#define __NR_stty		 31</div><div class='del'>-#define __NR_gtty		 32</div><div class='del'>-#define __NR_access		 33</div><div class='del'>-#define __NR_nice		 34</div><div class='del'>-#define __NR_ftime		 35</div><div class='del'>-#define __NR_sync		 36</div><div class='del'>-#define __NR_kill		 37</div><div class='del'>-#define __NR_rename		 38</div><div class='del'>-#define __NR_mkdir		 39</div><div class='del'>-#define __NR_rmdir		 40</div><div class='del'>-#define __NR_dup		 41</div><div class='del'>-#define __NR_pipe		 42</div><div class='del'>-#define __NR_times		 43</div><div class='del'>-#define __NR_prof		 44</div><div class='del'>-#define __NR_brk		 45</div><div class='del'>-#define __NR_setgid		 46</div><div class='del'>-#define __NR_getgid		 47</div><div class='del'>-#define __NR_signal		 48</div><div class='del'>-#define __NR_geteuid		 49</div><div class='del'>-#define __NR_getegid		 50</div><div class='del'>-#define __NR_acct		 51</div><div class='del'>-#define __NR_umount2		 52</div><div class='del'>-#define __NR_lock		 53</div><div class='del'>-#define __NR_ioctl		 54</div><div class='del'>-#define __NR_fcntl		 55</div><div class='del'>-#define __NR_mpx		 56</div><div class='del'>-#define __NR_setpgid		 57</div><div class='del'>-#define __NR_ulimit		 58</div><div class='del'>-#define __NR_oldolduname	 59</div><div class='del'>-#define __NR_umask		 60</div><div class='del'>-#define __NR_chroot		 61</div><div class='del'>-#define __NR_ustat		 62</div><div class='del'>-#define __NR_dup2		 63</div><div class='del'>-#define __NR_getppid		 64</div><div class='del'>-#define __NR_getpgrp		 65</div><div class='del'>-#define __NR_setsid		 66</div><div class='del'>-#define __NR_sigaction		 67</div><div class='del'>-#define __NR_sgetmask		 68</div><div class='del'>-#define __NR_ssetmask		 69</div><div class='del'>-#define __NR_setreuid		 70</div><div class='del'>-#define __NR_setregid		 71</div><div class='del'>-#define __NR_sigsuspend		 72</div><div class='del'>-#define __NR_sigpending		 73</div><div class='del'>-#define __NR_sethostname	 74</div><div class='del'>-#define __NR_setrlimit		 75</div><div class='del'>-#define __NR_getrlimit		 76   /* Back compatible 2Gig limited rlimit */</div><div class='del'>-#define __NR_getrusage		 77</div><div class='del'>-#define __NR_gettimeofday	 78</div><div class='del'>-#define __NR_settimeofday	 79</div><div class='del'>-#define __NR_getgroups		 80</div><div class='del'>-#define __NR_setgroups		 81</div><div class='del'>-#define __NR_select		 82</div><div class='del'>-#define __NR_symlink		 83</div><div class='del'>-#define __NR_oldlstat		 84</div><div class='del'>-#define __NR_readlink		 85</div><div class='del'>-#define __NR_uselib		 86</div><div class='del'>-#define __NR_swapon		 87</div><div class='del'>-#define __NR_reboot		 88</div><div class='del'>-#define __NR_readdir		 89</div><div class='del'>-#define __NR_mmap		 90</div><div class='del'>-#define __NR_munmap		 91</div><div class='del'>-#define __NR_truncate		 92</div><div class='del'>-#define __NR_ftruncate		 93</div><div class='del'>-#define __NR_fchmod		 94</div><div class='del'>-#define __NR_fchown		 95</div><div class='del'>-#define __NR_getpriority	 96</div><div class='del'>-#define __NR_setpriority	 97</div><div class='del'>-#define __NR_profil		 98</div><div class='del'>-#define __NR_statfs		 99</div><div class='del'>-#define __NR_fstatfs		100</div><div class='del'>-#define __NR_ioperm		101</div><div class='del'>-#define __NR_socketcall		102</div><div class='del'>-#define __NR_syslog		103</div><div class='del'>-#define __NR_setitimer		104</div><div class='del'>-#define __NR_getitimer		105</div><div class='del'>-#define __NR_stat		106</div><div class='del'>-#define __NR_lstat		107</div><div class='del'>-#define __NR_fstat		108</div><div class='del'>-#define __NR_olduname		109</div><div class='del'>-#define __NR_iopl		110</div><div class='del'>-#define __NR_vhangup		111</div><div class='del'>-#define __NR_idle		112</div><div class='del'>-#define __NR_vm86old		113</div><div class='del'>-#define __NR_wait4		114</div><div class='del'>-#define __NR_swapoff		115</div><div class='del'>-#define __NR_sysinfo		116</div><div class='del'>-#define __NR_ipc		117</div><div class='del'>-#define __NR_fsync		118</div><div class='del'>-#define __NR_sigreturn		119</div><div class='del'>-#define __NR_clone		120</div><div class='del'>-#define __NR_setdomainname	121</div><div class='del'>-#define __NR_uname		122</div><div class='del'>-#define __NR_modify_ldt		123</div><div class='del'>-#define __NR_adjtimex		124</div><div class='del'>-#define __NR_mprotect		125</div><div class='del'>-#define __NR_sigprocmask	126</div><div class='del'>-#define __NR_create_module	127</div><div class='del'>-#define __NR_init_module	128</div><div class='del'>-#define __NR_delete_module	129</div><div class='del'>-#define __NR_get_kernel_syms	130</div><div class='del'>-#define __NR_quotactl		131</div><div class='del'>-#define __NR_getpgid		132</div><div class='del'>-#define __NR_fchdir		133</div><div class='del'>-#define __NR_bdflush		134</div><div class='del'>-#define __NR_sysfs		135</div><div class='del'>-#define __NR_personality	136</div><div class='del'>-#define __NR_afs_syscall	137 /* Syscall for Andrew File System */</div><div class='del'>-#define __NR_setfsuid		138</div><div class='del'>-#define __NR_setfsgid		139</div><div class='del'>-#define __NR__llseek		140</div><div class='del'>-#define __NR_getdents		141</div><div class='del'>-#define __NR__newselect		142</div><div class='del'>-#define __NR_flock		143</div><div class='del'>-#define __NR_msync		144</div><div class='del'>-#define __NR_readv		145</div><div class='del'>-#define __NR_writev		146</div><div class='del'>-#define __NR_getsid		147</div><div class='del'>-#define __NR_fdatasync		148</div><div class='del'>-#define __NR__sysctl		149</div><div class='del'>-#define __NR_mlock		150</div><div class='del'>-#define __NR_munlock		151</div><div class='del'>-#define __NR_mlockall		152</div><div class='del'>-#define __NR_munlockall		153</div><div class='del'>-#define __NR_sched_setparam		154</div><div class='del'>-#define __NR_sched_getparam		155</div><div class='del'>-#define __NR_sched_setscheduler		156</div><div class='del'>-#define __NR_sched_getscheduler		157</div><div class='del'>-#define __NR_sched_yield		158</div><div class='del'>-#define __NR_sched_get_priority_max	159</div><div class='del'>-#define __NR_sched_get_priority_min	160</div><div class='del'>-#define __NR_sched_rr_get_interval	161</div><div class='del'>-#define __NR_nanosleep		162</div><div class='del'>-#define __NR_mremap		163</div><div class='del'>-#define __NR_setresuid		164</div><div class='del'>-#define __NR_getresuid		165</div><div class='del'>-#define __NR_vm86		166</div><div class='del'>-#define __NR_query_module	167</div><div class='del'>-#define __NR_poll		168</div><div class='del'>-#define __NR_nfsservctl		169</div><div class='del'>-#define __NR_setresgid		170</div><div class='del'>-#define __NR_getresgid		171</div><div class='del'>-#define __NR_prctl              172</div><div class='del'>-#define __NR_rt_sigreturn	173</div><div class='del'>-#define __NR_rt_sigaction	174</div><div class='del'>-#define __NR_rt_sigprocmask	175</div><div class='del'>-#define __NR_rt_sigpending	176</div><div class='del'>-#define __NR_rt_sigtimedwait	177</div><div class='del'>-#define __NR_rt_sigqueueinfo	178</div><div class='del'>-#define __NR_rt_sigsuspend	179</div><div class='del'>-#define __NR_pread64		180</div><div class='del'>-#define __NR_pwrite64		181</div><div class='del'>-#define __NR_chown		182</div><div class='del'>-#define __NR_getcwd		183</div><div class='del'>-#define __NR_capget		184</div><div class='del'>-#define __NR_capset		185</div><div class='del'>-#define __NR_sigaltstack	186</div><div class='del'>-#define __NR_sendfile		187</div><div class='del'>-#define __NR_getpmsg		188	/* some people actually want streams */</div><div class='del'>-#define __NR_putpmsg		189	/* some people actually want streams */</div><div class='del'>-#define __NR_vfork		190</div><div class='del'>-#define __NR_ugetrlimit		191	/* SuS compliant getrlimit */</div><div class='del'>-#define __NR_mmap2		192</div><div class='del'>-#define __NR_truncate64		193</div><div class='del'>-#define __NR_ftruncate64	194</div><div class='del'>-#define __NR_stat64		195</div><div class='del'>-#define __NR_lstat64		196</div><div class='del'>-#define __NR_fstat64		197</div><div class='del'>-#define __NR_lchown32		198</div><div class='del'>-#define __NR_getuid32		199</div><div class='del'>-#define __NR_getgid32		200</div><div class='del'>-#define __NR_geteuid32		201</div><div class='del'>-#define __NR_getegid32		202</div><div class='del'>-#define __NR_setreuid32		203</div><div class='del'>-#define __NR_setregid32		204</div><div class='del'>-#define __NR_getgroups32	205</div><div class='del'>-#define __NR_setgroups32	206</div><div class='del'>-#define __NR_fchown32		207</div><div class='del'>-#define __NR_setresuid32	208</div><div class='del'>-#define __NR_getresuid32	209</div><div class='del'>-#define __NR_setresgid32	210</div><div class='del'>-#define __NR_getresgid32	211</div><div class='del'>-#define __NR_chown32		212</div><div class='del'>-#define __NR_setuid32		213</div><div class='del'>-#define __NR_setgid32		214</div><div class='del'>-#define __NR_setfsuid32		215</div><div class='del'>-#define __NR_setfsgid32		216</div><div class='del'>-#define __NR_pivot_root		217</div><div class='del'>-#define __NR_mincore		218</div><div class='del'>-#define __NR_madvise		219</div><div class='del'>-#define __NR_madvise1		219	/* delete when C lib stub is removed */</div><div class='del'>-#define __NR_getdents64		220</div><div class='del'>-#define __NR_fcntl64		221</div><div class='del'>-/* 223 is unused */</div><div class='del'>-#define __NR_gettid		224</div><div class='del'>-#define __NR_readahead		225</div><div class='del'>-#define __NR_setxattr		226</div><div class='del'>-#define __NR_lsetxattr		227</div><div class='del'>-#define __NR_fsetxattr		228</div><div class='del'>-#define __NR_getxattr		229</div><div class='del'>-#define __NR_lgetxattr		230</div><div class='del'>-#define __NR_fgetxattr		231</div><div class='del'>-#define __NR_listxattr		232</div><div class='del'>-#define __NR_llistxattr		233</div><div class='del'>-#define __NR_flistxattr		234</div><div class='del'>-#define __NR_removexattr	235</div><div class='del'>-#define __NR_lremovexattr	236</div><div class='del'>-#define __NR_fremovexattr	237</div><div class='del'>-#define __NR_tkill		238</div><div class='del'>-#define __NR_sendfile64		239</div><div class='del'>-#define __NR_futex		240</div><div class='del'>-#define __NR_sched_setaffinity	241</div><div class='del'>-#define __NR_sched_getaffinity	242</div><div class='del'>-#define __NR_set_thread_area	243</div><div class='del'>-#define __NR_get_thread_area	244</div><div class='del'>-#define __NR_io_setup		245</div><div class='del'>-#define __NR_io_destroy		246</div><div class='del'>-#define __NR_io_getevents	247</div><div class='del'>-#define __NR_io_submit		248</div><div class='del'>-#define __NR_io_cancel		249</div><div class='del'>-#define __NR_fadvise64		250</div><div class='del'>-/* 251 is available for reuse (was briefly sys_set_zone_reclaim) */</div><div class='del'>-#define __NR_exit_group		252</div><div class='del'>-#define __NR_lookup_dcookie	253</div><div class='del'>-#define __NR_epoll_create	254</div><div class='del'>-#define __NR_epoll_ctl		255</div><div class='del'>-#define __NR_epoll_wait		256</div><div class='del'>-#define __NR_remap_file_pages	257</div><div class='del'>-#define __NR_set_tid_address	258</div><div class='del'>-#define __NR_timer_create	259</div><div class='del'>-#define __NR_timer_settime	(__NR_timer_create+1)</div><div class='del'>-#define __NR_timer_gettime	(__NR_timer_create+2)</div><div class='del'>-#define __NR_timer_getoverrun	(__NR_timer_create+3)</div><div class='del'>-#define __NR_timer_delete	(__NR_timer_create+4)</div><div class='del'>-#define __NR_clock_settime	(__NR_timer_create+5)</div><div class='del'>-#define __NR_clock_gettime	(__NR_timer_create+6)</div><div class='del'>-#define __NR_clock_getres	(__NR_timer_create+7)</div><div class='del'>-#define __NR_clock_nanosleep	(__NR_timer_create+8)</div><div class='del'>-#define __NR_statfs64		268</div><div class='del'>-#define __NR_fstatfs64		269</div><div class='del'>-#define __NR_tgkill		270</div><div class='del'>-#define __NR_utimes		271</div><div class='del'>-#define __NR_fadvise64_64	272</div><div class='del'>-#define __NR_vserver		273</div><div class='del'>-#define __NR_mbind		274</div><div class='del'>-#define __NR_get_mempolicy	275</div><div class='del'>-#define __NR_set_mempolicy	276</div><div class='del'>-#define __NR_mq_open 		277</div><div class='del'>-#define __NR_mq_unlink		(__NR_mq_open+1)</div><div class='del'>-#define __NR_mq_timedsend	(__NR_mq_open+2)</div><div class='del'>-#define __NR_mq_timedreceive	(__NR_mq_open+3)</div><div class='del'>-#define __NR_mq_notify		(__NR_mq_open+4)</div><div class='del'>-#define __NR_mq_getsetattr	(__NR_mq_open+5)</div><div class='del'>-#define __NR_kexec_load		283</div><div class='del'>-#define __NR_waitid		284</div><div class='del'>-/* #define __NR_sys_setaltroot	285 */</div><div class='del'>-#define __NR_add_key		286</div><div class='del'>-#define __NR_request_key	287</div><div class='del'>-#define __NR_keyctl		288</div><div class='del'>-#define __NR_ioprio_set		289</div><div class='del'>-#define __NR_ioprio_get		290</div><div class='del'>-#define __NR_inotify_init	291</div><div class='del'>-#define __NR_inotify_add_watch	292</div><div class='del'>-#define __NR_inotify_rm_watch	293</div><div class='del'>-#define __NR_migrate_pages	294</div><div class='del'>-#define __NR_openat		295</div><div class='del'>-#define __NR_mkdirat		296</div><div class='del'>-#define __NR_mknodat		297</div><div class='del'>-#define __NR_fchownat		298</div><div class='del'>-#define __NR_futimesat		299</div><div class='del'>-#define __NR_fstatat64		300</div><div class='del'>-#define __NR_unlinkat		301</div><div class='del'>-#define __NR_renameat		302</div><div class='del'>-#define __NR_linkat		303</div><div class='del'>-#define __NR_symlinkat		304</div><div class='del'>-#define __NR_readlinkat		305</div><div class='del'>-#define __NR_fchmodat		306</div><div class='del'>-#define __NR_faccessat		307</div><div class='del'>-#define __NR_pselect6		308</div><div class='del'>-#define __NR_ppoll		309</div><div class='del'>-#define __NR_unshare		310</div><div class='del'>-#define __NR_set_robust_list	311</div><div class='del'>-#define __NR_get_robust_list	312</div><div class='del'>-#define __NR_splice		313</div><div class='del'>-#define __NR_sync_file_range	314</div><div class='del'>-#define __NR_tee		315</div><div class='del'>-#define __NR_vmsplice		316</div><div class='del'>-#define __NR_move_pages		317</div><div class='del'>-#define __NR_getcpu		318</div><div class='del'>-#define __NR_epoll_pwait	319</div><div class='del'>-#define __NR_utimensat		320</div><div class='del'>-#define __NR_signalfd		321</div><div class='del'>-#define __NR_timerfd_create	322</div><div class='del'>-#define __NR_eventfd		323</div><div class='del'>-#define __NR_fallocate		324</div><div class='del'>-#define __NR_timerfd_settime	325</div><div class='del'>-#define __NR_timerfd_gettime	326</div><div class='del'>-#define __NR_signalfd4		327</div><div class='del'>-#define __NR_eventfd2		328</div><div class='del'>-#define __NR_epoll_create1	329</div><div class='del'>-#define __NR_dup3		330</div><div class='del'>-#define __NR_pipe2		331</div><div class='del'>-#define __NR_inotify_init1	332</div><div class='del'>-#define __NR_preadv		333</div><div class='del'>-#define __NR_pwritev		334</div><div class='del'>-#define __NR_rt_tgsigqueueinfo	335</div><div class='del'>-#define __NR_perf_event_open	336</div><div class='del'>-#define __NR_recvmmsg		337</div><div class='del'>-#define __NR_fanotify_init	338</div><div class='del'>-#define __NR_fanotify_mark	339</div><div class='del'>-#define __NR_prlimit64		340</div><div class='del'>-#define __NR_name_to_handle_at	341</div><div class='del'>-#define __NR_open_by_handle_at  342</div><div class='del'>-#define __NR_clock_adjtime	343</div><div class='del'>-#define __NR_syncfs             344</div><div class='del'>-#define __NR_sendmmsg		345</div><div class='del'>-#define __NR_setns		346</div><div class='del'>-#define __NR_process_vm_readv	347</div><div class='del'>-#define __NR_process_vm_writev	348</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-</div><div class='del'>-#define NR_syscalls 349</div><div class='del'>-</div><div class='del'>-#define __ARCH_WANT_IPC_PARSE_VERSION</div><div class='del'>-#define __ARCH_WANT_OLD_READDIR</div><div class='del'>-#define __ARCH_WANT_OLD_STAT</div><div class='del'>-#define __ARCH_WANT_STAT64</div><div class='del'>-#define __ARCH_WANT_SYS_ALARM</div><div class='del'>-#define __ARCH_WANT_SYS_GETHOSTNAME</div><div class='del'>-#define __ARCH_WANT_SYS_IPC</div><div class='del'>-#define __ARCH_WANT_SYS_PAUSE</div><div class='del'>-#define __ARCH_WANT_SYS_SGETMASK</div><div class='del'>-#define __ARCH_WANT_SYS_SIGNAL</div><div class='del'>-#define __ARCH_WANT_SYS_TIME</div><div class='del'>-#define __ARCH_WANT_SYS_UTIME</div><div class='del'>-#define __ARCH_WANT_SYS_WAITPID</div><div class='del'>-#define __ARCH_WANT_SYS_SOCKETCALL</div><div class='del'>-#define __ARCH_WANT_SYS_FADVISE64</div><div class='del'>-#define __ARCH_WANT_SYS_GETPGRP</div><div class='del'>-#define __ARCH_WANT_SYS_LLSEEK</div><div class='del'>-#define __ARCH_WANT_SYS_NICE</div><div class='del'>-#define __ARCH_WANT_SYS_OLD_GETRLIMIT</div><div class='del'>-#define __ARCH_WANT_SYS_OLD_UNAME</div><div class='del'>-#define __ARCH_WANT_SYS_OLD_MMAP</div><div class='del'>-#define __ARCH_WANT_SYS_OLD_SELECT</div><div class='del'>-#define __ARCH_WANT_SYS_OLDUMOUNT</div><div class='del'>-#define __ARCH_WANT_SYS_SIGPENDING</div><div class='del'>-#define __ARCH_WANT_SYS_SIGPROCMASK</div><div class='del'>-#define __ARCH_WANT_SYS_RT_SIGACTION</div><div class='del'>-#define __ARCH_WANT_SYS_RT_SIGSUSPEND</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * "Conditional" syscalls</div><div class='del'>- *</div><div class='del'>- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),</div><div class='del'>- * but it doesn't work on all toolchains, so we just do it by hand</div><div class='del'>- */</div><div class='del'>-#ifndef cond_syscall</div><div class='del'>-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* __KERNEL__ */</div><div class='del'>-#endif /* _ASM_X86_UNISTD_32_H */</div><div class='head'>diff --git a/arch/x86/include/asm/unistd_64.h b/arch/x86/include/asm/unistd_64.h<br/>deleted file mode 100644<br/>index 0431f193c3f2..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/unistd_64.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/unistd_64.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,732 +0,0 @@</div><div class='del'>-#ifndef _ASM_X86_UNISTD_64_H</div><div class='del'>-#define _ASM_X86_UNISTD_64_H</div><div class='del'>-</div><div class='del'>-#ifndef __SYSCALL</div><div class='del'>-#define __SYSCALL(a, b)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This file contains the system call numbers.</div><div class='del'>- *</div><div class='del'>- * Note: holes are not allowed.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* at least 8 syscall per cacheline */</div><div class='del'>-#define __NR_read				0</div><div class='del'>-__SYSCALL(__NR_read, sys_read)</div><div class='del'>-#define __NR_write				1</div><div class='del'>-__SYSCALL(__NR_write, sys_write)</div><div class='del'>-#define __NR_open				2</div><div class='del'>-__SYSCALL(__NR_open, sys_open)</div><div class='del'>-#define __NR_close				3</div><div class='del'>-__SYSCALL(__NR_close, sys_close)</div><div class='del'>-#define __NR_stat				4</div><div class='del'>-__SYSCALL(__NR_stat, sys_newstat)</div><div class='del'>-#define __NR_fstat				5</div><div class='del'>-__SYSCALL(__NR_fstat, sys_newfstat)</div><div class='del'>-#define __NR_lstat				6</div><div class='del'>-__SYSCALL(__NR_lstat, sys_newlstat)</div><div class='del'>-#define __NR_poll				7</div><div class='del'>-__SYSCALL(__NR_poll, sys_poll)</div><div class='del'>-</div><div class='del'>-#define __NR_lseek				8</div><div class='del'>-__SYSCALL(__NR_lseek, sys_lseek)</div><div class='del'>-#define __NR_mmap				9</div><div class='del'>-__SYSCALL(__NR_mmap, sys_mmap)</div><div class='del'>-#define __NR_mprotect				10</div><div class='del'>-__SYSCALL(__NR_mprotect, sys_mprotect)</div><div class='del'>-#define __NR_munmap				11</div><div class='del'>-__SYSCALL(__NR_munmap, sys_munmap)</div><div class='del'>-#define __NR_brk				12</div><div class='del'>-__SYSCALL(__NR_brk, sys_brk)</div><div class='del'>-#define __NR_rt_sigaction			13</div><div class='del'>-__SYSCALL(__NR_rt_sigaction, sys_rt_sigaction)</div><div class='del'>-#define __NR_rt_sigprocmask			14</div><div class='del'>-__SYSCALL(__NR_rt_sigprocmask, sys_rt_sigprocmask)</div><div class='del'>-#define __NR_rt_sigreturn			15</div><div class='del'>-__SYSCALL(__NR_rt_sigreturn, stub_rt_sigreturn)</div><div class='del'>-</div><div class='del'>-#define __NR_ioctl				16</div><div class='del'>-__SYSCALL(__NR_ioctl, sys_ioctl)</div><div class='del'>-#define __NR_pread64				17</div><div class='del'>-__SYSCALL(__NR_pread64, sys_pread64)</div><div class='del'>-#define __NR_pwrite64				18</div><div class='del'>-__SYSCALL(__NR_pwrite64, sys_pwrite64)</div><div class='del'>-#define __NR_readv				19</div><div class='del'>-__SYSCALL(__NR_readv, sys_readv)</div><div class='del'>-#define __NR_writev				20</div><div class='del'>-__SYSCALL(__NR_writev, sys_writev)</div><div class='del'>-#define __NR_access				21</div><div class='del'>-__SYSCALL(__NR_access, sys_access)</div><div class='del'>-#define __NR_pipe				22</div><div class='del'>-__SYSCALL(__NR_pipe, sys_pipe)</div><div class='del'>-#define __NR_select				23</div><div class='del'>-__SYSCALL(__NR_select, sys_select)</div><div class='del'>-</div><div class='del'>-#define __NR_sched_yield			24</div><div class='del'>-__SYSCALL(__NR_sched_yield, sys_sched_yield)</div><div class='del'>-#define __NR_mremap				25</div><div class='del'>-__SYSCALL(__NR_mremap, sys_mremap)</div><div class='del'>-#define __NR_msync				26</div><div class='del'>-__SYSCALL(__NR_msync, sys_msync)</div><div class='del'>-#define __NR_mincore				27</div><div class='del'>-__SYSCALL(__NR_mincore, sys_mincore)</div><div class='del'>-#define __NR_madvise				28</div><div class='del'>-__SYSCALL(__NR_madvise, sys_madvise)</div><div class='del'>-#define __NR_shmget				29</div><div class='del'>-__SYSCALL(__NR_shmget, sys_shmget)</div><div class='del'>-#define __NR_shmat				30</div><div class='del'>-__SYSCALL(__NR_shmat, sys_shmat)</div><div class='del'>-#define __NR_shmctl				31</div><div class='del'>-__SYSCALL(__NR_shmctl, sys_shmctl)</div><div class='del'>-</div><div class='del'>-#define __NR_dup				32</div><div class='del'>-__SYSCALL(__NR_dup, sys_dup)</div><div class='del'>-#define __NR_dup2				33</div><div class='del'>-__SYSCALL(__NR_dup2, sys_dup2)</div><div class='del'>-#define __NR_pause				34</div><div class='del'>-__SYSCALL(__NR_pause, sys_pause)</div><div class='del'>-#define __NR_nanosleep				35</div><div class='del'>-__SYSCALL(__NR_nanosleep, sys_nanosleep)</div><div class='del'>-#define __NR_getitimer				36</div><div class='del'>-__SYSCALL(__NR_getitimer, sys_getitimer)</div><div class='del'>-#define __NR_alarm				37</div><div class='del'>-__SYSCALL(__NR_alarm, sys_alarm)</div><div class='del'>-#define __NR_setitimer				38</div><div class='del'>-__SYSCALL(__NR_setitimer, sys_setitimer)</div><div class='del'>-#define __NR_getpid				39</div><div class='del'>-__SYSCALL(__NR_getpid, sys_getpid)</div><div class='del'>-</div><div class='del'>-#define __NR_sendfile				40</div><div class='del'>-__SYSCALL(__NR_sendfile, sys_sendfile64)</div><div class='del'>-#define __NR_socket				41</div><div class='del'>-__SYSCALL(__NR_socket, sys_socket)</div><div class='del'>-#define __NR_connect				42</div><div class='del'>-__SYSCALL(__NR_connect, sys_connect)</div><div class='del'>-#define __NR_accept				43</div><div class='del'>-__SYSCALL(__NR_accept, sys_accept)</div><div class='del'>-#define __NR_sendto				44</div><div class='del'>-__SYSCALL(__NR_sendto, sys_sendto)</div><div class='del'>-#define __NR_recvfrom				45</div><div class='del'>-__SYSCALL(__NR_recvfrom, sys_recvfrom)</div><div class='del'>-#define __NR_sendmsg				46</div><div class='del'>-__SYSCALL(__NR_sendmsg, sys_sendmsg)</div><div class='del'>-#define __NR_recvmsg				47</div><div class='del'>-__SYSCALL(__NR_recvmsg, sys_recvmsg)</div><div class='del'>-</div><div class='del'>-#define __NR_shutdown				48</div><div class='del'>-__SYSCALL(__NR_shutdown, sys_shutdown)</div><div class='del'>-#define __NR_bind				49</div><div class='del'>-__SYSCALL(__NR_bind, sys_bind)</div><div class='del'>-#define __NR_listen				50</div><div class='del'>-__SYSCALL(__NR_listen, sys_listen)</div><div class='del'>-#define __NR_getsockname			51</div><div class='del'>-__SYSCALL(__NR_getsockname, sys_getsockname)</div><div class='del'>-#define __NR_getpeername			52</div><div class='del'>-__SYSCALL(__NR_getpeername, sys_getpeername)</div><div class='del'>-#define __NR_socketpair				53</div><div class='del'>-__SYSCALL(__NR_socketpair, sys_socketpair)</div><div class='del'>-#define __NR_setsockopt				54</div><div class='del'>-__SYSCALL(__NR_setsockopt, sys_setsockopt)</div><div class='del'>-#define __NR_getsockopt				55</div><div class='del'>-__SYSCALL(__NR_getsockopt, sys_getsockopt)</div><div class='del'>-</div><div class='del'>-#define __NR_clone				56</div><div class='del'>-__SYSCALL(__NR_clone, stub_clone)</div><div class='del'>-#define __NR_fork				57</div><div class='del'>-__SYSCALL(__NR_fork, stub_fork)</div><div class='del'>-#define __NR_vfork				58</div><div class='del'>-__SYSCALL(__NR_vfork, stub_vfork)</div><div class='del'>-#define __NR_execve				59</div><div class='del'>-__SYSCALL(__NR_execve, stub_execve)</div><div class='del'>-#define __NR_exit				60</div><div class='del'>-__SYSCALL(__NR_exit, sys_exit)</div><div class='del'>-#define __NR_wait4				61</div><div class='del'>-__SYSCALL(__NR_wait4, sys_wait4)</div><div class='del'>-#define __NR_kill				62</div><div class='del'>-__SYSCALL(__NR_kill, sys_kill)</div><div class='del'>-#define __NR_uname				63</div><div class='del'>-__SYSCALL(__NR_uname, sys_newuname)</div><div class='del'>-</div><div class='del'>-#define __NR_semget				64</div><div class='del'>-__SYSCALL(__NR_semget, sys_semget)</div><div class='del'>-#define __NR_semop				65</div><div class='del'>-__SYSCALL(__NR_semop, sys_semop)</div><div class='del'>-#define __NR_semctl				66</div><div class='del'>-__SYSCALL(__NR_semctl, sys_semctl)</div><div class='del'>-#define __NR_shmdt				67</div><div class='del'>-__SYSCALL(__NR_shmdt, sys_shmdt)</div><div class='del'>-#define __NR_msgget				68</div><div class='del'>-__SYSCALL(__NR_msgget, sys_msgget)</div><div class='del'>-#define __NR_msgsnd				69</div><div class='del'>-__SYSCALL(__NR_msgsnd, sys_msgsnd)</div><div class='del'>-#define __NR_msgrcv				70</div><div class='del'>-__SYSCALL(__NR_msgrcv, sys_msgrcv)</div><div class='del'>-#define __NR_msgctl				71</div><div class='del'>-__SYSCALL(__NR_msgctl, sys_msgctl)</div><div class='del'>-</div><div class='del'>-#define __NR_fcntl				72</div><div class='del'>-__SYSCALL(__NR_fcntl, sys_fcntl)</div><div class='del'>-#define __NR_flock				73</div><div class='del'>-__SYSCALL(__NR_flock, sys_flock)</div><div class='del'>-#define __NR_fsync				74</div><div class='del'>-__SYSCALL(__NR_fsync, sys_fsync)</div><div class='del'>-#define __NR_fdatasync				75</div><div class='del'>-__SYSCALL(__NR_fdatasync, sys_fdatasync)</div><div class='del'>-#define __NR_truncate				76</div><div class='del'>-__SYSCALL(__NR_truncate, sys_truncate)</div><div class='del'>-#define __NR_ftruncate				77</div><div class='del'>-__SYSCALL(__NR_ftruncate, sys_ftruncate)</div><div class='del'>-#define __NR_getdents				78</div><div class='del'>-__SYSCALL(__NR_getdents, sys_getdents)</div><div class='del'>-#define __NR_getcwd				79</div><div class='del'>-__SYSCALL(__NR_getcwd, sys_getcwd)</div><div class='del'>-</div><div class='del'>-#define __NR_chdir				80</div><div class='del'>-__SYSCALL(__NR_chdir, sys_chdir)</div><div class='del'>-#define __NR_fchdir				81</div><div class='del'>-__SYSCALL(__NR_fchdir, sys_fchdir)</div><div class='del'>-#define __NR_rename				82</div><div class='del'>-__SYSCALL(__NR_rename, sys_rename)</div><div class='del'>-#define __NR_mkdir				83</div><div class='del'>-__SYSCALL(__NR_mkdir, sys_mkdir)</div><div class='del'>-#define __NR_rmdir				84</div><div class='del'>-__SYSCALL(__NR_rmdir, sys_rmdir)</div><div class='del'>-#define __NR_creat				85</div><div class='del'>-__SYSCALL(__NR_creat, sys_creat)</div><div class='del'>-#define __NR_link				86</div><div class='del'>-__SYSCALL(__NR_link, sys_link)</div><div class='del'>-#define __NR_unlink				87</div><div class='del'>-__SYSCALL(__NR_unlink, sys_unlink)</div><div class='del'>-</div><div class='del'>-#define __NR_symlink				88</div><div class='del'>-__SYSCALL(__NR_symlink, sys_symlink)</div><div class='del'>-#define __NR_readlink				89</div><div class='del'>-__SYSCALL(__NR_readlink, sys_readlink)</div><div class='del'>-#define __NR_chmod				90</div><div class='del'>-__SYSCALL(__NR_chmod, sys_chmod)</div><div class='del'>-#define __NR_fchmod				91</div><div class='del'>-__SYSCALL(__NR_fchmod, sys_fchmod)</div><div class='del'>-#define __NR_chown				92</div><div class='del'>-__SYSCALL(__NR_chown, sys_chown)</div><div class='del'>-#define __NR_fchown				93</div><div class='del'>-__SYSCALL(__NR_fchown, sys_fchown)</div><div class='del'>-#define __NR_lchown				94</div><div class='del'>-__SYSCALL(__NR_lchown, sys_lchown)</div><div class='del'>-#define __NR_umask				95</div><div class='del'>-__SYSCALL(__NR_umask, sys_umask)</div><div class='del'>-</div><div class='del'>-#define __NR_gettimeofday			96</div><div class='del'>-__SYSCALL(__NR_gettimeofday, sys_gettimeofday)</div><div class='del'>-#define __NR_getrlimit				97</div><div class='del'>-__SYSCALL(__NR_getrlimit, sys_getrlimit)</div><div class='del'>-#define __NR_getrusage				98</div><div class='del'>-__SYSCALL(__NR_getrusage, sys_getrusage)</div><div class='del'>-#define __NR_sysinfo				99</div><div class='del'>-__SYSCALL(__NR_sysinfo, sys_sysinfo)</div><div class='del'>-#define __NR_times				100</div><div class='del'>-__SYSCALL(__NR_times, sys_times)</div><div class='del'>-#define __NR_ptrace				101</div><div class='del'>-__SYSCALL(__NR_ptrace, sys_ptrace)</div><div class='del'>-#define __NR_getuid				102</div><div class='del'>-__SYSCALL(__NR_getuid, sys_getuid)</div><div class='del'>-#define __NR_syslog				103</div><div class='del'>-__SYSCALL(__NR_syslog, sys_syslog)</div><div class='del'>-</div><div class='del'>-/* at the very end the stuff that never runs during the benchmarks */</div><div class='del'>-#define __NR_getgid				104</div><div class='del'>-__SYSCALL(__NR_getgid, sys_getgid)</div><div class='del'>-#define __NR_setuid				105</div><div class='del'>-__SYSCALL(__NR_setuid, sys_setuid)</div><div class='del'>-#define __NR_setgid				106</div><div class='del'>-__SYSCALL(__NR_setgid, sys_setgid)</div><div class='del'>-#define __NR_geteuid				107</div><div class='del'>-__SYSCALL(__NR_geteuid, sys_geteuid)</div><div class='del'>-#define __NR_getegid				108</div><div class='del'>-__SYSCALL(__NR_getegid, sys_getegid)</div><div class='del'>-#define __NR_setpgid				109</div><div class='del'>-__SYSCALL(__NR_setpgid, sys_setpgid)</div><div class='del'>-#define __NR_getppid				110</div><div class='del'>-__SYSCALL(__NR_getppid, sys_getppid)</div><div class='del'>-#define __NR_getpgrp				111</div><div class='del'>-__SYSCALL(__NR_getpgrp, sys_getpgrp)</div><div class='del'>-</div><div class='del'>-#define __NR_setsid				112</div><div class='del'>-__SYSCALL(__NR_setsid, sys_setsid)</div><div class='del'>-#define __NR_setreuid				113</div><div class='del'>-__SYSCALL(__NR_setreuid, sys_setreuid)</div><div class='del'>-#define __NR_setregid				114</div><div class='del'>-__SYSCALL(__NR_setregid, sys_setregid)</div><div class='del'>-#define __NR_getgroups				115</div><div class='del'>-__SYSCALL(__NR_getgroups, sys_getgroups)</div><div class='del'>-#define __NR_setgroups				116</div><div class='del'>-__SYSCALL(__NR_setgroups, sys_setgroups)</div><div class='del'>-#define __NR_setresuid				117</div><div class='del'>-__SYSCALL(__NR_setresuid, sys_setresuid)</div><div class='del'>-#define __NR_getresuid				118</div><div class='del'>-__SYSCALL(__NR_getresuid, sys_getresuid)</div><div class='del'>-#define __NR_setresgid				119</div><div class='del'>-__SYSCALL(__NR_setresgid, sys_setresgid)</div><div class='del'>-</div><div class='del'>-#define __NR_getresgid				120</div><div class='del'>-__SYSCALL(__NR_getresgid, sys_getresgid)</div><div class='del'>-#define __NR_getpgid				121</div><div class='del'>-__SYSCALL(__NR_getpgid, sys_getpgid)</div><div class='del'>-#define __NR_setfsuid				122</div><div class='del'>-__SYSCALL(__NR_setfsuid, sys_setfsuid)</div><div class='del'>-#define __NR_setfsgid				123</div><div class='del'>-__SYSCALL(__NR_setfsgid, sys_setfsgid)</div><div class='del'>-#define __NR_getsid				124</div><div class='del'>-__SYSCALL(__NR_getsid, sys_getsid)</div><div class='del'>-#define __NR_capget				125</div><div class='del'>-__SYSCALL(__NR_capget, sys_capget)</div><div class='del'>-#define __NR_capset				126</div><div class='del'>-__SYSCALL(__NR_capset, sys_capset)</div><div class='del'>-</div><div class='del'>-#define __NR_rt_sigpending			127</div><div class='del'>-__SYSCALL(__NR_rt_sigpending, sys_rt_sigpending)</div><div class='del'>-#define __NR_rt_sigtimedwait			128</div><div class='del'>-__SYSCALL(__NR_rt_sigtimedwait, sys_rt_sigtimedwait)</div><div class='del'>-#define __NR_rt_sigqueueinfo			129</div><div class='del'>-__SYSCALL(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo)</div><div class='del'>-#define __NR_rt_sigsuspend			130</div><div class='del'>-__SYSCALL(__NR_rt_sigsuspend, sys_rt_sigsuspend)</div><div class='del'>-#define __NR_sigaltstack			131</div><div class='del'>-__SYSCALL(__NR_sigaltstack, stub_sigaltstack)</div><div class='del'>-#define __NR_utime				132</div><div class='del'>-__SYSCALL(__NR_utime, sys_utime)</div><div class='del'>-#define __NR_mknod				133</div><div class='del'>-__SYSCALL(__NR_mknod, sys_mknod)</div><div class='del'>-</div><div class='del'>-/* Only needed for a.out */</div><div class='del'>-#define __NR_uselib				134</div><div class='del'>-__SYSCALL(__NR_uselib, sys_ni_syscall)</div><div class='del'>-#define __NR_personality			135</div><div class='del'>-__SYSCALL(__NR_personality, sys_personality)</div><div class='del'>-</div><div class='del'>-#define __NR_ustat				136</div><div class='del'>-__SYSCALL(__NR_ustat, sys_ustat)</div><div class='del'>-#define __NR_statfs				137</div><div class='del'>-__SYSCALL(__NR_statfs, sys_statfs)</div><div class='del'>-#define __NR_fstatfs				138</div><div class='del'>-__SYSCALL(__NR_fstatfs, sys_fstatfs)</div><div class='del'>-#define __NR_sysfs				139</div><div class='del'>-__SYSCALL(__NR_sysfs, sys_sysfs)</div><div class='del'>-</div><div class='del'>-#define __NR_getpriority			140</div><div class='del'>-__SYSCALL(__NR_getpriority, sys_getpriority)</div><div class='del'>-#define __NR_setpriority			141</div><div class='del'>-__SYSCALL(__NR_setpriority, sys_setpriority)</div><div class='del'>-#define __NR_sched_setparam			142</div><div class='del'>-__SYSCALL(__NR_sched_setparam, sys_sched_setparam)</div><div class='del'>-#define __NR_sched_getparam			143</div><div class='del'>-__SYSCALL(__NR_sched_getparam, sys_sched_getparam)</div><div class='del'>-#define __NR_sched_setscheduler			144</div><div class='del'>-__SYSCALL(__NR_sched_setscheduler, sys_sched_setscheduler)</div><div class='del'>-#define __NR_sched_getscheduler			145</div><div class='del'>-__SYSCALL(__NR_sched_getscheduler, sys_sched_getscheduler)</div><div class='del'>-#define __NR_sched_get_priority_max		146</div><div class='del'>-__SYSCALL(__NR_sched_get_priority_max, sys_sched_get_priority_max)</div><div class='del'>-#define __NR_sched_get_priority_min		147</div><div class='del'>-__SYSCALL(__NR_sched_get_priority_min, sys_sched_get_priority_min)</div><div class='del'>-#define __NR_sched_rr_get_interval		148</div><div class='del'>-__SYSCALL(__NR_sched_rr_get_interval, sys_sched_rr_get_interval)</div><div class='del'>-</div><div class='del'>-#define __NR_mlock				149</div><div class='del'>-__SYSCALL(__NR_mlock, sys_mlock)</div><div class='del'>-#define __NR_munlock				150</div><div class='del'>-__SYSCALL(__NR_munlock, sys_munlock)</div><div class='del'>-#define __NR_mlockall				151</div><div class='del'>-__SYSCALL(__NR_mlockall, sys_mlockall)</div><div class='del'>-#define __NR_munlockall				152</div><div class='del'>-__SYSCALL(__NR_munlockall, sys_munlockall)</div><div class='del'>-</div><div class='del'>-#define __NR_vhangup				153</div><div class='del'>-__SYSCALL(__NR_vhangup, sys_vhangup)</div><div class='del'>-</div><div class='del'>-#define __NR_modify_ldt				154</div><div class='del'>-__SYSCALL(__NR_modify_ldt, sys_modify_ldt)</div><div class='del'>-</div><div class='del'>-#define __NR_pivot_root				155</div><div class='del'>-__SYSCALL(__NR_pivot_root, sys_pivot_root)</div><div class='del'>-</div><div class='del'>-#define __NR__sysctl				156</div><div class='del'>-__SYSCALL(__NR__sysctl, sys_sysctl)</div><div class='del'>-</div><div class='del'>-#define __NR_prctl				157</div><div class='del'>-__SYSCALL(__NR_prctl, sys_prctl)</div><div class='del'>-#define __NR_arch_prctl				158</div><div class='del'>-__SYSCALL(__NR_arch_prctl, sys_arch_prctl)</div><div class='del'>-</div><div class='del'>-#define __NR_adjtimex				159</div><div class='del'>-__SYSCALL(__NR_adjtimex, sys_adjtimex)</div><div class='del'>-</div><div class='del'>-#define __NR_setrlimit				160</div><div class='del'>-__SYSCALL(__NR_setrlimit, sys_setrlimit)</div><div class='del'>-</div><div class='del'>-#define __NR_chroot				161</div><div class='del'>-__SYSCALL(__NR_chroot, sys_chroot)</div><div class='del'>-</div><div class='del'>-#define __NR_sync				162</div><div class='del'>-__SYSCALL(__NR_sync, sys_sync)</div><div class='del'>-</div><div class='del'>-#define __NR_acct				163</div><div class='del'>-__SYSCALL(__NR_acct, sys_acct)</div><div class='del'>-</div><div class='del'>-#define __NR_settimeofday			164</div><div class='del'>-__SYSCALL(__NR_settimeofday, sys_settimeofday)</div><div class='del'>-</div><div class='del'>-#define __NR_mount				165</div><div class='del'>-__SYSCALL(__NR_mount, sys_mount)</div><div class='del'>-#define __NR_umount2				166</div><div class='del'>-__SYSCALL(__NR_umount2, sys_umount)</div><div class='del'>-</div><div class='del'>-#define __NR_swapon				167</div><div class='del'>-__SYSCALL(__NR_swapon, sys_swapon)</div><div class='del'>-#define __NR_swapoff				168</div><div class='del'>-__SYSCALL(__NR_swapoff, sys_swapoff)</div><div class='del'>-</div><div class='del'>-#define __NR_reboot				169</div><div class='del'>-__SYSCALL(__NR_reboot, sys_reboot)</div><div class='del'>-</div><div class='del'>-#define __NR_sethostname			170</div><div class='del'>-__SYSCALL(__NR_sethostname, sys_sethostname)</div><div class='del'>-#define __NR_setdomainname			171</div><div class='del'>-__SYSCALL(__NR_setdomainname, sys_setdomainname)</div><div class='del'>-</div><div class='del'>-#define __NR_iopl				172</div><div class='del'>-__SYSCALL(__NR_iopl, stub_iopl)</div><div class='del'>-#define __NR_ioperm				173</div><div class='del'>-__SYSCALL(__NR_ioperm, sys_ioperm)</div><div class='del'>-</div><div class='del'>-#define __NR_create_module			174</div><div class='del'>-__SYSCALL(__NR_create_module, sys_ni_syscall)</div><div class='del'>-#define __NR_init_module			175</div><div class='del'>-__SYSCALL(__NR_init_module, sys_init_module)</div><div class='del'>-#define __NR_delete_module			176</div><div class='del'>-__SYSCALL(__NR_delete_module, sys_delete_module)</div><div class='del'>-#define __NR_get_kernel_syms			177</div><div class='del'>-__SYSCALL(__NR_get_kernel_syms, sys_ni_syscall)</div><div class='del'>-#define __NR_query_module			178</div><div class='del'>-__SYSCALL(__NR_query_module, sys_ni_syscall)</div><div class='del'>-</div><div class='del'>-#define __NR_quotactl				179</div><div class='del'>-__SYSCALL(__NR_quotactl, sys_quotactl)</div><div class='del'>-</div><div class='del'>-#define __NR_nfsservctl				180</div><div class='del'>-__SYSCALL(__NR_nfsservctl, sys_ni_syscall)</div><div class='del'>-</div><div class='del'>-/* reserved for LiS/STREAMS */</div><div class='del'>-#define __NR_getpmsg				181</div><div class='del'>-__SYSCALL(__NR_getpmsg, sys_ni_syscall)</div><div class='del'>-#define __NR_putpmsg				182</div><div class='del'>-__SYSCALL(__NR_putpmsg, sys_ni_syscall)</div><div class='del'>-</div><div class='del'>-/* reserved for AFS */</div><div class='del'>-#define __NR_afs_syscall			183</div><div class='del'>-__SYSCALL(__NR_afs_syscall, sys_ni_syscall)</div><div class='del'>-</div><div class='del'>-/* reserved for tux */</div><div class='del'>-#define __NR_tuxcall				184</div><div class='del'>-__SYSCALL(__NR_tuxcall, sys_ni_syscall)</div><div class='del'>-</div><div class='del'>-#define __NR_security				185</div><div class='del'>-__SYSCALL(__NR_security, sys_ni_syscall)</div><div class='del'>-</div><div class='del'>-#define __NR_gettid				186</div><div class='del'>-__SYSCALL(__NR_gettid, sys_gettid)</div><div class='del'>-</div><div class='del'>-#define __NR_readahead				187</div><div class='del'>-__SYSCALL(__NR_readahead, sys_readahead)</div><div class='del'>-#define __NR_setxattr				188</div><div class='del'>-__SYSCALL(__NR_setxattr, sys_setxattr)</div><div class='del'>-#define __NR_lsetxattr				189</div><div class='del'>-__SYSCALL(__NR_lsetxattr, sys_lsetxattr)</div><div class='del'>-#define __NR_fsetxattr				190</div><div class='del'>-__SYSCALL(__NR_fsetxattr, sys_fsetxattr)</div><div class='del'>-#define __NR_getxattr				191</div><div class='del'>-__SYSCALL(__NR_getxattr, sys_getxattr)</div><div class='del'>-#define __NR_lgetxattr				192</div><div class='del'>-__SYSCALL(__NR_lgetxattr, sys_lgetxattr)</div><div class='del'>-#define __NR_fgetxattr				193</div><div class='del'>-__SYSCALL(__NR_fgetxattr, sys_fgetxattr)</div><div class='del'>-#define __NR_listxattr				194</div><div class='del'>-__SYSCALL(__NR_listxattr, sys_listxattr)</div><div class='del'>-#define __NR_llistxattr				195</div><div class='del'>-__SYSCALL(__NR_llistxattr, sys_llistxattr)</div><div class='del'>-#define __NR_flistxattr				196</div><div class='del'>-__SYSCALL(__NR_flistxattr, sys_flistxattr)</div><div class='del'>-#define __NR_removexattr			197</div><div class='del'>-__SYSCALL(__NR_removexattr, sys_removexattr)</div><div class='del'>-#define __NR_lremovexattr			198</div><div class='del'>-__SYSCALL(__NR_lremovexattr, sys_lremovexattr)</div><div class='del'>-#define __NR_fremovexattr			199</div><div class='del'>-__SYSCALL(__NR_fremovexattr, sys_fremovexattr)</div><div class='del'>-#define __NR_tkill				200</div><div class='del'>-__SYSCALL(__NR_tkill, sys_tkill)</div><div class='del'>-#define __NR_time				201</div><div class='del'>-__SYSCALL(__NR_time, sys_time)</div><div class='del'>-#define __NR_futex				202</div><div class='del'>-__SYSCALL(__NR_futex, sys_futex)</div><div class='del'>-#define __NR_sched_setaffinity			203</div><div class='del'>-__SYSCALL(__NR_sched_setaffinity, sys_sched_setaffinity)</div><div class='del'>-#define __NR_sched_getaffinity			204</div><div class='del'>-__SYSCALL(__NR_sched_getaffinity, sys_sched_getaffinity)</div><div class='del'>-#define __NR_set_thread_area			205</div><div class='del'>-__SYSCALL(__NR_set_thread_area, sys_ni_syscall)	/* use arch_prctl */</div><div class='del'>-#define __NR_io_setup				206</div><div class='del'>-__SYSCALL(__NR_io_setup, sys_io_setup)</div><div class='del'>-#define __NR_io_destroy				207</div><div class='del'>-__SYSCALL(__NR_io_destroy, sys_io_destroy)</div><div class='del'>-#define __NR_io_getevents			208</div><div class='del'>-__SYSCALL(__NR_io_getevents, sys_io_getevents)</div><div class='del'>-#define __NR_io_submit				209</div><div class='del'>-__SYSCALL(__NR_io_submit, sys_io_submit)</div><div class='del'>-#define __NR_io_cancel				210</div><div class='del'>-__SYSCALL(__NR_io_cancel, sys_io_cancel)</div><div class='del'>-#define __NR_get_thread_area			211</div><div class='del'>-__SYSCALL(__NR_get_thread_area, sys_ni_syscall)	/* use arch_prctl */</div><div class='del'>-#define __NR_lookup_dcookie			212</div><div class='del'>-__SYSCALL(__NR_lookup_dcookie, sys_lookup_dcookie)</div><div class='del'>-#define __NR_epoll_create			213</div><div class='del'>-__SYSCALL(__NR_epoll_create, sys_epoll_create)</div><div class='del'>-#define __NR_epoll_ctl_old			214</div><div class='del'>-__SYSCALL(__NR_epoll_ctl_old, sys_ni_syscall)</div><div class='del'>-#define __NR_epoll_wait_old			215</div><div class='del'>-__SYSCALL(__NR_epoll_wait_old, sys_ni_syscall)</div><div class='del'>-#define __NR_remap_file_pages			216</div><div class='del'>-__SYSCALL(__NR_remap_file_pages, sys_remap_file_pages)</div><div class='del'>-#define __NR_getdents64				217</div><div class='del'>-__SYSCALL(__NR_getdents64, sys_getdents64)</div><div class='del'>-#define __NR_set_tid_address			218</div><div class='del'>-__SYSCALL(__NR_set_tid_address, sys_set_tid_address)</div><div class='del'>-#define __NR_restart_syscall			219</div><div class='del'>-__SYSCALL(__NR_restart_syscall, sys_restart_syscall)</div><div class='del'>-#define __NR_semtimedop				220</div><div class='del'>-__SYSCALL(__NR_semtimedop, sys_semtimedop)</div><div class='del'>-#define __NR_fadvise64				221</div><div class='del'>-__SYSCALL(__NR_fadvise64, sys_fadvise64)</div><div class='del'>-#define __NR_timer_create			222</div><div class='del'>-__SYSCALL(__NR_timer_create, sys_timer_create)</div><div class='del'>-#define __NR_timer_settime			223</div><div class='del'>-__SYSCALL(__NR_timer_settime, sys_timer_settime)</div><div class='del'>-#define __NR_timer_gettime			224</div><div class='del'>-__SYSCALL(__NR_timer_gettime, sys_timer_gettime)</div><div class='del'>-#define __NR_timer_getoverrun			225</div><div class='del'>-__SYSCALL(__NR_timer_getoverrun, sys_timer_getoverrun)</div><div class='del'>-#define __NR_timer_delete			226</div><div class='del'>-__SYSCALL(__NR_timer_delete, sys_timer_delete)</div><div class='del'>-#define __NR_clock_settime			227</div><div class='del'>-__SYSCALL(__NR_clock_settime, sys_clock_settime)</div><div class='del'>-#define __NR_clock_gettime			228</div><div class='del'>-__SYSCALL(__NR_clock_gettime, sys_clock_gettime)</div><div class='del'>-#define __NR_clock_getres			229</div><div class='del'>-__SYSCALL(__NR_clock_getres, sys_clock_getres)</div><div class='del'>-#define __NR_clock_nanosleep			230</div><div class='del'>-__SYSCALL(__NR_clock_nanosleep, sys_clock_nanosleep)</div><div class='del'>-#define __NR_exit_group				231</div><div class='del'>-__SYSCALL(__NR_exit_group, sys_exit_group)</div><div class='del'>-#define __NR_epoll_wait				232</div><div class='del'>-__SYSCALL(__NR_epoll_wait, sys_epoll_wait)</div><div class='del'>-#define __NR_epoll_ctl				233</div><div class='del'>-__SYSCALL(__NR_epoll_ctl, sys_epoll_ctl)</div><div class='del'>-#define __NR_tgkill				234</div><div class='del'>-__SYSCALL(__NR_tgkill, sys_tgkill)</div><div class='del'>-#define __NR_utimes				235</div><div class='del'>-__SYSCALL(__NR_utimes, sys_utimes)</div><div class='del'>-#define __NR_vserver				236</div><div class='del'>-__SYSCALL(__NR_vserver, sys_ni_syscall)</div><div class='del'>-#define __NR_mbind				237</div><div class='del'>-__SYSCALL(__NR_mbind, sys_mbind)</div><div class='del'>-#define __NR_set_mempolicy			238</div><div class='del'>-__SYSCALL(__NR_set_mempolicy, sys_set_mempolicy)</div><div class='del'>-#define __NR_get_mempolicy			239</div><div class='del'>-__SYSCALL(__NR_get_mempolicy, sys_get_mempolicy)</div><div class='del'>-#define __NR_mq_open				240</div><div class='del'>-__SYSCALL(__NR_mq_open, sys_mq_open)</div><div class='del'>-#define __NR_mq_unlink				241</div><div class='del'>-__SYSCALL(__NR_mq_unlink, sys_mq_unlink)</div><div class='del'>-#define __NR_mq_timedsend			242</div><div class='del'>-__SYSCALL(__NR_mq_timedsend, sys_mq_timedsend)</div><div class='del'>-#define __NR_mq_timedreceive			243</div><div class='del'>-__SYSCALL(__NR_mq_timedreceive, sys_mq_timedreceive)</div><div class='del'>-#define __NR_mq_notify				244</div><div class='del'>-__SYSCALL(__NR_mq_notify, sys_mq_notify)</div><div class='del'>-#define __NR_mq_getsetattr			245</div><div class='del'>-__SYSCALL(__NR_mq_getsetattr, sys_mq_getsetattr)</div><div class='del'>-#define __NR_kexec_load				246</div><div class='del'>-__SYSCALL(__NR_kexec_load, sys_kexec_load)</div><div class='del'>-#define __NR_waitid				247</div><div class='del'>-__SYSCALL(__NR_waitid, sys_waitid)</div><div class='del'>-#define __NR_add_key				248</div><div class='del'>-__SYSCALL(__NR_add_key, sys_add_key)</div><div class='del'>-#define __NR_request_key			249</div><div class='del'>-__SYSCALL(__NR_request_key, sys_request_key)</div><div class='del'>-#define __NR_keyctl				250</div><div class='del'>-__SYSCALL(__NR_keyctl, sys_keyctl)</div><div class='del'>-#define __NR_ioprio_set				251</div><div class='del'>-__SYSCALL(__NR_ioprio_set, sys_ioprio_set)</div><div class='del'>-#define __NR_ioprio_get				252</div><div class='del'>-__SYSCALL(__NR_ioprio_get, sys_ioprio_get)</div><div class='del'>-#define __NR_inotify_init			253</div><div class='del'>-__SYSCALL(__NR_inotify_init, sys_inotify_init)</div><div class='del'>-#define __NR_inotify_add_watch			254</div><div class='del'>-__SYSCALL(__NR_inotify_add_watch, sys_inotify_add_watch)</div><div class='del'>-#define __NR_inotify_rm_watch			255</div><div class='del'>-__SYSCALL(__NR_inotify_rm_watch, sys_inotify_rm_watch)</div><div class='del'>-#define __NR_migrate_pages			256</div><div class='del'>-__SYSCALL(__NR_migrate_pages, sys_migrate_pages)</div><div class='del'>-#define __NR_openat				257</div><div class='del'>-__SYSCALL(__NR_openat, sys_openat)</div><div class='del'>-#define __NR_mkdirat				258</div><div class='del'>-__SYSCALL(__NR_mkdirat, sys_mkdirat)</div><div class='del'>-#define __NR_mknodat				259</div><div class='del'>-__SYSCALL(__NR_mknodat, sys_mknodat)</div><div class='del'>-#define __NR_fchownat				260</div><div class='del'>-__SYSCALL(__NR_fchownat, sys_fchownat)</div><div class='del'>-#define __NR_futimesat				261</div><div class='del'>-__SYSCALL(__NR_futimesat, sys_futimesat)</div><div class='del'>-#define __NR_newfstatat				262</div><div class='del'>-__SYSCALL(__NR_newfstatat, sys_newfstatat)</div><div class='del'>-#define __NR_unlinkat				263</div><div class='del'>-__SYSCALL(__NR_unlinkat, sys_unlinkat)</div><div class='del'>-#define __NR_renameat				264</div><div class='del'>-__SYSCALL(__NR_renameat, sys_renameat)</div><div class='del'>-#define __NR_linkat				265</div><div class='del'>-__SYSCALL(__NR_linkat, sys_linkat)</div><div class='del'>-#define __NR_symlinkat				266</div><div class='del'>-__SYSCALL(__NR_symlinkat, sys_symlinkat)</div><div class='del'>-#define __NR_readlinkat				267</div><div class='del'>-__SYSCALL(__NR_readlinkat, sys_readlinkat)</div><div class='del'>-#define __NR_fchmodat				268</div><div class='del'>-__SYSCALL(__NR_fchmodat, sys_fchmodat)</div><div class='del'>-#define __NR_faccessat				269</div><div class='del'>-__SYSCALL(__NR_faccessat, sys_faccessat)</div><div class='del'>-#define __NR_pselect6				270</div><div class='del'>-__SYSCALL(__NR_pselect6, sys_pselect6)</div><div class='del'>-#define __NR_ppoll				271</div><div class='del'>-__SYSCALL(__NR_ppoll,	sys_ppoll)</div><div class='del'>-#define __NR_unshare				272</div><div class='del'>-__SYSCALL(__NR_unshare,	sys_unshare)</div><div class='del'>-#define __NR_set_robust_list			273</div><div class='del'>-__SYSCALL(__NR_set_robust_list, sys_set_robust_list)</div><div class='del'>-#define __NR_get_robust_list			274</div><div class='del'>-__SYSCALL(__NR_get_robust_list, sys_get_robust_list)</div><div class='del'>-#define __NR_splice				275</div><div class='del'>-__SYSCALL(__NR_splice, sys_splice)</div><div class='del'>-#define __NR_tee				276</div><div class='del'>-__SYSCALL(__NR_tee, sys_tee)</div><div class='del'>-#define __NR_sync_file_range			277</div><div class='del'>-__SYSCALL(__NR_sync_file_range, sys_sync_file_range)</div><div class='del'>-#define __NR_vmsplice				278</div><div class='del'>-__SYSCALL(__NR_vmsplice, sys_vmsplice)</div><div class='del'>-#define __NR_move_pages				279</div><div class='del'>-__SYSCALL(__NR_move_pages, sys_move_pages)</div><div class='del'>-#define __NR_utimensat				280</div><div class='del'>-__SYSCALL(__NR_utimensat, sys_utimensat)</div><div class='del'>-#define __NR_epoll_pwait			281</div><div class='del'>-__SYSCALL(__NR_epoll_pwait, sys_epoll_pwait)</div><div class='del'>-#define __NR_signalfd				282</div><div class='del'>-__SYSCALL(__NR_signalfd, sys_signalfd)</div><div class='del'>-#define __NR_timerfd_create			283</div><div class='del'>-__SYSCALL(__NR_timerfd_create, sys_timerfd_create)</div><div class='del'>-#define __NR_eventfd				284</div><div class='del'>-__SYSCALL(__NR_eventfd, sys_eventfd)</div><div class='del'>-#define __NR_fallocate				285</div><div class='del'>-__SYSCALL(__NR_fallocate, sys_fallocate)</div><div class='del'>-#define __NR_timerfd_settime			286</div><div class='del'>-__SYSCALL(__NR_timerfd_settime, sys_timerfd_settime)</div><div class='del'>-#define __NR_timerfd_gettime			287</div><div class='del'>-__SYSCALL(__NR_timerfd_gettime, sys_timerfd_gettime)</div><div class='del'>-#define __NR_accept4				288</div><div class='del'>-__SYSCALL(__NR_accept4, sys_accept4)</div><div class='del'>-#define __NR_signalfd4				289</div><div class='del'>-__SYSCALL(__NR_signalfd4, sys_signalfd4)</div><div class='del'>-#define __NR_eventfd2				290</div><div class='del'>-__SYSCALL(__NR_eventfd2, sys_eventfd2)</div><div class='del'>-#define __NR_epoll_create1			291</div><div class='del'>-__SYSCALL(__NR_epoll_create1, sys_epoll_create1)</div><div class='del'>-#define __NR_dup3				292</div><div class='del'>-__SYSCALL(__NR_dup3, sys_dup3)</div><div class='del'>-#define __NR_pipe2				293</div><div class='del'>-__SYSCALL(__NR_pipe2, sys_pipe2)</div><div class='del'>-#define __NR_inotify_init1			294</div><div class='del'>-__SYSCALL(__NR_inotify_init1, sys_inotify_init1)</div><div class='del'>-#define __NR_preadv				295</div><div class='del'>-__SYSCALL(__NR_preadv, sys_preadv)</div><div class='del'>-#define __NR_pwritev				296</div><div class='del'>-__SYSCALL(__NR_pwritev, sys_pwritev)</div><div class='del'>-#define __NR_rt_tgsigqueueinfo			297</div><div class='del'>-__SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)</div><div class='del'>-#define __NR_perf_event_open			298</div><div class='del'>-__SYSCALL(__NR_perf_event_open, sys_perf_event_open)</div><div class='del'>-#define __NR_recvmmsg				299</div><div class='del'>-__SYSCALL(__NR_recvmmsg, sys_recvmmsg)</div><div class='del'>-#define __NR_fanotify_init			300</div><div class='del'>-__SYSCALL(__NR_fanotify_init, sys_fanotify_init)</div><div class='del'>-#define __NR_fanotify_mark			301</div><div class='del'>-__SYSCALL(__NR_fanotify_mark, sys_fanotify_mark)</div><div class='del'>-#define __NR_prlimit64				302</div><div class='del'>-__SYSCALL(__NR_prlimit64, sys_prlimit64)</div><div class='del'>-#define __NR_name_to_handle_at			303</div><div class='del'>-__SYSCALL(__NR_name_to_handle_at, sys_name_to_handle_at)</div><div class='del'>-#define __NR_open_by_handle_at			304</div><div class='del'>-__SYSCALL(__NR_open_by_handle_at, sys_open_by_handle_at)</div><div class='del'>-#define __NR_clock_adjtime			305</div><div class='del'>-__SYSCALL(__NR_clock_adjtime, sys_clock_adjtime)</div><div class='del'>-#define __NR_syncfs                             306</div><div class='del'>-__SYSCALL(__NR_syncfs, sys_syncfs)</div><div class='del'>-#define __NR_sendmmsg				307</div><div class='del'>-__SYSCALL(__NR_sendmmsg, sys_sendmmsg)</div><div class='del'>-#define __NR_setns				308</div><div class='del'>-__SYSCALL(__NR_setns, sys_setns)</div><div class='del'>-#define __NR_getcpu				309</div><div class='del'>-__SYSCALL(__NR_getcpu, sys_getcpu)</div><div class='del'>-#define __NR_process_vm_readv			310</div><div class='del'>-__SYSCALL(__NR_process_vm_readv, sys_process_vm_readv)</div><div class='del'>-#define __NR_process_vm_writev			311</div><div class='del'>-__SYSCALL(__NR_process_vm_writev, sys_process_vm_writev)</div><div class='del'>-</div><div class='del'>-#ifndef __NO_STUBS</div><div class='del'>-#define __ARCH_WANT_OLD_READDIR</div><div class='del'>-#define __ARCH_WANT_OLD_STAT</div><div class='del'>-#define __ARCH_WANT_SYS_ALARM</div><div class='del'>-#define __ARCH_WANT_SYS_GETHOSTNAME</div><div class='del'>-#define __ARCH_WANT_SYS_PAUSE</div><div class='del'>-#define __ARCH_WANT_SYS_SGETMASK</div><div class='del'>-#define __ARCH_WANT_SYS_SIGNAL</div><div class='del'>-#define __ARCH_WANT_SYS_UTIME</div><div class='del'>-#define __ARCH_WANT_SYS_WAITPID</div><div class='del'>-#define __ARCH_WANT_SYS_SOCKETCALL</div><div class='del'>-#define __ARCH_WANT_SYS_FADVISE64</div><div class='del'>-#define __ARCH_WANT_SYS_GETPGRP</div><div class='del'>-#define __ARCH_WANT_SYS_LLSEEK</div><div class='del'>-#define __ARCH_WANT_SYS_NICE</div><div class='del'>-#define __ARCH_WANT_SYS_OLD_GETRLIMIT</div><div class='del'>-#define __ARCH_WANT_SYS_OLD_UNAME</div><div class='del'>-#define __ARCH_WANT_SYS_OLDUMOUNT</div><div class='del'>-#define __ARCH_WANT_SYS_SIGPENDING</div><div class='del'>-#define __ARCH_WANT_SYS_SIGPROCMASK</div><div class='del'>-#define __ARCH_WANT_SYS_RT_SIGACTION</div><div class='del'>-#define __ARCH_WANT_SYS_RT_SIGSUSPEND</div><div class='del'>-#define __ARCH_WANT_SYS_TIME</div><div class='del'>-#define __ARCH_WANT_COMPAT_SYS_TIME</div><div class='del'>-#endif	/* __NO_STUBS */</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-</div><div class='del'>-#ifndef COMPILE_OFFSETS</div><div class='del'>-#include &lt;asm/asm-offsets.h&gt;</div><div class='del'>-#define NR_syscalls (__NR_syscall_max + 1)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * "Conditional" syscalls</div><div class='del'>- *</div><div class='del'>- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),</div><div class='del'>- * but it doesn't work on all toolchains, so we just do it by hand</div><div class='del'>- */</div><div class='del'>-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")</div><div class='del'>-#endif	/* __KERNEL__ */</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_X86_UNISTD_64_H */</div><div class='head'>diff --git a/arch/x86/include/asm/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h<br/>index 8e862aaf0d90..becf47b81735 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/uv/uv_bau.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/uv/uv_bau.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/uv/uv_bau.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/uv/uv_bau.h</a></div><div class='hunk'>@@ -65,7 +65,7 @@</div><div class='ctx'>  * UV2: Bit 19 selects between</div><div class='ctx'>  *  (0): 10 microsecond timebase and</div><div class='ctx'>  *  (1): 80 microseconds</div><div class='del'>- *  we're using 655us, similar to UV1: 65 units of 10us</div><div class='add'>+ *  we're using 560us, similar to UV1: 65 units of 10us</div><div class='ctx'>  */</div><div class='ctx'> #define UV1_INTD_SOFT_ACK_TIMEOUT_PERIOD (9UL)</div><div class='ctx'> #define UV2_INTD_SOFT_ACK_TIMEOUT_PERIOD (15UL)</div><div class='hunk'>@@ -167,6 +167,7 @@</div><div class='ctx'> #define FLUSH_RETRY_TIMEOUT		2</div><div class='ctx'> #define FLUSH_GIVEUP			3</div><div class='ctx'> #define FLUSH_COMPLETE			4</div><div class='add'>+#define FLUSH_RETRY_BUSYBUG		5</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * tuning the action when the numalink network is extremely delayed</div><div class='hunk'>@@ -235,10 +236,10 @@ struct bau_msg_payload {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Message header:  16 bytes (128 bits) (bytes 0x30-0x3f of descriptor)</div><div class='add'>+ * UV1 Message header:  16 bytes (128 bits) (bytes 0x30-0x3f of descriptor)</div><div class='ctx'>  * see table 4.2.3.0.1 in broacast_assist spec.</div><div class='ctx'>  */</div><div class='del'>-struct bau_msg_header {</div><div class='add'>+struct uv1_bau_msg_header {</div><div class='ctx'> 	unsigned int	dest_subnodeid:6;	/* must be 0x10, for the LB */</div><div class='ctx'> 	/* bits 5:0 */</div><div class='ctx'> 	unsigned int	base_dest_nasid:15;	/* nasid of the first bit */</div><div class='hunk'>@@ -318,19 +319,87 @@ struct bau_msg_header {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * UV2 Message header:  16 bytes (128 bits) (bytes 0x30-0x3f of descriptor)</div><div class='add'>+ * see figure 9-2 of harp_sys.pdf</div><div class='add'>+ */</div><div class='add'>+struct uv2_bau_msg_header {</div><div class='add'>+	unsigned int	base_dest_nasid:15;	/* nasid of the first bit */</div><div class='add'>+	/* bits 14:0 */				/* in uvhub map */</div><div class='add'>+	unsigned int	dest_subnodeid:5;	/* must be 0x10, for the LB */</div><div class='add'>+	/* bits 19:15 */</div><div class='add'>+	unsigned int	rsvd_1:1;		/* must be zero */</div><div class='add'>+	/* bit 20 */</div><div class='add'>+	/* Address bits 59:21 */</div><div class='add'>+	/* bits 25:2 of address (44:21) are payload */</div><div class='add'>+	/* these next 24 bits become bytes 12-14 of msg */</div><div class='add'>+	/* bits 28:21 land in byte 12 */</div><div class='add'>+	unsigned int	replied_to:1;		/* sent as 0 by the source to</div><div class='add'>+						   byte 12 */</div><div class='add'>+	/* bit 21 */</div><div class='add'>+	unsigned int	msg_type:3;		/* software type of the</div><div class='add'>+						   message */</div><div class='add'>+	/* bits 24:22 */</div><div class='add'>+	unsigned int	canceled:1;		/* message canceled, resource</div><div class='add'>+						   is to be freed*/</div><div class='add'>+	/* bit 25 */</div><div class='add'>+	unsigned int	payload_1:3;		/* not currently used */</div><div class='add'>+	/* bits 28:26 */</div><div class='add'>+</div><div class='add'>+	/* bits 36:29 land in byte 13 */</div><div class='add'>+	unsigned int	payload_2a:3;		/* not currently used */</div><div class='add'>+	unsigned int	payload_2b:5;		/* not currently used */</div><div class='add'>+	/* bits 36:29 */</div><div class='add'>+</div><div class='add'>+	/* bits 44:37 land in byte 14 */</div><div class='add'>+	unsigned int	payload_3:8;		/* not currently used */</div><div class='add'>+	/* bits 44:37 */</div><div class='add'>+</div><div class='add'>+	unsigned int	rsvd_2:7;		/* reserved */</div><div class='add'>+	/* bits 51:45 */</div><div class='add'>+	unsigned int	swack_flag:1;		/* software acknowledge flag */</div><div class='add'>+	/* bit 52 */</div><div class='add'>+	unsigned int	rsvd_3a:3;		/* must be zero */</div><div class='add'>+	unsigned int	rsvd_3b:8;		/* must be zero */</div><div class='add'>+	unsigned int	rsvd_3c:8;		/* must be zero */</div><div class='add'>+	unsigned int	rsvd_3d:3;		/* must be zero */</div><div class='add'>+	/* bits 74:53 */</div><div class='add'>+	unsigned int	fairness:3;		/* usually zero */</div><div class='add'>+	/* bits 77:75 */</div><div class='add'>+</div><div class='add'>+	unsigned int	sequence:16;		/* message sequence number */</div><div class='add'>+	/* bits 93:78  Suppl_A  */</div><div class='add'>+	unsigned int	chaining:1;		/* next descriptor is part of</div><div class='add'>+						   this activation*/</div><div class='add'>+	/* bit 94 */</div><div class='add'>+	unsigned int	multilevel:1;		/* multi-level multicast</div><div class='add'>+						   format */</div><div class='add'>+	/* bit 95 */</div><div class='add'>+	unsigned int	rsvd_4:24;		/* ordered / source node /</div><div class='add'>+						   source subnode / aging</div><div class='add'>+						   must be zero */</div><div class='add'>+	/* bits 119:96 */</div><div class='add'>+	unsigned int	command:8;		/* message type */</div><div class='add'>+	/* bits 127:120 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * The activation descriptor:</div><div class='ctx'>  * The format of the message to send, plus all accompanying control</div><div class='ctx'>  * Should be 64 bytes</div><div class='ctx'>  */</div><div class='ctx'> struct bau_desc {</div><div class='del'>-	struct pnmask			distribution;</div><div class='add'>+	struct pnmask				distribution;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * message template, consisting of header and payload:</div><div class='ctx'> 	 */</div><div class='del'>-	struct bau_msg_header		header;</div><div class='del'>-	struct bau_msg_payload		payload;</div><div class='add'>+	union bau_msg_header {</div><div class='add'>+		struct uv1_bau_msg_header	uv1_hdr;</div><div class='add'>+		struct uv2_bau_msg_header	uv2_hdr;</div><div class='add'>+	} header;</div><div class='add'>+</div><div class='add'>+	struct bau_msg_payload			payload;</div><div class='ctx'> };</div><div class='del'>-/*</div><div class='add'>+/* UV1:</div><div class='ctx'>  *   -payload--    ---------header------</div><div class='ctx'>  *   bytes 0-11    bits 41-56  bits 58-81</div><div class='ctx'>  *       A           B  (2)      C (3)</div><div class='hunk'>@@ -340,6 +409,16 @@ struct bau_desc {</div><div class='ctx'>  *   bytes 0-11  bytes 12-14  bytes 16-17  (byte 15 filled in by hw as vector)</div><div class='ctx'>  *   ------------payload queue-----------</div><div class='ctx'>  */</div><div class='add'>+/* UV2:</div><div class='add'>+ *   -payload--    ---------header------</div><div class='add'>+ *   bytes 0-11    bits 70-78  bits 21-44</div><div class='add'>+ *       A           B  (2)      C (3)</div><div class='add'>+ *</div><div class='add'>+ *            A/B/C are moved to:</div><div class='add'>+ *       A            C          B</div><div class='add'>+ *   bytes 0-11  bytes 12-14  bytes 16-17  (byte 15 filled in by hw as vector)</div><div class='add'>+ *   ------------payload queue-----------</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The payload queue on the destination side is an array of these.</div><div class='hunk'>@@ -385,7 +464,6 @@ struct bau_pq_entry {</div><div class='ctx'> struct msg_desc {</div><div class='ctx'> 	struct bau_pq_entry	*msg;</div><div class='ctx'> 	int			msg_slot;</div><div class='del'>-	int			swack_slot;</div><div class='ctx'> 	struct bau_pq_entry	*queue_first;</div><div class='ctx'> 	struct bau_pq_entry	*queue_last;</div><div class='ctx'> };</div><div class='hunk'>@@ -405,6 +483,7 @@ struct ptc_stats {</div><div class='ctx'> 						   requests */</div><div class='ctx'> 	unsigned long	s_stimeout;		/* source side timeouts */</div><div class='ctx'> 	unsigned long	s_dtimeout;		/* destination side timeouts */</div><div class='add'>+	unsigned long	s_strongnacks;		/* number of strong nack's */</div><div class='ctx'> 	unsigned long	s_time;			/* time spent in sending side */</div><div class='ctx'> 	unsigned long	s_retriesok;		/* successful retries */</div><div class='ctx'> 	unsigned long	s_ntargcpu;		/* total number of cpu's</div><div class='hunk'>@@ -439,6 +518,9 @@ struct ptc_stats {</div><div class='ctx'> 	unsigned long	s_retry_messages;	/* retry broadcasts */</div><div class='ctx'> 	unsigned long	s_bau_reenabled;	/* for bau enable/disable */</div><div class='ctx'> 	unsigned long	s_bau_disabled;		/* for bau enable/disable */</div><div class='add'>+	unsigned long	s_uv2_wars;		/* uv2 workaround, perm. busy */</div><div class='add'>+	unsigned long	s_uv2_wars_hw;		/* uv2 workaround, hiwater */</div><div class='add'>+	unsigned long	s_uv2_war_waits;	/* uv2 workaround, long waits */</div><div class='ctx'> 	/* destination statistics */</div><div class='ctx'> 	unsigned long	d_alltlb;		/* times all tlb's on this</div><div class='ctx'> 						   cpu were flushed */</div><div class='hunk'>@@ -511,9 +593,12 @@ struct bau_control {</div><div class='ctx'> 	short			osnode;</div><div class='ctx'> 	short			uvhub_cpu;</div><div class='ctx'> 	short			uvhub;</div><div class='add'>+	short			uvhub_version;</div><div class='ctx'> 	short			cpus_in_socket;</div><div class='ctx'> 	short			cpus_in_uvhub;</div><div class='ctx'> 	short			partition_base_pnode;</div><div class='add'>+	short			using_desc; /* an index, like uvhub_cpu */</div><div class='add'>+	unsigned int		inuse_map;</div><div class='ctx'> 	unsigned short		message_number;</div><div class='ctx'> 	unsigned short		uvhub_quiesce;</div><div class='ctx'> 	short			socket_acknowledge_count[DEST_Q_SIZE];</div><div class='hunk'>@@ -531,6 +616,7 @@ struct bau_control {</div><div class='ctx'> 	int			cong_response_us;</div><div class='ctx'> 	int			cong_reps;</div><div class='ctx'> 	int			cong_period;</div><div class='add'>+	unsigned long		clocks_per_100_usec;</div><div class='ctx'> 	cycles_t		period_time;</div><div class='ctx'> 	long			period_requests;</div><div class='ctx'> 	struct hub_and_pnode	*thp;</div><div class='hunk'>@@ -591,6 +677,11 @@ static inline void write_mmr_sw_ack(unsigned long mr)</div><div class='ctx'> 	uv_write_local_mmr(UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS, mr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void write_gmmr_sw_ack(int pnode, unsigned long mr)</div><div class='add'>+{</div><div class='add'>+	write_gmmr(pnode, UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS, mr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline unsigned long read_mmr_sw_ack(void)</div><div class='ctx'> {</div><div class='ctx'> 	return read_lmmr(UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE);</div><div class='head'>diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h<br/>index 1ac860a09849..517d4767ffdd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/include/asm/x86_init.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/include/asm/x86_init.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/include/asm/x86_init.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/include/asm/x86_init.h</a></div><div class='hunk'>@@ -179,6 +179,7 @@ struct x86_msi_ops {</div><div class='ctx'> 	int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);</div><div class='ctx'> 	void (*teardown_msi_irq)(unsigned int irq);</div><div class='ctx'> 	void (*teardown_msi_irqs)(struct pci_dev *dev);</div><div class='add'>+	void (*restore_msi_irqs)(struct pci_dev *dev, int irq);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct x86_init_ops x86_init;</div><div class='head'>diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile<br/>index 8baca3c4871c..5369059c07a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/Makefile</a></div><div class='hunk'>@@ -25,7 +25,8 @@ obj-$(CONFIG_IRQ_WORK)  += irq_work.o</div><div class='ctx'> obj-y			+= probe_roms.o</div><div class='ctx'> obj-$(CONFIG_X86_32)	+= sys_i386_32.o i386_ksyms_32.o</div><div class='ctx'> obj-$(CONFIG_X86_64)	+= sys_x86_64.o x8664_ksyms_64.o</div><div class='del'>-obj-$(CONFIG_X86_64)	+= syscall_64.o vsyscall_64.o</div><div class='add'>+obj-y			+= syscall_$(BITS).o</div><div class='add'>+obj-$(CONFIG_X86_64)	+= vsyscall_64.o</div><div class='ctx'> obj-$(CONFIG_X86_64)	+= vsyscall_emu_64.o</div><div class='ctx'> obj-y			+= bootflag.o e820.o</div><div class='ctx'> obj-y			+= pci-dma.o quirks.o topology.o kdebugfs.o</div><div class='hunk'>@@ -80,6 +81,7 @@ obj-$(CONFIG_APB_TIMER)		+= apb_timer.o</div><div class='ctx'> obj-$(CONFIG_AMD_NB)		+= amd_nb.o</div><div class='ctx'> obj-$(CONFIG_DEBUG_RODATA_TEST)	+= test_rodata.o</div><div class='ctx'> obj-$(CONFIG_DEBUG_NX_TEST)	+= test_nx.o</div><div class='add'>+obj-$(CONFIG_DEBUG_NMI_SELFTEST) += nmi_selftest.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_KVM_GUEST)		+= kvm.o</div><div class='ctx'> obj-$(CONFIG_KVM_CLOCK)		+= kvmclock.o</div><div class='head'>diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c<br/>index 013c1810ce72..be16854591cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/amd_nb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/amd_nb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/amd_nb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/amd_nb.c</a></div><div class='hunk'>@@ -119,6 +119,37 @@ bool __init early_is_amd_nb(u32 device)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct resource *amd_get_mmconfig_range(struct resource *res)</div><div class='add'>+{</div><div class='add'>+	u32 address;</div><div class='add'>+	u64 base, msr;</div><div class='add'>+	unsigned segn_busn_bits;</div><div class='add'>+</div><div class='add'>+	if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* assume all cpus from fam10h have mmconfig */</div><div class='add'>+        if (boot_cpu_data.x86 &lt; 0x10)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	address = MSR_FAM10H_MMIO_CONF_BASE;</div><div class='add'>+	rdmsrl(address, msr);</div><div class='add'>+</div><div class='add'>+	/* mmconfig is not enabled */</div><div class='add'>+	if (!(msr &amp; FAM10H_MMIO_CONF_ENABLE))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	base = msr &amp; (FAM10H_MMIO_CONF_BASE_MASK&lt;&lt;FAM10H_MMIO_CONF_BASE_SHIFT);</div><div class='add'>+</div><div class='add'>+	segn_busn_bits = (msr &gt;&gt; FAM10H_MMIO_CONF_BUSRANGE_SHIFT) &amp;</div><div class='add'>+			 FAM10H_MMIO_CONF_BUSRANGE_MASK;</div><div class='add'>+</div><div class='add'>+	res-&gt;flags = IORESOURCE_MEM;</div><div class='add'>+	res-&gt;start = base;</div><div class='add'>+	res-&gt;end = base + (1ULL&lt;&lt;(segn_busn_bits + 20)) - 1;</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int amd_get_subcaches(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *link = node_to_amd_nb(amd_get_nb_id(cpu))-&gt;link;</div><div class='head'>diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c<br/>index 9d59bbacd4e3..79b05b88aa19 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/apic/x2apic_uv_x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/apic/x2apic_uv_x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/apic/x2apic_uv_x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/apic/x2apic_uv_x.c</a></div><div class='hunk'>@@ -769,7 +769,12 @@ void __init uv_system_init(void)</div><div class='ctx'> 	for(i = 0; i &lt; UVH_NODE_PRESENT_TABLE_DEPTH; i++)</div><div class='ctx'> 		uv_possible_blades +=</div><div class='ctx'> 		  hweight64(uv_read_local_mmr( UVH_NODE_PRESENT_TABLE + i * 8));</div><div class='del'>-	printk(KERN_DEBUG "UV: Found %d blades\n", uv_num_possible_blades());</div><div class='add'>+</div><div class='add'>+	/* uv_num_possible_blades() is really the hub count */</div><div class='add'>+	printk(KERN_INFO "UV: Found %d blades, %d hubs\n",</div><div class='add'>+			is_uv1_hub() ? uv_num_possible_blades() :</div><div class='add'>+			(uv_num_possible_blades() + 1) / 2,</div><div class='add'>+			uv_num_possible_blades());</div><div class='ctx'> </div><div class='ctx'> 	bytes = sizeof(struct uv_blade_info) * uv_num_possible_blades();</div><div class='ctx'> 	uv_blade_info = kzalloc(bytes, GFP_KERNEL);</div><div class='head'>diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c<br/>index a46bd383953c..f76623cbe263 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/apm_32.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/apm_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/apm_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/apm_32.c</a></div><div class='hunk'>@@ -383,21 +383,21 @@ static int ignore_sys_suspend;</div><div class='ctx'> static int ignore_normal_resume;</div><div class='ctx'> static int bounce_interval __read_mostly = DEFAULT_BOUNCE_INTERVAL;</div><div class='ctx'> </div><div class='del'>-static int debug __read_mostly;</div><div class='del'>-static int smp __read_mostly;</div><div class='add'>+static bool debug __read_mostly;</div><div class='add'>+static bool smp __read_mostly;</div><div class='ctx'> static int apm_disabled = -1;</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-static int power_off;</div><div class='add'>+static bool power_off;</div><div class='ctx'> #else</div><div class='del'>-static int power_off = 1;</div><div class='add'>+static bool power_off = 1;</div><div class='ctx'> #endif</div><div class='del'>-static int realmode_power_off;</div><div class='add'>+static bool realmode_power_off;</div><div class='ctx'> #ifdef CONFIG_APM_ALLOW_INTS</div><div class='del'>-static int allow_ints = 1;</div><div class='add'>+static bool allow_ints = 1;</div><div class='ctx'> #else</div><div class='del'>-static int allow_ints;</div><div class='add'>+static bool allow_ints;</div><div class='ctx'> #endif</div><div class='del'>-static int broken_psr;</div><div class='add'>+static bool broken_psr;</div><div class='ctx'> </div><div class='ctx'> static DECLARE_WAIT_QUEUE_HEAD(apm_waitqueue);</div><div class='ctx'> static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue);</div><div class='head'>diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c<br/>index 4f13fafc5264..68de2dc962ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/asm-offsets.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/asm-offsets.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -67,4 +67,6 @@ void common(void) {</div><div class='ctx'> 	OFFSET(BP_hardware_subarch, boot_params, hdr.hardware_subarch);</div><div class='ctx'> 	OFFSET(BP_version, boot_params, hdr.version);</div><div class='ctx'> 	OFFSET(BP_kernel_alignment, boot_params, hdr.kernel_alignment);</div><div class='add'>+	OFFSET(BP_pref_address, boot_params, hdr.pref_address);</div><div class='add'>+	OFFSET(BP_code32_start, boot_params, hdr.code32_start);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c<br/>index 395a10e68067..85d98ab15cdc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/asm-offsets_32.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/asm-offsets_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/asm-offsets_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/asm-offsets_32.c</a></div><div class='hunk'>@@ -3,6 +3,11 @@</div><div class='ctx'> #include &lt;linux/lguest.h&gt;</div><div class='ctx'> #include "../../../drivers/lguest/lg.h"</div><div class='ctx'> </div><div class='add'>+#define __SYSCALL_I386(nr, sym, compat) [nr] = 1,</div><div class='add'>+static char syscalls[] = {</div><div class='add'>+#include &lt;asm/syscalls_32.h&gt;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* workaround for a warning with -Wmissing-prototypes */</div><div class='ctx'> void foo(void);</div><div class='ctx'> </div><div class='hunk'>@@ -76,4 +81,7 @@ void foo(void)</div><div class='ctx'> 	OFFSET(LGUEST_PAGES_regs_errcode, lguest_pages, regs.errcode);</div><div class='ctx'> 	OFFSET(LGUEST_PAGES_regs, lguest_pages, regs);</div><div class='ctx'> #endif</div><div class='add'>+	BLANK();</div><div class='add'>+	DEFINE(__NR_syscall_max, sizeof(syscalls) - 1);</div><div class='add'>+	DEFINE(NR_syscalls, sizeof(syscalls));</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 e72a1194af22..834e897b1e25 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/asm-offsets_64.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/asm-offsets_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/asm-offsets_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/asm-offsets_64.c</a></div><div class='hunk'>@@ -1,11 +1,12 @@</div><div class='ctx'> #include &lt;asm/ia32.h&gt;</div><div class='ctx'> </div><div class='del'>-#define __NO_STUBS 1</div><div class='del'>-#undef __SYSCALL</div><div class='del'>-#undef _ASM_X86_UNISTD_64_H</div><div class='del'>-#define __SYSCALL(nr, sym) [nr] = 1,</div><div class='del'>-static char syscalls[] = {</div><div class='del'>-#include &lt;asm/unistd.h&gt;</div><div class='add'>+#define __SYSCALL_64(nr, sym, compat) [nr] = 1,</div><div class='add'>+static char syscalls_64[] = {</div><div class='add'>+#include &lt;asm/syscalls_64.h&gt;</div><div class='add'>+};</div><div class='add'>+#define __SYSCALL_I386(nr, sym, compat) [nr] = 1,</div><div class='add'>+static char syscalls_ia32[] = {</div><div class='add'>+#include &lt;asm/syscalls_32.h&gt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int main(void)</div><div class='hunk'>@@ -72,7 +73,11 @@ int main(void)</div><div class='ctx'> 	OFFSET(TSS_ist, tss_struct, x86_tss.ist);</div><div class='ctx'> 	BLANK();</div><div class='ctx'> </div><div class='del'>-	DEFINE(__NR_syscall_max, sizeof(syscalls) - 1);</div><div class='add'>+	DEFINE(__NR_syscall_max, sizeof(syscalls_64) - 1);</div><div class='add'>+	DEFINE(NR_syscalls, sizeof(syscalls_64));</div><div class='add'>+</div><div class='add'>+	DEFINE(__NR_ia32_syscall_max, sizeof(syscalls_ia32) - 1);</div><div class='add'>+	DEFINE(IA32_NR_syscalls, sizeof(syscalls_ia32));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c<br/>index 850f2963a420..d43cad74f166 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/cpu/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/cpu/common.c</a></div><div class='hunk'>@@ -1021,6 +1021,8 @@ __setup("clearcpuid=", setup_disablecpuid);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };</div><div class='add'>+struct desc_ptr nmi_idt_descr = { NR_VECTORS * 16 - 1,</div><div class='add'>+				    (unsigned long) nmi_idt_table };</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU_FIRST(union irq_stack_union,</div><div class='ctx'> 		     irq_stack_union) __aligned(PAGE_SIZE);</div><div class='hunk'>@@ -1085,6 +1087,26 @@ unsigned long kernel_eflags;</div><div class='ctx'>  */</div><div class='ctx'> DEFINE_PER_CPU(struct orig_ist, orig_ist);</div><div class='ctx'> </div><div class='add'>+static DEFINE_PER_CPU(unsigned long, debug_stack_addr);</div><div class='add'>+DEFINE_PER_CPU(int, debug_stack_usage);</div><div class='add'>+</div><div class='add'>+int is_debug_stack(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return __get_cpu_var(debug_stack_usage) ||</div><div class='add'>+		(addr &lt;= __get_cpu_var(debug_stack_addr) &amp;&amp;</div><div class='add'>+		 addr &gt; (__get_cpu_var(debug_stack_addr) - DEBUG_STKSZ));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void debug_stack_set_zero(void)</div><div class='add'>+{</div><div class='add'>+	load_idt((const struct desc_ptr *)&amp;nmi_idt_descr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void debug_stack_reset(void)</div><div class='add'>+{</div><div class='add'>+	load_idt((const struct desc_ptr *)&amp;idt_descr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else	/* CONFIG_X86_64 */</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU(struct task_struct *, current_task) = &amp;init_task;</div><div class='hunk'>@@ -1212,6 +1234,8 @@ void __cpuinit cpu_init(void)</div><div class='ctx'> 			estacks += exception_stack_sizes[v];</div><div class='ctx'> 			oist-&gt;ist[v] = t-&gt;x86_tss.ist[v] =</div><div class='ctx'> 					(unsigned long)estacks;</div><div class='add'>+			if (v == DEBUG_STACK-1)</div><div class='add'>+				per_cpu(debug_stack_addr, cpu) = (unsigned long)estacks;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c<br/>index a3b0811693c9..6b45e5e7a901 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/intel_cacheinfo.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/cpu/intel_cacheinfo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/intel_cacheinfo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/cpu/intel_cacheinfo.c</a></div><div class='hunk'>@@ -844,8 +844,7 @@ static int __cpuinit detect_cache_attributes(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kobject.h&gt;</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='del'>-</div><div class='del'>-extern struct sysdev_class cpu_sysdev_class; /* from drivers/base/cpu.c */</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* pointer to kobject for cpuX/cache */</div><div class='ctx'> static DEFINE_PER_CPU(struct kobject *, ici_cache_kobject);</div><div class='hunk'>@@ -1073,9 +1072,9 @@ err_out:</div><div class='ctx'> static DECLARE_BITMAP(cache_dev_map, NR_CPUS);</div><div class='ctx'> </div><div class='ctx'> /* Add/Remove cache interface for CPU device */</div><div class='del'>-static int __cpuinit cache_add_dev(struct sys_device * sys_dev)</div><div class='add'>+static int __cpuinit cache_add_dev(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cpu = sys_dev-&gt;id;</div><div class='add'>+	unsigned int cpu = dev-&gt;id;</div><div class='ctx'> 	unsigned long i, j;</div><div class='ctx'> 	struct _index_kobject *this_object;</div><div class='ctx'> 	struct _cpuid4_info   *this_leaf;</div><div class='hunk'>@@ -1087,7 +1086,7 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev)</div><div class='ctx'> </div><div class='ctx'> 	retval = kobject_init_and_add(per_cpu(ici_cache_kobject, cpu),</div><div class='ctx'> 				      &amp;ktype_percpu_entry,</div><div class='del'>-				      &amp;sys_dev-&gt;kobj, "%s", "cache");</div><div class='add'>+				      &amp;dev-&gt;kobj, "%s", "cache");</div><div class='ctx'> 	if (retval &lt; 0) {</div><div class='ctx'> 		cpuid4_cache_sysfs_exit(cpu);</div><div class='ctx'> 		return retval;</div><div class='hunk'>@@ -1124,9 +1123,9 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __cpuinit cache_remove_dev(struct sys_device * sys_dev)</div><div class='add'>+static void __cpuinit cache_remove_dev(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cpu = sys_dev-&gt;id;</div><div class='add'>+	unsigned int cpu = dev-&gt;id;</div><div class='ctx'> 	unsigned long i;</div><div class='ctx'> </div><div class='ctx'> 	if (per_cpu(ici_cpuid4_info, cpu) == NULL)</div><div class='hunk'>@@ -1145,17 +1144,17 @@ static int __cpuinit cacheinfo_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 					unsigned long action, void *hcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu = (unsigned long)hcpu;</div><div class='del'>-	struct sys_device *sys_dev;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> </div><div class='del'>-	sys_dev = get_cpu_sysdev(cpu);</div><div class='add'>+	dev = get_cpu_device(cpu);</div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case CPU_ONLINE:</div><div class='ctx'> 	case CPU_ONLINE_FROZEN:</div><div class='del'>-		cache_add_dev(sys_dev);</div><div class='add'>+		cache_add_dev(dev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPU_DEAD:</div><div class='ctx'> 	case CPU_DEAD_FROZEN:</div><div class='del'>-		cache_remove_dev(sys_dev);</div><div class='add'>+		cache_remove_dev(dev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return NOTIFY_OK;</div><div class='hunk'>@@ -1174,9 +1173,9 @@ static int __cpuinit cache_sysfs_init(void)</div><div class='ctx'> </div><div class='ctx'> 	for_each_online_cpu(i) {</div><div class='ctx'> 		int err;</div><div class='del'>-		struct sys_device *sys_dev = get_cpu_sysdev(i);</div><div class='add'>+		struct device *dev = get_cpu_device(i);</div><div class='ctx'> </div><div class='del'>-		err = cache_add_dev(sys_dev);</div><div class='add'>+		err = cache_add_dev(dev);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mcheck/mce-internal.h b/arch/x86/kernel/cpu/mcheck/mce-internal.h<br/>index fefcc69ee8b5..ed44c8a65858 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/mcheck/mce-internal.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/cpu/mcheck/mce-internal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/mcheck/mce-internal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/cpu/mcheck/mce-internal.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;asm/mce.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum severity_level {</div><div class='hunk'>@@ -17,7 +17,7 @@ enum severity_level {</div><div class='ctx'> struct mce_bank {</div><div class='ctx'> 	u64			ctl;			/* subevents to enable */</div><div class='ctx'> 	unsigned char init;				/* initialise bank? */</div><div class='del'>-	struct sysdev_attribute attr;			/* sysdev attribute */</div><div class='add'>+	struct device_attribute attr;			/* device attribute */</div><div class='ctx'> 	char			attrname[ATTR_LEN];	/* attribute name */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c<br/>index cbe82b5918ce..5a11ae2e9e91 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/mcheck/mce.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/cpu/mcheck/mce.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/mcheck/mce.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/cpu/mcheck/mce.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='hunk'>@@ -1818,7 +1818,7 @@ static struct syscore_ops mce_syscore_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * mce_sysdev: Sysfs support</div><div class='add'>+ * mce_device: Sysfs support</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void mce_cpu_restart(void *data)</div><div class='hunk'>@@ -1854,27 +1854,28 @@ static void mce_enable_ce(void *all)</div><div class='ctx'> 		__mcheck_cpu_init_timer();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class mce_sysdev_class = {</div><div class='add'>+static struct bus_type mce_subsys = {</div><div class='ctx'> 	.name		= "machinecheck",</div><div class='add'>+	.dev_name	= "machinecheck",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-DEFINE_PER_CPU(struct sys_device, mce_sysdev);</div><div class='add'>+struct device *mce_device[CONFIG_NR_CPUS];</div><div class='ctx'> </div><div class='ctx'> __cpuinitdata</div><div class='ctx'> void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu);</div><div class='ctx'> </div><div class='del'>-static inline struct mce_bank *attr_to_bank(struct sysdev_attribute *attr)</div><div class='add'>+static inline struct mce_bank *attr_to_bank(struct device_attribute *attr)</div><div class='ctx'> {</div><div class='ctx'> 	return container_of(attr, struct mce_bank, attr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_bank(struct sys_device *s, struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t show_bank(struct device *s, struct device_attribute *attr,</div><div class='ctx'> 			 char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%llx\n", attr_to_bank(attr)-&gt;ctl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_bank(struct sys_device *s, struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t set_bank(struct device *s, struct device_attribute *attr,</div><div class='ctx'> 			const char *buf, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	u64 new;</div><div class='hunk'>@@ -1889,14 +1890,14 @@ static ssize_t set_bank(struct sys_device *s, struct sysdev_attribute *attr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_trigger(struct sys_device *s, struct sysdev_attribute *attr, char *buf)</div><div class='add'>+show_trigger(struct device *s, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	strcpy(buf, mce_helper);</div><div class='ctx'> 	strcat(buf, "\n");</div><div class='ctx'> 	return strlen(mce_helper) + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_trigger(struct sys_device *s, struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t set_trigger(struct device *s, struct device_attribute *attr,</div><div class='ctx'> 				const char *buf, size_t siz)</div><div class='ctx'> {</div><div class='ctx'> 	char *p;</div><div class='hunk'>@@ -1911,8 +1912,8 @@ static ssize_t set_trigger(struct sys_device *s, struct sysdev_attribute *attr,</div><div class='ctx'> 	return strlen(mce_helper) + !!p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_ignore_ce(struct sys_device *s,</div><div class='del'>-			     struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t set_ignore_ce(struct device *s,</div><div class='add'>+			     struct device_attribute *attr,</div><div class='ctx'> 			     const char *buf, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	u64 new;</div><div class='hunk'>@@ -1935,8 +1936,8 @@ static ssize_t set_ignore_ce(struct sys_device *s,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_cmci_disabled(struct sys_device *s,</div><div class='del'>-				 struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t set_cmci_disabled(struct device *s,</div><div class='add'>+				 struct device_attribute *attr,</div><div class='ctx'> 				 const char *buf, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	u64 new;</div><div class='hunk'>@@ -1958,108 +1959,117 @@ static ssize_t set_cmci_disabled(struct sys_device *s,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_int_with_restart(struct sys_device *s,</div><div class='del'>-				      struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t store_int_with_restart(struct device *s,</div><div class='add'>+				      struct device_attribute *attr,</div><div class='ctx'> 				      const char *buf, size_t size)</div><div class='ctx'> {</div><div class='del'>-	ssize_t ret = sysdev_store_int(s, attr, buf, size);</div><div class='add'>+	ssize_t ret = device_store_int(s, attr, buf, size);</div><div class='ctx'> 	mce_restart();</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(trigger, 0644, show_trigger, set_trigger);</div><div class='del'>-static SYSDEV_INT_ATTR(tolerant, 0644, tolerant);</div><div class='del'>-static SYSDEV_INT_ATTR(monarch_timeout, 0644, monarch_timeout);</div><div class='del'>-static SYSDEV_INT_ATTR(dont_log_ce, 0644, mce_dont_log_ce);</div><div class='add'>+static DEVICE_ATTR(trigger, 0644, show_trigger, set_trigger);</div><div class='add'>+static DEVICE_INT_ATTR(tolerant, 0644, tolerant);</div><div class='add'>+static DEVICE_INT_ATTR(monarch_timeout, 0644, monarch_timeout);</div><div class='add'>+static DEVICE_INT_ATTR(dont_log_ce, 0644, mce_dont_log_ce);</div><div class='ctx'> </div><div class='del'>-static struct sysdev_ext_attribute attr_check_interval = {</div><div class='del'>-	_SYSDEV_ATTR(check_interval, 0644, sysdev_show_int,</div><div class='del'>-		     store_int_with_restart),</div><div class='add'>+static struct dev_ext_attribute dev_attr_check_interval = {</div><div class='add'>+	__ATTR(check_interval, 0644, device_show_int, store_int_with_restart),</div><div class='ctx'> 	&amp;check_interval</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sysdev_ext_attribute attr_ignore_ce = {</div><div class='del'>-	_SYSDEV_ATTR(ignore_ce, 0644, sysdev_show_int, set_ignore_ce),</div><div class='add'>+static struct dev_ext_attribute dev_attr_ignore_ce = {</div><div class='add'>+	__ATTR(ignore_ce, 0644, device_show_int, set_ignore_ce),</div><div class='ctx'> 	&amp;mce_ignore_ce</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sysdev_ext_attribute attr_cmci_disabled = {</div><div class='del'>-	_SYSDEV_ATTR(cmci_disabled, 0644, sysdev_show_int, set_cmci_disabled),</div><div class='add'>+static struct dev_ext_attribute dev_attr_cmci_disabled = {</div><div class='add'>+	__ATTR(cmci_disabled, 0644, device_show_int, set_cmci_disabled),</div><div class='ctx'> 	&amp;mce_cmci_disabled</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sysdev_attribute *mce_sysdev_attrs[] = {</div><div class='del'>-	&amp;attr_tolerant.attr,</div><div class='del'>-	&amp;attr_check_interval.attr,</div><div class='del'>-	&amp;attr_trigger,</div><div class='del'>-	&amp;attr_monarch_timeout.attr,</div><div class='del'>-	&amp;attr_dont_log_ce.attr,</div><div class='del'>-	&amp;attr_ignore_ce.attr,</div><div class='del'>-	&amp;attr_cmci_disabled.attr,</div><div class='add'>+static struct device_attribute *mce_device_attrs[] = {</div><div class='add'>+	&amp;dev_attr_tolerant.attr,</div><div class='add'>+	&amp;dev_attr_check_interval.attr,</div><div class='add'>+	&amp;dev_attr_trigger,</div><div class='add'>+	&amp;dev_attr_monarch_timeout.attr,</div><div class='add'>+	&amp;dev_attr_dont_log_ce.attr,</div><div class='add'>+	&amp;dev_attr_ignore_ce.attr,</div><div class='add'>+	&amp;dev_attr_cmci_disabled.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static cpumask_var_t mce_sysdev_initialized;</div><div class='add'>+static cpumask_var_t mce_device_initialized;</div><div class='ctx'> </div><div class='del'>-/* Per cpu sysdev init. All of the cpus still share the same ctrl bank: */</div><div class='del'>-static __cpuinit int mce_sysdev_create(unsigned int cpu)</div><div class='add'>+static void mce_device_release(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct sys_device *sysdev = &amp;per_cpu(mce_sysdev, cpu);</div><div class='add'>+	kfree(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Per cpu device init. All of the cpus still share the same ctrl bank: */</div><div class='add'>+static __cpuinit int mce_device_create(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	struct device *dev;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	if (!mce_available(&amp;boot_cpu_data))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;sysdev-&gt;kobj, 0, sizeof(struct kobject));</div><div class='del'>-	sysdev-&gt;id  = cpu;</div><div class='del'>-	sysdev-&gt;cls = &amp;mce_sysdev_class;</div><div class='add'>+	dev = kzalloc(sizeof *dev, GFP_KERNEL);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	dev-&gt;id  = cpu;</div><div class='add'>+	dev-&gt;bus = &amp;mce_subsys;</div><div class='add'>+	dev-&gt;release = &amp;mce_device_release;</div><div class='ctx'> </div><div class='del'>-	err = sysdev_register(sysdev);</div><div class='add'>+	err = device_register(dev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; mce_sysdev_attrs[i]; i++) {</div><div class='del'>-		err = sysdev_create_file(sysdev, mce_sysdev_attrs[i]);</div><div class='add'>+	for (i = 0; mce_device_attrs[i]; i++) {</div><div class='add'>+		err = device_create_file(dev, mce_device_attrs[i]);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto error;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (j = 0; j &lt; banks; j++) {</div><div class='del'>-		err = sysdev_create_file(sysdev, &amp;mce_banks[j].attr);</div><div class='add'>+		err = device_create_file(dev, &amp;mce_banks[j].attr);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto error2;</div><div class='ctx'> 	}</div><div class='del'>-	cpumask_set_cpu(cpu, mce_sysdev_initialized);</div><div class='add'>+	cpumask_set_cpu(cpu, mce_device_initialized);</div><div class='add'>+	mce_device[cpu] = dev;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> error2:</div><div class='ctx'> 	while (--j &gt;= 0)</div><div class='del'>-		sysdev_remove_file(sysdev, &amp;mce_banks[j].attr);</div><div class='add'>+		device_remove_file(dev, &amp;mce_banks[j].attr);</div><div class='ctx'> error:</div><div class='ctx'> 	while (--i &gt;= 0)</div><div class='del'>-		sysdev_remove_file(sysdev, mce_sysdev_attrs[i]);</div><div class='add'>+		device_remove_file(dev, mce_device_attrs[i]);</div><div class='ctx'> </div><div class='del'>-	sysdev_unregister(sysdev);</div><div class='add'>+	device_unregister(dev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __cpuinit void mce_sysdev_remove(unsigned int cpu)</div><div class='add'>+static __cpuinit void mce_device_remove(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	struct sys_device *sysdev = &amp;per_cpu(mce_sysdev, cpu);</div><div class='add'>+	struct device *dev = mce_device[cpu];</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!cpumask_test_cpu(cpu, mce_sysdev_initialized))</div><div class='add'>+	if (!cpumask_test_cpu(cpu, mce_device_initialized))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; mce_sysdev_attrs[i]; i++)</div><div class='del'>-		sysdev_remove_file(sysdev, mce_sysdev_attrs[i]);</div><div class='add'>+	for (i = 0; mce_device_attrs[i]; i++)</div><div class='add'>+		device_remove_file(dev, mce_device_attrs[i]);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; banks; i++)</div><div class='del'>-		sysdev_remove_file(sysdev, &amp;mce_banks[i].attr);</div><div class='add'>+		device_remove_file(dev, &amp;mce_banks[i].attr);</div><div class='ctx'> </div><div class='del'>-	sysdev_unregister(sysdev);</div><div class='del'>-	cpumask_clear_cpu(cpu, mce_sysdev_initialized);</div><div class='add'>+	device_unregister(dev);</div><div class='add'>+	cpumask_clear_cpu(cpu, mce_device_initialized);</div><div class='add'>+	mce_device[cpu] = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Make sure there are no machine checks on offlined CPUs. */</div><div class='hunk'>@@ -2109,7 +2119,7 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)</div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case CPU_ONLINE:</div><div class='ctx'> 	case CPU_ONLINE_FROZEN:</div><div class='del'>-		mce_sysdev_create(cpu);</div><div class='add'>+		mce_device_create(cpu);</div><div class='ctx'> 		if (threshold_cpu_callback)</div><div class='ctx'> 			threshold_cpu_callback(action, cpu);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2117,7 +2127,7 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)</div><div class='ctx'> 	case CPU_DEAD_FROZEN:</div><div class='ctx'> 		if (threshold_cpu_callback)</div><div class='ctx'> 			threshold_cpu_callback(action, cpu);</div><div class='del'>-		mce_sysdev_remove(cpu);</div><div class='add'>+		mce_device_remove(cpu);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPU_DOWN_PREPARE:</div><div class='ctx'> 	case CPU_DOWN_PREPARE_FROZEN:</div><div class='hunk'>@@ -2151,7 +2161,7 @@ static __init void mce_init_banks(void)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; banks; i++) {</div><div class='ctx'> 		struct mce_bank *b = &amp;mce_banks[i];</div><div class='del'>-		struct sysdev_attribute *a = &amp;b-&gt;attr;</div><div class='add'>+		struct device_attribute *a = &amp;b-&gt;attr;</div><div class='ctx'> </div><div class='ctx'> 		sysfs_attr_init(&amp;a-&gt;attr);</div><div class='ctx'> 		a-&gt;attr.name	= b-&gt;attrname;</div><div class='hunk'>@@ -2171,16 +2181,16 @@ static __init int mcheck_init_device(void)</div><div class='ctx'> 	if (!mce_available(&amp;boot_cpu_data))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	zalloc_cpumask_var(&amp;mce_sysdev_initialized, GFP_KERNEL);</div><div class='add'>+	zalloc_cpumask_var(&amp;mce_device_initialized, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	mce_init_banks();</div><div class='ctx'> </div><div class='del'>-	err = sysdev_class_register(&amp;mce_sysdev_class);</div><div class='add'>+	err = subsys_system_register(&amp;mce_subsys, NULL);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	for_each_online_cpu(i) {</div><div class='del'>-		err = mce_sysdev_create(i);</div><div class='add'>+		err = mce_device_create(i);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c<br/>index 1d76872b6a45..786e76a86322 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/mcheck/mce_amd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/cpu/mcheck/mce_amd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/mcheck/mce_amd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/cpu/mcheck/mce_amd.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/kobject.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='hunk'>@@ -524,6 +523,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)</div><div class='ctx'> {</div><div class='ctx'> 	int i, err = 0;</div><div class='ctx'> 	struct threshold_bank *b = NULL;</div><div class='add'>+	struct device *dev = mce_device[cpu];</div><div class='ctx'> 	char name[32];</div><div class='ctx'> </div><div class='ctx'> 	sprintf(name, "threshold_bank%i", bank);</div><div class='hunk'>@@ -544,8 +544,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)</div><div class='ctx'> 		if (!b)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		err = sysfs_create_link(&amp;per_cpu(mce_sysdev, cpu).kobj,</div><div class='del'>-					b-&gt;kobj, name);</div><div class='add'>+		err = sysfs_create_link(&amp;dev-&gt;kobj, b-&gt;kobj, name);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -566,7 +565,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	b-&gt;kobj = kobject_create_and_add(name, &amp;per_cpu(mce_sysdev, cpu).kobj);</div><div class='add'>+	b-&gt;kobj = kobject_create_and_add(name, &amp;dev-&gt;kobj);</div><div class='ctx'> 	if (!b-&gt;kobj)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='hunk'>@@ -586,8 +585,9 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)</div><div class='ctx'> 		if (i == cpu)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		err = sysfs_create_link(&amp;per_cpu(mce_sysdev, i).kobj,</div><div class='del'>-					b-&gt;kobj, name);</div><div class='add'>+		dev = mce_device[i];</div><div class='add'>+		if (dev)</div><div class='add'>+			err = sysfs_create_link(&amp;dev-&gt;kobj,b-&gt;kobj, name);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -650,6 +650,7 @@ static void deallocate_threshold_block(unsigned int cpu,</div><div class='ctx'> static void threshold_remove_bank(unsigned int cpu, int bank)</div><div class='ctx'> {</div><div class='ctx'> 	struct threshold_bank *b;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> 	char name[32];</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -664,7 +665,7 @@ static void threshold_remove_bank(unsigned int cpu, int bank)</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	/* sibling symlink */</div><div class='ctx'> 	if (shared_bank[bank] &amp;&amp; b-&gt;blocks-&gt;cpu != cpu) {</div><div class='del'>-		sysfs_remove_link(&amp;per_cpu(mce_sysdev, cpu).kobj, name);</div><div class='add'>+		sysfs_remove_link(&amp;mce_device[cpu]-&gt;kobj, name);</div><div class='ctx'> 		per_cpu(threshold_banks, cpu)[bank] = NULL;</div><div class='ctx'> </div><div class='ctx'> 		return;</div><div class='hunk'>@@ -676,7 +677,9 @@ static void threshold_remove_bank(unsigned int cpu, int bank)</div><div class='ctx'> 		if (i == cpu)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		sysfs_remove_link(&amp;per_cpu(mce_sysdev, i).kobj, name);</div><div class='add'>+		dev = mce_device[i];</div><div class='add'>+		if (dev)</div><div class='add'>+			sysfs_remove_link(&amp;dev-&gt;kobj, name);</div><div class='ctx'> 		per_cpu(threshold_banks, i)[bank] = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c<br/>index 39c6089891e4..67bb17a37a0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/mcheck/therm_throt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/cpu/mcheck/therm_throt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpu/mcheck/therm_throt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/cpu/mcheck/therm_throt.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.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/smp.h&gt;</div><div class='hunk'>@@ -69,16 +68,16 @@ static atomic_t therm_throt_en	= ATOMIC_INIT(0);</div><div class='ctx'> static u32 lvtthmr_init __read_mostly;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSFS</div><div class='del'>-#define define_therm_throt_sysdev_one_ro(_name)				\</div><div class='del'>-	static SYSDEV_ATTR(_name, 0444,					\</div><div class='del'>-			   therm_throt_sysdev_show_##_name,		\</div><div class='add'>+#define define_therm_throt_device_one_ro(_name)				\</div><div class='add'>+	static DEVICE_ATTR(_name, 0444,					\</div><div class='add'>+			   therm_throt_device_show_##_name,		\</div><div class='ctx'> 				   NULL)				\</div><div class='ctx'> </div><div class='del'>-#define define_therm_throt_sysdev_show_func(event, name)		\</div><div class='add'>+#define define_therm_throt_device_show_func(event, name)		\</div><div class='ctx'> 									\</div><div class='del'>-static ssize_t therm_throt_sysdev_show_##event##_##name(		\</div><div class='del'>-			struct sys_device *dev,				\</div><div class='del'>-			struct sysdev_attribute *attr,			\</div><div class='add'>+static ssize_t therm_throt_device_show_##event##_##name(		\</div><div class='add'>+			struct device *dev,				\</div><div class='add'>+			struct device_attribute *attr,			\</div><div class='ctx'> 			char *buf)					\</div><div class='ctx'> {									\</div><div class='ctx'> 	unsigned int cpu = dev-&gt;id;					\</div><div class='hunk'>@@ -95,20 +94,20 @@ static ssize_t therm_throt_sysdev_show_##event##_##name(		\</div><div class='ctx'> 	return ret;							\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-define_therm_throt_sysdev_show_func(core_throttle, count);</div><div class='del'>-define_therm_throt_sysdev_one_ro(core_throttle_count);</div><div class='add'>+define_therm_throt_device_show_func(core_throttle, count);</div><div class='add'>+define_therm_throt_device_one_ro(core_throttle_count);</div><div class='ctx'> </div><div class='del'>-define_therm_throt_sysdev_show_func(core_power_limit, count);</div><div class='del'>-define_therm_throt_sysdev_one_ro(core_power_limit_count);</div><div class='add'>+define_therm_throt_device_show_func(core_power_limit, count);</div><div class='add'>+define_therm_throt_device_one_ro(core_power_limit_count);</div><div class='ctx'> </div><div class='del'>-define_therm_throt_sysdev_show_func(package_throttle, count);</div><div class='del'>-define_therm_throt_sysdev_one_ro(package_throttle_count);</div><div class='add'>+define_therm_throt_device_show_func(package_throttle, count);</div><div class='add'>+define_therm_throt_device_one_ro(package_throttle_count);</div><div class='ctx'> </div><div class='del'>-define_therm_throt_sysdev_show_func(package_power_limit, count);</div><div class='del'>-define_therm_throt_sysdev_one_ro(package_power_limit_count);</div><div class='add'>+define_therm_throt_device_show_func(package_power_limit, count);</div><div class='add'>+define_therm_throt_device_one_ro(package_power_limit_count);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *thermal_throttle_attrs[] = {</div><div class='del'>-	&amp;attr_core_throttle_count.attr,</div><div class='add'>+	&amp;dev_attr_core_throttle_count.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -223,36 +222,36 @@ static int thresh_event_valid(int event)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSFS</div><div class='ctx'> /* Add/Remove thermal_throttle interface for CPU device: */</div><div class='del'>-static __cpuinit int thermal_throttle_add_dev(struct sys_device *sys_dev,</div><div class='add'>+static __cpuinit int thermal_throttle_add_dev(struct device *dev,</div><div class='ctx'> 				unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct cpuinfo_x86 *c = &amp;cpu_data(cpu);</div><div class='ctx'> </div><div class='del'>-	err = sysfs_create_group(&amp;sys_dev-&gt;kobj, &amp;thermal_attr_group);</div><div class='add'>+	err = sysfs_create_group(&amp;dev-&gt;kobj, &amp;thermal_attr_group);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_has(c, X86_FEATURE_PLN))</div><div class='del'>-		err = sysfs_add_file_to_group(&amp;sys_dev-&gt;kobj,</div><div class='del'>-					      &amp;attr_core_power_limit_count.attr,</div><div class='add'>+		err = sysfs_add_file_to_group(&amp;dev-&gt;kobj,</div><div class='add'>+					      &amp;dev_attr_core_power_limit_count.attr,</div><div class='ctx'> 					      thermal_attr_group.name);</div><div class='ctx'> 	if (cpu_has(c, X86_FEATURE_PTS)) {</div><div class='del'>-		err = sysfs_add_file_to_group(&amp;sys_dev-&gt;kobj,</div><div class='del'>-					      &amp;attr_package_throttle_count.attr,</div><div class='add'>+		err = sysfs_add_file_to_group(&amp;dev-&gt;kobj,</div><div class='add'>+					      &amp;dev_attr_package_throttle_count.attr,</div><div class='ctx'> 					      thermal_attr_group.name);</div><div class='ctx'> 		if (cpu_has(c, X86_FEATURE_PLN))</div><div class='del'>-			err = sysfs_add_file_to_group(&amp;sys_dev-&gt;kobj,</div><div class='del'>-					&amp;attr_package_power_limit_count.attr,</div><div class='add'>+			err = sysfs_add_file_to_group(&amp;dev-&gt;kobj,</div><div class='add'>+					&amp;dev_attr_package_power_limit_count.attr,</div><div class='ctx'> 					thermal_attr_group.name);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __cpuinit void thermal_throttle_remove_dev(struct sys_device *sys_dev)</div><div class='add'>+static __cpuinit void thermal_throttle_remove_dev(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	sysfs_remove_group(&amp;sys_dev-&gt;kobj, &amp;thermal_attr_group);</div><div class='add'>+	sysfs_remove_group(&amp;dev-&gt;kobj, &amp;thermal_attr_group);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Mutex protecting device creation against CPU hotplug: */</div><div class='hunk'>@@ -265,16 +264,16 @@ thermal_throttle_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 			      void *hcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu = (unsigned long)hcpu;</div><div class='del'>-	struct sys_device *sys_dev;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	sys_dev = get_cpu_sysdev(cpu);</div><div class='add'>+	dev = get_cpu_device(cpu);</div><div class='ctx'> </div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case CPU_UP_PREPARE:</div><div class='ctx'> 	case CPU_UP_PREPARE_FROZEN:</div><div class='ctx'> 		mutex_lock(&amp;therm_cpu_lock);</div><div class='del'>-		err = thermal_throttle_add_dev(sys_dev, cpu);</div><div class='add'>+		err = thermal_throttle_add_dev(dev, cpu);</div><div class='ctx'> 		mutex_unlock(&amp;therm_cpu_lock);</div><div class='ctx'> 		WARN_ON(err);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -283,7 +282,7 @@ thermal_throttle_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 	case CPU_DEAD:</div><div class='ctx'> 	case CPU_DEAD_FROZEN:</div><div class='ctx'> 		mutex_lock(&amp;therm_cpu_lock);</div><div class='del'>-		thermal_throttle_remove_dev(sys_dev);</div><div class='add'>+		thermal_throttle_remove_dev(dev);</div><div class='ctx'> 		mutex_unlock(&amp;therm_cpu_lock);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -310,7 +309,7 @@ static __init int thermal_throttle_init_device(void)</div><div class='ctx'> #endif</div><div class='ctx'> 	/* connect live CPUs to sysfs */</div><div class='ctx'> 	for_each_online_cpu(cpu) {</div><div class='del'>-		err = thermal_throttle_add_dev(get_cpu_sysdev(cpu), cpu);</div><div class='add'>+		err = thermal_throttle_add_dev(get_cpu_device(cpu), cpu);</div><div class='ctx'> 		WARN_ON(err);</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='head'>diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c<br/>index 212a6a42527c..a524353d93f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpuid.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/cpuid.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/cpuid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/cpuid.c</a></div><div class='hunk'>@@ -177,7 +177,7 @@ static struct notifier_block __refdata cpuid_class_cpu_notifier =</div><div class='ctx'> 	.notifier_call = cpuid_class_cpu_callback,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *cpuid_devnode(struct device *dev, mode_t *mode)</div><div class='add'>+static char *cpuid_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	return kasprintf(GFP_KERNEL, "cpu/%u/cpuid", MINOR(dev-&gt;devt));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c<br/>index 8071e2f3d6eb..62d61e9976eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/e820.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/e820.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/e820.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/e820.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/firmware-map.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='add'>+#include &lt;linux/sort.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/e820.h&gt;</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='hunk'>@@ -227,22 +228,38 @@ void __init e820_print_map(char *who)</div><div class='ctx'>  *	   ____________________33__</div><div class='ctx'>  *	   ______________________4_</div><div class='ctx'>  */</div><div class='add'>+struct change_member {</div><div class='add'>+	struct e820entry *pbios; /* pointer to original bios entry */</div><div class='add'>+	unsigned long long addr; /* address for this change point */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init cpcompare(const void *a, const void *b)</div><div class='add'>+{</div><div class='add'>+	struct change_member * const *app = a, * const *bpp = b;</div><div class='add'>+	const struct change_member *ap = *app, *bp = *bpp;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Inputs are pointers to two elements of change_point[].  If their</div><div class='add'>+	 * addresses are unequal, their difference dominates.  If the addresses</div><div class='add'>+	 * are equal, then consider one that represents the end of its region</div><div class='add'>+	 * to be greater than one that does not.</div><div class='add'>+	 */</div><div class='add'>+	if (ap-&gt;addr != bp-&gt;addr)</div><div class='add'>+		return ap-&gt;addr &gt; bp-&gt;addr ? 1 : -1;</div><div class='add'>+</div><div class='add'>+	return (ap-&gt;addr != ap-&gt;pbios-&gt;addr) - (bp-&gt;addr != bp-&gt;pbios-&gt;addr);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> int __init sanitize_e820_map(struct e820entry *biosmap, int max_nr_map,</div><div class='ctx'> 			     u32 *pnr_map)</div><div class='ctx'> {</div><div class='del'>-	struct change_member {</div><div class='del'>-		struct e820entry *pbios; /* pointer to original bios entry */</div><div class='del'>-		unsigned long long addr; /* address for this change point */</div><div class='del'>-	};</div><div class='ctx'> 	static struct change_member change_point_list[2*E820_X_MAX] __initdata;</div><div class='ctx'> 	static struct change_member *change_point[2*E820_X_MAX] __initdata;</div><div class='ctx'> 	static struct e820entry *overlap_list[E820_X_MAX] __initdata;</div><div class='ctx'> 	static struct e820entry new_bios[E820_X_MAX] __initdata;</div><div class='del'>-	struct change_member *change_tmp;</div><div class='ctx'> 	unsigned long current_type, last_type;</div><div class='ctx'> 	unsigned long long last_addr;</div><div class='del'>-	int chgidx, still_changing;</div><div class='add'>+	int chgidx;</div><div class='ctx'> 	int overlap_entries;</div><div class='ctx'> 	int new_bios_entry;</div><div class='ctx'> 	int old_nr, new_nr, chg_nr;</div><div class='hunk'>@@ -279,35 +296,7 @@ int __init sanitize_e820_map(struct e820entry *biosmap, int max_nr_map,</div><div class='ctx'> 	chg_nr = chgidx;</div><div class='ctx'> </div><div class='ctx'> 	/* sort change-point list by memory addresses (low -&gt; high) */</div><div class='del'>-	still_changing = 1;</div><div class='del'>-	while (still_changing)	{</div><div class='del'>-		still_changing = 0;</div><div class='del'>-		for (i = 1; i &lt; chg_nr; i++)  {</div><div class='del'>-			unsigned long long curaddr, lastaddr;</div><div class='del'>-			unsigned long long curpbaddr, lastpbaddr;</div><div class='del'>-</div><div class='del'>-			curaddr = change_point[i]-&gt;addr;</div><div class='del'>-			lastaddr = change_point[i - 1]-&gt;addr;</div><div class='del'>-			curpbaddr = change_point[i]-&gt;pbios-&gt;addr;</div><div class='del'>-			lastpbaddr = change_point[i - 1]-&gt;pbios-&gt;addr;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * swap entries, when:</div><div class='del'>-			 *</div><div class='del'>-			 * curaddr &gt; lastaddr or</div><div class='del'>-			 * curaddr == lastaddr and curaddr == curpbaddr and</div><div class='del'>-			 * lastaddr != lastpbaddr</div><div class='del'>-			 */</div><div class='del'>-			if (curaddr &lt; lastaddr ||</div><div class='del'>-			    (curaddr == lastaddr &amp;&amp; curaddr == curpbaddr &amp;&amp;</div><div class='del'>-			     lastaddr != lastpbaddr)) {</div><div class='del'>-				change_tmp = change_point[i];</div><div class='del'>-				change_point[i] = change_point[i-1];</div><div class='del'>-				change_point[i-1] = change_tmp;</div><div class='del'>-				still_changing = 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	sort(change_point, chg_nr, sizeof *change_point, cpcompare, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* create a new bios memory map, removing overlaps */</div><div class='ctx'> 	overlap_entries = 0;	 /* number of entries in the overlap table */</div><div class='hunk'>@@ -714,7 +703,7 @@ void __init e820_mark_nosave_regions(unsigned long limit_pfn)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HIBERNATION</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='ctx'> /**</div><div class='ctx'>  * Mark ACPI NVS memory region, so that we can save/restore it during</div><div class='ctx'>  * hibernation and the subsequent resume.</div><div class='hunk'>@@ -727,7 +716,7 @@ static int __init e820_mark_nvs_memory(void)</div><div class='ctx'> 		struct e820entry *ei = &amp;e820.map[i];</div><div class='ctx'> </div><div class='ctx'> 		if (ei-&gt;type == E820_NVS)</div><div class='del'>-			suspend_nvs_register(ei-&gt;addr, ei-&gt;size);</div><div class='add'>+			acpi_nvs_register(ei-&gt;addr, ei-&gt;size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c<br/>index cd28a350f7f9..9b9f18b49918 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/early_printk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/early_printk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/early_printk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/early_printk.c</a></div><div class='hunk'>@@ -240,14 +240,14 @@ static int __init setup_early_printk(char *buf)</div><div class='ctx'> 		if (!strncmp(buf, "xen", 3))</div><div class='ctx'> 			early_console_register(&amp;xenboot_console, keep);</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_EARLY_PRINTK_MRST</div><div class='add'>+#ifdef CONFIG_EARLY_PRINTK_INTEL_MID</div><div class='ctx'> 		if (!strncmp(buf, "mrst", 4)) {</div><div class='ctx'> 			mrst_early_console_init();</div><div class='ctx'> 			early_console_register(&amp;early_mrst_console, keep);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!strncmp(buf, "hsu", 3)) {</div><div class='del'>-			hsu_early_console_init();</div><div class='add'>+			hsu_early_console_init(buf + 3);</div><div class='ctx'> 			early_console_register(&amp;early_hsu_console, keep);</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S<br/>index 22d0e21b4dd7..79d97e68f042 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/entry_32.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/entry_32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/entry_32.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/entry_32.S</a></div><div class='hunk'>@@ -42,6 +42,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='ctx'> #include &lt;asm/irqflags.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='hunk'>@@ -81,8 +82,6 @@</div><div class='ctx'>  * enough to patch inline, increasing performance.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define nr_syscalls ((syscall_table_size)/4)</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PREEMPT</div><div class='ctx'> #define preempt_stop(clobbers)	DISABLE_INTERRUPTS(clobbers); TRACE_IRQS_OFF</div><div class='ctx'> #else</div><div class='hunk'>@@ -423,7 +422,7 @@ sysenter_past_esp:</div><div class='ctx'> 	testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)</div><div class='ctx'> 	jnz sysenter_audit</div><div class='ctx'> sysenter_do_call:</div><div class='del'>-	cmpl $(nr_syscalls), %eax</div><div class='add'>+	cmpl $(NR_syscalls), %eax</div><div class='ctx'> 	jae syscall_badsys</div><div class='ctx'> 	call *sys_call_table(,%eax,4)</div><div class='ctx'> 	movl %eax,PT_EAX(%esp)</div><div class='hunk'>@@ -455,7 +454,7 @@ sysenter_audit:</div><div class='ctx'> 	movl %ebx,%ecx			/* 3rd arg: 1st syscall arg */</div><div class='ctx'> 	movl %eax,%edx			/* 2nd arg: syscall number */</div><div class='ctx'> 	movl $AUDIT_ARCH_I386,%eax	/* 1st arg: audit arch */</div><div class='del'>-	call audit_syscall_entry</div><div class='add'>+	call __audit_syscall_entry</div><div class='ctx'> 	pushl_cfi %ebx</div><div class='ctx'> 	movl PT_EAX(%esp),%eax		/* reload syscall number */</div><div class='ctx'> 	jmp sysenter_do_call</div><div class='hunk'>@@ -466,11 +465,10 @@ sysexit_audit:</div><div class='ctx'> 	TRACE_IRQS_ON</div><div class='ctx'> 	ENABLE_INTERRUPTS(CLBR_ANY)</div><div class='ctx'> 	movl %eax,%edx		/* second arg, syscall return value */</div><div class='del'>-	cmpl $0,%eax		/* is it &lt; 0? */</div><div class='del'>-	setl %al		/* 1 if so, 0 if not */</div><div class='add'>+	cmpl $-MAX_ERRNO,%eax	/* is it an error ? */</div><div class='add'>+	setbe %al		/* 1 if so, 0 if not */</div><div class='ctx'> 	movzbl %al,%eax		/* zero-extend that */</div><div class='del'>-	inc %eax /* first arg, 0-&gt;1(AUDITSC_SUCCESS), 1-&gt;2(AUDITSC_FAILURE) */</div><div class='del'>-	call audit_syscall_exit</div><div class='add'>+	call __audit_syscall_exit</div><div class='ctx'> 	DISABLE_INTERRUPTS(CLBR_ANY)</div><div class='ctx'> 	TRACE_IRQS_OFF</div><div class='ctx'> 	movl TI_flags(%ebp), %ecx</div><div class='hunk'>@@ -504,7 +502,7 @@ ENTRY(system_call)</div><div class='ctx'> 					# system call tracing in operation / emulation</div><div class='ctx'> 	testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)</div><div class='ctx'> 	jnz syscall_trace_entry</div><div class='del'>-	cmpl $(nr_syscalls), %eax</div><div class='add'>+	cmpl $(NR_syscalls), %eax</div><div class='ctx'> 	jae syscall_badsys</div><div class='ctx'> syscall_call:</div><div class='ctx'> 	call *sys_call_table(,%eax,4)</div><div class='hunk'>@@ -654,7 +652,7 @@ syscall_trace_entry:</div><div class='ctx'> 	movl %esp, %eax</div><div class='ctx'> 	call syscall_trace_enter</div><div class='ctx'> 	/* What it returned is what we'll actually use.  */</div><div class='del'>-	cmpl $(nr_syscalls), %eax</div><div class='add'>+	cmpl $(NR_syscalls), %eax</div><div class='ctx'> 	jnae syscall_call</div><div class='ctx'> 	jmp syscall_exit</div><div class='ctx'> END(syscall_trace_entry)</div><div class='hunk'>@@ -694,29 +692,28 @@ END(syscall_badsys)</div><div class='ctx'>  * System calls that need a pt_regs pointer.</div><div class='ctx'>  */</div><div class='ctx'> #define PTREGSCALL0(name) \</div><div class='del'>-	ALIGN; \</div><div class='del'>-ptregs_##name: \</div><div class='add'>+ENTRY(ptregs_##name) ;  \</div><div class='ctx'> 	leal 4(%esp),%eax; \</div><div class='del'>-	jmp sys_##name;</div><div class='add'>+	jmp sys_##name; \</div><div class='add'>+ENDPROC(ptregs_##name)</div><div class='ctx'> </div><div class='ctx'> #define PTREGSCALL1(name) \</div><div class='del'>-	ALIGN; \</div><div class='del'>-ptregs_##name: \</div><div class='add'>+ENTRY(ptregs_##name) ; \</div><div class='ctx'> 	leal 4(%esp),%edx; \</div><div class='ctx'> 	movl (PT_EBX+4)(%esp),%eax; \</div><div class='del'>-	jmp sys_##name;</div><div class='add'>+	jmp sys_##name; \</div><div class='add'>+ENDPROC(ptregs_##name)</div><div class='ctx'> </div><div class='ctx'> #define PTREGSCALL2(name) \</div><div class='del'>-	ALIGN; \</div><div class='del'>-ptregs_##name: \</div><div class='add'>+ENTRY(ptregs_##name) ; \</div><div class='ctx'> 	leal 4(%esp),%ecx; \</div><div class='ctx'> 	movl (PT_ECX+4)(%esp),%edx; \</div><div class='ctx'> 	movl (PT_EBX+4)(%esp),%eax; \</div><div class='del'>-	jmp sys_##name;</div><div class='add'>+	jmp sys_##name; \</div><div class='add'>+ENDPROC(ptregs_##name)</div><div class='ctx'> </div><div class='ctx'> #define PTREGSCALL3(name) \</div><div class='del'>-	ALIGN; \</div><div class='del'>-ptregs_##name: \</div><div class='add'>+ENTRY(ptregs_##name) ; \</div><div class='ctx'> 	CFI_STARTPROC; \</div><div class='ctx'> 	leal 4(%esp),%eax; \</div><div class='ctx'> 	pushl_cfi %eax; \</div><div class='hunk'>@@ -741,8 +738,7 @@ PTREGSCALL2(vm86)</div><div class='ctx'> PTREGSCALL1(vm86old)</div><div class='ctx'> </div><div class='ctx'> /* Clone is an oddball.  The 4th arg is in %edi */</div><div class='del'>-	ALIGN;</div><div class='del'>-ptregs_clone:</div><div class='add'>+ENTRY(ptregs_clone)</div><div class='ctx'> 	CFI_STARTPROC</div><div class='ctx'> 	leal 4(%esp),%eax</div><div class='ctx'> 	pushl_cfi %eax</div><div class='hunk'>@@ -1213,11 +1209,6 @@ return_to_handler:</div><div class='ctx'> 	jmp *%ecx</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-.section .rodata,"a"</div><div class='del'>-#include "syscall_table_32.S"</div><div class='del'>-</div><div class='del'>-syscall_table_size=(.-sys_call_table)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Some functions should be protected against kprobes</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S<br/>index a20e1cb9dc87..3fe8239fd8fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/entry_64.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/entry_64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/entry_64.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/entry_64.S</a></div><div class='hunk'>@@ -55,6 +55,7 @@</div><div class='ctx'> #include &lt;asm/paravirt.h&gt;</div><div class='ctx'> #include &lt;asm/ftrace.h&gt;</div><div class='ctx'> #include &lt;asm/percpu.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Avoid __ASSEMBLER__'ifying &lt;linux/audit.h&gt; just for this.  */</div><div class='ctx'> #include &lt;linux/elf-em.h&gt;</div><div class='hunk'>@@ -548,7 +549,7 @@ badsys:</div><div class='ctx'> #ifdef CONFIG_AUDITSYSCALL</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Fast path for syscall audit without full syscall trace.</div><div class='del'>-	 * We just call audit_syscall_entry() directly, and then</div><div class='add'>+	 * We just call __audit_syscall_entry() directly, and then</div><div class='ctx'> 	 * jump back to the normal fast path.</div><div class='ctx'> 	 */</div><div class='ctx'> auditsys:</div><div class='hunk'>@@ -558,22 +559,21 @@ auditsys:</div><div class='ctx'> 	movq %rdi,%rdx			/* 3rd arg: 1st syscall arg */</div><div class='ctx'> 	movq %rax,%rsi			/* 2nd arg: syscall number */</div><div class='ctx'> 	movl $AUDIT_ARCH_X86_64,%edi	/* 1st arg: audit arch */</div><div class='del'>-	call audit_syscall_entry</div><div class='add'>+	call __audit_syscall_entry</div><div class='ctx'> 	LOAD_ARGS 0		/* reload call-clobbered registers */</div><div class='ctx'> 	jmp system_call_fastpath</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Return fast path for syscall audit.  Call audit_syscall_exit()</div><div class='add'>+	 * Return fast path for syscall audit.  Call __audit_syscall_exit()</div><div class='ctx'> 	 * directly and then jump back to the fast path with TIF_SYSCALL_AUDIT</div><div class='ctx'> 	 * masked off.</div><div class='ctx'> 	 */</div><div class='ctx'> sysret_audit:</div><div class='ctx'> 	movq RAX-ARGOFFSET(%rsp),%rsi	/* second arg, syscall return value */</div><div class='del'>-	cmpq $0,%rsi		/* is it &lt; 0? */</div><div class='del'>-	setl %al		/* 1 if so, 0 if not */</div><div class='add'>+	cmpq $-MAX_ERRNO,%rsi	/* is it &lt; -MAX_ERRNO? */</div><div class='add'>+	setbe %al		/* 1 if so, 0 if not */</div><div class='ctx'> 	movzbl %al,%edi		/* zero-extend that into %edi */</div><div class='del'>-	inc %edi /* first arg, 0-&gt;1(AUDITSC_SUCCESS), 1-&gt;2(AUDITSC_FAILURE) */</div><div class='del'>-	call audit_syscall_exit</div><div class='add'>+	call __audit_syscall_exit</div><div class='ctx'> 	movl $(_TIF_ALLWORK_MASK &amp; ~_TIF_SYSCALL_AUDIT),%edi</div><div class='ctx'> 	jmp sysret_check</div><div class='ctx'> #endif	/* CONFIG_AUDITSYSCALL */</div><div class='hunk'>@@ -1480,62 +1480,214 @@ ENTRY(error_exit)</div><div class='ctx'> 	CFI_ENDPROC</div><div class='ctx'> END(error_exit)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Test if a given stack is an NMI stack or not.</div><div class='add'>+ */</div><div class='add'>+	.macro test_in_nmi reg stack nmi_ret normal_ret</div><div class='add'>+	cmpq %\reg, \stack</div><div class='add'>+	ja \normal_ret</div><div class='add'>+	subq $EXCEPTION_STKSZ, %\reg</div><div class='add'>+	cmpq %\reg, \stack</div><div class='add'>+	jb \normal_ret</div><div class='add'>+	jmp \nmi_ret</div><div class='add'>+	.endm</div><div class='ctx'> </div><div class='ctx'> 	/* runs on exception stack */</div><div class='ctx'> ENTRY(nmi)</div><div class='ctx'> 	INTR_FRAME</div><div class='ctx'> 	PARAVIRT_ADJUST_EXCEPTION_FRAME</div><div class='del'>-	pushq_cfi $-1</div><div class='add'>+	/*</div><div class='add'>+	 * We allow breakpoints in NMIs. If a breakpoint occurs, then</div><div class='add'>+	 * the iretq it performs will take us out of NMI context.</div><div class='add'>+	 * This means that we can have nested NMIs where the next</div><div class='add'>+	 * NMI is using the top of the stack of the previous NMI. We</div><div class='add'>+	 * can't let it execute because the nested NMI will corrupt the</div><div class='add'>+	 * stack of the previous NMI. NMI handlers are not re-entrant</div><div class='add'>+	 * anyway.</div><div class='add'>+	 *</div><div class='add'>+	 * To handle this case we do the following:</div><div class='add'>+	 *  Check the a special location on the stack that contains</div><div class='add'>+	 *  a variable that is set when NMIs are executing.</div><div class='add'>+	 *  The interrupted task's stack is also checked to see if it</div><div class='add'>+	 *  is an NMI stack.</div><div class='add'>+	 *  If the variable is not set and the stack is not the NMI</div><div class='add'>+	 *  stack then:</div><div class='add'>+	 *    o Set the special variable on the stack</div><div class='add'>+	 *    o Copy the interrupt frame into a "saved" location on the stack</div><div class='add'>+	 *    o Copy the interrupt frame into a "copy" location on the stack</div><div class='add'>+	 *    o Continue processing the NMI</div><div class='add'>+	 *  If the variable is set or the previous stack is the NMI stack:</div><div class='add'>+	 *    o Modify the "copy" location to jump to the repeate_nmi</div><div class='add'>+	 *    o return back to the first NMI</div><div class='add'>+	 *</div><div class='add'>+	 * Now on exit of the first NMI, we first clear the stack variable</div><div class='add'>+	 * The NMI stack will tell any nested NMIs at that point that it is</div><div class='add'>+	 * nested. Then we pop the stack normally with iret, and if there was</div><div class='add'>+	 * a nested NMI that updated the copy interrupt stack frame, a</div><div class='add'>+	 * jump will be made to the repeat_nmi code that will handle the second</div><div class='add'>+	 * NMI.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Use %rdx as out temp variable throughout */</div><div class='add'>+	pushq_cfi %rdx</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check the special variable on the stack to see if NMIs are</div><div class='add'>+	 * executing.</div><div class='add'>+	 */</div><div class='add'>+	cmp $1, -8(%rsp)</div><div class='add'>+	je nested_nmi</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now test if the previous stack was an NMI stack.</div><div class='add'>+	 * We need the double check. We check the NMI stack to satisfy the</div><div class='add'>+	 * race when the first NMI clears the variable before returning.</div><div class='add'>+	 * We check the variable because the first NMI could be in a</div><div class='add'>+	 * breakpoint routine using a breakpoint stack.</div><div class='add'>+	 */</div><div class='add'>+	lea 6*8(%rsp), %rdx</div><div class='add'>+	test_in_nmi rdx, 4*8(%rsp), nested_nmi, first_nmi</div><div class='add'>+</div><div class='add'>+nested_nmi:</div><div class='add'>+	/*</div><div class='add'>+	 * Do nothing if we interrupted the fixup in repeat_nmi.</div><div class='add'>+	 * It's about to repeat the NMI handler, so we are fine</div><div class='add'>+	 * with ignoring this one.</div><div class='add'>+	 */</div><div class='add'>+	movq $repeat_nmi, %rdx</div><div class='add'>+	cmpq 8(%rsp), %rdx</div><div class='add'>+	ja 1f</div><div class='add'>+	movq $end_repeat_nmi, %rdx</div><div class='add'>+	cmpq 8(%rsp), %rdx</div><div class='add'>+	ja nested_nmi_out</div><div class='add'>+</div><div class='add'>+1:</div><div class='add'>+	/* Set up the interrupted NMIs stack to jump to repeat_nmi */</div><div class='add'>+	leaq -6*8(%rsp), %rdx</div><div class='add'>+	movq %rdx, %rsp</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 6*8</div><div class='add'>+	pushq_cfi $__KERNEL_DS</div><div class='add'>+	pushq_cfi %rdx</div><div class='add'>+	pushfq_cfi</div><div class='add'>+	pushq_cfi $__KERNEL_CS</div><div class='add'>+	pushq_cfi $repeat_nmi</div><div class='add'>+</div><div class='add'>+	/* Put stack back */</div><div class='add'>+	addq $(11*8), %rsp</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -11*8</div><div class='add'>+</div><div class='add'>+nested_nmi_out:</div><div class='add'>+	popq_cfi %rdx</div><div class='add'>+</div><div class='add'>+	/* No need to check faults here */</div><div class='add'>+	INTERRUPT_RETURN</div><div class='add'>+</div><div class='add'>+first_nmi:</div><div class='add'>+	/*</div><div class='add'>+	 * Because nested NMIs will use the pushed location that we</div><div class='add'>+	 * stored in rdx, we must keep that space available.</div><div class='add'>+	 * Here's what our stack frame will look like:</div><div class='add'>+	 * +-------------------------+</div><div class='add'>+	 * | original SS             |</div><div class='add'>+	 * | original Return RSP     |</div><div class='add'>+	 * | original RFLAGS         |</div><div class='add'>+	 * | original CS             |</div><div class='add'>+	 * | original RIP            |</div><div class='add'>+	 * +-------------------------+</div><div class='add'>+	 * | temp storage for rdx    |</div><div class='add'>+	 * +-------------------------+</div><div class='add'>+	 * | NMI executing variable  |</div><div class='add'>+	 * +-------------------------+</div><div class='add'>+	 * | Saved SS                |</div><div class='add'>+	 * | Saved Return RSP        |</div><div class='add'>+	 * | Saved RFLAGS            |</div><div class='add'>+	 * | Saved CS                |</div><div class='add'>+	 * | Saved RIP               |</div><div class='add'>+	 * +-------------------------+</div><div class='add'>+	 * | copied SS               |</div><div class='add'>+	 * | copied Return RSP       |</div><div class='add'>+	 * | copied RFLAGS           |</div><div class='add'>+	 * | copied CS               |</div><div class='add'>+	 * | copied RIP              |</div><div class='add'>+	 * +-------------------------+</div><div class='add'>+	 * | pt_regs                 |</div><div class='add'>+	 * +-------------------------+</div><div class='add'>+	 *</div><div class='add'>+	 * The saved RIP is used to fix up the copied RIP that a nested</div><div class='add'>+	 * NMI may zero out. The original stack frame and the temp storage</div><div class='add'>+	 * is also used by nested NMIs and can not be trusted on exit.</div><div class='add'>+	 */</div><div class='add'>+	/* Set the NMI executing variable on the stack. */</div><div class='add'>+	pushq_cfi $1</div><div class='add'>+</div><div class='add'>+	/* Copy the stack frame to the Saved frame */</div><div class='add'>+	.rept 5</div><div class='add'>+	pushq_cfi 6*8(%rsp)</div><div class='add'>+	.endr</div><div class='add'>+</div><div class='add'>+	/* Make another copy, this one may be modified by nested NMIs */</div><div class='add'>+	.rept 5</div><div class='add'>+	pushq_cfi 4*8(%rsp)</div><div class='add'>+	.endr</div><div class='add'>+</div><div class='add'>+	/* Do not pop rdx, nested NMIs will corrupt it */</div><div class='add'>+	movq 11*8(%rsp), %rdx</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Everything below this point can be preempted by a nested</div><div class='add'>+	 * NMI if the first NMI took an exception. Repeated NMIs</div><div class='add'>+	 * caused by an exception and nested NMI will start here, and</div><div class='add'>+	 * can still be preempted by another NMI.</div><div class='add'>+	 */</div><div class='add'>+restart_nmi:</div><div class='add'>+	pushq_cfi $-1		/* ORIG_RAX: no syscall to restart */</div><div class='ctx'> 	subq $ORIG_RAX-R15, %rsp</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15</div><div class='add'>+	/*</div><div class='add'>+	 * Use save_paranoid to handle SWAPGS, but no need to use paranoid_exit</div><div class='add'>+	 * as we should not be calling schedule in NMI context.</div><div class='add'>+	 * Even with normal interrupts enabled. An NMI should not be</div><div class='add'>+	 * setting NEED_RESCHED or anything that normal interrupts and</div><div class='add'>+	 * exceptions might do.</div><div class='add'>+	 */</div><div class='ctx'> 	call save_paranoid</div><div class='ctx'> 	DEFAULT_FRAME 0</div><div class='ctx'> 	/* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */</div><div class='ctx'> 	movq %rsp,%rdi</div><div class='ctx'> 	movq $-1,%rsi</div><div class='ctx'> 	call do_nmi</div><div class='del'>-#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='del'>-	/* paranoidexit; without TRACE_IRQS_OFF */</div><div class='del'>-	/* ebx:	no swapgs flag */</div><div class='del'>-	DISABLE_INTERRUPTS(CLBR_NONE)</div><div class='ctx'> 	testl %ebx,%ebx				/* swapgs needed? */</div><div class='ctx'> 	jnz nmi_restore</div><div class='del'>-	testl $3,CS(%rsp)</div><div class='del'>-	jnz nmi_userspace</div><div class='ctx'> nmi_swapgs:</div><div class='ctx'> 	SWAPGS_UNSAFE_STACK</div><div class='ctx'> nmi_restore:</div><div class='ctx'> 	RESTORE_ALL 8</div><div class='add'>+	/* Clear the NMI executing stack variable */</div><div class='add'>+	movq $0, 10*8(%rsp)</div><div class='ctx'> 	jmp irq_return</div><div class='del'>-nmi_userspace:</div><div class='del'>-	GET_THREAD_INFO(%rcx)</div><div class='del'>-	movl TI_flags(%rcx),%ebx</div><div class='del'>-	andl $_TIF_WORK_MASK,%ebx</div><div class='del'>-	jz nmi_swapgs</div><div class='del'>-	movq %rsp,%rdi			/* &amp;pt_regs */</div><div class='del'>-	call sync_regs</div><div class='del'>-	movq %rax,%rsp			/* switch stack for scheduling */</div><div class='del'>-	testl $_TIF_NEED_RESCHED,%ebx</div><div class='del'>-	jnz nmi_schedule</div><div class='del'>-	movl %ebx,%edx			/* arg3: thread flags */</div><div class='del'>-	ENABLE_INTERRUPTS(CLBR_NONE)</div><div class='del'>-	xorl %esi,%esi 			/* arg2: oldset */</div><div class='del'>-	movq %rsp,%rdi 			/* arg1: &amp;pt_regs */</div><div class='del'>-	call do_notify_resume</div><div class='del'>-	DISABLE_INTERRUPTS(CLBR_NONE)</div><div class='del'>-	jmp nmi_userspace</div><div class='del'>-nmi_schedule:</div><div class='del'>-	ENABLE_INTERRUPTS(CLBR_ANY)</div><div class='del'>-	call schedule</div><div class='del'>-	DISABLE_INTERRUPTS(CLBR_ANY)</div><div class='del'>-	jmp nmi_userspace</div><div class='del'>-	CFI_ENDPROC</div><div class='del'>-#else</div><div class='del'>-	jmp paranoid_exit</div><div class='ctx'> 	CFI_ENDPROC</div><div class='del'>-#endif</div><div class='ctx'> END(nmi)</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If an NMI hit an iret because of an exception or breakpoint,</div><div class='add'>+	 * it can lose its NMI context, and a nested NMI may come in.</div><div class='add'>+	 * In that case, the nested NMI will change the preempted NMI's</div><div class='add'>+	 * stack to jump to here when it does the final iret.</div><div class='add'>+	 */</div><div class='add'>+repeat_nmi:</div><div class='add'>+	INTR_FRAME</div><div class='add'>+	/* Update the stack variable to say we are still in NMI */</div><div class='add'>+	movq $1, 5*8(%rsp)</div><div class='add'>+</div><div class='add'>+	/* copy the saved stack back to copy stack */</div><div class='add'>+	.rept 5</div><div class='add'>+	pushq_cfi 4*8(%rsp)</div><div class='add'>+	.endr</div><div class='add'>+</div><div class='add'>+	jmp restart_nmi</div><div class='add'>+	CFI_ENDPROC</div><div class='add'>+end_repeat_nmi:</div><div class='add'>+</div><div class='ctx'> ENTRY(ignore_sysret)</div><div class='ctx'> 	CFI_STARTPROC</div><div class='ctx'> 	mov $-ENOSYS,%eax</div><div class='head'>diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S<br/>index e11e39478a49..40f4eb3766d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/head_64.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/head_64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/head_64.S?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/head_64.S</a></div><div class='hunk'>@@ -417,6 +417,10 @@ ENTRY(phys_base)</div><div class='ctx'> ENTRY(idt_table)</div><div class='ctx'> 	.skip IDT_ENTRIES * 16</div><div class='ctx'> </div><div class='add'>+	.align L1_CACHE_BYTES</div><div class='add'>+ENTRY(nmi_idt_table)</div><div class='add'>+	.skip IDT_ENTRIES * 16</div><div class='add'>+</div><div class='ctx'> 	__PAGE_ALIGNED_BSS</div><div class='ctx'> 	.align PAGE_SIZE</div><div class='ctx'> ENTRY(empty_zero_page)</div><div class='head'>diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c<br/>index 07b0a56a754d..ad0de0c2714e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/hpet.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/hpet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/hpet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/hpet.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'> #include &lt;linux/clockchips.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.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/i8253.h&gt;</div><div class='head'>diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c<br/>index 72090705a656..40fc86161d92 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/irq_32.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/irq_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/irq_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/irq_32.c</a></div><div class='hunk'>@@ -28,6 +28,9 @@ DEFINE_PER_CPU(struct pt_regs *, irq_regs);</div><div class='ctx'> EXPORT_PER_CPU_SYMBOL(irq_regs);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_STACKOVERFLOW</div><div class='add'>+</div><div class='add'>+int sysctl_panic_on_stackoverflow __read_mostly;</div><div class='add'>+</div><div class='ctx'> /* Debugging check for stack overflow: is there less than 1KB free? */</div><div class='ctx'> static int check_stack_overflow(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -43,6 +46,8 @@ static void print_stack_overflow(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_WARNING "low stack detected by irq handler\n");</div><div class='ctx'> 	dump_stack();</div><div class='add'>+	if (sysctl_panic_on_stackoverflow)</div><div class='add'>+		panic("low stack detected by irq handler - check messages\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c<br/>index 69bca468c47a..d04d3ecded62 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/irq_64.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/irq_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/irq_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/irq_64.c</a></div><div class='hunk'>@@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);</div><div class='ctx'> DEFINE_PER_CPU(struct pt_regs *, irq_regs);</div><div class='ctx'> EXPORT_PER_CPU_SYMBOL(irq_regs);</div><div class='ctx'> </div><div class='add'>+int sysctl_panic_on_stackoverflow;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Probabilistic stack overflow check:</div><div class='ctx'>  *</div><div class='hunk'>@@ -36,18 +38,39 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);</div><div class='ctx'> static inline void stack_overflow_check(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_DEBUG_STACKOVERFLOW</div><div class='add'>+#define STACK_TOP_MARGIN	128</div><div class='add'>+	struct orig_ist *oist;</div><div class='add'>+	u64 irq_stack_top, irq_stack_bottom;</div><div class='add'>+	u64 estack_top, estack_bottom;</div><div class='ctx'> 	u64 curbase = (u64)task_stack_page(current);</div><div class='ctx'> </div><div class='ctx'> 	if (user_mode_vm(regs))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	WARN_ONCE(regs-&gt;sp &gt;= curbase &amp;&amp;</div><div class='del'>-		  regs-&gt;sp &lt;= curbase + THREAD_SIZE &amp;&amp;</div><div class='del'>-		  regs-&gt;sp &lt;  curbase + sizeof(struct thread_info) +</div><div class='del'>-					sizeof(struct pt_regs) + 128,</div><div class='add'>+	if (regs-&gt;sp &gt;= curbase + sizeof(struct thread_info) +</div><div class='add'>+				  sizeof(struct pt_regs) + STACK_TOP_MARGIN &amp;&amp;</div><div class='add'>+	    regs-&gt;sp &lt;= curbase + THREAD_SIZE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	irq_stack_top = (u64)__get_cpu_var(irq_stack_union.irq_stack) +</div><div class='add'>+			STACK_TOP_MARGIN;</div><div class='add'>+	irq_stack_bottom = (u64)__get_cpu_var(irq_stack_ptr);</div><div class='add'>+	if (regs-&gt;sp &gt;= irq_stack_top &amp;&amp; regs-&gt;sp &lt;= irq_stack_bottom)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	oist = &amp;__get_cpu_var(orig_ist);</div><div class='add'>+	estack_top = (u64)oist-&gt;ist[0] - EXCEPTION_STKSZ + STACK_TOP_MARGIN;</div><div class='add'>+	estack_bottom = (u64)oist-&gt;ist[N_EXCEPTION_STACKS - 1];</div><div class='add'>+	if (regs-&gt;sp &gt;= estack_top &amp;&amp; regs-&gt;sp &lt;= estack_bottom)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	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)\n",</div><div class='add'>+		current-&gt;comm, curbase, regs-&gt;sp,</div><div class='add'>+		irq_stack_top, irq_stack_bottom,</div><div class='add'>+		estack_top, estack_bottom);</div><div class='ctx'> </div><div class='del'>-		  "do_IRQ: %s near stack overflow (cur:%Lx,sp:%lx)\n",</div><div class='del'>-			current-&gt;comm, curbase, regs-&gt;sp);</div><div class='add'>+	if (sysctl_panic_on_stackoverflow)</div><div class='add'>+		panic("low stack detected by irq handler - check messages\n");</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c<br/>index b3300e6bacef..313fb5cddbce 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/irqinit.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/irqinit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/irqinit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/irqinit.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='head'>diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c<br/>index a9c2116001d6..f0c6fd6f176b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/kvm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/kvm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/kvm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/kvm.c</a></div><div class='hunk'>@@ -39,8 +39,6 @@</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> </div><div class='del'>-#define MMU_QUEUE_SIZE 1024</div><div class='del'>-</div><div class='ctx'> static int kvmapf = 1;</div><div class='ctx'> </div><div class='ctx'> static int parse_no_kvmapf(char *arg)</div><div class='hunk'>@@ -60,21 +58,10 @@ static int parse_no_stealacc(char *arg)</div><div class='ctx'> </div><div class='ctx'> early_param("no-steal-acc", parse_no_stealacc);</div><div class='ctx'> </div><div class='del'>-struct kvm_para_state {</div><div class='del'>-	u8 mmu_queue[MMU_QUEUE_SIZE];</div><div class='del'>-	int mmu_queue_len;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static DEFINE_PER_CPU(struct kvm_para_state, para_state);</div><div class='ctx'> static DEFINE_PER_CPU(struct kvm_vcpu_pv_apf_data, apf_reason) __aligned(64);</div><div class='ctx'> static DEFINE_PER_CPU(struct kvm_steal_time, steal_time) __aligned(64);</div><div class='ctx'> static int has_steal_clock = 0;</div><div class='ctx'> </div><div class='del'>-static struct kvm_para_state *kvm_para_state(void)</div><div class='del'>-{</div><div class='del'>-	return &amp;per_cpu(para_state, raw_smp_processor_id());</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * No need for any "IO delay" on KVM</div><div class='ctx'>  */</div><div class='hunk'>@@ -271,151 +258,6 @@ do_async_page_fault(struct pt_regs *regs, unsigned long error_code)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void kvm_mmu_op(void *buffer, unsigned len)</div><div class='del'>-{</div><div class='del'>-	int r;</div><div class='del'>-	unsigned long a1, a2;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		a1 = __pa(buffer);</div><div class='del'>-		a2 = 0;   /* on i386 __pa() always returns &lt;4G */</div><div class='del'>-		r = kvm_hypercall3(KVM_HC_MMU_OP, len, a1, a2);</div><div class='del'>-		buffer += r;</div><div class='del'>-		len -= r;</div><div class='del'>-	} while (len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mmu_queue_flush(struct kvm_para_state *state)</div><div class='del'>-{</div><div class='del'>-	if (state-&gt;mmu_queue_len) {</div><div class='del'>-		kvm_mmu_op(state-&gt;mmu_queue, state-&gt;mmu_queue_len);</div><div class='del'>-		state-&gt;mmu_queue_len = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void kvm_deferred_mmu_op(void *buffer, int len)</div><div class='del'>-{</div><div class='del'>-	struct kvm_para_state *state = kvm_para_state();</div><div class='del'>-</div><div class='del'>-	if (paravirt_get_lazy_mode() != PARAVIRT_LAZY_MMU) {</div><div class='del'>-		kvm_mmu_op(buffer, len);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (state-&gt;mmu_queue_len + len &gt; sizeof state-&gt;mmu_queue)</div><div class='del'>-		mmu_queue_flush(state);</div><div class='del'>-	memcpy(state-&gt;mmu_queue + state-&gt;mmu_queue_len, buffer, len);</div><div class='del'>-	state-&gt;mmu_queue_len += len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void kvm_mmu_write(void *dest, u64 val)</div><div class='del'>-{</div><div class='del'>-	__u64 pte_phys;</div><div class='del'>-	struct kvm_mmu_op_write_pte wpte;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HIGHPTE</div><div class='del'>-	struct page *page;</div><div class='del'>-	unsigned long dst = (unsigned long) dest;</div><div class='del'>-</div><div class='del'>-	page = kmap_atomic_to_page(dest);</div><div class='del'>-	pte_phys = page_to_pfn(page);</div><div class='del'>-	pte_phys &lt;&lt;= PAGE_SHIFT;</div><div class='del'>-	pte_phys += (dst &amp; ~(PAGE_MASK));</div><div class='del'>-#else</div><div class='del'>-	pte_phys = (unsigned long)__pa(dest);</div><div class='del'>-#endif</div><div class='del'>-	wpte.header.op = KVM_MMU_OP_WRITE_PTE;</div><div class='del'>-	wpte.pte_val = val;</div><div class='del'>-	wpte.pte_phys = pte_phys;</div><div class='del'>-</div><div class='del'>-	kvm_deferred_mmu_op(&amp;wpte, sizeof wpte);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We only need to hook operations that are MMU writes.  We hook these so that</div><div class='del'>- * we can use lazy MMU mode to batch these operations.  We could probably</div><div class='del'>- * improve the performance of the host code if we used some of the information</div><div class='del'>- * here to simplify processing of batched writes.</div><div class='del'>- */</div><div class='del'>-static void kvm_set_pte(pte_t *ptep, pte_t pte)</div><div class='del'>-{</div><div class='del'>-	kvm_mmu_write(ptep, pte_val(pte));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void kvm_set_pte_at(struct mm_struct *mm, unsigned long addr,</div><div class='del'>-			   pte_t *ptep, pte_t pte)</div><div class='del'>-{</div><div class='del'>-	kvm_mmu_write(ptep, pte_val(pte));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void kvm_set_pmd(pmd_t *pmdp, pmd_t pmd)</div><div class='del'>-{</div><div class='del'>-	kvm_mmu_write(pmdp, pmd_val(pmd));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if PAGETABLE_LEVELS &gt;= 3</div><div class='del'>-#ifdef CONFIG_X86_PAE</div><div class='del'>-static void kvm_set_pte_atomic(pte_t *ptep, pte_t pte)</div><div class='del'>-{</div><div class='del'>-	kvm_mmu_write(ptep, pte_val(pte));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void kvm_pte_clear(struct mm_struct *mm,</div><div class='del'>-			  unsigned long addr, pte_t *ptep)</div><div class='del'>-{</div><div class='del'>-	kvm_mmu_write(ptep, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void kvm_pmd_clear(pmd_t *pmdp)</div><div class='del'>-{</div><div class='del'>-	kvm_mmu_write(pmdp, 0);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void kvm_set_pud(pud_t *pudp, pud_t pud)</div><div class='del'>-{</div><div class='del'>-	kvm_mmu_write(pudp, pud_val(pud));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if PAGETABLE_LEVELS == 4</div><div class='del'>-static void kvm_set_pgd(pgd_t *pgdp, pgd_t pgd)</div><div class='del'>-{</div><div class='del'>-	kvm_mmu_write(pgdp, pgd_val(pgd));</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-#endif /* PAGETABLE_LEVELS &gt;= 3 */</div><div class='del'>-</div><div class='del'>-static void kvm_flush_tlb(void)</div><div class='del'>-{</div><div class='del'>-	struct kvm_mmu_op_flush_tlb ftlb = {</div><div class='del'>-		.header.op = KVM_MMU_OP_FLUSH_TLB,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	kvm_deferred_mmu_op(&amp;ftlb, sizeof ftlb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void kvm_release_pt(unsigned long pfn)</div><div class='del'>-{</div><div class='del'>-	struct kvm_mmu_op_release_pt rpt = {</div><div class='del'>-		.header.op = KVM_MMU_OP_RELEASE_PT,</div><div class='del'>-		.pt_phys = (u64)pfn &lt;&lt; PAGE_SHIFT,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	kvm_mmu_op(&amp;rpt, sizeof rpt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void kvm_enter_lazy_mmu(void)</div><div class='del'>-{</div><div class='del'>-	paravirt_enter_lazy_mmu();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void kvm_leave_lazy_mmu(void)</div><div class='del'>-{</div><div class='del'>-	struct kvm_para_state *state = kvm_para_state();</div><div class='del'>-</div><div class='del'>-	mmu_queue_flush(state);</div><div class='del'>-	paravirt_leave_lazy_mmu();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __init paravirt_ops_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	pv_info.name = "KVM";</div><div class='hunk'>@@ -424,29 +266,6 @@ static void __init paravirt_ops_setup(void)</div><div class='ctx'> 	if (kvm_para_has_feature(KVM_FEATURE_NOP_IO_DELAY))</div><div class='ctx'> 		pv_cpu_ops.io_delay = kvm_io_delay;</div><div class='ctx'> </div><div class='del'>-	if (kvm_para_has_feature(KVM_FEATURE_MMU_OP)) {</div><div class='del'>-		pv_mmu_ops.set_pte = kvm_set_pte;</div><div class='del'>-		pv_mmu_ops.set_pte_at = kvm_set_pte_at;</div><div class='del'>-		pv_mmu_ops.set_pmd = kvm_set_pmd;</div><div class='del'>-#if PAGETABLE_LEVELS &gt;= 3</div><div class='del'>-#ifdef CONFIG_X86_PAE</div><div class='del'>-		pv_mmu_ops.set_pte_atomic = kvm_set_pte_atomic;</div><div class='del'>-		pv_mmu_ops.pte_clear = kvm_pte_clear;</div><div class='del'>-		pv_mmu_ops.pmd_clear = kvm_pmd_clear;</div><div class='del'>-#endif</div><div class='del'>-		pv_mmu_ops.set_pud = kvm_set_pud;</div><div class='del'>-#if PAGETABLE_LEVELS == 4</div><div class='del'>-		pv_mmu_ops.set_pgd = kvm_set_pgd;</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-		pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;</div><div class='del'>-		pv_mmu_ops.release_pte = kvm_release_pt;</div><div class='del'>-		pv_mmu_ops.release_pmd = kvm_release_pt;</div><div class='del'>-		pv_mmu_ops.release_pud = kvm_release_pt;</div><div class='del'>-</div><div class='del'>-		pv_mmu_ops.lazy_mode.enter = kvm_enter_lazy_mmu;</div><div class='del'>-		pv_mmu_ops.lazy_mode.leave = kvm_leave_lazy_mmu;</div><div class='del'>-	}</div><div class='ctx'> #ifdef CONFIG_X86_IO_APIC</div><div class='ctx'> 	no_timer_check = 1;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c<br/>index 9302e2d0eb4b..fda91c307104 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/microcode_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/microcode_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/microcode_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/microcode_core.c</a></div><div class='hunk'>@@ -292,8 +292,8 @@ static int reload_for_cpu(int cpu)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t reload_store(struct sys_device *dev,</div><div class='del'>-			    struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t reload_store(struct device *dev,</div><div class='add'>+			    struct device_attribute *attr,</div><div class='ctx'> 			    const char *buf, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long val;</div><div class='hunk'>@@ -318,30 +318,30 @@ static ssize_t reload_store(struct sys_device *dev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t version_show(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</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='ctx'> {</div><div class='ctx'> 	struct ucode_cpu_info *uci = ucode_cpu_info + dev-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 	return sprintf(buf, "0x%x\n", uci-&gt;cpu_sig.rev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t pf_show(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t pf_show(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ucode_cpu_info *uci = ucode_cpu_info + dev-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 	return sprintf(buf, "0x%x\n", uci-&gt;cpu_sig.pf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(reload, 0200, NULL, reload_store);</div><div class='del'>-static SYSDEV_ATTR(version, 0400, version_show, NULL);</div><div class='del'>-static SYSDEV_ATTR(processor_flags, 0400, pf_show, NULL);</div><div class='add'>+static DEVICE_ATTR(reload, 0200, NULL, reload_store);</div><div class='add'>+static DEVICE_ATTR(version, 0400, version_show, NULL);</div><div class='add'>+static DEVICE_ATTR(processor_flags, 0400, pf_show, NULL);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *mc_default_attrs[] = {</div><div class='del'>-	&amp;attr_reload.attr,</div><div class='del'>-	&amp;attr_version.attr,</div><div class='del'>-	&amp;attr_processor_flags.attr,</div><div class='add'>+	&amp;dev_attr_reload.attr,</div><div class='add'>+	&amp;dev_attr_version.attr,</div><div class='add'>+	&amp;dev_attr_processor_flags.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -405,43 +405,45 @@ static enum ucode_state microcode_update_cpu(int cpu)</div><div class='ctx'> 	return ustate;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mc_sysdev_add(struct sys_device *sys_dev)</div><div class='add'>+static int mc_device_add(struct device *dev, struct subsys_interface *sif)</div><div class='ctx'> {</div><div class='del'>-	int err, cpu = sys_dev-&gt;id;</div><div class='add'>+	int err, cpu = dev-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 	if (!cpu_online(cpu))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("CPU%d added\n", cpu);</div><div class='ctx'> </div><div class='del'>-	err = sysfs_create_group(&amp;sys_dev-&gt;kobj, &amp;mc_attr_group);</div><div class='add'>+	err = sysfs_create_group(&amp;dev-&gt;kobj, &amp;mc_attr_group);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (microcode_init_cpu(cpu) == UCODE_ERROR) {</div><div class='del'>-		sysfs_remove_group(&amp;sys_dev-&gt;kobj, &amp;mc_attr_group);</div><div class='add'>+		sysfs_remove_group(&amp;dev-&gt;kobj, &amp;mc_attr_group);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mc_sysdev_remove(struct sys_device *sys_dev)</div><div class='add'>+static int mc_device_remove(struct device *dev, struct subsys_interface *sif)</div><div class='ctx'> {</div><div class='del'>-	int cpu = sys_dev-&gt;id;</div><div class='add'>+	int cpu = dev-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 	if (!cpu_online(cpu))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("CPU%d removed\n", cpu);</div><div class='ctx'> 	microcode_fini_cpu(cpu);</div><div class='del'>-	sysfs_remove_group(&amp;sys_dev-&gt;kobj, &amp;mc_attr_group);</div><div class='add'>+	sysfs_remove_group(&amp;dev-&gt;kobj, &amp;mc_attr_group);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver mc_sysdev_driver = {</div><div class='del'>-	.add			= mc_sysdev_add,</div><div class='del'>-	.remove			= mc_sysdev_remove,</div><div class='add'>+static struct subsys_interface mc_cpu_interface = {</div><div class='add'>+	.name			= "microcode",</div><div class='add'>+	.subsys			= &amp;cpu_subsys,</div><div class='add'>+	.add_dev		= mc_device_add,</div><div class='add'>+	.remove_dev		= mc_device_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -464,9 +466,9 @@ static __cpuinit int</div><div class='ctx'> mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu = (unsigned long)hcpu;</div><div class='del'>-	struct sys_device *sys_dev;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> </div><div class='del'>-	sys_dev = get_cpu_sysdev(cpu);</div><div class='add'>+	dev = get_cpu_device(cpu);</div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case CPU_ONLINE:</div><div class='ctx'> 	case CPU_ONLINE_FROZEN:</div><div class='hunk'>@@ -474,13 +476,13 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)</div><div class='ctx'> 	case CPU_DOWN_FAILED:</div><div class='ctx'> 	case CPU_DOWN_FAILED_FROZEN:</div><div class='ctx'> 		pr_debug("CPU%d added\n", cpu);</div><div class='del'>-		if (sysfs_create_group(&amp;sys_dev-&gt;kobj, &amp;mc_attr_group))</div><div class='add'>+		if (sysfs_create_group(&amp;dev-&gt;kobj, &amp;mc_attr_group))</div><div class='ctx'> 			pr_err("Failed to create group for CPU%d\n", cpu);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPU_DOWN_PREPARE:</div><div class='ctx'> 	case CPU_DOWN_PREPARE_FROZEN:</div><div class='ctx'> 		/* Suspend is in progress, only remove the interface */</div><div class='del'>-		sysfs_remove_group(&amp;sys_dev-&gt;kobj, &amp;mc_attr_group);</div><div class='add'>+		sysfs_remove_group(&amp;dev-&gt;kobj, &amp;mc_attr_group);</div><div class='ctx'> 		pr_debug("CPU%d removed\n", cpu);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -525,7 +527,7 @@ static int __init microcode_init(void)</div><div class='ctx'> 	get_online_cpus();</div><div class='ctx'> 	mutex_lock(&amp;microcode_mutex);</div><div class='ctx'> </div><div class='del'>-	error = sysdev_driver_register(&amp;cpu_sysdev_class, &amp;mc_sysdev_driver);</div><div class='add'>+	error = subsys_interface_register(&amp;mc_cpu_interface);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;microcode_mutex);</div><div class='ctx'> 	put_online_cpus();</div><div class='hunk'>@@ -535,7 +537,7 @@ static int __init microcode_init(void)</div><div class='ctx'> </div><div class='ctx'> 	error = microcode_dev_init();</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto out_sysdev_driver;</div><div class='add'>+		goto out_driver;</div><div class='ctx'> </div><div class='ctx'> 	register_syscore_ops(&amp;mc_syscore_ops);</div><div class='ctx'> 	register_hotcpu_notifier(&amp;mc_cpu_notifier);</div><div class='hunk'>@@ -545,11 +547,11 @@ static int __init microcode_init(void)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-out_sysdev_driver:</div><div class='add'>+out_driver:</div><div class='ctx'> 	get_online_cpus();</div><div class='ctx'> 	mutex_lock(&amp;microcode_mutex);</div><div class='ctx'> </div><div class='del'>-	sysdev_driver_unregister(&amp;cpu_sysdev_class, &amp;mc_sysdev_driver);</div><div class='add'>+	subsys_interface_unregister(&amp;mc_cpu_interface);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;microcode_mutex);</div><div class='ctx'> 	put_online_cpus();</div><div class='hunk'>@@ -573,7 +575,7 @@ static void __exit microcode_exit(void)</div><div class='ctx'> 	get_online_cpus();</div><div class='ctx'> 	mutex_lock(&amp;microcode_mutex);</div><div class='ctx'> </div><div class='del'>-	sysdev_driver_unregister(&amp;cpu_sysdev_class, &amp;mc_sysdev_driver);</div><div class='add'>+	subsys_interface_unregister(&amp;mc_cpu_interface);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;microcode_mutex);</div><div class='ctx'> 	put_online_cpus();</div><div class='head'>diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c<br/>index 12fcbe2c143e..96356762a51d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/msr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/msr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/msr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/msr.c</a></div><div class='hunk'>@@ -236,7 +236,7 @@ static struct notifier_block __refdata msr_class_cpu_notifier = {</div><div class='ctx'> 	.notifier_call = msr_class_cpu_callback,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *msr_devnode(struct device *dev, mode_t *mode)</div><div class='add'>+static char *msr_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	return kasprintf(GFP_KERNEL, "cpu/%u/msr", MINOR(dev-&gt;devt));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c<br/>index e88f37b58ddd..47acaf319165 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/nmi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/nmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/nmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/nmi.c</a></div><div class='hunk'>@@ -405,9 +405,108 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)</div><div class='ctx'> 		unknown_nmi_error(reason, regs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * NMIs can hit breakpoints which will cause it to lose its</div><div class='add'>+ * NMI context with the CPU when the breakpoint does an iret.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_X86_32</div><div class='add'>+/*</div><div class='add'>+ * For i386, NMIs use the same stack as the kernel, and we can</div><div class='add'>+ * add a workaround to the iret problem in C. Simply have 3 states</div><div class='add'>+ * the NMI can be in.</div><div class='add'>+ *</div><div class='add'>+ *  1) not running</div><div class='add'>+ *  2) executing</div><div class='add'>+ *  3) latched</div><div class='add'>+ *</div><div class='add'>+ * When no NMI is in progress, it is in the "not running" state.</div><div class='add'>+ * When an NMI comes in, it goes into the "executing" state.</div><div class='add'>+ * Normally, if another NMI is triggered, it does not interrupt</div><div class='add'>+ * the running NMI and the HW will simply latch it so that when</div><div class='add'>+ * the first NMI finishes, it will restart the second NMI.</div><div class='add'>+ * (Note, the latch is binary, thus multiple NMIs triggering,</div><div class='add'>+ *  when one is running, are ignored. Only one NMI is restarted.)</div><div class='add'>+ *</div><div class='add'>+ * If an NMI hits a breakpoint that executes an iret, another</div><div class='add'>+ * NMI can preempt it. We do not want to allow this new NMI</div><div class='add'>+ * to run, but we want to execute it when the first one finishes.</div><div class='add'>+ * We set the state to "latched", and the first NMI will perform</div><div class='add'>+ * an cmpxchg on the state, and if it doesn't successfully</div><div class='add'>+ * reset the state to "not running" it will restart the next</div><div class='add'>+ * NMI.</div><div class='add'>+ */</div><div class='add'>+enum nmi_states {</div><div class='add'>+	NMI_NOT_RUNNING,</div><div class='add'>+	NMI_EXECUTING,</div><div class='add'>+	NMI_LATCHED,</div><div class='add'>+};</div><div class='add'>+static DEFINE_PER_CPU(enum nmi_states, nmi_state);</div><div class='add'>+</div><div class='add'>+#define nmi_nesting_preprocess(regs)					\</div><div class='add'>+	do {								\</div><div class='add'>+		if (__get_cpu_var(nmi_state) != NMI_NOT_RUNNING) {	\</div><div class='add'>+			__get_cpu_var(nmi_state) = NMI_LATCHED;		\</div><div class='add'>+			return;						\</div><div class='add'>+		}							\</div><div class='add'>+	nmi_restart:							\</div><div class='add'>+		__get_cpu_var(nmi_state) = NMI_EXECUTING;		\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define nmi_nesting_postprocess()					\</div><div class='add'>+	do {								\</div><div class='add'>+		if (cmpxchg(&amp;__get_cpu_var(nmi_state),			\</div><div class='add'>+		    NMI_EXECUTING, NMI_NOT_RUNNING) != NMI_EXECUTING)	\</div><div class='add'>+			goto nmi_restart;				\</div><div class='add'>+	} while (0)</div><div class='add'>+#else /* x86_64 */</div><div class='add'>+/*</div><div class='add'>+ * In x86_64 things are a bit more difficult. This has the same problem</div><div class='add'>+ * where an NMI hitting a breakpoint that calls iret will remove the</div><div class='add'>+ * NMI context, allowing a nested NMI to enter. What makes this more</div><div class='add'>+ * difficult is that both NMIs and breakpoints have their own stack.</div><div class='add'>+ * When a new NMI or breakpoint is executed, the stack is set to a fixed</div><div class='add'>+ * point. If an NMI is nested, it will have its stack set at that same</div><div class='add'>+ * fixed address that the first NMI had, and will start corrupting the</div><div class='add'>+ * stack. This is handled in entry_64.S, but the same problem exists with</div><div class='add'>+ * the breakpoint stack.</div><div class='add'>+ *</div><div class='add'>+ * If a breakpoint is being processed, and the debug stack is being used,</div><div class='add'>+ * if an NMI comes in and also hits a breakpoint, the stack pointer</div><div class='add'>+ * will be set to the same fixed address as the breakpoint that was</div><div class='add'>+ * interrupted, causing that stack to be corrupted. To handle this case,</div><div class='add'>+ * check if the stack that was interrupted is the debug stack, and if</div><div class='add'>+ * so, change the IDT so that new breakpoints will use the current stack</div><div class='add'>+ * and not switch to the fixed address. On return of the NMI, switch back</div><div class='add'>+ * to the original IDT.</div><div class='add'>+ */</div><div class='add'>+static DEFINE_PER_CPU(int, update_debug_stack);</div><div class='add'>+</div><div class='add'>+static inline void nmi_nesting_preprocess(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * If we interrupted a breakpoint, it is possible that</div><div class='add'>+	 * the nmi handler will have breakpoints too. We need to</div><div class='add'>+	 * change the IDT such that breakpoints that happen here</div><div class='add'>+	 * continue to use the NMI stack.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(is_debug_stack(regs-&gt;sp))) {</div><div class='add'>+		debug_stack_set_zero();</div><div class='add'>+		__get_cpu_var(update_debug_stack) = 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void nmi_nesting_postprocess(void)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(__get_cpu_var(update_debug_stack)))</div><div class='add'>+		debug_stack_reset();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> dotraplinkage notrace __kprobes void</div><div class='ctx'> do_nmi(struct pt_regs *regs, long error_code)</div><div class='ctx'> {</div><div class='add'>+	nmi_nesting_preprocess(regs);</div><div class='add'>+</div><div class='ctx'> 	nmi_enter();</div><div class='ctx'> </div><div class='ctx'> 	inc_irq_stat(__nmi_count);</div><div class='hunk'>@@ -416,6 +515,9 @@ do_nmi(struct pt_regs *regs, long error_code)</div><div class='ctx'> 		default_do_nmi(regs);</div><div class='ctx'> </div><div class='ctx'> 	nmi_exit();</div><div class='add'>+</div><div class='add'>+	/* On i386, may loop back to preprocess */</div><div class='add'>+	nmi_nesting_postprocess();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void stop_nmi(void)</div><div class='head'>diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c<br/>new file mode 100644<br/>index 000000000000..0d01a8ea4e11<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/nmi_selftest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/nmi_selftest.c</a></div><div class='hunk'>@@ -0,0 +1,180 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/x86/kernel/nmi-selftest.c</div><div class='add'>+ *</div><div class='add'>+ * Testsuite for NMI: IPIs</div><div class='add'>+ *</div><div class='add'>+ * Started by Don Zickus:</div><div class='add'>+ * (using lib/locking-selftest.c as a guide)</div><div class='add'>+ *</div><div class='add'>+ *   Copyright (C) 2011 Red Hat, Inc., Don Zickus &lt;dzickus@redhat.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/apic.h&gt;</div><div class='add'>+#include &lt;asm/nmi.h&gt;</div><div class='add'>+</div><div class='add'>+#define SUCCESS		0</div><div class='add'>+#define FAILURE		1</div><div class='add'>+#define TIMEOUT		2</div><div class='add'>+</div><div class='add'>+static int nmi_fail;</div><div class='add'>+</div><div class='add'>+/* check to see if NMI IPIs work on this machine */</div><div class='add'>+static DECLARE_BITMAP(nmi_ipi_mask, NR_CPUS) __read_mostly;</div><div class='add'>+</div><div class='add'>+static int testcase_total;</div><div class='add'>+static int testcase_successes;</div><div class='add'>+static int expected_testcase_failures;</div><div class='add'>+static int unexpected_testcase_failures;</div><div class='add'>+static int unexpected_testcase_unknowns;</div><div class='add'>+</div><div class='add'>+static int nmi_unk_cb(unsigned int val, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unexpected_testcase_unknowns++;</div><div class='add'>+	return NMI_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_nmi_testsuite(void)</div><div class='add'>+{</div><div class='add'>+	/* trap all the unknown NMIs we may generate */</div><div class='add'>+	register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cleanup_nmi_testsuite(void)</div><div class='add'>+{</div><div class='add'>+	unregister_nmi_handler(NMI_UNKNOWN, "nmi_selftest_unk");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int test_nmi_ipi_callback(unsigned int val, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+        int cpu = raw_smp_processor_id();</div><div class='add'>+</div><div class='add'>+        if (cpumask_test_and_clear_cpu(cpu, to_cpumask(nmi_ipi_mask)))</div><div class='add'>+                return NMI_HANDLED;</div><div class='add'>+</div><div class='add'>+        return NMI_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_nmi_ipi(struct cpumask *mask)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+</div><div class='add'>+	if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,</div><div class='add'>+				 NMI_FLAG_FIRST, "nmi_selftest")) {</div><div class='add'>+		nmi_fail = FAILURE;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* sync above data before sending NMI */</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	apic-&gt;send_IPI_mask(mask, NMI_VECTOR);</div><div class='add'>+</div><div class='add'>+	/* Don't wait longer than a second */</div><div class='add'>+	timeout = USEC_PER_SEC;</div><div class='add'>+	while (!cpumask_empty(mask) &amp;&amp; timeout--)</div><div class='add'>+	        udelay(1);</div><div class='add'>+</div><div class='add'>+	/* What happens if we timeout, do we still unregister?? */</div><div class='add'>+	unregister_nmi_handler(NMI_LOCAL, "nmi_selftest");</div><div class='add'>+</div><div class='add'>+	if (!timeout)</div><div class='add'>+		nmi_fail = TIMEOUT;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remote_ipi(void)</div><div class='add'>+{</div><div class='add'>+	cpumask_copy(to_cpumask(nmi_ipi_mask), cpu_online_mask);</div><div class='add'>+	cpumask_clear_cpu(smp_processor_id(), to_cpumask(nmi_ipi_mask));</div><div class='add'>+	if (!cpumask_empty(to_cpumask(nmi_ipi_mask)))</div><div class='add'>+		test_nmi_ipi(to_cpumask(nmi_ipi_mask));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void local_ipi(void)</div><div class='add'>+{</div><div class='add'>+	cpumask_clear(to_cpumask(nmi_ipi_mask));</div><div class='add'>+	cpumask_set_cpu(smp_processor_id(), to_cpumask(nmi_ipi_mask));</div><div class='add'>+	test_nmi_ipi(to_cpumask(nmi_ipi_mask));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reset_nmi(void)</div><div class='add'>+{</div><div class='add'>+	nmi_fail = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dotest(void (*testcase_fn)(void), int expected)</div><div class='add'>+{</div><div class='add'>+	testcase_fn();</div><div class='add'>+	/*</div><div class='add'>+	 * Filter out expected failures:</div><div class='add'>+	 */</div><div class='add'>+	if (nmi_fail != expected) {</div><div class='add'>+		unexpected_testcase_failures++;</div><div class='add'>+</div><div class='add'>+		if (nmi_fail == FAILURE)</div><div class='add'>+			printk("FAILED |");</div><div class='add'>+		else if (nmi_fail == TIMEOUT)</div><div class='add'>+			printk("TIMEOUT|");</div><div class='add'>+		else</div><div class='add'>+			printk("ERROR  |");</div><div class='add'>+		dump_stack();</div><div class='add'>+	} else {</div><div class='add'>+		testcase_successes++;</div><div class='add'>+		printk("  ok  |");</div><div class='add'>+	}</div><div class='add'>+	testcase_total++;</div><div class='add'>+</div><div class='add'>+	reset_nmi();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void print_testname(const char *testname)</div><div class='add'>+{</div><div class='add'>+	printk("%12s:", testname);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nmi_selftest(void)</div><div class='add'>+{</div><div class='add'>+	init_nmi_testsuite();</div><div class='add'>+</div><div class='add'>+        /*</div><div class='add'>+	 * Run the testsuite:</div><div class='add'>+	 */</div><div class='add'>+	printk("----------------\n");</div><div class='add'>+	printk("| NMI testsuite:\n");</div><div class='add'>+	printk("--------------------\n");</div><div class='add'>+</div><div class='add'>+	print_testname("remote IPI");</div><div class='add'>+	dotest(remote_ipi, SUCCESS);</div><div class='add'>+	printk("\n");</div><div class='add'>+	print_testname("local IPI");</div><div class='add'>+	dotest(local_ipi, SUCCESS);</div><div class='add'>+	printk("\n");</div><div class='add'>+</div><div class='add'>+	cleanup_nmi_testsuite();</div><div class='add'>+</div><div class='add'>+	if (unexpected_testcase_failures) {</div><div class='add'>+		printk("--------------------\n");</div><div class='add'>+		printk("BUG: %3d unexpected failures (out of %3d) - debugging disabled! |\n",</div><div class='add'>+			unexpected_testcase_failures, testcase_total);</div><div class='add'>+		printk("-----------------------------------------------------------------\n");</div><div class='add'>+	} else if (expected_testcase_failures &amp;&amp; testcase_successes) {</div><div class='add'>+		printk("--------------------\n");</div><div class='add'>+		printk("%3d out of %3d testcases failed, as expected. |\n",</div><div class='add'>+			expected_testcase_failures, testcase_total);</div><div class='add'>+		printk("----------------------------------------------------\n");</div><div class='add'>+	} else if (expected_testcase_failures &amp;&amp; !testcase_successes) {</div><div class='add'>+		printk("--------------------\n");</div><div class='add'>+		printk("All %3d testcases failed, as expected. |\n",</div><div class='add'>+			expected_testcase_failures);</div><div class='add'>+		printk("----------------------------------------\n");</div><div class='add'>+	} else {</div><div class='add'>+		printk("--------------------\n");</div><div class='add'>+		printk("Good, all %3d testcases passed! |\n",</div><div class='add'>+			testcase_successes);</div><div class='add'>+		printk("---------------------------------\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c<br/>index 80dc793b3f63..1c4d769e21ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/pci-dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/pci-dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/pci-dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/pci-dma.c</a></div><div class='hunk'>@@ -45,6 +45,15 @@ int iommu_detected __read_mostly = 0;</div><div class='ctx'>  */</div><div class='ctx'> int iommu_pass_through __read_mostly;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Group multi-function PCI devices into a single device-group for the</div><div class='add'>+ * iommu_device_group interface.  This tells the iommu driver to pretend</div><div class='add'>+ * it cannot distinguish between functions of a device, exposing only one</div><div class='add'>+ * group for the device.  Useful for disallowing use of individual PCI</div><div class='add'>+ * functions from userspace drivers.</div><div class='add'>+ */</div><div class='add'>+int iommu_group_mf __read_mostly;</div><div class='add'>+</div><div class='ctx'> extern struct iommu_table_entry __iommu_table[], __iommu_table_end[];</div><div class='ctx'> </div><div class='ctx'> /* Dummy device used for NULL arguments (normally ISA). */</div><div class='hunk'>@@ -169,6 +178,8 @@ static __init int iommu_setup(char *p)</div><div class='ctx'> #endif</div><div class='ctx'> 		if (!strncmp(p, "pt", 2))</div><div class='ctx'> 			iommu_pass_through = 1;</div><div class='add'>+		if (!strncmp(p, "group_mf", 8))</div><div class='add'>+			iommu_group_mf = 1;</div><div class='ctx'> </div><div class='ctx'> 		gart_parse_options(p);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c<br/>index 89a04c7b5bb6..50267386b766 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/ptrace.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/ptrace.c</a></div><div class='hunk'>@@ -1392,20 +1392,18 @@ long syscall_trace_enter(struct pt_regs *regs)</div><div class='ctx'> 	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))</div><div class='ctx'> 		trace_sys_enter(regs, regs-&gt;orig_ax);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context)) {</div><div class='del'>-		if (IS_IA32)</div><div class='del'>-			audit_syscall_entry(AUDIT_ARCH_I386,</div><div class='del'>-					    regs-&gt;orig_ax,</div><div class='del'>-					    regs-&gt;bx, regs-&gt;cx,</div><div class='del'>-					    regs-&gt;dx, regs-&gt;si);</div><div class='add'>+	if (IS_IA32)</div><div class='add'>+		audit_syscall_entry(AUDIT_ARCH_I386,</div><div class='add'>+				    regs-&gt;orig_ax,</div><div class='add'>+				    regs-&gt;bx, regs-&gt;cx,</div><div class='add'>+				    regs-&gt;dx, regs-&gt;si);</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='del'>-		else</div><div class='del'>-			audit_syscall_entry(AUDIT_ARCH_X86_64,</div><div class='del'>-					    regs-&gt;orig_ax,</div><div class='del'>-					    regs-&gt;di, regs-&gt;si,</div><div class='del'>-					    regs-&gt;dx, regs-&gt;r10);</div><div class='add'>+	else</div><div class='add'>+		audit_syscall_entry(AUDIT_ARCH_X86_64,</div><div class='add'>+				    regs-&gt;orig_ax,</div><div class='add'>+				    regs-&gt;di, regs-&gt;si,</div><div class='add'>+				    regs-&gt;dx, regs-&gt;r10);</div><div class='ctx'> #endif</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return ret ?: regs-&gt;orig_ax;</div><div class='ctx'> }</div><div class='hunk'>@@ -1414,8 +1412,7 @@ void syscall_trace_leave(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	bool step;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(current-&gt;audit_context))</div><div class='del'>-		audit_syscall_exit(AUDITSC_RESULT(regs-&gt;ax), regs-&gt;ax);</div><div class='add'>+	audit_syscall_exit(regs);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))</div><div class='ctx'> 		trace_sys_exit(regs, regs-&gt;ax);</div><div class='head'>diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c<br/>index d05444ac2aea..d7d5099fe874 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/setup.c</a></div><div class='hunk'>@@ -749,12 +749,7 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_EFI</div><div class='ctx'> 	if (!strncmp((char *)&amp;boot_params.efi_info.efi_loader_signature,</div><div class='del'>-#ifdef CONFIG_X86_32</div><div class='del'>-		     "EL32",</div><div class='del'>-#else</div><div class='del'>-		     "EL64",</div><div class='del'>-#endif</div><div class='del'>-	 4)) {</div><div class='add'>+		     EFI_LOADER_SIGNATURE, 4)) {</div><div class='ctx'> 		efi_enabled = 1;</div><div class='ctx'> 		efi_memblock_x86_reserve_range();</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c<br/>index 54ddaeb221c1..46a01bdc27e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/signal.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/signal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/signal.c</a></div><div class='hunk'>@@ -682,7 +682,6 @@ static int</div><div class='ctx'> handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,</div><div class='ctx'> 		struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	sigset_t blocked;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Are we from a system call? */</div><div class='hunk'>@@ -733,10 +732,7 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,</div><div class='ctx'> 	 */</div><div class='ctx'> 	regs-&gt;flags &amp;= ~X86_EFLAGS_TF;</div><div class='ctx'> </div><div class='del'>-	sigorsets(&amp;blocked, &amp;current-&gt;blocked, &amp;ka-&gt;sa.sa_mask);</div><div class='del'>-	if (!(ka-&gt;sa.sa_flags &amp; SA_NODEFER))</div><div class='del'>-		sigaddset(&amp;blocked, sig);</div><div class='del'>-	set_current_blocked(&amp;blocked);</div><div class='add'>+	block_sigmask(ka, sig);</div><div class='ctx'> </div><div class='ctx'> 	tracehook_signal_handler(sig, info, ka, regs,</div><div class='ctx'> 				 test_thread_flag(TIF_SINGLESTEP));</div><div class='head'>diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c<br/>index 16204dc15484..66c74f481cab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/smp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/smp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/smp.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='add'>+#include &lt;asm/nmi.h&gt;</div><div class='ctx'> /*</div><div class='ctx'>  *	Some notes on x86 processor bugs affecting SMP operation:</div><div class='ctx'>  *</div><div class='hunk'>@@ -148,6 +149,60 @@ void native_send_call_func_ipi(const struct cpumask *mask)</div><div class='ctx'> 	free_cpumask_var(allbutself);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static atomic_t stopping_cpu = ATOMIC_INIT(-1);</div><div class='add'>+</div><div class='add'>+static int smp_stop_nmi_callback(unsigned int val, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	/* We are registered on stopping cpu too, avoid spurious NMI */</div><div class='add'>+	if (raw_smp_processor_id() == atomic_read(&amp;stopping_cpu))</div><div class='add'>+		return NMI_HANDLED;</div><div class='add'>+</div><div class='add'>+	stop_this_cpu(NULL);</div><div class='add'>+</div><div class='add'>+	return NMI_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void native_nmi_stop_other_cpus(int wait)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+</div><div class='add'>+	if (reboot_force)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Use an own vector here because smp_call_function</div><div class='add'>+	 * does lots of things not suitable in a panic situation.</div><div class='add'>+	 */</div><div class='add'>+	if (num_online_cpus() &gt; 1) {</div><div class='add'>+		/* did someone beat us here? */</div><div class='add'>+		if (atomic_cmpxchg(&amp;stopping_cpu, -1, safe_smp_processor_id()) != -1)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		if (register_nmi_handler(NMI_LOCAL, smp_stop_nmi_callback,</div><div class='add'>+					 NMI_FLAG_FIRST, "smp_stop"))</div><div class='add'>+			/* Note: we ignore failures here */</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		/* sync above data before sending NMI */</div><div class='add'>+		wmb();</div><div class='add'>+</div><div class='add'>+		apic-&gt;send_IPI_allbutself(NMI_VECTOR);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Don't wait longer than a second if the caller</div><div class='add'>+		 * didn't ask us to wait.</div><div class='add'>+		 */</div><div class='add'>+		timeout = USEC_PER_SEC;</div><div class='add'>+		while (num_online_cpus() &gt; 1 &amp;&amp; (wait || timeout--))</div><div class='add'>+			udelay(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	disable_local_APIC();</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * this function calls the 'stop' function on all other CPUs in the system.</div><div class='ctx'>  */</div><div class='hunk'>@@ -160,7 +215,7 @@ asmlinkage void smp_reboot_interrupt(void)</div><div class='ctx'> 	irq_exit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void native_stop_other_cpus(int wait)</div><div class='add'>+static void native_irq_stop_other_cpus(int wait)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned long timeout;</div><div class='hunk'>@@ -194,6 +249,11 @@ static void native_stop_other_cpus(int wait)</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void native_smp_disable_nmi_ipi(void)</div><div class='add'>+{</div><div class='add'>+	smp_ops.stop_other_cpus = native_irq_stop_other_cpus;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Reschedule call back.</div><div class='ctx'>  */</div><div class='hunk'>@@ -225,12 +285,20 @@ void smp_call_function_single_interrupt(struct pt_regs *regs)</div><div class='ctx'> 	irq_exit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __init nonmi_ipi_setup(char *str)</div><div class='add'>+{</div><div class='add'>+        native_smp_disable_nmi_ipi();</div><div class='add'>+        return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__setup("nonmi_ipi", nonmi_ipi_setup);</div><div class='add'>+</div><div class='ctx'> struct smp_ops smp_ops = {</div><div class='ctx'> 	.smp_prepare_boot_cpu	= native_smp_prepare_boot_cpu,</div><div class='ctx'> 	.smp_prepare_cpus	= native_smp_prepare_cpus,</div><div class='ctx'> 	.smp_cpus_done		= native_smp_cpus_done,</div><div class='ctx'> </div><div class='del'>-	.stop_other_cpus	= native_stop_other_cpus,</div><div class='add'>+	.stop_other_cpus	= native_nmi_stop_other_cpus,</div><div class='ctx'> 	.smp_send_reschedule	= native_smp_send_reschedule,</div><div class='ctx'> </div><div class='ctx'> 	.cpu_up			= native_cpu_up,</div><div class='head'>diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c<br/>index e38e21754eea..66d250c00d11 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/smpboot.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/smpboot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/smpboot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/smpboot.c</a></div><div class='hunk'>@@ -207,23 +207,29 @@ static void __cpuinit smp_callin(void)</div><div class='ctx'> 	 * Need to setup vector mappings before we enable interrupts.</div><div class='ctx'> 	 */</div><div class='ctx'> 	setup_vector_irq(smp_processor_id());</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Save our processor parameters. Note: this information</div><div class='add'>+	 * is needed for clock calibration.</div><div class='add'>+	 */</div><div class='add'>+	smp_store_cpu_info(cpuid);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Get our bogomips.</div><div class='add'>+	 * Update loops_per_jiffy in cpu_data. Previous call to</div><div class='add'>+	 * smp_store_cpu_info() stored a value that is close but not as</div><div class='add'>+	 * accurate as the value just calculated.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Need to enable IRQs because it can take longer and then</div><div class='ctx'> 	 * the NMI watchdog might kill us.</div><div class='ctx'> 	 */</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> 	calibrate_delay();</div><div class='add'>+	cpu_data(cpuid).loops_per_jiffy = loops_per_jiffy;</div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> 	pr_debug("Stack at about %p\n", &amp;cpuid);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Save our processor parameters</div><div class='del'>-	 */</div><div class='del'>-	smp_store_cpu_info(cpuid);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * This must be done before setting cpu_online_mask</div><div class='ctx'> 	 * or calling notify_cpu_starting.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1143,6 +1149,7 @@ void __init native_smp_cpus_done(unsigned int max_cpus)</div><div class='ctx'> {</div><div class='ctx'> 	pr_debug("Boot done.\n");</div><div class='ctx'> </div><div class='add'>+	nmi_selftest();</div><div class='ctx'> 	impress_friends();</div><div class='ctx'> #ifdef CONFIG_X86_IO_APIC</div><div class='ctx'> 	setup_ioapic_dest();</div><div class='head'>diff --git a/arch/x86/kernel/syscall_32.c b/arch/x86/kernel/syscall_32.c<br/>new file mode 100644<br/>index 000000000000..147fcd4941c4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/syscall_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/syscall_32.c</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+/* System call table for i386. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;linux/sys.h&gt;</div><div class='add'>+#include &lt;linux/cache.h&gt;</div><div class='add'>+#include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+</div><div class='add'>+#define __SYSCALL_I386(nr, sym, compat) extern asmlinkage void sym(void) ;</div><div class='add'>+#include &lt;asm/syscalls_32.h&gt;</div><div class='add'>+#undef __SYSCALL_I386</div><div class='add'>+</div><div class='add'>+#define __SYSCALL_I386(nr, sym, compat) [nr] = sym,</div><div class='add'>+</div><div class='add'>+typedef asmlinkage void (*sys_call_ptr_t)(void);</div><div class='add'>+</div><div class='add'>+extern asmlinkage void sys_ni_syscall(void);</div><div class='add'>+</div><div class='add'>+const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {</div><div class='add'>+	/*</div><div class='add'>+	 * Smells like a compiler bug -- it doesn't work</div><div class='add'>+	 * when the &amp; below is removed.</div><div class='add'>+	 */</div><div class='add'>+	[0 ... __NR_syscall_max] = &amp;sys_ni_syscall,</div><div class='add'>+#include &lt;asm/syscalls_32.h&gt;</div><div class='add'>+};</div><div class='head'>diff --git a/arch/x86/kernel/syscall_64.c b/arch/x86/kernel/syscall_64.c<br/>index de87d6008295..7ac7943be02c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/syscall_64.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/syscall_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/syscall_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/syscall_64.c</a></div><div class='hunk'>@@ -5,15 +5,11 @@</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> </div><div class='del'>-#define __NO_STUBS</div><div class='add'>+#define __SYSCALL_64(nr, sym, compat) extern asmlinkage void sym(void) ;</div><div class='add'>+#include &lt;asm/syscalls_64.h&gt;</div><div class='add'>+#undef __SYSCALL_64</div><div class='ctx'> </div><div class='del'>-#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;</div><div class='del'>-#undef _ASM_X86_UNISTD_64_H</div><div class='del'>-#include &lt;asm/unistd_64.h&gt;</div><div class='del'>-</div><div class='del'>-#undef __SYSCALL</div><div class='del'>-#define __SYSCALL(nr, sym) [nr] = sym,</div><div class='del'>-#undef _ASM_X86_UNISTD_64_H</div><div class='add'>+#define __SYSCALL_64(nr, sym, compat) [nr] = sym,</div><div class='ctx'> </div><div class='ctx'> typedef void (*sys_call_ptr_t)(void);</div><div class='ctx'> </div><div class='hunk'>@@ -21,9 +17,9 @@ extern void sys_ni_syscall(void);</div><div class='ctx'> </div><div class='ctx'> const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {</div><div class='ctx'> 	/*</div><div class='del'>-	*Smells like a like a compiler bug -- it doesn't work</div><div class='del'>-	*when the &amp; below is removed.</div><div class='del'>-	*/</div><div class='add'>+	 * Smells like a compiler bug -- it doesn't work</div><div class='add'>+	 * when the &amp; below is removed.</div><div class='add'>+	 */</div><div class='ctx'> 	[0 ... __NR_syscall_max] = &amp;sys_ni_syscall,</div><div class='del'>-#include &lt;asm/unistd_64.h&gt;</div><div class='add'>+#include &lt;asm/syscalls_64.h&gt;</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S<br/>deleted file mode 100644<br/>index 9a0e31293920..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/syscall_table_32.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/syscall_table_32.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,350 +0,0 @@</div><div class='del'>-ENTRY(sys_call_table)</div><div class='del'>-	.long sys_restart_syscall	/* 0 - old "setup()" system call, used for restarting */</div><div class='del'>-	.long sys_exit</div><div class='del'>-	.long ptregs_fork</div><div class='del'>-	.long sys_read</div><div class='del'>-	.long sys_write</div><div class='del'>-	.long sys_open		/* 5 */</div><div class='del'>-	.long sys_close</div><div class='del'>-	.long sys_waitpid</div><div class='del'>-	.long sys_creat</div><div class='del'>-	.long sys_link</div><div class='del'>-	.long sys_unlink	/* 10 */</div><div class='del'>-	.long ptregs_execve</div><div class='del'>-	.long sys_chdir</div><div class='del'>-	.long sys_time</div><div class='del'>-	.long sys_mknod</div><div class='del'>-	.long sys_chmod		/* 15 */</div><div class='del'>-	.long sys_lchown16</div><div class='del'>-	.long sys_ni_syscall	/* old break syscall holder */</div><div class='del'>-	.long sys_stat</div><div class='del'>-	.long sys_lseek</div><div class='del'>-	.long sys_getpid	/* 20 */</div><div class='del'>-	.long sys_mount</div><div class='del'>-	.long sys_oldumount</div><div class='del'>-	.long sys_setuid16</div><div class='del'>-	.long sys_getuid16</div><div class='del'>-	.long sys_stime		/* 25 */</div><div class='del'>-	.long sys_ptrace</div><div class='del'>-	.long sys_alarm</div><div class='del'>-	.long sys_fstat</div><div class='del'>-	.long sys_pause</div><div class='del'>-	.long sys_utime		/* 30 */</div><div class='del'>-	.long sys_ni_syscall	/* old stty syscall holder */</div><div class='del'>-	.long sys_ni_syscall	/* old gtty syscall holder */</div><div class='del'>-	.long sys_access</div><div class='del'>-	.long sys_nice</div><div class='del'>-	.long sys_ni_syscall	/* 35 - old ftime syscall holder */</div><div class='del'>-	.long sys_sync</div><div class='del'>-	.long sys_kill</div><div class='del'>-	.long sys_rename</div><div class='del'>-	.long sys_mkdir</div><div class='del'>-	.long sys_rmdir		/* 40 */</div><div class='del'>-	.long sys_dup</div><div class='del'>-	.long sys_pipe</div><div class='del'>-	.long sys_times</div><div class='del'>-	.long sys_ni_syscall	/* old prof syscall holder */</div><div class='del'>-	.long sys_brk		/* 45 */</div><div class='del'>-	.long sys_setgid16</div><div class='del'>-	.long sys_getgid16</div><div class='del'>-	.long sys_signal</div><div class='del'>-	.long sys_geteuid16</div><div class='del'>-	.long sys_getegid16	/* 50 */</div><div class='del'>-	.long sys_acct</div><div class='del'>-	.long sys_umount	/* recycled never used phys() */</div><div class='del'>-	.long sys_ni_syscall	/* old lock syscall holder */</div><div class='del'>-	.long sys_ioctl</div><div class='del'>-	.long sys_fcntl		/* 55 */</div><div class='del'>-	.long sys_ni_syscall	/* old mpx syscall holder */</div><div class='del'>-	.long sys_setpgid</div><div class='del'>-	.long sys_ni_syscall	/* old ulimit syscall holder */</div><div class='del'>-	.long sys_olduname</div><div class='del'>-	.long sys_umask		/* 60 */</div><div class='del'>-	.long sys_chroot</div><div class='del'>-	.long sys_ustat</div><div class='del'>-	.long sys_dup2</div><div class='del'>-	.long sys_getppid</div><div class='del'>-	.long sys_getpgrp	/* 65 */</div><div class='del'>-	.long sys_setsid</div><div class='del'>-	.long sys_sigaction</div><div class='del'>-	.long sys_sgetmask</div><div class='del'>-	.long sys_ssetmask</div><div class='del'>-	.long sys_setreuid16	/* 70 */</div><div class='del'>-	.long sys_setregid16</div><div class='del'>-	.long sys_sigsuspend</div><div class='del'>-	.long sys_sigpending</div><div class='del'>-	.long sys_sethostname</div><div class='del'>-	.long sys_setrlimit	/* 75 */</div><div class='del'>-	.long sys_old_getrlimit</div><div class='del'>-	.long sys_getrusage</div><div class='del'>-	.long sys_gettimeofday</div><div class='del'>-	.long sys_settimeofday</div><div class='del'>-	.long sys_getgroups16	/* 80 */</div><div class='del'>-	.long sys_setgroups16</div><div class='del'>-	.long sys_old_select</div><div class='del'>-	.long sys_symlink</div><div class='del'>-	.long sys_lstat</div><div class='del'>-	.long sys_readlink	/* 85 */</div><div class='del'>-	.long sys_uselib</div><div class='del'>-	.long sys_swapon</div><div class='del'>-	.long sys_reboot</div><div class='del'>-	.long sys_old_readdir</div><div class='del'>-	.long sys_old_mmap	/* 90 */</div><div class='del'>-	.long sys_munmap</div><div class='del'>-	.long sys_truncate</div><div class='del'>-	.long sys_ftruncate</div><div class='del'>-	.long sys_fchmod</div><div class='del'>-	.long sys_fchown16	/* 95 */</div><div class='del'>-	.long sys_getpriority</div><div class='del'>-	.long sys_setpriority</div><div class='del'>-	.long sys_ni_syscall	/* old profil syscall holder */</div><div class='del'>-	.long sys_statfs</div><div class='del'>-	.long sys_fstatfs	/* 100 */</div><div class='del'>-	.long sys_ioperm</div><div class='del'>-	.long sys_socketcall</div><div class='del'>-	.long sys_syslog</div><div class='del'>-	.long sys_setitimer</div><div class='del'>-	.long sys_getitimer	/* 105 */</div><div class='del'>-	.long sys_newstat</div><div class='del'>-	.long sys_newlstat</div><div class='del'>-	.long sys_newfstat</div><div class='del'>-	.long sys_uname</div><div class='del'>-	.long ptregs_iopl	/* 110 */</div><div class='del'>-	.long sys_vhangup</div><div class='del'>-	.long sys_ni_syscall	/* old "idle" system call */</div><div class='del'>-	.long ptregs_vm86old</div><div class='del'>-	.long sys_wait4</div><div class='del'>-	.long sys_swapoff	/* 115 */</div><div class='del'>-	.long sys_sysinfo</div><div class='del'>-	.long sys_ipc</div><div class='del'>-	.long sys_fsync</div><div class='del'>-	.long ptregs_sigreturn</div><div class='del'>-	.long ptregs_clone	/* 120 */</div><div class='del'>-	.long sys_setdomainname</div><div class='del'>-	.long sys_newuname</div><div class='del'>-	.long sys_modify_ldt</div><div class='del'>-	.long sys_adjtimex</div><div class='del'>-	.long sys_mprotect	/* 125 */</div><div class='del'>-	.long sys_sigprocmask</div><div class='del'>-	.long sys_ni_syscall	/* old "create_module" */</div><div class='del'>-	.long sys_init_module</div><div class='del'>-	.long sys_delete_module</div><div class='del'>-	.long sys_ni_syscall	/* 130:	old "get_kernel_syms" */</div><div class='del'>-	.long sys_quotactl</div><div class='del'>-	.long sys_getpgid</div><div class='del'>-	.long sys_fchdir</div><div class='del'>-	.long sys_bdflush</div><div class='del'>-	.long sys_sysfs		/* 135 */</div><div class='del'>-	.long sys_personality</div><div class='del'>-	.long sys_ni_syscall	/* reserved for afs_syscall */</div><div class='del'>-	.long sys_setfsuid16</div><div class='del'>-	.long sys_setfsgid16</div><div class='del'>-	.long sys_llseek	/* 140 */</div><div class='del'>-	.long sys_getdents</div><div class='del'>-	.long sys_select</div><div class='del'>-	.long sys_flock</div><div class='del'>-	.long sys_msync</div><div class='del'>-	.long sys_readv		/* 145 */</div><div class='del'>-	.long sys_writev</div><div class='del'>-	.long sys_getsid</div><div class='del'>-	.long sys_fdatasync</div><div class='del'>-	.long sys_sysctl</div><div class='del'>-	.long sys_mlock		/* 150 */</div><div class='del'>-	.long sys_munlock</div><div class='del'>-	.long sys_mlockall</div><div class='del'>-	.long sys_munlockall</div><div class='del'>-	.long sys_sched_setparam</div><div class='del'>-	.long sys_sched_getparam   /* 155 */</div><div class='del'>-	.long sys_sched_setscheduler</div><div class='del'>-	.long sys_sched_getscheduler</div><div class='del'>-	.long sys_sched_yield</div><div class='del'>-	.long sys_sched_get_priority_max</div><div class='del'>-	.long sys_sched_get_priority_min  /* 160 */</div><div class='del'>-	.long sys_sched_rr_get_interval</div><div class='del'>-	.long sys_nanosleep</div><div class='del'>-	.long sys_mremap</div><div class='del'>-	.long sys_setresuid16</div><div class='del'>-	.long sys_getresuid16	/* 165 */</div><div class='del'>-	.long ptregs_vm86</div><div class='del'>-	.long sys_ni_syscall	/* Old sys_query_module */</div><div class='del'>-	.long sys_poll</div><div class='del'>-	.long sys_ni_syscall	/* Old nfsservctl */</div><div class='del'>-	.long sys_setresgid16	/* 170 */</div><div class='del'>-	.long sys_getresgid16</div><div class='del'>-	.long sys_prctl</div><div class='del'>-	.long ptregs_rt_sigreturn</div><div class='del'>-	.long sys_rt_sigaction</div><div class='del'>-	.long sys_rt_sigprocmask	/* 175 */</div><div class='del'>-	.long sys_rt_sigpending</div><div class='del'>-	.long sys_rt_sigtimedwait</div><div class='del'>-	.long sys_rt_sigqueueinfo</div><div class='del'>-	.long sys_rt_sigsuspend</div><div class='del'>-	.long sys_pread64	/* 180 */</div><div class='del'>-	.long sys_pwrite64</div><div class='del'>-	.long sys_chown16</div><div class='del'>-	.long sys_getcwd</div><div class='del'>-	.long sys_capget</div><div class='del'>-	.long sys_capset	/* 185 */</div><div class='del'>-	.long ptregs_sigaltstack</div><div class='del'>-	.long sys_sendfile</div><div class='del'>-	.long sys_ni_syscall	/* reserved for streams1 */</div><div class='del'>-	.long sys_ni_syscall	/* reserved for streams2 */</div><div class='del'>-	.long ptregs_vfork	/* 190 */</div><div class='del'>-	.long sys_getrlimit</div><div class='del'>-	.long sys_mmap_pgoff</div><div class='del'>-	.long sys_truncate64</div><div class='del'>-	.long sys_ftruncate64</div><div class='del'>-	.long sys_stat64	/* 195 */</div><div class='del'>-	.long sys_lstat64</div><div class='del'>-	.long sys_fstat64</div><div class='del'>-	.long sys_lchown</div><div class='del'>-	.long sys_getuid</div><div class='del'>-	.long sys_getgid	/* 200 */</div><div class='del'>-	.long sys_geteuid</div><div class='del'>-	.long sys_getegid</div><div class='del'>-	.long sys_setreuid</div><div class='del'>-	.long sys_setregid</div><div class='del'>-	.long sys_getgroups	/* 205 */</div><div class='del'>-	.long sys_setgroups</div><div class='del'>-	.long sys_fchown</div><div class='del'>-	.long sys_setresuid</div><div class='del'>-	.long sys_getresuid</div><div class='del'>-	.long sys_setresgid	/* 210 */</div><div class='del'>-	.long sys_getresgid</div><div class='del'>-	.long sys_chown</div><div class='del'>-	.long sys_setuid</div><div class='del'>-	.long sys_setgid</div><div class='del'>-	.long sys_setfsuid	/* 215 */</div><div class='del'>-	.long sys_setfsgid</div><div class='del'>-	.long sys_pivot_root</div><div class='del'>-	.long sys_mincore</div><div class='del'>-	.long sys_madvise</div><div class='del'>-	.long sys_getdents64	/* 220 */</div><div class='del'>-	.long sys_fcntl64</div><div class='del'>-	.long sys_ni_syscall	/* reserved for TUX */</div><div class='del'>-	.long sys_ni_syscall</div><div class='del'>-	.long sys_gettid</div><div class='del'>-	.long sys_readahead	/* 225 */</div><div class='del'>-	.long sys_setxattr</div><div class='del'>-	.long sys_lsetxattr</div><div class='del'>-	.long sys_fsetxattr</div><div class='del'>-	.long sys_getxattr</div><div class='del'>-	.long sys_lgetxattr	/* 230 */</div><div class='del'>-	.long sys_fgetxattr</div><div class='del'>-	.long sys_listxattr</div><div class='del'>-	.long sys_llistxattr</div><div class='del'>-	.long sys_flistxattr</div><div class='del'>-	.long sys_removexattr	/* 235 */</div><div class='del'>-	.long sys_lremovexattr</div><div class='del'>-	.long sys_fremovexattr</div><div class='del'>-	.long sys_tkill</div><div class='del'>-	.long sys_sendfile64</div><div class='del'>-	.long sys_futex		/* 240 */</div><div class='del'>-	.long sys_sched_setaffinity</div><div class='del'>-	.long sys_sched_getaffinity</div><div class='del'>-	.long sys_set_thread_area</div><div class='del'>-	.long sys_get_thread_area</div><div class='del'>-	.long sys_io_setup	/* 245 */</div><div class='del'>-	.long sys_io_destroy</div><div class='del'>-	.long sys_io_getevents</div><div class='del'>-	.long sys_io_submit</div><div class='del'>-	.long sys_io_cancel</div><div class='del'>-	.long sys_fadvise64	/* 250 */</div><div class='del'>-	.long sys_ni_syscall</div><div class='del'>-	.long sys_exit_group</div><div class='del'>-	.long sys_lookup_dcookie</div><div class='del'>-	.long sys_epoll_create</div><div class='del'>-	.long sys_epoll_ctl	/* 255 */</div><div class='del'>-	.long sys_epoll_wait</div><div class='del'>- 	.long sys_remap_file_pages</div><div class='del'>- 	.long sys_set_tid_address</div><div class='del'>- 	.long sys_timer_create</div><div class='del'>- 	.long sys_timer_settime		/* 260 */</div><div class='del'>- 	.long sys_timer_gettime</div><div class='del'>- 	.long sys_timer_getoverrun</div><div class='del'>- 	.long sys_timer_delete</div><div class='del'>- 	.long sys_clock_settime</div><div class='del'>- 	.long sys_clock_gettime		/* 265 */</div><div class='del'>- 	.long sys_clock_getres</div><div class='del'>- 	.long sys_clock_nanosleep</div><div class='del'>-	.long sys_statfs64</div><div class='del'>-	.long sys_fstatfs64</div><div class='del'>-	.long sys_tgkill	/* 270 */</div><div class='del'>-	.long sys_utimes</div><div class='del'>- 	.long sys_fadvise64_64</div><div class='del'>-	.long sys_ni_syscall	/* sys_vserver */</div><div class='del'>-	.long sys_mbind</div><div class='del'>-	.long sys_get_mempolicy</div><div class='del'>-	.long sys_set_mempolicy</div><div class='del'>-	.long sys_mq_open</div><div class='del'>-	.long sys_mq_unlink</div><div class='del'>-	.long sys_mq_timedsend</div><div class='del'>-	.long sys_mq_timedreceive	/* 280 */</div><div class='del'>-	.long sys_mq_notify</div><div class='del'>-	.long sys_mq_getsetattr</div><div class='del'>-	.long sys_kexec_load</div><div class='del'>-	.long sys_waitid</div><div class='del'>-	.long sys_ni_syscall		/* 285 */ /* available */</div><div class='del'>-	.long sys_add_key</div><div class='del'>-	.long sys_request_key</div><div class='del'>-	.long sys_keyctl</div><div class='del'>-	.long sys_ioprio_set</div><div class='del'>-	.long sys_ioprio_get		/* 290 */</div><div class='del'>-	.long sys_inotify_init</div><div class='del'>-	.long sys_inotify_add_watch</div><div class='del'>-	.long sys_inotify_rm_watch</div><div class='del'>-	.long sys_migrate_pages</div><div class='del'>-	.long sys_openat		/* 295 */</div><div class='del'>-	.long sys_mkdirat</div><div class='del'>-	.long sys_mknodat</div><div class='del'>-	.long sys_fchownat</div><div class='del'>-	.long sys_futimesat</div><div class='del'>-	.long sys_fstatat64		/* 300 */</div><div class='del'>-	.long sys_unlinkat</div><div class='del'>-	.long sys_renameat</div><div class='del'>-	.long sys_linkat</div><div class='del'>-	.long sys_symlinkat</div><div class='del'>-	.long sys_readlinkat		/* 305 */</div><div class='del'>-	.long sys_fchmodat</div><div class='del'>-	.long sys_faccessat</div><div class='del'>-	.long sys_pselect6</div><div class='del'>-	.long sys_ppoll</div><div class='del'>-	.long sys_unshare		/* 310 */</div><div class='del'>-	.long sys_set_robust_list</div><div class='del'>-	.long sys_get_robust_list</div><div class='del'>-	.long sys_splice</div><div class='del'>-	.long sys_sync_file_range</div><div class='del'>-	.long sys_tee			/* 315 */</div><div class='del'>-	.long sys_vmsplice</div><div class='del'>-	.long sys_move_pages</div><div class='del'>-	.long sys_getcpu</div><div class='del'>-	.long sys_epoll_pwait</div><div class='del'>-	.long sys_utimensat		/* 320 */</div><div class='del'>-	.long sys_signalfd</div><div class='del'>-	.long sys_timerfd_create</div><div class='del'>-	.long sys_eventfd</div><div class='del'>-	.long sys_fallocate</div><div class='del'>-	.long sys_timerfd_settime	/* 325 */</div><div class='del'>-	.long sys_timerfd_gettime</div><div class='del'>-	.long sys_signalfd4</div><div class='del'>-	.long sys_eventfd2</div><div class='del'>-	.long sys_epoll_create1</div><div class='del'>-	.long sys_dup3			/* 330 */</div><div class='del'>-	.long sys_pipe2</div><div class='del'>-	.long sys_inotify_init1</div><div class='del'>-	.long sys_preadv</div><div class='del'>-	.long sys_pwritev</div><div class='del'>-	.long sys_rt_tgsigqueueinfo	/* 335 */</div><div class='del'>-	.long sys_perf_event_open</div><div class='del'>-	.long sys_recvmmsg</div><div class='del'>-	.long sys_fanotify_init</div><div class='del'>-	.long sys_fanotify_mark</div><div class='del'>-	.long sys_prlimit64		/* 340 */</div><div class='del'>-	.long sys_name_to_handle_at</div><div class='del'>-	.long sys_open_by_handle_at</div><div class='del'>-	.long sys_clock_adjtime</div><div class='del'>-	.long sys_syncfs</div><div class='del'>-	.long sys_sendmmsg		/* 345 */</div><div class='del'>-	.long sys_setns</div><div class='del'>-	.long sys_process_vm_readv</div><div class='del'>-	.long sys_process_vm_writev</div><div class='head'>diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c<br/>index fa1191fb679d..482ec3af2067 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/traps.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/traps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/traps.c</a></div><div class='hunk'>@@ -311,9 +311,15 @@ dotraplinkage void __kprobes do_int3(struct pt_regs *regs, long error_code)</div><div class='ctx'> 			== NOTIFY_STOP)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Let others (NMI) know that the debug stack is in use</div><div class='add'>+	 * as we may switch to the interrupt stack.</div><div class='add'>+	 */</div><div class='add'>+	debug_stack_usage_inc();</div><div class='ctx'> 	preempt_conditional_sti(regs);</div><div class='ctx'> 	do_trap(3, SIGTRAP, "int3", regs, error_code, NULL);</div><div class='ctx'> 	preempt_conditional_cli(regs);</div><div class='add'>+	debug_stack_usage_dec();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='hunk'>@@ -406,6 +412,12 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)</div><div class='ctx'> 							SIGTRAP) == NOTIFY_STOP)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Let others (NMI) know that the debug stack is in use</div><div class='add'>+	 * as we may switch to the interrupt stack.</div><div class='add'>+	 */</div><div class='add'>+	debug_stack_usage_inc();</div><div class='add'>+</div><div class='ctx'> 	/* It's safe to allow irq's after DR6 has been saved */</div><div class='ctx'> 	preempt_conditional_sti(regs);</div><div class='ctx'> </div><div class='hunk'>@@ -413,6 +425,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)</div><div class='ctx'> 		handle_vm86_trap((struct kernel_vm86_regs *) regs,</div><div class='ctx'> 				error_code, 1);</div><div class='ctx'> 		preempt_conditional_cli(regs);</div><div class='add'>+		debug_stack_usage_dec();</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -432,6 +445,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)</div><div class='ctx'> 	if (tsk-&gt;thread.debugreg6 &amp; (DR_STEP | DR_TRAP_BITS) || user_icebp)</div><div class='ctx'> 		send_sigtrap(tsk, regs, error_code, si_code);</div><div class='ctx'> 	preempt_conditional_cli(regs);</div><div class='add'>+	debug_stack_usage_dec();</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='hunk'>@@ -718,4 +732,10 @@ void __init trap_init(void)</div><div class='ctx'> 	cpu_init();</div><div class='ctx'> </div><div class='ctx'> 	x86_init.irqs.trap_init();</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	memcpy(&amp;nmi_idt_table, &amp;idt_table, IDT_ENTRIES * 16);</div><div class='add'>+	set_nmi_gate(1, &amp;debug);</div><div class='add'>+	set_nmi_gate(3, &amp;int3);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c<br/>index 2c9cf0fd78f5..a62c201c97ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/tsc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/tsc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/tsc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/tsc.c</a></div><div class='hunk'>@@ -290,14 +290,15 @@ static inline int pit_verify_msb(unsigned char val)</div><div class='ctx'> static inline int pit_expect_msb(unsigned char val, u64 *tscp, unsigned long *deltap)</div><div class='ctx'> {</div><div class='ctx'> 	int count;</div><div class='del'>-	u64 tsc = 0;</div><div class='add'>+	u64 tsc = 0, prev_tsc = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (count = 0; count &lt; 50000; count++) {</div><div class='ctx'> 		if (!pit_verify_msb(val))</div><div class='ctx'> 			break;</div><div class='add'>+		prev_tsc = tsc;</div><div class='ctx'> 		tsc = get_cycles();</div><div class='ctx'> 	}</div><div class='del'>-	*deltap = get_cycles() - tsc;</div><div class='add'>+	*deltap = get_cycles() - prev_tsc;</div><div class='ctx'> 	*tscp = tsc;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -311,9 +312,9 @@ static inline int pit_expect_msb(unsigned char val, u64 *tscp, unsigned long *de</div><div class='ctx'>  * How many MSB values do we want to see? We aim for</div><div class='ctx'>  * a maximum error rate of 500ppm (in practice the</div><div class='ctx'>  * real error is much smaller), but refuse to spend</div><div class='del'>- * more than 25ms on it.</div><div class='add'>+ * more than 50ms on it.</div><div class='ctx'>  */</div><div class='del'>-#define MAX_QUICK_PIT_MS 25</div><div class='add'>+#define MAX_QUICK_PIT_MS 50</div><div class='ctx'> #define MAX_QUICK_PIT_ITERATIONS (MAX_QUICK_PIT_MS * PIT_TICK_RATE / 1000 / 256)</div><div class='ctx'> </div><div class='ctx'> static unsigned long quick_pit_calibrate(void)</div><div class='hunk'>@@ -383,15 +384,12 @@ success:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * As a result, we can depend on there not being</div><div class='ctx'> 	 * any odd delays anywhere, and the TSC reads are</div><div class='del'>-	 * reliable (within the error). We also adjust the</div><div class='del'>-	 * delta to the middle of the error bars, just</div><div class='del'>-	 * because it looks nicer.</div><div class='add'>+	 * reliable (within the error).</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * kHz = ticks / time-in-seconds / 1000;</div><div class='ctx'> 	 * kHz = (t2 - t1) / (I * 256 / PIT_TICK_RATE) / 1000</div><div class='ctx'> 	 * kHz = ((t2 - t1) * PIT_TICK_RATE) / (I * 256 * 1000)</div><div class='ctx'> 	 */</div><div class='del'>-	delta += (long)(d2 - d1)/2;</div><div class='ctx'> 	delta *= PIT_TICK_RATE;</div><div class='ctx'> 	do_div(delta, i*256*1000);</div><div class='ctx'> 	printk("Fast TSC calibration using PIT\n");</div><div class='hunk'>@@ -995,3 +993,23 @@ void __init tsc_init(void)</div><div class='ctx'> 	check_system_tsc_reliable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+/*</div><div class='add'>+ * If we have a constant TSC and are using the TSC for the delay loop,</div><div class='add'>+ * we can skip clock calibration if another cpu in the same socket has already</div><div class='add'>+ * been calibrated. This assumes that CONSTANT_TSC applies to all</div><div class='add'>+ * cpus in the socket - this should be a safe assumption.</div><div class='add'>+ */</div><div class='add'>+unsigned long __cpuinit calibrate_delay_is_known(void)</div><div class='add'>+{</div><div class='add'>+	int i, cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	if (!tsc_disabled &amp;&amp; !cpu_has(&amp;cpu_data(cpu), X86_FEATURE_CONSTANT_TSC))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for_each_online_cpu(i)</div><div class='add'>+		if (cpu_data(i).phys_proc_id == cpu_data(cpu).phys_proc_id)</div><div class='add'>+			return cpu_data(i).loops_per_jiffy;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c<br/>index 863f8753ab0a..b466cab5ba15 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/vm86_32.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/vm86_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/vm86_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/vm86_32.c</a></div><div class='hunk'>@@ -335,9 +335,11 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk</div><div class='ctx'> 	if (info-&gt;flags &amp; VM86_SCREEN_BITMAP)</div><div class='ctx'> 		mark_screen_rdonly(tsk-&gt;mm);</div><div class='ctx'> </div><div class='del'>-	/*call audit_syscall_exit since we do not exit via the normal paths */</div><div class='add'>+	/*call __audit_syscall_exit since we do not exit via the normal paths */</div><div class='add'>+#ifdef CONFIG_AUDITSYSCALL</div><div class='ctx'> 	if (unlikely(current-&gt;audit_context))</div><div class='del'>-		audit_syscall_exit(AUDITSC_RESULT(0), 0);</div><div class='add'>+		__audit_syscall_exit(1, 0);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	__asm__ __volatile__(</div><div class='ctx'> 		"movl %0,%%esp\n\t"</div><div class='head'>diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c<br/>index 91f83e21b989..947a06ccc673 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kernel/x86_init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kernel/x86_init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kernel/x86_init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kernel/x86_init.c</a></div><div class='hunk'>@@ -115,4 +115,5 @@ struct x86_msi_ops x86_msi = {</div><div class='ctx'> 	.setup_msi_irqs = native_setup_msi_irqs,</div><div class='ctx'> 	.teardown_msi_irq = native_teardown_msi_irq,</div><div class='ctx'> 	.teardown_msi_irqs = default_teardown_msi_irqs,</div><div class='add'>+	.restore_msi_irqs = default_restore_msi_irqs,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig<br/>index ff5790d8e990..1a7fe868f375 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/Kconfig</a></div><div class='hunk'>@@ -35,6 +35,7 @@ config KVM</div><div class='ctx'> 	select KVM_MMIO</div><div class='ctx'> 	select TASKSTATS</div><div class='ctx'> 	select TASK_DELAY_ACCT</div><div class='add'>+	select PERF_EVENTS</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Support hosting fully virtualized guest machines using hardware</div><div class='ctx'> 	  virtualization extensions.  You will need a fairly recent</div><div class='hunk'>@@ -52,6 +53,8 @@ config KVM</div><div class='ctx'> config KVM_INTEL</div><div class='ctx'> 	tristate "KVM for Intel processors support"</div><div class='ctx'> 	depends on KVM</div><div class='add'>+	# for perf_guest_get_msrs():</div><div class='add'>+	depends on CPU_SUP_INTEL</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Provides support for KVM on Intel processors equipped with the VT</div><div class='ctx'> 	  extensions.</div><div class='head'>diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile<br/>index f15501f431c8..4f579e8dcacf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/Makefile</a></div><div class='hunk'>@@ -12,7 +12,7 @@ kvm-$(CONFIG_IOMMU_API)	+= $(addprefix ../../../virt/kvm/, iommu.o)</div><div class='ctx'> kvm-$(CONFIG_KVM_ASYNC_PF)	+= $(addprefix ../../../virt/kvm/, async_pf.o)</div><div class='ctx'> </div><div class='ctx'> kvm-y			+= x86.o mmu.o emulate.o i8259.o irq.o lapic.o \</div><div class='del'>-			   i8254.o timer.o</div><div class='add'>+			   i8254.o timer.o cpuid.o pmu.o</div><div class='ctx'> kvm-intel-y		+= vmx.o</div><div class='ctx'> kvm-amd-y		+= svm.o</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c<br/>new file mode 100644<br/>index 000000000000..89b02bfaaca5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/cpuid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/cpuid.c</a></div><div class='hunk'>@@ -0,0 +1,670 @@</div><div class='add'>+/*</div><div class='add'>+ * Kernel-based Virtual Machine driver for Linux</div><div class='add'>+ * cpuid support routines</div><div class='add'>+ *</div><div class='add'>+ * derived from arch/x86/kvm/x86.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Red Hat, Inc. and/or its affiliates.</div><div class='add'>+ * Copyright IBM Corporation, 2008</div><div class='add'>+ *</div><div class='add'>+ * This work is licensed under the terms of the GNU GPL, version 2.  See</div><div class='add'>+ * the COPYING file in the top-level directory.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kvm_host.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/user.h&gt;</div><div class='add'>+#include &lt;asm/xsave.h&gt;</div><div class='add'>+#include "cpuid.h"</div><div class='add'>+#include "lapic.h"</div><div class='add'>+#include "mmu.h"</div><div class='add'>+#include "trace.h"</div><div class='add'>+</div><div class='add'>+void kvm_update_cpuid(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_cpuid_entry2 *best;</div><div class='add'>+	struct kvm_lapic *apic = vcpu-&gt;arch.apic;</div><div class='add'>+</div><div class='add'>+	best = kvm_find_cpuid_entry(vcpu, 1, 0);</div><div class='add'>+	if (!best)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Update OSXSAVE bit */</div><div class='add'>+	if (cpu_has_xsave &amp;&amp; best-&gt;function == 0x1) {</div><div class='add'>+		best-&gt;ecx &amp;= ~(bit(X86_FEATURE_OSXSAVE));</div><div class='add'>+		if (kvm_read_cr4_bits(vcpu, X86_CR4_OSXSAVE))</div><div class='add'>+			best-&gt;ecx |= bit(X86_FEATURE_OSXSAVE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (apic) {</div><div class='add'>+		if (best-&gt;ecx &amp; bit(X86_FEATURE_TSC_DEADLINE_TIMER))</div><div class='add'>+			apic-&gt;lapic_timer.timer_mode_mask = 3 &lt;&lt; 17;</div><div class='add'>+		else</div><div class='add'>+			apic-&gt;lapic_timer.timer_mode_mask = 1 &lt;&lt; 17;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kvm_pmu_cpuid_update(vcpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int is_efer_nx(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long long efer = 0;</div><div class='add'>+</div><div class='add'>+	rdmsrl_safe(MSR_EFER, &amp;efer);</div><div class='add'>+	return efer &amp; EFER_NX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpuid_fix_nx_cap(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct kvm_cpuid_entry2 *e, *entry;</div><div class='add'>+</div><div class='add'>+	entry = NULL;</div><div class='add'>+	for (i = 0; i &lt; vcpu-&gt;arch.cpuid_nent; ++i) {</div><div class='add'>+		e = &amp;vcpu-&gt;arch.cpuid_entries[i];</div><div class='add'>+		if (e-&gt;function == 0x80000001) {</div><div class='add'>+			entry = e;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (entry &amp;&amp; (entry-&gt;edx &amp; (1 &lt;&lt; 20)) &amp;&amp; !is_efer_nx()) {</div><div class='add'>+		entry-&gt;edx &amp;= ~(1 &lt;&lt; 20);</div><div class='add'>+		printk(KERN_INFO "kvm: guest NX capability removed\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* when an old userspace process fills a new kernel module */</div><div class='add'>+int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu,</div><div class='add'>+			     struct kvm_cpuid *cpuid,</div><div class='add'>+			     struct kvm_cpuid_entry __user *entries)</div><div class='add'>+{</div><div class='add'>+	int r, i;</div><div class='add'>+	struct kvm_cpuid_entry *cpuid_entries;</div><div class='add'>+</div><div class='add'>+	r = -E2BIG;</div><div class='add'>+	if (cpuid-&gt;nent &gt; KVM_MAX_CPUID_ENTRIES)</div><div class='add'>+		goto out;</div><div class='add'>+	r = -ENOMEM;</div><div class='add'>+	cpuid_entries = vmalloc(sizeof(struct kvm_cpuid_entry) * cpuid-&gt;nent);</div><div class='add'>+	if (!cpuid_entries)</div><div class='add'>+		goto out;</div><div class='add'>+	r = -EFAULT;</div><div class='add'>+	if (copy_from_user(cpuid_entries, entries,</div><div class='add'>+			   cpuid-&gt;nent * sizeof(struct kvm_cpuid_entry)))</div><div class='add'>+		goto out_free;</div><div class='add'>+	for (i = 0; i &lt; cpuid-&gt;nent; i++) {</div><div class='add'>+		vcpu-&gt;arch.cpuid_entries[i].function = cpuid_entries[i].function;</div><div class='add'>+		vcpu-&gt;arch.cpuid_entries[i].eax = cpuid_entries[i].eax;</div><div class='add'>+		vcpu-&gt;arch.cpuid_entries[i].ebx = cpuid_entries[i].ebx;</div><div class='add'>+		vcpu-&gt;arch.cpuid_entries[i].ecx = cpuid_entries[i].ecx;</div><div class='add'>+		vcpu-&gt;arch.cpuid_entries[i].edx = cpuid_entries[i].edx;</div><div class='add'>+		vcpu-&gt;arch.cpuid_entries[i].index = 0;</div><div class='add'>+		vcpu-&gt;arch.cpuid_entries[i].flags = 0;</div><div class='add'>+		vcpu-&gt;arch.cpuid_entries[i].padding[0] = 0;</div><div class='add'>+		vcpu-&gt;arch.cpuid_entries[i].padding[1] = 0;</div><div class='add'>+		vcpu-&gt;arch.cpuid_entries[i].padding[2] = 0;</div><div class='add'>+	}</div><div class='add'>+	vcpu-&gt;arch.cpuid_nent = cpuid-&gt;nent;</div><div class='add'>+	cpuid_fix_nx_cap(vcpu);</div><div class='add'>+	r = 0;</div><div class='add'>+	kvm_apic_set_version(vcpu);</div><div class='add'>+	kvm_x86_ops-&gt;cpuid_update(vcpu);</div><div class='add'>+	kvm_update_cpuid(vcpu);</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	vfree(cpuid_entries);</div><div class='add'>+out:</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,</div><div class='add'>+			      struct kvm_cpuid2 *cpuid,</div><div class='add'>+			      struct kvm_cpuid_entry2 __user *entries)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = -E2BIG;</div><div class='add'>+	if (cpuid-&gt;nent &gt; KVM_MAX_CPUID_ENTRIES)</div><div class='add'>+		goto out;</div><div class='add'>+	r = -EFAULT;</div><div class='add'>+	if (copy_from_user(&amp;vcpu-&gt;arch.cpuid_entries, entries,</div><div class='add'>+			   cpuid-&gt;nent * sizeof(struct kvm_cpuid_entry2)))</div><div class='add'>+		goto out;</div><div class='add'>+	vcpu-&gt;arch.cpuid_nent = cpuid-&gt;nent;</div><div class='add'>+	kvm_apic_set_version(vcpu);</div><div class='add'>+	kvm_x86_ops-&gt;cpuid_update(vcpu);</div><div class='add'>+	kvm_update_cpuid(vcpu);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,</div><div class='add'>+			      struct kvm_cpuid2 *cpuid,</div><div class='add'>+			      struct kvm_cpuid_entry2 __user *entries)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = -E2BIG;</div><div class='add'>+	if (cpuid-&gt;nent &lt; vcpu-&gt;arch.cpuid_nent)</div><div class='add'>+		goto out;</div><div class='add'>+	r = -EFAULT;</div><div class='add'>+	if (copy_to_user(entries, &amp;vcpu-&gt;arch.cpuid_entries,</div><div class='add'>+			 vcpu-&gt;arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))</div><div class='add'>+		goto out;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	cpuid-&gt;nent = vcpu-&gt;arch.cpuid_nent;</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpuid_mask(u32 *word, int wordnum)</div><div class='add'>+{</div><div class='add'>+	*word &amp;= boot_cpu_data.x86_capability[wordnum];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void do_cpuid_1_ent(struct kvm_cpuid_entry2 *entry, u32 function,</div><div class='add'>+			   u32 index)</div><div class='add'>+{</div><div class='add'>+	entry-&gt;function = function;</div><div class='add'>+	entry-&gt;index = index;</div><div class='add'>+	cpuid_count(entry-&gt;function, entry-&gt;index,</div><div class='add'>+		    &amp;entry-&gt;eax, &amp;entry-&gt;ebx, &amp;entry-&gt;ecx, &amp;entry-&gt;edx);</div><div class='add'>+	entry-&gt;flags = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool supported_xcr0_bit(unsigned bit)</div><div class='add'>+{</div><div class='add'>+	u64 mask = ((u64)1 &lt;&lt; bit);</div><div class='add'>+</div><div class='add'>+	return mask &amp; (XSTATE_FP | XSTATE_SSE | XSTATE_YMM) &amp; host_xcr0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define F(x) bit(X86_FEATURE_##x)</div><div class='add'>+</div><div class='add'>+static int do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,</div><div class='add'>+			 u32 index, int *nent, int maxnent)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	unsigned f_nx = is_efer_nx() ? F(NX) : 0;</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	unsigned f_gbpages = (kvm_x86_ops-&gt;get_lpage_level() == PT_PDPE_LEVEL)</div><div class='add'>+				? F(GBPAGES) : 0;</div><div class='add'>+	unsigned f_lm = F(LM);</div><div class='add'>+#else</div><div class='add'>+	unsigned f_gbpages = 0;</div><div class='add'>+	unsigned f_lm = 0;</div><div class='add'>+#endif</div><div class='add'>+	unsigned f_rdtscp = kvm_x86_ops-&gt;rdtscp_supported() ? F(RDTSCP) : 0;</div><div class='add'>+</div><div class='add'>+	/* cpuid 1.edx */</div><div class='add'>+	const u32 kvm_supported_word0_x86_features =</div><div class='add'>+		F(FPU) | F(VME) | F(DE) | F(PSE) |</div><div class='add'>+		F(TSC) | F(MSR) | F(PAE) | F(MCE) |</div><div class='add'>+		F(CX8) | F(APIC) | 0 /* Reserved */ | F(SEP) |</div><div class='add'>+		F(MTRR) | F(PGE) | F(MCA) | F(CMOV) |</div><div class='add'>+		F(PAT) | F(PSE36) | 0 /* PSN */ | F(CLFLSH) |</div><div class='add'>+		0 /* Reserved, DS, ACPI */ | F(MMX) |</div><div class='add'>+		F(FXSR) | F(XMM) | F(XMM2) | F(SELFSNOOP) |</div><div class='add'>+		0 /* HTT, TM, Reserved, PBE */;</div><div class='add'>+	/* cpuid 0x80000001.edx */</div><div class='add'>+	const u32 kvm_supported_word1_x86_features =</div><div class='add'>+		F(FPU) | F(VME) | F(DE) | F(PSE) |</div><div class='add'>+		F(TSC) | F(MSR) | F(PAE) | F(MCE) |</div><div class='add'>+		F(CX8) | F(APIC) | 0 /* Reserved */ | F(SYSCALL) |</div><div class='add'>+		F(MTRR) | F(PGE) | F(MCA) | F(CMOV) |</div><div class='add'>+		F(PAT) | F(PSE36) | 0 /* Reserved */ |</div><div class='add'>+		f_nx | 0 /* Reserved */ | F(MMXEXT) | F(MMX) |</div><div class='add'>+		F(FXSR) | F(FXSR_OPT) | f_gbpages | f_rdtscp |</div><div class='add'>+		0 /* Reserved */ | f_lm | F(3DNOWEXT) | F(3DNOW);</div><div class='add'>+	/* cpuid 1.ecx */</div><div class='add'>+	const u32 kvm_supported_word4_x86_features =</div><div class='add'>+		F(XMM3) | F(PCLMULQDQ) | 0 /* DTES64, MONITOR */ |</div><div class='add'>+		0 /* DS-CPL, VMX, SMX, EST */ |</div><div class='add'>+		0 /* TM2 */ | F(SSSE3) | 0 /* CNXT-ID */ | 0 /* Reserved */ |</div><div class='add'>+		F(FMA) | F(CX16) | 0 /* xTPR Update, PDCM */ |</div><div class='add'>+		0 /* Reserved, DCA */ | F(XMM4_1) |</div><div class='add'>+		F(XMM4_2) | F(X2APIC) | F(MOVBE) | F(POPCNT) |</div><div class='add'>+		0 /* Reserved*/ | F(AES) | F(XSAVE) | 0 /* OSXSAVE */ | F(AVX) |</div><div class='add'>+		F(F16C) | F(RDRAND);</div><div class='add'>+	/* cpuid 0x80000001.ecx */</div><div class='add'>+	const u32 kvm_supported_word6_x86_features =</div><div class='add'>+		F(LAHF_LM) | F(CMP_LEGACY) | 0 /*SVM*/ | 0 /* ExtApicSpace */ |</div><div class='add'>+		F(CR8_LEGACY) | F(ABM) | F(SSE4A) | F(MISALIGNSSE) |</div><div class='add'>+		F(3DNOWPREFETCH) | 0 /* OSVW */ | 0 /* IBS */ | F(XOP) |</div><div class='add'>+		0 /* SKINIT, WDT, LWP */ | F(FMA4) | F(TBM);</div><div class='add'>+</div><div class='add'>+	/* cpuid 0xC0000001.edx */</div><div class='add'>+	const u32 kvm_supported_word5_x86_features =</div><div class='add'>+		F(XSTORE) | F(XSTORE_EN) | F(XCRYPT) | F(XCRYPT_EN) |</div><div class='add'>+		F(ACE2) | F(ACE2_EN) | F(PHE) | F(PHE_EN) |</div><div class='add'>+		F(PMM) | F(PMM_EN);</div><div class='add'>+</div><div class='add'>+	/* cpuid 7.0.ebx */</div><div class='add'>+	const u32 kvm_supported_word9_x86_features =</div><div class='add'>+		F(FSGSBASE) | F(BMI1) | F(AVX2) | F(SMEP) | F(BMI2) | F(ERMS);</div><div class='add'>+</div><div class='add'>+	/* all calls to cpuid_count() should be made on the same cpu */</div><div class='add'>+	get_cpu();</div><div class='add'>+</div><div class='add'>+	r = -E2BIG;</div><div class='add'>+</div><div class='add'>+	if (*nent &gt;= maxnent)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	do_cpuid_1_ent(entry, function, index);</div><div class='add'>+	++*nent;</div><div class='add'>+</div><div class='add'>+	switch (function) {</div><div class='add'>+	case 0:</div><div class='add'>+		entry-&gt;eax = min(entry-&gt;eax, (u32)0xd);</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		entry-&gt;edx &amp;= kvm_supported_word0_x86_features;</div><div class='add'>+		cpuid_mask(&amp;entry-&gt;edx, 0);</div><div class='add'>+		entry-&gt;ecx &amp;= kvm_supported_word4_x86_features;</div><div class='add'>+		cpuid_mask(&amp;entry-&gt;ecx, 4);</div><div class='add'>+		/* we support x2apic emulation even if host does not support</div><div class='add'>+		 * it since we emulate x2apic in software */</div><div class='add'>+		entry-&gt;ecx |= F(X2APIC);</div><div class='add'>+		break;</div><div class='add'>+	/* function 2 entries are STATEFUL. That is, repeated cpuid commands</div><div class='add'>+	 * may return different values. This forces us to get_cpu() before</div><div class='add'>+	 * issuing the first command, and also to emulate this annoying behavior</div><div class='add'>+	 * in kvm_emulate_cpuid() using KVM_CPUID_FLAG_STATE_READ_NEXT */</div><div class='add'>+	case 2: {</div><div class='add'>+		int t, times = entry-&gt;eax &amp; 0xff;</div><div class='add'>+</div><div class='add'>+		entry-&gt;flags |= KVM_CPUID_FLAG_STATEFUL_FUNC;</div><div class='add'>+		entry-&gt;flags |= KVM_CPUID_FLAG_STATE_READ_NEXT;</div><div class='add'>+		for (t = 1; t &lt; times; ++t) {</div><div class='add'>+			if (*nent &gt;= maxnent)</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			do_cpuid_1_ent(&amp;entry[t], function, 0);</div><div class='add'>+			entry[t].flags |= KVM_CPUID_FLAG_STATEFUL_FUNC;</div><div class='add'>+			++*nent;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	/* function 4 has additional index. */</div><div class='add'>+	case 4: {</div><div class='add'>+		int i, cache_type;</div><div class='add'>+</div><div class='add'>+		entry-&gt;flags |= KVM_CPUID_FLAG_SIGNIFCANT_INDEX;</div><div class='add'>+		/* read more entries until cache_type is zero */</div><div class='add'>+		for (i = 1; ; ++i) {</div><div class='add'>+			if (*nent &gt;= maxnent)</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			cache_type = entry[i - 1].eax &amp; 0x1f;</div><div class='add'>+			if (!cache_type)</div><div class='add'>+				break;</div><div class='add'>+			do_cpuid_1_ent(&amp;entry[i], function, i);</div><div class='add'>+			entry[i].flags |=</div><div class='add'>+			       KVM_CPUID_FLAG_SIGNIFCANT_INDEX;</div><div class='add'>+			++*nent;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case 7: {</div><div class='add'>+		entry-&gt;flags |= KVM_CPUID_FLAG_SIGNIFCANT_INDEX;</div><div class='add'>+		/* Mask ebx against host capbability word 9 */</div><div class='add'>+		if (index == 0) {</div><div class='add'>+			entry-&gt;ebx &amp;= kvm_supported_word9_x86_features;</div><div class='add'>+			cpuid_mask(&amp;entry-&gt;ebx, 9);</div><div class='add'>+		} else</div><div class='add'>+			entry-&gt;ebx = 0;</div><div class='add'>+		entry-&gt;eax = 0;</div><div class='add'>+		entry-&gt;ecx = 0;</div><div class='add'>+		entry-&gt;edx = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case 9:</div><div class='add'>+		break;</div><div class='add'>+	case 0xa: { /* Architectural Performance Monitoring */</div><div class='add'>+		struct x86_pmu_capability cap;</div><div class='add'>+		union cpuid10_eax eax;</div><div class='add'>+		union cpuid10_edx edx;</div><div class='add'>+</div><div class='add'>+		perf_get_x86_pmu_capability(&amp;cap);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Only support guest architectural pmu on a host</div><div class='add'>+		 * with architectural pmu.</div><div class='add'>+		 */</div><div class='add'>+		if (!cap.version)</div><div class='add'>+			memset(&amp;cap, 0, sizeof(cap));</div><div class='add'>+</div><div class='add'>+		eax.split.version_id = min(cap.version, 2);</div><div class='add'>+		eax.split.num_counters = cap.num_counters_gp;</div><div class='add'>+		eax.split.bit_width = cap.bit_width_gp;</div><div class='add'>+		eax.split.mask_length = cap.events_mask_len;</div><div class='add'>+</div><div class='add'>+		edx.split.num_counters_fixed = cap.num_counters_fixed;</div><div class='add'>+		edx.split.bit_width_fixed = cap.bit_width_fixed;</div><div class='add'>+		edx.split.reserved = 0;</div><div class='add'>+</div><div class='add'>+		entry-&gt;eax = eax.full;</div><div class='add'>+		entry-&gt;ebx = cap.events_mask;</div><div class='add'>+		entry-&gt;ecx = 0;</div><div class='add'>+		entry-&gt;edx = edx.full;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	/* function 0xb has additional index. */</div><div class='add'>+	case 0xb: {</div><div class='add'>+		int i, level_type;</div><div class='add'>+</div><div class='add'>+		entry-&gt;flags |= KVM_CPUID_FLAG_SIGNIFCANT_INDEX;</div><div class='add'>+		/* read more entries until level_type is zero */</div><div class='add'>+		for (i = 1; ; ++i) {</div><div class='add'>+			if (*nent &gt;= maxnent)</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			level_type = entry[i - 1].ecx &amp; 0xff00;</div><div class='add'>+			if (!level_type)</div><div class='add'>+				break;</div><div class='add'>+			do_cpuid_1_ent(&amp;entry[i], function, i);</div><div class='add'>+			entry[i].flags |=</div><div class='add'>+			       KVM_CPUID_FLAG_SIGNIFCANT_INDEX;</div><div class='add'>+			++*nent;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case 0xd: {</div><div class='add'>+		int idx, i;</div><div class='add'>+</div><div class='add'>+		entry-&gt;flags |= KVM_CPUID_FLAG_SIGNIFCANT_INDEX;</div><div class='add'>+		for (idx = 1, i = 1; idx &lt; 64; ++idx) {</div><div class='add'>+			if (*nent &gt;= maxnent)</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			do_cpuid_1_ent(&amp;entry[i], function, idx);</div><div class='add'>+			if (entry[i].eax == 0 || !supported_xcr0_bit(idx))</div><div class='add'>+				continue;</div><div class='add'>+			entry[i].flags |=</div><div class='add'>+			       KVM_CPUID_FLAG_SIGNIFCANT_INDEX;</div><div class='add'>+			++*nent;</div><div class='add'>+			++i;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case KVM_CPUID_SIGNATURE: {</div><div class='add'>+		char signature[12] = "KVMKVMKVM\0\0";</div><div class='add'>+		u32 *sigptr = (u32 *)signature;</div><div class='add'>+		entry-&gt;eax = 0;</div><div class='add'>+		entry-&gt;ebx = sigptr[0];</div><div class='add'>+		entry-&gt;ecx = sigptr[1];</div><div class='add'>+		entry-&gt;edx = sigptr[2];</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case KVM_CPUID_FEATURES:</div><div class='add'>+		entry-&gt;eax = (1 &lt;&lt; KVM_FEATURE_CLOCKSOURCE) |</div><div class='add'>+			     (1 &lt;&lt; KVM_FEATURE_NOP_IO_DELAY) |</div><div class='add'>+			     (1 &lt;&lt; KVM_FEATURE_CLOCKSOURCE2) |</div><div class='add'>+			     (1 &lt;&lt; KVM_FEATURE_ASYNC_PF) |</div><div class='add'>+			     (1 &lt;&lt; KVM_FEATURE_CLOCKSOURCE_STABLE_BIT);</div><div class='add'>+</div><div class='add'>+		if (sched_info_on())</div><div class='add'>+			entry-&gt;eax |= (1 &lt;&lt; KVM_FEATURE_STEAL_TIME);</div><div class='add'>+</div><div class='add'>+		entry-&gt;ebx = 0;</div><div class='add'>+		entry-&gt;ecx = 0;</div><div class='add'>+		entry-&gt;edx = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 0x80000000:</div><div class='add'>+		entry-&gt;eax = min(entry-&gt;eax, 0x8000001a);</div><div class='add'>+		break;</div><div class='add'>+	case 0x80000001:</div><div class='add'>+		entry-&gt;edx &amp;= kvm_supported_word1_x86_features;</div><div class='add'>+		cpuid_mask(&amp;entry-&gt;edx, 1);</div><div class='add'>+		entry-&gt;ecx &amp;= kvm_supported_word6_x86_features;</div><div class='add'>+		cpuid_mask(&amp;entry-&gt;ecx, 6);</div><div class='add'>+		break;</div><div class='add'>+	case 0x80000008: {</div><div class='add'>+		unsigned g_phys_as = (entry-&gt;eax &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+		unsigned virt_as = max((entry-&gt;eax &gt;&gt; 8) &amp; 0xff, 48U);</div><div class='add'>+		unsigned phys_as = entry-&gt;eax &amp; 0xff;</div><div class='add'>+</div><div class='add'>+		if (!g_phys_as)</div><div class='add'>+			g_phys_as = phys_as;</div><div class='add'>+		entry-&gt;eax = g_phys_as | (virt_as &lt;&lt; 8);</div><div class='add'>+		entry-&gt;ebx = entry-&gt;edx = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case 0x80000019:</div><div class='add'>+		entry-&gt;ecx = entry-&gt;edx = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 0x8000001a:</div><div class='add'>+		break;</div><div class='add'>+	case 0x8000001d:</div><div class='add'>+		break;</div><div class='add'>+	/*Add support for Centaur's CPUID instruction*/</div><div class='add'>+	case 0xC0000000:</div><div class='add'>+		/*Just support up to 0xC0000004 now*/</div><div class='add'>+		entry-&gt;eax = min(entry-&gt;eax, 0xC0000004);</div><div class='add'>+		break;</div><div class='add'>+	case 0xC0000001:</div><div class='add'>+		entry-&gt;edx &amp;= kvm_supported_word5_x86_features;</div><div class='add'>+		cpuid_mask(&amp;entry-&gt;edx, 5);</div><div class='add'>+		break;</div><div class='add'>+	case 3: /* Processor serial number */</div><div class='add'>+	case 5: /* MONITOR/MWAIT */</div><div class='add'>+	case 6: /* Thermal management */</div><div class='add'>+	case 0x80000007: /* Advanced power management */</div><div class='add'>+	case 0xC0000002:</div><div class='add'>+	case 0xC0000003:</div><div class='add'>+	case 0xC0000004:</div><div class='add'>+	default:</div><div class='add'>+		entry-&gt;eax = entry-&gt;ebx = entry-&gt;ecx = entry-&gt;edx = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kvm_x86_ops-&gt;set_supported_cpuid(function, entry);</div><div class='add'>+</div><div class='add'>+	r = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	put_cpu();</div><div class='add'>+</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#undef F</div><div class='add'>+</div><div class='add'>+struct kvm_cpuid_param {</div><div class='add'>+	u32 func;</div><div class='add'>+	u32 idx;</div><div class='add'>+	bool has_leaf_count;</div><div class='add'>+	bool (*qualifier)(struct kvm_cpuid_param *param);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool is_centaur_cpu(struct kvm_cpuid_param *param)</div><div class='add'>+{</div><div class='add'>+	return boot_cpu_data.x86_vendor == X86_VENDOR_CENTAUR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,</div><div class='add'>+				      struct kvm_cpuid_entry2 __user *entries)</div><div class='add'>+{</div><div class='add'>+	struct kvm_cpuid_entry2 *cpuid_entries;</div><div class='add'>+	int limit, nent = 0, r = -E2BIG, i;</div><div class='add'>+	u32 func;</div><div class='add'>+	static struct kvm_cpuid_param param[] = {</div><div class='add'>+		{ .func = 0, .has_leaf_count = true },</div><div class='add'>+		{ .func = 0x80000000, .has_leaf_count = true },</div><div class='add'>+		{ .func = 0xC0000000, .qualifier = is_centaur_cpu, .has_leaf_count = true },</div><div class='add'>+		{ .func = KVM_CPUID_SIGNATURE },</div><div class='add'>+		{ .func = KVM_CPUID_FEATURES },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (cpuid-&gt;nent &lt; 1)</div><div class='add'>+		goto out;</div><div class='add'>+	if (cpuid-&gt;nent &gt; KVM_MAX_CPUID_ENTRIES)</div><div class='add'>+		cpuid-&gt;nent = KVM_MAX_CPUID_ENTRIES;</div><div class='add'>+	r = -ENOMEM;</div><div class='add'>+	cpuid_entries = vmalloc(sizeof(struct kvm_cpuid_entry2) * cpuid-&gt;nent);</div><div class='add'>+	if (!cpuid_entries)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	r = 0;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(param); i++) {</div><div class='add'>+		struct kvm_cpuid_param *ent = &amp;param[i];</div><div class='add'>+</div><div class='add'>+		if (ent-&gt;qualifier &amp;&amp; !ent-&gt;qualifier(ent))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		r = do_cpuid_ent(&amp;cpuid_entries[nent], ent-&gt;func, ent-&gt;idx,</div><div class='add'>+				&amp;nent, cpuid-&gt;nent);</div><div class='add'>+</div><div class='add'>+		if (r)</div><div class='add'>+			goto out_free;</div><div class='add'>+</div><div class='add'>+		if (!ent-&gt;has_leaf_count)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		limit = cpuid_entries[nent - 1].eax;</div><div class='add'>+		for (func = ent-&gt;func + 1; func &lt;= limit &amp;&amp; nent &lt; cpuid-&gt;nent &amp;&amp; r == 0; ++func)</div><div class='add'>+			r = do_cpuid_ent(&amp;cpuid_entries[nent], func, ent-&gt;idx,</div><div class='add'>+				     &amp;nent, cpuid-&gt;nent);</div><div class='add'>+</div><div class='add'>+		if (r)</div><div class='add'>+			goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = -EFAULT;</div><div class='add'>+	if (copy_to_user(entries, cpuid_entries,</div><div class='add'>+			 nent * sizeof(struct kvm_cpuid_entry2)))</div><div class='add'>+		goto out_free;</div><div class='add'>+	cpuid-&gt;nent = nent;</div><div class='add'>+	r = 0;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	vfree(cpuid_entries);</div><div class='add'>+out:</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int move_to_next_stateful_cpuid_entry(struct kvm_vcpu *vcpu, int i)</div><div class='add'>+{</div><div class='add'>+	struct kvm_cpuid_entry2 *e = &amp;vcpu-&gt;arch.cpuid_entries[i];</div><div class='add'>+	int j, nent = vcpu-&gt;arch.cpuid_nent;</div><div class='add'>+</div><div class='add'>+	e-&gt;flags &amp;= ~KVM_CPUID_FLAG_STATE_READ_NEXT;</div><div class='add'>+	/* when no next entry is found, the current entry[i] is reselected */</div><div class='add'>+	for (j = i + 1; ; j = (j + 1) % nent) {</div><div class='add'>+		struct kvm_cpuid_entry2 *ej = &amp;vcpu-&gt;arch.cpuid_entries[j];</div><div class='add'>+		if (ej-&gt;function == e-&gt;function) {</div><div class='add'>+			ej-&gt;flags |= KVM_CPUID_FLAG_STATE_READ_NEXT;</div><div class='add'>+			return j;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0; /* silence gcc, even though control never reaches here */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* find an entry with matching function, matching index (if needed), and that</div><div class='add'>+ * should be read next (if it's stateful) */</div><div class='add'>+static int is_matching_cpuid_entry(struct kvm_cpuid_entry2 *e,</div><div class='add'>+	u32 function, u32 index)</div><div class='add'>+{</div><div class='add'>+	if (e-&gt;function != function)</div><div class='add'>+		return 0;</div><div class='add'>+	if ((e-&gt;flags &amp; KVM_CPUID_FLAG_SIGNIFCANT_INDEX) &amp;&amp; e-&gt;index != index)</div><div class='add'>+		return 0;</div><div class='add'>+	if ((e-&gt;flags &amp; KVM_CPUID_FLAG_STATEFUL_FUNC) &amp;&amp;</div><div class='add'>+	    !(e-&gt;flags &amp; KVM_CPUID_FLAG_STATE_READ_NEXT))</div><div class='add'>+		return 0;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu,</div><div class='add'>+					      u32 function, u32 index)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct kvm_cpuid_entry2 *best = NULL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; vcpu-&gt;arch.cpuid_nent; ++i) {</div><div class='add'>+		struct kvm_cpuid_entry2 *e;</div><div class='add'>+</div><div class='add'>+		e = &amp;vcpu-&gt;arch.cpuid_entries[i];</div><div class='add'>+		if (is_matching_cpuid_entry(e, function, index)) {</div><div class='add'>+			if (e-&gt;flags &amp; KVM_CPUID_FLAG_STATEFUL_FUNC)</div><div class='add'>+				move_to_next_stateful_cpuid_entry(vcpu, i);</div><div class='add'>+			best = e;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return best;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_find_cpuid_entry);</div><div class='add'>+</div><div class='add'>+int cpuid_maxphyaddr(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_cpuid_entry2 *best;</div><div class='add'>+</div><div class='add'>+	best = kvm_find_cpuid_entry(vcpu, 0x80000000, 0);</div><div class='add'>+	if (!best || best-&gt;eax &lt; 0x80000008)</div><div class='add'>+		goto not_found;</div><div class='add'>+	best = kvm_find_cpuid_entry(vcpu, 0x80000008, 0);</div><div class='add'>+	if (best)</div><div class='add'>+		return best-&gt;eax &amp; 0xff;</div><div class='add'>+not_found:</div><div class='add'>+	return 36;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If no match is found, check whether we exceed the vCPU's limit</div><div class='add'>+ * and return the content of the highest valid _standard_ leaf instead.</div><div class='add'>+ * This is to satisfy the CPUID specification.</div><div class='add'>+ */</div><div class='add'>+static struct kvm_cpuid_entry2* check_cpuid_limit(struct kvm_vcpu *vcpu,</div><div class='add'>+                                                  u32 function, u32 index)</div><div class='add'>+{</div><div class='add'>+	struct kvm_cpuid_entry2 *maxlevel;</div><div class='add'>+</div><div class='add'>+	maxlevel = kvm_find_cpuid_entry(vcpu, function &amp; 0x80000000, 0);</div><div class='add'>+	if (!maxlevel || maxlevel-&gt;eax &gt;= function)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (function &amp; 0x80000000) {</div><div class='add'>+		maxlevel = kvm_find_cpuid_entry(vcpu, 0, 0);</div><div class='add'>+		if (!maxlevel)</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+	return kvm_find_cpuid_entry(vcpu, maxlevel-&gt;eax, index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvm_emulate_cpuid(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	u32 function, index;</div><div class='add'>+	struct kvm_cpuid_entry2 *best;</div><div class='add'>+</div><div class='add'>+	function = kvm_register_read(vcpu, VCPU_REGS_RAX);</div><div class='add'>+	index = kvm_register_read(vcpu, VCPU_REGS_RCX);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RAX, 0);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RBX, 0);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RCX, 0);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RDX, 0);</div><div class='add'>+	best = kvm_find_cpuid_entry(vcpu, function, index);</div><div class='add'>+</div><div class='add'>+	if (!best)</div><div class='add'>+		best = check_cpuid_limit(vcpu, function, index);</div><div class='add'>+</div><div class='add'>+	if (best) {</div><div class='add'>+		kvm_register_write(vcpu, VCPU_REGS_RAX, best-&gt;eax);</div><div class='add'>+		kvm_register_write(vcpu, VCPU_REGS_RBX, best-&gt;ebx);</div><div class='add'>+		kvm_register_write(vcpu, VCPU_REGS_RCX, best-&gt;ecx);</div><div class='add'>+		kvm_register_write(vcpu, VCPU_REGS_RDX, best-&gt;edx);</div><div class='add'>+	}</div><div class='add'>+	kvm_x86_ops-&gt;skip_emulated_instruction(vcpu);</div><div class='add'>+	trace_kvm_cpuid(function,</div><div class='add'>+			kvm_register_read(vcpu, VCPU_REGS_RAX),</div><div class='add'>+			kvm_register_read(vcpu, VCPU_REGS_RBX),</div><div class='add'>+			kvm_register_read(vcpu, VCPU_REGS_RCX),</div><div class='add'>+			kvm_register_read(vcpu, VCPU_REGS_RDX));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_emulate_cpuid);</div><div class='head'>diff --git a/arch/x86/kvm/cpuid.h b/arch/x86/kvm/cpuid.h<br/>new file mode 100644<br/>index 000000000000..5b97e1797a6d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/cpuid.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/cpuid.h</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+#ifndef ARCH_X86_KVM_CPUID_H</div><div class='add'>+#define ARCH_X86_KVM_CPUID_H</div><div class='add'>+</div><div class='add'>+#include "x86.h"</div><div class='add'>+</div><div class='add'>+void kvm_update_cpuid(struct kvm_vcpu *vcpu);</div><div class='add'>+struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu,</div><div class='add'>+					      u32 function, u32 index);</div><div class='add'>+int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,</div><div class='add'>+				      struct kvm_cpuid_entry2 __user *entries);</div><div class='add'>+int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu,</div><div class='add'>+			     struct kvm_cpuid *cpuid,</div><div class='add'>+			     struct kvm_cpuid_entry __user *entries);</div><div class='add'>+int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,</div><div class='add'>+			      struct kvm_cpuid2 *cpuid,</div><div class='add'>+			      struct kvm_cpuid_entry2 __user *entries);</div><div class='add'>+int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,</div><div class='add'>+			      struct kvm_cpuid2 *cpuid,</div><div class='add'>+			      struct kvm_cpuid_entry2 __user *entries);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline bool guest_cpuid_has_xsave(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_cpuid_entry2 *best;</div><div class='add'>+</div><div class='add'>+	best = kvm_find_cpuid_entry(vcpu, 1, 0);</div><div class='add'>+	return best &amp;&amp; (best-&gt;ecx &amp; bit(X86_FEATURE_XSAVE));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool guest_cpuid_has_smep(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_cpuid_entry2 *best;</div><div class='add'>+</div><div class='add'>+	best = kvm_find_cpuid_entry(vcpu, 7, 0);</div><div class='add'>+	return best &amp;&amp; (best-&gt;ebx &amp; bit(X86_FEATURE_SMEP));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool guest_cpuid_has_fsgsbase(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_cpuid_entry2 *best;</div><div class='add'>+</div><div class='add'>+	best = kvm_find_cpuid_entry(vcpu, 7, 0);</div><div class='add'>+	return best &amp;&amp; (best-&gt;ebx &amp; bit(X86_FEATURE_FSGSBASE));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c<br/>index f1e3be18a08f..05a562b85025 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/emulate.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/emulate.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/emulate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/emulate.c</a></div><div class='hunk'>@@ -125,8 +125,9 @@</div><div class='ctx'> #define Lock        (1&lt;&lt;26) /* lock prefix is allowed for the instruction */</div><div class='ctx'> #define Priv        (1&lt;&lt;27) /* instruction generates #GP if current CPL != 0 */</div><div class='ctx'> #define No64	    (1&lt;&lt;28)</div><div class='add'>+#define PageTable   (1 &lt;&lt; 29)   /* instruction used to write page table */</div><div class='ctx'> /* Source 2 operand type */</div><div class='del'>-#define Src2Shift   (29)</div><div class='add'>+#define Src2Shift   (30)</div><div class='ctx'> #define Src2None    (OpNone &lt;&lt; Src2Shift)</div><div class='ctx'> #define Src2CL      (OpCL &lt;&lt; Src2Shift)</div><div class='ctx'> #define Src2ImmByte (OpImmByte &lt;&lt; Src2Shift)</div><div class='hunk'>@@ -1674,11 +1675,6 @@ static int em_jmp_far(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 em_grp1a(struct x86_emulate_ctxt *ctxt)</div><div class='del'>-{</div><div class='del'>-	return emulate_pop(ctxt, &amp;ctxt-&gt;dst.val, ctxt-&gt;dst.bytes);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int em_grp2(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> {</div><div class='ctx'> 	switch (ctxt-&gt;modrm_reg) {</div><div class='hunk'>@@ -1788,7 +1784,7 @@ static int em_grp45(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int em_grp9(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+static int em_cmpxchg8b(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> {</div><div class='ctx'> 	u64 old = ctxt-&gt;dst.orig_val64;</div><div class='ctx'> </div><div class='hunk'>@@ -1831,6 +1827,24 @@ static int em_ret_far(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int em_cmpxchg(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	/* Save real source value, then compare EAX against destination. */</div><div class='add'>+	ctxt-&gt;src.orig_val = ctxt-&gt;src.val;</div><div class='add'>+	ctxt-&gt;src.val = ctxt-&gt;regs[VCPU_REGS_RAX];</div><div class='add'>+	emulate_2op_SrcV(ctxt, "cmp");</div><div class='add'>+</div><div class='add'>+	if (ctxt-&gt;eflags &amp; EFLG_ZF) {</div><div class='add'>+		/* Success: write back to memory. */</div><div class='add'>+		ctxt-&gt;dst.val = ctxt-&gt;src.orig_val;</div><div class='add'>+	} else {</div><div class='add'>+		/* Failure: write the value we saw to EAX. */</div><div class='add'>+		ctxt-&gt;dst.type = OP_REG;</div><div class='add'>+		ctxt-&gt;dst.addr.reg = (unsigned long *)&amp;ctxt-&gt;regs[VCPU_REGS_RAX];</div><div class='add'>+	}</div><div class='add'>+	return X86EMUL_CONTINUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int em_lseg(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> {</div><div class='ctx'> 	int seg = ctxt-&gt;src2.val;</div><div class='hunk'>@@ -2481,6 +2495,15 @@ static int em_das(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> 	return X86EMUL_CONTINUE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int em_call(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	long rel = ctxt-&gt;src.val;</div><div class='add'>+</div><div class='add'>+	ctxt-&gt;src.val = (unsigned long)ctxt-&gt;_eip;</div><div class='add'>+	jmp_rel(ctxt, rel);</div><div class='add'>+	return em_push(ctxt);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int em_call_far(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> {</div><div class='ctx'> 	u16 sel, old_cs;</div><div class='hunk'>@@ -2622,12 +2645,75 @@ static int em_rdtsc(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> 	return X86EMUL_CONTINUE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int em_rdpmc(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	u64 pmc;</div><div class='add'>+</div><div class='add'>+	if (ctxt-&gt;ops-&gt;read_pmc(ctxt, ctxt-&gt;regs[VCPU_REGS_RCX], &amp;pmc))</div><div class='add'>+		return emulate_gp(ctxt, 0);</div><div class='add'>+	ctxt-&gt;regs[VCPU_REGS_RAX] = (u32)pmc;</div><div class='add'>+	ctxt-&gt;regs[VCPU_REGS_RDX] = pmc &gt;&gt; 32;</div><div class='add'>+	return X86EMUL_CONTINUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int em_mov(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> {</div><div class='ctx'> 	ctxt-&gt;dst.val = ctxt-&gt;src.val;</div><div class='ctx'> 	return X86EMUL_CONTINUE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int em_cr_write(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	if (ctxt-&gt;ops-&gt;set_cr(ctxt, ctxt-&gt;modrm_reg, ctxt-&gt;src.val))</div><div class='add'>+		return emulate_gp(ctxt, 0);</div><div class='add'>+</div><div class='add'>+	/* Disable writeback. */</div><div class='add'>+	ctxt-&gt;dst.type = OP_NONE;</div><div class='add'>+	return X86EMUL_CONTINUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int em_dr_write(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	if (ctxt-&gt;mode == X86EMUL_MODE_PROT64)</div><div class='add'>+		val = ctxt-&gt;src.val &amp; ~0ULL;</div><div class='add'>+	else</div><div class='add'>+		val = ctxt-&gt;src.val &amp; ~0U;</div><div class='add'>+</div><div class='add'>+	/* #UD condition is already handled. */</div><div class='add'>+	if (ctxt-&gt;ops-&gt;set_dr(ctxt, ctxt-&gt;modrm_reg, val) &lt; 0)</div><div class='add'>+		return emulate_gp(ctxt, 0);</div><div class='add'>+</div><div class='add'>+	/* Disable writeback. */</div><div class='add'>+	ctxt-&gt;dst.type = OP_NONE;</div><div class='add'>+	return X86EMUL_CONTINUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int em_wrmsr(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	u64 msr_data;</div><div class='add'>+</div><div class='add'>+	msr_data = (u32)ctxt-&gt;regs[VCPU_REGS_RAX]</div><div class='add'>+		| ((u64)ctxt-&gt;regs[VCPU_REGS_RDX] &lt;&lt; 32);</div><div class='add'>+	if (ctxt-&gt;ops-&gt;set_msr(ctxt, ctxt-&gt;regs[VCPU_REGS_RCX], msr_data))</div><div class='add'>+		return emulate_gp(ctxt, 0);</div><div class='add'>+</div><div class='add'>+	return X86EMUL_CONTINUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int em_rdmsr(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	u64 msr_data;</div><div class='add'>+</div><div class='add'>+	if (ctxt-&gt;ops-&gt;get_msr(ctxt, ctxt-&gt;regs[VCPU_REGS_RCX], &amp;msr_data))</div><div class='add'>+		return emulate_gp(ctxt, 0);</div><div class='add'>+</div><div class='add'>+	ctxt-&gt;regs[VCPU_REGS_RAX] = (u32)msr_data;</div><div class='add'>+	ctxt-&gt;regs[VCPU_REGS_RDX] = msr_data &gt;&gt; 32;</div><div class='add'>+	return X86EMUL_CONTINUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int em_mov_rm_sreg(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> {</div><div class='ctx'> 	if (ctxt-&gt;modrm_reg &gt; VCPU_SREG_GS)</div><div class='hunk'>@@ -2775,6 +2861,24 @@ static int em_jcxz(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> 	return X86EMUL_CONTINUE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int em_in(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	if (!pio_in_emulated(ctxt, ctxt-&gt;dst.bytes, ctxt-&gt;src.val,</div><div class='add'>+			     &amp;ctxt-&gt;dst.val))</div><div class='add'>+		return X86EMUL_IO_NEEDED;</div><div class='add'>+</div><div class='add'>+	return X86EMUL_CONTINUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int em_out(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	ctxt-&gt;ops-&gt;pio_out_emulated(ctxt, ctxt-&gt;src.bytes, ctxt-&gt;dst.val,</div><div class='add'>+				    &amp;ctxt-&gt;src.val, 1);</div><div class='add'>+	/* Disable writeback. */</div><div class='add'>+	ctxt-&gt;dst.type = OP_NONE;</div><div class='add'>+	return X86EMUL_CONTINUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int em_cli(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> {</div><div class='ctx'> 	if (emulator_bad_iopl(ctxt))</div><div class='hunk'>@@ -2794,6 +2898,69 @@ static int em_sti(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> 	return X86EMUL_CONTINUE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int em_bt(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	/* Disable writeback. */</div><div class='add'>+	ctxt-&gt;dst.type = OP_NONE;</div><div class='add'>+	/* only subword offset */</div><div class='add'>+	ctxt-&gt;src.val &amp;= (ctxt-&gt;dst.bytes &lt;&lt; 3) - 1;</div><div class='add'>+</div><div class='add'>+	emulate_2op_SrcV_nobyte(ctxt, "bt");</div><div class='add'>+	return X86EMUL_CONTINUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int em_bts(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	emulate_2op_SrcV_nobyte(ctxt, "bts");</div><div class='add'>+	return X86EMUL_CONTINUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int em_btr(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	emulate_2op_SrcV_nobyte(ctxt, "btr");</div><div class='add'>+	return X86EMUL_CONTINUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int em_btc(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	emulate_2op_SrcV_nobyte(ctxt, "btc");</div><div class='add'>+	return X86EMUL_CONTINUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int em_bsf(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	u8 zf;</div><div class='add'>+</div><div class='add'>+	__asm__ ("bsf %2, %0; setz %1"</div><div class='add'>+		 : "=r"(ctxt-&gt;dst.val), "=q"(zf)</div><div class='add'>+		 : "r"(ctxt-&gt;src.val));</div><div class='add'>+</div><div class='add'>+	ctxt-&gt;eflags &amp;= ~X86_EFLAGS_ZF;</div><div class='add'>+	if (zf) {</div><div class='add'>+		ctxt-&gt;eflags |= X86_EFLAGS_ZF;</div><div class='add'>+		/* Disable writeback. */</div><div class='add'>+		ctxt-&gt;dst.type = OP_NONE;</div><div class='add'>+	}</div><div class='add'>+	return X86EMUL_CONTINUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int em_bsr(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	u8 zf;</div><div class='add'>+</div><div class='add'>+	__asm__ ("bsr %2, %0; setz %1"</div><div class='add'>+		 : "=r"(ctxt-&gt;dst.val), "=q"(zf)</div><div class='add'>+		 : "r"(ctxt-&gt;src.val));</div><div class='add'>+</div><div class='add'>+	ctxt-&gt;eflags &amp;= ~X86_EFLAGS_ZF;</div><div class='add'>+	if (zf) {</div><div class='add'>+		ctxt-&gt;eflags |= X86_EFLAGS_ZF;</div><div class='add'>+		/* Disable writeback. */</div><div class='add'>+		ctxt-&gt;dst.type = OP_NONE;</div><div class='add'>+	}</div><div class='add'>+	return X86EMUL_CONTINUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool valid_cr(int nr)</div><div class='ctx'> {</div><div class='ctx'> 	switch (nr) {</div><div class='hunk'>@@ -2867,9 +3034,6 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> 		break;</div><div class='ctx'> 		}</div><div class='ctx'> 	case 4: {</div><div class='del'>-		u64 cr4;</div><div class='del'>-</div><div class='del'>-		cr4 = ctxt-&gt;ops-&gt;get_cr(ctxt, 4);</div><div class='ctx'> 		ctxt-&gt;ops-&gt;get_msr(ctxt, MSR_EFER, &amp;efer);</div><div class='ctx'> </div><div class='ctx'> 		if ((efer &amp; EFER_LMA) &amp;&amp; !(new_val &amp; X86_CR4_PAE))</div><div class='hunk'>@@ -3003,6 +3167,8 @@ static int check_perm_out(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> #define D2bv(_f)      D((_f) | ByteOp), D(_f)</div><div class='ctx'> #define D2bvIP(_f, _i, _p) DIP((_f) | ByteOp, _i, _p), DIP(_f, _i, _p)</div><div class='ctx'> #define I2bv(_f, _e)  I((_f) | ByteOp, _e), I(_f, _e)</div><div class='add'>+#define I2bvIP(_f, _e, _i, _p) \</div><div class='add'>+	IIP((_f) | ByteOp, _e, _i, _p), IIP(_f, _e, _i, _p)</div><div class='ctx'> </div><div class='ctx'> #define I6ALU(_f, _e) I2bv((_f) | DstMem | SrcReg | ModRM, _e),		\</div><div class='ctx'> 		I2bv(((_f) | DstReg | SrcMem | ModRM) &amp; ~Lock, _e),	\</div><div class='hunk'>@@ -3033,17 +3199,17 @@ static struct opcode group7_rm7[] = {</div><div class='ctx'> </div><div class='ctx'> static struct opcode group1[] = {</div><div class='ctx'> 	I(Lock, em_add),</div><div class='del'>-	I(Lock, em_or),</div><div class='add'>+	I(Lock | PageTable, em_or),</div><div class='ctx'> 	I(Lock, em_adc),</div><div class='ctx'> 	I(Lock, em_sbb),</div><div class='del'>-	I(Lock, em_and),</div><div class='add'>+	I(Lock | PageTable, em_and),</div><div class='ctx'> 	I(Lock, em_sub),</div><div class='ctx'> 	I(Lock, em_xor),</div><div class='ctx'> 	I(0, em_cmp),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct opcode group1A[] = {</div><div class='del'>-	D(DstMem | SrcNone | ModRM | Mov | Stack), N, N, N, N, N, N, N,</div><div class='add'>+	I(DstMem | SrcNone | ModRM | Mov | Stack, em_pop), N, N, N, N, N, N, N,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct opcode group3[] = {</div><div class='hunk'>@@ -3058,16 +3224,19 @@ static struct opcode group3[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct opcode group4[] = {</div><div class='del'>-	D(ByteOp | DstMem | SrcNone | ModRM | Lock), D(ByteOp | DstMem | SrcNone | ModRM | Lock),</div><div class='add'>+	I(ByteOp | DstMem | SrcNone | ModRM | Lock, em_grp45),</div><div class='add'>+	I(ByteOp | DstMem | SrcNone | ModRM | Lock, em_grp45),</div><div class='ctx'> 	N, N, N, N, N, N,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct opcode group5[] = {</div><div class='del'>-	D(DstMem | SrcNone | ModRM | Lock), D(DstMem | SrcNone | ModRM | Lock),</div><div class='del'>-	D(SrcMem | ModRM | Stack),</div><div class='add'>+	I(DstMem | SrcNone | ModRM | Lock, em_grp45),</div><div class='add'>+	I(DstMem | SrcNone | ModRM | Lock, em_grp45),</div><div class='add'>+	I(SrcMem | ModRM | Stack, em_grp45),</div><div class='ctx'> 	I(SrcMemFAddr | ModRM | ImplicitOps | Stack, em_call_far),</div><div class='del'>-	D(SrcMem | ModRM | Stack), D(SrcMemFAddr | ModRM | ImplicitOps),</div><div class='del'>-	D(SrcMem | ModRM | Stack), N,</div><div class='add'>+	I(SrcMem | ModRM | Stack, em_grp45),</div><div class='add'>+	I(SrcMemFAddr | ModRM | ImplicitOps, em_grp45),</div><div class='add'>+	I(SrcMem | ModRM | Stack, em_grp45), N,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct opcode group6[] = {</div><div class='hunk'>@@ -3096,18 +3265,21 @@ static struct group_dual group7 = { {</div><div class='ctx'> </div><div class='ctx'> static struct opcode group8[] = {</div><div class='ctx'> 	N, N, N, N,</div><div class='del'>-	D(DstMem | SrcImmByte | ModRM), D(DstMem | SrcImmByte | ModRM | Lock),</div><div class='del'>-	D(DstMem | SrcImmByte | ModRM | Lock), D(DstMem | SrcImmByte | ModRM | Lock),</div><div class='add'>+	I(DstMem | SrcImmByte | ModRM, em_bt),</div><div class='add'>+	I(DstMem | SrcImmByte | ModRM | Lock | PageTable, em_bts),</div><div class='add'>+	I(DstMem | SrcImmByte | ModRM | Lock, em_btr),</div><div class='add'>+	I(DstMem | SrcImmByte | ModRM | Lock | PageTable, em_btc),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct group_dual group9 = { {</div><div class='del'>-	N, D(DstMem64 | ModRM | Lock), N, N, N, N, N, N,</div><div class='add'>+	N, I(DstMem64 | ModRM | Lock | PageTable, em_cmpxchg8b), N, N, N, N, N, N,</div><div class='ctx'> }, {</div><div class='ctx'> 	N, N, N, N, N, N, N, N,</div><div class='ctx'> } };</div><div class='ctx'> </div><div class='ctx'> static struct opcode group11[] = {</div><div class='del'>-	I(DstMem | SrcImm | ModRM | Mov, em_mov), X7(D(Undefined)),</div><div class='add'>+	I(DstMem | SrcImm | ModRM | Mov | PageTable, em_mov),</div><div class='add'>+	X7(D(Undefined)),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct gprefix pfx_0f_6f_0f_7f = {</div><div class='hunk'>@@ -3120,7 +3292,7 @@ static struct opcode opcode_table[256] = {</div><div class='ctx'> 	I(ImplicitOps | Stack | No64 | Src2ES, em_push_sreg),</div><div class='ctx'> 	I(ImplicitOps | Stack | No64 | Src2ES, em_pop_sreg),</div><div class='ctx'> 	/* 0x08 - 0x0F */</div><div class='del'>-	I6ALU(Lock, em_or),</div><div class='add'>+	I6ALU(Lock | PageTable, em_or),</div><div class='ctx'> 	I(ImplicitOps | Stack | No64 | Src2CS, em_push_sreg),</div><div class='ctx'> 	N,</div><div class='ctx'> 	/* 0x10 - 0x17 */</div><div class='hunk'>@@ -3132,7 +3304,7 @@ static struct opcode opcode_table[256] = {</div><div class='ctx'> 	I(ImplicitOps | Stack | No64 | Src2DS, em_push_sreg),</div><div class='ctx'> 	I(ImplicitOps | Stack | No64 | Src2DS, em_pop_sreg),</div><div class='ctx'> 	/* 0x20 - 0x27 */</div><div class='del'>-	I6ALU(Lock, em_and), N, N,</div><div class='add'>+	I6ALU(Lock | PageTable, em_and), N, N,</div><div class='ctx'> 	/* 0x28 - 0x2F */</div><div class='ctx'> 	I6ALU(Lock, em_sub), N, I(ByteOp | DstAcc | No64, em_das),</div><div class='ctx'> 	/* 0x30 - 0x37 */</div><div class='hunk'>@@ -3155,8 +3327,8 @@ static struct opcode opcode_table[256] = {</div><div class='ctx'> 	I(DstReg | SrcMem | ModRM | Src2Imm, em_imul_3op),</div><div class='ctx'> 	I(SrcImmByte | Mov | Stack, em_push),</div><div class='ctx'> 	I(DstReg | SrcMem | ModRM | Src2ImmByte, em_imul_3op),</div><div class='del'>-	D2bvIP(DstDI | SrcDX | Mov | String, ins, check_perm_in), /* insb, insw/insd */</div><div class='del'>-	D2bvIP(SrcSI | DstDX | String, outs, check_perm_out), /* outsb, outsw/outsd */</div><div class='add'>+	I2bvIP(DstDI | SrcDX | Mov | String, em_in, ins, check_perm_in), /* insb, insw/insd */</div><div class='add'>+	I2bvIP(SrcSI | DstDX | String, em_out, outs, check_perm_out), /* outsb, outsw/outsd */</div><div class='ctx'> 	/* 0x70 - 0x7F */</div><div class='ctx'> 	X16(D(SrcImmByte)),</div><div class='ctx'> 	/* 0x80 - 0x87 */</div><div class='hunk'>@@ -3165,11 +3337,11 @@ static struct opcode opcode_table[256] = {</div><div class='ctx'> 	G(ByteOp | DstMem | SrcImm | ModRM | No64 | Group, group1),</div><div class='ctx'> 	G(DstMem | SrcImmByte | ModRM | Group, group1),</div><div class='ctx'> 	I2bv(DstMem | SrcReg | ModRM, em_test),</div><div class='del'>-	I2bv(DstMem | SrcReg | ModRM | Lock, em_xchg),</div><div class='add'>+	I2bv(DstMem | SrcReg | ModRM | Lock | PageTable, em_xchg),</div><div class='ctx'> 	/* 0x88 - 0x8F */</div><div class='del'>-	I2bv(DstMem | SrcReg | ModRM | Mov, em_mov),</div><div class='add'>+	I2bv(DstMem | SrcReg | ModRM | Mov | PageTable, em_mov),</div><div class='ctx'> 	I2bv(DstReg | SrcMem | ModRM | Mov, em_mov),</div><div class='del'>-	I(DstMem | SrcNone | ModRM | Mov, em_mov_rm_sreg),</div><div class='add'>+	I(DstMem | SrcNone | ModRM | Mov | PageTable, em_mov_rm_sreg),</div><div class='ctx'> 	D(ModRM | SrcMem | NoAccess | DstReg),</div><div class='ctx'> 	I(ImplicitOps | SrcMem16 | ModRM, em_mov_sreg_rm),</div><div class='ctx'> 	G(0, group1A),</div><div class='hunk'>@@ -3182,7 +3354,7 @@ static struct opcode opcode_table[256] = {</div><div class='ctx'> 	II(ImplicitOps | Stack, em_popf, popf), N, N,</div><div class='ctx'> 	/* 0xA0 - 0xA7 */</div><div class='ctx'> 	I2bv(DstAcc | SrcMem | Mov | MemAbs, em_mov),</div><div class='del'>-	I2bv(DstMem | SrcAcc | Mov | MemAbs, em_mov),</div><div class='add'>+	I2bv(DstMem | SrcAcc | Mov | MemAbs | PageTable, em_mov),</div><div class='ctx'> 	I2bv(SrcSI | DstDI | Mov | String, em_mov),</div><div class='ctx'> 	I2bv(SrcSI | DstDI | String, em_cmp),</div><div class='ctx'> 	/* 0xA8 - 0xAF */</div><div class='hunk'>@@ -3213,13 +3385,13 @@ static struct opcode opcode_table[256] = {</div><div class='ctx'> 	/* 0xE0 - 0xE7 */</div><div class='ctx'> 	X3(I(SrcImmByte, em_loop)),</div><div class='ctx'> 	I(SrcImmByte, em_jcxz),</div><div class='del'>-	D2bvIP(SrcImmUByte | DstAcc, in,  check_perm_in),</div><div class='del'>-	D2bvIP(SrcAcc | DstImmUByte, out, check_perm_out),</div><div class='add'>+	I2bvIP(SrcImmUByte | DstAcc, em_in,  in,  check_perm_in),</div><div class='add'>+	I2bvIP(SrcAcc | DstImmUByte, em_out, out, check_perm_out),</div><div class='ctx'> 	/* 0xE8 - 0xEF */</div><div class='del'>-	D(SrcImm | Stack), D(SrcImm | ImplicitOps),</div><div class='add'>+	I(SrcImm | Stack, em_call), D(SrcImm | ImplicitOps),</div><div class='ctx'> 	I(SrcImmFAddr | No64, em_jmp_far), D(SrcImmByte | ImplicitOps),</div><div class='del'>-	D2bvIP(SrcDX | DstAcc, in,  check_perm_in),</div><div class='del'>-	D2bvIP(SrcAcc | DstDX, out, check_perm_out),</div><div class='add'>+	I2bvIP(SrcDX | DstAcc, em_in,  in,  check_perm_in),</div><div class='add'>+	I2bvIP(SrcAcc | DstDX, em_out, out, check_perm_out),</div><div class='ctx'> 	/* 0xF0 - 0xF7 */</div><div class='ctx'> 	N, DI(ImplicitOps, icebp), N, N,</div><div class='ctx'> 	DI(ImplicitOps | Priv, hlt), D(ImplicitOps),</div><div class='hunk'>@@ -3242,15 +3414,15 @@ static struct opcode twobyte_table[256] = {</div><div class='ctx'> 	/* 0x20 - 0x2F */</div><div class='ctx'> 	DIP(ModRM | DstMem | Priv | Op3264, cr_read, check_cr_read),</div><div class='ctx'> 	DIP(ModRM | DstMem | Priv | Op3264, dr_read, check_dr_read),</div><div class='del'>-	DIP(ModRM | SrcMem | Priv | Op3264, cr_write, check_cr_write),</div><div class='del'>-	DIP(ModRM | SrcMem | Priv | Op3264, dr_write, check_dr_write),</div><div class='add'>+	IIP(ModRM | SrcMem | Priv | Op3264, em_cr_write, cr_write, check_cr_write),</div><div class='add'>+	IIP(ModRM | SrcMem | Priv | Op3264, em_dr_write, dr_write, check_dr_write),</div><div class='ctx'> 	N, N, N, N,</div><div class='ctx'> 	N, N, N, N, N, N, N, N,</div><div class='ctx'> 	/* 0x30 - 0x3F */</div><div class='del'>-	DI(ImplicitOps | Priv, wrmsr),</div><div class='add'>+	II(ImplicitOps | Priv, em_wrmsr, wrmsr),</div><div class='ctx'> 	IIP(ImplicitOps, em_rdtsc, rdtsc, check_rdtsc),</div><div class='del'>-	DI(ImplicitOps | Priv, rdmsr),</div><div class='del'>-	DIP(ImplicitOps | Priv, rdpmc, check_rdpmc),</div><div class='add'>+	II(ImplicitOps | Priv, em_rdmsr, rdmsr),</div><div class='add'>+	IIP(ImplicitOps, em_rdpmc, rdpmc, check_rdpmc),</div><div class='ctx'> 	I(ImplicitOps | VendorSpecific, em_sysenter),</div><div class='ctx'> 	I(ImplicitOps | Priv | VendorSpecific, em_sysexit),</div><div class='ctx'> 	N, N,</div><div class='hunk'>@@ -3275,26 +3447,28 @@ static struct opcode twobyte_table[256] = {</div><div class='ctx'> 	X16(D(ByteOp | DstMem | SrcNone | ModRM| Mov)),</div><div class='ctx'> 	/* 0xA0 - 0xA7 */</div><div class='ctx'> 	I(Stack | Src2FS, em_push_sreg), I(Stack | Src2FS, em_pop_sreg),</div><div class='del'>-	DI(ImplicitOps, cpuid), D(DstMem | SrcReg | ModRM | BitOp),</div><div class='add'>+	DI(ImplicitOps, cpuid), I(DstMem | SrcReg | ModRM | BitOp, em_bt),</div><div class='ctx'> 	D(DstMem | SrcReg | Src2ImmByte | ModRM),</div><div class='ctx'> 	D(DstMem | SrcReg | Src2CL | ModRM), N, N,</div><div class='ctx'> 	/* 0xA8 - 0xAF */</div><div class='ctx'> 	I(Stack | Src2GS, em_push_sreg), I(Stack | Src2GS, em_pop_sreg),</div><div class='del'>-	DI(ImplicitOps, rsm), D(DstMem | SrcReg | ModRM | BitOp | Lock),</div><div class='add'>+	DI(ImplicitOps, rsm),</div><div class='add'>+	I(DstMem | SrcReg | ModRM | BitOp | Lock | PageTable, em_bts),</div><div class='ctx'> 	D(DstMem | SrcReg | Src2ImmByte | ModRM),</div><div class='ctx'> 	D(DstMem | SrcReg | Src2CL | ModRM),</div><div class='ctx'> 	D(ModRM), I(DstReg | SrcMem | ModRM, em_imul),</div><div class='ctx'> 	/* 0xB0 - 0xB7 */</div><div class='del'>-	D2bv(DstMem | SrcReg | ModRM | Lock),</div><div class='add'>+	I2bv(DstMem | SrcReg | ModRM | Lock | PageTable, em_cmpxchg),</div><div class='ctx'> 	I(DstReg | SrcMemFAddr | ModRM | Src2SS, em_lseg),</div><div class='del'>-	D(DstMem | SrcReg | ModRM | BitOp | Lock),</div><div class='add'>+	I(DstMem | SrcReg | ModRM | BitOp | Lock, em_btr),</div><div class='ctx'> 	I(DstReg | SrcMemFAddr | ModRM | Src2FS, em_lseg),</div><div class='ctx'> 	I(DstReg | SrcMemFAddr | ModRM | Src2GS, em_lseg),</div><div class='ctx'> 	D(ByteOp | DstReg | SrcMem | ModRM | Mov), D(DstReg | SrcMem16 | ModRM | Mov),</div><div class='ctx'> 	/* 0xB8 - 0xBF */</div><div class='ctx'> 	N, N,</div><div class='del'>-	G(BitOp, group8), D(DstMem | SrcReg | ModRM | BitOp | Lock),</div><div class='del'>-	D(DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),</div><div class='add'>+	G(BitOp, group8),</div><div class='add'>+	I(DstMem | SrcReg | ModRM | BitOp | Lock | PageTable, em_btc),</div><div class='add'>+	I(DstReg | SrcMem | ModRM, em_bsf), I(DstReg | SrcMem | ModRM, em_bsr),</div><div class='ctx'> 	D(ByteOp | DstReg | SrcMem | ModRM | Mov), D(DstReg | SrcMem16 | ModRM | Mov),</div><div class='ctx'> 	/* 0xC0 - 0xCF */</div><div class='ctx'> 	D2bv(DstMem | SrcReg | ModRM | Lock),</div><div class='hunk'>@@ -3320,6 +3494,7 @@ static struct opcode twobyte_table[256] = {</div><div class='ctx'> #undef D2bv</div><div class='ctx'> #undef D2bvIP</div><div class='ctx'> #undef I2bv</div><div class='add'>+#undef I2bvIP</div><div class='ctx'> #undef I6ALU</div><div class='ctx'> </div><div class='ctx'> static unsigned imm_size(struct x86_emulate_ctxt *ctxt)</div><div class='hunk'>@@ -3697,6 +3872,11 @@ done:</div><div class='ctx'> 	return (rc != X86EMUL_CONTINUE) ? EMULATION_FAILED : EMULATION_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool x86_page_table_writing_insn(struct x86_emulate_ctxt *ctxt)</div><div class='add'>+{</div><div class='add'>+	return ctxt-&gt;d &amp; PageTable;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool string_insn_completed(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> {</div><div class='ctx'> 	/* The second termination condition only applies for REPE</div><div class='hunk'>@@ -3720,7 +3900,6 @@ static bool string_insn_completed(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> int x86_emulate_insn(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> {</div><div class='ctx'> 	struct x86_emulate_ops *ops = ctxt-&gt;ops;</div><div class='del'>-	u64 msr_data;</div><div class='ctx'> 	int rc = X86EMUL_CONTINUE;</div><div class='ctx'> 	int saved_dst_type = ctxt-&gt;dst.type;</div><div class='ctx'> </div><div class='hunk'>@@ -3854,15 +4033,6 @@ special_insn:</div><div class='ctx'> 			goto cannot_emulate;</div><div class='ctx'> 		ctxt-&gt;dst.val = (s32) ctxt-&gt;src.val;</div><div class='ctx'> 		break;</div><div class='del'>-	case 0x6c:		/* insb */</div><div class='del'>-	case 0x6d:		/* insw/insd */</div><div class='del'>-		ctxt-&gt;src.val = ctxt-&gt;regs[VCPU_REGS_RDX];</div><div class='del'>-		goto do_io_in;</div><div class='del'>-	case 0x6e:		/* outsb */</div><div class='del'>-	case 0x6f:		/* outsw/outsd */</div><div class='del'>-		ctxt-&gt;dst.val = ctxt-&gt;regs[VCPU_REGS_RDX];</div><div class='del'>-		goto do_io_out;</div><div class='del'>-		break;</div><div class='ctx'> 	case 0x70 ... 0x7f: /* jcc (short) */</div><div class='ctx'> 		if (test_cc(ctxt-&gt;b, ctxt-&gt;eflags))</div><div class='ctx'> 			jmp_rel(ctxt, ctxt-&gt;src.val);</div><div class='hunk'>@@ -3870,9 +4040,6 @@ special_insn:</div><div class='ctx'> 	case 0x8d: /* lea r16/r32, m */</div><div class='ctx'> 		ctxt-&gt;dst.val = ctxt-&gt;src.addr.mem.ea;</div><div class='ctx'> 		break;</div><div class='del'>-	case 0x8f:		/* pop (sole member of Grp1a) */</div><div class='del'>-		rc = em_grp1a(ctxt);</div><div class='del'>-		break;</div><div class='ctx'> 	case 0x90 ... 0x97: /* nop / xchg reg, rax */</div><div class='ctx'> 		if (ctxt-&gt;dst.addr.reg == &amp;ctxt-&gt;regs[VCPU_REGS_RAX])</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -3905,38 +4072,11 @@ special_insn:</div><div class='ctx'> 		ctxt-&gt;src.val = ctxt-&gt;regs[VCPU_REGS_RCX];</div><div class='ctx'> 		rc = em_grp2(ctxt);</div><div class='ctx'> 		break;</div><div class='del'>-	case 0xe4: 	/* inb */</div><div class='del'>-	case 0xe5: 	/* in */</div><div class='del'>-		goto do_io_in;</div><div class='del'>-	case 0xe6: /* outb */</div><div class='del'>-	case 0xe7: /* out */</div><div class='del'>-		goto do_io_out;</div><div class='del'>-	case 0xe8: /* call (near) */ {</div><div class='del'>-		long int rel = ctxt-&gt;src.val;</div><div class='del'>-		ctxt-&gt;src.val = (unsigned long) ctxt-&gt;_eip;</div><div class='del'>-		jmp_rel(ctxt, rel);</div><div class='del'>-		rc = em_push(ctxt);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='ctx'> 	case 0xe9: /* jmp rel */</div><div class='ctx'> 	case 0xeb: /* jmp rel short */</div><div class='ctx'> 		jmp_rel(ctxt, ctxt-&gt;src.val);</div><div class='ctx'> 		ctxt-&gt;dst.type = OP_NONE; /* Disable writeback. */</div><div class='ctx'> 		break;</div><div class='del'>-	case 0xec: /* in al,dx */</div><div class='del'>-	case 0xed: /* in (e/r)ax,dx */</div><div class='del'>-	do_io_in:</div><div class='del'>-		if (!pio_in_emulated(ctxt, ctxt-&gt;dst.bytes, ctxt-&gt;src.val,</div><div class='del'>-				     &amp;ctxt-&gt;dst.val))</div><div class='del'>-			goto done; /* IO is needed */</div><div class='del'>-		break;</div><div class='del'>-	case 0xee: /* out dx,al */</div><div class='del'>-	case 0xef: /* out dx,(e/r)ax */</div><div class='del'>-	do_io_out:</div><div class='del'>-		ops-&gt;pio_out_emulated(ctxt, ctxt-&gt;src.bytes, ctxt-&gt;dst.val,</div><div class='del'>-				      &amp;ctxt-&gt;src.val, 1);</div><div class='del'>-		ctxt-&gt;dst.type = OP_NONE;	/* Disable writeback. */</div><div class='del'>-		break;</div><div class='ctx'> 	case 0xf4:              /* hlt */</div><div class='ctx'> 		ctxt-&gt;ops-&gt;halt(ctxt);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -3956,12 +4096,6 @@ special_insn:</div><div class='ctx'> 	case 0xfd: /* std */</div><div class='ctx'> 		ctxt-&gt;eflags |= EFLG_DF;</div><div class='ctx'> 		break;</div><div class='del'>-	case 0xfe: /* Grp4 */</div><div class='del'>-		rc = em_grp45(ctxt);</div><div class='del'>-		break;</div><div class='del'>-	case 0xff: /* Grp5 */</div><div class='del'>-		rc = em_grp45(ctxt);</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		goto cannot_emulate;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4036,49 +4170,6 @@ twobyte_insn:</div><div class='ctx'> 	case 0x21: /* mov from dr to reg */</div><div class='ctx'> 		ops-&gt;get_dr(ctxt, ctxt-&gt;modrm_reg, &amp;ctxt-&gt;dst.val);</div><div class='ctx'> 		break;</div><div class='del'>-	case 0x22: /* mov reg, cr */</div><div class='del'>-		if (ops-&gt;set_cr(ctxt, ctxt-&gt;modrm_reg, ctxt-&gt;src.val)) {</div><div class='del'>-			emulate_gp(ctxt, 0);</div><div class='del'>-			rc = X86EMUL_PROPAGATE_FAULT;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-		ctxt-&gt;dst.type = OP_NONE;</div><div class='del'>-		break;</div><div class='del'>-	case 0x23: /* mov from reg to dr */</div><div class='del'>-		if (ops-&gt;set_dr(ctxt, ctxt-&gt;modrm_reg, ctxt-&gt;src.val &amp;</div><div class='del'>-				((ctxt-&gt;mode == X86EMUL_MODE_PROT64) ?</div><div class='del'>-				 ~0ULL : ~0U)) &lt; 0) {</div><div class='del'>-			/* #UD condition is already handled by the code above */</div><div class='del'>-			emulate_gp(ctxt, 0);</div><div class='del'>-			rc = X86EMUL_PROPAGATE_FAULT;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ctxt-&gt;dst.type = OP_NONE;	/* no writeback */</div><div class='del'>-		break;</div><div class='del'>-	case 0x30:</div><div class='del'>-		/* wrmsr */</div><div class='del'>-		msr_data = (u32)ctxt-&gt;regs[VCPU_REGS_RAX]</div><div class='del'>-			| ((u64)ctxt-&gt;regs[VCPU_REGS_RDX] &lt;&lt; 32);</div><div class='del'>-		if (ops-&gt;set_msr(ctxt, ctxt-&gt;regs[VCPU_REGS_RCX], msr_data)) {</div><div class='del'>-			emulate_gp(ctxt, 0);</div><div class='del'>-			rc = X86EMUL_PROPAGATE_FAULT;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-		rc = X86EMUL_CONTINUE;</div><div class='del'>-		break;</div><div class='del'>-	case 0x32:</div><div class='del'>-		/* rdmsr */</div><div class='del'>-		if (ops-&gt;get_msr(ctxt, ctxt-&gt;regs[VCPU_REGS_RCX], &amp;msr_data)) {</div><div class='del'>-			emulate_gp(ctxt, 0);</div><div class='del'>-			rc = X86EMUL_PROPAGATE_FAULT;</div><div class='del'>-			goto done;</div><div class='del'>-		} else {</div><div class='del'>-			ctxt-&gt;regs[VCPU_REGS_RAX] = (u32)msr_data;</div><div class='del'>-			ctxt-&gt;regs[VCPU_REGS_RDX] = msr_data &gt;&gt; 32;</div><div class='del'>-		}</div><div class='del'>-		rc = X86EMUL_CONTINUE;</div><div class='del'>-		break;</div><div class='ctx'> 	case 0x40 ... 0x4f:	/* cmov */</div><div class='ctx'> 		ctxt-&gt;dst.val = ctxt-&gt;dst.orig_val = ctxt-&gt;src.val;</div><div class='ctx'> 		if (!test_cc(ctxt-&gt;b, ctxt-&gt;eflags))</div><div class='hunk'>@@ -4091,93 +4182,21 @@ twobyte_insn:</div><div class='ctx'> 	case 0x90 ... 0x9f:     /* setcc r/m8 */</div><div class='ctx'> 		ctxt-&gt;dst.val = test_cc(ctxt-&gt;b, ctxt-&gt;eflags);</div><div class='ctx'> 		break;</div><div class='del'>-	case 0xa3:</div><div class='del'>-	      bt:		/* bt */</div><div class='del'>-		ctxt-&gt;dst.type = OP_NONE;</div><div class='del'>-		/* only subword offset */</div><div class='del'>-		ctxt-&gt;src.val &amp;= (ctxt-&gt;dst.bytes &lt;&lt; 3) - 1;</div><div class='del'>-		emulate_2op_SrcV_nobyte(ctxt, "bt");</div><div class='del'>-		break;</div><div class='ctx'> 	case 0xa4: /* shld imm8, r, r/m */</div><div class='ctx'> 	case 0xa5: /* shld cl, r, r/m */</div><div class='ctx'> 		emulate_2op_cl(ctxt, "shld");</div><div class='ctx'> 		break;</div><div class='del'>-	case 0xab:</div><div class='del'>-	      bts:		/* bts */</div><div class='del'>-		emulate_2op_SrcV_nobyte(ctxt, "bts");</div><div class='del'>-		break;</div><div class='ctx'> 	case 0xac: /* shrd imm8, r, r/m */</div><div class='ctx'> 	case 0xad: /* shrd cl, r, r/m */</div><div class='ctx'> 		emulate_2op_cl(ctxt, "shrd");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0xae:              /* clflush */</div><div class='ctx'> 		break;</div><div class='del'>-	case 0xb0 ... 0xb1:	/* cmpxchg */</div><div class='del'>-		/*</div><div class='del'>-		 * Save real source value, then compare EAX against</div><div class='del'>-		 * destination.</div><div class='del'>-		 */</div><div class='del'>-		ctxt-&gt;src.orig_val = ctxt-&gt;src.val;</div><div class='del'>-		ctxt-&gt;src.val = ctxt-&gt;regs[VCPU_REGS_RAX];</div><div class='del'>-		emulate_2op_SrcV(ctxt, "cmp");</div><div class='del'>-		if (ctxt-&gt;eflags &amp; EFLG_ZF) {</div><div class='del'>-			/* Success: write back to memory. */</div><div class='del'>-			ctxt-&gt;dst.val = ctxt-&gt;src.orig_val;</div><div class='del'>-		} else {</div><div class='del'>-			/* Failure: write the value we saw to EAX. */</div><div class='del'>-			ctxt-&gt;dst.type = OP_REG;</div><div class='del'>-			ctxt-&gt;dst.addr.reg = (unsigned long *)&amp;ctxt-&gt;regs[VCPU_REGS_RAX];</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case 0xb3:</div><div class='del'>-	      btr:		/* btr */</div><div class='del'>-		emulate_2op_SrcV_nobyte(ctxt, "btr");</div><div class='del'>-		break;</div><div class='ctx'> 	case 0xb6 ... 0xb7:	/* movzx */</div><div class='ctx'> 		ctxt-&gt;dst.bytes = ctxt-&gt;op_bytes;</div><div class='ctx'> 		ctxt-&gt;dst.val = (ctxt-&gt;d &amp; ByteOp) ? (u8) ctxt-&gt;src.val</div><div class='ctx'> 						       : (u16) ctxt-&gt;src.val;</div><div class='ctx'> 		break;</div><div class='del'>-	case 0xba:		/* Grp8 */</div><div class='del'>-		switch (ctxt-&gt;modrm_reg &amp; 3) {</div><div class='del'>-		case 0:</div><div class='del'>-			goto bt;</div><div class='del'>-		case 1:</div><div class='del'>-			goto bts;</div><div class='del'>-		case 2:</div><div class='del'>-			goto btr;</div><div class='del'>-		case 3:</div><div class='del'>-			goto btc;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case 0xbb:</div><div class='del'>-	      btc:		/* btc */</div><div class='del'>-		emulate_2op_SrcV_nobyte(ctxt, "btc");</div><div class='del'>-		break;</div><div class='del'>-	case 0xbc: {		/* bsf */</div><div class='del'>-		u8 zf;</div><div class='del'>-		__asm__ ("bsf %2, %0; setz %1"</div><div class='del'>-			 : "=r"(ctxt-&gt;dst.val), "=q"(zf)</div><div class='del'>-			 : "r"(ctxt-&gt;src.val));</div><div class='del'>-		ctxt-&gt;eflags &amp;= ~X86_EFLAGS_ZF;</div><div class='del'>-		if (zf) {</div><div class='del'>-			ctxt-&gt;eflags |= X86_EFLAGS_ZF;</div><div class='del'>-			ctxt-&gt;dst.type = OP_NONE;	/* Disable writeback. */</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case 0xbd: {		/* bsr */</div><div class='del'>-		u8 zf;</div><div class='del'>-		__asm__ ("bsr %2, %0; setz %1"</div><div class='del'>-			 : "=r"(ctxt-&gt;dst.val), "=q"(zf)</div><div class='del'>-			 : "r"(ctxt-&gt;src.val));</div><div class='del'>-		ctxt-&gt;eflags &amp;= ~X86_EFLAGS_ZF;</div><div class='del'>-		if (zf) {</div><div class='del'>-			ctxt-&gt;eflags |= X86_EFLAGS_ZF;</div><div class='del'>-			ctxt-&gt;dst.type = OP_NONE;	/* Disable writeback. */</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='ctx'> 	case 0xbe ... 0xbf:	/* movsx */</div><div class='ctx'> 		ctxt-&gt;dst.bytes = ctxt-&gt;op_bytes;</div><div class='ctx'> 		ctxt-&gt;dst.val = (ctxt-&gt;d &amp; ByteOp) ? (s8) ctxt-&gt;src.val :</div><div class='hunk'>@@ -4194,9 +4213,6 @@ twobyte_insn:</div><div class='ctx'> 		ctxt-&gt;dst.val = (ctxt-&gt;op_bytes == 4) ? (u32) ctxt-&gt;src.val :</div><div class='ctx'> 							(u64) ctxt-&gt;src.val;</div><div class='ctx'> 		break;</div><div class='del'>-	case 0xc7:		/* Grp9 (cmpxchg8b) */</div><div class='del'>-		rc = em_grp9(ctxt);</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		goto cannot_emulate;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c<br/>index 405f2620392f..d68f99df690c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/i8254.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/i8254.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/i8254.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/i8254.c</a></div><div class='hunk'>@@ -344,7 +344,7 @@ static void create_pit_timer(struct kvm *kvm, u32 val, int is_period)</div><div class='ctx'> 	struct kvm_timer *pt = &amp;ps-&gt;pit_timer;</div><div class='ctx'> 	s64 interval;</div><div class='ctx'> </div><div class='del'>-	if (!irqchip_in_kernel(kvm))</div><div class='add'>+	if (!irqchip_in_kernel(kvm) || ps-&gt;flags &amp; KVM_PIT_FLAGS_HPET_LEGACY)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	interval = muldiv64(val, NSEC_PER_SEC, KVM_PIT_FREQ);</div><div class='hunk'>@@ -397,15 +397,11 @@ static void pit_load_count(struct kvm *kvm, int channel, u32 val)</div><div class='ctx'> 	case 1:</div><div class='ctx'>         /* FIXME: enhance mode 4 precision */</div><div class='ctx'> 	case 4:</div><div class='del'>-		if (!(ps-&gt;flags &amp; KVM_PIT_FLAGS_HPET_LEGACY)) {</div><div class='del'>-			create_pit_timer(kvm, val, 0);</div><div class='del'>-		}</div><div class='add'>+		create_pit_timer(kvm, val, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='ctx'> 	case 3:</div><div class='del'>-		if (!(ps-&gt;flags &amp; KVM_PIT_FLAGS_HPET_LEGACY)){</div><div class='del'>-			create_pit_timer(kvm, val, 1);</div><div class='del'>-		}</div><div class='add'>+		create_pit_timer(kvm, val, 1);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		destroy_pit_timer(kvm-&gt;arch.vpit);</div><div class='head'>diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c<br/>index cac4746d7ffb..b6a73537e1ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/i8259.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/i8259.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/i8259.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/i8259.c</a></div><div class='hunk'>@@ -262,9 +262,10 @@ int kvm_pic_read_irq(struct kvm *kvm)</div><div class='ctx'> </div><div class='ctx'> void kvm_pic_reset(struct kvm_kpic_state *s)</div><div class='ctx'> {</div><div class='del'>-	int irq;</div><div class='del'>-	struct kvm_vcpu *vcpu0 = s-&gt;pics_state-&gt;kvm-&gt;bsp_vcpu;</div><div class='add'>+	int irq, i;</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='ctx'> 	u8 irr = s-&gt;irr, isr = s-&gt;imr;</div><div class='add'>+	bool found = false;</div><div class='ctx'> </div><div class='ctx'> 	s-&gt;last_irr = 0;</div><div class='ctx'> 	s-&gt;irr = 0;</div><div class='hunk'>@@ -281,12 +282,19 @@ void kvm_pic_reset(struct kvm_kpic_state *s)</div><div class='ctx'> 	s-&gt;special_fully_nested_mode = 0;</div><div class='ctx'> 	s-&gt;init4 = 0;</div><div class='ctx'> </div><div class='del'>-	for (irq = 0; irq &lt; PIC_NUM_PINS/2; irq++) {</div><div class='del'>-		if (vcpu0 &amp;&amp; kvm_apic_accept_pic_intr(vcpu0))</div><div class='del'>-			if (irr &amp; (1 &lt;&lt; irq) || isr &amp; (1 &lt;&lt; irq)) {</div><div class='del'>-				pic_clear_isr(s, irq);</div><div class='del'>-			}</div><div class='del'>-	}</div><div class='add'>+	kvm_for_each_vcpu(i, vcpu, s-&gt;pics_state-&gt;kvm)</div><div class='add'>+		if (kvm_apic_accept_pic_intr(vcpu)) {</div><div class='add'>+			found = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (!found)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (irq = 0; irq &lt; PIC_NUM_PINS/2; irq++)</div><div class='add'>+		if (irr &amp; (1 &lt;&lt; irq) || isr &amp; (1 &lt;&lt; irq))</div><div class='add'>+			pic_clear_isr(s, irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pic_ioport_write(void *opaque, u32 addr, u32 val)</div><div class='head'>diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c<br/>index 54abb40199d6..cfdc6e0ef002 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/lapic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/lapic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/lapic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/lapic.c</a></div><div class='hunk'>@@ -38,6 +38,7 @@</div><div class='ctx'> #include "irq.h"</div><div class='ctx'> #include "trace.h"</div><div class='ctx'> #include "x86.h"</div><div class='add'>+#include "cpuid.h"</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_X86_64</div><div class='ctx'> #define mod_64(x, y) ((x) - (y) * div64_u64(x, y))</div><div class='hunk'>@@ -1120,7 +1121,7 @@ int apic_has_pending_timer(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kvm_apic_local_deliver(struct kvm_lapic *apic, int lvt_type)</div><div class='add'>+int kvm_apic_local_deliver(struct kvm_lapic *apic, int lvt_type)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg = apic_get_reg(apic, lvt_type);</div><div class='ctx'> 	int vector, mode, trig_mode;</div><div class='head'>diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h<br/>index 138e8cc6fea6..6f4ce2575d09 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/lapic.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/lapic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/lapic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/lapic.h</a></div><div class='hunk'>@@ -34,6 +34,7 @@ void kvm_apic_set_version(struct kvm_vcpu *vcpu);</div><div class='ctx'> int kvm_apic_match_physical_addr(struct kvm_lapic *apic, u16 dest);</div><div class='ctx'> int kvm_apic_match_logical_addr(struct kvm_lapic *apic, u8 mda);</div><div class='ctx'> int kvm_apic_set_irq(struct kvm_vcpu *vcpu, struct kvm_lapic_irq *irq);</div><div class='add'>+int kvm_apic_local_deliver(struct kvm_lapic *apic, int lvt_type);</div><div class='ctx'> </div><div class='ctx'> u64 kvm_get_apic_base(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_set_apic_base(struct kvm_vcpu *vcpu, u64 data);</div><div class='head'>diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c<br/>index f1b36cf3e3d0..224b02c3cda9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/mmu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/mmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/mmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/mmu.c</a></div><div class='hunk'>@@ -59,15 +59,6 @@ enum {</div><div class='ctx'> 	AUDIT_POST_SYNC</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-char *audit_point_name[] = {</div><div class='del'>-	"pre page fault",</div><div class='del'>-	"post page fault",</div><div class='del'>-	"pre pte write",</div><div class='del'>-	"post pte write",</div><div class='del'>-	"pre sync",</div><div class='del'>-	"post sync"</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #undef MMU_DEBUG</div><div class='ctx'> </div><div class='ctx'> #ifdef MMU_DEBUG</div><div class='hunk'>@@ -83,13 +74,10 @@ char *audit_point_name[] = {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef MMU_DEBUG</div><div class='del'>-static int dbg = 0;</div><div class='add'>+static bool dbg = 0;</div><div class='ctx'> module_param(dbg, bool, 0644);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int oos_shadow = 1;</div><div class='del'>-module_param(oos_shadow, bool, 0644);</div><div class='del'>-</div><div class='ctx'> #ifndef MMU_DEBUG</div><div class='ctx'> #define ASSERT(x) do { } while (0)</div><div class='ctx'> #else</div><div class='hunk'>@@ -593,6 +581,11 @@ static int mmu_topup_memory_cache(struct kvm_mmu_memory_cache *cache,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mmu_memory_cache_free_objects(struct kvm_mmu_memory_cache *cache)</div><div class='add'>+{</div><div class='add'>+	return cache-&gt;nobjs;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void mmu_free_memory_cache(struct kvm_mmu_memory_cache *mc,</div><div class='ctx'> 				  struct kmem_cache *cache)</div><div class='ctx'> {</div><div class='hunk'>@@ -953,21 +946,35 @@ static void pte_list_walk(unsigned long *pte_list, pte_list_walk_fn fn)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned long *__gfn_to_rmap(struct kvm *kvm, gfn_t gfn, int level,</div><div class='add'>+				    struct kvm_memory_slot *slot)</div><div class='add'>+{</div><div class='add'>+	struct kvm_lpage_info *linfo;</div><div class='add'>+</div><div class='add'>+	if (likely(level == PT_PAGE_TABLE_LEVEL))</div><div class='add'>+		return &amp;slot-&gt;rmap[gfn - slot-&gt;base_gfn];</div><div class='add'>+</div><div class='add'>+	linfo = lpage_info_slot(gfn, slot, level);</div><div class='add'>+	return &amp;linfo-&gt;rmap_pde;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Take gfn and return the reverse mapping to it.</div><div class='ctx'>  */</div><div class='ctx'> static unsigned long *gfn_to_rmap(struct kvm *kvm, gfn_t gfn, int level)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_memory_slot *slot;</div><div class='del'>-	struct kvm_lpage_info *linfo;</div><div class='ctx'> </div><div class='ctx'> 	slot = gfn_to_memslot(kvm, gfn);</div><div class='del'>-	if (likely(level == PT_PAGE_TABLE_LEVEL))</div><div class='del'>-		return &amp;slot-&gt;rmap[gfn - slot-&gt;base_gfn];</div><div class='add'>+	return __gfn_to_rmap(kvm, gfn, level, slot);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	linfo = lpage_info_slot(gfn, slot, level);</div><div class='add'>+static bool rmap_can_add(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_mmu_memory_cache *cache;</div><div class='ctx'> </div><div class='del'>-	return &amp;linfo-&gt;rmap_pde;</div><div class='add'>+	cache = &amp;vcpu-&gt;arch.mmu_pte_list_desc_cache;</div><div class='add'>+	return mmu_memory_cache_free_objects(cache);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rmap_add(struct kvm_vcpu *vcpu, u64 *spte, gfn_t gfn)</div><div class='hunk'>@@ -1004,17 +1011,16 @@ static void drop_spte(struct kvm *kvm, u64 *sptep)</div><div class='ctx'> 		rmap_remove(kvm, sptep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rmap_write_protect(struct kvm *kvm, u64 gfn)</div><div class='add'>+int kvm_mmu_rmap_write_protect(struct kvm *kvm, u64 gfn,</div><div class='add'>+			       struct kvm_memory_slot *slot)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long *rmapp;</div><div class='ctx'> 	u64 *spte;</div><div class='ctx'> 	int i, write_protected = 0;</div><div class='ctx'> </div><div class='del'>-	rmapp = gfn_to_rmap(kvm, gfn, PT_PAGE_TABLE_LEVEL);</div><div class='del'>-</div><div class='add'>+	rmapp = __gfn_to_rmap(kvm, gfn, PT_PAGE_TABLE_LEVEL, slot);</div><div class='ctx'> 	spte = rmap_next(kvm, rmapp, NULL);</div><div class='ctx'> 	while (spte) {</div><div class='del'>-		BUG_ON(!spte);</div><div class='ctx'> 		BUG_ON(!(*spte &amp; PT_PRESENT_MASK));</div><div class='ctx'> 		rmap_printk("rmap_write_protect: spte %p %llx\n", spte, *spte);</div><div class='ctx'> 		if (is_writable_pte(*spte)) {</div><div class='hunk'>@@ -1027,12 +1033,11 @@ static int rmap_write_protect(struct kvm *kvm, u64 gfn)</div><div class='ctx'> 	/* check for huge page mappings */</div><div class='ctx'> 	for (i = PT_DIRECTORY_LEVEL;</div><div class='ctx'> 	     i &lt; PT_PAGE_TABLE_LEVEL + KVM_NR_PAGE_SIZES; ++i) {</div><div class='del'>-		rmapp = gfn_to_rmap(kvm, gfn, i);</div><div class='add'>+		rmapp = __gfn_to_rmap(kvm, gfn, i, slot);</div><div class='ctx'> 		spte = rmap_next(kvm, rmapp, NULL);</div><div class='ctx'> 		while (spte) {</div><div class='del'>-			BUG_ON(!spte);</div><div class='ctx'> 			BUG_ON(!(*spte &amp; PT_PRESENT_MASK));</div><div class='del'>-			BUG_ON((*spte &amp; (PT_PAGE_SIZE_MASK|PT_PRESENT_MASK)) != (PT_PAGE_SIZE_MASK|PT_PRESENT_MASK));</div><div class='add'>+			BUG_ON(!is_large_pte(*spte));</div><div class='ctx'> 			pgprintk("rmap_write_protect(large): spte %p %llx %lld\n", spte, *spte, gfn);</div><div class='ctx'> 			if (is_writable_pte(*spte)) {</div><div class='ctx'> 				drop_spte(kvm, spte);</div><div class='hunk'>@@ -1047,6 +1052,14 @@ static int rmap_write_protect(struct kvm *kvm, u64 gfn)</div><div class='ctx'> 	return write_protected;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rmap_write_protect(struct kvm *kvm, u64 gfn)</div><div class='add'>+{</div><div class='add'>+	struct kvm_memory_slot *slot;</div><div class='add'>+</div><div class='add'>+	slot = gfn_to_memslot(kvm, gfn);</div><div class='add'>+	return kvm_mmu_rmap_write_protect(kvm, gfn, slot);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp,</div><div class='ctx'> 			   unsigned long data)</div><div class='ctx'> {</div><div class='hunk'>@@ -1103,15 +1116,15 @@ static int kvm_handle_hva(struct kvm *kvm, unsigned long hva,</div><div class='ctx'> 			  int (*handler)(struct kvm *kvm, unsigned long *rmapp,</div><div class='ctx'> 					 unsigned long data))</div><div class='ctx'> {</div><div class='del'>-	int i, j;</div><div class='add'>+	int j;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> 	struct kvm_memslots *slots;</div><div class='add'>+	struct kvm_memory_slot *memslot;</div><div class='ctx'> </div><div class='ctx'> 	slots = kvm_memslots(kvm);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; slots-&gt;nmemslots; i++) {</div><div class='del'>-		struct kvm_memory_slot *memslot = &amp;slots-&gt;memslots[i];</div><div class='add'>+	kvm_for_each_memslot(memslot, slots) {</div><div class='ctx'> 		unsigned long start = memslot-&gt;userspace_addr;</div><div class='ctx'> 		unsigned long end;</div><div class='ctx'> </div><div class='hunk'>@@ -1324,7 +1337,7 @@ static struct kvm_mmu_page *kvm_mmu_alloc_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> 						  PAGE_SIZE);</div><div class='ctx'> 	set_page_private(virt_to_page(sp-&gt;spt), (unsigned long)sp);</div><div class='ctx'> 	list_add(&amp;sp-&gt;link, &amp;vcpu-&gt;kvm-&gt;arch.active_mmu_pages);</div><div class='del'>-	bitmap_zero(sp-&gt;slot_bitmap, KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS);</div><div class='add'>+	bitmap_zero(sp-&gt;slot_bitmap, KVM_MEM_SLOTS_NUM);</div><div class='ctx'> 	sp-&gt;parent_ptes = 0;</div><div class='ctx'> 	mmu_page_add_parent_pte(vcpu, sp, parent_pte);</div><div class='ctx'> 	kvm_mod_used_mmu_pages(vcpu-&gt;kvm, +1);</div><div class='hunk'>@@ -1511,6 +1524,13 @@ static int kvm_sync_page_transient(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KVM_MMU_AUDIT</div><div class='add'>+#include "mmu_audit.c"</div><div class='add'>+#else</div><div class='add'>+static void kvm_mmu_audit(struct kvm_vcpu *vcpu, int point) { }</div><div class='add'>+static void mmu_audit_disable(void) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int 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='hunk'>@@ -1640,6 +1660,18 @@ static void init_shadow_page_table(struct kvm_mmu_page *sp)</div><div class='ctx'> 		sp-&gt;spt[i] = 0ull;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __clear_sp_write_flooding_count(struct kvm_mmu_page *sp)</div><div class='add'>+{</div><div class='add'>+	sp-&gt;write_flooding_count = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clear_sp_write_flooding_count(u64 *spte)</div><div class='add'>+{</div><div class='add'>+	struct kvm_mmu_page *sp =  page_header(__pa(spte));</div><div class='add'>+</div><div class='add'>+	__clear_sp_write_flooding_count(sp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> 					     gfn_t gfn,</div><div class='ctx'> 					     gva_t gaddr,</div><div class='hunk'>@@ -1683,6 +1715,7 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		} else if (sp-&gt;unsync)</div><div class='ctx'> 			kvm_mmu_mark_parents_unsync(sp);</div><div class='ctx'> </div><div class='add'>+		__clear_sp_write_flooding_count(sp);</div><div class='ctx'> 		trace_kvm_mmu_get_page(sp, false);</div><div class='ctx'> 		return sp;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1796,7 +1829,7 @@ static void validate_direct_spte(struct kvm_vcpu *vcpu, u64 *sptep,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mmu_page_zap_pte(struct kvm *kvm, struct kvm_mmu_page *sp,</div><div class='add'>+static bool mmu_page_zap_pte(struct kvm *kvm, struct kvm_mmu_page *sp,</div><div class='ctx'> 			     u64 *spte)</div><div class='ctx'> {</div><div class='ctx'> 	u64 pte;</div><div class='hunk'>@@ -1804,17 +1837,21 @@ static void mmu_page_zap_pte(struct kvm *kvm, struct kvm_mmu_page *sp,</div><div class='ctx'> </div><div class='ctx'> 	pte = *spte;</div><div class='ctx'> 	if (is_shadow_present_pte(pte)) {</div><div class='del'>-		if (is_last_spte(pte, sp-&gt;role.level))</div><div class='add'>+		if (is_last_spte(pte, sp-&gt;role.level)) {</div><div class='ctx'> 			drop_spte(kvm, spte);</div><div class='del'>-		else {</div><div class='add'>+			if (is_large_pte(pte))</div><div class='add'>+				--kvm-&gt;stat.lpages;</div><div class='add'>+		} else {</div><div class='ctx'> 			child = page_header(pte &amp; PT64_BASE_ADDR_MASK);</div><div class='ctx'> 			drop_parent_pte(child, spte);</div><div class='ctx'> 		}</div><div class='del'>-	} else if (is_mmio_spte(pte))</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_mmio_spte(pte))</div><div class='ctx'> 		mmu_spte_clear_no_track(spte);</div><div class='ctx'> </div><div class='del'>-	if (is_large_pte(pte))</div><div class='del'>-		--kvm-&gt;stat.lpages;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void kvm_mmu_page_unlink_children(struct kvm *kvm,</div><div class='hunk'>@@ -1831,15 +1868,6 @@ static void kvm_mmu_put_page(struct kvm_mmu_page *sp, u64 *parent_pte)</div><div class='ctx'> 	mmu_page_remove_parent_pte(sp, parent_pte);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void kvm_mmu_reset_last_pte_updated(struct kvm *kvm)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct kvm_vcpu *vcpu;</div><div class='del'>-</div><div class='del'>-	kvm_for_each_vcpu(i, vcpu, kvm)</div><div class='del'>-		vcpu-&gt;arch.last_pte_updated = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void kvm_mmu_unlink_parents(struct kvm *kvm, struct kvm_mmu_page *sp)</div><div class='ctx'> {</div><div class='ctx'> 	u64 *parent_pte;</div><div class='hunk'>@@ -1899,7 +1927,6 @@ static int kvm_mmu_prepare_zap_page(struct kvm *kvm, struct kvm_mmu_page *sp,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sp-&gt;role.invalid = 1;</div><div class='del'>-	kvm_mmu_reset_last_pte_updated(kvm);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1985,7 +2012,7 @@ void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned int goal_nr_mmu_pages)</div><div class='ctx'> 	kvm-&gt;arch.n_max_mmu_pages = goal_nr_mmu_pages;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kvm_mmu_unprotect_page(struct kvm *kvm, gfn_t gfn)</div><div class='add'>+int kvm_mmu_unprotect_page(struct kvm *kvm, gfn_t gfn)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_mmu_page *sp;</div><div class='ctx'> 	struct hlist_node *node;</div><div class='hunk'>@@ -1994,7 +2021,7 @@ static int kvm_mmu_unprotect_page(struct kvm *kvm, gfn_t gfn)</div><div class='ctx'> </div><div class='ctx'> 	pgprintk("%s: looking for gfn %llx\n", __func__, gfn);</div><div class='ctx'> 	r = 0;</div><div class='del'>-</div><div class='add'>+	spin_lock(&amp;kvm-&gt;mmu_lock);</div><div class='ctx'> 	for_each_gfn_indirect_valid_sp(kvm, sp, gfn, node) {</div><div class='ctx'> 		pgprintk("%s: gfn %llx role %x\n", __func__, gfn,</div><div class='ctx'> 			 sp-&gt;role.word);</div><div class='hunk'>@@ -2002,22 +2029,11 @@ static int kvm_mmu_unprotect_page(struct kvm *kvm, gfn_t gfn)</div><div class='ctx'> 		kvm_mmu_prepare_zap_page(kvm, sp, &amp;invalid_list);</div><div class='ctx'> 	}</div><div class='ctx'> 	kvm_mmu_commit_zap_page(kvm, &amp;invalid_list);</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mmu_unshadow(struct kvm *kvm, gfn_t gfn)</div><div class='del'>-{</div><div class='del'>-	struct kvm_mmu_page *sp;</div><div class='del'>-	struct hlist_node *node;</div><div class='del'>-	LIST_HEAD(invalid_list);</div><div class='add'>+	spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='ctx'> </div><div class='del'>-	for_each_gfn_indirect_valid_sp(kvm, sp, gfn, node) {</div><div class='del'>-		pgprintk("%s: zap %llx %x\n",</div><div class='del'>-			 __func__, gfn, sp-&gt;role.word);</div><div class='del'>-		kvm_mmu_prepare_zap_page(kvm, sp, &amp;invalid_list);</div><div class='del'>-	}</div><div class='del'>-	kvm_mmu_commit_zap_page(kvm, &amp;invalid_list);</div><div class='add'>+	return r;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_mmu_unprotect_page);</div><div class='ctx'> </div><div class='ctx'> static void page_header_update_slot(struct kvm *kvm, void *pte, gfn_t gfn)</div><div class='ctx'> {</div><div class='hunk'>@@ -2169,8 +2185,6 @@ static int mmu_need_write_protect(struct kvm_vcpu *vcpu, gfn_t gfn,</div><div class='ctx'> 			return 1;</div><div class='ctx'> </div><div class='ctx'> 		if (!need_unsync &amp;&amp; !s-&gt;unsync) {</div><div class='del'>-			if (!oos_shadow)</div><div class='del'>-				return 1;</div><div class='ctx'> 			need_unsync = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2191,11 +2205,6 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep,</div><div class='ctx'> 	if (set_mmio_spte(sptep, gfn, pfn, pte_access))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We don't set the accessed bit, since we sometimes want to see</div><div class='del'>-	 * whether the guest actually used the pte (in order to detect</div><div class='del'>-	 * demand paging).</div><div class='del'>-	 */</div><div class='ctx'> 	spte = PT_PRESENT_MASK;</div><div class='ctx'> 	if (!speculative)</div><div class='ctx'> 		spte |= shadow_accessed_mask;</div><div class='hunk'>@@ -2346,10 +2355,6 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	kvm_release_pfn_clean(pfn);</div><div class='del'>-	if (speculative) {</div><div class='del'>-		vcpu-&gt;arch.last_pte_updated = sptep;</div><div class='del'>-		vcpu-&gt;arch.last_pte_gfn = gfn;</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nonpaging_new_cr3(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -2840,12 +2845,12 @@ static void mmu_sync_roots(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	vcpu_clear_mmio_info(vcpu, ~0ul);</div><div class='del'>-	trace_kvm_mmu_audit(vcpu, AUDIT_PRE_SYNC);</div><div class='add'>+	kvm_mmu_audit(vcpu, AUDIT_PRE_SYNC);</div><div class='ctx'> 	if (vcpu-&gt;arch.mmu.root_level == PT64_ROOT_LEVEL) {</div><div class='ctx'> 		hpa_t root = vcpu-&gt;arch.mmu.root_hpa;</div><div class='ctx'> 		sp = page_header(root);</div><div class='ctx'> 		mmu_sync_children(vcpu, sp);</div><div class='del'>-		trace_kvm_mmu_audit(vcpu, AUDIT_POST_SYNC);</div><div class='add'>+		kvm_mmu_audit(vcpu, AUDIT_POST_SYNC);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; 4; ++i) {</div><div class='hunk'>@@ -2857,7 +2862,7 @@ static void mmu_sync_roots(struct kvm_vcpu *vcpu)</div><div class='ctx'> 			mmu_sync_children(vcpu, sp);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	trace_kvm_mmu_audit(vcpu, AUDIT_POST_SYNC);</div><div class='add'>+	kvm_mmu_audit(vcpu, AUDIT_POST_SYNC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void kvm_mmu_sync_roots(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -3510,28 +3515,119 @@ static void mmu_pte_write_flush_tlb(struct kvm_vcpu *vcpu, bool zap_page,</div><div class='ctx'> 		kvm_mmu_flush_tlb(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool last_updated_pte_accessed(struct kvm_vcpu *vcpu)</div><div class='add'>+static u64 mmu_pte_write_fetch_gpte(struct kvm_vcpu *vcpu, gpa_t *gpa,</div><div class='add'>+				    const u8 *new, int *bytes)</div><div class='ctx'> {</div><div class='del'>-	u64 *spte = vcpu-&gt;arch.last_pte_updated;</div><div class='add'>+	u64 gentry;</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Assume that the pte write on a page table of the same type</div><div class='add'>+	 * as the current vcpu paging mode since we update the sptes only</div><div class='add'>+	 * when they have the same mode.</div><div class='add'>+	 */</div><div class='add'>+	if (is_pae(vcpu) &amp;&amp; *bytes == 4) {</div><div class='add'>+		/* Handle a 32-bit guest writing two halves of a 64-bit gpte */</div><div class='add'>+		*gpa &amp;= ~(gpa_t)7;</div><div class='add'>+		*bytes = 8;</div><div class='add'>+		r = kvm_read_guest(vcpu-&gt;kvm, *gpa, &amp;gentry, min(*bytes, 8));</div><div class='add'>+		if (r)</div><div class='add'>+			gentry = 0;</div><div class='add'>+		new = (const u8 *)&amp;gentry;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return !!(spte &amp;&amp; (*spte &amp; shadow_accessed_mask));</div><div class='add'>+	switch (*bytes) {</div><div class='add'>+	case 4:</div><div class='add'>+		gentry = *(const u32 *)new;</div><div class='add'>+		break;</div><div class='add'>+	case 8:</div><div class='add'>+		gentry = *(const u64 *)new;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		gentry = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return gentry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void kvm_mmu_access_page(struct kvm_vcpu *vcpu, gfn_t gfn)</div><div class='add'>+/*</div><div class='add'>+ * If we're seeing too many writes to a page, it may no longer be a page table,</div><div class='add'>+ * or we may be forking, in which case it is better to unmap the page.</div><div class='add'>+ */</div><div class='add'>+static bool detect_write_flooding(struct kvm_mmu_page *sp, u64 *spte)</div><div class='ctx'> {</div><div class='del'>-	u64 *spte = vcpu-&gt;arch.last_pte_updated;</div><div class='add'>+	/*</div><div class='add'>+	 * Skip write-flooding detected for the sp whose level is 1, because</div><div class='add'>+	 * it can become unsync, then the guest page is not write-protected.</div><div class='add'>+	 */</div><div class='add'>+	if (sp-&gt;role.level == 1)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	if (spte</div><div class='del'>-	    &amp;&amp; vcpu-&gt;arch.last_pte_gfn == gfn</div><div class='del'>-	    &amp;&amp; shadow_accessed_mask</div><div class='del'>-	    &amp;&amp; !(*spte &amp; shadow_accessed_mask)</div><div class='del'>-	    &amp;&amp; is_shadow_present_pte(*spte))</div><div class='del'>-		set_bit(PT_ACCESSED_SHIFT, (unsigned long *)spte);</div><div class='add'>+	return ++sp-&gt;write_flooding_count &gt;= 3;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Misaligned accesses are too much trouble to fix up; also, they usually</div><div class='add'>+ * indicate a page is not used as a page table.</div><div class='add'>+ */</div><div class='add'>+static bool detect_write_misaligned(struct kvm_mmu_page *sp, gpa_t gpa,</div><div class='add'>+				    int bytes)</div><div class='add'>+{</div><div class='add'>+	unsigned offset, pte_size, misaligned;</div><div class='add'>+</div><div class='add'>+	pgprintk("misaligned: gpa %llx bytes %d role %x\n",</div><div class='add'>+		 gpa, bytes, sp-&gt;role.word);</div><div class='add'>+</div><div class='add'>+	offset = offset_in_page(gpa);</div><div class='add'>+	pte_size = sp-&gt;role.cr4_pae ? 8 : 4;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Sometimes, the OS only writes the last one bytes to update status</div><div class='add'>+	 * bits, for example, in linux, andb instruction is used in clear_bit().</div><div class='add'>+	 */</div><div class='add'>+	if (!(offset &amp; (pte_size - 1)) &amp;&amp; bytes == 1)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	misaligned = (offset ^ (offset + bytes - 1)) &amp; ~(pte_size - 1);</div><div class='add'>+	misaligned |= bytes &lt; 4;</div><div class='add'>+</div><div class='add'>+	return misaligned;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 *get_written_sptes(struct kvm_mmu_page *sp, gpa_t gpa, int *nspte)</div><div class='add'>+{</div><div class='add'>+	unsigned page_offset, quadrant;</div><div class='add'>+	u64 *spte;</div><div class='add'>+	int level;</div><div class='add'>+</div><div class='add'>+	page_offset = offset_in_page(gpa);</div><div class='add'>+	level = sp-&gt;role.level;</div><div class='add'>+	*nspte = 1;</div><div class='add'>+	if (!sp-&gt;role.cr4_pae) {</div><div class='add'>+		page_offset &lt;&lt;= 1;	/* 32-&gt;64 */</div><div class='add'>+		/*</div><div class='add'>+		 * A 32-bit pde maps 4MB while the shadow pdes map</div><div class='add'>+		 * only 2MB.  So we need to double the offset again</div><div class='add'>+		 * and zap two pdes instead of one.</div><div class='add'>+		 */</div><div class='add'>+		if (level == PT32_ROOT_LEVEL) {</div><div class='add'>+			page_offset &amp;= ~7; /* kill rounding error */</div><div class='add'>+			page_offset &lt;&lt;= 1;</div><div class='add'>+			*nspte = 2;</div><div class='add'>+		}</div><div class='add'>+		quadrant = page_offset &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		page_offset &amp;= ~PAGE_MASK;</div><div class='add'>+		if (quadrant != sp-&gt;role.quadrant)</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spte = &amp;sp-&gt;spt[page_offset / sizeof(*spte)];</div><div class='add'>+	return spte;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,</div><div class='del'>-		       const u8 *new, int bytes,</div><div class='del'>-		       bool guest_initiated)</div><div class='add'>+		       const u8 *new, int bytes)</div><div class='ctx'> {</div><div class='ctx'> 	gfn_t gfn = gpa &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	union kvm_mmu_page_role mask = { .word = 0 };</div><div class='hunk'>@@ -3539,8 +3635,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,</div><div class='ctx'> 	struct hlist_node *node;</div><div class='ctx'> 	LIST_HEAD(invalid_list);</div><div class='ctx'> 	u64 entry, gentry, *spte;</div><div class='del'>-	unsigned pte_size, page_offset, misaligned, quadrant, offset;</div><div class='del'>-	int level, npte, invlpg_counter, r, flooded = 0;</div><div class='add'>+	int npte;</div><div class='ctx'> 	bool remote_flush, local_flush, zap_page;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3551,112 +3646,45 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	zap_page = remote_flush = local_flush = false;</div><div class='del'>-	offset = offset_in_page(gpa);</div><div class='ctx'> </div><div class='ctx'> 	pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);</div><div class='ctx'> </div><div class='del'>-	invlpg_counter = atomic_read(&amp;vcpu-&gt;kvm-&gt;arch.invlpg_counter);</div><div class='add'>+	gentry = mmu_pte_write_fetch_gpte(vcpu, &amp;gpa, new, &amp;bytes);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Assume that the pte write on a page table of the same type</div><div class='del'>-	 * as the current vcpu paging mode since we update the sptes only</div><div class='del'>-	 * when they have the same mode.</div><div class='add'>+	 * No need to care whether allocation memory is successful</div><div class='add'>+	 * or not since pte prefetch is skiped if it does not have</div><div class='add'>+	 * enough objects in the cache.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((is_pae(vcpu) &amp;&amp; bytes == 4) || !new) {</div><div class='del'>-		/* Handle a 32-bit guest writing two halves of a 64-bit gpte */</div><div class='del'>-		if (is_pae(vcpu)) {</div><div class='del'>-			gpa &amp;= ~(gpa_t)7;</div><div class='del'>-			bytes = 8;</div><div class='del'>-		}</div><div class='del'>-		r = kvm_read_guest(vcpu-&gt;kvm, gpa, &amp;gentry, min(bytes, 8));</div><div class='del'>-		if (r)</div><div class='del'>-			gentry = 0;</div><div class='del'>-		new = (const u8 *)&amp;gentry;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (bytes) {</div><div class='del'>-	case 4:</div><div class='del'>-		gentry = *(const u32 *)new;</div><div class='del'>-		break;</div><div class='del'>-	case 8:</div><div class='del'>-		gentry = *(const u64 *)new;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		gentry = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	mmu_topup_memory_caches(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='del'>-	if (atomic_read(&amp;vcpu-&gt;kvm-&gt;arch.invlpg_counter) != invlpg_counter)</div><div class='del'>-		gentry = 0;</div><div class='del'>-	kvm_mmu_free_some_pages(vcpu);</div><div class='ctx'> 	++vcpu-&gt;kvm-&gt;stat.mmu_pte_write;</div><div class='del'>-	trace_kvm_mmu_audit(vcpu, AUDIT_PRE_PTE_WRITE);</div><div class='del'>-	if (guest_initiated) {</div><div class='del'>-		kvm_mmu_access_page(vcpu, gfn);</div><div class='del'>-		if (gfn == vcpu-&gt;arch.last_pt_write_gfn</div><div class='del'>-		    &amp;&amp; !last_updated_pte_accessed(vcpu)) {</div><div class='del'>-			++vcpu-&gt;arch.last_pt_write_count;</div><div class='del'>-			if (vcpu-&gt;arch.last_pt_write_count &gt;= 3)</div><div class='del'>-				flooded = 1;</div><div class='del'>-		} else {</div><div class='del'>-			vcpu-&gt;arch.last_pt_write_gfn = gfn;</div><div class='del'>-			vcpu-&gt;arch.last_pt_write_count = 1;</div><div class='del'>-			vcpu-&gt;arch.last_pte_updated = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	kvm_mmu_audit(vcpu, AUDIT_PRE_PTE_WRITE);</div><div class='ctx'> </div><div class='ctx'> 	mask.cr0_wp = mask.cr4_pae = mask.nxe = 1;</div><div class='ctx'> 	for_each_gfn_indirect_valid_sp(vcpu-&gt;kvm, sp, gfn, node) {</div><div class='del'>-		pte_size = sp-&gt;role.cr4_pae ? 8 : 4;</div><div class='del'>-		misaligned = (offset ^ (offset + bytes - 1)) &amp; ~(pte_size - 1);</div><div class='del'>-		misaligned |= bytes &lt; 4;</div><div class='del'>-		if (misaligned || flooded) {</div><div class='del'>-			/*</div><div class='del'>-			 * Misaligned accesses are too much trouble to fix</div><div class='del'>-			 * up; also, they usually indicate a page is not used</div><div class='del'>-			 * as a page table.</div><div class='del'>-			 *</div><div class='del'>-			 * If we're seeing too many writes to a page,</div><div class='del'>-			 * it may no longer be a page table, or we may be</div><div class='del'>-			 * forking, in which case it is better to unmap the</div><div class='del'>-			 * page.</div><div class='del'>-			 */</div><div class='del'>-			pgprintk("misaligned: gpa %llx bytes %d role %x\n",</div><div class='del'>-				 gpa, bytes, sp-&gt;role.word);</div><div class='add'>+		spte = get_written_sptes(sp, gpa, &amp;npte);</div><div class='add'>+</div><div class='add'>+		if (detect_write_misaligned(sp, gpa, bytes) ||</div><div class='add'>+		      detect_write_flooding(sp, spte)) {</div><div class='ctx'> 			zap_page |= !!kvm_mmu_prepare_zap_page(vcpu-&gt;kvm, sp,</div><div class='ctx'> 						     &amp;invalid_list);</div><div class='ctx'> 			++vcpu-&gt;kvm-&gt;stat.mmu_flooded;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		page_offset = offset;</div><div class='del'>-		level = sp-&gt;role.level;</div><div class='del'>-		npte = 1;</div><div class='del'>-		if (!sp-&gt;role.cr4_pae) {</div><div class='del'>-			page_offset &lt;&lt;= 1;	/* 32-&gt;64 */</div><div class='del'>-			/*</div><div class='del'>-			 * A 32-bit pde maps 4MB while the shadow pdes map</div><div class='del'>-			 * only 2MB.  So we need to double the offset again</div><div class='del'>-			 * and zap two pdes instead of one.</div><div class='del'>-			 */</div><div class='del'>-			if (level == PT32_ROOT_LEVEL) {</div><div class='del'>-				page_offset &amp;= ~7; /* kill rounding error */</div><div class='del'>-				page_offset &lt;&lt;= 1;</div><div class='del'>-				npte = 2;</div><div class='del'>-			}</div><div class='del'>-			quadrant = page_offset &gt;&gt; PAGE_SHIFT;</div><div class='del'>-			page_offset &amp;= ~PAGE_MASK;</div><div class='del'>-			if (quadrant != sp-&gt;role.quadrant)</div><div class='del'>-				continue;</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		spte = get_written_sptes(sp, gpa, &amp;npte);</div><div class='add'>+		if (!spte)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		local_flush = true;</div><div class='del'>-		spte = &amp;sp-&gt;spt[page_offset / sizeof(*spte)];</div><div class='ctx'> 		while (npte--) {</div><div class='ctx'> 			entry = *spte;</div><div class='ctx'> 			mmu_page_zap_pte(vcpu-&gt;kvm, sp, spte);</div><div class='ctx'> 			if (gentry &amp;&amp;</div><div class='ctx'> 			      !((sp-&gt;role.word ^ vcpu-&gt;arch.mmu.base_role.word)</div><div class='del'>-			      &amp; mask.word))</div><div class='add'>+			      &amp; mask.word) &amp;&amp; rmap_can_add(vcpu))</div><div class='ctx'> 				mmu_pte_write_new_pte(vcpu, sp, spte, &amp;gentry);</div><div class='ctx'> 			if (!remote_flush &amp;&amp; need_remote_flush(entry, *spte))</div><div class='ctx'> 				remote_flush = true;</div><div class='hunk'>@@ -3665,7 +3693,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,</div><div class='ctx'> 	}</div><div class='ctx'> 	mmu_pte_write_flush_tlb(vcpu, zap_page, remote_flush, local_flush);</div><div class='ctx'> 	kvm_mmu_commit_zap_page(vcpu-&gt;kvm, &amp;invalid_list);</div><div class='del'>-	trace_kvm_mmu_audit(vcpu, AUDIT_POST_PTE_WRITE);</div><div class='add'>+	kvm_mmu_audit(vcpu, AUDIT_POST_PTE_WRITE);</div><div class='ctx'> 	spin_unlock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3679,9 +3707,8 @@ int kvm_mmu_unprotect_page_virt(struct kvm_vcpu *vcpu, gva_t gva)</div><div class='ctx'> </div><div class='ctx'> 	gpa = kvm_mmu_gva_to_gpa_read(vcpu, gva, NULL);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='ctx'> 	r = kvm_mmu_unprotect_page(vcpu-&gt;kvm, gpa &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	spin_unlock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='add'>+</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_mmu_unprotect_page_virt);</div><div class='hunk'>@@ -3702,10 +3729,18 @@ void __kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	kvm_mmu_commit_zap_page(vcpu-&gt;kvm, &amp;invalid_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool is_mmio_page_fault(struct kvm_vcpu *vcpu, gva_t addr)</div><div class='add'>+{</div><div class='add'>+	if (vcpu-&gt;arch.mmu.direct_map || mmu_is_nested(vcpu))</div><div class='add'>+		return vcpu_match_mmio_gpa(vcpu, addr);</div><div class='add'>+</div><div class='add'>+	return vcpu_match_mmio_gva(vcpu, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t cr2, u32 error_code,</div><div class='ctx'> 		       void *insn, int insn_len)</div><div class='ctx'> {</div><div class='del'>-	int r;</div><div class='add'>+	int r, emulation_type = EMULTYPE_RETRY;</div><div class='ctx'> 	enum emulation_result er;</div><div class='ctx'> </div><div class='ctx'> 	r = vcpu-&gt;arch.mmu.page_fault(vcpu, cr2, error_code, false);</div><div class='hunk'>@@ -3717,11 +3752,10 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t cr2, u32 error_code,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	r = mmu_topup_memory_caches(vcpu);</div><div class='del'>-	if (r)</div><div class='del'>-		goto out;</div><div class='add'>+	if (is_mmio_page_fault(vcpu, cr2))</div><div class='add'>+		emulation_type = 0;</div><div class='ctx'> </div><div class='del'>-	er = x86_emulate_instruction(vcpu, cr2, 0, insn, insn_len);</div><div class='add'>+	er = x86_emulate_instruction(vcpu, cr2, emulation_type, insn, insn_len);</div><div class='ctx'> </div><div class='ctx'> 	switch (er) {</div><div class='ctx'> 	case EMULATE_DONE:</div><div class='hunk'>@@ -3792,7 +3826,11 @@ static int alloc_mmu_pages(struct kvm_vcpu *vcpu)</div><div class='ctx'> int kvm_mmu_create(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	ASSERT(vcpu);</div><div class='del'>-	ASSERT(!VALID_PAGE(vcpu-&gt;arch.mmu.root_hpa));</div><div class='add'>+</div><div class='add'>+	vcpu-&gt;arch.walk_mmu = &amp;vcpu-&gt;arch.mmu;</div><div class='add'>+	vcpu-&gt;arch.mmu.root_hpa = INVALID_PAGE;</div><div class='add'>+	vcpu-&gt;arch.mmu.translate_gpa = translate_gpa;</div><div class='add'>+	vcpu-&gt;arch.nested_mmu.translate_gpa = translate_nested_gpa;</div><div class='ctx'> </div><div class='ctx'> 	return alloc_mmu_pages(vcpu);</div><div class='ctx'> }</div><div class='hunk'>@@ -3852,14 +3890,14 @@ restart:</div><div class='ctx'> 	spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kvm_mmu_remove_some_alloc_mmu_pages(struct kvm *kvm,</div><div class='del'>-					       struct list_head *invalid_list)</div><div class='add'>+static void kvm_mmu_remove_some_alloc_mmu_pages(struct kvm *kvm,</div><div class='add'>+						struct list_head *invalid_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_mmu_page *page;</div><div class='ctx'> </div><div class='ctx'> 	page = container_of(kvm-&gt;arch.active_mmu_pages.prev,</div><div class='ctx'> 			    struct kvm_mmu_page, link);</div><div class='del'>-	return kvm_mmu_prepare_zap_page(kvm, page, invalid_list);</div><div class='add'>+	kvm_mmu_prepare_zap_page(kvm, page, invalid_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mmu_shrink(struct shrinker *shrink, struct shrink_control *sc)</div><div class='hunk'>@@ -3874,15 +3912,15 @@ static int mmu_shrink(struct shrinker *shrink, struct shrink_control *sc)</div><div class='ctx'> 	raw_spin_lock(&amp;kvm_lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(kvm, &amp;vm_list, vm_list) {</div><div class='del'>-		int idx, freed_pages;</div><div class='add'>+		int idx;</div><div class='ctx'> 		LIST_HEAD(invalid_list);</div><div class='ctx'> </div><div class='ctx'> 		idx = srcu_read_lock(&amp;kvm-&gt;srcu);</div><div class='ctx'> 		spin_lock(&amp;kvm-&gt;mmu_lock);</div><div class='ctx'> 		if (!kvm_freed &amp;&amp; nr_to_scan &gt; 0 &amp;&amp;</div><div class='ctx'> 		    kvm-&gt;arch.n_used_mmu_pages &gt; 0) {</div><div class='del'>-			freed_pages = kvm_mmu_remove_some_alloc_mmu_pages(kvm,</div><div class='del'>-							  &amp;invalid_list);</div><div class='add'>+			kvm_mmu_remove_some_alloc_mmu_pages(kvm,</div><div class='add'>+							    &amp;invalid_list);</div><div class='ctx'> 			kvm_freed = kvm;</div><div class='ctx'> 		}</div><div class='ctx'> 		nr_to_scan--;</div><div class='hunk'>@@ -3944,15 +3982,15 @@ nomem:</div><div class='ctx'>  */</div><div class='ctx'> unsigned int kvm_mmu_calculate_mmu_pages(struct kvm *kvm)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='ctx'> 	unsigned int nr_mmu_pages;</div><div class='ctx'> 	unsigned int  nr_pages = 0;</div><div class='ctx'> 	struct kvm_memslots *slots;</div><div class='add'>+	struct kvm_memory_slot *memslot;</div><div class='ctx'> </div><div class='ctx'> 	slots = kvm_memslots(kvm);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; slots-&gt;nmemslots; i++)</div><div class='del'>-		nr_pages += slots-&gt;memslots[i].npages;</div><div class='add'>+	kvm_for_each_memslot(memslot, slots)</div><div class='add'>+		nr_pages += memslot-&gt;npages;</div><div class='ctx'> </div><div class='ctx'> 	nr_mmu_pages = nr_pages * KVM_PERMILLE_MMU_PAGES / 1000;</div><div class='ctx'> 	nr_mmu_pages = max(nr_mmu_pages,</div><div class='hunk'>@@ -3961,127 +3999,6 @@ unsigned int kvm_mmu_calculate_mmu_pages(struct kvm *kvm)</div><div class='ctx'> 	return nr_mmu_pages;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *pv_mmu_peek_buffer(struct kvm_pv_mmu_op_buffer *buffer,</div><div class='del'>-				unsigned len)</div><div class='del'>-{</div><div class='del'>-	if (len &gt; buffer-&gt;len)</div><div class='del'>-		return NULL;</div><div class='del'>-	return buffer-&gt;ptr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *pv_mmu_read_buffer(struct kvm_pv_mmu_op_buffer *buffer,</div><div class='del'>-				unsigned len)</div><div class='del'>-{</div><div class='del'>-	void *ret;</div><div class='del'>-</div><div class='del'>-	ret = pv_mmu_peek_buffer(buffer, len);</div><div class='del'>-	if (!ret)</div><div class='del'>-		return ret;</div><div class='del'>-	buffer-&gt;ptr += len;</div><div class='del'>-	buffer-&gt;len -= len;</div><div class='del'>-	buffer-&gt;processed += len;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int kvm_pv_mmu_write(struct kvm_vcpu *vcpu,</div><div class='del'>-			     gpa_t addr, gpa_t value)</div><div class='del'>-{</div><div class='del'>-	int bytes = 8;</div><div class='del'>-	int r;</div><div class='del'>-</div><div class='del'>-	if (!is_long_mode(vcpu) &amp;&amp; !is_pae(vcpu))</div><div class='del'>-		bytes = 4;</div><div class='del'>-</div><div class='del'>-	r = mmu_topup_memory_caches(vcpu);</div><div class='del'>-	if (r)</div><div class='del'>-		return r;</div><div class='del'>-</div><div class='del'>-	if (!emulator_write_phys(vcpu, addr, &amp;value, bytes))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int kvm_pv_mmu_flush_tlb(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	(void)kvm_set_cr3(vcpu, kvm_read_cr3(vcpu));</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int kvm_pv_mmu_release_pt(struct kvm_vcpu *vcpu, gpa_t addr)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='del'>-	mmu_unshadow(vcpu-&gt;kvm, addr &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	spin_unlock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int kvm_pv_mmu_op_one(struct kvm_vcpu *vcpu,</div><div class='del'>-			     struct kvm_pv_mmu_op_buffer *buffer)</div><div class='del'>-{</div><div class='del'>-	struct kvm_mmu_op_header *header;</div><div class='del'>-</div><div class='del'>-	header = pv_mmu_peek_buffer(buffer, sizeof *header);</div><div class='del'>-	if (!header)</div><div class='del'>-		return 0;</div><div class='del'>-	switch (header-&gt;op) {</div><div class='del'>-	case KVM_MMU_OP_WRITE_PTE: {</div><div class='del'>-		struct kvm_mmu_op_write_pte *wpte;</div><div class='del'>-</div><div class='del'>-		wpte = pv_mmu_read_buffer(buffer, sizeof *wpte);</div><div class='del'>-		if (!wpte)</div><div class='del'>-			return 0;</div><div class='del'>-		return kvm_pv_mmu_write(vcpu, wpte-&gt;pte_phys,</div><div class='del'>-					wpte-&gt;pte_val);</div><div class='del'>-	}</div><div class='del'>-	case KVM_MMU_OP_FLUSH_TLB: {</div><div class='del'>-		struct kvm_mmu_op_flush_tlb *ftlb;</div><div class='del'>-</div><div class='del'>-		ftlb = pv_mmu_read_buffer(buffer, sizeof *ftlb);</div><div class='del'>-		if (!ftlb)</div><div class='del'>-			return 0;</div><div class='del'>-		return kvm_pv_mmu_flush_tlb(vcpu);</div><div class='del'>-	}</div><div class='del'>-	case KVM_MMU_OP_RELEASE_PT: {</div><div class='del'>-		struct kvm_mmu_op_release_pt *rpt;</div><div class='del'>-</div><div class='del'>-		rpt = pv_mmu_read_buffer(buffer, sizeof *rpt);</div><div class='del'>-		if (!rpt)</div><div class='del'>-			return 0;</div><div class='del'>-		return kvm_pv_mmu_release_pt(vcpu, rpt-&gt;pt_phys);</div><div class='del'>-	}</div><div class='del'>-	default: return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int kvm_pv_mmu_op(struct kvm_vcpu *vcpu, unsigned long bytes,</div><div class='del'>-		  gpa_t addr, unsigned long *ret)</div><div class='del'>-{</div><div class='del'>-	int r;</div><div class='del'>-	struct kvm_pv_mmu_op_buffer *buffer = &amp;vcpu-&gt;arch.mmu_op_buffer;</div><div class='del'>-</div><div class='del'>-	buffer-&gt;ptr = buffer-&gt;buf;</div><div class='del'>-	buffer-&gt;len = min_t(unsigned long, bytes, sizeof buffer-&gt;buf);</div><div class='del'>-	buffer-&gt;processed = 0;</div><div class='del'>-</div><div class='del'>-	r = kvm_read_guest(vcpu-&gt;kvm, addr, buffer-&gt;buf, buffer-&gt;len);</div><div class='del'>-	if (r)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	while (buffer-&gt;len) {</div><div class='del'>-		r = kvm_pv_mmu_op_one(vcpu, buffer);</div><div class='del'>-		if (r &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-		if (r == 0)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r = 1;</div><div class='del'>-out:</div><div class='del'>-	*ret = buffer-&gt;processed;</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int kvm_mmu_get_spte_hierarchy(struct kvm_vcpu *vcpu, u64 addr, u64 sptes[4])</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_shadow_walk_iterator iterator;</div><div class='hunk'>@@ -4110,12 +4027,6 @@ void kvm_mmu_destroy(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	mmu_free_memory_caches(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KVM_MMU_AUDIT</div><div class='del'>-#include "mmu_audit.c"</div><div class='del'>-#else</div><div class='del'>-static void mmu_audit_disable(void) { }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> void kvm_mmu_module_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	mmu_destroy_caches();</div><div class='head'>diff --git a/arch/x86/kvm/mmu_audit.c b/arch/x86/kvm/mmu_audit.c<br/>index 746ec259d024..fe15dcc07a6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/mmu_audit.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/mmu_audit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/mmu_audit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/mmu_audit.c</a></div><div class='hunk'>@@ -19,6 +19,15 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> </div><div class='add'>+char const *audit_point_name[] = {</div><div class='add'>+	"pre page fault",</div><div class='add'>+	"post page fault",</div><div class='add'>+	"pre pte write",</div><div class='add'>+	"post pte write",</div><div class='add'>+	"pre sync",</div><div class='add'>+	"post sync"</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define audit_printk(kvm, fmt, args...)		\</div><div class='ctx'> 	printk(KERN_ERR "audit: (%s) error: "	\</div><div class='ctx'> 		fmt, audit_point_name[kvm-&gt;arch.audit_point], ##args)</div><div class='hunk'>@@ -224,7 +233,10 @@ static void audit_vcpu_spte(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	mmu_spte_walk(vcpu, audit_spte);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void kvm_mmu_audit(void *ignore, struct kvm_vcpu *vcpu, int point)</div><div class='add'>+static bool mmu_audit;</div><div class='add'>+static struct jump_label_key mmu_audit_key;</div><div class='add'>+</div><div class='add'>+static void __kvm_mmu_audit(struct kvm_vcpu *vcpu, int point)</div><div class='ctx'> {</div><div class='ctx'> 	static DEFINE_RATELIMIT_STATE(ratelimit_state, 5 * HZ, 10);</div><div class='ctx'> </div><div class='hunk'>@@ -236,18 +248,18 @@ static void kvm_mmu_audit(void *ignore, struct kvm_vcpu *vcpu, int point)</div><div class='ctx'> 	audit_vcpu_spte(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool mmu_audit;</div><div class='add'>+static inline void kvm_mmu_audit(struct kvm_vcpu *vcpu, int point)</div><div class='add'>+{</div><div class='add'>+	if (static_branch((&amp;mmu_audit_key)))</div><div class='add'>+		__kvm_mmu_audit(vcpu, point);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void mmu_audit_enable(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	if (mmu_audit)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ret = register_trace_kvm_mmu_audit(kvm_mmu_audit, NULL);</div><div class='del'>-	WARN_ON(ret);</div><div class='del'>-</div><div class='add'>+	jump_label_inc(&amp;mmu_audit_key);</div><div class='ctx'> 	mmu_audit = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -256,8 +268,7 @@ static void mmu_audit_disable(void)</div><div class='ctx'> 	if (!mmu_audit)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	unregister_trace_kvm_mmu_audit(kvm_mmu_audit, NULL);</div><div class='del'>-	tracepoint_synchronize_unregister();</div><div class='add'>+	jump_label_dec(&amp;mmu_audit_key);</div><div class='ctx'> 	mmu_audit = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/kvm/mmutrace.h b/arch/x86/kvm/mmutrace.h<br/>index eed67f34146d..89fb0e81322a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/mmutrace.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/mmutrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/mmutrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/mmutrace.h</a></div><div class='hunk'>@@ -243,25 +243,6 @@ TRACE_EVENT(</div><div class='ctx'> 	TP_printk("addr:%llx gfn %llx access %x", __entry-&gt;addr, __entry-&gt;gfn,</div><div class='ctx'> 		  __entry-&gt;access)</div><div class='ctx'> );</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(</div><div class='del'>-	kvm_mmu_audit,</div><div class='del'>-	TP_PROTO(struct kvm_vcpu *vcpu, int audit_point),</div><div class='del'>-	TP_ARGS(vcpu, audit_point),</div><div class='del'>-</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		__field(struct kvm_vcpu *, vcpu)</div><div class='del'>-		__field(int, audit_point)</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		__entry-&gt;vcpu = vcpu;</div><div class='del'>-		__entry-&gt;audit_point = audit_point;</div><div class='del'>-	),</div><div class='del'>-</div><div class='del'>-	TP_printk("vcpu:%d %s", __entry-&gt;vcpu-&gt;cpu,</div><div class='del'>-		  audit_point_name[__entry-&gt;audit_point])</div><div class='del'>-);</div><div class='ctx'> #endif /* _TRACE_KVMMMU_H */</div><div class='ctx'> </div><div class='ctx'> #undef TRACE_INCLUDE_PATH</div><div class='head'>diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h<br/>index 92994100638b..15610285ebb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/paging_tmpl.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/paging_tmpl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/paging_tmpl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/paging_tmpl.h</a></div><div class='hunk'>@@ -497,6 +497,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,</div><div class='ctx'> 	     shadow_walk_next(&amp;it)) {</div><div class='ctx'> 		gfn_t table_gfn;</div><div class='ctx'> </div><div class='add'>+		clear_sp_write_flooding_count(it.sptep);</div><div class='ctx'> 		drop_large_spte(vcpu, it.sptep);</div><div class='ctx'> </div><div class='ctx'> 		sp = NULL;</div><div class='hunk'>@@ -522,6 +523,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,</div><div class='ctx'> 	     shadow_walk_next(&amp;it)) {</div><div class='ctx'> 		gfn_t direct_gfn;</div><div class='ctx'> </div><div class='add'>+		clear_sp_write_flooding_count(it.sptep);</div><div class='ctx'> 		validate_direct_spte(vcpu, it.sptep, direct_access);</div><div class='ctx'> </div><div class='ctx'> 		drop_large_spte(vcpu, it.sptep);</div><div class='hunk'>@@ -536,6 +538,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,</div><div class='ctx'> 		link_shadow_page(it.sptep, sp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	clear_sp_write_flooding_count(it.sptep);</div><div class='ctx'> 	mmu_set_spte(vcpu, it.sptep, access, gw-&gt;pte_access,</div><div class='ctx'> 		     user_fault, write_fault, emulate, it.level,</div><div class='ctx'> 		     gw-&gt;gfn, pfn, prefault, map_writable);</div><div class='hunk'>@@ -599,11 +602,9 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!r) {</div><div class='ctx'> 		pgprintk("%s: guest page fault\n", __func__);</div><div class='del'>-		if (!prefault) {</div><div class='add'>+		if (!prefault)</div><div class='ctx'> 			inject_page_fault(vcpu, &amp;walker.fault);</div><div class='del'>-			/* reset fork detector */</div><div class='del'>-			vcpu-&gt;arch.last_pt_write_count = 0;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -631,7 +632,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code,</div><div class='ctx'> 	if (mmu_notifier_retry(vcpu, mmu_seq))</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	trace_kvm_mmu_audit(vcpu, AUDIT_PRE_PAGE_FAULT);</div><div class='add'>+	kvm_mmu_audit(vcpu, AUDIT_PRE_PAGE_FAULT);</div><div class='ctx'> 	kvm_mmu_free_some_pages(vcpu);</div><div class='ctx'> 	if (!force_pt_level)</div><div class='ctx'> 		transparent_hugepage_adjust(vcpu, &amp;walker.gfn, &amp;pfn, &amp;level);</div><div class='hunk'>@@ -641,11 +642,8 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code,</div><div class='ctx'> 	pgprintk("%s: shadow pte %p %llx emulate %d\n", __func__,</div><div class='ctx'> 		 sptep, *sptep, emulate);</div><div class='ctx'> </div><div class='del'>-	if (!emulate)</div><div class='del'>-		vcpu-&gt;arch.last_pt_write_count = 0; /* reset fork detector */</div><div class='del'>-</div><div class='ctx'> 	++vcpu-&gt;stat.pf_fixed;</div><div class='del'>-	trace_kvm_mmu_audit(vcpu, AUDIT_POST_PAGE_FAULT);</div><div class='add'>+	kvm_mmu_audit(vcpu, AUDIT_POST_PAGE_FAULT);</div><div class='ctx'> 	spin_unlock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='ctx'> </div><div class='ctx'> 	return emulate;</div><div class='hunk'>@@ -656,65 +654,66 @@ out_unlock:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static gpa_t FNAME(get_level1_sp_gpa)(struct kvm_mmu_page *sp)</div><div class='add'>+{</div><div class='add'>+	int offset = 0;</div><div class='add'>+</div><div class='add'>+	WARN_ON(sp-&gt;role.level != 1);</div><div class='add'>+</div><div class='add'>+	if (PTTYPE == 32)</div><div class='add'>+		offset = sp-&gt;role.quadrant &lt;&lt; PT64_LEVEL_BITS;</div><div class='add'>+</div><div class='add'>+	return gfn_to_gpa(sp-&gt;gfn) + offset * sizeof(pt_element_t);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void FNAME(invlpg)(struct kvm_vcpu *vcpu, gva_t gva)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_shadow_walk_iterator iterator;</div><div class='ctx'> 	struct kvm_mmu_page *sp;</div><div class='del'>-	gpa_t pte_gpa = -1;</div><div class='ctx'> 	int level;</div><div class='ctx'> 	u64 *sptep;</div><div class='del'>-	int need_flush = 0;</div><div class='ctx'> </div><div class='ctx'> 	vcpu_clear_mmio_info(vcpu, gva);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='add'>+	/*</div><div class='add'>+	 * No need to check return value here, rmap_can_add() can</div><div class='add'>+	 * help us to skip pte prefetch later.</div><div class='add'>+	 */</div><div class='add'>+	mmu_topup_memory_caches(vcpu);</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='ctx'> 	for_each_shadow_entry(vcpu, gva, iterator) {</div><div class='ctx'> 		level = iterator.level;</div><div class='ctx'> 		sptep = iterator.sptep;</div><div class='ctx'> </div><div class='ctx'> 		sp = page_header(__pa(sptep));</div><div class='ctx'> 		if (is_last_spte(*sptep, level)) {</div><div class='del'>-			int offset, shift;</div><div class='add'>+			pt_element_t gpte;</div><div class='add'>+			gpa_t pte_gpa;</div><div class='ctx'> </div><div class='ctx'> 			if (!sp-&gt;unsync)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			shift = PAGE_SHIFT -</div><div class='del'>-				  (PT_LEVEL_BITS - PT64_LEVEL_BITS) * level;</div><div class='del'>-			offset = sp-&gt;role.quadrant &lt;&lt; shift;</div><div class='del'>-</div><div class='del'>-			pte_gpa = (sp-&gt;gfn &lt;&lt; PAGE_SHIFT) + offset;</div><div class='add'>+			pte_gpa = FNAME(get_level1_sp_gpa)(sp);</div><div class='ctx'> 			pte_gpa += (sptep - sp-&gt;spt) * sizeof(pt_element_t);</div><div class='ctx'> </div><div class='del'>-			if (is_shadow_present_pte(*sptep)) {</div><div class='del'>-				if (is_large_pte(*sptep))</div><div class='del'>-					--vcpu-&gt;kvm-&gt;stat.lpages;</div><div class='del'>-				drop_spte(vcpu-&gt;kvm, sptep);</div><div class='del'>-				need_flush = 1;</div><div class='del'>-			} else if (is_mmio_spte(*sptep))</div><div class='del'>-				mmu_spte_clear_no_track(sptep);</div><div class='add'>+			if (mmu_page_zap_pte(vcpu-&gt;kvm, sp, sptep))</div><div class='add'>+				kvm_flush_remote_tlbs(vcpu-&gt;kvm);</div><div class='ctx'> </div><div class='del'>-			break;</div><div class='add'>+			if (!rmap_can_add(vcpu))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			if (kvm_read_guest_atomic(vcpu-&gt;kvm, pte_gpa, &amp;gpte,</div><div class='add'>+						  sizeof(pt_element_t)))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			FNAME(update_pte)(vcpu, sp, sptep, &amp;gpte);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!is_shadow_present_pte(*sptep) || !sp-&gt;unsync_children)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (need_flush)</div><div class='del'>-		kvm_flush_remote_tlbs(vcpu-&gt;kvm);</div><div class='del'>-</div><div class='del'>-	atomic_inc(&amp;vcpu-&gt;kvm-&gt;arch.invlpg_counter);</div><div class='del'>-</div><div class='ctx'> 	spin_unlock(&amp;vcpu-&gt;kvm-&gt;mmu_lock);</div><div class='del'>-</div><div class='del'>-	if (pte_gpa == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (mmu_topup_memory_caches(vcpu))</div><div class='del'>-		return;</div><div class='del'>-	kvm_mmu_pte_write(vcpu, pte_gpa, NULL, sizeof(pt_element_t), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static gpa_t FNAME(gva_to_gpa)(struct kvm_vcpu *vcpu, gva_t vaddr, u32 access,</div><div class='hunk'>@@ -769,19 +768,14 @@ static gpa_t FNAME(gva_to_gpa_nested)(struct kvm_vcpu *vcpu, gva_t vaddr,</div><div class='ctx'>  */</div><div class='ctx'> static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)</div><div class='ctx'> {</div><div class='del'>-	int i, offset, nr_present;</div><div class='add'>+	int i, nr_present = 0;</div><div class='ctx'> 	bool host_writable;</div><div class='ctx'> 	gpa_t first_pte_gpa;</div><div class='ctx'> </div><div class='del'>-	offset = nr_present = 0;</div><div class='del'>-</div><div class='ctx'> 	/* direct kvm_mmu_page can not be unsync. */</div><div class='ctx'> 	BUG_ON(sp-&gt;role.direct);</div><div class='ctx'> </div><div class='del'>-	if (PTTYPE == 32)</div><div class='del'>-		offset = sp-&gt;role.quadrant &lt;&lt; PT64_LEVEL_BITS;</div><div class='del'>-</div><div class='del'>-	first_pte_gpa = gfn_to_gpa(sp-&gt;gfn) + offset * sizeof(pt_element_t);</div><div class='add'>+	first_pte_gpa = FNAME(get_level1_sp_gpa)(sp);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; PT64_ENT_PER_PAGE; i++) {</div><div class='ctx'> 		unsigned pte_access;</div><div class='head'>diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c<br/>new file mode 100644<br/>index 000000000000..7aad5446f393<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/pmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/pmu.c</a></div><div class='hunk'>@@ -0,0 +1,533 @@</div><div class='add'>+/*</div><div class='add'>+ * Kernel-based Virtual Machine -- Performane Monitoring Unit support</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2011 Red Hat, Inc. and/or its affiliates.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *   Avi Kivity   &lt;avi@redhat.com&gt;</div><div class='add'>+ *   Gleb Natapov &lt;gleb@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This work is licensed under the terms of the GNU GPL, version 2.  See</div><div class='add'>+ * the COPYING file in the top-level directory.</div><div class='add'>+ *</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/kvm_host.h&gt;</div><div class='add'>+#include &lt;linux/perf_event.h&gt;</div><div class='add'>+#include "x86.h"</div><div class='add'>+#include "cpuid.h"</div><div class='add'>+#include "lapic.h"</div><div class='add'>+</div><div class='add'>+static struct kvm_arch_event_perf_mapping {</div><div class='add'>+	u8 eventsel;</div><div class='add'>+	u8 unit_mask;</div><div class='add'>+	unsigned event_type;</div><div class='add'>+	bool inexact;</div><div class='add'>+} arch_events[] = {</div><div class='add'>+	/* Index must match CPUID 0x0A.EBX bit vector */</div><div class='add'>+	[0] = { 0x3c, 0x00, PERF_COUNT_HW_CPU_CYCLES },</div><div class='add'>+	[1] = { 0xc0, 0x00, PERF_COUNT_HW_INSTRUCTIONS },</div><div class='add'>+	[2] = { 0x3c, 0x01, PERF_COUNT_HW_BUS_CYCLES  },</div><div class='add'>+	[3] = { 0x2e, 0x4f, PERF_COUNT_HW_CACHE_REFERENCES },</div><div class='add'>+	[4] = { 0x2e, 0x41, PERF_COUNT_HW_CACHE_MISSES },</div><div class='add'>+	[5] = { 0xc4, 0x00, PERF_COUNT_HW_BRANCH_INSTRUCTIONS },</div><div class='add'>+	[6] = { 0xc5, 0x00, PERF_COUNT_HW_BRANCH_MISSES },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* mapping between fixed pmc index and arch_events array */</div><div class='add'>+int fixed_pmc_events[] = {1, 0, 2};</div><div class='add'>+</div><div class='add'>+static bool pmc_is_gp(struct kvm_pmc *pmc)</div><div class='add'>+{</div><div class='add'>+	return pmc-&gt;type == KVM_PMC_GP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 pmc_bitmask(struct kvm_pmc *pmc)</div><div class='add'>+{</div><div class='add'>+	struct kvm_pmu *pmu = &amp;pmc-&gt;vcpu-&gt;arch.pmu;</div><div class='add'>+</div><div class='add'>+	return pmu-&gt;counter_bitmask[pmc-&gt;type];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool pmc_enabled(struct kvm_pmc *pmc)</div><div class='add'>+{</div><div class='add'>+	struct kvm_pmu *pmu = &amp;pmc-&gt;vcpu-&gt;arch.pmu;</div><div class='add'>+	return test_bit(pmc-&gt;idx, (unsigned long *)&amp;pmu-&gt;global_ctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct kvm_pmc *get_gp_pmc(struct kvm_pmu *pmu, u32 msr,</div><div class='add'>+					 u32 base)</div><div class='add'>+{</div><div class='add'>+	if (msr &gt;= base &amp;&amp; msr &lt; base + pmu-&gt;nr_arch_gp_counters)</div><div class='add'>+		return &amp;pmu-&gt;gp_counters[msr - base];</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct kvm_pmc *get_fixed_pmc(struct kvm_pmu *pmu, u32 msr)</div><div class='add'>+{</div><div class='add'>+	int base = MSR_CORE_PERF_FIXED_CTR0;</div><div class='add'>+	if (msr &gt;= base &amp;&amp; msr &lt; base + pmu-&gt;nr_arch_fixed_counters)</div><div class='add'>+		return &amp;pmu-&gt;fixed_counters[msr - base];</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct kvm_pmc *get_fixed_pmc_idx(struct kvm_pmu *pmu, int idx)</div><div class='add'>+{</div><div class='add'>+	return get_fixed_pmc(pmu, MSR_CORE_PERF_FIXED_CTR0 + idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kvm_pmc *global_idx_to_pmc(struct kvm_pmu *pmu, int idx)</div><div class='add'>+{</div><div class='add'>+	if (idx &lt; X86_PMC_IDX_FIXED)</div><div class='add'>+		return get_gp_pmc(pmu, MSR_P6_EVNTSEL0 + idx, MSR_P6_EVNTSEL0);</div><div class='add'>+	else</div><div class='add'>+		return get_fixed_pmc_idx(pmu, idx - X86_PMC_IDX_FIXED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvm_deliver_pmi(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	if (vcpu-&gt;arch.apic)</div><div class='add'>+		kvm_apic_local_deliver(vcpu-&gt;arch.apic, APIC_LVTPC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void trigger_pmi(struct irq_work *irq_work)</div><div class='add'>+{</div><div class='add'>+	struct kvm_pmu *pmu = container_of(irq_work, struct kvm_pmu,</div><div class='add'>+			irq_work);</div><div class='add'>+	struct kvm_vcpu *vcpu = container_of(pmu, struct kvm_vcpu,</div><div class='add'>+			arch.pmu);</div><div class='add'>+</div><div class='add'>+	kvm_deliver_pmi(vcpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvm_perf_overflow(struct perf_event *perf_event,</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 kvm_pmc *pmc = perf_event-&gt;overflow_handler_context;</div><div class='add'>+	struct kvm_pmu *pmu = &amp;pmc-&gt;vcpu-&gt;arch.pmu;</div><div class='add'>+	__set_bit(pmc-&gt;idx, (unsigned long *)&amp;pmu-&gt;global_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvm_perf_overflow_intr(struct perf_event *perf_event,</div><div class='add'>+		struct perf_sample_data *data, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct kvm_pmc *pmc = perf_event-&gt;overflow_handler_context;</div><div class='add'>+	struct kvm_pmu *pmu = &amp;pmc-&gt;vcpu-&gt;arch.pmu;</div><div class='add'>+	if (!test_and_set_bit(pmc-&gt;idx, (unsigned long *)&amp;pmu-&gt;reprogram_pmi)) {</div><div class='add'>+		kvm_perf_overflow(perf_event, data, regs);</div><div class='add'>+		kvm_make_request(KVM_REQ_PMU, pmc-&gt;vcpu);</div><div class='add'>+		/*</div><div class='add'>+		 * Inject PMI. If vcpu was in a guest mode during NMI PMI</div><div class='add'>+		 * can be ejected on a guest mode re-entry. Otherwise we can't</div><div class='add'>+		 * be sure that vcpu wasn't executing hlt instruction at the</div><div class='add'>+		 * time of vmexit and is not going to re-enter guest mode until,</div><div class='add'>+		 * woken up. So we should wake it, but this is impossible from</div><div class='add'>+		 * NMI context. Do it from irq work instead.</div><div class='add'>+		 */</div><div class='add'>+		if (!kvm_is_in_guest())</div><div class='add'>+			irq_work_queue(&amp;pmc-&gt;vcpu-&gt;arch.pmu.irq_work);</div><div class='add'>+		else</div><div class='add'>+			kvm_make_request(KVM_REQ_PMI, pmc-&gt;vcpu);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 read_pmc(struct kvm_pmc *pmc)</div><div class='add'>+{</div><div class='add'>+	u64 counter, enabled, running;</div><div class='add'>+</div><div class='add'>+	counter = pmc-&gt;counter;</div><div class='add'>+</div><div class='add'>+	if (pmc-&gt;perf_event)</div><div class='add'>+		counter += perf_event_read_value(pmc-&gt;perf_event,</div><div class='add'>+						 &amp;enabled, &amp;running);</div><div class='add'>+</div><div class='add'>+	/* FIXME: Scaling needed? */</div><div class='add'>+</div><div class='add'>+	return counter &amp; pmc_bitmask(pmc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stop_counter(struct kvm_pmc *pmc)</div><div class='add'>+{</div><div class='add'>+	if (pmc-&gt;perf_event) {</div><div class='add'>+		pmc-&gt;counter = read_pmc(pmc);</div><div class='add'>+		perf_event_release_kernel(pmc-&gt;perf_event);</div><div class='add'>+		pmc-&gt;perf_event = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reprogram_counter(struct kvm_pmc *pmc, u32 type,</div><div class='add'>+		unsigned config, bool exclude_user, bool exclude_kernel,</div><div class='add'>+		bool intr)</div><div class='add'>+{</div><div class='add'>+	struct perf_event *event;</div><div class='add'>+	struct perf_event_attr attr = {</div><div class='add'>+		.type = type,</div><div class='add'>+		.size = sizeof(attr),</div><div class='add'>+		.pinned = true,</div><div class='add'>+		.exclude_idle = true,</div><div class='add'>+		.exclude_host = 1,</div><div class='add'>+		.exclude_user = exclude_user,</div><div class='add'>+		.exclude_kernel = exclude_kernel,</div><div class='add'>+		.config = config,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	attr.sample_period = (-pmc-&gt;counter) &amp; pmc_bitmask(pmc);</div><div class='add'>+</div><div class='add'>+	event = perf_event_create_kernel_counter(&amp;attr, -1, current,</div><div class='add'>+						 intr ? kvm_perf_overflow_intr :</div><div class='add'>+						 kvm_perf_overflow, pmc);</div><div class='add'>+	if (IS_ERR(event)) {</div><div class='add'>+		printk_once("kvm: pmu event creation failed %ld\n",</div><div class='add'>+				PTR_ERR(event));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pmc-&gt;perf_event = event;</div><div class='add'>+	clear_bit(pmc-&gt;idx, (unsigned long*)&amp;pmc-&gt;vcpu-&gt;arch.pmu.reprogram_pmi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned find_arch_event(struct kvm_pmu *pmu, u8 event_select,</div><div class='add'>+		u8 unit_mask)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(arch_events); i++)</div><div class='add'>+		if (arch_events[i].eventsel == event_select</div><div class='add'>+				&amp;&amp; arch_events[i].unit_mask == unit_mask</div><div class='add'>+				&amp;&amp; (pmu-&gt;available_event_types &amp; (1 &lt;&lt; i)))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	if (i == ARRAY_SIZE(arch_events))</div><div class='add'>+		return PERF_COUNT_HW_MAX;</div><div class='add'>+</div><div class='add'>+	return arch_events[i].event_type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reprogram_gp_counter(struct kvm_pmc *pmc, u64 eventsel)</div><div class='add'>+{</div><div class='add'>+	unsigned config, type = PERF_TYPE_RAW;</div><div class='add'>+	u8 event_select, unit_mask;</div><div class='add'>+</div><div class='add'>+	pmc-&gt;eventsel = eventsel;</div><div class='add'>+</div><div class='add'>+	stop_counter(pmc);</div><div class='add'>+</div><div class='add'>+	if (!(eventsel &amp; ARCH_PERFMON_EVENTSEL_ENABLE) || !pmc_enabled(pmc))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	event_select = eventsel &amp; ARCH_PERFMON_EVENTSEL_EVENT;</div><div class='add'>+	unit_mask = (eventsel &amp; ARCH_PERFMON_EVENTSEL_UMASK) &gt;&gt; 8;</div><div class='add'>+</div><div class='add'>+	if (!(event_select &amp; (ARCH_PERFMON_EVENTSEL_EDGE |</div><div class='add'>+				ARCH_PERFMON_EVENTSEL_INV |</div><div class='add'>+				ARCH_PERFMON_EVENTSEL_CMASK))) {</div><div class='add'>+		config = find_arch_event(&amp;pmc-&gt;vcpu-&gt;arch.pmu, event_select,</div><div class='add'>+				unit_mask);</div><div class='add'>+		if (config != PERF_COUNT_HW_MAX)</div><div class='add'>+			type = PERF_TYPE_HARDWARE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (type == PERF_TYPE_RAW)</div><div class='add'>+		config = eventsel &amp; X86_RAW_EVENT_MASK;</div><div class='add'>+</div><div class='add'>+	reprogram_counter(pmc, type, config,</div><div class='add'>+			!(eventsel &amp; ARCH_PERFMON_EVENTSEL_USR),</div><div class='add'>+			!(eventsel &amp; ARCH_PERFMON_EVENTSEL_OS),</div><div class='add'>+			eventsel &amp; ARCH_PERFMON_EVENTSEL_INT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reprogram_fixed_counter(struct kvm_pmc *pmc, u8 en_pmi, int idx)</div><div class='add'>+{</div><div class='add'>+	unsigned en = en_pmi &amp; 0x3;</div><div class='add'>+	bool pmi = en_pmi &amp; 0x8;</div><div class='add'>+</div><div class='add'>+	stop_counter(pmc);</div><div class='add'>+</div><div class='add'>+	if (!en || !pmc_enabled(pmc))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	reprogram_counter(pmc, PERF_TYPE_HARDWARE,</div><div class='add'>+			arch_events[fixed_pmc_events[idx]].event_type,</div><div class='add'>+			!(en &amp; 0x2), /* exclude user */</div><div class='add'>+			!(en &amp; 0x1), /* exclude kernel */</div><div class='add'>+			pmi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 fixed_en_pmi(u64 ctrl, int idx)</div><div class='add'>+{</div><div class='add'>+	return (ctrl &gt;&gt; (idx * 4)) &amp; 0xf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reprogram_fixed_counters(struct kvm_pmu *pmu, u64 data)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pmu-&gt;nr_arch_fixed_counters; i++) {</div><div class='add'>+		u8 en_pmi = fixed_en_pmi(data, i);</div><div class='add'>+		struct kvm_pmc *pmc = get_fixed_pmc_idx(pmu, i);</div><div class='add'>+</div><div class='add'>+		if (fixed_en_pmi(pmu-&gt;fixed_ctr_ctrl, i) == en_pmi)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		reprogram_fixed_counter(pmc, en_pmi, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pmu-&gt;fixed_ctr_ctrl = data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reprogram_idx(struct kvm_pmu *pmu, int idx)</div><div class='add'>+{</div><div class='add'>+	struct kvm_pmc *pmc = global_idx_to_pmc(pmu, idx);</div><div class='add'>+</div><div class='add'>+	if (!pmc)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pmc_is_gp(pmc))</div><div class='add'>+		reprogram_gp_counter(pmc, pmc-&gt;eventsel);</div><div class='add'>+	else {</div><div class='add'>+		int fidx = idx - X86_PMC_IDX_FIXED;</div><div class='add'>+		reprogram_fixed_counter(pmc,</div><div class='add'>+				fixed_en_pmi(pmu-&gt;fixed_ctr_ctrl, fidx), fidx);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void global_ctrl_changed(struct kvm_pmu *pmu, u64 data)</div><div class='add'>+{</div><div class='add'>+	int bit;</div><div class='add'>+	u64 diff = pmu-&gt;global_ctrl ^ data;</div><div class='add'>+</div><div class='add'>+	pmu-&gt;global_ctrl = data;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(bit, (unsigned long *)&amp;diff, X86_PMC_IDX_MAX)</div><div class='add'>+		reprogram_idx(pmu, bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool kvm_pmu_msr(struct kvm_vcpu *vcpu, u32 msr)</div><div class='add'>+{</div><div class='add'>+	struct kvm_pmu *pmu = &amp;vcpu-&gt;arch.pmu;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (msr) {</div><div class='add'>+	case MSR_CORE_PERF_FIXED_CTR_CTRL:</div><div class='add'>+	case MSR_CORE_PERF_GLOBAL_STATUS:</div><div class='add'>+	case MSR_CORE_PERF_GLOBAL_CTRL:</div><div class='add'>+	case MSR_CORE_PERF_GLOBAL_OVF_CTRL:</div><div class='add'>+		ret = pmu-&gt;version &gt; 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = get_gp_pmc(pmu, msr, MSR_IA32_PERFCTR0)</div><div class='add'>+			|| get_gp_pmc(pmu, msr, MSR_P6_EVNTSEL0)</div><div class='add'>+			|| get_fixed_pmc(pmu, msr);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kvm_pmu_get_msr(struct kvm_vcpu *vcpu, u32 index, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct kvm_pmu *pmu = &amp;vcpu-&gt;arch.pmu;</div><div class='add'>+	struct kvm_pmc *pmc;</div><div class='add'>+</div><div class='add'>+	switch (index) {</div><div class='add'>+	case MSR_CORE_PERF_FIXED_CTR_CTRL:</div><div class='add'>+		*data = pmu-&gt;fixed_ctr_ctrl;</div><div class='add'>+		return 0;</div><div class='add'>+	case MSR_CORE_PERF_GLOBAL_STATUS:</div><div class='add'>+		*data = pmu-&gt;global_status;</div><div class='add'>+		return 0;</div><div class='add'>+	case MSR_CORE_PERF_GLOBAL_CTRL:</div><div class='add'>+		*data = pmu-&gt;global_ctrl;</div><div class='add'>+		return 0;</div><div class='add'>+	case MSR_CORE_PERF_GLOBAL_OVF_CTRL:</div><div class='add'>+		*data = pmu-&gt;global_ovf_ctrl;</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		if ((pmc = get_gp_pmc(pmu, index, MSR_IA32_PERFCTR0)) ||</div><div class='add'>+				(pmc = get_fixed_pmc(pmu, index))) {</div><div class='add'>+			*data = read_pmc(pmc);</div><div class='add'>+			return 0;</div><div class='add'>+		} else if ((pmc = get_gp_pmc(pmu, index, MSR_P6_EVNTSEL0))) {</div><div class='add'>+			*data = pmc-&gt;eventsel;</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='add'>+</div><div class='add'>+int kvm_pmu_set_msr(struct kvm_vcpu *vcpu, u32 index, u64 data)</div><div class='add'>+{</div><div class='add'>+	struct kvm_pmu *pmu = &amp;vcpu-&gt;arch.pmu;</div><div class='add'>+	struct kvm_pmc *pmc;</div><div class='add'>+</div><div class='add'>+	switch (index) {</div><div class='add'>+	case MSR_CORE_PERF_FIXED_CTR_CTRL:</div><div class='add'>+		if (pmu-&gt;fixed_ctr_ctrl == data)</div><div class='add'>+			return 0;</div><div class='add'>+		if (!(data &amp; 0xfffffffffffff444)) {</div><div class='add'>+			reprogram_fixed_counters(pmu, data);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case MSR_CORE_PERF_GLOBAL_STATUS:</div><div class='add'>+		break; /* RO MSR */</div><div class='add'>+	case MSR_CORE_PERF_GLOBAL_CTRL:</div><div class='add'>+		if (pmu-&gt;global_ctrl == data)</div><div class='add'>+			return 0;</div><div class='add'>+		if (!(data &amp; pmu-&gt;global_ctrl_mask)) {</div><div class='add'>+			global_ctrl_changed(pmu, data);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case MSR_CORE_PERF_GLOBAL_OVF_CTRL:</div><div class='add'>+		if (!(data &amp; (pmu-&gt;global_ctrl_mask &amp; ~(3ull&lt;&lt;62)))) {</div><div class='add'>+			pmu-&gt;global_status &amp;= ~data;</div><div class='add'>+			pmu-&gt;global_ovf_ctrl = data;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		if ((pmc = get_gp_pmc(pmu, index, MSR_IA32_PERFCTR0)) ||</div><div class='add'>+				(pmc = get_fixed_pmc(pmu, index))) {</div><div class='add'>+			data = (s64)(s32)data;</div><div class='add'>+			pmc-&gt;counter += data - read_pmc(pmc);</div><div class='add'>+			return 0;</div><div class='add'>+		} else if ((pmc = get_gp_pmc(pmu, index, MSR_P6_EVNTSEL0))) {</div><div class='add'>+			if (data == pmc-&gt;eventsel)</div><div class='add'>+				return 0;</div><div class='add'>+			if (!(data &amp; 0xffffffff00200000ull)) {</div><div class='add'>+				reprogram_gp_counter(pmc, data);</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kvm_pmu_read_pmc(struct kvm_vcpu *vcpu, unsigned pmc, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct kvm_pmu *pmu = &amp;vcpu-&gt;arch.pmu;</div><div class='add'>+	bool fast_mode = pmc &amp; (1u &lt;&lt; 31);</div><div class='add'>+	bool fixed = pmc &amp; (1u &lt;&lt; 30);</div><div class='add'>+	struct kvm_pmc *counters;</div><div class='add'>+	u64 ctr;</div><div class='add'>+</div><div class='add'>+	pmc &amp;= (3u &lt;&lt; 30) - 1;</div><div class='add'>+	if (!fixed &amp;&amp; pmc &gt;= pmu-&gt;nr_arch_gp_counters)</div><div class='add'>+		return 1;</div><div class='add'>+	if (fixed &amp;&amp; pmc &gt;= pmu-&gt;nr_arch_fixed_counters)</div><div class='add'>+		return 1;</div><div class='add'>+	counters = fixed ? pmu-&gt;fixed_counters : pmu-&gt;gp_counters;</div><div class='add'>+	ctr = read_pmc(&amp;counters[pmc]);</div><div class='add'>+	if (fast_mode)</div><div class='add'>+		ctr = (u32)ctr;</div><div class='add'>+	*data = ctr;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvm_pmu_cpuid_update(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_pmu *pmu = &amp;vcpu-&gt;arch.pmu;</div><div class='add'>+	struct kvm_cpuid_entry2 *entry;</div><div class='add'>+	unsigned bitmap_len;</div><div class='add'>+</div><div class='add'>+	pmu-&gt;nr_arch_gp_counters = 0;</div><div class='add'>+	pmu-&gt;nr_arch_fixed_counters = 0;</div><div class='add'>+	pmu-&gt;counter_bitmask[KVM_PMC_GP] = 0;</div><div class='add'>+	pmu-&gt;counter_bitmask[KVM_PMC_FIXED] = 0;</div><div class='add'>+	pmu-&gt;version = 0;</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;</div><div class='add'>+</div><div class='add'>+	pmu-&gt;version = entry-&gt;eax &amp; 0xff;</div><div class='add'>+	if (!pmu-&gt;version)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pmu-&gt;nr_arch_gp_counters = min((int)(entry-&gt;eax &gt;&gt; 8) &amp; 0xff,</div><div class='add'>+			X86_PMC_MAX_GENERIC);</div><div class='add'>+	pmu-&gt;counter_bitmask[KVM_PMC_GP] =</div><div class='add'>+		((u64)1 &lt;&lt; ((entry-&gt;eax &gt;&gt; 16) &amp; 0xff)) - 1;</div><div class='add'>+	bitmap_len = (entry-&gt;eax &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+	pmu-&gt;available_event_types = ~entry-&gt;ebx &amp; ((1ull &lt;&lt; bitmap_len) - 1);</div><div class='add'>+</div><div class='add'>+	if (pmu-&gt;version == 1) {</div><div class='add'>+		pmu-&gt;global_ctrl = (1 &lt;&lt; pmu-&gt;nr_arch_gp_counters) - 1;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pmu-&gt;nr_arch_fixed_counters = min((int)(entry-&gt;edx &amp; 0x1f),</div><div class='add'>+			X86_PMC_MAX_FIXED);</div><div class='add'>+	pmu-&gt;counter_bitmask[KVM_PMC_FIXED] =</div><div class='add'>+		((u64)1 &lt;&lt; ((entry-&gt;edx &gt;&gt; 5) &amp; 0xff)) - 1;</div><div class='add'>+	pmu-&gt;global_ctrl_mask = ~(((1 &lt;&lt; pmu-&gt;nr_arch_gp_counters) - 1)</div><div class='add'>+			| (((1ull &lt;&lt; pmu-&gt;nr_arch_fixed_counters) - 1)</div><div class='add'>+				&lt;&lt; X86_PMC_IDX_FIXED));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvm_pmu_init(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct kvm_pmu *pmu = &amp;vcpu-&gt;arch.pmu;</div><div class='add'>+</div><div class='add'>+	memset(pmu, 0, sizeof(*pmu));</div><div class='add'>+	for (i = 0; i &lt; X86_PMC_MAX_GENERIC; i++) {</div><div class='add'>+		pmu-&gt;gp_counters[i].type = KVM_PMC_GP;</div><div class='add'>+		pmu-&gt;gp_counters[i].vcpu = vcpu;</div><div class='add'>+		pmu-&gt;gp_counters[i].idx = i;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; X86_PMC_MAX_FIXED; i++) {</div><div class='add'>+		pmu-&gt;fixed_counters[i].type = KVM_PMC_FIXED;</div><div class='add'>+		pmu-&gt;fixed_counters[i].vcpu = vcpu;</div><div class='add'>+		pmu-&gt;fixed_counters[i].idx = i + X86_PMC_IDX_FIXED;</div><div class='add'>+	}</div><div class='add'>+	init_irq_work(&amp;pmu-&gt;irq_work, trigger_pmi);</div><div class='add'>+	kvm_pmu_cpuid_update(vcpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvm_pmu_reset(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_pmu *pmu = &amp;vcpu-&gt;arch.pmu;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	irq_work_sync(&amp;pmu-&gt;irq_work);</div><div class='add'>+	for (i = 0; i &lt; X86_PMC_MAX_GENERIC; i++) {</div><div class='add'>+		struct kvm_pmc *pmc = &amp;pmu-&gt;gp_counters[i];</div><div class='add'>+		stop_counter(pmc);</div><div class='add'>+		pmc-&gt;counter = pmc-&gt;eventsel = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; X86_PMC_MAX_FIXED; i++)</div><div class='add'>+		stop_counter(&amp;pmu-&gt;fixed_counters[i]);</div><div class='add'>+</div><div class='add'>+	pmu-&gt;fixed_ctr_ctrl = pmu-&gt;global_ctrl = pmu-&gt;global_status =</div><div class='add'>+		pmu-&gt;global_ovf_ctrl = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvm_pmu_destroy(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	kvm_pmu_reset(vcpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvm_handle_pmu_event(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_pmu *pmu = &amp;vcpu-&gt;arch.pmu;</div><div class='add'>+	u64 bitmask;</div><div class='add'>+	int bit;</div><div class='add'>+</div><div class='add'>+	bitmask = pmu-&gt;reprogram_pmi;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(bit, (unsigned long *)&amp;bitmask, X86_PMC_IDX_MAX) {</div><div class='add'>+		struct kvm_pmc *pmc = global_idx_to_pmc(pmu, bit);</div><div class='add'>+</div><div class='add'>+		if (unlikely(!pmc || !pmc-&gt;perf_event)) {</div><div class='add'>+			clear_bit(bit, (unsigned long *)&amp;pmu-&gt;reprogram_pmi);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		reprogram_idx(pmu, bit);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c<br/>index e32243eac2f4..5fa553babe56 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/svm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/svm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/svm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/svm.c</a></div><div class='hunk'>@@ -1014,6 +1014,7 @@ static void init_vmcb(struct vcpu_svm *svm)</div><div class='ctx'> 	set_intercept(svm, INTERCEPT_NMI);</div><div class='ctx'> 	set_intercept(svm, INTERCEPT_SMI);</div><div class='ctx'> 	set_intercept(svm, INTERCEPT_SELECTIVE_CR0);</div><div class='add'>+	set_intercept(svm, INTERCEPT_RDPMC);</div><div class='ctx'> 	set_intercept(svm, INTERCEPT_CPUID);</div><div class='ctx'> 	set_intercept(svm, INTERCEPT_INVD);</div><div class='ctx'> 	set_intercept(svm, INTERCEPT_HLT);</div><div class='hunk'>@@ -2770,6 +2771,19 @@ static int emulate_on_interception(struct vcpu_svm *svm)</div><div class='ctx'> 	return emulate_instruction(&amp;svm-&gt;vcpu, 0) == EMULATE_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rdpmc_interception(struct vcpu_svm *svm)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!static_cpu_has(X86_FEATURE_NRIPS))</div><div class='add'>+		return emulate_on_interception(svm);</div><div class='add'>+</div><div class='add'>+	err = kvm_rdpmc(&amp;svm-&gt;vcpu);</div><div class='add'>+	kvm_complete_insn_gp(&amp;svm-&gt;vcpu, err);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> bool check_selective_cr0_intercepted(struct vcpu_svm *svm, unsigned long val)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long cr0 = svm-&gt;vcpu.arch.cr0;</div><div class='hunk'>@@ -3190,6 +3204,7 @@ static int (*svm_exit_handlers[])(struct vcpu_svm *svm) = {</div><div class='ctx'> 	[SVM_EXIT_SMI]				= nop_on_interception,</div><div class='ctx'> 	[SVM_EXIT_INIT]				= nop_on_interception,</div><div class='ctx'> 	[SVM_EXIT_VINTR]			= interrupt_window_interception,</div><div class='add'>+	[SVM_EXIT_RDPMC]			= rdpmc_interception,</div><div class='ctx'> 	[SVM_EXIT_CPUID]			= cpuid_interception,</div><div class='ctx'> 	[SVM_EXIT_IRET]                         = iret_interception,</div><div class='ctx'> 	[SVM_EXIT_INVD]                         = emulate_on_interception,</div><div class='head'>diff --git a/arch/x86/kvm/timer.c b/arch/x86/kvm/timer.c<br/>index ae432ea1cd83..6b85cc647f34 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/timer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/timer.c</a></div><div class='hunk'>@@ -18,9 +18,10 @@</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include "kvm_timer.h"</div><div class='ctx'> </div><div class='del'>-static int __kvm_timer_fn(struct kvm_vcpu *vcpu, struct kvm_timer *ktimer)</div><div class='add'>+enum hrtimer_restart kvm_timer_fn(struct hrtimer *data)</div><div class='ctx'> {</div><div class='del'>-	int restart_timer = 0;</div><div class='add'>+	struct kvm_timer *ktimer = container_of(data, struct kvm_timer, timer);</div><div class='add'>+	struct kvm_vcpu *vcpu = ktimer-&gt;vcpu;</div><div class='ctx'> 	wait_queue_head_t *q = &amp;vcpu-&gt;wq;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -40,26 +41,7 @@ static int __kvm_timer_fn(struct kvm_vcpu *vcpu, struct kvm_timer *ktimer)</div><div class='ctx'> </div><div class='ctx'> 	if (ktimer-&gt;t_ops-&gt;is_periodic(ktimer)) {</div><div class='ctx'> 		hrtimer_add_expires_ns(&amp;ktimer-&gt;timer, ktimer-&gt;period);</div><div class='del'>-		restart_timer = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return restart_timer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum hrtimer_restart kvm_timer_fn(struct hrtimer *data)</div><div class='del'>-{</div><div class='del'>-	int restart_timer;</div><div class='del'>-	struct kvm_vcpu *vcpu;</div><div class='del'>-	struct kvm_timer *ktimer = container_of(data, struct kvm_timer, timer);</div><div class='del'>-</div><div class='del'>-	vcpu = ktimer-&gt;vcpu;</div><div class='del'>-	if (!vcpu)</div><div class='del'>-		return HRTIMER_NORESTART;</div><div class='del'>-</div><div class='del'>-	restart_timer = __kvm_timer_fn(vcpu, ktimer);</div><div class='del'>-	if (restart_timer)</div><div class='ctx'> 		return HRTIMER_RESTART;</div><div class='del'>-	else</div><div class='add'>+	} else</div><div class='ctx'> 		return HRTIMER_NORESTART;</div><div class='ctx'> }</div><div class='del'>-</div><div class='head'>diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c<br/>index 579a0b51696a..d29216c462b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/vmx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/vmx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/vmx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/vmx.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "irq.h"</div><div class='ctx'> #include "mmu.h"</div><div class='add'>+#include "cpuid.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kvm_host.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -50,29 +51,29 @@</div><div class='ctx'> MODULE_AUTHOR("Qumranet");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static int __read_mostly enable_vpid = 1;</div><div class='add'>+static bool __read_mostly enable_vpid = 1;</div><div class='ctx'> module_param_named(vpid, enable_vpid, bool, 0444);</div><div class='ctx'> </div><div class='del'>-static int __read_mostly flexpriority_enabled = 1;</div><div class='add'>+static bool __read_mostly flexpriority_enabled = 1;</div><div class='ctx'> module_param_named(flexpriority, flexpriority_enabled, bool, S_IRUGO);</div><div class='ctx'> </div><div class='del'>-static int __read_mostly enable_ept = 1;</div><div class='add'>+static bool __read_mostly enable_ept = 1;</div><div class='ctx'> module_param_named(ept, enable_ept, bool, S_IRUGO);</div><div class='ctx'> </div><div class='del'>-static int __read_mostly enable_unrestricted_guest = 1;</div><div class='add'>+static bool __read_mostly enable_unrestricted_guest = 1;</div><div class='ctx'> module_param_named(unrestricted_guest,</div><div class='ctx'> 			enable_unrestricted_guest, bool, S_IRUGO);</div><div class='ctx'> </div><div class='del'>-static int __read_mostly emulate_invalid_guest_state = 0;</div><div class='add'>+static bool __read_mostly emulate_invalid_guest_state = 0;</div><div class='ctx'> module_param(emulate_invalid_guest_state, bool, S_IRUGO);</div><div class='ctx'> </div><div class='del'>-static int __read_mostly vmm_exclusive = 1;</div><div class='add'>+static bool __read_mostly vmm_exclusive = 1;</div><div class='ctx'> module_param(vmm_exclusive, bool, S_IRUGO);</div><div class='ctx'> </div><div class='del'>-static int __read_mostly yield_on_hlt = 1;</div><div class='add'>+static bool __read_mostly yield_on_hlt = 1;</div><div class='ctx'> module_param(yield_on_hlt, bool, S_IRUGO);</div><div class='ctx'> </div><div class='del'>-static int __read_mostly fasteoi = 1;</div><div class='add'>+static bool __read_mostly fasteoi = 1;</div><div class='ctx'> module_param(fasteoi, bool, S_IRUGO);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -80,7 +81,7 @@ module_param(fasteoi, bool, S_IRUGO);</div><div class='ctx'>  * VMX and be a hypervisor for its own guests. If nested=0, guests may not</div><div class='ctx'>  * use VMX instructions.</div><div class='ctx'>  */</div><div class='del'>-static int __read_mostly nested = 0;</div><div class='add'>+static bool __read_mostly nested = 0;</div><div class='ctx'> module_param(nested, bool, S_IRUGO);</div><div class='ctx'> </div><div class='ctx'> #define KVM_GUEST_CR0_MASK_UNRESTRICTED_GUEST				\</div><div class='hunk'>@@ -1747,7 +1748,6 @@ static void setup_msrs(struct vcpu_vmx *vmx)</div><div class='ctx'> 	int save_nmsrs, index;</div><div class='ctx'> 	unsigned long *msr_bitmap;</div><div class='ctx'> </div><div class='del'>-	vmx_load_host_state(vmx);</div><div class='ctx'> 	save_nmsrs = 0;</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='ctx'> 	if (is_long_mode(&amp;vmx-&gt;vcpu)) {</div><div class='hunk'>@@ -1956,6 +1956,7 @@ static __init void nested_vmx_setup_ctls_msrs(void)</div><div class='ctx'> #endif</div><div class='ctx'> 		CPU_BASED_MOV_DR_EXITING | CPU_BASED_UNCOND_IO_EXITING |</div><div class='ctx'> 		CPU_BASED_USE_IO_BITMAPS | CPU_BASED_MONITOR_EXITING |</div><div class='add'>+		CPU_BASED_RDPMC_EXITING |</div><div class='ctx'> 		CPU_BASED_ACTIVATE_SECONDARY_CONTROLS;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We can allow some features even when not supported by the</div><div class='hunk'>@@ -2142,12 +2143,10 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata)</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		/* Otherwise falls through */</div><div class='ctx'> 	default:</div><div class='del'>-		vmx_load_host_state(to_vmx(vcpu));</div><div class='ctx'> 		if (vmx_get_vmx_msr(vcpu, msr_index, pdata))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		msr = find_msr_entry(to_vmx(vcpu), msr_index);</div><div class='ctx'> 		if (msr) {</div><div class='del'>-			vmx_load_host_state(to_vmx(vcpu));</div><div class='ctx'> 			data = msr-&gt;data;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2171,7 +2170,6 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data)</div><div class='ctx'> </div><div class='ctx'> 	switch (msr_index) {</div><div class='ctx'> 	case MSR_EFER:</div><div class='del'>-		vmx_load_host_state(vmx);</div><div class='ctx'> 		ret = kvm_set_msr_common(vcpu, msr_index, data);</div><div class='ctx'> 		break;</div><div class='ctx'> #ifdef CONFIG_X86_64</div><div class='hunk'>@@ -2220,7 +2218,6 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data)</div><div class='ctx'> 			break;</div><div class='ctx'> 		msr = find_msr_entry(vmx, msr_index);</div><div class='ctx'> 		if (msr) {</div><div class='del'>-			vmx_load_host_state(vmx);</div><div class='ctx'> 			msr-&gt;data = data;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2414,7 +2411,8 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf)</div><div class='ctx'> 	      CPU_BASED_USE_TSC_OFFSETING |</div><div class='ctx'> 	      CPU_BASED_MWAIT_EXITING |</div><div class='ctx'> 	      CPU_BASED_MONITOR_EXITING |</div><div class='del'>-	      CPU_BASED_INVLPG_EXITING;</div><div class='add'>+	      CPU_BASED_INVLPG_EXITING |</div><div class='add'>+	      CPU_BASED_RDPMC_EXITING;</div><div class='ctx'> </div><div class='ctx'> 	if (yield_on_hlt)</div><div class='ctx'> 		min |= CPU_BASED_HLT_EXITING;</div><div class='hunk'>@@ -2716,11 +2714,13 @@ static gva_t rmode_tss_base(struct kvm *kvm)</div><div class='ctx'> {</div><div class='ctx'> 	if (!kvm-&gt;arch.tss_addr) {</div><div class='ctx'> 		struct kvm_memslots *slots;</div><div class='add'>+		struct kvm_memory_slot *slot;</div><div class='ctx'> 		gfn_t base_gfn;</div><div class='ctx'> </div><div class='ctx'> 		slots = kvm_memslots(kvm);</div><div class='del'>-		base_gfn = slots-&gt;memslots[0].base_gfn +</div><div class='del'>-				 kvm-&gt;memslots-&gt;memslots[0].npages - 3;</div><div class='add'>+		slot = id_to_memslot(slots, 0);</div><div class='add'>+		base_gfn = slot-&gt;base_gfn + slot-&gt;npages - 3;</div><div class='add'>+</div><div class='ctx'> 		return base_gfn &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	}</div><div class='ctx'> 	return kvm-&gt;arch.tss_addr;</div><div class='hunk'>@@ -3945,12 +3945,15 @@ static bool nested_exit_on_intr(struct kvm_vcpu *vcpu)</div><div class='ctx'> static void enable_irq_window(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	u32 cpu_based_vm_exec_control;</div><div class='del'>-	if (is_guest_mode(vcpu) &amp;&amp; nested_exit_on_intr(vcpu))</div><div class='del'>-		/* We can get here when nested_run_pending caused</div><div class='del'>-		 * vmx_interrupt_allowed() to return false. In this case, do</div><div class='del'>-		 * nothing - the interrupt will be injected later.</div><div class='add'>+	if (is_guest_mode(vcpu) &amp;&amp; nested_exit_on_intr(vcpu)) {</div><div class='add'>+		/*</div><div class='add'>+		 * We get here if vmx_interrupt_allowed() said we can't</div><div class='add'>+		 * inject to L1 now because L2 must run. Ask L2 to exit</div><div class='add'>+		 * right after entry, so we can inject to L1 more promptly.</div><div class='ctx'> 		 */</div><div class='add'>+		kvm_make_request(KVM_REQ_IMMEDIATE_EXIT, vcpu);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	cpu_based_vm_exec_control = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL);</div><div class='ctx'> 	cpu_based_vm_exec_control |= CPU_BASED_VIRTUAL_INTR_PENDING;</div><div class='hunk'>@@ -4077,11 +4080,12 @@ static void vmx_set_nmi_mask(struct kvm_vcpu *vcpu, bool masked)</div><div class='ctx'> static int vmx_interrupt_allowed(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	if (is_guest_mode(vcpu) &amp;&amp; nested_exit_on_intr(vcpu)) {</div><div class='del'>-		struct vmcs12 *vmcs12;</div><div class='del'>-		if (to_vmx(vcpu)-&gt;nested.nested_run_pending)</div><div class='add'>+		struct vmcs12 *vmcs12 = get_vmcs12(vcpu);</div><div class='add'>+		if (to_vmx(vcpu)-&gt;nested.nested_run_pending ||</div><div class='add'>+		    (vmcs12-&gt;idt_vectoring_info_field &amp;</div><div class='add'>+		     VECTORING_INFO_VALID_MASK))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		nested_vmx_vmexit(vcpu);</div><div class='del'>-		vmcs12 = get_vmcs12(vcpu);</div><div class='ctx'> 		vmcs12-&gt;vm_exit_reason = EXIT_REASON_EXTERNAL_INTERRUPT;</div><div class='ctx'> 		vmcs12-&gt;vm_exit_intr_info = 0;</div><div class='ctx'> 		/* fall through to normal code, but now in L1, not L2 */</div><div class='hunk'>@@ -4611,6 +4615,16 @@ static int handle_invlpg(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int handle_rdpmc(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kvm_rdpmc(vcpu);</div><div class='add'>+	kvm_complete_insn_gp(vcpu, err);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int handle_wbinvd(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	skip_emulated_instruction(vcpu);</div><div class='hunk'>@@ -5561,6 +5575,7 @@ static int (*kvm_vmx_exit_handlers[])(struct kvm_vcpu *vcpu) = {</div><div class='ctx'> 	[EXIT_REASON_HLT]                     = handle_halt,</div><div class='ctx'> 	[EXIT_REASON_INVD]		      = handle_invd,</div><div class='ctx'> 	[EXIT_REASON_INVLPG]		      = handle_invlpg,</div><div class='add'>+	[EXIT_REASON_RDPMC]                   = handle_rdpmc,</div><div class='ctx'> 	[EXIT_REASON_VMCALL]                  = handle_vmcall,</div><div class='ctx'> 	[EXIT_REASON_VMCLEAR]	              = handle_vmclear,</div><div class='ctx'> 	[EXIT_REASON_VMLAUNCH]                = handle_vmlaunch,</div><div class='head'>diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c<br/>index 4c938da2ba00..14d6cadc4ba6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/x86.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/x86.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/x86.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/x86.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include "tss.h"</div><div class='ctx'> #include "kvm_cache_regs.h"</div><div class='ctx'> #include "x86.h"</div><div class='add'>+#include "cpuid.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -82,15 +83,13 @@ static u64 __read_mostly efer_reserved_bits = ~((u64)EFER_SCE);</div><div class='ctx'> #define VCPU_STAT(x) offsetof(struct kvm_vcpu, stat.x), KVM_STAT_VCPU</div><div class='ctx'> </div><div class='ctx'> static void update_cr8_intercept(struct kvm_vcpu *vcpu);</div><div class='del'>-static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,</div><div class='del'>-				    struct kvm_cpuid_entry2 __user *entries);</div><div class='ctx'> static void process_nmi(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> struct kvm_x86_ops *kvm_x86_ops;</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_x86_ops);</div><div class='ctx'> </div><div class='del'>-int ignore_msrs = 0;</div><div class='del'>-module_param_named(ignore_msrs, ignore_msrs, bool, S_IRUGO | S_IWUSR);</div><div class='add'>+static bool ignore_msrs = 0;</div><div class='add'>+module_param(ignore_msrs, bool, S_IRUGO | S_IWUSR);</div><div class='ctx'> </div><div class='ctx'> bool kvm_has_tsc_control;</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_has_tsc_control);</div><div class='hunk'>@@ -574,54 +573,6 @@ int kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_set_xcr);</div><div class='ctx'> </div><div class='del'>-static bool guest_cpuid_has_xsave(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	struct kvm_cpuid_entry2 *best;</div><div class='del'>-</div><div class='del'>-	best = kvm_find_cpuid_entry(vcpu, 1, 0);</div><div class='del'>-	return best &amp;&amp; (best-&gt;ecx &amp; bit(X86_FEATURE_XSAVE));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool guest_cpuid_has_smep(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	struct kvm_cpuid_entry2 *best;</div><div class='del'>-</div><div class='del'>-	best = kvm_find_cpuid_entry(vcpu, 7, 0);</div><div class='del'>-	return best &amp;&amp; (best-&gt;ebx &amp; bit(X86_FEATURE_SMEP));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool guest_cpuid_has_fsgsbase(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	struct kvm_cpuid_entry2 *best;</div><div class='del'>-</div><div class='del'>-	best = kvm_find_cpuid_entry(vcpu, 7, 0);</div><div class='del'>-	return best &amp;&amp; (best-&gt;ebx &amp; bit(X86_FEATURE_FSGSBASE));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void update_cpuid(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	struct kvm_cpuid_entry2 *best;</div><div class='del'>-	struct kvm_lapic *apic = vcpu-&gt;arch.apic;</div><div class='del'>-</div><div class='del'>-	best = kvm_find_cpuid_entry(vcpu, 1, 0);</div><div class='del'>-	if (!best)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Update OSXSAVE bit */</div><div class='del'>-	if (cpu_has_xsave &amp;&amp; best-&gt;function == 0x1) {</div><div class='del'>-		best-&gt;ecx &amp;= ~(bit(X86_FEATURE_OSXSAVE));</div><div class='del'>-		if (kvm_read_cr4_bits(vcpu, X86_CR4_OSXSAVE))</div><div class='del'>-			best-&gt;ecx |= bit(X86_FEATURE_OSXSAVE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (apic) {</div><div class='del'>-		if (best-&gt;ecx &amp; bit(X86_FEATURE_TSC_DEADLINE_TIMER))</div><div class='del'>-			apic-&gt;lapic_timer.timer_mode_mask = 3 &lt;&lt; 17;</div><div class='del'>-		else</div><div class='del'>-			apic-&gt;lapic_timer.timer_mode_mask = 1 &lt;&lt; 17;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long old_cr4 = kvm_read_cr4(vcpu);</div><div class='hunk'>@@ -655,7 +606,7 @@ int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)</div><div class='ctx'> 		kvm_mmu_reset_context(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	if ((cr4 ^ old_cr4) &amp; X86_CR4_OSXSAVE)</div><div class='del'>-		update_cpuid(vcpu);</div><div class='add'>+		kvm_update_cpuid(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -809,6 +760,21 @@ int kvm_get_dr(struct kvm_vcpu *vcpu, int dr, unsigned long *val)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_get_dr);</div><div class='ctx'> </div><div class='add'>+bool kvm_rdpmc(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	u32 ecx = kvm_register_read(vcpu, VCPU_REGS_RCX);</div><div class='add'>+	u64 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kvm_pmu_read_pmc(vcpu, ecx, &amp;data);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RAX, (u32)data);</div><div class='add'>+	kvm_register_write(vcpu, VCPU_REGS_RDX, data &gt;&gt; 32);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(kvm_rdpmc);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * List of msr numbers which we expose to userspace through KVM_GET_MSRS</div><div class='ctx'>  * and KVM_SET_MSRS, and KVM_GET_MSR_INDEX_LIST.</div><div class='hunk'>@@ -1358,12 +1324,11 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)</div><div class='ctx'> 	if (page_num &gt;= blob_size)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	r = -ENOMEM;</div><div class='del'>-	page = kzalloc(PAGE_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!page)</div><div class='add'>+	page = memdup_user(blob_addr + (page_num * PAGE_SIZE), PAGE_SIZE);</div><div class='add'>+	if (IS_ERR(page)) {</div><div class='add'>+		r = PTR_ERR(page);</div><div class='ctx'> 		goto out;</div><div class='del'>-	r = -EFAULT;</div><div class='del'>-	if (copy_from_user(page, blob_addr + (page_num * PAGE_SIZE), PAGE_SIZE))</div><div class='del'>-		goto out_free;</div><div class='add'>+	}</div><div class='ctx'> 	if (kvm_write_guest(kvm, page_addr, page, PAGE_SIZE))</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	r = 0;</div><div class='hunk'>@@ -1652,8 +1617,6 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data)</div><div class='ctx'> 	 * which we perfectly emulate ;-). Any other value should be at least</div><div class='ctx'> 	 * reported, some guests depend on them.</div><div class='ctx'> 	 */</div><div class='del'>-	case MSR_P6_EVNTSEL0:</div><div class='del'>-	case MSR_P6_EVNTSEL1:</div><div class='ctx'> 	case MSR_K7_EVNTSEL0:</div><div class='ctx'> 	case MSR_K7_EVNTSEL1:</div><div class='ctx'> 	case MSR_K7_EVNTSEL2:</div><div class='hunk'>@@ -1665,8 +1628,6 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data)</div><div class='ctx'> 	/* at least RHEL 4 unconditionally writes to the perfctr registers,</div><div class='ctx'> 	 * so we ignore writes to make it happy.</div><div class='ctx'> 	 */</div><div class='del'>-	case MSR_P6_PERFCTR0:</div><div class='del'>-	case MSR_P6_PERFCTR1:</div><div class='ctx'> 	case MSR_K7_PERFCTR0:</div><div class='ctx'> 	case MSR_K7_PERFCTR1:</div><div class='ctx'> 	case MSR_K7_PERFCTR2:</div><div class='hunk'>@@ -1703,6 +1664,8 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data)</div><div class='ctx'> 	default:</div><div class='ctx'> 		if (msr &amp;&amp; (msr == vcpu-&gt;kvm-&gt;arch.xen_hvm_config.msr))</div><div class='ctx'> 			return xen_hvm_config(vcpu, data);</div><div class='add'>+		if (kvm_pmu_msr(vcpu, msr))</div><div class='add'>+			return kvm_pmu_set_msr(vcpu, msr, data);</div><div class='ctx'> 		if (!ignore_msrs) {</div><div class='ctx'> 			pr_unimpl(vcpu, "unhandled wrmsr: 0x%x data %llx\n",</div><div class='ctx'> 				msr, data);</div><div class='hunk'>@@ -1865,10 +1828,6 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)</div><div class='ctx'> 	case MSR_K8_SYSCFG:</div><div class='ctx'> 	case MSR_K7_HWCR:</div><div class='ctx'> 	case MSR_VM_HSAVE_PA:</div><div class='del'>-	case MSR_P6_PERFCTR0:</div><div class='del'>-	case MSR_P6_PERFCTR1:</div><div class='del'>-	case MSR_P6_EVNTSEL0:</div><div class='del'>-	case MSR_P6_EVNTSEL1:</div><div class='ctx'> 	case MSR_K7_EVNTSEL0:</div><div class='ctx'> 	case MSR_K7_PERFCTR0:</div><div class='ctx'> 	case MSR_K8_INT_PENDING_MSG:</div><div class='hunk'>@@ -1979,6 +1938,8 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)</div><div class='ctx'> 		data = 0xbe702111;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='add'>+		if (kvm_pmu_msr(vcpu, msr))</div><div class='add'>+			return kvm_pmu_get_msr(vcpu, msr, pdata);</div><div class='ctx'> 		if (!ignore_msrs) {</div><div class='ctx'> 			pr_unimpl(vcpu, "unhandled rdmsr: 0x%x\n", msr);</div><div class='ctx'> 			return 1;</div><div class='hunk'>@@ -2037,15 +1998,12 @@ static int msr_io(struct kvm_vcpu *vcpu, struct kvm_msrs __user *user_msrs,</div><div class='ctx'> 	if (msrs.nmsrs &gt;= MAX_IO_MSRS)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	r = -ENOMEM;</div><div class='ctx'> 	size = sizeof(struct kvm_msr_entry) * msrs.nmsrs;</div><div class='del'>-	entries = kmalloc(size, GFP_KERNEL);</div><div class='del'>-	if (!entries)</div><div class='add'>+	entries = memdup_user(user_msrs-&gt;entries, size);</div><div class='add'>+	if (IS_ERR(entries)) {</div><div class='add'>+		r = PTR_ERR(entries);</div><div class='ctx'> 		goto out;</div><div class='del'>-</div><div class='del'>-	r = -EFAULT;</div><div class='del'>-	if (copy_from_user(entries, user_msrs-&gt;entries, size))</div><div class='del'>-		goto out_free;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	r = n = __msr_io(vcpu, &amp;msrs, entries, do_msr);</div><div class='ctx'> 	if (r &lt; 0)</div><div class='hunk'>@@ -2265,466 +2223,6 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	vcpu-&gt;arch.last_guest_tsc = kvm_x86_ops-&gt;read_l1_tsc(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int is_efer_nx(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long long efer = 0;</div><div class='del'>-</div><div class='del'>-	rdmsrl_safe(MSR_EFER, &amp;efer);</div><div class='del'>-	return efer &amp; EFER_NX;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cpuid_fix_nx_cap(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct kvm_cpuid_entry2 *e, *entry;</div><div class='del'>-</div><div class='del'>-	entry = NULL;</div><div class='del'>-	for (i = 0; i &lt; vcpu-&gt;arch.cpuid_nent; ++i) {</div><div class='del'>-		e = &amp;vcpu-&gt;arch.cpuid_entries[i];</div><div class='del'>-		if (e-&gt;function == 0x80000001) {</div><div class='del'>-			entry = e;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (entry &amp;&amp; (entry-&gt;edx &amp; (1 &lt;&lt; 20)) &amp;&amp; !is_efer_nx()) {</div><div class='del'>-		entry-&gt;edx &amp;= ~(1 &lt;&lt; 20);</div><div class='del'>-		printk(KERN_INFO "kvm: guest NX capability removed\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* when an old userspace process fills a new kernel module */</div><div class='del'>-static int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu,</div><div class='del'>-				    struct kvm_cpuid *cpuid,</div><div class='del'>-				    struct kvm_cpuid_entry __user *entries)</div><div class='del'>-{</div><div class='del'>-	int r, i;</div><div class='del'>-	struct kvm_cpuid_entry *cpuid_entries;</div><div class='del'>-</div><div class='del'>-	r = -E2BIG;</div><div class='del'>-	if (cpuid-&gt;nent &gt; KVM_MAX_CPUID_ENTRIES)</div><div class='del'>-		goto out;</div><div class='del'>-	r = -ENOMEM;</div><div class='del'>-	cpuid_entries = vmalloc(sizeof(struct kvm_cpuid_entry) * cpuid-&gt;nent);</div><div class='del'>-	if (!cpuid_entries)</div><div class='del'>-		goto out;</div><div class='del'>-	r = -EFAULT;</div><div class='del'>-	if (copy_from_user(cpuid_entries, entries,</div><div class='del'>-			   cpuid-&gt;nent * sizeof(struct kvm_cpuid_entry)))</div><div class='del'>-		goto out_free;</div><div class='del'>-	for (i = 0; i &lt; cpuid-&gt;nent; i++) {</div><div class='del'>-		vcpu-&gt;arch.cpuid_entries[i].function = cpuid_entries[i].function;</div><div class='del'>-		vcpu-&gt;arch.cpuid_entries[i].eax = cpuid_entries[i].eax;</div><div class='del'>-		vcpu-&gt;arch.cpuid_entries[i].ebx = cpuid_entries[i].ebx;</div><div class='del'>-		vcpu-&gt;arch.cpuid_entries[i].ecx = cpuid_entries[i].ecx;</div><div class='del'>-		vcpu-&gt;arch.cpuid_entries[i].edx = cpuid_entries[i].edx;</div><div class='del'>-		vcpu-&gt;arch.cpuid_entries[i].index = 0;</div><div class='del'>-		vcpu-&gt;arch.cpuid_entries[i].flags = 0;</div><div class='del'>-		vcpu-&gt;arch.cpuid_entries[i].padding[0] = 0;</div><div class='del'>-		vcpu-&gt;arch.cpuid_entries[i].padding[1] = 0;</div><div class='del'>-		vcpu-&gt;arch.cpuid_entries[i].padding[2] = 0;</div><div class='del'>-	}</div><div class='del'>-	vcpu-&gt;arch.cpuid_nent = cpuid-&gt;nent;</div><div class='del'>-	cpuid_fix_nx_cap(vcpu);</div><div class='del'>-	r = 0;</div><div class='del'>-	kvm_apic_set_version(vcpu);</div><div class='del'>-	kvm_x86_ops-&gt;cpuid_update(vcpu);</div><div class='del'>-	update_cpuid(vcpu);</div><div class='del'>-</div><div class='del'>-out_free:</div><div class='del'>-	vfree(cpuid_entries);</div><div class='del'>-out:</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,</div><div class='del'>-				     struct kvm_cpuid2 *cpuid,</div><div class='del'>-				     struct kvm_cpuid_entry2 __user *entries)</div><div class='del'>-{</div><div class='del'>-	int r;</div><div class='del'>-</div><div class='del'>-	r = -E2BIG;</div><div class='del'>-	if (cpuid-&gt;nent &gt; KVM_MAX_CPUID_ENTRIES)</div><div class='del'>-		goto out;</div><div class='del'>-	r = -EFAULT;</div><div class='del'>-	if (copy_from_user(&amp;vcpu-&gt;arch.cpuid_entries, entries,</div><div class='del'>-			   cpuid-&gt;nent * sizeof(struct kvm_cpuid_entry2)))</div><div class='del'>-		goto out;</div><div class='del'>-	vcpu-&gt;arch.cpuid_nent = cpuid-&gt;nent;</div><div class='del'>-	kvm_apic_set_version(vcpu);</div><div class='del'>-	kvm_x86_ops-&gt;cpuid_update(vcpu);</div><div class='del'>-	update_cpuid(vcpu);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,</div><div class='del'>-				     struct kvm_cpuid2 *cpuid,</div><div class='del'>-				     struct kvm_cpuid_entry2 __user *entries)</div><div class='del'>-{</div><div class='del'>-	int r;</div><div class='del'>-</div><div class='del'>-	r = -E2BIG;</div><div class='del'>-	if (cpuid-&gt;nent &lt; vcpu-&gt;arch.cpuid_nent)</div><div class='del'>-		goto out;</div><div class='del'>-	r = -EFAULT;</div><div class='del'>-	if (copy_to_user(entries, &amp;vcpu-&gt;arch.cpuid_entries,</div><div class='del'>-			 vcpu-&gt;arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))</div><div class='del'>-		goto out;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	cpuid-&gt;nent = vcpu-&gt;arch.cpuid_nent;</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cpuid_mask(u32 *word, int wordnum)</div><div class='del'>-{</div><div class='del'>-	*word &amp;= boot_cpu_data.x86_capability[wordnum];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void do_cpuid_1_ent(struct kvm_cpuid_entry2 *entry, u32 function,</div><div class='del'>-			   u32 index)</div><div class='del'>-{</div><div class='del'>-	entry-&gt;function = function;</div><div class='del'>-	entry-&gt;index = index;</div><div class='del'>-	cpuid_count(entry-&gt;function, entry-&gt;index,</div><div class='del'>-		    &amp;entry-&gt;eax, &amp;entry-&gt;ebx, &amp;entry-&gt;ecx, &amp;entry-&gt;edx);</div><div class='del'>-	entry-&gt;flags = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool supported_xcr0_bit(unsigned bit)</div><div class='del'>-{</div><div class='del'>-	u64 mask = ((u64)1 &lt;&lt; bit);</div><div class='del'>-</div><div class='del'>-	return mask &amp; (XSTATE_FP | XSTATE_SSE | XSTATE_YMM) &amp; host_xcr0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define F(x) bit(X86_FEATURE_##x)</div><div class='del'>-</div><div class='del'>-static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,</div><div class='del'>-			 u32 index, int *nent, int maxnent)</div><div class='del'>-{</div><div class='del'>-	unsigned f_nx = is_efer_nx() ? F(NX) : 0;</div><div class='del'>-#ifdef CONFIG_X86_64</div><div class='del'>-	unsigned f_gbpages = (kvm_x86_ops-&gt;get_lpage_level() == PT_PDPE_LEVEL)</div><div class='del'>-				? F(GBPAGES) : 0;</div><div class='del'>-	unsigned f_lm = F(LM);</div><div class='del'>-#else</div><div class='del'>-	unsigned f_gbpages = 0;</div><div class='del'>-	unsigned f_lm = 0;</div><div class='del'>-#endif</div><div class='del'>-	unsigned f_rdtscp = kvm_x86_ops-&gt;rdtscp_supported() ? F(RDTSCP) : 0;</div><div class='del'>-</div><div class='del'>-	/* cpuid 1.edx */</div><div class='del'>-	const u32 kvm_supported_word0_x86_features =</div><div class='del'>-		F(FPU) | F(VME) | F(DE) | F(PSE) |</div><div class='del'>-		F(TSC) | F(MSR) | F(PAE) | F(MCE) |</div><div class='del'>-		F(CX8) | F(APIC) | 0 /* Reserved */ | F(SEP) |</div><div class='del'>-		F(MTRR) | F(PGE) | F(MCA) | F(CMOV) |</div><div class='del'>-		F(PAT) | F(PSE36) | 0 /* PSN */ | F(CLFLSH) |</div><div class='del'>-		0 /* Reserved, DS, ACPI */ | F(MMX) |</div><div class='del'>-		F(FXSR) | F(XMM) | F(XMM2) | F(SELFSNOOP) |</div><div class='del'>-		0 /* HTT, TM, Reserved, PBE */;</div><div class='del'>-	/* cpuid 0x80000001.edx */</div><div class='del'>-	const u32 kvm_supported_word1_x86_features =</div><div class='del'>-		F(FPU) | F(VME) | F(DE) | F(PSE) |</div><div class='del'>-		F(TSC) | F(MSR) | F(PAE) | F(MCE) |</div><div class='del'>-		F(CX8) | F(APIC) | 0 /* Reserved */ | F(SYSCALL) |</div><div class='del'>-		F(MTRR) | F(PGE) | F(MCA) | F(CMOV) |</div><div class='del'>-		F(PAT) | F(PSE36) | 0 /* Reserved */ |</div><div class='del'>-		f_nx | 0 /* Reserved */ | F(MMXEXT) | F(MMX) |</div><div class='del'>-		F(FXSR) | F(FXSR_OPT) | f_gbpages | f_rdtscp |</div><div class='del'>-		0 /* Reserved */ | f_lm | F(3DNOWEXT) | F(3DNOW);</div><div class='del'>-	/* cpuid 1.ecx */</div><div class='del'>-	const u32 kvm_supported_word4_x86_features =</div><div class='del'>-		F(XMM3) | F(PCLMULQDQ) | 0 /* DTES64, MONITOR */ |</div><div class='del'>-		0 /* DS-CPL, VMX, SMX, EST */ |</div><div class='del'>-		0 /* TM2 */ | F(SSSE3) | 0 /* CNXT-ID */ | 0 /* Reserved */ |</div><div class='del'>-		0 /* Reserved */ | F(CX16) | 0 /* xTPR Update, PDCM */ |</div><div class='del'>-		0 /* Reserved, DCA */ | F(XMM4_1) |</div><div class='del'>-		F(XMM4_2) | F(X2APIC) | F(MOVBE) | F(POPCNT) |</div><div class='del'>-		0 /* Reserved*/ | F(AES) | F(XSAVE) | 0 /* OSXSAVE */ | F(AVX) |</div><div class='del'>-		F(F16C) | F(RDRAND);</div><div class='del'>-	/* cpuid 0x80000001.ecx */</div><div class='del'>-	const u32 kvm_supported_word6_x86_features =</div><div class='del'>-		F(LAHF_LM) | F(CMP_LEGACY) | 0 /*SVM*/ | 0 /* ExtApicSpace */ |</div><div class='del'>-		F(CR8_LEGACY) | F(ABM) | F(SSE4A) | F(MISALIGNSSE) |</div><div class='del'>-		F(3DNOWPREFETCH) | 0 /* OSVW */ | 0 /* IBS */ | F(XOP) |</div><div class='del'>-		0 /* SKINIT, WDT, LWP */ | F(FMA4) | F(TBM);</div><div class='del'>-</div><div class='del'>-	/* cpuid 0xC0000001.edx */</div><div class='del'>-	const u32 kvm_supported_word5_x86_features =</div><div class='del'>-		F(XSTORE) | F(XSTORE_EN) | F(XCRYPT) | F(XCRYPT_EN) |</div><div class='del'>-		F(ACE2) | F(ACE2_EN) | F(PHE) | F(PHE_EN) |</div><div class='del'>-		F(PMM) | F(PMM_EN);</div><div class='del'>-</div><div class='del'>-	/* cpuid 7.0.ebx */</div><div class='del'>-	const u32 kvm_supported_word9_x86_features =</div><div class='del'>-		F(SMEP) | F(FSGSBASE) | F(ERMS);</div><div class='del'>-</div><div class='del'>-	/* all calls to cpuid_count() should be made on the same cpu */</div><div class='del'>-	get_cpu();</div><div class='del'>-	do_cpuid_1_ent(entry, function, index);</div><div class='del'>-	++*nent;</div><div class='del'>-</div><div class='del'>-	switch (function) {</div><div class='del'>-	case 0:</div><div class='del'>-		entry-&gt;eax = min(entry-&gt;eax, (u32)0xd);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		entry-&gt;edx &amp;= kvm_supported_word0_x86_features;</div><div class='del'>-		cpuid_mask(&amp;entry-&gt;edx, 0);</div><div class='del'>-		entry-&gt;ecx &amp;= kvm_supported_word4_x86_features;</div><div class='del'>-		cpuid_mask(&amp;entry-&gt;ecx, 4);</div><div class='del'>-		/* we support x2apic emulation even if host does not support</div><div class='del'>-		 * it since we emulate x2apic in software */</div><div class='del'>-		entry-&gt;ecx |= F(X2APIC);</div><div class='del'>-		break;</div><div class='del'>-	/* function 2 entries are STATEFUL. That is, repeated cpuid commands</div><div class='del'>-	 * may return different values. This forces us to get_cpu() before</div><div class='del'>-	 * issuing the first command, and also to emulate this annoying behavior</div><div class='del'>-	 * in kvm_emulate_cpuid() using KVM_CPUID_FLAG_STATE_READ_NEXT */</div><div class='del'>-	case 2: {</div><div class='del'>-		int t, times = entry-&gt;eax &amp; 0xff;</div><div class='del'>-</div><div class='del'>-		entry-&gt;flags |= KVM_CPUID_FLAG_STATEFUL_FUNC;</div><div class='del'>-		entry-&gt;flags |= KVM_CPUID_FLAG_STATE_READ_NEXT;</div><div class='del'>-		for (t = 1; t &lt; times &amp;&amp; *nent &lt; maxnent; ++t) {</div><div class='del'>-			do_cpuid_1_ent(&amp;entry[t], function, 0);</div><div class='del'>-			entry[t].flags |= KVM_CPUID_FLAG_STATEFUL_FUNC;</div><div class='del'>-			++*nent;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	/* function 4 has additional index. */</div><div class='del'>-	case 4: {</div><div class='del'>-		int i, cache_type;</div><div class='del'>-</div><div class='del'>-		entry-&gt;flags |= KVM_CPUID_FLAG_SIGNIFCANT_INDEX;</div><div class='del'>-		/* read more entries until cache_type is zero */</div><div class='del'>-		for (i = 1; *nent &lt; maxnent; ++i) {</div><div class='del'>-			cache_type = entry[i - 1].eax &amp; 0x1f;</div><div class='del'>-			if (!cache_type)</div><div class='del'>-				break;</div><div class='del'>-			do_cpuid_1_ent(&amp;entry[i], function, i);</div><div class='del'>-			entry[i].flags |=</div><div class='del'>-			       KVM_CPUID_FLAG_SIGNIFCANT_INDEX;</div><div class='del'>-			++*nent;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case 7: {</div><div class='del'>-		entry-&gt;flags |= KVM_CPUID_FLAG_SIGNIFCANT_INDEX;</div><div class='del'>-		/* Mask ebx against host capbability word 9 */</div><div class='del'>-		if (index == 0) {</div><div class='del'>-			entry-&gt;ebx &amp;= kvm_supported_word9_x86_features;</div><div class='del'>-			cpuid_mask(&amp;entry-&gt;ebx, 9);</div><div class='del'>-		} else</div><div class='del'>-			entry-&gt;ebx = 0;</div><div class='del'>-		entry-&gt;eax = 0;</div><div class='del'>-		entry-&gt;ecx = 0;</div><div class='del'>-		entry-&gt;edx = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case 9:</div><div class='del'>-		break;</div><div class='del'>-	/* function 0xb has additional index. */</div><div class='del'>-	case 0xb: {</div><div class='del'>-		int i, level_type;</div><div class='del'>-</div><div class='del'>-		entry-&gt;flags |= KVM_CPUID_FLAG_SIGNIFCANT_INDEX;</div><div class='del'>-		/* read more entries until level_type is zero */</div><div class='del'>-		for (i = 1; *nent &lt; maxnent; ++i) {</div><div class='del'>-			level_type = entry[i - 1].ecx &amp; 0xff00;</div><div class='del'>-			if (!level_type)</div><div class='del'>-				break;</div><div class='del'>-			do_cpuid_1_ent(&amp;entry[i], function, i);</div><div class='del'>-			entry[i].flags |=</div><div class='del'>-			       KVM_CPUID_FLAG_SIGNIFCANT_INDEX;</div><div class='del'>-			++*nent;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case 0xd: {</div><div class='del'>-		int idx, i;</div><div class='del'>-</div><div class='del'>-		entry-&gt;flags |= KVM_CPUID_FLAG_SIGNIFCANT_INDEX;</div><div class='del'>-		for (idx = 1, i = 1; *nent &lt; maxnent &amp;&amp; idx &lt; 64; ++idx) {</div><div class='del'>-			do_cpuid_1_ent(&amp;entry[i], function, idx);</div><div class='del'>-			if (entry[i].eax == 0 || !supported_xcr0_bit(idx))</div><div class='del'>-				continue;</div><div class='del'>-			entry[i].flags |=</div><div class='del'>-			       KVM_CPUID_FLAG_SIGNIFCANT_INDEX;</div><div class='del'>-			++*nent;</div><div class='del'>-			++i;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case KVM_CPUID_SIGNATURE: {</div><div class='del'>-		char signature[12] = "KVMKVMKVM\0\0";</div><div class='del'>-		u32 *sigptr = (u32 *)signature;</div><div class='del'>-		entry-&gt;eax = 0;</div><div class='del'>-		entry-&gt;ebx = sigptr[0];</div><div class='del'>-		entry-&gt;ecx = sigptr[1];</div><div class='del'>-		entry-&gt;edx = sigptr[2];</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case KVM_CPUID_FEATURES:</div><div class='del'>-		entry-&gt;eax = (1 &lt;&lt; KVM_FEATURE_CLOCKSOURCE) |</div><div class='del'>-			     (1 &lt;&lt; KVM_FEATURE_NOP_IO_DELAY) |</div><div class='del'>-			     (1 &lt;&lt; KVM_FEATURE_CLOCKSOURCE2) |</div><div class='del'>-			     (1 &lt;&lt; KVM_FEATURE_ASYNC_PF) |</div><div class='del'>-			     (1 &lt;&lt; KVM_FEATURE_CLOCKSOURCE_STABLE_BIT);</div><div class='del'>-</div><div class='del'>-		if (sched_info_on())</div><div class='del'>-			entry-&gt;eax |= (1 &lt;&lt; KVM_FEATURE_STEAL_TIME);</div><div class='del'>-</div><div class='del'>-		entry-&gt;ebx = 0;</div><div class='del'>-		entry-&gt;ecx = 0;</div><div class='del'>-		entry-&gt;edx = 0;</div><div class='del'>-		break;</div><div class='del'>-	case 0x80000000:</div><div class='del'>-		entry-&gt;eax = min(entry-&gt;eax, 0x8000001a);</div><div class='del'>-		break;</div><div class='del'>-	case 0x80000001:</div><div class='del'>-		entry-&gt;edx &amp;= kvm_supported_word1_x86_features;</div><div class='del'>-		cpuid_mask(&amp;entry-&gt;edx, 1);</div><div class='del'>-		entry-&gt;ecx &amp;= kvm_supported_word6_x86_features;</div><div class='del'>-		cpuid_mask(&amp;entry-&gt;ecx, 6);</div><div class='del'>-		break;</div><div class='del'>-	case 0x80000008: {</div><div class='del'>-		unsigned g_phys_as = (entry-&gt;eax &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-		unsigned virt_as = max((entry-&gt;eax &gt;&gt; 8) &amp; 0xff, 48U);</div><div class='del'>-		unsigned phys_as = entry-&gt;eax &amp; 0xff;</div><div class='del'>-</div><div class='del'>-		if (!g_phys_as)</div><div class='del'>-			g_phys_as = phys_as;</div><div class='del'>-		entry-&gt;eax = g_phys_as | (virt_as &lt;&lt; 8);</div><div class='del'>-		entry-&gt;ebx = entry-&gt;edx = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case 0x80000019:</div><div class='del'>-		entry-&gt;ecx = entry-&gt;edx = 0;</div><div class='del'>-		break;</div><div class='del'>-	case 0x8000001a:</div><div class='del'>-		break;</div><div class='del'>-	case 0x8000001d:</div><div class='del'>-		break;</div><div class='del'>-	/*Add support for Centaur's CPUID instruction*/</div><div class='del'>-	case 0xC0000000:</div><div class='del'>-		/*Just support up to 0xC0000004 now*/</div><div class='del'>-		entry-&gt;eax = min(entry-&gt;eax, 0xC0000004);</div><div class='del'>-		break;</div><div class='del'>-	case 0xC0000001:</div><div class='del'>-		entry-&gt;edx &amp;= kvm_supported_word5_x86_features;</div><div class='del'>-		cpuid_mask(&amp;entry-&gt;edx, 5);</div><div class='del'>-		break;</div><div class='del'>-	case 3: /* Processor serial number */</div><div class='del'>-	case 5: /* MONITOR/MWAIT */</div><div class='del'>-	case 6: /* Thermal management */</div><div class='del'>-	case 0xA: /* Architectural Performance Monitoring */</div><div class='del'>-	case 0x80000007: /* Advanced power management */</div><div class='del'>-	case 0xC0000002:</div><div class='del'>-	case 0xC0000003:</div><div class='del'>-	case 0xC0000004:</div><div class='del'>-	default:</div><div class='del'>-		entry-&gt;eax = entry-&gt;ebx = entry-&gt;ecx = entry-&gt;edx = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kvm_x86_ops-&gt;set_supported_cpuid(function, entry);</div><div class='del'>-</div><div class='del'>-	put_cpu();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#undef F</div><div class='del'>-</div><div class='del'>-static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,</div><div class='del'>-				     struct kvm_cpuid_entry2 __user *entries)</div><div class='del'>-{</div><div class='del'>-	struct kvm_cpuid_entry2 *cpuid_entries;</div><div class='del'>-	int limit, nent = 0, r = -E2BIG;</div><div class='del'>-	u32 func;</div><div class='del'>-</div><div class='del'>-	if (cpuid-&gt;nent &lt; 1)</div><div class='del'>-		goto out;</div><div class='del'>-	if (cpuid-&gt;nent &gt; KVM_MAX_CPUID_ENTRIES)</div><div class='del'>-		cpuid-&gt;nent = KVM_MAX_CPUID_ENTRIES;</div><div class='del'>-	r = -ENOMEM;</div><div class='del'>-	cpuid_entries = vmalloc(sizeof(struct kvm_cpuid_entry2) * cpuid-&gt;nent);</div><div class='del'>-	if (!cpuid_entries)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	do_cpuid_ent(&amp;cpuid_entries[0], 0, 0, &amp;nent, cpuid-&gt;nent);</div><div class='del'>-	limit = cpuid_entries[0].eax;</div><div class='del'>-	for (func = 1; func &lt;= limit &amp;&amp; nent &lt; cpuid-&gt;nent; ++func)</div><div class='del'>-		do_cpuid_ent(&amp;cpuid_entries[nent], func, 0,</div><div class='del'>-			     &amp;nent, cpuid-&gt;nent);</div><div class='del'>-	r = -E2BIG;</div><div class='del'>-	if (nent &gt;= cpuid-&gt;nent)</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='del'>-	do_cpuid_ent(&amp;cpuid_entries[nent], 0x80000000, 0, &amp;nent, cpuid-&gt;nent);</div><div class='del'>-	limit = cpuid_entries[nent - 1].eax;</div><div class='del'>-	for (func = 0x80000001; func &lt;= limit &amp;&amp; nent &lt; cpuid-&gt;nent; ++func)</div><div class='del'>-		do_cpuid_ent(&amp;cpuid_entries[nent], func, 0,</div><div class='del'>-			     &amp;nent, cpuid-&gt;nent);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	r = -E2BIG;</div><div class='del'>-	if (nent &gt;= cpuid-&gt;nent)</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='del'>-	/* Add support for Centaur's CPUID instruction. */</div><div class='del'>-	if (boot_cpu_data.x86_vendor == X86_VENDOR_CENTAUR) {</div><div class='del'>-		do_cpuid_ent(&amp;cpuid_entries[nent], 0xC0000000, 0,</div><div class='del'>-				&amp;nent, cpuid-&gt;nent);</div><div class='del'>-</div><div class='del'>-		r = -E2BIG;</div><div class='del'>-		if (nent &gt;= cpuid-&gt;nent)</div><div class='del'>-			goto out_free;</div><div class='del'>-</div><div class='del'>-		limit = cpuid_entries[nent - 1].eax;</div><div class='del'>-		for (func = 0xC0000001;</div><div class='del'>-			func &lt;= limit &amp;&amp; nent &lt; cpuid-&gt;nent; ++func)</div><div class='del'>-			do_cpuid_ent(&amp;cpuid_entries[nent], func, 0,</div><div class='del'>-					&amp;nent, cpuid-&gt;nent);</div><div class='del'>-</div><div class='del'>-		r = -E2BIG;</div><div class='del'>-		if (nent &gt;= cpuid-&gt;nent)</div><div class='del'>-			goto out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	do_cpuid_ent(&amp;cpuid_entries[nent], KVM_CPUID_SIGNATURE, 0, &amp;nent,</div><div class='del'>-		     cpuid-&gt;nent);</div><div class='del'>-</div><div class='del'>-	r = -E2BIG;</div><div class='del'>-	if (nent &gt;= cpuid-&gt;nent)</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='del'>-	do_cpuid_ent(&amp;cpuid_entries[nent], KVM_CPUID_FEATURES, 0, &amp;nent,</div><div class='del'>-		     cpuid-&gt;nent);</div><div class='del'>-</div><div class='del'>-	r = -E2BIG;</div><div class='del'>-	if (nent &gt;= cpuid-&gt;nent)</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='del'>-	r = -EFAULT;</div><div class='del'>-	if (copy_to_user(entries, cpuid_entries,</div><div class='del'>-			 nent * sizeof(struct kvm_cpuid_entry2)))</div><div class='del'>-		goto out_free;</div><div class='del'>-	cpuid-&gt;nent = nent;</div><div class='del'>-	r = 0;</div><div class='del'>-</div><div class='del'>-out_free:</div><div class='del'>-	vfree(cpuid_entries);</div><div class='del'>-out:</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int kvm_vcpu_ioctl_get_lapic(struct kvm_vcpu *vcpu,</div><div class='ctx'> 				    struct kvm_lapic_state *s)</div><div class='ctx'> {</div><div class='hunk'>@@ -3042,13 +2540,12 @@ long kvm_arch_vcpu_ioctl(struct file *filp,</div><div class='ctx'> 		r = -EINVAL;</div><div class='ctx'> 		if (!vcpu-&gt;arch.apic)</div><div class='ctx'> 			goto out;</div><div class='del'>-		u.lapic = kmalloc(sizeof(struct kvm_lapic_state), GFP_KERNEL);</div><div class='del'>-		r = -ENOMEM;</div><div class='del'>-		if (!u.lapic)</div><div class='del'>-			goto out;</div><div class='del'>-		r = -EFAULT;</div><div class='del'>-		if (copy_from_user(u.lapic, argp, sizeof(struct kvm_lapic_state)))</div><div class='add'>+		u.lapic = memdup_user(argp, sizeof(*u.lapic));</div><div class='add'>+		if (IS_ERR(u.lapic)) {</div><div class='add'>+			r = PTR_ERR(u.lapic);</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		r = kvm_vcpu_ioctl_set_lapic(vcpu, u.lapic);</div><div class='ctx'> 		if (r)</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -3227,14 +2724,11 @@ long kvm_arch_vcpu_ioctl(struct file *filp,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case KVM_SET_XSAVE: {</div><div class='del'>-		u.xsave = kzalloc(sizeof(struct kvm_xsave), GFP_KERNEL);</div><div class='del'>-		r = -ENOMEM;</div><div class='del'>-		if (!u.xsave)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		r = -EFAULT;</div><div class='del'>-		if (copy_from_user(u.xsave, argp, sizeof(struct kvm_xsave)))</div><div class='del'>-			break;</div><div class='add'>+		u.xsave = memdup_user(argp, sizeof(*u.xsave));</div><div class='add'>+		if (IS_ERR(u.xsave)) {</div><div class='add'>+			r = PTR_ERR(u.xsave);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		r = kvm_vcpu_ioctl_x86_set_xsave(vcpu, u.xsave);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -3255,15 +2749,11 @@ long kvm_arch_vcpu_ioctl(struct file *filp,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case KVM_SET_XCRS: {</div><div class='del'>-		u.xcrs = kzalloc(sizeof(struct kvm_xcrs), GFP_KERNEL);</div><div class='del'>-		r = -ENOMEM;</div><div class='del'>-		if (!u.xcrs)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		r = -EFAULT;</div><div class='del'>-		if (copy_from_user(u.xcrs, argp,</div><div class='del'>-				   sizeof(struct kvm_xcrs)))</div><div class='del'>-			break;</div><div class='add'>+		u.xcrs = memdup_user(argp, sizeof(*u.xcrs));</div><div class='add'>+		if (IS_ERR(u.xcrs)) {</div><div class='add'>+			r = PTR_ERR(u.xcrs);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		r = kvm_vcpu_ioctl_x86_set_xcrs(vcpu, u.xcrs);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -3460,16 +2950,59 @@ static int kvm_vm_ioctl_reinject(struct kvm *kvm,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * write_protect_slot - write protect a slot for dirty logging</div><div class='add'>+ * @kvm: the kvm instance</div><div class='add'>+ * @memslot: the slot we protect</div><div class='add'>+ * @dirty_bitmap: the bitmap indicating which pages are dirty</div><div class='add'>+ * @nr_dirty_pages: the number of dirty pages</div><div class='add'>+ *</div><div class='add'>+ * We have two ways to find all sptes to protect:</div><div class='add'>+ * 1. Use kvm_mmu_slot_remove_write_access() which walks all shadow pages and</div><div class='add'>+ *    checks ones that have a spte mapping a page in the slot.</div><div class='add'>+ * 2. Use kvm_mmu_rmap_write_protect() for each gfn found in the bitmap.</div><div class='add'>+ *</div><div class='add'>+ * Generally speaking, if there are not so many dirty pages compared to the</div><div class='add'>+ * number of shadow pages, we should use the latter.</div><div class='add'>+ *</div><div class='add'>+ * Note that letting others write into a page marked dirty in the old bitmap</div><div class='add'>+ * by using the remaining tlb entry is not a problem.  That page will become</div><div class='add'>+ * write protected again when we flush the tlb and then be reported dirty to</div><div class='add'>+ * the user space by copying the old bitmap.</div><div class='add'>+ */</div><div class='add'>+static void write_protect_slot(struct kvm *kvm,</div><div class='add'>+			       struct kvm_memory_slot *memslot,</div><div class='add'>+			       unsigned long *dirty_bitmap,</div><div class='add'>+			       unsigned long nr_dirty_pages)</div><div class='add'>+{</div><div class='add'>+	/* Not many dirty pages compared to # of shadow pages. */</div><div class='add'>+	if (nr_dirty_pages &lt; kvm-&gt;arch.n_used_mmu_pages) {</div><div class='add'>+		unsigned long gfn_offset;</div><div class='add'>+</div><div class='add'>+		for_each_set_bit(gfn_offset, dirty_bitmap, memslot-&gt;npages) {</div><div class='add'>+			unsigned long gfn = memslot-&gt;base_gfn + gfn_offset;</div><div class='add'>+</div><div class='add'>+			spin_lock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+			kvm_mmu_rmap_write_protect(kvm, gfn, memslot);</div><div class='add'>+			spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+		}</div><div class='add'>+		kvm_flush_remote_tlbs(kvm);</div><div class='add'>+	} else {</div><div class='add'>+		spin_lock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+		kvm_mmu_slot_remove_write_access(kvm, memslot-&gt;id);</div><div class='add'>+		spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Get (and clear) the dirty memory log for a memory slot.</div><div class='ctx'>  */</div><div class='ctx'> int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,</div><div class='ctx'> 				      struct kvm_dirty_log *log)</div><div class='ctx'> {</div><div class='del'>-	int r, i;</div><div class='add'>+	int r;</div><div class='ctx'> 	struct kvm_memory_slot *memslot;</div><div class='del'>-	unsigned long n;</div><div class='del'>-	unsigned long is_dirty = 0;</div><div class='add'>+	unsigned long n, nr_dirty_pages;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;kvm-&gt;slots_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -3477,43 +3010,41 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,</div><div class='ctx'> 	if (log-&gt;slot &gt;= KVM_MEMORY_SLOTS)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	memslot = &amp;kvm-&gt;memslots-&gt;memslots[log-&gt;slot];</div><div class='add'>+	memslot = id_to_memslot(kvm-&gt;memslots, log-&gt;slot);</div><div class='ctx'> 	r = -ENOENT;</div><div class='ctx'> 	if (!memslot-&gt;dirty_bitmap)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	n = kvm_dirty_bitmap_bytes(memslot);</div><div class='del'>-</div><div class='del'>-	for (i = 0; !is_dirty &amp;&amp; i &lt; n/sizeof(long); i++)</div><div class='del'>-		is_dirty = memslot-&gt;dirty_bitmap[i];</div><div class='add'>+	nr_dirty_pages = memslot-&gt;nr_dirty_pages;</div><div class='ctx'> </div><div class='ctx'> 	/* If nothing is dirty, don't bother messing with page tables. */</div><div class='del'>-	if (is_dirty) {</div><div class='add'>+	if (nr_dirty_pages) {</div><div class='ctx'> 		struct kvm_memslots *slots, *old_slots;</div><div class='del'>-		unsigned long *dirty_bitmap;</div><div class='add'>+		unsigned long *dirty_bitmap, *dirty_bitmap_head;</div><div class='ctx'> </div><div class='del'>-		dirty_bitmap = memslot-&gt;dirty_bitmap_head;</div><div class='del'>-		if (memslot-&gt;dirty_bitmap == dirty_bitmap)</div><div class='del'>-			dirty_bitmap += n / sizeof(long);</div><div class='del'>-		memset(dirty_bitmap, 0, n);</div><div class='add'>+		dirty_bitmap = memslot-&gt;dirty_bitmap;</div><div class='add'>+		dirty_bitmap_head = memslot-&gt;dirty_bitmap_head;</div><div class='add'>+		if (dirty_bitmap == dirty_bitmap_head)</div><div class='add'>+			dirty_bitmap_head += n / sizeof(long);</div><div class='add'>+		memset(dirty_bitmap_head, 0, n);</div><div class='ctx'> </div><div class='ctx'> 		r = -ENOMEM;</div><div class='del'>-		slots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL);</div><div class='add'>+		slots = kmemdup(kvm-&gt;memslots, sizeof(*kvm-&gt;memslots), GFP_KERNEL);</div><div class='ctx'> 		if (!slots)</div><div class='ctx'> 			goto out;</div><div class='del'>-		memcpy(slots, kvm-&gt;memslots, sizeof(struct kvm_memslots));</div><div class='del'>-		slots-&gt;memslots[log-&gt;slot].dirty_bitmap = dirty_bitmap;</div><div class='del'>-		slots-&gt;generation++;</div><div class='add'>+</div><div class='add'>+		memslot = id_to_memslot(slots, log-&gt;slot);</div><div class='add'>+		memslot-&gt;nr_dirty_pages = 0;</div><div class='add'>+		memslot-&gt;dirty_bitmap = dirty_bitmap_head;</div><div class='add'>+		update_memslots(slots, NULL);</div><div class='ctx'> </div><div class='ctx'> 		old_slots = kvm-&gt;memslots;</div><div class='ctx'> 		rcu_assign_pointer(kvm-&gt;memslots, slots);</div><div class='ctx'> 		synchronize_srcu_expedited(&amp;kvm-&gt;srcu);</div><div class='del'>-		dirty_bitmap = old_slots-&gt;memslots[log-&gt;slot].dirty_bitmap;</div><div class='ctx'> 		kfree(old_slots);</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;kvm-&gt;mmu_lock);</div><div class='del'>-		kvm_mmu_slot_remove_write_access(kvm, log-&gt;slot);</div><div class='del'>-		spin_unlock(&amp;kvm-&gt;mmu_lock);</div><div class='add'>+		write_protect_slot(kvm, memslot, dirty_bitmap, nr_dirty_pages);</div><div class='ctx'> </div><div class='ctx'> 		r = -EFAULT;</div><div class='ctx'> 		if (copy_to_user(log-&gt;dirty_bitmap, dirty_bitmap, n))</div><div class='hunk'>@@ -3658,14 +3189,14 @@ long kvm_arch_vm_ioctl(struct file *filp,</div><div class='ctx'> 	}</div><div class='ctx'> 	case KVM_GET_IRQCHIP: {</div><div class='ctx'> 		/* 0: PIC master, 1: PIC slave, 2: IOAPIC */</div><div class='del'>-		struct kvm_irqchip *chip = kmalloc(sizeof(*chip), GFP_KERNEL);</div><div class='add'>+		struct kvm_irqchip *chip;</div><div class='ctx'> </div><div class='del'>-		r = -ENOMEM;</div><div class='del'>-		if (!chip)</div><div class='add'>+		chip = memdup_user(argp, sizeof(*chip));</div><div class='add'>+		if (IS_ERR(chip)) {</div><div class='add'>+			r = PTR_ERR(chip);</div><div class='ctx'> 			goto out;</div><div class='del'>-		r = -EFAULT;</div><div class='del'>-		if (copy_from_user(chip, argp, sizeof *chip))</div><div class='del'>-			goto get_irqchip_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		r = -ENXIO;</div><div class='ctx'> 		if (!irqchip_in_kernel(kvm))</div><div class='ctx'> 			goto get_irqchip_out;</div><div class='hunk'>@@ -3684,14 +3215,14 @@ long kvm_arch_vm_ioctl(struct file *filp,</div><div class='ctx'> 	}</div><div class='ctx'> 	case KVM_SET_IRQCHIP: {</div><div class='ctx'> 		/* 0: PIC master, 1: PIC slave, 2: IOAPIC */</div><div class='del'>-		struct kvm_irqchip *chip = kmalloc(sizeof(*chip), GFP_KERNEL);</div><div class='add'>+		struct kvm_irqchip *chip;</div><div class='ctx'> </div><div class='del'>-		r = -ENOMEM;</div><div class='del'>-		if (!chip)</div><div class='add'>+		chip = memdup_user(argp, sizeof(*chip));</div><div class='add'>+		if (IS_ERR(chip)) {</div><div class='add'>+			r = PTR_ERR(chip);</div><div class='ctx'> 			goto out;</div><div class='del'>-		r = -EFAULT;</div><div class='del'>-		if (copy_from_user(chip, argp, sizeof *chip))</div><div class='del'>-			goto set_irqchip_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		r = -ENXIO;</div><div class='ctx'> 		if (!irqchip_in_kernel(kvm))</div><div class='ctx'> 			goto set_irqchip_out;</div><div class='hunk'>@@ -3898,12 +3429,7 @@ void kvm_get_segment(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	kvm_x86_ops-&gt;get_segment(vcpu, var, seg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static gpa_t translate_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access)</div><div class='del'>-{</div><div class='del'>-	return gpa;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gpa_t translate_nested_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access)</div><div class='add'>+gpa_t translate_nested_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access)</div><div class='ctx'> {</div><div class='ctx'> 	gpa_t t_gpa;</div><div class='ctx'> 	struct x86_exception exception;</div><div class='hunk'>@@ -4087,7 +3613,7 @@ int emulator_write_phys(struct kvm_vcpu *vcpu, gpa_t gpa,</div><div class='ctx'> 	ret = kvm_write_guest(vcpu-&gt;kvm, gpa, val, bytes);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return 0;</div><div class='del'>-	kvm_mmu_pte_write(vcpu, gpa, val, bytes, 1);</div><div class='add'>+	kvm_mmu_pte_write(vcpu, gpa, val, bytes);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4324,7 +3850,7 @@ static int emulator_cmpxchg_emulated(struct x86_emulate_ctxt *ctxt,</div><div class='ctx'> 	if (!exchanged)</div><div class='ctx'> 		return X86EMUL_CMPXCHG_FAILED;</div><div class='ctx'> </div><div class='del'>-	kvm_mmu_pte_write(vcpu, gpa, new, bytes, 1);</div><div class='add'>+	kvm_mmu_pte_write(vcpu, gpa, new, bytes);</div><div class='ctx'> </div><div class='ctx'> 	return X86EMUL_CONTINUE;</div><div class='ctx'> </div><div class='hunk'>@@ -4349,32 +3875,24 @@ static int kernel_pio(struct kvm_vcpu *vcpu, void *pd)</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int emulator_pio_in_emulated(struct x86_emulate_ctxt *ctxt,</div><div class='del'>-				    int size, unsigned short port, void *val,</div><div class='del'>-				    unsigned int count)</div><div class='add'>+static int emulator_pio_in_out(struct kvm_vcpu *vcpu, int size,</div><div class='add'>+			       unsigned short port, void *val,</div><div class='add'>+			       unsigned int count, bool in)</div><div class='ctx'> {</div><div class='del'>-	struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);</div><div class='del'>-</div><div class='del'>-	if (vcpu-&gt;arch.pio.count)</div><div class='del'>-		goto data_avail;</div><div class='del'>-</div><div class='del'>-	trace_kvm_pio(0, port, size, count);</div><div class='add'>+	trace_kvm_pio(!in, port, size, count);</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;arch.pio.port = port;</div><div class='del'>-	vcpu-&gt;arch.pio.in = 1;</div><div class='add'>+	vcpu-&gt;arch.pio.in = in;</div><div class='ctx'> 	vcpu-&gt;arch.pio.count  = count;</div><div class='ctx'> 	vcpu-&gt;arch.pio.size = size;</div><div class='ctx'> </div><div class='ctx'> 	if (!kernel_pio(vcpu, vcpu-&gt;arch.pio_data)) {</div><div class='del'>-	data_avail:</div><div class='del'>-		memcpy(val, vcpu-&gt;arch.pio_data, size * count);</div><div class='ctx'> 		vcpu-&gt;arch.pio.count = 0;</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;run-&gt;exit_reason = KVM_EXIT_IO;</div><div class='del'>-	vcpu-&gt;run-&gt;io.direction = KVM_EXIT_IO_IN;</div><div class='add'>+	vcpu-&gt;run-&gt;io.direction = in ? KVM_EXIT_IO_IN : KVM_EXIT_IO_OUT;</div><div class='ctx'> 	vcpu-&gt;run-&gt;io.size = size;</div><div class='ctx'> 	vcpu-&gt;run-&gt;io.data_offset = KVM_PIO_PAGE_OFFSET * PAGE_SIZE;</div><div class='ctx'> 	vcpu-&gt;run-&gt;io.count = count;</div><div class='hunk'>@@ -4383,36 +3901,37 @@ static int emulator_pio_in_emulated(struct x86_emulate_ctxt *ctxt,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int emulator_pio_out_emulated(struct x86_emulate_ctxt *ctxt,</div><div class='del'>-				     int size, unsigned short port,</div><div class='del'>-				     const void *val, unsigned int count)</div><div class='add'>+static int emulator_pio_in_emulated(struct x86_emulate_ctxt *ctxt,</div><div class='add'>+				    int size, unsigned short port, void *val,</div><div class='add'>+				    unsigned int count)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	trace_kvm_pio(1, port, size, count);</div><div class='del'>-</div><div class='del'>-	vcpu-&gt;arch.pio.port = port;</div><div class='del'>-	vcpu-&gt;arch.pio.in = 0;</div><div class='del'>-	vcpu-&gt;arch.pio.count = count;</div><div class='del'>-	vcpu-&gt;arch.pio.size = size;</div><div class='del'>-</div><div class='del'>-	memcpy(vcpu-&gt;arch.pio_data, val, size * count);</div><div class='add'>+	if (vcpu-&gt;arch.pio.count)</div><div class='add'>+		goto data_avail;</div><div class='ctx'> </div><div class='del'>-	if (!kernel_pio(vcpu, vcpu-&gt;arch.pio_data)) {</div><div class='add'>+	ret = emulator_pio_in_out(vcpu, size, port, val, count, true);</div><div class='add'>+	if (ret) {</div><div class='add'>+data_avail:</div><div class='add'>+		memcpy(val, vcpu-&gt;arch.pio_data, size * count);</div><div class='ctx'> 		vcpu-&gt;arch.pio.count = 0;</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vcpu-&gt;run-&gt;exit_reason = KVM_EXIT_IO;</div><div class='del'>-	vcpu-&gt;run-&gt;io.direction = KVM_EXIT_IO_OUT;</div><div class='del'>-	vcpu-&gt;run-&gt;io.size = size;</div><div class='del'>-	vcpu-&gt;run-&gt;io.data_offset = KVM_PIO_PAGE_OFFSET * PAGE_SIZE;</div><div class='del'>-	vcpu-&gt;run-&gt;io.count = count;</div><div class='del'>-	vcpu-&gt;run-&gt;io.port = port;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int emulator_pio_out_emulated(struct x86_emulate_ctxt *ctxt,</div><div class='add'>+				     int size, unsigned short port,</div><div class='add'>+				     const void *val, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);</div><div class='add'>+</div><div class='add'>+	memcpy(vcpu-&gt;arch.pio_data, val, size * count);</div><div class='add'>+	return emulator_pio_in_out(vcpu, size, port, (void *)val, count, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static unsigned long get_segment_base(struct kvm_vcpu *vcpu, int seg)</div><div class='ctx'> {</div><div class='ctx'> 	return kvm_x86_ops-&gt;get_segment_base(vcpu, seg);</div><div class='hunk'>@@ -4627,6 +4146,12 @@ static int emulator_set_msr(struct x86_emulate_ctxt *ctxt,</div><div class='ctx'> 	return kvm_set_msr(emul_to_vcpu(ctxt), msr_index, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int emulator_read_pmc(struct x86_emulate_ctxt *ctxt,</div><div class='add'>+			     u32 pmc, u64 *pdata)</div><div class='add'>+{</div><div class='add'>+	return kvm_pmu_read_pmc(emul_to_vcpu(ctxt), pmc, pdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void emulator_halt(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> {</div><div class='ctx'> 	emul_to_vcpu(ctxt)-&gt;arch.halt_request = 1;</div><div class='hunk'>@@ -4679,6 +4204,7 @@ static struct x86_emulate_ops emulate_ops = {</div><div class='ctx'> 	.set_dr              = emulator_set_dr,</div><div class='ctx'> 	.set_msr             = emulator_set_msr,</div><div class='ctx'> 	.get_msr             = emulator_get_msr,</div><div class='add'>+	.read_pmc            = emulator_read_pmc,</div><div class='ctx'> 	.halt                = emulator_halt,</div><div class='ctx'> 	.wbinvd              = emulator_wbinvd,</div><div class='ctx'> 	.fix_hypercall       = emulator_fix_hypercall,</div><div class='hunk'>@@ -4836,6 +4362,50 @@ static bool reexecute_instruction(struct kvm_vcpu *vcpu, gva_t gva)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool retry_instruction(struct x86_emulate_ctxt *ctxt,</div><div class='add'>+			      unsigned long cr2,  int emulation_type)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);</div><div class='add'>+	unsigned long last_retry_eip, last_retry_addr, gpa = cr2;</div><div class='add'>+</div><div class='add'>+	last_retry_eip = vcpu-&gt;arch.last_retry_eip;</div><div class='add'>+	last_retry_addr = vcpu-&gt;arch.last_retry_addr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the emulation is caused by #PF and it is non-page_table</div><div class='add'>+	 * writing instruction, it means the VM-EXIT is caused by shadow</div><div class='add'>+	 * page protected, we can zap the shadow page and retry this</div><div class='add'>+	 * instruction directly.</div><div class='add'>+	 *</div><div class='add'>+	 * Note: if the guest uses a non-page-table modifying instruction</div><div class='add'>+	 * on the PDE that points to the instruction, then we will unmap</div><div class='add'>+	 * the instruction and go to an infinite loop. So, we cache the</div><div class='add'>+	 * last retried eip and the last fault address, if we meet the eip</div><div class='add'>+	 * and the address again, we can break out of the potential infinite</div><div class='add'>+	 * loop.</div><div class='add'>+	 */</div><div class='add'>+	vcpu-&gt;arch.last_retry_eip = vcpu-&gt;arch.last_retry_addr = 0;</div><div class='add'>+</div><div class='add'>+	if (!(emulation_type &amp; EMULTYPE_RETRY))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (x86_page_table_writing_insn(ctxt))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (ctxt-&gt;eip == last_retry_eip &amp;&amp; last_retry_addr == cr2)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	vcpu-&gt;arch.last_retry_eip = ctxt-&gt;eip;</div><div class='add'>+	vcpu-&gt;arch.last_retry_addr = cr2;</div><div class='add'>+</div><div class='add'>+	if (!vcpu-&gt;arch.mmu.direct_map)</div><div class='add'>+		gpa = kvm_mmu_gva_to_gpa_write(vcpu, cr2, NULL);</div><div class='add'>+</div><div class='add'>+	kvm_mmu_unprotect_page(vcpu-&gt;kvm, gpa &gt;&gt; PAGE_SHIFT);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int x86_emulate_instruction(struct kvm_vcpu *vcpu,</div><div class='ctx'> 			    unsigned long cr2,</div><div class='ctx'> 			    int emulation_type,</div><div class='hunk'>@@ -4877,6 +4447,9 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		return EMULATE_DONE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (retry_instruction(ctxt, cr2, emulation_type))</div><div class='add'>+		return EMULATE_DONE;</div><div class='add'>+</div><div class='ctx'> 	/* this is needed for vmware backdoor interface to work since it</div><div class='ctx'> 	   changes registers values  during IO operation */</div><div class='ctx'> 	if (vcpu-&gt;arch.emulate_regs_need_sync_from_vcpu) {</div><div class='hunk'>@@ -5095,17 +4668,17 @@ static void kvm_timer_init(void)</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU(struct kvm_vcpu *, current_vcpu);</div><div class='ctx'> </div><div class='del'>-static int kvm_is_in_guest(void)</div><div class='add'>+int kvm_is_in_guest(void)</div><div class='ctx'> {</div><div class='del'>-	return percpu_read(current_vcpu) != NULL;</div><div class='add'>+	return __this_cpu_read(current_vcpu) != NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int kvm_is_user_mode(void)</div><div class='ctx'> {</div><div class='ctx'> 	int user_mode = 3;</div><div class='ctx'> </div><div class='del'>-	if (percpu_read(current_vcpu))</div><div class='del'>-		user_mode = kvm_x86_ops-&gt;get_cpl(percpu_read(current_vcpu));</div><div class='add'>+	if (__this_cpu_read(current_vcpu))</div><div class='add'>+		user_mode = kvm_x86_ops-&gt;get_cpl(__this_cpu_read(current_vcpu));</div><div class='ctx'> </div><div class='ctx'> 	return user_mode != 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -5114,8 +4687,8 @@ static unsigned long kvm_get_guest_ip(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ip = 0;</div><div class='ctx'> </div><div class='del'>-	if (percpu_read(current_vcpu))</div><div class='del'>-		ip = kvm_rip_read(percpu_read(current_vcpu));</div><div class='add'>+	if (__this_cpu_read(current_vcpu))</div><div class='add'>+		ip = kvm_rip_read(__this_cpu_read(current_vcpu));</div><div class='ctx'> </div><div class='ctx'> 	return ip;</div><div class='ctx'> }</div><div class='hunk'>@@ -5128,13 +4701,13 @@ static struct perf_guest_info_callbacks kvm_guest_cbs = {</div><div class='ctx'> </div><div class='ctx'> void kvm_before_handle_nmi(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	percpu_write(current_vcpu, vcpu);</div><div class='add'>+	__this_cpu_write(current_vcpu, vcpu);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_before_handle_nmi);</div><div class='ctx'> </div><div class='ctx'> void kvm_after_handle_nmi(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	percpu_write(current_vcpu, NULL);</div><div class='add'>+	__this_cpu_write(current_vcpu, NULL);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_after_handle_nmi);</div><div class='ctx'> </div><div class='hunk'>@@ -5233,15 +4806,6 @@ int kvm_emulate_halt(struct kvm_vcpu *vcpu)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(kvm_emulate_halt);</div><div class='ctx'> </div><div class='del'>-static inline gpa_t hc_gpa(struct kvm_vcpu *vcpu, unsigned long a0,</div><div class='del'>-			   unsigned long a1)</div><div class='del'>-{</div><div class='del'>-	if (is_long_mode(vcpu))</div><div class='del'>-		return a0;</div><div class='del'>-	else</div><div class='del'>-		return a0 | ((gpa_t)a1 &lt;&lt; 32);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int kvm_hv_hypercall(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	u64 param, ingpa, outgpa, ret;</div><div class='hunk'>@@ -5337,9 +4901,6 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	case KVM_HC_VAPIC_POLL_IRQ:</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		break;</div><div class='del'>-	case KVM_HC_MMU_OP:</div><div class='del'>-		r = kvm_pv_mmu_op(vcpu, a0, hc_gpa(vcpu, a1, a2), &amp;ret);</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -KVM_ENOSYS;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -5369,125 +4930,6 @@ int emulator_fix_hypercall(struct x86_emulate_ctxt *ctxt)</div><div class='ctx'> 	return emulator_write_emulated(ctxt, rip, instruction, 3, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int move_to_next_stateful_cpuid_entry(struct kvm_vcpu *vcpu, int i)</div><div class='del'>-{</div><div class='del'>-	struct kvm_cpuid_entry2 *e = &amp;vcpu-&gt;arch.cpuid_entries[i];</div><div class='del'>-	int j, nent = vcpu-&gt;arch.cpuid_nent;</div><div class='del'>-</div><div class='del'>-	e-&gt;flags &amp;= ~KVM_CPUID_FLAG_STATE_READ_NEXT;</div><div class='del'>-	/* when no next entry is found, the current entry[i] is reselected */</div><div class='del'>-	for (j = i + 1; ; j = (j + 1) % nent) {</div><div class='del'>-		struct kvm_cpuid_entry2 *ej = &amp;vcpu-&gt;arch.cpuid_entries[j];</div><div class='del'>-		if (ej-&gt;function == e-&gt;function) {</div><div class='del'>-			ej-&gt;flags |= KVM_CPUID_FLAG_STATE_READ_NEXT;</div><div class='del'>-			return j;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0; /* silence gcc, even though control never reaches here */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* find an entry with matching function, matching index (if needed), and that</div><div class='del'>- * should be read next (if it's stateful) */</div><div class='del'>-static int is_matching_cpuid_entry(struct kvm_cpuid_entry2 *e,</div><div class='del'>-	u32 function, u32 index)</div><div class='del'>-{</div><div class='del'>-	if (e-&gt;function != function)</div><div class='del'>-		return 0;</div><div class='del'>-	if ((e-&gt;flags &amp; KVM_CPUID_FLAG_SIGNIFCANT_INDEX) &amp;&amp; e-&gt;index != index)</div><div class='del'>-		return 0;</div><div class='del'>-	if ((e-&gt;flags &amp; KVM_CPUID_FLAG_STATEFUL_FUNC) &amp;&amp;</div><div class='del'>-	    !(e-&gt;flags &amp; KVM_CPUID_FLAG_STATE_READ_NEXT))</div><div class='del'>-		return 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu,</div><div class='del'>-					      u32 function, u32 index)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct kvm_cpuid_entry2 *best = NULL;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; vcpu-&gt;arch.cpuid_nent; ++i) {</div><div class='del'>-		struct kvm_cpuid_entry2 *e;</div><div class='del'>-</div><div class='del'>-		e = &amp;vcpu-&gt;arch.cpuid_entries[i];</div><div class='del'>-		if (is_matching_cpuid_entry(e, function, index)) {</div><div class='del'>-			if (e-&gt;flags &amp; KVM_CPUID_FLAG_STATEFUL_FUNC)</div><div class='del'>-				move_to_next_stateful_cpuid_entry(vcpu, i);</div><div class='del'>-			best = e;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return best;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(kvm_find_cpuid_entry);</div><div class='del'>-</div><div class='del'>-int cpuid_maxphyaddr(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	struct kvm_cpuid_entry2 *best;</div><div class='del'>-</div><div class='del'>-	best = kvm_find_cpuid_entry(vcpu, 0x80000000, 0);</div><div class='del'>-	if (!best || best-&gt;eax &lt; 0x80000008)</div><div class='del'>-		goto not_found;</div><div class='del'>-	best = kvm_find_cpuid_entry(vcpu, 0x80000008, 0);</div><div class='del'>-	if (best)</div><div class='del'>-		return best-&gt;eax &amp; 0xff;</div><div class='del'>-not_found:</div><div class='del'>-	return 36;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If no match is found, check whether we exceed the vCPU's limit</div><div class='del'>- * and return the content of the highest valid _standard_ leaf instead.</div><div class='del'>- * This is to satisfy the CPUID specification.</div><div class='del'>- */</div><div class='del'>-static struct kvm_cpuid_entry2* check_cpuid_limit(struct kvm_vcpu *vcpu,</div><div class='del'>-                                                  u32 function, u32 index)</div><div class='del'>-{</div><div class='del'>-	struct kvm_cpuid_entry2 *maxlevel;</div><div class='del'>-</div><div class='del'>-	maxlevel = kvm_find_cpuid_entry(vcpu, function &amp; 0x80000000, 0);</div><div class='del'>-	if (!maxlevel || maxlevel-&gt;eax &gt;= function)</div><div class='del'>-		return NULL;</div><div class='del'>-	if (function &amp; 0x80000000) {</div><div class='del'>-		maxlevel = kvm_find_cpuid_entry(vcpu, 0, 0);</div><div class='del'>-		if (!maxlevel)</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-	return kvm_find_cpuid_entry(vcpu, maxlevel-&gt;eax, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void kvm_emulate_cpuid(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	u32 function, index;</div><div class='del'>-	struct kvm_cpuid_entry2 *best;</div><div class='del'>-</div><div class='del'>-	function = kvm_register_read(vcpu, VCPU_REGS_RAX);</div><div class='del'>-	index = kvm_register_read(vcpu, VCPU_REGS_RCX);</div><div class='del'>-	kvm_register_write(vcpu, VCPU_REGS_RAX, 0);</div><div class='del'>-	kvm_register_write(vcpu, VCPU_REGS_RBX, 0);</div><div class='del'>-	kvm_register_write(vcpu, VCPU_REGS_RCX, 0);</div><div class='del'>-	kvm_register_write(vcpu, VCPU_REGS_RDX, 0);</div><div class='del'>-	best = kvm_find_cpuid_entry(vcpu, function, index);</div><div class='del'>-</div><div class='del'>-	if (!best)</div><div class='del'>-		best = check_cpuid_limit(vcpu, function, index);</div><div class='del'>-</div><div class='del'>-	if (best) {</div><div class='del'>-		kvm_register_write(vcpu, VCPU_REGS_RAX, best-&gt;eax);</div><div class='del'>-		kvm_register_write(vcpu, VCPU_REGS_RBX, best-&gt;ebx);</div><div class='del'>-		kvm_register_write(vcpu, VCPU_REGS_RCX, best-&gt;ecx);</div><div class='del'>-		kvm_register_write(vcpu, VCPU_REGS_RDX, best-&gt;edx);</div><div class='del'>-	}</div><div class='del'>-	kvm_x86_ops-&gt;skip_emulated_instruction(vcpu);</div><div class='del'>-	trace_kvm_cpuid(function,</div><div class='del'>-			kvm_register_read(vcpu, VCPU_REGS_RAX),</div><div class='del'>-			kvm_register_read(vcpu, VCPU_REGS_RBX),</div><div class='del'>-			kvm_register_read(vcpu, VCPU_REGS_RCX),</div><div class='del'>-			kvm_register_read(vcpu, VCPU_REGS_RDX));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(kvm_emulate_cpuid);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Check if userspace requested an interrupt window, and that the</div><div class='ctx'>  * interrupt window is open.</div><div class='hunk'>@@ -5648,6 +5090,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	int r;</div><div class='ctx'> 	bool req_int_win = !irqchip_in_kernel(vcpu-&gt;kvm) &amp;&amp;</div><div class='ctx'> 		vcpu-&gt;run-&gt;request_interrupt_window;</div><div class='add'>+	bool req_immediate_exit = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (vcpu-&gt;requests) {</div><div class='ctx'> 		if (kvm_check_request(KVM_REQ_MMU_RELOAD, vcpu))</div><div class='hunk'>@@ -5687,7 +5130,12 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)</div><div class='ctx'> 			record_steal_time(vcpu);</div><div class='ctx'> 		if (kvm_check_request(KVM_REQ_NMI, vcpu))</div><div class='ctx'> 			process_nmi(vcpu);</div><div class='del'>-</div><div class='add'>+		req_immediate_exit =</div><div class='add'>+			kvm_check_request(KVM_REQ_IMMEDIATE_EXIT, vcpu);</div><div class='add'>+		if (kvm_check_request(KVM_REQ_PMU, vcpu))</div><div class='add'>+			kvm_handle_pmu_event(vcpu);</div><div class='add'>+		if (kvm_check_request(KVM_REQ_PMI, vcpu))</div><div class='add'>+			kvm_deliver_pmi(vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	r = kvm_mmu_reload(vcpu);</div><div class='hunk'>@@ -5738,6 +5186,9 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	srcu_read_unlock(&amp;vcpu-&gt;kvm-&gt;srcu, vcpu-&gt;srcu_idx);</div><div class='ctx'> </div><div class='add'>+	if (req_immediate_exit)</div><div class='add'>+		smp_send_reschedule(vcpu-&gt;cpu);</div><div class='add'>+</div><div class='ctx'> 	kvm_guest_enter();</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(vcpu-&gt;arch.switch_db_regs)) {</div><div class='hunk'>@@ -5943,10 +5394,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)</div><div class='ctx'> 	if (r &lt;= 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (kvm_run-&gt;exit_reason == KVM_EXIT_HYPERCALL)</div><div class='del'>-		kvm_register_write(vcpu, VCPU_REGS_RAX,</div><div class='del'>-				     kvm_run-&gt;hypercall.ret);</div><div class='del'>-</div><div class='ctx'> 	r = __vcpu_run(vcpu);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -6148,7 +5595,7 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,</div><div class='ctx'> 	mmu_reset_needed |= kvm_read_cr4(vcpu) != sregs-&gt;cr4;</div><div class='ctx'> 	kvm_x86_ops-&gt;set_cr4(vcpu, sregs-&gt;cr4);</div><div class='ctx'> 	if (sregs-&gt;cr4 &amp; X86_CR4_OSXSAVE)</div><div class='del'>-		update_cpuid(vcpu);</div><div class='add'>+		kvm_update_cpuid(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	idx = srcu_read_lock(&amp;vcpu-&gt;kvm-&gt;srcu);</div><div class='ctx'> 	if (!is_long_mode(vcpu) &amp;&amp; is_pae(vcpu)) {</div><div class='hunk'>@@ -6425,6 +5872,8 @@ int kvm_arch_vcpu_reset(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	kvm_async_pf_hash_reset(vcpu);</div><div class='ctx'> 	vcpu-&gt;arch.apf.halted = false;</div><div class='ctx'> </div><div class='add'>+	kvm_pmu_reset(vcpu);</div><div class='add'>+</div><div class='ctx'> 	return kvm_x86_ops-&gt;vcpu_reset(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6473,10 +5922,6 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	kvm = vcpu-&gt;kvm;</div><div class='ctx'> </div><div class='ctx'> 	vcpu-&gt;arch.emulate_ctxt.ops = &amp;emulate_ops;</div><div class='del'>-	vcpu-&gt;arch.walk_mmu = &amp;vcpu-&gt;arch.mmu;</div><div class='del'>-	vcpu-&gt;arch.mmu.root_hpa = INVALID_PAGE;</div><div class='del'>-	vcpu-&gt;arch.mmu.translate_gpa = translate_gpa;</div><div class='del'>-	vcpu-&gt;arch.nested_mmu.translate_gpa = translate_nested_gpa;</div><div class='ctx'> 	if (!irqchip_in_kernel(kvm) || kvm_vcpu_is_bsp(vcpu))</div><div class='ctx'> 		vcpu-&gt;arch.mp_state = KVM_MP_STATE_RUNNABLE;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -6513,6 +5958,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		goto fail_free_mce_banks;</div><div class='ctx'> </div><div class='ctx'> 	kvm_async_pf_hash_reset(vcpu);</div><div class='add'>+	kvm_pmu_init(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> fail_free_mce_banks:</div><div class='hunk'>@@ -6531,6 +5977,7 @@ void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	int idx;</div><div class='ctx'> </div><div class='add'>+	kvm_pmu_destroy(vcpu);</div><div class='ctx'> 	kfree(vcpu-&gt;arch.mce_banks);</div><div class='ctx'> 	kvm_free_lapic(vcpu);</div><div class='ctx'> 	idx = srcu_read_lock(&amp;vcpu-&gt;kvm-&gt;srcu);</div><div class='head'>diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h<br/>index d36fe237c665..cb80c293cdd8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/kvm/x86.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/kvm/x86.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/kvm/x86.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/kvm/x86.h</a></div><div class='hunk'>@@ -33,9 +33,6 @@ static inline bool kvm_exception_is_soft(unsigned int nr)</div><div class='ctx'> 	return (nr == BP_VECTOR) || (nr == OF_VECTOR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu,</div><div class='del'>-                                             u32 function, u32 index);</div><div class='del'>-</div><div class='ctx'> static inline bool is_protmode(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	return kvm_read_cr0_bits(vcpu, X86_CR0_PE);</div><div class='hunk'>@@ -125,4 +122,6 @@ int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt,</div><div class='ctx'> 	gva_t addr, void *val, unsigned int bytes,</div><div class='ctx'> 	struct x86_exception *exception);</div><div class='ctx'> </div><div class='add'>+extern u64 host_xcr0;</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c<br/>index cf4603ba866f..642d8805bc1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/lguest/boot.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/lguest/boot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/lguest/boot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/lguest/boot.c</a></div><div class='hunk'>@@ -856,18 +856,23 @@ static void __init lguest_init_IRQ(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * With CONFIG_SPARSE_IRQ, interrupt descriptors are allocated as-needed, so</div><div class='del'>- * rather than set them in lguest_init_IRQ we are called here every time an</div><div class='del'>- * lguest device needs an interrupt.</div><div class='del'>- *</div><div class='del'>- * FIXME: irq_alloc_desc_at() can fail due to lack of memory, we should</div><div class='del'>- * pass that up!</div><div class='add'>+ * Interrupt descriptors are allocated as-needed, but low-numbered ones are</div><div class='add'>+ * reserved by the generic x86 code.  So we ignore irq_alloc_desc_at if it</div><div class='add'>+ * tells us the irq is already used: other errors (ie. ENOMEM) we take</div><div class='add'>+ * seriously.</div><div class='ctx'>  */</div><div class='del'>-void lguest_setup_irq(unsigned int irq)</div><div class='add'>+int lguest_setup_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	irq_alloc_desc_at(irq, 0);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Returns -ve error or vector number. */</div><div class='add'>+	err = irq_alloc_desc_at(irq, 0);</div><div class='add'>+	if (err &lt; 0 &amp;&amp; err != -EEXIST)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	irq_set_chip_and_handler_name(irq, &amp;lguest_irq_controller,</div><div class='ctx'> 				      handle_level_irq, "level");</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/arch/x86/lib/x86-opcode-map.txt b/arch/x86/lib/x86-opcode-map.txt<br/>index 5b83c51c12e0..819137904428 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/lib/x86-opcode-map.txt?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/lib/x86-opcode-map.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/lib/x86-opcode-map.txt?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/lib/x86-opcode-map.txt</a></div><div class='hunk'>@@ -219,7 +219,9 @@ ab: STOS/W/D/Q Yv,rAX</div><div class='ctx'> ac: LODS/B AL,Xb</div><div class='ctx'> ad: LODS/W/D/Q rAX,Xv</div><div class='ctx'> ae: SCAS/B AL,Yb</div><div class='del'>-af: SCAS/W/D/Q rAX,Xv</div><div class='add'>+# Note: The May 2011 Intel manual shows Xv for the second parameter of the</div><div class='add'>+# next instruction but Yv is correct</div><div class='add'>+af: SCAS/W/D/Q rAX,Yv</div><div class='ctx'> # 0xb0 - 0xbf</div><div class='ctx'> b0: MOV AL/R8L,Ib</div><div class='ctx'> b1: MOV CL/R9L,Ib</div><div class='hunk'>@@ -729,8 +731,8 @@ de: VAESDEC Vdq,Hdq,Wdq (66),(v1)</div><div class='ctx'> df: VAESDECLAST Vdq,Hdq,Wdq (66),(v1)</div><div class='ctx'> f0: MOVBE Gy,My | MOVBE Gw,Mw (66) | CRC32 Gd,Eb (F2)</div><div class='ctx'> f1: MOVBE My,Gy | MOVBE Mw,Gw (66) | CRC32 Gd,Ey (F2)</div><div class='del'>-f3: ANDN Gy,By,Ey (v)</div><div class='del'>-f4: Grp17 (1A)</div><div class='add'>+f2: ANDN Gy,By,Ey (v)</div><div class='add'>+f3: Grp17 (1A)</div><div class='ctx'> f5: BZHI Gy,Ey,By (v) | PEXT Gy,By,Ey (F3),(v) | PDEP Gy,By,Ey (F2),(v)</div><div class='ctx'> f6: MULX By,Gy,rDX,Ey (F2),(v)</div><div class='ctx'> f7: BEXTR Gy,Ey,By (v) | SHLX Gy,Ey,By (66),(v) | SARX Gy,Ey,By (F3),(v) | SHRX Gy,Ey,By (F2),(v)</div><div class='head'>diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c<br/>index a298914058f9..6cabf6570d64 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mm/init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mm/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/mm/init.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/memblock.h&gt;</div><div class='add'>+#include &lt;linux/bootmem.h&gt;	/* for max_low_pfn */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/e820.h&gt;</div><div class='hunk'>@@ -15,6 +16,7 @@</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='add'>+#include &lt;asm/dma.h&gt;		/* for MAX_DMA_PFN */</div><div class='ctx'> </div><div class='ctx'> unsigned long __initdata pgt_buf_start;</div><div class='ctx'> unsigned long __meminitdata pgt_buf_end;</div><div class='hunk'>@@ -392,3 +394,24 @@ void free_initrd_mem(unsigned long start, unsigned long end)</div><div class='ctx'> 	free_init_pages("initrd memory", start, PAGE_ALIGN(end));</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+void __init zone_sizes_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long max_zone_pfns[MAX_NR_ZONES];</div><div class='add'>+</div><div class='add'>+	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ZONE_DMA</div><div class='add'>+	max_zone_pfns[ZONE_DMA]		= MAX_DMA_PFN;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_ZONE_DMA32</div><div class='add'>+	max_zone_pfns[ZONE_DMA32]	= MAX_DMA32_PFN;</div><div class='add'>+#endif</div><div class='add'>+	max_zone_pfns[ZONE_NORMAL]	= max_low_pfn;</div><div class='add'>+#ifdef CONFIG_HIGHMEM</div><div class='add'>+	max_zone_pfns[ZONE_HIGHMEM]	= max_pfn;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	free_area_init_nodes(max_zone_pfns);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c<br/>index 0c1da394a634..8663f6c47ccb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mm/init_32.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/mm/init_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mm/init_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/mm/init_32.c</a></div><div class='hunk'>@@ -668,22 +668,6 @@ void __init initmem_init(void)</div><div class='ctx'> }</div><div class='ctx'> #endif /* !CONFIG_NEED_MULTIPLE_NODES */</div><div class='ctx'> </div><div class='del'>-static void __init zone_sizes_init(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long max_zone_pfns[MAX_NR_ZONES];</div><div class='del'>-	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));</div><div class='del'>-#ifdef CONFIG_ZONE_DMA</div><div class='del'>-	max_zone_pfns[ZONE_DMA] =</div><div class='del'>-		virt_to_phys((char *)MAX_DMA_ADDRESS) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-#endif</div><div class='del'>-	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;</div><div class='del'>-#ifdef CONFIG_HIGHMEM</div><div class='del'>-	max_zone_pfns[ZONE_HIGHMEM] = highend_pfn;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	free_area_init_nodes(max_zone_pfns);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __init setup_bootmem_allocator(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO "  mapped low ram: 0 - %08lx\n",</div><div class='hunk'>@@ -754,6 +738,17 @@ void __init mem_init(void)</div><div class='ctx'> #ifdef CONFIG_FLATMEM</div><div class='ctx'> 	BUG_ON(!mem_map);</div><div class='ctx'> #endif</div><div class='add'>+	/*</div><div class='add'>+	 * With CONFIG_DEBUG_PAGEALLOC initialization of highmem pages has to</div><div class='add'>+	 * be done before free_all_bootmem(). Memblock use free low memory for</div><div class='add'>+	 * temporary data (see find_range_array()) and for this purpose can use</div><div class='add'>+	 * pages that was already passed to the buddy allocator, hence marked as</div><div class='add'>+	 * not accessible in the page tables when compiled with</div><div class='add'>+	 * CONFIG_DEBUG_PAGEALLOC. Otherwise order of initialization is not</div><div class='add'>+	 * important here.</div><div class='add'>+	 */</div><div class='add'>+	set_highmem_pages_init();</div><div class='add'>+</div><div class='ctx'> 	/* this will put all low memory onto the freelists */</div><div class='ctx'> 	totalram_pages += free_all_bootmem();</div><div class='ctx'> </div><div class='hunk'>@@ -765,8 +760,6 @@ void __init mem_init(void)</div><div class='ctx'> 		if (page_is_ram(tmp) &amp;&amp; PageReserved(pfn_to_page(tmp)))</div><div class='ctx'> 			reservedpages++;</div><div class='ctx'> </div><div class='del'>-	set_highmem_pages_init();</div><div class='del'>-</div><div class='ctx'> 	codesize =  (unsigned long) &amp;_etext - (unsigned long) &amp;_text;</div><div class='ctx'> 	datasize =  (unsigned long) &amp;_edata - (unsigned long) &amp;_etext;</div><div class='ctx'> 	initsize =  (unsigned long) &amp;__init_end - (unsigned long) &amp;__init_begin;</div><div class='head'>diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c<br/>index a8a56ce3a962..436a0309db33 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mm/init_64.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/mm/init_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mm/init_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/mm/init_64.c</a></div><div class='hunk'>@@ -614,15 +614,6 @@ void __init initmem_init(void)</div><div class='ctx'> </div><div class='ctx'> void __init paging_init(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long max_zone_pfns[MAX_NR_ZONES];</div><div class='del'>-</div><div class='del'>-	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));</div><div class='del'>-#ifdef CONFIG_ZONE_DMA</div><div class='del'>-	max_zone_pfns[ZONE_DMA] = MAX_DMA_PFN;</div><div class='del'>-#endif</div><div class='del'>-	max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;</div><div class='del'>-	max_zone_pfns[ZONE_NORMAL] = max_pfn;</div><div class='del'>-</div><div class='ctx'> 	sparse_memory_present_with_active_regions(MAX_NUMNODES);</div><div class='ctx'> 	sparse_init();</div><div class='ctx'> </div><div class='hunk'>@@ -634,7 +625,7 @@ void __init paging_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	node_clear_state(0, N_NORMAL_MEMORY);</div><div class='ctx'> </div><div class='del'>-	free_area_init_nodes(max_zone_pfns);</div><div class='add'>+	zone_sizes_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c<br/>index 4b5ba85eb5c9..845df6835f9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mm/mmap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/mm/mmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mm/mmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/mm/mmap.c</a></div><div class='hunk'>@@ -75,9 +75,9 @@ static unsigned long mmap_rnd(void)</div><div class='ctx'> 	*/</div><div class='ctx'> 	if (current-&gt;flags &amp; PF_RANDOMIZE) {</div><div class='ctx'> 		if (mmap_is_ia32())</div><div class='del'>-			rnd = (long)get_random_int() % (1&lt;&lt;8);</div><div class='add'>+			rnd = get_random_int() % (1&lt;&lt;8);</div><div class='ctx'> 		else</div><div class='del'>-			rnd = (long)(get_random_int() % (1&lt;&lt;28));</div><div class='add'>+			rnd = get_random_int() % (1&lt;&lt;28);</div><div class='ctx'> 	}</div><div class='ctx'> 	return rnd &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c<br/>index de54b9b278a7..dc0b727742f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mm/mmio-mod.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/mm/mmio-mod.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mm/mmio-mod.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/mm/mmio-mod.c</a></div><div class='hunk'>@@ -75,8 +75,8 @@ static LIST_HEAD(trace_list);		/* struct remap_trace */</div><div class='ctx'> </div><div class='ctx'> /* module parameters */</div><div class='ctx'> static unsigned long	filter_offset;</div><div class='del'>-static int		nommiotrace;</div><div class='del'>-static int		trace_pc;</div><div class='add'>+static bool		nommiotrace;</div><div class='add'>+static bool		trace_pc;</div><div class='ctx'> </div><div class='ctx'> module_param(filter_offset, ulong, 0);</div><div class='ctx'> module_param(nommiotrace, bool, 0);</div><div class='head'>diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c<br/>index 496f494593bf..19d3fa08b119 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mm/numa.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/mm/numa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mm/numa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/mm/numa.c</a></div><div class='hunk'>@@ -110,7 +110,7 @@ void __cpuinit numa_clear_node(int cpu)</div><div class='ctx'>  * Allocate node_to_cpumask_map based on number of available nodes</div><div class='ctx'>  * Requires node_possible_map to be valid.</div><div class='ctx'>  *</div><div class='del'>- * Note: node_to_cpumask() is not valid until after this is done.</div><div class='add'>+ * Note: cpumask_of_node() is not valid until after this is done.</div><div class='ctx'>  * (Use CONFIG_DEBUG_PER_CPU_MAPS to check this.)</div><div class='ctx'>  */</div><div class='ctx'> void __init setup_node_to_cpumask_map(void)</div><div class='hunk'>@@ -422,8 +422,9 @@ static int __init numa_alloc_distance(void)</div><div class='ctx'>  * calls are ignored until the distance table is reset with</div><div class='ctx'>  * numa_reset_distance().</div><div class='ctx'>  *</div><div class='del'>- * If @from or @to is higher than the highest known node at the time of</div><div class='del'>- * table creation or @distance doesn't make sense, the call is ignored.</div><div class='add'>+ * If @from or @to is higher than the highest known node or lower than zero</div><div class='add'>+ * at the time of table creation or @distance doesn't make sense, the call</div><div class='add'>+ * is ignored.</div><div class='ctx'>  * This is to allow simplification of specific NUMA config implementations.</div><div class='ctx'>  */</div><div class='ctx'> void __init numa_set_distance(int from, int to, int distance)</div><div class='hunk'>@@ -431,8 +432,9 @@ void __init numa_set_distance(int from, int to, int distance)</div><div class='ctx'> 	if (!numa_distance &amp;&amp; numa_alloc_distance() &lt; 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (from &gt;= numa_distance_cnt || to &gt;= numa_distance_cnt) {</div><div class='del'>-		printk_once(KERN_DEBUG "NUMA: Debug: distance out of bound, from=%d to=%d distance=%d\n",</div><div class='add'>+	if (from &gt;= numa_distance_cnt || to &gt;= numa_distance_cnt ||</div><div class='add'>+			from &lt; 0 || to &lt; 0) {</div><div class='add'>+		pr_warn_once("NUMA: Warning: node ids are out of bound, from=%d to=%d distance=%d\n",</div><div class='ctx'> 			    from, to, distance);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c<br/>index eda2acbb6e81..e1ebde315210 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mm/pageattr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/mm/pageattr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mm/pageattr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/mm/pageattr.c</a></div><div class='hunk'>@@ -1334,12 +1334,6 @@ void kernel_map_pages(struct page *page, int numpages, int enable)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If page allocator is not up yet then do not call c_p_a():</div><div class='del'>-	 */</div><div class='del'>-	if (!debug_pagealloc_enabled)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * The return value is ignored as the calls cannot fail.</div><div class='ctx'> 	 * Large pages for identity mappings are not used at boot time</div><div class='ctx'> 	 * and hence no memory allocations during large page split.</div><div class='head'>diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c<br/>index fd61b3fb7341..1c1c4f46a7c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/mm/srat.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/mm/srat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/mm/srat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/mm/srat.c</a></div><div class='hunk'>@@ -109,6 +109,8 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)</div><div class='ctx'> 	if ((pa-&gt;flags &amp; ACPI_SRAT_CPU_ENABLED) == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> 	pxm = pa-&gt;proximity_domain_lo;</div><div class='add'>+	if (acpi_srat_revision &gt;= 2)</div><div class='add'>+		pxm |= *((unsigned int*)pa-&gt;proximity_domain_hi) &lt;&lt; 8;</div><div class='ctx'> 	node = setup_node(pxm);</div><div class='ctx'> 	if (node &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);</div><div class='hunk'>@@ -160,6 +162,8 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)</div><div class='ctx'> 	start = ma-&gt;base_address;</div><div class='ctx'> 	end = start + ma-&gt;length;</div><div class='ctx'> 	pxm = ma-&gt;proximity_domain;</div><div class='add'>+	if (acpi_srat_revision &lt;= 1)</div><div class='add'>+		pxm &amp;= 0xff;</div><div class='ctx'> 	node = setup_node(pxm);</div><div class='ctx'> 	if (node &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "SRAT: Too many proximity domains.\n");</div><div class='head'>diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile<br/>index 6b8759f7634e..e76e18c94a3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/pci/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/pci/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/pci/Makefile</a></div><div class='hunk'>@@ -15,11 +15,12 @@ obj-$(CONFIG_X86_VISWS)		+= visws.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_X86_NUMAQ)		+= numaq_32.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_X86_MRST)		+= mrst.o</div><div class='add'>+obj-$(CONFIG_X86_INTEL_MID)	+= mrst.o</div><div class='ctx'> </div><div class='ctx'> obj-y				+= common.o early.o</div><div class='del'>-obj-y				+= amd_bus.o bus_numa.o</div><div class='add'>+obj-y				+= bus_numa.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_AMD_NB)		+= amd_bus.o</div><div class='ctx'> obj-$(CONFIG_PCI_CNB20LE_QUIRK)	+= broadcom_bus.o</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_PCI_DEBUG),y)</div><div class='head'>diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c<br/>index 404f21a3ff9e..a312e76063a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/pci/acpi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/acpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/pci/acpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/pci/acpi.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@ struct pci_root_info {</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	unsigned int res_num;</div><div class='ctx'> 	struct resource *res;</div><div class='del'>-	struct pci_bus *bus;</div><div class='add'>+	struct list_head *resources;</div><div class='ctx'> 	int busnum;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -24,6 +24,12 @@ static int __init set_use_crs(const struct dmi_system_id *id)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __init set_nouse_crs(const struct dmi_system_id *id)</div><div class='add'>+{</div><div class='add'>+	pci_use_crs = false;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct dmi_system_id pci_use_crs_table[] __initconst = {</div><div class='ctx'> 	/* http://bugzilla.kernel.org/show_bug.cgi?id=14183 */</div><div class='ctx'> 	{</div><div class='hunk'>@@ -54,6 +60,29 @@ static const struct dmi_system_id pci_use_crs_table[] __initconst = {</div><div class='ctx'> 			DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+</div><div class='add'>+	/* Now for the blacklist.. */</div><div class='add'>+</div><div class='add'>+	/* https://bugzilla.redhat.com/show_bug.cgi?id=769657 */</div><div class='add'>+	{</div><div class='add'>+		.callback = set_nouse_crs,</div><div class='add'>+		.ident = "Dell Studio 1557",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "Dell Inc."),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1557"),</div><div class='add'>+			DMI_MATCH(DMI_BIOS_VERSION, "A09"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	/* https://bugzilla.redhat.com/show_bug.cgi?id=769657 */</div><div class='add'>+	{</div><div class='add'>+		.callback = set_nouse_crs,</div><div class='add'>+		.ident = "Thinkpad SL510",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),</div><div class='add'>+			DMI_MATCH(DMI_BOARD_NAME, "2847DFG"),</div><div class='add'>+			DMI_MATCH(DMI_BIOS_VERSION, "6JET85WW (1.43 )"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -149,7 +178,7 @@ setup_resource(struct acpi_resource *acpi_res, void *data)</div><div class='ctx'> 	struct acpi_resource_address64 addr;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	u64 start, end;</div><div class='add'>+	u64 start, orig_end, end;</div><div class='ctx'> </div><div class='ctx'> 	status = resource_to_addr(acpi_res, &amp;addr);</div><div class='ctx'> 	if (!ACPI_SUCCESS(status))</div><div class='hunk'>@@ -165,7 +194,21 @@ setup_resource(struct acpi_resource *acpi_res, void *data)</div><div class='ctx'> 		return AE_OK;</div><div class='ctx'> </div><div class='ctx'> 	start = addr.minimum + addr.translation_offset;</div><div class='del'>-	end = addr.maximum + addr.translation_offset;</div><div class='add'>+	orig_end = end = addr.maximum + addr.translation_offset;</div><div class='add'>+</div><div class='add'>+	/* Exclude non-addressable range or non-addressable portion of range */</div><div class='add'>+	end = min(end, (u64)iomem_resource.end);</div><div class='add'>+	if (end &lt;= start) {</div><div class='add'>+		dev_info(&amp;info-&gt;bridge-&gt;dev,</div><div class='add'>+			"host bridge window [%#llx-%#llx] "</div><div class='add'>+			"(ignored, not CPU addressable)\n", start, orig_end);</div><div class='add'>+		return AE_OK;</div><div class='add'>+	} else if (orig_end != end) {</div><div class='add'>+		dev_info(&amp;info-&gt;bridge-&gt;dev,</div><div class='add'>+			"host bridge window [%#llx-%#llx] "</div><div class='add'>+			"([%#llx-%#llx] ignored, not CPU addressable)\n", </div><div class='add'>+			start, orig_end, end + 1, orig_end);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	res = &amp;info-&gt;res[info-&gt;res_num];</div><div class='ctx'> 	res-&gt;name = info-&gt;name;</div><div class='hunk'>@@ -261,23 +304,20 @@ static void add_resources(struct pci_root_info *info)</div><div class='ctx'> 				 "ignoring host bridge window %pR (conflicts with %s %pR)\n",</div><div class='ctx'> 				 res, conflict-&gt;name, conflict);</div><div class='ctx'> 		else</div><div class='del'>-			pci_bus_add_resource(info-&gt;bus, res, 0);</div><div class='add'>+			pci_add_resource(info-&gt;resources, res);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> get_current_resources(struct acpi_device *device, int busnum,</div><div class='del'>-			int domain, struct pci_bus *bus)</div><div class='add'>+		      int domain, struct list_head *resources)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_root_info info;</div><div class='ctx'> 	size_t size;</div><div class='ctx'> </div><div class='del'>-	if (pci_use_crs)</div><div class='del'>-		pci_bus_remove_resources(bus);</div><div class='del'>-</div><div class='ctx'> 	info.bridge = device;</div><div class='del'>-	info.bus = bus;</div><div class='ctx'> 	info.res_num = 0;</div><div class='add'>+	info.resources = resources;</div><div class='ctx'> 	acpi_walk_resources(device-&gt;handle, METHOD_NAME__CRS, count_resource,</div><div class='ctx'> 				&amp;info);</div><div class='ctx'> 	if (!info.res_num)</div><div class='hunk'>@@ -286,7 +326,7 @@ get_current_resources(struct acpi_device *device, int busnum,</div><div class='ctx'> 	size = sizeof(*info.res) * info.res_num;</div><div class='ctx'> 	info.res = kmalloc(size, GFP_KERNEL);</div><div class='ctx'> 	if (!info.res)</div><div class='del'>-		goto res_alloc_fail;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	info.name = kasprintf(GFP_KERNEL, "PCI Bus %04x:%02x", domain, busnum);</div><div class='ctx'> 	if (!info.name)</div><div class='hunk'>@@ -301,8 +341,6 @@ get_current_resources(struct acpi_device *device, int busnum,</div><div class='ctx'> </div><div class='ctx'> name_alloc_fail:</div><div class='ctx'> 	kfree(info.res);</div><div class='del'>-res_alloc_fail:</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)</div><div class='hunk'>@@ -310,6 +348,7 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)</div><div class='ctx'> 	struct acpi_device *device = root-&gt;device;</div><div class='ctx'> 	int domain = root-&gt;segment;</div><div class='ctx'> 	int busnum = root-&gt;secondary.start;</div><div class='add'>+	LIST_HEAD(resources);</div><div class='ctx'> 	struct pci_bus *bus;</div><div class='ctx'> 	struct pci_sysdata *sd;</div><div class='ctx'> 	int node;</div><div class='hunk'>@@ -364,11 +403,15 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)</div><div class='ctx'> 		memcpy(bus-&gt;sysdata, sd, sizeof(*sd));</div><div class='ctx'> 		kfree(sd);</div><div class='ctx'> 	} else {</div><div class='del'>-		bus = pci_create_bus(NULL, busnum, &amp;pci_root_ops, sd);</div><div class='del'>-		if (bus) {</div><div class='del'>-			get_current_resources(device, busnum, domain, bus);</div><div class='add'>+		get_current_resources(device, busnum, domain, &amp;resources);</div><div class='add'>+		if (list_empty(&amp;resources))</div><div class='add'>+			x86_pci_root_bus_resources(busnum, &amp;resources);</div><div class='add'>+		bus = pci_create_root_bus(NULL, busnum, &amp;pci_root_ops, sd,</div><div class='add'>+					  &amp;resources);</div><div class='add'>+		if (bus)</div><div class='ctx'> 			bus-&gt;subordinate = pci_scan_child_bus(bus);</div><div class='del'>-		}</div><div class='add'>+		else</div><div class='add'>+			pci_free_resource_list(&amp;resources);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* After the PCI-E bus has been walked and all devices discovered,</div><div class='head'>diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c<br/>index 026e4931d162..0567df3890e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/pci/amd_bus.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/amd_bus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/pci/amd_bus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/pci/amd_bus.c</a></div><div class='hunk'>@@ -30,34 +30,6 @@ static struct pci_hostbridge_probe pci_probes[] __initdata = {</div><div class='ctx'> 	{ 0, 0x18, PCI_VENDOR_ID_AMD, 0x1300 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u64 __initdata fam10h_mmconf_start;</div><div class='del'>-static u64 __initdata fam10h_mmconf_end;</div><div class='del'>-static void __init get_pci_mmcfg_amd_fam10h_range(void)</div><div class='del'>-{</div><div class='del'>-	u32 address;</div><div class='del'>-	u64 base, msr;</div><div class='del'>-	unsigned segn_busn_bits;</div><div class='del'>-</div><div class='del'>-	/* assume all cpus from fam10h have mmconf */</div><div class='del'>-        if (boot_cpu_data.x86 &lt; 0x10)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	address = MSR_FAM10H_MMIO_CONF_BASE;</div><div class='del'>-	rdmsrl(address, msr);</div><div class='del'>-</div><div class='del'>-	/* mmconfig is not enable */</div><div class='del'>-	if (!(msr &amp; FAM10H_MMIO_CONF_ENABLE))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	base = msr &amp; (FAM10H_MMIO_CONF_BASE_MASK&lt;&lt;FAM10H_MMIO_CONF_BASE_SHIFT);</div><div class='del'>-</div><div class='del'>-	segn_busn_bits = (msr &gt;&gt; FAM10H_MMIO_CONF_BUSRANGE_SHIFT) &amp;</div><div class='del'>-			 FAM10H_MMIO_CONF_BUSRANGE_MASK;</div><div class='del'>-</div><div class='del'>-	fam10h_mmconf_start = base;</div><div class='del'>-	fam10h_mmconf_end = base + (1ULL&lt;&lt;(segn_busn_bits + 20)) - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define RANGE_NUM 16</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -85,6 +57,9 @@ static int __init early_fill_mp_bus_info(void)</div><div class='ctx'> 	u64 val;</div><div class='ctx'> 	u32 address;</div><div class='ctx'> 	bool found;</div><div class='add'>+	struct resource fam10h_mmconf_res, *fam10h_mmconf;</div><div class='add'>+	u64 fam10h_mmconf_start;</div><div class='add'>+	u64 fam10h_mmconf_end;</div><div class='ctx'> </div><div class='ctx'> 	if (!early_pci_allowed())</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -211,12 +186,17 @@ static int __init early_fill_mp_bus_info(void)</div><div class='ctx'> 		subtract_range(range, RANGE_NUM, 0, end);</div><div class='ctx'> </div><div class='ctx'> 	/* get mmconfig */</div><div class='del'>-	get_pci_mmcfg_amd_fam10h_range();</div><div class='add'>+	fam10h_mmconf = amd_get_mmconfig_range(&amp;fam10h_mmconf_res);</div><div class='ctx'> 	/* need to take out mmconf range */</div><div class='del'>-	if (fam10h_mmconf_end) {</div><div class='del'>-		printk(KERN_DEBUG "Fam 10h mmconf [%llx, %llx]\n", fam10h_mmconf_start, fam10h_mmconf_end);</div><div class='add'>+	if (fam10h_mmconf) {</div><div class='add'>+		printk(KERN_DEBUG "Fam 10h mmconf %pR\n", fam10h_mmconf);</div><div class='add'>+		fam10h_mmconf_start = fam10h_mmconf-&gt;start;</div><div class='add'>+		fam10h_mmconf_end = fam10h_mmconf-&gt;end;</div><div class='ctx'> 		subtract_range(range, RANGE_NUM, fam10h_mmconf_start,</div><div class='ctx'> 				 fam10h_mmconf_end + 1);</div><div class='add'>+	} else {</div><div class='add'>+		fam10h_mmconf_start = 0;</div><div class='add'>+		fam10h_mmconf_end = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* mmio resource */</div><div class='hunk'>@@ -403,7 +383,6 @@ static void __init pci_enable_pci_io_ecs(void)</div><div class='ctx'> 			++n;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	pr_info("Extended Config Space enabled on %u nodes\n", n);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/pci/broadcom_bus.c b/arch/x86/pci/broadcom_bus.c<br/>index ab8269b0da29..f3a7c569a403 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/pci/broadcom_bus.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/broadcom_bus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/pci/broadcom_bus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/pci/broadcom_bus.c</a></div><div class='hunk'>@@ -15,10 +15,11 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/pci_x86.h&gt;</div><div class='add'>+#include &lt;asm/pci-direct.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "bus_numa.h"</div><div class='ctx'> </div><div class='del'>-static void __devinit cnb20le_res(struct pci_dev *dev)</div><div class='add'>+static void __init cnb20le_res(u8 bus, u8 slot, u8 func)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_root_info *info;</div><div class='ctx'> 	struct resource res;</div><div class='hunk'>@@ -26,21 +27,12 @@ static void __devinit cnb20le_res(struct pci_dev *dev)</div><div class='ctx'> 	u8 fbus, lbus;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ACPI</div><div class='del'>-	/*</div><div class='del'>-	 * We should get host bridge information from ACPI unless the BIOS</div><div class='del'>-	 * doesn't support it.</div><div class='del'>-	 */</div><div class='del'>-	if (acpi_os_get_root_pointer())</div><div class='del'>-		return;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	info = &amp;pci_root_info[pci_root_num];</div><div class='ctx'> 	pci_root_num++;</div><div class='ctx'> </div><div class='ctx'> 	/* read the PCI bus numbers */</div><div class='del'>-	pci_read_config_byte(dev, 0x44, &amp;fbus);</div><div class='del'>-	pci_read_config_byte(dev, 0x45, &amp;lbus);</div><div class='add'>+	fbus = read_pci_config_byte(bus, slot, func, 0x44);</div><div class='add'>+	lbus = read_pci_config_byte(bus, slot, func, 0x45);</div><div class='ctx'> 	info-&gt;bus_min = fbus;</div><div class='ctx'> 	info-&gt;bus_max = lbus;</div><div class='ctx'> </div><div class='hunk'>@@ -59,8 +51,8 @@ static void __devinit cnb20le_res(struct pci_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* read the non-prefetchable memory window */</div><div class='del'>-	pci_read_config_word(dev, 0xc0, &amp;word1);</div><div class='del'>-	pci_read_config_word(dev, 0xc2, &amp;word2);</div><div class='add'>+	word1 = read_pci_config_16(bus, slot, func, 0xc0);</div><div class='add'>+	word2 = read_pci_config_16(bus, slot, func, 0xc2);</div><div class='ctx'> 	if (word1 != word2) {</div><div class='ctx'> 		res.start = (word1 &lt;&lt; 16) | 0x0000;</div><div class='ctx'> 		res.end   = (word2 &lt;&lt; 16) | 0xffff;</div><div class='hunk'>@@ -69,8 +61,8 @@ static void __devinit cnb20le_res(struct pci_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* read the prefetchable memory window */</div><div class='del'>-	pci_read_config_word(dev, 0xc4, &amp;word1);</div><div class='del'>-	pci_read_config_word(dev, 0xc6, &amp;word2);</div><div class='add'>+	word1 = read_pci_config_16(bus, slot, func, 0xc4);</div><div class='add'>+	word2 = read_pci_config_16(bus, slot, func, 0xc6);</div><div class='ctx'> 	if (word1 != word2) {</div><div class='ctx'> 		res.start = (word1 &lt;&lt; 16) | 0x0000;</div><div class='ctx'> 		res.end   = (word2 &lt;&lt; 16) | 0xffff;</div><div class='hunk'>@@ -79,8 +71,8 @@ static void __devinit cnb20le_res(struct pci_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* read the IO port window */</div><div class='del'>-	pci_read_config_word(dev, 0xd0, &amp;word1);</div><div class='del'>-	pci_read_config_word(dev, 0xd2, &amp;word2);</div><div class='add'>+	word1 = read_pci_config_16(bus, slot, func, 0xd0);</div><div class='add'>+	word2 = read_pci_config_16(bus, slot, func, 0xd2);</div><div class='ctx'> 	if (word1 != word2) {</div><div class='ctx'> 		res.start = word1;</div><div class='ctx'> 		res.end   = word2;</div><div class='hunk'>@@ -92,13 +84,37 @@ static void __devinit cnb20le_res(struct pci_dev *dev)</div><div class='ctx'> 	res.start = fbus;</div><div class='ctx'> 	res.end   = lbus;</div><div class='ctx'> 	res.flags = IORESOURCE_BUS;</div><div class='del'>-	dev_info(&amp;dev-&gt;dev, "CNB20LE PCI Host Bridge (domain %04x %pR)\n",</div><div class='del'>-			    pci_domain_nr(dev-&gt;bus), &amp;res);</div><div class='add'>+	printk(KERN_INFO "CNB20LE PCI Host Bridge (domain 0000 %pR)\n", &amp;res);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; info-&gt;res_num; i++)</div><div class='del'>-		dev_info(&amp;dev-&gt;dev, "host bridge window %pR\n", &amp;info-&gt;res[i]);</div><div class='add'>+		printk(KERN_INFO "host bridge window %pR\n", &amp;info-&gt;res[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_LE,</div><div class='del'>-			cnb20le_res);</div><div class='add'>+static int __init broadcom_postcore_init(void)</div><div class='add'>+{</div><div class='add'>+	u8 bus = 0, slot = 0;</div><div class='add'>+	u32 id;</div><div class='add'>+	u16 vendor, device;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+	/*</div><div class='add'>+	 * We should get host bridge information from ACPI unless the BIOS</div><div class='add'>+	 * doesn't support it.</div><div class='add'>+	 */</div><div class='add'>+	if (acpi_os_get_root_pointer())</div><div class='add'>+		return 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	id = read_pci_config(bus, slot, 0, PCI_VENDOR_ID);</div><div class='add'>+	vendor = id &amp; 0xffff;</div><div class='add'>+	device = (id &gt;&gt; 16) &amp; 0xffff;</div><div class='add'>+</div><div class='add'>+	if (vendor == PCI_VENDOR_ID_SERVERWORKS &amp;&amp;</div><div class='add'>+	    device == PCI_DEVICE_ID_SERVERWORKS_LE) {</div><div class='add'>+		cnb20le_res(bus, slot, 0);</div><div class='add'>+		cnb20le_res(bus, slot, 1);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+postcore_initcall(broadcom_postcore_init);</div><div class='head'>diff --git a/arch/x86/pci/bus_numa.c b/arch/x86/pci/bus_numa.c<br/>index 64a122883896..fd3f65510e9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/pci/bus_numa.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/bus_numa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/pci/bus_numa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/pci/bus_numa.c</a></div><div class='hunk'>@@ -7,45 +7,50 @@</div><div class='ctx'> int pci_root_num;</div><div class='ctx'> struct pci_root_info pci_root_info[PCI_ROOT_NR];</div><div class='ctx'> </div><div class='del'>-void x86_pci_root_bus_res_quirks(struct pci_bus *b)</div><div class='add'>+void x86_pci_root_bus_resources(int bus, struct list_head *resources)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int j;</div><div class='ctx'> 	struct pci_root_info *info;</div><div class='ctx'> </div><div class='del'>-	/* don't go for it if _CRS is used already */</div><div class='del'>-	if (b-&gt;resource[0] != &amp;ioport_resource ||</div><div class='del'>-	    b-&gt;resource[1] != &amp;iomem_resource)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	if (!pci_root_num)</div><div class='del'>-		return;</div><div class='add'>+		goto default_resources;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pci_root_num; i++) {</div><div class='del'>-		if (pci_root_info[i].bus_min == b-&gt;number)</div><div class='add'>+		if (pci_root_info[i].bus_min == bus)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (i == pci_root_num)</div><div class='del'>-		return;</div><div class='add'>+		goto default_resources;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_DEBUG "PCI: peer root bus %02x res updated from pci conf\n",</div><div class='del'>-			b-&gt;number);</div><div class='add'>+	printk(KERN_DEBUG "PCI: root bus %02x: hardware-probed resources\n",</div><div class='add'>+	       bus);</div><div class='ctx'> </div><div class='del'>-	pci_bus_remove_resources(b);</div><div class='ctx'> 	info = &amp;pci_root_info[i];</div><div class='ctx'> 	for (j = 0; j &lt; info-&gt;res_num; j++) {</div><div class='ctx'> 		struct resource *res;</div><div class='ctx'> 		struct resource *root;</div><div class='ctx'> </div><div class='ctx'> 		res = &amp;info-&gt;res[j];</div><div class='del'>-		pci_bus_add_resource(b, res, 0);</div><div class='add'>+		pci_add_resource(resources, res);</div><div class='ctx'> 		if (res-&gt;flags &amp; IORESOURCE_IO)</div><div class='ctx'> 			root = &amp;ioport_resource;</div><div class='ctx'> 		else</div><div class='ctx'> 			root = &amp;iomem_resource;</div><div class='ctx'> 		insert_resource(root, res);</div><div class='ctx'> 	}</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+default_resources:</div><div class='add'>+	/*</div><div class='add'>+	 * We don't have any host bridge aperture information from the</div><div class='add'>+	 * "native host bridge drivers," e.g., amd_bus or broadcom_bus,</div><div class='add'>+	 * so fall back to the defaults historically used by pci_create_bus().</div><div class='add'>+	 */</div><div class='add'>+	printk(KERN_DEBUG "PCI: root bus %02x: using default resources\n", bus);</div><div class='add'>+	pci_add_resource(resources, &amp;ioport_resource);</div><div class='add'>+	pci_add_resource(resources, &amp;iomem_resource);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __devinit update_res(struct pci_root_info *info, resource_size_t start,</div><div class='head'>diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c<br/>index 7962ccb4d9b2..323481e06ef8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/pci/common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/pci/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/pci/common.c</a></div><div class='hunk'>@@ -164,9 +164,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *b)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev;</div><div class='ctx'> </div><div class='del'>-	/* root bus? */</div><div class='del'>-	if (!b-&gt;parent)</div><div class='del'>-		x86_pci_root_bus_res_quirks(b);</div><div class='ctx'> 	pci_read_bridge_bases(b);</div><div class='ctx'> 	list_for_each_entry(dev, &amp;b-&gt;devices, bus_list)</div><div class='ctx'> 		pcibios_fixup_device_resources(dev);</div><div class='hunk'>@@ -433,6 +430,7 @@ void __init dmi_check_pciprobe(void)</div><div class='ctx'> </div><div class='ctx'> struct pci_bus * __devinit pcibios_scan_root(int busnum)</div><div class='ctx'> {</div><div class='add'>+	LIST_HEAD(resources);</div><div class='ctx'> 	struct pci_bus *bus = NULL;</div><div class='ctx'> 	struct pci_sysdata *sd;</div><div class='ctx'> </div><div class='hunk'>@@ -456,9 +454,12 @@ struct pci_bus * __devinit pcibios_scan_root(int busnum)</div><div class='ctx'> 	sd-&gt;node = get_mp_bus_to_node(busnum);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n", busnum);</div><div class='del'>-	bus = pci_scan_bus_parented(NULL, busnum, &amp;pci_root_ops, sd);</div><div class='del'>-	if (!bus)</div><div class='add'>+	x86_pci_root_bus_resources(busnum, &amp;resources);</div><div class='add'>+	bus = pci_scan_root_bus(NULL, busnum, &amp;pci_root_ops, sd, &amp;resources);</div><div class='add'>+	if (!bus) {</div><div class='add'>+		pci_free_resource_list(&amp;resources);</div><div class='ctx'> 		kfree(sd);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return bus;</div><div class='ctx'> }</div><div class='hunk'>@@ -639,6 +640,7 @@ int pci_ext_cfg_avail(struct pci_dev *dev)</div><div class='ctx'> </div><div class='ctx'> struct pci_bus * __devinit pci_scan_bus_on_node(int busno, struct pci_ops *ops, int node)</div><div class='ctx'> {</div><div class='add'>+	LIST_HEAD(resources);</div><div class='ctx'> 	struct pci_bus *bus = NULL;</div><div class='ctx'> 	struct pci_sysdata *sd;</div><div class='ctx'> </div><div class='hunk'>@@ -653,9 +655,12 @@ struct pci_bus * __devinit pci_scan_bus_on_node(int busno, struct pci_ops *ops,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	sd-&gt;node = node;</div><div class='del'>-	bus = pci_scan_bus(busno, ops, sd);</div><div class='del'>-	if (!bus)</div><div class='add'>+	x86_pci_root_bus_resources(busno, &amp;resources);</div><div class='add'>+	bus = pci_scan_root_bus(NULL, busno, ops, sd, &amp;resources);</div><div class='add'>+	if (!bus) {</div><div class='add'>+		pci_free_resource_list(&amp;resources);</div><div class='ctx'> 		kfree(sd);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return bus;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c<br/>index 794b092d01ae..91821a1a0c3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/pci/i386.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/i386.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/pci/i386.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/pci/i386.c</a></div><div class='hunk'>@@ -254,26 +254,6 @@ void __init pcibios_resource_survey(void)</div><div class='ctx'>  */</div><div class='ctx'> fs_initcall(pcibios_assign_resources);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *  If we set up a device for bus mastering, we need to check the latency</div><div class='del'>- *  timer as certain crappy BIOSes forget to set it properly.</div><div class='del'>- */</div><div class='del'>-unsigned int pcibios_max_latency = 255;</div><div class='del'>-</div><div class='del'>-void pcibios_set_master(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	u8 lat;</div><div class='del'>-	pci_read_config_byte(dev, PCI_LATENCY_TIMER, &amp;lat);</div><div class='del'>-	if (lat &lt; 16)</div><div class='del'>-		lat = (64 &lt;= pcibios_max_latency) ? 64 : pcibios_max_latency;</div><div class='del'>-	else if (lat &gt; pcibios_max_latency)</div><div class='del'>-		lat = pcibios_max_latency;</div><div class='del'>-	else</div><div class='del'>-		return;</div><div class='del'>-	dev_printk(KERN_DEBUG, &amp;dev-&gt;dev, "setting latency timer to %d\n", lat);</div><div class='del'>-	pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct vm_operations_struct pci_mmap_ops = {</div><div class='ctx'> 	.access = generic_access_phys,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c<br/>index 2c2aeabc2609..a1df191129d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/pci/legacy.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/legacy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/pci/legacy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/pci/legacy.c</a></div><div class='hunk'>@@ -31,9 +31,6 @@ int __init pci_legacy_init(void)</div><div class='ctx'> </div><div class='ctx'> 	printk("PCI: Probing PCI hardware\n");</div><div class='ctx'> 	pci_root_bus = pcibios_scan_root(0);</div><div class='del'>-	if (pci_root_bus)</div><div class='del'>-		pci_bus_add_devices(pci_root_bus);</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/arch/x86/pci/numaq_32.c b/arch/x86/pci/numaq_32.c<br/>index 51abf02f9226..83e125b95ca6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/pci/numaq_32.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/numaq_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/pci/numaq_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/pci/numaq_32.c</a></div><div class='hunk'>@@ -153,8 +153,6 @@ int __init pci_numaq_init(void)</div><div class='ctx'> 	raw_pci_ops = &amp;pci_direct_conf1_mq;</div><div class='ctx'> </div><div class='ctx'> 	pci_root_bus = pcibios_scan_root(0);</div><div class='del'>-	if (pci_root_bus)</div><div class='del'>-		pci_bus_add_devices(pci_root_bus);</div><div class='ctx'> 	if (num_online_nodes() &gt; 1)</div><div class='ctx'> 		for_each_online_node(quad) {</div><div class='ctx'> 			if (quad == 0)</div><div class='head'>diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c<br/>index db0e9a51e611..da8fe0535ff4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/pci/pcbios.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/pci/pcbios.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/pci/pcbios.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/pci/pcbios.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@ static inline void set_bios_x(void)</div><div class='ctx'> 	pcibios_enabled = 1;</div><div class='ctx'> 	set_memory_x(PAGE_OFFSET + BIOS_BEGIN, (BIOS_END - BIOS_BEGIN) &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> 	if (__supported_pte_mask &amp; _PAGE_NX)</div><div class='del'>-		printk(KERN_INFO "PCI : PCI BIOS aera is rw and x. Use pci=nobios if you want it NX.\n");</div><div class='add'>+		printk(KERN_INFO "PCI : PCI BIOS area is rw and x. Use pci=nobios if you want it NX.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/x86/platform/geode/alix.c b/arch/x86/platform/geode/alix.c<br/>index ca1973699d3d..dc5f1d32aced 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/platform/geode/alix.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/platform/geode/alix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/platform/geode/alix.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/platform/geode/alix.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/geode.h&gt;</div><div class='ctx'> </div><div class='del'>-static int force = 0;</div><div class='add'>+static bool force = 0;</div><div class='ctx'> module_param(force, bool, 0444);</div><div class='ctx'> /* FIXME: Award bios is not automatically detected as Alix platform */</div><div class='ctx'> MODULE_PARM_DESC(force, "Force detection as ALIX.2/ALIX.3 platform");</div><div class='head'>diff --git a/arch/x86/platform/iris/iris.c b/arch/x86/platform/iris/iris.c<br/>index 1ba7f5ed8c9b..5917eb56b313 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/platform/iris/iris.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/platform/iris/iris.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/platform/iris/iris.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/platform/iris/iris.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@ MODULE_AUTHOR("Sébastien Hinderer &lt;Sebastien.Hinderer@ens-lyon.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("A power_off handler for Iris devices from EuroBraille");</div><div class='ctx'> MODULE_SUPPORTED_DEVICE("Eurobraille/Iris");</div><div class='ctx'> </div><div class='del'>-static int force;</div><div class='add'>+static bool force;</div><div class='ctx'> </div><div class='ctx'> module_param(force, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(force, "Set to one to force poweroff handler installation.");</div><div class='head'>diff --git a/arch/x86/platform/mrst/Makefile b/arch/x86/platform/mrst/Makefile<br/>index 1ea38775a6d3..7baed5135e0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/platform/mrst/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/platform/mrst/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/platform/mrst/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/platform/mrst/Makefile</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-obj-$(CONFIG_X86_MRST)		+= mrst.o</div><div class='del'>-obj-$(CONFIG_X86_MRST)		+= vrtc.o</div><div class='del'>-obj-$(CONFIG_EARLY_PRINTK_MRST)	+= early_printk_mrst.o</div><div class='add'>+obj-$(CONFIG_X86_INTEL_MID)	+= mrst.o</div><div class='add'>+obj-$(CONFIG_X86_INTEL_MID)	+= vrtc.o</div><div class='add'>+obj-$(CONFIG_EARLY_PRINTK_INTEL_MID)	+= early_printk_mrst.o</div><div class='ctx'> obj-$(CONFIG_X86_MRST)		+= pmu.o</div><div class='head'>diff --git a/arch/x86/platform/mrst/early_printk_mrst.c b/arch/x86/platform/mrst/early_printk_mrst.c<br/>index 25bfdbb5b130..3c6e328483c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/platform/mrst/early_printk_mrst.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/platform/mrst/early_printk_mrst.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/platform/mrst/early_printk_mrst.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/platform/mrst/early_printk_mrst.c</a></div><div class='hunk'>@@ -245,16 +245,24 @@ struct console early_mrst_console = {</div><div class='ctx'>  * Following is the early console based on Medfield HSU (High</div><div class='ctx'>  * Speed UART) device.</div><div class='ctx'>  */</div><div class='del'>-#define HSU_PORT2_PADDR		0xffa28180</div><div class='add'>+#define HSU_PORT_BASE		0xffa28080</div><div class='ctx'> </div><div class='ctx'> static void __iomem *phsu;</div><div class='ctx'> </div><div class='del'>-void hsu_early_console_init(void)</div><div class='add'>+void hsu_early_console_init(const char *s)</div><div class='ctx'> {</div><div class='add'>+	unsigned long paddr, port = 0;</div><div class='ctx'> 	u8 lcr;</div><div class='ctx'> </div><div class='del'>-	phsu = (void *)set_fixmap_offset_nocache(FIX_EARLYCON_MEM_BASE,</div><div class='del'>-							HSU_PORT2_PADDR);</div><div class='add'>+	/*</div><div class='add'>+	 * Select the early HSU console port if specified by user in the</div><div class='add'>+	 * kernel command line.</div><div class='add'>+	 */</div><div class='add'>+	if (*s &amp;&amp; !kstrtoul(s, 10, &amp;port))</div><div class='add'>+		port = clamp_val(port, 0, 2);</div><div class='add'>+</div><div class='add'>+	paddr = HSU_PORT_BASE + port * 0x80;</div><div class='add'>+	phsu = (void *)set_fixmap_offset_nocache(FIX_EARLYCON_MEM_BASE, paddr);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable FIFO */</div><div class='ctx'> 	writeb(0x0, phsu + UART_FCR);</div><div class='head'>diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c<br/>index ad4ec1cb097e..475e2cd0f3c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/platform/mrst/mrst.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/platform/mrst/mrst.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/platform/mrst/mrst.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/platform/mrst/mrst.c</a></div><div class='hunk'>@@ -848,8 +848,7 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *entry)</div><div class='ctx'> 	if (mrst_has_msic())</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* ID as IRQ is a hack that will go away */</div><div class='del'>-	pdev = platform_device_alloc(entry-&gt;name, entry-&gt;irq);</div><div class='add'>+	pdev = platform_device_alloc(entry-&gt;name, 0);</div><div class='ctx'> 	if (pdev == NULL) {</div><div class='ctx'> 		pr_err("out of memory for SFI platform device '%s'.\n",</div><div class='ctx'> 			entry-&gt;name);</div><div class='hunk'>@@ -1030,6 +1029,7 @@ static int __init pb_keys_init(void)</div><div class='ctx'> 	num = sizeof(gpio_button) / sizeof(struct gpio_keys_button);</div><div class='ctx'> 	for (i = 0; i &lt; num; i++) {</div><div class='ctx'> 		gb[i].gpio = get_gpio_by_name(gb[i].desc);</div><div class='add'>+		pr_debug("info[%2d]: name = %s, gpio = %d\n", i, gb[i].desc, gb[i].gpio);</div><div class='ctx'> 		if (gb[i].gpio == -1)</div><div class='ctx'> 			continue;</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 5b552198f774..9be4cff00a2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/platform/uv/tlb_uv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/platform/uv/tlb_uv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/platform/uv/tlb_uv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/platform/uv/tlb_uv.c</a></div><div class='hunk'>@@ -157,13 +157,14 @@ static int __init uvhub_to_first_apicid(int uvhub)</div><div class='ctx'>  * clear of the Timeout bit (as well) will free the resource. No reply will</div><div class='ctx'>  * be sent (the hardware will only do one reply per message).</div><div class='ctx'>  */</div><div class='del'>-static void reply_to_message(struct msg_desc *mdp, struct bau_control *bcp)</div><div class='add'>+static void reply_to_message(struct msg_desc *mdp, struct bau_control *bcp,</div><div class='add'>+						int do_acknowledge)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long dw;</div><div class='ctx'> 	struct bau_pq_entry *msg;</div><div class='ctx'> </div><div class='ctx'> 	msg = mdp-&gt;msg;</div><div class='del'>-	if (!msg-&gt;canceled) {</div><div class='add'>+	if (!msg-&gt;canceled &amp;&amp; do_acknowledge) {</div><div class='ctx'> 		dw = (msg-&gt;swack_vec &lt;&lt; UV_SW_ACK_NPENDING) | msg-&gt;swack_vec;</div><div class='ctx'> 		write_mmr_sw_ack(dw);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -212,8 +213,8 @@ static void bau_process_retry_msg(struct msg_desc *mdp,</div><div class='ctx'> 			if (mmr &amp; (msg_res &lt;&lt; UV_SW_ACK_NPENDING)) {</div><div class='ctx'> 				unsigned long mr;</div><div class='ctx'> 				/*</div><div class='del'>-				 * is the resource timed out?</div><div class='del'>-				 * make everyone ignore the cancelled message.</div><div class='add'>+				 * Is the resource timed out?</div><div class='add'>+				 * Make everyone ignore the cancelled message.</div><div class='ctx'> 				 */</div><div class='ctx'> 				msg2-&gt;canceled = 1;</div><div class='ctx'> 				stat-&gt;d_canceled++;</div><div class='hunk'>@@ -231,8 +232,8 @@ static void bau_process_retry_msg(struct msg_desc *mdp,</div><div class='ctx'>  * Do all the things a cpu should do for a TLB shootdown message.</div><div class='ctx'>  * Other cpu's may come here at the same time for this message.</div><div class='ctx'>  */</div><div class='del'>-static void bau_process_message(struct msg_desc *mdp,</div><div class='del'>-					struct bau_control *bcp)</div><div class='add'>+static void bau_process_message(struct msg_desc *mdp, struct bau_control *bcp,</div><div class='add'>+						int do_acknowledge)</div><div class='ctx'> {</div><div class='ctx'> 	short socket_ack_count = 0;</div><div class='ctx'> 	short *sp;</div><div class='hunk'>@@ -284,8 +285,9 @@ static void bau_process_message(struct msg_desc *mdp,</div><div class='ctx'> 		if (msg_ack_count == bcp-&gt;cpus_in_uvhub) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * All cpus in uvhub saw it; reply</div><div class='add'>+			 * (unless we are in the UV2 workaround)</div><div class='ctx'> 			 */</div><div class='del'>-			reply_to_message(mdp, bcp);</div><div class='add'>+			reply_to_message(mdp, bcp, do_acknowledge);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -491,27 +493,138 @@ static int uv1_wait_completion(struct bau_desc *bau_desc,</div><div class='ctx'> /*</div><div class='ctx'>  * UV2 has an extra bit of status in the ACTIVATION_STATUS_2 register.</div><div class='ctx'>  */</div><div class='del'>-static unsigned long uv2_read_status(unsigned long offset, int rshft, int cpu)</div><div class='add'>+static unsigned long uv2_read_status(unsigned long offset, int rshft, int desc)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long descriptor_status;</div><div class='ctx'> 	unsigned long descriptor_status2;</div><div class='ctx'> </div><div class='ctx'> 	descriptor_status = ((read_lmmr(offset) &gt;&gt; rshft) &amp; UV_ACT_STATUS_MASK);</div><div class='del'>-	descriptor_status2 = (read_mmr_uv2_status() &gt;&gt; cpu) &amp; 0x1UL;</div><div class='add'>+	descriptor_status2 = (read_mmr_uv2_status() &gt;&gt; desc) &amp; 0x1UL;</div><div class='ctx'> 	descriptor_status = (descriptor_status &lt;&lt; 1) | descriptor_status2;</div><div class='ctx'> 	return descriptor_status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Return whether the status of the descriptor that is normally used for this</div><div class='add'>+ * cpu (the one indexed by its hub-relative cpu number) is busy.</div><div class='add'>+ * The status of the original 32 descriptors is always reflected in the 64</div><div class='add'>+ * bits of UVH_LB_BAU_SB_ACTIVATION_STATUS_0.</div><div class='add'>+ * The bit provided by the activation_status_2 register is irrelevant to</div><div class='add'>+ * the status if it is only being tested for busy or not busy.</div><div class='add'>+ */</div><div class='add'>+int normal_busy(struct bau_control *bcp)</div><div class='add'>+{</div><div class='add'>+	int cpu = bcp-&gt;uvhub_cpu;</div><div class='add'>+	int mmr_offset;</div><div class='add'>+	int right_shift;</div><div class='add'>+</div><div class='add'>+	mmr_offset = UVH_LB_BAU_SB_ACTIVATION_STATUS_0;</div><div class='add'>+	right_shift = cpu * UV_ACT_STATUS_SIZE;</div><div class='add'>+	return (((((read_lmmr(mmr_offset) &gt;&gt; right_shift) &amp;</div><div class='add'>+				UV_ACT_STATUS_MASK)) &lt;&lt; 1) == UV2H_DESC_BUSY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Entered when a bau descriptor has gone into a permanent busy wait because</div><div class='add'>+ * of a hardware bug.</div><div class='add'>+ * Workaround the bug.</div><div class='add'>+ */</div><div class='add'>+int handle_uv2_busy(struct bau_control *bcp)</div><div class='add'>+{</div><div class='add'>+	int busy_one = bcp-&gt;using_desc;</div><div class='add'>+	int normal = bcp-&gt;uvhub_cpu;</div><div class='add'>+	int selected = -1;</div><div class='add'>+	int i;</div><div class='add'>+	unsigned long descriptor_status;</div><div class='add'>+	unsigned long status;</div><div class='add'>+	int mmr_offset;</div><div class='add'>+	struct bau_desc *bau_desc_old;</div><div class='add'>+	struct bau_desc *bau_desc_new;</div><div class='add'>+	struct bau_control *hmaster = bcp-&gt;uvhub_master;</div><div class='add'>+	struct ptc_stats *stat = bcp-&gt;statp;</div><div class='add'>+	cycles_t ttm;</div><div class='add'>+</div><div class='add'>+	stat-&gt;s_uv2_wars++;</div><div class='add'>+	spin_lock(&amp;hmaster-&gt;uvhub_lock);</div><div class='add'>+	/* try for the original first */</div><div class='add'>+	if (busy_one != normal) {</div><div class='add'>+		if (!normal_busy(bcp))</div><div class='add'>+			selected = normal;</div><div class='add'>+	}</div><div class='add'>+	if (selected &lt; 0) {</div><div class='add'>+		/* can't use the normal, select an alternate */</div><div class='add'>+		mmr_offset = UVH_LB_BAU_SB_ACTIVATION_STATUS_1;</div><div class='add'>+		descriptor_status = read_lmmr(mmr_offset);</div><div class='add'>+</div><div class='add'>+		/* scan available descriptors 32-63 */</div><div class='add'>+		for (i = 0; i &lt; UV_CPUS_PER_AS; i++) {</div><div class='add'>+			if ((hmaster-&gt;inuse_map &amp; (1 &lt;&lt; i)) == 0) {</div><div class='add'>+				status = ((descriptor_status &gt;&gt;</div><div class='add'>+						(i * UV_ACT_STATUS_SIZE)) &amp;</div><div class='add'>+						UV_ACT_STATUS_MASK) &lt;&lt; 1;</div><div class='add'>+				if (status != UV2H_DESC_BUSY) {</div><div class='add'>+					selected = i + UV_CPUS_PER_AS;</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'>+	if (busy_one != normal)</div><div class='add'>+		/* mark the busy alternate as not in-use */</div><div class='add'>+		hmaster-&gt;inuse_map &amp;= ~(1 &lt;&lt; (busy_one - UV_CPUS_PER_AS));</div><div class='add'>+</div><div class='add'>+	if (selected &gt;= 0) {</div><div class='add'>+		/* switch to the selected descriptor */</div><div class='add'>+		if (selected != normal) {</div><div class='add'>+			/* set the selected alternate as in-use */</div><div class='add'>+			hmaster-&gt;inuse_map |=</div><div class='add'>+					(1 &lt;&lt; (selected - UV_CPUS_PER_AS));</div><div class='add'>+			if (selected &gt; stat-&gt;s_uv2_wars_hw)</div><div class='add'>+				stat-&gt;s_uv2_wars_hw = selected;</div><div class='add'>+		}</div><div class='add'>+		bau_desc_old = bcp-&gt;descriptor_base;</div><div class='add'>+		bau_desc_old += (ITEMS_PER_DESC * busy_one);</div><div class='add'>+		bcp-&gt;using_desc = selected;</div><div class='add'>+		bau_desc_new = bcp-&gt;descriptor_base;</div><div class='add'>+		bau_desc_new += (ITEMS_PER_DESC * selected);</div><div class='add'>+		*bau_desc_new = *bau_desc_old;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * All are busy. Wait for the normal one for this cpu to</div><div class='add'>+		 * free up.</div><div class='add'>+		 */</div><div class='add'>+		stat-&gt;s_uv2_war_waits++;</div><div class='add'>+		spin_unlock(&amp;hmaster-&gt;uvhub_lock);</div><div class='add'>+		ttm = get_cycles();</div><div class='add'>+		do {</div><div class='add'>+			cpu_relax();</div><div class='add'>+		} while (normal_busy(bcp));</div><div class='add'>+		spin_lock(&amp;hmaster-&gt;uvhub_lock);</div><div class='add'>+		/* switch to the original descriptor */</div><div class='add'>+		bcp-&gt;using_desc = normal;</div><div class='add'>+		bau_desc_old = bcp-&gt;descriptor_base;</div><div class='add'>+		bau_desc_old += (ITEMS_PER_DESC * bcp-&gt;using_desc);</div><div class='add'>+		bcp-&gt;using_desc = (ITEMS_PER_DESC * normal);</div><div class='add'>+		bau_desc_new = bcp-&gt;descriptor_base;</div><div class='add'>+		bau_desc_new += (ITEMS_PER_DESC * normal);</div><div class='add'>+		*bau_desc_new = *bau_desc_old; /* copy the entire descriptor */</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;hmaster-&gt;uvhub_lock);</div><div class='add'>+	return FLUSH_RETRY_BUSYBUG;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int uv2_wait_completion(struct bau_desc *bau_desc,</div><div class='ctx'> 				unsigned long mmr_offset, int right_shift,</div><div class='ctx'> 				struct bau_control *bcp, long try)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long descriptor_stat;</div><div class='ctx'> 	cycles_t ttm;</div><div class='del'>-	int cpu = bcp-&gt;uvhub_cpu;</div><div class='add'>+	int desc = bcp-&gt;using_desc;</div><div class='add'>+	long busy_reps = 0;</div><div class='ctx'> 	struct ptc_stats *stat = bcp-&gt;statp;</div><div class='ctx'> </div><div class='del'>-	descriptor_stat = uv2_read_status(mmr_offset, right_shift, cpu);</div><div class='add'>+	descriptor_stat = uv2_read_status(mmr_offset, right_shift, desc);</div><div class='ctx'> </div><div class='ctx'> 	/* spin on the status MMR, waiting for it to go idle */</div><div class='ctx'> 	while (descriptor_stat != UV2H_DESC_IDLE) {</div><div class='hunk'>@@ -522,32 +635,35 @@ static int uv2_wait_completion(struct bau_desc *bau_desc,</div><div class='ctx'> 		 * our message and its state will stay IDLE.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ((descriptor_stat == UV2H_DESC_SOURCE_TIMEOUT) ||</div><div class='del'>-		    (descriptor_stat == UV2H_DESC_DEST_STRONG_NACK) ||</div><div class='ctx'> 		    (descriptor_stat == UV2H_DESC_DEST_PUT_ERR)) {</div><div class='ctx'> 			stat-&gt;s_stimeout++;</div><div class='ctx'> 			return FLUSH_GIVEUP;</div><div class='add'>+		} else if (descriptor_stat == UV2H_DESC_DEST_STRONG_NACK) {</div><div class='add'>+			stat-&gt;s_strongnacks++;</div><div class='add'>+			bcp-&gt;conseccompletes = 0;</div><div class='add'>+			return FLUSH_GIVEUP;</div><div class='ctx'> 		} else if (descriptor_stat == UV2H_DESC_DEST_TIMEOUT) {</div><div class='ctx'> 			stat-&gt;s_dtimeout++;</div><div class='del'>-			ttm = get_cycles();</div><div class='del'>-			/*</div><div class='del'>-			 * Our retries may be blocked by all destination</div><div class='del'>-			 * swack resources being consumed, and a timeout</div><div class='del'>-			 * pending.  In that case hardware returns the</div><div class='del'>-			 * ERROR that looks like a destination timeout.</div><div class='del'>-			 */</div><div class='del'>-			if (cycles_2_us(ttm - bcp-&gt;send_message) &lt; timeout_us) {</div><div class='del'>-				bcp-&gt;conseccompletes = 0;</div><div class='del'>-				return FLUSH_RETRY_PLUGGED;</div><div class='del'>-			}</div><div class='ctx'> 			bcp-&gt;conseccompletes = 0;</div><div class='ctx'> 			return FLUSH_RETRY_TIMEOUT;</div><div class='ctx'> 		} else {</div><div class='add'>+			busy_reps++;</div><div class='add'>+			if (busy_reps &gt; 1000000) {</div><div class='add'>+				/* not to hammer on the clock */</div><div class='add'>+				busy_reps = 0;</div><div class='add'>+				ttm = get_cycles();</div><div class='add'>+				if ((ttm - bcp-&gt;send_message) &gt;</div><div class='add'>+					(bcp-&gt;clocks_per_100_usec)) {</div><div class='add'>+					return handle_uv2_busy(bcp);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * descriptor_stat is still BUSY</div><div class='ctx'> 			 */</div><div class='ctx'> 			cpu_relax();</div><div class='ctx'> 		}</div><div class='del'>-		descriptor_stat = uv2_read_status(mmr_offset, right_shift, cpu);</div><div class='add'>+		descriptor_stat = uv2_read_status(mmr_offset, right_shift,</div><div class='add'>+									desc);</div><div class='ctx'> 	}</div><div class='ctx'> 	bcp-&gt;conseccompletes++;</div><div class='ctx'> 	return FLUSH_COMPLETE;</div><div class='hunk'>@@ -563,17 +679,17 @@ static int wait_completion(struct bau_desc *bau_desc,</div><div class='ctx'> {</div><div class='ctx'> 	int right_shift;</div><div class='ctx'> 	unsigned long mmr_offset;</div><div class='del'>-	int cpu = bcp-&gt;uvhub_cpu;</div><div class='add'>+	int desc = bcp-&gt;using_desc;</div><div class='ctx'> </div><div class='del'>-	if (cpu &lt; UV_CPUS_PER_AS) {</div><div class='add'>+	if (desc &lt; UV_CPUS_PER_AS) {</div><div class='ctx'> 		mmr_offset = UVH_LB_BAU_SB_ACTIVATION_STATUS_0;</div><div class='del'>-		right_shift = cpu * UV_ACT_STATUS_SIZE;</div><div class='add'>+		right_shift = desc * UV_ACT_STATUS_SIZE;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mmr_offset = UVH_LB_BAU_SB_ACTIVATION_STATUS_1;</div><div class='del'>-		right_shift = ((cpu - UV_CPUS_PER_AS) * UV_ACT_STATUS_SIZE);</div><div class='add'>+		right_shift = ((desc - UV_CPUS_PER_AS) * UV_ACT_STATUS_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_uv1_hub())</div><div class='add'>+	if (bcp-&gt;uvhub_version == 1)</div><div class='ctx'> 		return uv1_wait_completion(bau_desc, mmr_offset, right_shift,</div><div class='ctx'> 								bcp, try);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -752,19 +868,22 @@ static void handle_cmplt(int completion_status, struct bau_desc *bau_desc,</div><div class='ctx'>  * Returns 1 if it gives up entirely and the original cpu mask is to be</div><div class='ctx'>  * returned to the kernel.</div><div class='ctx'>  */</div><div class='del'>-int uv_flush_send_and_wait(struct bau_desc *bau_desc,</div><div class='del'>-			struct cpumask *flush_mask, struct bau_control *bcp)</div><div class='add'>+int uv_flush_send_and_wait(struct cpumask *flush_mask, struct bau_control *bcp)</div><div class='ctx'> {</div><div class='ctx'> 	int seq_number = 0;</div><div class='ctx'> 	int completion_stat = 0;</div><div class='add'>+	int uv1 = 0;</div><div class='ctx'> 	long try = 0;</div><div class='ctx'> 	unsigned long index;</div><div class='ctx'> 	cycles_t time1;</div><div class='ctx'> 	cycles_t time2;</div><div class='ctx'> 	struct ptc_stats *stat = bcp-&gt;statp;</div><div class='ctx'> 	struct bau_control *hmaster = bcp-&gt;uvhub_master;</div><div class='add'>+	struct uv1_bau_msg_header *uv1_hdr = NULL;</div><div class='add'>+	struct uv2_bau_msg_header *uv2_hdr = NULL;</div><div class='add'>+	struct bau_desc *bau_desc;</div><div class='ctx'> </div><div class='del'>-	if (is_uv1_hub())</div><div class='add'>+	if (bcp-&gt;uvhub_version == 1)</div><div class='ctx'> 		uv1_throttle(hmaster, stat);</div><div class='ctx'> </div><div class='ctx'> 	while (hmaster-&gt;uvhub_quiesce)</div><div class='hunk'>@@ -772,22 +891,39 @@ int uv_flush_send_and_wait(struct bau_desc *bau_desc,</div><div class='ctx'> </div><div class='ctx'> 	time1 = get_cycles();</div><div class='ctx'> 	do {</div><div class='del'>-		if (try == 0) {</div><div class='del'>-			bau_desc-&gt;header.msg_type = MSG_REGULAR;</div><div class='add'>+		bau_desc = bcp-&gt;descriptor_base;</div><div class='add'>+		bau_desc += (ITEMS_PER_DESC * bcp-&gt;using_desc);</div><div class='add'>+		if (bcp-&gt;uvhub_version == 1) {</div><div class='add'>+			uv1 = 1;</div><div class='add'>+			uv1_hdr = &amp;bau_desc-&gt;header.uv1_hdr;</div><div class='add'>+		} else</div><div class='add'>+			uv2_hdr = &amp;bau_desc-&gt;header.uv2_hdr;</div><div class='add'>+		if ((try == 0) || (completion_stat == FLUSH_RETRY_BUSYBUG)) {</div><div class='add'>+			if (uv1)</div><div class='add'>+				uv1_hdr-&gt;msg_type = MSG_REGULAR;</div><div class='add'>+			else</div><div class='add'>+				uv2_hdr-&gt;msg_type = MSG_REGULAR;</div><div class='ctx'> 			seq_number = bcp-&gt;message_number++;</div><div class='ctx'> 		} else {</div><div class='del'>-			bau_desc-&gt;header.msg_type = MSG_RETRY;</div><div class='add'>+			if (uv1)</div><div class='add'>+				uv1_hdr-&gt;msg_type = MSG_RETRY;</div><div class='add'>+			else</div><div class='add'>+				uv2_hdr-&gt;msg_type = MSG_RETRY;</div><div class='ctx'> 			stat-&gt;s_retry_messages++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		bau_desc-&gt;header.sequence = seq_number;</div><div class='del'>-		index = (1UL &lt;&lt; AS_PUSH_SHIFT) | bcp-&gt;uvhub_cpu;</div><div class='add'>+		if (uv1)</div><div class='add'>+			uv1_hdr-&gt;sequence = seq_number;</div><div class='add'>+		else</div><div class='add'>+			uv2_hdr-&gt;sequence = seq_number;</div><div class='add'>+		index = (1UL &lt;&lt; AS_PUSH_SHIFT) | bcp-&gt;using_desc;</div><div class='ctx'> 		bcp-&gt;send_message = get_cycles();</div><div class='ctx'> </div><div class='ctx'> 		write_mmr_activation(index);</div><div class='ctx'> </div><div class='ctx'> 		try++;</div><div class='ctx'> 		completion_stat = wait_completion(bau_desc, bcp, try);</div><div class='add'>+		/* UV2: wait_completion() may change the bcp-&gt;using_desc */</div><div class='ctx'> </div><div class='ctx'> 		handle_cmplt(completion_stat, bau_desc, bcp, hmaster, stat);</div><div class='ctx'> </div><div class='hunk'>@@ -798,6 +934,7 @@ int uv_flush_send_and_wait(struct bau_desc *bau_desc,</div><div class='ctx'> 		}</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> 	} while ((completion_stat == FLUSH_RETRY_PLUGGED) ||</div><div class='add'>+		 (completion_stat == FLUSH_RETRY_BUSYBUG) ||</div><div class='ctx'> 		 (completion_stat == FLUSH_RETRY_TIMEOUT));</div><div class='ctx'> </div><div class='ctx'> 	time2 = get_cycles();</div><div class='hunk'>@@ -812,6 +949,7 @@ int uv_flush_send_and_wait(struct bau_desc *bau_desc,</div><div class='ctx'> 	record_send_stats(time1, time2, bcp, stat, completion_stat, try);</div><div class='ctx'> </div><div class='ctx'> 	if (completion_stat == FLUSH_GIVEUP)</div><div class='add'>+		/* FLUSH_GIVEUP will fall back to using IPI's for tlb flush */</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -967,7 +1105,7 @@ const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask,</div><div class='ctx'> 		stat-&gt;s_ntargself++;</div><div class='ctx'> </div><div class='ctx'> 	bau_desc = bcp-&gt;descriptor_base;</div><div class='del'>-	bau_desc += ITEMS_PER_DESC * bcp-&gt;uvhub_cpu;</div><div class='add'>+	bau_desc += (ITEMS_PER_DESC * bcp-&gt;using_desc);</div><div class='ctx'> 	bau_uvhubs_clear(&amp;bau_desc-&gt;distribution, UV_DISTRIBUTION_SIZE);</div><div class='ctx'> 	if (set_distrib_bits(flush_mask, bcp, bau_desc, &amp;locals, &amp;remotes))</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -980,13 +1118,86 @@ const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask,</div><div class='ctx'> 	 * uv_flush_send_and_wait returns 0 if all cpu's were messaged,</div><div class='ctx'> 	 * or 1 if it gave up and the original cpumask should be returned.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!uv_flush_send_and_wait(bau_desc, flush_mask, bcp))</div><div class='add'>+	if (!uv_flush_send_and_wait(flush_mask, bcp))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	else</div><div class='ctx'> 		return cpumask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Search the message queue for any 'other' message with the same software</div><div class='add'>+ * acknowledge resource bit vector.</div><div class='add'>+ */</div><div class='add'>+struct bau_pq_entry *find_another_by_swack(struct bau_pq_entry *msg,</div><div class='add'>+			struct bau_control *bcp, unsigned char swack_vec)</div><div class='add'>+{</div><div class='add'>+	struct bau_pq_entry *msg_next = msg + 1;</div><div class='add'>+</div><div class='add'>+	if (msg_next &gt; bcp-&gt;queue_last)</div><div class='add'>+		msg_next = bcp-&gt;queue_first;</div><div class='add'>+	while ((msg_next-&gt;swack_vec != 0) &amp;&amp; (msg_next != msg)) {</div><div class='add'>+		if (msg_next-&gt;swack_vec == swack_vec)</div><div class='add'>+			return msg_next;</div><div class='add'>+		msg_next++;</div><div class='add'>+		if (msg_next &gt; bcp-&gt;queue_last)</div><div class='add'>+			msg_next = bcp-&gt;queue_first;</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'>+ * UV2 needs to work around a bug in which an arriving message has not</div><div class='add'>+ * set a bit in the UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE register.</div><div class='add'>+ * Such a message must be ignored.</div><div class='add'>+ */</div><div class='add'>+void process_uv2_message(struct msg_desc *mdp, struct bau_control *bcp)</div><div class='add'>+{</div><div class='add'>+	unsigned long mmr_image;</div><div class='add'>+	unsigned char swack_vec;</div><div class='add'>+	struct bau_pq_entry *msg = mdp-&gt;msg;</div><div class='add'>+	struct bau_pq_entry *other_msg;</div><div class='add'>+</div><div class='add'>+	mmr_image = read_mmr_sw_ack();</div><div class='add'>+	swack_vec = msg-&gt;swack_vec;</div><div class='add'>+</div><div class='add'>+	if ((swack_vec &amp; mmr_image) == 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * This message was assigned a swack resource, but no</div><div class='add'>+		 * reserved acknowlegment is pending.</div><div class='add'>+		 * The bug has prevented this message from setting the MMR.</div><div class='add'>+		 * And no other message has used the same sw_ack resource.</div><div class='add'>+		 * Do the requested shootdown but do not reply to the msg.</div><div class='add'>+		 * (the 0 means make no acknowledge)</div><div class='add'>+		 */</div><div class='add'>+		bau_process_message(mdp, bcp, 0);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Some message has set the MMR 'pending' bit; it might have been</div><div class='add'>+	 * another message.  Look for that message.</div><div class='add'>+	 */</div><div class='add'>+	other_msg = find_another_by_swack(msg, bcp, msg-&gt;swack_vec);</div><div class='add'>+	if (other_msg) {</div><div class='add'>+		/* There is another.  Do not ack the current one. */</div><div class='add'>+		bau_process_message(mdp, bcp, 0);</div><div class='add'>+		/*</div><div class='add'>+		 * Let the natural processing of that message acknowledge</div><div class='add'>+		 * it. Don't get the processing of sw_ack's out of order.</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'>+	 * There is no other message using this sw_ack, so it is safe to</div><div class='add'>+	 * acknowledge it.</div><div class='add'>+	 */</div><div class='add'>+	bau_process_message(mdp, bcp, 1);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * The BAU message interrupt comes here. (registered by set_intr_gate)</div><div class='ctx'>  * See entry_64.S</div><div class='ctx'>  *</div><div class='hunk'>@@ -1009,6 +1220,7 @@ void uv_bau_message_interrupt(struct pt_regs *regs)</div><div class='ctx'> 	struct ptc_stats *stat;</div><div class='ctx'> 	struct msg_desc msgdesc;</div><div class='ctx'> </div><div class='add'>+	ack_APIC_irq();</div><div class='ctx'> 	time_start = get_cycles();</div><div class='ctx'> </div><div class='ctx'> 	bcp = &amp;per_cpu(bau_control, smp_processor_id());</div><div class='hunk'>@@ -1022,9 +1234,11 @@ void uv_bau_message_interrupt(struct pt_regs *regs)</div><div class='ctx'> 		count++;</div><div class='ctx'> </div><div class='ctx'> 		msgdesc.msg_slot = msg - msgdesc.queue_first;</div><div class='del'>-		msgdesc.swack_slot = ffs(msg-&gt;swack_vec) - 1;</div><div class='ctx'> 		msgdesc.msg = msg;</div><div class='del'>-		bau_process_message(&amp;msgdesc, bcp);</div><div class='add'>+		if (bcp-&gt;uvhub_version == 2)</div><div class='add'>+			process_uv2_message(&amp;msgdesc, bcp);</div><div class='add'>+		else</div><div class='add'>+			bau_process_message(&amp;msgdesc, bcp, 1);</div><div class='ctx'> </div><div class='ctx'> 		msg++;</div><div class='ctx'> 		if (msg &gt; msgdesc.queue_last)</div><div class='hunk'>@@ -1036,8 +1250,6 @@ void uv_bau_message_interrupt(struct pt_regs *regs)</div><div class='ctx'> 		stat-&gt;d_nomsg++;</div><div class='ctx'> 	else if (count &gt; 1)</div><div class='ctx'> 		stat-&gt;d_multmsg++;</div><div class='del'>-</div><div class='del'>-	ack_APIC_irq();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1083,7 +1295,7 @@ static void __init enable_timeouts(void)</div><div class='ctx'> 		 */</div><div class='ctx'> 		mmr_image |= (1L &lt;&lt; SOFTACK_MSHIFT);</div><div class='ctx'> 		if (is_uv2_hub()) {</div><div class='del'>-			mmr_image |= (1L &lt;&lt; UV2_LEG_SHFT);</div><div class='add'>+			mmr_image &amp;= ~(1L &lt;&lt; UV2_LEG_SHFT);</div><div class='ctx'> 			mmr_image |= (1L &lt;&lt; UV2_EXT_SHFT);</div><div class='ctx'> 		}</div><div class='ctx'> 		write_mmr_misc_control(pnode, mmr_image);</div><div class='hunk'>@@ -1136,13 +1348,13 @@ static int ptc_seq_show(struct seq_file *file, void *data)</div><div class='ctx'> 		seq_printf(file,</div><div class='ctx'> 			"remotehub numuvhubs numuvhubs16 numuvhubs8 ");</div><div class='ctx'> 		seq_printf(file,</div><div class='del'>-			"numuvhubs4 numuvhubs2 numuvhubs1 dto retries rok ");</div><div class='add'>+		    "numuvhubs4 numuvhubs2 numuvhubs1 dto snacks retries rok ");</div><div class='ctx'> 		seq_printf(file,</div><div class='ctx'> 			"resetp resett giveup sto bz throt swack recv rtime ");</div><div class='ctx'> 		seq_printf(file,</div><div class='ctx'> 			"all one mult none retry canc nocan reset rcan ");</div><div class='ctx'> 		seq_printf(file,</div><div class='del'>-			"disable enable\n");</div><div class='add'>+			"disable enable wars warshw warwaits\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (cpu &lt; num_possible_cpus() &amp;&amp; cpu_online(cpu)) {</div><div class='ctx'> 		stat = &amp;per_cpu(ptcstats, cpu);</div><div class='hunk'>@@ -1154,10 +1366,10 @@ static int ptc_seq_show(struct seq_file *file, void *data)</div><div class='ctx'> 			   stat-&gt;s_ntargremotes, stat-&gt;s_ntargcpu,</div><div class='ctx'> 			   stat-&gt;s_ntarglocaluvhub, stat-&gt;s_ntargremoteuvhub,</div><div class='ctx'> 			   stat-&gt;s_ntarguvhub, stat-&gt;s_ntarguvhub16);</div><div class='del'>-		seq_printf(file, "%ld %ld %ld %ld %ld ",</div><div class='add'>+		seq_printf(file, "%ld %ld %ld %ld %ld %ld ",</div><div class='ctx'> 			   stat-&gt;s_ntarguvhub8, stat-&gt;s_ntarguvhub4,</div><div class='ctx'> 			   stat-&gt;s_ntarguvhub2, stat-&gt;s_ntarguvhub1,</div><div class='del'>-			   stat-&gt;s_dtimeout);</div><div class='add'>+			   stat-&gt;s_dtimeout, stat-&gt;s_strongnacks);</div><div class='ctx'> 		seq_printf(file, "%ld %ld %ld %ld %ld %ld %ld %ld ",</div><div class='ctx'> 			   stat-&gt;s_retry_messages, stat-&gt;s_retriesok,</div><div class='ctx'> 			   stat-&gt;s_resets_plug, stat-&gt;s_resets_timeout,</div><div class='hunk'>@@ -1173,8 +1385,10 @@ static int ptc_seq_show(struct seq_file *file, void *data)</div><div class='ctx'> 			   stat-&gt;d_nomsg, stat-&gt;d_retries, stat-&gt;d_canceled,</div><div class='ctx'> 			   stat-&gt;d_nocanceled, stat-&gt;d_resets,</div><div class='ctx'> 			   stat-&gt;d_rcanceled);</div><div class='del'>-		seq_printf(file, "%ld %ld\n",</div><div class='del'>-			stat-&gt;s_bau_disabled, stat-&gt;s_bau_reenabled);</div><div class='add'>+		seq_printf(file, "%ld %ld %ld %ld %ld\n",</div><div class='add'>+			stat-&gt;s_bau_disabled, stat-&gt;s_bau_reenabled,</div><div class='add'>+			stat-&gt;s_uv2_wars, stat-&gt;s_uv2_wars_hw,</div><div class='add'>+			stat-&gt;s_uv2_war_waits);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1432,12 +1646,15 @@ static void activation_descriptor_init(int node, int pnode, int base_pnode)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int cpu;</div><div class='add'>+	int uv1 = 0;</div><div class='ctx'> 	unsigned long gpa;</div><div class='ctx'> 	unsigned long m;</div><div class='ctx'> 	unsigned long n;</div><div class='ctx'> 	size_t dsize;</div><div class='ctx'> 	struct bau_desc *bau_desc;</div><div class='ctx'> 	struct bau_desc *bd2;</div><div class='add'>+	struct uv1_bau_msg_header *uv1_hdr;</div><div class='add'>+	struct uv2_bau_msg_header *uv2_hdr;</div><div class='ctx'> 	struct bau_control *bcp;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1451,6 +1668,8 @@ static void activation_descriptor_init(int node, int pnode, int base_pnode)</div><div class='ctx'> 	gpa = uv_gpa(bau_desc);</div><div class='ctx'> 	n = uv_gpa_to_gnode(gpa);</div><div class='ctx'> 	m = uv_gpa_to_offset(gpa);</div><div class='add'>+	if (is_uv1_hub())</div><div class='add'>+		uv1 = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* the 14-bit pnode */</div><div class='ctx'> 	write_mmr_descriptor_base(pnode, (n &lt;&lt; UV_DESC_PSHIFT | m));</div><div class='hunk'>@@ -1461,21 +1680,33 @@ static void activation_descriptor_init(int node, int pnode, int base_pnode)</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0, bd2 = bau_desc; i &lt; (ADP_SZ * ITEMS_PER_DESC); i++, bd2++) {</div><div class='ctx'> 		memset(bd2, 0, sizeof(struct bau_desc));</div><div class='del'>-		bd2-&gt;header.swack_flag =	1;</div><div class='del'>-		/*</div><div class='del'>-		 * The base_dest_nasid set in the message header is the nasid</div><div class='del'>-		 * of the first uvhub in the partition. The bit map will</div><div class='del'>-		 * indicate destination pnode numbers relative to that base.</div><div class='del'>-		 * They may not be consecutive if nasid striding is being used.</div><div class='del'>-		 */</div><div class='del'>-		bd2-&gt;header.base_dest_nasid =	UV_PNODE_TO_NASID(base_pnode);</div><div class='del'>-		bd2-&gt;header.dest_subnodeid =	UV_LB_SUBNODEID;</div><div class='del'>-		bd2-&gt;header.command =		UV_NET_ENDPOINT_INTD;</div><div class='del'>-		bd2-&gt;header.int_both =		1;</div><div class='del'>-		/*</div><div class='del'>-		 * all others need to be set to zero:</div><div class='del'>-		 *   fairness chaining multilevel count replied_to</div><div class='del'>-		 */</div><div class='add'>+		if (uv1) {</div><div class='add'>+			uv1_hdr = &amp;bd2-&gt;header.uv1_hdr;</div><div class='add'>+			uv1_hdr-&gt;swack_flag =	1;</div><div class='add'>+			/*</div><div class='add'>+			 * The base_dest_nasid set in the message header</div><div class='add'>+			 * is the nasid of the first uvhub in the partition.</div><div class='add'>+			 * The bit map will indicate destination pnode numbers</div><div class='add'>+			 * relative to that base. They may not be consecutive</div><div class='add'>+			 * if nasid striding is being used.</div><div class='add'>+			 */</div><div class='add'>+			uv1_hdr-&gt;base_dest_nasid =</div><div class='add'>+						UV_PNODE_TO_NASID(base_pnode);</div><div class='add'>+			uv1_hdr-&gt;dest_subnodeid =	UV_LB_SUBNODEID;</div><div class='add'>+			uv1_hdr-&gt;command =		UV_NET_ENDPOINT_INTD;</div><div class='add'>+			uv1_hdr-&gt;int_both =		1;</div><div class='add'>+			/*</div><div class='add'>+			 * all others need to be set to zero:</div><div class='add'>+			 *   fairness chaining multilevel count replied_to</div><div class='add'>+			 */</div><div class='add'>+		} else {</div><div class='add'>+			uv2_hdr = &amp;bd2-&gt;header.uv2_hdr;</div><div class='add'>+			uv2_hdr-&gt;swack_flag =	1;</div><div class='add'>+			uv2_hdr-&gt;base_dest_nasid =</div><div class='add'>+						UV_PNODE_TO_NASID(base_pnode);</div><div class='add'>+			uv2_hdr-&gt;dest_subnodeid =	UV_LB_SUBNODEID;</div><div class='add'>+			uv2_hdr-&gt;command =		UV_NET_ENDPOINT_INTD;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	for_each_present_cpu(cpu) {</div><div class='ctx'> 		if (pnode != uv_blade_to_pnode(uv_cpu_to_blade_id(cpu)))</div><div class='hunk'>@@ -1531,6 +1762,7 @@ static void pq_init(int node, int pnode)</div><div class='ctx'> 	write_mmr_payload_first(pnode, pn_first);</div><div class='ctx'> 	write_mmr_payload_tail(pnode, first);</div><div class='ctx'> 	write_mmr_payload_last(pnode, last);</div><div class='add'>+	write_gmmr_sw_ack(pnode, 0xffffUL);</div><div class='ctx'> </div><div class='ctx'> 	/* in effect, all msg_type's are set to MSG_NOOP */</div><div class='ctx'> 	memset(pqp, 0, sizeof(struct bau_pq_entry) * DEST_Q_SIZE);</div><div class='hunk'>@@ -1584,14 +1816,14 @@ static int calculate_destination_timeout(void)</div><div class='ctx'> 		ts_ns = base * mult1 * mult2;</div><div class='ctx'> 		ret = ts_ns / 1000;</div><div class='ctx'> 	} else {</div><div class='del'>-		/* 4 bits  0/1 for 10/80us, 3 bits of multiplier */</div><div class='del'>-		mmr_image = uv_read_local_mmr(UVH_AGING_PRESCALE_SEL);</div><div class='add'>+		/* 4 bits  0/1 for 10/80us base, 3 bits of multiplier */</div><div class='add'>+		mmr_image = uv_read_local_mmr(UVH_LB_BAU_MISC_CONTROL);</div><div class='ctx'> 		mmr_image = (mmr_image &amp; UV_SA_MASK) &gt;&gt; UV_SA_SHFT;</div><div class='ctx'> 		if (mmr_image &amp; (1L &lt;&lt; UV2_ACK_UNITS_SHFT))</div><div class='del'>-			mult1 = 80;</div><div class='add'>+			base = 80;</div><div class='ctx'> 		else</div><div class='del'>-			mult1 = 10;</div><div class='del'>-		base = mmr_image &amp; UV2_ACK_MASK;</div><div class='add'>+			base = 10;</div><div class='add'>+		mult1 = mmr_image &amp; UV2_ACK_MASK;</div><div class='ctx'> 		ret = mult1 * base;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1618,6 +1850,7 @@ static void __init init_per_cpu_tunables(void)</div><div class='ctx'> 		bcp-&gt;cong_response_us		= congested_respns_us;</div><div class='ctx'> 		bcp-&gt;cong_reps			= congested_reps;</div><div class='ctx'> 		bcp-&gt;cong_period		= congested_period;</div><div class='add'>+		bcp-&gt;clocks_per_100_usec =	usec_2_cycles(100);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1728,8 +1961,17 @@ static int scan_sock(struct socket_desc *sdp, struct uvhub_desc *bdp,</div><div class='ctx'> 		bcp-&gt;cpus_in_socket = sdp-&gt;num_cpus;</div><div class='ctx'> 		bcp-&gt;socket_master = *smasterp;</div><div class='ctx'> 		bcp-&gt;uvhub = bdp-&gt;uvhub;</div><div class='add'>+		if (is_uv1_hub())</div><div class='add'>+			bcp-&gt;uvhub_version = 1;</div><div class='add'>+		else if (is_uv2_hub())</div><div class='add'>+			bcp-&gt;uvhub_version = 2;</div><div class='add'>+		else {</div><div class='add'>+			printk(KERN_EMERG "uvhub version not 1 or 2\n");</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='ctx'> 		bcp-&gt;uvhub_master = *hmasterp;</div><div class='ctx'> 		bcp-&gt;uvhub_cpu = uv_cpu_hub_info(cpu)-&gt;blade_processor_id;</div><div class='add'>+		bcp-&gt;using_desc = bcp-&gt;uvhub_cpu;</div><div class='ctx'> 		if (bcp-&gt;uvhub_cpu &gt;= MAX_CPUS_PER_UVHUB) {</div><div class='ctx'> 			printk(KERN_EMERG "%d cpus per uvhub invalid\n",</div><div class='ctx'> 				bcp-&gt;uvhub_cpu);</div><div class='hunk'>@@ -1845,6 +2087,8 @@ static int __init uv_bau_init(void)</div><div class='ctx'> 			uv_base_pnode = uv_blade_to_pnode(uvhub);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	enable_timeouts();</div><div class='add'>+</div><div class='ctx'> 	if (init_per_cpu(nuvhubs, uv_base_pnode)) {</div><div class='ctx'> 		nobau = 1;</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1855,7 +2099,6 @@ static int __init uv_bau_init(void)</div><div class='ctx'> 		if (uv_blade_nr_possible_cpus(uvhub))</div><div class='ctx'> 			init_uvhub(uvhub, vector, uv_base_pnode);</div><div class='ctx'> </div><div class='del'>-	enable_timeouts();</div><div class='ctx'> 	alloc_intr_gate(vector, uv_bau_message_intr1);</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_blade(uvhub) {</div><div class='hunk'>@@ -1867,7 +2110,8 @@ static int __init uv_bau_init(void)</div><div class='ctx'> 			val = 1L &lt;&lt; 63;</div><div class='ctx'> 			write_gmmr_activation(pnode, val);</div><div class='ctx'> 			mmr = 1; /* should be 1 to broadcast to both sockets */</div><div class='del'>-			write_mmr_data_broadcast(pnode, mmr);</div><div class='add'>+			if (!is_uv1_hub())</div><div class='add'>+				write_mmr_data_broadcast(pnode, mmr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/platform/uv/uv_sysfs.c b/arch/x86/platform/uv/uv_sysfs.c<br/>index 309c70fb7759..5d4ba301e776 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/platform/uv/uv_sysfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/platform/uv/uv_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/platform/uv/uv_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/platform/uv/uv_sysfs.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'>  *  Copyright (c) Russ Anderson</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;asm/uv/bios.h&gt;</div><div class='ctx'> #include &lt;asm/uv/uv.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/syscalls/Makefile b/arch/x86/syscalls/Makefile<br/>new file mode 100644<br/>index 000000000000..564b2476fede<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/syscalls/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/syscalls/Makefile</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+out := $(obj)/../include/generated/asm</div><div class='add'>+</div><div class='add'>+# Create output directory if not already present</div><div class='add'>+_dummy := $(shell [ -d '$(out)' ] || mkdir -p '$(out)')</div><div class='add'>+</div><div class='add'>+syscall32 := $(srctree)/$(src)/syscall_32.tbl</div><div class='add'>+syscall64 := $(srctree)/$(src)/syscall_64.tbl</div><div class='add'>+</div><div class='add'>+syshdr := $(srctree)/$(src)/syscallhdr.sh</div><div class='add'>+systbl := $(srctree)/$(src)/syscalltbl.sh</div><div class='add'>+</div><div class='add'>+quiet_cmd_syshdr = SYSHDR  $@</div><div class='add'>+      cmd_syshdr = $(CONFIG_SHELL) '$(syshdr)' $&lt; $@ \</div><div class='add'>+		   $(syshdr_abi_$(basetarget)) $(syshdr_pfx_$(basetarget))</div><div class='add'>+quiet_cmd_systbl = SYSTBL  $@</div><div class='add'>+      cmd_systbl = $(CONFIG_SHELL) '$(systbl)' $&lt; $@</div><div class='add'>+</div><div class='add'>+syshdr_abi_unistd_32 := i386</div><div class='add'>+$(out)/unistd_32.h: $(syscall32) $(syshdr)</div><div class='add'>+	$(call if_changed,syshdr)</div><div class='add'>+</div><div class='add'>+syshdr_abi_unistd_32_ia32 := i386</div><div class='add'>+syshdr_pfx_unistd_32_ia32 := ia32_</div><div class='add'>+$(out)/unistd_32_ia32.h: $(syscall32) $(syshdr)</div><div class='add'>+	$(call if_changed,syshdr)</div><div class='add'>+</div><div class='add'>+syshdr_abi_unistd_64 := 64</div><div class='add'>+$(out)/unistd_64.h: $(syscall64) $(syshdr)</div><div class='add'>+	$(call if_changed,syshdr)</div><div class='add'>+</div><div class='add'>+$(out)/syscalls_32.h: $(syscall32) $(systbl)</div><div class='add'>+	$(call if_changed,systbl)</div><div class='add'>+$(out)/syscalls_64.h: $(syscall64) $(systbl)</div><div class='add'>+	$(call if_changed,systbl)</div><div class='add'>+</div><div class='add'>+syshdr-y			+= unistd_32.h unistd_64.h</div><div class='add'>+syshdr-y			+= syscalls_32.h</div><div class='add'>+syshdr-$(CONFIG_X86_64)		+= unistd_32_ia32.h</div><div class='add'>+syshdr-$(CONFIG_X86_64)		+= syscalls_64.h</div><div class='add'>+</div><div class='add'>+targets	+= $(syshdr-y)</div><div class='add'>+</div><div class='add'>+all: $(addprefix $(out)/,$(targets))</div><div class='head'>diff --git a/arch/x86/syscalls/syscall_32.tbl b/arch/x86/syscalls/syscall_32.tbl<br/>new file mode 100644<br/>index 000000000000..ce98e287c066<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/syscalls/syscall_32.tbl?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/syscalls/syscall_32.tbl</a></div><div class='hunk'>@@ -0,0 +1,357 @@</div><div class='add'>+#</div><div class='add'>+# 32-bit system call numbers and entry vectors</div><div class='add'>+#</div><div class='add'>+# The format is:</div><div class='add'>+# &lt;number&gt; &lt;abi&gt; &lt;name&gt; &lt;entry point&gt; &lt;compat entry point&gt;</div><div class='add'>+#</div><div class='add'>+# The abi is always "i386" for this file.</div><div class='add'>+#</div><div class='add'>+0	i386	restart_syscall		sys_restart_syscall</div><div class='add'>+1	i386	exit			sys_exit</div><div class='add'>+2	i386	fork			ptregs_fork			stub32_fork</div><div class='add'>+3	i386	read			sys_read</div><div class='add'>+4	i386	write			sys_write</div><div class='add'>+5	i386	open			sys_open			compat_sys_open</div><div class='add'>+6	i386	close			sys_close</div><div class='add'>+7	i386	waitpid			sys_waitpid			sys32_waitpid</div><div class='add'>+8	i386	creat			sys_creat</div><div class='add'>+9	i386	link			sys_link</div><div class='add'>+10	i386	unlink			sys_unlink</div><div class='add'>+11	i386	execve			ptregs_execve			stub32_execve</div><div class='add'>+12	i386	chdir			sys_chdir</div><div class='add'>+13	i386	time			sys_time			compat_sys_time</div><div class='add'>+14	i386	mknod			sys_mknod</div><div class='add'>+15	i386	chmod			sys_chmod</div><div class='add'>+16	i386	lchown			sys_lchown16</div><div class='add'>+17	i386	break</div><div class='add'>+18	i386	oldstat			sys_stat</div><div class='add'>+19	i386	lseek			sys_lseek			sys32_lseek</div><div class='add'>+20	i386	getpid			sys_getpid</div><div class='add'>+21	i386	mount			sys_mount			compat_sys_mount</div><div class='add'>+22	i386	umount			sys_oldumount</div><div class='add'>+23	i386	setuid			sys_setuid16</div><div class='add'>+24	i386	getuid			sys_getuid16</div><div class='add'>+25	i386	stime			sys_stime			compat_sys_stime</div><div class='add'>+26	i386	ptrace			sys_ptrace			compat_sys_ptrace</div><div class='add'>+27	i386	alarm			sys_alarm</div><div class='add'>+28	i386	oldfstat		sys_fstat</div><div class='add'>+29	i386	pause			sys_pause</div><div class='add'>+30	i386	utime			sys_utime			compat_sys_utime</div><div class='add'>+31	i386	stty</div><div class='add'>+32	i386	gtty</div><div class='add'>+33	i386	access			sys_access</div><div class='add'>+34	i386	nice			sys_nice</div><div class='add'>+35	i386	ftime</div><div class='add'>+36	i386	sync			sys_sync</div><div class='add'>+37	i386	kill			sys_kill			sys32_kill</div><div class='add'>+38	i386	rename			sys_rename</div><div class='add'>+39	i386	mkdir			sys_mkdir</div><div class='add'>+40	i386	rmdir			sys_rmdir</div><div class='add'>+41	i386	dup			sys_dup</div><div class='add'>+42	i386	pipe			sys_pipe</div><div class='add'>+43	i386	times			sys_times			compat_sys_times</div><div class='add'>+44	i386	prof</div><div class='add'>+45	i386	brk			sys_brk</div><div class='add'>+46	i386	setgid			sys_setgid16</div><div class='add'>+47	i386	getgid			sys_getgid16</div><div class='add'>+48	i386	signal			sys_signal</div><div class='add'>+49	i386	geteuid			sys_geteuid16</div><div class='add'>+50	i386	getegid			sys_getegid16</div><div class='add'>+51	i386	acct			sys_acct</div><div class='add'>+52	i386	umount2			sys_umount</div><div class='add'>+53	i386	lock</div><div class='add'>+54	i386	ioctl			sys_ioctl			compat_sys_ioctl</div><div class='add'>+55	i386	fcntl			sys_fcntl			compat_sys_fcntl64</div><div class='add'>+56	i386	mpx</div><div class='add'>+57	i386	setpgid			sys_setpgid</div><div class='add'>+58	i386	ulimit</div><div class='add'>+59	i386	oldolduname		sys_olduname</div><div class='add'>+60	i386	umask			sys_umask</div><div class='add'>+61	i386	chroot			sys_chroot</div><div class='add'>+62	i386	ustat			sys_ustat			compat_sys_ustat</div><div class='add'>+63	i386	dup2			sys_dup2</div><div class='add'>+64	i386	getppid			sys_getppid</div><div class='add'>+65	i386	getpgrp			sys_getpgrp</div><div class='add'>+66	i386	setsid			sys_setsid</div><div class='add'>+67	i386	sigaction		sys_sigaction			sys32_sigaction</div><div class='add'>+68	i386	sgetmask		sys_sgetmask</div><div class='add'>+69	i386	ssetmask		sys_ssetmask</div><div class='add'>+70	i386	setreuid		sys_setreuid16</div><div class='add'>+71	i386	setregid		sys_setregid16</div><div class='add'>+72	i386	sigsuspend		sys_sigsuspend			sys32_sigsuspend</div><div class='add'>+73	i386	sigpending		sys_sigpending			compat_sys_sigpending</div><div class='add'>+74	i386	sethostname		sys_sethostname</div><div class='add'>+75	i386	setrlimit		sys_setrlimit			compat_sys_setrlimit</div><div class='add'>+76	i386	getrlimit		sys_old_getrlimit		compat_sys_old_getrlimit</div><div class='add'>+77	i386	getrusage		sys_getrusage			compat_sys_getrusage</div><div class='add'>+78	i386	gettimeofday		sys_gettimeofday		compat_sys_gettimeofday</div><div class='add'>+79	i386	settimeofday		sys_settimeofday		compat_sys_settimeofday</div><div class='add'>+80	i386	getgroups		sys_getgroups16</div><div class='add'>+81	i386	setgroups		sys_setgroups16</div><div class='add'>+82	i386	select			sys_old_select			compat_sys_old_select</div><div class='add'>+83	i386	symlink			sys_symlink</div><div class='add'>+84	i386	oldlstat		sys_lstat</div><div class='add'>+85	i386	readlink		sys_readlink</div><div class='add'>+86	i386	uselib			sys_uselib</div><div class='add'>+87	i386	swapon			sys_swapon</div><div class='add'>+88	i386	reboot			sys_reboot</div><div class='add'>+89	i386	readdir			sys_old_readdir			compat_sys_old_readdir</div><div class='add'>+90	i386	mmap			sys_old_mmap			sys32_mmap</div><div class='add'>+91	i386	munmap			sys_munmap</div><div class='add'>+92	i386	truncate		sys_truncate</div><div class='add'>+93	i386	ftruncate		sys_ftruncate</div><div class='add'>+94	i386	fchmod			sys_fchmod</div><div class='add'>+95	i386	fchown			sys_fchown16</div><div class='add'>+96	i386	getpriority		sys_getpriority</div><div class='add'>+97	i386	setpriority		sys_setpriority</div><div class='add'>+98	i386	profil</div><div class='add'>+99	i386	statfs			sys_statfs			compat_sys_statfs</div><div class='add'>+100	i386	fstatfs			sys_fstatfs			compat_sys_fstatfs</div><div class='add'>+101	i386	ioperm			sys_ioperm</div><div class='add'>+102	i386	socketcall		sys_socketcall			compat_sys_socketcall</div><div class='add'>+103	i386	syslog			sys_syslog</div><div class='add'>+104	i386	setitimer		sys_setitimer			compat_sys_setitimer</div><div class='add'>+105	i386	getitimer		sys_getitimer			compat_sys_getitimer</div><div class='add'>+106	i386	stat			sys_newstat			compat_sys_newstat</div><div class='add'>+107	i386	lstat			sys_newlstat			compat_sys_newlstat</div><div class='add'>+108	i386	fstat			sys_newfstat			compat_sys_newfstat</div><div class='add'>+109	i386	olduname		sys_uname</div><div class='add'>+110	i386	iopl			ptregs_iopl			stub32_iopl</div><div class='add'>+111	i386	vhangup			sys_vhangup</div><div class='add'>+112	i386	idle</div><div class='add'>+113	i386	vm86old			ptregs_vm86old			sys32_vm86_warning</div><div class='add'>+114	i386	wait4			sys_wait4			compat_sys_wait4</div><div class='add'>+115	i386	swapoff			sys_swapoff</div><div class='add'>+116	i386	sysinfo			sys_sysinfo			compat_sys_sysinfo</div><div class='add'>+117	i386	ipc			sys_ipc				sys32_ipc</div><div class='add'>+118	i386	fsync			sys_fsync</div><div class='add'>+119	i386	sigreturn		ptregs_sigreturn		stub32_sigreturn</div><div class='add'>+120	i386	clone			ptregs_clone			stub32_clone</div><div class='add'>+121	i386	setdomainname		sys_setdomainname</div><div class='add'>+122	i386	uname			sys_newuname</div><div class='add'>+123	i386	modify_ldt		sys_modify_ldt</div><div class='add'>+124	i386	adjtimex		sys_adjtimex			compat_sys_adjtimex</div><div class='add'>+125	i386	mprotect		sys_mprotect			sys32_mprotect</div><div class='add'>+126	i386	sigprocmask		sys_sigprocmask			compat_sys_sigprocmask</div><div class='add'>+127	i386	create_module</div><div class='add'>+128	i386	init_module		sys_init_module</div><div class='add'>+129	i386	delete_module		sys_delete_module</div><div class='add'>+130	i386	get_kernel_syms</div><div class='add'>+131	i386	quotactl		sys_quotactl			sys32_quotactl</div><div class='add'>+132	i386	getpgid			sys_getpgid</div><div class='add'>+133	i386	fchdir			sys_fchdir</div><div class='add'>+134	i386	bdflush			sys_bdflush</div><div class='add'>+135	i386	sysfs			sys_sysfs</div><div class='add'>+136	i386	personality		sys_personality</div><div class='add'>+137	i386	afs_syscall</div><div class='add'>+138	i386	setfsuid		sys_setfsuid16</div><div class='add'>+139	i386	setfsgid		sys_setfsgid16</div><div class='add'>+140	i386	_llseek			sys_llseek</div><div class='add'>+141	i386	getdents		sys_getdents			compat_sys_getdents</div><div class='add'>+142	i386	_newselect		sys_select			compat_sys_select</div><div class='add'>+143	i386	flock			sys_flock</div><div class='add'>+144	i386	msync			sys_msync</div><div class='add'>+145	i386	readv			sys_readv			compat_sys_readv</div><div class='add'>+146	i386	writev			sys_writev			compat_sys_writev</div><div class='add'>+147	i386	getsid			sys_getsid</div><div class='add'>+148	i386	fdatasync		sys_fdatasync</div><div class='add'>+149	i386	_sysctl			sys_sysctl			compat_sys_sysctl</div><div class='add'>+150	i386	mlock			sys_mlock</div><div class='add'>+151	i386	munlock			sys_munlock</div><div class='add'>+152	i386	mlockall		sys_mlockall</div><div class='add'>+153	i386	munlockall		sys_munlockall</div><div class='add'>+154	i386	sched_setparam		sys_sched_setparam</div><div class='add'>+155	i386	sched_getparam		sys_sched_getparam</div><div class='add'>+156	i386	sched_setscheduler	sys_sched_setscheduler</div><div class='add'>+157	i386	sched_getscheduler	sys_sched_getscheduler</div><div class='add'>+158	i386	sched_yield		sys_sched_yield</div><div class='add'>+159	i386	sched_get_priority_max	sys_sched_get_priority_max</div><div class='add'>+160	i386	sched_get_priority_min	sys_sched_get_priority_min</div><div class='add'>+161	i386	sched_rr_get_interval	sys_sched_rr_get_interval	sys32_sched_rr_get_interval</div><div class='add'>+162	i386	nanosleep		sys_nanosleep			compat_sys_nanosleep</div><div class='add'>+163	i386	mremap			sys_mremap</div><div class='add'>+164	i386	setresuid		sys_setresuid16</div><div class='add'>+165	i386	getresuid		sys_getresuid16</div><div class='add'>+166	i386	vm86			ptregs_vm86			sys32_vm86_warning</div><div class='add'>+167	i386	query_module</div><div class='add'>+168	i386	poll			sys_poll</div><div class='add'>+169	i386	nfsservctl</div><div class='add'>+170	i386	setresgid		sys_setresgid16</div><div class='add'>+171	i386	getresgid		sys_getresgid16</div><div class='add'>+172	i386	prctl			sys_prctl</div><div class='add'>+173	i386	rt_sigreturn		ptregs_rt_sigreturn		stub32_rt_sigreturn</div><div class='add'>+174	i386	rt_sigaction		sys_rt_sigaction		sys32_rt_sigaction</div><div class='add'>+175	i386	rt_sigprocmask		sys_rt_sigprocmask		sys32_rt_sigprocmask</div><div class='add'>+176	i386	rt_sigpending		sys_rt_sigpending		sys32_rt_sigpending</div><div class='add'>+177	i386	rt_sigtimedwait		sys_rt_sigtimedwait		compat_sys_rt_sigtimedwait</div><div class='add'>+178	i386	rt_sigqueueinfo		sys_rt_sigqueueinfo		sys32_rt_sigqueueinfo</div><div class='add'>+179	i386	rt_sigsuspend		sys_rt_sigsuspend</div><div class='add'>+180	i386	pread64			sys_pread64			sys32_pread</div><div class='add'>+181	i386	pwrite64		sys_pwrite64			sys32_pwrite</div><div class='add'>+182	i386	chown			sys_chown16</div><div class='add'>+183	i386	getcwd			sys_getcwd</div><div class='add'>+184	i386	capget			sys_capget</div><div class='add'>+185	i386	capset			sys_capset</div><div class='add'>+186	i386	sigaltstack		ptregs_sigaltstack		stub32_sigaltstack</div><div class='add'>+187	i386	sendfile		sys_sendfile			sys32_sendfile</div><div class='add'>+188	i386	getpmsg</div><div class='add'>+189	i386	putpmsg</div><div class='add'>+190	i386	vfork			ptregs_vfork			stub32_vfork</div><div class='add'>+191	i386	ugetrlimit		sys_getrlimit			compat_sys_getrlimit</div><div class='add'>+192	i386	mmap2			sys_mmap_pgoff</div><div class='add'>+193	i386	truncate64		sys_truncate64			sys32_truncate64</div><div class='add'>+194	i386	ftruncate64		sys_ftruncate64			sys32_ftruncate64</div><div class='add'>+195	i386	stat64			sys_stat64			sys32_stat64</div><div class='add'>+196	i386	lstat64			sys_lstat64			sys32_lstat64</div><div class='add'>+197	i386	fstat64			sys_fstat64			sys32_fstat64</div><div class='add'>+198	i386	lchown32		sys_lchown</div><div class='add'>+199	i386	getuid32		sys_getuid</div><div class='add'>+200	i386	getgid32		sys_getgid</div><div class='add'>+201	i386	geteuid32		sys_geteuid</div><div class='add'>+202	i386	getegid32		sys_getegid</div><div class='add'>+203	i386	setreuid32		sys_setreuid</div><div class='add'>+204	i386	setregid32		sys_setregid</div><div class='add'>+205	i386	getgroups32		sys_getgroups</div><div class='add'>+206	i386	setgroups32		sys_setgroups</div><div class='add'>+207	i386	fchown32		sys_fchown</div><div class='add'>+208	i386	setresuid32		sys_setresuid</div><div class='add'>+209	i386	getresuid32		sys_getresuid</div><div class='add'>+210	i386	setresgid32		sys_setresgid</div><div class='add'>+211	i386	getresgid32		sys_getresgid</div><div class='add'>+212	i386	chown32			sys_chown</div><div class='add'>+213	i386	setuid32		sys_setuid</div><div class='add'>+214	i386	setgid32		sys_setgid</div><div class='add'>+215	i386	setfsuid32		sys_setfsuid</div><div class='add'>+216	i386	setfsgid32		sys_setfsgid</div><div class='add'>+217	i386	pivot_root		sys_pivot_root</div><div class='add'>+218	i386	mincore			sys_mincore</div><div class='add'>+219	i386	madvise			sys_madvise</div><div class='add'>+220	i386	getdents64		sys_getdents64			compat_sys_getdents64</div><div class='add'>+221	i386	fcntl64			sys_fcntl64			compat_sys_fcntl64</div><div class='add'>+# 222 is unused</div><div class='add'>+# 223 is unused</div><div class='add'>+224	i386	gettid			sys_gettid</div><div class='add'>+225	i386	readahead		sys_readahead			sys32_readahead</div><div class='add'>+226	i386	setxattr		sys_setxattr</div><div class='add'>+227	i386	lsetxattr		sys_lsetxattr</div><div class='add'>+228	i386	fsetxattr		sys_fsetxattr</div><div class='add'>+229	i386	getxattr		sys_getxattr</div><div class='add'>+230	i386	lgetxattr		sys_lgetxattr</div><div class='add'>+231	i386	fgetxattr		sys_fgetxattr</div><div class='add'>+232	i386	listxattr		sys_listxattr</div><div class='add'>+233	i386	llistxattr		sys_llistxattr</div><div class='add'>+234	i386	flistxattr		sys_flistxattr</div><div class='add'>+235	i386	removexattr		sys_removexattr</div><div class='add'>+236	i386	lremovexattr		sys_lremovexattr</div><div class='add'>+237	i386	fremovexattr		sys_fremovexattr</div><div class='add'>+238	i386	tkill			sys_tkill</div><div class='add'>+239	i386	sendfile64		sys_sendfile64</div><div class='add'>+240	i386	futex			sys_futex			compat_sys_futex</div><div class='add'>+241	i386	sched_setaffinity	sys_sched_setaffinity		compat_sys_sched_setaffinity</div><div class='add'>+242	i386	sched_getaffinity	sys_sched_getaffinity		compat_sys_sched_getaffinity</div><div class='add'>+243	i386	set_thread_area		sys_set_thread_area</div><div class='add'>+244	i386	get_thread_area		sys_get_thread_area</div><div class='add'>+245	i386	io_setup		sys_io_setup			compat_sys_io_setup</div><div class='add'>+246	i386	io_destroy		sys_io_destroy</div><div class='add'>+247	i386	io_getevents		sys_io_getevents		compat_sys_io_getevents</div><div class='add'>+248	i386	io_submit		sys_io_submit			compat_sys_io_submit</div><div class='add'>+249	i386	io_cancel		sys_io_cancel</div><div class='add'>+250	i386	fadvise64		sys_fadvise64			sys32_fadvise64</div><div class='add'>+# 251 is available for reuse (was briefly sys_set_zone_reclaim)</div><div class='add'>+252	i386	exit_group		sys_exit_group</div><div class='add'>+253	i386	lookup_dcookie		sys_lookup_dcookie		sys32_lookup_dcookie</div><div class='add'>+254	i386	epoll_create		sys_epoll_create</div><div class='add'>+255	i386	epoll_ctl		sys_epoll_ctl</div><div class='add'>+256	i386	epoll_wait		sys_epoll_wait</div><div class='add'>+257	i386	remap_file_pages	sys_remap_file_pages</div><div class='add'>+258	i386	set_tid_address		sys_set_tid_address</div><div class='add'>+259	i386	timer_create		sys_timer_create		compat_sys_timer_create</div><div class='add'>+260	i386	timer_settime		sys_timer_settime		compat_sys_timer_settime</div><div class='add'>+261	i386	timer_gettime		sys_timer_gettime		compat_sys_timer_gettime</div><div class='add'>+262	i386	timer_getoverrun	sys_timer_getoverrun</div><div class='add'>+263	i386	timer_delete		sys_timer_delete</div><div class='add'>+264	i386	clock_settime		sys_clock_settime		compat_sys_clock_settime</div><div class='add'>+265	i386	clock_gettime		sys_clock_gettime		compat_sys_clock_gettime</div><div class='add'>+266	i386	clock_getres		sys_clock_getres		compat_sys_clock_getres</div><div class='add'>+267	i386	clock_nanosleep		sys_clock_nanosleep		compat_sys_clock_nanosleep</div><div class='add'>+268	i386	statfs64		sys_statfs64			compat_sys_statfs64</div><div class='add'>+269	i386	fstatfs64		sys_fstatfs64			compat_sys_fstatfs64</div><div class='add'>+270	i386	tgkill			sys_tgkill</div><div class='add'>+271	i386	utimes			sys_utimes			compat_sys_utimes</div><div class='add'>+272	i386	fadvise64_64		sys_fadvise64_64		sys32_fadvise64_64</div><div class='add'>+273	i386	vserver</div><div class='add'>+274	i386	mbind			sys_mbind</div><div class='add'>+275	i386	get_mempolicy		sys_get_mempolicy		compat_sys_get_mempolicy</div><div class='add'>+276	i386	set_mempolicy		sys_set_mempolicy</div><div class='add'>+277	i386	mq_open			sys_mq_open			compat_sys_mq_open</div><div class='add'>+278	i386	mq_unlink		sys_mq_unlink</div><div class='add'>+279	i386	mq_timedsend		sys_mq_timedsend		compat_sys_mq_timedsend</div><div class='add'>+280	i386	mq_timedreceive		sys_mq_timedreceive		compat_sys_mq_timedreceive</div><div class='add'>+281	i386	mq_notify		sys_mq_notify			compat_sys_mq_notify</div><div class='add'>+282	i386	mq_getsetaddr		sys_mq_getsetattr		compat_sys_mq_getsetattr</div><div class='add'>+283	i386	kexec_load		sys_kexec_load			compat_sys_kexec_load</div><div class='add'>+284	i386	waitid			sys_waitid			compat_sys_waitid</div><div class='add'>+# 285 sys_setaltroot</div><div class='add'>+286	i386	add_key			sys_add_key</div><div class='add'>+287	i386	request_key		sys_request_key</div><div class='add'>+288	i386	keyctl			sys_keyctl</div><div class='add'>+289	i386	ioprio_set		sys_ioprio_set</div><div class='add'>+290	i386	ioprio_get		sys_ioprio_get</div><div class='add'>+291	i386	inotify_init		sys_inotify_init</div><div class='add'>+292	i386	inotify_add_watch	sys_inotify_add_watch</div><div class='add'>+293	i386	inotify_rm_watch	sys_inotify_rm_watch</div><div class='add'>+294	i386	migrate_pages		sys_migrate_pages</div><div class='add'>+295	i386	openat			sys_openat			compat_sys_openat</div><div class='add'>+296	i386	mkdirat			sys_mkdirat</div><div class='add'>+297	i386	mknodat			sys_mknodat</div><div class='add'>+298	i386	fchownat		sys_fchownat</div><div class='add'>+299	i386	futimesat		sys_futimesat			compat_sys_futimesat</div><div class='add'>+300	i386	fstatat64		sys_fstatat64			sys32_fstatat</div><div class='add'>+301	i386	unlinkat		sys_unlinkat</div><div class='add'>+302	i386	renameat		sys_renameat</div><div class='add'>+303	i386	linkat			sys_linkat</div><div class='add'>+304	i386	symlinkat		sys_symlinkat</div><div class='add'>+305	i386	readlinkat		sys_readlinkat</div><div class='add'>+306	i386	fchmodat		sys_fchmodat</div><div class='add'>+307	i386	faccessat		sys_faccessat</div><div class='add'>+308	i386	pselect6		sys_pselect6			compat_sys_pselect6</div><div class='add'>+309	i386	ppoll			sys_ppoll			compat_sys_ppoll</div><div class='add'>+310	i386	unshare			sys_unshare</div><div class='add'>+311	i386	set_robust_list		sys_set_robust_list		compat_sys_set_robust_list</div><div class='add'>+312	i386	get_robust_list		sys_get_robust_list		compat_sys_get_robust_list</div><div class='add'>+313	i386	splice			sys_splice</div><div class='add'>+314	i386	sync_file_range		sys_sync_file_range		sys32_sync_file_range</div><div class='add'>+315	i386	tee			sys_tee</div><div class='add'>+316	i386	vmsplice		sys_vmsplice			compat_sys_vmsplice</div><div class='add'>+317	i386	move_pages		sys_move_pages			compat_sys_move_pages</div><div class='add'>+318	i386	getcpu			sys_getcpu</div><div class='add'>+319	i386	epoll_pwait		sys_epoll_pwait</div><div class='add'>+320	i386	utimensat		sys_utimensat			compat_sys_utimensat</div><div class='add'>+321	i386	signalfd		sys_signalfd			compat_sys_signalfd</div><div class='add'>+322	i386	timerfd_create		sys_timerfd_create</div><div class='add'>+323	i386	eventfd			sys_eventfd</div><div class='add'>+324	i386	fallocate		sys_fallocate			sys32_fallocate</div><div class='add'>+325	i386	timerfd_settime		sys_timerfd_settime		compat_sys_timerfd_settime</div><div class='add'>+326	i386	timerfd_gettime		sys_timerfd_gettime		compat_sys_timerfd_gettime</div><div class='add'>+327	i386	signalfd4		sys_signalfd4			compat_sys_signalfd4</div><div class='add'>+328	i386	eventfd2		sys_eventfd2</div><div class='add'>+329	i386	epoll_create1		sys_epoll_create1</div><div class='add'>+330	i386	dup3			sys_dup3</div><div class='add'>+331	i386	pipe2			sys_pipe2</div><div class='add'>+332	i386	inotify_init1		sys_inotify_init1</div><div class='add'>+333	i386	preadv			sys_preadv			compat_sys_preadv</div><div class='add'>+334	i386	pwritev			sys_pwritev			compat_sys_pwritev</div><div class='add'>+335	i386	rt_tgsigqueueinfo	sys_rt_tgsigqueueinfo		compat_sys_rt_tgsigqueueinfo</div><div class='add'>+336	i386	perf_event_open		sys_perf_event_open</div><div class='add'>+337	i386	recvmmsg		sys_recvmmsg			compat_sys_recvmmsg</div><div class='add'>+338	i386	fanotify_init		sys_fanotify_init</div><div class='add'>+339	i386	fanotify_mark		sys_fanotify_mark		sys32_fanotify_mark</div><div class='add'>+340	i386	prlimit64		sys_prlimit64</div><div class='add'>+341	i386	name_to_handle_at	sys_name_to_handle_at</div><div class='add'>+342	i386	open_by_handle_at	sys_open_by_handle_at		compat_sys_open_by_handle_at</div><div class='add'>+343	i386	clock_adjtime		sys_clock_adjtime		compat_sys_clock_adjtime</div><div class='add'>+344	i386	syncfs			sys_syncfs</div><div class='add'>+345	i386	sendmmsg		sys_sendmmsg			compat_sys_sendmmsg</div><div class='add'>+346	i386	setns			sys_setns</div><div class='add'>+347	i386	process_vm_readv	sys_process_vm_readv		compat_sys_process_vm_readv</div><div class='add'>+348	i386	process_vm_writev	sys_process_vm_writev		compat_sys_process_vm_writev</div><div class='head'>diff --git a/arch/x86/syscalls/syscall_64.tbl b/arch/x86/syscalls/syscall_64.tbl<br/>new file mode 100644<br/>index 000000000000..b440a8f7eefa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/syscalls/syscall_64.tbl?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/syscalls/syscall_64.tbl</a></div><div class='hunk'>@@ -0,0 +1,320 @@</div><div class='add'>+#</div><div class='add'>+# 64-bit system call numbers and entry vectors</div><div class='add'>+#</div><div class='add'>+# The format is:</div><div class='add'>+# &lt;number&gt; &lt;abi&gt; &lt;name&gt; &lt;entry point&gt;</div><div class='add'>+#</div><div class='add'>+# The abi is always "64" for this file (for now.)</div><div class='add'>+#</div><div class='add'>+0	64	read			sys_read</div><div class='add'>+1	64	write			sys_write</div><div class='add'>+2	64	open			sys_open</div><div class='add'>+3	64	close			sys_close</div><div class='add'>+4	64	stat			sys_newstat</div><div class='add'>+5	64	fstat			sys_newfstat</div><div class='add'>+6	64	lstat			sys_newlstat</div><div class='add'>+7	64	poll			sys_poll</div><div class='add'>+8	64	lseek			sys_lseek</div><div class='add'>+9	64	mmap			sys_mmap</div><div class='add'>+10	64	mprotect		sys_mprotect</div><div class='add'>+11	64	munmap			sys_munmap</div><div class='add'>+12	64	brk			sys_brk</div><div class='add'>+13	64	rt_sigaction		sys_rt_sigaction</div><div class='add'>+14	64	rt_sigprocmask		sys_rt_sigprocmask</div><div class='add'>+15	64	rt_sigreturn		stub_rt_sigreturn</div><div class='add'>+16	64	ioctl			sys_ioctl</div><div class='add'>+17	64	pread64			sys_pread64</div><div class='add'>+18	64	pwrite64		sys_pwrite64</div><div class='add'>+19	64	readv			sys_readv</div><div class='add'>+20	64	writev			sys_writev</div><div class='add'>+21	64	access			sys_access</div><div class='add'>+22	64	pipe			sys_pipe</div><div class='add'>+23	64	select			sys_select</div><div class='add'>+24	64	sched_yield		sys_sched_yield</div><div class='add'>+25	64	mremap			sys_mremap</div><div class='add'>+26	64	msync			sys_msync</div><div class='add'>+27	64	mincore			sys_mincore</div><div class='add'>+28	64	madvise			sys_madvise</div><div class='add'>+29	64	shmget			sys_shmget</div><div class='add'>+30	64	shmat			sys_shmat</div><div class='add'>+31	64	shmctl			sys_shmctl</div><div class='add'>+32	64	dup			sys_dup</div><div class='add'>+33	64	dup2			sys_dup2</div><div class='add'>+34	64	pause			sys_pause</div><div class='add'>+35	64	nanosleep		sys_nanosleep</div><div class='add'>+36	64	getitimer		sys_getitimer</div><div class='add'>+37	64	alarm			sys_alarm</div><div class='add'>+38	64	setitimer		sys_setitimer</div><div class='add'>+39	64	getpid			sys_getpid</div><div class='add'>+40	64	sendfile		sys_sendfile64</div><div class='add'>+41	64	socket			sys_socket</div><div class='add'>+42	64	connect			sys_connect</div><div class='add'>+43	64	accept			sys_accept</div><div class='add'>+44	64	sendto			sys_sendto</div><div class='add'>+45	64	recvfrom		sys_recvfrom</div><div class='add'>+46	64	sendmsg			sys_sendmsg</div><div class='add'>+47	64	recvmsg			sys_recvmsg</div><div class='add'>+48	64	shutdown		sys_shutdown</div><div class='add'>+49	64	bind			sys_bind</div><div class='add'>+50	64	listen			sys_listen</div><div class='add'>+51	64	getsockname		sys_getsockname</div><div class='add'>+52	64	getpeername		sys_getpeername</div><div class='add'>+53	64	socketpair		sys_socketpair</div><div class='add'>+54	64	setsockopt		sys_setsockopt</div><div class='add'>+55	64	getsockopt		sys_getsockopt</div><div class='add'>+56	64	clone			stub_clone</div><div class='add'>+57	64	fork			stub_fork</div><div class='add'>+58	64	vfork			stub_vfork</div><div class='add'>+59	64	execve			stub_execve</div><div class='add'>+60	64	exit			sys_exit</div><div class='add'>+61	64	wait4			sys_wait4</div><div class='add'>+62	64	kill			sys_kill</div><div class='add'>+63	64	uname			sys_newuname</div><div class='add'>+64	64	semget			sys_semget</div><div class='add'>+65	64	semop			sys_semop</div><div class='add'>+66	64	semctl			sys_semctl</div><div class='add'>+67	64	shmdt			sys_shmdt</div><div class='add'>+68	64	msgget			sys_msgget</div><div class='add'>+69	64	msgsnd			sys_msgsnd</div><div class='add'>+70	64	msgrcv			sys_msgrcv</div><div class='add'>+71	64	msgctl			sys_msgctl</div><div class='add'>+72	64	fcntl			sys_fcntl</div><div class='add'>+73	64	flock			sys_flock</div><div class='add'>+74	64	fsync			sys_fsync</div><div class='add'>+75	64	fdatasync		sys_fdatasync</div><div class='add'>+76	64	truncate		sys_truncate</div><div class='add'>+77	64	ftruncate		sys_ftruncate</div><div class='add'>+78	64	getdents		sys_getdents</div><div class='add'>+79	64	getcwd			sys_getcwd</div><div class='add'>+80	64	chdir			sys_chdir</div><div class='add'>+81	64	fchdir			sys_fchdir</div><div class='add'>+82	64	rename			sys_rename</div><div class='add'>+83	64	mkdir			sys_mkdir</div><div class='add'>+84	64	rmdir			sys_rmdir</div><div class='add'>+85	64	creat			sys_creat</div><div class='add'>+86	64	link			sys_link</div><div class='add'>+87	64	unlink			sys_unlink</div><div class='add'>+88	64	symlink			sys_symlink</div><div class='add'>+89	64	readlink		sys_readlink</div><div class='add'>+90	64	chmod			sys_chmod</div><div class='add'>+91	64	fchmod			sys_fchmod</div><div class='add'>+92	64	chown			sys_chown</div><div class='add'>+93	64	fchown			sys_fchown</div><div class='add'>+94	64	lchown			sys_lchown</div><div class='add'>+95	64	umask			sys_umask</div><div class='add'>+96	64	gettimeofday		sys_gettimeofday</div><div class='add'>+97	64	getrlimit		sys_getrlimit</div><div class='add'>+98	64	getrusage		sys_getrusage</div><div class='add'>+99	64	sysinfo			sys_sysinfo</div><div class='add'>+100	64	times			sys_times</div><div class='add'>+101	64	ptrace			sys_ptrace</div><div class='add'>+102	64	getuid			sys_getuid</div><div class='add'>+103	64	syslog			sys_syslog</div><div class='add'>+104	64	getgid			sys_getgid</div><div class='add'>+105	64	setuid			sys_setuid</div><div class='add'>+106	64	setgid			sys_setgid</div><div class='add'>+107	64	geteuid			sys_geteuid</div><div class='add'>+108	64	getegid			sys_getegid</div><div class='add'>+109	64	setpgid			sys_setpgid</div><div class='add'>+110	64	getppid			sys_getppid</div><div class='add'>+111	64	getpgrp			sys_getpgrp</div><div class='add'>+112	64	setsid			sys_setsid</div><div class='add'>+113	64	setreuid		sys_setreuid</div><div class='add'>+114	64	setregid		sys_setregid</div><div class='add'>+115	64	getgroups		sys_getgroups</div><div class='add'>+116	64	setgroups		sys_setgroups</div><div class='add'>+117	64	setresuid		sys_setresuid</div><div class='add'>+118	64	getresuid		sys_getresuid</div><div class='add'>+119	64	setresgid		sys_setresgid</div><div class='add'>+120	64	getresgid		sys_getresgid</div><div class='add'>+121	64	getpgid			sys_getpgid</div><div class='add'>+122	64	setfsuid		sys_setfsuid</div><div class='add'>+123	64	setfsgid		sys_setfsgid</div><div class='add'>+124	64	getsid			sys_getsid</div><div class='add'>+125	64	capget			sys_capget</div><div class='add'>+126	64	capset			sys_capset</div><div class='add'>+127	64	rt_sigpending		sys_rt_sigpending</div><div class='add'>+128	64	rt_sigtimedwait		sys_rt_sigtimedwait</div><div class='add'>+129	64	rt_sigqueueinfo		sys_rt_sigqueueinfo</div><div class='add'>+130	64	rt_sigsuspend		sys_rt_sigsuspend</div><div class='add'>+131	64	sigaltstack		stub_sigaltstack</div><div class='add'>+132	64	utime			sys_utime</div><div class='add'>+133	64	mknod			sys_mknod</div><div class='add'>+134	64	uselib</div><div class='add'>+135	64	personality		sys_personality</div><div class='add'>+136	64	ustat			sys_ustat</div><div class='add'>+137	64	statfs			sys_statfs</div><div class='add'>+138	64	fstatfs			sys_fstatfs</div><div class='add'>+139	64	sysfs			sys_sysfs</div><div class='add'>+140	64	getpriority		sys_getpriority</div><div class='add'>+141	64	setpriority		sys_setpriority</div><div class='add'>+142	64	sched_setparam		sys_sched_setparam</div><div class='add'>+143	64	sched_getparam		sys_sched_getparam</div><div class='add'>+144	64	sched_setscheduler	sys_sched_setscheduler</div><div class='add'>+145	64	sched_getscheduler	sys_sched_getscheduler</div><div class='add'>+146	64	sched_get_priority_max	sys_sched_get_priority_max</div><div class='add'>+147	64	sched_get_priority_min	sys_sched_get_priority_min</div><div class='add'>+148	64	sched_rr_get_interval	sys_sched_rr_get_interval</div><div class='add'>+149	64	mlock			sys_mlock</div><div class='add'>+150	64	munlock			sys_munlock</div><div class='add'>+151	64	mlockall		sys_mlockall</div><div class='add'>+152	64	munlockall		sys_munlockall</div><div class='add'>+153	64	vhangup			sys_vhangup</div><div class='add'>+154	64	modify_ldt		sys_modify_ldt</div><div class='add'>+155	64	pivot_root		sys_pivot_root</div><div class='add'>+156	64	_sysctl			sys_sysctl</div><div class='add'>+157	64	prctl			sys_prctl</div><div class='add'>+158	64	arch_prctl		sys_arch_prctl</div><div class='add'>+159	64	adjtimex		sys_adjtimex</div><div class='add'>+160	64	setrlimit		sys_setrlimit</div><div class='add'>+161	64	chroot			sys_chroot</div><div class='add'>+162	64	sync			sys_sync</div><div class='add'>+163	64	acct			sys_acct</div><div class='add'>+164	64	settimeofday		sys_settimeofday</div><div class='add'>+165	64	mount			sys_mount</div><div class='add'>+166	64	umount2			sys_umount</div><div class='add'>+167	64	swapon			sys_swapon</div><div class='add'>+168	64	swapoff			sys_swapoff</div><div class='add'>+169	64	reboot			sys_reboot</div><div class='add'>+170	64	sethostname		sys_sethostname</div><div class='add'>+171	64	setdomainname		sys_setdomainname</div><div class='add'>+172	64	iopl			stub_iopl</div><div class='add'>+173	64	ioperm			sys_ioperm</div><div class='add'>+174	64	create_module</div><div class='add'>+175	64	init_module		sys_init_module</div><div class='add'>+176	64	delete_module		sys_delete_module</div><div class='add'>+177	64	get_kernel_syms</div><div class='add'>+178	64	query_module</div><div class='add'>+179	64	quotactl		sys_quotactl</div><div class='add'>+180	64	nfsservctl</div><div class='add'>+181	64	getpmsg</div><div class='add'>+182	64	putpmsg</div><div class='add'>+183	64	afs_syscall</div><div class='add'>+184	64	tuxcall</div><div class='add'>+185	64	security</div><div class='add'>+186	64	gettid			sys_gettid</div><div class='add'>+187	64	readahead		sys_readahead</div><div class='add'>+188	64	setxattr		sys_setxattr</div><div class='add'>+189	64	lsetxattr		sys_lsetxattr</div><div class='add'>+190	64	fsetxattr		sys_fsetxattr</div><div class='add'>+191	64	getxattr		sys_getxattr</div><div class='add'>+192	64	lgetxattr		sys_lgetxattr</div><div class='add'>+193	64	fgetxattr		sys_fgetxattr</div><div class='add'>+194	64	listxattr		sys_listxattr</div><div class='add'>+195	64	llistxattr		sys_llistxattr</div><div class='add'>+196	64	flistxattr		sys_flistxattr</div><div class='add'>+197	64	removexattr		sys_removexattr</div><div class='add'>+198	64	lremovexattr		sys_lremovexattr</div><div class='add'>+199	64	fremovexattr		sys_fremovexattr</div><div class='add'>+200	64	tkill			sys_tkill</div><div class='add'>+201	64	time			sys_time</div><div class='add'>+202	64	futex			sys_futex</div><div class='add'>+203	64	sched_setaffinity	sys_sched_setaffinity</div><div class='add'>+204	64	sched_getaffinity	sys_sched_getaffinity</div><div class='add'>+205	64	set_thread_area</div><div class='add'>+206	64	io_setup		sys_io_setup</div><div class='add'>+207	64	io_destroy		sys_io_destroy</div><div class='add'>+208	64	io_getevents		sys_io_getevents</div><div class='add'>+209	64	io_submit		sys_io_submit</div><div class='add'>+210	64	io_cancel		sys_io_cancel</div><div class='add'>+211	64	get_thread_area</div><div class='add'>+212	64	lookup_dcookie		sys_lookup_dcookie</div><div class='add'>+213	64	epoll_create		sys_epoll_create</div><div class='add'>+214	64	epoll_ctl_old</div><div class='add'>+215	64	epoll_wait_old</div><div class='add'>+216	64	remap_file_pages	sys_remap_file_pages</div><div class='add'>+217	64	getdents64		sys_getdents64</div><div class='add'>+218	64	set_tid_address		sys_set_tid_address</div><div class='add'>+219	64	restart_syscall		sys_restart_syscall</div><div class='add'>+220	64	semtimedop		sys_semtimedop</div><div class='add'>+221	64	fadvise64		sys_fadvise64</div><div class='add'>+222	64	timer_create		sys_timer_create</div><div class='add'>+223	64	timer_settime		sys_timer_settime</div><div class='add'>+224	64	timer_gettime		sys_timer_gettime</div><div class='add'>+225	64	timer_getoverrun	sys_timer_getoverrun</div><div class='add'>+226	64	timer_delete		sys_timer_delete</div><div class='add'>+227	64	clock_settime		sys_clock_settime</div><div class='add'>+228	64	clock_gettime		sys_clock_gettime</div><div class='add'>+229	64	clock_getres		sys_clock_getres</div><div class='add'>+230	64	clock_nanosleep		sys_clock_nanosleep</div><div class='add'>+231	64	exit_group		sys_exit_group</div><div class='add'>+232	64	epoll_wait		sys_epoll_wait</div><div class='add'>+233	64	epoll_ctl		sys_epoll_ctl</div><div class='add'>+234	64	tgkill			sys_tgkill</div><div class='add'>+235	64	utimes			sys_utimes</div><div class='add'>+236	64	vserver</div><div class='add'>+237	64	mbind			sys_mbind</div><div class='add'>+238	64	set_mempolicy		sys_set_mempolicy</div><div class='add'>+239	64	get_mempolicy		sys_get_mempolicy</div><div class='add'>+240	64	mq_open			sys_mq_open</div><div class='add'>+241	64	mq_unlink		sys_mq_unlink</div><div class='add'>+242	64	mq_timedsend		sys_mq_timedsend</div><div class='add'>+243	64	mq_timedreceive		sys_mq_timedreceive</div><div class='add'>+244	64	mq_notify		sys_mq_notify</div><div class='add'>+245	64	mq_getsetattr		sys_mq_getsetattr</div><div class='add'>+246	64	kexec_load		sys_kexec_load</div><div class='add'>+247	64	waitid			sys_waitid</div><div class='add'>+248	64	add_key			sys_add_key</div><div class='add'>+249	64	request_key		sys_request_key</div><div class='add'>+250	64	keyctl			sys_keyctl</div><div class='add'>+251	64	ioprio_set		sys_ioprio_set</div><div class='add'>+252	64	ioprio_get		sys_ioprio_get</div><div class='add'>+253	64	inotify_init		sys_inotify_init</div><div class='add'>+254	64	inotify_add_watch	sys_inotify_add_watch</div><div class='add'>+255	64	inotify_rm_watch	sys_inotify_rm_watch</div><div class='add'>+256	64	migrate_pages		sys_migrate_pages</div><div class='add'>+257	64	openat			sys_openat</div><div class='add'>+258	64	mkdirat			sys_mkdirat</div><div class='add'>+259	64	mknodat			sys_mknodat</div><div class='add'>+260	64	fchownat		sys_fchownat</div><div class='add'>+261	64	futimesat		sys_futimesat</div><div class='add'>+262	64	newfstatat		sys_newfstatat</div><div class='add'>+263	64	unlinkat		sys_unlinkat</div><div class='add'>+264	64	renameat		sys_renameat</div><div class='add'>+265	64	linkat			sys_linkat</div><div class='add'>+266	64	symlinkat		sys_symlinkat</div><div class='add'>+267	64	readlinkat		sys_readlinkat</div><div class='add'>+268	64	fchmodat		sys_fchmodat</div><div class='add'>+269	64	faccessat		sys_faccessat</div><div class='add'>+270	64	pselect6		sys_pselect6</div><div class='add'>+271	64	ppoll			sys_ppoll</div><div class='add'>+272	64	unshare			sys_unshare</div><div class='add'>+273	64	set_robust_list		sys_set_robust_list</div><div class='add'>+274	64	get_robust_list		sys_get_robust_list</div><div class='add'>+275	64	splice			sys_splice</div><div class='add'>+276	64	tee			sys_tee</div><div class='add'>+277	64	sync_file_range		sys_sync_file_range</div><div class='add'>+278	64	vmsplice		sys_vmsplice</div><div class='add'>+279	64	move_pages		sys_move_pages</div><div class='add'>+280	64	utimensat		sys_utimensat</div><div class='add'>+281	64	epoll_pwait		sys_epoll_pwait</div><div class='add'>+282	64	signalfd		sys_signalfd</div><div class='add'>+283	64	timerfd_create		sys_timerfd_create</div><div class='add'>+284	64	eventfd			sys_eventfd</div><div class='add'>+285	64	fallocate		sys_fallocate</div><div class='add'>+286	64	timerfd_settime		sys_timerfd_settime</div><div class='add'>+287	64	timerfd_gettime		sys_timerfd_gettime</div><div class='add'>+288	64	accept4			sys_accept4</div><div class='add'>+289	64	signalfd4		sys_signalfd4</div><div class='add'>+290	64	eventfd2		sys_eventfd2</div><div class='add'>+291	64	epoll_create1		sys_epoll_create1</div><div class='add'>+292	64	dup3			sys_dup3</div><div class='add'>+293	64	pipe2			sys_pipe2</div><div class='add'>+294	64	inotify_init1		sys_inotify_init1</div><div class='add'>+295	64	preadv			sys_preadv</div><div class='add'>+296	64	pwritev			sys_pwritev</div><div class='add'>+297	64	rt_tgsigqueueinfo	sys_rt_tgsigqueueinfo</div><div class='add'>+298	64	perf_event_open		sys_perf_event_open</div><div class='add'>+299	64	recvmmsg		sys_recvmmsg</div><div class='add'>+300	64	fanotify_init		sys_fanotify_init</div><div class='add'>+301	64	fanotify_mark		sys_fanotify_mark</div><div class='add'>+302	64	prlimit64		sys_prlimit64</div><div class='add'>+303	64	name_to_handle_at	sys_name_to_handle_at</div><div class='add'>+304	64	open_by_handle_at	sys_open_by_handle_at</div><div class='add'>+305	64	clock_adjtime		sys_clock_adjtime</div><div class='add'>+306	64	syncfs			sys_syncfs</div><div class='add'>+307	64	sendmmsg		sys_sendmmsg</div><div class='add'>+308	64	setns			sys_setns</div><div class='add'>+309	64	getcpu			sys_getcpu</div><div class='add'>+310	64	process_vm_readv	sys_process_vm_readv</div><div class='add'>+311	64	process_vm_writev	sys_process_vm_writev</div><div class='head'>diff --git a/arch/x86/syscalls/syscallhdr.sh b/arch/x86/syscalls/syscallhdr.sh<br/>new file mode 100644<br/>index 000000000000..31fd5f1f38f7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/syscalls/syscallhdr.sh?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/syscalls/syscallhdr.sh</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+</div><div class='add'>+in="$1"</div><div class='add'>+out="$2"</div><div class='add'>+my_abis=`echo "($3)" | tr ',' '|'`</div><div class='add'>+prefix="$4"</div><div class='add'>+offset="$5"</div><div class='add'>+</div><div class='add'>+fileguard=_ASM_X86_`basename "$out" | sed \</div><div class='add'>+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \</div><div class='add'>+    -e 's/[^A-Z0-9_]/_/g' -e 's/__/_/g'`</div><div class='add'>+grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | (</div><div class='add'>+    echo "#ifndef ${fileguard}"</div><div class='add'>+    echo "#define ${fileguard} 1"</div><div class='add'>+    echo ""</div><div class='add'>+</div><div class='add'>+    while read nr abi name entry ; do</div><div class='add'>+	if [ -z "$offset" ]; then</div><div class='add'>+	    echo "#define __NR_${prefix}${name} $nr"</div><div class='add'>+	else</div><div class='add'>+	    echo "#define __NR_${prefix}${name} ($offset + $nr)"</div><div class='add'>+        fi</div><div class='add'>+    done</div><div class='add'>+</div><div class='add'>+    echo ""</div><div class='add'>+    echo "#endif /* ${fileguard} */"</div><div class='add'>+) &gt; "$out"</div><div class='head'>diff --git a/arch/x86/syscalls/syscalltbl.sh b/arch/x86/syscalls/syscalltbl.sh<br/>new file mode 100644<br/>index 000000000000..0e7f8ec071e7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/syscalls/syscalltbl.sh?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/syscalls/syscalltbl.sh</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+</div><div class='add'>+in="$1"</div><div class='add'>+out="$2"</div><div class='add'>+</div><div class='add'>+grep '^[0-9]' "$in" | sort -n | (</div><div class='add'>+    while read nr abi name entry compat; do</div><div class='add'>+	abi=`echo "$abi" | tr '[a-z]' '[A-Z]'`</div><div class='add'>+	if [ -n "$compat" ]; then</div><div class='add'>+	    echo "__SYSCALL_${abi}($nr, $entry, $compat)"</div><div class='add'>+	elif [ -n "$entry" ]; then</div><div class='add'>+	    echo "__SYSCALL_${abi}($nr, $entry, $entry)"</div><div class='add'>+	fi</div><div class='add'>+    done</div><div class='add'>+) &gt; "$out"</div><div class='head'>diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig<br/>index 1d97bd84b6fb..b2b54d2edf53 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/um/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/um/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/um/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/um/Kconfig</a></div><div class='hunk'>@@ -6,14 +6,6 @@ menu "UML-specific options"</div><div class='ctx'> </div><div class='ctx'> menu "Host processor type and features"</div><div class='ctx'> </div><div class='del'>-config CMPXCHG_LOCAL</div><div class='del'>-	bool</div><div class='del'>-	default n</div><div class='del'>-</div><div class='del'>-config CMPXCHG_DOUBLE</div><div class='del'>-	bool</div><div class='del'>-	default n</div><div class='del'>-</div><div class='ctx'> source "arch/x86/Kconfig.cpu"</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='head'>diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile<br/>index 8fb58400e415..5d065b2222d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/um/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/um/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/um/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/um/Makefile</a></div><div class='hunk'>@@ -37,7 +37,8 @@ subarch-$(CONFIG_MODULES) += ../kernel/module.o</div><div class='ctx'> USER_OBJS := bugs_$(BITS).o ptrace_user.o fault.o</div><div class='ctx'> </div><div class='ctx'> extra-y += user-offsets.s</div><div class='del'>-$(obj)/user-offsets.s: c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS)</div><div class='add'>+$(obj)/user-offsets.s: c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) \</div><div class='add'>+	-Iarch/x86/include/generated</div><div class='ctx'> </div><div class='ctx'> UNPROFILE_OBJS := stub_segv.o</div><div class='ctx'> CFLAGS_stub_segv.o := $(CFLAGS_NO_HARDENING)</div><div class='head'>diff --git a/arch/x86/um/shared/sysdep/ptrace.h b/arch/x86/um/shared/sysdep/ptrace.h<br/>index 711b1621747f..2bbe1ec2d96a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/um/shared/sysdep/ptrace.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/um/shared/sysdep/ptrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/um/shared/sysdep/ptrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/um/shared/sysdep/ptrace.h</a></div><div class='hunk'>@@ -1,5 +1,15 @@</div><div class='add'>+#ifndef __SYSDEP_X86_PTRACE_H</div><div class='add'>+#define __SYSDEP_X86_PTRACE_H</div><div class='add'>+</div><div class='ctx'> #ifdef __i386__</div><div class='ctx'> #include "ptrace_32.h"</div><div class='ctx'> #else</div><div class='ctx'> #include "ptrace_64.h"</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+static inline long regs_return_value(struct uml_pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return UPT_SYSCALL_RET(regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* __SYSDEP_X86_PTRACE_H */</div><div class='head'>diff --git a/arch/x86/um/sys_call_table_32.S b/arch/x86/um/sys_call_table_32.S<br/>deleted file mode 100644<br/>index a7ca80d2dceb..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/um/sys_call_table_32.S?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/um/sys_call_table_32.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-#include &lt;linux/linkage.h&gt;</div><div class='del'>-/* Steal i386 syscall table for our purposes, but with some slight changes.*/</div><div class='del'>-</div><div class='del'>-#define sys_iopl sys_ni_syscall</div><div class='del'>-#define sys_ioperm sys_ni_syscall</div><div class='del'>-</div><div class='del'>-#define sys_vm86old sys_ni_syscall</div><div class='del'>-#define sys_vm86 sys_ni_syscall</div><div class='del'>-</div><div class='del'>-#define old_mmap sys_old_mmap</div><div class='del'>-</div><div class='del'>-#define ptregs_fork sys_fork</div><div class='del'>-#define ptregs_execve sys_execve</div><div class='del'>-#define ptregs_iopl sys_iopl</div><div class='del'>-#define ptregs_vm86old sys_vm86old</div><div class='del'>-#define ptregs_clone sys_clone</div><div class='del'>-#define ptregs_vm86 sys_vm86</div><div class='del'>-#define ptregs_sigaltstack sys_sigaltstack</div><div class='del'>-#define ptregs_vfork sys_vfork</div><div class='del'>-</div><div class='del'>-.section .rodata,"a"</div><div class='del'>-</div><div class='del'>-#include "../kernel/syscall_table_32.S"</div><div class='del'>-</div><div class='del'>-ENTRY(syscall_table_size)</div><div class='del'>-.long .-sys_call_table</div><div class='head'>diff --git a/arch/x86/um/sys_call_table_32.c b/arch/x86/um/sys_call_table_32.c<br/>new file mode 100644<br/>index 000000000000..416bd40c0eba<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/um/sys_call_table_32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/um/sys_call_table_32.c</a></div><div class='hunk'>@@ -0,0 +1,55 @@</div><div class='add'>+/*</div><div class='add'>+ * System call table for UML/i386, copied from arch/x86/kernel/syscall_*.c</div><div class='add'>+ * with some changes for UML.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;linux/sys.h&gt;</div><div class='add'>+#include &lt;linux/cache.h&gt;</div><div class='add'>+#include &lt;generated/user_constants.h&gt;</div><div class='add'>+</div><div class='add'>+#define __NO_STUBS</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Below you can see, in terms of #define's, the differences between the x86-64</div><div class='add'>+ * and the UML syscall table.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Not going to be implemented by UML, since we have no hardware. */</div><div class='add'>+#define sys_iopl sys_ni_syscall</div><div class='add'>+#define sys_ioperm sys_ni_syscall</div><div class='add'>+</div><div class='add'>+#define sys_vm86old sys_ni_syscall</div><div class='add'>+#define sys_vm86 sys_ni_syscall</div><div class='add'>+</div><div class='add'>+#define old_mmap sys_old_mmap</div><div class='add'>+</div><div class='add'>+#define ptregs_fork sys_fork</div><div class='add'>+#define ptregs_execve sys_execve</div><div class='add'>+#define ptregs_iopl sys_iopl</div><div class='add'>+#define ptregs_vm86old sys_vm86old</div><div class='add'>+#define ptregs_clone sys_clone</div><div class='add'>+#define ptregs_vm86 sys_vm86</div><div class='add'>+#define ptregs_sigaltstack sys_sigaltstack</div><div class='add'>+#define ptregs_vfork sys_vfork</div><div class='add'>+</div><div class='add'>+#define __SYSCALL_I386(nr, sym, compat) extern asmlinkage void sym(void) ;</div><div class='add'>+#include &lt;asm/syscalls_32.h&gt;</div><div class='add'>+</div><div class='add'>+#undef __SYSCALL_I386</div><div class='add'>+#define __SYSCALL_I386(nr, sym, compat) [ nr ] = sym,</div><div class='add'>+</div><div class='add'>+typedef void (*sys_call_ptr_t)(void);</div><div class='add'>+</div><div class='add'>+extern void sys_ni_syscall(void);</div><div class='add'>+</div><div class='add'>+const sys_call_ptr_t sys_call_table[] __cacheline_aligned = {</div><div class='add'>+	/*</div><div class='add'>+	 * Smells like a compiler bug -- it doesn't work</div><div class='add'>+	 * when the &amp; below is removed.</div><div class='add'>+	 */</div><div class='add'>+	[0 ... __NR_syscall_max] = &amp;sys_ni_syscall,</div><div class='add'>+#include &lt;asm/syscalls_32.h&gt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int syscall_table_size = sizeof(sys_call_table);</div><div class='head'>diff --git a/arch/x86/um/sys_call_table_64.c b/arch/x86/um/sys_call_table_64.c<br/>index 99522f78b162..fe626c3ba01b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/um/sys_call_table_64.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/um/sys_call_table_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/um/sys_call_table_64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/um/sys_call_table_64.c</a></div><div class='hunk'>@@ -1,11 +1,12 @@</div><div class='ctx'> /*</div><div class='del'>- * System call table for UML/x86-64, copied from arch/x86_64/kernel/syscall.c</div><div class='add'>+ * System call table for UML/x86-64, copied from arch/x86/kernel/syscall_*.c</div><div class='ctx'>  * with some changes for UML.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='add'>+#include &lt;generated/user_constants.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __NO_STUBS</div><div class='ctx'> </div><div class='hunk'>@@ -34,31 +35,23 @@</div><div class='ctx'> #define stub_sigaltstack sys_sigaltstack</div><div class='ctx'> #define stub_rt_sigreturn sys_rt_sigreturn</div><div class='ctx'> </div><div class='del'>-#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;</div><div class='del'>-#undef _ASM_X86_UNISTD_64_H</div><div class='del'>-#include "../../x86/include/asm/unistd_64.h"</div><div class='add'>+#define __SYSCALL_64(nr, sym, compat) extern asmlinkage void sym(void) ;</div><div class='add'>+#include &lt;asm/syscalls_64.h&gt;</div><div class='ctx'> </div><div class='del'>-#undef __SYSCALL</div><div class='del'>-#define __SYSCALL(nr, sym) [ nr ] = sym,</div><div class='del'>-#undef _ASM_X86_UNISTD_64_H</div><div class='add'>+#undef __SYSCALL_64</div><div class='add'>+#define __SYSCALL_64(nr, sym, compat) [ nr ] = sym,</div><div class='ctx'> </div><div class='ctx'> typedef void (*sys_call_ptr_t)(void);</div><div class='ctx'> </div><div class='ctx'> extern void sys_ni_syscall(void);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * We used to have a trick here which made sure that holes in the</div><div class='del'>- * x86_64 table were filled in with sys_ni_syscall, but a comment in</div><div class='del'>- * unistd_64.h says that holes aren't allowed, so the trick was</div><div class='del'>- * removed.</div><div class='del'>- * The trick looked like this</div><div class='del'>- *	[0 ... UM_NR_syscall_max] = &amp;sys_ni_syscall</div><div class='del'>- * before including unistd_64.h - the later initializations overwrote</div><div class='del'>- * the sys_ni_syscall filler.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-sys_call_ptr_t sys_call_table[] __cacheline_aligned = {</div><div class='del'>-#include &lt;asm/unistd_64.h&gt;</div><div class='add'>+const sys_call_ptr_t sys_call_table[] __cacheline_aligned = {</div><div class='add'>+	/*</div><div class='add'>+	 * Smells like a compiler bug -- it doesn't work</div><div class='add'>+	 * when the &amp; below is removed.</div><div class='add'>+	 */</div><div class='add'>+	[0 ... __NR_syscall_max] = &amp;sys_ni_syscall,</div><div class='add'>+#include &lt;asm/syscalls_64.h&gt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int syscall_table_size = sizeof(sys_call_table);</div><div class='head'>diff --git a/arch/x86/um/user-offsets.c b/arch/x86/um/user-offsets.c<br/>index ca49be8ddd0c..5edf4f4bbf53 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/um/user-offsets.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/um/user-offsets.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/um/user-offsets.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/um/user-offsets.c</a></div><div class='hunk'>@@ -8,6 +8,18 @@</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef __i386__</div><div class='add'>+#define __SYSCALL_I386(nr, sym, compat) [nr] = 1,</div><div class='add'>+static char syscalls[] = {</div><div class='add'>+#include &lt;asm/syscalls_32.h&gt;</div><div class='add'>+};</div><div class='add'>+#else</div><div class='add'>+#define __SYSCALL_64(nr, sym, compat) [nr] = 1,</div><div class='add'>+static char syscalls[] = {</div><div class='add'>+#include &lt;asm/syscalls_64.h&gt;</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define DEFINE(sym, val) \</div><div class='ctx'> 	asm volatile("\n-&gt;" #sym " %0 " #val : : "i" (val))</div><div class='ctx'> </div><div class='hunk'>@@ -77,4 +89,7 @@ void foo(void)</div><div class='ctx'> 	DEFINE(UM_PROT_READ, PROT_READ);</div><div class='ctx'> 	DEFINE(UM_PROT_WRITE, PROT_WRITE);</div><div class='ctx'> 	DEFINE(UM_PROT_EXEC, PROT_EXEC);</div><div class='add'>+</div><div class='add'>+	DEFINE(__NR_syscall_max, sizeof(syscalls) - 1);</div><div class='add'>+	DEFINE(NR_syscalls, sizeof(syscalls));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig<br/>index 26c731a106af..fdce49c7aff6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/xen/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/xen/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/xen/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/xen/Kconfig</a></div><div class='hunk'>@@ -29,7 +29,8 @@ config XEN_PVHVM</div><div class='ctx'> </div><div class='ctx'> config XEN_MAX_DOMAIN_MEMORY</div><div class='ctx'>        int</div><div class='del'>-       default 128</div><div class='add'>+       default 500 if X86_64</div><div class='add'>+       default 64 if X86_32</div><div class='ctx'>        depends on XEN</div><div class='ctx'>        help</div><div class='ctx'>          This only affects the sizing of some bss arrays, the unused</div><div class='hunk'>@@ -48,3 +49,4 @@ config XEN_DEBUG_FS</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable statistics output and various tuning options in debugfs.</div><div class='ctx'> 	  Enabling this option may incur a significant performance overhead.</div><div class='add'>+</div><div class='head'>diff --git a/arch/x86/xen/debugfs.c b/arch/x86/xen/debugfs.c<br/>index 7c0fedd98ea0..ef1db1900d86 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/xen/debugfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/xen/debugfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/xen/debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/xen/debugfs.c</a></div><div class='hunk'>@@ -109,7 +109,7 @@ static const struct file_operations u32_array_fops = {</div><div class='ctx'> 	.llseek = no_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dentry *xen_debugfs_create_u32_array(const char *name, mode_t mode,</div><div class='add'>+struct dentry *xen_debugfs_create_u32_array(const char *name, umode_t mode,</div><div class='ctx'> 					    struct dentry *parent,</div><div class='ctx'> 					    u32 *array, unsigned elements)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86/xen/debugfs.h b/arch/x86/xen/debugfs.h<br/>index e28132084832..78d25499be5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/xen/debugfs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/xen/debugfs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/xen/debugfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/xen/debugfs.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> </div><div class='ctx'> struct dentry * __init xen_init_debugfs(void);</div><div class='ctx'> </div><div class='del'>-struct dentry *xen_debugfs_create_u32_array(const char *name, mode_t mode,</div><div class='add'>+struct dentry *xen_debugfs_create_u32_array(const char *name, umode_t mode,</div><div class='ctx'> 					    struct dentry *parent,</div><div class='ctx'> 					    u32 *array, unsigned elements);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86/xen/grant-table.c b/arch/x86/xen/grant-table.c<br/>index 5a40d24ba331..3a5f55d51907 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/xen/grant-table.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/xen/grant-table.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/xen/grant-table.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/xen/grant-table.c</a></div><div class='hunk'>@@ -54,6 +54,20 @@ static int map_pte_fn(pte_t *pte, struct page *pmd_page,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This function is used to map shared frames to store grant status. It is</div><div class='add'>+ * different from map_pte_fn above, the frames type here is uint64_t.</div><div class='add'>+ */</div><div class='add'>+static int map_pte_fn_status(pte_t *pte, struct page *pmd_page,</div><div class='add'>+			     unsigned long addr, void *data)</div><div class='add'>+{</div><div class='add'>+	uint64_t **frames = (uint64_t **)data;</div><div class='add'>+</div><div class='add'>+	set_pte_at(&amp;init_mm, addr, pte, mfn_pte((*frames)[0], PAGE_KERNEL));</div><div class='add'>+	(*frames)++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int unmap_pte_fn(pte_t *pte, struct page *pmd_page,</div><div class='ctx'> 			unsigned long addr, void *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -64,10 +78,10 @@ static int unmap_pte_fn(pte_t *pte, struct page *pmd_page,</div><div class='ctx'> </div><div class='ctx'> int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes,</div><div class='ctx'> 			   unsigned long max_nr_gframes,</div><div class='del'>-			   struct grant_entry **__shared)</div><div class='add'>+			   void **__shared)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='del'>-	struct grant_entry *shared = *__shared;</div><div class='add'>+	void *shared = *__shared;</div><div class='ctx'> </div><div class='ctx'> 	if (shared == NULL) {</div><div class='ctx'> 		struct vm_struct *area =</div><div class='hunk'>@@ -83,8 +97,30 @@ int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void arch_gnttab_unmap_shared(struct grant_entry *shared,</div><div class='del'>-			      unsigned long nr_gframes)</div><div class='add'>+int arch_gnttab_map_status(uint64_t *frames, unsigned long nr_gframes,</div><div class='add'>+			   unsigned long max_nr_gframes,</div><div class='add'>+			   grant_status_t **__shared)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	grant_status_t *shared = *__shared;</div><div class='add'>+</div><div class='add'>+	if (shared == NULL) {</div><div class='add'>+		/* No need to pass in PTE as we are going to do it</div><div class='add'>+		 * in apply_to_page_range anyhow. */</div><div class='add'>+		struct vm_struct *area =</div><div class='add'>+			alloc_vm_area(PAGE_SIZE * max_nr_gframes, NULL);</div><div class='add'>+		BUG_ON(area == NULL);</div><div class='add'>+		shared = area-&gt;addr;</div><div class='add'>+		*__shared = shared;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = apply_to_page_range(&amp;init_mm, (unsigned long)shared,</div><div class='add'>+				 PAGE_SIZE * nr_gframes,</div><div class='add'>+				 map_pte_fn_status, &amp;frames);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void arch_gnttab_unmap(void *shared, unsigned long nr_gframes)</div><div class='ctx'> {</div><div class='ctx'> 	apply_to_page_range(&amp;init_mm, (unsigned long)shared,</div><div class='ctx'> 			    PAGE_SIZE * nr_gframes, unmap_pte_fn, NULL);</div><div class='head'>diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c<br/>index f4bf8aa574f4..58a0e46c404d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86/xen/mmu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/x86/xen/mmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86/xen/mmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/x86/xen/mmu.c</a></div><div class='hunk'>@@ -1852,7 +1852,7 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,</div><div class='ctx'> 	xen_write_cr3(__pa(initial_page_table));</div><div class='ctx'> </div><div class='ctx'> 	memblock_reserve(__pa(xen_start_info-&gt;pt_base),</div><div class='del'>-			 xen_start_info-&gt;nr_pt_frames * PAGE_SIZE));</div><div class='add'>+			 xen_start_info-&gt;nr_pt_frames * PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	return initial_page_table;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig<br/>index c346ccdce0df..8a3f8351f438 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/xtensa/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/xtensa/Kconfig</a></div><div class='hunk'>@@ -9,6 +9,7 @@ config XTENSA</div><div class='ctx'> 	select HAVE_IDE</div><div class='ctx'> 	select HAVE_GENERIC_HARDIRQS</div><div class='ctx'> 	select GENERIC_IRQ_SHOW</div><div class='add'>+	select GENERIC_CPU_DEVICES</div><div class='ctx'> 	help</div><div class='ctx'> 	  Xtensa processors are 32-bit RISC machines designed by Tensilica</div><div class='ctx'> 	  primarily for embedded systems.  These processors are both</div><div class='head'>diff --git a/arch/xtensa/include/asm/pci.h b/arch/xtensa/include/asm/pci.h<br/>index 4609b0f15f1f..05244f07dd31 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/include/asm/pci.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/xtensa/include/asm/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/include/asm/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/xtensa/include/asm/pci.h</a></div><div class='hunk'>@@ -22,11 +22,6 @@</div><div class='ctx'> </div><div class='ctx'> extern struct pci_controller* pcibios_alloc_controller(void);</div><div class='ctx'> </div><div class='del'>-static inline void pcibios_set_master(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	/* No special bus mastering setup handling */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void pcibios_penalize_isa_irq(int irq)</div><div class='ctx'> {</div><div class='ctx'> 	/* We don't do dynamic PCI IRQ allocation */</div><div class='head'>diff --git a/arch/xtensa/include/asm/socket.h b/arch/xtensa/include/asm/socket.h<br/>index cbdf2ffaacff..bb06968be227 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/include/asm/socket.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/xtensa/include/asm/socket.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/include/asm/socket.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/xtensa/include/asm/socket.h</a></div><div class='hunk'>@@ -73,4 +73,7 @@</div><div class='ctx'> </div><div class='ctx'> #define SO_RXQ_OVFL             40</div><div class='ctx'> </div><div class='add'>+#define SO_WIFI_STATUS		41</div><div class='add'>+#define SCM_WIFI_STATUS		SO_WIFI_STATUS</div><div class='add'>+</div><div class='ctx'> #endif	/* _XTENSA_SOCKET_H */</div><div class='head'>diff --git a/arch/xtensa/include/asm/thread_info.h b/arch/xtensa/include/asm/thread_info.h<br/>index 7be8accb0b0c..6abbedd09d85 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/include/asm/thread_info.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/xtensa/include/asm/thread_info.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/include/asm/thread_info.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/xtensa/include/asm/thread_info.h</a></div><div class='hunk'>@@ -132,7 +132,6 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define TIF_MEMDIE		5	/* is terminating due to OOM killer */</div><div class='ctx'> #define TIF_RESTORE_SIGMASK	6	/* restore signal mask in do_signal() */</div><div class='ctx'> #define TIF_POLLING_NRFLAG	16	/* true if poll_idle() is polling TIF_NEED_RESCHED */</div><div class='del'>-#define TIF_FREEZE		17	/* is freezing for suspend */</div><div class='ctx'> </div><div class='ctx'> #define _TIF_SYSCALL_TRACE	(1&lt;&lt;TIF_SYSCALL_TRACE)</div><div class='ctx'> #define _TIF_SIGPENDING		(1&lt;&lt;TIF_SIGPENDING)</div><div class='hunk'>@@ -141,7 +140,6 @@ static inline struct thread_info *current_thread_info(void)</div><div class='ctx'> #define _TIF_IRET		(1&lt;&lt;TIF_IRET)</div><div class='ctx'> #define _TIF_POLLING_NRFLAG	(1&lt;&lt;TIF_POLLING_NRFLAG)</div><div class='ctx'> #define _TIF_RESTORE_SIGMASK	(1&lt;&lt;TIF_RESTORE_SIGMASK)</div><div class='del'>-#define _TIF_FREEZE		(1&lt;&lt;TIF_FREEZE)</div><div class='ctx'> </div><div class='ctx'> #define _TIF_WORK_MASK		0x0000FFFE	/* work to do on interrupt/exception return */</div><div class='ctx'> #define _TIF_ALLWORK_MASK	0x0000FFFF	/* work to do on any return to u-space */</div><div class='head'>diff --git a/arch/xtensa/include/asm/types.h b/arch/xtensa/include/asm/types.h<br/>index b1c981e39b52..6d4db7e8ffac 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/include/asm/types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/xtensa/include/asm/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/include/asm/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/xtensa/include/asm/types.h</a></div><div class='hunk'>@@ -23,8 +23,6 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='del'>-typedef unsigned short umode_t;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * These aren't exported outside the kernel to avoid name space clashes</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c<br/>index cd1026931203..61045c192e88 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/xtensa/kernel/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/xtensa/kernel/pci.c</a></div><div class='hunk'>@@ -134,9 +134,46 @@ struct pci_controller * __init pcibios_alloc_controller(void)</div><div class='ctx'> 	return pci_ctrl;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init pci_controller_apertures(struct pci_controller *pci_ctrl,</div><div class='add'>+					    struct list_head *resources)</div><div class='add'>+{</div><div class='add'>+	struct resource *res;</div><div class='add'>+	unsigned long io_offset;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	io_offset = (unsigned long)pci_ctrl-&gt;io_space.base;</div><div class='add'>+	res = &amp;pci_ctrl-&gt;io_resource;</div><div class='add'>+	if (!res-&gt;flags) {</div><div class='add'>+		if (io_offset)</div><div class='add'>+			printk (KERN_ERR "I/O resource not set for host"</div><div class='add'>+				" bridge %d\n", pci_ctrl-&gt;index);</div><div class='add'>+		res-&gt;start = 0;</div><div class='add'>+		res-&gt;end = IO_SPACE_LIMIT;</div><div class='add'>+		res-&gt;flags = IORESOURCE_IO;</div><div class='add'>+	}</div><div class='add'>+	res-&gt;start += io_offset;</div><div class='add'>+	res-&gt;end += io_offset;</div><div class='add'>+	pci_add_resource(resources, res);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		res = &amp;pci_ctrl-&gt;mem_resources[i];</div><div class='add'>+		if (!res-&gt;flags) {</div><div class='add'>+			if (i &gt; 0)</div><div class='add'>+				continue;</div><div class='add'>+			printk(KERN_ERR "Memory resource not set for "</div><div class='add'>+			       "host bridge %d\n", pci_ctrl-&gt;index);</div><div class='add'>+			res-&gt;start = 0;</div><div class='add'>+			res-&gt;end = ~0U;</div><div class='add'>+			res-&gt;flags = IORESOURCE_MEM;</div><div class='add'>+		}</div><div class='add'>+		pci_add_resource(resources, res);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init pcibios_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_controller *pci_ctrl;</div><div class='add'>+	struct list_head resources;</div><div class='ctx'> 	struct pci_bus *bus;</div><div class='ctx'> 	int next_busno = 0, i;</div><div class='ctx'> </div><div class='hunk'>@@ -145,19 +182,10 @@ static int __init pcibios_init(void)</div><div class='ctx'> 	/* Scan all of the recorded PCI controllers.  */</div><div class='ctx'> 	for (pci_ctrl = pci_ctrl_head; pci_ctrl; pci_ctrl = pci_ctrl-&gt;next) {</div><div class='ctx'> 		pci_ctrl-&gt;last_busno = 0xff;</div><div class='del'>-		bus = pci_scan_bus(pci_ctrl-&gt;first_busno, pci_ctrl-&gt;ops,</div><div class='del'>-				   pci_ctrl);</div><div class='del'>-		if (pci_ctrl-&gt;io_resource.flags) {</div><div class='del'>-			unsigned long offs;</div><div class='del'>-</div><div class='del'>-			offs = (unsigned long)pci_ctrl-&gt;io_space.base;</div><div class='del'>-			pci_ctrl-&gt;io_resource.start += offs;</div><div class='del'>-			pci_ctrl-&gt;io_resource.end += offs;</div><div class='del'>-			bus-&gt;resource[0] = &amp;pci_ctrl-&gt;io_resource;</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; i &lt; 3; ++i)</div><div class='del'>-			if (pci_ctrl-&gt;mem_resources[i].flags)</div><div class='del'>-				bus-&gt;resource[i+1] =&amp;pci_ctrl-&gt;mem_resources[i];</div><div class='add'>+		INIT_LIST_HEAD(&amp;resources);</div><div class='add'>+		pci_controller_apertures(pci_ctrl, &amp;resources);</div><div class='add'>+		bus = pci_scan_root_bus(NULL, pci_ctrl-&gt;first_busno,</div><div class='add'>+					pci_ctrl-&gt;ops, pci_ctrl, &amp;resources);</div><div class='ctx'> 		pci_ctrl-&gt;bus = bus;</div><div class='ctx'> 		pci_ctrl-&gt;last_busno = bus-&gt;subordinate;</div><div class='ctx'> 		if (next_busno &lt;= pci_ctrl-&gt;last_busno)</div><div class='hunk'>@@ -178,36 +206,7 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	io_offset = (unsigned long)pci_ctrl-&gt;io_space.base;</div><div class='del'>-	if (bus-&gt;parent == NULL) {</div><div class='del'>-		/* this is a host bridge - fill in its resources */</div><div class='del'>-		pci_ctrl-&gt;bus = bus;</div><div class='del'>-</div><div class='del'>-		bus-&gt;resource[0] = res = &amp;pci_ctrl-&gt;io_resource;</div><div class='del'>-		if (!res-&gt;flags) {</div><div class='del'>-			if (io_offset)</div><div class='del'>-				printk (KERN_ERR "I/O resource not set for host"</div><div class='del'>-					" bridge %d\n", pci_ctrl-&gt;index);</div><div class='del'>-			res-&gt;start = 0;</div><div class='del'>-			res-&gt;end = IO_SPACE_LIMIT;</div><div class='del'>-			res-&gt;flags = IORESOURCE_IO;</div><div class='del'>-		}</div><div class='del'>-		res-&gt;start += io_offset;</div><div class='del'>-		res-&gt;end += io_offset;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 3; i++) {</div><div class='del'>-			res = &amp;pci_ctrl-&gt;mem_resources[i];</div><div class='del'>-			if (!res-&gt;flags) {</div><div class='del'>-				if (i &gt; 0)</div><div class='del'>-					continue;</div><div class='del'>-				printk(KERN_ERR "Memory resource not set for "</div><div class='del'>-				       "host bridge %d\n", pci_ctrl-&gt;index);</div><div class='del'>-				res-&gt;start = 0;</div><div class='del'>-				res-&gt;end = ~0U;</div><div class='del'>-				res-&gt;flags = IORESOURCE_MEM;</div><div class='del'>-			}</div><div class='del'>-			bus-&gt;resource[i+1] = res;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='add'>+	if (bus-&gt;parent) {</div><div class='ctx'> 		/* This is a subordinate bridge */</div><div class='ctx'> 		pci_read_bridge_bases(bus);</div><div class='ctx'> </div><div class='hunk'>@@ -227,6 +226,11 @@ char __init *pcibios_setup(char *str)</div><div class='ctx'> 	return str;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void pcibios_set_master(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	/* No special bus mastering setup handling */</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* the next one is stolen from the alpha port... */</div><div class='ctx'> </div><div class='ctx'> void __init</div><div class='head'>diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c<br/>index a0d042aa2967..2dff698ab02e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/ptrace.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/xtensa/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/ptrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>arch/xtensa/kernel/ptrace.c</a></div><div class='hunk'>@@ -334,8 +334,7 @@ void do_syscall_trace_enter(struct pt_regs *regs)</div><div class='ctx'> 		do_syscall_trace();</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='del'>-	if (unlikely(current-&gt;audit_context))</div><div class='del'>-		audit_syscall_entry(current, AUDIT_ARCH_XTENSA..);</div><div class='add'>+	audit_syscall_entry(current, AUDIT_ARCH_XTENSA..);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/block/Kconfig b/block/Kconfig<br/>index e97934eececa..09acf1b39905 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/Kconfig</a></div><div class='hunk'>@@ -99,6 +99,12 @@ config BLK_DEV_THROTTLING</div><div class='ctx'> </div><div class='ctx'> 	See Documentation/cgroups/blkio-controller.txt for more information.</div><div class='ctx'> </div><div class='add'>+menu "Partition Types"</div><div class='add'>+</div><div class='add'>+source "block/partitions/Kconfig"</div><div class='add'>+</div><div class='add'>+endmenu</div><div class='add'>+</div><div class='ctx'> endif # BLOCK</div><div class='ctx'> </div><div class='ctx'> config BLOCK_COMPAT</div><div class='head'>diff --git a/block/Makefile b/block/Makefile<br/>index 514c6e4f427a..39b76ba66ffd 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/Makefile</a></div><div class='hunk'>@@ -5,7 +5,8 @@</div><div class='ctx'> obj-$(CONFIG_BLOCK) := elevator.o blk-core.o blk-tag.o blk-sysfs.o \</div><div class='ctx'> 			blk-flush.o blk-settings.o blk-ioc.o blk-map.o \</div><div class='ctx'> 			blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \</div><div class='del'>-			blk-iopoll.o blk-lib.o ioctl.o genhd.o scsi_ioctl.o</div><div class='add'>+			blk-iopoll.o blk-lib.o ioctl.o genhd.o scsi_ioctl.o \</div><div class='add'>+			partition-generic.o partitions/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_BLK_DEV_BSG)	+= bsg.o</div><div class='ctx'> obj-$(CONFIG_BLK_DEV_BSGLIB)	+= bsg-lib.o</div><div class='head'>diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c<br/>index 8f630cec906e..fa8f26309444 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/blk-cgroup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/blk-cgroup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/blk-cgroup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/blk-cgroup.c</a></div><div class='hunk'>@@ -30,8 +30,10 @@ EXPORT_SYMBOL_GPL(blkio_root_cgroup);</div><div class='ctx'> </div><div class='ctx'> static struct cgroup_subsys_state *blkiocg_create(struct cgroup_subsys *,</div><div class='ctx'> 						  struct cgroup *);</div><div class='del'>-static int blkiocg_can_attach_task(struct cgroup *, struct task_struct *);</div><div class='del'>-static void blkiocg_attach_task(struct cgroup *, struct task_struct *);</div><div class='add'>+static int blkiocg_can_attach(struct cgroup_subsys *, struct cgroup *,</div><div class='add'>+			      struct cgroup_taskset *);</div><div class='add'>+static void blkiocg_attach(struct cgroup_subsys *, struct cgroup *,</div><div class='add'>+			   struct cgroup_taskset *);</div><div class='ctx'> static void blkiocg_destroy(struct cgroup_subsys *, struct cgroup *);</div><div class='ctx'> static int blkiocg_populate(struct cgroup_subsys *, struct cgroup *);</div><div class='ctx'> </div><div class='hunk'>@@ -44,8 +46,8 @@ static int blkiocg_populate(struct cgroup_subsys *, struct cgroup *);</div><div class='ctx'> struct cgroup_subsys blkio_subsys = {</div><div class='ctx'> 	.name = "blkio",</div><div class='ctx'> 	.create = blkiocg_create,</div><div class='del'>-	.can_attach_task = blkiocg_can_attach_task,</div><div class='del'>-	.attach_task = blkiocg_attach_task,</div><div class='add'>+	.can_attach = blkiocg_can_attach,</div><div class='add'>+	.attach = blkiocg_attach,</div><div class='ctx'> 	.destroy = blkiocg_destroy,</div><div class='ctx'> 	.populate = blkiocg_populate,</div><div class='ctx'> #ifdef CONFIG_BLK_CGROUP</div><div class='hunk'>@@ -1626,30 +1628,40 @@ done:</div><div class='ctx'>  * of the main cic data structures.  For now we allow a task to change</div><div class='ctx'>  * its cgroup only if it's the only owner of its ioc.</div><div class='ctx'>  */</div><div class='del'>-static int blkiocg_can_attach_task(struct cgroup *cgrp, struct task_struct *tsk)</div><div class='add'>+static int blkiocg_can_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,</div><div class='add'>+			      struct cgroup_taskset *tset)</div><div class='ctx'> {</div><div class='add'>+	struct task_struct *task;</div><div class='ctx'> 	struct io_context *ioc;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* task_lock() is needed to avoid races with exit_io_context() */</div><div class='del'>-	task_lock(tsk);</div><div class='del'>-	ioc = tsk-&gt;io_context;</div><div class='del'>-	if (ioc &amp;&amp; atomic_read(&amp;ioc-&gt;nr_tasks) &gt; 1)</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	task_unlock(tsk);</div><div class='del'>-</div><div class='add'>+	cgroup_taskset_for_each(task, cgrp, tset) {</div><div class='add'>+		task_lock(task);</div><div class='add'>+		ioc = task-&gt;io_context;</div><div class='add'>+		if (ioc &amp;&amp; atomic_read(&amp;ioc-&gt;nr_tasks) &gt; 1)</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		task_unlock(task);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void blkiocg_attach_task(struct cgroup *cgrp, struct task_struct *tsk)</div><div class='add'>+static void blkiocg_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,</div><div class='add'>+			   struct cgroup_taskset *tset)</div><div class='ctx'> {</div><div class='add'>+	struct task_struct *task;</div><div class='ctx'> 	struct io_context *ioc;</div><div class='ctx'> </div><div class='del'>-	task_lock(tsk);</div><div class='del'>-	ioc = tsk-&gt;io_context;</div><div class='del'>-	if (ioc)</div><div class='del'>-		ioc-&gt;cgroup_changed = 1;</div><div class='del'>-	task_unlock(tsk);</div><div class='add'>+	cgroup_taskset_for_each(task, cgrp, tset) {</div><div class='add'>+		/* we don't lose anything even if ioc allocation fails */</div><div class='add'>+		ioc = get_task_io_context(task, GFP_ATOMIC, NUMA_NO_NODE);</div><div class='add'>+		if (ioc) {</div><div class='add'>+			ioc_cgroup_changed(ioc);</div><div class='add'>+			put_io_context(ioc, NULL);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void blkio_policy_register(struct blkio_policy_type *blkiop)</div><div class='head'>diff --git a/block/blk-core.c b/block/blk-core.c<br/>index 15de223c7f93..e6c05a97ee2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/blk-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/blk-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/blk-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/blk-core.c</a></div><div class='hunk'>@@ -39,6 +39,8 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_remap);</div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_remap);</div><div class='ctx'> EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_complete);</div><div class='ctx'> </div><div class='add'>+DEFINE_IDA(blk_queue_ida);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * For the allocated request tables</div><div class='ctx'>  */</div><div class='hunk'>@@ -358,7 +360,8 @@ EXPORT_SYMBOL(blk_put_queue);</div><div class='ctx'> void blk_drain_queue(struct request_queue *q, bool drain_all)</div><div class='ctx'> {</div><div class='ctx'> 	while (true) {</div><div class='del'>-		int nr_rqs;</div><div class='add'>+		bool drain = false;</div><div class='add'>+		int i;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irq(q-&gt;queue_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -375,14 +378,25 @@ void blk_drain_queue(struct request_queue *q, bool drain_all)</div><div class='ctx'> 		if (!list_empty(&amp;q-&gt;queue_head))</div><div class='ctx'> 			__blk_run_queue(q);</div><div class='ctx'> </div><div class='del'>-		if (drain_all)</div><div class='del'>-			nr_rqs = q-&gt;rq.count[0] + q-&gt;rq.count[1];</div><div class='del'>-		else</div><div class='del'>-			nr_rqs = q-&gt;rq.elvpriv;</div><div class='add'>+		drain |= q-&gt;rq.elvpriv;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Unfortunately, requests are queued at and tracked from</div><div class='add'>+		 * multiple places and there's no single counter which can</div><div class='add'>+		 * be drained.  Check all the queues and counters.</div><div class='add'>+		 */</div><div class='add'>+		if (drain_all) {</div><div class='add'>+			drain |= !list_empty(&amp;q-&gt;queue_head);</div><div class='add'>+			for (i = 0; i &lt; 2; i++) {</div><div class='add'>+				drain |= q-&gt;rq.count[i];</div><div class='add'>+				drain |= q-&gt;in_flight[i];</div><div class='add'>+				drain |= !list_empty(&amp;q-&gt;flush_queue[i]);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock_irq(q-&gt;queue_lock);</div><div class='ctx'> </div><div class='del'>-		if (!nr_rqs)</div><div class='add'>+		if (!drain)</div><div class='ctx'> 			break;</div><div class='ctx'> 		msleep(10);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -469,6 +483,10 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)</div><div class='ctx'> 	if (!q)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	q-&gt;id = ida_simple_get(&amp;blk_queue_ida, 0, 0, GFP_KERNEL);</div><div class='add'>+	if (q-&gt;id &lt; 0)</div><div class='add'>+		goto fail_q;</div><div class='add'>+</div><div class='ctx'> 	q-&gt;backing_dev_info.ra_pages =</div><div class='ctx'> 			(VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;</div><div class='ctx'> 	q-&gt;backing_dev_info.state = 0;</div><div class='hunk'>@@ -477,20 +495,17 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)</div><div class='ctx'> 	q-&gt;node = node_id;</div><div class='ctx'> </div><div class='ctx'> 	err = bdi_init(&amp;q-&gt;backing_dev_info);</div><div class='del'>-	if (err) {</div><div class='del'>-		kmem_cache_free(blk_requestq_cachep, q);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+	if (err)</div><div class='add'>+		goto fail_id;</div><div class='ctx'> </div><div class='del'>-	if (blk_throtl_init(q)) {</div><div class='del'>-		kmem_cache_free(blk_requestq_cachep, q);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+	if (blk_throtl_init(q))</div><div class='add'>+		goto fail_id;</div><div class='ctx'> </div><div class='ctx'> 	setup_timer(&amp;q-&gt;backing_dev_info.laptop_mode_wb_timer,</div><div class='ctx'> 		    laptop_mode_timer_fn, (unsigned long) q);</div><div class='ctx'> 	setup_timer(&amp;q-&gt;timeout, blk_rq_timed_out_timer, (unsigned long) q);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;q-&gt;timeout_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;q-&gt;icq_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;q-&gt;flush_queue[0]);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;q-&gt;flush_queue[1]);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;q-&gt;flush_data_in_flight);</div><div class='hunk'>@@ -508,6 +523,12 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)</div><div class='ctx'> 	q-&gt;queue_lock = &amp;q-&gt;__queue_lock;</div><div class='ctx'> </div><div class='ctx'> 	return q;</div><div class='add'>+</div><div class='add'>+fail_id:</div><div class='add'>+	ida_simple_remove(&amp;blk_queue_ida, q-&gt;id);</div><div class='add'>+fail_q:</div><div class='add'>+	kmem_cache_free(blk_requestq_cachep, q);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_alloc_queue_node);</div><div class='ctx'> </div><div class='hunk'>@@ -605,26 +626,31 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_init_allocated_queue);</div><div class='ctx'> </div><div class='del'>-int blk_get_queue(struct request_queue *q)</div><div class='add'>+bool blk_get_queue(struct request_queue *q)</div><div class='ctx'> {</div><div class='del'>-	if (likely(!test_bit(QUEUE_FLAG_DEAD, &amp;q-&gt;queue_flags))) {</div><div class='del'>-		kobject_get(&amp;q-&gt;kobj);</div><div class='del'>-		return 0;</div><div class='add'>+	if (likely(!blk_queue_dead(q))) {</div><div class='add'>+		__blk_get_queue(q);</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(blk_get_queue);</div><div class='ctx'> </div><div class='ctx'> static inline void blk_free_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	if (rq-&gt;cmd_flags &amp; REQ_ELVPRIV)</div><div class='add'>+	if (rq-&gt;cmd_flags &amp; REQ_ELVPRIV) {</div><div class='ctx'> 		elv_put_request(q, rq);</div><div class='add'>+		if (rq-&gt;elv.icq)</div><div class='add'>+			put_io_context(rq-&gt;elv.icq-&gt;ioc, q);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mempool_free(rq, q-&gt;rq.rq_pool);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct request *</div><div class='del'>-blk_alloc_request(struct request_queue *q, unsigned int flags, gfp_t gfp_mask)</div><div class='add'>+blk_alloc_request(struct request_queue *q, struct io_cq *icq,</div><div class='add'>+		  unsigned int flags, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct request *rq = mempool_alloc(q-&gt;rq.rq_pool, gfp_mask);</div><div class='ctx'> </div><div class='hunk'>@@ -635,10 +661,15 @@ blk_alloc_request(struct request_queue *q, unsigned int flags, gfp_t gfp_mask)</div><div class='ctx'> </div><div class='ctx'> 	rq-&gt;cmd_flags = flags | REQ_ALLOCED;</div><div class='ctx'> </div><div class='del'>-	if ((flags &amp; REQ_ELVPRIV) &amp;&amp;</div><div class='del'>-	    unlikely(elv_set_request(q, rq, gfp_mask))) {</div><div class='del'>-		mempool_free(rq, q-&gt;rq.rq_pool);</div><div class='del'>-		return NULL;</div><div class='add'>+	if (flags &amp; REQ_ELVPRIV) {</div><div class='add'>+		rq-&gt;elv.icq = icq;</div><div class='add'>+		if (unlikely(elv_set_request(q, rq, gfp_mask))) {</div><div class='add'>+			mempool_free(rq, q-&gt;rq.rq_pool);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		/* @rq-&gt;elv.icq holds on to io_context until @rq is freed */</div><div class='add'>+		if (icq)</div><div class='add'>+			get_io_context(icq-&gt;ioc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rq;</div><div class='hunk'>@@ -750,11 +781,17 @@ static struct request *get_request(struct request_queue *q, int rw_flags,</div><div class='ctx'> {</div><div class='ctx'> 	struct request *rq = NULL;</div><div class='ctx'> 	struct request_list *rl = &amp;q-&gt;rq;</div><div class='del'>-	struct io_context *ioc = NULL;</div><div class='add'>+	struct elevator_type *et;</div><div class='add'>+	struct io_context *ioc;</div><div class='add'>+	struct io_cq *icq = NULL;</div><div class='ctx'> 	const bool is_sync = rw_is_sync(rw_flags) != 0;</div><div class='add'>+	bool retried = false;</div><div class='ctx'> 	int may_queue;</div><div class='add'>+retry:</div><div class='add'>+	et = q-&gt;elevator-&gt;type;</div><div class='add'>+	ioc = current-&gt;io_context;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(test_bit(QUEUE_FLAG_DEAD, &amp;q-&gt;queue_flags)))</div><div class='add'>+	if (unlikely(blk_queue_dead(q)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	may_queue = elv_may_queue(q, rw_flags);</div><div class='hunk'>@@ -763,7 +800,20 @@ static struct request *get_request(struct request_queue *q, int rw_flags,</div><div class='ctx'> </div><div class='ctx'> 	if (rl-&gt;count[is_sync]+1 &gt;= queue_congestion_on_threshold(q)) {</div><div class='ctx'> 		if (rl-&gt;count[is_sync]+1 &gt;= q-&gt;nr_requests) {</div><div class='del'>-			ioc = current_io_context(GFP_ATOMIC, q-&gt;node);</div><div class='add'>+			/*</div><div class='add'>+			 * We want ioc to record batching state.  If it's</div><div class='add'>+			 * not already there, creating a new one requires</div><div class='add'>+			 * dropping queue_lock, which in turn requires</div><div class='add'>+			 * retesting conditions to avoid queue hang.</div><div class='add'>+			 */</div><div class='add'>+			if (!ioc &amp;&amp; !retried) {</div><div class='add'>+				spin_unlock_irq(q-&gt;queue_lock);</div><div class='add'>+				create_io_context(current, gfp_mask, q-&gt;node);</div><div class='add'>+				spin_lock_irq(q-&gt;queue_lock);</div><div class='add'>+				retried = true;</div><div class='add'>+				goto retry;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * The queue will fill after this allocation, so set</div><div class='ctx'> 			 * it as full, and mark this process as "batching".</div><div class='hunk'>@@ -799,17 +849,36 @@ static struct request *get_request(struct request_queue *q, int rw_flags,</div><div class='ctx'> 	rl-&gt;count[is_sync]++;</div><div class='ctx'> 	rl-&gt;starved[is_sync] = 0;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Decide whether the new request will be managed by elevator.  If</div><div class='add'>+	 * so, mark @rw_flags and increment elvpriv.  Non-zero elvpriv will</div><div class='add'>+	 * prevent the current elevator from being destroyed until the new</div><div class='add'>+	 * request is freed.  This guarantees icq's won't be destroyed and</div><div class='add'>+	 * makes creating new ones safe.</div><div class='add'>+	 *</div><div class='add'>+	 * Also, lookup icq while holding queue_lock.  If it doesn't exist,</div><div class='add'>+	 * it will be created after releasing queue_lock.</div><div class='add'>+	 */</div><div class='ctx'> 	if (blk_rq_should_init_elevator(bio) &amp;&amp;</div><div class='ctx'> 	    !test_bit(QUEUE_FLAG_ELVSWITCH, &amp;q-&gt;queue_flags)) {</div><div class='ctx'> 		rw_flags |= REQ_ELVPRIV;</div><div class='ctx'> 		rl-&gt;elvpriv++;</div><div class='add'>+		if (et-&gt;icq_cache &amp;&amp; ioc)</div><div class='add'>+			icq = ioc_lookup_icq(ioc, q);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (blk_queue_io_stat(q))</div><div class='ctx'> 		rw_flags |= REQ_IO_STAT;</div><div class='ctx'> 	spin_unlock_irq(q-&gt;queue_lock);</div><div class='ctx'> </div><div class='del'>-	rq = blk_alloc_request(q, rw_flags, gfp_mask);</div><div class='add'>+	/* create icq if missing */</div><div class='add'>+	if (unlikely(et-&gt;icq_cache &amp;&amp; !icq))</div><div class='add'>+		icq = ioc_create_icq(q, gfp_mask);</div><div class='add'>+</div><div class='add'>+	/* rqs are guaranteed to have icq on elv_set_request() if requested */</div><div class='add'>+	if (likely(!et-&gt;icq_cache || icq))</div><div class='add'>+		rq = blk_alloc_request(q, icq, rw_flags, gfp_mask);</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(!rq)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Allocation failed presumably due to memory. Undo anything</div><div class='hunk'>@@ -871,10 +940,9 @@ static struct request *get_request_wait(struct request_queue *q, int rw_flags,</div><div class='ctx'> 	rq = get_request(q, rw_flags, bio, GFP_NOIO);</div><div class='ctx'> 	while (!rq) {</div><div class='ctx'> 		DEFINE_WAIT(wait);</div><div class='del'>-		struct io_context *ioc;</div><div class='ctx'> 		struct request_list *rl = &amp;q-&gt;rq;</div><div class='ctx'> </div><div class='del'>-		if (unlikely(test_bit(QUEUE_FLAG_DEAD, &amp;q-&gt;queue_flags)))</div><div class='add'>+		if (unlikely(blk_queue_dead(q)))</div><div class='ctx'> 			return NULL;</div><div class='ctx'> </div><div class='ctx'> 		prepare_to_wait_exclusive(&amp;rl-&gt;wait[is_sync], &amp;wait,</div><div class='hunk'>@@ -891,8 +959,8 @@ static struct request *get_request_wait(struct request_queue *q, int rw_flags,</div><div class='ctx'> 		 * up to a big batch of them for a small period time.</div><div class='ctx'> 		 * See ioc_batching, ioc_set_batching</div><div class='ctx'> 		 */</div><div class='del'>-		ioc = current_io_context(GFP_NOIO, q-&gt;node);</div><div class='del'>-		ioc_set_batching(q, ioc);</div><div class='add'>+		create_io_context(current, GFP_NOIO, q-&gt;node);</div><div class='add'>+		ioc_set_batching(q, current-&gt;io_context);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irq(q-&gt;queue_lock);</div><div class='ctx'> 		finish_wait(&amp;rl-&gt;wait[is_sync], &amp;wait);</div><div class='hunk'>@@ -1009,54 +1077,6 @@ static void add_acct_request(struct request_queue *q, struct request *rq,</div><div class='ctx'> 	__elv_add_request(q, rq, where);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * blk_insert_request - insert a special request into a request queue</div><div class='del'>- * @q:		request queue where request should be inserted</div><div class='del'>- * @rq:		request to be inserted</div><div class='del'>- * @at_head:	insert request at head or tail of queue</div><div class='del'>- * @data:	private data</div><div class='del'>- *</div><div class='del'>- * Description:</div><div class='del'>- *    Many block devices need to execute commands asynchronously, so they don't</div><div class='del'>- *    block the whole kernel from preemption during request execution.  This is</div><div class='del'>- *    accomplished normally by inserting aritficial requests tagged as</div><div class='del'>- *    REQ_TYPE_SPECIAL in to the corresponding request queue, and letting them</div><div class='del'>- *    be scheduled for actual execution by the request queue.</div><div class='del'>- *</div><div class='del'>- *    We have the option of inserting the head or the tail of the queue.</div><div class='del'>- *    Typically we use the tail for new ioctls and so forth.  We use the head</div><div class='del'>- *    of the queue for things like a QUEUE_FULL message from a device, or a</div><div class='del'>- *    host that is unable to accept a particular command.</div><div class='del'>- */</div><div class='del'>-void blk_insert_request(struct request_queue *q, struct request *rq,</div><div class='del'>-			int at_head, void *data)</div><div class='del'>-{</div><div class='del'>-	int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * tell I/O scheduler that this isn't a regular read/write (ie it</div><div class='del'>-	 * must not attempt merges on this) and that it acts as a soft</div><div class='del'>-	 * barrier</div><div class='del'>-	 */</div><div class='del'>-	rq-&gt;cmd_type = REQ_TYPE_SPECIAL;</div><div class='del'>-</div><div class='del'>-	rq-&gt;special = data;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(q-&gt;queue_lock, flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If command is tagged, release the tag</div><div class='del'>-	 */</div><div class='del'>-	if (blk_rq_tagged(rq))</div><div class='del'>-		blk_queue_end_tag(q, rq);</div><div class='del'>-</div><div class='del'>-	add_acct_request(q, rq, where);</div><div class='del'>-	__blk_run_queue(q);</div><div class='del'>-	spin_unlock_irqrestore(q-&gt;queue_lock, flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(blk_insert_request);</div><div class='del'>-</div><div class='ctx'> static void part_round_stats_single(int cpu, struct hd_struct *part,</div><div class='ctx'> 				    unsigned long now)</div><div class='ctx'> {</div><div class='hunk'>@@ -1766,6 +1786,10 @@ int blk_insert_cloned_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(q-&gt;queue_lock, flags);</div><div class='add'>+	if (unlikely(blk_queue_dead(q))) {</div><div class='add'>+		spin_unlock_irqrestore(q-&gt;queue_lock, flags);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Submitting request must be dequeued before calling this function</div><div class='hunk'>@@ -2740,6 +2764,14 @@ static void queue_unplugged(struct request_queue *q, unsigned int depth,</div><div class='ctx'> 	trace_block_unplug(q, depth, !from_schedule);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Don't mess with dead queue.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(blk_queue_dead(q))) {</div><div class='add'>+		spin_unlock(q-&gt;queue_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * If we are punting this to kblockd, then we can safely drop</div><div class='ctx'> 	 * the queue_lock before waking kblockd (which needs to take</div><div class='ctx'> 	 * this lock).</div><div class='hunk'>@@ -2815,6 +2847,15 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)</div><div class='ctx'> 			depth = 0;</div><div class='ctx'> 			spin_lock(q-&gt;queue_lock);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Short-circuit if @q is dead</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(blk_queue_dead(q))) {</div><div class='add'>+			__blk_end_request_all(rq, -ENODEV);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * rq is already accounted, so use raw insert</div><div class='ctx'> 		 */</div><div class='head'>diff --git a/block/blk-exec.c b/block/blk-exec.c<br/>index a1ebceb332f9..fb2cbd551621 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/blk-exec.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/blk-exec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/blk-exec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/blk-exec.c</a></div><div class='hunk'>@@ -50,7 +50,11 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,</div><div class='ctx'> {</div><div class='ctx'> 	int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(test_bit(QUEUE_FLAG_DEAD, &amp;q-&gt;queue_flags))) {</div><div class='add'>+	WARN_ON(irqs_disabled());</div><div class='add'>+	spin_lock_irq(q-&gt;queue_lock);</div><div class='add'>+</div><div class='add'>+	if (unlikely(blk_queue_dead(q))) {</div><div class='add'>+		spin_unlock_irq(q-&gt;queue_lock);</div><div class='ctx'> 		rq-&gt;errors = -ENXIO;</div><div class='ctx'> 		if (rq-&gt;end_io)</div><div class='ctx'> 			rq-&gt;end_io(rq, rq-&gt;errors);</div><div class='hunk'>@@ -59,8 +63,6 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,</div><div class='ctx'> </div><div class='ctx'> 	rq-&gt;rq_disk = bd_disk;</div><div class='ctx'> 	rq-&gt;end_io = done;</div><div class='del'>-	WARN_ON(irqs_disabled());</div><div class='del'>-	spin_lock_irq(q-&gt;queue_lock);</div><div class='ctx'> 	__elv_add_request(q, rq, where);</div><div class='ctx'> 	__blk_run_queue(q);</div><div class='ctx'> 	/* the queue is stopped so it won't be run */</div><div class='head'>diff --git a/block/blk-ioc.c b/block/blk-ioc.c<br/>index 6f9bbd978653..27a06e00eaec 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/blk-ioc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/blk-ioc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/blk-ioc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/blk-ioc.c</a></div><div class='hunk'>@@ -16,53 +16,214 @@</div><div class='ctx'>  */</div><div class='ctx'> static struct kmem_cache *iocontext_cachep;</div><div class='ctx'> </div><div class='del'>-static void cfq_dtor(struct io_context *ioc)</div><div class='add'>+/**</div><div class='add'>+ * get_io_context - increment reference count to io_context</div><div class='add'>+ * @ioc: io_context to get</div><div class='add'>+ *</div><div class='add'>+ * Increment reference count to @ioc.</div><div class='add'>+ */</div><div class='add'>+void get_io_context(struct io_context *ioc)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(atomic_long_read(&amp;ioc-&gt;refcount) &lt;= 0);</div><div class='add'>+	atomic_long_inc(&amp;ioc-&gt;refcount);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(get_io_context);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Releasing ioc may nest into another put_io_context() leading to nested</div><div class='add'>+ * fast path release.  As the ioc's can't be the same, this is okay but</div><div class='add'>+ * makes lockdep whine.  Keep track of nesting and use it as subclass.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+#define ioc_release_depth(q)		((q) ? (q)-&gt;ioc_release_depth : 0)</div><div class='add'>+#define ioc_release_depth_inc(q)	(q)-&gt;ioc_release_depth++</div><div class='add'>+#define ioc_release_depth_dec(q)	(q)-&gt;ioc_release_depth--</div><div class='add'>+#else</div><div class='add'>+#define ioc_release_depth(q)		0</div><div class='add'>+#define ioc_release_depth_inc(q)	do { } while (0)</div><div class='add'>+#define ioc_release_depth_dec(q)	do { } while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void icq_free_icq_rcu(struct rcu_head *head)</div><div class='add'>+{</div><div class='add'>+	struct io_cq *icq = container_of(head, struct io_cq, __rcu_head);</div><div class='add'>+</div><div class='add'>+	kmem_cache_free(icq-&gt;__rcu_icq_cache, icq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Exit and free an icq.  Called with both ioc and q locked.</div><div class='add'>+ */</div><div class='add'>+static void ioc_exit_icq(struct io_cq *icq)</div><div class='ctx'> {</div><div class='del'>-	if (!hlist_empty(&amp;ioc-&gt;cic_list)) {</div><div class='del'>-		struct cfq_io_context *cic;</div><div class='add'>+	struct io_context *ioc = icq-&gt;ioc;</div><div class='add'>+	struct request_queue *q = icq-&gt;q;</div><div class='add'>+	struct elevator_type *et = q-&gt;elevator-&gt;type;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ioc-&gt;lock);</div><div class='add'>+	lockdep_assert_held(q-&gt;queue_lock);</div><div class='add'>+</div><div class='add'>+	radix_tree_delete(&amp;ioc-&gt;icq_tree, icq-&gt;q-&gt;id);</div><div class='add'>+	hlist_del_init(&amp;icq-&gt;ioc_node);</div><div class='add'>+	list_del_init(&amp;icq-&gt;q_node);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Both setting lookup hint to and clearing it from @icq are done</div><div class='add'>+	 * under queue_lock.  If it's not pointing to @icq now, it never</div><div class='add'>+	 * will.  Hint assignment itself can race safely.</div><div class='add'>+	 */</div><div class='add'>+	if (rcu_dereference_raw(ioc-&gt;icq_hint) == icq)</div><div class='add'>+		rcu_assign_pointer(ioc-&gt;icq_hint, NULL);</div><div class='ctx'> </div><div class='del'>-		cic = hlist_entry(ioc-&gt;cic_list.first, struct cfq_io_context,</div><div class='del'>-								cic_list);</div><div class='del'>-		cic-&gt;dtor(ioc);</div><div class='add'>+	if (et-&gt;ops.elevator_exit_icq_fn) {</div><div class='add'>+		ioc_release_depth_inc(q);</div><div class='add'>+		et-&gt;ops.elevator_exit_icq_fn(icq);</div><div class='add'>+		ioc_release_depth_dec(q);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * @icq-&gt;q might have gone away by the time RCU callback runs</div><div class='add'>+	 * making it impossible to determine icq_cache.  Record it in @icq.</div><div class='add'>+	 */</div><div class='add'>+	icq-&gt;__rcu_icq_cache = et-&gt;icq_cache;</div><div class='add'>+	call_rcu(&amp;icq-&gt;__rcu_head, icq_free_icq_rcu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * IO Context helper functions. put_io_context() returns 1 if there are no</div><div class='del'>- * more users of this io context, 0 otherwise.</div><div class='add'>+ * Slow path for ioc release in put_io_context().  Performs double-lock</div><div class='add'>+ * dancing to unlink all icq's and then frees ioc.</div><div class='ctx'>  */</div><div class='del'>-int put_io_context(struct io_context *ioc)</div><div class='add'>+static void ioc_release_fn(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	if (ioc == NULL)</div><div class='del'>-		return 1;</div><div class='add'>+	struct io_context *ioc = container_of(work, struct io_context,</div><div class='add'>+					      release_work);</div><div class='add'>+	struct request_queue *last_q = NULL;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(atomic_long_read(&amp;ioc-&gt;refcount) == 0);</div><div class='add'>+	spin_lock_irq(&amp;ioc-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (atomic_long_dec_and_test(&amp;ioc-&gt;refcount)) {</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		cfq_dtor(ioc);</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+	while (!hlist_empty(&amp;ioc-&gt;icq_list)) {</div><div class='add'>+		struct io_cq *icq = hlist_entry(ioc-&gt;icq_list.first,</div><div class='add'>+						struct io_cq, ioc_node);</div><div class='add'>+		struct request_queue *this_q = icq-&gt;q;</div><div class='ctx'> </div><div class='del'>-		kmem_cache_free(iocontext_cachep, ioc);</div><div class='del'>-		return 1;</div><div class='add'>+		if (this_q != last_q) {</div><div class='add'>+			/*</div><div class='add'>+			 * Need to switch to @this_q.  Once we release</div><div class='add'>+			 * @ioc-&gt;lock, it can go away along with @cic.</div><div class='add'>+			 * Hold on to it.</div><div class='add'>+			 */</div><div class='add'>+			__blk_get_queue(this_q);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * blk_put_queue() might sleep thanks to kobject</div><div class='add'>+			 * idiocy.  Always release both locks, put and</div><div class='add'>+			 * restart.</div><div class='add'>+			 */</div><div class='add'>+			if (last_q) {</div><div class='add'>+				spin_unlock(last_q-&gt;queue_lock);</div><div class='add'>+				spin_unlock_irq(&amp;ioc-&gt;lock);</div><div class='add'>+				blk_put_queue(last_q);</div><div class='add'>+			} else {</div><div class='add'>+				spin_unlock_irq(&amp;ioc-&gt;lock);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			last_q = this_q;</div><div class='add'>+			spin_lock_irq(this_q-&gt;queue_lock);</div><div class='add'>+			spin_lock(&amp;ioc-&gt;lock);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		ioc_exit_icq(icq);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	if (last_q) {</div><div class='add'>+		spin_unlock(last_q-&gt;queue_lock);</div><div class='add'>+		spin_unlock_irq(&amp;ioc-&gt;lock);</div><div class='add'>+		blk_put_queue(last_q);</div><div class='add'>+	} else {</div><div class='add'>+		spin_unlock_irq(&amp;ioc-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kmem_cache_free(iocontext_cachep, ioc);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(put_io_context);</div><div class='ctx'> </div><div class='del'>-static void cfq_exit(struct io_context *ioc)</div><div class='add'>+/**</div><div class='add'>+ * put_io_context - put a reference of io_context</div><div class='add'>+ * @ioc: io_context to put</div><div class='add'>+ * @locked_q: request_queue the caller is holding queue_lock of (hint)</div><div class='add'>+ *</div><div class='add'>+ * Decrement reference count of @ioc and release it if the count reaches</div><div class='add'>+ * zero.  If the caller is holding queue_lock of a queue, it can indicate</div><div class='add'>+ * that with @locked_q.  This is an optimization hint and the caller is</div><div class='add'>+ * allowed to pass in %NULL even when it's holding a queue_lock.</div><div class='add'>+ */</div><div class='add'>+void put_io_context(struct io_context *ioc, struct request_queue *locked_q)</div><div class='ctx'> {</div><div class='del'>-	rcu_read_lock();</div><div class='add'>+	struct request_queue *last_q = locked_q;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (ioc == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	BUG_ON(atomic_long_read(&amp;ioc-&gt;refcount) &lt;= 0);</div><div class='add'>+	if (locked_q)</div><div class='add'>+		lockdep_assert_held(locked_q-&gt;queue_lock);</div><div class='ctx'> </div><div class='del'>-	if (!hlist_empty(&amp;ioc-&gt;cic_list)) {</div><div class='del'>-		struct cfq_io_context *cic;</div><div class='add'>+	if (!atomic_long_dec_and_test(&amp;ioc-&gt;refcount))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Destroy @ioc.  This is a bit messy because icq's are chained</div><div class='add'>+	 * from both ioc and queue, and ioc-&gt;lock nests inside queue_lock.</div><div class='add'>+	 * The inner ioc-&gt;lock should be held to walk our icq_list and then</div><div class='add'>+	 * for each icq the outer matching queue_lock should be grabbed.</div><div class='add'>+	 * ie. We need to do reverse-order double lock dancing.</div><div class='add'>+	 *</div><div class='add'>+	 * Another twist is that we are often called with one of the</div><div class='add'>+	 * matching queue_locks held as indicated by @locked_q, which</div><div class='add'>+	 * prevents performing double-lock dance for other queues.</div><div class='add'>+	 *</div><div class='add'>+	 * So, we do it in two stages.  The fast path uses the queue_lock</div><div class='add'>+	 * the caller is holding and, if other queues need to be accessed,</div><div class='add'>+	 * uses trylock to avoid introducing locking dependency.  This can</div><div class='add'>+	 * handle most cases, especially if @ioc was performing IO on only</div><div class='add'>+	 * single device.</div><div class='add'>+	 *</div><div class='add'>+	 * If trylock doesn't cut it, we defer to @ioc-&gt;release_work which</div><div class='add'>+	 * can do all the double-locking dancing.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave_nested(&amp;ioc-&gt;lock, flags,</div><div class='add'>+				 ioc_release_depth(locked_q));</div><div class='ctx'> </div><div class='del'>-		cic = hlist_entry(ioc-&gt;cic_list.first, struct cfq_io_context,</div><div class='del'>-								cic_list);</div><div class='del'>-		cic-&gt;exit(ioc);</div><div class='add'>+	while (!hlist_empty(&amp;ioc-&gt;icq_list)) {</div><div class='add'>+		struct io_cq *icq = hlist_entry(ioc-&gt;icq_list.first,</div><div class='add'>+						struct io_cq, ioc_node);</div><div class='add'>+		struct request_queue *this_q = icq-&gt;q;</div><div class='add'>+</div><div class='add'>+		if (this_q != last_q) {</div><div class='add'>+			if (last_q &amp;&amp; last_q != locked_q)</div><div class='add'>+				spin_unlock(last_q-&gt;queue_lock);</div><div class='add'>+			last_q = NULL;</div><div class='add'>+</div><div class='add'>+			if (!spin_trylock(this_q-&gt;queue_lock))</div><div class='add'>+				break;</div><div class='add'>+			last_q = this_q;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		ioc_exit_icq(icq);</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	if (last_q &amp;&amp; last_q != locked_q)</div><div class='add'>+		spin_unlock(last_q-&gt;queue_lock);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;ioc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* if no icq is left, we're done; otherwise, kick release_work */</div><div class='add'>+	if (hlist_empty(&amp;ioc-&gt;icq_list))</div><div class='add'>+		kmem_cache_free(iocontext_cachep, ioc);</div><div class='add'>+	else</div><div class='add'>+		schedule_work(&amp;ioc-&gt;release_work);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(put_io_context);</div><div class='ctx'> </div><div class='ctx'> /* Called by the exiting task */</div><div class='ctx'> void exit_io_context(struct task_struct *task)</div><div class='hunk'>@@ -74,86 +235,240 @@ void exit_io_context(struct task_struct *task)</div><div class='ctx'> 	task-&gt;io_context = NULL;</div><div class='ctx'> 	task_unlock(task);</div><div class='ctx'> </div><div class='del'>-	if (atomic_dec_and_test(&amp;ioc-&gt;nr_tasks))</div><div class='del'>-		cfq_exit(ioc);</div><div class='add'>+	atomic_dec(&amp;ioc-&gt;nr_tasks);</div><div class='add'>+	put_io_context(ioc, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ioc_clear_queue - break any ioc association with the specified queue</div><div class='add'>+ * @q: request_queue being cleared</div><div class='add'>+ *</div><div class='add'>+ * Walk @q-&gt;icq_list and exit all io_cq's.  Must be called with @q locked.</div><div class='add'>+ */</div><div class='add'>+void ioc_clear_queue(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(q-&gt;queue_lock);</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;q-&gt;icq_list)) {</div><div class='add'>+		struct io_cq *icq = list_entry(q-&gt;icq_list.next,</div><div class='add'>+					       struct io_cq, q_node);</div><div class='add'>+		struct io_context *ioc = icq-&gt;ioc;</div><div class='ctx'> </div><div class='del'>-	put_io_context(ioc);</div><div class='add'>+		spin_lock(&amp;ioc-&gt;lock);</div><div class='add'>+		ioc_exit_icq(icq);</div><div class='add'>+		spin_unlock(&amp;ioc-&gt;lock);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct io_context *alloc_io_context(gfp_t gfp_flags, int node)</div><div class='add'>+void create_io_context_slowpath(struct task_struct *task, gfp_t gfp_flags,</div><div class='add'>+				int node)</div><div class='ctx'> {</div><div class='ctx'> 	struct io_context *ioc;</div><div class='ctx'> </div><div class='del'>-	ioc = kmem_cache_alloc_node(iocontext_cachep, gfp_flags, node);</div><div class='del'>-	if (ioc) {</div><div class='del'>-		atomic_long_set(&amp;ioc-&gt;refcount, 1);</div><div class='del'>-		atomic_set(&amp;ioc-&gt;nr_tasks, 1);</div><div class='del'>-		spin_lock_init(&amp;ioc-&gt;lock);</div><div class='del'>-		ioc-&gt;ioprio_changed = 0;</div><div class='del'>-		ioc-&gt;ioprio = 0;</div><div class='del'>-		ioc-&gt;last_waited = 0; /* doesn't matter... */</div><div class='del'>-		ioc-&gt;nr_batch_requests = 0; /* because this is 0 */</div><div class='del'>-		INIT_RADIX_TREE(&amp;ioc-&gt;radix_root, GFP_ATOMIC | __GFP_HIGH);</div><div class='del'>-		INIT_HLIST_HEAD(&amp;ioc-&gt;cic_list);</div><div class='del'>-		ioc-&gt;ioc_data = NULL;</div><div class='del'>-#if defined(CONFIG_BLK_CGROUP) || defined(CONFIG_BLK_CGROUP_MODULE)</div><div class='del'>-		ioc-&gt;cgroup_changed = 0;</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='add'>+	ioc = kmem_cache_alloc_node(iocontext_cachep, gfp_flags | __GFP_ZERO,</div><div class='add'>+				    node);</div><div class='add'>+	if (unlikely(!ioc))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	return ioc;</div><div class='add'>+	/* initialize */</div><div class='add'>+	atomic_long_set(&amp;ioc-&gt;refcount, 1);</div><div class='add'>+	atomic_set(&amp;ioc-&gt;nr_tasks, 1);</div><div class='add'>+	spin_lock_init(&amp;ioc-&gt;lock);</div><div class='add'>+	INIT_RADIX_TREE(&amp;ioc-&gt;icq_tree, GFP_ATOMIC | __GFP_HIGH);</div><div class='add'>+	INIT_HLIST_HEAD(&amp;ioc-&gt;icq_list);</div><div class='add'>+	INIT_WORK(&amp;ioc-&gt;release_work, ioc_release_fn);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Try to install.  ioc shouldn't be installed if someone else</div><div class='add'>+	 * already did or @task, which isn't %current, is exiting.  Note</div><div class='add'>+	 * that we need to allow ioc creation on exiting %current as exit</div><div class='add'>+	 * path may issue IOs from e.g. exit_files().  The exit path is</div><div class='add'>+	 * responsible for not issuing IO after exit_io_context().</div><div class='add'>+	 */</div><div class='add'>+	task_lock(task);</div><div class='add'>+	if (!task-&gt;io_context &amp;&amp;</div><div class='add'>+	    (task == current || !(task-&gt;flags &amp; PF_EXITING)))</div><div class='add'>+		task-&gt;io_context = ioc;</div><div class='add'>+	else</div><div class='add'>+		kmem_cache_free(iocontext_cachep, ioc);</div><div class='add'>+	task_unlock(task);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * If the current task has no IO context then create one and initialise it.</div><div class='del'>- * Otherwise, return its existing IO context.</div><div class='add'>+/**</div><div class='add'>+ * get_task_io_context - get io_context of a task</div><div class='add'>+ * @task: task of interest</div><div class='add'>+ * @gfp_flags: allocation flags, used if allocation is necessary</div><div class='add'>+ * @node: allocation node, used if allocation is necessary</div><div class='ctx'>  *</div><div class='del'>- * This returned IO context doesn't have a specifically elevated refcount,</div><div class='del'>- * but since the current task itself holds a reference, the context can be</div><div class='del'>- * used in general code, so long as it stays within `current` context.</div><div class='add'>+ * Return io_context of @task.  If it doesn't exist, it is created with</div><div class='add'>+ * @gfp_flags and @node.  The returned io_context has its reference count</div><div class='add'>+ * incremented.</div><div class='add'>+ *</div><div class='add'>+ * This function always goes through task_lock() and it's better to use</div><div class='add'>+ * %current-&gt;io_context + get_io_context() for %current.</div><div class='ctx'>  */</div><div class='del'>-struct io_context *current_io_context(gfp_t gfp_flags, int node)</div><div class='add'>+struct io_context *get_task_io_context(struct task_struct *task,</div><div class='add'>+				       gfp_t gfp_flags, int node)</div><div class='ctx'> {</div><div class='del'>-	struct task_struct *tsk = current;</div><div class='del'>-	struct io_context *ret;</div><div class='del'>-</div><div class='del'>-	ret = tsk-&gt;io_context;</div><div class='del'>-	if (likely(ret))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = alloc_io_context(gfp_flags, node);</div><div class='del'>-	if (ret) {</div><div class='del'>-		/* make sure set_task_ioprio() sees the settings above */</div><div class='del'>-		smp_wmb();</div><div class='del'>-		tsk-&gt;io_context = ret;</div><div class='del'>-	}</div><div class='add'>+	struct io_context *ioc;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	might_sleep_if(gfp_flags &amp; __GFP_WAIT);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		task_lock(task);</div><div class='add'>+		ioc = task-&gt;io_context;</div><div class='add'>+		if (likely(ioc)) {</div><div class='add'>+			get_io_context(ioc);</div><div class='add'>+			task_unlock(task);</div><div class='add'>+			return ioc;</div><div class='add'>+		}</div><div class='add'>+		task_unlock(task);</div><div class='add'>+	} while (create_io_context(task, gfp_flags, node));</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(get_task_io_context);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * If the current task has no IO context then create one and initialise it.</div><div class='del'>- * If it does have a context, take a ref on it.</div><div class='add'>+/**</div><div class='add'>+ * ioc_lookup_icq - lookup io_cq from ioc</div><div class='add'>+ * @ioc: the associated io_context</div><div class='add'>+ * @q: the associated request_queue</div><div class='ctx'>  *</div><div class='del'>- * This is always called in the context of the task which submitted the I/O.</div><div class='add'>+ * Look up io_cq associated with @ioc - @q pair from @ioc.  Must be called</div><div class='add'>+ * with @q-&gt;queue_lock held.</div><div class='ctx'>  */</div><div class='del'>-struct io_context *get_io_context(gfp_t gfp_flags, int node)</div><div class='add'>+struct io_cq *ioc_lookup_icq(struct io_context *ioc, struct request_queue *q)</div><div class='ctx'> {</div><div class='del'>-	struct io_context *ioc = NULL;</div><div class='add'>+	struct io_cq *icq;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(q-&gt;queue_lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Check for unlikely race with exiting task. ioc ref count is</div><div class='del'>-	 * zero when ioc is being detached.</div><div class='add'>+	 * icq's are indexed from @ioc using radix tree and hint pointer,</div><div class='add'>+	 * both of which are protected with RCU.  All removals are done</div><div class='add'>+	 * holding both q and ioc locks, and we're holding q lock - if we</div><div class='add'>+	 * find a icq which points to us, it's guaranteed to be valid.</div><div class='ctx'> 	 */</div><div class='del'>-	do {</div><div class='del'>-		ioc = current_io_context(gfp_flags, node);</div><div class='del'>-		if (unlikely(!ioc))</div><div class='del'>-			break;</div><div class='del'>-	} while (!atomic_long_inc_not_zero(&amp;ioc-&gt;refcount));</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	icq = rcu_dereference(ioc-&gt;icq_hint);</div><div class='add'>+	if (icq &amp;&amp; icq-&gt;q == q)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	return ioc;</div><div class='add'>+	icq = radix_tree_lookup(&amp;ioc-&gt;icq_tree, q-&gt;id);</div><div class='add'>+	if (icq &amp;&amp; icq-&gt;q == q)</div><div class='add'>+		rcu_assign_pointer(ioc-&gt;icq_hint, icq);	/* allowed to race */</div><div class='add'>+	else</div><div class='add'>+		icq = NULL;</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return icq;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(get_io_context);</div><div class='add'>+EXPORT_SYMBOL(ioc_lookup_icq);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ioc_create_icq - create and link io_cq</div><div class='add'>+ * @q: request_queue of interest</div><div class='add'>+ * @gfp_mask: allocation mask</div><div class='add'>+ *</div><div class='add'>+ * Make sure io_cq linking %current-&gt;io_context and @q exists.  If either</div><div class='add'>+ * io_context and/or icq don't exist, they will be created using @gfp_mask.</div><div class='add'>+ *</div><div class='add'>+ * The caller is responsible for ensuring @ioc won't go away and @q is</div><div class='add'>+ * alive and will stay alive until this function returns.</div><div class='add'>+ */</div><div class='add'>+struct io_cq *ioc_create_icq(struct request_queue *q, gfp_t gfp_mask)</div><div class='add'>+{</div><div class='add'>+	struct elevator_type *et = q-&gt;elevator-&gt;type;</div><div class='add'>+	struct io_context *ioc;</div><div class='add'>+	struct io_cq *icq;</div><div class='add'>+</div><div class='add'>+	/* allocate stuff */</div><div class='add'>+	ioc = create_io_context(current, gfp_mask, q-&gt;node);</div><div class='add'>+	if (!ioc)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	icq = kmem_cache_alloc_node(et-&gt;icq_cache, gfp_mask | __GFP_ZERO,</div><div class='add'>+				    q-&gt;node);</div><div class='add'>+	if (!icq)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (radix_tree_preload(gfp_mask) &lt; 0) {</div><div class='add'>+		kmem_cache_free(et-&gt;icq_cache, icq);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	icq-&gt;ioc = ioc;</div><div class='add'>+	icq-&gt;q = q;</div><div class='add'>+	INIT_LIST_HEAD(&amp;icq-&gt;q_node);</div><div class='add'>+	INIT_HLIST_NODE(&amp;icq-&gt;ioc_node);</div><div class='add'>+</div><div class='add'>+	/* lock both q and ioc and try to link @icq */</div><div class='add'>+	spin_lock_irq(q-&gt;queue_lock);</div><div class='add'>+	spin_lock(&amp;ioc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (likely(!radix_tree_insert(&amp;ioc-&gt;icq_tree, q-&gt;id, icq))) {</div><div class='add'>+		hlist_add_head(&amp;icq-&gt;ioc_node, &amp;ioc-&gt;icq_list);</div><div class='add'>+		list_add(&amp;icq-&gt;q_node, &amp;q-&gt;icq_list);</div><div class='add'>+		if (et-&gt;ops.elevator_init_icq_fn)</div><div class='add'>+			et-&gt;ops.elevator_init_icq_fn(icq);</div><div class='add'>+	} else {</div><div class='add'>+		kmem_cache_free(et-&gt;icq_cache, icq);</div><div class='add'>+		icq = ioc_lookup_icq(ioc, q);</div><div class='add'>+		if (!icq)</div><div class='add'>+			printk(KERN_ERR "cfq: icq link failed!\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;ioc-&gt;lock);</div><div class='add'>+	spin_unlock_irq(q-&gt;queue_lock);</div><div class='add'>+	radix_tree_preload_end();</div><div class='add'>+	return icq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ioc_set_changed(struct io_context *ioc, int which)</div><div class='add'>+{</div><div class='add'>+	struct io_cq *icq;</div><div class='add'>+	struct hlist_node *n;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(icq, n, &amp;ioc-&gt;icq_list, ioc_node)</div><div class='add'>+		set_bit(which, &amp;icq-&gt;changed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ioc_ioprio_changed - notify ioprio change</div><div class='add'>+ * @ioc: io_context of interest</div><div class='add'>+ * @ioprio: new ioprio</div><div class='add'>+ *</div><div class='add'>+ * @ioc's ioprio has changed to @ioprio.  Set %ICQ_IOPRIO_CHANGED for all</div><div class='add'>+ * icq's.  iosched is responsible for checking the bit and applying it on</div><div class='add'>+ * request issue path.</div><div class='add'>+ */</div><div class='add'>+void ioc_ioprio_changed(struct io_context *ioc, int ioprio)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ioc-&gt;lock, flags);</div><div class='add'>+	ioc-&gt;ioprio = ioprio;</div><div class='add'>+	ioc_set_changed(ioc, ICQ_IOPRIO_CHANGED);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ioc-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ioc_cgroup_changed - notify cgroup change</div><div class='add'>+ * @ioc: io_context of interest</div><div class='add'>+ *</div><div class='add'>+ * @ioc's cgroup has changed.  Set %ICQ_CGROUP_CHANGED for all icq's.</div><div class='add'>+ * iosched is responsible for checking the bit and applying it on request</div><div class='add'>+ * issue path.</div><div class='add'>+ */</div><div class='add'>+void ioc_cgroup_changed(struct io_context *ioc)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ioc-&gt;lock, flags);</div><div class='add'>+	ioc_set_changed(ioc, ICQ_CGROUP_CHANGED);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ioc-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ioc_cgroup_changed);</div><div class='ctx'> </div><div class='ctx'> static int __init blk_ioc_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/block/blk-settings.c b/block/blk-settings.c<br/>index fa1eb0449a05..d3234fc494ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/blk-settings.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/blk-settings.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/blk-settings.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/blk-settings.c</a></div><div class='hunk'>@@ -104,9 +104,7 @@ EXPORT_SYMBOL_GPL(blk_queue_lld_busy);</div><div class='ctx'>  * @lim:  the queue_limits structure to reset</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='del'>- *   Returns a queue_limit struct to its default state.  Can be used by</div><div class='del'>- *   stacking drivers like DM that stage table swaps and reuse an</div><div class='del'>- *   existing device queue.</div><div class='add'>+ *   Returns a queue_limit struct to its default state.</div><div class='ctx'>  */</div><div class='ctx'> void blk_set_default_limits(struct queue_limits *lim)</div><div class='ctx'> {</div><div class='hunk'>@@ -114,13 +112,12 @@ void blk_set_default_limits(struct queue_limits *lim)</div><div class='ctx'> 	lim-&gt;max_integrity_segments = 0;</div><div class='ctx'> 	lim-&gt;seg_boundary_mask = BLK_SEG_BOUNDARY_MASK;</div><div class='ctx'> 	lim-&gt;max_segment_size = BLK_MAX_SEGMENT_SIZE;</div><div class='del'>-	lim-&gt;max_sectors = BLK_DEF_MAX_SECTORS;</div><div class='del'>-	lim-&gt;max_hw_sectors = INT_MAX;</div><div class='add'>+	lim-&gt;max_sectors = lim-&gt;max_hw_sectors = BLK_SAFE_MAX_SECTORS;</div><div class='ctx'> 	lim-&gt;max_discard_sectors = 0;</div><div class='ctx'> 	lim-&gt;discard_granularity = 0;</div><div class='ctx'> 	lim-&gt;discard_alignment = 0;</div><div class='ctx'> 	lim-&gt;discard_misaligned = 0;</div><div class='del'>-	lim-&gt;discard_zeroes_data = 1;</div><div class='add'>+	lim-&gt;discard_zeroes_data = 0;</div><div class='ctx'> 	lim-&gt;logical_block_size = lim-&gt;physical_block_size = lim-&gt;io_min = 512;</div><div class='ctx'> 	lim-&gt;bounce_pfn = (unsigned long)(BLK_BOUNCE_ANY &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> 	lim-&gt;alignment_offset = 0;</div><div class='hunk'>@@ -131,6 +128,27 @@ void blk_set_default_limits(struct queue_limits *lim)</div><div class='ctx'> EXPORT_SYMBOL(blk_set_default_limits);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * blk_set_stacking_limits - set default limits for stacking devices</div><div class='add'>+ * @lim:  the queue_limits structure to reset</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ *   Returns a queue_limit struct to its default state. Should be used</div><div class='add'>+ *   by stacking drivers like DM that have no internal limits.</div><div class='add'>+ */</div><div class='add'>+void blk_set_stacking_limits(struct queue_limits *lim)</div><div class='add'>+{</div><div class='add'>+	blk_set_default_limits(lim);</div><div class='add'>+</div><div class='add'>+	/* Inherit limits from component devices */</div><div class='add'>+	lim-&gt;discard_zeroes_data = 1;</div><div class='add'>+	lim-&gt;max_segments = USHRT_MAX;</div><div class='add'>+	lim-&gt;max_hw_sectors = UINT_MAX;</div><div class='add'>+</div><div class='add'>+	lim-&gt;max_sectors = BLK_DEF_MAX_SECTORS;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(blk_set_stacking_limits);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * blk_queue_make_request - define an alternate make_request function for a device</div><div class='ctx'>  * @q:  the request queue for the device to be affected</div><div class='ctx'>  * @mfn: the alternate make_request function</div><div class='hunk'>@@ -165,8 +183,6 @@ void blk_queue_make_request(struct request_queue *q, make_request_fn *mfn)</div><div class='ctx'> 	q-&gt;nr_batching = BLK_BATCH_REQ;</div><div class='ctx'> </div><div class='ctx'> 	blk_set_default_limits(&amp;q-&gt;limits);</div><div class='del'>-	blk_queue_max_hw_sectors(q, BLK_SAFE_MAX_SECTORS);</div><div class='del'>-	q-&gt;limits.discard_zeroes_data = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * by default assume old behaviour and bounce for any highmem page</div><div class='head'>diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c<br/>index e7f9f657f105..cf150011d808 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/blk-sysfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/blk-sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/blk-sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/blk-sysfs.c</a></div><div class='hunk'>@@ -425,7 +425,7 @@ queue_attr_show(struct kobject *kobj, struct attribute *attr, char *page)</div><div class='ctx'> 	if (!entry-&gt;show)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	mutex_lock(&amp;q-&gt;sysfs_lock);</div><div class='del'>-	if (test_bit(QUEUE_FLAG_DEAD, &amp;q-&gt;queue_flags)) {</div><div class='add'>+	if (blk_queue_dead(q)) {</div><div class='ctx'> 		mutex_unlock(&amp;q-&gt;sysfs_lock);</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -447,7 +447,7 @@ queue_attr_store(struct kobject *kobj, struct attribute *attr,</div><div class='ctx'> </div><div class='ctx'> 	q = container_of(kobj, struct request_queue, kobj);</div><div class='ctx'> 	mutex_lock(&amp;q-&gt;sysfs_lock);</div><div class='del'>-	if (test_bit(QUEUE_FLAG_DEAD, &amp;q-&gt;queue_flags)) {</div><div class='add'>+	if (blk_queue_dead(q)) {</div><div class='ctx'> 		mutex_unlock(&amp;q-&gt;sysfs_lock);</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -479,8 +479,12 @@ static void blk_release_queue(struct kobject *kobj)</div><div class='ctx'> </div><div class='ctx'> 	blk_sync_queue(q);</div><div class='ctx'> </div><div class='del'>-	if (q-&gt;elevator)</div><div class='add'>+	if (q-&gt;elevator) {</div><div class='add'>+		spin_lock_irq(q-&gt;queue_lock);</div><div class='add'>+		ioc_clear_queue(q);</div><div class='add'>+		spin_unlock_irq(q-&gt;queue_lock);</div><div class='ctx'> 		elevator_exit(q-&gt;elevator);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	blk_throtl_exit(q);</div><div class='ctx'> </div><div class='hunk'>@@ -494,6 +498,8 @@ static void blk_release_queue(struct kobject *kobj)</div><div class='ctx'> 	blk_trace_shutdown(q);</div><div class='ctx'> </div><div class='ctx'> 	bdi_destroy(&amp;q-&gt;backing_dev_info);</div><div class='add'>+</div><div class='add'>+	ida_simple_remove(&amp;blk_queue_ida, q-&gt;id);</div><div class='ctx'> 	kmem_cache_free(blk_requestq_cachep, q);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/block/blk-throttle.c b/block/blk-throttle.c<br/>index 4553245d9317..5eed6a76721d 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/blk-throttle.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/blk-throttle.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/blk-throttle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/blk-throttle.c</a></div><div class='hunk'>@@ -310,7 +310,7 @@ static struct throtl_grp * throtl_get_tg(struct throtl_data *td)</div><div class='ctx'> 	struct request_queue *q = td-&gt;queue;</div><div class='ctx'> </div><div class='ctx'> 	/* no throttling for dead queue */</div><div class='del'>-	if (unlikely(test_bit(QUEUE_FLAG_DEAD, &amp;q-&gt;queue_flags)))</div><div class='add'>+	if (unlikely(blk_queue_dead(q)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='hunk'>@@ -335,7 +335,7 @@ static struct throtl_grp * throtl_get_tg(struct throtl_data *td)</div><div class='ctx'> 	spin_lock_irq(q-&gt;queue_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure @q is still alive */</div><div class='del'>-	if (unlikely(test_bit(QUEUE_FLAG_DEAD, &amp;q-&gt;queue_flags))) {</div><div class='add'>+	if (unlikely(blk_queue_dead(q))) {</div><div class='ctx'> 		kfree(tg);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/block/blk.h b/block/blk.h<br/>index 3f6551b3c92d..7efd772336de 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/blk.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/blk.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/blk.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/blk.h</a></div><div class='hunk'>@@ -1,6 +1,8 @@</div><div class='ctx'> #ifndef BLK_INTERNAL_H</div><div class='ctx'> #define BLK_INTERNAL_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/idr.h&gt;</div><div class='add'>+</div><div class='ctx'> /* Amount of time in which a process may batch requests */</div><div class='ctx'> #define BLK_BATCH_TIME	(HZ/50UL)</div><div class='ctx'> </div><div class='hunk'>@@ -9,6 +11,12 @@</div><div class='ctx'> </div><div class='ctx'> extern struct kmem_cache *blk_requestq_cachep;</div><div class='ctx'> extern struct kobj_type blk_queue_ktype;</div><div class='add'>+extern struct ida blk_queue_ida;</div><div class='add'>+</div><div class='add'>+static inline void __blk_get_queue(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	kobject_get(&amp;q-&gt;kobj);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> void init_request_from_bio(struct request *req, struct bio *bio);</div><div class='ctx'> void blk_rq_bio_prep(struct request_queue *q, struct request *rq,</div><div class='hunk'>@@ -85,8 +93,8 @@ static inline struct request *__elv_next_request(struct request_queue *q)</div><div class='ctx'> 			q-&gt;flush_queue_delayed = 1;</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='del'>-		if (test_bit(QUEUE_FLAG_DEAD, &amp;q-&gt;queue_flags) ||</div><div class='del'>-		    !q-&gt;elevator-&gt;ops-&gt;elevator_dispatch_fn(q, 0))</div><div class='add'>+		if (unlikely(blk_queue_dead(q)) ||</div><div class='add'>+		    !q-&gt;elevator-&gt;type-&gt;ops.elevator_dispatch_fn(q, 0))</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -95,16 +103,16 @@ static inline void elv_activate_rq(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;ops-&gt;elevator_activate_req_fn)</div><div class='del'>-		e-&gt;ops-&gt;elevator_activate_req_fn(q, rq);</div><div class='add'>+	if (e-&gt;type-&gt;ops.elevator_activate_req_fn)</div><div class='add'>+		e-&gt;type-&gt;ops.elevator_activate_req_fn(q, rq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void elv_deactivate_rq(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;ops-&gt;elevator_deactivate_req_fn)</div><div class='del'>-		e-&gt;ops-&gt;elevator_deactivate_req_fn(q, rq);</div><div class='add'>+	if (e-&gt;type-&gt;ops.elevator_deactivate_req_fn)</div><div class='add'>+		e-&gt;type-&gt;ops.elevator_deactivate_req_fn(q, rq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FAIL_IO_TIMEOUT</div><div class='hunk'>@@ -119,8 +127,6 @@ static inline int blk_should_fake_timeout(struct request_queue *q)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-struct io_context *current_io_context(gfp_t gfp_flags, int node);</div><div class='del'>-</div><div class='ctx'> int ll_back_merge_fn(struct request_queue *q, struct request *req,</div><div class='ctx'> 		     struct bio *bio);</div><div class='ctx'> int ll_front_merge_fn(struct request_queue *q, struct request *req, </div><div class='hunk'>@@ -189,6 +195,42 @@ static inline int blk_do_io_stat(struct request *rq)</div><div class='ctx'> 	        (rq-&gt;cmd_flags &amp; REQ_DISCARD));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Internal io_context interface</div><div class='add'>+ */</div><div class='add'>+void get_io_context(struct io_context *ioc);</div><div class='add'>+struct io_cq *ioc_lookup_icq(struct io_context *ioc, struct request_queue *q);</div><div class='add'>+struct io_cq *ioc_create_icq(struct request_queue *q, gfp_t gfp_mask);</div><div class='add'>+void ioc_clear_queue(struct request_queue *q);</div><div class='add'>+</div><div class='add'>+void create_io_context_slowpath(struct task_struct *task, gfp_t gfp_mask,</div><div class='add'>+				int node);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * create_io_context - try to create task-&gt;io_context</div><div class='add'>+ * @task: target task</div><div class='add'>+ * @gfp_mask: allocation mask</div><div class='add'>+ * @node: allocation node</div><div class='add'>+ *</div><div class='add'>+ * If @task-&gt;io_context is %NULL, allocate a new io_context and install it.</div><div class='add'>+ * Returns the current @task-&gt;io_context which may be %NULL if allocation</div><div class='add'>+ * failed.</div><div class='add'>+ *</div><div class='add'>+ * Note that this function can't be called with IRQ disabled because</div><div class='add'>+ * task_lock which protects @task-&gt;io_context is IRQ-unsafe.</div><div class='add'>+ */</div><div class='add'>+static inline struct io_context *create_io_context(struct task_struct *task,</div><div class='add'>+						   gfp_t gfp_mask, int node)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(irqs_disabled());</div><div class='add'>+	if (unlikely(!task-&gt;io_context))</div><div class='add'>+		create_io_context_slowpath(task, gfp_mask, node);</div><div class='add'>+	return task-&gt;io_context;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Internal throttling interface</div><div class='add'>+ */</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_THROTTLING</div><div class='ctx'> extern bool blk_throtl_bio(struct request_queue *q, struct bio *bio);</div><div class='ctx'> extern void blk_throtl_drain(struct request_queue *q);</div><div class='head'>diff --git a/block/bsg.c b/block/bsg.c<br/>index 702f1316bb8f..4cf703fd98bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/bsg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/bsg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/bsg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/bsg.c</a></div><div class='hunk'>@@ -769,12 +769,10 @@ static struct bsg_device *bsg_add_device(struct inode *inode,</div><div class='ctx'> 					 struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct bsg_device *bd;</div><div class='del'>-	int ret;</div><div class='ctx'> #ifdef BSG_DEBUG</div><div class='ctx'> 	unsigned char buf[32];</div><div class='ctx'> #endif</div><div class='del'>-	ret = blk_get_queue(rq);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (!blk_get_queue(rq))</div><div class='ctx'> 		return ERR_PTR(-ENXIO);</div><div class='ctx'> </div><div class='ctx'> 	bd = bsg_alloc_device();</div><div class='hunk'>@@ -1070,7 +1068,7 @@ EXPORT_SYMBOL_GPL(bsg_register_queue);</div><div class='ctx'> </div><div class='ctx'> static struct cdev bsg_cdev;</div><div class='ctx'> </div><div class='del'>-static char *bsg_devnode(struct device *dev, mode_t *mode)</div><div class='add'>+static char *bsg_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	return kasprintf(GFP_KERNEL, "bsg/%s", dev_name(dev));</div><div class='ctx'> }</div><div class='head'>diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c<br/>index 3548705b04e4..ee55019066a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/cfq-iosched.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/cfq-iosched.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/cfq-iosched.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/cfq-iosched.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/rbtree.h&gt;</div><div class='ctx'> #include &lt;linux/ioprio.h&gt;</div><div class='ctx'> #include &lt;linux/blktrace_api.h&gt;</div><div class='add'>+#include "blk.h"</div><div class='ctx'> #include "cfq.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -53,20 +54,11 @@ static const int cfq_hist_divisor = 4;</div><div class='ctx'> #define CFQQ_SECT_THR_NONROT	(sector_t)(2 * 32)</div><div class='ctx'> #define CFQQ_SEEKY(cfqq)	(hweight32(cfqq-&gt;seek_history) &gt; 32/8)</div><div class='ctx'> </div><div class='del'>-#define RQ_CIC(rq)		\</div><div class='del'>-	((struct cfq_io_context *) (rq)-&gt;elevator_private[0])</div><div class='del'>-#define RQ_CFQQ(rq)		(struct cfq_queue *) ((rq)-&gt;elevator_private[1])</div><div class='del'>-#define RQ_CFQG(rq)		(struct cfq_group *) ((rq)-&gt;elevator_private[2])</div><div class='add'>+#define RQ_CIC(rq)		icq_to_cic((rq)-&gt;elv.icq)</div><div class='add'>+#define RQ_CFQQ(rq)		(struct cfq_queue *) ((rq)-&gt;elv.priv[0])</div><div class='add'>+#define RQ_CFQG(rq)		(struct cfq_group *) ((rq)-&gt;elv.priv[1])</div><div class='ctx'> </div><div class='ctx'> static struct kmem_cache *cfq_pool;</div><div class='del'>-static struct kmem_cache *cfq_ioc_pool;</div><div class='del'>-</div><div class='del'>-static DEFINE_PER_CPU(unsigned long, cfq_ioc_count);</div><div class='del'>-static struct completion *ioc_gone;</div><div class='del'>-static DEFINE_SPINLOCK(ioc_gone_lock);</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(cic_index_lock);</div><div class='del'>-static DEFINE_IDA(cic_index_ida);</div><div class='ctx'> </div><div class='ctx'> #define CFQ_PRIO_LISTS		IOPRIO_BE_NR</div><div class='ctx'> #define cfq_class_idle(cfqq)	((cfqq)-&gt;ioprio_class == IOPRIO_CLASS_IDLE)</div><div class='hunk'>@@ -75,6 +67,14 @@ static DEFINE_IDA(cic_index_ida);</div><div class='ctx'> #define sample_valid(samples)	((samples) &gt; 80)</div><div class='ctx'> #define rb_entry_cfqg(node)	rb_entry((node), struct cfq_group, rb_node)</div><div class='ctx'> </div><div class='add'>+struct cfq_ttime {</div><div class='add'>+	unsigned long last_end_request;</div><div class='add'>+</div><div class='add'>+	unsigned long ttime_total;</div><div class='add'>+	unsigned long ttime_samples;</div><div class='add'>+	unsigned long ttime_mean;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Most of our rbtree usage is for sorting with min extraction, so</div><div class='ctx'>  * if we cache the leftmost node we don't have to walk down the tree</div><div class='hunk'>@@ -216,6 +216,12 @@ struct cfq_group {</div><div class='ctx'> 	struct cfq_ttime ttime;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct cfq_io_cq {</div><div class='add'>+	struct io_cq		icq;		/* must be the first member */</div><div class='add'>+	struct cfq_queue	*cfqq[2];</div><div class='add'>+	struct cfq_ttime	ttime;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Per block device queue structure</div><div class='ctx'>  */</div><div class='hunk'>@@ -267,7 +273,7 @@ struct cfq_data {</div><div class='ctx'> 	struct work_struct unplug_work;</div><div class='ctx'> </div><div class='ctx'> 	struct cfq_queue *active_queue;</div><div class='del'>-	struct cfq_io_context *active_cic;</div><div class='add'>+	struct cfq_io_cq *active_cic;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * async queue for each priority case</div><div class='hunk'>@@ -290,9 +296,6 @@ struct cfq_data {</div><div class='ctx'> 	unsigned int cfq_group_idle;</div><div class='ctx'> 	unsigned int cfq_latency;</div><div class='ctx'> </div><div class='del'>-	unsigned int cic_index;</div><div class='del'>-	struct list_head cic_list;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Fallback dummy cfqq for extreme OOM conditions</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -464,37 +467,35 @@ static inline int cfqg_busy_async_queues(struct cfq_data *cfqd,</div><div class='ctx'> static void cfq_dispatch_insert(struct request_queue *, struct request *);</div><div class='ctx'> static struct cfq_queue *cfq_get_queue(struct cfq_data *, bool,</div><div class='ctx'> 				       struct io_context *, gfp_t);</div><div class='del'>-static struct cfq_io_context *cfq_cic_lookup(struct cfq_data *,</div><div class='del'>-						struct io_context *);</div><div class='ctx'> </div><div class='del'>-static inline struct cfq_queue *cic_to_cfqq(struct cfq_io_context *cic,</div><div class='del'>-					    bool is_sync)</div><div class='add'>+static inline struct cfq_io_cq *icq_to_cic(struct io_cq *icq)</div><div class='ctx'> {</div><div class='del'>-	return cic-&gt;cfqq[is_sync];</div><div class='add'>+	/* cic-&gt;icq is the first member, %NULL will convert to %NULL */</div><div class='add'>+	return container_of(icq, struct cfq_io_cq, icq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void cic_set_cfqq(struct cfq_io_context *cic,</div><div class='del'>-				struct cfq_queue *cfqq, bool is_sync)</div><div class='add'>+static inline struct cfq_io_cq *cfq_cic_lookup(struct cfq_data *cfqd,</div><div class='add'>+					       struct io_context *ioc)</div><div class='ctx'> {</div><div class='del'>-	cic-&gt;cfqq[is_sync] = cfqq;</div><div class='add'>+	if (ioc)</div><div class='add'>+		return icq_to_cic(ioc_lookup_icq(ioc, cfqd-&gt;queue));</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define CIC_DEAD_KEY	1ul</div><div class='del'>-#define CIC_DEAD_INDEX_SHIFT	1</div><div class='del'>-</div><div class='del'>-static inline void *cfqd_dead_key(struct cfq_data *cfqd)</div><div class='add'>+static inline struct cfq_queue *cic_to_cfqq(struct cfq_io_cq *cic, bool is_sync)</div><div class='ctx'> {</div><div class='del'>-	return (void *)(cfqd-&gt;cic_index &lt;&lt; CIC_DEAD_INDEX_SHIFT | CIC_DEAD_KEY);</div><div class='add'>+	return cic-&gt;cfqq[is_sync];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct cfq_data *cic_to_cfqd(struct cfq_io_context *cic)</div><div class='add'>+static inline void cic_set_cfqq(struct cfq_io_cq *cic, struct cfq_queue *cfqq,</div><div class='add'>+				bool is_sync)</div><div class='ctx'> {</div><div class='del'>-	struct cfq_data *cfqd = cic-&gt;key;</div><div class='del'>-</div><div class='del'>-	if (unlikely((unsigned long) cfqd &amp; CIC_DEAD_KEY))</div><div class='del'>-		return NULL;</div><div class='add'>+	cic-&gt;cfqq[is_sync] = cfqq;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return cfqd;</div><div class='add'>+static inline struct cfq_data *cic_to_cfqd(struct cfq_io_cq *cic)</div><div class='add'>+{</div><div class='add'>+	return cic-&gt;icq.q-&gt;elevator-&gt;elevator_data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1561,7 +1562,7 @@ static struct request *</div><div class='ctx'> cfq_find_rq_fmerge(struct cfq_data *cfqd, struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *tsk = current;</div><div class='del'>-	struct cfq_io_context *cic;</div><div class='add'>+	struct cfq_io_cq *cic;</div><div class='ctx'> 	struct cfq_queue *cfqq;</div><div class='ctx'> </div><div class='ctx'> 	cic = cfq_cic_lookup(cfqd, tsk-&gt;io_context);</div><div class='hunk'>@@ -1687,7 +1688,7 @@ static int cfq_allow_merge(struct request_queue *q, struct request *rq,</div><div class='ctx'> 			   struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_data *cfqd = q-&gt;elevator-&gt;elevator_data;</div><div class='del'>-	struct cfq_io_context *cic;</div><div class='add'>+	struct cfq_io_cq *cic;</div><div class='ctx'> 	struct cfq_queue *cfqq;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1697,12 +1698,19 @@ static int cfq_allow_merge(struct request_queue *q, struct request *rq,</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Lookup the cfqq that this bio will be queued with. Allow</div><div class='del'>-	 * merge only if rq is queued there.</div><div class='add'>+	 * Lookup the cfqq that this bio will be queued with and allow</div><div class='add'>+	 * merge only if rq is queued there.  This function can be called</div><div class='add'>+	 * from plug merge without queue_lock.  In such cases, ioc of @rq</div><div class='add'>+	 * and %current are guaranteed to be equal.  Avoid lookup which</div><div class='add'>+	 * requires queue_lock by using @rq's cic.</div><div class='ctx'> 	 */</div><div class='del'>-	cic = cfq_cic_lookup(cfqd, current-&gt;io_context);</div><div class='del'>-	if (!cic)</div><div class='del'>-		return false;</div><div class='add'>+	if (current-&gt;io_context == RQ_CIC(rq)-&gt;icq.ioc) {</div><div class='add'>+		cic = RQ_CIC(rq);</div><div class='add'>+	} else {</div><div class='add'>+		cic = cfq_cic_lookup(cfqd, current-&gt;io_context);</div><div class='add'>+		if (!cic)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	cfqq = cic_to_cfqq(cic, cfq_bio_sync(bio));</div><div class='ctx'> 	return cfqq == RQ_CFQQ(rq);</div><div class='hunk'>@@ -1786,7 +1794,7 @@ __cfq_slice_expired(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='ctx'> 		cfqd-&gt;active_queue = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (cfqd-&gt;active_cic) {</div><div class='del'>-		put_io_context(cfqd-&gt;active_cic-&gt;ioc);</div><div class='add'>+		put_io_context(cfqd-&gt;active_cic-&gt;icq.ioc, cfqd-&gt;queue);</div><div class='ctx'> 		cfqd-&gt;active_cic = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2006,7 +2014,7 @@ static bool cfq_should_idle(struct cfq_data *cfqd, struct cfq_queue *cfqq)</div><div class='ctx'> static void cfq_arm_slice_timer(struct cfq_data *cfqd)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_queue *cfqq = cfqd-&gt;active_queue;</div><div class='del'>-	struct cfq_io_context *cic;</div><div class='add'>+	struct cfq_io_cq *cic;</div><div class='ctx'> 	unsigned long sl, group_idle = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2041,7 +2049,7 @@ static void cfq_arm_slice_timer(struct cfq_data *cfqd)</div><div class='ctx'> 	 * task has exited, don't wait</div><div class='ctx'> 	 */</div><div class='ctx'> 	cic = cfqd-&gt;active_cic;</div><div class='del'>-	if (!cic || !atomic_read(&amp;cic-&gt;ioc-&gt;nr_tasks))</div><div class='add'>+	if (!cic || !atomic_read(&amp;cic-&gt;icq.ioc-&gt;nr_tasks))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2592,9 +2600,9 @@ static bool cfq_dispatch_request(struct cfq_data *cfqd, struct cfq_queue *cfqq)</div><div class='ctx'> 	cfq_dispatch_insert(cfqd-&gt;queue, rq);</div><div class='ctx'> </div><div class='ctx'> 	if (!cfqd-&gt;active_cic) {</div><div class='del'>-		struct cfq_io_context *cic = RQ_CIC(rq);</div><div class='add'>+		struct cfq_io_cq *cic = RQ_CIC(rq);</div><div class='ctx'> </div><div class='del'>-		atomic_long_inc(&amp;cic-&gt;ioc-&gt;refcount);</div><div class='add'>+		atomic_long_inc(&amp;cic-&gt;icq.ioc-&gt;refcount);</div><div class='ctx'> 		cfqd-&gt;active_cic = cic;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2677,84 +2685,6 @@ static void cfq_put_queue(struct cfq_queue *cfqq)</div><div class='ctx'> 	cfq_put_cfqg(cfqg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Call func for each cic attached to this ioc.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-call_for_each_cic(struct io_context *ioc,</div><div class='del'>-		  void (*func)(struct io_context *, struct cfq_io_context *))</div><div class='del'>-{</div><div class='del'>-	struct cfq_io_context *cic;</div><div class='del'>-	struct hlist_node *n;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	hlist_for_each_entry_rcu(cic, n, &amp;ioc-&gt;cic_list, cic_list)</div><div class='del'>-		func(ioc, cic);</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfq_cic_free_rcu(struct rcu_head *head)</div><div class='del'>-{</div><div class='del'>-	struct cfq_io_context *cic;</div><div class='del'>-</div><div class='del'>-	cic = container_of(head, struct cfq_io_context, rcu_head);</div><div class='del'>-</div><div class='del'>-	kmem_cache_free(cfq_ioc_pool, cic);</div><div class='del'>-	elv_ioc_count_dec(cfq_ioc_count);</div><div class='del'>-</div><div class='del'>-	if (ioc_gone) {</div><div class='del'>-		/*</div><div class='del'>-		 * CFQ scheduler is exiting, grab exit lock and check</div><div class='del'>-		 * the pending io context count. If it hits zero,</div><div class='del'>-		 * complete ioc_gone and set it back to NULL</div><div class='del'>-		 */</div><div class='del'>-		spin_lock(&amp;ioc_gone_lock);</div><div class='del'>-		if (ioc_gone &amp;&amp; !elv_ioc_count_read(cfq_ioc_count)) {</div><div class='del'>-			complete(ioc_gone);</div><div class='del'>-			ioc_gone = NULL;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;ioc_gone_lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfq_cic_free(struct cfq_io_context *cic)</div><div class='del'>-{</div><div class='del'>-	call_rcu(&amp;cic-&gt;rcu_head, cfq_cic_free_rcu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cic_free_func(struct io_context *ioc, struct cfq_io_context *cic)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned long dead_key = (unsigned long) cic-&gt;key;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!(dead_key &amp; CIC_DEAD_KEY));</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;ioc-&gt;lock, flags);</div><div class='del'>-	radix_tree_delete(&amp;ioc-&gt;radix_root, dead_key &gt;&gt; CIC_DEAD_INDEX_SHIFT);</div><div class='del'>-	hlist_del_rcu(&amp;cic-&gt;cic_list);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ioc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	cfq_cic_free(cic);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Must be called with rcu_read_lock() held or preemption otherwise disabled.</div><div class='del'>- * Only two callers of this - -&gt;dtor() which is called with the rcu_read_lock(),</div><div class='del'>- * and -&gt;trim() which is called with the task lock held</div><div class='del'>- */</div><div class='del'>-static void cfq_free_io_context(struct io_context *ioc)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * ioc-&gt;refcount is zero here, or we are called from elv_unregister(),</div><div class='del'>-	 * so no more cic's are allowed to be linked into this ioc.  So it</div><div class='del'>-	 * should be ok to iterate over the known list, we will see all cic's</div><div class='del'>-	 * since no new ones are added.</div><div class='del'>-	 */</div><div class='del'>-	call_for_each_cic(ioc, cic_free_func);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void cfq_put_cooperator(struct cfq_queue *cfqq)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_queue *__cfqq, *next;</div><div class='hunk'>@@ -2788,27 +2718,17 @@ static void cfq_exit_cfqq(struct cfq_data *cfqd, struct cfq_queue *cfqq)</div><div class='ctx'> 	cfq_put_queue(cfqq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __cfq_exit_single_io_context(struct cfq_data *cfqd,</div><div class='del'>-					 struct cfq_io_context *cic)</div><div class='add'>+static void cfq_init_icq(struct io_cq *icq)</div><div class='ctx'> {</div><div class='del'>-	struct io_context *ioc = cic-&gt;ioc;</div><div class='add'>+	struct cfq_io_cq *cic = icq_to_cic(icq);</div><div class='ctx'> </div><div class='del'>-	list_del_init(&amp;cic-&gt;queue_list);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure dead mark is seen for dead queues</div><div class='del'>-	 */</div><div class='del'>-	smp_wmb();</div><div class='del'>-	cic-&gt;key = cfqd_dead_key(cfqd);</div><div class='add'>+	cic-&gt;ttime.last_end_request = jiffies;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	if (rcu_dereference(ioc-&gt;ioc_data) == cic) {</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		spin_lock(&amp;ioc-&gt;lock);</div><div class='del'>-		rcu_assign_pointer(ioc-&gt;ioc_data, NULL);</div><div class='del'>-		spin_unlock(&amp;ioc-&gt;lock);</div><div class='del'>-	} else</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+static void cfq_exit_icq(struct io_cq *icq)</div><div class='add'>+{</div><div class='add'>+	struct cfq_io_cq *cic = icq_to_cic(icq);</div><div class='add'>+	struct cfq_data *cfqd = cic_to_cfqd(cic);</div><div class='ctx'> </div><div class='ctx'> 	if (cic-&gt;cfqq[BLK_RW_ASYNC]) {</div><div class='ctx'> 		cfq_exit_cfqq(cfqd, cic-&gt;cfqq[BLK_RW_ASYNC]);</div><div class='hunk'>@@ -2821,57 +2741,6 @@ static void __cfq_exit_single_io_context(struct cfq_data *cfqd,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cfq_exit_single_io_context(struct io_context *ioc,</div><div class='del'>-				       struct cfq_io_context *cic)</div><div class='del'>-{</div><div class='del'>-	struct cfq_data *cfqd = cic_to_cfqd(cic);</div><div class='del'>-</div><div class='del'>-	if (cfqd) {</div><div class='del'>-		struct request_queue *q = cfqd-&gt;queue;</div><div class='del'>-		unsigned long flags;</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(q-&gt;queue_lock, flags);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Ensure we get a fresh copy of the -&gt;key to prevent</div><div class='del'>-		 * race between exiting task and queue</div><div class='del'>-		 */</div><div class='del'>-		smp_read_barrier_depends();</div><div class='del'>-		if (cic-&gt;key == cfqd)</div><div class='del'>-			__cfq_exit_single_io_context(cfqd, cic);</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(q-&gt;queue_lock, flags);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The process that ioc belongs to has exited, we need to clean up</div><div class='del'>- * and put the internal structures we have that belongs to that process.</div><div class='del'>- */</div><div class='del'>-static void cfq_exit_io_context(struct io_context *ioc)</div><div class='del'>-{</div><div class='del'>-	call_for_each_cic(ioc, cfq_exit_single_io_context);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct cfq_io_context *</div><div class='del'>-cfq_alloc_io_context(struct cfq_data *cfqd, gfp_t gfp_mask)</div><div class='del'>-{</div><div class='del'>-	struct cfq_io_context *cic;</div><div class='del'>-</div><div class='del'>-	cic = kmem_cache_alloc_node(cfq_ioc_pool, gfp_mask | __GFP_ZERO,</div><div class='del'>-							cfqd-&gt;queue-&gt;node);</div><div class='del'>-	if (cic) {</div><div class='del'>-		cic-&gt;ttime.last_end_request = jiffies;</div><div class='del'>-		INIT_LIST_HEAD(&amp;cic-&gt;queue_list);</div><div class='del'>-		INIT_HLIST_NODE(&amp;cic-&gt;cic_list);</div><div class='del'>-		cic-&gt;dtor = cfq_free_io_context;</div><div class='del'>-		cic-&gt;exit = cfq_exit_io_context;</div><div class='del'>-		elv_ioc_count_inc(cfq_ioc_count);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cic;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void cfq_init_prio_data(struct cfq_queue *cfqq, struct io_context *ioc)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *tsk = current;</div><div class='hunk'>@@ -2914,21 +2783,18 @@ static void cfq_init_prio_data(struct cfq_queue *cfqq, struct io_context *ioc)</div><div class='ctx'> 	cfq_clear_cfqq_prio_changed(cfqq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void changed_ioprio(struct io_context *ioc, struct cfq_io_context *cic)</div><div class='add'>+static void changed_ioprio(struct cfq_io_cq *cic)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_data *cfqd = cic_to_cfqd(cic);</div><div class='ctx'> 	struct cfq_queue *cfqq;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!cfqd))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(cfqd-&gt;queue-&gt;queue_lock, flags);</div><div class='del'>-</div><div class='ctx'> 	cfqq = cic-&gt;cfqq[BLK_RW_ASYNC];</div><div class='ctx'> 	if (cfqq) {</div><div class='ctx'> 		struct cfq_queue *new_cfqq;</div><div class='del'>-		new_cfqq = cfq_get_queue(cfqd, BLK_RW_ASYNC, cic-&gt;ioc,</div><div class='add'>+		new_cfqq = cfq_get_queue(cfqd, BLK_RW_ASYNC, cic-&gt;icq.ioc,</div><div class='ctx'> 						GFP_ATOMIC);</div><div class='ctx'> 		if (new_cfqq) {</div><div class='ctx'> 			cic-&gt;cfqq[BLK_RW_ASYNC] = new_cfqq;</div><div class='hunk'>@@ -2939,14 +2805,6 @@ static void changed_ioprio(struct io_context *ioc, struct cfq_io_context *cic)</div><div class='ctx'> 	cfqq = cic-&gt;cfqq[BLK_RW_SYNC];</div><div class='ctx'> 	if (cfqq)</div><div class='ctx'> 		cfq_mark_cfqq_prio_changed(cfqq);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(cfqd-&gt;queue-&gt;queue_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfq_ioc_set_ioprio(struct io_context *ioc)</div><div class='del'>-{</div><div class='del'>-	call_for_each_cic(ioc, changed_ioprio);</div><div class='del'>-	ioc-&gt;ioprio_changed = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cfq_init_cfqq(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='hunk'>@@ -2970,11 +2828,10 @@ static void cfq_init_cfqq(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CFQ_GROUP_IOSCHED</div><div class='del'>-static void changed_cgroup(struct io_context *ioc, struct cfq_io_context *cic)</div><div class='add'>+static void changed_cgroup(struct cfq_io_cq *cic)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_queue *sync_cfqq = cic_to_cfqq(cic, 1);</div><div class='ctx'> 	struct cfq_data *cfqd = cic_to_cfqd(cic);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct request_queue *q;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!cfqd))</div><div class='hunk'>@@ -2982,8 +2839,6 @@ static void changed_cgroup(struct io_context *ioc, struct cfq_io_context *cic)</div><div class='ctx'> </div><div class='ctx'> 	q = cfqd-&gt;queue;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(q-&gt;queue_lock, flags);</div><div class='del'>-</div><div class='ctx'> 	if (sync_cfqq) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Drop reference to sync queue. A new sync queue will be</div><div class='hunk'>@@ -2993,14 +2848,6 @@ static void changed_cgroup(struct io_context *ioc, struct cfq_io_context *cic)</div><div class='ctx'> 		cic_set_cfqq(cic, NULL, 1);</div><div class='ctx'> 		cfq_put_queue(sync_cfqq);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(q-&gt;queue_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfq_ioc_set_cgroup(struct io_context *ioc)</div><div class='del'>-{</div><div class='del'>-	call_for_each_cic(ioc, changed_cgroup);</div><div class='del'>-	ioc-&gt;cgroup_changed = 0;</div><div class='ctx'> }</div><div class='ctx'> #endif  /* CONFIG_CFQ_GROUP_IOSCHED */</div><div class='ctx'> </div><div class='hunk'>@@ -3009,7 +2856,7 @@ cfq_find_alloc_queue(struct cfq_data *cfqd, bool is_sync,</div><div class='ctx'> 		     struct io_context *ioc, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_queue *cfqq, *new_cfqq = NULL;</div><div class='del'>-	struct cfq_io_context *cic;</div><div class='add'>+	struct cfq_io_cq *cic;</div><div class='ctx'> 	struct cfq_group *cfqg;</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='hunk'>@@ -3100,160 +2947,6 @@ cfq_get_queue(struct cfq_data *cfqd, bool is_sync, struct io_context *ioc,</div><div class='ctx'> 	return cfqq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * We drop cfq io contexts lazily, so we may find a dead one.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-cfq_drop_dead_cic(struct cfq_data *cfqd, struct io_context *ioc,</div><div class='del'>-		  struct cfq_io_context *cic)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	WARN_ON(!list_empty(&amp;cic-&gt;queue_list));</div><div class='del'>-	BUG_ON(cic-&gt;key != cfqd_dead_key(cfqd));</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;ioc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	BUG_ON(rcu_dereference_check(ioc-&gt;ioc_data,</div><div class='del'>-		lockdep_is_held(&amp;ioc-&gt;lock)) == cic);</div><div class='del'>-</div><div class='del'>-	radix_tree_delete(&amp;ioc-&gt;radix_root, cfqd-&gt;cic_index);</div><div class='del'>-	hlist_del_rcu(&amp;cic-&gt;cic_list);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ioc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	cfq_cic_free(cic);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct cfq_io_context *</div><div class='del'>-cfq_cic_lookup(struct cfq_data *cfqd, struct io_context *ioc)</div><div class='del'>-{</div><div class='del'>-	struct cfq_io_context *cic;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!ioc))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we maintain a last-hit cache, to avoid browsing over the tree</div><div class='del'>-	 */</div><div class='del'>-	cic = rcu_dereference(ioc-&gt;ioc_data);</div><div class='del'>-	if (cic &amp;&amp; cic-&gt;key == cfqd) {</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return cic;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		cic = radix_tree_lookup(&amp;ioc-&gt;radix_root, cfqd-&gt;cic_index);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		if (!cic)</div><div class='del'>-			break;</div><div class='del'>-		if (unlikely(cic-&gt;key != cfqd)) {</div><div class='del'>-			cfq_drop_dead_cic(cfqd, ioc, cic);</div><div class='del'>-			rcu_read_lock();</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;ioc-&gt;lock, flags);</div><div class='del'>-		rcu_assign_pointer(ioc-&gt;ioc_data, cic);</div><div class='del'>-		spin_unlock_irqrestore(&amp;ioc-&gt;lock, flags);</div><div class='del'>-		break;</div><div class='del'>-	} while (1);</div><div class='del'>-</div><div class='del'>-	return cic;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Add cic into ioc, using cfqd as the search key. This enables us to lookup</div><div class='del'>- * the process specific cfq io context when entered from the block layer.</div><div class='del'>- * Also adds the cic to a per-cfqd list, used when this queue is removed.</div><div class='del'>- */</div><div class='del'>-static int cfq_cic_link(struct cfq_data *cfqd, struct io_context *ioc,</div><div class='del'>-			struct cfq_io_context *cic, gfp_t gfp_mask)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = radix_tree_preload(gfp_mask);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		cic-&gt;ioc = ioc;</div><div class='del'>-		cic-&gt;key = cfqd;</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;ioc-&gt;lock, flags);</div><div class='del'>-		ret = radix_tree_insert(&amp;ioc-&gt;radix_root,</div><div class='del'>-						cfqd-&gt;cic_index, cic);</div><div class='del'>-		if (!ret)</div><div class='del'>-			hlist_add_head_rcu(&amp;cic-&gt;cic_list, &amp;ioc-&gt;cic_list);</div><div class='del'>-		spin_unlock_irqrestore(&amp;ioc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-		radix_tree_preload_end();</div><div class='del'>-</div><div class='del'>-		if (!ret) {</div><div class='del'>-			spin_lock_irqsave(cfqd-&gt;queue-&gt;queue_lock, flags);</div><div class='del'>-			list_add(&amp;cic-&gt;queue_list, &amp;cfqd-&gt;cic_list);</div><div class='del'>-			spin_unlock_irqrestore(cfqd-&gt;queue-&gt;queue_lock, flags);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret &amp;&amp; ret != -EEXIST)</div><div class='del'>-		printk(KERN_ERR "cfq: cic link failed!\n");</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Setup general io context and cfq io context. There can be several cfq</div><div class='del'>- * io contexts per general io context, if this process is doing io to more</div><div class='del'>- * than one device managed by cfq.</div><div class='del'>- */</div><div class='del'>-static struct cfq_io_context *</div><div class='del'>-cfq_get_io_context(struct cfq_data *cfqd, gfp_t gfp_mask)</div><div class='del'>-{</div><div class='del'>-	struct io_context *ioc = NULL;</div><div class='del'>-	struct cfq_io_context *cic;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	might_sleep_if(gfp_mask &amp; __GFP_WAIT);</div><div class='del'>-</div><div class='del'>-	ioc = get_io_context(gfp_mask, cfqd-&gt;queue-&gt;node);</div><div class='del'>-	if (!ioc)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-retry:</div><div class='del'>-	cic = cfq_cic_lookup(cfqd, ioc);</div><div class='del'>-	if (cic)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	cic = cfq_alloc_io_context(cfqd, gfp_mask);</div><div class='del'>-	if (cic == NULL)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = cfq_cic_link(cfqd, ioc, cic, gfp_mask);</div><div class='del'>-	if (ret == -EEXIST) {</div><div class='del'>-		/* someone has linked cic to ioc already */</div><div class='del'>-		cfq_cic_free(cic);</div><div class='del'>-		goto retry;</div><div class='del'>-	} else if (ret)</div><div class='del'>-		goto err_free;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	smp_read_barrier_depends();</div><div class='del'>-	if (unlikely(ioc-&gt;ioprio_changed))</div><div class='del'>-		cfq_ioc_set_ioprio(ioc);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CFQ_GROUP_IOSCHED</div><div class='del'>-	if (unlikely(ioc-&gt;cgroup_changed))</div><div class='del'>-		cfq_ioc_set_cgroup(ioc);</div><div class='del'>-#endif</div><div class='del'>-	return cic;</div><div class='del'>-err_free:</div><div class='del'>-	cfq_cic_free(cic);</div><div class='del'>-err:</div><div class='del'>-	put_io_context(ioc);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> __cfq_update_io_thinktime(struct cfq_ttime *ttime, unsigned long slice_idle)</div><div class='ctx'> {</div><div class='hunk'>@@ -3267,7 +2960,7 @@ __cfq_update_io_thinktime(struct cfq_ttime *ttime, unsigned long slice_idle)</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> cfq_update_io_thinktime(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='del'>-	struct cfq_io_context *cic)</div><div class='add'>+			struct cfq_io_cq *cic)</div><div class='ctx'> {</div><div class='ctx'> 	if (cfq_cfqq_sync(cfqq)) {</div><div class='ctx'> 		__cfq_update_io_thinktime(&amp;cic-&gt;ttime, cfqd-&gt;cfq_slice_idle);</div><div class='hunk'>@@ -3305,7 +2998,7 @@ cfq_update_io_seektime(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='ctx'> cfq_update_idle_window(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='del'>-		       struct cfq_io_context *cic)</div><div class='add'>+		       struct cfq_io_cq *cic)</div><div class='ctx'> {</div><div class='ctx'> 	int old_idle, enable_idle;</div><div class='ctx'> </div><div class='hunk'>@@ -3322,8 +3015,9 @@ cfq_update_idle_window(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='ctx'> </div><div class='ctx'> 	if (cfqq-&gt;next_rq &amp;&amp; (cfqq-&gt;next_rq-&gt;cmd_flags &amp; REQ_NOIDLE))</div><div class='ctx'> 		enable_idle = 0;</div><div class='del'>-	else if (!atomic_read(&amp;cic-&gt;ioc-&gt;nr_tasks) || !cfqd-&gt;cfq_slice_idle ||</div><div class='del'>-	    (!cfq_cfqq_deep(cfqq) &amp;&amp; CFQQ_SEEKY(cfqq)))</div><div class='add'>+	else if (!atomic_read(&amp;cic-&gt;icq.ioc-&gt;nr_tasks) ||</div><div class='add'>+		 !cfqd-&gt;cfq_slice_idle ||</div><div class='add'>+		 (!cfq_cfqq_deep(cfqq) &amp;&amp; CFQQ_SEEKY(cfqq)))</div><div class='ctx'> 		enable_idle = 0;</div><div class='ctx'> 	else if (sample_valid(cic-&gt;ttime.ttime_samples)) {</div><div class='ctx'> 		if (cic-&gt;ttime.ttime_mean &gt; cfqd-&gt;cfq_slice_idle)</div><div class='hunk'>@@ -3423,18 +3117,17 @@ cfq_should_preempt(struct cfq_data *cfqd, struct cfq_queue *new_cfqq,</div><div class='ctx'>  */</div><div class='ctx'> static void cfq_preempt_queue(struct cfq_data *cfqd, struct cfq_queue *cfqq)</div><div class='ctx'> {</div><div class='del'>-	struct cfq_queue *old_cfqq = cfqd-&gt;active_queue;</div><div class='del'>-</div><div class='ctx'> 	cfq_log_cfqq(cfqd, cfqq, "preempt");</div><div class='del'>-	cfq_slice_expired(cfqd, 1);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * workload type is changed, don't save slice, otherwise preempt</div><div class='ctx'> 	 * doesn't happen</div><div class='ctx'> 	 */</div><div class='del'>-	if (cfqq_type(old_cfqq) != cfqq_type(cfqq))</div><div class='add'>+	if (cfqq_type(cfqd-&gt;active_queue) != cfqq_type(cfqq))</div><div class='ctx'> 		cfqq-&gt;cfqg-&gt;saved_workload_slice = 0;</div><div class='ctx'> </div><div class='add'>+	cfq_slice_expired(cfqd, 1);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Put the new queue at the front of the of the current list,</div><div class='ctx'> 	 * so we know that it will be selected next.</div><div class='hunk'>@@ -3455,7 +3148,7 @@ static void</div><div class='ctx'> cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='ctx'> 		struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	struct cfq_io_context *cic = RQ_CIC(rq);</div><div class='add'>+	struct cfq_io_cq *cic = RQ_CIC(rq);</div><div class='ctx'> </div><div class='ctx'> 	cfqd-&gt;rq_queued++;</div><div class='ctx'> 	if (rq-&gt;cmd_flags &amp; REQ_PRIO)</div><div class='hunk'>@@ -3508,7 +3201,7 @@ static void cfq_insert_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	struct cfq_queue *cfqq = RQ_CFQQ(rq);</div><div class='ctx'> </div><div class='ctx'> 	cfq_log_cfqq(cfqd, cfqq, "insert_request");</div><div class='del'>-	cfq_init_prio_data(cfqq, RQ_CIC(rq)-&gt;ioc);</div><div class='add'>+	cfq_init_prio_data(cfqq, RQ_CIC(rq)-&gt;icq.ioc);</div><div class='ctx'> </div><div class='ctx'> 	rq_set_fifo_time(rq, jiffies + cfqd-&gt;cfq_fifo_expire[rq_is_sync(rq)]);</div><div class='ctx'> 	list_add_tail(&amp;rq-&gt;queuelist, &amp;cfqq-&gt;fifo);</div><div class='hunk'>@@ -3558,7 +3251,7 @@ static void cfq_update_hw_tag(struct cfq_data *cfqd)</div><div class='ctx'> </div><div class='ctx'> static bool cfq_should_wait_busy(struct cfq_data *cfqd, struct cfq_queue *cfqq)</div><div class='ctx'> {</div><div class='del'>-	struct cfq_io_context *cic = cfqd-&gt;active_cic;</div><div class='add'>+	struct cfq_io_cq *cic = cfqd-&gt;active_cic;</div><div class='ctx'> </div><div class='ctx'> 	/* If the queue already has requests, don't wait */</div><div class='ctx'> 	if (!RB_EMPTY_ROOT(&amp;cfqq-&gt;sort_list))</div><div class='hunk'>@@ -3695,7 +3388,7 @@ static int cfq_may_queue(struct request_queue *q, int rw)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_data *cfqd = q-&gt;elevator-&gt;elevator_data;</div><div class='ctx'> 	struct task_struct *tsk = current;</div><div class='del'>-	struct cfq_io_context *cic;</div><div class='add'>+	struct cfq_io_cq *cic;</div><div class='ctx'> 	struct cfq_queue *cfqq;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3710,7 +3403,7 @@ static int cfq_may_queue(struct request_queue *q, int rw)</div><div class='ctx'> </div><div class='ctx'> 	cfqq = cic_to_cfqq(cic, rw_is_sync(rw));</div><div class='ctx'> 	if (cfqq) {</div><div class='del'>-		cfq_init_prio_data(cfqq, cic-&gt;ioc);</div><div class='add'>+		cfq_init_prio_data(cfqq, cic-&gt;icq.ioc);</div><div class='ctx'> </div><div class='ctx'> 		return __cfq_may_queue(cfqq);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3731,21 +3424,17 @@ static void cfq_put_request(struct request *rq)</div><div class='ctx'> 		BUG_ON(!cfqq-&gt;allocated[rw]);</div><div class='ctx'> 		cfqq-&gt;allocated[rw]--;</div><div class='ctx'> </div><div class='del'>-		put_io_context(RQ_CIC(rq)-&gt;ioc);</div><div class='del'>-</div><div class='del'>-		rq-&gt;elevator_private[0] = NULL;</div><div class='del'>-		rq-&gt;elevator_private[1] = NULL;</div><div class='del'>-</div><div class='ctx'> 		/* Put down rq reference on cfqg */</div><div class='ctx'> 		cfq_put_cfqg(RQ_CFQG(rq));</div><div class='del'>-		rq-&gt;elevator_private[2] = NULL;</div><div class='add'>+		rq-&gt;elv.priv[0] = NULL;</div><div class='add'>+		rq-&gt;elv.priv[1] = NULL;</div><div class='ctx'> </div><div class='ctx'> 		cfq_put_queue(cfqq);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct cfq_queue *</div><div class='del'>-cfq_merge_cfqqs(struct cfq_data *cfqd, struct cfq_io_context *cic,</div><div class='add'>+cfq_merge_cfqqs(struct cfq_data *cfqd, struct cfq_io_cq *cic,</div><div class='ctx'> 		struct cfq_queue *cfqq)</div><div class='ctx'> {</div><div class='ctx'> 	cfq_log_cfqq(cfqd, cfqq, "merging with queue %p", cfqq-&gt;new_cfqq);</div><div class='hunk'>@@ -3760,7 +3449,7 @@ cfq_merge_cfqqs(struct cfq_data *cfqd, struct cfq_io_context *cic,</div><div class='ctx'>  * was the last process referring to said cfqq.</div><div class='ctx'>  */</div><div class='ctx'> static struct cfq_queue *</div><div class='del'>-split_cfqq(struct cfq_io_context *cic, struct cfq_queue *cfqq)</div><div class='add'>+split_cfqq(struct cfq_io_cq *cic, struct cfq_queue *cfqq)</div><div class='ctx'> {</div><div class='ctx'> 	if (cfqq_process_refs(cfqq) == 1) {</div><div class='ctx'> 		cfqq-&gt;pid = current-&gt;pid;</div><div class='hunk'>@@ -3783,25 +3472,29 @@ static int</div><div class='ctx'> cfq_set_request(struct request_queue *q, struct request *rq, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_data *cfqd = q-&gt;elevator-&gt;elevator_data;</div><div class='del'>-	struct cfq_io_context *cic;</div><div class='add'>+	struct cfq_io_cq *cic = icq_to_cic(rq-&gt;elv.icq);</div><div class='ctx'> 	const int rw = rq_data_dir(rq);</div><div class='ctx'> 	const bool is_sync = rq_is_sync(rq);</div><div class='ctx'> 	struct cfq_queue *cfqq;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	might_sleep_if(gfp_mask &amp; __GFP_WAIT);</div><div class='ctx'> </div><div class='del'>-	cic = cfq_get_io_context(cfqd, gfp_mask);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(q-&gt;queue_lock, flags);</div><div class='add'>+	spin_lock_irq(q-&gt;queue_lock);</div><div class='ctx'> </div><div class='del'>-	if (!cic)</div><div class='del'>-		goto queue_fail;</div><div class='add'>+	/* handle changed notifications */</div><div class='add'>+	if (unlikely(cic-&gt;icq.changed)) {</div><div class='add'>+		if (test_and_clear_bit(ICQ_IOPRIO_CHANGED, &amp;cic-&gt;icq.changed))</div><div class='add'>+			changed_ioprio(cic);</div><div class='add'>+#ifdef CONFIG_CFQ_GROUP_IOSCHED</div><div class='add'>+		if (test_and_clear_bit(ICQ_CGROUP_CHANGED, &amp;cic-&gt;icq.changed))</div><div class='add'>+			changed_cgroup(cic);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> new_queue:</div><div class='ctx'> 	cfqq = cic_to_cfqq(cic, is_sync);</div><div class='ctx'> 	if (!cfqq || cfqq == &amp;cfqd-&gt;oom_cfqq) {</div><div class='del'>-		cfqq = cfq_get_queue(cfqd, is_sync, cic-&gt;ioc, gfp_mask);</div><div class='add'>+		cfqq = cfq_get_queue(cfqd, is_sync, cic-&gt;icq.ioc, gfp_mask);</div><div class='ctx'> 		cic_set_cfqq(cic, cfqq, is_sync);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -3827,17 +3520,10 @@ new_queue:</div><div class='ctx'> 	cfqq-&gt;allocated[rw]++;</div><div class='ctx'> </div><div class='ctx'> 	cfqq-&gt;ref++;</div><div class='del'>-	rq-&gt;elevator_private[0] = cic;</div><div class='del'>-	rq-&gt;elevator_private[1] = cfqq;</div><div class='del'>-	rq-&gt;elevator_private[2] = cfq_ref_get_cfqg(cfqq-&gt;cfqg);</div><div class='del'>-	spin_unlock_irqrestore(q-&gt;queue_lock, flags);</div><div class='add'>+	rq-&gt;elv.priv[0] = cfqq;</div><div class='add'>+	rq-&gt;elv.priv[1] = cfq_ref_get_cfqg(cfqq-&gt;cfqg);</div><div class='add'>+	spin_unlock_irq(q-&gt;queue_lock);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-queue_fail:</div><div class='del'>-	cfq_schedule_dispatch(cfqd);</div><div class='del'>-	spin_unlock_irqrestore(q-&gt;queue_lock, flags);</div><div class='del'>-	cfq_log(cfqd, "set_request fail");</div><div class='del'>-	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cfq_kick_queue(struct work_struct *work)</div><div class='hunk'>@@ -3941,14 +3627,6 @@ static void cfq_exit_queue(struct elevator_queue *e)</div><div class='ctx'> 	if (cfqd-&gt;active_queue)</div><div class='ctx'> 		__cfq_slice_expired(cfqd, cfqd-&gt;active_queue, 0);</div><div class='ctx'> </div><div class='del'>-	while (!list_empty(&amp;cfqd-&gt;cic_list)) {</div><div class='del'>-		struct cfq_io_context *cic = list_entry(cfqd-&gt;cic_list.next,</div><div class='del'>-							struct cfq_io_context,</div><div class='del'>-							queue_list);</div><div class='del'>-</div><div class='del'>-		__cfq_exit_single_io_context(cfqd, cic);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	cfq_put_async_queues(cfqd);</div><div class='ctx'> 	cfq_release_cfq_groups(cfqd);</div><div class='ctx'> </div><div class='hunk'>@@ -3963,10 +3641,6 @@ static void cfq_exit_queue(struct elevator_queue *e)</div><div class='ctx'> </div><div class='ctx'> 	cfq_shutdown_timer_wq(cfqd);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;cic_index_lock);</div><div class='del'>-	ida_remove(&amp;cic_index_ida, cfqd-&gt;cic_index);</div><div class='del'>-	spin_unlock(&amp;cic_index_lock);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Wait for cfqg-&gt;blkg-&gt;key accessors to exit their grace periods.</div><div class='ctx'> 	 * Do this wait only if there are other unlinked groups out</div><div class='hunk'>@@ -3988,24 +3662,6 @@ static void cfq_exit_queue(struct elevator_queue *e)</div><div class='ctx'> 	kfree(cfqd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cfq_alloc_cic_index(void)</div><div class='del'>-{</div><div class='del'>-	int index, error;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		if (!ida_pre_get(&amp;cic_index_ida, GFP_KERNEL))</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;cic_index_lock);</div><div class='del'>-		error = ida_get_new(&amp;cic_index_ida, &amp;index);</div><div class='del'>-		spin_unlock(&amp;cic_index_lock);</div><div class='del'>-		if (error &amp;&amp; error != -EAGAIN)</div><div class='del'>-			return error;</div><div class='del'>-	} while (error);</div><div class='del'>-</div><div class='del'>-	return index;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void *cfq_init_queue(struct request_queue *q)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_data *cfqd;</div><div class='hunk'>@@ -4013,23 +3669,9 @@ static void *cfq_init_queue(struct request_queue *q)</div><div class='ctx'> 	struct cfq_group *cfqg;</div><div class='ctx'> 	struct cfq_rb_root *st;</div><div class='ctx'> </div><div class='del'>-	i = cfq_alloc_cic_index();</div><div class='del'>-	if (i &lt; 0)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='ctx'> 	cfqd = kmalloc_node(sizeof(*cfqd), GFP_KERNEL | __GFP_ZERO, q-&gt;node);</div><div class='del'>-	if (!cfqd) {</div><div class='del'>-		spin_lock(&amp;cic_index_lock);</div><div class='del'>-		ida_remove(&amp;cic_index_ida, i);</div><div class='del'>-		spin_unlock(&amp;cic_index_lock);</div><div class='add'>+	if (!cfqd)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Don't need take queue_lock in the routine, since we are</div><div class='del'>-	 * initializing the ioscheduler, and nobody is using cfqd</div><div class='del'>-	 */</div><div class='del'>-	cfqd-&gt;cic_index = i;</div><div class='ctx'> </div><div class='ctx'> 	/* Init root service tree */</div><div class='ctx'> 	cfqd-&gt;grp_service_tree = CFQ_RB_ROOT;</div><div class='hunk'>@@ -4055,11 +3697,6 @@ static void *cfq_init_queue(struct request_queue *q)</div><div class='ctx'> </div><div class='ctx'> 	if (blkio_alloc_blkg_stats(&amp;cfqg-&gt;blkg)) {</div><div class='ctx'> 		kfree(cfqg);</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;cic_index_lock);</div><div class='del'>-		ida_remove(&amp;cic_index_ida, cfqd-&gt;cic_index);</div><div class='del'>-		spin_unlock(&amp;cic_index_lock);</div><div class='del'>-</div><div class='ctx'> 		kfree(cfqd);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4091,8 +3728,6 @@ static void *cfq_init_queue(struct request_queue *q)</div><div class='ctx'> 	cfqd-&gt;oom_cfqq.ref++;</div><div class='ctx'> 	cfq_link_cfqq_cfqg(&amp;cfqd-&gt;oom_cfqq, &amp;cfqd-&gt;root_group);</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;cfqd-&gt;cic_list);</div><div class='del'>-</div><div class='ctx'> 	cfqd-&gt;queue = q;</div><div class='ctx'> </div><div class='ctx'> 	init_timer(&amp;cfqd-&gt;idle_slice_timer);</div><div class='hunk'>@@ -4121,34 +3756,6 @@ static void *cfq_init_queue(struct request_queue *q)</div><div class='ctx'> 	return cfqd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cfq_slab_kill(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Caller already ensured that pending RCU callbacks are completed,</div><div class='del'>-	 * so we should have no busy allocations at this point.</div><div class='del'>-	 */</div><div class='del'>-	if (cfq_pool)</div><div class='del'>-		kmem_cache_destroy(cfq_pool);</div><div class='del'>-	if (cfq_ioc_pool)</div><div class='del'>-		kmem_cache_destroy(cfq_ioc_pool);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init cfq_slab_setup(void)</div><div class='del'>-{</div><div class='del'>-	cfq_pool = KMEM_CACHE(cfq_queue, 0);</div><div class='del'>-	if (!cfq_pool)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	cfq_ioc_pool = KMEM_CACHE(cfq_io_context, 0);</div><div class='del'>-	if (!cfq_ioc_pool)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-fail:</div><div class='del'>-	cfq_slab_kill();</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * sysfs parts below --&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -4254,15 +3861,18 @@ static struct elevator_type iosched_cfq = {</div><div class='ctx'> 		.elevator_completed_req_fn =	cfq_completed_request,</div><div class='ctx'> 		.elevator_former_req_fn =	elv_rb_former_request,</div><div class='ctx'> 		.elevator_latter_req_fn =	elv_rb_latter_request,</div><div class='add'>+		.elevator_init_icq_fn =		cfq_init_icq,</div><div class='add'>+		.elevator_exit_icq_fn =		cfq_exit_icq,</div><div class='ctx'> 		.elevator_set_req_fn =		cfq_set_request,</div><div class='ctx'> 		.elevator_put_req_fn =		cfq_put_request,</div><div class='ctx'> 		.elevator_may_queue_fn =	cfq_may_queue,</div><div class='ctx'> 		.elevator_init_fn =		cfq_init_queue,</div><div class='ctx'> 		.elevator_exit_fn =		cfq_exit_queue,</div><div class='del'>-		.trim =				cfq_free_io_context,</div><div class='ctx'> 	},</div><div class='add'>+	.icq_size	=	sizeof(struct cfq_io_cq),</div><div class='add'>+	.icq_align	=	__alignof__(struct cfq_io_cq),</div><div class='ctx'> 	.elevator_attrs =	cfq_attrs,</div><div class='del'>-	.elevator_name =	"cfq",</div><div class='add'>+	.elevator_name	=	"cfq",</div><div class='ctx'> 	.elevator_owner =	THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -4280,6 +3890,8 @@ static struct blkio_policy_type blkio_policy_cfq;</div><div class='ctx'> </div><div class='ctx'> static int __init cfq_init(void)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * could be 0 on HZ &lt; 1000 setups</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -4294,10 +3906,16 @@ static int __init cfq_init(void)</div><div class='ctx'> #else</div><div class='ctx'> 		cfq_group_idle = 0;</div><div class='ctx'> #endif</div><div class='del'>-	if (cfq_slab_setup())</div><div class='add'>+	cfq_pool = KMEM_CACHE(cfq_queue, 0);</div><div class='add'>+	if (!cfq_pool)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	elv_register(&amp;iosched_cfq);</div><div class='add'>+	ret = elv_register(&amp;iosched_cfq);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kmem_cache_destroy(cfq_pool);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	blkio_policy_register(&amp;blkio_policy_cfq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -4305,21 +3923,9 @@ static int __init cfq_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __exit cfq_exit(void)</div><div class='ctx'> {</div><div class='del'>-	DECLARE_COMPLETION_ONSTACK(all_gone);</div><div class='ctx'> 	blkio_policy_unregister(&amp;blkio_policy_cfq);</div><div class='ctx'> 	elv_unregister(&amp;iosched_cfq);</div><div class='del'>-	ioc_gone = &amp;all_gone;</div><div class='del'>-	/* ioc_gone's update must be visible before reading ioc_count */</div><div class='del'>-	smp_wmb();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * this also protects us from entering cfq_slab_kill() with</div><div class='del'>-	 * pending RCU callbacks</div><div class='del'>-	 */</div><div class='del'>-	if (elv_ioc_count_read(cfq_ioc_count))</div><div class='del'>-		wait_for_completion(&amp;all_gone);</div><div class='del'>-	ida_destroy(&amp;cic_index_ida);</div><div class='del'>-	cfq_slab_kill();</div><div class='add'>+	kmem_cache_destroy(cfq_pool);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(cfq_init);</div><div class='head'>diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c<br/>index 7b725020823c..7c668c8a6f95 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/compat_ioctl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/compat_ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/compat_ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/compat_ioctl.c</a></div><div class='hunk'>@@ -719,6 +719,9 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)</div><div class='ctx'> 	case BLKSECTGET:</div><div class='ctx'> 		return compat_put_ushort(arg,</div><div class='ctx'> 					 queue_max_sectors(bdev_get_queue(bdev)));</div><div class='add'>+	case BLKROTATIONAL:</div><div class='add'>+		return compat_put_ushort(arg,</div><div class='add'>+					 !blk_queue_nonrot(bdev_get_queue(bdev)));</div><div class='ctx'> 	case BLKRASET: /* compatible, but no compat_ptr (!) */</div><div class='ctx'> 	case BLKFRASET:</div><div class='ctx'> 		if (!capable(CAP_SYS_ADMIN))</div><div class='head'>diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c<br/>index c644137d9cd6..7bf12d793fcd 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/deadline-iosched.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/deadline-iosched.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/deadline-iosched.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/deadline-iosched.c</a></div><div class='hunk'>@@ -448,9 +448,7 @@ static struct elevator_type iosched_deadline = {</div><div class='ctx'> </div><div class='ctx'> static int __init deadline_init(void)</div><div class='ctx'> {</div><div class='del'>-	elv_register(&amp;iosched_deadline);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return elv_register(&amp;iosched_deadline);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit deadline_exit(void)</div><div class='head'>diff --git a/block/elevator.c b/block/elevator.c<br/>index 66343d6917d0..91e18f8af9be 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/elevator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/elevator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/elevator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/elevator.c</a></div><div class='hunk'>@@ -61,8 +61,8 @@ static int elv_iosched_allow_merge(struct request *rq, struct bio *bio)</div><div class='ctx'> 	struct request_queue *q = rq-&gt;q;</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;ops-&gt;elevator_allow_merge_fn)</div><div class='del'>-		return e-&gt;ops-&gt;elevator_allow_merge_fn(q, rq, bio);</div><div class='add'>+	if (e-&gt;type-&gt;ops.elevator_allow_merge_fn)</div><div class='add'>+		return e-&gt;type-&gt;ops.elevator_allow_merge_fn(q, rq, bio);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -168,17 +168,13 @@ static struct elevator_type *elevator_get(const char *name)</div><div class='ctx'> 	return e;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *elevator_init_queue(struct request_queue *q,</div><div class='del'>-				 struct elevator_queue *eq)</div><div class='add'>+static int elevator_init_queue(struct request_queue *q,</div><div class='add'>+			       struct elevator_queue *eq)</div><div class='ctx'> {</div><div class='del'>-	return eq-&gt;ops-&gt;elevator_init_fn(q);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void elevator_attach(struct request_queue *q, struct elevator_queue *eq,</div><div class='del'>-			   void *data)</div><div class='del'>-{</div><div class='del'>-	q-&gt;elevator = eq;</div><div class='del'>-	eq-&gt;elevator_data = data;</div><div class='add'>+	eq-&gt;elevator_data = eq-&gt;type-&gt;ops.elevator_init_fn(q);</div><div class='add'>+	if (eq-&gt;elevator_data)</div><div class='add'>+		return 0;</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static char chosen_elevator[ELV_NAME_MAX];</div><div class='hunk'>@@ -207,8 +203,7 @@ static struct elevator_queue *elevator_alloc(struct request_queue *q,</div><div class='ctx'> 	if (unlikely(!eq))</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	eq-&gt;ops = &amp;e-&gt;ops;</div><div class='del'>-	eq-&gt;elevator_type = e;</div><div class='add'>+	eq-&gt;type = e;</div><div class='ctx'> 	kobject_init(&amp;eq-&gt;kobj, &amp;elv_ktype);</div><div class='ctx'> 	mutex_init(&amp;eq-&gt;sysfs_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -232,7 +227,7 @@ static void elevator_release(struct kobject *kobj)</div><div class='ctx'> 	struct elevator_queue *e;</div><div class='ctx'> </div><div class='ctx'> 	e = container_of(kobj, struct elevator_queue, kobj);</div><div class='del'>-	elevator_put(e-&gt;elevator_type);</div><div class='add'>+	elevator_put(e-&gt;type);</div><div class='ctx'> 	kfree(e-&gt;hash);</div><div class='ctx'> 	kfree(e);</div><div class='ctx'> }</div><div class='hunk'>@@ -241,7 +236,7 @@ int elevator_init(struct request_queue *q, char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_type *e = NULL;</div><div class='ctx'> 	struct elevator_queue *eq;</div><div class='del'>-	void *data;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(q-&gt;elevator))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -278,13 +273,13 @@ int elevator_init(struct request_queue *q, char *name)</div><div class='ctx'> 	if (!eq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	data = elevator_init_queue(q, eq);</div><div class='del'>-	if (!data) {</div><div class='add'>+	err = elevator_init_queue(q, eq);</div><div class='add'>+	if (err) {</div><div class='ctx'> 		kobject_put(&amp;eq-&gt;kobj);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	elevator_attach(q, eq, data);</div><div class='add'>+	q-&gt;elevator = eq;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(elevator_init);</div><div class='hunk'>@@ -292,9 +287,8 @@ EXPORT_SYMBOL(elevator_init);</div><div class='ctx'> void elevator_exit(struct elevator_queue *e)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;e-&gt;sysfs_lock);</div><div class='del'>-	if (e-&gt;ops-&gt;elevator_exit_fn)</div><div class='del'>-		e-&gt;ops-&gt;elevator_exit_fn(e);</div><div class='del'>-	e-&gt;ops = NULL;</div><div class='add'>+	if (e-&gt;type-&gt;ops.elevator_exit_fn)</div><div class='add'>+		e-&gt;type-&gt;ops.elevator_exit_fn(e);</div><div class='ctx'> 	mutex_unlock(&amp;e-&gt;sysfs_lock);</div><div class='ctx'> </div><div class='ctx'> 	kobject_put(&amp;e-&gt;kobj);</div><div class='hunk'>@@ -504,8 +498,8 @@ int elv_merge(struct request_queue *q, struct request **req, struct bio *bio)</div><div class='ctx'> 		return ELEVATOR_BACK_MERGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;ops-&gt;elevator_merge_fn)</div><div class='del'>-		return e-&gt;ops-&gt;elevator_merge_fn(q, req, bio);</div><div class='add'>+	if (e-&gt;type-&gt;ops.elevator_merge_fn)</div><div class='add'>+		return e-&gt;type-&gt;ops.elevator_merge_fn(q, req, bio);</div><div class='ctx'> </div><div class='ctx'> 	return ELEVATOR_NO_MERGE;</div><div class='ctx'> }</div><div class='hunk'>@@ -548,8 +542,8 @@ void elv_merged_request(struct request_queue *q, struct request *rq, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;ops-&gt;elevator_merged_fn)</div><div class='del'>-		e-&gt;ops-&gt;elevator_merged_fn(q, rq, type);</div><div class='add'>+	if (e-&gt;type-&gt;ops.elevator_merged_fn)</div><div class='add'>+		e-&gt;type-&gt;ops.elevator_merged_fn(q, rq, type);</div><div class='ctx'> </div><div class='ctx'> 	if (type == ELEVATOR_BACK_MERGE)</div><div class='ctx'> 		elv_rqhash_reposition(q, rq);</div><div class='hunk'>@@ -563,8 +557,8 @@ void elv_merge_requests(struct request_queue *q, struct request *rq,</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> 	const int next_sorted = next-&gt;cmd_flags &amp; REQ_SORTED;</div><div class='ctx'> </div><div class='del'>-	if (next_sorted &amp;&amp; e-&gt;ops-&gt;elevator_merge_req_fn)</div><div class='del'>-		e-&gt;ops-&gt;elevator_merge_req_fn(q, rq, next);</div><div class='add'>+	if (next_sorted &amp;&amp; e-&gt;type-&gt;ops.elevator_merge_req_fn)</div><div class='add'>+		e-&gt;type-&gt;ops.elevator_merge_req_fn(q, rq, next);</div><div class='ctx'> </div><div class='ctx'> 	elv_rqhash_reposition(q, rq);</div><div class='ctx'> </div><div class='hunk'>@@ -581,8 +575,8 @@ void elv_bio_merged(struct request_queue *q, struct request *rq,</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;ops-&gt;elevator_bio_merged_fn)</div><div class='del'>-		e-&gt;ops-&gt;elevator_bio_merged_fn(q, rq, bio);</div><div class='add'>+	if (e-&gt;type-&gt;ops.elevator_bio_merged_fn)</div><div class='add'>+		e-&gt;type-&gt;ops.elevator_bio_merged_fn(q, rq, bio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void elv_requeue_request(struct request_queue *q, struct request *rq)</div><div class='hunk'>@@ -608,12 +602,12 @@ void elv_drain_elevator(struct request_queue *q)</div><div class='ctx'> </div><div class='ctx'> 	lockdep_assert_held(q-&gt;queue_lock);</div><div class='ctx'> </div><div class='del'>-	while (q-&gt;elevator-&gt;ops-&gt;elevator_dispatch_fn(q, 1))</div><div class='add'>+	while (q-&gt;elevator-&gt;type-&gt;ops.elevator_dispatch_fn(q, 1))</div><div class='ctx'> 		;</div><div class='ctx'> 	if (q-&gt;nr_sorted &amp;&amp; printed++ &lt; 10) {</div><div class='ctx'> 		printk(KERN_ERR "%s: forced dispatching is broken "</div><div class='ctx'> 		       "(nr_sorted=%u), please report this\n",</div><div class='del'>-		       q-&gt;elevator-&gt;elevator_type-&gt;elevator_name, q-&gt;nr_sorted);</div><div class='add'>+		       q-&gt;elevator-&gt;type-&gt;elevator_name, q-&gt;nr_sorted);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -702,7 +696,7 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where)</div><div class='ctx'> 		 * rq cannot be accessed after calling</div><div class='ctx'> 		 * elevator_add_req_fn.</div><div class='ctx'> 		 */</div><div class='del'>-		q-&gt;elevator-&gt;ops-&gt;elevator_add_req_fn(q, rq);</div><div class='add'>+		q-&gt;elevator-&gt;type-&gt;ops.elevator_add_req_fn(q, rq);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ELEVATOR_INSERT_FLUSH:</div><div class='hunk'>@@ -731,8 +725,8 @@ struct request *elv_latter_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;ops-&gt;elevator_latter_req_fn)</div><div class='del'>-		return e-&gt;ops-&gt;elevator_latter_req_fn(q, rq);</div><div class='add'>+	if (e-&gt;type-&gt;ops.elevator_latter_req_fn)</div><div class='add'>+		return e-&gt;type-&gt;ops.elevator_latter_req_fn(q, rq);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -740,8 +734,8 @@ struct request *elv_former_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;ops-&gt;elevator_former_req_fn)</div><div class='del'>-		return e-&gt;ops-&gt;elevator_former_req_fn(q, rq);</div><div class='add'>+	if (e-&gt;type-&gt;ops.elevator_former_req_fn)</div><div class='add'>+		return e-&gt;type-&gt;ops.elevator_former_req_fn(q, rq);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -749,10 +743,8 @@ int elv_set_request(struct request_queue *q, struct request *rq, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;ops-&gt;elevator_set_req_fn)</div><div class='del'>-		return e-&gt;ops-&gt;elevator_set_req_fn(q, rq, gfp_mask);</div><div class='del'>-</div><div class='del'>-	rq-&gt;elevator_private[0] = NULL;</div><div class='add'>+	if (e-&gt;type-&gt;ops.elevator_set_req_fn)</div><div class='add'>+		return e-&gt;type-&gt;ops.elevator_set_req_fn(q, rq, gfp_mask);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -760,16 +752,16 @@ void elv_put_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;ops-&gt;elevator_put_req_fn)</div><div class='del'>-		e-&gt;ops-&gt;elevator_put_req_fn(rq);</div><div class='add'>+	if (e-&gt;type-&gt;ops.elevator_put_req_fn)</div><div class='add'>+		e-&gt;type-&gt;ops.elevator_put_req_fn(rq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int elv_may_queue(struct request_queue *q, int rw)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> </div><div class='del'>-	if (e-&gt;ops-&gt;elevator_may_queue_fn)</div><div class='del'>-		return e-&gt;ops-&gt;elevator_may_queue_fn(q, rw);</div><div class='add'>+	if (e-&gt;type-&gt;ops.elevator_may_queue_fn)</div><div class='add'>+		return e-&gt;type-&gt;ops.elevator_may_queue_fn(q, rw);</div><div class='ctx'> </div><div class='ctx'> 	return ELV_MQUEUE_MAY;</div><div class='ctx'> }</div><div class='hunk'>@@ -804,8 +796,8 @@ void elv_completed_request(struct request_queue *q, struct request *rq)</div><div class='ctx'> 	if (blk_account_rq(rq)) {</div><div class='ctx'> 		q-&gt;in_flight[rq_is_sync(rq)]--;</div><div class='ctx'> 		if ((rq-&gt;cmd_flags &amp; REQ_SORTED) &amp;&amp;</div><div class='del'>-		    e-&gt;ops-&gt;elevator_completed_req_fn)</div><div class='del'>-			e-&gt;ops-&gt;elevator_completed_req_fn(q, rq);</div><div class='add'>+		    e-&gt;type-&gt;ops.elevator_completed_req_fn)</div><div class='add'>+			e-&gt;type-&gt;ops.elevator_completed_req_fn(q, rq);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -823,7 +815,7 @@ elv_attr_show(struct kobject *kobj, struct attribute *attr, char *page)</div><div class='ctx'> </div><div class='ctx'> 	e = container_of(kobj, struct elevator_queue, kobj);</div><div class='ctx'> 	mutex_lock(&amp;e-&gt;sysfs_lock);</div><div class='del'>-	error = e-&gt;ops ? entry-&gt;show(e, page) : -ENOENT;</div><div class='add'>+	error = e-&gt;type ? entry-&gt;show(e, page) : -ENOENT;</div><div class='ctx'> 	mutex_unlock(&amp;e-&gt;sysfs_lock);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -841,7 +833,7 @@ elv_attr_store(struct kobject *kobj, struct attribute *attr,</div><div class='ctx'> </div><div class='ctx'> 	e = container_of(kobj, struct elevator_queue, kobj);</div><div class='ctx'> 	mutex_lock(&amp;e-&gt;sysfs_lock);</div><div class='del'>-	error = e-&gt;ops ? entry-&gt;store(e, page, length) : -ENOENT;</div><div class='add'>+	error = e-&gt;type ? entry-&gt;store(e, page, length) : -ENOENT;</div><div class='ctx'> 	mutex_unlock(&amp;e-&gt;sysfs_lock);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -856,14 +848,13 @@ static struct kobj_type elv_ktype = {</div><div class='ctx'> 	.release	= elevator_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int elv_register_queue(struct request_queue *q)</div><div class='add'>+int __elv_register_queue(struct request_queue *q, struct elevator_queue *e)</div><div class='ctx'> {</div><div class='del'>-	struct elevator_queue *e = q-&gt;elevator;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	error = kobject_add(&amp;e-&gt;kobj, &amp;q-&gt;kobj, "%s", "iosched");</div><div class='ctx'> 	if (!error) {</div><div class='del'>-		struct elv_fs_entry *attr = e-&gt;elevator_type-&gt;elevator_attrs;</div><div class='add'>+		struct elv_fs_entry *attr = e-&gt;type-&gt;elevator_attrs;</div><div class='ctx'> 		if (attr) {</div><div class='ctx'> 			while (attr-&gt;attr.name) {</div><div class='ctx'> 				if (sysfs_create_file(&amp;e-&gt;kobj, &amp;attr-&gt;attr))</div><div class='hunk'>@@ -876,31 +867,55 @@ int elv_register_queue(struct request_queue *q)</div><div class='ctx'> 	}</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(elv_register_queue);</div><div class='ctx'> </div><div class='del'>-static void __elv_unregister_queue(struct elevator_queue *e)</div><div class='add'>+int elv_register_queue(struct request_queue *q)</div><div class='ctx'> {</div><div class='del'>-	kobject_uevent(&amp;e-&gt;kobj, KOBJ_REMOVE);</div><div class='del'>-	kobject_del(&amp;e-&gt;kobj);</div><div class='del'>-	e-&gt;registered = 0;</div><div class='add'>+	return __elv_register_queue(q, q-&gt;elevator);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(elv_register_queue);</div><div class='ctx'> </div><div class='ctx'> void elv_unregister_queue(struct request_queue *q)</div><div class='ctx'> {</div><div class='del'>-	if (q)</div><div class='del'>-		__elv_unregister_queue(q-&gt;elevator);</div><div class='add'>+	if (q) {</div><div class='add'>+		struct elevator_queue *e = q-&gt;elevator;</div><div class='add'>+</div><div class='add'>+		kobject_uevent(&amp;e-&gt;kobj, KOBJ_REMOVE);</div><div class='add'>+		kobject_del(&amp;e-&gt;kobj);</div><div class='add'>+		e-&gt;registered = 0;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(elv_unregister_queue);</div><div class='ctx'> </div><div class='del'>-void elv_register(struct elevator_type *e)</div><div class='add'>+int elv_register(struct elevator_type *e)</div><div class='ctx'> {</div><div class='ctx'> 	char *def = "";</div><div class='ctx'> </div><div class='add'>+	/* create icq_cache if requested */</div><div class='add'>+	if (e-&gt;icq_size) {</div><div class='add'>+		if (WARN_ON(e-&gt;icq_size &lt; sizeof(struct io_cq)) ||</div><div class='add'>+		    WARN_ON(e-&gt;icq_align &lt; __alignof__(struct io_cq)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		snprintf(e-&gt;icq_cache_name, sizeof(e-&gt;icq_cache_name),</div><div class='add'>+			 "%s_io_cq", e-&gt;elevator_name);</div><div class='add'>+		e-&gt;icq_cache = kmem_cache_create(e-&gt;icq_cache_name, e-&gt;icq_size,</div><div class='add'>+						 e-&gt;icq_align, 0, NULL);</div><div class='add'>+		if (!e-&gt;icq_cache)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* register, don't allow duplicate names */</div><div class='ctx'> 	spin_lock(&amp;elv_list_lock);</div><div class='del'>-	BUG_ON(elevator_find(e-&gt;elevator_name));</div><div class='add'>+	if (elevator_find(e-&gt;elevator_name)) {</div><div class='add'>+		spin_unlock(&amp;elv_list_lock);</div><div class='add'>+		if (e-&gt;icq_cache)</div><div class='add'>+			kmem_cache_destroy(e-&gt;icq_cache);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</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='add'>+	/* print pretty message */</div><div class='ctx'> 	if (!strcmp(e-&gt;elevator_name, chosen_elevator) ||</div><div class='ctx'> 			(!*chosen_elevator &amp;&amp;</div><div class='ctx'> 			 !strcmp(e-&gt;elevator_name, CONFIG_DEFAULT_IOSCHED)))</div><div class='hunk'>@@ -908,30 +923,26 @@ void elv_register(struct elevator_type *e)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "io scheduler %s registered%s\n", e-&gt;elevator_name,</div><div class='ctx'> 								def);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(elv_register);</div><div class='ctx'> </div><div class='ctx'> void elv_unregister(struct elevator_type *e)</div><div class='ctx'> {</div><div class='del'>-	struct task_struct *g, *p;</div><div class='add'>+	/* unregister */</div><div class='add'>+	spin_lock(&amp;elv_list_lock);</div><div class='add'>+	list_del_init(&amp;e-&gt;list);</div><div class='add'>+	spin_unlock(&amp;elv_list_lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Iterate every thread in the process to remove the io contexts.</div><div class='add'>+	 * Destroy icq_cache if it exists.  icq's are RCU managed.  Make</div><div class='add'>+	 * sure all RCU operations are complete before proceeding.</div><div class='ctx'> 	 */</div><div class='del'>-	if (e-&gt;ops.trim) {</div><div class='del'>-		read_lock(&amp;tasklist_lock);</div><div class='del'>-		do_each_thread(g, p) {</div><div class='del'>-			task_lock(p);</div><div class='del'>-			if (p-&gt;io_context)</div><div class='del'>-				e-&gt;ops.trim(p-&gt;io_context);</div><div class='del'>-			task_unlock(p);</div><div class='del'>-		} while_each_thread(g, p);</div><div class='del'>-		read_unlock(&amp;tasklist_lock);</div><div class='add'>+	if (e-&gt;icq_cache) {</div><div class='add'>+		rcu_barrier();</div><div class='add'>+		kmem_cache_destroy(e-&gt;icq_cache);</div><div class='add'>+		e-&gt;icq_cache = NULL;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;elv_list_lock);</div><div class='del'>-	list_del_init(&amp;e-&gt;list);</div><div class='del'>-	spin_unlock(&amp;elv_list_lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(elv_unregister);</div><div class='ctx'> </div><div class='hunk'>@@ -944,54 +955,41 @@ EXPORT_SYMBOL_GPL(elv_unregister);</div><div class='ctx'> static int elevator_switch(struct request_queue *q, struct elevator_type *new_e)</div><div class='ctx'> {</div><div class='ctx'> 	struct elevator_queue *old_elevator, *e;</div><div class='del'>-	void *data;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Allocate new elevator</div><div class='del'>-	 */</div><div class='add'>+	/* allocate new elevator */</div><div class='ctx'> 	e = elevator_alloc(q, new_e);</div><div class='ctx'> 	if (!e)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	data = elevator_init_queue(q, e);</div><div class='del'>-	if (!data) {</div><div class='add'>+	err = elevator_init_queue(q, e);</div><div class='add'>+	if (err) {</div><div class='ctx'> 		kobject_put(&amp;e-&gt;kobj);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Turn on BYPASS and drain all requests w/ elevator private data</div><div class='del'>-	 */</div><div class='add'>+	/* turn on BYPASS and drain all requests w/ elevator private data */</div><div class='ctx'> 	elv_quiesce_start(q);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Remember old elevator.</div><div class='del'>-	 */</div><div class='del'>-	old_elevator = q-&gt;elevator;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * attach and start new elevator</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irq(q-&gt;queue_lock);</div><div class='del'>-	elevator_attach(q, e, data);</div><div class='del'>-	spin_unlock_irq(q-&gt;queue_lock);</div><div class='del'>-</div><div class='del'>-	if (old_elevator-&gt;registered) {</div><div class='del'>-		__elv_unregister_queue(old_elevator);</div><div class='del'>-</div><div class='del'>-		err = elv_register_queue(q);</div><div class='add'>+	/* unregister old queue, register new one and kill old elevator */</div><div class='add'>+	if (q-&gt;elevator-&gt;registered) {</div><div class='add'>+		elv_unregister_queue(q);</div><div class='add'>+		err = __elv_register_queue(q, e);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto fail_register;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * finally exit old elevator and turn off BYPASS.</div><div class='del'>-	 */</div><div class='add'>+	/* done, clear io_cq's, switch elevators and turn off BYPASS */</div><div class='add'>+	spin_lock_irq(q-&gt;queue_lock);</div><div class='add'>+	ioc_clear_queue(q);</div><div class='add'>+	old_elevator = q-&gt;elevator;</div><div class='add'>+	q-&gt;elevator = e;</div><div class='add'>+	spin_unlock_irq(q-&gt;queue_lock);</div><div class='add'>+</div><div class='ctx'> 	elevator_exit(old_elevator);</div><div class='ctx'> 	elv_quiesce_end(q);</div><div class='ctx'> </div><div class='del'>-	blk_add_trace_msg(q, "elv switch: %s", e-&gt;elevator_type-&gt;elevator_name);</div><div class='add'>+	blk_add_trace_msg(q, "elv switch: %s", e-&gt;type-&gt;elevator_name);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1001,7 +999,6 @@ fail_register:</div><div class='ctx'> 	 * one again (along with re-adding the sysfs dir)</div><div class='ctx'> 	 */</div><div class='ctx'> 	elevator_exit(e);</div><div class='del'>-	q-&gt;elevator = old_elevator;</div><div class='ctx'> 	elv_register_queue(q);</div><div class='ctx'> 	elv_quiesce_end(q);</div><div class='ctx'> </div><div class='hunk'>@@ -1026,7 +1023,7 @@ int elevator_change(struct request_queue *q, const char *name)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!strcmp(elevator_name, q-&gt;elevator-&gt;elevator_type-&gt;elevator_name)) {</div><div class='add'>+	if (!strcmp(elevator_name, q-&gt;elevator-&gt;type-&gt;elevator_name)) {</div><div class='ctx'> 		elevator_put(e);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1061,7 +1058,7 @@ ssize_t elv_iosched_show(struct request_queue *q, char *name)</div><div class='ctx'> 	if (!q-&gt;elevator || !blk_queue_stackable(q))</div><div class='ctx'> 		return sprintf(name, "none\n");</div><div class='ctx'> </div><div class='del'>-	elv = e-&gt;elevator_type;</div><div class='add'>+	elv = e-&gt;type;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;elv_list_lock);</div><div class='ctx'> 	list_for_each_entry(__e, &amp;elv_list, list) {</div><div class='head'>diff --git a/block/genhd.c b/block/genhd.c<br/>index 02e9fca80825..23b4f7063322 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/genhd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/genhd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/genhd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/genhd.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/kobj_map.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/log2.h&gt;</div><div class='hunk'>@@ -507,7 +506,7 @@ static int exact_lock(dev_t devt, void *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void register_disk(struct gendisk *disk)</div><div class='add'>+static void register_disk(struct gendisk *disk)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *ddev = disk_to_dev(disk);</div><div class='ctx'> 	struct block_device *bdev;</div><div class='hunk'>@@ -615,7 +614,7 @@ void add_disk(struct gendisk *disk)</div><div class='ctx'> 	 * Take an extra ref on queue which will be put on disk_release()</div><div class='ctx'> 	 * so that it sticks around as long as @disk is there.</div><div class='ctx'> 	 */</div><div class='del'>-	WARN_ON_ONCE(blk_get_queue(disk-&gt;queue));</div><div class='add'>+	WARN_ON_ONCE(!blk_get_queue(disk-&gt;queue));</div><div class='ctx'> </div><div class='ctx'> 	retval = sysfs_create_link(&amp;disk_to_dev(disk)-&gt;kobj, &amp;bdi-&gt;dev-&gt;kobj,</div><div class='ctx'> 				   "bdi");</div><div class='hunk'>@@ -1109,7 +1108,7 @@ struct class block_class = {</div><div class='ctx'> 	.name		= "block",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *block_devnode(struct device *dev, mode_t *mode)</div><div class='add'>+static char *block_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *disk = dev_to_disk(dev);</div><div class='ctx'> </div><div class='head'>diff --git a/block/ioctl.c b/block/ioctl.c<br/>index d510c2a4eff8..ba15b2dbfb98 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/ioctl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/ioctl.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> #include &lt;linux/blkpg.h&gt;</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/backing-dev.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/blktrace_api.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -296,6 +296,8 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,</div><div class='ctx'> 		return put_uint(arg, bdev_discard_zeroes_data(bdev));</div><div class='ctx'> 	case BLKSECTGET:</div><div class='ctx'> 		return put_ushort(arg, queue_max_sectors(bdev_get_queue(bdev)));</div><div class='add'>+	case BLKROTATIONAL:</div><div class='add'>+		return put_ushort(arg, !blk_queue_nonrot(bdev_get_queue(bdev)));</div><div class='ctx'> 	case BLKRASET:</div><div class='ctx'> 	case BLKFRASET:</div><div class='ctx'> 		if(!capable(CAP_SYS_ADMIN))</div><div class='head'>diff --git a/block/noop-iosched.c b/block/noop-iosched.c<br/>index 06389e9ef96d..413a0b1d788c 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/noop-iosched.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/noop-iosched.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/noop-iosched.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/noop-iosched.c</a></div><div class='hunk'>@@ -94,9 +94,7 @@ static struct elevator_type elevator_noop = {</div><div class='ctx'> </div><div class='ctx'> static int __init noop_init(void)</div><div class='ctx'> {</div><div class='del'>-	elv_register(&amp;elevator_noop);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return elv_register(&amp;elevator_noop);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit noop_exit(void)</div><div class='head'>diff --git a/fs/partitions/check.c b/block/partition-generic.c<br/>index e3c63d1c5e13..d06ec1c829c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/check.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/check.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partition-generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partition-generic.c</a></div><div class='hunk'>@@ -1,6 +1,4 @@</div><div class='ctx'> /*</div><div class='del'>- *  fs/partitions/check.c</div><div class='del'>- *</div><div class='ctx'>  *  Code extracted from drivers/block/genhd.c</div><div class='ctx'>  *  Copyright (C) 1991-1998  Linus Torvalds</div><div class='ctx'>  *  Re-organised Feb 1998 Russell King</div><div class='hunk'>@@ -9,8 +7,6 @@</div><div class='ctx'>  *  block drivers, which allows all the partition code to</div><div class='ctx'>  *  be grouped in one location, and it to be mostly self</div><div class='ctx'>  *  contained.</div><div class='del'>- *</div><div class='del'>- *  Added needed MAJORS for new pairs, {hdi,hdj}, {hdk,hdl}</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -22,98 +18,11 @@</div><div class='ctx'> #include &lt;linux/genhd.h&gt;</div><div class='ctx'> #include &lt;linux/blktrace_api.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "check.h"</div><div class='del'>-</div><div class='del'>-#include "acorn.h"</div><div class='del'>-#include "amiga.h"</div><div class='del'>-#include "atari.h"</div><div class='del'>-#include "ldm.h"</div><div class='del'>-#include "mac.h"</div><div class='del'>-#include "msdos.h"</div><div class='del'>-#include "osf.h"</div><div class='del'>-#include "sgi.h"</div><div class='del'>-#include "sun.h"</div><div class='del'>-#include "ibm.h"</div><div class='del'>-#include "ultrix.h"</div><div class='del'>-#include "efi.h"</div><div class='del'>-#include "karma.h"</div><div class='del'>-#include "sysv68.h"</div><div class='add'>+#include "partitions/check.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BLK_DEV_MD</div><div class='ctx'> extern void md_autodetect_dev(dev_t dev);</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-int warn_no_part = 1; /*This is ugly: should make genhd removable media aware*/</div><div class='del'>-</div><div class='del'>-static int (*check_part[])(struct parsed_partitions *) = {</div><div class='del'>-	/*</div><div class='del'>-	 * Probe partition formats with tables at disk address 0</div><div class='del'>-	 * that also have an ADFS boot block at 0xdc0.</div><div class='del'>-	 */</div><div class='del'>-#ifdef CONFIG_ACORN_PARTITION_ICS</div><div class='del'>-	adfspart_check_ICS,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_ACORN_PARTITION_POWERTEC</div><div class='del'>-	adfspart_check_POWERTEC,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_ACORN_PARTITION_EESOX</div><div class='del'>-	adfspart_check_EESOX,</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now move on to formats that only have partition info at</div><div class='del'>-	 * disk address 0xdc0.  Since these may also have stale</div><div class='del'>-	 * PC/BIOS partition tables, they need to come before</div><div class='del'>-	 * the msdos entry.</div><div class='del'>-	 */</div><div class='del'>-#ifdef CONFIG_ACORN_PARTITION_CUMANA</div><div class='del'>-	adfspart_check_CUMANA,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_ACORN_PARTITION_ADFS</div><div class='del'>-	adfspart_check_ADFS,</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_EFI_PARTITION</div><div class='del'>-	efi_partition,		/* this must come before msdos */</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SGI_PARTITION</div><div class='del'>-	sgi_partition,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_LDM_PARTITION</div><div class='del'>-	ldm_partition,		/* this must come before msdos */</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_MSDOS_PARTITION</div><div class='del'>-	msdos_partition,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_OSF_PARTITION</div><div class='del'>-	osf_partition,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SUN_PARTITION</div><div class='del'>-	sun_partition,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_AMIGA_PARTITION</div><div class='del'>-	amiga_partition,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_ATARI_PARTITION</div><div class='del'>-	atari_partition,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_MAC_PARTITION</div><div class='del'>-	mac_partition,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_ULTRIX_PARTITION</div><div class='del'>-	ultrix_partition,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_IBM_PARTITION</div><div class='del'>-	ibm_partition,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_KARMA_PARTITION</div><div class='del'>-	karma_partition,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SYSV68_PARTITION</div><div class='del'>-	sysv68_partition,</div><div class='del'>-#endif</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='ctx'>  </div><div class='ctx'> /*</div><div class='ctx'>  * disk_name() is used by partition check code and the genhd driver.</div><div class='hunk'>@@ -155,65 +64,6 @@ const char *__bdevname(dev_t dev, char *buffer)</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(__bdevname);</div><div class='ctx'> </div><div class='del'>-static struct parsed_partitions *</div><div class='del'>-check_partition(struct gendisk *hd, struct block_device *bdev)</div><div class='del'>-{</div><div class='del'>-	struct parsed_partitions *state;</div><div class='del'>-	int i, res, err;</div><div class='del'>-</div><div class='del'>-	state = kzalloc(sizeof(struct parsed_partitions), GFP_KERNEL);</div><div class='del'>-	if (!state)</div><div class='del'>-		return NULL;</div><div class='del'>-	state-&gt;pp_buf = (char *)__get_free_page(GFP_KERNEL);</div><div class='del'>-	if (!state-&gt;pp_buf) {</div><div class='del'>-		kfree(state);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	state-&gt;pp_buf[0] = '\0';</div><div class='del'>-</div><div class='del'>-	state-&gt;bdev = bdev;</div><div class='del'>-	disk_name(hd, 0, state-&gt;name);</div><div class='del'>-	snprintf(state-&gt;pp_buf, PAGE_SIZE, " %s:", state-&gt;name);</div><div class='del'>-	if (isdigit(state-&gt;name[strlen(state-&gt;name)-1]))</div><div class='del'>-		sprintf(state-&gt;name, "p");</div><div class='del'>-</div><div class='del'>-	state-&gt;limit = disk_max_parts(hd);</div><div class='del'>-	i = res = err = 0;</div><div class='del'>-	while (!res &amp;&amp; check_part[i]) {</div><div class='del'>-		memset(&amp;state-&gt;parts, 0, sizeof(state-&gt;parts));</div><div class='del'>-		res = check_part[i++](state);</div><div class='del'>-		if (res &lt; 0) {</div><div class='del'>-			/* We have hit an I/O error which we don't report now.</div><div class='del'>-		 	* But record it, and let the others do their job.</div><div class='del'>-		 	*/</div><div class='del'>-			err = res;</div><div class='del'>-			res = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	if (res &gt; 0) {</div><div class='del'>-		printk(KERN_INFO "%s", state-&gt;pp_buf);</div><div class='del'>-</div><div class='del'>-		free_page((unsigned long)state-&gt;pp_buf);</div><div class='del'>-		return state;</div><div class='del'>-	}</div><div class='del'>-	if (state-&gt;access_beyond_eod)</div><div class='del'>-		err = -ENOSPC;</div><div class='del'>-	if (err)</div><div class='del'>-	/* The partition is unrecognized. So report I/O errors if there were any */</div><div class='del'>-		res = err;</div><div class='del'>-	if (!res)</div><div class='del'>-		strlcat(state-&gt;pp_buf, " unknown partition table\n", PAGE_SIZE);</div><div class='del'>-	else if (warn_no_part)</div><div class='del'>-		strlcat(state-&gt;pp_buf, " unable to read partition table\n", PAGE_SIZE);</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "%s", state-&gt;pp_buf);</div><div class='del'>-</div><div class='del'>-	free_page((unsigned long)state-&gt;pp_buf);</div><div class='del'>-	kfree(state);</div><div class='del'>-	return ERR_PTR(res);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t part_partition_show(struct device *dev,</div><div class='ctx'> 				   struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='head'>diff --git a/fs/partitions/Kconfig b/block/partitions/Kconfig<br/>index cb5f0a3f1b03..cb5f0a3f1b03 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/Kconfig</a></div><div class='head'>diff --git a/fs/partitions/Makefile b/block/partitions/Makefile<br/>index 03af8eac51da..03af8eac51da 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/Makefile</a></div><div class='head'>diff --git a/fs/partitions/acorn.c b/block/partitions/acorn.c<br/>index fbeb697374d5..fbeb697374d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/acorn.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/acorn.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/acorn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/acorn.c</a></div><div class='head'>diff --git a/fs/partitions/acorn.h b/block/partitions/acorn.h<br/>index ede828529692..ede828529692 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/acorn.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/acorn.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/acorn.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/acorn.h</a></div><div class='head'>diff --git a/fs/partitions/amiga.c b/block/partitions/amiga.c<br/>index 70cbf44a1560..70cbf44a1560 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/amiga.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/amiga.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/amiga.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/amiga.c</a></div><div class='head'>diff --git a/fs/partitions/amiga.h b/block/partitions/amiga.h<br/>index d094585cadaa..d094585cadaa 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/amiga.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/amiga.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/amiga.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/amiga.h</a></div><div class='head'>diff --git a/fs/partitions/atari.c b/block/partitions/atari.c<br/>index 9875b05e80a2..9875b05e80a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/atari.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/atari.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/atari.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/atari.c</a></div><div class='head'>diff --git a/fs/partitions/atari.h b/block/partitions/atari.h<br/>index fe2d32a89f36..fe2d32a89f36 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/atari.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/atari.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/atari.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/atari.h</a></div><div class='head'>diff --git a/block/partitions/check.c b/block/partitions/check.c<br/>new file mode 100644<br/>index 000000000000..bc908672c976<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/check.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/check.c</a></div><div class='hunk'>@@ -0,0 +1,166 @@</div><div class='add'>+/*</div><div class='add'>+ *  fs/partitions/check.c</div><div class='add'>+ *</div><div class='add'>+ *  Code extracted from drivers/block/genhd.c</div><div class='add'>+ *  Copyright (C) 1991-1998  Linus Torvalds</div><div class='add'>+ *  Re-organised Feb 1998 Russell King</div><div class='add'>+ *</div><div class='add'>+ *  We now have independent partition support from the</div><div class='add'>+ *  block drivers, which allows all the partition code to</div><div class='add'>+ *  be grouped in one location, and it to be mostly self</div><div class='add'>+ *  contained.</div><div class='add'>+ *</div><div class='add'>+ *  Added needed MAJORS for new pairs, {hdi,hdj}, {hdk,hdl}</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/genhd.h&gt;</div><div class='add'>+</div><div class='add'>+#include "check.h"</div><div class='add'>+</div><div class='add'>+#include "acorn.h"</div><div class='add'>+#include "amiga.h"</div><div class='add'>+#include "atari.h"</div><div class='add'>+#include "ldm.h"</div><div class='add'>+#include "mac.h"</div><div class='add'>+#include "msdos.h"</div><div class='add'>+#include "osf.h"</div><div class='add'>+#include "sgi.h"</div><div class='add'>+#include "sun.h"</div><div class='add'>+#include "ibm.h"</div><div class='add'>+#include "ultrix.h"</div><div class='add'>+#include "efi.h"</div><div class='add'>+#include "karma.h"</div><div class='add'>+#include "sysv68.h"</div><div class='add'>+</div><div class='add'>+int warn_no_part = 1; /*This is ugly: should make genhd removable media aware*/</div><div class='add'>+</div><div class='add'>+static int (*check_part[])(struct parsed_partitions *) = {</div><div class='add'>+	/*</div><div class='add'>+	 * Probe partition formats with tables at disk address 0</div><div class='add'>+	 * that also have an ADFS boot block at 0xdc0.</div><div class='add'>+	 */</div><div class='add'>+#ifdef CONFIG_ACORN_PARTITION_ICS</div><div class='add'>+	adfspart_check_ICS,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_ACORN_PARTITION_POWERTEC</div><div class='add'>+	adfspart_check_POWERTEC,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_ACORN_PARTITION_EESOX</div><div class='add'>+	adfspart_check_EESOX,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now move on to formats that only have partition info at</div><div class='add'>+	 * disk address 0xdc0.  Since these may also have stale</div><div class='add'>+	 * PC/BIOS partition tables, they need to come before</div><div class='add'>+	 * the msdos entry.</div><div class='add'>+	 */</div><div class='add'>+#ifdef CONFIG_ACORN_PARTITION_CUMANA</div><div class='add'>+	adfspart_check_CUMANA,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_ACORN_PARTITION_ADFS</div><div class='add'>+	adfspart_check_ADFS,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_EFI_PARTITION</div><div class='add'>+	efi_partition,		/* this must come before msdos */</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SGI_PARTITION</div><div class='add'>+	sgi_partition,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_LDM_PARTITION</div><div class='add'>+	ldm_partition,		/* this must come before msdos */</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_MSDOS_PARTITION</div><div class='add'>+	msdos_partition,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_OSF_PARTITION</div><div class='add'>+	osf_partition,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SUN_PARTITION</div><div class='add'>+	sun_partition,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_AMIGA_PARTITION</div><div class='add'>+	amiga_partition,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_ATARI_PARTITION</div><div class='add'>+	atari_partition,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_MAC_PARTITION</div><div class='add'>+	mac_partition,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_ULTRIX_PARTITION</div><div class='add'>+	ultrix_partition,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_IBM_PARTITION</div><div class='add'>+	ibm_partition,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_KARMA_PARTITION</div><div class='add'>+	karma_partition,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SYSV68_PARTITION</div><div class='add'>+	sysv68_partition,</div><div class='add'>+#endif</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct parsed_partitions *</div><div class='add'>+check_partition(struct gendisk *hd, struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+	struct parsed_partitions *state;</div><div class='add'>+	int i, res, err;</div><div class='add'>+</div><div class='add'>+	state = kzalloc(sizeof(struct parsed_partitions), GFP_KERNEL);</div><div class='add'>+	if (!state)</div><div class='add'>+		return NULL;</div><div class='add'>+	state-&gt;pp_buf = (char *)__get_free_page(GFP_KERNEL);</div><div class='add'>+	if (!state-&gt;pp_buf) {</div><div class='add'>+		kfree(state);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	state-&gt;pp_buf[0] = '\0';</div><div class='add'>+</div><div class='add'>+	state-&gt;bdev = bdev;</div><div class='add'>+	disk_name(hd, 0, state-&gt;name);</div><div class='add'>+	snprintf(state-&gt;pp_buf, PAGE_SIZE, " %s:", state-&gt;name);</div><div class='add'>+	if (isdigit(state-&gt;name[strlen(state-&gt;name)-1]))</div><div class='add'>+		sprintf(state-&gt;name, "p");</div><div class='add'>+</div><div class='add'>+	state-&gt;limit = disk_max_parts(hd);</div><div class='add'>+	i = res = err = 0;</div><div class='add'>+	while (!res &amp;&amp; check_part[i]) {</div><div class='add'>+		memset(&amp;state-&gt;parts, 0, sizeof(state-&gt;parts));</div><div class='add'>+		res = check_part[i++](state);</div><div class='add'>+		if (res &lt; 0) {</div><div class='add'>+			/* We have hit an I/O error which we don't report now.</div><div class='add'>+		 	* But record it, and let the others do their job.</div><div class='add'>+		 	*/</div><div class='add'>+			err = res;</div><div class='add'>+			res = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	if (res &gt; 0) {</div><div class='add'>+		printk(KERN_INFO "%s", state-&gt;pp_buf);</div><div class='add'>+</div><div class='add'>+		free_page((unsigned long)state-&gt;pp_buf);</div><div class='add'>+		return state;</div><div class='add'>+	}</div><div class='add'>+	if (state-&gt;access_beyond_eod)</div><div class='add'>+		err = -ENOSPC;</div><div class='add'>+	if (err)</div><div class='add'>+	/* The partition is unrecognized. So report I/O errors if there were any */</div><div class='add'>+		res = err;</div><div class='add'>+	if (!res)</div><div class='add'>+		strlcat(state-&gt;pp_buf, " unknown partition table\n", PAGE_SIZE);</div><div class='add'>+	else if (warn_no_part)</div><div class='add'>+		strlcat(state-&gt;pp_buf, " unable to read partition table\n", PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s", state-&gt;pp_buf);</div><div class='add'>+</div><div class='add'>+	free_page((unsigned long)state-&gt;pp_buf);</div><div class='add'>+	kfree(state);</div><div class='add'>+	return ERR_PTR(res);</div><div class='add'>+}</div><div class='head'>diff --git a/fs/partitions/check.h b/block/partitions/check.h<br/>index d68bf4dc3bc2..52b100311ec3 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/check.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/check.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/check.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/check.h</a></div><div class='hunk'>@@ -22,6 +22,9 @@ struct parsed_partitions {</div><div class='ctx'> 	char *pp_buf;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct parsed_partitions *</div><div class='add'>+check_partition(struct gendisk *, struct block_device *);</div><div class='add'>+</div><div class='ctx'> static inline void *read_part_sector(struct parsed_partitions *state,</div><div class='ctx'> 				     sector_t n, Sector *p)</div><div class='ctx'> {</div><div class='head'>diff --git a/fs/partitions/efi.c b/block/partitions/efi.c<br/>index 6296b403c67a..6296b403c67a 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/efi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/efi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/efi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/efi.c</a></div><div class='head'>diff --git a/fs/partitions/efi.h b/block/partitions/efi.h<br/>index b69ab729558f..b69ab729558f 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/efi.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/efi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/efi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/efi.h</a></div><div class='head'>diff --git a/fs/partitions/ibm.c b/block/partitions/ibm.c<br/>index d513a07f44bb..d513a07f44bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/ibm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/ibm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/ibm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/ibm.c</a></div><div class='head'>diff --git a/fs/partitions/ibm.h b/block/partitions/ibm.h<br/>index 08fb0804a812..08fb0804a812 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/ibm.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/ibm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/ibm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/ibm.h</a></div><div class='head'>diff --git a/fs/partitions/karma.c b/block/partitions/karma.c<br/>index 0ea19312706b..0ea19312706b 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/karma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/karma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/karma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/karma.c</a></div><div class='head'>diff --git a/fs/partitions/karma.h b/block/partitions/karma.h<br/>index c764b2e9df21..c764b2e9df21 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/karma.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/karma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/karma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/karma.h</a></div><div class='head'>diff --git a/fs/partitions/ldm.c b/block/partitions/ldm.c<br/>index bd8ae788f689..bd8ae788f689 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/ldm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/ldm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/ldm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/ldm.c</a></div><div class='head'>diff --git a/fs/partitions/ldm.h b/block/partitions/ldm.h<br/>index 374242c0971a..374242c0971a 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/ldm.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/ldm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/ldm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/ldm.h</a></div><div class='head'>diff --git a/fs/partitions/mac.c b/block/partitions/mac.c<br/>index 11f688bd76c5..11f688bd76c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/mac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/mac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/mac.c</a></div><div class='head'>diff --git a/fs/partitions/mac.h b/block/partitions/mac.h<br/>index 3c7d98436380..3c7d98436380 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/mac.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/mac.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/mac.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/mac.h</a></div><div class='head'>diff --git a/fs/partitions/msdos.c b/block/partitions/msdos.c<br/>index 5f79a6677c69..5f79a6677c69 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/msdos.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/msdos.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/msdos.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/msdos.c</a></div><div class='head'>diff --git a/fs/partitions/msdos.h b/block/partitions/msdos.h<br/>index 38c781c490b3..38c781c490b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/msdos.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/msdos.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/msdos.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/msdos.h</a></div><div class='head'>diff --git a/fs/partitions/osf.c b/block/partitions/osf.c<br/>index 764b86a01965..764b86a01965 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/osf.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/osf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/osf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/osf.c</a></div><div class='head'>diff --git a/fs/partitions/osf.h b/block/partitions/osf.h<br/>index 20ed2315ec16..20ed2315ec16 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/osf.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/osf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/osf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/osf.h</a></div><div class='head'>diff --git a/fs/partitions/sgi.c b/block/partitions/sgi.c<br/>index ea8a86dceaf4..ea8a86dceaf4 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/sgi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/sgi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/sgi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/sgi.c</a></div><div class='head'>diff --git a/fs/partitions/sgi.h b/block/partitions/sgi.h<br/>index b9553ebdd5a9..b9553ebdd5a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/sgi.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/sgi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/sgi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/sgi.h</a></div><div class='head'>diff --git a/fs/partitions/sun.c b/block/partitions/sun.c<br/>index b5b6fcfb3d36..b5b6fcfb3d36 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/sun.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/sun.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/sun.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/sun.c</a></div><div class='head'>diff --git a/fs/partitions/sun.h b/block/partitions/sun.h<br/>index 2424baa8319f..2424baa8319f 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/sun.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/sun.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/sun.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/sun.h</a></div><div class='head'>diff --git a/fs/partitions/sysv68.c b/block/partitions/sysv68.c<br/>index 9627ccffc1c4..9627ccffc1c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/sysv68.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/sysv68.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/sysv68.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/sysv68.c</a></div><div class='head'>diff --git a/fs/partitions/sysv68.h b/block/partitions/sysv68.h<br/>index bf2f5ffa97ac..bf2f5ffa97ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/sysv68.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/sysv68.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/sysv68.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/sysv68.h</a></div><div class='head'>diff --git a/fs/partitions/ultrix.c b/block/partitions/ultrix.c<br/>index 8dbaf9f77a99..8dbaf9f77a99 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/ultrix.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/ultrix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/ultrix.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/ultrix.c</a></div><div class='head'>diff --git a/fs/partitions/ultrix.h b/block/partitions/ultrix.h<br/>index a3cc00b2bded..a3cc00b2bded 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/partitions/ultrix.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>fs/partitions/ultrix.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/partitions/ultrix.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/partitions/ultrix.h</a></div><div class='head'>diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c<br/>index fbdf0d802ec4..260fa80ef575 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/scsi_ioctl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>block/scsi_ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/scsi_ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>block/scsi_ioctl.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/cdrom.h&gt;</div><div class='add'>+#include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/times.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -690,6 +691,57 @@ int scsi_cmd_ioctl(struct request_queue *q, struct gendisk *bd_disk, fmode_t mod</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(scsi_cmd_ioctl);</div><div class='ctx'> </div><div class='add'>+int scsi_verify_blk_ioctl(struct block_device *bd, unsigned int cmd)</div><div class='add'>+{</div><div class='add'>+	if (bd &amp;&amp; bd == bd-&gt;bd_contains)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Actually none of these is particularly useful on a partition,</div><div class='add'>+	 * but they are safe.</div><div class='add'>+	 */</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SCSI_IOCTL_GET_IDLUN:</div><div class='add'>+	case SCSI_IOCTL_GET_BUS_NUMBER:</div><div class='add'>+	case SCSI_IOCTL_GET_PCI:</div><div class='add'>+	case SCSI_IOCTL_PROBE_HOST:</div><div class='add'>+	case SG_GET_VERSION_NUM:</div><div class='add'>+	case SG_SET_TIMEOUT:</div><div class='add'>+	case SG_GET_TIMEOUT:</div><div class='add'>+	case SG_GET_RESERVED_SIZE:</div><div class='add'>+	case SG_SET_RESERVED_SIZE:</div><div class='add'>+	case SG_EMULATED_HOST:</div><div class='add'>+		return 0;</div><div class='add'>+	case CDROM_GET_CAPABILITY:</div><div class='add'>+		/* Keep this until we remove the printk below.  udev sends it</div><div class='add'>+		 * and we do not want to spam dmesg about it.   CD-ROMs do</div><div class='add'>+		 * not have partitions, so we get here only for disks.</div><div class='add'>+		 */</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In particular, rule out all resets and host-specific ioctls.  */</div><div class='add'>+	printk_ratelimited(KERN_WARNING</div><div class='add'>+			   "%s: sending ioctl %x to a partition!\n", current-&gt;comm, cmd);</div><div class='add'>+</div><div class='add'>+	return capable(CAP_SYS_RAWIO) ? 0 : -ENOIOCTLCMD;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(scsi_verify_blk_ioctl);</div><div class='add'>+</div><div class='add'>+int scsi_cmd_blk_ioctl(struct block_device *bd, fmode_t mode,</div><div class='add'>+		       unsigned int cmd, void __user *arg)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = scsi_verify_blk_ioctl(bd, cmd);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return scsi_cmd_ioctl(bd-&gt;bd_disk-&gt;queue, bd-&gt;bd_disk, mode, cmd, arg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(scsi_cmd_blk_ioctl);</div><div class='add'>+</div><div class='ctx'> static int __init blk_scsi_ioctl_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	blk_set_cmd_filter_defaults(&amp;blk_default_cmd_filter);</div><div class='head'>diff --git a/crypto/Kconfig b/crypto/Kconfig<br/>index 527a857d10b6..e6cfe1a25137 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>crypto/Kconfig</a></div><div class='hunk'>@@ -105,7 +105,7 @@ config CRYPTO_USER</div><div class='ctx'> 	depends on NET</div><div class='ctx'> 	select CRYPTO_MANAGER</div><div class='ctx'> 	help</div><div class='del'>-	  Userapace configuration for cryptographic instantiations such as</div><div class='add'>+	  Userspace configuration for cryptographic instantiations such as</div><div class='ctx'> 	  cbc(aes).</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_MANAGER_DISABLE_TESTS</div><div class='hunk'>@@ -117,7 +117,7 @@ config CRYPTO_MANAGER_DISABLE_TESTS</div><div class='ctx'> 	  algorithm registration.</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_GF128MUL</div><div class='del'>-	tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"</div><div class='add'>+	tristate "GF(2^128) multiplication functions"</div><div class='ctx'> 	help</div><div class='ctx'> 	  Efficient table driven implementation of multiplications in the</div><div class='ctx'> 	  field GF(2^128).  This is needed by some cypher modes. This</div><div class='hunk'>@@ -241,8 +241,7 @@ config CRYPTO_ECB</div><div class='ctx'> 	  the input block by block.</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_LRW</div><div class='del'>-	tristate "LRW support (EXPERIMENTAL)"</div><div class='del'>-	depends on EXPERIMENTAL</div><div class='add'>+	tristate "LRW support"</div><div class='ctx'> 	select CRYPTO_BLKCIPHER</div><div class='ctx'> 	select CRYPTO_MANAGER</div><div class='ctx'> 	select CRYPTO_GF128MUL</div><div class='hunk'>@@ -262,8 +261,7 @@ config CRYPTO_PCBC</div><div class='ctx'> 	  This block cipher algorithm is required for RxRPC.</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_XTS</div><div class='del'>-	tristate "XTS support (EXPERIMENTAL)"</div><div class='del'>-	depends on EXPERIMENTAL</div><div class='add'>+	tristate "XTS support"</div><div class='ctx'> 	select CRYPTO_BLKCIPHER</div><div class='ctx'> 	select CRYPTO_MANAGER</div><div class='ctx'> 	select CRYPTO_GF128MUL</div><div class='hunk'>@@ -329,7 +327,6 @@ config CRYPTO_CRC32C_INTEL</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_GHASH</div><div class='ctx'> 	tristate "GHASH digest algorithm"</div><div class='del'>-	select CRYPTO_SHASH</div><div class='ctx'> 	select CRYPTO_GF128MUL</div><div class='ctx'> 	help</div><div class='ctx'> 	  GHASH is message digest algorithm for GCM (Galois/Counter Mode).</div><div class='hunk'>@@ -477,7 +474,6 @@ config CRYPTO_WP512</div><div class='ctx'> config CRYPTO_GHASH_CLMUL_NI_INTEL</div><div class='ctx'> 	tristate "GHASH digest algorithm (CLMUL-NI accelerated)"</div><div class='ctx'> 	depends on X86 &amp;&amp; 64BIT</div><div class='del'>-	select CRYPTO_SHASH</div><div class='ctx'> 	select CRYPTO_CRYPTD</div><div class='ctx'> 	help</div><div class='ctx'> 	  GHASH is message digest algorithm for GCM (Galois/Counter Mode).</div><div class='hunk'>@@ -766,6 +762,46 @@ config CRYPTO_SERPENT</div><div class='ctx'> 	  See also:</div><div class='ctx'> 	  &lt;http://www.cl.cam.ac.uk/~rja14/serpent.html&gt;</div><div class='ctx'> </div><div class='add'>+config CRYPTO_SERPENT_SSE2_X86_64</div><div class='add'>+	tristate "Serpent cipher algorithm (x86_64/SSE2)"</div><div class='add'>+	depends on X86 &amp;&amp; 64BIT</div><div class='add'>+	select CRYPTO_ALGAPI</div><div class='add'>+	select CRYPTO_CRYPTD</div><div class='add'>+	select CRYPTO_SERPENT</div><div class='add'>+	select CRYPTO_LRW</div><div class='add'>+	select CRYPTO_XTS</div><div class='add'>+	help</div><div class='add'>+	  Serpent cipher algorithm, by Anderson, Biham &amp; Knudsen.</div><div class='add'>+</div><div class='add'>+	  Keys are allowed to be from 0 to 256 bits in length, in steps</div><div class='add'>+	  of 8 bits.</div><div class='add'>+</div><div class='add'>+	  This module provides Serpent cipher algorithm that processes eigth</div><div class='add'>+	  blocks parallel using SSE2 instruction set.</div><div class='add'>+</div><div class='add'>+	  See also:</div><div class='add'>+	  &lt;http://www.cl.cam.ac.uk/~rja14/serpent.html&gt;</div><div class='add'>+</div><div class='add'>+config CRYPTO_SERPENT_SSE2_586</div><div class='add'>+	tristate "Serpent cipher algorithm (i586/SSE2)"</div><div class='add'>+	depends on X86 &amp;&amp; !64BIT</div><div class='add'>+	select CRYPTO_ALGAPI</div><div class='add'>+	select CRYPTO_CRYPTD</div><div class='add'>+	select CRYPTO_SERPENT</div><div class='add'>+	select CRYPTO_LRW</div><div class='add'>+	select CRYPTO_XTS</div><div class='add'>+	help</div><div class='add'>+	  Serpent cipher algorithm, by Anderson, Biham &amp; Knudsen.</div><div class='add'>+</div><div class='add'>+	  Keys are allowed to be from 0 to 256 bits in length, in steps</div><div class='add'>+	  of 8 bits.</div><div class='add'>+</div><div class='add'>+	  This module provides Serpent cipher algorithm that processes four</div><div class='add'>+	  blocks parallel using SSE2 instruction set.</div><div class='add'>+</div><div class='add'>+	  See also:</div><div class='add'>+	  &lt;http://www.cl.cam.ac.uk/~rja14/serpent.html&gt;</div><div class='add'>+</div><div class='ctx'> config CRYPTO_TEA</div><div class='ctx'> 	tristate "TEA, XTEA and XETA cipher algorithms"</div><div class='ctx'> 	select CRYPTO_ALGAPI</div><div class='hunk'>@@ -842,6 +878,8 @@ config CRYPTO_TWOFISH_X86_64_3WAY</div><div class='ctx'> 	select CRYPTO_ALGAPI</div><div class='ctx'> 	select CRYPTO_TWOFISH_COMMON</div><div class='ctx'> 	select CRYPTO_TWOFISH_X86_64</div><div class='add'>+	select CRYPTO_LRW</div><div class='add'>+	select CRYPTO_XTS</div><div class='ctx'> 	help</div><div class='ctx'> 	  Twofish cipher algorithm (x86_64, 3-way parallel).</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/Makefile b/crypto/Makefile<br/>index 9e6eee2c05db..f638063f4ea9 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>crypto/Makefile</a></div><div class='hunk'>@@ -65,7 +65,7 @@ obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish_generic.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_BLOWFISH_COMMON) += blowfish_common.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o</div><div class='del'>-obj-$(CONFIG_CRYPTO_SERPENT) += serpent.o</div><div class='add'>+obj-$(CONFIG_CRYPTO_SERPENT) += serpent_generic.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_AES) += aes_generic.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia.o</div><div class='ctx'> obj-$(CONFIG_CRYPTO_CAST5) += cast5.o</div><div class='head'>diff --git a/crypto/algapi.c b/crypto/algapi.c<br/>index 54dd4e33b5d6..9d4a9fe913f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/algapi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/algapi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/algapi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>crypto/algapi.c</a></div><div class='hunk'>@@ -518,6 +518,35 @@ err:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(crypto_register_instance);</div><div class='ctx'> </div><div class='add'>+int crypto_unregister_instance(struct crypto_alg *alg)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct crypto_instance *inst = (void *)alg;</div><div class='add'>+	struct crypto_template *tmpl = inst-&gt;tmpl;</div><div class='add'>+	LIST_HEAD(users);</div><div class='add'>+</div><div class='add'>+	if (!(alg-&gt;cra_flags &amp; CRYPTO_ALG_INSTANCE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	BUG_ON(atomic_read(&amp;alg-&gt;cra_refcnt) != 1);</div><div class='add'>+</div><div class='add'>+	down_write(&amp;crypto_alg_sem);</div><div class='add'>+</div><div class='add'>+	hlist_del_init(&amp;inst-&gt;list);</div><div class='add'>+	err = crypto_remove_alg(alg, &amp;users);</div><div class='add'>+</div><div class='add'>+	up_write(&amp;crypto_alg_sem);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	tmpl-&gt;free(inst);</div><div class='add'>+	crypto_remove_final(&amp;users);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(crypto_unregister_instance);</div><div class='add'>+</div><div class='ctx'> int crypto_init_spawn(struct crypto_spawn *spawn, struct crypto_alg *alg,</div><div class='ctx'> 		      struct crypto_instance *inst, u32 mask)</div><div class='ctx'> {</div><div class='head'>diff --git a/crypto/ansi_cprng.c b/crypto/ansi_cprng.c<br/>index ffa0245e2abc..6ddd99e6114b 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/ansi_cprng.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/ansi_cprng.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/ansi_cprng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>crypto/ansi_cprng.c</a></div><div class='hunk'>@@ -414,10 +414,18 @@ static int fips_cprng_get_random(struct crypto_rng *tfm, u8 *rdata,</div><div class='ctx'> static int fips_cprng_reset(struct crypto_rng *tfm, u8 *seed, unsigned int slen)</div><div class='ctx'> {</div><div class='ctx'> 	u8 rdata[DEFAULT_BLK_SZ];</div><div class='add'>+	u8 *key = seed + DEFAULT_BLK_SZ;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	struct prng_context *prng = crypto_rng_ctx(tfm);</div><div class='ctx'> </div><div class='add'>+	if (slen &lt; DEFAULT_PRNG_KSZ + DEFAULT_BLK_SZ)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* fips strictly requires seed != key */</div><div class='add'>+	if (!memcmp(seed, key, DEFAULT_PRNG_KSZ))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	rc = cprng_reset(tfm, seed, slen);</div><div class='ctx'> </div><div class='ctx'> 	if (!rc)</div><div class='head'>diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c<br/>index 0605a2bbba75..16f8693cc147 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/crypto_user.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/crypto_user.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/crypto_user.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>crypto/crypto_user.c</a></div><div class='hunk'>@@ -298,7 +298,7 @@ static int crypto_del_alg(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (atomic_read(&amp;alg-&gt;cra_refcnt) != 1)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	return crypto_unregister_alg(alg);</div><div class='add'>+	return crypto_unregister_instance(alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int crypto_add_alg(struct sk_buff *skb, struct nlmsghdr *nlh,</div><div class='hunk'>@@ -382,7 +382,7 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)</div><div class='ctx'> 	type -= CRYPTO_MSG_BASE;</div><div class='ctx'> 	link = &amp;crypto_dispatch[type];</div><div class='ctx'> </div><div class='del'>-	if (security_netlink_recv(skb, CAP_NET_ADMIN))</div><div class='add'>+	if (!capable(CAP_NET_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	if ((type == (CRYPTO_MSG_GETALG - CRYPTO_MSG_BASE) &amp;&amp;</div><div class='head'>diff --git a/crypto/lrw.c b/crypto/lrw.c<br/>index 358f80be2bf9..ba42acc4deba 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/lrw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/lrw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/lrw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>crypto/lrw.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2006 Rik Snel &lt;rsnel@cube.dyndns.org&gt;</div><div class='ctx'>  *</div><div class='del'>- * Based om ecb.c</div><div class='add'>+ * Based on ecb.c</div><div class='ctx'>  * Copyright (c) 2006 Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify it</div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'>  * http://www.mail-archive.com/stds-p1619@listserv.ieee.org/msg00173.html</div><div class='ctx'>  *</div><div class='ctx'>  * The test vectors are included in the testing module tcrypt.[ch] */</div><div class='add'>+</div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -26,21 +27,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/b128ops.h&gt;</div><div class='ctx'> #include &lt;crypto/gf128mul.h&gt;</div><div class='add'>+#include &lt;crypto/lrw.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct priv {</div><div class='ctx'> 	struct crypto_cipher *child;</div><div class='del'>-	/* optimizes multiplying a random (non incrementing, as at the</div><div class='del'>-	 * start of a new sector) value with key2, we could also have</div><div class='del'>-	 * used 4k optimization tables or no optimization at all. In the</div><div class='del'>-	 * latter case we would have to store key2 here */</div><div class='del'>-	struct gf128mul_64k *table;</div><div class='del'>-	/* stores:</div><div class='del'>-	 *  key2*{ 0,0,...0,0,0,0,1 }, key2*{ 0,0,...0,0,0,1,1 },</div><div class='del'>-	 *  key2*{ 0,0,...0,0,1,1,1 }, key2*{ 0,0,...0,1,1,1,1 }</div><div class='del'>-	 *  key2*{ 0,0,...1,1,1,1,1 }, etc</div><div class='del'>-	 * needed for optimized multiplication of incrementing values</div><div class='del'>-	 * with key2 */</div><div class='del'>-	be128 mulinc[128];</div><div class='add'>+	struct lrw_table_ctx table;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void setbit128_bbe(void *b, int bit)</div><div class='hunk'>@@ -54,28 +45,16 @@ static inline void setbit128_bbe(void *b, int bit)</div><div class='ctx'> 			), b);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int setkey(struct crypto_tfm *parent, const u8 *key,</div><div class='del'>-		  unsigned int keylen)</div><div class='add'>+int lrw_init_table(struct lrw_table_ctx *ctx, const u8 *tweak)</div><div class='ctx'> {</div><div class='del'>-	struct priv *ctx = crypto_tfm_ctx(parent);</div><div class='del'>-	struct crypto_cipher *child = ctx-&gt;child;</div><div class='del'>-	int err, i;</div><div class='ctx'> 	be128 tmp = { 0 };</div><div class='del'>-	int bsize = crypto_cipher_blocksize(child);</div><div class='del'>-</div><div class='del'>-	crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);</div><div class='del'>-	crypto_cipher_set_flags(child, crypto_tfm_get_flags(parent) &amp;</div><div class='del'>-				       CRYPTO_TFM_REQ_MASK);</div><div class='del'>-	if ((err = crypto_cipher_setkey(child, key, keylen - bsize)))</div><div class='del'>-		return err;</div><div class='del'>-	crypto_tfm_set_flags(parent, crypto_cipher_get_flags(child) &amp;</div><div class='del'>-				     CRYPTO_TFM_RES_MASK);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;table)</div><div class='ctx'> 		gf128mul_free_64k(ctx-&gt;table);</div><div class='ctx'> </div><div class='ctx'> 	/* initialize multiplication table for Key2 */</div><div class='del'>-	ctx-&gt;table = gf128mul_init_64k_bbe((be128 *)(key + keylen - bsize));</div><div class='add'>+	ctx-&gt;table = gf128mul_init_64k_bbe((be128 *)tweak);</div><div class='ctx'> 	if (!ctx-&gt;table)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -88,6 +67,34 @@ static int setkey(struct crypto_tfm *parent, const u8 *key,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(lrw_init_table);</div><div class='add'>+</div><div class='add'>+void lrw_free_table(struct lrw_table_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	if (ctx-&gt;table)</div><div class='add'>+		gf128mul_free_64k(ctx-&gt;table);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(lrw_free_table);</div><div class='add'>+</div><div class='add'>+static int setkey(struct crypto_tfm *parent, const u8 *key,</div><div class='add'>+		  unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct priv *ctx = crypto_tfm_ctx(parent);</div><div class='add'>+	struct crypto_cipher *child = ctx-&gt;child;</div><div class='add'>+	int err, bsize = LRW_BLOCK_SIZE;</div><div class='add'>+	const u8 *tweak = key + keylen - bsize;</div><div class='add'>+</div><div class='add'>+	crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	crypto_cipher_set_flags(child, crypto_tfm_get_flags(parent) &amp;</div><div class='add'>+				       CRYPTO_TFM_REQ_MASK);</div><div class='add'>+	err = crypto_cipher_setkey(child, key, keylen - bsize);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	crypto_tfm_set_flags(parent, crypto_cipher_get_flags(child) &amp;</div><div class='add'>+				     CRYPTO_TFM_RES_MASK);</div><div class='add'>+</div><div class='add'>+	return lrw_init_table(&amp;ctx-&gt;table, tweak);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> struct sinfo {</div><div class='ctx'> 	be128 t;</div><div class='hunk'>@@ -134,7 +141,7 @@ static int crypt(struct blkcipher_desc *d,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned int avail;</div><div class='del'>-	const int bs = crypto_cipher_blocksize(ctx-&gt;child);</div><div class='add'>+	const int bs = LRW_BLOCK_SIZE;</div><div class='ctx'> 	struct sinfo s = {</div><div class='ctx'> 		.tfm = crypto_cipher_tfm(ctx-&gt;child),</div><div class='ctx'> 		.fn = fn</div><div class='hunk'>@@ -155,7 +162,7 @@ static int crypt(struct blkcipher_desc *d,</div><div class='ctx'> 	s.t = *iv;</div><div class='ctx'> </div><div class='ctx'> 	/* T &lt;- I*Key2 */</div><div class='del'>-	gf128mul_64k_bbe(&amp;s.t, ctx-&gt;table);</div><div class='add'>+	gf128mul_64k_bbe(&amp;s.t, ctx-&gt;table.table);</div><div class='ctx'> </div><div class='ctx'> 	goto first;</div><div class='ctx'> </div><div class='hunk'>@@ -163,7 +170,8 @@ static int crypt(struct blkcipher_desc *d,</div><div class='ctx'> 		do {</div><div class='ctx'> 			/* T &lt;- I*Key2, using the optimization</div><div class='ctx'> 			 * discussed in the specification */</div><div class='del'>-			be128_xor(&amp;s.t, &amp;s.t, &amp;ctx-&gt;mulinc[get_index128(iv)]);</div><div class='add'>+			be128_xor(&amp;s.t, &amp;s.t,</div><div class='add'>+				  &amp;ctx-&gt;table.mulinc[get_index128(iv)]);</div><div class='ctx'> 			inc(iv);</div><div class='ctx'> </div><div class='ctx'> first:</div><div class='hunk'>@@ -206,6 +214,85 @@ static int decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='ctx'> 		     crypto_cipher_alg(ctx-&gt;child)-&gt;cia_decrypt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int lrw_crypt(struct blkcipher_desc *desc, struct scatterlist *sdst,</div><div class='add'>+	      struct scatterlist *ssrc, unsigned int nbytes,</div><div class='add'>+	      struct lrw_crypt_req *req)</div><div class='add'>+{</div><div class='add'>+	const unsigned int bsize = LRW_BLOCK_SIZE;</div><div class='add'>+	const unsigned int max_blks = req-&gt;tbuflen / bsize;</div><div class='add'>+	struct lrw_table_ctx *ctx = req-&gt;table_ctx;</div><div class='add'>+	struct blkcipher_walk walk;</div><div class='add'>+	unsigned int nblocks;</div><div class='add'>+	be128 *iv, *src, *dst, *t;</div><div class='add'>+	be128 *t_buf = req-&gt;tbuf;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	BUG_ON(max_blks &lt; 1);</div><div class='add'>+</div><div class='add'>+	blkcipher_walk_init(&amp;walk, sdst, ssrc, nbytes);</div><div class='add'>+</div><div class='add'>+	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+	nbytes = walk.nbytes;</div><div class='add'>+	if (!nbytes)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	nblocks = min(walk.nbytes / bsize, max_blks);</div><div class='add'>+	src = (be128 *)walk.src.virt.addr;</div><div class='add'>+	dst = (be128 *)walk.dst.virt.addr;</div><div class='add'>+</div><div class='add'>+	/* calculate first value of T */</div><div class='add'>+	iv = (be128 *)walk.iv;</div><div class='add'>+	t_buf[0] = *iv;</div><div class='add'>+</div><div class='add'>+	/* T &lt;- I*Key2 */</div><div class='add'>+	gf128mul_64k_bbe(&amp;t_buf[0], ctx-&gt;table);</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	goto first;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		do {</div><div class='add'>+			for (i = 0; i &lt; nblocks; i++) {</div><div class='add'>+				/* T &lt;- I*Key2, using the optimization</div><div class='add'>+				 * discussed in the specification */</div><div class='add'>+				be128_xor(&amp;t_buf[i], t,</div><div class='add'>+						&amp;ctx-&gt;mulinc[get_index128(iv)]);</div><div class='add'>+				inc(iv);</div><div class='add'>+first:</div><div class='add'>+				t = &amp;t_buf[i];</div><div class='add'>+</div><div class='add'>+				/* PP &lt;- T xor P */</div><div class='add'>+				be128_xor(dst + i, t, src + i);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* CC &lt;- E(Key2,PP) */</div><div class='add'>+			req-&gt;crypt_fn(req-&gt;crypt_ctx, (u8 *)dst,</div><div class='add'>+				      nblocks * bsize);</div><div class='add'>+</div><div class='add'>+			/* C &lt;- T xor CC */</div><div class='add'>+			for (i = 0; i &lt; nblocks; i++)</div><div class='add'>+				be128_xor(dst + i, dst + i, &amp;t_buf[i]);</div><div class='add'>+</div><div class='add'>+			src += nblocks;</div><div class='add'>+			dst += nblocks;</div><div class='add'>+			nbytes -= nblocks * bsize;</div><div class='add'>+			nblocks = min(nbytes / bsize, max_blks);</div><div class='add'>+		} while (nblocks &gt; 0);</div><div class='add'>+</div><div class='add'>+		err = blkcipher_walk_done(desc, &amp;walk, nbytes);</div><div class='add'>+		nbytes = walk.nbytes;</div><div class='add'>+		if (!nbytes)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		nblocks = min(nbytes / bsize, max_blks);</div><div class='add'>+		src = (be128 *)walk.src.virt.addr;</div><div class='add'>+		dst = (be128 *)walk.dst.virt.addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(lrw_crypt);</div><div class='add'>+</div><div class='ctx'> static int init_tfm(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_cipher *cipher;</div><div class='hunk'>@@ -218,8 +305,9 @@ static int init_tfm(struct crypto_tfm *tfm)</div><div class='ctx'> 	if (IS_ERR(cipher))</div><div class='ctx'> 		return PTR_ERR(cipher);</div><div class='ctx'> </div><div class='del'>-	if (crypto_cipher_blocksize(cipher) != 16) {</div><div class='add'>+	if (crypto_cipher_blocksize(cipher) != LRW_BLOCK_SIZE) {</div><div class='ctx'> 		*flags |= CRYPTO_TFM_RES_BAD_BLOCK_LEN;</div><div class='add'>+		crypto_free_cipher(cipher);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -230,8 +318,8 @@ static int init_tfm(struct crypto_tfm *tfm)</div><div class='ctx'> static void exit_tfm(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	struct priv *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	if (ctx-&gt;table)</div><div class='del'>-		gf128mul_free_64k(ctx-&gt;table);</div><div class='add'>+</div><div class='add'>+	lrw_free_table(&amp;ctx-&gt;table);</div><div class='ctx'> 	crypto_free_cipher(ctx-&gt;child);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/serpent.c b/crypto/serpent.c<br/>deleted file mode 100644<br/>index b651a55fa569..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/crypto/serpent.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/serpent.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,587 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Cryptographic API.</div><div class='del'>- *</div><div class='del'>- * Serpent Cipher Algorithm.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2002 Dag Arne Osvik &lt;osvik@ii.uib.no&gt;</div><div class='del'>- *               2003 Herbert Valerio Riedel &lt;hvr@gnu.org&gt;</div><div class='del'>- *</div><div class='del'>- * Added tnepres support: Ruben Jesus Garcia Hernandez &lt;ruben@ugr.es&gt;, 18.10.2004</div><div class='del'>- *               Based on code by hvr</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='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-/* Key is padded to the maximum of 256 bits before round key generation.</div><div class='del'>- * Any key length &lt;= 256 bits (32 bytes) is allowed by the algorithm.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define SERPENT_MIN_KEY_SIZE		  0</div><div class='del'>-#define SERPENT_MAX_KEY_SIZE		 32</div><div class='del'>-#define SERPENT_EXPKEY_WORDS		132</div><div class='del'>-#define SERPENT_BLOCK_SIZE		 16</div><div class='del'>-</div><div class='del'>-#define PHI 0x9e3779b9UL</div><div class='del'>-</div><div class='del'>-#define keyiter(a,b,c,d,i,j) \</div><div class='del'>-        b ^= d; b ^= c; b ^= a; b ^= PHI ^ i; b = rol32(b,11); k[j] = b;</div><div class='del'>-</div><div class='del'>-#define loadkeys(x0,x1,x2,x3,i) \</div><div class='del'>-	x0=k[i]; x1=k[i+1]; x2=k[i+2]; x3=k[i+3];</div><div class='del'>-</div><div class='del'>-#define storekeys(x0,x1,x2,x3,i) \</div><div class='del'>-	k[i]=x0; k[i+1]=x1; k[i+2]=x2; k[i+3]=x3;</div><div class='del'>-</div><div class='del'>-#define K(x0,x1,x2,x3,i)				\</div><div class='del'>-	x3 ^= k[4*(i)+3];        x2 ^= k[4*(i)+2];	\</div><div class='del'>-	x1 ^= k[4*(i)+1];        x0 ^= k[4*(i)+0];</div><div class='del'>-</div><div class='del'>-#define LK(x0,x1,x2,x3,x4,i)				\</div><div class='del'>-					x0=rol32(x0,13);\</div><div class='del'>-	x2=rol32(x2,3);	x1 ^= x0;	x4  = x0 &lt;&lt; 3;	\</div><div class='del'>-	x3 ^= x2;	x1 ^= x2;			\</div><div class='del'>-	x1=rol32(x1,1);	x3 ^= x4;			\</div><div class='del'>-	x3=rol32(x3,7);	x4  = x1;			\</div><div class='del'>-	x0 ^= x1;	x4 &lt;&lt;= 7;	x2 ^= x3;	\</div><div class='del'>-	x0 ^= x3;	x2 ^= x4;	x3 ^= k[4*i+3];	\</div><div class='del'>-	x1 ^= k[4*i+1];	x0=rol32(x0,5);	x2=rol32(x2,22);\</div><div class='del'>-	x0 ^= k[4*i+0];	x2 ^= k[4*i+2];</div><div class='del'>-</div><div class='del'>-#define KL(x0,x1,x2,x3,x4,i)				\</div><div class='del'>-	x0 ^= k[4*i+0];	x1 ^= k[4*i+1];	x2 ^= k[4*i+2];	\</div><div class='del'>-	x3 ^= k[4*i+3];	x0=ror32(x0,5);	x2=ror32(x2,22);\</div><div class='del'>-	x4 =  x1;	x2 ^= x3;	x0 ^= x3;	\</div><div class='del'>-	x4 &lt;&lt;= 7;	x0 ^= x1;	x1=ror32(x1,1);	\</div><div class='del'>-	x2 ^= x4;	x3=ror32(x3,7);	x4 = x0 &lt;&lt; 3;	\</div><div class='del'>-	x1 ^= x0;	x3 ^= x4;	x0=ror32(x0,13);\</div><div class='del'>-	x1 ^= x2;	x3 ^= x2;	x2=ror32(x2,3);</div><div class='del'>-</div><div class='del'>-#define S0(x0,x1,x2,x3,x4)				\</div><div class='del'>-					x4  = x3;	\</div><div class='del'>-	x3 |= x0;	x0 ^= x4;	x4 ^= x2;	\</div><div class='del'>-	x4 =~ x4;	x3 ^= x1;	x1 &amp;= x0;	\</div><div class='del'>-	x1 ^= x4;	x2 ^= x0;	x0 ^= x3;	\</div><div class='del'>-	x4 |= x0;	x0 ^= x2;	x2 &amp;= x1;	\</div><div class='del'>-	x3 ^= x2;	x1 =~ x1;	x2 ^= x4;	\</div><div class='del'>-	x1 ^= x2;</div><div class='del'>-</div><div class='del'>-#define S1(x0,x1,x2,x3,x4)				\</div><div class='del'>-					x4  = x1;	\</div><div class='del'>-	x1 ^= x0;	x0 ^= x3;	x3 =~ x3;	\</div><div class='del'>-	x4 &amp;= x1;	x0 |= x1;	x3 ^= x2;	\</div><div class='del'>-	x0 ^= x3;	x1 ^= x3;	x3 ^= x4;	\</div><div class='del'>-	x1 |= x4;	x4 ^= x2;	x2 &amp;= x0;	\</div><div class='del'>-	x2 ^= x1;	x1 |= x0;	x0 =~ x0;	\</div><div class='del'>-	x0 ^= x2;	x4 ^= x1;</div><div class='del'>-</div><div class='del'>-#define S2(x0,x1,x2,x3,x4)				\</div><div class='del'>-					x3 =~ x3;	\</div><div class='del'>-	x1 ^= x0;	x4  = x0;	x0 &amp;= x2;	\</div><div class='del'>-	x0 ^= x3;	x3 |= x4;	x2 ^= x1;	\</div><div class='del'>-	x3 ^= x1;	x1 &amp;= x0;	x0 ^= x2;	\</div><div class='del'>-	x2 &amp;= x3;	x3 |= x1;	x0 =~ x0;	\</div><div class='del'>-	x3 ^= x0;	x4 ^= x0;	x0 ^= x2;	\</div><div class='del'>-	x1 |= x2;</div><div class='del'>-</div><div class='del'>-#define S3(x0,x1,x2,x3,x4)				\</div><div class='del'>-					x4  = x1;	\</div><div class='del'>-	x1 ^= x3;	x3 |= x0;	x4 &amp;= x0;	\</div><div class='del'>-	x0 ^= x2;	x2 ^= x1;	x1 &amp;= x3;	\</div><div class='del'>-	x2 ^= x3;	x0 |= x4;	x4 ^= x3;	\</div><div class='del'>-	x1 ^= x0;	x0 &amp;= x3;	x3 &amp;= x4;	\</div><div class='del'>-	x3 ^= x2;	x4 |= x1;	x2 &amp;= x1;	\</div><div class='del'>-	x4 ^= x3;	x0 ^= x3;	x3 ^= x2;</div><div class='del'>-</div><div class='del'>-#define S4(x0,x1,x2,x3,x4)				\</div><div class='del'>-					x4  = x3;	\</div><div class='del'>-	x3 &amp;= x0;	x0 ^= x4;			\</div><div class='del'>-	x3 ^= x2;	x2 |= x4;	x0 ^= x1;	\</div><div class='del'>-	x4 ^= x3;	x2 |= x0;			\</div><div class='del'>-	x2 ^= x1;	x1 &amp;= x0;			\</div><div class='del'>-	x1 ^= x4;	x4 &amp;= x2;	x2 ^= x3;	\</div><div class='del'>-	x4 ^= x0;	x3 |= x1;	x1 =~ x1;	\</div><div class='del'>-	x3 ^= x0;</div><div class='del'>-</div><div class='del'>-#define S5(x0,x1,x2,x3,x4)				\</div><div class='del'>-	x4  = x1;	x1 |= x0;			\</div><div class='del'>-	x2 ^= x1;	x3 =~ x3;	x4 ^= x0;	\</div><div class='del'>-	x0 ^= x2;	x1 &amp;= x4;	x4 |= x3;	\</div><div class='del'>-	x4 ^= x0;	x0 &amp;= x3;	x1 ^= x3;	\</div><div class='del'>-	x3 ^= x2;	x0 ^= x1;	x2 &amp;= x4;	\</div><div class='del'>-	x1 ^= x2;	x2 &amp;= x0;			\</div><div class='del'>-	x3 ^= x2;</div><div class='del'>-</div><div class='del'>-#define S6(x0,x1,x2,x3,x4)				\</div><div class='del'>-					x4  = x1;	\</div><div class='del'>-	x3 ^= x0;	x1 ^= x2;	x2 ^= x0;	\</div><div class='del'>-	x0 &amp;= x3;	x1 |= x3;	x4 =~ x4;	\</div><div class='del'>-	x0 ^= x1;	x1 ^= x2;			\</div><div class='del'>-	x3 ^= x4;	x4 ^= x0;	x2 &amp;= x0;	\</div><div class='del'>-	x4 ^= x1;	x2 ^= x3;	x3 &amp;= x1;	\</div><div class='del'>-	x3 ^= x0;	x1 ^= x2;</div><div class='del'>-</div><div class='del'>-#define S7(x0,x1,x2,x3,x4)				\</div><div class='del'>-					x1 =~ x1;	\</div><div class='del'>-	x4  = x1;	x0 =~ x0;	x1 &amp;= x2;	\</div><div class='del'>-	x1 ^= x3;	x3 |= x4;	x4 ^= x2;	\</div><div class='del'>-	x2 ^= x3;	x3 ^= x0;	x0 |= x1;	\</div><div class='del'>-	x2 &amp;= x0;	x0 ^= x4;	x4 ^= x3;	\</div><div class='del'>-	x3 &amp;= x0;	x4 ^= x1;			\</div><div class='del'>-	x2 ^= x4;	x3 ^= x1;	x4 |= x0;	\</div><div class='del'>-	x4 ^= x1;</div><div class='del'>-</div><div class='del'>-#define SI0(x0,x1,x2,x3,x4)				\</div><div class='del'>-			x4  = x3;	x1 ^= x0;	\</div><div class='del'>-	x3 |= x1;	x4 ^= x1;	x0 =~ x0;	\</div><div class='del'>-	x2 ^= x3;	x3 ^= x0;	x0 &amp;= x1;	\</div><div class='del'>-	x0 ^= x2;	x2 &amp;= x3;	x3 ^= x4;	\</div><div class='del'>-	x2 ^= x3;	x1 ^= x3;	x3 &amp;= x0;	\</div><div class='del'>-	x1 ^= x0;	x0 ^= x2;	x4 ^= x3;</div><div class='del'>-</div><div class='del'>-#define SI1(x0,x1,x2,x3,x4)				\</div><div class='del'>-	x1 ^= x3;	x4  = x0;			\</div><div class='del'>-	x0 ^= x2;	x2 =~ x2;	x4 |= x1;	\</div><div class='del'>-	x4 ^= x3;	x3 &amp;= x1;	x1 ^= x2;	\</div><div class='del'>-	x2 &amp;= x4;	x4 ^= x1;	x1 |= x3;	\</div><div class='del'>-	x3 ^= x0;	x2 ^= x0;	x0 |= x4;	\</div><div class='del'>-	x2 ^= x4;	x1 ^= x0;			\</div><div class='del'>-	x4 ^= x1;</div><div class='del'>-</div><div class='del'>-#define SI2(x0,x1,x2,x3,x4)				\</div><div class='del'>-	x2 ^= x1;	x4  = x3;	x3 =~ x3;	\</div><div class='del'>-	x3 |= x2;	x2 ^= x4;	x4 ^= x0;	\</div><div class='del'>-	x3 ^= x1;	x1 |= x2;	x2 ^= x0;	\</div><div class='del'>-	x1 ^= x4;	x4 |= x3;	x2 ^= x3;	\</div><div class='del'>-	x4 ^= x2;	x2 &amp;= x1;			\</div><div class='del'>-	x2 ^= x3;	x3 ^= x4;	x4 ^= x0;</div><div class='del'>-</div><div class='del'>-#define SI3(x0,x1,x2,x3,x4)				\</div><div class='del'>-					x2 ^= x1;	\</div><div class='del'>-	x4  = x1;	x1 &amp;= x2;			\</div><div class='del'>-	x1 ^= x0;	x0 |= x4;	x4 ^= x3;	\</div><div class='del'>-	x0 ^= x3;	x3 |= x1;	x1 ^= x2;	\</div><div class='del'>-	x1 ^= x3;	x0 ^= x2;	x2 ^= x3;	\</div><div class='del'>-	x3 &amp;= x1;	x1 ^= x0;	x0 &amp;= x2;	\</div><div class='del'>-	x4 ^= x3;	x3 ^= x0;	x0 ^= x1;</div><div class='del'>-</div><div class='del'>-#define SI4(x0,x1,x2,x3,x4)				\</div><div class='del'>-	x2 ^= x3;	x4  = x0;	x0 &amp;= x1;	\</div><div class='del'>-	x0 ^= x2;	x2 |= x3;	x4 =~ x4;	\</div><div class='del'>-	x1 ^= x0;	x0 ^= x2;	x2 &amp;= x4;	\</div><div class='del'>-	x2 ^= x0;	x0 |= x4;			\</div><div class='del'>-	x0 ^= x3;	x3 &amp;= x2;			\</div><div class='del'>-	x4 ^= x3;	x3 ^= x1;	x1 &amp;= x0;	\</div><div class='del'>-	x4 ^= x1;	x0 ^= x3;</div><div class='del'>-</div><div class='del'>-#define SI5(x0,x1,x2,x3,x4)				\</div><div class='del'>-			x4  = x1;	x1 |= x2;	\</div><div class='del'>-	x2 ^= x4;	x1 ^= x3;	x3 &amp;= x4;	\</div><div class='del'>-	x2 ^= x3;	x3 |= x0;	x0 =~ x0;	\</div><div class='del'>-	x3 ^= x2;	x2 |= x0;	x4 ^= x1;	\</div><div class='del'>-	x2 ^= x4;	x4 &amp;= x0;	x0 ^= x1;	\</div><div class='del'>-	x1 ^= x3;	x0 &amp;= x2;	x2 ^= x3;	\</div><div class='del'>-	x0 ^= x2;	x2 ^= x4;	x4 ^= x3;</div><div class='del'>-</div><div class='del'>-#define SI6(x0,x1,x2,x3,x4)				\</div><div class='del'>-			x0 ^= x2;			\</div><div class='del'>-	x4  = x0;	x0 &amp;= x3;	x2 ^= x3;	\</div><div class='del'>-	x0 ^= x2;	x3 ^= x1;	x2 |= x4;	\</div><div class='del'>-	x2 ^= x3;	x3 &amp;= x0;	x0 =~ x0;	\</div><div class='del'>-	x3 ^= x1;	x1 &amp;= x2;	x4 ^= x0;	\</div><div class='del'>-	x3 ^= x4;	x4 ^= x2;	x0 ^= x1;	\</div><div class='del'>-	x2 ^= x0;</div><div class='del'>-</div><div class='del'>-#define SI7(x0,x1,x2,x3,x4)				\</div><div class='del'>-	x4  = x3;	x3 &amp;= x0;	x0 ^= x2;	\</div><div class='del'>-	x2 |= x4;	x4 ^= x1;	x0 =~ x0;	\</div><div class='del'>-	x1 |= x3;	x4 ^= x0;	x0 &amp;= x2;	\</div><div class='del'>-	x0 ^= x1;	x1 &amp;= x2;	x3 ^= x2;	\</div><div class='del'>-	x4 ^= x3;	x2 &amp;= x3;	x3 |= x0;	\</div><div class='del'>-	x1 ^= x4;	x3 ^= x4;	x4 &amp;= x0;	\</div><div class='del'>-	x4 ^= x2;</div><div class='del'>-</div><div class='del'>-struct serpent_ctx {</div><div class='del'>-	u32 expkey[SERPENT_EXPKEY_WORDS];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int serpent_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='del'>-			  unsigned int keylen)</div><div class='del'>-{</div><div class='del'>-	struct serpent_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	u32 *k = ctx-&gt;expkey;</div><div class='del'>-	u8  *k8 = (u8 *)k;</div><div class='del'>-	u32 r0,r1,r2,r3,r4;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Copy key, add padding */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; keylen; ++i)</div><div class='del'>-		k8[i] = key[i];</div><div class='del'>-	if (i &lt; SERPENT_MAX_KEY_SIZE)</div><div class='del'>-		k8[i++] = 1;</div><div class='del'>-	while (i &lt; SERPENT_MAX_KEY_SIZE)</div><div class='del'>-		k8[i++] = 0;</div><div class='del'>-</div><div class='del'>-	/* Expand key using polynomial */</div><div class='del'>-</div><div class='del'>-	r0 = le32_to_cpu(k[3]);</div><div class='del'>-	r1 = le32_to_cpu(k[4]);</div><div class='del'>-	r2 = le32_to_cpu(k[5]);</div><div class='del'>-	r3 = le32_to_cpu(k[6]);</div><div class='del'>-	r4 = le32_to_cpu(k[7]);</div><div class='del'>-</div><div class='del'>-	keyiter(le32_to_cpu(k[0]),r0,r4,r2,0,0);</div><div class='del'>-	keyiter(le32_to_cpu(k[1]),r1,r0,r3,1,1);</div><div class='del'>-	keyiter(le32_to_cpu(k[2]),r2,r1,r4,2,2);</div><div class='del'>-	keyiter(le32_to_cpu(k[3]),r3,r2,r0,3,3);</div><div class='del'>-	keyiter(le32_to_cpu(k[4]),r4,r3,r1,4,4);</div><div class='del'>-	keyiter(le32_to_cpu(k[5]),r0,r4,r2,5,5);</div><div class='del'>-	keyiter(le32_to_cpu(k[6]),r1,r0,r3,6,6);</div><div class='del'>-	keyiter(le32_to_cpu(k[7]),r2,r1,r4,7,7);</div><div class='del'>-</div><div class='del'>-	keyiter(k[  0],r3,r2,r0,  8,  8); keyiter(k[  1],r4,r3,r1,  9,  9);</div><div class='del'>-	keyiter(k[  2],r0,r4,r2, 10, 10); keyiter(k[  3],r1,r0,r3, 11, 11);</div><div class='del'>-	keyiter(k[  4],r2,r1,r4, 12, 12); keyiter(k[  5],r3,r2,r0, 13, 13);</div><div class='del'>-	keyiter(k[  6],r4,r3,r1, 14, 14); keyiter(k[  7],r0,r4,r2, 15, 15);</div><div class='del'>-	keyiter(k[  8],r1,r0,r3, 16, 16); keyiter(k[  9],r2,r1,r4, 17, 17);</div><div class='del'>-	keyiter(k[ 10],r3,r2,r0, 18, 18); keyiter(k[ 11],r4,r3,r1, 19, 19);</div><div class='del'>-	keyiter(k[ 12],r0,r4,r2, 20, 20); keyiter(k[ 13],r1,r0,r3, 21, 21);</div><div class='del'>-	keyiter(k[ 14],r2,r1,r4, 22, 22); keyiter(k[ 15],r3,r2,r0, 23, 23);</div><div class='del'>-	keyiter(k[ 16],r4,r3,r1, 24, 24); keyiter(k[ 17],r0,r4,r2, 25, 25);</div><div class='del'>-	keyiter(k[ 18],r1,r0,r3, 26, 26); keyiter(k[ 19],r2,r1,r4, 27, 27);</div><div class='del'>-	keyiter(k[ 20],r3,r2,r0, 28, 28); keyiter(k[ 21],r4,r3,r1, 29, 29);</div><div class='del'>-	keyiter(k[ 22],r0,r4,r2, 30, 30); keyiter(k[ 23],r1,r0,r3, 31, 31);</div><div class='del'>-</div><div class='del'>-	k += 50;</div><div class='del'>-</div><div class='del'>-	keyiter(k[-26],r2,r1,r4, 32,-18); keyiter(k[-25],r3,r2,r0, 33,-17);</div><div class='del'>-	keyiter(k[-24],r4,r3,r1, 34,-16); keyiter(k[-23],r0,r4,r2, 35,-15);</div><div class='del'>-	keyiter(k[-22],r1,r0,r3, 36,-14); keyiter(k[-21],r2,r1,r4, 37,-13);</div><div class='del'>-	keyiter(k[-20],r3,r2,r0, 38,-12); keyiter(k[-19],r4,r3,r1, 39,-11);</div><div class='del'>-	keyiter(k[-18],r0,r4,r2, 40,-10); keyiter(k[-17],r1,r0,r3, 41, -9);</div><div class='del'>-	keyiter(k[-16],r2,r1,r4, 42, -8); keyiter(k[-15],r3,r2,r0, 43, -7);</div><div class='del'>-	keyiter(k[-14],r4,r3,r1, 44, -6); keyiter(k[-13],r0,r4,r2, 45, -5);</div><div class='del'>-	keyiter(k[-12],r1,r0,r3, 46, -4); keyiter(k[-11],r2,r1,r4, 47, -3);</div><div class='del'>-	keyiter(k[-10],r3,r2,r0, 48, -2); keyiter(k[ -9],r4,r3,r1, 49, -1);</div><div class='del'>-	keyiter(k[ -8],r0,r4,r2, 50,  0); keyiter(k[ -7],r1,r0,r3, 51,  1);</div><div class='del'>-	keyiter(k[ -6],r2,r1,r4, 52,  2); keyiter(k[ -5],r3,r2,r0, 53,  3);</div><div class='del'>-	keyiter(k[ -4],r4,r3,r1, 54,  4); keyiter(k[ -3],r0,r4,r2, 55,  5);</div><div class='del'>-	keyiter(k[ -2],r1,r0,r3, 56,  6); keyiter(k[ -1],r2,r1,r4, 57,  7);</div><div class='del'>-	keyiter(k[  0],r3,r2,r0, 58,  8); keyiter(k[  1],r4,r3,r1, 59,  9);</div><div class='del'>-	keyiter(k[  2],r0,r4,r2, 60, 10); keyiter(k[  3],r1,r0,r3, 61, 11);</div><div class='del'>-	keyiter(k[  4],r2,r1,r4, 62, 12); keyiter(k[  5],r3,r2,r0, 63, 13);</div><div class='del'>-	keyiter(k[  6],r4,r3,r1, 64, 14); keyiter(k[  7],r0,r4,r2, 65, 15);</div><div class='del'>-	keyiter(k[  8],r1,r0,r3, 66, 16); keyiter(k[  9],r2,r1,r4, 67, 17);</div><div class='del'>-	keyiter(k[ 10],r3,r2,r0, 68, 18); keyiter(k[ 11],r4,r3,r1, 69, 19);</div><div class='del'>-	keyiter(k[ 12],r0,r4,r2, 70, 20); keyiter(k[ 13],r1,r0,r3, 71, 21);</div><div class='del'>-	keyiter(k[ 14],r2,r1,r4, 72, 22); keyiter(k[ 15],r3,r2,r0, 73, 23);</div><div class='del'>-	keyiter(k[ 16],r4,r3,r1, 74, 24); keyiter(k[ 17],r0,r4,r2, 75, 25);</div><div class='del'>-	keyiter(k[ 18],r1,r0,r3, 76, 26); keyiter(k[ 19],r2,r1,r4, 77, 27);</div><div class='del'>-	keyiter(k[ 20],r3,r2,r0, 78, 28); keyiter(k[ 21],r4,r3,r1, 79, 29);</div><div class='del'>-	keyiter(k[ 22],r0,r4,r2, 80, 30); keyiter(k[ 23],r1,r0,r3, 81, 31);</div><div class='del'>-</div><div class='del'>-	k += 50;</div><div class='del'>-</div><div class='del'>-	keyiter(k[-26],r2,r1,r4, 82,-18); keyiter(k[-25],r3,r2,r0, 83,-17);</div><div class='del'>-	keyiter(k[-24],r4,r3,r1, 84,-16); keyiter(k[-23],r0,r4,r2, 85,-15);</div><div class='del'>-	keyiter(k[-22],r1,r0,r3, 86,-14); keyiter(k[-21],r2,r1,r4, 87,-13);</div><div class='del'>-	keyiter(k[-20],r3,r2,r0, 88,-12); keyiter(k[-19],r4,r3,r1, 89,-11);</div><div class='del'>-	keyiter(k[-18],r0,r4,r2, 90,-10); keyiter(k[-17],r1,r0,r3, 91, -9);</div><div class='del'>-	keyiter(k[-16],r2,r1,r4, 92, -8); keyiter(k[-15],r3,r2,r0, 93, -7);</div><div class='del'>-	keyiter(k[-14],r4,r3,r1, 94, -6); keyiter(k[-13],r0,r4,r2, 95, -5);</div><div class='del'>-	keyiter(k[-12],r1,r0,r3, 96, -4); keyiter(k[-11],r2,r1,r4, 97, -3);</div><div class='del'>-	keyiter(k[-10],r3,r2,r0, 98, -2); keyiter(k[ -9],r4,r3,r1, 99, -1);</div><div class='del'>-	keyiter(k[ -8],r0,r4,r2,100,  0); keyiter(k[ -7],r1,r0,r3,101,  1);</div><div class='del'>-	keyiter(k[ -6],r2,r1,r4,102,  2); keyiter(k[ -5],r3,r2,r0,103,  3);</div><div class='del'>-	keyiter(k[ -4],r4,r3,r1,104,  4); keyiter(k[ -3],r0,r4,r2,105,  5);</div><div class='del'>-	keyiter(k[ -2],r1,r0,r3,106,  6); keyiter(k[ -1],r2,r1,r4,107,  7);</div><div class='del'>-	keyiter(k[  0],r3,r2,r0,108,  8); keyiter(k[  1],r4,r3,r1,109,  9);</div><div class='del'>-	keyiter(k[  2],r0,r4,r2,110, 10); keyiter(k[  3],r1,r0,r3,111, 11);</div><div class='del'>-	keyiter(k[  4],r2,r1,r4,112, 12); keyiter(k[  5],r3,r2,r0,113, 13);</div><div class='del'>-	keyiter(k[  6],r4,r3,r1,114, 14); keyiter(k[  7],r0,r4,r2,115, 15);</div><div class='del'>-	keyiter(k[  8],r1,r0,r3,116, 16); keyiter(k[  9],r2,r1,r4,117, 17);</div><div class='del'>-	keyiter(k[ 10],r3,r2,r0,118, 18); keyiter(k[ 11],r4,r3,r1,119, 19);</div><div class='del'>-	keyiter(k[ 12],r0,r4,r2,120, 20); keyiter(k[ 13],r1,r0,r3,121, 21);</div><div class='del'>-	keyiter(k[ 14],r2,r1,r4,122, 22); keyiter(k[ 15],r3,r2,r0,123, 23);</div><div class='del'>-	keyiter(k[ 16],r4,r3,r1,124, 24); keyiter(k[ 17],r0,r4,r2,125, 25);</div><div class='del'>-	keyiter(k[ 18],r1,r0,r3,126, 26); keyiter(k[ 19],r2,r1,r4,127, 27);</div><div class='del'>-	keyiter(k[ 20],r3,r2,r0,128, 28); keyiter(k[ 21],r4,r3,r1,129, 29);</div><div class='del'>-	keyiter(k[ 22],r0,r4,r2,130, 30); keyiter(k[ 23],r1,r0,r3,131, 31);</div><div class='del'>-</div><div class='del'>-	/* Apply S-boxes */</div><div class='del'>-</div><div class='del'>-	S3(r3,r4,r0,r1,r2); storekeys(r1,r2,r4,r3, 28); loadkeys(r1,r2,r4,r3, 24);</div><div class='del'>-	S4(r1,r2,r4,r3,r0); storekeys(r2,r4,r3,r0, 24); loadkeys(r2,r4,r3,r0, 20);</div><div class='del'>-	S5(r2,r4,r3,r0,r1); storekeys(r1,r2,r4,r0, 20); loadkeys(r1,r2,r4,r0, 16);</div><div class='del'>-	S6(r1,r2,r4,r0,r3); storekeys(r4,r3,r2,r0, 16); loadkeys(r4,r3,r2,r0, 12);</div><div class='del'>-	S7(r4,r3,r2,r0,r1); storekeys(r1,r2,r0,r4, 12); loadkeys(r1,r2,r0,r4,  8);</div><div class='del'>-	S0(r1,r2,r0,r4,r3); storekeys(r0,r2,r4,r1,  8); loadkeys(r0,r2,r4,r1,  4);</div><div class='del'>-	S1(r0,r2,r4,r1,r3); storekeys(r3,r4,r1,r0,  4); loadkeys(r3,r4,r1,r0,  0);</div><div class='del'>-	S2(r3,r4,r1,r0,r2); storekeys(r2,r4,r3,r0,  0); loadkeys(r2,r4,r3,r0, -4);</div><div class='del'>-	S3(r2,r4,r3,r0,r1); storekeys(r0,r1,r4,r2, -4); loadkeys(r0,r1,r4,r2, -8);</div><div class='del'>-	S4(r0,r1,r4,r2,r3); storekeys(r1,r4,r2,r3, -8); loadkeys(r1,r4,r2,r3,-12);</div><div class='del'>-	S5(r1,r4,r2,r3,r0); storekeys(r0,r1,r4,r3,-12); loadkeys(r0,r1,r4,r3,-16);</div><div class='del'>-	S6(r0,r1,r4,r3,r2); storekeys(r4,r2,r1,r3,-16); loadkeys(r4,r2,r1,r3,-20);</div><div class='del'>-	S7(r4,r2,r1,r3,r0); storekeys(r0,r1,r3,r4,-20); loadkeys(r0,r1,r3,r4,-24);</div><div class='del'>-	S0(r0,r1,r3,r4,r2); storekeys(r3,r1,r4,r0,-24); loadkeys(r3,r1,r4,r0,-28);</div><div class='del'>-	k -= 50;</div><div class='del'>-	S1(r3,r1,r4,r0,r2); storekeys(r2,r4,r0,r3, 22); loadkeys(r2,r4,r0,r3, 18);</div><div class='del'>-	S2(r2,r4,r0,r3,r1); storekeys(r1,r4,r2,r3, 18); loadkeys(r1,r4,r2,r3, 14);</div><div class='del'>-	S3(r1,r4,r2,r3,r0); storekeys(r3,r0,r4,r1, 14); loadkeys(r3,r0,r4,r1, 10);</div><div class='del'>-	S4(r3,r0,r4,r1,r2); storekeys(r0,r4,r1,r2, 10); loadkeys(r0,r4,r1,r2,  6);</div><div class='del'>-	S5(r0,r4,r1,r2,r3); storekeys(r3,r0,r4,r2,  6); loadkeys(r3,r0,r4,r2,  2);</div><div class='del'>-	S6(r3,r0,r4,r2,r1); storekeys(r4,r1,r0,r2,  2); loadkeys(r4,r1,r0,r2, -2);</div><div class='del'>-	S7(r4,r1,r0,r2,r3); storekeys(r3,r0,r2,r4, -2); loadkeys(r3,r0,r2,r4, -6);</div><div class='del'>-	S0(r3,r0,r2,r4,r1); storekeys(r2,r0,r4,r3, -6); loadkeys(r2,r0,r4,r3,-10);</div><div class='del'>-	S1(r2,r0,r4,r3,r1); storekeys(r1,r4,r3,r2,-10); loadkeys(r1,r4,r3,r2,-14);</div><div class='del'>-	S2(r1,r4,r3,r2,r0); storekeys(r0,r4,r1,r2,-14); loadkeys(r0,r4,r1,r2,-18);</div><div class='del'>-	S3(r0,r4,r1,r2,r3); storekeys(r2,r3,r4,r0,-18); loadkeys(r2,r3,r4,r0,-22);</div><div class='del'>-	k -= 50;</div><div class='del'>-	S4(r2,r3,r4,r0,r1); storekeys(r3,r4,r0,r1, 28); loadkeys(r3,r4,r0,r1, 24);</div><div class='del'>-	S5(r3,r4,r0,r1,r2); storekeys(r2,r3,r4,r1, 24); loadkeys(r2,r3,r4,r1, 20);</div><div class='del'>-	S6(r2,r3,r4,r1,r0); storekeys(r4,r0,r3,r1, 20); loadkeys(r4,r0,r3,r1, 16);</div><div class='del'>-	S7(r4,r0,r3,r1,r2); storekeys(r2,r3,r1,r4, 16); loadkeys(r2,r3,r1,r4, 12);</div><div class='del'>-	S0(r2,r3,r1,r4,r0); storekeys(r1,r3,r4,r2, 12); loadkeys(r1,r3,r4,r2,  8);</div><div class='del'>-	S1(r1,r3,r4,r2,r0); storekeys(r0,r4,r2,r1,  8); loadkeys(r0,r4,r2,r1,  4);</div><div class='del'>-	S2(r0,r4,r2,r1,r3); storekeys(r3,r4,r0,r1,  4); loadkeys(r3,r4,r0,r1,  0);</div><div class='del'>-	S3(r3,r4,r0,r1,r2); storekeys(r1,r2,r4,r3,  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 serpent_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='del'>-{</div><div class='del'>-	struct serpent_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	const u32</div><div class='del'>-		*k = ctx-&gt;expkey;</div><div class='del'>-	const __le32 *s = (const __le32 *)src;</div><div class='del'>-	__le32	*d = (__le32 *)dst;</div><div class='del'>-	u32	r0, r1, r2, r3, r4;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Note: The conversions between u8* and u32* might cause trouble</div><div class='del'>- * on architectures with stricter alignment rules than x86</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-	r0 = le32_to_cpu(s[0]);</div><div class='del'>-	r1 = le32_to_cpu(s[1]);</div><div class='del'>-	r2 = le32_to_cpu(s[2]);</div><div class='del'>-	r3 = le32_to_cpu(s[3]);</div><div class='del'>-</div><div class='del'>-				 K(r0,r1,r2,r3,0);</div><div class='del'>-	S0(r0,r1,r2,r3,r4);	LK(r2,r1,r3,r0,r4,1);</div><div class='del'>-	S1(r2,r1,r3,r0,r4);	LK(r4,r3,r0,r2,r1,2);</div><div class='del'>-	S2(r4,r3,r0,r2,r1);	LK(r1,r3,r4,r2,r0,3);</div><div class='del'>-	S3(r1,r3,r4,r2,r0);	LK(r2,r0,r3,r1,r4,4);</div><div class='del'>-	S4(r2,r0,r3,r1,r4);	LK(r0,r3,r1,r4,r2,5);</div><div class='del'>-	S5(r0,r3,r1,r4,r2);	LK(r2,r0,r3,r4,r1,6);</div><div class='del'>-	S6(r2,r0,r3,r4,r1);	LK(r3,r1,r0,r4,r2,7);</div><div class='del'>-	S7(r3,r1,r0,r4,r2);	LK(r2,r0,r4,r3,r1,8);</div><div class='del'>-	S0(r2,r0,r4,r3,r1);	LK(r4,r0,r3,r2,r1,9);</div><div class='del'>-	S1(r4,r0,r3,r2,r1);	LK(r1,r3,r2,r4,r0,10);</div><div class='del'>-	S2(r1,r3,r2,r4,r0);	LK(r0,r3,r1,r4,r2,11);</div><div class='del'>-	S3(r0,r3,r1,r4,r2);	LK(r4,r2,r3,r0,r1,12);</div><div class='del'>-	S4(r4,r2,r3,r0,r1);	LK(r2,r3,r0,r1,r4,13);</div><div class='del'>-	S5(r2,r3,r0,r1,r4);	LK(r4,r2,r3,r1,r0,14);</div><div class='del'>-	S6(r4,r2,r3,r1,r0);	LK(r3,r0,r2,r1,r4,15);</div><div class='del'>-	S7(r3,r0,r2,r1,r4);	LK(r4,r2,r1,r3,r0,16);</div><div class='del'>-	S0(r4,r2,r1,r3,r0);	LK(r1,r2,r3,r4,r0,17);</div><div class='del'>-	S1(r1,r2,r3,r4,r0);	LK(r0,r3,r4,r1,r2,18);</div><div class='del'>-	S2(r0,r3,r4,r1,r2);	LK(r2,r3,r0,r1,r4,19);</div><div class='del'>-	S3(r2,r3,r0,r1,r4);	LK(r1,r4,r3,r2,r0,20);</div><div class='del'>-	S4(r1,r4,r3,r2,r0);	LK(r4,r3,r2,r0,r1,21);</div><div class='del'>-	S5(r4,r3,r2,r0,r1);	LK(r1,r4,r3,r0,r2,22);</div><div class='del'>-	S6(r1,r4,r3,r0,r2);	LK(r3,r2,r4,r0,r1,23);</div><div class='del'>-	S7(r3,r2,r4,r0,r1);	LK(r1,r4,r0,r3,r2,24);</div><div class='del'>-	S0(r1,r4,r0,r3,r2);	LK(r0,r4,r3,r1,r2,25);</div><div class='del'>-	S1(r0,r4,r3,r1,r2);	LK(r2,r3,r1,r0,r4,26);</div><div class='del'>-	S2(r2,r3,r1,r0,r4);	LK(r4,r3,r2,r0,r1,27);</div><div class='del'>-	S3(r4,r3,r2,r0,r1);	LK(r0,r1,r3,r4,r2,28);</div><div class='del'>-	S4(r0,r1,r3,r4,r2);	LK(r1,r3,r4,r2,r0,29);</div><div class='del'>-	S5(r1,r3,r4,r2,r0);	LK(r0,r1,r3,r2,r4,30);</div><div class='del'>-	S6(r0,r1,r3,r2,r4);	LK(r3,r4,r1,r2,r0,31);</div><div class='del'>-	S7(r3,r4,r1,r2,r0);	 K(r0,r1,r2,r3,32);</div><div class='del'>-</div><div class='del'>-	d[0] = cpu_to_le32(r0);</div><div class='del'>-	d[1] = cpu_to_le32(r1);</div><div class='del'>-	d[2] = cpu_to_le32(r2);</div><div class='del'>-	d[3] = cpu_to_le32(r3);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void serpent_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='del'>-{</div><div class='del'>-	struct serpent_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	const u32</div><div class='del'>-		*k = ((struct serpent_ctx *)ctx)-&gt;expkey;</div><div class='del'>-	const __le32 *s = (const __le32 *)src;</div><div class='del'>-	__le32	*d = (__le32 *)dst;</div><div class='del'>-	u32	r0, r1, r2, r3, r4;</div><div class='del'>-</div><div class='del'>-	r0 = le32_to_cpu(s[0]);</div><div class='del'>-	r1 = le32_to_cpu(s[1]);</div><div class='del'>-	r2 = le32_to_cpu(s[2]);</div><div class='del'>-	r3 = le32_to_cpu(s[3]);</div><div class='del'>-</div><div class='del'>-				K(r0,r1,r2,r3,32);</div><div class='del'>-	SI7(r0,r1,r2,r3,r4);	KL(r1,r3,r0,r4,r2,31);</div><div class='del'>-	SI6(r1,r3,r0,r4,r2);	KL(r0,r2,r4,r1,r3,30);</div><div class='del'>-	SI5(r0,r2,r4,r1,r3);	KL(r2,r3,r0,r4,r1,29);</div><div class='del'>-	SI4(r2,r3,r0,r4,r1);	KL(r2,r0,r1,r4,r3,28);</div><div class='del'>-	SI3(r2,r0,r1,r4,r3);	KL(r1,r2,r3,r4,r0,27);</div><div class='del'>-	SI2(r1,r2,r3,r4,r0);	KL(r2,r0,r4,r3,r1,26);</div><div class='del'>-	SI1(r2,r0,r4,r3,r1);	KL(r1,r0,r4,r3,r2,25);</div><div class='del'>-	SI0(r1,r0,r4,r3,r2);	KL(r4,r2,r0,r1,r3,24);</div><div class='del'>-	SI7(r4,r2,r0,r1,r3);	KL(r2,r1,r4,r3,r0,23);</div><div class='del'>-	SI6(r2,r1,r4,r3,r0);	KL(r4,r0,r3,r2,r1,22);</div><div class='del'>-	SI5(r4,r0,r3,r2,r1);	KL(r0,r1,r4,r3,r2,21);</div><div class='del'>-	SI4(r0,r1,r4,r3,r2);	KL(r0,r4,r2,r3,r1,20);</div><div class='del'>-	SI3(r0,r4,r2,r3,r1);	KL(r2,r0,r1,r3,r4,19);</div><div class='del'>-	SI2(r2,r0,r1,r3,r4);	KL(r0,r4,r3,r1,r2,18);</div><div class='del'>-	SI1(r0,r4,r3,r1,r2);	KL(r2,r4,r3,r1,r0,17);</div><div class='del'>-	SI0(r2,r4,r3,r1,r0);	KL(r3,r0,r4,r2,r1,16);</div><div class='del'>-	SI7(r3,r0,r4,r2,r1);	KL(r0,r2,r3,r1,r4,15);</div><div class='del'>-	SI6(r0,r2,r3,r1,r4);	KL(r3,r4,r1,r0,r2,14);</div><div class='del'>-	SI5(r3,r4,r1,r0,r2);	KL(r4,r2,r3,r1,r0,13);</div><div class='del'>-	SI4(r4,r2,r3,r1,r0);	KL(r4,r3,r0,r1,r2,12);</div><div class='del'>-	SI3(r4,r3,r0,r1,r2);	KL(r0,r4,r2,r1,r3,11);</div><div class='del'>-	SI2(r0,r4,r2,r1,r3);	KL(r4,r3,r1,r2,r0,10);</div><div class='del'>-	SI1(r4,r3,r1,r2,r0);	KL(r0,r3,r1,r2,r4,9);</div><div class='del'>-	SI0(r0,r3,r1,r2,r4);	KL(r1,r4,r3,r0,r2,8);</div><div class='del'>-	SI7(r1,r4,r3,r0,r2);	KL(r4,r0,r1,r2,r3,7);</div><div class='del'>-	SI6(r4,r0,r1,r2,r3);	KL(r1,r3,r2,r4,r0,6);</div><div class='del'>-	SI5(r1,r3,r2,r4,r0);	KL(r3,r0,r1,r2,r4,5);</div><div class='del'>-	SI4(r3,r0,r1,r2,r4);	KL(r3,r1,r4,r2,r0,4);</div><div class='del'>-	SI3(r3,r1,r4,r2,r0);	KL(r4,r3,r0,r2,r1,3);</div><div class='del'>-	SI2(r4,r3,r0,r2,r1);	KL(r3,r1,r2,r0,r4,2);</div><div class='del'>-	SI1(r3,r1,r2,r0,r4);	KL(r4,r1,r2,r0,r3,1);</div><div class='del'>-	SI0(r4,r1,r2,r0,r3);	K(r2,r3,r1,r4,0);</div><div class='del'>-</div><div class='del'>-	d[0] = cpu_to_le32(r2);</div><div class='del'>-	d[1] = cpu_to_le32(r3);</div><div class='del'>-	d[2] = cpu_to_le32(r1);</div><div class='del'>-	d[3] = cpu_to_le32(r4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct crypto_alg serpent_alg = {</div><div class='del'>-	.cra_name		=	"serpent",</div><div class='del'>-	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,</div><div class='del'>-	.cra_blocksize		=	SERPENT_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		=	sizeof(struct serpent_ctx),</div><div class='del'>-	.cra_alignmask		=	3,</div><div class='del'>-	.cra_module		=	THIS_MODULE,</div><div class='del'>-	.cra_list		=	LIST_HEAD_INIT(serpent_alg.cra_list),</div><div class='del'>-	.cra_u			=	{ .cipher = {</div><div class='del'>-	.cia_min_keysize	=	SERPENT_MIN_KEY_SIZE,</div><div class='del'>-	.cia_max_keysize	=	SERPENT_MAX_KEY_SIZE,</div><div class='del'>-	.cia_setkey   		= 	serpent_setkey,</div><div class='del'>-	.cia_encrypt 		=	serpent_encrypt,</div><div class='del'>-	.cia_decrypt  		=	serpent_decrypt } }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int tnepres_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='del'>-			  unsigned int keylen)</div><div class='del'>-{</div><div class='del'>-	u8 rev_key[SERPENT_MAX_KEY_SIZE];</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; keylen; ++i)</div><div class='del'>-		rev_key[keylen - i - 1] = key[i];</div><div class='del'>- </div><div class='del'>-	return serpent_setkey(tfm, rev_key, keylen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tnepres_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='del'>-{</div><div class='del'>-	const u32 * const s = (const u32 * const)src;</div><div class='del'>-	u32 * const d = (u32 * const)dst;</div><div class='del'>-</div><div class='del'>-	u32 rs[4], rd[4];</div><div class='del'>-</div><div class='del'>-	rs[0] = swab32(s[3]);</div><div class='del'>-	rs[1] = swab32(s[2]);</div><div class='del'>-	rs[2] = swab32(s[1]);</div><div class='del'>-	rs[3] = swab32(s[0]);</div><div class='del'>-</div><div class='del'>-	serpent_encrypt(tfm, (u8 *)rd, (u8 *)rs);</div><div class='del'>-</div><div class='del'>-	d[0] = swab32(rd[3]);</div><div class='del'>-	d[1] = swab32(rd[2]);</div><div class='del'>-	d[2] = swab32(rd[1]);</div><div class='del'>-	d[3] = swab32(rd[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tnepres_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='del'>-{</div><div class='del'>-	const u32 * const s = (const u32 * const)src;</div><div class='del'>-	u32 * const d = (u32 * const)dst;</div><div class='del'>-</div><div class='del'>-	u32 rs[4], rd[4];</div><div class='del'>-</div><div class='del'>-	rs[0] = swab32(s[3]);</div><div class='del'>-	rs[1] = swab32(s[2]);</div><div class='del'>-	rs[2] = swab32(s[1]);</div><div class='del'>-	rs[3] = swab32(s[0]);</div><div class='del'>-</div><div class='del'>-	serpent_decrypt(tfm, (u8 *)rd, (u8 *)rs);</div><div class='del'>-</div><div class='del'>-	d[0] = swab32(rd[3]);</div><div class='del'>-	d[1] = swab32(rd[2]);</div><div class='del'>-	d[2] = swab32(rd[1]);</div><div class='del'>-	d[3] = swab32(rd[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct crypto_alg tnepres_alg = {</div><div class='del'>-	.cra_name		=	"tnepres",</div><div class='del'>-	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,</div><div class='del'>-	.cra_blocksize		=	SERPENT_BLOCK_SIZE,</div><div class='del'>-	.cra_ctxsize		=	sizeof(struct serpent_ctx),</div><div class='del'>-	.cra_alignmask		=	3,</div><div class='del'>-	.cra_module		=	THIS_MODULE,</div><div class='del'>-	.cra_list		=	LIST_HEAD_INIT(serpent_alg.cra_list),</div><div class='del'>-	.cra_u			=	{ .cipher = {</div><div class='del'>-	.cia_min_keysize	=	SERPENT_MIN_KEY_SIZE,</div><div class='del'>-	.cia_max_keysize	=	SERPENT_MAX_KEY_SIZE,</div><div class='del'>-	.cia_setkey   		= 	tnepres_setkey,</div><div class='del'>-	.cia_encrypt 		=	tnepres_encrypt,</div><div class='del'>-	.cia_decrypt  		=	tnepres_decrypt } }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init serpent_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret = crypto_register_alg(&amp;serpent_alg);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = crypto_register_alg(&amp;tnepres_alg);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		crypto_unregister_alg(&amp;serpent_alg);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit serpent_mod_fini(void)</div><div class='del'>-{</div><div class='del'>-	crypto_unregister_alg(&amp;tnepres_alg);</div><div class='del'>-	crypto_unregister_alg(&amp;serpent_alg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(serpent_mod_init);</div><div class='del'>-module_exit(serpent_mod_fini);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("Serpent and tnepres (kerneli compatible serpent reversed) Cipher Algorithm");</div><div class='del'>-MODULE_AUTHOR("Dag Arne Osvik &lt;osvik@ii.uib.no&gt;");</div><div class='del'>-MODULE_ALIAS("tnepres");</div><div class='head'>diff --git a/crypto/serpent_generic.c b/crypto/serpent_generic.c<br/>new file mode 100644<br/>index 000000000000..8f32cf35e5ce<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/crypto/serpent_generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>crypto/serpent_generic.c</a></div><div class='hunk'>@@ -0,0 +1,684 @@</div><div class='add'>+/*</div><div class='add'>+ * Cryptographic API.</div><div class='add'>+ *</div><div class='add'>+ * Serpent Cipher Algorithm.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2002 Dag Arne Osvik &lt;osvik@ii.uib.no&gt;</div><div class='add'>+ *               2003 Herbert Valerio Riedel &lt;hvr@gnu.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * Added tnepres support:</div><div class='add'>+ *		Ruben Jesus Garcia Hernandez &lt;ruben@ugr.es&gt;, 18.10.2004</div><div class='add'>+ *              Based on code by hvr</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 &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;crypto/serpent.h&gt;</div><div class='add'>+</div><div class='add'>+/* Key is padded to the maximum of 256 bits before round key generation.</div><div class='add'>+ * Any key length &lt;= 256 bits (32 bytes) is allowed by the algorithm.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PHI 0x9e3779b9UL</div><div class='add'>+</div><div class='add'>+#define keyiter(a, b, c, d, i, j) \</div><div class='add'>+	({ b ^= d; b ^= c; b ^= a; b ^= PHI ^ i; b = rol32(b, 11); k[j] = b; })</div><div class='add'>+</div><div class='add'>+#define loadkeys(x0, x1, x2, x3, i) \</div><div class='add'>+	({ x0 = k[i]; x1 = k[i+1]; x2 = k[i+2]; x3 = k[i+3]; })</div><div class='add'>+</div><div class='add'>+#define storekeys(x0, x1, x2, x3, i) \</div><div class='add'>+	({ k[i] = x0; k[i+1] = x1; k[i+2] = x2; k[i+3] = x3; })</div><div class='add'>+</div><div class='add'>+#define store_and_load_keys(x0, x1, x2, x3, s, l) \</div><div class='add'>+	({ storekeys(x0, x1, x2, x3, s); loadkeys(x0, x1, x2, x3, l); })</div><div class='add'>+</div><div class='add'>+#define K(x0, x1, x2, x3, i) ({				\</div><div class='add'>+	x3 ^= k[4*(i)+3];        x2 ^= k[4*(i)+2];	\</div><div class='add'>+	x1 ^= k[4*(i)+1];        x0 ^= k[4*(i)+0];	\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define LK(x0, x1, x2, x3, x4, i) ({					   \</div><div class='add'>+							x0 = rol32(x0, 13);\</div><div class='add'>+	x2 = rol32(x2, 3);	x1 ^= x0;		x4  = x0 &lt;&lt; 3;	   \</div><div class='add'>+	x3 ^= x2;		x1 ^= x2;				   \</div><div class='add'>+	x1 = rol32(x1, 1);	x3 ^= x4;				   \</div><div class='add'>+	x3 = rol32(x3, 7);	x4  = x1;				   \</div><div class='add'>+	x0 ^= x1;		x4 &lt;&lt;= 7;		x2 ^= x3;	   \</div><div class='add'>+	x0 ^= x3;		x2 ^= x4;		x3 ^= k[4*i+3];	   \</div><div class='add'>+	x1 ^= k[4*i+1];		x0 = rol32(x0, 5);	x2 = rol32(x2, 22);\</div><div class='add'>+	x0 ^= k[4*i+0];		x2 ^= k[4*i+2];				   \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define KL(x0, x1, x2, x3, x4, i) ({					   \</div><div class='add'>+	x0 ^= k[4*i+0];		x1 ^= k[4*i+1];		x2 ^= k[4*i+2];	   \</div><div class='add'>+	x3 ^= k[4*i+3];		x0 = ror32(x0, 5);	x2 = ror32(x2, 22);\</div><div class='add'>+	x4 =  x1;		x2 ^= x3;		x0 ^= x3;	   \</div><div class='add'>+	x4 &lt;&lt;= 7;		x0 ^= x1;		x1 = ror32(x1, 1); \</div><div class='add'>+	x2 ^= x4;		x3 = ror32(x3, 7);	x4 = x0 &lt;&lt; 3;	   \</div><div class='add'>+	x1 ^= x0;		x3 ^= x4;		x0 = ror32(x0, 13);\</div><div class='add'>+	x1 ^= x2;		x3 ^= x2;		x2 = ror32(x2, 3); \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define S0(x0, x1, x2, x3, x4) ({			\</div><div class='add'>+					x4  = x3;	\</div><div class='add'>+	x3 |= x0;	x0 ^= x4;	x4 ^= x2;	\</div><div class='add'>+	x4 = ~x4;	x3 ^= x1;	x1 &amp;= x0;	\</div><div class='add'>+	x1 ^= x4;	x2 ^= x0;	x0 ^= x3;	\</div><div class='add'>+	x4 |= x0;	x0 ^= x2;	x2 &amp;= x1;	\</div><div class='add'>+	x3 ^= x2;	x1 = ~x1;	x2 ^= x4;	\</div><div class='add'>+	x1 ^= x2;					\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define S1(x0, x1, x2, x3, x4) ({			\</div><div class='add'>+					x4  = x1;	\</div><div class='add'>+	x1 ^= x0;	x0 ^= x3;	x3 = ~x3;	\</div><div class='add'>+	x4 &amp;= x1;	x0 |= x1;	x3 ^= x2;	\</div><div class='add'>+	x0 ^= x3;	x1 ^= x3;	x3 ^= x4;	\</div><div class='add'>+	x1 |= x4;	x4 ^= x2;	x2 &amp;= x0;	\</div><div class='add'>+	x2 ^= x1;	x1 |= x0;	x0 = ~x0;	\</div><div class='add'>+	x0 ^= x2;	x4 ^= x1;			\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define S2(x0, x1, x2, x3, x4) ({			\</div><div class='add'>+					x3 = ~x3;	\</div><div class='add'>+	x1 ^= x0;	x4  = x0;	x0 &amp;= x2;	\</div><div class='add'>+	x0 ^= x3;	x3 |= x4;	x2 ^= x1;	\</div><div class='add'>+	x3 ^= x1;	x1 &amp;= x0;	x0 ^= x2;	\</div><div class='add'>+	x2 &amp;= x3;	x3 |= x1;	x0 = ~x0;	\</div><div class='add'>+	x3 ^= x0;	x4 ^= x0;	x0 ^= x2;	\</div><div class='add'>+	x1 |= x2;					\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define S3(x0, x1, x2, x3, x4) ({			\</div><div class='add'>+					x4  = x1;	\</div><div class='add'>+	x1 ^= x3;	x3 |= x0;	x4 &amp;= x0;	\</div><div class='add'>+	x0 ^= x2;	x2 ^= x1;	x1 &amp;= x3;	\</div><div class='add'>+	x2 ^= x3;	x0 |= x4;	x4 ^= x3;	\</div><div class='add'>+	x1 ^= x0;	x0 &amp;= x3;	x3 &amp;= x4;	\</div><div class='add'>+	x3 ^= x2;	x4 |= x1;	x2 &amp;= x1;	\</div><div class='add'>+	x4 ^= x3;	x0 ^= x3;	x3 ^= x2;	\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define S4(x0, x1, x2, x3, x4) ({			\</div><div class='add'>+					x4  = x3;	\</div><div class='add'>+	x3 &amp;= x0;	x0 ^= x4;			\</div><div class='add'>+	x3 ^= x2;	x2 |= x4;	x0 ^= x1;	\</div><div class='add'>+	x4 ^= x3;	x2 |= x0;			\</div><div class='add'>+	x2 ^= x1;	x1 &amp;= x0;			\</div><div class='add'>+	x1 ^= x4;	x4 &amp;= x2;	x2 ^= x3;	\</div><div class='add'>+	x4 ^= x0;	x3 |= x1;	x1 = ~x1;	\</div><div class='add'>+	x3 ^= x0;					\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define S5(x0, x1, x2, x3, x4) ({			\</div><div class='add'>+	x4  = x1;	x1 |= x0;			\</div><div class='add'>+	x2 ^= x1;	x3 = ~x3;	x4 ^= x0;	\</div><div class='add'>+	x0 ^= x2;	x1 &amp;= x4;	x4 |= x3;	\</div><div class='add'>+	x4 ^= x0;	x0 &amp;= x3;	x1 ^= x3;	\</div><div class='add'>+	x3 ^= x2;	x0 ^= x1;	x2 &amp;= x4;	\</div><div class='add'>+	x1 ^= x2;	x2 &amp;= x0;			\</div><div class='add'>+	x3 ^= x2;					\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define S6(x0, x1, x2, x3, x4) ({			\</div><div class='add'>+					x4  = x1;	\</div><div class='add'>+	x3 ^= x0;	x1 ^= x2;	x2 ^= x0;	\</div><div class='add'>+	x0 &amp;= x3;	x1 |= x3;	x4 = ~x4;	\</div><div class='add'>+	x0 ^= x1;	x1 ^= x2;			\</div><div class='add'>+	x3 ^= x4;	x4 ^= x0;	x2 &amp;= x0;	\</div><div class='add'>+	x4 ^= x1;	x2 ^= x3;	x3 &amp;= x1;	\</div><div class='add'>+	x3 ^= x0;	x1 ^= x2;			\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define S7(x0, x1, x2, x3, x4) ({			\</div><div class='add'>+					x1 = ~x1;	\</div><div class='add'>+	x4  = x1;	x0 = ~x0;	x1 &amp;= x2;	\</div><div class='add'>+	x1 ^= x3;	x3 |= x4;	x4 ^= x2;	\</div><div class='add'>+	x2 ^= x3;	x3 ^= x0;	x0 |= x1;	\</div><div class='add'>+	x2 &amp;= x0;	x0 ^= x4;	x4 ^= x3;	\</div><div class='add'>+	x3 &amp;= x0;	x4 ^= x1;			\</div><div class='add'>+	x2 ^= x4;	x3 ^= x1;	x4 |= x0;	\</div><div class='add'>+	x4 ^= x1;					\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define SI0(x0, x1, x2, x3, x4) ({			\</div><div class='add'>+			x4  = x3;	x1 ^= x0;	\</div><div class='add'>+	x3 |= x1;	x4 ^= x1;	x0 = ~x0;	\</div><div class='add'>+	x2 ^= x3;	x3 ^= x0;	x0 &amp;= x1;	\</div><div class='add'>+	x0 ^= x2;	x2 &amp;= x3;	x3 ^= x4;	\</div><div class='add'>+	x2 ^= x3;	x1 ^= x3;	x3 &amp;= x0;	\</div><div class='add'>+	x1 ^= x0;	x0 ^= x2;	x4 ^= x3;	\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define SI1(x0, x1, x2, x3, x4) ({			\</div><div class='add'>+	x1 ^= x3;	x4  = x0;			\</div><div class='add'>+	x0 ^= x2;	x2 = ~x2;	x4 |= x1;	\</div><div class='add'>+	x4 ^= x3;	x3 &amp;= x1;	x1 ^= x2;	\</div><div class='add'>+	x2 &amp;= x4;	x4 ^= x1;	x1 |= x3;	\</div><div class='add'>+	x3 ^= x0;	x2 ^= x0;	x0 |= x4;	\</div><div class='add'>+	x2 ^= x4;	x1 ^= x0;			\</div><div class='add'>+	x4 ^= x1;					\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define SI2(x0, x1, x2, x3, x4) ({			\</div><div class='add'>+	x2 ^= x1;	x4  = x3;	x3 = ~x3;	\</div><div class='add'>+	x3 |= x2;	x2 ^= x4;	x4 ^= x0;	\</div><div class='add'>+	x3 ^= x1;	x1 |= x2;	x2 ^= x0;	\</div><div class='add'>+	x1 ^= x4;	x4 |= x3;	x2 ^= x3;	\</div><div class='add'>+	x4 ^= x2;	x2 &amp;= x1;			\</div><div class='add'>+	x2 ^= x3;	x3 ^= x4;	x4 ^= x0;	\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define SI3(x0, x1, x2, x3, x4) ({			\</div><div class='add'>+					x2 ^= x1;	\</div><div class='add'>+	x4  = x1;	x1 &amp;= x2;			\</div><div class='add'>+	x1 ^= x0;	x0 |= x4;	x4 ^= x3;	\</div><div class='add'>+	x0 ^= x3;	x3 |= x1;	x1 ^= x2;	\</div><div class='add'>+	x1 ^= x3;	x0 ^= x2;	x2 ^= x3;	\</div><div class='add'>+	x3 &amp;= x1;	x1 ^= x0;	x0 &amp;= x2;	\</div><div class='add'>+	x4 ^= x3;	x3 ^= x0;	x0 ^= x1;	\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define SI4(x0, x1, x2, x3, x4) ({			\</div><div class='add'>+	x2 ^= x3;	x4  = x0;	x0 &amp;= x1;	\</div><div class='add'>+	x0 ^= x2;	x2 |= x3;	x4 = ~x4;	\</div><div class='add'>+	x1 ^= x0;	x0 ^= x2;	x2 &amp;= x4;	\</div><div class='add'>+	x2 ^= x0;	x0 |= x4;			\</div><div class='add'>+	x0 ^= x3;	x3 &amp;= x2;			\</div><div class='add'>+	x4 ^= x3;	x3 ^= x1;	x1 &amp;= x0;	\</div><div class='add'>+	x4 ^= x1;	x0 ^= x3;			\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define SI5(x0, x1, x2, x3, x4) ({			\</div><div class='add'>+			x4  = x1;	x1 |= x2;	\</div><div class='add'>+	x2 ^= x4;	x1 ^= x3;	x3 &amp;= x4;	\</div><div class='add'>+	x2 ^= x3;	x3 |= x0;	x0 = ~x0;	\</div><div class='add'>+	x3 ^= x2;	x2 |= x0;	x4 ^= x1;	\</div><div class='add'>+	x2 ^= x4;	x4 &amp;= x0;	x0 ^= x1;	\</div><div class='add'>+	x1 ^= x3;	x0 &amp;= x2;	x2 ^= x3;	\</div><div class='add'>+	x0 ^= x2;	x2 ^= x4;	x4 ^= x3;	\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define SI6(x0, x1, x2, x3, x4) ({			\</div><div class='add'>+			x0 ^= x2;			\</div><div class='add'>+	x4  = x0;	x0 &amp;= x3;	x2 ^= x3;	\</div><div class='add'>+	x0 ^= x2;	x3 ^= x1;	x2 |= x4;	\</div><div class='add'>+	x2 ^= x3;	x3 &amp;= x0;	x0 = ~x0;	\</div><div class='add'>+	x3 ^= x1;	x1 &amp;= x2;	x4 ^= x0;	\</div><div class='add'>+	x3 ^= x4;	x4 ^= x2;	x0 ^= x1;	\</div><div class='add'>+	x2 ^= x0;					\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define SI7(x0, x1, x2, x3, x4) ({			\</div><div class='add'>+	x4  = x3;	x3 &amp;= x0;	x0 ^= x2;	\</div><div class='add'>+	x2 |= x4;	x4 ^= x1;	x0 = ~x0;	\</div><div class='add'>+	x1 |= x3;	x4 ^= x0;	x0 &amp;= x2;	\</div><div class='add'>+	x0 ^= x1;	x1 &amp;= x2;	x3 ^= x2;	\</div><div class='add'>+	x4 ^= x3;	x2 &amp;= x3;	x3 |= x0;	\</div><div class='add'>+	x1 ^= x4;	x3 ^= x4;	x4 &amp;= x0;	\</div><div class='add'>+	x4 ^= x2;					\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+int __serpent_setkey(struct serpent_ctx *ctx, const u8 *key,</div><div class='add'>+		     unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	u32 *k = ctx-&gt;expkey;</div><div class='add'>+	u8  *k8 = (u8 *)k;</div><div class='add'>+	u32 r0, r1, r2, r3, r4;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Copy key, add padding */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; keylen; ++i)</div><div class='add'>+		k8[i] = key[i];</div><div class='add'>+	if (i &lt; SERPENT_MAX_KEY_SIZE)</div><div class='add'>+		k8[i++] = 1;</div><div class='add'>+	while (i &lt; SERPENT_MAX_KEY_SIZE)</div><div class='add'>+		k8[i++] = 0;</div><div class='add'>+</div><div class='add'>+	/* Expand key using polynomial */</div><div class='add'>+</div><div class='add'>+	r0 = le32_to_cpu(k[3]);</div><div class='add'>+	r1 = le32_to_cpu(k[4]);</div><div class='add'>+	r2 = le32_to_cpu(k[5]);</div><div class='add'>+	r3 = le32_to_cpu(k[6]);</div><div class='add'>+	r4 = le32_to_cpu(k[7]);</div><div class='add'>+</div><div class='add'>+	keyiter(le32_to_cpu(k[0]), r0, r4, r2, 0, 0);</div><div class='add'>+	keyiter(le32_to_cpu(k[1]), r1, r0, r3, 1, 1);</div><div class='add'>+	keyiter(le32_to_cpu(k[2]), r2, r1, r4, 2, 2);</div><div class='add'>+	keyiter(le32_to_cpu(k[3]), r3, r2, r0, 3, 3);</div><div class='add'>+	keyiter(le32_to_cpu(k[4]), r4, r3, r1, 4, 4);</div><div class='add'>+	keyiter(le32_to_cpu(k[5]), r0, r4, r2, 5, 5);</div><div class='add'>+	keyiter(le32_to_cpu(k[6]), r1, r0, r3, 6, 6);</div><div class='add'>+	keyiter(le32_to_cpu(k[7]), r2, r1, r4, 7, 7);</div><div class='add'>+</div><div class='add'>+	keyiter(k[0], r3, r2, r0, 8, 8);</div><div class='add'>+	keyiter(k[1], r4, r3, r1, 9, 9);</div><div class='add'>+	keyiter(k[2], r0, r4, r2, 10, 10);</div><div class='add'>+	keyiter(k[3], r1, r0, r3, 11, 11);</div><div class='add'>+	keyiter(k[4], r2, r1, r4, 12, 12);</div><div class='add'>+	keyiter(k[5], r3, r2, r0, 13, 13);</div><div class='add'>+	keyiter(k[6], r4, r3, r1, 14, 14);</div><div class='add'>+	keyiter(k[7], r0, r4, r2, 15, 15);</div><div class='add'>+	keyiter(k[8], r1, r0, r3, 16, 16);</div><div class='add'>+	keyiter(k[9], r2, r1, r4, 17, 17);</div><div class='add'>+	keyiter(k[10], r3, r2, r0, 18, 18);</div><div class='add'>+	keyiter(k[11], r4, r3, r1, 19, 19);</div><div class='add'>+	keyiter(k[12], r0, r4, r2, 20, 20);</div><div class='add'>+	keyiter(k[13], r1, r0, r3, 21, 21);</div><div class='add'>+	keyiter(k[14], r2, r1, r4, 22, 22);</div><div class='add'>+	keyiter(k[15], r3, r2, r0, 23, 23);</div><div class='add'>+	keyiter(k[16], r4, r3, r1, 24, 24);</div><div class='add'>+	keyiter(k[17], r0, r4, r2, 25, 25);</div><div class='add'>+	keyiter(k[18], r1, r0, r3, 26, 26);</div><div class='add'>+	keyiter(k[19], r2, r1, r4, 27, 27);</div><div class='add'>+	keyiter(k[20], r3, r2, r0, 28, 28);</div><div class='add'>+	keyiter(k[21], r4, r3, r1, 29, 29);</div><div class='add'>+	keyiter(k[22], r0, r4, r2, 30, 30);</div><div class='add'>+	keyiter(k[23], r1, r0, r3, 31, 31);</div><div class='add'>+</div><div class='add'>+	k += 50;</div><div class='add'>+</div><div class='add'>+	keyiter(k[-26], r2, r1, r4, 32, -18);</div><div class='add'>+	keyiter(k[-25], r3, r2, r0, 33, -17);</div><div class='add'>+	keyiter(k[-24], r4, r3, r1, 34, -16);</div><div class='add'>+	keyiter(k[-23], r0, r4, r2, 35, -15);</div><div class='add'>+	keyiter(k[-22], r1, r0, r3, 36, -14);</div><div class='add'>+	keyiter(k[-21], r2, r1, r4, 37, -13);</div><div class='add'>+	keyiter(k[-20], r3, r2, r0, 38, -12);</div><div class='add'>+	keyiter(k[-19], r4, r3, r1, 39, -11);</div><div class='add'>+	keyiter(k[-18], r0, r4, r2, 40, -10);</div><div class='add'>+	keyiter(k[-17], r1, r0, r3, 41, -9);</div><div class='add'>+	keyiter(k[-16], r2, r1, r4, 42, -8);</div><div class='add'>+	keyiter(k[-15], r3, r2, r0, 43, -7);</div><div class='add'>+	keyiter(k[-14], r4, r3, r1, 44, -6);</div><div class='add'>+	keyiter(k[-13], r0, r4, r2, 45, -5);</div><div class='add'>+	keyiter(k[-12], r1, r0, r3, 46, -4);</div><div class='add'>+	keyiter(k[-11], r2, r1, r4, 47, -3);</div><div class='add'>+	keyiter(k[-10], r3, r2, r0, 48, -2);</div><div class='add'>+	keyiter(k[-9], r4, r3, r1, 49, -1);</div><div class='add'>+	keyiter(k[-8], r0, r4, r2, 50, 0);</div><div class='add'>+	keyiter(k[-7], r1, r0, r3, 51, 1);</div><div class='add'>+	keyiter(k[-6], r2, r1, r4, 52, 2);</div><div class='add'>+	keyiter(k[-5], r3, r2, r0, 53, 3);</div><div class='add'>+	keyiter(k[-4], r4, r3, r1, 54, 4);</div><div class='add'>+	keyiter(k[-3], r0, r4, r2, 55, 5);</div><div class='add'>+	keyiter(k[-2], r1, r0, r3, 56, 6);</div><div class='add'>+	keyiter(k[-1], r2, r1, r4, 57, 7);</div><div class='add'>+	keyiter(k[0], r3, r2, r0, 58, 8);</div><div class='add'>+	keyiter(k[1], r4, r3, r1, 59, 9);</div><div class='add'>+	keyiter(k[2], r0, r4, r2, 60, 10);</div><div class='add'>+	keyiter(k[3], r1, r0, r3, 61, 11);</div><div class='add'>+	keyiter(k[4], r2, r1, r4, 62, 12);</div><div class='add'>+	keyiter(k[5], r3, r2, r0, 63, 13);</div><div class='add'>+	keyiter(k[6], r4, r3, r1, 64, 14);</div><div class='add'>+	keyiter(k[7], r0, r4, r2, 65, 15);</div><div class='add'>+	keyiter(k[8], r1, r0, r3, 66, 16);</div><div class='add'>+	keyiter(k[9], r2, r1, r4, 67, 17);</div><div class='add'>+	keyiter(k[10], r3, r2, r0, 68, 18);</div><div class='add'>+	keyiter(k[11], r4, r3, r1, 69, 19);</div><div class='add'>+	keyiter(k[12], r0, r4, r2, 70, 20);</div><div class='add'>+	keyiter(k[13], r1, r0, r3, 71, 21);</div><div class='add'>+	keyiter(k[14], r2, r1, r4, 72, 22);</div><div class='add'>+	keyiter(k[15], r3, r2, r0, 73, 23);</div><div class='add'>+	keyiter(k[16], r4, r3, r1, 74, 24);</div><div class='add'>+	keyiter(k[17], r0, r4, r2, 75, 25);</div><div class='add'>+	keyiter(k[18], r1, r0, r3, 76, 26);</div><div class='add'>+	keyiter(k[19], r2, r1, r4, 77, 27);</div><div class='add'>+	keyiter(k[20], r3, r2, r0, 78, 28);</div><div class='add'>+	keyiter(k[21], r4, r3, r1, 79, 29);</div><div class='add'>+	keyiter(k[22], r0, r4, r2, 80, 30);</div><div class='add'>+	keyiter(k[23], r1, r0, r3, 81, 31);</div><div class='add'>+</div><div class='add'>+	k += 50;</div><div class='add'>+</div><div class='add'>+	keyiter(k[-26], r2, r1, r4, 82, -18);</div><div class='add'>+	keyiter(k[-25], r3, r2, r0, 83, -17);</div><div class='add'>+	keyiter(k[-24], r4, r3, r1, 84, -16);</div><div class='add'>+	keyiter(k[-23], r0, r4, r2, 85, -15);</div><div class='add'>+	keyiter(k[-22], r1, r0, r3, 86, -14);</div><div class='add'>+	keyiter(k[-21], r2, r1, r4, 87, -13);</div><div class='add'>+	keyiter(k[-20], r3, r2, r0, 88, -12);</div><div class='add'>+	keyiter(k[-19], r4, r3, r1, 89, -11);</div><div class='add'>+	keyiter(k[-18], r0, r4, r2, 90, -10);</div><div class='add'>+	keyiter(k[-17], r1, r0, r3, 91, -9);</div><div class='add'>+	keyiter(k[-16], r2, r1, r4, 92, -8);</div><div class='add'>+	keyiter(k[-15], r3, r2, r0, 93, -7);</div><div class='add'>+	keyiter(k[-14], r4, r3, r1, 94, -6);</div><div class='add'>+	keyiter(k[-13], r0, r4, r2, 95, -5);</div><div class='add'>+	keyiter(k[-12], r1, r0, r3, 96, -4);</div><div class='add'>+	keyiter(k[-11], r2, r1, r4, 97, -3);</div><div class='add'>+	keyiter(k[-10], r3, r2, r0, 98, -2);</div><div class='add'>+	keyiter(k[-9], r4, r3, r1, 99, -1);</div><div class='add'>+	keyiter(k[-8], r0, r4, r2, 100, 0);</div><div class='add'>+	keyiter(k[-7], r1, r0, r3, 101, 1);</div><div class='add'>+	keyiter(k[-6], r2, r1, r4, 102, 2);</div><div class='add'>+	keyiter(k[-5], r3, r2, r0, 103, 3);</div><div class='add'>+	keyiter(k[-4], r4, r3, r1, 104, 4);</div><div class='add'>+	keyiter(k[-3], r0, r4, r2, 105, 5);</div><div class='add'>+	keyiter(k[-2], r1, r0, r3, 106, 6);</div><div class='add'>+	keyiter(k[-1], r2, r1, r4, 107, 7);</div><div class='add'>+	keyiter(k[0], r3, r2, r0, 108, 8);</div><div class='add'>+	keyiter(k[1], r4, r3, r1, 109, 9);</div><div class='add'>+	keyiter(k[2], r0, r4, r2, 110, 10);</div><div class='add'>+	keyiter(k[3], r1, r0, r3, 111, 11);</div><div class='add'>+	keyiter(k[4], r2, r1, r4, 112, 12);</div><div class='add'>+	keyiter(k[5], r3, r2, r0, 113, 13);</div><div class='add'>+	keyiter(k[6], r4, r3, r1, 114, 14);</div><div class='add'>+	keyiter(k[7], r0, r4, r2, 115, 15);</div><div class='add'>+	keyiter(k[8], r1, r0, r3, 116, 16);</div><div class='add'>+	keyiter(k[9], r2, r1, r4, 117, 17);</div><div class='add'>+	keyiter(k[10], r3, r2, r0, 118, 18);</div><div class='add'>+	keyiter(k[11], r4, r3, r1, 119, 19);</div><div class='add'>+	keyiter(k[12], r0, r4, r2, 120, 20);</div><div class='add'>+	keyiter(k[13], r1, r0, r3, 121, 21);</div><div class='add'>+	keyiter(k[14], r2, r1, r4, 122, 22);</div><div class='add'>+	keyiter(k[15], r3, r2, r0, 123, 23);</div><div class='add'>+	keyiter(k[16], r4, r3, r1, 124, 24);</div><div class='add'>+	keyiter(k[17], r0, r4, r2, 125, 25);</div><div class='add'>+	keyiter(k[18], r1, r0, r3, 126, 26);</div><div class='add'>+	keyiter(k[19], r2, r1, r4, 127, 27);</div><div class='add'>+	keyiter(k[20], r3, r2, r0, 128, 28);</div><div class='add'>+	keyiter(k[21], r4, r3, r1, 129, 29);</div><div class='add'>+	keyiter(k[22], r0, r4, r2, 130, 30);</div><div class='add'>+	keyiter(k[23], r1, r0, r3, 131, 31);</div><div class='add'>+</div><div class='add'>+	/* Apply S-boxes */</div><div class='add'>+</div><div class='add'>+	S3(r3, r4, r0, r1, r2); store_and_load_keys(r1, r2, r4, r3, 28, 24);</div><div class='add'>+	S4(r1, r2, r4, r3, r0); store_and_load_keys(r2, r4, r3, r0, 24, 20);</div><div class='add'>+	S5(r2, r4, r3, r0, r1); store_and_load_keys(r1, r2, r4, r0, 20, 16);</div><div class='add'>+	S6(r1, r2, r4, r0, r3); store_and_load_keys(r4, r3, r2, r0, 16, 12);</div><div class='add'>+	S7(r4, r3, r2, r0, r1); store_and_load_keys(r1, r2, r0, r4, 12, 8);</div><div class='add'>+	S0(r1, r2, r0, r4, r3); store_and_load_keys(r0, r2, r4, r1, 8, 4);</div><div class='add'>+	S1(r0, r2, r4, r1, r3); store_and_load_keys(r3, r4, r1, r0, 4, 0);</div><div class='add'>+	S2(r3, r4, r1, r0, r2); store_and_load_keys(r2, r4, r3, r0, 0, -4);</div><div class='add'>+	S3(r2, r4, r3, r0, r1); store_and_load_keys(r0, r1, r4, r2, -4, -8);</div><div class='add'>+	S4(r0, r1, r4, r2, r3); store_and_load_keys(r1, r4, r2, r3, -8, -12);</div><div class='add'>+	S5(r1, r4, r2, r3, r0); store_and_load_keys(r0, r1, r4, r3, -12, -16);</div><div class='add'>+	S6(r0, r1, r4, r3, r2); store_and_load_keys(r4, r2, r1, r3, -16, -20);</div><div class='add'>+	S7(r4, r2, r1, r3, r0); store_and_load_keys(r0, r1, r3, r4, -20, -24);</div><div class='add'>+	S0(r0, r1, r3, r4, r2); store_and_load_keys(r3, r1, r4, r0, -24, -28);</div><div class='add'>+	k -= 50;</div><div class='add'>+	S1(r3, r1, r4, r0, r2); store_and_load_keys(r2, r4, r0, r3, 22, 18);</div><div class='add'>+	S2(r2, r4, r0, r3, r1); store_and_load_keys(r1, r4, r2, r3, 18, 14);</div><div class='add'>+	S3(r1, r4, r2, r3, r0); store_and_load_keys(r3, r0, r4, r1, 14, 10);</div><div class='add'>+	S4(r3, r0, r4, r1, r2); store_and_load_keys(r0, r4, r1, r2, 10, 6);</div><div class='add'>+	S5(r0, r4, r1, r2, r3); store_and_load_keys(r3, r0, r4, r2, 6, 2);</div><div class='add'>+	S6(r3, r0, r4, r2, r1); store_and_load_keys(r4, r1, r0, r2, 2, -2);</div><div class='add'>+	S7(r4, r1, r0, r2, r3); store_and_load_keys(r3, r0, r2, r4, -2, -6);</div><div class='add'>+	S0(r3, r0, r2, r4, r1); store_and_load_keys(r2, r0, r4, r3, -6, -10);</div><div class='add'>+	S1(r2, r0, r4, r3, r1); store_and_load_keys(r1, r4, r3, r2, -10, -14);</div><div class='add'>+	S2(r1, r4, r3, r2, r0); store_and_load_keys(r0, r4, r1, r2, -14, -18);</div><div class='add'>+	S3(r0, r4, r1, r2, r3); store_and_load_keys(r2, r3, r4, r0, -18, -22);</div><div class='add'>+	k -= 50;</div><div class='add'>+	S4(r2, r3, r4, r0, r1); store_and_load_keys(r3, r4, r0, r1, 28, 24);</div><div class='add'>+	S5(r3, r4, r0, r1, r2); store_and_load_keys(r2, r3, r4, r1, 24, 20);</div><div class='add'>+	S6(r2, r3, r4, r1, r0); store_and_load_keys(r4, r0, r3, r1, 20, 16);</div><div class='add'>+	S7(r4, r0, r3, r1, r2); store_and_load_keys(r2, r3, r1, r4, 16, 12);</div><div class='add'>+	S0(r2, r3, r1, r4, r0); store_and_load_keys(r1, r3, r4, r2, 12, 8);</div><div class='add'>+	S1(r1, r3, r4, r2, r0); store_and_load_keys(r0, r4, r2, r1, 8, 4);</div><div class='add'>+	S2(r0, r4, r2, r1, r3); store_and_load_keys(r3, r4, r0, r1, 4, 0);</div><div class='add'>+	S3(r3, r4, r0, r1, r2); storekeys(r1, r2, r4, r3, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__serpent_setkey);</div><div class='add'>+</div><div class='add'>+int serpent_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	return __serpent_setkey(crypto_tfm_ctx(tfm), key, keylen);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(serpent_setkey);</div><div class='add'>+</div><div class='add'>+void __serpent_encrypt(struct serpent_ctx *ctx, u8 *dst, const u8 *src)</div><div class='add'>+{</div><div class='add'>+	const u32 *k = ctx-&gt;expkey;</div><div class='add'>+	const __le32 *s = (const __le32 *)src;</div><div class='add'>+	__le32	*d = (__le32 *)dst;</div><div class='add'>+	u32	r0, r1, r2, r3, r4;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Note: The conversions between u8* and u32* might cause trouble</div><div class='add'>+ * on architectures with stricter alignment rules than x86</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+	r0 = le32_to_cpu(s[0]);</div><div class='add'>+	r1 = le32_to_cpu(s[1]);</div><div class='add'>+	r2 = le32_to_cpu(s[2]);</div><div class='add'>+	r3 = le32_to_cpu(s[3]);</div><div class='add'>+</div><div class='add'>+					K(r0, r1, r2, r3, 0);</div><div class='add'>+	S0(r0, r1, r2, r3, r4);		LK(r2, r1, r3, r0, r4, 1);</div><div class='add'>+	S1(r2, r1, r3, r0, r4);		LK(r4, r3, r0, r2, r1, 2);</div><div class='add'>+	S2(r4, r3, r0, r2, r1);		LK(r1, r3, r4, r2, r0, 3);</div><div class='add'>+	S3(r1, r3, r4, r2, r0);		LK(r2, r0, r3, r1, r4, 4);</div><div class='add'>+	S4(r2, r0, r3, r1, r4);		LK(r0, r3, r1, r4, r2, 5);</div><div class='add'>+	S5(r0, r3, r1, r4, r2);		LK(r2, r0, r3, r4, r1, 6);</div><div class='add'>+	S6(r2, r0, r3, r4, r1);		LK(r3, r1, r0, r4, r2, 7);</div><div class='add'>+	S7(r3, r1, r0, r4, r2);		LK(r2, r0, r4, r3, r1, 8);</div><div class='add'>+	S0(r2, r0, r4, r3, r1);		LK(r4, r0, r3, r2, r1, 9);</div><div class='add'>+	S1(r4, r0, r3, r2, r1);		LK(r1, r3, r2, r4, r0, 10);</div><div class='add'>+	S2(r1, r3, r2, r4, r0);		LK(r0, r3, r1, r4, r2, 11);</div><div class='add'>+	S3(r0, r3, r1, r4, r2);		LK(r4, r2, r3, r0, r1, 12);</div><div class='add'>+	S4(r4, r2, r3, r0, r1);		LK(r2, r3, r0, r1, r4, 13);</div><div class='add'>+	S5(r2, r3, r0, r1, r4);		LK(r4, r2, r3, r1, r0, 14);</div><div class='add'>+	S6(r4, r2, r3, r1, r0);		LK(r3, r0, r2, r1, r4, 15);</div><div class='add'>+	S7(r3, r0, r2, r1, r4);		LK(r4, r2, r1, r3, r0, 16);</div><div class='add'>+	S0(r4, r2, r1, r3, r0);		LK(r1, r2, r3, r4, r0, 17);</div><div class='add'>+	S1(r1, r2, r3, r4, r0);		LK(r0, r3, r4, r1, r2, 18);</div><div class='add'>+	S2(r0, r3, r4, r1, r2);		LK(r2, r3, r0, r1, r4, 19);</div><div class='add'>+	S3(r2, r3, r0, r1, r4);		LK(r1, r4, r3, r2, r0, 20);</div><div class='add'>+	S4(r1, r4, r3, r2, r0);		LK(r4, r3, r2, r0, r1, 21);</div><div class='add'>+	S5(r4, r3, r2, r0, r1);		LK(r1, r4, r3, r0, r2, 22);</div><div class='add'>+	S6(r1, r4, r3, r0, r2);		LK(r3, r2, r4, r0, r1, 23);</div><div class='add'>+	S7(r3, r2, r4, r0, r1);		LK(r1, r4, r0, r3, r2, 24);</div><div class='add'>+	S0(r1, r4, r0, r3, r2);		LK(r0, r4, r3, r1, r2, 25);</div><div class='add'>+	S1(r0, r4, r3, r1, r2);		LK(r2, r3, r1, r0, r4, 26);</div><div class='add'>+	S2(r2, r3, r1, r0, r4);		LK(r4, r3, r2, r0, r1, 27);</div><div class='add'>+	S3(r4, r3, r2, r0, r1);		LK(r0, r1, r3, r4, r2, 28);</div><div class='add'>+	S4(r0, r1, r3, r4, r2);		LK(r1, r3, r4, r2, r0, 29);</div><div class='add'>+	S5(r1, r3, r4, r2, r0);		LK(r0, r1, r3, r2, r4, 30);</div><div class='add'>+	S6(r0, r1, r3, r2, r4);		LK(r3, r4, r1, r2, r0, 31);</div><div class='add'>+	S7(r3, r4, r1, r2, r0);		K(r0, r1, r2, r3, 32);</div><div class='add'>+</div><div class='add'>+	d[0] = cpu_to_le32(r0);</div><div class='add'>+	d[1] = cpu_to_le32(r1);</div><div class='add'>+	d[2] = cpu_to_le32(r2);</div><div class='add'>+	d[3] = cpu_to_le32(r3);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__serpent_encrypt);</div><div class='add'>+</div><div class='add'>+static void serpent_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='add'>+{</div><div class='add'>+	struct serpent_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	__serpent_encrypt(ctx, dst, src);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __serpent_decrypt(struct serpent_ctx *ctx, u8 *dst, const u8 *src)</div><div class='add'>+{</div><div class='add'>+	const u32 *k = ctx-&gt;expkey;</div><div class='add'>+	const __le32 *s = (const __le32 *)src;</div><div class='add'>+	__le32	*d = (__le32 *)dst;</div><div class='add'>+	u32	r0, r1, r2, r3, r4;</div><div class='add'>+</div><div class='add'>+	r0 = le32_to_cpu(s[0]);</div><div class='add'>+	r1 = le32_to_cpu(s[1]);</div><div class='add'>+	r2 = le32_to_cpu(s[2]);</div><div class='add'>+	r3 = le32_to_cpu(s[3]);</div><div class='add'>+</div><div class='add'>+					K(r0, r1, r2, r3, 32);</div><div class='add'>+	SI7(r0, r1, r2, r3, r4);	KL(r1, r3, r0, r4, r2, 31);</div><div class='add'>+	SI6(r1, r3, r0, r4, r2);	KL(r0, r2, r4, r1, r3, 30);</div><div class='add'>+	SI5(r0, r2, r4, r1, r3);	KL(r2, r3, r0, r4, r1, 29);</div><div class='add'>+	SI4(r2, r3, r0, r4, r1);	KL(r2, r0, r1, r4, r3, 28);</div><div class='add'>+	SI3(r2, r0, r1, r4, r3);	KL(r1, r2, r3, r4, r0, 27);</div><div class='add'>+	SI2(r1, r2, r3, r4, r0);	KL(r2, r0, r4, r3, r1, 26);</div><div class='add'>+	SI1(r2, r0, r4, r3, r1);	KL(r1, r0, r4, r3, r2, 25);</div><div class='add'>+	SI0(r1, r0, r4, r3, r2);	KL(r4, r2, r0, r1, r3, 24);</div><div class='add'>+	SI7(r4, r2, r0, r1, r3);	KL(r2, r1, r4, r3, r0, 23);</div><div class='add'>+	SI6(r2, r1, r4, r3, r0);	KL(r4, r0, r3, r2, r1, 22);</div><div class='add'>+	SI5(r4, r0, r3, r2, r1);	KL(r0, r1, r4, r3, r2, 21);</div><div class='add'>+	SI4(r0, r1, r4, r3, r2);	KL(r0, r4, r2, r3, r1, 20);</div><div class='add'>+	SI3(r0, r4, r2, r3, r1);	KL(r2, r0, r1, r3, r4, 19);</div><div class='add'>+	SI2(r2, r0, r1, r3, r4);	KL(r0, r4, r3, r1, r2, 18);</div><div class='add'>+	SI1(r0, r4, r3, r1, r2);	KL(r2, r4, r3, r1, r0, 17);</div><div class='add'>+	SI0(r2, r4, r3, r1, r0);	KL(r3, r0, r4, r2, r1, 16);</div><div class='add'>+	SI7(r3, r0, r4, r2, r1);	KL(r0, r2, r3, r1, r4, 15);</div><div class='add'>+	SI6(r0, r2, r3, r1, r4);	KL(r3, r4, r1, r0, r2, 14);</div><div class='add'>+	SI5(r3, r4, r1, r0, r2);	KL(r4, r2, r3, r1, r0, 13);</div><div class='add'>+	SI4(r4, r2, r3, r1, r0);	KL(r4, r3, r0, r1, r2, 12);</div><div class='add'>+	SI3(r4, r3, r0, r1, r2);	KL(r0, r4, r2, r1, r3, 11);</div><div class='add'>+	SI2(r0, r4, r2, r1, r3);	KL(r4, r3, r1, r2, r0, 10);</div><div class='add'>+	SI1(r4, r3, r1, r2, r0);	KL(r0, r3, r1, r2, r4, 9);</div><div class='add'>+	SI0(r0, r3, r1, r2, r4);	KL(r1, r4, r3, r0, r2, 8);</div><div class='add'>+	SI7(r1, r4, r3, r0, r2);	KL(r4, r0, r1, r2, r3, 7);</div><div class='add'>+	SI6(r4, r0, r1, r2, r3);	KL(r1, r3, r2, r4, r0, 6);</div><div class='add'>+	SI5(r1, r3, r2, r4, r0);	KL(r3, r0, r1, r2, r4, 5);</div><div class='add'>+	SI4(r3, r0, r1, r2, r4);	KL(r3, r1, r4, r2, r0, 4);</div><div class='add'>+	SI3(r3, r1, r4, r2, r0);	KL(r4, r3, r0, r2, r1, 3);</div><div class='add'>+	SI2(r4, r3, r0, r2, r1);	KL(r3, r1, r2, r0, r4, 2);</div><div class='add'>+	SI1(r3, r1, r2, r0, r4);	KL(r4, r1, r2, r0, r3, 1);</div><div class='add'>+	SI0(r4, r1, r2, r0, r3);	K(r2, r3, r1, r4, 0);</div><div class='add'>+</div><div class='add'>+	d[0] = cpu_to_le32(r2);</div><div class='add'>+	d[1] = cpu_to_le32(r3);</div><div class='add'>+	d[2] = cpu_to_le32(r1);</div><div class='add'>+	d[3] = cpu_to_le32(r4);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__serpent_decrypt);</div><div class='add'>+</div><div class='add'>+static void serpent_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='add'>+{</div><div class='add'>+	struct serpent_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='add'>+	__serpent_decrypt(ctx, dst, src);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg serpent_alg = {</div><div class='add'>+	.cra_name		=	"serpent",</div><div class='add'>+	.cra_driver_name	=	"serpent-generic",</div><div class='add'>+	.cra_priority		=	100,</div><div class='add'>+	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,</div><div class='add'>+	.cra_blocksize		=	SERPENT_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize		=	sizeof(struct serpent_ctx),</div><div class='add'>+	.cra_alignmask		=	3,</div><div class='add'>+	.cra_module		=	THIS_MODULE,</div><div class='add'>+	.cra_list		=	LIST_HEAD_INIT(serpent_alg.cra_list),</div><div class='add'>+	.cra_u			=	{ .cipher = {</div><div class='add'>+	.cia_min_keysize	=	SERPENT_MIN_KEY_SIZE,</div><div class='add'>+	.cia_max_keysize	=	SERPENT_MAX_KEY_SIZE,</div><div class='add'>+	.cia_setkey		=	serpent_setkey,</div><div class='add'>+	.cia_encrypt		=	serpent_encrypt,</div><div class='add'>+	.cia_decrypt		=	serpent_decrypt } }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tnepres_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+			  unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	u8 rev_key[SERPENT_MAX_KEY_SIZE];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; keylen; ++i)</div><div class='add'>+		rev_key[keylen - i - 1] = key[i];</div><div class='add'>+</div><div class='add'>+	return serpent_setkey(tfm, rev_key, keylen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tnepres_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='add'>+{</div><div class='add'>+	const u32 * const s = (const u32 * const)src;</div><div class='add'>+	u32 * const d = (u32 * const)dst;</div><div class='add'>+</div><div class='add'>+	u32 rs[4], rd[4];</div><div class='add'>+</div><div class='add'>+	rs[0] = swab32(s[3]);</div><div class='add'>+	rs[1] = swab32(s[2]);</div><div class='add'>+	rs[2] = swab32(s[1]);</div><div class='add'>+	rs[3] = swab32(s[0]);</div><div class='add'>+</div><div class='add'>+	serpent_encrypt(tfm, (u8 *)rd, (u8 *)rs);</div><div class='add'>+</div><div class='add'>+	d[0] = swab32(rd[3]);</div><div class='add'>+	d[1] = swab32(rd[2]);</div><div class='add'>+	d[2] = swab32(rd[1]);</div><div class='add'>+	d[3] = swab32(rd[0]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tnepres_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='add'>+{</div><div class='add'>+	const u32 * const s = (const u32 * const)src;</div><div class='add'>+	u32 * const d = (u32 * const)dst;</div><div class='add'>+</div><div class='add'>+	u32 rs[4], rd[4];</div><div class='add'>+</div><div class='add'>+	rs[0] = swab32(s[3]);</div><div class='add'>+	rs[1] = swab32(s[2]);</div><div class='add'>+	rs[2] = swab32(s[1]);</div><div class='add'>+	rs[3] = swab32(s[0]);</div><div class='add'>+</div><div class='add'>+	serpent_decrypt(tfm, (u8 *)rd, (u8 *)rs);</div><div class='add'>+</div><div class='add'>+	d[0] = swab32(rd[3]);</div><div class='add'>+	d[1] = swab32(rd[2]);</div><div class='add'>+	d[2] = swab32(rd[1]);</div><div class='add'>+	d[3] = swab32(rd[0]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct crypto_alg tnepres_alg = {</div><div class='add'>+	.cra_name		=	"tnepres",</div><div class='add'>+	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,</div><div class='add'>+	.cra_blocksize		=	SERPENT_BLOCK_SIZE,</div><div class='add'>+	.cra_ctxsize		=	sizeof(struct serpent_ctx),</div><div class='add'>+	.cra_alignmask		=	3,</div><div class='add'>+	.cra_module		=	THIS_MODULE,</div><div class='add'>+	.cra_list		=	LIST_HEAD_INIT(serpent_alg.cra_list),</div><div class='add'>+	.cra_u			=	{ .cipher = {</div><div class='add'>+	.cia_min_keysize	=	SERPENT_MIN_KEY_SIZE,</div><div class='add'>+	.cia_max_keysize	=	SERPENT_MAX_KEY_SIZE,</div><div class='add'>+	.cia_setkey		=	tnepres_setkey,</div><div class='add'>+	.cia_encrypt		=	tnepres_encrypt,</div><div class='add'>+	.cia_decrypt		=	tnepres_decrypt } }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init serpent_mod_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret = crypto_register_alg(&amp;serpent_alg);</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 = crypto_register_alg(&amp;tnepres_alg);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		crypto_unregister_alg(&amp;serpent_alg);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit serpent_mod_fini(void)</div><div class='add'>+{</div><div class='add'>+	crypto_unregister_alg(&amp;tnepres_alg);</div><div class='add'>+	crypto_unregister_alg(&amp;serpent_alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(serpent_mod_init);</div><div class='add'>+module_exit(serpent_mod_fini);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Serpent and tnepres (kerneli compatible serpent reversed) Cipher Algorithm");</div><div class='add'>+MODULE_AUTHOR("Dag Arne Osvik &lt;osvik@ii.uib.no&gt;");</div><div class='add'>+MODULE_ALIAS("tnepres");</div><div class='add'>+MODULE_ALIAS("serpent");</div><div class='head'>diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c<br/>index 0c4e80f34651..7736a9f05aba 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/tcrypt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/tcrypt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/tcrypt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>crypto/tcrypt.c</a></div><div class='hunk'>@@ -719,6 +719,207 @@ out:</div><div class='ctx'> 	crypto_free_ahash(tfm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int do_one_acipher_op(struct ablkcipher_request *req, int ret)</div><div class='add'>+{</div><div class='add'>+	if (ret == -EINPROGRESS || ret == -EBUSY) {</div><div class='add'>+		struct tcrypt_result *tr = req-&gt;base.data;</div><div class='add'>+</div><div class='add'>+		ret = wait_for_completion_interruptible(&amp;tr-&gt;completion);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = tr-&gt;err;</div><div class='add'>+		INIT_COMPLETION(tr-&gt;completion);</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 test_acipher_jiffies(struct ablkcipher_request *req, int enc,</div><div class='add'>+				int blen, int sec)</div><div class='add'>+{</div><div class='add'>+	unsigned long start, end;</div><div class='add'>+	int bcount;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for (start = jiffies, end = start + sec * HZ, bcount = 0;</div><div class='add'>+	     time_before(jiffies, end); bcount++) {</div><div class='add'>+		if (enc)</div><div class='add'>+			ret = do_one_acipher_op(req,</div><div class='add'>+						crypto_ablkcipher_encrypt(req));</div><div class='add'>+		else</div><div class='add'>+			ret = do_one_acipher_op(req,</div><div class='add'>+						crypto_ablkcipher_decrypt(req));</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_cont("%d operations in %d seconds (%ld bytes)\n",</div><div class='add'>+		bcount, sec, (long)bcount * blen);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int test_acipher_cycles(struct ablkcipher_request *req, int enc,</div><div class='add'>+			       int blen)</div><div class='add'>+{</div><div class='add'>+	unsigned long cycles = 0;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Warm-up run. */</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		if (enc)</div><div class='add'>+			ret = do_one_acipher_op(req,</div><div class='add'>+						crypto_ablkcipher_encrypt(req));</div><div class='add'>+		else</div><div class='add'>+			ret = do_one_acipher_op(req,</div><div class='add'>+						crypto_ablkcipher_decrypt(req));</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The real thing. */</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		cycles_t start, end;</div><div class='add'>+</div><div class='add'>+		start = get_cycles();</div><div class='add'>+		if (enc)</div><div class='add'>+			ret = do_one_acipher_op(req,</div><div class='add'>+						crypto_ablkcipher_encrypt(req));</div><div class='add'>+		else</div><div class='add'>+			ret = do_one_acipher_op(req,</div><div class='add'>+						crypto_ablkcipher_decrypt(req));</div><div class='add'>+		end = get_cycles();</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		cycles += end - start;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		pr_cont("1 operation in %lu cycles (%d bytes)\n",</div><div class='add'>+			(cycles + 4) / 8, blen);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_acipher_speed(const char *algo, int enc, unsigned int sec,</div><div class='add'>+			       struct cipher_speed_template *template,</div><div class='add'>+			       unsigned int tcount, u8 *keysize)</div><div class='add'>+{</div><div class='add'>+	unsigned int ret, i, j, iv_len;</div><div class='add'>+	struct tcrypt_result tresult;</div><div class='add'>+	const char *key;</div><div class='add'>+	char iv[128];</div><div class='add'>+	struct ablkcipher_request *req;</div><div class='add'>+	struct crypto_ablkcipher *tfm;</div><div class='add'>+	const char *e;</div><div class='add'>+	u32 *b_size;</div><div class='add'>+</div><div class='add'>+	if (enc == ENCRYPT)</div><div class='add'>+		e = "encryption";</div><div class='add'>+	else</div><div class='add'>+		e = "decryption";</div><div class='add'>+</div><div class='add'>+	pr_info("\ntesting speed of async %s %s\n", algo, e);</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;tresult.completion);</div><div class='add'>+</div><div class='add'>+	tfm = crypto_alloc_ablkcipher(algo, 0, 0);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(tfm)) {</div><div class='add'>+		pr_err("failed to load transform for %s: %ld\n", algo,</div><div class='add'>+		       PTR_ERR(tfm));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req = ablkcipher_request_alloc(tfm, GFP_KERNEL);</div><div class='add'>+	if (!req) {</div><div class='add'>+		pr_err("tcrypt: skcipher: Failed to allocate request for %s\n",</div><div class='add'>+		       algo);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ablkcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,</div><div class='add'>+					tcrypt_complete, &amp;tresult);</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	do {</div><div class='add'>+		b_size = block_sizes;</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			struct scatterlist sg[TVMEMSIZE];</div><div class='add'>+</div><div class='add'>+			if ((*keysize + *b_size) &gt; TVMEMSIZE * PAGE_SIZE) {</div><div class='add'>+				pr_err("template (%u) too big for "</div><div class='add'>+				       "tvmem (%lu)\n", *keysize + *b_size,</div><div class='add'>+				       TVMEMSIZE * PAGE_SIZE);</div><div class='add'>+				goto out_free_req;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			pr_info("test %u (%d bit key, %d byte blocks): ", i,</div><div class='add'>+				*keysize * 8, *b_size);</div><div class='add'>+</div><div class='add'>+			memset(tvmem[0], 0xff, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+			/* set key, plain text and IV */</div><div class='add'>+			key = tvmem[0];</div><div class='add'>+			for (j = 0; j &lt; tcount; j++) {</div><div class='add'>+				if (template[j].klen == *keysize) {</div><div class='add'>+					key = template[j].key;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			crypto_ablkcipher_clear_flags(tfm, ~0);</div><div class='add'>+</div><div class='add'>+			ret = crypto_ablkcipher_setkey(tfm, key, *keysize);</div><div class='add'>+			if (ret) {</div><div class='add'>+				pr_err("setkey() failed flags=%x\n",</div><div class='add'>+					crypto_ablkcipher_get_flags(tfm));</div><div class='add'>+				goto out_free_req;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			sg_init_table(sg, TVMEMSIZE);</div><div class='add'>+			sg_set_buf(sg, tvmem[0] + *keysize,</div><div class='add'>+				   PAGE_SIZE - *keysize);</div><div class='add'>+			for (j = 1; j &lt; TVMEMSIZE; j++) {</div><div class='add'>+				sg_set_buf(sg + j, tvmem[j], PAGE_SIZE);</div><div class='add'>+				memset(tvmem[j], 0xff, PAGE_SIZE);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			iv_len = crypto_ablkcipher_ivsize(tfm);</div><div class='add'>+			if (iv_len)</div><div class='add'>+				memset(&amp;iv, 0xff, iv_len);</div><div class='add'>+</div><div class='add'>+			ablkcipher_request_set_crypt(req, sg, sg, *b_size, iv);</div><div class='add'>+</div><div class='add'>+			if (sec)</div><div class='add'>+				ret = test_acipher_jiffies(req, enc,</div><div class='add'>+							   *b_size, sec);</div><div class='add'>+			else</div><div class='add'>+				ret = test_acipher_cycles(req, enc,</div><div class='add'>+							  *b_size);</div><div class='add'>+</div><div class='add'>+			if (ret) {</div><div class='add'>+				pr_err("%s() failed flags=%x\n", e,</div><div class='add'>+					crypto_ablkcipher_get_flags(tfm));</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			b_size++;</div><div class='add'>+			i++;</div><div class='add'>+		} while (*b_size);</div><div class='add'>+		keysize++;</div><div class='add'>+	} while (*keysize);</div><div class='add'>+</div><div class='add'>+out_free_req:</div><div class='add'>+	ablkcipher_request_free(req);</div><div class='add'>+out:</div><div class='add'>+	crypto_free_ablkcipher(tfm);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void test_available(void)</div><div class='ctx'> {</div><div class='ctx'> 	char **name = check;</div><div class='hunk'>@@ -789,10 +990,16 @@ static int do_test(int m)</div><div class='ctx'> 		ret += tcrypt_test("ecb(twofish)");</div><div class='ctx'> 		ret += tcrypt_test("cbc(twofish)");</div><div class='ctx'> 		ret += tcrypt_test("ctr(twofish)");</div><div class='add'>+		ret += tcrypt_test("lrw(twofish)");</div><div class='add'>+		ret += tcrypt_test("xts(twofish)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 9:</div><div class='ctx'> 		ret += tcrypt_test("ecb(serpent)");</div><div class='add'>+		ret += tcrypt_test("cbc(serpent)");</div><div class='add'>+		ret += tcrypt_test("ctr(serpent)");</div><div class='add'>+		ret += tcrypt_test("lrw(serpent)");</div><div class='add'>+		ret += tcrypt_test("xts(serpent)");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 10:</div><div class='hunk'>@@ -1045,6 +1252,14 @@ static int do_test(int m)</div><div class='ctx'> 				speed_template_16_24_32);</div><div class='ctx'> 		test_cipher_speed("ctr(twofish)", DECRYPT, sec, NULL, 0,</div><div class='ctx'> 				speed_template_16_24_32);</div><div class='add'>+		test_cipher_speed("lrw(twofish)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				speed_template_32_40_48);</div><div class='add'>+		test_cipher_speed("lrw(twofish)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				speed_template_32_40_48);</div><div class='add'>+		test_cipher_speed("xts(twofish)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				speed_template_32_48_64);</div><div class='add'>+		test_cipher_speed("xts(twofish)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				speed_template_32_48_64);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 203:</div><div class='hunk'>@@ -1089,6 +1304,29 @@ static int do_test(int m)</div><div class='ctx'> 				  speed_template_16_32);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case 207:</div><div class='add'>+		test_cipher_speed("ecb(serpent)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				  speed_template_16_32);</div><div class='add'>+		test_cipher_speed("ecb(serpent)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				  speed_template_16_32);</div><div class='add'>+		test_cipher_speed("cbc(serpent)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				  speed_template_16_32);</div><div class='add'>+		test_cipher_speed("cbc(serpent)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				  speed_template_16_32);</div><div class='add'>+		test_cipher_speed("ctr(serpent)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				  speed_template_16_32);</div><div class='add'>+		test_cipher_speed("ctr(serpent)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				  speed_template_16_32);</div><div class='add'>+		test_cipher_speed("lrw(serpent)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				  speed_template_32_48);</div><div class='add'>+		test_cipher_speed("lrw(serpent)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				  speed_template_32_48);</div><div class='add'>+		test_cipher_speed("xts(serpent)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				  speed_template_32_64);</div><div class='add'>+		test_cipher_speed("xts(serpent)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				  speed_template_32_64);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case 300:</div><div class='ctx'> 		/* fall through */</div><div class='ctx'> </div><div class='hunk'>@@ -1241,6 +1479,78 @@ static int do_test(int m)</div><div class='ctx'> 	case 499:</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case 500:</div><div class='add'>+		test_acipher_speed("ecb(aes)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_16_24_32);</div><div class='add'>+		test_acipher_speed("ecb(aes)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_16_24_32);</div><div class='add'>+		test_acipher_speed("cbc(aes)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_16_24_32);</div><div class='add'>+		test_acipher_speed("cbc(aes)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_16_24_32);</div><div class='add'>+		test_acipher_speed("lrw(aes)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_32_40_48);</div><div class='add'>+		test_acipher_speed("lrw(aes)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_32_40_48);</div><div class='add'>+		test_acipher_speed("xts(aes)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_32_48_64);</div><div class='add'>+		test_acipher_speed("xts(aes)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_32_48_64);</div><div class='add'>+		test_acipher_speed("ctr(aes)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_16_24_32);</div><div class='add'>+		test_acipher_speed("ctr(aes)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_16_24_32);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 501:</div><div class='add'>+		test_acipher_speed("ecb(des3_ede)", ENCRYPT, sec,</div><div class='add'>+				   des3_speed_template, DES3_SPEED_VECTORS,</div><div class='add'>+				   speed_template_24);</div><div class='add'>+		test_acipher_speed("ecb(des3_ede)", DECRYPT, sec,</div><div class='add'>+				   des3_speed_template, DES3_SPEED_VECTORS,</div><div class='add'>+				   speed_template_24);</div><div class='add'>+		test_acipher_speed("cbc(des3_ede)", ENCRYPT, sec,</div><div class='add'>+				   des3_speed_template, DES3_SPEED_VECTORS,</div><div class='add'>+				   speed_template_24);</div><div class='add'>+		test_acipher_speed("cbc(des3_ede)", DECRYPT, sec,</div><div class='add'>+				   des3_speed_template, DES3_SPEED_VECTORS,</div><div class='add'>+				   speed_template_24);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 502:</div><div class='add'>+		test_acipher_speed("ecb(des)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_8);</div><div class='add'>+		test_acipher_speed("ecb(des)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_8);</div><div class='add'>+		test_acipher_speed("cbc(des)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_8);</div><div class='add'>+		test_acipher_speed("cbc(des)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_8);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 503:</div><div class='add'>+		test_acipher_speed("ecb(serpent)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_16_32);</div><div class='add'>+		test_acipher_speed("ecb(serpent)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_16_32);</div><div class='add'>+		test_acipher_speed("cbc(serpent)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_16_32);</div><div class='add'>+		test_acipher_speed("cbc(serpent)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_16_32);</div><div class='add'>+		test_acipher_speed("ctr(serpent)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_16_32);</div><div class='add'>+		test_acipher_speed("ctr(serpent)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_16_32);</div><div class='add'>+		test_acipher_speed("lrw(serpent)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_32_48);</div><div class='add'>+		test_acipher_speed("lrw(serpent)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_32_48);</div><div class='add'>+		test_acipher_speed("xts(serpent)", ENCRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_32_64);</div><div class='add'>+		test_acipher_speed("xts(serpent)", DECRYPT, sec, NULL, 0,</div><div class='add'>+				   speed_template_32_64);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case 1000:</div><div class='ctx'> 		test_available();</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/crypto/tcrypt.h b/crypto/tcrypt.h<br/>index 10cb925132c9..5be1fc8c1ab3 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/tcrypt.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/tcrypt.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/tcrypt.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>crypto/tcrypt.h</a></div><div class='hunk'>@@ -51,7 +51,9 @@ static u8 speed_template_8_32[] = {8, 32, 0};</div><div class='ctx'> static u8 speed_template_16_32[] = {16, 32, 0};</div><div class='ctx'> static u8 speed_template_16_24_32[] = {16, 24, 32, 0};</div><div class='ctx'> static u8 speed_template_32_40_48[] = {32, 40, 48, 0};</div><div class='add'>+static u8 speed_template_32_48[] = {32, 48, 0};</div><div class='ctx'> static u8 speed_template_32_48_64[] = {32, 48, 64, 0};</div><div class='add'>+static u8 speed_template_32_64[] = {32, 64, 0};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Digest speed tests</div><div class='head'>diff --git a/crypto/testmgr.c b/crypto/testmgr.c<br/>index e91c1eb1722a..bb54b882d738 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/testmgr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/testmgr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/testmgr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>crypto/testmgr.c</a></div><div class='hunk'>@@ -1534,6 +1534,21 @@ static int alg_test_null(const struct alg_test_desc *desc,</div><div class='ctx'> /* Please keep this list sorted by algorithm name. */</div><div class='ctx'> static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 	{</div><div class='add'>+		.alg = "__cbc-serpent-sse2",</div><div class='add'>+		.test = alg_test_null,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = NULL,</div><div class='add'>+					.count = 0</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = NULL,</div><div class='add'>+					.count = 0</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='ctx'> 		.alg = "__driver-cbc-aes-aesni",</div><div class='ctx'> 		.test = alg_test_null,</div><div class='ctx'> 		.suite = {</div><div class='hunk'>@@ -1549,6 +1564,21 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='add'>+		.alg = "__driver-cbc-serpent-sse2",</div><div class='add'>+		.test = alg_test_null,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = NULL,</div><div class='add'>+					.count = 0</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = NULL,</div><div class='add'>+					.count = 0</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='ctx'> 		.alg = "__driver-ecb-aes-aesni",</div><div class='ctx'> 		.test = alg_test_null,</div><div class='ctx'> 		.suite = {</div><div class='hunk'>@@ -1564,6 +1594,21 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='add'>+		.alg = "__driver-ecb-serpent-sse2",</div><div class='add'>+		.test = alg_test_null,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = NULL,</div><div class='add'>+					.count = 0</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = NULL,</div><div class='add'>+					.count = 0</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='ctx'> 		.alg = "__ghash-pclmulqdqni",</div><div class='ctx'> 		.test = alg_test_null,</div><div class='ctx'> 		.suite = {</div><div class='hunk'>@@ -1675,6 +1720,21 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='add'>+		.alg = "cbc(serpent)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = serpent_cbc_enc_tv_template,</div><div class='add'>+					.count = SERPENT_CBC_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = serpent_cbc_dec_tv_template,</div><div class='add'>+					.count = SERPENT_CBC_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='ctx'> 		.alg = "cbc(twofish)",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='hunk'>@@ -1731,6 +1791,21 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='add'>+		.alg = "cryptd(__driver-ecb-serpent-sse2)",</div><div class='add'>+		.test = alg_test_null,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = NULL,</div><div class='add'>+					.count = 0</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = NULL,</div><div class='add'>+					.count = 0</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='ctx'> 		.alg = "cryptd(__ghash-pclmulqdqni)",</div><div class='ctx'> 		.test = alg_test_null,</div><div class='ctx'> 		.suite = {</div><div class='hunk'>@@ -1771,6 +1846,21 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='add'>+		.alg = "ctr(serpent)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = serpent_ctr_enc_tv_template,</div><div class='add'>+					.count = SERPENT_CTR_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = serpent_ctr_dec_tv_template,</div><div class='add'>+					.count = SERPENT_CTR_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='ctx'> 		.alg = "ctr(twofish)",</div><div class='ctx'> 		.test = alg_test_skcipher,</div><div class='ctx'> 		.suite = {</div><div class='hunk'>@@ -2207,6 +2297,36 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='add'>+		.alg = "lrw(serpent)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = serpent_lrw_enc_tv_template,</div><div class='add'>+					.count = SERPENT_LRW_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = serpent_lrw_dec_tv_template,</div><div class='add'>+					.count = SERPENT_LRW_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "lrw(twofish)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = tf_lrw_enc_tv_template,</div><div class='add'>+					.count = TF_LRW_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = tf_lrw_dec_tv_template,</div><div class='add'>+					.count = TF_LRW_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='ctx'> 		.alg = "lzo",</div><div class='ctx'> 		.test = alg_test_comp,</div><div class='ctx'> 		.suite = {</div><div class='hunk'>@@ -2514,6 +2634,36 @@ static const struct alg_test_desc alg_test_descs[] = {</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}, {</div><div class='add'>+		.alg = "xts(serpent)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = serpent_xts_enc_tv_template,</div><div class='add'>+					.count = SERPENT_XTS_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = serpent_xts_dec_tv_template,</div><div class='add'>+					.count = SERPENT_XTS_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='add'>+		.alg = "xts(twofish)",</div><div class='add'>+		.test = alg_test_skcipher,</div><div class='add'>+		.suite = {</div><div class='add'>+			.cipher = {</div><div class='add'>+				.enc = {</div><div class='add'>+					.vecs = tf_xts_enc_tv_template,</div><div class='add'>+					.count = TF_XTS_ENC_TEST_VECTORS</div><div class='add'>+				},</div><div class='add'>+				.dec = {</div><div class='add'>+					.vecs = tf_xts_dec_tv_template,</div><div class='add'>+					.count = TF_XTS_DEC_TEST_VECTORS</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}, {</div><div class='ctx'> 		.alg = "zlib",</div><div class='ctx'> 		.test = alg_test_pcomp,</div><div class='ctx'> 		.suite = {</div><div class='head'>diff --git a/crypto/testmgr.h b/crypto/testmgr.h<br/>index 37b4d8f45447..43e84d32b341 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/testmgr.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/testmgr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/testmgr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>crypto/testmgr.h</a></div><div class='hunk'>@@ -2717,6 +2717,10 @@ static struct cipher_testvec bf_ctr_dec_tv_template[] = {</div><div class='ctx'> #define TF_CBC_DEC_TEST_VECTORS		5</div><div class='ctx'> #define TF_CTR_ENC_TEST_VECTORS		2</div><div class='ctx'> #define TF_CTR_DEC_TEST_VECTORS		2</div><div class='add'>+#define TF_LRW_ENC_TEST_VECTORS		8</div><div class='add'>+#define TF_LRW_DEC_TEST_VECTORS		8</div><div class='add'>+#define TF_XTS_ENC_TEST_VECTORS		5</div><div class='add'>+#define TF_XTS_DEC_TEST_VECTORS		5</div><div class='ctx'> </div><div class='ctx'> static struct cipher_testvec tf_enc_tv_template[] = {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -3092,16 +3096,1206 @@ static struct cipher_testvec tf_ctr_dec_tv_template[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct cipher_testvec tf_lrw_enc_tv_template[] = {</div><div class='add'>+	/* Generated from AES-LRW test vectors */</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x45\x62\xac\x25\xf8\x28\x17\x6d"</div><div class='add'>+			  "\x4c\x26\x84\x14\xb5\x68\x01\x85"</div><div class='add'>+			  "\x25\x8e\x2a\x05\xe7\x3e\x9d\x03"</div><div class='add'>+			  "\xee\x5a\x83\x0c\xcc\x09\x4c\x87",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xa1\x6c\x50\x69\x26\xa4\xef\x7b"</div><div class='add'>+			  "\x7c\xc6\x91\xeb\x72\xdd\x9b\xee",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x59\x70\x47\x14\xf5\x57\x47\x8c"</div><div class='add'>+			  "\xd7\x79\xe8\x0f\x54\x88\x79\x44"</div><div class='add'>+			  "\x0d\x48\xf0\xb7\xb1\x5a\x53\xea"</div><div class='add'>+			  "\x1c\xaa\x6b\x29\xc2\xca\xfb\xaf",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x02",</div><div class='add'>+		.input	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xab\x72\x0a\xad\x3b\x0c\xf0\xc9"</div><div class='add'>+			  "\x42\x2f\xf1\xae\xf1\x3c\xb1\xbd",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xd8\x2a\x91\x34\xb2\x6a\x56\x50"</div><div class='add'>+			  "\x30\xfe\x69\xe2\x37\x7f\x98\x47"</div><div class='add'>+			  "\xcd\xf9\x0b\x16\x0c\x64\x8f\xb6"</div><div class='add'>+			  "\xb0\x0d\x0d\x1b\xae\x85\x87\x1f",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x85\xa7\x56\x67\x08\xfa\x42\xe1"</div><div class='add'>+			  "\x22\xe6\x82\xfc\xd9\xb4\xd7\xd4",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x0f\x6a\xef\xf8\xd3\xd2\xbb\x15"</div><div class='add'>+			  "\x25\x83\xf7\x3c\x1f\x01\x28\x74"</div><div class='add'>+			  "\xca\xc6\xbc\x35\x4d\x4a\x65\x54"</div><div class='add'>+			  "\x90\xae\x61\xcf\x7b\xae\xbd\xcc"</div><div class='add'>+			  "\xad\xe4\x94\xc5\x4a\x29\xae\x70",</div><div class='add'>+		.klen	= 40,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xd2\xaf\x69\x35\x24\x1d\x0e\x1c"</div><div class='add'>+			  "\x84\x8b\x05\xe4\xa2\x2f\x16\xf5",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x8a\xd4\xee\x10\x2f\xbd\x81\xff"</div><div class='add'>+			  "\xf8\x86\xce\xac\x93\xc5\xad\xc6"</div><div class='add'>+			  "\xa0\x19\x07\xc0\x9d\xf7\xbb\xdd"</div><div class='add'>+			  "\x52\x13\xb2\xb7\xf0\xff\x11\xd8"</div><div class='add'>+			  "\xd6\x08\xd0\xcd\x2e\xb1\x17\x6f",</div><div class='add'>+		.klen	= 40,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x4a\x23\x56\xd7\xff\x90\xd0\x9a"</div><div class='add'>+			  "\x0d\x7c\x26\xfc\xf0\xf0\xf6\xe4",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"</div><div class='add'>+			  "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"</div><div class='add'>+			  "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"</div><div class='add'>+			  "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"</div><div class='add'>+			  "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"</div><div class='add'>+			  "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",</div><div class='add'>+		.klen	= 48,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x30\xaf\x26\x05\x9d\x5d\x0a\x58"</div><div class='add'>+			  "\xe2\xe7\xce\x8a\xb2\x56\x6d\x76",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xfb\x76\x15\xb2\x3d\x80\x89\x1d"</div><div class='add'>+			  "\xd4\x70\x98\x0b\xc7\x95\x84\xc8"</div><div class='add'>+			  "\xb2\xfb\x64\xce\x60\x97\x87\x8d"</div><div class='add'>+			  "\x17\xfc\xe4\x5a\x49\xe8\x30\xb7"</div><div class='add'>+			  "\x6e\x78\x17\xe7\x2d\x5e\x12\xd4"</div><div class='add'>+			  "\x60\x64\x04\x7a\xf1\x2f\x9e\x0c",</div><div class='add'>+		.klen	= 48,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xdf\xcf\xdc\xd2\xe1\xcf\x86\x75"</div><div class='add'>+			  "\x17\x66\x5e\x0c\x14\xa1\x3d\x40",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"</div><div class='add'>+			  "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"</div><div class='add'>+			  "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"</div><div class='add'>+			  "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"</div><div class='add'>+			  "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"</div><div class='add'>+			  "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",</div><div class='add'>+		.klen	= 48,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input	= "\x05\x11\xb7\x18\xab\xc6\x2d\xac"</div><div class='add'>+			  "\x70\x5d\xf6\x22\x94\xcd\xe5\x6c"</div><div class='add'>+			  "\x17\x6b\xf6\x1c\xf0\xf3\x6e\xf8"</div><div class='add'>+			  "\x50\x38\x1f\x71\x49\xb6\x57\xd6"</div><div class='add'>+			  "\x8f\xcb\x8d\x6b\xe3\xa6\x29\x90"</div><div class='add'>+			  "\xfe\x2a\x62\x82\xae\x6d\x8b\xf6"</div><div class='add'>+			  "\xad\x1e\x9e\x20\x5f\x38\xbe\x04"</div><div class='add'>+			  "\xda\x10\x8e\xed\xa2\xa4\x87\xab"</div><div class='add'>+			  "\xda\x6b\xb4\x0c\x75\xba\xd3\x7c"</div><div class='add'>+			  "\xc9\xac\x42\x31\x95\x7c\xc9\x04"</div><div class='add'>+			  "\xeb\xd5\x6e\x32\x69\x8a\xdb\xa6"</div><div class='add'>+			  "\x15\xd7\x3f\x4f\x2f\x66\x69\x03"</div><div class='add'>+			  "\x9c\x1f\x54\x0f\xde\x1f\xf3\x65"</div><div class='add'>+			  "\x4c\x96\x12\xed\x7c\x92\x03\x01"</div><div class='add'>+			  "\x6f\xbc\x35\x93\xac\xf1\x27\xf1"</div><div class='add'>+			  "\xb4\x96\x82\x5a\x5f\xb0\xa0\x50"</div><div class='add'>+			  "\x89\xa4\x8e\x66\x44\x85\xcc\xfd"</div><div class='add'>+			  "\x33\x14\x70\xe3\x96\xb2\xc3\xd3"</div><div class='add'>+			  "\xbb\x54\x5a\x1a\xf9\x74\xa2\xc5"</div><div class='add'>+			  "\x2d\x64\x75\xdd\xb4\x54\xe6\x74"</div><div class='add'>+			  "\x8c\xd3\x9d\x9e\x86\xab\x51\x53"</div><div class='add'>+			  "\xb7\x93\x3e\x6f\xd0\x4e\x2c\x40"</div><div class='add'>+			  "\xf6\xa8\x2e\x3e\x9d\xf4\x66\xa5"</div><div class='add'>+			  "\x76\x12\x73\x44\x1a\x56\xd7\x72"</div><div class='add'>+			  "\x88\xcd\x21\x8c\x4c\x0f\xfe\xda"</div><div class='add'>+			  "\x95\xe0\x3a\xa6\xa5\x84\x46\xcd"</div><div class='add'>+			  "\xd5\x3e\x9d\x3a\xe2\x67\xe6\x60"</div><div class='add'>+			  "\x1a\xe2\x70\x85\x58\xc2\x1b\x09"</div><div class='add'>+			  "\xe1\xd7\x2c\xca\xad\xa8\x8f\xf9"</div><div class='add'>+			  "\xac\xb3\x0e\xdb\xca\x2e\xe2\xb8"</div><div class='add'>+			  "\x51\x71\xd9\x3c\x6c\xf1\x56\xf8"</div><div class='add'>+			  "\xea\x9c\xf1\xfb\x0c\xe6\xb7\x10"</div><div class='add'>+			  "\x1c\xf8\xa9\x7c\xe8\x53\x35\xc1"</div><div class='add'>+			  "\x90\x3e\x76\x4a\x74\xa4\x21\x2c"</div><div class='add'>+			  "\xf6\x2c\x4e\x0f\x94\x3a\x88\x2e"</div><div class='add'>+			  "\x41\x09\x6a\x33\x7d\xf6\xdd\x3f"</div><div class='add'>+			  "\x8d\x23\x31\x74\x84\xeb\x88\x6e"</div><div class='add'>+			  "\xcc\xb9\xbc\x22\x83\x19\x07\x22"</div><div class='add'>+			  "\xa5\x2d\xdf\xa5\xf3\x80\x85\x78"</div><div class='add'>+			  "\x84\x39\x6a\x6d\x6a\x99\x4f\xa5"</div><div class='add'>+			  "\x15\xfe\x46\xb0\xe4\x6c\xa5\x41"</div><div class='add'>+			  "\x3c\xce\x8f\x42\x60\x71\xa7\x75"</div><div class='add'>+			  "\x08\x40\x65\x8a\x82\xbf\xf5\x43"</div><div class='add'>+			  "\x71\x96\xa9\x4d\x44\x8a\x20\xbe"</div><div class='add'>+			  "\xfa\x4d\xbb\xc0\x7d\x31\x96\x65"</div><div class='add'>+			  "\xe7\x75\xe5\x3e\xfd\x92\x3b\xc9"</div><div class='add'>+			  "\x55\xbb\x16\x7e\xf7\xc2\x8c\xa4"</div><div class='add'>+			  "\x40\x1d\xe5\xef\x0e\xdf\xe4\x9a"</div><div class='add'>+			  "\x62\x73\x65\xfd\x46\x63\x25\x3d"</div><div class='add'>+			  "\x2b\xaf\xe5\x64\xfe\xa5\x5c\xcf"</div><div class='add'>+			  "\x24\xf3\xb4\xac\x64\xba\xdf\x4b"</div><div class='add'>+			  "\xc6\x96\x7d\x81\x2d\x8d\x97\xf7"</div><div class='add'>+			  "\xc5\x68\x77\x84\x32\x2b\xcc\x85"</div><div class='add'>+			  "\x74\x96\xf0\x12\x77\x61\xb9\xeb"</div><div class='add'>+			  "\x71\xaa\x82\xcb\x1c\xdb\x89\xc8"</div><div class='add'>+			  "\xc6\xb5\xe3\x5c\x7d\x39\x07\x24"</div><div class='add'>+			  "\xda\x39\x87\x45\xc0\x2b\xbb\x01"</div><div class='add'>+			  "\xac\xbc\x2a\x5c\x7f\xfc\xe8\xce"</div><div class='add'>+			  "\x6d\x9c\x6f\xed\xd3\xc1\xa1\xd6"</div><div class='add'>+			  "\xc5\x55\xa9\x66\x2f\xe1\xc8\x32"</div><div class='add'>+			  "\xa6\x5d\xa4\x3a\x98\x73\xe8\x45"</div><div class='add'>+			  "\xa4\xc7\xa8\xb4\xf6\x13\x03\xf6"</div><div class='add'>+			  "\xe9\x2e\xc4\x29\x0f\x84\xdb\xc4"</div><div class='add'>+			  "\x21\xc4\xc2\x75\x67\x89\x37\x0a",</div><div class='add'>+		.ilen	= 512,</div><div class='add'>+		.result	= "\x30\x38\xeb\xaf\x12\x43\x1a\x89"</div><div class='add'>+			  "\x62\xa2\x36\xe5\xcf\x77\x1e\xd9"</div><div class='add'>+			  "\x08\xc3\x0d\xdd\x95\xab\x19\x96"</div><div class='add'>+			  "\x27\x52\x41\xc3\xca\xfb\xf6\xee"</div><div class='add'>+			  "\x40\x2d\xdf\xdd\x00\x0c\xb9\x0a"</div><div class='add'>+			  "\x3a\xf0\xc0\xd1\xda\x63\x9e\x45"</div><div class='add'>+			  "\x42\xe9\x29\xc0\xb4\x07\xb4\x31"</div><div class='add'>+			  "\x66\x77\x72\xb5\xb6\xb3\x57\x46"</div><div class='add'>+			  "\x34\x9a\xfe\x03\xaf\x6b\x36\x07"</div><div class='add'>+			  "\x63\x8e\xc2\x5d\xa6\x0f\xb6\x7d"</div><div class='add'>+			  "\xfb\x6d\x82\x51\xb6\x98\xd0\x71"</div><div class='add'>+			  "\xe7\x10\x7a\xdf\xb2\xbd\xf1\x1d"</div><div class='add'>+			  "\x72\x2b\x54\x13\xe3\x6d\x79\x37"</div><div class='add'>+			  "\xa9\x39\x2c\xdf\x21\xab\x87\xd5"</div><div class='add'>+			  "\xee\xef\x9a\x12\x50\x39\x2e\x1b"</div><div class='add'>+			  "\x7d\xe6\x6a\x27\x48\xb9\xe7\xac"</div><div class='add'>+			  "\xaa\xcd\x79\x5f\xf2\xf3\xa0\x08"</div><div class='add'>+			  "\x6f\x2c\xf4\x0e\xd1\xb8\x89\x25"</div><div class='add'>+			  "\x31\x9d\xef\xb1\x1d\x27\x55\x04"</div><div class='add'>+			  "\xc9\x8c\xb7\x68\xdc\xb6\x67\x8a"</div><div class='add'>+			  "\xdb\xcf\x22\xf2\x3b\x6f\xce\xbb"</div><div class='add'>+			  "\x26\xbe\x4f\x27\x04\x42\xd1\x44"</div><div class='add'>+			  "\x4c\x08\xa3\x95\x4c\x7f\x1a\xaf"</div><div class='add'>+			  "\x1d\x28\x14\xfd\xb1\x1a\x34\x18"</div><div class='add'>+			  "\xf5\x1e\x28\x69\x95\x6a\x5a\xba"</div><div class='add'>+			  "\x8e\xb2\x58\x1d\x28\x17\x13\x3d"</div><div class='add'>+			  "\x38\x7d\x14\x8d\xab\x5d\xf9\xe8"</div><div class='add'>+			  "\x3c\x0f\x2b\x0d\x2b\x08\xb4\x4b"</div><div class='add'>+			  "\x6b\x0d\xc8\xa7\x84\xc2\x3a\x1a"</div><div class='add'>+			  "\xb7\xbd\xda\x92\x29\xb8\x5b\x5a"</div><div class='add'>+			  "\x63\xa5\x99\x82\x09\x72\x8f\xc6"</div><div class='add'>+			  "\xa4\x62\x24\x69\x8c\x2d\x26\x00"</div><div class='add'>+			  "\x99\x83\x91\xd6\xc6\xcf\x57\x67"</div><div class='add'>+			  "\x38\xea\xf2\xfc\x29\xe0\x73\x39"</div><div class='add'>+			  "\xf9\x13\x94\x6d\xe2\x58\x28\x75"</div><div class='add'>+			  "\x3e\xae\x71\x90\x07\x70\x1c\x38"</div><div class='add'>+			  "\x5b\x4c\x1e\xb5\xa5\x3b\x20\xef"</div><div class='add'>+			  "\xb1\x4c\x3e\x1a\x72\x62\xbb\x22"</div><div class='add'>+			  "\x82\x09\xe3\x18\x3f\x4f\x48\xfc"</div><div class='add'>+			  "\xdd\xac\xfc\xb6\x09\xdb\xd2\x7b"</div><div class='add'>+			  "\xd6\xb7\x7e\x41\x2f\x14\xf5\x0e"</div><div class='add'>+			  "\xc3\xac\x4a\xed\xe7\x82\xef\x31"</div><div class='add'>+			  "\x1f\x1a\x51\x1e\x29\x60\xc8\x98"</div><div class='add'>+			  "\x93\x51\x1d\x3d\x62\x59\x83\x82"</div><div class='add'>+			  "\x0c\xf1\xd7\x8d\xac\x33\x44\x81"</div><div class='add'>+			  "\x3c\x59\xb7\xd4\x5b\x65\x82\xc4"</div><div class='add'>+			  "\xec\xdc\x24\xfd\x0e\x1a\x79\x94"</div><div class='add'>+			  "\x34\xb0\x62\xfa\x98\x49\x26\x1f"</div><div class='add'>+			  "\xf4\x9e\x40\x44\x5b\x1f\xf8\xbe"</div><div class='add'>+			  "\x36\xff\xc6\xc6\x9d\xf2\xd6\xcc"</div><div class='add'>+			  "\x63\x93\x29\xb9\x0b\x6d\xd7\x6c"</div><div class='add'>+			  "\xdb\xf6\x21\x80\xf7\x5a\x37\x15"</div><div class='add'>+			  "\x0c\xe3\x36\xc8\x74\x75\x20\x91"</div><div class='add'>+			  "\xdf\x52\x2d\x0c\xe7\x45\xff\x46"</div><div class='add'>+			  "\xb3\xf4\xec\xc2\xbd\xd3\x37\xb6"</div><div class='add'>+			  "\x26\xa2\x5d\x7d\x61\xbf\x10\x46"</div><div class='add'>+			  "\x57\x8d\x05\x96\x70\x0b\xd6\x41"</div><div class='add'>+			  "\x5c\xe9\xd3\x54\x81\x39\x3a\xdd"</div><div class='add'>+			  "\x5f\x92\x81\x6e\x35\x03\xd4\x72"</div><div class='add'>+			  "\x3d\x5a\xe7\xb9\x3b\x0c\x84\x23"</div><div class='add'>+			  "\x45\x5d\xec\x72\xc1\x52\xef\x2e"</div><div class='add'>+			  "\x81\x00\xd3\xfe\x4c\x3c\x05\x61"</div><div class='add'>+			  "\x80\x18\xc4\x6c\x03\xd3\xb7\xba"</div><div class='add'>+			  "\x11\xd7\xb8\x6e\xea\xe1\x80\x30",</div><div class='add'>+		.rlen	= 512,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec tf_lrw_dec_tv_template[] = {</div><div class='add'>+	/* Generated from AES-LRW test vectors */</div><div class='add'>+	/* same as enc vectors with input and result reversed */</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x45\x62\xac\x25\xf8\x28\x17\x6d"</div><div class='add'>+			  "\x4c\x26\x84\x14\xb5\x68\x01\x85"</div><div class='add'>+			  "\x25\x8e\x2a\x05\xe7\x3e\x9d\x03"</div><div class='add'>+			  "\xee\x5a\x83\x0c\xcc\x09\x4c\x87",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input	= "\xa1\x6c\x50\x69\x26\xa4\xef\x7b"</div><div class='add'>+			  "\x7c\xc6\x91\xeb\x72\xdd\x9b\xee",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x59\x70\x47\x14\xf5\x57\x47\x8c"</div><div class='add'>+			  "\xd7\x79\xe8\x0f\x54\x88\x79\x44"</div><div class='add'>+			  "\x0d\x48\xf0\xb7\xb1\x5a\x53\xea"</div><div class='add'>+			  "\x1c\xaa\x6b\x29\xc2\xca\xfb\xaf",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x02",</div><div class='add'>+		.input	= "\xab\x72\x0a\xad\x3b\x0c\xf0\xc9"</div><div class='add'>+			  "\x42\x2f\xf1\xae\xf1\x3c\xb1\xbd",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xd8\x2a\x91\x34\xb2\x6a\x56\x50"</div><div class='add'>+			  "\x30\xfe\x69\xe2\x37\x7f\x98\x47"</div><div class='add'>+			  "\xcd\xf9\x0b\x16\x0c\x64\x8f\xb6"</div><div class='add'>+			  "\xb0\x0d\x0d\x1b\xae\x85\x87\x1f",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x85\xa7\x56\x67\x08\xfa\x42\xe1"</div><div class='add'>+			  "\x22\xe6\x82\xfc\xd9\xb4\xd7\xd4",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x0f\x6a\xef\xf8\xd3\xd2\xbb\x15"</div><div class='add'>+			  "\x25\x83\xf7\x3c\x1f\x01\x28\x74"</div><div class='add'>+			  "\xca\xc6\xbc\x35\x4d\x4a\x65\x54"</div><div class='add'>+			  "\x90\xae\x61\xcf\x7b\xae\xbd\xcc"</div><div class='add'>+			  "\xad\xe4\x94\xc5\x4a\x29\xae\x70",</div><div class='add'>+		.klen	= 40,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input	= "\xd2\xaf\x69\x35\x24\x1d\x0e\x1c"</div><div class='add'>+			  "\x84\x8b\x05\xe4\xa2\x2f\x16\xf5",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x8a\xd4\xee\x10\x2f\xbd\x81\xff"</div><div class='add'>+			  "\xf8\x86\xce\xac\x93\xc5\xad\xc6"</div><div class='add'>+			  "\xa0\x19\x07\xc0\x9d\xf7\xbb\xdd"</div><div class='add'>+			  "\x52\x13\xb2\xb7\xf0\xff\x11\xd8"</div><div class='add'>+			  "\xd6\x08\xd0\xcd\x2e\xb1\x17\x6f",</div><div class='add'>+		.klen	= 40,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x4a\x23\x56\xd7\xff\x90\xd0\x9a"</div><div class='add'>+			  "\x0d\x7c\x26\xfc\xf0\xf0\xf6\xe4",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"</div><div class='add'>+			  "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"</div><div class='add'>+			  "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"</div><div class='add'>+			  "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"</div><div class='add'>+			  "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"</div><div class='add'>+			  "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",</div><div class='add'>+		.klen	= 48,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input	= "\x30\xaf\x26\x05\x9d\x5d\x0a\x58"</div><div class='add'>+			  "\xe2\xe7\xce\x8a\xb2\x56\x6d\x76",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xfb\x76\x15\xb2\x3d\x80\x89\x1d"</div><div class='add'>+			  "\xd4\x70\x98\x0b\xc7\x95\x84\xc8"</div><div class='add'>+			  "\xb2\xfb\x64\xce\x60\x97\x87\x8d"</div><div class='add'>+			  "\x17\xfc\xe4\x5a\x49\xe8\x30\xb7"</div><div class='add'>+			  "\x6e\x78\x17\xe7\x2d\x5e\x12\xd4"</div><div class='add'>+			  "\x60\x64\x04\x7a\xf1\x2f\x9e\x0c",</div><div class='add'>+		.klen	= 48,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\xdf\xcf\xdc\xd2\xe1\xcf\x86\x75"</div><div class='add'>+			  "\x17\x66\x5e\x0c\x14\xa1\x3d\x40",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"</div><div class='add'>+			  "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"</div><div class='add'>+			  "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"</div><div class='add'>+			  "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"</div><div class='add'>+			  "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"</div><div class='add'>+			  "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",</div><div class='add'>+		.klen	= 48,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input	= "\x30\x38\xeb\xaf\x12\x43\x1a\x89"</div><div class='add'>+			  "\x62\xa2\x36\xe5\xcf\x77\x1e\xd9"</div><div class='add'>+			  "\x08\xc3\x0d\xdd\x95\xab\x19\x96"</div><div class='add'>+			  "\x27\x52\x41\xc3\xca\xfb\xf6\xee"</div><div class='add'>+			  "\x40\x2d\xdf\xdd\x00\x0c\xb9\x0a"</div><div class='add'>+			  "\x3a\xf0\xc0\xd1\xda\x63\x9e\x45"</div><div class='add'>+			  "\x42\xe9\x29\xc0\xb4\x07\xb4\x31"</div><div class='add'>+			  "\x66\x77\x72\xb5\xb6\xb3\x57\x46"</div><div class='add'>+			  "\x34\x9a\xfe\x03\xaf\x6b\x36\x07"</div><div class='add'>+			  "\x63\x8e\xc2\x5d\xa6\x0f\xb6\x7d"</div><div class='add'>+			  "\xfb\x6d\x82\x51\xb6\x98\xd0\x71"</div><div class='add'>+			  "\xe7\x10\x7a\xdf\xb2\xbd\xf1\x1d"</div><div class='add'>+			  "\x72\x2b\x54\x13\xe3\x6d\x79\x37"</div><div class='add'>+			  "\xa9\x39\x2c\xdf\x21\xab\x87\xd5"</div><div class='add'>+			  "\xee\xef\x9a\x12\x50\x39\x2e\x1b"</div><div class='add'>+			  "\x7d\xe6\x6a\x27\x48\xb9\xe7\xac"</div><div class='add'>+			  "\xaa\xcd\x79\x5f\xf2\xf3\xa0\x08"</div><div class='add'>+			  "\x6f\x2c\xf4\x0e\xd1\xb8\x89\x25"</div><div class='add'>+			  "\x31\x9d\xef\xb1\x1d\x27\x55\x04"</div><div class='add'>+			  "\xc9\x8c\xb7\x68\xdc\xb6\x67\x8a"</div><div class='add'>+			  "\xdb\xcf\x22\xf2\x3b\x6f\xce\xbb"</div><div class='add'>+			  "\x26\xbe\x4f\x27\x04\x42\xd1\x44"</div><div class='add'>+			  "\x4c\x08\xa3\x95\x4c\x7f\x1a\xaf"</div><div class='add'>+			  "\x1d\x28\x14\xfd\xb1\x1a\x34\x18"</div><div class='add'>+			  "\xf5\x1e\x28\x69\x95\x6a\x5a\xba"</div><div class='add'>+			  "\x8e\xb2\x58\x1d\x28\x17\x13\x3d"</div><div class='add'>+			  "\x38\x7d\x14\x8d\xab\x5d\xf9\xe8"</div><div class='add'>+			  "\x3c\x0f\x2b\x0d\x2b\x08\xb4\x4b"</div><div class='add'>+			  "\x6b\x0d\xc8\xa7\x84\xc2\x3a\x1a"</div><div class='add'>+			  "\xb7\xbd\xda\x92\x29\xb8\x5b\x5a"</div><div class='add'>+			  "\x63\xa5\x99\x82\x09\x72\x8f\xc6"</div><div class='add'>+			  "\xa4\x62\x24\x69\x8c\x2d\x26\x00"</div><div class='add'>+			  "\x99\x83\x91\xd6\xc6\xcf\x57\x67"</div><div class='add'>+			  "\x38\xea\xf2\xfc\x29\xe0\x73\x39"</div><div class='add'>+			  "\xf9\x13\x94\x6d\xe2\x58\x28\x75"</div><div class='add'>+			  "\x3e\xae\x71\x90\x07\x70\x1c\x38"</div><div class='add'>+			  "\x5b\x4c\x1e\xb5\xa5\x3b\x20\xef"</div><div class='add'>+			  "\xb1\x4c\x3e\x1a\x72\x62\xbb\x22"</div><div class='add'>+			  "\x82\x09\xe3\x18\x3f\x4f\x48\xfc"</div><div class='add'>+			  "\xdd\xac\xfc\xb6\x09\xdb\xd2\x7b"</div><div class='add'>+			  "\xd6\xb7\x7e\x41\x2f\x14\xf5\x0e"</div><div class='add'>+			  "\xc3\xac\x4a\xed\xe7\x82\xef\x31"</div><div class='add'>+			  "\x1f\x1a\x51\x1e\x29\x60\xc8\x98"</div><div class='add'>+			  "\x93\x51\x1d\x3d\x62\x59\x83\x82"</div><div class='add'>+			  "\x0c\xf1\xd7\x8d\xac\x33\x44\x81"</div><div class='add'>+			  "\x3c\x59\xb7\xd4\x5b\x65\x82\xc4"</div><div class='add'>+			  "\xec\xdc\x24\xfd\x0e\x1a\x79\x94"</div><div class='add'>+			  "\x34\xb0\x62\xfa\x98\x49\x26\x1f"</div><div class='add'>+			  "\xf4\x9e\x40\x44\x5b\x1f\xf8\xbe"</div><div class='add'>+			  "\x36\xff\xc6\xc6\x9d\xf2\xd6\xcc"</div><div class='add'>+			  "\x63\x93\x29\xb9\x0b\x6d\xd7\x6c"</div><div class='add'>+			  "\xdb\xf6\x21\x80\xf7\x5a\x37\x15"</div><div class='add'>+			  "\x0c\xe3\x36\xc8\x74\x75\x20\x91"</div><div class='add'>+			  "\xdf\x52\x2d\x0c\xe7\x45\xff\x46"</div><div class='add'>+			  "\xb3\xf4\xec\xc2\xbd\xd3\x37\xb6"</div><div class='add'>+			  "\x26\xa2\x5d\x7d\x61\xbf\x10\x46"</div><div class='add'>+			  "\x57\x8d\x05\x96\x70\x0b\xd6\x41"</div><div class='add'>+			  "\x5c\xe9\xd3\x54\x81\x39\x3a\xdd"</div><div class='add'>+			  "\x5f\x92\x81\x6e\x35\x03\xd4\x72"</div><div class='add'>+			  "\x3d\x5a\xe7\xb9\x3b\x0c\x84\x23"</div><div class='add'>+			  "\x45\x5d\xec\x72\xc1\x52\xef\x2e"</div><div class='add'>+			  "\x81\x00\xd3\xfe\x4c\x3c\x05\x61"</div><div class='add'>+			  "\x80\x18\xc4\x6c\x03\xd3\xb7\xba"</div><div class='add'>+			  "\x11\xd7\xb8\x6e\xea\xe1\x80\x30",</div><div class='add'>+		.ilen	= 512,</div><div class='add'>+		.result	= "\x05\x11\xb7\x18\xab\xc6\x2d\xac"</div><div class='add'>+			  "\x70\x5d\xf6\x22\x94\xcd\xe5\x6c"</div><div class='add'>+			  "\x17\x6b\xf6\x1c\xf0\xf3\x6e\xf8"</div><div class='add'>+			  "\x50\x38\x1f\x71\x49\xb6\x57\xd6"</div><div class='add'>+			  "\x8f\xcb\x8d\x6b\xe3\xa6\x29\x90"</div><div class='add'>+			  "\xfe\x2a\x62\x82\xae\x6d\x8b\xf6"</div><div class='add'>+			  "\xad\x1e\x9e\x20\x5f\x38\xbe\x04"</div><div class='add'>+			  "\xda\x10\x8e\xed\xa2\xa4\x87\xab"</div><div class='add'>+			  "\xda\x6b\xb4\x0c\x75\xba\xd3\x7c"</div><div class='add'>+			  "\xc9\xac\x42\x31\x95\x7c\xc9\x04"</div><div class='add'>+			  "\xeb\xd5\x6e\x32\x69\x8a\xdb\xa6"</div><div class='add'>+			  "\x15\xd7\x3f\x4f\x2f\x66\x69\x03"</div><div class='add'>+			  "\x9c\x1f\x54\x0f\xde\x1f\xf3\x65"</div><div class='add'>+			  "\x4c\x96\x12\xed\x7c\x92\x03\x01"</div><div class='add'>+			  "\x6f\xbc\x35\x93\xac\xf1\x27\xf1"</div><div class='add'>+			  "\xb4\x96\x82\x5a\x5f\xb0\xa0\x50"</div><div class='add'>+			  "\x89\xa4\x8e\x66\x44\x85\xcc\xfd"</div><div class='add'>+			  "\x33\x14\x70\xe3\x96\xb2\xc3\xd3"</div><div class='add'>+			  "\xbb\x54\x5a\x1a\xf9\x74\xa2\xc5"</div><div class='add'>+			  "\x2d\x64\x75\xdd\xb4\x54\xe6\x74"</div><div class='add'>+			  "\x8c\xd3\x9d\x9e\x86\xab\x51\x53"</div><div class='add'>+			  "\xb7\x93\x3e\x6f\xd0\x4e\x2c\x40"</div><div class='add'>+			  "\xf6\xa8\x2e\x3e\x9d\xf4\x66\xa5"</div><div class='add'>+			  "\x76\x12\x73\x44\x1a\x56\xd7\x72"</div><div class='add'>+			  "\x88\xcd\x21\x8c\x4c\x0f\xfe\xda"</div><div class='add'>+			  "\x95\xe0\x3a\xa6\xa5\x84\x46\xcd"</div><div class='add'>+			  "\xd5\x3e\x9d\x3a\xe2\x67\xe6\x60"</div><div class='add'>+			  "\x1a\xe2\x70\x85\x58\xc2\x1b\x09"</div><div class='add'>+			  "\xe1\xd7\x2c\xca\xad\xa8\x8f\xf9"</div><div class='add'>+			  "\xac\xb3\x0e\xdb\xca\x2e\xe2\xb8"</div><div class='add'>+			  "\x51\x71\xd9\x3c\x6c\xf1\x56\xf8"</div><div class='add'>+			  "\xea\x9c\xf1\xfb\x0c\xe6\xb7\x10"</div><div class='add'>+			  "\x1c\xf8\xa9\x7c\xe8\x53\x35\xc1"</div><div class='add'>+			  "\x90\x3e\x76\x4a\x74\xa4\x21\x2c"</div><div class='add'>+			  "\xf6\x2c\x4e\x0f\x94\x3a\x88\x2e"</div><div class='add'>+			  "\x41\x09\x6a\x33\x7d\xf6\xdd\x3f"</div><div class='add'>+			  "\x8d\x23\x31\x74\x84\xeb\x88\x6e"</div><div class='add'>+			  "\xcc\xb9\xbc\x22\x83\x19\x07\x22"</div><div class='add'>+			  "\xa5\x2d\xdf\xa5\xf3\x80\x85\x78"</div><div class='add'>+			  "\x84\x39\x6a\x6d\x6a\x99\x4f\xa5"</div><div class='add'>+			  "\x15\xfe\x46\xb0\xe4\x6c\xa5\x41"</div><div class='add'>+			  "\x3c\xce\x8f\x42\x60\x71\xa7\x75"</div><div class='add'>+			  "\x08\x40\x65\x8a\x82\xbf\xf5\x43"</div><div class='add'>+			  "\x71\x96\xa9\x4d\x44\x8a\x20\xbe"</div><div class='add'>+			  "\xfa\x4d\xbb\xc0\x7d\x31\x96\x65"</div><div class='add'>+			  "\xe7\x75\xe5\x3e\xfd\x92\x3b\xc9"</div><div class='add'>+			  "\x55\xbb\x16\x7e\xf7\xc2\x8c\xa4"</div><div class='add'>+			  "\x40\x1d\xe5\xef\x0e\xdf\xe4\x9a"</div><div class='add'>+			  "\x62\x73\x65\xfd\x46\x63\x25\x3d"</div><div class='add'>+			  "\x2b\xaf\xe5\x64\xfe\xa5\x5c\xcf"</div><div class='add'>+			  "\x24\xf3\xb4\xac\x64\xba\xdf\x4b"</div><div class='add'>+			  "\xc6\x96\x7d\x81\x2d\x8d\x97\xf7"</div><div class='add'>+			  "\xc5\x68\x77\x84\x32\x2b\xcc\x85"</div><div class='add'>+			  "\x74\x96\xf0\x12\x77\x61\xb9\xeb"</div><div class='add'>+			  "\x71\xaa\x82\xcb\x1c\xdb\x89\xc8"</div><div class='add'>+			  "\xc6\xb5\xe3\x5c\x7d\x39\x07\x24"</div><div class='add'>+			  "\xda\x39\x87\x45\xc0\x2b\xbb\x01"</div><div class='add'>+			  "\xac\xbc\x2a\x5c\x7f\xfc\xe8\xce"</div><div class='add'>+			  "\x6d\x9c\x6f\xed\xd3\xc1\xa1\xd6"</div><div class='add'>+			  "\xc5\x55\xa9\x66\x2f\xe1\xc8\x32"</div><div class='add'>+			  "\xa6\x5d\xa4\x3a\x98\x73\xe8\x45"</div><div class='add'>+			  "\xa4\xc7\xa8\xb4\xf6\x13\x03\xf6"</div><div class='add'>+			  "\xe9\x2e\xc4\x29\x0f\x84\xdb\xc4"</div><div class='add'>+			  "\x21\xc4\xc2\x75\x67\x89\x37\x0a",</div><div class='add'>+		.rlen	= 512,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec tf_xts_enc_tv_template[] = {</div><div class='add'>+	/* Generated from AES-XTS test vectors */</div><div class='add'>+{</div><div class='add'>+		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x4b\xc9\x44\x4a\x11\xa3\xef\xac"</div><div class='add'>+			  "\x30\x74\xe4\x44\x52\x77\x97\x43"</div><div class='add'>+			  "\xa7\x60\xb2\x45\x2e\xf9\x00\x90"</div><div class='add'>+			  "\x9f\xaa\xfd\x89\x6e\x9d\x4a\xe0",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x11\x11\x11\x11\x11\x11\x11\x11"</div><div class='add'>+			  "\x11\x11\x11\x11\x11\x11\x11\x11"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x33\x33\x33\x33\x33\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x57\x0e\x8f\xe5\x2a\x35\x61\x4f"</div><div class='add'>+			  "\x32\xd3\xbd\x36\x05\x15\x44\x2c"</div><div class='add'>+			  "\x58\x06\xf7\xf8\x00\xa8\xb6\xd5"</div><div class='add'>+			  "\xc6\x28\x92\xdb\xd8\x34\xa2\xe9",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xff\xfe\xfd\xfc\xfb\xfa\xf9\xf8"</div><div class='add'>+			  "\xf7\xf6\xf5\xf4\xf3\xf2\xf1\xf0"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x33\x33\x33\x33\x33\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x96\x45\x8f\x8d\x7a\x75\xb1\xde"</div><div class='add'>+			  "\x40\x0c\x89\x56\xf6\x4d\xa7\x07"</div><div class='add'>+			  "\x38\xbb\x5b\xe9\xcd\x84\xae\xb2"</div><div class='add'>+			  "\x7b\x6a\x62\xf4\x8c\xb5\x37\xea",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x27\x18\x28\x18\x28\x45\x90\x45"</div><div class='add'>+			  "\x23\x53\x60\x28\x74\x71\x35\x26"</div><div class='add'>+			  "\x31\x41\x59\x26\x53\x58\x97\x93"</div><div class='add'>+			  "\x23\x84\x62\x64\x33\x83\x27\x95",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"</div><div class='add'>+			  "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",</div><div class='add'>+		.ilen	= 512,</div><div class='add'>+		.result	= "\xa9\x78\xae\x1e\xea\xa2\x44\x4c"</div><div class='add'>+			  "\xa2\x7a\x64\x1f\xaf\x46\xc1\xe0"</div><div class='add'>+			  "\x6c\xb2\xf3\x92\x9a\xd6\x7d\x58"</div><div class='add'>+			  "\xb8\x2d\xb9\x5d\x58\x07\x66\x50"</div><div class='add'>+			  "\xea\x35\x35\x8c\xb2\x46\x61\x06"</div><div class='add'>+			  "\x5d\x65\xfc\x57\x8f\x69\x74\xab"</div><div class='add'>+			  "\x8a\x06\x69\xb5\x6c\xda\x66\xc7"</div><div class='add'>+			  "\x52\x90\xbb\x8e\x6d\x8b\xb5\xa2"</div><div class='add'>+			  "\x78\x1d\xc2\xa9\xc2\x73\x00\xc3"</div><div class='add'>+			  "\x32\x36\x7c\x97\x6b\x4e\x8a\x50"</div><div class='add'>+			  "\xe4\x91\x83\x96\x8f\xf4\x94\x1a"</div><div class='add'>+			  "\xa6\x27\xe1\x33\xcb\x91\xc6\x5f"</div><div class='add'>+			  "\x94\x75\xbc\xd7\x3e\x3e\x6f\x9e"</div><div class='add'>+			  "\xa9\x31\x80\x5e\xe5\xdb\xc8\x53"</div><div class='add'>+			  "\x01\x73\x68\x32\x25\x19\xfa\xfb"</div><div class='add'>+			  "\xe4\xcf\xb9\x3e\xa2\xa0\x8f\x31"</div><div class='add'>+			  "\xbf\x54\x06\x93\xa8\xb1\x0f\xb6"</div><div class='add'>+			  "\x7c\x3c\xde\x6f\x0f\xfb\x0c\x11"</div><div class='add'>+			  "\x39\x80\x39\x09\x97\x65\xf2\x83"</div><div class='add'>+			  "\xae\xe6\xa1\x6f\x47\xb8\x49\xde"</div><div class='add'>+			  "\x99\x36\x20\x7d\x97\x3b\xec\xfa"</div><div class='add'>+			  "\xb4\x33\x6e\x7a\xc7\x46\x84\x49"</div><div class='add'>+			  "\x91\xcd\xe1\x57\x0d\xed\x40\x08"</div><div class='add'>+			  "\x13\xf1\x4e\x3e\xa4\xa4\x5c\xe6"</div><div class='add'>+			  "\xd2\x0c\x20\x8f\x3e\xdf\x3f\x47"</div><div class='add'>+			  "\x9a\x2f\xde\x6d\x66\xc9\x99\x4a"</div><div class='add'>+			  "\x2d\x9e\x9d\x4b\x1a\x27\xa2\x12"</div><div class='add'>+			  "\x99\xf0\xf8\xb1\xb6\xf6\x57\xc3"</div><div class='add'>+			  "\xca\x1c\xa3\x8e\xed\x39\x28\xb5"</div><div class='add'>+			  "\x10\x1b\x4b\x08\x42\x00\x4a\xd3"</div><div class='add'>+			  "\xad\x5a\xc6\x8e\xc8\xbb\x95\xc4"</div><div class='add'>+			  "\x4b\xaa\xfe\xd5\x42\xa8\xa3\x6d"</div><div class='add'>+			  "\x3c\xf3\x34\x91\x2d\xb4\xdd\x20"</div><div class='add'>+			  "\x0c\x90\x6d\xa3\x9b\x66\x9d\x24"</div><div class='add'>+			  "\x02\xa6\xa9\x3f\x3f\x58\x5d\x47"</div><div class='add'>+			  "\x24\x65\x63\x7e\xbd\x8c\xe6\x52"</div><div class='add'>+			  "\x7d\xef\x33\x53\x63\xec\xaa\x0b"</div><div class='add'>+			  "\x64\x15\xa9\xa6\x1f\x10\x00\x38"</div><div class='add'>+			  "\x35\xa8\xe7\xbe\x23\x70\x22\xe0"</div><div class='add'>+			  "\xd3\xb9\xe6\xfd\xe6\xaa\x03\x50"</div><div class='add'>+			  "\xf3\x3c\x27\x36\x8b\xcc\xfe\x9c"</div><div class='add'>+			  "\x9c\xa3\xb3\xe7\x68\x9b\xa2\x71"</div><div class='add'>+			  "\xe0\x07\xd9\x1f\x68\x1f\xac\x5e"</div><div class='add'>+			  "\x7a\x74\x85\xa9\x6a\x90\xab\x2c"</div><div class='add'>+			  "\x38\x51\xbc\x1f\x43\x4a\x56\x1c"</div><div class='add'>+			  "\xf8\x47\x03\x4e\x67\xa8\x1f\x99"</div><div class='add'>+			  "\x04\x39\x73\x32\xb2\x86\x79\xe7"</div><div class='add'>+			  "\x14\x28\x70\xb8\xe2\x7d\x69\x85"</div><div class='add'>+			  "\xb6\x0f\xc5\xd0\xd0\x01\x5c\xe6"</div><div class='add'>+			  "\x09\x0f\x75\xf7\xb6\x81\xd2\x11"</div><div class='add'>+			  "\x20\x9c\xa1\xee\x11\x44\x79\xd0"</div><div class='add'>+			  "\xb2\x34\x77\xda\x10\x9a\x6f\x6f"</div><div class='add'>+			  "\xef\x7c\xd9\xdc\x35\xb7\x61\xdd"</div><div class='add'>+			  "\xf1\xa4\xc6\x1c\xbf\x05\x22\xac"</div><div class='add'>+			  "\xfe\x2f\x85\x00\x44\xdf\x33\x16"</div><div class='add'>+			  "\x35\xb6\xa3\xd3\x70\xdf\x69\x35"</div><div class='add'>+			  "\x6a\xc7\xb4\x99\x45\x27\xc8\x8e"</div><div class='add'>+			  "\x5a\x14\x30\xd0\x55\x3e\x4f\x64"</div><div class='add'>+			  "\x0d\x38\xe3\xdf\x8b\xa8\x93\x26"</div><div class='add'>+			  "\x75\xae\xf6\xb5\x23\x0b\x17\x31"</div><div class='add'>+			  "\xbf\x27\xb8\xb5\x94\x31\xa7\x8f"</div><div class='add'>+			  "\x43\xc4\x46\x24\x22\x4f\x8f\x7e"</div><div class='add'>+			  "\xe5\xf4\x6d\x1e\x0e\x18\x7a\xbb"</div><div class='add'>+			  "\xa6\x8f\xfb\x49\x49\xd8\x7e\x5a",</div><div class='add'>+		.rlen	= 512,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x27\x18\x28\x18\x28\x45\x90\x45"</div><div class='add'>+			  "\x23\x53\x60\x28\x74\x71\x35\x26"</div><div class='add'>+			  "\x62\x49\x77\x57\x24\x70\x93\x69"</div><div class='add'>+			  "\x99\x59\x57\x49\x66\x96\x76\x27"</div><div class='add'>+			  "\x31\x41\x59\x26\x53\x58\x97\x93"</div><div class='add'>+			  "\x23\x84\x62\x64\x33\x83\x27\x95"</div><div class='add'>+			  "\x02\x88\x41\x97\x16\x93\x99\x37"</div><div class='add'>+			  "\x51\x05\x82\x09\x74\x94\x45\x92",</div><div class='add'>+		.klen	= 64,</div><div class='add'>+		.iv	= "\xff\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"</div><div class='add'>+			  "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",</div><div class='add'>+		.ilen	= 512,</div><div class='add'>+		.result	= "\xd7\x4b\x93\x7d\x13\xa2\xa2\xe1"</div><div class='add'>+			  "\x35\x39\x71\x88\x76\x1e\xc9\xea"</div><div class='add'>+			  "\x86\xad\xf3\x14\x48\x3d\x5e\xe9"</div><div class='add'>+			  "\xe9\x2d\xb2\x56\x59\x35\x9d\xec"</div><div class='add'>+			  "\x84\xfa\x7e\x9d\x6d\x33\x36\x8f"</div><div class='add'>+			  "\xce\xf4\xa9\x21\x0b\x5f\x96\xec"</div><div class='add'>+			  "\xcb\xf9\x57\x68\x33\x88\x39\xbf"</div><div class='add'>+			  "\x2f\xbb\x59\x03\xbd\x66\x8b\x11"</div><div class='add'>+			  "\x11\x65\x51\x2e\xb8\x67\x05\xd1"</div><div class='add'>+			  "\x27\x11\x5c\xd4\xcc\x97\xc2\xb3"</div><div class='add'>+			  "\xa9\x55\xaf\x07\x56\xd1\xdc\xf5"</div><div class='add'>+			  "\x85\xdc\x46\xe6\xf0\x24\xeb\x93"</div><div class='add'>+			  "\x4d\xf0\x9b\xf5\x73\x1c\xda\x03"</div><div class='add'>+			  "\x22\xc8\x3a\x4f\xb4\x19\x91\x09"</div><div class='add'>+			  "\x54\x0b\xf6\xfe\x17\x3d\x1a\x53"</div><div class='add'>+			  "\x72\x60\x79\xcb\x0e\x32\x8a\x77"</div><div class='add'>+			  "\xd5\xed\xdb\x33\xd7\x62\x16\x69"</div><div class='add'>+			  "\x63\xe0\xab\xb5\xf6\x9c\x5f\x3d"</div><div class='add'>+			  "\x69\x35\x61\x86\xf8\x86\xb9\x89"</div><div class='add'>+			  "\x6e\x59\x35\xac\xf6\x6b\x33\xa0"</div><div class='add'>+			  "\xea\xef\x96\x62\xd8\xa9\xcf\x56"</div><div class='add'>+			  "\xbf\xdb\x8a\xfd\xa1\x82\x77\x73"</div><div class='add'>+			  "\x3d\x94\x4a\x49\x42\x6d\x08\x60"</div><div class='add'>+			  "\xa1\xea\xab\xb6\x88\x13\x94\xb8"</div><div class='add'>+			  "\x51\x98\xdb\x35\x85\xdf\xf6\xb9"</div><div class='add'>+			  "\x8f\xcd\xdf\x80\xd3\x40\x2d\x72"</div><div class='add'>+			  "\xb8\xb2\x6c\x02\x43\x35\x22\x2a"</div><div class='add'>+			  "\x31\xed\xcd\x16\x19\xdf\x62\x0f"</div><div class='add'>+			  "\x29\xcf\x87\x04\xec\x02\x4f\xe4"</div><div class='add'>+			  "\xa2\xed\x73\xc6\x69\xd3\x7e\x89"</div><div class='add'>+			  "\x0b\x76\x10\x7c\xd6\xf9\x6a\x25"</div><div class='add'>+			  "\xed\xcc\x60\x5d\x61\x20\xc1\x97"</div><div class='add'>+			  "\x56\x91\x57\x28\xbe\x71\x0d\xcd"</div><div class='add'>+			  "\xde\xc4\x9e\x55\x91\xbe\xd1\x28"</div><div class='add'>+			  "\x9b\x90\xeb\x73\xf3\x68\x51\xc6"</div><div class='add'>+			  "\xdf\x82\xcc\xd8\x1f\xce\x5b\x27"</div><div class='add'>+			  "\xc0\x60\x5e\x33\xd6\xa7\x20\xea"</div><div class='add'>+			  "\xb2\x54\xc7\x5d\x6a\x3b\x67\x47"</div><div class='add'>+			  "\xcf\xa0\xe3\xab\x86\xaf\xc1\x42"</div><div class='add'>+			  "\xe6\xb0\x23\x4a\xaf\x53\xdf\xa0"</div><div class='add'>+			  "\xad\x12\x32\x31\x03\xf7\x21\xbe"</div><div class='add'>+			  "\x2d\xd5\x82\x42\xb6\x4a\x3d\xcd"</div><div class='add'>+			  "\xd8\x81\x77\xa9\x49\x98\x6c\x09"</div><div class='add'>+			  "\xc5\xa3\x61\x12\x62\x85\x6b\xcd"</div><div class='add'>+			  "\xb3\xf4\x20\x0c\x41\xc4\x05\x37"</div><div class='add'>+			  "\x46\x5f\xeb\x71\x8b\xf1\xaf\x6e"</div><div class='add'>+			  "\xba\xf3\x50\x2e\xfe\xa8\x37\xeb"</div><div class='add'>+			  "\xe8\x8c\x4f\xa4\x0c\xf1\x31\xc8"</div><div class='add'>+			  "\x6e\x71\x4f\xa5\xd7\x97\x73\xe0"</div><div class='add'>+			  "\x93\x4a\x2f\xda\x7b\xe0\x20\x54"</div><div class='add'>+			  "\x1f\x8d\x85\x79\x0b\x7b\x5e\x75"</div><div class='add'>+			  "\xb9\x07\x67\xcc\xc8\xe7\x21\x15"</div><div class='add'>+			  "\xa7\xc8\x98\xff\x4b\x80\x1c\x12"</div><div class='add'>+			  "\xa8\x54\xe1\x38\x52\xe6\x74\x81"</div><div class='add'>+			  "\x97\x47\xa1\x41\x0e\xc0\x50\xe3"</div><div class='add'>+			  "\x55\x0e\xc3\xa7\x70\x77\xce\x07"</div><div class='add'>+			  "\xed\x8c\x88\xe6\xa1\x5b\x14\xec"</div><div class='add'>+			  "\xe6\xde\x06\x6d\x74\xc5\xd9\xfa"</div><div class='add'>+			  "\xe5\x2f\x5a\xff\xc8\x05\xee\x27"</div><div class='add'>+			  "\x35\x61\xbf\x0b\x19\x78\x9b\xd2"</div><div class='add'>+			  "\x04\xc7\x05\xb1\x79\xb4\xff\x5f"</div><div class='add'>+			  "\xf3\xea\x67\x52\x78\xc2\xce\x70"</div><div class='add'>+			  "\xa4\x05\x0b\xb2\xb3\xa8\x30\x97"</div><div class='add'>+			  "\x37\x30\xe1\x91\x8d\xb3\x2a\xff",</div><div class='add'>+		.rlen	= 512,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec tf_xts_dec_tv_template[] = {</div><div class='add'>+	/* Generated from AES-XTS test vectors */</div><div class='add'>+	/* same as enc vectors with input and result reversed */</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x4b\xc9\x44\x4a\x11\xa3\xef\xac"</div><div class='add'>+			  "\x30\x74\xe4\x44\x52\x77\x97\x43"</div><div class='add'>+			  "\xa7\x60\xb2\x45\x2e\xf9\x00\x90"</div><div class='add'>+			  "\x9f\xaa\xfd\x89\x6e\x9d\x4a\xe0",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x11\x11\x11\x11\x11\x11\x11\x11"</div><div class='add'>+			  "\x11\x11\x11\x11\x11\x11\x11\x11"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x33\x33\x33\x33\x33\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x57\x0e\x8f\xe5\x2a\x35\x61\x4f"</div><div class='add'>+			  "\x32\xd3\xbd\x36\x05\x15\x44\x2c"</div><div class='add'>+			  "\x58\x06\xf7\xf8\x00\xa8\xb6\xd5"</div><div class='add'>+			  "\xc6\x28\x92\xdb\xd8\x34\xa2\xe9",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xff\xfe\xfd\xfc\xfb\xfa\xf9\xf8"</div><div class='add'>+			  "\xf7\xf6\xf5\xf4\xf3\xf2\xf1\xf0"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x33\x33\x33\x33\x33\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x96\x45\x8f\x8d\x7a\x75\xb1\xde"</div><div class='add'>+			  "\x40\x0c\x89\x56\xf6\x4d\xa7\x07"</div><div class='add'>+			  "\x38\xbb\x5b\xe9\xcd\x84\xae\xb2"</div><div class='add'>+			  "\x7b\x6a\x62\xf4\x8c\xb5\x37\xea",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x27\x18\x28\x18\x28\x45\x90\x45"</div><div class='add'>+			  "\x23\x53\x60\x28\x74\x71\x35\x26"</div><div class='add'>+			  "\x31\x41\x59\x26\x53\x58\x97\x93"</div><div class='add'>+			  "\x23\x84\x62\x64\x33\x83\x27\x95",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\xa9\x78\xae\x1e\xea\xa2\x44\x4c"</div><div class='add'>+			  "\xa2\x7a\x64\x1f\xaf\x46\xc1\xe0"</div><div class='add'>+			  "\x6c\xb2\xf3\x92\x9a\xd6\x7d\x58"</div><div class='add'>+			  "\xb8\x2d\xb9\x5d\x58\x07\x66\x50"</div><div class='add'>+			  "\xea\x35\x35\x8c\xb2\x46\x61\x06"</div><div class='add'>+			  "\x5d\x65\xfc\x57\x8f\x69\x74\xab"</div><div class='add'>+			  "\x8a\x06\x69\xb5\x6c\xda\x66\xc7"</div><div class='add'>+			  "\x52\x90\xbb\x8e\x6d\x8b\xb5\xa2"</div><div class='add'>+			  "\x78\x1d\xc2\xa9\xc2\x73\x00\xc3"</div><div class='add'>+			  "\x32\x36\x7c\x97\x6b\x4e\x8a\x50"</div><div class='add'>+			  "\xe4\x91\x83\x96\x8f\xf4\x94\x1a"</div><div class='add'>+			  "\xa6\x27\xe1\x33\xcb\x91\xc6\x5f"</div><div class='add'>+			  "\x94\x75\xbc\xd7\x3e\x3e\x6f\x9e"</div><div class='add'>+			  "\xa9\x31\x80\x5e\xe5\xdb\xc8\x53"</div><div class='add'>+			  "\x01\x73\x68\x32\x25\x19\xfa\xfb"</div><div class='add'>+			  "\xe4\xcf\xb9\x3e\xa2\xa0\x8f\x31"</div><div class='add'>+			  "\xbf\x54\x06\x93\xa8\xb1\x0f\xb6"</div><div class='add'>+			  "\x7c\x3c\xde\x6f\x0f\xfb\x0c\x11"</div><div class='add'>+			  "\x39\x80\x39\x09\x97\x65\xf2\x83"</div><div class='add'>+			  "\xae\xe6\xa1\x6f\x47\xb8\x49\xde"</div><div class='add'>+			  "\x99\x36\x20\x7d\x97\x3b\xec\xfa"</div><div class='add'>+			  "\xb4\x33\x6e\x7a\xc7\x46\x84\x49"</div><div class='add'>+			  "\x91\xcd\xe1\x57\x0d\xed\x40\x08"</div><div class='add'>+			  "\x13\xf1\x4e\x3e\xa4\xa4\x5c\xe6"</div><div class='add'>+			  "\xd2\x0c\x20\x8f\x3e\xdf\x3f\x47"</div><div class='add'>+			  "\x9a\x2f\xde\x6d\x66\xc9\x99\x4a"</div><div class='add'>+			  "\x2d\x9e\x9d\x4b\x1a\x27\xa2\x12"</div><div class='add'>+			  "\x99\xf0\xf8\xb1\xb6\xf6\x57\xc3"</div><div class='add'>+			  "\xca\x1c\xa3\x8e\xed\x39\x28\xb5"</div><div class='add'>+			  "\x10\x1b\x4b\x08\x42\x00\x4a\xd3"</div><div class='add'>+			  "\xad\x5a\xc6\x8e\xc8\xbb\x95\xc4"</div><div class='add'>+			  "\x4b\xaa\xfe\xd5\x42\xa8\xa3\x6d"</div><div class='add'>+			  "\x3c\xf3\x34\x91\x2d\xb4\xdd\x20"</div><div class='add'>+			  "\x0c\x90\x6d\xa3\x9b\x66\x9d\x24"</div><div class='add'>+			  "\x02\xa6\xa9\x3f\x3f\x58\x5d\x47"</div><div class='add'>+			  "\x24\x65\x63\x7e\xbd\x8c\xe6\x52"</div><div class='add'>+			  "\x7d\xef\x33\x53\x63\xec\xaa\x0b"</div><div class='add'>+			  "\x64\x15\xa9\xa6\x1f\x10\x00\x38"</div><div class='add'>+			  "\x35\xa8\xe7\xbe\x23\x70\x22\xe0"</div><div class='add'>+			  "\xd3\xb9\xe6\xfd\xe6\xaa\x03\x50"</div><div class='add'>+			  "\xf3\x3c\x27\x36\x8b\xcc\xfe\x9c"</div><div class='add'>+			  "\x9c\xa3\xb3\xe7\x68\x9b\xa2\x71"</div><div class='add'>+			  "\xe0\x07\xd9\x1f\x68\x1f\xac\x5e"</div><div class='add'>+			  "\x7a\x74\x85\xa9\x6a\x90\xab\x2c"</div><div class='add'>+			  "\x38\x51\xbc\x1f\x43\x4a\x56\x1c"</div><div class='add'>+			  "\xf8\x47\x03\x4e\x67\xa8\x1f\x99"</div><div class='add'>+			  "\x04\x39\x73\x32\xb2\x86\x79\xe7"</div><div class='add'>+			  "\x14\x28\x70\xb8\xe2\x7d\x69\x85"</div><div class='add'>+			  "\xb6\x0f\xc5\xd0\xd0\x01\x5c\xe6"</div><div class='add'>+			  "\x09\x0f\x75\xf7\xb6\x81\xd2\x11"</div><div class='add'>+			  "\x20\x9c\xa1\xee\x11\x44\x79\xd0"</div><div class='add'>+			  "\xb2\x34\x77\xda\x10\x9a\x6f\x6f"</div><div class='add'>+			  "\xef\x7c\xd9\xdc\x35\xb7\x61\xdd"</div><div class='add'>+			  "\xf1\xa4\xc6\x1c\xbf\x05\x22\xac"</div><div class='add'>+			  "\xfe\x2f\x85\x00\x44\xdf\x33\x16"</div><div class='add'>+			  "\x35\xb6\xa3\xd3\x70\xdf\x69\x35"</div><div class='add'>+			  "\x6a\xc7\xb4\x99\x45\x27\xc8\x8e"</div><div class='add'>+			  "\x5a\x14\x30\xd0\x55\x3e\x4f\x64"</div><div class='add'>+			  "\x0d\x38\xe3\xdf\x8b\xa8\x93\x26"</div><div class='add'>+			  "\x75\xae\xf6\xb5\x23\x0b\x17\x31"</div><div class='add'>+			  "\xbf\x27\xb8\xb5\x94\x31\xa7\x8f"</div><div class='add'>+			  "\x43\xc4\x46\x24\x22\x4f\x8f\x7e"</div><div class='add'>+			  "\xe5\xf4\x6d\x1e\x0e\x18\x7a\xbb"</div><div class='add'>+			  "\xa6\x8f\xfb\x49\x49\xd8\x7e\x5a",</div><div class='add'>+		.ilen	= 512,</div><div class='add'>+		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"</div><div class='add'>+			  "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",</div><div class='add'>+		.rlen	= 512,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x27\x18\x28\x18\x28\x45\x90\x45"</div><div class='add'>+			  "\x23\x53\x60\x28\x74\x71\x35\x26"</div><div class='add'>+			  "\x62\x49\x77\x57\x24\x70\x93\x69"</div><div class='add'>+			  "\x99\x59\x57\x49\x66\x96\x76\x27"</div><div class='add'>+			  "\x31\x41\x59\x26\x53\x58\x97\x93"</div><div class='add'>+			  "\x23\x84\x62\x64\x33\x83\x27\x95"</div><div class='add'>+			  "\x02\x88\x41\x97\x16\x93\x99\x37"</div><div class='add'>+			  "\x51\x05\x82\x09\x74\x94\x45\x92",</div><div class='add'>+		.klen	= 64,</div><div class='add'>+		.iv	= "\xff\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\xd7\x4b\x93\x7d\x13\xa2\xa2\xe1"</div><div class='add'>+			  "\x35\x39\x71\x88\x76\x1e\xc9\xea"</div><div class='add'>+			  "\x86\xad\xf3\x14\x48\x3d\x5e\xe9"</div><div class='add'>+			  "\xe9\x2d\xb2\x56\x59\x35\x9d\xec"</div><div class='add'>+			  "\x84\xfa\x7e\x9d\x6d\x33\x36\x8f"</div><div class='add'>+			  "\xce\xf4\xa9\x21\x0b\x5f\x96\xec"</div><div class='add'>+			  "\xcb\xf9\x57\x68\x33\x88\x39\xbf"</div><div class='add'>+			  "\x2f\xbb\x59\x03\xbd\x66\x8b\x11"</div><div class='add'>+			  "\x11\x65\x51\x2e\xb8\x67\x05\xd1"</div><div class='add'>+			  "\x27\x11\x5c\xd4\xcc\x97\xc2\xb3"</div><div class='add'>+			  "\xa9\x55\xaf\x07\x56\xd1\xdc\xf5"</div><div class='add'>+			  "\x85\xdc\x46\xe6\xf0\x24\xeb\x93"</div><div class='add'>+			  "\x4d\xf0\x9b\xf5\x73\x1c\xda\x03"</div><div class='add'>+			  "\x22\xc8\x3a\x4f\xb4\x19\x91\x09"</div><div class='add'>+			  "\x54\x0b\xf6\xfe\x17\x3d\x1a\x53"</div><div class='add'>+			  "\x72\x60\x79\xcb\x0e\x32\x8a\x77"</div><div class='add'>+			  "\xd5\xed\xdb\x33\xd7\x62\x16\x69"</div><div class='add'>+			  "\x63\xe0\xab\xb5\xf6\x9c\x5f\x3d"</div><div class='add'>+			  "\x69\x35\x61\x86\xf8\x86\xb9\x89"</div><div class='add'>+			  "\x6e\x59\x35\xac\xf6\x6b\x33\xa0"</div><div class='add'>+			  "\xea\xef\x96\x62\xd8\xa9\xcf\x56"</div><div class='add'>+			  "\xbf\xdb\x8a\xfd\xa1\x82\x77\x73"</div><div class='add'>+			  "\x3d\x94\x4a\x49\x42\x6d\x08\x60"</div><div class='add'>+			  "\xa1\xea\xab\xb6\x88\x13\x94\xb8"</div><div class='add'>+			  "\x51\x98\xdb\x35\x85\xdf\xf6\xb9"</div><div class='add'>+			  "\x8f\xcd\xdf\x80\xd3\x40\x2d\x72"</div><div class='add'>+			  "\xb8\xb2\x6c\x02\x43\x35\x22\x2a"</div><div class='add'>+			  "\x31\xed\xcd\x16\x19\xdf\x62\x0f"</div><div class='add'>+			  "\x29\xcf\x87\x04\xec\x02\x4f\xe4"</div><div class='add'>+			  "\xa2\xed\x73\xc6\x69\xd3\x7e\x89"</div><div class='add'>+			  "\x0b\x76\x10\x7c\xd6\xf9\x6a\x25"</div><div class='add'>+			  "\xed\xcc\x60\x5d\x61\x20\xc1\x97"</div><div class='add'>+			  "\x56\x91\x57\x28\xbe\x71\x0d\xcd"</div><div class='add'>+			  "\xde\xc4\x9e\x55\x91\xbe\xd1\x28"</div><div class='add'>+			  "\x9b\x90\xeb\x73\xf3\x68\x51\xc6"</div><div class='add'>+			  "\xdf\x82\xcc\xd8\x1f\xce\x5b\x27"</div><div class='add'>+			  "\xc0\x60\x5e\x33\xd6\xa7\x20\xea"</div><div class='add'>+			  "\xb2\x54\xc7\x5d\x6a\x3b\x67\x47"</div><div class='add'>+			  "\xcf\xa0\xe3\xab\x86\xaf\xc1\x42"</div><div class='add'>+			  "\xe6\xb0\x23\x4a\xaf\x53\xdf\xa0"</div><div class='add'>+			  "\xad\x12\x32\x31\x03\xf7\x21\xbe"</div><div class='add'>+			  "\x2d\xd5\x82\x42\xb6\x4a\x3d\xcd"</div><div class='add'>+			  "\xd8\x81\x77\xa9\x49\x98\x6c\x09"</div><div class='add'>+			  "\xc5\xa3\x61\x12\x62\x85\x6b\xcd"</div><div class='add'>+			  "\xb3\xf4\x20\x0c\x41\xc4\x05\x37"</div><div class='add'>+			  "\x46\x5f\xeb\x71\x8b\xf1\xaf\x6e"</div><div class='add'>+			  "\xba\xf3\x50\x2e\xfe\xa8\x37\xeb"</div><div class='add'>+			  "\xe8\x8c\x4f\xa4\x0c\xf1\x31\xc8"</div><div class='add'>+			  "\x6e\x71\x4f\xa5\xd7\x97\x73\xe0"</div><div class='add'>+			  "\x93\x4a\x2f\xda\x7b\xe0\x20\x54"</div><div class='add'>+			  "\x1f\x8d\x85\x79\x0b\x7b\x5e\x75"</div><div class='add'>+			  "\xb9\x07\x67\xcc\xc8\xe7\x21\x15"</div><div class='add'>+			  "\xa7\xc8\x98\xff\x4b\x80\x1c\x12"</div><div class='add'>+			  "\xa8\x54\xe1\x38\x52\xe6\x74\x81"</div><div class='add'>+			  "\x97\x47\xa1\x41\x0e\xc0\x50\xe3"</div><div class='add'>+			  "\x55\x0e\xc3\xa7\x70\x77\xce\x07"</div><div class='add'>+			  "\xed\x8c\x88\xe6\xa1\x5b\x14\xec"</div><div class='add'>+			  "\xe6\xde\x06\x6d\x74\xc5\xd9\xfa"</div><div class='add'>+			  "\xe5\x2f\x5a\xff\xc8\x05\xee\x27"</div><div class='add'>+			  "\x35\x61\xbf\x0b\x19\x78\x9b\xd2"</div><div class='add'>+			  "\x04\xc7\x05\xb1\x79\xb4\xff\x5f"</div><div class='add'>+			  "\xf3\xea\x67\x52\x78\xc2\xce\x70"</div><div class='add'>+			  "\xa4\x05\x0b\xb2\xb3\xa8\x30\x97"</div><div class='add'>+			  "\x37\x30\xe1\x91\x8d\xb3\x2a\xff",</div><div class='add'>+		.ilen	= 512,</div><div class='add'>+		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"</div><div class='add'>+			  "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",</div><div class='add'>+		.rlen	= 512,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Serpent test vectors.  These are backwards because Serpent writes</div><div class='ctx'>  * octet sequences in right-to-left mode.</div><div class='ctx'>  */</div><div class='del'>-#define SERPENT_ENC_TEST_VECTORS	4</div><div class='del'>-#define SERPENT_DEC_TEST_VECTORS	4</div><div class='add'>+#define SERPENT_ENC_TEST_VECTORS	5</div><div class='add'>+#define SERPENT_DEC_TEST_VECTORS	5</div><div class='ctx'> </div><div class='ctx'> #define TNEPRES_ENC_TEST_VECTORS	4</div><div class='ctx'> #define TNEPRES_DEC_TEST_VECTORS	4</div><div class='ctx'> </div><div class='add'>+#define SERPENT_CBC_ENC_TEST_VECTORS	1</div><div class='add'>+#define SERPENT_CBC_DEC_TEST_VECTORS	1</div><div class='add'>+</div><div class='add'>+#define SERPENT_CTR_ENC_TEST_VECTORS	2</div><div class='add'>+#define SERPENT_CTR_DEC_TEST_VECTORS	2</div><div class='add'>+</div><div class='add'>+#define SERPENT_LRW_ENC_TEST_VECTORS	8</div><div class='add'>+#define SERPENT_LRW_DEC_TEST_VECTORS	8</div><div class='add'>+</div><div class='add'>+#define SERPENT_XTS_ENC_TEST_VECTORS	5</div><div class='add'>+#define SERPENT_XTS_DEC_TEST_VECTORS	5</div><div class='add'>+</div><div class='ctx'> static struct cipher_testvec serpent_enc_tv_template[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.input	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='hunk'>@@ -3140,6 +4334,50 @@ static struct cipher_testvec serpent_enc_tv_template[] = {</div><div class='ctx'> 		.result	= "\xdd\xd2\x6b\x98\xa5\xff\xd8\x2c"</div><div class='ctx'> 			  "\x05\x34\x5a\x9d\xad\xbf\xaf\x49",</div><div class='ctx'> 		.rlen	= 16,</div><div class='add'>+	}, { /* Generated with Crypto++ */</div><div class='add'>+		.key	= "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"</div><div class='add'>+			  "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"</div><div class='add'>+			  "\x27\x04\xE1\x27\x04\xE1\xBE\x9B"</div><div class='add'>+			  "\x78\xBE\x9B\x78\x55\x32\x0F\x55",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.input	= "\x56\xED\x84\x1B\x8F\x26\xBD\x31"</div><div class='add'>+			  "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"</div><div class='add'>+			  "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"</div><div class='add'>+			  "\xAC\x20\xB7\x4E\xE5\x59\xF0\x87"</div><div class='add'>+			  "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"</div><div class='add'>+			  "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48"</div><div class='add'>+			  "\xDF\x76\x0D\x81\x18\xAF\x23\xBA"</div><div class='add'>+			  "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C"</div><div class='add'>+			  "\xC3\x37\xCE\x65\xFC\x70\x07\x9E"</div><div class='add'>+			  "\x12\xA9\x40\xD7\x4B\xE2\x79\x10"</div><div class='add'>+			  "\x84\x1B\xB2\x26\xBD\x54\xEB\x5F"</div><div class='add'>+			  "\xF6\x8D\x01\x98\x2F\xC6\x3A\xD1"</div><div class='add'>+			  "\x68\xFF\x73\x0A\xA1\x15\xAC\x43"</div><div class='add'>+			  "\xDA\x4E\xE5\x7C\x13\x87\x1E\xB5"</div><div class='add'>+			  "\x29\xC0\x57\xEE\x62\xF9\x90\x04"</div><div class='add'>+			  "\x9B\x32\xC9\x3D\xD4\x6B\x02\x76"</div><div class='add'>+			  "\x0D\xA4\x18\xAF\x46\xDD\x51\xE8"</div><div class='add'>+			  "\x7F\x16\x8A\x21\xB8\x2C\xC3\x5A",</div><div class='add'>+		.ilen	= 144,</div><div class='add'>+		.result	= "\xFB\xB0\x5D\xDE\xC0\xFE\xFC\xEB"</div><div class='add'>+			  "\xB1\x80\x10\x43\xDE\x62\x70\xBD"</div><div class='add'>+			  "\xFA\x8A\x93\xEA\x6B\xF7\xC5\xD7"</div><div class='add'>+			  "\x0C\xD1\xBB\x29\x25\x14\x4C\x22"</div><div class='add'>+			  "\x77\xA6\x38\x00\xDB\xB9\xE2\x07"</div><div class='add'>+			  "\xD1\xAC\x82\xBA\xEA\x67\xAA\x39"</div><div class='add'>+			  "\x99\x34\x89\x5B\x54\xE9\x12\x13"</div><div class='add'>+			  "\x3B\x04\xE5\x12\x42\xC5\x79\xAB"</div><div class='add'>+			  "\x0D\xC7\x3C\x58\x2D\xA3\x98\xF6"</div><div class='add'>+			  "\xE4\x61\x9E\x17\x0B\xCE\xE8\xAA"</div><div class='add'>+			  "\xB5\x6C\x1A\x3A\x67\x52\x81\x6A"</div><div class='add'>+			  "\x04\xFF\x8A\x1B\x96\xFE\xE6\x87"</div><div class='add'>+			  "\x3C\xD4\x39\x7D\x36\x9B\x03\xD5"</div><div class='add'>+			  "\xB6\xA0\x75\x3C\x83\xE6\x1C\x73"</div><div class='add'>+			  "\x9D\x74\x2B\x77\x53\x2D\xE5\xBD"</div><div class='add'>+			  "\x69\xDA\x7A\x01\xF5\x6A\x70\x39"</div><div class='add'>+			  "\x30\xD4\x2C\xF2\x8E\x06\x4B\x39"</div><div class='add'>+			  "\xB3\x12\x1D\xB3\x17\x46\xE6\xD6",</div><div class='add'>+		.rlen	= 144,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3231,6 +4469,50 @@ static struct cipher_testvec serpent_dec_tv_template[] = {</div><div class='ctx'> 		.ilen	= 16,</div><div class='ctx'> 		.result	= zeroed_string,</div><div class='ctx'> 		.rlen	= 16,</div><div class='add'>+	}, { /* Generated with Crypto++ */</div><div class='add'>+		.key	= "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"</div><div class='add'>+			  "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"</div><div class='add'>+			  "\x27\x04\xE1\x27\x04\xE1\xBE\x9B"</div><div class='add'>+			  "\x78\xBE\x9B\x78\x55\x32\x0F\x55",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.input	= "\xFB\xB0\x5D\xDE\xC0\xFE\xFC\xEB"</div><div class='add'>+			  "\xB1\x80\x10\x43\xDE\x62\x70\xBD"</div><div class='add'>+			  "\xFA\x8A\x93\xEA\x6B\xF7\xC5\xD7"</div><div class='add'>+			  "\x0C\xD1\xBB\x29\x25\x14\x4C\x22"</div><div class='add'>+			  "\x77\xA6\x38\x00\xDB\xB9\xE2\x07"</div><div class='add'>+			  "\xD1\xAC\x82\xBA\xEA\x67\xAA\x39"</div><div class='add'>+			  "\x99\x34\x89\x5B\x54\xE9\x12\x13"</div><div class='add'>+			  "\x3B\x04\xE5\x12\x42\xC5\x79\xAB"</div><div class='add'>+			  "\x0D\xC7\x3C\x58\x2D\xA3\x98\xF6"</div><div class='add'>+			  "\xE4\x61\x9E\x17\x0B\xCE\xE8\xAA"</div><div class='add'>+			  "\xB5\x6C\x1A\x3A\x67\x52\x81\x6A"</div><div class='add'>+			  "\x04\xFF\x8A\x1B\x96\xFE\xE6\x87"</div><div class='add'>+			  "\x3C\xD4\x39\x7D\x36\x9B\x03\xD5"</div><div class='add'>+			  "\xB6\xA0\x75\x3C\x83\xE6\x1C\x73"</div><div class='add'>+			  "\x9D\x74\x2B\x77\x53\x2D\xE5\xBD"</div><div class='add'>+			  "\x69\xDA\x7A\x01\xF5\x6A\x70\x39"</div><div class='add'>+			  "\x30\xD4\x2C\xF2\x8E\x06\x4B\x39"</div><div class='add'>+			  "\xB3\x12\x1D\xB3\x17\x46\xE6\xD6",</div><div class='add'>+		.ilen	= 144,</div><div class='add'>+		.result	= "\x56\xED\x84\x1B\x8F\x26\xBD\x31"</div><div class='add'>+			  "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"</div><div class='add'>+			  "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"</div><div class='add'>+			  "\xAC\x20\xB7\x4E\xE5\x59\xF0\x87"</div><div class='add'>+			  "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"</div><div class='add'>+			  "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48"</div><div class='add'>+			  "\xDF\x76\x0D\x81\x18\xAF\x23\xBA"</div><div class='add'>+			  "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C"</div><div class='add'>+			  "\xC3\x37\xCE\x65\xFC\x70\x07\x9E"</div><div class='add'>+			  "\x12\xA9\x40\xD7\x4B\xE2\x79\x10"</div><div class='add'>+			  "\x84\x1B\xB2\x26\xBD\x54\xEB\x5F"</div><div class='add'>+			  "\xF6\x8D\x01\x98\x2F\xC6\x3A\xD1"</div><div class='add'>+			  "\x68\xFF\x73\x0A\xA1\x15\xAC\x43"</div><div class='add'>+			  "\xDA\x4E\xE5\x7C\x13\x87\x1E\xB5"</div><div class='add'>+			  "\x29\xC0\x57\xEE\x62\xF9\x90\x04"</div><div class='add'>+			  "\x9B\x32\xC9\x3D\xD4\x6B\x02\x76"</div><div class='add'>+			  "\x0D\xA4\x18\xAF\x46\xDD\x51\xE8"</div><div class='add'>+			  "\x7F\x16\x8A\x21\xB8\x2C\xC3\x5A",</div><div class='add'>+		.rlen	= 144,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3275,6 +4557,1479 @@ static struct cipher_testvec tnepres_dec_tv_template[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct cipher_testvec serpent_cbc_enc_tv_template[] = {</div><div class='add'>+	{ /* Generated with Crypto++ */</div><div class='add'>+		.key	= "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"</div><div class='add'>+			  "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"</div><div class='add'>+			  "\x27\x04\xE1\x27\x04\xE1\xBE\x9B"</div><div class='add'>+			  "\x78\xBE\x9B\x78\x55\x32\x0F\x55",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\xE2\x24\x89\xEE\x53\xB8\x1D\x5F"</div><div class='add'>+			  "\xC4\x29\x8E\xF3\x35\x9A\xFF\x64",</div><div class='add'>+		.input	= "\x56\xED\x84\x1B\x8F\x26\xBD\x31"</div><div class='add'>+			  "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"</div><div class='add'>+			  "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"</div><div class='add'>+			  "\xAC\x20\xB7\x4E\xE5\x59\xF0\x87"</div><div class='add'>+			  "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"</div><div class='add'>+			  "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48"</div><div class='add'>+			  "\xDF\x76\x0D\x81\x18\xAF\x23\xBA"</div><div class='add'>+			  "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C"</div><div class='add'>+			  "\xC3\x37\xCE\x65\xFC\x70\x07\x9E"</div><div class='add'>+			  "\x12\xA9\x40\xD7\x4B\xE2\x79\x10"</div><div class='add'>+			  "\x84\x1B\xB2\x26\xBD\x54\xEB\x5F"</div><div class='add'>+			  "\xF6\x8D\x01\x98\x2F\xC6\x3A\xD1"</div><div class='add'>+			  "\x68\xFF\x73\x0A\xA1\x15\xAC\x43"</div><div class='add'>+			  "\xDA\x4E\xE5\x7C\x13\x87\x1E\xB5"</div><div class='add'>+			  "\x29\xC0\x57\xEE\x62\xF9\x90\x04"</div><div class='add'>+			  "\x9B\x32\xC9\x3D\xD4\x6B\x02\x76"</div><div class='add'>+			  "\x0D\xA4\x18\xAF\x46\xDD\x51\xE8"</div><div class='add'>+			  "\x7F\x16\x8A\x21\xB8\x2C\xC3\x5A",</div><div class='add'>+		.ilen	= 144,</div><div class='add'>+		.result	= "\x80\xCF\x11\x41\x1A\xB9\x4B\x9C"</div><div class='add'>+			  "\xFF\xB7\x6C\xEA\xF0\xAF\x77\x6E"</div><div class='add'>+			  "\x71\x75\x95\x9D\x4E\x1C\xCF\xAD"</div><div class='add'>+			  "\x81\x34\xE9\x8F\xAE\x5A\x91\x1C"</div><div class='add'>+			  "\x38\x63\x35\x7E\x79\x18\x0A\xE8"</div><div class='add'>+			  "\x67\x06\x76\xD5\xFF\x22\x2F\xDA"</div><div class='add'>+			  "\xB6\x2D\x57\x13\xB6\x3C\xBC\x97"</div><div class='add'>+			  "\xFE\x53\x75\x35\x97\x7F\x51\xEA"</div><div class='add'>+			  "\xDF\x5D\xE8\x9D\xCC\xD9\xAE\xE7"</div><div class='add'>+			  "\x62\x67\xFF\x04\xC2\x18\x22\x5F"</div><div class='add'>+			  "\x2E\x06\xC1\xE2\x26\xCD\xC6\x1E"</div><div class='add'>+			  "\xE5\x2C\x4E\x87\x23\xDD\xF0\x41"</div><div class='add'>+			  "\x08\xA5\xB4\x3E\x07\x1E\x0B\xBB"</div><div class='add'>+			  "\x72\x84\xF8\x0A\x3F\x38\x5E\x91"</div><div class='add'>+			  "\x15\x26\xE1\xDB\xA4\x3D\x74\xD2"</div><div class='add'>+			  "\x41\x1E\x3F\xA9\xC6\x7D\x2A\xAB"</div><div class='add'>+			  "\x27\xDF\x89\x1D\x86\x3E\xF7\x5A"</div><div class='add'>+			  "\xF6\xE3\x0F\xC7\x6B\x4C\x96\x7C",</div><div class='add'>+		.rlen	= 144,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec serpent_cbc_dec_tv_template[] = {</div><div class='add'>+	{ /* Generated with Crypto++ */</div><div class='add'>+		.key	= "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"</div><div class='add'>+			  "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"</div><div class='add'>+			  "\x27\x04\xE1\x27\x04\xE1\xBE\x9B"</div><div class='add'>+			  "\x78\xBE\x9B\x78\x55\x32\x0F\x55",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\xE2\x24\x89\xEE\x53\xB8\x1D\x5F"</div><div class='add'>+			  "\xC4\x29\x8E\xF3\x35\x9A\xFF\x64",</div><div class='add'>+		.input	= "\x80\xCF\x11\x41\x1A\xB9\x4B\x9C"</div><div class='add'>+			  "\xFF\xB7\x6C\xEA\xF0\xAF\x77\x6E"</div><div class='add'>+			  "\x71\x75\x95\x9D\x4E\x1C\xCF\xAD"</div><div class='add'>+			  "\x81\x34\xE9\x8F\xAE\x5A\x91\x1C"</div><div class='add'>+			  "\x38\x63\x35\x7E\x79\x18\x0A\xE8"</div><div class='add'>+			  "\x67\x06\x76\xD5\xFF\x22\x2F\xDA"</div><div class='add'>+			  "\xB6\x2D\x57\x13\xB6\x3C\xBC\x97"</div><div class='add'>+			  "\xFE\x53\x75\x35\x97\x7F\x51\xEA"</div><div class='add'>+			  "\xDF\x5D\xE8\x9D\xCC\xD9\xAE\xE7"</div><div class='add'>+			  "\x62\x67\xFF\x04\xC2\x18\x22\x5F"</div><div class='add'>+			  "\x2E\x06\xC1\xE2\x26\xCD\xC6\x1E"</div><div class='add'>+			  "\xE5\x2C\x4E\x87\x23\xDD\xF0\x41"</div><div class='add'>+			  "\x08\xA5\xB4\x3E\x07\x1E\x0B\xBB"</div><div class='add'>+			  "\x72\x84\xF8\x0A\x3F\x38\x5E\x91"</div><div class='add'>+			  "\x15\x26\xE1\xDB\xA4\x3D\x74\xD2"</div><div class='add'>+			  "\x41\x1E\x3F\xA9\xC6\x7D\x2A\xAB"</div><div class='add'>+			  "\x27\xDF\x89\x1D\x86\x3E\xF7\x5A"</div><div class='add'>+			  "\xF6\xE3\x0F\xC7\x6B\x4C\x96\x7C",</div><div class='add'>+		.ilen	= 144,</div><div class='add'>+		.result	= "\x56\xED\x84\x1B\x8F\x26\xBD\x31"</div><div class='add'>+			  "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"</div><div class='add'>+			  "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"</div><div class='add'>+			  "\xAC\x20\xB7\x4E\xE5\x59\xF0\x87"</div><div class='add'>+			  "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"</div><div class='add'>+			  "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48"</div><div class='add'>+			  "\xDF\x76\x0D\x81\x18\xAF\x23\xBA"</div><div class='add'>+			  "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C"</div><div class='add'>+			  "\xC3\x37\xCE\x65\xFC\x70\x07\x9E"</div><div class='add'>+			  "\x12\xA9\x40\xD7\x4B\xE2\x79\x10"</div><div class='add'>+			  "\x84\x1B\xB2\x26\xBD\x54\xEB\x5F"</div><div class='add'>+			  "\xF6\x8D\x01\x98\x2F\xC6\x3A\xD1"</div><div class='add'>+			  "\x68\xFF\x73\x0A\xA1\x15\xAC\x43"</div><div class='add'>+			  "\xDA\x4E\xE5\x7C\x13\x87\x1E\xB5"</div><div class='add'>+			  "\x29\xC0\x57\xEE\x62\xF9\x90\x04"</div><div class='add'>+			  "\x9B\x32\xC9\x3D\xD4\x6B\x02\x76"</div><div class='add'>+			  "\x0D\xA4\x18\xAF\x46\xDD\x51\xE8"</div><div class='add'>+			  "\x7F\x16\x8A\x21\xB8\x2C\xC3\x5A",</div><div class='add'>+		.rlen	= 144,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec serpent_ctr_enc_tv_template[] = {</div><div class='add'>+	{ /* Generated with Crypto++ */</div><div class='add'>+		.key	= "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"</div><div class='add'>+			  "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"</div><div class='add'>+			  "\x27\x04\xE1\x27\x04\xE1\xBE\x9B"</div><div class='add'>+			  "\x78\xBE\x9B\x78\x55\x32\x0F\x55",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\xE2\x24\x89\xEE\x53\xB8\x1D\x5F"</div><div class='add'>+			  "\xC4\x29\x8E\xF3\x35\x9A\xFF\x64",</div><div class='add'>+		.input	= "\x56\xED\x84\x1B\x8F\x26\xBD\x31"</div><div class='add'>+			  "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"</div><div class='add'>+			  "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"</div><div class='add'>+			  "\xAC\x20\xB7\x4E\xE5\x59\xF0\x87"</div><div class='add'>+			  "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"</div><div class='add'>+			  "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48"</div><div class='add'>+			  "\xDF\x76\x0D\x81\x18\xAF\x23\xBA"</div><div class='add'>+			  "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C"</div><div class='add'>+			  "\xC3\x37\xCE\x65\xFC\x70\x07\x9E"</div><div class='add'>+			  "\x12\xA9\x40\xD7\x4B\xE2\x79\x10"</div><div class='add'>+			  "\x84\x1B\xB2\x26\xBD\x54\xEB\x5F"</div><div class='add'>+			  "\xF6\x8D\x01\x98\x2F\xC6\x3A\xD1"</div><div class='add'>+			  "\x68\xFF\x73\x0A\xA1\x15\xAC\x43"</div><div class='add'>+			  "\xDA\x4E\xE5\x7C\x13\x87\x1E\xB5"</div><div class='add'>+			  "\x29\xC0\x57\xEE\x62\xF9\x90\x04"</div><div class='add'>+			  "\x9B\x32\xC9\x3D\xD4\x6B\x02\x76"</div><div class='add'>+			  "\x0D\xA4\x18\xAF\x46\xDD\x51\xE8"</div><div class='add'>+			  "\x7F\x16\x8A\x21\xB8\x2C\xC3\x5A",</div><div class='add'>+		.ilen	= 144,</div><div class='add'>+		.result	= "\x84\x68\xEC\xF2\x1C\x88\x20\xCA"</div><div class='add'>+			  "\x37\x69\xE3\x3A\x22\x85\x48\x46"</div><div class='add'>+			  "\x70\xAA\x25\xB4\xCD\x8B\x04\x4E"</div><div class='add'>+			  "\x8D\x15\x2B\x98\xDF\x7B\x6D\xB9"</div><div class='add'>+			  "\xE0\x4A\x73\x00\x65\xB6\x1A\x0D"</div><div class='add'>+			  "\x5C\x60\xDF\x34\xDC\x60\x4C\xDF"</div><div class='add'>+			  "\xB5\x1F\x26\x8C\xDA\xC1\x11\xA8"</div><div class='add'>+			  "\x80\xFA\x37\x7A\x89\xAA\xAE\x7B"</div><div class='add'>+			  "\x92\x6E\xB9\xDC\xC9\x62\x4F\x88"</div><div class='add'>+			  "\x0A\x5D\x97\x2F\x6B\xAC\x03\x7C"</div><div class='add'>+			  "\x22\xF6\x55\x5A\xFA\x35\xA5\x17"</div><div class='add'>+			  "\xA1\x5C\x5E\x2B\x63\x2D\xB9\x91"</div><div class='add'>+			  "\x3E\x83\x26\x00\x4E\xD5\xBE\xCE"</div><div class='add'>+			  "\x79\xC4\x3D\xFC\x70\xA0\xAD\x96"</div><div class='add'>+			  "\xBA\x58\x2A\x1C\xDF\xC2\x3A\xA5"</div><div class='add'>+			  "\x7C\xB5\x12\x89\xED\xBF\xB6\x09"</div><div class='add'>+			  "\x13\x4F\x7D\x61\x3C\x5C\x27\xFC"</div><div class='add'>+			  "\x5D\xE1\x4F\xA1\xEA\xB3\xCA\xB9",</div><div class='add'>+		.rlen	= 144,</div><div class='add'>+	}, { /* Generated with Crypto++ */</div><div class='add'>+		.key	= "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"</div><div class='add'>+			  "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"</div><div class='add'>+			  "\x27\x04\xE1\x27\x04\xE1\xBE\x9B"</div><div class='add'>+			  "\x78\xBE\x9B\x78\x55\x32\x0F\x55",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\xE2\x24\x89\xEE\x53\xB8\x1D\x5F"</div><div class='add'>+			  "\xC4\x29\x8E\xF3\x35\x9A\xFF\x64",</div><div class='add'>+		.input	= "\x56\xED\x84\x1B\x8F\x26\xBD\x31"</div><div class='add'>+			  "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"</div><div class='add'>+			  "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"</div><div class='add'>+			  "\xAC\x20\xB7\x4E\xE5\x59\xF0\x87"</div><div class='add'>+			  "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"</div><div class='add'>+			  "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48"</div><div class='add'>+			  "\xDF\x76\x0D\x81\x18\xAF\x23\xBA"</div><div class='add'>+			  "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C"</div><div class='add'>+			  "\xC3\x37\xCE\x65\xFC\x70\x07\x9E"</div><div class='add'>+			  "\x12\xA9\x40\xD7\x4B\xE2\x79\x10"</div><div class='add'>+			  "\x84\x1B\xB2\x26\xBD\x54\xEB\x5F"</div><div class='add'>+			  "\xF6\x8D\x01\x98\x2F\xC6\x3A\xD1"</div><div class='add'>+			  "\x68\xFF\x73\x0A\xA1\x15\xAC\x43"</div><div class='add'>+			  "\xDA\x4E\xE5\x7C\x13\x87\x1E\xB5"</div><div class='add'>+			  "\x29\xC0\x57\xEE\x62\xF9\x90\x04"</div><div class='add'>+			  "\x9B\x32\xC9\x3D\xD4\x6B\x02\x76"</div><div class='add'>+			  "\x0D\xA4\x18\xAF\x46\xDD\x51\xE8"</div><div class='add'>+			  "\x7F\x16\x8A\x21\xB8\x2C\xC3\x5A"</div><div class='add'>+			  "\xF1\x65\xFC",</div><div class='add'>+		.ilen	= 147,</div><div class='add'>+		.result	= "\x84\x68\xEC\xF2\x1C\x88\x20\xCA"</div><div class='add'>+			  "\x37\x69\xE3\x3A\x22\x85\x48\x46"</div><div class='add'>+			  "\x70\xAA\x25\xB4\xCD\x8B\x04\x4E"</div><div class='add'>+			  "\x8D\x15\x2B\x98\xDF\x7B\x6D\xB9"</div><div class='add'>+			  "\xE0\x4A\x73\x00\x65\xB6\x1A\x0D"</div><div class='add'>+			  "\x5C\x60\xDF\x34\xDC\x60\x4C\xDF"</div><div class='add'>+			  "\xB5\x1F\x26\x8C\xDA\xC1\x11\xA8"</div><div class='add'>+			  "\x80\xFA\x37\x7A\x89\xAA\xAE\x7B"</div><div class='add'>+			  "\x92\x6E\xB9\xDC\xC9\x62\x4F\x88"</div><div class='add'>+			  "\x0A\x5D\x97\x2F\x6B\xAC\x03\x7C"</div><div class='add'>+			  "\x22\xF6\x55\x5A\xFA\x35\xA5\x17"</div><div class='add'>+			  "\xA1\x5C\x5E\x2B\x63\x2D\xB9\x91"</div><div class='add'>+			  "\x3E\x83\x26\x00\x4E\xD5\xBE\xCE"</div><div class='add'>+			  "\x79\xC4\x3D\xFC\x70\xA0\xAD\x96"</div><div class='add'>+			  "\xBA\x58\x2A\x1C\xDF\xC2\x3A\xA5"</div><div class='add'>+			  "\x7C\xB5\x12\x89\xED\xBF\xB6\x09"</div><div class='add'>+			  "\x13\x4F\x7D\x61\x3C\x5C\x27\xFC"</div><div class='add'>+			  "\x5D\xE1\x4F\xA1\xEA\xB3\xCA\xB9"</div><div class='add'>+			  "\xE6\xD0\x97",</div><div class='add'>+		.rlen	= 147,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec serpent_ctr_dec_tv_template[] = {</div><div class='add'>+	{ /* Generated with Crypto++ */</div><div class='add'>+		.key	= "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"</div><div class='add'>+			  "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"</div><div class='add'>+			  "\x27\x04\xE1\x27\x04\xE1\xBE\x9B"</div><div class='add'>+			  "\x78\xBE\x9B\x78\x55\x32\x0F\x55",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\xE2\x24\x89\xEE\x53\xB8\x1D\x5F"</div><div class='add'>+			  "\xC4\x29\x8E\xF3\x35\x9A\xFF\x64",</div><div class='add'>+		.input	= "\x84\x68\xEC\xF2\x1C\x88\x20\xCA"</div><div class='add'>+			  "\x37\x69\xE3\x3A\x22\x85\x48\x46"</div><div class='add'>+			  "\x70\xAA\x25\xB4\xCD\x8B\x04\x4E"</div><div class='add'>+			  "\x8D\x15\x2B\x98\xDF\x7B\x6D\xB9"</div><div class='add'>+			  "\xE0\x4A\x73\x00\x65\xB6\x1A\x0D"</div><div class='add'>+			  "\x5C\x60\xDF\x34\xDC\x60\x4C\xDF"</div><div class='add'>+			  "\xB5\x1F\x26\x8C\xDA\xC1\x11\xA8"</div><div class='add'>+			  "\x80\xFA\x37\x7A\x89\xAA\xAE\x7B"</div><div class='add'>+			  "\x92\x6E\xB9\xDC\xC9\x62\x4F\x88"</div><div class='add'>+			  "\x0A\x5D\x97\x2F\x6B\xAC\x03\x7C"</div><div class='add'>+			  "\x22\xF6\x55\x5A\xFA\x35\xA5\x17"</div><div class='add'>+			  "\xA1\x5C\x5E\x2B\x63\x2D\xB9\x91"</div><div class='add'>+			  "\x3E\x83\x26\x00\x4E\xD5\xBE\xCE"</div><div class='add'>+			  "\x79\xC4\x3D\xFC\x70\xA0\xAD\x96"</div><div class='add'>+			  "\xBA\x58\x2A\x1C\xDF\xC2\x3A\xA5"</div><div class='add'>+			  "\x7C\xB5\x12\x89\xED\xBF\xB6\x09"</div><div class='add'>+			  "\x13\x4F\x7D\x61\x3C\x5C\x27\xFC"</div><div class='add'>+			  "\x5D\xE1\x4F\xA1\xEA\xB3\xCA\xB9",</div><div class='add'>+		.ilen	= 144,</div><div class='add'>+		.result	= "\x56\xED\x84\x1B\x8F\x26\xBD\x31"</div><div class='add'>+			  "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"</div><div class='add'>+			  "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"</div><div class='add'>+			  "\xAC\x20\xB7\x4E\xE5\x59\xF0\x87"</div><div class='add'>+			  "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"</div><div class='add'>+			  "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48"</div><div class='add'>+			  "\xDF\x76\x0D\x81\x18\xAF\x23\xBA"</div><div class='add'>+			  "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C"</div><div class='add'>+			  "\xC3\x37\xCE\x65\xFC\x70\x07\x9E"</div><div class='add'>+			  "\x12\xA9\x40\xD7\x4B\xE2\x79\x10"</div><div class='add'>+			  "\x84\x1B\xB2\x26\xBD\x54\xEB\x5F"</div><div class='add'>+			  "\xF6\x8D\x01\x98\x2F\xC6\x3A\xD1"</div><div class='add'>+			  "\x68\xFF\x73\x0A\xA1\x15\xAC\x43"</div><div class='add'>+			  "\xDA\x4E\xE5\x7C\x13\x87\x1E\xB5"</div><div class='add'>+			  "\x29\xC0\x57\xEE\x62\xF9\x90\x04"</div><div class='add'>+			  "\x9B\x32\xC9\x3D\xD4\x6B\x02\x76"</div><div class='add'>+			  "\x0D\xA4\x18\xAF\x46\xDD\x51\xE8"</div><div class='add'>+			  "\x7F\x16\x8A\x21\xB8\x2C\xC3\x5A",</div><div class='add'>+		.rlen	= 144,</div><div class='add'>+	}, { /* Generated with Crypto++ */</div><div class='add'>+		.key	= "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"</div><div class='add'>+			  "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"</div><div class='add'>+			  "\x27\x04\xE1\x27\x04\xE1\xBE\x9B"</div><div class='add'>+			  "\x78\xBE\x9B\x78\x55\x32\x0F\x55",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\xE2\x24\x89\xEE\x53\xB8\x1D\x5F"</div><div class='add'>+			  "\xC4\x29\x8E\xF3\x35\x9A\xFF\x64",</div><div class='add'>+		.input	= "\x84\x68\xEC\xF2\x1C\x88\x20\xCA"</div><div class='add'>+			  "\x37\x69\xE3\x3A\x22\x85\x48\x46"</div><div class='add'>+			  "\x70\xAA\x25\xB4\xCD\x8B\x04\x4E"</div><div class='add'>+			  "\x8D\x15\x2B\x98\xDF\x7B\x6D\xB9"</div><div class='add'>+			  "\xE0\x4A\x73\x00\x65\xB6\x1A\x0D"</div><div class='add'>+			  "\x5C\x60\xDF\x34\xDC\x60\x4C\xDF"</div><div class='add'>+			  "\xB5\x1F\x26\x8C\xDA\xC1\x11\xA8"</div><div class='add'>+			  "\x80\xFA\x37\x7A\x89\xAA\xAE\x7B"</div><div class='add'>+			  "\x92\x6E\xB9\xDC\xC9\x62\x4F\x88"</div><div class='add'>+			  "\x0A\x5D\x97\x2F\x6B\xAC\x03\x7C"</div><div class='add'>+			  "\x22\xF6\x55\x5A\xFA\x35\xA5\x17"</div><div class='add'>+			  "\xA1\x5C\x5E\x2B\x63\x2D\xB9\x91"</div><div class='add'>+			  "\x3E\x83\x26\x00\x4E\xD5\xBE\xCE"</div><div class='add'>+			  "\x79\xC4\x3D\xFC\x70\xA0\xAD\x96"</div><div class='add'>+			  "\xBA\x58\x2A\x1C\xDF\xC2\x3A\xA5"</div><div class='add'>+			  "\x7C\xB5\x12\x89\xED\xBF\xB6\x09"</div><div class='add'>+			  "\x13\x4F\x7D\x61\x3C\x5C\x27\xFC"</div><div class='add'>+			  "\x5D\xE1\x4F\xA1\xEA\xB3\xCA\xB9"</div><div class='add'>+			  "\xE6\xD0\x97",</div><div class='add'>+		.ilen	= 147,</div><div class='add'>+		.result	= "\x56\xED\x84\x1B\x8F\x26\xBD\x31"</div><div class='add'>+			  "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"</div><div class='add'>+			  "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"</div><div class='add'>+			  "\xAC\x20\xB7\x4E\xE5\x59\xF0\x87"</div><div class='add'>+			  "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"</div><div class='add'>+			  "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48"</div><div class='add'>+			  "\xDF\x76\x0D\x81\x18\xAF\x23\xBA"</div><div class='add'>+			  "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C"</div><div class='add'>+			  "\xC3\x37\xCE\x65\xFC\x70\x07\x9E"</div><div class='add'>+			  "\x12\xA9\x40\xD7\x4B\xE2\x79\x10"</div><div class='add'>+			  "\x84\x1B\xB2\x26\xBD\x54\xEB\x5F"</div><div class='add'>+			  "\xF6\x8D\x01\x98\x2F\xC6\x3A\xD1"</div><div class='add'>+			  "\x68\xFF\x73\x0A\xA1\x15\xAC\x43"</div><div class='add'>+			  "\xDA\x4E\xE5\x7C\x13\x87\x1E\xB5"</div><div class='add'>+			  "\x29\xC0\x57\xEE\x62\xF9\x90\x04"</div><div class='add'>+			  "\x9B\x32\xC9\x3D\xD4\x6B\x02\x76"</div><div class='add'>+			  "\x0D\xA4\x18\xAF\x46\xDD\x51\xE8"</div><div class='add'>+			  "\x7F\x16\x8A\x21\xB8\x2C\xC3\x5A"</div><div class='add'>+			  "\xF1\x65\xFC",</div><div class='add'>+		.rlen	= 147,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec serpent_lrw_enc_tv_template[] = {</div><div class='add'>+	/* Generated from AES-LRW test vectors */</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x45\x62\xac\x25\xf8\x28\x17\x6d"</div><div class='add'>+			  "\x4c\x26\x84\x14\xb5\x68\x01\x85"</div><div class='add'>+			  "\x25\x8e\x2a\x05\xe7\x3e\x9d\x03"</div><div class='add'>+			  "\xee\x5a\x83\x0c\xcc\x09\x4c\x87",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x6f\xbf\xd4\xa4\x5d\x71\x16\x79"</div><div class='add'>+			  "\x63\x9c\xa6\x8e\x40\xbe\x0d\x8a",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x59\x70\x47\x14\xf5\x57\x47\x8c"</div><div class='add'>+			  "\xd7\x79\xe8\x0f\x54\x88\x79\x44"</div><div class='add'>+			  "\x0d\x48\xf0\xb7\xb1\x5a\x53\xea"</div><div class='add'>+			  "\x1c\xaa\x6b\x29\xc2\xca\xfb\xaf",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x02",</div><div class='add'>+		.input	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xfd\xb2\x66\x98\x80\x96\x55\xad"</div><div class='add'>+			  "\x08\x94\x54\x9c\x21\x7c\x69\xe3",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xd8\x2a\x91\x34\xb2\x6a\x56\x50"</div><div class='add'>+			  "\x30\xfe\x69\xe2\x37\x7f\x98\x47"</div><div class='add'>+			  "\xcd\xf9\x0b\x16\x0c\x64\x8f\xb6"</div><div class='add'>+			  "\xb0\x0d\x0d\x1b\xae\x85\x87\x1f",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x14\x5e\x3d\x70\xc0\x6e\x9c\x34"</div><div class='add'>+			  "\x5b\x5e\xcf\x0f\xe4\x8c\x21\x5c",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x0f\x6a\xef\xf8\xd3\xd2\xbb\x15"</div><div class='add'>+			  "\x25\x83\xf7\x3c\x1f\x01\x28\x74"</div><div class='add'>+			  "\xca\xc6\xbc\x35\x4d\x4a\x65\x54"</div><div class='add'>+			  "\x90\xae\x61\xcf\x7b\xae\xbd\xcc"</div><div class='add'>+			  "\xad\xe4\x94\xc5\x4a\x29\xae\x70",</div><div class='add'>+		.klen	= 40,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x25\x39\xaa\xa5\xf0\x65\xc8\xdc"</div><div class='add'>+			  "\x5d\x45\x95\x30\x8f\xff\x2f\x1b",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x8a\xd4\xee\x10\x2f\xbd\x81\xff"</div><div class='add'>+			  "\xf8\x86\xce\xac\x93\xc5\xad\xc6"</div><div class='add'>+			  "\xa0\x19\x07\xc0\x9d\xf7\xbb\xdd"</div><div class='add'>+			  "\x52\x13\xb2\xb7\xf0\xff\x11\xd8"</div><div class='add'>+			  "\xd6\x08\xd0\xcd\x2e\xb1\x17\x6f",</div><div class='add'>+		.klen	= 40,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x0c\x20\x20\x63\xd6\x8b\xfc\x8f"</div><div class='add'>+			  "\xc0\xe2\x17\xbb\xd2\x59\x6f\x26",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"</div><div class='add'>+			  "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"</div><div class='add'>+			  "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"</div><div class='add'>+			  "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"</div><div class='add'>+			  "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"</div><div class='add'>+			  "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",</div><div class='add'>+		.klen	= 48,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\xc1\x35\x2e\x53\xf0\x96\x4d\x9c"</div><div class='add'>+			  "\x2e\x18\xe6\x99\xcd\xd3\x15\x68",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xfb\x76\x15\xb2\x3d\x80\x89\x1d"</div><div class='add'>+			  "\xd4\x70\x98\x0b\xc7\x95\x84\xc8"</div><div class='add'>+			  "\xb2\xfb\x64\xce\x60\x97\x87\x8d"</div><div class='add'>+			  "\x17\xfc\xe4\x5a\x49\xe8\x30\xb7"</div><div class='add'>+			  "\x6e\x78\x17\xe7\x2d\x5e\x12\xd4"</div><div class='add'>+			  "\x60\x64\x04\x7a\xf1\x2f\x9e\x0c",</div><div class='add'>+		.klen	= 48,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x86\x0a\xc6\xa9\x1a\x9f\xe7\xe6"</div><div class='add'>+			  "\x64\x3b\x33\xd6\xd5\x84\xd6\xdf",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"</div><div class='add'>+			  "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"</div><div class='add'>+			  "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"</div><div class='add'>+			  "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"</div><div class='add'>+			  "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"</div><div class='add'>+			  "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",</div><div class='add'>+		.klen	= 48,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input	= "\x05\x11\xb7\x18\xab\xc6\x2d\xac"</div><div class='add'>+			  "\x70\x5d\xf6\x22\x94\xcd\xe5\x6c"</div><div class='add'>+			  "\x17\x6b\xf6\x1c\xf0\xf3\x6e\xf8"</div><div class='add'>+			  "\x50\x38\x1f\x71\x49\xb6\x57\xd6"</div><div class='add'>+			  "\x8f\xcb\x8d\x6b\xe3\xa6\x29\x90"</div><div class='add'>+			  "\xfe\x2a\x62\x82\xae\x6d\x8b\xf6"</div><div class='add'>+			  "\xad\x1e\x9e\x20\x5f\x38\xbe\x04"</div><div class='add'>+			  "\xda\x10\x8e\xed\xa2\xa4\x87\xab"</div><div class='add'>+			  "\xda\x6b\xb4\x0c\x75\xba\xd3\x7c"</div><div class='add'>+			  "\xc9\xac\x42\x31\x95\x7c\xc9\x04"</div><div class='add'>+			  "\xeb\xd5\x6e\x32\x69\x8a\xdb\xa6"</div><div class='add'>+			  "\x15\xd7\x3f\x4f\x2f\x66\x69\x03"</div><div class='add'>+			  "\x9c\x1f\x54\x0f\xde\x1f\xf3\x65"</div><div class='add'>+			  "\x4c\x96\x12\xed\x7c\x92\x03\x01"</div><div class='add'>+			  "\x6f\xbc\x35\x93\xac\xf1\x27\xf1"</div><div class='add'>+			  "\xb4\x96\x82\x5a\x5f\xb0\xa0\x50"</div><div class='add'>+			  "\x89\xa4\x8e\x66\x44\x85\xcc\xfd"</div><div class='add'>+			  "\x33\x14\x70\xe3\x96\xb2\xc3\xd3"</div><div class='add'>+			  "\xbb\x54\x5a\x1a\xf9\x74\xa2\xc5"</div><div class='add'>+			  "\x2d\x64\x75\xdd\xb4\x54\xe6\x74"</div><div class='add'>+			  "\x8c\xd3\x9d\x9e\x86\xab\x51\x53"</div><div class='add'>+			  "\xb7\x93\x3e\x6f\xd0\x4e\x2c\x40"</div><div class='add'>+			  "\xf6\xa8\x2e\x3e\x9d\xf4\x66\xa5"</div><div class='add'>+			  "\x76\x12\x73\x44\x1a\x56\xd7\x72"</div><div class='add'>+			  "\x88\xcd\x21\x8c\x4c\x0f\xfe\xda"</div><div class='add'>+			  "\x95\xe0\x3a\xa6\xa5\x84\x46\xcd"</div><div class='add'>+			  "\xd5\x3e\x9d\x3a\xe2\x67\xe6\x60"</div><div class='add'>+			  "\x1a\xe2\x70\x85\x58\xc2\x1b\x09"</div><div class='add'>+			  "\xe1\xd7\x2c\xca\xad\xa8\x8f\xf9"</div><div class='add'>+			  "\xac\xb3\x0e\xdb\xca\x2e\xe2\xb8"</div><div class='add'>+			  "\x51\x71\xd9\x3c\x6c\xf1\x56\xf8"</div><div class='add'>+			  "\xea\x9c\xf1\xfb\x0c\xe6\xb7\x10"</div><div class='add'>+			  "\x1c\xf8\xa9\x7c\xe8\x53\x35\xc1"</div><div class='add'>+			  "\x90\x3e\x76\x4a\x74\xa4\x21\x2c"</div><div class='add'>+			  "\xf6\x2c\x4e\x0f\x94\x3a\x88\x2e"</div><div class='add'>+			  "\x41\x09\x6a\x33\x7d\xf6\xdd\x3f"</div><div class='add'>+			  "\x8d\x23\x31\x74\x84\xeb\x88\x6e"</div><div class='add'>+			  "\xcc\xb9\xbc\x22\x83\x19\x07\x22"</div><div class='add'>+			  "\xa5\x2d\xdf\xa5\xf3\x80\x85\x78"</div><div class='add'>+			  "\x84\x39\x6a\x6d\x6a\x99\x4f\xa5"</div><div class='add'>+			  "\x15\xfe\x46\xb0\xe4\x6c\xa5\x41"</div><div class='add'>+			  "\x3c\xce\x8f\x42\x60\x71\xa7\x75"</div><div class='add'>+			  "\x08\x40\x65\x8a\x82\xbf\xf5\x43"</div><div class='add'>+			  "\x71\x96\xa9\x4d\x44\x8a\x20\xbe"</div><div class='add'>+			  "\xfa\x4d\xbb\xc0\x7d\x31\x96\x65"</div><div class='add'>+			  "\xe7\x75\xe5\x3e\xfd\x92\x3b\xc9"</div><div class='add'>+			  "\x55\xbb\x16\x7e\xf7\xc2\x8c\xa4"</div><div class='add'>+			  "\x40\x1d\xe5\xef\x0e\xdf\xe4\x9a"</div><div class='add'>+			  "\x62\x73\x65\xfd\x46\x63\x25\x3d"</div><div class='add'>+			  "\x2b\xaf\xe5\x64\xfe\xa5\x5c\xcf"</div><div class='add'>+			  "\x24\xf3\xb4\xac\x64\xba\xdf\x4b"</div><div class='add'>+			  "\xc6\x96\x7d\x81\x2d\x8d\x97\xf7"</div><div class='add'>+			  "\xc5\x68\x77\x84\x32\x2b\xcc\x85"</div><div class='add'>+			  "\x74\x96\xf0\x12\x77\x61\xb9\xeb"</div><div class='add'>+			  "\x71\xaa\x82\xcb\x1c\xdb\x89\xc8"</div><div class='add'>+			  "\xc6\xb5\xe3\x5c\x7d\x39\x07\x24"</div><div class='add'>+			  "\xda\x39\x87\x45\xc0\x2b\xbb\x01"</div><div class='add'>+			  "\xac\xbc\x2a\x5c\x7f\xfc\xe8\xce"</div><div class='add'>+			  "\x6d\x9c\x6f\xed\xd3\xc1\xa1\xd6"</div><div class='add'>+			  "\xc5\x55\xa9\x66\x2f\xe1\xc8\x32"</div><div class='add'>+			  "\xa6\x5d\xa4\x3a\x98\x73\xe8\x45"</div><div class='add'>+			  "\xa4\xc7\xa8\xb4\xf6\x13\x03\xf6"</div><div class='add'>+			  "\xe9\x2e\xc4\x29\x0f\x84\xdb\xc4"</div><div class='add'>+			  "\x21\xc4\xc2\x75\x67\x89\x37\x0a",</div><div class='add'>+		.ilen	= 512,</div><div class='add'>+		.result	= "\xe3\x5a\x38\x0f\x4d\x92\x3a\x74"</div><div class='add'>+			  "\x15\xb1\x50\x8c\x9a\xd8\x99\x1d"</div><div class='add'>+			  "\x82\xec\xf1\x5f\x03\x6d\x02\x58"</div><div class='add'>+			  "\x90\x67\xfc\xdd\x8d\xe1\x38\x08"</div><div class='add'>+			  "\x7b\xc9\x9b\x4b\x04\x09\x50\x15"</div><div class='add'>+			  "\xce\xab\xda\x33\x30\x20\x12\xfa"</div><div class='add'>+			  "\x83\xc4\xa6\x9a\x2e\x7d\x90\xd9"</div><div class='add'>+			  "\xa6\xa6\x67\x43\xb4\xa7\xa8\x5c"</div><div class='add'>+			  "\xbb\x6a\x49\x2b\x8b\xf8\xd0\x22"</div><div class='add'>+			  "\xe5\x9e\xba\xe8\x8c\x67\xb8\x5b"</div><div class='add'>+			  "\x60\xbc\xf5\xa4\x95\x4e\x66\xe5"</div><div class='add'>+			  "\x6d\x8e\xa9\xf6\x65\x2e\x04\xf5"</div><div class='add'>+			  "\xba\xb5\xdb\x88\xc2\xf6\x7a\x4b"</div><div class='add'>+			  "\x89\x58\x7c\x9a\xae\x26\xe8\xb7"</div><div class='add'>+			  "\xb7\x28\xcc\xd6\xcc\xa5\x98\x4d"</div><div class='add'>+			  "\xb9\x91\xcb\xb4\xe4\x8b\x96\x47"</div><div class='add'>+			  "\x5f\x03\x8b\xdd\x94\xd1\xee\x12"</div><div class='add'>+			  "\xa7\x83\x80\xf2\xc1\x15\x74\x4f"</div><div class='add'>+			  "\x49\xf9\xb0\x7e\x6f\xdc\x73\x2f"</div><div class='add'>+			  "\xe2\xcf\xe0\x1b\x34\xa5\xa0\x52"</div><div class='add'>+			  "\xfb\x3c\x5d\x85\x91\xe6\x6d\x98"</div><div class='add'>+			  "\x04\xd6\xdd\x4c\x00\x64\xd9\x54"</div><div class='add'>+			  "\x5c\x3c\x08\x1d\x4c\x06\x9f\xb8"</div><div class='add'>+			  "\x1c\x4d\x8d\xdc\xa4\x3c\xb9\x3b"</div><div class='add'>+			  "\x9e\x85\xce\xc3\xa8\x4a\x0c\xd9"</div><div class='add'>+			  "\x04\xc3\x6f\x17\x66\xa9\x1f\x59"</div><div class='add'>+			  "\xd9\xe2\x19\x36\xa3\x88\xb8\x0b"</div><div class='add'>+			  "\x0f\x4a\x4d\xf8\xc8\x6f\xd5\x43"</div><div class='add'>+			  "\xeb\xa0\xab\x1f\x61\xc0\x06\xeb"</div><div class='add'>+			  "\x93\xb7\xb8\x6f\x0d\xbd\x07\x49"</div><div class='add'>+			  "\xb3\xac\x5d\xcf\x31\xa0\x27\x26"</div><div class='add'>+			  "\x21\xbe\x94\x2e\x19\xea\xf4\xee"</div><div class='add'>+			  "\xb5\x13\x89\xf7\x94\x0b\xef\x59"</div><div class='add'>+			  "\x44\xc5\x78\x8b\x3c\x3b\x71\x20"</div><div class='add'>+			  "\xf9\x35\x0c\x70\x74\xdc\x5b\xc2"</div><div class='add'>+			  "\xb4\x11\x0e\x2c\x61\xa1\x52\x46"</div><div class='add'>+			  "\x18\x11\x16\xc6\x86\x44\xa7\xaf"</div><div class='add'>+			  "\xd5\x0c\x7d\xa6\x9e\x25\x2d\x1b"</div><div class='add'>+			  "\x9a\x8f\x0f\xf8\x6a\x61\xa0\xea"</div><div class='add'>+			  "\x3f\x0e\x90\xd6\x8f\x83\x30\x64"</div><div class='add'>+			  "\xb5\x51\x2d\x08\x3c\xcd\x99\x36"</div><div class='add'>+			  "\x96\xd4\xb1\xb5\x48\x30\xca\x48"</div><div class='add'>+			  "\xf7\x11\xa8\xf5\x97\x8a\x6a\x6d"</div><div class='add'>+			  "\x12\x33\x2f\xc0\xe8\xda\xec\x8a"</div><div class='add'>+			  "\xe1\x88\x72\x63\xde\x20\xa3\xe1"</div><div class='add'>+			  "\x8e\xac\x84\x37\x35\xf5\xf7\x3f"</div><div class='add'>+			  "\x00\x02\x0e\xe4\xc1\x53\x68\x3f"</div><div class='add'>+			  "\xaa\xd5\xac\x52\x3d\x20\x2f\x4d"</div><div class='add'>+			  "\x7c\x83\xd0\xbd\xaa\x97\x35\x36"</div><div class='add'>+			  "\x98\x88\x59\x5d\xe7\x24\xe3\x90"</div><div class='add'>+			  "\x9d\x30\x47\xa7\xc3\x60\x35\xf4"</div><div class='add'>+			  "\xd5\xdb\x0e\x4d\x44\xc1\x81\x8b"</div><div class='add'>+			  "\xfd\xbd\xc3\x2b\xba\x68\xfe\x8d"</div><div class='add'>+			  "\x49\x5a\x3c\x8a\xa3\x01\xae\x25"</div><div class='add'>+			  "\x42\xab\xd2\x87\x1b\x35\xd6\xd2"</div><div class='add'>+			  "\xd7\x70\x1c\x1f\x72\xd1\xe1\x39"</div><div class='add'>+			  "\x1c\x58\xa2\xb4\xd0\x78\x55\x72"</div><div class='add'>+			  "\x76\x59\xea\xd9\xd7\x6e\x63\x8b"</div><div class='add'>+			  "\xcc\x9b\xa7\x74\x89\xfc\xa3\x68"</div><div class='add'>+			  "\x86\x28\xd1\xbb\x54\x8d\x66\xad"</div><div class='add'>+			  "\x2a\x92\xf9\x4e\x04\x3d\xae\xfd"</div><div class='add'>+			  "\x1b\x2b\x7f\xc3\x2f\x1a\x78\x0a"</div><div class='add'>+			  "\x5c\xc6\x84\xfe\x7c\xcb\x26\xfd"</div><div class='add'>+			  "\xd9\x51\x0f\xd7\x94\x2f\xc5\xa7",</div><div class='add'>+		.rlen	= 512,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec serpent_lrw_dec_tv_template[] = {</div><div class='add'>+	/* Generated from AES-LRW test vectors */</div><div class='add'>+	/* same as enc vectors with input and result reversed */</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x45\x62\xac\x25\xf8\x28\x17\x6d"</div><div class='add'>+			  "\x4c\x26\x84\x14\xb5\x68\x01\x85"</div><div class='add'>+			  "\x25\x8e\x2a\x05\xe7\x3e\x9d\x03"</div><div class='add'>+			  "\xee\x5a\x83\x0c\xcc\x09\x4c\x87",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input	= "\x6f\xbf\xd4\xa4\x5d\x71\x16\x79"</div><div class='add'>+			  "\x63\x9c\xa6\x8e\x40\xbe\x0d\x8a",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x59\x70\x47\x14\xf5\x57\x47\x8c"</div><div class='add'>+			  "\xd7\x79\xe8\x0f\x54\x88\x79\x44"</div><div class='add'>+			  "\x0d\x48\xf0\xb7\xb1\x5a\x53\xea"</div><div class='add'>+			  "\x1c\xaa\x6b\x29\xc2\xca\xfb\xaf",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x02",</div><div class='add'>+		.input	= "\xfd\xb2\x66\x98\x80\x96\x55\xad"</div><div class='add'>+			  "\x08\x94\x54\x9c\x21\x7c\x69\xe3",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xd8\x2a\x91\x34\xb2\x6a\x56\x50"</div><div class='add'>+			  "\x30\xfe\x69\xe2\x37\x7f\x98\x47"</div><div class='add'>+			  "\xcd\xf9\x0b\x16\x0c\x64\x8f\xb6"</div><div class='add'>+			  "\xb0\x0d\x0d\x1b\xae\x85\x87\x1f",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x14\x5e\x3d\x70\xc0\x6e\x9c\x34"</div><div class='add'>+			  "\x5b\x5e\xcf\x0f\xe4\x8c\x21\x5c",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x0f\x6a\xef\xf8\xd3\xd2\xbb\x15"</div><div class='add'>+			  "\x25\x83\xf7\x3c\x1f\x01\x28\x74"</div><div class='add'>+			  "\xca\xc6\xbc\x35\x4d\x4a\x65\x54"</div><div class='add'>+			  "\x90\xae\x61\xcf\x7b\xae\xbd\xcc"</div><div class='add'>+			  "\xad\xe4\x94\xc5\x4a\x29\xae\x70",</div><div class='add'>+		.klen	= 40,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input	= "\x25\x39\xaa\xa5\xf0\x65\xc8\xdc"</div><div class='add'>+			  "\x5d\x45\x95\x30\x8f\xff\x2f\x1b",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x8a\xd4\xee\x10\x2f\xbd\x81\xff"</div><div class='add'>+			  "\xf8\x86\xce\xac\x93\xc5\xad\xc6"</div><div class='add'>+			  "\xa0\x19\x07\xc0\x9d\xf7\xbb\xdd"</div><div class='add'>+			  "\x52\x13\xb2\xb7\xf0\xff\x11\xd8"</div><div class='add'>+			  "\xd6\x08\xd0\xcd\x2e\xb1\x17\x6f",</div><div class='add'>+		.klen	= 40,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x0c\x20\x20\x63\xd6\x8b\xfc\x8f"</div><div class='add'>+			  "\xc0\xe2\x17\xbb\xd2\x59\x6f\x26",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"</div><div class='add'>+			  "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"</div><div class='add'>+			  "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"</div><div class='add'>+			  "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"</div><div class='add'>+			  "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"</div><div class='add'>+			  "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",</div><div class='add'>+		.klen	= 48,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input	= "\xc1\x35\x2e\x53\xf0\x96\x4d\x9c"</div><div class='add'>+			  "\x2e\x18\xe6\x99\xcd\xd3\x15\x68",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xfb\x76\x15\xb2\x3d\x80\x89\x1d"</div><div class='add'>+			  "\xd4\x70\x98\x0b\xc7\x95\x84\xc8"</div><div class='add'>+			  "\xb2\xfb\x64\xce\x60\x97\x87\x8d"</div><div class='add'>+			  "\x17\xfc\xe4\x5a\x49\xe8\x30\xb7"</div><div class='add'>+			  "\x6e\x78\x17\xe7\x2d\x5e\x12\xd4"</div><div class='add'>+			  "\x60\x64\x04\x7a\xf1\x2f\x9e\x0c",</div><div class='add'>+		.klen	= 48,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x02\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x86\x0a\xc6\xa9\x1a\x9f\xe7\xe6"</div><div class='add'>+			  "\x64\x3b\x33\xd6\xd5\x84\xd6\xdf",</div><div class='add'>+		.ilen	= 16,</div><div class='add'>+		.result	= "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x41\x42\x43\x44\x45\x46",</div><div class='add'>+		.rlen	= 16,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"</div><div class='add'>+			  "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"</div><div class='add'>+			  "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"</div><div class='add'>+			  "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"</div><div class='add'>+			  "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"</div><div class='add'>+			  "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",</div><div class='add'>+		.klen	= 48,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x01",</div><div class='add'>+		.input	= "\xe3\x5a\x38\x0f\x4d\x92\x3a\x74"</div><div class='add'>+			  "\x15\xb1\x50\x8c\x9a\xd8\x99\x1d"</div><div class='add'>+			  "\x82\xec\xf1\x5f\x03\x6d\x02\x58"</div><div class='add'>+			  "\x90\x67\xfc\xdd\x8d\xe1\x38\x08"</div><div class='add'>+			  "\x7b\xc9\x9b\x4b\x04\x09\x50\x15"</div><div class='add'>+			  "\xce\xab\xda\x33\x30\x20\x12\xfa"</div><div class='add'>+			  "\x83\xc4\xa6\x9a\x2e\x7d\x90\xd9"</div><div class='add'>+			  "\xa6\xa6\x67\x43\xb4\xa7\xa8\x5c"</div><div class='add'>+			  "\xbb\x6a\x49\x2b\x8b\xf8\xd0\x22"</div><div class='add'>+			  "\xe5\x9e\xba\xe8\x8c\x67\xb8\x5b"</div><div class='add'>+			  "\x60\xbc\xf5\xa4\x95\x4e\x66\xe5"</div><div class='add'>+			  "\x6d\x8e\xa9\xf6\x65\x2e\x04\xf5"</div><div class='add'>+			  "\xba\xb5\xdb\x88\xc2\xf6\x7a\x4b"</div><div class='add'>+			  "\x89\x58\x7c\x9a\xae\x26\xe8\xb7"</div><div class='add'>+			  "\xb7\x28\xcc\xd6\xcc\xa5\x98\x4d"</div><div class='add'>+			  "\xb9\x91\xcb\xb4\xe4\x8b\x96\x47"</div><div class='add'>+			  "\x5f\x03\x8b\xdd\x94\xd1\xee\x12"</div><div class='add'>+			  "\xa7\x83\x80\xf2\xc1\x15\x74\x4f"</div><div class='add'>+			  "\x49\xf9\xb0\x7e\x6f\xdc\x73\x2f"</div><div class='add'>+			  "\xe2\xcf\xe0\x1b\x34\xa5\xa0\x52"</div><div class='add'>+			  "\xfb\x3c\x5d\x85\x91\xe6\x6d\x98"</div><div class='add'>+			  "\x04\xd6\xdd\x4c\x00\x64\xd9\x54"</div><div class='add'>+			  "\x5c\x3c\x08\x1d\x4c\x06\x9f\xb8"</div><div class='add'>+			  "\x1c\x4d\x8d\xdc\xa4\x3c\xb9\x3b"</div><div class='add'>+			  "\x9e\x85\xce\xc3\xa8\x4a\x0c\xd9"</div><div class='add'>+			  "\x04\xc3\x6f\x17\x66\xa9\x1f\x59"</div><div class='add'>+			  "\xd9\xe2\x19\x36\xa3\x88\xb8\x0b"</div><div class='add'>+			  "\x0f\x4a\x4d\xf8\xc8\x6f\xd5\x43"</div><div class='add'>+			  "\xeb\xa0\xab\x1f\x61\xc0\x06\xeb"</div><div class='add'>+			  "\x93\xb7\xb8\x6f\x0d\xbd\x07\x49"</div><div class='add'>+			  "\xb3\xac\x5d\xcf\x31\xa0\x27\x26"</div><div class='add'>+			  "\x21\xbe\x94\x2e\x19\xea\xf4\xee"</div><div class='add'>+			  "\xb5\x13\x89\xf7\x94\x0b\xef\x59"</div><div class='add'>+			  "\x44\xc5\x78\x8b\x3c\x3b\x71\x20"</div><div class='add'>+			  "\xf9\x35\x0c\x70\x74\xdc\x5b\xc2"</div><div class='add'>+			  "\xb4\x11\x0e\x2c\x61\xa1\x52\x46"</div><div class='add'>+			  "\x18\x11\x16\xc6\x86\x44\xa7\xaf"</div><div class='add'>+			  "\xd5\x0c\x7d\xa6\x9e\x25\x2d\x1b"</div><div class='add'>+			  "\x9a\x8f\x0f\xf8\x6a\x61\xa0\xea"</div><div class='add'>+			  "\x3f\x0e\x90\xd6\x8f\x83\x30\x64"</div><div class='add'>+			  "\xb5\x51\x2d\x08\x3c\xcd\x99\x36"</div><div class='add'>+			  "\x96\xd4\xb1\xb5\x48\x30\xca\x48"</div><div class='add'>+			  "\xf7\x11\xa8\xf5\x97\x8a\x6a\x6d"</div><div class='add'>+			  "\x12\x33\x2f\xc0\xe8\xda\xec\x8a"</div><div class='add'>+			  "\xe1\x88\x72\x63\xde\x20\xa3\xe1"</div><div class='add'>+			  "\x8e\xac\x84\x37\x35\xf5\xf7\x3f"</div><div class='add'>+			  "\x00\x02\x0e\xe4\xc1\x53\x68\x3f"</div><div class='add'>+			  "\xaa\xd5\xac\x52\x3d\x20\x2f\x4d"</div><div class='add'>+			  "\x7c\x83\xd0\xbd\xaa\x97\x35\x36"</div><div class='add'>+			  "\x98\x88\x59\x5d\xe7\x24\xe3\x90"</div><div class='add'>+			  "\x9d\x30\x47\xa7\xc3\x60\x35\xf4"</div><div class='add'>+			  "\xd5\xdb\x0e\x4d\x44\xc1\x81\x8b"</div><div class='add'>+			  "\xfd\xbd\xc3\x2b\xba\x68\xfe\x8d"</div><div class='add'>+			  "\x49\x5a\x3c\x8a\xa3\x01\xae\x25"</div><div class='add'>+			  "\x42\xab\xd2\x87\x1b\x35\xd6\xd2"</div><div class='add'>+			  "\xd7\x70\x1c\x1f\x72\xd1\xe1\x39"</div><div class='add'>+			  "\x1c\x58\xa2\xb4\xd0\x78\x55\x72"</div><div class='add'>+			  "\x76\x59\xea\xd9\xd7\x6e\x63\x8b"</div><div class='add'>+			  "\xcc\x9b\xa7\x74\x89\xfc\xa3\x68"</div><div class='add'>+			  "\x86\x28\xd1\xbb\x54\x8d\x66\xad"</div><div class='add'>+			  "\x2a\x92\xf9\x4e\x04\x3d\xae\xfd"</div><div class='add'>+			  "\x1b\x2b\x7f\xc3\x2f\x1a\x78\x0a"</div><div class='add'>+			  "\x5c\xc6\x84\xfe\x7c\xcb\x26\xfd"</div><div class='add'>+			  "\xd9\x51\x0f\xd7\x94\x2f\xc5\xa7",</div><div class='add'>+		.ilen	= 512,</div><div class='add'>+		.result	= "\x05\x11\xb7\x18\xab\xc6\x2d\xac"</div><div class='add'>+			  "\x70\x5d\xf6\x22\x94\xcd\xe5\x6c"</div><div class='add'>+			  "\x17\x6b\xf6\x1c\xf0\xf3\x6e\xf8"</div><div class='add'>+			  "\x50\x38\x1f\x71\x49\xb6\x57\xd6"</div><div class='add'>+			  "\x8f\xcb\x8d\x6b\xe3\xa6\x29\x90"</div><div class='add'>+			  "\xfe\x2a\x62\x82\xae\x6d\x8b\xf6"</div><div class='add'>+			  "\xad\x1e\x9e\x20\x5f\x38\xbe\x04"</div><div class='add'>+			  "\xda\x10\x8e\xed\xa2\xa4\x87\xab"</div><div class='add'>+			  "\xda\x6b\xb4\x0c\x75\xba\xd3\x7c"</div><div class='add'>+			  "\xc9\xac\x42\x31\x95\x7c\xc9\x04"</div><div class='add'>+			  "\xeb\xd5\x6e\x32\x69\x8a\xdb\xa6"</div><div class='add'>+			  "\x15\xd7\x3f\x4f\x2f\x66\x69\x03"</div><div class='add'>+			  "\x9c\x1f\x54\x0f\xde\x1f\xf3\x65"</div><div class='add'>+			  "\x4c\x96\x12\xed\x7c\x92\x03\x01"</div><div class='add'>+			  "\x6f\xbc\x35\x93\xac\xf1\x27\xf1"</div><div class='add'>+			  "\xb4\x96\x82\x5a\x5f\xb0\xa0\x50"</div><div class='add'>+			  "\x89\xa4\x8e\x66\x44\x85\xcc\xfd"</div><div class='add'>+			  "\x33\x14\x70\xe3\x96\xb2\xc3\xd3"</div><div class='add'>+			  "\xbb\x54\x5a\x1a\xf9\x74\xa2\xc5"</div><div class='add'>+			  "\x2d\x64\x75\xdd\xb4\x54\xe6\x74"</div><div class='add'>+			  "\x8c\xd3\x9d\x9e\x86\xab\x51\x53"</div><div class='add'>+			  "\xb7\x93\x3e\x6f\xd0\x4e\x2c\x40"</div><div class='add'>+			  "\xf6\xa8\x2e\x3e\x9d\xf4\x66\xa5"</div><div class='add'>+			  "\x76\x12\x73\x44\x1a\x56\xd7\x72"</div><div class='add'>+			  "\x88\xcd\x21\x8c\x4c\x0f\xfe\xda"</div><div class='add'>+			  "\x95\xe0\x3a\xa6\xa5\x84\x46\xcd"</div><div class='add'>+			  "\xd5\x3e\x9d\x3a\xe2\x67\xe6\x60"</div><div class='add'>+			  "\x1a\xe2\x70\x85\x58\xc2\x1b\x09"</div><div class='add'>+			  "\xe1\xd7\x2c\xca\xad\xa8\x8f\xf9"</div><div class='add'>+			  "\xac\xb3\x0e\xdb\xca\x2e\xe2\xb8"</div><div class='add'>+			  "\x51\x71\xd9\x3c\x6c\xf1\x56\xf8"</div><div class='add'>+			  "\xea\x9c\xf1\xfb\x0c\xe6\xb7\x10"</div><div class='add'>+			  "\x1c\xf8\xa9\x7c\xe8\x53\x35\xc1"</div><div class='add'>+			  "\x90\x3e\x76\x4a\x74\xa4\x21\x2c"</div><div class='add'>+			  "\xf6\x2c\x4e\x0f\x94\x3a\x88\x2e"</div><div class='add'>+			  "\x41\x09\x6a\x33\x7d\xf6\xdd\x3f"</div><div class='add'>+			  "\x8d\x23\x31\x74\x84\xeb\x88\x6e"</div><div class='add'>+			  "\xcc\xb9\xbc\x22\x83\x19\x07\x22"</div><div class='add'>+			  "\xa5\x2d\xdf\xa5\xf3\x80\x85\x78"</div><div class='add'>+			  "\x84\x39\x6a\x6d\x6a\x99\x4f\xa5"</div><div class='add'>+			  "\x15\xfe\x46\xb0\xe4\x6c\xa5\x41"</div><div class='add'>+			  "\x3c\xce\x8f\x42\x60\x71\xa7\x75"</div><div class='add'>+			  "\x08\x40\x65\x8a\x82\xbf\xf5\x43"</div><div class='add'>+			  "\x71\x96\xa9\x4d\x44\x8a\x20\xbe"</div><div class='add'>+			  "\xfa\x4d\xbb\xc0\x7d\x31\x96\x65"</div><div class='add'>+			  "\xe7\x75\xe5\x3e\xfd\x92\x3b\xc9"</div><div class='add'>+			  "\x55\xbb\x16\x7e\xf7\xc2\x8c\xa4"</div><div class='add'>+			  "\x40\x1d\xe5\xef\x0e\xdf\xe4\x9a"</div><div class='add'>+			  "\x62\x73\x65\xfd\x46\x63\x25\x3d"</div><div class='add'>+			  "\x2b\xaf\xe5\x64\xfe\xa5\x5c\xcf"</div><div class='add'>+			  "\x24\xf3\xb4\xac\x64\xba\xdf\x4b"</div><div class='add'>+			  "\xc6\x96\x7d\x81\x2d\x8d\x97\xf7"</div><div class='add'>+			  "\xc5\x68\x77\x84\x32\x2b\xcc\x85"</div><div class='add'>+			  "\x74\x96\xf0\x12\x77\x61\xb9\xeb"</div><div class='add'>+			  "\x71\xaa\x82\xcb\x1c\xdb\x89\xc8"</div><div class='add'>+			  "\xc6\xb5\xe3\x5c\x7d\x39\x07\x24"</div><div class='add'>+			  "\xda\x39\x87\x45\xc0\x2b\xbb\x01"</div><div class='add'>+			  "\xac\xbc\x2a\x5c\x7f\xfc\xe8\xce"</div><div class='add'>+			  "\x6d\x9c\x6f\xed\xd3\xc1\xa1\xd6"</div><div class='add'>+			  "\xc5\x55\xa9\x66\x2f\xe1\xc8\x32"</div><div class='add'>+			  "\xa6\x5d\xa4\x3a\x98\x73\xe8\x45"</div><div class='add'>+			  "\xa4\xc7\xa8\xb4\xf6\x13\x03\xf6"</div><div class='add'>+			  "\xe9\x2e\xc4\x29\x0f\x84\xdb\xc4"</div><div class='add'>+			  "\x21\xc4\xc2\x75\x67\x89\x37\x0a",</div><div class='add'>+		.rlen	= 512,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec serpent_xts_enc_tv_template[] = {</div><div class='add'>+	/* Generated from AES-XTS test vectors */</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\xe1\x08\xb8\x1d\x2c\xf5\x33\x64"</div><div class='add'>+			  "\xc8\x12\x04\xc7\xb3\x70\xe8\xc4"</div><div class='add'>+			  "\x6a\x31\xc5\xf3\x00\xca\xb9\x16"</div><div class='add'>+			  "\xde\xe2\x77\x66\xf7\xfe\x62\x08",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x11\x11\x11\x11\x11\x11\x11\x11"</div><div class='add'>+			  "\x11\x11\x11\x11\x11\x11\x11\x11"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x33\x33\x33\x33\x33\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x1a\x0a\x09\x5f\xcd\x07\x07\x98"</div><div class='add'>+			  "\x41\x86\x12\xaf\xb3\xd7\x68\x13"</div><div class='add'>+			  "\xed\x81\xcd\x06\x87\x43\x1a\xbb"</div><div class='add'>+			  "\x13\x3d\xd6\x1e\x2b\xe1\x77\xbe",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xff\xfe\xfd\xfc\xfb\xfa\xf9\xf8"</div><div class='add'>+			  "\xf7\xf6\xf5\xf4\xf3\xf2\xf1\xf0"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x33\x33\x33\x33\x33\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\xf9\x9b\x28\xb8\x5c\xaf\x8c\x61"</div><div class='add'>+			  "\xb6\x1c\x81\x8f\x2c\x87\x60\x89"</div><div class='add'>+			  "\x0d\x8d\x7a\xe8\x60\x48\xcc\x86"</div><div class='add'>+			  "\xc1\x68\x45\xaa\x00\xe9\x24\xc5",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x27\x18\x28\x18\x28\x45\x90\x45"</div><div class='add'>+			  "\x23\x53\x60\x28\x74\x71\x35\x26"</div><div class='add'>+			  "\x31\x41\x59\x26\x53\x58\x97\x93"</div><div class='add'>+			  "\x23\x84\x62\x64\x33\x83\x27\x95",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"</div><div class='add'>+			  "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",</div><div class='add'>+		.ilen	= 512,</div><div class='add'>+		.result	= "\xfe\x47\x4a\xc8\x60\x7e\xb4\x8b"</div><div class='add'>+			  "\x0d\x10\xf4\xb0\x0d\xba\xf8\x53"</div><div class='add'>+			  "\x65\x6e\x38\x4b\xdb\xaa\xb1\x9e"</div><div class='add'>+			  "\x28\xca\xb0\x22\xb3\x85\x75\xf4"</div><div class='add'>+			  "\x00\x5c\x75\x14\x06\xd6\x25\x82"</div><div class='add'>+			  "\xe6\xcb\x08\xf7\x29\x90\x23\x8e"</div><div class='add'>+			  "\xa4\x68\x57\xe4\xf0\xd8\x32\xf3"</div><div class='add'>+			  "\x80\x51\x67\xb5\x0b\x85\x69\xe8"</div><div class='add'>+			  "\x19\xfe\xc4\xc7\x3e\xea\x90\xd3"</div><div class='add'>+			  "\x8f\xa3\xf2\x0a\xac\x17\x4b\xa0"</div><div class='add'>+			  "\x63\x5a\x16\x0f\xf0\xce\x66\x1f"</div><div class='add'>+			  "\x2c\x21\x07\xf1\xa4\x03\xa3\x44"</div><div class='add'>+			  "\x41\x61\x87\x5d\x6b\xb3\xef\xd4"</div><div class='add'>+			  "\xfc\xaa\x32\x7e\x55\x58\x04\x41"</div><div class='add'>+			  "\xc9\x07\x33\xc6\xa2\x68\xd6\x5a"</div><div class='add'>+			  "\x55\x79\x4b\x6f\xcf\x89\xb9\x19"</div><div class='add'>+			  "\xe5\x54\x13\x15\xb2\x1a\xfa\x15"</div><div class='add'>+			  "\xc2\xf0\x06\x59\xfa\xa0\x25\x05"</div><div class='add'>+			  "\x58\xfa\x43\x91\x16\x85\x40\xbb"</div><div class='add'>+			  "\x0d\x34\x4d\xc5\x1e\x20\xd5\x08"</div><div class='add'>+			  "\xcd\x22\x22\x41\x11\x9f\x6c\x7c"</div><div class='add'>+			  "\x8d\x57\xc9\xba\x57\xe8\x2c\xf7"</div><div class='add'>+			  "\xa0\x42\xa8\xde\xfc\xa3\xca\x98"</div><div class='add'>+			  "\x4b\x43\xb1\xce\x4b\xbf\x01\x67"</div><div class='add'>+			  "\x6e\x29\x60\xbd\x10\x14\x84\x82"</div><div class='add'>+			  "\x83\x82\x0c\x63\x73\x92\x02\x7c"</div><div class='add'>+			  "\x55\x37\x20\x80\x17\x51\xc8\xbc"</div><div class='add'>+			  "\x46\x02\xcb\x38\x07\x6d\xe2\x85"</div><div class='add'>+			  "\xaa\x29\xaf\x24\x58\x0d\xf0\x75"</div><div class='add'>+			  "\x08\x0a\xa5\x34\x25\x16\xf3\x74"</div><div class='add'>+			  "\xa7\x0b\x97\xbe\xc1\xa9\xdc\x29"</div><div class='add'>+			  "\x1a\x0a\x56\xc1\x1a\x91\x97\x8c"</div><div class='add'>+			  "\x0b\xc7\x16\xed\x5a\x22\xa6\x2e"</div><div class='add'>+			  "\x8c\x2b\x4f\x54\x76\x47\x53\x8e"</div><div class='add'>+			  "\xe8\x00\xec\x92\xb9\x55\xe6\xa2"</div><div class='add'>+			  "\xf3\xe2\x4f\x6a\x66\x60\xd0\x87"</div><div class='add'>+			  "\xe6\xd1\xcc\xe3\x6a\xc5\x2d\x21"</div><div class='add'>+			  "\xcc\x9d\x6a\xb6\x75\xaa\xe2\x19"</div><div class='add'>+			  "\x21\x9f\xa1\x5e\x4c\xfd\x72\xf9"</div><div class='add'>+			  "\x94\x4e\x63\xc7\xae\xfc\xed\x47"</div><div class='add'>+			  "\xe2\xfe\x7a\x63\x77\xfe\x97\x82"</div><div class='add'>+			  "\xb1\x10\x6e\x36\x1d\xe1\xc4\x80"</div><div class='add'>+			  "\xec\x69\x41\xec\xa7\x8a\xe0\x2f"</div><div class='add'>+			  "\xe3\x49\x26\xa2\x41\xb2\x08\x0f"</div><div class='add'>+			  "\x28\xb4\xa7\x39\xa1\x99\x2d\x1e"</div><div class='add'>+			  "\x43\x42\x35\xd0\xcf\xec\x77\x67"</div><div class='add'>+			  "\xb2\x3b\x9e\x1c\x35\xde\x4f\x5e"</div><div class='add'>+			  "\x73\x3f\x5d\x6f\x07\x4b\x2e\x50"</div><div class='add'>+			  "\xab\x6c\x6b\xff\xea\x00\x67\xaa"</div><div class='add'>+			  "\x0e\x82\x32\xdd\x3d\xb5\xe5\x76"</div><div class='add'>+			  "\x2b\x77\x3f\xbe\x12\x75\xfb\x92"</div><div class='add'>+			  "\xc6\x89\x67\x4d\xca\xf7\xd4\x50"</div><div class='add'>+			  "\xc0\x74\x47\xcc\xd9\x0a\xd4\xc6"</div><div class='add'>+			  "\x3b\x17\x2e\xe3\x35\xbb\x53\xb5"</div><div class='add'>+			  "\x86\xad\x51\xcc\xd5\x96\xb8\xdc"</div><div class='add'>+			  "\x03\x57\xe6\x98\x52\x2f\x61\x62"</div><div class='add'>+			  "\xc4\x5c\x9c\x36\x71\x07\xfb\x94"</div><div class='add'>+			  "\xe3\x02\xc4\x2b\x08\x75\xc7\x35"</div><div class='add'>+			  "\xfb\x2e\x88\x7b\xbb\x67\x00\xe1"</div><div class='add'>+			  "\xc9\xdd\x99\xb2\x13\x53\x1a\x4e"</div><div class='add'>+			  "\x76\x87\x19\x04\x1a\x2f\x38\x3e"</div><div class='add'>+			  "\xef\x91\x64\x1d\x18\x07\x4e\x31"</div><div class='add'>+			  "\x88\x21\x7c\xb0\xa5\x12\x4c\x3c"</div><div class='add'>+			  "\xb0\x20\xbd\xda\xdf\xf9\x7c\xdd",</div><div class='add'>+		.rlen	= 512,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x27\x18\x28\x18\x28\x45\x90\x45"</div><div class='add'>+			  "\x23\x53\x60\x28\x74\x71\x35\x26"</div><div class='add'>+			  "\x62\x49\x77\x57\x24\x70\x93\x69"</div><div class='add'>+			  "\x99\x59\x57\x49\x66\x96\x76\x27"</div><div class='add'>+			  "\x31\x41\x59\x26\x53\x58\x97\x93"</div><div class='add'>+			  "\x23\x84\x62\x64\x33\x83\x27\x95"</div><div class='add'>+			  "\x02\x88\x41\x97\x16\x93\x99\x37"</div><div class='add'>+			  "\x51\x05\x82\x09\x74\x94\x45\x92",</div><div class='add'>+		.klen	= 64,</div><div class='add'>+		.iv	= "\xff\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"</div><div class='add'>+			  "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",</div><div class='add'>+		.ilen	= 512,</div><div class='add'>+		.result	= "\x2b\xc9\xb4\x6b\x10\x94\xa9\x32"</div><div class='add'>+			  "\xaa\xb0\x20\xc6\x44\x3d\x74\x1f"</div><div class='add'>+			  "\x75\x01\xa7\xf6\xf5\xf7\x62\x1b"</div><div class='add'>+			  "\x80\x1b\x82\xcb\x01\x59\x91\x7f"</div><div class='add'>+			  "\x80\x3a\x98\xf0\xd2\xca\xc4\xc3"</div><div class='add'>+			  "\x34\xfd\xe6\x11\xf9\x33\x45\x12"</div><div class='add'>+			  "\x48\xc5\x8c\x25\xf1\xc5\xc5\x23"</div><div class='add'>+			  "\xd3\x44\xb4\x73\xd5\x04\xc0\xb7"</div><div class='add'>+			  "\xca\x2f\xf5\xcd\xc5\xb4\xdd\xb0"</div><div class='add'>+			  "\xf4\x60\xe8\xfb\xc6\x9c\xc5\x78"</div><div class='add'>+			  "\xcd\xec\x7d\xdc\x19\x9c\x72\x64"</div><div class='add'>+			  "\x63\x0b\x38\x2e\x76\xdd\x2d\x36"</div><div class='add'>+			  "\x49\xb0\x1d\xea\x78\x9e\x00\xca"</div><div class='add'>+			  "\x20\xcc\x1b\x1e\x98\x74\xab\xed"</div><div class='add'>+			  "\x79\xf7\xd0\x6c\xd8\x93\x80\x29"</div><div class='add'>+			  "\xac\xa5\x5e\x34\xa9\xab\xa0\x55"</div><div class='add'>+			  "\x9a\xea\xaa\x95\x4d\x7b\xfe\x46"</div><div class='add'>+			  "\x26\x8a\xfd\x88\xa2\xa8\xa6\xae"</div><div class='add'>+			  "\x25\x42\x17\xbf\x76\x8f\x1c\x3d"</div><div class='add'>+			  "\xec\x9a\xda\x64\x96\xb5\x61\xff"</div><div class='add'>+			  "\x99\xeb\x12\x96\x85\x82\x9d\xd5"</div><div class='add'>+			  "\x81\x85\x14\xa8\x59\xac\x8c\x94"</div><div class='add'>+			  "\xbb\x3b\x85\x2b\xdf\xb3\x0c\xba"</div><div class='add'>+			  "\x82\xc6\x4d\xca\x86\xea\x53\x28"</div><div class='add'>+			  "\x4c\xe0\x4e\x31\xe3\x73\x2f\x79"</div><div class='add'>+			  "\x9d\x42\xe1\x03\xe3\x8b\xc4\xff"</div><div class='add'>+			  "\x05\xca\x81\x7b\xda\xa2\xde\x63"</div><div class='add'>+			  "\x3a\x10\xbe\xc2\xac\x32\xc4\x05"</div><div class='add'>+			  "\x47\x7e\xef\x67\xe2\x5f\x5b\xae"</div><div class='add'>+			  "\xed\xf1\x70\x34\x16\x9a\x07\x7b"</div><div class='add'>+			  "\xf2\x25\x2b\xb0\xf8\x3c\x15\x9a"</div><div class='add'>+			  "\xa6\x59\x55\x5f\xc1\xf4\x1e\xcd"</div><div class='add'>+			  "\x93\x1f\x06\xba\xd4\x9a\x22\x69"</div><div class='add'>+			  "\xfa\x8e\x95\x0d\xf3\x23\x59\x2c"</div><div class='add'>+			  "\xfe\x00\xba\xf0\x0e\xbc\x6d\xd6"</div><div class='add'>+			  "\x62\xf0\x7a\x0e\x83\x3e\xdb\x32"</div><div class='add'>+			  "\xfd\x43\x7d\xda\x42\x51\x87\x43"</div><div class='add'>+			  "\x9d\xf9\xef\xf4\x30\x97\xf8\x09"</div><div class='add'>+			  "\x88\xfc\x3f\x93\x70\xc1\x4a\xec"</div><div class='add'>+			  "\x27\x5f\x11\xac\x71\xc7\x48\x46"</div><div class='add'>+			  "\x2f\xf9\xdf\x8d\x9f\xf7\x2e\x56"</div><div class='add'>+			  "\x0d\x4e\xb0\x32\x76\xce\x86\x81"</div><div class='add'>+			  "\xcd\xdf\xe4\x00\xbf\xfd\x5f\x24"</div><div class='add'>+			  "\xaf\xf7\x9a\xde\xff\x18\xac\x14"</div><div class='add'>+			  "\x90\xc5\x01\x39\x34\x0f\x24\xf3"</div><div class='add'>+			  "\x13\x2f\x5e\x4f\x30\x9a\x36\x40"</div><div class='add'>+			  "\xec\xea\xbc\xcd\x9e\x0e\x5b\x23"</div><div class='add'>+			  "\x50\x88\x97\x40\x69\xb1\x37\xf5"</div><div class='add'>+			  "\xc3\x15\xf9\x3f\xb7\x79\x64\xe8"</div><div class='add'>+			  "\x7b\x10\x20\xb9\x2b\x46\x83\x5b"</div><div class='add'>+			  "\xd8\x39\xfc\xe4\xfa\x88\x52\xf2"</div><div class='add'>+			  "\x72\xb0\x97\x4e\x89\xb3\x48\x00"</div><div class='add'>+			  "\xc1\x16\x73\x50\x77\xba\xa6\x65"</div><div class='add'>+			  "\x20\x2d\xb0\x02\x27\x89\xda\x99"</div><div class='add'>+			  "\x45\xfb\xe9\xd3\x1d\x39\x2f\xd6"</div><div class='add'>+			  "\x2a\xda\x09\x12\x11\xaf\xe6\x57"</div><div class='add'>+			  "\x01\x04\x8a\xff\x86\x8b\xac\xf8"</div><div class='add'>+			  "\xee\xe4\x1c\x98\x5b\xcf\x6b\x76"</div><div class='add'>+			  "\xa3\x0e\x33\x74\x40\x18\x39\x72"</div><div class='add'>+			  "\x66\x50\x31\xfd\x70\xdf\xe8\x51"</div><div class='add'>+			  "\x96\x21\x36\xb2\x9b\xfa\x85\xd1"</div><div class='add'>+			  "\x30\x05\xc8\x92\x98\x80\xff\x7a"</div><div class='add'>+			  "\xaf\x43\x0b\xc5\x20\x41\x92\x20"</div><div class='add'>+			  "\xd4\xa0\x91\x98\x11\x5f\x4d\xb1",</div><div class='add'>+		.rlen	= 512,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cipher_testvec serpent_xts_dec_tv_template[] = {</div><div class='add'>+	/* Generated from AES-XTS test vectors */</div><div class='add'>+	/* same as enc vectors with input and result reversed */</div><div class='add'>+	{</div><div class='add'>+		.key	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\xe1\x08\xb8\x1d\x2c\xf5\x33\x64"</div><div class='add'>+			  "\xc8\x12\x04\xc7\xb3\x70\xe8\xc4"</div><div class='add'>+			  "\x6a\x31\xc5\xf3\x00\xca\xb9\x16"</div><div class='add'>+			  "\xde\xe2\x77\x66\xf7\xfe\x62\x08",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x11\x11\x11\x11\x11\x11\x11\x11"</div><div class='add'>+			  "\x11\x11\x11\x11\x11\x11\x11\x11"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x33\x33\x33\x33\x33\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x1a\x0a\x09\x5f\xcd\x07\x07\x98"</div><div class='add'>+			  "\x41\x86\x12\xaf\xb3\xd7\x68\x13"</div><div class='add'>+			  "\xed\x81\xcd\x06\x87\x43\x1a\xbb"</div><div class='add'>+			  "\x13\x3d\xd6\x1e\x2b\xe1\x77\xbe",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\xff\xfe\xfd\xfc\xfb\xfa\xf9\xf8"</div><div class='add'>+			  "\xf7\xf6\xf5\xf4\xf3\xf2\xf1\xf0"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22"</div><div class='add'>+			  "\x22\x22\x22\x22\x22\x22\x22\x22",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x33\x33\x33\x33\x33\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\xf9\x9b\x28\xb8\x5c\xaf\x8c\x61"</div><div class='add'>+			  "\xb6\x1c\x81\x8f\x2c\x87\x60\x89"</div><div class='add'>+			  "\x0d\x8d\x7a\xe8\x60\x48\xcc\x86"</div><div class='add'>+			  "\xc1\x68\x45\xaa\x00\xe9\x24\xc5",</div><div class='add'>+		.ilen	= 32,</div><div class='add'>+		.result	= "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44"</div><div class='add'>+			  "\x44\x44\x44\x44\x44\x44\x44\x44",</div><div class='add'>+		.rlen	= 32,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x27\x18\x28\x18\x28\x45\x90\x45"</div><div class='add'>+			  "\x23\x53\x60\x28\x74\x71\x35\x26"</div><div class='add'>+			  "\x31\x41\x59\x26\x53\x58\x97\x93"</div><div class='add'>+			  "\x23\x84\x62\x64\x33\x83\x27\x95",</div><div class='add'>+		.klen	= 32,</div><div class='add'>+		.iv	= "\x00\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\xfe\x47\x4a\xc8\x60\x7e\xb4\x8b"</div><div class='add'>+			  "\x0d\x10\xf4\xb0\x0d\xba\xf8\x53"</div><div class='add'>+			  "\x65\x6e\x38\x4b\xdb\xaa\xb1\x9e"</div><div class='add'>+			  "\x28\xca\xb0\x22\xb3\x85\x75\xf4"</div><div class='add'>+			  "\x00\x5c\x75\x14\x06\xd6\x25\x82"</div><div class='add'>+			  "\xe6\xcb\x08\xf7\x29\x90\x23\x8e"</div><div class='add'>+			  "\xa4\x68\x57\xe4\xf0\xd8\x32\xf3"</div><div class='add'>+			  "\x80\x51\x67\xb5\x0b\x85\x69\xe8"</div><div class='add'>+			  "\x19\xfe\xc4\xc7\x3e\xea\x90\xd3"</div><div class='add'>+			  "\x8f\xa3\xf2\x0a\xac\x17\x4b\xa0"</div><div class='add'>+			  "\x63\x5a\x16\x0f\xf0\xce\x66\x1f"</div><div class='add'>+			  "\x2c\x21\x07\xf1\xa4\x03\xa3\x44"</div><div class='add'>+			  "\x41\x61\x87\x5d\x6b\xb3\xef\xd4"</div><div class='add'>+			  "\xfc\xaa\x32\x7e\x55\x58\x04\x41"</div><div class='add'>+			  "\xc9\x07\x33\xc6\xa2\x68\xd6\x5a"</div><div class='add'>+			  "\x55\x79\x4b\x6f\xcf\x89\xb9\x19"</div><div class='add'>+			  "\xe5\x54\x13\x15\xb2\x1a\xfa\x15"</div><div class='add'>+			  "\xc2\xf0\x06\x59\xfa\xa0\x25\x05"</div><div class='add'>+			  "\x58\xfa\x43\x91\x16\x85\x40\xbb"</div><div class='add'>+			  "\x0d\x34\x4d\xc5\x1e\x20\xd5\x08"</div><div class='add'>+			  "\xcd\x22\x22\x41\x11\x9f\x6c\x7c"</div><div class='add'>+			  "\x8d\x57\xc9\xba\x57\xe8\x2c\xf7"</div><div class='add'>+			  "\xa0\x42\xa8\xde\xfc\xa3\xca\x98"</div><div class='add'>+			  "\x4b\x43\xb1\xce\x4b\xbf\x01\x67"</div><div class='add'>+			  "\x6e\x29\x60\xbd\x10\x14\x84\x82"</div><div class='add'>+			  "\x83\x82\x0c\x63\x73\x92\x02\x7c"</div><div class='add'>+			  "\x55\x37\x20\x80\x17\x51\xc8\xbc"</div><div class='add'>+			  "\x46\x02\xcb\x38\x07\x6d\xe2\x85"</div><div class='add'>+			  "\xaa\x29\xaf\x24\x58\x0d\xf0\x75"</div><div class='add'>+			  "\x08\x0a\xa5\x34\x25\x16\xf3\x74"</div><div class='add'>+			  "\xa7\x0b\x97\xbe\xc1\xa9\xdc\x29"</div><div class='add'>+			  "\x1a\x0a\x56\xc1\x1a\x91\x97\x8c"</div><div class='add'>+			  "\x0b\xc7\x16\xed\x5a\x22\xa6\x2e"</div><div class='add'>+			  "\x8c\x2b\x4f\x54\x76\x47\x53\x8e"</div><div class='add'>+			  "\xe8\x00\xec\x92\xb9\x55\xe6\xa2"</div><div class='add'>+			  "\xf3\xe2\x4f\x6a\x66\x60\xd0\x87"</div><div class='add'>+			  "\xe6\xd1\xcc\xe3\x6a\xc5\x2d\x21"</div><div class='add'>+			  "\xcc\x9d\x6a\xb6\x75\xaa\xe2\x19"</div><div class='add'>+			  "\x21\x9f\xa1\x5e\x4c\xfd\x72\xf9"</div><div class='add'>+			  "\x94\x4e\x63\xc7\xae\xfc\xed\x47"</div><div class='add'>+			  "\xe2\xfe\x7a\x63\x77\xfe\x97\x82"</div><div class='add'>+			  "\xb1\x10\x6e\x36\x1d\xe1\xc4\x80"</div><div class='add'>+			  "\xec\x69\x41\xec\xa7\x8a\xe0\x2f"</div><div class='add'>+			  "\xe3\x49\x26\xa2\x41\xb2\x08\x0f"</div><div class='add'>+			  "\x28\xb4\xa7\x39\xa1\x99\x2d\x1e"</div><div class='add'>+			  "\x43\x42\x35\xd0\xcf\xec\x77\x67"</div><div class='add'>+			  "\xb2\x3b\x9e\x1c\x35\xde\x4f\x5e"</div><div class='add'>+			  "\x73\x3f\x5d\x6f\x07\x4b\x2e\x50"</div><div class='add'>+			  "\xab\x6c\x6b\xff\xea\x00\x67\xaa"</div><div class='add'>+			  "\x0e\x82\x32\xdd\x3d\xb5\xe5\x76"</div><div class='add'>+			  "\x2b\x77\x3f\xbe\x12\x75\xfb\x92"</div><div class='add'>+			  "\xc6\x89\x67\x4d\xca\xf7\xd4\x50"</div><div class='add'>+			  "\xc0\x74\x47\xcc\xd9\x0a\xd4\xc6"</div><div class='add'>+			  "\x3b\x17\x2e\xe3\x35\xbb\x53\xb5"</div><div class='add'>+			  "\x86\xad\x51\xcc\xd5\x96\xb8\xdc"</div><div class='add'>+			  "\x03\x57\xe6\x98\x52\x2f\x61\x62"</div><div class='add'>+			  "\xc4\x5c\x9c\x36\x71\x07\xfb\x94"</div><div class='add'>+			  "\xe3\x02\xc4\x2b\x08\x75\xc7\x35"</div><div class='add'>+			  "\xfb\x2e\x88\x7b\xbb\x67\x00\xe1"</div><div class='add'>+			  "\xc9\xdd\x99\xb2\x13\x53\x1a\x4e"</div><div class='add'>+			  "\x76\x87\x19\x04\x1a\x2f\x38\x3e"</div><div class='add'>+			  "\xef\x91\x64\x1d\x18\x07\x4e\x31"</div><div class='add'>+			  "\x88\x21\x7c\xb0\xa5\x12\x4c\x3c"</div><div class='add'>+			  "\xb0\x20\xbd\xda\xdf\xf9\x7c\xdd",</div><div class='add'>+		.ilen	= 512,</div><div class='add'>+		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"</div><div class='add'>+			  "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",</div><div class='add'>+		.rlen	= 512,</div><div class='add'>+	}, {</div><div class='add'>+		.key	= "\x27\x18\x28\x18\x28\x45\x90\x45"</div><div class='add'>+			  "\x23\x53\x60\x28\x74\x71\x35\x26"</div><div class='add'>+			  "\x62\x49\x77\x57\x24\x70\x93\x69"</div><div class='add'>+			  "\x99\x59\x57\x49\x66\x96\x76\x27"</div><div class='add'>+			  "\x31\x41\x59\x26\x53\x58\x97\x93"</div><div class='add'>+			  "\x23\x84\x62\x64\x33\x83\x27\x95"</div><div class='add'>+			  "\x02\x88\x41\x97\x16\x93\x99\x37"</div><div class='add'>+			  "\x51\x05\x82\x09\x74\x94\x45\x92",</div><div class='add'>+		.klen	= 64,</div><div class='add'>+		.iv	= "\xff\x00\x00\x00\x00\x00\x00\x00"</div><div class='add'>+			  "\x00\x00\x00\x00\x00\x00\x00\x00",</div><div class='add'>+		.input	= "\x2b\xc9\xb4\x6b\x10\x94\xa9\x32"</div><div class='add'>+			  "\xaa\xb0\x20\xc6\x44\x3d\x74\x1f"</div><div class='add'>+			  "\x75\x01\xa7\xf6\xf5\xf7\x62\x1b"</div><div class='add'>+			  "\x80\x1b\x82\xcb\x01\x59\x91\x7f"</div><div class='add'>+			  "\x80\x3a\x98\xf0\xd2\xca\xc4\xc3"</div><div class='add'>+			  "\x34\xfd\xe6\x11\xf9\x33\x45\x12"</div><div class='add'>+			  "\x48\xc5\x8c\x25\xf1\xc5\xc5\x23"</div><div class='add'>+			  "\xd3\x44\xb4\x73\xd5\x04\xc0\xb7"</div><div class='add'>+			  "\xca\x2f\xf5\xcd\xc5\xb4\xdd\xb0"</div><div class='add'>+			  "\xf4\x60\xe8\xfb\xc6\x9c\xc5\x78"</div><div class='add'>+			  "\xcd\xec\x7d\xdc\x19\x9c\x72\x64"</div><div class='add'>+			  "\x63\x0b\x38\x2e\x76\xdd\x2d\x36"</div><div class='add'>+			  "\x49\xb0\x1d\xea\x78\x9e\x00\xca"</div><div class='add'>+			  "\x20\xcc\x1b\x1e\x98\x74\xab\xed"</div><div class='add'>+			  "\x79\xf7\xd0\x6c\xd8\x93\x80\x29"</div><div class='add'>+			  "\xac\xa5\x5e\x34\xa9\xab\xa0\x55"</div><div class='add'>+			  "\x9a\xea\xaa\x95\x4d\x7b\xfe\x46"</div><div class='add'>+			  "\x26\x8a\xfd\x88\xa2\xa8\xa6\xae"</div><div class='add'>+			  "\x25\x42\x17\xbf\x76\x8f\x1c\x3d"</div><div class='add'>+			  "\xec\x9a\xda\x64\x96\xb5\x61\xff"</div><div class='add'>+			  "\x99\xeb\x12\x96\x85\x82\x9d\xd5"</div><div class='add'>+			  "\x81\x85\x14\xa8\x59\xac\x8c\x94"</div><div class='add'>+			  "\xbb\x3b\x85\x2b\xdf\xb3\x0c\xba"</div><div class='add'>+			  "\x82\xc6\x4d\xca\x86\xea\x53\x28"</div><div class='add'>+			  "\x4c\xe0\x4e\x31\xe3\x73\x2f\x79"</div><div class='add'>+			  "\x9d\x42\xe1\x03\xe3\x8b\xc4\xff"</div><div class='add'>+			  "\x05\xca\x81\x7b\xda\xa2\xde\x63"</div><div class='add'>+			  "\x3a\x10\xbe\xc2\xac\x32\xc4\x05"</div><div class='add'>+			  "\x47\x7e\xef\x67\xe2\x5f\x5b\xae"</div><div class='add'>+			  "\xed\xf1\x70\x34\x16\x9a\x07\x7b"</div><div class='add'>+			  "\xf2\x25\x2b\xb0\xf8\x3c\x15\x9a"</div><div class='add'>+			  "\xa6\x59\x55\x5f\xc1\xf4\x1e\xcd"</div><div class='add'>+			  "\x93\x1f\x06\xba\xd4\x9a\x22\x69"</div><div class='add'>+			  "\xfa\x8e\x95\x0d\xf3\x23\x59\x2c"</div><div class='add'>+			  "\xfe\x00\xba\xf0\x0e\xbc\x6d\xd6"</div><div class='add'>+			  "\x62\xf0\x7a\x0e\x83\x3e\xdb\x32"</div><div class='add'>+			  "\xfd\x43\x7d\xda\x42\x51\x87\x43"</div><div class='add'>+			  "\x9d\xf9\xef\xf4\x30\x97\xf8\x09"</div><div class='add'>+			  "\x88\xfc\x3f\x93\x70\xc1\x4a\xec"</div><div class='add'>+			  "\x27\x5f\x11\xac\x71\xc7\x48\x46"</div><div class='add'>+			  "\x2f\xf9\xdf\x8d\x9f\xf7\x2e\x56"</div><div class='add'>+			  "\x0d\x4e\xb0\x32\x76\xce\x86\x81"</div><div class='add'>+			  "\xcd\xdf\xe4\x00\xbf\xfd\x5f\x24"</div><div class='add'>+			  "\xaf\xf7\x9a\xde\xff\x18\xac\x14"</div><div class='add'>+			  "\x90\xc5\x01\x39\x34\x0f\x24\xf3"</div><div class='add'>+			  "\x13\x2f\x5e\x4f\x30\x9a\x36\x40"</div><div class='add'>+			  "\xec\xea\xbc\xcd\x9e\x0e\x5b\x23"</div><div class='add'>+			  "\x50\x88\x97\x40\x69\xb1\x37\xf5"</div><div class='add'>+			  "\xc3\x15\xf9\x3f\xb7\x79\x64\xe8"</div><div class='add'>+			  "\x7b\x10\x20\xb9\x2b\x46\x83\x5b"</div><div class='add'>+			  "\xd8\x39\xfc\xe4\xfa\x88\x52\xf2"</div><div class='add'>+			  "\x72\xb0\x97\x4e\x89\xb3\x48\x00"</div><div class='add'>+			  "\xc1\x16\x73\x50\x77\xba\xa6\x65"</div><div class='add'>+			  "\x20\x2d\xb0\x02\x27\x89\xda\x99"</div><div class='add'>+			  "\x45\xfb\xe9\xd3\x1d\x39\x2f\xd6"</div><div class='add'>+			  "\x2a\xda\x09\x12\x11\xaf\xe6\x57"</div><div class='add'>+			  "\x01\x04\x8a\xff\x86\x8b\xac\xf8"</div><div class='add'>+			  "\xee\xe4\x1c\x98\x5b\xcf\x6b\x76"</div><div class='add'>+			  "\xa3\x0e\x33\x74\x40\x18\x39\x72"</div><div class='add'>+			  "\x66\x50\x31\xfd\x70\xdf\xe8\x51"</div><div class='add'>+			  "\x96\x21\x36\xb2\x9b\xfa\x85\xd1"</div><div class='add'>+			  "\x30\x05\xc8\x92\x98\x80\xff\x7a"</div><div class='add'>+			  "\xaf\x43\x0b\xc5\x20\x41\x92\x20"</div><div class='add'>+			  "\xd4\xa0\x91\x98\x11\x5f\x4d\xb1",</div><div class='add'>+		.ilen	= 512,</div><div class='add'>+		.result	= "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"</div><div class='add'>+			  "\x00\x01\x02\x03\x04\x05\x06\x07"</div><div class='add'>+			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"</div><div class='add'>+			  "\x10\x11\x12\x13\x14\x15\x16\x17"</div><div class='add'>+			  "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"</div><div class='add'>+			  "\x20\x21\x22\x23\x24\x25\x26\x27"</div><div class='add'>+			  "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"</div><div class='add'>+			  "\x30\x31\x32\x33\x34\x35\x36\x37"</div><div class='add'>+			  "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"</div><div class='add'>+			  "\x40\x41\x42\x43\x44\x45\x46\x47"</div><div class='add'>+			  "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"</div><div class='add'>+			  "\x50\x51\x52\x53\x54\x55\x56\x57"</div><div class='add'>+			  "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"</div><div class='add'>+			  "\x60\x61\x62\x63\x64\x65\x66\x67"</div><div class='add'>+			  "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"</div><div class='add'>+			  "\x70\x71\x72\x73\x74\x75\x76\x77"</div><div class='add'>+			  "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"</div><div class='add'>+			  "\x80\x81\x82\x83\x84\x85\x86\x87"</div><div class='add'>+			  "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"</div><div class='add'>+			  "\x90\x91\x92\x93\x94\x95\x96\x97"</div><div class='add'>+			  "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"</div><div class='add'>+			  "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"</div><div class='add'>+			  "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"</div><div class='add'>+			  "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"</div><div class='add'>+			  "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"</div><div class='add'>+			  "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"</div><div class='add'>+			  "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"</div><div class='add'>+			  "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"</div><div class='add'>+			  "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"</div><div class='add'>+			  "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"</div><div class='add'>+			  "\xe8\xe9\xea\xeb\xec\xed\xee\xef"</div><div class='add'>+			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"</div><div class='add'>+			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",</div><div class='add'>+		.rlen	= 512,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* Cast6 test vectors from RFC 2612 */</div><div class='ctx'> #define CAST6_ENC_TEST_VECTORS	3</div><div class='head'>diff --git a/crypto/twofish_common.c b/crypto/twofish_common.c<br/>index 0af216c75d7e..5f62c4f9f6e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/twofish_common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/twofish_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/twofish_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>crypto/twofish_common.c</a></div><div class='hunk'>@@ -580,12 +580,9 @@ static const u8 calc_sb_tbl[512] = {</div><div class='ctx'>    ctx-&gt;a[(j) + 1] = rol32(y, 9)</div><div class='ctx'> </div><div class='ctx'> /* Perform the key setup. */</div><div class='del'>-int twofish_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int key_len)</div><div class='add'>+int __twofish_setkey(struct twofish_ctx *ctx, const u8 *key,</div><div class='add'>+		     unsigned int key_len, u32 *flags)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	struct twofish_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='del'>-	u32 *flags = &amp;tfm-&gt;crt_flags;</div><div class='del'>-</div><div class='ctx'> 	int i, j, k;</div><div class='ctx'> </div><div class='ctx'> 	/* Temporaries for CALC_K. */</div><div class='hunk'>@@ -701,7 +698,13 @@ int twofish_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int key_len)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(__twofish_setkey);</div><div class='ctx'> </div><div class='add'>+int twofish_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int key_len)</div><div class='add'>+{</div><div class='add'>+	return __twofish_setkey(crypto_tfm_ctx(tfm), key, key_len,</div><div class='add'>+				&amp;tfm-&gt;crt_flags);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(twofish_setkey);</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 851705446c82..ca1608f44cb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/xts.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>crypto/xts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/xts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>crypto/xts.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;crypto/xts.h&gt;</div><div class='ctx'> #include &lt;crypto/b128ops.h&gt;</div><div class='ctx'> #include &lt;crypto/gf128mul.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -96,7 +97,7 @@ static int crypt(struct blkcipher_desc *d,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned int avail;</div><div class='del'>-	const int bs = crypto_cipher_blocksize(ctx-&gt;child);</div><div class='add'>+	const int bs = XTS_BLOCK_SIZE;</div><div class='ctx'> 	struct sinfo s = {</div><div class='ctx'> 		.tfm = crypto_cipher_tfm(ctx-&gt;child),</div><div class='ctx'> 		.fn = fn</div><div class='hunk'>@@ -165,6 +166,78 @@ static int decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,</div><div class='ctx'> 		     crypto_cipher_alg(ctx-&gt;child)-&gt;cia_decrypt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int xts_crypt(struct blkcipher_desc *desc, struct scatterlist *sdst,</div><div class='add'>+	      struct scatterlist *ssrc, unsigned int nbytes,</div><div class='add'>+	      struct xts_crypt_req *req)</div><div class='add'>+{</div><div class='add'>+	const unsigned int bsize = XTS_BLOCK_SIZE;</div><div class='add'>+	const unsigned int max_blks = req-&gt;tbuflen / bsize;</div><div class='add'>+	struct blkcipher_walk walk;</div><div class='add'>+	unsigned int nblocks;</div><div class='add'>+	be128 *src, *dst, *t;</div><div class='add'>+	be128 *t_buf = req-&gt;tbuf;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	BUG_ON(max_blks &lt; 1);</div><div class='add'>+</div><div class='add'>+	blkcipher_walk_init(&amp;walk, sdst, ssrc, nbytes);</div><div class='add'>+</div><div class='add'>+	err = blkcipher_walk_virt(desc, &amp;walk);</div><div class='add'>+	nbytes = walk.nbytes;</div><div class='add'>+	if (!nbytes)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	nblocks = min(nbytes / bsize, max_blks);</div><div class='add'>+	src = (be128 *)walk.src.virt.addr;</div><div class='add'>+	dst = (be128 *)walk.dst.virt.addr;</div><div class='add'>+</div><div class='add'>+	/* calculate first value of T */</div><div class='add'>+	req-&gt;tweak_fn(req-&gt;tweak_ctx, (u8 *)&amp;t_buf[0], walk.iv);</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	goto first;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		do {</div><div class='add'>+			for (i = 0; i &lt; nblocks; i++) {</div><div class='add'>+				gf128mul_x_ble(&amp;t_buf[i], t);</div><div class='add'>+first:</div><div class='add'>+				t = &amp;t_buf[i];</div><div class='add'>+</div><div class='add'>+				/* PP &lt;- T xor P */</div><div class='add'>+				be128_xor(dst + i, t, src + i);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* CC &lt;- E(Key2,PP) */</div><div class='add'>+			req-&gt;crypt_fn(req-&gt;crypt_ctx, (u8 *)dst,</div><div class='add'>+				      nblocks * bsize);</div><div class='add'>+</div><div class='add'>+			/* C &lt;- T xor CC */</div><div class='add'>+			for (i = 0; i &lt; nblocks; i++)</div><div class='add'>+				be128_xor(dst + i, dst + i, &amp;t_buf[i]);</div><div class='add'>+</div><div class='add'>+			src += nblocks;</div><div class='add'>+			dst += nblocks;</div><div class='add'>+			nbytes -= nblocks * bsize;</div><div class='add'>+			nblocks = min(nbytes / bsize, max_blks);</div><div class='add'>+		} while (nblocks &gt; 0);</div><div class='add'>+</div><div class='add'>+		*(be128 *)walk.iv = *t;</div><div class='add'>+</div><div class='add'>+		err = blkcipher_walk_done(desc, &amp;walk, nbytes);</div><div class='add'>+		nbytes = walk.nbytes;</div><div class='add'>+		if (!nbytes)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		nblocks = min(nbytes / bsize, max_blks);</div><div class='add'>+		src = (be128 *)walk.src.virt.addr;</div><div class='add'>+		dst = (be128 *)walk.dst.virt.addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(xts_crypt);</div><div class='add'>+</div><div class='ctx'> static int init_tfm(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_cipher *cipher;</div><div class='hunk'>@@ -177,7 +250,7 @@ static int init_tfm(struct crypto_tfm *tfm)</div><div class='ctx'> 	if (IS_ERR(cipher))</div><div class='ctx'> 		return PTR_ERR(cipher);</div><div class='ctx'> </div><div class='del'>-	if (crypto_cipher_blocksize(cipher) != 16) {</div><div class='add'>+	if (crypto_cipher_blocksize(cipher) != XTS_BLOCK_SIZE) {</div><div class='ctx'> 		*flags |= CRYPTO_TFM_RES_BAD_BLOCK_LEN;</div><div class='ctx'> 		crypto_free_cipher(cipher);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -192,7 +265,7 @@ static int init_tfm(struct crypto_tfm *tfm)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* this check isn't really needed, leave it here just in case */</div><div class='del'>-	if (crypto_cipher_blocksize(cipher) != 16) {</div><div class='add'>+	if (crypto_cipher_blocksize(cipher) != XTS_BLOCK_SIZE) {</div><div class='ctx'> 		crypto_free_cipher(cipher);</div><div class='ctx'> 		crypto_free_cipher(ctx-&gt;child);</div><div class='ctx'> 		*flags |= CRYPTO_TFM_RES_BAD_BLOCK_LEN;</div><div class='head'>diff --git a/drivers/Kconfig b/drivers/Kconfig<br/>index b5e6f243f749..5afe5d1f199b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/Kconfig</a></div><div class='hunk'>@@ -116,6 +116,8 @@ source "drivers/vlynq/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/virtio/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "drivers/hv/Kconfig"</div><div class='add'>+</div><div class='ctx'> source "drivers/xen/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/staging/Kconfig"</div><div class='hunk'>@@ -132,8 +134,6 @@ source "drivers/iommu/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/virt/Kconfig"</div><div class='ctx'> </div><div class='del'>-source "drivers/hv/Kconfig"</div><div class='del'>-</div><div class='ctx'> source "drivers/devfreq/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/Makefile b/drivers/Makefile<br/>index 1b3142127bf5..c07be024b962 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/Makefile</a></div><div class='hunk'>@@ -97,7 +97,7 @@ obj-$(CONFIG_EISA)		+= eisa/</div><div class='ctx'> obj-y				+= lguest/</div><div class='ctx'> obj-$(CONFIG_CPU_FREQ)		+= cpufreq/</div><div class='ctx'> obj-$(CONFIG_CPU_IDLE)		+= cpuidle/</div><div class='del'>-obj-$(CONFIG_MMC)		+= mmc/</div><div class='add'>+obj-y				+= mmc/</div><div class='ctx'> obj-$(CONFIG_MEMSTICK)		+= memstick/</div><div class='ctx'> obj-y				+= leds/</div><div class='ctx'> obj-$(CONFIG_INFINIBAND)	+= infiniband/</div><div class='head'>diff --git a/drivers/accessibility/braille/braille_console.c b/drivers/accessibility/braille/braille_console.c<br/>index cb423f5aef24..c339a0880e6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/accessibility/braille/braille_console.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/accessibility/braille/braille_console.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/accessibility/braille/braille_console.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/accessibility/braille/braille_console.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* Emit various sounds */</div><div class='del'>-static int sound;</div><div class='add'>+static bool sound;</div><div class='ctx'> module_param(sound, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(sound, "emit sounds");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig<br/>index de0e3df76776..7556913aba45 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/Kconfig</a></div><div class='hunk'>@@ -374,7 +374,7 @@ config ACPI_CUSTOM_METHOD</div><div class='ctx'> 	depends on DEBUG_FS</div><div class='ctx'> 	default n</div><div class='ctx'> 	help</div><div class='del'>-	  This debug facility allows ACPI AML methods to me inserted and/or</div><div class='add'>+	  This debug facility allows ACPI AML methods to be inserted and/or</div><div class='ctx'> 	  replaced without rebooting the system. For details refer to:</div><div class='ctx'> 	  Documentation/acpi/method-customizing.txt.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile<br/>index ecb26b4f29a0..c07f44f05f9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/Makefile</a></div><div class='hunk'>@@ -20,11 +20,12 @@ obj-y				+= acpi.o \</div><div class='ctx'> # All the builtin files are in the "acpi." module_param namespace.</div><div class='ctx'> acpi-y				+= osl.o utils.o reboot.o</div><div class='ctx'> acpi-y				+= atomicio.o</div><div class='add'>+acpi-y				+= nvs.o</div><div class='ctx'> </div><div class='ctx'> # sleep related files</div><div class='ctx'> acpi-y				+= wakeup.o</div><div class='ctx'> acpi-y				+= sleep.o</div><div class='del'>-acpi-$(CONFIG_ACPI_SLEEP)	+= proc.o nvs.o</div><div class='add'>+acpi-$(CONFIG_ACPI_SLEEP)	+= proc.o</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #</div><div class='head'>diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile<br/>index 301bd2d388ad..0ca208b6dcf0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/Makefile</a></div><div class='hunk'>@@ -8,41 +8,151 @@ ccflags-$(CONFIG_ACPI_DEBUG)	+= -DACPI_DEBUG_OUTPUT</div><div class='ctx'> # use acpi.o to put all files here into acpi.o modparam namespace</div><div class='ctx'> obj-y	+= acpi.o</div><div class='ctx'> </div><div class='del'>-acpi-y := dsfield.o   dsmthdat.o  dsopcode.o  dswexec.o  dswscope.o \</div><div class='del'>-	 dsmethod.o  dsobject.o  dsutils.o   dswload.o  dswstate.o \</div><div class='del'>-	 dsinit.o dsargs.o dscontrol.o dswload2.o</div><div class='add'>+acpi-y :=		\</div><div class='add'>+	dsargs.o	\</div><div class='add'>+	dscontrol.o	\</div><div class='add'>+	dsfield.o	\</div><div class='add'>+	dsinit.o	\</div><div class='add'>+	dsmethod.o	\</div><div class='add'>+	dsmthdat.o	\</div><div class='add'>+	dsobject.o	\</div><div class='add'>+	dsopcode.o	\</div><div class='add'>+	dsutils.o	\</div><div class='add'>+	dswexec.o	\</div><div class='add'>+	dswload.o	\</div><div class='add'>+	dswload2.o	\</div><div class='add'>+	dswscope.o	\</div><div class='add'>+	dswstate.o</div><div class='ctx'> </div><div class='del'>-acpi-y += evevent.o  evregion.o  evsci.o    evxfevnt.o \</div><div class='del'>-	 evmisc.o   evrgnini.o  evxface.o  evxfregn.o \</div><div class='del'>-	 evgpe.o    evgpeblk.o evgpeinit.o  evgpeutil.o evxfgpe.o evglock.o</div><div class='add'>+acpi-y +=		\</div><div class='add'>+	evevent.o	\</div><div class='add'>+	evgpe.o		\</div><div class='add'>+	evgpeblk.o	\</div><div class='add'>+	evgpeinit.o	\</div><div class='add'>+	evgpeutil.o	\</div><div class='add'>+	evglock.o	\</div><div class='add'>+	evmisc.o	\</div><div class='add'>+	evregion.o	\</div><div class='add'>+	evrgnini.o	\</div><div class='add'>+	evsci.o		\</div><div class='add'>+	evxface.o	\</div><div class='add'>+	evxfevnt.o	\</div><div class='add'>+	evxfgpe.o	\</div><div class='add'>+	evxfregn.o</div><div class='ctx'> </div><div class='del'>-acpi-y += exconfig.o  exfield.o  exnames.o   exoparg6.o  exresolv.o  exstorob.o\</div><div class='del'>-	 exconvrt.o  exfldio.o  exoparg1.o  exprep.o    exresop.o   exsystem.o\</div><div class='del'>-	 excreate.o  exmisc.o   exoparg2.o  exregion.o  exstore.o   exutils.o \</div><div class='del'>-	 exdump.o    exmutex.o  exoparg3.o  exresnte.o  exstoren.o  exdebug.o</div><div class='add'>+acpi-y +=		\</div><div class='add'>+	exconfig.o	\</div><div class='add'>+	exconvrt.o	\</div><div class='add'>+	excreate.o	\</div><div class='add'>+	exdebug.o	\</div><div class='add'>+	exdump.o	\</div><div class='add'>+	exfield.o	\</div><div class='add'>+	exfldio.o	\</div><div class='add'>+	exmutex.o	\</div><div class='add'>+	exnames.o	\</div><div class='add'>+	exoparg1.o	\</div><div class='add'>+	exoparg2.o	\</div><div class='add'>+	exoparg3.o	\</div><div class='add'>+	exoparg6.o	\</div><div class='add'>+	exprep.o	\</div><div class='add'>+	exmisc.o	\</div><div class='add'>+	exregion.o	\</div><div class='add'>+	exresnte.o	\</div><div class='add'>+	exresolv.o	\</div><div class='add'>+	exresop.o	\</div><div class='add'>+	exstore.o	\</div><div class='add'>+	exstoren.o	\</div><div class='add'>+	exstorob.o	\</div><div class='add'>+	exsystem.o	\</div><div class='add'>+	exutils.o</div><div class='ctx'> </div><div class='del'>-acpi-y += hwacpi.o  hwgpe.o  hwregs.o  hwsleep.o hwxface.o hwvalid.o hwpci.o</div><div class='add'>+acpi-y +=		\</div><div class='add'>+	hwacpi.o	\</div><div class='add'>+	hwgpe.o		\</div><div class='add'>+	hwpci.o		\</div><div class='add'>+	hwregs.o	\</div><div class='add'>+	hwsleep.o	\</div><div class='add'>+	hwvalid.o	\</div><div class='add'>+	hwxface.o</div><div class='ctx'> </div><div class='ctx'> acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o</div><div class='ctx'> </div><div class='del'>-acpi-y += nsaccess.o  nsload.o    nssearch.o  nsxfeval.o \</div><div class='del'>-	 nsalloc.o   nseval.o    nsnames.o   nsutils.o   nsxfname.o \</div><div class='del'>-	 nsdump.o    nsinit.o    nsobject.o  nswalk.o    nsxfobj.o  \</div><div class='del'>-	 nsparse.o   nspredef.o  nsrepair.o  nsrepair2.o</div><div class='add'>+acpi-y +=		\</div><div class='add'>+	nsaccess.o	\</div><div class='add'>+	nsalloc.o	\</div><div class='add'>+	nsdump.o	\</div><div class='add'>+	nseval.o	\</div><div class='add'>+	nsinit.o	\</div><div class='add'>+	nsload.o	\</div><div class='add'>+	nsnames.o	\</div><div class='add'>+	nsobject.o	\</div><div class='add'>+	nsparse.o	\</div><div class='add'>+	nspredef.o	\</div><div class='add'>+	nsrepair.o	\</div><div class='add'>+	nsrepair2.o	\</div><div class='add'>+	nssearch.o	\</div><div class='add'>+	nsutils.o	\</div><div class='add'>+	nswalk.o	\</div><div class='add'>+	nsxfeval.o	\</div><div class='add'>+	nsxfname.o	\</div><div class='add'>+	nsxfobj.o</div><div class='ctx'> </div><div class='ctx'> acpi-$(ACPI_FUTURE_USAGE) += nsdumpdv.o</div><div class='ctx'> </div><div class='del'>-acpi-y += psargs.o    psparse.o  psloop.o pstree.o   pswalk.o  \</div><div class='del'>-	 psopcode.o  psscope.o  psutils.o  psxface.o</div><div class='add'>+acpi-y +=		\</div><div class='add'>+	psargs.o	\</div><div class='add'>+	psloop.o	\</div><div class='add'>+	psopcode.o	\</div><div class='add'>+	psparse.o	\</div><div class='add'>+	psscope.o	\</div><div class='add'>+	pstree.o	\</div><div class='add'>+	psutils.o	\</div><div class='add'>+	pswalk.o	\</div><div class='add'>+	psxface.o</div><div class='ctx'> </div><div class='del'>-acpi-y += rsaddr.o rscreate.o rsinfo.o rsio.o rslist.o rsmisc.o rsxface.o \</div><div class='del'>-	 rscalc.o  rsirq.o  rsmemory.o  rsutils.o</div><div class='add'>+acpi-y +=		\</div><div class='add'>+	rsaddr.o	\</div><div class='add'>+	rscalc.o	\</div><div class='add'>+	rscreate.o	\</div><div class='add'>+	rsinfo.o	\</div><div class='add'>+	rsio.o		\</div><div class='add'>+	rsirq.o		\</div><div class='add'>+	rslist.o	\</div><div class='add'>+	rsmemory.o	\</div><div class='add'>+	rsmisc.o	\</div><div class='add'>+	rsserial.o	\</div><div class='add'>+	rsutils.o	\</div><div class='add'>+	rsxface.o</div><div class='ctx'> </div><div class='ctx'> acpi-$(ACPI_FUTURE_USAGE) += rsdump.o</div><div class='ctx'> </div><div class='del'>-acpi-y += tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o</div><div class='add'>+acpi-y +=		\</div><div class='add'>+	tbfadt.o	\</div><div class='add'>+	tbfind.o	\</div><div class='add'>+	tbinstal.o	\</div><div class='add'>+	tbutils.o	\</div><div class='add'>+	tbxface.o	\</div><div class='add'>+	tbxfroot.o</div><div class='ctx'> </div><div class='del'>-acpi-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \</div><div class='del'>-		utcopy.o utdelete.o utglobal.o utmath.o utobject.o \</div><div class='del'>-		utstate.o utmutex.o utobject.o utresrc.o utlock.o utids.o \</div><div class='del'>-		utosi.o utxferror.o utdecode.o</div><div class='add'>+acpi-y +=		\</div><div class='add'>+	utaddress.o	\</div><div class='add'>+	utalloc.o	\</div><div class='add'>+	utcopy.o	\</div><div class='add'>+	utdebug.o	\</div><div class='add'>+	utdecode.o	\</div><div class='add'>+	utdelete.o	\</div><div class='add'>+	uteval.o	\</div><div class='add'>+	utglobal.o	\</div><div class='add'>+	utids.o		\</div><div class='add'>+	utinit.o	\</div><div class='add'>+	utlock.o	\</div><div class='add'>+	utmath.o	\</div><div class='add'>+	utmisc.o	\</div><div class='add'>+	utmutex.o	\</div><div class='add'>+	utobject.o	\</div><div class='add'>+	utosi.o		\</div><div class='add'>+	utresrc.o	\</div><div class='add'>+	utstate.o	\</div><div class='add'>+	utxface.o	\</div><div class='add'>+	utxferror.o	\</div><div class='add'>+	utxfmutex.o</div><div class='head'>diff --git a/drivers/acpi/acpica/accommon.h b/drivers/acpi/acpica/accommon.h<br/>index e0ba17f0a7c8..a44bd424f9f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/accommon.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/accommon.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/accommon.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/accommon.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/acconfig.h b/drivers/acpi/acpica/acconfig.h<br/>index f895a244ca7e..1f30af613e87 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acconfig.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acconfig.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acconfig.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/acconfig.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -123,6 +123,10 @@</div><div class='ctx'> </div><div class='ctx'> #define ACPI_MAX_SLEEP                  2000	/* Two seconds */</div><div class='ctx'> </div><div class='add'>+/* Address Range lists are per-space_id (Memory and I/O only) */</div><div class='add'>+</div><div class='add'>+#define ACPI_ADDRESS_RANGE_MAX          2</div><div class='add'>+</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * ACPI Specification constants (Do not change unless the specification changes)</div><div class='hunk'>@@ -202,9 +206,10 @@</div><div class='ctx'> #define ACPI_RSDP_CHECKSUM_LENGTH       20</div><div class='ctx'> #define ACPI_RSDP_XCHECKSUM_LENGTH      36</div><div class='ctx'> </div><div class='del'>-/* SMBus and IPMI bidirectional buffer size */</div><div class='add'>+/* SMBus, GSBus and IPMI bidirectional buffer size */</div><div class='ctx'> </div><div class='ctx'> #define ACPI_SMBUS_BUFFER_SIZE          34</div><div class='add'>+#define ACPI_GSBUS_BUFFER_SIZE          34</div><div class='ctx'> #define ACPI_IPMI_BUFFER_SIZE           66</div><div class='ctx'> </div><div class='ctx'> /* _sx_d and _sx_w control methods */</div><div class='head'>diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h<br/>index eb0b1f8dee6d..deaa81979561 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acdebug.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acdebug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acdebug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/acdebug.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/acdispat.h b/drivers/acpi/acpica/acdispat.h<br/>index 2d1b7ffa377a..5935ba6707e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acdispat.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acdispat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acdispat.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/acdispat.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h<br/>index bea3b4899183..c53caa521a30 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acevents.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acevents.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acevents.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/acevents.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -162,6 +162,7 @@ acpi_status acpi_ev_initialize_op_regions(void);</div><div class='ctx'> </div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,</div><div class='add'>+			       union acpi_operand_object *field_obj,</div><div class='ctx'> 			       u32 function,</div><div class='ctx'> 			       u32 region_offset, u32 bit_width, u64 *value);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h<br/>index 76dc02f15574..2853f7673f3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acglobal.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acglobal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acglobal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/acglobal.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -108,7 +108,7 @@ u8 ACPI_INIT_GLOBAL(acpi_gbl_use_default_register_widths, TRUE);</div><div class='ctx'> /*</div><div class='ctx'>  * Optionally enable output from the AML Debug Object.</div><div class='ctx'>  */</div><div class='del'>-u32 ACPI_INIT_GLOBAL(acpi_gbl_enable_aml_debug_object, FALSE);</div><div class='add'>+bool ACPI_INIT_GLOBAL(acpi_gbl_enable_aml_debug_object, FALSE);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Optionally copy the entire DSDT to local memory (instead of simply</div><div class='hunk'>@@ -140,8 +140,19 @@ u32 acpi_gbl_trace_flags;</div><div class='ctx'> acpi_name acpi_gbl_trace_method_name;</div><div class='ctx'> u8 acpi_gbl_system_awake_and_running;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * ACPI 5.0 introduces the concept of a "reduced hardware platform", meaning</div><div class='add'>+ * that the ACPI hardware is no longer required. A flag in the FADT indicates</div><div class='add'>+ * a reduced HW machine, and that flag is duplicated here for convenience.</div><div class='add'>+ */</div><div class='add'>+u8 acpi_gbl_reduced_hardware;</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Do not disassemble buffers to resource descriptors */</div><div class='add'>+</div><div class='add'>+ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_no_resource_disassembly, FALSE);</div><div class='add'>+</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Debug support</div><div class='hunk'>@@ -207,7 +218,7 @@ ACPI_EXTERN struct acpi_rw_lock acpi_gbl_namespace_rw_lock;</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * Mutual exlusion within ACPICA subsystem</div><div class='add'>+ * Mutual exclusion within ACPICA subsystem</div><div class='ctx'>  *</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -295,6 +306,8 @@ ACPI_EXTERN u8 acpi_gbl_acpi_hardware_present;</div><div class='ctx'> ACPI_EXTERN u8 acpi_gbl_events_initialized;</div><div class='ctx'> ACPI_EXTERN u8 acpi_gbl_osi_data;</div><div class='ctx'> ACPI_EXTERN struct acpi_interface_info *acpi_gbl_supported_interfaces;</div><div class='add'>+ACPI_EXTERN struct acpi_address_range</div><div class='add'>+    *acpi_gbl_address_range_list[ACPI_ADDRESS_RANGE_MAX];</div><div class='ctx'> </div><div class='ctx'> #ifndef DEFINE_ACPI_GLOBALS</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h<br/>index e7213beaafc7..677793e938f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/achware.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/achware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/achware.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/achware.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h<br/>index 3731e1c34b83..eb308635da72 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acinterp.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acinterp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acinterp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/acinterp.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -468,6 +468,8 @@ void acpi_ex_eisa_id_to_string(char *dest, u64 compressed_id);</div><div class='ctx'> </div><div class='ctx'> void acpi_ex_integer_to_string(char *dest, u64 value);</div><div class='ctx'> </div><div class='add'>+u8 acpi_is_valid_space_id(u8 space_id);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * exregion - default op_region handlers</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h<br/>index 5552125d8340..3f24068837d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/aclocal.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/aclocal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/aclocal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/aclocal.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -53,7 +53,7 @@ typedef u32 acpi_mutex_handle;</div><div class='ctx'> </div><div class='ctx'> /* Total number of aml opcodes defined */</div><div class='ctx'> </div><div class='del'>-#define AML_NUM_OPCODES                 0x7F</div><div class='add'>+#define AML_NUM_OPCODES                 0x81</div><div class='ctx'> </div><div class='ctx'> /* Forward declarations */</div><div class='ctx'> </div><div class='hunk'>@@ -249,12 +249,16 @@ struct acpi_create_field_info {</div><div class='ctx'> 	struct acpi_namespace_node *field_node;</div><div class='ctx'> 	struct acpi_namespace_node *register_node;</div><div class='ctx'> 	struct acpi_namespace_node *data_register_node;</div><div class='add'>+	struct acpi_namespace_node *connection_node;</div><div class='add'>+	u8 *resource_buffer;</div><div class='ctx'> 	u32 bank_value;</div><div class='ctx'> 	u32 field_bit_position;</div><div class='ctx'> 	u32 field_bit_length;</div><div class='add'>+	u16 resource_length;</div><div class='ctx'> 	u8 field_flags;</div><div class='ctx'> 	u8 attribute;</div><div class='ctx'> 	u8 field_type;</div><div class='add'>+	u8 access_length;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> typedef</div><div class='hunk'>@@ -315,7 +319,8 @@ struct acpi_name_info {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Used for ACPI_PTYPE1_FIXED, ACPI_PTYPE1_VAR, ACPI_PTYPE2,</div><div class='del'>- * ACPI_PTYPE2_MIN, ACPI_PTYPE2_PKG_COUNT, ACPI_PTYPE2_COUNT</div><div class='add'>+ * ACPI_PTYPE2_MIN, ACPI_PTYPE2_PKG_COUNT, ACPI_PTYPE2_COUNT,</div><div class='add'>+ * ACPI_PTYPE2_FIX_VAR</div><div class='ctx'>  */</div><div class='ctx'> struct acpi_package_info {</div><div class='ctx'> 	u8 type;</div><div class='hunk'>@@ -625,6 +630,15 @@ union acpi_generic_state {</div><div class='ctx'> </div><div class='ctx'> typedef acpi_status(*ACPI_EXECUTE_OP) (struct acpi_walk_state * walk_state);</div><div class='ctx'> </div><div class='add'>+/* Address Range info block */</div><div class='add'>+</div><div class='add'>+struct acpi_address_range {</div><div class='add'>+	struct acpi_address_range *next;</div><div class='add'>+	struct acpi_namespace_node *region_node;</div><div class='add'>+	acpi_physical_address start_address;</div><div class='add'>+	acpi_physical_address end_address;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Parser typedefs and structs</div><div class='hunk'>@@ -951,7 +965,7 @@ struct acpi_port_info {</div><div class='ctx'> #define ACPI_RESOURCE_NAME_END_DEPENDENT        0x38</div><div class='ctx'> #define ACPI_RESOURCE_NAME_IO                   0x40</div><div class='ctx'> #define ACPI_RESOURCE_NAME_FIXED_IO             0x48</div><div class='del'>-#define ACPI_RESOURCE_NAME_RESERVED_S1          0x50</div><div class='add'>+#define ACPI_RESOURCE_NAME_FIXED_DMA            0x50</div><div class='ctx'> #define ACPI_RESOURCE_NAME_RESERVED_S2          0x58</div><div class='ctx'> #define ACPI_RESOURCE_NAME_RESERVED_S3          0x60</div><div class='ctx'> #define ACPI_RESOURCE_NAME_RESERVED_S4          0x68</div><div class='hunk'>@@ -973,7 +987,9 @@ struct acpi_port_info {</div><div class='ctx'> #define ACPI_RESOURCE_NAME_EXTENDED_IRQ         0x89</div><div class='ctx'> #define ACPI_RESOURCE_NAME_ADDRESS64            0x8A</div><div class='ctx'> #define ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64   0x8B</div><div class='del'>-#define ACPI_RESOURCE_NAME_LARGE_MAX            0x8B</div><div class='add'>+#define ACPI_RESOURCE_NAME_GPIO                 0x8C</div><div class='add'>+#define ACPI_RESOURCE_NAME_SERIAL_BUS           0x8E</div><div class='add'>+#define ACPI_RESOURCE_NAME_LARGE_MAX            0x8E</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h<br/>index b7491ee1fba6..ef338a96f5b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acmacros.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acmacros.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acmacros.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/acmacros.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h<br/>index 79a598c67fe3..2c9e0f049523 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acnamesp.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acnamesp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acnamesp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/acnamesp.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h<br/>index 1055769f2f01..c065078ca83b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acobject.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acobject.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acobject.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/acobject.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -254,6 +254,7 @@ ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_NOTIFY_INFO};</div><div class='ctx'> 	u32                             base_byte_offset;   /* Byte offset within containing object */\</div><div class='ctx'> 	u32                             value;              /* Value to store into the Bank or Index register */\</div><div class='ctx'> 	u8                              start_field_bit_offset;/* Bit offset within first field datum (0-63) */\</div><div class='add'>+	u8                              access_length;	/* For serial regions/fields */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct acpi_object_field_common {	/* COMMON FIELD (for BUFFER, REGION, BANK, and INDEX fields) */</div><div class='hunk'>@@ -261,7 +262,9 @@ struct acpi_object_field_common {	/* COMMON FIELD (for BUFFER, REGION, BANK, and</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_object_region_field {</div><div class='del'>-	ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO union acpi_operand_object *region_obj;	/* Containing op_region object */</div><div class='add'>+	ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO u16 resource_length;</div><div class='add'>+	union acpi_operand_object *region_obj;	/* Containing op_region object */</div><div class='add'>+	u8 *resource_buffer;	/* resource_template for serial regions/fields */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_object_bank_field {</div><div class='hunk'>@@ -358,6 +361,7 @@ typedef enum {</div><div class='ctx'>  */</div><div class='ctx'> struct acpi_object_extra {</div><div class='ctx'> 	ACPI_OBJECT_COMMON_HEADER struct acpi_namespace_node *method_REG;	/* _REG method for this region (if any) */</div><div class='add'>+	struct acpi_namespace_node *scope_node;</div><div class='ctx'> 	void *region_context;	/* Region-specific data */</div><div class='ctx'> 	u8 *aml_start;</div><div class='ctx'> 	u32 aml_length;</div><div class='head'>diff --git a/drivers/acpi/acpica/acopcode.h b/drivers/acpi/acpica/acopcode.h<br/>index bb2ccfad7376..9440d053fbb3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acopcode.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acopcode.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acopcode.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/acopcode.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -93,6 +93,7 @@</div><div class='ctx'> #define ARGP_CONCAT_OP                  ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)</div><div class='ctx'> #define ARGP_CONCAT_RES_OP              ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)</div><div class='ctx'> #define ARGP_COND_REF_OF_OP             ARGP_LIST2 (ARGP_SUPERNAME,  ARGP_SUPERNAME)</div><div class='add'>+#define ARGP_CONNECTFIELD_OP            ARGP_LIST1 (ARGP_NAMESTRING)</div><div class='ctx'> #define ARGP_CONTINUE_OP                ARG_NONE</div><div class='ctx'> #define ARGP_COPY_OP                    ARGP_LIST2 (ARGP_TERMARG,    ARGP_SIMPLENAME)</div><div class='ctx'> #define ARGP_CREATE_BIT_FIELD_OP        ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_NAME)</div><div class='hunk'>@@ -164,6 +165,7 @@</div><div class='ctx'> #define ARGP_RETURN_OP                  ARGP_LIST1 (ARGP_TERMARG)</div><div class='ctx'> #define ARGP_REVISION_OP                ARG_NONE</div><div class='ctx'> #define ARGP_SCOPE_OP                   ARGP_LIST3 (ARGP_PKGLENGTH,  ARGP_NAME,          ARGP_TERMLIST)</div><div class='add'>+#define ARGP_SERIALFIELD_OP             ARGP_LIST1 (ARGP_NAMESTRING)</div><div class='ctx'> #define ARGP_SHIFT_LEFT_OP              ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)</div><div class='ctx'> #define ARGP_SHIFT_RIGHT_OP             ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)</div><div class='ctx'> #define ARGP_SIGNAL_OP                  ARGP_LIST1 (ARGP_SUPERNAME)</div><div class='hunk'>@@ -223,6 +225,7 @@</div><div class='ctx'> #define ARGI_CONCAT_OP                  ARGI_LIST3 (ARGI_COMPUTEDATA,ARGI_COMPUTEDATA,   ARGI_TARGETREF)</div><div class='ctx'> #define ARGI_CONCAT_RES_OP              ARGI_LIST3 (ARGI_BUFFER,     ARGI_BUFFER,        ARGI_TARGETREF)</div><div class='ctx'> #define ARGI_COND_REF_OF_OP             ARGI_LIST2 (ARGI_OBJECT_REF, ARGI_TARGETREF)</div><div class='add'>+#define ARGI_CONNECTFIELD_OP            ARGI_INVALID_OPCODE</div><div class='ctx'> #define ARGI_CONTINUE_OP                ARGI_INVALID_OPCODE</div><div class='ctx'> #define ARGI_COPY_OP                    ARGI_LIST2 (ARGI_ANYTYPE,    ARGI_SIMPLE_TARGET)</div><div class='ctx'> #define ARGI_CREATE_BIT_FIELD_OP        ARGI_LIST3 (ARGI_BUFFER,     ARGI_INTEGER,       ARGI_REFERENCE)</div><div class='hunk'>@@ -294,6 +297,7 @@</div><div class='ctx'> #define ARGI_RETURN_OP                  ARGI_INVALID_OPCODE</div><div class='ctx'> #define ARGI_REVISION_OP                ARG_NONE</div><div class='ctx'> #define ARGI_SCOPE_OP                   ARGI_INVALID_OPCODE</div><div class='add'>+#define ARGI_SERIALFIELD_OP             ARGI_INVALID_OPCODE</div><div class='ctx'> #define ARGI_SHIFT_LEFT_OP              ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)</div><div class='ctx'> #define ARGI_SHIFT_RIGHT_OP             ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)</div><div class='ctx'> #define ARGI_SIGNAL_OP                  ARGI_LIST1 (ARGI_EVENT)</div><div class='head'>diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h<br/>index 5ea1e06afa20..b725d780d34d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acparser.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acparser.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acparser.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/acparser.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h<br/>index c445cca490ea..bbb34c9be4e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acpredef.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acpredef.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acpredef.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/acpredef.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -94,6 +94,14 @@</div><div class='ctx'>  * ACPI_PTYPE2_REV_FIXED: Revision at start, each subpackage is Fixed-length</div><div class='ctx'>  *      (Used for _ART, _FPS)</div><div class='ctx'>  *</div><div class='add'>+ * ACPI_PTYPE2_FIX_VAR: Each subpackage consists of some fixed-length elements</div><div class='add'>+ *      followed by an optional element</div><div class='add'>+ *      object type</div><div class='add'>+ *      count</div><div class='add'>+ *      object type</div><div class='add'>+ *      count = 0 (optional)</div><div class='add'>+ *      (Used for _DLM)</div><div class='add'>+ *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> enum acpi_return_package_types {</div><div class='hunk'>@@ -105,7 +113,8 @@ enum acpi_return_package_types {</div><div class='ctx'> 	ACPI_PTYPE2_PKG_COUNT = 6,</div><div class='ctx'> 	ACPI_PTYPE2_FIXED = 7,</div><div class='ctx'> 	ACPI_PTYPE2_MIN = 8,</div><div class='del'>-	ACPI_PTYPE2_REV_FIXED = 9</div><div class='add'>+	ACPI_PTYPE2_REV_FIXED = 9,</div><div class='add'>+	ACPI_PTYPE2_FIX_VAR = 10</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef ACPI_CREATE_PREDEFINED_TABLE</div><div class='hunk'>@@ -154,6 +163,7 @@ static const union acpi_predefined_info predefined_names[] =</div><div class='ctx'> 	{{"_AC8", 0, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_AC9", 0, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_ADR", 0, ACPI_RTYPE_INTEGER}},</div><div class='add'>+	{{"_AEI", 0, ACPI_RTYPE_BUFFER}},</div><div class='ctx'> 	{{"_AL0", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */</div><div class='ctx'> 			  {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},</div><div class='ctx'> </div><div class='hunk'>@@ -229,6 +239,13 @@ static const union acpi_predefined_info predefined_names[] =</div><div class='ctx'> 	{{"_CID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints/Strs) */</div><div class='ctx'> 			  {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING, 0,0}, 0,0}},</div><div class='ctx'> </div><div class='add'>+	{{"_CLS", 0, ACPI_RTYPE_PACKAGE}},	/* Fixed-length (3 Int) */</div><div class='add'>+	{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, 0}, 0, 0}},</div><div class='add'>+</div><div class='add'>+	{{"_CPC", 0, ACPI_RTYPE_PACKAGE}},	/* Variable-length (Ints/Bufs) */</div><div class='add'>+	{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER, 0, 0}, 0,</div><div class='add'>+	  0}},</div><div class='add'>+</div><div class='ctx'> 	{{"_CRS", 0, ACPI_RTYPE_BUFFER}},</div><div class='ctx'> 	{{"_CRT", 0, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_CSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (1 Int(n), n-1 Int) */</div><div class='hunk'>@@ -237,12 +254,21 @@ static const union acpi_predefined_info predefined_names[] =</div><div class='ctx'> 	{{"_CST", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (1 Int(n), n Pkg (1 Buf/3 Int) */</div><div class='ctx'> 			  {{{ACPI_PTYPE2_PKG_COUNT,ACPI_RTYPE_BUFFER, 1, ACPI_RTYPE_INTEGER}, 3,0}},</div><div class='ctx'> </div><div class='add'>+	{{"_CWS", 1, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_DCK", 1, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_DCS", 0, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_DDC", 1, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER}},</div><div class='ctx'> 	{{"_DDN", 0, ACPI_RTYPE_STRING}},</div><div class='add'>+	{{"_DEP", 0, ACPI_RTYPE_PACKAGE}},	/* Variable-length (Refs) */</div><div class='add'>+	{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},</div><div class='add'>+</div><div class='ctx'> 	{{"_DGS", 0, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_DIS", 0, 0}},</div><div class='add'>+</div><div class='add'>+	{{"_DLM", 0, ACPI_RTYPE_PACKAGE}},	/* Variable-length (Pkgs) each (1 Ref, 0/1 Optional Buf/Ref) */</div><div class='add'>+	{{{ACPI_PTYPE2_FIX_VAR, ACPI_RTYPE_REFERENCE, 1,</div><div class='add'>+	   ACPI_RTYPE_REFERENCE | ACPI_RTYPE_BUFFER}, 0, 0}},</div><div class='add'>+</div><div class='ctx'> 	{{"_DMA", 0, ACPI_RTYPE_BUFFER}},</div><div class='ctx'> 	{{"_DOD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints) */</div><div class='ctx'> 			  {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0,0}, 0,0}},</div><div class='hunk'>@@ -262,6 +288,7 @@ static const union acpi_predefined_info predefined_names[] =</div><div class='ctx'> 	{{"_EJ3", 1, 0}},</div><div class='ctx'> 	{{"_EJ4", 1, 0}},</div><div class='ctx'> 	{{"_EJD", 0, ACPI_RTYPE_STRING}},</div><div class='add'>+	{{"_EVT", 1, 0}},</div><div class='ctx'> 	{{"_FDE", 0, ACPI_RTYPE_BUFFER}},</div><div class='ctx'> 	{{"_FDI", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (16 Int) */</div><div class='ctx'> 			  {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16,0}, 0,0}},</div><div class='hunk'>@@ -281,14 +308,17 @@ static const union acpi_predefined_info predefined_names[] =</div><div class='ctx'> 	{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, 0}, 0, 0}},</div><div class='ctx'> </div><div class='ctx'> 	{{"_GAI", 0, ACPI_RTYPE_INTEGER}},</div><div class='add'>+	{{"_GCP", 0, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_GHL", 0, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_GLK", 0, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_GPD", 0, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_GPE", 0, ACPI_RTYPE_INTEGER}}, /* _GPE method, not _GPE scope */</div><div class='add'>+	{{"_GRT", 0, ACPI_RTYPE_BUFFER}},</div><div class='ctx'> 	{{"_GSB", 0, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_GTF", 0, ACPI_RTYPE_BUFFER}},</div><div class='ctx'> 	{{"_GTM", 0, ACPI_RTYPE_BUFFER}},</div><div class='ctx'> 	{{"_GTS", 1, 0}},</div><div class='add'>+	{{"_GWS", 1, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_HID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING}},</div><div class='ctx'> 	{{"_HOT", 0, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_HPP", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (4 Int) */</div><div class='hunk'>@@ -303,6 +333,7 @@ static const union acpi_predefined_info predefined_names[] =</div><div class='ctx'> 	{{"_HPX", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (var Ints) */</div><div class='ctx'> 			  {{{ACPI_PTYPE2_MIN, ACPI_RTYPE_INTEGER, 5,0}, 0,0}},</div><div class='ctx'> </div><div class='add'>+	{{"_HRV", 0, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_IFT", 0, ACPI_RTYPE_INTEGER}}, /* See IPMI spec */</div><div class='ctx'> 	{{"_INI", 0, 0}},</div><div class='ctx'> 	{{"_IRC", 0, 0}},</div><div class='hunk'>@@ -361,6 +392,9 @@ static const union acpi_predefined_info predefined_names[] =</div><div class='ctx'> 	{{"_PR3", 0, ACPI_RTYPE_PACKAGE}},	/* Variable-length (Refs) */</div><div class='ctx'> 	{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},</div><div class='ctx'> </div><div class='add'>+	{{"_PRE", 0, ACPI_RTYPE_PACKAGE}},	/* Variable-length (Refs) */</div><div class='add'>+	{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},</div><div class='add'>+</div><div class='ctx'> 	{{"_PRL", 0, ACPI_RTYPE_PACKAGE}},	/* Variable-length (Refs) */</div><div class='ctx'> 	{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}},</div><div class='ctx'> </div><div class='hunk'>@@ -391,6 +425,7 @@ static const union acpi_predefined_info predefined_names[] =</div><div class='ctx'> 	{{"_PSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (5 Int) with count */</div><div class='ctx'> 			  {{{ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER,0,0}, 0,0}},</div><div class='ctx'> </div><div class='add'>+	{{"_PSE", 1, 0}},</div><div class='ctx'> 	{{"_PSL", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */</div><div class='ctx'> 			  {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},</div><div class='ctx'> </div><div class='hunk'>@@ -457,6 +492,7 @@ static const union acpi_predefined_info predefined_names[] =</div><div class='ctx'> 	{{"_SLI", 0, ACPI_RTYPE_BUFFER}},</div><div class='ctx'> 	{{"_SPD", 1, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_SRS", 1, 0}},</div><div class='add'>+	{{"_SRT", 1, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_SRV", 0, ACPI_RTYPE_INTEGER}}, /* See IPMI spec */</div><div class='ctx'> 	{{"_SST", 1, 0}},</div><div class='ctx'> 	{{"_STA", 0, ACPI_RTYPE_INTEGER}},</div><div class='hunk'>@@ -464,6 +500,7 @@ static const union acpi_predefined_info predefined_names[] =</div><div class='ctx'> 	{{"_STP", 2, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_STR", 0, ACPI_RTYPE_BUFFER}},</div><div class='ctx'> 	{{"_STV", 2, ACPI_RTYPE_INTEGER}},</div><div class='add'>+	{{"_SUB", 0, ACPI_RTYPE_STRING}},</div><div class='ctx'> 	{{"_SUN", 0, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_SWS", 0, ACPI_RTYPE_INTEGER}},</div><div class='ctx'> 	{{"_TC1", 0, ACPI_RTYPE_INTEGER}},</div><div class='head'>diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h<br/>index f08b55b7f3a0..0347d0993497 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acresrc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acresrc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acresrc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/acresrc.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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,28 +73,40 @@ typedef const struct acpi_rsconvert_info {</div><div class='ctx'> </div><div class='ctx'> /* Resource conversion opcodes */</div><div class='ctx'> </div><div class='del'>-#define ACPI_RSC_INITGET                0</div><div class='del'>-#define ACPI_RSC_INITSET                1</div><div class='del'>-#define ACPI_RSC_FLAGINIT               2</div><div class='del'>-#define ACPI_RSC_1BITFLAG               3</div><div class='del'>-#define ACPI_RSC_2BITFLAG               4</div><div class='del'>-#define ACPI_RSC_COUNT                  5</div><div class='del'>-#define ACPI_RSC_COUNT16                6</div><div class='del'>-#define ACPI_RSC_LENGTH                 7</div><div class='del'>-#define ACPI_RSC_MOVE8                  8</div><div class='del'>-#define ACPI_RSC_MOVE16                 9</div><div class='del'>-#define ACPI_RSC_MOVE32                 10</div><div class='del'>-#define ACPI_RSC_MOVE64                 11</div><div class='del'>-#define ACPI_RSC_SET8                   12</div><div class='del'>-#define ACPI_RSC_DATA8                  13</div><div class='del'>-#define ACPI_RSC_ADDRESS                14</div><div class='del'>-#define ACPI_RSC_SOURCE                 15</div><div class='del'>-#define ACPI_RSC_SOURCEX                16</div><div class='del'>-#define ACPI_RSC_BITMASK                17</div><div class='del'>-#define ACPI_RSC_BITMASK16              18</div><div class='del'>-#define ACPI_RSC_EXIT_NE                19</div><div class='del'>-#define ACPI_RSC_EXIT_LE                20</div><div class='del'>-#define ACPI_RSC_EXIT_EQ                21</div><div class='add'>+typedef enum {</div><div class='add'>+	ACPI_RSC_INITGET = 0,</div><div class='add'>+	ACPI_RSC_INITSET,</div><div class='add'>+	ACPI_RSC_FLAGINIT,</div><div class='add'>+	ACPI_RSC_1BITFLAG,</div><div class='add'>+	ACPI_RSC_2BITFLAG,</div><div class='add'>+	ACPI_RSC_3BITFLAG,</div><div class='add'>+	ACPI_RSC_ADDRESS,</div><div class='add'>+	ACPI_RSC_BITMASK,</div><div class='add'>+	ACPI_RSC_BITMASK16,</div><div class='add'>+	ACPI_RSC_COUNT,</div><div class='add'>+	ACPI_RSC_COUNT16,</div><div class='add'>+	ACPI_RSC_COUNT_GPIO_PIN,</div><div class='add'>+	ACPI_RSC_COUNT_GPIO_RES,</div><div class='add'>+	ACPI_RSC_COUNT_GPIO_VEN,</div><div class='add'>+	ACPI_RSC_COUNT_SERIAL_RES,</div><div class='add'>+	ACPI_RSC_COUNT_SERIAL_VEN,</div><div class='add'>+	ACPI_RSC_DATA8,</div><div class='add'>+	ACPI_RSC_EXIT_EQ,</div><div class='add'>+	ACPI_RSC_EXIT_LE,</div><div class='add'>+	ACPI_RSC_EXIT_NE,</div><div class='add'>+	ACPI_RSC_LENGTH,</div><div class='add'>+	ACPI_RSC_MOVE_GPIO_PIN,</div><div class='add'>+	ACPI_RSC_MOVE_GPIO_RES,</div><div class='add'>+	ACPI_RSC_MOVE_SERIAL_RES,</div><div class='add'>+	ACPI_RSC_MOVE_SERIAL_VEN,</div><div class='add'>+	ACPI_RSC_MOVE8,</div><div class='add'>+	ACPI_RSC_MOVE16,</div><div class='add'>+	ACPI_RSC_MOVE32,</div><div class='add'>+	ACPI_RSC_MOVE64,</div><div class='add'>+	ACPI_RSC_SET8,</div><div class='add'>+	ACPI_RSC_SOURCE,</div><div class='add'>+	ACPI_RSC_SOURCEX</div><div class='add'>+} ACPI_RSCONVERT_OPCODES;</div><div class='ctx'> </div><div class='ctx'> /* Resource Conversion sub-opcodes */</div><div class='ctx'> </div><div class='hunk'>@@ -106,6 +118,9 @@ typedef const struct acpi_rsconvert_info {</div><div class='ctx'> #define ACPI_RS_OFFSET(f)               (u8) ACPI_OFFSET (struct acpi_resource,f)</div><div class='ctx'> #define AML_OFFSET(f)                   (u8) ACPI_OFFSET (union aml_resource,f)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Individual entry for the resource dump tables</div><div class='add'>+ */</div><div class='ctx'> typedef const struct acpi_rsdump_info {</div><div class='ctx'> 	u8 opcode;</div><div class='ctx'> 	u8 offset;</div><div class='hunk'>@@ -116,20 +131,25 @@ typedef const struct acpi_rsdump_info {</div><div class='ctx'> </div><div class='ctx'> /* Values for the Opcode field above */</div><div class='ctx'> </div><div class='del'>-#define ACPI_RSD_TITLE                  0</div><div class='del'>-#define ACPI_RSD_LITERAL                1</div><div class='del'>-#define ACPI_RSD_STRING                 2</div><div class='del'>-#define ACPI_RSD_UINT8                  3</div><div class='del'>-#define ACPI_RSD_UINT16                 4</div><div class='del'>-#define ACPI_RSD_UINT32                 5</div><div class='del'>-#define ACPI_RSD_UINT64                 6</div><div class='del'>-#define ACPI_RSD_1BITFLAG               7</div><div class='del'>-#define ACPI_RSD_2BITFLAG               8</div><div class='del'>-#define ACPI_RSD_SHORTLIST              9</div><div class='del'>-#define ACPI_RSD_LONGLIST               10</div><div class='del'>-#define ACPI_RSD_DWORDLIST              11</div><div class='del'>-#define ACPI_RSD_ADDRESS                12</div><div class='del'>-#define ACPI_RSD_SOURCE                 13</div><div class='add'>+typedef enum {</div><div class='add'>+	ACPI_RSD_TITLE = 0,</div><div class='add'>+	ACPI_RSD_1BITFLAG,</div><div class='add'>+	ACPI_RSD_2BITFLAG,</div><div class='add'>+	ACPI_RSD_3BITFLAG,</div><div class='add'>+	ACPI_RSD_ADDRESS,</div><div class='add'>+	ACPI_RSD_DWORDLIST,</div><div class='add'>+	ACPI_RSD_LITERAL,</div><div class='add'>+	ACPI_RSD_LONGLIST,</div><div class='add'>+	ACPI_RSD_SHORTLIST,</div><div class='add'>+	ACPI_RSD_SHORTLISTX,</div><div class='add'>+	ACPI_RSD_SOURCE,</div><div class='add'>+	ACPI_RSD_STRING,</div><div class='add'>+	ACPI_RSD_UINT8,</div><div class='add'>+	ACPI_RSD_UINT16,</div><div class='add'>+	ACPI_RSD_UINT32,</div><div class='add'>+	ACPI_RSD_UINT64,</div><div class='add'>+	ACPI_RSD_WORDLIST</div><div class='add'>+} ACPI_RSDUMP_OPCODES;</div><div class='ctx'> </div><div class='ctx'> /* restore default alignment */</div><div class='ctx'> </div><div class='hunk'>@@ -138,13 +158,18 @@ typedef const struct acpi_rsdump_info {</div><div class='ctx'> /* Resource tables indexed by internal resource type */</div><div class='ctx'> </div><div class='ctx'> extern const u8 acpi_gbl_aml_resource_sizes[];</div><div class='add'>+extern const u8 acpi_gbl_aml_resource_serial_bus_sizes[];</div><div class='ctx'> extern struct acpi_rsconvert_info *acpi_gbl_set_resource_dispatch[];</div><div class='ctx'> </div><div class='ctx'> /* Resource tables indexed by raw AML resource descriptor type */</div><div class='ctx'> </div><div class='ctx'> extern const u8 acpi_gbl_resource_struct_sizes[];</div><div class='add'>+extern const u8 acpi_gbl_resource_struct_serial_bus_sizes[];</div><div class='ctx'> extern struct acpi_rsconvert_info *acpi_gbl_get_resource_dispatch[];</div><div class='ctx'> </div><div class='add'>+extern struct acpi_rsconvert_info</div><div class='add'>+    *acpi_gbl_convert_resource_serial_bus_dispatch[];</div><div class='add'>+</div><div class='ctx'> struct acpi_vendor_walk_info {</div><div class='ctx'> 	struct acpi_vendor_uuid *uuid;</div><div class='ctx'> 	struct acpi_buffer *buffer;</div><div class='hunk'>@@ -190,6 +215,10 @@ acpi_status</div><div class='ctx'> acpi_rs_set_srs_method_data(struct acpi_namespace_node *node,</div><div class='ctx'> 			    struct acpi_buffer *ret_buffer);</div><div class='ctx'> </div><div class='add'>+acpi_status</div><div class='add'>+acpi_rs_get_aei_method_data(struct acpi_namespace_node *node,</div><div class='add'>+			    struct acpi_buffer *ret_buffer);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * rscalc</div><div class='ctx'>  */</div><div class='hunk'>@@ -293,6 +322,11 @@ extern struct acpi_rsconvert_info acpi_rs_convert_address16[];</div><div class='ctx'> extern struct acpi_rsconvert_info acpi_rs_convert_ext_irq[];</div><div class='ctx'> extern struct acpi_rsconvert_info acpi_rs_convert_address64[];</div><div class='ctx'> extern struct acpi_rsconvert_info acpi_rs_convert_ext_address64[];</div><div class='add'>+extern struct acpi_rsconvert_info acpi_rs_convert_gpio[];</div><div class='add'>+extern struct acpi_rsconvert_info acpi_rs_convert_fixed_dma[];</div><div class='add'>+extern struct acpi_rsconvert_info acpi_rs_convert_i2c_serial_bus[];</div><div class='add'>+extern struct acpi_rsconvert_info acpi_rs_convert_spi_serial_bus[];</div><div class='add'>+extern struct acpi_rsconvert_info acpi_rs_convert_uart_serial_bus[];</div><div class='ctx'> </div><div class='ctx'> /* These resources require separate get/set tables */</div><div class='ctx'> </div><div class='hunk'>@@ -310,6 +344,7 @@ extern struct acpi_rsconvert_info acpi_rs_set_vendor[];</div><div class='ctx'>  * rsinfo</div><div class='ctx'>  */</div><div class='ctx'> extern struct acpi_rsdump_info *acpi_gbl_dump_resource_dispatch[];</div><div class='add'>+extern struct acpi_rsdump_info *acpi_gbl_dump_serial_bus_dispatch[];</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * rsdump</div><div class='hunk'>@@ -331,6 +366,12 @@ extern struct acpi_rsdump_info acpi_rs_dump_address64[];</div><div class='ctx'> extern struct acpi_rsdump_info acpi_rs_dump_ext_address64[];</div><div class='ctx'> extern struct acpi_rsdump_info acpi_rs_dump_ext_irq[];</div><div class='ctx'> extern struct acpi_rsdump_info acpi_rs_dump_generic_reg[];</div><div class='add'>+extern struct acpi_rsdump_info acpi_rs_dump_gpio[];</div><div class='add'>+extern struct acpi_rsdump_info acpi_rs_dump_fixed_dma[];</div><div class='add'>+extern struct acpi_rsdump_info acpi_rs_dump_common_serial_bus[];</div><div class='add'>+extern struct acpi_rsdump_info acpi_rs_dump_i2c_serial_bus[];</div><div class='add'>+extern struct acpi_rsdump_info acpi_rs_dump_spi_serial_bus[];</div><div class='add'>+extern struct acpi_rsdump_info acpi_rs_dump_uart_serial_bus[];</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif				/* __ACRESRC_H__ */</div><div class='head'>diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h<br/>index 1623b245dde2..0404df605bc1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acstruct.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acstruct.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acstruct.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/acstruct.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h<br/>index 967f08124eba..d5bec304c823 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/actables.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/actables.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/actables.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/actables.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h<br/>index 99c140d8e348..925ccf22101b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acutils.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/acutils.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/acutils.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/acutils.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -45,6 +45,7 @@</div><div class='ctx'> #define _ACUTILS_H</div><div class='ctx'> </div><div class='ctx'> extern const u8 acpi_gbl_resource_aml_sizes[];</div><div class='add'>+extern const u8 acpi_gbl_resource_aml_serial_bus_sizes[];</div><div class='ctx'> </div><div class='ctx'> /* Strings used by the disassembler and debugger resource dump routines */</div><div class='ctx'> </div><div class='hunk'>@@ -579,6 +580,24 @@ acpi_ut_create_list(char *list_name,</div><div class='ctx'> #endif				/* ACPI_DBG_TRACK_ALLOCATIONS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * utaddress - address range check</div><div class='add'>+ */</div><div class='add'>+acpi_status</div><div class='add'>+acpi_ut_add_address_range(acpi_adr_space_type space_id,</div><div class='add'>+			  acpi_physical_address address,</div><div class='add'>+			  u32 length, struct acpi_namespace_node *region_node);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+acpi_ut_remove_address_range(acpi_adr_space_type space_id,</div><div class='add'>+			     struct acpi_namespace_node *region_node);</div><div class='add'>+</div><div class='add'>+u32</div><div class='add'>+acpi_ut_check_address_range(acpi_adr_space_type space_id,</div><div class='add'>+			    acpi_physical_address address, u32 length, u8 warn);</div><div class='add'>+</div><div class='add'>+void acpi_ut_delete_address_lists(void);</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * utxferror - various error/warning output functions</div><div class='ctx'>  */</div><div class='ctx'> void ACPI_INTERNAL_VAR_XFACE</div><div class='head'>diff --git a/drivers/acpi/acpica/amlcode.h b/drivers/acpi/acpica/amlcode.h<br/>index 1077f17859ed..905280fec0fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/amlcode.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/amlcode.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/amlcode.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/amlcode.h</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -189,6 +189,14 @@</div><div class='ctx'> #define AML_LNOTEQUAL_OP            (u16) 0x9293</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Opcodes for "Field" operators</div><div class='add'>+ */</div><div class='add'>+#define AML_FIELD_OFFSET_OP         (u8) 0x00</div><div class='add'>+#define AML_FIELD_ACCESS_OP         (u8) 0x01</div><div class='add'>+#define AML_FIELD_CONNECTION_OP     (u8) 0x02	/* ACPI 5.0 */</div><div class='add'>+#define AML_FIELD_EXT_ACCESS_OP     (u8) 0x03	/* ACPI 5.0 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Internal opcodes</div><div class='ctx'>  * Use only "Unknown" AML opcodes, don't attempt to use</div><div class='ctx'>  * any valid ACPI ASCII values (A-Z, 0-9, '-')</div><div class='hunk'>@@ -202,6 +210,8 @@</div><div class='ctx'> #define AML_INT_METHODCALL_OP       (u16) 0x0035</div><div class='ctx'> #define AML_INT_RETURN_VALUE_OP     (u16) 0x0036</div><div class='ctx'> #define AML_INT_EVAL_SUBTREE_OP     (u16) 0x0037</div><div class='add'>+#define AML_INT_CONNECTION_OP       (u16) 0x0038</div><div class='add'>+#define AML_INT_EXTACCESSFIELD_OP   (u16) 0x0039</div><div class='ctx'> </div><div class='ctx'> #define ARG_NONE                    0x0</div><div class='ctx'> </div><div class='hunk'>@@ -456,13 +466,16 @@ typedef enum {</div><div class='ctx'>  * access_as keyword</div><div class='ctx'>  */</div><div class='ctx'> typedef enum {</div><div class='del'>-	AML_FIELD_ATTRIB_SMB_QUICK = 0x02,</div><div class='del'>-	AML_FIELD_ATTRIB_SMB_SEND_RCV = 0x04,</div><div class='del'>-	AML_FIELD_ATTRIB_SMB_BYTE = 0x06,</div><div class='del'>-	AML_FIELD_ATTRIB_SMB_WORD = 0x08,</div><div class='del'>-	AML_FIELD_ATTRIB_SMB_BLOCK = 0x0A,</div><div class='del'>-	AML_FIELD_ATTRIB_SMB_WORD_CALL = 0x0C,</div><div class='del'>-	AML_FIELD_ATTRIB_SMB_BLOCK_CALL = 0x0D</div><div class='add'>+	AML_FIELD_ATTRIB_QUICK = 0x02,</div><div class='add'>+	AML_FIELD_ATTRIB_SEND_RCV = 0x04,</div><div class='add'>+	AML_FIELD_ATTRIB_BYTE = 0x06,</div><div class='add'>+	AML_FIELD_ATTRIB_WORD = 0x08,</div><div class='add'>+	AML_FIELD_ATTRIB_BLOCK = 0x0A,</div><div class='add'>+	AML_FIELD_ATTRIB_MULTIBYTE = 0x0B,</div><div class='add'>+	AML_FIELD_ATTRIB_WORD_CALL = 0x0C,</div><div class='add'>+	AML_FIELD_ATTRIB_BLOCK_CALL = 0x0D,</div><div class='add'>+	AML_FIELD_ATTRIB_RAW_BYTES = 0x0E,</div><div class='add'>+	AML_FIELD_ATTRIB_RAW_PROCESS = 0x0F</div><div class='ctx'> } AML_ACCESS_ATTRIBUTE;</div><div class='ctx'> </div><div class='ctx'> /* Bit fields in the AML method_flags byte */</div><div class='head'>diff --git a/drivers/acpi/acpica/amlresrc.h b/drivers/acpi/acpica/amlresrc.h<br/>index 59122cde247c..7b2128f274e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/amlresrc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/amlresrc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/amlresrc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/amlresrc.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -58,29 +58,48 @@</div><div class='ctx'> #define ACPI_RESTAG_TYPESPECIFICATTRIBUTES      "_ATT"</div><div class='ctx'> #define ACPI_RESTAG_BASEADDRESS                 "_BAS"</div><div class='ctx'> #define ACPI_RESTAG_BUSMASTER                   "_BM_"	/* Master(1), Slave(0) */</div><div class='add'>+#define ACPI_RESTAG_DEBOUNCETIME                "_DBT"</div><div class='ctx'> #define ACPI_RESTAG_DECODE                      "_DEC"</div><div class='add'>+#define ACPI_RESTAG_DEVICEPOLARITY              "_DPL"</div><div class='ctx'> #define ACPI_RESTAG_DMA                         "_DMA"</div><div class='ctx'> #define ACPI_RESTAG_DMATYPE                     "_TYP"	/* Compatible(0), A(1), B(2), F(3) */</div><div class='add'>+#define ACPI_RESTAG_DRIVESTRENGTH               "_DRS"</div><div class='add'>+#define ACPI_RESTAG_ENDIANNESS                  "_END"</div><div class='add'>+#define ACPI_RESTAG_FLOWCONTROL                 "_FLC"</div><div class='ctx'> #define ACPI_RESTAG_GRANULARITY                 "_GRA"</div><div class='ctx'> #define ACPI_RESTAG_INTERRUPT                   "_INT"</div><div class='ctx'> #define ACPI_RESTAG_INTERRUPTLEVEL              "_LL_"	/* active_lo(1), active_hi(0) */</div><div class='ctx'> #define ACPI_RESTAG_INTERRUPTSHARE              "_SHR"	/* Shareable(1), no_share(0) */</div><div class='ctx'> #define ACPI_RESTAG_INTERRUPTTYPE               "_HE_"	/* Edge(1), Level(0) */</div><div class='add'>+#define ACPI_RESTAG_IORESTRICTION               "_IOR"</div><div class='ctx'> #define ACPI_RESTAG_LENGTH                      "_LEN"</div><div class='add'>+#define ACPI_RESTAG_LINE                        "_LIN"</div><div class='ctx'> #define ACPI_RESTAG_MEMATTRIBUTES               "_MTP"	/* Memory(0), Reserved(1), ACPI(2), NVS(3) */</div><div class='ctx'> #define ACPI_RESTAG_MEMTYPE                     "_MEM"	/* non_cache(0), Cacheable(1) Cache+combine(2), Cache+prefetch(3) */</div><div class='ctx'> #define ACPI_RESTAG_MAXADDR                     "_MAX"</div><div class='ctx'> #define ACPI_RESTAG_MINADDR                     "_MIN"</div><div class='ctx'> #define ACPI_RESTAG_MAXTYPE                     "_MAF"</div><div class='ctx'> #define ACPI_RESTAG_MINTYPE                     "_MIF"</div><div class='add'>+#define ACPI_RESTAG_MODE                        "_MOD"</div><div class='add'>+#define ACPI_RESTAG_PARITY                      "_PAR"</div><div class='add'>+#define ACPI_RESTAG_PHASE                       "_PHA"</div><div class='add'>+#define ACPI_RESTAG_PIN                         "_PIN"</div><div class='add'>+#define ACPI_RESTAG_PINCONFIG                   "_PPI"</div><div class='add'>+#define ACPI_RESTAG_POLARITY                    "_POL"</div><div class='ctx'> #define ACPI_RESTAG_REGISTERBITOFFSET           "_RBO"</div><div class='ctx'> #define ACPI_RESTAG_REGISTERBITWIDTH            "_RBW"</div><div class='ctx'> #define ACPI_RESTAG_RANGETYPE                   "_RNG"</div><div class='ctx'> #define ACPI_RESTAG_READWRITETYPE               "_RW_"	/* read_only(0), Writeable (1) */</div><div class='add'>+#define ACPI_RESTAG_LENGTH_RX                   "_RXL"</div><div class='add'>+#define ACPI_RESTAG_LENGTH_TX                   "_TXL"</div><div class='add'>+#define ACPI_RESTAG_SLAVEMODE                   "_SLV"</div><div class='add'>+#define ACPI_RESTAG_SPEED                       "_SPE"</div><div class='add'>+#define ACPI_RESTAG_STOPBITS                    "_STB"</div><div class='ctx'> #define ACPI_RESTAG_TRANSLATION                 "_TRA"</div><div class='ctx'> #define ACPI_RESTAG_TRANSTYPE                   "_TRS"	/* Sparse(1), Dense(0) */</div><div class='ctx'> #define ACPI_RESTAG_TYPE                        "_TTP"	/* Translation(1), Static (0) */</div><div class='ctx'> #define ACPI_RESTAG_XFERTYPE                    "_SIZ"	/* 8(0), 8_and16(1), 16(2) */</div><div class='add'>+#define ACPI_RESTAG_VENDORDATA                  "_VEN"</div><div class='ctx'> </div><div class='ctx'> /* Default sizes for "small" resource descriptors */</div><div class='ctx'> </div><div class='hunk'>@@ -90,6 +109,7 @@</div><div class='ctx'> #define ASL_RDESC_END_DEPEND_SIZE               0x00</div><div class='ctx'> #define ASL_RDESC_IO_SIZE                       0x07</div><div class='ctx'> #define ASL_RDESC_FIXED_IO_SIZE                 0x03</div><div class='add'>+#define ASL_RDESC_FIXED_DMA_SIZE                0x05</div><div class='ctx'> #define ASL_RDESC_END_TAG_SIZE                  0x01</div><div class='ctx'> </div><div class='ctx'> struct asl_resource_node {</div><div class='hunk'>@@ -164,6 +184,12 @@ struct aml_resource_end_tag {</div><div class='ctx'> 	AML_RESOURCE_SMALL_HEADER_COMMON u8 checksum;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct aml_resource_fixed_dma {</div><div class='add'>+	AML_RESOURCE_SMALL_HEADER_COMMON u16 request_lines;</div><div class='add'>+	u16 channels;</div><div class='add'>+	u8 width;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * LARGE descriptors</div><div class='ctx'>  */</div><div class='hunk'>@@ -263,6 +289,110 @@ struct aml_resource_generic_register {</div><div class='ctx'> 	u64 address;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Common descriptor for gpio_int and gpio_io (ACPI 5.0) */</div><div class='add'>+</div><div class='add'>+struct aml_resource_gpio {</div><div class='add'>+	AML_RESOURCE_LARGE_HEADER_COMMON u8 revision_id;</div><div class='add'>+	u8 connection_type;</div><div class='add'>+	u16 flags;</div><div class='add'>+	u16 int_flags;</div><div class='add'>+	u8 pin_config;</div><div class='add'>+	u16 drive_strength;</div><div class='add'>+	u16 debounce_timeout;</div><div class='add'>+	u16 pin_table_offset;</div><div class='add'>+	u8 res_source_index;</div><div class='add'>+	u16 res_source_offset;</div><div class='add'>+	u16 vendor_offset;</div><div class='add'>+	u16 vendor_length;</div><div class='add'>+	/*</div><div class='add'>+	 * Optional fields follow immediately:</div><div class='add'>+	 * 1) PIN list (Words)</div><div class='add'>+	 * 2) Resource Source String</div><div class='add'>+	 * 3) Vendor Data bytes</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AML_RESOURCE_GPIO_REVISION              1	/* ACPI 5.0 */</div><div class='add'>+</div><div class='add'>+/* Values for connection_type above */</div><div class='add'>+</div><div class='add'>+#define AML_RESOURCE_GPIO_TYPE_INT              0</div><div class='add'>+#define AML_RESOURCE_GPIO_TYPE_IO               1</div><div class='add'>+#define AML_RESOURCE_MAX_GPIOTYPE               1</div><div class='add'>+</div><div class='add'>+/* Common preamble for all serial descriptors (ACPI 5.0) */</div><div class='add'>+</div><div class='add'>+#define AML_RESOURCE_SERIAL_COMMON \</div><div class='add'>+	u8                              revision_id; \</div><div class='add'>+	u8                              res_source_index; \</div><div class='add'>+	u8                              type; \</div><div class='add'>+	u8                              flags; \</div><div class='add'>+	u16                             type_specific_flags; \</div><div class='add'>+	u8                              type_revision_id; \</div><div class='add'>+	u16                             type_data_length; \</div><div class='add'>+</div><div class='add'>+/* Values for the type field above */</div><div class='add'>+</div><div class='add'>+#define AML_RESOURCE_I2C_SERIALBUSTYPE          1</div><div class='add'>+#define AML_RESOURCE_SPI_SERIALBUSTYPE          2</div><div class='add'>+#define AML_RESOURCE_UART_SERIALBUSTYPE         3</div><div class='add'>+#define AML_RESOURCE_MAX_SERIALBUSTYPE          3</div><div class='add'>+#define AML_RESOURCE_VENDOR_SERIALBUSTYPE       192	/* Vendor defined is 0xC0-0xFF (NOT SUPPORTED) */</div><div class='add'>+</div><div class='add'>+struct aml_resource_common_serialbus {</div><div class='add'>+AML_RESOURCE_LARGE_HEADER_COMMON AML_RESOURCE_SERIAL_COMMON};</div><div class='add'>+</div><div class='add'>+struct aml_resource_i2c_serialbus {</div><div class='add'>+	AML_RESOURCE_LARGE_HEADER_COMMON</div><div class='add'>+	    AML_RESOURCE_SERIAL_COMMON u32 connection_speed;</div><div class='add'>+	u16 slave_address;</div><div class='add'>+	/*</div><div class='add'>+	 * Optional fields follow immediately:</div><div class='add'>+	 * 1) Vendor Data bytes</div><div class='add'>+	 * 2) Resource Source String</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AML_RESOURCE_I2C_REVISION               1	/* ACPI 5.0 */</div><div class='add'>+#define AML_RESOURCE_I2C_TYPE_REVISION          1	/* ACPI 5.0 */</div><div class='add'>+#define AML_RESOURCE_I2C_MIN_DATA_LEN           6</div><div class='add'>+</div><div class='add'>+struct aml_resource_spi_serialbus {</div><div class='add'>+	AML_RESOURCE_LARGE_HEADER_COMMON</div><div class='add'>+	    AML_RESOURCE_SERIAL_COMMON u32 connection_speed;</div><div class='add'>+	u8 data_bit_length;</div><div class='add'>+	u8 clock_phase;</div><div class='add'>+	u8 clock_polarity;</div><div class='add'>+	u16 device_selection;</div><div class='add'>+	/*</div><div class='add'>+	 * Optional fields follow immediately:</div><div class='add'>+	 * 1) Vendor Data bytes</div><div class='add'>+	 * 2) Resource Source String</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AML_RESOURCE_SPI_REVISION               1	/* ACPI 5.0 */</div><div class='add'>+#define AML_RESOURCE_SPI_TYPE_REVISION          1	/* ACPI 5.0 */</div><div class='add'>+#define AML_RESOURCE_SPI_MIN_DATA_LEN           9</div><div class='add'>+</div><div class='add'>+struct aml_resource_uart_serialbus {</div><div class='add'>+	AML_RESOURCE_LARGE_HEADER_COMMON</div><div class='add'>+	    AML_RESOURCE_SERIAL_COMMON u32 default_baud_rate;</div><div class='add'>+	u16 rx_fifo_size;</div><div class='add'>+	u16 tx_fifo_size;</div><div class='add'>+	u8 parity;</div><div class='add'>+	u8 lines_enabled;</div><div class='add'>+	/*</div><div class='add'>+	 * Optional fields follow immediately:</div><div class='add'>+	 * 1) Vendor Data bytes</div><div class='add'>+	 * 2) Resource Source String</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AML_RESOURCE_UART_REVISION              1	/* ACPI 5.0 */</div><div class='add'>+#define AML_RESOURCE_UART_TYPE_REVISION         1	/* ACPI 5.0 */</div><div class='add'>+#define AML_RESOURCE_UART_MIN_DATA_LEN          10</div><div class='add'>+</div><div class='ctx'> /* restore default alignment */</div><div class='ctx'> </div><div class='ctx'> #pragma pack()</div><div class='hunk'>@@ -284,6 +414,7 @@ union aml_resource {</div><div class='ctx'> 	struct aml_resource_end_dependent end_dpf;</div><div class='ctx'> 	struct aml_resource_io io;</div><div class='ctx'> 	struct aml_resource_fixed_io fixed_io;</div><div class='add'>+	struct aml_resource_fixed_dma fixed_dma;</div><div class='ctx'> 	struct aml_resource_vendor_small vendor_small;</div><div class='ctx'> 	struct aml_resource_end_tag end_tag;</div><div class='ctx'> </div><div class='hunk'>@@ -299,6 +430,11 @@ union aml_resource {</div><div class='ctx'> 	struct aml_resource_address64 address64;</div><div class='ctx'> 	struct aml_resource_extended_address64 ext_address64;</div><div class='ctx'> 	struct aml_resource_extended_irq extended_irq;</div><div class='add'>+	struct aml_resource_gpio gpio;</div><div class='add'>+	struct aml_resource_i2c_serialbus i2c_serial_bus;</div><div class='add'>+	struct aml_resource_spi_serialbus spi_serial_bus;</div><div class='add'>+	struct aml_resource_uart_serialbus uart_serial_bus;</div><div class='add'>+	struct aml_resource_common_serialbus common_serial_bus;</div><div class='ctx'> </div><div class='ctx'> 	/* Utility overlays */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/dsargs.c b/drivers/acpi/acpica/dsargs.c<br/>index 8c7b99728aa2..80eb1900297f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dsargs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dsargs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dsargs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/dsargs.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -250,6 +250,13 @@ acpi_ds_get_bank_field_arguments(union acpi_operand_object *obj_desc)</div><div class='ctx'> 	status = acpi_ds_execute_arguments(node, node-&gt;parent,</div><div class='ctx'> 					   extra_desc-&gt;extra.aml_length,</div><div class='ctx'> 					   extra_desc-&gt;extra.aml_start);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return_ACPI_STATUS(status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = acpi_ut_add_address_range(obj_desc-&gt;region.space_id,</div><div class='add'>+					   obj_desc-&gt;region.address,</div><div class='add'>+					   obj_desc-&gt;region.length, node);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -384,8 +391,15 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc)</div><div class='ctx'> </div><div class='ctx'> 	/* Execute the argument AML */</div><div class='ctx'> </div><div class='del'>-	status = acpi_ds_execute_arguments(node, node-&gt;parent,</div><div class='add'>+	status = acpi_ds_execute_arguments(node, extra_desc-&gt;extra.scope_node,</div><div class='ctx'> 					   extra_desc-&gt;extra.aml_length,</div><div class='ctx'> 					   extra_desc-&gt;extra.aml_start);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return_ACPI_STATUS(status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = acpi_ut_add_address_range(obj_desc-&gt;region.space_id,</div><div class='add'>+					   obj_desc-&gt;region.address,</div><div class='add'>+					   obj_desc-&gt;region.length, node);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/acpica/dscontrol.c b/drivers/acpi/acpica/dscontrol.c<br/>index 26c49fff58da..effe4ca1133f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dscontrol.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dscontrol.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dscontrol.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/dscontrol.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c<br/>index 34be60c0e448..cd243cf2cab2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dsfield.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dsfield.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dsfield.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/dsfield.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -221,6 +221,7 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	u64 position;</div><div class='add'>+	union acpi_parse_object *child;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE_PTR(ds_get_field_names, info);</div><div class='ctx'> </div><div class='hunk'>@@ -232,10 +233,11 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,</div><div class='ctx'> </div><div class='ctx'> 	while (arg) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Three types of field elements are handled:</div><div class='del'>-		 * 1) Offset - specifies a bit offset</div><div class='del'>-		 * 2) access_as - changes the access mode</div><div class='del'>-		 * 3) Name - Enters a new named field into the namespace</div><div class='add'>+		 * Four types of field elements are handled:</div><div class='add'>+		 * 1) Name - Enters a new named field into the namespace</div><div class='add'>+		 * 2) Offset - specifies a bit offset</div><div class='add'>+		 * 3) access_as - changes the access mode/attributes</div><div class='add'>+		 * 4) Connection - Associate a resource template with the field</div><div class='ctx'> 		 */</div><div class='ctx'> 		switch (arg-&gt;common.aml_opcode) {</div><div class='ctx'> 		case AML_INT_RESERVEDFIELD_OP:</div><div class='hunk'>@@ -253,21 +255,70 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case AML_INT_ACCESSFIELD_OP:</div><div class='del'>-</div><div class='add'>+		case AML_INT_EXTACCESSFIELD_OP:</div><div class='ctx'> 			/*</div><div class='del'>-			 * Get a new access_type and access_attribute -- to be used for all</div><div class='del'>-			 * field units that follow, until field end or another access_as</div><div class='del'>-			 * keyword.</div><div class='add'>+			 * Get new access_type, access_attribute, and access_length fields</div><div class='add'>+			 * -- to be used for all field units that follow, until the</div><div class='add'>+			 * end-of-field or another access_as keyword is encountered.</div><div class='add'>+			 * NOTE. These three bytes are encoded in the integer value</div><div class='add'>+			 * of the parseop for convenience.</div><div class='ctx'> 			 *</div><div class='ctx'> 			 * In field_flags, preserve the flag bits other than the</div><div class='del'>-			 * ACCESS_TYPE bits</div><div class='add'>+			 * ACCESS_TYPE bits.</div><div class='ctx'> 			 */</div><div class='add'>+</div><div class='add'>+			/* access_type (byte_acc, word_acc, etc.) */</div><div class='add'>+</div><div class='ctx'> 			info-&gt;field_flags = (u8)</div><div class='ctx'> 			    ((info-&gt;</div><div class='ctx'> 			      field_flags &amp; ~(AML_FIELD_ACCESS_TYPE_MASK)) |</div><div class='del'>-			     ((u8) ((u32) arg-&gt;common.value.integer &gt;&gt; 8)));</div><div class='add'>+			     ((u8)((u32)(arg-&gt;common.value.integer &amp; 0x07))));</div><div class='add'>+</div><div class='add'>+			/* access_attribute (attrib_quick, attrib_byte, etc.) */</div><div class='add'>+</div><div class='add'>+			info-&gt;attribute =</div><div class='add'>+			    (u8)((arg-&gt;common.value.integer &gt;&gt; 8) &amp; 0xFF);</div><div class='add'>+</div><div class='add'>+			/* access_length (for serial/buffer protocols) */</div><div class='add'>+</div><div class='add'>+			info-&gt;access_length =</div><div class='add'>+			    (u8)((arg-&gt;common.value.integer &gt;&gt; 16) &amp; 0xFF);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case AML_INT_CONNECTION_OP:</div><div class='add'>+			/*</div><div class='add'>+			 * Clear any previous connection. New connection is used for all</div><div class='add'>+			 * fields that follow, similar to access_as</div><div class='add'>+			 */</div><div class='add'>+			info-&gt;resource_buffer = NULL;</div><div class='add'>+			info-&gt;connection_node = NULL;</div><div class='ctx'> </div><div class='del'>-			info-&gt;attribute = (u8) (arg-&gt;common.value.integer);</div><div class='add'>+			/*</div><div class='add'>+			 * A Connection() is either an actual resource descriptor (buffer)</div><div class='add'>+			 * or a named reference to a resource template</div><div class='add'>+			 */</div><div class='add'>+			child = arg-&gt;common.value.arg;</div><div class='add'>+			if (child-&gt;common.aml_opcode == AML_INT_BYTELIST_OP) {</div><div class='add'>+				info-&gt;resource_buffer = child-&gt;named.data;</div><div class='add'>+				info-&gt;resource_length =</div><div class='add'>+				    (u16)child-&gt;named.value.integer;</div><div class='add'>+			} else {</div><div class='add'>+				/* Lookup the Connection() namepath, it should already exist */</div><div class='add'>+</div><div class='add'>+				status = acpi_ns_lookup(walk_state-&gt;scope_info,</div><div class='add'>+							child-&gt;common.value.</div><div class='add'>+							name, ACPI_TYPE_ANY,</div><div class='add'>+							ACPI_IMODE_EXECUTE,</div><div class='add'>+							ACPI_NS_DONT_OPEN_SCOPE,</div><div class='add'>+							walk_state,</div><div class='add'>+							&amp;info-&gt;connection_node);</div><div class='add'>+				if (ACPI_FAILURE(status)) {</div><div class='add'>+					ACPI_ERROR_NAMESPACE(child-&gt;common.</div><div class='add'>+							     value.name,</div><div class='add'>+							     status);</div><div class='add'>+					return_ACPI_STATUS(status);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case AML_INT_NAMEDFIELD_OP:</div><div class='hunk'>@@ -374,6 +425,8 @@ acpi_ds_create_field(union acpi_parse_object *op,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ACPI_MEMSET(&amp;info, 0, sizeof(struct acpi_create_field_info));</div><div class='add'>+</div><div class='ctx'> 	/* Second arg is the field flags */</div><div class='ctx'> </div><div class='ctx'> 	arg = arg-&gt;common.next;</div><div class='hunk'>@@ -386,7 +439,6 @@ acpi_ds_create_field(union acpi_parse_object *op,</div><div class='ctx'> 	info.region_node = region_node;</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ds_get_field_names(&amp;info, walk_state, arg-&gt;common.next);</div><div class='del'>-</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -474,8 +526,8 @@ acpi_ds_init_field_objects(union acpi_parse_object *op,</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (arg) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Ignore OFFSET and ACCESSAS terms here; we are only interested in the</div><div class='del'>-		 * field names in order to enter them into the namespace.</div><div class='add'>+		 * Ignore OFFSET/ACCESSAS/CONNECTION terms here; we are only interested</div><div class='add'>+		 * in the field names in order to enter them into the namespace.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (arg-&gt;common.aml_opcode == AML_INT_NAMEDFIELD_OP) {</div><div class='ctx'> 			status = acpi_ns_lookup(walk_state-&gt;scope_info,</div><div class='hunk'>@@ -651,6 +703,5 @@ acpi_ds_create_index_field(union acpi_parse_object *op,</div><div class='ctx'> 	info.region_node = region_node;</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ds_get_field_names(&amp;info, walk_state, arg-&gt;common.next);</div><div class='del'>-</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/acpica/dsinit.c b/drivers/acpi/acpica/dsinit.c<br/>index a7718bf2b9a1..9e5ac7f780a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dsinit.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dsinit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dsinit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/dsinit.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c<br/>index 5d797751e205..00f5dab5bcc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dsmethod.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dsmethod.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dsmethod.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/dsmethod.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/dsmthdat.c b/drivers/acpi/acpica/dsmthdat.c<br/>index 905ce29a92e1..b40bd507be5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dsmthdat.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dsmthdat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dsmthdat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/dsmthdat.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/dsobject.c b/drivers/acpi/acpica/dsobject.c<br/>index f42e17e5c252..d7045ca3e32a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dsobject.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dsobject.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dsobject.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/dsobject.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c<br/>index c627a288e027..e5eff7585102 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dsopcode.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dsopcode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dsopcode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/dsopcode.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c<br/>index 2c477ce172fa..1abcda31037f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dsutils.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dsutils.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dsutils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/dsutils.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/dswexec.c b/drivers/acpi/acpica/dswexec.c<br/>index fe40e4c6554f..642f3c053e87 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dswexec.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dswexec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dswexec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/dswexec.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c<br/>index 324acec1179a..552aa3a50c84 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dswload.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dswload.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dswload.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/dswload.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/dswload2.c b/drivers/acpi/acpica/dswload2.c<br/>index 976318138c56..ae7147724763 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dswload2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dswload2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dswload2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/dswload2.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/dswscope.c b/drivers/acpi/acpica/dswscope.c<br/>index 76a661fc1e09..9e9490a9cbf0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dswscope.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dswscope.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dswscope.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/dswscope.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/dswstate.c b/drivers/acpi/acpica/dswstate.c<br/>index a6c374ef9914..c9c2ac13e7cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dswstate.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/dswstate.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/dswstate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/dswstate.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/evevent.c b/drivers/acpi/acpica/evevent.c<br/>index d458b041e651..6729ebe2f1e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evevent.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evevent.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evevent.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/evevent.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -71,6 +71,12 @@ acpi_status acpi_ev_initialize_events(void)</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE(ev_initialize_events);</div><div class='ctx'> </div><div class='add'>+	/* If Hardware Reduced flag is set, there are no fixed events */</div><div class='add'>+</div><div class='add'>+	if (acpi_gbl_reduced_hardware) {</div><div class='add'>+		return_ACPI_STATUS(AE_OK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize the Fixed and General Purpose Events. This is done prior to</div><div class='ctx'> 	 * enabling SCIs to prevent interrupts from occurring before the handlers</div><div class='hunk'>@@ -111,6 +117,12 @@ acpi_status acpi_ev_install_xrupt_handlers(void)</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE(ev_install_xrupt_handlers);</div><div class='ctx'> </div><div class='add'>+	/* If Hardware Reduced flag is set, there is no ACPI h/w */</div><div class='add'>+</div><div class='add'>+	if (acpi_gbl_reduced_hardware) {</div><div class='add'>+		return_ACPI_STATUS(AE_OK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Install the SCI handler */</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ev_install_sci_handler();</div><div class='head'>diff --git a/drivers/acpi/acpica/evglock.c b/drivers/acpi/acpica/evglock.c<br/>index 56a562a1e5d7..5e5683cb1f0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evglock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evglock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evglock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/evglock.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -70,6 +70,12 @@ acpi_status acpi_ev_init_global_lock_handler(void)</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE(ev_init_global_lock_handler);</div><div class='ctx'> </div><div class='add'>+	/* If Hardware Reduced flag is set, there is no global lock */</div><div class='add'>+</div><div class='add'>+	if (acpi_gbl_reduced_hardware) {</div><div class='add'>+		return_ACPI_STATUS(AE_OK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Attempt installation of the global lock handler */</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_install_fixed_event_handler(ACPI_EVENT_GLOBAL,</div><div class='head'>diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c<br/>index 65c79add3b19..9e88cb6fb25e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evgpe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evgpe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evgpe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/evgpe.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c<br/>index ca2c41a53311..be75339cd5dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evgpeblk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evgpeblk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evgpeblk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/evgpeblk.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/evgpeinit.c b/drivers/acpi/acpica/evgpeinit.c<br/>index ce9aa9f9a972..adf7494da9db 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evgpeinit.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evgpeinit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evgpeinit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/evgpeinit.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/evgpeutil.c b/drivers/acpi/acpica/evgpeutil.c<br/>index 80a81d0c4a80..25073932aa10 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evgpeutil.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evgpeutil.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evgpeutil.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/evgpeutil.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c<br/>index d0b331844427..84966f416463 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evmisc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evmisc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evmisc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/evmisc.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c<br/>index f0edf5c43c03..1b0180a1b798 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evregion.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evregion.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evregion.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/evregion.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -329,6 +329,7 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)</div><div class='ctx'>  * FUNCTION:    acpi_ev_address_space_dispatch</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  region_obj          - Internal region object</div><div class='add'>+ *              field_obj           - Corresponding field. Can be NULL.</div><div class='ctx'>  *              Function            - Read or Write operation</div><div class='ctx'>  *              region_offset       - Where in the region to read or write</div><div class='ctx'>  *              bit_width           - Field width in bits (8, 16, 32, or 64)</div><div class='hunk'>@@ -344,6 +345,7 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)</div><div class='ctx'> </div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,</div><div class='add'>+			       union acpi_operand_object *field_obj,</div><div class='ctx'> 			       u32 function,</div><div class='ctx'> 			       u32 region_offset, u32 bit_width, u64 *value)</div><div class='ctx'> {</div><div class='hunk'>@@ -353,6 +355,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,</div><div class='ctx'> 	union acpi_operand_object *handler_desc;</div><div class='ctx'> 	union acpi_operand_object *region_obj2;</div><div class='ctx'> 	void *region_context = NULL;</div><div class='add'>+	struct acpi_connection_info *context;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE(ev_address_space_dispatch);</div><div class='ctx'> </div><div class='hunk'>@@ -375,6 +378,8 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,</div><div class='ctx'> 		return_ACPI_STATUS(AE_NOT_EXIST);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	context = handler_desc-&gt;address_space.context;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * It may be the case that the region has never been initialized.</div><div class='ctx'> 	 * Some types of regions require special init code</div><div class='hunk'>@@ -404,8 +409,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,</div><div class='ctx'> 		acpi_ex_exit_interpreter();</div><div class='ctx'> </div><div class='ctx'> 		status = region_setup(region_obj, ACPI_REGION_ACTIVATE,</div><div class='del'>-				      handler_desc-&gt;address_space.context,</div><div class='del'>-				      &amp;region_context);</div><div class='add'>+				      context, &amp;region_context);</div><div class='ctx'> </div><div class='ctx'> 		/* Re-enter the interpreter */</div><div class='ctx'> </div><div class='hunk'>@@ -455,6 +459,25 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,</div><div class='ctx'> 			  acpi_ut_get_region_name(region_obj-&gt;region.</div><div class='ctx'> 						  space_id)));</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Special handling for generic_serial_bus and general_purpose_io:</div><div class='add'>+	 * There are three extra parameters that must be passed to the</div><div class='add'>+	 * handler via the context:</div><div class='add'>+	 *   1) Connection buffer, a resource template from Connection() op.</div><div class='add'>+	 *   2) Length of the above buffer.</div><div class='add'>+	 *   3) Actual access length from the access_as() op.</div><div class='add'>+	 */</div><div class='add'>+	if (((region_obj-&gt;region.space_id == ACPI_ADR_SPACE_GSBUS) ||</div><div class='add'>+	     (region_obj-&gt;region.space_id == ACPI_ADR_SPACE_GPIO)) &amp;&amp;</div><div class='add'>+	    context &amp;&amp; field_obj) {</div><div class='add'>+</div><div class='add'>+		/* Get the Connection (resource_template) buffer */</div><div class='add'>+</div><div class='add'>+		context-&gt;connection = field_obj-&gt;field.resource_buffer;</div><div class='add'>+		context-&gt;length = field_obj-&gt;field.resource_length;</div><div class='add'>+		context-&gt;access_length = field_obj-&gt;field.access_length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!(handler_desc-&gt;address_space.handler_flags &amp;</div><div class='ctx'> 	      ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -469,7 +492,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,</div><div class='ctx'> </div><div class='ctx'> 	status = handler(function,</div><div class='ctx'> 			 (region_obj-&gt;region.address + region_offset),</div><div class='del'>-			 bit_width, value, handler_desc-&gt;address_space.context,</div><div class='add'>+			 bit_width, value, context,</div><div class='ctx'> 			 region_obj2-&gt;extra.region_context);</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='head'>diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c<br/>index 55a5d35ef34a..819c17f5897a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evrgnini.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evrgnini.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evrgnini.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/evrgnini.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/evsci.c b/drivers/acpi/acpica/evsci.c<br/>index 2ebd40e1a3ef..26065c612e76 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evsci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evsci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evsci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/evsci.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c<br/>index f4f523bf5939..61944e89565a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evxface.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evxface.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evxface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/evxface.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c<br/>index 20516e599476..1768bbec1002 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evxfevnt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evxfevnt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evxfevnt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/evxfevnt.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/evxfgpe.c b/drivers/acpi/acpica/evxfgpe.c<br/>index f06a3ee356ba..33388fd69df4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evxfgpe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evxfgpe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evxfgpe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/evxfgpe.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/evxfregn.c b/drivers/acpi/acpica/evxfregn.c<br/>index aee887e3ca5c..6019208cd4b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evxfregn.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/evxfregn.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/evxfregn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/evxfregn.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c<br/>index 745a42b401f5..c86d44e41bc8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exconfig.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exconfig.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exconfig.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exconfig.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -297,9 +297,9 @@ acpi_ex_region_read(union acpi_operand_object *obj_desc, u32 length, u8 *buffer)</div><div class='ctx'> 	/* Bytewise reads */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; length; i++) {</div><div class='del'>-		status = acpi_ev_address_space_dispatch(obj_desc, ACPI_READ,</div><div class='del'>-							region_offset, 8,</div><div class='del'>-							&amp;value);</div><div class='add'>+		status =</div><div class='add'>+		    acpi_ev_address_space_dispatch(obj_desc, NULL, ACPI_READ,</div><div class='add'>+						   region_offset, 8, &amp;value);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			return status;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/acpi/acpica/exconvrt.c b/drivers/acpi/acpica/exconvrt.c<br/>index 74162a11817d..e385436bd424 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exconvrt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exconvrt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exconvrt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exconvrt.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/excreate.c b/drivers/acpi/acpica/excreate.c<br/>index 110711afada8..3f5bc998c1cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/excreate.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/excreate.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/excreate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/excreate.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -267,7 +267,7 @@ acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state)</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  aml_start           - Pointer to the region declaration AML</div><div class='ctx'>  *              aml_length          - Max length of the declaration AML</div><div class='del'>- *              region_space        - space_iD for the region</div><div class='add'>+ *              space_id            - Address space ID for the region</div><div class='ctx'>  *              walk_state          - Current state</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='hunk'>@@ -279,7 +279,7 @@ acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state)</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_ex_create_region(u8 * aml_start,</div><div class='ctx'> 		      u32 aml_length,</div><div class='del'>-		      u8 region_space, struct acpi_walk_state *walk_state)</div><div class='add'>+		      u8 space_id, struct acpi_walk_state *walk_state)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='hunk'>@@ -304,16 +304,19 @@ acpi_ex_create_region(u8 * aml_start,</div><div class='ctx'> 	 * Space ID must be one of the predefined IDs, or in the user-defined</div><div class='ctx'> 	 * range</div><div class='ctx'> 	 */</div><div class='del'>-	if ((region_space &gt;= ACPI_NUM_PREDEFINED_REGIONS) &amp;&amp;</div><div class='del'>-	    (region_space &lt; ACPI_USER_REGION_BEGIN) &amp;&amp;</div><div class='del'>-	    (region_space != ACPI_ADR_SPACE_DATA_TABLE)) {</div><div class='del'>-		ACPI_ERROR((AE_INFO, "Invalid AddressSpace type 0x%X",</div><div class='del'>-			    region_space));</div><div class='del'>-		return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID);</div><div class='add'>+	if (!acpi_is_valid_space_id(space_id)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Print an error message, but continue. We don't want to abort</div><div class='add'>+		 * a table load for this exception. Instead, if the region is</div><div class='add'>+		 * actually used at runtime, abort the executing method.</div><div class='add'>+		 */</div><div class='add'>+		ACPI_ERROR((AE_INFO,</div><div class='add'>+			    "Invalid/unknown Address Space ID: 0x%2.2X",</div><div class='add'>+			    space_id));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "Region Type - %s (0x%X)\n",</div><div class='del'>-			  acpi_ut_get_region_name(region_space), region_space));</div><div class='add'>+			  acpi_ut_get_region_name(space_id), space_id));</div><div class='ctx'> </div><div class='ctx'> 	/* Create the region descriptor */</div><div class='ctx'> </div><div class='hunk'>@@ -330,10 +333,16 @@ acpi_ex_create_region(u8 * aml_start,</div><div class='ctx'> 	region_obj2 = obj_desc-&gt;common.next_object;</div><div class='ctx'> 	region_obj2-&gt;extra.aml_start = aml_start;</div><div class='ctx'> 	region_obj2-&gt;extra.aml_length = aml_length;</div><div class='add'>+	if (walk_state-&gt;scope_info) {</div><div class='add'>+		region_obj2-&gt;extra.scope_node =</div><div class='add'>+		    walk_state-&gt;scope_info-&gt;scope.node;</div><div class='add'>+	} else {</div><div class='add'>+		region_obj2-&gt;extra.scope_node = node;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Init the region from the operands */</div><div class='ctx'> </div><div class='del'>-	obj_desc-&gt;region.space_id = region_space;</div><div class='add'>+	obj_desc-&gt;region.space_id = space_id;</div><div class='ctx'> 	obj_desc-&gt;region.address = 0;</div><div class='ctx'> 	obj_desc-&gt;region.length = 0;</div><div class='ctx'> 	obj_desc-&gt;region.node = node;</div><div class='head'>diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c<br/>index c7a2f1edd282..e211e9c19215 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exdebug.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exdebug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exdebug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exdebug.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/exdump.c b/drivers/acpi/acpica/exdump.c<br/>index 61b8c0e8b74d..2a6ac0a3bc1e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exdump.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exdump.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exdump.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exdump.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -192,10 +192,13 @@ static struct acpi_exdump_info acpi_ex_dump_buffer_field[3] = {</div><div class='ctx'> 	 "Buffer Object"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct acpi_exdump_info acpi_ex_dump_region_field[3] = {</div><div class='add'>+static struct acpi_exdump_info acpi_ex_dump_region_field[5] = {</div><div class='ctx'> 	{ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_region_field), NULL},</div><div class='ctx'> 	{ACPI_EXD_FIELD, 0, NULL},</div><div class='del'>-	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(field.region_obj), "Region Object"}</div><div class='add'>+	{ACPI_EXD_UINT8, ACPI_EXD_OFFSET(field.access_length), "AccessLength"},</div><div class='add'>+	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(field.region_obj), "Region Object"},</div><div class='add'>+	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(field.resource_buffer),</div><div class='add'>+	 "ResourceBuffer"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct acpi_exdump_info acpi_ex_dump_bank_field[5] = {</div><div class='head'>diff --git a/drivers/acpi/acpica/exfield.c b/drivers/acpi/acpica/exfield.c<br/>index 0bde2230c028..dc092f5b35d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exfield.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exfield.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exfield.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exfield.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -100,18 +100,25 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		   (obj_desc-&gt;field.region_obj-&gt;region.space_id ==</div><div class='ctx'> 		    ACPI_ADR_SPACE_SMBUS</div><div class='ctx'> 		    || obj_desc-&gt;field.region_obj-&gt;region.space_id ==</div><div class='add'>+		    ACPI_ADR_SPACE_GSBUS</div><div class='add'>+		    || obj_desc-&gt;field.region_obj-&gt;region.space_id ==</div><div class='ctx'> 		    ACPI_ADR_SPACE_IPMI)) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * This is an SMBus or IPMI read. We must create a buffer to hold</div><div class='add'>+		 * This is an SMBus, GSBus or IPMI read. We must create a buffer to hold</div><div class='ctx'> 		 * the data and then directly access the region handler.</div><div class='ctx'> 		 *</div><div class='del'>-		 * Note: Smbus protocol value is passed in upper 16-bits of Function</div><div class='add'>+		 * Note: SMBus and GSBus protocol value is passed in upper 16-bits of Function</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (obj_desc-&gt;field.region_obj-&gt;region.space_id ==</div><div class='ctx'> 		    ACPI_ADR_SPACE_SMBUS) {</div><div class='ctx'> 			length = ACPI_SMBUS_BUFFER_SIZE;</div><div class='ctx'> 			function =</div><div class='ctx'> 			    ACPI_READ | (obj_desc-&gt;field.attribute &lt;&lt; 16);</div><div class='add'>+		} else if (obj_desc-&gt;field.region_obj-&gt;region.space_id ==</div><div class='add'>+			   ACPI_ADR_SPACE_GSBUS) {</div><div class='add'>+			length = ACPI_GSBUS_BUFFER_SIZE;</div><div class='add'>+			function =</div><div class='add'>+			    ACPI_READ | (obj_desc-&gt;field.attribute &lt;&lt; 16);</div><div class='ctx'> 		} else {	/* IPMI */</div><div class='ctx'> </div><div class='ctx'> 			length = ACPI_IPMI_BUFFER_SIZE;</div><div class='hunk'>@@ -248,21 +255,23 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,</div><div class='ctx'> 		   (obj_desc-&gt;field.region_obj-&gt;region.space_id ==</div><div class='ctx'> 		    ACPI_ADR_SPACE_SMBUS</div><div class='ctx'> 		    || obj_desc-&gt;field.region_obj-&gt;region.space_id ==</div><div class='add'>+		    ACPI_ADR_SPACE_GSBUS</div><div class='add'>+		    || obj_desc-&gt;field.region_obj-&gt;region.space_id ==</div><div class='ctx'> 		    ACPI_ADR_SPACE_IPMI)) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * This is an SMBus or IPMI write. We will bypass the entire field</div><div class='add'>+		 * This is an SMBus, GSBus or IPMI write. We will bypass the entire field</div><div class='ctx'> 		 * mechanism and handoff the buffer directly to the handler. For</div><div class='ctx'> 		 * these address spaces, the buffer is bi-directional; on a write,</div><div class='ctx'> 		 * return data is returned in the same buffer.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * Source must be a buffer of sufficient size:</div><div class='del'>-		 * ACPI_SMBUS_BUFFER_SIZE or ACPI_IPMI_BUFFER_SIZE.</div><div class='add'>+		 * ACPI_SMBUS_BUFFER_SIZE, ACPI_GSBUS_BUFFER_SIZE, or ACPI_IPMI_BUFFER_SIZE.</div><div class='ctx'> 		 *</div><div class='del'>-		 * Note: SMBus protocol type is passed in upper 16-bits of Function</div><div class='add'>+		 * Note: SMBus and GSBus protocol type is passed in upper 16-bits of Function</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (source_desc-&gt;common.type != ACPI_TYPE_BUFFER) {</div><div class='ctx'> 			ACPI_ERROR((AE_INFO,</div><div class='del'>-				    "SMBus or IPMI write requires Buffer, found type %s",</div><div class='add'>+				    "SMBus/IPMI/GenericSerialBus write requires Buffer, found type %s",</div><div class='ctx'> 				    acpi_ut_get_object_type_name(source_desc)));</div><div class='ctx'> </div><div class='ctx'> 			return_ACPI_STATUS(AE_AML_OPERAND_TYPE);</div><div class='hunk'>@@ -273,6 +282,11 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,</div><div class='ctx'> 			length = ACPI_SMBUS_BUFFER_SIZE;</div><div class='ctx'> 			function =</div><div class='ctx'> 			    ACPI_WRITE | (obj_desc-&gt;field.attribute &lt;&lt; 16);</div><div class='add'>+		} else if (obj_desc-&gt;field.region_obj-&gt;region.space_id ==</div><div class='add'>+			   ACPI_ADR_SPACE_GSBUS) {</div><div class='add'>+			length = ACPI_GSBUS_BUFFER_SIZE;</div><div class='add'>+			function =</div><div class='add'>+			    ACPI_WRITE | (obj_desc-&gt;field.attribute &lt;&lt; 16);</div><div class='ctx'> 		} else {	/* IPMI */</div><div class='ctx'> </div><div class='ctx'> 			length = ACPI_IPMI_BUFFER_SIZE;</div><div class='hunk'>@@ -281,7 +295,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,</div><div class='ctx'> </div><div class='ctx'> 		if (source_desc-&gt;buffer.length &lt; length) {</div><div class='ctx'> 			ACPI_ERROR((AE_INFO,</div><div class='del'>-				    "SMBus or IPMI write requires Buffer of length %u, found length %u",</div><div class='add'>+				    "SMBus/IPMI/GenericSerialBus write requires Buffer of length %u, found length %u",</div><div class='ctx'> 				    length, source_desc-&gt;buffer.length));</div><div class='ctx'> </div><div class='ctx'> 			return_ACPI_STATUS(AE_AML_BUFFER_LIMIT);</div><div class='head'>diff --git a/drivers/acpi/acpica/exfldio.c b/drivers/acpi/acpica/exfldio.c<br/>index f915a7f3f921..149de45fdadd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exfldio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exfldio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exfldio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exfldio.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -86,6 +86,7 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	union acpi_operand_object *rgn_desc;</div><div class='add'>+	u8 space_id;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE_U32(ex_setup_region, field_datum_byte_offset);</div><div class='ctx'> </div><div class='hunk'>@@ -101,6 +102,17 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,</div><div class='ctx'> 		return_ACPI_STATUS(AE_AML_OPERAND_TYPE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	space_id = rgn_desc-&gt;region.space_id;</div><div class='add'>+</div><div class='add'>+	/* Validate the Space ID */</div><div class='add'>+</div><div class='add'>+	if (!acpi_is_valid_space_id(space_id)) {</div><div class='add'>+		ACPI_ERROR((AE_INFO,</div><div class='add'>+			    "Invalid/unknown Address Space ID: 0x%2.2X",</div><div class='add'>+			    space_id));</div><div class='add'>+		return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the Region Address and Length have not been previously evaluated,</div><div class='ctx'> 	 * evaluate them now and save the results.</div><div class='hunk'>@@ -119,11 +131,12 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Exit now for SMBus or IPMI address space, it has a non-linear</div><div class='add'>+	 * Exit now for SMBus, GSBus or IPMI address space, it has a non-linear</div><div class='ctx'> 	 * address space and the request cannot be directly validated</div><div class='ctx'> 	 */</div><div class='del'>-	if (rgn_desc-&gt;region.space_id == ACPI_ADR_SPACE_SMBUS ||</div><div class='del'>-	    rgn_desc-&gt;region.space_id == ACPI_ADR_SPACE_IPMI) {</div><div class='add'>+	if (space_id == ACPI_ADR_SPACE_SMBUS ||</div><div class='add'>+	    space_id == ACPI_ADR_SPACE_GSBUS ||</div><div class='add'>+	    space_id == ACPI_ADR_SPACE_IPMI) {</div><div class='ctx'> </div><div class='ctx'> 		/* SMBus or IPMI has a non-linear address space */</div><div class='ctx'> </div><div class='hunk'>@@ -271,11 +284,12 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,</div><div class='ctx'> </div><div class='ctx'> 	/* Invoke the appropriate address_space/op_region handler */</div><div class='ctx'> </div><div class='del'>-	status =</div><div class='del'>-	    acpi_ev_address_space_dispatch(rgn_desc, function, region_offset,</div><div class='del'>-					   ACPI_MUL_8(obj_desc-&gt;common_field.</div><div class='del'>-						      access_byte_width),</div><div class='del'>-					   value);</div><div class='add'>+	status = acpi_ev_address_space_dispatch(rgn_desc, obj_desc,</div><div class='add'>+						function, region_offset,</div><div class='add'>+						ACPI_MUL_8(obj_desc-&gt;</div><div class='add'>+							   common_field.</div><div class='add'>+							   access_byte_width),</div><div class='add'>+						value);</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		if (status == AE_NOT_IMPLEMENTED) {</div><div class='hunk'>@@ -316,6 +330,7 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,</div><div class='ctx'> static u8</div><div class='ctx'> acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value)</div><div class='ctx'> {</div><div class='add'>+	ACPI_FUNCTION_NAME(ex_register_overflow);</div><div class='ctx'> </div><div class='ctx'> 	if (obj_desc-&gt;common_field.bit_length &gt;= ACPI_INTEGER_BIT_SIZE) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -330,6 +345,11 @@ acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value)</div><div class='ctx'> 		 * The Value is larger than the maximum value that can fit into</div><div class='ctx'> 		 * the register.</div><div class='ctx'> 		 */</div><div class='add'>+		ACPI_ERROR((AE_INFO,</div><div class='add'>+			    "Index value 0x%8.8X%8.8X overflows field width 0x%X",</div><div class='add'>+			    ACPI_FORMAT_UINT64(value),</div><div class='add'>+			    obj_desc-&gt;common_field.bit_length));</div><div class='add'>+</div><div class='ctx'> 		return (TRUE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/exmisc.c b/drivers/acpi/acpica/exmisc.c<br/>index 703d88ed0b3d..0a0893310348 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exmisc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exmisc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exmisc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exmisc.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/exmutex.c b/drivers/acpi/acpica/exmutex.c<br/>index be1c56ead653..60933e9dc3c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exmutex.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exmutex.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exmutex.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exmutex.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/exnames.c b/drivers/acpi/acpica/exnames.c<br/>index 49ec049c157e..fcc75fa27d32 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exnames.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exnames.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exnames.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exnames.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c<br/>index 236ead14b7f7..9ba8c73cea16 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exoparg1.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exoparg1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exoparg1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exoparg1.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/exoparg2.c b/drivers/acpi/acpica/exoparg2.c<br/>index 2571b4a310f4..879e8a277b94 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exoparg2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exoparg2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exoparg2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exoparg2.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/exoparg3.c b/drivers/acpi/acpica/exoparg3.c<br/>index 1b48d9d28c9a..71fcc65c9ffa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exoparg3.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exoparg3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exoparg3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exoparg3.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/exoparg6.c b/drivers/acpi/acpica/exoparg6.c<br/>index f4a2787e8e92..0786b8659061 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exoparg6.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exoparg6.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exoparg6.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exoparg6.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c<br/>index cc95e2000406..30157f5a12d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exprep.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exprep.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exprep.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exprep.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -47,6 +47,7 @@</div><div class='ctx'> #include "acinterp.h"</div><div class='ctx'> #include "amlcode.h"</div><div class='ctx'> #include "acnamesp.h"</div><div class='add'>+#include "acdispat.h"</div><div class='ctx'> </div><div class='ctx'> #define _COMPONENT          ACPI_EXECUTER</div><div class='ctx'> ACPI_MODULE_NAME("exprep")</div><div class='hunk'>@@ -455,6 +456,30 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)</div><div class='ctx'> 		obj_desc-&gt;field.region_obj =</div><div class='ctx'> 		    acpi_ns_get_attached_object(info-&gt;region_node);</div><div class='ctx'> </div><div class='add'>+		/* Fields specific to generic_serial_bus fields */</div><div class='add'>+</div><div class='add'>+		obj_desc-&gt;field.access_length = info-&gt;access_length;</div><div class='add'>+</div><div class='add'>+		if (info-&gt;connection_node) {</div><div class='add'>+			second_desc = info-&gt;connection_node-&gt;object;</div><div class='add'>+			if (!(second_desc-&gt;common.flags &amp; AOPOBJ_DATA_VALID)) {</div><div class='add'>+				status =</div><div class='add'>+				    acpi_ds_get_buffer_arguments(second_desc);</div><div class='add'>+				if (ACPI_FAILURE(status)) {</div><div class='add'>+					acpi_ut_delete_object_desc(obj_desc);</div><div class='add'>+					return_ACPI_STATUS(status);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			obj_desc-&gt;field.resource_buffer =</div><div class='add'>+			    second_desc-&gt;buffer.pointer;</div><div class='add'>+			obj_desc-&gt;field.resource_length =</div><div class='add'>+			    (u16)second_desc-&gt;buffer.length;</div><div class='add'>+		} else if (info-&gt;resource_buffer) {</div><div class='add'>+			obj_desc-&gt;field.resource_buffer = info-&gt;resource_buffer;</div><div class='add'>+			obj_desc-&gt;field.resource_length = info-&gt;resource_length;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* Allow full data read from EC address space */</div><div class='ctx'> </div><div class='ctx'> 		if ((obj_desc-&gt;field.region_obj-&gt;region.space_id ==</div><div class='head'>diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c<br/>index f0d5e14f1f2c..12d51df6d3bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exregion.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exregion.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exregion.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exregion.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/exresnte.c b/drivers/acpi/acpica/exresnte.c<br/>index 55997e46948b..fa50e77e64a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exresnte.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exresnte.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exresnte.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exresnte.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/exresolv.c b/drivers/acpi/acpica/exresolv.c<br/>index db502cd7d934..6e335dc34528 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exresolv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exresolv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exresolv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exresolv.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c<br/>index e3bb00ccdff5..a67b1d925ddd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exresop.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exresop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exresop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exresop.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/exstore.c b/drivers/acpi/acpica/exstore.c<br/>index c0c8842dd344..c6cf843cc4c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exstore.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exstore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exstore.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exstore.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/exstoren.c b/drivers/acpi/acpica/exstoren.c<br/>index a979017d56b8..b35bed52e061 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exstoren.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exstoren.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exstoren.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exstoren.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/exstorob.c b/drivers/acpi/acpica/exstorob.c<br/>index dc665cc554de..65a45d8335c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exstorob.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exstorob.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exstorob.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exstorob.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/exsystem.c b/drivers/acpi/acpica/exsystem.c<br/>index df66e7b686be..191a12945226 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exsystem.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exsystem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exsystem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exsystem.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/exutils.c b/drivers/acpi/acpica/exutils.c<br/>index 8ad93146dd32..eb6798ba8b59 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exutils.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/exutils.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/exutils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/exutils.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -435,4 +435,29 @@ void acpi_ex_integer_to_string(char *out_string, u64 value)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_is_valid_space_id</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  space_id            - ID to be validated</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      TRUE if valid/supported ID.</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Validate an operation region space_iD.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+u8 acpi_is_valid_space_id(u8 space_id)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if ((space_id &gt;= ACPI_NUM_PREDEFINED_REGIONS) &amp;&amp;</div><div class='add'>+	    (space_id &lt; ACPI_USER_REGION_BEGIN) &amp;&amp;</div><div class='add'>+	    (space_id != ACPI_ADR_SPACE_DATA_TABLE) &amp;&amp;</div><div class='add'>+	    (space_id != ACPI_ADR_SPACE_FIXED_HARDWARE)) {</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'> #endif</div><div class='head'>diff --git a/drivers/acpi/acpica/hwacpi.c b/drivers/acpi/acpica/hwacpi.c<br/>index fc380d3d45ab..d21ec5f0b3a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/hwacpi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/hwacpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/hwacpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/hwacpi.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c<br/>index f610d88a66be..1a6894afef79 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/hwgpe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/hwgpe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/hwgpe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/hwgpe.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/hwpci.c b/drivers/acpi/acpica/hwpci.c<br/>index 050fd227951b..1455ddcdc32c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/hwpci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/hwpci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/hwpci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/hwpci.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c<br/>index cc70f3fdcdd1..4ea4eeb51bfd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/hwregs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/hwregs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/hwregs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/hwregs.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c<br/>index d52da3073650..3c4a922a9fc2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/hwsleep.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/hwsleep.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/hwsleep.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/hwsleep.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/hwtimer.c b/drivers/acpi/acpica/hwtimer.c<br/>index 50d21c40b5c1..d4973d9da9f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/hwtimer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/hwtimer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/hwtimer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/hwtimer.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/hwvalid.c b/drivers/acpi/acpica/hwvalid.c<br/>index 5f1605874655..6e5c43a60bb7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/hwvalid.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/hwvalid.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/hwvalid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/hwvalid.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -134,6 +134,8 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)</div><div class='ctx'> 	/* Supported widths are 8/16/32 */</div><div class='ctx'> </div><div class='ctx'> 	if ((bit_width != 8) &amp;&amp; (bit_width != 16) &amp;&amp; (bit_width != 32)) {</div><div class='add'>+		ACPI_ERROR((AE_INFO,</div><div class='add'>+			    "Bad BitWidth parameter: %8.8X", bit_width));</div><div class='ctx'> 		return AE_BAD_PARAMETER;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c<br/>index c2793a82f120..9d38eb6c0d0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/hwxface.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/hwxface.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/hwxface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/hwxface.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -356,7 +356,7 @@ ACPI_EXPORT_SYMBOL(acpi_read_bit_register)</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  register_id     - ID of ACPI Bit Register to access</div><div class='ctx'>  *              Value           - Value to write to the register, in bit</div><div class='del'>- *                                position zero. The bit is automaticallly</div><div class='add'>+ *                                position zero. The bit is automatically</div><div class='ctx'>  *                                shifted to the correct position.</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='head'>diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c<br/>index d93172fd15a8..61623f3f6826 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsaccess.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsaccess.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsaccess.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nsaccess.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/nsalloc.c b/drivers/acpi/acpica/nsalloc.c<br/>index 1d0ef15d158f..7c3d3ceb98b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsalloc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsalloc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsalloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nsalloc.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c<br/>index b683cc2ff9d3..b7f2b3be79ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsdump.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsdump.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsdump.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nsdump.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/nsdumpdv.c b/drivers/acpi/acpica/nsdumpdv.c<br/>index 2ed294b7a4db..30ea5bc53a78 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsdumpdv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsdumpdv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsdumpdv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nsdumpdv.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/nseval.c b/drivers/acpi/acpica/nseval.c<br/>index c1bd02b1a058..f375cb82e321 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nseval.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nseval.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nseval.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nseval.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c<br/>index fd7c6380e294..9d84ec2f0211 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsinit.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsinit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsinit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nsinit.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/nsload.c b/drivers/acpi/acpica/nsload.c<br/>index 5f7dc691c183..5cbf15ffe7d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsload.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsload.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsload.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nsload.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/nsnames.c b/drivers/acpi/acpica/nsnames.c<br/>index d5fa520c3de5..b20e7c8c3ffb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsnames.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsnames.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsnames.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nsnames.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/nsobject.c b/drivers/acpi/acpica/nsobject.c<br/>index 3bb8bf105ea2..dd77a3ce6e50 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsobject.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsobject.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsobject.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nsobject.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c<br/>index b3234fa795b8..ec7ba2d3463c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsparse.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsparse.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsparse.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nsparse.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c<br/>index c845c8089f39..bbe46a447d34 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nspredef.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nspredef.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nspredef.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nspredef.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -620,6 +620,7 @@ acpi_ns_check_package(struct acpi_predefined_data *data,</div><div class='ctx'> 	case ACPI_PTYPE2_FIXED:</div><div class='ctx'> 	case ACPI_PTYPE2_MIN:</div><div class='ctx'> 	case ACPI_PTYPE2_COUNT:</div><div class='add'>+	case ACPI_PTYPE2_FIX_VAR:</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * These types all return a single Package that consists of a</div><div class='hunk'>@@ -759,6 +760,34 @@ acpi_ns_check_package_list(struct acpi_predefined_data *data,</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		case ACPI_PTYPE2_FIX_VAR:</div><div class='add'>+			/*</div><div class='add'>+			 * Each subpackage has a fixed number of elements and an</div><div class='add'>+			 * optional element</div><div class='add'>+			 */</div><div class='add'>+			expected_count =</div><div class='add'>+			    package-&gt;ret_info.count1 + package-&gt;ret_info.count2;</div><div class='add'>+			if (sub_package-&gt;package.count &lt; expected_count) {</div><div class='add'>+				goto package_too_small;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			status =</div><div class='add'>+			    acpi_ns_check_package_elements(data, sub_elements,</div><div class='add'>+							   package-&gt;ret_info.</div><div class='add'>+							   object_type1,</div><div class='add'>+							   package-&gt;ret_info.</div><div class='add'>+							   count1,</div><div class='add'>+							   package-&gt;ret_info.</div><div class='add'>+							   object_type2,</div><div class='add'>+							   sub_package-&gt;package.</div><div class='add'>+							   count -</div><div class='add'>+							   package-&gt;ret_info.</div><div class='add'>+							   count1, 0);</div><div class='add'>+			if (ACPI_FAILURE(status)) {</div><div class='add'>+				return (status);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		case ACPI_PTYPE2_FIXED:</div><div class='ctx'> </div><div class='ctx'> 			/* Each sub-package has a fixed length */</div><div class='head'>diff --git a/drivers/acpi/acpica/nsrepair.c b/drivers/acpi/acpica/nsrepair.c<br/>index ac7b854b0bd7..9c35d20eb52b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsrepair.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsrepair.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsrepair.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nsrepair.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -634,6 +634,7 @@ acpi_ns_remove_null_elements(struct acpi_predefined_data *data,</div><div class='ctx'> 	case ACPI_PTYPE2_FIXED:</div><div class='ctx'> 	case ACPI_PTYPE2_MIN:</div><div class='ctx'> 	case ACPI_PTYPE2_REV_FIXED:</div><div class='add'>+	case ACPI_PTYPE2_FIX_VAR:</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='head'>diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c<br/>index 024c4f263f87..726bc8e687f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsrepair2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsrepair2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsrepair2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nsrepair2.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -467,11 +467,12 @@ acpi_ns_repair_HID(struct acpi_predefined_data *data,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Copy and uppercase the string. From the ACPI specification:</div><div class='add'>+	 * Copy and uppercase the string. From the ACPI 5.0 specification:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * A valid PNP ID must be of the form "AAA####" where A is an uppercase</div><div class='ctx'> 	 * letter and # is a hex digit. A valid ACPI ID must be of the form</div><div class='del'>-	 * "ACPI####" where # is a hex digit.</div><div class='add'>+	 * "NNNN####" where N is an uppercase letter or decimal digit, and</div><div class='add'>+	 * # is a hex digit.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (dest = new_string-&gt;string.pointer; *source; dest++, source++) {</div><div class='ctx'> 		*dest = (char)ACPI_TOUPPER(*source);</div><div class='head'>diff --git a/drivers/acpi/acpica/nssearch.c b/drivers/acpi/acpica/nssearch.c<br/>index 28b0d7a62b99..507043d66114 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nssearch.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nssearch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nssearch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nssearch.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c<br/>index cb1b104a69a2..a535b7afda5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsutils.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsutils.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsutils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nsutils.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/nswalk.c b/drivers/acpi/acpica/nswalk.c<br/>index 345f0c3c6ad2..f69895a54895 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nswalk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nswalk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nswalk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nswalk.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c<br/>index e7f016d1b226..71d15f61807b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsxfeval.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsxfeval.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsxfeval.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nsxfeval.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/nsxfname.c b/drivers/acpi/acpica/nsxfname.c<br/>index 83bf93024303..af401c9c4dfc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsxfname.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsxfname.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsxfname.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nsxfname.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/nsxfobj.c b/drivers/acpi/acpica/nsxfobj.c<br/>index 57e6d825ed84..880a605cee20 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsxfobj.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/nsxfobj.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/nsxfobj.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/nsxfobj.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c<br/>index e1fad0ee0136..5ac36aba507c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/psargs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/psargs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/psargs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/psargs.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -484,34 +484,54 @@ acpi_ps_get_next_simple_arg(struct acpi_parse_state *parser_state,</div><div class='ctx'> static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state</div><div class='ctx'> 						       *parser_state)</div><div class='ctx'> {</div><div class='del'>-	u32 aml_offset = (u32)</div><div class='del'>-	    ACPI_PTR_DIFF(parser_state-&gt;aml,</div><div class='del'>-			  parser_state-&gt;aml_start);</div><div class='add'>+	u32 aml_offset;</div><div class='ctx'> 	union acpi_parse_object *field;</div><div class='add'>+	union acpi_parse_object *arg = NULL;</div><div class='ctx'> 	u16 opcode;</div><div class='ctx'> 	u32 name;</div><div class='add'>+	u8 access_type;</div><div class='add'>+	u8 access_attribute;</div><div class='add'>+	u8 access_length;</div><div class='add'>+	u32 pkg_length;</div><div class='add'>+	u8 *pkg_end;</div><div class='add'>+	u32 buffer_length;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE(ps_get_next_field);</div><div class='ctx'> </div><div class='add'>+	aml_offset =</div><div class='add'>+	    (u32)ACPI_PTR_DIFF(parser_state-&gt;aml, parser_state-&gt;aml_start);</div><div class='add'>+</div><div class='ctx'> 	/* Determine field type */</div><div class='ctx'> </div><div class='ctx'> 	switch (ACPI_GET8(parser_state-&gt;aml)) {</div><div class='del'>-	default:</div><div class='add'>+	case AML_FIELD_OFFSET_OP:</div><div class='ctx'> </div><div class='del'>-		opcode = AML_INT_NAMEDFIELD_OP;</div><div class='add'>+		opcode = AML_INT_RESERVEDFIELD_OP;</div><div class='add'>+		parser_state-&gt;aml++;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case 0x00:</div><div class='add'>+	case AML_FIELD_ACCESS_OP:</div><div class='ctx'> </div><div class='del'>-		opcode = AML_INT_RESERVEDFIELD_OP;</div><div class='add'>+		opcode = AML_INT_ACCESSFIELD_OP;</div><div class='ctx'> 		parser_state-&gt;aml++;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case 0x01:</div><div class='add'>+	case AML_FIELD_CONNECTION_OP:</div><div class='ctx'> </div><div class='del'>-		opcode = AML_INT_ACCESSFIELD_OP;</div><div class='add'>+		opcode = AML_INT_CONNECTION_OP;</div><div class='add'>+		parser_state-&gt;aml++;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AML_FIELD_EXT_ACCESS_OP:</div><div class='add'>+</div><div class='add'>+		opcode = AML_INT_EXTACCESSFIELD_OP;</div><div class='ctx'> 		parser_state-&gt;aml++;</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+</div><div class='add'>+		opcode = AML_INT_NAMEDFIELD_OP;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate a new field op */</div><div class='hunk'>@@ -549,16 +569,111 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case AML_INT_ACCESSFIELD_OP:</div><div class='add'>+	case AML_INT_EXTACCESSFIELD_OP:</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Get access_type and access_attrib and merge into the field Op</div><div class='del'>-		 * access_type is first operand, access_attribute is second</div><div class='add'>+		 * access_type is first operand, access_attribute is second. stuff</div><div class='add'>+		 * these bytes into the node integer value for convenience.</div><div class='ctx'> 		 */</div><div class='del'>-		field-&gt;common.value.integer =</div><div class='del'>-		    (((u32) ACPI_GET8(parser_state-&gt;aml) &lt;&lt; 8));</div><div class='add'>+</div><div class='add'>+		/* Get the two bytes (Type/Attribute) */</div><div class='add'>+</div><div class='add'>+		access_type = ACPI_GET8(parser_state-&gt;aml);</div><div class='ctx'> 		parser_state-&gt;aml++;</div><div class='del'>-		field-&gt;common.value.integer |= ACPI_GET8(parser_state-&gt;aml);</div><div class='add'>+		access_attribute = ACPI_GET8(parser_state-&gt;aml);</div><div class='ctx'> 		parser_state-&gt;aml++;</div><div class='add'>+</div><div class='add'>+		field-&gt;common.value.integer = (u8)access_type;</div><div class='add'>+		field-&gt;common.value.integer |= (u16)(access_attribute &lt;&lt; 8);</div><div class='add'>+</div><div class='add'>+		/* This opcode has a third byte, access_length */</div><div class='add'>+</div><div class='add'>+		if (opcode == AML_INT_EXTACCESSFIELD_OP) {</div><div class='add'>+			access_length = ACPI_GET8(parser_state-&gt;aml);</div><div class='add'>+			parser_state-&gt;aml++;</div><div class='add'>+</div><div class='add'>+			field-&gt;common.value.integer |=</div><div class='add'>+			    (u32)(access_length &lt;&lt; 16);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AML_INT_CONNECTION_OP:</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Argument for Connection operator can be either a Buffer</div><div class='add'>+		 * (resource descriptor), or a name_string.</div><div class='add'>+		 */</div><div class='add'>+		if (ACPI_GET8(parser_state-&gt;aml) == AML_BUFFER_OP) {</div><div class='add'>+			parser_state-&gt;aml++;</div><div class='add'>+</div><div class='add'>+			pkg_end = parser_state-&gt;aml;</div><div class='add'>+			pkg_length =</div><div class='add'>+			    acpi_ps_get_next_package_length(parser_state);</div><div class='add'>+			pkg_end += pkg_length;</div><div class='add'>+</div><div class='add'>+			if (parser_state-&gt;aml &lt; pkg_end) {</div><div class='add'>+</div><div class='add'>+				/* Non-empty list */</div><div class='add'>+</div><div class='add'>+				arg = acpi_ps_alloc_op(AML_INT_BYTELIST_OP);</div><div class='add'>+				if (!arg) {</div><div class='add'>+					return_PTR(NULL);</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				/* Get the actual buffer length argument */</div><div class='add'>+</div><div class='add'>+				opcode = ACPI_GET8(parser_state-&gt;aml);</div><div class='add'>+				parser_state-&gt;aml++;</div><div class='add'>+</div><div class='add'>+				switch (opcode) {</div><div class='add'>+				case AML_BYTE_OP:	/* AML_BYTEDATA_ARG */</div><div class='add'>+					buffer_length =</div><div class='add'>+					    ACPI_GET8(parser_state-&gt;aml);</div><div class='add'>+					parser_state-&gt;aml += 1;</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				case AML_WORD_OP:	/* AML_WORDDATA_ARG */</div><div class='add'>+					buffer_length =</div><div class='add'>+					    ACPI_GET16(parser_state-&gt;aml);</div><div class='add'>+					parser_state-&gt;aml += 2;</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				case AML_DWORD_OP:	/* AML_DWORDATA_ARG */</div><div class='add'>+					buffer_length =</div><div class='add'>+					    ACPI_GET32(parser_state-&gt;aml);</div><div class='add'>+					parser_state-&gt;aml += 4;</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				default:</div><div class='add'>+					buffer_length = 0;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				/* Fill in bytelist data */</div><div class='add'>+</div><div class='add'>+				arg-&gt;named.value.size = buffer_length;</div><div class='add'>+				arg-&gt;named.data = parser_state-&gt;aml;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Skip to End of byte data */</div><div class='add'>+</div><div class='add'>+			parser_state-&gt;aml = pkg_end;</div><div class='add'>+		} else {</div><div class='add'>+			arg = acpi_ps_alloc_op(AML_INT_NAMEPATH_OP);</div><div class='add'>+			if (!arg) {</div><div class='add'>+				return_PTR(NULL);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Get the Namestring argument */</div><div class='add'>+</div><div class='add'>+			arg-&gt;common.value.name =</div><div class='add'>+			    acpi_ps_get_next_namestring(parser_state);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Link the buffer/namestring to parent (CONNECTION_OP) */</div><div class='add'>+</div><div class='add'>+		acpi_ps_append_arg(field, arg);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='head'>diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c<br/>index 01dd70d1de51..9547ad8a620b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/psloop.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/psloop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/psloop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/psloop.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/psopcode.c b/drivers/acpi/acpica/psopcode.c<br/>index bed08de7528c..a0226fdcf75c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/psopcode.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/psopcode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/psopcode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/psopcode.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -638,7 +638,16 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {</div><div class='ctx'> </div><div class='ctx'> /* 7E */ ACPI_OP("Timer", ARGP_TIMER_OP, ARGI_TIMER_OP, ACPI_TYPE_ANY,</div><div class='ctx'> 		 AML_CLASS_EXECUTE, AML_TYPE_EXEC_0A_0T_1R,</div><div class='del'>-		 AML_FLAGS_EXEC_0A_0T_1R)</div><div class='add'>+			 AML_FLAGS_EXEC_0A_0T_1R),</div><div class='add'>+</div><div class='add'>+/* ACPI 5.0 opcodes */</div><div class='add'>+</div><div class='add'>+/* 7F */ ACPI_OP("-ConnectField-", ARGP_CONNECTFIELD_OP,</div><div class='add'>+			 ARGI_CONNECTFIELD_OP, ACPI_TYPE_ANY,</div><div class='add'>+			 AML_CLASS_INTERNAL, AML_TYPE_BOGUS, AML_HAS_ARGS),</div><div class='add'>+/* 80 */ ACPI_OP("-ExtAccessField-", ARGP_CONNECTFIELD_OP,</div><div class='add'>+			 ARGI_CONNECTFIELD_OP, ACPI_TYPE_ANY,</div><div class='add'>+			 AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0)</div><div class='ctx'> </div><div class='ctx'> /*! [End] no source code translation !*/</div><div class='ctx'> };</div><div class='hunk'>@@ -657,7 +666,7 @@ static const u8 acpi_gbl_short_op_index[256] = {</div><div class='ctx'> /* 0x20 */ _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK,</div><div class='ctx'> /* 0x28 */ _UNK, _UNK, _UNK, _UNK, _UNK, 0x63, _PFX, _PFX,</div><div class='ctx'> /* 0x30 */ 0x67, 0x66, 0x68, 0x65, 0x69, 0x64, 0x6A, 0x7D,</div><div class='del'>-/* 0x38 */ _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK,</div><div class='add'>+/* 0x38 */ 0x7F, 0x80, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK,</div><div class='ctx'> /* 0x40 */ _UNK, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC,</div><div class='ctx'> /* 0x48 */ _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC,</div><div class='ctx'> /* 0x50 */ _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC,</div><div class='head'>diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c<br/>index 9bb0cbd37b5e..2ff9c35a1968 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/psparse.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/psparse.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/psparse.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/psparse.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/psscope.c b/drivers/acpi/acpica/psscope.c<br/>index a5faa1323a02..c872aa4b926e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/psscope.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/psscope.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/psscope.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/psscope.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/pstree.c b/drivers/acpi/acpica/pstree.c<br/>index f1464c03aa42..2b03cdbbe1c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/pstree.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/pstree.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/pstree.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/pstree.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -74,6 +74,12 @@ union acpi_parse_object *acpi_ps_get_arg(union acpi_parse_object *op, u32 argn)</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_ENTRY();</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+	if (Op-&gt;Common.aml_opcode == AML_INT_CONNECTION_OP)</div><div class='add'>+	{</div><div class='add'>+		return (Op-&gt;Common.Value.Arg);</div><div class='add'>+	}</div><div class='add'>+*/</div><div class='ctx'> 	/* Get the info structure for this opcode */</div><div class='ctx'> </div><div class='ctx'> 	op_info = acpi_ps_get_opcode_info(op-&gt;common.aml_opcode);</div><div class='head'>diff --git a/drivers/acpi/acpica/psutils.c b/drivers/acpi/acpica/psutils.c<br/>index 7eda78503422..13bb131ae125 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/psutils.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/psutils.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/psutils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/psutils.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/pswalk.c b/drivers/acpi/acpica/pswalk.c<br/>index 3312d6368bf1..ab96cf47896d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/pswalk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/pswalk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/pswalk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/pswalk.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/psxface.c b/drivers/acpi/acpica/psxface.c<br/>index 8086805d4494..9d98c5ff66a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/psxface.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/psxface.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/psxface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/psxface.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/rsaddr.c b/drivers/acpi/acpica/rsaddr.c<br/>index 9e66f9078426..a0305652394f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsaddr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsaddr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsaddr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/rsaddr.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/rscalc.c b/drivers/acpi/acpica/rscalc.c<br/>index 3a8a89ec2ca4..3c6df4b7eb2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rscalc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rscalc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rscalc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/rscalc.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -313,6 +313,38 @@ acpi_rs_get_aml_length(struct acpi_resource * resource, acpi_size * size_needed)</div><div class='ctx'> 							  resource_source));</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		case ACPI_RESOURCE_TYPE_GPIO:</div><div class='add'>+</div><div class='add'>+			total_size =</div><div class='add'>+			    (acpi_rs_length) (total_size +</div><div class='add'>+					      (resource-&gt;data.gpio.</div><div class='add'>+					       pin_table_length * 2) +</div><div class='add'>+					      resource-&gt;data.gpio.</div><div class='add'>+					      resource_source.string_length +</div><div class='add'>+					      resource-&gt;data.gpio.</div><div class='add'>+					      vendor_length);</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ACPI_RESOURCE_TYPE_SERIAL_BUS:</div><div class='add'>+</div><div class='add'>+			total_size =</div><div class='add'>+			    acpi_gbl_aml_resource_serial_bus_sizes[resource-&gt;</div><div class='add'>+								   data.</div><div class='add'>+								   common_serial_bus.</div><div class='add'>+								   type];</div><div class='add'>+</div><div class='add'>+			total_size = (acpi_rs_length) (total_size +</div><div class='add'>+						       resource-&gt;data.</div><div class='add'>+						       i2c_serial_bus.</div><div class='add'>+						       resource_source.</div><div class='add'>+						       string_length +</div><div class='add'>+						       resource-&gt;data.</div><div class='add'>+						       i2c_serial_bus.</div><div class='add'>+						       vendor_length);</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -362,10 +394,11 @@ acpi_rs_get_list_length(u8 * aml_buffer,</div><div class='ctx'> 	u32 extra_struct_bytes;</div><div class='ctx'> 	u8 resource_index;</div><div class='ctx'> 	u8 minimum_aml_resource_length;</div><div class='add'>+	union aml_resource *aml_resource;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE(rs_get_list_length);</div><div class='ctx'> </div><div class='del'>-	*size_needed = 0;</div><div class='add'>+	*size_needed = ACPI_RS_SIZE_MIN;	/* Minimum size is one end_tag */</div><div class='ctx'> 	end_aml = aml_buffer + aml_buffer_length;</div><div class='ctx'> </div><div class='ctx'> 	/* Walk the list of AML resource descriptors */</div><div class='hunk'>@@ -376,9 +409,15 @@ acpi_rs_get_list_length(u8 * aml_buffer,</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ut_validate_resource(aml_buffer, &amp;resource_index);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Exit on failure. Cannot continue because the descriptor length</div><div class='add'>+			 * may be bogus also.</div><div class='add'>+			 */</div><div class='ctx'> 			return_ACPI_STATUS(status);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		aml_resource = (void *)aml_buffer;</div><div class='add'>+</div><div class='ctx'> 		/* Get the resource length and base (minimum) AML size */</div><div class='ctx'> </div><div class='ctx'> 		resource_length = acpi_ut_get_resource_length(aml_buffer);</div><div class='hunk'>@@ -422,10 +461,8 @@ acpi_rs_get_list_length(u8 * aml_buffer,</div><div class='ctx'> </div><div class='ctx'> 		case ACPI_RESOURCE_NAME_END_TAG:</div><div class='ctx'> 			/*</div><div class='del'>-			 * End Tag:</div><div class='del'>-			 * This is the normal exit, add size of end_tag</div><div class='add'>+			 * End Tag: This is the normal exit</div><div class='ctx'> 			 */</div><div class='del'>-			*size_needed += ACPI_RS_SIZE_MIN;</div><div class='ctx'> 			return_ACPI_STATUS(AE_OK);</div><div class='ctx'> </div><div class='ctx'> 		case ACPI_RESOURCE_NAME_ADDRESS32:</div><div class='hunk'>@@ -457,6 +494,33 @@ acpi_rs_get_list_length(u8 * aml_buffer,</div><div class='ctx'> 							 minimum_aml_resource_length);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		case ACPI_RESOURCE_NAME_GPIO:</div><div class='add'>+</div><div class='add'>+			/* Vendor data is optional */</div><div class='add'>+</div><div class='add'>+			if (aml_resource-&gt;gpio.vendor_length) {</div><div class='add'>+				extra_struct_bytes +=</div><div class='add'>+				    aml_resource-&gt;gpio.vendor_offset -</div><div class='add'>+				    aml_resource-&gt;gpio.pin_table_offset +</div><div class='add'>+				    aml_resource-&gt;gpio.vendor_length;</div><div class='add'>+			} else {</div><div class='add'>+				extra_struct_bytes +=</div><div class='add'>+				    aml_resource-&gt;large_header.resource_length +</div><div class='add'>+				    sizeof(struct aml_resource_large_header) -</div><div class='add'>+				    aml_resource-&gt;gpio.pin_table_offset;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ACPI_RESOURCE_NAME_SERIAL_BUS:</div><div class='add'>+</div><div class='add'>+			minimum_aml_resource_length =</div><div class='add'>+			    acpi_gbl_resource_aml_serial_bus_sizes</div><div class='add'>+			    [aml_resource-&gt;common_serial_bus.type];</div><div class='add'>+			extra_struct_bytes +=</div><div class='add'>+			    aml_resource-&gt;common_serial_bus.resource_length -</div><div class='add'>+			    minimum_aml_resource_length;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -467,9 +531,18 @@ acpi_rs_get_list_length(u8 * aml_buffer,</div><div class='ctx'> 		 * Important: Round the size up for the appropriate alignment. This</div><div class='ctx'> 		 * is a requirement on IA64.</div><div class='ctx'> 		 */</div><div class='del'>-		buffer_size = acpi_gbl_resource_struct_sizes[resource_index] +</div><div class='del'>-		    extra_struct_bytes;</div><div class='del'>-		buffer_size = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(buffer_size);</div><div class='add'>+		if (acpi_ut_get_resource_type(aml_buffer) ==</div><div class='add'>+		    ACPI_RESOURCE_NAME_SERIAL_BUS) {</div><div class='add'>+			buffer_size =</div><div class='add'>+			    acpi_gbl_resource_struct_serial_bus_sizes</div><div class='add'>+			    [aml_resource-&gt;common_serial_bus.type] +</div><div class='add'>+			    extra_struct_bytes;</div><div class='add'>+		} else {</div><div class='add'>+			buffer_size =</div><div class='add'>+			    acpi_gbl_resource_struct_sizes[resource_index] +</div><div class='add'>+			    extra_struct_bytes;</div><div class='add'>+		}</div><div class='add'>+		buffer_size = (u32)ACPI_ROUND_UP_TO_NATIVE_WORD(buffer_size);</div><div class='ctx'> </div><div class='ctx'> 		*size_needed += buffer_size;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/rscreate.c b/drivers/acpi/acpica/rscreate.c<br/>index 4ce6e1147e80..46d6eb38ae66 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rscreate.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rscreate.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rscreate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/rscreate.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -51,6 +51,70 @@ ACPI_MODULE_NAME("rscreate")</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='add'>+ * FUNCTION:    acpi_buffer_to_resource</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  aml_buffer          - Pointer to the resource byte stream</div><div class='add'>+ *              aml_buffer_length   - Length of the aml_buffer</div><div class='add'>+ *              resource_ptr        - Where the converted resource is returned</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      Status</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Convert a raw AML buffer to a resource list</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+acpi_status</div><div class='add'>+acpi_buffer_to_resource(u8 *aml_buffer,</div><div class='add'>+			u16 aml_buffer_length,</div><div class='add'>+			struct acpi_resource **resource_ptr)</div><div class='add'>+{</div><div class='add'>+	acpi_status status;</div><div class='add'>+	acpi_size list_size_needed;</div><div class='add'>+	void *resource;</div><div class='add'>+	void *current_resource_ptr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Note: we allow AE_AML_NO_RESOURCE_END_TAG, since an end tag</div><div class='add'>+	 * is not required here.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Get the required length for the converted resource */</div><div class='add'>+</div><div class='add'>+	status = acpi_rs_get_list_length(aml_buffer, aml_buffer_length,</div><div class='add'>+					 &amp;list_size_needed);</div><div class='add'>+	if (status == AE_AML_NO_RESOURCE_END_TAG) {</div><div class='add'>+		status = AE_OK;</div><div class='add'>+	}</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return (status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate a buffer for the converted resource */</div><div class='add'>+</div><div class='add'>+	resource = ACPI_ALLOCATE_ZEROED(list_size_needed);</div><div class='add'>+	current_resource_ptr = resource;</div><div class='add'>+	if (!resource) {</div><div class='add'>+		return (AE_NO_MEMORY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Perform the AML-to-Resource conversion */</div><div class='add'>+</div><div class='add'>+	status = acpi_ut_walk_aml_resources(aml_buffer, aml_buffer_length,</div><div class='add'>+					    acpi_rs_convert_aml_to_resources,</div><div class='add'>+					    &amp;current_resource_ptr);</div><div class='add'>+	if (status == AE_AML_NO_RESOURCE_END_TAG) {</div><div class='add'>+		status = AE_OK;</div><div class='add'>+	}</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		ACPI_FREE(resource);</div><div class='add'>+	} else {</div><div class='add'>+		*resource_ptr = resource;</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'>+ *</div><div class='ctx'>  * FUNCTION:    acpi_rs_create_resource_list</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  aml_buffer          - Pointer to the resource byte stream</div><div class='hunk'>@@ -66,9 +130,10 @@ ACPI_MODULE_NAME("rscreate")</div><div class='ctx'>  *              of device resources.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='add'>+</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,</div><div class='del'>-			     struct acpi_buffer *output_buffer)</div><div class='add'>+			     struct acpi_buffer * output_buffer)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	acpi_status status;</div><div class='head'>diff --git a/drivers/acpi/acpica/rsdump.c b/drivers/acpi/acpica/rsdump.c<br/>index 33db7520c74b..b4c581132393 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsdump.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsdump.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsdump.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/rsdump.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -61,11 +61,13 @@ static void acpi_rs_out_integer64(char *title, u64 value);</div><div class='ctx'> </div><div class='ctx'> static void acpi_rs_out_title(char *title);</div><div class='ctx'> </div><div class='del'>-static void acpi_rs_dump_byte_list(u16 length, u8 * data);</div><div class='add'>+static void acpi_rs_dump_byte_list(u16 length, u8 *data);</div><div class='ctx'> </div><div class='del'>-static void acpi_rs_dump_dword_list(u8 length, u32 * data);</div><div class='add'>+static void acpi_rs_dump_word_list(u16 length, u16 *data);</div><div class='ctx'> </div><div class='del'>-static void acpi_rs_dump_short_byte_list(u8 length, u8 * data);</div><div class='add'>+static void acpi_rs_dump_dword_list(u8 length, u32 *data);</div><div class='add'>+</div><div class='add'>+static void acpi_rs_dump_short_byte_list(u8 length, u8 *data);</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> acpi_rs_dump_resource_source(struct acpi_resource_source *resource_source);</div><div class='hunk'>@@ -309,6 +311,125 @@ struct acpi_rsdump_info acpi_rs_dump_generic_reg[6] = {</div><div class='ctx'> 	{ACPI_RSD_UINT64, ACPI_RSD_OFFSET(generic_reg.address), "Address", NULL}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct acpi_rsdump_info acpi_rs_dump_gpio[16] = {</div><div class='add'>+	{ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_gpio), "GPIO", NULL},</div><div class='add'>+	{ACPI_RSD_UINT8, ACPI_RSD_OFFSET(gpio.revision_id), "RevisionId", NULL},</div><div class='add'>+	{ACPI_RSD_UINT8, ACPI_RSD_OFFSET(gpio.connection_type),</div><div class='add'>+	 "ConnectionType", acpi_gbl_ct_decode},</div><div class='add'>+	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(gpio.producer_consumer),</div><div class='add'>+	 "ProducerConsumer", acpi_gbl_consume_decode},</div><div class='add'>+	{ACPI_RSD_UINT8, ACPI_RSD_OFFSET(gpio.pin_config), "PinConfig",</div><div class='add'>+	 acpi_gbl_ppc_decode},</div><div class='add'>+	{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(gpio.sharable), "Sharable",</div><div class='add'>+	 acpi_gbl_shr_decode},</div><div class='add'>+	{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(gpio.io_restriction),</div><div class='add'>+	 "IoRestriction", acpi_gbl_ior_decode},</div><div class='add'>+	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(gpio.triggering), "Triggering",</div><div class='add'>+	 acpi_gbl_he_decode},</div><div class='add'>+	{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(gpio.polarity), "Polarity",</div><div class='add'>+	 acpi_gbl_ll_decode},</div><div class='add'>+	{ACPI_RSD_UINT16, ACPI_RSD_OFFSET(gpio.drive_strength), "DriveStrength",</div><div class='add'>+	 NULL},</div><div class='add'>+	{ACPI_RSD_UINT16, ACPI_RSD_OFFSET(gpio.debounce_timeout),</div><div class='add'>+	 "DebounceTimeout", NULL},</div><div class='add'>+	{ACPI_RSD_SOURCE, ACPI_RSD_OFFSET(gpio.resource_source),</div><div class='add'>+	 "ResourceSource", NULL},</div><div class='add'>+	{ACPI_RSD_UINT16, ACPI_RSD_OFFSET(gpio.pin_table_length),</div><div class='add'>+	 "PinTableLength", NULL},</div><div class='add'>+	{ACPI_RSD_WORDLIST, ACPI_RSD_OFFSET(gpio.pin_table), "PinTable", NULL},</div><div class='add'>+	{ACPI_RSD_UINT16, ACPI_RSD_OFFSET(gpio.vendor_length), "VendorLength",</div><div class='add'>+	 NULL},</div><div class='add'>+	{ACPI_RSD_SHORTLISTX, ACPI_RSD_OFFSET(gpio.vendor_data), "VendorData",</div><div class='add'>+	 NULL},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_rsdump_info acpi_rs_dump_fixed_dma[4] = {</div><div class='add'>+	{ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_fixed_dma),</div><div class='add'>+	 "FixedDma", NULL},</div><div class='add'>+	{ACPI_RSD_UINT16, ACPI_RSD_OFFSET(fixed_dma.request_lines),</div><div class='add'>+	 "RequestLines", NULL},</div><div class='add'>+	{ACPI_RSD_UINT16, ACPI_RSD_OFFSET(fixed_dma.channels), "Channels",</div><div class='add'>+	 NULL},</div><div class='add'>+	{ACPI_RSD_UINT8, ACPI_RSD_OFFSET(fixed_dma.width), "TransferWidth",</div><div class='add'>+	 acpi_gbl_dts_decode},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ACPI_RS_DUMP_COMMON_SERIAL_BUS \</div><div class='add'>+	{ACPI_RSD_UINT8,    ACPI_RSD_OFFSET (common_serial_bus.revision_id),    "RevisionId",               NULL}, \</div><div class='add'>+	{ACPI_RSD_UINT8,    ACPI_RSD_OFFSET (common_serial_bus.type),           "Type",                     acpi_gbl_sbt_decode}, \</div><div class='add'>+	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (common_serial_bus.producer_consumer), "ProducerConsumer",      acpi_gbl_consume_decode}, \</div><div class='add'>+	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (common_serial_bus.slave_mode),     "SlaveMode",                acpi_gbl_sm_decode}, \</div><div class='add'>+	{ACPI_RSD_UINT8,    ACPI_RSD_OFFSET (common_serial_bus.type_revision_id), "TypeRevisionId",         NULL}, \</div><div class='add'>+	{ACPI_RSD_UINT16,   ACPI_RSD_OFFSET (common_serial_bus.type_data_length), "TypeDataLength",         NULL}, \</div><div class='add'>+	{ACPI_RSD_SOURCE,   ACPI_RSD_OFFSET (common_serial_bus.resource_source), "ResourceSource",          NULL}, \</div><div class='add'>+	{ACPI_RSD_UINT16,   ACPI_RSD_OFFSET (common_serial_bus.vendor_length),  "VendorLength",             NULL}, \</div><div class='add'>+	{ACPI_RSD_SHORTLISTX,ACPI_RSD_OFFSET (common_serial_bus.vendor_data),   "VendorData",               NULL},</div><div class='add'>+</div><div class='add'>+struct acpi_rsdump_info acpi_rs_dump_common_serial_bus[10] = {</div><div class='add'>+	{ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_common_serial_bus),</div><div class='add'>+	 "Common Serial Bus", NULL},</div><div class='add'>+	ACPI_RS_DUMP_COMMON_SERIAL_BUS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_rsdump_info acpi_rs_dump_i2c_serial_bus[13] = {</div><div class='add'>+	{ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_i2c_serial_bus),</div><div class='add'>+	 "I2C Serial Bus", NULL},</div><div class='add'>+	ACPI_RS_DUMP_COMMON_SERIAL_BUS {ACPI_RSD_1BITFLAG,</div><div class='add'>+					ACPI_RSD_OFFSET(i2c_serial_bus.</div><div class='add'>+							access_mode),</div><div class='add'>+					"AccessMode", acpi_gbl_am_decode},</div><div class='add'>+	{ACPI_RSD_UINT32, ACPI_RSD_OFFSET(i2c_serial_bus.connection_speed),</div><div class='add'>+	 "ConnectionSpeed", NULL},</div><div class='add'>+	{ACPI_RSD_UINT16, ACPI_RSD_OFFSET(i2c_serial_bus.slave_address),</div><div class='add'>+	 "SlaveAddress", NULL},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_rsdump_info acpi_rs_dump_spi_serial_bus[17] = {</div><div class='add'>+	{ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_spi_serial_bus),</div><div class='add'>+	 "Spi Serial Bus", NULL},</div><div class='add'>+	ACPI_RS_DUMP_COMMON_SERIAL_BUS {ACPI_RSD_1BITFLAG,</div><div class='add'>+					ACPI_RSD_OFFSET(spi_serial_bus.</div><div class='add'>+							wire_mode), "WireMode",</div><div class='add'>+					acpi_gbl_wm_decode},</div><div class='add'>+	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(spi_serial_bus.device_polarity),</div><div class='add'>+	 "DevicePolarity", acpi_gbl_dp_decode},</div><div class='add'>+	{ACPI_RSD_UINT8, ACPI_RSD_OFFSET(spi_serial_bus.data_bit_length),</div><div class='add'>+	 "DataBitLength", NULL},</div><div class='add'>+	{ACPI_RSD_UINT8, ACPI_RSD_OFFSET(spi_serial_bus.clock_phase),</div><div class='add'>+	 "ClockPhase", acpi_gbl_cph_decode},</div><div class='add'>+	{ACPI_RSD_UINT8, ACPI_RSD_OFFSET(spi_serial_bus.clock_polarity),</div><div class='add'>+	 "ClockPolarity", acpi_gbl_cpo_decode},</div><div class='add'>+	{ACPI_RSD_UINT16, ACPI_RSD_OFFSET(spi_serial_bus.device_selection),</div><div class='add'>+	 "DeviceSelection", NULL},</div><div class='add'>+	{ACPI_RSD_UINT32, ACPI_RSD_OFFSET(spi_serial_bus.connection_speed),</div><div class='add'>+	 "ConnectionSpeed", NULL},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_rsdump_info acpi_rs_dump_uart_serial_bus[19] = {</div><div class='add'>+	{ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_uart_serial_bus),</div><div class='add'>+	 "Uart Serial Bus", NULL},</div><div class='add'>+	ACPI_RS_DUMP_COMMON_SERIAL_BUS {ACPI_RSD_2BITFLAG,</div><div class='add'>+					ACPI_RSD_OFFSET(uart_serial_bus.</div><div class='add'>+							flow_control),</div><div class='add'>+					"FlowControl", acpi_gbl_fc_decode},</div><div class='add'>+	{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(uart_serial_bus.stop_bits),</div><div class='add'>+	 "StopBits", acpi_gbl_sb_decode},</div><div class='add'>+	{ACPI_RSD_3BITFLAG, ACPI_RSD_OFFSET(uart_serial_bus.data_bits),</div><div class='add'>+	 "DataBits", acpi_gbl_bpb_decode},</div><div class='add'>+	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(uart_serial_bus.endian), "Endian",</div><div class='add'>+	 acpi_gbl_ed_decode},</div><div class='add'>+	{ACPI_RSD_UINT8, ACPI_RSD_OFFSET(uart_serial_bus.parity), "Parity",</div><div class='add'>+	 acpi_gbl_pt_decode},</div><div class='add'>+	{ACPI_RSD_UINT8, ACPI_RSD_OFFSET(uart_serial_bus.lines_enabled),</div><div class='add'>+	 "LinesEnabled", NULL},</div><div class='add'>+	{ACPI_RSD_UINT16, ACPI_RSD_OFFSET(uart_serial_bus.rx_fifo_size),</div><div class='add'>+	 "RxFifoSize", NULL},</div><div class='add'>+	{ACPI_RSD_UINT16, ACPI_RSD_OFFSET(uart_serial_bus.tx_fifo_size),</div><div class='add'>+	 "TxFifoSize", NULL},</div><div class='add'>+	{ACPI_RSD_UINT32, ACPI_RSD_OFFSET(uart_serial_bus.default_baud_rate),</div><div class='add'>+	 "ConnectionSpeed", NULL},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Tables used for common address descriptor flag fields</div><div class='ctx'>  */</div><div class='hunk'>@@ -413,7 +534,14 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)</div><div class='ctx'> 			/* Data items, 8/16/32/64 bit */</div><div class='ctx'> </div><div class='ctx'> 		case ACPI_RSD_UINT8:</div><div class='del'>-			acpi_rs_out_integer8(name, ACPI_GET8(target));</div><div class='add'>+			if (table-&gt;pointer) {</div><div class='add'>+				acpi_rs_out_string(name, ACPI_CAST_PTR(char,</div><div class='add'>+								       table-&gt;</div><div class='add'>+								       pointer</div><div class='add'>+								       [*target]));</div><div class='add'>+			} else {</div><div class='add'>+				acpi_rs_out_integer8(name, ACPI_GET8(target));</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case ACPI_RSD_UINT16:</div><div class='hunk'>@@ -444,6 +572,13 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)</div><div class='ctx'> 								       0x03]));</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		case ACPI_RSD_3BITFLAG:</div><div class='add'>+			acpi_rs_out_string(name, ACPI_CAST_PTR(char,</div><div class='add'>+							       table-&gt;</div><div class='add'>+							       pointer[*target &amp;</div><div class='add'>+								       0x07]));</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		case ACPI_RSD_SHORTLIST:</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Short byte list (single line output) for DMA and IRQ resources</div><div class='hunk'>@@ -456,6 +591,20 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		case ACPI_RSD_SHORTLISTX:</div><div class='add'>+			/*</div><div class='add'>+			 * Short byte list (single line output) for GPIO vendor data</div><div class='add'>+			 * Note: The list length is obtained from the previous table entry</div><div class='add'>+			 */</div><div class='add'>+			if (previous_target) {</div><div class='add'>+				acpi_rs_out_title(name);</div><div class='add'>+				acpi_rs_dump_short_byte_list(*previous_target,</div><div class='add'>+							     *</div><div class='add'>+							     (ACPI_CAST_INDIRECT_PTR</div><div class='add'>+							      (u8, target)));</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		case ACPI_RSD_LONGLIST:</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Long byte list for Vendor resource data</div><div class='hunk'>@@ -480,6 +629,18 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		case ACPI_RSD_WORDLIST:</div><div class='add'>+			/*</div><div class='add'>+			 * Word list for GPIO Pin Table</div><div class='add'>+			 * Note: The list length is obtained from the previous table entry</div><div class='add'>+			 */</div><div class='add'>+			if (previous_target) {</div><div class='add'>+				acpi_rs_dump_word_list(*previous_target,</div><div class='add'>+						       *(ACPI_CAST_INDIRECT_PTR</div><div class='add'>+							 (u16, target)));</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		case ACPI_RSD_ADDRESS:</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Common flags for all Address resources</div><div class='hunk'>@@ -627,14 +788,20 @@ void acpi_rs_dump_resource_list(struct acpi_resource *resource_list)</div><div class='ctx'> </div><div class='ctx'> 		/* Dump the resource descriptor */</div><div class='ctx'> </div><div class='del'>-		acpi_rs_dump_descriptor(&amp;resource_list-&gt;data,</div><div class='del'>-					acpi_gbl_dump_resource_dispatch[type]);</div><div class='add'>+		if (type == ACPI_RESOURCE_TYPE_SERIAL_BUS) {</div><div class='add'>+			acpi_rs_dump_descriptor(&amp;resource_list-&gt;data,</div><div class='add'>+						acpi_gbl_dump_serial_bus_dispatch</div><div class='add'>+						[resource_list-&gt;data.</div><div class='add'>+						 common_serial_bus.type]);</div><div class='add'>+		} else {</div><div class='add'>+			acpi_rs_dump_descriptor(&amp;resource_list-&gt;data,</div><div class='add'>+						acpi_gbl_dump_resource_dispatch</div><div class='add'>+						[type]);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* Point to the next resource structure */</div><div class='ctx'> </div><div class='del'>-		resource_list =</div><div class='del'>-		    ACPI_ADD_PTR(struct acpi_resource, resource_list,</div><div class='del'>-				 resource_list-&gt;length);</div><div class='add'>+		resource_list = ACPI_NEXT_RESOURCE(resource_list);</div><div class='ctx'> </div><div class='ctx'> 		/* Exit when END_TAG descriptor is reached */</div><div class='ctx'> </div><div class='hunk'>@@ -768,4 +935,13 @@ static void acpi_rs_dump_dword_list(u8 length, u32 * data)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void acpi_rs_dump_word_list(u16 length, u16 *data)</div><div class='add'>+{</div><div class='add'>+	u16 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; length; i++) {</div><div class='add'>+		acpi_os_printf("%25s%2.2X : %4.4X\n", "Word", i, data[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/acpi/acpica/rsinfo.c b/drivers/acpi/acpica/rsinfo.c<br/>index f9ea60872aa4..a9fa5158200b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsinfo.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsinfo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsinfo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/rsinfo.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -76,7 +76,10 @@ struct acpi_rsconvert_info *acpi_gbl_set_resource_dispatch[] = {</div><div class='ctx'> 	acpi_rs_convert_address64,	/* 0x0D, ACPI_RESOURCE_TYPE_ADDRESS64 */</div><div class='ctx'> 	acpi_rs_convert_ext_address64,	/* 0x0E, ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 */</div><div class='ctx'> 	acpi_rs_convert_ext_irq,	/* 0x0F, ACPI_RESOURCE_TYPE_EXTENDED_IRQ */</div><div class='del'>-	acpi_rs_convert_generic_reg	/* 0x10, ACPI_RESOURCE_TYPE_GENERIC_REGISTER */</div><div class='add'>+	acpi_rs_convert_generic_reg,	/* 0x10, ACPI_RESOURCE_TYPE_GENERIC_REGISTER */</div><div class='add'>+	acpi_rs_convert_gpio,	/* 0x11, ACPI_RESOURCE_TYPE_GPIO */</div><div class='add'>+	acpi_rs_convert_fixed_dma,	/* 0x12, ACPI_RESOURCE_TYPE_FIXED_DMA */</div><div class='add'>+	NULL,			/* 0x13, ACPI_RESOURCE_TYPE_SERIAL_BUS - Use subtype table below */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Dispatch tables for AML-to-resource (Get Resource) conversion functions */</div><div class='hunk'>@@ -94,7 +97,7 @@ struct acpi_rsconvert_info *acpi_gbl_get_resource_dispatch[] = {</div><div class='ctx'> 	acpi_rs_convert_end_dpf,	/* 0x07, ACPI_RESOURCE_NAME_END_DEPENDENT */</div><div class='ctx'> 	acpi_rs_convert_io,	/* 0x08, ACPI_RESOURCE_NAME_IO */</div><div class='ctx'> 	acpi_rs_convert_fixed_io,	/* 0x09, ACPI_RESOURCE_NAME_FIXED_IO */</div><div class='del'>-	NULL,			/* 0x0A, Reserved */</div><div class='add'>+	acpi_rs_convert_fixed_dma,	/* 0x0A, ACPI_RESOURCE_NAME_FIXED_DMA */</div><div class='ctx'> 	NULL,			/* 0x0B, Reserved */</div><div class='ctx'> 	NULL,			/* 0x0C, Reserved */</div><div class='ctx'> 	NULL,			/* 0x0D, Reserved */</div><div class='hunk'>@@ -114,7 +117,19 @@ struct acpi_rsconvert_info *acpi_gbl_get_resource_dispatch[] = {</div><div class='ctx'> 	acpi_rs_convert_address16,	/* 0x08, ACPI_RESOURCE_NAME_ADDRESS16 */</div><div class='ctx'> 	acpi_rs_convert_ext_irq,	/* 0x09, ACPI_RESOURCE_NAME_EXTENDED_IRQ */</div><div class='ctx'> 	acpi_rs_convert_address64,	/* 0x0A, ACPI_RESOURCE_NAME_ADDRESS64 */</div><div class='del'>-	acpi_rs_convert_ext_address64	/* 0x0B, ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64 */</div><div class='add'>+	acpi_rs_convert_ext_address64,	/* 0x0B, ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64 */</div><div class='add'>+	acpi_rs_convert_gpio,	/* 0x0C, ACPI_RESOURCE_NAME_GPIO */</div><div class='add'>+	NULL,			/* 0x0D, Reserved */</div><div class='add'>+	NULL,			/* 0x0E, ACPI_RESOURCE_NAME_SERIAL_BUS - Use subtype table below */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Subtype table for serial_bus -- I2C, SPI, and UART */</div><div class='add'>+</div><div class='add'>+struct acpi_rsconvert_info *acpi_gbl_convert_resource_serial_bus_dispatch[] = {</div><div class='add'>+	NULL,</div><div class='add'>+	acpi_rs_convert_i2c_serial_bus,</div><div class='add'>+	acpi_rs_convert_spi_serial_bus,</div><div class='add'>+	acpi_rs_convert_uart_serial_bus,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef ACPI_FUTURE_USAGE</div><div class='hunk'>@@ -140,6 +155,16 @@ struct acpi_rsdump_info *acpi_gbl_dump_resource_dispatch[] = {</div><div class='ctx'> 	acpi_rs_dump_ext_address64,	/* ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 */</div><div class='ctx'> 	acpi_rs_dump_ext_irq,	/* ACPI_RESOURCE_TYPE_EXTENDED_IRQ */</div><div class='ctx'> 	acpi_rs_dump_generic_reg,	/* ACPI_RESOURCE_TYPE_GENERIC_REGISTER */</div><div class='add'>+	acpi_rs_dump_gpio,	/* ACPI_RESOURCE_TYPE_GPIO */</div><div class='add'>+	acpi_rs_dump_fixed_dma,	/* ACPI_RESOURCE_TYPE_FIXED_DMA */</div><div class='add'>+	NULL,			/* ACPI_RESOURCE_TYPE_SERIAL_BUS */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_rsdump_info *acpi_gbl_dump_serial_bus_dispatch[] = {</div><div class='add'>+	NULL,</div><div class='add'>+	acpi_rs_dump_i2c_serial_bus,	/* AML_RESOURCE_I2C_BUS_TYPE */</div><div class='add'>+	acpi_rs_dump_spi_serial_bus,	/* AML_RESOURCE_SPI_BUS_TYPE */</div><div class='add'>+	acpi_rs_dump_uart_serial_bus,	/* AML_RESOURCE_UART_BUS_TYPE */</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -166,7 +191,10 @@ const u8 acpi_gbl_aml_resource_sizes[] = {</div><div class='ctx'> 	sizeof(struct aml_resource_address64),	/* ACPI_RESOURCE_TYPE_ADDRESS64 */</div><div class='ctx'> 	sizeof(struct aml_resource_extended_address64),	/*ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 */</div><div class='ctx'> 	sizeof(struct aml_resource_extended_irq),	/* ACPI_RESOURCE_TYPE_EXTENDED_IRQ */</div><div class='del'>-	sizeof(struct aml_resource_generic_register)	/* ACPI_RESOURCE_TYPE_GENERIC_REGISTER */</div><div class='add'>+	sizeof(struct aml_resource_generic_register),	/* ACPI_RESOURCE_TYPE_GENERIC_REGISTER */</div><div class='add'>+	sizeof(struct aml_resource_gpio),	/* ACPI_RESOURCE_TYPE_GPIO */</div><div class='add'>+	sizeof(struct aml_resource_fixed_dma),	/* ACPI_RESOURCE_TYPE_FIXED_DMA */</div><div class='add'>+	sizeof(struct aml_resource_common_serialbus),	/* ACPI_RESOURCE_TYPE_SERIAL_BUS */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const u8 acpi_gbl_resource_struct_sizes[] = {</div><div class='hunk'>@@ -182,7 +210,7 @@ const u8 acpi_gbl_resource_struct_sizes[] = {</div><div class='ctx'> 	ACPI_RS_SIZE_MIN,</div><div class='ctx'> 	ACPI_RS_SIZE(struct acpi_resource_io),</div><div class='ctx'> 	ACPI_RS_SIZE(struct acpi_resource_fixed_io),</div><div class='del'>-	0,</div><div class='add'>+	ACPI_RS_SIZE(struct acpi_resource_fixed_dma),</div><div class='ctx'> 	0,</div><div class='ctx'> 	0,</div><div class='ctx'> 	0,</div><div class='hunk'>@@ -202,5 +230,21 @@ const u8 acpi_gbl_resource_struct_sizes[] = {</div><div class='ctx'> 	ACPI_RS_SIZE(struct acpi_resource_address16),</div><div class='ctx'> 	ACPI_RS_SIZE(struct acpi_resource_extended_irq),</div><div class='ctx'> 	ACPI_RS_SIZE(struct acpi_resource_address64),</div><div class='del'>-	ACPI_RS_SIZE(struct acpi_resource_extended_address64)</div><div class='add'>+	ACPI_RS_SIZE(struct acpi_resource_extended_address64),</div><div class='add'>+	ACPI_RS_SIZE(struct acpi_resource_gpio),</div><div class='add'>+	ACPI_RS_SIZE(struct acpi_resource_common_serialbus)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const u8 acpi_gbl_aml_resource_serial_bus_sizes[] = {</div><div class='add'>+	0,</div><div class='add'>+	sizeof(struct aml_resource_i2c_serialbus),</div><div class='add'>+	sizeof(struct aml_resource_spi_serialbus),</div><div class='add'>+	sizeof(struct aml_resource_uart_serialbus),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const u8 acpi_gbl_resource_struct_serial_bus_sizes[] = {</div><div class='add'>+	0,</div><div class='add'>+	ACPI_RS_SIZE(struct acpi_resource_i2c_serialbus),</div><div class='add'>+	ACPI_RS_SIZE(struct acpi_resource_spi_serialbus),</div><div class='add'>+	ACPI_RS_SIZE(struct acpi_resource_uart_serialbus),</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/acpi/acpica/rsio.c b/drivers/acpi/acpica/rsio.c<br/>index 0c7efef008be..f6a081057a22 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/rsio.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/rsirq.c b/drivers/acpi/acpica/rsirq.c<br/>index 50b8ad211167..e23a9ec248cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsirq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsirq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsirq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/rsirq.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -264,3 +264,34 @@ struct acpi_rsconvert_info acpi_rs_convert_dma[6] = {</div><div class='ctx'> 	 AML_OFFSET(dma.dma_channel_mask),</div><div class='ctx'> 	 ACPI_RS_OFFSET(data.dma.channel_count)}</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * acpi_rs_convert_fixed_dma</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+struct acpi_rsconvert_info acpi_rs_convert_fixed_dma[4] = {</div><div class='add'>+	{ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_FIXED_DMA,</div><div class='add'>+	 ACPI_RS_SIZE(struct acpi_resource_fixed_dma),</div><div class='add'>+	 ACPI_RSC_TABLE_SIZE(acpi_rs_convert_fixed_dma)},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_FIXED_DMA,</div><div class='add'>+	 sizeof(struct aml_resource_fixed_dma),</div><div class='add'>+	 0},</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * These fields are contiguous in both the source and destination:</div><div class='add'>+	 * request_lines</div><div class='add'>+	 * Channels</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.fixed_dma.request_lines),</div><div class='add'>+	 AML_OFFSET(fixed_dma.request_lines),</div><div class='add'>+	 2},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.fixed_dma.width),</div><div class='add'>+	 AML_OFFSET(fixed_dma.width),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/acpi/acpica/rslist.c b/drivers/acpi/acpica/rslist.c<br/>index 1bfcef736c50..9be129f5d6f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rslist.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rslist.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rslist.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/rslist.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -70,6 +70,8 @@ acpi_rs_convert_aml_to_resources(u8 * aml,</div><div class='ctx'> 	struct acpi_resource **resource_ptr =</div><div class='ctx'> 	    ACPI_CAST_INDIRECT_PTR(struct acpi_resource, context);</div><div class='ctx'> 	struct acpi_resource *resource;</div><div class='add'>+	union aml_resource *aml_resource;</div><div class='add'>+	struct acpi_rsconvert_info *conversion_table;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE(rs_convert_aml_to_resources);</div><div class='hunk'>@@ -84,14 +86,37 @@ acpi_rs_convert_aml_to_resources(u8 * aml,</div><div class='ctx'> 			      "Misaligned resource pointer %p", resource));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Get the appropriate conversion info table */</div><div class='add'>+</div><div class='add'>+	aml_resource = ACPI_CAST_PTR(union aml_resource, aml);</div><div class='add'>+	if (acpi_ut_get_resource_type(aml) == ACPI_RESOURCE_NAME_SERIAL_BUS) {</div><div class='add'>+		if (aml_resource-&gt;common_serial_bus.type &gt;</div><div class='add'>+		    AML_RESOURCE_MAX_SERIALBUSTYPE) {</div><div class='add'>+			conversion_table = NULL;</div><div class='add'>+		} else {</div><div class='add'>+			/* This is an I2C, SPI, or UART serial_bus descriptor */</div><div class='add'>+</div><div class='add'>+			conversion_table =</div><div class='add'>+			    acpi_gbl_convert_resource_serial_bus_dispatch</div><div class='add'>+			    [aml_resource-&gt;common_serial_bus.type];</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		conversion_table =</div><div class='add'>+		    acpi_gbl_get_resource_dispatch[resource_index];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!conversion_table) {</div><div class='add'>+		ACPI_ERROR((AE_INFO,</div><div class='add'>+			    "Invalid/unsupported resource descriptor: Type 0x%2.2X",</div><div class='add'>+			    resource_index));</div><div class='add'>+		return (AE_AML_INVALID_RESOURCE_TYPE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Convert the AML byte stream resource to a local resource struct */</div><div class='ctx'> </div><div class='ctx'> 	status =</div><div class='del'>-	    acpi_rs_convert_aml_to_resource(resource,</div><div class='del'>-					    ACPI_CAST_PTR(union aml_resource,</div><div class='del'>-							  aml),</div><div class='del'>-					    acpi_gbl_get_resource_dispatch</div><div class='del'>-					    [resource_index]);</div><div class='add'>+	    acpi_rs_convert_aml_to_resource(resource, aml_resource,</div><div class='add'>+					    conversion_table);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		ACPI_EXCEPTION((AE_INFO, status,</div><div class='ctx'> 				"Could not convert AML resource (Type 0x%X)",</div><div class='hunk'>@@ -106,7 +131,7 @@ acpi_rs_convert_aml_to_resources(u8 * aml,</div><div class='ctx'> </div><div class='ctx'> 	/* Point to the next structure in the output buffer */</div><div class='ctx'> </div><div class='del'>-	*resource_ptr = ACPI_ADD_PTR(void, resource, resource-&gt;length);</div><div class='add'>+	*resource_ptr = ACPI_NEXT_RESOURCE(resource);</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -135,6 +160,7 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,</div><div class='ctx'> {</div><div class='ctx'> 	u8 *aml = output_buffer;</div><div class='ctx'> 	u8 *end_aml = output_buffer + aml_size_needed;</div><div class='add'>+	struct acpi_rsconvert_info *conversion_table;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE(rs_convert_resources_to_aml);</div><div class='hunk'>@@ -154,11 +180,34 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,</div><div class='ctx'> </div><div class='ctx'> 		/* Perform the conversion */</div><div class='ctx'> </div><div class='del'>-		status = acpi_rs_convert_resource_to_aml(resource, ACPI_CAST_PTR(union</div><div class='del'>-										 aml_resource,</div><div class='del'>-										 aml),</div><div class='del'>-							 acpi_gbl_set_resource_dispatch</div><div class='del'>-							 [resource-&gt;type]);</div><div class='add'>+		if (resource-&gt;type == ACPI_RESOURCE_TYPE_SERIAL_BUS) {</div><div class='add'>+			if (resource-&gt;data.common_serial_bus.type &gt;</div><div class='add'>+			    AML_RESOURCE_MAX_SERIALBUSTYPE) {</div><div class='add'>+				conversion_table = NULL;</div><div class='add'>+			} else {</div><div class='add'>+				/* This is an I2C, SPI, or UART serial_bus descriptor */</div><div class='add'>+</div><div class='add'>+				conversion_table =</div><div class='add'>+				    acpi_gbl_convert_resource_serial_bus_dispatch</div><div class='add'>+				    [resource-&gt;data.common_serial_bus.type];</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			conversion_table =</div><div class='add'>+			    acpi_gbl_set_resource_dispatch[resource-&gt;type];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!conversion_table) {</div><div class='add'>+			ACPI_ERROR((AE_INFO,</div><div class='add'>+				    "Invalid/unsupported resource descriptor: Type 0x%2.2X",</div><div class='add'>+				    resource-&gt;type));</div><div class='add'>+			return (AE_AML_INVALID_RESOURCE_TYPE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		status = acpi_rs_convert_resource_to_aml(resource,</div><div class='add'>+						         ACPI_CAST_PTR(union</div><div class='add'>+								       aml_resource,</div><div class='add'>+								       aml),</div><div class='add'>+							 conversion_table);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			ACPI_EXCEPTION((AE_INFO, status,</div><div class='ctx'> 					"Could not convert resource (type 0x%X) to AML",</div><div class='hunk'>@@ -192,9 +241,7 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,</div><div class='ctx'> </div><div class='ctx'> 		/* Point to the next input resource descriptor */</div><div class='ctx'> </div><div class='del'>-		resource =</div><div class='del'>-		    ACPI_ADD_PTR(struct acpi_resource, resource,</div><div class='del'>-				 resource-&gt;length);</div><div class='add'>+		resource = ACPI_NEXT_RESOURCE(resource);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Completed buffer, but did not find an end_tag resource descriptor */</div><div class='head'>diff --git a/drivers/acpi/acpica/rsmemory.c b/drivers/acpi/acpica/rsmemory.c<br/>index 7cc6d8625f1e..4fd611ad02b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsmemory.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsmemory.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsmemory.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/rsmemory.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/rsmisc.c b/drivers/acpi/acpica/rsmisc.c<br/>index 410264b22a29..8073b371cc7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsmisc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsmisc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsmisc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/rsmisc.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -83,6 +83,10 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE(rs_convert_aml_to_resource);</div><div class='ctx'> </div><div class='add'>+	if (!info) {</div><div class='add'>+		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (((acpi_size) resource) &amp; 0x3) {</div><div class='ctx'> </div><div class='ctx'> 		/* Each internal resource struct is expected to be 32-bit aligned */</div><div class='hunk'>@@ -101,7 +105,6 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,</div><div class='ctx'> 	 * table length (# of table entries)</div><div class='ctx'> 	 */</div><div class='ctx'> 	count = INIT_TABLE_LENGTH(info);</div><div class='del'>-</div><div class='ctx'> 	while (count) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Source is the external AML byte stream buffer,</div><div class='hunk'>@@ -145,6 +148,14 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,</div><div class='ctx'> 			    ((ACPI_GET8(source) &gt;&gt; info-&gt;value) &amp; 0x03);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		case ACPI_RSC_3BITFLAG:</div><div class='add'>+			/*</div><div class='add'>+			 * Mask and shift the flag bits</div><div class='add'>+			 */</div><div class='add'>+			ACPI_SET8(destination) = (u8)</div><div class='add'>+			    ((ACPI_GET8(source) &gt;&gt; info-&gt;value) &amp; 0x07);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		case ACPI_RSC_COUNT:</div><div class='ctx'> </div><div class='ctx'> 			item_count = ACPI_GET8(source);</div><div class='hunk'>@@ -163,6 +174,69 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,</div><div class='ctx'> 			    (info-&gt;value * (item_count - 1));</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		case ACPI_RSC_COUNT_GPIO_PIN:</div><div class='add'>+</div><div class='add'>+			target = ACPI_ADD_PTR(void, aml, info-&gt;value);</div><div class='add'>+			item_count = ACPI_GET16(target) - ACPI_GET16(source);</div><div class='add'>+</div><div class='add'>+			resource-&gt;length = resource-&gt;length + item_count;</div><div class='add'>+			item_count = item_count / 2;</div><div class='add'>+			ACPI_SET16(destination) = item_count;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ACPI_RSC_COUNT_GPIO_VEN:</div><div class='add'>+</div><div class='add'>+			item_count = ACPI_GET8(source);</div><div class='add'>+			ACPI_SET8(destination) = (u8)item_count;</div><div class='add'>+</div><div class='add'>+			resource-&gt;length = resource-&gt;length +</div><div class='add'>+			    (info-&gt;value * item_count);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ACPI_RSC_COUNT_GPIO_RES:</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Vendor data is optional (length/offset may both be zero)</div><div class='add'>+			 * Examine vendor data length field first</div><div class='add'>+			 */</div><div class='add'>+			target = ACPI_ADD_PTR(void, aml, (info-&gt;value + 2));</div><div class='add'>+			if (ACPI_GET16(target)) {</div><div class='add'>+</div><div class='add'>+				/* Use vendor offset to get resource source length */</div><div class='add'>+</div><div class='add'>+				target = ACPI_ADD_PTR(void, aml, info-&gt;value);</div><div class='add'>+				item_count =</div><div class='add'>+				    ACPI_GET16(target) - ACPI_GET16(source);</div><div class='add'>+			} else {</div><div class='add'>+				/* No vendor data to worry about */</div><div class='add'>+</div><div class='add'>+				item_count = aml-&gt;large_header.resource_length +</div><div class='add'>+				    sizeof(struct aml_resource_large_header) -</div><div class='add'>+				    ACPI_GET16(source);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			resource-&gt;length = resource-&gt;length + item_count;</div><div class='add'>+			ACPI_SET16(destination) = item_count;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ACPI_RSC_COUNT_SERIAL_VEN:</div><div class='add'>+</div><div class='add'>+			item_count = ACPI_GET16(source) - info-&gt;value;</div><div class='add'>+</div><div class='add'>+			resource-&gt;length = resource-&gt;length + item_count;</div><div class='add'>+			ACPI_SET16(destination) = item_count;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ACPI_RSC_COUNT_SERIAL_RES:</div><div class='add'>+</div><div class='add'>+			item_count = (aml_resource_length +</div><div class='add'>+				      sizeof(struct aml_resource_large_header))</div><div class='add'>+			    - ACPI_GET16(source) - info-&gt;value;</div><div class='add'>+</div><div class='add'>+			resource-&gt;length = resource-&gt;length + item_count;</div><div class='add'>+			ACPI_SET16(destination) = item_count;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		case ACPI_RSC_LENGTH:</div><div class='ctx'> </div><div class='ctx'> 			resource-&gt;length = resource-&gt;length + info-&gt;value;</div><div class='hunk'>@@ -183,6 +257,72 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,</div><div class='ctx'> 					  info-&gt;opcode);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		case ACPI_RSC_MOVE_GPIO_PIN:</div><div class='add'>+</div><div class='add'>+			/* Generate and set the PIN data pointer */</div><div class='add'>+</div><div class='add'>+			target = (char *)ACPI_ADD_PTR(void, resource,</div><div class='add'>+						      (resource-&gt;length -</div><div class='add'>+						       item_count * 2));</div><div class='add'>+			*(u16 **)destination = ACPI_CAST_PTR(u16, target);</div><div class='add'>+</div><div class='add'>+			/* Copy the PIN data */</div><div class='add'>+</div><div class='add'>+			source = ACPI_ADD_PTR(void, aml, ACPI_GET16(source));</div><div class='add'>+			acpi_rs_move_data(target, source, item_count,</div><div class='add'>+					  info-&gt;opcode);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ACPI_RSC_MOVE_GPIO_RES:</div><div class='add'>+</div><div class='add'>+			/* Generate and set the resource_source string pointer */</div><div class='add'>+</div><div class='add'>+			target = (char *)ACPI_ADD_PTR(void, resource,</div><div class='add'>+						      (resource-&gt;length -</div><div class='add'>+						       item_count));</div><div class='add'>+			*(u8 **)destination = ACPI_CAST_PTR(u8, target);</div><div class='add'>+</div><div class='add'>+			/* Copy the resource_source string */</div><div class='add'>+</div><div class='add'>+			source = ACPI_ADD_PTR(void, aml, ACPI_GET16(source));</div><div class='add'>+			acpi_rs_move_data(target, source, item_count,</div><div class='add'>+					  info-&gt;opcode);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ACPI_RSC_MOVE_SERIAL_VEN:</div><div class='add'>+</div><div class='add'>+			/* Generate and set the Vendor Data pointer */</div><div class='add'>+</div><div class='add'>+			target = (char *)ACPI_ADD_PTR(void, resource,</div><div class='add'>+						      (resource-&gt;length -</div><div class='add'>+						       item_count));</div><div class='add'>+			*(u8 **)destination = ACPI_CAST_PTR(u8, target);</div><div class='add'>+</div><div class='add'>+			/* Copy the Vendor Data */</div><div class='add'>+</div><div class='add'>+			source = ACPI_ADD_PTR(void, aml, info-&gt;value);</div><div class='add'>+			acpi_rs_move_data(target, source, item_count,</div><div class='add'>+					  info-&gt;opcode);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ACPI_RSC_MOVE_SERIAL_RES:</div><div class='add'>+</div><div class='add'>+			/* Generate and set the resource_source string pointer */</div><div class='add'>+</div><div class='add'>+			target = (char *)ACPI_ADD_PTR(void, resource,</div><div class='add'>+						      (resource-&gt;length -</div><div class='add'>+						       item_count));</div><div class='add'>+			*(u8 **)destination = ACPI_CAST_PTR(u8, target);</div><div class='add'>+</div><div class='add'>+			/* Copy the resource_source string */</div><div class='add'>+</div><div class='add'>+			source =</div><div class='add'>+			    ACPI_ADD_PTR(void, aml,</div><div class='add'>+					 (ACPI_GET16(source) + info-&gt;value));</div><div class='add'>+			acpi_rs_move_data(target, source, item_count,</div><div class='add'>+					  info-&gt;opcode);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		case ACPI_RSC_SET8:</div><div class='ctx'> </div><div class='ctx'> 			ACPI_MEMSET(destination, info-&gt;aml_offset, info-&gt;value);</div><div class='hunk'>@@ -219,13 +359,18 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,</div><div class='ctx'> 			 * Optional resource_source (Index and String). This is the more</div><div class='ctx'> 			 * complicated case used by the Interrupt() macro</div><div class='ctx'> 			 */</div><div class='del'>-			target =</div><div class='del'>-			    ACPI_ADD_PTR(char, resource,</div><div class='del'>-					 info-&gt;aml_offset + (item_count * 4));</div><div class='add'>+			target = ACPI_ADD_PTR(char, resource,</div><div class='add'>+					      info-&gt;aml_offset +</div><div class='add'>+					      (item_count * 4));</div><div class='ctx'> </div><div class='ctx'> 			resource-&gt;length +=</div><div class='ctx'> 			    acpi_rs_get_resource_source(aml_resource_length,</div><div class='del'>-							(acpi_rs_length) (((item_count - 1) * sizeof(u32)) + info-&gt;value), destination, aml, target);</div><div class='add'>+							(acpi_rs_length)</div><div class='add'>+							(((item_count -</div><div class='add'>+							   1) * sizeof(u32)) +</div><div class='add'>+							 info-&gt;value),</div><div class='add'>+							destination, aml,</div><div class='add'>+							target);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case ACPI_RSC_BITMASK:</div><div class='hunk'>@@ -327,6 +472,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,</div><div class='ctx'> {</div><div class='ctx'> 	void *source = NULL;</div><div class='ctx'> 	void *destination;</div><div class='add'>+	char *target;</div><div class='ctx'> 	acpi_rsdesc_size aml_length = 0;</div><div class='ctx'> 	u8 count;</div><div class='ctx'> 	u16 temp16 = 0;</div><div class='hunk'>@@ -334,6 +480,10 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE(rs_convert_resource_to_aml);</div><div class='ctx'> </div><div class='add'>+	if (!info) {</div><div class='add'>+		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * First table entry must be ACPI_RSC_INITxxx and must contain the</div><div class='ctx'> 	 * table length (# of table entries)</div><div class='hunk'>@@ -383,6 +533,14 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,</div><div class='ctx'> 			    ((ACPI_GET8(source) &amp; 0x03) &lt;&lt; info-&gt;value);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		case ACPI_RSC_3BITFLAG:</div><div class='add'>+			/*</div><div class='add'>+			 * Mask and shift the flag bits</div><div class='add'>+			 */</div><div class='add'>+			ACPI_SET8(destination) |= (u8)</div><div class='add'>+			    ((ACPI_GET8(source) &amp; 0x07) &lt;&lt; info-&gt;value);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		case ACPI_RSC_COUNT:</div><div class='ctx'> </div><div class='ctx'> 			item_count = ACPI_GET8(source);</div><div class='hunk'>@@ -400,6 +558,63 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,</div><div class='ctx'> 			acpi_rs_set_resource_length(aml_length, aml);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		case ACPI_RSC_COUNT_GPIO_PIN:</div><div class='add'>+</div><div class='add'>+			item_count = ACPI_GET16(source);</div><div class='add'>+			ACPI_SET16(destination) = (u16)aml_length;</div><div class='add'>+</div><div class='add'>+			aml_length = (u16)(aml_length + item_count * 2);</div><div class='add'>+			target = ACPI_ADD_PTR(void, aml, info-&gt;value);</div><div class='add'>+			ACPI_SET16(target) = (u16)aml_length;</div><div class='add'>+			acpi_rs_set_resource_length(aml_length, aml);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ACPI_RSC_COUNT_GPIO_VEN:</div><div class='add'>+</div><div class='add'>+			item_count = ACPI_GET16(source);</div><div class='add'>+			ACPI_SET16(destination) = (u16)item_count;</div><div class='add'>+</div><div class='add'>+			aml_length =</div><div class='add'>+			    (u16)(aml_length + (info-&gt;value * item_count));</div><div class='add'>+			acpi_rs_set_resource_length(aml_length, aml);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ACPI_RSC_COUNT_GPIO_RES:</div><div class='add'>+</div><div class='add'>+			/* Set resource source string length */</div><div class='add'>+</div><div class='add'>+			item_count = ACPI_GET16(source);</div><div class='add'>+			ACPI_SET16(destination) = (u16)aml_length;</div><div class='add'>+</div><div class='add'>+			/* Compute offset for the Vendor Data */</div><div class='add'>+</div><div class='add'>+			aml_length = (u16)(aml_length + item_count);</div><div class='add'>+			target = ACPI_ADD_PTR(void, aml, info-&gt;value);</div><div class='add'>+</div><div class='add'>+			/* Set vendor offset only if there is vendor data */</div><div class='add'>+</div><div class='add'>+			if (resource-&gt;data.gpio.vendor_length) {</div><div class='add'>+				ACPI_SET16(target) = (u16)aml_length;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			acpi_rs_set_resource_length(aml_length, aml);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ACPI_RSC_COUNT_SERIAL_VEN:</div><div class='add'>+</div><div class='add'>+			item_count = ACPI_GET16(source);</div><div class='add'>+			ACPI_SET16(destination) = item_count + info-&gt;value;</div><div class='add'>+			aml_length = (u16)(aml_length + item_count);</div><div class='add'>+			acpi_rs_set_resource_length(aml_length, aml);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ACPI_RSC_COUNT_SERIAL_RES:</div><div class='add'>+</div><div class='add'>+			item_count = ACPI_GET16(source);</div><div class='add'>+			aml_length = (u16)(aml_length + item_count);</div><div class='add'>+			acpi_rs_set_resource_length(aml_length, aml);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		case ACPI_RSC_LENGTH:</div><div class='ctx'> </div><div class='ctx'> 			acpi_rs_set_resource_length(info-&gt;value, aml);</div><div class='hunk'>@@ -417,6 +632,48 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,</div><div class='ctx'> 					  info-&gt;opcode);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		case ACPI_RSC_MOVE_GPIO_PIN:</div><div class='add'>+</div><div class='add'>+			destination = (char *)ACPI_ADD_PTR(void, aml,</div><div class='add'>+							   ACPI_GET16</div><div class='add'>+							   (destination));</div><div class='add'>+			source = *(u16 **)source;</div><div class='add'>+			acpi_rs_move_data(destination, source, item_count,</div><div class='add'>+					  info-&gt;opcode);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ACPI_RSC_MOVE_GPIO_RES:</div><div class='add'>+</div><div class='add'>+			/* Used for both resource_source string and vendor_data */</div><div class='add'>+</div><div class='add'>+			destination = (char *)ACPI_ADD_PTR(void, aml,</div><div class='add'>+							   ACPI_GET16</div><div class='add'>+							   (destination));</div><div class='add'>+			source = *(u8 **)source;</div><div class='add'>+			acpi_rs_move_data(destination, source, item_count,</div><div class='add'>+					  info-&gt;opcode);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ACPI_RSC_MOVE_SERIAL_VEN:</div><div class='add'>+</div><div class='add'>+			destination = (char *)ACPI_ADD_PTR(void, aml,</div><div class='add'>+							   (aml_length -</div><div class='add'>+							    item_count));</div><div class='add'>+			source = *(u8 **)source;</div><div class='add'>+			acpi_rs_move_data(destination, source, item_count,</div><div class='add'>+					  info-&gt;opcode);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ACPI_RSC_MOVE_SERIAL_RES:</div><div class='add'>+</div><div class='add'>+			destination = (char *)ACPI_ADD_PTR(void, aml,</div><div class='add'>+							   (aml_length -</div><div class='add'>+							    item_count));</div><div class='add'>+			source = *(u8 **)source;</div><div class='add'>+			acpi_rs_move_data(destination, source, item_count,</div><div class='add'>+					  info-&gt;opcode);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		case ACPI_RSC_ADDRESS:</div><div class='ctx'> </div><div class='ctx'> 			/* Set the Resource Type, General Flags, and Type-Specific Flags */</div><div class='head'>diff --git a/drivers/acpi/acpica/rsserial.c b/drivers/acpi/acpica/rsserial.c<br/>new file mode 100644<br/>index 000000000000..9aa5e689b444<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsserial.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/rsserial.c</a></div><div class='hunk'>@@ -0,0 +1,441 @@</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Module Name: rsserial - GPIO/serial_bus resource descriptors</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions, and the following disclaimer,</div><div class='add'>+ *    without modification.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer</div><div class='add'>+ *    substantially similar to the "NO WARRANTY" disclaimer below</div><div class='add'>+ *    ("Disclaimer") and any redistribution must be conditioned upon</div><div class='add'>+ *    including a substantially similar Disclaimer requirement for further</div><div class='add'>+ *    binary redistribution.</div><div class='add'>+ * 3. Neither the names of the above-listed copyright holders nor the names</div><div class='add'>+ *    of any contributors may be used to endorse or promote products derived</div><div class='add'>+ *    from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Alternatively, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") version 2 as published by the Free</div><div class='add'>+ * Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * NO WARRANTY</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS</div><div class='add'>+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT</div><div class='add'>+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL</div><div class='add'>+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS</div><div class='add'>+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)</div><div class='add'>+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,</div><div class='add'>+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING</div><div class='add'>+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE</div><div class='add'>+ * POSSIBILITY OF SUCH DAMAGES.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;acpi/acpi.h&gt;</div><div class='add'>+#include "accommon.h"</div><div class='add'>+#include "acresrc.h"</div><div class='add'>+</div><div class='add'>+#define _COMPONENT          ACPI_RESOURCES</div><div class='add'>+ACPI_MODULE_NAME("rsserial")</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * acpi_rs_convert_gpio</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+struct acpi_rsconvert_info acpi_rs_convert_gpio[17] = {</div><div class='add'>+	{ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_GPIO,</div><div class='add'>+	 ACPI_RS_SIZE(struct acpi_resource_gpio),</div><div class='add'>+	 ACPI_RSC_TABLE_SIZE(acpi_rs_convert_gpio)},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_GPIO,</div><div class='add'>+	 sizeof(struct aml_resource_gpio),</div><div class='add'>+	 0},</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * These fields are contiguous in both the source and destination:</div><div class='add'>+	 * revision_id</div><div class='add'>+	 * connection_type</div><div class='add'>+	 */</div><div class='add'>+	{ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.gpio.revision_id),</div><div class='add'>+	 AML_OFFSET(gpio.revision_id),</div><div class='add'>+	 2},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.gpio.producer_consumer),</div><div class='add'>+	 AML_OFFSET(gpio.flags),</div><div class='add'>+	 0},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.gpio.sharable),</div><div class='add'>+	 AML_OFFSET(gpio.int_flags),</div><div class='add'>+	 3},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.gpio.io_restriction),</div><div class='add'>+	 AML_OFFSET(gpio.int_flags),</div><div class='add'>+	 0},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.gpio.triggering),</div><div class='add'>+	 AML_OFFSET(gpio.int_flags),</div><div class='add'>+	 0},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.gpio.polarity),</div><div class='add'>+	 AML_OFFSET(gpio.int_flags),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.gpio.pin_config),</div><div class='add'>+	 AML_OFFSET(gpio.pin_config),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * These fields are contiguous in both the source and destination:</div><div class='add'>+	 * drive_strength</div><div class='add'>+	 * debounce_timeout</div><div class='add'>+	 */</div><div class='add'>+	{ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.gpio.drive_strength),</div><div class='add'>+	 AML_OFFSET(gpio.drive_strength),</div><div class='add'>+	 2},</div><div class='add'>+</div><div class='add'>+	/* Pin Table */</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_COUNT_GPIO_PIN, ACPI_RS_OFFSET(data.gpio.pin_table_length),</div><div class='add'>+	 AML_OFFSET(gpio.pin_table_offset),</div><div class='add'>+	 AML_OFFSET(gpio.res_source_offset)},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE_GPIO_PIN, ACPI_RS_OFFSET(data.gpio.pin_table),</div><div class='add'>+	 AML_OFFSET(gpio.pin_table_offset),</div><div class='add'>+	 0},</div><div class='add'>+</div><div class='add'>+	/* Resource Source */</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.gpio.resource_source.index),</div><div class='add'>+	 AML_OFFSET(gpio.res_source_index),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_COUNT_GPIO_RES,</div><div class='add'>+	 ACPI_RS_OFFSET(data.gpio.resource_source.string_length),</div><div class='add'>+	 AML_OFFSET(gpio.res_source_offset),</div><div class='add'>+	 AML_OFFSET(gpio.vendor_offset)},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE_GPIO_RES,</div><div class='add'>+	 ACPI_RS_OFFSET(data.gpio.resource_source.string_ptr),</div><div class='add'>+	 AML_OFFSET(gpio.res_source_offset),</div><div class='add'>+	 0},</div><div class='add'>+</div><div class='add'>+	/* Vendor Data */</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_COUNT_GPIO_VEN, ACPI_RS_OFFSET(data.gpio.vendor_length),</div><div class='add'>+	 AML_OFFSET(gpio.vendor_length),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE_GPIO_RES, ACPI_RS_OFFSET(data.gpio.vendor_data),</div><div class='add'>+	 AML_OFFSET(gpio.vendor_offset),</div><div class='add'>+	 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * acpi_rs_convert_i2c_serial_bus</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+struct acpi_rsconvert_info acpi_rs_convert_i2c_serial_bus[16] = {</div><div class='add'>+	{ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_SERIAL_BUS,</div><div class='add'>+	 ACPI_RS_SIZE(struct acpi_resource_i2c_serialbus),</div><div class='add'>+	 ACPI_RSC_TABLE_SIZE(acpi_rs_convert_i2c_serial_bus)},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_SERIAL_BUS,</div><div class='add'>+	 sizeof(struct aml_resource_i2c_serialbus),</div><div class='add'>+	 0},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.revision_id),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.revision_id),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.type),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.type),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.common_serial_bus.slave_mode),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.flags),</div><div class='add'>+	 0},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_1BITFLAG,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.producer_consumer),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.flags),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.type_revision_id),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.type_revision_id),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE16,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.type_data_length),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.type_data_length),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	/* Vendor data */</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_COUNT_SERIAL_VEN,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.vendor_length),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.type_data_length),</div><div class='add'>+	 AML_RESOURCE_I2C_MIN_DATA_LEN},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE_SERIAL_VEN,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.vendor_data),</div><div class='add'>+	 0,</div><div class='add'>+	 sizeof(struct aml_resource_i2c_serialbus)},</div><div class='add'>+</div><div class='add'>+	/* Resource Source */</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.resource_source.index),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.res_source_index),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_COUNT_SERIAL_RES,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_length),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.type_data_length),</div><div class='add'>+	 sizeof(struct aml_resource_common_serialbus)},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE_SERIAL_RES,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_ptr),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.type_data_length),</div><div class='add'>+	 sizeof(struct aml_resource_common_serialbus)},</div><div class='add'>+</div><div class='add'>+	/* I2C bus type specific */</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.i2c_serial_bus.access_mode),</div><div class='add'>+	 AML_OFFSET(i2c_serial_bus.type_specific_flags),</div><div class='add'>+	 0},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE32, ACPI_RS_OFFSET(data.i2c_serial_bus.connection_speed),</div><div class='add'>+	 AML_OFFSET(i2c_serial_bus.connection_speed),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.i2c_serial_bus.slave_address),</div><div class='add'>+	 AML_OFFSET(i2c_serial_bus.slave_address),</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'>+ * acpi_rs_convert_spi_serial_bus</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+struct acpi_rsconvert_info acpi_rs_convert_spi_serial_bus[20] = {</div><div class='add'>+	{ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_SERIAL_BUS,</div><div class='add'>+	 ACPI_RS_SIZE(struct acpi_resource_spi_serialbus),</div><div class='add'>+	 ACPI_RSC_TABLE_SIZE(acpi_rs_convert_spi_serial_bus)},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_SERIAL_BUS,</div><div class='add'>+	 sizeof(struct aml_resource_spi_serialbus),</div><div class='add'>+	 0},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.revision_id),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.revision_id),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.type),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.type),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.common_serial_bus.slave_mode),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.flags),</div><div class='add'>+	 0},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_1BITFLAG,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.producer_consumer),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.flags),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.type_revision_id),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.type_revision_id),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE16,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.type_data_length),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.type_data_length),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	/* Vendor data */</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_COUNT_SERIAL_VEN,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.vendor_length),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.type_data_length),</div><div class='add'>+	 AML_RESOURCE_SPI_MIN_DATA_LEN},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE_SERIAL_VEN,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.vendor_data),</div><div class='add'>+	 0,</div><div class='add'>+	 sizeof(struct aml_resource_spi_serialbus)},</div><div class='add'>+</div><div class='add'>+	/* Resource Source */</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.resource_source.index),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.res_source_index),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_COUNT_SERIAL_RES,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_length),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.type_data_length),</div><div class='add'>+	 sizeof(struct aml_resource_common_serialbus)},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE_SERIAL_RES,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_ptr),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.type_data_length),</div><div class='add'>+	 sizeof(struct aml_resource_common_serialbus)},</div><div class='add'>+</div><div class='add'>+	/* Spi bus type specific  */</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.spi_serial_bus.wire_mode),</div><div class='add'>+	 AML_OFFSET(spi_serial_bus.type_specific_flags),</div><div class='add'>+	 0},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.spi_serial_bus.device_polarity),</div><div class='add'>+	 AML_OFFSET(spi_serial_bus.type_specific_flags),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.spi_serial_bus.data_bit_length),</div><div class='add'>+	 AML_OFFSET(spi_serial_bus.data_bit_length),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.spi_serial_bus.clock_phase),</div><div class='add'>+	 AML_OFFSET(spi_serial_bus.clock_phase),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.spi_serial_bus.clock_polarity),</div><div class='add'>+	 AML_OFFSET(spi_serial_bus.clock_polarity),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.spi_serial_bus.device_selection),</div><div class='add'>+	 AML_OFFSET(spi_serial_bus.device_selection),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE32, ACPI_RS_OFFSET(data.spi_serial_bus.connection_speed),</div><div class='add'>+	 AML_OFFSET(spi_serial_bus.connection_speed),</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'>+ * acpi_rs_convert_uart_serial_bus</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+struct acpi_rsconvert_info acpi_rs_convert_uart_serial_bus[22] = {</div><div class='add'>+	{ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_SERIAL_BUS,</div><div class='add'>+	 ACPI_RS_SIZE(struct acpi_resource_uart_serialbus),</div><div class='add'>+	 ACPI_RSC_TABLE_SIZE(acpi_rs_convert_uart_serial_bus)},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_SERIAL_BUS,</div><div class='add'>+	 sizeof(struct aml_resource_uart_serialbus),</div><div class='add'>+	 0},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.revision_id),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.revision_id),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.type),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.type),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.common_serial_bus.slave_mode),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.flags),</div><div class='add'>+	 0},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_1BITFLAG,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.producer_consumer),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.flags),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.type_revision_id),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.type_revision_id),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE16,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.type_data_length),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.type_data_length),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	/* Vendor data */</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_COUNT_SERIAL_VEN,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.vendor_length),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.type_data_length),</div><div class='add'>+	 AML_RESOURCE_UART_MIN_DATA_LEN},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE_SERIAL_VEN,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.vendor_data),</div><div class='add'>+	 0,</div><div class='add'>+	 sizeof(struct aml_resource_uart_serialbus)},</div><div class='add'>+</div><div class='add'>+	/* Resource Source */</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.resource_source.index),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.res_source_index),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_COUNT_SERIAL_RES,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_length),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.type_data_length),</div><div class='add'>+	 sizeof(struct aml_resource_common_serialbus)},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE_SERIAL_RES,</div><div class='add'>+	 ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_ptr),</div><div class='add'>+	 AML_OFFSET(common_serial_bus.type_data_length),</div><div class='add'>+	 sizeof(struct aml_resource_common_serialbus)},</div><div class='add'>+</div><div class='add'>+	/* Uart bus type specific  */</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.uart_serial_bus.flow_control),</div><div class='add'>+	 AML_OFFSET(uart_serial_bus.type_specific_flags),</div><div class='add'>+	 0},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.uart_serial_bus.stop_bits),</div><div class='add'>+	 AML_OFFSET(uart_serial_bus.type_specific_flags),</div><div class='add'>+	 2},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_3BITFLAG, ACPI_RS_OFFSET(data.uart_serial_bus.data_bits),</div><div class='add'>+	 AML_OFFSET(uart_serial_bus.type_specific_flags),</div><div class='add'>+	 4},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.uart_serial_bus.endian),</div><div class='add'>+	 AML_OFFSET(uart_serial_bus.type_specific_flags),</div><div class='add'>+	 7},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.uart_serial_bus.parity),</div><div class='add'>+	 AML_OFFSET(uart_serial_bus.parity),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.uart_serial_bus.lines_enabled),</div><div class='add'>+	 AML_OFFSET(uart_serial_bus.lines_enabled),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.uart_serial_bus.rx_fifo_size),</div><div class='add'>+	 AML_OFFSET(uart_serial_bus.rx_fifo_size),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.uart_serial_bus.tx_fifo_size),</div><div class='add'>+	 AML_OFFSET(uart_serial_bus.tx_fifo_size),</div><div class='add'>+	 1},</div><div class='add'>+</div><div class='add'>+	{ACPI_RSC_MOVE32,</div><div class='add'>+	 ACPI_RS_OFFSET(data.uart_serial_bus.default_baud_rate),</div><div class='add'>+	 AML_OFFSET(uart_serial_bus.default_baud_rate),</div><div class='add'>+	 1},</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/acpi/acpica/rsutils.c b/drivers/acpi/acpica/rsutils.c<br/>index 231811e56939..433a375deb93 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsutils.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsutils.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsutils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/rsutils.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -144,6 +144,9 @@ acpi_rs_move_data(void *destination, void *source, u16 item_count, u8 move_type)</div><div class='ctx'> 			 * since there are no alignment or endian issues</div><div class='ctx'> 			 */</div><div class='ctx'> 		case ACPI_RSC_MOVE8:</div><div class='add'>+		case ACPI_RSC_MOVE_GPIO_RES:</div><div class='add'>+		case ACPI_RSC_MOVE_SERIAL_VEN:</div><div class='add'>+		case ACPI_RSC_MOVE_SERIAL_RES:</div><div class='ctx'> 			ACPI_MEMCPY(destination, source, item_count);</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='hunk'>@@ -153,6 +156,7 @@ acpi_rs_move_data(void *destination, void *source, u16 item_count, u8 move_type)</div><div class='ctx'> 			 * misaligned memory transfers</div><div class='ctx'> 			 */</div><div class='ctx'> 		case ACPI_RSC_MOVE16:</div><div class='add'>+		case ACPI_RSC_MOVE_GPIO_PIN:</div><div class='ctx'> 			ACPI_MOVE_16_TO_16(&amp;ACPI_CAST_PTR(u16, destination)[i],</div><div class='ctx'> 					   &amp;ACPI_CAST_PTR(u16, source)[i]);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -590,6 +594,56 @@ acpi_rs_get_prs_method_data(struct acpi_namespace_node *node,</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='add'>+ * FUNCTION:    acpi_rs_get_aei_method_data</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  Node            - Device node</div><div class='add'>+ *              ret_buffer      - Pointer to a buffer structure for the</div><div class='add'>+ *                                results</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      Status</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: This function is called to get the _AEI value of an object</div><div class='add'>+ *              contained in an object specified by the handle passed in</div><div class='add'>+ *</div><div class='add'>+ *              If the function fails an appropriate status will be returned</div><div class='add'>+ *              and the contents of the callers buffer is undefined.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+acpi_status</div><div class='add'>+acpi_rs_get_aei_method_data(struct acpi_namespace_node *node,</div><div class='add'>+			    struct acpi_buffer *ret_buffer)</div><div class='add'>+{</div><div class='add'>+	union acpi_operand_object *obj_desc;</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	ACPI_FUNCTION_TRACE(rs_get_aei_method_data);</div><div class='add'>+</div><div class='add'>+	/* Parameters guaranteed valid by caller */</div><div class='add'>+</div><div class='add'>+	/* Execute the method, no parameters */</div><div class='add'>+</div><div class='add'>+	status = acpi_ut_evaluate_object(node, METHOD_NAME__AEI,</div><div class='add'>+					 ACPI_BTYPE_BUFFER, &amp;obj_desc);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return_ACPI_STATUS(status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make the call to create a resource linked list from the</div><div class='add'>+	 * byte stream buffer that comes back from the _CRS method</div><div class='add'>+	 * execution.</div><div class='add'>+	 */</div><div class='add'>+	status = acpi_rs_create_resource_list(obj_desc, ret_buffer);</div><div class='add'>+</div><div class='add'>+	/* On exit, we must delete the object returned by evaluate_object */</div><div class='add'>+</div><div class='add'>+	acpi_ut_remove_reference(obj_desc);</div><div class='add'>+	return_ACPI_STATUS(status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='ctx'>  * FUNCTION:    acpi_rs_get_method_data</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  Handle          - Handle to the containing object</div><div class='head'>diff --git a/drivers/acpi/acpica/rsxface.c b/drivers/acpi/acpica/rsxface.c<br/>index fe86b37b16ce..f58c098c7aeb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsxface.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/rsxface.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/rsxface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/rsxface.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -307,6 +307,46 @@ acpi_set_current_resources(acpi_handle device_handle,</div><div class='ctx'> </div><div class='ctx'> ACPI_EXPORT_SYMBOL(acpi_set_current_resources)</div><div class='ctx'> </div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_get_event_resources</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  device_handle   - Handle to the device object for the</div><div class='add'>+ *                                device we are getting resources</div><div class='add'>+ *              in_buffer       - Pointer to a buffer containing the</div><div class='add'>+ *                                resources to be set for the device</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      Status</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: This function is called to get the event resources for a</div><div class='add'>+ *              specific device. The caller must first acquire a handle for</div><div class='add'>+ *              the desired device. The resource data is passed to the routine</div><div class='add'>+ *              the buffer pointed to by the in_buffer variable. Uses the</div><div class='add'>+ *              _AEI method.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+acpi_status</div><div class='add'>+acpi_get_event_resources(acpi_handle device_handle,</div><div class='add'>+			 struct acpi_buffer *ret_buffer)</div><div class='add'>+{</div><div class='add'>+	acpi_status status;</div><div class='add'>+	struct acpi_namespace_node *node;</div><div class='add'>+</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_get_event_resources);</div><div class='add'>+</div><div class='add'>+	/* Validate parameters then dispatch to internal routine */</div><div class='add'>+</div><div class='add'>+	status = acpi_rs_validate_parameters(device_handle, ret_buffer, &amp;node);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return_ACPI_STATUS(status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = acpi_rs_get_aei_method_data(node, ret_buffer);</div><div class='add'>+	return_ACPI_STATUS(status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_event_resources)</div><div class='add'>+</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_resource_to_address64</div><div class='hunk'>@@ -486,8 +526,9 @@ acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context)</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  device_handle   - Handle to the device object for the</div><div class='ctx'>  *                                device we are querying</div><div class='del'>- *              Name            - Method name of the resources we want</div><div class='del'>- *                                (METHOD_NAME__CRS or METHOD_NAME__PRS)</div><div class='add'>+ *              Name            - Method name of the resources we want.</div><div class='add'>+ *                                (METHOD_NAME__CRS, METHOD_NAME__PRS, or</div><div class='add'>+ *                                METHOD_NAME__AEI)</div><div class='ctx'>  *              user_function   - Called for each resource</div><div class='ctx'>  *              Context         - Passed to user_function</div><div class='ctx'>  *</div><div class='hunk'>@@ -514,11 +555,12 @@ acpi_walk_resources(acpi_handle device_handle,</div><div class='ctx'> </div><div class='ctx'> 	if (!device_handle || !user_function || !name ||</div><div class='ctx'> 	    (!ACPI_COMPARE_NAME(name, METHOD_NAME__CRS) &amp;&amp;</div><div class='del'>-	     !ACPI_COMPARE_NAME(name, METHOD_NAME__PRS))) {</div><div class='add'>+	     !ACPI_COMPARE_NAME(name, METHOD_NAME__PRS) &amp;&amp;</div><div class='add'>+	     !ACPI_COMPARE_NAME(name, METHOD_NAME__AEI))) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Get the _CRS or _PRS resource list */</div><div class='add'>+	/* Get the _CRS/_PRS/_AEI resource list */</div><div class='ctx'> </div><div class='ctx'> 	buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;</div><div class='ctx'> 	status = acpi_rs_get_method_data(device_handle, name, &amp;buffer);</div><div class='head'>diff --git a/drivers/acpi/acpica/tbfadt.c b/drivers/acpi/acpica/tbfadt.c<br/>index 6f5588e62c0a..c5d870406f41 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/tbfadt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/tbfadt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/tbfadt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/tbfadt.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -63,14 +63,15 @@ static void acpi_tb_setup_fadt_registers(void);</div><div class='ctx'> </div><div class='ctx'> typedef struct acpi_fadt_info {</div><div class='ctx'> 	char *name;</div><div class='del'>-	u8 address64;</div><div class='del'>-	u8 address32;</div><div class='del'>-	u8 length;</div><div class='add'>+	u16 address64;</div><div class='add'>+	u16 address32;</div><div class='add'>+	u16 length;</div><div class='ctx'> 	u8 default_length;</div><div class='ctx'> 	u8 type;</div><div class='ctx'> </div><div class='ctx'> } acpi_fadt_info;</div><div class='ctx'> </div><div class='add'>+#define ACPI_FADT_OPTIONAL          0</div><div class='ctx'> #define ACPI_FADT_REQUIRED          1</div><div class='ctx'> #define ACPI_FADT_SEPARATE_LENGTH   2</div><div class='ctx'> </div><div class='hunk'>@@ -87,7 +88,7 @@ static struct acpi_fadt_info fadt_info_table[] = {</div><div class='ctx'> 	 ACPI_FADT_OFFSET(pm1b_event_block),</div><div class='ctx'> 	 ACPI_FADT_OFFSET(pm1_event_length),</div><div class='ctx'> 	 ACPI_PM1_REGISTER_WIDTH * 2,	/* Enable + Status register */</div><div class='del'>-	 0},</div><div class='add'>+	 ACPI_FADT_OPTIONAL},</div><div class='ctx'> </div><div class='ctx'> 	{"Pm1aControlBlock",</div><div class='ctx'> 	 ACPI_FADT_OFFSET(xpm1a_control_block),</div><div class='hunk'>@@ -101,7 +102,7 @@ static struct acpi_fadt_info fadt_info_table[] = {</div><div class='ctx'> 	 ACPI_FADT_OFFSET(pm1b_control_block),</div><div class='ctx'> 	 ACPI_FADT_OFFSET(pm1_control_length),</div><div class='ctx'> 	 ACPI_PM1_REGISTER_WIDTH,</div><div class='del'>-	 0},</div><div class='add'>+	 ACPI_FADT_OPTIONAL},</div><div class='ctx'> </div><div class='ctx'> 	{"Pm2ControlBlock",</div><div class='ctx'> 	 ACPI_FADT_OFFSET(xpm2_control_block),</div><div class='hunk'>@@ -139,7 +140,7 @@ static struct acpi_fadt_info fadt_info_table[] = {</div><div class='ctx'> </div><div class='ctx'> typedef struct acpi_fadt_pm_info {</div><div class='ctx'> 	struct acpi_generic_address *target;</div><div class='del'>-	u8 source;</div><div class='add'>+	u16 source;</div><div class='ctx'> 	u8 register_num;</div><div class='ctx'> </div><div class='ctx'> } acpi_fadt_pm_info;</div><div class='hunk'>@@ -253,8 +254,13 @@ void acpi_tb_parse_fadt(u32 table_index)</div><div class='ctx'> 	acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.Xdsdt,</div><div class='ctx'> 			      ACPI_SIG_DSDT, ACPI_TABLE_INDEX_DSDT);</div><div class='ctx'> </div><div class='del'>-	acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.Xfacs,</div><div class='del'>-			      ACPI_SIG_FACS, ACPI_TABLE_INDEX_FACS);</div><div class='add'>+	/* If Hardware Reduced flag is set, there is no FACS */</div><div class='add'>+</div><div class='add'>+	if (!acpi_gbl_reduced_hardware) {</div><div class='add'>+		acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.</div><div class='add'>+				      Xfacs, ACPI_SIG_FACS,</div><div class='add'>+				      ACPI_TABLE_INDEX_FACS);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -277,12 +283,12 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check if the FADT is larger than the largest table that we expect</div><div class='del'>-	 * (the ACPI 2.0/3.0 version). If so, truncate the table, and issue</div><div class='add'>+	 * (the ACPI 5.0 version). If so, truncate the table, and issue</div><div class='ctx'> 	 * a warning.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (length &gt; sizeof(struct acpi_table_fadt)) {</div><div class='ctx'> 		ACPI_WARNING((AE_INFO,</div><div class='del'>-			      "FADT (revision %u) is longer than ACPI 2.0 version, "</div><div class='add'>+			      "FADT (revision %u) is longer than ACPI 5.0 version, "</div><div class='ctx'> 			      "truncating length %u to %u",</div><div class='ctx'> 			      table-&gt;revision, length,</div><div class='ctx'> 			      (u32)sizeof(struct acpi_table_fadt)));</div><div class='hunk'>@@ -297,6 +303,13 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)</div><div class='ctx'> 	ACPI_MEMCPY(&amp;acpi_gbl_FADT, table,</div><div class='ctx'> 		    ACPI_MIN(length, sizeof(struct acpi_table_fadt)));</div><div class='ctx'> </div><div class='add'>+	/* Take a copy of the Hardware Reduced flag */</div><div class='add'>+</div><div class='add'>+	acpi_gbl_reduced_hardware = FALSE;</div><div class='add'>+	if (acpi_gbl_FADT.flags &amp; ACPI_FADT_HW_REDUCED) {</div><div class='add'>+		acpi_gbl_reduced_hardware = TRUE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Convert the local copy of the FADT to the common internal format */</div><div class='ctx'> </div><div class='ctx'> 	acpi_tb_convert_fadt();</div><div class='hunk'>@@ -502,6 +515,12 @@ static void acpi_tb_validate_fadt(void)</div><div class='ctx'> 		acpi_gbl_FADT.Xdsdt = (u64) acpi_gbl_FADT.dsdt;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* If Hardware Reduced flag is set, we are all done */</div><div class='add'>+</div><div class='add'>+	if (acpi_gbl_reduced_hardware) {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Examine all of the 64-bit extended address fields (X fields) */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ACPI_FADT_INFO_ENTRIES; i++) {</div><div class='head'>diff --git a/drivers/acpi/acpica/tbfind.c b/drivers/acpi/acpica/tbfind.c<br/>index a55cb2bb5abb..4903e36ea75a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/tbfind.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/tbfind.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/tbfind.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/tbfind.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c<br/>index 62365f6075dd..1aecf7baa4e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/tbinstal.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/tbinstal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/tbinstal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/tbinstal.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c<br/>index 0f2d395feaba..09ca39e14337 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/tbutils.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/tbutils.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/tbutils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/tbutils.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -135,6 +135,13 @@ acpi_status acpi_tb_initialize_facs(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='add'>+	/* If Hardware Reduced flag is set, there is no FACS */</div><div class='add'>+</div><div class='add'>+	if (acpi_gbl_reduced_hardware) {</div><div class='add'>+		acpi_gbl_FACS = NULL;</div><div class='add'>+		return (AE_OK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	status = acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,</div><div class='ctx'> 					 ACPI_CAST_INDIRECT_PTR(struct</div><div class='ctx'> 								acpi_table_header,</div><div class='head'>diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c<br/>index e7d13f5d3f2d..abcc6412c244 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/tbxface.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/tbxface.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/tbxface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/tbxface.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/tbxfroot.c b/drivers/acpi/acpica/tbxfroot.c<br/>index 7eb6c6cc1edf..4258f647ca3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/tbxfroot.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/tbxfroot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/tbxfroot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/tbxfroot.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/utaddress.c b/drivers/acpi/acpica/utaddress.c<br/>new file mode 100644<br/>index 000000000000..67932aebe6dd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utaddress.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utaddress.c</a></div><div class='hunk'>@@ -0,0 +1,294 @@</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Module Name: utaddress - op_region address range check</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions, and the following disclaimer,</div><div class='add'>+ *    without modification.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer</div><div class='add'>+ *    substantially similar to the "NO WARRANTY" disclaimer below</div><div class='add'>+ *    ("Disclaimer") and any redistribution must be conditioned upon</div><div class='add'>+ *    including a substantially similar Disclaimer requirement for further</div><div class='add'>+ *    binary redistribution.</div><div class='add'>+ * 3. Neither the names of the above-listed copyright holders nor the names</div><div class='add'>+ *    of any contributors may be used to endorse or promote products derived</div><div class='add'>+ *    from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Alternatively, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") version 2 as published by the Free</div><div class='add'>+ * Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * NO WARRANTY</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS</div><div class='add'>+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT</div><div class='add'>+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL</div><div class='add'>+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS</div><div class='add'>+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)</div><div class='add'>+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,</div><div class='add'>+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING</div><div class='add'>+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE</div><div class='add'>+ * POSSIBILITY OF SUCH DAMAGES.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;acpi/acpi.h&gt;</div><div class='add'>+#include "accommon.h"</div><div class='add'>+#include "acnamesp.h"</div><div class='add'>+</div><div class='add'>+#define _COMPONENT          ACPI_UTILITIES</div><div class='add'>+ACPI_MODULE_NAME("utaddress")</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_ut_add_address_range</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  space_id            - Address space ID</div><div class='add'>+ *              Address             - op_region start address</div><div class='add'>+ *              Length              - op_region length</div><div class='add'>+ *              region_node         - op_region namespace node</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      Status</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Add the Operation Region address range to the global list.</div><div class='add'>+ *              The only supported Space IDs are Memory and I/O. Called when</div><div class='add'>+ *              the op_region address/length operands are fully evaluated.</div><div class='add'>+ *</div><div class='add'>+ * MUTEX:       Locks the namespace</div><div class='add'>+ *</div><div class='add'>+ * NOTE: Because this interface is only called when an op_region argument</div><div class='add'>+ * list is evaluated, there cannot be any duplicate region_nodes.</div><div class='add'>+ * Duplicate Address/Length values are allowed, however, so that multiple</div><div class='add'>+ * address conflicts can be detected.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+acpi_status</div><div class='add'>+acpi_ut_add_address_range(acpi_adr_space_type space_id,</div><div class='add'>+			  acpi_physical_address address,</div><div class='add'>+			  u32 length, struct acpi_namespace_node *region_node)</div><div class='add'>+{</div><div class='add'>+	struct acpi_address_range *range_info;</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_add_address_range);</div><div class='add'>+</div><div class='add'>+	if ((space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) &amp;&amp;</div><div class='add'>+	    (space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {</div><div class='add'>+		return_ACPI_STATUS(AE_OK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate/init a new info block, add it to the appropriate list */</div><div class='add'>+</div><div class='add'>+	range_info = ACPI_ALLOCATE(sizeof(struct acpi_address_range));</div><div class='add'>+	if (!range_info) {</div><div class='add'>+		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	range_info-&gt;start_address = address;</div><div class='add'>+	range_info-&gt;end_address = (address + length - 1);</div><div class='add'>+	range_info-&gt;region_node = region_node;</div><div class='add'>+</div><div class='add'>+	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		ACPI_FREE(range_info);</div><div class='add'>+		return_ACPI_STATUS(status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	range_info-&gt;next = acpi_gbl_address_range_list[space_id];</div><div class='add'>+	acpi_gbl_address_range_list[space_id] = range_info;</div><div class='add'>+</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_NAMES,</div><div class='add'>+			  "\nAdded [%4.4s] address range: 0x%p-0x%p\n",</div><div class='add'>+			  acpi_ut_get_node_name(range_info-&gt;region_node),</div><div class='add'>+			  ACPI_CAST_PTR(void, address),</div><div class='add'>+			  ACPI_CAST_PTR(void, range_info-&gt;end_address)));</div><div class='add'>+</div><div class='add'>+	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);</div><div class='add'>+	return_ACPI_STATUS(AE_OK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_ut_remove_address_range</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  space_id            - Address space ID</div><div class='add'>+ *              region_node         - op_region namespace node</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      None</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Remove the Operation Region from the global list. The only</div><div class='add'>+ *              supported Space IDs are Memory and I/O. Called when an</div><div class='add'>+ *              op_region is deleted.</div><div class='add'>+ *</div><div class='add'>+ * MUTEX:       Assumes the namespace is locked</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+acpi_ut_remove_address_range(acpi_adr_space_type space_id,</div><div class='add'>+			     struct acpi_namespace_node *region_node)</div><div class='add'>+{</div><div class='add'>+	struct acpi_address_range *range_info;</div><div class='add'>+	struct acpi_address_range *prev;</div><div class='add'>+</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_remove_address_range);</div><div class='add'>+</div><div class='add'>+	if ((space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) &amp;&amp;</div><div class='add'>+	    (space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {</div><div class='add'>+		return_VOID;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get the appropriate list head and check the list */</div><div class='add'>+</div><div class='add'>+	range_info = prev = acpi_gbl_address_range_list[space_id];</div><div class='add'>+	while (range_info) {</div><div class='add'>+		if (range_info-&gt;region_node == region_node) {</div><div class='add'>+			if (range_info == prev) {	/* Found at list head */</div><div class='add'>+				acpi_gbl_address_range_list[space_id] =</div><div class='add'>+				    range_info-&gt;next;</div><div class='add'>+			} else {</div><div class='add'>+				prev-&gt;next = range_info-&gt;next;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_NAMES,</div><div class='add'>+					  "\nRemoved [%4.4s] address range: 0x%p-0x%p\n",</div><div class='add'>+					  acpi_ut_get_node_name(range_info-&gt;</div><div class='add'>+								region_node),</div><div class='add'>+					  ACPI_CAST_PTR(void,</div><div class='add'>+							range_info-&gt;</div><div class='add'>+							start_address),</div><div class='add'>+					  ACPI_CAST_PTR(void,</div><div class='add'>+							range_info-&gt;</div><div class='add'>+							end_address)));</div><div class='add'>+</div><div class='add'>+			ACPI_FREE(range_info);</div><div class='add'>+			return_VOID;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		prev = range_info;</div><div class='add'>+		range_info = range_info-&gt;next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return_VOID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_ut_check_address_range</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  space_id            - Address space ID</div><div class='add'>+ *              Address             - Start address</div><div class='add'>+ *              Length              - Length of address range</div><div class='add'>+ *              Warn                - TRUE if warning on overlap desired</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      Count of the number of conflicts detected. Zero is always</div><div class='add'>+ *              returned for Space IDs other than Memory or I/O.</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Check if the input address range overlaps any of the</div><div class='add'>+ *              ASL operation region address ranges. The only supported</div><div class='add'>+ *              Space IDs are Memory and I/O.</div><div class='add'>+ *</div><div class='add'>+ * MUTEX:       Assumes the namespace is locked.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+u32</div><div class='add'>+acpi_ut_check_address_range(acpi_adr_space_type space_id,</div><div class='add'>+			    acpi_physical_address address, u32 length, u8 warn)</div><div class='add'>+{</div><div class='add'>+	struct acpi_address_range *range_info;</div><div class='add'>+	acpi_physical_address end_address;</div><div class='add'>+	char *pathname;</div><div class='add'>+	u32 overlap_count = 0;</div><div class='add'>+</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_check_address_range);</div><div class='add'>+</div><div class='add'>+	if ((space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) &amp;&amp;</div><div class='add'>+	    (space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {</div><div class='add'>+		return_UINT32(0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	range_info = acpi_gbl_address_range_list[space_id];</div><div class='add'>+	end_address = address + length - 1;</div><div class='add'>+</div><div class='add'>+	/* Check entire list for all possible conflicts */</div><div class='add'>+</div><div class='add'>+	while (range_info) {</div><div class='add'>+		/*</div><div class='add'>+		 * Check if the requested Address/Length overlaps this address_range.</div><div class='add'>+		 * Four cases to consider:</div><div class='add'>+		 *</div><div class='add'>+		 * 1) Input address/length is contained completely in the address range</div><div class='add'>+		 * 2) Input address/length overlaps range at the range start</div><div class='add'>+		 * 3) Input address/length overlaps range at the range end</div><div class='add'>+		 * 4) Input address/length completely encompasses the range</div><div class='add'>+		 */</div><div class='add'>+		if ((address &lt;= range_info-&gt;end_address) &amp;&amp;</div><div class='add'>+		    (end_address &gt;= range_info-&gt;start_address)) {</div><div class='add'>+</div><div class='add'>+			/* Found an address range overlap */</div><div class='add'>+</div><div class='add'>+			overlap_count++;</div><div class='add'>+			if (warn) {	/* Optional warning message */</div><div class='add'>+				pathname =</div><div class='add'>+				    acpi_ns_get_external_pathname(range_info-&gt;</div><div class='add'>+								  region_node);</div><div class='add'>+</div><div class='add'>+				ACPI_WARNING((AE_INFO,</div><div class='add'>+					      "0x%p-0x%p %s conflicts with Region %s %d",</div><div class='add'>+					      ACPI_CAST_PTR(void, address),</div><div class='add'>+					      ACPI_CAST_PTR(void, end_address),</div><div class='add'>+					      acpi_ut_get_region_name(space_id),</div><div class='add'>+					      pathname, overlap_count));</div><div class='add'>+				ACPI_FREE(pathname);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		range_info = range_info-&gt;next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return_UINT32(overlap_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_ut_delete_address_lists</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  None</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      None</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Delete all global address range lists (called during</div><div class='add'>+ *              subsystem shutdown).</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+void acpi_ut_delete_address_lists(void)</div><div class='add'>+{</div><div class='add'>+	struct acpi_address_range *next;</div><div class='add'>+	struct acpi_address_range *range_info;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Delete all elements in all address range lists */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ACPI_ADDRESS_RANGE_MAX; i++) {</div><div class='add'>+		next = acpi_gbl_address_range_list[i];</div><div class='add'>+</div><div class='add'>+		while (next) {</div><div class='add'>+			range_info = next;</div><div class='add'>+			next = range_info-&gt;next;</div><div class='add'>+			ACPI_FREE(range_info);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		acpi_gbl_address_range_list[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/acpi/acpica/utalloc.c b/drivers/acpi/acpica/utalloc.c<br/>index 0a697351cf69..9982d2ea66fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utalloc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utalloc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utalloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utalloc.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/utcopy.c b/drivers/acpi/acpica/utcopy.c<br/>index aded299a2fa8..3317c0a406ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utcopy.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utcopy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utcopy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utcopy.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c<br/>index a1f8d7509e66..a0998a886318 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utdebug.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utdebug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utdebug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utdebug.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c<br/>index 8b087e2d64f4..d42ede5260c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utdecode.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utdecode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utdecode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utdecode.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -171,7 +171,9 @@ const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {</div><div class='ctx'> 	"SMBus",</div><div class='ctx'> 	"SystemCMOS",</div><div class='ctx'> 	"PCIBARTarget",</div><div class='del'>-	"IPMI"</div><div class='add'>+	"IPMI",</div><div class='add'>+	"GeneralPurposeIo",</div><div class='add'>+	"GenericSerialBus"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> char *acpi_ut_get_region_name(u8 space_id)</div><div class='head'>diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c<br/>index 31f5a7832ef1..2a6c3e183697 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utdelete.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utdelete.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utdelete.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utdelete.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -215,11 +215,14 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,</div><div class='ctx'> 				  "***** Region %p\n", object));</div><div class='ctx'> </div><div class='del'>-		/* Invalidate the region address/length via the host OS */</div><div class='del'>-</div><div class='del'>-		acpi_os_invalidate_address(object-&gt;region.space_id,</div><div class='del'>-					  object-&gt;region.address,</div><div class='del'>-					  (acpi_size) object-&gt;region.length);</div><div class='add'>+		/*</div><div class='add'>+		 * Update address_range list. However, only permanent regions</div><div class='add'>+		 * are installed in this list. (Not created within a method)</div><div class='add'>+		 */</div><div class='add'>+		if (!(object-&gt;region.node-&gt;flags &amp; ANOBJ_TEMPORARY)) {</div><div class='add'>+			acpi_ut_remove_address_range(object-&gt;region.space_id,</div><div class='add'>+						     object-&gt;region.node);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		second_desc = acpi_ns_get_secondary_object(object);</div><div class='ctx'> 		if (second_desc) {</div><div class='head'>diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c<br/>index 18f73c9d10bc..479f32b33415 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/uteval.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/uteval.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/uteval.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/uteval.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c<br/>index ffba0a39c3e8..4153584cf526 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utglobal.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utglobal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utglobal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utglobal.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -264,6 +264,12 @@ acpi_status acpi_ut_init_globals(void)</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Address Range lists */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ACPI_ADDRESS_RANGE_MAX; i++) {</div><div class='add'>+		acpi_gbl_address_range_list[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Mutex locked flags */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ACPI_NUM_MUTEX; i++) {</div><div class='head'>diff --git a/drivers/acpi/acpica/utids.c b/drivers/acpi/acpica/utids.c<br/>index b679ea693545..c92eb1d93785 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utids.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utids.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utids.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utids.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/utinit.c b/drivers/acpi/acpica/utinit.c<br/>index 191b6828cce9..8359c0c5dc98 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utinit.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utinit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utinit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utinit.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -92,6 +92,7 @@ static void acpi_ut_terminate(void)</div><div class='ctx'> 		gpe_xrupt_info = next_gpe_xrupt_info;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	acpi_ut_delete_address_lists();</div><div class='ctx'> 	return_VOID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/acpica/utlock.c b/drivers/acpi/acpica/utlock.c<br/>index f6bb75c6faf5..155fd786d0f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utlock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utlock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utlock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utlock.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/utmath.c b/drivers/acpi/acpica/utmath.c<br/>index ce481da9bb45..2491a552b0e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utmath.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utmath.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utmath.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utmath.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/utmisc.c b/drivers/acpi/acpica/utmisc.c<br/>index c33a852d4f42..86f19db74e05 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utmisc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utmisc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utmisc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utmisc.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c<br/>index 7d797e2baecd..43174df33121 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utmutex.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utmutex.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utmutex.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utmutex.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -293,14 +293,10 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)</div><div class='ctx'> </div><div class='ctx'> acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)</div><div class='ctx'> {</div><div class='del'>-	acpi_thread_id this_thread_id;</div><div class='del'>-</div><div class='ctx'> 	ACPI_FUNCTION_NAME(ut_release_mutex);</div><div class='ctx'> </div><div class='del'>-	this_thread_id = acpi_os_get_thread_id();</div><div class='del'>-</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Thread %u releasing Mutex [%s]\n",</div><div class='del'>-			  (u32)this_thread_id,</div><div class='add'>+			  (u32)acpi_os_get_thread_id(),</div><div class='ctx'> 			  acpi_ut_get_mutex_name(mutex_id)));</div><div class='ctx'> </div><div class='ctx'> 	if (mutex_id &gt; ACPI_MAX_MUTEX) {</div><div class='hunk'>@@ -329,7 +325,8 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)</div><div class='ctx'> 		 * the ACPI subsystem code.</div><div class='ctx'> 		 */</div><div class='ctx'> 		for (i = mutex_id; i &lt; ACPI_NUM_MUTEX; i++) {</div><div class='del'>-			if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) {</div><div class='add'>+			if (acpi_gbl_mutex_info[i].thread_id ==</div><div class='add'>+			    acpi_os_get_thread_id()) {</div><div class='ctx'> 				if (i == mutex_id) {</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='head'>diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c<br/>index 188340a017b4..b112744fc9ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utobject.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utobject.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utobject.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utobject.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c<br/>index 1fb10cb8f11d..2360cf70c18c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utosi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utosi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utosi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utosi.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/utresrc.c b/drivers/acpi/acpica/utresrc.c<br/>index 6ffd3a8bdaa5..9d441ea70305 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utresrc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utresrc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utresrc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utresrc.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -43,7 +43,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> #include "accommon.h"</div><div class='del'>-#include "amlresrc.h"</div><div class='add'>+#include "acresrc.h"</div><div class='ctx'> </div><div class='ctx'> #define _COMPONENT          ACPI_UTILITIES</div><div class='ctx'> ACPI_MODULE_NAME("utresrc")</div><div class='hunk'>@@ -154,6 +154,138 @@ const char *acpi_gbl_typ_decode[] = {</div><div class='ctx'> 	"TypeF"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const char *acpi_gbl_ppc_decode[] = {</div><div class='add'>+	"PullDefault",</div><div class='add'>+	"PullUp",</div><div class='add'>+	"PullDown",</div><div class='add'>+	"PullNone"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char *acpi_gbl_ior_decode[] = {</div><div class='add'>+	"IoRestrictionNone",</div><div class='add'>+	"IoRestrictionInputOnly",</div><div class='add'>+	"IoRestrictionOutputOnly",</div><div class='add'>+	"IoRestrictionNoneAndPreserve"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char *acpi_gbl_dts_decode[] = {</div><div class='add'>+	"Width8bit",</div><div class='add'>+	"Width16bit",</div><div class='add'>+	"Width32bit",</div><div class='add'>+	"Width64bit",</div><div class='add'>+	"Width128bit",</div><div class='add'>+	"Width256bit",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* GPIO connection type */</div><div class='add'>+</div><div class='add'>+const char *acpi_gbl_ct_decode[] = {</div><div class='add'>+	"Interrupt",</div><div class='add'>+	"I/O"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Serial bus type */</div><div class='add'>+</div><div class='add'>+const char *acpi_gbl_sbt_decode[] = {</div><div class='add'>+	"/* UNKNOWN serial bus type */",</div><div class='add'>+	"I2C",</div><div class='add'>+	"SPI",</div><div class='add'>+	"UART"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* I2C serial bus access mode */</div><div class='add'>+</div><div class='add'>+const char *acpi_gbl_am_decode[] = {</div><div class='add'>+	"AddressingMode7Bit",</div><div class='add'>+	"AddressingMode10Bit"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* I2C serial bus slave mode */</div><div class='add'>+</div><div class='add'>+const char *acpi_gbl_sm_decode[] = {</div><div class='add'>+	"ControllerInitiated",</div><div class='add'>+	"DeviceInitiated"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SPI serial bus wire mode */</div><div class='add'>+</div><div class='add'>+const char *acpi_gbl_wm_decode[] = {</div><div class='add'>+	"FourWireMode",</div><div class='add'>+	"ThreeWireMode"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SPI serial clock phase */</div><div class='add'>+</div><div class='add'>+const char *acpi_gbl_cph_decode[] = {</div><div class='add'>+	"ClockPhaseFirst",</div><div class='add'>+	"ClockPhaseSecond"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SPI serial bus clock polarity */</div><div class='add'>+</div><div class='add'>+const char *acpi_gbl_cpo_decode[] = {</div><div class='add'>+	"ClockPolarityLow",</div><div class='add'>+	"ClockPolarityHigh"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SPI serial bus device polarity */</div><div class='add'>+</div><div class='add'>+const char *acpi_gbl_dp_decode[] = {</div><div class='add'>+	"PolarityLow",</div><div class='add'>+	"PolarityHigh"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* UART serial bus endian */</div><div class='add'>+</div><div class='add'>+const char *acpi_gbl_ed_decode[] = {</div><div class='add'>+	"LittleEndian",</div><div class='add'>+	"BigEndian"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* UART serial bus bits per byte */</div><div class='add'>+</div><div class='add'>+const char *acpi_gbl_bpb_decode[] = {</div><div class='add'>+	"DataBitsFive",</div><div class='add'>+	"DataBitsSix",</div><div class='add'>+	"DataBitsSeven",</div><div class='add'>+	"DataBitsEight",</div><div class='add'>+	"DataBitsNine",</div><div class='add'>+	"/* UNKNOWN Bits per byte */",</div><div class='add'>+	"/* UNKNOWN Bits per byte */",</div><div class='add'>+	"/* UNKNOWN Bits per byte */"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* UART serial bus stop bits */</div><div class='add'>+</div><div class='add'>+const char *acpi_gbl_sb_decode[] = {</div><div class='add'>+	"StopBitsNone",</div><div class='add'>+	"StopBitsOne",</div><div class='add'>+	"StopBitsOnePlusHalf",</div><div class='add'>+	"StopBitsTwo"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* UART serial bus flow control */</div><div class='add'>+</div><div class='add'>+const char *acpi_gbl_fc_decode[] = {</div><div class='add'>+	"FlowControlNone",</div><div class='add'>+	"FlowControlHardware",</div><div class='add'>+	"FlowControlXON",</div><div class='add'>+	"/* UNKNOWN flow control keyword */"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* UART serial bus parity type */</div><div class='add'>+</div><div class='add'>+const char *acpi_gbl_pt_decode[] = {</div><div class='add'>+	"ParityTypeNone",</div><div class='add'>+	"ParityTypeEven",</div><div class='add'>+	"ParityTypeOdd",</div><div class='add'>+	"ParityTypeMark",</div><div class='add'>+	"ParityTypeSpace",</div><div class='add'>+	"/* UNKNOWN parity keyword */",</div><div class='add'>+	"/* UNKNOWN parity keyword */",</div><div class='add'>+	"/* UNKNOWN parity keyword */"</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -173,7 +305,7 @@ const u8 acpi_gbl_resource_aml_sizes[] = {</div><div class='ctx'> 	ACPI_AML_SIZE_SMALL(struct aml_resource_end_dependent),</div><div class='ctx'> 	ACPI_AML_SIZE_SMALL(struct aml_resource_io),</div><div class='ctx'> 	ACPI_AML_SIZE_SMALL(struct aml_resource_fixed_io),</div><div class='del'>-	0,</div><div class='add'>+	ACPI_AML_SIZE_SMALL(struct aml_resource_fixed_dma),</div><div class='ctx'> 	0,</div><div class='ctx'> 	0,</div><div class='ctx'> 	0,</div><div class='hunk'>@@ -193,7 +325,17 @@ const u8 acpi_gbl_resource_aml_sizes[] = {</div><div class='ctx'> 	ACPI_AML_SIZE_LARGE(struct aml_resource_address16),</div><div class='ctx'> 	ACPI_AML_SIZE_LARGE(struct aml_resource_extended_irq),</div><div class='ctx'> 	ACPI_AML_SIZE_LARGE(struct aml_resource_address64),</div><div class='del'>-	ACPI_AML_SIZE_LARGE(struct aml_resource_extended_address64)</div><div class='add'>+	ACPI_AML_SIZE_LARGE(struct aml_resource_extended_address64),</div><div class='add'>+	ACPI_AML_SIZE_LARGE(struct aml_resource_gpio),</div><div class='add'>+	0,</div><div class='add'>+	ACPI_AML_SIZE_LARGE(struct aml_resource_common_serialbus),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const u8 acpi_gbl_resource_aml_serial_bus_sizes[] = {</div><div class='add'>+	0,</div><div class='add'>+	ACPI_AML_SIZE_LARGE(struct aml_resource_i2c_serialbus),</div><div class='add'>+	ACPI_AML_SIZE_LARGE(struct aml_resource_spi_serialbus),</div><div class='add'>+	ACPI_AML_SIZE_LARGE(struct aml_resource_uart_serialbus),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -209,35 +351,49 @@ static const u8 acpi_gbl_resource_types[] = {</div><div class='ctx'> 	0,</div><div class='ctx'> 	0,</div><div class='ctx'> 	0,</div><div class='del'>-	ACPI_SMALL_VARIABLE_LENGTH,</div><div class='del'>-	ACPI_FIXED_LENGTH,</div><div class='del'>-	ACPI_SMALL_VARIABLE_LENGTH,</div><div class='del'>-	ACPI_FIXED_LENGTH,</div><div class='del'>-	ACPI_FIXED_LENGTH,</div><div class='del'>-	ACPI_FIXED_LENGTH,</div><div class='del'>-	0,</div><div class='add'>+	ACPI_SMALL_VARIABLE_LENGTH,	/* 04 IRQ */</div><div class='add'>+	ACPI_FIXED_LENGTH,	/* 05 DMA */</div><div class='add'>+	ACPI_SMALL_VARIABLE_LENGTH,	/* 06 start_dependent_functions */</div><div class='add'>+	ACPI_FIXED_LENGTH,	/* 07 end_dependent_functions */</div><div class='add'>+	ACPI_FIXED_LENGTH,	/* 08 IO */</div><div class='add'>+	ACPI_FIXED_LENGTH,	/* 09 fixed_iO */</div><div class='add'>+	ACPI_FIXED_LENGTH,	/* 0_a fixed_dMA */</div><div class='ctx'> 	0,</div><div class='ctx'> 	0,</div><div class='ctx'> 	0,</div><div class='del'>-	ACPI_VARIABLE_LENGTH,</div><div class='del'>-	ACPI_FIXED_LENGTH,</div><div class='add'>+	ACPI_VARIABLE_LENGTH,	/* 0_e vendor_short */</div><div class='add'>+	ACPI_FIXED_LENGTH,	/* 0_f end_tag */</div><div class='ctx'> </div><div class='ctx'> 	/* Large descriptors */</div><div class='ctx'> </div><div class='ctx'> 	0,</div><div class='del'>-	ACPI_FIXED_LENGTH,</div><div class='del'>-	ACPI_FIXED_LENGTH,</div><div class='add'>+	ACPI_FIXED_LENGTH,	/* 01 Memory24 */</div><div class='add'>+	ACPI_FIXED_LENGTH,	/* 02 generic_register */</div><div class='ctx'> 	0,</div><div class='del'>-	ACPI_VARIABLE_LENGTH,</div><div class='del'>-	ACPI_FIXED_LENGTH,</div><div class='del'>-	ACPI_FIXED_LENGTH,</div><div class='del'>-	ACPI_VARIABLE_LENGTH,</div><div class='del'>-	ACPI_VARIABLE_LENGTH,</div><div class='del'>-	ACPI_VARIABLE_LENGTH,</div><div class='del'>-	ACPI_VARIABLE_LENGTH,</div><div class='del'>-	ACPI_FIXED_LENGTH</div><div class='add'>+	ACPI_VARIABLE_LENGTH,	/* 04 vendor_long */</div><div class='add'>+	ACPI_FIXED_LENGTH,	/* 05 Memory32 */</div><div class='add'>+	ACPI_FIXED_LENGTH,	/* 06 memory32_fixed */</div><div class='add'>+	ACPI_VARIABLE_LENGTH,	/* 07 Dword* address */</div><div class='add'>+	ACPI_VARIABLE_LENGTH,	/* 08 Word* address */</div><div class='add'>+	ACPI_VARIABLE_LENGTH,	/* 09 extended_iRQ */</div><div class='add'>+	ACPI_VARIABLE_LENGTH,	/* 0_a Qword* address */</div><div class='add'>+	ACPI_FIXED_LENGTH,	/* 0_b Extended* address */</div><div class='add'>+	ACPI_VARIABLE_LENGTH,	/* 0_c Gpio* */</div><div class='add'>+	0,</div><div class='add'>+	ACPI_VARIABLE_LENGTH	/* 0_e *serial_bus */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * For the i_aSL compiler/disassembler, we don't want any error messages</div><div class='add'>+ * because the disassembler uses the resource validation code to determine</div><div class='add'>+ * if Buffer objects are actually Resource Templates.</div><div class='add'>+ */</div><div class='add'>+#ifdef ACPI_ASL_COMPILER</div><div class='add'>+#define ACPI_RESOURCE_ERROR(plist)</div><div class='add'>+#else</div><div class='add'>+#define ACPI_RESOURCE_ERROR(plist)  ACPI_ERROR(plist)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_ut_walk_aml_resources</div><div class='hunk'>@@ -265,6 +421,7 @@ acpi_ut_walk_aml_resources(u8 * aml,</div><div class='ctx'> 	u8 resource_index;</div><div class='ctx'> 	u32 length;</div><div class='ctx'> 	u32 offset = 0;</div><div class='add'>+	u8 end_tag[2] = { 0x79, 0x00 };</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_TRACE(ut_walk_aml_resources);</div><div class='ctx'> </div><div class='hunk'>@@ -286,6 +443,10 @@ acpi_ut_walk_aml_resources(u8 * aml,</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ut_validate_resource(aml, &amp;resource_index);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Exit on failure. Cannot continue because the descriptor length</div><div class='add'>+			 * may be bogus also.</div><div class='add'>+			 */</div><div class='ctx'> 			return_ACPI_STATUS(status);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -300,7 +461,7 @@ acpi_ut_walk_aml_resources(u8 * aml,</div><div class='ctx'> 			    user_function(aml, length, offset, resource_index,</div><div class='ctx'> 					  context);</div><div class='ctx'> 			if (ACPI_FAILURE(status)) {</div><div class='del'>-				return (status);</div><div class='add'>+				return_ACPI_STATUS(status);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -333,7 +494,19 @@ acpi_ut_walk_aml_resources(u8 * aml,</div><div class='ctx'> </div><div class='ctx'> 	/* Did not find an end_tag descriptor */</div><div class='ctx'> </div><div class='del'>-	return (AE_AML_NO_RESOURCE_END_TAG);</div><div class='add'>+	if (user_function) {</div><div class='add'>+</div><div class='add'>+		/* Insert an end_tag anyway. acpi_rs_get_list_length always leaves room */</div><div class='add'>+</div><div class='add'>+		(void)acpi_ut_validate_resource(end_tag, &amp;resource_index);</div><div class='add'>+		status =</div><div class='add'>+		    user_function(end_tag, 2, offset, resource_index, context);</div><div class='add'>+		if (ACPI_FAILURE(status)) {</div><div class='add'>+			return_ACPI_STATUS(status);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -354,6 +527,7 @@ acpi_ut_walk_aml_resources(u8 * aml,</div><div class='ctx'> </div><div class='ctx'> acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)</div><div class='ctx'> {</div><div class='add'>+	union aml_resource *aml_resource;</div><div class='ctx'> 	u8 resource_type;</div><div class='ctx'> 	u8 resource_index;</div><div class='ctx'> 	acpi_rs_length resource_length;</div><div class='hunk'>@@ -375,7 +549,7 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)</div><div class='ctx'> 		/* Verify the large resource type (name) against the max */</div><div class='ctx'> </div><div class='ctx'> 		if (resource_type &gt; ACPI_RESOURCE_NAME_LARGE_MAX) {</div><div class='del'>-			return (AE_AML_INVALID_RESOURCE_TYPE);</div><div class='add'>+			goto invalid_resource;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -392,15 +566,17 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)</div><div class='ctx'> 		    ((resource_type &amp; ACPI_RESOURCE_NAME_SMALL_MASK) &gt;&gt; 3);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Check validity of the resource type, zero indicates name is invalid */</div><div class='del'>-</div><div class='add'>+	/*</div><div class='add'>+	 * Check validity of the resource type, via acpi_gbl_resource_types. Zero</div><div class='add'>+	 * indicates an invalid resource.</div><div class='add'>+	 */</div><div class='ctx'> 	if (!acpi_gbl_resource_types[resource_index]) {</div><div class='del'>-		return (AE_AML_INVALID_RESOURCE_TYPE);</div><div class='add'>+		goto invalid_resource;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * 2) Validate the resource_length field. This ensures that the length</div><div class='del'>-	 *    is at least reasonable, and guarantees that it is non-zero.</div><div class='add'>+	 * Validate the resource_length field. This ensures that the length</div><div class='add'>+	 * is at least reasonable, and guarantees that it is non-zero.</div><div class='ctx'> 	 */</div><div class='ctx'> 	resource_length = acpi_ut_get_resource_length(aml);</div><div class='ctx'> 	minimum_resource_length = acpi_gbl_resource_aml_sizes[resource_index];</div><div class='hunk'>@@ -413,7 +589,7 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)</div><div class='ctx'> 		/* Fixed length resource, length must match exactly */</div><div class='ctx'> </div><div class='ctx'> 		if (resource_length != minimum_resource_length) {</div><div class='del'>-			return (AE_AML_BAD_RESOURCE_LENGTH);</div><div class='add'>+			goto bad_resource_length;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -422,7 +598,7 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)</div><div class='ctx'> 		/* Variable length resource, length must be at least the minimum */</div><div class='ctx'> </div><div class='ctx'> 		if (resource_length &lt; minimum_resource_length) {</div><div class='del'>-			return (AE_AML_BAD_RESOURCE_LENGTH);</div><div class='add'>+			goto bad_resource_length;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -432,7 +608,7 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)</div><div class='ctx'> </div><div class='ctx'> 		if ((resource_length &gt; minimum_resource_length) ||</div><div class='ctx'> 		    (resource_length &lt; (minimum_resource_length - 1))) {</div><div class='del'>-			return (AE_AML_BAD_RESOURCE_LENGTH);</div><div class='add'>+			goto bad_resource_length;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -440,7 +616,23 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)</div><div class='ctx'> </div><div class='ctx'> 		/* Shouldn't happen (because of validation earlier), but be sure */</div><div class='ctx'> </div><div class='del'>-		return (AE_AML_INVALID_RESOURCE_TYPE);</div><div class='add'>+		goto invalid_resource;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	aml_resource = ACPI_CAST_PTR(union aml_resource, aml);</div><div class='add'>+	if (resource_type == ACPI_RESOURCE_NAME_SERIAL_BUS) {</div><div class='add'>+</div><div class='add'>+		/* Validate the bus_type field */</div><div class='add'>+</div><div class='add'>+		if ((aml_resource-&gt;common_serial_bus.type == 0) ||</div><div class='add'>+		    (aml_resource-&gt;common_serial_bus.type &gt;</div><div class='add'>+		     AML_RESOURCE_MAX_SERIALBUSTYPE)) {</div><div class='add'>+			ACPI_RESOURCE_ERROR((AE_INFO,</div><div class='add'>+					     "Invalid/unsupported SerialBus resource descriptor: BusType 0x%2.2X",</div><div class='add'>+					     aml_resource-&gt;common_serial_bus.</div><div class='add'>+					     type));</div><div class='add'>+			return (AE_AML_INVALID_RESOURCE_TYPE);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Optionally return the resource table index */</div><div class='hunk'>@@ -450,6 +642,22 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return (AE_OK);</div><div class='add'>+</div><div class='add'>+      invalid_resource:</div><div class='add'>+</div><div class='add'>+	ACPI_RESOURCE_ERROR((AE_INFO,</div><div class='add'>+			     "Invalid/unsupported resource descriptor: Type 0x%2.2X",</div><div class='add'>+			     resource_type));</div><div class='add'>+	return (AE_AML_INVALID_RESOURCE_TYPE);</div><div class='add'>+</div><div class='add'>+      bad_resource_length:</div><div class='add'>+</div><div class='add'>+	ACPI_RESOURCE_ERROR((AE_INFO,</div><div class='add'>+			     "Invalid resource descriptor length: Type "</div><div class='add'>+			     "0x%2.2X, Length 0x%4.4X, MinLength 0x%4.4X",</div><div class='add'>+			     resource_type, resource_length,</div><div class='add'>+			     minimum_resource_length));</div><div class='add'>+	return (AE_AML_BAD_RESOURCE_LENGTH);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='head'>diff --git a/drivers/acpi/acpica/utstate.c b/drivers/acpi/acpica/utstate.c<br/>index 30c21e1a9360..4267477c2797 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utstate.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utstate.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utstate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utstate.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/utxface.c b/drivers/acpi/acpica/utxface.c<br/>index 420ebfe08c72..644e8c8ebc4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utxface.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utxface.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utxface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utxface.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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'>@@ -48,6 +48,7 @@</div><div class='ctx'> #include "acnamesp.h"</div><div class='ctx'> #include "acdebug.h"</div><div class='ctx'> #include "actables.h"</div><div class='add'>+#include "acinterp.h"</div><div class='ctx'> </div><div class='ctx'> #define _COMPONENT          ACPI_UTILITIES</div><div class='ctx'> ACPI_MODULE_NAME("utxface")</div><div class='hunk'>@@ -640,4 +641,41 @@ acpi_status acpi_install_interface_handler(acpi_interface_handler handler)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ACPI_EXPORT_SYMBOL(acpi_install_interface_handler)</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_check_address_range</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  space_id            - Address space ID</div><div class='add'>+ *              Address             - Start address</div><div class='add'>+ *              Length              - Length</div><div class='add'>+ *              Warn                - TRUE if warning on overlap desired</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      Count of the number of conflicts detected.</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Check if the input address range overlaps any of the</div><div class='add'>+ *              ASL operation region address ranges.</div><div class='add'>+ *</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+u32</div><div class='add'>+acpi_check_address_range(acpi_adr_space_type space_id,</div><div class='add'>+			 acpi_physical_address address,</div><div class='add'>+			 acpi_size length, u8 warn)</div><div class='add'>+{</div><div class='add'>+	u32 overlaps;</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return (0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	overlaps = acpi_ut_check_address_range(space_id, address,</div><div class='add'>+					       (u32)length, warn);</div><div class='add'>+</div><div class='add'>+	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);</div><div class='add'>+	return (overlaps);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_check_address_range)</div><div class='ctx'> #endif				/* !ACPI_ASL_COMPILER */</div><div class='head'>diff --git a/drivers/acpi/acpica/utxferror.c b/drivers/acpi/acpica/utxferror.c<br/>index 8d0245ec4315..52b568af1819 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utxferror.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/acpica/utxferror.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utxferror.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utxferror.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2000 - 2011, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</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='head'>diff --git a/drivers/acpi/acpica/utxfmutex.c b/drivers/acpi/acpica/utxfmutex.c<br/>new file mode 100644<br/>index 000000000000..1427d191d15a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpica/utxfmutex.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/acpica/utxfmutex.c</a></div><div class='hunk'>@@ -0,0 +1,187 @@</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Module Name: utxfmutex - external AML mutex access functions</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2000 - 2012, Intel Corp.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions, and the following disclaimer,</div><div class='add'>+ *    without modification.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer</div><div class='add'>+ *    substantially similar to the "NO WARRANTY" disclaimer below</div><div class='add'>+ *    ("Disclaimer") and any redistribution must be conditioned upon</div><div class='add'>+ *    including a substantially similar Disclaimer requirement for further</div><div class='add'>+ *    binary redistribution.</div><div class='add'>+ * 3. Neither the names of the above-listed copyright holders nor the names</div><div class='add'>+ *    of any contributors may be used to endorse or promote products derived</div><div class='add'>+ *    from this software without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * Alternatively, this software may be distributed under the terms of the</div><div class='add'>+ * GNU General Public License ("GPL") version 2 as published by the Free</div><div class='add'>+ * Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * NO WARRANTY</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS</div><div class='add'>+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT</div><div class='add'>+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL</div><div class='add'>+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS</div><div class='add'>+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)</div><div class='add'>+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,</div><div class='add'>+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING</div><div class='add'>+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE</div><div class='add'>+ * POSSIBILITY OF SUCH DAMAGES.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;acpi/acpi.h&gt;</div><div class='add'>+#include "accommon.h"</div><div class='add'>+#include "acnamesp.h"</div><div class='add'>+</div><div class='add'>+#define _COMPONENT          ACPI_UTILITIES</div><div class='add'>+ACPI_MODULE_NAME("utxfmutex")</div><div class='add'>+</div><div class='add'>+/* Local prototypes */</div><div class='add'>+static acpi_status</div><div class='add'>+acpi_ut_get_mutex_object(acpi_handle handle,</div><div class='add'>+			 acpi_string pathname,</div><div class='add'>+			 union acpi_operand_object **ret_obj);</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_ut_get_mutex_object</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  Handle              - Mutex or prefix handle (optional)</div><div class='add'>+ *              Pathname            - Mutex pathname (optional)</div><div class='add'>+ *              ret_obj             - Where the mutex object is returned</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      Status</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Get an AML mutex object. The mutex node is pointed to by</div><div class='add'>+ *              Handle:Pathname. Either Handle or Pathname can be NULL, but</div><div class='add'>+ *              not both.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+static acpi_status</div><div class='add'>+acpi_ut_get_mutex_object(acpi_handle handle,</div><div class='add'>+			 acpi_string pathname,</div><div class='add'>+			 union acpi_operand_object **ret_obj)</div><div class='add'>+{</div><div class='add'>+	struct acpi_namespace_node *mutex_node;</div><div class='add'>+	union acpi_operand_object *mutex_obj;</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	/* Parameter validation */</div><div class='add'>+</div><div class='add'>+	if (!ret_obj || (!handle &amp;&amp; !pathname)) {</div><div class='add'>+		return (AE_BAD_PARAMETER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get a the namespace node for the mutex */</div><div class='add'>+</div><div class='add'>+	mutex_node = handle;</div><div class='add'>+	if (pathname != NULL) {</div><div class='add'>+		status = acpi_get_handle(handle, pathname,</div><div class='add'>+					 ACPI_CAST_PTR(acpi_handle,</div><div class='add'>+						       &amp;mutex_node));</div><div class='add'>+		if (ACPI_FAILURE(status)) {</div><div class='add'>+			return (status);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ensure that we actually have a Mutex object */</div><div class='add'>+</div><div class='add'>+	if (!mutex_node || (mutex_node-&gt;type != ACPI_TYPE_MUTEX)) {</div><div class='add'>+		return (AE_TYPE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get the low-level mutex object */</div><div class='add'>+</div><div class='add'>+	mutex_obj = acpi_ns_get_attached_object(mutex_node);</div><div class='add'>+	if (!mutex_obj) {</div><div class='add'>+		return (AE_NULL_OBJECT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*ret_obj = mutex_obj;</div><div class='add'>+	return (AE_OK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_acquire_mutex</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  Handle              - Mutex or prefix handle (optional)</div><div class='add'>+ *              Pathname            - Mutex pathname (optional)</div><div class='add'>+ *              Timeout             - Max time to wait for the lock (millisec)</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      Status</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Acquire an AML mutex. This is a device driver interface to</div><div class='add'>+ *              AML mutex objects, and allows for transaction locking between</div><div class='add'>+ *              drivers and AML code. The mutex node is pointed to by</div><div class='add'>+ *              Handle:Pathname. Either Handle or Pathname can be NULL, but</div><div class='add'>+ *              not both.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+acpi_status</div><div class='add'>+acpi_acquire_mutex(acpi_handle handle, acpi_string pathname, u16 timeout)</div><div class='add'>+{</div><div class='add'>+	acpi_status status;</div><div class='add'>+	union acpi_operand_object *mutex_obj;</div><div class='add'>+</div><div class='add'>+	/* Get the low-level mutex associated with Handle:Pathname */</div><div class='add'>+</div><div class='add'>+	status = acpi_ut_get_mutex_object(handle, pathname, &amp;mutex_obj);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return (status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Acquire the OS mutex */</div><div class='add'>+</div><div class='add'>+	status = acpi_os_acquire_mutex(mutex_obj-&gt;mutex.os_mutex, timeout);</div><div class='add'>+	return (status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_release_mutex</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  Handle              - Mutex or prefix handle (optional)</div><div class='add'>+ *              Pathname            - Mutex pathname (optional)</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      Status</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Release an AML mutex. This is a device driver interface to</div><div class='add'>+ *              AML mutex objects, and allows for transaction locking between</div><div class='add'>+ *              drivers and AML code. The mutex node is pointed to by</div><div class='add'>+ *              Handle:Pathname. Either Handle or Pathname can be NULL, but</div><div class='add'>+ *              not both.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+acpi_status acpi_release_mutex(acpi_handle handle, acpi_string pathname)</div><div class='add'>+{</div><div class='add'>+	acpi_status status;</div><div class='add'>+	union acpi_operand_object *mutex_obj;</div><div class='add'>+</div><div class='add'>+	/* Get the low-level mutex associated with Handle:Pathname */</div><div class='add'>+</div><div class='add'>+	status = acpi_ut_get_mutex_object(handle, pathname, &amp;mutex_obj);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return (status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Release the OS mutex */</div><div class='add'>+</div><div class='add'>+	acpi_os_release_mutex(mutex_obj-&gt;mutex.os_mutex);</div><div class='add'>+	return (AE_OK);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c<br/>index 61540360d5ce..e45350cb6ac8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/apei/apei-base.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/apei/apei-base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/apei/apei-base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/apei/apei-base.c</a></div><div class='hunk'>@@ -34,13 +34,13 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/acpi_io.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='del'>-#include &lt;acpi/atomicio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "apei-internal.h"</div><div class='ctx'> </div><div class='hunk'>@@ -70,7 +70,7 @@ int __apei_exec_read_register(struct acpi_whea_header *entry, u64 *val)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = acpi_atomic_read(val, &amp;entry-&gt;register_region);</div><div class='add'>+	rc = apei_read(val, &amp;entry-&gt;register_region);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	*val &gt;&gt;= entry-&gt;register_region.bit_offset;</div><div class='hunk'>@@ -116,13 +116,13 @@ int __apei_exec_write_register(struct acpi_whea_header *entry, u64 val)</div><div class='ctx'> 	val &lt;&lt;= entry-&gt;register_region.bit_offset;</div><div class='ctx'> 	if (entry-&gt;flags &amp; APEI_EXEC_PRESERVE_REGISTER) {</div><div class='ctx'> 		u64 valr = 0;</div><div class='del'>-		rc = acpi_atomic_read(&amp;valr, &amp;entry-&gt;register_region);</div><div class='add'>+		rc = apei_read(&amp;valr, &amp;entry-&gt;register_region);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 		valr &amp;= ~(entry-&gt;mask &lt;&lt; entry-&gt;register_region.bit_offset);</div><div class='ctx'> 		val |= valr;</div><div class='ctx'> 	}</div><div class='del'>-	rc = acpi_atomic_write(val, &amp;entry-&gt;register_region);</div><div class='add'>+	rc = apei_write(val, &amp;entry-&gt;register_region);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -243,7 +243,7 @@ static int pre_map_gar_callback(struct apei_exec_context *ctx,</div><div class='ctx'> 	u8 ins = entry-&gt;instruction;</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;ins_table[ins].flags &amp; APEI_EXEC_INS_ACCESS_REGISTER)</div><div class='del'>-		return acpi_pre_map_gar(&amp;entry-&gt;register_region);</div><div class='add'>+		return acpi_os_map_generic_address(&amp;entry-&gt;register_region);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -276,7 +276,7 @@ static int post_unmap_gar_callback(struct apei_exec_context *ctx,</div><div class='ctx'> 	u8 ins = entry-&gt;instruction;</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;ins_table[ins].flags &amp; APEI_EXEC_INS_ACCESS_REGISTER)</div><div class='del'>-		acpi_post_unmap_gar(&amp;entry-&gt;register_region);</div><div class='add'>+		acpi_os_unmap_generic_address(&amp;entry-&gt;register_region);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -421,6 +421,17 @@ static int apei_resources_merge(struct apei_resources *resources1,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int apei_resources_add(struct apei_resources *resources,</div><div class='add'>+		       unsigned long start, unsigned long size,</div><div class='add'>+		       bool iomem)</div><div class='add'>+{</div><div class='add'>+	if (iomem)</div><div class='add'>+		return apei_res_add(&amp;resources-&gt;iomem, start, size);</div><div class='add'>+	else</div><div class='add'>+		return apei_res_add(&amp;resources-&gt;ioport, start, size);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(apei_resources_add);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * EINJ has two groups of GARs (EINJ table entry and trigger table</div><div class='ctx'>  * entry), so common resources are subtracted from the trigger table</div><div class='hunk'>@@ -438,8 +449,19 @@ int apei_resources_sub(struct apei_resources *resources1,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(apei_resources_sub);</div><div class='ctx'> </div><div class='add'>+static int apei_get_nvs_callback(__u64 start, __u64 size, void *data)</div><div class='add'>+{</div><div class='add'>+	struct apei_resources *resources = data;</div><div class='add'>+	return apei_res_add(&amp;resources-&gt;iomem, start, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int apei_get_nvs_resources(struct apei_resources *resources)</div><div class='add'>+{</div><div class='add'>+	return acpi_nvs_for_each_region(apei_get_nvs_callback, resources);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * IO memory/port rersource management mechanism is used to check</div><div class='add'>+ * IO memory/port resource management mechanism is used to check</div><div class='ctx'>  * whether memory/port area used by GARs conflicts with normal memory</div><div class='ctx'>  * or IO memory/port of devices.</div><div class='ctx'>  */</div><div class='hunk'>@@ -448,21 +470,35 @@ int apei_resources_request(struct apei_resources *resources,</div><div class='ctx'> {</div><div class='ctx'> 	struct apei_res *res, *res_bak = NULL;</div><div class='ctx'> 	struct resource *r;</div><div class='add'>+	struct apei_resources nvs_resources;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = apei_resources_sub(resources, &amp;apei_resources_all);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Some firmware uses ACPI NVS region, that has been marked as</div><div class='add'>+	 * busy, so exclude it from APEI resources to avoid false</div><div class='add'>+	 * conflict.</div><div class='add'>+	 */</div><div class='add'>+	apei_resources_init(&amp;nvs_resources);</div><div class='add'>+	rc = apei_get_nvs_resources(&amp;nvs_resources);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto res_fini;</div><div class='add'>+	rc = apei_resources_sub(resources, &amp;nvs_resources);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto res_fini;</div><div class='add'>+</div><div class='ctx'> 	rc = -EINVAL;</div><div class='ctx'> 	list_for_each_entry(res, &amp;resources-&gt;iomem, list) {</div><div class='ctx'> 		r = request_mem_region(res-&gt;start, res-&gt;end - res-&gt;start,</div><div class='ctx'> 				       desc);</div><div class='ctx'> 		if (!r) {</div><div class='ctx'> 			pr_err(APEI_PFX</div><div class='del'>-		"Can not request iomem region &lt;%016llx-%016llx&gt; for GARs.\n",</div><div class='add'>+		"Can not request [mem %#010llx-%#010llx] for %s registers\n",</div><div class='ctx'> 			       (unsigned long long)res-&gt;start,</div><div class='del'>-			       (unsigned long long)res-&gt;end);</div><div class='add'>+			       (unsigned long long)res-&gt;end - 1, desc);</div><div class='ctx'> 			res_bak = res;</div><div class='ctx'> 			goto err_unmap_iomem;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -472,9 +508,9 @@ int apei_resources_request(struct apei_resources *resources,</div><div class='ctx'> 		r = request_region(res-&gt;start, res-&gt;end - res-&gt;start, desc);</div><div class='ctx'> 		if (!r) {</div><div class='ctx'> 			pr_err(APEI_PFX</div><div class='del'>-		"Can not request ioport region &lt;%016llx-%016llx&gt; for GARs.\n",</div><div class='add'>+		"Can not request [io  %#06llx-%#06llx] for %s registers\n",</div><div class='ctx'> 			       (unsigned long long)res-&gt;start,</div><div class='del'>-			       (unsigned long long)res-&gt;end);</div><div class='add'>+			       (unsigned long long)res-&gt;end - 1, desc);</div><div class='ctx'> 			res_bak = res;</div><div class='ctx'> 			goto err_unmap_ioport;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -500,6 +536,8 @@ err_unmap_iomem:</div><div class='ctx'> 			break;</div><div class='ctx'> 		release_mem_region(res-&gt;start, res-&gt;end - res-&gt;start);</div><div class='ctx'> 	}</div><div class='add'>+res_fini:</div><div class='add'>+	apei_resources_fini(&amp;nvs_resources);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(apei_resources_request);</div><div class='hunk'>@@ -553,6 +591,96 @@ static int apei_check_gar(struct acpi_generic_address *reg, u64 *paddr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* read GAR in interrupt (including NMI) or process context */</div><div class='add'>+int apei_read(u64 *val, struct acpi_generic_address *reg)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	u64 address;</div><div class='add'>+	u32 tmp, width = reg-&gt;bit_width;</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	rc = apei_check_gar(reg, &amp;address);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (width == 64)</div><div class='add'>+		width = 32;	/* Break into two 32-bit transfers */</div><div class='add'>+</div><div class='add'>+	*val = 0;</div><div class='add'>+	switch(reg-&gt;space_id) {</div><div class='add'>+	case ACPI_ADR_SPACE_SYSTEM_MEMORY:</div><div class='add'>+		status = acpi_os_read_memory((acpi_physical_address)</div><div class='add'>+					     address, &amp;tmp, width);</div><div class='add'>+		if (ACPI_FAILURE(status))</div><div class='add'>+			return -EIO;</div><div class='add'>+		*val = tmp;</div><div class='add'>+</div><div class='add'>+		if (reg-&gt;bit_width == 64) {</div><div class='add'>+			/* Read the top 32 bits */</div><div class='add'>+			status = acpi_os_read_memory((acpi_physical_address)</div><div class='add'>+						     (address + 4), &amp;tmp, 32);</div><div class='add'>+			if (ACPI_FAILURE(status))</div><div class='add'>+				return -EIO;</div><div class='add'>+			*val |= ((u64)tmp &lt;&lt; 32);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case ACPI_ADR_SPACE_SYSTEM_IO:</div><div class='add'>+		status = acpi_os_read_port(address, (u32 *)val, reg-&gt;bit_width);</div><div class='add'>+		if (ACPI_FAILURE(status))</div><div class='add'>+			return -EIO;</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'>+EXPORT_SYMBOL_GPL(apei_read);</div><div class='add'>+</div><div class='add'>+/* write GAR in interrupt (including NMI) or process context */</div><div class='add'>+int apei_write(u64 val, struct acpi_generic_address *reg)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	u64 address;</div><div class='add'>+	u32 width = reg-&gt;bit_width;</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	rc = apei_check_gar(reg, &amp;address);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (width == 64)</div><div class='add'>+		width = 32;	/* Break into two 32-bit transfers */</div><div class='add'>+</div><div class='add'>+	switch (reg-&gt;space_id) {</div><div class='add'>+	case ACPI_ADR_SPACE_SYSTEM_MEMORY:</div><div class='add'>+		status = acpi_os_write_memory((acpi_physical_address)</div><div class='add'>+					      address, ACPI_LODWORD(val),</div><div class='add'>+					      width);</div><div class='add'>+		if (ACPI_FAILURE(status))</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='add'>+		if (reg-&gt;bit_width == 64) {</div><div class='add'>+			status = acpi_os_write_memory((acpi_physical_address)</div><div class='add'>+						      (address + 4),</div><div class='add'>+						      ACPI_HIDWORD(val), 32);</div><div class='add'>+			if (ACPI_FAILURE(status))</div><div class='add'>+				return -EIO;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case ACPI_ADR_SPACE_SYSTEM_IO:</div><div class='add'>+		status = acpi_os_write_port(address, val, reg-&gt;bit_width);</div><div class='add'>+		if (ACPI_FAILURE(status))</div><div class='add'>+			return -EIO;</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'>+EXPORT_SYMBOL_GPL(apei_write);</div><div class='add'>+</div><div class='ctx'> static int collect_res_callback(struct apei_exec_context *ctx,</div><div class='ctx'> 				struct acpi_whea_header *entry,</div><div class='ctx'> 				void *data)</div><div class='head'>diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h<br/>index f57050e7a5e7..cca240a33038 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/apei/apei-internal.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/apei/apei-internal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/apei/apei-internal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/apei/apei-internal.h</a></div><div class='hunk'>@@ -68,6 +68,9 @@ static inline int apei_exec_run_optional(struct apei_exec_context *ctx, u8 actio</div><div class='ctx'> /* IP has been set in instruction function */</div><div class='ctx'> #define APEI_EXEC_SET_IP	1</div><div class='ctx'> </div><div class='add'>+int apei_read(u64 *val, struct acpi_generic_address *reg);</div><div class='add'>+int apei_write(u64 val, struct acpi_generic_address *reg);</div><div class='add'>+</div><div class='ctx'> int __apei_exec_read_register(struct acpi_whea_header *entry, u64 *val);</div><div class='ctx'> int __apei_exec_write_register(struct acpi_whea_header *entry, u64 val);</div><div class='ctx'> int apei_exec_read_register(struct apei_exec_context *ctx,</div><div class='hunk'>@@ -95,6 +98,9 @@ static inline void apei_resources_init(struct apei_resources *resources)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void apei_resources_fini(struct apei_resources *resources);</div><div class='add'>+int apei_resources_add(struct apei_resources *resources,</div><div class='add'>+		       unsigned long start, unsigned long size,</div><div class='add'>+		       bool iomem);</div><div class='ctx'> int apei_resources_sub(struct apei_resources *resources1,</div><div class='ctx'> 		       struct apei_resources *resources2);</div><div class='ctx'> int apei_resources_request(struct apei_resources *resources,</div><div class='head'>diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c<br/>index 589b96c38704..5b898d4dda99 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/apei/einj.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/apei/einj.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/apei/einj.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/apei/einj.c</a></div><div class='hunk'>@@ -43,6 +43,42 @@</div><div class='ctx'> #define FIRMWARE_TIMEOUT	(1 * NSEC_PER_MSEC)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * ACPI version 5 provides a SET_ERROR_TYPE_WITH_ADDRESS action.</div><div class='add'>+ */</div><div class='add'>+static int acpi5;</div><div class='add'>+</div><div class='add'>+struct set_error_type_with_address {</div><div class='add'>+	u32	type;</div><div class='add'>+	u32	vendor_extension;</div><div class='add'>+	u32	flags;</div><div class='add'>+	u32	apicid;</div><div class='add'>+	u64	memory_address;</div><div class='add'>+	u64	memory_address_range;</div><div class='add'>+	u32	pcie_sbdf;</div><div class='add'>+};</div><div class='add'>+enum {</div><div class='add'>+	SETWA_FLAGS_APICID = 1,</div><div class='add'>+	SETWA_FLAGS_MEM = 2,</div><div class='add'>+	SETWA_FLAGS_PCIE_SBDF = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Vendor extensions for platform specific operations</div><div class='add'>+ */</div><div class='add'>+struct vendor_error_type_extension {</div><div class='add'>+	u32	length;</div><div class='add'>+	u32	pcie_sbdf;</div><div class='add'>+	u16	vendor_id;</div><div class='add'>+	u16	device_id;</div><div class='add'>+	u8	rev_id;</div><div class='add'>+	u8	reserved[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 vendor_flags;</div><div class='add'>+static struct debugfs_blob_wrapper vendor_blob;</div><div class='add'>+static char vendor_dev[64];</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Some BIOSes allow parameters to the SET_ERROR_TYPE entries in the</div><div class='ctx'>  * EINJ table through an unpublished extension. Use with caution as</div><div class='ctx'>  * most will ignore the parameter and make their own choice of address</div><div class='hunk'>@@ -103,7 +139,14 @@ static struct apei_exec_ins_type einj_ins_type[] = {</div><div class='ctx'>  */</div><div class='ctx'> static DEFINE_MUTEX(einj_mutex);</div><div class='ctx'> </div><div class='del'>-static struct einj_parameter *einj_param;</div><div class='add'>+static void *einj_param;</div><div class='add'>+</div><div class='add'>+#ifndef readq</div><div class='add'>+static inline __u64 readq(volatile void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	return ((__u64)readl(addr+4) &lt;&lt; 32) + readl(addr);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifndef writeq</div><div class='ctx'> static inline void writeq(__u64 val, volatile void __iomem *addr)</div><div class='hunk'>@@ -158,10 +201,31 @@ static int einj_timedout(u64 *t)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u64 einj_get_parameter_address(void)</div><div class='add'>+static void check_vendor_extension(u64 paddr,</div><div class='add'>+				   struct set_error_type_with_address *v5param)</div><div class='add'>+{</div><div class='add'>+	int	offset = readl(&amp;v5param-&gt;vendor_extension);</div><div class='add'>+	struct	vendor_error_type_extension *v;</div><div class='add'>+	u32	sbdf;</div><div class='add'>+</div><div class='add'>+	if (!offset)</div><div class='add'>+		return;</div><div class='add'>+	v = ioremap(paddr + offset, sizeof(*v));</div><div class='add'>+	if (!v)</div><div class='add'>+		return;</div><div class='add'>+	sbdf = readl(&amp;v-&gt;pcie_sbdf);</div><div class='add'>+	sprintf(vendor_dev, "%x:%x:%x.%x vendor_id=%x device_id=%x rev_id=%x\n",</div><div class='add'>+		sbdf &gt;&gt; 24, (sbdf &gt;&gt; 16) &amp; 0xff,</div><div class='add'>+		(sbdf &gt;&gt; 11) &amp; 0x1f, (sbdf &gt;&gt; 8) &amp; 0x7,</div><div class='add'>+		 readw(&amp;v-&gt;vendor_id), readw(&amp;v-&gt;device_id),</div><div class='add'>+		readb(&amp;v-&gt;rev_id));</div><div class='add'>+	iounmap(v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *einj_get_parameter_address(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	u64 paddr = 0;</div><div class='add'>+	u64 paddrv4 = 0, paddrv5 = 0;</div><div class='ctx'> 	struct acpi_whea_header *entry;</div><div class='ctx'> </div><div class='ctx'> 	entry = EINJ_TAB_ENTRY(einj_tab);</div><div class='hunk'>@@ -170,12 +234,40 @@ static u64 einj_get_parameter_address(void)</div><div class='ctx'> 		    entry-&gt;instruction == ACPI_EINJ_WRITE_REGISTER &amp;&amp;</div><div class='ctx'> 		    entry-&gt;register_region.space_id ==</div><div class='ctx'> 		    ACPI_ADR_SPACE_SYSTEM_MEMORY)</div><div class='del'>-			memcpy(&amp;paddr, &amp;entry-&gt;register_region.address,</div><div class='del'>-			       sizeof(paddr));</div><div class='add'>+			memcpy(&amp;paddrv4, &amp;entry-&gt;register_region.address,</div><div class='add'>+			       sizeof(paddrv4));</div><div class='add'>+		if (entry-&gt;action == ACPI_EINJ_SET_ERROR_TYPE_WITH_ADDRESS &amp;&amp;</div><div class='add'>+		    entry-&gt;instruction == ACPI_EINJ_WRITE_REGISTER &amp;&amp;</div><div class='add'>+		    entry-&gt;register_region.space_id ==</div><div class='add'>+		    ACPI_ADR_SPACE_SYSTEM_MEMORY)</div><div class='add'>+			memcpy(&amp;paddrv5, &amp;entry-&gt;register_region.address,</div><div class='add'>+			       sizeof(paddrv5));</div><div class='ctx'> 		entry++;</div><div class='ctx'> 	}</div><div class='add'>+	if (paddrv5) {</div><div class='add'>+		struct set_error_type_with_address *v5param;</div><div class='add'>+</div><div class='add'>+		v5param = ioremap(paddrv5, sizeof(*v5param));</div><div class='add'>+		if (v5param) {</div><div class='add'>+			acpi5 = 1;</div><div class='add'>+			check_vendor_extension(paddrv5, v5param);</div><div class='add'>+			return v5param;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (paddrv4) {</div><div class='add'>+		struct einj_parameter *v4param;</div><div class='add'>+</div><div class='add'>+		v4param = ioremap(paddrv4, sizeof(*v4param));</div><div class='add'>+		if (!v4param)</div><div class='add'>+			return 0;</div><div class='add'>+		if (readq(&amp;v4param-&gt;reserved1) || readq(&amp;v4param-&gt;reserved2)) {</div><div class='add'>+			iounmap(v4param);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		return v4param;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return paddr;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* do sanity check to trigger table */</div><div class='hunk'>@@ -194,8 +286,29 @@ static int einj_check_trigger_header(struct acpi_einj_trigger *trigger_tab)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct acpi_generic_address *einj_get_trigger_parameter_region(</div><div class='add'>+	struct acpi_einj_trigger *trigger_tab, u64 param1, u64 param2)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct acpi_whea_header *entry;</div><div class='add'>+</div><div class='add'>+	entry = (struct acpi_whea_header *)</div><div class='add'>+		((char *)trigger_tab + sizeof(struct acpi_einj_trigger));</div><div class='add'>+	for (i = 0; i &lt; trigger_tab-&gt;entry_count; i++) {</div><div class='add'>+		if (entry-&gt;action == ACPI_EINJ_TRIGGER_ERROR &amp;&amp;</div><div class='add'>+		entry-&gt;instruction == ACPI_EINJ_WRITE_REGISTER_VALUE &amp;&amp;</div><div class='add'>+		entry-&gt;register_region.space_id ==</div><div class='add'>+			ACPI_ADR_SPACE_SYSTEM_MEMORY &amp;&amp;</div><div class='add'>+		(entry-&gt;register_region.address &amp; param2) == (param1 &amp; param2))</div><div class='add'>+			return &amp;entry-&gt;register_region;</div><div class='add'>+		entry++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='ctx'> /* Execute instructions in trigger error action table */</div><div class='del'>-static int __einj_error_trigger(u64 trigger_paddr)</div><div class='add'>+static int __einj_error_trigger(u64 trigger_paddr, u32 type,</div><div class='add'>+				u64 param1, u64 param2)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_einj_trigger *trigger_tab = NULL;</div><div class='ctx'> 	struct apei_exec_context trigger_ctx;</div><div class='hunk'>@@ -204,14 +317,16 @@ static int __einj_error_trigger(u64 trigger_paddr)</div><div class='ctx'> 	struct resource *r;</div><div class='ctx'> 	u32 table_size;</div><div class='ctx'> 	int rc = -EIO;</div><div class='add'>+	struct acpi_generic_address *trigger_param_region = NULL;</div><div class='ctx'> </div><div class='ctx'> 	r = request_mem_region(trigger_paddr, sizeof(*trigger_tab),</div><div class='ctx'> 			       "APEI EINJ Trigger Table");</div><div class='ctx'> 	if (!r) {</div><div class='ctx'> 		pr_err(EINJ_PFX</div><div class='del'>-	"Can not request iomem region &lt;%016llx-%016llx&gt; for Trigger table.\n",</div><div class='add'>+	"Can not request [mem %#010llx-%#010llx] for Trigger table\n",</div><div class='ctx'> 		       (unsigned long long)trigger_paddr,</div><div class='del'>-		       (unsigned long long)trigger_paddr+sizeof(*trigger_tab));</div><div class='add'>+		       (unsigned long long)trigger_paddr +</div><div class='add'>+			    sizeof(*trigger_tab) - 1);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	trigger_tab = ioremap_cache(trigger_paddr, sizeof(*trigger_tab));</div><div class='hunk'>@@ -232,9 +347,9 @@ static int __einj_error_trigger(u64 trigger_paddr)</div><div class='ctx'> 			       "APEI EINJ Trigger Table");</div><div class='ctx'> 	if (!r) {</div><div class='ctx'> 		pr_err(EINJ_PFX</div><div class='del'>-"Can not request iomem region &lt;%016llx-%016llx&gt; for Trigger Table Entry.\n",</div><div class='del'>-		       (unsigned long long)trigger_paddr+sizeof(*trigger_tab),</div><div class='del'>-		       (unsigned long long)trigger_paddr + table_size);</div><div class='add'>+"Can not request [mem %#010llx-%#010llx] for Trigger Table Entry\n",</div><div class='add'>+		       (unsigned long long)trigger_paddr + sizeof(*trigger_tab),</div><div class='add'>+		       (unsigned long long)trigger_paddr + table_size - 1);</div><div class='ctx'> 		goto out_rel_header;</div><div class='ctx'> 	}</div><div class='ctx'> 	iounmap(trigger_tab);</div><div class='hunk'>@@ -255,6 +370,30 @@ static int __einj_error_trigger(u64 trigger_paddr)</div><div class='ctx'> 	rc = apei_resources_sub(&amp;trigger_resources, &amp;einj_resources);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out_fini;</div><div class='add'>+	/*</div><div class='add'>+	 * Some firmware will access target address specified in</div><div class='add'>+	 * param1 to trigger the error when injecting memory error.</div><div class='add'>+	 * This will cause resource conflict with regular memory.  So</div><div class='add'>+	 * remove it from trigger table resources.</div><div class='add'>+	 */</div><div class='add'>+	if (param_extension &amp;&amp; (type &amp; 0x0038) &amp;&amp; param2) {</div><div class='add'>+		struct apei_resources addr_resources;</div><div class='add'>+		apei_resources_init(&amp;addr_resources);</div><div class='add'>+		trigger_param_region = einj_get_trigger_parameter_region(</div><div class='add'>+			trigger_tab, param1, param2);</div><div class='add'>+		if (trigger_param_region) {</div><div class='add'>+			rc = apei_resources_add(&amp;addr_resources,</div><div class='add'>+				trigger_param_region-&gt;address,</div><div class='add'>+				trigger_param_region-&gt;bit_width/8, true);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto out_fini;</div><div class='add'>+			rc = apei_resources_sub(&amp;trigger_resources,</div><div class='add'>+					&amp;addr_resources);</div><div class='add'>+		}</div><div class='add'>+		apei_resources_fini(&amp;addr_resources);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto out_fini;</div><div class='add'>+	}</div><div class='ctx'> 	rc = apei_resources_request(&amp;trigger_resources, "APEI EINJ Trigger");</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out_fini;</div><div class='hunk'>@@ -293,12 +432,56 @@ static int __einj_error_inject(u32 type, u64 param1, u64 param2)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	apei_exec_ctx_set_input(&amp;ctx, type);</div><div class='del'>-	rc = apei_exec_run(&amp;ctx, ACPI_EINJ_SET_ERROR_TYPE);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-	if (einj_param) {</div><div class='del'>-		writeq(param1, &amp;einj_param-&gt;param1);</div><div class='del'>-		writeq(param2, &amp;einj_param-&gt;param2);</div><div class='add'>+	if (acpi5) {</div><div class='add'>+		struct set_error_type_with_address *v5param = einj_param;</div><div class='add'>+</div><div class='add'>+		writel(type, &amp;v5param-&gt;type);</div><div class='add'>+		if (type &amp; 0x80000000) {</div><div class='add'>+			switch (vendor_flags) {</div><div class='add'>+			case SETWA_FLAGS_APICID:</div><div class='add'>+				writel(param1, &amp;v5param-&gt;apicid);</div><div class='add'>+				break;</div><div class='add'>+			case SETWA_FLAGS_MEM:</div><div class='add'>+				writeq(param1, &amp;v5param-&gt;memory_address);</div><div class='add'>+				writeq(param2, &amp;v5param-&gt;memory_address_range);</div><div class='add'>+				break;</div><div class='add'>+			case SETWA_FLAGS_PCIE_SBDF:</div><div class='add'>+				writel(param1, &amp;v5param-&gt;pcie_sbdf);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			writel(vendor_flags, &amp;v5param-&gt;flags);</div><div class='add'>+		} else {</div><div class='add'>+			switch (type) {</div><div class='add'>+			case ACPI_EINJ_PROCESSOR_CORRECTABLE:</div><div class='add'>+			case ACPI_EINJ_PROCESSOR_UNCORRECTABLE:</div><div class='add'>+			case ACPI_EINJ_PROCESSOR_FATAL:</div><div class='add'>+				writel(param1, &amp;v5param-&gt;apicid);</div><div class='add'>+				writel(SETWA_FLAGS_APICID, &amp;v5param-&gt;flags);</div><div class='add'>+				break;</div><div class='add'>+			case ACPI_EINJ_MEMORY_CORRECTABLE:</div><div class='add'>+			case ACPI_EINJ_MEMORY_UNCORRECTABLE:</div><div class='add'>+			case ACPI_EINJ_MEMORY_FATAL:</div><div class='add'>+				writeq(param1, &amp;v5param-&gt;memory_address);</div><div class='add'>+				writeq(param2, &amp;v5param-&gt;memory_address_range);</div><div class='add'>+				writel(SETWA_FLAGS_MEM, &amp;v5param-&gt;flags);</div><div class='add'>+				break;</div><div class='add'>+			case ACPI_EINJ_PCIX_CORRECTABLE:</div><div class='add'>+			case ACPI_EINJ_PCIX_UNCORRECTABLE:</div><div class='add'>+			case ACPI_EINJ_PCIX_FATAL:</div><div class='add'>+				writel(param1, &amp;v5param-&gt;pcie_sbdf);</div><div class='add'>+				writel(SETWA_FLAGS_PCIE_SBDF, &amp;v5param-&gt;flags);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		rc = apei_exec_run(&amp;ctx, ACPI_EINJ_SET_ERROR_TYPE);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+		if (einj_param) {</div><div class='add'>+			struct einj_parameter *v4param = einj_param;</div><div class='add'>+			writeq(param1, &amp;v4param-&gt;param1);</div><div class='add'>+			writeq(param2, &amp;v4param-&gt;param2);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = apei_exec_run(&amp;ctx, ACPI_EINJ_EXECUTE_OPERATION);</div><div class='ctx'> 	if (rc)</div><div class='hunk'>@@ -324,7 +507,7 @@ static int __einj_error_inject(u32 type, u64 param1, u64 param2)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	trigger_paddr = apei_exec_ctx_get_output(&amp;ctx);</div><div class='del'>-	rc = __einj_error_trigger(trigger_paddr);</div><div class='add'>+	rc = __einj_error_trigger(trigger_paddr, type, param1, param2);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	rc = apei_exec_run_optional(&amp;ctx, ACPI_EINJ_END_OPERATION);</div><div class='hunk'>@@ -408,15 +591,25 @@ static int error_type_set(void *data, u64 val)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	u32 available_error_type = 0;</div><div class='add'>+	u32 tval, vendor;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Vendor defined types have 0x80000000 bit set, and</div><div class='add'>+	 * are not enumerated by ACPI_EINJ_GET_ERROR_TYPE</div><div class='add'>+	 */</div><div class='add'>+	vendor = val &amp; 0x80000000;</div><div class='add'>+	tval = val &amp; 0x7fffffff;</div><div class='ctx'> </div><div class='ctx'> 	/* Only one error type can be specified */</div><div class='del'>-	if (val &amp; (val - 1))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	rc = einj_get_available_error_type(&amp;available_error_type);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-	if (!(val &amp; available_error_type))</div><div class='add'>+	if (tval &amp; (tval - 1))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if (!vendor) {</div><div class='add'>+		rc = einj_get_available_error_type(&amp;available_error_type);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+		if (!(val &amp; available_error_type))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	error_type = val;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -455,7 +648,6 @@ static int einj_check_table(struct acpi_table_einj *einj_tab)</div><div class='ctx'> static int __init einj_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='del'>-	u64 param_paddr;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct dentry *fentry;</div><div class='ctx'> 	struct apei_exec_context ctx;</div><div class='hunk'>@@ -465,10 +657,9 @@ static int __init einj_init(void)</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_get_table(ACPI_SIG_EINJ, 0,</div><div class='ctx'> 				(struct acpi_table_header **)&amp;einj_tab);</div><div class='del'>-	if (status == AE_NOT_FOUND) {</div><div class='del'>-		pr_info(EINJ_PFX "Table is not found!\n");</div><div class='add'>+	if (status == AE_NOT_FOUND)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	} else if (ACPI_FAILURE(status)) {</div><div class='add'>+	else if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		const char *msg = acpi_format_exception(status);</div><div class='ctx'> 		pr_err(EINJ_PFX "Failed to get table, %s\n", msg);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -509,23 +700,30 @@ static int __init einj_init(void)</div><div class='ctx'> 	rc = apei_exec_pre_map_gars(&amp;ctx);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_release;</div><div class='del'>-	if (param_extension) {</div><div class='del'>-		param_paddr = einj_get_parameter_address();</div><div class='del'>-		if (param_paddr) {</div><div class='del'>-			einj_param = ioremap(param_paddr, sizeof(*einj_param));</div><div class='del'>-			rc = -ENOMEM;</div><div class='del'>-			if (!einj_param)</div><div class='del'>-				goto err_unmap;</div><div class='del'>-			fentry = debugfs_create_x64("param1", S_IRUSR | S_IWUSR,</div><div class='del'>-						    einj_debug_dir, &amp;error_param1);</div><div class='del'>-			if (!fentry)</div><div class='del'>-				goto err_unmap;</div><div class='del'>-			fentry = debugfs_create_x64("param2", S_IRUSR | S_IWUSR,</div><div class='del'>-						    einj_debug_dir, &amp;error_param2);</div><div class='del'>-			if (!fentry)</div><div class='del'>-				goto err_unmap;</div><div class='del'>-		} else</div><div class='del'>-			pr_warn(EINJ_PFX "Parameter extension is not supported.\n");</div><div class='add'>+</div><div class='add'>+	einj_param = einj_get_parameter_address();</div><div class='add'>+	if ((param_extension || acpi5) &amp;&amp; einj_param) {</div><div class='add'>+		fentry = debugfs_create_x64("param1", S_IRUSR | S_IWUSR,</div><div class='add'>+					    einj_debug_dir, &amp;error_param1);</div><div class='add'>+		if (!fentry)</div><div class='add'>+			goto err_unmap;</div><div class='add'>+		fentry = debugfs_create_x64("param2", S_IRUSR | S_IWUSR,</div><div class='add'>+					    einj_debug_dir, &amp;error_param2);</div><div class='add'>+		if (!fentry)</div><div class='add'>+			goto err_unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vendor_dev[0]) {</div><div class='add'>+		vendor_blob.data = vendor_dev;</div><div class='add'>+		vendor_blob.size = strlen(vendor_dev);</div><div class='add'>+		fentry = debugfs_create_blob("vendor", S_IRUSR,</div><div class='add'>+					     einj_debug_dir, &amp;vendor_blob);</div><div class='add'>+		if (!fentry)</div><div class='add'>+			goto err_unmap;</div><div class='add'>+		fentry = debugfs_create_x32("vendor_flags", S_IRUSR | S_IWUSR,</div><div class='add'>+					    einj_debug_dir, &amp;vendor_flags);</div><div class='add'>+		if (!fentry)</div><div class='add'>+			goto err_unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pr_info(EINJ_PFX "Error INJection is initialized.\n");</div><div class='head'>diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c<br/>index 631b9477b99c..eb9fab5b96e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/apei/erst.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/apei/erst.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/apei/erst.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/apei/erst.c</a></div><div class='hunk'>@@ -934,7 +934,8 @@ static int erst_close_pstore(struct pstore_info *psi);</div><div class='ctx'> static ssize_t erst_reader(u64 *id, enum pstore_type_id *type,</div><div class='ctx'> 			   struct timespec *time, char **buf,</div><div class='ctx'> 			   struct pstore_info *psi);</div><div class='del'>-static int erst_writer(enum pstore_type_id type, u64 *id, unsigned int part,</div><div class='add'>+static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason,</div><div class='add'>+		       u64 *id, unsigned int part,</div><div class='ctx'> 		       size_t size, struct pstore_info *psi);</div><div class='ctx'> static int erst_clearer(enum pstore_type_id type, u64 id,</div><div class='ctx'> 			struct pstore_info *psi);</div><div class='hunk'>@@ -1053,7 +1054,8 @@ out:</div><div class='ctx'> 	return (rc &lt; 0) ? rc : (len - sizeof(*rcd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int erst_writer(enum pstore_type_id type, u64 *id, unsigned int part,</div><div class='add'>+static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason,</div><div class='add'>+		       u64 *id, unsigned int part,</div><div class='ctx'> 		       size_t size, struct pstore_info *psi)</div><div class='ctx'> {</div><div class='ctx'> 	struct cper_pstore_record *rcd = (struct cper_pstore_record *)</div><div class='hunk'>@@ -1125,10 +1127,9 @@ static int __init erst_init(void)</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_get_table(ACPI_SIG_ERST, 0,</div><div class='ctx'> 				(struct acpi_table_header **)&amp;erst_tab);</div><div class='del'>-	if (status == AE_NOT_FOUND) {</div><div class='del'>-		pr_info(ERST_PFX "Table is not found!\n");</div><div class='add'>+	if (status == AE_NOT_FOUND)</div><div class='ctx'> 		goto err;</div><div class='del'>-	} else if (ACPI_FAILURE(status)) {</div><div class='add'>+	else if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		const char *msg = acpi_format_exception(status);</div><div class='ctx'> 		pr_err(ERST_PFX "Failed to get table, %s\n", msg);</div><div class='ctx'> 		rc = -EINVAL;</div><div class='head'>diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c<br/>index b8e08cb67a18..9b3cac0abecc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/apei/ghes.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/apei/ghes.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/apei/ghes.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/apei/ghes.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/init.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/acpi_io.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='hunk'>@@ -45,8 +46,9 @@</div><div class='ctx'> #include &lt;linux/irq_work.h&gt;</div><div class='ctx'> #include &lt;linux/llist.h&gt;</div><div class='ctx'> #include &lt;linux/genalloc.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/aer.h&gt;</div><div class='ctx'> #include &lt;acpi/apei.h&gt;</div><div class='del'>-#include &lt;acpi/atomicio.h&gt;</div><div class='ctx'> #include &lt;acpi/hed.h&gt;</div><div class='ctx'> #include &lt;asm/mce.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='hunk'>@@ -118,7 +120,7 @@ struct ghes_estatus_cache {</div><div class='ctx'> 	struct rcu_head rcu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int ghes_disable;</div><div class='add'>+bool ghes_disable;</div><div class='ctx'> module_param_named(disable, ghes_disable, bool, 0);</div><div class='ctx'> </div><div class='ctx'> static int ghes_panic_timeout	__read_mostly = 30;</div><div class='hunk'>@@ -299,7 +301,7 @@ static struct ghes *ghes_new(struct acpi_hest_generic *generic)</div><div class='ctx'> 	if (!ghes)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	ghes-&gt;generic = generic;</div><div class='del'>-	rc = acpi_pre_map_gar(&amp;generic-&gt;error_status_address);</div><div class='add'>+	rc = acpi_os_map_generic_address(&amp;generic-&gt;error_status_address);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> 	error_block_length = generic-&gt;error_block_length;</div><div class='hunk'>@@ -319,7 +321,7 @@ static struct ghes *ghes_new(struct acpi_hest_generic *generic)</div><div class='ctx'> 	return ghes;</div><div class='ctx'> </div><div class='ctx'> err_unmap:</div><div class='del'>-	acpi_post_unmap_gar(&amp;generic-&gt;error_status_address);</div><div class='add'>+	acpi_os_unmap_generic_address(&amp;generic-&gt;error_status_address);</div><div class='ctx'> err_free:</div><div class='ctx'> 	kfree(ghes);</div><div class='ctx'> 	return ERR_PTR(rc);</div><div class='hunk'>@@ -328,7 +330,7 @@ err_free:</div><div class='ctx'> static void ghes_fini(struct ghes *ghes)</div><div class='ctx'> {</div><div class='ctx'> 	kfree(ghes-&gt;estatus);</div><div class='del'>-	acpi_post_unmap_gar(&amp;ghes-&gt;generic-&gt;error_status_address);</div><div class='add'>+	acpi_os_unmap_generic_address(&amp;ghes-&gt;generic-&gt;error_status_address);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -399,7 +401,7 @@ static int ghes_read_estatus(struct ghes *ghes, int silent)</div><div class='ctx'> 	u32 len;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = acpi_atomic_read(&amp;buf_paddr, &amp;g-&gt;error_status_address);</div><div class='add'>+	rc = apei_read(&amp;buf_paddr, &amp;g-&gt;error_status_address);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		if (!silent &amp;&amp; printk_ratelimit())</div><div class='ctx'> 			pr_warning(FW_WARN GHES_PFX</div><div class='hunk'>@@ -476,6 +478,27 @@ static void ghes_do_proc(const struct acpi_hest_generic_status *estatus)</div><div class='ctx'> 			}</div><div class='ctx'> #endif</div><div class='ctx'> 		}</div><div class='add'>+#ifdef CONFIG_ACPI_APEI_PCIEAER</div><div class='add'>+		else if (!uuid_le_cmp(*(uuid_le *)gdata-&gt;section_type,</div><div class='add'>+				      CPER_SEC_PCIE)) {</div><div class='add'>+			struct cper_sec_pcie *pcie_err;</div><div class='add'>+			pcie_err = (struct cper_sec_pcie *)(gdata+1);</div><div class='add'>+			if (sev == GHES_SEV_RECOVERABLE &amp;&amp;</div><div class='add'>+			    sec_sev == GHES_SEV_RECOVERABLE &amp;&amp;</div><div class='add'>+			    pcie_err-&gt;validation_bits &amp; CPER_PCIE_VALID_DEVICE_ID &amp;&amp;</div><div class='add'>+			    pcie_err-&gt;validation_bits &amp; CPER_PCIE_VALID_AER_INFO) {</div><div class='add'>+				unsigned int devfn;</div><div class='add'>+				int aer_severity;</div><div class='add'>+				devfn = PCI_DEVFN(pcie_err-&gt;device_id.device,</div><div class='add'>+						  pcie_err-&gt;device_id.function);</div><div class='add'>+				aer_severity = cper_severity_to_aer(sev);</div><div class='add'>+				aer_recover_queue(pcie_err-&gt;device_id.segment,</div><div class='add'>+						  pcie_err-&gt;device_id.bus,</div><div class='add'>+						  devfn, aer_severity);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -483,16 +506,22 @@ static void __ghes_print_estatus(const char *pfx,</div><div class='ctx'> 				 const struct acpi_hest_generic *generic,</div><div class='ctx'> 				 const struct acpi_hest_generic_status *estatus)</div><div class='ctx'> {</div><div class='add'>+	static atomic_t seqno;</div><div class='add'>+	unsigned int curr_seqno;</div><div class='add'>+	char pfx_seq[64];</div><div class='add'>+</div><div class='ctx'> 	if (pfx == NULL) {</div><div class='ctx'> 		if (ghes_severity(estatus-&gt;error_severity) &lt;=</div><div class='ctx'> 		    GHES_SEV_CORRECTED)</div><div class='del'>-			pfx = KERN_WARNING HW_ERR;</div><div class='add'>+			pfx = KERN_WARNING;</div><div class='ctx'> 		else</div><div class='del'>-			pfx = KERN_ERR HW_ERR;</div><div class='add'>+			pfx = KERN_ERR;</div><div class='ctx'> 	}</div><div class='add'>+	curr_seqno = atomic_inc_return(&amp;seqno);</div><div class='add'>+	snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);</div><div class='ctx'> 	printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",</div><div class='del'>-	       pfx, generic-&gt;header.source_id);</div><div class='del'>-	apei_estatus_print(pfx, estatus);</div><div class='add'>+	       pfx_seq, generic-&gt;header.source_id);</div><div class='add'>+	apei_estatus_print(pfx_seq, estatus);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ghes_print_estatus(const char *pfx,</div><div class='hunk'>@@ -711,26 +740,34 @@ static int ghes_notify_sci(struct notifier_block *this,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct llist_node *llist_nodes_reverse(struct llist_node *llnode)</div><div class='add'>+{</div><div class='add'>+	struct llist_node *next, *tail = NULL;</div><div class='add'>+</div><div class='add'>+	while (llnode) {</div><div class='add'>+		next = llnode-&gt;next;</div><div class='add'>+		llnode-&gt;next = tail;</div><div class='add'>+		tail = llnode;</div><div class='add'>+		llnode = next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tail;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ghes_proc_in_irq(struct irq_work *irq_work)</div><div class='ctx'> {</div><div class='del'>-	struct llist_node *llnode, *next, *tail = NULL;</div><div class='add'>+	struct llist_node *llnode, *next;</div><div class='ctx'> 	struct ghes_estatus_node *estatus_node;</div><div class='ctx'> 	struct acpi_hest_generic *generic;</div><div class='ctx'> 	struct acpi_hest_generic_status *estatus;</div><div class='ctx'> 	u32 len, node_len;</div><div class='ctx'> </div><div class='add'>+	llnode = llist_del_all(&amp;ghes_estatus_llist);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Because the time order of estatus in list is reversed,</div><div class='ctx'> 	 * revert it back to proper order.</div><div class='ctx'> 	 */</div><div class='del'>-	llnode = llist_del_all(&amp;ghes_estatus_llist);</div><div class='del'>-	while (llnode) {</div><div class='del'>-		next = llnode-&gt;next;</div><div class='del'>-		llnode-&gt;next = tail;</div><div class='del'>-		tail = llnode;</div><div class='del'>-		llnode = next;</div><div class='del'>-	}</div><div class='del'>-	llnode = tail;</div><div class='add'>+	llnode = llist_nodes_reverse(llnode);</div><div class='ctx'> 	while (llnode) {</div><div class='ctx'> 		next = llnode-&gt;next;</div><div class='ctx'> 		estatus_node = llist_entry(llnode, struct ghes_estatus_node,</div><div class='hunk'>@@ -750,6 +787,32 @@ static void ghes_proc_in_irq(struct irq_work *irq_work)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ghes_print_queued_estatus(void)</div><div class='add'>+{</div><div class='add'>+	struct llist_node *llnode;</div><div class='add'>+	struct ghes_estatus_node *estatus_node;</div><div class='add'>+	struct acpi_hest_generic *generic;</div><div class='add'>+	struct acpi_hest_generic_status *estatus;</div><div class='add'>+	u32 len, node_len;</div><div class='add'>+</div><div class='add'>+	llnode = llist_del_all(&amp;ghes_estatus_llist);</div><div class='add'>+	/*</div><div class='add'>+	 * Because the time order of estatus in list is reversed,</div><div class='add'>+	 * revert it back to proper order.</div><div class='add'>+	 */</div><div class='add'>+	llnode = llist_nodes_reverse(llnode);</div><div class='add'>+	while (llnode) {</div><div class='add'>+		estatus_node = llist_entry(llnode, struct ghes_estatus_node,</div><div class='add'>+					   llnode);</div><div class='add'>+		estatus = GHES_ESTATUS_FROM_NODE(estatus_node);</div><div class='add'>+		len = apei_estatus_len(estatus);</div><div class='add'>+		node_len = GHES_ESTATUS_NODE_LEN(len);</div><div class='add'>+		generic = estatus_node-&gt;generic;</div><div class='add'>+		ghes_print_estatus(NULL, generic, estatus);</div><div class='add'>+		llnode = llnode-&gt;next;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ghes_notify_nmi(unsigned int cmd, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct ghes *ghes, *ghes_global = NULL;</div><div class='hunk'>@@ -775,7 +838,8 @@ static int ghes_notify_nmi(unsigned int cmd, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	if (sev_global &gt;= GHES_SEV_PANIC) {</div><div class='ctx'> 		oops_begin();</div><div class='del'>-		__ghes_print_estatus(KERN_EMERG HW_ERR, ghes_global-&gt;generic,</div><div class='add'>+		ghes_print_queued_estatus();</div><div class='add'>+		__ghes_print_estatus(KERN_EMERG, ghes_global-&gt;generic,</div><div class='ctx'> 				     ghes_global-&gt;estatus);</div><div class='ctx'> 		/* reboot to log the error! */</div><div class='ctx'> 		if (panic_timeout == 0)</div><div class='head'>diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c<br/>index 05fee06f4d6e..7f00cf38098f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/apei/hest.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/apei/hest.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/apei/hest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/apei/hest.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> </div><div class='ctx'> #define HEST_PFX "HEST: "</div><div class='ctx'> </div><div class='del'>-int hest_disable;</div><div class='add'>+bool hest_disable;</div><div class='ctx'> EXPORT_SYMBOL_GPL(hest_disable);</div><div class='ctx'> </div><div class='ctx'> /* HEST table parsing */</div><div class='hunk'>@@ -221,10 +221,9 @@ void __init acpi_hest_init(void)</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_get_table(ACPI_SIG_HEST, 0,</div><div class='ctx'> 				(struct acpi_table_header **)&amp;hest_tab);</div><div class='del'>-	if (status == AE_NOT_FOUND) {</div><div class='del'>-		pr_info(HEST_PFX "Table not found.\n");</div><div class='add'>+	if (status == AE_NOT_FOUND)</div><div class='ctx'> 		goto err;</div><div class='del'>-	} else if (ACPI_FAILURE(status)) {</div><div class='add'>+	else if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		const char *msg = acpi_format_exception(status);</div><div class='ctx'> 		pr_err(HEST_PFX "Failed to get table, %s\n", msg);</div><div class='ctx'> 		rc = -EINVAL;</div><div class='head'>diff --git a/drivers/acpi/atomicio.c b/drivers/acpi/atomicio.c<br/>index cfc0cc10af39..d4a5b3d3657b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/atomicio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/atomicio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/atomicio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/atomicio.c</a></div><div class='hunk'>@@ -32,6 +32,8 @@</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.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='add'>+#include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;acpi/atomicio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define ACPI_PFX "ACPI: "</div><div class='hunk'>@@ -97,6 +99,37 @@ static void __iomem *__acpi_try_ioremap(phys_addr_t paddr,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_IA64</div><div class='add'>+#define should_use_kmap(pfn)	page_is_ram(pfn)</div><div class='add'>+#else</div><div class='add'>+/* ioremap will take care of cache attributes */</div><div class='add'>+#define should_use_kmap(pfn)	0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void __iomem *acpi_map(phys_addr_t pg_off, unsigned long pg_sz)</div><div class='add'>+{</div><div class='add'>+	unsigned long pfn;</div><div class='add'>+</div><div class='add'>+	pfn = pg_off &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	if (should_use_kmap(pfn)) {</div><div class='add'>+		if (pg_sz &gt; PAGE_SIZE)</div><div class='add'>+			return NULL;</div><div class='add'>+		return (void __iomem __force *)kmap(pfn_to_page(pfn));</div><div class='add'>+	} else</div><div class='add'>+		return ioremap(pg_off, pg_sz);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void acpi_unmap(phys_addr_t pg_off, void __iomem *vaddr)</div><div class='add'>+{</div><div class='add'>+	unsigned long pfn;</div><div class='add'>+</div><div class='add'>+	pfn = pg_off &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	if (page_is_ram(pfn))</div><div class='add'>+		kunmap(pfn_to_page(pfn));</div><div class='add'>+	else</div><div class='add'>+		iounmap(vaddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Used to pre-map the specified IO memory area. First try to find</div><div class='ctx'>  * whether the area is already pre-mapped, if it is, increase the</div><div class='hunk'>@@ -119,7 +152,7 @@ static void __iomem *acpi_pre_map(phys_addr_t paddr,</div><div class='ctx'> </div><div class='ctx'> 	pg_off = paddr &amp; PAGE_MASK;</div><div class='ctx'> 	pg_sz = ((paddr + size + PAGE_SIZE - 1) &amp; PAGE_MASK) - pg_off;</div><div class='del'>-	vaddr = ioremap(pg_off, pg_sz);</div><div class='add'>+	vaddr = acpi_map(pg_off, pg_sz);</div><div class='ctx'> 	if (!vaddr)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	map = kmalloc(sizeof(*map), GFP_KERNEL);</div><div class='hunk'>@@ -135,7 +168,7 @@ static void __iomem *acpi_pre_map(phys_addr_t paddr,</div><div class='ctx'> 	vaddr = __acpi_try_ioremap(paddr, size);</div><div class='ctx'> 	if (vaddr) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;acpi_iomaps_lock, flags);</div><div class='del'>-		iounmap(map-&gt;vaddr);</div><div class='add'>+		acpi_unmap(pg_off, map-&gt;vaddr);</div><div class='ctx'> 		kfree(map);</div><div class='ctx'> 		return vaddr;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -144,7 +177,7 @@ static void __iomem *acpi_pre_map(phys_addr_t paddr,</div><div class='ctx'> </div><div class='ctx'> 	return map-&gt;vaddr + (paddr - map-&gt;paddr);</div><div class='ctx'> err_unmap:</div><div class='del'>-	iounmap(vaddr);</div><div class='add'>+	acpi_unmap(pg_off, vaddr);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -177,7 +210,7 @@ static void acpi_post_unmap(phys_addr_t paddr, unsigned long size)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	synchronize_rcu();</div><div class='del'>-	iounmap(map-&gt;vaddr);</div><div class='add'>+	acpi_unmap(map-&gt;paddr, map-&gt;vaddr);</div><div class='ctx'> 	kfree(map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -260,6 +293,21 @@ int acpi_post_unmap_gar(struct acpi_generic_address *reg)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(acpi_post_unmap_gar);</div><div class='ctx'> </div><div class='add'>+#ifdef readq</div><div class='add'>+static inline u64 read64(const volatile void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	return readq(addr);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline u64 read64(const volatile void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	u64 l, h;</div><div class='add'>+	l = readl(addr);</div><div class='add'>+	h = readl(addr+4);</div><div class='add'>+	return l | (h &lt;&lt; 32);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Can be used in atomic (including NMI) or process context. RCU read</div><div class='ctx'>  * lock can only be released after the IO memory area accessing.</div><div class='hunk'>@@ -280,11 +328,9 @@ static int acpi_atomic_read_mem(u64 paddr, u64 *val, u32 width)</div><div class='ctx'> 	case 32:</div><div class='ctx'> 		*val = readl(addr);</div><div class='ctx'> 		break;</div><div class='del'>-#ifdef readq</div><div class='ctx'> 	case 64:</div><div class='del'>-		*val = readq(addr);</div><div class='add'>+		*val = read64(addr);</div><div class='ctx'> 		break;</div><div class='del'>-#endif</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -293,6 +339,19 @@ static int acpi_atomic_read_mem(u64 paddr, u64 *val, u32 width)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef writeq</div><div class='add'>+static inline void write64(u64 val, volatile void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	writeq(val, addr);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void write64(u64 val, volatile void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	writel(val, addr);</div><div class='add'>+	writel(val&gt;&gt;32, addr+4);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int acpi_atomic_write_mem(u64 paddr, u64 val, u32 width)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *addr;</div><div class='hunk'>@@ -309,11 +368,9 @@ static int acpi_atomic_write_mem(u64 paddr, u64 val, u32 width)</div><div class='ctx'> 	case 32:</div><div class='ctx'> 		writel(val, addr);</div><div class='ctx'> 		break;</div><div class='del'>-#ifdef writeq</div><div class='ctx'> 	case 64:</div><div class='del'>-		writeq(val, addr);</div><div class='add'>+		write64(val, addr);</div><div class='ctx'> 		break;</div><div class='del'>-#endif</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c<br/>index 7711d94a0409..86933ca8b472 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/battery.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/battery.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/battery.c</a></div><div class='hunk'>@@ -873,7 +873,7 @@ DECLARE_FILE_FUNCTIONS(alarm);</div><div class='ctx'> </div><div class='ctx'> static const struct battery_file {</div><div class='ctx'> 	struct file_operations ops;</div><div class='del'>-	mode_t mode;</div><div class='add'>+	umode_t mode;</div><div class='ctx'> 	const char *name;</div><div class='ctx'> } acpi_battery_file[] = {</div><div class='ctx'> 	FILE_DESCRIPTION_RO(info),</div><div class='head'>diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c<br/>index 19a61136d848..88eb14304667 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/dock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/dock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/dock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/dock.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@ MODULE_AUTHOR("Kristen Carlson Accardi");</div><div class='ctx'> MODULE_DESCRIPTION(ACPI_DOCK_DRIVER_DESCRIPTION);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static int immediate_undock = 1;</div><div class='add'>+static bool immediate_undock = 1;</div><div class='ctx'> module_param(immediate_undock, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(immediate_undock, "1 (default) will cause the driver to "</div><div class='ctx'> 	"undock immediately when the undock button is pressed, 0 will cause"</div><div class='head'>diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c<br/>index 6c47ae9793a7..b258cab9061c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/ec_sys.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/ec_sys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/ec_sys.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/ec_sys.c</a></div><div class='hunk'>@@ -105,7 +105,7 @@ int acpi_ec_add_debugfs(struct acpi_ec *ec, unsigned int ec_device_count)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dev_dir;</div><div class='ctx'> 	char name[64];</div><div class='del'>-	mode_t mode = 0400;</div><div class='add'>+	umode_t mode = 0400;</div><div class='ctx'> </div><div class='ctx'> 	if (ec_device_count == 0) {</div><div class='ctx'> 		acpi_ec_debugfs_dir = debugfs_create_dir("ec", NULL);</div><div class='head'>diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c<br/>index 3b5c3189fd99..e56f3be7b07d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/numa.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/numa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/numa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/numa.c</a></div><div class='hunk'>@@ -45,6 +45,8 @@ static int pxm_to_node_map[MAX_PXM_DOMAINS]</div><div class='ctx'> static int node_to_pxm_map[MAX_NUMNODES]</div><div class='ctx'> 			= { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };</div><div class='ctx'> </div><div class='add'>+unsigned char acpi_srat_revision __initdata;</div><div class='add'>+</div><div class='ctx'> int pxm_to_node(int pxm)</div><div class='ctx'> {</div><div class='ctx'> 	if (pxm &lt; 0)</div><div class='hunk'>@@ -255,9 +257,13 @@ acpi_parse_memory_affinity(struct acpi_subtable_header * header,</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_parse_srat(struct acpi_table_header *table)</div><div class='ctx'> {</div><div class='add'>+	struct acpi_table_srat *srat;</div><div class='ctx'> 	if (!table)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	srat = (struct acpi_table_srat *)table;</div><div class='add'>+	acpi_srat_revision = srat-&gt;header.revision;</div><div class='add'>+</div><div class='ctx'> 	/* Real work done in acpi_table_parse_srat below. */</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/acpi/nvs.c b/drivers/acpi/nvs.c<br/>index 096787b43c96..7a2035fa8c71 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/nvs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/nvs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/nvs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/nvs.c</a></div><div class='hunk'>@@ -15,6 +15,56 @@</div><div class='ctx'> #include &lt;linux/acpi_io.h&gt;</div><div class='ctx'> #include &lt;acpi/acpiosxf.h&gt;</div><div class='ctx'> </div><div class='add'>+/* ACPI NVS regions, APEI may use it */</div><div class='add'>+</div><div class='add'>+struct nvs_region {</div><div class='add'>+	__u64 phys_start;</div><div class='add'>+	__u64 size;</div><div class='add'>+	struct list_head node;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(nvs_region_list);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ACPI_SLEEP</div><div class='add'>+static int suspend_nvs_register(unsigned long start, unsigned long size);</div><div class='add'>+#else</div><div class='add'>+static inline int suspend_nvs_register(unsigned long a, unsigned long b)</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'>+int acpi_nvs_register(__u64 start, __u64 size)</div><div class='add'>+{</div><div class='add'>+	struct nvs_region *region;</div><div class='add'>+</div><div class='add'>+	region = kmalloc(sizeof(*region), GFP_KERNEL);</div><div class='add'>+	if (!region)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	region-&gt;phys_start = start;</div><div class='add'>+	region-&gt;size = size;</div><div class='add'>+	list_add_tail(&amp;region-&gt;node, &amp;nvs_region_list);</div><div class='add'>+</div><div class='add'>+	return suspend_nvs_register(start, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int acpi_nvs_for_each_region(int (*func)(__u64 start, __u64 size, void *data),</div><div class='add'>+			     void *data)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	struct nvs_region *region;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(region, &amp;nvs_region_list, node) {</div><div class='add'>+		rc = func(region-&gt;phys_start, region-&gt;size, data);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ACPI_SLEEP</div><div class='ctx'> /*</div><div class='ctx'>  * Platforms, like ACPI, may want us to save some memory used by them during</div><div class='ctx'>  * suspend and to restore the contents of this memory during the subsequent</div><div class='hunk'>@@ -41,7 +91,7 @@ static LIST_HEAD(nvs_list);</div><div class='ctx'>  *	things so that the data from page-aligned addresses in this region will</div><div class='ctx'>  *	be copied into separate RAM pages.</div><div class='ctx'>  */</div><div class='del'>-int suspend_nvs_register(unsigned long start, unsigned long size)</div><div class='add'>+static int suspend_nvs_register(unsigned long start, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	struct nvs_page *entry, *next;</div><div class='ctx'> </div><div class='hunk'>@@ -159,3 +209,4 @@ void suspend_nvs_restore(void)</div><div class='ctx'> 		if (entry-&gt;data)</div><div class='ctx'> 			memcpy(entry-&gt;kaddr, entry-&gt;data, entry-&gt;size);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c<br/>index f31c5c5f1b7e..fcc12d842bcc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/osl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/osl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/osl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/osl.c</a></div><div class='hunk'>@@ -83,19 +83,6 @@ static struct workqueue_struct *kacpi_notify_wq;</div><div class='ctx'> struct workqueue_struct *kacpi_hotplug_wq;</div><div class='ctx'> EXPORT_SYMBOL(kacpi_hotplug_wq);</div><div class='ctx'> </div><div class='del'>-struct acpi_res_list {</div><div class='del'>-	resource_size_t start;</div><div class='del'>-	resource_size_t end;</div><div class='del'>-	acpi_adr_space_type resource_type; /* IO port, System memory, ...*/</div><div class='del'>-	char name[5];   /* only can have a length of 4 chars, make use of this</div><div class='del'>-			   one instead of res-&gt;name, no need to kalloc then */</div><div class='del'>-	struct list_head resource_list;</div><div class='del'>-	int count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static LIST_HEAD(resource_list_head);</div><div class='del'>-static DEFINE_SPINLOCK(acpi_res_lock);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * This list of permanent mappings is for memory that may be accessed from</div><div class='ctx'>  * interrupt context, where we can't do the ioremap().</div><div class='hunk'>@@ -166,17 +153,21 @@ static u32 acpi_osi_handler(acpi_string interface, u32 supported)</div><div class='ctx'> 	return supported;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init acpi_request_region (struct acpi_generic_address *addr,</div><div class='add'>+static void __init acpi_request_region (struct acpi_generic_address *gas,</div><div class='ctx'> 	unsigned int length, char *desc)</div><div class='ctx'> {</div><div class='del'>-	if (!addr-&gt;address || !length)</div><div class='add'>+	u64 addr;</div><div class='add'>+</div><div class='add'>+	/* Handle possible alignment issues */</div><div class='add'>+	memcpy(&amp;addr, &amp;gas-&gt;address, sizeof(addr));</div><div class='add'>+	if (!addr || !length)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Resources are never freed */</div><div class='del'>-	if (addr-&gt;space_id == ACPI_ADR_SPACE_SYSTEM_IO)</div><div class='del'>-		request_region(addr-&gt;address, length, desc);</div><div class='del'>-	else if (addr-&gt;space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)</div><div class='del'>-		request_mem_region(addr-&gt;address, length, desc);</div><div class='add'>+	if (gas-&gt;space_id == ACPI_ADR_SPACE_SYSTEM_IO)</div><div class='add'>+		request_region(addr, length, desc);</div><div class='add'>+	else if (gas-&gt;space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)</div><div class='add'>+		request_mem_region(addr, length, desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_reserve_resources(void)</div><div class='hunk'>@@ -427,35 +418,42 @@ void __init early_acpi_os_unmap_memory(void __iomem *virt, acpi_size size)</div><div class='ctx'> 		__acpi_unmap_table(virt, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int acpi_os_map_generic_address(struct acpi_generic_address *addr)</div><div class='add'>+int acpi_os_map_generic_address(struct acpi_generic_address *gas)</div><div class='ctx'> {</div><div class='add'>+	u64 addr;</div><div class='ctx'> 	void __iomem *virt;</div><div class='ctx'> </div><div class='del'>-	if (addr-&gt;space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)</div><div class='add'>+	if (gas-&gt;space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!addr-&gt;address || !addr-&gt;bit_width)</div><div class='add'>+	/* Handle possible alignment issues */</div><div class='add'>+	memcpy(&amp;addr, &amp;gas-&gt;address, sizeof(addr));</div><div class='add'>+	if (!addr || !gas-&gt;bit_width)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	virt = acpi_os_map_memory(addr-&gt;address, addr-&gt;bit_width / 8);</div><div class='add'>+	virt = acpi_os_map_memory(addr, gas-&gt;bit_width / 8);</div><div class='ctx'> 	if (!virt)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(acpi_os_map_generic_address);</div><div class='ctx'> </div><div class='del'>-static void acpi_os_unmap_generic_address(struct acpi_generic_address *addr)</div><div class='add'>+void acpi_os_unmap_generic_address(struct acpi_generic_address *gas)</div><div class='ctx'> {</div><div class='add'>+	u64 addr;</div><div class='ctx'> 	struct acpi_ioremap *map;</div><div class='ctx'> </div><div class='del'>-	if (addr-&gt;space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)</div><div class='add'>+	if (gas-&gt;space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!addr-&gt;address || !addr-&gt;bit_width)</div><div class='add'>+	/* Handle possible alignment issues */</div><div class='add'>+	memcpy(&amp;addr, &amp;gas-&gt;address, sizeof(addr));</div><div class='add'>+	if (!addr || !gas-&gt;bit_width)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;acpi_ioremap_lock);</div><div class='del'>-	map = acpi_map_lookup(addr-&gt;address, addr-&gt;bit_width / 8);</div><div class='add'>+	map = acpi_map_lookup(addr, gas-&gt;bit_width / 8);</div><div class='ctx'> 	if (!map) {</div><div class='ctx'> 		mutex_unlock(&amp;acpi_ioremap_lock);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -465,6 +463,7 @@ static void acpi_os_unmap_generic_address(struct acpi_generic_address *addr)</div><div class='ctx'> </div><div class='ctx'> 	acpi_os_map_cleanup(map);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(acpi_os_unmap_generic_address);</div><div class='ctx'> </div><div class='ctx'> #ifdef ACPI_FUTURE_USAGE</div><div class='ctx'> acpi_status</div><div class='hunk'>@@ -1278,44 +1277,28 @@ __setup("acpi_enforce_resources=", acpi_enforce_resources_setup);</div><div class='ctx'>  * drivers */</div><div class='ctx'> int acpi_check_resource_conflict(const struct resource *res)</div><div class='ctx'> {</div><div class='del'>-	struct acpi_res_list *res_list_elem;</div><div class='del'>-	int ioport = 0, clash = 0;</div><div class='add'>+	acpi_adr_space_type space_id;</div><div class='add'>+	acpi_size length;</div><div class='add'>+	u8 warn = 0;</div><div class='add'>+	int clash = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_enforce_resources == ENFORCE_RESOURCES_NO)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (!(res-&gt;flags &amp; IORESOURCE_IO) &amp;&amp; !(res-&gt;flags &amp; IORESOURCE_MEM))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ioport = res-&gt;flags &amp; IORESOURCE_IO;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;acpi_res_lock);</div><div class='del'>-	list_for_each_entry(res_list_elem, &amp;resource_list_head,</div><div class='del'>-			    resource_list) {</div><div class='del'>-		if (ioport &amp;&amp; (res_list_elem-&gt;resource_type</div><div class='del'>-			       != ACPI_ADR_SPACE_SYSTEM_IO))</div><div class='del'>-			continue;</div><div class='del'>-		if (!ioport &amp;&amp; (res_list_elem-&gt;resource_type</div><div class='del'>-				!= ACPI_ADR_SPACE_SYSTEM_MEMORY))</div><div class='del'>-			continue;</div><div class='add'>+	if (res-&gt;flags &amp; IORESOURCE_IO)</div><div class='add'>+		space_id = ACPI_ADR_SPACE_SYSTEM_IO;</div><div class='add'>+	else</div><div class='add'>+		space_id = ACPI_ADR_SPACE_SYSTEM_MEMORY;</div><div class='ctx'> </div><div class='del'>-		if (res-&gt;end &lt; res_list_elem-&gt;start</div><div class='del'>-		    || res_list_elem-&gt;end &lt; res-&gt;start)</div><div class='del'>-			continue;</div><div class='del'>-		clash = 1;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;acpi_res_lock);</div><div class='add'>+	length = res-&gt;end - res-&gt;start + 1;</div><div class='add'>+	if (acpi_enforce_resources != ENFORCE_RESOURCES_NO)</div><div class='add'>+		warn = 1;</div><div class='add'>+	clash = acpi_check_address_range(space_id, res-&gt;start, length, warn);</div><div class='ctx'> </div><div class='ctx'> 	if (clash) {</div><div class='ctx'> 		if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) {</div><div class='del'>-			printk(KERN_WARNING "ACPI: resource %s %pR"</div><div class='del'>-			       " conflicts with ACPI region %s "</div><div class='del'>-			       "[%s 0x%zx-0x%zx]\n",</div><div class='del'>-			       res-&gt;name, res, res_list_elem-&gt;name,</div><div class='del'>-			       (res_list_elem-&gt;resource_type ==</div><div class='del'>-				ACPI_ADR_SPACE_SYSTEM_IO) ? "io" : "mem",</div><div class='del'>-			       (size_t) res_list_elem-&gt;start,</div><div class='del'>-			       (size_t) res_list_elem-&gt;end);</div><div class='ctx'> 			if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX)</div><div class='ctx'> 				printk(KERN_NOTICE "ACPI: This conflict may"</div><div class='ctx'> 				       " cause random problems and system"</div><div class='hunk'>@@ -1467,155 +1450,6 @@ acpi_status acpi_os_release_object(acpi_cache_t * cache, void *object)</div><div class='ctx'> 	kmem_cache_free(cache, object);</div><div class='ctx'> 	return (AE_OK);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline int acpi_res_list_add(struct acpi_res_list *res)</div><div class='del'>-{</div><div class='del'>-	struct acpi_res_list *res_list_elem;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(res_list_elem, &amp;resource_list_head,</div><div class='del'>-			    resource_list) {</div><div class='del'>-</div><div class='del'>-		if (res-&gt;resource_type == res_list_elem-&gt;resource_type &amp;&amp;</div><div class='del'>-		    res-&gt;start == res_list_elem-&gt;start &amp;&amp;</div><div class='del'>-		    res-&gt;end == res_list_elem-&gt;end) {</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * The Region(addr,len) already exist in the list,</div><div class='del'>-			 * just increase the count</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			res_list_elem-&gt;count++;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	res-&gt;count = 1;</div><div class='del'>-	list_add(&amp;res-&gt;resource_list, &amp;resource_list_head);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void acpi_res_list_del(struct acpi_res_list *res)</div><div class='del'>-{</div><div class='del'>-	struct acpi_res_list *res_list_elem;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(res_list_elem, &amp;resource_list_head,</div><div class='del'>-			    resource_list) {</div><div class='del'>-</div><div class='del'>-		if (res-&gt;resource_type == res_list_elem-&gt;resource_type &amp;&amp;</div><div class='del'>-		    res-&gt;start == res_list_elem-&gt;start &amp;&amp;</div><div class='del'>-		    res-&gt;end == res_list_elem-&gt;end) {</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * If the res count is decreased to 0,</div><div class='del'>-			 * remove and free it</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			if (--res_list_elem-&gt;count == 0) {</div><div class='del'>-				list_del(&amp;res_list_elem-&gt;resource_list);</div><div class='del'>-				kfree(res_list_elem);</div><div class='del'>-			}</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-acpi_status</div><div class='del'>-acpi_os_invalidate_address(</div><div class='del'>-    u8                   space_id,</div><div class='del'>-    acpi_physical_address   address,</div><div class='del'>-    acpi_size               length)</div><div class='del'>-{</div><div class='del'>-	struct acpi_res_list res;</div><div class='del'>-</div><div class='del'>-	switch (space_id) {</div><div class='del'>-	case ACPI_ADR_SPACE_SYSTEM_IO:</div><div class='del'>-	case ACPI_ADR_SPACE_SYSTEM_MEMORY:</div><div class='del'>-		/* Only interference checks against SystemIO and SystemMemory</div><div class='del'>-		   are needed */</div><div class='del'>-		res.start = address;</div><div class='del'>-		res.end = address + length - 1;</div><div class='del'>-		res.resource_type = space_id;</div><div class='del'>-		spin_lock(&amp;acpi_res_lock);</div><div class='del'>-		acpi_res_list_del(&amp;res);</div><div class='del'>-		spin_unlock(&amp;acpi_res_lock);</div><div class='del'>-		break;</div><div class='del'>-	case ACPI_ADR_SPACE_PCI_CONFIG:</div><div class='del'>-	case ACPI_ADR_SPACE_EC:</div><div class='del'>-	case ACPI_ADR_SPACE_SMBUS:</div><div class='del'>-	case ACPI_ADR_SPACE_CMOS:</div><div class='del'>-	case ACPI_ADR_SPACE_PCI_BAR_TARGET:</div><div class='del'>-	case ACPI_ADR_SPACE_DATA_TABLE:</div><div class='del'>-	case ACPI_ADR_SPACE_FIXED_HARDWARE:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return AE_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * FUNCTION:    acpi_os_validate_address</div><div class='del'>- *</div><div class='del'>- * PARAMETERS:  space_id             - ACPI space ID</div><div class='del'>- *              address             - Physical address</div><div class='del'>- *              length              - Address length</div><div class='del'>- *</div><div class='del'>- * RETURN:      AE_OK if address/length is valid for the space_id. Otherwise,</div><div class='del'>- *              should return AE_AML_ILLEGAL_ADDRESS.</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION: Validate a system address via the host OS. Used to validate</div><div class='del'>- *              the addresses accessed by AML operation regions.</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-acpi_status</div><div class='del'>-acpi_os_validate_address (</div><div class='del'>-    u8                   space_id,</div><div class='del'>-    acpi_physical_address   address,</div><div class='del'>-    acpi_size               length,</div><div class='del'>-    char *name)</div><div class='del'>-{</div><div class='del'>-	struct acpi_res_list *res;</div><div class='del'>-	int added;</div><div class='del'>-	if (acpi_enforce_resources == ENFORCE_RESOURCES_NO)</div><div class='del'>-		return AE_OK;</div><div class='del'>-</div><div class='del'>-	switch (space_id) {</div><div class='del'>-	case ACPI_ADR_SPACE_SYSTEM_IO:</div><div class='del'>-	case ACPI_ADR_SPACE_SYSTEM_MEMORY:</div><div class='del'>-		/* Only interference checks against SystemIO and SystemMemory</div><div class='del'>-		   are needed */</div><div class='del'>-		res = kzalloc(sizeof(struct acpi_res_list), GFP_KERNEL);</div><div class='del'>-		if (!res)</div><div class='del'>-			return AE_OK;</div><div class='del'>-		/* ACPI names are fixed to 4 bytes, still better use strlcpy */</div><div class='del'>-		strlcpy(res-&gt;name, name, 5);</div><div class='del'>-		res-&gt;start = address;</div><div class='del'>-		res-&gt;end = address + length - 1;</div><div class='del'>-		res-&gt;resource_type = space_id;</div><div class='del'>-		spin_lock(&amp;acpi_res_lock);</div><div class='del'>-		added = acpi_res_list_add(res);</div><div class='del'>-		spin_unlock(&amp;acpi_res_lock);</div><div class='del'>-		pr_debug("%s %s resource: start: 0x%llx, end: 0x%llx, "</div><div class='del'>-			 "name: %s\n", added ? "Added" : "Already exist",</div><div class='del'>-			 (space_id == ACPI_ADR_SPACE_SYSTEM_IO)</div><div class='del'>-			 ? "SystemIO" : "System Memory",</div><div class='del'>-			 (unsigned long long)res-&gt;start,</div><div class='del'>-			 (unsigned long long)res-&gt;end,</div><div class='del'>-			 res-&gt;name);</div><div class='del'>-		if (!added)</div><div class='del'>-			kfree(res);</div><div class='del'>-		break;</div><div class='del'>-	case ACPI_ADR_SPACE_PCI_CONFIG:</div><div class='del'>-	case ACPI_ADR_SPACE_EC:</div><div class='del'>-	case ACPI_ADR_SPACE_SMBUS:</div><div class='del'>-	case ACPI_ADR_SPACE_CMOS:</div><div class='del'>-	case ACPI_ADR_SPACE_PCI_BAR_TARGET:</div><div class='del'>-	case ACPI_ADR_SPACE_DATA_TABLE:</div><div class='del'>-	case ACPI_ADR_SPACE_FIXED_HARDWARE:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return AE_OK;</div><div class='del'>-}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> acpi_status __init acpi_os_initialize(void)</div><div class='head'>diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c<br/>index 7f9eba9a0b02..0eefa12e648c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/pci_irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/pci_irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/pci_irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/pci_irq.c</a></div><div class='hunk'>@@ -487,10 +487,10 @@ int acpi_pci_irq_enable(struct pci_dev *dev)</div><div class='ctx'> 	else</div><div class='ctx'> 		link_desc[0] = '\0';</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;dev-&gt;dev, "PCI INT %c%s -&gt; GSI %u (%s, %s) -&gt; IRQ %d\n",</div><div class='del'>-		 pin_name(pin), link_desc, gsi,</div><div class='del'>-		 (triggering == ACPI_LEVEL_SENSITIVE) ? "level" : "edge",</div><div class='del'>-		 (polarity == ACPI_ACTIVE_LOW) ? "low" : "high", dev-&gt;irq);</div><div class='add'>+	dev_dbg(&amp;dev-&gt;dev, "PCI INT %c%s -&gt; GSI %u (%s, %s) -&gt; IRQ %d\n",</div><div class='add'>+		pin_name(pin), link_desc, gsi,</div><div class='add'>+		(triggering == ACPI_LEVEL_SENSITIVE) ? "level" : "edge",</div><div class='add'>+		(polarity == ACPI_ACTIVE_LOW) ? "low" : "high", dev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -524,6 +524,6 @@ void acpi_pci_irq_disable(struct pci_dev *dev)</div><div class='ctx'> 	 * (e.g. PCI_UNDEFINED_IRQ).</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;dev-&gt;dev, "PCI INT %c disabled\n", pin_name(pin));</div><div class='add'>+	dev_dbg(&amp;dev-&gt;dev, "PCI INT %c disabled\n", pin_name(pin));</div><div class='ctx'> 	acpi_unregister_gsi(gsi);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c<br/>index 2672c798272f..7aff6312ce7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/pci_root.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/pci_root.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/pci_root.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/pci_root.c</a></div><div class='hunk'>@@ -596,6 +596,13 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)</div><div class='ctx'> 		if (ACPI_SUCCESS(status)) {</div><div class='ctx'> 			dev_info(root-&gt;bus-&gt;bridge,</div><div class='ctx'> 				"ACPI _OSC control (0x%02x) granted\n", flags);</div><div class='add'>+			if (acpi_gbl_FADT.boot_flags &amp; ACPI_FADT_NO_ASPM) {</div><div class='add'>+				/*</div><div class='add'>+				 * We have ASPM control, but the FADT indicates</div><div class='add'>+				 * that it's unsupported. Clear it.</div><div class='add'>+				 */</div><div class='add'>+				pcie_clear_aspm(root-&gt;bus);</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dev_info(root-&gt;bus-&gt;bridge,</div><div class='ctx'> 				"ACPI _OSC request failed (%s), "</div><div class='head'>diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c<br/>index 07f7fea8a4e2..e50e31a518af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/pci_slot.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/pci_slot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/pci_slot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/pci_slot.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #include &lt;acpi/acpi_drivers.h&gt;</div><div class='ctx'> #include &lt;linux/dmi.h&gt;</div><div class='ctx'> </div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> static int check_sta_before_sun;</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_VERSION 	"0.1"</div><div class='head'>diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c<br/>index 3a0428e8435c..c850de4c9a14 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/processor_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/processor_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/processor_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/processor_core.c</a></div><div class='hunk'>@@ -173,8 +173,30 @@ int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)</div><div class='ctx'> 	apic_id = map_mat_entry(handle, type, acpi_id);</div><div class='ctx'> 	if (apic_id == -1)</div><div class='ctx'> 		apic_id = map_madt_entry(type, acpi_id);</div><div class='del'>-	if (apic_id == -1)</div><div class='del'>-		return apic_id;</div><div class='add'>+	if (apic_id == -1) {</div><div class='add'>+		/*</div><div class='add'>+		 * On UP processor, there is no _MAT or MADT table.</div><div class='add'>+		 * So above apic_id is always set to -1.</div><div class='add'>+		 *</div><div class='add'>+		 * BIOS may define multiple CPU handles even for UP processor.</div><div class='add'>+		 * For example,</div><div class='add'>+		 *</div><div class='add'>+		 * Scope (_PR)</div><div class='add'>+                 * {</div><div class='add'>+		 *     Processor (CPU0, 0x00, 0x00000410, 0x06) {}</div><div class='add'>+		 *     Processor (CPU1, 0x01, 0x00000410, 0x06) {}</div><div class='add'>+		 *     Processor (CPU2, 0x02, 0x00000410, 0x06) {}</div><div class='add'>+		 *     Processor (CPU3, 0x03, 0x00000410, 0x06) {}</div><div class='add'>+		 * }</div><div class='add'>+		 *</div><div class='add'>+		 * Ignores apic_id and always return 0 for CPU0's handle.</div><div class='add'>+		 * Return -1 for other CPU's handle.</div><div class='add'>+		 */</div><div class='add'>+		if (acpi_id == 0)</div><div class='add'>+			return acpi_id;</div><div class='add'>+		else</div><div class='add'>+			return apic_id;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	for_each_possible_cpu(i) {</div><div class='head'>diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c<br/>index 9d7bc9f6b6cc..0034ede38710 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/processor_driver.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/processor_driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/processor_driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/processor_driver.c</a></div><div class='hunk'>@@ -82,7 +82,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> static int acpi_processor_add(struct acpi_device *device);</div><div class='ctx'> static int acpi_processor_remove(struct acpi_device *device, int type);</div><div class='ctx'> static void acpi_processor_notify(struct acpi_device *device, u32 event);</div><div class='del'>-static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu);</div><div class='add'>+static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr);</div><div class='ctx'> static int acpi_processor_handle_eject(struct acpi_processor *pr);</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -324,10 +324,8 @@ static int acpi_processor_get_info(struct acpi_device *device)</div><div class='ctx'> 	 *  they are physically not present.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pr-&gt;id == -1) {</div><div class='del'>-		if (ACPI_FAILURE</div><div class='del'>-		    (acpi_processor_hotadd_init(pr-&gt;handle, &amp;pr-&gt;id))) {</div><div class='add'>+		if (ACPI_FAILURE(acpi_processor_hotadd_init(pr)))</div><div class='ctx'> 			return -ENODEV;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * On some boxes several processors use the same processor bus id.</div><div class='hunk'>@@ -446,7 +444,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_processor *pr = NULL;</div><div class='ctx'> 	int result = 0;</div><div class='del'>-	struct sys_device *sysdev;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> </div><div class='ctx'> 	pr = kzalloc(sizeof(struct acpi_processor), GFP_KERNEL);</div><div class='ctx'> 	if (!pr)</div><div class='hunk'>@@ -491,8 +489,8 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)</div><div class='ctx'> </div><div class='ctx'> 	per_cpu(processors, pr-&gt;id) = pr;</div><div class='ctx'> </div><div class='del'>-	sysdev = get_cpu_sysdev(pr-&gt;id);</div><div class='del'>-	if (sysfs_create_link(&amp;device-&gt;dev.kobj, &amp;sysdev-&gt;kobj, "sysdev")) {</div><div class='add'>+	dev = get_cpu_device(pr-&gt;id);</div><div class='add'>+	if (sysfs_create_link(&amp;device-&gt;dev.kobj, &amp;dev-&gt;kobj, "sysdev")) {</div><div class='ctx'> 		result = -EFAULT;</div><div class='ctx'> 		goto err_free_cpumask;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -539,6 +537,7 @@ err_thermal_unregister:</div><div class='ctx'> 	thermal_cooling_device_unregister(pr-&gt;cdev);</div><div class='ctx'> err_power_exit:</div><div class='ctx'> 	acpi_processor_power_exit(pr, device);</div><div class='add'>+	sysfs_remove_link(&amp;device-&gt;dev.kobj, "sysdev");</div><div class='ctx'> err_free_cpumask:</div><div class='ctx'> 	free_cpumask_var(pr-&gt;throttling.shared_cpu_map);</div><div class='ctx'> </div><div class='hunk'>@@ -720,18 +719,19 @@ processor_walk_namespace_cb(acpi_handle handle,</div><div class='ctx'> 	return (AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu)</div><div class='add'>+static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr)</div><div class='ctx'> {</div><div class='add'>+	acpi_handle handle = pr-&gt;handle;</div><div class='ctx'> </div><div class='ctx'> 	if (!is_processor_present(handle)) {</div><div class='ctx'> 		return AE_ERROR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (acpi_map_lsapic(handle, p_cpu))</div><div class='add'>+	if (acpi_map_lsapic(handle, &amp;pr-&gt;id))</div><div class='ctx'> 		return AE_ERROR;</div><div class='ctx'> </div><div class='del'>-	if (arch_register_cpu(*p_cpu)) {</div><div class='del'>-		acpi_unmap_lsapic(*p_cpu);</div><div class='add'>+	if (arch_register_cpu(pr-&gt;id)) {</div><div class='add'>+		acpi_unmap_lsapic(pr-&gt;id);</div><div class='ctx'> 		return AE_ERROR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -748,7 +748,7 @@ static int acpi_processor_handle_eject(struct acpi_processor *pr)</div><div class='ctx'> 	return (0);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu)</div><div class='add'>+static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr)</div><div class='ctx'> {</div><div class='ctx'> 	return AE_ERROR;</div><div class='ctx'> }</div><div class='hunk'>@@ -827,8 +827,6 @@ static void __exit acpi_processor_exit(void)</div><div class='ctx'> </div><div class='ctx'> 	acpi_bus_unregister_driver(&amp;acpi_processor_driver);</div><div class='ctx'> </div><div class='del'>-	cpuidle_unregister_driver(&amp;acpi_idle_driver);</div><div class='del'>-</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c<br/>index 870550d6a4bf..3b599abf2b40 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/processor_thermal.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/processor_thermal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/processor_thermal.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/processor_thermal.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c<br/>index 6d9a3ab58db2..0a7ed69546ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/sleep.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/sleep.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/sleep.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/sleep.c</a></div><div class='hunk'>@@ -476,6 +476,22 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {</div><div class='ctx'> 		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW520F"),</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+	.callback = init_nvs_nosave,</div><div class='add'>+	.ident = "Asus K54C",</div><div class='add'>+	.matches = {</div><div class='add'>+		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),</div><div class='add'>+		DMI_MATCH(DMI_PRODUCT_NAME, "K54C"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	.callback = init_nvs_nosave,</div><div class='add'>+	.ident = "Asus K54HR",</div><div class='add'>+	.matches = {</div><div class='add'>+		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),</div><div class='add'>+		DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_SUSPEND */</div><div class='head'>diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c<br/>index 08a44b532f7c..eaef02afc7cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/video.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/acpi/video.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/acpi/video.c</a></div><div class='hunk'>@@ -69,21 +69,21 @@ MODULE_AUTHOR("Bruno Ducrot");</div><div class='ctx'> MODULE_DESCRIPTION("ACPI Video Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static int brightness_switch_enabled = 1;</div><div class='add'>+static bool brightness_switch_enabled = 1;</div><div class='ctx'> module_param(brightness_switch_enabled, bool, 0644);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * By default, we don't allow duplicate ACPI video bus devices</div><div class='ctx'>  * under the same VGA controller</div><div class='ctx'>  */</div><div class='del'>-static int allow_duplicates;</div><div class='add'>+static bool allow_duplicates;</div><div class='ctx'> module_param(allow_duplicates, bool, 0644);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Some BIOSes claim they use minimum backlight at boot,</div><div class='ctx'>  * and this may bring dimming screen after boot</div><div class='ctx'>  */</div><div class='del'>-static int use_bios_initial_backlight = 1;</div><div class='add'>+static bool use_bios_initial_backlight = 1;</div><div class='ctx'> module_param(use_bios_initial_backlight, bool, 0644);</div><div class='ctx'> </div><div class='ctx'> static int register_count = 0;</div><div class='head'>diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c<br/>index bd230e801131..54eaf96ab217 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/amba/bus.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/amba/bus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/amba/bus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/amba/bus.c</a></div><div class='hunk'>@@ -52,6 +52,10 @@ static int amba_uevent(struct device *dev, struct kobj_uevent_env *env)</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	retval = add_uevent_var(env, "AMBA_ID=%08x", pcdev-&gt;periphid);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	retval = add_uevent_var(env, "MODALIAS=amba:d%08X", pcdev-&gt;periphid);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='hunk'>@@ -109,31 +113,7 @@ static int amba_legacy_resume(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int amba_pm_prepare(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (drv &amp;&amp; drv-&gt;pm &amp;&amp; drv-&gt;pm-&gt;prepare)</div><div class='del'>-		ret = drv-&gt;pm-&gt;prepare(dev);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void amba_pm_complete(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-</div><div class='del'>-	if (drv &amp;&amp; drv-&gt;pm &amp;&amp; drv-&gt;pm-&gt;complete)</div><div class='del'>-		drv-&gt;pm-&gt;complete(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else /* !CONFIG_PM_SLEEP */</div><div class='del'>-</div><div class='del'>-#define amba_pm_prepare		NULL</div><div class='del'>-#define amba_pm_complete		NULL</div><div class='del'>-</div><div class='del'>-#endif /* !CONFIG_PM_SLEEP */</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SUSPEND</div><div class='ctx'> </div><div class='hunk'>@@ -155,22 +135,6 @@ static int amba_pm_suspend(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int amba_pm_suspend_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;suspend_noirq)</div><div class='del'>-			ret = drv-&gt;pm-&gt;suspend_noirq(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='ctx'> static int amba_pm_resume(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_driver *drv = dev-&gt;driver;</div><div class='hunk'>@@ -189,28 +153,10 @@ static int amba_pm_resume(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int amba_pm_resume_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;resume_noirq)</div><div class='del'>-			ret = drv-&gt;pm-&gt;resume_noirq(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='ctx'> #else /* !CONFIG_SUSPEND */</div><div class='ctx'> </div><div class='ctx'> #define amba_pm_suspend		NULL</div><div class='ctx'> #define amba_pm_resume		NULL</div><div class='del'>-#define amba_pm_suspend_noirq	NULL</div><div class='del'>-#define amba_pm_resume_noirq	NULL</div><div class='ctx'> </div><div class='ctx'> #endif /* !CONFIG_SUSPEND */</div><div class='ctx'> </div><div class='hunk'>@@ -234,22 +180,6 @@ static int amba_pm_freeze(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int amba_pm_freeze_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;freeze_noirq)</div><div class='del'>-			ret = drv-&gt;pm-&gt;freeze_noirq(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='ctx'> static int amba_pm_thaw(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_driver *drv = dev-&gt;driver;</div><div class='hunk'>@@ -268,22 +198,6 @@ static int amba_pm_thaw(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int amba_pm_thaw_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;thaw_noirq)</div><div class='del'>-			ret = drv-&gt;pm-&gt;thaw_noirq(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='ctx'> static int amba_pm_poweroff(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_driver *drv = dev-&gt;driver;</div><div class='hunk'>@@ -302,22 +216,6 @@ static int amba_pm_poweroff(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int amba_pm_poweroff_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;poweroff_noirq)</div><div class='del'>-			ret = drv-&gt;pm-&gt;poweroff_noirq(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='ctx'> static int amba_pm_restore(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_driver *drv = dev-&gt;driver;</div><div class='hunk'>@@ -336,32 +234,12 @@ static int amba_pm_restore(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int amba_pm_restore_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;restore_noirq)</div><div class='del'>-			ret = drv-&gt;pm-&gt;restore_noirq(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='ctx'> #else /* !CONFIG_HIBERNATE_CALLBACKS */</div><div class='ctx'> </div><div class='ctx'> #define amba_pm_freeze		NULL</div><div class='ctx'> #define amba_pm_thaw		NULL</div><div class='ctx'> #define amba_pm_poweroff		NULL</div><div class='ctx'> #define amba_pm_restore		NULL</div><div class='del'>-#define amba_pm_freeze_noirq	NULL</div><div class='del'>-#define amba_pm_thaw_noirq		NULL</div><div class='del'>-#define amba_pm_poweroff_noirq	NULL</div><div class='del'>-#define amba_pm_restore_noirq	NULL</div><div class='ctx'> </div><div class='ctx'> #endif /* !CONFIG_HIBERNATE_CALLBACKS */</div><div class='ctx'> </div><div class='hunk'>@@ -402,20 +280,12 @@ static int amba_pm_runtime_resume(struct device *dev)</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> </div><div class='ctx'> static const struct dev_pm_ops amba_pm = {</div><div class='del'>-	.prepare	= amba_pm_prepare,</div><div class='del'>-	.complete	= amba_pm_complete,</div><div class='ctx'> 	.suspend	= amba_pm_suspend,</div><div class='ctx'> 	.resume		= amba_pm_resume,</div><div class='ctx'> 	.freeze		= amba_pm_freeze,</div><div class='ctx'> 	.thaw		= amba_pm_thaw,</div><div class='ctx'> 	.poweroff	= amba_pm_poweroff,</div><div class='ctx'> 	.restore	= amba_pm_restore,</div><div class='del'>-	.suspend_noirq	= amba_pm_suspend_noirq,</div><div class='del'>-	.resume_noirq	= amba_pm_resume_noirq,</div><div class='del'>-	.freeze_noirq	= amba_pm_freeze_noirq,</div><div class='del'>-	.thaw_noirq	= amba_pm_thaw_noirq,</div><div class='del'>-	.poweroff_noirq	= amba_pm_poweroff_noirq,</div><div class='del'>-	.restore_noirq	= amba_pm_restore_noirq,</div><div class='ctx'> 	SET_RUNTIME_PM_OPS(</div><div class='ctx'> 		amba_pm_runtime_suspend,</div><div class='ctx'> 		amba_pm_runtime_resume,</div><div class='head'>diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig<br/>index cf047c406d92..6bdedd7cca2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/Kconfig</a></div><div class='hunk'>@@ -820,7 +820,7 @@ config PATA_PLATFORM</div><div class='ctx'> </div><div class='ctx'> config PATA_OF_PLATFORM</div><div class='ctx'> 	tristate "OpenFirmware platform device PATA support"</div><div class='del'>-	depends on PATA_PLATFORM &amp;&amp; OF &amp;&amp; OF_IRQ</div><div class='add'>+	depends on PATA_PLATFORM &amp;&amp; OF</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for generic directly connected ATA</div><div class='ctx'> 	  devices commonly found on embedded systems with OpenFirmware</div><div class='head'>diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c<br/>index cf26222a93c5..d07bf0366d99 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/ahci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/ahci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/ahci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/ahci.c</a></div><div class='hunk'>@@ -52,7 +52,8 @@</div><div class='ctx'> #define DRV_VERSION	"3.0"</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	AHCI_PCI_BAR		= 5,</div><div class='add'>+	AHCI_PCI_BAR_STA2X11	= 0,</div><div class='add'>+	AHCI_PCI_BAR_STANDARD	= 5,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum board_ids {</div><div class='hunk'>@@ -375,6 +376,9 @@ static const struct pci_device_id ahci_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(SI, 0x1185), board_ahci },		/* SiS 968 */</div><div class='ctx'> 	{ PCI_VDEVICE(SI, 0x0186), board_ahci },		/* SiS 968 */</div><div class='ctx'> </div><div class='add'>+	/* ST Microelectronics */</div><div class='add'>+	{ PCI_VDEVICE(STMICRO, 0xCC06), board_ahci },		/* ST ConneXt */</div><div class='add'>+</div><div class='ctx'> 	/* Marvell */</div><div class='ctx'> 	{ PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv },	/* 6145 */</div><div class='ctx'> 	{ PCI_VDEVICE(MARVELL, 0x6121), board_ahci_mv },	/* 6121 */</div><div class='hunk'>@@ -622,6 +626,13 @@ static int ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If the device fixup already set the dma_mask to some non-standard</div><div class='add'>+	 * value, don't extend it here. This happens on STA2X11, for example.</div><div class='add'>+	 */</div><div class='add'>+	if (pdev-&gt;dma_mask &amp;&amp; pdev-&gt;dma_mask &lt; DMA_BIT_MASK(32))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (using_dac &amp;&amp;</div><div class='ctx'> 	    !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {</div><div class='ctx'> 		rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));</div><div class='hunk'>@@ -1026,6 +1037,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	struct ahci_host_priv *hpriv;</div><div class='ctx'> 	struct ata_host *host;</div><div class='ctx'> 	int n_ports, i, rc;</div><div class='add'>+	int ahci_pci_bar = AHCI_PCI_BAR_STANDARD;</div><div class='ctx'> </div><div class='ctx'> 	VPRINTK("ENTER\n");</div><div class='ctx'> </div><div class='hunk'>@@ -1057,6 +1069,10 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		dev_info(&amp;pdev-&gt;dev,</div><div class='ctx'> 			 "PDC42819 can only drive SATA devices with this driver\n");</div><div class='ctx'> </div><div class='add'>+	/* The Connext uses non-standard BAR */</div><div class='add'>+	if (pdev-&gt;vendor == PCI_VENDOR_ID_STMICRO &amp;&amp; pdev-&gt;device == 0xCC06)</div><div class='add'>+		ahci_pci_bar = AHCI_PCI_BAR_STA2X11;</div><div class='add'>+</div><div class='ctx'> 	/* acquire resources */</div><div class='ctx'> 	rc = pcim_enable_device(pdev);</div><div class='ctx'> 	if (rc)</div><div class='hunk'>@@ -1065,7 +1081,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	/* AHCI controllers often implement SFF compatible interface.</div><div class='ctx'> 	 * Grab all PCI BARs just in case.</div><div class='ctx'> 	 */</div><div class='del'>-	rc = pcim_iomap_regions_request_all(pdev, 1 &lt;&lt; AHCI_PCI_BAR, DRV_NAME);</div><div class='add'>+	rc = pcim_iomap_regions_request_all(pdev, 1 &lt;&lt; ahci_pci_bar, DRV_NAME);</div><div class='ctx'> 	if (rc == -EBUSY)</div><div class='ctx'> 		pcim_pin_device(pdev);</div><div class='ctx'> 	if (rc)</div><div class='hunk'>@@ -1108,7 +1124,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	if ((hpriv-&gt;flags &amp; AHCI_HFLAG_NO_MSI) || pci_enable_msi(pdev))</div><div class='ctx'> 		pci_intx(pdev, 1);</div><div class='ctx'> </div><div class='del'>-	hpriv-&gt;mmio = pcim_iomap_table(pdev)[AHCI_PCI_BAR];</div><div class='add'>+	hpriv-&gt;mmio = pcim_iomap_table(pdev)[ahci_pci_bar];</div><div class='ctx'> </div><div class='ctx'> 	/* save initial config */</div><div class='ctx'> 	ahci_pci_save_initial_config(pdev, hpriv);</div><div class='hunk'>@@ -1172,8 +1188,8 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	for (i = 0; i &lt; host-&gt;n_ports; i++) {</div><div class='ctx'> 		struct ata_port *ap = host-&gt;ports[i];</div><div class='ctx'> </div><div class='del'>-		ata_port_pbar_desc(ap, AHCI_PCI_BAR, -1, "abar");</div><div class='del'>-		ata_port_pbar_desc(ap, AHCI_PCI_BAR,</div><div class='add'>+		ata_port_pbar_desc(ap, ahci_pci_bar, -1, "abar");</div><div class='add'>+		ata_port_pbar_desc(ap, ahci_pci_bar,</div><div class='ctx'> 				   0x100 + ap-&gt;port_no * 0x80, "port");</div><div class='ctx'> </div><div class='ctx'> 		/* set enclosure management message type */</div><div class='head'>diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c<br/>index 43b875810d1b..48be4e189163 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/ahci_platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/ahci_platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/ahci_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/ahci_platform.c</a></div><div class='hunk'>@@ -202,6 +202,71 @@ static int __devexit ahci_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</div><div class='add'>+static int ahci_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ahci_platform_data *pdata = dev_get_platdata(dev);</div><div class='add'>+	struct ata_host *host = dev_get_drvdata(dev);</div><div class='add'>+	struct ahci_host_priv *hpriv = host-&gt;private_data;</div><div class='add'>+	void __iomem *mmio = hpriv-&gt;mmio;</div><div class='add'>+	u32 ctl;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (hpriv-&gt;flags &amp; AHCI_HFLAG_NO_SUSPEND) {</div><div class='add'>+		dev_err(dev, "firmware update required for suspend/resume\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * AHCI spec rev1.1 section 8.3.3:</div><div class='add'>+	 * Software must disable interrupts prior to requesting a</div><div class='add'>+	 * transition of the HBA to D3 state.</div><div class='add'>+	 */</div><div class='add'>+	ctl = readl(mmio + HOST_CTL);</div><div class='add'>+	ctl &amp;= ~HOST_IRQ_EN;</div><div class='add'>+	writel(ctl, mmio + HOST_CTL);</div><div class='add'>+	readl(mmio + HOST_CTL); /* flush */</div><div class='add'>+</div><div class='add'>+	rc = ata_host_suspend(host, PMSG_SUSPEND);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (pdata &amp;&amp; pdata-&gt;suspend)</div><div class='add'>+		return pdata-&gt;suspend(dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahci_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ahci_platform_data *pdata = dev_get_platdata(dev);</div><div class='add'>+	struct ata_host *host = dev_get_drvdata(dev);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (pdata &amp;&amp; pdata-&gt;resume) {</div><div class='add'>+		rc = pdata-&gt;resume(dev);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;power.power_state.event == PM_EVENT_SUSPEND) {</div><div class='add'>+		rc = ahci_reset_controller(host);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+</div><div class='add'>+		ahci_init_controller(host);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ata_host_resume(host);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dev_pm_ops ahci_pm_ops = {</div><div class='add'>+	.suspend		= &amp;ahci_suspend,</div><div class='add'>+	.resume			= &amp;ahci_resume,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id ahci_of_match[] = {</div><div class='ctx'> 	{ .compatible = "calxeda,hb-ahci", },</div><div class='ctx'> 	{},</div><div class='hunk'>@@ -214,6 +279,9 @@ static struct platform_driver ahci_driver = {</div><div class='ctx'> 		.name = "ahci",</div><div class='ctx'> 		.owner = THIS_MODULE,</div><div class='ctx'> 		.of_match_table = ahci_of_match,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+		.pm = &amp;ahci_pm_ops,</div><div class='add'>+#endif</div><div class='ctx'> 	},</div><div class='ctx'> 	.id_table	= ahci_devtype,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c<br/>index 69ac373c72ab..fdf27b9fce43 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/ata_piix.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/ata_piix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/ata_piix.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/ata_piix.c</a></div><div class='hunk'>@@ -1117,6 +1117,13 @@ static int piix_broken_suspend(void)</div><div class='ctx'> 			},</div><div class='ctx'> 		},</div><div class='ctx'> 		{</div><div class='add'>+			.ident = "Satellite Pro A120",</div><div class='add'>+			.matches = {</div><div class='add'>+				DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),</div><div class='add'>+				DMI_MATCH(DMI_PRODUCT_NAME, "Satellite Pro A120"),</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='ctx'> 			.ident = "Portege M500",</div><div class='ctx'> 			.matches = {</div><div class='ctx'> 				DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),</div><div class='head'>diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c<br/>index 3c92dbd751e0..a72bfd0ecfee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/libahci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/libahci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/libahci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/libahci.c</a></div><div class='hunk'>@@ -746,9 +746,6 @@ static void ahci_start_port(struct ata_port *ap)</div><div class='ctx'> 	/* enable FIS reception */</div><div class='ctx'> 	ahci_start_fis_rx(ap);</div><div class='ctx'> </div><div class='del'>-	/* enable DMA */</div><div class='del'>-	ahci_start_engine(ap);</div><div class='del'>-</div><div class='ctx'> 	/* turn on LEDs */</div><div class='ctx'> 	if (ap-&gt;flags &amp; ATA_FLAG_EM) {</div><div class='ctx'> 		ata_for_each_link(link, ap, EDGE) {</div><div class='hunk'>@@ -2022,7 +2019,7 @@ static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg)</div><div class='ctx'> 		ahci_power_down(ap);</div><div class='ctx'> 	else {</div><div class='ctx'> 		ata_port_err(ap, "%s (%d)\n", emsg, rc);</div><div class='del'>-		ahci_start_port(ap);</div><div class='add'>+		ata_port_freeze(ap);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='head'>diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c<br/>index c04ad68cb602..c06e0ec11556 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/libata-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/libata-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/libata-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/libata-core.c</a></div><div class='hunk'>@@ -66,6 +66,7 @@</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;linux/cdrom.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "libata.h"</div><div class='ctx'> #include "libata-transport.h"</div><div class='hunk'>@@ -3248,10 +3249,10 @@ int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)</div><div class='ctx'> 		ata_force_xfermask(dev);</div><div class='ctx'> </div><div class='ctx'> 		pio_mask = ata_pack_xfermask(dev-&gt;pio_mask, 0, 0);</div><div class='del'>-		dma_mask = ata_pack_xfermask(0, dev-&gt;mwdma_mask, dev-&gt;udma_mask);</div><div class='ctx'> </div><div class='ctx'> 		if (libata_dma_mask &amp; mode_mask)</div><div class='del'>-			dma_mask = ata_pack_xfermask(0, dev-&gt;mwdma_mask, dev-&gt;udma_mask);</div><div class='add'>+			dma_mask = ata_pack_xfermask(0, dev-&gt;mwdma_mask,</div><div class='add'>+						     dev-&gt;udma_mask);</div><div class='ctx'> 		else</div><div class='ctx'> 			dma_mask = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -4124,6 +4125,8 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {</div><div class='ctx'> 	 * device and controller are SATA.</div><div class='ctx'> 	 */</div><div class='ctx'> 	{ "PIONEER DVD-RW  DVRTD08",	NULL,	ATA_HORKAGE_NOSETXFER },</div><div class='add'>+	{ "PIONEER DVD-RW  DVRTD08A",	NULL,	ATA_HORKAGE_NOSETXFER },</div><div class='add'>+	{ "PIONEER DVD-RW  DVR-215",	NULL,	ATA_HORKAGE_NOSETXFER },</div><div class='ctx'> 	{ "PIONEER DVD-RW  DVR-212D",	NULL,	ATA_HORKAGE_NOSETXFER },</div><div class='ctx'> 	{ "PIONEER DVD-RW  DVR-216D",	NULL,	ATA_HORKAGE_NOSETXFER },</div><div class='ctx'> </div><div class='hunk'>@@ -5234,73 +5237,55 @@ bool ata_link_offline(struct ata_link *link)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='del'>-static int ata_host_request_pm(struct ata_host *host, pm_message_t mesg,</div><div class='add'>+static int ata_port_request_pm(struct ata_port *ap, pm_message_t mesg,</div><div class='ctx'> 			       unsigned int action, unsigned int ehi_flags,</div><div class='ctx'> 			       int wait)</div><div class='ctx'> {</div><div class='add'>+	struct ata_link *link;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	int i, rc;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; host-&gt;n_ports; i++) {</div><div class='del'>-		struct ata_port *ap = host-&gt;ports[i];</div><div class='del'>-		struct ata_link *link;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-		/* Previous resume operation might still be in</div><div class='del'>-		 * progress.  Wait for PM_PENDING to clear.</div><div class='del'>-		 */</div><div class='del'>-		if (ap-&gt;pflags &amp; ATA_PFLAG_PM_PENDING) {</div><div class='del'>-			ata_port_wait_eh(ap);</div><div class='del'>-			WARN_ON(ap-&gt;pflags &amp; ATA_PFLAG_PM_PENDING);</div><div class='del'>-		}</div><div class='add'>+	/* Previous resume operation might still be in</div><div class='add'>+	 * progress.  Wait for PM_PENDING to clear.</div><div class='add'>+	 */</div><div class='add'>+	if (ap-&gt;pflags &amp; ATA_PFLAG_PM_PENDING) {</div><div class='add'>+		ata_port_wait_eh(ap);</div><div class='add'>+		WARN_ON(ap-&gt;pflags &amp; ATA_PFLAG_PM_PENDING);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* request PM ops to EH */</div><div class='del'>-		spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+	/* request PM ops to EH */</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-		ap-&gt;pm_mesg = mesg;</div><div class='del'>-		if (wait) {</div><div class='del'>-			rc = 0;</div><div class='del'>-			ap-&gt;pm_result = &amp;rc;</div><div class='del'>-		}</div><div class='add'>+	ap-&gt;pm_mesg = mesg;</div><div class='add'>+	if (wait) {</div><div class='add'>+		rc = 0;</div><div class='add'>+		ap-&gt;pm_result = &amp;rc;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		ap-&gt;pflags |= ATA_PFLAG_PM_PENDING;</div><div class='del'>-		ata_for_each_link(link, ap, HOST_FIRST) {</div><div class='del'>-			link-&gt;eh_info.action |= action;</div><div class='del'>-			link-&gt;eh_info.flags |= ehi_flags;</div><div class='del'>-		}</div><div class='add'>+	ap-&gt;pflags |= ATA_PFLAG_PM_PENDING;</div><div class='add'>+	ata_for_each_link(link, ap, HOST_FIRST) {</div><div class='add'>+		link-&gt;eh_info.action |= action;</div><div class='add'>+		link-&gt;eh_info.flags |= ehi_flags;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		ata_port_schedule_eh(ap);</div><div class='add'>+	ata_port_schedule_eh(ap);</div><div class='ctx'> </div><div class='del'>-		spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-		/* wait and check result */</div><div class='del'>-		if (wait) {</div><div class='del'>-			ata_port_wait_eh(ap);</div><div class='del'>-			WARN_ON(ap-&gt;pflags &amp; ATA_PFLAG_PM_PENDING);</div><div class='del'>-			if (rc)</div><div class='del'>-				return rc;</div><div class='del'>-		}</div><div class='add'>+	/* wait and check result */</div><div class='add'>+	if (wait) {</div><div class='add'>+		ata_port_wait_eh(ap);</div><div class='add'>+		WARN_ON(ap-&gt;pflags &amp; ATA_PFLAG_PM_PENDING);</div><div class='ctx'> 	}</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='del'>-/**</div><div class='del'>- *	ata_host_suspend - suspend host</div><div class='del'>- *	@host: host to suspend</div><div class='del'>- *	@mesg: PM message</div><div class='del'>- *</div><div class='del'>- *	Suspend @host.  Actual operation is performed by EH.  This</div><div class='del'>- *	function requests EH to perform PM operations and waits for EH</div><div class='del'>- *	to finish.</div><div class='del'>- *</div><div class='del'>- *	LOCKING:</div><div class='del'>- *	Kernel thread context (may sleep).</div><div class='del'>- *</div><div class='del'>- *	RETURNS:</div><div class='del'>- *	0 on success, -errno on failure.</div><div class='del'>- */</div><div class='del'>-int ata_host_suspend(struct ata_host *host, pm_message_t mesg)</div><div class='add'>+#define to_ata_port(d) container_of(d, struct ata_port, tdev)</div><div class='add'>+</div><div class='add'>+static int ata_port_suspend_common(struct device *dev, pm_message_t mesg)</div><div class='ctx'> {</div><div class='add'>+	struct ata_port *ap = to_ata_port(dev);</div><div class='ctx'> 	unsigned int ehi_flags = ATA_EHI_QUIET;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -5315,31 +5300,108 @@ int ata_host_suspend(struct ata_host *host, pm_message_t mesg)</div><div class='ctx'> 	if (mesg.event == PM_EVENT_SUSPEND)</div><div class='ctx'> 		ehi_flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_NO_RECOVERY;</div><div class='ctx'> </div><div class='del'>-	rc = ata_host_request_pm(host, mesg, 0, ehi_flags, 1);</div><div class='del'>-	if (rc == 0)</div><div class='del'>-		host-&gt;dev-&gt;power.power_state = mesg;</div><div class='add'>+	rc = ata_port_request_pm(ap, mesg, 0, ehi_flags, 1);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ata_port_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	if (pm_runtime_suspended(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ata_port_suspend_common(dev, PMSG_SUSPEND);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ata_port_do_freeze(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	if (pm_runtime_suspended(dev))</div><div class='add'>+		pm_runtime_resume(dev);</div><div class='add'>+</div><div class='add'>+	return ata_port_suspend_common(dev, PMSG_FREEZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ata_port_poweroff(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	if (pm_runtime_suspended(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ata_port_suspend_common(dev, PMSG_HIBERNATE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ata_port_resume_common(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = to_ata_port(dev);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = ata_port_request_pm(ap, PMSG_ON, ATA_EH_RESET,</div><div class='add'>+		ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET, 1);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ata_port_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = ata_port_resume_common(dev);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		pm_runtime_disable(dev);</div><div class='add'>+		pm_runtime_set_active(dev);</div><div class='add'>+		pm_runtime_enable(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ata_port_runtime_idle(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return pm_runtime_suspend(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops ata_port_pm_ops = {</div><div class='add'>+	.suspend = ata_port_suspend,</div><div class='add'>+	.resume = ata_port_resume,</div><div class='add'>+	.freeze = ata_port_do_freeze,</div><div class='add'>+	.thaw = ata_port_resume,</div><div class='add'>+	.poweroff = ata_port_poweroff,</div><div class='add'>+	.restore = ata_port_resume,</div><div class='add'>+</div><div class='add'>+	.runtime_suspend = ata_port_suspend,</div><div class='add'>+	.runtime_resume = ata_port_resume_common,</div><div class='add'>+	.runtime_idle = ata_port_runtime_idle,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_host_suspend - suspend host</div><div class='add'>+ *	@host: host to suspend</div><div class='add'>+ *	@mesg: PM message</div><div class='add'>+ *</div><div class='add'>+ *	Suspend @host.  Actual operation is performed by port suspend.</div><div class='add'>+ */</div><div class='add'>+int ata_host_suspend(struct ata_host *host, pm_message_t mesg)</div><div class='add'>+{</div><div class='add'>+	host-&gt;dev-&gt;power.power_state = mesg;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	ata_host_resume - resume host</div><div class='ctx'>  *	@host: host to resume</div><div class='ctx'>  *</div><div class='del'>- *	Resume @host.  Actual operation is performed by EH.  This</div><div class='del'>- *	function requests EH to perform PM operations and returns.</div><div class='del'>- *	Note that all resume operations are performed parallelly.</div><div class='del'>- *</div><div class='del'>- *	LOCKING:</div><div class='del'>- *	Kernel thread context (may sleep).</div><div class='add'>+ *	Resume @host.  Actual operation is performed by port resume.</div><div class='ctx'>  */</div><div class='ctx'> void ata_host_resume(struct ata_host *host)</div><div class='ctx'> {</div><div class='del'>-	ata_host_request_pm(host, PMSG_ON, ATA_EH_RESET,</div><div class='del'>-			    ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET, 0);</div><div class='ctx'> 	host-&gt;dev-&gt;power.power_state = PMSG_ON;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+struct device_type ata_port_type = {</div><div class='add'>+	.name = "ata_port",</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.pm = &amp;ata_port_pm_ops,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	ata_dev_init - Initialize an ata_device structure</div><div class='ctx'>  *	@dev: Device structure to initialize</div><div class='head'>diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c<br/>index 2a5412e7e9c1..508a60bfe5c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/libata-scsi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/libata-scsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/libata-scsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/libata-scsi.c</a></div><div class='hunk'>@@ -3381,6 +3381,7 @@ int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht)</div><div class='ctx'> 		if (!shost)</div><div class='ctx'> 			goto err_alloc;</div><div class='ctx'> </div><div class='add'>+		shost-&gt;eh_noresume = 1;</div><div class='ctx'> 		*(struct ata_port **)&amp;shost-&gt;hostdata[0] = ap;</div><div class='ctx'> 		ap-&gt;scsi_host = shost;</div><div class='ctx'> </div><div class='hunk'>@@ -3398,7 +3399,7 @@ int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht)</div><div class='ctx'> 		 */</div><div class='ctx'> 		shost-&gt;max_host_blocked = 1;</div><div class='ctx'> </div><div class='del'>-		rc = scsi_add_host(ap-&gt;scsi_host, ap-&gt;host-&gt;dev);</div><div class='add'>+		rc = scsi_add_host(ap-&gt;scsi_host, &amp;ap-&gt;tdev);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto err_add;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c<br/>index 4cadfa28f940..9691dd0966d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/libata-sff.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/libata-sff.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/libata-sff.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/libata-sff.c</a></div><div class='hunk'>@@ -929,11 +929,11 @@ static void atapi_pio_bytes(struct ata_queued_cmd *qc)</div><div class='ctx'> 	bytes = (bc_hi &lt;&lt; 8) | bc_lo;</div><div class='ctx'> </div><div class='ctx'> 	/* shall be cleared to zero, indicating xfer of data */</div><div class='del'>-	if (unlikely(ireason &amp; (1 &lt;&lt; 0)))</div><div class='add'>+	if (unlikely(ireason &amp; ATAPI_COD))</div><div class='ctx'> 		goto atapi_check;</div><div class='ctx'> </div><div class='ctx'> 	/* make sure transfer direction matches expected */</div><div class='del'>-	i_write = ((ireason &amp; (1 &lt;&lt; 1)) == 0) ? 1 : 0;</div><div class='add'>+	i_write = ((ireason &amp; ATAPI_IO) == 0) ? 1 : 0;</div><div class='ctx'> 	if (unlikely(do_write != i_write))</div><div class='ctx'> 		goto atapi_check;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ata/libata-transport.c b/drivers/ata/libata-transport.c<br/>index ce9dc6207f37..74aaee30e264 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/libata-transport.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/libata-transport.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/libata-transport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/libata-transport.c</a></div><div class='hunk'>@@ -32,6 +32,7 @@</div><div class='ctx'> #include &lt;linux/libata.h&gt;</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "libata.h"</div><div class='ctx'> #include "libata-transport.h"</div><div class='hunk'>@@ -279,6 +280,7 @@ int ata_tport_add(struct device *parent,</div><div class='ctx'> 	struct device *dev = &amp;ap-&gt;tdev;</div><div class='ctx'> </div><div class='ctx'> 	device_initialize(dev);</div><div class='add'>+	dev-&gt;type = &amp;ata_port_type;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;parent = get_device(parent);</div><div class='ctx'> 	dev-&gt;release = ata_tport_release;</div><div class='hunk'>@@ -289,6 +291,10 @@ int ata_tport_add(struct device *parent,</div><div class='ctx'> 		goto tport_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	device_enable_async_suspend(dev);</div><div class='add'>+	pm_runtime_set_active(dev);</div><div class='add'>+	pm_runtime_enable(dev);</div><div class='add'>+</div><div class='ctx'> 	transport_add_device(dev);</div><div class='ctx'> 	transport_configure_device(dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h<br/>index 773de97988a2..814486d35c44 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/libata.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/libata.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/libata.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/libata.h</a></div><div class='hunk'>@@ -58,6 +58,7 @@ extern int atapi_passthru16;</div><div class='ctx'> extern int libata_fua;</div><div class='ctx'> extern int libata_noacpi;</div><div class='ctx'> extern int libata_allow_tpm;</div><div class='add'>+extern struct device_type ata_port_type;</div><div class='ctx'> extern struct ata_link *ata_dev_phys_link(struct ata_device *dev);</div><div class='ctx'> extern void ata_force_cbl(struct ata_port *ap);</div><div class='ctx'> extern u64 ata_tf_to_lba(const struct ata_taskfile *tf);</div><div class='head'>diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c<br/>index e8574bba3ee4..048589fad2ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_arasan_cf.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_arasan_cf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_arasan_cf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/pata_arasan_cf.c</a></div><div class='hunk'>@@ -963,17 +963,7 @@ static struct platform_driver arasan_cf_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init arasan_cf_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;arasan_cf_driver);</div><div class='del'>-}</div><div class='del'>-module_init(arasan_cf_init);</div><div class='del'>-</div><div class='del'>-static void __exit arasan_cf_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;arasan_cf_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(arasan_cf_exit);</div><div class='add'>+module_platform_driver(arasan_cf_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Viresh Kumar &lt;viresh.kumar@st.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Arasan ATA Compact Flash driver");</div><div class='head'>diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c<br/>index a76f24a8e5db..a7d91a72ee35 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_at91.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_at91.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_at91.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/pata_at91.c</a></div><div class='hunk'>@@ -360,7 +360,7 @@ static int __devinit pata_at91_probe(struct platform_device *pdev)</div><div class='ctx'> 	ap-&gt;flags |= ATA_FLAG_SLAVE_POSS;</div><div class='ctx'> 	ap-&gt;pio_mask = ATA_PIO4;</div><div class='ctx'> </div><div class='del'>-	if (!irq) {</div><div class='add'>+	if (!gpio_is_valid(irq)) {</div><div class='ctx'> 		ap-&gt;flags |= ATA_FLAG_PIO_POLLING;</div><div class='ctx'> 		ata_port_desc(ap, "no IRQ, using PIO polling");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -414,8 +414,8 @@ static int __devinit pata_at91_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;private_data = info;</div><div class='ctx'> </div><div class='del'>-	ret = ata_host_activate(host, irq ? gpio_to_irq(irq) : 0,</div><div class='del'>-			irq ? ata_sff_interrupt : NULL,</div><div class='add'>+	return ata_host_activate(host, gpio_is_valid(irq) ? gpio_to_irq(irq) : 0,</div><div class='add'>+			gpio_is_valid(irq) ? ata_sff_interrupt : NULL,</div><div class='ctx'> 			irq_flags, &amp;pata_at91_sht);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret)</div><div class='hunk'>@@ -454,20 +454,7 @@ static struct platform_driver pata_at91_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pata_at91_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pata_at91_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit pata_at91_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pata_at91_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-module_init(pata_at91_init);</div><div class='del'>-module_exit(pata_at91_exit);</div><div class='del'>-</div><div class='add'>+module_platform_driver(pata_at91_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for CF in True IDE mode on AT91SAM9260 SoC");</div><div class='head'>diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c<br/>index bd987bb082eb..1e65842e2ca7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_bf54x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_bf54x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_bf54x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/pata_bf54x.c</a></div><div class='hunk'>@@ -251,6 +251,8 @@ static const u32 udma_tenvmin = 20;</div><div class='ctx'> static const u32 udma_tackmin = 20;</div><div class='ctx'> static const u32 udma_tssmin = 50;</div><div class='ctx'> </div><div class='add'>+#define BFIN_MAX_SG_SEGMENTS 4</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *</div><div class='ctx'>  *	Function:       num_clocks_min</div><div class='hunk'>@@ -418,14 +420,6 @@ static void bfin_set_dmamode(struct ata_port *ap, struct ata_device *adev)</div><div class='ctx'> 					(tcyc_tdvs&lt;&lt;8 | tdvs));</div><div class='ctx'> 				ATAPI_SET_ULTRA_TIM_2(base, (tmli&lt;&lt;8 | tss));</div><div class='ctx'> 				ATAPI_SET_ULTRA_TIM_3(base, (trp&lt;&lt;8 | tzah));</div><div class='del'>-</div><div class='del'>-				/* Enable host ATAPI Untra DMA interrupts */</div><div class='del'>-				ATAPI_SET_INT_MASK(base,</div><div class='del'>-					ATAPI_GET_INT_MASK(base)</div><div class='del'>-					| UDMAIN_DONE_MASK</div><div class='del'>-					| UDMAOUT_DONE_MASK</div><div class='del'>-					| UDMAIN_TERM_MASK</div><div class='del'>-					| UDMAOUT_TERM_MASK);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -470,10 +464,6 @@ static void bfin_set_dmamode(struct ata_port *ap, struct ata_device *adev)</div><div class='ctx'> 			ATAPI_SET_MULTI_TIM_0(base, (tm&lt;&lt;8 | td));</div><div class='ctx'> 			ATAPI_SET_MULTI_TIM_1(base, (tkr&lt;&lt;8 | tkw));</div><div class='ctx'> 			ATAPI_SET_MULTI_TIM_2(base, (teoc&lt;&lt;8 | th));</div><div class='del'>-</div><div class='del'>-			/* Enable host ATAPI Multi DMA interrupts */</div><div class='del'>-			ATAPI_SET_INT_MASK(base, ATAPI_GET_INT_MASK(base)</div><div class='del'>-				| MULTI_DONE_MASK | MULTI_TERM_MASK);</div><div class='ctx'> 			SSYNC();</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -841,79 +831,61 @@ static void bfin_set_devctl(struct ata_port *ap, u8 ctl)</div><div class='ctx'> </div><div class='ctx'> static void bfin_bmdma_setup(struct ata_queued_cmd *qc)</div><div class='ctx'> {</div><div class='del'>-	unsigned short config = WDSIZE_16;</div><div class='add'>+	struct ata_port *ap = qc-&gt;ap;</div><div class='add'>+	struct dma_desc_array *dma_desc_cpu = (struct dma_desc_array *)ap-&gt;bmdma_prd;</div><div class='add'>+	void __iomem *base = (void __iomem *)ap-&gt;ioaddr.ctl_addr;</div><div class='add'>+	unsigned short config = DMAFLOW_ARRAY | NDSIZE_5 | RESTART | WDSIZE_16 | DMAEN;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	unsigned int si;</div><div class='add'>+	unsigned int channel;</div><div class='add'>+	unsigned int dir;</div><div class='add'>+	unsigned int size = 0;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(qc-&gt;ap-&gt;dev, "in atapi dma setup\n");</div><div class='ctx'> 	/* Program the ATA_CTRL register with dir */</div><div class='ctx'> 	if (qc-&gt;tf.flags &amp; ATA_TFLAG_WRITE) {</div><div class='del'>-		/* fill the ATAPI DMA controller */</div><div class='del'>-		set_dma_config(CH_ATAPI_TX, config);</div><div class='del'>-		set_dma_x_modify(CH_ATAPI_TX, 2);</div><div class='del'>-		for_each_sg(qc-&gt;sg, sg, qc-&gt;n_elem, si) {</div><div class='del'>-			set_dma_start_addr(CH_ATAPI_TX, sg_dma_address(sg));</div><div class='del'>-			set_dma_x_count(CH_ATAPI_TX, sg_dma_len(sg) &gt;&gt; 1);</div><div class='del'>-		}</div><div class='add'>+		channel = CH_ATAPI_TX;</div><div class='add'>+		dir = DMA_TO_DEVICE;</div><div class='ctx'> 	} else {</div><div class='add'>+		channel = CH_ATAPI_RX;</div><div class='add'>+		dir = DMA_FROM_DEVICE;</div><div class='ctx'> 		config |= WNR;</div><div class='del'>-		/* fill the ATAPI DMA controller */</div><div class='del'>-		set_dma_config(CH_ATAPI_RX, config);</div><div class='del'>-		set_dma_x_modify(CH_ATAPI_RX, 2);</div><div class='del'>-		for_each_sg(qc-&gt;sg, sg, qc-&gt;n_elem, si) {</div><div class='del'>-			set_dma_start_addr(CH_ATAPI_RX, sg_dma_address(sg));</div><div class='del'>-			set_dma_x_count(CH_ATAPI_RX, sg_dma_len(sg) &gt;&gt; 1);</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	bfin_bmdma_start - Start an IDE DMA transaction</div><div class='del'>- *	@qc: Info associated with this ATA transaction.</div><div class='del'>- *</div><div class='del'>- *	Note: Original code is ata_bmdma_start().</div><div class='del'>- */</div><div class='add'>+	dma_map_sg(ap-&gt;dev, qc-&gt;sg, qc-&gt;n_elem, dir);</div><div class='ctx'> </div><div class='del'>-static void bfin_bmdma_start(struct ata_queued_cmd *qc)</div><div class='del'>-{</div><div class='del'>-	struct ata_port *ap = qc-&gt;ap;</div><div class='del'>-	void __iomem *base = (void __iomem *)ap-&gt;ioaddr.ctl_addr;</div><div class='del'>-	struct scatterlist *sg;</div><div class='del'>-	unsigned int si;</div><div class='add'>+	/* fill the ATAPI DMA controller */</div><div class='add'>+	for_each_sg(qc-&gt;sg, sg, qc-&gt;n_elem, si) {</div><div class='add'>+		dma_desc_cpu[si].start_addr = sg_dma_address(sg);</div><div class='add'>+		dma_desc_cpu[si].cfg = config;</div><div class='add'>+		dma_desc_cpu[si].x_count = sg_dma_len(sg) &gt;&gt; 1;</div><div class='add'>+		dma_desc_cpu[si].x_modify = 2;</div><div class='add'>+		size += sg_dma_len(sg);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	dev_dbg(qc-&gt;ap-&gt;dev, "in atapi dma start\n");</div><div class='del'>-	if (!(ap-&gt;udma_mask || ap-&gt;mwdma_mask))</div><div class='del'>-		return;</div><div class='add'>+	/* Set the last descriptor to stop mode */</div><div class='add'>+	dma_desc_cpu[qc-&gt;n_elem - 1].cfg &amp;= ~(DMAFLOW | NDSIZE);</div><div class='ctx'> </div><div class='del'>-	/* start ATAPI DMA controller*/</div><div class='del'>-	if (qc-&gt;tf.flags &amp; ATA_TFLAG_WRITE) {</div><div class='del'>-		/*</div><div class='del'>-		 * On blackfin arch, uncacheable memory is not</div><div class='del'>-		 * allocated with flag GFP_DMA. DMA buffer from</div><div class='del'>-		 * common kenel code should be flushed if WB</div><div class='del'>-		 * data cache is enabled. Otherwise, this loop</div><div class='del'>-		 * is an empty loop and optimized out.</div><div class='del'>-		 */</div><div class='del'>-		for_each_sg(qc-&gt;sg, sg, qc-&gt;n_elem, si) {</div><div class='del'>-			flush_dcache_range(sg_dma_address(sg),</div><div class='del'>-				sg_dma_address(sg) + sg_dma_len(sg));</div><div class='del'>-		}</div><div class='del'>-		enable_dma(CH_ATAPI_TX);</div><div class='del'>-		dev_dbg(qc-&gt;ap-&gt;dev, "enable udma write\n");</div><div class='add'>+	flush_dcache_range((unsigned int)dma_desc_cpu,</div><div class='add'>+		(unsigned int)dma_desc_cpu +</div><div class='add'>+			qc-&gt;n_elem * sizeof(struct dma_desc_array));</div><div class='add'>+</div><div class='add'>+	/* Enable ATA DMA operation*/</div><div class='add'>+	set_dma_curr_desc_addr(channel, (unsigned long *)ap-&gt;bmdma_prd_dma);</div><div class='add'>+	set_dma_x_count(channel, 0);</div><div class='add'>+	set_dma_x_modify(channel, 0);</div><div class='add'>+	set_dma_config(channel, config);</div><div class='add'>+</div><div class='add'>+	SSYNC();</div><div class='ctx'> </div><div class='del'>-		/* Send ATA DMA write command */</div><div class='del'>-		bfin_exec_command(ap, &amp;qc-&gt;tf);</div><div class='add'>+	/* Send ATA DMA command */</div><div class='add'>+	bfin_exec_command(ap, &amp;qc-&gt;tf);</div><div class='ctx'> </div><div class='add'>+	if (qc-&gt;tf.flags &amp; ATA_TFLAG_WRITE) {</div><div class='ctx'> 		/* set ATA DMA write direction */</div><div class='ctx'> 		ATAPI_SET_CONTROL(base, (ATAPI_GET_CONTROL(base)</div><div class='ctx'> 			| XFER_DIR));</div><div class='ctx'> 	} else {</div><div class='del'>-		enable_dma(CH_ATAPI_RX);</div><div class='del'>-		dev_dbg(qc-&gt;ap-&gt;dev, "enable udma read\n");</div><div class='del'>-</div><div class='del'>-		/* Send ATA DMA read command */</div><div class='del'>-		bfin_exec_command(ap, &amp;qc-&gt;tf);</div><div class='del'>-</div><div class='ctx'> 		/* set ATA DMA read direction */</div><div class='ctx'> 		ATAPI_SET_CONTROL(base, (ATAPI_GET_CONTROL(base)</div><div class='ctx'> 			&amp; ~XFER_DIR));</div><div class='hunk'>@@ -925,12 +897,28 @@ static void bfin_bmdma_start(struct ata_queued_cmd *qc)</div><div class='ctx'> 	/* Set ATAPI state machine contorl in terminate sequence */</div><div class='ctx'> 	ATAPI_SET_CONTROL(base, ATAPI_GET_CONTROL(base) | END_ON_TERM);</div><div class='ctx'> </div><div class='del'>-	/* Set transfer length to buffer len */</div><div class='del'>-	for_each_sg(qc-&gt;sg, sg, qc-&gt;n_elem, si) {</div><div class='del'>-		ATAPI_SET_XFER_LEN(base, (sg_dma_len(sg) &gt;&gt; 1));</div><div class='del'>-	}</div><div class='add'>+	/* Set transfer length to the total size of sg buffers */</div><div class='add'>+	ATAPI_SET_XFER_LEN(base, size &gt;&gt; 1);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Enable ATA DMA operation*/</div><div class='add'>+/**</div><div class='add'>+ *	bfin_bmdma_start - Start an IDE DMA transaction</div><div class='add'>+ *	@qc: Info associated with this ATA transaction.</div><div class='add'>+ *</div><div class='add'>+ *	Note: Original code is ata_bmdma_start().</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void bfin_bmdma_start(struct ata_queued_cmd *qc)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = qc-&gt;ap;</div><div class='add'>+	void __iomem *base = (void __iomem *)ap-&gt;ioaddr.ctl_addr;</div><div class='add'>+</div><div class='add'>+	dev_dbg(qc-&gt;ap-&gt;dev, "in atapi dma start\n");</div><div class='add'>+</div><div class='add'>+	if (!(ap-&gt;udma_mask || ap-&gt;mwdma_mask))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* start ATAPI transfer*/</div><div class='ctx'> 	if (ap-&gt;udma_mask)</div><div class='ctx'> 		ATAPI_SET_CONTROL(base, ATAPI_GET_CONTROL(base)</div><div class='ctx'> 			| ULTRA_START);</div><div class='hunk'>@@ -947,34 +935,23 @@ static void bfin_bmdma_start(struct ata_queued_cmd *qc)</div><div class='ctx'> static void bfin_bmdma_stop(struct ata_queued_cmd *qc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_port *ap = qc-&gt;ap;</div><div class='del'>-	struct scatterlist *sg;</div><div class='del'>-	unsigned int si;</div><div class='add'>+	unsigned int dir;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(qc-&gt;ap-&gt;dev, "in atapi dma stop\n");</div><div class='add'>+</div><div class='ctx'> 	if (!(ap-&gt;udma_mask || ap-&gt;mwdma_mask))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* stop ATAPI DMA controller*/</div><div class='del'>-	if (qc-&gt;tf.flags &amp; ATA_TFLAG_WRITE)</div><div class='add'>+	if (qc-&gt;tf.flags &amp; ATA_TFLAG_WRITE) {</div><div class='add'>+		dir = DMA_TO_DEVICE;</div><div class='ctx'> 		disable_dma(CH_ATAPI_TX);</div><div class='del'>-	else {</div><div class='add'>+	} else {</div><div class='add'>+		dir = DMA_FROM_DEVICE;</div><div class='ctx'> 		disable_dma(CH_ATAPI_RX);</div><div class='del'>-		if (ap-&gt;hsm_task_state &amp; HSM_ST_LAST) {</div><div class='del'>-			/*</div><div class='del'>-			 * On blackfin arch, uncacheable memory is not</div><div class='del'>-			 * allocated with flag GFP_DMA. DMA buffer from</div><div class='del'>-			 * common kenel code should be invalidated if</div><div class='del'>-			 * data cache is enabled. Otherwise, this loop</div><div class='del'>-			 * is an empty loop and optimized out.</div><div class='del'>-			 */</div><div class='del'>-			for_each_sg(qc-&gt;sg, sg, qc-&gt;n_elem, si) {</div><div class='del'>-				invalidate_dcache_range(</div><div class='del'>-					sg_dma_address(sg),</div><div class='del'>-					sg_dma_address(sg)</div><div class='del'>-					+ sg_dma_len(sg));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	dma_unmap_sg(ap-&gt;dev, qc-&gt;sg, qc-&gt;n_elem, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1153,15 +1130,11 @@ static unsigned char bfin_bmdma_status(struct ata_port *ap)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char host_stat = 0;</div><div class='ctx'> 	void __iomem *base = (void __iomem *)ap-&gt;ioaddr.ctl_addr;</div><div class='del'>-	unsigned short int_status = ATAPI_GET_INT_STATUS(base);</div><div class='ctx'> </div><div class='del'>-	if (ATAPI_GET_STATUS(base) &amp; (MULTI_XFER_ON|ULTRA_XFER_ON))</div><div class='add'>+	if (ATAPI_GET_STATUS(base) &amp; (MULTI_XFER_ON | ULTRA_XFER_ON))</div><div class='ctx'> 		host_stat |= ATA_DMA_ACTIVE;</div><div class='del'>-	if (int_status &amp; (MULTI_DONE_INT|UDMAIN_DONE_INT|UDMAOUT_DONE_INT|</div><div class='del'>-		ATAPI_DEV_INT))</div><div class='add'>+	if (ATAPI_GET_INT_STATUS(base) &amp; ATAPI_DEV_INT)</div><div class='ctx'> 		host_stat |= ATA_DMA_INTR;</div><div class='del'>-	if (int_status &amp; (MULTI_TERM_INT|UDMAIN_TERM_INT|UDMAOUT_TERM_INT))</div><div class='del'>-		host_stat |= ATA_DMA_ERR|ATA_DMA_INTR;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(ap-&gt;dev, "ATAPI: host_stat=0x%x\n", host_stat);</div><div class='ctx'> </div><div class='hunk'>@@ -1276,6 +1249,11 @@ static void bfin_port_stop(struct ata_port *ap)</div><div class='ctx'> {</div><div class='ctx'> 	dev_dbg(ap-&gt;dev, "in atapi port stop\n");</div><div class='ctx'> 	if (ap-&gt;udma_mask != 0 || ap-&gt;mwdma_mask != 0) {</div><div class='add'>+		dma_free_coherent(ap-&gt;dev,</div><div class='add'>+			BFIN_MAX_SG_SEGMENTS * sizeof(struct dma_desc_array),</div><div class='add'>+			ap-&gt;bmdma_prd,</div><div class='add'>+			ap-&gt;bmdma_prd_dma);</div><div class='add'>+</div><div class='ctx'> 		free_dma(CH_ATAPI_RX);</div><div class='ctx'> 		free_dma(CH_ATAPI_TX);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1287,14 +1265,29 @@ static int bfin_port_start(struct ata_port *ap)</div><div class='ctx'> 	if (!(ap-&gt;udma_mask || ap-&gt;mwdma_mask))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	ap-&gt;bmdma_prd = dma_alloc_coherent(ap-&gt;dev,</div><div class='add'>+				BFIN_MAX_SG_SEGMENTS * sizeof(struct dma_desc_array),</div><div class='add'>+				&amp;ap-&gt;bmdma_prd_dma,</div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (ap-&gt;bmdma_prd == NULL) {</div><div class='add'>+		dev_info(ap-&gt;dev, "Unable to allocate DMA descriptor array.\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (request_dma(CH_ATAPI_RX, "BFIN ATAPI RX DMA") &gt;= 0) {</div><div class='ctx'> 		if (request_dma(CH_ATAPI_TX,</div><div class='ctx'> 			"BFIN ATAPI TX DMA") &gt;= 0)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='ctx'> 		free_dma(CH_ATAPI_RX);</div><div class='add'>+		dma_free_coherent(ap-&gt;dev,</div><div class='add'>+			BFIN_MAX_SG_SEGMENTS * sizeof(struct dma_desc_array),</div><div class='add'>+			ap-&gt;bmdma_prd,</div><div class='add'>+			ap-&gt;bmdma_prd_dma);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	ap-&gt;udma_mask = 0;</div><div class='ctx'> 	ap-&gt;mwdma_mask = 0;</div><div class='ctx'> 	dev_err(ap-&gt;dev, "Unable to request ATAPI DMA!"</div><div class='hunk'>@@ -1416,7 +1409,7 @@ static irqreturn_t bfin_ata_interrupt(int irq, void *dev_instance)</div><div class='ctx'> </div><div class='ctx'> static struct scsi_host_template bfin_sht = {</div><div class='ctx'> 	ATA_BASE_SHT(DRV_NAME),</div><div class='del'>-	.sg_tablesize		= SG_NONE,</div><div class='add'>+	.sg_tablesize		= BFIN_MAX_SG_SEGMENTS,</div><div class='ctx'> 	.dma_boundary		= ATA_DMA_BOUNDARY,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c<br/>index 628c8fae5937..7a402c75ab90 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_cs5536.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_cs5536.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_cs5536.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/pata_cs5536.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * pata_cs5536.c	- CS5536 PATA for new ATA layer</div><div class='ctx'>  *			  (C) 2007 Martin K. Petersen &lt;mkp@mkp.net&gt;</div><div class='add'>+ *			  (C) 2011 Bartlomiej Zolnierkiewicz</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 version 2 as</div><div class='hunk'>@@ -55,24 +56,16 @@ MODULE_PARM_DESC(msr, "Force using MSR to configure IDE function (Default: 0)");</div><div class='ctx'> #define DRV_VERSION	"0.0.8"</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	CFG			= 0,</div><div class='del'>-	DTC			= 1,</div><div class='del'>-	CAST			= 2,</div><div class='del'>-	ETC			= 3,</div><div class='del'>-</div><div class='del'>-	MSR_IDE_BASE		= 0x51300000,</div><div class='del'>-	MSR_IDE_CFG		= (MSR_IDE_BASE + 0x10),</div><div class='del'>-	MSR_IDE_DTC		= (MSR_IDE_BASE + 0x12),</div><div class='del'>-	MSR_IDE_CAST		= (MSR_IDE_BASE + 0x13),</div><div class='del'>-	MSR_IDE_ETC		= (MSR_IDE_BASE + 0x14),</div><div class='del'>-</div><div class='add'>+	MSR_IDE_CFG		= 0x51300010,</div><div class='ctx'> 	PCI_IDE_CFG		= 0x40,</div><div class='del'>-	PCI_IDE_DTC		= 0x48,</div><div class='del'>-	PCI_IDE_CAST		= 0x4c,</div><div class='del'>-	PCI_IDE_ETC		= 0x50,</div><div class='ctx'> </div><div class='del'>-	IDE_CFG_CHANEN		= 0x2,</div><div class='del'>-	IDE_CFG_CABLE		= 0x10000,</div><div class='add'>+	CFG			= 0,</div><div class='add'>+	DTC			= 2,</div><div class='add'>+	CAST			= 3,</div><div class='add'>+	ETC			= 4,</div><div class='add'>+</div><div class='add'>+	IDE_CFG_CHANEN		= (1 &lt;&lt; 1),</div><div class='add'>+	IDE_CFG_CABLE		= (1 &lt;&lt; 17) | (1 &lt;&lt; 16),</div><div class='ctx'> </div><div class='ctx'> 	IDE_D0_SHIFT		= 24,</div><div class='ctx'> 	IDE_D1_SHIFT		= 16,</div><div class='hunk'>@@ -84,45 +77,50 @@ enum {</div><div class='ctx'> 	IDE_CAST_CMD_MASK	= 0xff,</div><div class='ctx'> 	IDE_CAST_CMD_SHIFT	= 24,</div><div class='ctx'> </div><div class='del'>-	IDE_ETC_NODMA		= 0x03,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 msr_reg[4] = {</div><div class='del'>-	MSR_IDE_CFG, MSR_IDE_DTC, MSR_IDE_CAST, MSR_IDE_ETC,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u8 pci_reg[4] = {</div><div class='del'>-	PCI_IDE_CFG, PCI_IDE_DTC, PCI_IDE_CAST, PCI_IDE_ETC,</div><div class='add'>+	IDE_ETC_UDMA_MASK	= 0xc0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline int cs5536_read(struct pci_dev *pdev, int reg, u32 *val)</div><div class='add'>+static int cs5536_read(struct pci_dev *pdev, int reg, u32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(use_msr)) {</div><div class='ctx'> 		u32 dummy __maybe_unused;</div><div class='ctx'> </div><div class='del'>-		rdmsr(msr_reg[reg], *val, dummy);</div><div class='add'>+		rdmsr(MSR_IDE_CFG + reg, *val, dummy);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return pci_read_config_dword(pdev, pci_reg[reg], val);</div><div class='add'>+	return pci_read_config_dword(pdev, PCI_IDE_CFG + reg * 4, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int cs5536_write(struct pci_dev *pdev, int reg, int val)</div><div class='add'>+static int cs5536_write(struct pci_dev *pdev, int reg, int val)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(use_msr)) {</div><div class='del'>-		wrmsr(msr_reg[reg], val, 0);</div><div class='add'>+		wrmsr(MSR_IDE_CFG + reg, val, 0);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return pci_write_config_dword(pdev, pci_reg[reg], val);</div><div class='add'>+	return pci_write_config_dword(pdev, PCI_IDE_CFG + reg * 4, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs5536_program_dtc(struct ata_device *adev, u8 tim)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(adev-&gt;link-&gt;ap-&gt;host-&gt;dev);</div><div class='add'>+	int dshift = adev-&gt;devno ? IDE_D1_SHIFT : IDE_D0_SHIFT;</div><div class='add'>+	u32 dtc;</div><div class='add'>+</div><div class='add'>+	cs5536_read(pdev, DTC, &amp;dtc);</div><div class='add'>+	dtc &amp;= ~(IDE_DRV_MASK &lt;&lt; dshift);</div><div class='add'>+	dtc |= tim &lt;&lt; dshift;</div><div class='add'>+	cs5536_write(pdev, DTC, dtc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	cs5536_cable_detect	-	detect cable type</div><div class='ctx'>  *	@ap: Port to detect on</div><div class='ctx'>  *</div><div class='del'>- *	Perform cable detection for ATA66 capable cable. Return a libata</div><div class='del'>- *	cable type.</div><div class='add'>+ *	Perform cable detection for ATA66 capable cable.</div><div class='add'>+ *</div><div class='add'>+ *	Returns a cable type.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int cs5536_cable_detect(struct ata_port *ap)</div><div class='hunk'>@@ -132,7 +130,7 @@ static int cs5536_cable_detect(struct ata_port *ap)</div><div class='ctx'> </div><div class='ctx'> 	cs5536_read(pdev, CFG, &amp;cfg);</div><div class='ctx'> </div><div class='del'>-	if (cfg &amp; (IDE_CFG_CABLE &lt;&lt; ap-&gt;port_no))</div><div class='add'>+	if (cfg &amp; IDE_CFG_CABLE)</div><div class='ctx'> 		return ATA_CBL_PATA80;</div><div class='ctx'> 	else</div><div class='ctx'> 		return ATA_CBL_PATA40;</div><div class='hunk'>@@ -162,19 +160,15 @@ static void cs5536_set_piomode(struct ata_port *ap, struct ata_device *adev)</div><div class='ctx'> 	struct ata_device *pair = ata_dev_pair(adev);</div><div class='ctx'> 	int mode = adev-&gt;pio_mode - XFER_PIO_0;</div><div class='ctx'> 	int cmdmode = mode;</div><div class='del'>-	int dshift = adev-&gt;devno ? IDE_D1_SHIFT : IDE_D0_SHIFT;</div><div class='ctx'> 	int cshift = adev-&gt;devno ? IDE_CAST_D1_SHIFT : IDE_CAST_D0_SHIFT;</div><div class='del'>-	u32 dtc, cast, etc;</div><div class='add'>+	u32 cast;</div><div class='ctx'> </div><div class='ctx'> 	if (pair)</div><div class='ctx'> 		cmdmode = min(mode, pair-&gt;pio_mode - XFER_PIO_0);</div><div class='ctx'> </div><div class='del'>-	cs5536_read(pdev, DTC, &amp;dtc);</div><div class='del'>-	cs5536_read(pdev, CAST, &amp;cast);</div><div class='del'>-	cs5536_read(pdev, ETC, &amp;etc);</div><div class='add'>+	cs5536_program_dtc(adev, drv_timings[mode]);</div><div class='ctx'> </div><div class='del'>-	dtc &amp;= ~(IDE_DRV_MASK &lt;&lt; dshift);</div><div class='del'>-	dtc |= drv_timings[mode] &lt;&lt; dshift;</div><div class='add'>+	cs5536_read(pdev, CAST, &amp;cast);</div><div class='ctx'> </div><div class='ctx'> 	cast &amp;= ~(IDE_CAST_DRV_MASK &lt;&lt; cshift);</div><div class='ctx'> 	cast |= addr_timings[mode] &lt;&lt; cshift;</div><div class='hunk'>@@ -182,12 +176,7 @@ static void cs5536_set_piomode(struct ata_port *ap, struct ata_device *adev)</div><div class='ctx'> 	cast &amp;= ~(IDE_CAST_CMD_MASK &lt;&lt; IDE_CAST_CMD_SHIFT);</div><div class='ctx'> 	cast |= cmd_timings[cmdmode] &lt;&lt; IDE_CAST_CMD_SHIFT;</div><div class='ctx'> </div><div class='del'>-	etc &amp;= ~(IDE_DRV_MASK &lt;&lt; dshift);</div><div class='del'>-	etc |= IDE_ETC_NODMA &lt;&lt; dshift;</div><div class='del'>-</div><div class='del'>-	cs5536_write(pdev, DTC, dtc);</div><div class='ctx'> 	cs5536_write(pdev, CAST, cast);</div><div class='del'>-	cs5536_write(pdev, ETC, etc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -208,25 +197,21 @@ static void cs5536_set_dmamode(struct ata_port *ap, struct ata_device *adev)</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	struct pci_dev *pdev = to_pci_dev(ap-&gt;host-&gt;dev);</div><div class='del'>-	u32 dtc, etc;</div><div class='add'>+	u32 etc;</div><div class='ctx'> 	int mode = adev-&gt;dma_mode;</div><div class='ctx'> 	int dshift = adev-&gt;devno ? IDE_D1_SHIFT : IDE_D0_SHIFT;</div><div class='ctx'> </div><div class='del'>-	if (mode &gt;= XFER_UDMA_0) {</div><div class='del'>-		cs5536_read(pdev, ETC, &amp;etc);</div><div class='add'>+	cs5536_read(pdev, ETC, &amp;etc);</div><div class='ctx'> </div><div class='add'>+	if (mode &gt;= XFER_UDMA_0) {</div><div class='ctx'> 		etc &amp;= ~(IDE_DRV_MASK &lt;&lt; dshift);</div><div class='ctx'> 		etc |= udma_timings[mode - XFER_UDMA_0] &lt;&lt; dshift;</div><div class='del'>-</div><div class='del'>-		cs5536_write(pdev, ETC, etc);</div><div class='ctx'> 	} else { /* MWDMA */</div><div class='del'>-		cs5536_read(pdev, DTC, &amp;dtc);</div><div class='del'>-</div><div class='del'>-		dtc &amp;= ~(IDE_DRV_MASK &lt;&lt; dshift);</div><div class='del'>-		dtc |= mwdma_timings[mode - XFER_MW_DMA_0] &lt;&lt; dshift;</div><div class='del'>-</div><div class='del'>-		cs5536_write(pdev, DTC, dtc);</div><div class='add'>+		etc &amp;= ~(IDE_ETC_UDMA_MASK &lt;&lt; dshift);</div><div class='add'>+		cs5536_program_dtc(adev, mwdma_timings[mode - XFER_MW_DMA_0]);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	cs5536_write(pdev, ETC, etc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct scsi_host_template cs5536_sht = {</div><div class='head'>diff --git a/drivers/ata/pata_imx.c b/drivers/ata/pata_imx.c<br/>index ca9d9caedfa3..c5af97f5107b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_imx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_imx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_imx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/pata_imx.c</a></div><div class='hunk'>@@ -235,17 +235,7 @@ static struct platform_driver pata_imx_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pata_imx_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pata_imx_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit pata_imx_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pata_imx_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pata_imx_init);</div><div class='del'>-module_exit(pata_imx_exit);</div><div class='add'>+module_platform_driver(pata_imx_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Arnaud Patard &lt;arnaud.patard@rtp-net.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("low-level driver for iMX PATA");</div><div class='head'>diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c<br/>index 15b64311fe0a..badb1789a918 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_ixp4xx_cf.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_ixp4xx_cf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_ixp4xx_cf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/pata_ixp4xx_cf.c</a></div><div class='hunk'>@@ -205,21 +205,10 @@ static struct platform_driver ixp4xx_pata_platform_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(ixp4xx_pata_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ixp4xx_pata_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ixp4xx_pata_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ixp4xx_pata_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ixp4xx_pata_platform_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(ixp4xx_pata_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Alessandro Zummo &lt;a.zummo@towertech.it&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("low-level driver for ixp4xx Compact Flash PATA");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> MODULE_ALIAS("platform:" DRV_NAME);</div><div class='del'>-</div><div class='del'>-module_init(ixp4xx_pata_init);</div><div class='del'>-module_exit(ixp4xx_pata_exit);</div><div class='head'>diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c<br/>index 3e1746314f22..00748ae1a016 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_mpc52xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_mpc52xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_mpc52xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/pata_mpc52xx.c</a></div><div class='hunk'>@@ -897,26 +897,7 @@ static struct platform_driver mpc52xx_ata_of_platform_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* ======================================================================== */</div><div class='del'>-/* Module                                                                   */</div><div class='del'>-/* ======================================================================== */</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-mpc52xx_ata_init(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "ata: MPC52xx IDE/ATA libata driver\n");</div><div class='del'>-	return platform_driver_register(&amp;mpc52xx_ata_of_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-mpc52xx_ata_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;mpc52xx_ata_of_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(mpc52xx_ata_init);</div><div class='del'>-module_exit(mpc52xx_ata_exit);</div><div class='add'>+module_platform_driver(mpc52xx_ata_of_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Sylvain Munaut &lt;tnt@246tNt.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Freescale MPC52xx IDE/ATA libata driver");</div><div class='head'>diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c<br/>index 2a472c5bb7db..1654dc27e7f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_of_platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_of_platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_of_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/pata_of_platform.c</a></div><div class='hunk'>@@ -12,8 +12,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_address.h&gt;</div><div class='del'>-#include &lt;linux/of_irq.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/ata_platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int __devinit pata_of_platform_probe(struct platform_device *ofdev)</div><div class='hunk'>@@ -22,7 +21,7 @@ static int __devinit pata_of_platform_probe(struct platform_device *ofdev)</div><div class='ctx'> 	struct device_node *dn = ofdev-&gt;dev.of_node;</div><div class='ctx'> 	struct resource io_res;</div><div class='ctx'> 	struct resource ctl_res;</div><div class='del'>-	struct resource irq_res;</div><div class='add'>+	struct resource *irq_res;</div><div class='ctx'> 	unsigned int reg_shift = 0;</div><div class='ctx'> 	int pio_mode = 0;</div><div class='ctx'> 	int pio_mask;</div><div class='hunk'>@@ -51,11 +50,9 @@ static int __devinit pata_of_platform_probe(struct platform_device *ofdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = of_irq_to_resource(dn, 0, &amp;irq_res);</div><div class='del'>-	if (!ret)</div><div class='del'>-		irq_res.start = irq_res.end = 0;</div><div class='del'>-	else</div><div class='del'>-		irq_res.flags = 0;</div><div class='add'>+	irq_res = platform_get_resource(ofdev, IORESOURCE_IRQ, 0);</div><div class='add'>+	if (irq_res)</div><div class='add'>+		irq_res-&gt;flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	prop = of_get_property(dn, "reg-shift", NULL);</div><div class='ctx'> 	if (prop)</div><div class='hunk'>@@ -75,7 +72,7 @@ static int __devinit pata_of_platform_probe(struct platform_device *ofdev)</div><div class='ctx'> 	pio_mask = 1 &lt;&lt; pio_mode;</div><div class='ctx'> 	pio_mask |= (1 &lt;&lt; pio_mode) - 1;</div><div class='ctx'> </div><div class='del'>-	return __pata_platform_probe(&amp;ofdev-&gt;dev, &amp;io_res, &amp;ctl_res, &amp;irq_res,</div><div class='add'>+	return __pata_platform_probe(&amp;ofdev-&gt;dev, &amp;io_res, &amp;ctl_res, irq_res,</div><div class='ctx'> 				     reg_shift, pio_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -101,17 +98,7 @@ static struct platform_driver pata_of_platform_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(pata_of_platform_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pata_of_platform_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pata_of_platform_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pata_of_platform_init);</div><div class='del'>-</div><div class='del'>-static void __exit pata_of_platform_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pata_of_platform_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(pata_of_platform_exit);</div><div class='add'>+module_platform_driver(pata_of_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("OF-platform PATA driver");</div><div class='ctx'> MODULE_AUTHOR("Anton Vorontsov &lt;avorontsov@ru.mvista.com&gt;");</div><div class='head'>diff --git a/drivers/ata/pata_palmld.c b/drivers/ata/pata_palmld.c<br/>index b86d7e22595e..5ff31b68135c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_palmld.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_palmld.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_palmld.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/pata_palmld.c</a></div><div class='hunk'>@@ -132,20 +132,9 @@ static struct platform_driver palmld_pata_platform_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(palmld_pata_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init palmld_pata_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;palmld_pata_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit palmld_pata_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;palmld_pata_platform_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(palmld_pata_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Marek Vasut &lt;marek.vasut@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("PalmLD PATA driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS("platform:" DRV_NAME);</div><div class='del'>-</div><div class='del'>-module_init(palmld_pata_init);</div><div class='del'>-module_exit(palmld_pata_exit);</div><div class='head'>diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c<br/>index 2067308f683f..f1848aeda783 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/pata_platform.c</a></div><div class='hunk'>@@ -256,17 +256,7 @@ static struct platform_driver pata_platform_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pata_platform_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pata_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit pata_platform_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pata_platform_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pata_platform_init);</div><div class='del'>-module_exit(pata_platform_exit);</div><div class='add'>+module_platform_driver(pata_platform_driver);</div><div class='ctx'> </div><div class='ctx'> module_param(pio_mask, int, 0);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c<br/>index b4ede40f8ae1..0bb0fb7b26bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_pxa.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_pxa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_pxa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/pata_pxa.c</a></div><div class='hunk'>@@ -390,18 +390,7 @@ static struct platform_driver pxa_ata_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pxa_ata_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pxa_ata_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit pxa_ata_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pxa_ata_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(pxa_ata_init);</div><div class='del'>-module_exit(pxa_ata_exit);</div><div class='add'>+module_platform_driver(pxa_ata_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Marek Vasut &lt;marek.vasut@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("DMA-capable driver for PATA on PXA CPU");</div><div class='head'>diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c<br/>index 1b9d10d9c5d9..9417101bd5ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/pata_rb532_cf.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/pata_rb532_cf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/pata_rb532_cf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/pata_rb532_cf.c</a></div><div class='hunk'>@@ -188,9 +188,6 @@ static __devexit int rb532_pata_driver_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* work with hotplug and coldplug */</div><div class='del'>-MODULE_ALIAS("platform:" DRV_NAME);</div><div class='del'>-</div><div class='ctx'> static struct platform_driver rb532_pata_platform_driver = {</div><div class='ctx'> 	.probe		= rb532_pata_driver_probe,</div><div class='ctx'> 	.remove		= __devexit_p(rb532_pata_driver_remove),</div><div class='hunk'>@@ -200,27 +197,13 @@ static struct platform_driver rb532_pata_platform_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* ------------------------------------------------------------------------ */</div><div class='del'>-</div><div class='ctx'> #define DRV_INFO DRV_DESC " version " DRV_VERSION</div><div class='ctx'> </div><div class='del'>-static int __init rb532_pata_module_init(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO DRV_INFO "\n");</div><div class='del'>-</div><div class='del'>-	return platform_driver_register(&amp;rb532_pata_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit rb532_pata_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;rb532_pata_platform_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(rb532_pata_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Gabor Juhos &lt;juhosg at openwrt.org&gt;");</div><div class='ctx'> MODULE_AUTHOR("Florian Fainelli &lt;florian@openwrt.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION(DRV_DESC);</div><div class='ctx'> MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-module_init(rb532_pata_module_init);</div><div class='del'>-module_exit(rb532_pata_module_exit);</div><div class='add'>+MODULE_ALIAS("platform:" DRV_NAME);</div><div class='head'>diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c<br/>index 5c4237452f50..69f7cde49c6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/sata_dwc_460ex.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/sata_dwc_460ex.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/sata_dwc_460ex.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/sata_dwc_460ex.c</a></div><div class='hunk'>@@ -1777,18 +1777,7 @@ static struct platform_driver sata_dwc_driver = {</div><div class='ctx'> 	.remove = sata_dwc_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sata_dwc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sata_dwc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sata_dwc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sata_dwc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sata_dwc_init);</div><div class='del'>-module_exit(sata_dwc_exit);</div><div class='add'>+module_platform_driver(sata_dwc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Mark Miesfeld &lt;mmiesfeld@amcc.com&gt;");</div><div class='head'>diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c<br/>index 78ae7b67b09e..0120b0d1e9a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/sata_fsl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/sata_fsl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/sata_fsl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/sata_fsl.c</a></div><div class='hunk'>@@ -140,6 +140,7 @@ enum {</div><div class='ctx'> 	 */</div><div class='ctx'> 	HCONTROL_ONLINE_PHY_RST = (1 &lt;&lt; 31),</div><div class='ctx'> 	HCONTROL_FORCE_OFFLINE = (1 &lt;&lt; 30),</div><div class='add'>+	HCONTROL_LEGACY = (1 &lt;&lt; 28),</div><div class='ctx'> 	HCONTROL_PARITY_PROT_MOD = (1 &lt;&lt; 14),</div><div class='ctx'> 	HCONTROL_DPATH_PARITY = (1 &lt;&lt; 12),</div><div class='ctx'> 	HCONTROL_SNOOP_ENABLE = (1 &lt;&lt; 10),</div><div class='hunk'>@@ -1223,6 +1224,10 @@ static int sata_fsl_init_controller(struct ata_host *host)</div><div class='ctx'> 	 * part of the port_start() callback</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='add'>+	/* sata controller to operate in enterprise mode */</div><div class='add'>+	temp = ioread32(hcr_base + HCONTROL);</div><div class='add'>+	iowrite32(temp &amp; ~HCONTROL_LEGACY, hcr_base + HCONTROL);</div><div class='add'>+</div><div class='ctx'> 	/* ack. any pending IRQs for this controller/port */</div><div class='ctx'> 	temp = ioread32(hcr_base + HSTATUS);</div><div class='ctx'> 	if (temp &amp; 0x3F)</div><div class='hunk'>@@ -1421,6 +1426,12 @@ static int sata_fsl_resume(struct platform_device *op)</div><div class='ctx'> 	/* Recovery the CHBA register in host controller cmd register set */</div><div class='ctx'> 	iowrite32(pp-&gt;cmdslot_paddr &amp; 0xffffffff, hcr_base + CHBA);</div><div class='ctx'> </div><div class='add'>+	iowrite32((ioread32(hcr_base + HCONTROL)</div><div class='add'>+				| HCONTROL_ONLINE_PHY_RST</div><div class='add'>+				| HCONTROL_SNOOP_ENABLE</div><div class='add'>+				| HCONTROL_PMP_ATTACHED),</div><div class='add'>+			hcr_base + HCONTROL);</div><div class='add'>+</div><div class='ctx'> 	ata_host_resume(host);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1452,21 +1463,9 @@ static struct platform_driver fsl_sata_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sata_fsl_init(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_register(&amp;fsl_sata_driver);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sata_fsl_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;fsl_sata_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(fsl_sata_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Ashish Kalra, Freescale Semiconductor");</div><div class='ctx'> MODULE_DESCRIPTION("Freescale 3.0Gbps SATA controller low level driver");</div><div class='ctx'> MODULE_VERSION("1.10");</div><div class='del'>-</div><div class='del'>-module_init(sata_fsl_init);</div><div class='del'>-module_exit(sata_fsl_exit);</div><div class='head'>diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c<br/>index 0b8b8b488ee8..38950ea8398a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/sata_mv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/sata_mv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/sata_mv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/sata_mv.c</a></div><div class='hunk'>@@ -3988,7 +3988,7 @@ static int mv_create_dma_pools(struct mv_host_priv *hpriv, struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mv_conf_mbus_windows(struct mv_host_priv *hpriv,</div><div class='del'>-				 struct mbus_dram_target_info *dram)</div><div class='add'>+				 const struct mbus_dram_target_info *dram)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -3998,7 +3998,7 @@ static void mv_conf_mbus_windows(struct mv_host_priv *hpriv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; dram-&gt;num_cs; i++) {</div><div class='del'>-		struct mbus_dram_window *cs = dram-&gt;cs + i;</div><div class='add'>+		const struct mbus_dram_window *cs = dram-&gt;cs + i;</div><div class='ctx'> </div><div class='ctx'> 		writel(((cs-&gt;size - 1) &amp; 0xffff0000) |</div><div class='ctx'> 			(cs-&gt;mbus_attr &lt;&lt; 8) |</div><div class='hunk'>@@ -4019,6 +4019,7 @@ static void mv_conf_mbus_windows(struct mv_host_priv *hpriv,</div><div class='ctx'> static int mv_platform_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	const struct mv_sata_platform_data *mv_platform_data;</div><div class='add'>+	const struct mbus_dram_target_info *dram;</div><div class='ctx'> 	const struct ata_port_info *ppi[] =</div><div class='ctx'> 	    { &amp;mv_port_info[chip_soc], NULL };</div><div class='ctx'> 	struct ata_host *host;</div><div class='hunk'>@@ -4072,8 +4073,9 @@ static int mv_platform_probe(struct platform_device *pdev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * (Re-)program MBUS remapping windows if we are asked to.</div><div class='ctx'> 	 */</div><div class='del'>-	if (mv_platform_data-&gt;dram != NULL)</div><div class='del'>-		mv_conf_mbus_windows(hpriv, mv_platform_data-&gt;dram);</div><div class='add'>+	dram = mv_mbus_dram_info();</div><div class='add'>+	if (dram)</div><div class='add'>+		mv_conf_mbus_windows(hpriv, dram);</div><div class='ctx'> </div><div class='ctx'> 	rc = mv_create_dma_pools(hpriv, &amp;pdev-&gt;dev);</div><div class='ctx'> 	if (rc)</div><div class='hunk'>@@ -4141,17 +4143,18 @@ static int mv_platform_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='ctx'> static int mv_platform_resume(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_host *host = platform_get_drvdata(pdev);</div><div class='add'>+	const struct mbus_dram_target_info *dram;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (host) {</div><div class='ctx'> 		struct mv_host_priv *hpriv = host-&gt;private_data;</div><div class='del'>-		const struct mv_sata_platform_data *mv_platform_data = \</div><div class='del'>-			pdev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * (Re-)program MBUS remapping windows if we are asked to.</div><div class='ctx'> 		 */</div><div class='del'>-		if (mv_platform_data-&gt;dram != NULL)</div><div class='del'>-			mv_conf_mbus_windows(hpriv, mv_platform_data-&gt;dram);</div><div class='add'>+		dram = mv_mbus_dram_info();</div><div class='add'>+		if (dram)</div><div class='add'>+			mv_conf_mbus_windows(hpriv, dram);</div><div class='ctx'> </div><div class='ctx'> 		/* initialize adapter */</div><div class='ctx'> 		ret = mv_init_host(host);</div><div class='head'>diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c<br/>index e0bc9646a38e..55d6179dde58 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/sata_nv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/sata_nv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/sata_nv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/sata_nv.c</a></div><div class='hunk'>@@ -599,9 +599,9 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, nv_pci_tbl);</div><div class='ctx'> MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> </div><div class='del'>-static int adma_enabled;</div><div class='del'>-static int swncq_enabled = 1;</div><div class='del'>-static int msi_enabled;</div><div class='add'>+static bool adma_enabled;</div><div class='add'>+static bool swncq_enabled = 1;</div><div class='add'>+static bool msi_enabled;</div><div class='ctx'> </div><div class='ctx'> static void nv_adma_register_mode(struct ata_port *ap)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c<br/>index 1e9140626a83..e7e610aa9a7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ata/sata_sil24.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ata/sata_sil24.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ata/sata_sil24.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ata/sata_sil24.c</a></div><div class='hunk'>@@ -417,7 +417,7 @@ static struct ata_port_operations sil24_ops = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int sata_sil24_msi;    /* Disable MSI */</div><div class='add'>+static bool sata_sil24_msi;    /* Disable MSI */</div><div class='ctx'> module_param_named(msi, sata_sil24_msi, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(msi, "Enable MSI (Default: false)");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/atm/he.c b/drivers/atm/he.c<br/>index 9a51df4f5b74..b182c2f7d777 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/he.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/atm/he.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/he.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/atm/he.c</a></div><div class='hunk'>@@ -112,12 +112,12 @@ static u8 read_prom_byte(struct he_dev *he_dev, int addr);</div><div class='ctx'> /* globals */</div><div class='ctx'> </div><div class='ctx'> static struct he_dev *he_devs;</div><div class='del'>-static int disable64;</div><div class='add'>+static bool disable64;</div><div class='ctx'> static short nvpibits = -1;</div><div class='ctx'> static short nvcibits = -1;</div><div class='ctx'> static short rx_skb_reserve = 16;</div><div class='del'>-static int irq_coalesce = 1;</div><div class='del'>-static int sdh = 0;</div><div class='add'>+static bool irq_coalesce = 1;</div><div class='add'>+static bool sdh = 0;</div><div class='ctx'> </div><div class='ctx'> /* Read from EEPROM = 0000 0011b */</div><div class='ctx'> static unsigned int readtab[] = {</div><div class='head'>diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c<br/>index 3d0c2b0fed9c..9e373ba20308 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/iphase.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/atm/iphase.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/iphase.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/atm/iphase.c</a></div><div class='hunk'>@@ -1320,8 +1320,8 @@ static void rx_dle_intr(struct atm_dev *dev)</div><div class='ctx'>           if (ia_vcc == NULL)</div><div class='ctx'>           {</div><div class='ctx'>              atomic_inc(&amp;vcc-&gt;stats-&gt;rx_err);</div><div class='add'>+             atm_return(vcc, skb-&gt;truesize);</div><div class='ctx'>              dev_kfree_skb_any(skb);</div><div class='del'>-             atm_return(vcc, atm_guess_pdu2truesize(len));</div><div class='ctx'>              goto INCR_DLE;</div><div class='ctx'>            }</div><div class='ctx'>           // get real pkt length  pwang_test</div><div class='hunk'>@@ -1334,8 +1334,8 @@ static void rx_dle_intr(struct atm_dev *dev)</div><div class='ctx'>              atomic_inc(&amp;vcc-&gt;stats-&gt;rx_err);</div><div class='ctx'>              IF_ERR(printk("rx_dle_intr: Bad  AAL5 trailer %d (skb len %d)", </div><div class='ctx'>                                                             length, skb-&gt;len);)</div><div class='add'>+             atm_return(vcc, skb-&gt;truesize);</div><div class='ctx'>              dev_kfree_skb_any(skb);</div><div class='del'>-             atm_return(vcc, atm_guess_pdu2truesize(len));</div><div class='ctx'>              goto INCR_DLE;</div><div class='ctx'>           }</div><div class='ctx'>           skb_trim(skb, length);</div><div class='head'>diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig<br/>index 21cf46f45245..7be9f79018e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/Kconfig</a></div><div class='hunk'>@@ -172,6 +172,21 @@ config SYS_HYPERVISOR</div><div class='ctx'> 	bool</div><div class='ctx'> 	default n</div><div class='ctx'> </div><div class='add'>+config GENERIC_CPU_DEVICES</div><div class='add'>+	bool</div><div class='add'>+	default n</div><div class='add'>+</div><div class='ctx'> source "drivers/base/regmap/Kconfig"</div><div class='ctx'> </div><div class='add'>+config DMA_SHARED_BUFFER</div><div class='add'>+	bool</div><div class='add'>+	default n</div><div class='add'>+	select ANON_INODES</div><div class='add'>+	depends on EXPERIMENTAL</div><div class='add'>+	help</div><div class='add'>+	  This option enables the framework for buffer-sharing between</div><div class='add'>+	  multiple drivers. A buffer is associated with a file using driver</div><div class='add'>+	  APIs extension; the file's descriptor can then be passed on to other</div><div class='add'>+	  driver.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/base/Makefile b/drivers/base/Makefile<br/>index 99a375ad2cc9..2c8272dd93c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/Makefile</a></div><div class='hunk'>@@ -3,16 +3,17 @@</div><div class='ctx'> obj-y			:= core.o sys.o bus.o dd.o syscore.o \</div><div class='ctx'> 			   driver.o class.o platform.o \</div><div class='ctx'> 			   cpu.o firmware.o init.o map.o devres.o \</div><div class='del'>-			   attribute_container.o transport_class.o</div><div class='add'>+			   attribute_container.o transport_class.o \</div><div class='add'>+			   topology.o</div><div class='ctx'> obj-$(CONFIG_DEVTMPFS)	+= devtmpfs.o</div><div class='ctx'> obj-y			+= power/</div><div class='ctx'> obj-$(CONFIG_HAS_DMA)	+= dma-mapping.o</div><div class='ctx'> obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o</div><div class='add'>+obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf.o</div><div class='ctx'> obj-$(CONFIG_ISA)	+= isa.o</div><div class='ctx'> obj-$(CONFIG_FW_LOADER)	+= firmware_class.o</div><div class='ctx'> obj-$(CONFIG_NUMA)	+= node.o</div><div class='ctx'> obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o</div><div class='del'>-obj-$(CONFIG_SMP)	+= topology.o</div><div class='ctx'> ifeq ($(CONFIG_SYSFS),y)</div><div class='ctx'> obj-$(CONFIG_MODULES)	+= module.o</div><div class='ctx'> endif</div><div class='head'>diff --git a/drivers/base/base.h b/drivers/base/base.h<br/>index 21c1b96c34c6..b858dfd9a37c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/base.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/base.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/base.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/base.h</a></div><div class='hunk'>@@ -4,7 +4,9 @@</div><div class='ctx'>  * struct subsys_private - structure to hold the private to the driver core portions of the bus_type/class structure.</div><div class='ctx'>  *</div><div class='ctx'>  * @subsys - the struct kset that defines this subsystem</div><div class='del'>- * @devices_kset - the list of devices associated</div><div class='add'>+ * @devices_kset - the subsystem's 'devices' directory</div><div class='add'>+ * @interfaces - list of subsystem interfaces associated</div><div class='add'>+ * @mutex - protect the devices, and interfaces lists.</div><div class='ctx'>  *</div><div class='ctx'>  * @drivers_kset - the list of drivers associated</div><div class='ctx'>  * @klist_devices - the klist to iterate over the @devices_kset</div><div class='hunk'>@@ -14,10 +16,8 @@</div><div class='ctx'>  * @bus - pointer back to the struct bus_type that this structure is associated</div><div class='ctx'>  *        with.</div><div class='ctx'>  *</div><div class='del'>- * @class_interfaces - list of class_interfaces associated</div><div class='ctx'>  * @glue_dirs - "glue" directory to put in-between the parent device to</div><div class='ctx'>  *              avoid namespace conflicts</div><div class='del'>- * @class_mutex - mutex to protect the children, devices, and interfaces lists.</div><div class='ctx'>  * @class - pointer back to the struct class that this structure is associated</div><div class='ctx'>  *          with.</div><div class='ctx'>  *</div><div class='hunk'>@@ -28,6 +28,8 @@</div><div class='ctx'> struct subsys_private {</div><div class='ctx'> 	struct kset subsys;</div><div class='ctx'> 	struct kset *devices_kset;</div><div class='add'>+	struct list_head interfaces;</div><div class='add'>+	struct mutex mutex;</div><div class='ctx'> </div><div class='ctx'> 	struct kset *drivers_kset;</div><div class='ctx'> 	struct klist klist_devices;</div><div class='hunk'>@@ -36,9 +38,7 @@ struct subsys_private {</div><div class='ctx'> 	unsigned int drivers_autoprobe:1;</div><div class='ctx'> 	struct bus_type *bus;</div><div class='ctx'> </div><div class='del'>-	struct list_head class_interfaces;</div><div class='ctx'> 	struct kset glue_dirs;</div><div class='del'>-	struct mutex class_mutex;</div><div class='ctx'> 	struct class *class;</div><div class='ctx'> };</div><div class='ctx'> #define to_subsys_private(obj) container_of(obj, struct subsys_private, subsys.kobj)</div><div class='hunk'>@@ -94,8 +94,7 @@ extern int hypervisor_init(void);</div><div class='ctx'> static inline int hypervisor_init(void) { return 0; }</div><div class='ctx'> #endif</div><div class='ctx'> extern int platform_bus_init(void);</div><div class='del'>-extern int system_bus_init(void);</div><div class='del'>-extern int cpu_dev_init(void);</div><div class='add'>+extern void cpu_dev_init(void);</div><div class='ctx'> </div><div class='ctx'> extern int bus_add_device(struct device *dev);</div><div class='ctx'> extern void bus_probe_device(struct device *dev);</div><div class='hunk'>@@ -116,6 +115,7 @@ extern char *make_class_name(const char *name, struct kobject *kobj);</div><div class='ctx'> </div><div class='ctx'> extern int devres_release_all(struct device *dev);</div><div class='ctx'> </div><div class='add'>+/* /sys/devices directory */</div><div class='ctx'> extern struct kset *devices_kset;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MODULES) &amp;&amp; defined(CONFIG_SYSFS)</div><div class='head'>diff --git a/drivers/base/bus.c b/drivers/base/bus.c<br/>index 000e7b2006f8..99dc5921e1dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/bus.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/bus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/bus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/bus.c</a></div><div class='hunk'>@@ -16,9 +16,14 @@</div><div class='ctx'> #include &lt;linux/slab.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='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include "base.h"</div><div class='ctx'> #include "power/power.h"</div><div class='ctx'> </div><div class='add'>+/* /sys/devices/system */</div><div class='add'>+/* FIXME: make static after drivers/base/sys.c is deleted */</div><div class='add'>+struct kset *system_kset;</div><div class='add'>+</div><div class='ctx'> #define to_bus_attr(_attr) container_of(_attr, struct bus_attribute, attr)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -360,6 +365,47 @@ struct device *bus_find_device_by_name(struct bus_type *bus,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(bus_find_device_by_name);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * subsys_find_device_by_id - find a device with a specific enumeration number</div><div class='add'>+ * @subsys: subsystem</div><div class='add'>+ * @id: index 'id' in struct device</div><div class='add'>+ * @hint: device to check first</div><div class='add'>+ *</div><div class='add'>+ * Check the hint's next object and if it is a match return it directly,</div><div class='add'>+ * otherwise, fall back to a full list search. Either way a reference for</div><div class='add'>+ * the returned object is taken.</div><div class='add'>+ */</div><div class='add'>+struct device *subsys_find_device_by_id(struct bus_type *subsys, unsigned int id,</div><div class='add'>+					struct device *hint)</div><div class='add'>+{</div><div class='add'>+	struct klist_iter i;</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	if (!subsys)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (hint) {</div><div class='add'>+		klist_iter_init_node(&amp;subsys-&gt;p-&gt;klist_devices, &amp;i, &amp;hint-&gt;p-&gt;knode_bus);</div><div class='add'>+		dev = next_device(&amp;i);</div><div class='add'>+		if (dev &amp;&amp; dev-&gt;id == id &amp;&amp; get_device(dev)) {</div><div class='add'>+			klist_iter_exit(&amp;i);</div><div class='add'>+			return dev;</div><div class='add'>+		}</div><div class='add'>+		klist_iter_exit(&amp;i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	klist_iter_init_node(&amp;subsys-&gt;p-&gt;klist_devices, &amp;i, NULL);</div><div class='add'>+	while ((dev = next_device(&amp;i))) {</div><div class='add'>+		if (dev-&gt;id == id &amp;&amp; get_device(dev)) {</div><div class='add'>+			klist_iter_exit(&amp;i);</div><div class='add'>+			return dev;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	klist_iter_exit(&amp;i);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(subsys_find_device_by_id);</div><div class='add'>+</div><div class='ctx'> static struct device_driver *next_driver(struct klist_iter *i)</div><div class='ctx'> {</div><div class='ctx'> 	struct klist_node *n = klist_next(i);</div><div class='hunk'>@@ -487,38 +533,59 @@ out_put:</div><div class='ctx'> void bus_probe_device(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bus_type *bus = dev-&gt;bus;</div><div class='add'>+	struct subsys_interface *sif;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (bus &amp;&amp; bus-&gt;p-&gt;drivers_autoprobe) {</div><div class='add'>+	if (!bus)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (bus-&gt;p-&gt;drivers_autoprobe) {</div><div class='ctx'> 		ret = device_attach(dev);</div><div class='ctx'> 		WARN_ON(ret &lt; 0);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;bus-&gt;p-&gt;mutex);</div><div class='add'>+	list_for_each_entry(sif, &amp;bus-&gt;p-&gt;interfaces, node)</div><div class='add'>+		if (sif-&gt;add_dev)</div><div class='add'>+			sif-&gt;add_dev(dev, sif);</div><div class='add'>+	mutex_unlock(&amp;bus-&gt;p-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * bus_remove_device - remove device from bus</div><div class='ctx'>  * @dev: device to be removed</div><div class='ctx'>  *</div><div class='del'>- * - Remove symlink from bus's directory.</div><div class='add'>+ * - Remove device from all interfaces.</div><div class='add'>+ * - Remove symlink from bus' directory.</div><div class='ctx'>  * - Delete device from bus's list.</div><div class='ctx'>  * - Detach from its driver.</div><div class='ctx'>  * - Drop reference taken in bus_add_device().</div><div class='ctx'>  */</div><div class='ctx'> void bus_remove_device(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	if (dev-&gt;bus) {</div><div class='del'>-		sysfs_remove_link(&amp;dev-&gt;kobj, "subsystem");</div><div class='del'>-		sysfs_remove_link(&amp;dev-&gt;bus-&gt;p-&gt;devices_kset-&gt;kobj,</div><div class='del'>-				  dev_name(dev));</div><div class='del'>-		device_remove_attrs(dev-&gt;bus, dev);</div><div class='del'>-		if (klist_node_attached(&amp;dev-&gt;p-&gt;knode_bus))</div><div class='del'>-			klist_del(&amp;dev-&gt;p-&gt;knode_bus);</div><div class='del'>-</div><div class='del'>-		pr_debug("bus: '%s': remove device %s\n",</div><div class='del'>-			 dev-&gt;bus-&gt;name, dev_name(dev));</div><div class='del'>-		device_release_driver(dev);</div><div class='del'>-		bus_put(dev-&gt;bus);</div><div class='del'>-	}</div><div class='add'>+	struct bus_type *bus = dev-&gt;bus;</div><div class='add'>+	struct subsys_interface *sif;</div><div class='add'>+</div><div class='add'>+	if (!bus)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;bus-&gt;p-&gt;mutex);</div><div class='add'>+	list_for_each_entry(sif, &amp;bus-&gt;p-&gt;interfaces, node)</div><div class='add'>+		if (sif-&gt;remove_dev)</div><div class='add'>+			sif-&gt;remove_dev(dev, sif);</div><div class='add'>+	mutex_unlock(&amp;bus-&gt;p-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	sysfs_remove_link(&amp;dev-&gt;kobj, "subsystem");</div><div class='add'>+	sysfs_remove_link(&amp;dev-&gt;bus-&gt;p-&gt;devices_kset-&gt;kobj,</div><div class='add'>+			  dev_name(dev));</div><div class='add'>+	device_remove_attrs(dev-&gt;bus, dev);</div><div class='add'>+	if (klist_node_attached(&amp;dev-&gt;p-&gt;knode_bus))</div><div class='add'>+		klist_del(&amp;dev-&gt;p-&gt;knode_bus);</div><div class='add'>+</div><div class='add'>+	pr_debug("bus: '%s': remove device %s\n",</div><div class='add'>+		 dev-&gt;bus-&gt;name, dev_name(dev));</div><div class='add'>+	device_release_driver(dev);</div><div class='add'>+	bus_put(dev-&gt;bus);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int driver_add_attrs(struct bus_type *bus, struct device_driver *drv)</div><div class='hunk'>@@ -847,14 +914,14 @@ static ssize_t bus_uevent_store(struct bus_type *bus,</div><div class='ctx'> static BUS_ATTR(uevent, S_IWUSR, NULL, bus_uevent_store);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * bus_register - register a bus with the system.</div><div class='add'>+ * __bus_register - register a driver-core subsystem</div><div class='ctx'>  * @bus: bus.</div><div class='ctx'>  *</div><div class='ctx'>  * Once we have that, we registered the bus with the kobject</div><div class='ctx'>  * infrastructure, then register the children subsystems it has:</div><div class='del'>- * the devices and drivers that belong to the bus.</div><div class='add'>+ * the devices and drivers that belong to the subsystem.</div><div class='ctx'>  */</div><div class='del'>-int bus_register(struct bus_type *bus)</div><div class='add'>+int __bus_register(struct bus_type *bus, struct lock_class_key *key)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	struct subsys_private *priv;</div><div class='hunk'>@@ -898,6 +965,8 @@ int bus_register(struct bus_type *bus)</div><div class='ctx'> 		goto bus_drivers_fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	INIT_LIST_HEAD(&amp;priv-&gt;interfaces);</div><div class='add'>+	__mutex_init(&amp;priv-&gt;mutex, "subsys mutex", key);</div><div class='ctx'> 	klist_init(&amp;priv-&gt;klist_devices, klist_devices_get, klist_devices_put);</div><div class='ctx'> 	klist_init(&amp;priv-&gt;klist_drivers, NULL, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -927,7 +996,7 @@ out:</div><div class='ctx'> 	bus-&gt;p = NULL;</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(bus_register);</div><div class='add'>+EXPORT_SYMBOL_GPL(__bus_register);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * bus_unregister - remove a bus from the system</div><div class='hunk'>@@ -939,6 +1008,8 @@ EXPORT_SYMBOL_GPL(bus_register);</div><div class='ctx'> void bus_unregister(struct bus_type *bus)</div><div class='ctx'> {</div><div class='ctx'> 	pr_debug("bus: '%s': unregistering\n", bus-&gt;name);</div><div class='add'>+	if (bus-&gt;dev_root)</div><div class='add'>+		device_unregister(bus-&gt;dev_root);</div><div class='ctx'> 	bus_remove_attrs(bus);</div><div class='ctx'> 	remove_probe_files(bus);</div><div class='ctx'> 	kset_unregister(bus-&gt;p-&gt;drivers_kset);</div><div class='hunk'>@@ -1028,10 +1099,194 @@ void bus_sort_breadthfirst(struct bus_type *bus,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(bus_sort_breadthfirst);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * subsys_dev_iter_init - initialize subsys device iterator</div><div class='add'>+ * @iter: subsys iterator to initialize</div><div class='add'>+ * @subsys: the subsys we wanna iterate over</div><div class='add'>+ * @start: the device to start iterating from, if any</div><div class='add'>+ * @type: device_type of the devices to iterate over, NULL for all</div><div class='add'>+ *</div><div class='add'>+ * Initialize subsys iterator @iter such that it iterates over devices</div><div class='add'>+ * of @subsys.  If @start is set, the list iteration will start there,</div><div class='add'>+ * otherwise if it is NULL, the iteration starts at the beginning of</div><div class='add'>+ * the list.</div><div class='add'>+ */</div><div class='add'>+void subsys_dev_iter_init(struct subsys_dev_iter *iter, struct bus_type *subsys,</div><div class='add'>+			  struct device *start, const struct device_type *type)</div><div class='add'>+{</div><div class='add'>+	struct klist_node *start_knode = NULL;</div><div class='add'>+</div><div class='add'>+	if (start)</div><div class='add'>+		start_knode = &amp;start-&gt;p-&gt;knode_bus;</div><div class='add'>+	klist_iter_init_node(&amp;subsys-&gt;p-&gt;klist_devices, &amp;iter-&gt;ki, start_knode);</div><div class='add'>+	iter-&gt;type = type;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(subsys_dev_iter_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * subsys_dev_iter_next - iterate to the next device</div><div class='add'>+ * @iter: subsys iterator to proceed</div><div class='add'>+ *</div><div class='add'>+ * Proceed @iter to the next device and return it.  Returns NULL if</div><div class='add'>+ * iteration is complete.</div><div class='add'>+ *</div><div class='add'>+ * The returned device is referenced and won't be released till</div><div class='add'>+ * iterator is proceed to the next device or exited.  The caller is</div><div class='add'>+ * free to do whatever it wants to do with the device including</div><div class='add'>+ * calling back into subsys code.</div><div class='add'>+ */</div><div class='add'>+struct device *subsys_dev_iter_next(struct subsys_dev_iter *iter)</div><div class='add'>+{</div><div class='add'>+	struct klist_node *knode;</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		knode = klist_next(&amp;iter-&gt;ki);</div><div class='add'>+		if (!knode)</div><div class='add'>+			return NULL;</div><div class='add'>+		dev = container_of(knode, struct device_private, knode_bus)-&gt;device;</div><div class='add'>+		if (!iter-&gt;type || iter-&gt;type == dev-&gt;type)</div><div class='add'>+			return dev;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(subsys_dev_iter_next);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * subsys_dev_iter_exit - finish iteration</div><div class='add'>+ * @iter: subsys iterator to finish</div><div class='add'>+ *</div><div class='add'>+ * Finish an iteration.  Always call this function after iteration is</div><div class='add'>+ * complete whether the iteration ran till the end or not.</div><div class='add'>+ */</div><div class='add'>+void subsys_dev_iter_exit(struct subsys_dev_iter *iter)</div><div class='add'>+{</div><div class='add'>+	klist_iter_exit(&amp;iter-&gt;ki);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(subsys_dev_iter_exit);</div><div class='add'>+</div><div class='add'>+int subsys_interface_register(struct subsys_interface *sif)</div><div class='add'>+{</div><div class='add'>+	struct bus_type *subsys;</div><div class='add'>+	struct subsys_dev_iter iter;</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	if (!sif || !sif-&gt;subsys)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	subsys = bus_get(sif-&gt;subsys);</div><div class='add'>+	if (!subsys)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;subsys-&gt;p-&gt;mutex);</div><div class='add'>+	list_add_tail(&amp;sif-&gt;node, &amp;subsys-&gt;p-&gt;interfaces);</div><div class='add'>+	if (sif-&gt;add_dev) {</div><div class='add'>+		subsys_dev_iter_init(&amp;iter, subsys, NULL, NULL);</div><div class='add'>+		while ((dev = subsys_dev_iter_next(&amp;iter)))</div><div class='add'>+			sif-&gt;add_dev(dev, sif);</div><div class='add'>+		subsys_dev_iter_exit(&amp;iter);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;subsys-&gt;p-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(subsys_interface_register);</div><div class='add'>+</div><div class='add'>+void subsys_interface_unregister(struct subsys_interface *sif)</div><div class='add'>+{</div><div class='add'>+	struct bus_type *subsys = sif-&gt;subsys;</div><div class='add'>+	struct subsys_dev_iter iter;</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	if (!sif)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;subsys-&gt;p-&gt;mutex);</div><div class='add'>+	list_del_init(&amp;sif-&gt;node);</div><div class='add'>+	if (sif-&gt;remove_dev) {</div><div class='add'>+		subsys_dev_iter_init(&amp;iter, subsys, NULL, NULL);</div><div class='add'>+		while ((dev = subsys_dev_iter_next(&amp;iter)))</div><div class='add'>+			sif-&gt;remove_dev(dev, sif);</div><div class='add'>+		subsys_dev_iter_exit(&amp;iter);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;subsys-&gt;p-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	bus_put(subsys);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(subsys_interface_unregister);</div><div class='add'>+</div><div class='add'>+static void system_root_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'>+ * subsys_system_register - register a subsystem at /sys/devices/system/</div><div class='add'>+ * @subsys - system subsystem</div><div class='add'>+ * @groups - default attributes for the root device</div><div class='add'>+ *</div><div class='add'>+ * All 'system' subsystems have a /sys/devices/system/&lt;name&gt; root device</div><div class='add'>+ * with the name of the subsystem. The root device can carry subsystem-</div><div class='add'>+ * wide attributes. All registered devices are below this single root</div><div class='add'>+ * device and are named after the subsystem with a simple enumeration</div><div class='add'>+ * number appended. The registered devices are not explicitely named;</div><div class='add'>+ * only 'id' in the device needs to be set.</div><div class='add'>+ *</div><div class='add'>+ * Do not use this interface for anything new, it exists for compatibility</div><div class='add'>+ * with bad ideas only. New subsystems should use plain subsystems; and</div><div class='add'>+ * add the subsystem-wide attributes should be added to the subsystem</div><div class='add'>+ * directory itself and not some create fake root-device placed in</div><div class='add'>+ * /sys/devices/system/&lt;name&gt;.</div><div class='add'>+ */</div><div class='add'>+int subsys_system_register(struct bus_type *subsys,</div><div class='add'>+			   const struct attribute_group **groups)</div><div class='add'>+{</div><div class='add'>+	struct device *dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bus_register(subsys);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	dev = kzalloc(sizeof(struct device), GFP_KERNEL);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dev_set_name(dev, "%s", subsys-&gt;name);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_name;</div><div class='add'>+</div><div class='add'>+	dev-&gt;kobj.parent = &amp;system_kset-&gt;kobj;</div><div class='add'>+	dev-&gt;groups = groups;</div><div class='add'>+	dev-&gt;release = system_root_device_release;</div><div class='add'>+</div><div class='add'>+	err = device_register(dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_dev_reg;</div><div class='add'>+</div><div class='add'>+	subsys-&gt;dev_root = dev;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_dev_reg:</div><div class='add'>+	put_device(dev);</div><div class='add'>+	dev = NULL;</div><div class='add'>+err_name:</div><div class='add'>+	kfree(dev);</div><div class='add'>+err_dev:</div><div class='add'>+	bus_unregister(subsys);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(subsys_system_register);</div><div class='add'>+</div><div class='ctx'> int __init buses_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	bus_kset = kset_create_and_add("bus", &amp;bus_uevent_ops, NULL);</div><div class='ctx'> 	if (!bus_kset)</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	system_kset = kset_create_and_add("system", NULL, &amp;devices_kset-&gt;kobj);</div><div class='add'>+	if (!system_kset)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/base/class.c b/drivers/base/class.c<br/>index b80d91cc8c3a..03243d4002fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/class.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/class.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/class.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/class.c</a></div><div class='hunk'>@@ -184,9 +184,9 @@ int __class_register(struct class *cls, struct lock_class_key *key)</div><div class='ctx'> 	if (!cp)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	klist_init(&amp;cp-&gt;klist_devices, klist_class_dev_get, klist_class_dev_put);</div><div class='del'>-	INIT_LIST_HEAD(&amp;cp-&gt;class_interfaces);</div><div class='add'>+	INIT_LIST_HEAD(&amp;cp-&gt;interfaces);</div><div class='ctx'> 	kset_init(&amp;cp-&gt;glue_dirs);</div><div class='del'>-	__mutex_init(&amp;cp-&gt;class_mutex, "struct class mutex", key);</div><div class='add'>+	__mutex_init(&amp;cp-&gt;mutex, "subsys mutex", key);</div><div class='ctx'> 	error = kobject_set_name(&amp;cp-&gt;subsys.kobj, "%s", cls-&gt;name);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		kfree(cp);</div><div class='hunk'>@@ -460,15 +460,15 @@ int class_interface_register(struct class_interface *class_intf)</div><div class='ctx'> 	if (!parent)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;parent-&gt;p-&gt;class_mutex);</div><div class='del'>-	list_add_tail(&amp;class_intf-&gt;node, &amp;parent-&gt;p-&gt;class_interfaces);</div><div class='add'>+	mutex_lock(&amp;parent-&gt;p-&gt;mutex);</div><div class='add'>+	list_add_tail(&amp;class_intf-&gt;node, &amp;parent-&gt;p-&gt;interfaces);</div><div class='ctx'> 	if (class_intf-&gt;add_dev) {</div><div class='ctx'> 		class_dev_iter_init(&amp;iter, parent, NULL, NULL);</div><div class='ctx'> 		while ((dev = class_dev_iter_next(&amp;iter)))</div><div class='ctx'> 			class_intf-&gt;add_dev(dev, class_intf);</div><div class='ctx'> 		class_dev_iter_exit(&amp;iter);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;parent-&gt;p-&gt;class_mutex);</div><div class='add'>+	mutex_unlock(&amp;parent-&gt;p-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -482,7 +482,7 @@ void class_interface_unregister(struct class_interface *class_intf)</div><div class='ctx'> 	if (!parent)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;parent-&gt;p-&gt;class_mutex);</div><div class='add'>+	mutex_lock(&amp;parent-&gt;p-&gt;mutex);</div><div class='ctx'> 	list_del_init(&amp;class_intf-&gt;node);</div><div class='ctx'> 	if (class_intf-&gt;remove_dev) {</div><div class='ctx'> 		class_dev_iter_init(&amp;iter, parent, NULL, NULL);</div><div class='hunk'>@@ -490,7 +490,7 @@ void class_interface_unregister(struct class_interface *class_intf)</div><div class='ctx'> 			class_intf-&gt;remove_dev(dev, class_intf);</div><div class='ctx'> 		class_dev_iter_exit(&amp;iter);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;parent-&gt;p-&gt;class_mutex);</div><div class='add'>+	mutex_unlock(&amp;parent-&gt;p-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	class_put(parent);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/base/core.c b/drivers/base/core.c<br/>index 919daa7cd5b1..4a67cc0c8b37 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/core.c</a></div><div class='hunk'>@@ -118,6 +118,56 @@ static const struct sysfs_ops dev_sysfs_ops = {</div><div class='ctx'> 	.store	= dev_attr_store,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define to_ext_attr(x) container_of(x, struct dev_ext_attribute, attr)</div><div class='add'>+</div><div class='add'>+ssize_t device_store_ulong(struct device *dev,</div><div class='add'>+			   struct device_attribute *attr,</div><div class='add'>+			   const char *buf, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct dev_ext_attribute *ea = to_ext_attr(attr);</div><div class='add'>+	char *end;</div><div class='add'>+	unsigned long new = simple_strtoul(buf, &amp;end, 0);</div><div class='add'>+	if (end == buf)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	*(unsigned long *)(ea-&gt;var) = new;</div><div class='add'>+	/* Always return full write size even if we didn't consume all */</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(device_store_ulong);</div><div class='add'>+</div><div class='add'>+ssize_t device_show_ulong(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 dev_ext_attribute *ea = to_ext_attr(attr);</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%lx\n", *(unsigned long *)(ea-&gt;var));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(device_show_ulong);</div><div class='add'>+</div><div class='add'>+ssize_t device_store_int(struct device *dev,</div><div class='add'>+			 struct device_attribute *attr,</div><div class='add'>+			 const char *buf, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct dev_ext_attribute *ea = to_ext_attr(attr);</div><div class='add'>+	char *end;</div><div class='add'>+	long new = simple_strtol(buf, &amp;end, 0);</div><div class='add'>+	if (end == buf || new &gt; INT_MAX || new &lt; INT_MIN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	*(int *)(ea-&gt;var) = new;</div><div class='add'>+	/* Always return full write size even if we didn't consume all */</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(device_store_int);</div><div class='add'>+</div><div class='add'>+ssize_t device_show_int(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 dev_ext_attribute *ea = to_ext_attr(attr);</div><div class='add'>+</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%d\n", *(int *)(ea-&gt;var));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(device_show_int);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	device_release - free device structure.</div><div class='hunk'>@@ -198,7 +248,7 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj,</div><div class='ctx'> 	if (MAJOR(dev-&gt;devt)) {</div><div class='ctx'> 		const char *tmp;</div><div class='ctx'> 		const char *name;</div><div class='del'>-		mode_t mode = 0;</div><div class='add'>+		umode_t mode = 0;</div><div class='ctx'> </div><div class='ctx'> 		add_uevent_var(env, "MAJOR=%u", MAJOR(dev-&gt;devt));</div><div class='ctx'> 		add_uevent_var(env, "MINOR=%u", MINOR(dev-&gt;devt));</div><div class='hunk'>@@ -464,7 +514,7 @@ static ssize_t show_dev(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> static struct device_attribute devt_attr =</div><div class='ctx'> 	__ATTR(dev, S_IRUGO, show_dev, NULL);</div><div class='ctx'> </div><div class='del'>-/* kset to create /sys/devices/  */</div><div class='add'>+/* /sys/devices/ */</div><div class='ctx'> struct kset *devices_kset;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -711,6 +761,10 @@ static struct kobject *get_device_parent(struct device *dev,</div><div class='ctx'> 		return k;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* subsystems can specify a default root directory for their devices */</div><div class='add'>+	if (!parent &amp;&amp; dev-&gt;bus &amp;&amp; dev-&gt;bus-&gt;dev_root)</div><div class='add'>+		return &amp;dev-&gt;bus-&gt;dev_root-&gt;kobj;</div><div class='add'>+</div><div class='ctx'> 	if (parent)</div><div class='ctx'> 		return &amp;parent-&gt;kobj;</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -731,14 +785,6 @@ static void cleanup_device_parent(struct device *dev)</div><div class='ctx'> 	cleanup_glue_dir(dev, dev-&gt;kobj.parent);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void setup_parent(struct device *dev, struct device *parent)</div><div class='del'>-{</div><div class='del'>-	struct kobject *kobj;</div><div class='del'>-	kobj = get_device_parent(dev, parent);</div><div class='del'>-	if (kobj)</div><div class='del'>-		dev-&gt;kobj.parent = kobj;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int device_add_class_symlinks(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -891,6 +937,7 @@ int device_private_init(struct device *dev)</div><div class='ctx'> int device_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *parent = NULL;</div><div class='add'>+	struct kobject *kobj;</div><div class='ctx'> 	struct class_interface *class_intf;</div><div class='ctx'> 	int error = -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -914,6 +961,10 @@ int device_add(struct device *dev)</div><div class='ctx'> 		dev-&gt;init_name = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* subsystems can specify simple device enumeration */</div><div class='add'>+	if (!dev_name(dev) &amp;&amp; dev-&gt;bus &amp;&amp; dev-&gt;bus-&gt;dev_name)</div><div class='add'>+		dev_set_name(dev, "%s%u", dev-&gt;bus-&gt;dev_name, dev-&gt;id);</div><div class='add'>+</div><div class='ctx'> 	if (!dev_name(dev)) {</div><div class='ctx'> 		error = -EINVAL;</div><div class='ctx'> 		goto name_error;</div><div class='hunk'>@@ -922,7 +973,9 @@ int device_add(struct device *dev)</div><div class='ctx'> 	pr_debug("device: '%s': %s\n", dev_name(dev), __func__);</div><div class='ctx'> </div><div class='ctx'> 	parent = get_device(dev-&gt;parent);</div><div class='del'>-	setup_parent(dev, parent);</div><div class='add'>+	kobj = get_device_parent(dev, parent);</div><div class='add'>+	if (kobj)</div><div class='add'>+		dev-&gt;kobj.parent = kobj;</div><div class='ctx'> </div><div class='ctx'> 	/* use parent numa_node */</div><div class='ctx'> 	if (parent)</div><div class='hunk'>@@ -982,17 +1035,17 @@ int device_add(struct device *dev)</div><div class='ctx'> 			       &amp;parent-&gt;p-&gt;klist_children);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;class) {</div><div class='del'>-		mutex_lock(&amp;dev-&gt;class-&gt;p-&gt;class_mutex);</div><div class='add'>+		mutex_lock(&amp;dev-&gt;class-&gt;p-&gt;mutex);</div><div class='ctx'> 		/* tie the class to the device */</div><div class='ctx'> 		klist_add_tail(&amp;dev-&gt;knode_class,</div><div class='ctx'> 			       &amp;dev-&gt;class-&gt;p-&gt;klist_devices);</div><div class='ctx'> </div><div class='ctx'> 		/* notify any interfaces that the device is here */</div><div class='ctx'> 		list_for_each_entry(class_intf,</div><div class='del'>-				    &amp;dev-&gt;class-&gt;p-&gt;class_interfaces, node)</div><div class='add'>+				    &amp;dev-&gt;class-&gt;p-&gt;interfaces, node)</div><div class='ctx'> 			if (class_intf-&gt;add_dev)</div><div class='ctx'> 				class_intf-&gt;add_dev(dev, class_intf);</div><div class='del'>-		mutex_unlock(&amp;dev-&gt;class-&gt;p-&gt;class_mutex);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;class-&gt;p-&gt;mutex);</div><div class='ctx'> 	}</div><div class='ctx'> done:</div><div class='ctx'> 	put_device(dev);</div><div class='hunk'>@@ -1107,15 +1160,15 @@ void device_del(struct device *dev)</div><div class='ctx'> 	if (dev-&gt;class) {</div><div class='ctx'> 		device_remove_class_symlinks(dev);</div><div class='ctx'> </div><div class='del'>-		mutex_lock(&amp;dev-&gt;class-&gt;p-&gt;class_mutex);</div><div class='add'>+		mutex_lock(&amp;dev-&gt;class-&gt;p-&gt;mutex);</div><div class='ctx'> 		/* notify any interfaces that the device is now gone */</div><div class='ctx'> 		list_for_each_entry(class_intf,</div><div class='del'>-				    &amp;dev-&gt;class-&gt;p-&gt;class_interfaces, node)</div><div class='add'>+				    &amp;dev-&gt;class-&gt;p-&gt;interfaces, node)</div><div class='ctx'> 			if (class_intf-&gt;remove_dev)</div><div class='ctx'> 				class_intf-&gt;remove_dev(dev, class_intf);</div><div class='ctx'> 		/* remove the device from the class list */</div><div class='ctx'> 		klist_del(&amp;dev-&gt;knode_class);</div><div class='del'>-		mutex_unlock(&amp;dev-&gt;class-&gt;p-&gt;class_mutex);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;class-&gt;p-&gt;mutex);</div><div class='ctx'> 	}</div><div class='ctx'> 	device_remove_file(dev, &amp;uevent_attr);</div><div class='ctx'> 	device_remove_attrs(dev);</div><div class='hunk'>@@ -1182,7 +1235,7 @@ static struct device *next_device(struct klist_iter *i)</div><div class='ctx'>  * freed by the caller.</div><div class='ctx'>  */</div><div class='ctx'> const char *device_get_devnode(struct device *dev,</div><div class='del'>-			       mode_t *mode, const char **tmp)</div><div class='add'>+			       umode_t *mode, const char **tmp)</div><div class='ctx'> {</div><div class='ctx'> 	char *s;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c<br/>index 3991502b21e5..db87e78d7459 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/cpu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/cpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/cpu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/cpu.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> /*</div><div class='del'>- * drivers/base/cpu.c - basic CPU class support</div><div class='add'>+ * CPU subsystem support</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -11,43 +11,44 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/node.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='add'>+#include &lt;linux/percpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "base.h"</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class_attribute *cpu_sysdev_class_attrs[];</div><div class='del'>-</div><div class='del'>-struct sysdev_class cpu_sysdev_class = {</div><div class='add'>+struct bus_type cpu_subsys = {</div><div class='ctx'> 	.name = "cpu",</div><div class='del'>-	.attrs = cpu_sysdev_class_attrs,</div><div class='add'>+	.dev_name = "cpu",</div><div class='ctx'> };</div><div class='del'>-EXPORT_SYMBOL(cpu_sysdev_class);</div><div class='add'>+EXPORT_SYMBOL_GPL(cpu_subsys);</div><div class='ctx'> </div><div class='del'>-static DEFINE_PER_CPU(struct sys_device *, cpu_sys_devices);</div><div class='add'>+static DEFINE_PER_CPU(struct device *, cpu_sys_devices);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-static ssize_t show_online(struct sys_device *dev, struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t show_online(struct device *dev,</div><div class='add'>+			   struct device_attribute *attr,</div><div class='ctx'> 			   char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct cpu *cpu = container_of(dev, struct cpu, sysdev);</div><div class='add'>+	struct cpu *cpu = container_of(dev, struct cpu, dev);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%u\n", !!cpu_online(cpu-&gt;sysdev.id));</div><div class='add'>+	return sprintf(buf, "%u\n", !!cpu_online(cpu-&gt;dev.id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t __ref store_online(struct sys_device *dev, struct sysdev_attribute *attr,</div><div class='del'>-				 const char *buf, size_t count)</div><div class='add'>+static ssize_t __ref store_online(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='del'>-	struct cpu *cpu = container_of(dev, struct cpu, sysdev);</div><div class='add'>+	struct cpu *cpu = container_of(dev, struct cpu, dev);</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='ctx'> 	cpu_hotplug_driver_lock();</div><div class='ctx'> 	switch (buf[0]) {</div><div class='ctx'> 	case '0':</div><div class='del'>-		ret = cpu_down(cpu-&gt;sysdev.id);</div><div class='add'>+		ret = cpu_down(cpu-&gt;dev.id);</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			kobject_uevent(&amp;dev-&gt;kobj, KOBJ_OFFLINE);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case '1':</div><div class='del'>-		ret = cpu_up(cpu-&gt;sysdev.id);</div><div class='add'>+		ret = cpu_up(cpu-&gt;dev.id);</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			kobject_uevent(&amp;dev-&gt;kobj, KOBJ_ONLINE);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -60,44 +61,44 @@ static ssize_t __ref store_online(struct sys_device *dev, struct sysdev_attribut</div><div class='ctx'> 		ret = count;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_ATTR(online, 0644, show_online, store_online);</div><div class='add'>+static DEVICE_ATTR(online, 0644, show_online, store_online);</div><div class='ctx'> </div><div class='ctx'> static void __cpuinit register_cpu_control(struct cpu *cpu)</div><div class='ctx'> {</div><div class='del'>-	sysdev_create_file(&amp;cpu-&gt;sysdev, &amp;attr_online);</div><div class='add'>+	device_create_file(&amp;cpu-&gt;dev, &amp;dev_attr_online);</div><div class='ctx'> }</div><div class='ctx'> void unregister_cpu(struct cpu *cpu)</div><div class='ctx'> {</div><div class='del'>-	int logical_cpu = cpu-&gt;sysdev.id;</div><div class='add'>+	int logical_cpu = cpu-&gt;dev.id;</div><div class='ctx'> </div><div class='ctx'> 	unregister_cpu_under_node(logical_cpu, cpu_to_node(logical_cpu));</div><div class='ctx'> </div><div class='del'>-	sysdev_remove_file(&amp;cpu-&gt;sysdev, &amp;attr_online);</div><div class='add'>+	device_remove_file(&amp;cpu-&gt;dev, &amp;dev_attr_online);</div><div class='ctx'> </div><div class='del'>-	sysdev_unregister(&amp;cpu-&gt;sysdev);</div><div class='add'>+	device_unregister(&amp;cpu-&gt;dev);</div><div class='ctx'> 	per_cpu(cpu_sys_devices, logical_cpu) = NULL;</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_CPU_PROBE_RELEASE</div><div class='del'>-static ssize_t cpu_probe_store(struct sysdev_class *class,</div><div class='del'>-			       struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t cpu_probe_store(struct device *dev,</div><div class='add'>+			       struct device_attribute *attr,</div><div class='ctx'> 			       const char *buf,</div><div class='ctx'> 			       size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	return arch_cpu_probe(buf, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t cpu_release_store(struct sysdev_class *class,</div><div class='del'>-				 struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t cpu_release_store(struct device *dev,</div><div class='add'>+				 struct device_attribute *attr,</div><div class='ctx'> 				 const char *buf,</div><div class='ctx'> 				 size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	return arch_cpu_release(buf, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(probe, S_IWUSR, NULL, cpu_probe_store);</div><div class='del'>-static SYSDEV_CLASS_ATTR(release, S_IWUSR, NULL, cpu_release_store);</div><div class='add'>+static DEVICE_ATTR(probe, S_IWUSR, NULL, cpu_probe_store);</div><div class='add'>+static DEVICE_ATTR(release, S_IWUSR, NULL, cpu_release_store);</div><div class='ctx'> #endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */</div><div class='ctx'> </div><div class='ctx'> #else /* ... !CONFIG_HOTPLUG_CPU */</div><div class='hunk'>@@ -109,15 +110,15 @@ static inline void register_cpu_control(struct cpu *cpu)</div><div class='ctx'> #ifdef CONFIG_KEXEC</div><div class='ctx'> #include &lt;linux/kexec.h&gt;</div><div class='ctx'> </div><div class='del'>-static ssize_t show_crash_notes(struct sys_device *dev, struct sysdev_attribute *attr,</div><div class='add'>+static ssize_t show_crash_notes(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 				char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct cpu *cpu = container_of(dev, struct cpu, sysdev);</div><div class='add'>+	struct cpu *cpu = container_of(dev, struct cpu, dev);</div><div class='ctx'> 	ssize_t rc;</div><div class='ctx'> 	unsigned long long addr;</div><div class='ctx'> 	int cpunum;</div><div class='ctx'> </div><div class='del'>-	cpunum = cpu-&gt;sysdev.id;</div><div class='add'>+	cpunum = cpu-&gt;dev.id;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Might be reading other cpu's data based on which cpu read thread</div><div class='hunk'>@@ -129,7 +130,7 @@ static ssize_t show_crash_notes(struct sys_device *dev, struct sysdev_attribute</div><div class='ctx'> 	rc = sprintf(buf, "%Lx\n", addr);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_ATTR(crash_notes, 0400, show_crash_notes, NULL);</div><div class='add'>+static DEVICE_ATTR(crash_notes, 0400, show_crash_notes, NULL);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -137,12 +138,12 @@ static SYSDEV_ATTR(crash_notes, 0400, show_crash_notes, NULL);</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct cpu_attr {</div><div class='del'>-	struct sysdev_class_attribute attr;</div><div class='add'>+	struct device_attribute attr;</div><div class='ctx'> 	const struct cpumask *const * const map;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static ssize_t show_cpus_attr(struct sysdev_class *class,</div><div class='del'>-			      struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t show_cpus_attr(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr,</div><div class='ctx'> 			      char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpu_attr *ca = container_of(attr, struct cpu_attr, attr);</div><div class='hunk'>@@ -153,10 +154,10 @@ static ssize_t show_cpus_attr(struct sysdev_class *class,</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define _CPU_ATTR(name, map)						\</div><div class='del'>-	{ _SYSDEV_CLASS_ATTR(name, 0444, show_cpus_attr, NULL), map }</div><div class='add'>+#define _CPU_ATTR(name, map) \</div><div class='add'>+	{ __ATTR(name, 0444, show_cpus_attr, NULL), map }</div><div class='ctx'> </div><div class='del'>-/* Keep in sync with cpu_sysdev_class_attrs */</div><div class='add'>+/* Keep in sync with cpu_subsys_attrs */</div><div class='ctx'> static struct cpu_attr cpu_attrs[] = {</div><div class='ctx'> 	_CPU_ATTR(online, &amp;cpu_online_mask),</div><div class='ctx'> 	_CPU_ATTR(possible, &amp;cpu_possible_mask),</div><div class='hunk'>@@ -166,19 +167,19 @@ static struct cpu_attr cpu_attrs[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * Print values for NR_CPUS and offlined cpus</div><div class='ctx'>  */</div><div class='del'>-static ssize_t print_cpus_kernel_max(struct sysdev_class *class,</div><div class='del'>-				     struct sysdev_class_attribute *attr, char *buf)</div><div class='add'>+static ssize_t print_cpus_kernel_max(struct device *dev,</div><div class='add'>+				     struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int n = snprintf(buf, PAGE_SIZE-2, "%d\n", NR_CPUS - 1);</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_CLASS_ATTR(kernel_max, 0444, print_cpus_kernel_max, NULL);</div><div class='add'>+static DEVICE_ATTR(kernel_max, 0444, print_cpus_kernel_max, NULL);</div><div class='ctx'> </div><div class='ctx'> /* arch-optional setting to enable display of offline cpus &gt;= nr_cpu_ids */</div><div class='ctx'> unsigned int total_cpus;</div><div class='ctx'> </div><div class='del'>-static ssize_t print_cpus_offline(struct sysdev_class *class,</div><div class='del'>-				  struct sysdev_class_attribute *attr, char *buf)</div><div class='add'>+static ssize_t print_cpus_offline(struct device *dev,</div><div class='add'>+				  struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int n = 0, len = PAGE_SIZE-2;</div><div class='ctx'> 	cpumask_var_t offline;</div><div class='hunk'>@@ -205,7 +206,7 @@ static ssize_t print_cpus_offline(struct sysdev_class *class,</div><div class='ctx'> 	n += snprintf(&amp;buf[n], len - n, "\n");</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_CLASS_ATTR(offline, 0444, print_cpus_offline, NULL);</div><div class='add'>+static DEVICE_ATTR(offline, 0444, print_cpus_offline, NULL);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * register_cpu - Setup a sysfs device for a CPU.</div><div class='hunk'>@@ -218,64 +219,87 @@ static SYSDEV_CLASS_ATTR(offline, 0444, print_cpus_offline, NULL);</div><div class='ctx'> int __cpuinit register_cpu(struct cpu *cpu, int num)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='del'>-	cpu-&gt;node_id = cpu_to_node(num);</div><div class='del'>-	cpu-&gt;sysdev.id = num;</div><div class='del'>-	cpu-&gt;sysdev.cls = &amp;cpu_sysdev_class;</div><div class='del'>-</div><div class='del'>-	error = sysdev_register(&amp;cpu-&gt;sysdev);</div><div class='ctx'> </div><div class='add'>+	cpu-&gt;node_id = cpu_to_node(num);</div><div class='add'>+	cpu-&gt;dev.id = num;</div><div class='add'>+	cpu-&gt;dev.bus = &amp;cpu_subsys;</div><div class='add'>+	error = device_register(&amp;cpu-&gt;dev);</div><div class='ctx'> 	if (!error &amp;&amp; cpu-&gt;hotpluggable)</div><div class='ctx'> 		register_cpu_control(cpu);</div><div class='ctx'> 	if (!error)</div><div class='del'>-		per_cpu(cpu_sys_devices, num) = &amp;cpu-&gt;sysdev;</div><div class='add'>+		per_cpu(cpu_sys_devices, num) = &amp;cpu-&gt;dev;</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		register_cpu_under_node(num, cpu_to_node(num));</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KEXEC</div><div class='ctx'> 	if (!error)</div><div class='del'>-		error = sysdev_create_file(&amp;cpu-&gt;sysdev, &amp;attr_crash_notes);</div><div class='add'>+		error = device_create_file(&amp;cpu-&gt;dev, &amp;dev_attr_crash_notes);</div><div class='ctx'> #endif</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sys_device *get_cpu_sysdev(unsigned cpu)</div><div class='add'>+struct device *get_cpu_device(unsigned cpu)</div><div class='ctx'> {</div><div class='ctx'> 	if (cpu &lt; nr_cpu_ids &amp;&amp; cpu_possible(cpu))</div><div class='ctx'> 		return per_cpu(cpu_sys_devices, cpu);</div><div class='ctx'> 	else</div><div class='ctx'> 		return NULL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(get_cpu_sysdev);</div><div class='add'>+EXPORT_SYMBOL_GPL(get_cpu_device);</div><div class='add'>+</div><div class='add'>+static struct attribute *cpu_root_attrs[] = {</div><div class='add'>+#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE</div><div class='add'>+	&amp;dev_attr_probe.attr,</div><div class='add'>+	&amp;dev_attr_release.attr,</div><div class='add'>+#endif</div><div class='add'>+	&amp;cpu_attrs[0].attr.attr,</div><div class='add'>+	&amp;cpu_attrs[1].attr.attr,</div><div class='add'>+	&amp;cpu_attrs[2].attr.attr,</div><div class='add'>+	&amp;dev_attr_kernel_max.attr,</div><div class='add'>+	&amp;dev_attr_offline.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute_group cpu_root_attr_group = {</div><div class='add'>+	.attrs = cpu_root_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group *cpu_root_attr_groups[] = {</div><div class='add'>+	&amp;cpu_root_attr_group,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> bool cpu_is_hotpluggable(unsigned cpu)</div><div class='ctx'> {</div><div class='del'>-	struct sys_device *dev = get_cpu_sysdev(cpu);</div><div class='del'>-	return dev &amp;&amp; container_of(dev, struct cpu, sysdev)-&gt;hotpluggable;</div><div class='add'>+	struct device *dev = get_cpu_device(cpu);</div><div class='add'>+	return dev &amp;&amp; container_of(dev, struct cpu, dev)-&gt;hotpluggable;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(cpu_is_hotpluggable);</div><div class='ctx'> </div><div class='del'>-int __init cpu_dev_init(void)</div><div class='add'>+#ifdef CONFIG_GENERIC_CPU_DEVICES</div><div class='add'>+static DEFINE_PER_CPU(struct cpu, cpu_devices);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void __init cpu_dev_register_generic(void)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+#ifdef CONFIG_GENERIC_CPU_DEVICES</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	err = sysdev_class_register(&amp;cpu_sysdev_class);</div><div class='del'>-#if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT)</div><div class='del'>-	if (!err)</div><div class='del'>-		err = sched_create_sysfs_power_savings_entries(&amp;cpu_sysdev_class);</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		if (register_cpu(&amp;per_cpu(cpu_devices, i), i))</div><div class='add'>+			panic("Failed to register CPU device");</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class_attribute *cpu_sysdev_class_attrs[] = {</div><div class='del'>-#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE</div><div class='del'>-	&amp;attr_probe,</div><div class='del'>-	&amp;attr_release,</div><div class='add'>+void __init cpu_dev_init(void)</div><div class='add'>+{</div><div class='add'>+	if (subsys_system_register(&amp;cpu_subsys, cpu_root_attr_groups))</div><div class='add'>+		panic("Failed to register CPU subsystem");</div><div class='add'>+</div><div class='add'>+	cpu_dev_register_generic();</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT)</div><div class='add'>+	sched_create_sysfs_power_savings_entries(cpu_subsys.dev_root);</div><div class='ctx'> #endif</div><div class='del'>-	&amp;cpu_attrs[0].attr,</div><div class='del'>-	&amp;cpu_attrs[1].attr,</div><div class='del'>-	&amp;cpu_attrs[2].attr,</div><div class='del'>-	&amp;attr_kernel_max,</div><div class='del'>-	&amp;attr_offline,</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/base/devres.c b/drivers/base/devres.c<br/>index 65cd74832450..524bf96c289f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/devres.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/devres.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/devres.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/devres.c</a></div><div class='hunk'>@@ -639,7 +639,7 @@ EXPORT_SYMBOL_GPL(devm_kzalloc);</div><div class='ctx'>  * @dev: Device this memory belongs to</div><div class='ctx'>  * @p: Memory to free</div><div class='ctx'>  *</div><div class='del'>- * Free memory allocated with dev_kzalloc().</div><div class='add'>+ * Free memory allocated with devm_kzalloc().</div><div class='ctx'>  */</div><div class='ctx'> void devm_kfree(struct device *dev, void *p)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c<br/>index a4760e095ff5..8493536ea55b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/devtmpfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/devtmpfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/devtmpfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/devtmpfs.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@ static struct req {</div><div class='ctx'> 	struct completion done;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	const char *name;</div><div class='del'>-	mode_t mode;	/* 0 =&gt; delete */</div><div class='add'>+	umode_t mode;	/* 0 =&gt; delete */</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> } *requests;</div><div class='ctx'> </div><div class='hunk'>@@ -142,7 +142,7 @@ int devtmpfs_delete_node(struct device *dev)</div><div class='ctx'> 	return req.err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dev_mkdir(const char *name, mode_t mode)</div><div class='add'>+static int dev_mkdir(const char *name, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	struct path path;</div><div class='hunk'>@@ -189,7 +189,7 @@ static int create_path(const char *nodepath)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int handle_create(const char *nodename, mode_t mode, struct device *dev)</div><div class='add'>+static int handle_create(const char *nodename, umode_t mode, struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	struct path path;</div><div class='hunk'>@@ -378,7 +378,7 @@ int devtmpfs_mount(const char *mntdir)</div><div class='ctx'> </div><div class='ctx'> static DECLARE_COMPLETION(setup_done);</div><div class='ctx'> </div><div class='del'>-static int handle(const char *name, mode_t mode, struct device *dev)</div><div class='add'>+static int handle(const char *name, umode_t mode, struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (mode)</div><div class='ctx'> 		return handle_create(name, mode, dev);</div><div class='hunk'>@@ -413,10 +413,9 @@ static int devtmpfsd(void *p)</div><div class='ctx'> 			}</div><div class='ctx'> 			spin_lock(&amp;req_lock);</div><div class='ctx'> 		}</div><div class='del'>-		set_current_state(TASK_INTERRUPTIBLE);</div><div class='add'>+		__set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> 		spin_unlock(&amp;req_lock);</div><div class='ctx'> 		schedule();</div><div class='del'>-		__set_current_state(TASK_RUNNING);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> out:</div><div class='head'>diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c<br/>new file mode 100644<br/>index 000000000000..e38ad243b4bb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/dma-buf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/dma-buf.c</a></div><div class='hunk'>@@ -0,0 +1,291 @@</div><div class='add'>+/*</div><div class='add'>+ * Framework for buffer objects that can be shared across devices/subsystems.</div><div class='add'>+ *</div><div class='add'>+ * Copyright(C) 2011 Linaro Limited. All rights reserved.</div><div class='add'>+ * Author: Sumit Semwal &lt;sumit.semwal@ti.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Many thanks to linaro-mm-sig list, and specially</div><div class='add'>+ * Arnd Bergmann &lt;arnd@arndb.de&gt;, Rob Clark &lt;rob@ti.com&gt; and</div><div class='add'>+ * Daniel Vetter &lt;daniel@ffwll.ch&gt; for their support in creation and</div><div class='add'>+ * refining of this idea.</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 version 2 as published by</div><div class='add'>+ * the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</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/slab.h&gt;</div><div class='add'>+#include &lt;linux/dma-buf.h&gt;</div><div class='add'>+#include &lt;linux/anon_inodes.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+</div><div class='add'>+static inline int is_dma_buf_file(struct file *);</div><div class='add'>+</div><div class='add'>+static int dma_buf_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct dma_buf *dmabuf;</div><div class='add'>+</div><div class='add'>+	if (!is_dma_buf_file(file))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dmabuf = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	dmabuf-&gt;ops-&gt;release(dmabuf);</div><div class='add'>+	kfree(dmabuf);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations dma_buf_fops = {</div><div class='add'>+	.release	= dma_buf_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * is_dma_buf_file - Check if struct file* is associated with dma_buf</div><div class='add'>+ */</div><div class='add'>+static inline int is_dma_buf_file(struct file *file)</div><div class='add'>+{</div><div class='add'>+	return file-&gt;f_op == &amp;dma_buf_fops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_buf_export - Creates a new dma_buf, and associates an anon file</div><div class='add'>+ * with this buffer, so it can be exported.</div><div class='add'>+ * Also connect the allocator specific data and ops to the buffer.</div><div class='add'>+ *</div><div class='add'>+ * @priv:	[in]	Attach private data of allocator to this buffer</div><div class='add'>+ * @ops:	[in]	Attach allocator-defined dma buf ops to the new buffer.</div><div class='add'>+ * @size:	[in]	Size of the buffer</div><div class='add'>+ * @flags:	[in]	mode flags for the file.</div><div class='add'>+ *</div><div class='add'>+ * Returns, on success, a newly created dma_buf object, which wraps the</div><div class='add'>+ * supplied private data and operations for dma_buf_ops. On either missing</div><div class='add'>+ * ops, or error in allocating struct dma_buf, will return negative error.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+struct dma_buf *dma_buf_export(void *priv, struct dma_buf_ops *ops,</div><div class='add'>+				size_t size, int flags)</div><div class='add'>+{</div><div class='add'>+	struct dma_buf *dmabuf;</div><div class='add'>+	struct file *file;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!priv || !ops</div><div class='add'>+			  || !ops-&gt;map_dma_buf</div><div class='add'>+			  || !ops-&gt;unmap_dma_buf</div><div class='add'>+			  || !ops-&gt;release)) {</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dmabuf = kzalloc(sizeof(struct dma_buf), GFP_KERNEL);</div><div class='add'>+	if (dmabuf == NULL)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	dmabuf-&gt;priv = priv;</div><div class='add'>+	dmabuf-&gt;ops = ops;</div><div class='add'>+	dmabuf-&gt;size = size;</div><div class='add'>+</div><div class='add'>+	file = anon_inode_getfile("dmabuf", &amp;dma_buf_fops, dmabuf, flags);</div><div class='add'>+</div><div class='add'>+	dmabuf-&gt;file = file;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;dmabuf-&gt;lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dmabuf-&gt;attachments);</div><div class='add'>+</div><div class='add'>+	return dmabuf;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dma_buf_export);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_buf_fd - returns a file descriptor for the given dma_buf</div><div class='add'>+ * @dmabuf:	[in]	pointer to dma_buf for which fd is required.</div><div class='add'>+ *</div><div class='add'>+ * On success, returns an associated 'fd'. Else, returns error.</div><div class='add'>+ */</div><div class='add'>+int dma_buf_fd(struct dma_buf *dmabuf)</div><div class='add'>+{</div><div class='add'>+	int error, fd;</div><div class='add'>+</div><div class='add'>+	if (!dmabuf || !dmabuf-&gt;file)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	error = get_unused_fd();</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		return error;</div><div class='add'>+	fd = error;</div><div class='add'>+</div><div class='add'>+	fd_install(fd, dmabuf-&gt;file);</div><div class='add'>+</div><div class='add'>+	return fd;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dma_buf_fd);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_buf_get - returns the dma_buf structure related to an fd</div><div class='add'>+ * @fd:	[in]	fd associated with the dma_buf to be returned</div><div class='add'>+ *</div><div class='add'>+ * On success, returns the dma_buf structure associated with an fd; uses</div><div class='add'>+ * file's refcounting done by fget to increase refcount. returns ERR_PTR</div><div class='add'>+ * otherwise.</div><div class='add'>+ */</div><div class='add'>+struct dma_buf *dma_buf_get(int fd)</div><div class='add'>+{</div><div class='add'>+	struct file *file;</div><div class='add'>+</div><div class='add'>+	file = fget(fd);</div><div class='add'>+</div><div class='add'>+	if (!file)</div><div class='add'>+		return ERR_PTR(-EBADF);</div><div class='add'>+</div><div class='add'>+	if (!is_dma_buf_file(file)) {</div><div class='add'>+		fput(file);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return file-&gt;private_data;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dma_buf_get);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_buf_put - decreases refcount of the buffer</div><div class='add'>+ * @dmabuf:	[in]	buffer to reduce refcount of</div><div class='add'>+ *</div><div class='add'>+ * Uses file's refcounting done implicitly by fput()</div><div class='add'>+ */</div><div class='add'>+void dma_buf_put(struct dma_buf *dmabuf)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!dmabuf || !dmabuf-&gt;file))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fput(dmabuf-&gt;file);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dma_buf_put);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_buf_attach - Add the device to dma_buf's attachments list; optionally,</div><div class='add'>+ * calls attach() of dma_buf_ops to allow device-specific attach functionality</div><div class='add'>+ * @dmabuf:	[in]	buffer to attach device to.</div><div class='add'>+ * @dev:	[in]	device to be attached.</div><div class='add'>+ *</div><div class='add'>+ * Returns struct dma_buf_attachment * for this attachment; may return negative</div><div class='add'>+ * error codes.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,</div><div class='add'>+					  struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dma_buf_attachment *attach;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!dmabuf || !dev || !dmabuf-&gt;ops))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	attach = kzalloc(sizeof(struct dma_buf_attachment), GFP_KERNEL);</div><div class='add'>+	if (attach == NULL)</div><div class='add'>+		goto err_alloc;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dmabuf-&gt;lock);</div><div class='add'>+</div><div class='add'>+	attach-&gt;dev = dev;</div><div class='add'>+	attach-&gt;dmabuf = dmabuf;</div><div class='add'>+	if (dmabuf-&gt;ops-&gt;attach) {</div><div class='add'>+		ret = dmabuf-&gt;ops-&gt;attach(dmabuf, dev, attach);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_attach;</div><div class='add'>+	}</div><div class='add'>+	list_add(&amp;attach-&gt;node, &amp;dmabuf-&gt;attachments);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dmabuf-&gt;lock);</div><div class='add'>+	return attach;</div><div class='add'>+</div><div class='add'>+err_alloc:</div><div class='add'>+	return ERR_PTR(-ENOMEM);</div><div class='add'>+err_attach:</div><div class='add'>+	kfree(attach);</div><div class='add'>+	mutex_unlock(&amp;dmabuf-&gt;lock);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dma_buf_attach);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_buf_detach - Remove the given attachment from dmabuf's attachments list;</div><div class='add'>+ * optionally calls detach() of dma_buf_ops for device-specific detach</div><div class='add'>+ * @dmabuf:	[in]	buffer to detach from.</div><div class='add'>+ * @attach:	[in]	attachment to be detached; is free'd after this call.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+void dma_buf_detach(struct dma_buf *dmabuf, struct dma_buf_attachment *attach)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!dmabuf || !attach || !dmabuf-&gt;ops))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dmabuf-&gt;lock);</div><div class='add'>+	list_del(&amp;attach-&gt;node);</div><div class='add'>+	if (dmabuf-&gt;ops-&gt;detach)</div><div class='add'>+		dmabuf-&gt;ops-&gt;detach(dmabuf, attach);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dmabuf-&gt;lock);</div><div class='add'>+	kfree(attach);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dma_buf_detach);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_buf_map_attachment - Returns the scatterlist table of the attachment;</div><div class='add'>+ * mapped into _device_ address space. Is a wrapper for map_dma_buf() of the</div><div class='add'>+ * dma_buf_ops.</div><div class='add'>+ * @attach:	[in]	attachment whose scatterlist is to be returned</div><div class='add'>+ * @direction:	[in]	direction of DMA transfer</div><div class='add'>+ *</div><div class='add'>+ * Returns sg_table containing the scatterlist to be returned; may return NULL</div><div class='add'>+ * or ERR_PTR.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+struct sg_table *dma_buf_map_attachment(struct dma_buf_attachment *attach,</div><div class='add'>+					enum dma_data_direction direction)</div><div class='add'>+{</div><div class='add'>+	struct sg_table *sg_table = ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!attach || !attach-&gt;dmabuf || !attach-&gt;dmabuf-&gt;ops))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;attach-&gt;dmabuf-&gt;lock);</div><div class='add'>+	if (attach-&gt;dmabuf-&gt;ops-&gt;map_dma_buf)</div><div class='add'>+		sg_table = attach-&gt;dmabuf-&gt;ops-&gt;map_dma_buf(attach, direction);</div><div class='add'>+	mutex_unlock(&amp;attach-&gt;dmabuf-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return sg_table;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dma_buf_map_attachment);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_buf_unmap_attachment - unmaps and decreases usecount of the buffer;might</div><div class='add'>+ * deallocate the scatterlist associated. Is a wrapper for unmap_dma_buf() of</div><div class='add'>+ * dma_buf_ops.</div><div class='add'>+ * @attach:	[in]	attachment to unmap buffer from</div><div class='add'>+ * @sg_table:	[in]	scatterlist info of the buffer to unmap</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+void dma_buf_unmap_attachment(struct dma_buf_attachment *attach,</div><div class='add'>+				struct sg_table *sg_table)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!attach || !attach-&gt;dmabuf || !sg_table</div><div class='add'>+			    || !attach-&gt;dmabuf-&gt;ops))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;attach-&gt;dmabuf-&gt;lock);</div><div class='add'>+	if (attach-&gt;dmabuf-&gt;ops-&gt;unmap_dma_buf)</div><div class='add'>+		attach-&gt;dmabuf-&gt;ops-&gt;unmap_dma_buf(attach, sg_table);</div><div class='add'>+	mutex_unlock(&amp;attach-&gt;dmabuf-&gt;lock);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dma_buf_unmap_attachment);</div><div class='head'>diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c<br/>index 06ed6b4e7df5..26ab358dac62 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/firmware_class.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/firmware_class.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/firmware_class.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/firmware_class.c</a></div><div class='hunk'>@@ -226,13 +226,13 @@ static ssize_t firmware_loading_store(struct device *dev,</div><div class='ctx'> 	int loading = simple_strtol(buf, NULL, 10);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;fw_lock);</div><div class='add'>+</div><div class='add'>+	if (!fw_priv-&gt;fw)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	switch (loading) {</div><div class='ctx'> 	case 1:</div><div class='del'>-		mutex_lock(&amp;fw_lock);</div><div class='del'>-		if (!fw_priv-&gt;fw) {</div><div class='del'>-			mutex_unlock(&amp;fw_lock);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='ctx'> 		firmware_free_data(fw_priv-&gt;fw);</div><div class='ctx'> 		memset(fw_priv-&gt;fw, 0, sizeof(struct firmware));</div><div class='ctx'> 		/* If the pages are not owned by 'struct firmware' */</div><div class='hunk'>@@ -243,7 +243,6 @@ static ssize_t firmware_loading_store(struct device *dev,</div><div class='ctx'> 		fw_priv-&gt;page_array_size = 0;</div><div class='ctx'> 		fw_priv-&gt;nr_pages = 0;</div><div class='ctx'> 		set_bit(FW_STATUS_LOADING, &amp;fw_priv-&gt;status);</div><div class='del'>-		mutex_unlock(&amp;fw_lock);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		if (test_bit(FW_STATUS_LOADING, &amp;fw_priv-&gt;status)) {</div><div class='hunk'>@@ -274,7 +273,8 @@ static ssize_t firmware_loading_store(struct device *dev,</div><div class='ctx'> 		fw_load_abort(fw_priv);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;fw_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -534,6 +534,8 @@ static int _request_firmware(const struct firmware **firmware_p,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	read_lock_usermodehelper();</div><div class='add'>+</div><div class='ctx'> 	if (WARN_ON(usermodehelper_is_disabled())) {</div><div class='ctx'> 		dev_err(device, "firmware: %s will not be loaded\n", name);</div><div class='ctx'> 		retval = -EBUSY;</div><div class='hunk'>@@ -572,6 +574,8 @@ static int _request_firmware(const struct firmware **firmware_p,</div><div class='ctx'> 	fw_destroy_instance(fw_priv);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='add'>+	read_unlock_usermodehelper();</div><div class='add'>+</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		release_firmware(firmware);</div><div class='ctx'> 		*firmware_p = NULL;</div><div class='head'>diff --git a/drivers/base/init.c b/drivers/base/init.c<br/>index c8a934e79421..c16f0b808a17 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/init.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@ void __init driver_init(void)</div><div class='ctx'> 	 * core core pieces.</div><div class='ctx'> 	 */</div><div class='ctx'> 	platform_bus_init();</div><div class='del'>-	system_bus_init();</div><div class='ctx'> 	cpu_dev_init();</div><div class='ctx'> 	memory_dev_init();</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/base/memory.c b/drivers/base/memory.c<br/>index 8272d92d22c0..ed5de58c340f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/memory.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/memory.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/memory.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/memory.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * drivers/base/memory.c - basic Memory class support</div><div class='add'>+ * Memory subsystem support</div><div class='ctx'>  *</div><div class='ctx'>  * Written by Matt Tolentino &lt;matthew.e.tolentino@intel.com&gt;</div><div class='ctx'>  *            Dave Hansen &lt;haveblue@us.ibm.com&gt;</div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * SPARSEMEM should be contained here, or in mm/memory_hotplug.c.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/topology.h&gt;</div><div class='hunk'>@@ -38,26 +37,9 @@ static inline int base_memory_block_id(int section_nr)</div><div class='ctx'> 	return section_nr / sections_per_block;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class memory_sysdev_class = {</div><div class='add'>+static struct bus_type memory_subsys = {</div><div class='ctx'> 	.name = MEMORY_CLASS_NAME,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *memory_uevent_name(struct kset *kset, struct kobject *kobj)</div><div class='del'>-{</div><div class='del'>-	return MEMORY_CLASS_NAME;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int memory_uevent(struct kset *kset, struct kobject *obj,</div><div class='del'>-			struct kobj_uevent_env *env)</div><div class='del'>-{</div><div class='del'>-	int retval = 0;</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct kset_uevent_ops memory_uevent_ops = {</div><div class='del'>-	.name		= memory_uevent_name,</div><div class='del'>-	.uevent		= memory_uevent,</div><div class='add'>+	.dev_name = MEMORY_CLASS_NAME,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static BLOCKING_NOTIFIER_HEAD(memory_chain);</div><div class='hunk'>@@ -96,21 +78,21 @@ int register_memory(struct memory_block *memory)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	memory-&gt;sysdev.cls = &amp;memory_sysdev_class;</div><div class='del'>-	memory-&gt;sysdev.id = memory-&gt;start_section_nr / sections_per_block;</div><div class='add'>+	memory-&gt;dev.bus = &amp;memory_subsys;</div><div class='add'>+	memory-&gt;dev.id = memory-&gt;start_section_nr / sections_per_block;</div><div class='ctx'> </div><div class='del'>-	error = sysdev_register(&amp;memory-&gt;sysdev);</div><div class='add'>+	error = device_register(&amp;memory-&gt;dev);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> unregister_memory(struct memory_block *memory)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(memory-&gt;sysdev.cls != &amp;memory_sysdev_class);</div><div class='add'>+	BUG_ON(memory-&gt;dev.bus != &amp;memory_subsys);</div><div class='ctx'> </div><div class='ctx'> 	/* drop the ref. we got in remove_memory_block() */</div><div class='del'>-	kobject_put(&amp;memory-&gt;sysdev.kobj);</div><div class='del'>-	sysdev_unregister(&amp;memory-&gt;sysdev);</div><div class='add'>+	kobject_put(&amp;memory-&gt;dev.kobj);</div><div class='add'>+	device_unregister(&amp;memory-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned long __weak memory_block_size_bytes(void)</div><div class='hunk'>@@ -138,22 +120,22 @@ static unsigned long get_memory_block_size(void)</div><div class='ctx'>  * uses.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static ssize_t show_mem_start_phys_index(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_mem_start_phys_index(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct memory_block *mem =</div><div class='del'>-		container_of(dev, struct memory_block, sysdev);</div><div class='add'>+		container_of(dev, struct memory_block, dev);</div><div class='ctx'> 	unsigned long phys_index;</div><div class='ctx'> </div><div class='ctx'> 	phys_index = mem-&gt;start_section_nr / sections_per_block;</div><div class='ctx'> 	return sprintf(buf, "%08lx\n", phys_index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_mem_end_phys_index(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_mem_end_phys_index(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct memory_block *mem =</div><div class='del'>-		container_of(dev, struct memory_block, sysdev);</div><div class='add'>+		container_of(dev, struct memory_block, dev);</div><div class='ctx'> 	unsigned long phys_index;</div><div class='ctx'> </div><div class='ctx'> 	phys_index = mem-&gt;end_section_nr / sections_per_block;</div><div class='hunk'>@@ -163,13 +145,13 @@ static ssize_t show_mem_end_phys_index(struct sys_device *dev,</div><div class='ctx'> /*</div><div class='ctx'>  * Show whether the section of memory is likely to be hot-removable</div><div class='ctx'>  */</div><div class='del'>-static ssize_t show_mem_removable(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_mem_removable(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long i, pfn;</div><div class='ctx'> 	int ret = 1;</div><div class='ctx'> 	struct memory_block *mem =</div><div class='del'>-		container_of(dev, struct memory_block, sysdev);</div><div class='add'>+		container_of(dev, struct memory_block, dev);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; sections_per_block; i++) {</div><div class='ctx'> 		pfn = section_nr_to_pfn(mem-&gt;start_section_nr + i);</div><div class='hunk'>@@ -182,11 +164,11 @@ static ssize_t show_mem_removable(struct sys_device *dev,</div><div class='ctx'> /*</div><div class='ctx'>  * online, offline, going offline, etc.</div><div class='ctx'>  */</div><div class='del'>-static ssize_t show_mem_state(struct sys_device *dev,</div><div class='del'>-			struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_mem_state(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct memory_block *mem =</div><div class='del'>-		container_of(dev, struct memory_block, sysdev);</div><div class='add'>+		container_of(dev, struct memory_block, dev);</div><div class='ctx'> 	ssize_t len = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -313,24 +295,35 @@ static int memory_block_change_state(struct memory_block *mem,</div><div class='ctx'> </div><div class='ctx'> 	ret = memory_block_action(mem-&gt;start_section_nr, to_state);</div><div class='ctx'> </div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		mem-&gt;state = from_state_req;</div><div class='del'>-	else</div><div class='del'>-		mem-&gt;state = to_state;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	mem-&gt;state = to_state;</div><div class='add'>+	switch (mem-&gt;state) {</div><div class='add'>+	case MEM_OFFLINE:</div><div class='add'>+		kobject_uevent(&amp;mem-&gt;dev.kobj, KOBJ_OFFLINE);</div><div class='add'>+		break;</div><div class='add'>+	case MEM_ONLINE:</div><div class='add'>+		kobject_uevent(&amp;mem-&gt;dev.kobj, KOBJ_ONLINE);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;mem-&gt;state_mutex);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-store_mem_state(struct sys_device *dev,</div><div class='del'>-		struct sysdev_attribute *attr, const char *buf, size_t count)</div><div class='add'>+store_mem_state(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct memory_block *mem;</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mem = container_of(dev, struct memory_block, sysdev);</div><div class='add'>+	mem = container_of(dev, struct memory_block, dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!strncmp(buf, "online", min((int)count, 6)))</div><div class='ctx'> 		ret = memory_block_change_state(mem, MEM_ONLINE, MEM_OFFLINE);</div><div class='hunk'>@@ -351,41 +344,41 @@ store_mem_state(struct sys_device *dev,</div><div class='ctx'>  * s.t. if I offline all of these sections I can then</div><div class='ctx'>  * remove the physical device?</div><div class='ctx'>  */</div><div class='del'>-static ssize_t show_phys_device(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_phys_device(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct memory_block *mem =</div><div class='del'>-		container_of(dev, struct memory_block, sysdev);</div><div class='add'>+		container_of(dev, struct memory_block, dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", mem-&gt;phys_device);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(phys_index, 0444, show_mem_start_phys_index, NULL);</div><div class='del'>-static SYSDEV_ATTR(end_phys_index, 0444, show_mem_end_phys_index, NULL);</div><div class='del'>-static SYSDEV_ATTR(state, 0644, show_mem_state, store_mem_state);</div><div class='del'>-static SYSDEV_ATTR(phys_device, 0444, show_phys_device, NULL);</div><div class='del'>-static SYSDEV_ATTR(removable, 0444, show_mem_removable, NULL);</div><div class='add'>+static DEVICE_ATTR(phys_index, 0444, show_mem_start_phys_index, NULL);</div><div class='add'>+static DEVICE_ATTR(end_phys_index, 0444, show_mem_end_phys_index, NULL);</div><div class='add'>+static DEVICE_ATTR(state, 0644, show_mem_state, store_mem_state);</div><div class='add'>+static DEVICE_ATTR(phys_device, 0444, show_phys_device, NULL);</div><div class='add'>+static DEVICE_ATTR(removable, 0444, show_mem_removable, NULL);</div><div class='ctx'> </div><div class='ctx'> #define mem_create_simple_file(mem, attr_name)	\</div><div class='del'>-	sysdev_create_file(&amp;mem-&gt;sysdev, &amp;attr_##attr_name)</div><div class='add'>+	device_create_file(&amp;mem-&gt;dev, &amp;dev_attr_##attr_name)</div><div class='ctx'> #define mem_remove_simple_file(mem, attr_name)	\</div><div class='del'>-	sysdev_remove_file(&amp;mem-&gt;sysdev, &amp;attr_##attr_name)</div><div class='add'>+	device_remove_file(&amp;mem-&gt;dev, &amp;dev_attr_##attr_name)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Block size attribute stuff</div><div class='ctx'>  */</div><div class='ctx'> static ssize_t</div><div class='del'>-print_block_size(struct sysdev_class *class, struct sysdev_class_attribute *attr,</div><div class='add'>+print_block_size(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		 char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%lx\n", get_memory_block_size());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(block_size_bytes, 0444, print_block_size, NULL);</div><div class='add'>+static DEVICE_ATTR(block_size_bytes, 0444, print_block_size, NULL);</div><div class='ctx'> </div><div class='ctx'> static int block_size_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysfs_create_file(&amp;memory_sysdev_class.kset.kobj,</div><div class='del'>-				&amp;attr_block_size_bytes.attr);</div><div class='add'>+	return device_create_file(memory_subsys.dev_root,</div><div class='add'>+				  &amp;dev_attr_block_size_bytes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -396,7 +389,7 @@ static int block_size_init(void)</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_ARCH_MEMORY_PROBE</div><div class='ctx'> static ssize_t</div><div class='del'>-memory_probe_store(struct class *class, struct class_attribute *attr,</div><div class='add'>+memory_probe_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='ctx'> 	u64 phys_addr;</div><div class='hunk'>@@ -423,12 +416,11 @@ memory_probe_store(struct class *class, struct class_attribute *attr,</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-static CLASS_ATTR(probe, S_IWUSR, NULL, memory_probe_store);</div><div class='add'>+static DEVICE_ATTR(probe, S_IWUSR, NULL, memory_probe_store);</div><div class='ctx'> </div><div class='ctx'> static int memory_probe_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysfs_create_file(&amp;memory_sysdev_class.kset.kobj,</div><div class='del'>-				&amp;class_attr_probe.attr);</div><div class='add'>+	return device_create_file(memory_subsys.dev_root, &amp;dev_attr_probe);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static inline int memory_probe_init(void)</div><div class='hunk'>@@ -444,8 +436,8 @@ static inline int memory_probe_init(void)</div><div class='ctx'> </div><div class='ctx'> /* Soft offline a page */</div><div class='ctx'> static ssize_t</div><div class='del'>-store_soft_offline_page(struct class *class,</div><div class='del'>-			struct class_attribute *attr,</div><div class='add'>+store_soft_offline_page(struct device *dev,</div><div class='add'>+			struct device_attribute *attr,</div><div class='ctx'> 			const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -463,8 +455,8 @@ store_soft_offline_page(struct class *class,</div><div class='ctx'> </div><div class='ctx'> /* Forcibly offline a page, including killing processes. */</div><div class='ctx'> static ssize_t</div><div class='del'>-store_hard_offline_page(struct class *class,</div><div class='del'>-			struct class_attribute *attr,</div><div class='add'>+store_hard_offline_page(struct device *dev,</div><div class='add'>+			struct device_attribute *attr,</div><div class='ctx'> 			const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -478,18 +470,18 @@ store_hard_offline_page(struct class *class,</div><div class='ctx'> 	return ret ? ret : count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static CLASS_ATTR(soft_offline_page, 0644, NULL, store_soft_offline_page);</div><div class='del'>-static CLASS_ATTR(hard_offline_page, 0644, NULL, store_hard_offline_page);</div><div class='add'>+static DEVICE_ATTR(soft_offline_page, 0644, NULL, store_soft_offline_page);</div><div class='add'>+static DEVICE_ATTR(hard_offline_page, 0644, NULL, store_hard_offline_page);</div><div class='ctx'> </div><div class='ctx'> static __init int memory_fail_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = sysfs_create_file(&amp;memory_sysdev_class.kset.kobj,</div><div class='del'>-				&amp;class_attr_soft_offline_page.attr);</div><div class='add'>+	err = device_create_file(memory_subsys.dev_root,</div><div class='add'>+				&amp;dev_attr_soft_offline_page);</div><div class='ctx'> 	if (!err)</div><div class='del'>-		err = sysfs_create_file(&amp;memory_sysdev_class.kset.kobj,</div><div class='del'>-				&amp;class_attr_hard_offline_page.attr);</div><div class='add'>+		err = device_create_file(memory_subsys.dev_root,</div><div class='add'>+				&amp;dev_attr_hard_offline_page);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='hunk'>@@ -509,31 +501,23 @@ int __weak arch_get_memory_phys_device(unsigned long start_pfn)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * A reference for the returned object is held and the reference for the</div><div class='add'>+ * hinted object is released.</div><div class='add'>+ */</div><div class='ctx'> struct memory_block *find_memory_block_hinted(struct mem_section *section,</div><div class='ctx'> 					      struct memory_block *hint)</div><div class='ctx'> {</div><div class='del'>-	struct kobject *kobj;</div><div class='del'>-	struct sys_device *sysdev;</div><div class='del'>-	struct memory_block *mem;</div><div class='del'>-	char name[sizeof(MEMORY_CLASS_NAME) + 9 + 1];</div><div class='ctx'> 	int block_id = base_memory_block_id(__section_nr(section));</div><div class='add'>+	struct device *hintdev = hint ? &amp;hint-&gt;dev : NULL;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> </div><div class='del'>-	kobj = hint ? &amp;hint-&gt;sysdev.kobj : NULL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This only works because we know that section == sysdev-&gt;id</div><div class='del'>-	 * slightly redundant with sysdev_register()</div><div class='del'>-	 */</div><div class='del'>-	sprintf(&amp;name[0], "%s%d", MEMORY_CLASS_NAME, block_id);</div><div class='del'>-</div><div class='del'>-	kobj = kset_find_obj_hinted(&amp;memory_sysdev_class.kset, name, kobj);</div><div class='del'>-	if (!kobj)</div><div class='add'>+	dev = subsys_find_device_by_id(&amp;memory_subsys, block_id, hintdev);</div><div class='add'>+	if (hint)</div><div class='add'>+		put_device(&amp;hint-&gt;dev);</div><div class='add'>+	if (!dev)</div><div class='ctx'> 		return NULL;</div><div class='del'>-</div><div class='del'>-	sysdev = container_of(kobj, struct sys_device, kobj);</div><div class='del'>-	mem = container_of(sysdev, struct memory_block, sysdev);</div><div class='del'>-</div><div class='del'>-	return mem;</div><div class='add'>+	return container_of(dev, struct memory_block, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -542,7 +526,7 @@ struct memory_block *find_memory_block_hinted(struct mem_section *section,</div><div class='ctx'>  * this gets to be a real problem, we can always use a radix</div><div class='ctx'>  * tree or something here.</div><div class='ctx'>  *</div><div class='del'>- * This could be made generic for all sysdev classes.</div><div class='add'>+ * This could be made generic for all device subsystems.</div><div class='ctx'>  */</div><div class='ctx'> struct memory_block *find_memory_block(struct mem_section *section)</div><div class='ctx'> {</div><div class='hunk'>@@ -598,7 +582,7 @@ static int add_memory_section(int nid, struct mem_section *section,</div><div class='ctx'> 	mem = find_memory_block(section);</div><div class='ctx'> 	if (mem) {</div><div class='ctx'> 		mem-&gt;section_count++;</div><div class='del'>-		kobject_put(&amp;mem-&gt;sysdev.kobj);</div><div class='add'>+		kobject_put(&amp;mem-&gt;dev.kobj);</div><div class='ctx'> 	} else</div><div class='ctx'> 		ret = init_memory_block(&amp;mem, section, state);</div><div class='ctx'> </div><div class='hunk'>@@ -631,7 +615,7 @@ int remove_memory_block(unsigned long node_id, struct mem_section *section,</div><div class='ctx'> 		unregister_memory(mem);</div><div class='ctx'> 		kfree(mem);</div><div class='ctx'> 	} else</div><div class='del'>-		kobject_put(&amp;mem-&gt;sysdev.kobj);</div><div class='add'>+		kobject_put(&amp;mem-&gt;dev.kobj);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;mem_sysfs_mutex);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -664,8 +648,7 @@ int __init memory_dev_init(void)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned long block_sz;</div><div class='ctx'> </div><div class='del'>-	memory_sysdev_class.kset.uevent_ops = &amp;memory_uevent_ops;</div><div class='del'>-	ret = sysdev_class_register(&amp;memory_sysdev_class);</div><div class='add'>+	ret = subsys_system_register(&amp;memory_subsys, NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/node.c b/drivers/base/node.c<br/>index 5693ecee9a40..44f427a66117 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/node.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/node.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/node.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/node.c</a></div><div class='hunk'>@@ -1,8 +1,7 @@</div><div class='ctx'> /*</div><div class='del'>- * drivers/base/node.c - basic Node class support</div><div class='add'>+ * Basic Node interface support</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -19,18 +18,16 @@</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='del'>-static struct sysdev_class_attribute *node_state_attrs[];</div><div class='del'>-</div><div class='del'>-static struct sysdev_class node_class = {</div><div class='add'>+static struct bus_type node_subsys = {</div><div class='ctx'> 	.name = "node",</div><div class='del'>-	.attrs = node_state_attrs,</div><div class='add'>+	.dev_name = "node",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static ssize_t node_read_cpumap(struct sys_device *dev, int type, char *buf)</div><div class='add'>+static ssize_t node_read_cpumap(struct device *dev, int type, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct node *node_dev = to_node(dev);</div><div class='del'>-	const struct cpumask *mask = cpumask_of_node(node_dev-&gt;sysdev.id);</div><div class='add'>+	const struct cpumask *mask = cpumask_of_node(node_dev-&gt;dev.id);</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='ctx'> 	/* 2008/04/07: buf currently PAGE_SIZE, need 9 chars per 32 bits. */</div><div class='hunk'>@@ -44,23 +41,23 @@ static ssize_t node_read_cpumap(struct sys_device *dev, int type, char *buf)</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline ssize_t node_read_cpumask(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static inline ssize_t node_read_cpumask(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return node_read_cpumap(dev, 0, buf);</div><div class='ctx'> }</div><div class='del'>-static inline ssize_t node_read_cpulist(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static inline ssize_t node_read_cpulist(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return node_read_cpumap(dev, 1, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(cpumap,  S_IRUGO, node_read_cpumask, NULL);</div><div class='del'>-static SYSDEV_ATTR(cpulist, S_IRUGO, node_read_cpulist, NULL);</div><div class='add'>+static DEVICE_ATTR(cpumap,  S_IRUGO, node_read_cpumask, NULL);</div><div class='add'>+static DEVICE_ATTR(cpulist, S_IRUGO, node_read_cpulist, NULL);</div><div class='ctx'> </div><div class='ctx'> #define K(x) ((x) &lt;&lt; (PAGE_SHIFT - 10))</div><div class='del'>-static ssize_t node_read_meminfo(struct sys_device * dev,</div><div class='del'>-			struct sysdev_attribute *attr, char * buf)</div><div class='add'>+static ssize_t node_read_meminfo(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int n;</div><div class='ctx'> 	int nid = dev-&gt;id;</div><div class='hunk'>@@ -157,10 +154,10 @@ static ssize_t node_read_meminfo(struct sys_device * dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #undef K</div><div class='del'>-static SYSDEV_ATTR(meminfo, S_IRUGO, node_read_meminfo, NULL);</div><div class='add'>+static DEVICE_ATTR(meminfo, S_IRUGO, node_read_meminfo, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t node_read_numastat(struct sys_device * dev,</div><div class='del'>-				struct sysdev_attribute *attr, char * buf)</div><div class='add'>+static ssize_t node_read_numastat(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf,</div><div class='ctx'> 		       "numa_hit %lu\n"</div><div class='hunk'>@@ -176,10 +173,10 @@ static ssize_t node_read_numastat(struct sys_device * dev,</div><div class='ctx'> 		       node_page_state(dev-&gt;id, NUMA_LOCAL),</div><div class='ctx'> 		       node_page_state(dev-&gt;id, NUMA_OTHER));</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_ATTR(numastat, S_IRUGO, node_read_numastat, NULL);</div><div class='add'>+static DEVICE_ATTR(numastat, S_IRUGO, node_read_numastat, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t node_read_vmstat(struct sys_device *dev,</div><div class='del'>-				struct sysdev_attribute *attr, char *buf)</div><div class='add'>+static ssize_t node_read_vmstat(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nid = dev-&gt;id;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -191,10 +188,10 @@ static ssize_t node_read_vmstat(struct sys_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_ATTR(vmstat, S_IRUGO, node_read_vmstat, NULL);</div><div class='add'>+static DEVICE_ATTR(vmstat, S_IRUGO, node_read_vmstat, NULL);</div><div class='ctx'> </div><div class='del'>-static ssize_t node_read_distance(struct sys_device * dev,</div><div class='del'>-			struct sysdev_attribute *attr, char * buf)</div><div class='add'>+static ssize_t node_read_distance(struct device *dev,</div><div class='add'>+			struct device_attribute *attr, char * buf)</div><div class='ctx'> {</div><div class='ctx'> 	int nid = dev-&gt;id;</div><div class='ctx'> 	int len = 0;</div><div class='hunk'>@@ -212,7 +209,7 @@ static ssize_t node_read_distance(struct sys_device * dev,</div><div class='ctx'> 	len += sprintf(buf + len, "\n");</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='del'>-static SYSDEV_ATTR(distance, S_IRUGO, node_read_distance, NULL);</div><div class='add'>+static DEVICE_ATTR(distance, S_IRUGO, node_read_distance, NULL);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HUGETLBFS</div><div class='ctx'> /*</div><div class='hunk'>@@ -230,7 +227,7 @@ static node_registration_func_t __hugetlb_unregister_node;</div><div class='ctx'> static inline bool hugetlb_register_node(struct node *node)</div><div class='ctx'> {</div><div class='ctx'> 	if (__hugetlb_register_node &amp;&amp;</div><div class='del'>-			node_state(node-&gt;sysdev.id, N_HIGH_MEMORY)) {</div><div class='add'>+			node_state(node-&gt;dev.id, N_HIGH_MEMORY)) {</div><div class='ctx'> 		__hugetlb_register_node(node);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -266,17 +263,17 @@ int register_node(struct node *node, int num, struct node *parent)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	node-&gt;sysdev.id = num;</div><div class='del'>-	node-&gt;sysdev.cls = &amp;node_class;</div><div class='del'>-	error = sysdev_register(&amp;node-&gt;sysdev);</div><div class='add'>+	node-&gt;dev.id = num;</div><div class='add'>+	node-&gt;dev.bus = &amp;node_subsys;</div><div class='add'>+	error = device_register(&amp;node-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!error){</div><div class='del'>-		sysdev_create_file(&amp;node-&gt;sysdev, &amp;attr_cpumap);</div><div class='del'>-		sysdev_create_file(&amp;node-&gt;sysdev, &amp;attr_cpulist);</div><div class='del'>-		sysdev_create_file(&amp;node-&gt;sysdev, &amp;attr_meminfo);</div><div class='del'>-		sysdev_create_file(&amp;node-&gt;sysdev, &amp;attr_numastat);</div><div class='del'>-		sysdev_create_file(&amp;node-&gt;sysdev, &amp;attr_distance);</div><div class='del'>-		sysdev_create_file(&amp;node-&gt;sysdev, &amp;attr_vmstat);</div><div class='add'>+		device_create_file(&amp;node-&gt;dev, &amp;dev_attr_cpumap);</div><div class='add'>+		device_create_file(&amp;node-&gt;dev, &amp;dev_attr_cpulist);</div><div class='add'>+		device_create_file(&amp;node-&gt;dev, &amp;dev_attr_meminfo);</div><div class='add'>+		device_create_file(&amp;node-&gt;dev, &amp;dev_attr_numastat);</div><div class='add'>+		device_create_file(&amp;node-&gt;dev, &amp;dev_attr_distance);</div><div class='add'>+		device_create_file(&amp;node-&gt;dev, &amp;dev_attr_vmstat);</div><div class='ctx'> </div><div class='ctx'> 		scan_unevictable_register_node(node);</div><div class='ctx'> </div><div class='hunk'>@@ -296,17 +293,17 @@ int register_node(struct node *node, int num, struct node *parent)</div><div class='ctx'>  */</div><div class='ctx'> void unregister_node(struct node *node)</div><div class='ctx'> {</div><div class='del'>-	sysdev_remove_file(&amp;node-&gt;sysdev, &amp;attr_cpumap);</div><div class='del'>-	sysdev_remove_file(&amp;node-&gt;sysdev, &amp;attr_cpulist);</div><div class='del'>-	sysdev_remove_file(&amp;node-&gt;sysdev, &amp;attr_meminfo);</div><div class='del'>-	sysdev_remove_file(&amp;node-&gt;sysdev, &amp;attr_numastat);</div><div class='del'>-	sysdev_remove_file(&amp;node-&gt;sysdev, &amp;attr_distance);</div><div class='del'>-	sysdev_remove_file(&amp;node-&gt;sysdev, &amp;attr_vmstat);</div><div class='add'>+	device_remove_file(&amp;node-&gt;dev, &amp;dev_attr_cpumap);</div><div class='add'>+	device_remove_file(&amp;node-&gt;dev, &amp;dev_attr_cpulist);</div><div class='add'>+	device_remove_file(&amp;node-&gt;dev, &amp;dev_attr_meminfo);</div><div class='add'>+	device_remove_file(&amp;node-&gt;dev, &amp;dev_attr_numastat);</div><div class='add'>+	device_remove_file(&amp;node-&gt;dev, &amp;dev_attr_distance);</div><div class='add'>+	device_remove_file(&amp;node-&gt;dev, &amp;dev_attr_vmstat);</div><div class='ctx'> </div><div class='ctx'> 	scan_unevictable_unregister_node(node);</div><div class='ctx'> 	hugetlb_unregister_node(node);		/* no-op, if memoryless node */</div><div class='ctx'> </div><div class='del'>-	sysdev_unregister(&amp;node-&gt;sysdev);</div><div class='add'>+	device_unregister(&amp;node-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct node node_devices[MAX_NUMNODES];</div><div class='hunk'>@@ -317,41 +314,41 @@ struct node node_devices[MAX_NUMNODES];</div><div class='ctx'> int register_cpu_under_node(unsigned int cpu, unsigned int nid)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct sys_device *obj;</div><div class='add'>+	struct device *obj;</div><div class='ctx'> </div><div class='ctx'> 	if (!node_online(nid))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	obj = get_cpu_sysdev(cpu);</div><div class='add'>+	obj = get_cpu_device(cpu);</div><div class='ctx'> 	if (!obj)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = sysfs_create_link(&amp;node_devices[nid].sysdev.kobj,</div><div class='add'>+	ret = sysfs_create_link(&amp;node_devices[nid].dev.kobj,</div><div class='ctx'> 				&amp;obj-&gt;kobj,</div><div class='ctx'> 				kobject_name(&amp;obj-&gt;kobj));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return sysfs_create_link(&amp;obj-&gt;kobj,</div><div class='del'>-				 &amp;node_devices[nid].sysdev.kobj,</div><div class='del'>-				 kobject_name(&amp;node_devices[nid].sysdev.kobj));</div><div class='add'>+				 &amp;node_devices[nid].dev.kobj,</div><div class='add'>+				 kobject_name(&amp;node_devices[nid].dev.kobj));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)</div><div class='ctx'> {</div><div class='del'>-	struct sys_device *obj;</div><div class='add'>+	struct device *obj;</div><div class='ctx'> </div><div class='ctx'> 	if (!node_online(nid))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	obj = get_cpu_sysdev(cpu);</div><div class='add'>+	obj = get_cpu_device(cpu);</div><div class='ctx'> 	if (!obj)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	sysfs_remove_link(&amp;node_devices[nid].sysdev.kobj,</div><div class='add'>+	sysfs_remove_link(&amp;node_devices[nid].dev.kobj,</div><div class='ctx'> 			  kobject_name(&amp;obj-&gt;kobj));</div><div class='ctx'> 	sysfs_remove_link(&amp;obj-&gt;kobj,</div><div class='del'>-			  kobject_name(&amp;node_devices[nid].sysdev.kobj));</div><div class='add'>+			  kobject_name(&amp;node_devices[nid].dev.kobj));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -393,15 +390,15 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, int nid)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (page_nid != nid)</div><div class='ctx'> 			continue;</div><div class='del'>-		ret = sysfs_create_link_nowarn(&amp;node_devices[nid].sysdev.kobj,</div><div class='del'>-					&amp;mem_blk-&gt;sysdev.kobj,</div><div class='del'>-					kobject_name(&amp;mem_blk-&gt;sysdev.kobj));</div><div class='add'>+		ret = sysfs_create_link_nowarn(&amp;node_devices[nid].dev.kobj,</div><div class='add'>+					&amp;mem_blk-&gt;dev.kobj,</div><div class='add'>+					kobject_name(&amp;mem_blk-&gt;dev.kobj));</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		return sysfs_create_link_nowarn(&amp;mem_blk-&gt;sysdev.kobj,</div><div class='del'>-				&amp;node_devices[nid].sysdev.kobj,</div><div class='del'>-				kobject_name(&amp;node_devices[nid].sysdev.kobj));</div><div class='add'>+		return sysfs_create_link_nowarn(&amp;mem_blk-&gt;dev.kobj,</div><div class='add'>+				&amp;node_devices[nid].dev.kobj,</div><div class='add'>+				kobject_name(&amp;node_devices[nid].dev.kobj));</div><div class='ctx'> 	}</div><div class='ctx'> 	/* mem section does not span the specified node */</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -434,10 +431,10 @@ int unregister_mem_sect_under_nodes(struct memory_block *mem_blk,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (node_test_and_set(nid, *unlinked_nodes))</div><div class='ctx'> 			continue;</div><div class='del'>-		sysfs_remove_link(&amp;node_devices[nid].sysdev.kobj,</div><div class='del'>-			 kobject_name(&amp;mem_blk-&gt;sysdev.kobj));</div><div class='del'>-		sysfs_remove_link(&amp;mem_blk-&gt;sysdev.kobj,</div><div class='del'>-			 kobject_name(&amp;node_devices[nid].sysdev.kobj));</div><div class='add'>+		sysfs_remove_link(&amp;node_devices[nid].dev.kobj,</div><div class='add'>+			 kobject_name(&amp;mem_blk-&gt;dev.kobj));</div><div class='add'>+		sysfs_remove_link(&amp;mem_blk-&gt;dev.kobj,</div><div class='add'>+			 kobject_name(&amp;node_devices[nid].dev.kobj));</div><div class='ctx'> 	}</div><div class='ctx'> 	NODEMASK_FREE(unlinked_nodes);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -468,7 +465,7 @@ static int link_mem_sections(int nid)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (mem_blk)</div><div class='del'>-		kobject_put(&amp;mem_blk-&gt;sysdev.kobj);</div><div class='add'>+		kobject_put(&amp;mem_blk-&gt;dev.kobj);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -596,19 +593,19 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct node_attr {</div><div class='del'>-	struct sysdev_class_attribute attr;</div><div class='add'>+	struct device_attribute attr;</div><div class='ctx'> 	enum node_states state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static ssize_t show_node_state(struct sysdev_class *class,</div><div class='del'>-			       struct sysdev_class_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_node_state(struct device *dev,</div><div class='add'>+			       struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct node_attr *na = container_of(attr, struct node_attr, attr);</div><div class='ctx'> 	return print_nodes_state(na-&gt;state, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define _NODE_ATTR(name, state) \</div><div class='del'>-	{ _SYSDEV_CLASS_ATTR(name, 0444, show_node_state, NULL), state }</div><div class='add'>+	{ __ATTR(name, 0444, show_node_state, NULL), state }</div><div class='ctx'> </div><div class='ctx'> static struct node_attr node_state_attr[] = {</div><div class='ctx'> 	_NODE_ATTR(possible, N_POSSIBLE),</div><div class='hunk'>@@ -620,17 +617,26 @@ static struct node_attr node_state_attr[] = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class_attribute *node_state_attrs[] = {</div><div class='del'>-	&amp;node_state_attr[0].attr,</div><div class='del'>-	&amp;node_state_attr[1].attr,</div><div class='del'>-	&amp;node_state_attr[2].attr,</div><div class='del'>-	&amp;node_state_attr[3].attr,</div><div class='add'>+static struct attribute *node_state_attrs[] = {</div><div class='add'>+	&amp;node_state_attr[0].attr.attr,</div><div class='add'>+	&amp;node_state_attr[1].attr.attr,</div><div class='add'>+	&amp;node_state_attr[2].attr.attr,</div><div class='add'>+	&amp;node_state_attr[3].attr.attr,</div><div class='ctx'> #ifdef CONFIG_HIGHMEM</div><div class='del'>-	&amp;node_state_attr[4].attr,</div><div class='add'>+	&amp;node_state_attr[4].attr.attr,</div><div class='ctx'> #endif</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct attribute_group memory_root_attr_group = {</div><div class='add'>+	.attrs = node_state_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group *cpu_root_attr_groups[] = {</div><div class='add'>+	&amp;memory_root_attr_group,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define NODE_CALLBACK_PRI	2	/* lower than SLAB */</div><div class='ctx'> static int __init register_node_type(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -639,7 +645,7 @@ static int __init register_node_type(void)</div><div class='ctx'>  	BUILD_BUG_ON(ARRAY_SIZE(node_state_attr) != NR_NODE_STATES);</div><div class='ctx'>  	BUILD_BUG_ON(ARRAY_SIZE(node_state_attrs)-1 != NR_NODE_STATES);</div><div class='ctx'> </div><div class='del'>-	ret = sysdev_class_register(&amp;node_class);</div><div class='add'>+	ret = subsys_system_register(&amp;node_subsys, cpu_root_attr_groups);</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		hotplug_memory_notifier(node_memory_callback,</div><div class='ctx'> 					NODE_CALLBACK_PRI);</div><div class='head'>diff --git a/drivers/base/platform.c b/drivers/base/platform.c<br/>index 7a24895543e7..f0c605e99ade 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/platform.c</a></div><div class='hunk'>@@ -383,7 +383,7 @@ EXPORT_SYMBOL_GPL(platform_device_unregister);</div><div class='ctx'>  * Returns &amp;struct platform_device pointer on success, or ERR_PTR() on error.</div><div class='ctx'>  */</div><div class='ctx'> struct platform_device *platform_device_register_full(</div><div class='del'>-		struct platform_device_info *pdevinfo)</div><div class='add'>+		const struct platform_device_info *pdevinfo)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='ctx'> 	struct platform_device *pdev;</div><div class='hunk'>@@ -700,25 +700,6 @@ static int platform_legacy_resume(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int platform_pm_prepare(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (drv &amp;&amp; drv-&gt;pm &amp;&amp; drv-&gt;pm-&gt;prepare)</div><div class='del'>-		ret = drv-&gt;pm-&gt;prepare(dev);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void platform_pm_complete(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-</div><div class='del'>-	if (drv &amp;&amp; drv-&gt;pm &amp;&amp; drv-&gt;pm-&gt;complete)</div><div class='del'>-		drv-&gt;pm-&gt;complete(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif /* CONFIG_PM_SLEEP */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SUSPEND</div><div class='hunk'>@@ -741,22 +722,6 @@ int platform_pm_suspend(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int platform_pm_suspend_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;suspend_noirq)</div><div class='del'>-			ret = drv-&gt;pm-&gt;suspend_noirq(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='ctx'> int platform_pm_resume(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_driver *drv = dev-&gt;driver;</div><div class='hunk'>@@ -775,22 +740,6 @@ int platform_pm_resume(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int platform_pm_resume_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;resume_noirq)</div><div class='del'>-			ret = drv-&gt;pm-&gt;resume_noirq(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='ctx'> #endif /* CONFIG_SUSPEND */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HIBERNATE_CALLBACKS</div><div class='hunk'>@@ -813,22 +762,6 @@ int platform_pm_freeze(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int platform_pm_freeze_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;freeze_noirq)</div><div class='del'>-			ret = drv-&gt;pm-&gt;freeze_noirq(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='ctx'> int platform_pm_thaw(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_driver *drv = dev-&gt;driver;</div><div class='hunk'>@@ -847,22 +780,6 @@ int platform_pm_thaw(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int platform_pm_thaw_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;thaw_noirq)</div><div class='del'>-			ret = drv-&gt;pm-&gt;thaw_noirq(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='ctx'> int platform_pm_poweroff(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_driver *drv = dev-&gt;driver;</div><div class='hunk'>@@ -881,22 +798,6 @@ int platform_pm_poweroff(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int platform_pm_poweroff_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;poweroff_noirq)</div><div class='del'>-			ret = drv-&gt;pm-&gt;poweroff_noirq(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='ctx'> int platform_pm_restore(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_driver *drv = dev-&gt;driver;</div><div class='hunk'>@@ -915,22 +816,6 @@ int platform_pm_restore(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int platform_pm_restore_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!drv)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (drv-&gt;pm) {</div><div class='del'>-		if (drv-&gt;pm-&gt;restore_noirq)</div><div class='del'>-			ret = drv-&gt;pm-&gt;restore_noirq(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='ctx'> #endif /* CONFIG_HIBERNATE_CALLBACKS */</div><div class='ctx'> </div><div class='ctx'> static const struct dev_pm_ops platform_dev_pm_ops = {</div><div class='head'>diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile<br/>index 81676dd17900..2e58ebb1f6c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/power/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/power/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/power/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/power/Makefile</a></div><div class='hunk'>@@ -3,7 +3,7 @@ obj-$(CONFIG_PM_SLEEP)	+= main.o wakeup.o</div><div class='ctx'> obj-$(CONFIG_PM_RUNTIME)	+= runtime.o</div><div class='ctx'> obj-$(CONFIG_PM_TRACE_RTC)	+= trace.o</div><div class='ctx'> obj-$(CONFIG_PM_OPP)	+= opp.o</div><div class='del'>-obj-$(CONFIG_PM_GENERIC_DOMAINS)	+=  domain.o</div><div class='add'>+obj-$(CONFIG_PM_GENERIC_DOMAINS)	+=  domain.o domain_governor.o</div><div class='ctx'> obj-$(CONFIG_HAVE_CLK)	+= clock_ops.o</div><div class='ctx'> </div><div class='ctx'> ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG</div><div class='head'>diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c<br/>index 6790cf7eba5a..978bbf7ac6af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/power/domain.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/power/domain.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/power/domain.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/power/domain.c</a></div><div class='hunk'>@@ -15,13 +15,44 @@</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;linux/suspend.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+</div><div class='add'>+#define GENPD_DEV_CALLBACK(genpd, type, callback, dev)		\</div><div class='add'>+({								\</div><div class='add'>+	type (*__routine)(struct device *__d); 			\</div><div class='add'>+	type __ret = (type)0;					\</div><div class='add'>+								\</div><div class='add'>+	__routine = genpd-&gt;dev_ops.callback; 			\</div><div class='add'>+	if (__routine) {					\</div><div class='add'>+		__ret = __routine(dev); 			\</div><div class='add'>+	} else {						\</div><div class='add'>+		__routine = dev_gpd_data(dev)-&gt;ops.callback;	\</div><div class='add'>+		if (__routine) 					\</div><div class='add'>+			__ret = __routine(dev);			\</div><div class='add'>+	}							\</div><div class='add'>+	__ret;							\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define GENPD_DEV_TIMED_CALLBACK(genpd, type, callback, dev, field, name)	\</div><div class='add'>+({										\</div><div class='add'>+	ktime_t __start = ktime_get();						\</div><div class='add'>+	type __retval = GENPD_DEV_CALLBACK(genpd, type, callback, dev);		\</div><div class='add'>+	s64 __elapsed = ktime_to_ns(ktime_sub(ktime_get(), __start));		\</div><div class='add'>+	struct generic_pm_domain_data *__gpd_data = dev_gpd_data(dev);		\</div><div class='add'>+	if (__elapsed &gt; __gpd_data-&gt;td.field) {					\</div><div class='add'>+		__gpd_data-&gt;td.field = __elapsed;				\</div><div class='add'>+		dev_warn(dev, name " latency exceeded, new value %lld ns\n",	\</div><div class='add'>+			__elapsed);						\</div><div class='add'>+	}									\</div><div class='add'>+	__retval;								\</div><div class='add'>+})</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(gpd_list);</div><div class='ctx'> static DEFINE_MUTEX(gpd_list_lock);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> </div><div class='del'>-static struct generic_pm_domain *dev_to_genpd(struct device *dev)</div><div class='add'>+struct generic_pm_domain *dev_to_genpd(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (IS_ERR_OR_NULL(dev-&gt;pm_domain))</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='hunk'>@@ -29,6 +60,31 @@ static struct generic_pm_domain *dev_to_genpd(struct device *dev)</div><div class='ctx'> 	return pd_to_genpd(dev-&gt;pm_domain);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int genpd_stop_dev(struct generic_pm_domain *genpd, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return GENPD_DEV_TIMED_CALLBACK(genpd, int, stop, dev,</div><div class='add'>+					stop_latency_ns, "stop");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int genpd_start_dev(struct generic_pm_domain *genpd, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return GENPD_DEV_TIMED_CALLBACK(genpd, int, start, dev,</div><div class='add'>+					start_latency_ns, "start");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int genpd_save_dev(struct generic_pm_domain *genpd, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return GENPD_DEV_TIMED_CALLBACK(genpd, int, save_state, dev,</div><div class='add'>+					save_state_latency_ns, "state save");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int genpd_restore_dev(struct generic_pm_domain *genpd, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return GENPD_DEV_TIMED_CALLBACK(genpd, int, restore_state, dev,</div><div class='add'>+					restore_state_latency_ns,</div><div class='add'>+					"state restore");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool genpd_sd_counter_dec(struct generic_pm_domain *genpd)</div><div class='ctx'> {</div><div class='ctx'> 	bool ret = false;</div><div class='hunk'>@@ -145,9 +201,21 @@ int __pm_genpd_poweron(struct generic_pm_domain *genpd)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (genpd-&gt;power_on) {</div><div class='add'>+		ktime_t time_start = ktime_get();</div><div class='add'>+		s64 elapsed_ns;</div><div class='add'>+</div><div class='ctx'> 		ret = genpd-&gt;power_on(genpd);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto err;</div><div class='add'>+</div><div class='add'>+		elapsed_ns = ktime_to_ns(ktime_sub(ktime_get(), time_start));</div><div class='add'>+		if (elapsed_ns &gt; genpd-&gt;power_on_latency_ns) {</div><div class='add'>+			genpd-&gt;power_on_latency_ns = elapsed_ns;</div><div class='add'>+			if (genpd-&gt;name)</div><div class='add'>+				pr_warning("%s: Power-on latency exceeded, "</div><div class='add'>+					"new value %lld ns\n", genpd-&gt;name,</div><div class='add'>+					elapsed_ns);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	genpd_set_active(genpd);</div><div class='hunk'>@@ -190,7 +258,6 @@ static int __pm_genpd_save_device(struct pm_domain_data *pdd,</div><div class='ctx'> {</div><div class='ctx'> 	struct generic_pm_domain_data *gpd_data = to_gpd_data(pdd);</div><div class='ctx'> 	struct device *dev = pdd-&gt;dev;</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (gpd_data-&gt;need_restore)</div><div class='hunk'>@@ -198,15 +265,9 @@ static int __pm_genpd_save_device(struct pm_domain_data *pdd,</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;genpd-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (drv &amp;&amp; drv-&gt;pm &amp;&amp; drv-&gt;pm-&gt;runtime_suspend) {</div><div class='del'>-		if (genpd-&gt;start_device)</div><div class='del'>-			genpd-&gt;start_device(dev);</div><div class='del'>-</div><div class='del'>-		ret = drv-&gt;pm-&gt;runtime_suspend(dev);</div><div class='del'>-</div><div class='del'>-		if (genpd-&gt;stop_device)</div><div class='del'>-			genpd-&gt;stop_device(dev);</div><div class='del'>-	}</div><div class='add'>+	genpd_start_dev(genpd, dev);</div><div class='add'>+	ret = genpd_save_dev(genpd, dev);</div><div class='add'>+	genpd_stop_dev(genpd, dev);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;genpd-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -227,22 +288,15 @@ static void __pm_genpd_restore_device(struct pm_domain_data *pdd,</div><div class='ctx'> {</div><div class='ctx'> 	struct generic_pm_domain_data *gpd_data = to_gpd_data(pdd);</div><div class='ctx'> 	struct device *dev = pdd-&gt;dev;</div><div class='del'>-	struct device_driver *drv = dev-&gt;driver;</div><div class='ctx'> </div><div class='ctx'> 	if (!gpd_data-&gt;need_restore)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;genpd-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (drv &amp;&amp; drv-&gt;pm &amp;&amp; drv-&gt;pm-&gt;runtime_resume) {</div><div class='del'>-		if (genpd-&gt;start_device)</div><div class='del'>-			genpd-&gt;start_device(dev);</div><div class='del'>-</div><div class='del'>-		drv-&gt;pm-&gt;runtime_resume(dev);</div><div class='del'>-</div><div class='del'>-		if (genpd-&gt;stop_device)</div><div class='del'>-			genpd-&gt;stop_device(dev);</div><div class='del'>-	}</div><div class='add'>+	genpd_start_dev(genpd, dev);</div><div class='add'>+	genpd_restore_dev(genpd, dev);</div><div class='add'>+	genpd_stop_dev(genpd, dev);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;genpd-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -354,11 +408,16 @@ static int pm_genpd_poweroff(struct generic_pm_domain *genpd)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (genpd-&gt;power_off) {</div><div class='add'>+		ktime_t time_start;</div><div class='add'>+		s64 elapsed_ns;</div><div class='add'>+</div><div class='ctx'> 		if (atomic_read(&amp;genpd-&gt;sd_count) &gt; 0) {</div><div class='ctx'> 			ret = -EBUSY;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		time_start = ktime_get();</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If sd_count &gt; 0 at this point, one of the subdomains hasn't</div><div class='ctx'> 		 * managed to call pm_genpd_poweron() for the master yet after</div><div class='hunk'>@@ -372,9 +431,29 @@ static int pm_genpd_poweroff(struct generic_pm_domain *genpd)</div><div class='ctx'> 			genpd_set_active(genpd);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		elapsed_ns = ktime_to_ns(ktime_sub(ktime_get(), time_start));</div><div class='add'>+		if (elapsed_ns &gt; genpd-&gt;power_off_latency_ns) {</div><div class='add'>+			genpd-&gt;power_off_latency_ns = elapsed_ns;</div><div class='add'>+			if (genpd-&gt;name)</div><div class='add'>+				pr_warning("%s: Power-off latency exceeded, "</div><div class='add'>+					"new value %lld ns\n", genpd-&gt;name,</div><div class='add'>+					elapsed_ns);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	genpd-&gt;status = GPD_STATE_POWER_OFF;</div><div class='add'>+	genpd-&gt;power_off_time = ktime_get();</div><div class='add'>+</div><div class='add'>+	/* Update PM QoS information for devices in the domain. */</div><div class='add'>+	list_for_each_entry_reverse(pdd, &amp;genpd-&gt;dev_list, list_node) {</div><div class='add'>+		struct gpd_timing_data *td = &amp;to_gpd_data(pdd)-&gt;td;</div><div class='add'>+</div><div class='add'>+		pm_runtime_update_max_time_suspended(pdd-&gt;dev,</div><div class='add'>+					td-&gt;start_latency_ns +</div><div class='add'>+					td-&gt;restore_state_latency_ns +</div><div class='add'>+					genpd-&gt;power_on_latency_ns);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(link, &amp;genpd-&gt;slave_links, slave_node) {</div><div class='ctx'> 		genpd_sd_counter_dec(link-&gt;master);</div><div class='hunk'>@@ -413,6 +492,8 @@ static void genpd_power_off_work_fn(struct work_struct *work)</div><div class='ctx'> static int pm_genpd_runtime_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct generic_pm_domain *genpd;</div><div class='add'>+	bool (*stop_ok)(struct device *__dev);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev, "%s()\n", __func__);</div><div class='ctx'> </div><div class='hunk'>@@ -422,11 +503,16 @@ static int pm_genpd_runtime_suspend(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	might_sleep_if(!genpd-&gt;dev_irq_safe);</div><div class='ctx'> </div><div class='del'>-	if (genpd-&gt;stop_device) {</div><div class='del'>-		int ret = genpd-&gt;stop_device(dev);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='add'>+	stop_ok = genpd-&gt;gov ? genpd-&gt;gov-&gt;stop_ok : NULL;</div><div class='add'>+	if (stop_ok &amp;&amp; !stop_ok(dev))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	ret = genpd_stop_dev(genpd, dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pm_runtime_update_max_time_suspended(dev,</div><div class='add'>+				dev_gpd_data(dev)-&gt;td.start_latency_ns);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If power.irq_safe is set, this routine will be run with interrupts</div><div class='hunk'>@@ -502,8 +588,7 @@ static int pm_genpd_runtime_resume(struct device *dev)</div><div class='ctx'> 	mutex_unlock(&amp;genpd-&gt;lock);</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='del'>-	if (genpd-&gt;start_device)</div><div class='del'>-		genpd-&gt;start_device(dev);</div><div class='add'>+	genpd_start_dev(genpd, dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -534,6 +619,52 @@ static inline void genpd_power_off_work_fn(struct work_struct *work) {}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='ctx'> </div><div class='add'>+static bool genpd_dev_active_wakeup(struct generic_pm_domain *genpd,</div><div class='add'>+				    struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return GENPD_DEV_CALLBACK(genpd, bool, active_wakeup, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int genpd_suspend_dev(struct generic_pm_domain *genpd, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return GENPD_DEV_CALLBACK(genpd, int, suspend, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int genpd_suspend_late(struct generic_pm_domain *genpd, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return GENPD_DEV_CALLBACK(genpd, int, suspend_late, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int genpd_resume_early(struct generic_pm_domain *genpd, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return GENPD_DEV_CALLBACK(genpd, int, resume_early, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int genpd_resume_dev(struct generic_pm_domain *genpd, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return GENPD_DEV_CALLBACK(genpd, int, resume, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int genpd_freeze_dev(struct generic_pm_domain *genpd, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return GENPD_DEV_CALLBACK(genpd, int, freeze, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int genpd_freeze_late(struct generic_pm_domain *genpd, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return GENPD_DEV_CALLBACK(genpd, int, freeze_late, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int genpd_thaw_early(struct generic_pm_domain *genpd, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return GENPD_DEV_CALLBACK(genpd, int, thaw_early, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int genpd_thaw_dev(struct generic_pm_domain *genpd, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return GENPD_DEV_CALLBACK(genpd, int, thaw, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * pm_genpd_sync_poweroff - Synchronously power off a PM domain and its masters.</div><div class='ctx'>  * @genpd: PM domain to power off, if possible.</div><div class='hunk'>@@ -590,7 +721,7 @@ static bool resume_needed(struct device *dev, struct generic_pm_domain *genpd)</div><div class='ctx'> 	if (!device_can_wakeup(dev))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	active_wakeup = genpd-&gt;active_wakeup &amp;&amp; genpd-&gt;active_wakeup(dev);</div><div class='add'>+	active_wakeup = genpd_dev_active_wakeup(genpd, dev);</div><div class='ctx'> 	return device_may_wakeup(dev) ? active_wakeup : !active_wakeup;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -646,7 +777,7 @@ static int pm_genpd_prepare(struct device *dev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The PM domain must be in the GPD_STATE_ACTIVE state at this point,</div><div class='ctx'> 	 * so pm_genpd_poweron() will return immediately, but if the device</div><div class='del'>-	 * is suspended (e.g. it's been stopped by .stop_device()), we need</div><div class='add'>+	 * is suspended (e.g. it's been stopped by genpd_stop_dev()), we need</div><div class='ctx'> 	 * to make it operational.</div><div class='ctx'> 	 */</div><div class='ctx'> 	pm_runtime_resume(dev);</div><div class='hunk'>@@ -685,7 +816,7 @@ static int pm_genpd_suspend(struct device *dev)</div><div class='ctx'> 	if (IS_ERR(genpd))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return genpd-&gt;suspend_power_off ? 0 : pm_generic_suspend(dev);</div><div class='add'>+	return genpd-&gt;suspend_power_off ? 0 : genpd_suspend_dev(genpd, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -710,16 +841,14 @@ static int pm_genpd_suspend_noirq(struct device *dev)</div><div class='ctx'> 	if (genpd-&gt;suspend_power_off)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = pm_generic_suspend_noirq(dev);</div><div class='add'>+	ret = genpd_suspend_late(genpd, dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;power.wakeup_path</div><div class='del'>-	    &amp;&amp; genpd-&gt;active_wakeup &amp;&amp; genpd-&gt;active_wakeup(dev))</div><div class='add'>+	if (dev-&gt;power.wakeup_path &amp;&amp; genpd_dev_active_wakeup(genpd, dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (genpd-&gt;stop_device)</div><div class='del'>-		genpd-&gt;stop_device(dev);</div><div class='add'>+	genpd_stop_dev(genpd, dev);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since all of the "noirq" callbacks are executed sequentially, it is</div><div class='hunk'>@@ -761,10 +890,9 @@ static int pm_genpd_resume_noirq(struct device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	pm_genpd_poweron(genpd);</div><div class='ctx'> 	genpd-&gt;suspended_count--;</div><div class='del'>-	if (genpd-&gt;start_device)</div><div class='del'>-		genpd-&gt;start_device(dev);</div><div class='add'>+	genpd_start_dev(genpd, dev);</div><div class='ctx'> </div><div class='del'>-	return pm_generic_resume_noirq(dev);</div><div class='add'>+	return genpd_resume_early(genpd, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -785,7 +913,7 @@ static int pm_genpd_resume(struct device *dev)</div><div class='ctx'> 	if (IS_ERR(genpd))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return genpd-&gt;suspend_power_off ? 0 : pm_generic_resume(dev);</div><div class='add'>+	return genpd-&gt;suspend_power_off ? 0 : genpd_resume_dev(genpd, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -806,7 +934,7 @@ static int pm_genpd_freeze(struct device *dev)</div><div class='ctx'> 	if (IS_ERR(genpd))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return genpd-&gt;suspend_power_off ? 0 : pm_generic_freeze(dev);</div><div class='add'>+	return genpd-&gt;suspend_power_off ? 0 : genpd_freeze_dev(genpd, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -832,12 +960,11 @@ static int pm_genpd_freeze_noirq(struct device *dev)</div><div class='ctx'> 	if (genpd-&gt;suspend_power_off)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = pm_generic_freeze_noirq(dev);</div><div class='add'>+	ret = genpd_freeze_late(genpd, dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (genpd-&gt;stop_device)</div><div class='del'>-		genpd-&gt;stop_device(dev);</div><div class='add'>+	genpd_stop_dev(genpd, dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -864,10 +991,9 @@ static int pm_genpd_thaw_noirq(struct device *dev)</div><div class='ctx'> 	if (genpd-&gt;suspend_power_off)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (genpd-&gt;start_device)</div><div class='del'>-		genpd-&gt;start_device(dev);</div><div class='add'>+	genpd_start_dev(genpd, dev);</div><div class='ctx'> </div><div class='del'>-	return pm_generic_thaw_noirq(dev);</div><div class='add'>+	return genpd_thaw_early(genpd, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -888,72 +1014,7 @@ static int pm_genpd_thaw(struct device *dev)</div><div class='ctx'> 	if (IS_ERR(genpd))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return genpd-&gt;suspend_power_off ? 0 : pm_generic_thaw(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pm_genpd_dev_poweroff - Power off a device belonging to an I/O PM domain.</div><div class='del'>- * @dev: Device to suspend.</div><div class='del'>- *</div><div class='del'>- * Power off a device under the assumption that its pm_domain field points to</div><div class='del'>- * the domain member of an object of type struct generic_pm_domain representing</div><div class='del'>- * a PM domain consisting of I/O devices.</div><div class='del'>- */</div><div class='del'>-static int pm_genpd_dev_poweroff(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct generic_pm_domain *genpd;</div><div class='del'>-</div><div class='del'>-	dev_dbg(dev, "%s()\n", __func__);</div><div class='del'>-</div><div class='del'>-	genpd = dev_to_genpd(dev);</div><div class='del'>-	if (IS_ERR(genpd))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return genpd-&gt;suspend_power_off ? 0 : pm_generic_poweroff(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pm_genpd_dev_poweroff_noirq - Late power off of a device from a PM domain.</div><div class='del'>- * @dev: Device to suspend.</div><div class='del'>- *</div><div class='del'>- * Carry out a late powering off of a device under the assumption that its</div><div class='del'>- * pm_domain field points to the domain member of an object of type</div><div class='del'>- * struct generic_pm_domain representing a PM domain consisting of I/O devices.</div><div class='del'>- */</div><div class='del'>-static int pm_genpd_dev_poweroff_noirq(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct generic_pm_domain *genpd;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dev_dbg(dev, "%s()\n", __func__);</div><div class='del'>-</div><div class='del'>-	genpd = dev_to_genpd(dev);</div><div class='del'>-	if (IS_ERR(genpd))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (genpd-&gt;suspend_power_off)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = pm_generic_poweroff_noirq(dev);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;power.wakeup_path</div><div class='del'>-	    &amp;&amp; genpd-&gt;active_wakeup &amp;&amp; genpd-&gt;active_wakeup(dev))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (genpd-&gt;stop_device)</div><div class='del'>-		genpd-&gt;stop_device(dev);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Since all of the "noirq" callbacks are executed sequentially, it is</div><div class='del'>-	 * guaranteed that this function will never run twice in parallel for</div><div class='del'>-	 * the same PM domain, so it is not necessary to use locking here.</div><div class='del'>-	 */</div><div class='del'>-	genpd-&gt;suspended_count++;</div><div class='del'>-	pm_genpd_sync_poweroff(genpd);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return genpd-&gt;suspend_power_off ? 0 : genpd_thaw_dev(genpd, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -993,31 +1054,9 @@ static int pm_genpd_restore_noirq(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	pm_genpd_poweron(genpd);</div><div class='ctx'> 	genpd-&gt;suspended_count--;</div><div class='del'>-	if (genpd-&gt;start_device)</div><div class='del'>-		genpd-&gt;start_device(dev);</div><div class='add'>+	genpd_start_dev(genpd, dev);</div><div class='ctx'> </div><div class='del'>-	return pm_generic_restore_noirq(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pm_genpd_restore - Restore a device belonging to an I/O power domain.</div><div class='del'>- * @dev: Device to resume.</div><div class='del'>- *</div><div class='del'>- * Restore a device under the assumption that its pm_domain field points to the</div><div class='del'>- * domain member of an object of type struct generic_pm_domain representing</div><div class='del'>- * a power domain consisting of I/O devices.</div><div class='del'>- */</div><div class='del'>-static int pm_genpd_restore(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct generic_pm_domain *genpd;</div><div class='del'>-</div><div class='del'>-	dev_dbg(dev, "%s()\n", __func__);</div><div class='del'>-</div><div class='del'>-	genpd = dev_to_genpd(dev);</div><div class='del'>-	if (IS_ERR(genpd))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return genpd-&gt;suspend_power_off ? 0 : pm_generic_restore(dev);</div><div class='add'>+	return genpd_resume_early(genpd, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1067,20 +1106,19 @@ static void pm_genpd_complete(struct device *dev)</div><div class='ctx'> #define pm_genpd_freeze_noirq		NULL</div><div class='ctx'> #define pm_genpd_thaw_noirq		NULL</div><div class='ctx'> #define pm_genpd_thaw			NULL</div><div class='del'>-#define pm_genpd_dev_poweroff_noirq	NULL</div><div class='del'>-#define pm_genpd_dev_poweroff		NULL</div><div class='ctx'> #define pm_genpd_restore_noirq		NULL</div><div class='del'>-#define pm_genpd_restore		NULL</div><div class='ctx'> #define pm_genpd_complete		NULL</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_PM_SLEEP */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * pm_genpd_add_device - Add a device to an I/O PM domain.</div><div class='add'>+ * __pm_genpd_add_device - Add a device to an I/O PM domain.</div><div class='ctx'>  * @genpd: PM domain to add the device to.</div><div class='ctx'>  * @dev: Device to be added.</div><div class='add'>+ * @td: Set of PM QoS timing parameters to attach to the device.</div><div class='ctx'>  */</div><div class='del'>-int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev)</div><div class='add'>+int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,</div><div class='add'>+			  struct gpd_timing_data *td)</div><div class='ctx'> {</div><div class='ctx'> 	struct generic_pm_domain_data *gpd_data;</div><div class='ctx'> 	struct pm_domain_data *pdd;</div><div class='hunk'>@@ -1123,6 +1161,8 @@ int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev)</div><div class='ctx'> 	gpd_data-&gt;base.dev = dev;</div><div class='ctx'> 	gpd_data-&gt;need_restore = false;</div><div class='ctx'> 	list_add_tail(&amp;gpd_data-&gt;base.list_node, &amp;genpd-&gt;dev_list);</div><div class='add'>+	if (td)</div><div class='add'>+		gpd_data-&gt;td = *td;</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='ctx'> 	genpd_release_lock(genpd);</div><div class='hunk'>@@ -1280,6 +1320,219 @@ int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * pm_genpd_add_callbacks - Add PM domain callbacks to a given device.</div><div class='add'>+ * @dev: Device to add the callbacks to.</div><div class='add'>+ * @ops: Set of callbacks to add.</div><div class='add'>+ * @td: Timing data to add to the device along with the callbacks (optional).</div><div class='add'>+ */</div><div class='add'>+int pm_genpd_add_callbacks(struct device *dev, struct gpd_dev_ops *ops,</div><div class='add'>+			   struct gpd_timing_data *td)</div><div class='add'>+{</div><div class='add'>+	struct pm_domain_data *pdd;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!(dev &amp;&amp; dev-&gt;power.subsys_data &amp;&amp; ops))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pm_runtime_disable(dev);</div><div class='add'>+	device_pm_lock();</div><div class='add'>+</div><div class='add'>+	pdd = dev-&gt;power.subsys_data-&gt;domain_data;</div><div class='add'>+	if (pdd) {</div><div class='add'>+		struct generic_pm_domain_data *gpd_data = to_gpd_data(pdd);</div><div class='add'>+</div><div class='add'>+		gpd_data-&gt;ops = *ops;</div><div class='add'>+		if (td)</div><div class='add'>+			gpd_data-&gt;td = *td;</div><div class='add'>+	} else {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device_pm_unlock();</div><div class='add'>+	pm_runtime_enable(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pm_genpd_add_callbacks);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __pm_genpd_remove_callbacks - Remove PM domain callbacks from a given device.</div><div class='add'>+ * @dev: Device to remove the callbacks from.</div><div class='add'>+ * @clear_td: If set, clear the device's timing data too.</div><div class='add'>+ */</div><div class='add'>+int __pm_genpd_remove_callbacks(struct device *dev, bool clear_td)</div><div class='add'>+{</div><div class='add'>+	struct pm_domain_data *pdd;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!(dev &amp;&amp; dev-&gt;power.subsys_data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pm_runtime_disable(dev);</div><div class='add'>+	device_pm_lock();</div><div class='add'>+</div><div class='add'>+	pdd = dev-&gt;power.subsys_data-&gt;domain_data;</div><div class='add'>+	if (pdd) {</div><div class='add'>+		struct generic_pm_domain_data *gpd_data = to_gpd_data(pdd);</div><div class='add'>+</div><div class='add'>+		gpd_data-&gt;ops = (struct gpd_dev_ops){ 0 };</div><div class='add'>+		if (clear_td)</div><div class='add'>+			gpd_data-&gt;td = (struct gpd_timing_data){ 0 };</div><div class='add'>+	} else {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device_pm_unlock();</div><div class='add'>+	pm_runtime_enable(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__pm_genpd_remove_callbacks);</div><div class='add'>+</div><div class='add'>+/* Default device callbacks for generic PM domains. */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pm_genpd_default_save_state - Default "save device state" for PM domians.</div><div class='add'>+ * @dev: Device to handle.</div><div class='add'>+ */</div><div class='add'>+static int pm_genpd_default_save_state(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int (*cb)(struct device *__dev);</div><div class='add'>+	struct device_driver *drv = dev-&gt;driver;</div><div class='add'>+</div><div class='add'>+	cb = dev_gpd_data(dev)-&gt;ops.save_state;</div><div class='add'>+	if (cb)</div><div class='add'>+		return cb(dev);</div><div class='add'>+</div><div class='add'>+	if (drv &amp;&amp; drv-&gt;pm &amp;&amp; drv-&gt;pm-&gt;runtime_suspend)</div><div class='add'>+		return drv-&gt;pm-&gt;runtime_suspend(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pm_genpd_default_restore_state - Default PM domians "restore device state".</div><div class='add'>+ * @dev: Device to handle.</div><div class='add'>+ */</div><div class='add'>+static int pm_genpd_default_restore_state(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int (*cb)(struct device *__dev);</div><div class='add'>+	struct device_driver *drv = dev-&gt;driver;</div><div class='add'>+</div><div class='add'>+	cb = dev_gpd_data(dev)-&gt;ops.restore_state;</div><div class='add'>+	if (cb)</div><div class='add'>+		return cb(dev);</div><div class='add'>+</div><div class='add'>+	if (drv &amp;&amp; drv-&gt;pm &amp;&amp; drv-&gt;pm-&gt;runtime_resume)</div><div class='add'>+		return drv-&gt;pm-&gt;runtime_resume(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pm_genpd_default_suspend - Default "device suspend" for PM domians.</div><div class='add'>+ * @dev: Device to handle.</div><div class='add'>+ */</div><div class='add'>+static int pm_genpd_default_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int (*cb)(struct device *__dev) = dev_gpd_data(dev)-&gt;ops.suspend;</div><div class='add'>+</div><div class='add'>+	return cb ? cb(dev) : pm_generic_suspend(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pm_genpd_default_suspend_late - Default "late device suspend" for PM domians.</div><div class='add'>+ * @dev: Device to handle.</div><div class='add'>+ */</div><div class='add'>+static int pm_genpd_default_suspend_late(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int (*cb)(struct device *__dev) = dev_gpd_data(dev)-&gt;ops.suspend_late;</div><div class='add'>+</div><div class='add'>+	return cb ? cb(dev) : pm_generic_suspend_noirq(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pm_genpd_default_resume_early - Default "early device resume" for PM domians.</div><div class='add'>+ * @dev: Device to handle.</div><div class='add'>+ */</div><div class='add'>+static int pm_genpd_default_resume_early(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int (*cb)(struct device *__dev) = dev_gpd_data(dev)-&gt;ops.resume_early;</div><div class='add'>+</div><div class='add'>+	return cb ? cb(dev) : pm_generic_resume_noirq(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pm_genpd_default_resume - Default "device resume" for PM domians.</div><div class='add'>+ * @dev: Device to handle.</div><div class='add'>+ */</div><div class='add'>+static int pm_genpd_default_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int (*cb)(struct device *__dev) = dev_gpd_data(dev)-&gt;ops.resume;</div><div class='add'>+</div><div class='add'>+	return cb ? cb(dev) : pm_generic_resume(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pm_genpd_default_freeze - Default "device freeze" for PM domians.</div><div class='add'>+ * @dev: Device to handle.</div><div class='add'>+ */</div><div class='add'>+static int pm_genpd_default_freeze(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int (*cb)(struct device *__dev) = dev_gpd_data(dev)-&gt;ops.freeze;</div><div class='add'>+</div><div class='add'>+	return cb ? cb(dev) : pm_generic_freeze(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pm_genpd_default_freeze_late - Default "late device freeze" for PM domians.</div><div class='add'>+ * @dev: Device to handle.</div><div class='add'>+ */</div><div class='add'>+static int pm_genpd_default_freeze_late(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int (*cb)(struct device *__dev) = dev_gpd_data(dev)-&gt;ops.freeze_late;</div><div class='add'>+</div><div class='add'>+	return cb ? cb(dev) : pm_generic_freeze_noirq(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pm_genpd_default_thaw_early - Default "early device thaw" for PM domians.</div><div class='add'>+ * @dev: Device to handle.</div><div class='add'>+ */</div><div class='add'>+static int pm_genpd_default_thaw_early(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int (*cb)(struct device *__dev) = dev_gpd_data(dev)-&gt;ops.thaw_early;</div><div class='add'>+</div><div class='add'>+	return cb ? cb(dev) : pm_generic_thaw_noirq(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pm_genpd_default_thaw - Default "device thaw" for PM domians.</div><div class='add'>+ * @dev: Device to handle.</div><div class='add'>+ */</div><div class='add'>+static int pm_genpd_default_thaw(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int (*cb)(struct device *__dev) = dev_gpd_data(dev)-&gt;ops.thaw;</div><div class='add'>+</div><div class='add'>+	return cb ? cb(dev) : pm_generic_thaw(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_PM_SLEEP */</div><div class='add'>+</div><div class='add'>+#define pm_genpd_default_suspend	NULL</div><div class='add'>+#define pm_genpd_default_suspend_late	NULL</div><div class='add'>+#define pm_genpd_default_resume_early	NULL</div><div class='add'>+#define pm_genpd_default_resume		NULL</div><div class='add'>+#define pm_genpd_default_freeze		NULL</div><div class='add'>+#define pm_genpd_default_freeze_late	NULL</div><div class='add'>+#define pm_genpd_default_thaw_early	NULL</div><div class='add'>+#define pm_genpd_default_thaw		NULL</div><div class='add'>+</div><div class='add'>+#endif /* !CONFIG_PM_SLEEP */</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * pm_genpd_init - Initialize a generic I/O PM domain object.</div><div class='ctx'>  * @genpd: PM domain object to initialize.</div><div class='ctx'>  * @gov: PM domain governor to associate with the domain (may be NULL).</div><div class='hunk'>@@ -1305,6 +1558,7 @@ void pm_genpd_init(struct generic_pm_domain *genpd,</div><div class='ctx'> 	genpd-&gt;resume_count = 0;</div><div class='ctx'> 	genpd-&gt;device_count = 0;</div><div class='ctx'> 	genpd-&gt;suspended_count = 0;</div><div class='add'>+	genpd-&gt;max_off_time_ns = -1;</div><div class='ctx'> 	genpd-&gt;domain.ops.runtime_suspend = pm_genpd_runtime_suspend;</div><div class='ctx'> 	genpd-&gt;domain.ops.runtime_resume = pm_genpd_runtime_resume;</div><div class='ctx'> 	genpd-&gt;domain.ops.runtime_idle = pm_generic_runtime_idle;</div><div class='hunk'>@@ -1317,11 +1571,21 @@ void pm_genpd_init(struct generic_pm_domain *genpd,</div><div class='ctx'> 	genpd-&gt;domain.ops.freeze_noirq = pm_genpd_freeze_noirq;</div><div class='ctx'> 	genpd-&gt;domain.ops.thaw_noirq = pm_genpd_thaw_noirq;</div><div class='ctx'> 	genpd-&gt;domain.ops.thaw = pm_genpd_thaw;</div><div class='del'>-	genpd-&gt;domain.ops.poweroff = pm_genpd_dev_poweroff;</div><div class='del'>-	genpd-&gt;domain.ops.poweroff_noirq = pm_genpd_dev_poweroff_noirq;</div><div class='add'>+	genpd-&gt;domain.ops.poweroff = pm_genpd_suspend;</div><div class='add'>+	genpd-&gt;domain.ops.poweroff_noirq = pm_genpd_suspend_noirq;</div><div class='ctx'> 	genpd-&gt;domain.ops.restore_noirq = pm_genpd_restore_noirq;</div><div class='del'>-	genpd-&gt;domain.ops.restore = pm_genpd_restore;</div><div class='add'>+	genpd-&gt;domain.ops.restore = pm_genpd_resume;</div><div class='ctx'> 	genpd-&gt;domain.ops.complete = pm_genpd_complete;</div><div class='add'>+	genpd-&gt;dev_ops.save_state = pm_genpd_default_save_state;</div><div class='add'>+	genpd-&gt;dev_ops.restore_state = pm_genpd_default_restore_state;</div><div class='add'>+	genpd-&gt;dev_ops.suspend = pm_genpd_default_suspend;</div><div class='add'>+	genpd-&gt;dev_ops.suspend_late = pm_genpd_default_suspend_late;</div><div class='add'>+	genpd-&gt;dev_ops.resume_early = pm_genpd_default_resume_early;</div><div class='add'>+	genpd-&gt;dev_ops.resume = pm_genpd_default_resume;</div><div class='add'>+	genpd-&gt;dev_ops.freeze = pm_genpd_default_freeze;</div><div class='add'>+	genpd-&gt;dev_ops.freeze_late = pm_genpd_default_freeze_late;</div><div class='add'>+	genpd-&gt;dev_ops.thaw_early = pm_genpd_default_thaw_early;</div><div class='add'>+	genpd-&gt;dev_ops.thaw = pm_genpd_default_thaw;</div><div class='ctx'> 	mutex_lock(&amp;gpd_list_lock);</div><div class='ctx'> 	list_add(&amp;genpd-&gt;gpd_list_node, &amp;gpd_list);</div><div class='ctx'> 	mutex_unlock(&amp;gpd_list_lock);</div><div class='head'>diff --git a/drivers/base/power/domain_governor.c b/drivers/base/power/domain_governor.c<br/>new file mode 100644<br/>index 000000000000..66a265bf5867<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/power/domain_governor.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/power/domain_governor.c</a></div><div class='hunk'>@@ -0,0 +1,170 @@</div><div class='add'>+/*</div><div class='add'>+ * drivers/base/power/domain_governor.c - Governors for device PM domains.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Rafael J. Wysocki &lt;rjw@sisk.pl&gt;, Renesas Electronics Corp.</div><div class='add'>+ *</div><div class='add'>+ * This file is released under the GPLv2.</div><div class='add'>+ */</div><div class='add'>+</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/pm_domain.h&gt;</div><div class='add'>+#include &lt;linux/pm_qos.h&gt;</div><div class='add'>+#include &lt;linux/hrtimer.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_RUNTIME</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * default_stop_ok - Default PM domain governor routine for stopping devices.</div><div class='add'>+ * @dev: Device to check.</div><div class='add'>+ */</div><div class='add'>+bool default_stop_ok(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct gpd_timing_data *td = &amp;dev_gpd_data(dev)-&gt;td;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;power.max_time_suspended_ns &lt; 0 || td-&gt;break_even_ns == 0)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return td-&gt;stop_latency_ns + td-&gt;start_latency_ns &lt; td-&gt;break_even_ns</div><div class='add'>+		&amp;&amp; td-&gt;break_even_ns &lt; dev-&gt;power.max_time_suspended_ns;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * default_power_down_ok - Default generic PM domain power off governor routine.</div><div class='add'>+ * @pd: PM domain to check.</div><div class='add'>+ *</div><div class='add'>+ * This routine must be executed under the PM domain's lock.</div><div class='add'>+ */</div><div class='add'>+static bool default_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 gpd_link *link;</div><div class='add'>+	struct pm_domain_data *pdd;</div><div class='add'>+	s64 min_dev_off_time_ns;</div><div class='add'>+	s64 off_on_time_ns;</div><div class='add'>+	ktime_t time_now = ktime_get();</div><div class='add'>+</div><div class='add'>+	off_on_time_ns = genpd-&gt;power_off_latency_ns +</div><div class='add'>+				genpd-&gt;power_on_latency_ns;</div><div class='add'>+	/*</div><div class='add'>+	 * It doesn't make sense to remove power from the domain if saving</div><div class='add'>+	 * the state of all devices in it and the power off/power on operations</div><div class='add'>+	 * take too much time.</div><div class='add'>+	 *</div><div class='add'>+	 * All devices in this domain have been stopped already at this point.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry(pdd, &amp;genpd-&gt;dev_list, list_node) {</div><div class='add'>+		if (pdd-&gt;dev-&gt;driver)</div><div class='add'>+			off_on_time_ns +=</div><div class='add'>+				to_gpd_data(pdd)-&gt;td.save_state_latency_ns;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if subdomains can be off for enough time.</div><div class='add'>+	 *</div><div class='add'>+	 * All subdomains have been powered off already at this point.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry(link, &amp;genpd-&gt;master_links, master_node) {</div><div class='add'>+		struct generic_pm_domain *sd = link-&gt;slave;</div><div class='add'>+		s64 sd_max_off_ns = sd-&gt;max_off_time_ns;</div><div class='add'>+</div><div class='add'>+		if (sd_max_off_ns &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sd_max_off_ns -= ktime_to_ns(ktime_sub(time_now,</div><div class='add'>+						       sd-&gt;power_off_time));</div><div class='add'>+		/*</div><div class='add'>+		 * Check if the subdomain is allowed to be off long enough for</div><div class='add'>+		 * the current domain to turn off and on (that's how much time</div><div class='add'>+		 * it will have to wait worst case).</div><div class='add'>+		 */</div><div class='add'>+		if (sd_max_off_ns &lt;= off_on_time_ns)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if the devices in the domain can be off enough time.</div><div class='add'>+	 */</div><div class='add'>+	min_dev_off_time_ns = -1;</div><div class='add'>+	list_for_each_entry(pdd, &amp;genpd-&gt;dev_list, list_node) {</div><div class='add'>+		struct gpd_timing_data *td;</div><div class='add'>+		struct device *dev = pdd-&gt;dev;</div><div class='add'>+		s64 dev_off_time_ns;</div><div class='add'>+</div><div class='add'>+		if (!dev-&gt;driver || dev-&gt;power.max_time_suspended_ns &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		td = &amp;to_gpd_data(pdd)-&gt;td;</div><div class='add'>+		dev_off_time_ns = dev-&gt;power.max_time_suspended_ns -</div><div class='add'>+			(td-&gt;start_latency_ns + td-&gt;restore_state_latency_ns +</div><div class='add'>+				ktime_to_ns(ktime_sub(time_now,</div><div class='add'>+						dev-&gt;power.suspend_time)));</div><div class='add'>+		if (dev_off_time_ns &lt;= off_on_time_ns)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		if (min_dev_off_time_ns &gt; dev_off_time_ns</div><div class='add'>+		    || min_dev_off_time_ns &lt; 0)</div><div class='add'>+			min_dev_off_time_ns = dev_off_time_ns;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (min_dev_off_time_ns &lt; 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * There are no latency constraints, so the domain can spend</div><div class='add'>+		 * arbitrary time in the "off" state.</div><div class='add'>+		 */</div><div class='add'>+		genpd-&gt;max_off_time_ns = -1;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The difference between the computed minimum delta and the time needed</div><div class='add'>+	 * to turn the domain on is the maximum theoretical time this domain can</div><div class='add'>+	 * spend in the "off" state.</div><div class='add'>+	 */</div><div class='add'>+	min_dev_off_time_ns -= genpd-&gt;power_on_latency_ns;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the difference between the computed minimum delta and the time</div><div class='add'>+	 * needed to turn the domain off and back on on is smaller than the</div><div class='add'>+	 * domain's power break even time, removing power from the domain is not</div><div class='add'>+	 * worth it.</div><div class='add'>+	 */</div><div class='add'>+	if (genpd-&gt;break_even_ns &gt;</div><div class='add'>+	    min_dev_off_time_ns - genpd-&gt;power_off_latency_ns)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	genpd-&gt;max_off_time_ns = min_dev_off_time_ns;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool always_on_power_down_ok(struct dev_pm_domain *domain)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_PM_RUNTIME */</div><div class='add'>+</div><div class='add'>+bool default_stop_ok(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define default_power_down_ok	NULL</div><div class='add'>+#define always_on_power_down_ok	NULL</div><div class='add'>+</div><div class='add'>+#endif /* !CONFIG_PM_RUNTIME */</div><div class='add'>+</div><div class='add'>+struct dev_power_governor simple_qos_governor = {</div><div class='add'>+	.stop_ok = default_stop_ok,</div><div class='add'>+	.power_down_ok = default_power_down_ok,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pm_genpd_gov_always_on - A governor implementing an always-on policy</div><div class='add'>+ */</div><div class='add'>+struct dev_power_governor pm_domain_always_on_gov = {</div><div class='add'>+	.power_down_ok = always_on_power_down_ok,</div><div class='add'>+	.stop_ok = default_stop_ok,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c<br/>index 265a0ee3b49e..10bdd793f0bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/power/generic_ops.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/power/generic_ops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/power/generic_ops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/power/generic_ops.c</a></div><div class='hunk'>@@ -97,16 +97,16 @@ int pm_generic_prepare(struct device *dev)</div><div class='ctx'>  * @event: PM transition of the system under way.</div><div class='ctx'>  * @bool: Whether or not this is the "noirq" stage.</div><div class='ctx'>  *</div><div class='del'>- * If the device has not been suspended at run time, execute the</div><div class='del'>- * suspend/freeze/poweroff/thaw callback provided by its driver, if defined, and</div><div class='del'>- * return its error code.  Otherwise, return zero.</div><div class='add'>+ * Execute the PM callback corresponding to @event provided by the driver of</div><div class='add'>+ * @dev, if defined, and return its error code.    Return 0 if the callback is</div><div class='add'>+ * not present.</div><div class='ctx'>  */</div><div class='ctx'> static int __pm_generic_call(struct device *dev, int event, bool noirq)</div><div class='ctx'> {</div><div class='ctx'> 	const struct dev_pm_ops *pm = dev-&gt;driver ? dev-&gt;driver-&gt;pm : NULL;</div><div class='ctx'> 	int (*callback)(struct device *);</div><div class='ctx'> </div><div class='del'>-	if (!pm || pm_runtime_suspended(dev))</div><div class='add'>+	if (!pm)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='hunk'>@@ -119,9 +119,15 @@ static int __pm_generic_call(struct device *dev, int event, bool noirq)</div><div class='ctx'> 	case PM_EVENT_HIBERNATE:</div><div class='ctx'> 		callback = noirq ? pm-&gt;poweroff_noirq : pm-&gt;poweroff;</div><div class='ctx'> 		break;</div><div class='add'>+	case PM_EVENT_RESUME:</div><div class='add'>+		callback = noirq ? pm-&gt;resume_noirq : pm-&gt;resume;</div><div class='add'>+		break;</div><div class='ctx'> 	case PM_EVENT_THAW:</div><div class='ctx'> 		callback = noirq ? pm-&gt;thaw_noirq : pm-&gt;thaw;</div><div class='ctx'> 		break;</div><div class='add'>+	case PM_EVENT_RESTORE:</div><div class='add'>+		callback = noirq ? pm-&gt;restore_noirq : pm-&gt;restore;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		callback = NULL;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -211,56 +217,12 @@ int pm_generic_thaw(struct device *dev)</div><div class='ctx'> EXPORT_SYMBOL_GPL(pm_generic_thaw);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * __pm_generic_resume - Generic resume/restore callback for subsystems.</div><div class='del'>- * @dev: Device to handle.</div><div class='del'>- * @event: PM transition of the system under way.</div><div class='del'>- * @bool: Whether or not this is the "noirq" stage.</div><div class='del'>- *</div><div class='del'>- * Execute the resume/resotre callback provided by the @dev's driver, if</div><div class='del'>- * defined.  If it returns 0, change the device's runtime PM status to 'active'.</div><div class='del'>- * Return the callback's error code.</div><div class='del'>- */</div><div class='del'>-static int __pm_generic_resume(struct device *dev, int event, bool noirq)</div><div class='del'>-{</div><div class='del'>-	const struct dev_pm_ops *pm = dev-&gt;driver ? dev-&gt;driver-&gt;pm : NULL;</div><div class='del'>-	int (*callback)(struct device *);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!pm)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	switch (event) {</div><div class='del'>-	case PM_EVENT_RESUME:</div><div class='del'>-		callback = noirq ? pm-&gt;resume_noirq : pm-&gt;resume;</div><div class='del'>-		break;</div><div class='del'>-	case PM_EVENT_RESTORE:</div><div class='del'>-		callback = noirq ? pm-&gt;restore_noirq : pm-&gt;restore;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		callback = NULL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!callback)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ret = callback(dev);</div><div class='del'>-	if (!ret &amp;&amp; !noirq &amp;&amp; pm_runtime_enabled(dev)) {</div><div class='del'>-		pm_runtime_disable(dev);</div><div class='del'>-		pm_runtime_set_active(dev);</div><div class='del'>-		pm_runtime_enable(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'>-/**</div><div class='ctx'>  * pm_generic_resume_noirq - Generic resume_noirq callback for subsystems.</div><div class='ctx'>  * @dev: Device to resume.</div><div class='ctx'>  */</div><div class='ctx'> int pm_generic_resume_noirq(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	return __pm_generic_resume(dev, PM_EVENT_RESUME, true);</div><div class='add'>+	return __pm_generic_call(dev, PM_EVENT_RESUME, true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pm_generic_resume_noirq);</div><div class='ctx'> </div><div class='hunk'>@@ -270,7 +232,7 @@ EXPORT_SYMBOL_GPL(pm_generic_resume_noirq);</div><div class='ctx'>  */</div><div class='ctx'> int pm_generic_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	return __pm_generic_resume(dev, PM_EVENT_RESUME, false);</div><div class='add'>+	return __pm_generic_call(dev, PM_EVENT_RESUME, false);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pm_generic_resume);</div><div class='ctx'> </div><div class='hunk'>@@ -280,7 +242,7 @@ EXPORT_SYMBOL_GPL(pm_generic_resume);</div><div class='ctx'>  */</div><div class='ctx'> int pm_generic_restore_noirq(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	return __pm_generic_resume(dev, PM_EVENT_RESTORE, true);</div><div class='add'>+	return __pm_generic_call(dev, PM_EVENT_RESTORE, true);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pm_generic_restore_noirq);</div><div class='ctx'> </div><div class='hunk'>@@ -290,7 +252,7 @@ EXPORT_SYMBOL_GPL(pm_generic_restore_noirq);</div><div class='ctx'>  */</div><div class='ctx'> int pm_generic_restore(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	return __pm_generic_resume(dev, PM_EVENT_RESTORE, false);</div><div class='add'>+	return __pm_generic_call(dev, PM_EVENT_RESTORE, false);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pm_generic_restore);</div><div class='ctx'> </div><div class='hunk'>@@ -314,28 +276,3 @@ void pm_generic_complete(struct device *dev)</div><div class='ctx'> 	pm_runtime_idle(dev);</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PM_SLEEP */</div><div class='del'>-</div><div class='del'>-struct dev_pm_ops generic_subsys_pm_ops = {</div><div class='del'>-#ifdef CONFIG_PM_SLEEP</div><div class='del'>-	.prepare = pm_generic_prepare,</div><div class='del'>-	.suspend = pm_generic_suspend,</div><div class='del'>-	.suspend_noirq = pm_generic_suspend_noirq,</div><div class='del'>-	.resume = pm_generic_resume,</div><div class='del'>-	.resume_noirq = pm_generic_resume_noirq,</div><div class='del'>-	.freeze = pm_generic_freeze,</div><div class='del'>-	.freeze_noirq = pm_generic_freeze_noirq,</div><div class='del'>-	.thaw = pm_generic_thaw,</div><div class='del'>-	.thaw_noirq = pm_generic_thaw_noirq,</div><div class='del'>-	.poweroff = pm_generic_poweroff,</div><div class='del'>-	.poweroff_noirq = pm_generic_poweroff_noirq,</div><div class='del'>-	.restore = pm_generic_restore,</div><div class='del'>-	.restore_noirq = pm_generic_restore_noirq,</div><div class='del'>-	.complete = pm_generic_complete,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_PM_RUNTIME</div><div class='del'>-	.runtime_suspend = pm_generic_runtime_suspend,</div><div class='del'>-	.runtime_resume = pm_generic_runtime_resume,</div><div class='del'>-	.runtime_idle = pm_generic_runtime_idle,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-EXPORT_SYMBOL_GPL(generic_subsys_pm_ops);</div><div class='head'>diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c<br/>index c3d2dfcf438d..e2cc3d2e0ecc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/power/main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/power/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/power/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/power/main.c</a></div><div class='hunk'>@@ -32,6 +32,8 @@</div><div class='ctx'> #include "../base.h"</div><div class='ctx'> #include "power.h"</div><div class='ctx'> </div><div class='add'>+typedef int (*pm_callback_t)(struct device *);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The entries in the dpm_list list are in a depth first order, simply</div><div class='ctx'>  * because children are guaranteed to be discovered after parents, and</div><div class='hunk'>@@ -164,8 +166,9 @@ static ktime_t initcall_debug_start(struct device *dev)</div><div class='ctx'> 	ktime_t calltime = ktime_set(0, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (initcall_debug) {</div><div class='del'>-		pr_info("calling  %s+ @ %i\n",</div><div class='del'>-				dev_name(dev), task_pid_nr(current));</div><div class='add'>+		pr_info("calling  %s+ @ %i, parent: %s\n",</div><div class='add'>+			dev_name(dev), task_pid_nr(current),</div><div class='add'>+			dev-&gt;parent ? dev_name(dev-&gt;parent) : "none");</div><div class='ctx'> 		calltime = ktime_get();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -211,151 +214,69 @@ static void dpm_wait_for_children(struct device *dev, bool async)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * pm_op - Execute the PM operation appropriate for given PM event.</div><div class='del'>- * @dev: Device to handle.</div><div class='add'>+ * pm_op - Return the PM operation appropriate for given PM event.</div><div class='ctx'>  * @ops: PM operations to choose from.</div><div class='ctx'>  * @state: PM transition of the system being carried out.</div><div class='ctx'>  */</div><div class='del'>-static int pm_op(struct device *dev,</div><div class='del'>-		 const struct dev_pm_ops *ops,</div><div class='del'>-		 pm_message_t state)</div><div class='add'>+static pm_callback_t pm_op(const struct dev_pm_ops *ops, pm_message_t state)</div><div class='ctx'> {</div><div class='del'>-	int error = 0;</div><div class='del'>-	ktime_t calltime;</div><div class='del'>-</div><div class='del'>-	calltime = initcall_debug_start(dev);</div><div class='del'>-</div><div class='ctx'> 	switch (state.event) {</div><div class='ctx'> #ifdef CONFIG_SUSPEND</div><div class='ctx'> 	case PM_EVENT_SUSPEND:</div><div class='del'>-		if (ops-&gt;suspend) {</div><div class='del'>-			error = ops-&gt;suspend(dev);</div><div class='del'>-			suspend_report_result(ops-&gt;suspend, error);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='add'>+		return ops-&gt;suspend;</div><div class='ctx'> 	case PM_EVENT_RESUME:</div><div class='del'>-		if (ops-&gt;resume) {</div><div class='del'>-			error = ops-&gt;resume(dev);</div><div class='del'>-			suspend_report_result(ops-&gt;resume, error);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='add'>+		return ops-&gt;resume;</div><div class='ctx'> #endif /* CONFIG_SUSPEND */</div><div class='ctx'> #ifdef CONFIG_HIBERNATE_CALLBACKS</div><div class='ctx'> 	case PM_EVENT_FREEZE:</div><div class='ctx'> 	case PM_EVENT_QUIESCE:</div><div class='del'>-		if (ops-&gt;freeze) {</div><div class='del'>-			error = ops-&gt;freeze(dev);</div><div class='del'>-			suspend_report_result(ops-&gt;freeze, error);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='add'>+		return ops-&gt;freeze;</div><div class='ctx'> 	case PM_EVENT_HIBERNATE:</div><div class='del'>-		if (ops-&gt;poweroff) {</div><div class='del'>-			error = ops-&gt;poweroff(dev);</div><div class='del'>-			suspend_report_result(ops-&gt;poweroff, error);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='add'>+		return ops-&gt;poweroff;</div><div class='ctx'> 	case PM_EVENT_THAW:</div><div class='ctx'> 	case PM_EVENT_RECOVER:</div><div class='del'>-		if (ops-&gt;thaw) {</div><div class='del'>-			error = ops-&gt;thaw(dev);</div><div class='del'>-			suspend_report_result(ops-&gt;thaw, error);</div><div class='del'>-		}</div><div class='add'>+		return ops-&gt;thaw;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PM_EVENT_RESTORE:</div><div class='del'>-		if (ops-&gt;restore) {</div><div class='del'>-			error = ops-&gt;restore(dev);</div><div class='del'>-			suspend_report_result(ops-&gt;restore, error);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='add'>+		return ops-&gt;restore;</div><div class='ctx'> #endif /* CONFIG_HIBERNATE_CALLBACKS */</div><div class='del'>-	default:</div><div class='del'>-		error = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	initcall_debug_report(dev, calltime, error);</div><div class='del'>-</div><div class='del'>-	return error;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * pm_noirq_op - Execute the PM operation appropriate for given PM event.</div><div class='del'>- * @dev: Device to handle.</div><div class='add'>+ * pm_noirq_op - Return the PM operation appropriate for given PM event.</div><div class='ctx'>  * @ops: PM operations to choose from.</div><div class='ctx'>  * @state: PM transition of the system being carried out.</div><div class='ctx'>  *</div><div class='ctx'>  * The driver of @dev will not receive interrupts while this function is being</div><div class='ctx'>  * executed.</div><div class='ctx'>  */</div><div class='del'>-static int pm_noirq_op(struct device *dev,</div><div class='del'>-			const struct dev_pm_ops *ops,</div><div class='del'>-			pm_message_t state)</div><div class='add'>+static pm_callback_t pm_noirq_op(const struct dev_pm_ops *ops, pm_message_t state)</div><div class='ctx'> {</div><div class='del'>-	int error = 0;</div><div class='del'>-	ktime_t calltime = ktime_set(0, 0), delta, rettime;</div><div class='del'>-</div><div class='del'>-	if (initcall_debug) {</div><div class='del'>-		pr_info("calling  %s+ @ %i, parent: %s\n",</div><div class='del'>-				dev_name(dev), task_pid_nr(current),</div><div class='del'>-				dev-&gt;parent ? dev_name(dev-&gt;parent) : "none");</div><div class='del'>-		calltime = ktime_get();</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	switch (state.event) {</div><div class='ctx'> #ifdef CONFIG_SUSPEND</div><div class='ctx'> 	case PM_EVENT_SUSPEND:</div><div class='del'>-		if (ops-&gt;suspend_noirq) {</div><div class='del'>-			error = ops-&gt;suspend_noirq(dev);</div><div class='del'>-			suspend_report_result(ops-&gt;suspend_noirq, error);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='add'>+		return ops-&gt;suspend_noirq;</div><div class='ctx'> 	case PM_EVENT_RESUME:</div><div class='del'>-		if (ops-&gt;resume_noirq) {</div><div class='del'>-			error = ops-&gt;resume_noirq(dev);</div><div class='del'>-			suspend_report_result(ops-&gt;resume_noirq, error);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='add'>+		return ops-&gt;resume_noirq;</div><div class='ctx'> #endif /* CONFIG_SUSPEND */</div><div class='ctx'> #ifdef CONFIG_HIBERNATE_CALLBACKS</div><div class='ctx'> 	case PM_EVENT_FREEZE:</div><div class='ctx'> 	case PM_EVENT_QUIESCE:</div><div class='del'>-		if (ops-&gt;freeze_noirq) {</div><div class='del'>-			error = ops-&gt;freeze_noirq(dev);</div><div class='del'>-			suspend_report_result(ops-&gt;freeze_noirq, error);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='add'>+		return ops-&gt;freeze_noirq;</div><div class='ctx'> 	case PM_EVENT_HIBERNATE:</div><div class='del'>-		if (ops-&gt;poweroff_noirq) {</div><div class='del'>-			error = ops-&gt;poweroff_noirq(dev);</div><div class='del'>-			suspend_report_result(ops-&gt;poweroff_noirq, error);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='add'>+		return ops-&gt;poweroff_noirq;</div><div class='ctx'> 	case PM_EVENT_THAW:</div><div class='ctx'> 	case PM_EVENT_RECOVER:</div><div class='del'>-		if (ops-&gt;thaw_noirq) {</div><div class='del'>-			error = ops-&gt;thaw_noirq(dev);</div><div class='del'>-			suspend_report_result(ops-&gt;thaw_noirq, error);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='add'>+		return ops-&gt;thaw_noirq;</div><div class='ctx'> 	case PM_EVENT_RESTORE:</div><div class='del'>-		if (ops-&gt;restore_noirq) {</div><div class='del'>-			error = ops-&gt;restore_noirq(dev);</div><div class='del'>-			suspend_report_result(ops-&gt;restore_noirq, error);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='add'>+		return ops-&gt;restore_noirq;</div><div class='ctx'> #endif /* CONFIG_HIBERNATE_CALLBACKS */</div><div class='del'>-	default:</div><div class='del'>-		error = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (initcall_debug) {</div><div class='del'>-		rettime = ktime_get();</div><div class='del'>-		delta = ktime_sub(rettime, calltime);</div><div class='del'>-		printk("initcall %s_i+ returned %d after %Ld usecs\n",</div><div class='del'>-			dev_name(dev), error,</div><div class='del'>-			(unsigned long long)ktime_to_ns(delta) &gt;&gt; 10);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return error;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static char *pm_verb(int event)</div><div class='hunk'>@@ -413,6 +334,26 @@ static void dpm_show_time(ktime_t starttime, pm_message_t state, char *info)</div><div class='ctx'> 		usecs / USEC_PER_MSEC, usecs % USEC_PER_MSEC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dpm_run_callback(pm_callback_t cb, struct device *dev,</div><div class='add'>+			    pm_message_t state, char *info)</div><div class='add'>+{</div><div class='add'>+	ktime_t calltime;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	if (!cb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	calltime = initcall_debug_start(dev);</div><div class='add'>+</div><div class='add'>+	pm_dev_dbg(dev, state, info);</div><div class='add'>+	error = cb(dev);</div><div class='add'>+	suspend_report_result(cb, error);</div><div class='add'>+</div><div class='add'>+	initcall_debug_report(dev, calltime, error);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*------------------------- Resume routines -------------------------*/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -425,25 +366,34 @@ static void dpm_show_time(ktime_t starttime, pm_message_t state, char *info)</div><div class='ctx'>  */</div><div class='ctx'> static int device_resume_noirq(struct device *dev, pm_message_t state)</div><div class='ctx'> {</div><div class='add'>+	pm_callback_t callback = NULL;</div><div class='add'>+	char *info = NULL;</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> </div><div class='ctx'> 	TRACE_DEVICE(dev);</div><div class='ctx'> 	TRACE_RESUME(0);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;pm_domain) {</div><div class='del'>-		pm_dev_dbg(dev, state, "EARLY power domain ");</div><div class='del'>-		error = pm_noirq_op(dev, &amp;dev-&gt;pm_domain-&gt;ops, state);</div><div class='add'>+		info = "EARLY power domain ";</div><div class='add'>+		callback = pm_noirq_op(&amp;dev-&gt;pm_domain-&gt;ops, state);</div><div class='ctx'> 	} else if (dev-&gt;type &amp;&amp; dev-&gt;type-&gt;pm) {</div><div class='del'>-		pm_dev_dbg(dev, state, "EARLY type ");</div><div class='del'>-		error = pm_noirq_op(dev, dev-&gt;type-&gt;pm, state);</div><div class='add'>+		info = "EARLY type ";</div><div class='add'>+		callback = pm_noirq_op(dev-&gt;type-&gt;pm, state);</div><div class='ctx'> 	} else if (dev-&gt;class &amp;&amp; dev-&gt;class-&gt;pm) {</div><div class='del'>-		pm_dev_dbg(dev, state, "EARLY class ");</div><div class='del'>-		error = pm_noirq_op(dev, dev-&gt;class-&gt;pm, state);</div><div class='add'>+		info = "EARLY class ";</div><div class='add'>+		callback = pm_noirq_op(dev-&gt;class-&gt;pm, state);</div><div class='ctx'> 	} else if (dev-&gt;bus &amp;&amp; dev-&gt;bus-&gt;pm) {</div><div class='del'>-		pm_dev_dbg(dev, state, "EARLY ");</div><div class='del'>-		error = pm_noirq_op(dev, dev-&gt;bus-&gt;pm, state);</div><div class='add'>+		info = "EARLY bus ";</div><div class='add'>+		callback = pm_noirq_op(dev-&gt;bus-&gt;pm, state);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!callback &amp;&amp; dev-&gt;driver &amp;&amp; dev-&gt;driver-&gt;pm) {</div><div class='add'>+		info = "EARLY driver ";</div><div class='add'>+		callback = pm_noirq_op(dev-&gt;driver-&gt;pm, state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	error = dpm_run_callback(callback, dev, state, info);</div><div class='add'>+</div><div class='ctx'> 	TRACE_RESUME(error);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -486,26 +436,6 @@ void dpm_resume_noirq(pm_message_t state)</div><div class='ctx'> EXPORT_SYMBOL_GPL(dpm_resume_noirq);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * legacy_resume - Execute a legacy (bus or class) resume callback for device.</div><div class='del'>- * @dev: Device to resume.</div><div class='del'>- * @cb: Resume callback to execute.</div><div class='del'>- */</div><div class='del'>-static int legacy_resume(struct device *dev, int (*cb)(struct device *dev))</div><div class='del'>-{</div><div class='del'>-	int error;</div><div class='del'>-	ktime_t calltime;</div><div class='del'>-</div><div class='del'>-	calltime = initcall_debug_start(dev);</div><div class='del'>-</div><div class='del'>-	error = cb(dev);</div><div class='del'>-	suspend_report_result(cb, error);</div><div class='del'>-</div><div class='del'>-	initcall_debug_report(dev, calltime, error);</div><div class='del'>-</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * device_resume - Execute "resume" callbacks for given device.</div><div class='ctx'>  * @dev: Device to handle.</div><div class='ctx'>  * @state: PM transition of the system being carried out.</div><div class='hunk'>@@ -513,6 +443,8 @@ static int legacy_resume(struct device *dev, int (*cb)(struct device *dev))</div><div class='ctx'>  */</div><div class='ctx'> static int device_resume(struct device *dev, pm_message_t state, bool async)</div><div class='ctx'> {</div><div class='add'>+	pm_callback_t callback = NULL;</div><div class='add'>+	char *info = NULL;</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> 	bool put = false;</div><div class='ctx'> </div><div class='hunk'>@@ -535,40 +467,48 @@ static int device_resume(struct device *dev, pm_message_t state, bool async)</div><div class='ctx'> 	put = true;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;pm_domain) {</div><div class='del'>-		pm_dev_dbg(dev, state, "power domain ");</div><div class='del'>-		error = pm_op(dev, &amp;dev-&gt;pm_domain-&gt;ops, state);</div><div class='del'>-		goto End;</div><div class='add'>+		info = "power domain ";</div><div class='add'>+		callback = pm_op(&amp;dev-&gt;pm_domain-&gt;ops, state);</div><div class='add'>+		goto Driver;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;type &amp;&amp; dev-&gt;type-&gt;pm) {</div><div class='del'>-		pm_dev_dbg(dev, state, "type ");</div><div class='del'>-		error = pm_op(dev, dev-&gt;type-&gt;pm, state);</div><div class='del'>-		goto End;</div><div class='add'>+		info = "type ";</div><div class='add'>+		callback = pm_op(dev-&gt;type-&gt;pm, state);</div><div class='add'>+		goto Driver;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;class) {</div><div class='ctx'> 		if (dev-&gt;class-&gt;pm) {</div><div class='del'>-			pm_dev_dbg(dev, state, "class ");</div><div class='del'>-			error = pm_op(dev, dev-&gt;class-&gt;pm, state);</div><div class='del'>-			goto End;</div><div class='add'>+			info = "class ";</div><div class='add'>+			callback = pm_op(dev-&gt;class-&gt;pm, state);</div><div class='add'>+			goto Driver;</div><div class='ctx'> 		} else if (dev-&gt;class-&gt;resume) {</div><div class='del'>-			pm_dev_dbg(dev, state, "legacy class ");</div><div class='del'>-			error = legacy_resume(dev, dev-&gt;class-&gt;resume);</div><div class='add'>+			info = "legacy class ";</div><div class='add'>+			callback = dev-&gt;class-&gt;resume;</div><div class='ctx'> 			goto End;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;bus) {</div><div class='ctx'> 		if (dev-&gt;bus-&gt;pm) {</div><div class='del'>-			pm_dev_dbg(dev, state, "");</div><div class='del'>-			error = pm_op(dev, dev-&gt;bus-&gt;pm, state);</div><div class='add'>+			info = "bus ";</div><div class='add'>+			callback = pm_op(dev-&gt;bus-&gt;pm, state);</div><div class='ctx'> 		} else if (dev-&gt;bus-&gt;resume) {</div><div class='del'>-			pm_dev_dbg(dev, state, "legacy ");</div><div class='del'>-			error = legacy_resume(dev, dev-&gt;bus-&gt;resume);</div><div class='add'>+			info = "legacy bus ";</div><div class='add'>+			callback = dev-&gt;bus-&gt;resume;</div><div class='add'>+			goto End;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+ Driver:</div><div class='add'>+	if (!callback &amp;&amp; dev-&gt;driver &amp;&amp; dev-&gt;driver-&gt;pm) {</div><div class='add'>+		info = "driver ";</div><div class='add'>+		callback = pm_op(dev-&gt;driver-&gt;pm, state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'>  End:</div><div class='add'>+	error = dpm_run_callback(callback, dev, state, info);</div><div class='ctx'> 	dev-&gt;power.is_suspended = false;</div><div class='ctx'> </div><div class='ctx'>  Unlock:</div><div class='hunk'>@@ -660,24 +600,33 @@ void dpm_resume(pm_message_t state)</div><div class='ctx'>  */</div><div class='ctx'> static void device_complete(struct device *dev, pm_message_t state)</div><div class='ctx'> {</div><div class='add'>+	void (*callback)(struct device *) = NULL;</div><div class='add'>+	char *info = NULL;</div><div class='add'>+</div><div class='ctx'> 	device_lock(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;pm_domain) {</div><div class='del'>-		pm_dev_dbg(dev, state, "completing power domain ");</div><div class='del'>-		if (dev-&gt;pm_domain-&gt;ops.complete)</div><div class='del'>-			dev-&gt;pm_domain-&gt;ops.complete(dev);</div><div class='add'>+		info = "completing power domain ";</div><div class='add'>+		callback = dev-&gt;pm_domain-&gt;ops.complete;</div><div class='ctx'> 	} else if (dev-&gt;type &amp;&amp; dev-&gt;type-&gt;pm) {</div><div class='del'>-		pm_dev_dbg(dev, state, "completing type ");</div><div class='del'>-		if (dev-&gt;type-&gt;pm-&gt;complete)</div><div class='del'>-			dev-&gt;type-&gt;pm-&gt;complete(dev);</div><div class='add'>+		info = "completing type ";</div><div class='add'>+		callback = dev-&gt;type-&gt;pm-&gt;complete;</div><div class='ctx'> 	} else if (dev-&gt;class &amp;&amp; dev-&gt;class-&gt;pm) {</div><div class='del'>-		pm_dev_dbg(dev, state, "completing class ");</div><div class='del'>-		if (dev-&gt;class-&gt;pm-&gt;complete)</div><div class='del'>-			dev-&gt;class-&gt;pm-&gt;complete(dev);</div><div class='add'>+		info = "completing class ";</div><div class='add'>+		callback = dev-&gt;class-&gt;pm-&gt;complete;</div><div class='ctx'> 	} else if (dev-&gt;bus &amp;&amp; dev-&gt;bus-&gt;pm) {</div><div class='del'>-		pm_dev_dbg(dev, state, "completing ");</div><div class='del'>-		if (dev-&gt;bus-&gt;pm-&gt;complete)</div><div class='del'>-			dev-&gt;bus-&gt;pm-&gt;complete(dev);</div><div class='add'>+		info = "completing bus ";</div><div class='add'>+		callback = dev-&gt;bus-&gt;pm-&gt;complete;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!callback &amp;&amp; dev-&gt;driver &amp;&amp; dev-&gt;driver-&gt;pm) {</div><div class='add'>+		info = "completing driver ";</div><div class='add'>+		callback = dev-&gt;driver-&gt;pm-&gt;complete;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (callback) {</div><div class='add'>+		pm_dev_dbg(dev, state, info);</div><div class='add'>+		callback(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	device_unlock(dev);</div><div class='hunk'>@@ -763,31 +712,29 @@ static pm_message_t resume_event(pm_message_t sleep_state)</div><div class='ctx'>  */</div><div class='ctx'> static int device_suspend_noirq(struct device *dev, pm_message_t state)</div><div class='ctx'> {</div><div class='del'>-	int error;</div><div class='add'>+	pm_callback_t callback = NULL;</div><div class='add'>+	char *info = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;pm_domain) {</div><div class='del'>-		pm_dev_dbg(dev, state, "LATE power domain ");</div><div class='del'>-		error = pm_noirq_op(dev, &amp;dev-&gt;pm_domain-&gt;ops, state);</div><div class='del'>-		if (error)</div><div class='del'>-			return error;</div><div class='add'>+		info = "LATE power domain ";</div><div class='add'>+		callback = pm_noirq_op(&amp;dev-&gt;pm_domain-&gt;ops, state);</div><div class='ctx'> 	} else if (dev-&gt;type &amp;&amp; dev-&gt;type-&gt;pm) {</div><div class='del'>-		pm_dev_dbg(dev, state, "LATE type ");</div><div class='del'>-		error = pm_noirq_op(dev, dev-&gt;type-&gt;pm, state);</div><div class='del'>-		if (error)</div><div class='del'>-			return error;</div><div class='add'>+		info = "LATE type ";</div><div class='add'>+		callback = pm_noirq_op(dev-&gt;type-&gt;pm, state);</div><div class='ctx'> 	} else if (dev-&gt;class &amp;&amp; dev-&gt;class-&gt;pm) {</div><div class='del'>-		pm_dev_dbg(dev, state, "LATE class ");</div><div class='del'>-		error = pm_noirq_op(dev, dev-&gt;class-&gt;pm, state);</div><div class='del'>-		if (error)</div><div class='del'>-			return error;</div><div class='add'>+		info = "LATE class ";</div><div class='add'>+		callback = pm_noirq_op(dev-&gt;class-&gt;pm, state);</div><div class='ctx'> 	} else if (dev-&gt;bus &amp;&amp; dev-&gt;bus-&gt;pm) {</div><div class='del'>-		pm_dev_dbg(dev, state, "LATE ");</div><div class='del'>-		error = pm_noirq_op(dev, dev-&gt;bus-&gt;pm, state);</div><div class='del'>-		if (error)</div><div class='del'>-			return error;</div><div class='add'>+		info = "LATE bus ";</div><div class='add'>+		callback = pm_noirq_op(dev-&gt;bus-&gt;pm, state);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	if (!callback &amp;&amp; dev-&gt;driver &amp;&amp; dev-&gt;driver-&gt;pm) {</div><div class='add'>+		info = "LATE driver ";</div><div class='add'>+		callback = pm_noirq_op(dev-&gt;driver-&gt;pm, state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dpm_run_callback(callback, dev, state, info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -864,6 +811,8 @@ static int legacy_suspend(struct device *dev, pm_message_t state,</div><div class='ctx'>  */</div><div class='ctx'> static int __device_suspend(struct device *dev, pm_message_t state, bool async)</div><div class='ctx'> {</div><div class='add'>+	pm_callback_t callback = NULL;</div><div class='add'>+	char *info = NULL;</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> </div><div class='ctx'> 	dpm_wait_for_children(dev, async);</div><div class='hunk'>@@ -884,22 +833,22 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)</div><div class='ctx'> 	device_lock(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;pm_domain) {</div><div class='del'>-		pm_dev_dbg(dev, state, "power domain ");</div><div class='del'>-		error = pm_op(dev, &amp;dev-&gt;pm_domain-&gt;ops, state);</div><div class='del'>-		goto End;</div><div class='add'>+		info = "power domain ";</div><div class='add'>+		callback = pm_op(&amp;dev-&gt;pm_domain-&gt;ops, state);</div><div class='add'>+		goto Run;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;type &amp;&amp; dev-&gt;type-&gt;pm) {</div><div class='del'>-		pm_dev_dbg(dev, state, "type ");</div><div class='del'>-		error = pm_op(dev, dev-&gt;type-&gt;pm, state);</div><div class='del'>-		goto End;</div><div class='add'>+		info = "type ";</div><div class='add'>+		callback = pm_op(dev-&gt;type-&gt;pm, state);</div><div class='add'>+		goto Run;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;class) {</div><div class='ctx'> 		if (dev-&gt;class-&gt;pm) {</div><div class='del'>-			pm_dev_dbg(dev, state, "class ");</div><div class='del'>-			error = pm_op(dev, dev-&gt;class-&gt;pm, state);</div><div class='del'>-			goto End;</div><div class='add'>+			info = "class ";</div><div class='add'>+			callback = pm_op(dev-&gt;class-&gt;pm, state);</div><div class='add'>+			goto Run;</div><div class='ctx'> 		} else if (dev-&gt;class-&gt;suspend) {</div><div class='ctx'> 			pm_dev_dbg(dev, state, "legacy class ");</div><div class='ctx'> 			error = legacy_suspend(dev, state, dev-&gt;class-&gt;suspend);</div><div class='hunk'>@@ -909,14 +858,23 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;bus) {</div><div class='ctx'> 		if (dev-&gt;bus-&gt;pm) {</div><div class='del'>-			pm_dev_dbg(dev, state, "");</div><div class='del'>-			error = pm_op(dev, dev-&gt;bus-&gt;pm, state);</div><div class='add'>+			info = "bus ";</div><div class='add'>+			callback = pm_op(dev-&gt;bus-&gt;pm, state);</div><div class='ctx'> 		} else if (dev-&gt;bus-&gt;suspend) {</div><div class='del'>-			pm_dev_dbg(dev, state, "legacy ");</div><div class='add'>+			pm_dev_dbg(dev, state, "legacy bus ");</div><div class='ctx'> 			error = legacy_suspend(dev, state, dev-&gt;bus-&gt;suspend);</div><div class='add'>+			goto End;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+ Run:</div><div class='add'>+	if (!callback &amp;&amp; dev-&gt;driver &amp;&amp; dev-&gt;driver-&gt;pm) {</div><div class='add'>+		info = "driver ";</div><div class='add'>+		callback = pm_op(dev-&gt;driver-&gt;pm, state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	error = dpm_run_callback(callback, dev, state, info);</div><div class='add'>+</div><div class='ctx'>  End:</div><div class='ctx'> 	if (!error) {</div><div class='ctx'> 		dev-&gt;power.is_suspended = true;</div><div class='hunk'>@@ -1022,6 +980,8 @@ int dpm_suspend(pm_message_t state)</div><div class='ctx'>  */</div><div class='ctx'> static int device_prepare(struct device *dev, pm_message_t state)</div><div class='ctx'> {</div><div class='add'>+	int (*callback)(struct device *) = NULL;</div><div class='add'>+	char *info = NULL;</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> </div><div class='ctx'> 	device_lock(dev);</div><div class='hunk'>@@ -1029,34 +989,29 @@ static int device_prepare(struct device *dev, pm_message_t state)</div><div class='ctx'> 	dev-&gt;power.wakeup_path = device_may_wakeup(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;pm_domain) {</div><div class='del'>-		pm_dev_dbg(dev, state, "preparing power domain ");</div><div class='del'>-		if (dev-&gt;pm_domain-&gt;ops.prepare)</div><div class='del'>-			error = dev-&gt;pm_domain-&gt;ops.prepare(dev);</div><div class='del'>-		suspend_report_result(dev-&gt;pm_domain-&gt;ops.prepare, error);</div><div class='del'>-		if (error)</div><div class='del'>-			goto End;</div><div class='add'>+		info = "preparing power domain ";</div><div class='add'>+		callback = dev-&gt;pm_domain-&gt;ops.prepare;</div><div class='ctx'> 	} else if (dev-&gt;type &amp;&amp; dev-&gt;type-&gt;pm) {</div><div class='del'>-		pm_dev_dbg(dev, state, "preparing type ");</div><div class='del'>-		if (dev-&gt;type-&gt;pm-&gt;prepare)</div><div class='del'>-			error = dev-&gt;type-&gt;pm-&gt;prepare(dev);</div><div class='del'>-		suspend_report_result(dev-&gt;type-&gt;pm-&gt;prepare, error);</div><div class='del'>-		if (error)</div><div class='del'>-			goto End;</div><div class='add'>+		info = "preparing type ";</div><div class='add'>+		callback = dev-&gt;type-&gt;pm-&gt;prepare;</div><div class='ctx'> 	} else if (dev-&gt;class &amp;&amp; dev-&gt;class-&gt;pm) {</div><div class='del'>-		pm_dev_dbg(dev, state, "preparing class ");</div><div class='del'>-		if (dev-&gt;class-&gt;pm-&gt;prepare)</div><div class='del'>-			error = dev-&gt;class-&gt;pm-&gt;prepare(dev);</div><div class='del'>-		suspend_report_result(dev-&gt;class-&gt;pm-&gt;prepare, error);</div><div class='del'>-		if (error)</div><div class='del'>-			goto End;</div><div class='add'>+		info = "preparing class ";</div><div class='add'>+		callback = dev-&gt;class-&gt;pm-&gt;prepare;</div><div class='ctx'> 	} else if (dev-&gt;bus &amp;&amp; dev-&gt;bus-&gt;pm) {</div><div class='del'>-		pm_dev_dbg(dev, state, "preparing ");</div><div class='del'>-		if (dev-&gt;bus-&gt;pm-&gt;prepare)</div><div class='del'>-			error = dev-&gt;bus-&gt;pm-&gt;prepare(dev);</div><div class='del'>-		suspend_report_result(dev-&gt;bus-&gt;pm-&gt;prepare, error);</div><div class='add'>+		info = "preparing bus ";</div><div class='add'>+		callback = dev-&gt;bus-&gt;pm-&gt;prepare;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!callback &amp;&amp; dev-&gt;driver &amp;&amp; dev-&gt;driver-&gt;pm) {</div><div class='add'>+		info = "preparing driver ";</div><div class='add'>+		callback = dev-&gt;driver-&gt;pm-&gt;prepare;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (callback) {</div><div class='add'>+		error = callback(dev);</div><div class='add'>+		suspend_report_result(callback, error);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>- End:</div><div class='ctx'> 	device_unlock(dev);</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='head'>diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c<br/>index 86de6c50fc41..c5d358837461 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/power/qos.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/power/qos.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/power/qos.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/power/qos.c</a></div><div class='hunk'>@@ -47,21 +47,29 @@ static DEFINE_MUTEX(dev_pm_qos_mtx);</div><div class='ctx'> static BLOCKING_NOTIFIER_HEAD(dev_pm_notifiers);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * dev_pm_qos_read_value - Get PM QoS constraint for a given device.</div><div class='add'>+ * __dev_pm_qos_read_value - Get PM QoS constraint for a given device.</div><div class='add'>+ * @dev: Device to get the PM QoS constraint value for.</div><div class='add'>+ *</div><div class='add'>+ * This routine must be called with dev-&gt;power.lock held.</div><div class='add'>+ */</div><div class='add'>+s32 __dev_pm_qos_read_value(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct pm_qos_constraints *c = dev-&gt;power.constraints;</div><div class='add'>+</div><div class='add'>+	return c ? pm_qos_read_value(c) : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_pm_qos_read_value - Get PM QoS constraint for a given device (locked).</div><div class='ctx'>  * @dev: Device to get the PM QoS constraint value for.</div><div class='ctx'>  */</div><div class='ctx'> s32 dev_pm_qos_read_value(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct pm_qos_constraints *c;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	s32 ret = 0;</div><div class='add'>+	s32 ret;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;dev-&gt;power.lock, flags);</div><div class='del'>-</div><div class='del'>-	c = dev-&gt;power.constraints;</div><div class='del'>-	if (c)</div><div class='del'>-		ret = pm_qos_read_value(c);</div><div class='del'>-</div><div class='add'>+	ret = __dev_pm_qos_read_value(dev);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;dev-&gt;power.lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -412,3 +420,28 @@ int dev_pm_qos_remove_global_notifier(struct notifier_block *notifier)</div><div class='ctx'> 	return blocking_notifier_chain_unregister(&amp;dev_pm_notifiers, notifier);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(dev_pm_qos_remove_global_notifier);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dev_pm_qos_add_ancestor_request - Add PM QoS request for device's ancestor.</div><div class='add'>+ * @dev: Device whose ancestor to add the request for.</div><div class='add'>+ * @req: Pointer to the preallocated handle.</div><div class='add'>+ * @value: Constraint latency value.</div><div class='add'>+ */</div><div class='add'>+int dev_pm_qos_add_ancestor_request(struct device *dev,</div><div class='add'>+				    struct dev_pm_qos_request *req, s32 value)</div><div class='add'>+{</div><div class='add'>+	struct device *ancestor = dev-&gt;parent;</div><div class='add'>+	int error = -ENODEV;</div><div class='add'>+</div><div class='add'>+	while (ancestor &amp;&amp; !ancestor-&gt;power.ignore_children)</div><div class='add'>+		ancestor = ancestor-&gt;parent;</div><div class='add'>+</div><div class='add'>+	if (ancestor)</div><div class='add'>+		error = dev_pm_qos_add_request(ancestor, req, value);</div><div class='add'>+</div><div class='add'>+	if (error)</div><div class='add'>+		req-&gt;dev = NULL;</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_pm_qos_add_ancestor_request);</div><div class='head'>diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c<br/>index 8c78443bca8f..541f821d4ea6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/power/runtime.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/power/runtime.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/power/runtime.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/power/runtime.c</a></div><div class='hunk'>@@ -250,6 +250,9 @@ static int rpm_idle(struct device *dev, int rpmflags)</div><div class='ctx'> 	else</div><div class='ctx'> 		callback = NULL;</div><div class='ctx'> </div><div class='add'>+	if (!callback &amp;&amp; dev-&gt;driver &amp;&amp; dev-&gt;driver-&gt;pm)</div><div class='add'>+		callback = dev-&gt;driver-&gt;pm-&gt;runtime_idle;</div><div class='add'>+</div><div class='ctx'> 	if (callback)</div><div class='ctx'> 		__rpm_callback(callback, dev);</div><div class='ctx'> </div><div class='hunk'>@@ -279,6 +282,47 @@ static int rpm_callback(int (*cb)(struct device *), struct device *dev)</div><div class='ctx'> 	return retval != -EACCES ? retval : -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct rpm_qos_data {</div><div class='add'>+	ktime_t time_now;</div><div class='add'>+	s64 constraint_ns;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rpm_update_qos_constraint - Update a given PM QoS constraint data.</div><div class='add'>+ * @dev: Device whose timing data to use.</div><div class='add'>+ * @data: PM QoS constraint data to update.</div><div class='add'>+ *</div><div class='add'>+ * Use the suspend timing data of @dev to update PM QoS constraint data pointed</div><div class='add'>+ * to by @data.</div><div class='add'>+ */</div><div class='add'>+static int rpm_update_qos_constraint(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct rpm_qos_data *qos = data;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	s64 delta_ns;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dev-&gt;power.lock, flags);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;power.max_time_suspended_ns &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	delta_ns = dev-&gt;power.max_time_suspended_ns -</div><div class='add'>+		ktime_to_ns(ktime_sub(qos-&gt;time_now, dev-&gt;power.suspend_time));</div><div class='add'>+	if (delta_ns &lt;= 0) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (qos-&gt;constraint_ns &gt; delta_ns || qos-&gt;constraint_ns == 0)</div><div class='add'>+		qos-&gt;constraint_ns = delta_ns;</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev-&gt;power.lock, flags);</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'>  * rpm_suspend - Carry out runtime suspend of given device.</div><div class='ctx'>  * @dev: Device to suspend.</div><div class='hunk'>@@ -305,6 +349,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)</div><div class='ctx'> {</div><div class='ctx'> 	int (*callback)(struct device *);</div><div class='ctx'> 	struct device *parent = NULL;</div><div class='add'>+	struct rpm_qos_data qos;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	trace_rpm_suspend(dev, rpmflags);</div><div class='hunk'>@@ -400,8 +445,38 @@ static int rpm_suspend(struct device *dev, int rpmflags)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	qos.constraint_ns = __dev_pm_qos_read_value(dev);</div><div class='add'>+	if (qos.constraint_ns &lt; 0) {</div><div class='add'>+		/* Negative constraint means "never suspend". */</div><div class='add'>+		retval = -EPERM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	qos.constraint_ns *= NSEC_PER_USEC;</div><div class='add'>+	qos.time_now = ktime_get();</div><div class='add'>+</div><div class='ctx'> 	__update_runtime_status(dev, RPM_SUSPENDING);</div><div class='ctx'> </div><div class='add'>+	if (!dev-&gt;power.ignore_children) {</div><div class='add'>+		if (dev-&gt;power.irq_safe)</div><div class='add'>+			spin_unlock(&amp;dev-&gt;power.lock);</div><div class='add'>+		else</div><div class='add'>+			spin_unlock_irq(&amp;dev-&gt;power.lock);</div><div class='add'>+</div><div class='add'>+		retval = device_for_each_child(dev, &amp;qos,</div><div class='add'>+					       rpm_update_qos_constraint);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;power.irq_safe)</div><div class='add'>+			spin_lock(&amp;dev-&gt;power.lock);</div><div class='add'>+		else</div><div class='add'>+			spin_lock_irq(&amp;dev-&gt;power.lock);</div><div class='add'>+</div><div class='add'>+		if (retval)</div><div class='add'>+			goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;power.suspend_time = qos.time_now;</div><div class='add'>+	dev-&gt;power.max_time_suspended_ns = qos.constraint_ns ? : -1;</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;pm_domain)</div><div class='ctx'> 		callback = dev-&gt;pm_domain-&gt;ops.runtime_suspend;</div><div class='ctx'> 	else if (dev-&gt;type &amp;&amp; dev-&gt;type-&gt;pm)</div><div class='hunk'>@@ -413,28 +488,13 @@ static int rpm_suspend(struct device *dev, int rpmflags)</div><div class='ctx'> 	else</div><div class='ctx'> 		callback = NULL;</div><div class='ctx'> </div><div class='add'>+	if (!callback &amp;&amp; dev-&gt;driver &amp;&amp; dev-&gt;driver-&gt;pm)</div><div class='add'>+		callback = dev-&gt;driver-&gt;pm-&gt;runtime_suspend;</div><div class='add'>+</div><div class='ctx'> 	retval = rpm_callback(callback, dev);</div><div class='del'>-	if (retval) {</div><div class='del'>-		__update_runtime_status(dev, RPM_ACTIVE);</div><div class='del'>-		dev-&gt;power.deferred_resume = false;</div><div class='del'>-		if (retval == -EAGAIN || retval == -EBUSY) {</div><div class='del'>-			dev-&gt;power.runtime_error = 0;</div><div class='add'>+	if (retval)</div><div class='add'>+		goto fail;</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			 * If the callback routine failed an autosuspend, and</div><div class='del'>-			 * if the last_busy time has been updated so that there</div><div class='del'>-			 * is a new autosuspend expiration time, automatically</div><div class='del'>-			 * reschedule another autosuspend.</div><div class='del'>-			 */</div><div class='del'>-			if ((rpmflags &amp; RPM_AUTO) &amp;&amp;</div><div class='del'>-			    pm_runtime_autosuspend_expiration(dev) != 0)</div><div class='del'>-				goto repeat;</div><div class='del'>-		} else {</div><div class='del'>-			pm_runtime_cancel_pending(dev);</div><div class='del'>-		}</div><div class='del'>-		wake_up_all(&amp;dev-&gt;power.wait_queue);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='ctx'>  no_callback:</div><div class='ctx'> 	__update_runtime_status(dev, RPM_SUSPENDED);</div><div class='ctx'> 	pm_runtime_deactivate_timer(dev);</div><div class='hunk'>@@ -466,6 +526,29 @@ static int rpm_suspend(struct device *dev, int rpmflags)</div><div class='ctx'> 	trace_rpm_return_int(dev, _THIS_IP_, retval);</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='add'>+</div><div class='add'>+ fail:</div><div class='add'>+	__update_runtime_status(dev, RPM_ACTIVE);</div><div class='add'>+	dev-&gt;power.suspend_time = ktime_set(0, 0);</div><div class='add'>+	dev-&gt;power.max_time_suspended_ns = -1;</div><div class='add'>+	dev-&gt;power.deferred_resume = false;</div><div class='add'>+	if (retval == -EAGAIN || retval == -EBUSY) {</div><div class='add'>+		dev-&gt;power.runtime_error = 0;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If the callback routine failed an autosuspend, and</div><div class='add'>+		 * if the last_busy time has been updated so that there</div><div class='add'>+		 * is a new autosuspend expiration time, automatically</div><div class='add'>+		 * reschedule another autosuspend.</div><div class='add'>+		 */</div><div class='add'>+		if ((rpmflags &amp; RPM_AUTO) &amp;&amp;</div><div class='add'>+		    pm_runtime_autosuspend_expiration(dev) != 0)</div><div class='add'>+			goto repeat;</div><div class='add'>+	} else {</div><div class='add'>+		pm_runtime_cancel_pending(dev);</div><div class='add'>+	}</div><div class='add'>+	wake_up_all(&amp;dev-&gt;power.wait_queue);</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -620,6 +703,9 @@ static int rpm_resume(struct device *dev, int rpmflags)</div><div class='ctx'> 	if (dev-&gt;power.no_callbacks)</div><div class='ctx'> 		goto no_callback;	/* Assume success. */</div><div class='ctx'> </div><div class='add'>+	dev-&gt;power.suspend_time = ktime_set(0, 0);</div><div class='add'>+	dev-&gt;power.max_time_suspended_ns = -1;</div><div class='add'>+</div><div class='ctx'> 	__update_runtime_status(dev, RPM_RESUMING);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;pm_domain)</div><div class='hunk'>@@ -633,6 +719,9 @@ static int rpm_resume(struct device *dev, int rpmflags)</div><div class='ctx'> 	else</div><div class='ctx'> 		callback = NULL;</div><div class='ctx'> </div><div class='add'>+	if (!callback &amp;&amp; dev-&gt;driver &amp;&amp; dev-&gt;driver-&gt;pm)</div><div class='add'>+		callback = dev-&gt;driver-&gt;pm-&gt;runtime_resume;</div><div class='add'>+</div><div class='ctx'> 	retval = rpm_callback(callback, dev);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		__update_runtime_status(dev, RPM_SUSPENDED);</div><div class='hunk'>@@ -1279,6 +1368,9 @@ void pm_runtime_init(struct device *dev)</div><div class='ctx'> 	setup_timer(&amp;dev-&gt;power.suspend_timer, pm_suspend_timer_fn,</div><div class='ctx'> 			(unsigned long)dev);</div><div class='ctx'> </div><div class='add'>+	dev-&gt;power.suspend_time = ktime_set(0, 0);</div><div class='add'>+	dev-&gt;power.max_time_suspended_ns = -1;</div><div class='add'>+</div><div class='ctx'> 	init_waitqueue_head(&amp;dev-&gt;power.wait_queue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1296,3 +1388,28 @@ void pm_runtime_remove(struct device *dev)</div><div class='ctx'> 	if (dev-&gt;power.irq_safe &amp;&amp; dev-&gt;parent)</div><div class='ctx'> 		pm_runtime_put_sync(dev-&gt;parent);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pm_runtime_update_max_time_suspended - Update device's suspend time data.</div><div class='add'>+ * @dev: Device to handle.</div><div class='add'>+ * @delta_ns: Value to subtract from the device's max_time_suspended_ns field.</div><div class='add'>+ *</div><div class='add'>+ * Update the device's power.max_time_suspended_ns field by subtracting</div><div class='add'>+ * @delta_ns from it.  The resulting value of power.max_time_suspended_ns is</div><div class='add'>+ * never negative.</div><div class='add'>+ */</div><div class='add'>+void pm_runtime_update_max_time_suspended(struct device *dev, s64 delta_ns)</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;power.lock, flags);</div><div class='add'>+</div><div class='add'>+	if (delta_ns &gt; 0 &amp;&amp; dev-&gt;power.max_time_suspended_ns &gt; 0) {</div><div class='add'>+		if (dev-&gt;power.max_time_suspended_ns &gt; delta_ns)</div><div class='add'>+			dev-&gt;power.max_time_suspended_ns -= delta_ns;</div><div class='add'>+		else</div><div class='add'>+			dev-&gt;power.max_time_suspended_ns = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev-&gt;power.lock, flags);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig<br/>index 2fc6a66f39a4..0f6c7fb418e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/regmap/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/regmap/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/regmap/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/regmap/Kconfig</a></div><div class='hunk'>@@ -13,3 +13,6 @@ config REGMAP_I2C</div><div class='ctx'> </div><div class='ctx'> config REGMAP_SPI</div><div class='ctx'> 	tristate</div><div class='add'>+</div><div class='add'>+config REGMAP_IRQ</div><div class='add'>+	bool</div><div class='head'>diff --git a/drivers/base/regmap/Makefile b/drivers/base/regmap/Makefile<br/>index 0573c8a9dacb..defd57963c84 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/regmap/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/regmap/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/regmap/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/regmap/Makefile</a></div><div class='hunk'>@@ -1,4 +1,6 @@</div><div class='del'>-obj-$(CONFIG_REGMAP) += regmap.o regcache.o regcache-indexed.o regcache-rbtree.o regcache-lzo.o</div><div class='add'>+obj-$(CONFIG_REGMAP) += regmap.o regcache.o</div><div class='add'>+obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o</div><div class='ctx'> obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o</div><div class='ctx'> obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o</div><div class='ctx'> obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o</div><div class='add'>+obj-$(CONFIG_REGMAP_IRQ) += regmap-irq.o</div><div class='head'>diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h<br/>index 348ff02eb93e..1a02b7537c8b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/regmap/internal.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/regmap/internal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/regmap/internal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/regmap/internal.h</a></div><div class='hunk'>@@ -74,6 +74,7 @@ struct regmap {</div><div class='ctx'> 	struct reg_default *reg_defaults;</div><div class='ctx'> 	const void *reg_defaults_raw;</div><div class='ctx'> 	void *cache;</div><div class='add'>+	bool cache_dirty;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct regcache_ops {</div><div class='hunk'>@@ -105,7 +106,7 @@ static inline void regmap_debugfs_exit(struct regmap *map) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* regcache core declarations */</div><div class='del'>-int regcache_init(struct regmap *map);</div><div class='add'>+int regcache_init(struct regmap *map, const struct regmap_config *config);</div><div class='ctx'> void regcache_exit(struct regmap *map);</div><div class='ctx'> int regcache_read(struct regmap *map,</div><div class='ctx'> 		       unsigned int reg, unsigned int *value);</div><div class='hunk'>@@ -118,10 +119,7 @@ unsigned int regcache_get_val(const void *base, unsigned int idx,</div><div class='ctx'> bool regcache_set_val(void *base, unsigned int idx,</div><div class='ctx'> 		      unsigned int val, unsigned int word_size);</div><div class='ctx'> int regcache_lookup_reg(struct regmap *map, unsigned int reg);</div><div class='del'>-int regcache_insert_reg(struct regmap *map, unsigned int reg,</div><div class='del'>-			unsigned int val);</div><div class='ctx'> </div><div class='del'>-extern struct regcache_ops regcache_indexed_ops;</div><div class='ctx'> extern struct regcache_ops regcache_rbtree_ops;</div><div class='ctx'> extern struct regcache_ops regcache_lzo_ops;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/regmap/regcache-indexed.c b/drivers/base/regmap/regcache-indexed.c<br/>deleted file mode 100644<br/>index 507731ad8ec1..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/regmap/regcache-indexed.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/regmap/regcache-indexed.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,64 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Register cache access API - indexed 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='del'>-</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include "internal.h"</div><div class='del'>-</div><div class='del'>-static int regcache_indexed_read(struct regmap *map, unsigned int reg,</div><div class='del'>-				 unsigned int *value)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = regcache_lookup_reg(map, reg);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		*value = map-&gt;reg_defaults[ret].def;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int regcache_indexed_write(struct regmap *map, unsigned int reg,</div><div class='del'>-				  unsigned int value)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = regcache_lookup_reg(map, reg);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return regcache_insert_reg(map, reg, value);</div><div class='del'>-	map-&gt;reg_defaults[ret].def = value;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int regcache_indexed_sync(struct regmap *map)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; map-&gt;num_reg_defaults; i++) {</div><div class='del'>-		ret = _regmap_write(map, map-&gt;reg_defaults[i].reg,</div><div class='del'>-				    map-&gt;reg_defaults[i].def);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-		dev_dbg(map-&gt;dev, "Synced register %#x, value %#x\n",</div><div class='del'>-			map-&gt;reg_defaults[i].reg,</div><div class='del'>-			map-&gt;reg_defaults[i].def);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct regcache_ops regcache_indexed_ops = {</div><div class='del'>-	.type = REGCACHE_INDEXED,</div><div class='del'>-	.name = "indexed",</div><div class='del'>-	.read = regcache_indexed_read,</div><div class='del'>-	.write = regcache_indexed_write,</div><div class='del'>-	.sync = regcache_indexed_sync</div><div class='del'>-};</div><div class='head'>diff --git a/drivers/base/regmap/regcache-lzo.c b/drivers/base/regmap/regcache-lzo.c<br/>index 066aeece3626..b7d16143edeb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/regmap/regcache-lzo.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/regmap/regcache-lzo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/regmap/regcache-lzo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/regmap/regcache-lzo.c</a></div><div class='hunk'>@@ -15,6 +15,8 @@</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='add'>+static int regcache_lzo_exit(struct regmap *map);</div><div class='add'>+</div><div class='ctx'> struct regcache_lzo_ctx {</div><div class='ctx'> 	void *wmem;</div><div class='ctx'> 	void *dst;</div><div class='hunk'>@@ -27,7 +29,7 @@ struct regcache_lzo_ctx {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define LZO_BLOCK_NUM 8</div><div class='del'>-static int regcache_lzo_block_count(void)</div><div class='add'>+static int regcache_lzo_block_count(struct regmap *map)</div><div class='ctx'> {</div><div class='ctx'> 	return LZO_BLOCK_NUM;</div><div class='ctx'> }</div><div class='hunk'>@@ -106,19 +108,22 @@ static inline int regcache_lzo_get_blkindex(struct regmap *map,</div><div class='ctx'> 					    unsigned int reg)</div><div class='ctx'> {</div><div class='ctx'> 	return (reg * map-&gt;cache_word_size) /</div><div class='del'>-		DIV_ROUND_UP(map-&gt;cache_size_raw, regcache_lzo_block_count());</div><div class='add'>+		DIV_ROUND_UP(map-&gt;cache_size_raw,</div><div class='add'>+			     regcache_lzo_block_count(map));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int regcache_lzo_get_blkpos(struct regmap *map,</div><div class='ctx'> 					  unsigned int reg)</div><div class='ctx'> {</div><div class='del'>-	return reg % (DIV_ROUND_UP(map-&gt;cache_size_raw, regcache_lzo_block_count()) /</div><div class='add'>+	return reg % (DIV_ROUND_UP(map-&gt;cache_size_raw,</div><div class='add'>+				   regcache_lzo_block_count(map)) /</div><div class='ctx'> 		      map-&gt;cache_word_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int regcache_lzo_get_blksize(struct regmap *map)</div><div class='ctx'> {</div><div class='del'>-	return DIV_ROUND_UP(map-&gt;cache_size_raw, regcache_lzo_block_count());</div><div class='add'>+	return DIV_ROUND_UP(map-&gt;cache_size_raw,</div><div class='add'>+			    regcache_lzo_block_count(map));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int regcache_lzo_init(struct regmap *map)</div><div class='hunk'>@@ -131,7 +136,7 @@ static int regcache_lzo_init(struct regmap *map)</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='del'>-	blkcount = regcache_lzo_block_count();</div><div class='add'>+	blkcount = regcache_lzo_block_count(map);</div><div class='ctx'> 	map-&gt;cache = kzalloc(blkcount * sizeof *lzo_blocks,</div><div class='ctx'> 			     GFP_KERNEL);</div><div class='ctx'> 	if (!map-&gt;cache)</div><div class='hunk'>@@ -190,7 +195,7 @@ static int regcache_lzo_init(struct regmap *map)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> err:</div><div class='del'>-	regcache_exit(map);</div><div class='add'>+	regcache_lzo_exit(map);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -203,7 +208,7 @@ static int regcache_lzo_exit(struct regmap *map)</div><div class='ctx'> 	if (!lzo_blocks)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	blkcount = regcache_lzo_block_count();</div><div class='add'>+	blkcount = regcache_lzo_block_count(map);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * the pointer to the bitmap used for syncing the cache</div><div class='ctx'> 	 * is shared amongst all lzo_blocks.  Ensure it is freed</div><div class='hunk'>@@ -351,7 +356,7 @@ static int regcache_lzo_sync(struct regmap *map)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct regcache_ops regcache_lzo_ops = {</div><div class='del'>-	.type = REGCACHE_LZO,</div><div class='add'>+	.type = REGCACHE_COMPRESSED,</div><div class='ctx'> 	.name = "lzo",</div><div class='ctx'> 	.init = regcache_lzo_init,</div><div class='ctx'> 	.exit = regcache_lzo_exit,</div><div class='head'>diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c<br/>index e31498499b0f..32620c4f1683 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/regmap/regcache-rbtree.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/regmap/regcache-rbtree.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/regmap/regcache-rbtree.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/regmap/regcache-rbtree.c</a></div><div class='hunk'>@@ -11,12 +11,15 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='ctx'> static int regcache_rbtree_write(struct regmap *map, unsigned int reg,</div><div class='ctx'> 				 unsigned int value);</div><div class='add'>+static int regcache_rbtree_exit(struct regmap *map);</div><div class='ctx'> </div><div class='ctx'> struct regcache_rbtree_node {</div><div class='ctx'> 	/* the actual rbtree node holding this block */</div><div class='hunk'>@@ -124,6 +127,60 @@ static int regcache_rbtree_insert(struct rb_root *root,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='add'>+static int rbtree_show(struct seq_file *s, void *ignored)</div><div class='add'>+{</div><div class='add'>+	struct regmap *map = s-&gt;private;</div><div class='add'>+	struct regcache_rbtree_ctx *rbtree_ctx = map-&gt;cache;</div><div class='add'>+	struct regcache_rbtree_node *n;</div><div class='add'>+	struct rb_node *node;</div><div class='add'>+	unsigned int base, top;</div><div class='add'>+	int nodes = 0;</div><div class='add'>+	int registers = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;map-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (node = rb_first(&amp;rbtree_ctx-&gt;root); node != NULL;</div><div class='add'>+	     node = rb_next(node)) {</div><div class='add'>+		n = container_of(node, struct regcache_rbtree_node, node);</div><div class='add'>+</div><div class='add'>+		regcache_rbtree_get_base_top_reg(n, &amp;base, &amp;top);</div><div class='add'>+		seq_printf(s, "%x-%x (%d)\n", base, top, top - base + 1);</div><div class='add'>+</div><div class='add'>+		nodes++;</div><div class='add'>+		registers += top - base + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	seq_printf(s, "%d nodes, %d registers, average %d registers\n",</div><div class='add'>+		   nodes, registers, registers / nodes);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;map-&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 rbtree_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, rbtree_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations rbtree_fops = {</div><div class='add'>+	.open		= rbtree_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void rbtree_debugfs_init(struct regmap *map)</div><div class='add'>+{</div><div class='add'>+	debugfs_create_file("rbtree", 0400, map-&gt;debugfs, map, &amp;rbtree_fops);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void rbtree_debugfs_init(struct regmap *map)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int regcache_rbtree_init(struct regmap *map)</div><div class='ctx'> {</div><div class='ctx'> 	struct regcache_rbtree_ctx *rbtree_ctx;</div><div class='hunk'>@@ -146,10 +203,12 @@ static int regcache_rbtree_init(struct regmap *map)</div><div class='ctx'> 			goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rbtree_debugfs_init(map);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	regcache_exit(map);</div><div class='add'>+	regcache_rbtree_exit(map);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c<br/>index 666f6f5011dc..1ead66186b7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/regmap/regcache.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/regmap/regcache.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/regmap/regcache.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/regmap/regcache.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> #include "internal.h"</div><div class='ctx'> </div><div class='ctx'> static const struct regcache_ops *cache_types[] = {</div><div class='del'>-	&amp;regcache_indexed_ops,</div><div class='ctx'> 	&amp;regcache_rbtree_ops,</div><div class='ctx'> 	&amp;regcache_lzo_ops,</div><div class='ctx'> };</div><div class='hunk'>@@ -61,8 +60,10 @@ static int regcache_hw_init(struct regmap *map)</div><div class='ctx'> </div><div class='ctx'> 	map-&gt;reg_defaults = kmalloc(count * sizeof(struct reg_default),</div><div class='ctx'> 				      GFP_KERNEL);</div><div class='del'>-	if (!map-&gt;reg_defaults)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (!map-&gt;reg_defaults) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* fill the reg_defaults */</div><div class='ctx'> 	map-&gt;num_reg_defaults = count;</div><div class='hunk'>@@ -77,9 +78,15 @@ static int regcache_hw_init(struct regmap *map)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_free:</div><div class='add'>+	if (map-&gt;cache_free)</div><div class='add'>+		kfree(map-&gt;reg_defaults_raw);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int regcache_init(struct regmap *map)</div><div class='add'>+int regcache_init(struct regmap *map, const struct regmap_config *config)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -100,6 +107,12 @@ int regcache_init(struct regmap *map)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	map-&gt;num_reg_defaults = config-&gt;num_reg_defaults;</div><div class='add'>+	map-&gt;num_reg_defaults_raw = config-&gt;num_reg_defaults_raw;</div><div class='add'>+	map-&gt;reg_defaults_raw = config-&gt;reg_defaults_raw;</div><div class='add'>+	map-&gt;cache_word_size = DIV_ROUND_UP(config-&gt;val_bits, 8);</div><div class='add'>+	map-&gt;cache_size_raw = map-&gt;cache_word_size * config-&gt;num_reg_defaults_raw;</div><div class='add'>+</div><div class='ctx'> 	map-&gt;cache = NULL;</div><div class='ctx'> 	map-&gt;cache_ops = cache_types[i];</div><div class='ctx'> </div><div class='hunk'>@@ -112,10 +125,10 @@ int regcache_init(struct regmap *map)</div><div class='ctx'> 	 * won't vanish from under us.  We'll need to make</div><div class='ctx'> 	 * a copy of it.</div><div class='ctx'> 	 */</div><div class='del'>-	if (map-&gt;reg_defaults) {</div><div class='add'>+	if (config-&gt;reg_defaults) {</div><div class='ctx'> 		if (!map-&gt;num_reg_defaults)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		tmp_buf = kmemdup(map-&gt;reg_defaults, map-&gt;num_reg_defaults *</div><div class='add'>+		tmp_buf = kmemdup(config-&gt;reg_defaults, map-&gt;num_reg_defaults *</div><div class='ctx'> 				  sizeof(struct reg_default), GFP_KERNEL);</div><div class='ctx'> 		if (!tmp_buf)</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -136,9 +149,18 @@ int regcache_init(struct regmap *map)</div><div class='ctx'> 	if (map-&gt;cache_ops-&gt;init) {</div><div class='ctx'> 		dev_dbg(map-&gt;dev, "Initializing %s cache\n",</div><div class='ctx'> 			map-&gt;cache_ops-&gt;name);</div><div class='del'>-		return map-&gt;cache_ops-&gt;init(map);</div><div class='add'>+		ret = map-&gt;cache_ops-&gt;init(map);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_free;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_free:</div><div class='add'>+	kfree(map-&gt;reg_defaults);</div><div class='add'>+	if (map-&gt;cache_free)</div><div class='add'>+		kfree(map-&gt;reg_defaults_raw);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void regcache_exit(struct regmap *map)</div><div class='hunk'>@@ -171,16 +193,21 @@ void regcache_exit(struct regmap *map)</div><div class='ctx'> int regcache_read(struct regmap *map,</div><div class='ctx'> 		  unsigned int reg, unsigned int *value)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	if (map-&gt;cache_type == REGCACHE_NONE)</div><div class='ctx'> 		return -ENOSYS;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!map-&gt;cache_ops);</div><div class='ctx'> </div><div class='del'>-	if (!regmap_readable(map, reg))</div><div class='del'>-		return -EIO;</div><div class='add'>+	if (!regmap_volatile(map, reg)) {</div><div class='add'>+		ret = map-&gt;cache_ops-&gt;read(map, reg, value);</div><div class='ctx'> </div><div class='del'>-	if (!regmap_volatile(map, reg))</div><div class='del'>-		return map-&gt;cache_ops-&gt;read(map, reg, value);</div><div class='add'>+		if (ret == 0)</div><div class='add'>+			trace_regmap_reg_read_cache(map-&gt;dev, reg, *value);</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='hunk'>@@ -241,6 +268,8 @@ int regcache_sync(struct regmap *map)</div><div class='ctx'> 		map-&gt;cache_ops-&gt;name);</div><div class='ctx'> 	name = map-&gt;cache_ops-&gt;name;</div><div class='ctx'> 	trace_regcache_sync(map-&gt;dev, name, "start");</div><div class='add'>+	if (!map-&gt;cache_dirty)</div><div class='add'>+		goto out;</div><div class='ctx'> 	if (map-&gt;cache_ops-&gt;sync) {</div><div class='ctx'> 		ret = map-&gt;cache_ops-&gt;sync(map);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -291,6 +320,23 @@ void regcache_cache_only(struct regmap *map, bool enable)</div><div class='ctx'> EXPORT_SYMBOL_GPL(regcache_cache_only);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * regcache_mark_dirty: Mark the register cache as dirty</div><div class='add'>+ *</div><div class='add'>+ * @map: map to mark</div><div class='add'>+ *</div><div class='add'>+ * Mark the register cache as dirty, for example due to the device</div><div class='add'>+ * having been powered down for suspend.  If the cache is not marked</div><div class='add'>+ * as dirty then the cache sync will be suppressed.</div><div class='add'>+ */</div><div class='add'>+void regcache_mark_dirty(struct regmap *map)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;map-&gt;lock);</div><div class='add'>+	map-&gt;cache_dirty = true;</div><div class='add'>+	mutex_unlock(&amp;map-&gt;lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(regcache_mark_dirty);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * regcache_cache_bypass: Put a register map into cache bypass mode</div><div class='ctx'>  *</div><div class='ctx'>  * @map: map to configure</div><div class='hunk'>@@ -381,22 +427,3 @@ int regcache_lookup_reg(struct regmap *map, unsigned int reg)</div><div class='ctx'> 	else</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-int regcache_insert_reg(struct regmap *map, unsigned int reg,</div><div class='del'>-			unsigned int val)</div><div class='del'>-{</div><div class='del'>-	void *tmp;</div><div class='del'>-</div><div class='del'>-	tmp = krealloc(map-&gt;reg_defaults,</div><div class='del'>-		       (map-&gt;num_reg_defaults + 1) * sizeof(struct reg_default),</div><div class='del'>-		       GFP_KERNEL);</div><div class='del'>-	if (!tmp)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	map-&gt;reg_defaults = tmp;</div><div class='del'>-	map-&gt;num_reg_defaults++;</div><div class='del'>-	map-&gt;reg_defaults[map-&gt;num_reg_defaults - 1].reg = reg;</div><div class='del'>-	map-&gt;reg_defaults[map-&gt;num_reg_defaults - 1].def = val;</div><div class='del'>-	sort(map-&gt;reg_defaults, map-&gt;num_reg_defaults,</div><div class='del'>-	     sizeof(struct reg_default), regcache_default_cmp, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c<br/>new file mode 100644<br/>index 000000000000..428836fc5835<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/regmap/regmap-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/regmap/regmap-irq.c</a></div><div class='hunk'>@@ -0,0 +1,302 @@</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='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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+struct regmap_irq_chip_data {</div><div class='add'>+	struct mutex lock;</div><div class='add'>+</div><div class='add'>+	struct regmap *map;</div><div class='add'>+	struct regmap_irq_chip *chip;</div><div class='add'>+</div><div class='add'>+	int irq_base;</div><div class='add'>+</div><div class='add'>+	void *status_reg_buf;</div><div class='add'>+	unsigned int *status_buf;</div><div class='add'>+	unsigned int *mask_buf;</div><div class='add'>+	unsigned int *mask_buf_def;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline const</div><div class='add'>+struct regmap_irq *irq_to_regmap_irq(struct regmap_irq_chip_data *data,</div><div class='add'>+				     int irq)</div><div class='add'>+{</div><div class='add'>+	return &amp;data-&gt;chip-&gt;irqs[irq - data-&gt;irq_base];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void regmap_irq_lock(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	struct regmap_irq_chip_data *d = irq_data_get_irq_chip_data(data);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;d-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void regmap_irq_sync_unlock(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	struct regmap_irq_chip_data *d = irq_data_get_irq_chip_data(data);</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If there's been a change in the mask write it back to the</div><div class='add'>+	 * hardware.  We rely on the use of the regmap core cache to</div><div class='add'>+	 * suppress pointless writes.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; d-&gt;chip-&gt;num_regs; i++) {</div><div class='add'>+		ret = regmap_update_bits(d-&gt;map, d-&gt;chip-&gt;mask_base + i,</div><div class='add'>+					 d-&gt;mask_buf_def[i], d-&gt;mask_buf[i]);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			dev_err(d-&gt;map-&gt;dev, "Failed to sync masks in %x\n",</div><div class='add'>+				d-&gt;chip-&gt;mask_base + i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;d-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void regmap_irq_enable(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	struct regmap_irq_chip_data *d = irq_data_get_irq_chip_data(data);</div><div class='add'>+	const struct regmap_irq *irq_data = irq_to_regmap_irq(d, data-&gt;irq);</div><div class='add'>+</div><div class='add'>+	d-&gt;mask_buf[irq_data-&gt;reg_offset] &amp;= ~irq_data-&gt;mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void regmap_irq_disable(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	struct regmap_irq_chip_data *d = irq_data_get_irq_chip_data(data);</div><div class='add'>+	const struct regmap_irq *irq_data = irq_to_regmap_irq(d, data-&gt;irq);</div><div class='add'>+</div><div class='add'>+	d-&gt;mask_buf[irq_data-&gt;reg_offset] |= irq_data-&gt;mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip regmap_irq_chip = {</div><div class='add'>+	.name			= "regmap",</div><div class='add'>+	.irq_bus_lock		= regmap_irq_lock,</div><div class='add'>+	.irq_bus_sync_unlock	= regmap_irq_sync_unlock,</div><div class='add'>+	.irq_disable		= regmap_irq_disable,</div><div class='add'>+	.irq_enable		= regmap_irq_enable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static irqreturn_t regmap_irq_thread(int irq, void *d)</div><div class='add'>+{</div><div class='add'>+	struct regmap_irq_chip_data *data = d;</div><div class='add'>+	struct regmap_irq_chip *chip = data-&gt;chip;</div><div class='add'>+	struct regmap *map = data-&gt;map;</div><div class='add'>+	int ret, i;</div><div class='add'>+	u8 *buf8 = data-&gt;status_reg_buf;</div><div class='add'>+	u16 *buf16 = data-&gt;status_reg_buf;</div><div class='add'>+	u32 *buf32 = data-&gt;status_reg_buf;</div><div class='add'>+	bool handled = false;</div><div class='add'>+</div><div class='add'>+	ret = regmap_bulk_read(map, chip-&gt;status_base, data-&gt;status_reg_buf,</div><div class='add'>+			       chip-&gt;num_regs);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_err(map-&gt;dev, "Failed to read IRQ status: %d\n", ret);</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ignore masked IRQs and ack if we need to; we ack early so</div><div class='add'>+	 * there is no race between handling and acknowleding the</div><div class='add'>+	 * interrupt.  We assume that typically few of the interrupts</div><div class='add'>+	 * will fire simultaneously so don't worry about overhead from</div><div class='add'>+	 * doing a write per register.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; data-&gt;chip-&gt;num_regs; i++) {</div><div class='add'>+		switch (map-&gt;format.val_bytes) {</div><div class='add'>+		case 1:</div><div class='add'>+			data-&gt;status_buf[i] = buf8[i];</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			data-&gt;status_buf[i] = buf16[i];</div><div class='add'>+			break;</div><div class='add'>+		case 4:</div><div class='add'>+			data-&gt;status_buf[i] = buf32[i];</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			BUG();</div><div class='add'>+			return IRQ_NONE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		data-&gt;status_buf[i] &amp;= ~data-&gt;mask_buf[i];</div><div class='add'>+</div><div class='add'>+		if (data-&gt;status_buf[i] &amp;&amp; chip-&gt;ack_base) {</div><div class='add'>+			ret = regmap_write(map, chip-&gt;ack_base + i,</div><div class='add'>+					   data-&gt;status_buf[i]);</div><div class='add'>+			if (ret != 0)</div><div class='add'>+				dev_err(map-&gt;dev, "Failed to ack 0x%x: %d\n",</div><div class='add'>+					chip-&gt;ack_base + i, ret);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;num_irqs; i++) {</div><div class='add'>+		if (data-&gt;status_buf[chip-&gt;irqs[i].reg_offset] &amp;</div><div class='add'>+		    chip-&gt;irqs[i].mask) {</div><div class='add'>+			handle_nested_irq(data-&gt;irq_base + i);</div><div class='add'>+			handled = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (handled)</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	else</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * regmap_add_irq_chip(): Use standard regmap IRQ controller handling</div><div class='add'>+ *</div><div class='add'>+ * map:       The regmap for the device.</div><div class='add'>+ * irq:       The IRQ the device uses to signal interrupts</div><div class='add'>+ * irq_flags: The IRQF_ flags to use for the primary interrupt.</div><div class='add'>+ * chip:      Configuration for the interrupt controller.</div><div class='add'>+ * data:      Runtime data structure for the controller, allocated on success</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success or an errno on failure.</div><div class='add'>+ *</div><div class='add'>+ * In order for this to be efficient the chip really should use a</div><div class='add'>+ * register cache.  The chip driver is responsible for restoring the</div><div class='add'>+ * register values used by the IRQ controller over suspend and resume.</div><div class='add'>+ */</div><div class='add'>+int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,</div><div class='add'>+			int irq_base, struct regmap_irq_chip *chip,</div><div class='add'>+			struct regmap_irq_chip_data **data)</div><div class='add'>+{</div><div class='add'>+	struct regmap_irq_chip_data *d;</div><div class='add'>+	int cur_irq, i;</div><div class='add'>+	int ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	irq_base = irq_alloc_descs(irq_base, 0, chip-&gt;num_irqs, 0);</div><div class='add'>+	if (irq_base &lt; 0) {</div><div class='add'>+		dev_warn(map-&gt;dev, "Failed to allocate IRQs: %d\n",</div><div class='add'>+			 irq_base);</div><div class='add'>+		return irq_base;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	d = kzalloc(sizeof(*d), GFP_KERNEL);</div><div class='add'>+	if (!d)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	d-&gt;status_buf = kzalloc(sizeof(unsigned int) * chip-&gt;num_regs,</div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+	if (!d-&gt;status_buf)</div><div class='add'>+		goto err_alloc;</div><div class='add'>+</div><div class='add'>+	d-&gt;status_reg_buf = kzalloc(map-&gt;format.val_bytes * chip-&gt;num_regs,</div><div class='add'>+				    GFP_KERNEL);</div><div class='add'>+	if (!d-&gt;status_reg_buf)</div><div class='add'>+		goto err_alloc;</div><div class='add'>+</div><div class='add'>+	d-&gt;mask_buf = kzalloc(sizeof(unsigned int) * chip-&gt;num_regs,</div><div class='add'>+			      GFP_KERNEL);</div><div class='add'>+	if (!d-&gt;mask_buf)</div><div class='add'>+		goto err_alloc;</div><div class='add'>+</div><div class='add'>+	d-&gt;mask_buf_def = kzalloc(sizeof(unsigned int) * chip-&gt;num_regs,</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (!d-&gt;mask_buf_def)</div><div class='add'>+		goto err_alloc;</div><div class='add'>+</div><div class='add'>+	d-&gt;map = map;</div><div class='add'>+	d-&gt;chip = chip;</div><div class='add'>+	d-&gt;irq_base = irq_base;</div><div class='add'>+	mutex_init(&amp;d-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;num_irqs; i++)</div><div class='add'>+		d-&gt;mask_buf_def[chip-&gt;irqs[i].reg_offset]</div><div class='add'>+			|= chip-&gt;irqs[i].mask;</div><div class='add'>+</div><div class='add'>+	/* Mask all the interrupts by default */</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;num_regs; i++) {</div><div class='add'>+		d-&gt;mask_buf[i] = d-&gt;mask_buf_def[i];</div><div class='add'>+		ret = regmap_write(map, chip-&gt;mask_base + i, d-&gt;mask_buf[i]);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			dev_err(map-&gt;dev, "Failed to set masks in 0x%x: %d\n",</div><div class='add'>+				chip-&gt;mask_base + i, ret);</div><div class='add'>+			goto err_alloc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register them with genirq */</div><div class='add'>+	for (cur_irq = irq_base;</div><div class='add'>+	     cur_irq &lt; chip-&gt;num_irqs + irq_base;</div><div class='add'>+	     cur_irq++) {</div><div class='add'>+		irq_set_chip_data(cur_irq, d);</div><div class='add'>+		irq_set_chip_and_handler(cur_irq, &amp;regmap_irq_chip,</div><div class='add'>+					 handle_edge_irq);</div><div class='add'>+		irq_set_nested_thread(cur_irq, 1);</div><div class='add'>+</div><div class='add'>+		/* ARM needs us to explicitly flag the IRQ as valid</div><div class='add'>+		 * and will set them noprobe when we do so. */</div><div class='add'>+#ifdef CONFIG_ARM</div><div class='add'>+		set_irq_flags(cur_irq, IRQF_VALID);</div><div class='add'>+#else</div><div class='add'>+		irq_set_noprobe(cur_irq);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = request_threaded_irq(irq, NULL, regmap_irq_thread, irq_flags,</div><div class='add'>+				   chip-&gt;name, d);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_err(map-&gt;dev, "Failed to request IRQ %d: %d\n", irq, ret);</div><div class='add'>+		goto err_alloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_alloc:</div><div class='add'>+	kfree(d-&gt;mask_buf_def);</div><div class='add'>+	kfree(d-&gt;mask_buf);</div><div class='add'>+	kfree(d-&gt;status_reg_buf);</div><div class='add'>+	kfree(d-&gt;status_buf);</div><div class='add'>+	kfree(d);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(regmap_add_irq_chip);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * regmap_del_irq_chip(): Stop interrupt handling for a regmap IRQ chip</div><div class='add'>+ *</div><div class='add'>+ * @irq: Primary IRQ for the device</div><div class='add'>+ * @d:   regmap_irq_chip_data allocated by regmap_add_irq_chip()</div><div class='add'>+ */</div><div class='add'>+void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *d)</div><div class='add'>+{</div><div class='add'>+	if (!d)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	free_irq(irq, d);</div><div class='add'>+	kfree(d-&gt;mask_buf_def);</div><div class='add'>+	kfree(d-&gt;mask_buf);</div><div class='add'>+	kfree(d-&gt;status_reg_buf);</div><div class='add'>+	kfree(d-&gt;status_buf);</div><div class='add'>+	kfree(d);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(regmap_del_irq_chip);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * regmap_irq_chip_get_base(): Retrieve interrupt base for a regmap IRQ chip</div><div class='add'>+ *</div><div class='add'>+ * Useful for drivers to request their own IRQs.</div><div class='add'>+ *</div><div class='add'>+ * @data: regmap_irq controller to operate on.</div><div class='add'>+ */</div><div class='add'>+int regmap_irq_chip_get_base(struct regmap_irq_chip_data *data)</div><div class='add'>+{</div><div class='add'>+	return data-&gt;irq_base;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(regmap_irq_chip_get_base);</div><div class='head'>diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c<br/>index bf441db1ee90..be10a4ff6609 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/regmap/regmap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/regmap/regmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/regmap/regmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/regmap/regmap.c</a></div><div class='hunk'>@@ -64,6 +64,18 @@ bool regmap_precious(struct regmap *map, unsigned int reg)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool regmap_volatile_range(struct regmap *map, unsigned int reg,</div><div class='add'>+	unsigned int num)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num; i++)</div><div class='add'>+		if (!regmap_volatile(map, reg + 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='ctx'> static void regmap_format_4_12_write(struct regmap *map,</div><div class='ctx'> 				     unsigned int reg, unsigned int val)</div><div class='ctx'> {</div><div class='hunk'>@@ -78,6 +90,16 @@ static void regmap_format_7_9_write(struct regmap *map,</div><div class='ctx'> 	*out = cpu_to_be16((reg &lt;&lt; 9) | val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void regmap_format_10_14_write(struct regmap *map,</div><div class='add'>+				    unsigned int reg, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	u8 *out = map-&gt;work_buf;</div><div class='add'>+</div><div class='add'>+	out[2] = val;</div><div class='add'>+	out[1] = (val &gt;&gt; 8) | (reg &lt;&lt; 6);</div><div class='add'>+	out[0] = reg &gt;&gt; 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void regmap_format_8(void *buf, unsigned int val)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *b = buf;</div><div class='hunk'>@@ -127,7 +149,7 @@ struct regmap *regmap_init(struct device *dev,</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!bus || !config)</div><div class='del'>-		return NULL;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	map = kzalloc(sizeof(*map), GFP_KERNEL);</div><div class='ctx'> 	if (map == NULL) {</div><div class='hunk'>@@ -147,12 +169,6 @@ struct regmap *regmap_init(struct device *dev,</div><div class='ctx'> 	map-&gt;volatile_reg = config-&gt;volatile_reg;</div><div class='ctx'> 	map-&gt;precious_reg = config-&gt;precious_reg;</div><div class='ctx'> 	map-&gt;cache_type = config-&gt;cache_type;</div><div class='del'>-	map-&gt;reg_defaults = config-&gt;reg_defaults;</div><div class='del'>-	map-&gt;num_reg_defaults = config-&gt;num_reg_defaults;</div><div class='del'>-	map-&gt;num_reg_defaults_raw = config-&gt;num_reg_defaults_raw;</div><div class='del'>-	map-&gt;reg_defaults_raw = config-&gt;reg_defaults_raw;</div><div class='del'>-	map-&gt;cache_size_raw = (config-&gt;val_bits / 8) * config-&gt;num_reg_defaults_raw;</div><div class='del'>-	map-&gt;cache_word_size = config-&gt;val_bits / 8;</div><div class='ctx'> </div><div class='ctx'> 	if (config-&gt;read_flag_mask || config-&gt;write_flag_mask) {</div><div class='ctx'> 		map-&gt;read_flag_mask = config-&gt;read_flag_mask;</div><div class='hunk'>@@ -182,6 +198,16 @@ struct regmap *regmap_init(struct device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case 10:</div><div class='add'>+		switch (config-&gt;val_bits) {</div><div class='add'>+		case 14:</div><div class='add'>+			map-&gt;format.format_write = regmap_format_10_14_write;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			goto err_map;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case 8:</div><div class='ctx'> 		map-&gt;format.format_reg = regmap_format_8;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -215,14 +241,16 @@ struct regmap *regmap_init(struct device *dev,</div><div class='ctx'> 		goto err_map;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = regcache_init(map);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err_map;</div><div class='del'>-</div><div class='ctx'> 	regmap_debugfs_init(map);</div><div class='ctx'> </div><div class='add'>+	ret = regcache_init(map, config);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_free_workbuf;</div><div class='add'>+</div><div class='ctx'> 	return map;</div><div class='ctx'> </div><div class='add'>+err_free_workbuf:</div><div class='add'>+	kfree(map-&gt;work_buf);</div><div class='ctx'> err_map:</div><div class='ctx'> 	kfree(map);</div><div class='ctx'> err:</div><div class='hunk'>@@ -231,6 +259,39 @@ err:</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_init);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * regmap_reinit_cache(): Reinitialise the current register cache</div><div class='add'>+ *</div><div class='add'>+ * @map: Register map to operate on.</div><div class='add'>+ * @config: New configuration.  Only the cache data will be used.</div><div class='add'>+ *</div><div class='add'>+ * Discard any existing register cache for the map and initialize a</div><div class='add'>+ * new cache.  This can be used to restore the cache to defaults or to</div><div class='add'>+ * update the cache configuration to reflect runtime discovery of the</div><div class='add'>+ * hardware.</div><div class='add'>+ */</div><div class='add'>+int regmap_reinit_cache(struct regmap *map, const struct regmap_config *config)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;map-&gt;lock);</div><div class='add'>+</div><div class='add'>+	regcache_exit(map);</div><div class='add'>+</div><div class='add'>+	map-&gt;max_register = config-&gt;max_register;</div><div class='add'>+	map-&gt;writeable_reg = config-&gt;writeable_reg;</div><div class='add'>+	map-&gt;readable_reg = config-&gt;readable_reg;</div><div class='add'>+	map-&gt;volatile_reg = config-&gt;volatile_reg;</div><div class='add'>+	map-&gt;precious_reg = config-&gt;precious_reg;</div><div class='add'>+	map-&gt;cache_type = config-&gt;cache_type;</div><div class='add'>+</div><div class='add'>+	ret = regcache_init(map, config);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;map-&gt;lock);</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='ctx'>  * regmap_exit(): Free a previously allocated register map</div><div class='ctx'>  */</div><div class='ctx'> void regmap_exit(struct regmap *map)</div><div class='hunk'>@@ -306,8 +367,10 @@ int _regmap_write(struct regmap *map, unsigned int reg,</div><div class='ctx'> 		ret = regcache_write(map, reg, val);</div><div class='ctx'> 		if (ret != 0)</div><div class='ctx'> 			return ret;</div><div class='del'>-		if (map-&gt;cache_only)</div><div class='add'>+		if (map-&gt;cache_only) {</div><div class='add'>+			map-&gt;cache_dirty = true;</div><div class='ctx'> 			return 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	trace_regmap_reg_write(map-&gt;dev, reg, val);</div><div class='hunk'>@@ -375,9 +438,11 @@ EXPORT_SYMBOL_GPL(regmap_write);</div><div class='ctx'> int regmap_raw_write(struct regmap *map, unsigned int reg,</div><div class='ctx'> 		     const void *val, size_t val_len)</div><div class='ctx'> {</div><div class='add'>+	size_t val_count = val_len / map-&gt;format.val_bytes;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(map-&gt;cache_type != REGCACHE_NONE);</div><div class='add'>+	WARN_ON(!regmap_volatile_range(map, reg, val_count) &amp;&amp;</div><div class='add'>+		map-&gt;cache_type != REGCACHE_NONE);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;map-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -422,15 +487,15 @@ static int _regmap_read(struct regmap *map, unsigned int reg,</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!map-&gt;format.parse_val)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	if (!map-&gt;cache_bypass) {</div><div class='ctx'> 		ret = regcache_read(map, reg, val);</div><div class='ctx'> 		if (ret == 0)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!map-&gt;format.parse_val)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (map-&gt;cache_only)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='hunk'>@@ -481,15 +546,11 @@ EXPORT_SYMBOL_GPL(regmap_read);</div><div class='ctx'> int regmap_raw_read(struct regmap *map, unsigned int reg, void *val,</div><div class='ctx'> 		    size_t val_len)</div><div class='ctx'> {</div><div class='add'>+	size_t val_count = val_len / map-&gt;format.val_bytes;</div><div class='ctx'> 	int ret;</div><div class='del'>-	int i;</div><div class='del'>-	bool vol = true;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; val_len / map-&gt;format.val_bytes; i++)</div><div class='del'>-		if (!regmap_volatile(map, reg + i))</div><div class='del'>-			vol = false;</div><div class='del'>-</div><div class='del'>-	WARN_ON(!vol &amp;&amp; map-&gt;cache_type != REGCACHE_NONE);</div><div class='add'>+	WARN_ON(!regmap_volatile_range(map, reg, val_count) &amp;&amp;</div><div class='add'>+		map-&gt;cache_type != REGCACHE_NONE);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;map-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -517,16 +578,11 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val,</div><div class='ctx'> {</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> 	size_t val_bytes = map-&gt;format.val_bytes;</div><div class='del'>-	bool vol = true;</div><div class='add'>+	bool vol = regmap_volatile_range(map, reg, val_count);</div><div class='ctx'> </div><div class='ctx'> 	if (!map-&gt;format.parse_val)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* Is this a block of volatile registers? */</div><div class='del'>-	for (i = 0; i &lt; val_count; i++)</div><div class='del'>-		if (!regmap_volatile(map, reg + i))</div><div class='del'>-			vol = false;</div><div class='del'>-</div><div class='ctx'> 	if (vol || map-&gt;cache_type == REGCACHE_NONE) {</div><div class='ctx'> 		ret = regmap_raw_read(map, reg, val, val_bytes * val_count);</div><div class='ctx'> 		if (ret != 0)</div><div class='hunk'>@@ -546,40 +602,73 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_bulk_read);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * remap_update_bits: Perform a read/modify/write cycle on the register map</div><div class='del'>- *</div><div class='del'>- * @map: Register map to update</div><div class='del'>- * @reg: Register to update</div><div class='del'>- * @mask: Bitmask to change</div><div class='del'>- * @val: New value for bitmask</div><div class='del'>- *</div><div class='del'>- * Returns zero for success, a negative number on error.</div><div class='del'>- */</div><div class='del'>-int regmap_update_bits(struct regmap *map, unsigned int reg,</div><div class='del'>-		       unsigned int mask, unsigned int val)</div><div class='add'>+static int _regmap_update_bits(struct regmap *map, unsigned int reg,</div><div class='add'>+			       unsigned int mask, unsigned int val,</div><div class='add'>+			       bool *change)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	unsigned int tmp;</div><div class='add'>+	unsigned int tmp, orig;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;map-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	ret = _regmap_read(map, reg, &amp;tmp);</div><div class='add'>+	ret = _regmap_read(map, reg, &amp;orig);</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	tmp &amp;= ~mask;</div><div class='add'>+	tmp = orig &amp; ~mask;</div><div class='ctx'> 	tmp |= val &amp; mask;</div><div class='ctx'> </div><div class='del'>-	ret = _regmap_write(map, reg, tmp);</div><div class='add'>+	if (tmp != orig) {</div><div class='add'>+		ret = _regmap_write(map, reg, tmp);</div><div class='add'>+		*change = true;</div><div class='add'>+	} else {</div><div class='add'>+		*change = false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;map-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * regmap_update_bits: Perform a read/modify/write cycle on the register map</div><div class='add'>+ *</div><div class='add'>+ * @map: Register map to update</div><div class='add'>+ * @reg: Register to update</div><div class='add'>+ * @mask: Bitmask to change</div><div class='add'>+ * @val: New value for bitmask</div><div class='add'>+ *</div><div class='add'>+ * Returns zero for success, a negative number on error.</div><div class='add'>+ */</div><div class='add'>+int regmap_update_bits(struct regmap *map, unsigned int reg,</div><div class='add'>+		       unsigned int mask, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	bool change;</div><div class='add'>+	return _regmap_update_bits(map, reg, mask, val, &amp;change);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(regmap_update_bits);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * regmap_update_bits_check: Perform a read/modify/write cycle on the</div><div class='add'>+ *                           register map and report if updated</div><div class='add'>+ *</div><div class='add'>+ * @map: Register map to update</div><div class='add'>+ * @reg: Register to update</div><div class='add'>+ * @mask: Bitmask to change</div><div class='add'>+ * @val: New value for bitmask</div><div class='add'>+ * @change: Boolean indicating if a write was done</div><div class='add'>+ *</div><div class='add'>+ * Returns zero for success, a negative number on error.</div><div class='add'>+ */</div><div class='add'>+int regmap_update_bits_check(struct regmap *map, unsigned int reg,</div><div class='add'>+			     unsigned int mask, unsigned int val,</div><div class='add'>+			     bool *change)</div><div class='add'>+{</div><div class='add'>+	return _regmap_update_bits(map, reg, mask, val, change);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(regmap_update_bits_check);</div><div class='add'>+</div><div class='ctx'> static int __init regmap_initcall(void)</div><div class='ctx'> {</div><div class='ctx'> 	regmap_debugfs_initcall();</div><div class='head'>diff --git a/drivers/base/sys.c b/drivers/base/sys.c<br/>index 9dff77bfe1e3..409f5ce78829 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/sys.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/sys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/sys.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/sys.c</a></div><div class='hunk'>@@ -126,7 +126,7 @@ void sysdev_class_remove_file(struct sysdev_class *c,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(sysdev_class_remove_file);</div><div class='ctx'> </div><div class='del'>-static struct kset *system_kset;</div><div class='add'>+extern struct kset *system_kset;</div><div class='ctx'> </div><div class='ctx'> int sysdev_class_register(struct sysdev_class *cls)</div><div class='ctx'> {</div><div class='hunk'>@@ -331,14 +331,6 @@ void sysdev_unregister(struct sys_device *sysdev)</div><div class='ctx'> EXPORT_SYMBOL_GPL(sysdev_register);</div><div class='ctx'> EXPORT_SYMBOL_GPL(sysdev_unregister);</div><div class='ctx'> </div><div class='del'>-int __init system_bus_init(void)</div><div class='del'>-{</div><div class='del'>-	system_kset = kset_create_and_add("system", NULL, &amp;devices_kset-&gt;kobj);</div><div class='del'>-	if (!system_kset)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define to_ext_attr(x) container_of(x, struct sysdev_ext_attribute, attr)</div><div class='ctx'> </div><div class='ctx'> ssize_t sysdev_store_ulong(struct sys_device *sysdev,</div><div class='head'>diff --git a/drivers/base/topology.c b/drivers/base/topology.c<br/>index f6f37a05a0c3..ae989c57cd5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/topology.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/base/topology.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/topology.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/base/topology.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='hunk'>@@ -32,14 +31,14 @@</div><div class='ctx'> #include &lt;linux/topology.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define define_one_ro_named(_name, _func)				\</div><div class='del'>-static SYSDEV_ATTR(_name, 0444, _func, NULL)</div><div class='add'>+	static DEVICE_ATTR(_name, 0444, _func, NULL)</div><div class='ctx'> </div><div class='ctx'> #define define_one_ro(_name)				\</div><div class='del'>-static SYSDEV_ATTR(_name, 0444, show_##_name, NULL)</div><div class='add'>+	static DEVICE_ATTR(_name, 0444, show_##_name, NULL)</div><div class='ctx'> </div><div class='ctx'> #define define_id_show_func(name)				\</div><div class='del'>-static ssize_t show_##name(struct sys_device *dev,		\</div><div class='del'>-		struct sysdev_attribute *attr, char *buf)	\</div><div class='add'>+static ssize_t show_##name(struct device *dev,			\</div><div class='add'>+		struct device_attribute *attr, char *buf)	\</div><div class='ctx'> {								\</div><div class='ctx'> 	unsigned int cpu = dev-&gt;id;				\</div><div class='ctx'> 	return sprintf(buf, "%d\n", topology_##name(cpu));	\</div><div class='hunk'>@@ -65,16 +64,16 @@ static ssize_t show_cpumap(int type, const struct cpumask *mask, char *buf)</div><div class='ctx'> </div><div class='ctx'> #ifdef arch_provides_topology_pointers</div><div class='ctx'> #define define_siblings_show_map(name)					\</div><div class='del'>-static ssize_t show_##name(struct sys_device *dev,			\</div><div class='del'>-			   struct sysdev_attribute *attr, char *buf)	\</div><div class='add'>+static ssize_t show_##name(struct device *dev,				\</div><div class='add'>+			   struct device_attribute *attr, char *buf)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	unsigned int cpu = dev-&gt;id;					\</div><div class='ctx'> 	return show_cpumap(0, topology_##name(cpu), buf);		\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define define_siblings_show_list(name)					\</div><div class='del'>-static ssize_t show_##name##_list(struct sys_device *dev,		\</div><div class='del'>-				  struct sysdev_attribute *attr,	\</div><div class='add'>+static ssize_t show_##name##_list(struct device *dev,			\</div><div class='add'>+				  struct device_attribute *attr,	\</div><div class='ctx'> 				  char *buf)				\</div><div class='ctx'> {									\</div><div class='ctx'> 	unsigned int cpu = dev-&gt;id;					\</div><div class='hunk'>@@ -83,15 +82,15 @@ static ssize_t show_##name##_list(struct sys_device *dev,		\</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> #define define_siblings_show_map(name)					\</div><div class='del'>-static ssize_t show_##name(struct sys_device *dev,			\</div><div class='del'>-			   struct sysdev_attribute *attr, char *buf)	\</div><div class='add'>+static ssize_t show_##name(struct device *dev,				\</div><div class='add'>+			   struct device_attribute *attr, char *buf)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	return show_cpumap(0, topology_##name(dev-&gt;id), buf);		\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define define_siblings_show_list(name)					\</div><div class='del'>-static ssize_t show_##name##_list(struct sys_device *dev,		\</div><div class='del'>-				  struct sysdev_attribute *attr,	\</div><div class='add'>+static ssize_t show_##name##_list(struct device *dev,			\</div><div class='add'>+				  struct device_attribute *attr,	\</div><div class='ctx'> 				  char *buf)				\</div><div class='ctx'> {									\</div><div class='ctx'> 	return show_cpumap(1, topology_##name(dev-&gt;id), buf);		\</div><div class='hunk'>@@ -124,16 +123,16 @@ define_one_ro_named(book_siblings_list, show_book_cpumask_list);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct attribute *default_attrs[] = {</div><div class='del'>-	&amp;attr_physical_package_id.attr,</div><div class='del'>-	&amp;attr_core_id.attr,</div><div class='del'>-	&amp;attr_thread_siblings.attr,</div><div class='del'>-	&amp;attr_thread_siblings_list.attr,</div><div class='del'>-	&amp;attr_core_siblings.attr,</div><div class='del'>-	&amp;attr_core_siblings_list.attr,</div><div class='add'>+	&amp;dev_attr_physical_package_id.attr,</div><div class='add'>+	&amp;dev_attr_core_id.attr,</div><div class='add'>+	&amp;dev_attr_thread_siblings.attr,</div><div class='add'>+	&amp;dev_attr_thread_siblings_list.attr,</div><div class='add'>+	&amp;dev_attr_core_siblings.attr,</div><div class='add'>+	&amp;dev_attr_core_siblings_list.attr,</div><div class='ctx'> #ifdef CONFIG_SCHED_BOOK</div><div class='del'>-	&amp;attr_book_id.attr,</div><div class='del'>-	&amp;attr_book_siblings.attr,</div><div class='del'>-	&amp;attr_book_siblings_list.attr,</div><div class='add'>+	&amp;dev_attr_book_id.attr,</div><div class='add'>+	&amp;dev_attr_book_siblings.attr,</div><div class='add'>+	&amp;dev_attr_book_siblings_list.attr,</div><div class='ctx'> #endif</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='hunk'>@@ -146,16 +145,16 @@ static struct attribute_group topology_attr_group = {</div><div class='ctx'> /* Add/Remove cpu_topology interface for CPU device */</div><div class='ctx'> static int __cpuinit topology_add_dev(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	struct sys_device *sys_dev = get_cpu_sysdev(cpu);</div><div class='add'>+	struct device *dev = get_cpu_device(cpu);</div><div class='ctx'> </div><div class='del'>-	return sysfs_create_group(&amp;sys_dev-&gt;kobj, &amp;topology_attr_group);</div><div class='add'>+	return sysfs_create_group(&amp;dev-&gt;kobj, &amp;topology_attr_group);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __cpuinit topology_remove_dev(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	struct sys_device *sys_dev = get_cpu_sysdev(cpu);</div><div class='add'>+	struct device *dev = get_cpu_device(cpu);</div><div class='ctx'> </div><div class='del'>-	sysfs_remove_group(&amp;sys_dev-&gt;kobj, &amp;topology_attr_group);</div><div class='add'>+	sysfs_remove_group(&amp;dev-&gt;kobj, &amp;topology_attr_group);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __cpuinit topology_cpu_callback(struct notifier_block *nfb,</div><div class='head'>diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h<br/>index 30a3085d3354..0def898a1d15 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bcma/bcma_private.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bcma/bcma_private.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bcma/bcma_private.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/bcma/bcma_private.h</a></div><div class='hunk'>@@ -18,6 +18,10 @@ void bcma_bus_unregister(struct bcma_bus *bus);</div><div class='ctx'> int __init bcma_bus_early_register(struct bcma_bus *bus,</div><div class='ctx'> 				   struct bcma_device *core_cc,</div><div class='ctx'> 				   struct bcma_device *core_mips);</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+int bcma_bus_suspend(struct bcma_bus *bus);</div><div class='add'>+int bcma_bus_resume(struct bcma_bus *bus);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* scan.c */</div><div class='ctx'> int bcma_bus_scan(struct bcma_bus *bus);</div><div class='head'>diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c<br/>index 1b51d8b7ac80..f59244e33971 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bcma/host_pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bcma/host_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bcma/host_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/bcma/host_pci.c</a></div><div class='hunk'>@@ -21,48 +21,58 @@ static void bcma_host_pci_switch_core(struct bcma_device *core)</div><div class='ctx'> 	pr_debug("Switched to core: 0x%X\n", core-&gt;id.id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 bcma_host_pci_read8(struct bcma_device *core, u16 offset)</div><div class='add'>+/* Provides access to the requested core. Returns base offset that has to be</div><div class='add'>+ * used. It makes use of fixed windows when possible. */</div><div class='add'>+static u16 bcma_host_pci_provide_access_to_core(struct bcma_device *core)</div><div class='ctx'> {</div><div class='add'>+	switch (core-&gt;id.id) {</div><div class='add'>+	case BCMA_CORE_CHIPCOMMON:</div><div class='add'>+		return 3 * BCMA_CORE_SIZE;</div><div class='add'>+	case BCMA_CORE_PCIE:</div><div class='add'>+		return 2 * BCMA_CORE_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (core-&gt;bus-&gt;mapped_core != core)</div><div class='ctx'> 		bcma_host_pci_switch_core(core);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 bcma_host_pci_read8(struct bcma_device *core, u16 offset)</div><div class='add'>+{</div><div class='add'>+	offset += bcma_host_pci_provide_access_to_core(core);</div><div class='ctx'> 	return ioread8(core-&gt;bus-&gt;mmio + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 bcma_host_pci_read16(struct bcma_device *core, u16 offset)</div><div class='ctx'> {</div><div class='del'>-	if (core-&gt;bus-&gt;mapped_core != core)</div><div class='del'>-		bcma_host_pci_switch_core(core);</div><div class='add'>+	offset += bcma_host_pci_provide_access_to_core(core);</div><div class='ctx'> 	return ioread16(core-&gt;bus-&gt;mmio + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 bcma_host_pci_read32(struct bcma_device *core, u16 offset)</div><div class='ctx'> {</div><div class='del'>-	if (core-&gt;bus-&gt;mapped_core != core)</div><div class='del'>-		bcma_host_pci_switch_core(core);</div><div class='add'>+	offset += bcma_host_pci_provide_access_to_core(core);</div><div class='ctx'> 	return ioread32(core-&gt;bus-&gt;mmio + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcma_host_pci_write8(struct bcma_device *core, u16 offset,</div><div class='ctx'> 				 u8 value)</div><div class='ctx'> {</div><div class='del'>-	if (core-&gt;bus-&gt;mapped_core != core)</div><div class='del'>-		bcma_host_pci_switch_core(core);</div><div class='add'>+	offset += bcma_host_pci_provide_access_to_core(core);</div><div class='ctx'> 	iowrite8(value, core-&gt;bus-&gt;mmio + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcma_host_pci_write16(struct bcma_device *core, u16 offset,</div><div class='ctx'> 				 u16 value)</div><div class='ctx'> {</div><div class='del'>-	if (core-&gt;bus-&gt;mapped_core != core)</div><div class='del'>-		bcma_host_pci_switch_core(core);</div><div class='add'>+	offset += bcma_host_pci_provide_access_to_core(core);</div><div class='ctx'> 	iowrite16(value, core-&gt;bus-&gt;mmio + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcma_host_pci_write32(struct bcma_device *core, u16 offset,</div><div class='ctx'> 				 u32 value)</div><div class='ctx'> {</div><div class='del'>-	if (core-&gt;bus-&gt;mapped_core != core)</div><div class='del'>-		bcma_host_pci_switch_core(core);</div><div class='add'>+	offset += bcma_host_pci_provide_access_to_core(core);</div><div class='ctx'> 	iowrite32(value, core-&gt;bus-&gt;mmio + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -224,6 +234,35 @@ static void bcma_host_pci_remove(struct pci_dev *dev)</div><div class='ctx'> 	pci_set_drvdata(dev, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int bcma_host_pci_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='add'>+	struct bcma_bus *bus = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	bus-&gt;mapped_core = NULL;</div><div class='add'>+</div><div class='add'>+	return bcma_bus_suspend(bus);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcma_host_pci_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='add'>+	struct bcma_bus *bus = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	return bcma_bus_resume(bus);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bcma_host_pci_suspend,</div><div class='add'>+			 bcma_host_pci_resume);</div><div class='add'>+#define BCMA_PM_OPS	(&amp;bcma_pm_ops)</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+#define BCMA_PM_OPS     NULL</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },</div><div class='hunk'>@@ -239,6 +278,7 @@ static struct pci_driver bcma_pci_bridge_driver = {</div><div class='ctx'> 	.id_table = bcma_pci_bridge_tbl,</div><div class='ctx'> 	.probe = bcma_host_pci_probe,</div><div class='ctx'> 	.remove = bcma_host_pci_remove,</div><div class='add'>+	.driver.pm = BCMA_PM_OPS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int __init bcma_host_pci_init(void)</div><div class='head'>diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c<br/>index 70c84b951098..febbc0a1222a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bcma/main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bcma/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bcma/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/bcma/main.c</a></div><div class='hunk'>@@ -240,6 +240,46 @@ int __init bcma_bus_early_register(struct bcma_bus *bus,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+int bcma_bus_suspend(struct bcma_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct bcma_device *core;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(core, &amp;bus-&gt;cores, list) {</div><div class='add'>+		struct device_driver *drv = core-&gt;dev.driver;</div><div class='add'>+		if (drv) {</div><div class='add'>+			struct bcma_driver *adrv = container_of(drv, struct bcma_driver, drv);</div><div class='add'>+			if (adrv-&gt;suspend)</div><div class='add'>+				adrv-&gt;suspend(core);</div><div 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 bcma_bus_resume(struct bcma_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct bcma_device *core;</div><div class='add'>+</div><div class='add'>+	/* Init CC core */</div><div class='add'>+	core = bcma_find_core(bus, BCMA_CORE_CHIPCOMMON);</div><div class='add'>+	if (core) {</div><div class='add'>+		bus-&gt;drv_cc.setup_done = false;</div><div class='add'>+		bcma_core_chipcommon_init(&amp;bus-&gt;drv_cc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(core, &amp;bus-&gt;cores, list) {</div><div class='add'>+		struct device_driver *drv = core-&gt;dev.driver;</div><div class='add'>+		if (drv) {</div><div class='add'>+			struct bcma_driver *adrv = container_of(drv, struct bcma_driver, drv);</div><div class='add'>+			if (adrv-&gt;resume)</div><div class='add'>+				adrv-&gt;resume(core);</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'>+#endif</div><div class='add'>+</div><div class='ctx'> int __bcma_driver_register(struct bcma_driver *drv, struct module *owner)</div><div class='ctx'> {</div><div class='ctx'> 	drv-&gt;drv.name = drv-&gt;name;</div><div class='head'>diff --git a/drivers/bcma/sprom.c b/drivers/bcma/sprom.c<br/>index d7292390d236..6f230fb087c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bcma/sprom.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bcma/sprom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bcma/sprom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/bcma/sprom.c</a></div><div class='hunk'>@@ -129,6 +129,9 @@ static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom)</div><div class='ctx'> 	u16 v;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	bus-&gt;sprom.revision = sprom[SSB_SPROMSIZE_WORDS_R4 - 1] &amp;</div><div class='add'>+		SSB_SPROM_REVISION_REV;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; 3; i++) {</div><div class='ctx'> 		v = sprom[SPOFF(SSB_SPROM8_IL0MAC) + i];</div><div class='ctx'> 		*(((__be16 *)bus-&gt;sprom.il0mac) + i) = cpu_to_be16(v);</div><div class='hunk'>@@ -136,12 +139,70 @@ static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom)</div><div class='ctx'> </div><div class='ctx'> 	bus-&gt;sprom.board_rev = sprom[SPOFF(SSB_SPROM8_BOARDREV)];</div><div class='ctx'> </div><div class='add'>+	bus-&gt;sprom.txpid2g[0] = (sprom[SPOFF(SSB_SPROM4_TXPID2G01)] &amp;</div><div class='add'>+	     SSB_SPROM4_TXPID2G0) &gt;&gt; SSB_SPROM4_TXPID2G0_SHIFT;</div><div class='add'>+	bus-&gt;sprom.txpid2g[1] = (sprom[SPOFF(SSB_SPROM4_TXPID2G01)] &amp;</div><div class='add'>+	     SSB_SPROM4_TXPID2G1) &gt;&gt; SSB_SPROM4_TXPID2G1_SHIFT;</div><div class='add'>+	bus-&gt;sprom.txpid2g[2] = (sprom[SPOFF(SSB_SPROM4_TXPID2G23)] &amp;</div><div class='add'>+	     SSB_SPROM4_TXPID2G2) &gt;&gt; SSB_SPROM4_TXPID2G2_SHIFT;</div><div class='add'>+	bus-&gt;sprom.txpid2g[3] = (sprom[SPOFF(SSB_SPROM4_TXPID2G23)] &amp;</div><div class='add'>+	     SSB_SPROM4_TXPID2G3) &gt;&gt; SSB_SPROM4_TXPID2G3_SHIFT;</div><div class='add'>+</div><div class='add'>+	bus-&gt;sprom.txpid5gl[0] = (sprom[SPOFF(SSB_SPROM4_TXPID5GL01)] &amp;</div><div class='add'>+	     SSB_SPROM4_TXPID5GL0) &gt;&gt; SSB_SPROM4_TXPID5GL0_SHIFT;</div><div class='add'>+	bus-&gt;sprom.txpid5gl[1] = (sprom[SPOFF(SSB_SPROM4_TXPID5GL01)] &amp;</div><div class='add'>+	     SSB_SPROM4_TXPID5GL1) &gt;&gt; SSB_SPROM4_TXPID5GL1_SHIFT;</div><div class='add'>+	bus-&gt;sprom.txpid5gl[2] = (sprom[SPOFF(SSB_SPROM4_TXPID5GL23)] &amp;</div><div class='add'>+	     SSB_SPROM4_TXPID5GL2) &gt;&gt; SSB_SPROM4_TXPID5GL2_SHIFT;</div><div class='add'>+	bus-&gt;sprom.txpid5gl[3] = (sprom[SPOFF(SSB_SPROM4_TXPID5GL23)] &amp;</div><div class='add'>+	     SSB_SPROM4_TXPID5GL3) &gt;&gt; SSB_SPROM4_TXPID5GL3_SHIFT;</div><div class='add'>+</div><div class='add'>+	bus-&gt;sprom.txpid5g[0] = (sprom[SPOFF(SSB_SPROM4_TXPID5G01)] &amp;</div><div class='add'>+	     SSB_SPROM4_TXPID5G0) &gt;&gt; SSB_SPROM4_TXPID5G0_SHIFT;</div><div class='add'>+	bus-&gt;sprom.txpid5g[1] = (sprom[SPOFF(SSB_SPROM4_TXPID5G01)] &amp;</div><div class='add'>+	     SSB_SPROM4_TXPID5G1) &gt;&gt; SSB_SPROM4_TXPID5G1_SHIFT;</div><div class='add'>+	bus-&gt;sprom.txpid5g[2] = (sprom[SPOFF(SSB_SPROM4_TXPID5G23)] &amp;</div><div class='add'>+	     SSB_SPROM4_TXPID5G2) &gt;&gt; SSB_SPROM4_TXPID5G2_SHIFT;</div><div class='add'>+	bus-&gt;sprom.txpid5g[3] = (sprom[SPOFF(SSB_SPROM4_TXPID5G23)] &amp;</div><div class='add'>+	     SSB_SPROM4_TXPID5G3) &gt;&gt; SSB_SPROM4_TXPID5G3_SHIFT;</div><div class='add'>+</div><div class='add'>+	bus-&gt;sprom.txpid5gh[0] = (sprom[SPOFF(SSB_SPROM4_TXPID5GH01)] &amp;</div><div class='add'>+	     SSB_SPROM4_TXPID5GH0) &gt;&gt; SSB_SPROM4_TXPID5GH0_SHIFT;</div><div class='add'>+	bus-&gt;sprom.txpid5gh[1] = (sprom[SPOFF(SSB_SPROM4_TXPID5GH01)] &amp;</div><div class='add'>+	     SSB_SPROM4_TXPID5GH1) &gt;&gt; SSB_SPROM4_TXPID5GH1_SHIFT;</div><div class='add'>+	bus-&gt;sprom.txpid5gh[2] = (sprom[SPOFF(SSB_SPROM4_TXPID5GH23)] &amp;</div><div class='add'>+	     SSB_SPROM4_TXPID5GH2) &gt;&gt; SSB_SPROM4_TXPID5GH2_SHIFT;</div><div class='add'>+	bus-&gt;sprom.txpid5gh[3] = (sprom[SPOFF(SSB_SPROM4_TXPID5GH23)] &amp;</div><div class='add'>+	     SSB_SPROM4_TXPID5GH3) &gt;&gt; SSB_SPROM4_TXPID5GH3_SHIFT;</div><div class='add'>+</div><div class='ctx'> 	bus-&gt;sprom.boardflags_lo = sprom[SPOFF(SSB_SPROM8_BFLLO)];</div><div class='ctx'> 	bus-&gt;sprom.boardflags_hi = sprom[SPOFF(SSB_SPROM8_BFLHI)];</div><div class='ctx'> 	bus-&gt;sprom.boardflags2_lo = sprom[SPOFF(SSB_SPROM8_BFL2LO)];</div><div class='ctx'> 	bus-&gt;sprom.boardflags2_hi = sprom[SPOFF(SSB_SPROM8_BFL2HI)];</div><div class='ctx'> </div><div class='ctx'> 	bus-&gt;sprom.country_code = sprom[SPOFF(SSB_SPROM8_CCODE)];</div><div class='add'>+</div><div class='add'>+	bus-&gt;sprom.fem.ghz2.tssipos = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &amp;</div><div class='add'>+		SSB_SROM8_FEM_TSSIPOS) &gt;&gt; SSB_SROM8_FEM_TSSIPOS_SHIFT;</div><div class='add'>+	bus-&gt;sprom.fem.ghz2.extpa_gain = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &amp;</div><div class='add'>+		SSB_SROM8_FEM_EXTPA_GAIN) &gt;&gt; SSB_SROM8_FEM_EXTPA_GAIN_SHIFT;</div><div class='add'>+	bus-&gt;sprom.fem.ghz2.pdet_range = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &amp;</div><div class='add'>+		SSB_SROM8_FEM_PDET_RANGE) &gt;&gt; SSB_SROM8_FEM_PDET_RANGE_SHIFT;</div><div class='add'>+	bus-&gt;sprom.fem.ghz2.tr_iso = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &amp;</div><div class='add'>+		SSB_SROM8_FEM_TR_ISO) &gt;&gt; SSB_SROM8_FEM_TR_ISO_SHIFT;</div><div class='add'>+	bus-&gt;sprom.fem.ghz2.antswlut = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &amp;</div><div class='add'>+		SSB_SROM8_FEM_ANTSWLUT) &gt;&gt; SSB_SROM8_FEM_ANTSWLUT_SHIFT;</div><div class='add'>+</div><div class='add'>+	bus-&gt;sprom.fem.ghz5.tssipos = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &amp;</div><div class='add'>+		SSB_SROM8_FEM_TSSIPOS) &gt;&gt; SSB_SROM8_FEM_TSSIPOS_SHIFT;</div><div class='add'>+	bus-&gt;sprom.fem.ghz5.extpa_gain = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &amp;</div><div class='add'>+		SSB_SROM8_FEM_EXTPA_GAIN) &gt;&gt; SSB_SROM8_FEM_EXTPA_GAIN_SHIFT;</div><div class='add'>+	bus-&gt;sprom.fem.ghz5.pdet_range = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &amp;</div><div class='add'>+		SSB_SROM8_FEM_PDET_RANGE) &gt;&gt; SSB_SROM8_FEM_PDET_RANGE_SHIFT;</div><div class='add'>+	bus-&gt;sprom.fem.ghz5.tr_iso = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &amp;</div><div class='add'>+		SSB_SROM8_FEM_TR_ISO) &gt;&gt; SSB_SROM8_FEM_TR_ISO_SHIFT;</div><div class='add'>+	bus-&gt;sprom.fem.ghz5.antswlut = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &amp;</div><div class='add'>+		SSB_SROM8_FEM_ANTSWLUT) &gt;&gt; SSB_SROM8_FEM_ANTSWLUT_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bcma_sprom_get(struct bcma_bus *bus)</div><div class='head'>diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig<br/>index 6f07ec1c2f58..4e4c8a4a5fd3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/Kconfig</a></div><div class='hunk'>@@ -116,6 +116,8 @@ config PARIDE</div><div class='ctx'> </div><div class='ctx'> source "drivers/block/paride/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "drivers/block/mtip32xx/Kconfig"</div><div class='add'>+</div><div class='ctx'> config BLK_CPQ_DA</div><div class='ctx'> 	tristate "Compaq SMART2 support"</div><div class='ctx'> 	depends on PCI &amp;&amp; VIRT_TO_BUS</div><div class='hunk'>@@ -315,6 +317,17 @@ config BLK_DEV_NBD</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='add'>+config BLK_DEV_NVME</div><div class='add'>+	tristate "NVM Express block device"</div><div class='add'>+	depends on PCI</div><div class='add'>+	---help---</div><div class='add'>+	  The NVM Express driver is for solid state drives directly</div><div class='add'>+	  connected to the PCI or PCI Express bus.  If you know you</div><div class='add'>+	  don't have one of these, it is safe to answer N.</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 nvme.</div><div class='add'>+</div><div class='ctx'> config BLK_DEV_OSD</div><div class='ctx'> 	tristate "OSD object-as-blkdev support"</div><div class='ctx'> 	depends on SCSI_OSD_ULD</div><div class='head'>diff --git a/drivers/block/Makefile b/drivers/block/Makefile<br/>index 76646e9a1c91..5b795059f8fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/Makefile</a></div><div class='hunk'>@@ -23,6 +23,7 @@ obj-$(CONFIG_XILINX_SYSACE)	+= xsysace.o</div><div class='ctx'> obj-$(CONFIG_CDROM_PKTCDVD)	+= pktcdvd.o</div><div class='ctx'> obj-$(CONFIG_MG_DISK)		+= mg_disk.o</div><div class='ctx'> obj-$(CONFIG_SUNVDC)		+= sunvdc.o</div><div class='add'>+obj-$(CONFIG_BLK_DEV_NVME)	+= nvme.o</div><div class='ctx'> obj-$(CONFIG_BLK_DEV_OSD)	+= osdblk.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_BLK_DEV_UMEM)	+= umem.o</div><div class='hunk'>@@ -39,5 +40,6 @@ obj-$(CONFIG_XEN_BLKDEV_FRONTEND)	+= xen-blkfront.o</div><div class='ctx'> obj-$(CONFIG_XEN_BLKDEV_BACKEND)	+= xen-blkback/</div><div class='ctx'> obj-$(CONFIG_BLK_DEV_DRBD)     += drbd/</div><div class='ctx'> obj-$(CONFIG_BLK_DEV_RBD)     += rbd.o</div><div class='add'>+obj-$(CONFIG_BLK_DEV_PCIESSD_MTIP32XX)	+= mtip32xx/</div><div class='ctx'> </div><div class='ctx'> swim_mod-y	:= swim.o swim_asm.o</div><div class='head'>diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c<br/>index 8eba86bba599..386146d792d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/amiflop.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/amiflop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/amiflop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/amiflop.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/amifdreg.h&gt;</div><div class='ctx'> #include &lt;linux/amifd.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/elevator.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c<br/>index 5f8e39c43ae5..e86d2062a164 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/aoe/aoechr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/aoe/aoechr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/aoe/aoechr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/aoe/aoechr.c</a></div><div class='hunk'>@@ -270,7 +270,7 @@ static const struct file_operations aoe_fops = {</div><div class='ctx'> 	.llseek = noop_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *aoe_devnode(struct device *dev, mode_t *mode)</div><div class='add'>+static char *aoe_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	return kasprintf(GFP_KERNEL, "etherd/%s", dev_name(dev));</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/block/brd.c b/drivers/block/brd.c<br/>index d22119d49e53..ec246437f5a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/brd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/brd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/brd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/brd.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/radix-tree.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt; /* invalidate_bh_lrus() */</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -402,14 +402,13 @@ static int brd_ioctl(struct block_device *bdev, fmode_t mode,</div><div class='ctx'> 	error = -EBUSY;</div><div class='ctx'> 	if (bdev-&gt;bd_openers &lt;= 1) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Invalidate the cache first, so it isn't written</div><div class='del'>-		 * back to the device.</div><div class='add'>+		 * Kill the cache first, so it isn't written back to the</div><div class='add'>+		 * device.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * Another thread might instantiate more buffercache here,</div><div class='ctx'> 		 * but there is not much we can do to close that race.</div><div class='ctx'> 		 */</div><div class='del'>-		invalidate_bh_lrus();</div><div class='del'>-		truncate_inode_pages(bdev-&gt;bd_inode-&gt;i_mapping, 0);</div><div class='add'>+		kill_bdev(bdev);</div><div class='ctx'> 		brd_free_pages(brd);</div><div class='ctx'> 		error = 0;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c<br/>index 587cce57adae..b0f553b26d0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/cciss.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/cciss.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/cciss.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/cciss.c</a></div><div class='hunk'>@@ -1735,7 +1735,7 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,</div><div class='ctx'> 	case CCISS_BIG_PASSTHRU:</div><div class='ctx'> 		return cciss_bigpassthru(h, argp);</div><div class='ctx'> </div><div class='del'>-	/* scsi_cmd_ioctl handles these, below, though some are not */</div><div class='add'>+	/* scsi_cmd_blk_ioctl handles these, below, though some are not */</div><div class='ctx'> 	/* very meaningful for cciss.  SG_IO is the main one people want. */</div><div class='ctx'> </div><div class='ctx'> 	case SG_GET_VERSION_NUM:</div><div class='hunk'>@@ -1746,9 +1746,9 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,</div><div class='ctx'> 	case SG_EMULATED_HOST:</div><div class='ctx'> 	case SG_IO:</div><div class='ctx'> 	case SCSI_IOCTL_SEND_COMMAND:</div><div class='del'>-		return scsi_cmd_ioctl(disk-&gt;queue, disk, mode, cmd, argp);</div><div class='add'>+		return scsi_cmd_blk_ioctl(bdev, mode, cmd, argp);</div><div class='ctx'> </div><div class='del'>-	/* scsi_cmd_ioctl would normally handle these, below, but */</div><div class='add'>+	/* scsi_cmd_blk_ioctl would normally handle these, below, but */</div><div class='ctx'> 	/* they aren't a good fit for cciss, as CD-ROMs are */</div><div class='ctx'> 	/* not supported, and we don't have any bus/target/lun */</div><div class='ctx'> 	/* which we present to the kernel. */</div><div class='head'>diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h<br/>index 9cf20355ceec..8d680562ba73 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/drbd/drbd_int.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/drbd/drbd_int.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/drbd/drbd_int.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/drbd/drbd_int.h</a></div><div class='hunk'>@@ -59,8 +59,8 @@</div><div class='ctx'> </div><div class='ctx'> /* module parameter, defined in drbd_main.c */</div><div class='ctx'> extern unsigned int minor_count;</div><div class='del'>-extern int disable_sendpage;</div><div class='del'>-extern int allow_oos;</div><div class='add'>+extern bool disable_sendpage;</div><div class='add'>+extern bool allow_oos;</div><div class='ctx'> extern unsigned int cn_idx;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DRBD_FAULT_INJECTION</div><div class='head'>diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c<br/>index 0358e55356c8..211fc44f84be 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/drbd/drbd_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/drbd/drbd_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/drbd/drbd_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/drbd/drbd_main.c</a></div><div class='hunk'>@@ -117,8 +117,8 @@ module_param(fault_devs, int, 0644);</div><div class='ctx'> </div><div class='ctx'> /* module parameter, defined */</div><div class='ctx'> unsigned int minor_count = DRBD_MINOR_COUNT_DEF;</div><div class='del'>-int disable_sendpage;</div><div class='del'>-int allow_oos;</div><div class='add'>+bool disable_sendpage;</div><div class='add'>+bool allow_oos;</div><div class='ctx'> unsigned int cn_idx = CN_IDX_DRBD;</div><div class='ctx'> int proc_details;       /* Detail level in proc drbd*/</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c<br/>index 9955a53733b2..510fb10ec45a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/floppy.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/floppy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/floppy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/floppy.c</a></div><div class='hunk'>@@ -188,7 +188,6 @@ static int print_unex = 1;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/mod_devicetable.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;	/* for invalidate_buffers() */</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='head'>diff --git a/drivers/block/loop.c b/drivers/block/loop.c<br/>index 1e888c9e85b3..f00257782fcc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/loop.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/loop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/loop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/loop.c</a></div><div class='hunk'>@@ -69,7 +69,6 @@</div><div class='ctx'> #include &lt;linux/freezer.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;		/* for invalidate_bdev() */</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='head'>diff --git a/drivers/block/mtip32xx/Kconfig b/drivers/block/mtip32xx/Kconfig<br/>new file mode 100644<br/>index 000000000000..b5dd14e072f2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/mtip32xx/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/mtip32xx/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+#</div><div class='add'>+# mtip32xx device driver configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+config BLK_DEV_PCIESSD_MTIP32XX</div><div class='add'>+	tristate "Block Device Driver for Micron PCIe SSDs"</div><div class='add'>+	depends on HOTPLUG_PCI_PCIE</div><div class='add'>+	help</div><div class='add'>+          This enables the block driver for Micron PCIe SSDs.</div><div class='head'>diff --git a/drivers/block/mtip32xx/Makefile b/drivers/block/mtip32xx/Makefile<br/>new file mode 100644<br/>index 000000000000..4fbef8c8329b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/mtip32xx/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/mtip32xx/Makefile</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for  Block device driver for Micron PCIe SSD</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_BLK_DEV_PCIESSD_MTIP32XX) += mtip32xx.o</div><div class='head'>diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c<br/>new file mode 100644<br/>index 000000000000..b74eab70c3d0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/mtip32xx/mtip32xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/mtip32xx/mtip32xx.c</a></div><div class='hunk'>@@ -0,0 +1,3651 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for the Micron P320 SSD</div><div class='add'>+ *   Copyright (C) 2011 Micron Technology, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Portions of this code were derived from works subjected to the</div><div class='add'>+ * following copyright:</div><div class='add'>+ *    Copyright (C) 2009 Integrated Device Technology, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; 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'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</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/ata.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/hdreg.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/genhd.h&gt;</div><div class='add'>+#include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;linux/bio.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/idr.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='add'>+#include &lt;../drivers/ata/ahci.h&gt;</div><div class='add'>+#include "mtip32xx.h"</div><div class='add'>+</div><div class='add'>+#define HW_CMD_SLOT_SZ		(MTIP_MAX_COMMAND_SLOTS * 32)</div><div class='add'>+#define HW_CMD_TBL_SZ		(AHCI_CMD_TBL_HDR_SZ + (MTIP_MAX_SG * 16))</div><div class='add'>+#define HW_CMD_TBL_AR_SZ	(HW_CMD_TBL_SZ * MTIP_MAX_COMMAND_SLOTS)</div><div class='add'>+#define HW_PORT_PRIV_DMA_SZ \</div><div class='add'>+		(HW_CMD_SLOT_SZ + HW_CMD_TBL_AR_SZ + AHCI_RX_FIS_SZ)</div><div class='add'>+</div><div class='add'>+#define HOST_HSORG		0xFC</div><div class='add'>+#define HSORG_DISABLE_SLOTGRP_INTR (1&lt;&lt;24)</div><div class='add'>+#define HSORG_DISABLE_SLOTGRP_PXIS (1&lt;&lt;16)</div><div class='add'>+#define HSORG_HWREV		0xFF00</div><div class='add'>+#define HSORG_STYLE		0x8</div><div class='add'>+#define HSORG_SLOTGROUPS	0x7</div><div class='add'>+</div><div class='add'>+#define PORT_COMMAND_ISSUE	0x38</div><div class='add'>+#define PORT_SDBV		0x7C</div><div class='add'>+</div><div class='add'>+#define PORT_OFFSET		0x100</div><div class='add'>+#define PORT_MEM_SIZE		0x80</div><div class='add'>+</div><div class='add'>+#define PORT_IRQ_ERR \</div><div class='add'>+	(PORT_IRQ_HBUS_ERR | PORT_IRQ_IF_ERR | PORT_IRQ_CONNECT | \</div><div class='add'>+	 PORT_IRQ_PHYRDY | PORT_IRQ_UNK_FIS | PORT_IRQ_BAD_PMP | \</div><div class='add'>+	 PORT_IRQ_TF_ERR | PORT_IRQ_HBUS_DATA_ERR | PORT_IRQ_IF_NONFATAL | \</div><div class='add'>+	 PORT_IRQ_OVERFLOW)</div><div class='add'>+#define PORT_IRQ_LEGACY \</div><div class='add'>+	(PORT_IRQ_PIOS_FIS | PORT_IRQ_D2H_REG_FIS)</div><div class='add'>+#define PORT_IRQ_HANDLED \</div><div class='add'>+	(PORT_IRQ_SDB_FIS | PORT_IRQ_LEGACY | \</div><div class='add'>+	 PORT_IRQ_TF_ERR | PORT_IRQ_IF_ERR | \</div><div class='add'>+	 PORT_IRQ_CONNECT | PORT_IRQ_PHYRDY)</div><div class='add'>+#define DEF_PORT_IRQ \</div><div class='add'>+	(PORT_IRQ_ERR | PORT_IRQ_LEGACY | PORT_IRQ_SDB_FIS)</div><div class='add'>+</div><div class='add'>+/* product numbers */</div><div class='add'>+#define MTIP_PRODUCT_UNKNOWN	0x00</div><div class='add'>+#define MTIP_PRODUCT_ASICFPGA	0x11</div><div class='add'>+</div><div class='add'>+/* Device instance number, incremented each time a device is probed. */</div><div class='add'>+static int instance;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Global variable used to hold the major block device number</div><div class='add'>+ * allocated in mtip_init().</div><div class='add'>+ */</div><div class='add'>+static int mtip_major;</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(rssd_index_lock);</div><div class='add'>+static DEFINE_IDA(rssd_index_ida);</div><div class='add'>+</div><div class='add'>+static int mtip_block_initialize(struct driver_data *dd);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+struct mtip_compat_ide_task_request_s {</div><div class='add'>+	__u8		io_ports[8];</div><div class='add'>+	__u8		hob_ports[8];</div><div class='add'>+	ide_reg_valid_t	out_flags;</div><div class='add'>+	ide_reg_valid_t	in_flags;</div><div class='add'>+	int		data_phase;</div><div class='add'>+	int		req_cmd;</div><div class='add'>+	compat_ulong_t	out_size;</div><div class='add'>+	compat_ulong_t	in_size;</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function check_for_surprise_removal is called</div><div class='add'>+ * while card is removed from the system and it will</div><div class='add'>+ * read the vendor id from the configration space</div><div class='add'>+ *</div><div class='add'>+ * @pdev Pointer to the pci_dev structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	 true if device removed, else false</div><div class='add'>+ */</div><div class='add'>+static bool mtip_check_surprise_removal(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	u16 vendor_id = 0;</div><div class='add'>+</div><div class='add'>+       /* Read the vendorID from the configuration space */</div><div class='add'>+	pci_read_config_word(pdev, 0x00, &amp;vendor_id);</div><div class='add'>+	if (vendor_id == 0xFFFF)</div><div class='add'>+		return true; /* device removed */</div><div class='add'>+</div><div class='add'>+	return false; /* device present */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function is called for clean the pending command in the</div><div class='add'>+ * command slot during the surprise removal of device and return</div><div class='add'>+ * error to the upper layer.</div><div class='add'>+ *</div><div class='add'>+ * @dd Pointer to the DRIVER_DATA structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static void mtip_command_cleanup(struct driver_data *dd)</div><div class='add'>+{</div><div class='add'>+	int group = 0, commandslot = 0, commandindex = 0;</div><div class='add'>+	struct mtip_cmd *command;</div><div class='add'>+	struct mtip_port *port = dd-&gt;port;</div><div class='add'>+</div><div class='add'>+	for (group = 0; group &lt; 4; group++) {</div><div class='add'>+		for (commandslot = 0; commandslot &lt; 32; commandslot++) {</div><div class='add'>+			if (!(port-&gt;allocated[group] &amp; (1 &lt;&lt; commandslot)))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			commandindex = group &lt;&lt; 5 | commandslot;</div><div class='add'>+			command = &amp;port-&gt;commands[commandindex];</div><div class='add'>+</div><div class='add'>+			if (atomic_read(&amp;command-&gt;active)</div><div class='add'>+			    &amp;&amp; (command-&gt;async_callback)) {</div><div class='add'>+				command-&gt;async_callback(command-&gt;async_data,</div><div class='add'>+					-ENODEV);</div><div class='add'>+				command-&gt;async_callback = NULL;</div><div class='add'>+				command-&gt;async_data = NULL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			dma_unmap_sg(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+				command-&gt;sg,</div><div class='add'>+				command-&gt;scatter_ents,</div><div class='add'>+				command-&gt;direction);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	up(&amp;port-&gt;cmd_slot);</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;dd-&gt;drv_cleanup_done, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Obtain an empty command slot.</div><div class='add'>+ *</div><div class='add'>+ * This function needs to be reentrant since it could be called</div><div class='add'>+ * at the same time on multiple CPUs. The allocation of the</div><div class='add'>+ * command slot must be atomic.</div><div class='add'>+ *</div><div class='add'>+ * @port Pointer to the port data structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	&gt;= 0	Index of command slot obtained.</div><div class='add'>+ *	-1	No command slots available.</div><div class='add'>+ */</div><div class='add'>+static int get_slot(struct mtip_port *port)</div><div class='add'>+{</div><div class='add'>+	int slot, i;</div><div class='add'>+	unsigned int num_command_slots = port-&gt;dd-&gt;slot_groups * 32;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Try 10 times, because there is a small race here.</div><div class='add'>+	 *  that's ok, because it's still cheaper than a lock.</div><div class='add'>+	 *</div><div class='add'>+	 * Race: Since this section is not protected by lock, same bit</div><div class='add'>+	 * could be chosen by different process contexts running in</div><div class='add'>+	 * different processor. So instead of costly lock, we are going</div><div class='add'>+	 * with loop.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		slot = find_next_zero_bit(port-&gt;allocated,</div><div class='add'>+					 num_command_slots, 1);</div><div class='add'>+		if ((slot &lt; num_command_slots) &amp;&amp;</div><div class='add'>+		    (!test_and_set_bit(slot, port-&gt;allocated)))</div><div class='add'>+			return slot;</div><div class='add'>+	}</div><div class='add'>+	dev_warn(&amp;port-&gt;dd-&gt;pdev-&gt;dev, "Failed to get a tag.\n");</div><div class='add'>+</div><div class='add'>+	if (mtip_check_surprise_removal(port-&gt;dd-&gt;pdev)) {</div><div class='add'>+		/* Device not present, clean outstanding commands */</div><div class='add'>+		mtip_command_cleanup(port-&gt;dd);</div><div class='add'>+	}</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Release a command slot.</div><div class='add'>+ *</div><div class='add'>+ * @port Pointer to the port data structure.</div><div class='add'>+ * @tag  Tag of command to release</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static inline void release_slot(struct mtip_port *port, int tag)</div><div class='add'>+{</div><div class='add'>+	smp_mb__before_clear_bit();</div><div class='add'>+	clear_bit(tag, port-&gt;allocated);</div><div class='add'>+	smp_mb__after_clear_bit();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Reset the HBA (without sleeping)</div><div class='add'>+ *</div><div class='add'>+ * Just like hba_reset, except does not call sleep, so can be</div><div class='add'>+ * run from interrupt/tasklet context.</div><div class='add'>+ *</div><div class='add'>+ * @dd Pointer to the driver data structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0	The reset was successful.</div><div class='add'>+ *	-1	The HBA Reset bit did not clear.</div><div class='add'>+ */</div><div class='add'>+static int hba_reset_nosleep(struct driver_data *dd)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+</div><div class='add'>+	/* Chip quirk: quiesce any chip function */</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	/* Set the reset bit */</div><div class='add'>+	writel(HOST_RESET, dd-&gt;mmio + HOST_CTL);</div><div class='add'>+</div><div class='add'>+	/* Flush */</div><div class='add'>+	readl(dd-&gt;mmio + HOST_CTL);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Wait 10ms then spin for up to 1 second</div><div class='add'>+	 * waiting for reset acknowledgement</div><div class='add'>+	 */</div><div class='add'>+	timeout = jiffies + msecs_to_jiffies(1000);</div><div class='add'>+	mdelay(10);</div><div class='add'>+	while ((readl(dd-&gt;mmio + HOST_CTL) &amp; HOST_RESET)</div><div class='add'>+		 &amp;&amp; time_before(jiffies, timeout))</div><div class='add'>+		mdelay(1);</div><div class='add'>+</div><div class='add'>+	if (readl(dd-&gt;mmio + HOST_CTL) &amp; HOST_RESET)</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'>+ * Issue a command to the hardware.</div><div class='add'>+ *</div><div class='add'>+ * Set the appropriate bit in the s_active and Command Issue hardware</div><div class='add'>+ * registers, causing hardware command processing to begin.</div><div class='add'>+ *</div><div class='add'>+ * @port Pointer to the port structure.</div><div class='add'>+ * @tag  The tag of the command to be issued.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *      None</div><div class='add'>+ */</div><div class='add'>+static inline void mtip_issue_ncq_command(struct mtip_port *port, int tag)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags = 0;</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;port-&gt;commands[tag].active, 1);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;port-&gt;cmd_issue_lock, flags);</div><div class='add'>+</div><div class='add'>+	writel((1 &lt;&lt; MTIP_TAG_BIT(tag)),</div><div class='add'>+			port-&gt;s_active[MTIP_TAG_INDEX(tag)]);</div><div class='add'>+	writel((1 &lt;&lt; MTIP_TAG_BIT(tag)),</div><div class='add'>+			port-&gt;cmd_issue[MTIP_TAG_INDEX(tag)]);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;port-&gt;cmd_issue_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable/disable the reception of FIS</div><div class='add'>+ *</div><div class='add'>+ * @port   Pointer to the port data structure</div><div class='add'>+ * @enable 1 to enable, 0 to disable</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	Previous state: 1 enabled, 0 disabled</div><div class='add'>+ */</div><div class='add'>+static int mtip_enable_fis(struct mtip_port *port, int enable)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	/* enable FIS reception */</div><div class='add'>+	tmp = readl(port-&gt;mmio + PORT_CMD);</div><div class='add'>+	if (enable)</div><div class='add'>+		writel(tmp | PORT_CMD_FIS_RX, port-&gt;mmio + PORT_CMD);</div><div class='add'>+	else</div><div class='add'>+		writel(tmp &amp; ~PORT_CMD_FIS_RX, port-&gt;mmio + PORT_CMD);</div><div class='add'>+</div><div class='add'>+	/* Flush */</div><div class='add'>+	readl(port-&gt;mmio + PORT_CMD);</div><div class='add'>+</div><div class='add'>+	return (((tmp &amp; PORT_CMD_FIS_RX) == PORT_CMD_FIS_RX));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable/disable the DMA engine</div><div class='add'>+ *</div><div class='add'>+ * @port   Pointer to the port data structure</div><div class='add'>+ * @enable 1 to enable, 0 to disable</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	Previous state: 1 enabled, 0 disabled.</div><div class='add'>+ */</div><div class='add'>+static int mtip_enable_engine(struct mtip_port *port, int enable)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	/* enable FIS reception */</div><div class='add'>+	tmp = readl(port-&gt;mmio + PORT_CMD);</div><div class='add'>+	if (enable)</div><div class='add'>+		writel(tmp | PORT_CMD_START, port-&gt;mmio + PORT_CMD);</div><div class='add'>+	else</div><div class='add'>+		writel(tmp &amp; ~PORT_CMD_START, port-&gt;mmio + PORT_CMD);</div><div class='add'>+</div><div class='add'>+	readl(port-&gt;mmio + PORT_CMD);</div><div class='add'>+	return (((tmp &amp; PORT_CMD_START) == PORT_CMD_START));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enables the port DMA engine and FIS reception.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static inline void mtip_start_port(struct mtip_port *port)</div><div class='add'>+{</div><div class='add'>+	/* Enable FIS reception */</div><div class='add'>+	mtip_enable_fis(port, 1);</div><div class='add'>+</div><div class='add'>+	/* Enable the DMA engine */</div><div class='add'>+	mtip_enable_engine(port, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Deinitialize a port by disabling port interrupts, the DMA engine,</div><div class='add'>+ * and FIS reception.</div><div class='add'>+ *</div><div class='add'>+ * @port Pointer to the port structure</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static inline void mtip_deinit_port(struct mtip_port *port)</div><div class='add'>+{</div><div class='add'>+	/* Disable interrupts on this port */</div><div class='add'>+	writel(0, port-&gt;mmio + PORT_IRQ_MASK);</div><div class='add'>+</div><div class='add'>+	/* Disable the DMA engine */</div><div class='add'>+	mtip_enable_engine(port, 0);</div><div class='add'>+</div><div class='add'>+	/* Disable FIS reception */</div><div class='add'>+	mtip_enable_fis(port, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize a port.</div><div class='add'>+ *</div><div class='add'>+ * This function deinitializes the port by calling mtip_deinit_port() and</div><div class='add'>+ * then initializes it by setting the command header and RX FIS addresses,</div><div class='add'>+ * clearing the SError register and any pending port interrupts before</div><div class='add'>+ * re-enabling the default set of port interrupts.</div><div class='add'>+ *</div><div class='add'>+ * @port Pointer to the port structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static void mtip_init_port(struct mtip_port *port)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	mtip_deinit_port(port);</div><div class='add'>+</div><div class='add'>+	/* Program the command list base and FIS base addresses */</div><div class='add'>+	if (readl(port-&gt;dd-&gt;mmio + HOST_CAP) &amp; HOST_CAP_64) {</div><div class='add'>+		writel((port-&gt;command_list_dma &gt;&gt; 16) &gt;&gt; 16,</div><div class='add'>+			 port-&gt;mmio + PORT_LST_ADDR_HI);</div><div class='add'>+		writel((port-&gt;rxfis_dma &gt;&gt; 16) &gt;&gt; 16,</div><div class='add'>+			 port-&gt;mmio + PORT_FIS_ADDR_HI);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writel(port-&gt;command_list_dma &amp; 0xFFFFFFFF,</div><div class='add'>+			port-&gt;mmio + PORT_LST_ADDR);</div><div class='add'>+	writel(port-&gt;rxfis_dma &amp; 0xFFFFFFFF, port-&gt;mmio + PORT_FIS_ADDR);</div><div class='add'>+</div><div class='add'>+	/* Clear SError */</div><div class='add'>+	writel(readl(port-&gt;mmio + PORT_SCR_ERR), port-&gt;mmio + PORT_SCR_ERR);</div><div class='add'>+</div><div class='add'>+	/* reset the completed registers.*/</div><div class='add'>+	for (i = 0; i &lt; port-&gt;dd-&gt;slot_groups; i++)</div><div class='add'>+		writel(0xFFFFFFFF, port-&gt;completed[i]);</div><div class='add'>+</div><div class='add'>+	/* Clear any pending interrupts for this port */</div><div class='add'>+	writel(readl(port-&gt;mmio + PORT_IRQ_STAT), port-&gt;mmio + PORT_IRQ_STAT);</div><div class='add'>+</div><div class='add'>+	/* Enable port interrupts */</div><div class='add'>+	writel(DEF_PORT_IRQ, port-&gt;mmio + PORT_IRQ_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Restart a port</div><div class='add'>+ *</div><div class='add'>+ * @port Pointer to the port data structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static void mtip_restart_port(struct mtip_port *port)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+</div><div class='add'>+	/* Disable the DMA engine */</div><div class='add'>+	mtip_enable_engine(port, 0);</div><div class='add'>+</div><div class='add'>+	/* Chip quirk: wait up to 500ms for PxCMD.CR == 0 */</div><div class='add'>+	timeout = jiffies + msecs_to_jiffies(500);</div><div class='add'>+	while ((readl(port-&gt;mmio + PORT_CMD) &amp; PORT_CMD_LIST_ON)</div><div class='add'>+		 &amp;&amp; time_before(jiffies, timeout))</div><div class='add'>+		;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Chip quirk: escalate to hba reset if</div><div class='add'>+	 * PxCMD.CR not clear after 500 ms</div><div class='add'>+	 */</div><div class='add'>+	if (readl(port-&gt;mmio + PORT_CMD) &amp; PORT_CMD_LIST_ON) {</div><div class='add'>+		dev_warn(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"PxCMD.CR not clear, escalating reset\n");</div><div class='add'>+</div><div class='add'>+		if (hba_reset_nosleep(port-&gt;dd))</div><div class='add'>+			dev_err(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+				"HBA reset escalation failed.\n");</div><div class='add'>+</div><div class='add'>+		/* 30 ms delay before com reset to quiesce chip */</div><div class='add'>+		mdelay(30);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_warn(&amp;port-&gt;dd-&gt;pdev-&gt;dev, "Issuing COM reset\n");</div><div class='add'>+</div><div class='add'>+	/* Set PxSCTL.DET */</div><div class='add'>+	writel(readl(port-&gt;mmio + PORT_SCR_CTL) |</div><div class='add'>+			 1, port-&gt;mmio + PORT_SCR_CTL);</div><div class='add'>+	readl(port-&gt;mmio + PORT_SCR_CTL);</div><div class='add'>+</div><div class='add'>+	/* Wait 1 ms to quiesce chip function */</div><div class='add'>+	timeout = jiffies + msecs_to_jiffies(1);</div><div class='add'>+	while (time_before(jiffies, timeout))</div><div class='add'>+		;</div><div class='add'>+</div><div class='add'>+	/* Clear PxSCTL.DET */</div><div class='add'>+	writel(readl(port-&gt;mmio + PORT_SCR_CTL) &amp; ~1,</div><div class='add'>+			 port-&gt;mmio + PORT_SCR_CTL);</div><div class='add'>+	readl(port-&gt;mmio + PORT_SCR_CTL);</div><div class='add'>+</div><div class='add'>+	/* Wait 500 ms for bit 0 of PORT_SCR_STS to be set */</div><div class='add'>+	timeout = jiffies + msecs_to_jiffies(500);</div><div class='add'>+	while (((readl(port-&gt;mmio + PORT_SCR_STAT) &amp; 0x01) == 0)</div><div class='add'>+			 &amp;&amp; time_before(jiffies, timeout))</div><div class='add'>+		;</div><div class='add'>+</div><div class='add'>+	if ((readl(port-&gt;mmio + PORT_SCR_STAT) &amp; 0x01) == 0)</div><div class='add'>+		dev_warn(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"COM reset failed\n");</div><div class='add'>+</div><div class='add'>+	/* Clear SError, the PxSERR.DIAG.x should be set so clear it */</div><div class='add'>+	writel(readl(port-&gt;mmio + PORT_SCR_ERR), port-&gt;mmio + PORT_SCR_ERR);</div><div class='add'>+</div><div class='add'>+	/* Enable the DMA engine */</div><div class='add'>+	mtip_enable_engine(port, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called periodically to see if any read/write commands are</div><div class='add'>+ * taking too long to complete.</div><div class='add'>+ *</div><div class='add'>+ * @data Pointer to the PORT data structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static void mtip_timeout_function(unsigned long int data)</div><div class='add'>+{</div><div class='add'>+	struct mtip_port *port = (struct mtip_port *) data;</div><div class='add'>+	struct host_to_dev_fis *fis;</div><div class='add'>+	struct mtip_cmd *command;</div><div class='add'>+	int tag, cmdto_cnt = 0;</div><div class='add'>+	unsigned int bit, group;</div><div class='add'>+	unsigned int num_command_slots = port-&gt;dd-&gt;slot_groups * 32;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!port))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;port-&gt;dd-&gt;resumeflag) == true) {</div><div class='add'>+		mod_timer(&amp;port-&gt;cmd_timer,</div><div class='add'>+			jiffies + msecs_to_jiffies(30000));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (tag = 0; tag &lt; num_command_slots; tag++) {</div><div class='add'>+		/*</div><div class='add'>+		 * Skip internal command slot as it has</div><div class='add'>+		 * its own timeout mechanism</div><div class='add'>+		 */</div><div class='add'>+		if (tag == MTIP_TAG_INTERNAL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (atomic_read(&amp;port-&gt;commands[tag].active) &amp;&amp;</div><div class='add'>+		   (time_after(jiffies, port-&gt;commands[tag].comp_time))) {</div><div class='add'>+			group = tag &gt;&gt; 5;</div><div class='add'>+			bit = tag &amp; 0x1F;</div><div class='add'>+</div><div class='add'>+			command = &amp;port-&gt;commands[tag];</div><div class='add'>+			fis = (struct host_to_dev_fis *) command-&gt;command;</div><div class='add'>+</div><div class='add'>+			dev_warn(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+				"Timeout for command tag %d\n", tag);</div><div class='add'>+</div><div class='add'>+			cmdto_cnt++;</div><div class='add'>+			if (cmdto_cnt == 1)</div><div class='add'>+				set_bit(MTIP_FLAG_EH_ACTIVE_BIT, &amp;port-&gt;flags);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Clear the completed bit. This should prevent</div><div class='add'>+			 *  any interrupt handlers from trying to retire</div><div class='add'>+			 *  the command.</div><div class='add'>+			 */</div><div class='add'>+			writel(1 &lt;&lt; bit, port-&gt;completed[group]);</div><div class='add'>+</div><div class='add'>+			/* Call the async completion callback. */</div><div class='add'>+			if (likely(command-&gt;async_callback))</div><div class='add'>+				command-&gt;async_callback(command-&gt;async_data,</div><div class='add'>+							 -EIO);</div><div class='add'>+			command-&gt;async_callback = NULL;</div><div class='add'>+			command-&gt;comp_func = NULL;</div><div class='add'>+</div><div class='add'>+			/* Unmap the DMA scatter list entries */</div><div class='add'>+			dma_unmap_sg(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+					command-&gt;sg,</div><div class='add'>+					command-&gt;scatter_ents,</div><div class='add'>+					command-&gt;direction);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Clear the allocated bit and active tag for the</div><div class='add'>+			 * command.</div><div class='add'>+			 */</div><div class='add'>+			atomic_set(&amp;port-&gt;commands[tag].active, 0);</div><div class='add'>+			release_slot(port, tag);</div><div class='add'>+</div><div class='add'>+			up(&amp;port-&gt;cmd_slot);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmdto_cnt) {</div><div class='add'>+		dev_warn(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"%d commands timed out: restarting port",</div><div class='add'>+			cmdto_cnt);</div><div class='add'>+		mtip_restart_port(port);</div><div class='add'>+		clear_bit(MTIP_FLAG_EH_ACTIVE_BIT, &amp;port-&gt;flags);</div><div class='add'>+		wake_up_interruptible(&amp;port-&gt;svc_wait);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Restart the timer */</div><div class='add'>+	mod_timer(&amp;port-&gt;cmd_timer,</div><div class='add'>+		jiffies + msecs_to_jiffies(MTIP_TIMEOUT_CHECK_PERIOD));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IO completion function.</div><div class='add'>+ *</div><div class='add'>+ * This completion function is called by the driver ISR when a</div><div class='add'>+ * command that was issued by the kernel completes. It first calls the</div><div class='add'>+ * asynchronous completion function which normally calls back into the block</div><div class='add'>+ * layer passing the asynchronous callback data, then unmaps the</div><div class='add'>+ * scatter list associated with the completed command, and finally</div><div class='add'>+ * clears the allocated bit associated with the completed command.</div><div class='add'>+ *</div><div class='add'>+ * @port   Pointer to the port data structure.</div><div class='add'>+ * @tag    Tag of the command.</div><div class='add'>+ * @data   Pointer to driver_data.</div><div class='add'>+ * @status Completion status.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static void mtip_async_complete(struct mtip_port *port,</div><div class='add'>+				int tag,</div><div class='add'>+				void *data,</div><div class='add'>+				int status)</div><div class='add'>+{</div><div class='add'>+	struct mtip_cmd *command;</div><div class='add'>+	struct driver_data *dd = data;</div><div class='add'>+	int cb_status = status ? -EIO : 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!dd) || unlikely(!port))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	command = &amp;port-&gt;commands[tag];</div><div class='add'>+</div><div class='add'>+	if (unlikely(status == PORT_IRQ_TF_ERR)) {</div><div class='add'>+		dev_warn(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Command tag %d failed due to TFE\n", tag);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Upper layer callback */</div><div class='add'>+	if (likely(command-&gt;async_callback))</div><div class='add'>+		command-&gt;async_callback(command-&gt;async_data, cb_status);</div><div class='add'>+</div><div class='add'>+	command-&gt;async_callback = NULL;</div><div class='add'>+	command-&gt;comp_func = NULL;</div><div class='add'>+</div><div class='add'>+	/* Unmap the DMA scatter list entries */</div><div class='add'>+	dma_unmap_sg(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+		command-&gt;sg,</div><div class='add'>+		command-&gt;scatter_ents,</div><div class='add'>+		command-&gt;direction);</div><div class='add'>+</div><div class='add'>+	/* Clear the allocated and active bits for the command */</div><div class='add'>+	atomic_set(&amp;port-&gt;commands[tag].active, 0);</div><div class='add'>+	release_slot(port, tag);</div><div class='add'>+</div><div class='add'>+	up(&amp;port-&gt;cmd_slot);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Internal command completion callback function.</div><div class='add'>+ *</div><div class='add'>+ * This function is normally called by the driver ISR when an internal</div><div class='add'>+ * command completed. This function signals the command completion by</div><div class='add'>+ * calling complete().</div><div class='add'>+ *</div><div class='add'>+ * @port   Pointer to the port data structure.</div><div class='add'>+ * @tag    Tag of the command that has completed.</div><div class='add'>+ * @data   Pointer to a completion structure.</div><div class='add'>+ * @status Completion status.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static void mtip_completion(struct mtip_port *port,</div><div class='add'>+			    int tag,</div><div class='add'>+			    void *data,</div><div class='add'>+			    int status)</div><div class='add'>+{</div><div class='add'>+	struct mtip_cmd *command = &amp;port-&gt;commands[tag];</div><div class='add'>+	struct completion *waiting = data;</div><div class='add'>+	if (unlikely(status == PORT_IRQ_TF_ERR))</div><div class='add'>+		dev_warn(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Internal command %d completed with TFE\n", tag);</div><div class='add'>+</div><div class='add'>+	command-&gt;async_callback = NULL;</div><div class='add'>+	command-&gt;comp_func = NULL;</div><div class='add'>+</div><div class='add'>+	complete(waiting);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Helper function for tag logging</div><div class='add'>+ */</div><div class='add'>+static void print_tags(struct driver_data *dd,</div><div class='add'>+			char *msg,</div><div class='add'>+			unsigned long *tagbits)</div><div class='add'>+{</div><div class='add'>+	unsigned int tag, count = 0;</div><div class='add'>+</div><div class='add'>+	for (tag = 0; tag &lt; (dd-&gt;slot_groups) * 32; tag++) {</div><div class='add'>+		if (test_bit(tag, tagbits))</div><div class='add'>+			count++;</div><div class='add'>+	}</div><div class='add'>+	if (count)</div><div class='add'>+		dev_info(&amp;dd-&gt;pdev-&gt;dev, "%s [%i tags]\n", msg, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handle an error.</div><div class='add'>+ *</div><div class='add'>+ * @dd Pointer to the DRIVER_DATA structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static void mtip_handle_tfe(struct driver_data *dd)</div><div class='add'>+{</div><div class='add'>+	int group, tag, bit, reissue;</div><div class='add'>+	struct mtip_port *port;</div><div class='add'>+	struct mtip_cmd  *command;</div><div class='add'>+	u32 completed;</div><div class='add'>+	struct host_to_dev_fis *fis;</div><div class='add'>+	unsigned long tagaccum[SLOTBITS_IN_LONGS];</div><div class='add'>+</div><div class='add'>+	dev_warn(&amp;dd-&gt;pdev-&gt;dev, "Taskfile error\n");</div><div class='add'>+</div><div class='add'>+	port = dd-&gt;port;</div><div class='add'>+</div><div class='add'>+	/* Stop the timer to prevent command timeouts. */</div><div class='add'>+	del_timer(&amp;port-&gt;cmd_timer);</div><div class='add'>+</div><div class='add'>+	/* Set eh_active */</div><div class='add'>+	set_bit(MTIP_FLAG_EH_ACTIVE_BIT, &amp;port-&gt;flags);</div><div class='add'>+</div><div class='add'>+	/* Loop through all the groups */</div><div class='add'>+	for (group = 0; group &lt; dd-&gt;slot_groups; group++) {</div><div class='add'>+		completed = readl(port-&gt;completed[group]);</div><div class='add'>+</div><div class='add'>+		/* clear completed status register in the hardware.*/</div><div class='add'>+		writel(completed, port-&gt;completed[group]);</div><div class='add'>+</div><div class='add'>+		/* clear the tag accumulator */</div><div class='add'>+		memset(tagaccum, 0, SLOTBITS_IN_LONGS * sizeof(long));</div><div class='add'>+</div><div class='add'>+		/* Process successfully completed commands */</div><div class='add'>+		for (bit = 0; bit &lt; 32 &amp;&amp; completed; bit++) {</div><div class='add'>+			if (!(completed &amp; (1&lt;&lt;bit)))</div><div class='add'>+				continue;</div><div class='add'>+			tag = (group &lt;&lt; 5) + bit;</div><div class='add'>+</div><div class='add'>+			/* Skip the internal command slot */</div><div class='add'>+			if (tag == MTIP_TAG_INTERNAL)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			command = &amp;port-&gt;commands[tag];</div><div class='add'>+			if (likely(command-&gt;comp_func)) {</div><div class='add'>+				set_bit(tag, tagaccum);</div><div class='add'>+				atomic_set(&amp;port-&gt;commands[tag].active, 0);</div><div class='add'>+				command-&gt;comp_func(port,</div><div class='add'>+					 tag,</div><div class='add'>+					 command-&gt;comp_data,</div><div class='add'>+					 0);</div><div class='add'>+			} else {</div><div class='add'>+				dev_err(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+					"Missing completion func for tag %d",</div><div class='add'>+					tag);</div><div class='add'>+				if (mtip_check_surprise_removal(dd-&gt;pdev)) {</div><div class='add'>+					mtip_command_cleanup(dd);</div><div class='add'>+					/* don't proceed further */</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'>+	print_tags(dd, "TFE tags completed:", tagaccum);</div><div class='add'>+</div><div class='add'>+	/* Restart the port */</div><div class='add'>+	mdelay(20);</div><div class='add'>+	mtip_restart_port(port);</div><div class='add'>+</div><div class='add'>+	/* clear the tag accumulator */</div><div class='add'>+	memset(tagaccum, 0, SLOTBITS_IN_LONGS * sizeof(long));</div><div class='add'>+</div><div class='add'>+	/* Loop through all the groups */</div><div class='add'>+	for (group = 0; group &lt; dd-&gt;slot_groups; group++) {</div><div class='add'>+		for (bit = 0; bit &lt; 32; bit++) {</div><div class='add'>+			reissue = 1;</div><div class='add'>+			tag = (group &lt;&lt; 5) + bit;</div><div class='add'>+</div><div class='add'>+			/* If the active bit is set re-issue the command */</div><div class='add'>+			if (atomic_read(&amp;port-&gt;commands[tag].active) == 0)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			fis = (struct host_to_dev_fis *)</div><div class='add'>+				port-&gt;commands[tag].command;</div><div class='add'>+</div><div class='add'>+			/* Should re-issue? */</div><div class='add'>+			if (tag == MTIP_TAG_INTERNAL ||</div><div class='add'>+			    fis-&gt;command == ATA_CMD_SET_FEATURES)</div><div class='add'>+				reissue = 0;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * First check if this command has</div><div class='add'>+			 *  exceeded its retries.</div><div class='add'>+			 */</div><div class='add'>+			if (reissue &amp;&amp;</div><div class='add'>+			    (port-&gt;commands[tag].retries-- &gt; 0)) {</div><div class='add'>+</div><div class='add'>+				set_bit(tag, tagaccum);</div><div class='add'>+</div><div class='add'>+				/* Update the timeout value. */</div><div class='add'>+				port-&gt;commands[tag].comp_time =</div><div class='add'>+					jiffies + msecs_to_jiffies(</div><div class='add'>+					MTIP_NCQ_COMMAND_TIMEOUT_MS);</div><div class='add'>+				/* Re-issue the command. */</div><div class='add'>+				mtip_issue_ncq_command(port, tag);</div><div class='add'>+</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Retire a command that will not be reissued */</div><div class='add'>+			dev_warn(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+				"retiring tag %d\n", tag);</div><div class='add'>+			atomic_set(&amp;port-&gt;commands[tag].active, 0);</div><div class='add'>+</div><div class='add'>+			if (port-&gt;commands[tag].comp_func)</div><div class='add'>+				port-&gt;commands[tag].comp_func(</div><div class='add'>+					port,</div><div class='add'>+					tag,</div><div class='add'>+					port-&gt;commands[tag].comp_data,</div><div class='add'>+					PORT_IRQ_TF_ERR);</div><div class='add'>+			else</div><div class='add'>+				dev_warn(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+					"Bad completion for tag %d\n",</div><div class='add'>+					tag);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	print_tags(dd, "TFE tags reissued:", tagaccum);</div><div class='add'>+</div><div class='add'>+	/* clear eh_active */</div><div class='add'>+	clear_bit(MTIP_FLAG_EH_ACTIVE_BIT, &amp;port-&gt;flags);</div><div class='add'>+	wake_up_interruptible(&amp;port-&gt;svc_wait);</div><div class='add'>+</div><div class='add'>+	mod_timer(&amp;port-&gt;cmd_timer,</div><div class='add'>+		 jiffies + msecs_to_jiffies(MTIP_TIMEOUT_CHECK_PERIOD));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handle a set device bits interrupt</div><div class='add'>+ */</div><div class='add'>+static inline void mtip_process_sdbf(struct driver_data *dd)</div><div class='add'>+{</div><div class='add'>+	struct mtip_port  *port = dd-&gt;port;</div><div class='add'>+	int group, tag, bit;</div><div class='add'>+	u32 completed;</div><div class='add'>+	struct mtip_cmd *command;</div><div class='add'>+</div><div class='add'>+	/* walk all bits in all slot groups */</div><div class='add'>+	for (group = 0; group &lt; dd-&gt;slot_groups; group++) {</div><div class='add'>+		completed = readl(port-&gt;completed[group]);</div><div class='add'>+</div><div class='add'>+		/* clear completed status register in the hardware.*/</div><div class='add'>+		writel(completed, port-&gt;completed[group]);</div><div class='add'>+</div><div class='add'>+		/* Process completed commands. */</div><div class='add'>+		for (bit = 0;</div><div class='add'>+		     (bit &lt; 32) &amp;&amp; completed;</div><div class='add'>+		     bit++, completed &gt;&gt;= 1) {</div><div class='add'>+			if (completed &amp; 0x01) {</div><div class='add'>+				tag = (group &lt;&lt; 5) | bit;</div><div class='add'>+</div><div class='add'>+				/* skip internal command slot. */</div><div class='add'>+				if (unlikely(tag == MTIP_TAG_INTERNAL))</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				command = &amp;port-&gt;commands[tag];</div><div class='add'>+				/* make internal callback */</div><div class='add'>+				if (likely(command-&gt;comp_func)) {</div><div class='add'>+					command-&gt;comp_func(</div><div class='add'>+						port,</div><div class='add'>+						tag,</div><div class='add'>+						command-&gt;comp_data,</div><div class='add'>+						0);</div><div class='add'>+				} else {</div><div class='add'>+					dev_warn(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+						"Null completion "</div><div class='add'>+						"for tag %d",</div><div class='add'>+						tag);</div><div class='add'>+</div><div class='add'>+					if (mtip_check_surprise_removal(</div><div class='add'>+						dd-&gt;pdev)) {</div><div class='add'>+						mtip_command_cleanup(dd);</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'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Process legacy pio and d2h interrupts</div><div class='add'>+ */</div><div class='add'>+static inline void mtip_process_legacy(struct driver_data *dd, u32 port_stat)</div><div class='add'>+{</div><div class='add'>+	struct mtip_port *port = dd-&gt;port;</div><div class='add'>+	struct mtip_cmd *cmd = &amp;port-&gt;commands[MTIP_TAG_INTERNAL];</div><div class='add'>+</div><div class='add'>+	if (test_bit(MTIP_FLAG_IC_ACTIVE_BIT, &amp;port-&gt;flags) &amp;&amp;</div><div class='add'>+	    (cmd != NULL) &amp;&amp; !(readl(port-&gt;cmd_issue[MTIP_TAG_INTERNAL])</div><div class='add'>+		&amp; (1 &lt;&lt; MTIP_TAG_INTERNAL))) {</div><div class='add'>+		if (cmd-&gt;comp_func) {</div><div class='add'>+			cmd-&gt;comp_func(port,</div><div class='add'>+				MTIP_TAG_INTERNAL,</div><div class='add'>+				cmd-&gt;comp_data,</div><div class='add'>+				0);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_warn(&amp;dd-&gt;pdev-&gt;dev, "IRQ status 0x%x ignored.\n", port_stat);</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'>+ * Demux and handle errors</div><div class='add'>+ */</div><div class='add'>+static inline void mtip_process_errors(struct driver_data *dd, u32 port_stat)</div><div class='add'>+{</div><div class='add'>+	if (likely(port_stat &amp; (PORT_IRQ_TF_ERR | PORT_IRQ_IF_ERR)))</div><div class='add'>+		mtip_handle_tfe(dd);</div><div class='add'>+</div><div class='add'>+	if (unlikely(port_stat &amp; PORT_IRQ_CONNECT)) {</div><div class='add'>+		dev_warn(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Clearing PxSERR.DIAG.x\n");</div><div class='add'>+		writel((1 &lt;&lt; 26), dd-&gt;port-&gt;mmio + PORT_SCR_ERR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(port_stat &amp; PORT_IRQ_PHYRDY)) {</div><div class='add'>+		dev_warn(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Clearing PxSERR.DIAG.n\n");</div><div class='add'>+		writel((1 &lt;&lt; 16), dd-&gt;port-&gt;mmio + PORT_SCR_ERR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(port_stat &amp; ~PORT_IRQ_HANDLED)) {</div><div class='add'>+		dev_warn(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Port stat errors %x unhandled\n",</div><div class='add'>+			(port_stat &amp; ~PORT_IRQ_HANDLED));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline irqreturn_t mtip_handle_irq(struct driver_data *data)</div><div class='add'>+{</div><div class='add'>+	struct driver_data *dd = (struct driver_data *) data;</div><div class='add'>+	struct mtip_port *port = dd-&gt;port;</div><div class='add'>+	u32 hba_stat, port_stat;</div><div class='add'>+	int rv = IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	hba_stat = readl(dd-&gt;mmio + HOST_IRQ_STAT);</div><div class='add'>+	if (hba_stat) {</div><div class='add'>+		rv = IRQ_HANDLED;</div><div class='add'>+</div><div class='add'>+		/* Acknowledge the interrupt status on the port.*/</div><div class='add'>+		port_stat = readl(port-&gt;mmio + PORT_IRQ_STAT);</div><div class='add'>+		writel(port_stat, port-&gt;mmio + PORT_IRQ_STAT);</div><div class='add'>+</div><div class='add'>+		/* Demux port status */</div><div class='add'>+		if (likely(port_stat &amp; PORT_IRQ_SDB_FIS))</div><div class='add'>+			mtip_process_sdbf(dd);</div><div class='add'>+</div><div class='add'>+		if (unlikely(port_stat &amp; PORT_IRQ_ERR)) {</div><div class='add'>+			if (unlikely(mtip_check_surprise_removal(dd-&gt;pdev))) {</div><div class='add'>+				mtip_command_cleanup(dd);</div><div class='add'>+				/* don't proceed further */</div><div class='add'>+				return IRQ_HANDLED;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			mtip_process_errors(dd, port_stat &amp; PORT_IRQ_ERR);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (unlikely(port_stat &amp; PORT_IRQ_LEGACY))</div><div class='add'>+			mtip_process_legacy(dd, port_stat &amp; PORT_IRQ_LEGACY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* acknowledge interrupt */</div><div class='add'>+	writel(hba_stat, dd-&gt;mmio + HOST_IRQ_STAT);</div><div class='add'>+</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wrapper for mtip_handle_irq</div><div class='add'>+ * (ignores return code)</div><div class='add'>+ */</div><div class='add'>+static void mtip_tasklet(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	mtip_handle_irq((struct driver_data *) data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HBA interrupt subroutine.</div><div class='add'>+ *</div><div class='add'>+ * @irq		IRQ number.</div><div class='add'>+ * @instance	Pointer to the driver data structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	IRQ_HANDLED	A HBA interrupt was pending and handled.</div><div class='add'>+ *	IRQ_NONE	This interrupt was not for the HBA.</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t mtip_irq_handler(int irq, void *instance)</div><div class='add'>+{</div><div class='add'>+	struct driver_data *dd = instance;</div><div class='add'>+	tasklet_schedule(&amp;dd-&gt;tasklet);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mtip_issue_non_ncq_command(struct mtip_port *port, int tag)</div><div class='add'>+{</div><div class='add'>+	atomic_set(&amp;port-&gt;commands[tag].active, 1);</div><div class='add'>+	writel(1 &lt;&lt; MTIP_TAG_BIT(tag),</div><div class='add'>+		port-&gt;cmd_issue[MTIP_TAG_INDEX(tag)]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wait for port to quiesce</div><div class='add'>+ *</div><div class='add'>+ * @port    Pointer to port data structure</div><div class='add'>+ * @timeout Max duration to wait (ms)</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0	Success</div><div class='add'>+ *	-EBUSY  Commands still active</div><div class='add'>+ */</div><div class='add'>+static int mtip_quiesce_io(struct mtip_port *port, unsigned long timeout)</div><div class='add'>+{</div><div class='add'>+	unsigned long to;</div><div class='add'>+	unsigned int n;</div><div class='add'>+	unsigned int active = 1;</div><div class='add'>+</div><div class='add'>+	to = jiffies + msecs_to_jiffies(timeout);</div><div class='add'>+	do {</div><div class='add'>+		if (test_bit(MTIP_FLAG_SVC_THD_ACTIVE_BIT, &amp;port-&gt;flags) &amp;&amp;</div><div class='add'>+			test_bit(MTIP_FLAG_ISSUE_CMDS_BIT, &amp;port-&gt;flags)) {</div><div class='add'>+			msleep(20);</div><div class='add'>+			continue; /* svc thd is actively issuing commands */</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * Ignore s_active bit 0 of array element 0.</div><div class='add'>+		 * This bit will always be set</div><div class='add'>+		 */</div><div class='add'>+		active = readl(port-&gt;s_active[0]) &amp; 0xFFFFFFFE;</div><div class='add'>+		for (n = 1; n &lt; port-&gt;dd-&gt;slot_groups; n++)</div><div class='add'>+			active |= readl(port-&gt;s_active[n]);</div><div class='add'>+</div><div class='add'>+		if (!active)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		msleep(20);</div><div class='add'>+	} while (time_before(jiffies, to));</div><div class='add'>+</div><div class='add'>+	return active ? -EBUSY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Execute an internal command and wait for the completion.</div><div class='add'>+ *</div><div class='add'>+ * @port    Pointer to the port data structure.</div><div class='add'>+ * @fis     Pointer to the FIS that describes the command.</div><div class='add'>+ * @fis_len  Length in WORDS of the FIS.</div><div class='add'>+ * @buffer  DMA accessible for command data.</div><div class='add'>+ * @buf_len  Length, in bytes, of the data buffer.</div><div class='add'>+ * @opts    Command header options, excluding the FIS length</div><div class='add'>+ *             and the number of PRD entries.</div><div class='add'>+ * @timeout Time in ms to wait for the command to complete.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0	 Command completed successfully.</div><div class='add'>+ *	-EFAULT  The buffer address is not correctly aligned.</div><div class='add'>+ *	-EBUSY   Internal command or other IO in progress.</div><div class='add'>+ *	-EAGAIN  Time out waiting for command to complete.</div><div class='add'>+ */</div><div class='add'>+static int mtip_exec_internal_command(struct mtip_port *port,</div><div class='add'>+					void *fis,</div><div class='add'>+					int fis_len,</div><div class='add'>+					dma_addr_t buffer,</div><div class='add'>+					int buf_len,</div><div class='add'>+					u32 opts,</div><div class='add'>+					gfp_t atomic,</div><div class='add'>+					unsigned long timeout)</div><div class='add'>+{</div><div class='add'>+	struct mtip_cmd_sg *command_sg;</div><div class='add'>+	DECLARE_COMPLETION_ONSTACK(wait);</div><div class='add'>+	int rv = 0;</div><div class='add'>+	struct mtip_cmd *int_cmd = &amp;port-&gt;commands[MTIP_TAG_INTERNAL];</div><div class='add'>+</div><div class='add'>+	/* Make sure the buffer is 8 byte aligned. This is asic specific. */</div><div class='add'>+	if (buffer &amp; 0x00000007) {</div><div class='add'>+		dev_err(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"SG buffer is not 8 byte aligned\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Only one internal command should be running at a time */</div><div class='add'>+	if (test_and_set_bit(MTIP_TAG_INTERNAL, port-&gt;allocated)) {</div><div class='add'>+		dev_warn(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Internal command already active\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	set_bit(MTIP_FLAG_IC_ACTIVE_BIT, &amp;port-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if (atomic == GFP_KERNEL) {</div><div class='add'>+		/* wait for io to complete if non atomic */</div><div class='add'>+		if (mtip_quiesce_io(port, 5000) &lt; 0) {</div><div class='add'>+			dev_warn(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+				"Failed to quiesce IO\n");</div><div class='add'>+			release_slot(port, MTIP_TAG_INTERNAL);</div><div class='add'>+			clear_bit(MTIP_FLAG_IC_ACTIVE_BIT, &amp;port-&gt;flags);</div><div class='add'>+			wake_up_interruptible(&amp;port-&gt;svc_wait);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set the completion function and data for the command. */</div><div class='add'>+		int_cmd-&gt;comp_data = &amp;wait;</div><div class='add'>+		int_cmd-&gt;comp_func = mtip_completion;</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		/* Clear completion - we're going to poll */</div><div class='add'>+		int_cmd-&gt;comp_data = NULL;</div><div class='add'>+		int_cmd-&gt;comp_func = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy the command to the command table */</div><div class='add'>+	memcpy(int_cmd-&gt;command, fis, fis_len*4);</div><div class='add'>+</div><div class='add'>+	/* Populate the SG list */</div><div class='add'>+	int_cmd-&gt;command_header-&gt;opts =</div><div class='add'>+		 __force_bit2int cpu_to_le32(opts | fis_len);</div><div class='add'>+	if (buf_len) {</div><div class='add'>+		command_sg = int_cmd-&gt;command + AHCI_CMD_TBL_HDR_SZ;</div><div class='add'>+</div><div class='add'>+		command_sg-&gt;info =</div><div class='add'>+			__force_bit2int cpu_to_le32((buf_len-1) &amp; 0x3FFFFF);</div><div class='add'>+		command_sg-&gt;dba	=</div><div class='add'>+			__force_bit2int cpu_to_le32(buffer &amp; 0xFFFFFFFF);</div><div class='add'>+		command_sg-&gt;dba_upper =</div><div class='add'>+			__force_bit2int cpu_to_le32((buffer &gt;&gt; 16) &gt;&gt; 16);</div><div class='add'>+</div><div class='add'>+		int_cmd-&gt;command_header-&gt;opts |=</div><div class='add'>+			__force_bit2int cpu_to_le32((1 &lt;&lt; 16));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Populate the command header */</div><div class='add'>+	int_cmd-&gt;command_header-&gt;byte_count = 0;</div><div class='add'>+</div><div class='add'>+	/* Issue the command to the hardware */</div><div class='add'>+	mtip_issue_non_ncq_command(port, MTIP_TAG_INTERNAL);</div><div class='add'>+</div><div class='add'>+	/* Poll if atomic, wait_for_completion otherwise */</div><div class='add'>+	if (atomic == GFP_KERNEL) {</div><div class='add'>+		/* Wait for the command to complete or timeout. */</div><div class='add'>+		if (wait_for_completion_timeout(</div><div class='add'>+				&amp;wait,</div><div class='add'>+				msecs_to_jiffies(timeout)) == 0) {</div><div class='add'>+			dev_err(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+				"Internal command did not complete [%d] "</div><div class='add'>+				"within timeout of  %lu ms\n",</div><div class='add'>+				atomic, timeout);</div><div class='add'>+			rv = -EAGAIN;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (readl(port-&gt;cmd_issue[MTIP_TAG_INTERNAL])</div><div class='add'>+			&amp; (1 &lt;&lt; MTIP_TAG_INTERNAL)) {</div><div class='add'>+			dev_warn(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+				"Retiring internal command but CI is 1.\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		/* Spin for &lt;timeout&gt; checking if command still outstanding */</div><div class='add'>+		timeout = jiffies + msecs_to_jiffies(timeout);</div><div class='add'>+</div><div class='add'>+		while ((readl(</div><div class='add'>+			port-&gt;cmd_issue[MTIP_TAG_INTERNAL])</div><div class='add'>+			&amp; (1 &lt;&lt; MTIP_TAG_INTERNAL))</div><div class='add'>+			&amp;&amp; time_before(jiffies, timeout))</div><div class='add'>+			;</div><div class='add'>+</div><div class='add'>+		if (readl(port-&gt;cmd_issue[MTIP_TAG_INTERNAL])</div><div class='add'>+			&amp; (1 &lt;&lt; MTIP_TAG_INTERNAL)) {</div><div class='add'>+			dev_err(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+				"Internal command did not complete [%d]\n",</div><div class='add'>+				atomic);</div><div class='add'>+			rv = -EAGAIN;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear the allocated and active bits for the internal command. */</div><div class='add'>+	atomic_set(&amp;int_cmd-&gt;active, 0);</div><div class='add'>+	release_slot(port, MTIP_TAG_INTERNAL);</div><div class='add'>+	clear_bit(MTIP_FLAG_IC_ACTIVE_BIT, &amp;port-&gt;flags);</div><div class='add'>+	wake_up_interruptible(&amp;port-&gt;svc_wait);</div><div class='add'>+</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Byte-swap ATA ID strings.</div><div class='add'>+ *</div><div class='add'>+ * ATA identify data contains strings in byte-swapped 16-bit words.</div><div class='add'>+ * They must be swapped (on all architectures) to be usable as C strings.</div><div class='add'>+ * This function swaps bytes in-place.</div><div class='add'>+ *</div><div class='add'>+ * @buf The buffer location of the string</div><div class='add'>+ * @len The number of bytes to swap</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static inline void ata_swap_string(u16 *buf, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; (len/2); i++)</div><div class='add'>+		be16_to_cpus(&amp;buf[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Request the device identity information.</div><div class='add'>+ *</div><div class='add'>+ * If a user space buffer is not specified, i.e. is NULL, the</div><div class='add'>+ * identify information is still read from the drive and placed</div><div class='add'>+ * into the identify data buffer (@e port-&gt;identify) in the</div><div class='add'>+ * port data structure.</div><div class='add'>+ * When the identify buffer contains valid identify information @e</div><div class='add'>+ * port-&gt;identify_valid is non-zero.</div><div class='add'>+ *</div><div class='add'>+ * @port	 Pointer to the port structure.</div><div class='add'>+ * @user_buffer  A user space buffer where the identify data should be</div><div class='add'>+ *                    copied.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0	Command completed successfully.</div><div class='add'>+ *	-EFAULT An error occurred while coping data to the user buffer.</div><div class='add'>+ *	-1	Command failed.</div><div class='add'>+ */</div><div class='add'>+static int mtip_get_identify(struct mtip_port *port, void __user *user_buffer)</div><div class='add'>+{</div><div class='add'>+	int rv = 0;</div><div class='add'>+	struct host_to_dev_fis fis;</div><div class='add'>+</div><div class='add'>+	/* Build the FIS. */</div><div class='add'>+	memset(&amp;fis, 0, sizeof(struct host_to_dev_fis));</div><div class='add'>+	fis.type	= 0x27;</div><div class='add'>+	fis.opts	= 1 &lt;&lt; 7;</div><div class='add'>+	fis.command	= ATA_CMD_ID_ATA;</div><div class='add'>+</div><div class='add'>+	/* Set the identify information as invalid. */</div><div class='add'>+	port-&gt;identify_valid = 0;</div><div class='add'>+</div><div class='add'>+	/* Clear the identify information. */</div><div class='add'>+	memset(port-&gt;identify, 0, sizeof(u16) * ATA_ID_WORDS);</div><div class='add'>+</div><div class='add'>+	/* Execute the command. */</div><div class='add'>+	if (mtip_exec_internal_command(port,</div><div class='add'>+				&amp;fis,</div><div class='add'>+				5,</div><div class='add'>+				port-&gt;identify_dma,</div><div class='add'>+				sizeof(u16) * ATA_ID_WORDS,</div><div class='add'>+				0,</div><div class='add'>+				GFP_KERNEL,</div><div class='add'>+				MTIP_INTERNAL_COMMAND_TIMEOUT_MS)</div><div class='add'>+				&lt; 0) {</div><div class='add'>+		rv = -1;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Perform any necessary byte-swapping.  Yes, the kernel does in fact</div><div class='add'>+	 * perform field-sensitive swapping on the string fields.</div><div class='add'>+	 * See the kernel use of ata_id_string() for proof of this.</div><div class='add'>+	 */</div><div class='add'>+#ifdef __LITTLE_ENDIAN</div><div class='add'>+	ata_swap_string(port-&gt;identify + 27, 40);  /* model string*/</div><div class='add'>+	ata_swap_string(port-&gt;identify + 23, 8);   /* firmware string*/</div><div class='add'>+	ata_swap_string(port-&gt;identify + 10, 20);  /* serial# string*/</div><div class='add'>+#else</div><div class='add'>+	{</div><div class='add'>+		int i;</div><div class='add'>+		for (i = 0; i &lt; ATA_ID_WORDS; i++)</div><div class='add'>+			port-&gt;identify[i] = le16_to_cpu(port-&gt;identify[i]);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Set the identify buffer as valid. */</div><div class='add'>+	port-&gt;identify_valid = 1;</div><div class='add'>+</div><div class='add'>+	if (user_buffer) {</div><div class='add'>+		if (copy_to_user(</div><div class='add'>+			user_buffer,</div><div class='add'>+			port-&gt;identify,</div><div class='add'>+			ATA_ID_WORDS * sizeof(u16))) {</div><div class='add'>+			rv = -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'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Issue a standby immediate command to the device.</div><div class='add'>+ *</div><div class='add'>+ * @port Pointer to the port structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0	Command was executed successfully.</div><div class='add'>+ *	-1	An error occurred while executing the command.</div><div class='add'>+ */</div><div class='add'>+static int mtip_standby_immediate(struct mtip_port *port)</div><div class='add'>+{</div><div class='add'>+	int rv;</div><div class='add'>+	struct host_to_dev_fis	fis;</div><div class='add'>+</div><div class='add'>+	/* Build the FIS. */</div><div class='add'>+	memset(&amp;fis, 0, sizeof(struct host_to_dev_fis));</div><div class='add'>+	fis.type	= 0x27;</div><div class='add'>+	fis.opts	= 1 &lt;&lt; 7;</div><div class='add'>+	fis.command	= ATA_CMD_STANDBYNOW1;</div><div class='add'>+</div><div class='add'>+	/* Execute the command.  Use a 15-second timeout for large drives. */</div><div class='add'>+	rv = mtip_exec_internal_command(port,</div><div class='add'>+					&amp;fis,</div><div class='add'>+					5,</div><div class='add'>+					0,</div><div class='add'>+					0,</div><div class='add'>+					0,</div><div class='add'>+					GFP_KERNEL,</div><div class='add'>+					15000);</div><div class='add'>+</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get the drive capacity.</div><div class='add'>+ *</div><div class='add'>+ * @dd      Pointer to the device data structure.</div><div class='add'>+ * @sectors Pointer to the variable that will receive the sector count.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	1 Capacity was returned successfully.</div><div class='add'>+ *	0 The identify information is invalid.</div><div class='add'>+ */</div><div class='add'>+static bool mtip_hw_get_capacity(struct driver_data *dd, sector_t *sectors)</div><div class='add'>+{</div><div class='add'>+	struct mtip_port *port = dd-&gt;port;</div><div class='add'>+	u64 total, raw0, raw1, raw2, raw3;</div><div class='add'>+	raw0 = port-&gt;identify[100];</div><div class='add'>+	raw1 = port-&gt;identify[101];</div><div class='add'>+	raw2 = port-&gt;identify[102];</div><div class='add'>+	raw3 = port-&gt;identify[103];</div><div class='add'>+	total = raw0 | raw1&lt;&lt;16 | raw2&lt;&lt;32 | raw3&lt;&lt;48;</div><div class='add'>+	*sectors = total;</div><div class='add'>+	return (bool) !!port-&gt;identify_valid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Reset the HBA.</div><div class='add'>+ *</div><div class='add'>+ * Resets the HBA by setting the HBA Reset bit in the Global</div><div class='add'>+ * HBA Control register. After setting the HBA Reset bit the</div><div class='add'>+ * function waits for 1 second before reading the HBA Reset</div><div class='add'>+ * bit to make sure it has cleared. If HBA Reset is not clear</div><div class='add'>+ * an error is returned. Cannot be used in non-blockable</div><div class='add'>+ * context.</div><div class='add'>+ *</div><div class='add'>+ * @dd Pointer to the driver data structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0  The reset was successful.</div><div class='add'>+ *	-1 The HBA Reset bit did not clear.</div><div class='add'>+ */</div><div class='add'>+static int mtip_hba_reset(struct driver_data *dd)</div><div class='add'>+{</div><div class='add'>+	mtip_deinit_port(dd-&gt;port);</div><div class='add'>+</div><div class='add'>+	/* Set the reset bit */</div><div class='add'>+	writel(HOST_RESET, dd-&gt;mmio + HOST_CTL);</div><div class='add'>+</div><div class='add'>+	/* Flush */</div><div class='add'>+	readl(dd-&gt;mmio + HOST_CTL);</div><div class='add'>+</div><div class='add'>+	/* Wait for reset to clear */</div><div class='add'>+	ssleep(1);</div><div class='add'>+</div><div class='add'>+	/* Check the bit has cleared */</div><div class='add'>+	if (readl(dd-&gt;mmio + HOST_CTL) &amp; HOST_RESET) {</div><div class='add'>+		dev_err(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Reset bit did not clear.\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'>+/*</div><div class='add'>+ * Display the identify command data.</div><div class='add'>+ *</div><div class='add'>+ * @port Pointer to the port data structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static void mtip_dump_identify(struct mtip_port *port)</div><div class='add'>+{</div><div class='add'>+	sector_t sectors;</div><div class='add'>+	unsigned short revid;</div><div class='add'>+	char cbuf[42];</div><div class='add'>+</div><div class='add'>+	if (!port-&gt;identify_valid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	strlcpy(cbuf, (char *)(port-&gt;identify+10), 21);</div><div class='add'>+	dev_info(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+		"Serial No.: %s\n", cbuf);</div><div class='add'>+</div><div class='add'>+	strlcpy(cbuf, (char *)(port-&gt;identify+23), 9);</div><div class='add'>+	dev_info(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+		"Firmware Ver.: %s\n", cbuf);</div><div class='add'>+</div><div class='add'>+	strlcpy(cbuf, (char *)(port-&gt;identify+27), 41);</div><div class='add'>+	dev_info(&amp;port-&gt;dd-&gt;pdev-&gt;dev, "Model: %s\n", cbuf);</div><div class='add'>+</div><div class='add'>+	if (mtip_hw_get_capacity(port-&gt;dd, &amp;sectors))</div><div class='add'>+		dev_info(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Capacity: %llu sectors (%llu MB)\n",</div><div class='add'>+			 (u64)sectors,</div><div class='add'>+			 ((u64)sectors) * ATA_SECT_SIZE &gt;&gt; 20);</div><div class='add'>+</div><div class='add'>+	pci_read_config_word(port-&gt;dd-&gt;pdev, PCI_REVISION_ID, &amp;revid);</div><div class='add'>+	switch (revid &amp; 0xFF) {</div><div class='add'>+	case 0x1:</div><div class='add'>+		strlcpy(cbuf, "A0", 3);</div><div class='add'>+		break;</div><div class='add'>+	case 0x3:</div><div class='add'>+		strlcpy(cbuf, "A2", 3);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		strlcpy(cbuf, "?", 2);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	dev_info(&amp;port-&gt;dd-&gt;pdev-&gt;dev,</div><div class='add'>+		"Card Type: %s\n", cbuf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Map the commands scatter list into the command table.</div><div class='add'>+ *</div><div class='add'>+ * @command Pointer to the command.</div><div class='add'>+ * @nents Number of scatter list entries.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static inline void fill_command_sg(struct driver_data *dd,</div><div class='add'>+				struct mtip_cmd *command,</div><div class='add'>+				int nents)</div><div class='add'>+{</div><div class='add'>+	int n;</div><div class='add'>+	unsigned int dma_len;</div><div class='add'>+	struct mtip_cmd_sg *command_sg;</div><div class='add'>+	struct scatterlist *sg = command-&gt;sg;</div><div class='add'>+</div><div class='add'>+	command_sg = command-&gt;command + AHCI_CMD_TBL_HDR_SZ;</div><div class='add'>+</div><div class='add'>+	for (n = 0; n &lt; nents; n++) {</div><div class='add'>+		dma_len = sg_dma_len(sg);</div><div class='add'>+		if (dma_len &gt; 0x400000)</div><div class='add'>+			dev_err(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+				"DMA segment length truncated\n");</div><div class='add'>+		command_sg-&gt;info = __force_bit2int</div><div class='add'>+			cpu_to_le32((dma_len-1) &amp; 0x3FFFFF);</div><div class='add'>+		command_sg-&gt;dba	= __force_bit2int</div><div class='add'>+			cpu_to_le32(sg_dma_address(sg));</div><div class='add'>+		command_sg-&gt;dba_upper = __force_bit2int</div><div class='add'>+			cpu_to_le32((sg_dma_address(sg) &gt;&gt; 16) &gt;&gt; 16);</div><div class='add'>+		command_sg++;</div><div class='add'>+		sg++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * @brief Execute a drive command.</div><div class='add'>+ *</div><div class='add'>+ * return value 0 The command completed successfully.</div><div class='add'>+ * return value -1 An error occurred while executing the command.</div><div class='add'>+ */</div><div class='add'>+static int exec_drive_task(struct mtip_port *port, u8 *command)</div><div class='add'>+{</div><div class='add'>+	struct host_to_dev_fis	fis;</div><div class='add'>+	struct host_to_dev_fis *reply = (port-&gt;rxfis + RX_FIS_D2H_REG);</div><div class='add'>+</div><div class='add'>+	/* Build the FIS. */</div><div class='add'>+	memset(&amp;fis, 0, sizeof(struct host_to_dev_fis));</div><div class='add'>+	fis.type	= 0x27;</div><div class='add'>+	fis.opts	= 1 &lt;&lt; 7;</div><div class='add'>+	fis.command	= command[0];</div><div class='add'>+	fis.features	= command[1];</div><div class='add'>+	fis.sect_count	= command[2];</div><div class='add'>+	fis.sector	= command[3];</div><div class='add'>+	fis.cyl_low	= command[4];</div><div class='add'>+	fis.cyl_hi	= command[5];</div><div class='add'>+	fis.device	= command[6] &amp; ~0x10; /* Clear the dev bit*/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	dbg_printk(MTIP_DRV_NAME "%s: User Command: cmd %x, feat %x, "</div><div class='add'>+		"nsect %x, sect %x, lcyl %x, "</div><div class='add'>+		"hcyl %x, sel %x\n",</div><div class='add'>+		__func__,</div><div class='add'>+		command[0],</div><div class='add'>+		command[1],</div><div class='add'>+		command[2],</div><div class='add'>+		command[3],</div><div class='add'>+		command[4],</div><div class='add'>+		command[5],</div><div class='add'>+		command[6]);</div><div class='add'>+</div><div class='add'>+	/* Execute the command. */</div><div class='add'>+	if (mtip_exec_internal_command(port,</div><div class='add'>+				 &amp;fis,</div><div class='add'>+				 5,</div><div class='add'>+				 0,</div><div class='add'>+				 0,</div><div class='add'>+				 0,</div><div class='add'>+				 GFP_KERNEL,</div><div class='add'>+				 MTIP_IOCTL_COMMAND_TIMEOUT_MS) &lt; 0) {</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	command[0] = reply-&gt;command; /* Status*/</div><div class='add'>+	command[1] = reply-&gt;features; /* Error*/</div><div class='add'>+	command[4] = reply-&gt;cyl_low;</div><div class='add'>+	command[5] = reply-&gt;cyl_hi;</div><div class='add'>+</div><div class='add'>+	dbg_printk(MTIP_DRV_NAME "%s: Completion Status: stat %x, "</div><div class='add'>+		"err %x , cyl_lo %x cyl_hi %x\n",</div><div class='add'>+		__func__,</div><div class='add'>+		command[0],</div><div class='add'>+		command[1],</div><div class='add'>+		command[4],</div><div class='add'>+		command[5]);</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'>+ * @brief Execute a drive command.</div><div class='add'>+ *</div><div class='add'>+ * @param port Pointer to the port data structure.</div><div class='add'>+ * @param command Pointer to the user specified command parameters.</div><div class='add'>+ * @param user_buffer Pointer to the user space buffer where read sector</div><div class='add'>+ *                   data should be copied.</div><div class='add'>+ *</div><div class='add'>+ * return value 0 The command completed successfully.</div><div class='add'>+ * return value -EFAULT An error occurred while copying the completion</div><div class='add'>+ *                 data to the user space buffer.</div><div class='add'>+ * return value -1 An error occurred while executing the command.</div><div class='add'>+ */</div><div class='add'>+static int exec_drive_command(struct mtip_port *port, u8 *command,</div><div class='add'>+				void __user *user_buffer)</div><div class='add'>+{</div><div class='add'>+	struct host_to_dev_fis	fis;</div><div class='add'>+	struct host_to_dev_fis *reply = (port-&gt;rxfis + RX_FIS_D2H_REG);</div><div class='add'>+</div><div class='add'>+	/* Build the FIS. */</div><div class='add'>+	memset(&amp;fis, 0, sizeof(struct host_to_dev_fis));</div><div class='add'>+	fis.type		= 0x27;</div><div class='add'>+	fis.opts		= 1 &lt;&lt; 7;</div><div class='add'>+	fis.command		= command[0];</div><div class='add'>+	fis.features	= command[2];</div><div class='add'>+	fis.sect_count	= command[3];</div><div class='add'>+	if (fis.command == ATA_CMD_SMART) {</div><div class='add'>+		fis.sector	= command[1];</div><div class='add'>+		fis.cyl_low	= 0x4F;</div><div class='add'>+		fis.cyl_hi	= 0xC2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dbg_printk(MTIP_DRV_NAME</div><div class='add'>+		"%s: User Command: cmd %x, sect %x, "</div><div class='add'>+		"feat %x, sectcnt %x\n",</div><div class='add'>+		__func__,</div><div class='add'>+		command[0],</div><div class='add'>+		command[1],</div><div class='add'>+		command[2],</div><div class='add'>+		command[3]);</div><div class='add'>+</div><div class='add'>+	memset(port-&gt;sector_buffer, 0x00, ATA_SECT_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Execute the command. */</div><div class='add'>+	if (mtip_exec_internal_command(port,</div><div class='add'>+				&amp;fis,</div><div class='add'>+				 5,</div><div class='add'>+				 port-&gt;sector_buffer_dma,</div><div class='add'>+				 (command[3] != 0) ? ATA_SECT_SIZE : 0,</div><div class='add'>+				 0,</div><div class='add'>+				 GFP_KERNEL,</div><div class='add'>+				 MTIP_IOCTL_COMMAND_TIMEOUT_MS)</div><div class='add'>+				 &lt; 0) {</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Collect the completion status. */</div><div class='add'>+	command[0] = reply-&gt;command; /* Status*/</div><div class='add'>+	command[1] = reply-&gt;features; /* Error*/</div><div class='add'>+	command[2] = command[3];</div><div class='add'>+</div><div class='add'>+	dbg_printk(MTIP_DRV_NAME</div><div class='add'>+		"%s: Completion Status: stat %x, "</div><div class='add'>+		"err %x, cmd %x\n",</div><div class='add'>+		__func__,</div><div class='add'>+		command[0],</div><div class='add'>+		command[1],</div><div class='add'>+		command[2]);</div><div class='add'>+</div><div class='add'>+	if (user_buffer &amp;&amp; command[3]) {</div><div class='add'>+		if (copy_to_user(user_buffer,</div><div class='add'>+				 port-&gt;sector_buffer,</div><div class='add'>+				 ATA_SECT_SIZE * command[3])) {</div><div class='add'>+			return -EFAULT;</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'>+ *  Indicates whether a command has a single sector payload.</div><div class='add'>+ *</div><div class='add'>+ *  @command passed to the device to perform the certain event.</div><div class='add'>+ *  @features passed to the device to perform the certain event.</div><div class='add'>+ *</div><div class='add'>+ *  return value</div><div class='add'>+ *	1	command is one that always has a single sector payload,</div><div class='add'>+ *		regardless of the value in the Sector Count field.</div><div class='add'>+ *      0       otherwise</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static unsigned int implicit_sector(unsigned char command,</div><div class='add'>+				    unsigned char features)</div><div class='add'>+{</div><div class='add'>+	unsigned int rv = 0;</div><div class='add'>+</div><div class='add'>+	/* list of commands that have an implicit sector count of 1 */</div><div class='add'>+	switch (command) {</div><div class='add'>+	case ATA_CMD_SEC_SET_PASS:</div><div class='add'>+	case ATA_CMD_SEC_UNLOCK:</div><div class='add'>+	case ATA_CMD_SEC_ERASE_PREP:</div><div class='add'>+	case ATA_CMD_SEC_ERASE_UNIT:</div><div class='add'>+	case ATA_CMD_SEC_FREEZE_LOCK:</div><div class='add'>+	case ATA_CMD_SEC_DISABLE_PASS:</div><div class='add'>+	case ATA_CMD_PMP_READ:</div><div class='add'>+	case ATA_CMD_PMP_WRITE:</div><div class='add'>+		rv = 1;</div><div class='add'>+		break;</div><div class='add'>+	case ATA_CMD_SET_MAX:</div><div class='add'>+		if (features == ATA_SET_MAX_UNLOCK)</div><div class='add'>+			rv = 1;</div><div class='add'>+		break;</div><div class='add'>+	case ATA_CMD_SMART:</div><div class='add'>+		if ((features == ATA_SMART_READ_VALUES) ||</div><div class='add'>+				(features == ATA_SMART_READ_THRESHOLDS))</div><div class='add'>+			rv = 1;</div><div class='add'>+		break;</div><div class='add'>+	case ATA_CMD_CONF_OVERLAY:</div><div class='add'>+		if ((features == ATA_DCO_IDENTIFY) ||</div><div class='add'>+				(features == ATA_DCO_SET))</div><div class='add'>+			rv = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Executes a taskfile</div><div class='add'>+ * See ide_taskfile_ioctl() for derivation</div><div class='add'>+ */</div><div class='add'>+static int exec_drive_taskfile(struct driver_data *dd,</div><div class='add'>+			       void __user *buf,</div><div class='add'>+			       ide_task_request_t *req_task,</div><div class='add'>+			       int outtotal)</div><div class='add'>+{</div><div class='add'>+	struct host_to_dev_fis	fis;</div><div class='add'>+	struct host_to_dev_fis *reply;</div><div class='add'>+	u8 *outbuf = NULL;</div><div class='add'>+	u8 *inbuf = NULL;</div><div class='add'>+	dma_addr_t outbuf_dma = 0;</div><div class='add'>+	dma_addr_t inbuf_dma = 0;</div><div class='add'>+	dma_addr_t dma_buffer = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+	unsigned int taskin = 0;</div><div class='add'>+	unsigned int taskout = 0;</div><div class='add'>+	u8 nsect = 0;</div><div class='add'>+	unsigned int timeout = MTIP_IOCTL_COMMAND_TIMEOUT_MS;</div><div class='add'>+	unsigned int force_single_sector;</div><div class='add'>+	unsigned int transfer_size;</div><div class='add'>+	unsigned long task_file_data;</div><div class='add'>+	int intotal = outtotal + req_task-&gt;out_size;</div><div class='add'>+</div><div class='add'>+	taskout = req_task-&gt;out_size;</div><div class='add'>+	taskin = req_task-&gt;in_size;</div><div class='add'>+	/* 130560 = 512 * 0xFF*/</div><div class='add'>+	if (taskin &gt; 130560 || taskout &gt; 130560) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto abort;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (taskout) {</div><div class='add'>+		outbuf = kzalloc(taskout, GFP_KERNEL);</div><div class='add'>+		if (outbuf == NULL) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto abort;</div><div class='add'>+		}</div><div class='add'>+		if (copy_from_user(outbuf, buf + outtotal, taskout)) {</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+			goto abort;</div><div class='add'>+		}</div><div class='add'>+		outbuf_dma = pci_map_single(dd-&gt;pdev,</div><div class='add'>+					 outbuf,</div><div class='add'>+					 taskout,</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='add'>+		if (outbuf_dma == 0) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto abort;</div><div class='add'>+		}</div><div class='add'>+		dma_buffer = outbuf_dma;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (taskin) {</div><div class='add'>+		inbuf = kzalloc(taskin, GFP_KERNEL);</div><div class='add'>+		if (inbuf == NULL) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto abort;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (copy_from_user(inbuf, buf + intotal, taskin)) {</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+			goto abort;</div><div class='add'>+		}</div><div class='add'>+		inbuf_dma = pci_map_single(dd-&gt;pdev,</div><div class='add'>+					 inbuf,</div><div class='add'>+					 taskin, DMA_FROM_DEVICE);</div><div class='add'>+		if (inbuf_dma == 0) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto abort;</div><div class='add'>+		}</div><div class='add'>+		dma_buffer = inbuf_dma;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* only supports PIO and non-data commands from this ioctl. */</div><div class='add'>+	switch (req_task-&gt;data_phase) {</div><div class='add'>+	case TASKFILE_OUT:</div><div class='add'>+		nsect = taskout / ATA_SECT_SIZE;</div><div class='add'>+		reply = (dd-&gt;port-&gt;rxfis + RX_FIS_PIO_SETUP);</div><div class='add'>+		break;</div><div class='add'>+	case TASKFILE_IN:</div><div class='add'>+		reply = (dd-&gt;port-&gt;rxfis + RX_FIS_PIO_SETUP);</div><div class='add'>+		break;</div><div class='add'>+	case TASKFILE_NO_DATA:</div><div class='add'>+		reply = (dd-&gt;port-&gt;rxfis + RX_FIS_D2H_REG);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto abort;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Build the FIS. */</div><div class='add'>+	memset(&amp;fis, 0, sizeof(struct host_to_dev_fis));</div><div class='add'>+</div><div class='add'>+	fis.type	= 0x27;</div><div class='add'>+	fis.opts	= 1 &lt;&lt; 7;</div><div class='add'>+	fis.command	= req_task-&gt;io_ports[7];</div><div class='add'>+	fis.features	= req_task-&gt;io_ports[1];</div><div class='add'>+	fis.sect_count	= req_task-&gt;io_ports[2];</div><div class='add'>+	fis.lba_low	= req_task-&gt;io_ports[3];</div><div class='add'>+	fis.lba_mid	= req_task-&gt;io_ports[4];</div><div class='add'>+	fis.lba_hi	= req_task-&gt;io_ports[5];</div><div class='add'>+	 /* Clear the dev bit*/</div><div class='add'>+	fis.device	= req_task-&gt;io_ports[6] &amp; ~0x10;</div><div class='add'>+</div><div class='add'>+	if ((req_task-&gt;in_flags.all == 0) &amp;&amp; (req_task-&gt;out_flags.all &amp; 1)) {</div><div class='add'>+		req_task-&gt;in_flags.all	=</div><div class='add'>+			IDE_TASKFILE_STD_IN_FLAGS |</div><div class='add'>+			(IDE_HOB_STD_IN_FLAGS &lt;&lt; 8);</div><div class='add'>+		fis.lba_low_ex		= req_task-&gt;hob_ports[3];</div><div class='add'>+		fis.lba_mid_ex		= req_task-&gt;hob_ports[4];</div><div class='add'>+		fis.lba_hi_ex		= req_task-&gt;hob_ports[5];</div><div class='add'>+		fis.features_ex		= req_task-&gt;hob_ports[1];</div><div class='add'>+		fis.sect_cnt_ex		= req_task-&gt;hob_ports[2];</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		req_task-&gt;in_flags.all = IDE_TASKFILE_STD_IN_FLAGS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	force_single_sector = implicit_sector(fis.command, fis.features);</div><div class='add'>+</div><div class='add'>+	if ((taskin || taskout) &amp;&amp; (!fis.sect_count)) {</div><div class='add'>+		if (nsect)</div><div class='add'>+			fis.sect_count = nsect;</div><div class='add'>+		else {</div><div class='add'>+			if (!force_single_sector) {</div><div class='add'>+				dev_warn(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+					"data movement but "</div><div class='add'>+					"sect_count is 0\n");</div><div class='add'>+					err = -EINVAL;</div><div class='add'>+					goto abort;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dbg_printk(MTIP_DRV_NAME</div><div class='add'>+		"taskfile: cmd %x, feat %x, nsect %x,"</div><div class='add'>+		" sect/lbal %x, lcyl/lbam %x, hcyl/lbah %x,"</div><div class='add'>+		" head/dev %x\n",</div><div class='add'>+		fis.command,</div><div class='add'>+		fis.features,</div><div class='add'>+		fis.sect_count,</div><div class='add'>+		fis.lba_low,</div><div class='add'>+		fis.lba_mid,</div><div class='add'>+		fis.lba_hi,</div><div class='add'>+		fis.device);</div><div class='add'>+</div><div class='add'>+	switch (fis.command) {</div><div class='add'>+	case ATA_CMD_DOWNLOAD_MICRO:</div><div class='add'>+		/* Change timeout for Download Microcode to 60 seconds.*/</div><div class='add'>+		timeout = 60000;</div><div class='add'>+		break;</div><div class='add'>+	case ATA_CMD_SEC_ERASE_UNIT:</div><div class='add'>+		/* Change timeout for Security Erase Unit to 4 minutes.*/</div><div class='add'>+		timeout = 240000;</div><div class='add'>+		break;</div><div class='add'>+	case ATA_CMD_STANDBYNOW1:</div><div class='add'>+		/* Change timeout for standby immediate to 10 seconds.*/</div><div class='add'>+		timeout = 10000;</div><div class='add'>+		break;</div><div class='add'>+	case 0xF7:</div><div class='add'>+	case 0xFA:</div><div class='add'>+		/* Change timeout for vendor unique command to 10 secs */</div><div class='add'>+		timeout = 10000;</div><div class='add'>+		break;</div><div class='add'>+	case ATA_CMD_SMART:</div><div class='add'>+		/* Change timeout for vendor unique command to 10 secs */</div><div class='add'>+		timeout = 10000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		timeout = MTIP_IOCTL_COMMAND_TIMEOUT_MS;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Determine the correct transfer size.*/</div><div class='add'>+	if (force_single_sector)</div><div class='add'>+		transfer_size = ATA_SECT_SIZE;</div><div class='add'>+	else</div><div class='add'>+		transfer_size = ATA_SECT_SIZE * fis.sect_count;</div><div class='add'>+</div><div class='add'>+	/* Execute the command.*/</div><div class='add'>+	if (mtip_exec_internal_command(dd-&gt;port,</div><div class='add'>+				 &amp;fis,</div><div class='add'>+				 5,</div><div class='add'>+				 dma_buffer,</div><div class='add'>+				 transfer_size,</div><div class='add'>+				 0,</div><div class='add'>+				 GFP_KERNEL,</div><div class='add'>+				 timeout) &lt; 0) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto abort;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	task_file_data = readl(dd-&gt;port-&gt;mmio+PORT_TFDATA);</div><div class='add'>+</div><div class='add'>+	if ((req_task-&gt;data_phase == TASKFILE_IN) &amp;&amp; !(task_file_data &amp; 1)) {</div><div class='add'>+		reply = dd-&gt;port-&gt;rxfis + RX_FIS_PIO_SETUP;</div><div class='add'>+		req_task-&gt;io_ports[7] = reply-&gt;control;</div><div class='add'>+	} else {</div><div class='add'>+		reply = dd-&gt;port-&gt;rxfis + RX_FIS_D2H_REG;</div><div class='add'>+		req_task-&gt;io_ports[7] = reply-&gt;command;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* reclaim the DMA buffers.*/</div><div class='add'>+	if (inbuf_dma)</div><div class='add'>+		pci_unmap_single(dd-&gt;pdev, inbuf_dma,</div><div class='add'>+			taskin, DMA_FROM_DEVICE);</div><div class='add'>+	if (outbuf_dma)</div><div class='add'>+		pci_unmap_single(dd-&gt;pdev, outbuf_dma,</div><div class='add'>+			taskout, DMA_TO_DEVICE);</div><div class='add'>+	inbuf_dma  = 0;</div><div class='add'>+	outbuf_dma = 0;</div><div class='add'>+</div><div class='add'>+	/* return the ATA registers to the caller.*/</div><div class='add'>+	req_task-&gt;io_ports[1] = reply-&gt;features;</div><div class='add'>+	req_task-&gt;io_ports[2] = reply-&gt;sect_count;</div><div class='add'>+	req_task-&gt;io_ports[3] = reply-&gt;lba_low;</div><div class='add'>+	req_task-&gt;io_ports[4] = reply-&gt;lba_mid;</div><div class='add'>+	req_task-&gt;io_ports[5] = reply-&gt;lba_hi;</div><div class='add'>+	req_task-&gt;io_ports[6] = reply-&gt;device;</div><div class='add'>+</div><div class='add'>+	if (req_task-&gt;out_flags.all &amp; 1)  {</div><div class='add'>+</div><div class='add'>+		req_task-&gt;hob_ports[3] = reply-&gt;lba_low_ex;</div><div class='add'>+		req_task-&gt;hob_ports[4] = reply-&gt;lba_mid_ex;</div><div class='add'>+		req_task-&gt;hob_ports[5] = reply-&gt;lba_hi_ex;</div><div class='add'>+		req_task-&gt;hob_ports[1] = reply-&gt;features_ex;</div><div class='add'>+		req_task-&gt;hob_ports[2] = reply-&gt;sect_cnt_ex;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Com rest after secure erase or lowlevel format */</div><div class='add'>+	if (((fis.command == ATA_CMD_SEC_ERASE_UNIT) ||</div><div class='add'>+		((fis.command == 0xFC) &amp;&amp;</div><div class='add'>+			(fis.features == 0x27 || fis.features == 0x72 ||</div><div class='add'>+			 fis.features == 0x62 || fis.features == 0x26))) &amp;&amp;</div><div class='add'>+			 !(reply-&gt;command &amp; 1)) {</div><div class='add'>+		mtip_restart_port(dd-&gt;port);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dbg_printk(MTIP_DRV_NAME</div><div class='add'>+		"%s: Completion: stat %x,"</div><div class='add'>+		"err %x, sect_cnt %x, lbalo %x,"</div><div class='add'>+		"lbamid %x, lbahi %x, dev %x\n",</div><div class='add'>+		__func__,</div><div class='add'>+		req_task-&gt;io_ports[7],</div><div class='add'>+		req_task-&gt;io_ports[1],</div><div class='add'>+		req_task-&gt;io_ports[2],</div><div class='add'>+		req_task-&gt;io_ports[3],</div><div class='add'>+		req_task-&gt;io_ports[4],</div><div class='add'>+		req_task-&gt;io_ports[5],</div><div class='add'>+		req_task-&gt;io_ports[6]);</div><div class='add'>+</div><div class='add'>+	if (taskout) {</div><div class='add'>+		if (copy_to_user(buf + outtotal, outbuf, taskout)) {</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+			goto abort;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (taskin) {</div><div class='add'>+		if (copy_to_user(buf + intotal, inbuf, taskin)) {</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+			goto abort;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+abort:</div><div class='add'>+	if (inbuf_dma)</div><div class='add'>+		pci_unmap_single(dd-&gt;pdev, inbuf_dma,</div><div class='add'>+					taskin, DMA_FROM_DEVICE);</div><div class='add'>+	if (outbuf_dma)</div><div class='add'>+		pci_unmap_single(dd-&gt;pdev, outbuf_dma,</div><div class='add'>+					taskout, DMA_TO_DEVICE);</div><div class='add'>+	kfree(outbuf);</div><div class='add'>+	kfree(inbuf);</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'>+ * Handle IOCTL calls from the Block Layer.</div><div class='add'>+ *</div><div class='add'>+ * This function is called by the Block Layer when it receives an IOCTL</div><div class='add'>+ * command that it does not understand. If the IOCTL command is not supported</div><div class='add'>+ * this function returns -ENOTTY.</div><div class='add'>+ *</div><div class='add'>+ * @dd  Pointer to the driver data structure.</div><div class='add'>+ * @cmd IOCTL command passed from the Block Layer.</div><div class='add'>+ * @arg IOCTL argument passed from the Block Layer.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0	The IOCTL completed successfully.</div><div class='add'>+ *	-ENOTTY The specified command is not supported.</div><div class='add'>+ *	-EFAULT An error occurred copying data to a user space buffer.</div><div class='add'>+ *	-EIO	An error occurred while executing the command.</div><div class='add'>+ */</div><div class='add'>+static int mtip_hw_ioctl(struct driver_data *dd, unsigned int cmd,</div><div class='add'>+			 unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case HDIO_GET_IDENTITY:</div><div class='add'>+		if (mtip_get_identify(dd-&gt;port, (void __user *) arg) &lt; 0) {</div><div class='add'>+			dev_warn(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+				"Unable to read identity\n");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case HDIO_DRIVE_CMD:</div><div class='add'>+	{</div><div class='add'>+		u8 drive_command[4];</div><div class='add'>+</div><div class='add'>+		/* Copy the user command info to our buffer. */</div><div class='add'>+		if (copy_from_user(drive_command,</div><div class='add'>+					 (void __user *) arg,</div><div class='add'>+					 sizeof(drive_command)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		/* Execute the drive command. */</div><div class='add'>+		if (exec_drive_command(dd-&gt;port,</div><div class='add'>+					 drive_command,</div><div class='add'>+					 (void __user *) (arg+4)))</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='add'>+		/* Copy the status back to the users buffer. */</div><div class='add'>+		if (copy_to_user((void __user *) arg,</div><div class='add'>+					 drive_command,</div><div class='add'>+					 sizeof(drive_command)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case HDIO_DRIVE_TASK:</div><div class='add'>+	{</div><div class='add'>+		u8 drive_command[7];</div><div class='add'>+</div><div class='add'>+		/* Copy the user command info to our buffer. */</div><div class='add'>+		if (copy_from_user(drive_command,</div><div class='add'>+					 (void __user *) arg,</div><div class='add'>+					 sizeof(drive_command)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		/* Execute the drive command. */</div><div class='add'>+		if (exec_drive_task(dd-&gt;port, drive_command))</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='add'>+		/* Copy the status back to the users buffer. */</div><div class='add'>+		if (copy_to_user((void __user *) arg,</div><div class='add'>+					 drive_command,</div><div class='add'>+					 sizeof(drive_command)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case HDIO_DRIVE_TASKFILE: {</div><div class='add'>+		ide_task_request_t req_task;</div><div class='add'>+		int ret, outtotal;</div><div class='add'>+</div><div class='add'>+		if (copy_from_user(&amp;req_task, (void __user *) arg,</div><div class='add'>+					sizeof(req_task)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		outtotal = sizeof(req_task);</div><div class='add'>+</div><div class='add'>+		ret = exec_drive_taskfile(dd, (void __user *) arg,</div><div class='add'>+						&amp;req_task, outtotal);</div><div class='add'>+</div><div class='add'>+		if (copy_to_user((void __user *) arg, &amp;req_task,</div><div class='add'>+							sizeof(req_task)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</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'>+ * Submit an IO to the hw</div><div class='add'>+ *</div><div class='add'>+ * This function is called by the block layer to issue an io</div><div class='add'>+ * to the device. Upon completion, the callback function will</div><div class='add'>+ * be called with the data parameter passed as the callback data.</div><div class='add'>+ *</div><div class='add'>+ * @dd       Pointer to the driver data structure.</div><div class='add'>+ * @start    First sector to read.</div><div class='add'>+ * @nsect    Number of sectors to read.</div><div class='add'>+ * @nents    Number of entries in scatter list for the read command.</div><div class='add'>+ * @tag      The tag of this read command.</div><div class='add'>+ * @callback Pointer to the function that should be called</div><div class='add'>+ *	     when the read completes.</div><div class='add'>+ * @data     Callback data passed to the callback function</div><div class='add'>+ *	     when the read completes.</div><div class='add'>+ * @barrier  If non-zero, this command must be completed before</div><div class='add'>+ *	     issuing any other commands.</div><div class='add'>+ * @dir      Direction (read or write)</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static void mtip_hw_submit_io(struct driver_data *dd, sector_t start,</div><div class='add'>+			      int nsect, int nents, int tag, void *callback,</div><div class='add'>+			      void *data, int barrier, int dir)</div><div class='add'>+{</div><div class='add'>+	struct host_to_dev_fis	*fis;</div><div class='add'>+	struct mtip_port *port = dd-&gt;port;</div><div class='add'>+	struct mtip_cmd *command = &amp;port-&gt;commands[tag];</div><div class='add'>+</div><div class='add'>+	/* Map the scatter list for DMA access */</div><div class='add'>+	if (dir == READ)</div><div class='add'>+		nents = dma_map_sg(&amp;dd-&gt;pdev-&gt;dev, command-&gt;sg,</div><div class='add'>+					nents, DMA_FROM_DEVICE);</div><div class='add'>+	else</div><div class='add'>+		nents = dma_map_sg(&amp;dd-&gt;pdev-&gt;dev, command-&gt;sg,</div><div class='add'>+					nents, DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	command-&gt;scatter_ents = nents;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The number of retries for this command before it is</div><div class='add'>+	 * reported as a failure to the upper layers.</div><div class='add'>+	 */</div><div class='add'>+	command-&gt;retries = MTIP_MAX_RETRIES;</div><div class='add'>+</div><div class='add'>+	/* Fill out fis */</div><div class='add'>+	fis = command-&gt;command;</div><div class='add'>+	fis-&gt;type        = 0x27;</div><div class='add'>+	fis-&gt;opts        = 1 &lt;&lt; 7;</div><div class='add'>+	fis-&gt;command     =</div><div class='add'>+		(dir == READ ? ATA_CMD_FPDMA_READ : ATA_CMD_FPDMA_WRITE);</div><div class='add'>+	*((unsigned int *) &amp;fis-&gt;lba_low) = (start &amp; 0xFFFFFF);</div><div class='add'>+	*((unsigned int *) &amp;fis-&gt;lba_low_ex) = ((start &gt;&gt; 24) &amp; 0xFFFFFF);</div><div class='add'>+	fis-&gt;device	 = 1 &lt;&lt; 6;</div><div class='add'>+	if (barrier)</div><div class='add'>+		fis-&gt;device |= FUA_BIT;</div><div class='add'>+	fis-&gt;features    = nsect &amp; 0xFF;</div><div class='add'>+	fis-&gt;features_ex = (nsect &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+	fis-&gt;sect_count  = ((tag &lt;&lt; 3) | (tag &gt;&gt; 5));</div><div class='add'>+	fis-&gt;sect_cnt_ex = 0;</div><div class='add'>+	fis-&gt;control     = 0;</div><div class='add'>+	fis-&gt;res2        = 0;</div><div class='add'>+	fis-&gt;res3        = 0;</div><div class='add'>+	fill_command_sg(dd, command, nents);</div><div class='add'>+</div><div class='add'>+	/* Populate the command header */</div><div class='add'>+	command-&gt;command_header-&gt;opts =</div><div class='add'>+			__force_bit2int cpu_to_le32(</div><div class='add'>+				(nents &lt;&lt; 16) | 5 | AHCI_CMD_PREFETCH);</div><div class='add'>+	command-&gt;command_header-&gt;byte_count = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set the completion function and data for the command</div><div class='add'>+	 * within this layer.</div><div class='add'>+	 */</div><div class='add'>+	command-&gt;comp_data = dd;</div><div class='add'>+	command-&gt;comp_func = mtip_async_complete;</div><div class='add'>+	command-&gt;direction = (dir == READ ? DMA_FROM_DEVICE : DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set the completion function and data for the command passed</div><div class='add'>+	 * from the upper layer.</div><div class='add'>+	 */</div><div class='add'>+	command-&gt;async_data = data;</div><div class='add'>+	command-&gt;async_callback = callback;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * To prevent this command from being issued</div><div class='add'>+	 * if an internal command is in progress or error handling is active.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(test_bit(MTIP_FLAG_IC_ACTIVE_BIT, &amp;port-&gt;flags) ||</div><div class='add'>+			test_bit(MTIP_FLAG_EH_ACTIVE_BIT, &amp;port-&gt;flags))) {</div><div class='add'>+		set_bit(tag, port-&gt;cmds_to_issue);</div><div class='add'>+		set_bit(MTIP_FLAG_ISSUE_CMDS_BIT, &amp;port-&gt;flags);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Issue the command to the hardware */</div><div class='add'>+	mtip_issue_ncq_command(port, tag);</div><div class='add'>+</div><div class='add'>+	/* Set the command's timeout value.*/</div><div class='add'>+	port-&gt;commands[tag].comp_time = jiffies + msecs_to_jiffies(</div><div class='add'>+					MTIP_NCQ_COMMAND_TIMEOUT_MS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Release a command slot.</div><div class='add'>+ *</div><div class='add'>+ * @dd  Pointer to the driver data structure.</div><div class='add'>+ * @tag Slot tag</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *      None</div><div class='add'>+ */</div><div class='add'>+static void mtip_hw_release_scatterlist(struct driver_data *dd, int tag)</div><div class='add'>+{</div><div class='add'>+	release_slot(dd-&gt;port, tag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Obtain a command slot and return its associated scatter list.</div><div class='add'>+ *</div><div class='add'>+ * @dd  Pointer to the driver data structure.</div><div class='add'>+ * @tag Pointer to an int that will receive the allocated command</div><div class='add'>+ *            slot tag.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	Pointer to the scatter list for the allocated command slot</div><div class='add'>+ *	or NULL if no command slots are available.</div><div class='add'>+ */</div><div class='add'>+static struct scatterlist *mtip_hw_get_scatterlist(struct driver_data *dd,</div><div class='add'>+						   int *tag)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * It is possible that, even with this semaphore, a thread</div><div class='add'>+	 * may think that no command slots are available. Therefore, we</div><div class='add'>+	 * need to make an attempt to get_slot().</div><div class='add'>+	 */</div><div class='add'>+	down(&amp;dd-&gt;port-&gt;cmd_slot);</div><div class='add'>+	*tag = get_slot(dd-&gt;port);</div><div class='add'>+</div><div class='add'>+	if (unlikely(*tag &lt; 0))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return dd-&gt;port-&gt;commands[*tag].sg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Sysfs register/status dump.</div><div class='add'>+ *</div><div class='add'>+ * @dev  Pointer to the device structure, passed by the kernrel.</div><div class='add'>+ * @attr Pointer to the device_attribute structure passed by the kernel.</div><div class='add'>+ * @buf  Pointer to the char buffer that will receive the stats info.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	The size, in bytes, of the data copied into buf.</div><div class='add'>+ */</div><div class='add'>+static ssize_t hw_show_registers(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'>+	u32 group_allocated;</div><div class='add'>+	struct driver_data *dd = dev_to_disk(dev)-&gt;private_data;</div><div class='add'>+	int size = 0;</div><div class='add'>+	int n;</div><div class='add'>+</div><div class='add'>+	size += sprintf(&amp;buf[size], "%s:\ns_active:\n", __func__);</div><div class='add'>+</div><div class='add'>+	for (n = 0; n &lt; dd-&gt;slot_groups; n++)</div><div class='add'>+		size += sprintf(&amp;buf[size], "0x%08x\n",</div><div class='add'>+					 readl(dd-&gt;port-&gt;s_active[n]));</div><div class='add'>+</div><div class='add'>+	size += sprintf(&amp;buf[size], "Command Issue:\n");</div><div class='add'>+</div><div class='add'>+	for (n = 0; n &lt; dd-&gt;slot_groups; n++)</div><div class='add'>+		size += sprintf(&amp;buf[size], "0x%08x\n",</div><div class='add'>+					readl(dd-&gt;port-&gt;cmd_issue[n]));</div><div class='add'>+</div><div class='add'>+	size += sprintf(&amp;buf[size], "Allocated:\n");</div><div class='add'>+</div><div class='add'>+	for (n = 0; n &lt; dd-&gt;slot_groups; n++) {</div><div class='add'>+		if (sizeof(long) &gt; sizeof(u32))</div><div class='add'>+			group_allocated =</div><div class='add'>+				dd-&gt;port-&gt;allocated[n/2] &gt;&gt; (32*(n&amp;1));</div><div class='add'>+		else</div><div class='add'>+			group_allocated = dd-&gt;port-&gt;allocated[n];</div><div class='add'>+		size += sprintf(&amp;buf[size], "0x%08x\n",</div><div class='add'>+				 group_allocated);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	size += sprintf(&amp;buf[size], "completed:\n");</div><div class='add'>+</div><div class='add'>+	for (n = 0; n &lt; dd-&gt;slot_groups; n++)</div><div class='add'>+		size += sprintf(&amp;buf[size], "0x%08x\n",</div><div class='add'>+				readl(dd-&gt;port-&gt;completed[n]));</div><div class='add'>+</div><div class='add'>+	size += sprintf(&amp;buf[size], "PORT_IRQ_STAT 0x%08x\n",</div><div class='add'>+				readl(dd-&gt;port-&gt;mmio + PORT_IRQ_STAT));</div><div class='add'>+	size += sprintf(&amp;buf[size], "HOST_IRQ_STAT 0x%08x\n",</div><div class='add'>+				readl(dd-&gt;mmio + HOST_IRQ_STAT));</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(registers, S_IRUGO, hw_show_registers, NULL);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create the sysfs related attributes.</div><div class='add'>+ *</div><div class='add'>+ * @dd   Pointer to the driver data structure.</div><div class='add'>+ * @kobj Pointer to the kobj for the block device.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0	Operation completed successfully.</div><div class='add'>+ *	-EINVAL Invalid parameter.</div><div class='add'>+ */</div><div class='add'>+static int mtip_hw_sysfs_init(struct driver_data *dd, struct kobject *kobj)</div><div class='add'>+{</div><div class='add'>+	if (!kobj || !dd)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (sysfs_create_file(kobj, &amp;dev_attr_registers.attr))</div><div class='add'>+		dev_warn(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Error creating registers sysfs entry\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Remove the sysfs related attributes.</div><div class='add'>+ *</div><div class='add'>+ * @dd   Pointer to the driver data structure.</div><div class='add'>+ * @kobj Pointer to the kobj for the block device.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0	Operation completed successfully.</div><div class='add'>+ *	-EINVAL Invalid parameter.</div><div class='add'>+ */</div><div class='add'>+static int mtip_hw_sysfs_exit(struct driver_data *dd, struct kobject *kobj)</div><div class='add'>+{</div><div class='add'>+	if (!kobj || !dd)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	sysfs_remove_file(kobj, &amp;dev_attr_registers.attr);</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'>+ * Perform any init/resume time hardware setup</div><div class='add'>+ *</div><div class='add'>+ * @dd Pointer to the driver data structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static inline void hba_setup(struct driver_data *dd)</div><div class='add'>+{</div><div class='add'>+	u32 hwdata;</div><div class='add'>+	hwdata = readl(dd-&gt;mmio + HOST_HSORG);</div><div class='add'>+</div><div class='add'>+	/* interrupt bug workaround: use only 1 IS bit.*/</div><div class='add'>+	writel(hwdata |</div><div class='add'>+		HSORG_DISABLE_SLOTGRP_INTR |</div><div class='add'>+		HSORG_DISABLE_SLOTGRP_PXIS,</div><div class='add'>+		dd-&gt;mmio + HOST_HSORG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Detect the details of the product, and store anything needed</div><div class='add'>+ * into the driver data structure.  This includes product type and</div><div class='add'>+ * version and number of slot groups.</div><div class='add'>+ *</div><div class='add'>+ * @dd Pointer to the driver data structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static void mtip_detect_product(struct driver_data *dd)</div><div class='add'>+{</div><div class='add'>+	u32 hwdata;</div><div class='add'>+	unsigned int rev, slotgroups;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * HBA base + 0xFC [15:0] - vendor-specific hardware interface</div><div class='add'>+	 * info register:</div><div class='add'>+	 * [15:8] hardware/software interface rev#</div><div class='add'>+	 * [   3] asic-style interface</div><div class='add'>+	 * [ 2:0] number of slot groups, minus 1 (only valid for asic-style).</div><div class='add'>+	 */</div><div class='add'>+	hwdata = readl(dd-&gt;mmio + HOST_HSORG);</div><div class='add'>+</div><div class='add'>+	dd-&gt;product_type = MTIP_PRODUCT_UNKNOWN;</div><div class='add'>+	dd-&gt;slot_groups = 1;</div><div class='add'>+</div><div class='add'>+	if (hwdata &amp; 0x8) {</div><div class='add'>+		dd-&gt;product_type = MTIP_PRODUCT_ASICFPGA;</div><div class='add'>+		rev = (hwdata &amp; HSORG_HWREV) &gt;&gt; 8;</div><div class='add'>+		slotgroups = (hwdata &amp; HSORG_SLOTGROUPS) + 1;</div><div class='add'>+		dev_info(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"ASIC-FPGA design, HS rev 0x%x, "</div><div class='add'>+			"%i slot groups [%i slots]\n",</div><div class='add'>+			 rev,</div><div class='add'>+			 slotgroups,</div><div class='add'>+			 slotgroups * 32);</div><div class='add'>+</div><div class='add'>+		if (slotgroups &gt; MTIP_MAX_SLOT_GROUPS) {</div><div class='add'>+			dev_warn(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+				"Warning: driver only supports "</div><div class='add'>+				"%i slot groups.\n", MTIP_MAX_SLOT_GROUPS);</div><div class='add'>+			slotgroups = MTIP_MAX_SLOT_GROUPS;</div><div class='add'>+		}</div><div class='add'>+		dd-&gt;slot_groups = slotgroups;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_warn(&amp;dd-&gt;pdev-&gt;dev, "Unrecognized product id\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Blocking wait for FTL rebuild to complete</div><div class='add'>+ *</div><div class='add'>+ * @dd Pointer to the DRIVER_DATA structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0	FTL rebuild completed successfully</div><div class='add'>+ *	-EFAULT FTL rebuild error/timeout/interruption</div><div class='add'>+ */</div><div class='add'>+static int mtip_ftl_rebuild_poll(struct driver_data *dd)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout, cnt = 0, start;</div><div class='add'>+</div><div class='add'>+	dev_warn(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+		"FTL rebuild in progress. Polling for completion.\n");</div><div class='add'>+</div><div class='add'>+	start = jiffies;</div><div class='add'>+	dd-&gt;ftlrebuildflag = 1;</div><div class='add'>+	timeout = jiffies + msecs_to_jiffies(MTIP_FTL_REBUILD_TIMEOUT_MS);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (mtip_check_surprise_removal(dd-&gt;pdev))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		if (mtip_get_identify(dd-&gt;port, NULL) &lt; 0)</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		if (*(dd-&gt;port-&gt;identify + MTIP_FTL_REBUILD_OFFSET) ==</div><div class='add'>+			MTIP_FTL_REBUILD_MAGIC) {</div><div class='add'>+			ssleep(1);</div><div class='add'>+			/* Print message every 3 minutes */</div><div class='add'>+			if (cnt++ &gt;= 180) {</div><div class='add'>+				dev_warn(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+				"FTL rebuild in progress (%d secs).\n",</div><div class='add'>+				jiffies_to_msecs(jiffies - start) / 1000);</div><div class='add'>+				cnt = 0;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			dev_warn(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+				"FTL rebuild complete (%d secs).\n",</div><div class='add'>+			jiffies_to_msecs(jiffies - start) / 1000);</div><div class='add'>+			dd-&gt;ftlrebuildflag = 0;</div><div class='add'>+			mtip_block_initialize(dd);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ssleep(10);</div><div class='add'>+	} while (time_before(jiffies, timeout));</div><div class='add'>+</div><div class='add'>+	/* Check for timeout */</div><div class='add'>+	if (dd-&gt;ftlrebuildflag) {</div><div class='add'>+		dev_err(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+		"Timed out waiting for FTL rebuild to complete (%d secs).\n",</div><div class='add'>+		jiffies_to_msecs(jiffies - start) / 1000);</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'>+/*</div><div class='add'>+ * service thread to issue queued commands</div><div class='add'>+ *</div><div class='add'>+ * @data Pointer to the driver data structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int mtip_service_thread(void *data)</div><div class='add'>+{</div><div class='add'>+	struct driver_data *dd = (struct driver_data *)data;</div><div class='add'>+	unsigned long slot, slot_start, slot_wrap;</div><div class='add'>+	unsigned int num_cmd_slots = dd-&gt;slot_groups * 32;</div><div class='add'>+	struct mtip_port *port = dd-&gt;port;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		/*</div><div class='add'>+		 * the condition is to check neither an internal command is</div><div class='add'>+		 * is in progress nor error handling is active</div><div class='add'>+		 */</div><div class='add'>+		wait_event_interruptible(port-&gt;svc_wait, (port-&gt;flags) &amp;&amp;</div><div class='add'>+			!test_bit(MTIP_FLAG_IC_ACTIVE_BIT, &amp;port-&gt;flags) &amp;&amp;</div><div class='add'>+			!test_bit(MTIP_FLAG_EH_ACTIVE_BIT, &amp;port-&gt;flags));</div><div class='add'>+</div><div class='add'>+		if (kthread_should_stop())</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		set_bit(MTIP_FLAG_SVC_THD_ACTIVE_BIT, &amp;port-&gt;flags);</div><div class='add'>+		if (test_bit(MTIP_FLAG_ISSUE_CMDS_BIT, &amp;port-&gt;flags)) {</div><div class='add'>+			slot = 1;</div><div class='add'>+			/* used to restrict the loop to one iteration */</div><div class='add'>+			slot_start = num_cmd_slots;</div><div class='add'>+			slot_wrap = 0;</div><div class='add'>+			while (1) {</div><div class='add'>+				slot = find_next_bit(port-&gt;cmds_to_issue,</div><div class='add'>+						num_cmd_slots, slot);</div><div class='add'>+				if (slot_wrap == 1) {</div><div class='add'>+					if ((slot_start &gt;= slot) ||</div><div class='add'>+						(slot &gt;= num_cmd_slots))</div><div class='add'>+						break;</div><div class='add'>+				}</div><div class='add'>+				if (unlikely(slot_start == num_cmd_slots))</div><div class='add'>+					slot_start = slot;</div><div class='add'>+</div><div class='add'>+				if (unlikely(slot == num_cmd_slots)) {</div><div class='add'>+					slot = 1;</div><div class='add'>+					slot_wrap = 1;</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				/* Issue the command to the hardware */</div><div class='add'>+				mtip_issue_ncq_command(port, slot);</div><div class='add'>+</div><div class='add'>+				/* Set the command's timeout value.*/</div><div class='add'>+				port-&gt;commands[slot].comp_time = jiffies +</div><div class='add'>+				msecs_to_jiffies(MTIP_NCQ_COMMAND_TIMEOUT_MS);</div><div class='add'>+</div><div class='add'>+				clear_bit(slot, port-&gt;cmds_to_issue);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			clear_bit(MTIP_FLAG_ISSUE_CMDS_BIT, &amp;port-&gt;flags);</div><div class='add'>+		} else if (test_bit(MTIP_FLAG_REBUILD_BIT, &amp;port-&gt;flags)) {</div><div class='add'>+			mtip_ftl_rebuild_poll(dd);</div><div class='add'>+			clear_bit(MTIP_FLAG_REBUILD_BIT, &amp;port-&gt;flags);</div><div class='add'>+		}</div><div class='add'>+		clear_bit(MTIP_FLAG_SVC_THD_ACTIVE_BIT, &amp;port-&gt;flags);</div><div class='add'>+</div><div class='add'>+		if (test_bit(MTIP_FLAG_SVC_THD_SHOULD_STOP_BIT, &amp;port-&gt;flags))</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'>+ * Called once for each card.</div><div class='add'>+ *</div><div class='add'>+ * @dd Pointer to the driver data structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0 on success, else an error code.</div><div class='add'>+ */</div><div class='add'>+static int mtip_hw_init(struct driver_data *dd)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int rv;</div><div class='add'>+	unsigned int num_command_slots;</div><div class='add'>+</div><div class='add'>+	dd-&gt;mmio = pcim_iomap_table(dd-&gt;pdev)[MTIP_ABAR];</div><div class='add'>+</div><div class='add'>+	mtip_detect_product(dd);</div><div class='add'>+	if (dd-&gt;product_type == MTIP_PRODUCT_UNKNOWN) {</div><div class='add'>+		rv = -EIO;</div><div class='add'>+		goto out1;</div><div class='add'>+	}</div><div class='add'>+	num_command_slots = dd-&gt;slot_groups * 32;</div><div class='add'>+</div><div class='add'>+	hba_setup(dd);</div><div class='add'>+</div><div class='add'>+	tasklet_init(&amp;dd-&gt;tasklet, mtip_tasklet, (unsigned long)dd);</div><div class='add'>+</div><div class='add'>+	dd-&gt;port = kzalloc(sizeof(struct mtip_port), GFP_KERNEL);</div><div class='add'>+	if (!dd-&gt;port) {</div><div class='add'>+		dev_err(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Memory allocation: port structure\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Counting semaphore to track command slot usage */</div><div class='add'>+	sema_init(&amp;dd-&gt;port-&gt;cmd_slot, num_command_slots - 1);</div><div class='add'>+</div><div class='add'>+	/* Spinlock to prevent concurrent issue */</div><div class='add'>+	spin_lock_init(&amp;dd-&gt;port-&gt;cmd_issue_lock);</div><div class='add'>+</div><div class='add'>+	/* Set the port mmio base address. */</div><div class='add'>+	dd-&gt;port-&gt;mmio	= dd-&gt;mmio + PORT_OFFSET;</div><div class='add'>+	dd-&gt;port-&gt;dd	= dd;</div><div class='add'>+</div><div class='add'>+	/* Allocate memory for the command list. */</div><div class='add'>+	dd-&gt;port-&gt;command_list =</div><div class='add'>+		dmam_alloc_coherent(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			HW_PORT_PRIV_DMA_SZ + (ATA_SECT_SIZE * 2),</div><div class='add'>+			&amp;dd-&gt;port-&gt;command_list_dma,</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+	if (!dd-&gt;port-&gt;command_list) {</div><div class='add'>+		dev_err(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Memory allocation: command list\n");</div><div class='add'>+		rv = -ENOMEM;</div><div class='add'>+		goto out1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear the memory we have allocated. */</div><div class='add'>+	memset(dd-&gt;port-&gt;command_list,</div><div class='add'>+		0,</div><div class='add'>+		HW_PORT_PRIV_DMA_SZ + (ATA_SECT_SIZE * 2));</div><div class='add'>+</div><div class='add'>+	/* Setup the addresse of the RX FIS. */</div><div class='add'>+	dd-&gt;port-&gt;rxfis	    = dd-&gt;port-&gt;command_list + HW_CMD_SLOT_SZ;</div><div class='add'>+	dd-&gt;port-&gt;rxfis_dma = dd-&gt;port-&gt;command_list_dma + HW_CMD_SLOT_SZ;</div><div class='add'>+</div><div class='add'>+	/* Setup the address of the command tables. */</div><div class='add'>+	dd-&gt;port-&gt;command_table	  = dd-&gt;port-&gt;rxfis + AHCI_RX_FIS_SZ;</div><div class='add'>+	dd-&gt;port-&gt;command_tbl_dma = dd-&gt;port-&gt;rxfis_dma + AHCI_RX_FIS_SZ;</div><div class='add'>+</div><div class='add'>+	/* Setup the address of the identify data. */</div><div class='add'>+	dd-&gt;port-&gt;identify     = dd-&gt;port-&gt;command_table +</div><div class='add'>+					HW_CMD_TBL_AR_SZ;</div><div class='add'>+	dd-&gt;port-&gt;identify_dma = dd-&gt;port-&gt;command_tbl_dma +</div><div class='add'>+					HW_CMD_TBL_AR_SZ;</div><div class='add'>+</div><div class='add'>+	/* Setup the address of the sector buffer. */</div><div class='add'>+	dd-&gt;port-&gt;sector_buffer	= (void *) dd-&gt;port-&gt;identify + ATA_SECT_SIZE;</div><div class='add'>+	dd-&gt;port-&gt;sector_buffer_dma = dd-&gt;port-&gt;identify_dma + ATA_SECT_SIZE;</div><div class='add'>+</div><div class='add'>+	/* Point the command headers at the command tables. */</div><div class='add'>+	for (i = 0; i &lt; num_command_slots; i++) {</div><div class='add'>+		dd-&gt;port-&gt;commands[i].command_header =</div><div class='add'>+					dd-&gt;port-&gt;command_list +</div><div class='add'>+					(sizeof(struct mtip_cmd_hdr) * i);</div><div class='add'>+		dd-&gt;port-&gt;commands[i].command_header_dma =</div><div class='add'>+					dd-&gt;port-&gt;command_list_dma +</div><div class='add'>+					(sizeof(struct mtip_cmd_hdr) * i);</div><div class='add'>+</div><div class='add'>+		dd-&gt;port-&gt;commands[i].command =</div><div class='add'>+			dd-&gt;port-&gt;command_table + (HW_CMD_TBL_SZ * i);</div><div class='add'>+		dd-&gt;port-&gt;commands[i].command_dma =</div><div class='add'>+			dd-&gt;port-&gt;command_tbl_dma + (HW_CMD_TBL_SZ * i);</div><div class='add'>+</div><div class='add'>+		if (readl(dd-&gt;mmio + HOST_CAP) &amp; HOST_CAP_64)</div><div class='add'>+			dd-&gt;port-&gt;commands[i].command_header-&gt;ctbau =</div><div class='add'>+			__force_bit2int cpu_to_le32(</div><div class='add'>+			(dd-&gt;port-&gt;commands[i].command_dma &gt;&gt; 16) &gt;&gt; 16);</div><div class='add'>+		dd-&gt;port-&gt;commands[i].command_header-&gt;ctba =</div><div class='add'>+			__force_bit2int cpu_to_le32(</div><div class='add'>+			dd-&gt;port-&gt;commands[i].command_dma &amp; 0xFFFFFFFF);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If this is not done, a bug is reported by the stock</div><div class='add'>+		 * FC11 i386. Due to the fact that it has lots of kernel</div><div class='add'>+		 * debugging enabled.</div><div class='add'>+		 */</div><div class='add'>+		sg_init_table(dd-&gt;port-&gt;commands[i].sg, MTIP_MAX_SG);</div><div class='add'>+</div><div class='add'>+		/* Mark all commands as currently inactive.*/</div><div class='add'>+		atomic_set(&amp;dd-&gt;port-&gt;commands[i].active, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup the pointers to the extended s_active and CI registers. */</div><div class='add'>+	for (i = 0; i &lt; dd-&gt;slot_groups; i++) {</div><div class='add'>+		dd-&gt;port-&gt;s_active[i] =</div><div class='add'>+			dd-&gt;port-&gt;mmio + i*0x80 + PORT_SCR_ACT;</div><div class='add'>+		dd-&gt;port-&gt;cmd_issue[i] =</div><div class='add'>+			dd-&gt;port-&gt;mmio + i*0x80 + PORT_COMMAND_ISSUE;</div><div class='add'>+		dd-&gt;port-&gt;completed[i] =</div><div class='add'>+			dd-&gt;port-&gt;mmio + i*0x80 + PORT_SDBV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reset the HBA. */</div><div class='add'>+	if (mtip_hba_reset(dd) &lt; 0) {</div><div class='add'>+		dev_err(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Card did not reset within timeout\n");</div><div class='add'>+		rv = -EIO;</div><div class='add'>+		goto out2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mtip_init_port(dd-&gt;port);</div><div class='add'>+	mtip_start_port(dd-&gt;port);</div><div class='add'>+</div><div class='add'>+	/* Setup the ISR and enable interrupts. */</div><div class='add'>+	rv = devm_request_irq(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+				dd-&gt;pdev-&gt;irq,</div><div class='add'>+				mtip_irq_handler,</div><div class='add'>+				IRQF_SHARED,</div><div class='add'>+				dev_driver_string(&amp;dd-&gt;pdev-&gt;dev),</div><div class='add'>+				dd);</div><div class='add'>+</div><div class='add'>+	if (rv) {</div><div class='add'>+		dev_err(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Unable to allocate IRQ %d\n", dd-&gt;pdev-&gt;irq);</div><div class='add'>+		goto out2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable interrupts on the HBA. */</div><div class='add'>+	writel(readl(dd-&gt;mmio + HOST_CTL) | HOST_IRQ_EN,</div><div class='add'>+					dd-&gt;mmio + HOST_CTL);</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;dd-&gt;port-&gt;cmd_timer);</div><div class='add'>+	init_waitqueue_head(&amp;dd-&gt;port-&gt;svc_wait);</div><div class='add'>+</div><div class='add'>+	dd-&gt;port-&gt;cmd_timer.data = (unsigned long int) dd-&gt;port;</div><div class='add'>+	dd-&gt;port-&gt;cmd_timer.function = mtip_timeout_function;</div><div class='add'>+	mod_timer(&amp;dd-&gt;port-&gt;cmd_timer,</div><div class='add'>+		jiffies + msecs_to_jiffies(MTIP_TIMEOUT_CHECK_PERIOD));</div><div class='add'>+</div><div class='add'>+	if (mtip_get_identify(dd-&gt;port, NULL) &lt; 0) {</div><div class='add'>+		rv = -EFAULT;</div><div class='add'>+		goto out3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (*(dd-&gt;port-&gt;identify + MTIP_FTL_REBUILD_OFFSET) ==</div><div class='add'>+		MTIP_FTL_REBUILD_MAGIC) {</div><div class='add'>+		set_bit(MTIP_FLAG_REBUILD_BIT, &amp;dd-&gt;port-&gt;flags);</div><div class='add'>+		return MTIP_FTL_REBUILD_MAGIC;</div><div class='add'>+	}</div><div class='add'>+	mtip_dump_identify(dd-&gt;port);</div><div class='add'>+	return rv;</div><div class='add'>+</div><div class='add'>+out3:</div><div class='add'>+	del_timer_sync(&amp;dd-&gt;port-&gt;cmd_timer);</div><div class='add'>+</div><div class='add'>+	/* Disable interrupts on the HBA. */</div><div class='add'>+	writel(readl(dd-&gt;mmio + HOST_CTL) &amp; ~HOST_IRQ_EN,</div><div class='add'>+			dd-&gt;mmio + HOST_CTL);</div><div class='add'>+</div><div class='add'>+	/*Release the IRQ. */</div><div class='add'>+	devm_free_irq(&amp;dd-&gt;pdev-&gt;dev, dd-&gt;pdev-&gt;irq, dd);</div><div class='add'>+</div><div class='add'>+out2:</div><div class='add'>+	mtip_deinit_port(dd-&gt;port);</div><div class='add'>+</div><div class='add'>+	/* Free the command/command header memory. */</div><div class='add'>+	dmam_free_coherent(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+				HW_PORT_PRIV_DMA_SZ + (ATA_SECT_SIZE * 2),</div><div class='add'>+				dd-&gt;port-&gt;command_list,</div><div class='add'>+				dd-&gt;port-&gt;command_list_dma);</div><div class='add'>+out1:</div><div class='add'>+	/* Free the memory allocated for the for structure. */</div><div class='add'>+	kfree(dd-&gt;port);</div><div class='add'>+</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called to deinitialize an interface.</div><div class='add'>+ *</div><div class='add'>+ * @dd Pointer to the driver data structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0</div><div class='add'>+ */</div><div class='add'>+static int mtip_hw_exit(struct driver_data *dd)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Send standby immediate (E0h) to the drive so that it</div><div class='add'>+	 * saves its state.</div><div class='add'>+	 */</div><div class='add'>+	if (atomic_read(&amp;dd-&gt;drv_cleanup_done) != true) {</div><div class='add'>+</div><div class='add'>+		mtip_standby_immediate(dd-&gt;port);</div><div class='add'>+</div><div class='add'>+		/* de-initialize the port. */</div><div class='add'>+		mtip_deinit_port(dd-&gt;port);</div><div class='add'>+</div><div class='add'>+		/* Disable interrupts on the HBA. */</div><div class='add'>+		writel(readl(dd-&gt;mmio + HOST_CTL) &amp; ~HOST_IRQ_EN,</div><div class='add'>+				dd-&gt;mmio + HOST_CTL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	del_timer_sync(&amp;dd-&gt;port-&gt;cmd_timer);</div><div class='add'>+</div><div class='add'>+	/* Release the IRQ. */</div><div class='add'>+	devm_free_irq(&amp;dd-&gt;pdev-&gt;dev, dd-&gt;pdev-&gt;irq, dd);</div><div class='add'>+</div><div class='add'>+	/* Stop the bottom half tasklet. */</div><div class='add'>+	tasklet_kill(&amp;dd-&gt;tasklet);</div><div class='add'>+</div><div class='add'>+	/* Free the command/command header memory. */</div><div class='add'>+	dmam_free_coherent(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			HW_PORT_PRIV_DMA_SZ + (ATA_SECT_SIZE * 2),</div><div class='add'>+			dd-&gt;port-&gt;command_list,</div><div class='add'>+			dd-&gt;port-&gt;command_list_dma);</div><div class='add'>+	/* Free the memory allocated for the for structure. */</div><div class='add'>+	kfree(dd-&gt;port);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Issue a Standby Immediate command to the device.</div><div class='add'>+ *</div><div class='add'>+ * This function is called by the Block Layer just before the</div><div class='add'>+ * system powers off during a shutdown.</div><div class='add'>+ *</div><div class='add'>+ * @dd Pointer to the driver data structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0</div><div class='add'>+ */</div><div class='add'>+static int mtip_hw_shutdown(struct driver_data *dd)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Send standby immediate (E0h) to the drive so that it</div><div class='add'>+	 * saves its state.</div><div class='add'>+	 */</div><div class='add'>+	mtip_standby_immediate(dd-&gt;port);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Suspend function</div><div class='add'>+ *</div><div class='add'>+ * This function is called by the Block Layer just before the</div><div class='add'>+ * system hibernates.</div><div class='add'>+ *</div><div class='add'>+ * @dd Pointer to the driver data structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0	Suspend was successful</div><div class='add'>+ *	-EFAULT Suspend was not successful</div><div class='add'>+ */</div><div class='add'>+static int mtip_hw_suspend(struct driver_data *dd)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Send standby immediate (E0h) to the drive</div><div class='add'>+	 * so that it saves its state.</div><div class='add'>+	 */</div><div class='add'>+	if (mtip_standby_immediate(dd-&gt;port) != 0) {</div><div class='add'>+		dev_err(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Failed standby-immediate command\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable interrupts on the HBA.*/</div><div class='add'>+	writel(readl(dd-&gt;mmio + HOST_CTL) &amp; ~HOST_IRQ_EN,</div><div class='add'>+			dd-&gt;mmio + HOST_CTL);</div><div class='add'>+	mtip_deinit_port(dd-&gt;port);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Resume function</div><div class='add'>+ *</div><div class='add'>+ * This function is called by the Block Layer as the</div><div class='add'>+ * system resumes.</div><div class='add'>+ *</div><div class='add'>+ * @dd Pointer to the driver data structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0	Resume was successful</div><div class='add'>+ *      -EFAULT Resume was not successful</div><div class='add'>+ */</div><div class='add'>+static int mtip_hw_resume(struct driver_data *dd)</div><div class='add'>+{</div><div class='add'>+	/* Perform any needed hardware setup steps */</div><div class='add'>+	hba_setup(dd);</div><div class='add'>+</div><div class='add'>+	/* Reset the HBA */</div><div class='add'>+	if (mtip_hba_reset(dd) != 0) {</div><div class='add'>+		dev_err(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Unable to reset the HBA\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable the port, DMA engine, and FIS reception specific</div><div class='add'>+	 * h/w in controller.</div><div class='add'>+	 */</div><div class='add'>+	mtip_init_port(dd-&gt;port);</div><div class='add'>+	mtip_start_port(dd-&gt;port);</div><div class='add'>+</div><div class='add'>+	/* Enable interrupts on the HBA.*/</div><div class='add'>+	writel(readl(dd-&gt;mmio + HOST_CTL) | HOST_IRQ_EN,</div><div class='add'>+			dd-&gt;mmio + HOST_CTL);</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'>+ * Helper function for reusing disk name</div><div class='add'>+ * upon hot insertion.</div><div class='add'>+ */</div><div class='add'>+static int rssd_disk_name_format(char *prefix,</div><div class='add'>+				 int index,</div><div class='add'>+				 char *buf,</div><div class='add'>+				 int buflen)</div><div class='add'>+{</div><div class='add'>+	const int base = 'z' - 'a' + 1;</div><div class='add'>+	char *begin = buf + strlen(prefix);</div><div class='add'>+	char *end = buf + buflen;</div><div class='add'>+	char *p;</div><div class='add'>+	int unit;</div><div class='add'>+</div><div class='add'>+	p = end - 1;</div><div class='add'>+	*p = '\0';</div><div class='add'>+	unit = base;</div><div class='add'>+	do {</div><div class='add'>+		if (p == begin)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		*--p = 'a' + (index % unit);</div><div class='add'>+		index = (index / unit) - 1;</div><div class='add'>+	} while (index &gt;= 0);</div><div class='add'>+</div><div class='add'>+	memmove(begin, p, end - p);</div><div class='add'>+	memcpy(buf, prefix, strlen(prefix));</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'>+ * Block layer IOCTL handler.</div><div class='add'>+ *</div><div class='add'>+ * @dev Pointer to the block_device structure.</div><div class='add'>+ * @mode ignored</div><div class='add'>+ * @cmd IOCTL command passed from the user application.</div><div class='add'>+ * @arg Argument passed from the user application.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0        IOCTL completed successfully.</div><div class='add'>+ *	-ENOTTY  IOCTL not supported or invalid driver data</div><div class='add'>+ *                 structure pointer.</div><div class='add'>+ */</div><div class='add'>+static int mtip_block_ioctl(struct block_device *dev,</div><div class='add'>+			    fmode_t mode,</div><div class='add'>+			    unsigned cmd,</div><div class='add'>+			    unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct driver_data *dd = dev-&gt;bd_disk-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EACCES;</div><div class='add'>+</div><div class='add'>+	if (!dd)</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case BLKFLSBUF:</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	default:</div><div class='add'>+		return mtip_hw_ioctl(dd, cmd, arg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+/*</div><div class='add'>+ * Block layer compat IOCTL handler.</div><div class='add'>+ *</div><div class='add'>+ * @dev Pointer to the block_device structure.</div><div class='add'>+ * @mode ignored</div><div class='add'>+ * @cmd IOCTL command passed from the user application.</div><div class='add'>+ * @arg Argument passed from the user application.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0        IOCTL completed successfully.</div><div class='add'>+ *	-ENOTTY  IOCTL not supported or invalid driver data</div><div class='add'>+ *                 structure pointer.</div><div class='add'>+ */</div><div class='add'>+static int mtip_block_compat_ioctl(struct block_device *dev,</div><div class='add'>+			    fmode_t mode,</div><div class='add'>+			    unsigned cmd,</div><div class='add'>+			    unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct driver_data *dd = dev-&gt;bd_disk-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EACCES;</div><div class='add'>+</div><div class='add'>+	if (!dd)</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case BLKFLSBUF:</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	case HDIO_DRIVE_TASKFILE: {</div><div class='add'>+		struct mtip_compat_ide_task_request_s __user *compat_req_task;</div><div class='add'>+		ide_task_request_t req_task;</div><div class='add'>+		int compat_tasksize, outtotal, ret;</div><div class='add'>+</div><div class='add'>+		compat_tasksize =</div><div class='add'>+			sizeof(struct mtip_compat_ide_task_request_s);</div><div class='add'>+</div><div class='add'>+		compat_req_task =</div><div class='add'>+			(struct mtip_compat_ide_task_request_s __user *) arg;</div><div class='add'>+</div><div class='add'>+		if (copy_from_user(&amp;req_task, (void __user *) arg,</div><div class='add'>+			compat_tasksize - (2 * sizeof(compat_long_t))))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		if (get_user(req_task.out_size, &amp;compat_req_task-&gt;out_size))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		if (get_user(req_task.in_size, &amp;compat_req_task-&gt;in_size))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		outtotal = sizeof(struct mtip_compat_ide_task_request_s);</div><div class='add'>+</div><div class='add'>+		ret = exec_drive_taskfile(dd, (void __user *) arg,</div><div class='add'>+						&amp;req_task, outtotal);</div><div class='add'>+</div><div class='add'>+		if (copy_to_user((void __user *) arg, &amp;req_task,</div><div class='add'>+				compat_tasksize -</div><div class='add'>+				(2 * sizeof(compat_long_t))))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		if (put_user(req_task.out_size, &amp;compat_req_task-&gt;out_size))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		if (put_user(req_task.in_size, &amp;compat_req_task-&gt;in_size))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		return mtip_hw_ioctl(dd, cmd, arg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Obtain the geometry of the device.</div><div class='add'>+ *</div><div class='add'>+ * You may think that this function is obsolete, but some applications,</div><div class='add'>+ * fdisk for example still used CHS values. This function describes the</div><div class='add'>+ * device as having 224 heads and 56 sectors per cylinder. These values are</div><div class='add'>+ * chosen so that each cylinder is aligned on a 4KB boundary. Since a</div><div class='add'>+ * partition is described in terms of a start and end cylinder this means</div><div class='add'>+ * that each partition is also 4KB aligned. Non-aligned partitions adversely</div><div class='add'>+ * affects performance.</div><div class='add'>+ *</div><div class='add'>+ * @dev Pointer to the block_device strucutre.</div><div class='add'>+ * @geo Pointer to a hd_geometry structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0       Operation completed successfully.</div><div class='add'>+ *	-ENOTTY An error occurred while reading the drive capacity.</div><div class='add'>+ */</div><div class='add'>+static int mtip_block_getgeo(struct block_device *dev,</div><div class='add'>+				struct hd_geometry *geo)</div><div class='add'>+{</div><div class='add'>+	struct driver_data *dd = dev-&gt;bd_disk-&gt;private_data;</div><div class='add'>+	sector_t capacity;</div><div class='add'>+</div><div class='add'>+	if (!dd)</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+</div><div class='add'>+	if (!(mtip_hw_get_capacity(dd, &amp;capacity))) {</div><div class='add'>+		dev_warn(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Could not get drive capacity.\n");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	geo-&gt;heads = 224;</div><div class='add'>+	geo-&gt;sectors = 56;</div><div class='add'>+	sector_div(capacity, (geo-&gt;heads * geo-&gt;sectors));</div><div class='add'>+	geo-&gt;cylinders = capacity;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Block device operation function.</div><div class='add'>+ *</div><div class='add'>+ * This structure contains pointers to the functions required by the block</div><div class='add'>+ * layer.</div><div class='add'>+ */</div><div class='add'>+static const struct block_device_operations mtip_block_ops = {</div><div class='add'>+	.ioctl		= mtip_block_ioctl,</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+	.compat_ioctl	= mtip_block_compat_ioctl,</div><div class='add'>+#endif</div><div class='add'>+	.getgeo		= mtip_block_getgeo,</div><div class='add'>+	.owner		= THIS_MODULE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Block layer make request function.</div><div class='add'>+ *</div><div class='add'>+ * This function is called by the kernel to process a BIO for</div><div class='add'>+ * the P320 device.</div><div class='add'>+ *</div><div class='add'>+ * @queue Pointer to the request queue. Unused other than to obtain</div><div class='add'>+ *              the driver data structure.</div><div class='add'>+ * @bio   Pointer to the BIO.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void mtip_make_request(struct request_queue *queue, struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	struct driver_data *dd = queue-&gt;queuedata;</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	struct bio_vec *bvec;</div><div class='add'>+	int nents = 0;</div><div class='add'>+	int tag = 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!bio_has_data(bio))) {</div><div class='add'>+		blk_queue_flush(queue, 0);</div><div class='add'>+		bio_endio(bio, 0);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sg = mtip_hw_get_scatterlist(dd, &amp;tag);</div><div class='add'>+	if (likely(sg != NULL)) {</div><div class='add'>+		blk_queue_bounce(queue, &amp;bio);</div><div class='add'>+</div><div class='add'>+		if (unlikely((bio)-&gt;bi_vcnt &gt; MTIP_MAX_SG)) {</div><div class='add'>+			dev_warn(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+				"Maximum number of SGL entries exceeded");</div><div class='add'>+			bio_io_error(bio);</div><div class='add'>+			mtip_hw_release_scatterlist(dd, tag);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Create the scatter list for this bio. */</div><div class='add'>+		bio_for_each_segment(bvec, bio, nents) {</div><div class='add'>+			sg_set_page(&amp;sg[nents],</div><div class='add'>+					bvec-&gt;bv_page,</div><div class='add'>+					bvec-&gt;bv_len,</div><div class='add'>+					bvec-&gt;bv_offset);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Issue the read/write. */</div><div class='add'>+		mtip_hw_submit_io(dd,</div><div class='add'>+				bio-&gt;bi_sector,</div><div class='add'>+				bio_sectors(bio),</div><div class='add'>+				nents,</div><div class='add'>+				tag,</div><div class='add'>+				bio_endio,</div><div class='add'>+				bio,</div><div class='add'>+				bio-&gt;bi_rw &amp; REQ_FUA,</div><div class='add'>+				bio_data_dir(bio));</div><div class='add'>+	} else</div><div class='add'>+		bio_io_error(bio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Block layer initialization function.</div><div class='add'>+ *</div><div class='add'>+ * This function is called once by the PCI layer for each P320</div><div class='add'>+ * device that is connected to the system.</div><div class='add'>+ *</div><div class='add'>+ * @dd Pointer to the driver data structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0 on success else an error code.</div><div class='add'>+ */</div><div class='add'>+static int mtip_block_initialize(struct driver_data *dd)</div><div class='add'>+{</div><div class='add'>+	int rv = 0, wait_for_rebuild = 0;</div><div class='add'>+	sector_t capacity;</div><div class='add'>+	unsigned int index = 0;</div><div class='add'>+	struct kobject *kobj;</div><div class='add'>+	unsigned char thd_name[16];</div><div class='add'>+</div><div class='add'>+	if (dd-&gt;disk)</div><div class='add'>+		goto skip_create_disk; /* hw init done, before rebuild */</div><div class='add'>+</div><div class='add'>+	/* Initialize the protocol layer. */</div><div class='add'>+	wait_for_rebuild = mtip_hw_init(dd);</div><div class='add'>+	if (wait_for_rebuild &lt; 0) {</div><div class='add'>+		dev_err(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Protocol layer initialization failed\n");</div><div class='add'>+		rv = -EINVAL;</div><div class='add'>+		goto protocol_init_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dd-&gt;disk = alloc_disk(MTIP_MAX_MINORS);</div><div class='add'>+	if (dd-&gt;disk  == NULL) {</div><div class='add'>+		dev_err(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Unable to allocate gendisk structure\n");</div><div class='add'>+		rv = -EINVAL;</div><div class='add'>+		goto alloc_disk_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Generate the disk name, implemented same as in sd.c */</div><div class='add'>+	do {</div><div class='add'>+		if (!ida_pre_get(&amp;rssd_index_ida, GFP_KERNEL))</div><div class='add'>+			goto ida_get_error;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;rssd_index_lock);</div><div class='add'>+		rv = ida_get_new(&amp;rssd_index_ida, &amp;index);</div><div class='add'>+		spin_unlock(&amp;rssd_index_lock);</div><div class='add'>+	} while (rv == -EAGAIN);</div><div class='add'>+</div><div class='add'>+	if (rv)</div><div class='add'>+		goto ida_get_error;</div><div class='add'>+</div><div class='add'>+	rv = rssd_disk_name_format("rssd",</div><div class='add'>+				index,</div><div class='add'>+				dd-&gt;disk-&gt;disk_name,</div><div class='add'>+				DISK_NAME_LEN);</div><div class='add'>+	if (rv)</div><div class='add'>+		goto disk_index_error;</div><div class='add'>+</div><div class='add'>+	dd-&gt;disk-&gt;driverfs_dev	= &amp;dd-&gt;pdev-&gt;dev;</div><div class='add'>+	dd-&gt;disk-&gt;major		= dd-&gt;major;</div><div class='add'>+	dd-&gt;disk-&gt;first_minor	= dd-&gt;instance * MTIP_MAX_MINORS;</div><div class='add'>+	dd-&gt;disk-&gt;fops		= &amp;mtip_block_ops;</div><div class='add'>+	dd-&gt;disk-&gt;private_data	= dd;</div><div class='add'>+	dd-&gt;index		= index;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if rebuild pending, start the service thread, and delay the block</div><div class='add'>+	 * queue creation and add_disk()</div><div class='add'>+	 */</div><div class='add'>+	if (wait_for_rebuild == MTIP_FTL_REBUILD_MAGIC)</div><div class='add'>+		goto start_service_thread;</div><div class='add'>+</div><div class='add'>+skip_create_disk:</div><div class='add'>+	/* Allocate the request queue. */</div><div class='add'>+	dd-&gt;queue = blk_alloc_queue(GFP_KERNEL);</div><div class='add'>+	if (dd-&gt;queue == NULL) {</div><div class='add'>+		dev_err(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Unable to allocate request queue\n");</div><div class='add'>+		rv = -ENOMEM;</div><div class='add'>+		goto block_queue_alloc_init_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Attach our request function to the request queue. */</div><div class='add'>+	blk_queue_make_request(dd-&gt;queue, mtip_make_request);</div><div class='add'>+</div><div class='add'>+	dd-&gt;disk-&gt;queue		= dd-&gt;queue;</div><div class='add'>+	dd-&gt;queue-&gt;queuedata	= dd;</div><div class='add'>+</div><div class='add'>+	/* Set device limits. */</div><div class='add'>+	set_bit(QUEUE_FLAG_NONROT, &amp;dd-&gt;queue-&gt;queue_flags);</div><div class='add'>+	blk_queue_max_segments(dd-&gt;queue, MTIP_MAX_SG);</div><div class='add'>+	blk_queue_physical_block_size(dd-&gt;queue, 4096);</div><div class='add'>+	blk_queue_io_min(dd-&gt;queue, 4096);</div><div class='add'>+	blk_queue_flush(dd-&gt;queue, 0);</div><div class='add'>+</div><div class='add'>+	/* Set the capacity of the device in 512 byte sectors. */</div><div class='add'>+	if (!(mtip_hw_get_capacity(dd, &amp;capacity))) {</div><div class='add'>+		dev_warn(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+			"Could not read drive capacity\n");</div><div class='add'>+		rv = -EIO;</div><div class='add'>+		goto read_capacity_error;</div><div class='add'>+	}</div><div class='add'>+	set_capacity(dd-&gt;disk, capacity);</div><div class='add'>+</div><div class='add'>+	/* Enable the block device and add it to /dev */</div><div class='add'>+	add_disk(dd-&gt;disk);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now that the disk is active, initialize any sysfs attributes</div><div class='add'>+	 * managed by the protocol layer.</div><div class='add'>+	 */</div><div class='add'>+	kobj = kobject_get(&amp;disk_to_dev(dd-&gt;disk)-&gt;kobj);</div><div class='add'>+	if (kobj) {</div><div class='add'>+		mtip_hw_sysfs_init(dd, kobj);</div><div class='add'>+		kobject_put(kobj);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dd-&gt;mtip_svc_handler)</div><div class='add'>+		return rv; /* service thread created for handling rebuild */</div><div class='add'>+</div><div class='add'>+start_service_thread:</div><div class='add'>+	sprintf(thd_name, "mtip_svc_thd_%02d", index);</div><div class='add'>+</div><div class='add'>+	dd-&gt;mtip_svc_handler = kthread_run(mtip_service_thread,</div><div class='add'>+						dd, thd_name);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(dd-&gt;mtip_svc_handler)) {</div><div class='add'>+		printk(KERN_ERR "mtip32xx: service thread failed to start\n");</div><div class='add'>+		dd-&gt;mtip_svc_handler = NULL;</div><div class='add'>+		rv = -EFAULT;</div><div class='add'>+		goto kthread_run_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rv;</div><div class='add'>+</div><div class='add'>+kthread_run_error:</div><div class='add'>+	/* Delete our gendisk. This also removes the device from /dev */</div><div class='add'>+	del_gendisk(dd-&gt;disk);</div><div class='add'>+</div><div class='add'>+read_capacity_error:</div><div class='add'>+	blk_cleanup_queue(dd-&gt;queue);</div><div class='add'>+</div><div class='add'>+block_queue_alloc_init_error:</div><div class='add'>+disk_index_error:</div><div class='add'>+	spin_lock(&amp;rssd_index_lock);</div><div class='add'>+	ida_remove(&amp;rssd_index_ida, index);</div><div class='add'>+	spin_unlock(&amp;rssd_index_lock);</div><div class='add'>+</div><div class='add'>+ida_get_error:</div><div class='add'>+	put_disk(dd-&gt;disk);</div><div class='add'>+</div><div class='add'>+alloc_disk_error:</div><div class='add'>+	mtip_hw_exit(dd); /* De-initialize the protocol layer. */</div><div class='add'>+</div><div class='add'>+protocol_init_error:</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Block layer deinitialization function.</div><div class='add'>+ *</div><div class='add'>+ * Called by the PCI layer as each P320 device is removed.</div><div class='add'>+ *</div><div class='add'>+ * @dd Pointer to the driver data structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0</div><div class='add'>+ */</div><div class='add'>+static int mtip_block_remove(struct driver_data *dd)</div><div class='add'>+{</div><div class='add'>+	struct kobject *kobj;</div><div class='add'>+</div><div class='add'>+	if (dd-&gt;mtip_svc_handler) {</div><div class='add'>+		set_bit(MTIP_FLAG_SVC_THD_SHOULD_STOP_BIT, &amp;dd-&gt;port-&gt;flags);</div><div class='add'>+		wake_up_interruptible(&amp;dd-&gt;port-&gt;svc_wait);</div><div class='add'>+		kthread_stop(dd-&gt;mtip_svc_handler);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clean up the sysfs attributes managed by the protocol layer. */</div><div class='add'>+	kobj = kobject_get(&amp;disk_to_dev(dd-&gt;disk)-&gt;kobj);</div><div class='add'>+	if (kobj) {</div><div class='add'>+		mtip_hw_sysfs_exit(dd, kobj);</div><div class='add'>+		kobject_put(kobj);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Delete our gendisk structure. This also removes the device</div><div class='add'>+	 * from /dev</div><div class='add'>+	 */</div><div class='add'>+	del_gendisk(dd-&gt;disk);</div><div class='add'>+	blk_cleanup_queue(dd-&gt;queue);</div><div class='add'>+	dd-&gt;disk  = NULL;</div><div class='add'>+	dd-&gt;queue = NULL;</div><div class='add'>+</div><div class='add'>+	/* De-initialize the protocol layer. */</div><div class='add'>+	mtip_hw_exit(dd);</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'>+ * Function called by the PCI layer when just before the</div><div class='add'>+ * machine shuts down.</div><div class='add'>+ *</div><div class='add'>+ * If a protocol layer shutdown function is present it will be called</div><div class='add'>+ * by this function.</div><div class='add'>+ *</div><div class='add'>+ * @dd Pointer to the driver data structure.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0</div><div class='add'>+ */</div><div class='add'>+static int mtip_block_shutdown(struct driver_data *dd)</div><div class='add'>+{</div><div class='add'>+	dev_info(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+		"Shutting down %s ...\n", dd-&gt;disk-&gt;disk_name);</div><div class='add'>+</div><div class='add'>+	/* Delete our gendisk structure, and cleanup the blk queue. */</div><div class='add'>+	del_gendisk(dd-&gt;disk);</div><div class='add'>+	blk_cleanup_queue(dd-&gt;queue);</div><div class='add'>+	dd-&gt;disk  = NULL;</div><div class='add'>+	dd-&gt;queue = NULL;</div><div class='add'>+</div><div class='add'>+	mtip_hw_shutdown(dd);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtip_block_suspend(struct driver_data *dd)</div><div class='add'>+{</div><div class='add'>+	dev_info(&amp;dd-&gt;pdev-&gt;dev,</div><div class='add'>+		"Suspending %s ...\n", dd-&gt;disk-&gt;disk_name);</div><div class='add'>+	mtip_hw_suspend(dd);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtip_block_resume(struct driver_data *dd)</div><div class='add'>+{</div><div class='add'>+	dev_info(&amp;dd-&gt;pdev-&gt;dev, "Resuming %s ...\n",</div><div class='add'>+		dd-&gt;disk-&gt;disk_name);</div><div class='add'>+	mtip_hw_resume(dd);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called for each supported PCI device detected.</div><div class='add'>+ *</div><div class='add'>+ * This function allocates the private data structure, enables the</div><div class='add'>+ * PCI device and then calls the block layer initialization function.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0 on success else an error code.</div><div class='add'>+ */</div><div class='add'>+static int mtip_pci_probe(struct pci_dev *pdev,</div><div class='add'>+			const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	int rv = 0;</div><div class='add'>+	struct driver_data *dd = NULL;</div><div class='add'>+</div><div class='add'>+	/* Allocate memory for this devices private data. */</div><div class='add'>+	dd = kzalloc(sizeof(struct driver_data), GFP_KERNEL);</div><div class='add'>+	if (dd == NULL) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"Unable to allocate memory for driver data\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the atomic variable as 1 in case of SRSI */</div><div class='add'>+	atomic_set(&amp;dd-&gt;drv_cleanup_done, true);</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;dd-&gt;resumeflag, false);</div><div class='add'>+</div><div class='add'>+	/* Attach the private data to this PCI device.  */</div><div class='add'>+	pci_set_drvdata(pdev, dd);</div><div class='add'>+</div><div class='add'>+	rv = pcim_enable_device(pdev);</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Unable to enable device\n");</div><div class='add'>+		goto iomap_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Map BAR5 to memory. */</div><div class='add'>+	rv = pcim_iomap_regions(pdev, 1 &lt;&lt; MTIP_ABAR, MTIP_DRV_NAME);</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Unable to map regions\n");</div><div class='add'>+		goto iomap_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {</div><div class='add'>+		rv = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));</div><div class='add'>+</div><div class='add'>+		if (rv) {</div><div class='add'>+			rv = pci_set_consistent_dma_mask(pdev,</div><div class='add'>+						DMA_BIT_MASK(32));</div><div class='add'>+			if (rv) {</div><div class='add'>+				dev_warn(&amp;pdev-&gt;dev,</div><div class='add'>+					"64-bit DMA enable failed\n");</div><div class='add'>+				goto setmask_err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	if (pci_enable_msi(pdev)) {</div><div class='add'>+		dev_warn(&amp;pdev-&gt;dev,</div><div class='add'>+			"Unable to enable MSI interrupt.\n");</div><div class='add'>+		goto block_initialize_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy the info we may need later into the private data structure. */</div><div class='add'>+	dd-&gt;major	= mtip_major;</div><div class='add'>+	dd-&gt;instance	= instance;</div><div class='add'>+	dd-&gt;pdev	= pdev;</div><div class='add'>+</div><div class='add'>+	/* Initialize the block layer. */</div><div class='add'>+	rv = mtip_block_initialize(dd);</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"Unable to initialize block layer\n");</div><div class='add'>+		goto block_initialize_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Increment the instance count so that each device has a unique</div><div class='add'>+	 * instance number.</div><div class='add'>+	 */</div><div class='add'>+	instance++;</div><div class='add'>+</div><div class='add'>+	goto done;</div><div class='add'>+</div><div class='add'>+block_initialize_err:</div><div class='add'>+	pci_disable_msi(pdev);</div><div class='add'>+</div><div class='add'>+setmask_err:</div><div class='add'>+	pcim_iounmap_regions(pdev, 1 &lt;&lt; MTIP_ABAR);</div><div class='add'>+</div><div class='add'>+iomap_err:</div><div class='add'>+	kfree(dd);</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+	return rv;</div><div class='add'>+done:</div><div class='add'>+	/* Set the atomic variable as 0 in case of SRSI */</div><div class='add'>+	atomic_set(&amp;dd-&gt;drv_cleanup_done, true);</div><div class='add'>+</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called for each probed device when the device is removed or the</div><div class='add'>+ * driver is unloaded.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	None</div><div class='add'>+ */</div><div class='add'>+static void mtip_pci_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct driver_data *dd = pci_get_drvdata(pdev);</div><div class='add'>+	int counter = 0;</div><div class='add'>+</div><div class='add'>+	if (mtip_check_surprise_removal(pdev)) {</div><div class='add'>+		while (atomic_read(&amp;dd-&gt;drv_cleanup_done) == false) {</div><div class='add'>+			counter++;</div><div class='add'>+			msleep(20);</div><div class='add'>+			if (counter == 10) {</div><div class='add'>+				/* Cleanup the outstanding commands */</div><div class='add'>+				mtip_command_cleanup(dd);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* Set the atomic variable as 1 in case of SRSI */</div><div class='add'>+	atomic_set(&amp;dd-&gt;drv_cleanup_done, true);</div><div class='add'>+</div><div class='add'>+	/* Clean up the block layer. */</div><div class='add'>+	mtip_block_remove(dd);</div><div class='add'>+</div><div class='add'>+	pci_disable_msi(pdev);</div><div class='add'>+</div><div class='add'>+	kfree(dd);</div><div class='add'>+	pcim_iounmap_regions(pdev, 1 &lt;&lt; MTIP_ABAR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called for each probed device when the device is suspended.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *	0  Success</div><div class='add'>+ *	&lt;0 Error</div><div class='add'>+ */</div><div class='add'>+static int mtip_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)</div><div class='add'>+{</div><div class='add'>+	int rv = 0;</div><div class='add'>+	struct driver_data *dd = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!dd) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"Driver private datastructure is NULL\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;dd-&gt;resumeflag, true);</div><div class='add'>+</div><div class='add'>+	/* Disable ports &amp; interrupts then send standby immediate */</div><div class='add'>+	rv = mtip_block_suspend(dd);</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"Failed to suspend controller\n");</div><div class='add'>+		return rv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Save the pci config space to pdev structure &amp;</div><div class='add'>+	 * disable the device</div><div class='add'>+	 */</div><div class='add'>+	pci_save_state(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+</div><div class='add'>+	/* Move to Low power state*/</div><div class='add'>+	pci_set_power_state(pdev, PCI_D3hot);</div><div class='add'>+</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called for each probed device when the device is resumed.</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *      0  Success</div><div class='add'>+ *      &lt;0 Error</div><div class='add'>+ */</div><div class='add'>+static int mtip_pci_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	int rv = 0;</div><div class='add'>+	struct driver_data *dd;</div><div class='add'>+</div><div class='add'>+	dd = pci_get_drvdata(pdev);</div><div class='add'>+	if (!dd) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"Driver private datastructure is NULL\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Move the device to active State */</div><div class='add'>+	pci_set_power_state(pdev, PCI_D0);</div><div class='add'>+</div><div class='add'>+	/* Restore PCI configuration space */</div><div class='add'>+	pci_restore_state(pdev);</div><div class='add'>+</div><div class='add'>+	/* Enable the PCI device*/</div><div class='add'>+	rv = pcim_enable_device(pdev);</div><div class='add'>+	if (rv &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"Failed to enable card during resume\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Calls hbaReset, initPort, &amp; startPort function</div><div class='add'>+	 * then enables interrupts</div><div class='add'>+	 */</div><div class='add'>+	rv = mtip_block_resume(dd);</div><div class='add'>+	if (rv &lt; 0)</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Unable to resume\n");</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	atomic_set(&amp;dd-&gt;resumeflag, false);</div><div class='add'>+</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Shutdown routine</div><div class='add'>+ *</div><div class='add'>+ * return value</div><div class='add'>+ *      None</div><div class='add'>+ */</div><div class='add'>+static void mtip_pci_shutdown(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct driver_data *dd = pci_get_drvdata(pdev);</div><div class='add'>+	if (dd)</div><div class='add'>+		mtip_block_shutdown(dd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Table of device ids supported by this driver. */</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(mtip_pci_tbl) = {</div><div class='add'>+	{  PCI_DEVICE(PCI_VENDOR_ID_MICRON, P320_DEVICE_ID) },</div><div class='add'>+	{ 0 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Structure that describes the PCI driver functions. */</div><div class='add'>+static struct pci_driver mtip_pci_driver = {</div><div class='add'>+	.name			= MTIP_DRV_NAME,</div><div class='add'>+	.id_table		= mtip_pci_tbl,</div><div class='add'>+	.probe			= mtip_pci_probe,</div><div class='add'>+	.remove			= mtip_pci_remove,</div><div class='add'>+	.suspend		= mtip_pci_suspend,</div><div class='add'>+	.resume			= mtip_pci_resume,</div><div class='add'>+	.shutdown		= mtip_pci_shutdown,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pci, mtip_pci_tbl);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Module initialization function.</div><div class='add'>+ *</div><div class='add'>+ * Called once when the module is loaded. This function allocates a major</div><div class='add'>+ * block device number to the Cyclone devices and registers the PCI layer</div><div class='add'>+ * of the driver.</div><div class='add'>+ *</div><div class='add'>+ * Return value</div><div class='add'>+ *      0 on success else error code.</div><div class='add'>+ */</div><div class='add'>+static int __init mtip_init(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO MTIP_DRV_NAME " Version " MTIP_DRV_VERSION "\n");</div><div class='add'>+</div><div class='add'>+	/* Allocate a major block device number to use with this driver. */</div><div class='add'>+	mtip_major = register_blkdev(0, MTIP_DRV_NAME);</div><div class='add'>+	if (mtip_major &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "Unable to register block device (%d)\n",</div><div class='add'>+		mtip_major);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register our PCI operations. */</div><div class='add'>+	return pci_register_driver(&amp;mtip_pci_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Module de-initialization function.</div><div class='add'>+ *</div><div class='add'>+ * Called once when the module is unloaded. This function deallocates</div><div class='add'>+ * the major block device number allocated by mtip_init() and</div><div class='add'>+ * unregisters the PCI layer of the driver.</div><div class='add'>+ *</div><div class='add'>+ * Return value</div><div class='add'>+ *      none</div><div class='add'>+ */</div><div class='add'>+static void __exit mtip_exit(void)</div><div class='add'>+{</div><div class='add'>+	/* Release the allocated major block device number. */</div><div class='add'>+	unregister_blkdev(mtip_major, MTIP_DRV_NAME);</div><div class='add'>+</div><div class='add'>+	/* Unregister the PCI driver. */</div><div class='add'>+	pci_unregister_driver(&amp;mtip_pci_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Micron Technology, Inc");</div><div class='add'>+MODULE_DESCRIPTION("Micron RealSSD PCIe Block Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION(MTIP_DRV_VERSION);</div><div class='add'>+</div><div class='add'>+module_init(mtip_init);</div><div class='add'>+module_exit(mtip_exit);</div><div class='head'>diff --git a/drivers/block/mtip32xx/mtip32xx.h b/drivers/block/mtip32xx/mtip32xx.h<br/>new file mode 100644<br/>index 000000000000..723d7c4946dc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/mtip32xx/mtip32xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/mtip32xx/mtip32xx.h</a></div><div class='hunk'>@@ -0,0 +1,423 @@</div><div class='add'>+/*</div><div class='add'>+ * mtip32xx.h - Header file for the P320 SSD Block Driver</div><div class='add'>+ *   Copyright (C) 2011 Micron Technology, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Portions of this code were derived from works subjected to the</div><div class='add'>+ * following copyright:</div><div class='add'>+ *    Copyright (C) 2009 Integrated Device Technology, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; 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'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MTIP32XX_H__</div><div class='add'>+#define __MTIP32XX_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/rwsem.h&gt;</div><div class='add'>+#include &lt;linux/ata.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/genhd.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+</div><div class='add'>+/* Offset of Subsystem Device ID in pci confoguration space */</div><div class='add'>+#define PCI_SUBSYSTEM_DEVICEID	0x2E</div><div class='add'>+</div><div class='add'>+/* offset of Device Control register in PCIe extended capabilites space */</div><div class='add'>+#define PCIE_CONFIG_EXT_DEVICE_CONTROL_OFFSET	0x48</div><div class='add'>+</div><div class='add'>+/* # of times to retry timed out IOs */</div><div class='add'>+#define MTIP_MAX_RETRIES	5</div><div class='add'>+</div><div class='add'>+/* Various timeout values in ms */</div><div class='add'>+#define MTIP_NCQ_COMMAND_TIMEOUT_MS       5000</div><div class='add'>+#define MTIP_IOCTL_COMMAND_TIMEOUT_MS     5000</div><div class='add'>+#define MTIP_INTERNAL_COMMAND_TIMEOUT_MS  5000</div><div class='add'>+</div><div class='add'>+/* check for timeouts every 500ms */</div><div class='add'>+#define MTIP_TIMEOUT_CHECK_PERIOD	500</div><div class='add'>+</div><div class='add'>+/* ftl rebuild */</div><div class='add'>+#define MTIP_FTL_REBUILD_OFFSET		142</div><div class='add'>+#define MTIP_FTL_REBUILD_MAGIC		0xED51</div><div class='add'>+#define MTIP_FTL_REBUILD_TIMEOUT_MS	2400000</div><div class='add'>+</div><div class='add'>+/* Macro to extract the tag bit number from a tag value. */</div><div class='add'>+#define MTIP_TAG_BIT(tag)	(tag &amp; 0x1F)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Macro to extract the tag index from a tag value. The index</div><div class='add'>+ * is used to access the correct s_active/Command Issue register based</div><div class='add'>+ * on the tag value.</div><div class='add'>+ */</div><div class='add'>+#define MTIP_TAG_INDEX(tag)	(tag &gt;&gt; 5)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Maximum number of scatter gather entries</div><div class='add'>+ * a single command may have.</div><div class='add'>+ */</div><div class='add'>+#define MTIP_MAX_SG		128</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Maximum number of slot groups (Command Issue &amp; s_active registers)</div><div class='add'>+ * NOTE: This is the driver maximum; check dd-&gt;slot_groups for actual value.</div><div class='add'>+ */</div><div class='add'>+#define MTIP_MAX_SLOT_GROUPS	8</div><div class='add'>+</div><div class='add'>+/* Internal command tag. */</div><div class='add'>+#define MTIP_TAG_INTERNAL	0</div><div class='add'>+</div><div class='add'>+/* Micron Vendor ID &amp; P320x SSD Device ID */</div><div class='add'>+#define PCI_VENDOR_ID_MICRON    0x1344</div><div class='add'>+#define P320_DEVICE_ID		0x5150</div><div class='add'>+</div><div class='add'>+/* Driver name and version strings */</div><div class='add'>+#define MTIP_DRV_NAME		"mtip32xx"</div><div class='add'>+#define MTIP_DRV_VERSION	"1.2.6os3"</div><div class='add'>+</div><div class='add'>+/* Maximum number of minor device numbers per device. */</div><div class='add'>+#define MTIP_MAX_MINORS		16</div><div class='add'>+</div><div class='add'>+/* Maximum number of supported command slots. */</div><div class='add'>+#define MTIP_MAX_COMMAND_SLOTS	(MTIP_MAX_SLOT_GROUPS * 32)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Per-tag bitfield size in longs.</div><div class='add'>+ * Linux bit manipulation functions</div><div class='add'>+ * (i.e. test_and_set_bit, find_next_zero_bit)</div><div class='add'>+ * manipulate memory in longs, so we try to make the math work.</div><div class='add'>+ * take the slot groups and find the number of longs, rounding up.</div><div class='add'>+ * Careful! i386 and x86_64 use different size longs!</div><div class='add'>+ */</div><div class='add'>+#define U32_PER_LONG	(sizeof(long) / sizeof(u32))</div><div class='add'>+#define SLOTBITS_IN_LONGS ((MTIP_MAX_SLOT_GROUPS + \</div><div class='add'>+					(U32_PER_LONG-1))/U32_PER_LONG)</div><div class='add'>+</div><div class='add'>+/* BAR number used to access the HBA registers. */</div><div class='add'>+#define MTIP_ABAR		5</div><div class='add'>+</div><div class='add'>+/* Forced Unit Access Bit */</div><div class='add'>+#define FUA_BIT			0x80</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+ #define dbg_printk(format, arg...)	\</div><div class='add'>+	printk(pr_fmt(format), ##arg);</div><div class='add'>+#else</div><div class='add'>+ #define dbg_printk(format, arg...)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define __force_bit2int (unsigned int __force)</div><div class='add'>+</div><div class='add'>+/* below are bit numbers in 'flags' defined in mtip_port */</div><div class='add'>+#define MTIP_FLAG_IC_ACTIVE_BIT			0</div><div class='add'>+#define MTIP_FLAG_EH_ACTIVE_BIT			1</div><div class='add'>+#define MTIP_FLAG_SVC_THD_ACTIVE_BIT		2</div><div class='add'>+#define MTIP_FLAG_ISSUE_CMDS_BIT		4</div><div class='add'>+#define MTIP_FLAG_REBUILD_BIT			5</div><div class='add'>+#define MTIP_FLAG_SVC_THD_SHOULD_STOP_BIT	8</div><div class='add'>+</div><div class='add'>+/* Register Frame Information Structure (FIS), host to device. */</div><div class='add'>+struct host_to_dev_fis {</div><div class='add'>+	/*</div><div class='add'>+	 * FIS type.</div><div class='add'>+	 * - 27h Register FIS, host to device.</div><div class='add'>+	 * - 34h Register FIS, device to host.</div><div class='add'>+	 * - 39h DMA Activate FIS, device to host.</div><div class='add'>+	 * - 41h DMA Setup FIS, bi-directional.</div><div class='add'>+	 * - 46h Data FIS, bi-directional.</div><div class='add'>+	 * - 58h BIST Activate FIS, bi-directional.</div><div class='add'>+	 * - 5Fh PIO Setup FIS, device to host.</div><div class='add'>+	 * - A1h Set Device Bits FIS, device to host.</div><div class='add'>+	 */</div><div class='add'>+	unsigned char type;</div><div class='add'>+	unsigned char opts;</div><div class='add'>+	unsigned char command;</div><div class='add'>+	unsigned char features;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		unsigned char lba_low;</div><div class='add'>+		unsigned char sector;</div><div class='add'>+	};</div><div class='add'>+	union {</div><div class='add'>+		unsigned char lba_mid;</div><div class='add'>+		unsigned char cyl_low;</div><div class='add'>+	};</div><div class='add'>+	union {</div><div class='add'>+		unsigned char lba_hi;</div><div class='add'>+		unsigned char cyl_hi;</div><div class='add'>+	};</div><div class='add'>+	union {</div><div class='add'>+		unsigned char device;</div><div class='add'>+		unsigned char head;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		unsigned char lba_low_ex;</div><div class='add'>+		unsigned char sector_ex;</div><div class='add'>+	};</div><div class='add'>+	union {</div><div class='add'>+		unsigned char lba_mid_ex;</div><div class='add'>+		unsigned char cyl_low_ex;</div><div class='add'>+	};</div><div class='add'>+	union {</div><div class='add'>+		unsigned char lba_hi_ex;</div><div class='add'>+		unsigned char cyl_hi_ex;</div><div class='add'>+	};</div><div class='add'>+	unsigned char features_ex;</div><div class='add'>+</div><div class='add'>+	unsigned char sect_count;</div><div class='add'>+	unsigned char sect_cnt_ex;</div><div class='add'>+	unsigned char res2;</div><div class='add'>+	unsigned char control;</div><div class='add'>+</div><div class='add'>+	unsigned int res3;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Command header structure. */</div><div class='add'>+struct mtip_cmd_hdr {</div><div class='add'>+	/*</div><div class='add'>+	 * Command options.</div><div class='add'>+	 * - Bits 31:16 Number of PRD entries.</div><div class='add'>+	 * - Bits 15:8 Unused in this implementation.</div><div class='add'>+	 * - Bit 7 Prefetch bit, informs the drive to prefetch PRD entries.</div><div class='add'>+	 * - Bit 6 Write bit, should be set when writing data to the device.</div><div class='add'>+	 * - Bit 5 Unused in this implementation.</div><div class='add'>+	 * - Bits 4:0 Length of the command FIS in DWords (DWord = 4 bytes).</div><div class='add'>+	 */</div><div class='add'>+	unsigned int opts;</div><div class='add'>+	/* This field is unsed when using NCQ. */</div><div class='add'>+	union {</div><div class='add'>+		unsigned int byte_count;</div><div class='add'>+		unsigned int status;</div><div class='add'>+	};</div><div class='add'>+	/*</div><div class='add'>+	 * Lower 32 bits of the command table address associated with this</div><div class='add'>+	 * header. The command table addresses must be 128 byte aligned.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int ctba;</div><div class='add'>+	/*</div><div class='add'>+	 * If 64 bit addressing is used this field is the upper 32 bits</div><div class='add'>+	 * of the command table address associated with this command.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int ctbau;</div><div class='add'>+	/* Reserved and unused. */</div><div class='add'>+	unsigned int res[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Command scatter gather structure (PRD). */</div><div class='add'>+struct mtip_cmd_sg {</div><div class='add'>+	/*</div><div class='add'>+	 * Low 32 bits of the data buffer address. For P320 this</div><div class='add'>+	 * address must be 8 byte aligned signified by bits 2:0 being</div><div class='add'>+	 * set to 0.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int dba;</div><div class='add'>+	/*</div><div class='add'>+	 * When 64 bit addressing is used this field is the upper</div><div class='add'>+	 * 32 bits of the data buffer address.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int dba_upper;</div><div class='add'>+	/* Unused. */</div><div class='add'>+	unsigned int reserved;</div><div class='add'>+	/*</div><div class='add'>+	 * Bit 31: interrupt when this data block has been transferred.</div><div class='add'>+	 * Bits 30..22: reserved</div><div class='add'>+	 * Bits 21..0: byte count (minus 1).  For P320 the byte count must be</div><div class='add'>+	 * 8 byte aligned signified by bits 2:0 being set to 1.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int info;</div><div class='add'>+};</div><div class='add'>+struct mtip_port;</div><div class='add'>+</div><div class='add'>+/* Structure used to describe a command. */</div><div class='add'>+struct mtip_cmd {</div><div class='add'>+</div><div class='add'>+	struct mtip_cmd_hdr *command_header; /* ptr to command header entry */</div><div class='add'>+</div><div class='add'>+	dma_addr_t command_header_dma; /* corresponding physical address */</div><div class='add'>+</div><div class='add'>+	void *command; /* ptr to command table entry */</div><div class='add'>+</div><div class='add'>+	dma_addr_t command_dma; /* corresponding physical address */</div><div class='add'>+</div><div class='add'>+	void *comp_data; /* data passed to completion function comp_func() */</div><div class='add'>+	/*</div><div class='add'>+	 * Completion function called by the ISR upon completion of</div><div class='add'>+	 * a command.</div><div class='add'>+	 */</div><div class='add'>+	void (*comp_func)(struct mtip_port *port,</div><div class='add'>+				int tag,</div><div class='add'>+				void *data,</div><div class='add'>+				int status);</div><div class='add'>+	/* Additional callback function that may be called by comp_func() */</div><div class='add'>+	void (*async_callback)(void *data, int status);</div><div class='add'>+</div><div class='add'>+	void *async_data; /* Addl. data passed to async_callback() */</div><div class='add'>+</div><div class='add'>+	int scatter_ents; /* Number of scatter list entries used */</div><div class='add'>+</div><div class='add'>+	struct scatterlist sg[MTIP_MAX_SG]; /* Scatter list entries */</div><div class='add'>+</div><div class='add'>+	int retries; /* The number of retries left for this command. */</div><div class='add'>+</div><div class='add'>+	int direction; /* Data transfer direction */</div><div class='add'>+</div><div class='add'>+	unsigned long comp_time; /* command completion time, in jiffies */</div><div class='add'>+</div><div class='add'>+	atomic_t active; /* declares if this command sent to the drive. */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Structure used to describe a port. */</div><div class='add'>+struct mtip_port {</div><div class='add'>+	/* Pointer back to the driver data for this port. */</div><div class='add'>+	struct driver_data *dd;</div><div class='add'>+	/*</div><div class='add'>+	 * Used to determine if the data pointed to by the</div><div class='add'>+	 * identify field is valid.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long identify_valid;</div><div class='add'>+	/* Base address of the memory mapped IO for the port. */</div><div class='add'>+	void __iomem *mmio;</div><div class='add'>+	/* Array of pointers to the memory mapped s_active registers. */</div><div class='add'>+	void __iomem *s_active[MTIP_MAX_SLOT_GROUPS];</div><div class='add'>+	/* Array of pointers to the memory mapped completed registers. */</div><div class='add'>+	void __iomem *completed[MTIP_MAX_SLOT_GROUPS];</div><div class='add'>+	/* Array of pointers to the memory mapped Command Issue registers. */</div><div class='add'>+	void __iomem *cmd_issue[MTIP_MAX_SLOT_GROUPS];</div><div class='add'>+	/*</div><div class='add'>+	 * Pointer to the beginning of the command header memory as used</div><div class='add'>+	 * by the driver.</div><div class='add'>+	 */</div><div class='add'>+	void *command_list;</div><div class='add'>+	/*</div><div class='add'>+	 * Pointer to the beginning of the command header memory as used</div><div class='add'>+	 * by the DMA.</div><div class='add'>+	 */</div><div class='add'>+	dma_addr_t command_list_dma;</div><div class='add'>+	/*</div><div class='add'>+	 * Pointer to the beginning of the RX FIS memory as used</div><div class='add'>+	 * by the driver.</div><div class='add'>+	 */</div><div class='add'>+	void *rxfis;</div><div class='add'>+	/*</div><div class='add'>+	 * Pointer to the beginning of the RX FIS memory as used</div><div class='add'>+	 * by the DMA.</div><div class='add'>+	 */</div><div class='add'>+	dma_addr_t rxfis_dma;</div><div class='add'>+	/*</div><div class='add'>+	 * Pointer to the beginning of the command table memory as used</div><div class='add'>+	 * by the driver.</div><div class='add'>+	 */</div><div class='add'>+	void *command_table;</div><div class='add'>+	/*</div><div class='add'>+	 * Pointer to the beginning of the command table memory as used</div><div class='add'>+	 * by the DMA.</div><div class='add'>+	 */</div><div class='add'>+	dma_addr_t command_tbl_dma;</div><div class='add'>+	/*</div><div class='add'>+	 * Pointer to the beginning of the identify data memory as used</div><div class='add'>+	 * by the driver.</div><div class='add'>+	 */</div><div class='add'>+	u16 *identify;</div><div class='add'>+	/*</div><div class='add'>+	 * Pointer to the beginning of the identify data memory as used</div><div class='add'>+	 * by the DMA.</div><div class='add'>+	 */</div><div class='add'>+	dma_addr_t identify_dma;</div><div class='add'>+	/*</div><div class='add'>+	 * Pointer to the beginning of a sector buffer that is used</div><div class='add'>+	 * by the driver when issuing internal commands.</div><div class='add'>+	 */</div><div class='add'>+	u16 *sector_buffer;</div><div class='add'>+	/*</div><div class='add'>+	 * Pointer to the beginning of a sector buffer that is used</div><div class='add'>+	 * by the DMA when the driver issues internal commands.</div><div class='add'>+	 */</div><div class='add'>+	dma_addr_t sector_buffer_dma;</div><div class='add'>+	/*</div><div class='add'>+	 * Bit significant, used to determine if a command slot has</div><div class='add'>+	 * been allocated. i.e. the slot is in use.  Bits are cleared</div><div class='add'>+	 * when the command slot and all associated data structures</div><div class='add'>+	 * are no longer needed.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long allocated[SLOTBITS_IN_LONGS];</div><div class='add'>+	/*</div><div class='add'>+	 * used to queue commands when an internal command is in progress</div><div class='add'>+	 * or error handling is active</div><div class='add'>+	 */</div><div class='add'>+	unsigned long cmds_to_issue[SLOTBITS_IN_LONGS];</div><div class='add'>+	/*</div><div class='add'>+	 * Array of command slots. Structure includes pointers to the</div><div class='add'>+	 * command header and command table, and completion function and data</div><div class='add'>+	 * pointers.</div><div class='add'>+	 */</div><div class='add'>+	struct mtip_cmd commands[MTIP_MAX_COMMAND_SLOTS];</div><div class='add'>+	/* Used by mtip_service_thread to wait for an event */</div><div class='add'>+	wait_queue_head_t svc_wait;</div><div class='add'>+	/*</div><div class='add'>+	 * indicates the state of the port. Also, helps the service thread</div><div class='add'>+	 * to determine its action on wake up.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	/*</div><div class='add'>+	 * Timer used to complete commands that have been active for too long.</div><div class='add'>+	 */</div><div class='add'>+	struct timer_list cmd_timer;</div><div class='add'>+	/*</div><div class='add'>+	 * Semaphore used to block threads if there are no</div><div class='add'>+	 * command slots available.</div><div class='add'>+	 */</div><div class='add'>+	struct semaphore cmd_slot;</div><div class='add'>+	/* Spinlock for working around command-issue bug. */</div><div class='add'>+	spinlock_t cmd_issue_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Driver private data structure.</div><div class='add'>+ *</div><div class='add'>+ * One structure is allocated per probed device.</div><div class='add'>+ */</div><div class='add'>+struct driver_data {</div><div class='add'>+	void __iomem *mmio; /* Base address of the HBA registers. */</div><div class='add'>+</div><div class='add'>+	int major; /* Major device number. */</div><div class='add'>+</div><div class='add'>+	int instance; /* Instance number. First device probed is 0, ... */</div><div class='add'>+</div><div class='add'>+	struct gendisk *disk; /* Pointer to our gendisk structure. */</div><div class='add'>+</div><div class='add'>+	struct pci_dev *pdev; /* Pointer to the PCI device structure. */</div><div class='add'>+</div><div class='add'>+	struct request_queue *queue; /* Our request queue. */</div><div class='add'>+</div><div class='add'>+	struct mtip_port *port; /* Pointer to the port data structure. */</div><div class='add'>+</div><div class='add'>+	/* Tasklet used to process the bottom half of the ISR. */</div><div class='add'>+	struct tasklet_struct tasklet;</div><div class='add'>+</div><div class='add'>+	unsigned product_type; /* magic value declaring the product type */</div><div class='add'>+</div><div class='add'>+	unsigned slot_groups; /* number of slot groups the product supports */</div><div class='add'>+</div><div class='add'>+	atomic_t drv_cleanup_done; /* Atomic variable for SRSI */</div><div class='add'>+</div><div class='add'>+	unsigned long index; /* Index to determine the disk name */</div><div class='add'>+</div><div class='add'>+	unsigned int ftlrebuildflag; /* FTL rebuild flag */</div><div class='add'>+</div><div class='add'>+	atomic_t resumeflag; /* Atomic variable to track suspend/resume */</div><div class='add'>+</div><div class='add'>+	atomic_t eh_active; /* Flag for error handling tracking */</div><div class='add'>+</div><div class='add'>+	struct task_struct *mtip_svc_handler; /* task_struct of svc thd */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c<br/>new file mode 100644<br/>index 000000000000..c1dc4d86c221<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/nvme.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/nvme.c</a></div><div class='hunk'>@@ -0,0 +1,1739 @@</div><div class='add'>+/*</div><div class='add'>+ * NVM Express device driver</div><div class='add'>+ * Copyright (c) 2011, Intel Corporation.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/nvme.h&gt;</div><div class='add'>+#include &lt;linux/bio.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/genhd.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/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/kdev_t.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/poison.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+</div><div class='add'>+#define NVME_Q_DEPTH 1024</div><div class='add'>+#define SQ_SIZE(depth)		(depth * sizeof(struct nvme_command))</div><div class='add'>+#define CQ_SIZE(depth)		(depth * sizeof(struct nvme_completion))</div><div class='add'>+#define NVME_MINORS 64</div><div class='add'>+#define NVME_IO_TIMEOUT	(5 * HZ)</div><div class='add'>+#define ADMIN_TIMEOUT	(60 * HZ)</div><div class='add'>+</div><div class='add'>+static int nvme_major;</div><div class='add'>+module_param(nvme_major, int, 0);</div><div class='add'>+</div><div class='add'>+static int use_threaded_interrupts;</div><div class='add'>+module_param(use_threaded_interrupts, int, 0);</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(dev_list_lock);</div><div class='add'>+static LIST_HEAD(dev_list);</div><div class='add'>+static struct task_struct *nvme_thread;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Represents an NVM Express device.  Each nvme_dev is a PCI function.</div><div class='add'>+ */</div><div class='add'>+struct nvme_dev {</div><div class='add'>+	struct list_head node;</div><div class='add'>+	struct nvme_queue **queues;</div><div class='add'>+	u32 __iomem *dbs;</div><div class='add'>+	struct pci_dev *pci_dev;</div><div class='add'>+	struct dma_pool *prp_page_pool;</div><div class='add'>+	struct dma_pool *prp_small_pool;</div><div class='add'>+	int instance;</div><div class='add'>+	int queue_count;</div><div class='add'>+	int db_stride;</div><div class='add'>+	u32 ctrl_config;</div><div class='add'>+	struct msix_entry *entry;</div><div class='add'>+	struct nvme_bar __iomem *bar;</div><div class='add'>+	struct list_head namespaces;</div><div class='add'>+	char serial[20];</div><div class='add'>+	char model[40];</div><div class='add'>+	char firmware_rev[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * An NVM Express namespace is equivalent to a SCSI LUN</div><div class='add'>+ */</div><div class='add'>+struct nvme_ns {</div><div class='add'>+	struct list_head list;</div><div class='add'>+</div><div class='add'>+	struct nvme_dev *dev;</div><div class='add'>+	struct request_queue *queue;</div><div class='add'>+	struct gendisk *disk;</div><div class='add'>+</div><div class='add'>+	int ns_id;</div><div class='add'>+	int lba_shift;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * An NVM Express queue.  Each device has at least two (one for admin</div><div class='add'>+ * commands and one for I/O commands).</div><div class='add'>+ */</div><div class='add'>+struct nvme_queue {</div><div class='add'>+	struct device *q_dmadev;</div><div class='add'>+	struct nvme_dev *dev;</div><div class='add'>+	spinlock_t q_lock;</div><div class='add'>+	struct nvme_command *sq_cmds;</div><div class='add'>+	volatile struct nvme_completion *cqes;</div><div class='add'>+	dma_addr_t sq_dma_addr;</div><div class='add'>+	dma_addr_t cq_dma_addr;</div><div class='add'>+	wait_queue_head_t sq_full;</div><div class='add'>+	wait_queue_t sq_cong_wait;</div><div class='add'>+	struct bio_list sq_cong;</div><div class='add'>+	u32 __iomem *q_db;</div><div class='add'>+	u16 q_depth;</div><div class='add'>+	u16 cq_vector;</div><div class='add'>+	u16 sq_head;</div><div class='add'>+	u16 sq_tail;</div><div class='add'>+	u16 cq_head;</div><div class='add'>+	u16 cq_phase;</div><div class='add'>+	unsigned long cmdid_data[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check we didin't inadvertently grow the command struct</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_rw_command) != 64);</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='add'>+	BUILD_BUG_ON(sizeof(struct nvme_features) != 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) != 4096);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_id_ns) != 4096);</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct nvme_lba_range_type) != 64);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+typedef void (*nvme_completion_fn)(struct nvme_dev *, void *,</div><div class='add'>+						struct nvme_completion *);</div><div class='add'>+</div><div class='add'>+struct nvme_cmd_info {</div><div class='add'>+	nvme_completion_fn fn;</div><div class='add'>+	void *ctx;</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct nvme_cmd_info *nvme_cmd_info(struct nvme_queue *nvmeq)</div><div class='add'>+{</div><div class='add'>+	return (void *)&amp;nvmeq-&gt;cmdid_data[BITS_TO_LONGS(nvmeq-&gt;q_depth)];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * alloc_cmdid() - Allocate a Command ID</div><div class='add'>+ * @nvmeq: The queue that will be used for this command</div><div class='add'>+ * @ctx: A pointer that will be passed to the handler</div><div class='add'>+ * @handler: The function to call on completion</div><div class='add'>+ *</div><div class='add'>+ * Allocate a Command ID for a queue.  The data passed in will</div><div class='add'>+ * be passed to the completion handler.  This is implemented by using</div><div class='add'>+ * the bottom two bits of the ctx pointer to store the handler ID.</div><div class='add'>+ * Passing in a pointer that's not 4-byte aligned will cause a BUG.</div><div class='add'>+ * We can change this if it becomes a problem.</div><div class='add'>+ *</div><div class='add'>+ * May be called with local interrupts disabled and the q_lock held,</div><div class='add'>+ * or with interrupts enabled and no locks held.</div><div class='add'>+ */</div><div class='add'>+static int alloc_cmdid(struct nvme_queue *nvmeq, void *ctx,</div><div class='add'>+				nvme_completion_fn handler, unsigned timeout)</div><div class='add'>+{</div><div class='add'>+	int depth = nvmeq-&gt;q_depth - 1;</div><div class='add'>+	struct nvme_cmd_info *info = nvme_cmd_info(nvmeq);</div><div class='add'>+	int cmdid;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		cmdid = find_first_zero_bit(nvmeq-&gt;cmdid_data, depth);</div><div class='add'>+		if (cmdid &gt;= depth)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+	} while (test_and_set_bit(cmdid, nvmeq-&gt;cmdid_data));</div><div class='add'>+</div><div class='add'>+	info[cmdid].fn = handler;</div><div class='add'>+	info[cmdid].ctx = ctx;</div><div class='add'>+	info[cmdid].timeout = jiffies + timeout;</div><div class='add'>+	return cmdid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alloc_cmdid_killable(struct nvme_queue *nvmeq, void *ctx,</div><div class='add'>+				nvme_completion_fn handler, unsigned timeout)</div><div class='add'>+{</div><div class='add'>+	int cmdid;</div><div class='add'>+	wait_event_killable(nvmeq-&gt;sq_full,</div><div class='add'>+		(cmdid = alloc_cmdid(nvmeq, ctx, handler, timeout)) &gt;= 0);</div><div class='add'>+	return (cmdid &lt; 0) ? -EINTR : cmdid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Special values must be less than 0x1000 */</div><div class='add'>+#define CMD_CTX_BASE		((void *)POISON_POINTER_DELTA)</div><div class='add'>+#define CMD_CTX_CANCELLED	(0x30C + CMD_CTX_BASE)</div><div class='add'>+#define CMD_CTX_COMPLETED	(0x310 + CMD_CTX_BASE)</div><div class='add'>+#define CMD_CTX_INVALID		(0x314 + CMD_CTX_BASE)</div><div class='add'>+#define CMD_CTX_FLUSH		(0x318 + CMD_CTX_BASE)</div><div class='add'>+</div><div class='add'>+static void special_completion(struct nvme_dev *dev, void *ctx,</div><div class='add'>+						struct nvme_completion *cqe)</div><div class='add'>+{</div><div class='add'>+	if (ctx == CMD_CTX_CANCELLED)</div><div class='add'>+		return;</div><div class='add'>+	if (ctx == CMD_CTX_FLUSH)</div><div class='add'>+		return;</div><div class='add'>+	if (ctx == CMD_CTX_COMPLETED) {</div><div class='add'>+		dev_warn(&amp;dev-&gt;pci_dev-&gt;dev,</div><div class='add'>+				"completed id %d twice on queue %d\n",</div><div class='add'>+				cqe-&gt;command_id, le16_to_cpup(&amp;cqe-&gt;sq_id));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (ctx == CMD_CTX_INVALID) {</div><div class='add'>+		dev_warn(&amp;dev-&gt;pci_dev-&gt;dev,</div><div class='add'>+				"invalid id %d completed on queue %d\n",</div><div class='add'>+				cqe-&gt;command_id, le16_to_cpup(&amp;cqe-&gt;sq_id));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_warn(&amp;dev-&gt;pci_dev-&gt;dev, "Unknown special completion %p\n", ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called with local interrupts disabled and the q_lock held.  May not sleep.</div><div class='add'>+ */</div><div class='add'>+static void *free_cmdid(struct nvme_queue *nvmeq, int cmdid,</div><div class='add'>+						nvme_completion_fn *fn)</div><div class='add'>+{</div><div class='add'>+	void *ctx;</div><div class='add'>+	struct nvme_cmd_info *info = nvme_cmd_info(nvmeq);</div><div class='add'>+</div><div class='add'>+	if (cmdid &gt;= nvmeq-&gt;q_depth) {</div><div class='add'>+		*fn = special_completion;</div><div class='add'>+		return CMD_CTX_INVALID;</div><div class='add'>+	}</div><div class='add'>+	*fn = info[cmdid].fn;</div><div class='add'>+	ctx = info[cmdid].ctx;</div><div class='add'>+	info[cmdid].fn = special_completion;</div><div class='add'>+	info[cmdid].ctx = CMD_CTX_COMPLETED;</div><div class='add'>+	clear_bit(cmdid, nvmeq-&gt;cmdid_data);</div><div class='add'>+	wake_up(&amp;nvmeq-&gt;sq_full);</div><div class='add'>+	return ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *cancel_cmdid(struct nvme_queue *nvmeq, int cmdid,</div><div class='add'>+						nvme_completion_fn *fn)</div><div class='add'>+{</div><div class='add'>+	void *ctx;</div><div class='add'>+	struct nvme_cmd_info *info = nvme_cmd_info(nvmeq);</div><div class='add'>+	if (fn)</div><div class='add'>+		*fn = info[cmdid].fn;</div><div class='add'>+	ctx = info[cmdid].ctx;</div><div class='add'>+	info[cmdid].fn = special_completion;</div><div class='add'>+	info[cmdid].ctx = CMD_CTX_CANCELLED;</div><div class='add'>+	return ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nvme_queue *get_nvmeq(struct nvme_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;queues[get_cpu() + 1];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void put_nvmeq(struct nvme_queue *nvmeq)</div><div class='add'>+{</div><div class='add'>+	put_cpu();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nvme_submit_cmd() - Copy a command into a queue and ring the doorbell</div><div class='add'>+ * @nvmeq: The queue to use</div><div class='add'>+ * @cmd: The command to send</div><div class='add'>+ *</div><div class='add'>+ * Safe to use from interrupt context</div><div class='add'>+ */</div><div class='add'>+static int nvme_submit_cmd(struct nvme_queue *nvmeq, struct nvme_command *cmd)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 tail;</div><div class='add'>+	spin_lock_irqsave(&amp;nvmeq-&gt;q_lock, flags);</div><div class='add'>+	tail = nvmeq-&gt;sq_tail;</div><div class='add'>+	memcpy(&amp;nvmeq-&gt;sq_cmds[tail], cmd, sizeof(*cmd));</div><div class='add'>+	if (++tail == nvmeq-&gt;q_depth)</div><div class='add'>+		tail = 0;</div><div class='add'>+	writel(tail, nvmeq-&gt;q_db);</div><div class='add'>+	nvmeq-&gt;sq_tail = tail;</div><div class='add'>+	spin_unlock_irqrestore(&amp;nvmeq-&gt;q_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The nvme_iod describes the data in an I/O, including the list of PRP</div><div class='add'>+ * entries.  You can't see it in this data structure because C doesn't let</div><div class='add'>+ * me express that.  Use nvme_alloc_iod to ensure there's enough space</div><div class='add'>+ * allocated to store the PRP list.</div><div class='add'>+ */</div><div class='add'>+struct nvme_iod {</div><div class='add'>+	void *private;		/* For the use of the submitter of the I/O */</div><div class='add'>+	int npages;		/* In the PRP list. 0 means small pool in use */</div><div class='add'>+	int offset;		/* Of PRP list */</div><div class='add'>+	int nents;		/* Used in scatterlist */</div><div class='add'>+	int length;		/* Of data, in bytes */</div><div class='add'>+	dma_addr_t first_dma;</div><div class='add'>+	struct scatterlist sg[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __le64 **iod_list(struct nvme_iod *iod)</div><div class='add'>+{</div><div class='add'>+	return ((void *)iod) + iod-&gt;offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Will slightly overestimate the number of pages needed.  This is OK</div><div class='add'>+ * as it only leads to a small amount of wasted memory for the lifetime of</div><div class='add'>+ * the I/O.</div><div class='add'>+ */</div><div class='add'>+static int nvme_npages(unsigned size)</div><div class='add'>+{</div><div class='add'>+	unsigned nprps = DIV_ROUND_UP(size + PAGE_SIZE, PAGE_SIZE);</div><div class='add'>+	return DIV_ROUND_UP(8 * nprps, PAGE_SIZE - 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nvme_iod *</div><div class='add'>+nvme_alloc_iod(unsigned nseg, unsigned nbytes, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct nvme_iod *iod = kmalloc(sizeof(struct nvme_iod) +</div><div class='add'>+				sizeof(__le64 *) * nvme_npages(nbytes) +</div><div class='add'>+				sizeof(struct scatterlist) * nseg, gfp);</div><div class='add'>+</div><div class='add'>+	if (iod) {</div><div class='add'>+		iod-&gt;offset = offsetof(struct nvme_iod, sg[nseg]);</div><div class='add'>+		iod-&gt;npages = -1;</div><div class='add'>+		iod-&gt;length = nbytes;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iod;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nvme_free_iod(struct nvme_dev *dev, struct nvme_iod *iod)</div><div class='add'>+{</div><div class='add'>+	const int last_prp = PAGE_SIZE / 8 - 1;</div><div class='add'>+	int i;</div><div class='add'>+	__le64 **list = iod_list(iod);</div><div class='add'>+	dma_addr_t prp_dma = iod-&gt;first_dma;</div><div class='add'>+</div><div class='add'>+	if (iod-&gt;npages == 0)</div><div class='add'>+		dma_pool_free(dev-&gt;prp_small_pool, list[0], prp_dma);</div><div class='add'>+	for (i = 0; i &lt; iod-&gt;npages; i++) {</div><div class='add'>+		__le64 *prp_list = list[i];</div><div class='add'>+		dma_addr_t next_prp_dma = le64_to_cpu(prp_list[last_prp]);</div><div class='add'>+		dma_pool_free(dev-&gt;prp_page_pool, prp_list, prp_dma);</div><div class='add'>+		prp_dma = next_prp_dma;</div><div class='add'>+	}</div><div class='add'>+	kfree(iod);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void requeue_bio(struct nvme_dev *dev, struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	struct nvme_queue *nvmeq = get_nvmeq(dev);</div><div class='add'>+	if (bio_list_empty(&amp;nvmeq-&gt;sq_cong))</div><div class='add'>+		add_wait_queue(&amp;nvmeq-&gt;sq_full, &amp;nvmeq-&gt;sq_cong_wait);</div><div class='add'>+	bio_list_add(&amp;nvmeq-&gt;sq_cong, bio);</div><div class='add'>+	put_nvmeq(nvmeq);</div><div class='add'>+	wake_up_process(nvme_thread);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bio_completion(struct nvme_dev *dev, void *ctx,</div><div class='add'>+						struct nvme_completion *cqe)</div><div class='add'>+{</div><div class='add'>+	struct nvme_iod *iod = ctx;</div><div class='add'>+	struct bio *bio = iod-&gt;private;</div><div class='add'>+	u16 status = le16_to_cpup(&amp;cqe-&gt;status) &gt;&gt; 1;</div><div class='add'>+</div><div class='add'>+	dma_unmap_sg(&amp;dev-&gt;pci_dev-&gt;dev, iod-&gt;sg, iod-&gt;nents,</div><div class='add'>+			bio_data_dir(bio) ? DMA_TO_DEVICE : DMA_FROM_DEVICE);</div><div class='add'>+	nvme_free_iod(dev, iod);</div><div class='add'>+	if (status) {</div><div class='add'>+		bio_endio(bio, -EIO);</div><div class='add'>+	} else if (bio-&gt;bi_vcnt &gt; bio-&gt;bi_idx) {</div><div class='add'>+		requeue_bio(dev, bio);</div><div class='add'>+	} else {</div><div class='add'>+		bio_endio(bio, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* length is in bytes.  gfp flags indicates whether we may sleep. */</div><div class='add'>+static int nvme_setup_prps(struct nvme_dev *dev,</div><div class='add'>+			struct nvme_common_command *cmd, struct nvme_iod *iod,</div><div class='add'>+			int total_len, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct dma_pool *pool;</div><div class='add'>+	int length = total_len;</div><div class='add'>+	struct scatterlist *sg = iod-&gt;sg;</div><div class='add'>+	int dma_len = sg_dma_len(sg);</div><div class='add'>+	u64 dma_addr = sg_dma_address(sg);</div><div class='add'>+	int offset = offset_in_page(dma_addr);</div><div class='add'>+	__le64 *prp_list;</div><div class='add'>+	__le64 **list = iod_list(iod);</div><div class='add'>+	dma_addr_t prp_dma;</div><div class='add'>+	int nprps, i;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;prp1 = cpu_to_le64(dma_addr);</div><div class='add'>+	length -= (PAGE_SIZE - offset);</div><div class='add'>+	if (length &lt;= 0)</div><div class='add'>+		return total_len;</div><div class='add'>+</div><div class='add'>+	dma_len -= (PAGE_SIZE - offset);</div><div class='add'>+	if (dma_len) {</div><div class='add'>+		dma_addr += (PAGE_SIZE - offset);</div><div class='add'>+	} else {</div><div class='add'>+		sg = sg_next(sg);</div><div class='add'>+		dma_addr = sg_dma_address(sg);</div><div class='add'>+		dma_len = sg_dma_len(sg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (length &lt;= PAGE_SIZE) {</div><div class='add'>+		cmd-&gt;prp2 = cpu_to_le64(dma_addr);</div><div class='add'>+		return total_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nprps = DIV_ROUND_UP(length, PAGE_SIZE);</div><div class='add'>+	if (nprps &lt;= (256 / 8)) {</div><div class='add'>+		pool = dev-&gt;prp_small_pool;</div><div class='add'>+		iod-&gt;npages = 0;</div><div class='add'>+	} else {</div><div class='add'>+		pool = dev-&gt;prp_page_pool;</div><div class='add'>+		iod-&gt;npages = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prp_list = dma_pool_alloc(pool, gfp, &amp;prp_dma);</div><div class='add'>+	if (!prp_list) {</div><div class='add'>+		cmd-&gt;prp2 = cpu_to_le64(dma_addr);</div><div class='add'>+		iod-&gt;npages = -1;</div><div class='add'>+		return (total_len - length) + PAGE_SIZE;</div><div class='add'>+	}</div><div class='add'>+	list[0] = prp_list;</div><div class='add'>+	iod-&gt;first_dma = prp_dma;</div><div class='add'>+	cmd-&gt;prp2 = cpu_to_le64(prp_dma);</div><div class='add'>+	i = 0;</div><div class='add'>+	for (;;) {</div><div class='add'>+		if (i == PAGE_SIZE / 8) {</div><div class='add'>+			__le64 *old_prp_list = prp_list;</div><div class='add'>+			prp_list = dma_pool_alloc(pool, gfp, &amp;prp_dma);</div><div class='add'>+			if (!prp_list)</div><div class='add'>+				return total_len - length;</div><div class='add'>+			list[iod-&gt;npages++] = prp_list;</div><div class='add'>+			prp_list[0] = old_prp_list[i - 1];</div><div class='add'>+			old_prp_list[i - 1] = cpu_to_le64(prp_dma);</div><div class='add'>+			i = 1;</div><div class='add'>+		}</div><div class='add'>+		prp_list[i++] = cpu_to_le64(dma_addr);</div><div class='add'>+		dma_len -= PAGE_SIZE;</div><div class='add'>+		dma_addr += PAGE_SIZE;</div><div class='add'>+		length -= PAGE_SIZE;</div><div class='add'>+		if (length &lt;= 0)</div><div class='add'>+			break;</div><div class='add'>+		if (dma_len &gt; 0)</div><div class='add'>+			continue;</div><div class='add'>+		BUG_ON(dma_len &lt; 0);</div><div class='add'>+		sg = sg_next(sg);</div><div class='add'>+		dma_addr = sg_dma_address(sg);</div><div class='add'>+		dma_len = sg_dma_len(sg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return total_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* NVMe scatterlists require no holes in the virtual address */</div><div class='add'>+#define BIOVEC_NOT_VIRT_MERGEABLE(vec1, vec2)	((vec2)-&gt;bv_offset || \</div><div class='add'>+			(((vec1)-&gt;bv_offset + (vec1)-&gt;bv_len) % PAGE_SIZE))</div><div class='add'>+</div><div class='add'>+static int nvme_map_bio(struct device *dev, struct nvme_iod *iod,</div><div class='add'>+		struct bio *bio, enum dma_data_direction dma_dir, int psegs)</div><div class='add'>+{</div><div class='add'>+	struct bio_vec *bvec, *bvprv = NULL;</div><div class='add'>+	struct scatterlist *sg = NULL;</div><div class='add'>+	int i, old_idx, length = 0, nsegs = 0;</div><div class='add'>+</div><div class='add'>+	sg_init_table(iod-&gt;sg, psegs);</div><div class='add'>+	old_idx = bio-&gt;bi_idx;</div><div class='add'>+	bio_for_each_segment(bvec, bio, i) {</div><div class='add'>+		if (bvprv &amp;&amp; BIOVEC_PHYS_MERGEABLE(bvprv, bvec)) {</div><div class='add'>+			sg-&gt;length += bvec-&gt;bv_len;</div><div class='add'>+		} else {</div><div class='add'>+			if (bvprv &amp;&amp; BIOVEC_NOT_VIRT_MERGEABLE(bvprv, bvec))</div><div class='add'>+				break;</div><div class='add'>+			sg = sg ? sg + 1 : iod-&gt;sg;</div><div class='add'>+			sg_set_page(sg, bvec-&gt;bv_page, bvec-&gt;bv_len,</div><div class='add'>+							bvec-&gt;bv_offset);</div><div class='add'>+			nsegs++;</div><div class='add'>+		}</div><div class='add'>+		length += bvec-&gt;bv_len;</div><div class='add'>+		bvprv = bvec;</div><div class='add'>+	}</div><div class='add'>+	bio-&gt;bi_idx = i;</div><div class='add'>+	iod-&gt;nents = nsegs;</div><div class='add'>+	sg_mark_end(sg);</div><div class='add'>+	if (dma_map_sg(dev, iod-&gt;sg, iod-&gt;nents, dma_dir) == 0) {</div><div class='add'>+		bio-&gt;bi_idx = old_idx;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	return length;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvme_submit_flush(struct nvme_queue *nvmeq, struct nvme_ns *ns,</div><div class='add'>+								int cmdid)</div><div class='add'>+{</div><div class='add'>+	struct nvme_command *cmnd = &amp;nvmeq-&gt;sq_cmds[nvmeq-&gt;sq_tail];</div><div class='add'>+</div><div class='add'>+	memset(cmnd, 0, sizeof(*cmnd));</div><div class='add'>+	cmnd-&gt;common.opcode = nvme_cmd_flush;</div><div class='add'>+	cmnd-&gt;common.command_id = cmdid;</div><div class='add'>+	cmnd-&gt;common.nsid = cpu_to_le32(ns-&gt;ns_id);</div><div class='add'>+</div><div class='add'>+	if (++nvmeq-&gt;sq_tail == nvmeq-&gt;q_depth)</div><div class='add'>+		nvmeq-&gt;sq_tail = 0;</div><div class='add'>+	writel(nvmeq-&gt;sq_tail, nvmeq-&gt;q_db);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvme_submit_flush_data(struct nvme_queue *nvmeq, struct nvme_ns *ns)</div><div class='add'>+{</div><div class='add'>+	int cmdid = alloc_cmdid(nvmeq, (void *)CMD_CTX_FLUSH,</div><div class='add'>+					special_completion, NVME_IO_TIMEOUT);</div><div class='add'>+	if (unlikely(cmdid &lt; 0))</div><div class='add'>+		return cmdid;</div><div class='add'>+</div><div class='add'>+	return nvme_submit_flush(nvmeq, ns, cmdid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called with local interrupts disabled and the q_lock held.  May not sleep.</div><div class='add'>+ */</div><div class='add'>+static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns,</div><div class='add'>+								struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	struct nvme_command *cmnd;</div><div class='add'>+	struct nvme_iod *iod;</div><div class='add'>+	enum dma_data_direction dma_dir;</div><div class='add'>+	int cmdid, length, result = -ENOMEM;</div><div class='add'>+	u16 control;</div><div class='add'>+	u32 dsmgmt;</div><div class='add'>+	int psegs = bio_phys_segments(ns-&gt;queue, bio);</div><div class='add'>+</div><div class='add'>+	if ((bio-&gt;bi_rw &amp; REQ_FLUSH) &amp;&amp; psegs) {</div><div class='add'>+		result = nvme_submit_flush_data(nvmeq, ns);</div><div class='add'>+		if (result)</div><div class='add'>+			return result;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iod = nvme_alloc_iod(psegs, bio-&gt;bi_size, GFP_ATOMIC);</div><div class='add'>+	if (!iod)</div><div class='add'>+		goto nomem;</div><div class='add'>+	iod-&gt;private = bio;</div><div class='add'>+</div><div class='add'>+	result = -EBUSY;</div><div class='add'>+	cmdid = alloc_cmdid(nvmeq, iod, bio_completion, NVME_IO_TIMEOUT);</div><div class='add'>+	if (unlikely(cmdid &lt; 0))</div><div class='add'>+		goto free_iod;</div><div class='add'>+</div><div class='add'>+	if ((bio-&gt;bi_rw &amp; REQ_FLUSH) &amp;&amp; !psegs)</div><div class='add'>+		return nvme_submit_flush(nvmeq, ns, cmdid);</div><div class='add'>+</div><div class='add'>+	control = 0;</div><div class='add'>+	if (bio-&gt;bi_rw &amp; REQ_FUA)</div><div class='add'>+		control |= NVME_RW_FUA;</div><div class='add'>+	if (bio-&gt;bi_rw &amp; (REQ_FAILFAST_DEV | REQ_RAHEAD))</div><div class='add'>+		control |= NVME_RW_LR;</div><div class='add'>+</div><div class='add'>+	dsmgmt = 0;</div><div class='add'>+	if (bio-&gt;bi_rw &amp; REQ_RAHEAD)</div><div class='add'>+		dsmgmt |= NVME_RW_DSM_FREQ_PREFETCH;</div><div class='add'>+</div><div class='add'>+	cmnd = &amp;nvmeq-&gt;sq_cmds[nvmeq-&gt;sq_tail];</div><div class='add'>+</div><div class='add'>+	memset(cmnd, 0, sizeof(*cmnd));</div><div class='add'>+	if (bio_data_dir(bio)) {</div><div class='add'>+		cmnd-&gt;rw.opcode = nvme_cmd_write;</div><div class='add'>+		dma_dir = DMA_TO_DEVICE;</div><div class='add'>+	} else {</div><div class='add'>+		cmnd-&gt;rw.opcode = nvme_cmd_read;</div><div class='add'>+		dma_dir = DMA_FROM_DEVICE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = nvme_map_bio(nvmeq-&gt;q_dmadev, iod, bio, dma_dir, psegs);</div><div class='add'>+	if (result &lt; 0)</div><div class='add'>+		goto free_iod;</div><div class='add'>+	length = result;</div><div class='add'>+</div><div class='add'>+	cmnd-&gt;rw.command_id = cmdid;</div><div class='add'>+	cmnd-&gt;rw.nsid = cpu_to_le32(ns-&gt;ns_id);</div><div class='add'>+	length = nvme_setup_prps(nvmeq-&gt;dev, &amp;cmnd-&gt;common, iod, length,</div><div class='add'>+								GFP_ATOMIC);</div><div class='add'>+	cmnd-&gt;rw.slba = cpu_to_le64(bio-&gt;bi_sector &gt;&gt; (ns-&gt;lba_shift - 9));</div><div class='add'>+	cmnd-&gt;rw.length = cpu_to_le16((length &gt;&gt; ns-&gt;lba_shift) - 1);</div><div class='add'>+	cmnd-&gt;rw.control = cpu_to_le16(control);</div><div class='add'>+	cmnd-&gt;rw.dsmgmt = cpu_to_le32(dsmgmt);</div><div class='add'>+</div><div class='add'>+	bio-&gt;bi_sector += length &gt;&gt; 9;</div><div class='add'>+</div><div class='add'>+	if (++nvmeq-&gt;sq_tail == nvmeq-&gt;q_depth)</div><div class='add'>+		nvmeq-&gt;sq_tail = 0;</div><div class='add'>+	writel(nvmeq-&gt;sq_tail, nvmeq-&gt;q_db);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ free_iod:</div><div class='add'>+	nvme_free_iod(nvmeq-&gt;dev, iod);</div><div class='add'>+ nomem:</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nvme_make_request(struct request_queue *q, struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	struct nvme_ns *ns = q-&gt;queuedata;</div><div class='add'>+	struct nvme_queue *nvmeq = get_nvmeq(ns-&gt;dev);</div><div class='add'>+	int result = -EBUSY;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;nvmeq-&gt;q_lock);</div><div class='add'>+	if (bio_list_empty(&amp;nvmeq-&gt;sq_cong))</div><div class='add'>+		result = nvme_submit_bio_queue(nvmeq, ns, bio);</div><div class='add'>+	if (unlikely(result)) {</div><div class='add'>+		if (bio_list_empty(&amp;nvmeq-&gt;sq_cong))</div><div class='add'>+			add_wait_queue(&amp;nvmeq-&gt;sq_full, &amp;nvmeq-&gt;sq_cong_wait);</div><div class='add'>+		bio_list_add(&amp;nvmeq-&gt;sq_cong, bio);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;nvmeq-&gt;q_lock);</div><div class='add'>+	put_nvmeq(nvmeq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t nvme_process_cq(struct nvme_queue *nvmeq)</div><div class='add'>+{</div><div class='add'>+	u16 head, phase;</div><div class='add'>+</div><div class='add'>+	head = nvmeq-&gt;cq_head;</div><div class='add'>+	phase = nvmeq-&gt;cq_phase;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		void *ctx;</div><div class='add'>+		nvme_completion_fn fn;</div><div class='add'>+		struct nvme_completion cqe = nvmeq-&gt;cqes[head];</div><div class='add'>+		if ((le16_to_cpu(cqe.status) &amp; 1) != phase)</div><div class='add'>+			break;</div><div class='add'>+		nvmeq-&gt;sq_head = le16_to_cpu(cqe.sq_head);</div><div class='add'>+		if (++head == nvmeq-&gt;q_depth) {</div><div class='add'>+			head = 0;</div><div class='add'>+			phase = !phase;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ctx = free_cmdid(nvmeq, cqe.command_id, &amp;fn);</div><div class='add'>+		fn(nvmeq-&gt;dev, ctx, &amp;cqe);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If the controller ignores the cq head doorbell and continuously</div><div class='add'>+	 * writes to the queue, it is theoretically possible to wrap around</div><div class='add'>+	 * the queue twice and mistakenly return IRQ_NONE.  Linux only</div><div class='add'>+	 * requires that 0.1% of your interrupts are handled, so this isn't</div><div class='add'>+	 * a big problem.</div><div class='add'>+	 */</div><div class='add'>+	if (head == nvmeq-&gt;cq_head &amp;&amp; phase == nvmeq-&gt;cq_phase)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	writel(head, nvmeq-&gt;q_db + (1 &lt;&lt; nvmeq-&gt;dev-&gt;db_stride));</div><div class='add'>+	nvmeq-&gt;cq_head = head;</div><div class='add'>+	nvmeq-&gt;cq_phase = phase;</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t nvme_irq(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	irqreturn_t result;</div><div class='add'>+	struct nvme_queue *nvmeq = data;</div><div class='add'>+	spin_lock(&amp;nvmeq-&gt;q_lock);</div><div class='add'>+	result = nvme_process_cq(nvmeq);</div><div class='add'>+	spin_unlock(&amp;nvmeq-&gt;q_lock);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t nvme_irq_check(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct nvme_queue *nvmeq = data;</div><div class='add'>+	struct nvme_completion cqe = nvmeq-&gt;cqes[nvmeq-&gt;cq_head];</div><div class='add'>+	if ((le16_to_cpu(cqe.status) &amp; 1) != nvmeq-&gt;cq_phase)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	return IRQ_WAKE_THREAD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nvme_abort_command(struct nvme_queue *nvmeq, int cmdid)</div><div class='add'>+{</div><div class='add'>+	spin_lock_irq(&amp;nvmeq-&gt;q_lock);</div><div class='add'>+	cancel_cmdid(nvmeq, cmdid, NULL);</div><div class='add'>+	spin_unlock_irq(&amp;nvmeq-&gt;q_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sync_cmd_info {</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+	u32 result;</div><div class='add'>+	int status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void sync_completion(struct nvme_dev *dev, void *ctx,</div><div class='add'>+						struct nvme_completion *cqe)</div><div class='add'>+{</div><div class='add'>+	struct sync_cmd_info *cmdinfo = ctx;</div><div class='add'>+	cmdinfo-&gt;result = le32_to_cpup(&amp;cqe-&gt;result);</div><div class='add'>+	cmdinfo-&gt;status = le16_to_cpup(&amp;cqe-&gt;status) &gt;&gt; 1;</div><div class='add'>+	wake_up_process(cmdinfo-&gt;task);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns 0 on success.  If the result is negative, it's a Linux error code;</div><div class='add'>+ * if the result is positive, it's an NVM Express status code</div><div class='add'>+ */</div><div class='add'>+static int nvme_submit_sync_cmd(struct nvme_queue *nvmeq,</div><div class='add'>+			struct nvme_command *cmd, u32 *result, unsigned timeout)</div><div class='add'>+{</div><div class='add'>+	int cmdid;</div><div class='add'>+	struct sync_cmd_info cmdinfo;</div><div class='add'>+</div><div class='add'>+	cmdinfo.task = current;</div><div class='add'>+	cmdinfo.status = -EINTR;</div><div class='add'>+</div><div class='add'>+	cmdid = alloc_cmdid_killable(nvmeq, &amp;cmdinfo, sync_completion,</div><div class='add'>+								timeout);</div><div class='add'>+	if (cmdid &lt; 0)</div><div class='add'>+		return cmdid;</div><div class='add'>+	cmd-&gt;common.command_id = cmdid;</div><div class='add'>+</div><div class='add'>+	set_current_state(TASK_KILLABLE);</div><div class='add'>+	nvme_submit_cmd(nvmeq, cmd);</div><div class='add'>+	schedule();</div><div class='add'>+</div><div class='add'>+	if (cmdinfo.status == -EINTR) {</div><div class='add'>+		nvme_abort_command(nvmeq, cmdid);</div><div class='add'>+		return -EINTR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (result)</div><div class='add'>+		*result = cmdinfo.result;</div><div class='add'>+</div><div class='add'>+	return cmdinfo.status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvme_submit_admin_cmd(struct nvme_dev *dev, struct nvme_command *cmd,</div><div class='add'>+								u32 *result)</div><div class='add'>+{</div><div class='add'>+	return nvme_submit_sync_cmd(dev-&gt;queues[0], cmd, result, ADMIN_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adapter_delete_queue(struct nvme_dev *dev, u8 opcode, u16 id)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	struct nvme_command c;</div><div class='add'>+</div><div class='add'>+	memset(&amp;c, 0, sizeof(c));</div><div class='add'>+	c.delete_queue.opcode = opcode;</div><div class='add'>+	c.delete_queue.qid = cpu_to_le16(id);</div><div class='add'>+</div><div class='add'>+	status = nvme_submit_admin_cmd(dev, &amp;c, NULL);</div><div class='add'>+	if (status)</div><div class='add'>+		return -EIO;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adapter_alloc_cq(struct nvme_dev *dev, u16 qid,</div><div class='add'>+						struct nvme_queue *nvmeq)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	struct nvme_command c;</div><div class='add'>+	int flags = NVME_QUEUE_PHYS_CONTIG | NVME_CQ_IRQ_ENABLED;</div><div class='add'>+</div><div class='add'>+	memset(&amp;c, 0, sizeof(c));</div><div class='add'>+	c.create_cq.opcode = nvme_admin_create_cq;</div><div class='add'>+	c.create_cq.prp1 = cpu_to_le64(nvmeq-&gt;cq_dma_addr);</div><div class='add'>+	c.create_cq.cqid = cpu_to_le16(qid);</div><div class='add'>+	c.create_cq.qsize = cpu_to_le16(nvmeq-&gt;q_depth - 1);</div><div class='add'>+	c.create_cq.cq_flags = cpu_to_le16(flags);</div><div class='add'>+	c.create_cq.irq_vector = cpu_to_le16(nvmeq-&gt;cq_vector);</div><div class='add'>+</div><div class='add'>+	status = nvme_submit_admin_cmd(dev, &amp;c, NULL);</div><div class='add'>+	if (status)</div><div class='add'>+		return -EIO;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adapter_alloc_sq(struct nvme_dev *dev, u16 qid,</div><div class='add'>+						struct nvme_queue *nvmeq)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	struct nvme_command c;</div><div class='add'>+	int flags = NVME_QUEUE_PHYS_CONTIG | NVME_SQ_PRIO_MEDIUM;</div><div class='add'>+</div><div class='add'>+	memset(&amp;c, 0, sizeof(c));</div><div class='add'>+	c.create_sq.opcode = nvme_admin_create_sq;</div><div class='add'>+	c.create_sq.prp1 = cpu_to_le64(nvmeq-&gt;sq_dma_addr);</div><div class='add'>+	c.create_sq.sqid = cpu_to_le16(qid);</div><div class='add'>+	c.create_sq.qsize = cpu_to_le16(nvmeq-&gt;q_depth - 1);</div><div class='add'>+	c.create_sq.sq_flags = cpu_to_le16(flags);</div><div class='add'>+	c.create_sq.cqid = cpu_to_le16(qid);</div><div class='add'>+</div><div class='add'>+	status = nvme_submit_admin_cmd(dev, &amp;c, NULL);</div><div class='add'>+	if (status)</div><div class='add'>+		return -EIO;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adapter_delete_cq(struct nvme_dev *dev, u16 cqid)</div><div class='add'>+{</div><div class='add'>+	return adapter_delete_queue(dev, nvme_admin_delete_cq, cqid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adapter_delete_sq(struct nvme_dev *dev, u16 sqid)</div><div class='add'>+{</div><div class='add'>+	return adapter_delete_queue(dev, nvme_admin_delete_sq, sqid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvme_identify(struct nvme_dev *dev, unsigned nsid, unsigned cns,</div><div class='add'>+							dma_addr_t dma_addr)</div><div class='add'>+{</div><div class='add'>+	struct nvme_command c;</div><div class='add'>+</div><div class='add'>+	memset(&amp;c, 0, sizeof(c));</div><div class='add'>+	c.identify.opcode = nvme_admin_identify;</div><div class='add'>+	c.identify.nsid = cpu_to_le32(nsid);</div><div class='add'>+	c.identify.prp1 = cpu_to_le64(dma_addr);</div><div class='add'>+	c.identify.cns = cpu_to_le32(cns);</div><div class='add'>+</div><div class='add'>+	return nvme_submit_admin_cmd(dev, &amp;c, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvme_get_features(struct nvme_dev *dev, unsigned fid,</div><div class='add'>+				unsigned dword11, dma_addr_t dma_addr)</div><div class='add'>+{</div><div class='add'>+	struct nvme_command c;</div><div class='add'>+</div><div class='add'>+	memset(&amp;c, 0, sizeof(c));</div><div class='add'>+	c.features.opcode = nvme_admin_get_features;</div><div class='add'>+	c.features.prp1 = cpu_to_le64(dma_addr);</div><div class='add'>+	c.features.fid = cpu_to_le32(fid);</div><div class='add'>+	c.features.dword11 = cpu_to_le32(dword11);</div><div class='add'>+</div><div class='add'>+	return nvme_submit_admin_cmd(dev, &amp;c, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvme_set_features(struct nvme_dev *dev, unsigned fid,</div><div class='add'>+			unsigned dword11, dma_addr_t dma_addr, u32 *result)</div><div class='add'>+{</div><div class='add'>+	struct nvme_command c;</div><div class='add'>+</div><div class='add'>+	memset(&amp;c, 0, sizeof(c));</div><div class='add'>+	c.features.opcode = nvme_admin_set_features;</div><div class='add'>+	c.features.prp1 = cpu_to_le64(dma_addr);</div><div class='add'>+	c.features.fid = cpu_to_le32(fid);</div><div class='add'>+	c.features.dword11 = cpu_to_le32(dword11);</div><div class='add'>+</div><div class='add'>+	return nvme_submit_admin_cmd(dev, &amp;c, result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nvme_free_queue(struct nvme_dev *dev, int qid)</div><div class='add'>+{</div><div class='add'>+	struct nvme_queue *nvmeq = dev-&gt;queues[qid];</div><div class='add'>+	int vector = dev-&gt;entry[nvmeq-&gt;cq_vector].vector;</div><div class='add'>+</div><div class='add'>+	irq_set_affinity_hint(vector, NULL);</div><div class='add'>+	free_irq(vector, nvmeq);</div><div class='add'>+</div><div class='add'>+	/* Don't tell the adapter to delete the admin queue */</div><div class='add'>+	if (qid) {</div><div class='add'>+		adapter_delete_sq(dev, qid);</div><div class='add'>+		adapter_delete_cq(dev, qid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_free_coherent(nvmeq-&gt;q_dmadev, CQ_SIZE(nvmeq-&gt;q_depth),</div><div class='add'>+				(void *)nvmeq-&gt;cqes, nvmeq-&gt;cq_dma_addr);</div><div class='add'>+	dma_free_coherent(nvmeq-&gt;q_dmadev, SQ_SIZE(nvmeq-&gt;q_depth),</div><div class='add'>+					nvmeq-&gt;sq_cmds, nvmeq-&gt;sq_dma_addr);</div><div class='add'>+	kfree(nvmeq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nvme_queue *nvme_alloc_queue(struct nvme_dev *dev, int qid,</div><div class='add'>+							int depth, int vector)</div><div class='add'>+{</div><div class='add'>+	struct device *dmadev = &amp;dev-&gt;pci_dev-&gt;dev;</div><div class='add'>+	unsigned extra = (depth / 8) + (depth * sizeof(struct nvme_cmd_info));</div><div class='add'>+	struct nvme_queue *nvmeq = kzalloc(sizeof(*nvmeq) + extra, GFP_KERNEL);</div><div class='add'>+	if (!nvmeq)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	nvmeq-&gt;cqes = dma_alloc_coherent(dmadev, CQ_SIZE(depth),</div><div class='add'>+					&amp;nvmeq-&gt;cq_dma_addr, GFP_KERNEL);</div><div class='add'>+	if (!nvmeq-&gt;cqes)</div><div class='add'>+		goto free_nvmeq;</div><div class='add'>+	memset((void *)nvmeq-&gt;cqes, 0, CQ_SIZE(depth));</div><div class='add'>+</div><div class='add'>+	nvmeq-&gt;sq_cmds = dma_alloc_coherent(dmadev, SQ_SIZE(depth),</div><div class='add'>+					&amp;nvmeq-&gt;sq_dma_addr, GFP_KERNEL);</div><div class='add'>+	if (!nvmeq-&gt;sq_cmds)</div><div class='add'>+		goto free_cqdma;</div><div class='add'>+</div><div class='add'>+	nvmeq-&gt;q_dmadev = dmadev;</div><div class='add'>+	nvmeq-&gt;dev = dev;</div><div class='add'>+	spin_lock_init(&amp;nvmeq-&gt;q_lock);</div><div class='add'>+	nvmeq-&gt;cq_head = 0;</div><div class='add'>+	nvmeq-&gt;cq_phase = 1;</div><div class='add'>+	init_waitqueue_head(&amp;nvmeq-&gt;sq_full);</div><div class='add'>+	init_waitqueue_entry(&amp;nvmeq-&gt;sq_cong_wait, nvme_thread);</div><div class='add'>+	bio_list_init(&amp;nvmeq-&gt;sq_cong);</div><div class='add'>+	nvmeq-&gt;q_db = &amp;dev-&gt;dbs[qid &lt;&lt; (dev-&gt;db_stride + 1)];</div><div class='add'>+	nvmeq-&gt;q_depth = depth;</div><div class='add'>+	nvmeq-&gt;cq_vector = vector;</div><div class='add'>+</div><div class='add'>+	return nvmeq;</div><div class='add'>+</div><div class='add'>+ free_cqdma:</div><div class='add'>+	dma_free_coherent(dmadev, CQ_SIZE(nvmeq-&gt;q_depth), (void *)nvmeq-&gt;cqes,</div><div class='add'>+							nvmeq-&gt;cq_dma_addr);</div><div class='add'>+ free_nvmeq:</div><div class='add'>+	kfree(nvmeq);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int queue_request_irq(struct nvme_dev *dev, struct nvme_queue *nvmeq,</div><div class='add'>+							const char *name)</div><div class='add'>+{</div><div class='add'>+	if (use_threaded_interrupts)</div><div class='add'>+		return request_threaded_irq(dev-&gt;entry[nvmeq-&gt;cq_vector].vector,</div><div class='add'>+					nvme_irq_check, nvme_irq,</div><div class='add'>+					IRQF_DISABLED | IRQF_SHARED,</div><div class='add'>+					name, nvmeq);</div><div class='add'>+	return request_irq(dev-&gt;entry[nvmeq-&gt;cq_vector].vector, nvme_irq,</div><div class='add'>+				IRQF_DISABLED | IRQF_SHARED, name, nvmeq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __devinit struct nvme_queue *nvme_create_queue(struct nvme_dev *dev,</div><div class='add'>+					int qid, int cq_size, int vector)</div><div class='add'>+{</div><div class='add'>+	int result;</div><div class='add'>+	struct nvme_queue *nvmeq = nvme_alloc_queue(dev, qid, cq_size, vector);</div><div class='add'>+</div><div class='add'>+	if (!nvmeq)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	result = adapter_alloc_cq(dev, qid, nvmeq);</div><div class='add'>+	if (result &lt; 0)</div><div class='add'>+		goto free_nvmeq;</div><div class='add'>+</div><div class='add'>+	result = adapter_alloc_sq(dev, qid, nvmeq);</div><div class='add'>+	if (result &lt; 0)</div><div class='add'>+		goto release_cq;</div><div class='add'>+</div><div class='add'>+	result = queue_request_irq(dev, nvmeq, "nvme");</div><div class='add'>+	if (result &lt; 0)</div><div class='add'>+		goto release_sq;</div><div class='add'>+</div><div class='add'>+	return nvmeq;</div><div class='add'>+</div><div class='add'>+ release_sq:</div><div class='add'>+	adapter_delete_sq(dev, qid);</div><div class='add'>+ release_cq:</div><div class='add'>+	adapter_delete_cq(dev, qid);</div><div class='add'>+ free_nvmeq:</div><div class='add'>+	dma_free_coherent(nvmeq-&gt;q_dmadev, CQ_SIZE(nvmeq-&gt;q_depth),</div><div class='add'>+				(void *)nvmeq-&gt;cqes, nvmeq-&gt;cq_dma_addr);</div><div class='add'>+	dma_free_coherent(nvmeq-&gt;q_dmadev, SQ_SIZE(nvmeq-&gt;q_depth),</div><div class='add'>+					nvmeq-&gt;sq_cmds, nvmeq-&gt;sq_dma_addr);</div><div class='add'>+	kfree(nvmeq);</div><div class='add'>+	return ERR_PTR(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit nvme_configure_admin_queue(struct nvme_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int result;</div><div class='add'>+	u32 aqa;</div><div class='add'>+	u64 cap;</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	struct nvme_queue *nvmeq;</div><div class='add'>+</div><div class='add'>+	dev-&gt;dbs = ((void __iomem *)dev-&gt;bar) + 4096;</div><div class='add'>+</div><div class='add'>+	nvmeq = nvme_alloc_queue(dev, 0, 64, 0);</div><div class='add'>+	if (!nvmeq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	aqa = nvmeq-&gt;q_depth - 1;</div><div class='add'>+	aqa |= aqa &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	dev-&gt;ctrl_config = NVME_CC_ENABLE | NVME_CC_CSS_NVM;</div><div class='add'>+	dev-&gt;ctrl_config |= (PAGE_SHIFT - 12) &lt;&lt; NVME_CC_MPS_SHIFT;</div><div class='add'>+	dev-&gt;ctrl_config |= NVME_CC_ARB_RR | NVME_CC_SHN_NONE;</div><div class='add'>+	dev-&gt;ctrl_config |= NVME_CC_IOSQES | NVME_CC_IOCQES;</div><div class='add'>+</div><div class='add'>+	writel(0, &amp;dev-&gt;bar-&gt;cc);</div><div class='add'>+	writel(aqa, &amp;dev-&gt;bar-&gt;aqa);</div><div class='add'>+	writeq(nvmeq-&gt;sq_dma_addr, &amp;dev-&gt;bar-&gt;asq);</div><div class='add'>+	writeq(nvmeq-&gt;cq_dma_addr, &amp;dev-&gt;bar-&gt;acq);</div><div class='add'>+	writel(dev-&gt;ctrl_config, &amp;dev-&gt;bar-&gt;cc);</div><div class='add'>+</div><div class='add'>+	cap = readq(&amp;dev-&gt;bar-&gt;cap);</div><div class='add'>+	timeout = ((NVME_CAP_TIMEOUT(cap) + 1) * HZ / 2) + jiffies;</div><div class='add'>+	dev-&gt;db_stride = NVME_CAP_STRIDE(cap);</div><div class='add'>+</div><div class='add'>+	while (!(readl(&amp;dev-&gt;bar-&gt;csts) &amp; NVME_CSTS_RDY)) {</div><div class='add'>+		msleep(100);</div><div class='add'>+		if (fatal_signal_pending(current))</div><div class='add'>+			return -EINTR;</div><div class='add'>+		if (time_after(jiffies, timeout)) {</div><div class='add'>+			dev_err(&amp;dev-&gt;pci_dev-&gt;dev,</div><div class='add'>+				"Device not ready; aborting initialisation\n");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = queue_request_irq(dev, nvmeq, "nvme admin");</div><div class='add'>+	dev-&gt;queues[0] = nvmeq;</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nvme_iod *nvme_map_user_pages(struct nvme_dev *dev, int write,</div><div class='add'>+				unsigned long addr, unsigned length)</div><div class='add'>+{</div><div class='add'>+	int i, err, count, nents, offset;</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	struct page **pages;</div><div class='add'>+	struct nvme_iod *iod;</div><div class='add'>+</div><div class='add'>+	if (addr &amp; 3)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	if (!length)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	offset = offset_in_page(addr);</div><div class='add'>+	count = DIV_ROUND_UP(offset + length, PAGE_SIZE);</div><div class='add'>+	pages = kcalloc(count, sizeof(*pages), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	err = get_user_pages_fast(addr, count, 1, pages);</div><div class='add'>+	if (err &lt; count) {</div><div class='add'>+		count = err;</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto put_pages;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iod = nvme_alloc_iod(count, length, GFP_KERNEL);</div><div class='add'>+	sg = iod-&gt;sg;</div><div class='add'>+	sg_init_table(sg, count);</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		sg_set_page(&amp;sg[i], pages[i],</div><div class='add'>+				min_t(int, length, PAGE_SIZE - offset), offset);</div><div class='add'>+		length -= (PAGE_SIZE - offset);</div><div class='add'>+		offset = 0;</div><div class='add'>+	}</div><div class='add'>+	sg_mark_end(&amp;sg[i - 1]);</div><div class='add'>+	iod-&gt;nents = count;</div><div class='add'>+</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	nents = dma_map_sg(&amp;dev-&gt;pci_dev-&gt;dev, sg, count,</div><div class='add'>+				write ? DMA_TO_DEVICE : DMA_FROM_DEVICE);</div><div class='add'>+	if (!nents)</div><div class='add'>+		goto free_iod;</div><div class='add'>+</div><div class='add'>+	kfree(pages);</div><div class='add'>+	return iod;</div><div class='add'>+</div><div class='add'>+ free_iod:</div><div class='add'>+	kfree(iod);</div><div class='add'>+ put_pages:</div><div class='add'>+	for (i = 0; i &lt; count; i++)</div><div class='add'>+		put_page(pages[i]);</div><div class='add'>+	kfree(pages);</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nvme_unmap_user_pages(struct nvme_dev *dev, int write,</div><div class='add'>+			struct nvme_iod *iod)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dma_unmap_sg(&amp;dev-&gt;pci_dev-&gt;dev, iod-&gt;sg, iod-&gt;nents,</div><div class='add'>+				write ? DMA_TO_DEVICE : DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; iod-&gt;nents; i++)</div><div class='add'>+		put_page(sg_page(&amp;iod-&gt;sg[i]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)</div><div class='add'>+{</div><div class='add'>+	struct nvme_dev *dev = ns-&gt;dev;</div><div class='add'>+	struct nvme_queue *nvmeq;</div><div class='add'>+	struct nvme_user_io io;</div><div class='add'>+	struct nvme_command c;</div><div class='add'>+	unsigned length;</div><div class='add'>+	int status;</div><div class='add'>+	struct nvme_iod *iod;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;io, uio, sizeof(io)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	length = (io.nblocks + 1) &lt;&lt; ns-&gt;lba_shift;</div><div class='add'>+</div><div class='add'>+	switch (io.opcode) {</div><div class='add'>+	case nvme_cmd_write:</div><div class='add'>+	case nvme_cmd_read:</div><div class='add'>+	case nvme_cmd_compare:</div><div class='add'>+		iod = nvme_map_user_pages(dev, io.opcode &amp; 1, io.addr, length);</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 (IS_ERR(iod))</div><div class='add'>+		return PTR_ERR(iod);</div><div class='add'>+</div><div class='add'>+	memset(&amp;c, 0, sizeof(c));</div><div class='add'>+	c.rw.opcode = io.opcode;</div><div class='add'>+	c.rw.flags = io.flags;</div><div class='add'>+	c.rw.nsid = cpu_to_le32(ns-&gt;ns_id);</div><div class='add'>+	c.rw.slba = cpu_to_le64(io.slba);</div><div class='add'>+	c.rw.length = cpu_to_le16(io.nblocks);</div><div class='add'>+	c.rw.control = cpu_to_le16(io.control);</div><div class='add'>+	c.rw.dsmgmt = cpu_to_le16(io.dsmgmt);</div><div class='add'>+	c.rw.reftag = io.reftag;</div><div class='add'>+	c.rw.apptag = io.apptag;</div><div class='add'>+	c.rw.appmask = io.appmask;</div><div class='add'>+	/* XXX: metadata */</div><div class='add'>+	length = nvme_setup_prps(dev, &amp;c.common, iod, length, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	nvmeq = get_nvmeq(dev);</div><div class='add'>+	/*</div><div class='add'>+	 * Since nvme_submit_sync_cmd sleeps, we can't keep preemption</div><div class='add'>+	 * disabled.  We may be preempted at any point, and be rescheduled</div><div class='add'>+	 * to a different CPU.  That will cause cacheline bouncing, but no</div><div class='add'>+	 * additional races since q_lock already protects against other CPUs.</div><div class='add'>+	 */</div><div class='add'>+	put_nvmeq(nvmeq);</div><div class='add'>+	if (length != (io.nblocks + 1) &lt;&lt; ns-&gt;lba_shift)</div><div class='add'>+		status = -ENOMEM;</div><div class='add'>+	else</div><div class='add'>+		status = nvme_submit_sync_cmd(nvmeq, &amp;c, NULL, NVME_IO_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	nvme_unmap_user_pages(dev, io.opcode &amp; 1, iod);</div><div class='add'>+	nvme_free_iod(dev, iod);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvme_user_admin_cmd(struct nvme_ns *ns,</div><div class='add'>+					struct nvme_admin_cmd __user *ucmd)</div><div class='add'>+{</div><div class='add'>+	struct nvme_dev *dev = ns-&gt;dev;</div><div class='add'>+	struct nvme_admin_cmd cmd;</div><div class='add'>+	struct nvme_command c;</div><div class='add'>+	int status, length;</div><div class='add'>+	struct nvme_iod *iod;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EACCES;</div><div class='add'>+	if (copy_from_user(&amp;cmd, ucmd, sizeof(cmd)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	memset(&amp;c, 0, sizeof(c));</div><div class='add'>+	c.common.opcode = cmd.opcode;</div><div class='add'>+	c.common.flags = cmd.flags;</div><div class='add'>+	c.common.nsid = cpu_to_le32(cmd.nsid);</div><div class='add'>+	c.common.cdw2[0] = cpu_to_le32(cmd.cdw2);</div><div class='add'>+	c.common.cdw2[1] = cpu_to_le32(cmd.cdw3);</div><div class='add'>+	c.common.cdw10[0] = cpu_to_le32(cmd.cdw10);</div><div class='add'>+	c.common.cdw10[1] = cpu_to_le32(cmd.cdw11);</div><div class='add'>+	c.common.cdw10[2] = cpu_to_le32(cmd.cdw12);</div><div class='add'>+	c.common.cdw10[3] = cpu_to_le32(cmd.cdw13);</div><div class='add'>+	c.common.cdw10[4] = cpu_to_le32(cmd.cdw14);</div><div class='add'>+	c.common.cdw10[5] = cpu_to_le32(cmd.cdw15);</div><div class='add'>+</div><div class='add'>+	length = cmd.data_len;</div><div class='add'>+	if (cmd.data_len) {</div><div class='add'>+		iod = nvme_map_user_pages(dev, cmd.opcode &amp; 1, cmd.addr,</div><div class='add'>+								length);</div><div class='add'>+		if (IS_ERR(iod))</div><div class='add'>+			return PTR_ERR(iod);</div><div class='add'>+		length = nvme_setup_prps(dev, &amp;c.common, iod, length,</div><div class='add'>+								GFP_KERNEL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (length != cmd.data_len)</div><div class='add'>+		status = -ENOMEM;</div><div class='add'>+	else</div><div class='add'>+		status = nvme_submit_admin_cmd(dev, &amp;c, NULL);</div><div class='add'>+</div><div class='add'>+	if (cmd.data_len) {</div><div class='add'>+		nvme_unmap_user_pages(dev, cmd.opcode &amp; 1, iod);</div><div class='add'>+		nvme_free_iod(dev, iod);</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvme_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,</div><div class='add'>+							unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct nvme_ns *ns = bdev-&gt;bd_disk-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case NVME_IOCTL_ID:</div><div class='add'>+		return ns-&gt;ns_id;</div><div class='add'>+	case NVME_IOCTL_ADMIN_CMD:</div><div class='add'>+		return nvme_user_admin_cmd(ns, (void __user *)arg);</div><div class='add'>+	case NVME_IOCTL_SUBMIT_IO:</div><div class='add'>+		return nvme_submit_io(ns, (void __user *)arg);</div><div class='add'>+	default:</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct block_device_operations nvme_fops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.ioctl		= nvme_ioctl,</div><div class='add'>+	.compat_ioctl	= nvme_ioctl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void nvme_timeout_ios(struct nvme_queue *nvmeq)</div><div class='add'>+{</div><div class='add'>+	int depth = nvmeq-&gt;q_depth - 1;</div><div class='add'>+	struct nvme_cmd_info *info = nvme_cmd_info(nvmeq);</div><div class='add'>+	unsigned long now = jiffies;</div><div class='add'>+	int cmdid;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(cmdid, nvmeq-&gt;cmdid_data, depth) {</div><div class='add'>+		void *ctx;</div><div class='add'>+		nvme_completion_fn fn;</div><div class='add'>+		static struct nvme_completion cqe = { .status = cpu_to_le16(NVME_SC_ABORT_REQ) &lt;&lt; 1, };</div><div class='add'>+</div><div class='add'>+		if (!time_after(now, info[cmdid].timeout))</div><div class='add'>+			continue;</div><div class='add'>+		dev_warn(nvmeq-&gt;q_dmadev, "Timing out I/O %d\n", cmdid);</div><div class='add'>+		ctx = cancel_cmdid(nvmeq, cmdid, &amp;fn);</div><div class='add'>+		fn(nvmeq-&gt;dev, ctx, &amp;cqe);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nvme_resubmit_bios(struct nvme_queue *nvmeq)</div><div class='add'>+{</div><div class='add'>+	while (bio_list_peek(&amp;nvmeq-&gt;sq_cong)) {</div><div class='add'>+		struct bio *bio = bio_list_pop(&amp;nvmeq-&gt;sq_cong);</div><div class='add'>+		struct nvme_ns *ns = bio-&gt;bi_bdev-&gt;bd_disk-&gt;private_data;</div><div class='add'>+		if (nvme_submit_bio_queue(nvmeq, ns, bio)) {</div><div class='add'>+			bio_list_add_head(&amp;nvmeq-&gt;sq_cong, bio);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (bio_list_empty(&amp;nvmeq-&gt;sq_cong))</div><div class='add'>+			remove_wait_queue(&amp;nvmeq-&gt;sq_full,</div><div class='add'>+							&amp;nvmeq-&gt;sq_cong_wait);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvme_kthread(void *data)</div><div class='add'>+{</div><div class='add'>+	struct nvme_dev *dev;</div><div class='add'>+</div><div class='add'>+	while (!kthread_should_stop()) {</div><div class='add'>+		__set_current_state(TASK_RUNNING);</div><div class='add'>+		spin_lock(&amp;dev_list_lock);</div><div class='add'>+		list_for_each_entry(dev, &amp;dev_list, node) {</div><div class='add'>+			int i;</div><div class='add'>+			for (i = 0; i &lt; dev-&gt;queue_count; i++) {</div><div class='add'>+				struct nvme_queue *nvmeq = dev-&gt;queues[i];</div><div class='add'>+				if (!nvmeq)</div><div class='add'>+					continue;</div><div class='add'>+				spin_lock_irq(&amp;nvmeq-&gt;q_lock);</div><div class='add'>+				if (nvme_process_cq(nvmeq))</div><div class='add'>+					printk("process_cq did something\n");</div><div class='add'>+				nvme_timeout_ios(nvmeq);</div><div class='add'>+				nvme_resubmit_bios(nvmeq);</div><div class='add'>+				spin_unlock_irq(&amp;nvmeq-&gt;q_lock);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;dev_list_lock);</div><div class='add'>+		set_current_state(TASK_INTERRUPTIBLE);</div><div class='add'>+		schedule_timeout(HZ);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEFINE_IDA(nvme_index_ida);</div><div class='add'>+</div><div class='add'>+static int nvme_get_ns_idx(void)</div><div class='add'>+{</div><div class='add'>+	int index, error;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (!ida_pre_get(&amp;nvme_index_ida, GFP_KERNEL))</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;dev_list_lock);</div><div class='add'>+		error = ida_get_new(&amp;nvme_index_ida, &amp;index);</div><div class='add'>+		spin_unlock(&amp;dev_list_lock);</div><div class='add'>+	} while (error == -EAGAIN);</div><div class='add'>+</div><div class='add'>+	if (error)</div><div class='add'>+		index = -1;</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nvme_put_ns_idx(int index)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;dev_list_lock);</div><div class='add'>+	ida_remove(&amp;nvme_index_ida, index);</div><div class='add'>+	spin_unlock(&amp;dev_list_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nvme_ns *nvme_alloc_ns(struct nvme_dev *dev, int nsid,</div><div class='add'>+			struct nvme_id_ns *id, struct nvme_lba_range_type *rt)</div><div class='add'>+{</div><div class='add'>+	struct nvme_ns *ns;</div><div class='add'>+	struct gendisk *disk;</div><div class='add'>+	int lbaf;</div><div class='add'>+</div><div class='add'>+	if (rt-&gt;attributes &amp; NVME_LBART_ATTRIB_HIDE)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ns = kzalloc(sizeof(*ns), GFP_KERNEL);</div><div class='add'>+	if (!ns)</div><div class='add'>+		return NULL;</div><div class='add'>+	ns-&gt;queue = blk_alloc_queue(GFP_KERNEL);</div><div class='add'>+	if (!ns-&gt;queue)</div><div class='add'>+		goto out_free_ns;</div><div class='add'>+	ns-&gt;queue-&gt;queue_flags = QUEUE_FLAG_DEFAULT;</div><div class='add'>+	queue_flag_set_unlocked(QUEUE_FLAG_NOMERGES, ns-&gt;queue);</div><div class='add'>+	queue_flag_set_unlocked(QUEUE_FLAG_NONROT, ns-&gt;queue);</div><div class='add'>+/*	queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, ns-&gt;queue); */</div><div class='add'>+	blk_queue_make_request(ns-&gt;queue, nvme_make_request);</div><div class='add'>+	ns-&gt;dev = dev;</div><div class='add'>+	ns-&gt;queue-&gt;queuedata = ns;</div><div class='add'>+</div><div class='add'>+	disk = alloc_disk(NVME_MINORS);</div><div class='add'>+	if (!disk)</div><div class='add'>+		goto out_free_queue;</div><div class='add'>+	ns-&gt;ns_id = nsid;</div><div class='add'>+	ns-&gt;disk = disk;</div><div class='add'>+	lbaf = id-&gt;flbas &amp; 0xf;</div><div class='add'>+	ns-&gt;lba_shift = id-&gt;lbaf[lbaf].ds;</div><div class='add'>+</div><div class='add'>+	disk-&gt;major = nvme_major;</div><div class='add'>+	disk-&gt;minors = NVME_MINORS;</div><div class='add'>+	disk-&gt;first_minor = NVME_MINORS * nvme_get_ns_idx();</div><div class='add'>+	disk-&gt;fops = &amp;nvme_fops;</div><div class='add'>+	disk-&gt;private_data = ns;</div><div class='add'>+	disk-&gt;queue = ns-&gt;queue;</div><div class='add'>+	disk-&gt;driverfs_dev = &amp;dev-&gt;pci_dev-&gt;dev;</div><div class='add'>+	sprintf(disk-&gt;disk_name, "nvme%dn%d", dev-&gt;instance, nsid);</div><div class='add'>+	set_capacity(disk, le64_to_cpup(&amp;id-&gt;nsze) &lt;&lt; (ns-&gt;lba_shift - 9));</div><div class='add'>+</div><div class='add'>+	return ns;</div><div class='add'>+</div><div class='add'>+ out_free_queue:</div><div class='add'>+	blk_cleanup_queue(ns-&gt;queue);</div><div class='add'>+ out_free_ns:</div><div class='add'>+	kfree(ns);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nvme_ns_free(struct nvme_ns *ns)</div><div class='add'>+{</div><div class='add'>+	int index = ns-&gt;disk-&gt;first_minor / NVME_MINORS;</div><div class='add'>+	put_disk(ns-&gt;disk);</div><div class='add'>+	nvme_put_ns_idx(index);</div><div class='add'>+	blk_cleanup_queue(ns-&gt;queue);</div><div class='add'>+	kfree(ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_queue_count(struct nvme_dev *dev, int count)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	u32 result;</div><div class='add'>+	u32 q_count = (count - 1) | ((count - 1) &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	status = nvme_set_features(dev, NVME_FEAT_NUM_QUEUES, q_count, 0,</div><div class='add'>+								&amp;result);</div><div class='add'>+	if (status)</div><div class='add'>+		return -EIO;</div><div class='add'>+	return min(result &amp; 0xffff, result &gt;&gt; 16) + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit nvme_setup_io_queues(struct nvme_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int result, cpu, i, nr_io_queues, db_bar_size;</div><div class='add'>+</div><div class='add'>+	nr_io_queues = num_online_cpus();</div><div class='add'>+	result = set_queue_count(dev, nr_io_queues);</div><div class='add'>+	if (result &lt; 0)</div><div class='add'>+		return result;</div><div class='add'>+	if (result &lt; nr_io_queues)</div><div class='add'>+		nr_io_queues = result;</div><div class='add'>+</div><div class='add'>+	/* Deregister the admin queue's interrupt */</div><div class='add'>+	free_irq(dev-&gt;entry[0].vector, dev-&gt;queues[0]);</div><div class='add'>+</div><div class='add'>+	db_bar_size = 4096 + ((nr_io_queues + 1) &lt;&lt; (dev-&gt;db_stride + 3));</div><div class='add'>+	if (db_bar_size &gt; 8192) {</div><div class='add'>+		iounmap(dev-&gt;bar);</div><div class='add'>+		dev-&gt;bar = ioremap(pci_resource_start(dev-&gt;pci_dev, 0),</div><div class='add'>+								db_bar_size);</div><div class='add'>+		dev-&gt;dbs = ((void __iomem *)dev-&gt;bar) + 4096;</div><div class='add'>+		dev-&gt;queues[0]-&gt;q_db = dev-&gt;dbs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nr_io_queues; i++)</div><div class='add'>+		dev-&gt;entry[i].entry = i;</div><div class='add'>+	for (;;) {</div><div class='add'>+		result = pci_enable_msix(dev-&gt;pci_dev, dev-&gt;entry,</div><div class='add'>+								nr_io_queues);</div><div class='add'>+		if (result == 0) {</div><div class='add'>+			break;</div><div class='add'>+		} else if (result &gt; 0) {</div><div class='add'>+			nr_io_queues = result;</div><div class='add'>+			continue;</div><div class='add'>+		} else {</div><div class='add'>+			nr_io_queues = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = queue_request_irq(dev, dev-&gt;queues[0], "nvme admin");</div><div class='add'>+	/* XXX: handle failure here */</div><div class='add'>+</div><div class='add'>+	cpu = cpumask_first(cpu_online_mask);</div><div class='add'>+	for (i = 0; i &lt; nr_io_queues; i++) {</div><div class='add'>+		irq_set_affinity_hint(dev-&gt;entry[i].vector, get_cpu_mask(cpu));</div><div class='add'>+		cpu = cpumask_next(cpu, cpu_online_mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nr_io_queues; i++) {</div><div class='add'>+		dev-&gt;queues[i + 1] = nvme_create_queue(dev, i + 1,</div><div class='add'>+							NVME_Q_DEPTH, i);</div><div class='add'>+		if (IS_ERR(dev-&gt;queues[i + 1]))</div><div class='add'>+			return PTR_ERR(dev-&gt;queues[i + 1]);</div><div class='add'>+		dev-&gt;queue_count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (; i &lt; num_possible_cpus(); i++) {</div><div class='add'>+		int target = i % rounddown_pow_of_two(dev-&gt;queue_count - 1);</div><div class='add'>+		dev-&gt;queues[i + 1] = dev-&gt;queues[target + 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 void nvme_free_queues(struct nvme_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = dev-&gt;queue_count - 1; i &gt;= 0; i--)</div><div class='add'>+		nvme_free_queue(dev, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit nvme_dev_add(struct nvme_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int res, nn, i;</div><div class='add'>+	struct nvme_ns *ns, *next;</div><div class='add'>+	struct nvme_id_ctrl *ctrl;</div><div class='add'>+	struct nvme_id_ns *id_ns;</div><div class='add'>+	void *mem;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+</div><div class='add'>+	res = nvme_setup_io_queues(dev);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	mem = dma_alloc_coherent(&amp;dev-&gt;pci_dev-&gt;dev, 8192, &amp;dma_addr,</div><div class='add'>+								GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	res = nvme_identify(dev, 0, 1, dma_addr);</div><div class='add'>+	if (res) {</div><div class='add'>+		res = -EIO;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctrl = mem;</div><div class='add'>+	nn = le32_to_cpup(&amp;ctrl-&gt;nn);</div><div class='add'>+	memcpy(dev-&gt;serial, ctrl-&gt;sn, sizeof(ctrl-&gt;sn));</div><div class='add'>+	memcpy(dev-&gt;model, ctrl-&gt;mn, sizeof(ctrl-&gt;mn));</div><div class='add'>+	memcpy(dev-&gt;firmware_rev, ctrl-&gt;fr, sizeof(ctrl-&gt;fr));</div><div class='add'>+</div><div class='add'>+	id_ns = mem;</div><div class='add'>+	for (i = 1; i &lt;= nn; i++) {</div><div class='add'>+		res = nvme_identify(dev, i, 0, dma_addr);</div><div class='add'>+		if (res)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (id_ns-&gt;ncap == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		res = nvme_get_features(dev, NVME_FEAT_LBA_RANGE, i,</div><div class='add'>+							dma_addr + 4096);</div><div class='add'>+		if (res)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ns = nvme_alloc_ns(dev, i, mem, mem + 4096);</div><div class='add'>+		if (ns)</div><div class='add'>+			list_add_tail(&amp;ns-&gt;list, &amp;dev-&gt;namespaces);</div><div class='add'>+	}</div><div class='add'>+	list_for_each_entry(ns, &amp;dev-&gt;namespaces, list)</div><div class='add'>+		add_disk(ns-&gt;disk);</div><div class='add'>+</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+ out_free:</div><div class='add'>+	list_for_each_entry_safe(ns, next, &amp;dev-&gt;namespaces, list) {</div><div class='add'>+		list_del(&amp;ns-&gt;list);</div><div class='add'>+		nvme_ns_free(ns);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	dma_free_coherent(&amp;dev-&gt;pci_dev-&gt;dev, 8192, mem, dma_addr);</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvme_dev_remove(struct nvme_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct nvme_ns *ns, *next;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;dev_list_lock);</div><div class='add'>+	list_del(&amp;dev-&gt;node);</div><div class='add'>+	spin_unlock(&amp;dev_list_lock);</div><div class='add'>+</div><div class='add'>+	/* TODO: wait all I/O finished or cancel them */</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(ns, next, &amp;dev-&gt;namespaces, list) {</div><div class='add'>+		list_del(&amp;ns-&gt;list);</div><div class='add'>+		del_gendisk(ns-&gt;disk);</div><div class='add'>+		nvme_ns_free(ns);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nvme_free_queues(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 nvme_setup_prp_pools(struct nvme_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct device *dmadev = &amp;dev-&gt;pci_dev-&gt;dev;</div><div class='add'>+	dev-&gt;prp_page_pool = dma_pool_create("prp list page", dmadev,</div><div class='add'>+						PAGE_SIZE, PAGE_SIZE, 0);</div><div class='add'>+	if (!dev-&gt;prp_page_pool)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Optimisation for I/Os between 4k and 128k */</div><div class='add'>+	dev-&gt;prp_small_pool = dma_pool_create("prp list 256", dmadev,</div><div class='add'>+						256, 256, 0);</div><div class='add'>+	if (!dev-&gt;prp_small_pool) {</div><div class='add'>+		dma_pool_destroy(dev-&gt;prp_page_pool);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nvme_release_prp_pools(struct nvme_dev *dev)</div><div class='add'>+{</div><div class='add'>+	dma_pool_destroy(dev-&gt;prp_page_pool);</div><div class='add'>+	dma_pool_destroy(dev-&gt;prp_small_pool);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* XXX: Use an ida or something to let remove / add work correctly */</div><div class='add'>+static void nvme_set_instance(struct nvme_dev *dev)</div><div class='add'>+{</div><div class='add'>+	static int instance;</div><div class='add'>+	dev-&gt;instance = instance++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nvme_release_instance(struct nvme_dev *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit nvme_probe(struct pci_dev *pdev,</div><div class='add'>+						const struct pci_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int bars, result = -ENOMEM;</div><div class='add'>+	struct nvme_dev *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 -ENOMEM;</div><div class='add'>+	dev-&gt;entry = kcalloc(num_possible_cpus(), sizeof(*dev-&gt;entry),</div><div class='add'>+								GFP_KERNEL);</div><div class='add'>+	if (!dev-&gt;entry)</div><div class='add'>+		goto free;</div><div class='add'>+	dev-&gt;queues = kcalloc(num_possible_cpus() + 1, sizeof(void *),</div><div class='add'>+								GFP_KERNEL);</div><div class='add'>+	if (!dev-&gt;queues)</div><div class='add'>+		goto free;</div><div class='add'>+</div><div class='add'>+	if (pci_enable_device_mem(pdev))</div><div class='add'>+		goto free;</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+	bars = pci_select_bars(pdev, IORESOURCE_MEM);</div><div class='add'>+	if (pci_request_selected_regions(pdev, bars, "nvme"))</div><div class='add'>+		goto disable;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;namespaces);</div><div class='add'>+	dev-&gt;pci_dev = pdev;</div><div class='add'>+	pci_set_drvdata(pdev, dev);</div><div class='add'>+	dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(64));</div><div class='add'>+	dma_set_coherent_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(64));</div><div class='add'>+	nvme_set_instance(dev);</div><div class='add'>+	dev-&gt;entry[0].vector = pdev-&gt;irq;</div><div class='add'>+</div><div class='add'>+	result = nvme_setup_prp_pools(dev);</div><div class='add'>+	if (result)</div><div class='add'>+		goto disable_msix;</div><div class='add'>+</div><div class='add'>+	dev-&gt;bar = ioremap(pci_resource_start(pdev, 0), 8192);</div><div class='add'>+	if (!dev-&gt;bar) {</div><div class='add'>+		result = -ENOMEM;</div><div class='add'>+		goto disable_msix;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = nvme_configure_admin_queue(dev);</div><div class='add'>+	if (result)</div><div class='add'>+		goto unmap;</div><div class='add'>+	dev-&gt;queue_count++;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;dev_list_lock);</div><div class='add'>+	list_add(&amp;dev-&gt;node, &amp;dev_list);</div><div class='add'>+	spin_unlock(&amp;dev_list_lock);</div><div class='add'>+</div><div class='add'>+	result = nvme_dev_add(dev);</div><div class='add'>+	if (result)</div><div class='add'>+		goto delete;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ delete:</div><div class='add'>+	spin_lock(&amp;dev_list_lock);</div><div class='add'>+	list_del(&amp;dev-&gt;node);</div><div class='add'>+	spin_unlock(&amp;dev_list_lock);</div><div class='add'>+</div><div class='add'>+	nvme_free_queues(dev);</div><div class='add'>+ unmap:</div><div class='add'>+	iounmap(dev-&gt;bar);</div><div class='add'>+ disable_msix:</div><div class='add'>+	pci_disable_msix(pdev);</div><div class='add'>+	nvme_release_instance(dev);</div><div class='add'>+	nvme_release_prp_pools(dev);</div><div class='add'>+ disable:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+ free:</div><div class='add'>+	kfree(dev-&gt;queues);</div><div class='add'>+	kfree(dev-&gt;entry);</div><div class='add'>+	kfree(dev);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit nvme_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct nvme_dev *dev = pci_get_drvdata(pdev);</div><div class='add'>+	nvme_dev_remove(dev);</div><div class='add'>+	pci_disable_msix(pdev);</div><div class='add'>+	iounmap(dev-&gt;bar);</div><div class='add'>+	nvme_release_instance(dev);</div><div class='add'>+	nvme_release_prp_pools(dev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+	kfree(dev-&gt;queues);</div><div class='add'>+	kfree(dev-&gt;entry);</div><div class='add'>+	kfree(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* These functions are yet to be implemented */</div><div class='add'>+#define nvme_error_detected NULL</div><div class='add'>+#define nvme_dump_registers NULL</div><div class='add'>+#define nvme_link_reset NULL</div><div class='add'>+#define nvme_slot_reset NULL</div><div class='add'>+#define nvme_error_resume NULL</div><div class='add'>+#define nvme_suspend NULL</div><div class='add'>+#define nvme_resume NULL</div><div class='add'>+</div><div class='add'>+static struct pci_error_handlers nvme_err_handler = {</div><div class='add'>+	.error_detected	= nvme_error_detected,</div><div class='add'>+	.mmio_enabled	= nvme_dump_registers,</div><div class='add'>+	.link_reset	= nvme_link_reset,</div><div class='add'>+	.slot_reset	= nvme_slot_reset,</div><div class='add'>+	.resume		= nvme_error_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Move to pci_ids.h later */</div><div class='add'>+#define PCI_CLASS_STORAGE_EXPRESS	0x010802</div><div class='add'>+</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(nvme_id_table) = {</div><div class='add'>+	{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },</div><div class='add'>+	{ 0, }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pci, nvme_id_table);</div><div class='add'>+</div><div class='add'>+static struct pci_driver nvme_driver = {</div><div class='add'>+	.name		= "nvme",</div><div class='add'>+	.id_table	= nvme_id_table,</div><div class='add'>+	.probe		= nvme_probe,</div><div class='add'>+	.remove		= __devexit_p(nvme_remove),</div><div class='add'>+	.suspend	= nvme_suspend,</div><div class='add'>+	.resume		= nvme_resume,</div><div class='add'>+	.err_handler	= &amp;nvme_err_handler,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init nvme_init(void)</div><div class='add'>+{</div><div class='add'>+	int result = -EBUSY;</div><div class='add'>+</div><div class='add'>+	nvme_thread = kthread_run(nvme_kthread, NULL, "nvme");</div><div class='add'>+	if (IS_ERR(nvme_thread))</div><div class='add'>+		return PTR_ERR(nvme_thread);</div><div class='add'>+</div><div class='add'>+	nvme_major = register_blkdev(nvme_major, "nvme");</div><div class='add'>+	if (nvme_major &lt;= 0)</div><div class='add'>+		goto kill_kthread;</div><div class='add'>+</div><div class='add'>+	result = pci_register_driver(&amp;nvme_driver);</div><div class='add'>+	if (result)</div><div class='add'>+		goto unregister_blkdev;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ unregister_blkdev:</div><div class='add'>+	unregister_blkdev(nvme_major, "nvme");</div><div class='add'>+ kill_kthread:</div><div class='add'>+	kthread_stop(nvme_thread);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit nvme_exit(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;nvme_driver);</div><div class='add'>+	unregister_blkdev(nvme_major, "nvme");</div><div class='add'>+	kthread_stop(nvme_thread);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Matthew Wilcox &lt;willy@linux.intel.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION("0.8");</div><div class='add'>+module_init(nvme_init);</div><div class='add'>+module_exit(nvme_exit);</div><div class='head'>diff --git a/drivers/block/paride/bpck6.c b/drivers/block/paride/bpck6.c<br/>index ad124525ac23..ec64e7f5d1ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/paride/bpck6.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/paride/bpck6.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/paride/bpck6.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/paride/bpck6.c</a></div><div class='hunk'>@@ -20,9 +20,6 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* PARAMETERS */</div><div class='del'>-static int verbose; /* set this to 1 to see debugging messages and whatnot */</div><div class='del'>-</div><div class='ctx'> #define BACKPACK_VERSION "2.0.2"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -36,6 +33,8 @@ static int verbose; /* set this to 1 to see debugging messages and whatnot */</div><div class='ctx'> #include "ppc6lnx.c"</div><div class='ctx'> #include "paride.h"</div><div class='ctx'> </div><div class='add'>+/* PARAMETERS */</div><div class='add'>+static bool verbose; /* set this to 1 to see debugging messages and whatnot */</div><div class='ctx'>  </div><div class='ctx'> </div><div class='ctx'> #define PPCSTRUCT(pi) ((Interface *)(pi-&gt;private))</div><div class='head'>diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c<br/>index 46b8136c31bb..ba2b6b5e5910 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/paride/pcd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/paride/pcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/paride/pcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/paride/pcd.c</a></div><div class='hunk'>@@ -144,7 +144,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY};</div><div class='ctx'> static DEFINE_MUTEX(pcd_mutex);</div><div class='ctx'> static DEFINE_SPINLOCK(pcd_lock);</div><div class='ctx'> </div><div class='del'>-module_param(verbose, bool, 0644);</div><div class='add'>+module_param(verbose, int, 0644);</div><div class='ctx'> module_param(major, int, 0);</div><div class='ctx'> module_param(name, charp, 0);</div><div class='ctx'> module_param(nice, int, 0);</div><div class='head'>diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c<br/>index 869e7676d46f..831e3ac156e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/paride/pd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/paride/pd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/paride/pd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/paride/pd.c</a></div><div class='hunk'>@@ -124,8 +124,9 @@</div><div class='ctx'>    by default.</div><div class='ctx'> </div><div class='ctx'> */</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-static int verbose = 0;</div><div class='add'>+static bool verbose = 0;</div><div class='ctx'> static int major = PD_MAJOR;</div><div class='ctx'> static char *name = PD_NAME;</div><div class='ctx'> static int cluster = 64;</div><div class='head'>diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c<br/>index f21b520ef419..ec8f9ed6326e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/paride/pf.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/paride/pf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/paride/pf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/paride/pf.c</a></div><div class='hunk'>@@ -118,13 +118,15 @@</div><div class='ctx'> #define PF_NAME		"pf"</div><div class='ctx'> #define PF_UNITS	4</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='ctx'> /* Here are things one can override from the insmod command.</div><div class='ctx'>    Most are autoprobed by paride unless set here.  Verbose is off</div><div class='ctx'>    by default.</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-static int verbose = 0;</div><div class='add'>+static bool verbose = 0;</div><div class='ctx'> static int major = PF_MAJOR;</div><div class='ctx'> static char *name = PF_NAME;</div><div class='ctx'> static int cluster = 64;</div><div class='head'>diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c<br/>index a79fb4f7ff62..4a27b1de5fcb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/paride/pg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/paride/pg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/paride/pg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/paride/pg.c</a></div><div class='hunk'>@@ -130,13 +130,14 @@</div><div class='ctx'> #define PI_PG	4</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> /* Here are things one can override from the insmod command.</div><div class='ctx'>    Most are autoprobed by paride unless set here.  Verbose is 0</div><div class='ctx'>    by default.</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-static int verbose = 0;</div><div class='add'>+static bool verbose = 0;</div><div class='ctx'> static int major = PG_MAJOR;</div><div class='ctx'> static char *name = PG_NAME;</div><div class='ctx'> static int disable = 0;</div><div class='head'>diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c<br/>index 7179f79d7468..2596042eb987 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/paride/pt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/paride/pt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/paride/pt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/paride/pt.c</a></div><div class='hunk'>@@ -109,13 +109,15 @@</div><div class='ctx'> #define PT_NAME		"pt"</div><div class='ctx'> #define PT_UNITS	4</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='ctx'> /* Here are things one can override from the insmod command.</div><div class='ctx'>    Most are autoprobed by paride unless set here.  Verbose is on</div><div class='ctx'>    by default.</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-static int verbose = 0;</div><div class='add'>+static bool verbose = 0;</div><div class='ctx'> static int major = PT_MAJOR;</div><div class='ctx'> static char *name = PT_NAME;</div><div class='ctx'> static int disable = 0;</div><div class='head'>diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c<br/>index a63b0a2b7805..d59edeabd93f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/pktcdvd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/pktcdvd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/pktcdvd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/pktcdvd.c</a></div><div class='hunk'>@@ -2817,7 +2817,7 @@ static const struct block_device_operations pktcdvd_ops = {</div><div class='ctx'> 	.check_events =		pkt_check_events,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *pktcdvd_devnode(struct gendisk *gd, mode_t *mode)</div><div class='add'>+static char *pktcdvd_devnode(struct gendisk *gd, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	return kasprintf(GFP_KERNEL, "pktcdvd/%s", gd-&gt;disk_name);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c<br/>index 148ab944378d..3fd31dec8c9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/rbd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/rbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/rbd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/rbd.c</a></div><div class='hunk'>@@ -2184,6 +2184,8 @@ static ssize_t rbd_add(struct bus_type *bus,</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;rbd_dev-&gt;node);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;rbd_dev-&gt;snaps);</div><div class='ctx'> </div><div class='add'>+	init_rwsem(&amp;rbd_dev-&gt;header.snap_rwsem);</div><div class='add'>+</div><div class='ctx'> 	/* generate unique id: find highest unique id, add one */</div><div class='ctx'> 	mutex_lock_nested(&amp;ctl_mutex, SINGLE_DEPTH_NESTING);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/swim.c b/drivers/block/swim.c<br/>index fd5adcd55944..6d5a914b9619 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/swim.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/swim.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/swim.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/swim.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/macintosh.h&gt;</div><div class='ctx'> #include &lt;asm/mac_via.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CARDNAME "swim"</div><div class='head'>diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c<br/>index b70f0fca9a42..e7472f567c9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/sx8.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/sx8.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/sx8.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/sx8.c</a></div><div class='hunk'>@@ -619,8 +619,10 @@ static int carm_array_info (struct carm_host *host, unsigned int array_idx)</div><div class='ctx'> 	       host-&gt;state == HST_DEV_SCAN);</div><div class='ctx'> 	spin_unlock_irq(&amp;host-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	DPRINTK("blk_insert_request, tag == %u\n", idx);</div><div class='del'>-	blk_insert_request(host-&gt;oob_q, crq-&gt;rq, 1, crq);</div><div class='add'>+	DPRINTK("blk_execute_rq_nowait, tag == %u\n", idx);</div><div class='add'>+	crq-&gt;rq-&gt;cmd_type = REQ_TYPE_SPECIAL;</div><div class='add'>+	crq-&gt;rq-&gt;special = crq;</div><div class='add'>+	blk_execute_rq_nowait(host-&gt;oob_q, NULL, crq-&gt;rq, true, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -658,8 +660,10 @@ static int carm_send_special (struct carm_host *host, carm_sspc_t func)</div><div class='ctx'> 	BUG_ON(rc &lt; 0);</div><div class='ctx'> 	crq-&gt;msg_bucket = (u32) rc;</div><div class='ctx'> </div><div class='del'>-	DPRINTK("blk_insert_request, tag == %u\n", idx);</div><div class='del'>-	blk_insert_request(host-&gt;oob_q, crq-&gt;rq, 1, crq);</div><div class='add'>+	DPRINTK("blk_execute_rq_nowait, tag == %u\n", idx);</div><div class='add'>+	crq-&gt;rq-&gt;cmd_type = REQ_TYPE_SPECIAL;</div><div class='add'>+	crq-&gt;rq-&gt;special = crq;</div><div class='add'>+	blk_execute_rq_nowait(host-&gt;oob_q, NULL, crq-&gt;rq, true, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/block/ub.c b/drivers/block/ub.c<br/>index 0e376d46bdd1..7333b9e44411 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/ub.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/ub.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/ub.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/ub.c</a></div><div class='hunk'>@@ -1744,12 +1744,11 @@ static int ub_bd_release(struct gendisk *disk, fmode_t mode)</div><div class='ctx'> static int ub_bd_ioctl(struct block_device *bdev, fmode_t mode,</div><div class='ctx'>     unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	struct gendisk *disk = bdev-&gt;bd_disk;</div><div class='ctx'> 	void __user *usermem = (void __user *) arg;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ub_mutex);</div><div class='del'>-	ret = scsi_cmd_ioctl(disk-&gt;queue, disk, mode, cmd, usermem);</div><div class='add'>+	ret = scsi_cmd_blk_ioctl(bdev, mode, cmd, usermem);</div><div class='ctx'> 	mutex_unlock(&amp;ub_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c<br/>index 4d0b70adf5f7..c4a60badf252 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/virtio_blk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/virtio_blk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/virtio_blk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/virtio_blk.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/virtio.h&gt;</div><div class='ctx'> #include &lt;linux/virtio_blk.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='hunk'>@@ -36,6 +37,12 @@ struct virtio_blk</div><div class='ctx'> 	/* Process context for config space updates */</div><div class='ctx'> 	struct work_struct config_work;</div><div class='ctx'> </div><div class='add'>+	/* Lock for config space updates */</div><div class='add'>+	struct mutex config_lock;</div><div class='add'>+</div><div class='add'>+	/* enable config space updates */</div><div class='add'>+	bool config_enable;</div><div class='add'>+</div><div class='ctx'> 	/* What host tells us, plus 2 for header &amp; tailer. */</div><div class='ctx'> 	unsigned int sg_elems;</div><div class='ctx'> </div><div class='hunk'>@@ -172,7 +179,7 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (virtqueue_add_buf(vblk-&gt;vq, vblk-&gt;sg, out, in, vbr) &lt; 0) {</div><div class='add'>+	if (virtqueue_add_buf(vblk-&gt;vq, vblk-&gt;sg, out, in, vbr, GFP_ATOMIC)&lt;0) {</div><div class='ctx'> 		mempool_free(vbr, vblk-&gt;pool);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -243,8 +250,8 @@ static int virtblk_ioctl(struct block_device *bdev, fmode_t mode,</div><div class='ctx'> 	if (!virtio_has_feature(vblk-&gt;vdev, VIRTIO_BLK_F_SCSI))</div><div class='ctx'> 		return -ENOTTY;</div><div class='ctx'> </div><div class='del'>-	return scsi_cmd_ioctl(disk-&gt;queue, disk, mode, cmd,</div><div class='del'>-			      (void __user *)data);</div><div class='add'>+	return scsi_cmd_blk_ioctl(bdev, mode, cmd,</div><div class='add'>+				  (void __user *)data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* We provide getgeo only to please some old bootloader/partitioning tools */</div><div class='hunk'>@@ -318,6 +325,10 @@ static void virtblk_config_changed_work(struct work_struct *work)</div><div class='ctx'> 	char cap_str_2[10], cap_str_10[10];</div><div class='ctx'> 	u64 capacity, size;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;vblk-&gt;config_lock);</div><div class='add'>+	if (!vblk-&gt;config_enable)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='ctx'> 	/* Host must always specify the capacity. */</div><div class='ctx'> 	vdev-&gt;config-&gt;get(vdev, offsetof(struct virtio_blk_config, capacity),</div><div class='ctx'> 			  &amp;capacity, sizeof(capacity));</div><div class='hunk'>@@ -340,6 +351,8 @@ static void virtblk_config_changed_work(struct work_struct *work)</div><div class='ctx'> 		  cap_str_10, cap_str_2);</div><div class='ctx'> </div><div class='ctx'> 	set_capacity(vblk-&gt;disk, capacity);</div><div class='add'>+done:</div><div class='add'>+	mutex_unlock(&amp;vblk-&gt;config_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void virtblk_config_changed(struct virtio_device *vdev)</div><div class='hunk'>@@ -349,6 +362,18 @@ static void virtblk_config_changed(struct virtio_device *vdev)</div><div class='ctx'> 	queue_work(virtblk_wq, &amp;vblk-&gt;config_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int init_vq(struct virtio_blk *vblk)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* We expect one virtqueue, for output. */</div><div class='add'>+	vblk-&gt;vq = virtio_find_single_vq(vblk-&gt;vdev, blk_done, "requests");</div><div class='add'>+	if (IS_ERR(vblk-&gt;vq))</div><div class='add'>+		err = PTR_ERR(vblk-&gt;vq);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __devinit virtblk_probe(struct virtio_device *vdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct virtio_blk *vblk;</div><div class='hunk'>@@ -388,14 +413,13 @@ static int __devinit virtblk_probe(struct virtio_device *vdev)</div><div class='ctx'> 	vblk-&gt;vdev = vdev;</div><div class='ctx'> 	vblk-&gt;sg_elems = sg_elems;</div><div class='ctx'> 	sg_init_table(vblk-&gt;sg, vblk-&gt;sg_elems);</div><div class='add'>+	mutex_init(&amp;vblk-&gt;config_lock);</div><div class='ctx'> 	INIT_WORK(&amp;vblk-&gt;config_work, virtblk_config_changed_work);</div><div class='add'>+	vblk-&gt;config_enable = true;</div><div class='ctx'> </div><div class='del'>-	/* We expect one virtqueue, for output. */</div><div class='del'>-	vblk-&gt;vq = virtio_find_single_vq(vdev, blk_done, "requests");</div><div class='del'>-	if (IS_ERR(vblk-&gt;vq)) {</div><div class='del'>-		err = PTR_ERR(vblk-&gt;vq);</div><div class='add'>+	err = init_vq(vblk);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto out_free_vblk;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	vblk-&gt;pool = mempool_create_kmalloc_pool(1,sizeof(struct virtblk_req));</div><div class='ctx'> 	if (!vblk-&gt;pool) {</div><div class='hunk'>@@ -542,7 +566,10 @@ static void __devexit virtblk_remove(struct virtio_device *vdev)</div><div class='ctx'> 	struct virtio_blk *vblk = vdev-&gt;priv;</div><div class='ctx'> 	int index = vblk-&gt;index;</div><div class='ctx'> </div><div class='del'>-	flush_work(&amp;vblk-&gt;config_work);</div><div class='add'>+	/* Prevent config work handler from accessing the device. */</div><div class='add'>+	mutex_lock(&amp;vblk-&gt;config_lock);</div><div class='add'>+	vblk-&gt;config_enable = false;</div><div class='add'>+	mutex_unlock(&amp;vblk-&gt;config_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Nothing should be pending. */</div><div class='ctx'> 	BUG_ON(!list_empty(&amp;vblk-&gt;reqs));</div><div class='hunk'>@@ -550,6 +577,8 @@ static void __devexit virtblk_remove(struct virtio_device *vdev)</div><div class='ctx'> 	/* Stop all the virtqueues. */</div><div class='ctx'> 	vdev-&gt;config-&gt;reset(vdev);</div><div class='ctx'> </div><div class='add'>+	flush_work(&amp;vblk-&gt;config_work);</div><div class='add'>+</div><div class='ctx'> 	del_gendisk(vblk-&gt;disk);</div><div class='ctx'> 	blk_cleanup_queue(vblk-&gt;disk-&gt;queue);</div><div class='ctx'> 	put_disk(vblk-&gt;disk);</div><div class='hunk'>@@ -559,6 +588,46 @@ static void __devexit virtblk_remove(struct virtio_device *vdev)</div><div class='ctx'> 	ida_simple_remove(&amp;vd_index_ida, index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int virtblk_freeze(struct virtio_device *vdev)</div><div class='add'>+{</div><div class='add'>+	struct virtio_blk *vblk = vdev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* Ensure we don't receive any more interrupts */</div><div class='add'>+	vdev-&gt;config-&gt;reset(vdev);</div><div class='add'>+</div><div class='add'>+	/* Prevent config work handler from accessing the device. */</div><div class='add'>+	mutex_lock(&amp;vblk-&gt;config_lock);</div><div class='add'>+	vblk-&gt;config_enable = false;</div><div class='add'>+	mutex_unlock(&amp;vblk-&gt;config_lock);</div><div class='add'>+</div><div class='add'>+	flush_work(&amp;vblk-&gt;config_work);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(vblk-&gt;disk-&gt;queue-&gt;queue_lock);</div><div class='add'>+	blk_stop_queue(vblk-&gt;disk-&gt;queue);</div><div class='add'>+	spin_unlock_irq(vblk-&gt;disk-&gt;queue-&gt;queue_lock);</div><div class='add'>+	blk_sync_queue(vblk-&gt;disk-&gt;queue);</div><div class='add'>+</div><div class='add'>+	vdev-&gt;config-&gt;del_vqs(vdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int virtblk_restore(struct virtio_device *vdev)</div><div class='add'>+{</div><div class='add'>+	struct virtio_blk *vblk = vdev-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	vblk-&gt;config_enable = true;</div><div class='add'>+	ret = init_vq(vdev-&gt;priv);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		spin_lock_irq(vblk-&gt;disk-&gt;queue-&gt;queue_lock);</div><div class='add'>+		blk_start_queue(vblk-&gt;disk-&gt;queue);</div><div class='add'>+		spin_unlock_irq(vblk-&gt;disk-&gt;queue-&gt;queue_lock);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static const struct virtio_device_id id_table[] = {</div><div class='ctx'> 	{ VIRTIO_ID_BLOCK, VIRTIO_DEV_ANY_ID },</div><div class='ctx'> 	{ 0 },</div><div class='hunk'>@@ -584,6 +653,10 @@ static struct virtio_driver __refdata virtio_blk = {</div><div class='ctx'> 	.probe			= virtblk_probe,</div><div class='ctx'> 	.remove			= __devexit_p(virtblk_remove),</div><div class='ctx'> 	.config_changed		= virtblk_config_changed,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.freeze			= virtblk_freeze,</div><div class='add'>+	.restore		= virtblk_restore,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init init(void)</div><div class='head'>diff --git a/drivers/block/xd.c b/drivers/block/xd.c<br/>index 4abd2bcd20fb..51a972704db5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/xd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/xd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/xd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/xd.c</a></div><div class='hunk'>@@ -148,7 +148,7 @@ static volatile int xdc_busy;</div><div class='ctx'> static struct timer_list xd_watchdog_int;</div><div class='ctx'> </div><div class='ctx'> static volatile u_char xd_error;</div><div class='del'>-static int nodma = XD_DONT_USE_DMA;</div><div class='add'>+static bool nodma = XD_DONT_USE_DMA;</div><div class='ctx'> </div><div class='ctx'> static struct request_queue *xd_queue;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c<br/>index 15ec4db194d1..0088bf60f368 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/xen-blkback/blkback.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/xen-blkback/blkback.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/xen-blkback/blkback.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/xen-blkback/blkback.c</a></div><div class='hunk'>@@ -39,9 +39,6 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/freezer.h&gt;</div><div class='del'>-#include &lt;linux/loop.h&gt;</div><div class='del'>-#include &lt;linux/falloc.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;xen/events.h&gt;</div><div class='ctx'> #include &lt;xen/page.h&gt;</div><div class='hunk'>@@ -362,7 +359,7 @@ static int xen_blkbk_map(struct blkif_request *req,</div><div class='ctx'> {</div><div class='ctx'> 	struct gnttab_map_grant_ref map[BLKIF_MAX_SEGMENTS_PER_REQUEST];</div><div class='ctx'> 	int i;</div><div class='del'>-	int nseg = req-&gt;nr_segments;</div><div class='add'>+	int nseg = req-&gt;u.rw.nr_segments;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -416,30 +413,25 @@ static int xen_blkbk_map(struct blkif_request *req,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xen_blk_discard(struct xen_blkif *blkif, struct blkif_request *req)</div><div class='add'>+static int dispatch_discard_io(struct xen_blkif *blkif,</div><div class='add'>+				struct blkif_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int status = BLKIF_RSP_OKAY;</div><div class='ctx'> 	struct block_device *bdev = blkif-&gt;vbd.bdev;</div><div class='ctx'> </div><div class='del'>-	if (blkif-&gt;blk_backend_type == BLKIF_BACKEND_PHY)</div><div class='del'>-		/* just forward the discard request */</div><div class='add'>+	blkif-&gt;st_ds_req++;</div><div class='add'>+</div><div class='add'>+	xen_blkif_get(blkif);</div><div class='add'>+	if (blkif-&gt;blk_backend_type == BLKIF_BACKEND_PHY ||</div><div class='add'>+	    blkif-&gt;blk_backend_type == BLKIF_BACKEND_FILE) {</div><div class='add'>+		unsigned long secure = (blkif-&gt;vbd.discard_secure &amp;&amp;</div><div class='add'>+			(req-&gt;u.discard.flag &amp; BLKIF_DISCARD_SECURE)) ?</div><div class='add'>+			BLKDEV_DISCARD_SECURE : 0;</div><div class='ctx'> 		err = blkdev_issue_discard(bdev,</div><div class='ctx'> 				req-&gt;u.discard.sector_number,</div><div class='ctx'> 				req-&gt;u.discard.nr_sectors,</div><div class='del'>-				GFP_KERNEL, 0);</div><div class='del'>-	else if (blkif-&gt;blk_backend_type == BLKIF_BACKEND_FILE) {</div><div class='del'>-		/* punch a hole in the backing file */</div><div class='del'>-		struct loop_device *lo = bdev-&gt;bd_disk-&gt;private_data;</div><div class='del'>-		struct file *file = lo-&gt;lo_backing_file;</div><div class='del'>-</div><div class='del'>-		if (file-&gt;f_op-&gt;fallocate)</div><div class='del'>-			err = file-&gt;f_op-&gt;fallocate(file,</div><div class='del'>-				FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE,</div><div class='del'>-				req-&gt;u.discard.sector_number &lt;&lt; 9,</div><div class='del'>-				req-&gt;u.discard.nr_sectors &lt;&lt; 9);</div><div class='del'>-		else</div><div class='del'>-			err = -EOPNOTSUPP;</div><div class='add'>+				GFP_KERNEL, secure);</div><div class='ctx'> 	} else</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='ctx'> </div><div class='hunk'>@@ -449,7 +441,9 @@ static void xen_blk_discard(struct xen_blkif *blkif, struct blkif_request *req)</div><div class='ctx'> 	} else if (err)</div><div class='ctx'> 		status = BLKIF_RSP_ERROR;</div><div class='ctx'> </div><div class='del'>-	make_response(blkif, req-&gt;id, req-&gt;operation, status);</div><div class='add'>+	make_response(blkif, req-&gt;u.discard.id, req-&gt;operation, status);</div><div class='add'>+	xen_blkif_put(blkif);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void xen_blk_drain_io(struct xen_blkif *blkif)</div><div class='hunk'>@@ -573,8 +567,11 @@ __do_block_io_op(struct xen_blkif *blkif)</div><div class='ctx'> </div><div class='ctx'> 		/* Apply all sanity checks to /private copy/ of request. */</div><div class='ctx'> 		barrier();</div><div class='del'>-</div><div class='del'>-		if (dispatch_rw_block_io(blkif, &amp;req, pending_req))</div><div class='add'>+		if (unlikely(req.operation == BLKIF_OP_DISCARD)) {</div><div class='add'>+			free_req(pending_req);</div><div class='add'>+			if (dispatch_discard_io(blkif, &amp;req))</div><div class='add'>+				break;</div><div class='add'>+		} else if (dispatch_rw_block_io(blkif, &amp;req, pending_req))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		/* Yield point for this unbounded loop. */</div><div class='hunk'>@@ -633,10 +630,6 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,</div><div class='ctx'> 		blkif-&gt;st_f_req++;</div><div class='ctx'> 		operation = WRITE_FLUSH;</div><div class='ctx'> 		break;</div><div class='del'>-	case BLKIF_OP_DISCARD:</div><div class='del'>-		blkif-&gt;st_ds_req++;</div><div class='del'>-		operation = REQ_DISCARD;</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		operation = 0; /* make gcc happy */</div><div class='ctx'> 		goto fail_response;</div><div class='hunk'>@@ -644,9 +637,9 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check that the number of segments is sane. */</div><div class='del'>-	nseg = req-&gt;nr_segments;</div><div class='del'>-	if (unlikely(nseg == 0 &amp;&amp; operation != WRITE_FLUSH &amp;&amp;</div><div class='del'>-				operation != REQ_DISCARD) ||</div><div class='add'>+	nseg = req-&gt;u.rw.nr_segments;</div><div class='add'>+</div><div class='add'>+	if (unlikely(nseg == 0 &amp;&amp; operation != WRITE_FLUSH) ||</div><div class='ctx'> 	    unlikely(nseg &gt; BLKIF_MAX_SEGMENTS_PER_REQUEST)) {</div><div class='ctx'> 		pr_debug(DRV_PFX "Bad number of segments in request (%d)\n",</div><div class='ctx'> 			 nseg);</div><div class='hunk'>@@ -654,12 +647,12 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,</div><div class='ctx'> 		goto fail_response;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	preq.dev           = req-&gt;handle;</div><div class='add'>+	preq.dev           = req-&gt;u.rw.handle;</div><div class='ctx'> 	preq.sector_number = req-&gt;u.rw.sector_number;</div><div class='ctx'> 	preq.nr_sects      = 0;</div><div class='ctx'> </div><div class='ctx'> 	pending_req-&gt;blkif     = blkif;</div><div class='del'>-	pending_req-&gt;id        = req-&gt;id;</div><div class='add'>+	pending_req-&gt;id        = req-&gt;u.rw.id;</div><div class='ctx'> 	pending_req-&gt;operation = req-&gt;operation;</div><div class='ctx'> 	pending_req-&gt;status    = BLKIF_RSP_OKAY;</div><div class='ctx'> 	pending_req-&gt;nr_pages  = nseg;</div><div class='hunk'>@@ -707,7 +700,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,</div><div class='ctx'> 	 * the hypercall to unmap the grants - that is all done in</div><div class='ctx'> 	 * xen_blkbk_unmap.</div><div class='ctx'> 	 */</div><div class='del'>-	if (operation != REQ_DISCARD &amp;&amp; xen_blkbk_map(req, pending_req, seg))</div><div class='add'>+	if (xen_blkbk_map(req, pending_req, seg))</div><div class='ctx'> 		goto fail_flush;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -739,23 +732,16 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,</div><div class='ctx'> </div><div class='ctx'> 	/* This will be hit if the operation was a flush or discard. */</div><div class='ctx'> 	if (!bio) {</div><div class='del'>-		BUG_ON(operation != WRITE_FLUSH &amp;&amp; operation != REQ_DISCARD);</div><div class='add'>+		BUG_ON(operation != WRITE_FLUSH);</div><div class='ctx'> </div><div class='del'>-		if (operation == WRITE_FLUSH) {</div><div class='del'>-			bio = bio_alloc(GFP_KERNEL, 0);</div><div class='del'>-			if (unlikely(bio == NULL))</div><div class='del'>-				goto fail_put_bio;</div><div class='add'>+		bio = bio_alloc(GFP_KERNEL, 0);</div><div class='add'>+		if (unlikely(bio == NULL))</div><div class='add'>+			goto fail_put_bio;</div><div class='ctx'> </div><div class='del'>-			biolist[nbio++] = bio;</div><div class='del'>-			bio-&gt;bi_bdev    = preq.bdev;</div><div class='del'>-			bio-&gt;bi_private = pending_req;</div><div class='del'>-			bio-&gt;bi_end_io  = end_block_io_op;</div><div class='del'>-		} else if (operation == REQ_DISCARD) {</div><div class='del'>-			xen_blk_discard(blkif, req);</div><div class='del'>-			xen_blkif_put(blkif);</div><div class='del'>-			free_req(pending_req);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+		biolist[nbio++] = bio;</div><div class='add'>+		bio-&gt;bi_bdev    = preq.bdev;</div><div class='add'>+		bio-&gt;bi_private = pending_req;</div><div class='add'>+		bio-&gt;bi_end_io  = end_block_io_op;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -784,7 +770,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,</div><div class='ctx'> 	xen_blkbk_unmap(pending_req);</div><div class='ctx'>  fail_response:</div><div class='ctx'> 	/* Haven't submitted any bio's yet. */</div><div class='del'>-	make_response(blkif, req-&gt;id, req-&gt;operation, BLKIF_RSP_ERROR);</div><div class='add'>+	make_response(blkif, req-&gt;u.rw.id, req-&gt;operation, BLKIF_RSP_ERROR);</div><div class='ctx'> 	free_req(pending_req);</div><div class='ctx'> 	msleep(1); /* back off a bit */</div><div class='ctx'> 	return -EIO;</div><div class='head'>diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h<br/>index dfb1b3a43a5d..d0ee7edc9be8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/xen-blkback/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/xen-blkback/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/xen-blkback/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/xen-blkback/common.h</a></div><div class='hunk'>@@ -60,58 +60,66 @@ struct blkif_common_response {</div><div class='ctx'> 	char dummy;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* i386 protocol version */</div><div class='del'>-#pragma pack(push, 4)</div><div class='del'>-</div><div class='ctx'> struct blkif_x86_32_request_rw {</div><div class='add'>+	uint8_t        nr_segments;  /* number of segments                   */</div><div class='add'>+	blkif_vdev_t   handle;       /* only for read/write requests         */</div><div class='add'>+	uint64_t       id;           /* private guest value, echoed in resp  */</div><div class='ctx'> 	blkif_sector_t sector_number;/* start sector idx on disk (r/w only)  */</div><div class='ctx'> 	struct blkif_request_segment seg[BLKIF_MAX_SEGMENTS_PER_REQUEST];</div><div class='del'>-};</div><div class='add'>+} __attribute__((__packed__));</div><div class='ctx'> </div><div class='ctx'> struct blkif_x86_32_request_discard {</div><div class='add'>+	uint8_t        flag;         /* BLKIF_DISCARD_SECURE or zero         */</div><div class='add'>+	blkif_vdev_t   _pad1;        /* was "handle" for read/write requests */</div><div class='add'>+	uint64_t       id;           /* private guest value, echoed in resp  */</div><div class='ctx'> 	blkif_sector_t sector_number;/* start sector idx on disk (r/w only)  */</div><div class='del'>-	uint64_t nr_sectors;</div><div class='del'>-};</div><div class='add'>+	uint64_t       nr_sectors;</div><div class='add'>+} __attribute__((__packed__));</div><div class='ctx'> </div><div class='ctx'> struct blkif_x86_32_request {</div><div class='ctx'> 	uint8_t        operation;    /* BLKIF_OP_???                         */</div><div class='del'>-	uint8_t        nr_segments;  /* number of segments                   */</div><div class='del'>-	blkif_vdev_t   handle;       /* only for read/write requests         */</div><div class='del'>-	uint64_t       id;           /* private guest value, echoed in resp  */</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct blkif_x86_32_request_rw rw;</div><div class='ctx'> 		struct blkif_x86_32_request_discard discard;</div><div class='ctx'> 	} u;</div><div class='del'>-};</div><div class='add'>+} __attribute__((__packed__));</div><div class='add'>+</div><div class='add'>+/* i386 protocol version */</div><div class='add'>+#pragma pack(push, 4)</div><div class='ctx'> struct blkif_x86_32_response {</div><div class='ctx'> 	uint64_t        id;              /* copied from request */</div><div class='ctx'> 	uint8_t         operation;       /* copied from request */</div><div class='ctx'> 	int16_t         status;          /* BLKIF_RSP_???       */</div><div class='ctx'> };</div><div class='ctx'> #pragma pack(pop)</div><div class='del'>-</div><div class='ctx'> /* x86_64 protocol version */</div><div class='ctx'> </div><div class='ctx'> struct blkif_x86_64_request_rw {</div><div class='add'>+	uint8_t        nr_segments;  /* number of segments                   */</div><div class='add'>+	blkif_vdev_t   handle;       /* only for read/write requests         */</div><div class='add'>+	uint32_t       _pad1;        /* offsetof(blkif_reqest..,u.rw.id)==8  */</div><div class='add'>+	uint64_t       id;</div><div class='ctx'> 	blkif_sector_t sector_number;/* start sector idx on disk (r/w only)  */</div><div class='ctx'> 	struct blkif_request_segment seg[BLKIF_MAX_SEGMENTS_PER_REQUEST];</div><div class='del'>-};</div><div class='add'>+} __attribute__((__packed__));</div><div class='ctx'> </div><div class='ctx'> struct blkif_x86_64_request_discard {</div><div class='add'>+	uint8_t        flag;         /* BLKIF_DISCARD_SECURE or zero         */</div><div class='add'>+	blkif_vdev_t   _pad1;        /* was "handle" for read/write requests */</div><div class='add'>+        uint32_t       _pad2;        /* offsetof(blkif_..,u.discard.id)==8   */</div><div class='add'>+	uint64_t       id;</div><div class='ctx'> 	blkif_sector_t sector_number;/* start sector idx on disk (r/w only)  */</div><div class='del'>-	uint64_t nr_sectors;</div><div class='del'>-};</div><div class='add'>+	uint64_t       nr_sectors;</div><div class='add'>+} __attribute__((__packed__));</div><div class='ctx'> </div><div class='ctx'> struct blkif_x86_64_request {</div><div class='ctx'> 	uint8_t        operation;    /* BLKIF_OP_???                         */</div><div class='del'>-	uint8_t        nr_segments;  /* number of segments                   */</div><div class='del'>-	blkif_vdev_t   handle;       /* only for read/write requests         */</div><div class='del'>-	uint64_t       __attribute__((__aligned__(8))) id;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct blkif_x86_64_request_rw rw;</div><div class='ctx'> 		struct blkif_x86_64_request_discard discard;</div><div class='ctx'> 	} u;</div><div class='del'>-};</div><div class='add'>+} __attribute__((__packed__));</div><div class='add'>+</div><div class='ctx'> struct blkif_x86_64_response {</div><div class='ctx'> 	uint64_t       __attribute__((__aligned__(8))) id;</div><div class='ctx'> 	uint8_t         operation;       /* copied from request */</div><div class='hunk'>@@ -156,6 +164,7 @@ struct xen_vbd {</div><div class='ctx'> 	/* Cached size parameter. */</div><div class='ctx'> 	sector_t		size;</div><div class='ctx'> 	bool			flush_support;</div><div class='add'>+	bool			discard_secure;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct backend_info;</div><div class='hunk'>@@ -237,22 +246,23 @@ static inline void blkif_get_x86_32_req(struct blkif_request *dst,</div><div class='ctx'> {</div><div class='ctx'> 	int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST;</div><div class='ctx'> 	dst-&gt;operation = src-&gt;operation;</div><div class='del'>-	dst-&gt;nr_segments = src-&gt;nr_segments;</div><div class='del'>-	dst-&gt;handle = src-&gt;handle;</div><div class='del'>-	dst-&gt;id = src-&gt;id;</div><div class='ctx'> 	switch (src-&gt;operation) {</div><div class='ctx'> 	case BLKIF_OP_READ:</div><div class='ctx'> 	case BLKIF_OP_WRITE:</div><div class='ctx'> 	case BLKIF_OP_WRITE_BARRIER:</div><div class='ctx'> 	case BLKIF_OP_FLUSH_DISKCACHE:</div><div class='add'>+		dst-&gt;u.rw.nr_segments = src-&gt;u.rw.nr_segments;</div><div class='add'>+		dst-&gt;u.rw.handle = src-&gt;u.rw.handle;</div><div class='add'>+		dst-&gt;u.rw.id = src-&gt;u.rw.id;</div><div class='ctx'> 		dst-&gt;u.rw.sector_number = src-&gt;u.rw.sector_number;</div><div class='ctx'> 		barrier();</div><div class='del'>-		if (n &gt; dst-&gt;nr_segments)</div><div class='del'>-			n = dst-&gt;nr_segments;</div><div class='add'>+		if (n &gt; dst-&gt;u.rw.nr_segments)</div><div class='add'>+			n = dst-&gt;u.rw.nr_segments;</div><div class='ctx'> 		for (i = 0; i &lt; n; i++)</div><div class='ctx'> 			dst-&gt;u.rw.seg[i] = src-&gt;u.rw.seg[i];</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BLKIF_OP_DISCARD:</div><div class='add'>+		dst-&gt;u.discard.flag = src-&gt;u.discard.flag;</div><div class='ctx'> 		dst-&gt;u.discard.sector_number = src-&gt;u.discard.sector_number;</div><div class='ctx'> 		dst-&gt;u.discard.nr_sectors = src-&gt;u.discard.nr_sectors;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -266,22 +276,23 @@ static inline void blkif_get_x86_64_req(struct blkif_request *dst,</div><div class='ctx'> {</div><div class='ctx'> 	int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST;</div><div class='ctx'> 	dst-&gt;operation = src-&gt;operation;</div><div class='del'>-	dst-&gt;nr_segments = src-&gt;nr_segments;</div><div class='del'>-	dst-&gt;handle = src-&gt;handle;</div><div class='del'>-	dst-&gt;id = src-&gt;id;</div><div class='ctx'> 	switch (src-&gt;operation) {</div><div class='ctx'> 	case BLKIF_OP_READ:</div><div class='ctx'> 	case BLKIF_OP_WRITE:</div><div class='ctx'> 	case BLKIF_OP_WRITE_BARRIER:</div><div class='ctx'> 	case BLKIF_OP_FLUSH_DISKCACHE:</div><div class='add'>+		dst-&gt;u.rw.nr_segments = src-&gt;u.rw.nr_segments;</div><div class='add'>+		dst-&gt;u.rw.handle = src-&gt;u.rw.handle;</div><div class='add'>+		dst-&gt;u.rw.id = src-&gt;u.rw.id;</div><div class='ctx'> 		dst-&gt;u.rw.sector_number = src-&gt;u.rw.sector_number;</div><div class='ctx'> 		barrier();</div><div class='del'>-		if (n &gt; dst-&gt;nr_segments)</div><div class='del'>-			n = dst-&gt;nr_segments;</div><div class='add'>+		if (n &gt; dst-&gt;u.rw.nr_segments)</div><div class='add'>+			n = dst-&gt;u.rw.nr_segments;</div><div class='ctx'> 		for (i = 0; i &lt; n; i++)</div><div class='ctx'> 			dst-&gt;u.rw.seg[i] = src-&gt;u.rw.seg[i];</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BLKIF_OP_DISCARD:</div><div class='add'>+		dst-&gt;u.discard.flag = src-&gt;u.discard.flag;</div><div class='ctx'> 		dst-&gt;u.discard.sector_number = src-&gt;u.discard.sector_number;</div><div class='ctx'> 		dst-&gt;u.discard.nr_sectors = src-&gt;u.discard.nr_sectors;</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c<br/>index f759ad4584c3..24a2fb57e5d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/xen-blkback/xenbus.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/xen-blkback/xenbus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/xen-blkback/xenbus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/xen-blkback/xenbus.c</a></div><div class='hunk'>@@ -338,6 +338,9 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle,</div><div class='ctx'> 	if (q &amp;&amp; q-&gt;flush_flags)</div><div class='ctx'> 		vbd-&gt;flush_support = true;</div><div class='ctx'> </div><div class='add'>+	if (q &amp;&amp; blk_queue_secdiscard(q))</div><div class='add'>+		vbd-&gt;discard_secure = true;</div><div class='add'>+</div><div class='ctx'> 	DPRINTK("Successful creation of handle=%04x (dom=%u)\n",</div><div class='ctx'> 		handle, blkif-&gt;domid);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -420,6 +423,15 @@ int xen_blkbk_discard(struct xenbus_transaction xbt, struct backend_info *be)</div><div class='ctx'> 				state = 1;</div><div class='ctx'> 				blkif-&gt;blk_backend_type = BLKIF_BACKEND_PHY;</div><div class='ctx'> 			}</div><div class='add'>+			/* Optional. */</div><div class='add'>+			err = xenbus_printf(xbt, dev-&gt;nodename,</div><div class='add'>+				"discard-secure", "%d",</div><div class='add'>+				blkif-&gt;vbd.discard_secure);</div><div class='add'>+			if (err) {</div><div class='add'>+				xenbus_dev_fatal(dev, err,</div><div class='add'>+					"writting discard-secure");</div><div class='add'>+				goto kfree;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = PTR_ERR(type);</div><div class='hunk'>@@ -613,7 +625,7 @@ static void frontend_changed(struct xenbus_device *dev,</div><div class='ctx'> 	case XenbusStateConnected:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Ensure we connect even when two watches fire in</div><div class='del'>-		 * close successsion and we miss the intermediate value</div><div class='add'>+		 * close succession and we miss the intermediate value</div><div class='ctx'> 		 * of frontend_state.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (dev-&gt;state == XenbusStateConnected)</div><div class='hunk'>@@ -787,17 +799,14 @@ static const struct xenbus_device_id xen_blkbk_ids[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct xenbus_driver xen_blkbk = {</div><div class='del'>-	.name = "vbd",</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.ids = xen_blkbk_ids,</div><div class='add'>+static DEFINE_XENBUS_DRIVER(xen_blkbk, ,</div><div class='ctx'> 	.probe = xen_blkbk_probe,</div><div class='ctx'> 	.remove = xen_blkbk_remove,</div><div class='ctx'> 	.otherend_changed = frontend_changed</div><div class='del'>-};</div><div class='add'>+);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> int xen_blkif_xenbus_init(void)</div><div class='ctx'> {</div><div class='del'>-	return xenbus_register_backend(&amp;xen_blkbk);</div><div class='add'>+	return xenbus_register_backend(&amp;xen_blkbk_driver);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c<br/>index 7b2ec5908413..2f22874c0a37 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/xen-blkfront.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/xen-blkfront.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/xen-blkfront.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/xen-blkfront.c</a></div><div class='hunk'>@@ -98,7 +98,8 @@ struct blkfront_info</div><div class='ctx'> 	unsigned long shadow_free;</div><div class='ctx'> 	unsigned int feature_flush;</div><div class='ctx'> 	unsigned int flush_op;</div><div class='del'>-	unsigned int feature_discard;</div><div class='add'>+	unsigned int feature_discard:1;</div><div class='add'>+	unsigned int feature_secdiscard:1;</div><div class='ctx'> 	unsigned int discard_granularity;</div><div class='ctx'> 	unsigned int discard_alignment;</div><div class='ctx'> 	int is_ready;</div><div class='hunk'>@@ -135,15 +136,15 @@ static int get_id_from_freelist(struct blkfront_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long free = info-&gt;shadow_free;</div><div class='ctx'> 	BUG_ON(free &gt;= BLK_RING_SIZE);</div><div class='del'>-	info-&gt;shadow_free = info-&gt;shadow[free].req.id;</div><div class='del'>-	info-&gt;shadow[free].req.id = 0x0fffffee; /* debug */</div><div class='add'>+	info-&gt;shadow_free = info-&gt;shadow[free].req.u.rw.id;</div><div class='add'>+	info-&gt;shadow[free].req.u.rw.id = 0x0fffffee; /* debug */</div><div class='ctx'> 	return free;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void add_id_to_freelist(struct blkfront_info *info,</div><div class='ctx'> 			       unsigned long id)</div><div class='ctx'> {</div><div class='del'>-	info-&gt;shadow[id].req.id  = info-&gt;shadow_free;</div><div class='add'>+	info-&gt;shadow[id].req.u.rw.id  = info-&gt;shadow_free;</div><div class='ctx'> 	info-&gt;shadow[id].request = NULL;</div><div class='ctx'> 	info-&gt;shadow_free = id;</div><div class='ctx'> }</div><div class='hunk'>@@ -156,7 +157,7 @@ static int xlbd_reserve_minors(unsigned int minor, unsigned int nr)</div><div class='ctx'> 	if (end &gt; nr_minors) {</div><div class='ctx'> 		unsigned long *bitmap, *old;</div><div class='ctx'> </div><div class='del'>-		bitmap = kzalloc(BITS_TO_LONGS(end) * sizeof(*bitmap),</div><div class='add'>+		bitmap = kcalloc(BITS_TO_LONGS(end), sizeof(*bitmap),</div><div class='ctx'> 				 GFP_KERNEL);</div><div class='ctx'> 		if (bitmap == NULL)</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -287,9 +288,9 @@ static int blkif_queue_request(struct request *req)</div><div class='ctx'> 	id = get_id_from_freelist(info);</div><div class='ctx'> 	info-&gt;shadow[id].request = req;</div><div class='ctx'> </div><div class='del'>-	ring_req-&gt;id = id;</div><div class='add'>+	ring_req-&gt;u.rw.id = id;</div><div class='ctx'> 	ring_req-&gt;u.rw.sector_number = (blkif_sector_t)blk_rq_pos(req);</div><div class='del'>-	ring_req-&gt;handle = info-&gt;handle;</div><div class='add'>+	ring_req-&gt;u.rw.handle = info-&gt;handle;</div><div class='ctx'> </div><div class='ctx'> 	ring_req-&gt;operation = rq_data_dir(req) ?</div><div class='ctx'> 		BLKIF_OP_WRITE : BLKIF_OP_READ;</div><div class='hunk'>@@ -305,16 +306,21 @@ static int blkif_queue_request(struct request *req)</div><div class='ctx'> 		ring_req-&gt;operation = info-&gt;flush_op;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(req-&gt;cmd_flags &amp; REQ_DISCARD)) {</div><div class='add'>+	if (unlikely(req-&gt;cmd_flags &amp; (REQ_DISCARD | REQ_SECURE))) {</div><div class='ctx'> 		/* id, sector_number and handle are set above. */</div><div class='ctx'> 		ring_req-&gt;operation = BLKIF_OP_DISCARD;</div><div class='del'>-		ring_req-&gt;nr_segments = 0;</div><div class='ctx'> 		ring_req-&gt;u.discard.nr_sectors = blk_rq_sectors(req);</div><div class='add'>+		if ((req-&gt;cmd_flags &amp; REQ_SECURE) &amp;&amp; info-&gt;feature_secdiscard)</div><div class='add'>+			ring_req-&gt;u.discard.flag = BLKIF_DISCARD_SECURE;</div><div class='add'>+		else</div><div class='add'>+			ring_req-&gt;u.discard.flag = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		ring_req-&gt;nr_segments = blk_rq_map_sg(req-&gt;q, req, info-&gt;sg);</div><div class='del'>-		BUG_ON(ring_req-&gt;nr_segments &gt; BLKIF_MAX_SEGMENTS_PER_REQUEST);</div><div class='add'>+		ring_req-&gt;u.rw.nr_segments = blk_rq_map_sg(req-&gt;q, req,</div><div class='add'>+							   info-&gt;sg);</div><div class='add'>+		BUG_ON(ring_req-&gt;u.rw.nr_segments &gt;</div><div class='add'>+		       BLKIF_MAX_SEGMENTS_PER_REQUEST);</div><div class='ctx'> </div><div class='del'>-		for_each_sg(info-&gt;sg, sg, ring_req-&gt;nr_segments, i) {</div><div class='add'>+		for_each_sg(info-&gt;sg, sg, ring_req-&gt;u.rw.nr_segments, i) {</div><div class='ctx'> 			buffer_mfn = pfn_to_mfn(page_to_pfn(sg_page(sg)));</div><div class='ctx'> 			fsect = sg-&gt;offset &gt;&gt; 9;</div><div class='ctx'> 			lsect = fsect + (sg-&gt;length &gt;&gt; 9) - 1;</div><div class='hunk'>@@ -424,6 +430,8 @@ static int xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size)</div><div class='ctx'> 		blk_queue_max_discard_sectors(rq, get_capacity(gd));</div><div class='ctx'> 		rq-&gt;limits.discard_granularity = info-&gt;discard_granularity;</div><div class='ctx'> 		rq-&gt;limits.discard_alignment = info-&gt;discard_alignment;</div><div class='add'>+		if (info-&gt;feature_secdiscard)</div><div class='add'>+			queue_flag_set_unlocked(QUEUE_FLAG_SECDISCARD, rq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Hard sector size and max sectors impersonate the equiv. hardware. */</div><div class='hunk'>@@ -705,7 +713,9 @@ static void blkif_free(struct blkfront_info *info, int suspend)</div><div class='ctx'> static void blkif_completion(struct blk_shadow *s)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	for (i = 0; i &lt; s-&gt;req.nr_segments; i++)</div><div class='add'>+	/* Do not let BLKIF_OP_DISCARD as nr_segment is in the same place</div><div class='add'>+	 * flag. */</div><div class='add'>+	for (i = 0; i &lt; s-&gt;req.u.rw.nr_segments; i++)</div><div class='ctx'> 		gnttab_end_foreign_access(s-&gt;req.u.rw.seg[i].gref, 0, 0UL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -736,7 +746,8 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		id   = bret-&gt;id;</div><div class='ctx'> 		req  = info-&gt;shadow[id].request;</div><div class='ctx'> </div><div class='del'>-		blkif_completion(&amp;info-&gt;shadow[id]);</div><div class='add'>+		if (bret-&gt;operation != BLKIF_OP_DISCARD)</div><div class='add'>+			blkif_completion(&amp;info-&gt;shadow[id]);</div><div class='ctx'> </div><div class='ctx'> 		add_id_to_freelist(info, id);</div><div class='ctx'> </div><div class='hunk'>@@ -749,7 +760,9 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)</div><div class='ctx'> 					   info-&gt;gd-&gt;disk_name);</div><div class='ctx'> 				error = -EOPNOTSUPP;</div><div class='ctx'> 				info-&gt;feature_discard = 0;</div><div class='add'>+				info-&gt;feature_secdiscard = 0;</div><div class='ctx'> 				queue_flag_clear(QUEUE_FLAG_DISCARD, rq);</div><div class='add'>+				queue_flag_clear(QUEUE_FLAG_SECDISCARD, rq);</div><div class='ctx'> 			}</div><div class='ctx'> 			__blk_end_request_all(req, error);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -763,7 +776,7 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)</div><div class='ctx'> 				error = -EOPNOTSUPP;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (unlikely(bret-&gt;status == BLKIF_RSP_ERROR &amp;&amp;</div><div class='del'>-				     info-&gt;shadow[id].req.nr_segments == 0)) {</div><div class='add'>+				     info-&gt;shadow[id].req.u.rw.nr_segments == 0)) {</div><div class='ctx'> 				printk(KERN_WARNING "blkfront: %s: empty write %s op failed\n",</div><div class='ctx'> 				       info-&gt;flush_op == BLKIF_OP_WRITE_BARRIER ?</div><div class='ctx'> 				       "barrier" :  "flush disk cache",</div><div class='hunk'>@@ -984,8 +997,8 @@ static int blkfront_probe(struct xenbus_device *dev,</div><div class='ctx'> 	INIT_WORK(&amp;info-&gt;work, blkif_restart_queue);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; BLK_RING_SIZE; i++)</div><div class='del'>-		info-&gt;shadow[i].req.id = i+1;</div><div class='del'>-	info-&gt;shadow[BLK_RING_SIZE-1].req.id = 0x0fffffff;</div><div class='add'>+		info-&gt;shadow[i].req.u.rw.id = i+1;</div><div class='add'>+	info-&gt;shadow[BLK_RING_SIZE-1].req.u.rw.id = 0x0fffffff;</div><div class='ctx'> </div><div class='ctx'> 	/* Front end dir is a number, which is used as the id. */</div><div class='ctx'> 	info-&gt;handle = simple_strtoul(strrchr(dev-&gt;nodename, '/')+1, NULL, 0);</div><div class='hunk'>@@ -1019,9 +1032,9 @@ static int blkif_recover(struct blkfront_info *info)</div><div class='ctx'> 	/* Stage 2: Set up free list. */</div><div class='ctx'> 	memset(&amp;info-&gt;shadow, 0, sizeof(info-&gt;shadow));</div><div class='ctx'> 	for (i = 0; i &lt; BLK_RING_SIZE; i++)</div><div class='del'>-		info-&gt;shadow[i].req.id = i+1;</div><div class='add'>+		info-&gt;shadow[i].req.u.rw.id = i+1;</div><div class='ctx'> 	info-&gt;shadow_free = info-&gt;ring.req_prod_pvt;</div><div class='del'>-	info-&gt;shadow[BLK_RING_SIZE-1].req.id = 0x0fffffff;</div><div class='add'>+	info-&gt;shadow[BLK_RING_SIZE-1].req.u.rw.id = 0x0fffffff;</div><div class='ctx'> </div><div class='ctx'> 	/* Stage 3: Find pending requests and requeue them. */</div><div class='ctx'> 	for (i = 0; i &lt; BLK_RING_SIZE; i++) {</div><div class='hunk'>@@ -1034,17 +1047,19 @@ static int blkif_recover(struct blkfront_info *info)</div><div class='ctx'> 		*req = copy[i].req;</div><div class='ctx'> </div><div class='ctx'> 		/* We get a new request id, and must reset the shadow state. */</div><div class='del'>-		req-&gt;id = get_id_from_freelist(info);</div><div class='del'>-		memcpy(&amp;info-&gt;shadow[req-&gt;id], &amp;copy[i], sizeof(copy[i]));</div><div class='add'>+		req-&gt;u.rw.id = get_id_from_freelist(info);</div><div class='add'>+		memcpy(&amp;info-&gt;shadow[req-&gt;u.rw.id], &amp;copy[i], sizeof(copy[i]));</div><div class='ctx'> </div><div class='add'>+		if (req-&gt;operation != BLKIF_OP_DISCARD) {</div><div class='ctx'> 		/* Rewrite any grant references invalidated by susp/resume. */</div><div class='del'>-		for (j = 0; j &lt; req-&gt;nr_segments; j++)</div><div class='del'>-			gnttab_grant_foreign_access_ref(</div><div class='del'>-				req-&gt;u.rw.seg[j].gref,</div><div class='del'>-				info-&gt;xbdev-&gt;otherend_id,</div><div class='del'>-				pfn_to_mfn(info-&gt;shadow[req-&gt;id].frame[j]),</div><div class='del'>-				rq_data_dir(info-&gt;shadow[req-&gt;id].request));</div><div class='del'>-		info-&gt;shadow[req-&gt;id].req = *req;</div><div class='add'>+			for (j = 0; j &lt; req-&gt;u.rw.nr_segments; j++)</div><div class='add'>+				gnttab_grant_foreign_access_ref(</div><div class='add'>+					req-&gt;u.rw.seg[j].gref,</div><div class='add'>+					info-&gt;xbdev-&gt;otherend_id,</div><div class='add'>+					pfn_to_mfn(info-&gt;shadow[req-&gt;u.rw.id].frame[j]),</div><div class='add'>+					rq_data_dir(info-&gt;shadow[req-&gt;u.rw.id].request));</div><div class='add'>+		}</div><div class='add'>+		info-&gt;shadow[req-&gt;u.rw.id].req = *req;</div><div class='ctx'> </div><div class='ctx'> 		info-&gt;ring.req_prod_pvt++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1135,11 +1150,13 @@ static void blkfront_setup_discard(struct blkfront_info *info)</div><div class='ctx'> 	char *type;</div><div class='ctx'> 	unsigned int discard_granularity;</div><div class='ctx'> 	unsigned int discard_alignment;</div><div class='add'>+	unsigned int discard_secure;</div><div class='ctx'> </div><div class='ctx'> 	type = xenbus_read(XBT_NIL, info-&gt;xbdev-&gt;otherend, "type", NULL);</div><div class='ctx'> 	if (IS_ERR(type))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	info-&gt;feature_secdiscard = 0;</div><div class='ctx'> 	if (strncmp(type, "phy", 3) == 0) {</div><div class='ctx'> 		err = xenbus_gather(XBT_NIL, info-&gt;xbdev-&gt;otherend,</div><div class='ctx'> 			"discard-granularity", "%u", &amp;discard_granularity,</div><div class='hunk'>@@ -1150,6 +1167,12 @@ static void blkfront_setup_discard(struct blkfront_info *info)</div><div class='ctx'> 			info-&gt;discard_granularity = discard_granularity;</div><div class='ctx'> 			info-&gt;discard_alignment = discard_alignment;</div><div class='ctx'> 		}</div><div class='add'>+		err = xenbus_gather(XBT_NIL, info-&gt;xbdev-&gt;otherend,</div><div class='add'>+			    "discard-secure", "%d", &amp;discard_secure,</div><div class='add'>+			    NULL);</div><div class='add'>+		if (!err)</div><div class='add'>+			info-&gt;feature_secdiscard = discard_secure;</div><div class='add'>+</div><div class='ctx'> 	} else if (strncmp(type, "file", 4) == 0)</div><div class='ctx'> 		info-&gt;feature_discard = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1437,16 +1460,13 @@ static const struct xenbus_device_id blkfront_ids[] = {</div><div class='ctx'> 	{ "" }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct xenbus_driver blkfront = {</div><div class='del'>-	.name = "vbd",</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.ids = blkfront_ids,</div><div class='add'>+static DEFINE_XENBUS_DRIVER(blkfront, ,</div><div class='ctx'> 	.probe = blkfront_probe,</div><div class='ctx'> 	.remove = blkfront_remove,</div><div class='ctx'> 	.resume = blkfront_resume,</div><div class='ctx'> 	.otherend_changed = blkback_changed,</div><div class='ctx'> 	.is_ready = blkfront_is_ready,</div><div class='del'>-};</div><div class='add'>+);</div><div class='ctx'> </div><div class='ctx'> static int __init xlblk_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -1461,7 +1481,7 @@ static int __init xlblk_init(void)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = xenbus_register_frontend(&amp;blkfront);</div><div class='add'>+	ret = xenbus_register_frontend(&amp;blkfront_driver);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		unregister_blkdev(XENVBD_MAJOR, DEV_NAME);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -1474,7 +1494,7 @@ module_init(xlblk_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit xlblk_exit(void)</div><div class='ctx'> {</div><div class='del'>-	return xenbus_unregister_driver(&amp;blkfront);</div><div class='add'>+	return xenbus_unregister_driver(&amp;blkfront_driver);</div><div class='ctx'> }</div><div class='ctx'> module_exit(xlblk_exit);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c<br/>index fb1975d82a73..1a17e338735e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/xsysace.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/block/xsysace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/xsysace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/block/xsysace.c</a></div><div class='hunk'>@@ -456,7 +456,7 @@ static inline void ace_fsm_yieldirq(struct ace_device *ace)</div><div class='ctx'> {</div><div class='ctx'> 	dev_dbg(ace-&gt;dev, "ace_fsm_yieldirq()\n");</div><div class='ctx'> </div><div class='del'>-	if (ace-&gt;irq == NO_IRQ)</div><div class='add'>+	if (!ace-&gt;irq)</div><div class='ctx'> 		/* No IRQ assigned, so need to poll */</div><div class='ctx'> 		tasklet_schedule(&amp;ace-&gt;fsm_tasklet);</div><div class='ctx'> 	ace-&gt;fsm_continue_flag = 0;</div><div class='hunk'>@@ -1034,12 +1034,12 @@ static int __devinit ace_setup(struct ace_device *ace)</div><div class='ctx'> 		ACE_CTRL_DATABUFRDYIRQ | ACE_CTRL_ERRORIRQ);</div><div class='ctx'> </div><div class='ctx'> 	/* Now we can hook up the irq handler */</div><div class='del'>-	if (ace-&gt;irq != NO_IRQ) {</div><div class='add'>+	if (ace-&gt;irq) {</div><div class='ctx'> 		rc = request_irq(ace-&gt;irq, ace_interrupt, 0, "systemace", ace);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			/* Failure - fall back to polled mode */</div><div class='ctx'> 			dev_err(ace-&gt;dev, "request_irq failed\n");</div><div class='del'>-			ace-&gt;irq = NO_IRQ;</div><div class='add'>+			ace-&gt;irq = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1086,7 +1086,7 @@ static void __devexit ace_teardown(struct ace_device *ace)</div><div class='ctx'> </div><div class='ctx'> 	tasklet_kill(&amp;ace-&gt;fsm_tasklet);</div><div class='ctx'> </div><div class='del'>-	if (ace-&gt;irq != NO_IRQ)</div><div class='add'>+	if (ace-&gt;irq)</div><div class='ctx'> 		free_irq(ace-&gt;irq, ace);</div><div class='ctx'> </div><div class='ctx'> 	iounmap(ace-&gt;baseaddr);</div><div class='hunk'>@@ -1156,7 +1156,7 @@ static int __devinit ace_probe(struct platform_device *dev)</div><div class='ctx'> 	resource_size_t physaddr = 0;</div><div class='ctx'> 	int bus_width = ACE_BUS_WIDTH_16; /* FIXME: should not be hard coded */</div><div class='ctx'> 	u32 id = dev-&gt;id;</div><div class='del'>-	int irq = NO_IRQ;</div><div class='add'>+	int irq = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;dev-&gt;dev, "ace_probe(%p)\n", dev);</div><div class='head'>diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c<br/>index 106beb194f3c..07f14d10ea49 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/ath3k.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/ath3k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/ath3k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/bluetooth/ath3k.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> #include &lt;net/bluetooth/bluetooth.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define VERSION "1.0"</div><div class='add'>+#define ATH3K_FIRMWARE	"ath3k-1.fw"</div><div class='ctx'> </div><div class='ctx'> #define ATH3K_DNLOAD				0x01</div><div class='ctx'> #define ATH3K_GETSTATE				0x05</div><div class='hunk'>@@ -400,9 +401,15 @@ static int ath3k_probe(struct usb_interface *intf,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (request_firmware(&amp;firmware, "ath3k-1.fw", &amp;udev-&gt;dev) &lt; 0) {</div><div class='del'>-		BT_ERR("Error loading firmware");</div><div class='del'>-		return -EIO;</div><div class='add'>+	ret = request_firmware(&amp;firmware, ATH3K_FIRMWARE, &amp;udev-&gt;dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		if (ret == -ENOENT)</div><div class='add'>+			BT_ERR("Firmware file \"%s\" not found",</div><div class='add'>+							ATH3K_FIRMWARE);</div><div class='add'>+		else</div><div class='add'>+			BT_ERR("Firmware file \"%s\" request failed (err=%d)",</div><div class='add'>+							ATH3K_FIRMWARE, ret);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ath3k_load_firmware(udev, firmware);</div><div class='hunk'>@@ -423,22 +430,10 @@ static struct usb_driver ath3k_driver = {</div><div class='ctx'> 	.id_table	= ath3k_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ath3k_init(void)</div><div class='del'>-{</div><div class='del'>-	BT_INFO("Atheros AR30xx firmware driver ver %s", VERSION);</div><div class='del'>-	return usb_register(&amp;ath3k_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ath3k_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;ath3k_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ath3k_init);</div><div class='del'>-module_exit(ath3k_exit);</div><div class='add'>+module_usb_driver(ath3k_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Atheros Communications");</div><div class='ctx'> MODULE_DESCRIPTION("Atheros AR30xx firmware driver");</div><div class='ctx'> MODULE_VERSION(VERSION);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_FIRMWARE("ath3k-1.fw");</div><div class='add'>+MODULE_FIRMWARE(ATH3K_FIRMWARE);</div><div class='head'>diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c<br/>index 54952ab800b8..1e742a50e2cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/bcm203x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/bcm203x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/bcm203x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/bluetooth/bcm203x.c</a></div><div class='hunk'>@@ -281,26 +281,7 @@ static struct usb_driver bcm203x_driver = {</div><div class='ctx'> 	.id_table	= bcm203x_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init bcm203x_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	BT_INFO("Broadcom Blutonium firmware driver ver %s", VERSION);</div><div class='del'>-</div><div class='del'>-	err = usb_register(&amp;bcm203x_driver);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		BT_ERR("Failed to register USB driver");</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit bcm203x_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;bcm203x_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(bcm203x_init);</div><div class='del'>-module_exit(bcm203x_exit);</div><div class='add'>+module_usb_driver(bcm203x_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Marcel Holtmann &lt;marcel@holtmann.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Broadcom Blutonium firmware driver ver " VERSION);</div><div class='head'>diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c<br/>index 61b591470a90..a323baee51b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/bfusb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/bfusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/bfusb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/bluetooth/bfusb.c</a></div><div class='hunk'>@@ -751,9 +751,7 @@ static void bfusb_disconnect(struct usb_interface *intf)</div><div class='ctx'> </div><div class='ctx'> 	bfusb_close(hdev);</div><div class='ctx'> </div><div class='del'>-	if (hci_unregister_dev(hdev) &lt; 0)</div><div class='del'>-		BT_ERR("Can't unregister HCI device %s", hdev-&gt;name);</div><div class='del'>-</div><div class='add'>+	hci_unregister_dev(hdev);</div><div class='ctx'> 	hci_free_dev(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -764,26 +762,7 @@ static struct usb_driver bfusb_driver = {</div><div class='ctx'> 	.id_table	= bfusb_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init bfusb_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	BT_INFO("BlueFRITZ! USB driver ver %s", VERSION);</div><div class='del'>-</div><div class='del'>-	err = usb_register(&amp;bfusb_driver);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		BT_ERR("Failed to register BlueFRITZ! USB driver");</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit bfusb_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;bfusb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(bfusb_init);</div><div class='del'>-module_exit(bfusb_exit);</div><div class='add'>+module_usb_driver(bfusb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Marcel Holtmann &lt;marcel@holtmann.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("BlueFRITZ! USB driver ver " VERSION);</div><div class='head'>diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c<br/>index aed1904ea67b..c6a0c6103743 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/bluecard_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/bluecard_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/bluecard_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/bluetooth/bluecard_cs.c</a></div><div class='hunk'>@@ -844,9 +844,7 @@ static int bluecard_close(bluecard_info_t *info)</div><div class='ctx'> 	/* Turn FPGA off */</div><div class='ctx'> 	outb(0x80, iobase + 0x30);</div><div class='ctx'> </div><div class='del'>-	if (hci_unregister_dev(hdev) &lt; 0)</div><div class='del'>-		BT_ERR("Can't unregister HCI device %s", hdev-&gt;name);</div><div class='del'>-</div><div class='add'>+	hci_unregister_dev(hdev);</div><div class='ctx'> 	hci_free_dev(hdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c<br/>index 751b338d904a..62831603de5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/bpa10x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/bpa10x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/bpa10x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/bluetooth/bpa10x.c</a></div><div class='hunk'>@@ -521,20 +521,7 @@ static struct usb_driver bpa10x_driver = {</div><div class='ctx'> 	.id_table	= bpa10x_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init bpa10x_init(void)</div><div class='del'>-{</div><div class='del'>-	BT_INFO("Digianswer Bluetooth USB driver ver %s", VERSION);</div><div class='del'>-</div><div class='del'>-	return usb_register(&amp;bpa10x_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit bpa10x_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;bpa10x_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(bpa10x_init);</div><div class='del'>-module_exit(bpa10x_exit);</div><div class='add'>+module_usb_driver(bpa10x_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Marcel Holtmann &lt;marcel@holtmann.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Digianswer Bluetooth USB driver ver " VERSION);</div><div class='head'>diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c<br/>index 4fc01949d399..0c97e5d514b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/bt3c_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/bt3c_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/bt3c_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/bluetooth/bt3c_cs.c</a></div><div class='hunk'>@@ -636,9 +636,7 @@ static int bt3c_close(bt3c_info_t *info)</div><div class='ctx'> </div><div class='ctx'> 	bt3c_hci_close(hdev);</div><div class='ctx'> </div><div class='del'>-	if (hci_unregister_dev(hdev) &lt; 0)</div><div class='del'>-		BT_ERR("Can't unregister HCI device %s", hdev-&gt;name);</div><div class='del'>-</div><div class='add'>+	hci_unregister_dev(hdev);</div><div class='ctx'> 	hci_free_dev(hdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c<br/>index a88a78c86162..6c3defa50845 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/btmrvl_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/btmrvl_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/btmrvl_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/bluetooth/btmrvl_main.c</a></div><div class='hunk'>@@ -475,8 +475,6 @@ static int btmrvl_service_main_thread(void *data)</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_entry(&amp;wait, current);</div><div class='ctx'> </div><div class='del'>-	current-&gt;flags |= PF_NOFREEZE;</div><div class='del'>-</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		add_wait_queue(&amp;thread-&gt;wait_q, &amp;wait);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c<br/>index 526b61807d94..200b3a2877d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/btuart_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/btuart_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/btuart_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/bluetooth/btuart_cs.c</a></div><div class='hunk'>@@ -565,9 +565,7 @@ static int btuart_close(btuart_info_t *info)</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;(info-&gt;lock), flags);</div><div class='ctx'> </div><div class='del'>-	if (hci_unregister_dev(hdev) &lt; 0)</div><div class='del'>-		BT_ERR("Can't unregister HCI device %s", hdev-&gt;name);</div><div class='del'>-</div><div class='add'>+	hci_unregister_dev(hdev);</div><div class='ctx'> 	hci_free_dev(hdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c<br/>index eabc437ce500..f00f596c1029 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/btusb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/btusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/btusb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/bluetooth/btusb.c</a></div><div class='hunk'>@@ -37,13 +37,13 @@</div><div class='ctx'> </div><div class='ctx'> #define VERSION "0.6"</div><div class='ctx'> </div><div class='del'>-static int ignore_dga;</div><div class='del'>-static int ignore_csr;</div><div class='del'>-static int ignore_sniffer;</div><div class='del'>-static int disable_scofix;</div><div class='del'>-static int force_scofix;</div><div class='add'>+static bool ignore_dga;</div><div class='add'>+static bool ignore_csr;</div><div class='add'>+static bool ignore_sniffer;</div><div class='add'>+static bool disable_scofix;</div><div class='add'>+static bool force_scofix;</div><div class='ctx'> </div><div class='del'>-static int reset = 1;</div><div class='add'>+static bool reset = 1;</div><div class='ctx'> </div><div class='ctx'> static struct usb_driver btusb_driver;</div><div class='ctx'> </div><div class='hunk'>@@ -101,6 +101,7 @@ static struct usb_device_id btusb_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x0c10, 0x0000) },</div><div class='ctx'> </div><div class='ctx'> 	/* Broadcom BCM20702A0 */</div><div class='add'>+	{ USB_DEVICE(0x0a5c, 0x21e3) },</div><div class='ctx'> 	{ USB_DEVICE(0x413c, 0x8197) },</div><div class='ctx'> </div><div class='ctx'> 	{ }	/* Terminating entry */</div><div class='hunk'>@@ -315,7 +316,8 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev, gfp_t mem_flags)</div><div class='ctx'> </div><div class='ctx'> 	err = usb_submit_urb(urb, mem_flags);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		BT_ERR("%s urb %p submission failed (%d)",</div><div class='add'>+		if (err != -EPERM &amp;&amp; err != -ENODEV)</div><div class='add'>+			BT_ERR("%s urb %p submission failed (%d)",</div><div class='ctx'> 						hdev-&gt;name, urb, -err);</div><div class='ctx'> 		usb_unanchor_urb(urb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -400,7 +402,8 @@ static int btusb_submit_bulk_urb(struct hci_dev *hdev, gfp_t mem_flags)</div><div class='ctx'> </div><div class='ctx'> 	err = usb_submit_urb(urb, mem_flags);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		BT_ERR("%s urb %p submission failed (%d)",</div><div class='add'>+		if (err != -EPERM &amp;&amp; err != -ENODEV)</div><div class='add'>+			BT_ERR("%s urb %p submission failed (%d)",</div><div class='ctx'> 						hdev-&gt;name, urb, -err);</div><div class='ctx'> 		usb_unanchor_urb(urb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -506,15 +509,10 @@ static int btusb_submit_isoc_urb(struct hci_dev *hdev, gfp_t mem_flags)</div><div class='ctx'> </div><div class='ctx'> 	pipe = usb_rcvisocpipe(data-&gt;udev, data-&gt;isoc_rx_ep-&gt;bEndpointAddress);</div><div class='ctx'> </div><div class='del'>-	urb-&gt;dev      = data-&gt;udev;</div><div class='del'>-	urb-&gt;pipe     = pipe;</div><div class='del'>-	urb-&gt;context  = hdev;</div><div class='del'>-	urb-&gt;complete = btusb_isoc_complete;</div><div class='del'>-	urb-&gt;interval = data-&gt;isoc_rx_ep-&gt;bInterval;</div><div class='add'>+	usb_fill_int_urb(urb, data-&gt;udev, pipe, buf, size, btusb_isoc_complete,</div><div class='add'>+				hdev, data-&gt;isoc_rx_ep-&gt;bInterval);</div><div class='ctx'> </div><div class='ctx'> 	urb-&gt;transfer_flags  = URB_FREE_BUFFER | URB_ISO_ASAP;</div><div class='del'>-	urb-&gt;transfer_buffer = buf;</div><div class='del'>-	urb-&gt;transfer_buffer_length = size;</div><div class='ctx'> </div><div class='ctx'> 	__fill_isoc_descriptor(urb, size,</div><div class='ctx'> 			le16_to_cpu(data-&gt;isoc_rx_ep-&gt;wMaxPacketSize));</div><div class='hunk'>@@ -523,7 +521,8 @@ static int btusb_submit_isoc_urb(struct hci_dev *hdev, gfp_t mem_flags)</div><div class='ctx'> </div><div class='ctx'> 	err = usb_submit_urb(urb, mem_flags);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		BT_ERR("%s urb %p submission failed (%d)",</div><div class='add'>+		if (err != -EPERM &amp;&amp; err != -ENODEV)</div><div class='add'>+			BT_ERR("%s urb %p submission failed (%d)",</div><div class='ctx'> 						hdev-&gt;name, urb, -err);</div><div class='ctx'> 		usb_unanchor_urb(urb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -727,6 +726,9 @@ static int btusb_send_frame(struct sk_buff *skb)</div><div class='ctx'> 		usb_fill_bulk_urb(urb, data-&gt;udev, pipe,</div><div class='ctx'> 				skb-&gt;data, skb-&gt;len, btusb_tx_complete, skb);</div><div class='ctx'> </div><div class='add'>+		if (skb-&gt;priority &gt;= HCI_PRIO_MAX - 1)</div><div class='add'>+			urb-&gt;transfer_flags  = URB_ISO_ASAP;</div><div class='add'>+</div><div class='ctx'> 		hdev-&gt;stat.acl_tx++;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -770,7 +772,9 @@ skip_waking:</div><div class='ctx'> </div><div class='ctx'> 	err = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		BT_ERR("%s urb %p submission failed", hdev-&gt;name, urb);</div><div class='add'>+		if (err != -EPERM &amp;&amp; err != -ENODEV)</div><div class='add'>+			BT_ERR("%s urb %p submission failed (%d)",</div><div class='add'>+						hdev-&gt;name, urb, -err);</div><div class='ctx'> 		kfree(urb-&gt;setup_packet);</div><div class='ctx'> 		usb_unanchor_urb(urb);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1222,20 +1226,7 @@ static struct usb_driver btusb_driver = {</div><div class='ctx'> 	.supports_autosuspend = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init btusb_init(void)</div><div class='del'>-{</div><div class='del'>-	BT_INFO("Generic Bluetooth USB driver ver %s", VERSION);</div><div class='del'>-</div><div class='del'>-	return usb_register(&amp;btusb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit btusb_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;btusb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(btusb_init);</div><div class='del'>-module_exit(btusb_exit);</div><div class='add'>+module_usb_driver(btusb_driver);</div><div class='ctx'> </div><div class='ctx'> module_param(ignore_dga, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(ignore_dga, "Ignore devices with id 08fd:0001");</div><div class='head'>diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c<br/>index 5e4c2de9fc3f..969bb22e493f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/dtl1_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/dtl1_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/dtl1_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/bluetooth/dtl1_cs.c</a></div><div class='hunk'>@@ -551,9 +551,7 @@ static int dtl1_close(dtl1_info_t *info)</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;(info-&gt;lock), flags);</div><div class='ctx'> </div><div class='del'>-	if (hci_unregister_dev(hdev) &lt; 0)</div><div class='del'>-		BT_ERR("Can't unregister HCI device %s", hdev-&gt;name);</div><div class='del'>-</div><div class='add'>+	hci_unregister_dev(hdev);</div><div class='ctx'> 	hci_free_dev(hdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c<br/>index 9c5b2dc38e29..a767d4de45a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_bcsp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/hci_bcsp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_bcsp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/bluetooth/hci_bcsp.c</a></div><div class='hunk'>@@ -49,8 +49,8 @@</div><div class='ctx'> </div><div class='ctx'> #define VERSION "0.3"</div><div class='ctx'> </div><div class='del'>-static int txcrc = 1;</div><div class='del'>-static int hciextn = 1;</div><div class='add'>+static bool txcrc = 1;</div><div class='add'>+static bool hciextn = 1;</div><div class='ctx'> </div><div class='ctx'> #define BCSP_TXWINSIZE	4</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c<br/>index 48ad2a7ab080..07114489994f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_ldisc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/hci_ldisc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_ldisc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/bluetooth/hci_ldisc.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> </div><div class='ctx'> #define VERSION "2.2"</div><div class='ctx'> </div><div class='del'>-static int reset = 0;</div><div class='add'>+static bool reset = 0;</div><div class='ctx'> </div><div class='ctx'> static struct hci_uart_proto *hup[HCI_UART_MAX_PROTO];</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c<br/>index 67c180c2c1e0..2ed6ab1c6e1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_vhci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/bluetooth/hci_vhci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_vhci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/bluetooth/hci_vhci.c</a></div><div class='hunk'>@@ -41,6 +41,8 @@</div><div class='ctx'> </div><div class='ctx'> #define VERSION "1.3"</div><div class='ctx'> </div><div class='add'>+static bool amp;</div><div class='add'>+</div><div class='ctx'> struct vhci_data {</div><div class='ctx'> 	struct hci_dev *hdev;</div><div class='ctx'> </div><div class='hunk'>@@ -239,6 +241,9 @@ static int vhci_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	hdev-&gt;bus = HCI_VIRTUAL;</div><div class='ctx'> 	hdev-&gt;driver_data = data;</div><div class='ctx'> </div><div class='add'>+	if (amp)</div><div class='add'>+		hdev-&gt;dev_type = HCI_AMP;</div><div class='add'>+</div><div class='ctx'> 	hdev-&gt;open     = vhci_open_dev;</div><div class='ctx'> 	hdev-&gt;close    = vhci_close_dev;</div><div class='ctx'> 	hdev-&gt;flush    = vhci_flush;</div><div class='hunk'>@@ -264,10 +269,7 @@ static int vhci_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct vhci_data *data = file-&gt;private_data;</div><div class='ctx'> 	struct hci_dev *hdev = data-&gt;hdev;</div><div class='ctx'> </div><div class='del'>-	if (hci_unregister_dev(hdev) &lt; 0) {</div><div class='del'>-		BT_ERR("Can't unregister HCI device %s", hdev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	hci_unregister_dev(hdev);</div><div class='ctx'> 	hci_free_dev(hdev);</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = NULL;</div><div class='hunk'>@@ -306,6 +308,9 @@ static void __exit vhci_exit(void)</div><div class='ctx'> module_init(vhci_init);</div><div class='ctx'> module_exit(vhci_exit);</div><div class='ctx'> </div><div class='add'>+module_param(amp, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(amp, "Create AMP controller device");</div><div class='add'>+</div><div class='ctx'> MODULE_AUTHOR("Marcel Holtmann &lt;marcel@holtmann.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);</div><div class='ctx'> MODULE_VERSION(VERSION);</div><div class='head'>diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c<br/>index f997c27d79e2..55eaf474d32c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cdrom/cdrom.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cdrom/cdrom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cdrom/cdrom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/cdrom/cdrom.c</a></div><div class='hunk'>@@ -267,7 +267,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -286,17 +285,17 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* used to tell the module to turn on full debugging messages */</div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> /* used to keep tray locked at all times */</div><div class='ctx'> static int keeplocked;</div><div class='ctx'> /* default compatibility mode */</div><div class='del'>-static int autoclose=1;</div><div class='del'>-static int autoeject;</div><div class='del'>-static int lockdoor = 1;</div><div class='add'>+static bool autoclose=1;</div><div class='add'>+static bool autoeject;</div><div class='add'>+static bool lockdoor = 1;</div><div class='ctx'> /* will we ever get to use this... sigh. */</div><div class='del'>-static int check_media_type;</div><div class='add'>+static bool check_media_type;</div><div class='ctx'> /* automatically restart mrw format */</div><div class='del'>-static int mrw_format_restart = 1;</div><div class='add'>+static bool mrw_format_restart = 1;</div><div class='ctx'> module_param(debug, bool, 0);</div><div class='ctx'> module_param(autoclose, bool, 0);</div><div class='ctx'> module_param(autoeject, bool, 0);</div><div class='hunk'>@@ -2747,12 +2746,11 @@ int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev,</div><div class='ctx'> {</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct gendisk *disk = bdev-&gt;bd_disk;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Try the generic SCSI command ioctl's first.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = scsi_cmd_ioctl(disk-&gt;queue, disk, mode, cmd, argp);</div><div class='add'>+	ret = scsi_cmd_blk_ioctl(bdev, mode, cmd, argp);</div><div class='ctx'> 	if (ret != -ENOTTY)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c<br/>index 780498d76581..444f8b6ab411 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/amd64-agp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/agp/amd64-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/amd64-agp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/agp/amd64-agp.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> #define ULI_X86_64_ENU_SCR_REG		0x54</div><div class='ctx'> </div><div class='ctx'> static struct resource *aperture_resource;</div><div class='del'>-static int __initdata agp_try_unsupported = 1;</div><div class='add'>+static bool __initdata agp_try_unsupported = 1;</div><div class='ctx'> static int agp_bridges_found;</div><div class='ctx'> </div><div class='ctx'> static void amd64_tlbflush(struct agp_memory *temp)</div><div class='head'>diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c<br/>index b072648dc3f6..17e05d1076b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/generic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/agp/generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/agp/generic.c</a></div><div class='hunk'>@@ -514,12 +514,12 @@ static void agp_v2_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_</div><div class='ctx'> 	switch (*bridge_agpstat &amp; 7) {</div><div class='ctx'> 	case 4:</div><div class='ctx'> 		*bridge_agpstat |= (AGPSTAT2_2X | AGPSTAT2_1X);</div><div class='del'>-		printk(KERN_INFO PFX "BIOS bug. AGP bridge claims to only support x4 rate"</div><div class='add'>+		printk(KERN_INFO PFX "BIOS bug. AGP bridge claims to only support x4 rate. "</div><div class='ctx'> 			"Fixing up support for x2 &amp; x1\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		*bridge_agpstat |= AGPSTAT2_1X;</div><div class='del'>-		printk(KERN_INFO PFX "BIOS bug. AGP bridge claims to only support x2 rate"</div><div class='add'>+		printk(KERN_INFO PFX "BIOS bug. AGP bridge claims to only support x2 rate. "</div><div class='ctx'> 			"Fixing up support for x1\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -693,7 +693,7 @@ static void agp_v3_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_</div><div class='ctx'> 			*bridge_agpstat &amp;= ~(AGPSTAT3_4X | AGPSTAT3_RSVD);</div><div class='ctx'> 			*vga_agpstat &amp;= ~(AGPSTAT3_4X | AGPSTAT3_RSVD);</div><div class='ctx'> 		} else {</div><div class='del'>-			printk(KERN_INFO PFX "Fell back to AGPx4 mode because");</div><div class='add'>+			printk(KERN_INFO PFX "Fell back to AGPx4 mode because ");</div><div class='ctx'> 			if (!(*bridge_agpstat &amp; AGPSTAT3_8X)) {</div><div class='ctx'> 				printk(KERN_INFO PFX "bridge couldn't do x8. bridge_agpstat:%x (orig=%x)\n",</div><div class='ctx'> 					*bridge_agpstat, origbridge);</div><div class='hunk'>@@ -956,7 +956,7 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)</div><div class='ctx'> 	bridge-&gt;driver-&gt;cache_flush();</div><div class='ctx'> #ifdef CONFIG_X86</div><div class='ctx'> 	if (set_memory_uc((unsigned long)table, 1 &lt;&lt; page_order))</div><div class='del'>-		printk(KERN_WARNING "Could not set GATT table memory to UC!");</div><div class='add'>+		printk(KERN_WARNING "Could not set GATT table memory to UC!\n");</div><div class='ctx'> </div><div class='ctx'> 	bridge-&gt;gatt_table = (void *)table;</div><div class='ctx'> #else</div><div class='head'>diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c<br/>index 29aacd81de78..08704ae53956 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/sis-agp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/agp/sis-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/sis-agp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/agp/sis-agp.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #define PCI_DEVICE_ID_SI_662	0x0662</div><div class='ctx'> #define PCI_DEVICE_ID_SI_671	0x0671</div><div class='ctx'> </div><div class='del'>-static int __devinitdata agp_sis_force_delay = 0;</div><div class='add'>+static bool __devinitdata agp_sis_force_delay = 0;</div><div class='ctx'> static int __devinitdata agp_sis_agp_spec = -1;</div><div class='ctx'> </div><div class='ctx'> static int sis_fetch_size(void)</div><div class='head'>diff --git a/drivers/char/hw_random/atmel-rng.c b/drivers/char/hw_random/atmel-rng.c<br/>index 241df2e76aba..f518b99f53f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hw_random/atmel-rng.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/hw_random/atmel-rng.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/atmel-rng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/hw_random/atmel-rng.c</a></div><div class='hunk'>@@ -141,17 +141,7 @@ static struct platform_driver atmel_trng_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init atmel_trng_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;atmel_trng_driver);</div><div class='del'>-}</div><div class='del'>-module_init(atmel_trng_init);</div><div class='del'>-</div><div class='del'>-static void __exit atmel_trng_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;atmel_trng_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(atmel_trng_exit);</div><div class='add'>+module_platform_driver(atmel_trng_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Peter Korsgaard &lt;jacmet@sunsite.dk&gt;");</div><div class='head'>diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c<br/>index c3de70de00d4..ebd48f0135da 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hw_random/n2-drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/hw_random/n2-drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/n2-drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/hw_random/n2-drv.c</a></div><div class='hunk'>@@ -770,15 +770,4 @@ static struct platform_driver n2rng_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(n2rng_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init n2rng_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;n2rng_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit n2rng_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;n2rng_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(n2rng_init);</div><div class='del'>-module_exit(n2rng_exit);</div><div class='add'>+module_platform_driver(n2rng_driver);</div><div class='head'>diff --git a/drivers/char/hw_random/nomadik-rng.c b/drivers/char/hw_random/nomadik-rng.c<br/>index 52e08ca3ccd7..3d3c1e6703b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hw_random/nomadik-rng.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/hw_random/nomadik-rng.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/nomadik-rng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/hw_random/nomadik-rng.c</a></div><div class='hunk'>@@ -95,6 +95,8 @@ static struct amba_id nmk_rng_ids[] = {</div><div class='ctx'> 	{0, 0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+MODULE_DEVICE_TABLE(amba, nmk_rng_ids);</div><div class='add'>+</div><div class='ctx'> static struct amba_driver nmk_rng_driver = {</div><div class='ctx'> 	.drv = {</div><div class='ctx'> 		.owner = THIS_MODULE,</div><div class='head'>diff --git a/drivers/char/hw_random/octeon-rng.c b/drivers/char/hw_random/octeon-rng.c<br/>index 9cd0feca318c..0943edc782a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hw_random/octeon-rng.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/hw_random/octeon-rng.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/octeon-rng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/hw_random/octeon-rng.c</a></div><div class='hunk'>@@ -131,18 +131,7 @@ static struct platform_driver octeon_rng_driver = {</div><div class='ctx'> 	.remove		= __exit_p(octeon_rng_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init octeon_rng_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;octeon_rng_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit octeon_rng_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;octeon_rng_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(octeon_rng_mod_init);</div><div class='del'>-module_exit(octeon_rng_mod_exit);</div><div class='add'>+module_platform_driver(octeon_rng_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("David Daney");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/char/hw_random/pasemi-rng.c b/drivers/char/hw_random/pasemi-rng.c<br/>index 1d504815e6db..3a632673aed5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hw_random/pasemi-rng.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/hw_random/pasemi-rng.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/pasemi-rng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/hw_random/pasemi-rng.c</a></div><div class='hunk'>@@ -148,17 +148,7 @@ static struct platform_driver rng_driver = {</div><div class='ctx'> 	.remove		= rng_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init rng_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;rng_driver);</div><div class='del'>-}</div><div class='del'>-module_init(rng_init);</div><div class='del'>-</div><div class='del'>-static void __exit rng_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;rng_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(rng_exit);</div><div class='add'>+module_platform_driver(rng_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Egor Martovetsky &lt;egor@pasemi.com&gt;");</div><div class='head'>diff --git a/drivers/char/hw_random/picoxcell-rng.c b/drivers/char/hw_random/picoxcell-rng.c<br/>index 990d55a5e3e8..97bd891422c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hw_random/picoxcell-rng.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/hw_random/picoxcell-rng.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/picoxcell-rng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/hw_random/picoxcell-rng.c</a></div><div class='hunk'>@@ -191,17 +191,7 @@ static struct platform_driver picoxcell_trng_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init picoxcell_trng_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;picoxcell_trng_driver);</div><div class='del'>-}</div><div class='del'>-module_init(picoxcell_trng_init);</div><div class='del'>-</div><div class='del'>-static void __exit picoxcell_trng_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;picoxcell_trng_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(picoxcell_trng_exit);</div><div class='add'>+module_platform_driver(picoxcell_trng_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Jamie Iles");</div><div class='head'>diff --git a/drivers/char/hw_random/ppc4xx-rng.c b/drivers/char/hw_random/ppc4xx-rng.c<br/>index b8afa6a4ff67..c51762c13031 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hw_random/ppc4xx-rng.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/hw_random/ppc4xx-rng.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/ppc4xx-rng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/hw_random/ppc4xx-rng.c</a></div><div class='hunk'>@@ -139,17 +139,7 @@ static struct platform_driver ppc4xx_rng_driver = {</div><div class='ctx'> 	.remove = ppc4xx_rng_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ppc4xx_rng_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ppc4xx_rng_driver);</div><div class='del'>-}</div><div class='del'>-module_init(ppc4xx_rng_init);</div><div class='del'>-</div><div class='del'>-static void __exit ppc4xx_rng_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ppc4xx_rng_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(ppc4xx_rng_exit);</div><div class='add'>+module_platform_driver(ppc4xx_rng_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Josh Boyer &lt;jwboyer@linux.vnet.ibm.com&gt;");</div><div class='head'>diff --git a/drivers/char/hw_random/timeriomem-rng.c b/drivers/char/hw_random/timeriomem-rng.c<br/>index a8428e6f64a9..f1a1618db1fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hw_random/timeriomem-rng.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/hw_random/timeriomem-rng.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/timeriomem-rng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/hw_random/timeriomem-rng.c</a></div><div class='hunk'>@@ -149,18 +149,7 @@ static struct platform_driver timeriomem_rng_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(timeriomem_rng_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init timeriomem_rng_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;timeriomem_rng_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit timeriomem_rng_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;timeriomem_rng_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(timeriomem_rng_init);</div><div class='del'>-module_exit(timeriomem_rng_exit);</div><div class='add'>+module_platform_driver(timeriomem_rng_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Alexander Clouter &lt;alex@digriz.org.uk&gt;");</div><div class='head'>diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c<br/>index fd699ccecf5b..723725bbb96b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hw_random/virtio-rng.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/hw_random/virtio-rng.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/virtio-rng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/hw_random/virtio-rng.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@ static void register_buffer(u8 *buf, size_t size)</div><div class='ctx'> 	sg_init_one(&amp;sg, buf, size);</div><div class='ctx'> </div><div class='ctx'> 	/* There should always be room for one buffer. */</div><div class='del'>-	if (virtqueue_add_buf(vq, &amp;sg, 0, 1, buf) &lt; 0)</div><div class='add'>+	if (virtqueue_add_buf(vq, &amp;sg, 0, 1, buf, GFP_KERNEL) &lt; 0)</div><div class='ctx'> 		BUG();</div><div class='ctx'> </div><div class='ctx'> 	virtqueue_kick(vq);</div><div class='head'>diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c<br/>index 6e40072fbf67..40cc0cf2ded6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/i8k.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/i8k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/i8k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/i8k.c</a></div><div class='hunk'>@@ -69,19 +69,19 @@ MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for accessing SMM BIOS on Dell laptops");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static int force;</div><div class='add'>+static bool force;</div><div class='ctx'> module_param(force, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(force, "Force loading without checking for supported models");</div><div class='ctx'> </div><div class='del'>-static int ignore_dmi;</div><div class='add'>+static bool ignore_dmi;</div><div class='ctx'> module_param(ignore_dmi, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(ignore_dmi, "Continue probing hardware even if DMI data does not match");</div><div class='ctx'> </div><div class='del'>-static int restricted;</div><div class='add'>+static bool restricted;</div><div class='ctx'> module_param(restricted, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(restricted, "Allow fan control if SYS_ADMIN capability set");</div><div class='ctx'> </div><div class='del'>-static int power_status;</div><div class='add'>+static bool power_status;</div><div class='ctx'> module_param(power_status, bool, 0600);</div><div class='ctx'> MODULE_PARM_DESC(power_status, "Report power status in /proc/i8k");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_bt_sm.c b/drivers/char/ipmi/ipmi_bt_sm.c<br/>index 3ed20e8abc0d..cdd4c09fda96 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ipmi/ipmi_bt_sm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/ipmi/ipmi_bt_sm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ipmi/ipmi_bt_sm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/ipmi/ipmi_bt_sm.c</a></div><div class='hunk'>@@ -560,7 +560,7 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)</div><div class='ctx'> 		BT_CONTROL(BT_H_BUSY);		/* set */</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Uncached, ordered writes should just proceeed serially but</div><div class='add'>+		 * Uncached, ordered writes should just proceed serially but</div><div class='ctx'> 		 * some BMCs don't clear B2H_ATN with one hit.  Fast-path a</div><div class='ctx'> 		 * workaround without too much penalty to the general case.</div><div class='ctx'> 		 */</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c<br/>index 9397ab49b72e..50fcf9c04569 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ipmi/ipmi_si_intf.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/ipmi/ipmi_si_intf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ipmi/ipmi_si_intf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/ipmi/ipmi_si_intf.c</a></div><div class='hunk'>@@ -1227,7 +1227,7 @@ static int smi_num; /* Used to sequence the SMIs */</div><div class='ctx'> #define DEFAULT_REGSPACING	1</div><div class='ctx'> #define DEFAULT_REGSIZE		1</div><div class='ctx'> </div><div class='del'>-static int           si_trydefaults = 1;</div><div class='add'>+static bool          si_trydefaults = 1;</div><div class='ctx'> static char          *si_type[SI_MAX_PARMS];</div><div class='ctx'> #define MAX_SI_TYPE_STR 30</div><div class='ctx'> static char          si_type_str[MAX_SI_TYPE_STR];</div><div class='head'>diff --git a/drivers/char/lp.c b/drivers/char/lp.c<br/>index 97c3edb95ae7..f43485607063 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/lp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/lp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/lp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/lp.c</a></div><div class='hunk'>@@ -829,7 +829,7 @@ static struct console lpcons = {</div><div class='ctx'> </div><div class='ctx'> static int parport_nr[LP_NO] = { [0 ... LP_NO-1] = LP_PARPORT_UNSPEC };</div><div class='ctx'> static char *parport[LP_NO];</div><div class='del'>-static int reset;</div><div class='add'>+static bool reset;</div><div class='ctx'> </div><div class='ctx'> module_param_array(parport, charp, NULL, 0);</div><div class='ctx'> module_param(reset, bool, 0);</div><div class='head'>diff --git a/drivers/char/mem.c b/drivers/char/mem.c<br/>index 145179033716..d6e9d081c8b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/mem.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/mem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/mem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/mem.c</a></div><div class='hunk'>@@ -847,7 +847,7 @@ static const struct file_operations kmsg_fops = {</div><div class='ctx'> </div><div class='ctx'> static const struct memdev {</div><div class='ctx'> 	const char *name;</div><div class='del'>-	mode_t mode;</div><div class='add'>+	umode_t mode;</div><div class='ctx'> 	const struct file_operations *fops;</div><div class='ctx'> 	struct backing_dev_info *dev_info;</div><div class='ctx'> } devlist[] = {</div><div class='hunk'>@@ -901,7 +901,7 @@ static const struct file_operations memory_fops = {</div><div class='ctx'> 	.llseek = noop_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *mem_devnode(struct device *dev, mode_t *mode)</div><div class='add'>+static char *mem_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	if (mode &amp;&amp; devlist[MINOR(dev-&gt;devt)].mode)</div><div class='ctx'> 		*mode = devlist[MINOR(dev-&gt;devt)].mode;</div><div class='head'>diff --git a/drivers/char/misc.c b/drivers/char/misc.c<br/>index 778273c93242..522136d40843 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/misc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/misc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/misc.c</a></div><div class='hunk'>@@ -258,7 +258,7 @@ int misc_deregister(struct miscdevice *misc)</div><div class='ctx'> EXPORT_SYMBOL(misc_register);</div><div class='ctx'> EXPORT_SYMBOL(misc_deregister);</div><div class='ctx'> </div><div class='del'>-static char *misc_devnode(struct device *dev, mode_t *mode)</div><div class='add'>+static char *misc_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct miscdevice *c = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c<br/>index a12f52400dbc..bf586ae1ee83 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/nwflash.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/nwflash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/nwflash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/nwflash.c</a></div><div class='hunk'>@@ -51,7 +51,7 @@ static int write_block(unsigned long p, const char __user *buf, int count);</div><div class='ctx'> #define KFLASH_ID	0x89A6		//Intel flash</div><div class='ctx'> #define KFLASH_ID4	0xB0D4		//Intel flash 4Meg</div><div class='ctx'> </div><div class='del'>-static int flashdebug;		//if set - we will display progress msgs</div><div class='add'>+static bool flashdebug;		//if set - we will display progress msgs</div><div class='ctx'> </div><div class='ctx'> static int gbWriteEnable;</div><div class='ctx'> static int gbWriteBase64Enable;</div><div class='head'>diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c<br/>index 15781396af25..07f6a5abe372 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/pcmcia/synclink_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/pcmcia/synclink_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/pcmcia/synclink_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/pcmcia/synclink_cs.c</a></div><div class='hunk'>@@ -439,7 +439,7 @@ static int mgslpc_device_count = 0;</div><div class='ctx'>  * .text section address and breakpoint on module load.</div><div class='ctx'>  * This is useful for use with gdb and add-symbol-file command.</div><div class='ctx'>  */</div><div class='del'>-static int break_on_load=0;</div><div class='add'>+static bool break_on_load=0;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Driver major number, defaults to zero to get auto</div><div class='head'>diff --git a/drivers/char/ramoops.c b/drivers/char/ramoops.c<br/>index 7c7f42a1f880..9fec3232b736 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ramoops.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/ramoops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ramoops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/ramoops.c</a></div><div class='hunk'>@@ -83,8 +83,7 @@ static void ramoops_do_dump(struct kmsg_dumper *dumper,</div><div class='ctx'> 	struct timeval timestamp;</div><div class='ctx'> </div><div class='ctx'> 	if (reason != KMSG_DUMP_OOPS &amp;&amp;</div><div class='del'>-	    reason != KMSG_DUMP_PANIC &amp;&amp;</div><div class='del'>-	    reason != KMSG_DUMP_KEXEC)</div><div class='add'>+	    reason != KMSG_DUMP_PANIC)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Only dump oopses if dump_oops is set */</div><div class='hunk'>@@ -126,8 +125,8 @@ static int __init ramoops_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto fail3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rounddown_pow_of_two(pdata-&gt;mem_size);</div><div class='del'>-	rounddown_pow_of_two(pdata-&gt;record_size);</div><div class='add'>+	pdata-&gt;mem_size = rounddown_pow_of_two(pdata-&gt;mem_size);</div><div class='add'>+	pdata-&gt;record_size = rounddown_pow_of_two(pdata-&gt;record_size);</div><div class='ctx'> </div><div class='ctx'> 	/* Check for the minimum memory size */</div><div class='ctx'> 	if (pdata-&gt;mem_size &lt; MIN_MEM_SIZE &amp;&amp;</div><div class='hunk'>@@ -148,14 +147,6 @@ static int __init ramoops_probe(struct platform_device *pdev)</div><div class='ctx'> 	cxt-&gt;phys_addr = pdata-&gt;mem_address;</div><div class='ctx'> 	cxt-&gt;record_size = pdata-&gt;record_size;</div><div class='ctx'> 	cxt-&gt;dump_oops = pdata-&gt;dump_oops;</div><div class='del'>-	/*</div><div class='del'>-	 * Update the module parameter variables as well so they are visible</div><div class='del'>-	 * through /sys/module/ramoops/parameters/</div><div class='del'>-	 */</div><div class='del'>-	mem_size = pdata-&gt;mem_size;</div><div class='del'>-	mem_address = pdata-&gt;mem_address;</div><div class='del'>-	record_size = pdata-&gt;record_size;</div><div class='del'>-	dump_oops = pdata-&gt;dump_oops;</div><div class='ctx'> </div><div class='ctx'> 	if (!request_mem_region(cxt-&gt;phys_addr, cxt-&gt;size, "ramoops")) {</div><div class='ctx'> 		pr_err("request mem region failed\n");</div><div class='hunk'>@@ -176,6 +167,15 @@ static int __init ramoops_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto fail1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Update the module parameter variables as well so they are visible</div><div class='add'>+	 * through /sys/module/ramoops/parameters/</div><div class='add'>+	 */</div><div class='add'>+	mem_size = pdata-&gt;mem_size;</div><div class='add'>+	mem_address = pdata-&gt;mem_address;</div><div class='add'>+	record_size = pdata-&gt;record_size;</div><div class='add'>+	dump_oops = pdata-&gt;dump_oops;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail1:</div><div class='head'>diff --git a/drivers/char/random.c b/drivers/char/random.c<br/>index 85da8740586b..54ca8b23cde3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/random.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/random.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/random.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/random.c</a></div><div class='hunk'>@@ -387,7 +387,7 @@ static DECLARE_WAIT_QUEUE_HEAD(random_write_wait);</div><div class='ctx'> static struct fasync_struct *fasync;</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> module_param(debug, bool, 0644);</div><div class='ctx'> #define DEBUG_ENT(fmt, arg...) do { \</div><div class='ctx'> 	if (debug) \</div><div class='hunk'>@@ -965,6 +965,7 @@ EXPORT_SYMBOL(get_random_bytes);</div><div class='ctx'>  */</div><div class='ctx'> static void init_std_data(struct entropy_store *r)</div><div class='ctx'> {</div><div class='add'>+	int i;</div><div class='ctx'> 	ktime_t now;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -974,6 +975,11 @@ static void init_std_data(struct entropy_store *r)</div><div class='ctx'> </div><div class='ctx'> 	now = ktime_get_real();</div><div class='ctx'> 	mix_pool_bytes(r, &amp;now, sizeof(now));</div><div class='add'>+	for (i = r-&gt;poolinfo-&gt;POOLBYTES; i &gt; 0; i -= sizeof flags) {</div><div class='add'>+		if (!arch_get_random_long(&amp;flags))</div><div class='add'>+			break;</div><div class='add'>+		mix_pool_bytes(r, &amp;flags, sizeof(flags));</div><div class='add'>+	}</div><div class='ctx'> 	mix_pool_bytes(r, utsname(), sizeof(*(utsname())));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/raw.c b/drivers/char/raw.c<br/>index b6de2c047145..54a3a6d09819 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/raw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/raw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/raw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/raw.c</a></div><div class='hunk'>@@ -308,7 +308,7 @@ static const struct file_operations raw_ctl_fops = {</div><div class='ctx'> </div><div class='ctx'> static struct cdev raw_cdev;</div><div class='ctx'> </div><div class='del'>-static char *raw_devnode(struct device *dev, mode_t *mode)</div><div class='add'>+static char *raw_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	return kasprintf(GFP_KERNEL, "raw/%s", dev_name(dev));</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/char/tile-srom.c b/drivers/char/tile-srom.c<br/>index cf3ee008dca2..4dc019408fac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/tile-srom.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/tile-srom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/tile-srom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/tile-srom.c</a></div><div class='hunk'>@@ -329,7 +329,7 @@ static struct device_attribute srom_dev_attrs[] = {</div><div class='ctx'> 	__ATTR_NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *srom_devnode(struct device *dev, mode_t *mode)</div><div class='add'>+static char *srom_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	*mode = S_IRUGO | S_IWUSR;</div><div class='ctx'> 	return kasprintf(GFP_KERNEL, "srom/%s", dev_name(dev));</div><div class='head'>diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig<br/>index fa567f1158c2..7fc75e47e6d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/tpm/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/tpm/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/tpm/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/tpm/Kconfig</a></div><div class='hunk'>@@ -27,6 +27,7 @@ if TCG_TPM</div><div class='ctx'> </div><div class='ctx'> config TCG_TIS</div><div class='ctx'> 	tristate "TPM Interface Specification 1.2 Interface"</div><div class='add'>+	depends on X86</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  If you have a TPM security chip that is compliant with the</div><div class='ctx'> 	  TCG TIS 1.2 TPM specification say Yes and it will be accessible</div><div class='hunk'>@@ -35,6 +36,7 @@ config TCG_TIS</div><div class='ctx'> </div><div class='ctx'> config TCG_NSC</div><div class='ctx'> 	tristate "National Semiconductor TPM Interface"</div><div class='add'>+	depends on X86</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  If you have a TPM security chip from National Semiconductor </div><div class='ctx'> 	  say Yes and it will be accessible from within Linux.  To </div><div class='head'>diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c<br/>index 361a1dff8f77..32362cf35b8d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/tpm/tpm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/tpm/tpm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/tpm/tpm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/tpm/tpm.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/freezer.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "tpm.h"</div><div class='ctx'> </div><div class='hunk'>@@ -440,7 +441,6 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define TPM_DIGEST_SIZE 20</div><div class='del'>-#define TPM_ERROR_SIZE 10</div><div class='ctx'> #define TPM_RET_CODE_IDX 6</div><div class='ctx'> </div><div class='ctx'> enum tpm_capabilities {</div><div class='hunk'>@@ -469,12 +469,14 @@ static ssize_t transmit_cmd(struct tpm_chip *chip, struct tpm_cmd_t *cmd,</div><div class='ctx'> 	len = tpm_transmit(chip,(u8 *) cmd, len);</div><div class='ctx'> 	if (len &lt;  0)</div><div class='ctx'> 		return len;</div><div class='del'>-	if (len == TPM_ERROR_SIZE) {</div><div class='del'>-		err = be32_to_cpu(cmd-&gt;header.out.return_code);</div><div class='del'>-		dev_dbg(chip-&gt;dev, "A TPM error (%d) occurred %s\n", err, desc);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	else if (len &lt; TPM_HEADER_SIZE)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	err = be32_to_cpu(cmd-&gt;header.out.return_code);</div><div class='add'>+	if (err != 0)</div><div class='add'>+		dev_err(chip-&gt;dev, "A TPM error (%d) occurred %s\n", err, desc);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define TPM_INTERNAL_RESULT_SIZE 200</div><div class='hunk'>@@ -530,7 +532,7 @@ void tpm_gen_interrupt(struct tpm_chip *chip)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tpm_gen_interrupt);</div><div class='ctx'> </div><div class='del'>-void tpm_get_timeouts(struct tpm_chip *chip)</div><div class='add'>+int tpm_get_timeouts(struct tpm_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct tpm_cmd_t tpm_cmd;</div><div class='ctx'> 	struct timeout_t *timeout_cap;</div><div class='hunk'>@@ -552,7 +554,7 @@ void tpm_get_timeouts(struct tpm_chip *chip)</div><div class='ctx'> 	if (be32_to_cpu(tpm_cmd.header.out.return_code) != 0 ||</div><div class='ctx'> 	    be32_to_cpu(tpm_cmd.header.out.length)</div><div class='ctx'> 	    != sizeof(tpm_cmd.header.out) + sizeof(u32) + 4 * sizeof(u32))</div><div class='del'>-		return;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	timeout_cap = &amp;tpm_cmd.params.getcap_out.cap.timeout;</div><div class='ctx'> 	/* Don't overwrite default if value is 0 */</div><div class='hunk'>@@ -583,12 +585,12 @@ duration:</div><div class='ctx'> 	rc = transmit_cmd(chip, &amp;tpm_cmd, TPM_INTERNAL_RESULT_SIZE,</div><div class='ctx'> 			"attempting to determine the durations");</div><div class='ctx'> 	if (rc)</div><div class='del'>-		return;</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	if (be32_to_cpu(tpm_cmd.header.out.return_code) != 0 ||</div><div class='ctx'> 	    be32_to_cpu(tpm_cmd.header.out.length)</div><div class='ctx'> 	    != sizeof(tpm_cmd.header.out) + sizeof(u32) + 3 * sizeof(u32))</div><div class='del'>-		return;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	duration_cap = &amp;tpm_cmd.params.getcap_out.cap.duration;</div><div class='ctx'> 	chip-&gt;vendor.duration[TPM_SHORT] =</div><div class='hunk'>@@ -610,20 +612,36 @@ duration:</div><div class='ctx'> 		chip-&gt;vendor.duration_adjusted = true;</div><div class='ctx'> 		dev_info(chip-&gt;dev, "Adjusting TPM timeout parameters.");</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tpm_get_timeouts);</div><div class='ctx'> </div><div class='del'>-void tpm_continue_selftest(struct tpm_chip *chip)</div><div class='add'>+#define TPM_ORD_CONTINUE_SELFTEST 83</div><div class='add'>+#define CONTINUE_SELFTEST_RESULT_SIZE 10</div><div class='add'>+</div><div class='add'>+static struct tpm_input_header continue_selftest_header = {</div><div class='add'>+	.tag = TPM_TAG_RQU_COMMAND,</div><div class='add'>+	.length = cpu_to_be32(10),</div><div class='add'>+	.ordinal = cpu_to_be32(TPM_ORD_CONTINUE_SELFTEST),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tpm_continue_selftest -- run TPM's selftest</div><div class='add'>+ * @chip: TPM chip to use</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, &lt; 0 in case of fatal error or a value &gt; 0 representing</div><div class='add'>+ * a TPM error code.</div><div class='add'>+ */</div><div class='add'>+static int tpm_continue_selftest(struct tpm_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	u8 data[] = {</div><div class='del'>-		0, 193,			/* TPM_TAG_RQU_COMMAND */</div><div class='del'>-		0, 0, 0, 10,		/* length */</div><div class='del'>-		0, 0, 0, 83,		/* TPM_ORD_ContinueSelfTest */</div><div class='del'>-	};</div><div class='add'>+	int rc;</div><div class='add'>+	struct tpm_cmd_t cmd;</div><div class='ctx'> </div><div class='del'>-	tpm_transmit(chip, data, sizeof(data));</div><div class='add'>+	cmd.header.in = continue_selftest_header;</div><div class='add'>+	rc = transmit_cmd(chip, &amp;cmd, CONTINUE_SELFTEST_RESULT_SIZE,</div><div class='add'>+			  "continue selftest");</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(tpm_continue_selftest);</div><div class='ctx'> </div><div class='ctx'> ssize_t tpm_show_enabled(struct device * dev, struct device_attribute * attr,</div><div class='ctx'> 			char *buf)</div><div class='hunk'>@@ -718,7 +736,7 @@ static struct tpm_input_header pcrread_header = {</div><div class='ctx'> 	.ordinal = TPM_ORDINAL_PCRREAD</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)</div><div class='add'>+static int __tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	struct tpm_cmd_t cmd;</div><div class='hunk'>@@ -798,6 +816,54 @@ int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tpm_pcr_extend);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * tpm_do_selftest - have the TPM continue its selftest and wait until it</div><div class='add'>+ *                   can receive further commands</div><div class='add'>+ * @chip: TPM chip to use</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, &lt; 0 in case of fatal error or a value &gt; 0 representing</div><div class='add'>+ * a TPM error code.</div><div class='add'>+ */</div><div class='add'>+int tpm_do_selftest(struct tpm_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	u8 digest[TPM_DIGEST_SIZE];</div><div class='add'>+	unsigned int loops;</div><div class='add'>+	unsigned int delay_msec = 1000;</div><div class='add'>+	unsigned long duration;</div><div class='add'>+</div><div class='add'>+	duration = tpm_calc_ordinal_duration(chip,</div><div class='add'>+	                                     TPM_ORD_CONTINUE_SELFTEST);</div><div class='add'>+</div><div class='add'>+	loops = jiffies_to_msecs(duration) / delay_msec;</div><div class='add'>+</div><div class='add'>+	rc = tpm_continue_selftest(chip);</div><div class='add'>+	/* This may fail if there was no TPM driver during a suspend/resume</div><div class='add'>+	 * cycle; some may return 10 (BAD_ORDINAL), others 28 (FAILEDSELFTEST)</div><div class='add'>+	 */</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		rc = __tpm_pcr_read(chip, 0, digest);</div><div class='add'>+		if (rc == TPM_ERR_DISABLED || rc == TPM_ERR_DEACTIVATED) {</div><div class='add'>+			dev_info(chip-&gt;dev,</div><div class='add'>+				 "TPM is disabled/deactivated (0x%X)\n", rc);</div><div class='add'>+			/* TPM is disabled and/or deactivated; driver can</div><div class='add'>+			 * proceed and TPM does handle commands for</div><div class='add'>+			 * suspend/resume correctly</div><div class='add'>+			 */</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		if (rc != TPM_WARN_DOING_SELFTEST)</div><div class='add'>+			return rc;</div><div class='add'>+		msleep(delay_msec);</div><div class='add'>+	} while (--loops &gt; 0);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(tpm_do_selftest);</div><div class='add'>+</div><div class='ctx'> int tpm_send(u32 chip_num, void *cmd, size_t buflen)</div><div class='ctx'> {</div><div class='ctx'> 	struct tpm_chip *chip;</div><div class='hunk'>@@ -1005,6 +1071,46 @@ ssize_t tpm_store_cancel(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(tpm_store_cancel);</div><div class='ctx'> </div><div class='add'>+int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout,</div><div class='add'>+			 wait_queue_head_t *queue)</div><div class='add'>+{</div><div class='add'>+	unsigned long stop;</div><div class='add'>+	long rc;</div><div class='add'>+	u8 status;</div><div class='add'>+</div><div class='add'>+	/* check current status */</div><div class='add'>+	status = chip-&gt;vendor.status(chip);</div><div class='add'>+	if ((status &amp; mask) == mask)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	stop = jiffies + timeout;</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;vendor.irq) {</div><div class='add'>+again:</div><div class='add'>+		timeout = stop - jiffies;</div><div class='add'>+		if ((long)timeout &lt;= 0)</div><div class='add'>+			return -ETIME;</div><div class='add'>+		rc = wait_event_interruptible_timeout(*queue,</div><div class='add'>+						      ((chip-&gt;vendor.status(chip)</div><div class='add'>+						      &amp; mask) == mask),</div><div class='add'>+						      timeout);</div><div class='add'>+		if (rc &gt; 0)</div><div class='add'>+			return 0;</div><div class='add'>+		if (rc == -ERESTARTSYS &amp;&amp; freezing(current)) {</div><div class='add'>+			clear_thread_flag(TIF_SIGPENDING);</div><div class='add'>+			goto again;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		do {</div><div class='add'>+			msleep(TPM_TIMEOUT);</div><div class='add'>+			status = chip-&gt;vendor.status(chip);</div><div class='add'>+			if ((status &amp; mask) == mask)</div><div class='add'>+				return 0;</div><div class='add'>+		} while (time_before(jiffies, stop));</div><div class='add'>+	}</div><div class='add'>+	return -ETIME;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(wait_for_tpm_stat);</div><div class='ctx'> /*</div><div class='ctx'>  * Device file system interface to the TPM</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h<br/>index 9c4163cfa3ce..010547138281 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/tpm/tpm.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/tpm/tpm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/tpm/tpm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/tpm/tpm.h</a></div><div class='hunk'>@@ -38,6 +38,11 @@ enum tpm_addr {</div><div class='ctx'> 	TPM_ADDR = 0x4E,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define TPM_WARN_DOING_SELFTEST 0x802</div><div class='add'>+#define TPM_ERR_DEACTIVATED     0x6</div><div class='add'>+#define TPM_ERR_DISABLED        0x7</div><div class='add'>+</div><div class='add'>+#define TPM_HEADER_SIZE		10</div><div class='ctx'> extern ssize_t tpm_show_pubek(struct device *, struct device_attribute *attr,</div><div class='ctx'> 				char *);</div><div class='ctx'> extern ssize_t tpm_show_pcrs(struct device *, struct device_attribute *attr,</div><div class='hunk'>@@ -279,9 +284,9 @@ struct tpm_cmd_t {</div><div class='ctx'> </div><div class='ctx'> ssize_t	tpm_getcap(struct device *, __be32, cap_t *, const char *);</div><div class='ctx'> </div><div class='del'>-extern void tpm_get_timeouts(struct tpm_chip *);</div><div class='add'>+extern int tpm_get_timeouts(struct tpm_chip *);</div><div class='ctx'> extern void tpm_gen_interrupt(struct tpm_chip *);</div><div class='del'>-extern void tpm_continue_selftest(struct tpm_chip *);</div><div class='add'>+extern int tpm_do_selftest(struct tpm_chip *);</div><div class='ctx'> extern unsigned long tpm_calc_ordinal_duration(struct tpm_chip *, u32);</div><div class='ctx'> extern struct tpm_chip* tpm_register_hardware(struct device *,</div><div class='ctx'> 				 const struct tpm_vendor_specific *);</div><div class='hunk'>@@ -294,7 +299,8 @@ extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *);</div><div class='ctx'> extern void tpm_remove_hardware(struct device *);</div><div class='ctx'> extern int tpm_pm_suspend(struct device *, pm_message_t);</div><div class='ctx'> extern int tpm_pm_resume(struct device *);</div><div class='del'>-</div><div class='add'>+extern int wait_for_tpm_stat(struct tpm_chip *, u8, unsigned long,</div><div class='add'>+			     wait_queue_head_t *);</div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> extern struct dentry ** tpm_bios_log_setup(char *);</div><div class='ctx'> extern void tpm_bios_log_teardown(struct dentry **);</div><div class='head'>diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c<br/>index 3f4051a7c5a7..a1748621111b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/tpm/tpm_tis.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/tpm/tpm_tis.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/tpm/tpm_tis.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/tpm/tpm_tis.c</a></div><div class='hunk'>@@ -29,8 +29,6 @@</div><div class='ctx'> #include &lt;linux/freezer.h&gt;</div><div class='ctx'> #include "tpm.h"</div><div class='ctx'> </div><div class='del'>-#define TPM_HEADER_SIZE 10</div><div class='del'>-</div><div class='ctx'> enum tis_access {</div><div class='ctx'> 	TPM_ACCESS_VALID = 0x80,</div><div class='ctx'> 	TPM_ACCESS_ACTIVE_LOCALITY = 0x20,</div><div class='hunk'>@@ -193,54 +191,14 @@ static int get_burstcount(struct tpm_chip *chip)</div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout,</div><div class='del'>-			 wait_queue_head_t *queue)</div><div class='del'>-{</div><div class='del'>-	unsigned long stop;</div><div class='del'>-	long rc;</div><div class='del'>-	u8 status;</div><div class='del'>-</div><div class='del'>-	/* check current status */</div><div class='del'>-	status = tpm_tis_status(chip);</div><div class='del'>-	if ((status &amp; mask) == mask)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	stop = jiffies + timeout;</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;vendor.irq) {</div><div class='del'>-again:</div><div class='del'>-		timeout = stop - jiffies;</div><div class='del'>-		if ((long)timeout &lt;= 0)</div><div class='del'>-			return -ETIME;</div><div class='del'>-		rc = wait_event_interruptible_timeout(*queue,</div><div class='del'>-						      ((tpm_tis_status</div><div class='del'>-							(chip) &amp; mask) ==</div><div class='del'>-						       mask), timeout);</div><div class='del'>-		if (rc &gt; 0)</div><div class='del'>-			return 0;</div><div class='del'>-		if (rc == -ERESTARTSYS &amp;&amp; freezing(current)) {</div><div class='del'>-			clear_thread_flag(TIF_SIGPENDING);</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		do {</div><div class='del'>-			msleep(TPM_TIMEOUT);</div><div class='del'>-			status = tpm_tis_status(chip);</div><div class='del'>-			if ((status &amp; mask) == mask)</div><div class='del'>-				return 0;</div><div class='del'>-		} while (time_before(jiffies, stop));</div><div class='del'>-	}</div><div class='del'>-	return -ETIME;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	int size = 0, burstcnt;</div><div class='ctx'> 	while (size &lt; count &amp;&amp;</div><div class='del'>-	       wait_for_stat(chip,</div><div class='del'>-			     TPM_STS_DATA_AVAIL | TPM_STS_VALID,</div><div class='del'>-			     chip-&gt;vendor.timeout_c,</div><div class='del'>-			     &amp;chip-&gt;vendor.read_queue)</div><div class='add'>+	       wait_for_tpm_stat(chip,</div><div class='add'>+				 TPM_STS_DATA_AVAIL | TPM_STS_VALID,</div><div class='add'>+				 chip-&gt;vendor.timeout_c,</div><div class='add'>+				 &amp;chip-&gt;vendor.read_queue)</div><div class='ctx'> 	       == 0) {</div><div class='ctx'> 		burstcnt = get_burstcount(chip);</div><div class='ctx'> 		for (; burstcnt &gt; 0 &amp;&amp; size &lt; count; burstcnt--)</div><div class='hunk'>@@ -282,8 +240,8 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wait_for_stat(chip, TPM_STS_VALID, chip-&gt;vendor.timeout_c,</div><div class='del'>-		      &amp;chip-&gt;vendor.int_queue);</div><div class='add'>+	wait_for_tpm_stat(chip, TPM_STS_VALID, chip-&gt;vendor.timeout_c,</div><div class='add'>+			  &amp;chip-&gt;vendor.int_queue);</div><div class='ctx'> 	status = tpm_tis_status(chip);</div><div class='ctx'> 	if (status &amp; TPM_STS_DATA_AVAIL) {	/* retry? */</div><div class='ctx'> 		dev_err(chip-&gt;dev, "Error left over data\n");</div><div class='hunk'>@@ -297,7 +255,7 @@ out:</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int itpm;</div><div class='add'>+static bool itpm;</div><div class='ctx'> module_param(itpm, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(itpm, "Force iTPM workarounds (found on some Lenovo laptops)");</div><div class='ctx'> </div><div class='hunk'>@@ -317,7 +275,7 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)</div><div class='ctx'> 	status = tpm_tis_status(chip);</div><div class='ctx'> 	if ((status &amp; TPM_STS_COMMAND_READY) == 0) {</div><div class='ctx'> 		tpm_tis_ready(chip);</div><div class='del'>-		if (wait_for_stat</div><div class='add'>+		if (wait_for_tpm_stat</div><div class='ctx'> 		    (chip, TPM_STS_COMMAND_READY, chip-&gt;vendor.timeout_b,</div><div class='ctx'> 		     &amp;chip-&gt;vendor.int_queue) &lt; 0) {</div><div class='ctx'> 			rc = -ETIME;</div><div class='hunk'>@@ -333,8 +291,8 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)</div><div class='ctx'> 			count++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		wait_for_stat(chip, TPM_STS_VALID, chip-&gt;vendor.timeout_c,</div><div class='del'>-			      &amp;chip-&gt;vendor.int_queue);</div><div class='add'>+		wait_for_tpm_stat(chip, TPM_STS_VALID, chip-&gt;vendor.timeout_c,</div><div class='add'>+				  &amp;chip-&gt;vendor.int_queue);</div><div class='ctx'> 		status = tpm_tis_status(chip);</div><div class='ctx'> 		if (!itpm &amp;&amp; (status &amp; TPM_STS_DATA_EXPECT) == 0) {</div><div class='ctx'> 			rc = -EIO;</div><div class='hunk'>@@ -345,8 +303,8 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)</div><div class='ctx'> 	/* write last byte */</div><div class='ctx'> 	iowrite8(buf[count],</div><div class='ctx'> 		 chip-&gt;vendor.iobase + TPM_DATA_FIFO(chip-&gt;vendor.locality));</div><div class='del'>-	wait_for_stat(chip, TPM_STS_VALID, chip-&gt;vendor.timeout_c,</div><div class='del'>-		      &amp;chip-&gt;vendor.int_queue);</div><div class='add'>+	wait_for_tpm_stat(chip, TPM_STS_VALID, chip-&gt;vendor.timeout_c,</div><div class='add'>+			  &amp;chip-&gt;vendor.int_queue);</div><div class='ctx'> 	status = tpm_tis_status(chip);</div><div class='ctx'> 	if ((status &amp; TPM_STS_DATA_EXPECT) != 0) {</div><div class='ctx'> 		rc = -EIO;</div><div class='hunk'>@@ -381,7 +339,7 @@ static int tpm_tis_send(struct tpm_chip *chip, u8 *buf, size_t len)</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;vendor.irq) {</div><div class='ctx'> 		ordinal = be32_to_cpu(*((__be32 *) (buf + 6)));</div><div class='del'>-		if (wait_for_stat</div><div class='add'>+		if (wait_for_tpm_stat</div><div class='ctx'> 		    (chip, TPM_STS_DATA_AVAIL | TPM_STS_VALID,</div><div class='ctx'> 		     tpm_calc_ordinal_duration(chip, ordinal),</div><div class='ctx'> 		     &amp;chip-&gt;vendor.read_queue) &lt; 0) {</div><div class='hunk'>@@ -432,6 +390,9 @@ static int probe_itpm(struct tpm_chip *chip)</div><div class='ctx'> out:</div><div class='ctx'> 	itpm = rem_itpm;</div><div class='ctx'> 	tpm_tis_ready(chip);</div><div class='add'>+	/* some TPMs need a break here otherwise they will not work</div><div class='add'>+	 * correctly on the immediately subsequent command */</div><div class='add'>+	msleep(chip-&gt;vendor.timeout_b);</div><div class='ctx'> 	release_locality(chip, chip-&gt;vendor.locality, 0);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -539,7 +500,7 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int interrupts = 1;</div><div class='add'>+static bool interrupts = 1;</div><div class='ctx'> module_param(interrupts, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(interrupts, "Enable interrupts");</div><div class='ctx'> </div><div class='hunk'>@@ -614,7 +575,17 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,</div><div class='ctx'> 		dev_dbg(dev, "\tData Avail Int Support\n");</div><div class='ctx'> </div><div class='ctx'> 	/* get the timeouts before testing for irqs */</div><div class='del'>-	tpm_get_timeouts(chip);</div><div class='add'>+	if (tpm_get_timeouts(chip)) {</div><div class='add'>+		dev_err(dev, "Could not get TPM timeouts and durations\n");</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tpm_do_selftest(chip)) {</div><div class='add'>+		dev_err(dev, "TPM self test failed\n");</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* INTERRUPT Setup */</div><div class='ctx'> 	init_waitqueue_head(&amp;chip-&gt;vendor.read_queue);</div><div class='hunk'>@@ -722,7 +693,6 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,</div><div class='ctx'> 	list_add(&amp;chip-&gt;vendor.list, &amp;tis_chips);</div><div class='ctx'> 	spin_unlock(&amp;tis_lock);</div><div class='ctx'> </div><div class='del'>-	tpm_continue_selftest(chip);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> out_err:</div><div class='hunk'>@@ -790,7 +760,7 @@ static int tpm_tis_pnp_resume(struct pnp_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	ret = tpm_pm_resume(&amp;dev-&gt;dev);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		tpm_continue_selftest(chip);</div><div class='add'>+		tpm_do_selftest(chip);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -858,7 +828,7 @@ static struct platform_driver tis_drv = {</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *pdev;</div><div class='ctx'> </div><div class='del'>-static int force;</div><div class='add'>+static bool force;</div><div class='ctx'> module_param(force, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(force, "Force device probe rather than using ACPI entry");</div><div class='ctx'> static int __init init_tis(void)</div><div class='head'>diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c<br/>index 8e3c46d67cb3..b58b56187065 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/virtio_console.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/char/virtio_console.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/virtio_console.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/char/virtio_console.c</a></div><div class='hunk'>@@ -392,7 +392,7 @@ static int add_inbuf(struct virtqueue *vq, struct port_buffer *buf)</div><div class='ctx'> </div><div class='ctx'> 	sg_init_one(sg, buf-&gt;buf, buf-&gt;size);</div><div class='ctx'> </div><div class='del'>-	ret = virtqueue_add_buf(vq, sg, 0, 1, buf);</div><div class='add'>+	ret = virtqueue_add_buf(vq, sg, 0, 1, buf, GFP_ATOMIC);</div><div class='ctx'> 	virtqueue_kick(vq);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -457,7 +457,7 @@ static ssize_t __send_control_msg(struct ports_device *portdev, u32 port_id,</div><div class='ctx'> 	vq = portdev-&gt;c_ovq;</div><div class='ctx'> </div><div class='ctx'> 	sg_init_one(sg, &amp;cpkt, sizeof(cpkt));</div><div class='del'>-	if (virtqueue_add_buf(vq, sg, 1, 0, &amp;cpkt) &gt;= 0) {</div><div class='add'>+	if (virtqueue_add_buf(vq, sg, 1, 0, &amp;cpkt, GFP_ATOMIC) &gt;= 0) {</div><div class='ctx'> 		virtqueue_kick(vq);</div><div class='ctx'> 		while (!virtqueue_get_buf(vq, &amp;len))</div><div class='ctx'> 			cpu_relax();</div><div class='hunk'>@@ -506,7 +506,7 @@ static ssize_t send_buf(struct port *port, void *in_buf, size_t in_count,</div><div class='ctx'> 	reclaim_consumed_buffers(port);</div><div class='ctx'> </div><div class='ctx'> 	sg_init_one(sg, in_buf, in_count);</div><div class='del'>-	ret = virtqueue_add_buf(out_vq, sg, 1, 0, in_buf);</div><div class='add'>+	ret = virtqueue_add_buf(out_vq, sg, 1, 0, in_buf, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 	/* Tell Host to go! */</div><div class='ctx'> 	virtqueue_kick(out_vq);</div><div class='hunk'>@@ -1271,6 +1271,20 @@ static void remove_port(struct kref *kref)</div><div class='ctx'> 	kfree(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void remove_port_data(struct port *port)</div><div class='add'>+{</div><div class='add'>+	struct port_buffer *buf;</div><div class='add'>+</div><div class='add'>+	/* Remove unused data this port might have received. */</div><div class='add'>+	discard_port_data(port);</div><div class='add'>+</div><div class='add'>+	reclaim_consumed_buffers(port);</div><div class='add'>+</div><div class='add'>+	/* Remove buffers we queued up for the Host to send us data in. */</div><div class='add'>+	while ((buf = virtqueue_detach_unused_buf(port-&gt;in_vq)))</div><div class='add'>+		free_buf(buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Port got unplugged.  Remove port from portdev's list and drop the</div><div class='ctx'>  * kref reference.  If no userspace has this port opened, it will</div><div class='hunk'>@@ -1278,8 +1292,6 @@ static void remove_port(struct kref *kref)</div><div class='ctx'>  */</div><div class='ctx'> static void unplug_port(struct port *port)</div><div class='ctx'> {</div><div class='del'>-	struct port_buffer *buf;</div><div class='del'>-</div><div class='ctx'> 	spin_lock_irq(&amp;port-&gt;portdev-&gt;ports_lock);</div><div class='ctx'> 	list_del(&amp;port-&gt;list);</div><div class='ctx'> 	spin_unlock_irq(&amp;port-&gt;portdev-&gt;ports_lock);</div><div class='hunk'>@@ -1300,14 +1312,7 @@ static void unplug_port(struct port *port)</div><div class='ctx'> 		hvc_remove(port-&gt;cons.hvc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Remove unused data this port might have received. */</div><div class='del'>-	discard_port_data(port);</div><div class='del'>-</div><div class='del'>-	reclaim_consumed_buffers(port);</div><div class='del'>-</div><div class='del'>-	/* Remove buffers we queued up for the Host to send us data in. */</div><div class='del'>-	while ((buf = virtqueue_detach_unused_buf(port-&gt;in_vq)))</div><div class='del'>-		free_buf(buf);</div><div class='add'>+	remove_port_data(port);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We should just assume the device itself has gone off --</div><div class='hunk'>@@ -1659,6 +1664,28 @@ static const struct file_operations portdev_fops = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void remove_vqs(struct ports_device *portdev)</div><div class='add'>+{</div><div class='add'>+	portdev-&gt;vdev-&gt;config-&gt;del_vqs(portdev-&gt;vdev);</div><div class='add'>+	kfree(portdev-&gt;in_vqs);</div><div class='add'>+	kfree(portdev-&gt;out_vqs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_controlq_data(struct ports_device *portdev)</div><div class='add'>+{</div><div class='add'>+	struct port_buffer *buf;</div><div class='add'>+	unsigned int len;</div><div class='add'>+</div><div class='add'>+	if (!use_multiport(portdev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	while ((buf = virtqueue_get_buf(portdev-&gt;c_ivq, &amp;len)))</div><div class='add'>+		free_buf(buf);</div><div class='add'>+</div><div class='add'>+	while ((buf = virtqueue_detach_unused_buf(portdev-&gt;c_ivq)))</div><div class='add'>+		free_buf(buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Once we're further in boot, we get probed like any other virtio</div><div class='ctx'>  * device.</div><div class='hunk'>@@ -1764,9 +1791,7 @@ free_vqs:</div><div class='ctx'> 	/* The host might want to notify mgmt sw about device add failure */</div><div class='ctx'> 	__send_control_msg(portdev, VIRTIO_CONSOLE_BAD_ID,</div><div class='ctx'> 			   VIRTIO_CONSOLE_DEVICE_READY, 0);</div><div class='del'>-	vdev-&gt;config-&gt;del_vqs(vdev);</div><div class='del'>-	kfree(portdev-&gt;in_vqs);</div><div class='del'>-	kfree(portdev-&gt;out_vqs);</div><div class='add'>+	remove_vqs(portdev);</div><div class='ctx'> free_chrdev:</div><div class='ctx'> 	unregister_chrdev(portdev-&gt;chr_major, "virtio-portsdev");</div><div class='ctx'> free:</div><div class='hunk'>@@ -1804,21 +1829,8 @@ static void virtcons_remove(struct virtio_device *vdev)</div><div class='ctx'> 	 * have to just stop using the port, as the vqs are going</div><div class='ctx'> 	 * away.</div><div class='ctx'> 	 */</div><div class='del'>-	if (use_multiport(portdev)) {</div><div class='del'>-		struct port_buffer *buf;</div><div class='del'>-		unsigned int len;</div><div class='del'>-</div><div class='del'>-		while ((buf = virtqueue_get_buf(portdev-&gt;c_ivq, &amp;len)))</div><div class='del'>-			free_buf(buf);</div><div class='del'>-</div><div class='del'>-		while ((buf = virtqueue_detach_unused_buf(portdev-&gt;c_ivq)))</div><div class='del'>-			free_buf(buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vdev-&gt;config-&gt;del_vqs(vdev);</div><div class='del'>-	kfree(portdev-&gt;in_vqs);</div><div class='del'>-	kfree(portdev-&gt;out_vqs);</div><div class='del'>-</div><div class='add'>+	remove_controlq_data(portdev);</div><div class='add'>+	remove_vqs(portdev);</div><div class='ctx'> 	kfree(portdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1832,6 +1844,68 @@ static unsigned int features[] = {</div><div class='ctx'> 	VIRTIO_CONSOLE_F_MULTIPORT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int virtcons_freeze(struct virtio_device *vdev)</div><div class='add'>+{</div><div class='add'>+	struct ports_device *portdev;</div><div class='add'>+	struct port *port;</div><div class='add'>+</div><div class='add'>+	portdev = vdev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	vdev-&gt;config-&gt;reset(vdev);</div><div class='add'>+</div><div class='add'>+	virtqueue_disable_cb(portdev-&gt;c_ivq);</div><div class='add'>+	cancel_work_sync(&amp;portdev-&gt;control_work);</div><div class='add'>+	/*</div><div class='add'>+	 * Once more: if control_work_handler() was running, it would</div><div class='add'>+	 * enable the cb as the last step.</div><div class='add'>+	 */</div><div class='add'>+	virtqueue_disable_cb(portdev-&gt;c_ivq);</div><div class='add'>+	remove_controlq_data(portdev);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(port, &amp;portdev-&gt;ports, list) {</div><div class='add'>+		virtqueue_disable_cb(port-&gt;in_vq);</div><div class='add'>+		virtqueue_disable_cb(port-&gt;out_vq);</div><div class='add'>+		/*</div><div class='add'>+		 * We'll ask the host later if the new invocation has</div><div class='add'>+		 * the port opened or closed.</div><div class='add'>+		 */</div><div class='add'>+		port-&gt;host_connected = false;</div><div class='add'>+		remove_port_data(port);</div><div class='add'>+	}</div><div class='add'>+	remove_vqs(portdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int virtcons_restore(struct virtio_device *vdev)</div><div class='add'>+{</div><div class='add'>+	struct ports_device *portdev;</div><div class='add'>+	struct port *port;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	portdev = vdev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ret = init_vqs(portdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (use_multiport(portdev))</div><div class='add'>+		fill_queue(portdev-&gt;c_ivq, &amp;portdev-&gt;cvq_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(port, &amp;portdev-&gt;ports, list) {</div><div class='add'>+		port-&gt;in_vq = portdev-&gt;in_vqs[port-&gt;id];</div><div class='add'>+		port-&gt;out_vq = portdev-&gt;out_vqs[port-&gt;id];</div><div class='add'>+</div><div class='add'>+		fill_queue(port-&gt;in_vq, &amp;port-&gt;inbuf_lock);</div><div class='add'>+</div><div class='add'>+		/* Get port open/close status on the host */</div><div class='add'>+		send_control_msg(port, VIRTIO_CONSOLE_PORT_READY, 1);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct virtio_driver virtio_console = {</div><div class='ctx'> 	.feature_table = features,</div><div class='ctx'> 	.feature_table_size = ARRAY_SIZE(features),</div><div class='hunk'>@@ -1841,6 +1915,10 @@ static struct virtio_driver virtio_console = {</div><div class='ctx'> 	.probe =	virtcons_probe,</div><div class='ctx'> 	.remove =	virtcons_remove,</div><div class='ctx'> 	.config_changed = config_intr,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.freeze =	virtcons_freeze,</div><div class='add'>+	.restore =	virtcons_restore,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init init(void)</div><div class='head'>diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig<br/>index 35309274ad68..9b3cd08cd0ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/clk/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/clk/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/clk/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/clk/Kconfig</a></div><div class='hunk'>@@ -3,5 +3,8 @@ config CLKDEV_LOOKUP</div><div class='ctx'> 	bool</div><div class='ctx'> 	select HAVE_CLK</div><div class='ctx'> </div><div class='add'>+config HAVE_CLK_PREPARE</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config HAVE_MACH_CLKDEV</div><div class='ctx'> 	bool</div><div class='head'>diff --git a/drivers/clocksource/clksrc-dbx500-prcmu.c b/drivers/clocksource/clksrc-dbx500-prcmu.c<br/>index 59feefe0e3e6..fb6b6d28b60e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/clocksource/clksrc-dbx500-prcmu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/clocksource/clksrc-dbx500-prcmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/clocksource/clksrc-dbx500-prcmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/clocksource/clksrc-dbx500-prcmu.c</a></div><div class='hunk'>@@ -58,25 +58,15 @@ static struct clocksource clocksource_dbx500_prcmu = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK</div><div class='del'>-static DEFINE_CLOCK_DATA(cd);</div><div class='ctx'> </div><div class='del'>-unsigned long long notrace sched_clock(void)</div><div class='add'>+static u32 notrace dbx500_prcmu_sched_clock_read(void)</div><div class='ctx'> {</div><div class='del'>-	u32 cyc;</div><div class='del'>-</div><div class='ctx'> 	if (unlikely(!clksrc_dbx500_timer_base))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	cyc = clksrc_dbx500_prcmu_read(&amp;clocksource_dbx500_prcmu);</div><div class='del'>-</div><div class='del'>-	return cyc_to_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='add'>+	return clksrc_dbx500_prcmu_read(&amp;clocksource_dbx500_prcmu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void notrace clksrc_dbx500_prcmu_update_sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	u32 cyc = clksrc_dbx500_prcmu_read(&amp;clocksource_dbx500_prcmu);</div><div class='del'>-	update_sched_clock(&amp;cd, cyc, (u32)~0);</div><div class='del'>-}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> void __init clksrc_dbx500_prcmu_init(void __iomem *base)</div><div class='hunk'>@@ -97,7 +87,7 @@ void __init clksrc_dbx500_prcmu_init(void __iomem *base)</div><div class='ctx'> 		       clksrc_dbx500_timer_base + PRCMU_TIMER_REF);</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK</div><div class='del'>-	init_sched_clock(&amp;cd, clksrc_dbx500_prcmu_update_sched_clock,</div><div class='add'>+	setup_sched_clock(dbx500_prcmu_sched_clock_read,</div><div class='ctx'> 			 32, RATE_32K);</div><div class='ctx'> #endif</div><div class='ctx'> 	clocksource_calc_mult_shift(&amp;clocksource_dbx500_prcmu,</div><div class='head'>diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm<br/>index 72a0044c1baa..e0664fed018a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpufreq/Kconfig.arm?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/Kconfig.arm</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/Kconfig.arm?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/cpufreq/Kconfig.arm</a></div><div class='hunk'>@@ -21,12 +21,19 @@ config ARM_S5PV210_CPUFREQ</div><div class='ctx'> </div><div class='ctx'> 	  If in doubt, say N.</div><div class='ctx'> </div><div class='add'>+config ARM_EXYNOS_CPUFREQ</div><div class='add'>+	bool "SAMSUNG EXYNOS SoCs"</div><div class='add'>+	depends on ARCH_EXYNOS</div><div class='add'>+	select ARM_EXYNOS4210_CPUFREQ if CPU_EXYNOS4210</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  This adds the CPUFreq driver common part for Samsung</div><div class='add'>+	  EXYNOS SoCs.</div><div class='add'>+</div><div class='add'>+	  If in doubt, say N.</div><div class='add'>+</div><div class='ctx'> config ARM_EXYNOS4210_CPUFREQ</div><div class='ctx'> 	bool "Samsung EXYNOS4210"</div><div class='del'>-	depends on CPU_EXYNOS4210</div><div class='del'>-	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  This adds the CPUFreq driver for Samsung EXYNOS4210</div><div class='ctx'> 	  SoC (S5PV310 or S5PC210).</div><div class='del'>-</div><div class='del'>-	  If in doubt, say N.</div><div class='head'>diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile<br/>index a48bc02cd765..ac000fa76bbb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpufreq/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/cpufreq/Makefile</a></div><div class='hunk'>@@ -42,7 +42,9 @@ obj-$(CONFIG_X86_CPUFREQ_NFORCE2)	+= cpufreq-nforce2.o</div><div class='ctx'> obj-$(CONFIG_UX500_SOC_DB8500)		+= db8500-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_ARM_S3C64XX_CPUFREQ)	+= s3c64xx-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_ARM_S5PV210_CPUFREQ)	+= s5pv210-cpufreq.o</div><div class='add'>+obj-$(CONFIG_ARM_EXYNOS_CPUFREQ)	+= exynos-cpufreq.o</div><div class='ctx'> obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ)	+= exynos4210-cpufreq.o</div><div class='add'>+obj-$(CONFIG_ARCH_OMAP2PLUS)            += omap-cpufreq.o</div><div class='ctx'> </div><div class='ctx'> ##################################################################################</div><div class='ctx'> # PowerPC platform drivers</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c<br/>index 987a165ede26..622013fb7890 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/cpufreq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/cpufreq/cpufreq.c</a></div><div class='hunk'>@@ -204,8 +204,7 @@ static void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci)</div><div class='ctx'> 		pr_debug("saving %lu as reference value for loops_per_jiffy; "</div><div class='ctx'> 			"freq is %u kHz\n", l_p_j_ref, l_p_j_ref_freq);</div><div class='ctx'> 	}</div><div class='del'>-	if ((val == CPUFREQ_PRECHANGE  &amp;&amp; ci-&gt;old &lt; ci-&gt;new) ||</div><div class='del'>-	    (val == CPUFREQ_POSTCHANGE &amp;&amp; ci-&gt;old &gt; ci-&gt;new) ||</div><div class='add'>+	if ((val == CPUFREQ_POSTCHANGE  &amp;&amp; ci-&gt;old != ci-&gt;new) ||</div><div class='ctx'> 	    (val == CPUFREQ_RESUMECHANGE || val == CPUFREQ_SUSPENDCHANGE)) {</div><div class='ctx'> 		loops_per_jiffy = cpufreq_scale(l_p_j_ref, l_p_j_ref_freq,</div><div class='ctx'> 								ci-&gt;new);</div><div class='hunk'>@@ -679,7 +678,7 @@ static struct kobj_type ktype_cpufreq = {</div><div class='ctx'>  */</div><div class='ctx'> static int cpufreq_add_dev_policy(unsigned int cpu,</div><div class='ctx'> 				  struct cpufreq_policy *policy,</div><div class='del'>-				  struct sys_device *sys_dev)</div><div class='add'>+				  struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='hunk'>@@ -728,7 +727,7 @@ static int cpufreq_add_dev_policy(unsigned int cpu,</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;cpufreq_driver_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 			pr_debug("CPU already managed, adding link\n");</div><div class='del'>-			ret = sysfs_create_link(&amp;sys_dev-&gt;kobj,</div><div class='add'>+			ret = sysfs_create_link(&amp;dev-&gt;kobj,</div><div class='ctx'> 						&amp;managed_policy-&gt;kobj,</div><div class='ctx'> 						"cpufreq");</div><div class='ctx'> 			if (ret)</div><div class='hunk'>@@ -761,7 +760,7 @@ static int cpufreq_add_dev_symlink(unsigned int cpu,</div><div class='ctx'> </div><div class='ctx'> 	for_each_cpu(j, policy-&gt;cpus) {</div><div class='ctx'> 		struct cpufreq_policy *managed_policy;</div><div class='del'>-		struct sys_device *cpu_sys_dev;</div><div class='add'>+		struct device *cpu_dev;</div><div class='ctx'> </div><div class='ctx'> 		if (j == cpu)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -770,8 +769,8 @@ static int cpufreq_add_dev_symlink(unsigned int cpu,</div><div class='ctx'> </div><div class='ctx'> 		pr_debug("CPU %u already managed, adding link\n", j);</div><div class='ctx'> 		managed_policy = cpufreq_cpu_get(cpu);</div><div class='del'>-		cpu_sys_dev = get_cpu_sysdev(j);</div><div class='del'>-		ret = sysfs_create_link(&amp;cpu_sys_dev-&gt;kobj, &amp;policy-&gt;kobj,</div><div class='add'>+		cpu_dev = get_cpu_device(j);</div><div class='add'>+		ret = sysfs_create_link(&amp;cpu_dev-&gt;kobj, &amp;policy-&gt;kobj,</div><div class='ctx'> 					"cpufreq");</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			cpufreq_cpu_put(managed_policy);</div><div class='hunk'>@@ -783,7 +782,7 @@ static int cpufreq_add_dev_symlink(unsigned int cpu,</div><div class='ctx'> </div><div class='ctx'> static int cpufreq_add_dev_interface(unsigned int cpu,</div><div class='ctx'> 				     struct cpufreq_policy *policy,</div><div class='del'>-				     struct sys_device *sys_dev)</div><div class='add'>+				     struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpufreq_policy new_policy;</div><div class='ctx'> 	struct freq_attr **drv_attr;</div><div class='hunk'>@@ -793,7 +792,7 @@ static int cpufreq_add_dev_interface(unsigned int cpu,</div><div class='ctx'> </div><div class='ctx'> 	/* prepare interface data */</div><div class='ctx'> 	ret = kobject_init_and_add(&amp;policy-&gt;kobj, &amp;ktype_cpufreq,</div><div class='del'>-				   &amp;sys_dev-&gt;kobj, "cpufreq");</div><div class='add'>+				   &amp;dev-&gt;kobj, "cpufreq");</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -866,9 +865,9 @@ err_out_kobj_put:</div><div class='ctx'>  * with with cpu hotplugging and all hell will break loose. Tried to clean this</div><div class='ctx'>  * mess up, but more thorough testing is needed. - Mathieu</div><div class='ctx'>  */</div><div class='del'>-static int cpufreq_add_dev(struct sys_device *sys_dev)</div><div class='add'>+static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cpu = sys_dev-&gt;id;</div><div class='add'>+	unsigned int cpu = dev-&gt;id;</div><div class='ctx'> 	int ret = 0, found = 0;</div><div class='ctx'> 	struct cpufreq_policy *policy;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -947,7 +946,7 @@ static int cpufreq_add_dev(struct sys_device *sys_dev)</div><div class='ctx'> 	blocking_notifier_call_chain(&amp;cpufreq_policy_notifier_list,</div><div class='ctx'> 				     CPUFREQ_START, policy);</div><div class='ctx'> </div><div class='del'>-	ret = cpufreq_add_dev_policy(cpu, policy, sys_dev);</div><div class='add'>+	ret = cpufreq_add_dev_policy(cpu, policy, dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		if (ret &gt; 0)</div><div class='ctx'> 			/* This is a managed cpu, symlink created,</div><div class='hunk'>@@ -956,7 +955,7 @@ static int cpufreq_add_dev(struct sys_device *sys_dev)</div><div class='ctx'> 		goto err_unlock_policy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = cpufreq_add_dev_interface(cpu, policy, sys_dev);</div><div class='add'>+	ret = cpufreq_add_dev_interface(cpu, policy, dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_out_unregister;</div><div class='ctx'> </div><div class='hunk'>@@ -999,15 +998,15 @@ module_out:</div><div class='ctx'>  * Caller should already have policy_rwsem in write mode for this CPU.</div><div class='ctx'>  * This routine frees the rwsem before returning.</div><div class='ctx'>  */</div><div class='del'>-static int __cpufreq_remove_dev(struct sys_device *sys_dev)</div><div class='add'>+static int __cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cpu = sys_dev-&gt;id;</div><div class='add'>+	unsigned int cpu = dev-&gt;id;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct cpufreq_policy *data;</div><div class='ctx'> 	struct kobject *kobj;</div><div class='ctx'> 	struct completion *cmp;</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	struct sys_device *cpu_sys_dev;</div><div class='add'>+	struct device *cpu_dev;</div><div class='ctx'> 	unsigned int j;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1032,7 +1031,7 @@ static int __cpufreq_remove_dev(struct sys_device *sys_dev)</div><div class='ctx'> 		pr_debug("removing link\n");</div><div class='ctx'> 		cpumask_clear_cpu(cpu, data-&gt;cpus);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;cpufreq_driver_lock, flags);</div><div class='del'>-		kobj = &amp;sys_dev-&gt;kobj;</div><div class='add'>+		kobj = &amp;dev-&gt;kobj;</div><div class='ctx'> 		cpufreq_cpu_put(data);</div><div class='ctx'> 		unlock_policy_rwsem_write(cpu);</div><div class='ctx'> 		sysfs_remove_link(kobj, "cpufreq");</div><div class='hunk'>@@ -1071,8 +1070,8 @@ static int __cpufreq_remove_dev(struct sys_device *sys_dev)</div><div class='ctx'> 			strncpy(per_cpu(cpufreq_cpu_governor, j),</div><div class='ctx'> 				data-&gt;governor-&gt;name, CPUFREQ_NAME_LEN);</div><div class='ctx'> #endif</div><div class='del'>-			cpu_sys_dev = get_cpu_sysdev(j);</div><div class='del'>-			kobj = &amp;cpu_sys_dev-&gt;kobj;</div><div class='add'>+			cpu_dev = get_cpu_device(j);</div><div class='add'>+			kobj = &amp;cpu_dev-&gt;kobj;</div><div class='ctx'> 			unlock_policy_rwsem_write(cpu);</div><div class='ctx'> 			sysfs_remove_link(kobj, "cpufreq");</div><div class='ctx'> 			lock_policy_rwsem_write(cpu);</div><div class='hunk'>@@ -1112,11 +1111,11 @@ static int __cpufreq_remove_dev(struct sys_device *sys_dev)</div><div class='ctx'> 	if (unlikely(cpumask_weight(data-&gt;cpus) &gt; 1)) {</div><div class='ctx'> 		/* first sibling now owns the new sysfs dir */</div><div class='ctx'> 		cpumask_clear_cpu(cpu, data-&gt;cpus);</div><div class='del'>-		cpufreq_add_dev(get_cpu_sysdev(cpumask_first(data-&gt;cpus)));</div><div class='add'>+		cpufreq_add_dev(get_cpu_device(cpumask_first(data-&gt;cpus)), NULL);</div><div class='ctx'> </div><div class='ctx'> 		/* finally remove our own symlink */</div><div class='ctx'> 		lock_policy_rwsem_write(cpu);</div><div class='del'>-		__cpufreq_remove_dev(sys_dev);</div><div class='add'>+		__cpufreq_remove_dev(dev, sif);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1128,9 +1127,9 @@ static int __cpufreq_remove_dev(struct sys_device *sys_dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int cpufreq_remove_dev(struct sys_device *sys_dev)</div><div class='add'>+static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cpu = sys_dev-&gt;id;</div><div class='add'>+	unsigned int cpu = dev-&gt;id;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_is_offline(cpu))</div><div class='hunk'>@@ -1139,7 +1138,7 @@ static int cpufreq_remove_dev(struct sys_device *sys_dev)</div><div class='ctx'> 	if (unlikely(lock_policy_rwsem_write(cpu)))</div><div class='ctx'> 		BUG();</div><div class='ctx'> </div><div class='del'>-	retval = __cpufreq_remove_dev(sys_dev);</div><div class='add'>+	retval = __cpufreq_remove_dev(dev, sif);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1271,9 +1270,11 @@ out:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(cpufreq_get);</div><div class='ctx'> </div><div class='del'>-static struct sysdev_driver cpufreq_sysdev_driver = {</div><div class='del'>-	.add		= cpufreq_add_dev,</div><div class='del'>-	.remove		= cpufreq_remove_dev,</div><div class='add'>+static struct subsys_interface cpufreq_interface = {</div><div class='add'>+	.name		= "cpufreq",</div><div class='add'>+	.subsys		= &amp;cpu_subsys,</div><div class='add'>+	.add_dev	= cpufreq_add_dev,</div><div class='add'>+	.remove_dev	= cpufreq_remove_dev,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1765,25 +1766,25 @@ static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 					unsigned long action, void *hcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu = (unsigned long)hcpu;</div><div class='del'>-	struct sys_device *sys_dev;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> </div><div class='del'>-	sys_dev = get_cpu_sysdev(cpu);</div><div class='del'>-	if (sys_dev) {</div><div class='add'>+	dev = get_cpu_device(cpu);</div><div class='add'>+	if (dev) {</div><div class='ctx'> 		switch (action) {</div><div class='ctx'> 		case CPU_ONLINE:</div><div class='ctx'> 		case CPU_ONLINE_FROZEN:</div><div class='del'>-			cpufreq_add_dev(sys_dev);</div><div class='add'>+			cpufreq_add_dev(dev, NULL);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case CPU_DOWN_PREPARE:</div><div class='ctx'> 		case CPU_DOWN_PREPARE_FROZEN:</div><div class='ctx'> 			if (unlikely(lock_policy_rwsem_write(cpu)))</div><div class='ctx'> 				BUG();</div><div class='ctx'> </div><div class='del'>-			__cpufreq_remove_dev(sys_dev);</div><div class='add'>+			__cpufreq_remove_dev(dev, NULL);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case CPU_DOWN_FAILED:</div><div class='ctx'> 		case CPU_DOWN_FAILED_FROZEN:</div><div class='del'>-			cpufreq_add_dev(sys_dev);</div><div class='add'>+			cpufreq_add_dev(dev, NULL);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1830,8 +1831,7 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)</div><div class='ctx'> 	cpufreq_driver = driver_data;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;cpufreq_driver_lock, flags);</div><div class='ctx'> </div><div class='del'>-	ret = sysdev_driver_register(&amp;cpu_sysdev_class,</div><div class='del'>-					&amp;cpufreq_sysdev_driver);</div><div class='add'>+	ret = subsys_interface_register(&amp;cpufreq_interface);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_null_driver;</div><div class='ctx'> </div><div class='hunk'>@@ -1850,7 +1850,7 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			pr_debug("no CPU initialized for driver %s\n",</div><div class='ctx'> 							driver_data-&gt;name);</div><div class='del'>-			goto err_sysdev_unreg;</div><div class='add'>+			goto err_if_unreg;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1858,9 +1858,8 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)</div><div class='ctx'> 	pr_debug("driver %s up and running\n", driver_data-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-err_sysdev_unreg:</div><div class='del'>-	sysdev_driver_unregister(&amp;cpu_sysdev_class,</div><div class='del'>-			&amp;cpufreq_sysdev_driver);</div><div class='add'>+err_if_unreg:</div><div class='add'>+	subsys_interface_unregister(&amp;cpufreq_interface);</div><div class='ctx'> err_null_driver:</div><div class='ctx'> 	spin_lock_irqsave(&amp;cpufreq_driver_lock, flags);</div><div class='ctx'> 	cpufreq_driver = NULL;</div><div class='hunk'>@@ -1887,7 +1886,7 @@ int cpufreq_unregister_driver(struct cpufreq_driver *driver)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("unregistering driver %s\n", driver-&gt;name);</div><div class='ctx'> </div><div class='del'>-	sysdev_driver_unregister(&amp;cpu_sysdev_class, &amp;cpufreq_sysdev_driver);</div><div class='add'>+	subsys_interface_unregister(&amp;cpufreq_interface);</div><div class='ctx'> 	unregister_hotcpu_notifier(&amp;cpufreq_cpu_notifier);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;cpufreq_driver_lock, flags);</div><div class='hunk'>@@ -1907,8 +1906,7 @@ static int __init cpufreq_core_init(void)</div><div class='ctx'> 		init_rwsem(&amp;per_cpu(cpu_policy_rwsem, cpu));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cpufreq_global_kobject = kobject_create_and_add("cpufreq",</div><div class='del'>-						&amp;cpu_sysdev_class.kset.kobj);</div><div class='add'>+	cpufreq_global_kobject = kobject_create_and_add("cpufreq", &amp;cpu_subsys.dev_root-&gt;kobj);</div><div class='ctx'> 	BUG_ON(!cpufreq_global_kobject);</div><div class='ctx'> 	register_syscore_ops(&amp;cpufreq_syscore_ops);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c<br/>index 3d679eee70a1..c3e0652520a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq_ondemand.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/cpufreq_ondemand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq_ondemand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/cpufreq/cpufreq_ondemand.c</a></div><div class='hunk'>@@ -713,11 +713,10 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,</div><div class='ctx'> </div><div class='ctx'> static int __init cpufreq_gov_dbs_init(void)</div><div class='ctx'> {</div><div class='del'>-	cputime64_t wall;</div><div class='ctx'> 	u64 idle_time;</div><div class='ctx'> 	int cpu = get_cpu();</div><div class='ctx'> </div><div class='del'>-	idle_time = get_cpu_idle_time_us(cpu, &amp;wall);</div><div class='add'>+	idle_time = get_cpu_idle_time_us(cpu, NULL);</div><div class='ctx'> 	put_cpu();</div><div class='ctx'> 	if (idle_time != -1ULL) {</div><div class='ctx'> 		/* Idle micro accounting is supported. Use finer thresholds */</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c<br/>index 2a508edd768b..b40ee1403be9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq_stats.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/cpufreq_stats.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq_stats.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/cpufreq/cpufreq_stats.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c<br/>index f231015904c0..bedac1aa9be3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq_userspace.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/cpufreq_userspace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq_userspace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/cpufreq/cpufreq_userspace.c</a></div><div class='hunk'>@@ -47,9 +47,11 @@ userspace_cpufreq_notifier(struct notifier_block *nb, unsigned long val,</div><div class='ctx'> 	if (!per_cpu(cpu_is_managed, freq-&gt;cpu))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	pr_debug("saving cpu_cur_freq of cpu %u to be %u kHz\n",</div><div class='del'>-			freq-&gt;cpu, freq-&gt;new);</div><div class='del'>-	per_cpu(cpu_cur_freq, freq-&gt;cpu) = freq-&gt;new;</div><div class='add'>+	if (val == CPUFREQ_POSTCHANGE) {</div><div class='add'>+		pr_debug("saving cpu_cur_freq of cpu %u to be %u kHz\n",</div><div class='add'>+				freq-&gt;cpu, freq-&gt;new);</div><div class='add'>+		per_cpu(cpu_cur_freq, freq-&gt;cpu) = freq-&gt;new;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c<br/>new file mode 100644<br/>index 000000000000..5467879ea07d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/exynos-cpufreq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/cpufreq/exynos-cpufreq.c</a></div><div class='hunk'>@@ -0,0 +1,290 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * EXYNOS - CPU frequency scaling support for EXYNOS series</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/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/regulator/consumer.h&gt;</div><div class='add'>+#include &lt;linux/cpufreq.h&gt;</div><div class='add'>+#include &lt;linux/suspend.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/cpufreq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;plat/cpu.h&gt;</div><div class='add'>+</div><div class='add'>+static struct exynos_dvfs_info *exynos_info;</div><div class='add'>+</div><div class='add'>+static struct regulator *arm_regulator;</div><div class='add'>+static struct cpufreq_freqs freqs;</div><div class='add'>+</div><div class='add'>+static unsigned int locking_frequency;</div><div class='add'>+static bool frequency_locked;</div><div class='add'>+static DEFINE_MUTEX(cpufreq_lock);</div><div class='add'>+</div><div class='add'>+int exynos_verify_speed(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	return cpufreq_frequency_table_verify(policy,</div><div class='add'>+					      exynos_info-&gt;freq_table);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int exynos_getspeed(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	return clk_get_rate(exynos_info-&gt;cpu_clk) / 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int exynos_target(struct cpufreq_policy *policy,</div><div class='add'>+			  unsigned int target_freq,</div><div class='add'>+			  unsigned int relation)</div><div class='add'>+{</div><div class='add'>+	unsigned int index, old_index;</div><div class='add'>+	unsigned int arm_volt, safe_arm_volt = 0;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct cpufreq_frequency_table *freq_table = exynos_info-&gt;freq_table;</div><div class='add'>+	unsigned int *volt_table = exynos_info-&gt;volt_table;</div><div class='add'>+	unsigned int mpll_freq_khz = exynos_info-&gt;mpll_freq_khz;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;cpufreq_lock);</div><div class='add'>+</div><div class='add'>+	freqs.old = policy-&gt;cur;</div><div class='add'>+</div><div class='add'>+	if (frequency_locked &amp;&amp; target_freq != locking_frequency) {</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cpufreq_frequency_table_target(policy, freq_table,</div><div class='add'>+					   freqs.old, relation, &amp;old_index)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cpufreq_frequency_table_target(policy, freq_table,</div><div class='add'>+					   target_freq, relation, &amp;index)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	freqs.new = freq_table[index].frequency;</div><div class='add'>+	freqs.cpu = policy-&gt;cpu;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ARM clock source will be changed APLL to MPLL temporary</div><div class='add'>+	 * To support this level, need to control regulator for</div><div class='add'>+	 * required voltage level</div><div class='add'>+	 */</div><div class='add'>+	if (exynos_info-&gt;need_apll_change != NULL) {</div><div class='add'>+		if (exynos_info-&gt;need_apll_change(old_index, index) &amp;&amp;</div><div class='add'>+		   (freq_table[index].frequency &lt; mpll_freq_khz) &amp;&amp;</div><div class='add'>+		   (freq_table[old_index].frequency &lt; mpll_freq_khz))</div><div class='add'>+			safe_arm_volt = volt_table[exynos_info-&gt;pll_safe_idx];</div><div class='add'>+	}</div><div class='add'>+	arm_volt = volt_table[index];</div><div class='add'>+</div><div class='add'>+	cpufreq_notify_transition(&amp;freqs, CPUFREQ_PRECHANGE);</div><div class='add'>+</div><div class='add'>+	/* When the new frequency is higher than current frequency */</div><div class='add'>+	if ((freqs.new &gt; freqs.old) &amp;&amp; !safe_arm_volt) {</div><div class='add'>+		/* Firstly, voltage up to increase frequency */</div><div class='add'>+		regulator_set_voltage(arm_regulator, arm_volt,</div><div class='add'>+				arm_volt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (safe_arm_volt)</div><div class='add'>+		regulator_set_voltage(arm_regulator, safe_arm_volt,</div><div class='add'>+				      safe_arm_volt);</div><div class='add'>+	if (freqs.new != freqs.old)</div><div class='add'>+		exynos_info-&gt;set_freq(old_index, index);</div><div class='add'>+</div><div class='add'>+	cpufreq_notify_transition(&amp;freqs, CPUFREQ_POSTCHANGE);</div><div class='add'>+</div><div class='add'>+	/* When the new frequency is lower than current frequency */</div><div class='add'>+	if ((freqs.new &lt; freqs.old) ||</div><div class='add'>+	   ((freqs.new &gt; freqs.old) &amp;&amp; safe_arm_volt)) {</div><div class='add'>+		/* down the voltage after frequency change */</div><div class='add'>+		regulator_set_voltage(arm_regulator, arm_volt,</div><div class='add'>+				arm_volt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;cpufreq_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int exynos_cpufreq_suspend(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int exynos_cpufreq_resume(struct cpufreq_policy *policy)</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'>+/**</div><div class='add'>+ * exynos_cpufreq_pm_notifier - block CPUFREQ's activities in suspend-resume</div><div class='add'>+ *			context</div><div class='add'>+ * @notifier</div><div class='add'>+ * @pm_event</div><div class='add'>+ * @v</div><div class='add'>+ *</div><div class='add'>+ * While frequency_locked == true, target() ignores every frequency but</div><div class='add'>+ * locking_frequency. The locking_frequency value is the initial frequency,</div><div class='add'>+ * which is set by the bootloader. In order to eliminate possible</div><div class='add'>+ * inconsistency in clock values, we save and restore frequencies during</div><div class='add'>+ * suspend and resume and block CPUFREQ activities. Note that the standard</div><div class='add'>+ * suspend/resume cannot be used as they are too deep (syscore_ops) for</div><div class='add'>+ * regulator actions.</div><div class='add'>+ */</div><div class='add'>+static int exynos_cpufreq_pm_notifier(struct notifier_block *notifier,</div><div class='add'>+				       unsigned long pm_event, void *v)</div><div class='add'>+{</div><div class='add'>+	struct cpufreq_policy *policy = cpufreq_cpu_get(0); /* boot CPU */</div><div class='add'>+	static unsigned int saved_frequency;</div><div class='add'>+	unsigned int temp;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;cpufreq_lock);</div><div class='add'>+	switch (pm_event) {</div><div class='add'>+	case PM_SUSPEND_PREPARE:</div><div class='add'>+		if (frequency_locked)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		frequency_locked = true;</div><div class='add'>+</div><div class='add'>+		if (locking_frequency) {</div><div class='add'>+			saved_frequency = exynos_getspeed(0);</div><div class='add'>+</div><div class='add'>+			mutex_unlock(&amp;cpufreq_lock);</div><div class='add'>+			exynos_target(policy, locking_frequency,</div><div class='add'>+				      CPUFREQ_RELATION_H);</div><div class='add'>+			mutex_lock(&amp;cpufreq_lock);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case PM_POST_SUSPEND:</div><div class='add'>+		if (saved_frequency) {</div><div class='add'>+			/*</div><div class='add'>+			 * While frequency_locked, only locking_frequency</div><div class='add'>+			 * is valid for target(). In order to use</div><div class='add'>+			 * saved_frequency while keeping frequency_locked,</div><div class='add'>+			 * we temporarly overwrite locking_frequency.</div><div class='add'>+			 */</div><div class='add'>+			temp = locking_frequency;</div><div class='add'>+			locking_frequency = saved_frequency;</div><div class='add'>+</div><div class='add'>+			mutex_unlock(&amp;cpufreq_lock);</div><div class='add'>+			exynos_target(policy, locking_frequency,</div><div class='add'>+				      CPUFREQ_RELATION_H);</div><div class='add'>+			mutex_lock(&amp;cpufreq_lock);</div><div class='add'>+</div><div class='add'>+			locking_frequency = temp;</div><div class='add'>+		}</div><div class='add'>+		frequency_locked = false;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;cpufreq_lock);</div><div class='add'>+</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block exynos_cpufreq_nb = {</div><div class='add'>+	.notifier_call = exynos_cpufreq_pm_notifier,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int exynos_cpufreq_cpu_init(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	policy-&gt;cur = policy-&gt;min = policy-&gt;max = exynos_getspeed(policy-&gt;cpu);</div><div class='add'>+</div><div class='add'>+	cpufreq_frequency_table_get_attr(exynos_info-&gt;freq_table, policy-&gt;cpu);</div><div class='add'>+</div><div class='add'>+	/* set the transition latency value */</div><div class='add'>+	policy-&gt;cpuinfo.transition_latency = 100000;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * EXYNOS4 multi-core processors has 2 cores</div><div class='add'>+	 * that the frequency cannot be set independently.</div><div class='add'>+	 * Each cpu is bound to the same speed.</div><div class='add'>+	 * So the affected cpu is all of the cpus.</div><div class='add'>+	 */</div><div class='add'>+	if (num_online_cpus() == 1) {</div><div class='add'>+		cpumask_copy(policy-&gt;related_cpus, cpu_possible_mask);</div><div class='add'>+		cpumask_copy(policy-&gt;cpus, cpu_online_mask);</div><div class='add'>+	} else {</div><div class='add'>+		cpumask_setall(policy-&gt;cpus);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return cpufreq_frequency_table_cpuinfo(policy, exynos_info-&gt;freq_table);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct cpufreq_driver exynos_driver = {</div><div class='add'>+	.flags		= CPUFREQ_STICKY,</div><div class='add'>+	.verify		= exynos_verify_speed,</div><div class='add'>+	.target		= exynos_target,</div><div class='add'>+	.get		= exynos_getspeed,</div><div class='add'>+	.init		= exynos_cpufreq_cpu_init,</div><div class='add'>+	.name		= "exynos_cpufreq",</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend	= exynos_cpufreq_suspend,</div><div class='add'>+	.resume		= exynos_cpufreq_resume,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init exynos_cpufreq_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	exynos_info = kzalloc(sizeof(struct exynos_dvfs_info), GFP_KERNEL);</div><div class='add'>+	if (!exynos_info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (soc_is_exynos4210())</div><div class='add'>+		ret = exynos4210_cpufreq_init(exynos_info);</div><div class='add'>+	else</div><div class='add'>+		pr_err("%s: CPU type not found\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_vdd_arm;</div><div class='add'>+</div><div class='add'>+	if (exynos_info-&gt;set_freq == NULL) {</div><div class='add'>+		pr_err("%s: No set_freq function (ERR)\n", __func__);</div><div class='add'>+		goto err_vdd_arm;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arm_regulator = regulator_get(NULL, "vdd_arm");</div><div class='add'>+	if (IS_ERR(arm_regulator)) {</div><div class='add'>+		pr_err("%s: failed to get resource vdd_arm\n", __func__);</div><div class='add'>+		goto err_vdd_arm;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	register_pm_notifier(&amp;exynos_cpufreq_nb);</div><div class='add'>+</div><div class='add'>+	if (cpufreq_register_driver(&amp;exynos_driver)) {</div><div class='add'>+		pr_err("%s: failed to register cpufreq driver\n", __func__);</div><div class='add'>+		goto err_cpufreq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_cpufreq:</div><div class='add'>+	unregister_pm_notifier(&amp;exynos_cpufreq_nb);</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR(arm_regulator))</div><div class='add'>+		regulator_put(arm_regulator);</div><div class='add'>+err_vdd_arm:</div><div class='add'>+	kfree(exynos_info);</div><div class='add'>+	pr_debug("%s: failed initialization\n", __func__);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+late_initcall(exynos_cpufreq_init);</div><div class='head'>diff --git a/drivers/cpufreq/exynos4210-cpufreq.c b/drivers/cpufreq/exynos4210-cpufreq.c<br/>index ab9741fab92e..065da5b702f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpufreq/exynos4210-cpufreq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/exynos4210-cpufreq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/exynos4210-cpufreq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/cpufreq/exynos4210-cpufreq.c</a></div><div class='hunk'>@@ -2,61 +2,52 @@</div><div class='ctx'>  * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.</div><div class='ctx'>  *		http://www.samsung.com</div><div class='ctx'>  *</div><div class='del'>- * EXYNOS4 - CPU frequency scaling support</div><div class='add'>+ * EXYNOS4210 - CPU frequency scaling support</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 version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/regulator/consumer.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='del'>-#include &lt;linux/notifier.h&gt;</div><div class='del'>-#include &lt;linux/suspend.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/map.h&gt;</div><div class='ctx'> #include &lt;mach/regs-clock.h&gt;</div><div class='del'>-#include &lt;mach/regs-mem.h&gt;</div><div class='add'>+#include &lt;mach/cpufreq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;plat/clock.h&gt;</div><div class='del'>-#include &lt;plat/pm.h&gt;</div><div class='add'>+#define CPUFREQ_LEVEL_END	L5</div><div class='add'>+</div><div class='add'>+static int max_support_idx = L0;</div><div class='add'>+static int min_support_idx = (CPUFREQ_LEVEL_END - 1);</div><div class='ctx'> </div><div class='ctx'> static struct clk *cpu_clk;</div><div class='ctx'> static struct clk *moutcore;</div><div class='ctx'> static struct clk *mout_mpll;</div><div class='ctx'> static struct clk *mout_apll;</div><div class='ctx'> </div><div class='del'>-static struct regulator *arm_regulator;</div><div class='del'>-static struct regulator *int_regulator;</div><div class='del'>-</div><div class='del'>-static struct cpufreq_freqs freqs;</div><div class='del'>-static unsigned int memtype;</div><div class='del'>-</div><div class='del'>-static unsigned int locking_frequency;</div><div class='del'>-static bool frequency_locked;</div><div class='del'>-static DEFINE_MUTEX(cpufreq_lock);</div><div class='del'>-</div><div class='del'>-enum exynos4_memory_type {</div><div class='del'>-	DDR2 = 4,</div><div class='del'>-	LPDDR2,</div><div class='del'>-	DDR3,</div><div class='add'>+struct cpufreq_clkdiv {</div><div class='add'>+	unsigned int index;</div><div class='add'>+	unsigned int clkdiv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum cpufreq_level_index {</div><div class='del'>-	L0, L1, L2, L3, CPUFREQ_LEVEL_END,</div><div class='add'>+static unsigned int exynos4210_volt_table[CPUFREQ_LEVEL_END] = {</div><div class='add'>+	1250000, 1150000, 1050000, 975000, 950000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct cpufreq_frequency_table exynos4_freq_table[] = {</div><div class='del'>-	{L0, 1000*1000},</div><div class='del'>-	{L1, 800*1000},</div><div class='del'>-	{L2, 400*1000},</div><div class='del'>-	{L3, 100*1000},</div><div class='add'>+</div><div class='add'>+static struct cpufreq_clkdiv exynos4210_clkdiv_table[CPUFREQ_LEVEL_END];</div><div class='add'>+</div><div class='add'>+static struct cpufreq_frequency_table exynos4210_freq_table[] = {</div><div class='add'>+	{L0, 1200*1000},</div><div class='add'>+	{L1, 1000*1000},</div><div class='add'>+	{L2, 800*1000},</div><div class='add'>+	{L3, 500*1000},</div><div class='add'>+	{L4, 200*1000},</div><div class='ctx'> 	{0, CPUFREQ_TABLE_END},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -67,17 +58,20 @@ static unsigned int clkdiv_cpu0[CPUFREQ_LEVEL_END][7] = {</div><div class='ctx'> 	 *		DIVATB, DIVPCLK_DBG, DIVAPLL }</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	/* ARM L0: 1000MHz */</div><div class='del'>-	{ 0, 3, 7, 3, 3, 0, 1 },</div><div class='add'>+	/* ARM L0: 1200MHz */</div><div class='add'>+	{ 0, 3, 7, 3, 4, 1, 7 },</div><div class='ctx'> </div><div class='del'>-	/* ARM L1: 800MHz */</div><div class='del'>-	{ 0, 3, 7, 3, 3, 0, 1 },</div><div class='add'>+	/* ARM L1: 1000MHz */</div><div class='add'>+	{ 0, 3, 7, 3, 4, 1, 7 },</div><div class='ctx'> </div><div class='del'>-	/* ARM L2: 400MHz */</div><div class='del'>-	{ 0, 1, 3, 1, 3, 0, 1 },</div><div class='add'>+	/* ARM L2: 800MHz */</div><div class='add'>+	{ 0, 3, 7, 3, 3, 1, 7 },</div><div class='ctx'> </div><div class='del'>-	/* ARM L3: 100MHz */</div><div class='del'>-	{ 0, 0, 1, 0, 3, 1, 1 },</div><div class='add'>+	/* ARM L3: 500MHz */</div><div class='add'>+	{ 0, 3, 7, 3, 3, 1, 7 },</div><div class='add'>+</div><div class='add'>+	/* ARM L4: 200MHz */</div><div class='add'>+	{ 0, 1, 3, 1, 3, 1, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static unsigned int clkdiv_cpu1[CPUFREQ_LEVEL_END][2] = {</div><div class='hunk'>@@ -86,147 +80,46 @@ static unsigned int clkdiv_cpu1[CPUFREQ_LEVEL_END][2] = {</div><div class='ctx'> 	 * { DIVCOPY, DIVHPM }</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	 /* ARM L0: 1000MHz */</div><div class='del'>-	{ 3, 0 },</div><div class='add'>+	/* ARM L0: 1200MHz */</div><div class='add'>+	{ 5, 0 },</div><div class='ctx'> </div><div class='del'>-	/* ARM L1: 800MHz */</div><div class='del'>-	{ 3, 0 },</div><div class='add'>+	/* ARM L1: 1000MHz */</div><div class='add'>+	{ 4, 0 },</div><div class='ctx'> </div><div class='del'>-	/* ARM L2: 400MHz */</div><div class='add'>+	/* ARM L2: 800MHz */</div><div class='ctx'> 	{ 3, 0 },</div><div class='ctx'> </div><div class='del'>-	/* ARM L3: 100MHz */</div><div class='add'>+	/* ARM L3: 500MHz */</div><div class='ctx'> 	{ 3, 0 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int clkdiv_dmc0[CPUFREQ_LEVEL_END][8] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Clock divider value for following</div><div class='del'>-	 * { DIVACP, DIVACP_PCLK, DIVDPHY, DIVDMC, DIVDMCD</div><div class='del'>-	 *		DIVDMCP, DIVCOPY2, DIVCORE_TIMERS }</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* DMC L0: 400MHz */</div><div class='del'>-	{ 3, 1, 1, 1, 1, 1, 3, 1 },</div><div class='del'>-</div><div class='del'>-	/* DMC L1: 400MHz */</div><div class='del'>-	{ 3, 1, 1, 1, 1, 1, 3, 1 },</div><div class='del'>-</div><div class='del'>-	/* DMC L2: 266.7MHz */</div><div class='del'>-	{ 7, 1, 1, 2, 1, 1, 3, 1 },</div><div class='del'>-</div><div class='del'>-	/* DMC L3: 200MHz */</div><div class='del'>-	{ 7, 1, 1, 3, 1, 1, 3, 1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int clkdiv_top[CPUFREQ_LEVEL_END][5] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Clock divider value for following</div><div class='del'>-	 * { DIVACLK200, DIVACLK100, DIVACLK160, DIVACLK133, DIVONENAND }</div><div class='del'>-	 */</div><div class='ctx'> </div><div class='del'>-	/* ACLK200 L0: 200MHz */</div><div class='del'>-	{ 3, 7, 4, 5, 1 },</div><div class='del'>-</div><div class='del'>-	/* ACLK200 L1: 200MHz */</div><div class='del'>-	{ 3, 7, 4, 5, 1 },</div><div class='del'>-</div><div class='del'>-	/* ACLK200 L2: 160MHz */</div><div class='del'>-	{ 4, 7, 5, 7, 1 },</div><div class='del'>-</div><div class='del'>-	/* ACLK200 L3: 133.3MHz */</div><div class='del'>-	{ 5, 7, 7, 7, 1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int clkdiv_lr_bus[CPUFREQ_LEVEL_END][2] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Clock divider value for following</div><div class='del'>-	 * { DIVGDL/R, DIVGPL/R }</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* ACLK_GDL/R L0: 200MHz */</div><div class='del'>-	{ 3, 1 },</div><div class='del'>-</div><div class='del'>-	/* ACLK_GDL/R L1: 200MHz */</div><div class='del'>-	{ 3, 1 },</div><div class='del'>-</div><div class='del'>-	/* ACLK_GDL/R L2: 160MHz */</div><div class='del'>-	{ 4, 1 },</div><div class='del'>-</div><div class='del'>-	/* ACLK_GDL/R L3: 133.3MHz */</div><div class='del'>-	{ 5, 1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cpufreq_voltage_table {</div><div class='del'>-	unsigned int	index;		/* any */</div><div class='del'>-	unsigned int	arm_volt;	/* uV */</div><div class='del'>-	unsigned int	int_volt;</div><div class='add'>+	/* ARM L4: 200MHz */</div><div class='add'>+	{ 3, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct cpufreq_voltage_table exynos4_volt_table[CPUFREQ_LEVEL_END] = {</div><div class='del'>-	{</div><div class='del'>-		.index		= L0,</div><div class='del'>-		.arm_volt	= 1200000,</div><div class='del'>-		.int_volt	= 1100000,</div><div class='del'>-	}, {</div><div class='del'>-		.index		= L1,</div><div class='del'>-		.arm_volt	= 1100000,</div><div class='del'>-		.int_volt	= 1100000,</div><div class='del'>-	}, {</div><div class='del'>-		.index		= L2,</div><div class='del'>-		.arm_volt	= 1000000,</div><div class='del'>-		.int_volt	= 1000000,</div><div class='del'>-	}, {</div><div class='del'>-		.index		= L3,</div><div class='del'>-		.arm_volt	= 900000,</div><div class='del'>-		.int_volt	= 1000000,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='add'>+static unsigned int exynos4210_apll_pms_table[CPUFREQ_LEVEL_END] = {</div><div class='add'>+	/* APLL FOUT L0: 1200MHz */</div><div class='add'>+	((150 &lt;&lt; 16) | (3 &lt;&lt; 8) | 1),</div><div class='ctx'> </div><div class='del'>-static unsigned int exynos4_apll_pms_table[CPUFREQ_LEVEL_END] = {</div><div class='del'>-	/* APLL FOUT L0: 1000MHz */</div><div class='add'>+	/* APLL FOUT L1: 1000MHz */</div><div class='ctx'> 	((250 &lt;&lt; 16) | (6 &lt;&lt; 8) | 1),</div><div class='ctx'> </div><div class='del'>-	/* APLL FOUT L1: 800MHz */</div><div class='add'>+	/* APLL FOUT L2: 800MHz */</div><div class='ctx'> 	((200 &lt;&lt; 16) | (6 &lt;&lt; 8) | 1),</div><div class='ctx'> </div><div class='del'>-	/* APLL FOUT L2 : 400MHz */</div><div class='del'>-	((200 &lt;&lt; 16) | (6 &lt;&lt; 8) | 2),</div><div class='add'>+	/* APLL FOUT L3: 500MHz */</div><div class='add'>+	((250 &lt;&lt; 16) | (6 &lt;&lt; 8) | 2),</div><div class='ctx'> </div><div class='del'>-	/* APLL FOUT L3: 100MHz */</div><div class='del'>-	((200 &lt;&lt; 16) | (6 &lt;&lt; 8) | 4),</div><div class='add'>+	/* APLL FOUT L4: 200MHz */</div><div class='add'>+	((200 &lt;&lt; 16) | (6 &lt;&lt; 8) | 3),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int exynos4_verify_speed(struct cpufreq_policy *policy)</div><div class='del'>-{</div><div class='del'>-	return cpufreq_frequency_table_verify(policy, exynos4_freq_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int exynos4_getspeed(unsigned int cpu)</div><div class='del'>-{</div><div class='del'>-	return clk_get_rate(cpu_clk) / 1000;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void exynos4_set_clkdiv(unsigned int div_index)</div><div class='add'>+static void exynos4210_set_clkdiv(unsigned int div_index)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int tmp;</div><div class='ctx'> </div><div class='ctx'> 	/* Change Divider - CPU0 */</div><div class='ctx'> </div><div class='del'>-	tmp = __raw_readl(S5P_CLKDIV_CPU);</div><div class='del'>-</div><div class='del'>-	tmp &amp;= ~(S5P_CLKDIV_CPU0_CORE_MASK | S5P_CLKDIV_CPU0_COREM0_MASK |</div><div class='del'>-		S5P_CLKDIV_CPU0_COREM1_MASK | S5P_CLKDIV_CPU0_PERIPH_MASK |</div><div class='del'>-		S5P_CLKDIV_CPU0_ATB_MASK | S5P_CLKDIV_CPU0_PCLKDBG_MASK |</div><div class='del'>-		S5P_CLKDIV_CPU0_APLL_MASK);</div><div class='del'>-</div><div class='del'>-	tmp |= ((clkdiv_cpu0[div_index][0] &lt;&lt; S5P_CLKDIV_CPU0_CORE_SHIFT) |</div><div class='del'>-		(clkdiv_cpu0[div_index][1] &lt;&lt; S5P_CLKDIV_CPU0_COREM0_SHIFT) |</div><div class='del'>-		(clkdiv_cpu0[div_index][2] &lt;&lt; S5P_CLKDIV_CPU0_COREM1_SHIFT) |</div><div class='del'>-		(clkdiv_cpu0[div_index][3] &lt;&lt; S5P_CLKDIV_CPU0_PERIPH_SHIFT) |</div><div class='del'>-		(clkdiv_cpu0[div_index][4] &lt;&lt; S5P_CLKDIV_CPU0_ATB_SHIFT) |</div><div class='del'>-		(clkdiv_cpu0[div_index][5] &lt;&lt; S5P_CLKDIV_CPU0_PCLKDBG_SHIFT) |</div><div class='del'>-		(clkdiv_cpu0[div_index][6] &lt;&lt; S5P_CLKDIV_CPU0_APLL_SHIFT));</div><div class='add'>+	tmp = exynos4210_clkdiv_table[div_index].clkdiv;</div><div class='ctx'> </div><div class='ctx'> 	__raw_writel(tmp, S5P_CLKDIV_CPU);</div><div class='ctx'> </div><div class='hunk'>@@ -248,83 +141,9 @@ static void exynos4_set_clkdiv(unsigned int div_index)</div><div class='ctx'> 	do {</div><div class='ctx'> 		tmp = __raw_readl(S5P_CLKDIV_STATCPU1);</div><div class='ctx'> 	} while (tmp &amp; 0x11);</div><div class='del'>-</div><div class='del'>-	/* Change Divider - DMC0 */</div><div class='del'>-</div><div class='del'>-	tmp = __raw_readl(S5P_CLKDIV_DMC0);</div><div class='del'>-</div><div class='del'>-	tmp &amp;= ~(S5P_CLKDIV_DMC0_ACP_MASK | S5P_CLKDIV_DMC0_ACPPCLK_MASK |</div><div class='del'>-		S5P_CLKDIV_DMC0_DPHY_MASK | S5P_CLKDIV_DMC0_DMC_MASK |</div><div class='del'>-		S5P_CLKDIV_DMC0_DMCD_MASK | S5P_CLKDIV_DMC0_DMCP_MASK |</div><div class='del'>-		S5P_CLKDIV_DMC0_COPY2_MASK | S5P_CLKDIV_DMC0_CORETI_MASK);</div><div class='del'>-</div><div class='del'>-	tmp |= ((clkdiv_dmc0[div_index][0] &lt;&lt; S5P_CLKDIV_DMC0_ACP_SHIFT) |</div><div class='del'>-		(clkdiv_dmc0[div_index][1] &lt;&lt; S5P_CLKDIV_DMC0_ACPPCLK_SHIFT) |</div><div class='del'>-		(clkdiv_dmc0[div_index][2] &lt;&lt; S5P_CLKDIV_DMC0_DPHY_SHIFT) |</div><div class='del'>-		(clkdiv_dmc0[div_index][3] &lt;&lt; S5P_CLKDIV_DMC0_DMC_SHIFT) |</div><div class='del'>-		(clkdiv_dmc0[div_index][4] &lt;&lt; S5P_CLKDIV_DMC0_DMCD_SHIFT) |</div><div class='del'>-		(clkdiv_dmc0[div_index][5] &lt;&lt; S5P_CLKDIV_DMC0_DMCP_SHIFT) |</div><div class='del'>-		(clkdiv_dmc0[div_index][6] &lt;&lt; S5P_CLKDIV_DMC0_COPY2_SHIFT) |</div><div class='del'>-		(clkdiv_dmc0[div_index][7] &lt;&lt; S5P_CLKDIV_DMC0_CORETI_SHIFT));</div><div class='del'>-</div><div class='del'>-	__raw_writel(tmp, S5P_CLKDIV_DMC0);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		tmp = __raw_readl(S5P_CLKDIV_STAT_DMC0);</div><div class='del'>-	} while (tmp &amp; 0x11111111);</div><div class='del'>-</div><div class='del'>-	/* Change Divider - TOP */</div><div class='del'>-</div><div class='del'>-	tmp = __raw_readl(S5P_CLKDIV_TOP);</div><div class='del'>-</div><div class='del'>-	tmp &amp;= ~(S5P_CLKDIV_TOP_ACLK200_MASK | S5P_CLKDIV_TOP_ACLK100_MASK |</div><div class='del'>-		S5P_CLKDIV_TOP_ACLK160_MASK | S5P_CLKDIV_TOP_ACLK133_MASK |</div><div class='del'>-		S5P_CLKDIV_TOP_ONENAND_MASK);</div><div class='del'>-</div><div class='del'>-	tmp |= ((clkdiv_top[div_index][0] &lt;&lt; S5P_CLKDIV_TOP_ACLK200_SHIFT) |</div><div class='del'>-		(clkdiv_top[div_index][1] &lt;&lt; S5P_CLKDIV_TOP_ACLK100_SHIFT) |</div><div class='del'>-		(clkdiv_top[div_index][2] &lt;&lt; S5P_CLKDIV_TOP_ACLK160_SHIFT) |</div><div class='del'>-		(clkdiv_top[div_index][3] &lt;&lt; S5P_CLKDIV_TOP_ACLK133_SHIFT) |</div><div class='del'>-		(clkdiv_top[div_index][4] &lt;&lt; S5P_CLKDIV_TOP_ONENAND_SHIFT));</div><div class='del'>-</div><div class='del'>-	__raw_writel(tmp, S5P_CLKDIV_TOP);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		tmp = __raw_readl(S5P_CLKDIV_STAT_TOP);</div><div class='del'>-	} while (tmp &amp; 0x11111);</div><div class='del'>-</div><div class='del'>-	/* Change Divider - LEFTBUS */</div><div class='del'>-</div><div class='del'>-	tmp = __raw_readl(S5P_CLKDIV_LEFTBUS);</div><div class='del'>-</div><div class='del'>-	tmp &amp;= ~(S5P_CLKDIV_BUS_GDLR_MASK | S5P_CLKDIV_BUS_GPLR_MASK);</div><div class='del'>-</div><div class='del'>-	tmp |= ((clkdiv_lr_bus[div_index][0] &lt;&lt; S5P_CLKDIV_BUS_GDLR_SHIFT) |</div><div class='del'>-		(clkdiv_lr_bus[div_index][1] &lt;&lt; S5P_CLKDIV_BUS_GPLR_SHIFT));</div><div class='del'>-</div><div class='del'>-	__raw_writel(tmp, S5P_CLKDIV_LEFTBUS);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		tmp = __raw_readl(S5P_CLKDIV_STAT_LEFTBUS);</div><div class='del'>-	} while (tmp &amp; 0x11);</div><div class='del'>-</div><div class='del'>-	/* Change Divider - RIGHTBUS */</div><div class='del'>-</div><div class='del'>-	tmp = __raw_readl(S5P_CLKDIV_RIGHTBUS);</div><div class='del'>-</div><div class='del'>-	tmp &amp;= ~(S5P_CLKDIV_BUS_GDLR_MASK | S5P_CLKDIV_BUS_GPLR_MASK);</div><div class='del'>-</div><div class='del'>-	tmp |= ((clkdiv_lr_bus[div_index][0] &lt;&lt; S5P_CLKDIV_BUS_GDLR_SHIFT) |</div><div class='del'>-		(clkdiv_lr_bus[div_index][1] &lt;&lt; S5P_CLKDIV_BUS_GPLR_SHIFT));</div><div class='del'>-</div><div class='del'>-	__raw_writel(tmp, S5P_CLKDIV_RIGHTBUS);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		tmp = __raw_readl(S5P_CLKDIV_STAT_RIGHTBUS);</div><div class='del'>-	} while (tmp &amp; 0x11);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void exynos4_set_apll(unsigned int index)</div><div class='add'>+static void exynos4210_set_apll(unsigned int index)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int tmp;</div><div class='ctx'> </div><div class='hunk'>@@ -343,7 +162,7 @@ static void exynos4_set_apll(unsigned int index)</div><div class='ctx'> 	/* 3. Change PLL PMS values */</div><div class='ctx'> 	tmp = __raw_readl(S5P_APLL_CON0);</div><div class='ctx'> 	tmp &amp;= ~((0x3ff &lt;&lt; 16) | (0x3f &lt;&lt; 8) | (0x7 &lt;&lt; 0));</div><div class='del'>-	tmp |= exynos4_apll_pms_table[index];</div><div class='add'>+	tmp |= exynos4210_apll_pms_table[index];</div><div class='ctx'> 	__raw_writel(tmp, S5P_APLL_CON0);</div><div class='ctx'> </div><div class='ctx'> 	/* 4. wait_lock_time */</div><div class='hunk'>@@ -360,328 +179,126 @@ static void exynos4_set_apll(unsigned int index)</div><div class='ctx'> 	} while (tmp != (0x1 &lt;&lt; S5P_CLKSRC_CPU_MUXCORE_SHIFT));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void exynos4_set_frequency(unsigned int old_index, unsigned int new_index)</div><div class='add'>+bool exynos4210_pms_change(unsigned int old_index, unsigned int new_index)</div><div class='add'>+{</div><div class='add'>+	unsigned int old_pm = (exynos4210_apll_pms_table[old_index] &gt;&gt; 8);</div><div class='add'>+	unsigned int new_pm = (exynos4210_apll_pms_table[new_index] &gt;&gt; 8);</div><div class='add'>+</div><div class='add'>+	return (old_pm == new_pm) ? 0 : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void exynos4210_set_frequency(unsigned int old_index,</div><div class='add'>+				     unsigned int new_index)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int tmp;</div><div class='ctx'> </div><div class='ctx'> 	if (old_index &gt; new_index) {</div><div class='del'>-		/* The frequency changing to L0 needs to change apll */</div><div class='del'>-		if (freqs.new == exynos4_freq_table[L0].frequency) {</div><div class='del'>-			/* 1. Change the system clock divider values */</div><div class='del'>-			exynos4_set_clkdiv(new_index);</div><div class='del'>-</div><div class='del'>-			/* 2. Change the apll m,p,s value */</div><div class='del'>-			exynos4_set_apll(new_index);</div><div class='del'>-		} else {</div><div class='add'>+		if (!exynos4210_pms_change(old_index, new_index)) {</div><div class='ctx'> 			/* 1. Change the system clock divider values */</div><div class='del'>-			exynos4_set_clkdiv(new_index);</div><div class='add'>+			exynos4210_set_clkdiv(new_index);</div><div class='ctx'> </div><div class='ctx'> 			/* 2. Change just s value in apll m,p,s value */</div><div class='ctx'> 			tmp = __raw_readl(S5P_APLL_CON0);</div><div class='ctx'> 			tmp &amp;= ~(0x7 &lt;&lt; 0);</div><div class='del'>-			tmp |= (exynos4_apll_pms_table[new_index] &amp; 0x7);</div><div class='add'>+			tmp |= (exynos4210_apll_pms_table[new_index] &amp; 0x7);</div><div class='ctx'> 			__raw_writel(tmp, S5P_APLL_CON0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	else if (old_index &lt; new_index) {</div><div class='del'>-		/* The frequency changing from L0 needs to change apll */</div><div class='del'>-		if (freqs.old == exynos4_freq_table[L0].frequency) {</div><div class='del'>-			/* 1. Change the apll m,p,s value */</div><div class='del'>-			exynos4_set_apll(new_index);</div><div class='del'>-</div><div class='del'>-			/* 2. Change the system clock divider values */</div><div class='del'>-			exynos4_set_clkdiv(new_index);</div><div class='ctx'> 		} else {</div><div class='add'>+			/* Clock Configuration Procedure */</div><div class='add'>+			/* 1. Change the system clock divider values */</div><div class='add'>+			exynos4210_set_clkdiv(new_index);</div><div class='add'>+			/* 2. Change the apll m,p,s value */</div><div class='add'>+			exynos4210_set_apll(new_index);</div><div class='add'>+		}</div><div class='add'>+	} else if (old_index &lt; new_index) {</div><div class='add'>+		if (!exynos4210_pms_change(old_index, new_index)) {</div><div class='ctx'> 			/* 1. Change just s value in apll m,p,s value */</div><div class='ctx'> 			tmp = __raw_readl(S5P_APLL_CON0);</div><div class='ctx'> 			tmp &amp;= ~(0x7 &lt;&lt; 0);</div><div class='del'>-			tmp |= (exynos4_apll_pms_table[new_index] &amp; 0x7);</div><div class='add'>+			tmp |= (exynos4210_apll_pms_table[new_index] &amp; 0x7);</div><div class='ctx'> 			__raw_writel(tmp, S5P_APLL_CON0);</div><div class='ctx'> </div><div class='ctx'> 			/* 2. Change the system clock divider values */</div><div class='del'>-			exynos4_set_clkdiv(new_index);</div><div class='add'>+			exynos4210_set_clkdiv(new_index);</div><div class='add'>+		} else {</div><div class='add'>+			/* Clock Configuration Procedure */</div><div class='add'>+			/* 1. Change the apll m,p,s value */</div><div class='add'>+			exynos4210_set_apll(new_index);</div><div class='add'>+			/* 2. Change the system clock divider values */</div><div class='add'>+			exynos4210_set_clkdiv(new_index);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int exynos4_target(struct cpufreq_policy *policy,</div><div class='del'>-			  unsigned int target_freq,</div><div class='del'>-			  unsigned int relation)</div><div class='del'>-{</div><div class='del'>-	unsigned int index, old_index;</div><div class='del'>-	unsigned int arm_volt, int_volt;</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-</div><div class='del'>-	freqs.old = exynos4_getspeed(policy-&gt;cpu);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;cpufreq_lock);</div><div class='del'>-</div><div class='del'>-	if (frequency_locked &amp;&amp; target_freq != locking_frequency) {</div><div class='del'>-		err = -EAGAIN;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cpufreq_frequency_table_target(policy, exynos4_freq_table,</div><div class='del'>-					   freqs.old, relation, &amp;old_index))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (cpufreq_frequency_table_target(policy, exynos4_freq_table,</div><div class='del'>-					   target_freq, relation, &amp;index))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>-</div><div class='del'>-	freqs.new = exynos4_freq_table[index].frequency;</div><div class='del'>-	freqs.cpu = policy-&gt;cpu;</div><div class='del'>-</div><div class='del'>-	if (freqs.new == freqs.old)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* get the voltage value */</div><div class='del'>-	arm_volt = exynos4_volt_table[index].arm_volt;</div><div class='del'>-	int_volt = exynos4_volt_table[index].int_volt;</div><div class='del'>-</div><div class='del'>-	cpufreq_notify_transition(&amp;freqs, CPUFREQ_PRECHANGE);</div><div class='del'>-</div><div class='del'>-	/* control regulator */</div><div class='del'>-	if (freqs.new &gt; freqs.old) {</div><div class='del'>-		/* Voltage up */</div><div class='del'>-		regulator_set_voltage(arm_regulator, arm_volt, arm_volt);</div><div class='del'>-		regulator_set_voltage(int_regulator, int_volt, int_volt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Clock Configuration Procedure */</div><div class='del'>-	exynos4_set_frequency(old_index, index);</div><div class='del'>-</div><div class='del'>-	/* control regulator */</div><div class='del'>-	if (freqs.new &lt; freqs.old) {</div><div class='del'>-		/* Voltage down */</div><div class='del'>-		regulator_set_voltage(arm_regulator, arm_volt, arm_volt);</div><div class='del'>-		regulator_set_voltage(int_regulator, int_volt, int_volt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cpufreq_notify_transition(&amp;freqs, CPUFREQ_POSTCHANGE);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;cpufreq_lock);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-/*</div><div class='del'>- * These suspend/resume are used as syscore_ops, it is already too</div><div class='del'>- * late to set regulator voltages at this stage.</div><div class='del'>- */</div><div class='del'>-static int exynos4_cpufreq_suspend(struct cpufreq_policy *policy)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int exynos4_cpufreq_resume(struct cpufreq_policy *policy)</div><div class='add'>+int exynos4210_cpufreq_init(struct exynos_dvfs_info *info)</div><div class='ctx'> {</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'>- * exynos4_cpufreq_pm_notifier - block CPUFREQ's activities in suspend-resume</div><div class='del'>- *			context</div><div class='del'>- * @notifier</div><div class='del'>- * @pm_event</div><div class='del'>- * @v</div><div class='del'>- *</div><div class='del'>- * While frequency_locked == true, target() ignores every frequency but</div><div class='del'>- * locking_frequency. The locking_frequency value is the initial frequency,</div><div class='del'>- * which is set by the bootloader. In order to eliminate possible</div><div class='del'>- * inconsistency in clock values, we save and restore frequencies during</div><div class='del'>- * suspend and resume and block CPUFREQ activities. Note that the standard</div><div class='del'>- * suspend/resume cannot be used as they are too deep (syscore_ops) for</div><div class='del'>- * regulator actions.</div><div class='del'>- */</div><div class='del'>-static int exynos4_cpufreq_pm_notifier(struct notifier_block *notifier,</div><div class='del'>-				       unsigned long pm_event, void *v)</div><div class='del'>-{</div><div class='del'>-	struct cpufreq_policy *policy = cpufreq_cpu_get(0); /* boot CPU */</div><div class='del'>-	static unsigned int saved_frequency;</div><div class='del'>-	unsigned int temp;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;cpufreq_lock);</div><div class='del'>-	switch (pm_event) {</div><div class='del'>-	case PM_SUSPEND_PREPARE:</div><div class='del'>-		if (frequency_locked)</div><div class='del'>-			goto out;</div><div class='del'>-		frequency_locked = true;</div><div class='del'>-</div><div class='del'>-		if (locking_frequency) {</div><div class='del'>-			saved_frequency = exynos4_getspeed(0);</div><div class='del'>-</div><div class='del'>-			mutex_unlock(&amp;cpufreq_lock);</div><div class='del'>-			exynos4_target(policy, locking_frequency,</div><div class='del'>-				       CPUFREQ_RELATION_H);</div><div class='del'>-			mutex_lock(&amp;cpufreq_lock);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case PM_POST_SUSPEND:</div><div class='del'>-</div><div class='del'>-		if (saved_frequency) {</div><div class='del'>-			/*</div><div class='del'>-			 * While frequency_locked, only locking_frequency</div><div class='del'>-			 * is valid for target(). In order to use</div><div class='del'>-			 * saved_frequency while keeping frequency_locked,</div><div class='del'>-			 * we temporarly overwrite locking_frequency.</div><div class='del'>-			 */</div><div class='del'>-			temp = locking_frequency;</div><div class='del'>-			locking_frequency = saved_frequency;</div><div class='del'>-</div><div class='del'>-			mutex_unlock(&amp;cpufreq_lock);</div><div class='del'>-			exynos4_target(policy, locking_frequency,</div><div class='del'>-				       CPUFREQ_RELATION_H);</div><div class='del'>-			mutex_lock(&amp;cpufreq_lock);</div><div class='del'>-</div><div class='del'>-			locking_frequency = temp;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		frequency_locked = false;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;cpufreq_lock);</div><div class='del'>-</div><div class='del'>-	return NOTIFY_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block exynos4_cpufreq_nb = {</div><div class='del'>-	.notifier_call = exynos4_cpufreq_pm_notifier,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int exynos4_cpufreq_cpu_init(struct cpufreq_policy *policy)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	policy-&gt;cur = policy-&gt;min = policy-&gt;max = exynos4_getspeed(policy-&gt;cpu);</div><div class='del'>-</div><div class='del'>-	cpufreq_frequency_table_get_attr(exynos4_freq_table, policy-&gt;cpu);</div><div class='del'>-</div><div class='del'>-	/* set the transition latency value */</div><div class='del'>-	policy-&gt;cpuinfo.transition_latency = 100000;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * EXYNOS4 multi-core processors has 2 cores</div><div class='del'>-	 * that the frequency cannot be set independently.</div><div class='del'>-	 * Each cpu is bound to the same speed.</div><div class='del'>-	 * So the affected cpu is all of the cpus.</div><div class='del'>-	 */</div><div class='del'>-	cpumask_setall(policy-&gt;cpus);</div><div class='del'>-</div><div class='del'>-	ret = cpufreq_frequency_table_cpuinfo(policy, exynos4_freq_table);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	cpufreq_frequency_table_get_attr(exynos4_freq_table, policy-&gt;cpu);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int exynos4_cpufreq_cpu_exit(struct cpufreq_policy *policy)</div><div class='del'>-{</div><div class='del'>-	cpufreq_frequency_table_put_attr(policy-&gt;cpu);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct freq_attr *exynos4_cpufreq_attr[] = {</div><div class='del'>-	&amp;cpufreq_freq_attr_scaling_available_freqs,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cpufreq_driver exynos4_driver = {</div><div class='del'>-	.flags		= CPUFREQ_STICKY,</div><div class='del'>-	.verify		= exynos4_verify_speed,</div><div class='del'>-	.target		= exynos4_target,</div><div class='del'>-	.get		= exynos4_getspeed,</div><div class='del'>-	.init		= exynos4_cpufreq_cpu_init,</div><div class='del'>-	.exit		= exynos4_cpufreq_cpu_exit,</div><div class='del'>-	.name		= "exynos4_cpufreq",</div><div class='del'>-	.attr		= exynos4_cpufreq_attr,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend	= exynos4_cpufreq_suspend,</div><div class='del'>-	.resume		= exynos4_cpufreq_resume,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='add'>+	int i;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+	unsigned long rate;</div><div class='ctx'> </div><div class='del'>-static int __init exynos4_cpufreq_init(void)</div><div class='del'>-{</div><div class='ctx'> 	cpu_clk = clk_get(NULL, "armclk");</div><div class='ctx'> 	if (IS_ERR(cpu_clk))</div><div class='ctx'> 		return PTR_ERR(cpu_clk);</div><div class='ctx'> </div><div class='del'>-	locking_frequency = exynos4_getspeed(0);</div><div class='del'>-</div><div class='ctx'> 	moutcore = clk_get(NULL, "moutcore");</div><div class='ctx'> 	if (IS_ERR(moutcore))</div><div class='del'>-		goto out;</div><div class='add'>+		goto err_moutcore;</div><div class='ctx'> </div><div class='ctx'> 	mout_mpll = clk_get(NULL, "mout_mpll");</div><div class='ctx'> 	if (IS_ERR(mout_mpll))</div><div class='del'>-		goto out;</div><div class='add'>+		goto err_mout_mpll;</div><div class='add'>+</div><div class='add'>+	rate = clk_get_rate(mout_mpll) / 1000;</div><div class='ctx'> </div><div class='ctx'> 	mout_apll = clk_get(NULL, "mout_apll");</div><div class='ctx'> 	if (IS_ERR(mout_apll))</div><div class='del'>-		goto out;</div><div class='add'>+		goto err_mout_apll;</div><div class='ctx'> </div><div class='del'>-	arm_regulator = regulator_get(NULL, "vdd_arm");</div><div class='del'>-	if (IS_ERR(arm_regulator)) {</div><div class='del'>-		printk(KERN_ERR "failed to get resource %s\n", "vdd_arm");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	tmp = __raw_readl(S5P_CLKDIV_CPU);</div><div class='ctx'> </div><div class='del'>-	int_regulator = regulator_get(NULL, "vdd_int");</div><div class='del'>-	if (IS_ERR(int_regulator)) {</div><div class='del'>-		printk(KERN_ERR "failed to get resource %s\n", "vdd_int");</div><div class='del'>-		goto out;</div><div class='add'>+	for (i = L0; i &lt;  CPUFREQ_LEVEL_END; i++) {</div><div class='add'>+		tmp &amp;= ~(S5P_CLKDIV_CPU0_CORE_MASK |</div><div class='add'>+			S5P_CLKDIV_CPU0_COREM0_MASK |</div><div class='add'>+			S5P_CLKDIV_CPU0_COREM1_MASK |</div><div class='add'>+			S5P_CLKDIV_CPU0_PERIPH_MASK |</div><div class='add'>+			S5P_CLKDIV_CPU0_ATB_MASK |</div><div class='add'>+			S5P_CLKDIV_CPU0_PCLKDBG_MASK |</div><div class='add'>+			S5P_CLKDIV_CPU0_APLL_MASK);</div><div class='add'>+</div><div class='add'>+		tmp |= ((clkdiv_cpu0[i][0] &lt;&lt; S5P_CLKDIV_CPU0_CORE_SHIFT) |</div><div class='add'>+			(clkdiv_cpu0[i][1] &lt;&lt; S5P_CLKDIV_CPU0_COREM0_SHIFT) |</div><div class='add'>+			(clkdiv_cpu0[i][2] &lt;&lt; S5P_CLKDIV_CPU0_COREM1_SHIFT) |</div><div class='add'>+			(clkdiv_cpu0[i][3] &lt;&lt; S5P_CLKDIV_CPU0_PERIPH_SHIFT) |</div><div class='add'>+			(clkdiv_cpu0[i][4] &lt;&lt; S5P_CLKDIV_CPU0_ATB_SHIFT) |</div><div class='add'>+			(clkdiv_cpu0[i][5] &lt;&lt; S5P_CLKDIV_CPU0_PCLKDBG_SHIFT) |</div><div class='add'>+			(clkdiv_cpu0[i][6] &lt;&lt; S5P_CLKDIV_CPU0_APLL_SHIFT));</div><div class='add'>+</div><div class='add'>+		exynos4210_clkdiv_table[i].clkdiv = tmp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Check DRAM type.</div><div class='del'>-	 * Because DVFS level is different according to DRAM type.</div><div class='del'>-	 */</div><div class='del'>-	memtype = __raw_readl(S5P_VA_DMC0 + S5P_DMC0_MEMCON_OFFSET);</div><div class='del'>-	memtype = (memtype &gt;&gt; S5P_DMC0_MEMTYPE_SHIFT);</div><div class='del'>-	memtype &amp;= S5P_DMC0_MEMTYPE_MASK;</div><div class='del'>-</div><div class='del'>-	if ((memtype &lt; DDR2) &amp;&amp; (memtype &gt; DDR3)) {</div><div class='del'>-		printk(KERN_ERR "%s: wrong memtype= 0x%x\n", __func__, memtype);</div><div class='del'>-		goto out;</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_DEBUG "%s: memtype= 0x%x\n", __func__, memtype);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	register_pm_notifier(&amp;exynos4_cpufreq_nb);</div><div class='del'>-</div><div class='del'>-	return cpufreq_register_driver(&amp;exynos4_driver);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	if (!IS_ERR(cpu_clk))</div><div class='del'>-		clk_put(cpu_clk);</div><div class='add'>+	info-&gt;mpll_freq_khz = rate;</div><div class='add'>+	info-&gt;pm_lock_idx = L2;</div><div class='add'>+	info-&gt;pll_safe_idx = L2;</div><div class='add'>+	info-&gt;max_support_idx = max_support_idx;</div><div class='add'>+	info-&gt;min_support_idx = min_support_idx;</div><div class='add'>+	info-&gt;cpu_clk = cpu_clk;</div><div class='add'>+	info-&gt;volt_table = exynos4210_volt_table;</div><div class='add'>+	info-&gt;freq_table = exynos4210_freq_table;</div><div class='add'>+	info-&gt;set_freq = exynos4210_set_frequency;</div><div class='add'>+	info-&gt;need_apll_change = exynos4210_pms_change;</div><div class='ctx'> </div><div class='del'>-	if (!IS_ERR(moutcore))</div><div class='del'>-		clk_put(moutcore);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='add'>+err_mout_apll:</div><div class='ctx'> 	if (!IS_ERR(mout_mpll))</div><div class='ctx'> 		clk_put(mout_mpll);</div><div class='add'>+err_mout_mpll:</div><div class='add'>+	if (!IS_ERR(moutcore))</div><div class='add'>+		clk_put(moutcore);</div><div class='add'>+err_moutcore:</div><div class='add'>+	if (!IS_ERR(cpu_clk))</div><div class='add'>+		clk_put(cpu_clk);</div><div class='ctx'> </div><div class='del'>-	if (!IS_ERR(mout_apll))</div><div class='del'>-		clk_put(mout_apll);</div><div class='del'>-</div><div class='del'>-	if (!IS_ERR(arm_regulator))</div><div class='del'>-		regulator_put(arm_regulator);</div><div class='del'>-</div><div class='del'>-	if (!IS_ERR(int_regulator))</div><div class='del'>-		regulator_put(int_regulator);</div><div class='del'>-</div><div class='del'>-	printk(KERN_ERR "%s: failed initialization\n", __func__);</div><div class='del'>-</div><div class='add'>+	pr_debug("%s: failed initialization\n", __func__);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='del'>-late_initcall(exynos4_cpufreq_init);</div><div class='add'>+EXPORT_SYMBOL(exynos4210_cpufreq_init);</div><div class='head'>diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c<br/>new file mode 100644<br/>index 000000000000..5d04c57aae30<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/omap-cpufreq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/cpufreq/omap-cpufreq.c</a></div><div class='hunk'>@@ -0,0 +1,274 @@</div><div class='add'>+/*</div><div class='add'>+ *  CPU frequency scaling for OMAP using OPP information</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Nokia Corporation</div><div class='add'>+ *  Written by Tony Lindgren &lt;tony@atomide.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  Based on cpu-sa1110.c, Copyright (C) 2001 Russell King</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007-2011 Texas Instruments, Inc.</div><div class='add'>+ * - OMAP3/4 support by Rajendra Nayak, Santosh Shilimkar</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/cpufreq.h&gt;</div><div class='add'>+#include &lt;linux/delay.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/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/opp.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/smp_plat.h&gt;</div><div class='add'>+#include &lt;asm/cpu.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;plat/clock.h&gt;</div><div class='add'>+#include &lt;plat/omap-pm.h&gt;</div><div class='add'>+#include &lt;plat/common.h&gt;</div><div class='add'>+#include &lt;plat/omap_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;mach/hardware.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+struct lpj_info {</div><div class='add'>+	unsigned long	ref;</div><div class='add'>+	unsigned int	freq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_PER_CPU(struct lpj_info, lpj_ref);</div><div class='add'>+static struct lpj_info global_lpj_ref;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct cpufreq_frequency_table *freq_table;</div><div class='add'>+static atomic_t freq_table_users = ATOMIC_INIT(0);</div><div class='add'>+static struct clk *mpu_clk;</div><div class='add'>+static char *mpu_clk_name;</div><div class='add'>+static struct device *mpu_dev;</div><div class='add'>+</div><div class='add'>+static int omap_verify_speed(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	if (!freq_table)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return cpufreq_frequency_table_verify(policy, freq_table);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int omap_getspeed(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	unsigned long rate;</div><div class='add'>+</div><div class='add'>+	if (cpu &gt;= NR_CPUS)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rate = clk_get_rate(mpu_clk) / 1000;</div><div class='add'>+	return rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int omap_target(struct cpufreq_policy *policy,</div><div class='add'>+		       unsigned int target_freq,</div><div class='add'>+		       unsigned int relation)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct cpufreq_freqs freqs;</div><div class='add'>+</div><div class='add'>+	if (!freq_table) {</div><div class='add'>+		dev_err(mpu_dev, "%s: cpu%d: no freq table!\n", __func__,</div><div class='add'>+				policy-&gt;cpu);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cpufreq_frequency_table_target(policy, freq_table, target_freq,</div><div class='add'>+			relation, &amp;i);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_dbg(mpu_dev, "%s: cpu%d: no freq match for %d(ret=%d)\n",</div><div class='add'>+			__func__, policy-&gt;cpu, target_freq, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	freqs.new = freq_table[i].frequency;</div><div class='add'>+	if (!freqs.new) {</div><div class='add'>+		dev_err(mpu_dev, "%s: cpu%d: no match for freq %d\n", __func__,</div><div class='add'>+			policy-&gt;cpu, target_freq);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	freqs.old = omap_getspeed(policy-&gt;cpu);</div><div class='add'>+	freqs.cpu = policy-&gt;cpu;</div><div class='add'>+</div><div class='add'>+	if (freqs.old == freqs.new &amp;&amp; policy-&gt;cur == freqs.new)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* notifiers */</div><div class='add'>+	for_each_cpu(i, policy-&gt;cpus) {</div><div class='add'>+		freqs.cpu = i;</div><div class='add'>+		cpufreq_notify_transition(&amp;freqs, CPUFREQ_PRECHANGE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_FREQ_DEBUG</div><div class='add'>+	pr_info("cpufreq-omap: transition: %u --&gt; %u\n", freqs.old, freqs.new);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	ret = clk_set_rate(mpu_clk, freqs.new * 1000);</div><div class='add'>+	freqs.new = omap_getspeed(policy-&gt;cpu);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	/*</div><div class='add'>+	 * Note that loops_per_jiffy is not updated on SMP systems in</div><div class='add'>+	 * cpufreq driver. So, update the per-CPU loops_per_jiffy value</div><div class='add'>+	 * on frequency transition. We need to update all dependent CPUs.</div><div class='add'>+	 */</div><div class='add'>+	for_each_cpu(i, policy-&gt;cpus) {</div><div class='add'>+		struct lpj_info *lpj = &amp;per_cpu(lpj_ref, i);</div><div class='add'>+		if (!lpj-&gt;freq) {</div><div class='add'>+			lpj-&gt;ref = per_cpu(cpu_data, i).loops_per_jiffy;</div><div class='add'>+			lpj-&gt;freq = freqs.old;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		per_cpu(cpu_data, i).loops_per_jiffy =</div><div class='add'>+			cpufreq_scale(lpj-&gt;ref, lpj-&gt;freq, freqs.new);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* And don't forget to adjust the global one */</div><div class='add'>+	if (!global_lpj_ref.freq) {</div><div class='add'>+		global_lpj_ref.ref = loops_per_jiffy;</div><div class='add'>+		global_lpj_ref.freq = freqs.old;</div><div class='add'>+	}</div><div class='add'>+	loops_per_jiffy = cpufreq_scale(global_lpj_ref.ref, global_lpj_ref.freq,</div><div class='add'>+					freqs.new);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* notifiers */</div><div class='add'>+	for_each_cpu(i, policy-&gt;cpus) {</div><div class='add'>+		freqs.cpu = i;</div><div class='add'>+		cpufreq_notify_transition(&amp;freqs, CPUFREQ_POSTCHANGE);</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 inline void freq_table_free(void)</div><div class='add'>+{</div><div class='add'>+	if (atomic_dec_and_test(&amp;freq_table_users))</div><div class='add'>+		opp_free_cpufreq_table(mpu_dev, &amp;freq_table);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+</div><div class='add'>+	mpu_clk = clk_get(NULL, mpu_clk_name);</div><div class='add'>+	if (IS_ERR(mpu_clk))</div><div class='add'>+		return PTR_ERR(mpu_clk);</div><div class='add'>+</div><div class='add'>+	if (policy-&gt;cpu &gt;= NR_CPUS) {</div><div class='add'>+		result = -EINVAL;</div><div class='add'>+		goto fail_ck;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	policy-&gt;cur = policy-&gt;min = policy-&gt;max = omap_getspeed(policy-&gt;cpu);</div><div class='add'>+</div><div class='add'>+	if (atomic_inc_return(&amp;freq_table_users) == 1)</div><div class='add'>+		result = opp_init_cpufreq_table(mpu_dev, &amp;freq_table);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		dev_err(mpu_dev, "%s: cpu%d: failed creating freq table[%d]\n",</div><div class='add'>+				__func__, policy-&gt;cpu, result);</div><div class='add'>+		goto fail_ck;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = cpufreq_frequency_table_cpuinfo(policy, freq_table);</div><div class='add'>+	if (result)</div><div class='add'>+		goto fail_table;</div><div class='add'>+</div><div class='add'>+	cpufreq_frequency_table_get_attr(freq_table, policy-&gt;cpu);</div><div class='add'>+</div><div class='add'>+	policy-&gt;min = policy-&gt;cpuinfo.min_freq;</div><div class='add'>+	policy-&gt;max = policy-&gt;cpuinfo.max_freq;</div><div class='add'>+	policy-&gt;cur = omap_getspeed(policy-&gt;cpu);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * On OMAP SMP configuartion, both processors share the voltage</div><div class='add'>+	 * and clock. So both CPUs needs to be scaled together and hence</div><div class='add'>+	 * needs software co-ordination. Use cpufreq affected_cpus</div><div class='add'>+	 * interface to handle this scenario. Additional is_smp() check</div><div class='add'>+	 * is to keep SMP_ON_UP build working.</div><div class='add'>+	 */</div><div class='add'>+	if (is_smp()) {</div><div class='add'>+		policy-&gt;shared_type = CPUFREQ_SHARED_TYPE_ANY;</div><div class='add'>+		cpumask_setall(policy-&gt;cpus);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FIXME: what's the actual transition time? */</div><div class='add'>+	policy-&gt;cpuinfo.transition_latency = 300 * 1000;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_table:</div><div class='add'>+	freq_table_free();</div><div class='add'>+fail_ck:</div><div class='add'>+	clk_put(mpu_clk);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int omap_cpu_exit(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	freq_table_free();</div><div class='add'>+	clk_put(mpu_clk);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct freq_attr *omap_cpufreq_attr[] = {</div><div class='add'>+	&amp;cpufreq_freq_attr_scaling_available_freqs,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cpufreq_driver omap_driver = {</div><div class='add'>+	.flags		= CPUFREQ_STICKY,</div><div class='add'>+	.verify		= omap_verify_speed,</div><div class='add'>+	.target		= omap_target,</div><div class='add'>+	.get		= omap_getspeed,</div><div class='add'>+	.init		= omap_cpu_init,</div><div class='add'>+	.exit		= omap_cpu_exit,</div><div class='add'>+	.name		= "omap",</div><div class='add'>+	.attr		= omap_cpufreq_attr,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init omap_cpufreq_init(void)</div><div class='add'>+{</div><div class='add'>+	if (cpu_is_omap24xx())</div><div class='add'>+		mpu_clk_name = "virt_prcm_set";</div><div class='add'>+	else if (cpu_is_omap34xx())</div><div class='add'>+		mpu_clk_name = "dpll1_ck";</div><div class='add'>+	else if (cpu_is_omap44xx())</div><div class='add'>+		mpu_clk_name = "dpll_mpu_ck";</div><div class='add'>+</div><div class='add'>+	if (!mpu_clk_name) {</div><div class='add'>+		pr_err("%s: unsupported Silicon?\n", __func__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mpu_dev = omap_device_get_by_hwmod_name("mpu");</div><div class='add'>+	if (!mpu_dev) {</div><div class='add'>+		pr_warning("%s: unable to get the mpu device\n", __func__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return cpufreq_register_driver(&amp;omap_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit omap_cpufreq_exit(void)</div><div class='add'>+{</div><div class='add'>+	cpufreq_unregister_driver(&amp;omap_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("cpufreq driver for OMAP SoCs");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+module_init(omap_cpufreq_init);</div><div class='add'>+module_exit(omap_cpufreq_exit);</div><div class='head'>diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c<br/>index bce576d7478e..8f9b2ceeec85 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpufreq/powernow-k8.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/powernow-k8.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/powernow-k8.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/cpufreq/powernow-k8.c</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='ctx'> /*</div><div class='del'>- *   (c) 2003-2010 Advanced Micro Devices, Inc.</div><div class='add'>+ *   (c) 2003-2012 Advanced Micro Devices, Inc.</div><div class='ctx'>  *  Your use of this code is subject to the terms and conditions of the</div><div class='ctx'>  *  GNU general public license version 2. See "COPYING" or</div><div class='ctx'>  *  http://www.gnu.org/licenses/gpl.html</div><div class='ctx'>  *</div><div class='del'>- *  Support : mark.langsdorf@amd.com</div><div class='add'>+ *  Maintainer:</div><div class='add'>+ *  Andreas Herrmann &lt;andreas.herrmann3@amd.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  Based on the powernow-k7.c module written by Dave Jones.</div><div class='ctx'>  *  (C) 2003 Dave Jones on behalf of SuSE Labs</div><div class='hunk'>@@ -16,12 +17,14 @@</div><div class='ctx'>  *  Valuable input gratefully received from Dave Jones, Pavel Machek,</div><div class='ctx'>  *  Dominik Brodowski, Jacob Shin, and others.</div><div class='ctx'>  *  Originally developed by Paul Devriendt.</div><div class='del'>- *  Processor information obtained from Chapter 9 (Power and Thermal Management)</div><div class='del'>- *  of the "BIOS and Kernel Developer's Guide for the AMD Athlon 64 and AMD</div><div class='del'>- *  Opteron Processors" available for download from www.amd.com</div><div class='ctx'>  *</div><div class='del'>- *  Tables for specific CPUs can be inferred from</div><div class='del'>- *     http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/30430.pdf</div><div class='add'>+ *  Processor information obtained from Chapter 9 (Power and Thermal</div><div class='add'>+ *  Management) of the "BIOS and Kernel Developer's Guide (BKDG) for</div><div class='add'>+ *  the AMD Athlon 64 and AMD Opteron Processors" and section "2.x</div><div class='add'>+ *  Power Management" in BKDGs for newer AMD CPU families.</div><div class='add'>+ *</div><div class='add'>+ *  Tables for specific CPUs can be inferred from AMD's processor</div><div class='add'>+ *  power and thermal data sheets, (e.g. 30417.pdf, 30430.pdf, 43375.pdf)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -54,6 +57,9 @@ static DEFINE_PER_CPU(struct powernow_k8_data *, powernow_data);</div><div class='ctx'> </div><div class='ctx'> static int cpu_family = CPU_OPTERON;</div><div class='ctx'> </div><div class='add'>+/* array to map SW pstate number to acpi state */</div><div class='add'>+static u32 ps_to_as[8];</div><div class='add'>+</div><div class='ctx'> /* core performance boost */</div><div class='ctx'> static bool cpb_capable, cpb_enabled;</div><div class='ctx'> static struct msr __percpu *msrs;</div><div class='hunk'>@@ -80,9 +86,9 @@ static u32 find_khz_freq_from_fid(u32 fid)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 find_khz_freq_from_pstate(struct cpufreq_frequency_table *data,</div><div class='del'>-		u32 pstate)</div><div class='add'>+				     u32 pstate)</div><div class='ctx'> {</div><div class='del'>-	return data[pstate].frequency;</div><div class='add'>+	return data[ps_to_as[pstate]].frequency;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Return the vco fid for an input fid</div><div class='hunk'>@@ -926,23 +932,27 @@ static int fill_powernow_table_pstate(struct powernow_k8_data *data,</div><div class='ctx'> 			invalidate_entry(powernow_table, i);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		rdmsr(MSR_PSTATE_DEF_BASE + index, lo, hi);</div><div class='del'>-		if (!(hi &amp; HW_PSTATE_VALID_MASK)) {</div><div class='del'>-			pr_debug("invalid pstate %d, ignoring\n", index);</div><div class='del'>-			invalidate_entry(powernow_table, i);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		powernow_table[i].index = index;</div><div class='add'>+		ps_to_as[index] = i;</div><div class='ctx'> </div><div class='ctx'> 		/* Frequency may be rounded for these */</div><div class='ctx'> 		if ((boot_cpu_data.x86 == 0x10 &amp;&amp; boot_cpu_data.x86_model &lt; 10)</div><div class='ctx'> 				 || boot_cpu_data.x86 == 0x11) {</div><div class='add'>+</div><div class='add'>+			rdmsr(MSR_PSTATE_DEF_BASE + index, lo, hi);</div><div class='add'>+			if (!(hi &amp; HW_PSTATE_VALID_MASK)) {</div><div class='add'>+				pr_debug("invalid pstate %d, ignoring\n", index);</div><div class='add'>+				invalidate_entry(powernow_table, i);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			powernow_table[i].frequency =</div><div class='ctx'> 				freq_from_fid_did(lo &amp; 0x3f, (lo &gt;&gt; 6) &amp; 7);</div><div class='ctx'> 		} else</div><div class='ctx'> 			powernow_table[i].frequency =</div><div class='ctx'> 				data-&gt;acpi_data.states[i].core_frequency * 1000;</div><div class='add'>+</div><div class='add'>+		powernow_table[i].index = index;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1189,7 +1199,8 @@ static int powernowk8_target(struct cpufreq_policy *pol,</div><div class='ctx'> 	powernow_k8_acpi_pst_values(data, newstate);</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_family == CPU_HW_PSTATE)</div><div class='del'>-		ret = transition_frequency_pstate(data, newstate);</div><div class='add'>+		ret = transition_frequency_pstate(data,</div><div class='add'>+			data-&gt;powernow_table[newstate].index);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = transition_frequency_fidvid(data, newstate);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -1202,7 +1213,7 @@ static int powernowk8_target(struct cpufreq_policy *pol,</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_family == CPU_HW_PSTATE)</div><div class='ctx'> 		pol-&gt;cur = find_khz_freq_from_pstate(data-&gt;powernow_table,</div><div class='del'>-				newstate);</div><div class='add'>+				data-&gt;powernow_table[newstate].index);</div><div class='ctx'> 	else</div><div class='ctx'> 		pol-&gt;cur = find_khz_freq_from_fid(data-&gt;currfid);</div><div class='ctx'> 	ret = 0;</div><div class='head'>diff --git a/drivers/cpufreq/s3c64xx-cpufreq.c b/drivers/cpufreq/s3c64xx-cpufreq.c<br/>index 3475f65aeec6..a5e72cb5f53c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpufreq/s3c64xx-cpufreq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpufreq/s3c64xx-cpufreq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/s3c64xx-cpufreq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/cpufreq/s3c64xx-cpufreq.c</a></div><div class='hunk'>@@ -8,6 +8,8 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define pr_fmt(fmt) "cpufreq: " fmt</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -91,7 +93,7 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,</div><div class='ctx'> 	if (freqs.old == freqs.new)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	pr_debug("cpufreq: Transition %d-%dkHz\n", freqs.old, freqs.new);</div><div class='add'>+	pr_debug("Transition %d-%dkHz\n", freqs.old, freqs.new);</div><div class='ctx'> </div><div class='ctx'> 	cpufreq_notify_transition(&amp;freqs, CPUFREQ_PRECHANGE);</div><div class='ctx'> </div><div class='hunk'>@@ -101,7 +103,7 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,</div><div class='ctx'> 					    dvfs-&gt;vddarm_min,</div><div class='ctx'> 					    dvfs-&gt;vddarm_max);</div><div class='ctx'> 		if (ret != 0) {</div><div class='del'>-			pr_err("cpufreq: Failed to set VDDARM for %dkHz: %d\n",</div><div class='add'>+			pr_err("Failed to set VDDARM for %dkHz: %d\n",</div><div class='ctx'> 			       freqs.new, ret);</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -110,7 +112,7 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,</div><div class='ctx'> </div><div class='ctx'> 	ret = clk_set_rate(armclk, freqs.new * 1000);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		pr_err("cpufreq: Failed to set rate %dkHz: %d\n",</div><div class='add'>+		pr_err("Failed to set rate %dkHz: %d\n",</div><div class='ctx'> 		       freqs.new, ret);</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -123,14 +125,14 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,</div><div class='ctx'> 					    dvfs-&gt;vddarm_min,</div><div class='ctx'> 					    dvfs-&gt;vddarm_max);</div><div class='ctx'> 		if (ret != 0) {</div><div class='del'>-			pr_err("cpufreq: Failed to set VDDARM for %dkHz: %d\n",</div><div class='add'>+			pr_err("Failed to set VDDARM for %dkHz: %d\n",</div><div class='ctx'> 			       freqs.new, ret);</div><div class='ctx'> 			goto err_clk;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	pr_debug("cpufreq: Set actual frequency %lukHz\n",</div><div class='add'>+	pr_debug("Set actual frequency %lukHz\n",</div><div class='ctx'> 		 clk_get_rate(armclk) / 1000);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -153,7 +155,7 @@ static void __init s3c64xx_cpufreq_config_regulator(void)</div><div class='ctx'> </div><div class='ctx'> 	count = regulator_count_voltages(vddarm);</div><div class='ctx'> 	if (count &lt; 0) {</div><div class='del'>-		pr_err("cpufreq: Unable to check supported voltages\n");</div><div class='add'>+		pr_err("Unable to check supported voltages\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	freq = s3c64xx_freq_table;</div><div class='hunk'>@@ -171,7 +173,7 @@ static void __init s3c64xx_cpufreq_config_regulator(void)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!found) {</div><div class='del'>-			pr_debug("cpufreq: %dkHz unsupported by regulator\n",</div><div class='add'>+			pr_debug("%dkHz unsupported by regulator\n",</div><div class='ctx'> 				 freq-&gt;frequency);</div><div class='ctx'> 			freq-&gt;frequency = CPUFREQ_ENTRY_INVALID;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -194,13 +196,13 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (s3c64xx_freq_table == NULL) {</div><div class='del'>-		pr_err("cpufreq: No frequency information for this CPU\n");</div><div class='add'>+		pr_err("No frequency information for this CPU\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	armclk = clk_get(NULL, "armclk");</div><div class='ctx'> 	if (IS_ERR(armclk)) {</div><div class='del'>-		pr_err("cpufreq: Unable to obtain ARMCLK: %ld\n",</div><div class='add'>+		pr_err("Unable to obtain ARMCLK: %ld\n",</div><div class='ctx'> 		       PTR_ERR(armclk));</div><div class='ctx'> 		return PTR_ERR(armclk);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -209,12 +211,19 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	vddarm = regulator_get(NULL, "vddarm");</div><div class='ctx'> 	if (IS_ERR(vddarm)) {</div><div class='ctx'> 		ret = PTR_ERR(vddarm);</div><div class='del'>-		pr_err("cpufreq: Failed to obtain VDDARM: %d\n", ret);</div><div class='del'>-		pr_err("cpufreq: Only frequency scaling available\n");</div><div class='add'>+		pr_err("Failed to obtain VDDARM: %d\n", ret);</div><div class='add'>+		pr_err("Only frequency scaling available\n");</div><div class='ctx'> 		vddarm = NULL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		s3c64xx_cpufreq_config_regulator();</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	vddint = regulator_get(NULL, "vddint");</div><div class='add'>+	if (IS_ERR(vddint)) {</div><div class='add'>+		ret = PTR_ERR(vddint);</div><div class='add'>+		pr_err("Failed to obtain VDDINT: %d\n", ret);</div><div class='add'>+		vddint = NULL;</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	freq = s3c64xx_freq_table;</div><div class='hunk'>@@ -225,7 +234,7 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)</div><div class='ctx'> 		r = clk_round_rate(armclk, freq-&gt;frequency * 1000);</div><div class='ctx'> 		r /= 1000;</div><div class='ctx'> 		if (r != freq-&gt;frequency) {</div><div class='del'>-			pr_debug("cpufreq: %dkHz unsupported by clock\n",</div><div class='add'>+			pr_debug("%dkHz unsupported by clock\n",</div><div class='ctx'> 				 freq-&gt;frequency);</div><div class='ctx'> 			freq-&gt;frequency = CPUFREQ_ENTRY_INVALID;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -248,7 +257,7 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)</div><div class='ctx'> </div><div class='ctx'> 	ret = cpufreq_frequency_table_cpuinfo(policy, s3c64xx_freq_table);</div><div class='ctx'> 	if (ret != 0) {</div><div class='del'>-		pr_err("cpufreq: Failed to configure frequency table: %d\n",</div><div class='add'>+		pr_err("Failed to configure frequency table: %d\n",</div><div class='ctx'> 		       ret);</div><div class='ctx'> 		regulator_put(vddarm);</div><div class='ctx'> 		clk_put(armclk);</div><div class='head'>diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c<br/>index 06ce2680d00d..59f4261c753a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpuidle/cpuidle.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpuidle/cpuidle.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpuidle/cpuidle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/cpuidle/cpuidle.c</a></div><div class='hunk'>@@ -291,10 +291,10 @@ EXPORT_SYMBOL_GPL(cpuidle_disable_device);</div><div class='ctx'> static int __cpuidle_register_device(struct cpuidle_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct sys_device *sys_dev = get_cpu_sysdev((unsigned long)dev-&gt;cpu);</div><div class='add'>+	struct device *cpu_dev = get_cpu_device((unsigned long)dev-&gt;cpu);</div><div class='ctx'> 	struct cpuidle_driver *cpuidle_driver = cpuidle_get_driver();</div><div class='ctx'> </div><div class='del'>-	if (!sys_dev)</div><div class='add'>+	if (!dev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (!try_module_get(cpuidle_driver-&gt;owner))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -303,7 +303,7 @@ static int __cpuidle_register_device(struct cpuidle_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	per_cpu(cpuidle_devices, dev-&gt;cpu) = dev;</div><div class='ctx'> 	list_add(&amp;dev-&gt;device_list, &amp;cpuidle_detected_devices);</div><div class='del'>-	if ((ret = cpuidle_add_sysfs(sys_dev))) {</div><div class='add'>+	if ((ret = cpuidle_add_sysfs(cpu_dev))) {</div><div class='ctx'> 		module_put(cpuidle_driver-&gt;owner);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -344,7 +344,7 @@ EXPORT_SYMBOL_GPL(cpuidle_register_device);</div><div class='ctx'>  */</div><div class='ctx'> void cpuidle_unregister_device(struct cpuidle_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct sys_device *sys_dev = get_cpu_sysdev((unsigned long)dev-&gt;cpu);</div><div class='add'>+	struct device *cpu_dev = get_cpu_device((unsigned long)dev-&gt;cpu);</div><div class='ctx'> 	struct cpuidle_driver *cpuidle_driver = cpuidle_get_driver();</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;registered == 0)</div><div class='hunk'>@@ -354,7 +354,7 @@ void cpuidle_unregister_device(struct cpuidle_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	cpuidle_disable_device(dev);</div><div class='ctx'> </div><div class='del'>-	cpuidle_remove_sysfs(sys_dev);</div><div class='add'>+	cpuidle_remove_sysfs(cpu_dev);</div><div class='ctx'> 	list_del(&amp;dev-&gt;device_list);</div><div class='ctx'> 	wait_for_completion(&amp;dev-&gt;kobj_unregister);</div><div class='ctx'> 	per_cpu(cpuidle_devices, dev-&gt;cpu) = NULL;</div><div class='hunk'>@@ -411,7 +411,7 @@ static int __init cpuidle_init(void)</div><div class='ctx'> 	if (cpuidle_disabled())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	ret = cpuidle_add_class_sysfs(&amp;cpu_sysdev_class);</div><div class='add'>+	ret = cpuidle_add_interface(cpu_subsys.dev_root);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cpuidle/cpuidle.h b/drivers/cpuidle/cpuidle.h<br/>index 38c3fd8b9d76..7db186685c27 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpuidle/cpuidle.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpuidle/cpuidle.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpuidle/cpuidle.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/cpuidle/cpuidle.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> #ifndef __DRIVER_CPUIDLE_H</div><div class='ctx'> #define __DRIVER_CPUIDLE_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* For internal use only */</div><div class='ctx'> extern struct cpuidle_governor *cpuidle_curr_governor;</div><div class='hunk'>@@ -23,11 +23,11 @@ extern void cpuidle_uninstall_idle_handler(void);</div><div class='ctx'> extern int cpuidle_switch_governor(struct cpuidle_governor *gov);</div><div class='ctx'> </div><div class='ctx'> /* sysfs */</div><div class='del'>-extern int cpuidle_add_class_sysfs(struct sysdev_class *cls);</div><div class='del'>-extern void cpuidle_remove_class_sysfs(struct sysdev_class *cls);</div><div class='add'>+extern int cpuidle_add_interface(struct device *dev);</div><div class='add'>+extern void cpuidle_remove_interface(struct device *dev);</div><div class='ctx'> extern int cpuidle_add_state_sysfs(struct cpuidle_device *device);</div><div class='ctx'> extern void cpuidle_remove_state_sysfs(struct cpuidle_device *device);</div><div class='del'>-extern int cpuidle_add_sysfs(struct sys_device *sysdev);</div><div class='del'>-extern void cpuidle_remove_sysfs(struct sys_device *sysdev);</div><div class='add'>+extern int cpuidle_add_sysfs(struct device *dev);</div><div class='add'>+extern void cpuidle_remove_sysfs(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> #endif /* __DRIVER_CPUIDLE_H */</div><div class='head'>diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c<br/>index 1e756e160dca..3fe41fe4851a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpuidle/sysfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/cpuidle/sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpuidle/sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/cpuidle/sysfs.c</a></div><div class='hunk'>@@ -22,8 +22,8 @@ static int __init cpuidle_sysfs_setup(char *unused)</div><div class='ctx'> }</div><div class='ctx'> __setup("cpuidle_sysfs_switch", cpuidle_sysfs_setup);</div><div class='ctx'> </div><div class='del'>-static ssize_t show_available_governors(struct sysdev_class *class,</div><div class='del'>-					struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t show_available_governors(struct device *dev,</div><div class='add'>+					struct device_attribute *attr,</div><div class='ctx'> 					char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t i = 0;</div><div class='hunk'>@@ -42,8 +42,8 @@ out:</div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_current_driver(struct sysdev_class *class,</div><div class='del'>-				   struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t show_current_driver(struct device *dev,</div><div class='add'>+				   struct device_attribute *attr,</div><div class='ctx'> 				   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t ret;</div><div class='hunk'>@@ -59,8 +59,8 @@ static ssize_t show_current_driver(struct sysdev_class *class,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_current_governor(struct sysdev_class *class,</div><div class='del'>-				     struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t show_current_governor(struct device *dev,</div><div class='add'>+				     struct device_attribute *attr,</div><div class='ctx'> 				     char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t ret;</div><div class='hunk'>@@ -75,8 +75,8 @@ static ssize_t show_current_governor(struct sysdev_class *class,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_current_governor(struct sysdev_class *class,</div><div class='del'>-				      struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t store_current_governor(struct device *dev,</div><div class='add'>+				      struct device_attribute *attr,</div><div class='ctx'> 				      const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	char gov_name[CPUIDLE_NAME_LEN];</div><div class='hunk'>@@ -109,50 +109,48 @@ static ssize_t store_current_governor(struct sysdev_class *class,</div><div class='ctx'> 		return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(current_driver, 0444, show_current_driver, NULL);</div><div class='del'>-static SYSDEV_CLASS_ATTR(current_governor_ro, 0444, show_current_governor,</div><div class='del'>-			 NULL);</div><div class='add'>+static DEVICE_ATTR(current_driver, 0444, show_current_driver, NULL);</div><div class='add'>+static DEVICE_ATTR(current_governor_ro, 0444, show_current_governor, NULL);</div><div class='ctx'> </div><div class='del'>-static struct attribute *cpuclass_default_attrs[] = {</div><div class='del'>-	&amp;attr_current_driver.attr,</div><div class='del'>-	&amp;attr_current_governor_ro.attr,</div><div class='add'>+static struct attribute *cpuidle_default_attrs[] = {</div><div class='add'>+	&amp;dev_attr_current_driver.attr,</div><div class='add'>+	&amp;dev_attr_current_governor_ro.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(available_governors, 0444, show_available_governors,</div><div class='del'>-			 NULL);</div><div class='del'>-static SYSDEV_CLASS_ATTR(current_governor, 0644, show_current_governor,</div><div class='del'>-			 store_current_governor);</div><div class='add'>+static DEVICE_ATTR(available_governors, 0444, show_available_governors, NULL);</div><div class='add'>+static DEVICE_ATTR(current_governor, 0644, show_current_governor,</div><div class='add'>+		   store_current_governor);</div><div class='ctx'> </div><div class='del'>-static struct attribute *cpuclass_switch_attrs[] = {</div><div class='del'>-	&amp;attr_available_governors.attr,</div><div class='del'>-	&amp;attr_current_driver.attr,</div><div class='del'>-	&amp;attr_current_governor.attr,</div><div class='add'>+static struct attribute *cpuidle_switch_attrs[] = {</div><div class='add'>+	&amp;dev_attr_available_governors.attr,</div><div class='add'>+	&amp;dev_attr_current_driver.attr,</div><div class='add'>+	&amp;dev_attr_current_governor.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct attribute_group cpuclass_attr_group = {</div><div class='del'>-	.attrs = cpuclass_default_attrs,</div><div class='add'>+static struct attribute_group cpuidle_attr_group = {</div><div class='add'>+	.attrs = cpuidle_default_attrs,</div><div class='ctx'> 	.name = "cpuidle",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * cpuidle_add_class_sysfs - add CPU global sysfs attributes</div><div class='add'>+ * cpuidle_add_interface - add CPU global sysfs attributes</div><div class='ctx'>  */</div><div class='del'>-int cpuidle_add_class_sysfs(struct sysdev_class *cls)</div><div class='add'>+int cpuidle_add_interface(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (sysfs_switch)</div><div class='del'>-		cpuclass_attr_group.attrs = cpuclass_switch_attrs;</div><div class='add'>+		cpuidle_attr_group.attrs = cpuidle_switch_attrs;</div><div class='ctx'> </div><div class='del'>-	return sysfs_create_group(&amp;cls-&gt;kset.kobj, &amp;cpuclass_attr_group);</div><div class='add'>+	return sysfs_create_group(&amp;dev-&gt;kobj, &amp;cpuidle_attr_group);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * cpuidle_remove_class_sysfs - remove CPU global sysfs attributes</div><div class='add'>+ * cpuidle_remove_interface - remove CPU global sysfs attributes</div><div class='ctx'>  */</div><div class='del'>-void cpuidle_remove_class_sysfs(struct sysdev_class *cls)</div><div class='add'>+void cpuidle_remove_interface(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	sysfs_remove_group(&amp;cls-&gt;kset.kobj, &amp;cpuclass_attr_group);</div><div class='add'>+	sysfs_remove_group(&amp;dev-&gt;kobj, &amp;cpuidle_attr_group);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct cpuidle_attr {</div><div class='hunk'>@@ -365,16 +363,16 @@ void cpuidle_remove_state_sysfs(struct cpuidle_device *device)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cpuidle_add_sysfs - creates a sysfs instance for the target device</div><div class='del'>- * @sysdev: the target device</div><div class='add'>+ * @dev: the target device</div><div class='ctx'>  */</div><div class='del'>-int cpuidle_add_sysfs(struct sys_device *sysdev)</div><div class='add'>+int cpuidle_add_sysfs(struct device *cpu_dev)</div><div class='ctx'> {</div><div class='del'>-	int cpu = sysdev-&gt;id;</div><div class='add'>+	int cpu = cpu_dev-&gt;id;</div><div class='ctx'> 	struct cpuidle_device *dev;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	dev = per_cpu(cpuidle_devices, cpu);</div><div class='del'>-	error = kobject_init_and_add(&amp;dev-&gt;kobj, &amp;ktype_cpuidle, &amp;sysdev-&gt;kobj,</div><div class='add'>+	error = kobject_init_and_add(&amp;dev-&gt;kobj, &amp;ktype_cpuidle, &amp;cpu_dev-&gt;kobj,</div><div class='ctx'> 				     "cpuidle");</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		kobject_uevent(&amp;dev-&gt;kobj, KOBJ_ADD);</div><div class='hunk'>@@ -383,11 +381,11 @@ int cpuidle_add_sysfs(struct sys_device *sysdev)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cpuidle_remove_sysfs - deletes a sysfs instance on the target device</div><div class='del'>- * @sysdev: the target device</div><div class='add'>+ * @dev: the target device</div><div class='ctx'>  */</div><div class='del'>-void cpuidle_remove_sysfs(struct sys_device *sysdev)</div><div class='add'>+void cpuidle_remove_sysfs(struct device *cpu_dev)</div><div class='ctx'> {</div><div class='del'>-	int cpu = sysdev-&gt;id;</div><div class='add'>+	int cpu = cpu_dev-&gt;id;</div><div class='ctx'> 	struct cpuidle_device *dev;</div><div class='ctx'> </div><div class='ctx'> 	dev = per_cpu(cpuidle_devices, cpu);</div><div class='head'>diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c<br/>index 1d103f997dc2..13f8e1a14988 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/crypto/amcc/crypto4xx_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/amcc/crypto4xx_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/crypto/amcc/crypto4xx_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/crypto/amcc/crypto4xx_core.c</a></div><div class='hunk'>@@ -1292,18 +1292,7 @@ static struct platform_driver crypto4xx_driver = {</div><div class='ctx'> 	.remove		= crypto4xx_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init crypto4xx_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;crypto4xx_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit crypto4xx_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;crypto4xx_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(crypto4xx_init);</div><div class='del'>-module_exit(crypto4xx_exit);</div><div class='add'>+module_platform_driver(crypto4xx_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("James Hsiao &lt;jhsiao@amcc.com&gt;");</div><div class='head'>diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c<br/>index 4159265b453b..e73cf2e8110a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/crypto/caam/caamalg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/caam/caamalg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/crypto/caam/caamalg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/crypto/caam/caamalg.c</a></div><div class='hunk'>@@ -113,7 +113,7 @@ static inline void append_dec_shr_done(u32 *desc)</div><div class='ctx'> </div><div class='ctx'> 	jump_cmd = append_jump(desc, JUMP_CLASS_CLASS1 | JUMP_TEST_ALL);</div><div class='ctx'> 	set_jump_tgt_here(desc, jump_cmd);</div><div class='del'>-	append_cmd(desc, SET_OK_PROP_ERRORS | CMD_LOAD);</div><div class='add'>+	append_cmd(desc, SET_OK_NO_PROP_ERRORS | CMD_LOAD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -213,7 +213,7 @@ static void init_sh_desc_key_aead(u32 *desc, struct caam_ctx *ctx,</div><div class='ctx'> 	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='ctx'> </div><div class='ctx'> 	/* Propagate errors from shared to job descriptor */</div><div class='del'>-	append_cmd(desc, SET_OK_PROP_ERRORS | CMD_LOAD);</div><div class='add'>+	append_cmd(desc, SET_OK_NO_PROP_ERRORS | CMD_LOAD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aead_set_sh_desc(struct crypto_aead *aead)</div><div class='hunk'>@@ -310,7 +310,7 @@ static int aead_set_sh_desc(struct crypto_aead *aead)</div><div class='ctx'> 	/* Only propagate error immediately if shared */</div><div class='ctx'> 	jump_cmd = append_jump(desc, JUMP_TEST_ALL);</div><div class='ctx'> 	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='del'>-	append_cmd(desc, SET_OK_PROP_ERRORS | CMD_LOAD);</div><div class='add'>+	append_cmd(desc, SET_OK_NO_PROP_ERRORS | CMD_LOAD);</div><div class='ctx'> 	set_jump_tgt_here(desc, jump_cmd);</div><div class='ctx'> </div><div class='ctx'> 	/* Class 2 operation */</div><div class='hunk'>@@ -683,7 +683,7 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,</div><div class='ctx'> 	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='ctx'> </div><div class='ctx'> 	/* Propagate errors from shared to job descriptor */</div><div class='del'>-	append_cmd(desc, SET_OK_PROP_ERRORS | CMD_LOAD);</div><div class='add'>+	append_cmd(desc, SET_OK_NO_PROP_ERRORS | CMD_LOAD);</div><div class='ctx'> </div><div class='ctx'> 	/* Load iv */</div><div class='ctx'> 	append_cmd(desc, CMD_SEQ_LOAD | LDST_SRCDST_BYTE_CONTEXT |</div><div class='hunk'>@@ -724,7 +724,7 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,</div><div class='ctx'> 	/* For aead, only propagate error immediately if shared */</div><div class='ctx'> 	jump_cmd = append_jump(desc, JUMP_TEST_ALL);</div><div class='ctx'> 	set_jump_tgt_here(desc, key_jump_cmd);</div><div class='del'>-	append_cmd(desc, SET_OK_PROP_ERRORS | CMD_LOAD);</div><div class='add'>+	append_cmd(desc, SET_OK_NO_PROP_ERRORS | CMD_LOAD);</div><div class='ctx'> 	set_jump_tgt_here(desc, jump_cmd);</div><div class='ctx'> </div><div class='ctx'> 	/* load IV */</div><div class='hunk'>@@ -1806,6 +1806,25 @@ struct caam_alg_template {</div><div class='ctx'> static struct caam_alg_template driver_algs[] = {</div><div class='ctx'> 	/* single-pass ipsec_esp descriptor */</div><div class='ctx'> 	{</div><div class='add'>+		.name = "authenc(hmac(md5),cbc(aes))",</div><div class='add'>+		.driver_name = "authenc-hmac-md5-cbc-aes-caam",</div><div class='add'>+		.blocksize = AES_BLOCK_SIZE,</div><div class='add'>+		.type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+		.template_aead = {</div><div class='add'>+			.setkey = aead_setkey,</div><div class='add'>+			.setauthsize = aead_setauthsize,</div><div class='add'>+			.encrypt = aead_encrypt,</div><div class='add'>+			.decrypt = aead_decrypt,</div><div class='add'>+			.givencrypt = aead_givencrypt,</div><div class='add'>+			.geniv = "&lt;built-in&gt;",</div><div class='add'>+			.ivsize = AES_BLOCK_SIZE,</div><div class='add'>+			.maxauthsize = MD5_DIGEST_SIZE,</div><div class='add'>+			},</div><div class='add'>+		.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC,</div><div class='add'>+		.class2_alg_type = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC_PRECOMP,</div><div class='add'>+		.alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.name = "authenc(hmac(sha1),cbc(aes))",</div><div class='ctx'> 		.driver_name = "authenc-hmac-sha1-cbc-aes-caam",</div><div class='ctx'> 		.blocksize = AES_BLOCK_SIZE,</div><div class='hunk'>@@ -1865,6 +1884,25 @@ static struct caam_alg_template driver_algs[] = {</div><div class='ctx'> 		.alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.name = "authenc(hmac(md5),cbc(des3_ede))",</div><div class='add'>+		.driver_name = "authenc-hmac-md5-cbc-des3_ede-caam",</div><div class='add'>+		.blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+		.type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+		.template_aead = {</div><div class='add'>+			.setkey = aead_setkey,</div><div class='add'>+			.setauthsize = aead_setauthsize,</div><div class='add'>+			.encrypt = aead_encrypt,</div><div class='add'>+			.decrypt = aead_decrypt,</div><div class='add'>+			.givencrypt = aead_givencrypt,</div><div class='add'>+			.geniv = "&lt;built-in&gt;",</div><div class='add'>+			.ivsize = DES3_EDE_BLOCK_SIZE,</div><div class='add'>+			.maxauthsize = MD5_DIGEST_SIZE,</div><div class='add'>+			},</div><div class='add'>+		.class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC,</div><div class='add'>+		.class2_alg_type = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC_PRECOMP,</div><div class='add'>+		.alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.name = "authenc(hmac(sha1),cbc(des3_ede))",</div><div class='ctx'> 		.driver_name = "authenc-hmac-sha1-cbc-des3_ede-caam",</div><div class='ctx'> 		.blocksize = DES3_EDE_BLOCK_SIZE,</div><div class='hunk'>@@ -1924,6 +1962,25 @@ static struct caam_alg_template driver_algs[] = {</div><div class='ctx'> 		.alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.name = "authenc(hmac(md5),cbc(des))",</div><div class='add'>+		.driver_name = "authenc-hmac-md5-cbc-des-caam",</div><div class='add'>+		.blocksize = DES_BLOCK_SIZE,</div><div class='add'>+		.type = CRYPTO_ALG_TYPE_AEAD,</div><div class='add'>+		.template_aead = {</div><div class='add'>+			.setkey = aead_setkey,</div><div class='add'>+			.setauthsize = aead_setauthsize,</div><div class='add'>+			.encrypt = aead_encrypt,</div><div class='add'>+			.decrypt = aead_decrypt,</div><div class='add'>+			.givencrypt = aead_givencrypt,</div><div class='add'>+			.geniv = "&lt;built-in&gt;",</div><div class='add'>+			.ivsize = DES_BLOCK_SIZE,</div><div class='add'>+			.maxauthsize = MD5_DIGEST_SIZE,</div><div class='add'>+			},</div><div class='add'>+		.class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC,</div><div class='add'>+		.class2_alg_type = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC_PRECOMP,</div><div class='add'>+		.alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.name = "authenc(hmac(sha1),cbc(des))",</div><div class='ctx'> 		.driver_name = "authenc-hmac-sha1-cbc-des-caam",</div><div class='ctx'> 		.blocksize = DES_BLOCK_SIZE,</div><div class='head'>diff --git a/drivers/crypto/caam/compat.h b/drivers/crypto/caam/compat.h<br/>index d38f2afaa966..a63bc65fae86 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/crypto/caam/compat.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/caam/compat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/crypto/caam/compat.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/crypto/caam/compat.h</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;crypto/aes.h&gt;</div><div class='ctx'> #include &lt;crypto/des.h&gt;</div><div class='ctx'> #include &lt;crypto/sha.h&gt;</div><div class='add'>+#include &lt;crypto/md5.h&gt;</div><div class='ctx'> #include &lt;crypto/aead.h&gt;</div><div class='ctx'> #include &lt;crypto/authenc.h&gt;</div><div class='ctx'> #include &lt;crypto/scatterwalk.h&gt;</div><div class='head'>diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c<br/>index 73988bb7322a..8ae3ba2a160d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/crypto/caam/ctrl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/caam/ctrl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/crypto/caam/ctrl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/crypto/caam/ctrl.c</a></div><div class='hunk'>@@ -52,8 +52,6 @@ static int caam_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct caam_ctrl __iomem *ctrl;</div><div class='ctx'> 	struct caam_full __iomem *topregs;</div><div class='ctx'> 	struct caam_drv_private *ctrlpriv;</div><div class='del'>-	struct caam_deco **deco;</div><div class='del'>-	u32 deconum;</div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='ctx'> 	struct caam_perfmon *perfmon;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -92,17 +90,6 @@ static int caam_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (sizeof(dma_addr_t) == sizeof(u64))</div><div class='ctx'> 		dma_set_mask(dev, DMA_BIT_MASK(36));</div><div class='ctx'> </div><div class='del'>-	/* Find out how many DECOs are present */</div><div class='del'>-	deconum = (rd_reg64(&amp;topregs-&gt;ctrl.perfmon.cha_num) &amp;</div><div class='del'>-		   CHA_NUM_DECONUM_MASK) &gt;&gt; CHA_NUM_DECONUM_SHIFT;</div><div class='del'>-</div><div class='del'>-	ctrlpriv-&gt;deco = kmalloc(deconum * sizeof(struct caam_deco *),</div><div class='del'>-				 GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	deco = (struct caam_deco __force **)&amp;topregs-&gt;deco;</div><div class='del'>-	for (d = 0; d &lt; deconum; d++)</div><div class='del'>-		ctrlpriv-&gt;deco[d] = deco[d];</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Detect and enable JobRs</div><div class='ctx'> 	 * First, find out how many ring spec'ed, allocate references</div><div class='hunk'>@@ -253,18 +240,7 @@ static struct platform_driver caam_driver = {</div><div class='ctx'> 	.remove      = __devexit_p(caam_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init caam_base_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;caam_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit caam_base_exit(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_unregister(&amp;caam_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(caam_base_init);</div><div class='del'>-module_exit(caam_base_exit);</div><div class='add'>+module_platform_driver(caam_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("FSL CAAM request backend");</div><div class='head'>diff --git a/drivers/crypto/caam/desc.h b/drivers/crypto/caam/desc.h<br/>index 974a75842da9..a17c2958dab1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/crypto/caam/desc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/caam/desc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/crypto/caam/desc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/crypto/caam/desc.h</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #define DESC_H</div><div class='ctx'> </div><div class='ctx'> /* Max size of any CAAM descriptor in 32-bit words, inclusive of header */</div><div class='del'>-#define MAX_CAAM_DESCSIZE       64</div><div class='add'>+#define MAX_CAAM_DESCSIZE	64</div><div class='ctx'> </div><div class='ctx'> /* Block size of any entity covered/uncovered with a KEK/TKEK */</div><div class='ctx'> #define KEK_BLOCKSIZE		16</div><div class='hunk'>@@ -18,38 +18,38 @@</div><div class='ctx'>  * Supported descriptor command types as they show up</div><div class='ctx'>  * inside a descriptor command word.</div><div class='ctx'>  */</div><div class='del'>-#define CMD_SHIFT               27</div><div class='del'>-#define CMD_MASK                0xf8000000</div><div class='del'>-</div><div class='del'>-#define CMD_KEY                 (0x00 &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_SEQ_KEY             (0x01 &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_LOAD                (0x02 &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_SEQ_LOAD            (0x03 &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_FIFO_LOAD           (0x04 &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_SEQ_FIFO_LOAD       (0x05 &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_STORE               (0x0a &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_SEQ_STORE           (0x0b &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_FIFO_STORE          (0x0c &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_SEQ_FIFO_STORE      (0x0d &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_MOVE_LEN            (0x0e &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_MOVE                (0x0f &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_OPERATION           (0x10 &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_SIGNATURE           (0x12 &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_JUMP                (0x14 &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_MATH                (0x15 &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_DESC_HDR            (0x16 &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_SHARED_DESC_HDR     (0x17 &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_SEQ_IN_PTR          (0x1e &lt;&lt; CMD_SHIFT)</div><div class='del'>-#define CMD_SEQ_OUT_PTR         (0x1f &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_SHIFT		27</div><div class='add'>+#define CMD_MASK		0xf8000000</div><div class='add'>+</div><div class='add'>+#define CMD_KEY			(0x00 &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_SEQ_KEY		(0x01 &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_LOAD		(0x02 &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_SEQ_LOAD		(0x03 &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_FIFO_LOAD		(0x04 &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_SEQ_FIFO_LOAD	(0x05 &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_STORE		(0x0a &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_SEQ_STORE		(0x0b &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_FIFO_STORE		(0x0c &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_SEQ_FIFO_STORE	(0x0d &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_MOVE_LEN		(0x0e &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_MOVE		(0x0f &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_OPERATION		(0x10 &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_SIGNATURE		(0x12 &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_JUMP		(0x14 &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_MATH		(0x15 &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_DESC_HDR		(0x16 &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_SHARED_DESC_HDR	(0x17 &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_SEQ_IN_PTR		(0x1e &lt;&lt; CMD_SHIFT)</div><div class='add'>+#define CMD_SEQ_OUT_PTR		(0x1f &lt;&lt; CMD_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* General-purpose class selector for all commands */</div><div class='del'>-#define CLASS_SHIFT             25</div><div class='del'>-#define CLASS_MASK              (0x03 &lt;&lt; CLASS_SHIFT)</div><div class='add'>+#define CLASS_SHIFT		25</div><div class='add'>+#define CLASS_MASK		(0x03 &lt;&lt; CLASS_SHIFT)</div><div class='ctx'> </div><div class='del'>-#define CLASS_NONE              (0x00 &lt;&lt; CLASS_SHIFT)</div><div class='del'>-#define CLASS_1                 (0x01 &lt;&lt; CLASS_SHIFT)</div><div class='del'>-#define CLASS_2                 (0x02 &lt;&lt; CLASS_SHIFT)</div><div class='del'>-#define CLASS_BOTH              (0x03 &lt;&lt; CLASS_SHIFT)</div><div class='add'>+#define CLASS_NONE		(0x00 &lt;&lt; CLASS_SHIFT)</div><div class='add'>+#define CLASS_1			(0x01 &lt;&lt; CLASS_SHIFT)</div><div class='add'>+#define CLASS_2			(0x02 &lt;&lt; CLASS_SHIFT)</div><div class='add'>+#define CLASS_BOTH		(0x03 &lt;&lt; CLASS_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Descriptor header command constructs</div><div class='hunk'>@@ -60,82 +60,82 @@</div><div class='ctx'>  * Do Not Run - marks a descriptor inexecutable if there was</div><div class='ctx'>  * a preceding error somewhere</div><div class='ctx'>  */</div><div class='del'>-#define HDR_DNR                 0x01000000</div><div class='add'>+#define HDR_DNR			0x01000000</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ONE - should always be set. Combination of ONE (always</div><div class='ctx'>  * set) and ZRO (always clear) forms an endianness sanity check</div><div class='ctx'>  */</div><div class='del'>-#define HDR_ONE                 0x00800000</div><div class='del'>-#define HDR_ZRO                 0x00008000</div><div class='add'>+#define HDR_ONE			0x00800000</div><div class='add'>+#define HDR_ZRO			0x00008000</div><div class='ctx'> </div><div class='ctx'> /* Start Index or SharedDesc Length */</div><div class='del'>-#define HDR_START_IDX_MASK      0x3f</div><div class='del'>-#define HDR_START_IDX_SHIFT     16</div><div class='add'>+#define HDR_START_IDX_MASK	0x3f</div><div class='add'>+#define HDR_START_IDX_SHIFT	16</div><div class='ctx'> </div><div class='ctx'> /* If shared descriptor header, 6-bit length */</div><div class='del'>-#define HDR_DESCLEN_SHR_MASK  0x3f</div><div class='add'>+#define HDR_DESCLEN_SHR_MASK	0x3f</div><div class='ctx'> </div><div class='ctx'> /* If non-shared header, 7-bit length */</div><div class='del'>-#define HDR_DESCLEN_MASK      0x7f</div><div class='add'>+#define HDR_DESCLEN_MASK	0x7f</div><div class='ctx'> </div><div class='ctx'> /* This is a TrustedDesc (if not SharedDesc) */</div><div class='del'>-#define HDR_TRUSTED             0x00004000</div><div class='add'>+#define HDR_TRUSTED		0x00004000</div><div class='ctx'> </div><div class='ctx'> /* Make into TrustedDesc (if not SharedDesc) */</div><div class='del'>-#define HDR_MAKE_TRUSTED        0x00002000</div><div class='add'>+#define HDR_MAKE_TRUSTED	0x00002000</div><div class='ctx'> </div><div class='ctx'> /* Save context if self-shared (if SharedDesc) */</div><div class='del'>-#define HDR_SAVECTX             0x00001000</div><div class='add'>+#define HDR_SAVECTX		0x00001000</div><div class='ctx'> </div><div class='ctx'> /* Next item points to SharedDesc */</div><div class='del'>-#define HDR_SHARED              0x00001000</div><div class='add'>+#define HDR_SHARED		0x00001000</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Reverse Execution Order - execute JobDesc first, then</div><div class='ctx'>  * execute SharedDesc (normally SharedDesc goes first).</div><div class='ctx'>  */</div><div class='del'>-#define HDR_REVERSE             0x00000800</div><div class='add'>+#define HDR_REVERSE		0x00000800</div><div class='ctx'> </div><div class='ctx'> /* Propogate DNR property to SharedDesc */</div><div class='del'>-#define HDR_PROP_DNR            0x00000800</div><div class='add'>+#define HDR_PROP_DNR		0x00000800</div><div class='ctx'> </div><div class='ctx'> /* JobDesc/SharedDesc share property */</div><div class='del'>-#define HDR_SD_SHARE_MASK       0x03</div><div class='del'>-#define HDR_SD_SHARE_SHIFT      8</div><div class='del'>-#define HDR_JD_SHARE_MASK       0x07</div><div class='del'>-#define HDR_JD_SHARE_SHIFT      8</div><div class='add'>+#define HDR_SD_SHARE_MASK	0x03</div><div class='add'>+#define HDR_SD_SHARE_SHIFT	8</div><div class='add'>+#define HDR_JD_SHARE_MASK	0x07</div><div class='add'>+#define HDR_JD_SHARE_SHIFT	8</div><div class='ctx'> </div><div class='del'>-#define HDR_SHARE_NEVER         (0x00 &lt;&lt; HDR_SD_SHARE_SHIFT)</div><div class='del'>-#define HDR_SHARE_WAIT          (0x01 &lt;&lt; HDR_SD_SHARE_SHIFT)</div><div class='del'>-#define HDR_SHARE_SERIAL        (0x02 &lt;&lt; HDR_SD_SHARE_SHIFT)</div><div class='del'>-#define HDR_SHARE_ALWAYS        (0x03 &lt;&lt; HDR_SD_SHARE_SHIFT)</div><div class='del'>-#define HDR_SHARE_DEFER         (0x04 &lt;&lt; HDR_SD_SHARE_SHIFT)</div><div class='add'>+#define HDR_SHARE_NEVER		(0x00 &lt;&lt; HDR_SD_SHARE_SHIFT)</div><div class='add'>+#define HDR_SHARE_WAIT		(0x01 &lt;&lt; HDR_SD_SHARE_SHIFT)</div><div class='add'>+#define HDR_SHARE_SERIAL	(0x02 &lt;&lt; HDR_SD_SHARE_SHIFT)</div><div class='add'>+#define HDR_SHARE_ALWAYS	(0x03 &lt;&lt; HDR_SD_SHARE_SHIFT)</div><div class='add'>+#define HDR_SHARE_DEFER		(0x04 &lt;&lt; HDR_SD_SHARE_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* JobDesc/SharedDesc descriptor length */</div><div class='del'>-#define HDR_JD_LENGTH_MASK      0x7f</div><div class='del'>-#define HDR_SD_LENGTH_MASK      0x3f</div><div class='add'>+#define HDR_JD_LENGTH_MASK	0x7f</div><div class='add'>+#define HDR_SD_LENGTH_MASK	0x3f</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * KEY/SEQ_KEY Command Constructs</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* Key Destination Class: 01 = Class 1, 02 - Class 2  */</div><div class='del'>-#define KEY_DEST_CLASS_SHIFT    25  /* use CLASS_1 or CLASS_2 */</div><div class='del'>-#define KEY_DEST_CLASS_MASK     (0x03 &lt;&lt; KEY_DEST_CLASS_SHIFT)</div><div class='add'>+/* Key Destination Class: 01 = Class 1, 02 - Class 2 */</div><div class='add'>+#define KEY_DEST_CLASS_SHIFT	25	/* use CLASS_1 or CLASS_2 */</div><div class='add'>+#define KEY_DEST_CLASS_MASK	(0x03 &lt;&lt; KEY_DEST_CLASS_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* Scatter-Gather Table/Variable Length Field */</div><div class='del'>-#define KEY_SGF                 0x01000000</div><div class='del'>-#define KEY_VLF                 0x01000000</div><div class='add'>+#define KEY_SGF			0x01000000</div><div class='add'>+#define KEY_VLF			0x01000000</div><div class='ctx'> </div><div class='ctx'> /* Immediate - Key follows command in the descriptor */</div><div class='del'>-#define KEY_IMM                 0x00800000</div><div class='add'>+#define KEY_IMM			0x00800000</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Encrypted - Key is encrypted either with the KEK, or</div><div class='ctx'>  * with the TDKEK if TK is set</div><div class='ctx'>  */</div><div class='del'>-#define KEY_ENC                 0x00400000</div><div class='add'>+#define KEY_ENC			0x00400000</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * No Write Back - Do not allow key to be FIFO STOREd</div><div class='hunk'>@@ -156,16 +156,16 @@</div><div class='ctx'>  * KDEST - Key Destination: 0 - class key register,</div><div class='ctx'>  * 1 - PKHA 'e', 2 - AFHA Sbox, 3 - MDHA split-key</div><div class='ctx'>  */</div><div class='del'>-#define KEY_DEST_SHIFT          16</div><div class='del'>-#define KEY_DEST_MASK           (0x03 &lt;&lt; KEY_DEST_SHIFT)</div><div class='add'>+#define KEY_DEST_SHIFT		16</div><div class='add'>+#define KEY_DEST_MASK		(0x03 &lt;&lt; KEY_DEST_SHIFT)</div><div class='ctx'> </div><div class='del'>-#define KEY_DEST_CLASS_REG      (0x00 &lt;&lt; KEY_DEST_SHIFT)</div><div class='del'>-#define KEY_DEST_PKHA_E         (0x01 &lt;&lt; KEY_DEST_SHIFT)</div><div class='del'>-#define KEY_DEST_AFHA_SBOX      (0x02 &lt;&lt; KEY_DEST_SHIFT)</div><div class='del'>-#define KEY_DEST_MDHA_SPLIT     (0x03 &lt;&lt; KEY_DEST_SHIFT)</div><div class='add'>+#define KEY_DEST_CLASS_REG	(0x00 &lt;&lt; KEY_DEST_SHIFT)</div><div class='add'>+#define KEY_DEST_PKHA_E		(0x01 &lt;&lt; KEY_DEST_SHIFT)</div><div class='add'>+#define KEY_DEST_AFHA_SBOX	(0x02 &lt;&lt; KEY_DEST_SHIFT)</div><div class='add'>+#define KEY_DEST_MDHA_SPLIT	(0x03 &lt;&lt; KEY_DEST_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* Length in bytes */</div><div class='del'>-#define KEY_LENGTH_MASK         0x000003ff</div><div class='add'>+#define KEY_LENGTH_MASK		0x000003ff</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * LOAD/SEQ_LOAD/STORE/SEQ_STORE Command Constructs</div><div class='hunk'>@@ -175,25 +175,25 @@</div><div class='ctx'>  * Load/Store Destination: 0 = class independent CCB,</div><div class='ctx'>  * 1 = class 1 CCB, 2 = class 2 CCB, 3 = DECO</div><div class='ctx'>  */</div><div class='del'>-#define LDST_CLASS_SHIFT        25</div><div class='del'>-#define LDST_CLASS_MASK         (0x03 &lt;&lt; LDST_CLASS_SHIFT)</div><div class='del'>-#define LDST_CLASS_IND_CCB      (0x00 &lt;&lt; LDST_CLASS_SHIFT)</div><div class='del'>-#define LDST_CLASS_1_CCB        (0x01 &lt;&lt; LDST_CLASS_SHIFT)</div><div class='del'>-#define LDST_CLASS_2_CCB        (0x02 &lt;&lt; LDST_CLASS_SHIFT)</div><div class='del'>-#define LDST_CLASS_DECO         (0x03 &lt;&lt; LDST_CLASS_SHIFT)</div><div class='add'>+#define LDST_CLASS_SHIFT	25</div><div class='add'>+#define LDST_CLASS_MASK		(0x03 &lt;&lt; LDST_CLASS_SHIFT)</div><div class='add'>+#define LDST_CLASS_IND_CCB	(0x00 &lt;&lt; LDST_CLASS_SHIFT)</div><div class='add'>+#define LDST_CLASS_1_CCB	(0x01 &lt;&lt; LDST_CLASS_SHIFT)</div><div class='add'>+#define LDST_CLASS_2_CCB	(0x02 &lt;&lt; LDST_CLASS_SHIFT)</div><div class='add'>+#define LDST_CLASS_DECO		(0x03 &lt;&lt; LDST_CLASS_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* Scatter-Gather Table/Variable Length Field */</div><div class='del'>-#define LDST_SGF                0x01000000</div><div class='add'>+#define LDST_SGF		0x01000000</div><div class='ctx'> #define LDST_VLF		LDST_SGF</div><div class='ctx'> </div><div class='del'>-/* Immediate - Key follows this command in descriptor    */</div><div class='del'>-#define LDST_IMM_MASK           1</div><div class='del'>-#define LDST_IMM_SHIFT          23</div><div class='del'>-#define LDST_IMM                (LDST_IMM_MASK &lt;&lt; LDST_IMM_SHIFT)</div><div class='add'>+/* Immediate - Key follows this command in descriptor */</div><div class='add'>+#define LDST_IMM_MASK		1</div><div class='add'>+#define LDST_IMM_SHIFT		23</div><div class='add'>+#define LDST_IMM		(LDST_IMM_MASK &lt;&lt; LDST_IMM_SHIFT)</div><div class='ctx'> </div><div class='del'>-/* SRC/DST - Destination for LOAD, Source for STORE   */</div><div class='del'>-#define LDST_SRCDST_SHIFT       16</div><div class='del'>-#define LDST_SRCDST_MASK        (0x7f &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='add'>+/* SRC/DST - Destination for LOAD, Source for STORE */</div><div class='add'>+#define LDST_SRCDST_SHIFT	16</div><div class='add'>+#define LDST_SRCDST_MASK	(0x7f &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #define LDST_SRCDST_BYTE_CONTEXT	(0x20 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='ctx'> #define LDST_SRCDST_BYTE_KEY		(0x40 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='hunk'>@@ -205,64 +205,64 @@</div><div class='ctx'> #define LDST_SRCDST_WORD_DATASZ_REG	(0x02 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='ctx'> #define LDST_SRCDST_WORD_ICVSZ_REG	(0x03 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='ctx'> #define LDST_SRCDST_WORD_CHACTRL	(0x06 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='del'>-#define LDST_SRCDST_WORD_DECOCTRL       (0x06 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='add'>+#define LDST_SRCDST_WORD_DECOCTRL	(0x06 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='ctx'> #define LDST_SRCDST_WORD_IRQCTRL	(0x07 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='del'>-#define LDST_SRCDST_WORD_DECO_PCLOVRD   (0x07 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='add'>+#define LDST_SRCDST_WORD_DECO_PCLOVRD	(0x07 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='ctx'> #define LDST_SRCDST_WORD_CLRW		(0x08 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='del'>-#define LDST_SRCDST_WORD_DECO_MATH0     (0x08 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='add'>+#define LDST_SRCDST_WORD_DECO_MATH0	(0x08 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='ctx'> #define LDST_SRCDST_WORD_STAT		(0x09 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='del'>-#define LDST_SRCDST_WORD_DECO_MATH1     (0x09 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='del'>-#define LDST_SRCDST_WORD_DECO_MATH2     (0x0a &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='del'>-#define LDST_SRCDST_WORD_DECO_AAD_SZ    (0x0b &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='del'>-#define LDST_SRCDST_WORD_DECO_MATH3     (0x0b &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='del'>-#define LDST_SRCDST_WORD_CLASS1_ICV_SZ  (0x0c &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='del'>-#define LDST_SRCDST_WORD_ALTDS_CLASS1   (0x0f &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='del'>-#define LDST_SRCDST_WORD_PKHA_A_SZ      (0x10 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='del'>-#define LDST_SRCDST_WORD_PKHA_B_SZ      (0x11 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='del'>-#define LDST_SRCDST_WORD_PKHA_N_SZ      (0x12 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='del'>-#define LDST_SRCDST_WORD_PKHA_E_SZ      (0x13 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='del'>-#define LDST_SRCDST_WORD_DESCBUF        (0x40 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='del'>-#define LDST_SRCDST_WORD_INFO_FIFO      (0x7a &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='del'>-</div><div class='del'>-/* Offset in source/destination                        */</div><div class='del'>-#define LDST_OFFSET_SHIFT       8</div><div class='del'>-#define LDST_OFFSET_MASK        (0xff &lt;&lt; LDST_OFFSET_SHIFT)</div><div class='add'>+#define LDST_SRCDST_WORD_DECO_MATH1	(0x09 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='add'>+#define LDST_SRCDST_WORD_DECO_MATH2	(0x0a &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='add'>+#define LDST_SRCDST_WORD_DECO_AAD_SZ	(0x0b &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='add'>+#define LDST_SRCDST_WORD_DECO_MATH3	(0x0b &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='add'>+#define LDST_SRCDST_WORD_CLASS1_ICV_SZ	(0x0c &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='add'>+#define LDST_SRCDST_WORD_ALTDS_CLASS1	(0x0f &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='add'>+#define LDST_SRCDST_WORD_PKHA_A_SZ	(0x10 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='add'>+#define LDST_SRCDST_WORD_PKHA_B_SZ	(0x11 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='add'>+#define LDST_SRCDST_WORD_PKHA_N_SZ	(0x12 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='add'>+#define LDST_SRCDST_WORD_PKHA_E_SZ	(0x13 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='add'>+#define LDST_SRCDST_WORD_DESCBUF	(0x40 &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='add'>+#define LDST_SRCDST_WORD_INFO_FIFO	(0x7a &lt;&lt; LDST_SRCDST_SHIFT)</div><div class='add'>+</div><div class='add'>+/* Offset in source/destination */</div><div class='add'>+#define LDST_OFFSET_SHIFT	8</div><div class='add'>+#define LDST_OFFSET_MASK	(0xff &lt;&lt; LDST_OFFSET_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* LDOFF definitions used when DST = LDST_SRCDST_WORD_DECOCTRL */</div><div class='ctx'> /* These could also be shifted by LDST_OFFSET_SHIFT - this reads better */</div><div class='del'>-#define LDOFF_CHG_SHARE_SHIFT        0</div><div class='del'>-#define LDOFF_CHG_SHARE_MASK         (0x3 &lt;&lt; LDOFF_CHG_SHARE_SHIFT)</div><div class='del'>-#define LDOFF_CHG_SHARE_NEVER        (0x1 &lt;&lt; LDOFF_CHG_SHARE_SHIFT)</div><div class='del'>-#define LDOFF_CHG_SHARE_OK_NO_PROP   (0x2 &lt;&lt; LDOFF_CHG_SHARE_SHIFT)</div><div class='del'>-#define LDOFF_CHG_SHARE_OK_PROP      (0x3 &lt;&lt; LDOFF_CHG_SHARE_SHIFT)</div><div class='del'>-</div><div class='del'>-#define LDOFF_ENABLE_AUTO_NFIFO         (1 &lt;&lt; 2)</div><div class='del'>-#define LDOFF_DISABLE_AUTO_NFIFO        (1 &lt;&lt; 3)</div><div class='del'>-</div><div class='del'>-#define LDOFF_CHG_NONSEQLIODN_SHIFT     4</div><div class='del'>-#define LDOFF_CHG_NONSEQLIODN_MASK      (0x3 &lt;&lt; LDOFF_CHG_NONSEQLIODN_SHIFT)</div><div class='del'>-#define LDOFF_CHG_NONSEQLIODN_SEQ       (0x1 &lt;&lt; LDOFF_CHG_NONSEQLIODN_SHIFT)</div><div class='del'>-#define LDOFF_CHG_NONSEQLIODN_NON_SEQ   (0x2 &lt;&lt; LDOFF_CHG_NONSEQLIODN_SHIFT)</div><div class='del'>-#define LDOFF_CHG_NONSEQLIODN_TRUSTED   (0x3 &lt;&lt; LDOFF_CHG_NONSEQLIODN_SHIFT)</div><div class='del'>-</div><div class='del'>-#define LDOFF_CHG_SEQLIODN_SHIFT     6</div><div class='del'>-#define LDOFF_CHG_SEQLIODN_MASK      (0x3 &lt;&lt; LDOFF_CHG_SEQLIODN_SHIFT)</div><div class='del'>-#define LDOFF_CHG_SEQLIODN_SEQ       (0x1 &lt;&lt; LDOFF_CHG_SEQLIODN_SHIFT)</div><div class='del'>-#define LDOFF_CHG_SEQLIODN_NON_SEQ   (0x2 &lt;&lt; LDOFF_CHG_SEQLIODN_SHIFT)</div><div class='del'>-#define LDOFF_CHG_SEQLIODN_TRUSTED   (0x3 &lt;&lt; LDOFF_CHG_SEQLIODN_SHIFT)</div><div class='del'>-</div><div class='del'>-/* Data length in bytes                                 */</div><div class='del'>-#define LDST_LEN_SHIFT          0</div><div class='del'>-#define LDST_LEN_MASK           (0xff &lt;&lt; LDST_LEN_SHIFT)</div><div class='add'>+#define LDOFF_CHG_SHARE_SHIFT		0</div><div class='add'>+#define LDOFF_CHG_SHARE_MASK		(0x3 &lt;&lt; LDOFF_CHG_SHARE_SHIFT)</div><div class='add'>+#define LDOFF_CHG_SHARE_NEVER		(0x1 &lt;&lt; LDOFF_CHG_SHARE_SHIFT)</div><div class='add'>+#define LDOFF_CHG_SHARE_OK_PROP		(0x2 &lt;&lt; LDOFF_CHG_SHARE_SHIFT)</div><div class='add'>+#define LDOFF_CHG_SHARE_OK_NO_PROP	(0x3 &lt;&lt; LDOFF_CHG_SHARE_SHIFT)</div><div class='add'>+</div><div class='add'>+#define LDOFF_ENABLE_AUTO_NFIFO		(1 &lt;&lt; 2)</div><div class='add'>+#define LDOFF_DISABLE_AUTO_NFIFO	(1 &lt;&lt; 3)</div><div class='add'>+</div><div class='add'>+#define LDOFF_CHG_NONSEQLIODN_SHIFT	4</div><div class='add'>+#define LDOFF_CHG_NONSEQLIODN_MASK	(0x3 &lt;&lt; LDOFF_CHG_NONSEQLIODN_SHIFT)</div><div class='add'>+#define LDOFF_CHG_NONSEQLIODN_SEQ	(0x1 &lt;&lt; LDOFF_CHG_NONSEQLIODN_SHIFT)</div><div class='add'>+#define LDOFF_CHG_NONSEQLIODN_NON_SEQ	(0x2 &lt;&lt; LDOFF_CHG_NONSEQLIODN_SHIFT)</div><div class='add'>+#define LDOFF_CHG_NONSEQLIODN_TRUSTED	(0x3 &lt;&lt; LDOFF_CHG_NONSEQLIODN_SHIFT)</div><div class='add'>+</div><div class='add'>+#define LDOFF_CHG_SEQLIODN_SHIFT	6</div><div class='add'>+#define LDOFF_CHG_SEQLIODN_MASK		(0x3 &lt;&lt; LDOFF_CHG_SEQLIODN_SHIFT)</div><div class='add'>+#define LDOFF_CHG_SEQLIODN_SEQ		(0x1 &lt;&lt; LDOFF_CHG_SEQLIODN_SHIFT)</div><div class='add'>+#define LDOFF_CHG_SEQLIODN_NON_SEQ	(0x2 &lt;&lt; LDOFF_CHG_SEQLIODN_SHIFT)</div><div class='add'>+#define LDOFF_CHG_SEQLIODN_TRUSTED	(0x3 &lt;&lt; LDOFF_CHG_SEQLIODN_SHIFT)</div><div class='add'>+</div><div class='add'>+/* Data length in bytes	*/</div><div class='add'>+#define LDST_LEN_SHIFT		0</div><div class='add'>+#define LDST_LEN_MASK		(0xff &lt;&lt; LDST_LEN_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* Special Length definitions when dst=deco-ctrl */</div><div class='del'>-#define LDLEN_ENABLE_OSL_COUNT      (1 &lt;&lt; 7)</div><div class='del'>-#define LDLEN_RST_CHA_OFIFO_PTR     (1 &lt;&lt; 6)</div><div class='del'>-#define LDLEN_RST_OFIFO             (1 &lt;&lt; 5)</div><div class='del'>-#define LDLEN_SET_OFIFO_OFF_VALID   (1 &lt;&lt; 4)</div><div class='del'>-#define LDLEN_SET_OFIFO_OFF_RSVD    (1 &lt;&lt; 3)</div><div class='del'>-#define LDLEN_SET_OFIFO_OFFSET_SHIFT 0</div><div class='del'>-#define LDLEN_SET_OFIFO_OFFSET_MASK (3 &lt;&lt; LDLEN_SET_OFIFO_OFFSET_SHIFT)</div><div class='add'>+#define LDLEN_ENABLE_OSL_COUNT		(1 &lt;&lt; 7)</div><div class='add'>+#define LDLEN_RST_CHA_OFIFO_PTR		(1 &lt;&lt; 6)</div><div class='add'>+#define LDLEN_RST_OFIFO			(1 &lt;&lt; 5)</div><div class='add'>+#define LDLEN_SET_OFIFO_OFF_VALID	(1 &lt;&lt; 4)</div><div class='add'>+#define LDLEN_SET_OFIFO_OFF_RSVD	(1 &lt;&lt; 3)</div><div class='add'>+#define LDLEN_SET_OFIFO_OFFSET_SHIFT	0</div><div class='add'>+#define LDLEN_SET_OFIFO_OFFSET_MASK	(3 &lt;&lt; LDLEN_SET_OFIFO_OFFSET_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * FIFO_LOAD/FIFO_STORE/SEQ_FIFO_LOAD/SEQ_FIFO_STORE</div><div class='hunk'>@@ -274,808 +274,808 @@</div><div class='ctx'>  * 1 = Load for Class1, 2 = Load for Class2, 3 = Load both</div><div class='ctx'>  * Store Source: 0 = normal, 1 = Class1key, 2 = Class2key</div><div class='ctx'>  */</div><div class='del'>-#define FIFOLD_CLASS_SHIFT      25</div><div class='del'>-#define FIFOLD_CLASS_MASK       (0x03 &lt;&lt; FIFOLD_CLASS_SHIFT)</div><div class='del'>-#define FIFOLD_CLASS_SKIP       (0x00 &lt;&lt; FIFOLD_CLASS_SHIFT)</div><div class='del'>-#define FIFOLD_CLASS_CLASS1     (0x01 &lt;&lt; FIFOLD_CLASS_SHIFT)</div><div class='del'>-#define FIFOLD_CLASS_CLASS2     (0x02 &lt;&lt; FIFOLD_CLASS_SHIFT)</div><div class='del'>-#define FIFOLD_CLASS_BOTH       (0x03 &lt;&lt; FIFOLD_CLASS_SHIFT)</div><div class='del'>-</div><div class='del'>-#define FIFOST_CLASS_SHIFT      25</div><div class='del'>-#define FIFOST_CLASS_MASK       (0x03 &lt;&lt; FIFOST_CLASS_SHIFT)</div><div class='del'>-#define FIFOST_CLASS_NORMAL     (0x00 &lt;&lt; FIFOST_CLASS_SHIFT)</div><div class='del'>-#define FIFOST_CLASS_CLASS1KEY  (0x01 &lt;&lt; FIFOST_CLASS_SHIFT)</div><div class='del'>-#define FIFOST_CLASS_CLASS2KEY  (0x02 &lt;&lt; FIFOST_CLASS_SHIFT)</div><div class='add'>+#define FIFOLD_CLASS_SHIFT	25</div><div class='add'>+#define FIFOLD_CLASS_MASK	(0x03 &lt;&lt; FIFOLD_CLASS_SHIFT)</div><div class='add'>+#define FIFOLD_CLASS_SKIP	(0x00 &lt;&lt; FIFOLD_CLASS_SHIFT)</div><div class='add'>+#define FIFOLD_CLASS_CLASS1	(0x01 &lt;&lt; FIFOLD_CLASS_SHIFT)</div><div class='add'>+#define FIFOLD_CLASS_CLASS2	(0x02 &lt;&lt; FIFOLD_CLASS_SHIFT)</div><div class='add'>+#define FIFOLD_CLASS_BOTH	(0x03 &lt;&lt; FIFOLD_CLASS_SHIFT)</div><div class='add'>+</div><div class='add'>+#define FIFOST_CLASS_SHIFT	25</div><div class='add'>+#define FIFOST_CLASS_MASK	(0x03 &lt;&lt; FIFOST_CLASS_SHIFT)</div><div class='add'>+#define FIFOST_CLASS_NORMAL	(0x00 &lt;&lt; FIFOST_CLASS_SHIFT)</div><div class='add'>+#define FIFOST_CLASS_CLASS1KEY	(0x01 &lt;&lt; FIFOST_CLASS_SHIFT)</div><div class='add'>+#define FIFOST_CLASS_CLASS2KEY	(0x02 &lt;&lt; FIFOST_CLASS_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Scatter-Gather Table/Variable Length Field</div><div class='ctx'>  * If set for FIFO_LOAD, refers to a SG table. Within</div><div class='ctx'>  * SEQ_FIFO_LOAD, is variable input sequence</div><div class='ctx'>  */</div><div class='del'>-#define FIFOLDST_SGF_SHIFT      24</div><div class='del'>-#define FIFOLDST_SGF_MASK       (1 &lt;&lt; FIFOLDST_SGF_SHIFT)</div><div class='del'>-#define FIFOLDST_VLF_MASK       (1 &lt;&lt; FIFOLDST_SGF_SHIFT)</div><div class='del'>-#define FIFOLDST_SGF            (1 &lt;&lt; FIFOLDST_SGF_SHIFT)</div><div class='del'>-#define FIFOLDST_VLF            (1 &lt;&lt; FIFOLDST_SGF_SHIFT)</div><div class='add'>+#define FIFOLDST_SGF_SHIFT	24</div><div class='add'>+#define FIFOLDST_SGF_MASK	(1 &lt;&lt; FIFOLDST_SGF_SHIFT)</div><div class='add'>+#define FIFOLDST_VLF_MASK	(1 &lt;&lt; FIFOLDST_SGF_SHIFT)</div><div class='add'>+#define FIFOLDST_SGF		(1 &lt;&lt; FIFOLDST_SGF_SHIFT)</div><div class='add'>+#define FIFOLDST_VLF		(1 &lt;&lt; FIFOLDST_SGF_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* Immediate - Data follows command in descriptor */</div><div class='del'>-#define FIFOLD_IMM_SHIFT      23</div><div class='del'>-#define FIFOLD_IMM_MASK       (1 &lt;&lt; FIFOLD_IMM_SHIFT)</div><div class='del'>-#define FIFOLD_IMM            (1 &lt;&lt; FIFOLD_IMM_SHIFT)</div><div class='add'>+#define FIFOLD_IMM_SHIFT	23</div><div class='add'>+#define FIFOLD_IMM_MASK		(1 &lt;&lt; FIFOLD_IMM_SHIFT)</div><div class='add'>+#define FIFOLD_IMM		(1 &lt;&lt; FIFOLD_IMM_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* Continue - Not the last FIFO store to come */</div><div class='del'>-#define FIFOST_CONT_SHIFT     23</div><div class='del'>-#define FIFOST_CONT_MASK      (1 &lt;&lt; FIFOST_CONT_SHIFT)</div><div class='del'>-#define FIFOST_CONT_MASK      (1 &lt;&lt; FIFOST_CONT_SHIFT)</div><div class='add'>+#define FIFOST_CONT_SHIFT	23</div><div class='add'>+#define FIFOST_CONT_MASK	(1 &lt;&lt; FIFOST_CONT_SHIFT)</div><div class='add'>+#define FIFOST_CONT_MASK	(1 &lt;&lt; FIFOST_CONT_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Extended Length - use 32-bit extended length that</div><div class='ctx'>  * follows the pointer field. Illegal with IMM set</div><div class='ctx'>  */</div><div class='del'>-#define FIFOLDST_EXT_SHIFT      22</div><div class='del'>-#define FIFOLDST_EXT_MASK       (1 &lt;&lt; FIFOLDST_EXT_SHIFT)</div><div class='del'>-#define FIFOLDST_EXT            (1 &lt;&lt; FIFOLDST_EXT_SHIFT)</div><div class='add'>+#define FIFOLDST_EXT_SHIFT	22</div><div class='add'>+#define FIFOLDST_EXT_MASK	(1 &lt;&lt; FIFOLDST_EXT_SHIFT)</div><div class='add'>+#define FIFOLDST_EXT		(1 &lt;&lt; FIFOLDST_EXT_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* Input data type.*/</div><div class='del'>-#define FIFOLD_TYPE_SHIFT       16</div><div class='del'>-#define FIFOLD_CONT_TYPE_SHIFT  19 /* shift past last-flush bits */</div><div class='del'>-#define FIFOLD_TYPE_MASK        (0x3f &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_SHIFT	16</div><div class='add'>+#define FIFOLD_CONT_TYPE_SHIFT	19 /* shift past last-flush bits */</div><div class='add'>+#define FIFOLD_TYPE_MASK	(0x3f &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* PK types */</div><div class='del'>-#define FIFOLD_TYPE_PK          (0x00 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_PK_MASK     (0x30 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_PK		(0x00 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_PK_MASK	(0x30 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='ctx'> #define FIFOLD_TYPE_PK_TYPEMASK (0x0f &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_PK_A0       (0x00 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_PK_A1       (0x01 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_PK_A2       (0x02 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_PK_A3       (0x03 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_PK_B0       (0x04 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_PK_B1       (0x05 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_PK_B2       (0x06 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_PK_B3       (0x07 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_PK_N        (0x08 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_PK_A        (0x0c &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_PK_B        (0x0d &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_PK_A0	(0x00 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_PK_A1	(0x01 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_PK_A2	(0x02 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_PK_A3	(0x03 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_PK_B0	(0x04 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_PK_B1	(0x05 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_PK_B2	(0x06 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_PK_B3	(0x07 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_PK_N	(0x08 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_PK_A	(0x0c &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_PK_B	(0x0d &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* Other types. Need to OR in last/flush bits as desired */</div><div class='del'>-#define FIFOLD_TYPE_MSG_MASK    (0x38 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_MSG         (0x10 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_MSG1OUT2    (0x18 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_IV          (0x20 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_BITDATA     (0x28 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_AAD         (0x30 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_ICV         (0x38 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_MSG_MASK	(0x38 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_MSG		(0x10 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_MSG1OUT2	(0x18 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_IV		(0x20 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_BITDATA	(0x28 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_AAD		(0x30 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_ICV		(0x38 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* Last/Flush bits for use with "other" types above */</div><div class='del'>-#define FIFOLD_TYPE_ACT_MASK    (0x07 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_NOACTION    (0x00 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_FLUSH1      (0x01 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_LAST1       (0x02 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_LAST2FLUSH  (0x03 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_LAST2       (0x04 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_ACT_MASK	(0x07 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_NOACTION	(0x00 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_FLUSH1	(0x01 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_LAST1	(0x02 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_LAST2FLUSH	(0x03 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_LAST2	(0x04 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='ctx'> #define FIFOLD_TYPE_LAST2FLUSH1 (0x05 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_LASTBOTH    (0x06 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='del'>-#define FIFOLD_TYPE_LASTBOTHFL  (0x07 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_LASTBOTH	(0x06 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='add'>+#define FIFOLD_TYPE_LASTBOTHFL	(0x07 &lt;&lt; FIFOLD_TYPE_SHIFT)</div><div class='ctx'> </div><div class='del'>-#define FIFOLDST_LEN_MASK       0xffff</div><div class='del'>-#define FIFOLDST_EXT_LEN_MASK   0xffffffff</div><div class='add'>+#define FIFOLDST_LEN_MASK	0xffff</div><div class='add'>+#define FIFOLDST_EXT_LEN_MASK	0xffffffff</div><div class='ctx'> </div><div class='ctx'> /* Output data types */</div><div class='del'>-#define FIFOST_TYPE_SHIFT       16</div><div class='del'>-#define FIFOST_TYPE_MASK        (0x3f &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-</div><div class='del'>-#define FIFOST_TYPE_PKHA_A0      (0x00 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_PKHA_A1      (0x01 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_PKHA_A2      (0x02 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_PKHA_A3      (0x03 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_PKHA_B0      (0x04 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_PKHA_B1      (0x05 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_PKHA_B2      (0x06 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_PKHA_B3      (0x07 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_PKHA_N       (0x08 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_PKHA_A       (0x0c &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_PKHA_B       (0x0d &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_SHIFT	16</div><div class='add'>+#define FIFOST_TYPE_MASK	(0x3f &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+</div><div class='add'>+#define FIFOST_TYPE_PKHA_A0	 (0x00 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_PKHA_A1	 (0x01 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_PKHA_A2	 (0x02 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_PKHA_A3	 (0x03 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_PKHA_B0	 (0x04 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_PKHA_B1	 (0x05 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_PKHA_B2	 (0x06 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_PKHA_B3	 (0x07 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_PKHA_N	 (0x08 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_PKHA_A	 (0x0c &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_PKHA_B	 (0x0d &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='ctx'> #define FIFOST_TYPE_AF_SBOX_JKEK (0x10 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='ctx'> #define FIFOST_TYPE_AF_SBOX_TKEK (0x21 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_PKHA_E_JKEK  (0x22 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_PKHA_E_TKEK  (0x23 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_KEY_KEK      (0x24 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_KEY_TKEK     (0x25 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_SPLIT_KEK    (0x26 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_SPLIT_TKEK   (0x27 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_OUTFIFO_KEK  (0x28 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_PKHA_E_JKEK	 (0x22 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_PKHA_E_TKEK	 (0x23 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_KEY_KEK	 (0x24 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_KEY_TKEK	 (0x25 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_SPLIT_KEK	 (0x26 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_SPLIT_TKEK	 (0x27 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_OUTFIFO_KEK	 (0x28 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='ctx'> #define FIFOST_TYPE_OUTFIFO_TKEK (0x29 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='ctx'> #define FIFOST_TYPE_MESSAGE_DATA (0x30 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_RNGSTORE     (0x34 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_RNGFIFO      (0x35 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='del'>-#define FIFOST_TYPE_SKIP         (0x3f &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_RNGSTORE	 (0x34 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_RNGFIFO	 (0x35 &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='add'>+#define FIFOST_TYPE_SKIP	 (0x3f &lt;&lt; FIFOST_TYPE_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * OPERATION Command Constructs</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* Operation type selectors - OP TYPE */</div><div class='del'>-#define OP_TYPE_SHIFT           24</div><div class='del'>-#define OP_TYPE_MASK            (0x07 &lt;&lt; OP_TYPE_SHIFT)</div><div class='add'>+#define OP_TYPE_SHIFT		24</div><div class='add'>+#define OP_TYPE_MASK		(0x07 &lt;&lt; OP_TYPE_SHIFT)</div><div class='ctx'> </div><div class='del'>-#define OP_TYPE_UNI_PROTOCOL    (0x00 &lt;&lt; OP_TYPE_SHIFT)</div><div class='del'>-#define OP_TYPE_PK              (0x01 &lt;&lt; OP_TYPE_SHIFT)</div><div class='del'>-#define OP_TYPE_CLASS1_ALG      (0x02 &lt;&lt; OP_TYPE_SHIFT)</div><div class='del'>-#define OP_TYPE_CLASS2_ALG      (0x04 &lt;&lt; OP_TYPE_SHIFT)</div><div class='del'>-#define OP_TYPE_DECAP_PROTOCOL  (0x06 &lt;&lt; OP_TYPE_SHIFT)</div><div class='del'>-#define OP_TYPE_ENCAP_PROTOCOL  (0x07 &lt;&lt; OP_TYPE_SHIFT)</div><div class='add'>+#define OP_TYPE_UNI_PROTOCOL	(0x00 &lt;&lt; OP_TYPE_SHIFT)</div><div class='add'>+#define OP_TYPE_PK		(0x01 &lt;&lt; OP_TYPE_SHIFT)</div><div class='add'>+#define OP_TYPE_CLASS1_ALG	(0x02 &lt;&lt; OP_TYPE_SHIFT)</div><div class='add'>+#define OP_TYPE_CLASS2_ALG	(0x04 &lt;&lt; OP_TYPE_SHIFT)</div><div class='add'>+#define OP_TYPE_DECAP_PROTOCOL	(0x06 &lt;&lt; OP_TYPE_SHIFT)</div><div class='add'>+#define OP_TYPE_ENCAP_PROTOCOL	(0x07 &lt;&lt; OP_TYPE_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* ProtocolID selectors - PROTID */</div><div class='del'>-#define OP_PCLID_SHIFT          16</div><div class='del'>-#define OP_PCLID_MASK           (0xff &lt;&lt; 16)</div><div class='add'>+#define OP_PCLID_SHIFT		16</div><div class='add'>+#define OP_PCLID_MASK		(0xff &lt;&lt; 16)</div><div class='ctx'> </div><div class='ctx'> /* Assuming OP_TYPE = OP_TYPE_UNI_PROTOCOL */</div><div class='del'>-#define OP_PCLID_IKEV1_PRF      (0x01 &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_IKEV2_PRF      (0x02 &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_SSL30_PRF      (0x08 &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_TLS10_PRF      (0x09 &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_TLS11_PRF      (0x0a &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_DTLS10_PRF     (0x0c &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_PRF            (0x06 &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_BLOB           (0x0d &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_SECRETKEY      (0x11 &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_PUBLICKEYPAIR  (0x14 &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_DSASIGN        (0x15 &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_DSAVERIFY      (0x16 &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_IKEV1_PRF	(0x01 &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_IKEV2_PRF	(0x02 &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_SSL30_PRF	(0x08 &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_TLS10_PRF	(0x09 &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_TLS11_PRF	(0x0a &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_DTLS10_PRF	(0x0c &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_PRF		(0x06 &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_BLOB		(0x0d &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_SECRETKEY	(0x11 &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_PUBLICKEYPAIR	(0x14 &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_DSASIGN	(0x15 &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_DSAVERIFY	(0x16 &lt;&lt; OP_PCLID_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* Assuming OP_TYPE = OP_TYPE_DECAP_PROTOCOL/ENCAP_PROTOCOL */</div><div class='del'>-#define OP_PCLID_IPSEC          (0x01 &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_SRTP           (0x02 &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_MACSEC         (0x03 &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_WIFI           (0x04 &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_WIMAX          (0x05 &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_SSL30          (0x08 &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_TLS10          (0x09 &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_TLS11          (0x0a &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_TLS12          (0x0b &lt;&lt; OP_PCLID_SHIFT)</div><div class='del'>-#define OP_PCLID_DTLS           (0x0c &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_IPSEC		(0x01 &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_SRTP		(0x02 &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_MACSEC		(0x03 &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_WIFI		(0x04 &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_WIMAX		(0x05 &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_SSL30		(0x08 &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_TLS10		(0x09 &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_TLS11		(0x0a &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_TLS12		(0x0b &lt;&lt; OP_PCLID_SHIFT)</div><div class='add'>+#define OP_PCLID_DTLS		(0x0c &lt;&lt; OP_PCLID_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ProtocolInfo selectors</div><div class='ctx'>  */</div><div class='del'>-#define OP_PCLINFO_MASK                          0xffff</div><div class='add'>+#define OP_PCLINFO_MASK				 0xffff</div><div class='ctx'> </div><div class='ctx'> /* for OP_PCLID_IPSEC */</div><div class='del'>-#define OP_PCL_IPSEC_CIPHER_MASK                 0xff00</div><div class='del'>-#define OP_PCL_IPSEC_AUTH_MASK                   0x00ff</div><div class='del'>-</div><div class='del'>-#define OP_PCL_IPSEC_DES_IV64                    0x0100</div><div class='del'>-#define OP_PCL_IPSEC_DES                         0x0200</div><div class='del'>-#define OP_PCL_IPSEC_3DES                        0x0300</div><div class='del'>-#define OP_PCL_IPSEC_AES_CBC                     0x0c00</div><div class='del'>-#define OP_PCL_IPSEC_AES_CTR                     0x0d00</div><div class='del'>-#define OP_PCL_IPSEC_AES_XTS                     0x1600</div><div class='del'>-#define OP_PCL_IPSEC_AES_CCM8                    0x0e00</div><div class='del'>-#define OP_PCL_IPSEC_AES_CCM12                   0x0f00</div><div class='del'>-#define OP_PCL_IPSEC_AES_CCM16                   0x1000</div><div class='del'>-#define OP_PCL_IPSEC_AES_GCM8                    0x1200</div><div class='del'>-#define OP_PCL_IPSEC_AES_GCM12                   0x1300</div><div class='del'>-#define OP_PCL_IPSEC_AES_GCM16                   0x1400</div><div class='del'>-</div><div class='del'>-#define OP_PCL_IPSEC_HMAC_NULL                   0x0000</div><div class='del'>-#define OP_PCL_IPSEC_HMAC_MD5_96                 0x0001</div><div class='del'>-#define OP_PCL_IPSEC_HMAC_SHA1_96                0x0002</div><div class='del'>-#define OP_PCL_IPSEC_AES_XCBC_MAC_96             0x0005</div><div class='del'>-#define OP_PCL_IPSEC_HMAC_MD5_128                0x0006</div><div class='del'>-#define OP_PCL_IPSEC_HMAC_SHA1_160               0x0007</div><div class='del'>-#define OP_PCL_IPSEC_HMAC_SHA2_256_128           0x000c</div><div class='del'>-#define OP_PCL_IPSEC_HMAC_SHA2_384_192           0x000d</div><div class='del'>-#define OP_PCL_IPSEC_HMAC_SHA2_512_256           0x000e</div><div class='add'>+#define OP_PCL_IPSEC_CIPHER_MASK		 0xff00</div><div class='add'>+#define OP_PCL_IPSEC_AUTH_MASK			 0x00ff</div><div class='add'>+</div><div class='add'>+#define OP_PCL_IPSEC_DES_IV64			 0x0100</div><div class='add'>+#define OP_PCL_IPSEC_DES			 0x0200</div><div class='add'>+#define OP_PCL_IPSEC_3DES			 0x0300</div><div class='add'>+#define OP_PCL_IPSEC_AES_CBC			 0x0c00</div><div class='add'>+#define OP_PCL_IPSEC_AES_CTR			 0x0d00</div><div class='add'>+#define OP_PCL_IPSEC_AES_XTS			 0x1600</div><div class='add'>+#define OP_PCL_IPSEC_AES_CCM8			 0x0e00</div><div class='add'>+#define OP_PCL_IPSEC_AES_CCM12			 0x0f00</div><div class='add'>+#define OP_PCL_IPSEC_AES_CCM16			 0x1000</div><div class='add'>+#define OP_PCL_IPSEC_AES_GCM8			 0x1200</div><div class='add'>+#define OP_PCL_IPSEC_AES_GCM12			 0x1300</div><div class='add'>+#define OP_PCL_IPSEC_AES_GCM16			 0x1400</div><div class='add'>+</div><div class='add'>+#define OP_PCL_IPSEC_HMAC_NULL			 0x0000</div><div class='add'>+#define OP_PCL_IPSEC_HMAC_MD5_96		 0x0001</div><div class='add'>+#define OP_PCL_IPSEC_HMAC_SHA1_96		 0x0002</div><div class='add'>+#define OP_PCL_IPSEC_AES_XCBC_MAC_96		 0x0005</div><div class='add'>+#define OP_PCL_IPSEC_HMAC_MD5_128		 0x0006</div><div class='add'>+#define OP_PCL_IPSEC_HMAC_SHA1_160		 0x0007</div><div class='add'>+#define OP_PCL_IPSEC_HMAC_SHA2_256_128		 0x000c</div><div class='add'>+#define OP_PCL_IPSEC_HMAC_SHA2_384_192		 0x000d</div><div class='add'>+#define OP_PCL_IPSEC_HMAC_SHA2_512_256		 0x000e</div><div class='ctx'> </div><div class='ctx'> /* For SRTP - OP_PCLID_SRTP */</div><div class='del'>-#define OP_PCL_SRTP_CIPHER_MASK                  0xff00</div><div class='del'>-#define OP_PCL_SRTP_AUTH_MASK                    0x00ff</div><div class='add'>+#define OP_PCL_SRTP_CIPHER_MASK			 0xff00</div><div class='add'>+#define OP_PCL_SRTP_AUTH_MASK			 0x00ff</div><div class='ctx'> </div><div class='del'>-#define OP_PCL_SRTP_AES_CTR                      0x0d00</div><div class='add'>+#define OP_PCL_SRTP_AES_CTR			 0x0d00</div><div class='ctx'> </div><div class='del'>-#define OP_PCL_SRTP_HMAC_SHA1_160                0x0007</div><div class='add'>+#define OP_PCL_SRTP_HMAC_SHA1_160		 0x0007</div><div class='ctx'> </div><div class='ctx'> /* For SSL 3.0 - OP_PCLID_SSL30 */</div><div class='del'>-#define OP_PCL_SSL30_AES_128_CBC_SHA             0x002f</div><div class='del'>-#define OP_PCL_SSL30_AES_128_CBC_SHA_2           0x0030</div><div class='del'>-#define OP_PCL_SSL30_AES_128_CBC_SHA_3           0x0031</div><div class='del'>-#define OP_PCL_SSL30_AES_128_CBC_SHA_4           0x0032</div><div class='del'>-#define OP_PCL_SSL30_AES_128_CBC_SHA_5           0x0033</div><div class='del'>-#define OP_PCL_SSL30_AES_128_CBC_SHA_6           0x0034</div><div class='del'>-#define OP_PCL_SSL30_AES_128_CBC_SHA_7           0x008c</div><div class='del'>-#define OP_PCL_SSL30_AES_128_CBC_SHA_8           0x0090</div><div class='del'>-#define OP_PCL_SSL30_AES_128_CBC_SHA_9           0x0094</div><div class='del'>-#define OP_PCL_SSL30_AES_128_CBC_SHA_10          0xc004</div><div class='del'>-#define OP_PCL_SSL30_AES_128_CBC_SHA_11          0xc009</div><div class='del'>-#define OP_PCL_SSL30_AES_128_CBC_SHA_12          0xc00e</div><div class='del'>-#define OP_PCL_SSL30_AES_128_CBC_SHA_13          0xc013</div><div class='del'>-#define OP_PCL_SSL30_AES_128_CBC_SHA_14          0xc018</div><div class='del'>-#define OP_PCL_SSL30_AES_128_CBC_SHA_15          0xc01d</div><div class='del'>-#define OP_PCL_SSL30_AES_128_CBC_SHA_16          0xc01e</div><div class='del'>-#define OP_PCL_SSL30_AES_128_CBC_SHA_17          0xc01f</div><div class='del'>-</div><div class='del'>-#define OP_PCL_SSL30_AES_256_CBC_SHA             0x0035</div><div class='del'>-#define OP_PCL_SSL30_AES_256_CBC_SHA_2           0x0036</div><div class='del'>-#define OP_PCL_SSL30_AES_256_CBC_SHA_3           0x0037</div><div class='del'>-#define OP_PCL_SSL30_AES_256_CBC_SHA_4           0x0038</div><div class='del'>-#define OP_PCL_SSL30_AES_256_CBC_SHA_5           0x0039</div><div class='del'>-#define OP_PCL_SSL30_AES_256_CBC_SHA_6           0x003a</div><div class='del'>-#define OP_PCL_SSL30_AES_256_CBC_SHA_7           0x008d</div><div class='del'>-#define OP_PCL_SSL30_AES_256_CBC_SHA_8           0x0091</div><div class='del'>-#define OP_PCL_SSL30_AES_256_CBC_SHA_9           0x0095</div><div class='del'>-#define OP_PCL_SSL30_AES_256_CBC_SHA_10          0xc005</div><div class='del'>-#define OP_PCL_SSL30_AES_256_CBC_SHA_11          0xc00a</div><div class='del'>-#define OP_PCL_SSL30_AES_256_CBC_SHA_12          0xc00f</div><div class='del'>-#define OP_PCL_SSL30_AES_256_CBC_SHA_13          0xc014</div><div class='del'>-#define OP_PCL_SSL30_AES_256_CBC_SHA_14          0xc019</div><div class='del'>-#define OP_PCL_SSL30_AES_256_CBC_SHA_15          0xc020</div><div class='del'>-#define OP_PCL_SSL30_AES_256_CBC_SHA_16          0xc021</div><div class='del'>-#define OP_PCL_SSL30_AES_256_CBC_SHA_17          0xc022</div><div class='del'>-</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_MD5            0x0023</div><div class='del'>-</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_SHA            0x001f</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_2          0x008b</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_3          0x008f</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_4          0x0093</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_5          0x000a</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_6          0x000d</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_7          0x0010</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_8          0x0013</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_9          0x0016</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_10         0x001b</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_11         0xc003</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_12         0xc008</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_13         0xc00d</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_14         0xc012</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_15         0xc017</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_16         0xc01a</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_17         0xc01b</div><div class='del'>-#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_18         0xc01c</div><div class='del'>-</div><div class='del'>-#define OP_PCL_SSL30_DES40_CBC_MD5               0x0029</div><div class='del'>-</div><div class='del'>-#define OP_PCL_SSL30_DES_CBC_MD5                 0x0022</div><div class='del'>-</div><div class='del'>-#define OP_PCL_SSL30_DES40_CBC_SHA               0x0008</div><div class='del'>-#define OP_PCL_SSL30_DES40_CBC_SHA_2             0x000b</div><div class='del'>-#define OP_PCL_SSL30_DES40_CBC_SHA_3             0x000e</div><div class='del'>-#define OP_PCL_SSL30_DES40_CBC_SHA_4             0x0011</div><div class='del'>-#define OP_PCL_SSL30_DES40_CBC_SHA_5             0x0014</div><div class='del'>-#define OP_PCL_SSL30_DES40_CBC_SHA_6             0x0019</div><div class='del'>-#define OP_PCL_SSL30_DES40_CBC_SHA_7             0x0026</div><div class='del'>-</div><div class='del'>-#define OP_PCL_SSL30_DES_CBC_SHA                 0x001e</div><div class='del'>-#define OP_PCL_SSL30_DES_CBC_SHA_2               0x0009</div><div class='del'>-#define OP_PCL_SSL30_DES_CBC_SHA_3               0x000c</div><div class='del'>-#define OP_PCL_SSL30_DES_CBC_SHA_4               0x000f</div><div class='del'>-#define OP_PCL_SSL30_DES_CBC_SHA_5               0x0012</div><div class='del'>-#define OP_PCL_SSL30_DES_CBC_SHA_6               0x0015</div><div class='del'>-#define OP_PCL_SSL30_DES_CBC_SHA_7               0x001a</div><div class='del'>-</div><div class='del'>-#define OP_PCL_SSL30_RC4_128_MD5                 0x0024</div><div class='del'>-#define OP_PCL_SSL30_RC4_128_MD5_2               0x0004</div><div class='del'>-#define OP_PCL_SSL30_RC4_128_MD5_3               0x0018</div><div class='del'>-</div><div class='del'>-#define OP_PCL_SSL30_RC4_40_MD5                  0x002b</div><div class='del'>-#define OP_PCL_SSL30_RC4_40_MD5_2                0x0003</div><div class='del'>-#define OP_PCL_SSL30_RC4_40_MD5_3                0x0017</div><div class='del'>-</div><div class='del'>-#define OP_PCL_SSL30_RC4_128_SHA                 0x0020</div><div class='del'>-#define OP_PCL_SSL30_RC4_128_SHA_2               0x008a</div><div class='del'>-#define OP_PCL_SSL30_RC4_128_SHA_3               0x008e</div><div class='del'>-#define OP_PCL_SSL30_RC4_128_SHA_4               0x0092</div><div class='del'>-#define OP_PCL_SSL30_RC4_128_SHA_5               0x0005</div><div class='del'>-#define OP_PCL_SSL30_RC4_128_SHA_6               0xc002</div><div class='del'>-#define OP_PCL_SSL30_RC4_128_SHA_7               0xc007</div><div class='del'>-#define OP_PCL_SSL30_RC4_128_SHA_8               0xc00c</div><div class='del'>-#define OP_PCL_SSL30_RC4_128_SHA_9               0xc011</div><div class='del'>-#define OP_PCL_SSL30_RC4_128_SHA_10              0xc016</div><div class='del'>-</div><div class='del'>-#define OP_PCL_SSL30_RC4_40_SHA                  0x0028</div><div class='add'>+#define OP_PCL_SSL30_AES_128_CBC_SHA		 0x002f</div><div class='add'>+#define OP_PCL_SSL30_AES_128_CBC_SHA_2		 0x0030</div><div class='add'>+#define OP_PCL_SSL30_AES_128_CBC_SHA_3		 0x0031</div><div class='add'>+#define OP_PCL_SSL30_AES_128_CBC_SHA_4		 0x0032</div><div class='add'>+#define OP_PCL_SSL30_AES_128_CBC_SHA_5		 0x0033</div><div class='add'>+#define OP_PCL_SSL30_AES_128_CBC_SHA_6		 0x0034</div><div class='add'>+#define OP_PCL_SSL30_AES_128_CBC_SHA_7		 0x008c</div><div class='add'>+#define OP_PCL_SSL30_AES_128_CBC_SHA_8		 0x0090</div><div class='add'>+#define OP_PCL_SSL30_AES_128_CBC_SHA_9		 0x0094</div><div class='add'>+#define OP_PCL_SSL30_AES_128_CBC_SHA_10		 0xc004</div><div class='add'>+#define OP_PCL_SSL30_AES_128_CBC_SHA_11		 0xc009</div><div class='add'>+#define OP_PCL_SSL30_AES_128_CBC_SHA_12		 0xc00e</div><div class='add'>+#define OP_PCL_SSL30_AES_128_CBC_SHA_13		 0xc013</div><div class='add'>+#define OP_PCL_SSL30_AES_128_CBC_SHA_14		 0xc018</div><div class='add'>+#define OP_PCL_SSL30_AES_128_CBC_SHA_15		 0xc01d</div><div class='add'>+#define OP_PCL_SSL30_AES_128_CBC_SHA_16		 0xc01e</div><div class='add'>+#define OP_PCL_SSL30_AES_128_CBC_SHA_17		 0xc01f</div><div class='add'>+</div><div class='add'>+#define OP_PCL_SSL30_AES_256_CBC_SHA		 0x0035</div><div class='add'>+#define OP_PCL_SSL30_AES_256_CBC_SHA_2		 0x0036</div><div class='add'>+#define OP_PCL_SSL30_AES_256_CBC_SHA_3		 0x0037</div><div class='add'>+#define OP_PCL_SSL30_AES_256_CBC_SHA_4		 0x0038</div><div class='add'>+#define OP_PCL_SSL30_AES_256_CBC_SHA_5		 0x0039</div><div class='add'>+#define OP_PCL_SSL30_AES_256_CBC_SHA_6		 0x003a</div><div class='add'>+#define OP_PCL_SSL30_AES_256_CBC_SHA_7		 0x008d</div><div class='add'>+#define OP_PCL_SSL30_AES_256_CBC_SHA_8		 0x0091</div><div class='add'>+#define OP_PCL_SSL30_AES_256_CBC_SHA_9		 0x0095</div><div class='add'>+#define OP_PCL_SSL30_AES_256_CBC_SHA_10		 0xc005</div><div class='add'>+#define OP_PCL_SSL30_AES_256_CBC_SHA_11		 0xc00a</div><div class='add'>+#define OP_PCL_SSL30_AES_256_CBC_SHA_12		 0xc00f</div><div class='add'>+#define OP_PCL_SSL30_AES_256_CBC_SHA_13		 0xc014</div><div class='add'>+#define OP_PCL_SSL30_AES_256_CBC_SHA_14		 0xc019</div><div class='add'>+#define OP_PCL_SSL30_AES_256_CBC_SHA_15		 0xc020</div><div class='add'>+#define OP_PCL_SSL30_AES_256_CBC_SHA_16		 0xc021</div><div class='add'>+#define OP_PCL_SSL30_AES_256_CBC_SHA_17		 0xc022</div><div class='add'>+</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_MD5		 0x0023</div><div class='add'>+</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_SHA		 0x001f</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_2		 0x008b</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_3		 0x008f</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_4		 0x0093</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_5		 0x000a</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_6		 0x000d</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_7		 0x0010</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_8		 0x0013</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_9		 0x0016</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_10	 0x001b</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_11	 0xc003</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_12	 0xc008</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_13	 0xc00d</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_14	 0xc012</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_15	 0xc017</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_16	 0xc01a</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_17	 0xc01b</div><div class='add'>+#define OP_PCL_SSL30_3DES_EDE_CBC_SHA_18	 0xc01c</div><div class='add'>+</div><div class='add'>+#define OP_PCL_SSL30_DES40_CBC_MD5		 0x0029</div><div class='add'>+</div><div class='add'>+#define OP_PCL_SSL30_DES_CBC_MD5		 0x0022</div><div class='add'>+</div><div class='add'>+#define OP_PCL_SSL30_DES40_CBC_SHA		 0x0008</div><div class='add'>+#define OP_PCL_SSL30_DES40_CBC_SHA_2		 0x000b</div><div class='add'>+#define OP_PCL_SSL30_DES40_CBC_SHA_3		 0x000e</div><div class='add'>+#define OP_PCL_SSL30_DES40_CBC_SHA_4		 0x0011</div><div class='add'>+#define OP_PCL_SSL30_DES40_CBC_SHA_5		 0x0014</div><div class='add'>+#define OP_PCL_SSL30_DES40_CBC_SHA_6		 0x0019</div><div class='add'>+#define OP_PCL_SSL30_DES40_CBC_SHA_7		 0x0026</div><div class='add'>+</div><div class='add'>+#define OP_PCL_SSL30_DES_CBC_SHA		 0x001e</div><div class='add'>+#define OP_PCL_SSL30_DES_CBC_SHA_2		 0x0009</div><div class='add'>+#define OP_PCL_SSL30_DES_CBC_SHA_3		 0x000c</div><div class='add'>+#define OP_PCL_SSL30_DES_CBC_SHA_4		 0x000f</div><div class='add'>+#define OP_PCL_SSL30_DES_CBC_SHA_5		 0x0012</div><div class='add'>+#define OP_PCL_SSL30_DES_CBC_SHA_6		 0x0015</div><div class='add'>+#define OP_PCL_SSL30_DES_CBC_SHA_7		 0x001a</div><div class='add'>+</div><div class='add'>+#define OP_PCL_SSL30_RC4_128_MD5		 0x0024</div><div class='add'>+#define OP_PCL_SSL30_RC4_128_MD5_2		 0x0004</div><div class='add'>+#define OP_PCL_SSL30_RC4_128_MD5_3		 0x0018</div><div class='add'>+</div><div class='add'>+#define OP_PCL_SSL30_RC4_40_MD5			 0x002b</div><div class='add'>+#define OP_PCL_SSL30_RC4_40_MD5_2		 0x0003</div><div class='add'>+#define OP_PCL_SSL30_RC4_40_MD5_3		 0x0017</div><div class='add'>+</div><div class='add'>+#define OP_PCL_SSL30_RC4_128_SHA		 0x0020</div><div class='add'>+#define OP_PCL_SSL30_RC4_128_SHA_2		 0x008a</div><div class='add'>+#define OP_PCL_SSL30_RC4_128_SHA_3		 0x008e</div><div class='add'>+#define OP_PCL_SSL30_RC4_128_SHA_4		 0x0092</div><div class='add'>+#define OP_PCL_SSL30_RC4_128_SHA_5		 0x0005</div><div class='add'>+#define OP_PCL_SSL30_RC4_128_SHA_6		 0xc002</div><div class='add'>+#define OP_PCL_SSL30_RC4_128_SHA_7		 0xc007</div><div class='add'>+#define OP_PCL_SSL30_RC4_128_SHA_8		 0xc00c</div><div class='add'>+#define OP_PCL_SSL30_RC4_128_SHA_9		 0xc011</div><div class='add'>+#define OP_PCL_SSL30_RC4_128_SHA_10		 0xc016</div><div class='add'>+</div><div class='add'>+#define OP_PCL_SSL30_RC4_40_SHA			 0x0028</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* For TLS 1.0 - OP_PCLID_TLS10 */</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA             0x002f</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA_2           0x0030</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA_3           0x0031</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA_4           0x0032</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA_5           0x0033</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA_6           0x0034</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA_7           0x008c</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA_8           0x0090</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA_9           0x0094</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA_10          0xc004</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA_11          0xc009</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA_12          0xc00e</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA_13          0xc013</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA_14          0xc018</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA_15          0xc01d</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA_16          0xc01e</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA_17          0xc01f</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA             0x0035</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA_2           0x0036</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA_3           0x0037</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA_4           0x0038</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA_5           0x0039</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA_6           0x003a</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA_7           0x008d</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA_8           0x0091</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA_9           0x0095</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA_10          0xc005</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA_11          0xc00a</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA_12          0xc00f</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA_13          0xc014</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA_14          0xc019</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA_15          0xc020</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA_16          0xc021</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA_17          0xc022</div><div class='del'>-</div><div class='del'>-/* #define OP_PCL_TLS10_3DES_EDE_CBC_MD5            0x0023 */</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA            0x001f</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_2          0x008b</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_3          0x008f</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_4          0x0093</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_5          0x000a</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_6          0x000d</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_7          0x0010</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_8          0x0013</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_9          0x0016</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_10         0x001b</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_11         0xc003</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_12         0xc008</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_13         0xc00d</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_14         0xc012</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_15         0xc017</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_16         0xc01a</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_17         0xc01b</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_18         0xc01c</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS10_DES40_CBC_MD5               0x0029</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS10_DES_CBC_MD5                 0x0022</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS10_DES40_CBC_SHA               0x0008</div><div class='del'>-#define OP_PCL_TLS10_DES40_CBC_SHA_2             0x000b</div><div class='del'>-#define OP_PCL_TLS10_DES40_CBC_SHA_3             0x000e</div><div class='del'>-#define OP_PCL_TLS10_DES40_CBC_SHA_4             0x0011</div><div class='del'>-#define OP_PCL_TLS10_DES40_CBC_SHA_5             0x0014</div><div class='del'>-#define OP_PCL_TLS10_DES40_CBC_SHA_6             0x0019</div><div class='del'>-#define OP_PCL_TLS10_DES40_CBC_SHA_7             0x0026</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS10_DES_CBC_SHA                 0x001e</div><div class='del'>-#define OP_PCL_TLS10_DES_CBC_SHA_2               0x0009</div><div class='del'>-#define OP_PCL_TLS10_DES_CBC_SHA_3               0x000c</div><div class='del'>-#define OP_PCL_TLS10_DES_CBC_SHA_4               0x000f</div><div class='del'>-#define OP_PCL_TLS10_DES_CBC_SHA_5               0x0012</div><div class='del'>-#define OP_PCL_TLS10_DES_CBC_SHA_6               0x0015</div><div class='del'>-#define OP_PCL_TLS10_DES_CBC_SHA_7               0x001a</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS10_RC4_128_MD5                 0x0024</div><div class='del'>-#define OP_PCL_TLS10_RC4_128_MD5_2               0x0004</div><div class='del'>-#define OP_PCL_TLS10_RC4_128_MD5_3               0x0018</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS10_RC4_40_MD5                  0x002b</div><div class='del'>-#define OP_PCL_TLS10_RC4_40_MD5_2                0x0003</div><div class='del'>-#define OP_PCL_TLS10_RC4_40_MD5_3                0x0017</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS10_RC4_128_SHA                 0x0020</div><div class='del'>-#define OP_PCL_TLS10_RC4_128_SHA_2               0x008a</div><div class='del'>-#define OP_PCL_TLS10_RC4_128_SHA_3               0x008e</div><div class='del'>-#define OP_PCL_TLS10_RC4_128_SHA_4               0x0092</div><div class='del'>-#define OP_PCL_TLS10_RC4_128_SHA_5               0x0005</div><div class='del'>-#define OP_PCL_TLS10_RC4_128_SHA_6               0xc002</div><div class='del'>-#define OP_PCL_TLS10_RC4_128_SHA_7               0xc007</div><div class='del'>-#define OP_PCL_TLS10_RC4_128_SHA_8               0xc00c</div><div class='del'>-#define OP_PCL_TLS10_RC4_128_SHA_9               0xc011</div><div class='del'>-#define OP_PCL_TLS10_RC4_128_SHA_10              0xc016</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS10_RC4_40_SHA                  0x0028</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_MD5            0xff23</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA160         0xff30</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA224         0xff34</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA256         0xff36</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA384         0xff33</div><div class='del'>-#define OP_PCL_TLS10_3DES_EDE_CBC_SHA512         0xff35</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA160          0xff80</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA224          0xff84</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA256          0xff86</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA384          0xff83</div><div class='del'>-#define OP_PCL_TLS10_AES_128_CBC_SHA512          0xff85</div><div class='del'>-#define OP_PCL_TLS10_AES_192_CBC_SHA160          0xff20</div><div class='del'>-#define OP_PCL_TLS10_AES_192_CBC_SHA224          0xff24</div><div class='del'>-#define OP_PCL_TLS10_AES_192_CBC_SHA256          0xff26</div><div class='del'>-#define OP_PCL_TLS10_AES_192_CBC_SHA384          0xff23</div><div class='del'>-#define OP_PCL_TLS10_AES_192_CBC_SHA512          0xff25</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA160          0xff60</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA224          0xff64</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA256          0xff66</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA384          0xff63</div><div class='del'>-#define OP_PCL_TLS10_AES_256_CBC_SHA512          0xff65</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA		 0x002f</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA_2		 0x0030</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA_3		 0x0031</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA_4		 0x0032</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA_5		 0x0033</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA_6		 0x0034</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA_7		 0x008c</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA_8		 0x0090</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA_9		 0x0094</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA_10		 0xc004</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA_11		 0xc009</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA_12		 0xc00e</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA_13		 0xc013</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA_14		 0xc018</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA_15		 0xc01d</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA_16		 0xc01e</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA_17		 0xc01f</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA		 0x0035</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA_2		 0x0036</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA_3		 0x0037</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA_4		 0x0038</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA_5		 0x0039</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA_6		 0x003a</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA_7		 0x008d</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA_8		 0x0091</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA_9		 0x0095</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA_10		 0xc005</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA_11		 0xc00a</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA_12		 0xc00f</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA_13		 0xc014</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA_14		 0xc019</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA_15		 0xc020</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA_16		 0xc021</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA_17		 0xc022</div><div class='add'>+</div><div class='add'>+/* #define OP_PCL_TLS10_3DES_EDE_CBC_MD5	0x0023 */</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA		 0x001f</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_2		 0x008b</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_3		 0x008f</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_4		 0x0093</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_5		 0x000a</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_6		 0x000d</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_7		 0x0010</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_8		 0x0013</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_9		 0x0016</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_10	 0x001b</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_11	 0xc003</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_12	 0xc008</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_13	 0xc00d</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_14	 0xc012</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_15	 0xc017</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_16	 0xc01a</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_17	 0xc01b</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA_18	 0xc01c</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS10_DES40_CBC_MD5		 0x0029</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS10_DES_CBC_MD5		 0x0022</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS10_DES40_CBC_SHA		 0x0008</div><div class='add'>+#define OP_PCL_TLS10_DES40_CBC_SHA_2		 0x000b</div><div class='add'>+#define OP_PCL_TLS10_DES40_CBC_SHA_3		 0x000e</div><div class='add'>+#define OP_PCL_TLS10_DES40_CBC_SHA_4		 0x0011</div><div class='add'>+#define OP_PCL_TLS10_DES40_CBC_SHA_5		 0x0014</div><div class='add'>+#define OP_PCL_TLS10_DES40_CBC_SHA_6		 0x0019</div><div class='add'>+#define OP_PCL_TLS10_DES40_CBC_SHA_7		 0x0026</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS10_DES_CBC_SHA		 0x001e</div><div class='add'>+#define OP_PCL_TLS10_DES_CBC_SHA_2		 0x0009</div><div class='add'>+#define OP_PCL_TLS10_DES_CBC_SHA_3		 0x000c</div><div class='add'>+#define OP_PCL_TLS10_DES_CBC_SHA_4		 0x000f</div><div class='add'>+#define OP_PCL_TLS10_DES_CBC_SHA_5		 0x0012</div><div class='add'>+#define OP_PCL_TLS10_DES_CBC_SHA_6		 0x0015</div><div class='add'>+#define OP_PCL_TLS10_DES_CBC_SHA_7		 0x001a</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS10_RC4_128_MD5		 0x0024</div><div class='add'>+#define OP_PCL_TLS10_RC4_128_MD5_2		 0x0004</div><div class='add'>+#define OP_PCL_TLS10_RC4_128_MD5_3		 0x0018</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS10_RC4_40_MD5			 0x002b</div><div class='add'>+#define OP_PCL_TLS10_RC4_40_MD5_2		 0x0003</div><div class='add'>+#define OP_PCL_TLS10_RC4_40_MD5_3		 0x0017</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS10_RC4_128_SHA		 0x0020</div><div class='add'>+#define OP_PCL_TLS10_RC4_128_SHA_2		 0x008a</div><div class='add'>+#define OP_PCL_TLS10_RC4_128_SHA_3		 0x008e</div><div class='add'>+#define OP_PCL_TLS10_RC4_128_SHA_4		 0x0092</div><div class='add'>+#define OP_PCL_TLS10_RC4_128_SHA_5		 0x0005</div><div class='add'>+#define OP_PCL_TLS10_RC4_128_SHA_6		 0xc002</div><div class='add'>+#define OP_PCL_TLS10_RC4_128_SHA_7		 0xc007</div><div class='add'>+#define OP_PCL_TLS10_RC4_128_SHA_8		 0xc00c</div><div class='add'>+#define OP_PCL_TLS10_RC4_128_SHA_9		 0xc011</div><div class='add'>+#define OP_PCL_TLS10_RC4_128_SHA_10		 0xc016</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS10_RC4_40_SHA			 0x0028</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_MD5		 0xff23</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA160	 0xff30</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA224	 0xff34</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA256	 0xff36</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA384	 0xff33</div><div class='add'>+#define OP_PCL_TLS10_3DES_EDE_CBC_SHA512	 0xff35</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA160		 0xff80</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA224		 0xff84</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA256		 0xff86</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA384		 0xff83</div><div class='add'>+#define OP_PCL_TLS10_AES_128_CBC_SHA512		 0xff85</div><div class='add'>+#define OP_PCL_TLS10_AES_192_CBC_SHA160		 0xff20</div><div class='add'>+#define OP_PCL_TLS10_AES_192_CBC_SHA224		 0xff24</div><div class='add'>+#define OP_PCL_TLS10_AES_192_CBC_SHA256		 0xff26</div><div class='add'>+#define OP_PCL_TLS10_AES_192_CBC_SHA384		 0xff23</div><div class='add'>+#define OP_PCL_TLS10_AES_192_CBC_SHA512		 0xff25</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA160		 0xff60</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA224		 0xff64</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA256		 0xff66</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA384		 0xff63</div><div class='add'>+#define OP_PCL_TLS10_AES_256_CBC_SHA512		 0xff65</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* For TLS 1.1 - OP_PCLID_TLS11 */</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA             0x002f</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA_2           0x0030</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA_3           0x0031</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA_4           0x0032</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA_5           0x0033</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA_6           0x0034</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA_7           0x008c</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA_8           0x0090</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA_9           0x0094</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA_10          0xc004</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA_11          0xc009</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA_12          0xc00e</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA_13          0xc013</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA_14          0xc018</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA_15          0xc01d</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA_16          0xc01e</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA_17          0xc01f</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA             0x0035</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA_2           0x0036</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA_3           0x0037</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA_4           0x0038</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA_5           0x0039</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA_6           0x003a</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA_7           0x008d</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA_8           0x0091</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA_9           0x0095</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA_10          0xc005</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA_11          0xc00a</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA_12          0xc00f</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA_13          0xc014</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA_14          0xc019</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA_15          0xc020</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA_16          0xc021</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA_17          0xc022</div><div class='del'>-</div><div class='del'>-/* #define OP_PCL_TLS11_3DES_EDE_CBC_MD5            0x0023 */</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA            0x001f</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_2          0x008b</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_3          0x008f</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_4          0x0093</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_5          0x000a</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_6          0x000d</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_7          0x0010</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_8          0x0013</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_9          0x0016</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_10         0x001b</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_11         0xc003</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_12         0xc008</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_13         0xc00d</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_14         0xc012</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_15         0xc017</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_16         0xc01a</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_17         0xc01b</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_18         0xc01c</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS11_DES40_CBC_MD5               0x0029</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS11_DES_CBC_MD5                 0x0022</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS11_DES40_CBC_SHA               0x0008</div><div class='del'>-#define OP_PCL_TLS11_DES40_CBC_SHA_2             0x000b</div><div class='del'>-#define OP_PCL_TLS11_DES40_CBC_SHA_3             0x000e</div><div class='del'>-#define OP_PCL_TLS11_DES40_CBC_SHA_4             0x0011</div><div class='del'>-#define OP_PCL_TLS11_DES40_CBC_SHA_5             0x0014</div><div class='del'>-#define OP_PCL_TLS11_DES40_CBC_SHA_6             0x0019</div><div class='del'>-#define OP_PCL_TLS11_DES40_CBC_SHA_7             0x0026</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS11_DES_CBC_SHA                 0x001e</div><div class='del'>-#define OP_PCL_TLS11_DES_CBC_SHA_2               0x0009</div><div class='del'>-#define OP_PCL_TLS11_DES_CBC_SHA_3               0x000c</div><div class='del'>-#define OP_PCL_TLS11_DES_CBC_SHA_4               0x000f</div><div class='del'>-#define OP_PCL_TLS11_DES_CBC_SHA_5               0x0012</div><div class='del'>-#define OP_PCL_TLS11_DES_CBC_SHA_6               0x0015</div><div class='del'>-#define OP_PCL_TLS11_DES_CBC_SHA_7               0x001a</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS11_RC4_128_MD5                 0x0024</div><div class='del'>-#define OP_PCL_TLS11_RC4_128_MD5_2               0x0004</div><div class='del'>-#define OP_PCL_TLS11_RC4_128_MD5_3               0x0018</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS11_RC4_40_MD5                  0x002b</div><div class='del'>-#define OP_PCL_TLS11_RC4_40_MD5_2                0x0003</div><div class='del'>-#define OP_PCL_TLS11_RC4_40_MD5_3                0x0017</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS11_RC4_128_SHA                 0x0020</div><div class='del'>-#define OP_PCL_TLS11_RC4_128_SHA_2               0x008a</div><div class='del'>-#define OP_PCL_TLS11_RC4_128_SHA_3               0x008e</div><div class='del'>-#define OP_PCL_TLS11_RC4_128_SHA_4               0x0092</div><div class='del'>-#define OP_PCL_TLS11_RC4_128_SHA_5               0x0005</div><div class='del'>-#define OP_PCL_TLS11_RC4_128_SHA_6               0xc002</div><div class='del'>-#define OP_PCL_TLS11_RC4_128_SHA_7               0xc007</div><div class='del'>-#define OP_PCL_TLS11_RC4_128_SHA_8               0xc00c</div><div class='del'>-#define OP_PCL_TLS11_RC4_128_SHA_9               0xc011</div><div class='del'>-#define OP_PCL_TLS11_RC4_128_SHA_10              0xc016</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS11_RC4_40_SHA                  0x0028</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_MD5            0xff23</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA160         0xff30</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA224         0xff34</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA256         0xff36</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA384         0xff33</div><div class='del'>-#define OP_PCL_TLS11_3DES_EDE_CBC_SHA512         0xff35</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA160          0xff80</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA224          0xff84</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA256          0xff86</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA384          0xff83</div><div class='del'>-#define OP_PCL_TLS11_AES_128_CBC_SHA512          0xff85</div><div class='del'>-#define OP_PCL_TLS11_AES_192_CBC_SHA160          0xff20</div><div class='del'>-#define OP_PCL_TLS11_AES_192_CBC_SHA224          0xff24</div><div class='del'>-#define OP_PCL_TLS11_AES_192_CBC_SHA256          0xff26</div><div class='del'>-#define OP_PCL_TLS11_AES_192_CBC_SHA384          0xff23</div><div class='del'>-#define OP_PCL_TLS11_AES_192_CBC_SHA512          0xff25</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA160          0xff60</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA224          0xff64</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA256          0xff66</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA384          0xff63</div><div class='del'>-#define OP_PCL_TLS11_AES_256_CBC_SHA512          0xff65</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA		 0x002f</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA_2		 0x0030</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA_3		 0x0031</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA_4		 0x0032</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA_5		 0x0033</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA_6		 0x0034</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA_7		 0x008c</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA_8		 0x0090</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA_9		 0x0094</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA_10		 0xc004</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA_11		 0xc009</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA_12		 0xc00e</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA_13		 0xc013</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA_14		 0xc018</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA_15		 0xc01d</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA_16		 0xc01e</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA_17		 0xc01f</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA		 0x0035</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA_2		 0x0036</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA_3		 0x0037</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA_4		 0x0038</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA_5		 0x0039</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA_6		 0x003a</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA_7		 0x008d</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA_8		 0x0091</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA_9		 0x0095</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA_10		 0xc005</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA_11		 0xc00a</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA_12		 0xc00f</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA_13		 0xc014</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA_14		 0xc019</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA_15		 0xc020</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA_16		 0xc021</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA_17		 0xc022</div><div class='add'>+</div><div class='add'>+/* #define OP_PCL_TLS11_3DES_EDE_CBC_MD5	0x0023 */</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA		 0x001f</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_2		 0x008b</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_3		 0x008f</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_4		 0x0093</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_5		 0x000a</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_6		 0x000d</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_7		 0x0010</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_8		 0x0013</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_9		 0x0016</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_10	 0x001b</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_11	 0xc003</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_12	 0xc008</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_13	 0xc00d</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_14	 0xc012</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_15	 0xc017</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_16	 0xc01a</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_17	 0xc01b</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA_18	 0xc01c</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS11_DES40_CBC_MD5		 0x0029</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS11_DES_CBC_MD5		 0x0022</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS11_DES40_CBC_SHA		 0x0008</div><div class='add'>+#define OP_PCL_TLS11_DES40_CBC_SHA_2		 0x000b</div><div class='add'>+#define OP_PCL_TLS11_DES40_CBC_SHA_3		 0x000e</div><div class='add'>+#define OP_PCL_TLS11_DES40_CBC_SHA_4		 0x0011</div><div class='add'>+#define OP_PCL_TLS11_DES40_CBC_SHA_5		 0x0014</div><div class='add'>+#define OP_PCL_TLS11_DES40_CBC_SHA_6		 0x0019</div><div class='add'>+#define OP_PCL_TLS11_DES40_CBC_SHA_7		 0x0026</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS11_DES_CBC_SHA		 0x001e</div><div class='add'>+#define OP_PCL_TLS11_DES_CBC_SHA_2		 0x0009</div><div class='add'>+#define OP_PCL_TLS11_DES_CBC_SHA_3		 0x000c</div><div class='add'>+#define OP_PCL_TLS11_DES_CBC_SHA_4		 0x000f</div><div class='add'>+#define OP_PCL_TLS11_DES_CBC_SHA_5		 0x0012</div><div class='add'>+#define OP_PCL_TLS11_DES_CBC_SHA_6		 0x0015</div><div class='add'>+#define OP_PCL_TLS11_DES_CBC_SHA_7		 0x001a</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS11_RC4_128_MD5		 0x0024</div><div class='add'>+#define OP_PCL_TLS11_RC4_128_MD5_2		 0x0004</div><div class='add'>+#define OP_PCL_TLS11_RC4_128_MD5_3		 0x0018</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS11_RC4_40_MD5			 0x002b</div><div class='add'>+#define OP_PCL_TLS11_RC4_40_MD5_2		 0x0003</div><div class='add'>+#define OP_PCL_TLS11_RC4_40_MD5_3		 0x0017</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS11_RC4_128_SHA		 0x0020</div><div class='add'>+#define OP_PCL_TLS11_RC4_128_SHA_2		 0x008a</div><div class='add'>+#define OP_PCL_TLS11_RC4_128_SHA_3		 0x008e</div><div class='add'>+#define OP_PCL_TLS11_RC4_128_SHA_4		 0x0092</div><div class='add'>+#define OP_PCL_TLS11_RC4_128_SHA_5		 0x0005</div><div class='add'>+#define OP_PCL_TLS11_RC4_128_SHA_6		 0xc002</div><div class='add'>+#define OP_PCL_TLS11_RC4_128_SHA_7		 0xc007</div><div class='add'>+#define OP_PCL_TLS11_RC4_128_SHA_8		 0xc00c</div><div class='add'>+#define OP_PCL_TLS11_RC4_128_SHA_9		 0xc011</div><div class='add'>+#define OP_PCL_TLS11_RC4_128_SHA_10		 0xc016</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS11_RC4_40_SHA			 0x0028</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_MD5		 0xff23</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA160	 0xff30</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA224	 0xff34</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA256	 0xff36</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA384	 0xff33</div><div class='add'>+#define OP_PCL_TLS11_3DES_EDE_CBC_SHA512	 0xff35</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA160		 0xff80</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA224		 0xff84</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA256		 0xff86</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA384		 0xff83</div><div class='add'>+#define OP_PCL_TLS11_AES_128_CBC_SHA512		 0xff85</div><div class='add'>+#define OP_PCL_TLS11_AES_192_CBC_SHA160		 0xff20</div><div class='add'>+#define OP_PCL_TLS11_AES_192_CBC_SHA224		 0xff24</div><div class='add'>+#define OP_PCL_TLS11_AES_192_CBC_SHA256		 0xff26</div><div class='add'>+#define OP_PCL_TLS11_AES_192_CBC_SHA384		 0xff23</div><div class='add'>+#define OP_PCL_TLS11_AES_192_CBC_SHA512		 0xff25</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA160		 0xff60</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA224		 0xff64</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA256		 0xff66</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA384		 0xff63</div><div class='add'>+#define OP_PCL_TLS11_AES_256_CBC_SHA512		 0xff65</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* For TLS 1.2 - OP_PCLID_TLS12 */</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA             0x002f</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA_2           0x0030</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA_3           0x0031</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA_4           0x0032</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA_5           0x0033</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA_6           0x0034</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA_7           0x008c</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA_8           0x0090</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA_9           0x0094</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA_10          0xc004</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA_11          0xc009</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA_12          0xc00e</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA_13          0xc013</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA_14          0xc018</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA_15          0xc01d</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA_16          0xc01e</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA_17          0xc01f</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA             0x0035</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA_2           0x0036</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA_3           0x0037</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA_4           0x0038</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA_5           0x0039</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA_6           0x003a</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA_7           0x008d</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA_8           0x0091</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA_9           0x0095</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA_10          0xc005</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA_11          0xc00a</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA_12          0xc00f</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA_13          0xc014</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA_14          0xc019</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA_15          0xc020</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA_16          0xc021</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA_17          0xc022</div><div class='del'>-</div><div class='del'>-/* #define OP_PCL_TLS12_3DES_EDE_CBC_MD5            0x0023 */</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA            0x001f</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_2          0x008b</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_3          0x008f</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_4          0x0093</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_5          0x000a</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_6          0x000d</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_7          0x0010</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_8          0x0013</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_9          0x0016</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_10         0x001b</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_11         0xc003</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_12         0xc008</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_13         0xc00d</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_14         0xc012</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_15         0xc017</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_16         0xc01a</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_17         0xc01b</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_18         0xc01c</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS12_DES40_CBC_MD5               0x0029</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS12_DES_CBC_MD5                 0x0022</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS12_DES40_CBC_SHA               0x0008</div><div class='del'>-#define OP_PCL_TLS12_DES40_CBC_SHA_2             0x000b</div><div class='del'>-#define OP_PCL_TLS12_DES40_CBC_SHA_3             0x000e</div><div class='del'>-#define OP_PCL_TLS12_DES40_CBC_SHA_4             0x0011</div><div class='del'>-#define OP_PCL_TLS12_DES40_CBC_SHA_5             0x0014</div><div class='del'>-#define OP_PCL_TLS12_DES40_CBC_SHA_6             0x0019</div><div class='del'>-#define OP_PCL_TLS12_DES40_CBC_SHA_7             0x0026</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS12_DES_CBC_SHA                 0x001e</div><div class='del'>-#define OP_PCL_TLS12_DES_CBC_SHA_2               0x0009</div><div class='del'>-#define OP_PCL_TLS12_DES_CBC_SHA_3               0x000c</div><div class='del'>-#define OP_PCL_TLS12_DES_CBC_SHA_4               0x000f</div><div class='del'>-#define OP_PCL_TLS12_DES_CBC_SHA_5               0x0012</div><div class='del'>-#define OP_PCL_TLS12_DES_CBC_SHA_6               0x0015</div><div class='del'>-#define OP_PCL_TLS12_DES_CBC_SHA_7               0x001a</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS12_RC4_128_MD5                 0x0024</div><div class='del'>-#define OP_PCL_TLS12_RC4_128_MD5_2               0x0004</div><div class='del'>-#define OP_PCL_TLS12_RC4_128_MD5_3               0x0018</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS12_RC4_40_MD5                  0x002b</div><div class='del'>-#define OP_PCL_TLS12_RC4_40_MD5_2                0x0003</div><div class='del'>-#define OP_PCL_TLS12_RC4_40_MD5_3                0x0017</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS12_RC4_128_SHA                 0x0020</div><div class='del'>-#define OP_PCL_TLS12_RC4_128_SHA_2               0x008a</div><div class='del'>-#define OP_PCL_TLS12_RC4_128_SHA_3               0x008e</div><div class='del'>-#define OP_PCL_TLS12_RC4_128_SHA_4               0x0092</div><div class='del'>-#define OP_PCL_TLS12_RC4_128_SHA_5               0x0005</div><div class='del'>-#define OP_PCL_TLS12_RC4_128_SHA_6               0xc002</div><div class='del'>-#define OP_PCL_TLS12_RC4_128_SHA_7               0xc007</div><div class='del'>-#define OP_PCL_TLS12_RC4_128_SHA_8               0xc00c</div><div class='del'>-#define OP_PCL_TLS12_RC4_128_SHA_9               0xc011</div><div class='del'>-#define OP_PCL_TLS12_RC4_128_SHA_10              0xc016</div><div class='del'>-</div><div class='del'>-#define OP_PCL_TLS12_RC4_40_SHA                  0x0028</div><div class='del'>-</div><div class='del'>-/* #define OP_PCL_TLS12_AES_128_CBC_SHA256          0x003c */</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA256_2        0x003e</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA256_3        0x003f</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA256_4        0x0040</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA256_5        0x0067</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA256_6        0x006c</div><div class='del'>-</div><div class='del'>-/* #define OP_PCL_TLS12_AES_256_CBC_SHA256          0x003d */</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA256_2        0x0068</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA256_3        0x0069</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA256_4        0x006a</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA256_5        0x006b</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA256_6        0x006d</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA		 0x002f</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA_2		 0x0030</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA_3		 0x0031</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA_4		 0x0032</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA_5		 0x0033</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA_6		 0x0034</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA_7		 0x008c</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA_8		 0x0090</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA_9		 0x0094</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA_10		 0xc004</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA_11		 0xc009</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA_12		 0xc00e</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA_13		 0xc013</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA_14		 0xc018</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA_15		 0xc01d</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA_16		 0xc01e</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA_17		 0xc01f</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA		 0x0035</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA_2		 0x0036</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA_3		 0x0037</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA_4		 0x0038</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA_5		 0x0039</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA_6		 0x003a</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA_7		 0x008d</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA_8		 0x0091</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA_9		 0x0095</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA_10		 0xc005</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA_11		 0xc00a</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA_12		 0xc00f</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA_13		 0xc014</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA_14		 0xc019</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA_15		 0xc020</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA_16		 0xc021</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA_17		 0xc022</div><div class='add'>+</div><div class='add'>+/* #define OP_PCL_TLS12_3DES_EDE_CBC_MD5	0x0023 */</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA		 0x001f</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_2		 0x008b</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_3		 0x008f</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_4		 0x0093</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_5		 0x000a</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_6		 0x000d</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_7		 0x0010</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_8		 0x0013</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_9		 0x0016</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_10	 0x001b</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_11	 0xc003</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_12	 0xc008</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_13	 0xc00d</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_14	 0xc012</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_15	 0xc017</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_16	 0xc01a</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_17	 0xc01b</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA_18	 0xc01c</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS12_DES40_CBC_MD5		 0x0029</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS12_DES_CBC_MD5		 0x0022</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS12_DES40_CBC_SHA		 0x0008</div><div class='add'>+#define OP_PCL_TLS12_DES40_CBC_SHA_2		 0x000b</div><div class='add'>+#define OP_PCL_TLS12_DES40_CBC_SHA_3		 0x000e</div><div class='add'>+#define OP_PCL_TLS12_DES40_CBC_SHA_4		 0x0011</div><div class='add'>+#define OP_PCL_TLS12_DES40_CBC_SHA_5		 0x0014</div><div class='add'>+#define OP_PCL_TLS12_DES40_CBC_SHA_6		 0x0019</div><div class='add'>+#define OP_PCL_TLS12_DES40_CBC_SHA_7		 0x0026</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS12_DES_CBC_SHA		 0x001e</div><div class='add'>+#define OP_PCL_TLS12_DES_CBC_SHA_2		 0x0009</div><div class='add'>+#define OP_PCL_TLS12_DES_CBC_SHA_3		 0x000c</div><div class='add'>+#define OP_PCL_TLS12_DES_CBC_SHA_4		 0x000f</div><div class='add'>+#define OP_PCL_TLS12_DES_CBC_SHA_5		 0x0012</div><div class='add'>+#define OP_PCL_TLS12_DES_CBC_SHA_6		 0x0015</div><div class='add'>+#define OP_PCL_TLS12_DES_CBC_SHA_7		 0x001a</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS12_RC4_128_MD5		 0x0024</div><div class='add'>+#define OP_PCL_TLS12_RC4_128_MD5_2		 0x0004</div><div class='add'>+#define OP_PCL_TLS12_RC4_128_MD5_3		 0x0018</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS12_RC4_40_MD5			 0x002b</div><div class='add'>+#define OP_PCL_TLS12_RC4_40_MD5_2		 0x0003</div><div class='add'>+#define OP_PCL_TLS12_RC4_40_MD5_3		 0x0017</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS12_RC4_128_SHA		 0x0020</div><div class='add'>+#define OP_PCL_TLS12_RC4_128_SHA_2		 0x008a</div><div class='add'>+#define OP_PCL_TLS12_RC4_128_SHA_3		 0x008e</div><div class='add'>+#define OP_PCL_TLS12_RC4_128_SHA_4		 0x0092</div><div class='add'>+#define OP_PCL_TLS12_RC4_128_SHA_5		 0x0005</div><div class='add'>+#define OP_PCL_TLS12_RC4_128_SHA_6		 0xc002</div><div class='add'>+#define OP_PCL_TLS12_RC4_128_SHA_7		 0xc007</div><div class='add'>+#define OP_PCL_TLS12_RC4_128_SHA_8		 0xc00c</div><div class='add'>+#define OP_PCL_TLS12_RC4_128_SHA_9		 0xc011</div><div class='add'>+#define OP_PCL_TLS12_RC4_128_SHA_10		 0xc016</div><div class='add'>+</div><div class='add'>+#define OP_PCL_TLS12_RC4_40_SHA			 0x0028</div><div class='add'>+</div><div class='add'>+/* #define OP_PCL_TLS12_AES_128_CBC_SHA256	0x003c */</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA256_2	 0x003e</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA256_3	 0x003f</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA256_4	 0x0040</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA256_5	 0x0067</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA256_6	 0x006c</div><div class='add'>+</div><div class='add'>+/* #define OP_PCL_TLS12_AES_256_CBC_SHA256	0x003d */</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA256_2	 0x0068</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA256_3	 0x0069</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA256_4	 0x006a</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA256_5	 0x006b</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA256_6	 0x006d</div><div class='ctx'> </div><div class='ctx'> /* AEAD_AES_xxx_CCM/GCM remain to be defined... */</div><div class='ctx'> </div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_MD5            0xff23</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA160         0xff30</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA224         0xff34</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA256         0xff36</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA384         0xff33</div><div class='del'>-#define OP_PCL_TLS12_3DES_EDE_CBC_SHA512         0xff35</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA160          0xff80</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA224          0xff84</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA256          0xff86</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA384          0xff83</div><div class='del'>-#define OP_PCL_TLS12_AES_128_CBC_SHA512          0xff85</div><div class='del'>-#define OP_PCL_TLS12_AES_192_CBC_SHA160          0xff20</div><div class='del'>-#define OP_PCL_TLS12_AES_192_CBC_SHA224          0xff24</div><div class='del'>-#define OP_PCL_TLS12_AES_192_CBC_SHA256          0xff26</div><div class='del'>-#define OP_PCL_TLS12_AES_192_CBC_SHA384          0xff23</div><div class='del'>-#define OP_PCL_TLS12_AES_192_CBC_SHA512          0xff25</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA160          0xff60</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA224          0xff64</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA256          0xff66</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA384          0xff63</div><div class='del'>-#define OP_PCL_TLS12_AES_256_CBC_SHA512          0xff65</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_MD5		 0xff23</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA160	 0xff30</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA224	 0xff34</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA256	 0xff36</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA384	 0xff33</div><div class='add'>+#define OP_PCL_TLS12_3DES_EDE_CBC_SHA512	 0xff35</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA160		 0xff80</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA224		 0xff84</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA256		 0xff86</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA384		 0xff83</div><div class='add'>+#define OP_PCL_TLS12_AES_128_CBC_SHA512		 0xff85</div><div class='add'>+#define OP_PCL_TLS12_AES_192_CBC_SHA160		 0xff20</div><div class='add'>+#define OP_PCL_TLS12_AES_192_CBC_SHA224		 0xff24</div><div class='add'>+#define OP_PCL_TLS12_AES_192_CBC_SHA256		 0xff26</div><div class='add'>+#define OP_PCL_TLS12_AES_192_CBC_SHA384		 0xff23</div><div class='add'>+#define OP_PCL_TLS12_AES_192_CBC_SHA512		 0xff25</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA160		 0xff60</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA224		 0xff64</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA256		 0xff66</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA384		 0xff63</div><div class='add'>+#define OP_PCL_TLS12_AES_256_CBC_SHA512		 0xff65</div><div class='ctx'> </div><div class='ctx'> /* For DTLS - OP_PCLID_DTLS */</div><div class='ctx'> </div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA              0x002f</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA_2            0x0030</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA_3            0x0031</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA_4            0x0032</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA_5            0x0033</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA_6            0x0034</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA_7            0x008c</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA_8            0x0090</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA_9            0x0094</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA_10           0xc004</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA_11           0xc009</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA_12           0xc00e</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA_13           0xc013</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA_14           0xc018</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA_15           0xc01d</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA_16           0xc01e</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA_17           0xc01f</div><div class='del'>-</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA              0x0035</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA_2            0x0036</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA_3            0x0037</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA_4            0x0038</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA_5            0x0039</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA_6            0x003a</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA_7            0x008d</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA_8            0x0091</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA_9            0x0095</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA_10           0xc005</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA_11           0xc00a</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA_12           0xc00f</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA_13           0xc014</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA_14           0xc019</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA_15           0xc020</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA_16           0xc021</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA_17           0xc022</div><div class='del'>-</div><div class='del'>-/* #define OP_PCL_DTLS_3DES_EDE_CBC_MD5             0x0023 */</div><div class='del'>-</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA             0x001f</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_2           0x008b</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_3           0x008f</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_4           0x0093</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_5           0x000a</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_6           0x000d</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_7           0x0010</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_8           0x0013</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_9           0x0016</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_10          0x001b</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_11          0xc003</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_12          0xc008</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_13          0xc00d</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_14          0xc012</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_15          0xc017</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_16          0xc01a</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_17          0xc01b</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_18          0xc01c</div><div class='del'>-</div><div class='del'>-#define OP_PCL_DTLS_DES40_CBC_MD5                0x0029</div><div class='del'>-</div><div class='del'>-#define OP_PCL_DTLS_DES_CBC_MD5                  0x0022</div><div class='del'>-</div><div class='del'>-#define OP_PCL_DTLS_DES40_CBC_SHA                0x0008</div><div class='del'>-#define OP_PCL_DTLS_DES40_CBC_SHA_2              0x000b</div><div class='del'>-#define OP_PCL_DTLS_DES40_CBC_SHA_3              0x000e</div><div class='del'>-#define OP_PCL_DTLS_DES40_CBC_SHA_4              0x0011</div><div class='del'>-#define OP_PCL_DTLS_DES40_CBC_SHA_5              0x0014</div><div class='del'>-#define OP_PCL_DTLS_DES40_CBC_SHA_6              0x0019</div><div class='del'>-#define OP_PCL_DTLS_DES40_CBC_SHA_7              0x0026</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define OP_PCL_DTLS_DES_CBC_SHA                  0x001e</div><div class='del'>-#define OP_PCL_DTLS_DES_CBC_SHA_2                0x0009</div><div class='del'>-#define OP_PCL_DTLS_DES_CBC_SHA_3                0x000c</div><div class='del'>-#define OP_PCL_DTLS_DES_CBC_SHA_4                0x000f</div><div class='del'>-#define OP_PCL_DTLS_DES_CBC_SHA_5                0x0012</div><div class='del'>-#define OP_PCL_DTLS_DES_CBC_SHA_6                0x0015</div><div class='del'>-#define OP_PCL_DTLS_DES_CBC_SHA_7                0x001a</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_MD5             0xff23</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA160          0xff30</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA224          0xff34</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA256          0xff36</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA384          0xff33</div><div class='del'>-#define OP_PCL_DTLS_3DES_EDE_CBC_SHA512          0xff35</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA160           0xff80</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA224           0xff84</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA256           0xff86</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA384           0xff83</div><div class='del'>-#define OP_PCL_DTLS_AES_128_CBC_SHA512           0xff85</div><div class='del'>-#define OP_PCL_DTLS_AES_192_CBC_SHA160           0xff20</div><div class='del'>-#define OP_PCL_DTLS_AES_192_CBC_SHA224           0xff24</div><div class='del'>-#define OP_PCL_DTLS_AES_192_CBC_SHA256           0xff26</div><div class='del'>-#define OP_PCL_DTLS_AES_192_CBC_SHA384           0xff23</div><div class='del'>-#define OP_PCL_DTLS_AES_192_CBC_SHA512           0xff25</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA160           0xff60</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA224           0xff64</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA256           0xff66</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA384           0xff63</div><div class='del'>-#define OP_PCL_DTLS_AES_256_CBC_SHA512           0xff65</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA		 0x002f</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA_2		 0x0030</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA_3		 0x0031</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA_4		 0x0032</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA_5		 0x0033</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA_6		 0x0034</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA_7		 0x008c</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA_8		 0x0090</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA_9		 0x0094</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA_10		 0xc004</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA_11		 0xc009</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA_12		 0xc00e</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA_13		 0xc013</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA_14		 0xc018</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA_15		 0xc01d</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA_16		 0xc01e</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA_17		 0xc01f</div><div class='add'>+</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA		 0x0035</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA_2		 0x0036</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA_3		 0x0037</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA_4		 0x0038</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA_5		 0x0039</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA_6		 0x003a</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA_7		 0x008d</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA_8		 0x0091</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA_9		 0x0095</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA_10		 0xc005</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA_11		 0xc00a</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA_12		 0xc00f</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA_13		 0xc014</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA_14		 0xc019</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA_15		 0xc020</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA_16		 0xc021</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA_17		 0xc022</div><div class='add'>+</div><div class='add'>+/* #define OP_PCL_DTLS_3DES_EDE_CBC_MD5		0x0023 */</div><div class='add'>+</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA		 0x001f</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_2		 0x008b</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_3		 0x008f</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_4		 0x0093</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_5		 0x000a</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_6		 0x000d</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_7		 0x0010</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_8		 0x0013</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_9		 0x0016</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_10		 0x001b</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_11		 0xc003</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_12		 0xc008</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_13		 0xc00d</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_14		 0xc012</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_15		 0xc017</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_16		 0xc01a</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_17		 0xc01b</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA_18		 0xc01c</div><div class='add'>+</div><div class='add'>+#define OP_PCL_DTLS_DES40_CBC_MD5		 0x0029</div><div class='add'>+</div><div class='add'>+#define OP_PCL_DTLS_DES_CBC_MD5			 0x0022</div><div class='add'>+</div><div class='add'>+#define OP_PCL_DTLS_DES40_CBC_SHA		 0x0008</div><div class='add'>+#define OP_PCL_DTLS_DES40_CBC_SHA_2		 0x000b</div><div class='add'>+#define OP_PCL_DTLS_DES40_CBC_SHA_3		 0x000e</div><div class='add'>+#define OP_PCL_DTLS_DES40_CBC_SHA_4		 0x0011</div><div class='add'>+#define OP_PCL_DTLS_DES40_CBC_SHA_5		 0x0014</div><div class='add'>+#define OP_PCL_DTLS_DES40_CBC_SHA_6		 0x0019</div><div class='add'>+#define OP_PCL_DTLS_DES40_CBC_SHA_7		 0x0026</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define OP_PCL_DTLS_DES_CBC_SHA			 0x001e</div><div class='add'>+#define OP_PCL_DTLS_DES_CBC_SHA_2		 0x0009</div><div class='add'>+#define OP_PCL_DTLS_DES_CBC_SHA_3		 0x000c</div><div class='add'>+#define OP_PCL_DTLS_DES_CBC_SHA_4		 0x000f</div><div class='add'>+#define OP_PCL_DTLS_DES_CBC_SHA_5		 0x0012</div><div class='add'>+#define OP_PCL_DTLS_DES_CBC_SHA_6		 0x0015</div><div class='add'>+#define OP_PCL_DTLS_DES_CBC_SHA_7		 0x001a</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_MD5		 0xff23</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA160		 0xff30</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA224		 0xff34</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA256		 0xff36</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA384		 0xff33</div><div class='add'>+#define OP_PCL_DTLS_3DES_EDE_CBC_SHA512		 0xff35</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA160		 0xff80</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA224		 0xff84</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA256		 0xff86</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA384		 0xff83</div><div class='add'>+#define OP_PCL_DTLS_AES_128_CBC_SHA512		 0xff85</div><div class='add'>+#define OP_PCL_DTLS_AES_192_CBC_SHA160		 0xff20</div><div class='add'>+#define OP_PCL_DTLS_AES_192_CBC_SHA224		 0xff24</div><div class='add'>+#define OP_PCL_DTLS_AES_192_CBC_SHA256		 0xff26</div><div class='add'>+#define OP_PCL_DTLS_AES_192_CBC_SHA384		 0xff23</div><div class='add'>+#define OP_PCL_DTLS_AES_192_CBC_SHA512		 0xff25</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA160		 0xff60</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA224		 0xff64</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA256		 0xff66</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA384		 0xff63</div><div class='add'>+#define OP_PCL_DTLS_AES_256_CBC_SHA512		 0xff65</div><div class='ctx'> </div><div class='ctx'> /* 802.16 WiMAX protinfos */</div><div class='del'>-#define OP_PCL_WIMAX_OFDM                        0x0201</div><div class='del'>-#define OP_PCL_WIMAX_OFDMA                       0x0231</div><div class='add'>+#define OP_PCL_WIMAX_OFDM			 0x0201</div><div class='add'>+#define OP_PCL_WIMAX_OFDMA			 0x0231</div><div class='ctx'> </div><div class='ctx'> /* 802.11 WiFi protinfos */</div><div class='del'>-#define OP_PCL_WIFI                              0xac04</div><div class='add'>+#define OP_PCL_WIFI				 0xac04</div><div class='ctx'> </div><div class='ctx'> /* MacSec protinfos */</div><div class='del'>-#define OP_PCL_MACSEC                            0x0001</div><div class='add'>+#define OP_PCL_MACSEC				 0x0001</div><div class='ctx'> </div><div class='ctx'> /* PKI unidirectional protocol protinfo bits */</div><div class='del'>-#define OP_PCL_PKPROT_TEST                       0x0008</div><div class='del'>-#define OP_PCL_PKPROT_DECRYPT                    0x0004</div><div class='del'>-#define OP_PCL_PKPROT_ECC                        0x0002</div><div class='del'>-#define OP_PCL_PKPROT_F2M                        0x0001</div><div class='add'>+#define OP_PCL_PKPROT_TEST			 0x0008</div><div class='add'>+#define OP_PCL_PKPROT_DECRYPT			 0x0004</div><div class='add'>+#define OP_PCL_PKPROT_ECC			 0x0002</div><div class='add'>+#define OP_PCL_PKPROT_F2M			 0x0001</div><div class='ctx'> </div><div class='ctx'> /* For non-protocol/alg-only op commands */</div><div class='ctx'> #define OP_ALG_TYPE_SHIFT	24</div><div class='hunk'>@@ -1181,114 +1181,114 @@</div><div class='ctx'> #define OP_ALG_ENCRYPT		1</div><div class='ctx'> </div><div class='ctx'> /* PKHA algorithm type set */</div><div class='del'>-#define OP_ALG_PK                    0x00800000</div><div class='del'>-#define OP_ALG_PK_FUN_MASK           0x3f /* clrmem, modmath, or cpymem */</div><div class='add'>+#define OP_ALG_PK		0x00800000</div><div class='add'>+#define OP_ALG_PK_FUN_MASK	0x3f /* clrmem, modmath, or cpymem */</div><div class='ctx'> </div><div class='ctx'> /* PKHA mode clear memory functions */</div><div class='del'>-#define OP_ALG_PKMODE_A_RAM          0x80000</div><div class='del'>-#define OP_ALG_PKMODE_B_RAM          0x40000</div><div class='del'>-#define OP_ALG_PKMODE_E_RAM          0x20000</div><div class='del'>-#define OP_ALG_PKMODE_N_RAM          0x10000</div><div class='del'>-#define OP_ALG_PKMODE_CLEARMEM       0x00001</div><div class='add'>+#define OP_ALG_PKMODE_A_RAM	0x80000</div><div class='add'>+#define OP_ALG_PKMODE_B_RAM	0x40000</div><div class='add'>+#define OP_ALG_PKMODE_E_RAM	0x20000</div><div class='add'>+#define OP_ALG_PKMODE_N_RAM	0x10000</div><div class='add'>+#define OP_ALG_PKMODE_CLEARMEM	0x00001</div><div class='ctx'> </div><div class='ctx'> /* PKHA mode modular-arithmetic functions */</div><div class='del'>-#define OP_ALG_PKMODE_MOD_IN_MONTY   0x80000</div><div class='del'>-#define OP_ALG_PKMODE_MOD_OUT_MONTY  0x40000</div><div class='del'>-#define OP_ALG_PKMODE_MOD_F2M        0x20000</div><div class='del'>-#define OP_ALG_PKMODE_MOD_R2_IN      0x10000</div><div class='del'>-#define OP_ALG_PKMODE_PRJECTV        0x00800</div><div class='del'>-#define OP_ALG_PKMODE_TIME_EQ        0x400</div><div class='del'>-#define OP_ALG_PKMODE_OUT_B          0x000</div><div class='del'>-#define OP_ALG_PKMODE_OUT_A          0x100</div><div class='del'>-#define OP_ALG_PKMODE_MOD_ADD        0x002</div><div class='del'>-#define OP_ALG_PKMODE_MOD_SUB_AB     0x003</div><div class='del'>-#define OP_ALG_PKMODE_MOD_SUB_BA     0x004</div><div class='del'>-#define OP_ALG_PKMODE_MOD_MULT       0x005</div><div class='del'>-#define OP_ALG_PKMODE_MOD_EXPO       0x006</div><div class='del'>-#define OP_ALG_PKMODE_MOD_REDUCT     0x007</div><div class='del'>-#define OP_ALG_PKMODE_MOD_INV        0x008</div><div class='del'>-#define OP_ALG_PKMODE_MOD_ECC_ADD    0x009</div><div class='del'>-#define OP_ALG_PKMODE_MOD_ECC_DBL    0x00a</div><div class='del'>-#define OP_ALG_PKMODE_MOD_ECC_MULT   0x00b</div><div class='del'>-#define OP_ALG_PKMODE_MOD_MONT_CNST  0x00c</div><div class='del'>-#define OP_ALG_PKMODE_MOD_CRT_CNST   0x00d</div><div class='del'>-#define OP_ALG_PKMODE_MOD_GCD        0x00e</div><div class='del'>-#define OP_ALG_PKMODE_MOD_PRIMALITY  0x00f</div><div class='add'>+#define OP_ALG_PKMODE_MOD_IN_MONTY	0x80000</div><div class='add'>+#define OP_ALG_PKMODE_MOD_OUT_MONTY	0x40000</div><div class='add'>+#define OP_ALG_PKMODE_MOD_F2M		0x20000</div><div class='add'>+#define OP_ALG_PKMODE_MOD_R2_IN		0x10000</div><div class='add'>+#define OP_ALG_PKMODE_PRJECTV		0x00800</div><div class='add'>+#define OP_ALG_PKMODE_TIME_EQ		0x400</div><div class='add'>+#define OP_ALG_PKMODE_OUT_B		0x000</div><div class='add'>+#define OP_ALG_PKMODE_OUT_A		0x100</div><div class='add'>+#define OP_ALG_PKMODE_MOD_ADD		0x002</div><div class='add'>+#define OP_ALG_PKMODE_MOD_SUB_AB	0x003</div><div class='add'>+#define OP_ALG_PKMODE_MOD_SUB_BA	0x004</div><div class='add'>+#define OP_ALG_PKMODE_MOD_MULT		0x005</div><div class='add'>+#define OP_ALG_PKMODE_MOD_EXPO		0x006</div><div class='add'>+#define OP_ALG_PKMODE_MOD_REDUCT	0x007</div><div class='add'>+#define OP_ALG_PKMODE_MOD_INV		0x008</div><div class='add'>+#define OP_ALG_PKMODE_MOD_ECC_ADD	0x009</div><div class='add'>+#define OP_ALG_PKMODE_MOD_ECC_DBL	0x00a</div><div class='add'>+#define OP_ALG_PKMODE_MOD_ECC_MULT	0x00b</div><div class='add'>+#define OP_ALG_PKMODE_MOD_MONT_CNST	0x00c</div><div class='add'>+#define OP_ALG_PKMODE_MOD_CRT_CNST	0x00d</div><div class='add'>+#define OP_ALG_PKMODE_MOD_GCD		0x00e</div><div class='add'>+#define OP_ALG_PKMODE_MOD_PRIMALITY	0x00f</div><div class='ctx'> </div><div class='ctx'> /* PKHA mode copy-memory functions */</div><div class='del'>-#define OP_ALG_PKMODE_SRC_REG_SHIFT  13</div><div class='del'>-#define OP_ALG_PKMODE_SRC_REG_MASK   (7 &lt;&lt; OP_ALG_PKMODE_SRC_REG_SHIFT)</div><div class='del'>-#define OP_ALG_PKMODE_DST_REG_SHIFT  10</div><div class='del'>-#define OP_ALG_PKMODE_DST_REG_MASK   (7 &lt;&lt; OP_ALG_PKMODE_DST_REG_SHIFT)</div><div class='del'>-#define OP_ALG_PKMODE_SRC_SEG_SHIFT  8</div><div class='del'>-#define OP_ALG_PKMODE_SRC_SEG_MASK   (3 &lt;&lt; OP_ALG_PKMODE_SRC_SEG_SHIFT)</div><div class='del'>-#define OP_ALG_PKMODE_DST_SEG_SHIFT  6</div><div class='del'>-#define OP_ALG_PKMODE_DST_SEG_MASK   (3 &lt;&lt; OP_ALG_PKMODE_DST_SEG_SHIFT)</div><div class='del'>-</div><div class='del'>-#define OP_ALG_PKMODE_SRC_REG_A      (0 &lt;&lt; OP_ALG_PKMODE_SRC_REG_SHIFT)</div><div class='del'>-#define OP_ALG_PKMODE_SRC_REG_B      (1 &lt;&lt; OP_ALG_PKMODE_SRC_REG_SHIFT)</div><div class='del'>-#define OP_ALG_PKMODE_SRC_REG_N      (3 &lt;&lt; OP_ALG_PKMODE_SRC_REG_SHIFT)</div><div class='del'>-#define OP_ALG_PKMODE_DST_REG_A      (0 &lt;&lt; OP_ALG_PKMODE_DST_REG_SHIFT)</div><div class='del'>-#define OP_ALG_PKMODE_DST_REG_B      (1 &lt;&lt; OP_ALG_PKMODE_DST_REG_SHIFT)</div><div class='del'>-#define OP_ALG_PKMODE_DST_REG_E      (2 &lt;&lt; OP_ALG_PKMODE_DST_REG_SHIFT)</div><div class='del'>-#define OP_ALG_PKMODE_DST_REG_N      (3 &lt;&lt; OP_ALG_PKMODE_DST_REG_SHIFT)</div><div class='del'>-#define OP_ALG_PKMODE_SRC_SEG_0      (0 &lt;&lt; OP_ALG_PKMODE_SRC_SEG_SHIFT)</div><div class='del'>-#define OP_ALG_PKMODE_SRC_SEG_1      (1 &lt;&lt; OP_ALG_PKMODE_SRC_SEG_SHIFT)</div><div class='del'>-#define OP_ALG_PKMODE_SRC_SEG_2      (2 &lt;&lt; OP_ALG_PKMODE_SRC_SEG_SHIFT)</div><div class='del'>-#define OP_ALG_PKMODE_SRC_SEG_3      (3 &lt;&lt; OP_ALG_PKMODE_SRC_SEG_SHIFT)</div><div class='del'>-#define OP_ALG_PKMODE_DST_SEG_0      (0 &lt;&lt; OP_ALG_PKMODE_DST_SEG_SHIFT)</div><div class='del'>-#define OP_ALG_PKMODE_DST_SEG_1      (1 &lt;&lt; OP_ALG_PKMODE_DST_SEG_SHIFT)</div><div class='del'>-#define OP_ALG_PKMODE_DST_SEG_2      (2 &lt;&lt; OP_ALG_PKMODE_DST_SEG_SHIFT)</div><div class='del'>-#define OP_ALG_PKMODE_DST_SEG_3      (3 &lt;&lt; OP_ALG_PKMODE_DST_SEG_SHIFT)</div><div class='del'>-#define OP_ALG_PKMODE_CPYMEM_N_SZ    0x80</div><div class='del'>-#define OP_ALG_PKMODE_CPYMEM_SRC_SZ  0x81</div><div class='add'>+#define OP_ALG_PKMODE_SRC_REG_SHIFT	13</div><div class='add'>+#define OP_ALG_PKMODE_SRC_REG_MASK	(7 &lt;&lt; OP_ALG_PKMODE_SRC_REG_SHIFT)</div><div class='add'>+#define OP_ALG_PKMODE_DST_REG_SHIFT	10</div><div class='add'>+#define OP_ALG_PKMODE_DST_REG_MASK	(7 &lt;&lt; OP_ALG_PKMODE_DST_REG_SHIFT)</div><div class='add'>+#define OP_ALG_PKMODE_SRC_SEG_SHIFT	8</div><div class='add'>+#define OP_ALG_PKMODE_SRC_SEG_MASK	(3 &lt;&lt; OP_ALG_PKMODE_SRC_SEG_SHIFT)</div><div class='add'>+#define OP_ALG_PKMODE_DST_SEG_SHIFT	6</div><div class='add'>+#define OP_ALG_PKMODE_DST_SEG_MASK	(3 &lt;&lt; OP_ALG_PKMODE_DST_SEG_SHIFT)</div><div class='add'>+</div><div class='add'>+#define OP_ALG_PKMODE_SRC_REG_A		(0 &lt;&lt; OP_ALG_PKMODE_SRC_REG_SHIFT)</div><div class='add'>+#define OP_ALG_PKMODE_SRC_REG_B		(1 &lt;&lt; OP_ALG_PKMODE_SRC_REG_SHIFT)</div><div class='add'>+#define OP_ALG_PKMODE_SRC_REG_N		(3 &lt;&lt; OP_ALG_PKMODE_SRC_REG_SHIFT)</div><div class='add'>+#define OP_ALG_PKMODE_DST_REG_A		(0 &lt;&lt; OP_ALG_PKMODE_DST_REG_SHIFT)</div><div class='add'>+#define OP_ALG_PKMODE_DST_REG_B		(1 &lt;&lt; OP_ALG_PKMODE_DST_REG_SHIFT)</div><div class='add'>+#define OP_ALG_PKMODE_DST_REG_E		(2 &lt;&lt; OP_ALG_PKMODE_DST_REG_SHIFT)</div><div class='add'>+#define OP_ALG_PKMODE_DST_REG_N		(3 &lt;&lt; OP_ALG_PKMODE_DST_REG_SHIFT)</div><div class='add'>+#define OP_ALG_PKMODE_SRC_SEG_0		(0 &lt;&lt; OP_ALG_PKMODE_SRC_SEG_SHIFT)</div><div class='add'>+#define OP_ALG_PKMODE_SRC_SEG_1		(1 &lt;&lt; OP_ALG_PKMODE_SRC_SEG_SHIFT)</div><div class='add'>+#define OP_ALG_PKMODE_SRC_SEG_2		(2 &lt;&lt; OP_ALG_PKMODE_SRC_SEG_SHIFT)</div><div class='add'>+#define OP_ALG_PKMODE_SRC_SEG_3		(3 &lt;&lt; OP_ALG_PKMODE_SRC_SEG_SHIFT)</div><div class='add'>+#define OP_ALG_PKMODE_DST_SEG_0		(0 &lt;&lt; OP_ALG_PKMODE_DST_SEG_SHIFT)</div><div class='add'>+#define OP_ALG_PKMODE_DST_SEG_1		(1 &lt;&lt; OP_ALG_PKMODE_DST_SEG_SHIFT)</div><div class='add'>+#define OP_ALG_PKMODE_DST_SEG_2		(2 &lt;&lt; OP_ALG_PKMODE_DST_SEG_SHIFT)</div><div class='add'>+#define OP_ALG_PKMODE_DST_SEG_3		(3 &lt;&lt; OP_ALG_PKMODE_DST_SEG_SHIFT)</div><div class='add'>+#define OP_ALG_PKMODE_CPYMEM_N_SZ	0x80</div><div class='add'>+#define OP_ALG_PKMODE_CPYMEM_SRC_SZ	0x81</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * SEQ_IN_PTR Command Constructs</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* Release Buffers */</div><div class='del'>-#define SQIN_RBS               0x04000000</div><div class='add'>+#define SQIN_RBS	0x04000000</div><div class='ctx'> </div><div class='ctx'> /* Sequence pointer is really a descriptor */</div><div class='del'>-#define SQIN_INL               0x02000000</div><div class='add'>+#define SQIN_INL	0x02000000</div><div class='ctx'> </div><div class='ctx'> /* Sequence pointer is a scatter-gather table */</div><div class='del'>-#define SQIN_SGF               0x01000000</div><div class='add'>+#define SQIN_SGF	0x01000000</div><div class='ctx'> </div><div class='ctx'> /* Appends to a previous pointer */</div><div class='del'>-#define SQIN_PRE               0x00800000</div><div class='add'>+#define SQIN_PRE	0x00800000</div><div class='ctx'> </div><div class='ctx'> /* Use extended length following pointer */</div><div class='del'>-#define SQIN_EXT               0x00400000</div><div class='add'>+#define SQIN_EXT	0x00400000</div><div class='ctx'> </div><div class='ctx'> /* Restore sequence with pointer/length */</div><div class='del'>-#define SQIN_RTO               0x00200000</div><div class='add'>+#define SQIN_RTO	0x00200000</div><div class='ctx'> </div><div class='ctx'> /* Replace job descriptor */</div><div class='del'>-#define SQIN_RJD               0x00100000</div><div class='add'>+#define SQIN_RJD	0x00100000</div><div class='ctx'> </div><div class='del'>-#define SQIN_LEN_SHIFT           0</div><div class='del'>-#define SQIN_LEN_MASK           (0xffff &lt;&lt; SQIN_LEN_SHIFT)</div><div class='add'>+#define SQIN_LEN_SHIFT		 0</div><div class='add'>+#define SQIN_LEN_MASK		(0xffff &lt;&lt; SQIN_LEN_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * SEQ_OUT_PTR Command Constructs</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* Sequence pointer is a scatter-gather table */</div><div class='del'>-#define SQOUT_SGF              0x01000000</div><div class='add'>+#define SQOUT_SGF	0x01000000</div><div class='ctx'> </div><div class='ctx'> /* Appends to a previous pointer */</div><div class='del'>-#define SQOUT_PRE              0x00800000</div><div class='add'>+#define SQOUT_PRE	0x00800000</div><div class='ctx'> </div><div class='ctx'> /* Restore sequence with pointer/length */</div><div class='del'>-#define SQOUT_RTO              0x00200000</div><div class='add'>+#define SQOUT_RTO	0x00200000</div><div class='ctx'> </div><div class='ctx'> /* Use extended length following pointer */</div><div class='del'>-#define SQOUT_EXT              0x00400000</div><div class='add'>+#define SQOUT_EXT	0x00400000</div><div class='ctx'> </div><div class='del'>-#define SQOUT_LEN_SHIFT           0</div><div class='del'>-#define SQOUT_LEN_MASK           (0xffff &lt;&lt; SQOUT_LEN_SHIFT)</div><div class='add'>+#define SQOUT_LEN_SHIFT		0</div><div class='add'>+#define SQOUT_LEN_MASK		(0xffff &lt;&lt; SQOUT_LEN_SHIFT)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1296,196 +1296,196 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* TYPE field is all that's relevant */</div><div class='del'>-#define SIGN_TYPE_SHIFT         16</div><div class='del'>-#define SIGN_TYPE_MASK          (0x0f &lt;&lt; SIGN_TYPE_SHIFT)</div><div class='add'>+#define SIGN_TYPE_SHIFT		16</div><div class='add'>+#define SIGN_TYPE_MASK		(0x0f &lt;&lt; SIGN_TYPE_SHIFT)</div><div class='ctx'> </div><div class='del'>-#define SIGN_TYPE_FINAL         (0x00 &lt;&lt; SIGN_TYPE_SHIFT)</div><div class='add'>+#define SIGN_TYPE_FINAL		(0x00 &lt;&lt; SIGN_TYPE_SHIFT)</div><div class='ctx'> #define SIGN_TYPE_FINAL_RESTORE (0x01 &lt;&lt; SIGN_TYPE_SHIFT)</div><div class='ctx'> #define SIGN_TYPE_FINAL_NONZERO (0x02 &lt;&lt; SIGN_TYPE_SHIFT)</div><div class='del'>-#define SIGN_TYPE_IMM_2         (0x0a &lt;&lt; SIGN_TYPE_SHIFT)</div><div class='del'>-#define SIGN_TYPE_IMM_3         (0x0b &lt;&lt; SIGN_TYPE_SHIFT)</div><div class='del'>-#define SIGN_TYPE_IMM_4         (0x0c &lt;&lt; SIGN_TYPE_SHIFT)</div><div class='add'>+#define SIGN_TYPE_IMM_2		(0x0a &lt;&lt; SIGN_TYPE_SHIFT)</div><div class='add'>+#define SIGN_TYPE_IMM_3		(0x0b &lt;&lt; SIGN_TYPE_SHIFT)</div><div class='add'>+#define SIGN_TYPE_IMM_4		(0x0c &lt;&lt; SIGN_TYPE_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * MOVE Command Constructs</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define MOVE_AUX_SHIFT          25</div><div class='del'>-#define MOVE_AUX_MASK           (3 &lt;&lt; MOVE_AUX_SHIFT)</div><div class='del'>-#define MOVE_AUX_MS             (2 &lt;&lt; MOVE_AUX_SHIFT)</div><div class='del'>-#define MOVE_AUX_LS             (1 &lt;&lt; MOVE_AUX_SHIFT)</div><div class='del'>-</div><div class='del'>-#define MOVE_WAITCOMP_SHIFT     24</div><div class='del'>-#define MOVE_WAITCOMP_MASK      (1 &lt;&lt; MOVE_WAITCOMP_SHIFT)</div><div class='del'>-#define MOVE_WAITCOMP           (1 &lt;&lt; MOVE_WAITCOMP_SHIFT)</div><div class='del'>-</div><div class='del'>-#define MOVE_SRC_SHIFT          20</div><div class='del'>-#define MOVE_SRC_MASK           (0x0f &lt;&lt; MOVE_SRC_SHIFT)</div><div class='del'>-#define MOVE_SRC_CLASS1CTX      (0x00 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='del'>-#define MOVE_SRC_CLASS2CTX      (0x01 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='del'>-#define MOVE_SRC_OUTFIFO        (0x02 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='del'>-#define MOVE_SRC_DESCBUF        (0x03 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='del'>-#define MOVE_SRC_MATH0          (0x04 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='del'>-#define MOVE_SRC_MATH1          (0x05 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='del'>-#define MOVE_SRC_MATH2          (0x06 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='del'>-#define MOVE_SRC_MATH3          (0x07 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='del'>-#define MOVE_SRC_INFIFO         (0x08 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='del'>-#define MOVE_SRC_INFIFO_CL      (0x09 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='del'>-</div><div class='del'>-#define MOVE_DEST_SHIFT         16</div><div class='del'>-#define MOVE_DEST_MASK          (0x0f &lt;&lt; MOVE_DEST_SHIFT)</div><div class='del'>-#define MOVE_DEST_CLASS1CTX     (0x00 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='del'>-#define MOVE_DEST_CLASS2CTX     (0x01 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='del'>-#define MOVE_DEST_OUTFIFO       (0x02 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='del'>-#define MOVE_DEST_DESCBUF       (0x03 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='del'>-#define MOVE_DEST_MATH0         (0x04 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='del'>-#define MOVE_DEST_MATH1         (0x05 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='del'>-#define MOVE_DEST_MATH2         (0x06 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='del'>-#define MOVE_DEST_MATH3         (0x07 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='del'>-#define MOVE_DEST_CLASS1INFIFO  (0x08 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='del'>-#define MOVE_DEST_CLASS2INFIFO  (0x09 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='del'>-#define MOVE_DEST_PK_A          (0x0c &lt;&lt; MOVE_DEST_SHIFT)</div><div class='del'>-#define MOVE_DEST_CLASS1KEY     (0x0d &lt;&lt; MOVE_DEST_SHIFT)</div><div class='del'>-#define MOVE_DEST_CLASS2KEY     (0x0e &lt;&lt; MOVE_DEST_SHIFT)</div><div class='del'>-</div><div class='del'>-#define MOVE_OFFSET_SHIFT       8</div><div class='del'>-#define MOVE_OFFSET_MASK        (0xff &lt;&lt; MOVE_OFFSET_SHIFT)</div><div class='del'>-</div><div class='del'>-#define MOVE_LEN_SHIFT          0</div><div class='del'>-#define MOVE_LEN_MASK           (0xff &lt;&lt; MOVE_LEN_SHIFT)</div><div class='del'>-</div><div class='del'>-#define MOVELEN_MRSEL_SHIFT     0</div><div class='del'>-#define MOVELEN_MRSEL_MASK      (0x3 &lt;&lt; MOVE_LEN_SHIFT)</div><div class='add'>+#define MOVE_AUX_SHIFT		25</div><div class='add'>+#define MOVE_AUX_MASK		(3 &lt;&lt; MOVE_AUX_SHIFT)</div><div class='add'>+#define MOVE_AUX_MS		(2 &lt;&lt; MOVE_AUX_SHIFT)</div><div class='add'>+#define MOVE_AUX_LS		(1 &lt;&lt; MOVE_AUX_SHIFT)</div><div class='add'>+</div><div class='add'>+#define MOVE_WAITCOMP_SHIFT	24</div><div class='add'>+#define MOVE_WAITCOMP_MASK	(1 &lt;&lt; MOVE_WAITCOMP_SHIFT)</div><div class='add'>+#define MOVE_WAITCOMP		(1 &lt;&lt; MOVE_WAITCOMP_SHIFT)</div><div class='add'>+</div><div class='add'>+#define MOVE_SRC_SHIFT		20</div><div class='add'>+#define MOVE_SRC_MASK		(0x0f &lt;&lt; MOVE_SRC_SHIFT)</div><div class='add'>+#define MOVE_SRC_CLASS1CTX	(0x00 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='add'>+#define MOVE_SRC_CLASS2CTX	(0x01 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='add'>+#define MOVE_SRC_OUTFIFO	(0x02 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='add'>+#define MOVE_SRC_DESCBUF	(0x03 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='add'>+#define MOVE_SRC_MATH0		(0x04 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='add'>+#define MOVE_SRC_MATH1		(0x05 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='add'>+#define MOVE_SRC_MATH2		(0x06 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='add'>+#define MOVE_SRC_MATH3		(0x07 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='add'>+#define MOVE_SRC_INFIFO		(0x08 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='add'>+#define MOVE_SRC_INFIFO_CL	(0x09 &lt;&lt; MOVE_SRC_SHIFT)</div><div class='add'>+</div><div class='add'>+#define MOVE_DEST_SHIFT		16</div><div class='add'>+#define MOVE_DEST_MASK		(0x0f &lt;&lt; MOVE_DEST_SHIFT)</div><div class='add'>+#define MOVE_DEST_CLASS1CTX	(0x00 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='add'>+#define MOVE_DEST_CLASS2CTX	(0x01 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='add'>+#define MOVE_DEST_OUTFIFO	(0x02 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='add'>+#define MOVE_DEST_DESCBUF	(0x03 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='add'>+#define MOVE_DEST_MATH0		(0x04 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='add'>+#define MOVE_DEST_MATH1		(0x05 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='add'>+#define MOVE_DEST_MATH2		(0x06 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='add'>+#define MOVE_DEST_MATH3		(0x07 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='add'>+#define MOVE_DEST_CLASS1INFIFO	(0x08 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='add'>+#define MOVE_DEST_CLASS2INFIFO	(0x09 &lt;&lt; MOVE_DEST_SHIFT)</div><div class='add'>+#define MOVE_DEST_PK_A		(0x0c &lt;&lt; MOVE_DEST_SHIFT)</div><div class='add'>+#define MOVE_DEST_CLASS1KEY	(0x0d &lt;&lt; MOVE_DEST_SHIFT)</div><div class='add'>+#define MOVE_DEST_CLASS2KEY	(0x0e &lt;&lt; MOVE_DEST_SHIFT)</div><div class='add'>+</div><div class='add'>+#define MOVE_OFFSET_SHIFT	8</div><div class='add'>+#define MOVE_OFFSET_MASK	(0xff &lt;&lt; MOVE_OFFSET_SHIFT)</div><div class='add'>+</div><div class='add'>+#define MOVE_LEN_SHIFT		0</div><div class='add'>+#define MOVE_LEN_MASK		(0xff &lt;&lt; MOVE_LEN_SHIFT)</div><div class='add'>+</div><div class='add'>+#define MOVELEN_MRSEL_SHIFT	0</div><div class='add'>+#define MOVELEN_MRSEL_MASK	(0x3 &lt;&lt; MOVE_LEN_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * MATH Command Constructs</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define MATH_IFB_SHIFT          26</div><div class='del'>-#define MATH_IFB_MASK           (1 &lt;&lt; MATH_IFB_SHIFT)</div><div class='del'>-#define MATH_IFB                (1 &lt;&lt; MATH_IFB_SHIFT)</div><div class='add'>+#define MATH_IFB_SHIFT		26</div><div class='add'>+#define MATH_IFB_MASK		(1 &lt;&lt; MATH_IFB_SHIFT)</div><div class='add'>+#define MATH_IFB		(1 &lt;&lt; MATH_IFB_SHIFT)</div><div class='ctx'> </div><div class='del'>-#define MATH_NFU_SHIFT          25</div><div class='del'>-#define MATH_NFU_MASK           (1 &lt;&lt; MATH_NFU_SHIFT)</div><div class='del'>-#define MATH_NFU                (1 &lt;&lt; MATH_NFU_SHIFT)</div><div class='add'>+#define MATH_NFU_SHIFT		25</div><div class='add'>+#define MATH_NFU_MASK		(1 &lt;&lt; MATH_NFU_SHIFT)</div><div class='add'>+#define MATH_NFU		(1 &lt;&lt; MATH_NFU_SHIFT)</div><div class='ctx'> </div><div class='del'>-#define MATH_STL_SHIFT          24</div><div class='del'>-#define MATH_STL_MASK           (1 &lt;&lt; MATH_STL_SHIFT)</div><div class='del'>-#define MATH_STL                (1 &lt;&lt; MATH_STL_SHIFT)</div><div class='add'>+#define MATH_STL_SHIFT		24</div><div class='add'>+#define MATH_STL_MASK		(1 &lt;&lt; MATH_STL_SHIFT)</div><div class='add'>+#define MATH_STL		(1 &lt;&lt; MATH_STL_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* Function selectors */</div><div class='del'>-#define MATH_FUN_SHIFT          20</div><div class='del'>-#define MATH_FUN_MASK           (0x0f &lt;&lt; MATH_FUN_SHIFT)</div><div class='del'>-#define MATH_FUN_ADD            (0x00 &lt;&lt; MATH_FUN_SHIFT)</div><div class='del'>-#define MATH_FUN_ADDC           (0x01 &lt;&lt; MATH_FUN_SHIFT)</div><div class='del'>-#define MATH_FUN_SUB            (0x02 &lt;&lt; MATH_FUN_SHIFT)</div><div class='del'>-#define MATH_FUN_SUBB           (0x03 &lt;&lt; MATH_FUN_SHIFT)</div><div class='del'>-#define MATH_FUN_OR             (0x04 &lt;&lt; MATH_FUN_SHIFT)</div><div class='del'>-#define MATH_FUN_AND            (0x05 &lt;&lt; MATH_FUN_SHIFT)</div><div class='del'>-#define MATH_FUN_XOR            (0x06 &lt;&lt; MATH_FUN_SHIFT)</div><div class='del'>-#define MATH_FUN_LSHIFT         (0x07 &lt;&lt; MATH_FUN_SHIFT)</div><div class='del'>-#define MATH_FUN_RSHIFT         (0x08 &lt;&lt; MATH_FUN_SHIFT)</div><div class='del'>-#define MATH_FUN_SHLD           (0x09 &lt;&lt; MATH_FUN_SHIFT)</div><div class='del'>-#define MATH_FUN_ZBYT           (0x0a &lt;&lt; MATH_FUN_SHIFT)</div><div class='add'>+#define MATH_FUN_SHIFT		20</div><div class='add'>+#define MATH_FUN_MASK		(0x0f &lt;&lt; MATH_FUN_SHIFT)</div><div class='add'>+#define MATH_FUN_ADD		(0x00 &lt;&lt; MATH_FUN_SHIFT)</div><div class='add'>+#define MATH_FUN_ADDC		(0x01 &lt;&lt; MATH_FUN_SHIFT)</div><div class='add'>+#define MATH_FUN_SUB		(0x02 &lt;&lt; MATH_FUN_SHIFT)</div><div class='add'>+#define MATH_FUN_SUBB		(0x03 &lt;&lt; MATH_FUN_SHIFT)</div><div class='add'>+#define MATH_FUN_OR		(0x04 &lt;&lt; MATH_FUN_SHIFT)</div><div class='add'>+#define MATH_FUN_AND		(0x05 &lt;&lt; MATH_FUN_SHIFT)</div><div class='add'>+#define MATH_FUN_XOR		(0x06 &lt;&lt; MATH_FUN_SHIFT)</div><div class='add'>+#define MATH_FUN_LSHIFT		(0x07 &lt;&lt; MATH_FUN_SHIFT)</div><div class='add'>+#define MATH_FUN_RSHIFT		(0x08 &lt;&lt; MATH_FUN_SHIFT)</div><div class='add'>+#define MATH_FUN_SHLD		(0x09 &lt;&lt; MATH_FUN_SHIFT)</div><div class='add'>+#define MATH_FUN_ZBYT		(0x0a &lt;&lt; MATH_FUN_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* Source 0 selectors */</div><div class='del'>-#define MATH_SRC0_SHIFT         16</div><div class='del'>-#define MATH_SRC0_MASK          (0x0f &lt;&lt; MATH_SRC0_SHIFT)</div><div class='del'>-#define MATH_SRC0_REG0          (0x00 &lt;&lt; MATH_SRC0_SHIFT)</div><div class='del'>-#define MATH_SRC0_REG1          (0x01 &lt;&lt; MATH_SRC0_SHIFT)</div><div class='del'>-#define MATH_SRC0_REG2          (0x02 &lt;&lt; MATH_SRC0_SHIFT)</div><div class='del'>-#define MATH_SRC0_REG3          (0x03 &lt;&lt; MATH_SRC0_SHIFT)</div><div class='del'>-#define MATH_SRC0_IMM           (0x04 &lt;&lt; MATH_SRC0_SHIFT)</div><div class='del'>-#define MATH_SRC0_SEQINLEN      (0x08 &lt;&lt; MATH_SRC0_SHIFT)</div><div class='del'>-#define MATH_SRC0_SEQOUTLEN     (0x09 &lt;&lt; MATH_SRC0_SHIFT)</div><div class='del'>-#define MATH_SRC0_VARSEQINLEN   (0x0a &lt;&lt; MATH_SRC0_SHIFT)</div><div class='del'>-#define MATH_SRC0_VARSEQOUTLEN  (0x0b &lt;&lt; MATH_SRC0_SHIFT)</div><div class='del'>-#define MATH_SRC0_ZERO          (0x0c &lt;&lt; MATH_SRC0_SHIFT)</div><div class='add'>+#define MATH_SRC0_SHIFT		16</div><div class='add'>+#define MATH_SRC0_MASK		(0x0f &lt;&lt; MATH_SRC0_SHIFT)</div><div class='add'>+#define MATH_SRC0_REG0		(0x00 &lt;&lt; MATH_SRC0_SHIFT)</div><div class='add'>+#define MATH_SRC0_REG1		(0x01 &lt;&lt; MATH_SRC0_SHIFT)</div><div class='add'>+#define MATH_SRC0_REG2		(0x02 &lt;&lt; MATH_SRC0_SHIFT)</div><div class='add'>+#define MATH_SRC0_REG3		(0x03 &lt;&lt; MATH_SRC0_SHIFT)</div><div class='add'>+#define MATH_SRC0_IMM		(0x04 &lt;&lt; MATH_SRC0_SHIFT)</div><div class='add'>+#define MATH_SRC0_SEQINLEN	(0x08 &lt;&lt; MATH_SRC0_SHIFT)</div><div class='add'>+#define MATH_SRC0_SEQOUTLEN	(0x09 &lt;&lt; MATH_SRC0_SHIFT)</div><div class='add'>+#define MATH_SRC0_VARSEQINLEN	(0x0a &lt;&lt; MATH_SRC0_SHIFT)</div><div class='add'>+#define MATH_SRC0_VARSEQOUTLEN	(0x0b &lt;&lt; MATH_SRC0_SHIFT)</div><div class='add'>+#define MATH_SRC0_ZERO		(0x0c &lt;&lt; MATH_SRC0_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* Source 1 selectors */</div><div class='del'>-#define MATH_SRC1_SHIFT         12</div><div class='del'>-#define MATH_SRC1_MASK          (0x0f &lt;&lt; MATH_SRC1_SHIFT)</div><div class='del'>-#define MATH_SRC1_REG0          (0x00 &lt;&lt; MATH_SRC1_SHIFT)</div><div class='del'>-#define MATH_SRC1_REG1          (0x01 &lt;&lt; MATH_SRC1_SHIFT)</div><div class='del'>-#define MATH_SRC1_REG2          (0x02 &lt;&lt; MATH_SRC1_SHIFT)</div><div class='del'>-#define MATH_SRC1_REG3          (0x03 &lt;&lt; MATH_SRC1_SHIFT)</div><div class='del'>-#define MATH_SRC1_IMM           (0x04 &lt;&lt; MATH_SRC1_SHIFT)</div><div class='del'>-#define MATH_SRC1_INFIFO        (0x0a &lt;&lt; MATH_SRC1_SHIFT)</div><div class='del'>-#define MATH_SRC1_OUTFIFO       (0x0b &lt;&lt; MATH_SRC1_SHIFT)</div><div class='del'>-#define MATH_SRC1_ONE           (0x0c &lt;&lt; MATH_SRC1_SHIFT)</div><div class='add'>+#define MATH_SRC1_SHIFT		12</div><div class='add'>+#define MATH_SRC1_MASK		(0x0f &lt;&lt; MATH_SRC1_SHIFT)</div><div class='add'>+#define MATH_SRC1_REG0		(0x00 &lt;&lt; MATH_SRC1_SHIFT)</div><div class='add'>+#define MATH_SRC1_REG1		(0x01 &lt;&lt; MATH_SRC1_SHIFT)</div><div class='add'>+#define MATH_SRC1_REG2		(0x02 &lt;&lt; MATH_SRC1_SHIFT)</div><div class='add'>+#define MATH_SRC1_REG3		(0x03 &lt;&lt; MATH_SRC1_SHIFT)</div><div class='add'>+#define MATH_SRC1_IMM		(0x04 &lt;&lt; MATH_SRC1_SHIFT)</div><div class='add'>+#define MATH_SRC1_INFIFO	(0x0a &lt;&lt; MATH_SRC1_SHIFT)</div><div class='add'>+#define MATH_SRC1_OUTFIFO	(0x0b &lt;&lt; MATH_SRC1_SHIFT)</div><div class='add'>+#define MATH_SRC1_ONE		(0x0c &lt;&lt; MATH_SRC1_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* Destination selectors */</div><div class='del'>-#define MATH_DEST_SHIFT         8</div><div class='del'>-#define MATH_DEST_MASK          (0x0f &lt;&lt; MATH_DEST_SHIFT)</div><div class='del'>-#define MATH_DEST_REG0          (0x00 &lt;&lt; MATH_DEST_SHIFT)</div><div class='del'>-#define MATH_DEST_REG1          (0x01 &lt;&lt; MATH_DEST_SHIFT)</div><div class='del'>-#define MATH_DEST_REG2          (0x02 &lt;&lt; MATH_DEST_SHIFT)</div><div class='del'>-#define MATH_DEST_REG3          (0x03 &lt;&lt; MATH_DEST_SHIFT)</div><div class='del'>-#define MATH_DEST_SEQINLEN      (0x08 &lt;&lt; MATH_DEST_SHIFT)</div><div class='del'>-#define MATH_DEST_SEQOUTLEN     (0x09 &lt;&lt; MATH_DEST_SHIFT)</div><div class='del'>-#define MATH_DEST_VARSEQINLEN   (0x0a &lt;&lt; MATH_DEST_SHIFT)</div><div class='del'>-#define MATH_DEST_VARSEQOUTLEN  (0x0b &lt;&lt; MATH_DEST_SHIFT)</div><div class='del'>-#define MATH_DEST_NONE          (0x0f &lt;&lt; MATH_DEST_SHIFT)</div><div class='add'>+#define MATH_DEST_SHIFT		8</div><div class='add'>+#define MATH_DEST_MASK		(0x0f &lt;&lt; MATH_DEST_SHIFT)</div><div class='add'>+#define MATH_DEST_REG0		(0x00 &lt;&lt; MATH_DEST_SHIFT)</div><div class='add'>+#define MATH_DEST_REG1		(0x01 &lt;&lt; MATH_DEST_SHIFT)</div><div class='add'>+#define MATH_DEST_REG2		(0x02 &lt;&lt; MATH_DEST_SHIFT)</div><div class='add'>+#define MATH_DEST_REG3		(0x03 &lt;&lt; MATH_DEST_SHIFT)</div><div class='add'>+#define MATH_DEST_SEQINLEN	(0x08 &lt;&lt; MATH_DEST_SHIFT)</div><div class='add'>+#define MATH_DEST_SEQOUTLEN	(0x09 &lt;&lt; MATH_DEST_SHIFT)</div><div class='add'>+#define MATH_DEST_VARSEQINLEN	(0x0a &lt;&lt; MATH_DEST_SHIFT)</div><div class='add'>+#define MATH_DEST_VARSEQOUTLEN	(0x0b &lt;&lt; MATH_DEST_SHIFT)</div><div class='add'>+#define MATH_DEST_NONE		(0x0f &lt;&lt; MATH_DEST_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* Length selectors */</div><div class='del'>-#define MATH_LEN_SHIFT          0</div><div class='del'>-#define MATH_LEN_MASK           (0x0f &lt;&lt; MATH_LEN_SHIFT)</div><div class='del'>-#define MATH_LEN_1BYTE          0x01</div><div class='del'>-#define MATH_LEN_2BYTE          0x02</div><div class='del'>-#define MATH_LEN_4BYTE          0x04</div><div class='del'>-#define MATH_LEN_8BYTE          0x08</div><div class='add'>+#define MATH_LEN_SHIFT		0</div><div class='add'>+#define MATH_LEN_MASK		(0x0f &lt;&lt; MATH_LEN_SHIFT)</div><div class='add'>+#define MATH_LEN_1BYTE		0x01</div><div class='add'>+#define MATH_LEN_2BYTE		0x02</div><div class='add'>+#define MATH_LEN_4BYTE		0x04</div><div class='add'>+#define MATH_LEN_8BYTE		0x08</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * JUMP Command Constructs</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define JUMP_CLASS_SHIFT        25</div><div class='add'>+#define JUMP_CLASS_SHIFT	25</div><div class='ctx'> #define JUMP_CLASS_MASK		(3 &lt;&lt; JUMP_CLASS_SHIFT)</div><div class='ctx'> #define JUMP_CLASS_NONE		0</div><div class='ctx'> #define JUMP_CLASS_CLASS1	(1 &lt;&lt; JUMP_CLASS_SHIFT)</div><div class='ctx'> #define JUMP_CLASS_CLASS2	(2 &lt;&lt; JUMP_CLASS_SHIFT)</div><div class='ctx'> #define JUMP_CLASS_BOTH		(3 &lt;&lt; JUMP_CLASS_SHIFT)</div><div class='ctx'> </div><div class='del'>-#define JUMP_JSL_SHIFT          24</div><div class='del'>-#define JUMP_JSL_MASK           (1 &lt;&lt; JUMP_JSL_SHIFT)</div><div class='del'>-#define JUMP_JSL                (1 &lt;&lt; JUMP_JSL_SHIFT)</div><div class='add'>+#define JUMP_JSL_SHIFT		24</div><div class='add'>+#define JUMP_JSL_MASK		(1 &lt;&lt; JUMP_JSL_SHIFT)</div><div class='add'>+#define JUMP_JSL		(1 &lt;&lt; JUMP_JSL_SHIFT)</div><div class='ctx'> </div><div class='del'>-#define JUMP_TYPE_SHIFT         22</div><div class='del'>-#define JUMP_TYPE_MASK          (0x03 &lt;&lt; JUMP_TYPE_SHIFT)</div><div class='del'>-#define JUMP_TYPE_LOCAL         (0x00 &lt;&lt; JUMP_TYPE_SHIFT)</div><div class='del'>-#define JUMP_TYPE_NONLOCAL      (0x01 &lt;&lt; JUMP_TYPE_SHIFT)</div><div class='del'>-#define JUMP_TYPE_HALT          (0x02 &lt;&lt; JUMP_TYPE_SHIFT)</div><div class='del'>-#define JUMP_TYPE_HALT_USER     (0x03 &lt;&lt; JUMP_TYPE_SHIFT)</div><div class='add'>+#define JUMP_TYPE_SHIFT		22</div><div class='add'>+#define JUMP_TYPE_MASK		(0x03 &lt;&lt; JUMP_TYPE_SHIFT)</div><div class='add'>+#define JUMP_TYPE_LOCAL		(0x00 &lt;&lt; JUMP_TYPE_SHIFT)</div><div class='add'>+#define JUMP_TYPE_NONLOCAL	(0x01 &lt;&lt; JUMP_TYPE_SHIFT)</div><div class='add'>+#define JUMP_TYPE_HALT		(0x02 &lt;&lt; JUMP_TYPE_SHIFT)</div><div class='add'>+#define JUMP_TYPE_HALT_USER	(0x03 &lt;&lt; JUMP_TYPE_SHIFT)</div><div class='ctx'> </div><div class='del'>-#define JUMP_TEST_SHIFT         16</div><div class='del'>-#define JUMP_TEST_MASK          (0x03 &lt;&lt; JUMP_TEST_SHIFT)</div><div class='del'>-#define JUMP_TEST_ALL           (0x00 &lt;&lt; JUMP_TEST_SHIFT)</div><div class='del'>-#define JUMP_TEST_INVALL        (0x01 &lt;&lt; JUMP_TEST_SHIFT)</div><div class='del'>-#define JUMP_TEST_ANY           (0x02 &lt;&lt; JUMP_TEST_SHIFT)</div><div class='del'>-#define JUMP_TEST_INVANY        (0x03 &lt;&lt; JUMP_TEST_SHIFT)</div><div class='add'>+#define JUMP_TEST_SHIFT		16</div><div class='add'>+#define JUMP_TEST_MASK		(0x03 &lt;&lt; JUMP_TEST_SHIFT)</div><div class='add'>+#define JUMP_TEST_ALL		(0x00 &lt;&lt; JUMP_TEST_SHIFT)</div><div class='add'>+#define JUMP_TEST_INVALL	(0x01 &lt;&lt; JUMP_TEST_SHIFT)</div><div class='add'>+#define JUMP_TEST_ANY		(0x02 &lt;&lt; JUMP_TEST_SHIFT)</div><div class='add'>+#define JUMP_TEST_INVANY	(0x03 &lt;&lt; JUMP_TEST_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* Condition codes. JSL bit is factored in */</div><div class='del'>-#define JUMP_COND_SHIFT         8</div><div class='del'>-#define JUMP_COND_MASK          (0x100ff &lt;&lt; JUMP_COND_SHIFT)</div><div class='del'>-#define JUMP_COND_PK_0          (0x80 &lt;&lt; JUMP_COND_SHIFT)</div><div class='del'>-#define JUMP_COND_PK_GCD_1      (0x40 &lt;&lt; JUMP_COND_SHIFT)</div><div class='del'>-#define JUMP_COND_PK_PRIME      (0x20 &lt;&lt; JUMP_COND_SHIFT)</div><div class='del'>-#define JUMP_COND_MATH_N        (0x08 &lt;&lt; JUMP_COND_SHIFT)</div><div class='del'>-#define JUMP_COND_MATH_Z        (0x04 &lt;&lt; JUMP_COND_SHIFT)</div><div class='del'>-#define JUMP_COND_MATH_C        (0x02 &lt;&lt; JUMP_COND_SHIFT)</div><div class='del'>-#define JUMP_COND_MATH_NV       (0x01 &lt;&lt; JUMP_COND_SHIFT)</div><div class='del'>-</div><div class='del'>-#define JUMP_COND_JRP           ((0x80 &lt;&lt; JUMP_COND_SHIFT) | JUMP_JSL)</div><div class='del'>-#define JUMP_COND_SHRD          ((0x40 &lt;&lt; JUMP_COND_SHIFT) | JUMP_JSL)</div><div class='del'>-#define JUMP_COND_SELF          ((0x20 &lt;&lt; JUMP_COND_SHIFT) | JUMP_JSL)</div><div class='del'>-#define JUMP_COND_CALM          ((0x10 &lt;&lt; JUMP_COND_SHIFT) | JUMP_JSL)</div><div class='del'>-#define JUMP_COND_NIP           ((0x08 &lt;&lt; JUMP_COND_SHIFT) | JUMP_JSL)</div><div class='del'>-#define JUMP_COND_NIFP          ((0x04 &lt;&lt; JUMP_COND_SHIFT) | JUMP_JSL)</div><div class='del'>-#define JUMP_COND_NOP           ((0x02 &lt;&lt; JUMP_COND_SHIFT) | JUMP_JSL)</div><div class='del'>-#define JUMP_COND_NCP           ((0x01 &lt;&lt; JUMP_COND_SHIFT) | JUMP_JSL)</div><div class='del'>-</div><div class='del'>-#define JUMP_OFFSET_SHIFT       0</div><div class='del'>-#define JUMP_OFFSET_MASK        (0xff &lt;&lt; JUMP_OFFSET_SHIFT)</div><div class='add'>+#define JUMP_COND_SHIFT		8</div><div class='add'>+#define JUMP_COND_MASK		(0x100ff &lt;&lt; JUMP_COND_SHIFT)</div><div class='add'>+#define JUMP_COND_PK_0		(0x80 &lt;&lt; JUMP_COND_SHIFT)</div><div class='add'>+#define JUMP_COND_PK_GCD_1	(0x40 &lt;&lt; JUMP_COND_SHIFT)</div><div class='add'>+#define JUMP_COND_PK_PRIME	(0x20 &lt;&lt; JUMP_COND_SHIFT)</div><div class='add'>+#define JUMP_COND_MATH_N	(0x08 &lt;&lt; JUMP_COND_SHIFT)</div><div class='add'>+#define JUMP_COND_MATH_Z	(0x04 &lt;&lt; JUMP_COND_SHIFT)</div><div class='add'>+#define JUMP_COND_MATH_C	(0x02 &lt;&lt; JUMP_COND_SHIFT)</div><div class='add'>+#define JUMP_COND_MATH_NV	(0x01 &lt;&lt; JUMP_COND_SHIFT)</div><div class='add'>+</div><div class='add'>+#define JUMP_COND_JRP		((0x80 &lt;&lt; JUMP_COND_SHIFT) | JUMP_JSL)</div><div class='add'>+#define JUMP_COND_SHRD		((0x40 &lt;&lt; JUMP_COND_SHIFT) | JUMP_JSL)</div><div class='add'>+#define JUMP_COND_SELF		((0x20 &lt;&lt; JUMP_COND_SHIFT) | JUMP_JSL)</div><div class='add'>+#define JUMP_COND_CALM		((0x10 &lt;&lt; JUMP_COND_SHIFT) | JUMP_JSL)</div><div class='add'>+#define JUMP_COND_NIP		((0x08 &lt;&lt; JUMP_COND_SHIFT) | JUMP_JSL)</div><div class='add'>+#define JUMP_COND_NIFP		((0x04 &lt;&lt; JUMP_COND_SHIFT) | JUMP_JSL)</div><div class='add'>+#define JUMP_COND_NOP		((0x02 &lt;&lt; JUMP_COND_SHIFT) | JUMP_JSL)</div><div class='add'>+#define JUMP_COND_NCP		((0x01 &lt;&lt; JUMP_COND_SHIFT) | JUMP_JSL)</div><div class='add'>+</div><div class='add'>+#define JUMP_OFFSET_SHIFT	0</div><div class='add'>+#define JUMP_OFFSET_MASK	(0xff &lt;&lt; JUMP_OFFSET_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * NFIFO ENTRY</div><div class='hunk'>@@ -1500,20 +1500,20 @@</div><div class='ctx'> #define NFIFOENTRY_DEST_BOTH	(3 &lt;&lt; NFIFOENTRY_DEST_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #define NFIFOENTRY_LC2_SHIFT	29</div><div class='del'>-#define NFIFOENTRY_LC2_MASK		(1 &lt;&lt; NFIFOENTRY_LC2_SHIFT)</div><div class='del'>-#define NFIFOENTRY_LC2			(1 &lt;&lt; NFIFOENTRY_LC2_SHIFT)</div><div class='add'>+#define NFIFOENTRY_LC2_MASK	(1 &lt;&lt; NFIFOENTRY_LC2_SHIFT)</div><div class='add'>+#define NFIFOENTRY_LC2		(1 &lt;&lt; NFIFOENTRY_LC2_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #define NFIFOENTRY_LC1_SHIFT	28</div><div class='del'>-#define NFIFOENTRY_LC1_MASK		(1 &lt;&lt; NFIFOENTRY_LC1_SHIFT)</div><div class='del'>-#define NFIFOENTRY_LC1			(1 &lt;&lt; NFIFOENTRY_LC1_SHIFT)</div><div class='add'>+#define NFIFOENTRY_LC1_MASK	(1 &lt;&lt; NFIFOENTRY_LC1_SHIFT)</div><div class='add'>+#define NFIFOENTRY_LC1		(1 &lt;&lt; NFIFOENTRY_LC1_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #define NFIFOENTRY_FC2_SHIFT	27</div><div class='del'>-#define NFIFOENTRY_FC2_MASK		(1 &lt;&lt; NFIFOENTRY_FC2_SHIFT)</div><div class='del'>-#define NFIFOENTRY_FC2			(1 &lt;&lt; NFIFOENTRY_FC2_SHIFT)</div><div class='add'>+#define NFIFOENTRY_FC2_MASK	(1 &lt;&lt; NFIFOENTRY_FC2_SHIFT)</div><div class='add'>+#define NFIFOENTRY_FC2		(1 &lt;&lt; NFIFOENTRY_FC2_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #define NFIFOENTRY_FC1_SHIFT	26</div><div class='del'>-#define NFIFOENTRY_FC1_MASK		(1 &lt;&lt; NFIFOENTRY_FC1_SHIFT)</div><div class='del'>-#define NFIFOENTRY_FC1			(1 &lt;&lt; NFIFOENTRY_FC1_SHIFT)</div><div class='add'>+#define NFIFOENTRY_FC1_MASK	(1 &lt;&lt; NFIFOENTRY_FC1_SHIFT)</div><div class='add'>+#define NFIFOENTRY_FC1		(1 &lt;&lt; NFIFOENTRY_FC1_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #define NFIFOENTRY_STYPE_SHIFT	24</div><div class='ctx'> #define NFIFOENTRY_STYPE_MASK	(3 &lt;&lt; NFIFOENTRY_STYPE_SHIFT)</div><div class='hunk'>@@ -1525,60 +1525,59 @@</div><div class='ctx'> #define NFIFOENTRY_DTYPE_SHIFT	20</div><div class='ctx'> #define NFIFOENTRY_DTYPE_MASK	(0xF &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='ctx'> </div><div class='del'>-#define NFIFOENTRY_DTYPE_SBOX      (0x0  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_DTYPE_AAD       (0x1  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_DTYPE_IV        (0x2  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_DTYPE_SAD       (0x3  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_DTYPE_ICV       (0xA  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_DTYPE_SKIP      (0xE  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_DTYPE_MSG       (0xF  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='del'>-</div><div class='del'>-#define NFIFOENTRY_DTYPE_PK_A0     (0x0  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_DTYPE_PK_A1     (0x1  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_DTYPE_PK_A2     (0x2  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_DTYPE_PK_A3     (0x3  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_DTYPE_PK_B0     (0x4  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_DTYPE_PK_B1     (0x5  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_DTYPE_PK_B2     (0x6  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_DTYPE_PK_B3     (0x7  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_DTYPE_PK_N      (0x8  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_DTYPE_PK_E      (0x9  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_DTYPE_PK_A      (0xC  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_DTYPE_PK_B      (0xD  &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_DTYPE_SBOX	(0x0 &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_DTYPE_AAD	(0x1 &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_DTYPE_IV	(0x2 &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_DTYPE_SAD	(0x3 &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_DTYPE_ICV	(0xA &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_DTYPE_SKIP	(0xE &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_DTYPE_MSG	(0xF &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+</div><div class='add'>+#define NFIFOENTRY_DTYPE_PK_A0	(0x0 &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_DTYPE_PK_A1	(0x1 &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_DTYPE_PK_A2	(0x2 &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_DTYPE_PK_A3	(0x3 &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_DTYPE_PK_B0	(0x4 &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_DTYPE_PK_B1	(0x5 &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_DTYPE_PK_B2	(0x6 &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_DTYPE_PK_B3	(0x7 &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_DTYPE_PK_N	(0x8 &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_DTYPE_PK_E	(0x9 &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_DTYPE_PK_A	(0xC &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_DTYPE_PK_B	(0xD &lt;&lt; NFIFOENTRY_DTYPE_SHIFT)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define NFIFOENTRY_BND_SHIFT	19</div><div class='del'>-#define NFIFOENTRY_BND_MASK		(1 &lt;&lt; NFIFOENTRY_BND_SHIFT)</div><div class='del'>-#define NFIFOENTRY_BND			(1 &lt;&lt; NFIFOENTRY_BND_SHIFT)</div><div class='add'>+#define NFIFOENTRY_BND_MASK	(1 &lt;&lt; NFIFOENTRY_BND_SHIFT)</div><div class='add'>+#define NFIFOENTRY_BND		(1 &lt;&lt; NFIFOENTRY_BND_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #define NFIFOENTRY_PTYPE_SHIFT	16</div><div class='ctx'> #define NFIFOENTRY_PTYPE_MASK	(0x7 &lt;&lt; NFIFOENTRY_PTYPE_SHIFT)</div><div class='ctx'> </div><div class='del'>-#define NFIFOENTRY_PTYPE_ZEROS         (0x0  &lt;&lt; NFIFOENTRY_PTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_PTYPE_RND_NOZEROS   (0x1  &lt;&lt; NFIFOENTRY_PTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_PTYPE_INCREMENT     (0x2  &lt;&lt; NFIFOENTRY_PTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_PTYPE_RND           (0x3  &lt;&lt; NFIFOENTRY_PTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_PTYPE_ZEROS_NZ      (0x4  &lt;&lt; NFIFOENTRY_PTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_PTYPE_RND_NZ_LZ     (0x5  &lt;&lt; NFIFOENTRY_PTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_PTYPE_N             (0x6  &lt;&lt; NFIFOENTRY_PTYPE_SHIFT)</div><div class='del'>-#define NFIFOENTRY_PTYPE_RND_NZ_N      (0x7  &lt;&lt; NFIFOENTRY_PTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_PTYPE_ZEROS		(0x0 &lt;&lt; NFIFOENTRY_PTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_PTYPE_RND_NOZEROS	(0x1 &lt;&lt; NFIFOENTRY_PTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_PTYPE_INCREMENT	(0x2 &lt;&lt; NFIFOENTRY_PTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_PTYPE_RND		(0x3 &lt;&lt; NFIFOENTRY_PTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_PTYPE_ZEROS_NZ	(0x4 &lt;&lt; NFIFOENTRY_PTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_PTYPE_RND_NZ_LZ	(0x5 &lt;&lt; NFIFOENTRY_PTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_PTYPE_N		(0x6 &lt;&lt; NFIFOENTRY_PTYPE_SHIFT)</div><div class='add'>+#define NFIFOENTRY_PTYPE_RND_NZ_N	(0x7 &lt;&lt; NFIFOENTRY_PTYPE_SHIFT)</div><div class='ctx'> </div><div class='del'>-#define NFIFOENTRY_OC_SHIFT		15</div><div class='del'>-#define NFIFOENTRY_OC_MASK		(1 &lt;&lt; NFIFOENTRY_OC_SHIFT)</div><div class='del'>-#define NFIFOENTRY_OC			(1 &lt;&lt; NFIFOENTRY_OC_SHIFT)</div><div class='add'>+#define NFIFOENTRY_OC_SHIFT	15</div><div class='add'>+#define NFIFOENTRY_OC_MASK	(1 &lt;&lt; NFIFOENTRY_OC_SHIFT)</div><div class='add'>+#define NFIFOENTRY_OC		(1 &lt;&lt; NFIFOENTRY_OC_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #define NFIFOENTRY_AST_SHIFT	14</div><div class='del'>-#define NFIFOENTRY_AST_MASK		(1 &lt;&lt; NFIFOENTRY_OC_SHIFT)</div><div class='del'>-#define NFIFOENTRY_AST			(1 &lt;&lt; NFIFOENTRY_OC_SHIFT)</div><div class='add'>+#define NFIFOENTRY_AST_MASK	(1 &lt;&lt; NFIFOENTRY_OC_SHIFT)</div><div class='add'>+#define NFIFOENTRY_AST		(1 &lt;&lt; NFIFOENTRY_OC_SHIFT)</div><div class='ctx'> </div><div class='del'>-#define NFIFOENTRY_BM_SHIFT		11</div><div class='del'>-#define NFIFOENTRY_BM_MASK		(1 &lt;&lt; NFIFOENTRY_BM_SHIFT)</div><div class='del'>-#define NFIFOENTRY_BM			(1 &lt;&lt; NFIFOENTRY_BM_SHIFT)</div><div class='del'>-</div><div class='del'>-#define NFIFOENTRY_PS_SHIFT		10</div><div class='del'>-#define NFIFOENTRY_PS_MASK		(1 &lt;&lt; NFIFOENTRY_PS_SHIFT)</div><div class='del'>-#define NFIFOENTRY_PS			(1 &lt;&lt; NFIFOENTRY_PS_SHIFT)</div><div class='add'>+#define NFIFOENTRY_BM_SHIFT	11</div><div class='add'>+#define NFIFOENTRY_BM_MASK	(1 &lt;&lt; NFIFOENTRY_BM_SHIFT)</div><div class='add'>+#define NFIFOENTRY_BM		(1 &lt;&lt; NFIFOENTRY_BM_SHIFT)</div><div class='ctx'> </div><div class='add'>+#define NFIFOENTRY_PS_SHIFT	10</div><div class='add'>+#define NFIFOENTRY_PS_MASK	(1 &lt;&lt; NFIFOENTRY_PS_SHIFT)</div><div class='add'>+#define NFIFOENTRY_PS		(1 &lt;&lt; NFIFOENTRY_PS_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #define NFIFOENTRY_DLEN_SHIFT	0</div><div class='ctx'> #define NFIFOENTRY_DLEN_MASK	(0xFFF &lt;&lt; NFIFOENTRY_DLEN_SHIFT)</div><div class='hunk'>@@ -1591,15 +1590,15 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* IPSec ESP CBC Encap/Decap Options */</div><div class='del'>-#define PDBOPTS_ESPCBC_ARSNONE  0x00   /* no antireplay window              */</div><div class='del'>-#define PDBOPTS_ESPCBC_ARS32    0x40   /* 32-entry antireplay window        */</div><div class='del'>-#define PDBOPTS_ESPCBC_ARS64    0xc0   /* 64-entry antireplay window        */</div><div class='del'>-#define PDBOPTS_ESPCBC_IVSRC    0x20   /* IV comes from internal random gen */</div><div class='del'>-#define PDBOPTS_ESPCBC_ESN      0x10   /* extended sequence included        */</div><div class='del'>-#define PDBOPTS_ESPCBC_OUTFMT   0x08   /* output only decapsulation (decap) */</div><div class='del'>-#define PDBOPTS_ESPCBC_IPHDRSRC 0x08   /* IP header comes from PDB (encap)  */</div><div class='del'>-#define PDBOPTS_ESPCBC_INCIPHDR 0x04   /* Prepend IP header to output frame */</div><div class='del'>-#define PDBOPTS_ESPCBC_IPVSN    0x02   /* process IPv6 header               */</div><div class='del'>-#define PDBOPTS_ESPCBC_TUNNEL   0x01   /* tunnel mode next-header byte      */</div><div class='add'>+#define PDBOPTS_ESPCBC_ARSNONE	0x00	/* no antireplay window	*/</div><div class='add'>+#define PDBOPTS_ESPCBC_ARS32	0x40	/* 32-entry antireplay window */</div><div class='add'>+#define PDBOPTS_ESPCBC_ARS64	0xc0	/* 64-entry antireplay window */</div><div class='add'>+#define PDBOPTS_ESPCBC_IVSRC	0x20	/* IV comes from internal random gen */</div><div class='add'>+#define PDBOPTS_ESPCBC_ESN	0x10	/* extended sequence included */</div><div class='add'>+#define PDBOPTS_ESPCBC_OUTFMT	0x08	/* output only decapsulation (decap) */</div><div class='add'>+#define PDBOPTS_ESPCBC_IPHDRSRC 0x08	/* IP header comes from PDB (encap) */</div><div class='add'>+#define PDBOPTS_ESPCBC_INCIPHDR 0x04	/* Prepend IP header to output frame */</div><div class='add'>+#define PDBOPTS_ESPCBC_IPVSN	0x02	/* process IPv6 header */</div><div class='add'>+#define PDBOPTS_ESPCBC_TUNNEL	0x01	/* tunnel mode next-header byte */</div><div class='ctx'> </div><div class='ctx'> #endif /* DESC_H */</div><div class='head'>diff --git a/drivers/crypto/caam/desc_constr.h b/drivers/crypto/caam/desc_constr.h<br/>index 0991323cf3fd..348b882275f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/crypto/caam/desc_constr.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/caam/desc_constr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/crypto/caam/desc_constr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/crypto/caam/desc_constr.h</a></div><div class='hunk'>@@ -18,9 +18,10 @@</div><div class='ctx'> #define PRINT_POS</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define SET_OK_PROP_ERRORS (IMMEDIATE | LDST_CLASS_DECO | \</div><div class='del'>-			    LDST_SRCDST_WORD_DECOCTRL | \</div><div class='del'>-			    (LDOFF_CHG_SHARE_OK_PROP &lt;&lt; LDST_OFFSET_SHIFT))</div><div class='add'>+#define SET_OK_NO_PROP_ERRORS (IMMEDIATE | LDST_CLASS_DECO | \</div><div class='add'>+			       LDST_SRCDST_WORD_DECOCTRL | \</div><div class='add'>+			       (LDOFF_CHG_SHARE_OK_NO_PROP &lt;&lt; \</div><div class='add'>+				LDST_OFFSET_SHIFT))</div><div class='ctx'> #define DISABLE_AUTO_INFO_FIFO (IMMEDIATE | LDST_CLASS_DECO | \</div><div class='ctx'> 				LDST_SRCDST_WORD_DECOCTRL | \</div><div class='ctx'> 				(LDOFF_DISABLE_AUTO_NFIFO &lt;&lt; LDST_OFFSET_SHIFT))</div><div class='head'>diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h<br/>index aee394e39056..e9f7a70cdd5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/crypto/caam/regs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/caam/regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/crypto/caam/regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/crypto/caam/regs.h</a></div><div class='hunk'>@@ -657,7 +657,6 @@ struct caam_full {</div><div class='ctx'> 	u64 rsvd[512];</div><div class='ctx'> 	struct caam_assurance assure;</div><div class='ctx'> 	struct caam_queue_if qi;</div><div class='del'>-	struct caam_deco *deco;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* REGS_H */</div><div class='head'>diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c<br/>index dcd8babae9eb..597235a2f8f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/crypto/mv_cesa.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/mv_cesa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/crypto/mv_cesa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/crypto/mv_cesa.c</a></div><div class='hunk'>@@ -1128,17 +1128,7 @@ static struct platform_driver marvell_crypto = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_ALIAS("platform:mv_crypto");</div><div class='ctx'> </div><div class='del'>-static int __init mv_crypto_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;marvell_crypto);</div><div class='del'>-}</div><div class='del'>-module_init(mv_crypto_init);</div><div class='del'>-</div><div class='del'>-static void __exit mv_crypto_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;marvell_crypto);</div><div class='del'>-}</div><div class='del'>-module_exit(mv_crypto_exit);</div><div class='add'>+module_platform_driver(marvell_crypto);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Sebastian Andrzej Siewior &lt;sebastian@breakpoint.cc&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Support for Marvell's cryptographic engine");</div><div class='head'>diff --git a/drivers/crypto/picoxcell_crypto.c b/drivers/crypto/picoxcell_crypto.c<br/>index a2b553eabbdb..58480d009324 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/crypto/picoxcell_crypto.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/picoxcell_crypto.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/crypto/picoxcell_crypto.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/crypto/picoxcell_crypto.c</a></div><div class='hunk'>@@ -873,7 +873,7 @@ static int spacc_aes_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='ctx'> 	 * request for any other size (192 bits) then we need to do a software</div><div class='ctx'> 	 * fallback.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((len != AES_KEYSIZE_128 || len != AES_KEYSIZE_256) &amp;&amp;</div><div class='add'>+	if (len != AES_KEYSIZE_128 &amp;&amp; len != AES_KEYSIZE_256 &amp;&amp;</div><div class='ctx'> 	    ctx-&gt;sw_cipher) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Set the fallback transform to use the same request flags as</div><div class='hunk'>@@ -886,7 +886,7 @@ static int spacc_aes_setkey(struct crypto_ablkcipher *cipher, const u8 *key,</div><div class='ctx'> 		err = crypto_ablkcipher_setkey(ctx-&gt;sw_cipher, key, len);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto sw_setkey_failed;</div><div class='del'>-	} else if ((len != AES_KEYSIZE_128 || len != AES_KEYSIZE_256) &amp;&amp;</div><div class='add'>+	} else if (len != AES_KEYSIZE_128 &amp;&amp; len != AES_KEYSIZE_256 &amp;&amp;</div><div class='ctx'> 		   !ctx-&gt;sw_cipher)</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -1854,17 +1854,7 @@ static struct platform_driver spacc_driver = {</div><div class='ctx'> 	.id_table	= spacc_id_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init spacc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;spacc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(spacc_init);</div><div class='del'>-</div><div class='del'>-static void __exit spacc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;spacc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(spacc_exit);</div><div class='add'>+module_platform_driver(spacc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Jamie Iles");</div><div class='head'>diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c<br/>index 8115417a1c93..3376bca200fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/crypto/s5p-sss.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/s5p-sss.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/crypto/s5p-sss.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/crypto/s5p-sss.c</a></div><div class='hunk'>@@ -683,18 +683,7 @@ static struct platform_driver s5p_aes_crypto = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init s5p_aes_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return  platform_driver_register(&amp;s5p_aes_crypto);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit s5p_aes_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;s5p_aes_crypto);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(s5p_aes_mod_init);</div><div class='del'>-module_exit(s5p_aes_mod_exit);</div><div class='add'>+module_platform_driver(s5p_aes_crypto);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("S5PV210 AES hw acceleration support.");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c<br/>index dbe76b5df9cf..2d8c78901686 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/crypto/talitos.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/talitos.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/crypto/talitos.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/crypto/talitos.c</a></div><div class='hunk'>@@ -99,6 +99,8 @@ struct talitos_request {</div><div class='ctx'> </div><div class='ctx'> /* per-channel fifo management */</div><div class='ctx'> struct talitos_channel {</div><div class='add'>+	void __iomem *reg;</div><div class='add'>+</div><div class='ctx'> 	/* request fifo */</div><div class='ctx'> 	struct talitos_request *fifo;</div><div class='ctx'> </div><div class='hunk'>@@ -120,7 +122,7 @@ struct talitos_private {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct platform_device *ofdev;</div><div class='ctx'> 	void __iomem *reg;</div><div class='del'>-	int irq;</div><div class='add'>+	int irq[2];</div><div class='ctx'> </div><div class='ctx'> 	/* SEC version geometry (from device tree node) */</div><div class='ctx'> 	unsigned int num_channels;</div><div class='hunk'>@@ -144,7 +146,7 @@ struct talitos_private {</div><div class='ctx'> 	atomic_t last_chan ____cacheline_aligned;</div><div class='ctx'> </div><div class='ctx'> 	/* request callback tasklet */</div><div class='del'>-	struct tasklet_struct done_task;</div><div class='add'>+	struct tasklet_struct done_task[2];</div><div class='ctx'> </div><div class='ctx'> 	/* list of registered algorithms */</div><div class='ctx'> 	struct list_head alg_list;</div><div class='hunk'>@@ -157,6 +159,7 @@ struct talitos_private {</div><div class='ctx'> #define TALITOS_FTR_SRC_LINK_TBL_LEN_INCLUDES_EXTENT 0x00000001</div><div class='ctx'> #define TALITOS_FTR_HW_AUTH_CHECK 0x00000002</div><div class='ctx'> #define TALITOS_FTR_SHA224_HWINIT 0x00000004</div><div class='add'>+#define TALITOS_FTR_HMAC_OK 0x00000008</div><div class='ctx'> </div><div class='ctx'> static void to_talitos_ptr(struct talitos_ptr *talitos_ptr, dma_addr_t dma_addr)</div><div class='ctx'> {</div><div class='hunk'>@@ -196,9 +199,9 @@ static int reset_channel(struct device *dev, int ch)</div><div class='ctx'> 	struct talitos_private *priv = dev_get_drvdata(dev);</div><div class='ctx'> 	unsigned int timeout = TALITOS_TIMEOUT;</div><div class='ctx'> </div><div class='del'>-	setbits32(priv-&gt;reg + TALITOS_CCCR(ch), TALITOS_CCCR_RESET);</div><div class='add'>+	setbits32(priv-&gt;chan[ch].reg + TALITOS_CCCR, TALITOS_CCCR_RESET);</div><div class='ctx'> </div><div class='del'>-	while ((in_be32(priv-&gt;reg + TALITOS_CCCR(ch)) &amp; TALITOS_CCCR_RESET)</div><div class='add'>+	while ((in_be32(priv-&gt;chan[ch].reg + TALITOS_CCCR) &amp; TALITOS_CCCR_RESET)</div><div class='ctx'> 	       &amp;&amp; --timeout)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> </div><div class='hunk'>@@ -208,12 +211,12 @@ static int reset_channel(struct device *dev, int ch)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set 36-bit addressing, done writeback enable and done IRQ enable */</div><div class='del'>-	setbits32(priv-&gt;reg + TALITOS_CCCR_LO(ch), TALITOS_CCCR_LO_EAE |</div><div class='add'>+	setbits32(priv-&gt;chan[ch].reg + TALITOS_CCCR_LO, TALITOS_CCCR_LO_EAE |</div><div class='ctx'> 		  TALITOS_CCCR_LO_CDWE | TALITOS_CCCR_LO_CDIE);</div><div class='ctx'> </div><div class='ctx'> 	/* and ICCR writeback, if available */</div><div class='ctx'> 	if (priv-&gt;features &amp; TALITOS_FTR_HW_AUTH_CHECK)</div><div class='del'>-		setbits32(priv-&gt;reg + TALITOS_CCCR_LO(ch),</div><div class='add'>+		setbits32(priv-&gt;chan[ch].reg + TALITOS_CCCR_LO,</div><div class='ctx'> 		          TALITOS_CCCR_LO_IWSE);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -223,13 +226,19 @@ static int reset_device(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct talitos_private *priv = dev_get_drvdata(dev);</div><div class='ctx'> 	unsigned int timeout = TALITOS_TIMEOUT;</div><div class='add'>+	u32 mcr = TALITOS_MCR_SWR;</div><div class='ctx'> </div><div class='del'>-	setbits32(priv-&gt;reg + TALITOS_MCR, TALITOS_MCR_SWR);</div><div class='add'>+	setbits32(priv-&gt;reg + TALITOS_MCR, mcr);</div><div class='ctx'> </div><div class='ctx'> 	while ((in_be32(priv-&gt;reg + TALITOS_MCR) &amp; TALITOS_MCR_SWR)</div><div class='ctx'> 	       &amp;&amp; --timeout)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;irq[1]) {</div><div class='add'>+		mcr = TALITOS_MCR_RCA1 | TALITOS_MCR_RCA3;</div><div class='add'>+		setbits32(priv-&gt;reg + TALITOS_MCR, mcr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (timeout == 0) {</div><div class='ctx'> 		dev_err(dev, "failed to reset device\n");</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -327,8 +336,9 @@ static int talitos_submit(struct device *dev, int ch, struct talitos_desc *desc,</div><div class='ctx'> </div><div class='ctx'> 	/* GO! */</div><div class='ctx'> 	wmb();</div><div class='del'>-	out_be32(priv-&gt;reg + TALITOS_FF(ch), upper_32_bits(request-&gt;dma_desc));</div><div class='del'>-	out_be32(priv-&gt;reg + TALITOS_FF_LO(ch),</div><div class='add'>+	out_be32(priv-&gt;chan[ch].reg + TALITOS_FF,</div><div class='add'>+		 upper_32_bits(request-&gt;dma_desc));</div><div class='add'>+	out_be32(priv-&gt;chan[ch].reg + TALITOS_FF_LO,</div><div class='ctx'> 		 lower_32_bits(request-&gt;dma_desc));</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;chan[ch].head_lock, flags);</div><div class='hunk'>@@ -397,21 +407,32 @@ static void flush_channel(struct device *dev, int ch, int error, int reset_ch)</div><div class='ctx'> /*</div><div class='ctx'>  * process completed requests for channels that have done status</div><div class='ctx'>  */</div><div class='del'>-static void talitos_done(unsigned long data)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = (struct device *)data;</div><div class='del'>-	struct talitos_private *priv = dev_get_drvdata(dev);</div><div class='del'>-	int ch;</div><div class='del'>-</div><div class='del'>-	for (ch = 0; ch &lt; priv-&gt;num_channels; ch++)</div><div class='del'>-		flush_channel(dev, ch, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* At this point, all completed channels have been processed.</div><div class='del'>-	 * Unmask done interrupts for channels completed later on.</div><div class='del'>-	 */</div><div class='del'>-	setbits32(priv-&gt;reg + TALITOS_IMR, TALITOS_IMR_INIT);</div><div class='del'>-	setbits32(priv-&gt;reg + TALITOS_IMR_LO, TALITOS_IMR_LO_INIT);</div><div class='add'>+#define DEF_TALITOS_DONE(name, ch_done_mask)				\</div><div class='add'>+static void talitos_done_##name(unsigned long data)			\</div><div class='add'>+{									\</div><div class='add'>+	struct device *dev = (struct device *)data;			\</div><div class='add'>+	struct talitos_private *priv = dev_get_drvdata(dev);		\</div><div class='add'>+									\</div><div class='add'>+	if (ch_done_mask &amp; 1)						\</div><div class='add'>+		flush_channel(dev, 0, 0, 0);				\</div><div class='add'>+	if (priv-&gt;num_channels == 1)					\</div><div class='add'>+		goto out;						\</div><div class='add'>+	if (ch_done_mask &amp; (1 &lt;&lt; 2))					\</div><div class='add'>+		flush_channel(dev, 1, 0, 0);				\</div><div class='add'>+	if (ch_done_mask &amp; (1 &lt;&lt; 4))					\</div><div class='add'>+		flush_channel(dev, 2, 0, 0);				\</div><div class='add'>+	if (ch_done_mask &amp; (1 &lt;&lt; 6))					\</div><div class='add'>+		flush_channel(dev, 3, 0, 0);				\</div><div class='add'>+									\</div><div class='add'>+out:									\</div><div class='add'>+	/* At this point, all completed channels have been processed */	\</div><div class='add'>+	/* Unmask done interrupts for channels completed later on. */	\</div><div class='add'>+	setbits32(priv-&gt;reg + TALITOS_IMR, ch_done_mask);		\</div><div class='add'>+	setbits32(priv-&gt;reg + TALITOS_IMR_LO, TALITOS_IMR_LO_INIT);	\</div><div class='ctx'> }</div><div class='add'>+DEF_TALITOS_DONE(4ch, TALITOS_ISR_4CHDONE)</div><div class='add'>+DEF_TALITOS_DONE(ch0_2, TALITOS_ISR_CH_0_2_DONE)</div><div class='add'>+DEF_TALITOS_DONE(ch1_3, TALITOS_ISR_CH_1_3_DONE)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * locate current (offending) descriptor</div><div class='hunk'>@@ -422,7 +443,7 @@ static u32 current_desc_hdr(struct device *dev, int ch)</div><div class='ctx'> 	int tail = priv-&gt;chan[ch].tail;</div><div class='ctx'> 	dma_addr_t cur_desc;</div><div class='ctx'> </div><div class='del'>-	cur_desc = in_be32(priv-&gt;reg + TALITOS_CDPR_LO(ch));</div><div class='add'>+	cur_desc = in_be32(priv-&gt;chan[ch].reg + TALITOS_CDPR_LO);</div><div class='ctx'> </div><div class='ctx'> 	while (priv-&gt;chan[ch].fifo[tail].dma_desc != cur_desc) {</div><div class='ctx'> 		tail = (tail + 1) &amp; (priv-&gt;fifo_len - 1);</div><div class='hunk'>@@ -444,7 +465,7 @@ static void report_eu_error(struct device *dev, int ch, u32 desc_hdr)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!desc_hdr)</div><div class='del'>-		desc_hdr = in_be32(priv-&gt;reg + TALITOS_DESCBUF(ch));</div><div class='add'>+		desc_hdr = in_be32(priv-&gt;chan[ch].reg + TALITOS_DESCBUF);</div><div class='ctx'> </div><div class='ctx'> 	switch (desc_hdr &amp; DESC_HDR_SEL0_MASK) {</div><div class='ctx'> 	case DESC_HDR_SEL0_AFEU:</div><div class='hunk'>@@ -506,16 +527,15 @@ static void report_eu_error(struct device *dev, int ch, u32 desc_hdr)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 8; i++)</div><div class='ctx'> 		dev_err(dev, "DESCBUF 0x%08x_%08x\n",</div><div class='del'>-			in_be32(priv-&gt;reg + TALITOS_DESCBUF(ch) + 8*i),</div><div class='del'>-			in_be32(priv-&gt;reg + TALITOS_DESCBUF_LO(ch) + 8*i));</div><div class='add'>+			in_be32(priv-&gt;chan[ch].reg + TALITOS_DESCBUF + 8*i),</div><div class='add'>+			in_be32(priv-&gt;chan[ch].reg + TALITOS_DESCBUF_LO + 8*i));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * recover from error interrupts</div><div class='ctx'>  */</div><div class='del'>-static void talitos_error(unsigned long data, u32 isr, u32 isr_lo)</div><div class='add'>+static void talitos_error(struct device *dev, u32 isr, u32 isr_lo)</div><div class='ctx'> {</div><div class='del'>-	struct device *dev = (struct device *)data;</div><div class='ctx'> 	struct talitos_private *priv = dev_get_drvdata(dev);</div><div class='ctx'> 	unsigned int timeout = TALITOS_TIMEOUT;</div><div class='ctx'> 	int ch, error, reset_dev = 0, reset_ch = 0;</div><div class='hunk'>@@ -528,8 +548,8 @@ static void talitos_error(unsigned long data, u32 isr, u32 isr_lo)</div><div class='ctx'> </div><div class='ctx'> 		error = -EINVAL;</div><div class='ctx'> </div><div class='del'>-		v = in_be32(priv-&gt;reg + TALITOS_CCPSR(ch));</div><div class='del'>-		v_lo = in_be32(priv-&gt;reg + TALITOS_CCPSR_LO(ch));</div><div class='add'>+		v = in_be32(priv-&gt;chan[ch].reg + TALITOS_CCPSR);</div><div class='add'>+		v_lo = in_be32(priv-&gt;chan[ch].reg + TALITOS_CCPSR_LO);</div><div class='ctx'> </div><div class='ctx'> 		if (v_lo &amp; TALITOS_CCPSR_LO_DOF) {</div><div class='ctx'> 			dev_err(dev, "double fetch fifo overflow error\n");</div><div class='hunk'>@@ -567,10 +587,10 @@ static void talitos_error(unsigned long data, u32 isr, u32 isr_lo)</div><div class='ctx'> 		if (reset_ch) {</div><div class='ctx'> 			reset_channel(dev, ch);</div><div class='ctx'> 		} else {</div><div class='del'>-			setbits32(priv-&gt;reg + TALITOS_CCCR(ch),</div><div class='add'>+			setbits32(priv-&gt;chan[ch].reg + TALITOS_CCCR,</div><div class='ctx'> 				  TALITOS_CCCR_CONT);</div><div class='del'>-			setbits32(priv-&gt;reg + TALITOS_CCCR_LO(ch), 0);</div><div class='del'>-			while ((in_be32(priv-&gt;reg + TALITOS_CCCR(ch)) &amp;</div><div class='add'>+			setbits32(priv-&gt;chan[ch].reg + TALITOS_CCCR_LO, 0);</div><div class='add'>+			while ((in_be32(priv-&gt;chan[ch].reg + TALITOS_CCCR) &amp;</div><div class='ctx'> 			       TALITOS_CCCR_CONT) &amp;&amp; --timeout)</div><div class='ctx'> 				cpu_relax();</div><div class='ctx'> 			if (timeout == 0) {</div><div class='hunk'>@@ -580,7 +600,7 @@ static void talitos_error(unsigned long data, u32 isr, u32 isr_lo)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (reset_dev || isr &amp; ~TALITOS_ISR_CHERR || isr_lo) {</div><div class='add'>+	if (reset_dev || isr &amp; ~TALITOS_ISR_4CHERR || isr_lo) {</div><div class='ctx'> 		dev_err(dev, "done overflow, internal time out, or rngu error: "</div><div class='ctx'> 		        "ISR 0x%08x_%08x\n", isr, isr_lo);</div><div class='ctx'> </div><div class='hunk'>@@ -593,30 +613,35 @@ static void talitos_error(unsigned long data, u32 isr, u32 isr_lo)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t talitos_interrupt(int irq, void *data)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = data;</div><div class='del'>-	struct talitos_private *priv = dev_get_drvdata(dev);</div><div class='del'>-	u32 isr, isr_lo;</div><div class='del'>-</div><div class='del'>-	isr = in_be32(priv-&gt;reg + TALITOS_ISR);</div><div class='del'>-	isr_lo = in_be32(priv-&gt;reg + TALITOS_ISR_LO);</div><div class='del'>-	/* Acknowledge interrupt */</div><div class='del'>-	out_be32(priv-&gt;reg + TALITOS_ICR, isr);</div><div class='del'>-	out_be32(priv-&gt;reg + TALITOS_ICR_LO, isr_lo);</div><div class='del'>-</div><div class='del'>-	if (unlikely((isr &amp; ~TALITOS_ISR_CHDONE) || isr_lo))</div><div class='del'>-		talitos_error((unsigned long)data, isr, isr_lo);</div><div class='del'>-	else</div><div class='del'>-		if (likely(isr &amp; TALITOS_ISR_CHDONE)) {</div><div class='del'>-			/* mask further done interrupts. */</div><div class='del'>-			clrbits32(priv-&gt;reg + TALITOS_IMR, TALITOS_IMR_DONE);</div><div class='del'>-			/* done_task will unmask done interrupts at exit */</div><div class='del'>-			tasklet_schedule(&amp;priv-&gt;done_task);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return (isr || isr_lo) ? IRQ_HANDLED : IRQ_NONE;</div><div class='add'>+#define DEF_TALITOS_INTERRUPT(name, ch_done_mask, ch_err_mask, tlet)	       \</div><div class='add'>+static irqreturn_t talitos_interrupt_##name(int irq, void *data)	       \</div><div class='add'>+{									       \</div><div class='add'>+	struct device *dev = data;					       \</div><div class='add'>+	struct talitos_private *priv = dev_get_drvdata(dev);		       \</div><div class='add'>+	u32 isr, isr_lo;						       \</div><div class='add'>+									       \</div><div class='add'>+	isr = in_be32(priv-&gt;reg + TALITOS_ISR);				       \</div><div class='add'>+	isr_lo = in_be32(priv-&gt;reg + TALITOS_ISR_LO);			       \</div><div class='add'>+	/* Acknowledge interrupt */					       \</div><div class='add'>+	out_be32(priv-&gt;reg + TALITOS_ICR, isr &amp; (ch_done_mask | ch_err_mask)); \</div><div class='add'>+	out_be32(priv-&gt;reg + TALITOS_ICR_LO, isr_lo);			       \</div><div class='add'>+									       \</div><div class='add'>+	if (unlikely((isr &amp; ~TALITOS_ISR_4CHDONE) &amp; ch_err_mask || isr_lo))    \</div><div class='add'>+		talitos_error(dev, isr, isr_lo);			       \</div><div class='add'>+	else								       \</div><div class='add'>+		if (likely(isr &amp; ch_done_mask)) {			       \</div><div class='add'>+			/* mask further done interrupts. */		       \</div><div class='add'>+			clrbits32(priv-&gt;reg + TALITOS_IMR, ch_done_mask);      \</div><div class='add'>+			/* done_task will unmask done interrupts at exit */    \</div><div class='add'>+			tasklet_schedule(&amp;priv-&gt;done_task[tlet]);	       \</div><div class='add'>+		}							       \</div><div class='add'>+									       \</div><div class='add'>+	return (isr &amp; (ch_done_mask | ch_err_mask) || isr_lo) ? IRQ_HANDLED :  \</div><div class='add'>+								IRQ_NONE;      \</div><div class='ctx'> }</div><div class='add'>+DEF_TALITOS_INTERRUPT(4ch, TALITOS_ISR_4CHDONE, TALITOS_ISR_4CHERR, 0)</div><div class='add'>+DEF_TALITOS_INTERRUPT(ch0_2, TALITOS_ISR_CH_0_2_DONE, TALITOS_ISR_CH_0_2_ERR, 0)</div><div class='add'>+DEF_TALITOS_INTERRUPT(ch1_3, TALITOS_ISR_CH_1_3_DONE, TALITOS_ISR_CH_1_3_ERR, 1)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * hwrng</div><div class='hunk'>@@ -1874,6 +1899,97 @@ static int ahash_digest(struct ahash_request *areq)</div><div class='ctx'> 	return ahash_process_req(areq, areq-&gt;nbytes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct keyhash_result {</div><div class='add'>+	struct completion completion;</div><div class='add'>+	int err;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void keyhash_complete(struct crypto_async_request *req, int err)</div><div class='add'>+{</div><div class='add'>+	struct keyhash_result *res = req-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (err == -EINPROGRESS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	res-&gt;err = err;</div><div class='add'>+	complete(&amp;res-&gt;completion);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int keyhash(struct crypto_ahash *tfm, const u8 *key, unsigned int keylen,</div><div class='add'>+		   u8 *hash)</div><div class='add'>+{</div><div class='add'>+	struct talitos_ctx *ctx = crypto_tfm_ctx(crypto_ahash_tfm(tfm));</div><div class='add'>+</div><div class='add'>+	struct scatterlist sg[1];</div><div class='add'>+	struct ahash_request *req;</div><div class='add'>+	struct keyhash_result hresult;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;hresult.completion);</div><div class='add'>+</div><div class='add'>+	req = ahash_request_alloc(tfm, GFP_KERNEL);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Keep tfm keylen == 0 during hash of the long key */</div><div class='add'>+	ctx-&gt;keylen = 0;</div><div class='add'>+	ahash_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,</div><div class='add'>+				   keyhash_complete, &amp;hresult);</div><div class='add'>+</div><div class='add'>+	sg_init_one(&amp;sg[0], key, keylen);</div><div class='add'>+</div><div class='add'>+	ahash_request_set_crypt(req, sg, hash, keylen);</div><div class='add'>+	ret = crypto_ahash_digest(req);</div><div class='add'>+	switch (ret) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case -EINPROGRESS:</div><div class='add'>+	case -EBUSY:</div><div class='add'>+		ret = wait_for_completion_interruptible(</div><div class='add'>+			&amp;hresult.completion);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = hresult.err;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	ahash_request_free(req);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahash_setkey(struct crypto_ahash *tfm, const u8 *key,</div><div class='add'>+			unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct talitos_ctx *ctx = crypto_tfm_ctx(crypto_ahash_tfm(tfm));</div><div class='add'>+	unsigned int blocksize =</div><div class='add'>+			crypto_tfm_alg_blocksize(crypto_ahash_tfm(tfm));</div><div class='add'>+	unsigned int digestsize = crypto_ahash_digestsize(tfm);</div><div class='add'>+	unsigned int keysize = keylen;</div><div class='add'>+	u8 hash[SHA512_DIGEST_SIZE];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (keylen &lt;= blocksize)</div><div class='add'>+		memcpy(ctx-&gt;key, key, keysize);</div><div class='add'>+	else {</div><div class='add'>+		/* Must get the hash of the long key */</div><div class='add'>+		ret = keyhash(tfm, key, keylen, hash);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			crypto_ahash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		keysize = digestsize;</div><div class='add'>+		memcpy(ctx-&gt;key, hash, digestsize);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;keylen = keysize;</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'> struct talitos_alg_template {</div><div class='ctx'> 	u32 type;</div><div class='ctx'> 	union {</div><div class='hunk'>@@ -2217,6 +2333,138 @@ static struct talitos_alg_template driver_algs[] = {</div><div class='ctx'> 				     DESC_HDR_SEL0_MDEUB |</div><div class='ctx'> 				     DESC_HDR_MODE0_MDEUB_SHA512,</div><div class='ctx'> 	},</div><div class='add'>+	{	.type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+		.alg.hash = {</div><div class='add'>+			.init = ahash_init,</div><div class='add'>+			.update = ahash_update,</div><div class='add'>+			.final = ahash_final,</div><div class='add'>+			.finup = ahash_finup,</div><div class='add'>+			.digest = ahash_digest,</div><div class='add'>+			.setkey = ahash_setkey,</div><div class='add'>+			.halg.digestsize = MD5_DIGEST_SIZE,</div><div class='add'>+			.halg.base = {</div><div class='add'>+				.cra_name = "hmac(md5)",</div><div class='add'>+				.cra_driver_name = "hmac-md5-talitos",</div><div class='add'>+				.cra_blocksize = MD5_BLOCK_SIZE,</div><div class='add'>+				.cra_flags = CRYPTO_ALG_TYPE_AHASH |</div><div class='add'>+					     CRYPTO_ALG_ASYNC,</div><div class='add'>+				.cra_type = &amp;crypto_ahash_type</div><div class='add'>+			}</div><div class='add'>+		},</div><div class='add'>+		.desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |</div><div class='add'>+				     DESC_HDR_SEL0_MDEUA |</div><div class='add'>+				     DESC_HDR_MODE0_MDEU_MD5,</div><div class='add'>+	},</div><div class='add'>+	{	.type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+		.alg.hash = {</div><div class='add'>+			.init = ahash_init,</div><div class='add'>+			.update = ahash_update,</div><div class='add'>+			.final = ahash_final,</div><div class='add'>+			.finup = ahash_finup,</div><div class='add'>+			.digest = ahash_digest,</div><div class='add'>+			.setkey = ahash_setkey,</div><div class='add'>+			.halg.digestsize = SHA1_DIGEST_SIZE,</div><div class='add'>+			.halg.base = {</div><div class='add'>+				.cra_name = "hmac(sha1)",</div><div class='add'>+				.cra_driver_name = "hmac-sha1-talitos",</div><div class='add'>+				.cra_blocksize = SHA1_BLOCK_SIZE,</div><div class='add'>+				.cra_flags = CRYPTO_ALG_TYPE_AHASH |</div><div class='add'>+					     CRYPTO_ALG_ASYNC,</div><div class='add'>+				.cra_type = &amp;crypto_ahash_type</div><div class='add'>+			}</div><div class='add'>+		},</div><div class='add'>+		.desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |</div><div class='add'>+				     DESC_HDR_SEL0_MDEUA |</div><div class='add'>+				     DESC_HDR_MODE0_MDEU_SHA1,</div><div class='add'>+	},</div><div class='add'>+	{	.type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+		.alg.hash = {</div><div class='add'>+			.init = ahash_init,</div><div class='add'>+			.update = ahash_update,</div><div class='add'>+			.final = ahash_final,</div><div class='add'>+			.finup = ahash_finup,</div><div class='add'>+			.digest = ahash_digest,</div><div class='add'>+			.setkey = ahash_setkey,</div><div class='add'>+			.halg.digestsize = SHA224_DIGEST_SIZE,</div><div class='add'>+			.halg.base = {</div><div class='add'>+				.cra_name = "hmac(sha224)",</div><div class='add'>+				.cra_driver_name = "hmac-sha224-talitos",</div><div class='add'>+				.cra_blocksize = SHA224_BLOCK_SIZE,</div><div class='add'>+				.cra_flags = CRYPTO_ALG_TYPE_AHASH |</div><div class='add'>+					     CRYPTO_ALG_ASYNC,</div><div class='add'>+				.cra_type = &amp;crypto_ahash_type</div><div class='add'>+			}</div><div class='add'>+		},</div><div class='add'>+		.desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |</div><div class='add'>+				     DESC_HDR_SEL0_MDEUA |</div><div class='add'>+				     DESC_HDR_MODE0_MDEU_SHA224,</div><div class='add'>+	},</div><div class='add'>+	{	.type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+		.alg.hash = {</div><div class='add'>+			.init = ahash_init,</div><div class='add'>+			.update = ahash_update,</div><div class='add'>+			.final = ahash_final,</div><div class='add'>+			.finup = ahash_finup,</div><div class='add'>+			.digest = ahash_digest,</div><div class='add'>+			.setkey = ahash_setkey,</div><div class='add'>+			.halg.digestsize = SHA256_DIGEST_SIZE,</div><div class='add'>+			.halg.base = {</div><div class='add'>+				.cra_name = "hmac(sha256)",</div><div class='add'>+				.cra_driver_name = "hmac-sha256-talitos",</div><div class='add'>+				.cra_blocksize = SHA256_BLOCK_SIZE,</div><div class='add'>+				.cra_flags = CRYPTO_ALG_TYPE_AHASH |</div><div class='add'>+					     CRYPTO_ALG_ASYNC,</div><div class='add'>+				.cra_type = &amp;crypto_ahash_type</div><div class='add'>+			}</div><div class='add'>+		},</div><div class='add'>+		.desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |</div><div class='add'>+				     DESC_HDR_SEL0_MDEUA |</div><div class='add'>+				     DESC_HDR_MODE0_MDEU_SHA256,</div><div class='add'>+	},</div><div class='add'>+	{	.type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+		.alg.hash = {</div><div class='add'>+			.init = ahash_init,</div><div class='add'>+			.update = ahash_update,</div><div class='add'>+			.final = ahash_final,</div><div class='add'>+			.finup = ahash_finup,</div><div class='add'>+			.digest = ahash_digest,</div><div class='add'>+			.setkey = ahash_setkey,</div><div class='add'>+			.halg.digestsize = SHA384_DIGEST_SIZE,</div><div class='add'>+			.halg.base = {</div><div class='add'>+				.cra_name = "hmac(sha384)",</div><div class='add'>+				.cra_driver_name = "hmac-sha384-talitos",</div><div class='add'>+				.cra_blocksize = SHA384_BLOCK_SIZE,</div><div class='add'>+				.cra_flags = CRYPTO_ALG_TYPE_AHASH |</div><div class='add'>+					     CRYPTO_ALG_ASYNC,</div><div class='add'>+				.cra_type = &amp;crypto_ahash_type</div><div class='add'>+			}</div><div class='add'>+		},</div><div class='add'>+		.desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |</div><div class='add'>+				     DESC_HDR_SEL0_MDEUB |</div><div class='add'>+				     DESC_HDR_MODE0_MDEUB_SHA384,</div><div class='add'>+	},</div><div class='add'>+	{	.type = CRYPTO_ALG_TYPE_AHASH,</div><div class='add'>+		.alg.hash = {</div><div class='add'>+			.init = ahash_init,</div><div class='add'>+			.update = ahash_update,</div><div class='add'>+			.final = ahash_final,</div><div class='add'>+			.finup = ahash_finup,</div><div class='add'>+			.digest = ahash_digest,</div><div class='add'>+			.setkey = ahash_setkey,</div><div class='add'>+			.halg.digestsize = SHA512_DIGEST_SIZE,</div><div class='add'>+			.halg.base = {</div><div class='add'>+				.cra_name = "hmac(sha512)",</div><div class='add'>+				.cra_driver_name = "hmac-sha512-talitos",</div><div class='add'>+				.cra_blocksize = SHA512_BLOCK_SIZE,</div><div class='add'>+				.cra_flags = CRYPTO_ALG_TYPE_AHASH |</div><div class='add'>+					     CRYPTO_ALG_ASYNC,</div><div class='add'>+				.cra_type = &amp;crypto_ahash_type</div><div class='add'>+			}</div><div class='add'>+		},</div><div class='add'>+		.desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |</div><div class='add'>+				     DESC_HDR_SEL0_MDEUB |</div><div class='add'>+				     DESC_HDR_MODE0_MDEUB_SHA512,</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct talitos_crypto_alg {</div><div class='hunk'>@@ -2331,12 +2579,15 @@ static int talitos_remove(struct platform_device *ofdev)</div><div class='ctx'> </div><div class='ctx'> 	kfree(priv-&gt;chan);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;irq != NO_IRQ) {</div><div class='del'>-		free_irq(priv-&gt;irq, dev);</div><div class='del'>-		irq_dispose_mapping(priv-&gt;irq);</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; 2; i++)</div><div class='add'>+		if (priv-&gt;irq[i]) {</div><div class='add'>+			free_irq(priv-&gt;irq[i], dev);</div><div class='add'>+			irq_dispose_mapping(priv-&gt;irq[i]);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	tasklet_kill(&amp;priv-&gt;done_task);</div><div class='add'>+	tasklet_kill(&amp;priv-&gt;done_task[0]);</div><div class='add'>+	if (priv-&gt;irq[1])</div><div class='add'>+		tasklet_kill(&amp;priv-&gt;done_task[1]);</div><div class='ctx'> </div><div class='ctx'> 	iounmap(priv-&gt;reg);</div><div class='ctx'> </div><div class='hunk'>@@ -2373,8 +2624,14 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev,</div><div class='ctx'> 	case CRYPTO_ALG_TYPE_AHASH:</div><div class='ctx'> 		alg = &amp;t_alg-&gt;algt.alg.hash.halg.base;</div><div class='ctx'> 		alg-&gt;cra_init = talitos_cra_init_ahash;</div><div class='add'>+		if (!(priv-&gt;features &amp; TALITOS_FTR_HMAC_OK) &amp;&amp;</div><div class='add'>+		    !strncmp(alg-&gt;cra_name, "hmac", 4)) {</div><div class='add'>+			kfree(t_alg);</div><div class='add'>+			return ERR_PTR(-ENOTSUPP);</div><div class='add'>+		}</div><div class='ctx'> 		if (!(priv-&gt;features &amp; TALITOS_FTR_SHA224_HWINIT) &amp;&amp;</div><div class='del'>-		    !strcmp(alg-&gt;cra_name, "sha224")) {</div><div class='add'>+		    (!strcmp(alg-&gt;cra_name, "sha224") ||</div><div class='add'>+		     !strcmp(alg-&gt;cra_name, "hmac(sha224)"))) {</div><div class='ctx'> 			t_alg-&gt;algt.alg.hash.init = ahash_init_sha224_swinit;</div><div class='ctx'> 			t_alg-&gt;algt.desc_hdr_template =</div><div class='ctx'> 					DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |</div><div class='hunk'>@@ -2397,6 +2654,54 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev,</div><div class='ctx'> 	return t_alg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int talitos_probe_irq(struct platform_device *ofdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;ofdev-&gt;dev;</div><div class='add'>+	struct device_node *np = ofdev-&gt;dev.of_node;</div><div class='add'>+	struct talitos_private *priv = dev_get_drvdata(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	priv-&gt;irq[0] = irq_of_parse_and_map(np, 0);</div><div class='add'>+	if (!priv-&gt;irq[0]) {</div><div class='add'>+		dev_err(dev, "failed to map irq\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;irq[1] = irq_of_parse_and_map(np, 1);</div><div class='add'>+</div><div class='add'>+	/* get the primary irq line */</div><div class='add'>+	if (!priv-&gt;irq[1]) {</div><div class='add'>+		err = request_irq(priv-&gt;irq[0], talitos_interrupt_4ch, 0,</div><div class='add'>+				  dev_driver_string(dev), dev);</div><div class='add'>+		goto primary_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = request_irq(priv-&gt;irq[0], talitos_interrupt_ch0_2, 0,</div><div class='add'>+			  dev_driver_string(dev), dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto primary_out;</div><div class='add'>+</div><div class='add'>+	/* get the secondary irq line */</div><div class='add'>+	err = request_irq(priv-&gt;irq[1], talitos_interrupt_ch1_3, 0,</div><div class='add'>+			  dev_driver_string(dev), dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "failed to request secondary irq\n");</div><div class='add'>+		irq_dispose_mapping(priv-&gt;irq[1]);</div><div class='add'>+		priv-&gt;irq[1] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+primary_out:</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "failed to request primary irq\n");</div><div class='add'>+		irq_dispose_mapping(priv-&gt;irq[0]);</div><div class='add'>+		priv-&gt;irq[0] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int talitos_probe(struct platform_device *ofdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;ofdev-&gt;dev;</div><div class='hunk'>@@ -2413,28 +2718,22 @@ static int talitos_probe(struct platform_device *ofdev)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;ofdev = ofdev;</div><div class='ctx'> </div><div class='del'>-	tasklet_init(&amp;priv-&gt;done_task, talitos_done, (unsigned long)dev);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;priv-&gt;alg_list);</div><div class='del'>-</div><div class='del'>-	priv-&gt;irq = irq_of_parse_and_map(np, 0);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;irq == NO_IRQ) {</div><div class='del'>-		dev_err(dev, "failed to map irq\n");</div><div class='del'>-		err = -EINVAL;</div><div class='add'>+	err = talitos_probe_irq(ofdev);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto err_out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	/* get the irq line */</div><div class='del'>-	err = request_irq(priv-&gt;irq, talitos_interrupt, 0,</div><div class='del'>-			  dev_driver_string(dev), dev);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "failed to request irq %d\n", priv-&gt;irq);</div><div class='del'>-		irq_dispose_mapping(priv-&gt;irq);</div><div class='del'>-		priv-&gt;irq = NO_IRQ;</div><div class='del'>-		goto err_out;</div><div class='add'>+	if (!priv-&gt;irq[1]) {</div><div class='add'>+		tasklet_init(&amp;priv-&gt;done_task[0], talitos_done_4ch,</div><div class='add'>+			     (unsigned long)dev);</div><div class='add'>+	} else {</div><div class='add'>+		tasklet_init(&amp;priv-&gt;done_task[0], talitos_done_ch0_2,</div><div class='add'>+			     (unsigned long)dev);</div><div class='add'>+		tasklet_init(&amp;priv-&gt;done_task[1], talitos_done_ch1_3,</div><div class='add'>+			     (unsigned long)dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	INIT_LIST_HEAD(&amp;priv-&gt;alg_list);</div><div class='add'>+</div><div class='ctx'> 	priv-&gt;reg = of_iomap(np, 0);</div><div class='ctx'> 	if (!priv-&gt;reg) {</div><div class='ctx'> 		dev_err(dev, "failed to of_iomap\n");</div><div class='hunk'>@@ -2471,7 +2770,8 @@ static int talitos_probe(struct platform_device *ofdev)</div><div class='ctx'> </div><div class='ctx'> 	if (of_device_is_compatible(np, "fsl,sec2.1"))</div><div class='ctx'> 		priv-&gt;features |= TALITOS_FTR_HW_AUTH_CHECK |</div><div class='del'>-				  TALITOS_FTR_SHA224_HWINIT;</div><div class='add'>+				  TALITOS_FTR_SHA224_HWINIT |</div><div class='add'>+				  TALITOS_FTR_HMAC_OK;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;chan = kzalloc(sizeof(struct talitos_channel) *</div><div class='ctx'> 			     priv-&gt;num_channels, GFP_KERNEL);</div><div class='hunk'>@@ -2482,6 +2782,12 @@ static int talitos_probe(struct platform_device *ofdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; priv-&gt;num_channels; i++) {</div><div class='add'>+		priv-&gt;chan[i].reg = priv-&gt;reg + TALITOS_CH_STRIDE * (i + 1);</div><div class='add'>+		if (!priv-&gt;irq[1] || !(i &amp; 1))</div><div class='add'>+			priv-&gt;chan[i].reg += TALITOS_CH_BASE_OFFSET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_channels; i++) {</div><div class='ctx'> 		spin_lock_init(&amp;priv-&gt;chan[i].head_lock);</div><div class='ctx'> 		spin_lock_init(&amp;priv-&gt;chan[i].tail_lock);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2530,6 +2836,8 @@ static int talitos_probe(struct platform_device *ofdev)</div><div class='ctx'> 			t_alg = talitos_alg_alloc(dev, &amp;driver_algs[i]);</div><div class='ctx'> 			if (IS_ERR(t_alg)) {</div><div class='ctx'> 				err = PTR_ERR(t_alg);</div><div class='add'>+				if (err == -ENOTSUPP)</div><div class='add'>+					continue;</div><div class='ctx'> 				goto err_out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -2551,12 +2859,13 @@ static int talitos_probe(struct platform_device *ofdev)</div><div class='ctx'> 				dev_err(dev, "%s alg registration failed\n",</div><div class='ctx'> 					name);</div><div class='ctx'> 				kfree(t_alg);</div><div class='del'>-			} else {</div><div class='add'>+			} else</div><div class='ctx'> 				list_add_tail(&amp;t_alg-&gt;entry, &amp;priv-&gt;alg_list);</div><div class='del'>-				dev_info(dev, "%s\n", name);</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	if (!list_empty(&amp;priv-&gt;alg_list))</div><div class='add'>+		dev_info(dev, "%s algorithms registered in /proc/crypto\n",</div><div class='add'>+			 (char *)of_get_property(np, "compatible", NULL));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2584,17 +2893,7 @@ static struct platform_driver talitos_driver = {</div><div class='ctx'> 	.remove = talitos_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init talitos_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;talitos_driver);</div><div class='del'>-}</div><div class='del'>-module_init(talitos_init);</div><div class='del'>-</div><div class='del'>-static void __exit talitos_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;talitos_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(talitos_exit);</div><div class='add'>+module_platform_driver(talitos_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Kim Phillips &lt;kim.phillips@freescale.com&gt;");</div><div class='head'>diff --git a/drivers/crypto/talitos.h b/drivers/crypto/talitos.h<br/>index 0b746aca4587..3c173954ef29 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/crypto/talitos.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/crypto/talitos.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/crypto/talitos.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/crypto/talitos.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Freescale SEC (talitos) device register and descriptor header defines</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2006-2010 Freescale Semiconductor, Inc.</div><div class='add'>+ * Copyright (c) 2006-2011 Freescale Semiconductor, Inc.</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</div><div class='hunk'>@@ -34,28 +34,37 @@</div><div class='ctx'> </div><div class='ctx'> /* global register offset addresses */</div><div class='ctx'> #define TALITOS_MCR			0x1030  /* master control register */</div><div class='del'>-#define TALITOS_MCR_LO			0x1038</div><div class='add'>+#define   TALITOS_MCR_RCA0		(1 &lt;&lt; 15) /* remap channel 0 */</div><div class='add'>+#define   TALITOS_MCR_RCA1		(1 &lt;&lt; 14) /* remap channel 1 */</div><div class='add'>+#define   TALITOS_MCR_RCA2		(1 &lt;&lt; 13) /* remap channel 2 */</div><div class='add'>+#define   TALITOS_MCR_RCA3		(1 &lt;&lt; 12) /* remap channel 3 */</div><div class='ctx'> #define   TALITOS_MCR_SWR		0x1     /* s/w reset */</div><div class='add'>+#define TALITOS_MCR_LO			0x1034</div><div class='ctx'> #define TALITOS_IMR			0x1008  /* interrupt mask register */</div><div class='ctx'> #define   TALITOS_IMR_INIT		0x100ff /* enable channel IRQs */</div><div class='ctx'> #define   TALITOS_IMR_DONE		0x00055 /* done IRQs */</div><div class='ctx'> #define TALITOS_IMR_LO			0x100C</div><div class='ctx'> #define   TALITOS_IMR_LO_INIT		0x20000 /* allow RNGU error IRQs */</div><div class='ctx'> #define TALITOS_ISR			0x1010  /* interrupt status register */</div><div class='del'>-#define   TALITOS_ISR_CHERR		0xaa    /* channel errors mask */</div><div class='del'>-#define   TALITOS_ISR_CHDONE		0x55    /* channel done mask */</div><div class='add'>+#define   TALITOS_ISR_4CHERR		0xaa    /* 4 channel errors mask */</div><div class='add'>+#define   TALITOS_ISR_4CHDONE		0x55    /* 4 channel done mask */</div><div class='add'>+#define   TALITOS_ISR_CH_0_2_ERR	0x22    /* channels 0, 2 errors mask */</div><div class='add'>+#define   TALITOS_ISR_CH_0_2_DONE	0x11    /* channels 0, 2 done mask */</div><div class='add'>+#define   TALITOS_ISR_CH_1_3_ERR	0x88    /* channels 1, 3 errors mask */</div><div class='add'>+#define   TALITOS_ISR_CH_1_3_DONE	0x44    /* channels 1, 3 done mask */</div><div class='ctx'> #define TALITOS_ISR_LO			0x1014</div><div class='ctx'> #define TALITOS_ICR			0x1018  /* interrupt clear register */</div><div class='ctx'> #define TALITOS_ICR_LO			0x101C</div><div class='ctx'> </div><div class='ctx'> /* channel register address stride */</div><div class='add'>+#define TALITOS_CH_BASE_OFFSET		0x1000	/* default channel map base */</div><div class='ctx'> #define TALITOS_CH_STRIDE		0x100</div><div class='ctx'> </div><div class='ctx'> /* channel configuration register  */</div><div class='del'>-#define TALITOS_CCCR(ch)		(ch * TALITOS_CH_STRIDE + 0x1108)</div><div class='add'>+#define TALITOS_CCCR			0x8</div><div class='ctx'> #define   TALITOS_CCCR_CONT		0x2    /* channel continue */</div><div class='ctx'> #define   TALITOS_CCCR_RESET		0x1    /* channel reset */</div><div class='del'>-#define TALITOS_CCCR_LO(ch)		(ch * TALITOS_CH_STRIDE + 0x110c)</div><div class='add'>+#define TALITOS_CCCR_LO			0xc</div><div class='ctx'> #define   TALITOS_CCCR_LO_IWSE		0x80   /* chan. ICCR writeback enab. */</div><div class='ctx'> #define   TALITOS_CCCR_LO_EAE		0x20   /* extended address enable */</div><div class='ctx'> #define   TALITOS_CCCR_LO_CDWE		0x10   /* chan. done writeback enab. */</div><div class='hunk'>@@ -63,8 +72,8 @@</div><div class='ctx'> #define   TALITOS_CCCR_LO_CDIE		0x2    /* channel done IRQ enable */</div><div class='ctx'> </div><div class='ctx'> /* CCPSR: channel pointer status register */</div><div class='del'>-#define TALITOS_CCPSR(ch)		(ch * TALITOS_CH_STRIDE + 0x1110)</div><div class='del'>-#define TALITOS_CCPSR_LO(ch)		(ch * TALITOS_CH_STRIDE + 0x1114)</div><div class='add'>+#define TALITOS_CCPSR			0x10</div><div class='add'>+#define TALITOS_CCPSR_LO		0x14</div><div class='ctx'> #define   TALITOS_CCPSR_LO_DOF		0x8000 /* double FF write oflow error */</div><div class='ctx'> #define   TALITOS_CCPSR_LO_SOF		0x4000 /* single FF write oflow error */</div><div class='ctx'> #define   TALITOS_CCPSR_LO_MDTE		0x2000 /* master data transfer error */</div><div class='hunk'>@@ -79,24 +88,24 @@</div><div class='ctx'> #define   TALITOS_CCPSR_LO_SRL		0x0010 /* scatter return/length error */</div><div class='ctx'> </div><div class='ctx'> /* channel fetch fifo register */</div><div class='del'>-#define TALITOS_FF(ch)			(ch * TALITOS_CH_STRIDE + 0x1148)</div><div class='del'>-#define TALITOS_FF_LO(ch)		(ch * TALITOS_CH_STRIDE + 0x114c)</div><div class='add'>+#define TALITOS_FF			0x48</div><div class='add'>+#define TALITOS_FF_LO			0x4c</div><div class='ctx'> </div><div class='ctx'> /* current descriptor pointer register */</div><div class='del'>-#define TALITOS_CDPR(ch)		(ch * TALITOS_CH_STRIDE + 0x1140)</div><div class='del'>-#define TALITOS_CDPR_LO(ch)		(ch * TALITOS_CH_STRIDE + 0x1144)</div><div class='add'>+#define TALITOS_CDPR			0x40</div><div class='add'>+#define TALITOS_CDPR_LO			0x44</div><div class='ctx'> </div><div class='ctx'> /* descriptor buffer register */</div><div class='del'>-#define TALITOS_DESCBUF(ch)		(ch * TALITOS_CH_STRIDE + 0x1180)</div><div class='del'>-#define TALITOS_DESCBUF_LO(ch)		(ch * TALITOS_CH_STRIDE + 0x1184)</div><div class='add'>+#define TALITOS_DESCBUF			0x80</div><div class='add'>+#define TALITOS_DESCBUF_LO		0x84</div><div class='ctx'> </div><div class='ctx'> /* gather link table */</div><div class='del'>-#define TALITOS_GATHER(ch)		(ch * TALITOS_CH_STRIDE + 0x11c0)</div><div class='del'>-#define TALITOS_GATHER_LO(ch)		(ch * TALITOS_CH_STRIDE + 0x11c4)</div><div class='add'>+#define TALITOS_GATHER			0xc0</div><div class='add'>+#define TALITOS_GATHER_LO		0xc4</div><div class='ctx'> </div><div class='ctx'> /* scatter link table */</div><div class='del'>-#define TALITOS_SCATTER(ch)		(ch * TALITOS_CH_STRIDE + 0x11e0)</div><div class='del'>-#define TALITOS_SCATTER_LO(ch)		(ch * TALITOS_CH_STRIDE + 0x11e4)</div><div class='add'>+#define TALITOS_SCATTER			0xe0</div><div class='add'>+#define TALITOS_SCATTER_LO		0xe4</div><div class='ctx'> </div><div class='ctx'> /* execution unit interrupt status registers */</div><div class='ctx'> #define TALITOS_DEUISR			0x2030 /* DES unit */</div><div class='head'>diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig<br/>index 8f0491037080..464fa2147dfb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/devfreq/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/devfreq/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/devfreq/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/devfreq/Kconfig</a></div><div class='hunk'>@@ -65,4 +65,17 @@ config DEVFREQ_GOV_USERSPACE</div><div class='ctx'> </div><div class='ctx'> comment "DEVFREQ Drivers"</div><div class='ctx'> </div><div class='add'>+config ARM_EXYNOS4_BUS_DEVFREQ</div><div class='add'>+	bool "ARM Exynos4210/4212/4412 Memory Bus DEVFREQ Driver"</div><div class='add'>+	depends on CPU_EXYNOS4210 || CPU_EXYNOS4212 || CPU_EXYNOS4412</div><div class='add'>+	select ARCH_HAS_OPP</div><div class='add'>+	select DEVFREQ_GOV_SIMPLE_ONDEMAND</div><div class='add'>+	help</div><div class='add'>+	  This adds the DEVFREQ driver for Exynos4210 memory bus (vdd_int)</div><div class='add'>+	  and Exynos4212/4412 memory interface and bus (vdd_mif + vdd_int).</div><div class='add'>+	  It reads PPMU counters of memory controllers and adjusts</div><div class='add'>+	  the operating frequencies and voltages with OPP support.</div><div class='add'>+	  To operate with optimal voltages, ASV support is required</div><div class='add'>+	  (CONFIG_EXYNOS_ASV).</div><div class='add'>+</div><div class='ctx'> endif # PM_DEVFREQ</div><div class='head'>diff --git a/drivers/devfreq/Makefile b/drivers/devfreq/Makefile<br/>index 4564a89e970a..8c464234f7e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/devfreq/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/devfreq/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/devfreq/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/devfreq/Makefile</a></div><div class='hunk'>@@ -3,3 +3,6 @@ obj-$(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND)	+= governor_simpleondemand.o</div><div class='ctx'> obj-$(CONFIG_DEVFREQ_GOV_PERFORMANCE)	+= governor_performance.o</div><div class='ctx'> obj-$(CONFIG_DEVFREQ_GOV_POWERSAVE)	+= governor_powersave.o</div><div class='ctx'> obj-$(CONFIG_DEVFREQ_GOV_USERSPACE)	+= governor_userspace.o</div><div class='add'>+</div><div class='add'>+# DEVFREQ Drivers</div><div class='add'>+obj-$(CONFIG_ARM_EXYNOS4_BUS_DEVFREQ)	+= exynos4_bus.o</div><div class='head'>diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c<br/>index 59d24e9cb8c5..c189b82f5ece 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/devfreq/devfreq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/devfreq/devfreq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/devfreq/devfreq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/devfreq/devfreq.c</a></div><div class='hunk'>@@ -347,7 +347,7 @@ struct devfreq *devfreq_add_device(struct device *dev,</div><div class='ctx'> 		if (!IS_ERR(devfreq)) {</div><div class='ctx'> 			dev_err(dev, "%s: Unable to create devfreq for the device. It already has one.\n", __func__);</div><div class='ctx'> 			err = -EINVAL;</div><div class='del'>-			goto out;</div><div class='add'>+			goto err_out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -356,7 +356,7 @@ struct devfreq *devfreq_add_device(struct device *dev,</div><div class='ctx'> 		dev_err(dev, "%s: Unable to create devfreq for the device\n",</div><div class='ctx'> 			__func__);</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='add'>+		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;devfreq-&gt;lock);</div><div class='hunk'>@@ -399,17 +399,16 @@ struct devfreq *devfreq_add_device(struct device *dev,</div><div class='ctx'> 				   devfreq-&gt;next_polling);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;devfreq_list_lock);</div><div class='del'>-	goto out;</div><div class='add'>+out:</div><div class='add'>+	return devfreq;</div><div class='add'>+</div><div class='ctx'> err_init:</div><div class='ctx'> 	device_unregister(&amp;devfreq-&gt;dev);</div><div class='ctx'> err_dev:</div><div class='ctx'> 	mutex_unlock(&amp;devfreq-&gt;lock);</div><div class='ctx'> 	kfree(devfreq);</div><div class='del'>-out:</div><div class='del'>-	if (err)</div><div class='del'>-		return ERR_PTR(err);</div><div class='del'>-	else</div><div class='del'>-		return devfreq;</div><div class='add'>+err_out:</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/devfreq/exynos4_bus.c b/drivers/devfreq/exynos4_bus.c<br/>new file mode 100644<br/>index 000000000000..6460577d6701<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/devfreq/exynos4_bus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/devfreq/exynos4_bus.c</a></div><div class='hunk'>@@ -0,0 +1,1135 @@</div><div class='add'>+/* drivers/devfreq/exynos4210_memorybus.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com/</div><div class='add'>+ *	MyungJoo Ham &lt;myungjoo.ham@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * EXYNOS4 - Memory/Bus clock frequency scaling support in DEVFREQ framework</div><div class='add'>+ *	This version supports EXYNOS4210 only. This changes bus frequencies</div><div class='add'>+ *	and vddint voltages. Exynos4412/4212 should be able to be supported</div><div class='add'>+ *	with minor modifications.</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</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/slab.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/suspend.h&gt;</div><div class='add'>+#include &lt;linux/opp.h&gt;</div><div class='add'>+#include &lt;linux/devfreq.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='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+/* Exynos4 ASV has been in the mailing list, but not upstreamed, yet. */</div><div class='add'>+#ifdef CONFIG_EXYNOS_ASV</div><div class='add'>+extern unsigned int exynos_result_of_asv;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;mach/regs-clock.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;plat/map-s5p.h&gt;</div><div class='add'>+</div><div class='add'>+#define MAX_SAFEVOLT	1200000 /* 1.2V */</div><div class='add'>+</div><div class='add'>+enum exynos4_busf_type {</div><div class='add'>+	TYPE_BUSF_EXYNOS4210,</div><div class='add'>+	TYPE_BUSF_EXYNOS4x12,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Assume that the bus is saturated if the utilization is 40% */</div><div class='add'>+#define BUS_SATURATION_RATIO	40</div><div class='add'>+</div><div class='add'>+enum ppmu_counter {</div><div class='add'>+	PPMU_PMNCNT0 = 0,</div><div class='add'>+	PPMU_PMCCNT1,</div><div class='add'>+	PPMU_PMNCNT2,</div><div class='add'>+	PPMU_PMNCNT3,</div><div class='add'>+	PPMU_PMNCNT_MAX,</div><div class='add'>+};</div><div class='add'>+struct exynos4_ppmu {</div><div class='add'>+	void __iomem *hw_base;</div><div class='add'>+	unsigned int ccnt;</div><div class='add'>+	unsigned int event;</div><div class='add'>+	unsigned int count[PPMU_PMNCNT_MAX];</div><div class='add'>+	bool ccnt_overflow;</div><div class='add'>+	bool count_overflow[PPMU_PMNCNT_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum busclk_level_idx {</div><div class='add'>+	LV_0 = 0,</div><div class='add'>+	LV_1,</div><div class='add'>+	LV_2,</div><div class='add'>+	LV_3,</div><div class='add'>+	LV_4,</div><div class='add'>+	_LV_END</div><div class='add'>+};</div><div class='add'>+#define EX4210_LV_MAX	LV_2</div><div class='add'>+#define EX4x12_LV_MAX	LV_4</div><div class='add'>+#define EX4210_LV_NUM	(LV_2 + 1)</div><div class='add'>+#define EX4x12_LV_NUM	(LV_4 + 1)</div><div class='add'>+</div><div class='add'>+struct busfreq_data {</div><div class='add'>+	enum exynos4_busf_type type;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct devfreq *devfreq;</div><div class='add'>+	bool disabled;</div><div class='add'>+	struct regulator *vdd_int;</div><div class='add'>+	struct regulator *vdd_mif; /* Exynos4412/4212 only */</div><div class='add'>+	struct opp *curr_opp;</div><div class='add'>+	struct exynos4_ppmu dmc[2];</div><div class='add'>+</div><div class='add'>+	struct notifier_block pm_notifier;</div><div class='add'>+	struct mutex lock;</div><div class='add'>+</div><div class='add'>+	/* Dividers calculated at boot/probe-time */</div><div class='add'>+	unsigned int dmc_divtable[_LV_END]; /* DMC0 */</div><div class='add'>+	unsigned int top_divtable[_LV_END];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bus_opp_table {</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	unsigned long clk;</div><div class='add'>+	unsigned long volt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 4210 controls clock of mif and voltage of int */</div><div class='add'>+static struct bus_opp_table exynos4210_busclk_table[] = {</div><div class='add'>+	{LV_0, 400000, 1150000},</div><div class='add'>+	{LV_1, 267000, 1050000},</div><div class='add'>+	{LV_2, 133000, 1025000},</div><div class='add'>+	{0, 0, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MIF is the main control knob clock for exynox4x12 MIF/INT</div><div class='add'>+ * clock and voltage of both mif/int are controlled.</div><div class='add'>+ */</div><div class='add'>+static struct bus_opp_table exynos4x12_mifclk_table[] = {</div><div class='add'>+	{LV_0, 400000, 1100000},</div><div class='add'>+	{LV_1, 267000, 1000000},</div><div class='add'>+	{LV_2, 160000, 950000},</div><div class='add'>+	{LV_3, 133000, 950000},</div><div class='add'>+	{LV_4, 100000, 950000},</div><div class='add'>+	{0, 0, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * INT is not the control knob of 4x12. LV_x is not meant to represent</div><div class='add'>+ * the current performance. (MIF does)</div><div class='add'>+ */</div><div class='add'>+static struct bus_opp_table exynos4x12_intclk_table[] = {</div><div class='add'>+	{LV_0, 200000, 1000000},</div><div class='add'>+	{LV_1, 160000, 950000},</div><div class='add'>+	{LV_2, 133000, 925000},</div><div class='add'>+	{LV_3, 100000, 900000},</div><div class='add'>+	{0, 0, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* TODO: asv volt definitions are "__initdata"? */</div><div class='add'>+/* Some chips have different operating voltages */</div><div class='add'>+static unsigned int exynos4210_asv_volt[][EX4210_LV_NUM] = {</div><div class='add'>+	{1150000, 1050000, 1050000},</div><div class='add'>+	{1125000, 1025000, 1025000},</div><div class='add'>+	{1100000, 1000000, 1000000},</div><div class='add'>+	{1075000, 975000, 975000},</div><div class='add'>+	{1050000, 950000, 950000},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int exynos4x12_mif_step_50[][EX4x12_LV_NUM] = {</div><div class='add'>+	/* 400      267     160     133     100 */</div><div class='add'>+	{1050000, 950000, 900000, 900000, 900000}, /* ASV0 */</div><div class='add'>+	{1050000, 950000, 900000, 900000, 900000}, /* ASV1 */</div><div class='add'>+	{1050000, 950000, 900000, 900000, 900000}, /* ASV2 */</div><div class='add'>+	{1050000, 900000, 900000, 900000, 900000}, /* ASV3 */</div><div class='add'>+	{1050000, 900000, 900000, 900000, 850000}, /* ASV4 */</div><div class='add'>+	{1050000, 900000, 900000, 850000, 850000}, /* ASV5 */</div><div class='add'>+	{1050000, 900000, 850000, 850000, 850000}, /* ASV6 */</div><div class='add'>+	{1050000, 900000, 850000, 850000, 850000}, /* ASV7 */</div><div class='add'>+	{1050000, 900000, 850000, 850000, 850000}, /* ASV8 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int exynos4x12_int_volt[][EX4x12_LV_NUM] = {</div><div class='add'>+	/* 200    160      133     100 */</div><div class='add'>+	{1000000, 950000, 925000, 900000}, /* ASV0 */</div><div class='add'>+	{975000,  925000, 925000, 900000}, /* ASV1 */</div><div class='add'>+	{950000,  925000, 900000, 875000}, /* ASV2 */</div><div class='add'>+	{950000,  900000, 900000, 875000}, /* ASV3 */</div><div class='add'>+	{925000,  875000, 875000, 875000}, /* ASV4 */</div><div class='add'>+	{900000,  850000, 850000, 850000}, /* ASV5 */</div><div class='add'>+	{900000,  850000, 850000, 850000}, /* ASV6 */</div><div class='add'>+	{900000,  850000, 850000, 850000}, /* ASV7 */</div><div class='add'>+	{900000,  850000, 850000, 850000}, /* ASV8 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*** Clock Divider Data for Exynos4210 ***/</div><div class='add'>+static unsigned int exynos4210_clkdiv_dmc0[][8] = {</div><div class='add'>+	/*</div><div class='add'>+	 * Clock divider value for following</div><div class='add'>+	 * { DIVACP, DIVACP_PCLK, DIVDPHY, DIVDMC, DIVDMCD</div><div class='add'>+	 *		DIVDMCP, DIVCOPY2, DIVCORE_TIMERS }</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* DMC L0: 400MHz */</div><div class='add'>+	{ 3, 1, 1, 1, 1, 1, 3, 1 },</div><div class='add'>+	/* DMC L1: 266.7MHz */</div><div class='add'>+	{ 4, 1, 1, 2, 1, 1, 3, 1 },</div><div class='add'>+	/* DMC L2: 133MHz */</div><div class='add'>+	{ 5, 1, 1, 5, 1, 1, 3, 1 },</div><div class='add'>+};</div><div class='add'>+static unsigned int exynos4210_clkdiv_top[][5] = {</div><div class='add'>+	/*</div><div class='add'>+	 * Clock divider value for following</div><div class='add'>+	 * { DIVACLK200, DIVACLK100, DIVACLK160, DIVACLK133, DIVONENAND }</div><div class='add'>+	 */</div><div class='add'>+	/* ACLK200 L0: 200MHz */</div><div class='add'>+	{ 3, 7, 4, 5, 1 },</div><div class='add'>+	/* ACLK200 L1: 160MHz */</div><div class='add'>+	{ 4, 7, 5, 6, 1 },</div><div class='add'>+	/* ACLK200 L2: 133MHz */</div><div class='add'>+	{ 5, 7, 7, 7, 1 },</div><div class='add'>+};</div><div class='add'>+static unsigned int exynos4210_clkdiv_lr_bus[][2] = {</div><div class='add'>+	/*</div><div class='add'>+	 * Clock divider value for following</div><div class='add'>+	 * { DIVGDL/R, DIVGPL/R }</div><div class='add'>+	 */</div><div class='add'>+	/* ACLK_GDL/R L1: 200MHz */</div><div class='add'>+	{ 3, 1 },</div><div class='add'>+	/* ACLK_GDL/R L2: 160MHz */</div><div class='add'>+	{ 4, 1 },</div><div class='add'>+	/* ACLK_GDL/R L3: 133MHz */</div><div class='add'>+	{ 5, 1 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*** Clock Divider Data for Exynos4212/4412 ***/</div><div class='add'>+static unsigned int exynos4x12_clkdiv_dmc0[][6] = {</div><div class='add'>+	/*</div><div class='add'>+	 * Clock divider value for following</div><div class='add'>+	 * { DIVACP, DIVACP_PCLK, DIVDPHY, DIVDMC, DIVDMCD</div><div class='add'>+	 *              DIVDMCP}</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* DMC L0: 400MHz */</div><div class='add'>+	{3, 1, 1, 1, 1, 1},</div><div class='add'>+	/* DMC L1: 266.7MHz */</div><div class='add'>+	{4, 1, 1, 2, 1, 1},</div><div class='add'>+	/* DMC L2: 160MHz */</div><div class='add'>+	{5, 1, 1, 4, 1, 1},</div><div class='add'>+	/* DMC L3: 133MHz */</div><div class='add'>+	{5, 1, 1, 5, 1, 1},</div><div class='add'>+	/* DMC L4: 100MHz */</div><div class='add'>+	{7, 1, 1, 7, 1, 1},</div><div class='add'>+};</div><div class='add'>+static unsigned int exynos4x12_clkdiv_dmc1[][6] = {</div><div class='add'>+	/*</div><div class='add'>+	 * Clock divider value for following</div><div class='add'>+	 * { G2DACP, DIVC2C, DIVC2C_ACLK }</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* DMC L0: 400MHz */</div><div class='add'>+	{3, 1, 1},</div><div class='add'>+	/* DMC L1: 266.7MHz */</div><div class='add'>+	{4, 2, 1},</div><div class='add'>+	/* DMC L2: 160MHz */</div><div class='add'>+	{5, 4, 1},</div><div class='add'>+	/* DMC L3: 133MHz */</div><div class='add'>+	{5, 5, 1},</div><div class='add'>+	/* DMC L4: 100MHz */</div><div class='add'>+	{7, 7, 1},</div><div class='add'>+};</div><div class='add'>+static unsigned int exynos4x12_clkdiv_top[][5] = {</div><div class='add'>+	/*</div><div class='add'>+	 * Clock divider value for following</div><div class='add'>+	 * { DIVACLK266_GPS, DIVACLK100, DIVACLK160,</div><div class='add'>+		DIVACLK133, DIVONENAND }</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* ACLK_GDL/R L0: 200MHz */</div><div class='add'>+	{2, 7, 4, 5, 1},</div><div class='add'>+	/* ACLK_GDL/R L1: 200MHz */</div><div class='add'>+	{2, 7, 4, 5, 1},</div><div class='add'>+	/* ACLK_GDL/R L2: 160MHz */</div><div class='add'>+	{4, 7, 5, 7, 1},</div><div class='add'>+	/* ACLK_GDL/R L3: 133MHz */</div><div class='add'>+	{4, 7, 5, 7, 1},</div><div class='add'>+	/* ACLK_GDL/R L4: 100MHz */</div><div class='add'>+	{7, 7, 7, 7, 1},</div><div class='add'>+};</div><div class='add'>+static unsigned int exynos4x12_clkdiv_lr_bus[][2] = {</div><div class='add'>+	/*</div><div class='add'>+	 * Clock divider value for following</div><div class='add'>+	 * { DIVGDL/R, DIVGPL/R }</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* ACLK_GDL/R L0: 200MHz */</div><div class='add'>+	{3, 1},</div><div class='add'>+	/* ACLK_GDL/R L1: 200MHz */</div><div class='add'>+	{3, 1},</div><div class='add'>+	/* ACLK_GDL/R L2: 160MHz */</div><div class='add'>+	{4, 1},</div><div class='add'>+	/* ACLK_GDL/R L3: 133MHz */</div><div class='add'>+	{5, 1},</div><div class='add'>+	/* ACLK_GDL/R L4: 100MHz */</div><div class='add'>+	{7, 1},</div><div class='add'>+};</div><div class='add'>+static unsigned int exynos4x12_clkdiv_sclkip[][3] = {</div><div class='add'>+	/*</div><div class='add'>+	 * Clock divider value for following</div><div class='add'>+	 * { DIVMFC, DIVJPEG, DIVFIMC0~3}</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* SCLK_MFC: 200MHz */</div><div class='add'>+	{3, 3, 4},</div><div class='add'>+	/* SCLK_MFC: 200MHz */</div><div class='add'>+	{3, 3, 4},</div><div class='add'>+	/* SCLK_MFC: 160MHz */</div><div class='add'>+	{4, 4, 5},</div><div class='add'>+	/* SCLK_MFC: 133MHz */</div><div class='add'>+	{5, 5, 5},</div><div class='add'>+	/* SCLK_MFC: 100MHz */</div><div class='add'>+	{7, 7, 7},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int exynos4210_set_busclk(struct busfreq_data *data, struct opp *opp)</div><div class='add'>+{</div><div class='add'>+	unsigned int index;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+</div><div class='add'>+	for (index = LV_0; index &lt; EX4210_LV_NUM; index++)</div><div class='add'>+		if (opp_get_freq(opp) == exynos4210_busclk_table[index].clk)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	if (index == EX4210_LV_NUM)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Change Divider - DMC0 */</div><div class='add'>+	tmp = data-&gt;dmc_divtable[index];</div><div class='add'>+</div><div class='add'>+	__raw_writel(tmp, S5P_CLKDIV_DMC0);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		tmp = __raw_readl(S5P_CLKDIV_STAT_DMC0);</div><div class='add'>+	} while (tmp &amp; 0x11111111);</div><div class='add'>+</div><div class='add'>+	/* Change Divider - TOP */</div><div class='add'>+	tmp = data-&gt;top_divtable[index];</div><div class='add'>+</div><div class='add'>+	__raw_writel(tmp, S5P_CLKDIV_TOP);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		tmp = __raw_readl(S5P_CLKDIV_STAT_TOP);</div><div class='add'>+	} while (tmp &amp; 0x11111);</div><div class='add'>+</div><div class='add'>+	/* Change Divider - LEFTBUS */</div><div class='add'>+	tmp = __raw_readl(S5P_CLKDIV_LEFTBUS);</div><div class='add'>+</div><div class='add'>+	tmp &amp;= ~(S5P_CLKDIV_BUS_GDLR_MASK | S5P_CLKDIV_BUS_GPLR_MASK);</div><div class='add'>+</div><div class='add'>+	tmp |= ((exynos4210_clkdiv_lr_bus[index][0] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_BUS_GDLR_SHIFT) |</div><div class='add'>+		(exynos4210_clkdiv_lr_bus[index][1] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_BUS_GPLR_SHIFT));</div><div class='add'>+</div><div class='add'>+	__raw_writel(tmp, S5P_CLKDIV_LEFTBUS);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		tmp = __raw_readl(S5P_CLKDIV_STAT_LEFTBUS);</div><div class='add'>+	} while (tmp &amp; 0x11);</div><div class='add'>+</div><div class='add'>+	/* Change Divider - RIGHTBUS */</div><div class='add'>+	tmp = __raw_readl(S5P_CLKDIV_RIGHTBUS);</div><div class='add'>+</div><div class='add'>+	tmp &amp;= ~(S5P_CLKDIV_BUS_GDLR_MASK | S5P_CLKDIV_BUS_GPLR_MASK);</div><div class='add'>+</div><div class='add'>+	tmp |= ((exynos4210_clkdiv_lr_bus[index][0] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_BUS_GDLR_SHIFT) |</div><div class='add'>+		(exynos4210_clkdiv_lr_bus[index][1] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_BUS_GPLR_SHIFT));</div><div class='add'>+</div><div class='add'>+	__raw_writel(tmp, S5P_CLKDIV_RIGHTBUS);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		tmp = __raw_readl(S5P_CLKDIV_STAT_RIGHTBUS);</div><div class='add'>+	} while (tmp &amp; 0x11);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int exynos4x12_set_busclk(struct busfreq_data *data, struct opp *opp)</div><div class='add'>+{</div><div class='add'>+	unsigned int index;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+</div><div class='add'>+	for (index = LV_0; index &lt; EX4x12_LV_NUM; index++)</div><div class='add'>+		if (opp_get_freq(opp) == exynos4x12_mifclk_table[index].clk)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	if (index == EX4x12_LV_NUM)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Change Divider - DMC0 */</div><div class='add'>+	tmp = data-&gt;dmc_divtable[index];</div><div class='add'>+</div><div class='add'>+	__raw_writel(tmp, S5P_CLKDIV_DMC0);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		tmp = __raw_readl(S5P_CLKDIV_STAT_DMC0);</div><div class='add'>+	} while (tmp &amp; 0x11111111);</div><div class='add'>+</div><div class='add'>+	/* Change Divider - DMC1 */</div><div class='add'>+	tmp = __raw_readl(S5P_CLKDIV_DMC1);</div><div class='add'>+</div><div class='add'>+	tmp &amp;= ~(S5P_CLKDIV_DMC1_G2D_ACP_MASK |</div><div class='add'>+		S5P_CLKDIV_DMC1_C2C_MASK |</div><div class='add'>+		S5P_CLKDIV_DMC1_C2CACLK_MASK);</div><div class='add'>+</div><div class='add'>+	tmp |= ((exynos4x12_clkdiv_dmc1[index][0] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_DMC1_G2D_ACP_SHIFT) |</div><div class='add'>+		(exynos4x12_clkdiv_dmc1[index][1] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_DMC1_C2C_SHIFT) |</div><div class='add'>+		(exynos4x12_clkdiv_dmc1[index][2] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_DMC1_C2CACLK_SHIFT));</div><div class='add'>+</div><div class='add'>+	__raw_writel(tmp, S5P_CLKDIV_DMC1);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		tmp = __raw_readl(S5P_CLKDIV_STAT_DMC1);</div><div class='add'>+	} while (tmp &amp; 0x111111);</div><div class='add'>+</div><div class='add'>+	/* Change Divider - TOP */</div><div class='add'>+	tmp = __raw_readl(S5P_CLKDIV_TOP);</div><div class='add'>+</div><div class='add'>+	tmp &amp;= ~(S5P_CLKDIV_TOP_ACLK266_GPS_MASK |</div><div class='add'>+		S5P_CLKDIV_TOP_ACLK100_MASK |</div><div class='add'>+		S5P_CLKDIV_TOP_ACLK160_MASK |</div><div class='add'>+		S5P_CLKDIV_TOP_ACLK133_MASK |</div><div class='add'>+		S5P_CLKDIV_TOP_ONENAND_MASK);</div><div class='add'>+</div><div class='add'>+	tmp |= ((exynos4x12_clkdiv_top[index][0] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_TOP_ACLK266_GPS_SHIFT) |</div><div class='add'>+		(exynos4x12_clkdiv_top[index][1] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_TOP_ACLK100_SHIFT) |</div><div class='add'>+		(exynos4x12_clkdiv_top[index][2] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_TOP_ACLK160_SHIFT) |</div><div class='add'>+		(exynos4x12_clkdiv_top[index][3] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_TOP_ACLK133_SHIFT) |</div><div class='add'>+		(exynos4x12_clkdiv_top[index][4] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_TOP_ONENAND_SHIFT));</div><div class='add'>+</div><div class='add'>+	__raw_writel(tmp, S5P_CLKDIV_TOP);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		tmp = __raw_readl(S5P_CLKDIV_STAT_TOP);</div><div class='add'>+	} while (tmp &amp; 0x11111);</div><div class='add'>+</div><div class='add'>+	/* Change Divider - LEFTBUS */</div><div class='add'>+	tmp = __raw_readl(S5P_CLKDIV_LEFTBUS);</div><div class='add'>+</div><div class='add'>+	tmp &amp;= ~(S5P_CLKDIV_BUS_GDLR_MASK | S5P_CLKDIV_BUS_GPLR_MASK);</div><div class='add'>+</div><div class='add'>+	tmp |= ((exynos4x12_clkdiv_lr_bus[index][0] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_BUS_GDLR_SHIFT) |</div><div class='add'>+		(exynos4x12_clkdiv_lr_bus[index][1] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_BUS_GPLR_SHIFT));</div><div class='add'>+</div><div class='add'>+	__raw_writel(tmp, S5P_CLKDIV_LEFTBUS);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		tmp = __raw_readl(S5P_CLKDIV_STAT_LEFTBUS);</div><div class='add'>+	} while (tmp &amp; 0x11);</div><div class='add'>+</div><div class='add'>+	/* Change Divider - RIGHTBUS */</div><div class='add'>+	tmp = __raw_readl(S5P_CLKDIV_RIGHTBUS);</div><div class='add'>+</div><div class='add'>+	tmp &amp;= ~(S5P_CLKDIV_BUS_GDLR_MASK | S5P_CLKDIV_BUS_GPLR_MASK);</div><div class='add'>+</div><div class='add'>+	tmp |= ((exynos4x12_clkdiv_lr_bus[index][0] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_BUS_GDLR_SHIFT) |</div><div class='add'>+		(exynos4x12_clkdiv_lr_bus[index][1] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_BUS_GPLR_SHIFT));</div><div class='add'>+</div><div class='add'>+	__raw_writel(tmp, S5P_CLKDIV_RIGHTBUS);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		tmp = __raw_readl(S5P_CLKDIV_STAT_RIGHTBUS);</div><div class='add'>+	} while (tmp &amp; 0x11);</div><div class='add'>+</div><div class='add'>+	/* Change Divider - MFC */</div><div class='add'>+	tmp = __raw_readl(S5P_CLKDIV_MFC);</div><div class='add'>+</div><div class='add'>+	tmp &amp;= ~(S5P_CLKDIV_MFC_MASK);</div><div class='add'>+</div><div class='add'>+	tmp |= ((exynos4x12_clkdiv_sclkip[index][0] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_MFC_SHIFT));</div><div class='add'>+</div><div class='add'>+	__raw_writel(tmp, S5P_CLKDIV_MFC);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		tmp = __raw_readl(S5P_CLKDIV_STAT_MFC);</div><div class='add'>+	} while (tmp &amp; 0x1);</div><div class='add'>+</div><div class='add'>+	/* Change Divider - JPEG */</div><div class='add'>+	tmp = __raw_readl(S5P_CLKDIV_CAM1);</div><div class='add'>+</div><div class='add'>+	tmp &amp;= ~(S5P_CLKDIV_CAM1_JPEG_MASK);</div><div class='add'>+</div><div class='add'>+	tmp |= ((exynos4x12_clkdiv_sclkip[index][1] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_CAM1_JPEG_SHIFT));</div><div class='add'>+</div><div class='add'>+	__raw_writel(tmp, S5P_CLKDIV_CAM1);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		tmp = __raw_readl(S5P_CLKDIV_STAT_CAM1);</div><div class='add'>+	} while (tmp &amp; 0x1);</div><div class='add'>+</div><div class='add'>+	/* Change Divider - FIMC0~3 */</div><div class='add'>+	tmp = __raw_readl(S5P_CLKDIV_CAM);</div><div class='add'>+</div><div class='add'>+	tmp &amp;= ~(S5P_CLKDIV_CAM_FIMC0_MASK | S5P_CLKDIV_CAM_FIMC1_MASK |</div><div class='add'>+		S5P_CLKDIV_CAM_FIMC2_MASK | S5P_CLKDIV_CAM_FIMC3_MASK);</div><div class='add'>+</div><div class='add'>+	tmp |= ((exynos4x12_clkdiv_sclkip[index][2] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_CAM_FIMC0_SHIFT) |</div><div class='add'>+		(exynos4x12_clkdiv_sclkip[index][2] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_CAM_FIMC1_SHIFT) |</div><div class='add'>+		(exynos4x12_clkdiv_sclkip[index][2] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_CAM_FIMC2_SHIFT) |</div><div class='add'>+		(exynos4x12_clkdiv_sclkip[index][2] &lt;&lt;</div><div class='add'>+				S5P_CLKDIV_CAM_FIMC3_SHIFT));</div><div class='add'>+</div><div class='add'>+	__raw_writel(tmp, S5P_CLKDIV_CAM);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		tmp = __raw_readl(S5P_CLKDIV_STAT_CAM1);</div><div class='add'>+	} while (tmp &amp; 0x1111);</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 void busfreq_mon_reset(struct busfreq_data *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		void __iomem *ppmu_base = data-&gt;dmc[i].hw_base;</div><div class='add'>+</div><div class='add'>+		/* Reset PPMU */</div><div class='add'>+		__raw_writel(0x8000000f, ppmu_base + 0xf010);</div><div class='add'>+		__raw_writel(0x8000000f, ppmu_base + 0xf050);</div><div class='add'>+		__raw_writel(0x6, ppmu_base + 0xf000);</div><div class='add'>+		__raw_writel(0x0, ppmu_base + 0xf100);</div><div class='add'>+</div><div class='add'>+		/* Set PPMU Event */</div><div class='add'>+		data-&gt;dmc[i].event = 0x6;</div><div class='add'>+		__raw_writel(((data-&gt;dmc[i].event &lt;&lt; 12) | 0x1),</div><div class='add'>+			     ppmu_base + 0xfc);</div><div class='add'>+</div><div class='add'>+		/* Start PPMU */</div><div class='add'>+		__raw_writel(0x1, ppmu_base + 0xf000);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void exynos4_read_ppmu(struct busfreq_data *data)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		void __iomem *ppmu_base = data-&gt;dmc[i].hw_base;</div><div class='add'>+		u32 overflow;</div><div class='add'>+</div><div class='add'>+		/* Stop PPMU */</div><div class='add'>+		__raw_writel(0x0, ppmu_base + 0xf000);</div><div class='add'>+</div><div class='add'>+		/* Update local data from PPMU */</div><div class='add'>+		overflow = __raw_readl(ppmu_base + 0xf050);</div><div class='add'>+</div><div class='add'>+		data-&gt;dmc[i].ccnt = __raw_readl(ppmu_base + 0xf100);</div><div class='add'>+		data-&gt;dmc[i].ccnt_overflow = overflow &amp; (1 &lt;&lt; 31);</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; PPMU_PMNCNT_MAX; j++) {</div><div class='add'>+			data-&gt;dmc[i].count[j] = __raw_readl(</div><div class='add'>+					ppmu_base + (0xf110 + (0x10 * j)));</div><div class='add'>+			data-&gt;dmc[i].count_overflow[j] = overflow &amp; (1 &lt;&lt; j);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	busfreq_mon_reset(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int exynos4x12_get_intspec(unsigned long mifclk)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	while (exynos4x12_intclk_table[i].clk) {</div><div class='add'>+		if (exynos4x12_intclk_table[i].clk &lt;= mifclk)</div><div class='add'>+			return i;</div><div class='add'>+		i++;</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 exynos4_bus_setvolt(struct busfreq_data *data, struct opp *opp,</div><div class='add'>+			       struct opp *oldopp)</div><div class='add'>+{</div><div class='add'>+	int err = 0, tmp;</div><div class='add'>+	unsigned long volt = opp_get_voltage(opp);</div><div class='add'>+</div><div class='add'>+	switch (data-&gt;type) {</div><div class='add'>+	case TYPE_BUSF_EXYNOS4210:</div><div class='add'>+		/* OPP represents DMC clock + INT voltage */</div><div class='add'>+		err = regulator_set_voltage(data-&gt;vdd_int, volt,</div><div class='add'>+					    MAX_SAFEVOLT);</div><div class='add'>+		break;</div><div class='add'>+	case TYPE_BUSF_EXYNOS4x12:</div><div class='add'>+		/* OPP represents MIF clock + MIF voltage */</div><div class='add'>+		err = regulator_set_voltage(data-&gt;vdd_mif, volt,</div><div class='add'>+					    MAX_SAFEVOLT);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		tmp = exynos4x12_get_intspec(opp_get_freq(opp));</div><div class='add'>+		if (tmp &lt; 0) {</div><div class='add'>+			err = tmp;</div><div class='add'>+			regulator_set_voltage(data-&gt;vdd_mif,</div><div class='add'>+					      opp_get_voltage(oldopp),</div><div class='add'>+					      MAX_SAFEVOLT);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		err = regulator_set_voltage(data-&gt;vdd_int,</div><div class='add'>+					    exynos4x12_intclk_table[tmp].volt,</div><div class='add'>+					    MAX_SAFEVOLT);</div><div class='add'>+		/*  Try to recover */</div><div class='add'>+		if (err)</div><div class='add'>+			regulator_set_voltage(data-&gt;vdd_mif,</div><div class='add'>+					      opp_get_voltage(oldopp),</div><div class='add'>+					      MAX_SAFEVOLT);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int exynos4_bus_target(struct device *dev, unsigned long *_freq)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	struct platform_device *pdev = container_of(dev, struct platform_device,</div><div class='add'>+						    dev);</div><div class='add'>+	struct busfreq_data *data = platform_get_drvdata(pdev);</div><div class='add'>+	struct opp *opp = devfreq_recommended_opp(dev, _freq);</div><div class='add'>+	unsigned long old_freq = opp_get_freq(data-&gt;curr_opp);</div><div class='add'>+	unsigned long freq = opp_get_freq(opp);</div><div class='add'>+</div><div class='add'>+	if (old_freq == freq)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "targetting %lukHz %luuV\n", freq, opp_get_voltage(opp));</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (data-&gt;disabled)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (old_freq &lt; freq)</div><div class='add'>+		err = exynos4_bus_setvolt(data, opp, data-&gt;curr_opp);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (old_freq != freq) {</div><div class='add'>+		switch (data-&gt;type) {</div><div class='add'>+		case TYPE_BUSF_EXYNOS4210:</div><div class='add'>+			err = exynos4210_set_busclk(data, opp);</div><div class='add'>+			break;</div><div class='add'>+		case TYPE_BUSF_EXYNOS4x12:</div><div class='add'>+			err = exynos4x12_set_busclk(data, opp);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (old_freq &gt; freq)</div><div class='add'>+		err = exynos4_bus_setvolt(data, opp, data-&gt;curr_opp);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	data-&gt;curr_opp = opp;</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;data-&gt;lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int exynos4_get_busier_dmc(struct busfreq_data *data)</div><div class='add'>+{</div><div class='add'>+	u64 p0 = data-&gt;dmc[0].count[0];</div><div class='add'>+	u64 p1 = data-&gt;dmc[1].count[0];</div><div class='add'>+</div><div class='add'>+	p0 *= data-&gt;dmc[1].ccnt;</div><div class='add'>+	p1 *= data-&gt;dmc[0].ccnt;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;dmc[1].ccnt == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (p0 &gt; p1)</div><div class='add'>+		return 0;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int exynos4_bus_get_dev_status(struct device *dev,</div><div class='add'>+				      struct devfreq_dev_status *stat)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = container_of(dev, struct platform_device,</div><div class='add'>+						    dev);</div><div class='add'>+	struct busfreq_data *data = platform_get_drvdata(pdev);</div><div class='add'>+	int busier_dmc;</div><div class='add'>+	int cycles_x2 = 2; /* 2 x cycles */</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+	u32 timing;</div><div class='add'>+	u32 memctrl;</div><div class='add'>+</div><div class='add'>+	exynos4_read_ppmu(data);</div><div class='add'>+	busier_dmc = exynos4_get_busier_dmc(data);</div><div class='add'>+	stat-&gt;current_frequency = opp_get_freq(data-&gt;curr_opp);</div><div class='add'>+</div><div class='add'>+	if (busier_dmc)</div><div class='add'>+		addr = S5P_VA_DMC1;</div><div class='add'>+	else</div><div class='add'>+		addr = S5P_VA_DMC0;</div><div class='add'>+</div><div class='add'>+	memctrl = __raw_readl(addr + 0x04); /* one of DDR2/3/LPDDR2 */</div><div class='add'>+	timing = __raw_readl(addr + 0x38); /* CL or WL/RL values */</div><div class='add'>+</div><div class='add'>+	switch ((memctrl &gt;&gt; 8) &amp; 0xf) {</div><div class='add'>+	case 0x4: /* DDR2 */</div><div class='add'>+		cycles_x2 = ((timing &gt;&gt; 16) &amp; 0xf) * 2;</div><div class='add'>+		break;</div><div class='add'>+	case 0x5: /* LPDDR2 */</div><div class='add'>+	case 0x6: /* DDR3 */</div><div class='add'>+		cycles_x2 = ((timing &gt;&gt; 8) &amp; 0xf) + ((timing &gt;&gt; 0) &amp; 0xf);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_err("%s: Unknown Memory Type(%d).\n", __func__,</div><div class='add'>+		       (memctrl &gt;&gt; 8) &amp; 0xf);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Number of cycles spent on memory access */</div><div class='add'>+	stat-&gt;busy_time = data-&gt;dmc[busier_dmc].count[0] / 2 * (cycles_x2 + 2);</div><div class='add'>+	stat-&gt;busy_time *= 100 / BUS_SATURATION_RATIO;</div><div class='add'>+	stat-&gt;total_time = data-&gt;dmc[busier_dmc].ccnt;</div><div class='add'>+</div><div class='add'>+	/* If the counters have overflown, retry */</div><div class='add'>+	if (data-&gt;dmc[busier_dmc].ccnt_overflow ||</div><div class='add'>+	    data-&gt;dmc[busier_dmc].count_overflow[0])</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 void exynos4_bus_exit(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = container_of(dev, struct platform_device,</div><div class='add'>+						    dev);</div><div class='add'>+	struct busfreq_data *data = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	devfreq_unregister_opp_notifier(dev, data-&gt;devfreq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devfreq_dev_profile exynos4_devfreq_profile = {</div><div class='add'>+	.initial_freq	= 400000,</div><div class='add'>+	.polling_ms	= 50,</div><div class='add'>+	.target		= exynos4_bus_target,</div><div class='add'>+	.get_dev_status	= exynos4_bus_get_dev_status,</div><div class='add'>+	.exit		= exynos4_bus_exit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int exynos4210_init_tables(struct busfreq_data *data)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int mgrp;</div><div class='add'>+	int i, err = 0;</div><div class='add'>+</div><div class='add'>+	tmp = __raw_readl(S5P_CLKDIV_DMC0);</div><div class='add'>+	for (i = LV_0; i &lt; EX4210_LV_NUM; i++) {</div><div class='add'>+		tmp &amp;= ~(S5P_CLKDIV_DMC0_ACP_MASK |</div><div class='add'>+			S5P_CLKDIV_DMC0_ACPPCLK_MASK |</div><div class='add'>+			S5P_CLKDIV_DMC0_DPHY_MASK |</div><div class='add'>+			S5P_CLKDIV_DMC0_DMC_MASK |</div><div class='add'>+			S5P_CLKDIV_DMC0_DMCD_MASK |</div><div class='add'>+			S5P_CLKDIV_DMC0_DMCP_MASK |</div><div class='add'>+			S5P_CLKDIV_DMC0_COPY2_MASK |</div><div class='add'>+			S5P_CLKDIV_DMC0_CORETI_MASK);</div><div class='add'>+</div><div class='add'>+		tmp |= ((exynos4210_clkdiv_dmc0[i][0] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_DMC0_ACP_SHIFT) |</div><div class='add'>+			(exynos4210_clkdiv_dmc0[i][1] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_DMC0_ACPPCLK_SHIFT) |</div><div class='add'>+			(exynos4210_clkdiv_dmc0[i][2] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_DMC0_DPHY_SHIFT) |</div><div class='add'>+			(exynos4210_clkdiv_dmc0[i][3] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_DMC0_DMC_SHIFT) |</div><div class='add'>+			(exynos4210_clkdiv_dmc0[i][4] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_DMC0_DMCD_SHIFT) |</div><div class='add'>+			(exynos4210_clkdiv_dmc0[i][5] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_DMC0_DMCP_SHIFT) |</div><div class='add'>+			(exynos4210_clkdiv_dmc0[i][6] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_DMC0_COPY2_SHIFT) |</div><div class='add'>+			(exynos4210_clkdiv_dmc0[i][7] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_DMC0_CORETI_SHIFT));</div><div class='add'>+</div><div class='add'>+		data-&gt;dmc_divtable[i] = tmp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmp = __raw_readl(S5P_CLKDIV_TOP);</div><div class='add'>+	for (i = LV_0; i &lt;  EX4210_LV_NUM; i++) {</div><div class='add'>+		tmp &amp;= ~(S5P_CLKDIV_TOP_ACLK200_MASK |</div><div class='add'>+			S5P_CLKDIV_TOP_ACLK100_MASK |</div><div class='add'>+			S5P_CLKDIV_TOP_ACLK160_MASK |</div><div class='add'>+			S5P_CLKDIV_TOP_ACLK133_MASK |</div><div class='add'>+			S5P_CLKDIV_TOP_ONENAND_MASK);</div><div class='add'>+</div><div class='add'>+		tmp |= ((exynos4210_clkdiv_top[i][0] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_TOP_ACLK200_SHIFT) |</div><div class='add'>+			(exynos4210_clkdiv_top[i][1] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_TOP_ACLK100_SHIFT) |</div><div class='add'>+			(exynos4210_clkdiv_top[i][2] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_TOP_ACLK160_SHIFT) |</div><div class='add'>+			(exynos4210_clkdiv_top[i][3] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_TOP_ACLK133_SHIFT) |</div><div class='add'>+			(exynos4210_clkdiv_top[i][4] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_TOP_ONENAND_SHIFT));</div><div class='add'>+</div><div class='add'>+		data-&gt;top_divtable[i] = tmp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_EXYNOS_ASV</div><div class='add'>+	tmp = exynos4_result_of_asv;</div><div class='add'>+#else</div><div class='add'>+	tmp = 0; /* Max voltages for the reliability of the unknown */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	pr_debug("ASV Group of Exynos4 is %d\n", tmp);</div><div class='add'>+	/* Use merged grouping for voltage */</div><div class='add'>+	switch (tmp) {</div><div class='add'>+	case 0:</div><div class='add'>+		mgrp = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+	case 2:</div><div class='add'>+		mgrp = 1;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+	case 4:</div><div class='add'>+		mgrp = 2;</div><div class='add'>+		break;</div><div class='add'>+	case 5:</div><div class='add'>+	case 6:</div><div class='add'>+		mgrp = 3;</div><div class='add'>+		break;</div><div class='add'>+	case 7:</div><div class='add'>+		mgrp = 4;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_warn("Unknown ASV Group. Use max voltage.\n");</div><div class='add'>+		mgrp = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = LV_0; i &lt; EX4210_LV_NUM; i++)</div><div class='add'>+		exynos4210_busclk_table[i].volt = exynos4210_asv_volt[mgrp][i];</div><div class='add'>+</div><div class='add'>+	for (i = LV_0; i &lt; EX4210_LV_NUM; i++) {</div><div class='add'>+		err = opp_add(data-&gt;dev, exynos4210_busclk_table[i].clk,</div><div class='add'>+			      exynos4210_busclk_table[i].volt);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(data-&gt;dev, "Cannot add opp entries.\n");</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int exynos4x12_init_tables(struct busfreq_data *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Enable pause function for DREX2 DVFS */</div><div class='add'>+	tmp = __raw_readl(S5P_DMC_PAUSE_CTRL);</div><div class='add'>+	tmp |= DMC_PAUSE_ENABLE;</div><div class='add'>+	__raw_writel(tmp, S5P_DMC_PAUSE_CTRL);</div><div class='add'>+</div><div class='add'>+	tmp = __raw_readl(S5P_CLKDIV_DMC0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;  EX4x12_LV_NUM; i++) {</div><div class='add'>+		tmp &amp;= ~(S5P_CLKDIV_DMC0_ACP_MASK |</div><div class='add'>+			S5P_CLKDIV_DMC0_ACPPCLK_MASK |</div><div class='add'>+			S5P_CLKDIV_DMC0_DPHY_MASK |</div><div class='add'>+			S5P_CLKDIV_DMC0_DMC_MASK |</div><div class='add'>+			S5P_CLKDIV_DMC0_DMCD_MASK |</div><div class='add'>+			S5P_CLKDIV_DMC0_DMCP_MASK);</div><div class='add'>+</div><div class='add'>+		tmp |= ((exynos4x12_clkdiv_dmc0[i][0] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_DMC0_ACP_SHIFT) |</div><div class='add'>+			(exynos4x12_clkdiv_dmc0[i][1] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_DMC0_ACPPCLK_SHIFT) |</div><div class='add'>+			(exynos4x12_clkdiv_dmc0[i][2] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_DMC0_DPHY_SHIFT) |</div><div class='add'>+			(exynos4x12_clkdiv_dmc0[i][3] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_DMC0_DMC_SHIFT) |</div><div class='add'>+			(exynos4x12_clkdiv_dmc0[i][4] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_DMC0_DMCD_SHIFT) |</div><div class='add'>+			(exynos4x12_clkdiv_dmc0[i][5] &lt;&lt;</div><div class='add'>+					S5P_CLKDIV_DMC0_DMCP_SHIFT));</div><div class='add'>+</div><div class='add'>+		data-&gt;dmc_divtable[i] = tmp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_EXYNOS_ASV</div><div class='add'>+	tmp = exynos4_result_of_asv;</div><div class='add'>+#else</div><div class='add'>+	tmp = 0; /* Max voltages for the reliability of the unknown */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (tmp &gt; 8)</div><div class='add'>+		tmp = 0;</div><div class='add'>+	pr_debug("ASV Group of Exynos4x12 is %d\n", tmp);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; EX4x12_LV_NUM; i++) {</div><div class='add'>+		exynos4x12_mifclk_table[i].volt =</div><div class='add'>+			exynos4x12_mif_step_50[tmp][i];</div><div class='add'>+		exynos4x12_intclk_table[i].volt =</div><div class='add'>+			exynos4x12_int_volt[tmp][i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; EX4x12_LV_NUM; i++) {</div><div class='add'>+		ret = opp_add(data-&gt;dev, exynos4x12_mifclk_table[i].clk,</div><div class='add'>+			      exynos4x12_mifclk_table[i].volt);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(data-&gt;dev, "Fail to add opp entries.\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int exynos4_busfreq_pm_notifier_event(struct notifier_block *this,</div><div class='add'>+		unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct busfreq_data *data = container_of(this, struct busfreq_data,</div><div class='add'>+						 pm_notifier);</div><div class='add'>+	struct opp *opp;</div><div class='add'>+	unsigned long maxfreq = ULONG_MAX;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case PM_SUSPEND_PREPARE:</div><div class='add'>+		/* Set Fastest and Deactivate DVFS */</div><div class='add'>+		mutex_lock(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+		data-&gt;disabled = true;</div><div class='add'>+</div><div class='add'>+		opp = opp_find_freq_floor(data-&gt;dev, &amp;maxfreq);</div><div class='add'>+</div><div class='add'>+		err = exynos4_bus_setvolt(data, opp, data-&gt;curr_opp);</div><div class='add'>+		if (err)</div><div class='add'>+			goto unlock;</div><div class='add'>+</div><div class='add'>+		switch (data-&gt;type) {</div><div class='add'>+		case TYPE_BUSF_EXYNOS4210:</div><div class='add'>+			err = exynos4210_set_busclk(data, opp);</div><div class='add'>+			break;</div><div class='add'>+		case TYPE_BUSF_EXYNOS4x12:</div><div class='add'>+			err = exynos4x12_set_busclk(data, opp);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (err)</div><div class='add'>+			goto unlock;</div><div class='add'>+</div><div class='add'>+		data-&gt;curr_opp = opp;</div><div class='add'>+unlock:</div><div class='add'>+		mutex_unlock(&amp;data-&gt;lock);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		return NOTIFY_OK;</div><div class='add'>+	case PM_POST_RESTORE:</div><div class='add'>+	case PM_POST_SUSPEND:</div><div class='add'>+		/* Reactivate */</div><div class='add'>+		mutex_lock(&amp;data-&gt;lock);</div><div class='add'>+		data-&gt;disabled = false;</div><div class='add'>+		mutex_unlock(&amp;data-&gt;lock);</div><div class='add'>+		return NOTIFY_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __devinit int exynos4_busfreq_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct busfreq_data *data;</div><div class='add'>+	struct opp *opp;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	data = kzalloc(sizeof(struct busfreq_data), GFP_KERNEL);</div><div class='add'>+	if (data == NULL) {</div><div class='add'>+		dev_err(dev, "Cannot allocate memory.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;type = pdev-&gt;id_entry-&gt;driver_data;</div><div class='add'>+	data-&gt;dmc[0].hw_base = S5P_VA_DMC0;</div><div class='add'>+	data-&gt;dmc[1].hw_base = S5P_VA_DMC1;</div><div class='add'>+	data-&gt;pm_notifier.notifier_call = exynos4_busfreq_pm_notifier_event;</div><div class='add'>+	data-&gt;dev = dev;</div><div class='add'>+	mutex_init(&amp;data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	switch (data-&gt;type) {</div><div class='add'>+	case TYPE_BUSF_EXYNOS4210:</div><div class='add'>+		err = exynos4210_init_tables(data);</div><div class='add'>+		break;</div><div class='add'>+	case TYPE_BUSF_EXYNOS4x12:</div><div class='add'>+		err = exynos4x12_init_tables(data);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev, "Cannot determine the device id %d\n", data-&gt;type);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_regulator;</div><div class='add'>+</div><div class='add'>+	data-&gt;vdd_int = regulator_get(dev, "vdd_int");</div><div class='add'>+	if (IS_ERR(data-&gt;vdd_int)) {</div><div class='add'>+		dev_err(dev, "Cannot get the regulator \"vdd_int\"\n");</div><div class='add'>+		err = PTR_ERR(data-&gt;vdd_int);</div><div class='add'>+		goto err_regulator;</div><div class='add'>+	}</div><div class='add'>+	if (data-&gt;type == TYPE_BUSF_EXYNOS4x12) {</div><div class='add'>+		data-&gt;vdd_mif = regulator_get(dev, "vdd_mif");</div><div class='add'>+		if (IS_ERR(data-&gt;vdd_mif)) {</div><div class='add'>+			dev_err(dev, "Cannot get the regulator \"vdd_mif\"\n");</div><div class='add'>+			err = PTR_ERR(data-&gt;vdd_mif);</div><div class='add'>+			regulator_put(data-&gt;vdd_int);</div><div class='add'>+			goto err_regulator;</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	opp = opp_find_freq_floor(dev, &amp;exynos4_devfreq_profile.initial_freq);</div><div class='add'>+	if (IS_ERR(opp)) {</div><div class='add'>+		dev_err(dev, "Invalid initial frequency %lu kHz.\n",</div><div class='add'>+		       exynos4_devfreq_profile.initial_freq);</div><div class='add'>+		err = PTR_ERR(opp);</div><div class='add'>+		goto err_opp_add;</div><div class='add'>+	}</div><div class='add'>+	data-&gt;curr_opp = opp;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, data);</div><div class='add'>+</div><div class='add'>+	busfreq_mon_reset(data);</div><div class='add'>+</div><div class='add'>+	data-&gt;devfreq = devfreq_add_device(dev, &amp;exynos4_devfreq_profile,</div><div class='add'>+					   &amp;devfreq_simple_ondemand, NULL);</div><div class='add'>+	if (IS_ERR(data-&gt;devfreq)) {</div><div class='add'>+		err = PTR_ERR(data-&gt;devfreq);</div><div class='add'>+		goto err_opp_add;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devfreq_register_opp_notifier(dev, data-&gt;devfreq);</div><div class='add'>+</div><div class='add'>+	err = register_pm_notifier(&amp;data-&gt;pm_notifier);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Failed to setup pm notifier\n");</div><div class='add'>+		goto err_devfreq_add;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_devfreq_add:</div><div class='add'>+	devfreq_remove_device(data-&gt;devfreq);</div><div class='add'>+err_opp_add:</div><div class='add'>+	if (data-&gt;vdd_mif)</div><div class='add'>+		regulator_put(data-&gt;vdd_mif);</div><div class='add'>+	regulator_put(data-&gt;vdd_int);</div><div class='add'>+err_regulator:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __devexit int exynos4_busfreq_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct busfreq_data *data = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	unregister_pm_notifier(&amp;data-&gt;pm_notifier);</div><div class='add'>+	devfreq_remove_device(data-&gt;devfreq);</div><div class='add'>+	regulator_put(data-&gt;vdd_int);</div><div class='add'>+	if (data-&gt;vdd_mif)</div><div class='add'>+		regulator_put(data-&gt;vdd_mif);</div><div class='add'>+	kfree(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 exynos4_busfreq_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = container_of(dev, struct platform_device,</div><div class='add'>+						    dev);</div><div class='add'>+	struct busfreq_data *data = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	busfreq_mon_reset(data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops exynos4_busfreq_pm = {</div><div class='add'>+	.resume	= exynos4_busfreq_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct platform_device_id exynos4_busfreq_id[] = {</div><div class='add'>+	{ "exynos4210-busfreq", TYPE_BUSF_EXYNOS4210 },</div><div class='add'>+	{ "exynos4412-busfreq", TYPE_BUSF_EXYNOS4x12 },</div><div class='add'>+	{ "exynos4212-busfreq", TYPE_BUSF_EXYNOS4x12 },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver exynos4_busfreq_driver = {</div><div class='add'>+	.probe	= exynos4_busfreq_probe,</div><div class='add'>+	.remove	= __devexit_p(exynos4_busfreq_remove),</div><div class='add'>+	.id_table = exynos4_busfreq_id,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "exynos4-busfreq",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+		.pm	= &amp;exynos4_busfreq_pm,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init exynos4_busfreq_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;exynos4_busfreq_driver);</div><div class='add'>+}</div><div class='add'>+late_initcall(exynos4_busfreq_init);</div><div class='add'>+</div><div class='add'>+static void __exit exynos4_busfreq_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;exynos4_busfreq_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(exynos4_busfreq_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("EXYNOS4 busfreq driver with devfreq framework");</div><div class='add'>+MODULE_AUTHOR("MyungJoo Ham &lt;myungjoo.ham@samsung.com&gt;");</div><div class='add'>+MODULE_ALIAS("exynos4-busfreq");</div><div class='head'>diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig<br/>index 5a99bb3f255a..f1a274994bb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/Kconfig</a></div><div class='hunk'>@@ -124,7 +124,7 @@ config MV_XOR</div><div class='ctx'> </div><div class='ctx'> config MX3_IPU</div><div class='ctx'> 	bool "MX3x Image Processing Unit support"</div><div class='del'>-	depends on SOC_IMX31 || SOC_IMX35</div><div class='add'>+	depends on ARCH_MXC</div><div class='ctx'> 	select DMA_ENGINE</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='hunk'>@@ -187,6 +187,13 @@ config TIMB_DMA</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable support for the Timberdale FPGA DMA engine.</div><div class='ctx'> </div><div class='add'>+config SIRF_DMA</div><div class='add'>+	tristate "CSR SiRFprimaII DMA support"</div><div class='add'>+	depends on ARCH_PRIMA2</div><div class='add'>+	select DMA_ENGINE</div><div class='add'>+	help</div><div class='add'>+	  Enable support for the CSR SiRFprimaII DMA engine.</div><div class='add'>+</div><div class='ctx'> config ARCH_HAS_ASYNC_TX_FIND_CHANNEL</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='hunk'>@@ -201,26 +208,26 @@ config PL330_DMA</div><div class='ctx'> 	  platform_data for a dma-pl330 device.</div><div class='ctx'> </div><div class='ctx'> config PCH_DMA</div><div class='del'>-	tristate "Intel EG20T PCH / OKI Semi IOH(ML7213/ML7223) DMA support"</div><div class='add'>+	tristate "Intel EG20T PCH / LAPIS Semicon IOH(ML7213/ML7223/ML7831) DMA"</div><div class='ctx'> 	depends on PCI &amp;&amp; X86</div><div class='ctx'> 	select DMA_ENGINE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable support for Intel EG20T PCH DMA engine.</div><div class='ctx'> </div><div class='del'>-	  This driver also can be used for OKI SEMICONDUCTOR IOH(Input/</div><div class='del'>-	  Output Hub), ML7213 and ML7223.</div><div class='del'>-	  ML7213 IOH is for IVI(In-Vehicle Infotainment) use and ML7223 IOH is</div><div class='del'>-	  for MP(Media Phone) use.</div><div class='del'>-	  ML7213/ML7223 is companion chip for Intel Atom E6xx series.</div><div class='del'>-	  ML7213/ML7223 is completely compatible for Intel EG20T PCH.</div><div class='add'>+	  This driver also can be used for LAPIS Semiconductor IOH(Input/</div><div class='add'>+	  Output Hub), ML7213, ML7223 and ML7831.</div><div class='add'>+	  ML7213 IOH is for IVI(In-Vehicle Infotainment) use, ML7223 IOH is</div><div class='add'>+	  for MP(Media Phone) use and ML7831 IOH is for general purpose use.</div><div class='add'>+	  ML7213/ML7223/ML7831 is companion chip for Intel Atom E6xx series.</div><div class='add'>+	  ML7213/ML7223/ML7831 is completely compatible for Intel EG20T PCH.</div><div class='ctx'> </div><div class='ctx'> config IMX_SDMA</div><div class='ctx'> 	tristate "i.MX SDMA support"</div><div class='del'>-	depends on ARCH_MX25 || SOC_IMX31 || SOC_IMX35 || ARCH_MX5</div><div class='add'>+	depends on ARCH_MXC</div><div class='ctx'> 	select DMA_ENGINE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support the i.MX SDMA engine. This engine is integrated into</div><div class='del'>-	  Freescale i.MX25/31/35/51 chips.</div><div class='add'>+	  Freescale i.MX25/31/35/51/53 chips.</div><div class='ctx'> </div><div class='ctx'> config IMX_DMA</div><div class='ctx'> 	tristate "i.MX DMA support"</div><div class='head'>diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile<br/>index 30cf3b1f0c5c..009a222e8283 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/Makefile</a></div><div class='hunk'>@@ -21,6 +21,7 @@ obj-$(CONFIG_IMX_SDMA) += imx-sdma.o</div><div class='ctx'> obj-$(CONFIG_IMX_DMA) += imx-dma.o</div><div class='ctx'> obj-$(CONFIG_MXS_DMA) += mxs-dma.o</div><div class='ctx'> obj-$(CONFIG_TIMB_DMA) += timb_dma.o</div><div class='add'>+obj-$(CONFIG_SIRF_DMA) += sirf-dma.o</div><div class='ctx'> obj-$(CONFIG_STE_DMA40) += ste_dma40.o ste_dma40_ll.o</div><div class='ctx'> obj-$(CONFIG_PL330_DMA) += pl330.o</div><div class='ctx'> obj-$(CONFIG_PCH_DMA) += pch_dma.o</div><div class='head'>diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c<br/>index b7cbd1ab1db1..8a281584458b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/amba-pl08x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/amba-pl08x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/amba-pl08x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/amba-pl08x.c</a></div><div class='hunk'>@@ -854,8 +854,10 @@ static int prep_phy_channel(struct pl08x_dma_chan *plchan,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Check if we already have a channel */</div><div class='del'>-	if (plchan-&gt;phychan)</div><div class='del'>-		return 0;</div><div class='add'>+	if (plchan-&gt;phychan) {</div><div class='add'>+		ch = plchan-&gt;phychan;</div><div class='add'>+		goto got_channel;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ch = pl08x_get_phy_channel(pl08x, plchan);</div><div class='ctx'> 	if (!ch) {</div><div class='hunk'>@@ -880,21 +882,22 @@ static int prep_phy_channel(struct pl08x_dma_chan *plchan,</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 		ch-&gt;signal = ret;</div><div class='del'>-</div><div class='del'>-		/* Assign the flow control signal to this channel */</div><div class='del'>-		if (txd-&gt;direction == DMA_TO_DEVICE)</div><div class='del'>-			txd-&gt;ccfg |= ch-&gt;signal &lt;&lt; PL080_CONFIG_DST_SEL_SHIFT;</div><div class='del'>-		else if (txd-&gt;direction == DMA_FROM_DEVICE)</div><div class='del'>-			txd-&gt;ccfg |= ch-&gt;signal &lt;&lt; PL080_CONFIG_SRC_SEL_SHIFT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	plchan-&gt;phychan = ch;</div><div class='ctx'> 	dev_dbg(&amp;pl08x-&gt;adev-&gt;dev, "allocated physical channel %d and signal %d for xfer on %s\n",</div><div class='ctx'> 		 ch-&gt;id,</div><div class='ctx'> 		 ch-&gt;signal,</div><div class='ctx'> 		 plchan-&gt;name);</div><div class='ctx'> </div><div class='add'>+got_channel:</div><div class='add'>+	/* Assign the flow control signal to this channel */</div><div class='add'>+	if (txd-&gt;direction == DMA_MEM_TO_DEV)</div><div class='add'>+		txd-&gt;ccfg |= ch-&gt;signal &lt;&lt; PL080_CONFIG_DST_SEL_SHIFT;</div><div class='add'>+	else if (txd-&gt;direction == DMA_DEV_TO_MEM)</div><div class='add'>+		txd-&gt;ccfg |= ch-&gt;signal &lt;&lt; PL080_CONFIG_SRC_SEL_SHIFT;</div><div class='add'>+</div><div class='ctx'> 	plchan-&gt;phychan_hold++;</div><div class='del'>-	plchan-&gt;phychan = ch;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1102,10 +1105,10 @@ static int dma_set_runtime_config(struct dma_chan *chan,</div><div class='ctx'> </div><div class='ctx'> 	/* Transfer direction */</div><div class='ctx'> 	plchan-&gt;runtime_direction = config-&gt;direction;</div><div class='del'>-	if (config-&gt;direction == DMA_TO_DEVICE) {</div><div class='add'>+	if (config-&gt;direction == DMA_MEM_TO_DEV) {</div><div class='ctx'> 		addr_width = config-&gt;dst_addr_width;</div><div class='ctx'> 		maxburst = config-&gt;dst_maxburst;</div><div class='del'>-	} else if (config-&gt;direction == DMA_FROM_DEVICE) {</div><div class='add'>+	} else if (config-&gt;direction == DMA_DEV_TO_MEM) {</div><div class='ctx'> 		addr_width = config-&gt;src_addr_width;</div><div class='ctx'> 		maxburst = config-&gt;src_maxburst;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1136,7 +1139,7 @@ static int dma_set_runtime_config(struct dma_chan *chan,</div><div class='ctx'> 	cctl |= burst &lt;&lt; PL080_CONTROL_SB_SIZE_SHIFT;</div><div class='ctx'> 	cctl |= burst &lt;&lt; PL080_CONTROL_DB_SIZE_SHIFT;</div><div class='ctx'> </div><div class='del'>-	if (plchan-&gt;runtime_direction == DMA_FROM_DEVICE) {</div><div class='add'>+	if (plchan-&gt;runtime_direction == DMA_DEV_TO_MEM) {</div><div class='ctx'> 		plchan-&gt;src_addr = config-&gt;src_addr;</div><div class='ctx'> 		plchan-&gt;src_cctl = pl08x_cctl(cctl) | PL080_CONTROL_DST_INCR |</div><div class='ctx'> 			pl08x_select_bus(plchan-&gt;cd-&gt;periph_buses,</div><div class='hunk'>@@ -1152,7 +1155,7 @@ static int dma_set_runtime_config(struct dma_chan *chan,</div><div class='ctx'> 		"configured channel %s (%s) for %s, data width %d, "</div><div class='ctx'> 		"maxburst %d words, LE, CCTL=0x%08x\n",</div><div class='ctx'> 		dma_chan_name(chan), plchan-&gt;name,</div><div class='del'>-		(config-&gt;direction == DMA_FROM_DEVICE) ? "RX" : "TX",</div><div class='add'>+		(config-&gt;direction == DMA_DEV_TO_MEM) ? "RX" : "TX",</div><div class='ctx'> 		addr_width,</div><div class='ctx'> 		maxburst,</div><div class='ctx'> 		cctl);</div><div class='hunk'>@@ -1322,7 +1325,7 @@ static struct dma_async_tx_descriptor *pl08x_prep_dma_memcpy(</div><div class='ctx'> </div><div class='ctx'> static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(</div><div class='ctx'> 		struct dma_chan *chan, struct scatterlist *sgl,</div><div class='del'>-		unsigned int sg_len, enum dma_data_direction direction,</div><div class='add'>+		unsigned int sg_len, enum dma_transfer_direction direction,</div><div class='ctx'> 		unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);</div><div class='hunk'>@@ -1354,10 +1357,10 @@ static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(</div><div class='ctx'> 	 */</div><div class='ctx'> 	txd-&gt;direction = direction;</div><div class='ctx'> </div><div class='del'>-	if (direction == DMA_TO_DEVICE) {</div><div class='add'>+	if (direction == DMA_MEM_TO_DEV) {</div><div class='ctx'> 		txd-&gt;cctl = plchan-&gt;dst_cctl;</div><div class='ctx'> 		slave_addr = plchan-&gt;dst_addr;</div><div class='del'>-	} else if (direction == DMA_FROM_DEVICE) {</div><div class='add'>+	} else if (direction == DMA_DEV_TO_MEM) {</div><div class='ctx'> 		txd-&gt;cctl = plchan-&gt;src_cctl;</div><div class='ctx'> 		slave_addr = plchan-&gt;src_addr;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1368,10 +1371,10 @@ static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (plchan-&gt;cd-&gt;device_fc)</div><div class='del'>-		tmp = (direction == DMA_TO_DEVICE) ? PL080_FLOW_MEM2PER_PER :</div><div class='add'>+		tmp = (direction == DMA_MEM_TO_DEV) ? PL080_FLOW_MEM2PER_PER :</div><div class='ctx'> 			PL080_FLOW_PER2MEM_PER;</div><div class='ctx'> 	else</div><div class='del'>-		tmp = (direction == DMA_TO_DEVICE) ? PL080_FLOW_MEM2PER :</div><div class='add'>+		tmp = (direction == DMA_MEM_TO_DEV) ? PL080_FLOW_MEM2PER :</div><div class='ctx'> 			PL080_FLOW_PER2MEM;</div><div class='ctx'> </div><div class='ctx'> 	txd-&gt;ccfg |= tmp &lt;&lt; PL080_CONFIG_FLOW_CONTROL_SHIFT;</div><div class='hunk'>@@ -1387,7 +1390,7 @@ static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(</div><div class='ctx'> 		list_add_tail(&amp;dsg-&gt;node, &amp;txd-&gt;dsg_list);</div><div class='ctx'> </div><div class='ctx'> 		dsg-&gt;len = sg_dma_len(sg);</div><div class='del'>-		if (direction == DMA_TO_DEVICE) {</div><div class='add'>+		if (direction == DMA_MEM_TO_DEV) {</div><div class='ctx'> 			dsg-&gt;src_addr = sg_phys(sg);</div><div class='ctx'> 			dsg-&gt;dst_addr = slave_addr;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -2054,6 +2057,8 @@ static struct amba_id pl08x_ids[] = {</div><div class='ctx'> 	{ 0, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+MODULE_DEVICE_TABLE(amba, pl08x_ids);</div><div class='add'>+</div><div class='ctx'> static struct amba_driver pl08x_amba_driver = {</div><div class='ctx'> 	.drv.name	= DRIVER_NAME,</div><div class='ctx'> 	.id_table	= pl08x_ids,</div><div class='head'>diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c<br/>index fcfa0a8b5c59..97f87b29b9f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/at_hdmac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/at_hdmac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/at_hdmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/at_hdmac.c</a></div><div class='hunk'>@@ -23,6 +23,8 @@</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='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "at_hdmac_regs.h"</div><div class='ctx'> </div><div class='hunk'>@@ -660,7 +662,7 @@ err_desc_get:</div><div class='ctx'>  */</div><div class='ctx'> static struct dma_async_tx_descriptor *</div><div class='ctx'> atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,</div><div class='del'>-		unsigned int sg_len, enum dma_data_direction direction,</div><div class='add'>+		unsigned int sg_len, enum dma_transfer_direction direction,</div><div class='ctx'> 		unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct at_dma_chan	*atchan = to_at_dma_chan(chan);</div><div class='hunk'>@@ -678,7 +680,7 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,</div><div class='ctx'> </div><div class='ctx'> 	dev_vdbg(chan2dev(chan), "prep_slave_sg (%d): %s f0x%lx\n",</div><div class='ctx'> 			sg_len,</div><div class='del'>-			direction == DMA_TO_DEVICE ? "TO DEVICE" : "FROM DEVICE",</div><div class='add'>+			direction == DMA_MEM_TO_DEV ? "TO DEVICE" : "FROM DEVICE",</div><div class='ctx'> 			flags);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!atslave || !sg_len)) {</div><div class='hunk'>@@ -692,7 +694,7 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,</div><div class='ctx'> 	ctrlb = ATC_IEN;</div><div class='ctx'> </div><div class='ctx'> 	switch (direction) {</div><div class='del'>-	case DMA_TO_DEVICE:</div><div class='add'>+	case DMA_MEM_TO_DEV:</div><div class='ctx'> 		ctrla |=  ATC_DST_WIDTH(reg_width);</div><div class='ctx'> 		ctrlb |=  ATC_DST_ADDR_MODE_FIXED</div><div class='ctx'> 			| ATC_SRC_ADDR_MODE_INCR</div><div class='hunk'>@@ -725,7 +727,7 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,</div><div class='ctx'> 			total_len += len;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-	case DMA_FROM_DEVICE:</div><div class='add'>+	case DMA_DEV_TO_MEM:</div><div class='ctx'> 		ctrla |=  ATC_SRC_WIDTH(reg_width);</div><div class='ctx'> 		ctrlb |=  ATC_DST_ADDR_MODE_INCR</div><div class='ctx'> 			| ATC_SRC_ADDR_MODE_FIXED</div><div class='hunk'>@@ -787,7 +789,7 @@ err_desc_get:</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> atc_dma_cyclic_check_values(unsigned int reg_width, dma_addr_t buf_addr,</div><div class='del'>-		size_t period_len, enum dma_data_direction direction)</div><div class='add'>+		size_t period_len, enum dma_transfer_direction direction)</div><div class='ctx'> {</div><div class='ctx'> 	if (period_len &gt; (ATC_BTSIZE_MAX &lt;&lt; reg_width))</div><div class='ctx'> 		goto err_out;</div><div class='hunk'>@@ -795,7 +797,7 @@ atc_dma_cyclic_check_values(unsigned int reg_width, dma_addr_t buf_addr,</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	if (unlikely(buf_addr &amp; ((1 &lt;&lt; reg_width) - 1)))</div><div class='ctx'> 		goto err_out;</div><div class='del'>-	if (unlikely(!(direction &amp; (DMA_TO_DEVICE | DMA_FROM_DEVICE))))</div><div class='add'>+	if (unlikely(!(direction &amp; (DMA_DEV_TO_MEM | DMA_MEM_TO_DEV))))</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -810,7 +812,7 @@ err_out:</div><div class='ctx'> static int</div><div class='ctx'> atc_dma_cyclic_fill_desc(struct at_dma_slave *atslave, struct at_desc *desc,</div><div class='ctx'> 		unsigned int period_index, dma_addr_t buf_addr,</div><div class='del'>-		size_t period_len, enum dma_data_direction direction)</div><div class='add'>+		size_t period_len, enum dma_transfer_direction direction)</div><div class='ctx'> {</div><div class='ctx'> 	u32		ctrla;</div><div class='ctx'> 	unsigned int	reg_width = atslave-&gt;reg_width;</div><div class='hunk'>@@ -822,7 +824,7 @@ atc_dma_cyclic_fill_desc(struct at_dma_slave *atslave, struct at_desc *desc,</div><div class='ctx'> 		| period_len &gt;&gt; reg_width;</div><div class='ctx'> </div><div class='ctx'> 	switch (direction) {</div><div class='del'>-	case DMA_TO_DEVICE:</div><div class='add'>+	case DMA_MEM_TO_DEV:</div><div class='ctx'> 		desc-&gt;lli.saddr = buf_addr + (period_len * period_index);</div><div class='ctx'> 		desc-&gt;lli.daddr = atslave-&gt;tx_reg;</div><div class='ctx'> 		desc-&gt;lli.ctrla = ctrla;</div><div class='hunk'>@@ -833,7 +835,7 @@ atc_dma_cyclic_fill_desc(struct at_dma_slave *atslave, struct at_desc *desc,</div><div class='ctx'> 				| ATC_DIF(AT_DMA_PER_IF);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case DMA_FROM_DEVICE:</div><div class='add'>+	case DMA_DEV_TO_MEM:</div><div class='ctx'> 		desc-&gt;lli.saddr = atslave-&gt;rx_reg;</div><div class='ctx'> 		desc-&gt;lli.daddr = buf_addr + (period_len * period_index);</div><div class='ctx'> 		desc-&gt;lli.ctrla = ctrla;</div><div class='hunk'>@@ -861,7 +863,7 @@ atc_dma_cyclic_fill_desc(struct at_dma_slave *atslave, struct at_desc *desc,</div><div class='ctx'>  */</div><div class='ctx'> static struct dma_async_tx_descriptor *</div><div class='ctx'> atc_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,</div><div class='del'>-		size_t period_len, enum dma_data_direction direction)</div><div class='add'>+		size_t period_len, enum dma_transfer_direction direction)</div><div class='ctx'> {</div><div class='ctx'> 	struct at_dma_chan	*atchan = to_at_dma_chan(chan);</div><div class='ctx'> 	struct at_dma_slave	*atslave = chan-&gt;private;</div><div class='hunk'>@@ -872,7 +874,7 @@ atc_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,</div><div class='ctx'> 	unsigned int		i;</div><div class='ctx'> </div><div class='ctx'> 	dev_vdbg(chan2dev(chan), "prep_dma_cyclic: %s buf@0x%08x - %d (%d/%d)\n",</div><div class='del'>-			direction == DMA_TO_DEVICE ? "TO DEVICE" : "FROM DEVICE",</div><div class='add'>+			direction == DMA_MEM_TO_DEV ? "TO DEVICE" : "FROM DEVICE",</div><div class='ctx'> 			buf_addr,</div><div class='ctx'> 			periods, buf_len, period_len);</div><div class='ctx'> </div><div class='hunk'>@@ -1175,6 +1177,56 @@ static void atc_free_chan_resources(struct dma_chan *chan)</div><div class='ctx'> </div><div class='ctx'> /*--  Module Management  -----------------------------------------------*/</div><div class='ctx'> </div><div class='add'>+/* cap_mask is a multi-u32 bitfield, fill it with proper C code. */</div><div class='add'>+static struct at_dma_platform_data at91sam9rl_config = {</div><div class='add'>+	.nr_channels = 2,</div><div class='add'>+};</div><div class='add'>+static struct at_dma_platform_data at91sam9g45_config = {</div><div class='add'>+	.nr_channels = 8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_OF)</div><div class='add'>+static const struct of_device_id atmel_dma_dt_ids[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "atmel,at91sam9rl-dma",</div><div class='add'>+		.data = &amp;at91sam9rl_config,</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "atmel,at91sam9g45-dma",</div><div class='add'>+		.data = &amp;at91sam9g45_config,</div><div class='add'>+	}, {</div><div class='add'>+		/* sentinel */</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, atmel_dma_dt_ids);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const struct platform_device_id atdma_devtypes[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "at91sam9rl_dma",</div><div class='add'>+		.driver_data = (unsigned long) &amp;at91sam9rl_config,</div><div class='add'>+	}, {</div><div class='add'>+		.name = "at91sam9g45_dma",</div><div class='add'>+		.driver_data = (unsigned long) &amp;at91sam9g45_config,</div><div class='add'>+	}, {</div><div class='add'>+		/* sentinel */</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct at_dma_platform_data * __init at_dma_get_driver_data(</div><div class='add'>+						struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	if (pdev-&gt;dev.of_node) {</div><div class='add'>+		const struct of_device_id *match;</div><div class='add'>+		match = of_match_node(atmel_dma_dt_ids, pdev-&gt;dev.of_node);</div><div class='add'>+		if (match == NULL)</div><div class='add'>+			return NULL;</div><div class='add'>+		return match-&gt;data;</div><div class='add'>+	}</div><div class='add'>+	return (struct at_dma_platform_data *)</div><div class='add'>+			platform_get_device_id(pdev)-&gt;driver_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * at_dma_off - disable DMA controller</div><div class='ctx'>  * @atdma: the Atmel HDAMC device</div><div class='hunk'>@@ -1193,18 +1245,23 @@ static void at_dma_off(struct at_dma *atdma)</div><div class='ctx'> </div><div class='ctx'> static int __init at_dma_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct at_dma_platform_data *pdata;</div><div class='ctx'> 	struct resource		*io;</div><div class='ctx'> 	struct at_dma		*atdma;</div><div class='ctx'> 	size_t			size;</div><div class='ctx'> 	int			irq;</div><div class='ctx'> 	int			err;</div><div class='ctx'> 	int			i;</div><div class='add'>+	struct at_dma_platform_data *plat_dat;</div><div class='ctx'> </div><div class='del'>-	/* get DMA Controller parameters from platform */</div><div class='del'>-	pdata = pdev-&gt;dev.platform_data;</div><div class='del'>-	if (!pdata || pdata-&gt;nr_channels &gt; AT_DMA_MAX_NR_CHANNELS)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	/* setup platform data for each SoC */</div><div class='add'>+	dma_cap_set(DMA_MEMCPY, at91sam9rl_config.cap_mask);</div><div class='add'>+	dma_cap_set(DMA_MEMCPY, at91sam9g45_config.cap_mask);</div><div class='add'>+	dma_cap_set(DMA_SLAVE, at91sam9g45_config.cap_mask);</div><div class='add'>+</div><div class='add'>+	/* get DMA parameters from controller type */</div><div class='add'>+	plat_dat = at_dma_get_driver_data(pdev);</div><div class='add'>+	if (!plat_dat)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	io = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	if (!io)</div><div class='hunk'>@@ -1215,14 +1272,14 @@ static int __init at_dma_probe(struct platform_device *pdev)</div><div class='ctx'> 		return irq;</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(struct at_dma);</div><div class='del'>-	size += pdata-&gt;nr_channels * sizeof(struct at_dma_chan);</div><div class='add'>+	size += plat_dat-&gt;nr_channels * sizeof(struct at_dma_chan);</div><div class='ctx'> 	atdma = kzalloc(size, GFP_KERNEL);</div><div class='ctx'> 	if (!atdma)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* discover transaction capabilites from the platform data */</div><div class='del'>-	atdma-&gt;dma_common.cap_mask = pdata-&gt;cap_mask;</div><div class='del'>-	atdma-&gt;all_chan_mask = (1 &lt;&lt; pdata-&gt;nr_channels) - 1;</div><div class='add'>+	/* discover transaction capabilities */</div><div class='add'>+	atdma-&gt;dma_common.cap_mask = plat_dat-&gt;cap_mask;</div><div class='add'>+	atdma-&gt;all_chan_mask = (1 &lt;&lt; plat_dat-&gt;nr_channels) - 1;</div><div class='ctx'> </div><div class='ctx'> 	size = resource_size(io);</div><div class='ctx'> 	if (!request_mem_region(io-&gt;start, size, pdev-&gt;dev.driver-&gt;name)) {</div><div class='hunk'>@@ -1268,7 +1325,7 @@ static int __init at_dma_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* initialize channels related values */</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;atdma-&gt;dma_common.channels);</div><div class='del'>-	for (i = 0; i &lt; pdata-&gt;nr_channels; i++) {</div><div class='add'>+	for (i = 0; i &lt; plat_dat-&gt;nr_channels; i++) {</div><div class='ctx'> 		struct at_dma_chan	*atchan = &amp;atdma-&gt;chan[i];</div><div class='ctx'> </div><div class='ctx'> 		atchan-&gt;chan_common.device = &amp;atdma-&gt;dma_common;</div><div class='hunk'>@@ -1313,7 +1370,7 @@ static int __init at_dma_probe(struct platform_device *pdev)</div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "Atmel AHB DMA Controller ( %s%s), %d channels\n",</div><div class='ctx'> 	  dma_has_cap(DMA_MEMCPY, atdma-&gt;dma_common.cap_mask) ? "cpy " : "",</div><div class='ctx'> 	  dma_has_cap(DMA_SLAVE, atdma-&gt;dma_common.cap_mask)  ? "slave " : "",</div><div class='del'>-	  pdata-&gt;nr_channels);</div><div class='add'>+	  plat_dat-&gt;nr_channels);</div><div class='ctx'> </div><div class='ctx'> 	dma_async_device_register(&amp;atdma-&gt;dma_common);</div><div class='ctx'> </div><div class='hunk'>@@ -1495,9 +1552,11 @@ static const struct dev_pm_ops at_dma_dev_pm_ops = {</div><div class='ctx'> static struct platform_driver at_dma_driver = {</div><div class='ctx'> 	.remove		= __exit_p(at_dma_remove),</div><div class='ctx'> 	.shutdown	= at_dma_shutdown,</div><div class='add'>+	.id_table	= atdma_devtypes,</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "at_hdmac",</div><div class='ctx'> 		.pm	= &amp;at_dma_dev_pm_ops,</div><div class='add'>+		.of_match_table	= of_match_ptr(atmel_dma_dt_ids),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/dma/at_hdmac_regs.h b/drivers/dma/at_hdmac_regs.h<br/>index aa4c9aebab7c..dcaedfc181cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/at_hdmac_regs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/at_hdmac_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/at_hdmac_regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/at_hdmac_regs.h</a></div><div class='hunk'>@@ -251,6 +251,7 @@ static inline struct at_dma_chan *to_at_dma_chan(struct dma_chan *dchan)</div><div class='ctx'> /**</div><div class='ctx'>  * struct at_dma - internal representation of an Atmel HDMA Controller</div><div class='ctx'>  * @chan_common: common dmaengine dma_device object members</div><div class='add'>+ * @atdma_devtype: identifier of DMA controller compatibility</div><div class='ctx'>  * @ch_regs: memory mapped register base</div><div class='ctx'>  * @clk: dma controller clock</div><div class='ctx'>  * @save_imr: interrupt mask register that is saved on suspend/resume cycle</div><div class='head'>diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c<br/>index 4234f416ef11..d65a718c0f9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/coh901318.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/coh901318.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/coh901318.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/coh901318.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@ struct coh901318_desc {</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	unsigned int sg_len;</div><div class='ctx'> 	struct coh901318_lli *lli;</div><div class='del'>-	enum dma_data_direction dir;</div><div class='add'>+	enum dma_transfer_direction dir;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 head_config;</div><div class='ctx'> 	u32 head_ctrl;</div><div class='hunk'>@@ -1034,7 +1034,7 @@ coh901318_prep_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,</div><div class='ctx'> </div><div class='ctx'> static struct dma_async_tx_descriptor *</div><div class='ctx'> coh901318_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,</div><div class='del'>-			unsigned int sg_len, enum dma_data_direction direction,</div><div class='add'>+			unsigned int sg_len, enum dma_transfer_direction direction,</div><div class='ctx'> 			unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct coh901318_chan *cohc = to_coh901318_chan(chan);</div><div class='hunk'>@@ -1077,7 +1077,7 @@ coh901318_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,</div><div class='ctx'> 	ctrl_last |= cohc-&gt;runtime_ctrl;</div><div class='ctx'> 	ctrl |= cohc-&gt;runtime_ctrl;</div><div class='ctx'> </div><div class='del'>-	if (direction == DMA_TO_DEVICE) {</div><div class='add'>+	if (direction == DMA_MEM_TO_DEV) {</div><div class='ctx'> 		u32 tx_flags = COH901318_CX_CTRL_PRDD_SOURCE |</div><div class='ctx'> 			COH901318_CX_CTRL_SRC_ADDR_INC_ENABLE;</div><div class='ctx'> </div><div class='hunk'>@@ -1085,7 +1085,7 @@ coh901318_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,</div><div class='ctx'> 		ctrl_chained |= tx_flags;</div><div class='ctx'> 		ctrl_last |= tx_flags;</div><div class='ctx'> 		ctrl |= tx_flags;</div><div class='del'>-	} else if (direction == DMA_FROM_DEVICE) {</div><div class='add'>+	} else if (direction == DMA_DEV_TO_MEM) {</div><div class='ctx'> 		u32 rx_flags = COH901318_CX_CTRL_PRDD_DEST |</div><div class='ctx'> 			COH901318_CX_CTRL_DST_ADDR_INC_ENABLE;</div><div class='ctx'> </div><div class='hunk'>@@ -1274,11 +1274,11 @@ static void coh901318_dma_set_runtimeconfig(struct dma_chan *chan,</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* We only support mem to per or per to mem transfers */</div><div class='del'>-	if (config-&gt;direction == DMA_FROM_DEVICE) {</div><div class='add'>+	if (config-&gt;direction == DMA_DEV_TO_MEM) {</div><div class='ctx'> 		addr = config-&gt;src_addr;</div><div class='ctx'> 		addr_width = config-&gt;src_addr_width;</div><div class='ctx'> 		maxburst = config-&gt;src_maxburst;</div><div class='del'>-	} else if (config-&gt;direction == DMA_TO_DEVICE) {</div><div class='add'>+	} else if (config-&gt;direction == DMA_MEM_TO_DEV) {</div><div class='ctx'> 		addr = config-&gt;dst_addr;</div><div class='ctx'> 		addr_width = config-&gt;dst_addr_width;</div><div class='ctx'> 		maxburst = config-&gt;dst_maxburst;</div><div class='head'>diff --git a/drivers/dma/coh901318_lli.c b/drivers/dma/coh901318_lli.c<br/>index 9f7e0e6a7eea..6c0e2d4c6682 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/coh901318_lli.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/coh901318_lli.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/coh901318_lli.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/coh901318_lli.c</a></div><div class='hunk'>@@ -7,11 +7,10 @@</div><div class='ctx'>  * Author: Per Friden &lt;per.friden@stericsson.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/dmapool.h&gt;</div><div class='ctx'> #include &lt;linux/memory.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='add'>+#include &lt;linux/dmapool.h&gt;</div><div class='ctx'> #include &lt;mach/coh901318.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "coh901318_lli.h"</div><div class='hunk'>@@ -177,18 +176,18 @@ coh901318_lli_fill_single(struct coh901318_pool *pool,</div><div class='ctx'> 			  struct coh901318_lli *lli,</div><div class='ctx'> 			  dma_addr_t buf, unsigned int size,</div><div class='ctx'> 			  dma_addr_t dev_addr, u32 ctrl_chained, u32 ctrl_eom,</div><div class='del'>-			  enum dma_data_direction dir)</div><div class='add'>+			  enum dma_transfer_direction dir)</div><div class='ctx'> {</div><div class='ctx'> 	int s = size;</div><div class='ctx'> 	dma_addr_t src;</div><div class='ctx'> 	dma_addr_t dst;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	if (dir == DMA_TO_DEVICE) {</div><div class='add'>+	if (dir == DMA_MEM_TO_DEV) {</div><div class='ctx'> 		src = buf;</div><div class='ctx'> 		dst = dev_addr;</div><div class='ctx'> </div><div class='del'>-	} else if (dir == DMA_FROM_DEVICE) {</div><div class='add'>+	} else if (dir == DMA_DEV_TO_MEM) {</div><div class='ctx'> </div><div class='ctx'> 		src = dev_addr;</div><div class='ctx'> 		dst = buf;</div><div class='hunk'>@@ -215,9 +214,9 @@ coh901318_lli_fill_single(struct coh901318_pool *pool,</div><div class='ctx'> </div><div class='ctx'> 		lli = coh901318_lli_next(lli);</div><div class='ctx'> </div><div class='del'>-		if (dir == DMA_TO_DEVICE)</div><div class='add'>+		if (dir == DMA_MEM_TO_DEV)</div><div class='ctx'> 			src += block_size;</div><div class='del'>-		else if (dir == DMA_FROM_DEVICE)</div><div class='add'>+		else if (dir == DMA_DEV_TO_MEM)</div><div class='ctx'> 			dst += block_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -234,7 +233,7 @@ coh901318_lli_fill_sg(struct coh901318_pool *pool,</div><div class='ctx'> 		      struct scatterlist *sgl, unsigned int nents,</div><div class='ctx'> 		      dma_addr_t dev_addr, u32 ctrl_chained, u32 ctrl,</div><div class='ctx'> 		      u32 ctrl_last,</div><div class='del'>-		      enum dma_data_direction dir, u32 ctrl_irq_mask)</div><div class='add'>+		      enum dma_transfer_direction dir, u32 ctrl_irq_mask)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='hunk'>@@ -249,9 +248,9 @@ coh901318_lli_fill_sg(struct coh901318_pool *pool,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;pool-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (dir == DMA_TO_DEVICE)</div><div class='add'>+	if (dir == DMA_MEM_TO_DEV)</div><div class='ctx'> 		dst = dev_addr;</div><div class='del'>-	else if (dir == DMA_FROM_DEVICE)</div><div class='add'>+	else if (dir == DMA_DEV_TO_MEM)</div><div class='ctx'> 		src = dev_addr;</div><div class='ctx'> 	else</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -269,7 +268,7 @@ coh901318_lli_fill_sg(struct coh901318_pool *pool,</div><div class='ctx'> 			ctrl_sg = ctrl ? ctrl : ctrl_last;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-		if (dir == DMA_TO_DEVICE)</div><div class='add'>+		if (dir == DMA_MEM_TO_DEV)</div><div class='ctx'> 			/* increment source address */</div><div class='ctx'> 			src = sg_phys(sg);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -293,7 +292,7 @@ coh901318_lli_fill_sg(struct coh901318_pool *pool,</div><div class='ctx'> 			lli-&gt;src_addr = src;</div><div class='ctx'> 			lli-&gt;dst_addr = dst;</div><div class='ctx'> </div><div class='del'>-			if (dir == DMA_FROM_DEVICE)</div><div class='add'>+			if (dir == DMA_DEV_TO_MEM)</div><div class='ctx'> 				dst += elem_size;</div><div class='ctx'> 			else</div><div class='ctx'> 				src += elem_size;</div><div class='head'>diff --git a/drivers/dma/coh901318_lli.h b/drivers/dma/coh901318_lli.h<br/>index 7a5c80990e9e..abff3714fdda 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/coh901318_lli.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/coh901318_lli.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/coh901318_lli.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/coh901318_lli.h</a></div><div class='hunk'>@@ -97,7 +97,7 @@ coh901318_lli_fill_single(struct coh901318_pool *pool,</div><div class='ctx'> 			  struct coh901318_lli *lli,</div><div class='ctx'> 			  dma_addr_t buf, unsigned int size,</div><div class='ctx'> 			  dma_addr_t dev_addr, u32 ctrl_chained, u32 ctrl_last,</div><div class='del'>-			  enum dma_data_direction dir);</div><div class='add'>+			  enum dma_transfer_direction dir);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * coh901318_lli_fill_single() - Prepares the lli:s for dma scatter list transfer</div><div class='hunk'>@@ -119,6 +119,6 @@ coh901318_lli_fill_sg(struct coh901318_pool *pool,</div><div class='ctx'> 		      struct scatterlist *sg, unsigned int nents,</div><div class='ctx'> 		      dma_addr_t dev_addr, u32 ctrl_chained,</div><div class='ctx'> 		      u32 ctrl, u32 ctrl_last,</div><div class='del'>-		      enum dma_data_direction dir, u32 ctrl_irq_mask);</div><div class='add'>+		      enum dma_transfer_direction dir, u32 ctrl_irq_mask);</div><div class='ctx'> </div><div class='ctx'> #endif /* COH901318_LLI_H */</div><div class='head'>diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c<br/>index b48967b499da..a6c6051ec858 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/dmaengine.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/dmaengine.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/dmaengine.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/dmaengine.c</a></div><div class='hunk'>@@ -693,12 +693,12 @@ int dma_async_device_register(struct dma_device *device)</div><div class='ctx'> 		!device-&gt;device_prep_dma_interrupt);</div><div class='ctx'> 	BUG_ON(dma_has_cap(DMA_SG, device-&gt;cap_mask) &amp;&amp;</div><div class='ctx'> 		!device-&gt;device_prep_dma_sg);</div><div class='del'>-	BUG_ON(dma_has_cap(DMA_SLAVE, device-&gt;cap_mask) &amp;&amp;</div><div class='del'>-		!device-&gt;device_prep_slave_sg);</div><div class='ctx'> 	BUG_ON(dma_has_cap(DMA_CYCLIC, device-&gt;cap_mask) &amp;&amp;</div><div class='ctx'> 		!device-&gt;device_prep_dma_cyclic);</div><div class='ctx'> 	BUG_ON(dma_has_cap(DMA_SLAVE, device-&gt;cap_mask) &amp;&amp;</div><div class='ctx'> 		!device-&gt;device_control);</div><div class='add'>+	BUG_ON(dma_has_cap(DMA_INTERLEAVE, device-&gt;cap_mask) &amp;&amp;</div><div class='add'>+		!device-&gt;device_prep_interleaved_dma);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!device-&gt;device_alloc_chan_resources);</div><div class='ctx'> 	BUG_ON(!device-&gt;device_free_chan_resources);</div><div class='head'>diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c<br/>index eb1d8641cf5c..2b8661b54eaf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/dmatest.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/dmatest.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/dmatest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/dmatest.c</a></div><div class='hunk'>@@ -214,9 +214,18 @@ static unsigned int dmatest_verify(u8 **bufs, unsigned int start,</div><div class='ctx'> 	return error_count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dmatest_callback(void *completion)</div><div class='add'>+/* poor man's completion - we want to use wait_event_freezable() on it */</div><div class='add'>+struct dmatest_done {</div><div class='add'>+	bool			done;</div><div class='add'>+	wait_queue_head_t	*wait;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void dmatest_callback(void *arg)</div><div class='ctx'> {</div><div class='del'>-	complete(completion);</div><div class='add'>+	struct dmatest_done *done = arg;</div><div class='add'>+</div><div class='add'>+	done-&gt;done = true;</div><div class='add'>+	wake_up_all(done-&gt;wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -235,7 +244,9 @@ static void dmatest_callback(void *completion)</div><div class='ctx'>  */</div><div class='ctx'> static int dmatest_func(void *data)</div><div class='ctx'> {</div><div class='add'>+	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(done_wait);</div><div class='ctx'> 	struct dmatest_thread	*thread = data;</div><div class='add'>+	struct dmatest_done	done = { .wait = &amp;done_wait };</div><div class='ctx'> 	struct dma_chan		*chan;</div><div class='ctx'> 	const char		*thread_name;</div><div class='ctx'> 	unsigned int		src_off, dst_off, len;</div><div class='hunk'>@@ -252,7 +263,7 @@ static int dmatest_func(void *data)</div><div class='ctx'> 	int			i;</div><div class='ctx'> </div><div class='ctx'> 	thread_name = current-&gt;comm;</div><div class='del'>-	set_freezable_with_signal();</div><div class='add'>+	set_freezable();</div><div class='ctx'> </div><div class='ctx'> 	ret = -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -306,9 +317,6 @@ static int dmatest_func(void *data)</div><div class='ctx'> 		struct dma_async_tx_descriptor *tx = NULL;</div><div class='ctx'> 		dma_addr_t dma_srcs[src_cnt];</div><div class='ctx'> 		dma_addr_t dma_dsts[dst_cnt];</div><div class='del'>-		struct completion cmp;</div><div class='del'>-		unsigned long start, tmo, end = 0 /* compiler... */;</div><div class='del'>-		bool reload = true;</div><div class='ctx'> 		u8 align = 0;</div><div class='ctx'> </div><div class='ctx'> 		total_tests++;</div><div class='hunk'>@@ -391,9 +399,9 @@ static int dmatest_func(void *data)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		init_completion(&amp;cmp);</div><div class='add'>+		done.done = false;</div><div class='ctx'> 		tx-&gt;callback = dmatest_callback;</div><div class='del'>-		tx-&gt;callback_param = &amp;cmp;</div><div class='add'>+		tx-&gt;callback_param = &amp;done;</div><div class='ctx'> 		cookie = tx-&gt;tx_submit(tx);</div><div class='ctx'> </div><div class='ctx'> 		if (dma_submit_error(cookie)) {</div><div class='hunk'>@@ -407,20 +415,20 @@ static int dmatest_func(void *data)</div><div class='ctx'> 		}</div><div class='ctx'> 		dma_async_issue_pending(chan);</div><div class='ctx'> </div><div class='del'>-		do {</div><div class='del'>-			start = jiffies;</div><div class='del'>-			if (reload)</div><div class='del'>-				end = start + msecs_to_jiffies(timeout);</div><div class='del'>-			else if (end &lt;= start)</div><div class='del'>-				end = start + 1;</div><div class='del'>-			tmo = wait_for_completion_interruptible_timeout(&amp;cmp,</div><div class='del'>-								end - start);</div><div class='del'>-			reload = try_to_freeze();</div><div class='del'>-		} while (tmo == -ERESTARTSYS);</div><div class='add'>+		wait_event_freezable_timeout(done_wait, done.done,</div><div class='add'>+					     msecs_to_jiffies(timeout));</div><div class='ctx'> </div><div class='ctx'> 		status = dma_async_is_tx_complete(chan, cookie, NULL, NULL);</div><div class='ctx'> </div><div class='del'>-		if (tmo == 0) {</div><div class='add'>+		if (!done.done) {</div><div class='add'>+			/*</div><div class='add'>+			 * We're leaving the timed out dma operation with</div><div class='add'>+			 * dangling pointer to done_wait.  To make this</div><div class='add'>+			 * correct, we'll need to allocate wait_done for</div><div class='add'>+			 * each test iteration and perform "who's gonna</div><div class='add'>+			 * free it this time?" dancing.  For now, just</div><div class='add'>+			 * leave it dangling.</div><div class='add'>+			 */</div><div class='ctx'> 			pr_warning("%s: #%u: test timed out\n",</div><div class='ctx'> 				   thread_name, total_tests - 1);</div><div class='ctx'> 			failed_tests++;</div><div class='head'>diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c<br/>index 9bfd6d360718..9b592b02b5f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/dw_dmac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/dw_dmac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/dw_dmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/dw_dmac.c</a></div><div class='hunk'>@@ -166,6 +166,38 @@ dwc_assign_cookie(struct dw_dma_chan *dwc, struct dw_desc *desc)</div><div class='ctx'> 	return cookie;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void dwc_initialize(struct dw_dma_chan *dwc)</div><div class='add'>+{</div><div class='add'>+	struct dw_dma *dw = to_dw_dma(dwc-&gt;chan.device);</div><div class='add'>+	struct dw_dma_slave *dws = dwc-&gt;chan.private;</div><div class='add'>+	u32 cfghi = DWC_CFGH_FIFO_MODE;</div><div class='add'>+	u32 cfglo = DWC_CFGL_CH_PRIOR(dwc-&gt;priority);</div><div class='add'>+</div><div class='add'>+	if (dwc-&gt;initialized == true)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (dws) {</div><div class='add'>+		/*</div><div class='add'>+		 * We need controller-specific data to set up slave</div><div class='add'>+		 * transfers.</div><div class='add'>+		 */</div><div class='add'>+		BUG_ON(!dws-&gt;dma_dev || dws-&gt;dma_dev != dw-&gt;dma.dev);</div><div class='add'>+</div><div class='add'>+		cfghi = dws-&gt;cfg_hi;</div><div class='add'>+		cfglo |= dws-&gt;cfg_lo &amp; ~DWC_CFGL_CH_PRIOR_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	channel_writel(dwc, CFG_LO, cfglo);</div><div class='add'>+	channel_writel(dwc, CFG_HI, cfghi);</div><div class='add'>+</div><div class='add'>+	/* Enable interrupts */</div><div class='add'>+	channel_set_bit(dw, MASK.XFER, dwc-&gt;mask);</div><div class='add'>+	channel_set_bit(dw, MASK.BLOCK, dwc-&gt;mask);</div><div class='add'>+	channel_set_bit(dw, MASK.ERROR, dwc-&gt;mask);</div><div class='add'>+</div><div class='add'>+	dwc-&gt;initialized = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*----------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='ctx'> /* Called with dwc-&gt;lock held and bh disabled */</div><div class='hunk'>@@ -189,6 +221,8 @@ static void dwc_dostart(struct dw_dma_chan *dwc, struct dw_desc *first)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dwc_initialize(dwc);</div><div class='add'>+</div><div class='ctx'> 	channel_writel(dwc, LLP, first-&gt;txd.phys);</div><div class='ctx'> 	channel_writel(dwc, CTL_LO,</div><div class='ctx'> 			DWC_CTLL_LLP_D_EN | DWC_CTLL_LLP_S_EN);</div><div class='hunk'>@@ -696,7 +730,7 @@ err_desc_get:</div><div class='ctx'> </div><div class='ctx'> static struct dma_async_tx_descriptor *</div><div class='ctx'> dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,</div><div class='del'>-		unsigned int sg_len, enum dma_data_direction direction,</div><div class='add'>+		unsigned int sg_len, enum dma_transfer_direction direction,</div><div class='ctx'> 		unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct dw_dma_chan	*dwc = to_dw_dma_chan(chan);</div><div class='hunk'>@@ -720,7 +754,7 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,</div><div class='ctx'> 	prev = first = NULL;</div><div class='ctx'> </div><div class='ctx'> 	switch (direction) {</div><div class='del'>-	case DMA_TO_DEVICE:</div><div class='add'>+	case DMA_MEM_TO_DEV:</div><div class='ctx'> 		ctllo = (DWC_DEFAULT_CTLLO(chan-&gt;private)</div><div class='ctx'> 				| DWC_CTLL_DST_WIDTH(reg_width)</div><div class='ctx'> 				| DWC_CTLL_DST_FIX</div><div class='hunk'>@@ -777,7 +811,7 @@ slave_sg_todev_fill_desc:</div><div class='ctx'> 				goto slave_sg_todev_fill_desc;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-	case DMA_FROM_DEVICE:</div><div class='add'>+	case DMA_DEV_TO_MEM:</div><div class='ctx'> 		ctllo = (DWC_DEFAULT_CTLLO(chan-&gt;private)</div><div class='ctx'> 				| DWC_CTLL_SRC_WIDTH(reg_width)</div><div class='ctx'> 				| DWC_CTLL_DST_INC</div><div class='hunk'>@@ -959,10 +993,7 @@ static int dwc_alloc_chan_resources(struct dma_chan *chan)</div><div class='ctx'> 	struct dw_dma_chan	*dwc = to_dw_dma_chan(chan);</div><div class='ctx'> 	struct dw_dma		*dw = to_dw_dma(chan-&gt;device);</div><div class='ctx'> 	struct dw_desc		*desc;</div><div class='del'>-	struct dw_dma_slave	*dws;</div><div class='ctx'> 	int			i;</div><div class='del'>-	u32			cfghi;</div><div class='del'>-	u32			cfglo;</div><div class='ctx'> 	unsigned long		flags;</div><div class='ctx'> </div><div class='ctx'> 	dev_vdbg(chan2dev(chan), "alloc_chan_resources\n");</div><div class='hunk'>@@ -975,26 +1006,6 @@ static int dwc_alloc_chan_resources(struct dma_chan *chan)</div><div class='ctx'> </div><div class='ctx'> 	dwc-&gt;completed = chan-&gt;cookie = 1;</div><div class='ctx'> </div><div class='del'>-	cfghi = DWC_CFGH_FIFO_MODE;</div><div class='del'>-	cfglo = 0;</div><div class='del'>-</div><div class='del'>-	dws = chan-&gt;private;</div><div class='del'>-	if (dws) {</div><div class='del'>-		/*</div><div class='del'>-		 * We need controller-specific data to set up slave</div><div class='del'>-		 * transfers.</div><div class='del'>-		 */</div><div class='del'>-		BUG_ON(!dws-&gt;dma_dev || dws-&gt;dma_dev != dw-&gt;dma.dev);</div><div class='del'>-</div><div class='del'>-		cfghi = dws-&gt;cfg_hi;</div><div class='del'>-		cfglo = dws-&gt;cfg_lo &amp; ~DWC_CFGL_CH_PRIOR_MASK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cfglo |= DWC_CFGL_CH_PRIOR(dwc-&gt;priority);</div><div class='del'>-</div><div class='del'>-	channel_writel(dwc, CFG_LO, cfglo);</div><div class='del'>-	channel_writel(dwc, CFG_HI, cfghi);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * NOTE: some controllers may have additional features that we</div><div class='ctx'> 	 * need to initialize here, like "scatter-gather" (which</div><div class='hunk'>@@ -1026,11 +1037,6 @@ static int dwc_alloc_chan_resources(struct dma_chan *chan)</div><div class='ctx'> 		i = ++dwc-&gt;descs_allocated;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Enable interrupts */</div><div class='del'>-	channel_set_bit(dw, MASK.XFER, dwc-&gt;mask);</div><div class='del'>-	channel_set_bit(dw, MASK.BLOCK, dwc-&gt;mask);</div><div class='del'>-	channel_set_bit(dw, MASK.ERROR, dwc-&gt;mask);</div><div class='del'>-</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;dwc-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(chan2dev(chan),</div><div class='hunk'>@@ -1058,6 +1064,7 @@ static void dwc_free_chan_resources(struct dma_chan *chan)</div><div class='ctx'> 	spin_lock_irqsave(&amp;dwc-&gt;lock, flags);</div><div class='ctx'> 	list_splice_init(&amp;dwc-&gt;free_list, &amp;list);</div><div class='ctx'> 	dwc-&gt;descs_allocated = 0;</div><div class='add'>+	dwc-&gt;initialized = false;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable interrupts */</div><div class='ctx'> 	channel_clear_bit(dw, MASK.XFER, dwc-&gt;mask);</div><div class='hunk'>@@ -1165,7 +1172,7 @@ EXPORT_SYMBOL(dw_dma_cyclic_stop);</div><div class='ctx'>  */</div><div class='ctx'> struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan,</div><div class='ctx'> 		dma_addr_t buf_addr, size_t buf_len, size_t period_len,</div><div class='del'>-		enum dma_data_direction direction)</div><div class='add'>+		enum dma_transfer_direction direction)</div><div class='ctx'> {</div><div class='ctx'> 	struct dw_dma_chan		*dwc = to_dw_dma_chan(chan);</div><div class='ctx'> 	struct dw_cyclic_desc		*cdesc;</div><div class='hunk'>@@ -1206,7 +1213,7 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan,</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	if (unlikely(buf_addr &amp; ((1 &lt;&lt; reg_width) - 1)))</div><div class='ctx'> 		goto out_err;</div><div class='del'>-	if (unlikely(!(direction &amp; (DMA_TO_DEVICE | DMA_FROM_DEVICE))))</div><div class='add'>+	if (unlikely(!(direction &amp; (DMA_MEM_TO_DEV | DMA_DEV_TO_MEM))))</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='ctx'> 	retval = ERR_PTR(-ENOMEM);</div><div class='hunk'>@@ -1228,7 +1235,7 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan,</div><div class='ctx'> 			goto out_err_desc_get;</div><div class='ctx'> </div><div class='ctx'> 		switch (direction) {</div><div class='del'>-		case DMA_TO_DEVICE:</div><div class='add'>+		case DMA_MEM_TO_DEV:</div><div class='ctx'> 			desc-&gt;lli.dar = dws-&gt;tx_reg;</div><div class='ctx'> 			desc-&gt;lli.sar = buf_addr + (period_len * i);</div><div class='ctx'> 			desc-&gt;lli.ctllo = (DWC_DEFAULT_CTLLO(chan-&gt;private)</div><div class='hunk'>@@ -1239,7 +1246,7 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan,</div><div class='ctx'> 					| DWC_CTLL_FC(dws-&gt;fc)</div><div class='ctx'> 					| DWC_CTLL_INT_EN);</div><div class='ctx'> 			break;</div><div class='del'>-		case DMA_FROM_DEVICE:</div><div class='add'>+		case DMA_DEV_TO_MEM:</div><div class='ctx'> 			desc-&gt;lli.dar = buf_addr + (period_len * i);</div><div class='ctx'> 			desc-&gt;lli.sar = dws-&gt;rx_reg;</div><div class='ctx'> 			desc-&gt;lli.ctllo = (DWC_DEFAULT_CTLLO(chan-&gt;private)</div><div class='hunk'>@@ -1335,6 +1342,8 @@ EXPORT_SYMBOL(dw_dma_cyclic_free);</div><div class='ctx'> </div><div class='ctx'> static void dw_dma_off(struct dw_dma *dw)</div><div class='ctx'> {</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='ctx'> 	dma_writel(dw, CFG, 0);</div><div class='ctx'> </div><div class='ctx'> 	channel_clear_bit(dw, MASK.XFER, dw-&gt;all_chan_mask);</div><div class='hunk'>@@ -1345,6 +1354,9 @@ static void dw_dma_off(struct dw_dma *dw)</div><div class='ctx'> </div><div class='ctx'> 	while (dma_readl(dw, CFG) &amp; DW_CFG_DMA_EN)</div><div class='ctx'> 		cpu_relax();</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dw-&gt;dma.chancnt; i++)</div><div class='add'>+		dw-&gt;chan[i].initialized = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init dw_probe(struct platform_device *pdev)</div><div class='hunk'>@@ -1533,6 +1545,7 @@ static int dw_suspend_noirq(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	dw_dma_off(platform_get_drvdata(pdev));</div><div class='ctx'> 	clk_disable(dw-&gt;clk);</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/dma/dw_dmac_regs.h b/drivers/dma/dw_dmac_regs.h<br/>index c3419518d701..5eef6946a367 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/dw_dmac_regs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/dw_dmac_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/dw_dmac_regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/dw_dmac_regs.h</a></div><div class='hunk'>@@ -140,6 +140,7 @@ struct dw_dma_chan {</div><div class='ctx'> 	u8			mask;</div><div class='ctx'> 	u8			priority;</div><div class='ctx'> 	bool			paused;</div><div class='add'>+	bool			initialized;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t		lock;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c<br/>index b47e2b803faf..59e7a965772b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/ep93xx_dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/ep93xx_dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/ep93xx_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/ep93xx_dma.c</a></div><div class='hunk'>@@ -246,6 +246,9 @@ static void ep93xx_dma_set_active(struct ep93xx_dma_chan *edmac,</div><div class='ctx'> static struct ep93xx_dma_desc *</div><div class='ctx'> ep93xx_dma_get_active(struct ep93xx_dma_chan *edmac)</div><div class='ctx'> {</div><div class='add'>+	if (list_empty(&amp;edmac-&gt;active))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	return list_first_entry(&amp;edmac-&gt;active, struct ep93xx_dma_desc, node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -263,16 +266,22 @@ ep93xx_dma_get_active(struct ep93xx_dma_chan *edmac)</div><div class='ctx'>  */</div><div class='ctx'> static bool ep93xx_dma_advance_active(struct ep93xx_dma_chan *edmac)</div><div class='ctx'> {</div><div class='add'>+	struct ep93xx_dma_desc *desc;</div><div class='add'>+</div><div class='ctx'> 	list_rotate_left(&amp;edmac-&gt;active);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(EP93XX_DMA_IS_CYCLIC, &amp;edmac-&gt;flags))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='add'>+	desc = ep93xx_dma_get_active(edmac);</div><div class='add'>+	if (!desc)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If txd.cookie is set it means that we are back in the first</div><div class='ctx'> 	 * descriptor in the chain and hence done with it.</div><div class='ctx'> 	 */</div><div class='del'>-	return !ep93xx_dma_get_active(edmac)-&gt;txd.cookie;</div><div class='add'>+	return !desc-&gt;txd.cookie;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -327,10 +336,16 @@ static void m2p_hw_shutdown(struct ep93xx_dma_chan *edmac)</div><div class='ctx'> </div><div class='ctx'> static void m2p_fill_desc(struct ep93xx_dma_chan *edmac)</div><div class='ctx'> {</div><div class='del'>-	struct ep93xx_dma_desc *desc = ep93xx_dma_get_active(edmac);</div><div class='add'>+	struct ep93xx_dma_desc *desc;</div><div class='ctx'> 	u32 bus_addr;</div><div class='ctx'> </div><div class='del'>-	if (ep93xx_dma_chan_direction(&amp;edmac-&gt;chan) == DMA_TO_DEVICE)</div><div class='add'>+	desc = ep93xx_dma_get_active(edmac);</div><div class='add'>+	if (!desc) {</div><div class='add'>+		dev_warn(chan2dev(edmac), "M2P: empty descriptor list\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ep93xx_dma_chan_direction(&amp;edmac-&gt;chan) == DMA_MEM_TO_DEV)</div><div class='ctx'> 		bus_addr = desc-&gt;src_addr;</div><div class='ctx'> 	else</div><div class='ctx'> 		bus_addr = desc-&gt;dst_addr;</div><div class='hunk'>@@ -443,7 +458,7 @@ static int m2m_hw_setup(struct ep93xx_dma_chan *edmac)</div><div class='ctx'> 		control = (5 &lt;&lt; M2M_CONTROL_PWSC_SHIFT);</div><div class='ctx'> 		control |= M2M_CONTROL_NO_HDSK;</div><div class='ctx'> </div><div class='del'>-		if (data-&gt;direction == DMA_TO_DEVICE) {</div><div class='add'>+		if (data-&gt;direction == DMA_MEM_TO_DEV) {</div><div class='ctx'> 			control |= M2M_CONTROL_DAH;</div><div class='ctx'> 			control |= M2M_CONTROL_TM_TX;</div><div class='ctx'> 			control |= M2M_CONTROL_RSS_SSPTX;</div><div class='hunk'>@@ -459,11 +474,7 @@ static int m2m_hw_setup(struct ep93xx_dma_chan *edmac)</div><div class='ctx'> 		 * This IDE part is totally untested. Values below are taken</div><div class='ctx'> 		 * from the EP93xx Users's Guide and might not be correct.</div><div class='ctx'> 		 */</div><div class='del'>-		control |= M2M_CONTROL_NO_HDSK;</div><div class='del'>-		control |= M2M_CONTROL_RSS_IDE;</div><div class='del'>-		control |= M2M_CONTROL_PW_16;</div><div class='del'>-</div><div class='del'>-		if (data-&gt;direction == DMA_TO_DEVICE) {</div><div class='add'>+		if (data-&gt;direction == DMA_MEM_TO_DEV) {</div><div class='ctx'> 			/* Worst case from the UG */</div><div class='ctx'> 			control = (3 &lt;&lt; M2M_CONTROL_PWSC_SHIFT);</div><div class='ctx'> 			control |= M2M_CONTROL_DAH;</div><div class='hunk'>@@ -473,6 +484,10 @@ static int m2m_hw_setup(struct ep93xx_dma_chan *edmac)</div><div class='ctx'> 			control |= M2M_CONTROL_SAH;</div><div class='ctx'> 			control |= M2M_CONTROL_TM_RX;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		control |= M2M_CONTROL_NO_HDSK;</div><div class='add'>+		control |= M2M_CONTROL_RSS_IDE;</div><div class='add'>+		control |= M2M_CONTROL_PW_16;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -491,7 +506,13 @@ static void m2m_hw_shutdown(struct ep93xx_dma_chan *edmac)</div><div class='ctx'> </div><div class='ctx'> static void m2m_fill_desc(struct ep93xx_dma_chan *edmac)</div><div class='ctx'> {</div><div class='del'>-	struct ep93xx_dma_desc *desc = ep93xx_dma_get_active(edmac);</div><div class='add'>+	struct ep93xx_dma_desc *desc;</div><div class='add'>+</div><div class='add'>+	desc = ep93xx_dma_get_active(edmac);</div><div class='add'>+	if (!desc) {</div><div class='add'>+		dev_warn(chan2dev(edmac), "M2M: empty descriptor list\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (edmac-&gt;buffer == 0) {</div><div class='ctx'> 		writel(desc-&gt;src_addr, edmac-&gt;regs + M2M_SAR_BASE0);</div><div class='hunk'>@@ -669,24 +690,30 @@ static void ep93xx_dma_tasklet(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ep93xx_dma_chan *edmac = (struct ep93xx_dma_chan *)data;</div><div class='ctx'> 	struct ep93xx_dma_desc *desc, *d;</div><div class='del'>-	dma_async_tx_callback callback;</div><div class='del'>-	void *callback_param;</div><div class='add'>+	dma_async_tx_callback callback = NULL;</div><div class='add'>+	void *callback_param = NULL;</div><div class='ctx'> 	LIST_HEAD(list);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;edmac-&gt;lock);</div><div class='add'>+	/*</div><div class='add'>+	 * If dma_terminate_all() was called before we get to run, the active</div><div class='add'>+	 * list has become empty. If that happens we aren't supposed to do</div><div class='add'>+	 * anything more than call ep93xx_dma_advance_work().</div><div class='add'>+	 */</div><div class='ctx'> 	desc = ep93xx_dma_get_active(edmac);</div><div class='del'>-	if (desc-&gt;complete) {</div><div class='del'>-		edmac-&gt;last_completed = desc-&gt;txd.cookie;</div><div class='del'>-		list_splice_init(&amp;edmac-&gt;active, &amp;list);</div><div class='add'>+	if (desc) {</div><div class='add'>+		if (desc-&gt;complete) {</div><div class='add'>+			edmac-&gt;last_completed = desc-&gt;txd.cookie;</div><div class='add'>+			list_splice_init(&amp;edmac-&gt;active, &amp;list);</div><div class='add'>+		}</div><div class='add'>+		callback = desc-&gt;txd.callback;</div><div class='add'>+		callback_param = desc-&gt;txd.callback_param;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irq(&amp;edmac-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Pick up the next descriptor from the queue */</div><div class='ctx'> 	ep93xx_dma_advance_work(edmac);</div><div class='ctx'> </div><div class='del'>-	callback = desc-&gt;txd.callback;</div><div class='del'>-	callback_param = desc-&gt;txd.callback_param;</div><div class='del'>-</div><div class='ctx'> 	/* Now we can release all the chained descriptors */</div><div class='ctx'> 	list_for_each_entry_safe(desc, d, &amp;list, node) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -706,13 +733,22 @@ static void ep93xx_dma_tasklet(unsigned long data)</div><div class='ctx'> static irqreturn_t ep93xx_dma_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct ep93xx_dma_chan *edmac = dev_id;</div><div class='add'>+	struct ep93xx_dma_desc *desc;</div><div class='ctx'> 	irqreturn_t ret = IRQ_HANDLED;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;edmac-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	desc = ep93xx_dma_get_active(edmac);</div><div class='add'>+	if (!desc) {</div><div class='add'>+		dev_warn(chan2dev(edmac),</div><div class='add'>+			 "got interrupt while active list is empty\n");</div><div class='add'>+		spin_unlock(&amp;edmac-&gt;lock);</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	switch (edmac-&gt;edma-&gt;hw_interrupt(edmac)) {</div><div class='ctx'> 	case INTERRUPT_DONE:</div><div class='del'>-		ep93xx_dma_get_active(edmac)-&gt;complete = true;</div><div class='add'>+		desc-&gt;complete = true;</div><div class='ctx'> 		tasklet_schedule(&amp;edmac-&gt;tasklet);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -803,8 +839,8 @@ static int ep93xx_dma_alloc_chan_resources(struct dma_chan *chan)</div><div class='ctx'> 			switch (data-&gt;port) {</div><div class='ctx'> 			case EP93XX_DMA_SSP:</div><div class='ctx'> 			case EP93XX_DMA_IDE:</div><div class='del'>-				if (data-&gt;direction != DMA_TO_DEVICE &amp;&amp;</div><div class='del'>-				    data-&gt;direction != DMA_FROM_DEVICE)</div><div class='add'>+				if (data-&gt;direction != DMA_MEM_TO_DEV &amp;&amp;</div><div class='add'>+				    data-&gt;direction != DMA_DEV_TO_MEM)</div><div class='ctx'> 					return -EINVAL;</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='hunk'>@@ -952,7 +988,7 @@ fail:</div><div class='ctx'>  */</div><div class='ctx'> static struct dma_async_tx_descriptor *</div><div class='ctx'> ep93xx_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,</div><div class='del'>-			 unsigned int sg_len, enum dma_data_direction dir,</div><div class='add'>+			 unsigned int sg_len, enum dma_transfer_direction dir,</div><div class='ctx'> 			 unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan);</div><div class='hunk'>@@ -988,7 +1024,7 @@ ep93xx_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (dir == DMA_TO_DEVICE) {</div><div class='add'>+		if (dir == DMA_MEM_TO_DEV) {</div><div class='ctx'> 			desc-&gt;src_addr = sg_dma_address(sg);</div><div class='ctx'> 			desc-&gt;dst_addr = edmac-&gt;runtime_addr;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1032,7 +1068,7 @@ fail:</div><div class='ctx'> static struct dma_async_tx_descriptor *</div><div class='ctx'> ep93xx_dma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr,</div><div class='ctx'> 			   size_t buf_len, size_t period_len,</div><div class='del'>-			   enum dma_data_direction dir)</div><div class='add'>+			   enum dma_transfer_direction dir)</div><div class='ctx'> {</div><div class='ctx'> 	struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan);</div><div class='ctx'> 	struct ep93xx_dma_desc *desc, *first;</div><div class='hunk'>@@ -1065,7 +1101,7 @@ ep93xx_dma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr,</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (dir == DMA_TO_DEVICE) {</div><div class='add'>+		if (dir == DMA_MEM_TO_DEV) {</div><div class='ctx'> 			desc-&gt;src_addr = dma_addr + offset;</div><div class='ctx'> 			desc-&gt;dst_addr = edmac-&gt;runtime_addr;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1133,12 +1169,12 @@ static int ep93xx_dma_slave_config(struct ep93xx_dma_chan *edmac,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (config-&gt;direction) {</div><div class='del'>-	case DMA_FROM_DEVICE:</div><div class='add'>+	case DMA_DEV_TO_MEM:</div><div class='ctx'> 		width = config-&gt;src_addr_width;</div><div class='ctx'> 		addr = config-&gt;src_addr;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case DMA_TO_DEVICE:</div><div class='add'>+	case DMA_MEM_TO_DEV:</div><div class='ctx'> 		width = config-&gt;dst_addr_width;</div><div class='ctx'> 		addr = config-&gt;dst_addr;</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c<br/>index 8a781540590c..b98070c33ca9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/fsldma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/fsldma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/fsldma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/fsldma.c</a></div><div class='hunk'>@@ -772,7 +772,7 @@ fail:</div><div class='ctx'>  */</div><div class='ctx'> static struct dma_async_tx_descriptor *fsl_dma_prep_slave_sg(</div><div class='ctx'> 	struct dma_chan *dchan, struct scatterlist *sgl, unsigned int sg_len,</div><div class='del'>-	enum dma_data_direction direction, unsigned long flags)</div><div class='add'>+	enum dma_transfer_direction direction, unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This operation is not supported on the Freescale DMA controller</div><div class='hunk'>@@ -819,7 +819,7 @@ static int fsl_dma_device_control(struct dma_chan *dchan,</div><div class='ctx'> 			return -ENXIO;</div><div class='ctx'> </div><div class='ctx'> 		/* we set the controller burst size depending on direction */</div><div class='del'>-		if (config-&gt;direction == DMA_TO_DEVICE)</div><div class='add'>+		if (config-&gt;direction == DMA_MEM_TO_DEV)</div><div class='ctx'> 			size = config-&gt;dst_addr_width * config-&gt;dst_maxburst;</div><div class='ctx'> 		else</div><div class='ctx'> 			size = config-&gt;src_addr_width * config-&gt;src_maxburst;</div><div class='head'>diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c<br/>index 4be55f9bb6c1..e4383ee2c9ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/imx-dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/imx-dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/imx-dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/imx-dma.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ static int imxdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,</div><div class='ctx'> 		imx_dma_disable(imxdmac-&gt;imxdma_channel);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case DMA_SLAVE_CONFIG:</div><div class='del'>-		if (dmaengine_cfg-&gt;direction == DMA_FROM_DEVICE) {</div><div class='add'>+		if (dmaengine_cfg-&gt;direction == DMA_DEV_TO_MEM) {</div><div class='ctx'> 			imxdmac-&gt;per_address = dmaengine_cfg-&gt;src_addr;</div><div class='ctx'> 			imxdmac-&gt;watermark_level = dmaengine_cfg-&gt;src_maxburst;</div><div class='ctx'> 			imxdmac-&gt;word_size = dmaengine_cfg-&gt;src_addr_width;</div><div class='hunk'>@@ -224,7 +224,7 @@ static void imxdma_free_chan_resources(struct dma_chan *chan)</div><div class='ctx'> </div><div class='ctx'> static struct dma_async_tx_descriptor *imxdma_prep_slave_sg(</div><div class='ctx'> 		struct dma_chan *chan, struct scatterlist *sgl,</div><div class='del'>-		unsigned int sg_len, enum dma_data_direction direction,</div><div class='add'>+		unsigned int sg_len, enum dma_transfer_direction direction,</div><div class='ctx'> 		unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct imxdma_channel *imxdmac = to_imxdma_chan(chan);</div><div class='hunk'>@@ -241,7 +241,7 @@ static struct dma_async_tx_descriptor *imxdma_prep_slave_sg(</div><div class='ctx'> 		dma_length += sg-&gt;length;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (direction == DMA_FROM_DEVICE)</div><div class='add'>+	if (direction == DMA_DEV_TO_MEM)</div><div class='ctx'> 		dmamode = DMA_MODE_READ;</div><div class='ctx'> 	else</div><div class='ctx'> 		dmamode = DMA_MODE_WRITE;</div><div class='hunk'>@@ -271,7 +271,7 @@ static struct dma_async_tx_descriptor *imxdma_prep_slave_sg(</div><div class='ctx'> </div><div class='ctx'> static struct dma_async_tx_descriptor *imxdma_prep_dma_cyclic(</div><div class='ctx'> 		struct dma_chan *chan, dma_addr_t dma_addr, size_t buf_len,</div><div class='del'>-		size_t period_len, enum dma_data_direction direction)</div><div class='add'>+		size_t period_len, enum dma_transfer_direction direction)</div><div class='ctx'> {</div><div class='ctx'> 	struct imxdma_channel *imxdmac = to_imxdma_chan(chan);</div><div class='ctx'> 	struct imxdma_engine *imxdma = imxdmac-&gt;imxdma;</div><div class='hunk'>@@ -317,7 +317,7 @@ static struct dma_async_tx_descriptor *imxdma_prep_dma_cyclic(</div><div class='ctx'> 	imxdmac-&gt;sg_list[periods].page_link =</div><div class='ctx'> 		((unsigned long)imxdmac-&gt;sg_list | 0x01) &amp; ~0x02;</div><div class='ctx'> </div><div class='del'>-	if (direction == DMA_FROM_DEVICE)</div><div class='add'>+	if (direction == DMA_DEV_TO_MEM)</div><div class='ctx'> 		dmamode = DMA_MODE_READ;</div><div class='ctx'> 	else</div><div class='ctx'> 		dmamode = DMA_MODE_WRITE;</div><div class='head'>diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c<br/>index f993955a640c..a8af379680c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/imx-sdma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/imx-sdma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/imx-sdma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/imx-sdma.c</a></div><div class='hunk'>@@ -247,7 +247,7 @@ struct sdma_engine;</div><div class='ctx'> struct sdma_channel {</div><div class='ctx'> 	struct sdma_engine		*sdma;</div><div class='ctx'> 	unsigned int			channel;</div><div class='del'>-	enum dma_data_direction		direction;</div><div class='add'>+	enum dma_transfer_direction		direction;</div><div class='ctx'> 	enum sdma_peripheral_type	peripheral_type;</div><div class='ctx'> 	unsigned int			event_id0;</div><div class='ctx'> 	unsigned int			event_id1;</div><div class='hunk'>@@ -268,6 +268,8 @@ struct sdma_channel {</div><div class='ctx'> 	struct dma_async_tx_descriptor	desc;</div><div class='ctx'> 	dma_cookie_t			last_completed;</div><div class='ctx'> 	enum dma_status			status;</div><div class='add'>+	unsigned int			chn_count;</div><div class='add'>+	unsigned int			chn_real_count;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IMX_DMA_SG_LOOP		(1 &lt;&lt; 0)</div><div class='hunk'>@@ -503,6 +505,7 @@ static void mxc_sdma_handle_channel_normal(struct sdma_channel *sdmac)</div><div class='ctx'> 	struct sdma_buffer_descriptor *bd;</div><div class='ctx'> 	int i, error = 0;</div><div class='ctx'> </div><div class='add'>+	sdmac-&gt;chn_real_count = 0;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * non loop mode. Iterate over all descriptors, collect</div><div class='ctx'> 	 * errors and call callback function</div><div class='hunk'>@@ -512,6 +515,7 @@ static void mxc_sdma_handle_channel_normal(struct sdma_channel *sdmac)</div><div class='ctx'> </div><div class='ctx'> 		 if (bd-&gt;mode.status &amp; (BD_DONE | BD_RROR))</div><div class='ctx'> 			error = -EIO;</div><div class='add'>+		 sdmac-&gt;chn_real_count += bd-&gt;mode.count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (error)</div><div class='hunk'>@@ -519,9 +523,9 @@ static void mxc_sdma_handle_channel_normal(struct sdma_channel *sdmac)</div><div class='ctx'> 	else</div><div class='ctx'> 		sdmac-&gt;status = DMA_SUCCESS;</div><div class='ctx'> </div><div class='add'>+	sdmac-&gt;last_completed = sdmac-&gt;desc.cookie;</div><div class='ctx'> 	if (sdmac-&gt;desc.callback)</div><div class='ctx'> 		sdmac-&gt;desc.callback(sdmac-&gt;desc.callback_param);</div><div class='del'>-	sdmac-&gt;last_completed = sdmac-&gt;desc.cookie;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mxc_sdma_handle_channel(struct sdma_channel *sdmac)</div><div class='hunk'>@@ -650,7 +654,7 @@ static int sdma_load_context(struct sdma_channel *sdmac)</div><div class='ctx'> 	struct sdma_buffer_descriptor *bd0 = sdma-&gt;channel[0].bd;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (sdmac-&gt;direction == DMA_FROM_DEVICE) {</div><div class='add'>+	if (sdmac-&gt;direction == DMA_DEV_TO_MEM) {</div><div class='ctx'> 		load_address = sdmac-&gt;pc_from_device;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		load_address = sdmac-&gt;pc_to_device;</div><div class='hunk'>@@ -832,17 +836,18 @@ static struct sdma_channel *to_sdma_chan(struct dma_chan *chan)</div><div class='ctx'> </div><div class='ctx'> static dma_cookie_t sdma_tx_submit(struct dma_async_tx_descriptor *tx)</div><div class='ctx'> {</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	struct sdma_channel *sdmac = to_sdma_chan(tx-&gt;chan);</div><div class='ctx'> 	struct sdma_engine *sdma = sdmac-&gt;sdma;</div><div class='ctx'> 	dma_cookie_t cookie;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;sdmac-&gt;lock);</div><div class='add'>+	spin_lock_irqsave(&amp;sdmac-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	cookie = sdma_assign_cookie(sdmac);</div><div class='ctx'> </div><div class='ctx'> 	sdma_enable_channel(sdma, sdmac-&gt;channel);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;sdmac-&gt;lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;sdmac-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return cookie;</div><div class='ctx'> }</div><div class='hunk'>@@ -911,7 +916,7 @@ static void sdma_free_chan_resources(struct dma_chan *chan)</div><div class='ctx'> </div><div class='ctx'> static struct dma_async_tx_descriptor *sdma_prep_slave_sg(</div><div class='ctx'> 		struct dma_chan *chan, struct scatterlist *sgl,</div><div class='del'>-		unsigned int sg_len, enum dma_data_direction direction,</div><div class='add'>+		unsigned int sg_len, enum dma_transfer_direction direction,</div><div class='ctx'> 		unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdma_channel *sdmac = to_sdma_chan(chan);</div><div class='hunk'>@@ -941,6 +946,7 @@ static struct dma_async_tx_descriptor *sdma_prep_slave_sg(</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	sdmac-&gt;chn_count = 0;</div><div class='ctx'> 	for_each_sg(sgl, sg, sg_len, i) {</div><div class='ctx'> 		struct sdma_buffer_descriptor *bd = &amp;sdmac-&gt;bd[i];</div><div class='ctx'> 		int param;</div><div class='hunk'>@@ -957,6 +963,7 @@ static struct dma_async_tx_descriptor *sdma_prep_slave_sg(</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		bd-&gt;mode.count = count;</div><div class='add'>+		sdmac-&gt;chn_count += count;</div><div class='ctx'> </div><div class='ctx'> 		if (sdmac-&gt;word_size &gt; DMA_SLAVE_BUSWIDTH_4_BYTES) {</div><div class='ctx'> 			ret =  -EINVAL;</div><div class='hunk'>@@ -1008,7 +1015,7 @@ err_out:</div><div class='ctx'> </div><div class='ctx'> static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic(</div><div class='ctx'> 		struct dma_chan *chan, dma_addr_t dma_addr, size_t buf_len,</div><div class='del'>-		size_t period_len, enum dma_data_direction direction)</div><div class='add'>+		size_t period_len, enum dma_transfer_direction direction)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdma_channel *sdmac = to_sdma_chan(chan);</div><div class='ctx'> 	struct sdma_engine *sdma = sdmac-&gt;sdma;</div><div class='hunk'>@@ -1093,7 +1100,7 @@ static int sdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,</div><div class='ctx'> 		sdma_disable_channel(sdmac);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case DMA_SLAVE_CONFIG:</div><div class='del'>-		if (dmaengine_cfg-&gt;direction == DMA_FROM_DEVICE) {</div><div class='add'>+		if (dmaengine_cfg-&gt;direction == DMA_DEV_TO_MEM) {</div><div class='ctx'> 			sdmac-&gt;per_address = dmaengine_cfg-&gt;src_addr;</div><div class='ctx'> 			sdmac-&gt;watermark_level = dmaengine_cfg-&gt;src_maxburst;</div><div class='ctx'> 			sdmac-&gt;word_size = dmaengine_cfg-&gt;src_addr_width;</div><div class='hunk'>@@ -1102,6 +1109,7 @@ static int sdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,</div><div class='ctx'> 			sdmac-&gt;watermark_level = dmaengine_cfg-&gt;dst_maxburst;</div><div class='ctx'> 			sdmac-&gt;word_size = dmaengine_cfg-&gt;dst_addr_width;</div><div class='ctx'> 		}</div><div class='add'>+		sdmac-&gt;direction = dmaengine_cfg-&gt;direction;</div><div class='ctx'> 		return sdma_config_channel(sdmac);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOSYS;</div><div class='hunk'>@@ -1119,7 +1127,8 @@ static enum dma_status sdma_tx_status(struct dma_chan *chan,</div><div class='ctx'> </div><div class='ctx'> 	last_used = chan-&gt;cookie;</div><div class='ctx'> </div><div class='del'>-	dma_set_tx_state(txstate, sdmac-&gt;last_completed, last_used, 0);</div><div class='add'>+	dma_set_tx_state(txstate, sdmac-&gt;last_completed, last_used,</div><div class='add'>+			sdmac-&gt;chn_count - sdmac-&gt;chn_real_count);</div><div class='ctx'> </div><div class='ctx'> 	return sdmac-&gt;status;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c<br/>index 19a0c64d45d3..74f70aadf9e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/intel_mid_dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/intel_mid_dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/intel_mid_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/intel_mid_dma.c</a></div><div class='hunk'>@@ -280,7 +280,8 @@ static void midc_dostart(struct intel_mid_dma_chan *midc,</div><div class='ctx'>  * callbacks but must be called with the lock held.</div><div class='ctx'>  */</div><div class='ctx'> static void midc_descriptor_complete(struct intel_mid_dma_chan *midc,</div><div class='del'>-	       struct intel_mid_dma_desc *desc)</div><div class='add'>+		struct intel_mid_dma_desc *desc)</div><div class='add'>+		__releases(&amp;midc-&gt;lock) __acquires(&amp;midc-&gt;lock)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_async_tx_descriptor	*txd = &amp;desc-&gt;txd;</div><div class='ctx'> 	dma_async_tx_callback callback_txd = NULL;</div><div class='hunk'>@@ -311,6 +312,7 @@ static void midc_descriptor_complete(struct intel_mid_dma_chan *midc,</div><div class='ctx'> 			pci_pool_free(desc-&gt;lli_pool, desc-&gt;lli,</div><div class='ctx'> 						desc-&gt;lli_phys);</div><div class='ctx'> 			pci_pool_destroy(desc-&gt;lli_pool);</div><div class='add'>+			desc-&gt;lli = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		list_move(&amp;desc-&gt;desc_node, &amp;midc-&gt;free_list);</div><div class='ctx'> 		midc-&gt;busy = false;</div><div class='hunk'>@@ -395,10 +397,10 @@ static int midc_lli_fill_sg(struct intel_mid_dma_chan *midc,</div><div class='ctx'> 							midc-&gt;dma-&gt;block_size);</div><div class='ctx'> 		/*Populate SAR and DAR values*/</div><div class='ctx'> 		sg_phy_addr = sg_phys(sg);</div><div class='del'>-		if (desc-&gt;dirn ==  DMA_TO_DEVICE) {</div><div class='add'>+		if (desc-&gt;dirn ==  DMA_MEM_TO_DEV) {</div><div class='ctx'> 			lli_bloc_desc-&gt;sar  = sg_phy_addr;</div><div class='ctx'> 			lli_bloc_desc-&gt;dar  = mids-&gt;dma_slave.dst_addr;</div><div class='del'>-		} else if (desc-&gt;dirn ==  DMA_FROM_DEVICE) {</div><div class='add'>+		} else if (desc-&gt;dirn ==  DMA_DEV_TO_MEM) {</div><div class='ctx'> 			lli_bloc_desc-&gt;sar  = mids-&gt;dma_slave.src_addr;</div><div class='ctx'> 			lli_bloc_desc-&gt;dar  = sg_phy_addr;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -490,7 +492,9 @@ static enum dma_status intel_mid_dma_tx_status(struct dma_chan *chan,</div><div class='ctx'> </div><div class='ctx'> 	ret = dma_async_is_complete(cookie, last_complete, last_used);</div><div class='ctx'> 	if (ret != DMA_SUCCESS) {</div><div class='add'>+		spin_lock_bh(&amp;midc-&gt;lock);</div><div class='ctx'> 		midc_scan_descriptors(to_middma_device(chan-&gt;device), midc);</div><div class='add'>+		spin_unlock_bh(&amp;midc-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		last_complete = midc-&gt;completed;</div><div class='ctx'> 		last_used = chan-&gt;cookie;</div><div class='hunk'>@@ -566,6 +570,7 @@ static int intel_mid_dma_device_control(struct dma_chan *chan,</div><div class='ctx'> 			pci_pool_free(desc-&gt;lli_pool, desc-&gt;lli,</div><div class='ctx'> 						desc-&gt;lli_phys);</div><div class='ctx'> 			pci_pool_destroy(desc-&gt;lli_pool);</div><div class='add'>+			desc-&gt;lli = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		list_move(&amp;desc-&gt;desc_node, &amp;midc-&gt;free_list);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -632,13 +637,13 @@ static struct dma_async_tx_descriptor *intel_mid_dma_prep_memcpy(</div><div class='ctx'> 		if (midc-&gt;dma-&gt;pimr_mask) {</div><div class='ctx'> 			cfg_hi.cfgx.protctl = 0x0; /*default value*/</div><div class='ctx'> 			cfg_hi.cfgx.fifo_mode = 1;</div><div class='del'>-			if (mids-&gt;dma_slave.direction == DMA_TO_DEVICE) {</div><div class='add'>+			if (mids-&gt;dma_slave.direction == DMA_MEM_TO_DEV) {</div><div class='ctx'> 				cfg_hi.cfgx.src_per = 0;</div><div class='ctx'> 				if (mids-&gt;device_instance == 0)</div><div class='ctx'> 					cfg_hi.cfgx.dst_per = 3;</div><div class='ctx'> 				if (mids-&gt;device_instance == 1)</div><div class='ctx'> 					cfg_hi.cfgx.dst_per = 1;</div><div class='del'>-			} else if (mids-&gt;dma_slave.direction == DMA_FROM_DEVICE) {</div><div class='add'>+			} else if (mids-&gt;dma_slave.direction == DMA_DEV_TO_MEM) {</div><div class='ctx'> 				if (mids-&gt;device_instance == 0)</div><div class='ctx'> 					cfg_hi.cfgx.src_per = 2;</div><div class='ctx'> 				if (mids-&gt;device_instance == 1)</div><div class='hunk'>@@ -682,11 +687,11 @@ static struct dma_async_tx_descriptor *intel_mid_dma_prep_memcpy(</div><div class='ctx'> 		ctl_lo.ctlx.sinc = 0;</div><div class='ctx'> 		ctl_lo.ctlx.dinc = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (mids-&gt;dma_slave.direction == DMA_TO_DEVICE) {</div><div class='add'>+		if (mids-&gt;dma_slave.direction == DMA_MEM_TO_DEV) {</div><div class='ctx'> 			ctl_lo.ctlx.sinc = 0;</div><div class='ctx'> 			ctl_lo.ctlx.dinc = 2;</div><div class='ctx'> 			ctl_lo.ctlx.tt_fc = 1;</div><div class='del'>-		} else if (mids-&gt;dma_slave.direction == DMA_FROM_DEVICE) {</div><div class='add'>+		} else if (mids-&gt;dma_slave.direction == DMA_DEV_TO_MEM) {</div><div class='ctx'> 			ctl_lo.ctlx.sinc = 2;</div><div class='ctx'> 			ctl_lo.ctlx.dinc = 0;</div><div class='ctx'> 			ctl_lo.ctlx.tt_fc = 2;</div><div class='hunk'>@@ -732,7 +737,7 @@ err_desc_get:</div><div class='ctx'>  */</div><div class='ctx'> static struct dma_async_tx_descriptor *intel_mid_dma_prep_slave_sg(</div><div class='ctx'> 			struct dma_chan *chan, struct scatterlist *sgl,</div><div class='del'>-			unsigned int sg_len, enum dma_data_direction direction,</div><div class='add'>+			unsigned int sg_len, enum dma_transfer_direction direction,</div><div class='ctx'> 			unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct intel_mid_dma_chan *midc = NULL;</div><div class='hunk'>@@ -868,7 +873,7 @@ static int intel_mid_dma_alloc_chan_resources(struct dma_chan *chan)</div><div class='ctx'> 	pm_runtime_get_sync(&amp;mid-&gt;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (mid-&gt;state == SUSPENDED) {</div><div class='del'>-		if (dma_resume(mid-&gt;pdev)) {</div><div class='add'>+		if (dma_resume(&amp;mid-&gt;pdev-&gt;dev)) {</div><div class='ctx'> 			pr_err("ERR_MDMA: resume failed");</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1099,7 +1104,8 @@ static int mid_setup_dma(struct pci_dev *pdev)</div><div class='ctx'> 					LNW_PERIPHRAL_MASK_SIZE);</div><div class='ctx'> 		if (dma-&gt;mask_reg == NULL) {</div><div class='ctx'> 			pr_err("ERR_MDMA:Can't map periphral intr space !!\n");</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_ioremap;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='ctx'> 		dma-&gt;mask_reg = NULL;</div><div class='hunk'>@@ -1196,6 +1202,9 @@ static int mid_setup_dma(struct pci_dev *pdev)</div><div class='ctx'> err_engine:</div><div class='ctx'> 	free_irq(pdev-&gt;irq, dma);</div><div class='ctx'> err_irq:</div><div class='add'>+	if (dma-&gt;mask_reg)</div><div class='add'>+		iounmap(dma-&gt;mask_reg);</div><div class='add'>+err_ioremap:</div><div class='ctx'> 	pci_pool_destroy(dma-&gt;dma_pool);</div><div class='ctx'> err_dma_pool:</div><div class='ctx'> 	pr_err("ERR_MDMA:setup_dma failed: %d\n", err);</div><div class='hunk'>@@ -1337,8 +1346,9 @@ static void __devexit intel_mid_dma_remove(struct pci_dev *pdev)</div><div class='ctx'> *</div><div class='ctx'> * This function is called by OS when a power event occurs</div><div class='ctx'> */</div><div class='del'>-int dma_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+static int dma_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct pci_dev *pci = to_pci_dev(dev);</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct middma_device *device = pci_get_drvdata(pci);</div><div class='ctx'> 	pr_debug("MDMA: dma_suspend called\n");</div><div class='hunk'>@@ -1362,8 +1372,9 @@ int dma_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='ctx'> *</div><div class='ctx'> * This function is called by OS when a power event occurs</div><div class='ctx'> */</div><div class='del'>-int dma_resume(struct pci_dev *pci)</div><div class='add'>+int dma_resume(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct pci_dev *pci = to_pci_dev(dev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct middma_device *device = pci_get_drvdata(pci);</div><div class='ctx'> </div><div class='hunk'>@@ -1429,6 +1440,8 @@ static const struct dev_pm_ops intel_mid_dma_pm = {</div><div class='ctx'> 	.runtime_suspend = dma_runtime_suspend,</div><div class='ctx'> 	.runtime_resume = dma_runtime_resume,</div><div class='ctx'> 	.runtime_idle = dma_runtime_idle,</div><div class='add'>+	.suspend = dma_suspend,</div><div class='add'>+	.resume = dma_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver intel_mid_dma_pci_driver = {</div><div class='hunk'>@@ -1437,8 +1450,6 @@ static struct pci_driver intel_mid_dma_pci_driver = {</div><div class='ctx'> 	.probe		=	intel_mid_dma_probe,</div><div class='ctx'> 	.remove		=	__devexit_p(intel_mid_dma_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='del'>-	.suspend = dma_suspend,</div><div class='del'>-	.resume = dma_resume,</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.pm = &amp;intel_mid_dma_pm,</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/dma/intel_mid_dma_regs.h b/drivers/dma/intel_mid_dma_regs.h<br/>index aea5ee88ce03..c83d35b97bd8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/intel_mid_dma_regs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/intel_mid_dma_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/intel_mid_dma_regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/intel_mid_dma_regs.h</a></div><div class='hunk'>@@ -262,7 +262,7 @@ struct intel_mid_dma_desc {</div><div class='ctx'> 	unsigned int			lli_length;</div><div class='ctx'> 	unsigned int			current_lli;</div><div class='ctx'> 	dma_addr_t			next;</div><div class='del'>-	enum dma_data_direction		dirn;</div><div class='add'>+	enum dma_transfer_direction		dirn;</div><div class='ctx'> 	enum dma_status			status;</div><div class='ctx'> 	enum dma_slave_buswidth		width; /*width of DMA txn*/</div><div class='ctx'> 	enum intel_mid_dma_mode		cfg_mode; /*mode configuration*/</div><div class='hunk'>@@ -296,6 +296,6 @@ static inline struct intel_mid_dma_slave *to_intel_mid_dma_slave</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int dma_resume(struct pci_dev *pci);</div><div class='add'>+int dma_resume(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> #endif /*__INTEL_MID_DMAC_REGS_H__*/</div><div class='head'>diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c<br/>index e03f811a83dd..04be90b645b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/iop-adma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/iop-adma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/iop-adma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/iop-adma.c</a></div><div class='hunk'>@@ -1735,8 +1735,6 @@ static void iop_chan_start_null_xor(struct iop_adma_chan *iop_chan)</div><div class='ctx'> 	spin_unlock_bh(&amp;iop_chan-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-MODULE_ALIAS("platform:iop-adma");</div><div class='del'>-</div><div class='ctx'> static struct platform_driver iop_adma_driver = {</div><div class='ctx'> 	.probe		= iop_adma_probe,</div><div class='ctx'> 	.remove		= __devexit_p(iop_adma_remove),</div><div class='hunk'>@@ -1746,19 +1744,9 @@ static struct platform_driver iop_adma_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init iop_adma_init (void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;iop_adma_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit iop_adma_exit (void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;iop_adma_driver);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-module_exit(iop_adma_exit);</div><div class='del'>-module_init(iop_adma_init);</div><div class='add'>+module_platform_driver(iop_adma_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Intel Corporation");</div><div class='ctx'> MODULE_DESCRIPTION("IOP ADMA Engine Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("platform:iop-adma");</div><div class='head'>diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c<br/>index 0e5ef33f90a1..6212b16e8cf2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/ipu/ipu_idmac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/ipu/ipu_idmac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/ipu/ipu_idmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/ipu/ipu_idmac.c</a></div><div class='hunk'>@@ -312,7 +312,7 @@ static void ipu_ch_param_set_size(union chan_param_mem *params,</div><div class='ctx'> 	case IPU_PIX_FMT_RGB565:</div><div class='ctx'> 		params-&gt;ip.bpp	= 2;</div><div class='ctx'> 		params-&gt;ip.pfs	= 4;</div><div class='del'>-		params-&gt;ip.npb	= 7;</div><div class='add'>+		params-&gt;ip.npb	= 15;</div><div class='ctx'> 		params-&gt;ip.sat	= 2;		/* SAT = 32-bit access */</div><div class='ctx'> 		params-&gt;ip.ofs0	= 0;		/* Red bit offset */</div><div class='ctx'> 		params-&gt;ip.ofs1	= 5;		/* Green bit offset */</div><div class='hunk'>@@ -422,12 +422,6 @@ static void ipu_ch_param_set_size(union chan_param_mem *params,</div><div class='ctx'> 	params-&gt;pp.nsb = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ipu_ch_param_set_burst_size(union chan_param_mem *params,</div><div class='del'>-					uint16_t burst_pixels)</div><div class='del'>-{</div><div class='del'>-	params-&gt;pp.npb = burst_pixels - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void ipu_ch_param_set_buffer(union chan_param_mem *params,</div><div class='ctx'> 				    dma_addr_t buf0, dma_addr_t buf1)</div><div class='ctx'> {</div><div class='hunk'>@@ -690,23 +684,6 @@ static int ipu_init_channel_buffer(struct idmac_channel *ichan,</div><div class='ctx'> 	ipu_ch_param_set_size(&amp;params, pixel_fmt, width, height, stride_bytes);</div><div class='ctx'> 	ipu_ch_param_set_buffer(&amp;params, phyaddr_0, phyaddr_1);</div><div class='ctx'> 	ipu_ch_param_set_rotation(&amp;params, rot_mode);</div><div class='del'>-	/* Some channels (rotation) have restriction on burst length */</div><div class='del'>-	switch (channel) {</div><div class='del'>-	case IDMAC_IC_7:	/* Hangs with burst 8, 16, other values</div><div class='del'>-				   invalid - Table 44-30 */</div><div class='del'>-/*</div><div class='del'>-		ipu_ch_param_set_burst_size(&amp;params, 8);</div><div class='del'>- */</div><div class='del'>-		break;</div><div class='del'>-	case IDMAC_SDC_0:</div><div class='del'>-	case IDMAC_SDC_1:</div><div class='del'>-		/* In original code only IPU_PIX_FMT_RGB565 was setting burst */</div><div class='del'>-		ipu_ch_param_set_burst_size(&amp;params, 16);</div><div class='del'>-		break;</div><div class='del'>-	case IDMAC_IC_0:</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;ipu-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1364,7 +1341,7 @@ static void ipu_gc_tasklet(unsigned long arg)</div><div class='ctx'> /* Allocate and initialise a transfer descriptor. */</div><div class='ctx'> static struct dma_async_tx_descriptor *idmac_prep_slave_sg(struct dma_chan *chan,</div><div class='ctx'> 		struct scatterlist *sgl, unsigned int sg_len,</div><div class='del'>-		enum dma_data_direction direction, unsigned long tx_flags)</div><div class='add'>+		enum dma_transfer_direction direction, unsigned long tx_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct idmac_channel *ichan = to_idmac_chan(chan);</div><div class='ctx'> 	struct idmac_tx_desc *desc = NULL;</div><div class='hunk'>@@ -1376,7 +1353,7 @@ static struct dma_async_tx_descriptor *idmac_prep_slave_sg(struct dma_chan *chan</div><div class='ctx'> 	    chan-&gt;chan_id != IDMAC_IC_7)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (direction != DMA_FROM_DEVICE &amp;&amp; direction != DMA_TO_DEVICE) {</div><div class='add'>+	if (direction != DMA_DEV_TO_MEM &amp;&amp; direction != DMA_MEM_TO_DEV) {</div><div class='ctx'> 		dev_err(chan-&gt;device-&gt;dev, "Invalid DMA direction %d!\n", direction);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c<br/>index 8ba4edc6185e..4d6d4cf66949 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/mpc512x_dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/mpc512x_dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/mpc512x_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/mpc512x_dma.c</a></div><div class='hunk'>@@ -835,17 +835,7 @@ static struct platform_driver mpc_dma_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init mpc_dma_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;mpc_dma_driver);</div><div class='del'>-}</div><div class='del'>-module_init(mpc_dma_init);</div><div class='del'>-</div><div class='del'>-static void __exit mpc_dma_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;mpc_dma_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(mpc_dma_exit);</div><div class='add'>+module_platform_driver(mpc_dma_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Piotr Ziecik &lt;kosmo@semihalf.com&gt;");</div><div class='head'>diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c<br/>index 9a353c2216d0..e779b434af45 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/mv_xor.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/mv_xor.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/mv_xor.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/mv_xor.c</a></div><div class='hunk'>@@ -1250,7 +1250,7 @@ static int __devinit mv_xor_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mv_xor_conf_mbus_windows(struct mv_xor_shared_private *msp,</div><div class='del'>-			 struct mbus_dram_target_info *dram)</div><div class='add'>+			 const struct mbus_dram_target_info *dram)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *base = msp-&gt;xor_base;</div><div class='ctx'> 	u32 win_enable = 0;</div><div class='hunk'>@@ -1264,7 +1264,7 @@ mv_xor_conf_mbus_windows(struct mv_xor_shared_private *msp,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; dram-&gt;num_cs; i++) {</div><div class='del'>-		struct mbus_dram_window *cs = dram-&gt;cs + i;</div><div class='add'>+		const struct mbus_dram_window *cs = dram-&gt;cs + i;</div><div class='ctx'> </div><div class='ctx'> 		writel((cs-&gt;base &amp; 0xffff0000) |</div><div class='ctx'> 		       (cs-&gt;mbus_attr &lt;&lt; 8) |</div><div class='hunk'>@@ -1290,7 +1290,7 @@ static struct platform_driver mv_xor_driver = {</div><div class='ctx'> </div><div class='ctx'> static int mv_xor_shared_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct mv_xor_platform_shared_data *msd = pdev-&gt;dev.platform_data;</div><div class='add'>+	const struct mbus_dram_target_info *dram;</div><div class='ctx'> 	struct mv_xor_shared_private *msp;</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> </div><div class='hunk'>@@ -1323,8 +1323,9 @@ static int mv_xor_shared_probe(struct platform_device *pdev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * (Re-)program MBUS remapping windows if we are asked to.</div><div class='ctx'> 	 */</div><div class='del'>-	if (msd != NULL &amp;&amp; msd-&gt;dram != NULL)</div><div class='del'>-		mv_xor_conf_mbus_windows(msp, msd-&gt;dram);</div><div class='add'>+	dram = mv_mbus_dram_info();</div><div class='add'>+	if (dram)</div><div class='add'>+		mv_xor_conf_mbus_windows(msp, dram);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c<br/>index b4588bdd98bb..b06cd4ca626f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/mxs-dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/mxs-dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/mxs-dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/mxs-dma.c</a></div><div class='hunk'>@@ -44,7 +44,6 @@</div><div class='ctx'> #define HW_APBHX_CTRL0				0x000</div><div class='ctx'> #define BM_APBH_CTRL0_APB_BURST8_EN		(1 &lt;&lt; 29)</div><div class='ctx'> #define BM_APBH_CTRL0_APB_BURST_EN		(1 &lt;&lt; 28)</div><div class='del'>-#define BP_APBH_CTRL0_CLKGATE_CHANNEL		8</div><div class='ctx'> #define BP_APBH_CTRL0_RESET_CHANNEL		16</div><div class='ctx'> #define HW_APBHX_CTRL1				0x010</div><div class='ctx'> #define HW_APBHX_CTRL2				0x020</div><div class='hunk'>@@ -111,6 +110,7 @@ struct mxs_dma_chan {</div><div class='ctx'> 	int				chan_irq;</div><div class='ctx'> 	struct mxs_dma_ccw		*ccw;</div><div class='ctx'> 	dma_addr_t			ccw_phys;</div><div class='add'>+	int				desc_count;</div><div class='ctx'> 	dma_cookie_t			last_completed;</div><div class='ctx'> 	enum dma_status			status;</div><div class='ctx'> 	unsigned int			flags;</div><div class='hunk'>@@ -130,23 +130,6 @@ struct mxs_dma_engine {</div><div class='ctx'> 	struct mxs_dma_chan		mxs_chans[MXS_DMA_CHANNELS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline void mxs_dma_clkgate(struct mxs_dma_chan *mxs_chan, int enable)</div><div class='del'>-{</div><div class='del'>-	struct mxs_dma_engine *mxs_dma = mxs_chan-&gt;mxs_dma;</div><div class='del'>-	int chan_id = mxs_chan-&gt;chan.chan_id;</div><div class='del'>-	int set_clr = enable ? MXS_CLR_ADDR : MXS_SET_ADDR;</div><div class='del'>-</div><div class='del'>-	/* enable apbh channel clock */</div><div class='del'>-	if (dma_is_apbh()) {</div><div class='del'>-		if (apbh_is_old())</div><div class='del'>-			writel(1 &lt;&lt; (chan_id + BP_APBH_CTRL0_CLKGATE_CHANNEL),</div><div class='del'>-				mxs_dma-&gt;base + HW_APBHX_CTRL0 + set_clr);</div><div class='del'>-		else</div><div class='del'>-			writel(1 &lt;&lt; chan_id,</div><div class='del'>-				mxs_dma-&gt;base + HW_APBHX_CTRL0 + set_clr);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void mxs_dma_reset_chan(struct mxs_dma_chan *mxs_chan)</div><div class='ctx'> {</div><div class='ctx'> 	struct mxs_dma_engine *mxs_dma = mxs_chan-&gt;mxs_dma;</div><div class='hunk'>@@ -165,9 +148,6 @@ static void mxs_dma_enable_chan(struct mxs_dma_chan *mxs_chan)</div><div class='ctx'> 	struct mxs_dma_engine *mxs_dma = mxs_chan-&gt;mxs_dma;</div><div class='ctx'> 	int chan_id = mxs_chan-&gt;chan.chan_id;</div><div class='ctx'> </div><div class='del'>-	/* clkgate needs to be enabled before writing other registers */</div><div class='del'>-	mxs_dma_clkgate(mxs_chan, 1);</div><div class='del'>-</div><div class='ctx'> 	/* set cmd_addr up */</div><div class='ctx'> 	writel(mxs_chan-&gt;ccw_phys,</div><div class='ctx'> 		mxs_dma-&gt;base + HW_APBHX_CHn_NXTCMDAR(chan_id));</div><div class='hunk'>@@ -178,9 +158,6 @@ static void mxs_dma_enable_chan(struct mxs_dma_chan *mxs_chan)</div><div class='ctx'> </div><div class='ctx'> static void mxs_dma_disable_chan(struct mxs_dma_chan *mxs_chan)</div><div class='ctx'> {</div><div class='del'>-	/* disable apbh channel clock */</div><div class='del'>-	mxs_dma_clkgate(mxs_chan, 0);</div><div class='del'>-</div><div class='ctx'> 	mxs_chan-&gt;status = DMA_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -268,7 +245,7 @@ static irqreturn_t mxs_dma_int_handler(int irq, void *dev_id)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * When both completion and error of termination bits set at the</div><div class='ctx'> 	 * same time, we do not take it as an error.  IOW, it only becomes</div><div class='del'>-	 * an error we need to handler here in case of ether it's (1) an bus</div><div class='add'>+	 * an error we need to handle here in case of either it's (1) a bus</div><div class='ctx'> 	 * error or (2) a termination error with no completion.</div><div class='ctx'> 	 */</div><div class='ctx'> 	stat2 = ((stat2 &gt;&gt; MXS_DMA_CHANNELS) &amp; stat2) | /* (1) */</div><div class='hunk'>@@ -334,14 +311,11 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan)</div><div class='ctx'> 			goto err_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = clk_enable(mxs_dma-&gt;clk);</div><div class='add'>+	ret = clk_prepare_enable(mxs_dma-&gt;clk);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_clk;</div><div class='ctx'> </div><div class='del'>-	/* clkgate needs to be enabled for reset to finish */</div><div class='del'>-	mxs_dma_clkgate(mxs_chan, 1);</div><div class='ctx'> 	mxs_dma_reset_chan(mxs_chan);</div><div class='del'>-	mxs_dma_clkgate(mxs_chan, 0);</div><div class='ctx'> </div><div class='ctx'> 	dma_async_tx_descriptor_init(&amp;mxs_chan-&gt;desc, chan);</div><div class='ctx'> 	mxs_chan-&gt;desc.tx_submit = mxs_dma_tx_submit;</div><div class='hunk'>@@ -372,12 +346,12 @@ static void mxs_dma_free_chan_resources(struct dma_chan *chan)</div><div class='ctx'> 	dma_free_coherent(mxs_dma-&gt;dma_device.dev, PAGE_SIZE,</div><div class='ctx'> 			mxs_chan-&gt;ccw, mxs_chan-&gt;ccw_phys);</div><div class='ctx'> </div><div class='del'>-	clk_disable(mxs_dma-&gt;clk);</div><div class='add'>+	clk_disable_unprepare(mxs_dma-&gt;clk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(</div><div class='ctx'> 		struct dma_chan *chan, struct scatterlist *sgl,</div><div class='del'>-		unsigned int sg_len, enum dma_data_direction direction,</div><div class='add'>+		unsigned int sg_len, enum dma_transfer_direction direction,</div><div class='ctx'> 		unsigned long append)</div><div class='ctx'> {</div><div class='ctx'> 	struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);</div><div class='hunk'>@@ -386,7 +360,7 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> 	u32 *pio;</div><div class='del'>-	static int idx;</div><div class='add'>+	int idx = append ? mxs_chan-&gt;desc_count : 0;</div><div class='ctx'> </div><div class='ctx'> 	if (mxs_chan-&gt;status == DMA_IN_PROGRESS &amp;&amp; !append)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -417,7 +391,7 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(</div><div class='ctx'> 		idx = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (direction == DMA_NONE) {</div><div class='add'>+	if (direction == DMA_TRANS_NONE) {</div><div class='ctx'> 		ccw = &amp;mxs_chan-&gt;ccw[idx++];</div><div class='ctx'> 		pio = (u32 *) sgl;</div><div class='ctx'> </div><div class='hunk'>@@ -450,7 +424,7 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(</div><div class='ctx'> 			ccw-&gt;bits |= CCW_CHAIN;</div><div class='ctx'> 			ccw-&gt;bits |= CCW_HALT_ON_TERM;</div><div class='ctx'> 			ccw-&gt;bits |= CCW_TERM_FLUSH;</div><div class='del'>-			ccw-&gt;bits |= BF_CCW(direction == DMA_FROM_DEVICE ?</div><div class='add'>+			ccw-&gt;bits |= BF_CCW(direction == DMA_DEV_TO_MEM ?</div><div class='ctx'> 					MXS_DMA_CMD_WRITE : MXS_DMA_CMD_READ,</div><div class='ctx'> 					COMMAND);</div><div class='ctx'> </div><div class='hunk'>@@ -462,6 +436,7 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	mxs_chan-&gt;desc_count = idx;</div><div class='ctx'> </div><div class='ctx'> 	return &amp;mxs_chan-&gt;desc;</div><div class='ctx'> </div><div class='hunk'>@@ -472,7 +447,7 @@ err_out:</div><div class='ctx'> </div><div class='ctx'> static struct dma_async_tx_descriptor *mxs_dma_prep_dma_cyclic(</div><div class='ctx'> 		struct dma_chan *chan, dma_addr_t dma_addr, size_t buf_len,</div><div class='del'>-		size_t period_len, enum dma_data_direction direction)</div><div class='add'>+		size_t period_len, enum dma_transfer_direction direction)</div><div class='ctx'> {</div><div class='ctx'> 	struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);</div><div class='ctx'> 	struct mxs_dma_engine *mxs_dma = mxs_chan-&gt;mxs_dma;</div><div class='hunk'>@@ -515,7 +490,7 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_dma_cyclic(</div><div class='ctx'> 		ccw-&gt;bits |= CCW_IRQ;</div><div class='ctx'> 		ccw-&gt;bits |= CCW_HALT_ON_TERM;</div><div class='ctx'> 		ccw-&gt;bits |= CCW_TERM_FLUSH;</div><div class='del'>-		ccw-&gt;bits |= BF_CCW(direction == DMA_FROM_DEVICE ?</div><div class='add'>+		ccw-&gt;bits |= BF_CCW(direction == DMA_DEV_TO_MEM ?</div><div class='ctx'> 				MXS_DMA_CMD_WRITE : MXS_DMA_CMD_READ, COMMAND);</div><div class='ctx'> </div><div class='ctx'> 		dma_addr += period_len;</div><div class='hunk'>@@ -523,6 +498,7 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_dma_cyclic(</div><div class='ctx'> </div><div class='ctx'> 		i++;</div><div class='ctx'> 	}</div><div class='add'>+	mxs_chan-&gt;desc_count = i;</div><div class='ctx'> </div><div class='ctx'> 	return &amp;mxs_chan-&gt;desc;</div><div class='ctx'> </div><div class='hunk'>@@ -539,8 +515,8 @@ static int mxs_dma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case DMA_TERMINATE_ALL:</div><div class='del'>-		mxs_dma_disable_chan(mxs_chan);</div><div class='ctx'> 		mxs_dma_reset_chan(mxs_chan);</div><div class='add'>+		mxs_dma_disable_chan(mxs_chan);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DMA_PAUSE:</div><div class='ctx'> 		mxs_dma_pause_chan(mxs_chan);</div><div class='hunk'>@@ -578,9 +554,9 @@ static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = clk_enable(mxs_dma-&gt;clk);</div><div class='add'>+	ret = clk_prepare_enable(mxs_dma-&gt;clk);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto err_out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = mxs_reset_block(mxs_dma-&gt;base);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -604,11 +580,8 @@ static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma)</div><div class='ctx'> 	writel(MXS_DMA_CHANNELS_MASK &lt;&lt; MXS_DMA_CHANNELS,</div><div class='ctx'> 		mxs_dma-&gt;base + HW_APBHX_CTRL1 + MXS_SET_ADDR);</div><div class='ctx'> </div><div class='del'>-	clk_disable(mxs_dma-&gt;clk);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='ctx'> err_out:</div><div class='add'>+	clk_disable_unprepare(mxs_dma-&gt;clk);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c<br/>index a6d0e3dbed07..823f58179f9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/pch_dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/pch_dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/pch_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/pch_dma.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Topcliff PCH DMA controller driver</div><div class='ctx'>  * Copyright (c) 2010 Intel Corporation</div><div class='del'>- * Copyright (C) 2011 OKI SEMICONDUCTOR CO., LTD.</div><div class='add'>+ * Copyright (C) 2011 LAPIS Semiconductor Co., Ltd.</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 version 2 as</div><div class='hunk'>@@ -99,7 +99,7 @@ struct pch_dma_desc {</div><div class='ctx'> struct pch_dma_chan {</div><div class='ctx'> 	struct dma_chan		chan;</div><div class='ctx'> 	void __iomem *membase;</div><div class='del'>-	enum dma_data_direction	dir;</div><div class='add'>+	enum dma_transfer_direction dir;</div><div class='ctx'> 	struct tasklet_struct	tasklet;</div><div class='ctx'> 	unsigned long		err_status;</div><div class='ctx'> </div><div class='hunk'>@@ -224,7 +224,7 @@ static void pdc_set_dir(struct dma_chan *chan)</div><div class='ctx'> 		mask_ctl = DMA_MASK_CTL0_MODE &amp; ~(DMA_CTL0_MODE_MASK_BITS &lt;&lt;</div><div class='ctx'> 				       (DMA_CTL0_BITS_PER_CH * chan-&gt;chan_id));</div><div class='ctx'> 		val &amp;= mask_mode;</div><div class='del'>-		if (pd_chan-&gt;dir == DMA_TO_DEVICE)</div><div class='add'>+		if (pd_chan-&gt;dir == DMA_MEM_TO_DEV)</div><div class='ctx'> 			val |= 0x1 &lt;&lt; (DMA_CTL0_BITS_PER_CH * chan-&gt;chan_id +</div><div class='ctx'> 				       DMA_CTL0_DIR_SHIFT_BITS);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -242,7 +242,7 @@ static void pdc_set_dir(struct dma_chan *chan)</div><div class='ctx'> 		mask_ctl = DMA_MASK_CTL2_MODE &amp; ~(DMA_CTL0_MODE_MASK_BITS &lt;&lt;</div><div class='ctx'> 						 (DMA_CTL0_BITS_PER_CH * ch));</div><div class='ctx'> 		val &amp;= mask_mode;</div><div class='del'>-		if (pd_chan-&gt;dir == DMA_TO_DEVICE)</div><div class='add'>+		if (pd_chan-&gt;dir == DMA_MEM_TO_DEV)</div><div class='ctx'> 			val |= 0x1 &lt;&lt; (DMA_CTL0_BITS_PER_CH * ch +</div><div class='ctx'> 				       DMA_CTL0_DIR_SHIFT_BITS);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -607,7 +607,7 @@ static void pd_issue_pending(struct dma_chan *chan)</div><div class='ctx'> </div><div class='ctx'> static struct dma_async_tx_descriptor *pd_prep_slave_sg(struct dma_chan *chan,</div><div class='ctx'> 			struct scatterlist *sgl, unsigned int sg_len,</div><div class='del'>-			enum dma_data_direction direction, unsigned long flags)</div><div class='add'>+			enum dma_transfer_direction direction, unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct pch_dma_chan *pd_chan = to_pd_chan(chan);</div><div class='ctx'> 	struct pch_dma_slave *pd_slave = chan-&gt;private;</div><div class='hunk'>@@ -623,9 +623,9 @@ static struct dma_async_tx_descriptor *pd_prep_slave_sg(struct dma_chan *chan,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (direction == DMA_FROM_DEVICE)</div><div class='add'>+	if (direction == DMA_DEV_TO_MEM)</div><div class='ctx'> 		reg = pd_slave-&gt;rx_reg;</div><div class='del'>-	else if (direction == DMA_TO_DEVICE)</div><div class='add'>+	else if (direction == DMA_MEM_TO_DEV)</div><div class='ctx'> 		reg = pd_slave-&gt;tx_reg;</div><div class='ctx'> 	else</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -1018,6 +1018,8 @@ static void __devexit pch_dma_remove(struct pci_dev *pdev)</div><div class='ctx'> #define PCI_DEVICE_ID_ML7223_DMA2_4CH	0x800E</div><div class='ctx'> #define PCI_DEVICE_ID_ML7223_DMA3_4CH	0x8017</div><div class='ctx'> #define PCI_DEVICE_ID_ML7223_DMA4_4CH	0x803B</div><div class='add'>+#define PCI_DEVICE_ID_ML7831_DMA1_8CH	0x8810</div><div class='add'>+#define PCI_DEVICE_ID_ML7831_DMA2_4CH	0x8815</div><div class='ctx'> </div><div class='ctx'> DEFINE_PCI_DEVICE_TABLE(pch_dma_id_table) = {</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_EG20T_PCH_DMA_8CH), 8 },</div><div class='hunk'>@@ -1030,6 +1032,8 @@ DEFINE_PCI_DEVICE_TABLE(pch_dma_id_table) = {</div><div class='ctx'> 	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA2_4CH), 4}, /* Video SPI */</div><div class='ctx'> 	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA3_4CH), 4}, /* Security */</div><div class='ctx'> 	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA4_4CH), 4}, /* FPGA */</div><div class='add'>+	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_DMA1_8CH), 8}, /* UART */</div><div class='add'>+	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_DMA2_4CH), 4}, /* SPI */</div><div class='ctx'> 	{ 0, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1057,7 +1061,7 @@ static void __exit pch_dma_exit(void)</div><div class='ctx'> module_init(pch_dma_init);</div><div class='ctx'> module_exit(pch_dma_exit);</div><div class='ctx'> </div><div class='del'>-MODULE_DESCRIPTION("Intel EG20T PCH / OKI SEMICONDUCTOR ML7213 IOH "</div><div class='add'>+MODULE_DESCRIPTION("Intel EG20T PCH / LAPIS Semicon ML7213/ML7223/ML7831 IOH "</div><div class='ctx'> 		   "DMA controller driver");</div><div class='ctx'> MODULE_AUTHOR("Yong Wang &lt;yong.y.wang@intel.com&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c<br/>index 571041477ab2..b8ec03ee8e22 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/pl330.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/pl330.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/pl330.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/pl330.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/amba/pl330.h&gt;</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define NR_DEFAULT_DESC	16</div><div class='ctx'> </div><div class='hunk'>@@ -116,6 +117,9 @@ struct dma_pl330_desc {</div><div class='ctx'> 	struct dma_pl330_chan *pchan;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* forward declaration */</div><div class='add'>+static struct amba_driver pl330_driver;</div><div class='add'>+</div><div class='ctx'> static inline struct dma_pl330_chan *</div><div class='ctx'> to_pchan(struct dma_chan *ch)</div><div class='ctx'> {</div><div class='hunk'>@@ -267,6 +271,32 @@ static void dma_pl330_rqcb(void *token, enum pl330_op_err err)</div><div class='ctx'> 	tasklet_schedule(&amp;pch-&gt;task);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool pl330_filter(struct dma_chan *chan, void *param)</div><div class='add'>+{</div><div class='add'>+	u8 *peri_id;</div><div class='add'>+</div><div class='add'>+	if (chan-&gt;device-&gt;dev-&gt;driver != &amp;pl330_driver.drv)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+	if (chan-&gt;device-&gt;dev-&gt;of_node) {</div><div class='add'>+		const __be32 *prop_value;</div><div class='add'>+		phandle phandle;</div><div class='add'>+		struct device_node *node;</div><div class='add'>+</div><div class='add'>+		prop_value = ((struct property *)param)-&gt;value;</div><div class='add'>+		phandle = be32_to_cpup(prop_value++);</div><div class='add'>+		node = of_find_node_by_phandle(phandle);</div><div class='add'>+		return ((chan-&gt;private == node) &amp;&amp;</div><div class='add'>+				(chan-&gt;chan_id == be32_to_cpup(prop_value)));</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	peri_id = chan-&gt;private;</div><div class='add'>+	return *peri_id == (unsigned)param;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pl330_filter);</div><div class='add'>+</div><div class='ctx'> static int pl330_alloc_chan_resources(struct dma_chan *chan)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_pl330_chan *pch = to_pchan(chan);</div><div class='hunk'>@@ -320,14 +350,14 @@ static int pl330_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, unsigned</div><div class='ctx'> 	case DMA_SLAVE_CONFIG:</div><div class='ctx'> 		slave_config = (struct dma_slave_config *)arg;</div><div class='ctx'> </div><div class='del'>-		if (slave_config-&gt;direction == DMA_TO_DEVICE) {</div><div class='add'>+		if (slave_config-&gt;direction == DMA_MEM_TO_DEV) {</div><div class='ctx'> 			if (slave_config-&gt;dst_addr)</div><div class='ctx'> 				pch-&gt;fifo_addr = slave_config-&gt;dst_addr;</div><div class='ctx'> 			if (slave_config-&gt;dst_addr_width)</div><div class='ctx'> 				pch-&gt;burst_sz = __ffs(slave_config-&gt;dst_addr_width);</div><div class='ctx'> 			if (slave_config-&gt;dst_maxburst)</div><div class='ctx'> 				pch-&gt;burst_len = slave_config-&gt;dst_maxburst;</div><div class='del'>-		} else if (slave_config-&gt;direction == DMA_FROM_DEVICE) {</div><div class='add'>+		} else if (slave_config-&gt;direction == DMA_DEV_TO_MEM) {</div><div class='ctx'> 			if (slave_config-&gt;src_addr)</div><div class='ctx'> 				pch-&gt;fifo_addr = slave_config-&gt;src_addr;</div><div class='ctx'> 			if (slave_config-&gt;src_addr_width)</div><div class='hunk'>@@ -497,7 +527,7 @@ pluck_desc(struct dma_pl330_dmac *pdmac)</div><div class='ctx'> static struct dma_pl330_desc *pl330_get_desc(struct dma_pl330_chan *pch)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_pl330_dmac *pdmac = pch-&gt;dmac;</div><div class='del'>-	struct dma_pl330_peri *peri = pch-&gt;chan.private;</div><div class='add'>+	u8 *peri_id = pch-&gt;chan.private;</div><div class='ctx'> 	struct dma_pl330_desc *desc;</div><div class='ctx'> </div><div class='ctx'> 	/* Pluck one desc from the pool of DMAC */</div><div class='hunk'>@@ -522,13 +552,7 @@ static struct dma_pl330_desc *pl330_get_desc(struct dma_pl330_chan *pch)</div><div class='ctx'> 	desc-&gt;txd.cookie = 0;</div><div class='ctx'> 	async_tx_ack(&amp;desc-&gt;txd);</div><div class='ctx'> </div><div class='del'>-	if (peri) {</div><div class='del'>-		desc-&gt;req.rqtype = peri-&gt;rqtype;</div><div class='del'>-		desc-&gt;req.peri = pch-&gt;chan.chan_id;</div><div class='del'>-	} else {</div><div class='del'>-		desc-&gt;req.rqtype = MEMTOMEM;</div><div class='del'>-		desc-&gt;req.peri = 0;</div><div class='del'>-	}</div><div class='add'>+	desc-&gt;req.peri = peri_id ? pch-&gt;chan.chan_id : 0;</div><div class='ctx'> </div><div class='ctx'> 	dma_async_tx_descriptor_init(&amp;desc-&gt;txd, &amp;pch-&gt;chan);</div><div class='ctx'> </div><div class='hunk'>@@ -597,7 +621,7 @@ static inline int get_burst_len(struct dma_pl330_desc *desc, size_t len)</div><div class='ctx'> </div><div class='ctx'> static struct dma_async_tx_descriptor *pl330_prep_dma_cyclic(</div><div class='ctx'> 		struct dma_chan *chan, dma_addr_t dma_addr, size_t len,</div><div class='del'>-		size_t period_len, enum dma_data_direction direction)</div><div class='add'>+		size_t period_len, enum dma_transfer_direction direction)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_pl330_desc *desc;</div><div class='ctx'> 	struct dma_pl330_chan *pch = to_pchan(chan);</div><div class='hunk'>@@ -612,15 +636,17 @@ static struct dma_async_tx_descriptor *pl330_prep_dma_cyclic(</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (direction) {</div><div class='del'>-	case DMA_TO_DEVICE:</div><div class='add'>+	case DMA_MEM_TO_DEV:</div><div class='ctx'> 		desc-&gt;rqcfg.src_inc = 1;</div><div class='ctx'> 		desc-&gt;rqcfg.dst_inc = 0;</div><div class='add'>+		desc-&gt;req.rqtype = MEMTODEV;</div><div class='ctx'> 		src = dma_addr;</div><div class='ctx'> 		dst = pch-&gt;fifo_addr;</div><div class='ctx'> 		break;</div><div class='del'>-	case DMA_FROM_DEVICE:</div><div class='add'>+	case DMA_DEV_TO_MEM:</div><div class='ctx'> 		desc-&gt;rqcfg.src_inc = 0;</div><div class='ctx'> 		desc-&gt;rqcfg.dst_inc = 1;</div><div class='add'>+		desc-&gt;req.rqtype = DEVTOMEM;</div><div class='ctx'> 		src = pch-&gt;fifo_addr;</div><div class='ctx'> 		dst = dma_addr;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -646,16 +672,12 @@ pl330_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst,</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_pl330_desc *desc;</div><div class='ctx'> 	struct dma_pl330_chan *pch = to_pchan(chan);</div><div class='del'>-	struct dma_pl330_peri *peri = chan-&gt;private;</div><div class='ctx'> 	struct pl330_info *pi;</div><div class='ctx'> 	int burst;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!pch || !len))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (peri &amp;&amp; peri-&gt;rqtype != MEMTOMEM)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='ctx'> 	pi = &amp;pch-&gt;dmac-&gt;pif;</div><div class='ctx'> </div><div class='ctx'> 	desc = __pl330_prep_dma_memcpy(pch, dst, src, len);</div><div class='hunk'>@@ -664,6 +686,7 @@ pl330_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst,</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;rqcfg.src_inc = 1;</div><div class='ctx'> 	desc-&gt;rqcfg.dst_inc = 1;</div><div class='add'>+	desc-&gt;req.rqtype = MEMTOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* Select max possible burst size */</div><div class='ctx'> 	burst = pi-&gt;pcfg.data_bus_width / 8;</div><div class='hunk'>@@ -687,30 +710,19 @@ pl330_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst,</div><div class='ctx'> </div><div class='ctx'> static struct dma_async_tx_descriptor *</div><div class='ctx'> pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,</div><div class='del'>-		unsigned int sg_len, enum dma_data_direction direction,</div><div class='add'>+		unsigned int sg_len, enum dma_transfer_direction direction,</div><div class='ctx'> 		unsigned long flg)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_pl330_desc *first, *desc = NULL;</div><div class='ctx'> 	struct dma_pl330_chan *pch = to_pchan(chan);</div><div class='del'>-	struct dma_pl330_peri *peri = chan-&gt;private;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	dma_addr_t addr;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!pch || !sgl || !sg_len || !peri))</div><div class='add'>+	if (unlikely(!pch || !sgl || !sg_len))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	/* Make sure the direction is consistent */</div><div class='del'>-	if ((direction == DMA_TO_DEVICE &amp;&amp;</div><div class='del'>-				peri-&gt;rqtype != MEMTODEV) ||</div><div class='del'>-			(direction == DMA_FROM_DEVICE &amp;&amp;</div><div class='del'>-				peri-&gt;rqtype != DEVTOMEM)) {</div><div class='del'>-		dev_err(pch-&gt;dmac-&gt;pif.dev, "%s:%d Invalid Direction\n",</div><div class='del'>-				__func__, __LINE__);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	addr = pch-&gt;fifo_addr;</div><div class='ctx'> </div><div class='ctx'> 	first = NULL;</div><div class='hunk'>@@ -747,14 +759,16 @@ pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,</div><div class='ctx'> 		else</div><div class='ctx'> 			list_add_tail(&amp;desc-&gt;node, &amp;first-&gt;node);</div><div class='ctx'> </div><div class='del'>-		if (direction == DMA_TO_DEVICE) {</div><div class='add'>+		if (direction == DMA_MEM_TO_DEV) {</div><div class='ctx'> 			desc-&gt;rqcfg.src_inc = 1;</div><div class='ctx'> 			desc-&gt;rqcfg.dst_inc = 0;</div><div class='add'>+			desc-&gt;req.rqtype = MEMTODEV;</div><div class='ctx'> 			fill_px(&amp;desc-&gt;px,</div><div class='ctx'> 				addr, sg_dma_address(sg), sg_dma_len(sg));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			desc-&gt;rqcfg.src_inc = 0;</div><div class='ctx'> 			desc-&gt;rqcfg.dst_inc = 1;</div><div class='add'>+			desc-&gt;req.rqtype = DEVTOMEM;</div><div class='ctx'> 			fill_px(&amp;desc-&gt;px,</div><div class='ctx'> 				sg_dma_address(sg), addr, sg_dma_len(sg));</div><div class='ctx'> 		}</div><div class='hunk'>@@ -820,17 +834,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)</div><div class='ctx'> </div><div class='ctx'> 	amba_set_drvdata(adev, pdmac);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM_RUNTIME</div><div class='del'>-	/* to use the runtime PM helper functions */</div><div class='del'>-	pm_runtime_enable(&amp;adev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	/* enable the power domain */</div><div class='del'>-	if (pm_runtime_get_sync(&amp;adev-&gt;dev)) {</div><div class='del'>-		dev_err(&amp;adev-&gt;dev, "failed to get runtime pm\n");</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto probe_err1;</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='add'>+#ifndef CONFIG_PM_RUNTIME</div><div class='ctx'> 	/* enable dma clk */</div><div class='ctx'> 	clk_enable(pdmac-&gt;clk);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -856,32 +860,16 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;pd-&gt;channels);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize channel parameters */</div><div class='del'>-	num_chan = max(pdat ? pdat-&gt;nr_valid_peri : 0, (u8)pi-&gt;pcfg.num_chan);</div><div class='add'>+	num_chan = max(pdat ? pdat-&gt;nr_valid_peri : (u8)pi-&gt;pcfg.num_peri,</div><div class='add'>+			(u8)pi-&gt;pcfg.num_chan);</div><div class='ctx'> 	pdmac-&gt;peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num_chan; i++) {</div><div class='ctx'> 		pch = &amp;pdmac-&gt;peripherals[i];</div><div class='del'>-		if (pdat) {</div><div class='del'>-			struct dma_pl330_peri *peri = &amp;pdat-&gt;peri[i];</div><div class='del'>-</div><div class='del'>-			switch (peri-&gt;rqtype) {</div><div class='del'>-			case MEMTOMEM:</div><div class='del'>-				dma_cap_set(DMA_MEMCPY, pd-&gt;cap_mask);</div><div class='del'>-				break;</div><div class='del'>-			case MEMTODEV:</div><div class='del'>-			case DEVTOMEM:</div><div class='del'>-				dma_cap_set(DMA_SLAVE, pd-&gt;cap_mask);</div><div class='del'>-				dma_cap_set(DMA_CYCLIC, pd-&gt;cap_mask);</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				dev_err(&amp;adev-&gt;dev, "DEVTODEV Not Supported\n");</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			pch-&gt;chan.private = peri;</div><div class='del'>-		} else {</div><div class='del'>-			dma_cap_set(DMA_MEMCPY, pd-&gt;cap_mask);</div><div class='del'>-			pch-&gt;chan.private = NULL;</div><div class='del'>-		}</div><div class='add'>+		if (!adev-&gt;dev.of_node)</div><div class='add'>+			pch-&gt;chan.private = pdat ? &amp;pdat-&gt;peri_id[i] : NULL;</div><div class='add'>+		else</div><div class='add'>+			pch-&gt;chan.private = adev-&gt;dev.of_node;</div><div class='ctx'> </div><div class='ctx'> 		INIT_LIST_HEAD(&amp;pch-&gt;work_list);</div><div class='ctx'> 		spin_lock_init(&amp;pch-&gt;lock);</div><div class='hunk'>@@ -894,6 +882,15 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pd-&gt;dev = &amp;adev-&gt;dev;</div><div class='add'>+	if (pdat) {</div><div class='add'>+		pd-&gt;cap_mask = pdat-&gt;cap_mask;</div><div class='add'>+	} else {</div><div class='add'>+		dma_cap_set(DMA_MEMCPY, pd-&gt;cap_mask);</div><div class='add'>+		if (pi-&gt;pcfg.num_peri) {</div><div class='add'>+			dma_cap_set(DMA_SLAVE, pd-&gt;cap_mask);</div><div class='add'>+			dma_cap_set(DMA_CYCLIC, pd-&gt;cap_mask);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	pd-&gt;device_alloc_chan_resources = pl330_alloc_chan_resources;</div><div class='ctx'> 	pd-&gt;device_free_chan_resources = pl330_free_chan_resources;</div><div class='hunk'>@@ -970,10 +967,7 @@ static int __devexit pl330_remove(struct amba_device *adev)</div><div class='ctx'> 	res = &amp;adev-&gt;res;</div><div class='ctx'> 	release_mem_region(res-&gt;start, resource_size(res));</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM_RUNTIME</div><div class='del'>-	pm_runtime_put(&amp;adev-&gt;dev);</div><div class='del'>-	pm_runtime_disable(&amp;adev-&gt;dev);</div><div class='del'>-#else</div><div class='add'>+#ifndef CONFIG_PM_RUNTIME</div><div class='ctx'> 	clk_disable(pdmac-&gt;clk);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -990,6 +984,8 @@ static struct amba_id pl330_ids[] = {</div><div class='ctx'> 	{ 0, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+MODULE_DEVICE_TABLE(amba, pl330_ids);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PM_RUNTIME</div><div class='ctx'> static int pl330_runtime_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c<br/>index 81809c2b46ab..54043cd831c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/shdma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/shdma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/shdma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/shdma.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/dmaengine.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.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='ctx'> #include &lt;linux/sh_dma.h&gt;</div><div class='hunk'>@@ -57,6 +56,15 @@ static LIST_HEAD(sh_dmae_devices);</div><div class='ctx'> static unsigned long sh_dmae_slave_used[BITS_TO_LONGS(SH_DMA_SLAVE_NUMBER)];</div><div class='ctx'> </div><div class='ctx'> static void sh_dmae_chan_ld_cleanup(struct sh_dmae_chan *sh_chan, bool all);</div><div class='add'>+static void sh_chan_xfer_ld_queue(struct sh_dmae_chan *sh_chan);</div><div class='add'>+</div><div class='add'>+static void chclr_write(struct sh_dmae_chan *sh_dc, u32 data)</div><div class='add'>+{</div><div class='add'>+	struct sh_dmae_device *shdev = to_sh_dev(sh_dc);</div><div class='add'>+</div><div class='add'>+	__raw_writel(data, shdev-&gt;chan_reg +</div><div class='add'>+		     shdev-&gt;pdata-&gt;channel[sh_dc-&gt;id].chclr_offset);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void sh_dmae_writel(struct sh_dmae_chan *sh_dc, u32 data, u32 reg)</div><div class='ctx'> {</div><div class='hunk'>@@ -129,6 +137,15 @@ static int sh_dmae_rst(struct sh_dmae_device *shdev)</div><div class='ctx'> </div><div class='ctx'> 	dmaor = dmaor_read(shdev) &amp; ~(DMAOR_NMIF | DMAOR_AE | DMAOR_DME);</div><div class='ctx'> </div><div class='add'>+	if (shdev-&gt;pdata-&gt;chclr_present) {</div><div class='add'>+		int i;</div><div class='add'>+		for (i = 0; i &lt; shdev-&gt;pdata-&gt;channel_num; i++) {</div><div class='add'>+			struct sh_dmae_chan *sh_chan = shdev-&gt;chan[i];</div><div class='add'>+			if (sh_chan)</div><div class='add'>+				chclr_write(sh_chan, 0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dmaor_write(shdev, dmaor | shdev-&gt;pdata-&gt;dmaor_init);</div><div class='ctx'> </div><div class='ctx'> 	dmaor = dmaor_read(shdev);</div><div class='hunk'>@@ -139,6 +156,10 @@ static int sh_dmae_rst(struct sh_dmae_device *shdev)</div><div class='ctx'> 		dev_warn(shdev-&gt;common.dev, "Can't initialize DMAOR.\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='add'>+	if (shdev-&gt;pdata-&gt;dmaor_init &amp; ~dmaor)</div><div class='add'>+		dev_warn(shdev-&gt;common.dev,</div><div class='add'>+			 "DMAOR=0x%x hasn't latched the initial value 0x%x.\n",</div><div class='add'>+			 dmaor, shdev-&gt;pdata-&gt;dmaor_init);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -259,8 +280,6 @@ static int dmae_set_dmars(struct sh_dmae_chan *sh_chan, u16 val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sh_chan_xfer_ld_queue(struct sh_dmae_chan *sh_chan);</div><div class='del'>-</div><div class='ctx'> static dma_cookie_t sh_dmae_tx_submit(struct dma_async_tx_descriptor *tx)</div><div class='ctx'> {</div><div class='ctx'> 	struct sh_desc *desc = tx_to_sh_desc(tx), *chunk, *last = desc, *c;</div><div class='hunk'>@@ -340,6 +359,8 @@ static dma_cookie_t sh_dmae_tx_submit(struct dma_async_tx_descriptor *tx)</div><div class='ctx'> 				sh_chan_xfer_ld_queue(sh_chan);</div><div class='ctx'> 			sh_chan-&gt;pm_state = DMAE_PM_ESTABLISHED;</div><div class='ctx'> 		}</div><div class='add'>+	} else {</div><div class='add'>+		sh_chan-&gt;pm_state = DMAE_PM_PENDING;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(&amp;sh_chan-&gt;desc_lock);</div><div class='hunk'>@@ -479,19 +500,19 @@ static void sh_dmae_free_chan_resources(struct dma_chan *chan)</div><div class='ctx'>  * @sh_chan:	DMA channel</div><div class='ctx'>  * @flags:	DMA transfer flags</div><div class='ctx'>  * @dest:	destination DMA address, incremented when direction equals</div><div class='del'>- *		DMA_FROM_DEVICE or DMA_BIDIRECTIONAL</div><div class='add'>+ *		DMA_DEV_TO_MEM</div><div class='ctx'>  * @src:	source DMA address, incremented when direction equals</div><div class='del'>- *		DMA_TO_DEVICE or DMA_BIDIRECTIONAL</div><div class='add'>+ *		DMA_MEM_TO_DEV</div><div class='ctx'>  * @len:	DMA transfer length</div><div class='ctx'>  * @first:	if NULL, set to the current descriptor and cookie set to -EBUSY</div><div class='ctx'>  * @direction:	needed for slave DMA to decide which address to keep constant,</div><div class='del'>- *		equals DMA_BIDIRECTIONAL for MEMCPY</div><div class='add'>+ *		equals DMA_MEM_TO_MEM for MEMCPY</div><div class='ctx'>  * Returns 0 or an error</div><div class='ctx'>  * Locks: called with desc_lock held</div><div class='ctx'>  */</div><div class='ctx'> static struct sh_desc *sh_dmae_add_desc(struct sh_dmae_chan *sh_chan,</div><div class='ctx'> 	unsigned long flags, dma_addr_t *dest, dma_addr_t *src, size_t *len,</div><div class='del'>-	struct sh_desc **first, enum dma_data_direction direction)</div><div class='add'>+	struct sh_desc **first, enum dma_transfer_direction direction)</div><div class='ctx'> {</div><div class='ctx'> 	struct sh_desc *new;</div><div class='ctx'> 	size_t copy_size;</div><div class='hunk'>@@ -531,9 +552,9 @@ static struct sh_desc *sh_dmae_add_desc(struct sh_dmae_chan *sh_chan,</div><div class='ctx'> 	new-&gt;direction = direction;</div><div class='ctx'> </div><div class='ctx'> 	*len -= copy_size;</div><div class='del'>-	if (direction == DMA_BIDIRECTIONAL || direction == DMA_TO_DEVICE)</div><div class='add'>+	if (direction == DMA_MEM_TO_MEM || direction == DMA_MEM_TO_DEV)</div><div class='ctx'> 		*src += copy_size;</div><div class='del'>-	if (direction == DMA_BIDIRECTIONAL || direction == DMA_FROM_DEVICE)</div><div class='add'>+	if (direction == DMA_MEM_TO_MEM || direction == DMA_DEV_TO_MEM)</div><div class='ctx'> 		*dest += copy_size;</div><div class='ctx'> </div><div class='ctx'> 	return new;</div><div class='hunk'>@@ -546,12 +567,12 @@ static struct sh_desc *sh_dmae_add_desc(struct sh_dmae_chan *sh_chan,</div><div class='ctx'>  * converted to scatter-gather to guarantee consistent locking and a correct</div><div class='ctx'>  * list manipulation. For slave DMA direction carries the usual meaning, and,</div><div class='ctx'>  * logically, the SG list is RAM and the addr variable contains slave address,</div><div class='del'>- * e.g., the FIFO I/O register. For MEMCPY direction equals DMA_BIDIRECTIONAL</div><div class='add'>+ * e.g., the FIFO I/O register. For MEMCPY direction equals DMA_MEM_TO_MEM</div><div class='ctx'>  * and the SG list contains only one element and points at the source buffer.</div><div class='ctx'>  */</div><div class='ctx'> static struct dma_async_tx_descriptor *sh_dmae_prep_sg(struct sh_dmae_chan *sh_chan,</div><div class='ctx'> 	struct scatterlist *sgl, unsigned int sg_len, dma_addr_t *addr,</div><div class='del'>-	enum dma_data_direction direction, unsigned long flags)</div><div class='add'>+	enum dma_transfer_direction direction, unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	struct sh_desc *first = NULL, *new = NULL /* compiler... */;</div><div class='hunk'>@@ -592,7 +613,7 @@ static struct dma_async_tx_descriptor *sh_dmae_prep_sg(struct sh_dmae_chan *sh_c</div><div class='ctx'> 			dev_dbg(sh_chan-&gt;dev, "Add SG #%d@%p[%d], dma %llx\n",</div><div class='ctx'> 				i, sg, len, (unsigned long long)sg_addr);</div><div class='ctx'> </div><div class='del'>-			if (direction == DMA_FROM_DEVICE)</div><div class='add'>+			if (direction == DMA_DEV_TO_MEM)</div><div class='ctx'> 				new = sh_dmae_add_desc(sh_chan, flags,</div><div class='ctx'> 						&amp;sg_addr, addr, &amp;len, &amp;first,</div><div class='ctx'> 						direction);</div><div class='hunk'>@@ -646,13 +667,13 @@ static struct dma_async_tx_descriptor *sh_dmae_prep_memcpy(</div><div class='ctx'> 	sg_dma_address(&amp;sg) = dma_src;</div><div class='ctx'> 	sg_dma_len(&amp;sg) = len;</div><div class='ctx'> </div><div class='del'>-	return sh_dmae_prep_sg(sh_chan, &amp;sg, 1, &amp;dma_dest, DMA_BIDIRECTIONAL,</div><div class='add'>+	return sh_dmae_prep_sg(sh_chan, &amp;sg, 1, &amp;dma_dest, DMA_MEM_TO_MEM,</div><div class='ctx'> 			       flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dma_async_tx_descriptor *sh_dmae_prep_slave_sg(</div><div class='ctx'> 	struct dma_chan *chan, struct scatterlist *sgl, unsigned int sg_len,</div><div class='del'>-	enum dma_data_direction direction, unsigned long flags)</div><div class='add'>+	enum dma_transfer_direction direction, unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sh_dmae_slave *param;</div><div class='ctx'> 	struct sh_dmae_chan *sh_chan;</div><div class='hunk'>@@ -996,7 +1017,7 @@ static void dmae_do_tasklet(unsigned long data)</div><div class='ctx'> 	spin_lock_irq(&amp;sh_chan-&gt;desc_lock);</div><div class='ctx'> 	list_for_each_entry(desc, &amp;sh_chan-&gt;ld_queue, node) {</div><div class='ctx'> 		if (desc-&gt;mark == DESC_SUBMITTED &amp;&amp;</div><div class='del'>-		    ((desc-&gt;direction == DMA_FROM_DEVICE &amp;&amp;</div><div class='add'>+		    ((desc-&gt;direction == DMA_DEV_TO_MEM &amp;&amp;</div><div class='ctx'> 		      (desc-&gt;hw.dar + desc-&gt;hw.tcr) == dar_buf) ||</div><div class='ctx'> 		     (desc-&gt;hw.sar + desc-&gt;hw.tcr) == sar_buf)) {</div><div class='ctx'> 			dev_dbg(sh_chan-&gt;dev, "done #%d@%p dst %u\n",</div><div class='hunk'>@@ -1225,6 +1246,8 @@ static int __init sh_dmae_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, shdev);</div><div class='ctx'> </div><div class='add'>+	shdev-&gt;common.dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='ctx'> 	pm_runtime_enable(&amp;pdev-&gt;dev);</div><div class='ctx'> 	pm_runtime_get_sync(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1254,7 +1277,6 @@ static int __init sh_dmae_probe(struct platform_device *pdev)</div><div class='ctx'> 	shdev-&gt;common.device_prep_slave_sg = sh_dmae_prep_slave_sg;</div><div class='ctx'> 	shdev-&gt;common.device_control = sh_dmae_control;</div><div class='ctx'> </div><div class='del'>-	shdev-&gt;common.dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	/* Default transfer size of 32 bytes requires 32-byte alignment */</div><div class='ctx'> 	shdev-&gt;common.copy_align = LOG2_DEFAULT_XFER_SIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -1435,22 +1457,17 @@ static int sh_dmae_runtime_resume(struct device *dev)</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int sh_dmae_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct sh_dmae_device *shdev = dev_get_drvdata(dev);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; shdev-&gt;pdata-&gt;channel_num; i++) {</div><div class='del'>-		struct sh_dmae_chan *sh_chan = shdev-&gt;chan[i];</div><div class='del'>-		if (sh_chan-&gt;descs_allocated)</div><div class='del'>-			sh_chan-&gt;pm_error = pm_runtime_put_sync(dev);</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='ctx'> static int sh_dmae_resume(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sh_dmae_device *shdev = dev_get_drvdata(dev);</div><div class='del'>-	int i;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	ret = sh_dmae_rst(shdev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_err(dev, "Failed to reset!\n");</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; shdev-&gt;pdata-&gt;channel_num; i++) {</div><div class='ctx'> 		struct sh_dmae_chan *sh_chan = shdev-&gt;chan[i];</div><div class='hunk'>@@ -1459,9 +1476,6 @@ static int sh_dmae_resume(struct device *dev)</div><div class='ctx'> 		if (!sh_chan-&gt;descs_allocated)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (!sh_chan-&gt;pm_error)</div><div class='del'>-			pm_runtime_get_sync(dev);</div><div class='del'>-</div><div class='ctx'> 		if (param) {</div><div class='ctx'> 			const struct sh_dmae_slave_config *cfg = param-&gt;config;</div><div class='ctx'> 			dmae_set_dmars(sh_chan, cfg-&gt;mid_rid);</div><div class='head'>diff --git a/drivers/dma/sirf-dma.c b/drivers/dma/sirf-dma.c<br/>new file mode 100644<br/>index 000000000000..2333810d1688<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/sirf-dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/sirf-dma.c</a></div><div class='hunk'>@@ -0,0 +1,707 @@</div><div class='add'>+/*</div><div class='add'>+ * DMA controller driver for CSR SiRFprimaII</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.</div><div class='add'>+ *</div><div class='add'>+ * Licensed under GPLv2 or later.</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/dmaengine.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.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/slab.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/of_device.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/sirfsoc_dma.h&gt;</div><div class='add'>+</div><div class='add'>+#define SIRFSOC_DMA_DESCRIPTORS                 16</div><div class='add'>+#define SIRFSOC_DMA_CHANNELS                    16</div><div class='add'>+</div><div class='add'>+#define SIRFSOC_DMA_CH_ADDR                     0x00</div><div class='add'>+#define SIRFSOC_DMA_CH_XLEN                     0x04</div><div class='add'>+#define SIRFSOC_DMA_CH_YLEN                     0x08</div><div class='add'>+#define SIRFSOC_DMA_CH_CTRL                     0x0C</div><div class='add'>+</div><div class='add'>+#define SIRFSOC_DMA_WIDTH_0                     0x100</div><div class='add'>+#define SIRFSOC_DMA_CH_VALID                    0x140</div><div class='add'>+#define SIRFSOC_DMA_CH_INT                      0x144</div><div class='add'>+#define SIRFSOC_DMA_INT_EN                      0x148</div><div class='add'>+#define SIRFSOC_DMA_CH_LOOP_CTRL                0x150</div><div class='add'>+</div><div class='add'>+#define SIRFSOC_DMA_MODE_CTRL_BIT               4</div><div class='add'>+#define SIRFSOC_DMA_DIR_CTRL_BIT                5</div><div class='add'>+</div><div class='add'>+/* xlen and dma_width register is in 4 bytes boundary */</div><div class='add'>+#define SIRFSOC_DMA_WORD_LEN			4</div><div class='add'>+</div><div class='add'>+struct sirfsoc_dma_desc {</div><div class='add'>+	struct dma_async_tx_descriptor	desc;</div><div class='add'>+	struct list_head		node;</div><div class='add'>+</div><div class='add'>+	/* SiRFprimaII 2D-DMA parameters */</div><div class='add'>+</div><div class='add'>+	int             xlen;           /* DMA xlen */</div><div class='add'>+	int             ylen;           /* DMA ylen */</div><div class='add'>+	int             width;          /* DMA width */</div><div class='add'>+	int             dir;</div><div class='add'>+	bool            cyclic;         /* is loop DMA? */</div><div class='add'>+	u32             addr;		/* DMA buffer address */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sirfsoc_dma_chan {</div><div class='add'>+	struct dma_chan			chan;</div><div class='add'>+	struct list_head		free;</div><div class='add'>+	struct list_head		prepared;</div><div class='add'>+	struct list_head		queued;</div><div class='add'>+	struct list_head		active;</div><div class='add'>+	struct list_head		completed;</div><div class='add'>+	dma_cookie_t			completed_cookie;</div><div class='add'>+	unsigned long			happened_cyclic;</div><div class='add'>+	unsigned long			completed_cyclic;</div><div class='add'>+</div><div class='add'>+	/* Lock for this structure */</div><div class='add'>+	spinlock_t			lock;</div><div class='add'>+</div><div class='add'>+	int				mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sirfsoc_dma {</div><div class='add'>+	struct dma_device		dma;</div><div class='add'>+	struct tasklet_struct		tasklet;</div><div class='add'>+	struct sirfsoc_dma_chan		channels[SIRFSOC_DMA_CHANNELS];</div><div class='add'>+	void __iomem			*base;</div><div class='add'>+	int				irq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DRV_NAME	"sirfsoc_dma"</div><div class='add'>+</div><div class='add'>+/* Convert struct dma_chan to struct sirfsoc_dma_chan */</div><div class='add'>+static inline</div><div class='add'>+struct sirfsoc_dma_chan *dma_chan_to_sirfsoc_dma_chan(struct dma_chan *c)</div><div class='add'>+{</div><div class='add'>+	return container_of(c, struct sirfsoc_dma_chan, chan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convert struct dma_chan to struct sirfsoc_dma */</div><div class='add'>+static inline struct sirfsoc_dma *dma_chan_to_sirfsoc_dma(struct dma_chan *c)</div><div class='add'>+{</div><div class='add'>+	struct sirfsoc_dma_chan *schan = dma_chan_to_sirfsoc_dma_chan(c);</div><div class='add'>+	return container_of(schan, struct sirfsoc_dma, channels[c-&gt;chan_id]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Execute all queued DMA descriptors */</div><div class='add'>+static void sirfsoc_dma_execute(struct sirfsoc_dma_chan *schan)</div><div class='add'>+{</div><div class='add'>+	struct sirfsoc_dma *sdma = dma_chan_to_sirfsoc_dma(&amp;schan-&gt;chan);</div><div class='add'>+	int cid = schan-&gt;chan.chan_id;</div><div class='add'>+	struct sirfsoc_dma_desc *sdesc = NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * lock has been held by functions calling this, so we don't hold</div><div class='add'>+	 * lock again</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	sdesc = list_first_entry(&amp;schan-&gt;queued, struct sirfsoc_dma_desc,</div><div class='add'>+		node);</div><div class='add'>+	/* Move the first queued descriptor to active list */</div><div class='add'>+	list_move_tail(&amp;schan-&gt;queued, &amp;schan-&gt;active);</div><div class='add'>+</div><div class='add'>+	/* Start the DMA transfer */</div><div class='add'>+	writel_relaxed(sdesc-&gt;width, sdma-&gt;base + SIRFSOC_DMA_WIDTH_0 +</div><div class='add'>+		cid * 4);</div><div class='add'>+	writel_relaxed(cid | (schan-&gt;mode &lt;&lt; SIRFSOC_DMA_MODE_CTRL_BIT) |</div><div class='add'>+		(sdesc-&gt;dir &lt;&lt; SIRFSOC_DMA_DIR_CTRL_BIT),</div><div class='add'>+		sdma-&gt;base + cid * 0x10 + SIRFSOC_DMA_CH_CTRL);</div><div class='add'>+	writel_relaxed(sdesc-&gt;xlen, sdma-&gt;base + cid * 0x10 +</div><div class='add'>+		SIRFSOC_DMA_CH_XLEN);</div><div class='add'>+	writel_relaxed(sdesc-&gt;ylen, sdma-&gt;base + cid * 0x10 +</div><div class='add'>+		SIRFSOC_DMA_CH_YLEN);</div><div class='add'>+	writel_relaxed(readl_relaxed(sdma-&gt;base + SIRFSOC_DMA_INT_EN) |</div><div class='add'>+		(1 &lt;&lt; cid), sdma-&gt;base + SIRFSOC_DMA_INT_EN);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * writel has an implict memory write barrier to make sure data is</div><div class='add'>+	 * flushed into memory before starting DMA</div><div class='add'>+	 */</div><div class='add'>+	writel(sdesc-&gt;addr &gt;&gt; 2, sdma-&gt;base + cid * 0x10 + SIRFSOC_DMA_CH_ADDR);</div><div class='add'>+</div><div class='add'>+	if (sdesc-&gt;cyclic) {</div><div class='add'>+		writel((1 &lt;&lt; cid) | 1 &lt;&lt; (cid + 16) |</div><div class='add'>+			readl_relaxed(sdma-&gt;base + SIRFSOC_DMA_CH_LOOP_CTRL),</div><div class='add'>+			sdma-&gt;base + SIRFSOC_DMA_CH_LOOP_CTRL);</div><div class='add'>+		schan-&gt;happened_cyclic = schan-&gt;completed_cyclic = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Interrupt handler */</div><div class='add'>+static irqreturn_t sirfsoc_dma_irq(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct sirfsoc_dma *sdma = data;</div><div class='add'>+	struct sirfsoc_dma_chan *schan;</div><div class='add'>+	struct sirfsoc_dma_desc *sdesc = NULL;</div><div class='add'>+	u32 is;</div><div class='add'>+	int ch;</div><div class='add'>+</div><div class='add'>+	is = readl(sdma-&gt;base + SIRFSOC_DMA_CH_INT);</div><div class='add'>+	while ((ch = fls(is) - 1) &gt;= 0) {</div><div class='add'>+		is &amp;= ~(1 &lt;&lt; ch);</div><div class='add'>+		writel_relaxed(1 &lt;&lt; ch, sdma-&gt;base + SIRFSOC_DMA_CH_INT);</div><div class='add'>+		schan = &amp;sdma-&gt;channels[ch];</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;schan-&gt;lock);</div><div class='add'>+</div><div class='add'>+		sdesc = list_first_entry(&amp;schan-&gt;active, struct sirfsoc_dma_desc,</div><div class='add'>+			node);</div><div class='add'>+		if (!sdesc-&gt;cyclic) {</div><div class='add'>+			/* Execute queued descriptors */</div><div class='add'>+			list_splice_tail_init(&amp;schan-&gt;active, &amp;schan-&gt;completed);</div><div class='add'>+			if (!list_empty(&amp;schan-&gt;queued))</div><div class='add'>+				sirfsoc_dma_execute(schan);</div><div class='add'>+		} else</div><div class='add'>+			schan-&gt;happened_cyclic++;</div><div class='add'>+</div><div class='add'>+		spin_unlock(&amp;schan-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Schedule tasklet */</div><div class='add'>+	tasklet_schedule(&amp;sdma-&gt;tasklet);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* process completed descriptors */</div><div class='add'>+static void sirfsoc_dma_process_completed(struct sirfsoc_dma *sdma)</div><div class='add'>+{</div><div class='add'>+	dma_cookie_t last_cookie = 0;</div><div class='add'>+	struct sirfsoc_dma_chan *schan;</div><div class='add'>+	struct sirfsoc_dma_desc *sdesc;</div><div class='add'>+	struct dma_async_tx_descriptor *desc;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned long happened_cyclic;</div><div class='add'>+	LIST_HEAD(list);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sdma-&gt;dma.chancnt; i++) {</div><div class='add'>+		schan = &amp;sdma-&gt;channels[i];</div><div class='add'>+</div><div class='add'>+		/* Get all completed descriptors */</div><div class='add'>+		spin_lock_irqsave(&amp;schan-&gt;lock, flags);</div><div class='add'>+		if (!list_empty(&amp;schan-&gt;completed)) {</div><div class='add'>+			list_splice_tail_init(&amp;schan-&gt;completed, &amp;list);</div><div class='add'>+			spin_unlock_irqrestore(&amp;schan-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+			/* Execute callbacks and run dependencies */</div><div class='add'>+			list_for_each_entry(sdesc, &amp;list, node) {</div><div class='add'>+				desc = &amp;sdesc-&gt;desc;</div><div class='add'>+</div><div class='add'>+				if (desc-&gt;callback)</div><div class='add'>+					desc-&gt;callback(desc-&gt;callback_param);</div><div class='add'>+</div><div class='add'>+				last_cookie = desc-&gt;cookie;</div><div class='add'>+				dma_run_dependencies(desc);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Free descriptors */</div><div class='add'>+			spin_lock_irqsave(&amp;schan-&gt;lock, flags);</div><div class='add'>+			list_splice_tail_init(&amp;list, &amp;schan-&gt;free);</div><div class='add'>+			schan-&gt;completed_cookie = last_cookie;</div><div class='add'>+			spin_unlock_irqrestore(&amp;schan-&gt;lock, flags);</div><div class='add'>+		} else {</div><div class='add'>+			/* for cyclic channel, desc is always in active list */</div><div class='add'>+			sdesc = list_first_entry(&amp;schan-&gt;active, struct sirfsoc_dma_desc,</div><div class='add'>+				node);</div><div class='add'>+</div><div class='add'>+			if (!sdesc || (sdesc &amp;&amp; !sdesc-&gt;cyclic)) {</div><div class='add'>+				/* without active cyclic DMA */</div><div class='add'>+				spin_unlock_irqrestore(&amp;schan-&gt;lock, flags);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* cyclic DMA */</div><div class='add'>+			happened_cyclic = schan-&gt;happened_cyclic;</div><div class='add'>+			spin_unlock_irqrestore(&amp;schan-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+			desc = &amp;sdesc-&gt;desc;</div><div class='add'>+			while (happened_cyclic != schan-&gt;completed_cyclic) {</div><div class='add'>+				if (desc-&gt;callback)</div><div class='add'>+					desc-&gt;callback(desc-&gt;callback_param);</div><div class='add'>+				schan-&gt;completed_cyclic++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* DMA Tasklet */</div><div class='add'>+static void sirfsoc_dma_tasklet(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct sirfsoc_dma *sdma = (void *)data;</div><div class='add'>+</div><div class='add'>+	sirfsoc_dma_process_completed(sdma);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Submit descriptor to hardware */</div><div class='add'>+static dma_cookie_t sirfsoc_dma_tx_submit(struct dma_async_tx_descriptor *txd)</div><div class='add'>+{</div><div class='add'>+	struct sirfsoc_dma_chan *schan = dma_chan_to_sirfsoc_dma_chan(txd-&gt;chan);</div><div class='add'>+	struct sirfsoc_dma_desc *sdesc;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	dma_cookie_t cookie;</div><div class='add'>+</div><div class='add'>+	sdesc = container_of(txd, struct sirfsoc_dma_desc, desc);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;schan-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Move descriptor to queue */</div><div class='add'>+	list_move_tail(&amp;sdesc-&gt;node, &amp;schan-&gt;queued);</div><div class='add'>+</div><div class='add'>+	/* Update cookie */</div><div class='add'>+	cookie = schan-&gt;chan.cookie + 1;</div><div class='add'>+	if (cookie &lt;= 0)</div><div class='add'>+		cookie = 1;</div><div class='add'>+</div><div class='add'>+	schan-&gt;chan.cookie = cookie;</div><div class='add'>+	sdesc-&gt;desc.cookie = cookie;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;schan-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return cookie;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sirfsoc_dma_slave_config(struct sirfsoc_dma_chan *schan,</div><div class='add'>+	struct dma_slave_config *config)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if ((config-&gt;src_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES) ||</div><div class='add'>+		(config-&gt;dst_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;schan-&gt;lock, flags);</div><div class='add'>+	schan-&gt;mode = (config-&gt;src_maxburst == 4 ? 1 : 0);</div><div class='add'>+	spin_unlock_irqrestore(&amp;schan-&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 sirfsoc_dma_terminate_all(struct sirfsoc_dma_chan *schan)</div><div class='add'>+{</div><div class='add'>+	struct sirfsoc_dma *sdma = dma_chan_to_sirfsoc_dma(&amp;schan-&gt;chan);</div><div class='add'>+	int cid = schan-&gt;chan.chan_id;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	writel_relaxed(readl_relaxed(sdma-&gt;base + SIRFSOC_DMA_INT_EN) &amp;</div><div class='add'>+		~(1 &lt;&lt; cid), sdma-&gt;base + SIRFSOC_DMA_INT_EN);</div><div class='add'>+	writel_relaxed(1 &lt;&lt; cid, sdma-&gt;base + SIRFSOC_DMA_CH_VALID);</div><div class='add'>+</div><div class='add'>+	writel_relaxed(readl_relaxed(sdma-&gt;base + SIRFSOC_DMA_CH_LOOP_CTRL)</div><div class='add'>+		&amp; ~((1 &lt;&lt; cid) | 1 &lt;&lt; (cid + 16)),</div><div class='add'>+			sdma-&gt;base + SIRFSOC_DMA_CH_LOOP_CTRL);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;schan-&gt;lock, flags);</div><div class='add'>+	list_splice_tail_init(&amp;schan-&gt;active, &amp;schan-&gt;free);</div><div class='add'>+	list_splice_tail_init(&amp;schan-&gt;queued, &amp;schan-&gt;free);</div><div class='add'>+	spin_unlock_irqrestore(&amp;schan-&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 sirfsoc_dma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,</div><div class='add'>+	unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct dma_slave_config *config;</div><div class='add'>+	struct sirfsoc_dma_chan *schan = dma_chan_to_sirfsoc_dma_chan(chan);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case DMA_TERMINATE_ALL:</div><div class='add'>+		return sirfsoc_dma_terminate_all(schan);</div><div class='add'>+	case DMA_SLAVE_CONFIG:</div><div class='add'>+		config = (struct dma_slave_config *)arg;</div><div class='add'>+		return sirfsoc_dma_slave_config(schan, config);</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Alloc channel resources */</div><div class='add'>+static int sirfsoc_dma_alloc_chan_resources(struct dma_chan *chan)</div><div class='add'>+{</div><div class='add'>+	struct sirfsoc_dma *sdma = dma_chan_to_sirfsoc_dma(chan);</div><div class='add'>+	struct sirfsoc_dma_chan *schan = dma_chan_to_sirfsoc_dma_chan(chan);</div><div class='add'>+	struct sirfsoc_dma_desc *sdesc;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	LIST_HEAD(descs);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Alloc descriptors for this channel */</div><div class='add'>+	for (i = 0; i &lt; SIRFSOC_DMA_DESCRIPTORS; i++) {</div><div class='add'>+		sdesc = kzalloc(sizeof(*sdesc), GFP_KERNEL);</div><div class='add'>+		if (!sdesc) {</div><div class='add'>+			dev_notice(sdma-&gt;dma.dev, "Memory allocation error. "</div><div class='add'>+				"Allocated only %u descriptors\n", i);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dma_async_tx_descriptor_init(&amp;sdesc-&gt;desc, chan);</div><div class='add'>+		sdesc-&gt;desc.flags = DMA_CTRL_ACK;</div><div class='add'>+		sdesc-&gt;desc.tx_submit = sirfsoc_dma_tx_submit;</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;sdesc-&gt;node, &amp;descs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Return error only if no descriptors were allocated */</div><div class='add'>+	if (i == 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;schan-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	list_splice_tail_init(&amp;descs, &amp;schan-&gt;free);</div><div class='add'>+	spin_unlock_irqrestore(&amp;schan-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Free channel resources */</div><div class='add'>+static void sirfsoc_dma_free_chan_resources(struct dma_chan *chan)</div><div class='add'>+{</div><div class='add'>+	struct sirfsoc_dma_chan *schan = dma_chan_to_sirfsoc_dma_chan(chan);</div><div class='add'>+	struct sirfsoc_dma_desc *sdesc, *tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	LIST_HEAD(descs);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;schan-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Channel must be idle */</div><div class='add'>+	BUG_ON(!list_empty(&amp;schan-&gt;prepared));</div><div class='add'>+	BUG_ON(!list_empty(&amp;schan-&gt;queued));</div><div class='add'>+	BUG_ON(!list_empty(&amp;schan-&gt;active));</div><div class='add'>+	BUG_ON(!list_empty(&amp;schan-&gt;completed));</div><div class='add'>+</div><div class='add'>+	/* Move data */</div><div class='add'>+	list_splice_tail_init(&amp;schan-&gt;free, &amp;descs);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;schan-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Free descriptors */</div><div class='add'>+	list_for_each_entry_safe(sdesc, tmp, &amp;descs, node)</div><div class='add'>+		kfree(sdesc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Send pending descriptor to hardware */</div><div class='add'>+static void sirfsoc_dma_issue_pending(struct dma_chan *chan)</div><div class='add'>+{</div><div class='add'>+	struct sirfsoc_dma_chan *schan = dma_chan_to_sirfsoc_dma_chan(chan);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;schan-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;schan-&gt;active) &amp;&amp; !list_empty(&amp;schan-&gt;queued))</div><div class='add'>+		sirfsoc_dma_execute(schan);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;schan-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check request completion status */</div><div class='add'>+static enum dma_status</div><div class='add'>+sirfsoc_dma_tx_status(struct dma_chan *chan, dma_cookie_t cookie,</div><div class='add'>+	struct dma_tx_state *txstate)</div><div class='add'>+{</div><div class='add'>+	struct sirfsoc_dma_chan *schan = dma_chan_to_sirfsoc_dma_chan(chan);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	dma_cookie_t last_used;</div><div class='add'>+	dma_cookie_t last_complete;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;schan-&gt;lock, flags);</div><div class='add'>+	last_used = schan-&gt;chan.cookie;</div><div class='add'>+	last_complete = schan-&gt;completed_cookie;</div><div class='add'>+	spin_unlock_irqrestore(&amp;schan-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	dma_set_tx_state(txstate, last_complete, last_used, 0);</div><div class='add'>+	return dma_async_is_complete(cookie, last_complete, last_used);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dma_async_tx_descriptor *sirfsoc_dma_prep_interleaved(</div><div class='add'>+	struct dma_chan *chan, struct dma_interleaved_template *xt,</div><div class='add'>+	unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	struct sirfsoc_dma *sdma = dma_chan_to_sirfsoc_dma(chan);</div><div class='add'>+	struct sirfsoc_dma_chan *schan = dma_chan_to_sirfsoc_dma_chan(chan);</div><div class='add'>+	struct sirfsoc_dma_desc *sdesc = NULL;</div><div class='add'>+	unsigned long iflags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if ((xt-&gt;dir != DMA_MEM_TO_DEV) || (xt-&gt;dir != DMA_DEV_TO_MEM)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_dir;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get free descriptor */</div><div class='add'>+	spin_lock_irqsave(&amp;schan-&gt;lock, iflags);</div><div class='add'>+	if (!list_empty(&amp;schan-&gt;free)) {</div><div class='add'>+		sdesc = list_first_entry(&amp;schan-&gt;free, struct sirfsoc_dma_desc,</div><div class='add'>+			node);</div><div class='add'>+		list_del(&amp;sdesc-&gt;node);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;schan-&gt;lock, iflags);</div><div class='add'>+</div><div class='add'>+	if (!sdesc) {</div><div class='add'>+		/* try to free completed descriptors */</div><div class='add'>+		sirfsoc_dma_process_completed(sdma);</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto no_desc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Place descriptor in prepared list */</div><div class='add'>+	spin_lock_irqsave(&amp;schan-&gt;lock, iflags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Number of chunks in a frame can only be 1 for prima2</div><div class='add'>+	 * and ylen (number of frame - 1) must be at least 0</div><div class='add'>+	 */</div><div class='add'>+	if ((xt-&gt;frame_size == 1) &amp;&amp; (xt-&gt;numf &gt; 0)) {</div><div class='add'>+		sdesc-&gt;cyclic = 0;</div><div class='add'>+		sdesc-&gt;xlen = xt-&gt;sgl[0].size / SIRFSOC_DMA_WORD_LEN;</div><div class='add'>+		sdesc-&gt;width = (xt-&gt;sgl[0].size + xt-&gt;sgl[0].icg) /</div><div class='add'>+				SIRFSOC_DMA_WORD_LEN;</div><div class='add'>+		sdesc-&gt;ylen = xt-&gt;numf - 1;</div><div class='add'>+		if (xt-&gt;dir == DMA_MEM_TO_DEV) {</div><div class='add'>+			sdesc-&gt;addr = xt-&gt;src_start;</div><div class='add'>+			sdesc-&gt;dir = 1;</div><div class='add'>+		} else {</div><div class='add'>+			sdesc-&gt;addr = xt-&gt;dst_start;</div><div class='add'>+			sdesc-&gt;dir = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;sdesc-&gt;node, &amp;schan-&gt;prepared);</div><div class='add'>+	} else {</div><div class='add'>+		pr_err("sirfsoc DMA Invalid xfer\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_xfer;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;schan-&gt;lock, iflags);</div><div class='add'>+</div><div class='add'>+	return &amp;sdesc-&gt;desc;</div><div class='add'>+err_xfer:</div><div class='add'>+	spin_unlock_irqrestore(&amp;schan-&gt;lock, iflags);</div><div class='add'>+no_desc:</div><div class='add'>+err_dir:</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dma_async_tx_descriptor *</div><div class='add'>+sirfsoc_dma_prep_cyclic(struct dma_chan *chan, dma_addr_t addr,</div><div class='add'>+	size_t buf_len, size_t period_len,</div><div class='add'>+	enum dma_transfer_direction direction)</div><div class='add'>+{</div><div class='add'>+	struct sirfsoc_dma_chan *schan = dma_chan_to_sirfsoc_dma_chan(chan);</div><div class='add'>+	struct sirfsoc_dma_desc *sdesc = NULL;</div><div class='add'>+	unsigned long iflags;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * we only support cycle transfer with 2 period</div><div class='add'>+	 * If the X-length is set to 0, it would be the loop mode.</div><div class='add'>+	 * The DMA address keeps increasing until reaching the end of a loop</div><div class='add'>+	 * area whose size is defined by (DMA_WIDTH x (Y_LENGTH + 1)). Then</div><div class='add'>+	 * the DMA address goes back to the beginning of this area.</div><div class='add'>+	 * In loop mode, the DMA data region is divided into two parts, BUFA</div><div class='add'>+	 * and BUFB. DMA controller generates interrupts twice in each loop:</div><div class='add'>+	 * when the DMA address reaches the end of BUFA or the end of the</div><div class='add'>+	 * BUFB</div><div class='add'>+	 */</div><div class='add'>+	if (buf_len !=  2 * period_len)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	/* Get free descriptor */</div><div class='add'>+	spin_lock_irqsave(&amp;schan-&gt;lock, iflags);</div><div class='add'>+	if (!list_empty(&amp;schan-&gt;free)) {</div><div class='add'>+		sdesc = list_first_entry(&amp;schan-&gt;free, struct sirfsoc_dma_desc,</div><div class='add'>+			node);</div><div class='add'>+		list_del(&amp;sdesc-&gt;node);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;schan-&gt;lock, iflags);</div><div class='add'>+</div><div class='add'>+	if (!sdesc)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Place descriptor in prepared list */</div><div class='add'>+	spin_lock_irqsave(&amp;schan-&gt;lock, iflags);</div><div class='add'>+	sdesc-&gt;addr = addr;</div><div class='add'>+	sdesc-&gt;cyclic = 1;</div><div class='add'>+	sdesc-&gt;xlen = 0;</div><div class='add'>+	sdesc-&gt;ylen = buf_len / SIRFSOC_DMA_WORD_LEN - 1;</div><div class='add'>+	sdesc-&gt;width = 1;</div><div class='add'>+	list_add_tail(&amp;sdesc-&gt;node, &amp;schan-&gt;prepared);</div><div class='add'>+	spin_unlock_irqrestore(&amp;schan-&gt;lock, iflags);</div><div class='add'>+</div><div class='add'>+	return &amp;sdesc-&gt;desc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The DMA controller consists of 16 independent DMA channels.</div><div class='add'>+ * Each channel is allocated to a different function</div><div class='add'>+ */</div><div class='add'>+bool sirfsoc_dma_filter_id(struct dma_chan *chan, void *chan_id)</div><div class='add'>+{</div><div class='add'>+	unsigned int ch_nr = (unsigned int) chan_id;</div><div class='add'>+</div><div class='add'>+	if (ch_nr == chan-&gt;chan_id +</div><div class='add'>+		chan-&gt;device-&gt;dev_id * SIRFSOC_DMA_CHANNELS)</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(sirfsoc_dma_filter_id);</div><div class='add'>+</div><div class='add'>+static int __devinit sirfsoc_dma_probe(struct platform_device *op)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dn = op-&gt;dev.of_node;</div><div class='add'>+	struct device *dev = &amp;op-&gt;dev;</div><div class='add'>+	struct dma_device *dma;</div><div class='add'>+	struct sirfsoc_dma *sdma;</div><div class='add'>+	struct sirfsoc_dma_chan *schan;</div><div class='add'>+	struct resource res;</div><div class='add'>+	ulong regs_start, regs_size;</div><div class='add'>+	u32 id;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	sdma = devm_kzalloc(dev, sizeof(*sdma), GFP_KERNEL);</div><div class='add'>+	if (!sdma) {</div><div class='add'>+		dev_err(dev, "Memory exhausted!\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (of_property_read_u32(dn, "cell-index", &amp;id)) {</div><div class='add'>+		dev_err(dev, "Fail to get DMAC index\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto free_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sdma-&gt;irq = irq_of_parse_and_map(dn, 0);</div><div class='add'>+	if (sdma-&gt;irq == NO_IRQ) {</div><div class='add'>+		dev_err(dev, "Error mapping IRQ!\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto free_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = of_address_to_resource(dn, 0, &amp;res);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "Error parsing memory region!\n");</div><div class='add'>+		goto free_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regs_start = res.start;</div><div class='add'>+	regs_size = resource_size(&amp;res);</div><div class='add'>+</div><div class='add'>+	sdma-&gt;base = devm_ioremap(dev, regs_start, regs_size);</div><div class='add'>+	if (!sdma-&gt;base) {</div><div class='add'>+		dev_err(dev, "Error mapping memory region!\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto irq_dispose;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = devm_request_irq(dev, sdma-&gt;irq, &amp;sirfsoc_dma_irq, 0, DRV_NAME,</div><div class='add'>+		sdma);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "Error requesting IRQ!\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto unmap_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma = &amp;sdma-&gt;dma;</div><div class='add'>+	dma-&gt;dev = dev;</div><div class='add'>+	dma-&gt;chancnt = SIRFSOC_DMA_CHANNELS;</div><div class='add'>+</div><div class='add'>+	dma-&gt;device_alloc_chan_resources = sirfsoc_dma_alloc_chan_resources;</div><div class='add'>+	dma-&gt;device_free_chan_resources = sirfsoc_dma_free_chan_resources;</div><div class='add'>+	dma-&gt;device_issue_pending = sirfsoc_dma_issue_pending;</div><div class='add'>+	dma-&gt;device_control = sirfsoc_dma_control;</div><div class='add'>+	dma-&gt;device_tx_status = sirfsoc_dma_tx_status;</div><div class='add'>+	dma-&gt;device_prep_interleaved_dma = sirfsoc_dma_prep_interleaved;</div><div class='add'>+	dma-&gt;device_prep_dma_cyclic = sirfsoc_dma_prep_cyclic;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;dma-&gt;channels);</div><div class='add'>+	dma_cap_set(DMA_SLAVE, dma-&gt;cap_mask);</div><div class='add'>+	dma_cap_set(DMA_CYCLIC, dma-&gt;cap_mask);</div><div class='add'>+	dma_cap_set(DMA_INTERLEAVE, dma-&gt;cap_mask);</div><div class='add'>+	dma_cap_set(DMA_PRIVATE, dma-&gt;cap_mask);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dma-&gt;chancnt; i++) {</div><div class='add'>+		schan = &amp;sdma-&gt;channels[i];</div><div class='add'>+</div><div class='add'>+		schan-&gt;chan.device = dma;</div><div class='add'>+		schan-&gt;chan.cookie = 1;</div><div class='add'>+		schan-&gt;completed_cookie = schan-&gt;chan.cookie;</div><div class='add'>+</div><div class='add'>+		INIT_LIST_HEAD(&amp;schan-&gt;free);</div><div class='add'>+		INIT_LIST_HEAD(&amp;schan-&gt;prepared);</div><div class='add'>+		INIT_LIST_HEAD(&amp;schan-&gt;queued);</div><div class='add'>+		INIT_LIST_HEAD(&amp;schan-&gt;active);</div><div class='add'>+		INIT_LIST_HEAD(&amp;schan-&gt;completed);</div><div class='add'>+</div><div class='add'>+		spin_lock_init(&amp;schan-&gt;lock);</div><div class='add'>+		list_add_tail(&amp;schan-&gt;chan.device_node, &amp;dma-&gt;channels);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tasklet_init(&amp;sdma-&gt;tasklet, sirfsoc_dma_tasklet, (unsigned long)sdma);</div><div class='add'>+</div><div class='add'>+	/* Register DMA engine */</div><div class='add'>+	dev_set_drvdata(dev, sdma);</div><div class='add'>+	ret = dma_async_device_register(dma);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_irq;</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "initialized SIRFSOC DMAC driver\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_irq:</div><div class='add'>+	devm_free_irq(dev, sdma-&gt;irq, sdma);</div><div class='add'>+irq_dispose:</div><div class='add'>+	irq_dispose_mapping(sdma-&gt;irq);</div><div class='add'>+unmap_mem:</div><div class='add'>+	iounmap(sdma-&gt;base);</div><div class='add'>+free_mem:</div><div class='add'>+	devm_kfree(dev, sdma);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit sirfsoc_dma_remove(struct platform_device *op)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;op-&gt;dev;</div><div class='add'>+	struct sirfsoc_dma *sdma = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	dma_async_device_unregister(&amp;sdma-&gt;dma);</div><div class='add'>+	devm_free_irq(dev, sdma-&gt;irq, sdma);</div><div class='add'>+	irq_dispose_mapping(sdma-&gt;irq);</div><div class='add'>+	iounmap(sdma-&gt;base);</div><div class='add'>+	devm_kfree(dev, sdma);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct of_device_id sirfsoc_dma_match[] = {</div><div class='add'>+	{ .compatible = "sirf,prima2-dmac", },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver sirfsoc_dma_driver = {</div><div class='add'>+	.probe		= sirfsoc_dma_probe,</div><div class='add'>+	.remove		= __devexit_p(sirfsoc_dma_remove),</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = DRV_NAME,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+		.of_match_table	= sirfsoc_dma_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(sirfsoc_dma_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Rongjun Ying &lt;rongjun.ying@csr.com&gt;, "</div><div class='add'>+	"Barry Song &lt;baohua.song@csr.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("SIRFSOC DMA control driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c<br/>index 13259cad0ceb..cc5ecbc067a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/ste_dma40.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/ste_dma40.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/ste_dma40.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/ste_dma40.c</a></div><div class='hunk'>@@ -14,6 +14,8 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/delay.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='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -32,6 +34,9 @@</div><div class='ctx'> /* Maximum iterations taken before giving up suspending a channel */</div><div class='ctx'> #define D40_SUSPEND_MAX_IT 500</div><div class='ctx'> </div><div class='add'>+/* Milliseconds */</div><div class='add'>+#define DMA40_AUTOSUSPEND_DELAY	100</div><div class='add'>+</div><div class='ctx'> /* Hardware requirement on LCLA alignment */</div><div class='ctx'> #define LCLA_ALIGNMENT 0x40000</div><div class='ctx'> </div><div class='hunk'>@@ -62,6 +67,55 @@ enum d40_command {</div><div class='ctx'> 	D40_DMA_SUSPENDED	= 3</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * These are the registers that has to be saved and later restored</div><div class='add'>+ * when the DMA hw is powered off.</div><div class='add'>+ * TODO: Add save/restore of D40_DREG_GCC on dma40 v3 or later, if that works.</div><div class='add'>+ */</div><div class='add'>+static u32 d40_backup_regs[] = {</div><div class='add'>+	D40_DREG_LCPA,</div><div class='add'>+	D40_DREG_LCLA,</div><div class='add'>+	D40_DREG_PRMSE,</div><div class='add'>+	D40_DREG_PRMSO,</div><div class='add'>+	D40_DREG_PRMOE,</div><div class='add'>+	D40_DREG_PRMOO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BACKUP_REGS_SZ ARRAY_SIZE(d40_backup_regs)</div><div class='add'>+</div><div class='add'>+/* TODO: Check if all these registers have to be saved/restored on dma40 v3 */</div><div class='add'>+static u32 d40_backup_regs_v3[] = {</div><div class='add'>+	D40_DREG_PSEG1,</div><div class='add'>+	D40_DREG_PSEG2,</div><div class='add'>+	D40_DREG_PSEG3,</div><div class='add'>+	D40_DREG_PSEG4,</div><div class='add'>+	D40_DREG_PCEG1,</div><div class='add'>+	D40_DREG_PCEG2,</div><div class='add'>+	D40_DREG_PCEG3,</div><div class='add'>+	D40_DREG_PCEG4,</div><div class='add'>+	D40_DREG_RSEG1,</div><div class='add'>+	D40_DREG_RSEG2,</div><div class='add'>+	D40_DREG_RSEG3,</div><div class='add'>+	D40_DREG_RSEG4,</div><div class='add'>+	D40_DREG_RCEG1,</div><div class='add'>+	D40_DREG_RCEG2,</div><div class='add'>+	D40_DREG_RCEG3,</div><div class='add'>+	D40_DREG_RCEG4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BACKUP_REGS_SZ_V3 ARRAY_SIZE(d40_backup_regs_v3)</div><div class='add'>+</div><div class='add'>+static u32 d40_backup_regs_chan[] = {</div><div class='add'>+	D40_CHAN_REG_SSCFG,</div><div class='add'>+	D40_CHAN_REG_SSELT,</div><div class='add'>+	D40_CHAN_REG_SSPTR,</div><div class='add'>+	D40_CHAN_REG_SSLNK,</div><div class='add'>+	D40_CHAN_REG_SDCFG,</div><div class='add'>+	D40_CHAN_REG_SDELT,</div><div class='add'>+	D40_CHAN_REG_SDPTR,</div><div class='add'>+	D40_CHAN_REG_SDLNK,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct d40_lli_pool - Structure for keeping LLIs in memory</div><div class='ctx'>  *</div><div class='hunk'>@@ -96,7 +150,7 @@ struct d40_lli_pool {</div><div class='ctx'>  * during a transfer.</div><div class='ctx'>  * @node: List entry.</div><div class='ctx'>  * @is_in_client_list: true if the client owns this descriptor.</div><div class='del'>- * the previous one.</div><div class='add'>+ * @cyclic: true if this is a cyclic job</div><div class='ctx'>  *</div><div class='ctx'>  * This descriptor is used for both logical and physical transfers.</div><div class='ctx'>  */</div><div class='hunk'>@@ -143,6 +197,7 @@ struct d40_lcla_pool {</div><div class='ctx'>  * channels.</div><div class='ctx'>  *</div><div class='ctx'>  * @lock: A lock protection this entity.</div><div class='add'>+ * @reserved: True if used by secure world or otherwise.</div><div class='ctx'>  * @num: The physical channel number of this entity.</div><div class='ctx'>  * @allocated_src: Bit mapped to show which src event line's are mapped to</div><div class='ctx'>  * this physical channel. Can also be free or physically allocated.</div><div class='hunk'>@@ -152,6 +207,7 @@ struct d40_lcla_pool {</div><div class='ctx'>  */</div><div class='ctx'> struct d40_phy_res {</div><div class='ctx'> 	spinlock_t lock;</div><div class='add'>+	bool	   reserved;</div><div class='ctx'> 	int	   num;</div><div class='ctx'> 	u32	   allocated_src;</div><div class='ctx'> 	u32	   allocated_dst;</div><div class='hunk'>@@ -185,7 +241,6 @@ struct d40_base;</div><div class='ctx'>  * @src_def_cfg: Default cfg register setting for src.</div><div class='ctx'>  * @dst_def_cfg: Default cfg register setting for dst.</div><div class='ctx'>  * @log_def: Default logical channel settings.</div><div class='del'>- * @lcla: Space for one dst src pair for logical channel transfers.</div><div class='ctx'>  * @lcpa: Pointer to dst and src lcpa settings.</div><div class='ctx'>  * @runtime_addr: runtime configured address.</div><div class='ctx'>  * @runtime_direction: runtime configured direction.</div><div class='hunk'>@@ -217,7 +272,7 @@ struct d40_chan {</div><div class='ctx'> 	struct d40_log_lli_full		*lcpa;</div><div class='ctx'> 	/* Runtime reconfiguration */</div><div class='ctx'> 	dma_addr_t			runtime_addr;</div><div class='del'>-	enum dma_data_direction		runtime_direction;</div><div class='add'>+	enum dma_transfer_direction	runtime_direction;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -241,6 +296,7 @@ struct d40_chan {</div><div class='ctx'>  * @dma_both: dma_device channels that can do both memcpy and slave transfers.</div><div class='ctx'>  * @dma_slave: dma_device channels that can do only do slave transfers.</div><div class='ctx'>  * @dma_memcpy: dma_device channels that can do only do memcpy transfers.</div><div class='add'>+ * @phy_chans: Room for all possible physical channels in system.</div><div class='ctx'>  * @log_chans: Room for all possible logical channels in system.</div><div class='ctx'>  * @lookup_log_chans: Used to map interrupt number to logical channel. Points</div><div class='ctx'>  * to log_chans entries.</div><div class='hunk'>@@ -248,12 +304,20 @@ struct d40_chan {</div><div class='ctx'>  * to phy_chans entries.</div><div class='ctx'>  * @plat_data: Pointer to provided platform_data which is the driver</div><div class='ctx'>  * configuration.</div><div class='add'>+ * @lcpa_regulator: Pointer to hold the regulator for the esram bank for lcla.</div><div class='ctx'>  * @phy_res: Vector containing all physical channels.</div><div class='ctx'>  * @lcla_pool: lcla pool settings and data.</div><div class='ctx'>  * @lcpa_base: The virtual mapped address of LCPA.</div><div class='ctx'>  * @phy_lcpa: The physical address of the LCPA.</div><div class='ctx'>  * @lcpa_size: The size of the LCPA area.</div><div class='ctx'>  * @desc_slab: cache for descriptors.</div><div class='add'>+ * @reg_val_backup: Here the values of some hardware registers are stored</div><div class='add'>+ * before the DMA is powered off. They are restored when the power is back on.</div><div class='add'>+ * @reg_val_backup_v3: Backup of registers that only exits on dma40 v3 and</div><div class='add'>+ * later.</div><div class='add'>+ * @reg_val_backup_chan: Backup data for standard channel parameter registers.</div><div class='add'>+ * @gcc_pwr_off_mask: Mask to maintain the channels that can be turned off.</div><div class='add'>+ * @initialized: true if the dma has been initialized</div><div class='ctx'>  */</div><div class='ctx'> struct d40_base {</div><div class='ctx'> 	spinlock_t			 interrupt_lock;</div><div class='hunk'>@@ -275,6 +339,7 @@ struct d40_base {</div><div class='ctx'> 	struct d40_chan			**lookup_log_chans;</div><div class='ctx'> 	struct d40_chan			**lookup_phy_chans;</div><div class='ctx'> 	struct stedma40_platform_data	 *plat_data;</div><div class='add'>+	struct regulator		 *lcpa_regulator;</div><div class='ctx'> 	/* Physical half channels */</div><div class='ctx'> 	struct d40_phy_res		 *phy_res;</div><div class='ctx'> 	struct d40_lcla_pool		  lcla_pool;</div><div class='hunk'>@@ -282,6 +347,11 @@ struct d40_base {</div><div class='ctx'> 	dma_addr_t			  phy_lcpa;</div><div class='ctx'> 	resource_size_t			  lcpa_size;</div><div class='ctx'> 	struct kmem_cache		 *desc_slab;</div><div class='add'>+	u32				  reg_val_backup[BACKUP_REGS_SZ];</div><div class='add'>+	u32				  reg_val_backup_v3[BACKUP_REGS_SZ_V3];</div><div class='add'>+	u32				 *reg_val_backup_chan;</div><div class='add'>+	u16				  gcc_pwr_off_mask;</div><div class='add'>+	bool				  initialized;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -479,13 +549,14 @@ static struct d40_desc *d40_desc_get(struct d40_chan *d40c)</div><div class='ctx'> 		struct d40_desc *d;</div><div class='ctx'> 		struct d40_desc *_d;</div><div class='ctx'> </div><div class='del'>-		list_for_each_entry_safe(d, _d, &amp;d40c-&gt;client, node)</div><div class='add'>+		list_for_each_entry_safe(d, _d, &amp;d40c-&gt;client, node) {</div><div class='ctx'> 			if (async_tx_test_ack(&amp;d-&gt;txd)) {</div><div class='ctx'> 				d40_desc_remove(d);</div><div class='ctx'> 				desc = d;</div><div class='ctx'> 				memset(desc, 0, sizeof(*desc));</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!desc)</div><div class='hunk'>@@ -536,6 +607,7 @@ static void d40_log_lli_to_lcxa(struct d40_chan *chan, struct d40_desc *desc)</div><div class='ctx'> 	bool cyclic = desc-&gt;cyclic;</div><div class='ctx'> 	int curr_lcla = -EINVAL;</div><div class='ctx'> 	int first_lcla = 0;</div><div class='add'>+	bool use_esram_lcla = chan-&gt;base-&gt;plat_data-&gt;use_esram_lcla;</div><div class='ctx'> 	bool linkback;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -608,11 +680,16 @@ static void d40_log_lli_to_lcxa(struct d40_chan *chan, struct d40_desc *desc)</div><div class='ctx'> 				       &amp;lli-&gt;src[lli_current],</div><div class='ctx'> 				       next_lcla, flags);</div><div class='ctx'> </div><div class='del'>-		dma_sync_single_range_for_device(chan-&gt;base-&gt;dev,</div><div class='del'>-					pool-&gt;dma_addr, lcla_offset,</div><div class='del'>-					2 * sizeof(struct d40_log_lli),</div><div class='del'>-					DMA_TO_DEVICE);</div><div class='del'>-</div><div class='add'>+		/*</div><div class='add'>+		 * Cache maintenance is not needed if lcla is</div><div class='add'>+		 * mapped in esram</div><div class='add'>+		 */</div><div class='add'>+		if (!use_esram_lcla) {</div><div class='add'>+			dma_sync_single_range_for_device(chan-&gt;base-&gt;dev,</div><div class='add'>+						pool-&gt;dma_addr, lcla_offset,</div><div class='add'>+						2 * sizeof(struct d40_log_lli),</div><div class='add'>+						DMA_TO_DEVICE);</div><div class='add'>+		}</div><div class='ctx'> 		curr_lcla = next_lcla;</div><div class='ctx'> </div><div class='ctx'> 		if (curr_lcla == -EINVAL || curr_lcla == first_lcla) {</div><div class='hunk'>@@ -740,7 +817,61 @@ static int d40_sg_2_dmalen(struct scatterlist *sgl, int sg_len,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Support functions for logical channels */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static void dma40_backup(void __iomem *baseaddr, u32 *backup,</div><div class='add'>+			 u32 *regaddr, int num, bool save)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		void __iomem *addr = baseaddr + regaddr[i];</div><div class='add'>+</div><div class='add'>+		if (save)</div><div class='add'>+			backup[i] = readl_relaxed(addr);</div><div class='add'>+		else</div><div class='add'>+			writel_relaxed(backup[i], addr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void d40_save_restore_registers(struct d40_base *base, bool save)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Save/Restore channel specific registers */</div><div class='add'>+	for (i = 0; i &lt; base-&gt;num_phy_chans; i++) {</div><div class='add'>+		void __iomem *addr;</div><div class='add'>+		int idx;</div><div class='add'>+</div><div class='add'>+		if (base-&gt;phy_res[i].reserved)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		addr = base-&gt;virtbase + D40_DREG_PCBASE + i * D40_DREG_PCDELTA;</div><div class='add'>+		idx = i * ARRAY_SIZE(d40_backup_regs_chan);</div><div class='add'>+</div><div class='add'>+		dma40_backup(addr, &amp;base-&gt;reg_val_backup_chan[idx],</div><div class='add'>+			     d40_backup_regs_chan,</div><div class='add'>+			     ARRAY_SIZE(d40_backup_regs_chan),</div><div class='add'>+			     save);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Save/Restore global registers */</div><div class='add'>+	dma40_backup(base-&gt;virtbase, base-&gt;reg_val_backup,</div><div class='add'>+		     d40_backup_regs, ARRAY_SIZE(d40_backup_regs),</div><div class='add'>+		     save);</div><div class='add'>+</div><div class='add'>+	/* Save/Restore registers only existing on dma40 v3 and later */</div><div class='add'>+	if (base-&gt;rev &gt;= 3)</div><div class='add'>+		dma40_backup(base-&gt;virtbase, base-&gt;reg_val_backup_v3,</div><div class='add'>+			     d40_backup_regs_v3,</div><div class='add'>+			     ARRAY_SIZE(d40_backup_regs_v3),</div><div class='add'>+			     save);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void d40_save_restore_registers(struct d40_base *base, bool save)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static int d40_channel_execute_command(struct d40_chan *d40c,</div><div class='ctx'> 				       enum d40_command command)</div><div class='hunk'>@@ -973,6 +1104,10 @@ static void d40_config_write(struct d40_chan *d40c)</div><div class='ctx'> 		/* Set LIDX for lcla */</div><div class='ctx'> 		writel(lidx, chanbase + D40_CHAN_REG_SSELT);</div><div class='ctx'> 		writel(lidx, chanbase + D40_CHAN_REG_SDELT);</div><div class='add'>+</div><div class='add'>+		/* Clear LNK which will be used by d40_chan_has_events() */</div><div class='add'>+		writel(0, chanbase + D40_CHAN_REG_SSLNK);</div><div class='add'>+		writel(0, chanbase + D40_CHAN_REG_SDLNK);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1013,6 +1148,7 @@ static int d40_pause(struct d40_chan *d40c)</div><div class='ctx'> 	if (!d40c-&gt;busy)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	pm_runtime_get_sync(d40c-&gt;base-&gt;dev);</div><div class='ctx'> 	spin_lock_irqsave(&amp;d40c-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	res = d40_channel_execute_command(d40c, D40_DMA_SUSPEND_REQ);</div><div class='hunk'>@@ -1025,7 +1161,8 @@ static int d40_pause(struct d40_chan *d40c)</div><div class='ctx'> 								  D40_DMA_RUN);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	pm_runtime_mark_last_busy(d40c-&gt;base-&gt;dev);</div><div class='add'>+	pm_runtime_put_autosuspend(d40c-&gt;base-&gt;dev);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;d40c-&gt;lock, flags);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -1039,7 +1176,7 @@ static int d40_resume(struct d40_chan *d40c)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;d40c-&gt;lock, flags);</div><div class='del'>-</div><div class='add'>+	pm_runtime_get_sync(d40c-&gt;base-&gt;dev);</div><div class='ctx'> 	if (d40c-&gt;base-&gt;rev == 0)</div><div class='ctx'> 		if (chan_is_logical(d40c)) {</div><div class='ctx'> 			res = d40_channel_execute_command(d40c,</div><div class='hunk'>@@ -1057,6 +1194,8 @@ static int d40_resume(struct d40_chan *d40c)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> no_suspend:</div><div class='add'>+	pm_runtime_mark_last_busy(d40c-&gt;base-&gt;dev);</div><div class='add'>+	pm_runtime_put_autosuspend(d40c-&gt;base-&gt;dev);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;d40c-&gt;lock, flags);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -1129,7 +1268,10 @@ static struct d40_desc *d40_queue_start(struct d40_chan *d40c)</div><div class='ctx'> 	d40d = d40_first_queued(d40c);</div><div class='ctx'> </div><div class='ctx'> 	if (d40d != NULL) {</div><div class='del'>-		d40c-&gt;busy = true;</div><div class='add'>+		if (!d40c-&gt;busy)</div><div class='add'>+			d40c-&gt;busy = true;</div><div class='add'>+</div><div class='add'>+		pm_runtime_get_sync(d40c-&gt;base-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 		/* Remove from queue */</div><div class='ctx'> 		d40_desc_remove(d40d);</div><div class='hunk'>@@ -1190,6 +1332,8 @@ static void dma_tc_handle(struct d40_chan *d40c)</div><div class='ctx'> </div><div class='ctx'> 		if (d40_queue_start(d40c) == NULL)</div><div class='ctx'> 			d40c-&gt;busy = false;</div><div class='add'>+		pm_runtime_mark_last_busy(d40c-&gt;base-&gt;dev);</div><div class='add'>+		pm_runtime_put_autosuspend(d40c-&gt;base-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	d40c-&gt;pending_tx++;</div><div class='hunk'>@@ -1405,11 +1549,16 @@ static int d40_validate_conf(struct d40_chan *d40c,</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool d40_alloc_mask_set(struct d40_phy_res *phy, bool is_src,</div><div class='del'>-			       int log_event_line, bool is_log)</div><div class='add'>+static bool d40_alloc_mask_set(struct d40_phy_res *phy,</div><div class='add'>+			       bool is_src, int log_event_line, bool is_log,</div><div class='add'>+			       bool *first_user)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	spin_lock_irqsave(&amp;phy-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	*first_user = ((phy-&gt;allocated_src | phy-&gt;allocated_dst)</div><div class='add'>+			== D40_ALLOC_FREE);</div><div class='add'>+</div><div class='ctx'> 	if (!is_log) {</div><div class='ctx'> 		/* Physical interrupts are masked per physical full channel */</div><div class='ctx'> 		if (phy-&gt;allocated_src == D40_ALLOC_FREE &amp;&amp;</div><div class='hunk'>@@ -1490,7 +1639,7 @@ out:</div><div class='ctx'> 	return is_free;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int d40_allocate_channel(struct d40_chan *d40c)</div><div class='add'>+static int d40_allocate_channel(struct d40_chan *d40c, bool *first_phy_user)</div><div class='ctx'> {</div><div class='ctx'> 	int dev_type;</div><div class='ctx'> 	int event_group;</div><div class='hunk'>@@ -1526,7 +1675,8 @@ static int d40_allocate_channel(struct d40_chan *d40c)</div><div class='ctx'> 			for (i = 0; i &lt; d40c-&gt;base-&gt;num_phy_chans; i++) {</div><div class='ctx'> </div><div class='ctx'> 				if (d40_alloc_mask_set(&amp;phys[i], is_src,</div><div class='del'>-						       0, is_log))</div><div class='add'>+						       0, is_log,</div><div class='add'>+						       first_phy_user))</div><div class='ctx'> 					goto found_phy;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else</div><div class='hunk'>@@ -1536,7 +1686,8 @@ static int d40_allocate_channel(struct d40_chan *d40c)</div><div class='ctx'> 					if (d40_alloc_mask_set(&amp;phys[i],</div><div class='ctx'> 							       is_src,</div><div class='ctx'> 							       0,</div><div class='del'>-							       is_log))</div><div class='add'>+							       is_log,</div><div class='add'>+							       first_phy_user))</div><div class='ctx'> 						goto found_phy;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1552,6 +1703,25 @@ found_phy:</div><div class='ctx'> 	/* Find logical channel */</div><div class='ctx'> 	for (j = 0; j &lt; d40c-&gt;base-&gt;num_phy_chans; j += 8) {</div><div class='ctx'> 		int phy_num = j + event_group * 2;</div><div class='add'>+</div><div class='add'>+		if (d40c-&gt;dma_cfg.use_fixed_channel) {</div><div class='add'>+			i = d40c-&gt;dma_cfg.phy_channel;</div><div class='add'>+</div><div class='add'>+			if ((i != phy_num) &amp;&amp; (i != phy_num + 1)) {</div><div class='add'>+				dev_err(chan2dev(d40c),</div><div class='add'>+					"invalid fixed phy channel %d\n", i);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (d40_alloc_mask_set(&amp;phys[i], is_src, event_line,</div><div class='add'>+					       is_log, first_phy_user))</div><div class='add'>+				goto found_log;</div><div class='add'>+</div><div class='add'>+			dev_err(chan2dev(d40c),</div><div class='add'>+				"could not allocate fixed phy channel %d\n", i);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Spread logical channels across all available physical rather</div><div class='ctx'> 		 * than pack every logical channel at the first available phy</div><div class='hunk'>@@ -1560,13 +1730,15 @@ found_phy:</div><div class='ctx'> 		if (is_src) {</div><div class='ctx'> 			for (i = phy_num; i &lt; phy_num + 2; i++) {</div><div class='ctx'> 				if (d40_alloc_mask_set(&amp;phys[i], is_src,</div><div class='del'>-						       event_line, is_log))</div><div class='add'>+						       event_line, is_log,</div><div class='add'>+						       first_phy_user))</div><div class='ctx'> 					goto found_log;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			for (i = phy_num + 1; i &gt;= phy_num; i--) {</div><div class='ctx'> 				if (d40_alloc_mask_set(&amp;phys[i], is_src,</div><div class='del'>-						       event_line, is_log))</div><div class='add'>+						       event_line, is_log,</div><div class='add'>+						       first_phy_user))</div><div class='ctx'> 					goto found_log;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1643,10 +1815,11 @@ static int d40_free_dma(struct d40_chan *d40c)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	pm_runtime_get_sync(d40c-&gt;base-&gt;dev);</div><div class='ctx'> 	res = d40_channel_execute_command(d40c, D40_DMA_SUSPEND_REQ);</div><div class='ctx'> 	if (res) {</div><div class='ctx'> 		chan_err(d40c, "suspend failed\n");</div><div class='del'>-		return res;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (chan_is_logical(d40c)) {</div><div class='hunk'>@@ -1664,13 +1837,11 @@ static int d40_free_dma(struct d40_chan *d40c)</div><div class='ctx'> 			if (d40_chan_has_events(d40c)) {</div><div class='ctx'> 				res = d40_channel_execute_command(d40c,</div><div class='ctx'> 								  D40_DMA_RUN);</div><div class='del'>-				if (res) {</div><div class='add'>+				if (res)</div><div class='ctx'> 					chan_err(d40c,</div><div class='ctx'> 						"Executing RUN command\n");</div><div class='del'>-					return res;</div><div class='del'>-				}</div><div class='ctx'> 			}</div><div class='del'>-			return 0;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		(void) d40_alloc_mask_free(phy, is_src, 0);</div><div class='hunk'>@@ -1680,13 +1851,23 @@ static int d40_free_dma(struct d40_chan *d40c)</div><div class='ctx'> 	res = d40_channel_execute_command(d40c, D40_DMA_STOP);</div><div class='ctx'> 	if (res) {</div><div class='ctx'> 		chan_err(d40c, "Failed to stop channel\n");</div><div class='del'>-		return res;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (d40c-&gt;busy) {</div><div class='add'>+		pm_runtime_mark_last_busy(d40c-&gt;base-&gt;dev);</div><div class='add'>+		pm_runtime_put_autosuspend(d40c-&gt;base-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	d40c-&gt;busy = false;</div><div class='ctx'> 	d40c-&gt;phy_chan = NULL;</div><div class='ctx'> 	d40c-&gt;configured = false;</div><div class='ctx'> 	d40c-&gt;base-&gt;lookup_phy_chans[phy-&gt;num] = NULL;</div><div class='add'>+out:</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	pm_runtime_mark_last_busy(d40c-&gt;base-&gt;dev);</div><div class='add'>+	pm_runtime_put_autosuspend(d40c-&gt;base-&gt;dev);</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool d40_is_paused(struct d40_chan *d40c)</div><div class='hunk'>@@ -1855,7 +2036,7 @@ err:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static dma_addr_t</div><div class='del'>-d40_get_dev_addr(struct d40_chan *chan, enum dma_data_direction direction)</div><div class='add'>+d40_get_dev_addr(struct d40_chan *chan, enum dma_transfer_direction direction)</div><div class='ctx'> {</div><div class='ctx'> 	struct stedma40_platform_data *plat = chan-&gt;base-&gt;plat_data;</div><div class='ctx'> 	struct stedma40_chan_cfg *cfg = &amp;chan-&gt;dma_cfg;</div><div class='hunk'>@@ -1864,9 +2045,9 @@ d40_get_dev_addr(struct d40_chan *chan, enum dma_data_direction direction)</div><div class='ctx'> 	if (chan-&gt;runtime_addr)</div><div class='ctx'> 		return chan-&gt;runtime_addr;</div><div class='ctx'> </div><div class='del'>-	if (direction == DMA_FROM_DEVICE)</div><div class='add'>+	if (direction == DMA_DEV_TO_MEM)</div><div class='ctx'> 		addr = plat-&gt;dev_rx[cfg-&gt;src_dev_type];</div><div class='del'>-	else if (direction == DMA_TO_DEVICE)</div><div class='add'>+	else if (direction == DMA_MEM_TO_DEV)</div><div class='ctx'> 		addr = plat-&gt;dev_tx[cfg-&gt;dst_dev_type];</div><div class='ctx'> </div><div class='ctx'> 	return addr;</div><div class='hunk'>@@ -1875,7 +2056,7 @@ d40_get_dev_addr(struct d40_chan *chan, enum dma_data_direction direction)</div><div class='ctx'> static struct dma_async_tx_descriptor *</div><div class='ctx'> d40_prep_sg(struct dma_chan *dchan, struct scatterlist *sg_src,</div><div class='ctx'> 	    struct scatterlist *sg_dst, unsigned int sg_len,</div><div class='del'>-	    enum dma_data_direction direction, unsigned long dma_flags)</div><div class='add'>+	    enum dma_transfer_direction direction, unsigned long dma_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct d40_chan *chan = container_of(dchan, struct d40_chan, chan);</div><div class='ctx'> 	dma_addr_t src_dev_addr = 0;</div><div class='hunk'>@@ -1902,9 +2083,9 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist *sg_src,</div><div class='ctx'> 	if (direction != DMA_NONE) {</div><div class='ctx'> 		dma_addr_t dev_addr = d40_get_dev_addr(chan, direction);</div><div class='ctx'> </div><div class='del'>-		if (direction == DMA_FROM_DEVICE)</div><div class='add'>+		if (direction == DMA_DEV_TO_MEM)</div><div class='ctx'> 			src_dev_addr = dev_addr;</div><div class='del'>-		else if (direction == DMA_TO_DEVICE)</div><div class='add'>+		else if (direction == DMA_MEM_TO_DEV)</div><div class='ctx'> 			dst_dev_addr = dev_addr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2011,14 +2192,15 @@ static int d40_alloc_chan_resources(struct dma_chan *chan)</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	is_free_phy = (d40c-&gt;phy_chan == NULL);</div><div class='ctx'> </div><div class='del'>-	err = d40_allocate_channel(d40c);</div><div class='add'>+	err = d40_allocate_channel(d40c, &amp;is_free_phy);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		chan_err(d40c, "Failed to allocate channel\n");</div><div class='add'>+		d40c-&gt;configured = false;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	pm_runtime_get_sync(d40c-&gt;base-&gt;dev);</div><div class='ctx'> 	/* Fill in basic CFG register values */</div><div class='ctx'> 	d40_phy_cfg(&amp;d40c-&gt;dma_cfg, &amp;d40c-&gt;src_def_cfg,</div><div class='ctx'> 		    &amp;d40c-&gt;dst_def_cfg, chan_is_logical(d40c));</div><div class='hunk'>@@ -2038,6 +2220,12 @@ static int d40_alloc_chan_resources(struct dma_chan *chan)</div><div class='ctx'> 			  D40_LCPA_CHAN_SIZE + D40_LCPA_CHAN_DST_DELTA;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dev_dbg(chan2dev(d40c), "allocated %s channel (phy %d%s)\n",</div><div class='add'>+		 chan_is_logical(d40c) ? "logical" : "physical",</div><div class='add'>+		 d40c-&gt;phy_chan-&gt;num,</div><div class='add'>+		 d40c-&gt;dma_cfg.use_fixed_channel ? ", fixed" : "");</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Only write channel configuration to the DMA if the physical</div><div class='ctx'> 	 * resource is free. In case of multiple logical channels</div><div class='hunk'>@@ -2046,6 +2234,8 @@ static int d40_alloc_chan_resources(struct dma_chan *chan)</div><div class='ctx'> 	if (is_free_phy)</div><div class='ctx'> 		d40_config_write(d40c);</div><div class='ctx'> fail:</div><div class='add'>+	pm_runtime_mark_last_busy(d40c-&gt;base-&gt;dev);</div><div class='add'>+	pm_runtime_put_autosuspend(d40c-&gt;base-&gt;dev);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;d40c-&gt;lock, flags);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2108,10 +2298,10 @@ d40_prep_memcpy_sg(struct dma_chan *chan,</div><div class='ctx'> static struct dma_async_tx_descriptor *d40_prep_slave_sg(struct dma_chan *chan,</div><div class='ctx'> 							 struct scatterlist *sgl,</div><div class='ctx'> 							 unsigned int sg_len,</div><div class='del'>-							 enum dma_data_direction direction,</div><div class='add'>+							 enum dma_transfer_direction direction,</div><div class='ctx'> 							 unsigned long dma_flags)</div><div class='ctx'> {</div><div class='del'>-	if (direction != DMA_FROM_DEVICE &amp;&amp; direction != DMA_TO_DEVICE)</div><div class='add'>+	if (direction != DMA_DEV_TO_MEM &amp;&amp; direction != DMA_MEM_TO_DEV)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	return d40_prep_sg(chan, sgl, sgl, sg_len, direction, dma_flags);</div><div class='hunk'>@@ -2120,7 +2310,7 @@ static struct dma_async_tx_descriptor *d40_prep_slave_sg(struct dma_chan *chan,</div><div class='ctx'> static struct dma_async_tx_descriptor *</div><div class='ctx'> dma40_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr,</div><div class='ctx'> 		     size_t buf_len, size_t period_len,</div><div class='del'>-		     enum dma_data_direction direction)</div><div class='add'>+		     enum dma_transfer_direction direction)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int periods = buf_len / period_len;</div><div class='ctx'> 	struct dma_async_tx_descriptor *txd;</div><div class='hunk'>@@ -2269,7 +2459,7 @@ static int d40_set_runtime_config(struct dma_chan *chan,</div><div class='ctx'> 	dst_addr_width = config-&gt;dst_addr_width;</div><div class='ctx'> 	dst_maxburst = config-&gt;dst_maxburst;</div><div class='ctx'> </div><div class='del'>-	if (config-&gt;direction == DMA_FROM_DEVICE) {</div><div class='add'>+	if (config-&gt;direction == DMA_DEV_TO_MEM) {</div><div class='ctx'> 		dma_addr_t dev_addr_rx =</div><div class='ctx'> 			d40c-&gt;base-&gt;plat_data-&gt;dev_rx[cfg-&gt;src_dev_type];</div><div class='ctx'> </div><div class='hunk'>@@ -2292,7 +2482,7 @@ static int d40_set_runtime_config(struct dma_chan *chan,</div><div class='ctx'> 		if (dst_maxburst == 0)</div><div class='ctx'> 			dst_maxburst = src_maxburst;</div><div class='ctx'> </div><div class='del'>-	} else if (config-&gt;direction == DMA_TO_DEVICE) {</div><div class='add'>+	} else if (config-&gt;direction == DMA_MEM_TO_DEV) {</div><div class='ctx'> 		dma_addr_t dev_addr_tx =</div><div class='ctx'> 			d40c-&gt;base-&gt;plat_data-&gt;dev_tx[cfg-&gt;dst_dev_type];</div><div class='ctx'> </div><div class='hunk'>@@ -2357,7 +2547,7 @@ static int d40_set_runtime_config(struct dma_chan *chan,</div><div class='ctx'> 		"configured channel %s for %s, data width %d/%d, "</div><div class='ctx'> 		"maxburst %d/%d elements, LE, no flow control\n",</div><div class='ctx'> 		dma_chan_name(chan),</div><div class='del'>-		(config-&gt;direction == DMA_FROM_DEVICE) ? "RX" : "TX",</div><div class='add'>+		(config-&gt;direction == DMA_DEV_TO_MEM) ? "RX" : "TX",</div><div class='ctx'> 		src_addr_width, dst_addr_width,</div><div class='ctx'> 		src_maxburst, dst_maxburst);</div><div class='ctx'> </div><div class='hunk'>@@ -2519,6 +2709,72 @@ failure1:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Suspend resume functionality */</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int dma40_pm_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct d40_base *base = platform_get_drvdata(pdev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+	if (!pm_runtime_suspended(dev))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (base-&gt;lcpa_regulator)</div><div class='add'>+		ret = regulator_disable(base-&gt;lcpa_regulator);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dma40_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct d40_base *base = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	d40_save_restore_registers(base, true);</div><div class='add'>+</div><div class='add'>+	/* Don't disable/enable clocks for v1 due to HW bugs */</div><div class='add'>+	if (base-&gt;rev != 1)</div><div class='add'>+		writel_relaxed(base-&gt;gcc_pwr_off_mask,</div><div class='add'>+			       base-&gt;virtbase + D40_DREG_GCC);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dma40_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct d40_base *base = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (base-&gt;initialized)</div><div class='add'>+		d40_save_restore_registers(base, false);</div><div class='add'>+</div><div class='add'>+	writel_relaxed(D40_DREG_GCC_ENABLE_ALL,</div><div class='add'>+		       base-&gt;virtbase + D40_DREG_GCC);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dma40_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct d40_base *base = platform_get_drvdata(pdev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (base-&gt;lcpa_regulator)</div><div class='add'>+		ret = regulator_enable(base-&gt;lcpa_regulator);</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 dev_pm_ops dma40_pm_ops = {</div><div class='add'>+	.suspend		= dma40_pm_suspend,</div><div class='add'>+	.runtime_suspend	= dma40_runtime_suspend,</div><div class='add'>+	.runtime_resume		= dma40_runtime_resume,</div><div class='add'>+	.resume			= dma40_resume,</div><div class='add'>+};</div><div class='add'>+#define DMA40_PM_OPS	(&amp;dma40_pm_ops)</div><div class='add'>+#else</div><div class='add'>+#define DMA40_PM_OPS	NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Initialization functions. */</div><div class='ctx'> </div><div class='ctx'> static int __init d40_phy_res_init(struct d40_base *base)</div><div class='hunk'>@@ -2527,6 +2783,7 @@ static int __init d40_phy_res_init(struct d40_base *base)</div><div class='ctx'> 	int num_phy_chans_avail = 0;</div><div class='ctx'> 	u32 val[2];</div><div class='ctx'> 	int odd_even_bit = -2;</div><div class='add'>+	int gcc = D40_DREG_GCC_ENA;</div><div class='ctx'> </div><div class='ctx'> 	val[0] = readl(base-&gt;virtbase + D40_DREG_PRSME);</div><div class='ctx'> 	val[1] = readl(base-&gt;virtbase + D40_DREG_PRSMO);</div><div class='hunk'>@@ -2538,9 +2795,17 @@ static int __init d40_phy_res_init(struct d40_base *base)</div><div class='ctx'> 			/* Mark security only channels as occupied */</div><div class='ctx'> 			base-&gt;phy_res[i].allocated_src = D40_ALLOC_PHY;</div><div class='ctx'> 			base-&gt;phy_res[i].allocated_dst = D40_ALLOC_PHY;</div><div class='add'>+			base-&gt;phy_res[i].reserved = true;</div><div class='add'>+			gcc |= D40_DREG_GCC_EVTGRP_ENA(D40_PHYS_TO_GROUP(i),</div><div class='add'>+						       D40_DREG_GCC_SRC);</div><div class='add'>+			gcc |= D40_DREG_GCC_EVTGRP_ENA(D40_PHYS_TO_GROUP(i),</div><div class='add'>+						       D40_DREG_GCC_DST);</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 		} else {</div><div class='ctx'> 			base-&gt;phy_res[i].allocated_src = D40_ALLOC_FREE;</div><div class='ctx'> 			base-&gt;phy_res[i].allocated_dst = D40_ALLOC_FREE;</div><div class='add'>+			base-&gt;phy_res[i].reserved = false;</div><div class='ctx'> 			num_phy_chans_avail++;</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_lock_init(&amp;base-&gt;phy_res[i].lock);</div><div class='hunk'>@@ -2552,6 +2817,11 @@ static int __init d40_phy_res_init(struct d40_base *base)</div><div class='ctx'> </div><div class='ctx'> 		base-&gt;phy_res[chan].allocated_src = D40_ALLOC_PHY;</div><div class='ctx'> 		base-&gt;phy_res[chan].allocated_dst = D40_ALLOC_PHY;</div><div class='add'>+		base-&gt;phy_res[chan].reserved = true;</div><div class='add'>+		gcc |= D40_DREG_GCC_EVTGRP_ENA(D40_PHYS_TO_GROUP(chan),</div><div class='add'>+					       D40_DREG_GCC_SRC);</div><div class='add'>+		gcc |= D40_DREG_GCC_EVTGRP_ENA(D40_PHYS_TO_GROUP(chan),</div><div class='add'>+					       D40_DREG_GCC_DST);</div><div class='ctx'> 		num_phy_chans_avail--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2572,6 +2842,15 @@ static int __init d40_phy_res_init(struct d40_base *base)</div><div class='ctx'> 		val[0] = val[0] &gt;&gt; 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * To keep things simple, Enable all clocks initially.</div><div class='add'>+	 * The clocks will get managed later post channel allocation.</div><div class='add'>+	 * The clocks for the event lines on which reserved channels exists</div><div class='add'>+	 * are not managed here.</div><div class='add'>+	 */</div><div class='add'>+	writel(D40_DREG_GCC_ENABLE_ALL, base-&gt;virtbase + D40_DREG_GCC);</div><div class='add'>+	base-&gt;gcc_pwr_off_mask = gcc;</div><div class='add'>+</div><div class='ctx'> 	return num_phy_chans_avail;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2699,10 +2978,15 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev)</div><div class='ctx'> 			goto failure;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	base-&gt;lcla_pool.alloc_map = kzalloc(num_phy_chans *</div><div class='del'>-					    sizeof(struct d40_desc *) *</div><div class='del'>-					    D40_LCLA_LINK_PER_EVENT_GRP,</div><div class='add'>+	base-&gt;reg_val_backup_chan = kmalloc(base-&gt;num_phy_chans *</div><div class='add'>+					    sizeof(d40_backup_regs_chan),</div><div class='ctx'> 					    GFP_KERNEL);</div><div class='add'>+	if (!base-&gt;reg_val_backup_chan)</div><div class='add'>+		goto failure;</div><div class='add'>+</div><div class='add'>+	base-&gt;lcla_pool.alloc_map =</div><div class='add'>+		kzalloc(num_phy_chans * sizeof(struct d40_desc *)</div><div class='add'>+			* D40_LCLA_LINK_PER_EVENT_GRP, GFP_KERNEL);</div><div class='ctx'> 	if (!base-&gt;lcla_pool.alloc_map)</div><div class='ctx'> 		goto failure;</div><div class='ctx'> </div><div class='hunk'>@@ -2741,9 +3025,9 @@ failure:</div><div class='ctx'> static void __init d40_hw_init(struct d40_base *base)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	static const struct d40_reg_val dma_init_reg[] = {</div><div class='add'>+	static struct d40_reg_val dma_init_reg[] = {</div><div class='ctx'> 		/* Clock every part of the DMA block from start */</div><div class='del'>-		{ .reg = D40_DREG_GCC,    .val = 0x0000ff01},</div><div class='add'>+		{ .reg = D40_DREG_GCC,    .val = D40_DREG_GCC_ENABLE_ALL},</div><div class='ctx'> </div><div class='ctx'> 		/* Interrupts on all logical channels */</div><div class='ctx'> 		{ .reg = D40_DREG_LCMIS0, .val = 0xFFFFFFFF},</div><div class='hunk'>@@ -2943,11 +3227,31 @@ static int __init d40_probe(struct platform_device *pdev)</div><div class='ctx'> 		d40_err(&amp;pdev-&gt;dev, "Failed to ioremap LCPA region\n");</div><div class='ctx'> 		goto failure;</div><div class='ctx'> 	}</div><div class='add'>+	/* If lcla has to be located in ESRAM we don't need to allocate */</div><div class='add'>+	if (base-&gt;plat_data-&gt;use_esram_lcla) {</div><div class='add'>+		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,</div><div class='add'>+							"lcla_esram");</div><div class='add'>+		if (!res) {</div><div class='add'>+			ret = -ENOENT;</div><div class='add'>+			d40_err(&amp;pdev-&gt;dev,</div><div class='add'>+				"No \"lcla_esram\" memory resource\n");</div><div class='add'>+			goto failure;</div><div class='add'>+		}</div><div class='add'>+		base-&gt;lcla_pool.base = ioremap(res-&gt;start,</div><div class='add'>+						resource_size(res));</div><div class='add'>+		if (!base-&gt;lcla_pool.base) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			d40_err(&amp;pdev-&gt;dev, "Failed to ioremap LCLA region\n");</div><div class='add'>+			goto failure;</div><div class='add'>+		}</div><div class='add'>+		writel(res-&gt;start, base-&gt;virtbase + D40_DREG_LCLA);</div><div class='ctx'> </div><div class='del'>-	ret = d40_lcla_allocate(base);</div><div class='del'>-	if (ret) {</div><div class='del'>-		d40_err(&amp;pdev-&gt;dev, "Failed to allocate LCLA area\n");</div><div class='del'>-		goto failure;</div><div class='add'>+	} else {</div><div class='add'>+		ret = d40_lcla_allocate(base);</div><div class='add'>+		if (ret) {</div><div class='add'>+			d40_err(&amp;pdev-&gt;dev, "Failed to allocate LCLA area\n");</div><div class='add'>+			goto failure;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;base-&gt;lcla_pool.lock);</div><div class='hunk'>@@ -2960,6 +3264,32 @@ static int __init d40_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto failure;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	pm_runtime_irq_safe(base-&gt;dev);</div><div class='add'>+	pm_runtime_set_autosuspend_delay(base-&gt;dev, DMA40_AUTOSUSPEND_DELAY);</div><div class='add'>+	pm_runtime_use_autosuspend(base-&gt;dev);</div><div class='add'>+	pm_runtime_enable(base-&gt;dev);</div><div class='add'>+	pm_runtime_resume(base-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (base-&gt;plat_data-&gt;use_esram_lcla) {</div><div class='add'>+</div><div class='add'>+		base-&gt;lcpa_regulator = regulator_get(base-&gt;dev, "lcla_esram");</div><div class='add'>+		if (IS_ERR(base-&gt;lcpa_regulator)) {</div><div class='add'>+			d40_err(&amp;pdev-&gt;dev, "Failed to get lcpa_regulator\n");</div><div class='add'>+			base-&gt;lcpa_regulator = NULL;</div><div class='add'>+			goto failure;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = regulator_enable(base-&gt;lcpa_regulator);</div><div class='add'>+		if (ret) {</div><div class='add'>+			d40_err(&amp;pdev-&gt;dev,</div><div class='add'>+				"Failed to enable lcpa_regulator\n");</div><div class='add'>+			regulator_put(base-&gt;lcpa_regulator);</div><div class='add'>+			base-&gt;lcpa_regulator = NULL;</div><div class='add'>+			goto failure;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	base-&gt;initialized = true;</div><div class='ctx'> 	err = d40_dmaengine_init(base, num_reserved_chans);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto failure;</div><div class='hunk'>@@ -2976,6 +3306,11 @@ failure:</div><div class='ctx'> 		if (base-&gt;virtbase)</div><div class='ctx'> 			iounmap(base-&gt;virtbase);</div><div class='ctx'> </div><div class='add'>+		if (base-&gt;lcla_pool.base &amp;&amp; base-&gt;plat_data-&gt;use_esram_lcla) {</div><div class='add'>+			iounmap(base-&gt;lcla_pool.base);</div><div class='add'>+			base-&gt;lcla_pool.base = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (base-&gt;lcla_pool.dma_addr)</div><div class='ctx'> 			dma_unmap_single(base-&gt;dev, base-&gt;lcla_pool.dma_addr,</div><div class='ctx'> 					 SZ_1K * base-&gt;num_phy_chans,</div><div class='hunk'>@@ -2998,6 +3333,11 @@ failure:</div><div class='ctx'> 			clk_put(base-&gt;clk);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (base-&gt;lcpa_regulator) {</div><div class='add'>+			regulator_disable(base-&gt;lcpa_regulator);</div><div class='add'>+			regulator_put(base-&gt;lcpa_regulator);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		kfree(base-&gt;lcla_pool.alloc_map);</div><div class='ctx'> 		kfree(base-&gt;lookup_log_chans);</div><div class='ctx'> 		kfree(base-&gt;lookup_phy_chans);</div><div class='hunk'>@@ -3013,6 +3353,7 @@ static struct platform_driver d40_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.owner = THIS_MODULE,</div><div class='ctx'> 		.name  = D40_NAME,</div><div class='add'>+		.pm = DMA40_PM_OPS,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/dma/ste_dma40_ll.h b/drivers/dma/ste_dma40_ll.h<br/>index b44c455158de..8d3d490968a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/ste_dma40_ll.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/ste_dma40_ll.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/ste_dma40_ll.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/ste_dma40_ll.h</a></div><div class='hunk'>@@ -16,6 +16,8 @@</div><div class='ctx'> </div><div class='ctx'> #define D40_TYPE_TO_GROUP(type) (type / 16)</div><div class='ctx'> #define D40_TYPE_TO_EVENT(type) (type % 16)</div><div class='add'>+#define D40_GROUP_SIZE 8</div><div class='add'>+#define D40_PHYS_TO_GROUP(phys) ((phys &amp; (D40_GROUP_SIZE - 1)) / 2)</div><div class='ctx'> </div><div class='ctx'> /* Most bits of the CFG register are the same in log as in phy mode */</div><div class='ctx'> #define D40_SREG_CFG_MST_POS		15</div><div class='hunk'>@@ -123,6 +125,15 @@</div><div class='ctx'> </div><div class='ctx'> /* DMA Register Offsets */</div><div class='ctx'> #define D40_DREG_GCC		0x000</div><div class='add'>+#define D40_DREG_GCC_ENA	0x1</div><div class='add'>+/* This assumes that there are only 4 event groups */</div><div class='add'>+#define D40_DREG_GCC_ENABLE_ALL	0xff01</div><div class='add'>+#define D40_DREG_GCC_EVTGRP_POS 8</div><div class='add'>+#define D40_DREG_GCC_SRC 0</div><div class='add'>+#define D40_DREG_GCC_DST 1</div><div class='add'>+#define D40_DREG_GCC_EVTGRP_ENA(x, y) \</div><div class='add'>+	(1 &lt;&lt; (D40_DREG_GCC_EVTGRP_POS + 2 * x + y))</div><div class='add'>+</div><div class='ctx'> #define D40_DREG_PRTYP		0x004</div><div class='ctx'> #define D40_DREG_PRSME		0x008</div><div class='ctx'> #define D40_DREG_PRSMO		0x00C</div><div class='head'>diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c<br/>index a4a398f2ef61..a6f9c1684a0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/timb_dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/timb_dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/timb_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/timb_dma.c</a></div><div class='hunk'>@@ -90,7 +90,7 @@ struct timb_dma_chan {</div><div class='ctx'> 	struct list_head	queue;</div><div class='ctx'> 	struct list_head	free_list;</div><div class='ctx'> 	unsigned int		bytes_per_line;</div><div class='del'>-	enum dma_data_direction	direction;</div><div class='add'>+	enum dma_transfer_direction	direction;</div><div class='ctx'> 	unsigned int		descs; /* Descriptors to allocate */</div><div class='ctx'> 	unsigned int		desc_elems; /* number of elems per descriptor */</div><div class='ctx'> };</div><div class='hunk'>@@ -166,10 +166,10 @@ static void __td_unmap_desc(struct timb_dma_chan *td_chan, const u8 *dma_desc,</div><div class='ctx'> </div><div class='ctx'> 	if (single)</div><div class='ctx'> 		dma_unmap_single(chan2dev(&amp;td_chan-&gt;chan), addr, len,</div><div class='del'>-			td_chan-&gt;direction);</div><div class='add'>+			DMA_TO_DEVICE);</div><div class='ctx'> 	else</div><div class='ctx'> 		dma_unmap_page(chan2dev(&amp;td_chan-&gt;chan), addr, len,</div><div class='del'>-			td_chan-&gt;direction);</div><div class='add'>+			DMA_TO_DEVICE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __td_unmap_descs(struct timb_dma_desc *td_desc, bool single)</div><div class='hunk'>@@ -235,7 +235,7 @@ static void __td_start_dma(struct timb_dma_chan *td_chan)</div><div class='ctx'> 		"td_chan: %p, chan: %d, membase: %p\n",</div><div class='ctx'> 		td_chan, td_chan-&gt;chan.chan_id, td_chan-&gt;membase);</div><div class='ctx'> </div><div class='del'>-	if (td_chan-&gt;direction == DMA_FROM_DEVICE) {</div><div class='add'>+	if (td_chan-&gt;direction == DMA_DEV_TO_MEM) {</div><div class='ctx'> </div><div class='ctx'> 		/* descriptor address */</div><div class='ctx'> 		iowrite32(0, td_chan-&gt;membase + TIMBDMA_OFFS_RX_DHAR);</div><div class='hunk'>@@ -278,7 +278,7 @@ static void __td_finish(struct timb_dma_chan *td_chan)</div><div class='ctx'> 		txd-&gt;cookie);</div><div class='ctx'> </div><div class='ctx'> 	/* make sure to stop the transfer */</div><div class='del'>-	if (td_chan-&gt;direction == DMA_FROM_DEVICE)</div><div class='add'>+	if (td_chan-&gt;direction == DMA_DEV_TO_MEM)</div><div class='ctx'> 		iowrite32(0, td_chan-&gt;membase + TIMBDMA_OFFS_RX_ER);</div><div class='ctx'> /* Currently no support for stopping DMA transfers</div><div class='ctx'> 	else</div><div class='hunk'>@@ -558,7 +558,7 @@ static void td_issue_pending(struct dma_chan *chan)</div><div class='ctx'> </div><div class='ctx'> static struct dma_async_tx_descriptor *td_prep_slave_sg(struct dma_chan *chan,</div><div class='ctx'> 	struct scatterlist *sgl, unsigned int sg_len,</div><div class='del'>-	enum dma_data_direction direction, unsigned long flags)</div><div class='add'>+	enum dma_transfer_direction direction, unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct timb_dma_chan *td_chan =</div><div class='ctx'> 		container_of(chan, struct timb_dma_chan, chan);</div><div class='hunk'>@@ -606,7 +606,7 @@ static struct dma_async_tx_descriptor *td_prep_slave_sg(struct dma_chan *chan,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dma_sync_single_for_device(chan2dmadev(chan), td_desc-&gt;txd.phys,</div><div class='del'>-		td_desc-&gt;desc_list_len, DMA_TO_DEVICE);</div><div class='add'>+		td_desc-&gt;desc_list_len, DMA_MEM_TO_DEV);</div><div class='ctx'> </div><div class='ctx'> 	return &amp;td_desc-&gt;txd;</div><div class='ctx'> }</div><div class='hunk'>@@ -775,8 +775,8 @@ static int __devinit td_probe(struct platform_device *pdev)</div><div class='ctx'> 		td_chan-&gt;descs = pchan-&gt;descriptors;</div><div class='ctx'> 		td_chan-&gt;desc_elems = pchan-&gt;descriptor_elements;</div><div class='ctx'> 		td_chan-&gt;bytes_per_line = pchan-&gt;bytes_per_line;</div><div class='del'>-		td_chan-&gt;direction = pchan-&gt;rx ? DMA_FROM_DEVICE :</div><div class='del'>-			DMA_TO_DEVICE;</div><div class='add'>+		td_chan-&gt;direction = pchan-&gt;rx ? DMA_DEV_TO_MEM :</div><div class='add'>+			DMA_MEM_TO_DEV;</div><div class='ctx'> </div><div class='ctx'> 		td_chan-&gt;membase = td-&gt;membase +</div><div class='ctx'> 			(i / 2) * TIMBDMA_INSTANCE_OFFSET +</div><div class='hunk'>@@ -841,17 +841,7 @@ static struct platform_driver td_driver = {</div><div class='ctx'> 	.remove	= __exit_p(td_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init td_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;td_driver);</div><div class='del'>-}</div><div class='del'>-module_init(td_init);</div><div class='del'>-</div><div class='del'>-static void __exit td_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;td_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(td_exit);</div><div class='add'>+module_platform_driver(td_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> MODULE_DESCRIPTION("Timberdale DMA controller driver");</div><div class='head'>diff --git a/drivers/dma/txx9dmac.c b/drivers/dma/txx9dmac.c<br/>index cbd83e362b5e..6122c364cf11 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/dma/txx9dmac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/dma/txx9dmac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/txx9dmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/dma/txx9dmac.c</a></div><div class='hunk'>@@ -845,7 +845,7 @@ txx9dmac_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,</div><div class='ctx'> </div><div class='ctx'> static struct dma_async_tx_descriptor *</div><div class='ctx'> txx9dmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,</div><div class='del'>-		unsigned int sg_len, enum dma_data_direction direction,</div><div class='add'>+		unsigned int sg_len, enum dma_transfer_direction direction,</div><div class='ctx'> 		unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct txx9dmac_chan *dc = to_txx9dmac_chan(chan);</div><div class='hunk'>@@ -860,9 +860,9 @@ txx9dmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!ds || !ds-&gt;reg_width);</div><div class='ctx'> 	if (ds-&gt;tx_reg)</div><div class='del'>-		BUG_ON(direction != DMA_TO_DEVICE);</div><div class='add'>+		BUG_ON(direction != DMA_MEM_TO_DEV);</div><div class='ctx'> 	else</div><div class='del'>-		BUG_ON(direction != DMA_FROM_DEVICE);</div><div class='add'>+		BUG_ON(direction != DMA_DEV_TO_MEM);</div><div class='ctx'> 	if (unlikely(!sg_len))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -882,7 +882,7 @@ txx9dmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,</div><div class='ctx'> 		mem = sg_dma_address(sg);</div><div class='ctx'> </div><div class='ctx'> 		if (__is_dmac64(ddev)) {</div><div class='del'>-			if (direction == DMA_TO_DEVICE) {</div><div class='add'>+			if (direction == DMA_MEM_TO_DEV) {</div><div class='ctx'> 				desc-&gt;hwdesc.SAR = mem;</div><div class='ctx'> 				desc-&gt;hwdesc.DAR = ds-&gt;tx_reg;</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -891,7 +891,7 @@ txx9dmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,</div><div class='ctx'> 			}</div><div class='ctx'> 			desc-&gt;hwdesc.CNTR = sg_dma_len(sg);</div><div class='ctx'> 		} else {</div><div class='del'>-			if (direction == DMA_TO_DEVICE) {</div><div class='add'>+			if (direction == DMA_MEM_TO_DEV) {</div><div class='ctx'> 				desc-&gt;hwdesc32.SAR = mem;</div><div class='ctx'> 				desc-&gt;hwdesc32.DAR = ds-&gt;tx_reg;</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -900,7 +900,7 @@ txx9dmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,</div><div class='ctx'> 			}</div><div class='ctx'> 			desc-&gt;hwdesc32.CNTR = sg_dma_len(sg);</div><div class='ctx'> 		}</div><div class='del'>-		if (direction == DMA_TO_DEVICE) {</div><div class='add'>+		if (direction == DMA_MEM_TO_DEV) {</div><div class='ctx'> 			sai = ds-&gt;reg_width;</div><div class='ctx'> 			dai = 0;</div><div class='ctx'> 		} else {</div><div class='head'>diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h<br/>index fe90cd4a7ebc..e48ab3108ad8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/edac_core.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/edac_core.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/edac_core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/edac/edac_core.h</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/kobject.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/edac.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -243,8 +242,8 @@ struct edac_device_ctl_info {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct edac_dev_sysfs_attribute *sysfs_attributes;</div><div class='ctx'> </div><div class='del'>-	/* pointer to main 'edac' class in sysfs */</div><div class='del'>-	struct sysdev_class *edac_class;</div><div class='add'>+	/* pointer to main 'edac' subsys in sysfs */</div><div class='add'>+	struct bus_type *edac_subsys;</div><div class='ctx'> </div><div class='ctx'> 	/* the internal state of this controller instance */</div><div class='ctx'> 	int op_state;</div><div class='hunk'>@@ -342,7 +341,7 @@ struct edac_pci_ctl_info {</div><div class='ctx'> </div><div class='ctx'> 	int pci_idx;</div><div class='ctx'> </div><div class='del'>-	struct sysdev_class *edac_class;	/* pointer to class */</div><div class='add'>+	struct bus_type *edac_subsys;	/* pointer to subsystem */</div><div class='ctx'> </div><div class='ctx'> 	/* the internal state of this controller instance */</div><div class='ctx'> 	int op_state;</div><div class='head'>diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c<br/>index c3f67437afb6..4b154593343a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/edac_device.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/edac_device.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/edac_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/edac/edac_device.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/drivers/edac/edac_device_sysfs.c b/drivers/edac/edac_device_sysfs.c<br/>index 86649df00285..b4ea185ccebf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/edac_device_sysfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/edac_device_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/edac_device_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/edac/edac_device_sysfs.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * file for managing the edac_device class of devices for EDAC</div><div class='add'>+ * file for managing the edac_device subsystem of devices for EDAC</div><div class='ctx'>  *</div><div class='ctx'>  * (C) 2007 SoftwareBitMaker </div><div class='ctx'>  *</div><div class='hunk'>@@ -230,21 +230,21 @@ static struct kobj_type ktype_device_ctrl = {</div><div class='ctx'>  */</div><div class='ctx'> int edac_device_register_sysfs_main_kobj(struct edac_device_ctl_info *edac_dev)</div><div class='ctx'> {</div><div class='del'>-	struct sysdev_class *edac_class;</div><div class='add'>+	struct bus_type *edac_subsys;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	debugf1("%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* get the /sys/devices/system/edac reference */</div><div class='del'>-	edac_class = edac_get_sysfs_class();</div><div class='del'>-	if (edac_class == NULL) {</div><div class='del'>-		debugf1("%s() no edac_class error\n", __func__);</div><div class='add'>+	edac_subsys = edac_get_sysfs_subsys();</div><div class='add'>+	if (edac_subsys == NULL) {</div><div class='add'>+		debugf1("%s() no edac_subsys error\n", __func__);</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Point to the 'edac_class' this instance 'reports' to */</div><div class='del'>-	edac_dev-&gt;edac_class = edac_class;</div><div class='add'>+	/* Point to the 'edac_subsys' this instance 'reports' to */</div><div class='add'>+	edac_dev-&gt;edac_subsys = edac_subsys;</div><div class='ctx'> </div><div class='ctx'> 	/* Init the devices's kobject */</div><div class='ctx'> 	memset(&amp;edac_dev-&gt;kobj, 0, sizeof(struct kobject));</div><div class='hunk'>@@ -261,7 +261,7 @@ int edac_device_register_sysfs_main_kobj(struct edac_device_ctl_info *edac_dev)</div><div class='ctx'> </div><div class='ctx'> 	/* register */</div><div class='ctx'> 	err = kobject_init_and_add(&amp;edac_dev-&gt;kobj, &amp;ktype_device_ctrl,</div><div class='del'>-				   &amp;edac_class-&gt;kset.kobj,</div><div class='add'>+				   &amp;edac_subsys-&gt;dev_root-&gt;kobj,</div><div class='ctx'> 				   "%s", edac_dev-&gt;name);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		debugf1("%s()Failed to register '.../edac/%s'\n",</div><div class='hunk'>@@ -284,7 +284,7 @@ err_kobj_reg:</div><div class='ctx'> 	module_put(edac_dev-&gt;owner);</div><div class='ctx'> </div><div class='ctx'> err_mod_get:</div><div class='del'>-	edac_put_sysfs_class();</div><div class='add'>+	edac_put_sysfs_subsys();</div><div class='ctx'> </div><div class='ctx'> err_out:</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -308,7 +308,7 @@ void edac_device_unregister_sysfs_main_kobj(struct edac_device_ctl_info *dev)</div><div class='ctx'> 	 *   b) 'kfree' the memory</div><div class='ctx'> 	 */</div><div class='ctx'> 	kobject_put(&amp;dev-&gt;kobj);</div><div class='del'>-	edac_put_sysfs_class();</div><div class='add'>+	edac_put_sysfs_subsys();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* edac_dev -&gt; instance information */</div><div class='head'>diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c<br/>index d69144a09043..ca6c04d350ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/edac_mc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/edac_mc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/edac_mc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/edac/edac_mc.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/edac.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c<br/>index 29ffa350bfbe..d56e63477d5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/edac_mc_sysfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/edac_mc_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/edac_mc_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/edac/edac_mc_sysfs.c</a></div><div class='hunk'>@@ -1021,19 +1021,19 @@ void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)</div><div class='ctx'> int edac_sysfs_setup_mc_kset(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err = -EINVAL;</div><div class='del'>-	struct sysdev_class *edac_class;</div><div class='add'>+	struct bus_type *edac_subsys;</div><div class='ctx'> </div><div class='ctx'> 	debugf1("%s()\n", __func__);</div><div class='ctx'> </div><div class='del'>-	/* get the /sys/devices/system/edac class reference */</div><div class='del'>-	edac_class = edac_get_sysfs_class();</div><div class='del'>-	if (edac_class == NULL) {</div><div class='del'>-		debugf1("%s() no edac_class error=%d\n", __func__, err);</div><div class='add'>+	/* get the /sys/devices/system/edac subsys reference */</div><div class='add'>+	edac_subsys = edac_get_sysfs_subsys();</div><div class='add'>+	if (edac_subsys == NULL) {</div><div class='add'>+		debugf1("%s() no edac_subsys error=%d\n", __func__, err);</div><div class='ctx'> 		goto fail_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Init the MC's kobject */</div><div class='del'>-	mc_kset = kset_create_and_add("mc", NULL, &amp;edac_class-&gt;kset.kobj);</div><div class='add'>+	mc_kset = kset_create_and_add("mc", NULL, &amp;edac_subsys-&gt;dev_root-&gt;kobj);</div><div class='ctx'> 	if (!mc_kset) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		debugf1("%s() Failed to register '.../edac/mc'\n", __func__);</div><div class='hunk'>@@ -1045,7 +1045,7 @@ int edac_sysfs_setup_mc_kset(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail_kset:</div><div class='del'>-	edac_put_sysfs_class();</div><div class='add'>+	edac_put_sysfs_subsys();</div><div class='ctx'> </div><div class='ctx'> fail_out:</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1059,6 +1059,6 @@ fail_out:</div><div class='ctx'> void edac_sysfs_teardown_mc_kset(void)</div><div class='ctx'> {</div><div class='ctx'> 	kset_unregister(mc_kset);</div><div class='del'>-	edac_put_sysfs_class();</div><div class='add'>+	edac_put_sysfs_subsys();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/edac/edac_module.h b/drivers/edac/edac_module.h<br/>index 17aabb7b90ec..00f81b47a51f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/edac_module.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/edac_module.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/edac_module.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/edac/edac_module.h</a></div><div class='hunk'>@@ -10,8 +10,6 @@</div><div class='ctx'> #ifndef	__EDAC_MODULE_H__</div><div class='ctx'> #define	__EDAC_MODULE_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='del'>-</div><div class='ctx'> #include "edac_core.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c<br/>index 2b378207d571..63af1c5673d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/edac_pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/edac_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/edac_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/edac/edac_pci.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c<br/>index 495198ad059c..97f5064e3992 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/edac_pci_sysfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/edac_pci_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/edac_pci_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/edac/edac_pci_sysfs.c</a></div><div class='hunk'>@@ -338,12 +338,12 @@ static struct kobj_type ktype_edac_pci_main_kobj = {</div><div class='ctx'>  * edac_pci_main_kobj_setup()</div><div class='ctx'>  *</div><div class='ctx'>  *	setup the sysfs for EDAC PCI attributes</div><div class='del'>- *	assumes edac_class has already been initialized</div><div class='add'>+ *	assumes edac_subsys has already been initialized</div><div class='ctx'>  */</div><div class='ctx'> static int edac_pci_main_kobj_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	struct sysdev_class *edac_class;</div><div class='add'>+	struct bus_type *edac_subsys;</div><div class='ctx'> </div><div class='ctx'> 	debugf0("%s()\n", __func__);</div><div class='ctx'> </div><div class='hunk'>@@ -354,9 +354,9 @@ static int edac_pci_main_kobj_setup(void)</div><div class='ctx'> 	/* First time, so create the main kobject and its</div><div class='ctx'> 	 * controls and attributes</div><div class='ctx'> 	 */</div><div class='del'>-	edac_class = edac_get_sysfs_class();</div><div class='del'>-	if (edac_class == NULL) {</div><div class='del'>-		debugf1("%s() no edac_class\n", __func__);</div><div class='add'>+	edac_subsys = edac_get_sysfs_subsys();</div><div class='add'>+	if (edac_subsys == NULL) {</div><div class='add'>+		debugf1("%s() no edac_subsys\n", __func__);</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto decrement_count_fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -381,7 +381,7 @@ static int edac_pci_main_kobj_setup(void)</div><div class='ctx'> 	/* Instanstiate the pci object */</div><div class='ctx'> 	err = kobject_init_and_add(edac_pci_top_main_kobj,</div><div class='ctx'> 				   &amp;ktype_edac_pci_main_kobj,</div><div class='del'>-				   &amp;edac_class-&gt;kset.kobj, "pci");</div><div class='add'>+				   &amp;edac_subsys-&gt;dev_root-&gt;kobj, "pci");</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		debugf1("Failed to register '.../edac/pci'\n");</div><div class='ctx'> 		goto kobject_init_and_add_fail;</div><div class='hunk'>@@ -404,7 +404,7 @@ kzalloc_fail:</div><div class='ctx'> 	module_put(THIS_MODULE);</div><div class='ctx'> </div><div class='ctx'> mod_get_fail:</div><div class='del'>-	edac_put_sysfs_class();</div><div class='add'>+	edac_put_sysfs_subsys();</div><div class='ctx'> </div><div class='ctx'> decrement_count_fail:</div><div class='ctx'> 	/* if are on this error exit, nothing to tear down */</div><div class='hunk'>@@ -432,7 +432,7 @@ static void edac_pci_main_kobj_teardown(void)</div><div class='ctx'> 			__func__);</div><div class='ctx'> 		kobject_put(edac_pci_top_main_kobj);</div><div class='ctx'> 	}</div><div class='del'>-	edac_put_sysfs_class();</div><div class='add'>+	edac_put_sysfs_subsys();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/edac/edac_stub.c b/drivers/edac/edac_stub.c<br/>index 86ad2eee1201..670c4481453b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/edac_stub.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/edac_stub.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/edac_stub.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/edac/edac_stub.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@ EXPORT_SYMBOL_GPL(edac_handlers);</div><div class='ctx'> int edac_err_assert = 0;</div><div class='ctx'> EXPORT_SYMBOL_GPL(edac_err_assert);</div><div class='ctx'> </div><div class='del'>-static atomic_t edac_class_valid = ATOMIC_INIT(0);</div><div class='add'>+static atomic_t edac_subsys_valid = ATOMIC_INIT(0);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * called to determine if there is an EDAC driver interested in</div><div class='hunk'>@@ -54,36 +54,37 @@ EXPORT_SYMBOL_GPL(edac_atomic_assert_error);</div><div class='ctx'>  * sysfs object: /sys/devices/system/edac</div><div class='ctx'>  *	need to export to other files</div><div class='ctx'>  */</div><div class='del'>-struct sysdev_class edac_class = {</div><div class='add'>+struct bus_type edac_subsys = {</div><div class='ctx'> 	.name = "edac",</div><div class='add'>+	.dev_name = "edac",</div><div class='ctx'> };</div><div class='del'>-EXPORT_SYMBOL_GPL(edac_class);</div><div class='add'>+EXPORT_SYMBOL_GPL(edac_subsys);</div><div class='ctx'> </div><div class='ctx'> /* return pointer to the 'edac' node in sysfs */</div><div class='del'>-struct sysdev_class *edac_get_sysfs_class(void)</div><div class='add'>+struct bus_type *edac_get_sysfs_subsys(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;edac_class_valid))</div><div class='add'>+	if (atomic_read(&amp;edac_subsys_valid))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* create the /sys/devices/system/edac directory */</div><div class='del'>-	err = sysdev_class_register(&amp;edac_class);</div><div class='add'>+	err = subsys_system_register(&amp;edac_subsys, NULL);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "Error registering toplevel EDAC sysfs dir\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	atomic_inc(&amp;edac_class_valid);</div><div class='del'>-	return &amp;edac_class;</div><div class='add'>+	atomic_inc(&amp;edac_subsys_valid);</div><div class='add'>+	return &amp;edac_subsys;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(edac_get_sysfs_class);</div><div class='add'>+EXPORT_SYMBOL_GPL(edac_get_sysfs_subsys);</div><div class='ctx'> </div><div class='del'>-void edac_put_sysfs_class(void)</div><div class='add'>+void edac_put_sysfs_subsys(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* last user unregisters it */</div><div class='del'>-	if (atomic_dec_and_test(&amp;edac_class_valid))</div><div class='del'>-		sysdev_class_unregister(&amp;edac_class);</div><div class='add'>+	if (atomic_dec_and_test(&amp;edac_subsys_valid))</div><div class='add'>+		bus_unregister(&amp;edac_subsys);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(edac_put_sysfs_class);</div><div class='add'>+EXPORT_SYMBOL_GPL(edac_put_sysfs_subsys);</div><div class='head'>diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c<br/>index a5da732fe5b2..4184e0171f00 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/i82975x_edac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/i82975x_edac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/i82975x_edac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/edac/i82975x_edac.c</a></div><div class='hunk'>@@ -277,11 +277,9 @@ static void i82975x_get_error_info(struct mem_ctl_info *mci,</div><div class='ctx'> static int i82975x_process_error_info(struct mem_ctl_info *mci,</div><div class='ctx'> 		struct i82975x_error_info *info, int handle_errors)</div><div class='ctx'> {</div><div class='del'>-	int row, multi_chan, chan;</div><div class='add'>+	int row, chan;</div><div class='ctx'> 	unsigned long offst, page;</div><div class='ctx'> </div><div class='del'>-	multi_chan = mci-&gt;csrows[0].nr_channels - 1;</div><div class='del'>-</div><div class='ctx'> 	if (!(info-&gt;errsts2 &amp; 0x0003))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -294,20 +292,30 @@ static int i82975x_process_error_info(struct mem_ctl_info *mci,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	page = (unsigned long) info-&gt;eap;</div><div class='del'>-	if (info-&gt;xeap &amp; 1)</div><div class='del'>-		page |= 0x100000000ul;</div><div class='del'>-	chan = page &amp; 1;</div><div class='ctx'> 	page &gt;&gt;= 1;</div><div class='del'>-	offst = page &amp; ((1 &lt;&lt; PAGE_SHIFT) - 1);</div><div class='del'>-	page &gt;&gt;= PAGE_SHIFT;</div><div class='add'>+	if (info-&gt;xeap &amp; 1)</div><div class='add'>+		page |= 0x80000000;</div><div class='add'>+	page &gt;&gt;= (PAGE_SHIFT - 1);</div><div class='ctx'> 	row = edac_mc_find_csrow_by_page(mci, page);</div><div class='ctx'> </div><div class='add'>+	if (row == -1)	{</div><div class='add'>+		i82975x_mc_printk(mci, KERN_ERR, "error processing EAP:\n"</div><div class='add'>+			"\tXEAP=%u\n"</div><div class='add'>+			"\t EAP=0x%08x\n"</div><div class='add'>+			"\tPAGE=0x%08x\n",</div><div class='add'>+			(info-&gt;xeap &amp; 1) ? 1 : 0, info-&gt;eap, (unsigned int) page);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	chan = (mci-&gt;csrows[row].nr_channels == 1) ? 0 : info-&gt;eap &amp; 1;</div><div class='add'>+	offst = info-&gt;eap</div><div class='add'>+			&amp; ((1 &lt;&lt; PAGE_SHIFT) -</div><div class='add'>+				(1 &lt;&lt; mci-&gt;csrows[row].grain));</div><div class='add'>+</div><div class='ctx'> 	if (info-&gt;errsts &amp; 0x0002)</div><div class='ctx'> 		edac_mc_handle_ue(mci, page, offst , row, "i82975x UE");</div><div class='ctx'> 	else</div><div class='ctx'> 		edac_mc_handle_ce(mci, page, offst, info-&gt;derrsyn, row,</div><div class='del'>-				multi_chan ? chan : 0,</div><div class='del'>-				"i82975x CE");</div><div class='add'>+				chan, "i82975x CE");</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -410,7 +418,7 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci,</div><div class='ctx'> 		csrow-&gt;last_page = cumul_size - 1;</div><div class='ctx'> 		csrow-&gt;nr_pages = cumul_size - last_cumul_size;</div><div class='ctx'> 		last_cumul_size = cumul_size;</div><div class='del'>-		csrow-&gt;grain = 1 &lt;&lt; 6;	/* I82975X_EAP has 64B resolution */</div><div class='add'>+		csrow-&gt;grain = 1 &lt;&lt; 7;	/* 128Byte cache-line resolution */</div><div class='ctx'> 		csrow-&gt;mtype = MEM_DDR2; /* I82975x supports only DDR2 */</div><div class='ctx'> 		csrow-&gt;dtype = i82975x_dram_type(mch_window, index);</div><div class='ctx'> 		csrow-&gt;edac_mode = EDAC_SECDED; /* only supported */</div><div class='head'>diff --git a/drivers/edac/mce_amd_inj.c b/drivers/edac/mce_amd_inj.c<br/>index 73c3e26a0bce..885e8ad8fdcf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/mce_amd_inj.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/mce_amd_inj.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/mce_amd_inj.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/edac/mce_amd_inj.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kobject.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/edac.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/mce.h&gt;</div><div class='hunk'>@@ -116,14 +115,14 @@ static struct edac_mce_attr *sysfs_attrs[] = { &amp;mce_attr_status, &amp;mce_attr_misc,</div><div class='ctx'> </div><div class='ctx'> static int __init edac_init_mce_inject(void)</div><div class='ctx'> {</div><div class='del'>-	struct sysdev_class *edac_class = NULL;</div><div class='add'>+	struct bus_type *edac_subsys = NULL;</div><div class='ctx'> 	int i, err = 0;</div><div class='ctx'> </div><div class='del'>-	edac_class = edac_get_sysfs_class();</div><div class='del'>-	if (!edac_class)</div><div class='add'>+	edac_subsys = edac_get_sysfs_subsys();</div><div class='add'>+	if (!edac_subsys)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mce_kobj = kobject_create_and_add("mce", &amp;edac_class-&gt;kset.kobj);</div><div class='add'>+	mce_kobj = kobject_create_and_add("mce", &amp;edac_subsys-&gt;dev_root-&gt;kobj);</div><div class='ctx'> 	if (!mce_kobj) {</div><div class='ctx'> 		printk(KERN_ERR "Error creating a mce kset.\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='hunk'>@@ -147,7 +146,7 @@ err_sysfs_create:</div><div class='ctx'> 	kobject_del(mce_kobj);</div><div class='ctx'> </div><div class='ctx'> err_mce_kobj:</div><div class='del'>-	edac_put_sysfs_class();</div><div class='add'>+	edac_put_sysfs_subsys();</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -161,7 +160,7 @@ static void __exit edac_exit_mce_inject(void)</div><div class='ctx'> </div><div class='ctx'> 	kobject_del(mce_kobj);</div><div class='ctx'> </div><div class='del'>-	edac_put_sysfs_class();</div><div class='add'>+	edac_put_sysfs_subsys();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(edac_init_mce_inject);</div><div class='head'>diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c<br/>index 38400963e245..fc757069c6af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/ppc4xx_edac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/ppc4xx_edac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/ppc4xx_edac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/edac/ppc4xx_edac.c</a></div><div class='hunk'>@@ -142,7 +142,7 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The ibm,sdram-4xx-ddr2 Device Control Registers (DCRs) are</div><div class='del'>- * indirectly acccessed and have a base and length defined by the</div><div class='add'>+ * indirectly accessed and have a base and length defined by the</div><div class='ctx'>  * device tree. The base can be anything; however, we expect the</div><div class='ctx'>  * length to be precisely two registers, the first for the address</div><div class='ctx'>  * window and the second for the data window.</div><div class='head'>diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c<br/>index b153674431f1..e294e1b3616c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/r82600_edac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/edac/r82600_edac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/r82600_edac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/edac/r82600_edac.c</a></div><div class='hunk'>@@ -131,7 +131,7 @@ struct r82600_error_info {</div><div class='ctx'> 	u32 eapr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int disable_hardware_scrub;</div><div class='add'>+static bool disable_hardware_scrub;</div><div class='ctx'> </div><div class='ctx'> static struct edac_pci_ctl_info *r82600_pci;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c<br/>index 68375bc3aef6..80e95aa3bf14 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/firewire/sbp2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/firewire/sbp2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/firewire/sbp2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/firewire/sbp2.c</a></div><div class='hunk'>@@ -66,7 +66,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Concurrent logins are useful together with cluster filesystems.</div><div class='ctx'>  */</div><div class='del'>-static int sbp2_param_exclusive_login = 1;</div><div class='add'>+static bool sbp2_param_exclusive_login = 1;</div><div class='ctx'> module_param_named(exclusive_login, sbp2_param_exclusive_login, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(exclusive_login, "Exclusive login to sbp2 device "</div><div class='ctx'> 		 "(default = Y, use N for concurrent initiators)");</div><div class='head'>diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig<br/>index efba163595db..9b00072a020f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/firmware/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/firmware/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/firmware/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/firmware/Kconfig</a></div><div class='hunk'>@@ -145,18 +145,6 @@ config ISCSI_IBFT</div><div class='ctx'> 	  detect iSCSI boot parameters dynamically during system boot, say Y.</div><div class='ctx'> 	  Otherwise, say N.</div><div class='ctx'> </div><div class='del'>-config SIGMA</div><div class='del'>-	tristate "SigmaStudio firmware loader"</div><div class='del'>-	depends on I2C</div><div class='del'>-	select CRC32</div><div class='del'>-	default n</div><div class='del'>-	help</div><div class='del'>-	  Enable helper functions for working with Analog Devices SigmaDSP</div><div class='del'>-	  parts and binary firmwares produced by Analog Devices SigmaStudio.</div><div class='del'>-</div><div class='del'>-	  If unsure, say N here.  Drivers that need these helpers will select</div><div class='del'>-	  this option automatically.</div><div class='del'>-</div><div class='ctx'> source "drivers/firmware/google/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile<br/>index 47338c979126..5a7e27399729 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/firmware/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/firmware/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/firmware/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/firmware/Makefile</a></div><div class='hunk'>@@ -12,6 +12,5 @@ obj-$(CONFIG_DMIID)		+= dmi-id.o</div><div class='ctx'> obj-$(CONFIG_ISCSI_IBFT_FIND)	+= iscsi_ibft_find.o</div><div class='ctx'> obj-$(CONFIG_ISCSI_IBFT)	+= iscsi_ibft.o</div><div class='ctx'> obj-$(CONFIG_FIRMWARE_MEMMAP)	+= memmap.o</div><div class='del'>-obj-$(CONFIG_SIGMA)		+= sigma.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_GOOGLE_FIRMWARE)	+= google/</div><div class='head'>diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c<br/>index b0a81173a268..d25599f2a3f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/firmware/efivars.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/firmware/efivars.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/firmware/efivars.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/firmware/efivars.c</a></div><div class='hunk'>@@ -495,7 +495,8 @@ static ssize_t efi_pstore_read(u64 *id, enum pstore_type_id *type,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int efi_pstore_write(enum pstore_type_id type, u64 *id,</div><div class='add'>+static int efi_pstore_write(enum pstore_type_id type,</div><div class='add'>+		enum kmsg_dump_reason reason, u64 *id,</div><div class='ctx'> 		unsigned int part, size_t size, struct pstore_info *psi)</div><div class='ctx'> {</div><div class='ctx'> 	char name[DUMP_NAME_LEN];</div><div class='hunk'>@@ -565,7 +566,7 @@ static int efi_pstore_write(enum pstore_type_id type, u64 *id,</div><div class='ctx'> static int efi_pstore_erase(enum pstore_type_id type, u64 id,</div><div class='ctx'> 			    struct pstore_info *psi)</div><div class='ctx'> {</div><div class='del'>-	efi_pstore_write(type, &amp;id, (unsigned int)id, 0, psi);</div><div class='add'>+	efi_pstore_write(type, 0, &amp;id, (unsigned int)id, 0, psi);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -587,7 +588,8 @@ static ssize_t efi_pstore_read(u64 *id, enum pstore_type_id *type,</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int efi_pstore_write(enum pstore_type_id type, u64 *id,</div><div class='add'>+static int efi_pstore_write(enum pstore_type_id type,</div><div class='add'>+		enum kmsg_dump_reason reason, u64 *id,</div><div class='ctx'> 		unsigned int part, size_t size, struct pstore_info *psi)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c<br/>index c4e7c59d1c63..91ddf0f7a1b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/firmware/google/gsmi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/firmware/google/gsmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/firmware/google/gsmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/firmware/google/gsmi.c</a></div><div class='hunk'>@@ -345,7 +345,8 @@ static efi_status_t gsmi_get_variable(efi_char16_t *name,</div><div class='ctx'> 		memcpy(&amp;param, gsmi_dev.param_buf-&gt;start, sizeof(param));</div><div class='ctx'> </div><div class='ctx'> 		/* The size reported is the min of all of our buffers */</div><div class='del'>-		*data_size = min(*data_size, gsmi_dev.data_buf-&gt;length);</div><div class='add'>+		*data_size = min_t(unsigned long, *data_size,</div><div class='add'>+						gsmi_dev.data_buf-&gt;length);</div><div class='ctx'> 		*data_size = min_t(unsigned long, *data_size, param.data_len);</div><div class='ctx'> </div><div class='ctx'> 		/* Copy data back to return buffer. */</div><div class='head'>diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c<br/>index 2cce44a1d7d0..3ee852c9925b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/firmware/iscsi_ibft.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/firmware/iscsi_ibft.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/firmware/iscsi_ibft.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/firmware/iscsi_ibft.c</a></div><div class='hunk'>@@ -433,11 +433,11 @@ static int __init ibft_check_device(void)</div><div class='ctx'>  * Helper routiners to check to determine if the entry is valid</div><div class='ctx'>  * in the proper iBFT structure.</div><div class='ctx'>  */</div><div class='del'>-static mode_t ibft_check_nic_for(void *data, int type)</div><div class='add'>+static umode_t ibft_check_nic_for(void *data, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct ibft_kobject *entry = data;</div><div class='ctx'> 	struct ibft_nic *nic = entry-&gt;nic;</div><div class='del'>-	mode_t rc = 0;</div><div class='add'>+	umode_t rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case ISCSI_BOOT_ETH_INDEX:</div><div class='hunk'>@@ -488,11 +488,11 @@ static mode_t ibft_check_nic_for(void *data, int type)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static mode_t __init ibft_check_tgt_for(void *data, int type)</div><div class='add'>+static umode_t __init ibft_check_tgt_for(void *data, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct ibft_kobject *entry = data;</div><div class='ctx'> 	struct ibft_tgt *tgt = entry-&gt;tgt;</div><div class='del'>-	mode_t rc = 0;</div><div class='add'>+	umode_t rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case ISCSI_BOOT_TGT_INDEX:</div><div class='hunk'>@@ -524,11 +524,11 @@ static mode_t __init ibft_check_tgt_for(void *data, int type)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static mode_t __init ibft_check_initiator_for(void *data, int type)</div><div class='add'>+static umode_t __init ibft_check_initiator_for(void *data, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct ibft_kobject *entry = data;</div><div class='ctx'> 	struct ibft_initiator *init = entry-&gt;initiator;</div><div class='del'>-	mode_t rc = 0;</div><div class='add'>+	umode_t rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case ISCSI_BOOT_INI_INDEX:</div><div class='head'>diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig<br/>index 8482a23887dc..d0c41188d4e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/Kconfig</a></div><div class='hunk'>@@ -70,7 +70,7 @@ config GPIO_GENERIC</div><div class='ctx'> </div><div class='ctx'> config GPIO_DA9052</div><div class='ctx'> 	tristate "Dialog DA9052 GPIO"</div><div class='del'>-	depends on PMIC_DA9052</div><div class='add'>+	depends on PMIC_DA9052 &amp;&amp; BROKEN</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say yes here to enable the GPIO driver for the DA9052 chip.</div><div class='ctx'> </div><div class='hunk'>@@ -87,6 +87,7 @@ config GPIO_GENERIC_PLATFORM</div><div class='ctx'> </div><div class='ctx'> config GPIO_IT8761E</div><div class='ctx'> 	tristate "IT8761E GPIO support"</div><div class='add'>+	depends on X86  # unconditional access to IO space.</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say yes here to support GPIO functionality of IT8761E super I/O chip.</div><div class='ctx'> </div><div class='hunk'>@@ -138,9 +139,16 @@ config GPIO_MXS</div><div class='ctx'> config GPIO_PL061</div><div class='ctx'> 	bool "PrimeCell PL061 GPIO support"</div><div class='ctx'> 	depends on ARM_AMBA</div><div class='add'>+	select GENERIC_IRQ_CHIP</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say yes here to support the PrimeCell PL061 GPIO device</div><div class='ctx'> </div><div class='add'>+config GPIO_PXA</div><div class='add'>+	bool "PXA GPIO support"</div><div class='add'>+	depends on ARCH_PXA || ARCH_MMP</div><div class='add'>+	help</div><div class='add'>+	  Say yes here to support the PXA GPIO device</div><div class='add'>+</div><div class='ctx'> config GPIO_XILINX</div><div class='ctx'> 	bool "Xilinx GPIO support"</div><div class='ctx'> 	depends on PPC_OF || MICROBLAZE</div><div class='hunk'>@@ -170,15 +178,6 @@ config GPIO_SCH</div><div class='ctx'> 	  The Intel Tunnel Creek processor has 5 GPIOs powered by the</div><div class='ctx'> 	  core power rail and 9 from suspend power supply.</div><div class='ctx'> </div><div class='del'>-config GPIO_U300</div><div class='del'>-	bool "ST-Ericsson U300 COH 901 335/571 GPIO"</div><div class='del'>-	depends on GPIOLIB &amp;&amp; ARCH_U300</div><div class='del'>-	help</div><div class='del'>-	  Say yes here to support GPIO interface on ST-Ericsson U300.</div><div class='del'>-	  The names of the two IP block variants supported are</div><div class='del'>-	  COH 901 335 and COH 901 571/3. They contain 3, 5 or 7</div><div class='del'>-	  ports of 8 GPIO pins each.</div><div class='del'>-</div><div class='ctx'> config GPIO_VX855</div><div class='ctx'> 	tristate "VIA VX855/VX875 GPIO"</div><div class='ctx'> 	depends on PCI</div><div class='hunk'>@@ -356,7 +355,7 @@ comment "PCI GPIO expanders:"</div><div class='ctx'> </div><div class='ctx'> config GPIO_CS5535</div><div class='ctx'> 	tristate "AMD CS5535/CS5536 GPIO support"</div><div class='del'>-	depends on PCI &amp;&amp; X86 &amp;&amp; !CS5535_GPIO &amp;&amp; MFD_CS5535</div><div class='add'>+	depends on PCI &amp;&amp; X86 &amp;&amp; MFD_CS5535</div><div class='ctx'> 	help</div><div class='ctx'> 	  The AMD CS5535 and CS5536 southbridges support 28 GPIO pins that</div><div class='ctx'> 	  can be used for quite a number of things.  The CS5535/6 is found on</div><div class='hunk'>@@ -387,7 +386,7 @@ config GPIO_LANGWELL</div><div class='ctx'> 	  Say Y here to support Intel Langwell/Penwell GPIO.</div><div class='ctx'> </div><div class='ctx'> config GPIO_PCH</div><div class='del'>-	tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GPIO"</div><div class='add'>+	tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7223/ML7831) GPIO"</div><div class='ctx'> 	depends on PCI &amp;&amp; X86</div><div class='ctx'> 	select GENERIC_IRQ_CHIP</div><div class='ctx'> 	help</div><div class='hunk'>@@ -395,11 +394,12 @@ config GPIO_PCH</div><div class='ctx'> 	  which is an IOH(Input/Output Hub) for x86 embedded processor.</div><div class='ctx'> 	  This driver can access PCH GPIO device.</div><div class='ctx'> </div><div class='del'>-	  This driver also can be used for OKI SEMICONDUCTOR IOH(Input/</div><div class='del'>-	  Output Hub), ML7223.</div><div class='add'>+	  This driver also can be used for LAPIS Semiconductor IOH(Input/</div><div class='add'>+	  Output Hub), ML7223 and ML7831.</div><div class='ctx'> 	  ML7223 IOH is for MP(Media Phone) use.</div><div class='del'>-	  ML7223 is companion chip for Intel Atom E6xx series.</div><div class='del'>-	  ML7223 is completely compatible for Intel EG20T PCH.</div><div class='add'>+	  ML7831 IOH is for general purpose use.</div><div class='add'>+	  ML7223/ML7831 is companion chip for Intel Atom E6xx series.</div><div class='add'>+	  ML7223/ML7831 is completely compatible for Intel EG20T PCH.</div><div class='ctx'> </div><div class='ctx'> config GPIO_ML_IOH</div><div class='ctx'> 	tristate "OKI SEMICONDUCTOR ML7213 IOH GPIO support"</div><div class='head'>diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile<br/>index 4e018d6a7639..fa10df604c01 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/Makefile</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> </div><div class='ctx'> ccflags-$(CONFIG_DEBUG_GPIO)	+= -DDEBUG</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_GPIOLIB)		+= gpiolib.o</div><div class='add'>+obj-$(CONFIG_GPIOLIB)		+= gpiolib.o devres.o</div><div class='ctx'> </div><div class='ctx'> # Device drivers. Generally keep list sorted alphabetically</div><div class='ctx'> obj-$(CONFIG_GPIO_GENERIC)	+= gpio-generic.o</div><div class='hunk'>@@ -40,7 +40,7 @@ obj-$(CONFIG_GPIO_PCA953X)	+= gpio-pca953x.o</div><div class='ctx'> obj-$(CONFIG_GPIO_PCF857X)	+= gpio-pcf857x.o</div><div class='ctx'> obj-$(CONFIG_GPIO_PCH)		+= gpio-pch.o</div><div class='ctx'> obj-$(CONFIG_GPIO_PL061)	+= gpio-pl061.o</div><div class='del'>-obj-$(CONFIG_PLAT_PXA)		+= gpio-pxa.o</div><div class='add'>+obj-$(CONFIG_GPIO_PXA)		+= gpio-pxa.o</div><div class='ctx'> obj-$(CONFIG_GPIO_RDC321X)	+= gpio-rdc321x.o</div><div class='ctx'> obj-$(CONFIG_PLAT_SAMSUNG)	+= gpio-samsung.o</div><div class='ctx'> obj-$(CONFIG_ARCH_SA1100)	+= gpio-sa1100.o</div><div class='hunk'>@@ -54,7 +54,6 @@ obj-$(CONFIG_ARCH_DAVINCI_TNETV107X) += gpio-tnetv107x.o</div><div class='ctx'> obj-$(CONFIG_GPIO_TPS65910)	+= gpio-tps65910.o</div><div class='ctx'> obj-$(CONFIG_GPIO_TPS65912)	+= gpio-tps65912.o</div><div class='ctx'> obj-$(CONFIG_GPIO_TWL4030)	+= gpio-twl4030.o</div><div class='del'>-obj-$(CONFIG_MACH_U300)		+= gpio-u300.o</div><div class='ctx'> obj-$(CONFIG_GPIO_UCB1400)	+= gpio-ucb1400.o</div><div class='ctx'> obj-$(CONFIG_GPIO_VR41XX)	+= gpio-vr41xx.o</div><div class='ctx'> obj-$(CONFIG_GPIO_VX855)	+= gpio-vx855.o</div><div class='head'>diff --git a/drivers/gpio/devres.c b/drivers/gpio/devres.c<br/>new file mode 100644<br/>index 000000000000..3dd29399cef5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/devres.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/devres.c</a></div><div class='hunk'>@@ -0,0 +1,90 @@</div><div class='add'>+/*</div><div class='add'>+ * drivers/gpio/devres.c - managed gpio resources</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 version 2</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ * This file is based on kernel/irq/devres.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 John Crispin &lt;blogic@openwrt.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/gfp.h&gt;</div><div class='add'>+</div><div class='add'>+static void devm_gpio_release(struct device *dev, void *res)</div><div class='add'>+{</div><div class='add'>+	unsigned *gpio = res;</div><div class='add'>+</div><div class='add'>+	gpio_free(*gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int devm_gpio_match(struct device *dev, void *res, void *data)</div><div class='add'>+{</div><div class='add'>+	unsigned *this = res, *gpio = data;</div><div class='add'>+</div><div class='add'>+	return *this == *gpio;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *      devm_gpio_request - request a gpio for a managed device</div><div class='add'>+ *      @dev: device to request the gpio for</div><div class='add'>+ *      @gpio: gpio to allocate</div><div class='add'>+ *      @label: the name of the requested gpio</div><div class='add'>+ *</div><div class='add'>+ *      Except for the extra @dev argument, this function takes the</div><div class='add'>+ *      same arguments and performs the same function as</div><div class='add'>+ *      gpio_request().  GPIOs requested with this function will be</div><div class='add'>+ *      automatically freed on driver detach.</div><div class='add'>+ *</div><div class='add'>+ *      If an GPIO allocated with this function needs to be freed</div><div class='add'>+ *      separately, devm_gpio_free() must be used.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int devm_gpio_request(struct device *dev, unsigned gpio, const char *label)</div><div class='add'>+{</div><div class='add'>+	unsigned *dr;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	dr = devres_alloc(devm_gpio_release, sizeof(unsigned), GFP_KERNEL);</div><div class='add'>+	if (!dr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rc = gpio_request(gpio, label);</div><div class='add'>+	if (rc) {</div><div class='add'>+		devres_free(dr);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*dr = gpio;</div><div class='add'>+	devres_add(dev, dr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(devm_gpio_request);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *      devm_gpio_free - free an interrupt</div><div class='add'>+ *      @dev: device to free gpio for</div><div class='add'>+ *      @gpio: gpio to free</div><div class='add'>+ *</div><div class='add'>+ *      Except for the extra @dev argument, this function takes the</div><div class='add'>+ *      same arguments and performs the same function as gpio_free().</div><div class='add'>+ *      This function instead of gpio_free() should be used to manually</div><div class='add'>+ *      free GPIOs allocated with devm_gpio_request().</div><div class='add'>+ */</div><div class='add'>+void devm_gpio_free(struct device *dev, unsigned int gpio)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	WARN_ON(devres_destroy(dev, devm_gpio_release, devm_gpio_match,</div><div class='add'>+		&amp;gpio));</div><div class='add'>+	gpio_free(gpio);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(devm_gpio_free);</div><div class='head'>diff --git a/drivers/gpio/gpio-adp5520.c b/drivers/gpio/gpio-adp5520.c<br/>index 9f2781537001..2f263cc32561 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-adp5520.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-adp5520.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-adp5520.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-adp5520.c</a></div><div class='hunk'>@@ -193,17 +193,7 @@ static struct platform_driver adp5520_gpio_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(adp5520_gpio_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init adp5520_gpio_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;adp5520_gpio_driver);</div><div class='del'>-}</div><div class='del'>-module_init(adp5520_gpio_init);</div><div class='del'>-</div><div class='del'>-static void __exit adp5520_gpio_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;adp5520_gpio_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(adp5520_gpio_exit);</div><div class='add'>+module_platform_driver(adp5520_gpio_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Michael Hennerich &lt;hennerich@blackfin.uclinux.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("GPIO ADP5520 Driver");</div><div class='head'>diff --git a/drivers/gpio/gpio-adp5588.c b/drivers/gpio/gpio-adp5588.c<br/>index 3525ad918771..9ad1703d1408 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-adp5588.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-adp5588.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-adp5588.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-adp5588.c</a></div><div class='hunk'>@@ -418,9 +418,8 @@ static int __devinit adp5588_gpio_probe(struct i2c_client *client,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_irq;</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;client-&gt;dev, "gpios %d..%d (IRQ Base %d) on a %s Rev. %d\n",</div><div class='del'>-			gc-&gt;base, gc-&gt;base + gc-&gt;ngpio - 1,</div><div class='del'>-			pdata-&gt;irq_base, client-&gt;name, revid);</div><div class='add'>+	dev_info(&amp;client-&gt;dev, "IRQ Base: %d Rev.: %d\n",</div><div class='add'>+			pdata-&gt;irq_base, revid);</div><div class='ctx'> </div><div class='ctx'> 	if (pdata-&gt;setup) {</div><div class='ctx'> 		ret = pdata-&gt;setup(client, gc-&gt;base, gc-&gt;ngpio, pdata-&gt;context);</div><div class='head'>diff --git a/drivers/gpio/gpio-bt8xx.c b/drivers/gpio/gpio-bt8xx.c<br/>index ec57936aef62..5ca4098ba092 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-bt8xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-bt8xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-bt8xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-bt8xx.c</a></div><div class='hunk'>@@ -223,9 +223,6 @@ static int bt8xxgpio_probe(struct pci_dev *dev,</div><div class='ctx'> 		goto err_release_mem;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "bt8xxgpio: Abusing BT8xx card for GPIOs %d to %d\n",</div><div class='del'>-	       bg-&gt;gpio.base, bg-&gt;gpio.base + BT8XXGPIO_NR_GPIOS - 1);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_release_mem:</div><div class='head'>diff --git a/drivers/gpio/gpio-cs5535.c b/drivers/gpio/gpio-cs5535.c<br/>index 6e16cba56ad2..19eda1bbe343 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-cs5535.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-cs5535.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-cs5535.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-cs5535.c</a></div><div class='hunk'>@@ -347,7 +347,6 @@ static int __devinit cs5535_gpio_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto release_region;</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "GPIO support successfully loaded.\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> release_region:</div><div class='hunk'>@@ -382,18 +381,7 @@ static struct platform_driver cs5535_gpio_driver = {</div><div class='ctx'> 	.remove = __devexit_p(cs5535_gpio_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init cs5535_gpio_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;cs5535_gpio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cs5535_gpio_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;cs5535_gpio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(cs5535_gpio_init);</div><div class='del'>-module_exit(cs5535_gpio_exit);</div><div class='add'>+module_platform_driver(cs5535_gpio_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Andres Salomon &lt;dilinger@queued.net&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("AMD CS5535/CS5536 GPIO driver");</div><div class='head'>diff --git a/drivers/gpio/gpio-da9052.c b/drivers/gpio/gpio-da9052.c<br/>index f8ce29ef9f88..56dd047d5844 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-da9052.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-da9052.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-da9052.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-da9052.c</a></div><div class='hunk'>@@ -254,17 +254,7 @@ static struct platform_driver da9052_gpio_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init da9052_gpio_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;da9052_gpio_driver);</div><div class='del'>-}</div><div class='del'>-module_init(da9052_gpio_init);</div><div class='del'>-</div><div class='del'>-static void __exit da9052_gpio_exit(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_unregister(&amp;da9052_gpio_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(da9052_gpio_exit);</div><div class='add'>+module_platform_driver(da9052_gpio_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("David Dajun Chen &lt;dchen@diasemi.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("DA9052 GPIO Device Driver");</div><div class='head'>diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c<br/>index 4e24436b0f82..e38dd0c31973 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-generic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-generic.c</a></div><div class='hunk'>@@ -524,17 +524,7 @@ static struct platform_driver bgpio_driver = {</div><div class='ctx'> 	.remove = __devexit_p(bgpio_pdev_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init bgpio_platform_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;bgpio_driver);</div><div class='del'>-}</div><div class='del'>-module_init(bgpio_platform_init);</div><div class='del'>-</div><div class='del'>-static void __exit bgpio_platform_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;bgpio_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(bgpio_platform_exit);</div><div class='add'>+module_platform_driver(bgpio_driver);</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_GPIO_GENERIC_PLATFORM */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpio/gpio-janz-ttl.c b/drivers/gpio/gpio-janz-ttl.c<br/>index 813ac077e5d7..f2f000dd70b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-janz-ttl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-janz-ttl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-janz-ttl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-janz-ttl.c</a></div><div class='hunk'>@@ -201,8 +201,6 @@ static int __devinit ttl_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto out_iounmap_regs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "module %d: registered GPIO device\n",</div><div class='del'>-			     pdata-&gt;modno);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_iounmap_regs:</div><div class='hunk'>@@ -239,20 +237,9 @@ static struct platform_driver ttl_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(ttl_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ttl_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ttl_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ttl_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ttl_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(ttl_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Ira W. Snyder &lt;iws@ovro.caltech.edu&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Janz MODULbus VMOD-TTL Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS("platform:janz-ttl");</div><div class='del'>-</div><div class='del'>-module_init(ttl_init);</div><div class='del'>-module_exit(ttl_exit);</div><div class='head'>diff --git a/drivers/gpio/gpio-ml-ioh.c b/drivers/gpio/gpio-ml-ioh.c<br/>index 461958fc2264..03d6dd5dcb77 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-ml-ioh.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-ml-ioh.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-ml-ioh.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-ml-ioh.c</a></div><div class='hunk'>@@ -248,7 +248,7 @@ static void ioh_gpio_setup(struct ioh_gpio *chip, int num_port)</div><div class='ctx'> static int ioh_irq_type(struct irq_data *d, unsigned int type)</div><div class='ctx'> {</div><div class='ctx'> 	u32 im;</div><div class='del'>-	u32 *im_reg;</div><div class='add'>+	void __iomem *im_reg;</div><div class='ctx'> 	u32 ien;</div><div class='ctx'> 	u32 im_pos;</div><div class='ctx'> 	int ch;</div><div class='hunk'>@@ -412,7 +412,7 @@ static int __devinit ioh_gpio_probe(struct pci_dev *pdev,</div><div class='ctx'> 	int i, j;</div><div class='ctx'> 	struct ioh_gpio *chip;</div><div class='ctx'> 	void __iomem *base;</div><div class='del'>-	void __iomem *chip_save;</div><div class='add'>+	void *chip_save;</div><div class='ctx'> 	int irq_base;</div><div class='ctx'> </div><div class='ctx'> 	ret = pci_enable_device(pdev);</div><div class='hunk'>@@ -428,7 +428,7 @@ static int __devinit ioh_gpio_probe(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	base = pci_iomap(pdev, 1, 0);</div><div class='del'>-	if (base == 0) {</div><div class='add'>+	if (!base) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "%s : pci_iomap failed", __func__);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto err_iomap;</div><div class='hunk'>@@ -521,7 +521,7 @@ static void __devexit ioh_gpio_remove(struct pci_dev *pdev)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct ioh_gpio *chip = pci_get_drvdata(pdev);</div><div class='del'>-	void __iomem *chip_save;</div><div class='add'>+	void *chip_save;</div><div class='ctx'> </div><div class='ctx'> 	chip_save = chip;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpio/gpio-nomadik.c b/drivers/gpio/gpio-nomadik.c<br/>index 1ebedfb6d46d..839624f9fe6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-nomadik.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-nomadik.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-nomadik.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-nomadik.c</a></div><div class='hunk'>@@ -1150,8 +1150,8 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	nmk_gpio_init_irq(nmk_chip);</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;dev-&gt;dev, "Bits %i-%i at address %p\n",</div><div class='del'>-		 nmk_chip-&gt;chip.base, nmk_chip-&gt;chip.base+31, nmk_chip-&gt;addr);</div><div class='add'>+	dev_info(&amp;dev-&gt;dev, "at address %p\n",</div><div class='add'>+		 nmk_chip-&gt;addr);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='head'>diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c<br/>index 3e1f1ecd07be..2d1de9e7e9bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-pcf857x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-pcf857x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-pcf857x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-pcf857x.c</a></div><div class='hunk'>@@ -290,10 +290,7 @@ static int pcf857x_probe(struct i2c_client *client,</div><div class='ctx'> 	 * methods can't be called from sleeping contexts.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;client-&gt;dev, "gpios %d..%d on a %s%s\n",</div><div class='del'>-			gpio-&gt;chip.base,</div><div class='del'>-			gpio-&gt;chip.base + gpio-&gt;chip.ngpio - 1,</div><div class='del'>-			client-&gt;name,</div><div class='add'>+	dev_info(&amp;client-&gt;dev, "%s\n",</div><div class='ctx'> 			client-&gt;irq ? " (irq ignored)" : "");</div><div class='ctx'> </div><div class='ctx'> 	/* Let platform code set up the GPIOs and their users.</div><div class='head'>diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c<br/>index a6008e123d04..68fa55e86eb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-pch.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-pch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-pch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-pch.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2010 OKI SEMICONDUCTOR Co., LTD.</div><div class='add'>+ * Copyright (C) 2011 LAPIS Semiconductor Co., Ltd.</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'>@@ -49,8 +49,8 @@ struct pch_regs {</div><div class='ctx'> </div><div class='ctx'> enum pch_type_t {</div><div class='ctx'> 	INTEL_EG20T_PCH,</div><div class='del'>-	OKISEMI_ML7223m_IOH, /* OKISEMI ML7223 IOH PCIe Bus-m */</div><div class='del'>-	OKISEMI_ML7223n_IOH  /* OKISEMI ML7223 IOH PCIe Bus-n */</div><div class='add'>+	OKISEMI_ML7223m_IOH, /* LAPIS Semiconductor ML7223 IOH PCIe Bus-m */</div><div class='add'>+	OKISEMI_ML7223n_IOH  /* LAPIS Semiconductor ML7223 IOH PCIe Bus-n */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Specifies number of GPIO PINS */</div><div class='hunk'>@@ -231,7 +231,7 @@ static void pch_gpio_setup(struct pch_gpio *chip)</div><div class='ctx'> static int pch_irq_type(struct irq_data *d, unsigned int type)</div><div class='ctx'> {</div><div class='ctx'> 	u32 im;</div><div class='del'>-	u32 *im_reg;</div><div class='add'>+	u32 __iomem *im_reg;</div><div class='ctx'> 	u32 ien;</div><div class='ctx'> 	u32 im_pos;</div><div class='ctx'> 	int ch;</div><div class='hunk'>@@ -376,7 +376,7 @@ static int __devinit pch_gpio_probe(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;base = pci_iomap(pdev, 1, 0);</div><div class='del'>-	if (chip-&gt;base == 0) {</div><div class='add'>+	if (!chip-&gt;base) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "%s : pci_iomap FAILED", __func__);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto err_iomap;</div><div class='hunk'>@@ -524,6 +524,7 @@ static DEFINE_PCI_DEVICE_TABLE(pch_gpio_pcidev_id) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8803) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8014) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8043) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8803) },</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, pch_gpio_pcidev_id);</div><div class='head'>diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c<br/>index 4102f63230fd..77c9cc70fa77 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-pl061.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-pl061.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-pl061.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-pl061.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='hunk'>@@ -23,6 +22,8 @@</div><div class='ctx'> #include &lt;linux/amba/bus.h&gt;</div><div class='ctx'> #include &lt;linux/amba/pl061.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define GPIODIR 0x400</div><div class='ctx'> #define GPIOIS  0x404</div><div class='hunk'>@@ -35,25 +36,33 @@</div><div class='ctx'> </div><div class='ctx'> #define PL061_GPIO_NR	8</div><div class='ctx'> </div><div class='del'>-struct pl061_gpio {</div><div class='del'>-	/* We use a list of pl061_gpio structs for each trigger IRQ in the main</div><div class='del'>-	 * interrupts controller of the system. We need this to support systems</div><div class='del'>-	 * in which more that one PL061s are connected to the same IRQ. The ISR</div><div class='del'>-	 * interates through this list to find the source of the interrupt.</div><div class='del'>-	 */</div><div class='del'>-	struct list_head	list;</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+struct pl061_context_save_regs {</div><div class='add'>+	u8 gpio_data;</div><div class='add'>+	u8 gpio_dir;</div><div class='add'>+	u8 gpio_is;</div><div class='add'>+	u8 gpio_ibe;</div><div class='add'>+	u8 gpio_iev;</div><div class='add'>+	u8 gpio_ie;</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+struct pl061_gpio {</div><div class='ctx'> 	/* Each of the two spinlocks protects a different set of hardware</div><div class='ctx'> 	 * regiters and data structurs. This decouples the code of the IRQ from</div><div class='ctx'> 	 * the GPIO code. This also makes the case of a GPIO routine call from</div><div class='ctx'> 	 * the IRQ code simpler.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spinlock_t		lock;		/* GPIO registers */</div><div class='del'>-	spinlock_t		irq_lock;	/* IRQ registers */</div><div class='ctx'> </div><div class='ctx'> 	void __iomem		*base;</div><div class='del'>-	unsigned		irq_base;</div><div class='add'>+	int			irq_base;</div><div class='add'>+	struct irq_chip_generic	*irq_gc;</div><div class='ctx'> 	struct gpio_chip	gc;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	struct pl061_context_save_regs csave_regs;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int pl061_direction_input(struct gpio_chip *gc, unsigned offset)</div><div class='hunk'>@@ -118,46 +127,16 @@ static int pl061_to_irq(struct gpio_chip *gc, unsigned offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;irq_base == NO_IRQ)</div><div class='add'>+	if (chip-&gt;irq_base &lt;= 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return chip-&gt;irq_base + offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * PL061 GPIO IRQ</div><div class='del'>- */</div><div class='del'>-static void pl061_irq_disable(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	struct pl061_gpio *chip = irq_data_get_irq_chip_data(d);</div><div class='del'>-	int offset = d-&gt;irq - chip-&gt;irq_base;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u8 gpioie;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;irq_lock, flags);</div><div class='del'>-	gpioie = readb(chip-&gt;base + GPIOIE);</div><div class='del'>-	gpioie &amp;= ~(1 &lt;&lt; offset);</div><div class='del'>-	writeb(gpioie, chip-&gt;base + GPIOIE);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;irq_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pl061_irq_enable(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	struct pl061_gpio *chip = irq_data_get_irq_chip_data(d);</div><div class='del'>-	int offset = d-&gt;irq - chip-&gt;irq_base;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u8 gpioie;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;irq_lock, flags);</div><div class='del'>-	gpioie = readb(chip-&gt;base + GPIOIE);</div><div class='del'>-	gpioie |= 1 &lt;&lt; offset;</div><div class='del'>-	writeb(gpioie, chip-&gt;base + GPIOIE);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;irq_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int pl061_irq_type(struct irq_data *d, unsigned trigger)</div><div class='ctx'> {</div><div class='del'>-	struct pl061_gpio *chip = irq_data_get_irq_chip_data(d);</div><div class='add'>+	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);</div><div class='add'>+	struct pl061_gpio *chip = gc-&gt;private;</div><div class='ctx'> 	int offset = d-&gt;irq - chip-&gt;irq_base;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u8 gpiois, gpioibe, gpioiev;</div><div class='hunk'>@@ -165,7 +144,7 @@ static int pl061_irq_type(struct irq_data *d, unsigned trigger)</div><div class='ctx'> 	if (offset &lt; 0 || offset &gt;= PL061_GPIO_NR)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;irq_lock, flags);</div><div class='add'>+	raw_spin_lock_irqsave(&amp;gc-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	gpioiev = readb(chip-&gt;base + GPIOIEV);</div><div class='ctx'> </div><div class='hunk'>@@ -194,49 +173,54 @@ static int pl061_irq_type(struct irq_data *d, unsigned trigger)</div><div class='ctx'> </div><div class='ctx'> 	writeb(gpioiev, chip-&gt;base + GPIOIEV);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;irq_lock, flags);</div><div class='add'>+	raw_spin_unlock_irqrestore(&amp;gc-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct irq_chip pl061_irqchip = {</div><div class='del'>-	.name		= "GPIO",</div><div class='del'>-	.irq_enable	= pl061_irq_enable,</div><div class='del'>-	.irq_disable	= pl061_irq_disable,</div><div class='del'>-	.irq_set_type	= pl061_irq_type,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void pl061_irq_handler(unsigned irq, struct irq_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *chip_list = irq_get_handler_data(irq);</div><div class='del'>-	struct list_head *ptr;</div><div class='del'>-	struct pl061_gpio *chip;</div><div class='del'>-</div><div class='del'>-	desc-&gt;irq_data.chip-&gt;irq_ack(&amp;desc-&gt;irq_data);</div><div class='del'>-	list_for_each(ptr, chip_list) {</div><div class='del'>-		unsigned long pending;</div><div class='del'>-		int offset;</div><div class='add'>+	unsigned long pending;</div><div class='add'>+	int offset;</div><div class='add'>+	struct pl061_gpio *chip = irq_desc_get_handler_data(desc);</div><div class='add'>+	struct irq_chip *irqchip = irq_desc_get_chip(desc);</div><div class='ctx'> </div><div class='del'>-		chip = list_entry(ptr, struct pl061_gpio, list);</div><div class='del'>-		pending = readb(chip-&gt;base + GPIOMIS);</div><div class='del'>-		writeb(pending, chip-&gt;base + GPIOIC);</div><div class='del'>-</div><div class='del'>-		if (pending == 0)</div><div class='del'>-			continue;</div><div class='add'>+	chained_irq_enter(irqchip, desc);</div><div class='ctx'> </div><div class='add'>+	pending = readb(chip-&gt;base + GPIOMIS);</div><div class='add'>+	writeb(pending, chip-&gt;base + GPIOIC);</div><div class='add'>+	if (pending) {</div><div class='ctx'> 		for_each_set_bit(offset, &amp;pending, PL061_GPIO_NR)</div><div class='ctx'> 			generic_handle_irq(pl061_to_irq(&amp;chip-&gt;gc, offset));</div><div class='ctx'> 	}</div><div class='del'>-	desc-&gt;irq_data.chip-&gt;irq_unmask(&amp;desc-&gt;irq_data);</div><div class='add'>+</div><div class='add'>+	chained_irq_exit(irqchip, desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init pl061_init_gc(struct pl061_gpio *chip, int irq_base)</div><div class='add'>+{</div><div class='add'>+	struct irq_chip_type *ct;</div><div class='add'>+</div><div class='add'>+	chip-&gt;irq_gc = irq_alloc_generic_chip("gpio-pl061", 1, irq_base,</div><div class='add'>+					      chip-&gt;base, handle_simple_irq);</div><div class='add'>+	chip-&gt;irq_gc-&gt;private = chip;</div><div class='add'>+</div><div class='add'>+	ct = chip-&gt;irq_gc-&gt;chip_types;</div><div class='add'>+	ct-&gt;chip.irq_mask = irq_gc_mask_clr_bit;</div><div class='add'>+	ct-&gt;chip.irq_unmask = irq_gc_mask_set_bit;</div><div class='add'>+	ct-&gt;chip.irq_set_type = pl061_irq_type;</div><div class='add'>+	ct-&gt;chip.irq_set_wake = irq_gc_set_wake;</div><div class='add'>+	ct-&gt;regs.mask = GPIOIE;</div><div class='add'>+</div><div class='add'>+	irq_setup_generic_chip(chip-&gt;irq_gc, IRQ_MSK(PL061_GPIO_NR),</div><div class='add'>+			       IRQ_GC_INIT_NESTED_LOCK, IRQ_NOREQUEST, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pl061_probe(struct amba_device *dev, const struct amba_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pl061_platform_data *pdata;</div><div class='ctx'> 	struct pl061_gpio *chip;</div><div class='del'>-	struct list_head *chip_list;</div><div class='ctx'> 	int ret, irq, i;</div><div class='del'>-	static DECLARE_BITMAP(init_irq, NR_IRQS);</div><div class='ctx'> </div><div class='ctx'> 	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='ctx'> 	if (chip == NULL)</div><div class='hunk'>@@ -248,7 +232,7 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id)</div><div class='ctx'> 		chip-&gt;irq_base = pdata-&gt;irq_base;</div><div class='ctx'> 	} else if (dev-&gt;dev.of_node) {</div><div class='ctx'> 		chip-&gt;gc.base = -1;</div><div class='del'>-		chip-&gt;irq_base = NO_IRQ;</div><div class='add'>+		chip-&gt;irq_base = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		goto free_mem;</div><div class='hunk'>@@ -267,8 +251,6 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;lock);</div><div class='del'>-	spin_lock_init(&amp;chip-&gt;irq_lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;chip-&gt;list);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;gc.direction_input = pl061_direction_input;</div><div class='ctx'> 	chip-&gt;gc.direction_output = pl061_direction_output;</div><div class='hunk'>@@ -288,9 +270,11 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id)</div><div class='ctx'> 	 * irq_chip support</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;irq_base == NO_IRQ)</div><div class='add'>+	if (chip-&gt;irq_base &lt;= 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	pl061_init_gc(chip, chip-&gt;irq_base);</div><div class='add'>+</div><div class='ctx'> 	writeb(0, chip-&gt;base + GPIOIE); /* disable irqs */</div><div class='ctx'> 	irq = dev-&gt;irq[0];</div><div class='ctx'> 	if (irq &lt; 0) {</div><div class='hunk'>@@ -298,18 +282,7 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id)</div><div class='ctx'> 		goto iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> 	irq_set_chained_handler(irq, pl061_irq_handler);</div><div class='del'>-	if (!test_and_set_bit(irq, init_irq)) { /* list initialized? */</div><div class='del'>-		chip_list = kmalloc(sizeof(*chip_list), GFP_KERNEL);</div><div class='del'>-		if (chip_list == NULL) {</div><div class='del'>-			clear_bit(irq, init_irq);</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto iounmap;</div><div class='del'>-		}</div><div class='del'>-		INIT_LIST_HEAD(chip_list);</div><div class='del'>-		irq_set_handler_data(irq, chip_list);</div><div class='del'>-	} else</div><div class='del'>-		chip_list = irq_get_handler_data(irq);</div><div class='del'>-	list_add(&amp;chip-&gt;list, chip_list);</div><div class='add'>+	irq_set_handler_data(irq, chip);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; PL061_GPIO_NR; i++) {</div><div class='ctx'> 		if (pdata) {</div><div class='hunk'>@@ -319,13 +292,10 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id)</div><div class='ctx'> 			else</div><div class='ctx'> 				pl061_direction_input(&amp;chip-&gt;gc, i);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		irq_set_chip_and_handler(i + chip-&gt;irq_base, &amp;pl061_irqchip,</div><div class='del'>-					 handle_simple_irq);</div><div class='del'>-		set_irq_flags(i+chip-&gt;irq_base, IRQF_VALID);</div><div class='del'>-		irq_set_chip_data(i + chip-&gt;irq_base, chip);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	amba_set_drvdata(dev, chip);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> iounmap:</div><div class='hunk'>@@ -338,6 +308,53 @@ free_mem:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int pl061_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct pl061_gpio *chip = dev_get_drvdata(dev);</div><div class='add'>+	int offset;</div><div class='add'>+</div><div class='add'>+	chip-&gt;csave_regs.gpio_data = 0;</div><div class='add'>+	chip-&gt;csave_regs.gpio_dir = readb(chip-&gt;base + GPIODIR);</div><div class='add'>+	chip-&gt;csave_regs.gpio_is = readb(chip-&gt;base + GPIOIS);</div><div class='add'>+	chip-&gt;csave_regs.gpio_ibe = readb(chip-&gt;base + GPIOIBE);</div><div class='add'>+	chip-&gt;csave_regs.gpio_iev = readb(chip-&gt;base + GPIOIEV);</div><div class='add'>+	chip-&gt;csave_regs.gpio_ie = readb(chip-&gt;base + GPIOIE);</div><div class='add'>+</div><div class='add'>+	for (offset = 0; offset &lt; PL061_GPIO_NR; offset++) {</div><div class='add'>+		if (chip-&gt;csave_regs.gpio_dir &amp; (1 &lt;&lt; offset))</div><div class='add'>+			chip-&gt;csave_regs.gpio_data |=</div><div class='add'>+				pl061_get_value(&amp;chip-&gt;gc, offset) &lt;&lt; offset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pl061_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct pl061_gpio *chip = dev_get_drvdata(dev);</div><div class='add'>+	int offset;</div><div class='add'>+</div><div class='add'>+	for (offset = 0; offset &lt; PL061_GPIO_NR; offset++) {</div><div class='add'>+		if (chip-&gt;csave_regs.gpio_dir &amp; (1 &lt;&lt; offset))</div><div class='add'>+			pl061_direction_output(&amp;chip-&gt;gc, offset,</div><div class='add'>+					chip-&gt;csave_regs.gpio_data &amp;</div><div class='add'>+					(1 &lt;&lt; offset));</div><div class='add'>+		else</div><div class='add'>+			pl061_direction_input(&amp;chip-&gt;gc, offset);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writeb(chip-&gt;csave_regs.gpio_is, chip-&gt;base + GPIOIS);</div><div class='add'>+	writeb(chip-&gt;csave_regs.gpio_ibe, chip-&gt;base + GPIOIBE);</div><div class='add'>+	writeb(chip-&gt;csave_regs.gpio_iev, chip-&gt;base + GPIOIEV);</div><div class='add'>+	writeb(chip-&gt;csave_regs.gpio_ie, chip-&gt;base + GPIOIE);</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(pl061_dev_pm_ops, pl061_suspend, pl061_resume);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct amba_id pl061_ids[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.id	= 0x00041061,</div><div class='hunk'>@@ -346,9 +363,14 @@ static struct amba_id pl061_ids[] = {</div><div class='ctx'> 	{ 0, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+MODULE_DEVICE_TABLE(amba, pl061_ids);</div><div class='add'>+</div><div class='ctx'> static struct amba_driver pl061_gpio_driver = {</div><div class='ctx'> 	.drv = {</div><div class='ctx'> 		.name	= "pl061_gpio",</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+		.pm	= &amp;pl061_dev_pm_ops,</div><div class='add'>+#endif</div><div class='ctx'> 	},</div><div class='ctx'> 	.id_table	= pl061_ids,</div><div class='ctx'> 	.probe		= pl061_probe,</div><div class='head'>diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c<br/>index ee137712f9db..b2d3ee1d183a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-pxa.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-pxa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-pxa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-pxa.c</a></div><div class='hunk'>@@ -11,14 +11,46 @@</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='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/gpio-pxa.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/gpio-pxa.h&gt;</div><div class='add'>+/*</div><div class='add'>+ * We handle the GPIOs by banks, each bank covers up to 32 GPIOs with</div><div class='add'>+ * one set of registers. The register offsets are organized below:</div><div class='add'>+ *</div><div class='add'>+ *           GPLR    GPDR    GPSR    GPCR    GRER    GFER    GEDR</div><div class='add'>+ * BANK 0 - 0x0000  0x000C  0x0018  0x0024  0x0030  0x003C  0x0048</div><div class='add'>+ * BANK 1 - 0x0004  0x0010  0x001C  0x0028  0x0034  0x0040  0x004C</div><div class='add'>+ * BANK 2 - 0x0008  0x0014  0x0020  0x002C  0x0038  0x0044  0x0050</div><div class='add'>+ *</div><div class='add'>+ * BANK 3 - 0x0100  0x010C  0x0118  0x0124  0x0130  0x013C  0x0148</div><div class='add'>+ * BANK 4 - 0x0104  0x0110  0x011C  0x0128  0x0134  0x0140  0x014C</div><div class='add'>+ * BANK 5 - 0x0108  0x0114  0x0120  0x012C  0x0138  0x0144  0x0150</div><div class='add'>+ *</div><div class='add'>+ * NOTE:</div><div class='add'>+ *   BANK 3 is only available on PXA27x and later processors.</div><div class='add'>+ *   BANK 4 and 5 are only available on PXA935</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define GPLR_OFFSET	0x00</div><div class='add'>+#define GPDR_OFFSET	0x0C</div><div class='add'>+#define GPSR_OFFSET	0x18</div><div class='add'>+#define GPCR_OFFSET	0x24</div><div class='add'>+#define GRER_OFFSET	0x30</div><div class='add'>+#define GFER_OFFSET	0x3C</div><div class='add'>+#define GEDR_OFFSET	0x48</div><div class='add'>+#define GAFR_OFFSET	0x54</div><div class='add'>+#define ED_MASK_OFFSET	0x9C	/* GPIO edge detection for AP side */</div><div class='add'>+</div><div class='add'>+#define BANK_OFF(n)	(((n) &lt; 3) ? (n) &lt;&lt; 2 : 0x100 + (((n) - 3) &lt;&lt; 2))</div><div class='ctx'> </div><div class='ctx'> int pxa_last_gpio;</div><div class='ctx'> </div><div class='hunk'>@@ -39,8 +71,20 @@ struct pxa_gpio_chip {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	PXA25X_GPIO = 0,</div><div class='add'>+	PXA26X_GPIO,</div><div class='add'>+	PXA27X_GPIO,</div><div class='add'>+	PXA3XX_GPIO,</div><div class='add'>+	PXA93X_GPIO,</div><div class='add'>+	MMP_GPIO = 0x10,</div><div class='add'>+	MMP2_GPIO,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static DEFINE_SPINLOCK(gpio_lock);</div><div class='ctx'> static struct pxa_gpio_chip *pxa_gpio_chips;</div><div class='add'>+static int gpio_type;</div><div class='add'>+static void __iomem *gpio_reg_base;</div><div class='ctx'> </div><div class='ctx'> #define for_each_gpio_chip(i, c)			\</div><div class='ctx'> 	for (i = 0, c = &amp;pxa_gpio_chips[0]; i &lt;= pxa_last_gpio; i += 32, c++)</div><div class='hunk'>@@ -55,6 +99,122 @@ static inline struct pxa_gpio_chip *gpio_to_pxachip(unsigned gpio)</div><div class='ctx'> 	return &amp;pxa_gpio_chips[gpio_to_bank(gpio)];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int gpio_is_pxa_type(int type)</div><div class='add'>+{</div><div class='add'>+	return (type &amp; MMP_GPIO) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gpio_is_mmp_type(int type)</div><div class='add'>+{</div><div class='add'>+	return (type &amp; MMP_GPIO) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* GPIO86/87/88/89 on PXA26x have their direction bits in PXA_GPDR(2 inverted,</div><div class='add'>+ * as well as their Alternate Function value being '1' for GPIO in GAFRx.</div><div class='add'>+ */</div><div class='add'>+static inline int __gpio_is_inverted(int gpio)</div><div class='add'>+{</div><div class='add'>+	if ((gpio_type == PXA26X_GPIO) &amp;&amp; (gpio &gt; 85))</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On PXA25x and PXA27x, GAFRx and GPDRx together decide the alternate</div><div class='add'>+ * function of a GPIO, and GPDRx cannot be altered once configured. It</div><div class='add'>+ * is attributed as "occupied" here (I know this terminology isn't</div><div class='add'>+ * accurate, you are welcome to propose a better one :-)</div><div class='add'>+ */</div><div class='add'>+static inline int __gpio_is_occupied(unsigned gpio)</div><div class='add'>+{</div><div class='add'>+	struct pxa_gpio_chip *pxachip;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	unsigned long gafr = 0, gpdr = 0;</div><div class='add'>+	int ret, af = 0, dir = 0;</div><div class='add'>+</div><div class='add'>+	pxachip = gpio_to_pxachip(gpio);</div><div class='add'>+	base = gpio_chip_base(&amp;pxachip-&gt;chip);</div><div class='add'>+	gpdr = readl_relaxed(base + GPDR_OFFSET);</div><div class='add'>+</div><div class='add'>+	switch (gpio_type) {</div><div class='add'>+	case PXA25X_GPIO:</div><div class='add'>+	case PXA26X_GPIO:</div><div class='add'>+	case PXA27X_GPIO:</div><div class='add'>+		gafr = readl_relaxed(base + GAFR_OFFSET);</div><div class='add'>+		af = (gafr &gt;&gt; ((gpio &amp; 0xf) * 2)) &amp; 0x3;</div><div class='add'>+		dir = gpdr &amp; GPIO_bit(gpio);</div><div class='add'>+</div><div class='add'>+		if (__gpio_is_inverted(gpio))</div><div class='add'>+			ret = (af != 1) || (dir == 0);</div><div class='add'>+		else</div><div class='add'>+			ret = (af != 0) || (dir != 0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = gpdr &amp; GPIO_bit(gpio);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_PXA</div><div class='add'>+static inline int __pxa_gpio_to_irq(int gpio)</div><div class='add'>+{</div><div class='add'>+	if (gpio_is_pxa_type(gpio_type))</div><div class='add'>+		return PXA_GPIO_TO_IRQ(gpio);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int __pxa_irq_to_gpio(int irq)</div><div class='add'>+{</div><div class='add'>+	if (gpio_is_pxa_type(gpio_type))</div><div class='add'>+		return irq - PXA_GPIO_TO_IRQ(0);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int __pxa_gpio_to_irq(int gpio) { return -1; }</div><div class='add'>+static inline int __pxa_irq_to_gpio(int irq) { return -1; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_MMP</div><div class='add'>+static inline int __mmp_gpio_to_irq(int gpio)</div><div class='add'>+{</div><div class='add'>+	if (gpio_is_mmp_type(gpio_type))</div><div class='add'>+		return MMP_GPIO_TO_IRQ(gpio);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int __mmp_irq_to_gpio(int irq)</div><div class='add'>+{</div><div class='add'>+	if (gpio_is_mmp_type(gpio_type))</div><div class='add'>+		return irq - MMP_GPIO_TO_IRQ(0);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int __mmp_gpio_to_irq(int gpio) { return -1; }</div><div class='add'>+static inline int __mmp_irq_to_gpio(int irq) { return -1; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int pxa_gpio_to_irq(struct gpio_chip *chip, unsigned offset)</div><div class='add'>+{</div><div class='add'>+	int gpio, ret;</div><div class='add'>+</div><div class='add'>+	gpio = chip-&gt;base + offset;</div><div class='add'>+	ret = __pxa_gpio_to_irq(gpio);</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		return ret;</div><div class='add'>+	return __mmp_gpio_to_irq(gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pxa_irq_to_gpio(int irq)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = __pxa_irq_to_gpio(irq);</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		return ret;</div><div class='add'>+	return __mmp_irq_to_gpio(irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *base = gpio_chip_base(chip);</div><div class='hunk'>@@ -63,12 +223,12 @@ static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;gpio_lock, flags);</div><div class='ctx'> </div><div class='del'>-	value = __raw_readl(base + GPDR_OFFSET);</div><div class='add'>+	value = readl_relaxed(base + GPDR_OFFSET);</div><div class='ctx'> 	if (__gpio_is_inverted(chip-&gt;base + offset))</div><div class='ctx'> 		value |= mask;</div><div class='ctx'> 	else</div><div class='ctx'> 		value &amp;= ~mask;</div><div class='del'>-	__raw_writel(value, base + GPDR_OFFSET);</div><div class='add'>+	writel_relaxed(value, base + GPDR_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;gpio_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -81,16 +241,16 @@ static int pxa_gpio_direction_output(struct gpio_chip *chip,</div><div class='ctx'> 	uint32_t tmp, mask = 1 &lt;&lt; offset;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	__raw_writel(mask, base + (value ? GPSR_OFFSET : GPCR_OFFSET));</div><div class='add'>+	writel_relaxed(mask, base + (value ? GPSR_OFFSET : GPCR_OFFSET));</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;gpio_lock, flags);</div><div class='ctx'> </div><div class='del'>-	tmp = __raw_readl(base + GPDR_OFFSET);</div><div class='add'>+	tmp = readl_relaxed(base + GPDR_OFFSET);</div><div class='ctx'> 	if (__gpio_is_inverted(chip-&gt;base + offset))</div><div class='ctx'> 		tmp &amp;= ~mask;</div><div class='ctx'> 	else</div><div class='ctx'> 		tmp |= mask;</div><div class='del'>-	__raw_writel(tmp, base + GPDR_OFFSET);</div><div class='add'>+	writel_relaxed(tmp, base + GPDR_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;gpio_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -98,16 +258,16 @@ static int pxa_gpio_direction_output(struct gpio_chip *chip,</div><div class='ctx'> </div><div class='ctx'> static int pxa_gpio_get(struct gpio_chip *chip, unsigned offset)</div><div class='ctx'> {</div><div class='del'>-	return __raw_readl(gpio_chip_base(chip) + GPLR_OFFSET) &amp; (1 &lt;&lt; offset);</div><div class='add'>+	return readl_relaxed(gpio_chip_base(chip) + GPLR_OFFSET) &amp; (1 &lt;&lt; offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pxa_gpio_set(struct gpio_chip *chip, unsigned offset, int value)</div><div class='ctx'> {</div><div class='del'>-	__raw_writel(1 &lt;&lt; offset, gpio_chip_base(chip) +</div><div class='add'>+	writel_relaxed(1 &lt;&lt; offset, gpio_chip_base(chip) +</div><div class='ctx'> 				(value ? GPSR_OFFSET : GPCR_OFFSET));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init pxa_init_gpio_chip(int gpio_end)</div><div class='add'>+static int __devinit pxa_init_gpio_chip(int gpio_end)</div><div class='ctx'> {</div><div class='ctx'> 	int i, gpio, nbanks = gpio_to_bank(gpio_end) + 1;</div><div class='ctx'> 	struct pxa_gpio_chip *chips;</div><div class='hunk'>@@ -122,7 +282,7 @@ static int __init pxa_init_gpio_chip(int gpio_end)</div><div class='ctx'> 		struct gpio_chip *c = &amp;chips[i].chip;</div><div class='ctx'> </div><div class='ctx'> 		sprintf(chips[i].label, "gpio-%d", i);</div><div class='del'>-		chips[i].regbase = GPIO_BANK(i);</div><div class='add'>+		chips[i].regbase = gpio_reg_base + BANK_OFF(i);</div><div class='ctx'> </div><div class='ctx'> 		c-&gt;base  = gpio;</div><div class='ctx'> 		c-&gt;label = chips[i].label;</div><div class='hunk'>@@ -131,6 +291,7 @@ static int __init pxa_init_gpio_chip(int gpio_end)</div><div class='ctx'> 		c-&gt;direction_output = pxa_gpio_direction_output;</div><div class='ctx'> 		c-&gt;get = pxa_gpio_get;</div><div class='ctx'> 		c-&gt;set = pxa_gpio_set;</div><div class='add'>+		c-&gt;to_irq = pxa_gpio_to_irq;</div><div class='ctx'> </div><div class='ctx'> 		/* number of GPIOs on last bank may be less than 32 */</div><div class='ctx'> 		c-&gt;ngpio = (gpio + 31 &gt; gpio_end) ? (gpio_end - gpio + 1) : 32;</div><div class='hunk'>@@ -147,18 +308,18 @@ static inline void update_edge_detect(struct pxa_gpio_chip *c)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t grer, gfer;</div><div class='ctx'> </div><div class='del'>-	grer = __raw_readl(c-&gt;regbase + GRER_OFFSET) &amp; ~c-&gt;irq_mask;</div><div class='del'>-	gfer = __raw_readl(c-&gt;regbase + GFER_OFFSET) &amp; ~c-&gt;irq_mask;</div><div class='add'>+	grer = readl_relaxed(c-&gt;regbase + GRER_OFFSET) &amp; ~c-&gt;irq_mask;</div><div class='add'>+	gfer = readl_relaxed(c-&gt;regbase + GFER_OFFSET) &amp; ~c-&gt;irq_mask;</div><div class='ctx'> 	grer |= c-&gt;irq_edge_rise &amp; c-&gt;irq_mask;</div><div class='ctx'> 	gfer |= c-&gt;irq_edge_fall &amp; c-&gt;irq_mask;</div><div class='del'>-	__raw_writel(grer, c-&gt;regbase + GRER_OFFSET);</div><div class='del'>-	__raw_writel(gfer, c-&gt;regbase + GFER_OFFSET);</div><div class='add'>+	writel_relaxed(grer, c-&gt;regbase + GRER_OFFSET);</div><div class='add'>+	writel_relaxed(gfer, c-&gt;regbase + GFER_OFFSET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pxa_gpio_irq_type(struct irq_data *d, unsigned int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct pxa_gpio_chip *c;</div><div class='del'>-	int gpio = irq_to_gpio(d-&gt;irq);</div><div class='add'>+	int gpio = pxa_irq_to_gpio(d-&gt;irq);</div><div class='ctx'> 	unsigned long gpdr, mask = GPIO_bit(gpio);</div><div class='ctx'> </div><div class='ctx'> 	c = gpio_to_pxachip(gpio);</div><div class='hunk'>@@ -176,12 +337,12 @@ static int pxa_gpio_irq_type(struct irq_data *d, unsigned int type)</div><div class='ctx'> 		type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	gpdr = __raw_readl(c-&gt;regbase + GPDR_OFFSET);</div><div class='add'>+	gpdr = readl_relaxed(c-&gt;regbase + GPDR_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 	if (__gpio_is_inverted(gpio))</div><div class='del'>-		__raw_writel(gpdr | mask,  c-&gt;regbase + GPDR_OFFSET);</div><div class='add'>+		writel_relaxed(gpdr | mask,  c-&gt;regbase + GPDR_OFFSET);</div><div class='ctx'> 	else</div><div class='del'>-		__raw_writel(gpdr &amp; ~mask, c-&gt;regbase + GPDR_OFFSET);</div><div class='add'>+		writel_relaxed(gpdr &amp; ~mask, c-&gt;regbase + GPDR_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 	if (type &amp; IRQ_TYPE_EDGE_RISING)</div><div class='ctx'> 		c-&gt;irq_edge_rise |= mask;</div><div class='hunk'>@@ -212,9 +373,9 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> 		for_each_gpio_chip(gpio, c) {</div><div class='ctx'> 			gpio_base = c-&gt;chip.base;</div><div class='ctx'> </div><div class='del'>-			gedr = __raw_readl(c-&gt;regbase + GEDR_OFFSET);</div><div class='add'>+			gedr = readl_relaxed(c-&gt;regbase + GEDR_OFFSET);</div><div class='ctx'> 			gedr = gedr &amp; c-&gt;irq_mask;</div><div class='del'>-			__raw_writel(gedr, c-&gt;regbase + GEDR_OFFSET);</div><div class='add'>+			writel_relaxed(gedr, c-&gt;regbase + GEDR_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 			n = find_first_bit(&amp;gedr, BITS_PER_LONG);</div><div class='ctx'> 			while (n &lt; BITS_PER_LONG) {</div><div class='hunk'>@@ -229,29 +390,29 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)</div><div class='ctx'> </div><div class='ctx'> static void pxa_ack_muxed_gpio(struct irq_data *d)</div><div class='ctx'> {</div><div class='del'>-	int gpio = irq_to_gpio(d-&gt;irq);</div><div class='add'>+	int gpio = pxa_irq_to_gpio(d-&gt;irq);</div><div class='ctx'> 	struct pxa_gpio_chip *c = gpio_to_pxachip(gpio);</div><div class='ctx'> </div><div class='del'>-	__raw_writel(GPIO_bit(gpio), c-&gt;regbase + GEDR_OFFSET);</div><div class='add'>+	writel_relaxed(GPIO_bit(gpio), c-&gt;regbase + GEDR_OFFSET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pxa_mask_muxed_gpio(struct irq_data *d)</div><div class='ctx'> {</div><div class='del'>-	int gpio = irq_to_gpio(d-&gt;irq);</div><div class='add'>+	int gpio = pxa_irq_to_gpio(d-&gt;irq);</div><div class='ctx'> 	struct pxa_gpio_chip *c = gpio_to_pxachip(gpio);</div><div class='ctx'> 	uint32_t grer, gfer;</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;irq_mask &amp;= ~GPIO_bit(gpio);</div><div class='ctx'> </div><div class='del'>-	grer = __raw_readl(c-&gt;regbase + GRER_OFFSET) &amp; ~GPIO_bit(gpio);</div><div class='del'>-	gfer = __raw_readl(c-&gt;regbase + GFER_OFFSET) &amp; ~GPIO_bit(gpio);</div><div class='del'>-	__raw_writel(grer, c-&gt;regbase + GRER_OFFSET);</div><div class='del'>-	__raw_writel(gfer, c-&gt;regbase + GFER_OFFSET);</div><div class='add'>+	grer = readl_relaxed(c-&gt;regbase + GRER_OFFSET) &amp; ~GPIO_bit(gpio);</div><div class='add'>+	gfer = readl_relaxed(c-&gt;regbase + GFER_OFFSET) &amp; ~GPIO_bit(gpio);</div><div class='add'>+	writel_relaxed(grer, c-&gt;regbase + GRER_OFFSET);</div><div class='add'>+	writel_relaxed(gfer, c-&gt;regbase + GFER_OFFSET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pxa_unmask_muxed_gpio(struct irq_data *d)</div><div class='ctx'> {</div><div class='del'>-	int gpio = irq_to_gpio(d-&gt;irq);</div><div class='add'>+	int gpio = pxa_irq_to_gpio(d-&gt;irq);</div><div class='ctx'> 	struct pxa_gpio_chip *c = gpio_to_pxachip(gpio);</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;irq_mask |= GPIO_bit(gpio);</div><div class='hunk'>@@ -266,34 +427,143 @@ static struct irq_chip pxa_muxed_gpio_chip = {</div><div class='ctx'> 	.irq_set_type	= pxa_gpio_irq_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init pxa_init_gpio(int mux_irq, int start, int end, set_wake_t fn)</div><div class='add'>+static int pxa_gpio_nums(void)</div><div class='ctx'> {</div><div class='del'>-	struct pxa_gpio_chip *c;</div><div class='del'>-	int gpio, irq;</div><div class='add'>+	int count = 0;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_PXA</div><div class='add'>+	if (cpu_is_pxa25x()) {</div><div class='add'>+#ifdef CONFIG_CPU_PXA26x</div><div class='add'>+		count = 89;</div><div class='add'>+		gpio_type = PXA26X_GPIO;</div><div class='add'>+#elif defined(CONFIG_PXA25x)</div><div class='add'>+		count = 84;</div><div class='add'>+		gpio_type = PXA26X_GPIO;</div><div class='add'>+#endif /* CONFIG_CPU_PXA26x */</div><div class='add'>+	} else if (cpu_is_pxa27x()) {</div><div class='add'>+		count = 120;</div><div class='add'>+		gpio_type = PXA27X_GPIO;</div><div class='add'>+	} else if (cpu_is_pxa93x() || cpu_is_pxa95x()) {</div><div class='add'>+		count = 191;</div><div class='add'>+		gpio_type = PXA93X_GPIO;</div><div class='add'>+	} else if (cpu_is_pxa3xx()) {</div><div class='add'>+		count = 127;</div><div class='add'>+		gpio_type = PXA3XX_GPIO;</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_ARCH_PXA */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_MMP</div><div class='add'>+	if (cpu_is_pxa168() || cpu_is_pxa910()) {</div><div class='add'>+		count = 127;</div><div class='add'>+		gpio_type = MMP_GPIO;</div><div class='add'>+	} else if (cpu_is_mmp2()) {</div><div class='add'>+		count = 191;</div><div class='add'>+		gpio_type = MMP2_GPIO;</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_ARCH_MMP */</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	pxa_last_gpio = end;</div><div class='add'>+static int __devinit pxa_gpio_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct pxa_gpio_chip *c;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	int gpio, irq, ret;</div><div class='add'>+	int irq0 = 0, irq1 = 0, irq_mux, gpio_offset = 0;</div><div class='add'>+</div><div class='add'>+	pxa_last_gpio = pxa_gpio_nums();</div><div class='add'>+	if (!pxa_last_gpio)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	irq0 = platform_get_irq_byname(pdev, "gpio0");</div><div class='add'>+	irq1 = platform_get_irq_byname(pdev, "gpio1");</div><div class='add'>+	irq_mux = platform_get_irq_byname(pdev, "gpio_mux");</div><div class='add'>+	if ((irq0 &gt; 0 &amp;&amp; irq1 &lt;= 0) || (irq0 &lt;= 0 &amp;&amp; irq1 &gt; 0)</div><div class='add'>+		|| (irq_mux &lt;= 0))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!res)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	gpio_reg_base = ioremap(res-&gt;start, resource_size(res));</div><div class='add'>+	if (!gpio_reg_base)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (irq0 &gt; 0)</div><div class='add'>+		gpio_offset = 2;</div><div class='add'>+</div><div class='add'>+	clk = clk_get(&amp;pdev-&gt;dev, NULL);</div><div class='add'>+	if (IS_ERR(clk)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Error %ld to get gpio clock\n",</div><div class='add'>+			PTR_ERR(clk));</div><div class='add'>+		iounmap(gpio_reg_base);</div><div class='add'>+		return PTR_ERR(clk);</div><div class='add'>+	}</div><div class='add'>+	ret = clk_prepare(clk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		clk_put(clk);</div><div class='add'>+		iounmap(gpio_reg_base);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	ret = clk_enable(clk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		clk_unprepare(clk);</div><div class='add'>+		clk_put(clk);</div><div class='add'>+		iounmap(gpio_reg_base);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize GPIO chips */</div><div class='del'>-	pxa_init_gpio_chip(end);</div><div class='add'>+	pxa_init_gpio_chip(pxa_last_gpio);</div><div class='ctx'> </div><div class='ctx'> 	/* clear all GPIO edge detects */</div><div class='ctx'> 	for_each_gpio_chip(gpio, c) {</div><div class='del'>-		__raw_writel(0, c-&gt;regbase + GFER_OFFSET);</div><div class='del'>-		__raw_writel(0, c-&gt;regbase + GRER_OFFSET);</div><div class='del'>-		__raw_writel(~0,c-&gt;regbase + GEDR_OFFSET);</div><div class='add'>+		writel_relaxed(0, c-&gt;regbase + GFER_OFFSET);</div><div class='add'>+		writel_relaxed(0, c-&gt;regbase + GRER_OFFSET);</div><div class='add'>+		writel_relaxed(~0,c-&gt;regbase + GEDR_OFFSET);</div><div class='add'>+		/* unmask GPIO edge detect for AP side */</div><div class='add'>+		if (gpio_is_mmp_type(gpio_type))</div><div class='add'>+			writel_relaxed(~0, c-&gt;regbase + ED_MASK_OFFSET);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (irq  = gpio_to_irq(start); irq &lt;= gpio_to_irq(end); irq++) {</div><div class='add'>+#ifdef CONFIG_ARCH_PXA</div><div class='add'>+	irq = gpio_to_irq(0);</div><div class='add'>+	irq_set_chip_and_handler(irq, &amp;pxa_muxed_gpio_chip,</div><div class='add'>+				 handle_edge_irq);</div><div class='add'>+	set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);</div><div class='add'>+	irq_set_chained_handler(IRQ_GPIO0, pxa_gpio_demux_handler);</div><div class='add'>+</div><div class='add'>+	irq = gpio_to_irq(1);</div><div class='add'>+	irq_set_chip_and_handler(irq, &amp;pxa_muxed_gpio_chip,</div><div class='add'>+				 handle_edge_irq);</div><div class='add'>+	set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);</div><div class='add'>+	irq_set_chained_handler(IRQ_GPIO1, pxa_gpio_demux_handler);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (irq  = gpio_to_irq(gpio_offset);</div><div class='add'>+		irq &lt;= gpio_to_irq(pxa_last_gpio); irq++) {</div><div class='ctx'> 		irq_set_chip_and_handler(irq, &amp;pxa_muxed_gpio_chip,</div><div class='ctx'> 					 handle_edge_irq);</div><div class='ctx'> 		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Install handler for GPIO&gt;=2 edge detect interrupts */</div><div class='del'>-	irq_set_chained_handler(mux_irq, pxa_gpio_demux_handler);</div><div class='del'>-	pxa_muxed_gpio_chip.irq_set_wake = fn;</div><div class='add'>+	irq_set_chained_handler(irq_mux, pxa_gpio_demux_handler);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct platform_driver pxa_gpio_driver = {</div><div class='add'>+	.probe		= pxa_gpio_probe,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "pxa-gpio",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init pxa_gpio_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;pxa_gpio_driver);</div><div class='add'>+}</div><div class='add'>+postcore_initcall(pxa_gpio_init);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int pxa_gpio_suspend(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -301,13 +571,13 @@ static int pxa_gpio_suspend(void)</div><div class='ctx'> 	int gpio;</div><div class='ctx'> </div><div class='ctx'> 	for_each_gpio_chip(gpio, c) {</div><div class='del'>-		c-&gt;saved_gplr = __raw_readl(c-&gt;regbase + GPLR_OFFSET);</div><div class='del'>-		c-&gt;saved_gpdr = __raw_readl(c-&gt;regbase + GPDR_OFFSET);</div><div class='del'>-		c-&gt;saved_grer = __raw_readl(c-&gt;regbase + GRER_OFFSET);</div><div class='del'>-		c-&gt;saved_gfer = __raw_readl(c-&gt;regbase + GFER_OFFSET);</div><div class='add'>+		c-&gt;saved_gplr = readl_relaxed(c-&gt;regbase + GPLR_OFFSET);</div><div class='add'>+		c-&gt;saved_gpdr = readl_relaxed(c-&gt;regbase + GPDR_OFFSET);</div><div class='add'>+		c-&gt;saved_grer = readl_relaxed(c-&gt;regbase + GRER_OFFSET);</div><div class='add'>+		c-&gt;saved_gfer = readl_relaxed(c-&gt;regbase + GFER_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 		/* Clear GPIO transition detect bits */</div><div class='del'>-		__raw_writel(0xffffffff, c-&gt;regbase + GEDR_OFFSET);</div><div class='add'>+		writel_relaxed(0xffffffff, c-&gt;regbase + GEDR_OFFSET);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -319,12 +589,12 @@ static void pxa_gpio_resume(void)</div><div class='ctx'> </div><div class='ctx'> 	for_each_gpio_chip(gpio, c) {</div><div class='ctx'> 		/* restore level with set/clear */</div><div class='del'>-		__raw_writel( c-&gt;saved_gplr, c-&gt;regbase + GPSR_OFFSET);</div><div class='del'>-		__raw_writel(~c-&gt;saved_gplr, c-&gt;regbase + GPCR_OFFSET);</div><div class='add'>+		writel_relaxed( c-&gt;saved_gplr, c-&gt;regbase + GPSR_OFFSET);</div><div class='add'>+		writel_relaxed(~c-&gt;saved_gplr, c-&gt;regbase + GPCR_OFFSET);</div><div class='ctx'> </div><div class='del'>-		__raw_writel(c-&gt;saved_grer, c-&gt;regbase + GRER_OFFSET);</div><div class='del'>-		__raw_writel(c-&gt;saved_gfer, c-&gt;regbase + GFER_OFFSET);</div><div class='del'>-		__raw_writel(c-&gt;saved_gpdr, c-&gt;regbase + GPDR_OFFSET);</div><div class='add'>+		writel_relaxed(c-&gt;saved_grer, c-&gt;regbase + GRER_OFFSET);</div><div class='add'>+		writel_relaxed(c-&gt;saved_gfer, c-&gt;regbase + GFER_OFFSET);</div><div class='add'>+		writel_relaxed(c-&gt;saved_gpdr, c-&gt;regbase + GPDR_OFFSET);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='hunk'>@@ -336,3 +606,10 @@ struct syscore_ops pxa_gpio_syscore_ops = {</div><div class='ctx'> 	.suspend	= pxa_gpio_suspend,</div><div class='ctx'> 	.resume		= pxa_gpio_resume,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+static int __init pxa_gpio_sysinit(void)</div><div class='add'>+{</div><div class='add'>+	register_syscore_ops(&amp;pxa_gpio_syscore_ops);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+postcore_initcall(pxa_gpio_sysinit);</div><div class='head'>diff --git a/drivers/gpio/gpio-rdc321x.c b/drivers/gpio/gpio-rdc321x.c<br/>index 2762698e0204..e97016af6443 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-rdc321x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-rdc321x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-rdc321x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-rdc321x.c</a></div><div class='hunk'>@@ -227,18 +227,7 @@ static struct platform_driver rdc321x_gpio_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(rdc321x_gpio_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init rdc321x_gpio_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;rdc321x_gpio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit rdc321x_gpio_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;rdc321x_gpio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(rdc321x_gpio_init);</div><div class='del'>-module_exit(rdc321x_gpio_exit);</div><div class='add'>+module_platform_driver(rdc321x_gpio_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Florian Fainelli &lt;florian@openwrt.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("RDC321x GPIO driver");</div><div class='head'>diff --git a/drivers/gpio/gpio-sa1100.c b/drivers/gpio/gpio-sa1100.c<br/>index b6c1f6d80649..7eecf69362ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-sa1100.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-sa1100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-sa1100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-sa1100.c</a></div><div class='hunk'>@@ -47,12 +47,18 @@ static int sa1100_direction_output(struct gpio_chip *chip, unsigned offset, int</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int sa1100_to_irq(struct gpio_chip *chip, unsigned offset)</div><div class='add'>+{</div><div class='add'>+	return offset &lt; 11 ? (IRQ_GPIO0 + offset) : (IRQ_GPIO11 - 11 + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct gpio_chip sa1100_gpio_chip = {</div><div class='ctx'> 	.label			= "gpio",</div><div class='ctx'> 	.direction_input	= sa1100_direction_input,</div><div class='ctx'> 	.direction_output	= sa1100_direction_output,</div><div class='ctx'> 	.set			= sa1100_gpio_set,</div><div class='ctx'> 	.get			= sa1100_gpio_get,</div><div class='add'>+	.to_irq			= sa1100_to_irq,</div><div class='ctx'> 	.base			= 0,</div><div class='ctx'> 	.ngpio			= GPIO_MAX + 1,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c<br/>index 866251852719..a7661773c052 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-samsung.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-samsung.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-samsung.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-samsung.c</a></div><div class='hunk'>@@ -22,8 +22,11 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -230,7 +233,7 @@ static int samsung_gpio_setcfg_2bit(struct samsung_gpio_chip *chip,</div><div class='ctx'>  * @chip: The gpio chip that is being configured.</div><div class='ctx'>  * @off: The offset for the GPIO being configured.</div><div class='ctx'>  *</div><div class='del'>- * The reverse of samsung_gpio_setcfg_2bit(). Will return a value whicg</div><div class='add'>+ * The reverse of samsung_gpio_setcfg_2bit(). Will return a value which</div><div class='ctx'>  * could be directly passed back to samsung_gpio_setcfg_2bit(), from the</div><div class='ctx'>  * S3C_GPIO_SPECIAL() macro.</div><div class='ctx'>  */</div><div class='hunk'>@@ -467,33 +470,42 @@ static struct samsung_gpio_cfg s5p64x0_gpio_cfg_rbank = {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct samsung_gpio_cfg samsung_gpio_cfgs[] = {</div><div class='del'>-	{</div><div class='add'>+	[0] = {</div><div class='ctx'> 		.cfg_eint	= 0x0,</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='ctx'> 		.cfg_eint	= 0x3,</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='ctx'> 		.cfg_eint	= 0x7,</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	[3] = {</div><div class='ctx'> 		.cfg_eint	= 0xF,</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	[4] = {</div><div class='ctx'> 		.cfg_eint	= 0x0,</div><div class='ctx'> 		.set_config	= samsung_gpio_setcfg_2bit,</div><div class='ctx'> 		.get_config	= samsung_gpio_getcfg_2bit,</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	[5] = {</div><div class='ctx'> 		.cfg_eint	= 0x2,</div><div class='ctx'> 		.set_config	= samsung_gpio_setcfg_2bit,</div><div class='ctx'> 		.get_config	= samsung_gpio_getcfg_2bit,</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	[6] = {</div><div class='ctx'> 		.cfg_eint	= 0x3,</div><div class='ctx'> 		.set_config	= samsung_gpio_setcfg_2bit,</div><div class='ctx'> 		.get_config	= samsung_gpio_getcfg_2bit,</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	[7] = {</div><div class='ctx'> 		.set_config	= samsung_gpio_setcfg_2bit,</div><div class='ctx'> 		.get_config	= samsung_gpio_getcfg_2bit,</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	[8] = {</div><div class='ctx'> 		.set_pull	= exynos4_gpio_setpull,</div><div class='ctx'> 		.get_pull	= exynos4_gpio_getpull,</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	[9] = {</div><div class='ctx'> 		.cfg_eint	= 0x3,</div><div class='ctx'> 		.set_pull	= exynos4_gpio_setpull,</div><div class='ctx'> 		.get_pull	= exynos4_gpio_getpull,</div><div class='hunk'>@@ -2374,6 +2386,63 @@ static struct samsung_gpio_chip exynos4_gpios_3[] = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_ARCH_EXYNOS4) &amp;&amp; defined(CONFIG_OF)</div><div class='add'>+static int exynos4_gpio_xlate(struct gpio_chip *gc, struct device_node *np,</div><div class='add'>+			      const void *gpio_spec, u32 *flags)</div><div class='add'>+{</div><div class='add'>+	const __be32 *gpio = gpio_spec;</div><div class='add'>+	const u32 n = be32_to_cpup(gpio);</div><div class='add'>+	unsigned int pin = gc-&gt;base + be32_to_cpu(gpio[0]);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(gc-&gt;of_gpio_n_cells &lt; 4))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (n &gt; gc-&gt;ngpio)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (s3c_gpio_cfgpin(pin, S3C_GPIO_SFN(be32_to_cpu(gpio[1]))))</div><div class='add'>+		pr_warn("gpio_xlate: failed to set pin function\n");</div><div class='add'>+	if (s3c_gpio_setpull(pin, be32_to_cpu(gpio[2])))</div><div class='add'>+		pr_warn("gpio_xlate: failed to set pin pull up/down\n");</div><div class='add'>+	if (s5p_gpio_set_drvstr(pin, be32_to_cpu(gpio[3])))</div><div class='add'>+		pr_warn("gpio_xlate: failed to set pin drive strength\n");</div><div class='add'>+</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id exynos4_gpio_dt_match[] __initdata = {</div><div class='add'>+	{ .compatible = "samsung,exynos4-gpio", },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __init void exynos4_gpiolib_attach_ofnode(struct samsung_gpio_chip *chip,</div><div class='add'>+						 u64 base, u64 offset)</div><div class='add'>+{</div><div class='add'>+	struct gpio_chip *gc =  &amp;chip-&gt;chip;</div><div class='add'>+	u64 address;</div><div class='add'>+</div><div class='add'>+	if (!of_have_populated_dt())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	address = chip-&gt;base ? base + ((u32)chip-&gt;base &amp; 0xfff) : base + offset;</div><div class='add'>+	gc-&gt;of_node = of_find_matching_node_by_address(NULL,</div><div class='add'>+			exynos4_gpio_dt_match, address);</div><div class='add'>+	if (!gc-&gt;of_node) {</div><div class='add'>+		pr_info("gpio: device tree node not found for gpio controller"</div><div class='add'>+			" with base address %08llx\n", address);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	gc-&gt;of_gpio_n_cells = 4;</div><div class='add'>+	gc-&gt;of_xlate = exynos4_gpio_xlate;</div><div class='add'>+}</div><div class='add'>+#elif defined(CONFIG_ARCH_EXYNOS4)</div><div class='add'>+static __init void exynos4_gpiolib_attach_ofnode(struct samsung_gpio_chip *chip,</div><div class='add'>+						 u64 base, u64 offset)</div><div class='add'>+{</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+#endif /* defined(CONFIG_ARCH_EXYNOS4) &amp;&amp; defined(CONFIG_OF) */</div><div class='add'>+</div><div class='ctx'> /* TODO: cleanup soc_is_* */</div><div class='ctx'> static __init int samsung_gpiolib_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -2455,6 +2524,10 @@ static __init int samsung_gpiolib_init(void)</div><div class='ctx'> 				chip-&gt;config = &amp;exynos4_gpio_cfg;</div><div class='ctx'> 				chip-&gt;group = group++;</div><div class='ctx'> 			}</div><div class='add'>+#ifdef CONFIG_CPU_EXYNOS4210</div><div class='add'>+			exynos4_gpiolib_attach_ofnode(chip,</div><div class='add'>+					EXYNOS4_PA_GPIO1, i * 0x20);</div><div class='add'>+#endif</div><div class='ctx'> 		}</div><div class='ctx'> 		samsung_gpiolib_add_4bit_chips(exynos4_gpios_1, nr_chips, S5P_VA_GPIO1);</div><div class='ctx'> </div><div class='hunk'>@@ -2467,6 +2540,10 @@ static __init int samsung_gpiolib_init(void)</div><div class='ctx'> 				chip-&gt;config = &amp;exynos4_gpio_cfg;</div><div class='ctx'> 				chip-&gt;group = group++;</div><div class='ctx'> 			}</div><div class='add'>+#ifdef CONFIG_CPU_EXYNOS4210</div><div class='add'>+			exynos4_gpiolib_attach_ofnode(chip,</div><div class='add'>+					EXYNOS4_PA_GPIO2, i * 0x20);</div><div class='add'>+#endif</div><div class='ctx'> 		}</div><div class='ctx'> 		samsung_gpiolib_add_4bit_chips(exynos4_gpios_2, nr_chips, S5P_VA_GPIO2);</div><div class='ctx'> </div><div class='hunk'>@@ -2479,6 +2556,10 @@ static __init int samsung_gpiolib_init(void)</div><div class='ctx'> 				chip-&gt;config = &amp;exynos4_gpio_cfg;</div><div class='ctx'> 				chip-&gt;group = group++;</div><div class='ctx'> 			}</div><div class='add'>+#ifdef CONFIG_CPU_EXYNOS4210</div><div class='add'>+			exynos4_gpiolib_attach_ofnode(chip,</div><div class='add'>+					EXYNOS4_PA_GPIO3, i * 0x20);</div><div class='add'>+#endif</div><div class='ctx'> 		}</div><div class='ctx'> 		samsung_gpiolib_add_4bit_chips(exynos4_gpios_3, nr_chips, S5P_VA_GPIO3);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpio/gpio-sch.c b/drivers/gpio/gpio-sch.c<br/>index 163515845494..8cadf4d683a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-sch.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-sch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-sch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-sch.c</a></div><div class='hunk'>@@ -297,18 +297,7 @@ static struct platform_driver sch_gpio_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(sch_gpio_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sch_gpio_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sch_gpio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sch_gpio_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sch_gpio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sch_gpio_init);</div><div class='del'>-module_exit(sch_gpio_exit);</div><div class='add'>+module_platform_driver(sch_gpio_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Denis Turischev &lt;denis@compulab.co.il&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("GPIO interface for Intel Poulsbo SCH");</div><div class='head'>diff --git a/drivers/gpio/gpio-stmpe.c b/drivers/gpio/gpio-stmpe.c<br/>index 4c980b573328..87a68a896abf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-stmpe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-stmpe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-stmpe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-stmpe.c</a></div><div class='hunk'>@@ -65,7 +65,14 @@ static void stmpe_gpio_set(struct gpio_chip *chip, unsigned offset, int val)</div><div class='ctx'> 	u8 reg = stmpe-&gt;regs[which] - (offset / 8);</div><div class='ctx'> 	u8 mask = 1 &lt;&lt; (offset % 8);</div><div class='ctx'> </div><div class='del'>-	stmpe_reg_write(stmpe, reg, mask);</div><div class='add'>+	/*</div><div class='add'>+	 * Some variants have single register for gpio set/clear functionality.</div><div class='add'>+	 * For them we need to write 0 to clear and 1 to set.</div><div class='add'>+	 */</div><div class='add'>+	if (stmpe-&gt;regs[STMPE_IDX_GPSR_LSB] == stmpe-&gt;regs[STMPE_IDX_GPCR_LSB])</div><div class='add'>+		stmpe_set_bits(stmpe, reg, mask, val ? mask : 0);</div><div class='add'>+	else</div><div class='add'>+		stmpe_reg_write(stmpe, reg, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int stmpe_gpio_direction_output(struct gpio_chip *chip,</div><div class='hunk'>@@ -132,6 +139,10 @@ static int stmpe_gpio_irq_set_type(struct irq_data *d, unsigned int type)</div><div class='ctx'> 	if (type == IRQ_TYPE_LEVEL_LOW || type == IRQ_TYPE_LEVEL_HIGH)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* STMPE801 doesn't have RE and FE registers */</div><div class='add'>+	if (stmpe_gpio-&gt;stmpe-&gt;partnum == STMPE801)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (type == IRQ_TYPE_EDGE_RISING)</div><div class='ctx'> 		stmpe_gpio-&gt;regs[REG_RE][regoffset] |= mask;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -165,6 +176,11 @@ static void stmpe_gpio_irq_sync_unlock(struct irq_data *d)</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; CACHE_NR_REGS; i++) {</div><div class='add'>+		/* STMPE801 doesn't have RE and FE registers */</div><div class='add'>+		if ((stmpe-&gt;partnum == STMPE801) &amp;&amp;</div><div class='add'>+				(i != REG_IE))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		for (j = 0; j &lt; num_banks; j++) {</div><div class='ctx'> 			u8 old = stmpe_gpio-&gt;oldregs[i][j];</div><div class='ctx'> 			u8 new = stmpe_gpio-&gt;regs[i][j];</div><div class='hunk'>@@ -241,8 +257,11 @@ static irqreturn_t stmpe_gpio_irq(int irq, void *dev)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		stmpe_reg_write(stmpe, statmsbreg + i, status[i]);</div><div class='del'>-		stmpe_reg_write(stmpe, stmpe-&gt;regs[STMPE_IDX_GPEDR_MSB] + i,</div><div class='del'>-				status[i]);</div><div class='add'>+</div><div class='add'>+		/* Edge detect register is not present on 801 */</div><div class='add'>+		if (stmpe-&gt;partnum != STMPE801)</div><div class='add'>+			stmpe_reg_write(stmpe, stmpe-&gt;regs[STMPE_IDX_GPEDR_MSB]</div><div class='add'>+					+ i, status[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='head'>diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c<br/>index 61044c889f7f..bdc293791590 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-tegra.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-tegra.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-tegra.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-tegra.c</a></div><div class='hunk'>@@ -361,14 +361,7 @@ static int __devinit tegra_gpio_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!devm_request_mem_region(&amp;pdev-&gt;dev, res-&gt;start,</div><div class='del'>-				     resource_size(res),</div><div class='del'>-				     dev_name(&amp;pdev-&gt;dev))) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Couldn't request MEM resource\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	regs = devm_ioremap(&amp;pdev-&gt;dev, res-&gt;start, resource_size(res));</div><div class='add'>+	regs = devm_request_and_ioremap(&amp;pdev-&gt;dev, res);</div><div class='ctx'> 	if (!regs) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Couldn't ioremap regs\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='head'>diff --git a/drivers/gpio/gpio-timberdale.c b/drivers/gpio/gpio-timberdale.c<br/>index c593bd46bfb6..031c6adf5b65 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-timberdale.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-timberdale.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-timberdale.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-timberdale.c</a></div><div class='hunk'>@@ -359,18 +359,7 @@ static struct platform_driver timbgpio_platform_driver = {</div><div class='ctx'> </div><div class='ctx'> /*--------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-static int __init timbgpio_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;timbgpio_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit timbgpio_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;timbgpio_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(timbgpio_init);</div><div class='del'>-module_exit(timbgpio_exit);</div><div class='add'>+module_platform_driver(timbgpio_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Timberdale GPIO driver");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/gpio/gpio-tps65910.c b/drivers/gpio/gpio-tps65910.c<br/>index b9c1c297669e..91f45b965d1e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-tps65910.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-tps65910.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-tps65910.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-tps65910.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@ static int tps65910_gpio_output(struct gpio_chip *gc, unsigned offset,</div><div class='ctx'> 	struct tps65910 *tps65910 = container_of(gc, struct tps65910, gpio);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the initial value */</div><div class='del'>-	tps65910_gpio_set(gc, 0, value);</div><div class='add'>+	tps65910_gpio_set(gc, offset, value);</div><div class='ctx'> </div><div class='ctx'> 	return tps65910_set_bits(tps65910, TPS65910_GPIO0 + offset,</div><div class='ctx'> 						GPIO_CFG_MASK);</div><div class='head'>diff --git a/drivers/gpio/gpio-ucb1400.c b/drivers/gpio/gpio-ucb1400.c<br/>index 50e6bd1392ce..26405efe0f9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-ucb1400.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-ucb1400.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-ucb1400.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-ucb1400.c</a></div><div class='hunk'>@@ -103,23 +103,12 @@ static struct platform_driver ucb1400_gpio_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ucb1400_gpio_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ucb1400_gpio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ucb1400_gpio_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ucb1400_gpio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __init ucb1400_gpio_set_data(struct ucb1400_gpio_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	ucbdata = data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(ucb1400_gpio_init);</div><div class='del'>-module_exit(ucb1400_gpio_exit);</div><div class='add'>+module_platform_driver(ucb1400_gpio_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Philips UCB1400 GPIO driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c<br/>index 98723cb9ac68..82d5c20ad3cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-vr41xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-vr41xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-vr41xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-vr41xx.c</a></div><div class='hunk'>@@ -571,15 +571,4 @@ static struct platform_driver giu_device_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init vr41xx_giu_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;giu_device_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit vr41xx_giu_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;giu_device_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(vr41xx_giu_init);</div><div class='del'>-module_exit(vr41xx_giu_exit);</div><div class='add'>+module_platform_driver(giu_device_driver);</div><div class='head'>diff --git a/drivers/gpio/gpio-vx855.c b/drivers/gpio/gpio-vx855.c<br/>index ef5aabd8b8b7..76ebfe5ff702 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-vx855.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-vx855.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-vx855.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-vx855.c</a></div><div class='hunk'>@@ -315,17 +315,7 @@ static struct platform_driver vx855gpio_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(vx855gpio_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int vx855gpio_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;vx855gpio_driver);</div><div class='del'>-}</div><div class='del'>-module_init(vx855gpio_init);</div><div class='del'>-</div><div class='del'>-static void vx855gpio_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;vx855gpio_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(vx855gpio_exit);</div><div class='add'>+module_platform_driver(vx855gpio_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Harald Welte &lt;HaraldWelte@viatech.com&gt;");</div><div class='head'>diff --git a/drivers/gpio/gpio-wm8994.c b/drivers/gpio/gpio-wm8994.c<br/>index 96198f3fab73..92ea5350dfe9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-wm8994.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-wm8994.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-wm8994.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-wm8994.c</a></div><div class='hunk'>@@ -117,6 +117,60 @@ static int wm8994_gpio_to_irq(struct gpio_chip *chip, unsigned offset)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='add'>+static const char *wm8994_gpio_fn(u16 fn)</div><div class='add'>+{</div><div class='add'>+	switch (fn) {</div><div class='add'>+	case WM8994_GP_FN_PIN_SPECIFIC:</div><div class='add'>+		return "pin-specific";</div><div class='add'>+	case WM8994_GP_FN_GPIO:</div><div class='add'>+		return "GPIO";</div><div class='add'>+	case WM8994_GP_FN_SDOUT:</div><div class='add'>+		return "SDOUT";</div><div class='add'>+	case WM8994_GP_FN_IRQ:</div><div class='add'>+		return "IRQ";</div><div class='add'>+	case WM8994_GP_FN_TEMPERATURE:</div><div class='add'>+		return "Temperature";</div><div class='add'>+	case WM8994_GP_FN_MICBIAS1_DET:</div><div class='add'>+		return "MICBIAS1 detect";</div><div class='add'>+	case WM8994_GP_FN_MICBIAS1_SHORT:</div><div class='add'>+		return "MICBIAS1 short";</div><div class='add'>+	case WM8994_GP_FN_MICBIAS2_DET:</div><div class='add'>+		return "MICBIAS2 detect";</div><div class='add'>+	case WM8994_GP_FN_MICBIAS2_SHORT:</div><div class='add'>+		return "MICBIAS2 short";</div><div class='add'>+	case WM8994_GP_FN_FLL1_LOCK:</div><div class='add'>+		return "FLL1 lock";</div><div class='add'>+	case WM8994_GP_FN_FLL2_LOCK:</div><div class='add'>+		return "FLL2 lock";</div><div class='add'>+	case WM8994_GP_FN_SRC1_LOCK:</div><div class='add'>+		return "SRC1 lock";</div><div class='add'>+	case WM8994_GP_FN_SRC2_LOCK:</div><div class='add'>+		return "SRC2 lock";</div><div class='add'>+	case WM8994_GP_FN_DRC1_ACT:</div><div class='add'>+		return "DRC1 activity";</div><div class='add'>+	case WM8994_GP_FN_DRC2_ACT:</div><div class='add'>+		return "DRC2 activity";</div><div class='add'>+	case WM8994_GP_FN_DRC3_ACT:</div><div class='add'>+		return "DRC3 activity";</div><div class='add'>+	case WM8994_GP_FN_WSEQ_STATUS:</div><div class='add'>+		return "Write sequencer";</div><div class='add'>+	case WM8994_GP_FN_FIFO_ERROR:</div><div class='add'>+		return "FIFO error";</div><div class='add'>+	case WM8994_GP_FN_OPCLK:</div><div class='add'>+		return "OPCLK";</div><div class='add'>+	case WM8994_GP_FN_THW:</div><div class='add'>+		return "Thermal warning";</div><div class='add'>+	case WM8994_GP_FN_DCS_DONE:</div><div class='add'>+		return "DC servo";</div><div class='add'>+	case WM8994_GP_FN_FLL1_OUT:</div><div class='add'>+		return "FLL1 output";</div><div class='add'>+	case WM8994_GP_FN_FLL2_OUT:</div><div class='add'>+		return "FLL1 output";</div><div class='add'>+	default:</div><div class='add'>+		return "Unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void wm8994_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct wm8994_gpio *wm8994_gpio = to_wm8994_gpio(chip);</div><div class='hunk'>@@ -148,8 +202,29 @@ static void wm8994_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* No decode yet; note that GPIO2 is special */</div><div class='del'>-		seq_printf(s, "(%x)\n", reg);</div><div class='add'>+		if (reg &amp; WM8994_GPN_DIR)</div><div class='add'>+			seq_printf(s, "in ");</div><div class='add'>+		else</div><div class='add'>+			seq_printf(s, "out ");</div><div class='add'>+</div><div class='add'>+		if (reg &amp; WM8994_GPN_PU)</div><div class='add'>+			seq_printf(s, "pull up ");</div><div class='add'>+</div><div class='add'>+		if (reg &amp; WM8994_GPN_PD)</div><div class='add'>+			seq_printf(s, "pull down ");</div><div class='add'>+</div><div class='add'>+		if (reg &amp; WM8994_GPN_POL)</div><div class='add'>+			seq_printf(s, "inverted ");</div><div class='add'>+		else</div><div class='add'>+			seq_printf(s, "noninverted ");</div><div class='add'>+</div><div class='add'>+		if (reg &amp; WM8994_GPN_OP_CFG)</div><div class='add'>+			seq_printf(s, "open drain ");</div><div class='add'>+		else</div><div class='add'>+			seq_printf(s, "CMOS ");</div><div class='add'>+</div><div class='add'>+		seq_printf(s, "%s (%x)\n",</div><div class='add'>+			   wm8994_gpio_fn(reg &amp; WM8994_GPN_FN_MASK), reg);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='head'>diff --git a/drivers/gpio/gpio-xilinx.c b/drivers/gpio/gpio-xilinx.c<br/>index 0ce6ac9898b1..79b0fe8a7253 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-xilinx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-xilinx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-xilinx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpio-xilinx.c</a></div><div class='hunk'>@@ -206,7 +206,6 @@ static int __devinit xgpio_of_probe(struct device_node *np)</div><div class='ctx'> 		       np-&gt;full_name, status);</div><div class='ctx'> 		return status;</div><div class='ctx'> 	}</div><div class='del'>-	pr_info("XGpio: %s: registered\n", np-&gt;full_name);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c<br/>index a971e3d043ba..17fdf4b6af93 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpiolib.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpiolib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpio/gpiolib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpio/gpiolib.c</a></div><div class='hunk'>@@ -114,7 +114,7 @@ static int gpio_ensure_requested(struct gpio_desc *desc, unsigned offset)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* caller holds gpio_lock *OR* gpio is marked as requested */</div><div class='del'>-static inline struct gpio_chip *gpio_to_chip(unsigned gpio)</div><div class='add'>+struct gpio_chip *gpio_to_chip(unsigned gpio)</div><div class='ctx'> {</div><div class='ctx'> 	return gpio_desc[gpio].chip;</div><div class='ctx'> }</div><div class='hunk'>@@ -1089,6 +1089,10 @@ unlock:</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='add'>+	pr_info("gpiochip_add: registered GPIOs %d to %d on device: %s\n",</div><div class='add'>+		chip-&gt;base, chip-&gt;base + chip-&gt;ngpio - 1,</div><div class='add'>+		chip-&gt;label ? : "generic");</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> fail:</div><div class='ctx'> 	/* failures here can mean systems won't boot... */</div><div class='head'>diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig<br/>index 1368826ef284..2418429a9836 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/Kconfig</a></div><div class='hunk'>@@ -162,3 +162,6 @@ config DRM_SAVAGE</div><div class='ctx'> source "drivers/gpu/drm/exynos/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/gpu/drm/vmwgfx/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/gpu/drm/gma500/Kconfig"</div><div class='add'>+</div><div class='head'>diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile<br/>index c0496f660707..0cde1b80fdb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/Makefile</a></div><div class='hunk'>@@ -9,7 +9,7 @@ drm-y       :=	drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \</div><div class='ctx'> 		drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \</div><div class='ctx'> 		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \</div><div class='ctx'> 		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \</div><div class='del'>-		drm_platform.o drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \</div><div class='add'>+		drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \</div><div class='ctx'> 		drm_crtc.o drm_modes.o drm_edid.o \</div><div class='ctx'> 		drm_info.o drm_debugfs.o drm_encoder_slave.o \</div><div class='ctx'> 		drm_trace_points.o drm_global.o drm_usb.o</div><div class='hunk'>@@ -36,4 +36,5 @@ obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/</div><div class='ctx'> obj-$(CONFIG_DRM_VIA)	+=via/</div><div class='ctx'> obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/</div><div class='ctx'> obj-$(CONFIG_DRM_EXYNOS) +=exynos/</div><div class='add'>+obj-$(CONFIG_DRM_GMA500) += gma500/</div><div class='ctx'> obj-y			+= i2c/</div><div class='head'>diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c<br/>index 6d440fb894cf..325365f6d355 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_context.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_context.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_context.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/drm_context.c</a></div><div class='hunk'>@@ -154,8 +154,6 @@ int drm_getsareactx(struct drm_device *dev, void *data,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-</div><div class='ctx'> 	request-&gt;handle = NULL;</div><div class='ctx'> 	list_for_each_entry(_entry, &amp;dev-&gt;maplist, head) {</div><div class='ctx'> 		if (_entry-&gt;map == map) {</div><div class='hunk'>@@ -164,6 +162,9 @@ int drm_getsareactx(struct drm_device *dev, void *data,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='ctx'> 	if (request-&gt;handle == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c<br/>index 8323fc389840..5e818a808ace 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_crtc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_crtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_crtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/drm_crtc.c</a></div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> #include "drm_crtc.h"</div><div class='ctx'> #include "drm_edid.h"</div><div class='add'>+#include "drm_fourcc.h"</div><div class='ctx'> </div><div class='ctx'> struct drm_prop_enum_list {</div><div class='ctx'> 	int type;</div><div class='hunk'>@@ -324,6 +325,7 @@ void drm_framebuffer_cleanup(struct drm_framebuffer *fb)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_device *dev = fb-&gt;dev;</div><div class='ctx'> 	struct drm_crtc *crtc;</div><div class='add'>+	struct drm_plane *plane;</div><div class='ctx'> 	struct drm_mode_set set;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -340,6 +342,18 @@ void drm_framebuffer_cleanup(struct drm_framebuffer *fb)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	list_for_each_entry(plane, &amp;dev-&gt;mode_config.plane_list, head) {</div><div class='add'>+		if (plane-&gt;fb == fb) {</div><div class='add'>+			/* should turn off the crtc */</div><div class='add'>+			ret = plane-&gt;funcs-&gt;disable_plane(plane);</div><div class='add'>+			if (ret)</div><div class='add'>+				DRM_ERROR("failed to disable plane with busy fb\n");</div><div class='add'>+			/* disconnect the plane from the fb and crtc: */</div><div class='add'>+			plane-&gt;fb = NULL;</div><div class='add'>+			plane-&gt;crtc = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	drm_mode_object_put(dev, &amp;fb-&gt;base);</div><div class='ctx'> 	list_del(&amp;fb-&gt;head);</div><div class='ctx'> 	dev-&gt;mode_config.num_fb--;</div><div class='hunk'>@@ -540,6 +554,63 @@ void drm_encoder_cleanup(struct drm_encoder *encoder)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(drm_encoder_cleanup);</div><div class='ctx'> </div><div class='add'>+int drm_plane_init(struct drm_device *dev, struct drm_plane *plane,</div><div class='add'>+		   unsigned long possible_crtcs,</div><div class='add'>+		   const struct drm_plane_funcs *funcs,</div><div class='add'>+		   const uint32_t *formats, uint32_t format_count,</div><div class='add'>+		   bool priv)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+</div><div class='add'>+	plane-&gt;dev = dev;</div><div class='add'>+	drm_mode_object_get(dev, &amp;plane-&gt;base, DRM_MODE_OBJECT_PLANE);</div><div class='add'>+	plane-&gt;funcs = funcs;</div><div class='add'>+	plane-&gt;format_types = kmalloc(sizeof(uint32_t) * format_count,</div><div class='add'>+				      GFP_KERNEL);</div><div class='add'>+	if (!plane-&gt;format_types) {</div><div class='add'>+		DRM_DEBUG_KMS("out of memory when allocating plane\n");</div><div class='add'>+		drm_mode_object_put(dev, &amp;plane-&gt;base);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(plane-&gt;format_types, formats, format_count * sizeof(uint32_t));</div><div class='add'>+	plane-&gt;format_count = format_count;</div><div class='add'>+	plane-&gt;possible_crtcs = possible_crtcs;</div><div class='add'>+</div><div class='add'>+	/* private planes are not exposed to userspace, but depending on</div><div class='add'>+	 * display hardware, might be convenient to allow sharing programming</div><div class='add'>+	 * for the scanout engine with the crtc implementation.</div><div class='add'>+	 */</div><div class='add'>+	if (!priv) {</div><div class='add'>+		list_add_tail(&amp;plane-&gt;head, &amp;dev-&gt;mode_config.plane_list);</div><div class='add'>+		dev-&gt;mode_config.num_plane++;</div><div class='add'>+	} else {</div><div class='add'>+		INIT_LIST_HEAD(&amp;plane-&gt;head);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(drm_plane_init);</div><div class='add'>+</div><div class='add'>+void drm_plane_cleanup(struct drm_plane *plane)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = plane-&gt;dev;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+	kfree(plane-&gt;format_types);</div><div class='add'>+	drm_mode_object_put(dev, &amp;plane-&gt;base);</div><div class='add'>+	/* if not added to a list, it must be a private plane */</div><div class='add'>+	if (!list_empty(&amp;plane-&gt;head)) {</div><div class='add'>+		list_del(&amp;plane-&gt;head);</div><div class='add'>+		dev-&gt;mode_config.num_plane--;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(drm_plane_cleanup);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * drm_mode_create - create a new display mode</div><div class='ctx'>  * @dev: DRM device</div><div class='hunk'>@@ -871,6 +942,7 @@ void drm_mode_config_init(struct drm_device *dev)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;mode_config.encoder_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;mode_config.property_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;mode_config.property_blob_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;mode_config.plane_list);</div><div class='ctx'> 	idr_init(&amp;dev-&gt;mode_config.crtc_idr);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='hunk'>@@ -947,6 +1019,7 @@ void drm_mode_config_cleanup(struct drm_device *dev)</div><div class='ctx'> 	struct drm_encoder *encoder, *enct;</div><div class='ctx'> 	struct drm_framebuffer *fb, *fbt;</div><div class='ctx'> 	struct drm_property *property, *pt;</div><div class='add'>+	struct drm_plane *plane, *plt;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(encoder, enct, &amp;dev-&gt;mode_config.encoder_list,</div><div class='ctx'> 				 head) {</div><div class='hunk'>@@ -971,6 +1044,10 @@ void drm_mode_config_cleanup(struct drm_device *dev)</div><div class='ctx'> 		crtc-&gt;funcs-&gt;destroy(crtc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	list_for_each_entry_safe(plane, plt, &amp;dev-&gt;mode_config.plane_list,</div><div class='add'>+				 head) {</div><div class='add'>+		plane-&gt;funcs-&gt;destroy(plane);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(drm_mode_config_cleanup);</div><div class='ctx'> </div><div class='hunk'>@@ -1379,7 +1456,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((out_resp-&gt;count_modes &gt;= mode_count) &amp;&amp; mode_count) {</div><div class='ctx'> 		copied = 0;</div><div class='del'>-		mode_ptr = (struct drm_mode_modeinfo *)(unsigned long)out_resp-&gt;modes_ptr;</div><div class='add'>+		mode_ptr = (struct drm_mode_modeinfo __user *)(unsigned long)out_resp-&gt;modes_ptr;</div><div class='ctx'> 		list_for_each_entry(mode, &amp;connector-&gt;modes, head) {</div><div class='ctx'> 			drm_crtc_convert_to_umode(&amp;u_mode, mode);</div><div class='ctx'> 			if (copy_to_user(mode_ptr + copied,</div><div class='hunk'>@@ -1394,8 +1471,8 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,</div><div class='ctx'> </div><div class='ctx'> 	if ((out_resp-&gt;count_props &gt;= props_count) &amp;&amp; props_count) {</div><div class='ctx'> 		copied = 0;</div><div class='del'>-		prop_ptr = (uint32_t *)(unsigned long)(out_resp-&gt;props_ptr);</div><div class='del'>-		prop_values = (uint64_t *)(unsigned long)(out_resp-&gt;prop_values_ptr);</div><div class='add'>+		prop_ptr = (uint32_t __user *)(unsigned long)(out_resp-&gt;props_ptr);</div><div class='add'>+		prop_values = (uint64_t __user *)(unsigned long)(out_resp-&gt;prop_values_ptr);</div><div class='ctx'> 		for (i = 0; i &lt; DRM_CONNECTOR_MAX_PROPERTY; i++) {</div><div class='ctx'> 			if (connector-&gt;property_ids[i] != 0) {</div><div class='ctx'> 				if (put_user(connector-&gt;property_ids[i],</div><div class='hunk'>@@ -1417,7 +1494,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,</div><div class='ctx'> </div><div class='ctx'> 	if ((out_resp-&gt;count_encoders &gt;= encoders_count) &amp;&amp; encoders_count) {</div><div class='ctx'> 		copied = 0;</div><div class='del'>-		encoder_ptr = (uint32_t *)(unsigned long)(out_resp-&gt;encoders_ptr);</div><div class='add'>+		encoder_ptr = (uint32_t __user *)(unsigned long)(out_resp-&gt;encoders_ptr);</div><div class='ctx'> 		for (i = 0; i &lt; DRM_CONNECTOR_MAX_ENCODER; i++) {</div><div class='ctx'> 			if (connector-&gt;encoder_ids[i] != 0) {</div><div class='ctx'> 				if (put_user(connector-&gt;encoder_ids[i],</div><div class='hunk'>@@ -1471,6 +1548,245 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * drm_mode_getplane_res - get plane info</div><div class='add'>+ * @dev: DRM device</div><div class='add'>+ * @data: ioctl data</div><div class='add'>+ * @file_priv: DRM file info</div><div class='add'>+ *</div><div class='add'>+ * Return an plane count and set of IDs.</div><div class='add'>+ */</div><div class='add'>+int drm_mode_getplane_res(struct drm_device *dev, void *data,</div><div class='add'>+			    struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_mode_get_plane_res *plane_resp = data;</div><div class='add'>+	struct drm_mode_config *config;</div><div class='add'>+	struct drm_plane *plane;</div><div class='add'>+	uint32_t __user *plane_ptr;</div><div class='add'>+	int copied = 0, ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!drm_core_check_feature(dev, DRIVER_MODESET))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+	config = &amp;dev-&gt;mode_config;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This ioctl is called twice, once to determine how much space is</div><div class='add'>+	 * needed, and the 2nd time to fill it.</div><div class='add'>+	 */</div><div class='add'>+	if (config-&gt;num_plane &amp;&amp;</div><div class='add'>+	    (plane_resp-&gt;count_planes &gt;= config-&gt;num_plane)) {</div><div class='add'>+		plane_ptr = (uint32_t __user *)(unsigned long)plane_resp-&gt;plane_id_ptr;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(plane, &amp;config-&gt;plane_list, head) {</div><div class='add'>+			if (put_user(plane-&gt;base.id, plane_ptr + copied)) {</div><div class='add'>+				ret = -EFAULT;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			copied++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	plane_resp-&gt;count_planes = config-&gt;num_plane;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_mode_getplane - get plane info</div><div class='add'>+ * @dev: DRM device</div><div class='add'>+ * @data: ioctl data</div><div class='add'>+ * @file_priv: DRM file info</div><div class='add'>+ *</div><div class='add'>+ * Return plane info, including formats supported, gamma size, any</div><div class='add'>+ * current fb, etc.</div><div class='add'>+ */</div><div class='add'>+int drm_mode_getplane(struct drm_device *dev, void *data,</div><div class='add'>+			struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_mode_get_plane *plane_resp = data;</div><div class='add'>+	struct drm_mode_object *obj;</div><div class='add'>+	struct drm_plane *plane;</div><div class='add'>+	uint32_t __user *format_ptr;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!drm_core_check_feature(dev, DRIVER_MODESET))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+	obj = drm_mode_object_find(dev, plane_resp-&gt;plane_id,</div><div class='add'>+				   DRM_MODE_OBJECT_PLANE);</div><div class='add'>+	if (!obj) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	plane = obj_to_plane(obj);</div><div class='add'>+</div><div class='add'>+	if (plane-&gt;crtc)</div><div class='add'>+		plane_resp-&gt;crtc_id = plane-&gt;crtc-&gt;base.id;</div><div class='add'>+	else</div><div class='add'>+		plane_resp-&gt;crtc_id = 0;</div><div class='add'>+</div><div class='add'>+	if (plane-&gt;fb)</div><div class='add'>+		plane_resp-&gt;fb_id = plane-&gt;fb-&gt;base.id;</div><div class='add'>+	else</div><div class='add'>+		plane_resp-&gt;fb_id = 0;</div><div class='add'>+</div><div class='add'>+	plane_resp-&gt;plane_id = plane-&gt;base.id;</div><div class='add'>+	plane_resp-&gt;possible_crtcs = plane-&gt;possible_crtcs;</div><div class='add'>+	plane_resp-&gt;gamma_size = plane-&gt;gamma_size;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This ioctl is called twice, once to determine how much space is</div><div class='add'>+	 * needed, and the 2nd time to fill it.</div><div class='add'>+	 */</div><div class='add'>+	if (plane-&gt;format_count &amp;&amp;</div><div class='add'>+	    (plane_resp-&gt;count_format_types &gt;= plane-&gt;format_count)) {</div><div class='add'>+		format_ptr = (uint32_t __user *)(unsigned long)plane_resp-&gt;format_type_ptr;</div><div class='add'>+		if (copy_to_user(format_ptr,</div><div class='add'>+				 plane-&gt;format_types,</div><div class='add'>+				 sizeof(uint32_t) * plane-&gt;format_count)) {</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	plane_resp-&gt;count_format_types = plane-&gt;format_count;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_mode_setplane - set up or tear down an plane</div><div class='add'>+ * @dev: DRM device</div><div class='add'>+ * @data: ioctl data*</div><div class='add'>+ * @file_prive: DRM file info</div><div class='add'>+ *</div><div class='add'>+ * Set plane info, including placement, fb, scaling, and other factors.</div><div class='add'>+ * Or pass a NULL fb to disable.</div><div class='add'>+ */</div><div class='add'>+int drm_mode_setplane(struct drm_device *dev, void *data,</div><div class='add'>+			struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_mode_set_plane *plane_req = data;</div><div class='add'>+	struct drm_mode_object *obj;</div><div class='add'>+	struct drm_plane *plane;</div><div class='add'>+	struct drm_crtc *crtc;</div><div class='add'>+	struct drm_framebuffer *fb;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	unsigned int fb_width, fb_height;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!drm_core_check_feature(dev, DRIVER_MODESET))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * First, find the plane, crtc, and fb objects.  If not available,</div><div class='add'>+	 * we don't bother to call the driver.</div><div class='add'>+	 */</div><div class='add'>+	obj = drm_mode_object_find(dev, plane_req-&gt;plane_id,</div><div class='add'>+				   DRM_MODE_OBJECT_PLANE);</div><div class='add'>+	if (!obj) {</div><div class='add'>+		DRM_DEBUG_KMS("Unknown plane ID %d\n",</div><div class='add'>+			      plane_req-&gt;plane_id);</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	plane = obj_to_plane(obj);</div><div class='add'>+</div><div class='add'>+	/* No fb means shut it down */</div><div class='add'>+	if (!plane_req-&gt;fb_id) {</div><div class='add'>+		plane-&gt;funcs-&gt;disable_plane(plane);</div><div class='add'>+		plane-&gt;crtc = NULL;</div><div class='add'>+		plane-&gt;fb = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	obj = drm_mode_object_find(dev, plane_req-&gt;crtc_id,</div><div class='add'>+				   DRM_MODE_OBJECT_CRTC);</div><div class='add'>+	if (!obj) {</div><div class='add'>+		DRM_DEBUG_KMS("Unknown crtc ID %d\n",</div><div class='add'>+			      plane_req-&gt;crtc_id);</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	crtc = obj_to_crtc(obj);</div><div class='add'>+</div><div class='add'>+	obj = drm_mode_object_find(dev, plane_req-&gt;fb_id,</div><div class='add'>+				   DRM_MODE_OBJECT_FB);</div><div class='add'>+	if (!obj) {</div><div class='add'>+		DRM_DEBUG_KMS("Unknown framebuffer ID %d\n",</div><div class='add'>+			      plane_req-&gt;fb_id);</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	fb = obj_to_fb(obj);</div><div class='add'>+</div><div class='add'>+	/* Check whether this plane supports the fb pixel format. */</div><div class='add'>+	for (i = 0; i &lt; plane-&gt;format_count; i++)</div><div class='add'>+		if (fb-&gt;pixel_format == plane-&gt;format_types[i])</div><div class='add'>+			break;</div><div class='add'>+	if (i == plane-&gt;format_count) {</div><div class='add'>+		DRM_DEBUG_KMS("Invalid pixel format 0x%08x\n", fb-&gt;pixel_format);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fb_width = fb-&gt;width &lt;&lt; 16;</div><div class='add'>+	fb_height = fb-&gt;height &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	/* Make sure source coordinates are inside the fb. */</div><div class='add'>+	if (plane_req-&gt;src_w &gt; fb_width ||</div><div class='add'>+	    plane_req-&gt;src_x &gt; fb_width - plane_req-&gt;src_w ||</div><div class='add'>+	    plane_req-&gt;src_h &gt; fb_height ||</div><div class='add'>+	    plane_req-&gt;src_y &gt; fb_height - plane_req-&gt;src_h) {</div><div class='add'>+		DRM_DEBUG_KMS("Invalid source coordinates "</div><div class='add'>+			      "%u.%06ux%u.%06u+%u.%06u+%u.%06u\n",</div><div class='add'>+			      plane_req-&gt;src_w &gt;&gt; 16,</div><div class='add'>+			      ((plane_req-&gt;src_w &amp; 0xffff) * 15625) &gt;&gt; 10,</div><div class='add'>+			      plane_req-&gt;src_h &gt;&gt; 16,</div><div class='add'>+			      ((plane_req-&gt;src_h &amp; 0xffff) * 15625) &gt;&gt; 10,</div><div class='add'>+			      plane_req-&gt;src_x &gt;&gt; 16,</div><div class='add'>+			      ((plane_req-&gt;src_x &amp; 0xffff) * 15625) &gt;&gt; 10,</div><div class='add'>+			      plane_req-&gt;src_y &gt;&gt; 16,</div><div class='add'>+			      ((plane_req-&gt;src_y &amp; 0xffff) * 15625) &gt;&gt; 10);</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Give drivers some help against integer overflows */</div><div class='add'>+	if (plane_req-&gt;crtc_w &gt; INT_MAX ||</div><div class='add'>+	    plane_req-&gt;crtc_x &gt; INT_MAX - (int32_t) plane_req-&gt;crtc_w ||</div><div class='add'>+	    plane_req-&gt;crtc_h &gt; INT_MAX ||</div><div class='add'>+	    plane_req-&gt;crtc_y &gt; INT_MAX - (int32_t) plane_req-&gt;crtc_h) {</div><div class='add'>+		DRM_DEBUG_KMS("Invalid CRTC coordinates %ux%u+%d+%d\n",</div><div class='add'>+			      plane_req-&gt;crtc_w, plane_req-&gt;crtc_h,</div><div class='add'>+			      plane_req-&gt;crtc_x, plane_req-&gt;crtc_y);</div><div class='add'>+		ret = -ERANGE;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = plane-&gt;funcs-&gt;update_plane(plane, crtc, fb,</div><div class='add'>+					 plane_req-&gt;crtc_x, plane_req-&gt;crtc_y,</div><div class='add'>+					 plane_req-&gt;crtc_w, plane_req-&gt;crtc_h,</div><div class='add'>+					 plane_req-&gt;src_x, plane_req-&gt;src_y,</div><div class='add'>+					 plane_req-&gt;src_w, plane_req-&gt;src_h);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		plane-&gt;crtc = crtc;</div><div class='add'>+		plane-&gt;fb = fb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * drm_mode_setcrtc - set CRTC configuration</div><div class='ctx'>  * @inode: inode from the ioctl</div><div class='ctx'>  * @filp: file * from the ioctl</div><div class='hunk'>@@ -1576,7 +1892,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; crtc_req-&gt;count_connectors; i++) {</div><div class='del'>-			set_connectors_ptr = (uint32_t *)(unsigned long)crtc_req-&gt;set_connectors_ptr;</div><div class='add'>+			set_connectors_ptr = (uint32_t __user *)(unsigned long)crtc_req-&gt;set_connectors_ptr;</div><div class='ctx'> 			if (get_user(out_id, &amp;set_connectors_ptr[i])) {</div><div class='ctx'> 				ret = -EFAULT;</div><div class='ctx'> 				goto out;</div><div class='hunk'>@@ -1625,10 +1941,8 @@ int drm_mode_cursor_ioctl(struct drm_device *dev,</div><div class='ctx'> 	if (!drm_core_check_feature(dev, DRIVER_MODESET))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!req-&gt;flags) {</div><div class='del'>-		DRM_ERROR("no operation set\n");</div><div class='add'>+	if (!req-&gt;flags)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='ctx'> 	obj = drm_mode_object_find(dev, req-&gt;crtc_id, DRM_MODE_OBJECT_CRTC);</div><div class='hunk'>@@ -1641,7 +1955,6 @@ int drm_mode_cursor_ioctl(struct drm_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;flags &amp; DRM_MODE_CURSOR_BO) {</div><div class='ctx'> 		if (!crtc-&gt;funcs-&gt;cursor_set) {</div><div class='del'>-			DRM_ERROR("crtc does not support cursor\n");</div><div class='ctx'> 			ret = -ENXIO;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1654,7 +1967,6 @@ int drm_mode_cursor_ioctl(struct drm_device *dev,</div><div class='ctx'> 		if (crtc-&gt;funcs-&gt;cursor_move) {</div><div class='ctx'> 			ret = crtc-&gt;funcs-&gt;cursor_move(crtc, req-&gt;x, req-&gt;y);</div><div class='ctx'> 		} else {</div><div class='del'>-			DRM_ERROR("crtc does not support cursor\n");</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1664,6 +1976,42 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Original addfb only supported RGB formats, so figure out which one */</div><div class='add'>+uint32_t drm_mode_legacy_fb_format(uint32_t bpp, uint32_t depth)</div><div class='add'>+{</div><div class='add'>+	uint32_t fmt;</div><div class='add'>+</div><div class='add'>+	switch (bpp) {</div><div class='add'>+	case 8:</div><div class='add'>+		fmt = DRM_FORMAT_RGB332;</div><div class='add'>+		break;</div><div class='add'>+	case 16:</div><div class='add'>+		if (depth == 15)</div><div class='add'>+			fmt = DRM_FORMAT_XRGB1555;</div><div class='add'>+		else</div><div class='add'>+			fmt = DRM_FORMAT_RGB565;</div><div class='add'>+		break;</div><div class='add'>+	case 24:</div><div class='add'>+		fmt = DRM_FORMAT_RGB888;</div><div class='add'>+		break;</div><div class='add'>+	case 32:</div><div class='add'>+		if (depth == 24)</div><div class='add'>+			fmt = DRM_FORMAT_XRGB8888;</div><div class='add'>+		else if (depth == 30)</div><div class='add'>+			fmt = DRM_FORMAT_XRGB2101010;</div><div class='add'>+		else</div><div class='add'>+			fmt = DRM_FORMAT_ARGB8888;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DRM_ERROR("bad bpp, assuming x8r8g8b8 pixel format\n");</div><div class='add'>+		fmt = DRM_FORMAT_XRGB8888;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return fmt;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(drm_mode_legacy_fb_format);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * drm_mode_addfb - add an FB to the graphics configuration</div><div class='ctx'>  * @inode: inode from the ioctl</div><div class='hunk'>@@ -1684,7 +2032,140 @@ out:</div><div class='ctx'> int drm_mode_addfb(struct drm_device *dev,</div><div class='ctx'> 		   void *data, struct drm_file *file_priv)</div><div class='ctx'> {</div><div class='del'>-	struct drm_mode_fb_cmd *r = data;</div><div class='add'>+	struct drm_mode_fb_cmd *or = data;</div><div class='add'>+	struct drm_mode_fb_cmd2 r = {};</div><div class='add'>+	struct drm_mode_config *config = &amp;dev-&gt;mode_config;</div><div class='add'>+	struct drm_framebuffer *fb;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Use new struct with format internally */</div><div class='add'>+	r.fb_id = or-&gt;fb_id;</div><div class='add'>+	r.width = or-&gt;width;</div><div class='add'>+	r.height = or-&gt;height;</div><div class='add'>+	r.pitches[0] = or-&gt;pitch;</div><div class='add'>+	r.pixel_format = drm_mode_legacy_fb_format(or-&gt;bpp, or-&gt;depth);</div><div class='add'>+	r.handles[0] = or-&gt;handle;</div><div class='add'>+</div><div class='add'>+	if (!drm_core_check_feature(dev, DRIVER_MODESET))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((config-&gt;min_width &gt; r.width) || (r.width &gt; config-&gt;max_width))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((config-&gt;min_height &gt; r.height) || (r.height &gt; config-&gt;max_height))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+</div><div class='add'>+	/* TODO check buffer is sufficiently large */</div><div class='add'>+	/* TODO setup destructor callback */</div><div class='add'>+</div><div class='add'>+	fb = dev-&gt;mode_config.funcs-&gt;fb_create(dev, file_priv, &amp;r);</div><div class='add'>+	if (IS_ERR(fb)) {</div><div class='add'>+		DRM_ERROR("could not create framebuffer\n");</div><div class='add'>+		ret = PTR_ERR(fb);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	or-&gt;fb_id = fb-&gt;base.id;</div><div class='add'>+	list_add(&amp;fb-&gt;filp_head, &amp;file_priv-&gt;fbs);</div><div class='add'>+	DRM_DEBUG_KMS("[FB:%d]\n", fb-&gt;base.id);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int format_check(struct drm_mode_fb_cmd2 *r)</div><div class='add'>+{</div><div class='add'>+	uint32_t format = r-&gt;pixel_format &amp; ~DRM_FORMAT_BIG_ENDIAN;</div><div class='add'>+</div><div class='add'>+	switch (format) {</div><div class='add'>+	case DRM_FORMAT_C8:</div><div class='add'>+	case DRM_FORMAT_RGB332:</div><div class='add'>+	case DRM_FORMAT_BGR233:</div><div class='add'>+	case DRM_FORMAT_XRGB4444:</div><div class='add'>+	case DRM_FORMAT_XBGR4444:</div><div class='add'>+	case DRM_FORMAT_RGBX4444:</div><div class='add'>+	case DRM_FORMAT_BGRX4444:</div><div class='add'>+	case DRM_FORMAT_ARGB4444:</div><div class='add'>+	case DRM_FORMAT_ABGR4444:</div><div class='add'>+	case DRM_FORMAT_RGBA4444:</div><div class='add'>+	case DRM_FORMAT_BGRA4444:</div><div class='add'>+	case DRM_FORMAT_XRGB1555:</div><div class='add'>+	case DRM_FORMAT_XBGR1555:</div><div class='add'>+	case DRM_FORMAT_RGBX5551:</div><div class='add'>+	case DRM_FORMAT_BGRX5551:</div><div class='add'>+	case DRM_FORMAT_ARGB1555:</div><div class='add'>+	case DRM_FORMAT_ABGR1555:</div><div class='add'>+	case DRM_FORMAT_RGBA5551:</div><div class='add'>+	case DRM_FORMAT_BGRA5551:</div><div class='add'>+	case DRM_FORMAT_RGB565:</div><div class='add'>+	case DRM_FORMAT_BGR565:</div><div class='add'>+	case DRM_FORMAT_RGB888:</div><div class='add'>+	case DRM_FORMAT_BGR888:</div><div class='add'>+	case DRM_FORMAT_XRGB8888:</div><div class='add'>+	case DRM_FORMAT_XBGR8888:</div><div class='add'>+	case DRM_FORMAT_RGBX8888:</div><div class='add'>+	case DRM_FORMAT_BGRX8888:</div><div class='add'>+	case DRM_FORMAT_ARGB8888:</div><div class='add'>+	case DRM_FORMAT_ABGR8888:</div><div class='add'>+	case DRM_FORMAT_RGBA8888:</div><div class='add'>+	case DRM_FORMAT_BGRA8888:</div><div class='add'>+	case DRM_FORMAT_XRGB2101010:</div><div class='add'>+	case DRM_FORMAT_XBGR2101010:</div><div class='add'>+	case DRM_FORMAT_RGBX1010102:</div><div class='add'>+	case DRM_FORMAT_BGRX1010102:</div><div class='add'>+	case DRM_FORMAT_ARGB2101010:</div><div class='add'>+	case DRM_FORMAT_ABGR2101010:</div><div class='add'>+	case DRM_FORMAT_RGBA1010102:</div><div class='add'>+	case DRM_FORMAT_BGRA1010102:</div><div class='add'>+	case DRM_FORMAT_YUYV:</div><div class='add'>+	case DRM_FORMAT_YVYU:</div><div class='add'>+	case DRM_FORMAT_UYVY:</div><div class='add'>+	case DRM_FORMAT_VYUY:</div><div class='add'>+	case DRM_FORMAT_AYUV:</div><div class='add'>+	case DRM_FORMAT_NV12:</div><div class='add'>+	case DRM_FORMAT_NV21:</div><div class='add'>+	case DRM_FORMAT_NV16:</div><div class='add'>+	case DRM_FORMAT_NV61:</div><div class='add'>+	case DRM_FORMAT_YUV410:</div><div class='add'>+	case DRM_FORMAT_YVU410:</div><div class='add'>+	case DRM_FORMAT_YUV411:</div><div class='add'>+	case DRM_FORMAT_YVU411:</div><div class='add'>+	case DRM_FORMAT_YUV420:</div><div class='add'>+	case DRM_FORMAT_YVU420:</div><div class='add'>+	case DRM_FORMAT_YUV422:</div><div class='add'>+	case DRM_FORMAT_YVU422:</div><div class='add'>+	case DRM_FORMAT_YUV444:</div><div class='add'>+	case DRM_FORMAT_YVU444:</div><div class='add'>+		return 0;</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'>+/**</div><div class='add'>+ * drm_mode_addfb2 - add an FB to the graphics configuration</div><div class='add'>+ * @inode: inode from the ioctl</div><div class='add'>+ * @filp: file * from the ioctl</div><div class='add'>+ * @cmd: cmd from ioctl</div><div class='add'>+ * @arg: arg from ioctl</div><div class='add'>+ *</div><div class='add'>+ * LOCKING:</div><div class='add'>+ * Takes mode config lock.</div><div class='add'>+ *</div><div class='add'>+ * Add a new FB to the specified CRTC, given a user request with format.</div><div class='add'>+ *</div><div class='add'>+ * Called by the user via ioctl.</div><div class='add'>+ *</div><div class='add'>+ * RETURNS:</div><div class='add'>+ * Zero on success, errno on failure.</div><div class='add'>+ */</div><div class='add'>+int drm_mode_addfb2(struct drm_device *dev,</div><div class='add'>+		    void *data, struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_mode_fb_cmd2 *r = data;</div><div class='ctx'> 	struct drm_mode_config *config = &amp;dev-&gt;mode_config;</div><div class='ctx'> 	struct drm_framebuffer *fb;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -1693,18 +2174,23 @@ int drm_mode_addfb(struct drm_device *dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if ((config-&gt;min_width &gt; r-&gt;width) || (r-&gt;width &gt; config-&gt;max_width)) {</div><div class='del'>-		DRM_ERROR("mode new framebuffer width not within limits\n");</div><div class='add'>+		DRM_ERROR("bad framebuffer width %d, should be &gt;= %d &amp;&amp; &lt;= %d\n",</div><div class='add'>+			  r-&gt;width, config-&gt;min_width, config-&gt;max_width);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((config-&gt;min_height &gt; r-&gt;height) || (r-&gt;height &gt; config-&gt;max_height)) {</div><div class='del'>-		DRM_ERROR("mode new framebuffer height not within limits\n");</div><div class='add'>+		DRM_ERROR("bad framebuffer height %d, should be &gt;= %d &amp;&amp; &lt;= %d\n",</div><div class='add'>+			  r-&gt;height, config-&gt;min_height, config-&gt;max_height);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+	ret = format_check(r);</div><div class='add'>+	if (ret) {</div><div class='add'>+		DRM_ERROR("bad framebuffer format 0x%08x\n", r-&gt;pixel_format);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* TODO check buffer is sufficiently large */</div><div class='del'>-	/* TODO setup destructor callback */</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='ctx'> </div><div class='ctx'> 	fb = dev-&gt;mode_config.funcs-&gt;fb_create(dev, file_priv, r);</div><div class='ctx'> 	if (IS_ERR(fb)) {</div><div class='hunk'>@@ -1756,7 +2242,6 @@ int drm_mode_rmfb(struct drm_device *dev,</div><div class='ctx'> 	obj = drm_mode_object_find(dev, *id, DRM_MODE_OBJECT_FB);</div><div class='ctx'> 	/* TODO check that we really get a framebuffer back. */</div><div class='ctx'> 	if (!obj) {</div><div class='del'>-		DRM_ERROR("mode invalid framebuffer id\n");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1767,7 +2252,6 @@ int drm_mode_rmfb(struct drm_device *dev,</div><div class='ctx'> 			found = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (!found) {</div><div class='del'>-		DRM_ERROR("tried to remove a fb that we didn't own\n");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1814,7 +2298,6 @@ int drm_mode_getfb(struct drm_device *dev,</div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='ctx'> 	obj = drm_mode_object_find(dev, r-&gt;fb_id, DRM_MODE_OBJECT_FB);</div><div class='ctx'> 	if (!obj) {</div><div class='del'>-		DRM_ERROR("invalid framebuffer id\n");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1824,7 +2307,7 @@ int drm_mode_getfb(struct drm_device *dev,</div><div class='ctx'> 	r-&gt;width = fb-&gt;width;</div><div class='ctx'> 	r-&gt;depth = fb-&gt;depth;</div><div class='ctx'> 	r-&gt;bpp = fb-&gt;bits_per_pixel;</div><div class='del'>-	r-&gt;pitch = fb-&gt;pitch;</div><div class='add'>+	r-&gt;pitch = fb-&gt;pitches[0];</div><div class='ctx'> 	fb-&gt;funcs-&gt;create_handle(fb, file_priv, &amp;r-&gt;handle);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1850,14 +2333,13 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev,</div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='ctx'> 	obj = drm_mode_object_find(dev, r-&gt;fb_id, DRM_MODE_OBJECT_FB);</div><div class='ctx'> 	if (!obj) {</div><div class='del'>-		DRM_ERROR("invalid framebuffer id\n");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out_err1;</div><div class='ctx'> 	}</div><div class='ctx'> 	fb = obj_to_fb(obj);</div><div class='ctx'> </div><div class='ctx'> 	num_clips = r-&gt;num_clips;</div><div class='del'>-	clips_ptr = (struct drm_clip_rect *)(unsigned long)r-&gt;clips_ptr;</div><div class='add'>+	clips_ptr = (struct drm_clip_rect __user *)(unsigned long)r-&gt;clips_ptr;</div><div class='ctx'> </div><div class='ctx'> 	if (!num_clips != !clips_ptr) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='hunk'>@@ -2253,7 +2735,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,</div><div class='ctx'> 	struct drm_property_enum *prop_enum;</div><div class='ctx'> 	struct drm_mode_property_enum __user *enum_ptr;</div><div class='ctx'> 	struct drm_property_blob *prop_blob;</div><div class='del'>-	uint32_t *blob_id_ptr;</div><div class='add'>+	uint32_t __user *blob_id_ptr;</div><div class='ctx'> 	uint64_t __user *values_ptr;</div><div class='ctx'> 	uint32_t __user *blob_length_ptr;</div><div class='ctx'> </div><div class='hunk'>@@ -2283,7 +2765,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,</div><div class='ctx'> 	out_resp-&gt;flags = property-&gt;flags;</div><div class='ctx'> </div><div class='ctx'> 	if ((out_resp-&gt;count_values &gt;= value_count) &amp;&amp; value_count) {</div><div class='del'>-		values_ptr = (uint64_t *)(unsigned long)out_resp-&gt;values_ptr;</div><div class='add'>+		values_ptr = (uint64_t __user *)(unsigned long)out_resp-&gt;values_ptr;</div><div class='ctx'> 		for (i = 0; i &lt; value_count; i++) {</div><div class='ctx'> 			if (copy_to_user(values_ptr + i, &amp;property-&gt;values[i], sizeof(uint64_t))) {</div><div class='ctx'> 				ret = -EFAULT;</div><div class='hunk'>@@ -2296,7 +2778,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,</div><div class='ctx'> 	if (property-&gt;flags &amp; DRM_MODE_PROP_ENUM) {</div><div class='ctx'> 		if ((out_resp-&gt;count_enum_blobs &gt;= enum_count) &amp;&amp; enum_count) {</div><div class='ctx'> 			copied = 0;</div><div class='del'>-			enum_ptr = (struct drm_mode_property_enum *)(unsigned long)out_resp-&gt;enum_blob_ptr;</div><div class='add'>+			enum_ptr = (struct drm_mode_property_enum __user *)(unsigned long)out_resp-&gt;enum_blob_ptr;</div><div class='ctx'> 			list_for_each_entry(prop_enum, &amp;property-&gt;enum_blob_list, head) {</div><div class='ctx'> </div><div class='ctx'> 				if (copy_to_user(&amp;enum_ptr[copied].value, &amp;prop_enum-&gt;value, sizeof(uint64_t))) {</div><div class='hunk'>@@ -2318,8 +2800,8 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,</div><div class='ctx'> 	if (property-&gt;flags &amp; DRM_MODE_PROP_BLOB) {</div><div class='ctx'> 		if ((out_resp-&gt;count_enum_blobs &gt;= blob_count) &amp;&amp; blob_count) {</div><div class='ctx'> 			copied = 0;</div><div class='del'>-			blob_id_ptr = (uint32_t *)(unsigned long)out_resp-&gt;enum_blob_ptr;</div><div class='del'>-			blob_length_ptr = (uint32_t *)(unsigned long)out_resp-&gt;values_ptr;</div><div class='add'>+			blob_id_ptr = (uint32_t __user *)(unsigned long)out_resp-&gt;enum_blob_ptr;</div><div class='add'>+			blob_length_ptr = (uint32_t __user *)(unsigned long)out_resp-&gt;values_ptr;</div><div class='ctx'> </div><div class='ctx'> 			list_for_each_entry(prop_blob, &amp;property-&gt;enum_blob_list, head) {</div><div class='ctx'> 				if (put_user(prop_blob-&gt;base.id, blob_id_ptr + copied)) {</div><div class='hunk'>@@ -2380,7 +2862,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,</div><div class='ctx'> 	struct drm_mode_get_blob *out_resp = data;</div><div class='ctx'> 	struct drm_property_blob *blob;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	void *blob_ptr;</div><div class='add'>+	void __user *blob_ptr;</div><div class='ctx'> </div><div class='ctx'> 	if (!drm_core_check_feature(dev, DRIVER_MODESET))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -2394,7 +2876,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,</div><div class='ctx'> 	blob = obj_to_blob(obj);</div><div class='ctx'> </div><div class='ctx'> 	if (out_resp-&gt;length == blob-&gt;length) {</div><div class='del'>-		blob_ptr = (void *)(unsigned long)out_resp-&gt;data;</div><div class='add'>+		blob_ptr = (void __user *)(unsigned long)out_resp-&gt;data;</div><div class='ctx'> 		if (copy_to_user(blob_ptr, blob-&gt;data, blob-&gt;length)){</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 			goto done;</div><div class='hunk'>@@ -2788,3 +3270,71 @@ int drm_mode_destroy_dumb_ioctl(struct drm_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	return dev-&gt;driver-&gt;dumb_destroy(file_priv, dev, args-&gt;handle);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Just need to support RGB formats here for compat with code that doesn't</div><div class='add'>+ * use pixel formats directly yet.</div><div class='add'>+ */</div><div class='add'>+void drm_fb_get_bpp_depth(uint32_t format, unsigned int *depth,</div><div class='add'>+			  int *bpp)</div><div class='add'>+{</div><div class='add'>+	switch (format) {</div><div class='add'>+	case DRM_FORMAT_RGB332:</div><div class='add'>+	case DRM_FORMAT_BGR233:</div><div class='add'>+		*depth = 8;</div><div class='add'>+		*bpp = 8;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_FORMAT_XRGB1555:</div><div class='add'>+	case DRM_FORMAT_XBGR1555:</div><div class='add'>+	case DRM_FORMAT_RGBX5551:</div><div class='add'>+	case DRM_FORMAT_BGRX5551:</div><div class='add'>+	case DRM_FORMAT_ARGB1555:</div><div class='add'>+	case DRM_FORMAT_ABGR1555:</div><div class='add'>+	case DRM_FORMAT_RGBA5551:</div><div class='add'>+	case DRM_FORMAT_BGRA5551:</div><div class='add'>+		*depth = 15;</div><div class='add'>+		*bpp = 16;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_FORMAT_RGB565:</div><div class='add'>+	case DRM_FORMAT_BGR565:</div><div class='add'>+		*depth = 16;</div><div class='add'>+		*bpp = 16;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_FORMAT_RGB888:</div><div class='add'>+	case DRM_FORMAT_BGR888:</div><div class='add'>+		*depth = 24;</div><div class='add'>+		*bpp = 24;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_FORMAT_XRGB8888:</div><div class='add'>+	case DRM_FORMAT_XBGR8888:</div><div class='add'>+	case DRM_FORMAT_RGBX8888:</div><div class='add'>+	case DRM_FORMAT_BGRX8888:</div><div class='add'>+		*depth = 24;</div><div class='add'>+		*bpp = 32;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_FORMAT_XRGB2101010:</div><div class='add'>+	case DRM_FORMAT_XBGR2101010:</div><div class='add'>+	case DRM_FORMAT_RGBX1010102:</div><div class='add'>+	case DRM_FORMAT_BGRX1010102:</div><div class='add'>+	case DRM_FORMAT_ARGB2101010:</div><div class='add'>+	case DRM_FORMAT_ABGR2101010:</div><div class='add'>+	case DRM_FORMAT_RGBA1010102:</div><div class='add'>+	case DRM_FORMAT_BGRA1010102:</div><div class='add'>+		*depth = 30;</div><div class='add'>+		*bpp = 32;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_FORMAT_ARGB8888:</div><div class='add'>+	case DRM_FORMAT_ABGR8888:</div><div class='add'>+	case DRM_FORMAT_RGBA8888:</div><div class='add'>+	case DRM_FORMAT_BGRA8888:</div><div class='add'>+		*depth = 32;</div><div class='add'>+		*bpp = 32;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DRM_DEBUG_KMS("unsupported pixel format\n");</div><div class='add'>+		*depth = 0;</div><div class='add'>+		*bpp = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(drm_fb_get_bpp_depth);</div><div class='head'>diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c<br/>index d2619d72cece..84a4a809793f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_crtc_helper.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_crtc_helper.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_crtc_helper.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/drm_crtc_helper.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> #include "drm_crtc.h"</div><div class='add'>+#include "drm_fourcc.h"</div><div class='ctx'> #include "drm_crtc_helper.h"</div><div class='ctx'> #include "drm_fb_helper.h"</div><div class='ctx'> </div><div class='hunk'>@@ -710,7 +711,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)</div><div class='ctx'> 			for (i = 0; i &lt; set-&gt;num_connectors; i++) {</div><div class='ctx'> 				DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set-&gt;connectors[i]-&gt;base.id,</div><div class='ctx'> 					      drm_get_connector_name(set-&gt;connectors[i]));</div><div class='del'>-				set-&gt;connectors[i]-&gt;dpms = DRM_MODE_DPMS_ON;</div><div class='add'>+				set-&gt;connectors[i]-&gt;funcs-&gt;dpms(set-&gt;connectors[i], DRM_MODE_DPMS_ON);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		drm_helper_disable_unused_functions(dev);</div><div class='hunk'>@@ -847,13 +848,19 @@ void drm_helper_connector_dpms(struct drm_connector *connector, int mode)</div><div class='ctx'> EXPORT_SYMBOL(drm_helper_connector_dpms);</div><div class='ctx'> </div><div class='ctx'> int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb,</div><div class='del'>-				   struct drm_mode_fb_cmd *mode_cmd)</div><div class='add'>+				   struct drm_mode_fb_cmd2 *mode_cmd)</div><div class='ctx'> {</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='ctx'> 	fb-&gt;width = mode_cmd-&gt;width;</div><div class='ctx'> 	fb-&gt;height = mode_cmd-&gt;height;</div><div class='del'>-	fb-&gt;pitch = mode_cmd-&gt;pitch;</div><div class='del'>-	fb-&gt;bits_per_pixel = mode_cmd-&gt;bpp;</div><div class='del'>-	fb-&gt;depth = mode_cmd-&gt;depth;</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		fb-&gt;pitches[i] = mode_cmd-&gt;pitches[i];</div><div class='add'>+		fb-&gt;offsets[i] = mode_cmd-&gt;offsets[i];</div><div class='add'>+	}</div><div class='add'>+	drm_fb_get_bpp_depth(mode_cmd-&gt;pixel_format, &amp;fb-&gt;depth,</div><div class='add'>+				    &amp;fb-&gt;bits_per_pixel);</div><div class='add'>+	fb-&gt;pixel_format = mode_cmd-&gt;pixel_format;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1008,3 +1015,36 @@ void drm_helper_hpd_irq_event(struct drm_device *dev)</div><div class='ctx'> 		queue_delayed_work(system_nrt_wq, &amp;dev-&gt;mode_config.output_poll_work, 0);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(drm_helper_hpd_irq_event);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_format_num_planes - get the number of planes for format</div><div class='add'>+ * @format: pixel format (DRM_FORMAT_*)</div><div class='add'>+ *</div><div class='add'>+ * RETURNS:</div><div class='add'>+ * The number of planes used by the specified pixel format.</div><div class='add'>+ */</div><div class='add'>+int drm_format_num_planes(uint32_t format)</div><div class='add'>+{</div><div class='add'>+	switch (format) {</div><div class='add'>+	case DRM_FORMAT_YUV410:</div><div class='add'>+	case DRM_FORMAT_YVU410:</div><div class='add'>+	case DRM_FORMAT_YUV411:</div><div class='add'>+	case DRM_FORMAT_YVU411:</div><div class='add'>+	case DRM_FORMAT_YUV420:</div><div class='add'>+	case DRM_FORMAT_YVU420:</div><div class='add'>+	case DRM_FORMAT_YUV422:</div><div class='add'>+	case DRM_FORMAT_YVU422:</div><div class='add'>+	case DRM_FORMAT_YUV444:</div><div class='add'>+	case DRM_FORMAT_YVU444:</div><div class='add'>+		return 3;</div><div class='add'>+	case DRM_FORMAT_NV12:</div><div class='add'>+	case DRM_FORMAT_NV21:</div><div class='add'>+	case DRM_FORMAT_NV16:</div><div class='add'>+	case DRM_FORMAT_NV61:</div><div class='add'>+		return 2;</div><div class='add'>+	default:</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(drm_format_num_planes);</div><div class='head'>diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c<br/>index 40c187c60f44..ebf7d3f68fc4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/drm_drv.c</a></div><div class='hunk'>@@ -61,14 +61,14 @@ static int drm_version(struct drm_device *dev, void *data,</div><div class='ctx'> </div><div class='ctx'> /** Ioctl table */</div><div class='ctx'> static struct drm_ioctl_desc drm_ioctls[] = {</div><div class='del'>-	DRM_IOCTL_DEF(DRM_IOCTL_VERSION, drm_version, 0),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_IOCTL_VERSION, drm_version, DRM_UNLOCKED),</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_GET_UNIQUE, drm_getunique, 0),</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_GET_MAGIC, drm_getmagic, 0),</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_IRQ_BUSID, drm_irq_by_busid, DRM_MASTER|DRM_ROOT_ONLY),</div><div class='del'>-	DRM_IOCTL_DEF(DRM_IOCTL_GET_MAP, drm_getmap, 0),</div><div class='del'>-	DRM_IOCTL_DEF(DRM_IOCTL_GET_CLIENT, drm_getclient, 0),</div><div class='del'>-	DRM_IOCTL_DEF(DRM_IOCTL_GET_STATS, drm_getstats, 0),</div><div class='del'>-	DRM_IOCTL_DEF(DRM_IOCTL_GET_CAP, drm_getcap, 0),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_IOCTL_GET_MAP, drm_getmap, DRM_UNLOCKED),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_IOCTL_GET_CLIENT, drm_getclient, DRM_UNLOCKED),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_IOCTL_GET_STATS, drm_getstats, DRM_UNLOCKED),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_IOCTL_GET_CAP, drm_getcap, DRM_UNLOCKED),</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_SET_VERSION, drm_setversion, DRM_MASTER),</div><div class='ctx'> </div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_SET_UNIQUE, drm_setunique, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),</div><div class='hunk'>@@ -136,8 +136,11 @@ static struct drm_ioctl_desc drm_ioctls[] = {</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_GEM_OPEN, drm_gem_open_ioctl, DRM_AUTH|DRM_UNLOCKED),</div><div class='ctx'> </div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETRESOURCES, drm_mode_getresources, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPLANERESOURCES, drm_mode_getplane_res, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCRTC, drm_mode_getcrtc, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETCRTC, drm_mode_setcrtc, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPLANE, drm_mode_getplane, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPLANE, drm_mode_setplane, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_CURSOR, drm_mode_cursor_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETGAMMA, drm_mode_gamma_get_ioctl, DRM_MASTER|DRM_UNLOCKED),</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETGAMMA, drm_mode_gamma_set_ioctl, DRM_MASTER|DRM_UNLOCKED),</div><div class='hunk'>@@ -150,6 +153,7 @@ static struct drm_ioctl_desc drm_ioctls[] = {</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPBLOB, drm_mode_getblob_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),</div><div class='add'>+	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB2, drm_mode_addfb2, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_PAGE_FLIP, drm_mode_page_flip_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),</div><div class='ctx'> 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_DIRTYFB, drm_mode_dirtyfb_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),</div><div class='head'>diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c<br/>index 3e927ce7557d..ece03fc2d386 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_edid.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_edid.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_edid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/drm_edid.c</a></div><div class='hunk'>@@ -508,25 +508,10 @@ static void</div><div class='ctx'> cea_for_each_detailed_block(u8 *ext, detailed_cb *cb, void *closure)</div><div class='ctx'> {</div><div class='ctx'> 	int i, n = 0;</div><div class='del'>-	u8 rev = ext[0x01], d = ext[0x02];</div><div class='add'>+	u8 d = ext[0x02];</div><div class='ctx'> 	u8 *det_base = ext + d;</div><div class='ctx'> </div><div class='del'>-	switch (rev) {</div><div class='del'>-	case 0:</div><div class='del'>-		/* can't happen */</div><div class='del'>-		return;</div><div class='del'>-	case 1:</div><div class='del'>-		/* have to infer how many blocks we have, check pixel clock */</div><div class='del'>-		for (i = 0; i &lt; 6; i++)</div><div class='del'>-			if (det_base[18*i] || det_base[18*i+1])</div><div class='del'>-				n++;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* explicit count */</div><div class='del'>-		n = min(ext[0x03] &amp; 0x0f, 6);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	n = (127 - d) / 18;</div><div class='ctx'> 	for (i = 0; i &lt; n; i++)</div><div class='ctx'> 		cb((struct detailed_timing *)(det_base + 18 * i), closure);</div><div class='ctx'> }</div><div class='hunk'>@@ -1319,6 +1304,7 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid,</div><div class='ctx'> </div><div class='ctx'> #define HDMI_IDENTIFIER 0x000C03</div><div class='ctx'> #define AUDIO_BLOCK	0x01</div><div class='add'>+#define VIDEO_BLOCK     0x02</div><div class='ctx'> #define VENDOR_BLOCK    0x03</div><div class='ctx'> #define SPEAKER_BLOCK	0x04</div><div class='ctx'> #define EDID_BASIC_AUDIO	(1 &lt;&lt; 6)</div><div class='hunk'>@@ -1349,6 +1335,47 @@ u8 *drm_find_cea_extension(struct edid *edid)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(drm_find_cea_extension);</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+do_cea_modes (struct drm_connector *connector, u8 *db, u8 len)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = connector-&gt;dev;</div><div class='add'>+	u8 * mode, cea_mode;</div><div class='add'>+	int modes = 0;</div><div class='add'>+</div><div class='add'>+	for (mode = db; mode &lt; db + len; mode++) {</div><div class='add'>+		cea_mode = (*mode &amp; 127) - 1; /* CEA modes are numbered 1..127 */</div><div class='add'>+		if (cea_mode &lt; drm_num_cea_modes) {</div><div class='add'>+			struct drm_display_mode *newmode;</div><div class='add'>+			newmode = drm_mode_duplicate(dev,</div><div class='add'>+						     &amp;edid_cea_modes[cea_mode]);</div><div class='add'>+			if (newmode) {</div><div class='add'>+				drm_mode_probed_add(connector, newmode);</div><div class='add'>+				modes++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return modes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+add_cea_modes(struct drm_connector *connector, struct edid *edid)</div><div class='add'>+{</div><div class='add'>+	u8 * cea = drm_find_cea_extension(edid);</div><div class='add'>+	u8 * db, dbl;</div><div class='add'>+	int modes = 0;</div><div class='add'>+</div><div class='add'>+	if (cea &amp;&amp; cea[1] &gt;= 3) {</div><div class='add'>+		for (db = cea + 4; db &lt; cea + cea[2]; db += dbl + 1) {</div><div class='add'>+			dbl = db[0] &amp; 0x1f;</div><div class='add'>+			if (((db[0] &amp; 0xe0) &gt;&gt; 5) == VIDEO_BLOCK)</div><div class='add'>+				modes += do_cea_modes (connector, db+1, dbl);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return modes;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> parse_hdmi_vsdb(struct drm_connector *connector, uint8_t *db)</div><div class='ctx'> {</div><div class='hunk'>@@ -1432,26 +1459,29 @@ void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid)</div><div class='ctx'> 	eld[18] = edid-&gt;prod_code[0];</div><div class='ctx'> 	eld[19] = edid-&gt;prod_code[1];</div><div class='ctx'> </div><div class='del'>-	for (db = cea + 4; db &lt; cea + cea[2]; db += dbl + 1) {</div><div class='del'>-		dbl = db[0] &amp; 0x1f;</div><div class='del'>-</div><div class='del'>-		switch ((db[0] &amp; 0xe0) &gt;&gt; 5) {</div><div class='del'>-		case AUDIO_BLOCK:	/* Audio Data Block, contains SADs */</div><div class='del'>-			sad_count = dbl / 3;</div><div class='del'>-			memcpy(eld + 20 + mnl, &amp;db[1], dbl);</div><div class='del'>-			break;</div><div class='del'>-		case SPEAKER_BLOCK:	/* Speaker Allocation Data Block */</div><div class='del'>-			eld[7] = db[1];</div><div class='del'>-			break;</div><div class='del'>-		case VENDOR_BLOCK:</div><div class='del'>-			/* HDMI Vendor-Specific Data Block */</div><div class='del'>-			if (db[1] == 0x03 &amp;&amp; db[2] == 0x0c &amp;&amp; db[3] == 0)</div><div class='del'>-				parse_hdmi_vsdb(connector, db);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='add'>+	if (cea[1] &gt;= 3)</div><div class='add'>+		for (db = cea + 4; db &lt; cea + cea[2]; db += dbl + 1) {</div><div class='add'>+			dbl = db[0] &amp; 0x1f;</div><div class='add'>+			</div><div class='add'>+			switch ((db[0] &amp; 0xe0) &gt;&gt; 5) {</div><div class='add'>+			case AUDIO_BLOCK:</div><div class='add'>+				/* Audio Data Block, contains SADs */</div><div class='add'>+				sad_count = dbl / 3;</div><div class='add'>+				memcpy(eld + 20 + mnl, &amp;db[1], dbl);</div><div class='add'>+				break;</div><div class='add'>+			case SPEAKER_BLOCK:</div><div class='add'>+                                /* Speaker Allocation Data Block */</div><div class='add'>+				eld[7] = db[1];</div><div class='add'>+				break;</div><div class='add'>+			case VENDOR_BLOCK:</div><div class='add'>+				/* HDMI Vendor-Specific Data Block */</div><div class='add'>+				if (db[1] == 0x03 &amp;&amp; db[2] == 0x0c &amp;&amp; db[3] == 0)</div><div class='add'>+					parse_hdmi_vsdb(connector, db);</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> 	eld[5] |= sad_count &lt;&lt; 4;</div><div class='ctx'> 	eld[2] = (20 + mnl + sad_count * 3 + 3) / 4;</div><div class='ctx'> </div><div class='hunk'>@@ -1722,6 +1752,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)</div><div class='ctx'> 	num_modes += add_standard_modes(connector, edid);</div><div class='ctx'> 	num_modes += add_established_modes(connector, edid);</div><div class='ctx'> 	num_modes += add_inferred_modes(connector, edid);</div><div class='add'>+	num_modes += add_cea_modes(connector, edid);</div><div class='ctx'> </div><div class='ctx'> 	if (quirks &amp; (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))</div><div class='ctx'> 		edid_fixup_preferred(connector, quirks);</div><div class='head'>diff --git a/drivers/gpu/drm/drm_edid_modes.h b/drivers/gpu/drm/drm_edid_modes.h<br/>index 5f2064489fd5..a91ffb117220 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_edid_modes.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_edid_modes.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_edid_modes.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/drm_edid_modes.h</a></div><div class='hunk'>@@ -378,3 +378,287 @@ static const struct {</div><div class='ctx'> 	{ 1920, 1440, 75, 0 },</div><div class='ctx'> };</div><div class='ctx'> static const int num_est3_modes = sizeof(est3_modes) / sizeof(est3_modes[0]);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Probably taken from CEA-861 spec.</div><div class='add'>+ * This table is converted from xorg's hw/xfree86/modes/xf86EdidModes.c.</div><div class='add'>+ */</div><div class='add'>+static const struct drm_display_mode edid_cea_modes[] = {</div><div class='add'>+	/* 640x480@60Hz */</div><div class='add'>+	{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 25175, 640, 656,</div><div class='add'>+		   752, 800, 0, 480, 490, 492, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 720x480@60Hz */</div><div class='add'>+	{ DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 27000, 720, 736,</div><div class='add'>+		   798, 858, 0, 480, 489, 495, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 720x480@60Hz */</div><div class='add'>+	{ DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 27000, 720, 736,</div><div class='add'>+		   798, 858, 0, 480, 489, 495, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 1280x720@60Hz */</div><div class='add'>+	{ DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 1390,</div><div class='add'>+		   1430, 1650, 0, 720, 725, 730, 750, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	/* 1920x1080i@60Hz */</div><div class='add'>+	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2008,</div><div class='add'>+		   2052, 2200, 0, 1080, 1084, 1094, 1125, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 1440x480i@60Hz */</div><div class='add'>+	{ DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,</div><div class='add'>+		   1602, 1716, 0, 480, 488, 494, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 1440x480i@60Hz */</div><div class='add'>+	{ DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,</div><div class='add'>+		   1602, 1716, 0, 480, 488, 494, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 1440x240@60Hz */</div><div class='add'>+	{ DRM_MODE("1440x240", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,</div><div class='add'>+		   1602, 1716, 0, 240, 244, 247, 262, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 1440x240@60Hz */</div><div class='add'>+	{ DRM_MODE("1440x240", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,</div><div class='add'>+		   1602, 1716, 0, 240, 244, 247, 262, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 2880x480i@60Hz */</div><div class='add'>+	{ DRM_MODE("2880x480", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956,</div><div class='add'>+		   3204, 3432, 0, 480, 488, 494, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 2880x480i@60Hz */</div><div class='add'>+	{ DRM_MODE("2880x480", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956,</div><div class='add'>+		   3204, 3432, 0, 480, 488, 494, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 2880x240@60Hz */</div><div class='add'>+	{ DRM_MODE("2880x240", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956,</div><div class='add'>+		   3204, 3432, 0, 240, 244, 247, 262, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 2880x240@60Hz */</div><div class='add'>+	{ DRM_MODE("2880x240", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956,</div><div class='add'>+		   3204, 3432, 0, 240, 244, 247, 262, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 1440x480@60Hz */</div><div class='add'>+	{ DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1472,</div><div class='add'>+		   1596, 1716, 0, 480, 489, 495, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 1440x480@60Hz */</div><div class='add'>+	{ DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1472,</div><div class='add'>+		   1596, 1716, 0, 480, 489, 495, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 1920x1080@60Hz */</div><div class='add'>+	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2008,</div><div class='add'>+		   2052, 2200, 0, 1080, 1084, 1089, 1125, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	/* 720x576@50Hz */</div><div class='add'>+	{ DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 27000, 720, 732,</div><div class='add'>+		   796, 864, 0, 576, 581, 586, 625, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 720x576@50Hz */</div><div class='add'>+	{ DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 27000, 720, 732,</div><div class='add'>+		   796, 864, 0, 576, 581, 586, 625, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 1280x720@50Hz */</div><div class='add'>+	{ DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 1720,</div><div class='add'>+		   1760, 1980, 0, 720, 725, 730, 750, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	/* 1920x1080i@50Hz */</div><div class='add'>+	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2448,</div><div class='add'>+		   2492, 2640, 0, 1080, 1084, 1094, 1125, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 1440x576i@50Hz */</div><div class='add'>+	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,</div><div class='add'>+		   1590, 1728, 0, 576, 580, 586, 625, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 1440x576i@50Hz */</div><div class='add'>+	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,</div><div class='add'>+		   1590, 1728, 0, 576, 580, 586, 625, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 1440x288@50Hz */</div><div class='add'>+	{ DRM_MODE("1440x288", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,</div><div class='add'>+		   1590, 1728, 0, 288, 290, 293, 312, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 1440x288@50Hz */</div><div class='add'>+	{ DRM_MODE("1440x288", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,</div><div class='add'>+		   1590, 1728, 0, 288, 290, 293, 312, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 2880x576i@50Hz */</div><div class='add'>+	{ DRM_MODE("2880x576", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928,</div><div class='add'>+		   3180, 3456, 0, 576, 580, 586, 625, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 2880x576i@50Hz */</div><div class='add'>+	{ DRM_MODE("2880x576", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928,</div><div class='add'>+		   3180, 3456, 0, 576, 580, 586, 625, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 2880x288@50Hz */</div><div class='add'>+	{ DRM_MODE("2880x288", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928,</div><div class='add'>+		   3180, 3456, 0, 288, 290, 293, 312, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 2880x288@50Hz */</div><div class='add'>+	{ DRM_MODE("2880x288", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928,</div><div class='add'>+		   3180, 3456, 0, 288, 290, 293, 312, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 1440x576@50Hz */</div><div class='add'>+	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464,</div><div class='add'>+		   1592, 1728, 0, 576, 581, 586, 625, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 1440x576@50Hz */</div><div class='add'>+	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464,</div><div class='add'>+		   1592, 1728, 0, 576, 581, 586, 625, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 1920x1080@50Hz */</div><div class='add'>+	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2448,</div><div class='add'>+		   2492, 2640, 0, 1080, 1084, 1089, 1125, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	/* 1920x1080@24Hz */</div><div class='add'>+	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2558,</div><div class='add'>+		   2602, 2750, 0, 1080, 1084, 1089, 1125, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	/* 1920x1080@25Hz */</div><div class='add'>+	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2448,</div><div class='add'>+		   2492, 2640, 0, 1080, 1084, 1089, 1125, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	/* 1920x1080@30Hz */</div><div class='add'>+	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2008,</div><div class='add'>+		   2052, 2200, 0, 1080, 1084, 1089, 1125, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	/* 2880x480@60Hz */</div><div class='add'>+	{ DRM_MODE("2880x480", DRM_MODE_TYPE_DRIVER, 108000, 2880, 2944,</div><div class='add'>+		   3192, 3432, 0, 480, 489, 495, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 2880x480@60Hz */</div><div class='add'>+	{ DRM_MODE("2880x480", DRM_MODE_TYPE_DRIVER, 108000, 2880, 2944,</div><div class='add'>+		   3192, 3432, 0, 480, 489, 495, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 2880x576@50Hz */</div><div class='add'>+	{ DRM_MODE("2880x576", DRM_MODE_TYPE_DRIVER, 108000, 2880, 2928,</div><div class='add'>+		   3184, 3456, 0, 576, 581, 586, 625, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 2880x576@50Hz */</div><div class='add'>+	{ DRM_MODE("2880x576", DRM_MODE_TYPE_DRIVER, 108000, 2880, 2928,</div><div class='add'>+		   3184, 3456, 0, 576, 581, 586, 625, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 1920x1080i@50Hz */</div><div class='add'>+	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 72000, 1920, 1952,</div><div class='add'>+		   2120, 2304, 0, 1080, 1126, 1136, 1250, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 1920x1080i@100Hz */</div><div class='add'>+	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2448,</div><div class='add'>+		   2492, 2640, 0, 1080, 1084, 1094, 1125, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 1280x720@100Hz */</div><div class='add'>+	{ DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 148500, 1280, 1720,</div><div class='add'>+		   1760, 1980, 0, 720, 725, 730, 750, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	/* 720x576@100Hz */</div><div class='add'>+	{ DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 54000, 720, 732,</div><div class='add'>+		   796, 864, 0, 576, 581, 586, 625, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 720x576@100Hz */</div><div class='add'>+	{ DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 54000, 720, 732,</div><div class='add'>+		   796, 864, 0, 576, 581, 586, 625, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 1440x576i@100Hz */</div><div class='add'>+	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464,</div><div class='add'>+		   1590, 1728, 0, 576, 580, 586, 625, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 1440x576i@100Hz */</div><div class='add'>+	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464,</div><div class='add'>+		   1590, 1728, 0, 576, 580, 586, 625, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 1920x1080i@120Hz */</div><div class='add'>+	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2008,</div><div class='add'>+		   2052, 2200, 0, 1080, 1084, 1094, 1125, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 1280x720@120Hz */</div><div class='add'>+	{ DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 148500, 1280, 1390,</div><div class='add'>+		   1430, 1650, 0, 720, 725, 730, 750, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	/* 720x480@120Hz */</div><div class='add'>+	{ DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 54000, 720, 736,</div><div class='add'>+		   798, 858, 0, 480, 489, 495, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 720x480@120Hz */</div><div class='add'>+	{ DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 54000, 720, 736,</div><div class='add'>+		   798, 858, 0, 480, 489, 495, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 1440x480i@120Hz */</div><div class='add'>+	{ DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478,</div><div class='add'>+		   1602, 1716, 0, 480, 488, 494, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 1440x480i@120Hz */</div><div class='add'>+	{ DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478,</div><div class='add'>+		   1602, 1716, 0, 480, 488, 494, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 720x576@200Hz */</div><div class='add'>+	{ DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 108000, 720, 732,</div><div class='add'>+		   796, 864, 0, 576, 581, 586, 625, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 720x576@200Hz */</div><div class='add'>+	{ DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 108000, 720, 732,</div><div class='add'>+		   796, 864, 0, 576, 581, 586, 625, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 1440x576i@200Hz */</div><div class='add'>+	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464,</div><div class='add'>+		   1590, 1728, 0, 576, 580, 586, 625, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 1440x576i@200Hz */</div><div class='add'>+	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464,</div><div class='add'>+		   1590, 1728, 0, 576, 580, 586, 625, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 720x480@240Hz */</div><div class='add'>+	{ DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 108000, 720, 736,</div><div class='add'>+		   798, 858, 0, 480, 489, 495, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 720x480@240Hz */</div><div class='add'>+	{ DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 108000, 720, 736,</div><div class='add'>+		   798, 858, 0, 480, 489, 495, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },</div><div class='add'>+	/* 1440x480i@240 */</div><div class='add'>+	{ DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478,</div><div class='add'>+		   1602, 1716, 0, 480, 488, 494, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 1440x480i@240 */</div><div class='add'>+	{ DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478,</div><div class='add'>+		   1602, 1716, 0, 480, 488, 494, 525, 0,</div><div class='add'>+		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |</div><div class='add'>+			DRM_MODE_FLAG_INTERLACE) },</div><div class='add'>+	/* 1280x720@24Hz */</div><div class='add'>+	{ DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 59400, 1280, 3040,</div><div class='add'>+		   3080, 3300, 0, 720, 725, 730, 750, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	/* 1280x720@25Hz */</div><div class='add'>+	{ DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 3700,</div><div class='add'>+		   3740, 3960, 0, 720, 725, 730, 750, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	/* 1280x720@30Hz */</div><div class='add'>+	{ DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 3040,</div><div class='add'>+		   3080, 3300, 0, 720, 725, 730, 750, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	/* 1920x1080@120Hz */</div><div class='add'>+	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 297000, 1920, 2008,</div><div class='add'>+		   2052, 2200, 0, 1080, 1084, 1089, 1125, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	/* 1920x1080@100Hz */</div><div class='add'>+	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 297000, 1920, 2448,</div><div class='add'>+		   2492, 2640, 0, 1080, 1084, 1094, 1125, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+};</div><div class='add'>+static const int drm_num_cea_modes =</div><div class='add'>+	sizeof (edid_cea_modes) / sizeof (edid_cea_modes[0]);</div><div class='head'>diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c<br/>index 80fe39d98b0c..aada26f63dec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_fb_helper.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_fb_helper.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_fb_helper.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/drm_fb_helper.c</a></div><div class='hunk'>@@ -255,6 +255,13 @@ bool drm_fb_helper_force_kernel_mode(void)</div><div class='ctx'> int drm_fb_helper_panic(struct notifier_block *n, unsigned long ununsed,</div><div class='ctx'> 			void *panic_str)</div><div class='ctx'> {</div><div class='add'>+	/*</div><div class='add'>+	 * It's a waste of time and effort to switch back to text console</div><div class='add'>+	 * if the kernel should reboot before panic messages can be seen.</div><div class='add'>+	 */</div><div class='add'>+	if (panic_timeout &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_ERR "panic occurred, switching back to text console\n");</div><div class='ctx'> 	return drm_fb_helper_force_kernel_mode();</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c<br/>index 4911e1d1dcf2..c00cf154cc0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_fops.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_fops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_fops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/drm_fops.c</a></div><div class='hunk'>@@ -182,7 +182,7 @@ int drm_stub_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	old_fops = filp-&gt;f_op;</div><div class='del'>-	filp-&gt;f_op = fops_get(&amp;dev-&gt;driver-&gt;fops);</div><div class='add'>+	filp-&gt;f_op = fops_get(dev-&gt;driver-&gt;fops);</div><div class='ctx'> 	if (filp-&gt;f_op == NULL) {</div><div class='ctx'> 		filp-&gt;f_op = old_fops;</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c<br/>index 904d7e9c8e47..956fd38d7c9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_ioctl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/drm_ioctl.c</a></div><div class='hunk'>@@ -158,14 +158,11 @@ int drm_getmap(struct drm_device *dev, void *data,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	idx = map-&gt;offset;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-	if (idx &lt; 0) {</div><div class='del'>-		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	if (idx &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	i = 0;</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> 	list_for_each(list, &amp;dev-&gt;maplist) {</div><div class='ctx'> 		if (i == idx) {</div><div class='ctx'> 			r_list = list_entry(list, struct drm_map_list, head);</div><div class='hunk'>@@ -211,9 +208,9 @@ int drm_getclient(struct drm_device *dev, void *data,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	idx = client-&gt;idx;</div><div class='del'>-	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-</div><div class='ctx'> 	i = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> 	list_for_each_entry(pt, &amp;dev-&gt;filelist, lhead) {</div><div class='ctx'> 		if (i++ &gt;= idx) {</div><div class='ctx'> 			client-&gt;auth = pt-&gt;authenticated;</div><div class='hunk'>@@ -249,8 +246,6 @@ int drm_getstats(struct drm_device *dev, void *data,</div><div class='ctx'> </div><div class='ctx'> 	memset(stats, 0, sizeof(*stats));</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;counters; i++) {</div><div class='ctx'> 		if (dev-&gt;types[i] == _DRM_STAT_LOCK)</div><div class='ctx'> 			stats-&gt;data[i].value =</div><div class='hunk'>@@ -262,8 +257,6 @@ int drm_getstats(struct drm_device *dev, void *data,</div><div class='ctx'> </div><div class='ctx'> 	stats-&gt;count = dev-&gt;counters;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;dev-&gt;struct_mutex);</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/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c<br/>index 632ae243ede0..c79c713eeba0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_lock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_lock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_lock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/drm_lock.c</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'>  * OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> </div><div class='ctx'> static int drm_notifier(void *priv);</div><div class='hunk'>@@ -345,6 +346,7 @@ void drm_idlelock_take(struct drm_lock_data *lock_data)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;lock_data-&gt;spinlock);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(drm_idlelock_take);</div><div class='ctx'> </div><div class='ctx'> void drm_idlelock_release(struct drm_lock_data *lock_data)</div><div class='ctx'> {</div><div class='hunk'>@@ -364,6 +366,7 @@ void drm_idlelock_release(struct drm_lock_data *lock_data)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;lock_data-&gt;spinlock);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(drm_idlelock_release);</div><div class='ctx'> </div><div class='ctx'> int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/gpu/drm/drm_sman.c b/drivers/gpu/drm/drm_sman.c<br/>deleted file mode 100644<br/>index cebce45f4429..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_sman.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_sman.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,351 +0,0 @@</div><div class='del'>-/**************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright 2006 Tungsten Graphics, Inc., Bismarck., ND., USA.</div><div class='del'>- * All Rights Reserved.</div><div class='del'>- *</div><div class='del'>- * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='del'>- * copy of this software and associated documentation files (the</div><div class='del'>- * "Software"), to deal in the Software without restriction, including</div><div class='del'>- * without limitation the rights to use, copy, modify, merge, publish,</div><div class='del'>- * distribute, sub license, and/or sell copies of the Software, and to</div><div class='del'>- * permit persons to whom the Software is furnished to do so, subject to</div><div class='del'>- * the following conditions:</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='del'>- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='del'>- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL</div><div class='del'>- * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,</div><div class='del'>- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR</div><div class='del'>- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE</div><div class='del'>- * USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class='del'>- *</div><div class='del'>- * The above copyright notice and this permission notice (including the</div><div class='del'>- * next paragraph) shall be included in all copies or substantial portions</div><div class='del'>- * of the Software.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- **************************************************************************/</div><div class='del'>-/*</div><div class='del'>- * Simple memory manager interface that keeps track on allocate regions on a</div><div class='del'>- * per "owner" basis. All regions associated with an "owner" can be released</div><div class='del'>- * with a simple call. Typically if the "owner" exists. The owner is any</div><div class='del'>- * "unsigned long" identifier. Can typically be a pointer to a file private</div><div class='del'>- * struct or a context identifier.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- * Thomas Hellström &lt;thomas-at-tungstengraphics-dot-com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include "drm_sman.h"</div><div class='del'>-</div><div class='del'>-struct drm_owner_item {</div><div class='del'>-	struct drm_hash_item owner_hash;</div><div class='del'>-	struct list_head sman_list;</div><div class='del'>-	struct list_head mem_blocks;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void drm_sman_takedown(struct drm_sman * sman)</div><div class='del'>-{</div><div class='del'>-	drm_ht_remove(&amp;sman-&gt;user_hash_tab);</div><div class='del'>-	drm_ht_remove(&amp;sman-&gt;owner_hash_tab);</div><div class='del'>-	kfree(sman-&gt;mm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(drm_sman_takedown);</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-drm_sman_init(struct drm_sman * sman, unsigned int num_managers,</div><div class='del'>-	      unsigned int user_order, unsigned int owner_order)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	sman-&gt;mm = kcalloc(num_managers, sizeof(*sman-&gt;mm), GFP_KERNEL);</div><div class='del'>-	if (!sman-&gt;mm) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	sman-&gt;num_managers = num_managers;</div><div class='del'>-	INIT_LIST_HEAD(&amp;sman-&gt;owner_items);</div><div class='del'>-	ret = drm_ht_create(&amp;sman-&gt;owner_hash_tab, owner_order);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out1;</div><div class='del'>-	ret = drm_ht_create(&amp;sman-&gt;user_hash_tab, user_order);</div><div class='del'>-	if (!ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	drm_ht_remove(&amp;sman-&gt;owner_hash_tab);</div><div class='del'>-out1:</div><div class='del'>-	kfree(sman-&gt;mm);</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(drm_sman_init);</div><div class='del'>-</div><div class='del'>-static void *drm_sman_mm_allocate(void *private, unsigned long size,</div><div class='del'>-				  unsigned alignment)</div><div class='del'>-{</div><div class='del'>-	struct drm_mm *mm = (struct drm_mm *) private;</div><div class='del'>-	struct drm_mm_node *tmp;</div><div class='del'>-</div><div class='del'>-	tmp = drm_mm_search_free(mm, size, alignment, 1);</div><div class='del'>-	if (!tmp) {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	tmp = drm_mm_get_block(tmp, size, alignment);</div><div class='del'>-	return tmp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void drm_sman_mm_free(void *private, void *ref)</div><div class='del'>-{</div><div class='del'>-	struct drm_mm_node *node = (struct drm_mm_node *) ref;</div><div class='del'>-</div><div class='del'>-	drm_mm_put_block(node);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void drm_sman_mm_destroy(void *private)</div><div class='del'>-{</div><div class='del'>-	struct drm_mm *mm = (struct drm_mm *) private;</div><div class='del'>-	drm_mm_takedown(mm);</div><div class='del'>-	kfree(mm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long drm_sman_mm_offset(void *private, void *ref)</div><div class='del'>-{</div><div class='del'>-	struct drm_mm_node *node = (struct drm_mm_node *) ref;</div><div class='del'>-	return node-&gt;start;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-drm_sman_set_range(struct drm_sman * sman, unsigned int manager,</div><div class='del'>-		   unsigned long start, unsigned long size)</div><div class='del'>-{</div><div class='del'>-	struct drm_sman_mm *sman_mm;</div><div class='del'>-	struct drm_mm *mm;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(manager &gt;= sman-&gt;num_managers);</div><div class='del'>-</div><div class='del'>-	sman_mm = &amp;sman-&gt;mm[manager];</div><div class='del'>-	mm = kzalloc(sizeof(*mm), GFP_KERNEL);</div><div class='del'>-	if (!mm) {</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	sman_mm-&gt;private = mm;</div><div class='del'>-	ret = drm_mm_init(mm, start, size);</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		kfree(mm);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sman_mm-&gt;allocate = drm_sman_mm_allocate;</div><div class='del'>-	sman_mm-&gt;free = drm_sman_mm_free;</div><div class='del'>-	sman_mm-&gt;destroy = drm_sman_mm_destroy;</div><div class='del'>-	sman_mm-&gt;offset = drm_sman_mm_offset;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(drm_sman_set_range);</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-drm_sman_set_manager(struct drm_sman * sman, unsigned int manager,</div><div class='del'>-		     struct drm_sman_mm * allocator)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(manager &gt;= sman-&gt;num_managers);</div><div class='del'>-	sman-&gt;mm[manager] = *allocator;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(drm_sman_set_manager);</div><div class='del'>-</div><div class='del'>-static struct drm_owner_item *drm_sman_get_owner_item(struct drm_sman * sman,</div><div class='del'>-						 unsigned long owner)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct drm_hash_item *owner_hash_item;</div><div class='del'>-	struct drm_owner_item *owner_item;</div><div class='del'>-</div><div class='del'>-	ret = drm_ht_find_item(&amp;sman-&gt;owner_hash_tab, owner, &amp;owner_hash_item);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		return drm_hash_entry(owner_hash_item, struct drm_owner_item,</div><div class='del'>-				      owner_hash);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	owner_item = kzalloc(sizeof(*owner_item), GFP_KERNEL);</div><div class='del'>-	if (!owner_item)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;owner_item-&gt;mem_blocks);</div><div class='del'>-	owner_item-&gt;owner_hash.key = owner;</div><div class='del'>-	if (drm_ht_insert_item(&amp;sman-&gt;owner_hash_tab, &amp;owner_item-&gt;owner_hash))</div><div class='del'>-		goto out1;</div><div class='del'>-</div><div class='del'>-	list_add_tail(&amp;owner_item-&gt;sman_list, &amp;sman-&gt;owner_items);</div><div class='del'>-	return owner_item;</div><div class='del'>-</div><div class='del'>-out1:</div><div class='del'>-	kfree(owner_item);</div><div class='del'>-out:</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct drm_memblock_item *drm_sman_alloc(struct drm_sman *sman, unsigned int manager,</div><div class='del'>-				    unsigned long size, unsigned alignment,</div><div class='del'>-				    unsigned long owner)</div><div class='del'>-{</div><div class='del'>-	void *tmp;</div><div class='del'>-	struct drm_sman_mm *sman_mm;</div><div class='del'>-	struct drm_owner_item *owner_item;</div><div class='del'>-	struct drm_memblock_item *memblock;</div><div class='del'>-</div><div class='del'>-	BUG_ON(manager &gt;= sman-&gt;num_managers);</div><div class='del'>-</div><div class='del'>-	sman_mm = &amp;sman-&gt;mm[manager];</div><div class='del'>-	tmp = sman_mm-&gt;allocate(sman_mm-&gt;private, size, alignment);</div><div class='del'>-</div><div class='del'>-	if (!tmp) {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memblock = kzalloc(sizeof(*memblock), GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!memblock)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	memblock-&gt;mm_info = tmp;</div><div class='del'>-	memblock-&gt;mm = sman_mm;</div><div class='del'>-	memblock-&gt;sman = sman;</div><div class='del'>-</div><div class='del'>-	if (drm_ht_just_insert_please</div><div class='del'>-	    (&amp;sman-&gt;user_hash_tab, &amp;memblock-&gt;user_hash,</div><div class='del'>-	     (unsigned long)memblock, 32, 0, 0))</div><div class='del'>-		goto out1;</div><div class='del'>-</div><div class='del'>-	owner_item = drm_sman_get_owner_item(sman, owner);</div><div class='del'>-	if (!owner_item)</div><div class='del'>-		goto out2;</div><div class='del'>-</div><div class='del'>-	list_add_tail(&amp;memblock-&gt;owner_list, &amp;owner_item-&gt;mem_blocks);</div><div class='del'>-</div><div class='del'>-	return memblock;</div><div class='del'>-</div><div class='del'>-out2:</div><div class='del'>-	drm_ht_remove_item(&amp;sman-&gt;user_hash_tab, &amp;memblock-&gt;user_hash);</div><div class='del'>-out1:</div><div class='del'>-	kfree(memblock);</div><div class='del'>-out:</div><div class='del'>-	sman_mm-&gt;free(sman_mm-&gt;private, tmp);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(drm_sman_alloc);</div><div class='del'>-</div><div class='del'>-static void drm_sman_free(struct drm_memblock_item *item)</div><div class='del'>-{</div><div class='del'>-	struct drm_sman *sman = item-&gt;sman;</div><div class='del'>-</div><div class='del'>-	list_del(&amp;item-&gt;owner_list);</div><div class='del'>-	drm_ht_remove_item(&amp;sman-&gt;user_hash_tab, &amp;item-&gt;user_hash);</div><div class='del'>-	item-&gt;mm-&gt;free(item-&gt;mm-&gt;private, item-&gt;mm_info);</div><div class='del'>-	kfree(item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int drm_sman_free_key(struct drm_sman *sman, unsigned int key)</div><div class='del'>-{</div><div class='del'>-	struct drm_hash_item *hash_item;</div><div class='del'>-	struct drm_memblock_item *memblock_item;</div><div class='del'>-</div><div class='del'>-	if (drm_ht_find_item(&amp;sman-&gt;user_hash_tab, key, &amp;hash_item))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	memblock_item = drm_hash_entry(hash_item, struct drm_memblock_item,</div><div class='del'>-				       user_hash);</div><div class='del'>-	drm_sman_free(memblock_item);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(drm_sman_free_key);</div><div class='del'>-</div><div class='del'>-static void drm_sman_remove_owner(struct drm_sman *sman,</div><div class='del'>-				  struct drm_owner_item *owner_item)</div><div class='del'>-{</div><div class='del'>-	list_del(&amp;owner_item-&gt;sman_list);</div><div class='del'>-	drm_ht_remove_item(&amp;sman-&gt;owner_hash_tab, &amp;owner_item-&gt;owner_hash);</div><div class='del'>-	kfree(owner_item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int drm_sman_owner_clean(struct drm_sman *sman, unsigned long owner)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	struct drm_hash_item *hash_item;</div><div class='del'>-	struct drm_owner_item *owner_item;</div><div class='del'>-</div><div class='del'>-	if (drm_ht_find_item(&amp;sman-&gt;owner_hash_tab, owner, &amp;hash_item)) {</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	owner_item = drm_hash_entry(hash_item, struct drm_owner_item, owner_hash);</div><div class='del'>-	if (owner_item-&gt;mem_blocks.next == &amp;owner_item-&gt;mem_blocks) {</div><div class='del'>-		drm_sman_remove_owner(sman, owner_item);</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'>-EXPORT_SYMBOL(drm_sman_owner_clean);</div><div class='del'>-</div><div class='del'>-static void drm_sman_do_owner_cleanup(struct drm_sman *sman,</div><div class='del'>-				      struct drm_owner_item *owner_item)</div><div class='del'>-{</div><div class='del'>-	struct drm_memblock_item *entry, *next;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(entry, next, &amp;owner_item-&gt;mem_blocks,</div><div class='del'>-				 owner_list) {</div><div class='del'>-		drm_sman_free(entry);</div><div class='del'>-	}</div><div class='del'>-	drm_sman_remove_owner(sman, owner_item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void drm_sman_owner_cleanup(struct drm_sman *sman, unsigned long owner)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	struct drm_hash_item *hash_item;</div><div class='del'>-	struct drm_owner_item *owner_item;</div><div class='del'>-</div><div class='del'>-	if (drm_ht_find_item(&amp;sman-&gt;owner_hash_tab, owner, &amp;hash_item)) {</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	owner_item = drm_hash_entry(hash_item, struct drm_owner_item, owner_hash);</div><div class='del'>-	drm_sman_do_owner_cleanup(sman, owner_item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(drm_sman_owner_cleanup);</div><div class='del'>-</div><div class='del'>-void drm_sman_cleanup(struct drm_sman *sman)</div><div class='del'>-{</div><div class='del'>-	struct drm_owner_item *entry, *next;</div><div class='del'>-	unsigned int i;</div><div class='del'>-	struct drm_sman_mm *sman_mm;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(entry, next, &amp;sman-&gt;owner_items, sman_list) {</div><div class='del'>-		drm_sman_do_owner_cleanup(sman, entry);</div><div class='del'>-	}</div><div class='del'>-	if (sman-&gt;mm) {</div><div class='del'>-		for (i = 0; i &lt; sman-&gt;num_managers; ++i) {</div><div class='del'>-			sman_mm = &amp;sman-&gt;mm[i];</div><div class='del'>-			if (sman_mm-&gt;private) {</div><div class='del'>-				sman_mm-&gt;destroy(sman_mm-&gt;private);</div><div class='del'>-				sman_mm-&gt;private = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(drm_sman_cleanup);</div><div class='head'>diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c<br/>index 0f9ef9bf6730..62c3675045ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_sysfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/drm_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/drm_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/drm_sysfs.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@ static int drm_class_resume(struct device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char *drm_devnode(struct device *dev, mode_t *mode)</div><div class='add'>+static char *drm_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	return kasprintf(GFP_KERNEL, "dri/%s", dev_name(dev));</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig<br/>index 847466aab435..f9aaa56eae07 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/Kconfig</a></div><div class='hunk'>@@ -18,3 +18,10 @@ config DRM_EXYNOS_FIMD</div><div class='ctx'> 	help</div><div class='ctx'> 	  Choose this option if you want to use Exynos FIMD for DRM.</div><div class='ctx'> 	  If M is selected, the module will be called exynos_drm_fimd</div><div class='add'>+</div><div class='add'>+config DRM_EXYNOS_HDMI</div><div class='add'>+	tristate "Exynos DRM HDMI"</div><div class='add'>+	depends on DRM_EXYNOS</div><div class='add'>+	help</div><div class='add'>+	  Choose this option if you want to use Exynos HDMI for DRM.</div><div class='add'>+	  If M is selected, the module will be called exynos_drm_hdmi</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/Makefile b/drivers/gpu/drm/exynos/Makefile<br/>index 0496d3ff2683..395e69c9a96e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/Makefile</a></div><div class='hunk'>@@ -5,7 +5,10 @@</div><div class='ctx'> ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/exynos</div><div class='ctx'> exynosdrm-y := exynos_drm_drv.o exynos_drm_encoder.o exynos_drm_connector.o \</div><div class='ctx'> 		exynos_drm_crtc.o exynos_drm_fbdev.o exynos_drm_fb.o \</div><div class='del'>-		exynos_drm_buf.o exynos_drm_gem.o exynos_drm_core.o</div><div class='add'>+		exynos_drm_buf.o exynos_drm_gem.o exynos_drm_core.o \</div><div class='add'>+		exynos_drm_plane.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_DRM_EXYNOS) += exynosdrm.o</div><div class='ctx'> obj-$(CONFIG_DRM_EXYNOS_FIMD) += exynos_drm_fimd.o</div><div class='add'>+obj-$(CONFIG_DRM_EXYNOS_HDMI) += exynos_hdmi.o exynos_mixer.o exynos_ddc.o \</div><div class='add'>+				 exynos_hdmiphy.o exynos_drm_hdmi.o</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_ddc.c b/drivers/gpu/drm/exynos/exynos_ddc.c<br/>new file mode 100644<br/>index 000000000000..84b614fe26fd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_ddc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_ddc.c</a></div><div class='hunk'>@@ -0,0 +1,58 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2011 Samsung Electronics Co.Ltd</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Seung-Woo Kim &lt;sw0312.kim@samsung.com&gt;</div><div class='add'>+ *	Inki Dae &lt;inki.dae@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.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'>+</div><div class='add'>+</div><div class='add'>+#include "exynos_drm_drv.h"</div><div class='add'>+#include "exynos_hdmi.h"</div><div class='add'>+</div><div class='add'>+static int s5p_ddc_probe(struct i2c_client *client,</div><div class='add'>+			const struct i2c_device_id *dev_id)</div><div class='add'>+{</div><div class='add'>+	hdmi_attach_ddc_client(client);</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;client-&gt;adapter-&gt;dev, "attached s5p_ddc "</div><div class='add'>+		"into i2c adapter successfully\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_ddc_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	dev_info(&amp;client-&gt;adapter-&gt;dev, "detached s5p_ddc "</div><div class='add'>+		"from i2c adapter successfully\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_device_id ddc_idtable[] = {</div><div class='add'>+	{"s5p_ddc", 0},</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct i2c_driver ddc_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "s5p_ddc",</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.id_table	= ddc_idtable,</div><div class='add'>+	.probe		= s5p_ddc_probe,</div><div class='add'>+	.remove		= __devexit_p(s5p_ddc_remove),</div><div class='add'>+	.command		= NULL,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(ddc_driver);</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_drm_buf.c b/drivers/gpu/drm/exynos/exynos_drm_buf.c<br/>index 2bb07bca511a..3cf785c58186 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_buf.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_buf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_buf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_drm_buf.c</a></div><div class='hunk'>@@ -73,7 +73,7 @@ struct exynos_drm_gem_buf *exynos_drm_buf_create(struct drm_device *dev,</div><div class='ctx'> 	buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);</div><div class='ctx'> 	if (!buffer) {</div><div class='ctx'> 		DRM_ERROR("failed to allocate exynos_drm_gem_buf.\n");</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	buffer-&gt;size = size;</div><div class='hunk'>@@ -84,8 +84,7 @@ struct exynos_drm_gem_buf *exynos_drm_buf_create(struct drm_device *dev,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (lowlevel_buffer_allocate(dev, buffer) &lt; 0) {</div><div class='ctx'> 		kfree(buffer);</div><div class='del'>-		buffer = NULL;</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return buffer;</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_drm_buf.h b/drivers/gpu/drm/exynos/exynos_drm_buf.h<br/>index 6e91f9caa5db..c913f2bad760 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_buf.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_buf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_buf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_drm_buf.h</a></div><div class='hunk'>@@ -30,9 +30,6 @@</div><div class='ctx'> struct exynos_drm_gem_buf *exynos_drm_buf_create(struct drm_device *dev,</div><div class='ctx'> 		unsigned int size);</div><div class='ctx'> </div><div class='del'>-/* get memory information of a drm framebuffer. */</div><div class='del'>-struct exynos_drm_gem_buf *exynos_drm_fb_get_buf(struct drm_framebuffer *fb);</div><div class='del'>-</div><div class='ctx'> /* remove allocated physical memory. */</div><div class='ctx'> void exynos_drm_buf_destroy(struct drm_device *dev,</div><div class='ctx'> 		struct exynos_drm_gem_buf *buffer);</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c<br/>index ee43cc220853..e3861ac49295 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_crtc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_crtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_crtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_drm_crtc.c</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'> #include "exynos_drm_fb.h"</div><div class='ctx'> #include "exynos_drm_encoder.h"</div><div class='ctx'> #include "exynos_drm_gem.h"</div><div class='del'>-#include "exynos_drm_buf.h"</div><div class='ctx'> </div><div class='ctx'> #define to_exynos_crtc(x)	container_of(x, struct exynos_drm_crtc,\</div><div class='ctx'> 				drm_crtc)</div><div class='hunk'>@@ -52,11 +51,13 @@</div><div class='ctx'>  *	drm framework doesn't support multiple irq yet.</div><div class='ctx'>  *	we can refer to the crtc to current hardware interrupt occured through</div><div class='ctx'>  *	this pipe value.</div><div class='add'>+ * @dpms: store the crtc dpms value</div><div class='ctx'>  */</div><div class='ctx'> struct exynos_drm_crtc {</div><div class='ctx'> 	struct drm_crtc			drm_crtc;</div><div class='ctx'> 	struct exynos_drm_overlay	overlay;</div><div class='ctx'> 	unsigned int			pipe;</div><div class='add'>+	unsigned int			dpms;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void exynos_drm_crtc_apply(struct drm_crtc *crtc)</div><div class='hunk'>@@ -78,19 +79,23 @@ int exynos_drm_overlay_update(struct exynos_drm_overlay *overlay,</div><div class='ctx'> 	struct exynos_drm_gem_buf *buffer;</div><div class='ctx'> 	unsigned int actual_w;</div><div class='ctx'> 	unsigned int actual_h;</div><div class='add'>+	int nr = exynos_drm_format_num_buffers(fb-&gt;pixel_format);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nr; i++) {</div><div class='add'>+		buffer = exynos_drm_fb_buffer(fb, i);</div><div class='add'>+		if (!buffer) {</div><div class='add'>+			DRM_LOG_KMS("buffer is null\n");</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	buffer = exynos_drm_fb_get_buf(fb);</div><div class='del'>-	if (!buffer) {</div><div class='del'>-		DRM_LOG_KMS("buffer is null.\n");</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	overlay-&gt;dma_addr = buffer-&gt;dma_addr;</div><div class='del'>-	overlay-&gt;vaddr = buffer-&gt;kvaddr;</div><div class='add'>+		overlay-&gt;dma_addr[i] = buffer-&gt;dma_addr;</div><div class='add'>+		overlay-&gt;vaddr[i] = buffer-&gt;kvaddr;</div><div class='ctx'> </div><div class='del'>-	DRM_DEBUG_KMS("vaddr = 0x%lx, dma_addr = 0x%lx\n",</div><div class='del'>-			(unsigned long)overlay-&gt;vaddr,</div><div class='del'>-			(unsigned long)overlay-&gt;dma_addr);</div><div class='add'>+		DRM_DEBUG_KMS("buffer: %d, vaddr = 0x%lx, dma_addr = 0x%lx\n",</div><div class='add'>+				i, (unsigned long)overlay-&gt;vaddr[i],</div><div class='add'>+				(unsigned long)overlay-&gt;dma_addr[i]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	actual_w = min((mode-&gt;hdisplay - pos-&gt;crtc_x), pos-&gt;crtc_w);</div><div class='ctx'> 	actual_h = min((mode-&gt;vdisplay - pos-&gt;crtc_y), pos-&gt;crtc_h);</div><div class='hunk'>@@ -101,7 +106,8 @@ int exynos_drm_overlay_update(struct exynos_drm_overlay *overlay,</div><div class='ctx'> 	overlay-&gt;fb_width = fb-&gt;width;</div><div class='ctx'> 	overlay-&gt;fb_height = fb-&gt;height;</div><div class='ctx'> 	overlay-&gt;bpp = fb-&gt;bits_per_pixel;</div><div class='del'>-	overlay-&gt;pitch = fb-&gt;pitch;</div><div class='add'>+	overlay-&gt;pitch = fb-&gt;pitches[0];</div><div class='add'>+	overlay-&gt;pixel_format = fb-&gt;pixel_format;</div><div class='ctx'> </div><div class='ctx'> 	/* set overlay range to be displayed. */</div><div class='ctx'> 	overlay-&gt;crtc_x = pos-&gt;crtc_x;</div><div class='hunk'>@@ -153,26 +159,37 @@ static int exynos_drm_crtc_update(struct drm_crtc *crtc)</div><div class='ctx'> </div><div class='ctx'> static void exynos_drm_crtc_dpms(struct drm_crtc *crtc, int mode)</div><div class='ctx'> {</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='ctx'> 	struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("crtc[%d] mode[%d]\n", crtc-&gt;base.id, mode);</div><div class='ctx'> </div><div class='add'>+	if (exynos_crtc-&gt;dpms == mode) {</div><div class='add'>+		DRM_DEBUG_KMS("desired dpms mode is same as previous one.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case DRM_MODE_DPMS_ON:</div><div class='del'>-		exynos_drm_fn_encoder(crtc, &amp;exynos_crtc-&gt;pipe,</div><div class='del'>-				exynos_drm_encoder_crtc_commit);</div><div class='add'>+		exynos_drm_fn_encoder(crtc, &amp;mode,</div><div class='add'>+				exynos_drm_encoder_crtc_dpms);</div><div class='add'>+		exynos_crtc-&gt;dpms = mode;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DRM_MODE_DPMS_STANDBY:</div><div class='ctx'> 	case DRM_MODE_DPMS_SUSPEND:</div><div class='ctx'> 	case DRM_MODE_DPMS_OFF:</div><div class='del'>-		/* TODO */</div><div class='del'>-		exynos_drm_fn_encoder(crtc, NULL,</div><div class='del'>-				exynos_drm_encoder_crtc_disable);</div><div class='add'>+		exynos_drm_fn_encoder(crtc, &amp;mode,</div><div class='add'>+				exynos_drm_encoder_crtc_dpms);</div><div class='add'>+		exynos_crtc-&gt;dpms = mode;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		DRM_DEBUG_KMS("unspecified mode %d\n", mode);</div><div class='add'>+		DRM_ERROR("unspecified mode %d\n", mode);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void exynos_drm_crtc_prepare(struct drm_crtc *crtc)</div><div class='hunk'>@@ -188,6 +205,28 @@ static void exynos_drm_crtc_commit(struct drm_crtc *crtc)</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * when set_crtc is requested from user or at booting time,</div><div class='add'>+	 * crtc-&gt;commit would be called without dpms call so if dpms is</div><div class='add'>+	 * no power on then crtc-&gt;dpms should be called</div><div class='add'>+	 * with DRM_MODE_DPMS_ON for the hardware power to be on.</div><div class='add'>+	 */</div><div class='add'>+	if (exynos_crtc-&gt;dpms != DRM_MODE_DPMS_ON) {</div><div class='add'>+		int mode = DRM_MODE_DPMS_ON;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * enable hardware(power on) to all encoders hdmi connected</div><div class='add'>+		 * to current crtc.</div><div class='add'>+		 */</div><div class='add'>+		exynos_drm_crtc_dpms(crtc, mode);</div><div class='add'>+		/*</div><div class='add'>+		 * enable dma to all encoders connected to current crtc and</div><div class='add'>+		 * lcd panel.</div><div class='add'>+		 */</div><div class='add'>+		exynos_drm_fn_encoder(crtc, &amp;mode,</div><div class='add'>+					exynos_drm_encoder_dpms_from_crtc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	exynos_drm_fn_encoder(crtc, &amp;exynos_crtc-&gt;pipe,</div><div class='ctx'> 			exynos_drm_encoder_crtc_commit);</div><div class='ctx'> }</div><div class='hunk'>@@ -344,6 +383,8 @@ int exynos_drm_crtc_create(struct drm_device *dev, unsigned int nr)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	exynos_crtc-&gt;pipe = nr;</div><div class='add'>+	exynos_crtc-&gt;dpms = DRM_MODE_DPMS_OFF;</div><div class='add'>+	exynos_crtc-&gt;overlay.zpos = DEFAULT_ZPOS;</div><div class='ctx'> 	crtc = &amp;exynos_crtc-&gt;drm_crtc;</div><div class='ctx'> </div><div class='ctx'> 	private-&gt;crtc[nr] = crtc;</div><div class='hunk'>@@ -357,9 +398,14 @@ int exynos_drm_crtc_create(struct drm_device *dev, unsigned int nr)</div><div class='ctx'> int exynos_drm_crtc_enable_vblank(struct drm_device *dev, int crtc)</div><div class='ctx'> {</div><div class='ctx'> 	struct exynos_drm_private *private = dev-&gt;dev_private;</div><div class='add'>+	struct exynos_drm_crtc *exynos_crtc =</div><div class='add'>+		to_exynos_crtc(private-&gt;crtc[crtc]);</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='add'>+	if (exynos_crtc-&gt;dpms != DRM_MODE_DPMS_ON)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='ctx'> 	exynos_drm_fn_encoder(private-&gt;crtc[crtc], &amp;crtc,</div><div class='ctx'> 			exynos_drm_enable_vblank);</div><div class='ctx'> </div><div class='hunk'>@@ -369,9 +415,14 @@ int exynos_drm_crtc_enable_vblank(struct drm_device *dev, int crtc)</div><div class='ctx'> void exynos_drm_crtc_disable_vblank(struct drm_device *dev, int crtc)</div><div class='ctx'> {</div><div class='ctx'> 	struct exynos_drm_private *private = dev-&gt;dev_private;</div><div class='add'>+	struct exynos_drm_crtc *exynos_crtc =</div><div class='add'>+		to_exynos_crtc(private-&gt;crtc[crtc]);</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='add'>+	if (exynos_crtc-&gt;dpms != DRM_MODE_DPMS_ON)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	exynos_drm_fn_encoder(private-&gt;crtc[crtc], &amp;crtc,</div><div class='ctx'> 			exynos_drm_disable_vblank);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c<br/>index 53e2216de61d..35889ca255e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_drm_drv.c</a></div><div class='hunk'>@@ -36,13 +36,16 @@</div><div class='ctx'> #include "exynos_drm_fbdev.h"</div><div class='ctx'> #include "exynos_drm_fb.h"</div><div class='ctx'> #include "exynos_drm_gem.h"</div><div class='add'>+#include "exynos_drm_plane.h"</div><div class='ctx'> </div><div class='del'>-#define DRIVER_NAME	"exynos-drm"</div><div class='add'>+#define DRIVER_NAME	"exynos"</div><div class='ctx'> #define DRIVER_DESC	"Samsung SoC DRM"</div><div class='ctx'> #define DRIVER_DATE	"20110530"</div><div class='ctx'> #define DRIVER_MAJOR	1</div><div class='ctx'> #define DRIVER_MINOR	0</div><div class='ctx'> </div><div class='add'>+#define VBLANK_OFF_DELAY	50000</div><div class='add'>+</div><div class='ctx'> static int exynos_drm_load(struct drm_device *dev, unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct exynos_drm_private *private;</div><div class='hunk'>@@ -77,6 +80,12 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags)</div><div class='ctx'> 			goto err_crtc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	for (nr = 0; nr &lt; MAX_PLANE; nr++) {</div><div class='add'>+		ret = exynos_plane_init(dev, nr);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_crtc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = drm_vblank_init(dev, MAX_CRTC);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_crtc;</div><div class='hunk'>@@ -100,6 +109,8 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags)</div><div class='ctx'> 		goto err_drm_device;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	drm_vblank_offdelay = VBLANK_OFF_DELAY;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_drm_device:</div><div class='hunk'>@@ -163,6 +174,18 @@ static struct drm_ioctl_desc exynos_ioctls[] = {</div><div class='ctx'> 			DRM_AUTH),</div><div class='ctx'> 	DRM_IOCTL_DEF_DRV(EXYNOS_GEM_MMAP,</div><div class='ctx'> 			exynos_drm_gem_mmap_ioctl, DRM_UNLOCKED | DRM_AUTH),</div><div class='add'>+	DRM_IOCTL_DEF_DRV(EXYNOS_PLANE_SET_ZPOS, exynos_plane_set_zpos_ioctl,</div><div class='add'>+			DRM_UNLOCKED | DRM_AUTH),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations exynos_drm_driver_fops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.open		= drm_open,</div><div class='add'>+	.mmap		= exynos_drm_gem_mmap,</div><div class='add'>+	.poll		= drm_poll,</div><div class='add'>+	.read		= drm_read,</div><div class='add'>+	.unlocked_ioctl	= drm_ioctl,</div><div class='add'>+	.release	= drm_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct drm_driver exynos_drm_driver = {</div><div class='hunk'>@@ -182,15 +205,7 @@ static struct drm_driver exynos_drm_driver = {</div><div class='ctx'> 	.dumb_map_offset	= exynos_drm_gem_dumb_map_offset,</div><div class='ctx'> 	.dumb_destroy		= exynos_drm_gem_dumb_destroy,</div><div class='ctx'> 	.ioctls			= exynos_ioctls,</div><div class='del'>-	.fops = {</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-		.open		= drm_open,</div><div class='del'>-		.mmap		= exynos_drm_gem_mmap,</div><div class='del'>-		.poll		= drm_poll,</div><div class='del'>-		.read		= drm_read,</div><div class='del'>-		.unlocked_ioctl	= drm_ioctl,</div><div class='del'>-		.release	= drm_release,</div><div class='del'>-	},</div><div class='add'>+	.fops			= &amp;exynos_drm_driver_fops,</div><div class='ctx'> 	.name	= DRIVER_NAME,</div><div class='ctx'> 	.desc	= DRIVER_DESC,</div><div class='ctx'> 	.date	= DRIVER_DATE,</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h<br/>index 5e02e6ecc2e0..e685e1e33055 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_drv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_drv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_drm_drv.h</a></div><div class='hunk'>@@ -33,11 +33,16 @@</div><div class='ctx'> #include "drm.h"</div><div class='ctx'> </div><div class='ctx'> #define MAX_CRTC	2</div><div class='add'>+#define MAX_PLANE	5</div><div class='add'>+#define MAX_FB_BUFFER	3</div><div class='add'>+#define DEFAULT_ZPOS	-1</div><div class='ctx'> </div><div class='ctx'> struct drm_device;</div><div class='ctx'> struct exynos_drm_overlay;</div><div class='ctx'> struct drm_connector;</div><div class='ctx'> </div><div class='add'>+extern unsigned int drm_vblank_offdelay;</div><div class='add'>+</div><div class='ctx'> /* this enumerates display type. */</div><div class='ctx'> enum exynos_drm_output_type {</div><div class='ctx'> 	EXYNOS_DISPLAY_TYPE_NONE,</div><div class='hunk'>@@ -57,8 +62,8 @@ enum exynos_drm_output_type {</div><div class='ctx'> struct exynos_drm_overlay_ops {</div><div class='ctx'> 	void (*mode_set)(struct device *subdrv_dev,</div><div class='ctx'> 			 struct exynos_drm_overlay *overlay);</div><div class='del'>-	void (*commit)(struct device *subdrv_dev);</div><div class='del'>-	void (*disable)(struct device *subdrv_dev);</div><div class='add'>+	void (*commit)(struct device *subdrv_dev, int zpos);</div><div class='add'>+	void (*disable)(struct device *subdrv_dev, int zpos);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -80,9 +85,11 @@ struct exynos_drm_overlay_ops {</div><div class='ctx'>  * @scan_flag: interlace or progressive way.</div><div class='ctx'>  *	(it could be DRM_MODE_FLAG_*)</div><div class='ctx'>  * @bpp: pixel size.(in bit)</div><div class='del'>- * @dma_addr: bus(accessed by dma) address to the memory region allocated</div><div class='del'>- *	for a overlay.</div><div class='del'>- * @vaddr: virtual memory addresss to this overlay.</div><div class='add'>+ * @pixel_format: fourcc pixel format of this overlay</div><div class='add'>+ * @dma_addr: array of bus(accessed by dma) address to the memory region</div><div class='add'>+ *	      allocated for a overlay.</div><div class='add'>+ * @vaddr: array of virtual memory addresss to this overlay.</div><div class='add'>+ * @zpos: order of overlay layer(z position).</div><div class='ctx'>  * @default_win: a window to be enabled.</div><div class='ctx'>  * @color_key: color key on or off.</div><div class='ctx'>  * @index_color: if using color key feature then this value would be used</div><div class='hunk'>@@ -109,8 +116,10 @@ struct exynos_drm_overlay {</div><div class='ctx'> 	unsigned int scan_flag;</div><div class='ctx'> 	unsigned int bpp;</div><div class='ctx'> 	unsigned int pitch;</div><div class='del'>-	dma_addr_t dma_addr;</div><div class='del'>-	void __iomem *vaddr;</div><div class='add'>+	uint32_t pixel_format;</div><div class='add'>+	dma_addr_t dma_addr[MAX_FB_BUFFER];</div><div class='add'>+	void __iomem *vaddr[MAX_FB_BUFFER];</div><div class='add'>+	int zpos;</div><div class='ctx'> </div><div class='ctx'> 	bool default_win;</div><div class='ctx'> 	bool color_key;</div><div class='hunk'>@@ -144,17 +153,19 @@ struct exynos_drm_display_ops {</div><div class='ctx'> /*</div><div class='ctx'>  * Exynos drm manager ops</div><div class='ctx'>  *</div><div class='add'>+ * @dpms: control device power.</div><div class='add'>+ * @apply: set timing, vblank and overlay data to registers.</div><div class='ctx'>  * @mode_set: convert drm_display_mode to hw specific display mode and</div><div class='ctx'>  *	      would be called by encoder-&gt;mode_set().</div><div class='ctx'>  * @commit: set current hw specific display mode to hw.</div><div class='del'>- * @disable: disable hardware specific display mode.</div><div class='ctx'>  * @enable_vblank: specific driver callback for enabling vblank interrupt.</div><div class='ctx'>  * @disable_vblank: specific driver callback for disabling vblank interrupt.</div><div class='ctx'>  */</div><div class='ctx'> struct exynos_drm_manager_ops {</div><div class='add'>+	void (*dpms)(struct device *subdrv_dev, int mode);</div><div class='add'>+	void (*apply)(struct device *subdrv_dev);</div><div class='ctx'> 	void (*mode_set)(struct device *subdrv_dev, void *mode);</div><div class='ctx'> 	void (*commit)(struct device *subdrv_dev);</div><div class='del'>-	void (*disable)(struct device *subdrv_dev);</div><div class='ctx'> 	int (*enable_vblank)(struct device *subdrv_dev);</div><div class='ctx'> 	void (*disable_vblank)(struct device *subdrv_dev);</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_drm_encoder.c b/drivers/gpu/drm/exynos/exynos_drm_encoder.c<br/>index 153061415baf..86b93dde219a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_encoder.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_encoder.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_encoder.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_drm_encoder.c</a></div><div class='hunk'>@@ -42,49 +42,68 @@</div><div class='ctx'>  * @drm_encoder: encoder object.</div><div class='ctx'>  * @manager: specific encoder has its own manager to control a hardware</div><div class='ctx'>  *	appropriately and we can access a hardware drawing on this manager.</div><div class='add'>+ * @dpms: store the encoder dpms value.</div><div class='ctx'>  */</div><div class='ctx'> struct exynos_drm_encoder {</div><div class='ctx'> 	struct drm_encoder		drm_encoder;</div><div class='ctx'> 	struct exynos_drm_manager	*manager;</div><div class='add'>+	int dpms;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void exynos_drm_encoder_dpms(struct drm_encoder *encoder, int mode)</div><div class='add'>+static void exynos_drm_display_power(struct drm_encoder *encoder, int mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_device *dev = encoder-&gt;dev;</div><div class='ctx'> 	struct drm_connector *connector;</div><div class='ctx'> 	struct exynos_drm_manager *manager = exynos_drm_get_manager(encoder);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(connector, &amp;dev-&gt;mode_config.connector_list, head) {</div><div class='add'>+		if (connector-&gt;encoder == encoder) {</div><div class='add'>+			struct exynos_drm_display_ops *display_ops =</div><div class='add'>+							manager-&gt;display_ops;</div><div class='add'>+</div><div class='add'>+			DRM_DEBUG_KMS("connector[%d] dpms[%d]\n",</div><div class='add'>+					connector-&gt;base.id, mode);</div><div class='add'>+			if (display_ops &amp;&amp; display_ops-&gt;power_on)</div><div class='add'>+				display_ops-&gt;power_on(manager-&gt;dev, mode);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void exynos_drm_encoder_dpms(struct drm_encoder *encoder, int mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct exynos_drm_manager *manager = exynos_drm_get_manager(encoder);</div><div class='ctx'> 	struct exynos_drm_manager_ops *manager_ops = manager-&gt;ops;</div><div class='add'>+	struct exynos_drm_encoder *exynos_encoder = to_exynos_encoder(encoder);</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("%s, encoder dpms: %d\n", __FILE__, mode);</div><div class='ctx'> </div><div class='add'>+	if (exynos_encoder-&gt;dpms == mode) {</div><div class='add'>+		DRM_DEBUG_KMS("desired dpms mode is same as previous one.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case DRM_MODE_DPMS_ON:</div><div class='del'>-		if (manager_ops &amp;&amp; manager_ops-&gt;commit)</div><div class='del'>-			manager_ops-&gt;commit(manager-&gt;dev);</div><div class='add'>+		if (manager_ops &amp;&amp; manager_ops-&gt;apply)</div><div class='add'>+			manager_ops-&gt;apply(manager-&gt;dev);</div><div class='add'>+		exynos_drm_display_power(encoder, mode);</div><div class='add'>+		exynos_encoder-&gt;dpms = mode;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DRM_MODE_DPMS_STANDBY:</div><div class='ctx'> 	case DRM_MODE_DPMS_SUSPEND:</div><div class='ctx'> 	case DRM_MODE_DPMS_OFF:</div><div class='del'>-		/* TODO */</div><div class='del'>-		if (manager_ops &amp;&amp; manager_ops-&gt;disable)</div><div class='del'>-			manager_ops-&gt;disable(manager-&gt;dev);</div><div class='add'>+		exynos_drm_display_power(encoder, mode);</div><div class='add'>+		exynos_encoder-&gt;dpms = mode;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		DRM_ERROR("unspecified mode %d\n", mode);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(connector, &amp;dev-&gt;mode_config.connector_list, head) {</div><div class='del'>-		if (connector-&gt;encoder == encoder) {</div><div class='del'>-			struct exynos_drm_display_ops *display_ops =</div><div class='del'>-							manager-&gt;display_ops;</div><div class='del'>-</div><div class='del'>-			DRM_DEBUG_KMS("connector[%d] dpms[%d]\n",</div><div class='del'>-					connector-&gt;base.id, mode);</div><div class='del'>-			if (display_ops &amp;&amp; display_ops-&gt;power_on)</div><div class='del'>-				display_ops-&gt;power_on(manager-&gt;dev, mode);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='hunk'>@@ -169,7 +188,6 @@ static void exynos_drm_encoder_destroy(struct drm_encoder *encoder)</div><div class='ctx'> 	exynos_encoder-&gt;manager-&gt;pipe = -1;</div><div class='ctx'> </div><div class='ctx'> 	drm_encoder_cleanup(encoder);</div><div class='del'>-	encoder-&gt;dev-&gt;mode_config.num_encoder--;</div><div class='ctx'> 	kfree(exynos_encoder);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -199,6 +217,7 @@ exynos_drm_encoder_create(struct drm_device *dev,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	exynos_encoder-&gt;dpms = DRM_MODE_DPMS_OFF;</div><div class='ctx'> 	exynos_encoder-&gt;manager = manager;</div><div class='ctx'> 	encoder = &amp;exynos_encoder-&gt;drm_encoder;</div><div class='ctx'> 	encoder-&gt;possible_crtcs = possible_crtcs;</div><div class='hunk'>@@ -275,12 +294,27 @@ void exynos_drm_disable_vblank(struct drm_encoder *encoder, void *data)</div><div class='ctx'> 		manager_ops-&gt;disable_vblank(manager-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void exynos_drm_encoder_crtc_commit(struct drm_encoder *encoder, void *data)</div><div class='add'>+void exynos_drm_encoder_crtc_plane_commit(struct drm_encoder *encoder,</div><div class='add'>+					  void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct exynos_drm_manager *manager =</div><div class='ctx'> 		to_exynos_encoder(encoder)-&gt;manager;</div><div class='ctx'> 	struct exynos_drm_overlay_ops *overlay_ops = manager-&gt;overlay_ops;</div><div class='add'>+	int zpos = DEFAULT_ZPOS;</div><div class='add'>+</div><div class='add'>+	if (data)</div><div class='add'>+		zpos = *(int *)data;</div><div class='add'>+</div><div class='add'>+	if (overlay_ops &amp;&amp; overlay_ops-&gt;commit)</div><div class='add'>+		overlay_ops-&gt;commit(manager-&gt;dev, zpos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void exynos_drm_encoder_crtc_commit(struct drm_encoder *encoder, void *data)</div><div class='add'>+{</div><div class='add'>+	struct exynos_drm_manager *manager =</div><div class='add'>+		to_exynos_encoder(encoder)-&gt;manager;</div><div class='ctx'> 	int crtc = *(int *)data;</div><div class='add'>+	int zpos = DEFAULT_ZPOS;</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='hunk'>@@ -290,8 +324,53 @@ void exynos_drm_encoder_crtc_commit(struct drm_encoder *encoder, void *data)</div><div class='ctx'> 	 */</div><div class='ctx'> 	manager-&gt;pipe = crtc;</div><div class='ctx'> </div><div class='del'>-	if (overlay_ops &amp;&amp; overlay_ops-&gt;commit)</div><div class='del'>-		overlay_ops-&gt;commit(manager-&gt;dev);</div><div class='add'>+	exynos_drm_encoder_crtc_plane_commit(encoder, &amp;zpos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void exynos_drm_encoder_dpms_from_crtc(struct drm_encoder *encoder, void *data)</div><div class='add'>+{</div><div class='add'>+	struct exynos_drm_encoder *exynos_encoder = to_exynos_encoder(encoder);</div><div class='add'>+	int mode = *(int *)data;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	exynos_drm_encoder_dpms(encoder, mode);</div><div class='add'>+</div><div class='add'>+	exynos_encoder-&gt;dpms = mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void exynos_drm_encoder_crtc_dpms(struct drm_encoder *encoder, void *data)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct exynos_drm_encoder *exynos_encoder = to_exynos_encoder(encoder);</div><div class='add'>+	struct exynos_drm_manager *manager = exynos_encoder-&gt;manager;</div><div class='add'>+	struct exynos_drm_manager_ops *manager_ops = manager-&gt;ops;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+	int mode = *(int *)data;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	if (manager_ops &amp;&amp; manager_ops-&gt;dpms)</div><div class='add'>+		manager_ops-&gt;dpms(manager-&gt;dev, mode);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * set current dpms mode to the connector connected to</div><div class='add'>+	 * current encoder. connector-&gt;dpms would be checked</div><div class='add'>+	 * at drm_helper_connector_dpms()</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry(connector, &amp;dev-&gt;mode_config.connector_list, head)</div><div class='add'>+		if (connector-&gt;encoder == encoder)</div><div class='add'>+			connector-&gt;dpms = mode;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if this condition is ok then it means that the crtc is already</div><div class='add'>+	 * detached from encoder and last function for detaching is properly</div><div class='add'>+	 * done, so clear pipe from manager to prevent repeated call.</div><div class='add'>+	 */</div><div class='add'>+	if (mode &gt; DRM_MODE_DPMS_ON) {</div><div class='add'>+		if (!encoder-&gt;crtc)</div><div class='add'>+			manager-&gt;pipe = -1;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void exynos_drm_encoder_crtc_mode_set(struct drm_encoder *encoder, void *data)</div><div class='hunk'>@@ -310,19 +389,15 @@ void exynos_drm_encoder_crtc_disable(struct drm_encoder *encoder, void *data)</div><div class='ctx'> 	struct exynos_drm_manager *manager =</div><div class='ctx'> 		to_exynos_encoder(encoder)-&gt;manager;</div><div class='ctx'> 	struct exynos_drm_overlay_ops *overlay_ops = manager-&gt;overlay_ops;</div><div class='add'>+	int zpos = DEFAULT_ZPOS;</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("\n");</div><div class='ctx'> </div><div class='del'>-	if (overlay_ops &amp;&amp; overlay_ops-&gt;disable)</div><div class='del'>-		overlay_ops-&gt;disable(manager-&gt;dev);</div><div class='add'>+	if (data)</div><div class='add'>+		zpos = *(int *)data;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * crtc is already detached from encoder and last</div><div class='del'>-	 * function for detaching is properly done, so</div><div class='del'>-	 * clear pipe from manager to prevent repeated call</div><div class='del'>-	 */</div><div class='del'>-	if (!encoder-&gt;crtc)</div><div class='del'>-		manager-&gt;pipe = -1;</div><div class='add'>+	if (overlay_ops &amp;&amp; overlay_ops-&gt;disable)</div><div class='add'>+		overlay_ops-&gt;disable(manager-&gt;dev, zpos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Inki Dae &lt;inki.dae@samsung.com&gt;");</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_drm_encoder.h b/drivers/gpu/drm/exynos/exynos_drm_encoder.h<br/>index a22acfbf0e4e..97b087a51cb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_encoder.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_encoder.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_encoder.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_drm_encoder.h</a></div><div class='hunk'>@@ -39,7 +39,12 @@ void exynos_drm_fn_encoder(struct drm_crtc *crtc, void *data,</div><div class='ctx'> 			    void (*fn)(struct drm_encoder *, void *));</div><div class='ctx'> void exynos_drm_enable_vblank(struct drm_encoder *encoder, void *data);</div><div class='ctx'> void exynos_drm_disable_vblank(struct drm_encoder *encoder, void *data);</div><div class='add'>+void exynos_drm_encoder_crtc_plane_commit(struct drm_encoder *encoder,</div><div class='add'>+					  void *data);</div><div class='ctx'> void exynos_drm_encoder_crtc_commit(struct drm_encoder *encoder, void *data);</div><div class='add'>+void exynos_drm_encoder_dpms_from_crtc(struct drm_encoder *encoder,</div><div class='add'>+					void *data);</div><div class='add'>+void exynos_drm_encoder_crtc_dpms(struct drm_encoder *encoder, void *data);</div><div class='ctx'> void exynos_drm_encoder_crtc_mode_set(struct drm_encoder *encoder, void *data);</div><div class='ctx'> void exynos_drm_encoder_crtc_disable(struct drm_encoder *encoder, void *data);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c<br/>index 5bf4a1ac7f82..3733fe6723d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_fb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_drm_fb.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "exynos_drm_drv.h"</div><div class='ctx'> #include "exynos_drm_fb.h"</div><div class='del'>-#include "exynos_drm_buf.h"</div><div class='ctx'> #include "exynos_drm_gem.h"</div><div class='ctx'> </div><div class='ctx'> #define to_exynos_fb(x)	container_of(x, struct exynos_drm_fb, fb)</div><div class='hunk'>@@ -42,15 +41,11 @@</div><div class='ctx'>  * exynos specific framebuffer structure.</div><div class='ctx'>  *</div><div class='ctx'>  * @fb: drm framebuffer obejct.</div><div class='del'>- * @exynos_gem_obj: exynos specific gem object containing a gem object.</div><div class='del'>- * @buffer: pointer to exynos_drm_gem_buffer object.</div><div class='del'>- *	- contain the memory information to memory region allocated</div><div class='del'>- *	at default framebuffer creation.</div><div class='add'>+ * @exynos_gem_obj: array of exynos specific gem object containing a gem object.</div><div class='ctx'>  */</div><div class='ctx'> struct exynos_drm_fb {</div><div class='ctx'> 	struct drm_framebuffer		fb;</div><div class='del'>-	struct exynos_drm_gem_obj	*exynos_gem_obj;</div><div class='del'>-	struct exynos_drm_gem_buf	*buffer;</div><div class='add'>+	struct exynos_drm_gem_obj	*exynos_gem_obj[MAX_FB_BUFFER];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void exynos_drm_fb_destroy(struct drm_framebuffer *fb)</div><div class='hunk'>@@ -61,13 +56,6 @@ static void exynos_drm_fb_destroy(struct drm_framebuffer *fb)</div><div class='ctx'> </div><div class='ctx'> 	drm_framebuffer_cleanup(fb);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * default framebuffer has no gem object so</div><div class='del'>-	 * a buffer of the default framebuffer should be released at here.</div><div class='del'>-	 */</div><div class='del'>-	if (!exynos_fb-&gt;exynos_gem_obj &amp;&amp; exynos_fb-&gt;buffer)</div><div class='del'>-		exynos_drm_buf_destroy(fb-&gt;dev, exynos_fb-&gt;buffer);</div><div class='del'>-</div><div class='ctx'> 	kfree(exynos_fb);</div><div class='ctx'> 	exynos_fb = NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -81,7 +69,7 @@ static int exynos_drm_fb_create_handle(struct drm_framebuffer *fb,</div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='ctx'> 	return drm_gem_handle_create(file_priv,</div><div class='del'>-			&amp;exynos_fb-&gt;exynos_gem_obj-&gt;base, handle);</div><div class='add'>+			&amp;exynos_fb-&gt;exynos_gem_obj[0]-&gt;base, handle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int exynos_drm_fb_dirty(struct drm_framebuffer *fb,</div><div class='hunk'>@@ -102,134 +90,88 @@ static struct drm_framebuffer_funcs exynos_drm_fb_funcs = {</div><div class='ctx'> 	.dirty		= exynos_drm_fb_dirty,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct drm_framebuffer *</div><div class='del'>-exynos_drm_fb_init(struct drm_file *file_priv, struct drm_device *dev,</div><div class='del'>-		    struct drm_mode_fb_cmd *mode_cmd)</div><div class='add'>+struct drm_framebuffer *</div><div class='add'>+exynos_drm_framebuffer_init(struct drm_device *dev,</div><div class='add'>+			    struct drm_mode_fb_cmd2 *mode_cmd,</div><div class='add'>+			    struct drm_gem_object *obj)</div><div class='ctx'> {</div><div class='ctx'> 	struct exynos_drm_fb *exynos_fb;</div><div class='del'>-	struct drm_framebuffer *fb;</div><div class='del'>-	struct exynos_drm_gem_obj *exynos_gem_obj = NULL;</div><div class='del'>-	struct drm_gem_object *obj;</div><div class='del'>-	unsigned int size;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='del'>-</div><div class='del'>-	mode_cmd-&gt;pitch = max(mode_cmd-&gt;pitch,</div><div class='del'>-			mode_cmd-&gt;width * (mode_cmd-&gt;bpp &gt;&gt; 3));</div><div class='del'>-</div><div class='del'>-	DRM_LOG_KMS("drm fb create(%dx%d)\n",</div><div class='del'>-			mode_cmd-&gt;width, mode_cmd-&gt;height);</div><div class='del'>-</div><div class='ctx'> 	exynos_fb = kzalloc(sizeof(*exynos_fb), GFP_KERNEL);</div><div class='ctx'> 	if (!exynos_fb) {</div><div class='del'>-		DRM_ERROR("failed to allocate exynos drm framebuffer.\n");</div><div class='add'>+		DRM_ERROR("failed to allocate exynos drm framebuffer\n");</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fb = &amp;exynos_fb-&gt;fb;</div><div class='del'>-	ret = drm_framebuffer_init(dev, fb, &amp;exynos_drm_fb_funcs);</div><div class='add'>+	ret = drm_framebuffer_init(dev, &amp;exynos_fb-&gt;fb, &amp;exynos_drm_fb_funcs);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		DRM_ERROR("failed to initialize framebuffer.\n");</div><div class='del'>-		goto err_init;</div><div class='add'>+		DRM_ERROR("failed to initialize framebuffer\n");</div><div class='add'>+		return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DRM_LOG_KMS("create: fb id: %d\n", fb-&gt;base.id);</div><div class='add'>+	drm_helper_mode_fill_fb_struct(&amp;exynos_fb-&gt;fb, mode_cmd);</div><div class='add'>+	exynos_fb-&gt;exynos_gem_obj[0] = to_exynos_gem_obj(obj);</div><div class='ctx'> </div><div class='del'>-	size = mode_cmd-&gt;pitch * mode_cmd-&gt;height;</div><div class='add'>+	return &amp;exynos_fb-&gt;fb;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * mode_cmd-&gt;handle could be NULL at booting time or</div><div class='del'>-	 * with user request. if NULL, a new buffer or a gem object</div><div class='del'>-	 * would be allocated.</div><div class='del'>-	 */</div><div class='del'>-	if (!mode_cmd-&gt;handle) {</div><div class='del'>-		if (!file_priv) {</div><div class='del'>-			struct exynos_drm_gem_buf *buffer;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * in case that file_priv is NULL, it allocates</div><div class='del'>-			 * only buffer and this buffer would be used</div><div class='del'>-			 * for default framebuffer.</div><div class='del'>-			 */</div><div class='del'>-			buffer = exynos_drm_buf_create(dev, size);</div><div class='del'>-			if (IS_ERR(buffer)) {</div><div class='del'>-				ret = PTR_ERR(buffer);</div><div class='del'>-				goto err_buffer;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			exynos_fb-&gt;buffer = buffer;</div><div class='del'>-</div><div class='del'>-			DRM_LOG_KMS("default: dma_addr = 0x%lx, size = 0x%x\n",</div><div class='del'>-					(unsigned long)buffer-&gt;dma_addr, size);</div><div class='del'>-</div><div class='del'>-			goto out;</div><div class='del'>-		} else {</div><div class='del'>-			exynos_gem_obj = exynos_drm_gem_create(dev, file_priv,</div><div class='del'>-							&amp;mode_cmd-&gt;handle,</div><div class='del'>-							size);</div><div class='del'>-			if (IS_ERR(exynos_gem_obj)) {</div><div class='del'>-				ret = PTR_ERR(exynos_gem_obj);</div><div class='del'>-				goto err_buffer;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		obj = drm_gem_object_lookup(dev, file_priv, mode_cmd-&gt;handle);</div><div class='del'>-		if (!obj) {</div><div class='del'>-			DRM_ERROR("failed to lookup gem object.\n");</div><div class='del'>-			goto err_buffer;</div><div class='del'>-		}</div><div class='add'>+static struct drm_framebuffer *</div><div class='add'>+exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,</div><div class='add'>+		      struct drm_mode_fb_cmd2 *mode_cmd)</div><div class='add'>+{</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	struct drm_framebuffer *fb;</div><div class='add'>+	struct exynos_drm_fb *exynos_fb;</div><div class='add'>+	int nr;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-		exynos_gem_obj = to_exynos_gem_obj(obj);</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='del'>-		drm_gem_object_unreference_unlocked(obj);</div><div class='add'>+	obj = drm_gem_object_lookup(dev, file_priv, mode_cmd-&gt;handles[0]);</div><div class='add'>+	if (!obj) {</div><div class='add'>+		DRM_ERROR("failed to lookup gem object\n");</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * if got a exynos_gem_obj from either a handle or</div><div class='del'>-	 * a new creation then exynos_fb-&gt;exynos_gem_obj is NULL</div><div class='del'>-	 * so that default framebuffer has no its own gem object,</div><div class='del'>-	 * only its own buffer object.</div><div class='del'>-	 */</div><div class='del'>-	exynos_fb-&gt;buffer = exynos_gem_obj-&gt;buffer;</div><div class='del'>-</div><div class='del'>-	DRM_LOG_KMS("dma_addr = 0x%lx, size = 0x%x, gem object = 0x%x\n",</div><div class='del'>-			(unsigned long)exynos_fb-&gt;buffer-&gt;dma_addr, size,</div><div class='del'>-			(unsigned int)&amp;exynos_gem_obj-&gt;base);</div><div class='add'>+	drm_gem_object_unreference_unlocked(obj);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	exynos_fb-&gt;exynos_gem_obj = exynos_gem_obj;</div><div class='add'>+	fb = exynos_drm_framebuffer_init(dev, mode_cmd, obj);</div><div class='add'>+	if (IS_ERR(fb))</div><div class='add'>+		return fb;</div><div class='ctx'> </div><div class='del'>-	drm_helper_mode_fill_fb_struct(fb, mode_cmd);</div><div class='add'>+	exynos_fb = to_exynos_fb(fb);</div><div class='add'>+	nr = exynos_drm_format_num_buffers(fb-&gt;pixel_format);</div><div class='ctx'> </div><div class='del'>-	return fb;</div><div class='del'>-</div><div class='del'>-err_buffer:</div><div class='del'>-	drm_framebuffer_cleanup(fb);</div><div class='del'>-</div><div class='del'>-err_init:</div><div class='del'>-	kfree(exynos_fb);</div><div class='add'>+	for (i = 1; i &lt; nr; i++) {</div><div class='add'>+		obj = drm_gem_object_lookup(dev, file_priv,</div><div class='add'>+				mode_cmd-&gt;handles[i]);</div><div class='add'>+		if (!obj) {</div><div class='add'>+			DRM_ERROR("failed to lookup gem object\n");</div><div class='add'>+			exynos_drm_fb_destroy(fb);</div><div class='add'>+			return ERR_PTR(-ENOENT);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	return ERR_PTR(ret);</div><div class='del'>-}</div><div class='add'>+		drm_gem_object_unreference_unlocked(obj);</div><div class='ctx'> </div><div class='del'>-struct drm_framebuffer *exynos_drm_fb_create(struct drm_device *dev,</div><div class='del'>-					      struct drm_file *file_priv,</div><div class='del'>-					      struct drm_mode_fb_cmd *mode_cmd)</div><div class='del'>-{</div><div class='del'>-	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+		exynos_fb-&gt;exynos_gem_obj[i] = to_exynos_gem_obj(obj);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return exynos_drm_fb_init(file_priv, dev, mode_cmd);</div><div class='add'>+	return fb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct exynos_drm_gem_buf *exynos_drm_fb_get_buf(struct drm_framebuffer *fb)</div><div class='add'>+struct exynos_drm_gem_buf *exynos_drm_fb_buffer(struct drm_framebuffer *fb,</div><div class='add'>+						int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct exynos_drm_fb *exynos_fb = to_exynos_fb(fb);</div><div class='ctx'> 	struct exynos_drm_gem_buf *buffer;</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='del'>-	buffer = exynos_fb-&gt;buffer;</div><div class='add'>+	if (index &gt;= MAX_FB_BUFFER)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	buffer = exynos_fb-&gt;exynos_gem_obj[index]-&gt;buffer;</div><div class='ctx'> 	if (!buffer)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -250,7 +192,7 @@ static void exynos_drm_output_poll_changed(struct drm_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct drm_mode_config_funcs exynos_drm_mode_config_funcs = {</div><div class='del'>-	.fb_create = exynos_drm_fb_create,</div><div class='add'>+	.fb_create = exynos_user_fb_create,</div><div class='ctx'> 	.output_poll_changed = exynos_drm_output_poll_changed,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.h b/drivers/gpu/drm/exynos/exynos_drm_fb.h<br/>index eb35931d302c..3ecb30d93552 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_fb.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_fb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_fb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_drm_fb.h</a></div><div class='hunk'>@@ -28,9 +28,27 @@</div><div class='ctx'> #ifndef _EXYNOS_DRM_FB_H_</div><div class='ctx'> #define _EXYNOS_DRM_FB_H</div><div class='ctx'> </div><div class='del'>-struct drm_framebuffer *exynos_drm_fb_create(struct drm_device *dev,</div><div class='del'>-					      struct drm_file *filp,</div><div class='del'>-					      struct drm_mode_fb_cmd *mode_cmd);</div><div class='add'>+static inline int exynos_drm_format_num_buffers(uint32_t format)</div><div class='add'>+{</div><div class='add'>+	switch (format) {</div><div class='add'>+	case DRM_FORMAT_NV12M:</div><div class='add'>+	case DRM_FORMAT_NV12MT:</div><div class='add'>+		return 2;</div><div class='add'>+	case DRM_FORMAT_YUV420M:</div><div class='add'>+		return 3;</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'>+struct drm_framebuffer *</div><div class='add'>+exynos_drm_framebuffer_init(struct drm_device *dev,</div><div class='add'>+			    struct drm_mode_fb_cmd2 *mode_cmd,</div><div class='add'>+			    struct drm_gem_object *obj);</div><div class='add'>+</div><div class='add'>+/* get memory information of a drm framebuffer */</div><div class='add'>+struct exynos_drm_gem_buf *exynos_drm_fb_buffer(struct drm_framebuffer *fb,</div><div class='add'>+						 int index);</div><div class='ctx'> </div><div class='ctx'> void exynos_drm_mode_config_init(struct drm_device *dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c<br/>index 836f41008187..d7ae29d2f3d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_fbdev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_fbdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_fbdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_drm_fbdev.c</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'> #include "exynos_drm_drv.h"</div><div class='ctx'> #include "exynos_drm_fb.h"</div><div class='ctx'> #include "exynos_drm_gem.h"</div><div class='del'>-#include "exynos_drm_buf.h"</div><div class='ctx'> </div><div class='ctx'> #define MAX_CONNECTOR		4</div><div class='ctx'> #define PREFERRED_BPP		32</div><div class='hunk'>@@ -43,8 +42,8 @@</div><div class='ctx'> 				drm_fb_helper)</div><div class='ctx'> </div><div class='ctx'> struct exynos_drm_fbdev {</div><div class='del'>-	struct drm_fb_helper	drm_fb_helper;</div><div class='del'>-	struct drm_framebuffer	*fb;</div><div class='add'>+	struct drm_fb_helper		drm_fb_helper;</div><div class='add'>+	struct exynos_drm_gem_obj	*exynos_gem_obj;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int exynos_drm_fbdev_set_par(struct fb_info *info)</div><div class='hunk'>@@ -90,26 +89,24 @@ static int exynos_drm_fbdev_update(struct drm_fb_helper *helper,</div><div class='ctx'> {</div><div class='ctx'> 	struct fb_info *fbi = helper-&gt;fbdev;</div><div class='ctx'> 	struct drm_device *dev = helper-&gt;dev;</div><div class='del'>-	struct exynos_drm_fbdev *exynos_fb = to_exynos_fbdev(helper);</div><div class='ctx'> 	struct exynos_drm_gem_buf *buffer;</div><div class='ctx'> 	unsigned int size = fb-&gt;width * fb-&gt;height * (fb-&gt;bits_per_pixel &gt;&gt; 3);</div><div class='ctx'> 	unsigned long offset;</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='del'>-	exynos_fb-&gt;fb = fb;</div><div class='del'>-</div><div class='del'>-	drm_fb_helper_fill_fix(fbi, fb-&gt;pitch, fb-&gt;depth);</div><div class='add'>+	drm_fb_helper_fill_fix(fbi, fb-&gt;pitches[0], fb-&gt;depth);</div><div class='ctx'> 	drm_fb_helper_fill_var(fbi, helper, fb-&gt;width, fb-&gt;height);</div><div class='ctx'> </div><div class='del'>-	buffer = exynos_drm_fb_get_buf(fb);</div><div class='add'>+	/* RGB formats use only one buffer */</div><div class='add'>+	buffer = exynos_drm_fb_buffer(fb, 0);</div><div class='ctx'> 	if (!buffer) {</div><div class='ctx'> 		DRM_LOG_KMS("buffer is null.\n");</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	offset = fbi-&gt;var.xoffset * (fb-&gt;bits_per_pixel &gt;&gt; 3);</div><div class='del'>-	offset += fbi-&gt;var.yoffset * fb-&gt;pitch;</div><div class='add'>+	offset += fbi-&gt;var.yoffset * fb-&gt;pitches[0];</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;mode_config.fb_base = (resource_size_t)buffer-&gt;dma_addr;</div><div class='ctx'> 	fbi-&gt;screen_base = buffer-&gt;kvaddr + offset;</div><div class='hunk'>@@ -124,10 +121,12 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper,</div><div class='ctx'> 				    struct drm_fb_helper_surface_size *sizes)</div><div class='ctx'> {</div><div class='ctx'> 	struct exynos_drm_fbdev *exynos_fbdev = to_exynos_fbdev(helper);</div><div class='add'>+	struct exynos_drm_gem_obj *exynos_gem_obj;</div><div class='ctx'> 	struct drm_device *dev = helper-&gt;dev;</div><div class='ctx'> 	struct fb_info *fbi;</div><div class='del'>-	struct drm_mode_fb_cmd mode_cmd = { 0 };</div><div class='add'>+	struct drm_mode_fb_cmd2 mode_cmd = { 0 };</div><div class='ctx'> 	struct platform_device *pdev = dev-&gt;platformdev;</div><div class='add'>+	unsigned long size;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='hunk'>@@ -138,8 +137,9 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper,</div><div class='ctx'> </div><div class='ctx'> 	mode_cmd.width = sizes-&gt;surface_width;</div><div class='ctx'> 	mode_cmd.height = sizes-&gt;surface_height;</div><div class='del'>-	mode_cmd.bpp = sizes-&gt;surface_bpp;</div><div class='del'>-	mode_cmd.depth = sizes-&gt;surface_depth;</div><div class='add'>+	mode_cmd.pitches[0] = sizes-&gt;surface_width * (sizes-&gt;surface_bpp &gt;&gt; 3);</div><div class='add'>+	mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes-&gt;surface_bpp,</div><div class='add'>+							  sizes-&gt;surface_depth);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -150,14 +150,23 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	exynos_fbdev-&gt;fb = exynos_drm_fb_create(dev, NULL, &amp;mode_cmd);</div><div class='del'>-	if (IS_ERR_OR_NULL(exynos_fbdev-&gt;fb)) {</div><div class='add'>+	size = mode_cmd.pitches[0] * mode_cmd.height;</div><div class='add'>+	exynos_gem_obj = exynos_drm_gem_create(dev, size);</div><div class='add'>+	if (IS_ERR(exynos_gem_obj)) {</div><div class='add'>+		ret = PTR_ERR(exynos_gem_obj);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	exynos_fbdev-&gt;exynos_gem_obj = exynos_gem_obj;</div><div class='add'>+</div><div class='add'>+	helper-&gt;fb = exynos_drm_framebuffer_init(dev, &amp;mode_cmd,</div><div class='add'>+			&amp;exynos_gem_obj-&gt;base);</div><div class='add'>+	if (IS_ERR_OR_NULL(helper-&gt;fb)) {</div><div class='ctx'> 		DRM_ERROR("failed to create drm framebuffer.\n");</div><div class='del'>-		ret = PTR_ERR(exynos_fbdev-&gt;fb);</div><div class='add'>+		ret = PTR_ERR(helper-&gt;fb);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	helper-&gt;fb = exynos_fbdev-&gt;fb;</div><div class='ctx'> 	helper-&gt;fbdev = fbi;</div><div class='ctx'> </div><div class='ctx'> 	fbi-&gt;par = helper;</div><div class='hunk'>@@ -171,8 +180,10 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = exynos_drm_fbdev_update(helper, helper-&gt;fb);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (ret &lt; 0) {</div><div class='ctx'> 		fb_dealloc_cmap(&amp;fbi-&gt;cmap);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * if failed, all resources allocated above would be released by</div><div class='hunk'>@@ -205,34 +216,42 @@ static int exynos_drm_fbdev_recreate(struct drm_fb_helper *helper,</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_device *dev = helper-&gt;dev;</div><div class='ctx'> 	struct exynos_drm_fbdev *exynos_fbdev = to_exynos_fbdev(helper);</div><div class='del'>-	struct drm_framebuffer *fb = exynos_fbdev-&gt;fb;</div><div class='del'>-	struct drm_mode_fb_cmd mode_cmd = { 0 };</div><div class='add'>+	struct exynos_drm_gem_obj *exynos_gem_obj;</div><div class='add'>+	struct drm_framebuffer *fb = helper-&gt;fb;</div><div class='add'>+	struct drm_mode_fb_cmd2 mode_cmd = { 0 };</div><div class='add'>+	unsigned long size;</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='del'>-	if (helper-&gt;fb != fb) {</div><div class='del'>-		DRM_ERROR("drm framebuffer is different\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (exynos_drm_fbdev_is_samefb(fb, sizes))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	mode_cmd.width = sizes-&gt;surface_width;</div><div class='ctx'> 	mode_cmd.height = sizes-&gt;surface_height;</div><div class='del'>-	mode_cmd.bpp = sizes-&gt;surface_bpp;</div><div class='del'>-	mode_cmd.depth = sizes-&gt;surface_depth;</div><div class='add'>+	mode_cmd.pitches[0] = sizes-&gt;surface_width * (sizes-&gt;surface_bpp &gt;&gt; 3);</div><div class='add'>+	mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes-&gt;surface_bpp,</div><div class='add'>+							  sizes-&gt;surface_depth);</div><div class='add'>+</div><div class='add'>+	if (exynos_fbdev-&gt;exynos_gem_obj)</div><div class='add'>+		exynos_drm_gem_destroy(exynos_fbdev-&gt;exynos_gem_obj);</div><div class='ctx'> </div><div class='ctx'> 	if (fb-&gt;funcs-&gt;destroy)</div><div class='ctx'> 		fb-&gt;funcs-&gt;destroy(fb);</div><div class='ctx'> </div><div class='del'>-	exynos_fbdev-&gt;fb = exynos_drm_fb_create(dev, NULL, &amp;mode_cmd);</div><div class='del'>-	if (IS_ERR(exynos_fbdev-&gt;fb)) {</div><div class='del'>-		DRM_ERROR("failed to allocate fb.\n");</div><div class='del'>-		return PTR_ERR(exynos_fbdev-&gt;fb);</div><div class='add'>+	size = mode_cmd.pitches[0] * mode_cmd.height;</div><div class='add'>+	exynos_gem_obj = exynos_drm_gem_create(dev, size);</div><div class='add'>+	if (IS_ERR(exynos_gem_obj))</div><div class='add'>+		return PTR_ERR(exynos_gem_obj);</div><div class='add'>+</div><div class='add'>+	exynos_fbdev-&gt;exynos_gem_obj = exynos_gem_obj;</div><div class='add'>+</div><div class='add'>+	helper-&gt;fb = exynos_drm_framebuffer_init(dev, &amp;mode_cmd,</div><div class='add'>+			&amp;exynos_gem_obj-&gt;base);</div><div class='add'>+	if (IS_ERR_OR_NULL(helper-&gt;fb)) {</div><div class='add'>+		DRM_ERROR("failed to create drm framebuffer.\n");</div><div class='add'>+		return PTR_ERR(helper-&gt;fb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	helper-&gt;fb = exynos_fbdev-&gt;fb;</div><div class='ctx'> 	return exynos_drm_fbdev_update(helper, helper-&gt;fb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -366,6 +385,9 @@ void exynos_drm_fbdev_fini(struct drm_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	fbdev = to_exynos_fbdev(private-&gt;fb_helper);</div><div class='ctx'> </div><div class='add'>+	if (fbdev-&gt;exynos_gem_obj)</div><div class='add'>+		exynos_drm_gem_destroy(fbdev-&gt;exynos_gem_obj);</div><div class='add'>+</div><div class='ctx'> 	exynos_drm_fbdev_destroy(dev, private-&gt;fb_helper);</div><div class='ctx'> 	kfree(fbdev);</div><div class='ctx'> 	private-&gt;fb_helper = NULL;</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c<br/>index db3b3d9e731d..ca83139cd309 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_fimd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_fimd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_fimd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_drm_fimd.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</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/clk.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;drm/exynos_drm.h&gt;</div><div class='ctx'> #include &lt;plat/regs-fb-v4.h&gt;</div><div class='hunk'>@@ -68,6 +69,7 @@ struct fimd_win_data {</div><div class='ctx'> 	void __iomem		*vaddr;</div><div class='ctx'> 	unsigned int		buf_offsize;</div><div class='ctx'> 	unsigned int		line_size;	/* bytes */</div><div class='add'>+	bool			enabled;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct fimd_context {</div><div class='hunk'>@@ -84,6 +86,8 @@ struct fimd_context {</div><div class='ctx'> 	unsigned long			irq_flags;</div><div class='ctx'> 	u32				vidcon0;</div><div class='ctx'> 	u32				vidcon1;</div><div class='add'>+	bool				suspended;</div><div class='add'>+	struct mutex			lock;</div><div class='ctx'> </div><div class='ctx'> 	struct fb_videomode		*timing;</div><div class='ctx'> };</div><div class='hunk'>@@ -119,7 +123,7 @@ static int fimd_display_power_on(struct device *dev, int mode)</div><div class='ctx'> {</div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='del'>-	/* TODO. */</div><div class='add'>+	/* TODO */</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -132,12 +136,68 @@ static struct exynos_drm_display_ops fimd_display_ops = {</div><div class='ctx'> 	.power_on = fimd_display_power_on,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void fimd_dpms(struct device *subdrv_dev, int mode)</div><div class='add'>+{</div><div class='add'>+	struct fimd_context *ctx = get_fimd_context(subdrv_dev);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s, %d\n", __FILE__, mode);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ctx-&gt;lock);</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case DRM_MODE_DPMS_ON:</div><div class='add'>+		/*</div><div class='add'>+		 * enable fimd hardware only if suspended status.</div><div class='add'>+		 *</div><div class='add'>+		 * P.S. fimd_dpms function would be called at booting time so</div><div class='add'>+		 * clk_enable could be called double time.</div><div class='add'>+		 */</div><div class='add'>+		if (ctx-&gt;suspended)</div><div class='add'>+			pm_runtime_get_sync(subdrv_dev);</div><div class='add'>+		break;</div><div class='add'>+	case DRM_MODE_DPMS_STANDBY:</div><div class='add'>+	case DRM_MODE_DPMS_SUSPEND:</div><div class='add'>+	case DRM_MODE_DPMS_OFF:</div><div class='add'>+		pm_runtime_put_sync(subdrv_dev);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DRM_DEBUG_KMS("unspecified mode %d\n", mode);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ctx-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fimd_apply(struct device *subdrv_dev)</div><div class='add'>+{</div><div class='add'>+	struct fimd_context *ctx = get_fimd_context(subdrv_dev);</div><div class='add'>+	struct exynos_drm_manager *mgr = &amp;ctx-&gt;subdrv.manager;</div><div class='add'>+	struct exynos_drm_manager_ops *mgr_ops = mgr-&gt;ops;</div><div class='add'>+	struct exynos_drm_overlay_ops *ovl_ops = mgr-&gt;overlay_ops;</div><div class='add'>+	struct fimd_win_data *win_data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WINDOWS_NR; i++) {</div><div class='add'>+		win_data = &amp;ctx-&gt;win_data[i];</div><div class='add'>+		if (win_data-&gt;enabled &amp;&amp; (ovl_ops &amp;&amp; ovl_ops-&gt;commit))</div><div class='add'>+			ovl_ops-&gt;commit(subdrv_dev, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mgr_ops &amp;&amp; mgr_ops-&gt;commit)</div><div class='add'>+		mgr_ops-&gt;commit(subdrv_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void fimd_commit(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fimd_context *ctx = get_fimd_context(dev);</div><div class='ctx'> 	struct fb_videomode *timing = ctx-&gt;timing;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='add'>+	if (ctx-&gt;suspended)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='ctx'> 	/* setup polarity values from machine code. */</div><div class='hunk'>@@ -177,40 +237,6 @@ static void fimd_commit(struct device *dev)</div><div class='ctx'> 	writel(val, ctx-&gt;regs + VIDCON0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fimd_disable(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct fimd_context *ctx = get_fimd_context(dev);</div><div class='del'>-	struct exynos_drm_subdrv *subdrv = &amp;ctx-&gt;subdrv;</div><div class='del'>-	struct drm_device *drm_dev = subdrv-&gt;drm_dev;</div><div class='del'>-	struct exynos_drm_manager *manager = &amp;subdrv-&gt;manager;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='del'>-</div><div class='del'>-	/* fimd dma off */</div><div class='del'>-	val = readl(ctx-&gt;regs + VIDCON0);</div><div class='del'>-	val &amp;= ~(VIDCON0_ENVID | VIDCON0_ENVID_F);</div><div class='del'>-	writel(val, ctx-&gt;regs + VIDCON0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if vblank is enabled status with dma off then</div><div class='del'>-	 * it disables vsync interrupt.</div><div class='del'>-	 */</div><div class='del'>-	if (drm_dev-&gt;vblank_enabled[manager-&gt;pipe] &amp;&amp;</div><div class='del'>-		atomic_read(&amp;drm_dev-&gt;vblank_refcount[manager-&gt;pipe])) {</div><div class='del'>-		drm_vblank_put(drm_dev, manager-&gt;pipe);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * if vblank_disable_allowed is 0 then disable</div><div class='del'>-		 * vsync interrupt right now else the vsync interrupt</div><div class='del'>-		 * would be disabled by drm timer once a current process</div><div class='del'>-		 * gives up ownershop of vblank event.</div><div class='del'>-		 */</div><div class='del'>-		if (!drm_dev-&gt;vblank_disable_allowed)</div><div class='del'>-			drm_vblank_off(drm_dev, manager-&gt;pipe);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int fimd_enable_vblank(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fimd_context *ctx = get_fimd_context(dev);</div><div class='hunk'>@@ -218,6 +244,9 @@ static int fimd_enable_vblank(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='add'>+	if (ctx-&gt;suspended)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='ctx'> 	if (!test_and_set_bit(0, &amp;ctx-&gt;irq_flags)) {</div><div class='ctx'> 		val = readl(ctx-&gt;regs + VIDINTCON0);</div><div class='ctx'> </div><div class='hunk'>@@ -242,6 +271,9 @@ static void fimd_disable_vblank(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='add'>+	if (ctx-&gt;suspended)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (test_and_clear_bit(0, &amp;ctx-&gt;irq_flags)) {</div><div class='ctx'> 		val = readl(ctx-&gt;regs + VIDINTCON0);</div><div class='ctx'> </div><div class='hunk'>@@ -253,8 +285,9 @@ static void fimd_disable_vblank(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct exynos_drm_manager_ops fimd_manager_ops = {</div><div class='add'>+	.dpms = fimd_dpms,</div><div class='add'>+	.apply = fimd_apply,</div><div class='ctx'> 	.commit = fimd_commit,</div><div class='del'>-	.disable = fimd_disable,</div><div class='ctx'> 	.enable_vblank = fimd_enable_vblank,</div><div class='ctx'> 	.disable_vblank = fimd_disable_vblank,</div><div class='ctx'> };</div><div class='hunk'>@@ -264,6 +297,7 @@ static void fimd_win_mode_set(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct fimd_context *ctx = get_fimd_context(dev);</div><div class='ctx'> 	struct fimd_win_data *win_data;</div><div class='add'>+	int win;</div><div class='ctx'> 	unsigned long offset;</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='hunk'>@@ -273,12 +307,19 @@ static void fimd_win_mode_set(struct device *dev,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	win = overlay-&gt;zpos;</div><div class='add'>+	if (win == DEFAULT_ZPOS)</div><div class='add'>+		win = ctx-&gt;default_win;</div><div class='add'>+</div><div class='add'>+	if (win &lt; 0 || win &gt; WINDOWS_NR)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	offset = overlay-&gt;fb_x * (overlay-&gt;bpp &gt;&gt; 3);</div><div class='ctx'> 	offset += overlay-&gt;fb_y * overlay-&gt;pitch;</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("offset = 0x%lx, pitch = %x\n", offset, overlay-&gt;pitch);</div><div class='ctx'> </div><div class='del'>-	win_data = &amp;ctx-&gt;win_data[ctx-&gt;default_win];</div><div class='add'>+	win_data = &amp;ctx-&gt;win_data[win];</div><div class='ctx'> </div><div class='ctx'> 	win_data-&gt;offset_x = overlay-&gt;crtc_x;</div><div class='ctx'> 	win_data-&gt;offset_y = overlay-&gt;crtc_y;</div><div class='hunk'>@@ -286,8 +327,8 @@ static void fimd_win_mode_set(struct device *dev,</div><div class='ctx'> 	win_data-&gt;ovl_height = overlay-&gt;crtc_height;</div><div class='ctx'> 	win_data-&gt;fb_width = overlay-&gt;fb_width;</div><div class='ctx'> 	win_data-&gt;fb_height = overlay-&gt;fb_height;</div><div class='del'>-	win_data-&gt;dma_addr = overlay-&gt;dma_addr + offset;</div><div class='del'>-	win_data-&gt;vaddr = overlay-&gt;vaddr + offset;</div><div class='add'>+	win_data-&gt;dma_addr = overlay-&gt;dma_addr[0] + offset;</div><div class='add'>+	win_data-&gt;vaddr = overlay-&gt;vaddr[0] + offset;</div><div class='ctx'> 	win_data-&gt;bpp = overlay-&gt;bpp;</div><div class='ctx'> 	win_data-&gt;buf_offsize = (overlay-&gt;fb_width - overlay-&gt;crtc_width) *</div><div class='ctx'> 				(overlay-&gt;bpp &gt;&gt; 3);</div><div class='hunk'>@@ -381,15 +422,21 @@ static void fimd_win_set_colkey(struct device *dev, unsigned int win)</div><div class='ctx'> 	writel(keycon1, ctx-&gt;regs + WKEYCON1_BASE(win));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fimd_win_commit(struct device *dev)</div><div class='add'>+static void fimd_win_commit(struct device *dev, int zpos)</div><div class='ctx'> {</div><div class='ctx'> 	struct fimd_context *ctx = get_fimd_context(dev);</div><div class='ctx'> 	struct fimd_win_data *win_data;</div><div class='del'>-	int win = ctx-&gt;default_win;</div><div class='add'>+	int win = zpos;</div><div class='ctx'> 	unsigned long val, alpha, size;</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='add'>+	if (ctx-&gt;suspended)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (win == DEFAULT_ZPOS)</div><div class='add'>+		win = ctx-&gt;default_win;</div><div class='add'>+</div><div class='ctx'> 	if (win &lt; 0 || win &gt; WINDOWS_NR)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -472,24 +519,37 @@ static void fimd_win_commit(struct device *dev)</div><div class='ctx'> 	if (win != 0)</div><div class='ctx'> 		fimd_win_set_colkey(dev, win);</div><div class='ctx'> </div><div class='add'>+	/* wincon */</div><div class='add'>+	val = readl(ctx-&gt;regs + WINCON(win));</div><div class='add'>+	val |= WINCONx_ENWIN;</div><div class='add'>+	writel(val, ctx-&gt;regs + WINCON(win));</div><div class='add'>+</div><div class='ctx'> 	/* Enable DMA channel and unprotect windows */</div><div class='ctx'> 	val = readl(ctx-&gt;regs + SHADOWCON);</div><div class='ctx'> 	val |= SHADOWCON_CHx_ENABLE(win);</div><div class='ctx'> 	val &amp;= ~SHADOWCON_WINx_PROTECT(win);</div><div class='ctx'> 	writel(val, ctx-&gt;regs + SHADOWCON);</div><div class='add'>+</div><div class='add'>+	win_data-&gt;enabled = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fimd_win_disable(struct device *dev)</div><div class='add'>+static void fimd_win_disable(struct device *dev, int zpos)</div><div class='ctx'> {</div><div class='ctx'> 	struct fimd_context *ctx = get_fimd_context(dev);</div><div class='del'>-	int win = ctx-&gt;default_win;</div><div class='add'>+	struct fimd_win_data *win_data;</div><div class='add'>+	int win = zpos;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='add'>+	if (win == DEFAULT_ZPOS)</div><div class='add'>+		win = ctx-&gt;default_win;</div><div class='add'>+</div><div class='ctx'> 	if (win &lt; 0 || win &gt; WINDOWS_NR)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	win_data = &amp;ctx-&gt;win_data[win];</div><div class='add'>+</div><div class='ctx'> 	/* protect windows */</div><div class='ctx'> 	val = readl(ctx-&gt;regs + SHADOWCON);</div><div class='ctx'> 	val |= SHADOWCON_WINx_PROTECT(win);</div><div class='hunk'>@@ -505,6 +565,8 @@ static void fimd_win_disable(struct device *dev)</div><div class='ctx'> 	val &amp;= ~SHADOWCON_CHx_ENABLE(win);</div><div class='ctx'> 	val &amp;= ~SHADOWCON_WINx_PROTECT(win);</div><div class='ctx'> 	writel(val, ctx-&gt;regs + SHADOWCON);</div><div class='add'>+</div><div class='add'>+	win_data-&gt;enabled = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct exynos_drm_overlay_ops fimd_overlay_ops = {</div><div class='hunk'>@@ -540,9 +602,17 @@ static void fimd_finish_pageflip(struct drm_device *drm_dev, int crtc)</div><div class='ctx'> 		wake_up_interruptible(&amp;e-&gt;base.file_priv-&gt;event_wait);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_checked)</div><div class='add'>+	if (is_checked) {</div><div class='ctx'> 		drm_vblank_put(drm_dev, crtc);</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * don't off vblank if vblank_disable_allowed is 1,</div><div class='add'>+		 * because vblank would be off by timer handler.</div><div class='add'>+		 */</div><div class='add'>+		if (!drm_dev-&gt;vblank_disable_allowed)</div><div class='add'>+			drm_vblank_off(drm_dev, crtc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;drm_dev-&gt;event_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -560,19 +630,14 @@ static irqreturn_t fimd_irq_handler(int irq, void *dev_id)</div><div class='ctx'> 		/* VSYNC interrupt */</div><div class='ctx'> 		writel(VIDINTCON1_INT_FRAME, ctx-&gt;regs + VIDINTCON1);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * in case that vblank_disable_allowed is 1, it could induce</div><div class='del'>-	 * the problem that manager-&gt;pipe could be -1 because with</div><div class='del'>-	 * disable callback, vsync interrupt isn't disabled and at this moment,</div><div class='del'>-	 * vsync interrupt could occur. the vsync interrupt would be disabled</div><div class='del'>-	 * by timer handler later.</div><div class='del'>-	 */</div><div class='del'>-	if (manager-&gt;pipe == -1)</div><div class='del'>-		return IRQ_HANDLED;</div><div class='add'>+	/* check the crtc is detached already from encoder */</div><div class='add'>+	if (manager-&gt;pipe &lt; 0)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	drm_handle_vblank(drm_dev, manager-&gt;pipe);</div><div class='ctx'> 	fimd_finish_pageflip(drm_dev, manager-&gt;pipe);</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -590,6 +655,13 @@ static int fimd_subdrv_probe(struct drm_device *drm_dev, struct device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	drm_dev-&gt;irq_enabled = 1;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * with vblank_disable_allowed = 1, vblank interrupt will be disabled</div><div class='add'>+	 * by drm timer once a current process gives up ownership of</div><div class='add'>+	 * vblank event.(after drm_vblank_put function is called)</div><div class='add'>+	 */</div><div class='add'>+	drm_dev-&gt;vblank_disable_allowed = 1;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -739,9 +811,6 @@ static int __devinit fimd_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;irq = res-&gt;start;</div><div class='ctx'> </div><div class='del'>-	for (win = 0; win &lt; WINDOWS_NR; win++)</div><div class='del'>-		fimd_clear_win(ctx, win);</div><div class='del'>-</div><div class='ctx'> 	ret = request_irq(ctx-&gt;irq, fimd_irq_handler, 0, "drm_fimd", ctx);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(dev, "irq request failed.\n");</div><div class='hunk'>@@ -769,7 +838,17 @@ static int __devinit fimd_probe(struct platform_device *pdev)</div><div class='ctx'> 	subdrv-&gt;manager.display_ops = &amp;fimd_display_ops;</div><div class='ctx'> 	subdrv-&gt;manager.dev = dev;</div><div class='ctx'> </div><div class='add'>+	mutex_init(&amp;ctx-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	platform_set_drvdata(pdev, ctx);</div><div class='add'>+</div><div class='add'>+	pm_runtime_set_active(dev);</div><div class='add'>+	pm_runtime_enable(dev);</div><div class='add'>+	pm_runtime_get_sync(dev);</div><div class='add'>+</div><div class='add'>+	for (win = 0; win &lt; WINDOWS_NR; win++)</div><div class='add'>+		fimd_clear_win(ctx, win);</div><div class='add'>+</div><div class='ctx'> 	exynos_drm_subdrv_register(subdrv);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -797,14 +876,25 @@ err_clk_get:</div><div class='ctx'> </div><div class='ctx'> static int __devexit fimd_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct fimd_context *ctx = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='ctx'> 	exynos_drm_subdrv_unregister(&amp;ctx-&gt;subdrv);</div><div class='ctx'> </div><div class='add'>+	if (ctx-&gt;suspended)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	clk_disable(ctx-&gt;lcd_clk);</div><div class='ctx'> 	clk_disable(ctx-&gt;bus_clk);</div><div class='add'>+</div><div class='add'>+	pm_runtime_set_suspended(dev);</div><div class='add'>+	pm_runtime_put_sync(dev);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	pm_runtime_disable(dev);</div><div class='add'>+</div><div class='ctx'> 	clk_put(ctx-&gt;lcd_clk);</div><div class='ctx'> 	clk_put(ctx-&gt;bus_clk);</div><div class='ctx'> </div><div class='hunk'>@@ -818,12 +908,102 @@ static int __devexit fimd_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 fimd_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (pm_runtime_suspended(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_suspend(dev);</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 fimd_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_resume(dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		DRM_ERROR("failed to resume runtime pm.\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pm_runtime_disable(dev);</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_set_active(dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		DRM_ERROR("failed to active runtime pm.\n");</div><div class='add'>+		pm_runtime_enable(dev);</div><div class='add'>+		pm_runtime_suspend(dev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pm_runtime_enable(dev);</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'>+#ifdef CONFIG_PM_RUNTIME</div><div class='add'>+static int fimd_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fimd_context *ctx = get_fimd_context(dev);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	clk_disable(ctx-&gt;lcd_clk);</div><div class='add'>+	clk_disable(ctx-&gt;bus_clk);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;suspended = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fimd_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fimd_context *ctx = get_fimd_context(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	ret = clk_enable(ctx-&gt;bus_clk);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = clk_enable(ctx-&gt;lcd_clk);</div><div class='add'>+	if  (ret &lt; 0) {</div><div class='add'>+		clk_disable(ctx-&gt;bus_clk);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;suspended = false;</div><div class='add'>+</div><div class='add'>+	/* if vblank was enabled status, enable it again. */</div><div class='add'>+	if (test_and_clear_bit(0, &amp;ctx-&gt;irq_flags))</div><div class='add'>+		fimd_enable_vblank(dev);</div><div class='add'>+</div><div class='add'>+	fimd_apply(dev);</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 const struct dev_pm_ops fimd_pm_ops = {</div><div class='add'>+	SET_SYSTEM_SLEEP_PM_OPS(fimd_suspend, fimd_resume)</div><div class='add'>+	SET_RUNTIME_PM_OPS(fimd_runtime_suspend, fimd_runtime_resume, NULL)</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_driver fimd_driver = {</div><div class='ctx'> 	.probe		= fimd_probe,</div><div class='ctx'> 	.remove		= __devexit_p(fimd_remove),</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "exynos4-fb",</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='add'>+		.pm	= &amp;fimd_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c<br/>index aba0fe47f7ea..025abb3e3b67 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_gem.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_gem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_gem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_drm_gem.c</a></div><div class='hunk'>@@ -55,17 +55,54 @@ static unsigned int convert_to_vm_err_msg(int msg)</div><div class='ctx'> 	return out_msg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int get_gem_mmap_offset(struct drm_gem_object *obj)</div><div class='add'>+static int exynos_drm_gem_handle_create(struct drm_gem_object *obj,</div><div class='add'>+					struct drm_file *file_priv,</div><div class='add'>+					unsigned int *handle)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * allocate a id of idr table where the obj is registered</div><div class='add'>+	 * and handle has the id what user can see.</div><div class='add'>+	 */</div><div class='add'>+	ret = drm_gem_handle_create(file_priv, obj, handle);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("gem handle = 0x%x\n", *handle);</div><div class='add'>+</div><div class='add'>+	/* drop reference from allocate - handle holds it now. */</div><div class='add'>+	drm_gem_object_unreference_unlocked(obj);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void exynos_drm_gem_destroy(struct exynos_drm_gem_obj *exynos_gem_obj)</div><div class='add'>+{</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+</div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='del'>-	return (unsigned int)obj-&gt;map_list.hash.key &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	if (!exynos_gem_obj)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	obj = &amp;exynos_gem_obj-&gt;base;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("handle count = %d\n", atomic_read(&amp;obj-&gt;handle_count));</div><div class='add'>+</div><div class='add'>+	exynos_drm_buf_destroy(obj-&gt;dev, exynos_gem_obj-&gt;buffer);</div><div class='add'>+</div><div class='add'>+	if (obj-&gt;map_list.map)</div><div class='add'>+		drm_gem_free_mmap_offset(obj);</div><div class='add'>+</div><div class='add'>+	/* release file pointer to gem object. */</div><div class='add'>+	drm_gem_object_release(obj);</div><div class='add'>+</div><div class='add'>+	kfree(exynos_gem_obj);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct exynos_drm_gem_obj</div><div class='del'>-		*exynos_drm_gem_init(struct drm_device *drm_dev,</div><div class='del'>-			struct drm_file *file_priv, unsigned int *handle,</div><div class='del'>-			unsigned int size)</div><div class='add'>+static struct exynos_drm_gem_obj *exynos_drm_gem_init(struct drm_device *dev,</div><div class='add'>+						      unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	struct exynos_drm_gem_obj *exynos_gem_obj;</div><div class='ctx'> 	struct drm_gem_object *obj;</div><div class='hunk'>@@ -73,75 +110,41 @@ static struct exynos_drm_gem_obj</div><div class='ctx'> </div><div class='ctx'> 	exynos_gem_obj = kzalloc(sizeof(*exynos_gem_obj), GFP_KERNEL);</div><div class='ctx'> 	if (!exynos_gem_obj) {</div><div class='del'>-		DRM_ERROR("failed to allocate exynos gem object.\n");</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+		DRM_ERROR("failed to allocate exynos gem object\n");</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	obj = &amp;exynos_gem_obj-&gt;base;</div><div class='ctx'> </div><div class='del'>-	ret = drm_gem_object_init(drm_dev, obj, size);</div><div class='add'>+	ret = drm_gem_object_init(dev, obj, size);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		DRM_ERROR("failed to initialize gem object.\n");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err_object_init;</div><div class='add'>+		DRM_ERROR("failed to initialize gem object\n");</div><div class='add'>+		kfree(exynos_gem_obj);</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("created file object = 0x%x\n", (unsigned int)obj-&gt;filp);</div><div class='ctx'> </div><div class='del'>-	ret = drm_gem_create_mmap_offset(obj);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		DRM_ERROR("failed to allocate mmap offset.\n");</div><div class='del'>-		goto err_create_mmap_offset;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * allocate a id of idr table where the obj is registered</div><div class='del'>-	 * and handle has the id what user can see.</div><div class='del'>-	 */</div><div class='del'>-	ret = drm_gem_handle_create(file_priv, obj, handle);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_handle_create;</div><div class='del'>-</div><div class='del'>-	DRM_DEBUG_KMS("gem handle = 0x%x\n", *handle);</div><div class='del'>-</div><div class='del'>-	/* drop reference from allocate - handle holds it now. */</div><div class='del'>-	drm_gem_object_unreference_unlocked(obj);</div><div class='del'>-</div><div class='ctx'> 	return exynos_gem_obj;</div><div class='del'>-</div><div class='del'>-err_handle_create:</div><div class='del'>-	drm_gem_free_mmap_offset(obj);</div><div class='del'>-</div><div class='del'>-err_create_mmap_offset:</div><div class='del'>-	drm_gem_object_release(obj);</div><div class='del'>-</div><div class='del'>-err_object_init:</div><div class='del'>-	kfree(exynos_gem_obj);</div><div class='del'>-</div><div class='del'>-	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct exynos_drm_gem_obj *exynos_drm_gem_create(struct drm_device *dev,</div><div class='del'>-				struct drm_file *file_priv,</div><div class='del'>-				unsigned int *handle, unsigned long size)</div><div class='add'>+						 unsigned long size)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	struct exynos_drm_gem_obj *exynos_gem_obj = NULL;</div><div class='ctx'> 	struct exynos_drm_gem_buf *buffer;</div><div class='add'>+	struct exynos_drm_gem_obj *exynos_gem_obj;</div><div class='ctx'> </div><div class='ctx'> 	size = roundup(size, PAGE_SIZE);</div><div class='del'>-</div><div class='ctx'> 	DRM_DEBUG_KMS("%s: size = 0x%lx\n", __FILE__, size);</div><div class='ctx'> </div><div class='ctx'> 	buffer = exynos_drm_buf_create(dev, size);</div><div class='del'>-	if (IS_ERR(buffer)) {</div><div class='del'>-		return ERR_CAST(buffer);</div><div class='del'>-	}</div><div class='add'>+	if (!buffer)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	exynos_gem_obj = exynos_drm_gem_init(dev, file_priv, handle, size);</div><div class='del'>-	if (IS_ERR(exynos_gem_obj)) {</div><div class='add'>+	exynos_gem_obj = exynos_drm_gem_init(dev, size);</div><div class='add'>+	if (!exynos_gem_obj) {</div><div class='ctx'> 		exynos_drm_buf_destroy(dev, buffer);</div><div class='del'>-		return exynos_gem_obj;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	exynos_gem_obj-&gt;buffer = buffer;</div><div class='hunk'>@@ -150,23 +153,30 @@ struct exynos_drm_gem_obj *exynos_drm_gem_create(struct drm_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int exynos_drm_gem_create_ioctl(struct drm_device *dev, void *data,</div><div class='del'>-					struct drm_file *file_priv)</div><div class='add'>+				struct drm_file *file_priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_exynos_gem_create *args = data;</div><div class='del'>-	struct exynos_drm_gem_obj *exynos_gem_obj = NULL;</div><div class='add'>+	struct exynos_drm_gem_obj *exynos_gem_obj;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='del'>-	exynos_gem_obj = exynos_drm_gem_create(dev, file_priv,</div><div class='del'>-						&amp;args-&gt;handle, args-&gt;size);</div><div class='add'>+	exynos_gem_obj = exynos_drm_gem_create(dev, args-&gt;size);</div><div class='ctx'> 	if (IS_ERR(exynos_gem_obj))</div><div class='ctx'> 		return PTR_ERR(exynos_gem_obj);</div><div class='ctx'> </div><div class='add'>+	ret = exynos_drm_gem_handle_create(&amp;exynos_gem_obj-&gt;base, file_priv,</div><div class='add'>+			&amp;args-&gt;handle);</div><div class='add'>+	if (ret) {</div><div class='add'>+		exynos_drm_gem_destroy(exynos_gem_obj);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int exynos_drm_gem_map_offset_ioctl(struct drm_device *dev, void *data,</div><div class='del'>-		struct drm_file *file_priv)</div><div class='add'>+				    struct drm_file *file_priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_exynos_gem_map_off *args = data;</div><div class='ctx'> </div><div class='hunk'>@@ -185,7 +195,7 @@ int exynos_drm_gem_map_offset_ioctl(struct drm_device *dev, void *data,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int exynos_drm_gem_mmap_buffer(struct file *filp,</div><div class='del'>-		struct vm_area_struct *vma)</div><div class='add'>+				      struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_gem_object *obj = filp-&gt;private_data;</div><div class='ctx'> 	struct exynos_drm_gem_obj *exynos_gem_obj = to_exynos_gem_obj(obj);</div><div class='hunk'>@@ -196,6 +206,7 @@ static int exynos_drm_gem_mmap_buffer(struct file *filp,</div><div class='ctx'> </div><div class='ctx'> 	vma-&gt;vm_flags |= (VM_IO | VM_RESERVED);</div><div class='ctx'> </div><div class='add'>+	/* in case of direct mapping, always having non-cachable attribute */</div><div class='ctx'> 	vma-&gt;vm_page_prot = pgprot_noncached(vma-&gt;vm_page_prot);</div><div class='ctx'> 	vma-&gt;vm_file = filp;</div><div class='ctx'> </div><div class='hunk'>@@ -232,7 +243,7 @@ static const struct file_operations exynos_drm_gem_fops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int exynos_drm_gem_mmap_ioctl(struct drm_device *dev, void *data,</div><div class='del'>-		struct drm_file *file_priv)</div><div class='add'>+			      struct drm_file *file_priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_exynos_gem_mmap *args = data;</div><div class='ctx'> 	struct drm_gem_object *obj;</div><div class='hunk'>@@ -278,32 +289,19 @@ int exynos_drm_gem_init_object(struct drm_gem_object *obj)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void exynos_drm_gem_free_object(struct drm_gem_object *gem_obj)</div><div class='add'>+void exynos_drm_gem_free_object(struct drm_gem_object *obj)</div><div class='ctx'> {</div><div class='del'>-	struct exynos_drm_gem_obj *exynos_gem_obj;</div><div class='del'>-</div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='del'>-	DRM_DEBUG_KMS("handle count = %d\n",</div><div class='del'>-			atomic_read(&amp;gem_obj-&gt;handle_count));</div><div class='del'>-</div><div class='del'>-	if (gem_obj-&gt;map_list.map)</div><div class='del'>-		drm_gem_free_mmap_offset(gem_obj);</div><div class='del'>-</div><div class='del'>-	/* release file pointer to gem object. */</div><div class='del'>-	drm_gem_object_release(gem_obj);</div><div class='del'>-</div><div class='del'>-	exynos_gem_obj = to_exynos_gem_obj(gem_obj);</div><div class='del'>-</div><div class='del'>-	exynos_drm_buf_destroy(gem_obj-&gt;dev, exynos_gem_obj-&gt;buffer);</div><div class='del'>-</div><div class='del'>-	kfree(exynos_gem_obj);</div><div class='add'>+	exynos_drm_gem_destroy(to_exynos_gem_obj(obj));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int exynos_drm_gem_dumb_create(struct drm_file *file_priv,</div><div class='del'>-		struct drm_device *dev, struct drm_mode_create_dumb *args)</div><div class='add'>+			       struct drm_device *dev,</div><div class='add'>+			       struct drm_mode_create_dumb *args)</div><div class='ctx'> {</div><div class='ctx'> 	struct exynos_drm_gem_obj *exynos_gem_obj;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='hunk'>@@ -316,19 +314,27 @@ int exynos_drm_gem_dumb_create(struct drm_file *file_priv,</div><div class='ctx'> 	args-&gt;pitch = args-&gt;width * args-&gt;bpp &gt;&gt; 3;</div><div class='ctx'> 	args-&gt;size = args-&gt;pitch * args-&gt;height;</div><div class='ctx'> </div><div class='del'>-	exynos_gem_obj = exynos_drm_gem_create(dev, file_priv, &amp;args-&gt;handle,</div><div class='del'>-							args-&gt;size);</div><div class='add'>+	exynos_gem_obj = exynos_drm_gem_create(dev, args-&gt;size);</div><div class='ctx'> 	if (IS_ERR(exynos_gem_obj))</div><div class='ctx'> 		return PTR_ERR(exynos_gem_obj);</div><div class='ctx'> </div><div class='add'>+	ret = exynos_drm_gem_handle_create(&amp;exynos_gem_obj-&gt;base, file_priv,</div><div class='add'>+			&amp;args-&gt;handle);</div><div class='add'>+	if (ret) {</div><div class='add'>+		exynos_drm_gem_destroy(exynos_gem_obj);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int exynos_drm_gem_dumb_map_offset(struct drm_file *file_priv,</div><div class='del'>-		struct drm_device *dev, uint32_t handle, uint64_t *offset)</div><div class='add'>+				   struct drm_device *dev, uint32_t handle,</div><div class='add'>+				   uint64_t *offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct exynos_drm_gem_obj *exynos_gem_obj;</div><div class='ctx'> 	struct drm_gem_object *obj;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='ctx'> </div><div class='hunk'>@@ -343,19 +349,46 @@ int exynos_drm_gem_dumb_map_offset(struct drm_file *file_priv,</div><div class='ctx'> 	obj = drm_gem_object_lookup(dev, file_priv, handle);</div><div class='ctx'> 	if (!obj) {</div><div class='ctx'> 		DRM_ERROR("failed to lookup gem object.\n");</div><div class='del'>-		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	exynos_gem_obj = to_exynos_gem_obj(obj);</div><div class='ctx'> </div><div class='del'>-	*offset = get_gem_mmap_offset(&amp;exynos_gem_obj-&gt;base);</div><div class='del'>-</div><div class='del'>-	drm_gem_object_unreference(obj);</div><div class='add'>+	if (!exynos_gem_obj-&gt;base.map_list.map) {</div><div class='add'>+		ret = drm_gem_create_mmap_offset(&amp;exynos_gem_obj-&gt;base);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	*offset = (u64)exynos_gem_obj-&gt;base.map_list.hash.key &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	DRM_DEBUG_KMS("offset = 0x%lx\n", (unsigned long)*offset);</div><div class='ctx'> </div><div class='add'>+out:</div><div class='add'>+	drm_gem_object_unreference(obj);</div><div class='add'>+unlock:</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int exynos_drm_gem_dumb_destroy(struct drm_file *file_priv,</div><div class='add'>+				struct drm_device *dev,</div><div class='add'>+				unsigned int handle)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * obj-&gt;refcount and obj-&gt;handle_count are decreased and</div><div class='add'>+	 * if both them are 0 then exynos_drm_gem_free_object()</div><div class='add'>+	 * would be called by callback to release resources.</div><div class='add'>+	 */</div><div class='add'>+	ret = drm_gem_handle_delete(file_priv, handle);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		DRM_ERROR("failed to delete drm_gem_handle.\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -403,28 +436,6 @@ int exynos_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-int exynos_drm_gem_dumb_destroy(struct drm_file *file_priv,</div><div class='del'>-		struct drm_device *dev, unsigned int handle)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * obj-&gt;refcount and obj-&gt;handle_count are decreased and</div><div class='del'>-	 * if both them are 0 then exynos_drm_gem_free_object()</div><div class='del'>-	 * would be called by callback to release resources.</div><div class='del'>-	 */</div><div class='del'>-	ret = drm_gem_handle_delete(file_priv, handle);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		DRM_ERROR("failed to delete drm_gem_handle.\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Inki Dae &lt;inki.dae@samsung.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Samsung SoC DRM GEM Module");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.h b/drivers/gpu/drm/exynos/exynos_drm_gem.h<br/>index ef8797334e6d..67cdc9168708 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_gem.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/exynos/exynos_drm_gem.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_gem.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_drm_gem.h</a></div><div class='hunk'>@@ -60,14 +60,16 @@ struct exynos_drm_gem_buf {</div><div class='ctx'>  *	user can access the buffer through kms_bo.handle.</div><div class='ctx'>  */</div><div class='ctx'> struct exynos_drm_gem_obj {</div><div class='del'>-	struct drm_gem_object base;</div><div class='del'>-	struct exynos_drm_gem_buf *buffer;</div><div class='add'>+	struct drm_gem_object		base;</div><div class='add'>+	struct exynos_drm_gem_buf	*buffer;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* create a new buffer and get a new gem handle. */</div><div class='add'>+/* destroy a buffer with gem object */</div><div class='add'>+void exynos_drm_gem_destroy(struct exynos_drm_gem_obj *exynos_gem_obj);</div><div class='add'>+</div><div class='add'>+/* create a new buffer with gem object */</div><div class='ctx'> struct exynos_drm_gem_obj *exynos_drm_gem_create(struct drm_device *dev,</div><div class='del'>-		struct drm_file *file_priv,</div><div class='del'>-		unsigned int *handle, unsigned long size);</div><div class='add'>+						 unsigned long size);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * request gem object creation and buffer allocation as the size</div><div class='hunk'>@@ -75,15 +77,18 @@ struct exynos_drm_gem_obj *exynos_drm_gem_create(struct drm_device *dev,</div><div class='ctx'>  * height and bpp.</div><div class='ctx'>  */</div><div class='ctx'> int exynos_drm_gem_create_ioctl(struct drm_device *dev, void *data,</div><div class='del'>-		struct drm_file *file_priv);</div><div class='add'>+				struct drm_file *file_priv);</div><div class='ctx'> </div><div class='ctx'> /* get buffer offset to map to user space. */</div><div class='ctx'> int exynos_drm_gem_map_offset_ioctl(struct drm_device *dev, void *data,</div><div class='del'>-		struct drm_file *file_priv);</div><div class='add'>+				    struct drm_file *file_priv);</div><div class='ctx'> </div><div class='del'>-/* unmap a buffer from user space. */</div><div class='del'>-int exynos_drm_gem_munmap_ioctl(struct drm_device *dev, void *data,</div><div class='del'>-		struct drm_file *file_priv);</div><div class='add'>+/*</div><div class='add'>+ * mmap the physically continuous memory that a gem object contains</div><div class='add'>+ * to user space.</div><div class='add'>+ */</div><div class='add'>+int exynos_drm_gem_mmap_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			      struct drm_file *file_priv);</div><div class='ctx'> </div><div class='ctx'> /* initialize gem object. */</div><div class='ctx'> int exynos_drm_gem_init_object(struct drm_gem_object *obj);</div><div class='hunk'>@@ -93,24 +98,13 @@ void exynos_drm_gem_free_object(struct drm_gem_object *gem_obj);</div><div class='ctx'> </div><div class='ctx'> /* create memory region for drm framebuffer. */</div><div class='ctx'> int exynos_drm_gem_dumb_create(struct drm_file *file_priv,</div><div class='del'>-		struct drm_device *dev, struct drm_mode_create_dumb *args);</div><div class='add'>+			       struct drm_device *dev,</div><div class='add'>+			       struct drm_mode_create_dumb *args);</div><div class='ctx'> </div><div class='ctx'> /* map memory region for drm framebuffer to user space. */</div><div class='ctx'> int exynos_drm_gem_dumb_map_offset(struct drm_file *file_priv,</div><div class='del'>-		struct drm_device *dev, uint32_t handle, uint64_t *offset);</div><div class='del'>-</div><div class='del'>-/* page fault handler and mmap fault address(virtual) to physical memory. */</div><div class='del'>-int exynos_drm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * mmap the physically continuous memory that a gem object contains</div><div class='del'>- * to user space.</div><div class='del'>- */</div><div class='del'>-int exynos_drm_gem_mmap_ioctl(struct drm_device *dev, void *data,</div><div class='del'>-		struct drm_file *file_priv);</div><div class='del'>-</div><div class='del'>-/* set vm_flags and we can change the vm attribute to other one at here. */</div><div class='del'>-int exynos_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma);</div><div class='add'>+				   struct drm_device *dev, uint32_t handle,</div><div class='add'>+				   uint64_t *offset);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * destroy memory region allocated.</div><div class='hunk'>@@ -118,6 +112,13 @@ int exynos_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma);</div><div class='ctx'>  *	would be released by drm_gem_handle_delete().</div><div class='ctx'>  */</div><div class='ctx'> int exynos_drm_gem_dumb_destroy(struct drm_file *file_priv,</div><div class='del'>-		struct drm_device *dev, unsigned int handle);</div><div class='add'>+				struct drm_device *dev,</div><div class='add'>+				unsigned int handle);</div><div class='add'>+</div><div class='add'>+/* page fault handler and mmap fault address(virtual) to physical memory. */</div><div class='add'>+int exynos_drm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);</div><div class='add'>+</div><div class='add'>+/* set vm_flags and we can change the vm attribute to other one at here. */</div><div class='add'>+int exynos_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c<br/>new file mode 100644<br/>index 000000000000..ed8a319ed84b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_hdmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_drm_hdmi.c</a></div><div class='hunk'>@@ -0,0 +1,439 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2011 Samsung Electronics Co.Ltd</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Inki Dae &lt;inki.dae@samsung.com&gt;</div><div class='add'>+ *	Seung-Woo Kim &lt;sw0312.kim@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/wait.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/pm_runtime.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;drm/exynos_drm.h&gt;</div><div class='add'>+</div><div class='add'>+#include "exynos_drm_drv.h"</div><div class='add'>+#include "exynos_drm_hdmi.h"</div><div class='add'>+</div><div class='add'>+#define to_context(dev)		platform_get_drvdata(to_platform_device(dev))</div><div class='add'>+#define to_subdrv(dev)		to_context(dev)</div><div class='add'>+#define get_ctx_from_subdrv(subdrv)	container_of(subdrv,\</div><div class='add'>+					struct drm_hdmi_context, subdrv);</div><div class='add'>+</div><div class='add'>+/* these callback points shoud be set by specific drivers. */</div><div class='add'>+static struct exynos_hdmi_display_ops *hdmi_display_ops;</div><div class='add'>+static struct exynos_hdmi_manager_ops *hdmi_manager_ops;</div><div class='add'>+static struct exynos_hdmi_overlay_ops *hdmi_overlay_ops;</div><div class='add'>+</div><div class='add'>+struct drm_hdmi_context {</div><div class='add'>+	struct exynos_drm_subdrv	subdrv;</div><div class='add'>+	struct exynos_drm_hdmi_context	*hdmi_ctx;</div><div class='add'>+	struct exynos_drm_hdmi_context	*mixer_ctx;</div><div class='add'>+	struct work_struct		work;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void exynos_drm_display_ops_register(struct exynos_hdmi_display_ops</div><div class='add'>+					*display_ops)</div><div class='add'>+{</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	if (display_ops)</div><div class='add'>+		hdmi_display_ops = display_ops;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(exynos_drm_display_ops_register);</div><div class='add'>+</div><div class='add'>+void exynos_drm_manager_ops_register(struct exynos_hdmi_manager_ops</div><div class='add'>+					*manager_ops)</div><div class='add'>+{</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	if (manager_ops)</div><div class='add'>+		hdmi_manager_ops = manager_ops;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(exynos_drm_manager_ops_register);</div><div class='add'>+</div><div class='add'>+void exynos_drm_overlay_ops_register(struct exynos_hdmi_overlay_ops</div><div class='add'>+					*overlay_ops)</div><div class='add'>+{</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	if (overlay_ops)</div><div class='add'>+		hdmi_overlay_ops = overlay_ops;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(exynos_drm_overlay_ops_register);</div><div class='add'>+</div><div class='add'>+static bool drm_hdmi_is_connected(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_hdmi_context *ctx = to_context(dev);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	if (hdmi_display_ops &amp;&amp; hdmi_display_ops-&gt;is_connected)</div><div class='add'>+		return hdmi_display_ops-&gt;is_connected(ctx-&gt;hdmi_ctx-&gt;ctx);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int drm_hdmi_get_edid(struct device *dev,</div><div class='add'>+		struct drm_connector *connector, u8 *edid, int len)</div><div class='add'>+{</div><div class='add'>+	struct drm_hdmi_context *ctx = to_context(dev);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	if (hdmi_display_ops &amp;&amp; hdmi_display_ops-&gt;get_edid)</div><div class='add'>+		return hdmi_display_ops-&gt;get_edid(ctx-&gt;hdmi_ctx-&gt;ctx,</div><div class='add'>+				connector, edid, 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 drm_hdmi_check_timing(struct device *dev, void *timing)</div><div class='add'>+{</div><div class='add'>+	struct drm_hdmi_context *ctx = to_context(dev);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	if (hdmi_display_ops &amp;&amp; hdmi_display_ops-&gt;check_timing)</div><div class='add'>+		return hdmi_display_ops-&gt;check_timing(ctx-&gt;hdmi_ctx-&gt;ctx,</div><div class='add'>+				timing);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int drm_hdmi_power_on(struct device *dev, int mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_hdmi_context *ctx = to_context(dev);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	if (hdmi_display_ops &amp;&amp; hdmi_display_ops-&gt;power_on)</div><div class='add'>+		return hdmi_display_ops-&gt;power_on(ctx-&gt;hdmi_ctx-&gt;ctx, 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 exynos_drm_display_ops drm_hdmi_display_ops = {</div><div class='add'>+	.type = EXYNOS_DISPLAY_TYPE_HDMI,</div><div class='add'>+	.is_connected = drm_hdmi_is_connected,</div><div class='add'>+	.get_edid = drm_hdmi_get_edid,</div><div class='add'>+	.check_timing = drm_hdmi_check_timing,</div><div class='add'>+	.power_on = drm_hdmi_power_on,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int drm_hdmi_enable_vblank(struct device *subdrv_dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_hdmi_context *ctx = to_context(subdrv_dev);</div><div class='add'>+	struct exynos_drm_subdrv *subdrv = &amp;ctx-&gt;subdrv;</div><div class='add'>+	struct exynos_drm_manager *manager = &amp;subdrv-&gt;manager;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	if (hdmi_overlay_ops &amp;&amp; hdmi_overlay_ops-&gt;enable_vblank)</div><div class='add'>+		return hdmi_overlay_ops-&gt;enable_vblank(ctx-&gt;mixer_ctx-&gt;ctx,</div><div class='add'>+							manager-&gt;pipe);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void drm_hdmi_disable_vblank(struct device *subdrv_dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_hdmi_context *ctx = to_context(subdrv_dev);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	if (hdmi_overlay_ops &amp;&amp; hdmi_overlay_ops-&gt;disable_vblank)</div><div class='add'>+		return hdmi_overlay_ops-&gt;disable_vblank(ctx-&gt;mixer_ctx-&gt;ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void drm_hdmi_mode_set(struct device *subdrv_dev, void *mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_hdmi_context *ctx = to_context(subdrv_dev);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	if (hdmi_manager_ops &amp;&amp; hdmi_manager_ops-&gt;mode_set)</div><div class='add'>+		hdmi_manager_ops-&gt;mode_set(ctx-&gt;hdmi_ctx-&gt;ctx, mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void drm_hdmi_commit(struct device *subdrv_dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_hdmi_context *ctx = to_context(subdrv_dev);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	if (hdmi_manager_ops &amp;&amp; hdmi_manager_ops-&gt;commit)</div><div class='add'>+		hdmi_manager_ops-&gt;commit(ctx-&gt;hdmi_ctx-&gt;ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void drm_hdmi_dpms(struct device *subdrv_dev, int mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_hdmi_context *ctx = to_context(subdrv_dev);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case DRM_MODE_DPMS_ON:</div><div class='add'>+		break;</div><div class='add'>+	case DRM_MODE_DPMS_STANDBY:</div><div class='add'>+	case DRM_MODE_DPMS_SUSPEND:</div><div class='add'>+	case DRM_MODE_DPMS_OFF:</div><div class='add'>+		if (hdmi_manager_ops &amp;&amp; hdmi_manager_ops-&gt;disable)</div><div class='add'>+			hdmi_manager_ops-&gt;disable(ctx-&gt;hdmi_ctx-&gt;ctx);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DRM_DEBUG_KMS("unkown dps mode: %d\n", mode);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct exynos_drm_manager_ops drm_hdmi_manager_ops = {</div><div class='add'>+	.dpms = drm_hdmi_dpms,</div><div class='add'>+	.enable_vblank = drm_hdmi_enable_vblank,</div><div class='add'>+	.disable_vblank = drm_hdmi_disable_vblank,</div><div class='add'>+	.mode_set = drm_hdmi_mode_set,</div><div class='add'>+	.commit = drm_hdmi_commit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void drm_mixer_mode_set(struct device *subdrv_dev,</div><div class='add'>+		struct exynos_drm_overlay *overlay)</div><div class='add'>+{</div><div class='add'>+	struct drm_hdmi_context *ctx = to_context(subdrv_dev);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	if (hdmi_overlay_ops &amp;&amp; hdmi_overlay_ops-&gt;win_mode_set)</div><div class='add'>+		hdmi_overlay_ops-&gt;win_mode_set(ctx-&gt;mixer_ctx-&gt;ctx, overlay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void drm_mixer_commit(struct device *subdrv_dev, int zpos)</div><div class='add'>+{</div><div class='add'>+	struct drm_hdmi_context *ctx = to_context(subdrv_dev);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	if (hdmi_overlay_ops &amp;&amp; hdmi_overlay_ops-&gt;win_commit)</div><div class='add'>+		hdmi_overlay_ops-&gt;win_commit(ctx-&gt;mixer_ctx-&gt;ctx, zpos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void drm_mixer_disable(struct device *subdrv_dev, int zpos)</div><div class='add'>+{</div><div class='add'>+	struct drm_hdmi_context *ctx = to_context(subdrv_dev);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	if (hdmi_overlay_ops &amp;&amp; hdmi_overlay_ops-&gt;win_disable)</div><div class='add'>+		hdmi_overlay_ops-&gt;win_disable(ctx-&gt;mixer_ctx-&gt;ctx, zpos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct exynos_drm_overlay_ops drm_hdmi_overlay_ops = {</div><div class='add'>+	.mode_set = drm_mixer_mode_set,</div><div class='add'>+	.commit = drm_mixer_commit,</div><div class='add'>+	.disable = drm_mixer_disable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int hdmi_subdrv_probe(struct drm_device *drm_dev,</div><div class='add'>+		struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct exynos_drm_subdrv *subdrv = to_subdrv(dev);</div><div class='add'>+	struct drm_hdmi_context *ctx;</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct exynos_drm_common_hdmi_pd *pd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	pd = pdev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	if (!pd) {</div><div class='add'>+		DRM_DEBUG_KMS("platform data is null.\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!pd-&gt;hdmi_dev) {</div><div class='add'>+		DRM_DEBUG_KMS("hdmi device is null.\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!pd-&gt;mixer_dev) {</div><div class='add'>+		DRM_DEBUG_KMS("mixer device is null.\n");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = platform_driver_register(&amp;hdmi_driver);</div><div class='add'>+	if (ret) {</div><div class='add'>+		DRM_DEBUG_KMS("failed to register hdmi driver.\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = platform_driver_register(&amp;mixer_driver);</div><div class='add'>+	if (ret) {</div><div class='add'>+		DRM_DEBUG_KMS("failed to register mixer driver.\n");</div><div class='add'>+		goto err_hdmidrv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx = get_ctx_from_subdrv(subdrv);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;hdmi_ctx = (struct exynos_drm_hdmi_context *)</div><div class='add'>+				to_context(pd-&gt;hdmi_dev);</div><div class='add'>+	if (!ctx-&gt;hdmi_ctx) {</div><div class='add'>+		DRM_DEBUG_KMS("hdmi context is null.\n");</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto err_mixerdrv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;hdmi_ctx-&gt;drm_dev = drm_dev;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;mixer_ctx = (struct exynos_drm_hdmi_context *)</div><div class='add'>+				to_context(pd-&gt;mixer_dev);</div><div class='add'>+	if (!ctx-&gt;mixer_ctx) {</div><div class='add'>+		DRM_DEBUG_KMS("mixer context is null.\n");</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto err_mixerdrv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;mixer_ctx-&gt;drm_dev = drm_dev;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_mixerdrv:</div><div class='add'>+	platform_driver_unregister(&amp;mixer_driver);</div><div class='add'>+err_hdmidrv:</div><div class='add'>+	platform_driver_unregister(&amp;hdmi_driver);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_subdrv_remove(struct drm_device *drm_dev)</div><div class='add'>+{</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	platform_driver_unregister(&amp;hdmi_driver);</div><div class='add'>+	platform_driver_unregister(&amp;mixer_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void exynos_drm_hdmi_late_probe(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct drm_hdmi_context *ctx = container_of(work,</div><div class='add'>+				struct drm_hdmi_context, work);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * this function calls subdrv-&gt;probe() so this must be called</div><div class='add'>+	 * after probe context.</div><div class='add'>+	 *</div><div class='add'>+	 * PS. subdrv-&gt;probe() will call platform_driver_register() to probe</div><div class='add'>+	 * hdmi and mixer driver.</div><div class='add'>+	 */</div><div class='add'>+	exynos_drm_subdrv_register(&amp;ctx-&gt;subdrv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit exynos_drm_hdmi_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 exynos_drm_subdrv *subdrv;</div><div class='add'>+	struct drm_hdmi_context *ctx;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+	if (!ctx) {</div><div class='add'>+		DRM_LOG_KMS("failed to alloc common hdmi context.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	subdrv = &amp;ctx-&gt;subdrv;</div><div class='add'>+</div><div class='add'>+	subdrv-&gt;probe = hdmi_subdrv_probe;</div><div class='add'>+	subdrv-&gt;remove = hdmi_subdrv_remove;</div><div class='add'>+	subdrv-&gt;manager.pipe = -1;</div><div class='add'>+	subdrv-&gt;manager.ops = &amp;drm_hdmi_manager_ops;</div><div class='add'>+	subdrv-&gt;manager.overlay_ops = &amp;drm_hdmi_overlay_ops;</div><div class='add'>+	subdrv-&gt;manager.display_ops = &amp;drm_hdmi_display_ops;</div><div class='add'>+	subdrv-&gt;manager.dev = dev;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, subdrv);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;ctx-&gt;work, exynos_drm_hdmi_late_probe);</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;ctx-&gt;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 hdmi_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</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 dev_pm_ops hdmi_pm_ops = {</div><div class='add'>+	.runtime_suspend = hdmi_runtime_suspend,</div><div class='add'>+	.runtime_resume	 = hdmi_runtime_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devexit exynos_drm_hdmi_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct drm_hdmi_context *ctx = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	exynos_drm_subdrv_unregister(&amp;ctx-&gt;subdrv);</div><div class='add'>+	kfree(ctx);</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 exynos_drm_common_hdmi_driver = {</div><div class='add'>+	.probe		= exynos_drm_hdmi_probe,</div><div class='add'>+	.remove		= __devexit_p(exynos_drm_hdmi_remove),</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "exynos-drm-hdmi",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+		.pm = &amp;hdmi_pm_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init exynos_drm_hdmi_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __FILE__);</div><div class='add'>+</div><div class='add'>+	ret = platform_driver_register(&amp;exynos_drm_common_hdmi_driver);</div><div class='add'>+	if (ret) {</div><div class='add'>+		DRM_DEBUG_KMS("failed to register hdmi common driver.\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit exynos_drm_hdmi_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;exynos_drm_common_hdmi_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(exynos_drm_hdmi_init);</div><div class='add'>+module_exit(exynos_drm_hdmi_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Inki Dae &lt;inki.dae@samsung.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Seung-Woo Kim, &lt;sw0312.kim@samsung.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Samsung SoC DRM HDMI Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.h b/drivers/gpu/drm/exynos/exynos_drm_hdmi.h<br/>new file mode 100644<br/>index 000000000000..3c29f790ee45<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_hdmi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_drm_hdmi.h</a></div><div class='hunk'>@@ -0,0 +1,73 @@</div><div class='add'>+/* exynos_drm_hdmi.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ * Authoer: Inki Dae &lt;inki.dae@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR</div><div class='add'>+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,</div><div class='add'>+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ * OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _EXYNOS_DRM_HDMI_H_</div><div class='add'>+#define _EXYNOS_DRM_HDMI_H_</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * exynos hdmi common context structure.</div><div class='add'>+ *</div><div class='add'>+ * @drm_dev: pointer to drm_device.</div><div class='add'>+ * @ctx: pointer to the context of specific device driver.</div><div class='add'>+ *	this context should be hdmi_context or mixer_context.</div><div class='add'>+ */</div><div class='add'>+struct exynos_drm_hdmi_context {</div><div class='add'>+	struct drm_device	*drm_dev;</div><div class='add'>+	void			*ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct exynos_hdmi_display_ops {</div><div class='add'>+	bool (*is_connected)(void *ctx);</div><div class='add'>+	int (*get_edid)(void *ctx, struct drm_connector *connector,</div><div class='add'>+			u8 *edid, int len);</div><div class='add'>+	int (*check_timing)(void *ctx, void *timing);</div><div class='add'>+	int (*power_on)(void *ctx, int mode);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct exynos_hdmi_manager_ops {</div><div class='add'>+	void (*mode_set)(void *ctx, void *mode);</div><div class='add'>+	void (*commit)(void *ctx);</div><div class='add'>+	void (*disable)(void *ctx);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct exynos_hdmi_overlay_ops {</div><div class='add'>+	int (*enable_vblank)(void *ctx, int pipe);</div><div class='add'>+	void (*disable_vblank)(void *ctx);</div><div class='add'>+	void (*win_mode_set)(void *ctx, struct exynos_drm_overlay *overlay);</div><div class='add'>+	void (*win_commit)(void *ctx, int zpos);</div><div class='add'>+	void (*win_disable)(void *ctx, int zpos);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct platform_driver hdmi_driver;</div><div class='add'>+extern struct platform_driver mixer_driver;</div><div class='add'>+</div><div class='add'>+void exynos_drm_display_ops_register(struct exynos_hdmi_display_ops</div><div class='add'>+					*display_ops);</div><div class='add'>+void exynos_drm_manager_ops_register(struct exynos_hdmi_manager_ops</div><div class='add'>+					*manager_ops);</div><div class='add'>+void exynos_drm_overlay_ops_register(struct exynos_hdmi_overlay_ops</div><div class='add'>+					*overlay_ops);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c<br/>new file mode 100644<br/>index 000000000000..bdcf770aa22e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_plane.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_drm_plane.c</a></div><div class='hunk'>@@ -0,0 +1,163 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2011 Samsung Electronics Co.Ltd</div><div class='add'>+ * Authors: Joonyoung Shim &lt;jy0922.shim@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+</div><div class='add'>+#include "exynos_drm.h"</div><div class='add'>+#include "exynos_drm_crtc.h"</div><div class='add'>+#include "exynos_drm_drv.h"</div><div class='add'>+#include "exynos_drm_encoder.h"</div><div class='add'>+</div><div class='add'>+struct exynos_plane {</div><div class='add'>+	struct drm_plane		base;</div><div class='add'>+	struct exynos_drm_overlay	overlay;</div><div class='add'>+	bool				enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+exynos_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,</div><div class='add'>+		     struct drm_framebuffer *fb, int crtc_x, int crtc_y,</div><div class='add'>+		     unsigned int crtc_w, unsigned int crtc_h,</div><div class='add'>+		     uint32_t src_x, uint32_t src_y,</div><div class='add'>+		     uint32_t src_w, uint32_t src_h)</div><div class='add'>+{</div><div class='add'>+	struct exynos_plane *exynos_plane =</div><div class='add'>+		container_of(plane, struct exynos_plane, base);</div><div class='add'>+	struct exynos_drm_overlay *overlay = &amp;exynos_plane-&gt;overlay;</div><div class='add'>+	struct exynos_drm_crtc_pos pos;</div><div class='add'>+	unsigned int x = src_x &gt;&gt; 16;</div><div class='add'>+	unsigned int y = src_y &gt;&gt; 16;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	memset(&amp;pos, 0, sizeof(struct exynos_drm_crtc_pos));</div><div class='add'>+	pos.crtc_x = crtc_x;</div><div class='add'>+	pos.crtc_y = crtc_y;</div><div class='add'>+	pos.crtc_w = crtc_w;</div><div class='add'>+	pos.crtc_h = crtc_h;</div><div class='add'>+</div><div class='add'>+	pos.fb_x = x;</div><div class='add'>+	pos.fb_y = y;</div><div class='add'>+</div><div class='add'>+	/* TODO: scale feature */</div><div class='add'>+	ret = exynos_drm_overlay_update(overlay, fb, &amp;crtc-&gt;mode, &amp;pos);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	exynos_drm_fn_encoder(crtc, overlay,</div><div class='add'>+			exynos_drm_encoder_crtc_mode_set);</div><div class='add'>+	exynos_drm_fn_encoder(crtc, &amp;overlay-&gt;zpos,</div><div class='add'>+			exynos_drm_encoder_crtc_plane_commit);</div><div class='add'>+</div><div class='add'>+	exynos_plane-&gt;enabled = 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 exynos_disable_plane(struct drm_plane *plane)</div><div class='add'>+{</div><div class='add'>+	struct exynos_plane *exynos_plane =</div><div class='add'>+		container_of(plane, struct exynos_plane, base);</div><div class='add'>+	struct exynos_drm_overlay *overlay = &amp;exynos_plane-&gt;overlay;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	if (!exynos_plane-&gt;enabled)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	exynos_drm_fn_encoder(plane-&gt;crtc, &amp;overlay-&gt;zpos,</div><div class='add'>+			exynos_drm_encoder_crtc_disable);</div><div class='add'>+</div><div class='add'>+	exynos_plane-&gt;enabled = false;</div><div class='add'>+	exynos_plane-&gt;overlay.zpos = DEFAULT_ZPOS;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void exynos_plane_destroy(struct drm_plane *plane)</div><div class='add'>+{</div><div class='add'>+	struct exynos_plane *exynos_plane =</div><div class='add'>+		container_of(plane, struct exynos_plane, base);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	exynos_disable_plane(plane);</div><div class='add'>+	drm_plane_cleanup(plane);</div><div class='add'>+	kfree(exynos_plane);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct drm_plane_funcs exynos_plane_funcs = {</div><div class='add'>+	.update_plane	= exynos_update_plane,</div><div class='add'>+	.disable_plane	= exynos_disable_plane,</div><div class='add'>+	.destroy	= exynos_plane_destroy,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int exynos_plane_init(struct drm_device *dev, unsigned int nr)</div><div class='add'>+{</div><div class='add'>+	struct exynos_plane *exynos_plane;</div><div class='add'>+	uint32_t possible_crtcs;</div><div class='add'>+</div><div class='add'>+	exynos_plane = kzalloc(sizeof(struct exynos_plane), GFP_KERNEL);</div><div class='add'>+	if (!exynos_plane)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* all CRTCs are available */</div><div class='add'>+	possible_crtcs = (1 &lt;&lt; MAX_CRTC) - 1;</div><div class='add'>+</div><div class='add'>+	exynos_plane-&gt;overlay.zpos = DEFAULT_ZPOS;</div><div class='add'>+</div><div class='add'>+	/* TODO: format */</div><div class='add'>+	return drm_plane_init(dev, &amp;exynos_plane-&gt;base, possible_crtcs,</div><div class='add'>+			      &amp;exynos_plane_funcs, NULL, 0, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int exynos_plane_set_zpos_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+				struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_exynos_plane_set_zpos *zpos_req = data;</div><div class='add'>+	struct drm_mode_object *obj;</div><div class='add'>+	struct drm_plane *plane;</div><div class='add'>+	struct exynos_plane *exynos_plane;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	if (!drm_core_check_feature(dev, DRIVER_MODESET))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (zpos_req-&gt;zpos &lt; 0 || zpos_req-&gt;zpos &gt;= MAX_PLANE) {</div><div class='add'>+		if (zpos_req-&gt;zpos != DEFAULT_ZPOS) {</div><div class='add'>+			DRM_ERROR("zpos not within limits\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+</div><div class='add'>+	obj = drm_mode_object_find(dev, zpos_req-&gt;plane_id,</div><div class='add'>+			DRM_MODE_OBJECT_PLANE);</div><div class='add'>+	if (!obj) {</div><div class='add'>+		DRM_DEBUG_KMS("Unknown plane ID %d\n",</div><div class='add'>+			      zpos_req-&gt;plane_id);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	plane = obj_to_plane(obj);</div><div class='add'>+	exynos_plane = container_of(plane, struct exynos_plane, base);</div><div class='add'>+</div><div class='add'>+	exynos_plane-&gt;overlay.zpos = zpos_req-&gt;zpos;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.h b/drivers/gpu/drm/exynos/exynos_drm_plane.h<br/>new file mode 100644<br/>index 000000000000..16b71f8217e7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_drm_plane.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_drm_plane.h</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2011 Samsung Electronics Co.Ltd</div><div class='add'>+ * Authors: Joonyoung Shim &lt;jy0922.shim@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int exynos_plane_init(struct drm_device *dev, unsigned int nr);</div><div class='add'>+int exynos_plane_set_zpos_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+				struct drm_file *file_priv);</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c<br/>new file mode 100644<br/>index 000000000000..f48f7ce92f5f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_hdmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_hdmi.c</a></div><div class='hunk'>@@ -0,0 +1,1176 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2011 Samsung Electronics Co.Ltd</div><div class='add'>+ * Authors:</div><div class='add'>+ * Seung-Woo Kim &lt;sw0312.kim@samsung.com&gt;</div><div class='add'>+ *	Inki Dae &lt;inki.dae@samsung.com&gt;</div><div class='add'>+ *	Joonyoung Shim &lt;jy0922.shim@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on drivers/media/video/s5p-tv/hdmi_drv.c</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "drm_edid.h"</div><div class='add'>+#include "drm_crtc_helper.h"</div><div class='add'>+</div><div class='add'>+#include "regs-hdmi.h"</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/wait.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/platform_device.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/delay.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/regulator/consumer.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;drm/exynos_drm.h&gt;</div><div class='add'>+</div><div class='add'>+#include "exynos_drm_drv.h"</div><div class='add'>+#include "exynos_drm_hdmi.h"</div><div class='add'>+</div><div class='add'>+#include "exynos_hdmi.h"</div><div class='add'>+</div><div class='add'>+#define HDMI_OVERLAY_NUMBER	3</div><div class='add'>+#define get_hdmi_context(dev)	platform_get_drvdata(to_platform_device(dev))</div><div class='add'>+</div><div class='add'>+static const u8 hdmiphy_conf27[32] = {</div><div class='add'>+	0x01, 0x05, 0x00, 0xD8, 0x10, 0x1C, 0x30, 0x40,</div><div class='add'>+	0x6B, 0x10, 0x02, 0x51, 0xDF, 0xF2, 0x54, 0x87,</div><div class='add'>+	0x84, 0x00, 0x30, 0x38, 0x00, 0x08, 0x10, 0xE0,</div><div class='add'>+	0x22, 0x40, 0xE3, 0x26, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 hdmiphy_conf27_027[32] = {</div><div class='add'>+	0x01, 0x05, 0x00, 0xD4, 0x10, 0x9C, 0x09, 0x64,</div><div class='add'>+	0x6B, 0x10, 0x02, 0x51, 0xDF, 0xF2, 0x54, 0x87,</div><div class='add'>+	0x84, 0x00, 0x30, 0x38, 0x00, 0x08, 0x10, 0xE0,</div><div class='add'>+	0x22, 0x40, 0xE3, 0x26, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 hdmiphy_conf74_175[32] = {</div><div class='add'>+	0x01, 0x05, 0x00, 0xD8, 0x10, 0x9C, 0xef, 0x5B,</div><div class='add'>+	0x6D, 0x10, 0x01, 0x51, 0xef, 0xF3, 0x54, 0xb9,</div><div class='add'>+	0x84, 0x00, 0x30, 0x38, 0x00, 0x08, 0x10, 0xE0,</div><div class='add'>+	0x22, 0x40, 0xa5, 0x26, 0x01, 0x00, 0x00, 0x00,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 hdmiphy_conf74_25[32] = {</div><div class='add'>+	0x01, 0x05, 0x00, 0xd8, 0x10, 0x9c, 0xf8, 0x40,</div><div class='add'>+	0x6a, 0x10, 0x01, 0x51, 0xff, 0xf1, 0x54, 0xba,</div><div class='add'>+	0x84, 0x00, 0x10, 0x38, 0x00, 0x08, 0x10, 0xe0,</div><div class='add'>+	0x22, 0x40, 0xa4, 0x26, 0x01, 0x00, 0x00, 0x00,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 hdmiphy_conf148_5[32] = {</div><div class='add'>+	0x01, 0x05, 0x00, 0xD8, 0x10, 0x9C, 0xf8, 0x40,</div><div class='add'>+	0x6A, 0x18, 0x00, 0x51, 0xff, 0xF1, 0x54, 0xba,</div><div class='add'>+	0x84, 0x00, 0x10, 0x38, 0x00, 0x08, 0x10, 0xE0,</div><div class='add'>+	0x22, 0x40, 0xa4, 0x26, 0x02, 0x00, 0x00, 0x00,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hdmi_tg_regs {</div><div class='add'>+	u8 cmd;</div><div class='add'>+	u8 h_fsz_l;</div><div class='add'>+	u8 h_fsz_h;</div><div class='add'>+	u8 hact_st_l;</div><div class='add'>+	u8 hact_st_h;</div><div class='add'>+	u8 hact_sz_l;</div><div class='add'>+	u8 hact_sz_h;</div><div class='add'>+	u8 v_fsz_l;</div><div class='add'>+	u8 v_fsz_h;</div><div class='add'>+	u8 vsync_l;</div><div class='add'>+	u8 vsync_h;</div><div class='add'>+	u8 vsync2_l;</div><div class='add'>+	u8 vsync2_h;</div><div class='add'>+	u8 vact_st_l;</div><div class='add'>+	u8 vact_st_h;</div><div class='add'>+	u8 vact_sz_l;</div><div class='add'>+	u8 vact_sz_h;</div><div class='add'>+	u8 field_chg_l;</div><div class='add'>+	u8 field_chg_h;</div><div class='add'>+	u8 vact_st2_l;</div><div class='add'>+	u8 vact_st2_h;</div><div class='add'>+	u8 vsync_top_hdmi_l;</div><div class='add'>+	u8 vsync_top_hdmi_h;</div><div class='add'>+	u8 vsync_bot_hdmi_l;</div><div class='add'>+	u8 vsync_bot_hdmi_h;</div><div class='add'>+	u8 field_top_hdmi_l;</div><div class='add'>+	u8 field_top_hdmi_h;</div><div class='add'>+	u8 field_bot_hdmi_l;</div><div class='add'>+	u8 field_bot_hdmi_h;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hdmi_core_regs {</div><div class='add'>+	u8 h_blank[2];</div><div class='add'>+	u8 v_blank[3];</div><div class='add'>+	u8 h_v_line[3];</div><div class='add'>+	u8 vsync_pol[1];</div><div class='add'>+	u8 int_pro_mode[1];</div><div class='add'>+	u8 v_blank_f[3];</div><div class='add'>+	u8 h_sync_gen[3];</div><div class='add'>+	u8 v_sync_gen1[3];</div><div class='add'>+	u8 v_sync_gen2[3];</div><div class='add'>+	u8 v_sync_gen3[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hdmi_preset_conf {</div><div class='add'>+	struct hdmi_core_regs core;</div><div class='add'>+	struct hdmi_tg_regs tg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hdmi_preset_conf hdmi_conf_480p = {</div><div class='add'>+	.core = {</div><div class='add'>+		.h_blank = {0x8a, 0x00},</div><div class='add'>+		.v_blank = {0x0d, 0x6a, 0x01},</div><div class='add'>+		.h_v_line = {0x0d, 0xa2, 0x35},</div><div class='add'>+		.vsync_pol = {0x01},</div><div class='add'>+		.int_pro_mode = {0x00},</div><div class='add'>+		.v_blank_f = {0x00, 0x00, 0x00},</div><div class='add'>+		.h_sync_gen = {0x0e, 0x30, 0x11},</div><div class='add'>+		.v_sync_gen1 = {0x0f, 0x90, 0x00},</div><div class='add'>+		/* other don't care */</div><div class='add'>+	},</div><div class='add'>+	.tg = {</div><div class='add'>+		0x00, /* cmd */</div><div class='add'>+		0x5a, 0x03, /* h_fsz */</div><div class='add'>+		0x8a, 0x00, 0xd0, 0x02, /* hact */</div><div class='add'>+		0x0d, 0x02, /* v_fsz */</div><div class='add'>+		0x01, 0x00, 0x33, 0x02, /* vsync */</div><div class='add'>+		0x2d, 0x00, 0xe0, 0x01, /* vact */</div><div class='add'>+		0x33, 0x02, /* field_chg */</div><div class='add'>+		0x49, 0x02, /* vact_st2 */</div><div class='add'>+		0x01, 0x00, 0x33, 0x02, /* vsync top/bot */</div><div class='add'>+		0x01, 0x00, 0x33, 0x02, /* field top/bot */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hdmi_preset_conf hdmi_conf_720p60 = {</div><div class='add'>+	.core = {</div><div class='add'>+		.h_blank = {0x72, 0x01},</div><div class='add'>+		.v_blank = {0xee, 0xf2, 0x00},</div><div class='add'>+		.h_v_line = {0xee, 0x22, 0x67},</div><div class='add'>+		.vsync_pol = {0x00},</div><div class='add'>+		.int_pro_mode = {0x00},</div><div class='add'>+		.v_blank_f = {0x00, 0x00, 0x00}, /* don't care */</div><div class='add'>+		.h_sync_gen = {0x6c, 0x50, 0x02},</div><div class='add'>+		.v_sync_gen1 = {0x0a, 0x50, 0x00},</div><div class='add'>+		.v_sync_gen2 = {0x01, 0x10, 0x00},</div><div class='add'>+		.v_sync_gen3 = {0x01, 0x10, 0x00},</div><div class='add'>+		/* other don't care */</div><div class='add'>+	},</div><div class='add'>+	.tg = {</div><div class='add'>+		0x00, /* cmd */</div><div class='add'>+		0x72, 0x06, /* h_fsz */</div><div class='add'>+		0x71, 0x01, 0x01, 0x05, /* hact */</div><div class='add'>+		0xee, 0x02, /* v_fsz */</div><div class='add'>+		0x01, 0x00, 0x33, 0x02, /* vsync */</div><div class='add'>+		0x1e, 0x00, 0xd0, 0x02, /* vact */</div><div class='add'>+		0x33, 0x02, /* field_chg */</div><div class='add'>+		0x49, 0x02, /* vact_st2 */</div><div class='add'>+		0x01, 0x00, 0x01, 0x00, /* vsync top/bot */</div><div class='add'>+		0x01, 0x00, 0x33, 0x02, /* field top/bot */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hdmi_preset_conf hdmi_conf_1080i50 = {</div><div class='add'>+	.core = {</div><div class='add'>+		.h_blank = {0xd0, 0x02},</div><div class='add'>+		.v_blank = {0x32, 0xB2, 0x00},</div><div class='add'>+		.h_v_line = {0x65, 0x04, 0xa5},</div><div class='add'>+		.vsync_pol = {0x00},</div><div class='add'>+		.int_pro_mode = {0x01},</div><div class='add'>+		.v_blank_f = {0x49, 0x2A, 0x23},</div><div class='add'>+		.h_sync_gen = {0x0E, 0xEA, 0x08},</div><div class='add'>+		.v_sync_gen1 = {0x07, 0x20, 0x00},</div><div class='add'>+		.v_sync_gen2 = {0x39, 0x42, 0x23},</div><div class='add'>+		.v_sync_gen3 = {0x38, 0x87, 0x73},</div><div class='add'>+		/* other don't care */</div><div class='add'>+	},</div><div class='add'>+	.tg = {</div><div class='add'>+		0x00, /* cmd */</div><div class='add'>+		0x50, 0x0A, /* h_fsz */</div><div class='add'>+		0xCF, 0x02, 0x81, 0x07, /* hact */</div><div class='add'>+		0x65, 0x04, /* v_fsz */</div><div class='add'>+		0x01, 0x00, 0x33, 0x02, /* vsync */</div><div class='add'>+		0x16, 0x00, 0x1c, 0x02, /* vact */</div><div class='add'>+		0x33, 0x02, /* field_chg */</div><div class='add'>+		0x49, 0x02, /* vact_st2 */</div><div class='add'>+		0x01, 0x00, 0x33, 0x02, /* vsync top/bot */</div><div class='add'>+		0x01, 0x00, 0x33, 0x02, /* field top/bot */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hdmi_preset_conf hdmi_conf_1080p50 = {</div><div class='add'>+	.core = {</div><div class='add'>+		.h_blank = {0xd0, 0x02},</div><div class='add'>+		.v_blank = {0x65, 0x6c, 0x01},</div><div class='add'>+		.h_v_line = {0x65, 0x04, 0xa5},</div><div class='add'>+		.vsync_pol = {0x00},</div><div class='add'>+		.int_pro_mode = {0x00},</div><div class='add'>+		.v_blank_f = {0x00, 0x00, 0x00}, /* don't care */</div><div class='add'>+		.h_sync_gen = {0x0e, 0xea, 0x08},</div><div class='add'>+		.v_sync_gen1 = {0x09, 0x40, 0x00},</div><div class='add'>+		.v_sync_gen2 = {0x01, 0x10, 0x00},</div><div class='add'>+		.v_sync_gen3 = {0x01, 0x10, 0x00},</div><div class='add'>+		/* other don't care */</div><div class='add'>+	},</div><div class='add'>+	.tg = {</div><div class='add'>+		0x00, /* cmd */</div><div class='add'>+		0x50, 0x0A, /* h_fsz */</div><div class='add'>+		0xCF, 0x02, 0x81, 0x07, /* hact */</div><div class='add'>+		0x65, 0x04, /* v_fsz */</div><div class='add'>+		0x01, 0x00, 0x33, 0x02, /* vsync */</div><div class='add'>+		0x2d, 0x00, 0x38, 0x04, /* vact */</div><div class='add'>+		0x33, 0x02, /* field_chg */</div><div class='add'>+		0x48, 0x02, /* vact_st2 */</div><div class='add'>+		0x01, 0x00, 0x01, 0x00, /* vsync top/bot */</div><div class='add'>+		0x01, 0x00, 0x33, 0x02, /* field top/bot */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hdmi_preset_conf hdmi_conf_1080i60 = {</div><div class='add'>+	.core = {</div><div class='add'>+		.h_blank = {0x18, 0x01},</div><div class='add'>+		.v_blank = {0x32, 0xB2, 0x00},</div><div class='add'>+		.h_v_line = {0x65, 0x84, 0x89},</div><div class='add'>+		.vsync_pol = {0x00},</div><div class='add'>+		.int_pro_mode = {0x01},</div><div class='add'>+		.v_blank_f = {0x49, 0x2A, 0x23},</div><div class='add'>+		.h_sync_gen = {0x56, 0x08, 0x02},</div><div class='add'>+		.v_sync_gen1 = {0x07, 0x20, 0x00},</div><div class='add'>+		.v_sync_gen2 = {0x39, 0x42, 0x23},</div><div class='add'>+		.v_sync_gen3 = {0xa4, 0x44, 0x4a},</div><div class='add'>+		/* other don't care */</div><div class='add'>+	},</div><div class='add'>+	.tg = {</div><div class='add'>+		0x00, /* cmd */</div><div class='add'>+		0x98, 0x08, /* h_fsz */</div><div class='add'>+		0x17, 0x01, 0x81, 0x07, /* hact */</div><div class='add'>+		0x65, 0x04, /* v_fsz */</div><div class='add'>+		0x01, 0x00, 0x33, 0x02, /* vsync */</div><div class='add'>+		0x16, 0x00, 0x1c, 0x02, /* vact */</div><div class='add'>+		0x33, 0x02, /* field_chg */</div><div class='add'>+		0x49, 0x02, /* vact_st2 */</div><div class='add'>+		0x01, 0x00, 0x33, 0x02, /* vsync top/bot */</div><div class='add'>+		0x01, 0x00, 0x33, 0x02, /* field top/bot */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hdmi_preset_conf hdmi_conf_1080p60 = {</div><div class='add'>+	.core = {</div><div class='add'>+		.h_blank = {0x18, 0x01},</div><div class='add'>+		.v_blank = {0x65, 0x6c, 0x01},</div><div class='add'>+		.h_v_line = {0x65, 0x84, 0x89},</div><div class='add'>+		.vsync_pol = {0x00},</div><div class='add'>+		.int_pro_mode = {0x00},</div><div class='add'>+		.v_blank_f = {0x00, 0x00, 0x00}, /* don't care */</div><div class='add'>+		.h_sync_gen = {0x56, 0x08, 0x02},</div><div class='add'>+		.v_sync_gen1 = {0x09, 0x40, 0x00},</div><div class='add'>+		.v_sync_gen2 = {0x01, 0x10, 0x00},</div><div class='add'>+		.v_sync_gen3 = {0x01, 0x10, 0x00},</div><div class='add'>+		/* other don't care */</div><div class='add'>+	},</div><div class='add'>+	.tg = {</div><div class='add'>+		0x00, /* cmd */</div><div class='add'>+		0x98, 0x08, /* h_fsz */</div><div class='add'>+		0x17, 0x01, 0x81, 0x07, /* hact */</div><div class='add'>+		0x65, 0x04, /* v_fsz */</div><div class='add'>+		0x01, 0x00, 0x33, 0x02, /* vsync */</div><div class='add'>+		0x2d, 0x00, 0x38, 0x04, /* vact */</div><div class='add'>+		0x33, 0x02, /* field_chg */</div><div class='add'>+		0x48, 0x02, /* vact_st2 */</div><div class='add'>+		0x01, 0x00, 0x01, 0x00, /* vsync top/bot */</div><div class='add'>+		0x01, 0x00, 0x33, 0x02, /* field top/bot */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hdmi_conf hdmi_confs[] = {</div><div class='add'>+	{ 1280, 720, 60, false, hdmiphy_conf74_25, &amp;hdmi_conf_720p60 },</div><div class='add'>+	{ 1280, 720, 50, false, hdmiphy_conf74_25, &amp;hdmi_conf_720p60 },</div><div class='add'>+	{ 720, 480, 60, false, hdmiphy_conf27_027, &amp;hdmi_conf_480p },</div><div class='add'>+	{ 1920, 1080, 50, true, hdmiphy_conf74_25, &amp;hdmi_conf_1080i50 },</div><div class='add'>+	{ 1920, 1080, 50, false, hdmiphy_conf148_5, &amp;hdmi_conf_1080p50 },</div><div class='add'>+	{ 1920, 1080, 60, true, hdmiphy_conf74_25, &amp;hdmi_conf_1080i60 },</div><div class='add'>+	{ 1920, 1080, 60, false, hdmiphy_conf148_5, &amp;hdmi_conf_1080p60 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline u32 hdmi_reg_read(struct hdmi_context *hdata, u32 reg_id)</div><div class='add'>+{</div><div class='add'>+	return readl(hdata-&gt;regs + reg_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void hdmi_reg_writeb(struct hdmi_context *hdata,</div><div class='add'>+				 u32 reg_id, u8 value)</div><div class='add'>+{</div><div class='add'>+	writeb(value, hdata-&gt;regs + reg_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void hdmi_reg_writemask(struct hdmi_context *hdata,</div><div class='add'>+				 u32 reg_id, u32 value, u32 mask)</div><div class='add'>+{</div><div class='add'>+	u32 old = readl(hdata-&gt;regs + reg_id);</div><div class='add'>+	value = (value &amp; mask) | (old &amp; ~mask);</div><div class='add'>+	writel(value, hdata-&gt;regs + reg_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_regs_dump(struct hdmi_context *hdata, char *prefix)</div><div class='add'>+{</div><div class='add'>+#define DUMPREG(reg_id) \</div><div class='add'>+	DRM_DEBUG_KMS("%s:" #reg_id " = %08x\n", prefix, \</div><div class='add'>+	readl(hdata-&gt;regs + reg_id))</div><div class='add'>+	DRM_DEBUG_KMS("%s: ---- CONTROL REGISTERS ----\n", prefix);</div><div class='add'>+	DUMPREG(HDMI_INTC_FLAG);</div><div class='add'>+	DUMPREG(HDMI_INTC_CON);</div><div class='add'>+	DUMPREG(HDMI_HPD_STATUS);</div><div class='add'>+	DUMPREG(HDMI_PHY_RSTOUT);</div><div class='add'>+	DUMPREG(HDMI_PHY_VPLL);</div><div class='add'>+	DUMPREG(HDMI_PHY_CMU);</div><div class='add'>+	DUMPREG(HDMI_CORE_RSTOUT);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s: ---- CORE REGISTERS ----\n", prefix);</div><div class='add'>+	DUMPREG(HDMI_CON_0);</div><div class='add'>+	DUMPREG(HDMI_CON_1);</div><div class='add'>+	DUMPREG(HDMI_CON_2);</div><div class='add'>+	DUMPREG(HDMI_SYS_STATUS);</div><div class='add'>+	DUMPREG(HDMI_PHY_STATUS);</div><div class='add'>+	DUMPREG(HDMI_STATUS_EN);</div><div class='add'>+	DUMPREG(HDMI_HPD);</div><div class='add'>+	DUMPREG(HDMI_MODE_SEL);</div><div class='add'>+	DUMPREG(HDMI_HPD_GEN);</div><div class='add'>+	DUMPREG(HDMI_DC_CONTROL);</div><div class='add'>+	DUMPREG(HDMI_VIDEO_PATTERN_GEN);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s: ---- CORE SYNC REGISTERS ----\n", prefix);</div><div class='add'>+	DUMPREG(HDMI_H_BLANK_0);</div><div class='add'>+	DUMPREG(HDMI_H_BLANK_1);</div><div class='add'>+	DUMPREG(HDMI_V_BLANK_0);</div><div class='add'>+	DUMPREG(HDMI_V_BLANK_1);</div><div class='add'>+	DUMPREG(HDMI_V_BLANK_2);</div><div class='add'>+	DUMPREG(HDMI_H_V_LINE_0);</div><div class='add'>+	DUMPREG(HDMI_H_V_LINE_1);</div><div class='add'>+	DUMPREG(HDMI_H_V_LINE_2);</div><div class='add'>+	DUMPREG(HDMI_VSYNC_POL);</div><div class='add'>+	DUMPREG(HDMI_INT_PRO_MODE);</div><div class='add'>+	DUMPREG(HDMI_V_BLANK_F_0);</div><div class='add'>+	DUMPREG(HDMI_V_BLANK_F_1);</div><div class='add'>+	DUMPREG(HDMI_V_BLANK_F_2);</div><div class='add'>+	DUMPREG(HDMI_H_SYNC_GEN_0);</div><div class='add'>+	DUMPREG(HDMI_H_SYNC_GEN_1);</div><div class='add'>+	DUMPREG(HDMI_H_SYNC_GEN_2);</div><div class='add'>+	DUMPREG(HDMI_V_SYNC_GEN_1_0);</div><div class='add'>+	DUMPREG(HDMI_V_SYNC_GEN_1_1);</div><div class='add'>+	DUMPREG(HDMI_V_SYNC_GEN_1_2);</div><div class='add'>+	DUMPREG(HDMI_V_SYNC_GEN_2_0);</div><div class='add'>+	DUMPREG(HDMI_V_SYNC_GEN_2_1);</div><div class='add'>+	DUMPREG(HDMI_V_SYNC_GEN_2_2);</div><div class='add'>+	DUMPREG(HDMI_V_SYNC_GEN_3_0);</div><div class='add'>+	DUMPREG(HDMI_V_SYNC_GEN_3_1);</div><div class='add'>+	DUMPREG(HDMI_V_SYNC_GEN_3_2);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s: ---- TG REGISTERS ----\n", prefix);</div><div class='add'>+	DUMPREG(HDMI_TG_CMD);</div><div class='add'>+	DUMPREG(HDMI_TG_H_FSZ_L);</div><div class='add'>+	DUMPREG(HDMI_TG_H_FSZ_H);</div><div class='add'>+	DUMPREG(HDMI_TG_HACT_ST_L);</div><div class='add'>+	DUMPREG(HDMI_TG_HACT_ST_H);</div><div class='add'>+	DUMPREG(HDMI_TG_HACT_SZ_L);</div><div class='add'>+	DUMPREG(HDMI_TG_HACT_SZ_H);</div><div class='add'>+	DUMPREG(HDMI_TG_V_FSZ_L);</div><div class='add'>+	DUMPREG(HDMI_TG_V_FSZ_H);</div><div class='add'>+	DUMPREG(HDMI_TG_VSYNC_L);</div><div class='add'>+	DUMPREG(HDMI_TG_VSYNC_H);</div><div class='add'>+	DUMPREG(HDMI_TG_VSYNC2_L);</div><div class='add'>+	DUMPREG(HDMI_TG_VSYNC2_H);</div><div class='add'>+	DUMPREG(HDMI_TG_VACT_ST_L);</div><div class='add'>+	DUMPREG(HDMI_TG_VACT_ST_H);</div><div class='add'>+	DUMPREG(HDMI_TG_VACT_SZ_L);</div><div class='add'>+	DUMPREG(HDMI_TG_VACT_SZ_H);</div><div class='add'>+	DUMPREG(HDMI_TG_FIELD_CHG_L);</div><div class='add'>+	DUMPREG(HDMI_TG_FIELD_CHG_H);</div><div class='add'>+	DUMPREG(HDMI_TG_VACT_ST2_L);</div><div class='add'>+	DUMPREG(HDMI_TG_VACT_ST2_H);</div><div class='add'>+	DUMPREG(HDMI_TG_VSYNC_TOP_HDMI_L);</div><div class='add'>+	DUMPREG(HDMI_TG_VSYNC_TOP_HDMI_H);</div><div class='add'>+	DUMPREG(HDMI_TG_VSYNC_BOT_HDMI_L);</div><div class='add'>+	DUMPREG(HDMI_TG_VSYNC_BOT_HDMI_H);</div><div class='add'>+	DUMPREG(HDMI_TG_FIELD_TOP_HDMI_L);</div><div class='add'>+	DUMPREG(HDMI_TG_FIELD_TOP_HDMI_H);</div><div class='add'>+	DUMPREG(HDMI_TG_FIELD_BOT_HDMI_L);</div><div class='add'>+	DUMPREG(HDMI_TG_FIELD_BOT_HDMI_H);</div><div class='add'>+#undef DUMPREG</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_conf_index(struct drm_display_mode *mode)</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(hdmi_confs); ++i)</div><div class='add'>+		if (hdmi_confs[i].width == mode-&gt;hdisplay &amp;&amp;</div><div class='add'>+				hdmi_confs[i].height == mode-&gt;vdisplay &amp;&amp;</div><div class='add'>+				hdmi_confs[i].vrefresh == mode-&gt;vrefresh &amp;&amp;</div><div class='add'>+				hdmi_confs[i].interlace ==</div><div class='add'>+				((mode-&gt;flags &amp; DRM_MODE_FLAG_INTERLACE) ?</div><div class='add'>+				 true : false))</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool hdmi_is_connected(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_context *hdata = (struct hdmi_context *)ctx;</div><div class='add'>+	u32 val = hdmi_reg_read(hdata, HDMI_HPD_STATUS);</div><div class='add'>+</div><div class='add'>+	if (val)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_get_edid(void *ctx, struct drm_connector *connector,</div><div class='add'>+				u8 *edid, int len)</div><div class='add'>+{</div><div class='add'>+	struct edid *raw_edid;</div><div class='add'>+	struct hdmi_context *hdata = (struct hdmi_context *)ctx;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	if (!hdata-&gt;ddc_port)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	raw_edid = drm_get_edid(connector, hdata-&gt;ddc_port-&gt;adapter);</div><div class='add'>+	if (raw_edid) {</div><div class='add'>+		memcpy(edid, raw_edid, min((1 + raw_edid-&gt;extensions)</div><div class='add'>+					* EDID_LENGTH, len));</div><div class='add'>+		DRM_DEBUG_KMS("width[%d] x height[%d]\n",</div><div class='add'>+				raw_edid-&gt;width_cm, raw_edid-&gt;height_cm);</div><div class='add'>+	} else {</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 hdmi_check_timing(void *ctx, void *timing)</div><div class='add'>+{</div><div class='add'>+	struct fb_videomode *check_timing = timing;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d]x[%d] [%d]Hz [%x]\n", check_timing-&gt;xres,</div><div class='add'>+			check_timing-&gt;yres, check_timing-&gt;refresh,</div><div class='add'>+			check_timing-&gt;vmode);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(hdmi_confs); ++i)</div><div class='add'>+		if (hdmi_confs[i].width == check_timing-&gt;xres &amp;&amp;</div><div class='add'>+			hdmi_confs[i].height == check_timing-&gt;yres &amp;&amp;</div><div class='add'>+			hdmi_confs[i].vrefresh == check_timing-&gt;refresh &amp;&amp;</div><div class='add'>+			hdmi_confs[i].interlace ==</div><div class='add'>+			((check_timing-&gt;vmode &amp; FB_VMODE_INTERLACED) ?</div><div class='add'>+			 true : false))</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 hdmi_display_power_on(void *ctx, int mode)</div><div class='add'>+{</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case DRM_MODE_DPMS_ON:</div><div class='add'>+		DRM_DEBUG_KMS("hdmi [on]\n");</div><div class='add'>+		break;</div><div class='add'>+	case DRM_MODE_DPMS_STANDBY:</div><div class='add'>+		break;</div><div class='add'>+	case DRM_MODE_DPMS_SUSPEND:</div><div class='add'>+		break;</div><div class='add'>+	case DRM_MODE_DPMS_OFF:</div><div class='add'>+		DRM_DEBUG_KMS("hdmi [off]\n");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct exynos_hdmi_display_ops display_ops = {</div><div class='add'>+	.is_connected	= hdmi_is_connected,</div><div class='add'>+	.get_edid	= hdmi_get_edid,</div><div class='add'>+	.check_timing	= hdmi_check_timing,</div><div class='add'>+	.power_on	= hdmi_display_power_on,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void hdmi_conf_reset(struct hdmi_context *hdata)</div><div class='add'>+{</div><div class='add'>+	/* disable hpd handle for drm */</div><div class='add'>+	hdata-&gt;hpd_handle = false;</div><div class='add'>+</div><div class='add'>+	/* resetting HDMI core */</div><div class='add'>+	hdmi_reg_writemask(hdata, HDMI_CORE_RSTOUT,  0, HDMI_CORE_SW_RSTOUT);</div><div class='add'>+	mdelay(10);</div><div class='add'>+	hdmi_reg_writemask(hdata, HDMI_CORE_RSTOUT, ~0, HDMI_CORE_SW_RSTOUT);</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	/* enable hpd handle for drm */</div><div class='add'>+	hdata-&gt;hpd_handle = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_conf_init(struct hdmi_context *hdata)</div><div class='add'>+{</div><div class='add'>+	/* disable hpd handle for drm */</div><div class='add'>+	hdata-&gt;hpd_handle = false;</div><div class='add'>+</div><div class='add'>+	/* enable HPD interrupts */</div><div class='add'>+	hdmi_reg_writemask(hdata, HDMI_INTC_CON, 0, HDMI_INTC_EN_GLOBAL |</div><div class='add'>+		HDMI_INTC_EN_HPD_PLUG | HDMI_INTC_EN_HPD_UNPLUG);</div><div class='add'>+	mdelay(10);</div><div class='add'>+	hdmi_reg_writemask(hdata, HDMI_INTC_CON, ~0, HDMI_INTC_EN_GLOBAL |</div><div class='add'>+		HDMI_INTC_EN_HPD_PLUG | HDMI_INTC_EN_HPD_UNPLUG);</div><div class='add'>+</div><div class='add'>+	/* choose HDMI mode */</div><div class='add'>+	hdmi_reg_writemask(hdata, HDMI_MODE_SEL,</div><div class='add'>+		HDMI_MODE_HDMI_EN, HDMI_MODE_MASK);</div><div class='add'>+	/* disable bluescreen */</div><div class='add'>+	hdmi_reg_writemask(hdata, HDMI_CON_0, 0, HDMI_BLUE_SCR_EN);</div><div class='add'>+	/* choose bluescreen (fecal) color */</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_BLUE_SCREEN_0, 0x12);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_BLUE_SCREEN_1, 0x34);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_BLUE_SCREEN_2, 0x56);</div><div class='add'>+	/* enable AVI packet every vsync, fixes purple line problem */</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_AVI_CON, 0x02);</div><div class='add'>+	/* force RGB, look to CEA-861-D, table 7 for more detail */</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_AVI_BYTE(0), 0 &lt;&lt; 5);</div><div class='add'>+	hdmi_reg_writemask(hdata, HDMI_CON_1, 0x10 &lt;&lt; 5, 0x11 &lt;&lt; 5);</div><div class='add'>+</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_SPD_CON, 0x02);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_AUI_CON, 0x02);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_ACR_CON, 0x04);</div><div class='add'>+</div><div class='add'>+	/* enable hpd handle for drm */</div><div class='add'>+	hdata-&gt;hpd_handle = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_timing_apply(struct hdmi_context *hdata,</div><div class='add'>+				 const struct hdmi_preset_conf *conf)</div><div class='add'>+{</div><div class='add'>+	const struct hdmi_core_regs *core = &amp;conf-&gt;core;</div><div class='add'>+	const struct hdmi_tg_regs *tg = &amp;conf-&gt;tg;</div><div class='add'>+	int tries;</div><div class='add'>+</div><div class='add'>+	/* setting core registers */</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_H_BLANK_0, core-&gt;h_blank[0]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_H_BLANK_1, core-&gt;h_blank[1]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_V_BLANK_0, core-&gt;v_blank[0]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_V_BLANK_1, core-&gt;v_blank[1]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_V_BLANK_2, core-&gt;v_blank[2]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_H_V_LINE_0, core-&gt;h_v_line[0]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_H_V_LINE_1, core-&gt;h_v_line[1]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_H_V_LINE_2, core-&gt;h_v_line[2]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_VSYNC_POL, core-&gt;vsync_pol[0]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_INT_PRO_MODE, core-&gt;int_pro_mode[0]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_V_BLANK_F_0, core-&gt;v_blank_f[0]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_V_BLANK_F_1, core-&gt;v_blank_f[1]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_V_BLANK_F_2, core-&gt;v_blank_f[2]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_H_SYNC_GEN_0, core-&gt;h_sync_gen[0]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_H_SYNC_GEN_1, core-&gt;h_sync_gen[1]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_H_SYNC_GEN_2, core-&gt;h_sync_gen[2]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_V_SYNC_GEN_1_0, core-&gt;v_sync_gen1[0]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_V_SYNC_GEN_1_1, core-&gt;v_sync_gen1[1]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_V_SYNC_GEN_1_2, core-&gt;v_sync_gen1[2]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_V_SYNC_GEN_2_0, core-&gt;v_sync_gen2[0]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_V_SYNC_GEN_2_1, core-&gt;v_sync_gen2[1]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_V_SYNC_GEN_2_2, core-&gt;v_sync_gen2[2]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_V_SYNC_GEN_3_0, core-&gt;v_sync_gen3[0]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_V_SYNC_GEN_3_1, core-&gt;v_sync_gen3[1]);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_V_SYNC_GEN_3_2, core-&gt;v_sync_gen3[2]);</div><div class='add'>+	/* Timing generator registers */</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_H_FSZ_L, tg-&gt;h_fsz_l);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_H_FSZ_H, tg-&gt;h_fsz_h);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_HACT_ST_L, tg-&gt;hact_st_l);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_HACT_ST_H, tg-&gt;hact_st_h);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_HACT_SZ_L, tg-&gt;hact_sz_l);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_HACT_SZ_H, tg-&gt;hact_sz_h);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_V_FSZ_L, tg-&gt;v_fsz_l);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_V_FSZ_H, tg-&gt;v_fsz_h);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_VSYNC_L, tg-&gt;vsync_l);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_VSYNC_H, tg-&gt;vsync_h);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_VSYNC2_L, tg-&gt;vsync2_l);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_VSYNC2_H, tg-&gt;vsync2_h);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_VACT_ST_L, tg-&gt;vact_st_l);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_VACT_ST_H, tg-&gt;vact_st_h);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_VACT_SZ_L, tg-&gt;vact_sz_l);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_VACT_SZ_H, tg-&gt;vact_sz_h);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_FIELD_CHG_L, tg-&gt;field_chg_l);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_FIELD_CHG_H, tg-&gt;field_chg_h);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_VACT_ST2_L, tg-&gt;vact_st2_l);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_VACT_ST2_H, tg-&gt;vact_st2_h);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_VSYNC_TOP_HDMI_L, tg-&gt;vsync_top_hdmi_l);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_VSYNC_TOP_HDMI_H, tg-&gt;vsync_top_hdmi_h);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_VSYNC_BOT_HDMI_L, tg-&gt;vsync_bot_hdmi_l);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_VSYNC_BOT_HDMI_H, tg-&gt;vsync_bot_hdmi_h);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_FIELD_TOP_HDMI_L, tg-&gt;field_top_hdmi_l);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_FIELD_TOP_HDMI_H, tg-&gt;field_top_hdmi_h);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_FIELD_BOT_HDMI_L, tg-&gt;field_bot_hdmi_l);</div><div class='add'>+	hdmi_reg_writeb(hdata, HDMI_TG_FIELD_BOT_HDMI_H, tg-&gt;field_bot_hdmi_h);</div><div class='add'>+</div><div class='add'>+	/* waiting for HDMIPHY's PLL to get to steady state */</div><div class='add'>+	for (tries = 100; tries; --tries) {</div><div class='add'>+		u32 val = hdmi_reg_read(hdata, HDMI_PHY_STATUS);</div><div class='add'>+		if (val &amp; HDMI_PHY_STATUS_READY)</div><div class='add'>+			break;</div><div class='add'>+		mdelay(1);</div><div class='add'>+	}</div><div class='add'>+	/* steady state not achieved */</div><div class='add'>+	if (tries == 0) {</div><div class='add'>+		DRM_ERROR("hdmiphy's pll could not reach steady state.\n");</div><div class='add'>+		hdmi_regs_dump(hdata, "timing apply");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clk_disable(hdata-&gt;res.sclk_hdmi);</div><div class='add'>+	clk_set_parent(hdata-&gt;res.sclk_hdmi, hdata-&gt;res.sclk_hdmiphy);</div><div class='add'>+	clk_enable(hdata-&gt;res.sclk_hdmi);</div><div class='add'>+</div><div class='add'>+	/* enable HDMI and timing generator */</div><div class='add'>+	hdmi_reg_writemask(hdata, HDMI_CON_0, ~0, HDMI_EN);</div><div class='add'>+	if (core-&gt;int_pro_mode[0])</div><div class='add'>+		hdmi_reg_writemask(hdata, HDMI_TG_CMD, ~0, HDMI_TG_EN |</div><div class='add'>+				HDMI_FIELD_EN);</div><div class='add'>+	else</div><div class='add'>+		hdmi_reg_writemask(hdata, HDMI_TG_CMD, ~0, HDMI_TG_EN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmiphy_conf_reset(struct hdmi_context *hdata)</div><div class='add'>+{</div><div class='add'>+	u8 buffer[2];</div><div class='add'>+</div><div class='add'>+	clk_disable(hdata-&gt;res.sclk_hdmi);</div><div class='add'>+	clk_set_parent(hdata-&gt;res.sclk_hdmi, hdata-&gt;res.sclk_pixel);</div><div class='add'>+	clk_enable(hdata-&gt;res.sclk_hdmi);</div><div class='add'>+</div><div class='add'>+	/* operation mode */</div><div class='add'>+	buffer[0] = 0x1f;</div><div class='add'>+	buffer[1] = 0x00;</div><div class='add'>+</div><div class='add'>+	if (hdata-&gt;hdmiphy_port)</div><div class='add'>+		i2c_master_send(hdata-&gt;hdmiphy_port, buffer, 2);</div><div class='add'>+</div><div class='add'>+	/* reset hdmiphy */</div><div class='add'>+	hdmi_reg_writemask(hdata, HDMI_PHY_RSTOUT, ~0, HDMI_PHY_SW_RSTOUT);</div><div class='add'>+	mdelay(10);</div><div class='add'>+	hdmi_reg_writemask(hdata, HDMI_PHY_RSTOUT,  0, HDMI_PHY_SW_RSTOUT);</div><div class='add'>+	mdelay(10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmiphy_conf_apply(struct hdmi_context *hdata)</div><div class='add'>+{</div><div class='add'>+	u8 buffer[32];</div><div class='add'>+	u8 operation[2];</div><div class='add'>+	u8 read_buffer[32] = {0, };</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!hdata-&gt;hdmiphy_port) {</div><div class='add'>+		DRM_ERROR("hdmiphy is not attached\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* pixel clock */</div><div class='add'>+	memcpy(buffer, hdmi_confs[hdata-&gt;cur_conf].hdmiphy_data, 32);</div><div class='add'>+	ret = i2c_master_send(hdata-&gt;hdmiphy_port, buffer, 32);</div><div class='add'>+	if (ret != 32) {</div><div class='add'>+		DRM_ERROR("failed to configure HDMIPHY via I2C\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	/* operation mode */</div><div class='add'>+	operation[0] = 0x1f;</div><div class='add'>+	operation[1] = 0x80;</div><div class='add'>+</div><div class='add'>+	ret = i2c_master_send(hdata-&gt;hdmiphy_port, operation, 2);</div><div class='add'>+	if (ret != 2) {</div><div class='add'>+		DRM_ERROR("failed to enable hdmiphy\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = i2c_master_recv(hdata-&gt;hdmiphy_port, read_buffer, 32);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		DRM_ERROR("failed to read hdmiphy config\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ret; i++)</div><div class='add'>+		DRM_DEBUG_KMS("hdmiphy[0x%02x] write[0x%02x] - "</div><div class='add'>+			"recv [0x%02x]\n", i, buffer[i], read_buffer[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_conf_apply(struct hdmi_context *hdata)</div><div class='add'>+{</div><div class='add'>+	const struct hdmi_preset_conf *conf =</div><div class='add'>+		  hdmi_confs[hdata-&gt;cur_conf].conf;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	hdmiphy_conf_reset(hdata);</div><div class='add'>+	hdmiphy_conf_apply(hdata);</div><div class='add'>+</div><div class='add'>+	hdmi_conf_reset(hdata);</div><div class='add'>+	hdmi_conf_init(hdata);</div><div class='add'>+</div><div class='add'>+	/* setting core registers */</div><div class='add'>+	hdmi_timing_apply(hdata, conf);</div><div class='add'>+</div><div class='add'>+	hdmi_regs_dump(hdata, "start");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_mode_set(void *ctx, void *mode)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_context *hdata = (struct hdmi_context *)ctx;</div><div class='add'>+	int conf_idx;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	conf_idx = hdmi_conf_index(mode);</div><div class='add'>+	if (conf_idx &gt;= 0 &amp;&amp; conf_idx &lt; ARRAY_SIZE(hdmi_confs))</div><div class='add'>+		hdata-&gt;cur_conf = conf_idx;</div><div class='add'>+	else</div><div class='add'>+		DRM_DEBUG_KMS("not supported mode\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_commit(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_context *hdata = (struct hdmi_context *)ctx;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	hdmi_conf_apply(hdata);</div><div class='add'>+</div><div class='add'>+	hdata-&gt;enabled = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_disable(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_context *hdata = (struct hdmi_context *)ctx;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	if (hdata-&gt;enabled) {</div><div class='add'>+		hdmiphy_conf_reset(hdata);</div><div class='add'>+		hdmi_conf_reset(hdata);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct exynos_hdmi_manager_ops manager_ops = {</div><div class='add'>+	.mode_set	= hdmi_mode_set,</div><div class='add'>+	.commit		= hdmi_commit,</div><div class='add'>+	.disable	= hdmi_disable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handle hotplug events outside the interrupt handler proper.</div><div class='add'>+ */</div><div class='add'>+static void hdmi_hotplug_func(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_context *hdata =</div><div class='add'>+		container_of(work, struct hdmi_context, hotplug_work);</div><div class='add'>+	struct exynos_drm_hdmi_context *ctx =</div><div class='add'>+		(struct exynos_drm_hdmi_context *)hdata-&gt;parent_ctx;</div><div class='add'>+</div><div class='add'>+	drm_helper_hpd_irq_event(ctx-&gt;drm_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t hdmi_irq_handler(int irq, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct exynos_drm_hdmi_context *ctx = arg;</div><div class='add'>+	struct hdmi_context *hdata = (struct hdmi_context *)ctx-&gt;ctx;</div><div class='add'>+	u32 intc_flag;</div><div class='add'>+</div><div class='add'>+	intc_flag = hdmi_reg_read(hdata, HDMI_INTC_FLAG);</div><div class='add'>+	/* clearing flags for HPD plug/unplug */</div><div class='add'>+	if (intc_flag &amp; HDMI_INTC_FLAG_HPD_UNPLUG) {</div><div class='add'>+		DRM_DEBUG_KMS("unplugged, handling:%d\n", hdata-&gt;hpd_handle);</div><div class='add'>+		hdmi_reg_writemask(hdata, HDMI_INTC_FLAG, ~0,</div><div class='add'>+			HDMI_INTC_FLAG_HPD_UNPLUG);</div><div class='add'>+	}</div><div class='add'>+	if (intc_flag &amp; HDMI_INTC_FLAG_HPD_PLUG) {</div><div class='add'>+		DRM_DEBUG_KMS("plugged, handling:%d\n", hdata-&gt;hpd_handle);</div><div class='add'>+		hdmi_reg_writemask(hdata, HDMI_INTC_FLAG, ~0,</div><div class='add'>+			HDMI_INTC_FLAG_HPD_PLUG);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;drm_dev &amp;&amp; hdata-&gt;hpd_handle)</div><div class='add'>+		queue_work(hdata-&gt;wq, &amp;hdata-&gt;hotplug_work);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit hdmi_resources_init(struct hdmi_context *hdata)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = hdata-&gt;dev;</div><div class='add'>+	struct hdmi_resources *res = &amp;hdata-&gt;res;</div><div class='add'>+	static char *supply[] = {</div><div class='add'>+		"hdmi-en",</div><div class='add'>+		"vdd",</div><div class='add'>+		"vdd_osc",</div><div class='add'>+		"vdd_pll",</div><div class='add'>+	};</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("HDMI resource init\n");</div><div class='add'>+</div><div class='add'>+	memset(res, 0, sizeof *res);</div><div class='add'>+</div><div class='add'>+	/* get clocks, power */</div><div class='add'>+	res-&gt;hdmi = clk_get(dev, "hdmi");</div><div class='add'>+	if (IS_ERR_OR_NULL(res-&gt;hdmi)) {</div><div class='add'>+		DRM_ERROR("failed to get clock 'hdmi'\n");</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	res-&gt;sclk_hdmi = clk_get(dev, "sclk_hdmi");</div><div class='add'>+	if (IS_ERR_OR_NULL(res-&gt;sclk_hdmi)) {</div><div class='add'>+		DRM_ERROR("failed to get clock 'sclk_hdmi'\n");</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	res-&gt;sclk_pixel = clk_get(dev, "sclk_pixel");</div><div class='add'>+	if (IS_ERR_OR_NULL(res-&gt;sclk_pixel)) {</div><div class='add'>+		DRM_ERROR("failed to get clock 'sclk_pixel'\n");</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	res-&gt;sclk_hdmiphy = clk_get(dev, "sclk_hdmiphy");</div><div class='add'>+	if (IS_ERR_OR_NULL(res-&gt;sclk_hdmiphy)) {</div><div class='add'>+		DRM_ERROR("failed to get clock 'sclk_hdmiphy'\n");</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	res-&gt;hdmiphy = clk_get(dev, "hdmiphy");</div><div class='add'>+	if (IS_ERR_OR_NULL(res-&gt;hdmiphy)) {</div><div class='add'>+		DRM_ERROR("failed to get clock 'hdmiphy'\n");</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clk_set_parent(res-&gt;sclk_hdmi, res-&gt;sclk_pixel);</div><div class='add'>+</div><div class='add'>+	res-&gt;regul_bulk = kzalloc(ARRAY_SIZE(supply) *</div><div class='add'>+		sizeof res-&gt;regul_bulk[0], GFP_KERNEL);</div><div class='add'>+	if (!res-&gt;regul_bulk) {</div><div class='add'>+		DRM_ERROR("failed to get memory for regulators\n");</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(supply); ++i) {</div><div class='add'>+		res-&gt;regul_bulk[i].supply = supply[i];</div><div class='add'>+		res-&gt;regul_bulk[i].consumer = NULL;</div><div class='add'>+	}</div><div class='add'>+	ret = regulator_bulk_get(dev, ARRAY_SIZE(supply), res-&gt;regul_bulk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		DRM_ERROR("failed to get regulators\n");</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	res-&gt;regul_count = ARRAY_SIZE(supply);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+fail:</div><div class='add'>+	DRM_ERROR("HDMI resource init - failed\n");</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_resources_cleanup(struct hdmi_context *hdata)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_resources *res = &amp;hdata-&gt;res;</div><div class='add'>+</div><div class='add'>+	regulator_bulk_free(res-&gt;regul_count, res-&gt;regul_bulk);</div><div class='add'>+	/* kfree is NULL-safe */</div><div class='add'>+	kfree(res-&gt;regul_bulk);</div><div class='add'>+	if (!IS_ERR_OR_NULL(res-&gt;hdmiphy))</div><div class='add'>+		clk_put(res-&gt;hdmiphy);</div><div class='add'>+	if (!IS_ERR_OR_NULL(res-&gt;sclk_hdmiphy))</div><div class='add'>+		clk_put(res-&gt;sclk_hdmiphy);</div><div class='add'>+	if (!IS_ERR_OR_NULL(res-&gt;sclk_pixel))</div><div class='add'>+		clk_put(res-&gt;sclk_pixel);</div><div class='add'>+	if (!IS_ERR_OR_NULL(res-&gt;sclk_hdmi))</div><div class='add'>+		clk_put(res-&gt;sclk_hdmi);</div><div class='add'>+	if (!IS_ERR_OR_NULL(res-&gt;hdmi))</div><div class='add'>+		clk_put(res-&gt;hdmi);</div><div class='add'>+	memset(res, 0, sizeof *res);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_resource_poweron(struct hdmi_context *hdata)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_resources *res = &amp;hdata-&gt;res;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	/* turn HDMI power on */</div><div class='add'>+	regulator_bulk_enable(res-&gt;regul_count, res-&gt;regul_bulk);</div><div class='add'>+	/* power-on hdmi physical interface */</div><div class='add'>+	clk_enable(res-&gt;hdmiphy);</div><div class='add'>+	/* turn clocks on */</div><div class='add'>+	clk_enable(res-&gt;hdmi);</div><div class='add'>+	clk_enable(res-&gt;sclk_hdmi);</div><div class='add'>+</div><div class='add'>+	hdmiphy_conf_reset(hdata);</div><div class='add'>+	hdmi_conf_reset(hdata);</div><div class='add'>+	hdmi_conf_init(hdata);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_resource_poweroff(struct hdmi_context *hdata)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_resources *res = &amp;hdata-&gt;res;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	/* turn clocks off */</div><div class='add'>+	clk_disable(res-&gt;sclk_hdmi);</div><div class='add'>+	clk_disable(res-&gt;hdmi);</div><div class='add'>+	/* power-off hdmiphy */</div><div class='add'>+	clk_disable(res-&gt;hdmiphy);</div><div class='add'>+	/* turn HDMI power off */</div><div class='add'>+	regulator_bulk_disable(res-&gt;regul_count, res-&gt;regul_bulk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct exynos_drm_hdmi_context *ctx = get_hdmi_context(dev);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	hdmi_resource_poweroff((struct hdmi_context *)ctx-&gt;ctx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct exynos_drm_hdmi_context *ctx = get_hdmi_context(dev);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	hdmi_resource_poweron((struct hdmi_context *)ctx-&gt;ctx);</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 dev_pm_ops hdmi_pm_ops = {</div><div class='add'>+	.runtime_suspend = hdmi_runtime_suspend,</div><div class='add'>+	.runtime_resume	 = hdmi_runtime_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_client *hdmi_ddc, *hdmi_hdmiphy;</div><div class='add'>+</div><div class='add'>+void hdmi_attach_ddc_client(struct i2c_client *ddc)</div><div class='add'>+{</div><div class='add'>+	if (ddc)</div><div class='add'>+		hdmi_ddc = ddc;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hdmi_attach_ddc_client);</div><div class='add'>+</div><div class='add'>+void hdmi_attach_hdmiphy_client(struct i2c_client *hdmiphy)</div><div class='add'>+{</div><div class='add'>+	if (hdmiphy)</div><div class='add'>+		hdmi_hdmiphy = hdmiphy;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hdmi_attach_hdmiphy_client);</div><div class='add'>+</div><div class='add'>+static int __devinit hdmi_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 exynos_drm_hdmi_context *drm_hdmi_ctx;</div><div class='add'>+	struct hdmi_context *hdata;</div><div class='add'>+	struct exynos_drm_hdmi_pdata *pdata;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d]\n", __LINE__);</div><div class='add'>+</div><div class='add'>+	pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	if (!pdata) {</div><div class='add'>+		DRM_ERROR("no platform data specified\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	drm_hdmi_ctx = kzalloc(sizeof(*drm_hdmi_ctx), GFP_KERNEL);</div><div class='add'>+	if (!drm_hdmi_ctx) {</div><div class='add'>+		DRM_ERROR("failed to allocate common hdmi context.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdata = kzalloc(sizeof(struct hdmi_context), GFP_KERNEL);</div><div class='add'>+	if (!hdata) {</div><div class='add'>+		DRM_ERROR("out of memory\n");</div><div class='add'>+		kfree(drm_hdmi_ctx);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	drm_hdmi_ctx-&gt;ctx = (void *)hdata;</div><div class='add'>+	hdata-&gt;parent_ctx = (void *)drm_hdmi_ctx;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, drm_hdmi_ctx);</div><div class='add'>+</div><div class='add'>+	hdata-&gt;default_win = pdata-&gt;default_win;</div><div class='add'>+	hdata-&gt;default_timing = &amp;pdata-&gt;timing;</div><div class='add'>+	hdata-&gt;default_bpp = pdata-&gt;bpp;</div><div class='add'>+	hdata-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	ret = hdmi_resources_init(hdata);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_data;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!res) {</div><div class='add'>+		DRM_ERROR("failed to find registers\n");</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto err_resource;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdata-&gt;regs_res = request_mem_region(res-&gt;start, resource_size(res),</div><div class='add'>+					   dev_name(dev));</div><div class='add'>+	if (!hdata-&gt;regs_res) {</div><div class='add'>+		DRM_ERROR("failed to claim register region\n");</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto err_resource;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdata-&gt;regs = ioremap(res-&gt;start, resource_size(res));</div><div class='add'>+	if (!hdata-&gt;regs) {</div><div class='add'>+		DRM_ERROR("failed to map registers\n");</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto err_req_region;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* DDC i2c driver */</div><div class='add'>+	if (i2c_add_driver(&amp;ddc_driver)) {</div><div class='add'>+		DRM_ERROR("failed to register ddc i2c driver\n");</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto err_iomap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdata-&gt;ddc_port = hdmi_ddc;</div><div class='add'>+</div><div class='add'>+	/* hdmiphy i2c driver */</div><div class='add'>+	if (i2c_add_driver(&amp;hdmiphy_driver)) {</div><div class='add'>+		DRM_ERROR("failed to register hdmiphy i2c driver\n");</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto err_ddc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdata-&gt;hdmiphy_port = hdmi_hdmiphy;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='add'>+	if (res == NULL) {</div><div class='add'>+		DRM_ERROR("get interrupt resource failed.\n");</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto err_hdmiphy;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* create workqueue and hotplug work */</div><div class='add'>+	hdata-&gt;wq = alloc_workqueue("exynos-drm-hdmi",</div><div class='add'>+			WQ_UNBOUND | WQ_NON_REENTRANT, 1);</div><div class='add'>+	if (hdata-&gt;wq == NULL) {</div><div class='add'>+		DRM_ERROR("Failed to create workqueue.\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_hdmiphy;</div><div class='add'>+	}</div><div class='add'>+	INIT_WORK(&amp;hdata-&gt;hotplug_work, hdmi_hotplug_func);</div><div class='add'>+</div><div class='add'>+	/* register hpd interrupt */</div><div class='add'>+	ret = request_irq(res-&gt;start, hdmi_irq_handler, 0, "drm_hdmi",</div><div class='add'>+				drm_hdmi_ctx);</div><div class='add'>+	if (ret) {</div><div class='add'>+		DRM_ERROR("request interrupt failed.\n");</div><div class='add'>+		goto err_workqueue;</div><div class='add'>+	}</div><div class='add'>+	hdata-&gt;irq = res-&gt;start;</div><div class='add'>+</div><div class='add'>+	/* register specific callbacks to common hdmi. */</div><div class='add'>+	exynos_drm_display_ops_register(&amp;display_ops);</div><div class='add'>+	exynos_drm_manager_ops_register(&amp;manager_ops);</div><div class='add'>+</div><div class='add'>+	hdmi_resource_poweron(hdata);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_workqueue:</div><div class='add'>+	destroy_workqueue(hdata-&gt;wq);</div><div class='add'>+err_hdmiphy:</div><div class='add'>+	i2c_del_driver(&amp;hdmiphy_driver);</div><div class='add'>+err_ddc:</div><div class='add'>+	i2c_del_driver(&amp;ddc_driver);</div><div class='add'>+err_iomap:</div><div class='add'>+	iounmap(hdata-&gt;regs);</div><div class='add'>+err_req_region:</div><div class='add'>+	release_resource(hdata-&gt;regs_res);</div><div class='add'>+	kfree(hdata-&gt;regs_res);</div><div class='add'>+err_resource:</div><div class='add'>+	hdmi_resources_cleanup(hdata);</div><div class='add'>+err_data:</div><div class='add'>+	kfree(hdata);</div><div class='add'>+	kfree(drm_hdmi_ctx);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit hdmi_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct exynos_drm_hdmi_context *ctx = platform_get_drvdata(pdev);</div><div class='add'>+	struct hdmi_context *hdata = (struct hdmi_context *)ctx-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	hdmi_resource_poweroff(hdata);</div><div class='add'>+</div><div class='add'>+	disable_irq(hdata-&gt;irq);</div><div class='add'>+	free_irq(hdata-&gt;irq, hdata);</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;hdata-&gt;hotplug_work);</div><div class='add'>+	destroy_workqueue(hdata-&gt;wq);</div><div class='add'>+</div><div class='add'>+	hdmi_resources_cleanup(hdata);</div><div class='add'>+</div><div class='add'>+	iounmap(hdata-&gt;regs);</div><div class='add'>+</div><div class='add'>+	release_resource(hdata-&gt;regs_res);</div><div class='add'>+	kfree(hdata-&gt;regs_res);</div><div class='add'>+</div><div class='add'>+	/* hdmiphy i2c driver */</div><div class='add'>+	i2c_del_driver(&amp;hdmiphy_driver);</div><div class='add'>+	/* DDC i2c driver */</div><div class='add'>+	i2c_del_driver(&amp;ddc_driver);</div><div class='add'>+</div><div class='add'>+	kfree(hdata);</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 hdmi_driver = {</div><div class='add'>+	.probe		= hdmi_probe,</div><div class='add'>+	.remove		= __devexit_p(hdmi_remove),</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "exynos4-hdmi",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+		.pm = &amp;hdmi_pm_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(hdmi_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Seung-Woo Kim, &lt;sw0312.kim@samsung.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Inki Dae &lt;inki.dae@samsung.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Joonyoung Shim &lt;jy0922.shim@samsung.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Samsung DRM HDMI core Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.h b/drivers/gpu/drm/exynos/exynos_hdmi.h<br/>new file mode 100644<br/>index 000000000000..31d6cf84c1aa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_hdmi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_hdmi.h</a></div><div class='hunk'>@@ -0,0 +1,87 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Inki Dae &lt;inki.dae@samsung.com&gt;</div><div class='add'>+ *	Seung-Woo Kim &lt;sw0312.kim@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR</div><div class='add'>+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,</div><div class='add'>+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ * OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _EXYNOS_HDMI_H_</div><div class='add'>+#define _EXYNOS_HDMI_H_</div><div class='add'>+</div><div class='add'>+struct hdmi_conf {</div><div class='add'>+	int width;</div><div class='add'>+	int height;</div><div class='add'>+	int vrefresh;</div><div class='add'>+	bool interlace;</div><div class='add'>+	const u8 *hdmiphy_data;</div><div class='add'>+	const struct hdmi_preset_conf *conf;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hdmi_resources {</div><div class='add'>+	struct clk *hdmi;</div><div class='add'>+	struct clk *sclk_hdmi;</div><div class='add'>+	struct clk *sclk_pixel;</div><div class='add'>+	struct clk *sclk_hdmiphy;</div><div class='add'>+	struct clk *hdmiphy;</div><div class='add'>+	struct regulator_bulk_data *regul_bulk;</div><div class='add'>+	int regul_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hdmi_context {</div><div class='add'>+	struct device			*dev;</div><div class='add'>+	struct drm_device		*drm_dev;</div><div class='add'>+	struct fb_videomode		*default_timing;</div><div class='add'>+	unsigned int			default_win;</div><div class='add'>+	unsigned int			default_bpp;</div><div class='add'>+	bool				hpd_handle;</div><div class='add'>+	bool				enabled;</div><div class='add'>+</div><div class='add'>+	struct resource			*regs_res;</div><div class='add'>+	/** base address of HDMI registers */</div><div class='add'>+	void __iomem *regs;</div><div class='add'>+	/** HDMI hotplug interrupt */</div><div class='add'>+	unsigned int irq;</div><div class='add'>+	/** workqueue for delayed work */</div><div class='add'>+	struct workqueue_struct *wq;</div><div class='add'>+	/** hotplug handling work */</div><div class='add'>+	struct work_struct hotplug_work;</div><div class='add'>+</div><div class='add'>+	struct i2c_client *ddc_port;</div><div class='add'>+	struct i2c_client *hdmiphy_port;</div><div class='add'>+</div><div class='add'>+	/** current hdmiphy conf index */</div><div class='add'>+	int cur_conf;</div><div class='add'>+	/** other resources */</div><div class='add'>+	struct hdmi_resources res;</div><div class='add'>+</div><div class='add'>+	void *parent_ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void hdmi_attach_ddc_client(struct i2c_client *ddc);</div><div class='add'>+void hdmi_attach_hdmiphy_client(struct i2c_client *hdmiphy);</div><div class='add'>+</div><div class='add'>+extern struct i2c_driver hdmiphy_driver;</div><div class='add'>+extern struct i2c_driver ddc_driver;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_hdmiphy.c b/drivers/gpu/drm/exynos/exynos_hdmiphy.c<br/>new file mode 100644<br/>index 000000000000..9fe2995ab9f9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_hdmiphy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_hdmiphy.c</a></div><div class='hunk'>@@ -0,0 +1,58 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2011 Samsung Electronics Co.Ltd</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Seung-Woo Kim &lt;sw0312.kim@samsung.com&gt;</div><div class='add'>+ *	Inki Dae &lt;inki.dae@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.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'>+</div><div class='add'>+#include "exynos_drm_drv.h"</div><div class='add'>+#include "exynos_hdmi.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int hdmiphy_probe(struct i2c_client *client,</div><div class='add'>+	const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	hdmi_attach_hdmiphy_client(client);</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;client-&gt;adapter-&gt;dev, "attached s5p_hdmiphy "</div><div class='add'>+		"into i2c adapter successfully\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmiphy_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	dev_info(&amp;client-&gt;adapter-&gt;dev, "detached s5p_hdmiphy "</div><div class='add'>+		"from i2c adapter successfully\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 i2c_device_id hdmiphy_id[] = {</div><div class='add'>+	{ "s5p_hdmiphy", 0 },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct i2c_driver hdmiphy_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "s5p-hdmiphy",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.id_table = hdmiphy_id,</div><div class='add'>+	.probe		= hdmiphy_probe,</div><div class='add'>+	.remove		= __devexit_p(hdmiphy_remove),</div><div class='add'>+	.command		= NULL,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(hdmiphy_driver);</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c<br/>new file mode 100644<br/>index 000000000000..ac24cff39775<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_mixer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_mixer.c</a></div><div class='hunk'>@@ -0,0 +1,1070 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2011 Samsung Electronics Co.Ltd</div><div class='add'>+ * Authors:</div><div class='add'>+ * Seung-Woo Kim &lt;sw0312.kim@samsung.com&gt;</div><div class='add'>+ *	Inki Dae &lt;inki.dae@samsung.com&gt;</div><div class='add'>+ *	Joonyoung Shim &lt;jy0922.shim@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on drivers/media/video/s5p-tv/mixer_reg.c</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+</div><div class='add'>+#include "regs-mixer.h"</div><div class='add'>+#include "regs-vp.h"</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/wait.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/platform_device.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/delay.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/regulator/consumer.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;drm/exynos_drm.h&gt;</div><div class='add'>+</div><div class='add'>+#include "exynos_drm_drv.h"</div><div class='add'>+#include "exynos_drm_hdmi.h"</div><div class='add'>+#include "exynos_hdmi.h"</div><div class='add'>+#include "exynos_mixer.h"</div><div class='add'>+</div><div class='add'>+#define get_mixer_context(dev)	platform_get_drvdata(to_platform_device(dev))</div><div class='add'>+</div><div class='add'>+static const u8 filter_y_horiz_tap8[] = {</div><div class='add'>+	0,	-1,	-1,	-1,	-1,	-1,	-1,	-1,</div><div class='add'>+	-1,	-1,	-1,	-1,	-1,	0,	0,	0,</div><div class='add'>+	0,	2,	4,	5,	6,	6,	6,	6,</div><div class='add'>+	6,	5,	5,	4,	3,	2,	1,	1,</div><div class='add'>+	0,	-6,	-12,	-16,	-18,	-20,	-21,	-20,</div><div class='add'>+	-20,	-18,	-16,	-13,	-10,	-8,	-5,	-2,</div><div class='add'>+	127,	126,	125,	121,	114,	107,	99,	89,</div><div class='add'>+	79,	68,	57,	46,	35,	25,	16,	8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 filter_y_vert_tap4[] = {</div><div class='add'>+	0,	-3,	-6,	-8,	-8,	-8,	-8,	-7,</div><div class='add'>+	-6,	-5,	-4,	-3,	-2,	-1,	-1,	0,</div><div class='add'>+	127,	126,	124,	118,	111,	102,	92,	81,</div><div class='add'>+	70,	59,	48,	37,	27,	19,	11,	5,</div><div class='add'>+	0,	5,	11,	19,	27,	37,	48,	59,</div><div class='add'>+	70,	81,	92,	102,	111,	118,	124,	126,</div><div class='add'>+	0,	0,	-1,	-1,	-2,	-3,	-4,	-5,</div><div class='add'>+	-6,	-7,	-8,	-8,	-8,	-8,	-6,	-3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 filter_cr_horiz_tap4[] = {</div><div class='add'>+	0,	-3,	-6,	-8,	-8,	-8,	-8,	-7,</div><div class='add'>+	-6,	-5,	-4,	-3,	-2,	-1,	-1,	0,</div><div class='add'>+	127,	126,	124,	118,	111,	102,	92,	81,</div><div class='add'>+	70,	59,	48,	37,	27,	19,	11,	5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u32 vp_reg_read(struct mixer_resources *res, u32 reg_id)</div><div class='add'>+{</div><div class='add'>+	return readl(res-&gt;vp_regs + reg_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void vp_reg_write(struct mixer_resources *res, u32 reg_id,</div><div class='add'>+				 u32 val)</div><div class='add'>+{</div><div class='add'>+	writel(val, res-&gt;vp_regs + reg_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void vp_reg_writemask(struct mixer_resources *res, u32 reg_id,</div><div class='add'>+				 u32 val, u32 mask)</div><div class='add'>+{</div><div class='add'>+	u32 old = vp_reg_read(res, reg_id);</div><div class='add'>+</div><div class='add'>+	val = (val &amp; mask) | (old &amp; ~mask);</div><div class='add'>+	writel(val, res-&gt;vp_regs + reg_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 mixer_reg_read(struct mixer_resources *res, u32 reg_id)</div><div class='add'>+{</div><div class='add'>+	return readl(res-&gt;mixer_regs + reg_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mixer_reg_write(struct mixer_resources *res, u32 reg_id,</div><div class='add'>+				 u32 val)</div><div class='add'>+{</div><div class='add'>+	writel(val, res-&gt;mixer_regs + reg_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mixer_reg_writemask(struct mixer_resources *res,</div><div class='add'>+				 u32 reg_id, u32 val, u32 mask)</div><div class='add'>+{</div><div class='add'>+	u32 old = mixer_reg_read(res, reg_id);</div><div class='add'>+</div><div class='add'>+	val = (val &amp; mask) | (old &amp; ~mask);</div><div class='add'>+	writel(val, res-&gt;mixer_regs + reg_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mixer_regs_dump(struct mixer_context *ctx)</div><div class='add'>+{</div><div class='add'>+#define DUMPREG(reg_id) \</div><div class='add'>+do { \</div><div class='add'>+	DRM_DEBUG_KMS(#reg_id " = %08x\n", \</div><div class='add'>+		(u32)readl(ctx-&gt;mixer_res.mixer_regs + reg_id)); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+	DUMPREG(MXR_STATUS);</div><div class='add'>+	DUMPREG(MXR_CFG);</div><div class='add'>+	DUMPREG(MXR_INT_EN);</div><div class='add'>+	DUMPREG(MXR_INT_STATUS);</div><div class='add'>+</div><div class='add'>+	DUMPREG(MXR_LAYER_CFG);</div><div class='add'>+	DUMPREG(MXR_VIDEO_CFG);</div><div class='add'>+</div><div class='add'>+	DUMPREG(MXR_GRAPHIC0_CFG);</div><div class='add'>+	DUMPREG(MXR_GRAPHIC0_BASE);</div><div class='add'>+	DUMPREG(MXR_GRAPHIC0_SPAN);</div><div class='add'>+	DUMPREG(MXR_GRAPHIC0_WH);</div><div class='add'>+	DUMPREG(MXR_GRAPHIC0_SXY);</div><div class='add'>+	DUMPREG(MXR_GRAPHIC0_DXY);</div><div class='add'>+</div><div class='add'>+	DUMPREG(MXR_GRAPHIC1_CFG);</div><div class='add'>+	DUMPREG(MXR_GRAPHIC1_BASE);</div><div class='add'>+	DUMPREG(MXR_GRAPHIC1_SPAN);</div><div class='add'>+	DUMPREG(MXR_GRAPHIC1_WH);</div><div class='add'>+	DUMPREG(MXR_GRAPHIC1_SXY);</div><div class='add'>+	DUMPREG(MXR_GRAPHIC1_DXY);</div><div class='add'>+#undef DUMPREG</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vp_regs_dump(struct mixer_context *ctx)</div><div class='add'>+{</div><div class='add'>+#define DUMPREG(reg_id) \</div><div class='add'>+do { \</div><div class='add'>+	DRM_DEBUG_KMS(#reg_id " = %08x\n", \</div><div class='add'>+		(u32) readl(ctx-&gt;mixer_res.vp_regs + reg_id)); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+	DUMPREG(VP_ENABLE);</div><div class='add'>+	DUMPREG(VP_SRESET);</div><div class='add'>+	DUMPREG(VP_SHADOW_UPDATE);</div><div class='add'>+	DUMPREG(VP_FIELD_ID);</div><div class='add'>+	DUMPREG(VP_MODE);</div><div class='add'>+	DUMPREG(VP_IMG_SIZE_Y);</div><div class='add'>+	DUMPREG(VP_IMG_SIZE_C);</div><div class='add'>+	DUMPREG(VP_PER_RATE_CTRL);</div><div class='add'>+	DUMPREG(VP_TOP_Y_PTR);</div><div class='add'>+	DUMPREG(VP_BOT_Y_PTR);</div><div class='add'>+	DUMPREG(VP_TOP_C_PTR);</div><div class='add'>+	DUMPREG(VP_BOT_C_PTR);</div><div class='add'>+	DUMPREG(VP_ENDIAN_MODE);</div><div class='add'>+	DUMPREG(VP_SRC_H_POSITION);</div><div class='add'>+	DUMPREG(VP_SRC_V_POSITION);</div><div class='add'>+	DUMPREG(VP_SRC_WIDTH);</div><div class='add'>+	DUMPREG(VP_SRC_HEIGHT);</div><div class='add'>+	DUMPREG(VP_DST_H_POSITION);</div><div class='add'>+	DUMPREG(VP_DST_V_POSITION);</div><div class='add'>+	DUMPREG(VP_DST_WIDTH);</div><div class='add'>+	DUMPREG(VP_DST_HEIGHT);</div><div class='add'>+	DUMPREG(VP_H_RATIO);</div><div class='add'>+	DUMPREG(VP_V_RATIO);</div><div class='add'>+</div><div class='add'>+#undef DUMPREG</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void vp_filter_set(struct mixer_resources *res,</div><div class='add'>+		int reg_id, const u8 *data, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	/* assure 4-byte align */</div><div class='add'>+	BUG_ON(size &amp; 3);</div><div class='add'>+	for (; size; size -= 4, reg_id += 4, data += 4) {</div><div class='add'>+		u32 val = (data[0] &lt;&lt; 24) |  (data[1] &lt;&lt; 16) |</div><div class='add'>+			(data[2] &lt;&lt; 8) | data[3];</div><div class='add'>+		vp_reg_write(res, reg_id, val);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vp_default_filter(struct mixer_resources *res)</div><div class='add'>+{</div><div class='add'>+	vp_filter_set(res, VP_POLY8_Y0_LL,</div><div class='add'>+		filter_y_horiz_tap8, sizeof filter_y_horiz_tap8);</div><div class='add'>+	vp_filter_set(res, VP_POLY4_Y0_LL,</div><div class='add'>+		filter_y_vert_tap4, sizeof filter_y_vert_tap4);</div><div class='add'>+	vp_filter_set(res, VP_POLY4_C0_LL,</div><div class='add'>+		filter_cr_horiz_tap4, sizeof filter_cr_horiz_tap4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mixer_vsync_set_update(struct mixer_context *ctx, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct mixer_resources *res = &amp;ctx-&gt;mixer_res;</div><div class='add'>+</div><div class='add'>+	/* block update on vsync */</div><div class='add'>+	mixer_reg_writemask(res, MXR_STATUS, enable ?</div><div class='add'>+			MXR_STATUS_SYNC_ENABLE : 0, MXR_STATUS_SYNC_ENABLE);</div><div class='add'>+</div><div class='add'>+	vp_reg_write(res, VP_SHADOW_UPDATE, enable ?</div><div class='add'>+			VP_SHADOW_UPDATE_ENABLE : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mixer_cfg_scan(struct mixer_context *ctx, unsigned int height)</div><div class='add'>+{</div><div class='add'>+	struct mixer_resources *res = &amp;ctx-&gt;mixer_res;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* choosing between interlace and progressive mode */</div><div class='add'>+	val = (ctx-&gt;interlace ? MXR_CFG_SCAN_INTERLACE :</div><div class='add'>+				MXR_CFG_SCAN_PROGRASSIVE);</div><div class='add'>+</div><div class='add'>+	/* choosing between porper HD and SD mode */</div><div class='add'>+	if (height == 480)</div><div class='add'>+		val |= MXR_CFG_SCAN_NTSC | MXR_CFG_SCAN_SD;</div><div class='add'>+	else if (height == 576)</div><div class='add'>+		val |= MXR_CFG_SCAN_PAL | MXR_CFG_SCAN_SD;</div><div class='add'>+	else if (height == 720)</div><div class='add'>+		val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD;</div><div class='add'>+	else if (height == 1080)</div><div class='add'>+		val |= MXR_CFG_SCAN_HD_1080 | MXR_CFG_SCAN_HD;</div><div class='add'>+	else</div><div class='add'>+		val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD;</div><div class='add'>+</div><div class='add'>+	mixer_reg_writemask(res, MXR_CFG, val, MXR_CFG_SCAN_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mixer_cfg_rgb_fmt(struct mixer_context *ctx, unsigned int height)</div><div class='add'>+{</div><div class='add'>+	struct mixer_resources *res = &amp;ctx-&gt;mixer_res;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (height == 480) {</div><div class='add'>+		val = MXR_CFG_RGB601_0_255;</div><div class='add'>+	} else if (height == 576) {</div><div class='add'>+		val = MXR_CFG_RGB601_0_255;</div><div class='add'>+	} else if (height == 720) {</div><div class='add'>+		val = MXR_CFG_RGB709_16_235;</div><div class='add'>+		mixer_reg_write(res, MXR_CM_COEFF_Y,</div><div class='add'>+				(1 &lt;&lt; 30) | (94 &lt;&lt; 20) | (314 &lt;&lt; 10) |</div><div class='add'>+				(32 &lt;&lt; 0));</div><div class='add'>+		mixer_reg_write(res, MXR_CM_COEFF_CB,</div><div class='add'>+				(972 &lt;&lt; 20) | (851 &lt;&lt; 10) | (225 &lt;&lt; 0));</div><div class='add'>+		mixer_reg_write(res, MXR_CM_COEFF_CR,</div><div class='add'>+				(225 &lt;&lt; 20) | (820 &lt;&lt; 10) | (1004 &lt;&lt; 0));</div><div class='add'>+	} else if (height == 1080) {</div><div class='add'>+		val = MXR_CFG_RGB709_16_235;</div><div class='add'>+		mixer_reg_write(res, MXR_CM_COEFF_Y,</div><div class='add'>+				(1 &lt;&lt; 30) | (94 &lt;&lt; 20) | (314 &lt;&lt; 10) |</div><div class='add'>+				(32 &lt;&lt; 0));</div><div class='add'>+		mixer_reg_write(res, MXR_CM_COEFF_CB,</div><div class='add'>+				(972 &lt;&lt; 20) | (851 &lt;&lt; 10) | (225 &lt;&lt; 0));</div><div class='add'>+		mixer_reg_write(res, MXR_CM_COEFF_CR,</div><div class='add'>+				(225 &lt;&lt; 20) | (820 &lt;&lt; 10) | (1004 &lt;&lt; 0));</div><div class='add'>+	} else {</div><div class='add'>+		val = MXR_CFG_RGB709_16_235;</div><div class='add'>+		mixer_reg_write(res, MXR_CM_COEFF_Y,</div><div class='add'>+				(1 &lt;&lt; 30) | (94 &lt;&lt; 20) | (314 &lt;&lt; 10) |</div><div class='add'>+				(32 &lt;&lt; 0));</div><div class='add'>+		mixer_reg_write(res, MXR_CM_COEFF_CB,</div><div class='add'>+				(972 &lt;&lt; 20) | (851 &lt;&lt; 10) | (225 &lt;&lt; 0));</div><div class='add'>+		mixer_reg_write(res, MXR_CM_COEFF_CR,</div><div class='add'>+				(225 &lt;&lt; 20) | (820 &lt;&lt; 10) | (1004 &lt;&lt; 0));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mixer_reg_writemask(res, MXR_CFG, val, MXR_CFG_RGB_FMT_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mixer_cfg_layer(struct mixer_context *ctx, int win, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct mixer_resources *res = &amp;ctx-&gt;mixer_res;</div><div class='add'>+	u32 val = enable ? ~0 : 0;</div><div class='add'>+</div><div class='add'>+	switch (win) {</div><div class='add'>+	case 0:</div><div class='add'>+		mixer_reg_writemask(res, MXR_CFG, val, MXR_CFG_GRP0_ENABLE);</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		mixer_reg_writemask(res, MXR_CFG, val, MXR_CFG_GRP1_ENABLE);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		vp_reg_writemask(res, VP_ENABLE, val, VP_ENABLE_ON);</div><div class='add'>+		mixer_reg_writemask(res, MXR_CFG, val, MXR_CFG_VP_ENABLE);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mixer_run(struct mixer_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct mixer_resources *res = &amp;ctx-&gt;mixer_res;</div><div class='add'>+</div><div class='add'>+	mixer_reg_writemask(res, MXR_STATUS, ~0, MXR_STATUS_REG_RUN);</div><div class='add'>+</div><div class='add'>+	mixer_regs_dump(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vp_video_buffer(struct mixer_context *ctx, int win)</div><div class='add'>+{</div><div class='add'>+	struct mixer_resources *res = &amp;ctx-&gt;mixer_res;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct hdmi_win_data *win_data;</div><div class='add'>+	unsigned int full_width, full_height, width, height;</div><div class='add'>+	unsigned int x_ratio, y_ratio;</div><div class='add'>+	unsigned int src_x_offset, src_y_offset, dst_x_offset, dst_y_offset;</div><div class='add'>+	unsigned int mode_width, mode_height;</div><div class='add'>+	unsigned int buf_num;</div><div class='add'>+	dma_addr_t luma_addr[2], chroma_addr[2];</div><div class='add'>+	bool tiled_mode = false;</div><div class='add'>+	bool crcb_mode = false;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	win_data = &amp;ctx-&gt;win_data[win];</div><div class='add'>+</div><div class='add'>+	switch (win_data-&gt;pixel_format) {</div><div class='add'>+	case DRM_FORMAT_NV12MT:</div><div class='add'>+		tiled_mode = true;</div><div class='add'>+	case DRM_FORMAT_NV12M:</div><div class='add'>+		crcb_mode = false;</div><div class='add'>+		buf_num = 2;</div><div class='add'>+		break;</div><div class='add'>+	/* TODO: single buffer format NV12, NV21 */</div><div class='add'>+	default:</div><div class='add'>+		/* ignore pixel format at disable time */</div><div class='add'>+		if (!win_data-&gt;dma_addr)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		DRM_ERROR("pixel format for vp is wrong [%d].\n",</div><div class='add'>+				win_data-&gt;pixel_format);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	full_width = win_data-&gt;fb_width;</div><div class='add'>+	full_height = win_data-&gt;fb_height;</div><div class='add'>+	width = win_data-&gt;crtc_width;</div><div class='add'>+	height = win_data-&gt;crtc_height;</div><div class='add'>+	mode_width = win_data-&gt;mode_width;</div><div class='add'>+	mode_height = win_data-&gt;mode_height;</div><div class='add'>+</div><div class='add'>+	/* scaling feature: (src &lt;&lt; 16) / dst */</div><div class='add'>+	x_ratio = (width &lt;&lt; 16) / width;</div><div class='add'>+	y_ratio = (height &lt;&lt; 16) / height;</div><div class='add'>+</div><div class='add'>+	src_x_offset = win_data-&gt;fb_x;</div><div class='add'>+	src_y_offset = win_data-&gt;fb_y;</div><div class='add'>+	dst_x_offset = win_data-&gt;crtc_x;</div><div class='add'>+	dst_y_offset = win_data-&gt;crtc_y;</div><div class='add'>+</div><div class='add'>+	if (buf_num == 2) {</div><div class='add'>+		luma_addr[0] = win_data-&gt;dma_addr;</div><div class='add'>+		chroma_addr[0] = win_data-&gt;chroma_dma_addr;</div><div class='add'>+	} else {</div><div class='add'>+		luma_addr[0] = win_data-&gt;dma_addr;</div><div class='add'>+		chroma_addr[0] = win_data-&gt;dma_addr</div><div class='add'>+			+ (full_width * full_height);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (win_data-&gt;scan_flags &amp; DRM_MODE_FLAG_INTERLACE) {</div><div class='add'>+		ctx-&gt;interlace = true;</div><div class='add'>+		if (tiled_mode) {</div><div class='add'>+			luma_addr[1] = luma_addr[0] + 0x40;</div><div class='add'>+			chroma_addr[1] = chroma_addr[0] + 0x40;</div><div class='add'>+		} else {</div><div class='add'>+			luma_addr[1] = luma_addr[0] + full_width;</div><div class='add'>+			chroma_addr[1] = chroma_addr[0] + full_width;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ctx-&gt;interlace = false;</div><div class='add'>+		luma_addr[1] = 0;</div><div class='add'>+		chroma_addr[1] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;res-&gt;reg_slock, flags);</div><div class='add'>+	mixer_vsync_set_update(ctx, false);</div><div class='add'>+</div><div class='add'>+	/* interlace or progressive scan mode */</div><div class='add'>+	val = (ctx-&gt;interlace ? ~0 : 0);</div><div class='add'>+	vp_reg_writemask(res, VP_MODE, val, VP_MODE_LINE_SKIP);</div><div class='add'>+</div><div class='add'>+	/* setup format */</div><div class='add'>+	val = (crcb_mode ? VP_MODE_NV21 : VP_MODE_NV12);</div><div class='add'>+	val |= (tiled_mode ? VP_MODE_MEM_TILED : VP_MODE_MEM_LINEAR);</div><div class='add'>+	vp_reg_writemask(res, VP_MODE, val, VP_MODE_FMT_MASK);</div><div class='add'>+</div><div class='add'>+	/* setting size of input image */</div><div class='add'>+	vp_reg_write(res, VP_IMG_SIZE_Y, VP_IMG_HSIZE(full_width) |</div><div class='add'>+		VP_IMG_VSIZE(full_height));</div><div class='add'>+	/* chroma height has to reduced by 2 to avoid chroma distorions */</div><div class='add'>+	vp_reg_write(res, VP_IMG_SIZE_C, VP_IMG_HSIZE(full_width) |</div><div class='add'>+		VP_IMG_VSIZE(full_height / 2));</div><div class='add'>+</div><div class='add'>+	vp_reg_write(res, VP_SRC_WIDTH, width);</div><div class='add'>+	vp_reg_write(res, VP_SRC_HEIGHT, height);</div><div class='add'>+	vp_reg_write(res, VP_SRC_H_POSITION,</div><div class='add'>+			VP_SRC_H_POSITION_VAL(src_x_offset));</div><div class='add'>+	vp_reg_write(res, VP_SRC_V_POSITION, src_y_offset);</div><div class='add'>+</div><div class='add'>+	vp_reg_write(res, VP_DST_WIDTH, width);</div><div class='add'>+	vp_reg_write(res, VP_DST_H_POSITION, dst_x_offset);</div><div class='add'>+	if (ctx-&gt;interlace) {</div><div class='add'>+		vp_reg_write(res, VP_DST_HEIGHT, height / 2);</div><div class='add'>+		vp_reg_write(res, VP_DST_V_POSITION, dst_y_offset / 2);</div><div class='add'>+	} else {</div><div class='add'>+		vp_reg_write(res, VP_DST_HEIGHT, height);</div><div class='add'>+		vp_reg_write(res, VP_DST_V_POSITION, dst_y_offset);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vp_reg_write(res, VP_H_RATIO, x_ratio);</div><div class='add'>+	vp_reg_write(res, VP_V_RATIO, y_ratio);</div><div class='add'>+</div><div class='add'>+	vp_reg_write(res, VP_ENDIAN_MODE, VP_ENDIAN_MODE_LITTLE);</div><div class='add'>+</div><div class='add'>+	/* set buffer address to vp */</div><div class='add'>+	vp_reg_write(res, VP_TOP_Y_PTR, luma_addr[0]);</div><div class='add'>+	vp_reg_write(res, VP_BOT_Y_PTR, luma_addr[1]);</div><div class='add'>+	vp_reg_write(res, VP_TOP_C_PTR, chroma_addr[0]);</div><div class='add'>+	vp_reg_write(res, VP_BOT_C_PTR, chroma_addr[1]);</div><div class='add'>+</div><div class='add'>+	mixer_cfg_scan(ctx, mode_height);</div><div class='add'>+	mixer_cfg_rgb_fmt(ctx, mode_height);</div><div class='add'>+	mixer_cfg_layer(ctx, win, true);</div><div class='add'>+	mixer_run(ctx);</div><div class='add'>+</div><div class='add'>+	mixer_vsync_set_update(ctx, true);</div><div class='add'>+	spin_unlock_irqrestore(&amp;res-&gt;reg_slock, flags);</div><div class='add'>+</div><div class='add'>+	vp_regs_dump(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mixer_graph_buffer(struct mixer_context *ctx, int win)</div><div class='add'>+{</div><div class='add'>+	struct mixer_resources *res = &amp;ctx-&gt;mixer_res;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct hdmi_win_data *win_data;</div><div class='add'>+	unsigned int full_width, width, height;</div><div class='add'>+	unsigned int x_ratio, y_ratio;</div><div class='add'>+	unsigned int src_x_offset, src_y_offset, dst_x_offset, dst_y_offset;</div><div class='add'>+	unsigned int mode_width, mode_height;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	unsigned int fmt;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	win_data = &amp;ctx-&gt;win_data[win];</div><div class='add'>+</div><div class='add'>+	#define RGB565 4</div><div class='add'>+	#define ARGB1555 5</div><div class='add'>+	#define ARGB4444 6</div><div class='add'>+	#define ARGB8888 7</div><div class='add'>+</div><div class='add'>+	switch (win_data-&gt;bpp) {</div><div class='add'>+	case 16:</div><div class='add'>+		fmt = ARGB4444;</div><div class='add'>+		break;</div><div class='add'>+	case 32:</div><div class='add'>+		fmt = ARGB8888;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		fmt = ARGB8888;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_addr = win_data-&gt;dma_addr;</div><div class='add'>+	full_width = win_data-&gt;fb_width;</div><div class='add'>+	width = win_data-&gt;crtc_width;</div><div class='add'>+	height = win_data-&gt;crtc_height;</div><div class='add'>+	mode_width = win_data-&gt;mode_width;</div><div class='add'>+	mode_height = win_data-&gt;mode_height;</div><div class='add'>+</div><div class='add'>+	/* 2x scaling feature */</div><div class='add'>+	x_ratio = 0;</div><div class='add'>+	y_ratio = 0;</div><div class='add'>+</div><div class='add'>+	src_x_offset = win_data-&gt;fb_x;</div><div class='add'>+	src_y_offset = win_data-&gt;fb_y;</div><div class='add'>+	dst_x_offset = win_data-&gt;crtc_x;</div><div class='add'>+	dst_y_offset = win_data-&gt;crtc_y;</div><div class='add'>+</div><div class='add'>+	/* converting dma address base and source offset */</div><div class='add'>+	dma_addr = dma_addr</div><div class='add'>+		+ (src_x_offset * win_data-&gt;bpp &gt;&gt; 3)</div><div class='add'>+		+ (src_y_offset * full_width * win_data-&gt;bpp &gt;&gt; 3);</div><div class='add'>+	src_x_offset = 0;</div><div class='add'>+	src_y_offset = 0;</div><div class='add'>+</div><div class='add'>+	if (win_data-&gt;scan_flags &amp; DRM_MODE_FLAG_INTERLACE)</div><div class='add'>+		ctx-&gt;interlace = true;</div><div class='add'>+	else</div><div class='add'>+		ctx-&gt;interlace = false;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;res-&gt;reg_slock, flags);</div><div class='add'>+	mixer_vsync_set_update(ctx, false);</div><div class='add'>+</div><div class='add'>+	/* setup format */</div><div class='add'>+	mixer_reg_writemask(res, MXR_GRAPHIC_CFG(win),</div><div class='add'>+		MXR_GRP_CFG_FORMAT_VAL(fmt), MXR_GRP_CFG_FORMAT_MASK);</div><div class='add'>+</div><div class='add'>+	/* setup geometry */</div><div class='add'>+	mixer_reg_write(res, MXR_GRAPHIC_SPAN(win), full_width);</div><div class='add'>+</div><div class='add'>+	val  = MXR_GRP_WH_WIDTH(width);</div><div class='add'>+	val |= MXR_GRP_WH_HEIGHT(height);</div><div class='add'>+	val |= MXR_GRP_WH_H_SCALE(x_ratio);</div><div class='add'>+	val |= MXR_GRP_WH_V_SCALE(y_ratio);</div><div class='add'>+	mixer_reg_write(res, MXR_GRAPHIC_WH(win), val);</div><div class='add'>+</div><div class='add'>+	/* setup offsets in source image */</div><div class='add'>+	val  = MXR_GRP_SXY_SX(src_x_offset);</div><div class='add'>+	val |= MXR_GRP_SXY_SY(src_y_offset);</div><div class='add'>+	mixer_reg_write(res, MXR_GRAPHIC_SXY(win), val);</div><div class='add'>+</div><div class='add'>+	/* setup offsets in display image */</div><div class='add'>+	val  = MXR_GRP_DXY_DX(dst_x_offset);</div><div class='add'>+	val |= MXR_GRP_DXY_DY(dst_y_offset);</div><div class='add'>+	mixer_reg_write(res, MXR_GRAPHIC_DXY(win), val);</div><div class='add'>+</div><div class='add'>+	/* set buffer address to mixer */</div><div class='add'>+	mixer_reg_write(res, MXR_GRAPHIC_BASE(win), dma_addr);</div><div class='add'>+</div><div class='add'>+	mixer_cfg_scan(ctx, mode_height);</div><div class='add'>+	mixer_cfg_rgb_fmt(ctx, mode_height);</div><div class='add'>+	mixer_cfg_layer(ctx, win, true);</div><div class='add'>+	mixer_run(ctx);</div><div class='add'>+</div><div class='add'>+	mixer_vsync_set_update(ctx, true);</div><div class='add'>+	spin_unlock_irqrestore(&amp;res-&gt;reg_slock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vp_win_reset(struct mixer_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct mixer_resources *res = &amp;ctx-&gt;mixer_res;</div><div class='add'>+	int tries = 100;</div><div class='add'>+</div><div class='add'>+	vp_reg_write(res, VP_SRESET, VP_SRESET_PROCESSING);</div><div class='add'>+	for (tries = 100; tries; --tries) {</div><div class='add'>+		/* waiting until VP_SRESET_PROCESSING is 0 */</div><div class='add'>+		if (~vp_reg_read(res, VP_SRESET) &amp; VP_SRESET_PROCESSING)</div><div class='add'>+			break;</div><div class='add'>+		mdelay(10);</div><div class='add'>+	}</div><div class='add'>+	WARN(tries == 0, "failed to reset Video Processor\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mixer_enable_vblank(void *ctx, int pipe)</div><div class='add'>+{</div><div class='add'>+	struct mixer_context *mixer_ctx = ctx;</div><div class='add'>+	struct mixer_resources *res = &amp;mixer_ctx-&gt;mixer_res;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	mixer_ctx-&gt;pipe = pipe;</div><div class='add'>+</div><div class='add'>+	/* enable vsync interrupt */</div><div class='add'>+	mixer_reg_writemask(res, MXR_INT_EN, MXR_INT_EN_VSYNC,</div><div class='add'>+			MXR_INT_EN_VSYNC);</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_vblank(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct mixer_context *mixer_ctx = ctx;</div><div class='add'>+	struct mixer_resources *res = &amp;mixer_ctx-&gt;mixer_res;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	/* disable vsync interrupt */</div><div class='add'>+	mixer_reg_writemask(res, MXR_INT_EN, 0, MXR_INT_EN_VSYNC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mixer_win_mode_set(void *ctx,</div><div class='add'>+			      struct exynos_drm_overlay *overlay)</div><div class='add'>+{</div><div class='add'>+	struct mixer_context *mixer_ctx = ctx;</div><div class='add'>+	struct hdmi_win_data *win_data;</div><div class='add'>+	int win;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	if (!overlay) {</div><div class='add'>+		DRM_ERROR("overlay is NULL\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("set [%d]x[%d] at (%d,%d) to [%d]x[%d] at (%d,%d)\n",</div><div class='add'>+				 overlay-&gt;fb_width, overlay-&gt;fb_height,</div><div class='add'>+				 overlay-&gt;fb_x, overlay-&gt;fb_y,</div><div class='add'>+				 overlay-&gt;crtc_width, overlay-&gt;crtc_height,</div><div class='add'>+				 overlay-&gt;crtc_x, overlay-&gt;crtc_y);</div><div class='add'>+</div><div class='add'>+	win = overlay-&gt;zpos;</div><div class='add'>+	if (win == DEFAULT_ZPOS)</div><div class='add'>+		win = mixer_ctx-&gt;default_win;</div><div class='add'>+</div><div class='add'>+	if (win &lt; 0 || win &gt; HDMI_OVERLAY_NUMBER) {</div><div class='add'>+		DRM_ERROR("overlay plane[%d] is wrong\n", win);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	win_data = &amp;mixer_ctx-&gt;win_data[win];</div><div class='add'>+</div><div class='add'>+	win_data-&gt;dma_addr = overlay-&gt;dma_addr[0];</div><div class='add'>+	win_data-&gt;vaddr = overlay-&gt;vaddr[0];</div><div class='add'>+	win_data-&gt;chroma_dma_addr = overlay-&gt;dma_addr[1];</div><div class='add'>+	win_data-&gt;chroma_vaddr = overlay-&gt;vaddr[1];</div><div class='add'>+	win_data-&gt;pixel_format = overlay-&gt;pixel_format;</div><div class='add'>+	win_data-&gt;bpp = overlay-&gt;bpp;</div><div class='add'>+</div><div class='add'>+	win_data-&gt;crtc_x = overlay-&gt;crtc_x;</div><div class='add'>+	win_data-&gt;crtc_y = overlay-&gt;crtc_y;</div><div class='add'>+	win_data-&gt;crtc_width = overlay-&gt;crtc_width;</div><div class='add'>+	win_data-&gt;crtc_height = overlay-&gt;crtc_height;</div><div class='add'>+</div><div class='add'>+	win_data-&gt;fb_x = overlay-&gt;fb_x;</div><div class='add'>+	win_data-&gt;fb_y = overlay-&gt;fb_y;</div><div class='add'>+	win_data-&gt;fb_width = overlay-&gt;fb_width;</div><div class='add'>+	win_data-&gt;fb_height = overlay-&gt;fb_height;</div><div class='add'>+</div><div class='add'>+	win_data-&gt;mode_width = overlay-&gt;mode_width;</div><div class='add'>+	win_data-&gt;mode_height = overlay-&gt;mode_height;</div><div class='add'>+</div><div class='add'>+	win_data-&gt;scan_flags = overlay-&gt;scan_flag;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mixer_win_commit(void *ctx, int zpos)</div><div class='add'>+{</div><div class='add'>+	struct mixer_context *mixer_ctx = ctx;</div><div class='add'>+	int win = zpos;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s, win: %d\n", __LINE__, __func__, win);</div><div class='add'>+</div><div class='add'>+	if (win == DEFAULT_ZPOS)</div><div class='add'>+		win = mixer_ctx-&gt;default_win;</div><div class='add'>+</div><div class='add'>+	if (win &lt; 0 || win &gt; HDMI_OVERLAY_NUMBER) {</div><div class='add'>+		DRM_ERROR("overlay plane[%d] is wrong\n", win);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (win &gt; 1)</div><div class='add'>+		vp_video_buffer(mixer_ctx, win);</div><div class='add'>+	else</div><div class='add'>+		mixer_graph_buffer(mixer_ctx, win);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mixer_win_disable(void *ctx, int zpos)</div><div class='add'>+{</div><div class='add'>+	struct mixer_context *mixer_ctx = ctx;</div><div class='add'>+	struct mixer_resources *res = &amp;mixer_ctx-&gt;mixer_res;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int win = zpos;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s, win: %d\n", __LINE__, __func__, win);</div><div class='add'>+</div><div class='add'>+	if (win == DEFAULT_ZPOS)</div><div class='add'>+		win = mixer_ctx-&gt;default_win;</div><div class='add'>+</div><div class='add'>+	if (win &lt; 0 || win &gt; HDMI_OVERLAY_NUMBER) {</div><div class='add'>+		DRM_ERROR("overlay plane[%d] is wrong\n", win);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;res-&gt;reg_slock, flags);</div><div class='add'>+	mixer_vsync_set_update(mixer_ctx, false);</div><div class='add'>+</div><div class='add'>+	mixer_cfg_layer(mixer_ctx, win, false);</div><div class='add'>+</div><div class='add'>+	mixer_vsync_set_update(mixer_ctx, true);</div><div class='add'>+	spin_unlock_irqrestore(&amp;res-&gt;reg_slock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct exynos_hdmi_overlay_ops overlay_ops = {</div><div class='add'>+	.enable_vblank		= mixer_enable_vblank,</div><div class='add'>+	.disable_vblank		= mixer_disable_vblank,</div><div class='add'>+	.win_mode_set		= mixer_win_mode_set,</div><div class='add'>+	.win_commit		= mixer_win_commit,</div><div class='add'>+	.win_disable		= mixer_win_disable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* for pageflip event */</div><div class='add'>+static void mixer_finish_pageflip(struct drm_device *drm_dev, int crtc)</div><div class='add'>+{</div><div class='add'>+	struct exynos_drm_private *dev_priv = drm_dev-&gt;dev_private;</div><div class='add'>+	struct drm_pending_vblank_event *e, *t;</div><div class='add'>+	struct timeval now;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	bool is_checked = false;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;drm_dev-&gt;event_lock, flags);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(e, t, &amp;dev_priv-&gt;pageflip_event_list,</div><div class='add'>+			base.link) {</div><div class='add'>+		/* if event's pipe isn't same as crtc then ignore it. */</div><div class='add'>+		if (crtc != e-&gt;pipe)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		is_checked = true;</div><div class='add'>+		do_gettimeofday(&amp;now);</div><div class='add'>+		e-&gt;event.sequence = 0;</div><div class='add'>+		e-&gt;event.tv_sec = now.tv_sec;</div><div class='add'>+		e-&gt;event.tv_usec = now.tv_usec;</div><div class='add'>+</div><div class='add'>+		list_move_tail(&amp;e-&gt;base.link, &amp;e-&gt;base.file_priv-&gt;event_list);</div><div class='add'>+		wake_up_interruptible(&amp;e-&gt;base.file_priv-&gt;event_wait);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_checked)</div><div class='add'>+		drm_vblank_put(drm_dev, crtc);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;drm_dev-&gt;event_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t mixer_irq_handler(int irq, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct exynos_drm_hdmi_context *drm_hdmi_ctx = arg;</div><div class='add'>+	struct mixer_context *ctx =</div><div class='add'>+			(struct mixer_context *)drm_hdmi_ctx-&gt;ctx;</div><div class='add'>+	struct mixer_resources *res = &amp;ctx-&gt;mixer_res;</div><div class='add'>+	u32 val, val_base;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;res-&gt;reg_slock);</div><div class='add'>+</div><div class='add'>+	/* read interrupt status for handling and clearing flags for VSYNC */</div><div class='add'>+	val = mixer_reg_read(res, MXR_INT_STATUS);</div><div class='add'>+</div><div class='add'>+	/* handling VSYNC */</div><div class='add'>+	if (val &amp; MXR_INT_STATUS_VSYNC) {</div><div class='add'>+		/* interlace scan need to check shadow register */</div><div class='add'>+		if (ctx-&gt;interlace) {</div><div class='add'>+			val_base = mixer_reg_read(res, MXR_GRAPHIC_BASE_S(0));</div><div class='add'>+			if (ctx-&gt;win_data[0].dma_addr != val_base)</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			val_base = mixer_reg_read(res, MXR_GRAPHIC_BASE_S(1));</div><div class='add'>+			if (ctx-&gt;win_data[1].dma_addr != val_base)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		drm_handle_vblank(drm_hdmi_ctx-&gt;drm_dev, ctx-&gt;pipe);</div><div class='add'>+		mixer_finish_pageflip(drm_hdmi_ctx-&gt;drm_dev, ctx-&gt;pipe);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	/* clear interrupts */</div><div class='add'>+	if (~val &amp; MXR_INT_EN_VSYNC) {</div><div class='add'>+		/* vsync interrupt use different bit for read and clear */</div><div class='add'>+		val &amp;= ~MXR_INT_EN_VSYNC;</div><div class='add'>+		val |= MXR_INT_CLEAR_VSYNC;</div><div class='add'>+	}</div><div class='add'>+	mixer_reg_write(res, MXR_INT_STATUS, val);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;res-&gt;reg_slock);</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 mixer_win_reset(struct mixer_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct mixer_resources *res = &amp;ctx-&gt;mixer_res;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 val; /* value stored to register */</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;res-&gt;reg_slock, flags);</div><div class='add'>+	mixer_vsync_set_update(ctx, false);</div><div class='add'>+</div><div class='add'>+	mixer_reg_writemask(res, MXR_CFG, MXR_CFG_DST_HDMI, MXR_CFG_DST_MASK);</div><div class='add'>+</div><div class='add'>+	/* set output in RGB888 mode */</div><div class='add'>+	mixer_reg_writemask(res, MXR_CFG, MXR_CFG_OUT_RGB888, MXR_CFG_OUT_MASK);</div><div class='add'>+</div><div class='add'>+	/* 16 beat burst in DMA */</div><div class='add'>+	mixer_reg_writemask(res, MXR_STATUS, MXR_STATUS_16_BURST,</div><div class='add'>+		MXR_STATUS_BURST_MASK);</div><div class='add'>+</div><div class='add'>+	/* setting default layer priority: layer1 &gt; video &gt; layer0</div><div class='add'>+	 * because typical usage scenario would be</div><div class='add'>+	 * layer0 - framebuffer</div><div class='add'>+	 * video - video overlay</div><div class='add'>+	 * layer1 - OSD</div><div class='add'>+	 */</div><div class='add'>+	val  = MXR_LAYER_CFG_GRP0_VAL(1);</div><div class='add'>+	val |= MXR_LAYER_CFG_VP_VAL(2);</div><div class='add'>+	val |= MXR_LAYER_CFG_GRP1_VAL(3);</div><div class='add'>+	mixer_reg_write(res, MXR_LAYER_CFG, val);</div><div class='add'>+</div><div class='add'>+	/* setting background color */</div><div class='add'>+	mixer_reg_write(res, MXR_BG_COLOR0, 0x008080);</div><div class='add'>+	mixer_reg_write(res, MXR_BG_COLOR1, 0x008080);</div><div class='add'>+	mixer_reg_write(res, MXR_BG_COLOR2, 0x008080);</div><div class='add'>+</div><div class='add'>+	/* setting graphical layers */</div><div class='add'>+</div><div class='add'>+	val  = MXR_GRP_CFG_COLOR_KEY_DISABLE; /* no blank key */</div><div class='add'>+	val |= MXR_GRP_CFG_WIN_BLEND_EN;</div><div class='add'>+	val |= MXR_GRP_CFG_ALPHA_VAL(0xff); /* non-transparent alpha */</div><div class='add'>+</div><div class='add'>+	/* the same configuration for both layers */</div><div class='add'>+	mixer_reg_write(res, MXR_GRAPHIC_CFG(0), val);</div><div class='add'>+</div><div class='add'>+	val |= MXR_GRP_CFG_BLEND_PRE_MUL;</div><div class='add'>+	val |= MXR_GRP_CFG_PIXEL_BLEND_EN;</div><div class='add'>+	mixer_reg_write(res, MXR_GRAPHIC_CFG(1), val);</div><div class='add'>+</div><div class='add'>+	/* configuration of Video Processor Registers */</div><div class='add'>+	vp_win_reset(ctx);</div><div class='add'>+	vp_default_filter(res);</div><div class='add'>+</div><div class='add'>+	/* disable all layers */</div><div class='add'>+	mixer_reg_writemask(res, MXR_CFG, 0, MXR_CFG_GRP0_ENABLE);</div><div class='add'>+	mixer_reg_writemask(res, MXR_CFG, 0, MXR_CFG_GRP1_ENABLE);</div><div class='add'>+	mixer_reg_writemask(res, MXR_CFG, 0, MXR_CFG_VP_ENABLE);</div><div class='add'>+</div><div class='add'>+	mixer_vsync_set_update(ctx, true);</div><div class='add'>+	spin_unlock_irqrestore(&amp;res-&gt;reg_slock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mixer_resource_poweron(struct mixer_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct mixer_resources *res = &amp;ctx-&gt;mixer_res;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	clk_enable(res-&gt;mixer);</div><div class='add'>+	clk_enable(res-&gt;vp);</div><div class='add'>+	clk_enable(res-&gt;sclk_mixer);</div><div class='add'>+</div><div class='add'>+	mixer_win_reset(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mixer_resource_poweroff(struct mixer_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct mixer_resources *res = &amp;ctx-&gt;mixer_res;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);</div><div class='add'>+</div><div class='add'>+	clk_disable(res-&gt;mixer);</div><div class='add'>+	clk_disable(res-&gt;vp);</div><div class='add'>+	clk_disable(res-&gt;sclk_mixer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mixer_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct exynos_drm_hdmi_context *ctx = get_mixer_context(dev);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("resume - start\n");</div><div class='add'>+</div><div class='add'>+	mixer_resource_poweron((struct mixer_context *)ctx-&gt;ctx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mixer_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct exynos_drm_hdmi_context *ctx = get_mixer_context(dev);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("suspend - start\n");</div><div class='add'>+</div><div class='add'>+	mixer_resource_poweroff((struct mixer_context *)ctx-&gt;ctx);</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 dev_pm_ops mixer_pm_ops = {</div><div class='add'>+	.runtime_suspend = mixer_runtime_suspend,</div><div class='add'>+	.runtime_resume	 = mixer_runtime_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit mixer_resources_init(struct exynos_drm_hdmi_context *ctx,</div><div class='add'>+				 struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct mixer_context *mixer_ctx =</div><div class='add'>+			(struct mixer_context *)ctx-&gt;ctx;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct mixer_resources *mixer_res = &amp;mixer_ctx-&gt;mixer_res;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mixer_res-&gt;dev = dev;</div><div class='add'>+	spin_lock_init(&amp;mixer_res-&gt;reg_slock);</div><div class='add'>+</div><div class='add'>+	mixer_res-&gt;mixer = clk_get(dev, "mixer");</div><div class='add'>+	if (IS_ERR_OR_NULL(mixer_res-&gt;mixer)) {</div><div class='add'>+		dev_err(dev, "failed to get clock 'mixer'\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	mixer_res-&gt;vp = clk_get(dev, "vp");</div><div class='add'>+	if (IS_ERR_OR_NULL(mixer_res-&gt;vp)) {</div><div class='add'>+		dev_err(dev, "failed to get clock 'vp'\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	mixer_res-&gt;sclk_mixer = clk_get(dev, "sclk_mixer");</div><div class='add'>+	if (IS_ERR_OR_NULL(mixer_res-&gt;sclk_mixer)) {</div><div class='add'>+		dev_err(dev, "failed to get clock 'sclk_mixer'\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	mixer_res-&gt;sclk_hdmi = clk_get(dev, "sclk_hdmi");</div><div class='add'>+	if (IS_ERR_OR_NULL(mixer_res-&gt;sclk_hdmi)) {</div><div class='add'>+		dev_err(dev, "failed to get clock 'sclk_hdmi'\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	mixer_res-&gt;sclk_dac = clk_get(dev, "sclk_dac");</div><div class='add'>+	if (IS_ERR_OR_NULL(mixer_res-&gt;sclk_dac)) {</div><div class='add'>+		dev_err(dev, "failed to get clock 'sclk_dac'\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mxr");</div><div class='add'>+	if (res == NULL) {</div><div class='add'>+		dev_err(dev, "get memory resource failed.\n");</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clk_set_parent(mixer_res-&gt;sclk_mixer, mixer_res-&gt;sclk_hdmi);</div><div class='add'>+</div><div class='add'>+	mixer_res-&gt;mixer_regs = ioremap(res-&gt;start, resource_size(res));</div><div class='add'>+	if (mixer_res-&gt;mixer_regs == NULL) {</div><div class='add'>+		dev_err(dev, "register mapping failed.\n");</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "vp");</div><div class='add'>+	if (res == NULL) {</div><div class='add'>+		dev_err(dev, "get memory resource failed.\n");</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto fail_mixer_regs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mixer_res-&gt;vp_regs = ioremap(res-&gt;start, resource_size(res));</div><div class='add'>+	if (mixer_res-&gt;vp_regs == NULL) {</div><div class='add'>+		dev_err(dev, "register mapping failed.\n");</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto fail_mixer_regs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "irq");</div><div class='add'>+	if (res == NULL) {</div><div class='add'>+		dev_err(dev, "get interrupt resource failed.\n");</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto fail_vp_regs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = request_irq(res-&gt;start, mixer_irq_handler, 0, "drm_mixer", ctx);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "request interrupt failed.\n");</div><div class='add'>+		goto fail_vp_regs;</div><div class='add'>+	}</div><div class='add'>+	mixer_res-&gt;irq = res-&gt;start;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_vp_regs:</div><div class='add'>+	iounmap(mixer_res-&gt;vp_regs);</div><div class='add'>+</div><div class='add'>+fail_mixer_regs:</div><div class='add'>+	iounmap(mixer_res-&gt;mixer_regs);</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	if (!IS_ERR_OR_NULL(mixer_res-&gt;sclk_dac))</div><div class='add'>+		clk_put(mixer_res-&gt;sclk_dac);</div><div class='add'>+	if (!IS_ERR_OR_NULL(mixer_res-&gt;sclk_hdmi))</div><div class='add'>+		clk_put(mixer_res-&gt;sclk_hdmi);</div><div class='add'>+	if (!IS_ERR_OR_NULL(mixer_res-&gt;sclk_mixer))</div><div class='add'>+		clk_put(mixer_res-&gt;sclk_mixer);</div><div class='add'>+	if (!IS_ERR_OR_NULL(mixer_res-&gt;vp))</div><div class='add'>+		clk_put(mixer_res-&gt;vp);</div><div class='add'>+	if (!IS_ERR_OR_NULL(mixer_res-&gt;mixer))</div><div class='add'>+		clk_put(mixer_res-&gt;mixer);</div><div class='add'>+	mixer_res-&gt;dev = NULL;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mixer_resources_cleanup(struct mixer_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct mixer_resources *res = &amp;ctx-&gt;mixer_res;</div><div class='add'>+</div><div class='add'>+	disable_irq(res-&gt;irq);</div><div class='add'>+	free_irq(res-&gt;irq, ctx);</div><div class='add'>+</div><div class='add'>+	iounmap(res-&gt;vp_regs);</div><div class='add'>+	iounmap(res-&gt;mixer_regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit mixer_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 exynos_drm_hdmi_context *drm_hdmi_ctx;</div><div class='add'>+	struct mixer_context *ctx;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "probe start\n");</div><div class='add'>+</div><div class='add'>+	drm_hdmi_ctx = kzalloc(sizeof(*drm_hdmi_ctx), GFP_KERNEL);</div><div class='add'>+	if (!drm_hdmi_ctx) {</div><div class='add'>+		DRM_ERROR("failed to allocate common hdmi context.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+	if (!ctx) {</div><div class='add'>+		DRM_ERROR("failed to alloc mixer context.\n");</div><div class='add'>+		kfree(drm_hdmi_ctx);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	drm_hdmi_ctx-&gt;ctx = (void *)ctx;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, drm_hdmi_ctx);</div><div class='add'>+</div><div class='add'>+	/* acquire resources: regs, irqs, clocks */</div><div class='add'>+	ret = mixer_resources_init(drm_hdmi_ctx, pdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* register specific callback point to common hdmi. */</div><div class='add'>+	exynos_drm_overlay_ops_register(&amp;overlay_ops);</div><div class='add'>+</div><div class='add'>+	mixer_resource_poweron(ctx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	dev_info(dev, "probe failed\n");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mixer_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct exynos_drm_hdmi_context *drm_hdmi_ctx =</div><div class='add'>+					platform_get_drvdata(pdev);</div><div class='add'>+	struct mixer_context *ctx = (struct mixer_context *)drm_hdmi_ctx-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "remove sucessful\n");</div><div class='add'>+</div><div class='add'>+	mixer_resource_poweroff(ctx);</div><div class='add'>+	mixer_resources_cleanup(ctx);</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 mixer_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "s5p-mixer",</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+		.pm = &amp;mixer_pm_ops,</div><div class='add'>+	},</div><div class='add'>+	.probe = mixer_probe,</div><div class='add'>+	.remove = __devexit_p(mixer_remove),</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(mixer_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Seung-Woo Kim, &lt;sw0312.kim@samsung.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Inki Dae &lt;inki.dae@samsung.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Joonyoung Shim &lt;jy0922.shim@samsung.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Samsung DRM HDMI mixer Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/exynos_mixer.h b/drivers/gpu/drm/exynos/exynos_mixer.h<br/>new file mode 100644<br/>index 000000000000..cebacfefc077<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/exynos_mixer.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/exynos_mixer.h</a></div><div class='hunk'>@@ -0,0 +1,92 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Seung-Woo Kim &lt;sw0312.kim@samsung.com&gt;</div><div class='add'>+ *	Inki Dae &lt;inki.dae@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR</div><div class='add'>+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,</div><div class='add'>+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ * OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _EXYNOS_MIXER_H_</div><div class='add'>+#define _EXYNOS_MIXER_H_</div><div class='add'>+</div><div class='add'>+#define HDMI_OVERLAY_NUMBER	3</div><div class='add'>+</div><div class='add'>+struct hdmi_win_data {</div><div class='add'>+	dma_addr_t		dma_addr;</div><div class='add'>+	void __iomem		*vaddr;</div><div class='add'>+	dma_addr_t		chroma_dma_addr;</div><div class='add'>+	void __iomem		*chroma_vaddr;</div><div class='add'>+	uint32_t		pixel_format;</div><div class='add'>+	unsigned int		bpp;</div><div class='add'>+	unsigned int		crtc_x;</div><div class='add'>+	unsigned int		crtc_y;</div><div class='add'>+	unsigned int		crtc_width;</div><div class='add'>+	unsigned int		crtc_height;</div><div class='add'>+	unsigned int		fb_x;</div><div class='add'>+	unsigned int		fb_y;</div><div class='add'>+	unsigned int		fb_width;</div><div class='add'>+	unsigned int		fb_height;</div><div class='add'>+	unsigned int		mode_width;</div><div class='add'>+	unsigned int		mode_height;</div><div class='add'>+	unsigned int		scan_flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mixer_resources {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	/** interrupt index */</div><div class='add'>+	int irq;</div><div class='add'>+	/** pointer to Mixer registers */</div><div class='add'>+	void __iomem *mixer_regs;</div><div class='add'>+	/** pointer to Video Processor registers */</div><div class='add'>+	void __iomem *vp_regs;</div><div class='add'>+	/** spinlock for protection of registers */</div><div class='add'>+	spinlock_t reg_slock;</div><div class='add'>+	/** other resources */</div><div class='add'>+	struct clk *mixer;</div><div class='add'>+	struct clk *vp;</div><div class='add'>+	struct clk *sclk_mixer;</div><div class='add'>+	struct clk *sclk_hdmi;</div><div class='add'>+	struct clk *sclk_dac;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mixer_context {</div><div class='add'>+	unsigned int			default_win;</div><div class='add'>+	struct fb_videomode		*default_timing;</div><div class='add'>+	unsigned int			default_bpp;</div><div class='add'>+</div><div class='add'>+	/** mixer interrupt */</div><div class='add'>+	unsigned int irq;</div><div class='add'>+	/** current crtc pipe for vblank */</div><div class='add'>+	int pipe;</div><div class='add'>+	/** interlace scan mode */</div><div class='add'>+	bool interlace;</div><div class='add'>+	/** vp enabled status */</div><div class='add'>+	bool vp_enabled;</div><div class='add'>+</div><div class='add'>+	/** mixer and vp resources */</div><div class='add'>+	struct mixer_resources mixer_res;</div><div class='add'>+</div><div class='add'>+	/** overlay window data */</div><div class='add'>+	struct hdmi_win_data		win_data[HDMI_OVERLAY_NUMBER];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/regs-hdmi.h b/drivers/gpu/drm/exynos/regs-hdmi.h<br/>new file mode 100644<br/>index 000000000000..72e6b52be740<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/regs-hdmi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/regs-hdmi.h</a></div><div class='hunk'>@@ -0,0 +1,147 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  Cloned from drivers/media/video/s5p-tv/regs-hdmi.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ * http://www.samsung.com/</div><div class='add'>+ *</div><div class='add'>+ * HDMI register header file for Samsung TVOUT driver</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef SAMSUNG_REGS_HDMI_H</div><div class='add'>+#define SAMSUNG_REGS_HDMI_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Register part</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#define HDMI_CTRL_BASE(x)		((x) + 0x00000000)</div><div class='add'>+#define HDMI_CORE_BASE(x)		((x) + 0x00010000)</div><div class='add'>+#define HDMI_TG_BASE(x)			((x) + 0x00050000)</div><div class='add'>+</div><div class='add'>+/* Control registers */</div><div class='add'>+#define HDMI_INTC_CON			HDMI_CTRL_BASE(0x0000)</div><div class='add'>+#define HDMI_INTC_FLAG			HDMI_CTRL_BASE(0x0004)</div><div class='add'>+#define HDMI_HPD_STATUS			HDMI_CTRL_BASE(0x000C)</div><div class='add'>+#define HDMI_PHY_RSTOUT			HDMI_CTRL_BASE(0x0014)</div><div class='add'>+#define HDMI_PHY_VPLL			HDMI_CTRL_BASE(0x0018)</div><div class='add'>+#define HDMI_PHY_CMU			HDMI_CTRL_BASE(0x001C)</div><div class='add'>+#define HDMI_CORE_RSTOUT		HDMI_CTRL_BASE(0x0020)</div><div class='add'>+</div><div class='add'>+/* Core registers */</div><div class='add'>+#define HDMI_CON_0			HDMI_CORE_BASE(0x0000)</div><div class='add'>+#define HDMI_CON_1			HDMI_CORE_BASE(0x0004)</div><div class='add'>+#define HDMI_CON_2			HDMI_CORE_BASE(0x0008)</div><div class='add'>+#define HDMI_SYS_STATUS			HDMI_CORE_BASE(0x0010)</div><div class='add'>+#define HDMI_PHY_STATUS			HDMI_CORE_BASE(0x0014)</div><div class='add'>+#define HDMI_STATUS_EN			HDMI_CORE_BASE(0x0020)</div><div class='add'>+#define HDMI_HPD			HDMI_CORE_BASE(0x0030)</div><div class='add'>+#define HDMI_MODE_SEL			HDMI_CORE_BASE(0x0040)</div><div class='add'>+#define HDMI_BLUE_SCREEN_0		HDMI_CORE_BASE(0x0050)</div><div class='add'>+#define HDMI_BLUE_SCREEN_1		HDMI_CORE_BASE(0x0054)</div><div class='add'>+#define HDMI_BLUE_SCREEN_2		HDMI_CORE_BASE(0x0058)</div><div class='add'>+#define HDMI_H_BLANK_0			HDMI_CORE_BASE(0x00A0)</div><div class='add'>+#define HDMI_H_BLANK_1			HDMI_CORE_BASE(0x00A4)</div><div class='add'>+#define HDMI_V_BLANK_0			HDMI_CORE_BASE(0x00B0)</div><div class='add'>+#define HDMI_V_BLANK_1			HDMI_CORE_BASE(0x00B4)</div><div class='add'>+#define HDMI_V_BLANK_2			HDMI_CORE_BASE(0x00B8)</div><div class='add'>+#define HDMI_H_V_LINE_0			HDMI_CORE_BASE(0x00C0)</div><div class='add'>+#define HDMI_H_V_LINE_1			HDMI_CORE_BASE(0x00C4)</div><div class='add'>+#define HDMI_H_V_LINE_2			HDMI_CORE_BASE(0x00C8)</div><div class='add'>+#define HDMI_VSYNC_POL			HDMI_CORE_BASE(0x00E4)</div><div class='add'>+#define HDMI_INT_PRO_MODE		HDMI_CORE_BASE(0x00E8)</div><div class='add'>+#define HDMI_V_BLANK_F_0		HDMI_CORE_BASE(0x0110)</div><div class='add'>+#define HDMI_V_BLANK_F_1		HDMI_CORE_BASE(0x0114)</div><div class='add'>+#define HDMI_V_BLANK_F_2		HDMI_CORE_BASE(0x0118)</div><div class='add'>+#define HDMI_H_SYNC_GEN_0		HDMI_CORE_BASE(0x0120)</div><div class='add'>+#define HDMI_H_SYNC_GEN_1		HDMI_CORE_BASE(0x0124)</div><div class='add'>+#define HDMI_H_SYNC_GEN_2		HDMI_CORE_BASE(0x0128)</div><div class='add'>+#define HDMI_V_SYNC_GEN_1_0		HDMI_CORE_BASE(0x0130)</div><div class='add'>+#define HDMI_V_SYNC_GEN_1_1		HDMI_CORE_BASE(0x0134)</div><div class='add'>+#define HDMI_V_SYNC_GEN_1_2		HDMI_CORE_BASE(0x0138)</div><div class='add'>+#define HDMI_V_SYNC_GEN_2_0		HDMI_CORE_BASE(0x0140)</div><div class='add'>+#define HDMI_V_SYNC_GEN_2_1		HDMI_CORE_BASE(0x0144)</div><div class='add'>+#define HDMI_V_SYNC_GEN_2_2		HDMI_CORE_BASE(0x0148)</div><div class='add'>+#define HDMI_V_SYNC_GEN_3_0		HDMI_CORE_BASE(0x0150)</div><div class='add'>+#define HDMI_V_SYNC_GEN_3_1		HDMI_CORE_BASE(0x0154)</div><div class='add'>+#define HDMI_V_SYNC_GEN_3_2		HDMI_CORE_BASE(0x0158)</div><div class='add'>+#define HDMI_ACR_CON			HDMI_CORE_BASE(0x0180)</div><div class='add'>+#define HDMI_AVI_CON			HDMI_CORE_BASE(0x0300)</div><div class='add'>+#define HDMI_AVI_BYTE(n)		HDMI_CORE_BASE(0x0320 + 4 * (n))</div><div class='add'>+#define HDMI_DC_CONTROL			HDMI_CORE_BASE(0x05C0)</div><div class='add'>+#define HDMI_VIDEO_PATTERN_GEN		HDMI_CORE_BASE(0x05C4)</div><div class='add'>+#define HDMI_HPD_GEN			HDMI_CORE_BASE(0x05C8)</div><div class='add'>+#define HDMI_AUI_CON			HDMI_CORE_BASE(0x0360)</div><div class='add'>+#define HDMI_SPD_CON			HDMI_CORE_BASE(0x0400)</div><div class='add'>+</div><div class='add'>+/* Timing generator registers */</div><div class='add'>+#define HDMI_TG_CMD			HDMI_TG_BASE(0x0000)</div><div class='add'>+#define HDMI_TG_H_FSZ_L			HDMI_TG_BASE(0x0018)</div><div class='add'>+#define HDMI_TG_H_FSZ_H			HDMI_TG_BASE(0x001C)</div><div class='add'>+#define HDMI_TG_HACT_ST_L		HDMI_TG_BASE(0x0020)</div><div class='add'>+#define HDMI_TG_HACT_ST_H		HDMI_TG_BASE(0x0024)</div><div class='add'>+#define HDMI_TG_HACT_SZ_L		HDMI_TG_BASE(0x0028)</div><div class='add'>+#define HDMI_TG_HACT_SZ_H		HDMI_TG_BASE(0x002C)</div><div class='add'>+#define HDMI_TG_V_FSZ_L			HDMI_TG_BASE(0x0030)</div><div class='add'>+#define HDMI_TG_V_FSZ_H			HDMI_TG_BASE(0x0034)</div><div class='add'>+#define HDMI_TG_VSYNC_L			HDMI_TG_BASE(0x0038)</div><div class='add'>+#define HDMI_TG_VSYNC_H			HDMI_TG_BASE(0x003C)</div><div class='add'>+#define HDMI_TG_VSYNC2_L		HDMI_TG_BASE(0x0040)</div><div class='add'>+#define HDMI_TG_VSYNC2_H		HDMI_TG_BASE(0x0044)</div><div class='add'>+#define HDMI_TG_VACT_ST_L		HDMI_TG_BASE(0x0048)</div><div class='add'>+#define HDMI_TG_VACT_ST_H		HDMI_TG_BASE(0x004C)</div><div class='add'>+#define HDMI_TG_VACT_SZ_L		HDMI_TG_BASE(0x0050)</div><div class='add'>+#define HDMI_TG_VACT_SZ_H		HDMI_TG_BASE(0x0054)</div><div class='add'>+#define HDMI_TG_FIELD_CHG_L		HDMI_TG_BASE(0x0058)</div><div class='add'>+#define HDMI_TG_FIELD_CHG_H		HDMI_TG_BASE(0x005C)</div><div class='add'>+#define HDMI_TG_VACT_ST2_L		HDMI_TG_BASE(0x0060)</div><div class='add'>+#define HDMI_TG_VACT_ST2_H		HDMI_TG_BASE(0x0064)</div><div class='add'>+#define HDMI_TG_VSYNC_TOP_HDMI_L	HDMI_TG_BASE(0x0078)</div><div class='add'>+#define HDMI_TG_VSYNC_TOP_HDMI_H	HDMI_TG_BASE(0x007C)</div><div class='add'>+#define HDMI_TG_VSYNC_BOT_HDMI_L	HDMI_TG_BASE(0x0080)</div><div class='add'>+#define HDMI_TG_VSYNC_BOT_HDMI_H	HDMI_TG_BASE(0x0084)</div><div class='add'>+#define HDMI_TG_FIELD_TOP_HDMI_L	HDMI_TG_BASE(0x0088)</div><div class='add'>+#define HDMI_TG_FIELD_TOP_HDMI_H	HDMI_TG_BASE(0x008C)</div><div class='add'>+#define HDMI_TG_FIELD_BOT_HDMI_L	HDMI_TG_BASE(0x0090)</div><div class='add'>+#define HDMI_TG_FIELD_BOT_HDMI_H	HDMI_TG_BASE(0x0094)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Bit definition part</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* HDMI_INTC_CON */</div><div class='add'>+#define HDMI_INTC_EN_GLOBAL		(1 &lt;&lt; 6)</div><div class='add'>+#define HDMI_INTC_EN_HPD_PLUG		(1 &lt;&lt; 3)</div><div class='add'>+#define HDMI_INTC_EN_HPD_UNPLUG		(1 &lt;&lt; 2)</div><div class='add'>+</div><div class='add'>+/* HDMI_INTC_FLAG */</div><div class='add'>+#define HDMI_INTC_FLAG_HPD_PLUG		(1 &lt;&lt; 3)</div><div class='add'>+#define HDMI_INTC_FLAG_HPD_UNPLUG	(1 &lt;&lt; 2)</div><div class='add'>+</div><div class='add'>+/* HDMI_PHY_RSTOUT */</div><div class='add'>+#define HDMI_PHY_SW_RSTOUT		(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* HDMI_CORE_RSTOUT */</div><div class='add'>+#define HDMI_CORE_SW_RSTOUT		(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* HDMI_CON_0 */</div><div class='add'>+#define HDMI_BLUE_SCR_EN		(1 &lt;&lt; 5)</div><div class='add'>+#define HDMI_EN				(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* HDMI_PHY_STATUS */</div><div class='add'>+#define HDMI_PHY_STATUS_READY		(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* HDMI_MODE_SEL */</div><div class='add'>+#define HDMI_MODE_HDMI_EN		(1 &lt;&lt; 1)</div><div class='add'>+#define HDMI_MODE_DVI_EN		(1 &lt;&lt; 0)</div><div class='add'>+#define HDMI_MODE_MASK			(3 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* HDMI_TG_CMD */</div><div class='add'>+#define HDMI_TG_EN			(1 &lt;&lt; 0)</div><div class='add'>+#define HDMI_FIELD_EN			(1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+#endif /* SAMSUNG_REGS_HDMI_H */</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/regs-mixer.h b/drivers/gpu/drm/exynos/regs-mixer.h<br/>new file mode 100644<br/>index 000000000000..fd2f4d14cf6d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/regs-mixer.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/regs-mixer.h</a></div><div class='hunk'>@@ -0,0 +1,141 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  Cloned from drivers/media/video/s5p-tv/regs-mixer.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ * http://www.samsung.com/</div><div class='add'>+ *</div><div class='add'>+ * Mixer register header file for Samsung Mixer driver</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+*/</div><div class='add'>+#ifndef SAMSUNG_REGS_MIXER_H</div><div class='add'>+#define SAMSUNG_REGS_MIXER_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Register part</div><div class='add'>+ */</div><div class='add'>+#define MXR_STATUS			0x0000</div><div class='add'>+#define MXR_CFG				0x0004</div><div class='add'>+#define MXR_INT_EN			0x0008</div><div class='add'>+#define MXR_INT_STATUS			0x000C</div><div class='add'>+#define MXR_LAYER_CFG			0x0010</div><div class='add'>+#define MXR_VIDEO_CFG			0x0014</div><div class='add'>+#define MXR_GRAPHIC0_CFG		0x0020</div><div class='add'>+#define MXR_GRAPHIC0_BASE		0x0024</div><div class='add'>+#define MXR_GRAPHIC0_SPAN		0x0028</div><div class='add'>+#define MXR_GRAPHIC0_SXY		0x002C</div><div class='add'>+#define MXR_GRAPHIC0_WH			0x0030</div><div class='add'>+#define MXR_GRAPHIC0_DXY		0x0034</div><div class='add'>+#define MXR_GRAPHIC0_BLANK		0x0038</div><div class='add'>+#define MXR_GRAPHIC1_CFG		0x0040</div><div class='add'>+#define MXR_GRAPHIC1_BASE		0x0044</div><div class='add'>+#define MXR_GRAPHIC1_SPAN		0x0048</div><div class='add'>+#define MXR_GRAPHIC1_SXY		0x004C</div><div class='add'>+#define MXR_GRAPHIC1_WH			0x0050</div><div class='add'>+#define MXR_GRAPHIC1_DXY		0x0054</div><div class='add'>+#define MXR_GRAPHIC1_BLANK		0x0058</div><div class='add'>+#define MXR_BG_CFG			0x0060</div><div class='add'>+#define MXR_BG_COLOR0			0x0064</div><div class='add'>+#define MXR_BG_COLOR1			0x0068</div><div class='add'>+#define MXR_BG_COLOR2			0x006C</div><div class='add'>+#define MXR_CM_COEFF_Y			0x0080</div><div class='add'>+#define MXR_CM_COEFF_CB			0x0084</div><div class='add'>+#define MXR_CM_COEFF_CR			0x0088</div><div class='add'>+#define MXR_GRAPHIC0_BASE_S		0x2024</div><div class='add'>+#define MXR_GRAPHIC1_BASE_S		0x2044</div><div class='add'>+</div><div class='add'>+/* for parametrized access to layer registers */</div><div class='add'>+#define MXR_GRAPHIC_CFG(i)		(0x0020 + (i) * 0x20)</div><div class='add'>+#define MXR_GRAPHIC_BASE(i)		(0x0024 + (i) * 0x20)</div><div class='add'>+#define MXR_GRAPHIC_SPAN(i)		(0x0028 + (i) * 0x20)</div><div class='add'>+#define MXR_GRAPHIC_SXY(i)		(0x002C + (i) * 0x20)</div><div class='add'>+#define MXR_GRAPHIC_WH(i)		(0x0030 + (i) * 0x20)</div><div class='add'>+#define MXR_GRAPHIC_DXY(i)		(0x0034 + (i) * 0x20)</div><div class='add'>+#define MXR_GRAPHIC_BLANK(i)		(0x0038 + (i) * 0x20)</div><div class='add'>+#define MXR_GRAPHIC_BASE_S(i)		(0x2024 + (i) * 0x20)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Bit definition part</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* generates mask for range of bits */</div><div class='add'>+#define MXR_MASK(high_bit, low_bit) \</div><div class='add'>+	(((2 &lt;&lt; ((high_bit) - (low_bit))) - 1) &lt;&lt; (low_bit))</div><div class='add'>+</div><div class='add'>+#define MXR_MASK_VAL(val, high_bit, low_bit) \</div><div class='add'>+	(((val) &lt;&lt; (low_bit)) &amp; MXR_MASK(high_bit, low_bit))</div><div class='add'>+</div><div class='add'>+/* bits for MXR_STATUS */</div><div class='add'>+#define MXR_STATUS_16_BURST		(1 &lt;&lt; 7)</div><div class='add'>+#define MXR_STATUS_BURST_MASK		(1 &lt;&lt; 7)</div><div class='add'>+#define MXR_STATUS_BIG_ENDIAN		(1 &lt;&lt; 3)</div><div class='add'>+#define MXR_STATUS_ENDIAN_MASK		(1 &lt;&lt; 3)</div><div class='add'>+#define MXR_STATUS_SYNC_ENABLE		(1 &lt;&lt; 2)</div><div class='add'>+#define MXR_STATUS_REG_RUN		(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* bits for MXR_CFG */</div><div class='add'>+#define MXR_CFG_RGB601_0_255		(0 &lt;&lt; 9)</div><div class='add'>+#define MXR_CFG_RGB601_16_235		(1 &lt;&lt; 9)</div><div class='add'>+#define MXR_CFG_RGB709_0_255		(2 &lt;&lt; 9)</div><div class='add'>+#define MXR_CFG_RGB709_16_235		(3 &lt;&lt; 9)</div><div class='add'>+#define MXR_CFG_RGB_FMT_MASK		0x600</div><div class='add'>+#define MXR_CFG_OUT_YUV444		(0 &lt;&lt; 8)</div><div class='add'>+#define MXR_CFG_OUT_RGB888		(1 &lt;&lt; 8)</div><div class='add'>+#define MXR_CFG_OUT_MASK		(1 &lt;&lt; 8)</div><div class='add'>+#define MXR_CFG_DST_SDO			(0 &lt;&lt; 7)</div><div class='add'>+#define MXR_CFG_DST_HDMI		(1 &lt;&lt; 7)</div><div class='add'>+#define MXR_CFG_DST_MASK		(1 &lt;&lt; 7)</div><div class='add'>+#define MXR_CFG_SCAN_HD_720		(0 &lt;&lt; 6)</div><div class='add'>+#define MXR_CFG_SCAN_HD_1080		(1 &lt;&lt; 6)</div><div class='add'>+#define MXR_CFG_GRP1_ENABLE		(1 &lt;&lt; 5)</div><div class='add'>+#define MXR_CFG_GRP0_ENABLE		(1 &lt;&lt; 4)</div><div class='add'>+#define MXR_CFG_VP_ENABLE		(1 &lt;&lt; 3)</div><div class='add'>+#define MXR_CFG_SCAN_INTERLACE		(0 &lt;&lt; 2)</div><div class='add'>+#define MXR_CFG_SCAN_PROGRASSIVE	(1 &lt;&lt; 2)</div><div class='add'>+#define MXR_CFG_SCAN_NTSC		(0 &lt;&lt; 1)</div><div class='add'>+#define MXR_CFG_SCAN_PAL		(1 &lt;&lt; 1)</div><div class='add'>+#define MXR_CFG_SCAN_SD			(0 &lt;&lt; 0)</div><div class='add'>+#define MXR_CFG_SCAN_HD			(1 &lt;&lt; 0)</div><div class='add'>+#define MXR_CFG_SCAN_MASK		0x47</div><div class='add'>+</div><div class='add'>+/* bits for MXR_GRAPHICn_CFG */</div><div class='add'>+#define MXR_GRP_CFG_COLOR_KEY_DISABLE	(1 &lt;&lt; 21)</div><div class='add'>+#define MXR_GRP_CFG_BLEND_PRE_MUL	(1 &lt;&lt; 20)</div><div class='add'>+#define MXR_GRP_CFG_WIN_BLEND_EN	(1 &lt;&lt; 17)</div><div class='add'>+#define MXR_GRP_CFG_PIXEL_BLEND_EN	(1 &lt;&lt; 16)</div><div class='add'>+#define MXR_GRP_CFG_FORMAT_VAL(x)	MXR_MASK_VAL(x, 11, 8)</div><div class='add'>+#define MXR_GRP_CFG_FORMAT_MASK		MXR_GRP_CFG_FORMAT_VAL(~0)</div><div class='add'>+#define MXR_GRP_CFG_ALPHA_VAL(x)	MXR_MASK_VAL(x, 7, 0)</div><div class='add'>+</div><div class='add'>+/* bits for MXR_GRAPHICn_WH */</div><div class='add'>+#define MXR_GRP_WH_H_SCALE(x)		MXR_MASK_VAL(x, 28, 28)</div><div class='add'>+#define MXR_GRP_WH_V_SCALE(x)		MXR_MASK_VAL(x, 12, 12)</div><div class='add'>+#define MXR_GRP_WH_WIDTH(x)		MXR_MASK_VAL(x, 26, 16)</div><div class='add'>+#define MXR_GRP_WH_HEIGHT(x)		MXR_MASK_VAL(x, 10, 0)</div><div class='add'>+</div><div class='add'>+/* bits for MXR_GRAPHICn_SXY */</div><div class='add'>+#define MXR_GRP_SXY_SX(x)		MXR_MASK_VAL(x, 26, 16)</div><div class='add'>+#define MXR_GRP_SXY_SY(x)		MXR_MASK_VAL(x, 10, 0)</div><div class='add'>+</div><div class='add'>+/* bits for MXR_GRAPHICn_DXY */</div><div class='add'>+#define MXR_GRP_DXY_DX(x)		MXR_MASK_VAL(x, 26, 16)</div><div class='add'>+#define MXR_GRP_DXY_DY(x)		MXR_MASK_VAL(x, 10, 0)</div><div class='add'>+</div><div class='add'>+/* bits for MXR_INT_EN */</div><div class='add'>+#define MXR_INT_EN_VSYNC		(1 &lt;&lt; 11)</div><div class='add'>+#define MXR_INT_EN_ALL			(0x0f &lt;&lt; 8)</div><div class='add'>+</div><div class='add'>+/* bit for MXR_INT_STATUS */</div><div class='add'>+#define MXR_INT_CLEAR_VSYNC		(1 &lt;&lt; 11)</div><div class='add'>+#define MXR_INT_STATUS_VSYNC		(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* bit for MXR_LAYER_CFG */</div><div class='add'>+#define MXR_LAYER_CFG_GRP1_VAL(x)	MXR_MASK_VAL(x, 11, 8)</div><div class='add'>+#define MXR_LAYER_CFG_GRP0_VAL(x)	MXR_MASK_VAL(x, 7, 4)</div><div class='add'>+#define MXR_LAYER_CFG_VP_VAL(x)		MXR_MASK_VAL(x, 3, 0)</div><div class='add'>+</div><div class='add'>+#endif /* SAMSUNG_REGS_MIXER_H */</div><div class='add'>+</div><div class='head'>diff --git a/drivers/gpu/drm/exynos/regs-vp.h b/drivers/gpu/drm/exynos/regs-vp.h<br/>new file mode 100644<br/>index 000000000000..10b737af0a72<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/exynos/regs-vp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/exynos/regs-vp.h</a></div><div class='hunk'>@@ -0,0 +1,91 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  Cloned from drivers/media/video/s5p-tv/regs-vp.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com/</div><div class='add'>+ *</div><div class='add'>+ * Video processor register header file for Samsung Mixer driver</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef SAMSUNG_REGS_VP_H</div><div class='add'>+#define SAMSUNG_REGS_VP_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Register part</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define VP_ENABLE			0x0000</div><div class='add'>+#define VP_SRESET			0x0004</div><div class='add'>+#define VP_SHADOW_UPDATE		0x0008</div><div class='add'>+#define VP_FIELD_ID			0x000C</div><div class='add'>+#define VP_MODE				0x0010</div><div class='add'>+#define VP_IMG_SIZE_Y			0x0014</div><div class='add'>+#define VP_IMG_SIZE_C			0x0018</div><div class='add'>+#define VP_PER_RATE_CTRL		0x001C</div><div class='add'>+#define VP_TOP_Y_PTR			0x0028</div><div class='add'>+#define VP_BOT_Y_PTR			0x002C</div><div class='add'>+#define VP_TOP_C_PTR			0x0030</div><div class='add'>+#define VP_BOT_C_PTR			0x0034</div><div class='add'>+#define VP_ENDIAN_MODE			0x03CC</div><div class='add'>+#define VP_SRC_H_POSITION		0x0044</div><div class='add'>+#define VP_SRC_V_POSITION		0x0048</div><div class='add'>+#define VP_SRC_WIDTH			0x004C</div><div class='add'>+#define VP_SRC_HEIGHT			0x0050</div><div class='add'>+#define VP_DST_H_POSITION		0x0054</div><div class='add'>+#define VP_DST_V_POSITION		0x0058</div><div class='add'>+#define VP_DST_WIDTH			0x005C</div><div class='add'>+#define VP_DST_HEIGHT			0x0060</div><div class='add'>+#define VP_H_RATIO			0x0064</div><div class='add'>+#define VP_V_RATIO			0x0068</div><div class='add'>+#define VP_POLY8_Y0_LL			0x006C</div><div class='add'>+#define VP_POLY4_Y0_LL			0x00EC</div><div class='add'>+#define VP_POLY4_C0_LL			0x012C</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Bit definition part</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* generates mask for range of bits */</div><div class='add'>+</div><div class='add'>+#define VP_MASK(high_bit, low_bit) \</div><div class='add'>+	(((2 &lt;&lt; ((high_bit) - (low_bit))) - 1) &lt;&lt; (low_bit))</div><div class='add'>+</div><div class='add'>+#define VP_MASK_VAL(val, high_bit, low_bit) \</div><div class='add'>+	(((val) &lt;&lt; (low_bit)) &amp; VP_MASK(high_bit, low_bit))</div><div class='add'>+</div><div class='add'>+ /* VP_ENABLE */</div><div class='add'>+#define VP_ENABLE_ON			(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* VP_SRESET */</div><div class='add'>+#define VP_SRESET_PROCESSING		(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* VP_SHADOW_UPDATE */</div><div class='add'>+#define VP_SHADOW_UPDATE_ENABLE		(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* VP_MODE */</div><div class='add'>+#define VP_MODE_NV12			(0 &lt;&lt; 6)</div><div class='add'>+#define VP_MODE_NV21			(1 &lt;&lt; 6)</div><div class='add'>+#define VP_MODE_LINE_SKIP		(1 &lt;&lt; 5)</div><div class='add'>+#define VP_MODE_MEM_LINEAR		(0 &lt;&lt; 4)</div><div class='add'>+#define VP_MODE_MEM_TILED		(1 &lt;&lt; 4)</div><div class='add'>+#define VP_MODE_FMT_MASK		(5 &lt;&lt; 4)</div><div class='add'>+#define VP_MODE_FIELD_ID_AUTO_TOGGLING	(1 &lt;&lt; 2)</div><div class='add'>+#define VP_MODE_2D_IPC			(1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+/* VP_IMG_SIZE_Y */</div><div class='add'>+/* VP_IMG_SIZE_C */</div><div class='add'>+#define VP_IMG_HSIZE(x)			VP_MASK_VAL(x, 29, 16)</div><div class='add'>+#define VP_IMG_VSIZE(x)			VP_MASK_VAL(x, 13, 0)</div><div class='add'>+</div><div class='add'>+/* VP_SRC_H_POSITION */</div><div class='add'>+#define VP_SRC_H_POSITION_VAL(x)	VP_MASK_VAL(x, 14, 4)</div><div class='add'>+</div><div class='add'>+/* VP_ENDIAN_MODE */</div><div class='add'>+#define VP_ENDIAN_MODE_LITTLE		(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#endif /* SAMSUNG_REGS_VP_H */</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/Kconfig b/drivers/gpu/drm/gma500/Kconfig<br/>new file mode 100644<br/>index 000000000000..754e14bdc801<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+config DRM_GMA500</div><div class='add'>+	tristate "Intel GMA5/600 KMS Framebuffer"</div><div class='add'>+	depends on DRM &amp;&amp; PCI &amp;&amp; X86 &amp;&amp; EXPERIMENTAL</div><div class='add'>+	select FB_CFB_COPYAREA</div><div class='add'>+        select FB_CFB_FILLRECT</div><div class='add'>+        select FB_CFB_IMAGEBLIT</div><div class='add'>+        select DRM_KMS_HELPER</div><div class='add'>+        select DRM_TTM</div><div class='add'>+	help</div><div class='add'>+	  Say yes for an experimental 2D KMS framebuffer driver for the</div><div class='add'>+	  Intel GMA500 ('Poulsbo') and other Intel IMG based graphics</div><div class='add'>+	  devices.</div><div class='add'>+</div><div class='add'>+config DRM_GMA600</div><div class='add'>+	bool "Intel GMA600 support (Experimental)"</div><div class='add'>+	depends on DRM_GMA500</div><div class='add'>+	help</div><div class='add'>+	  Say yes to include support for GMA600 (Intel Moorestown/Oaktrail)</div><div class='add'>+	  platforms with LVDS ports. HDMI and MIPI are not currently</div><div class='add'>+	  supported.</div><div class='add'>+</div><div class='add'>+config DRM_GMA3600</div><div class='add'>+	bool "Intel GMA3600/3650 support (Experimental)"</div><div class='add'>+	depends on DRM_GMA500</div><div class='add'>+	help</div><div class='add'>+	  Say yes to include basic support for Intel GMA3600/3650 (Intel</div><div class='add'>+	  Cedar Trail) platforms.</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/Makefile b/drivers/gpu/drm/gma500/Makefile<br/>new file mode 100644<br/>index 000000000000..81c103be5e21<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/Makefile</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+#</div><div class='add'>+#	KMS driver for the GMA500</div><div class='add'>+#</div><div class='add'>+ccflags-y += -Iinclude/drm</div><div class='add'>+</div><div class='add'>+gma500_gfx-y += gem_glue.o \</div><div class='add'>+	  accel_2d.o \</div><div class='add'>+	  backlight.o \</div><div class='add'>+	  framebuffer.o \</div><div class='add'>+	  gem.o \</div><div class='add'>+	  gtt.o \</div><div class='add'>+	  intel_bios.o \</div><div class='add'>+	  intel_i2c.o \</div><div class='add'>+	  intel_gmbus.o \</div><div class='add'>+	  intel_opregion.o \</div><div class='add'>+	  mmu.o \</div><div class='add'>+	  power.o \</div><div class='add'>+	  psb_drv.o \</div><div class='add'>+	  psb_intel_display.o \</div><div class='add'>+	  psb_intel_lvds.o \</div><div class='add'>+	  psb_intel_modes.o \</div><div class='add'>+	  psb_intel_sdvo.o \</div><div class='add'>+	  psb_lid.o \</div><div class='add'>+	  psb_irq.o \</div><div class='add'>+	  psb_device.o \</div><div class='add'>+	  mid_bios.o</div><div class='add'>+</div><div class='add'>+gma500_gfx-$(CONFIG_DRM_GMA3600) +=  cdv_device.o \</div><div class='add'>+	  cdv_intel_crt.o \</div><div class='add'>+	  cdv_intel_display.o \</div><div class='add'>+	  cdv_intel_hdmi.o \</div><div class='add'>+	  cdv_intel_lvds.o</div><div class='add'>+</div><div class='add'>+gma500_gfx-$(CONFIG_DRM_GMA600) += oaktrail_device.o \</div><div class='add'>+	  oaktrail_crtc.o \</div><div class='add'>+	  oaktrail_lvds.o \</div><div class='add'>+	  oaktrail_hdmi.o \</div><div class='add'>+	  oaktrail_hdmi_i2c.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_DRM_GMA500) += gma500_gfx.o</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/accel_2d.c b/drivers/gpu/drm/gma500/accel_2d.c<br/>new file mode 100644<br/>index 000000000000..d5ef1a5793c8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/accel_2d.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/accel_2d.c</a></div><div class='hunk'>@@ -0,0 +1,364 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ * Copyright (c) 2007-2011, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ * Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to</div><div class='add'>+ * develop this driver.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/console.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include &lt;drm/drm.h&gt;</div><div class='add'>+#include &lt;drm/drm_crtc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_reg.h"</div><div class='add'>+#include "framebuffer.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_spank		-	reset the 2D engine</div><div class='add'>+ *	@dev_priv: our PSB DRM device</div><div class='add'>+ *</div><div class='add'>+ *	Soft reset the graphics engine and then reload the necessary registers.</div><div class='add'>+ *	We use this at initialisation time but it will become relevant for</div><div class='add'>+ *	accelerated X later</div><div class='add'>+ */</div><div class='add'>+void psb_spank(struct drm_psb_private *dev_priv)</div><div class='add'>+{</div><div class='add'>+	PSB_WSGX32(_PSB_CS_RESET_BIF_RESET | _PSB_CS_RESET_DPM_RESET |</div><div class='add'>+		_PSB_CS_RESET_TA_RESET | _PSB_CS_RESET_USE_RESET |</div><div class='add'>+		_PSB_CS_RESET_ISP_RESET | _PSB_CS_RESET_TSP_RESET |</div><div class='add'>+		_PSB_CS_RESET_TWOD_RESET, PSB_CR_SOFT_RESET);</div><div class='add'>+	PSB_RSGX32(PSB_CR_SOFT_RESET);</div><div class='add'>+</div><div class='add'>+	msleep(1);</div><div class='add'>+</div><div class='add'>+	PSB_WSGX32(0, PSB_CR_SOFT_RESET);</div><div class='add'>+	wmb();</div><div class='add'>+	PSB_WSGX32(PSB_RSGX32(PSB_CR_BIF_CTRL) | _PSB_CB_CTRL_CLEAR_FAULT,</div><div class='add'>+		   PSB_CR_BIF_CTRL);</div><div class='add'>+	wmb();</div><div class='add'>+	(void) PSB_RSGX32(PSB_CR_BIF_CTRL);</div><div class='add'>+</div><div class='add'>+	msleep(1);</div><div class='add'>+	PSB_WSGX32(PSB_RSGX32(PSB_CR_BIF_CTRL) &amp; ~_PSB_CB_CTRL_CLEAR_FAULT,</div><div class='add'>+		   PSB_CR_BIF_CTRL);</div><div class='add'>+	(void) PSB_RSGX32(PSB_CR_BIF_CTRL);</div><div class='add'>+	PSB_WSGX32(dev_priv-&gt;gtt.gatt_start, PSB_CR_BIF_TWOD_REQ_BASE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb2_2d_wait_available	-	wait for FIFO room</div><div class='add'>+ *	@dev_priv: our DRM device</div><div class='add'>+ *	@size: size (in dwords) of the command we want to issue</div><div class='add'>+ *</div><div class='add'>+ *	Wait until there is room to load the FIFO with our data. If the</div><div class='add'>+ *	device is not responding then reset it</div><div class='add'>+ */</div><div class='add'>+static int psb_2d_wait_available(struct drm_psb_private *dev_priv,</div><div class='add'>+			  unsigned size)</div><div class='add'>+{</div><div class='add'>+	uint32_t avail = PSB_RSGX32(PSB_CR_2D_SOCIF);</div><div class='add'>+	unsigned long t = jiffies + HZ;</div><div class='add'>+</div><div class='add'>+	while (avail &lt; size) {</div><div class='add'>+		avail = PSB_RSGX32(PSB_CR_2D_SOCIF);</div><div class='add'>+		if (time_after(jiffies, t)) {</div><div class='add'>+			psb_spank(dev_priv);</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'>+ *	psb_2d_submit		-	submit a 2D command</div><div class='add'>+ *	@dev_priv: our DRM device</div><div class='add'>+ *	@cmdbuf: command to issue</div><div class='add'>+ *	@size: length (in dwords)</div><div class='add'>+ *</div><div class='add'>+ *	Issue one or more 2D commands to the accelerator. This needs to be</div><div class='add'>+ *	serialized later when we add the GEM interfaces for acceleration</div><div class='add'>+ */</div><div class='add'>+static int psbfb_2d_submit(struct drm_psb_private *dev_priv, uint32_t *cmdbuf,</div><div class='add'>+								unsigned size)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int i;</div><div class='add'>+	unsigned submit_size;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dev_priv-&gt;lock_2d, flags);</div><div class='add'>+	while (size &gt; 0) {</div><div class='add'>+		submit_size = (size &lt; 0x60) ? size : 0x60;</div><div class='add'>+		size -= submit_size;</div><div class='add'>+		ret = psb_2d_wait_available(dev_priv, submit_size);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		submit_size &lt;&lt;= 2;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; submit_size; i += 4)</div><div class='add'>+			PSB_WSGX32(*cmdbuf++, PSB_SGX_2D_SLAVE_PORT + i);</div><div class='add'>+</div><div class='add'>+		(void)PSB_RSGX32(PSB_SGX_2D_SLAVE_PORT + i - 4);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev_priv-&gt;lock_2d, flags);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_accel_2d_copy_direction	-	compute blit order</div><div class='add'>+ *	@xdir: X direction of move</div><div class='add'>+ *	@ydir: Y direction of move</div><div class='add'>+ *</div><div class='add'>+ *	Compute the correct order setings to ensure that an overlapping blit</div><div class='add'>+ *	correctly copies all the pixels.</div><div class='add'>+ */</div><div class='add'>+static u32 psb_accel_2d_copy_direction(int xdir, int ydir)</div><div class='add'>+{</div><div class='add'>+	if (xdir &lt; 0)</div><div class='add'>+		return (ydir &lt; 0) ? PSB_2D_COPYORDER_BR2TL :</div><div class='add'>+						PSB_2D_COPYORDER_TR2BL;</div><div class='add'>+	else</div><div class='add'>+		return (ydir &lt; 0) ? PSB_2D_COPYORDER_BL2TR :</div><div class='add'>+						PSB_2D_COPYORDER_TL2BR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_accel_2d_copy		-	accelerated 2D copy</div><div class='add'>+ *	@dev_priv: our DRM device</div><div class='add'>+ *	@src_offset in bytes</div><div class='add'>+ *	@src_stride in bytes</div><div class='add'>+ *	@src_format psb 2D format defines</div><div class='add'>+ *	@dst_offset in bytes</div><div class='add'>+ *	@dst_stride in bytes</div><div class='add'>+ *	@dst_format psb 2D format defines</div><div class='add'>+ *	@src_x offset in pixels</div><div class='add'>+ *	@src_y offset in pixels</div><div class='add'>+ *	@dst_x offset in pixels</div><div class='add'>+ *	@dst_y offset in pixels</div><div class='add'>+ *	@size_x of the copied area</div><div class='add'>+ *	@size_y of the copied area</div><div class='add'>+ *</div><div class='add'>+ *	Format and issue a 2D accelerated copy command.</div><div class='add'>+ */</div><div class='add'>+static int psb_accel_2d_copy(struct drm_psb_private *dev_priv,</div><div class='add'>+			     uint32_t src_offset, uint32_t src_stride,</div><div class='add'>+			     uint32_t src_format, uint32_t dst_offset,</div><div class='add'>+			     uint32_t dst_stride, uint32_t dst_format,</div><div class='add'>+			     uint16_t src_x, uint16_t src_y,</div><div class='add'>+			     uint16_t dst_x, uint16_t dst_y,</div><div class='add'>+			     uint16_t size_x, uint16_t size_y)</div><div class='add'>+{</div><div class='add'>+	uint32_t blit_cmd;</div><div class='add'>+	uint32_t buffer[10];</div><div class='add'>+	uint32_t *buf;</div><div class='add'>+	uint32_t direction;</div><div class='add'>+</div><div class='add'>+	buf = buffer;</div><div class='add'>+</div><div class='add'>+	direction =</div><div class='add'>+	    psb_accel_2d_copy_direction(src_x - dst_x, src_y - dst_y);</div><div class='add'>+</div><div class='add'>+	if (direction == PSB_2D_COPYORDER_BR2TL ||</div><div class='add'>+	    direction == PSB_2D_COPYORDER_TR2BL) {</div><div class='add'>+		src_x += size_x - 1;</div><div class='add'>+		dst_x += size_x - 1;</div><div class='add'>+	}</div><div class='add'>+	if (direction == PSB_2D_COPYORDER_BR2TL ||</div><div class='add'>+	    direction == PSB_2D_COPYORDER_BL2TR) {</div><div class='add'>+		src_y += size_y - 1;</div><div class='add'>+		dst_y += size_y - 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	blit_cmd =</div><div class='add'>+	    PSB_2D_BLIT_BH |</div><div class='add'>+	    PSB_2D_ROT_NONE |</div><div class='add'>+	    PSB_2D_DSTCK_DISABLE |</div><div class='add'>+	    PSB_2D_SRCCK_DISABLE |</div><div class='add'>+	    PSB_2D_USE_PAT | PSB_2D_ROP3_SRCCOPY | direction;</div><div class='add'>+</div><div class='add'>+	*buf++ = PSB_2D_FENCE_BH;</div><div class='add'>+	*buf++ =</div><div class='add'>+	    PSB_2D_DST_SURF_BH | dst_format | (dst_stride &lt;&lt;</div><div class='add'>+					       PSB_2D_DST_STRIDE_SHIFT);</div><div class='add'>+	*buf++ = dst_offset;</div><div class='add'>+	*buf++ =</div><div class='add'>+	    PSB_2D_SRC_SURF_BH | src_format | (src_stride &lt;&lt;</div><div class='add'>+					       PSB_2D_SRC_STRIDE_SHIFT);</div><div class='add'>+	*buf++ = src_offset;</div><div class='add'>+	*buf++ =</div><div class='add'>+	    PSB_2D_SRC_OFF_BH | (src_x &lt;&lt; PSB_2D_SRCOFF_XSTART_SHIFT) |</div><div class='add'>+	    (src_y &lt;&lt; PSB_2D_SRCOFF_YSTART_SHIFT);</div><div class='add'>+	*buf++ = blit_cmd;</div><div class='add'>+	*buf++ =</div><div class='add'>+	    (dst_x &lt;&lt; PSB_2D_DST_XSTART_SHIFT) | (dst_y &lt;&lt;</div><div class='add'>+						  PSB_2D_DST_YSTART_SHIFT);</div><div class='add'>+	*buf++ =</div><div class='add'>+	    (size_x &lt;&lt; PSB_2D_DST_XSIZE_SHIFT) | (size_y &lt;&lt;</div><div class='add'>+						  PSB_2D_DST_YSIZE_SHIFT);</div><div class='add'>+	*buf++ = PSB_2D_FLUSH_BH;</div><div class='add'>+</div><div class='add'>+	return psbfb_2d_submit(dev_priv, buffer, buf - buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psbfb_copyarea_accel	-	copyarea acceleration for /dev/fb</div><div class='add'>+ *	@info: our framebuffer</div><div class='add'>+ *	@a: copyarea parameters from the framebuffer core</div><div class='add'>+ *</div><div class='add'>+ *	Perform a 2D copy via the accelerator</div><div class='add'>+ */</div><div class='add'>+static void psbfb_copyarea_accel(struct fb_info *info,</div><div class='add'>+				 const struct fb_copyarea *a)</div><div class='add'>+{</div><div class='add'>+	struct psb_fbdev *fbdev = info-&gt;par;</div><div class='add'>+	struct psb_framebuffer *psbfb = &amp;fbdev-&gt;pfb;</div><div class='add'>+	struct drm_device *dev = psbfb-&gt;base.dev;</div><div class='add'>+	struct drm_framebuffer *fb = fbdev-&gt;psb_fb_helper.fb;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	uint32_t offset;</div><div class='add'>+	uint32_t stride;</div><div class='add'>+	uint32_t src_format;</div><div class='add'>+	uint32_t dst_format;</div><div class='add'>+</div><div class='add'>+	if (!fb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	offset = psbfb-&gt;gtt-&gt;offset;</div><div class='add'>+	stride = fb-&gt;pitches[0];</div><div class='add'>+</div><div class='add'>+	switch (fb-&gt;depth) {</div><div class='add'>+	case 8:</div><div class='add'>+		src_format = PSB_2D_SRC_332RGB;</div><div class='add'>+		dst_format = PSB_2D_DST_332RGB;</div><div class='add'>+		break;</div><div class='add'>+	case 15:</div><div class='add'>+		src_format = PSB_2D_SRC_555RGB;</div><div class='add'>+		dst_format = PSB_2D_DST_555RGB;</div><div class='add'>+		break;</div><div class='add'>+	case 16:</div><div class='add'>+		src_format = PSB_2D_SRC_565RGB;</div><div class='add'>+		dst_format = PSB_2D_DST_565RGB;</div><div class='add'>+		break;</div><div class='add'>+	case 24:</div><div class='add'>+	case 32:</div><div class='add'>+		/* this is wrong but since we don't do blending its okay */</div><div class='add'>+		src_format = PSB_2D_SRC_8888ARGB;</div><div class='add'>+		dst_format = PSB_2D_DST_8888ARGB;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* software fallback */</div><div class='add'>+		cfb_copyarea(info, a);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!gma_power_begin(dev, false)) {</div><div class='add'>+		cfb_copyarea(info, a);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	psb_accel_2d_copy(dev_priv,</div><div class='add'>+			  offset, stride, src_format,</div><div class='add'>+			  offset, stride, dst_format,</div><div class='add'>+			  a-&gt;sx, a-&gt;sy, a-&gt;dx, a-&gt;dy, a-&gt;width, a-&gt;height);</div><div class='add'>+	gma_power_end(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psbfb_copyarea	-	2D copy interface</div><div class='add'>+ *	@info: our framebuffer</div><div class='add'>+ *	@region: region to copy</div><div class='add'>+ *</div><div class='add'>+ *	Copy an area of the framebuffer console either by the accelerator</div><div class='add'>+ *	or directly using the cfb helpers according to the request</div><div class='add'>+ */</div><div class='add'>+void psbfb_copyarea(struct fb_info *info,</div><div class='add'>+			   const struct fb_copyarea *region)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(info-&gt;state != FBINFO_STATE_RUNNING))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Avoid the 8 pixel erratum */</div><div class='add'>+	if (region-&gt;width == 8 || region-&gt;height == 8 ||</div><div class='add'>+		(info-&gt;flags &amp; FBINFO_HWACCEL_DISABLED))</div><div class='add'>+		return cfb_copyarea(info, region);</div><div class='add'>+</div><div class='add'>+	psbfb_copyarea_accel(info, region);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psbfb_sync	-	synchronize 2D</div><div class='add'>+ *	@info: our framebuffer</div><div class='add'>+ *</div><div class='add'>+ *	Wait for the 2D engine to quiesce so that we can do CPU</div><div class='add'>+ *	access to the framebuffer again</div><div class='add'>+ */</div><div class='add'>+int psbfb_sync(struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	struct psb_fbdev *fbdev = info-&gt;par;</div><div class='add'>+	struct psb_framebuffer *psbfb = &amp;fbdev-&gt;pfb;</div><div class='add'>+	struct drm_device *dev = psbfb-&gt;base.dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	unsigned long _end = jiffies + DRM_HZ;</div><div class='add'>+	int busy = 0;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dev_priv-&gt;lock_2d, flags);</div><div class='add'>+	/*</div><div class='add'>+	 * First idle the 2D engine.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if ((PSB_RSGX32(PSB_CR_2D_SOCIF) == _PSB_C2_SOCIF_EMPTY) &amp;&amp;</div><div class='add'>+	    ((PSB_RSGX32(PSB_CR_2D_BLIT_STATUS) &amp; _PSB_C2B_STATUS_BUSY) == 0))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		busy = (PSB_RSGX32(PSB_CR_2D_SOCIF) != _PSB_C2_SOCIF_EMPTY);</div><div class='add'>+		cpu_relax();</div><div class='add'>+	} while (busy &amp;&amp; !time_after_eq(jiffies, _end));</div><div class='add'>+</div><div class='add'>+	if (busy)</div><div class='add'>+		busy = (PSB_RSGX32(PSB_CR_2D_SOCIF) != _PSB_C2_SOCIF_EMPTY);</div><div class='add'>+	if (busy)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		busy = ((PSB_RSGX32(PSB_CR_2D_BLIT_STATUS) &amp;</div><div class='add'>+						_PSB_C2B_STATUS_BUSY) != 0);</div><div class='add'>+		cpu_relax();</div><div class='add'>+	} while (busy &amp;&amp; !time_after_eq(jiffies, _end));</div><div class='add'>+	if (busy)</div><div class='add'>+		busy = ((PSB_RSGX32(PSB_CR_2D_BLIT_STATUS) &amp;</div><div class='add'>+					_PSB_C2B_STATUS_BUSY) != 0);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev_priv-&gt;lock_2d, flags);</div><div class='add'>+	return (busy) ? -EBUSY : 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/backlight.c b/drivers/gpu/drm/gma500/backlight.c<br/>new file mode 100644<br/>index 000000000000..20793951fcac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/backlight.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/backlight.c</a></div><div class='hunk'>@@ -0,0 +1,49 @@</div><div class='add'>+/*</div><div class='add'>+ * GMA500 Backlight Interface</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2009-2011, Intel Corporation.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ * Authors: Eric Knopp</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include "psb_intel_drv.h"</div><div class='add'>+#include "intel_bios.h"</div><div class='add'>+#include "power.h"</div><div class='add'>+</div><div class='add'>+int gma_backlight_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	return dev_priv-&gt;ops-&gt;backlight_init(dev);</div><div class='add'>+#else</div><div class='add'>+	return 0;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void gma_backlight_exit(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	if (dev_priv-&gt;backlight_device) {</div><div class='add'>+		dev_priv-&gt;backlight_device-&gt;props.brightness = 0;</div><div class='add'>+		backlight_update_status(dev_priv-&gt;backlight_device);</div><div class='add'>+		backlight_device_unregister(dev_priv-&gt;backlight_device);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c<br/>new file mode 100644<br/>index 000000000000..4a5b099c3bc5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/cdv_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/cdv_device.c</a></div><div class='hunk'>@@ -0,0 +1,351 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ * Copyright (c) 2011, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/backlight.h&gt;</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include &lt;drm/drm.h&gt;</div><div class='add'>+#include "gma_drm.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_reg.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include "intel_bios.h"</div><div class='add'>+#include "cdv_device.h"</div><div class='add'>+</div><div class='add'>+#define VGA_SR_INDEX		0x3c4</div><div class='add'>+#define VGA_SR_DATA		0x3c5</div><div class='add'>+</div><div class='add'>+static void cdv_disable_vga(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 sr1;</div><div class='add'>+	u32 vga_reg;</div><div class='add'>+</div><div class='add'>+	vga_reg = VGACNTRL;</div><div class='add'>+</div><div class='add'>+	outb(1, VGA_SR_INDEX);</div><div class='add'>+	sr1 = inb(VGA_SR_DATA);</div><div class='add'>+	outb(sr1 | 1&lt;&lt;5, VGA_SR_DATA);</div><div class='add'>+	udelay(300);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(vga_reg, VGA_DISP_DISABLE);</div><div class='add'>+	REG_READ(vga_reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cdv_output_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	cdv_disable_vga(dev);</div><div class='add'>+</div><div class='add'>+	cdv_intel_crt_init(dev, &amp;dev_priv-&gt;mode_dev);</div><div class='add'>+	cdv_intel_lvds_init(dev, &amp;dev_priv-&gt;mode_dev);</div><div class='add'>+</div><div class='add'>+	/* These bits indicate HDMI not SDVO on CDV, but we don't yet support</div><div class='add'>+	   the HDMI interface */</div><div class='add'>+	if (REG_READ(SDVOB) &amp; SDVO_DETECTED)</div><div class='add'>+		cdv_hdmi_init(dev, &amp;dev_priv-&gt;mode_dev, SDVOB);</div><div class='add'>+	if (REG_READ(SDVOC) &amp; SDVO_DETECTED)</div><div class='add'>+		cdv_hdmi_init(dev, &amp;dev_priv-&gt;mode_dev, SDVOC);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Poulsbo Backlight Interfaces</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define BLC_PWM_PRECISION_FACTOR 100	/* 10000000 */</div><div class='add'>+#define BLC_PWM_FREQ_CALC_CONSTANT 32</div><div class='add'>+#define MHz 1000000</div><div class='add'>+</div><div class='add'>+#define PSB_BLC_PWM_PRECISION_FACTOR    10</div><div class='add'>+#define PSB_BLC_MAX_PWM_REG_FREQ        0xFFFE</div><div class='add'>+#define PSB_BLC_MIN_PWM_REG_FREQ        0x2</div><div class='add'>+</div><div class='add'>+#define PSB_BACKLIGHT_PWM_POLARITY_BIT_CLEAR (0xFFFE)</div><div class='add'>+#define PSB_BACKLIGHT_PWM_CTL_SHIFT	(16)</div><div class='add'>+</div><div class='add'>+static int cdv_brightness;</div><div class='add'>+static struct backlight_device *cdv_backlight_device;</div><div class='add'>+</div><div class='add'>+static int cdv_get_brightness(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	/* return locally cached var instead of HW read (due to DPST etc.) */</div><div class='add'>+	/* FIXME: ideally return actual value in case firmware fiddled with</div><div class='add'>+	   it */</div><div class='add'>+	return cdv_brightness;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int cdv_backlight_setup(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	unsigned long core_clock;</div><div class='add'>+	/* u32 bl_max_freq; */</div><div class='add'>+	/* unsigned long value; */</div><div class='add'>+	u16 bl_max_freq;</div><div class='add'>+	uint32_t value;</div><div class='add'>+	uint32_t blc_pwm_precision_factor;</div><div class='add'>+</div><div class='add'>+	/* get bl_max_freq and pol from dev_priv*/</div><div class='add'>+	if (!dev_priv-&gt;lvds_bl) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Has no valid LVDS backlight info\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	bl_max_freq = dev_priv-&gt;lvds_bl-&gt;freq;</div><div class='add'>+	blc_pwm_precision_factor = PSB_BLC_PWM_PRECISION_FACTOR;</div><div class='add'>+</div><div class='add'>+	core_clock = dev_priv-&gt;core_freq;</div><div class='add'>+</div><div class='add'>+	value = (core_clock * MHz) / BLC_PWM_FREQ_CALC_CONSTANT;</div><div class='add'>+	value *= blc_pwm_precision_factor;</div><div class='add'>+	value /= bl_max_freq;</div><div class='add'>+	value /= blc_pwm_precision_factor;</div><div class='add'>+</div><div class='add'>+	if (value &gt; (unsigned long long)PSB_BLC_MAX_PWM_REG_FREQ ||</div><div class='add'>+		 value &lt; (unsigned long long)PSB_BLC_MIN_PWM_REG_FREQ)</div><div class='add'>+				return -ERANGE;</div><div class='add'>+	else {</div><div class='add'>+		/* FIXME */</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cdv_set_brightness(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	int level = bd-&gt;props.brightness;</div><div class='add'>+</div><div class='add'>+	/* Percentage 1-100% being valid */</div><div class='add'>+	if (level &lt; 1)</div><div class='add'>+		level = 1;</div><div class='add'>+</div><div class='add'>+	/*cdv_intel_lvds_set_brightness(dev, level); FIXME */</div><div class='add'>+	cdv_brightness = level;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct backlight_ops cdv_ops = {</div><div class='add'>+	.get_brightness = cdv_get_brightness,</div><div class='add'>+	.update_status  = cdv_set_brightness,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cdv_backlight_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int ret;</div><div class='add'>+	struct backlight_properties props;</div><div class='add'>+</div><div class='add'>+	memset(&amp;props, 0, sizeof(struct backlight_properties));</div><div class='add'>+	props.max_brightness = 100;</div><div class='add'>+	props.type = BACKLIGHT_PLATFORM;</div><div class='add'>+</div><div class='add'>+	cdv_backlight_device = backlight_device_register("psb-bl",</div><div class='add'>+					NULL, (void *)dev, &amp;cdv_ops, &amp;props);</div><div class='add'>+	if (IS_ERR(cdv_backlight_device))</div><div class='add'>+		return PTR_ERR(cdv_backlight_device);</div><div class='add'>+</div><div class='add'>+	ret = cdv_backlight_setup(dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		backlight_device_unregister(cdv_backlight_device);</div><div class='add'>+		cdv_backlight_device = NULL;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	cdv_backlight_device-&gt;props.brightness = 100;</div><div class='add'>+	cdv_backlight_device-&gt;props.max_brightness = 100;</div><div class='add'>+	backlight_update_status(cdv_backlight_device);</div><div class='add'>+	dev_priv-&gt;backlight_device = cdv_backlight_device;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Provide the Cedarview specific chip logic and low level methods</div><div class='add'>+ *	for power management</div><div class='add'>+ *</div><div class='add'>+ *	FIXME: we need to implement the apm/ospm base management bits</div><div class='add'>+ *	for this and the MID devices.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline u32 CDV_MSG_READ32(uint port, uint offset)</div><div class='add'>+{</div><div class='add'>+	int mcr = (0x10&lt;&lt;24) | (port &lt;&lt; 16) | (offset &lt;&lt; 8);</div><div class='add'>+	uint32_t ret_val = 0;</div><div class='add'>+	struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);</div><div class='add'>+	pci_write_config_dword(pci_root, 0xD0, mcr);</div><div class='add'>+	pci_read_config_dword(pci_root, 0xD4, &amp;ret_val);</div><div class='add'>+	pci_dev_put(pci_root);</div><div class='add'>+	return ret_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void CDV_MSG_WRITE32(uint port, uint offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	int mcr = (0x11&lt;&lt;24) | (port &lt;&lt; 16) | (offset &lt;&lt; 8) | 0xF0;</div><div class='add'>+	struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);</div><div class='add'>+	pci_write_config_dword(pci_root, 0xD4, value);</div><div class='add'>+	pci_write_config_dword(pci_root, 0xD0, mcr);</div><div class='add'>+	pci_dev_put(pci_root);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define PSB_APM_CMD			0x0</div><div class='add'>+#define PSB_APM_STS			0x04</div><div class='add'>+#define PSB_PM_SSC			0x20</div><div class='add'>+#define PSB_PM_SSS			0x30</div><div class='add'>+#define PSB_PWRGT_GFX_MASK		0x3</div><div class='add'>+#define CDV_PWRGT_DISPLAY_CNTR		0x000fc00c</div><div class='add'>+#define CDV_PWRGT_DISPLAY_STS		0x000fc00c</div><div class='add'>+</div><div class='add'>+static void cdv_init_pm(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 pwr_cnt;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;apm_base = CDV_MSG_READ32(PSB_PUNIT_PORT,</div><div class='add'>+							PSB_APMBA) &amp; 0xFFFF;</div><div class='add'>+	dev_priv-&gt;ospm_base = CDV_MSG_READ32(PSB_PUNIT_PORT,</div><div class='add'>+							PSB_OSPMBA) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	/* Force power on for now */</div><div class='add'>+	pwr_cnt = inl(dev_priv-&gt;apm_base + PSB_APM_CMD);</div><div class='add'>+	pwr_cnt &amp;= ~PSB_PWRGT_GFX_MASK;</div><div class='add'>+</div><div class='add'>+	outl(pwr_cnt, dev_priv-&gt;apm_base + PSB_APM_CMD);</div><div class='add'>+	for (i = 0; i &lt; 5; i++) {</div><div class='add'>+		u32 pwr_sts = inl(dev_priv-&gt;apm_base + PSB_APM_STS);</div><div class='add'>+		if ((pwr_sts &amp; PSB_PWRGT_GFX_MASK) == 0)</div><div class='add'>+			break;</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+	pwr_cnt = inl(dev_priv-&gt;ospm_base + PSB_PM_SSC);</div><div class='add'>+	pwr_cnt &amp;= ~CDV_PWRGT_DISPLAY_CNTR;</div><div class='add'>+	outl(pwr_cnt, dev_priv-&gt;ospm_base + PSB_PM_SSC);</div><div class='add'>+	for (i = 0; i &lt; 5; i++) {</div><div class='add'>+		u32 pwr_sts = inl(dev_priv-&gt;ospm_base + PSB_PM_SSS);</div><div class='add'>+		if ((pwr_sts &amp; CDV_PWRGT_DISPLAY_STS) == 0)</div><div class='add'>+			break;</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	cdv_save_display_registers	-	save registers lost on suspend</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *</div><div class='add'>+ *	Save the state we need in order to be able to restore the interface</div><div class='add'>+ *	upon resume from suspend</div><div class='add'>+ *</div><div class='add'>+ *	FIXME: review</div><div class='add'>+ */</div><div class='add'>+static int cdv_save_display_registers(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	cdv_restore_display_registers	-	restore lost register state</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *</div><div class='add'>+ *	Restore register state that was lost during suspend and resume.</div><div class='add'>+ *</div><div class='add'>+ *	FIXME: review</div><div class='add'>+ */</div><div class='add'>+static int cdv_restore_display_registers(struct drm_device *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 cdv_power_down(struct drm_device *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 cdv_power_up(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* FIXME ? - shared with Poulsbo */</div><div class='add'>+static void cdv_get_core_freq(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	uint32_t clock;</div><div class='add'>+	struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	pci_write_config_dword(pci_root, 0xD0, 0xD0050300);</div><div class='add'>+	pci_read_config_dword(pci_root, 0xD4, &amp;clock);</div><div class='add'>+	pci_dev_put(pci_root);</div><div class='add'>+</div><div class='add'>+	switch (clock &amp; 0x07) {</div><div class='add'>+	case 0:</div><div class='add'>+		dev_priv-&gt;core_freq = 100;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		dev_priv-&gt;core_freq = 133;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		dev_priv-&gt;core_freq = 150;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		dev_priv-&gt;core_freq = 178;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		dev_priv-&gt;core_freq = 200;</div><div class='add'>+		break;</div><div class='add'>+	case 5:</div><div class='add'>+	case 6:</div><div class='add'>+	case 7:</div><div class='add'>+		dev_priv-&gt;core_freq = 266;</div><div class='add'>+	default:</div><div class='add'>+		dev_priv-&gt;core_freq = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cdv_chip_setup(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	cdv_get_core_freq(dev);</div><div class='add'>+	gma_intel_opregion_init(dev);</div><div class='add'>+	psb_intel_init_bios(dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* CDV is much like Poulsbo but has MID like SGX offsets and PM */</div><div class='add'>+</div><div class='add'>+const struct psb_ops cdv_chip_ops = {</div><div class='add'>+	.name = "GMA3600/3650",</div><div class='add'>+	.accel_2d = 0,</div><div class='add'>+	.pipes = 2,</div><div class='add'>+	.crtcs = 2,</div><div class='add'>+	.sgx_offset = MRST_SGX_OFFSET,</div><div class='add'>+	.chip_setup = cdv_chip_setup,</div><div class='add'>+</div><div class='add'>+	.crtc_helper = &amp;cdv_intel_helper_funcs,</div><div class='add'>+	.crtc_funcs = &amp;cdv_intel_crtc_funcs,</div><div class='add'>+</div><div class='add'>+	.output_init = cdv_output_init,</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE</div><div class='add'>+	.backlight_init = cdv_backlight_init,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	.init_pm = cdv_init_pm,</div><div class='add'>+	.save_regs = cdv_save_display_registers,</div><div class='add'>+	.restore_regs = cdv_restore_display_registers,</div><div class='add'>+	.power_down = cdv_power_down,</div><div class='add'>+	.power_up = cdv_power_up,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/cdv_device.h b/drivers/gpu/drm/gma500/cdv_device.h<br/>new file mode 100644<br/>index 000000000000..2a88b7beb551<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/cdv_device.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/cdv_device.h</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2011 Intel Corporation</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc., </div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+extern const struct drm_crtc_helper_funcs cdv_intel_helper_funcs;</div><div class='add'>+extern const struct drm_crtc_funcs cdv_intel_crtc_funcs;</div><div class='add'>+extern void cdv_intel_crt_init(struct drm_device *dev,</div><div class='add'>+			struct psb_intel_mode_device *mode_dev);</div><div class='add'>+extern void cdv_intel_lvds_init(struct drm_device *dev,</div><div class='add'>+			struct psb_intel_mode_device *mode_dev);</div><div class='add'>+extern void cdv_hdmi_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev,</div><div class='add'>+			int reg);</div><div class='add'>+extern struct drm_display_mode *cdv_intel_crtc_mode_get(struct drm_device *dev,</div><div class='add'>+					     struct drm_crtc *crtc);</div><div class='add'>+</div><div class='add'>+extern inline void cdv_intel_wait_for_vblank(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	/* Wait for 20ms, i.e. one cycle at 50hz. */</div><div class='add'>+        /* FIXME: msleep ?? */</div><div class='add'>+	mdelay(20);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/cdv_intel_crt.c b/drivers/gpu/drm/gma500/cdv_intel_crt.c<br/>new file mode 100644<br/>index 000000000000..c100f3e9c920<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/cdv_intel_crt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/cdv_intel_crt.c</a></div><div class='hunk'>@@ -0,0 +1,339 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2006-2007 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='add'>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER</div><div class='add'>+ * DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Eric Anholt &lt;eric@anholt.net&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+</div><div class='add'>+#include "intel_bios.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_intel_drv.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include "power.h"</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void cdv_intel_crt_dpms(struct drm_encoder *encoder, int mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	u32 temp, reg;</div><div class='add'>+	reg = ADPA;</div><div class='add'>+</div><div class='add'>+	temp = REG_READ(reg);</div><div class='add'>+	temp &amp;= ~(ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE);</div><div class='add'>+	temp &amp;= ~ADPA_DAC_ENABLE;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case DRM_MODE_DPMS_ON:</div><div class='add'>+		temp |= ADPA_DAC_ENABLE;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_MODE_DPMS_STANDBY:</div><div class='add'>+		temp |= ADPA_DAC_ENABLE | ADPA_HSYNC_CNTL_DISABLE;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_MODE_DPMS_SUSPEND:</div><div class='add'>+		temp |= ADPA_DAC_ENABLE | ADPA_VSYNC_CNTL_DISABLE;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_MODE_DPMS_OFF:</div><div class='add'>+		temp |= ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_WRITE(reg, temp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cdv_intel_crt_mode_valid(struct drm_connector *connector,</div><div class='add'>+				struct drm_display_mode *mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = connector-&gt;dev-&gt;dev_private;</div><div class='add'>+	int max_clock = 0;</div><div class='add'>+	if (mode-&gt;flags &amp; DRM_MODE_FLAG_DBLSCAN)</div><div class='add'>+		return MODE_NO_DBLESCAN;</div><div class='add'>+</div><div class='add'>+	/* The lowest clock for CDV is 20000KHz */</div><div class='add'>+	if (mode-&gt;clock &lt; 20000)</div><div class='add'>+		return MODE_CLOCK_LOW;</div><div class='add'>+</div><div class='add'>+	/* The max clock for CDV is 355 instead of 400 */</div><div class='add'>+	max_clock = 355000;</div><div class='add'>+	if (mode-&gt;clock &gt; max_clock)</div><div class='add'>+		return MODE_CLOCK_HIGH;</div><div class='add'>+</div><div class='add'>+	if (mode-&gt;hdisplay &gt; 1680 || mode-&gt;vdisplay &gt; 1050)</div><div class='add'>+		return MODE_PANEL;</div><div class='add'>+</div><div class='add'>+	/* We assume worst case scenario of 32 bpp here, since we don't know */</div><div class='add'>+	if ((ALIGN(mode-&gt;hdisplay * 4, 64) * mode-&gt;vdisplay) &gt;</div><div class='add'>+	    dev_priv-&gt;vram_stolen_size)</div><div class='add'>+		return MODE_MEM;</div><div class='add'>+</div><div class='add'>+	return MODE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool cdv_intel_crt_mode_fixup(struct drm_encoder *encoder,</div><div class='add'>+				 struct drm_display_mode *mode,</div><div class='add'>+				 struct drm_display_mode *adjusted_mode)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cdv_intel_crt_mode_set(struct drm_encoder *encoder,</div><div class='add'>+			       struct drm_display_mode *mode,</div><div class='add'>+			       struct drm_display_mode *adjusted_mode)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct drm_crtc *crtc = encoder-&gt;crtc;</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc =</div><div class='add'>+					to_psb_intel_crtc(crtc);</div><div class='add'>+	int dpll_md_reg;</div><div class='add'>+	u32 adpa, dpll_md;</div><div class='add'>+	u32 adpa_reg;</div><div class='add'>+</div><div class='add'>+	if (psb_intel_crtc-&gt;pipe == 0)</div><div class='add'>+		dpll_md_reg = DPLL_A_MD;</div><div class='add'>+	else</div><div class='add'>+		dpll_md_reg = DPLL_B_MD;</div><div class='add'>+</div><div class='add'>+	adpa_reg = ADPA;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable separate mode multiplier used when cloning SDVO to CRT</div><div class='add'>+	 * XXX this needs to be adjusted when we really are cloning</div><div class='add'>+	 */</div><div class='add'>+	{</div><div class='add'>+		dpll_md = REG_READ(dpll_md_reg);</div><div class='add'>+		REG_WRITE(dpll_md_reg,</div><div class='add'>+			   dpll_md &amp; ~DPLL_MD_UDI_MULTIPLIER_MASK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adpa = 0;</div><div class='add'>+	if (adjusted_mode-&gt;flags &amp; DRM_MODE_FLAG_PHSYNC)</div><div class='add'>+		adpa |= ADPA_HSYNC_ACTIVE_HIGH;</div><div class='add'>+	if (adjusted_mode-&gt;flags &amp; DRM_MODE_FLAG_PVSYNC)</div><div class='add'>+		adpa |= ADPA_VSYNC_ACTIVE_HIGH;</div><div class='add'>+</div><div class='add'>+	if (psb_intel_crtc-&gt;pipe == 0)</div><div class='add'>+		adpa |= ADPA_PIPE_A_SELECT;</div><div class='add'>+	else</div><div class='add'>+		adpa |= ADPA_PIPE_B_SELECT;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(adpa_reg, adpa);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Uses CRT_HOTPLUG_EN and CRT_HOTPLUG_STAT to detect CRT presence.</div><div class='add'>+ *</div><div class='add'>+ * \return true if CRT is connected.</div><div class='add'>+ * \return false if CRT is disconnected.</div><div class='add'>+ */</div><div class='add'>+static bool cdv_intel_crt_detect_hotplug(struct drm_connector *connector,</div><div class='add'>+								bool force)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = connector-&gt;dev;</div><div class='add'>+	u32 hotplug_en;</div><div class='add'>+	int i, tries = 0, ret = false;</div><div class='add'>+	u32 adpa_orig;</div><div class='add'>+</div><div class='add'>+	/* disable the DAC when doing the hotplug detection */</div><div class='add'>+</div><div class='add'>+	adpa_orig = REG_READ(ADPA);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ADPA, adpa_orig &amp; ~(ADPA_DAC_ENABLE));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * On a CDV thep, CRT detect sequence need to be done twice</div><div class='add'>+	 * to get a reliable result.</div><div class='add'>+	 */</div><div class='add'>+	tries = 2;</div><div class='add'>+</div><div class='add'>+	hotplug_en = REG_READ(PORT_HOTPLUG_EN);</div><div class='add'>+	hotplug_en &amp;= ~(CRT_HOTPLUG_DETECT_MASK);</div><div class='add'>+	hotplug_en |= CRT_HOTPLUG_FORCE_DETECT;</div><div class='add'>+</div><div class='add'>+	hotplug_en |= CRT_HOTPLUG_ACTIVATION_PERIOD_64;</div><div class='add'>+	hotplug_en |= CRT_HOTPLUG_VOLTAGE_COMPARE_50;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; tries ; i++) {</div><div class='add'>+		unsigned long timeout;</div><div class='add'>+		/* turn on the FORCE_DETECT */</div><div class='add'>+		REG_WRITE(PORT_HOTPLUG_EN, hotplug_en);</div><div class='add'>+		timeout = jiffies + msecs_to_jiffies(1000);</div><div class='add'>+		/* wait for FORCE_DETECT to go off */</div><div class='add'>+		do {</div><div class='add'>+			if (!(REG_READ(PORT_HOTPLUG_EN) &amp;</div><div class='add'>+					CRT_HOTPLUG_FORCE_DETECT))</div><div class='add'>+				break;</div><div class='add'>+			msleep(1);</div><div class='add'>+		} while (time_after(timeout, jiffies));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((REG_READ(PORT_HOTPLUG_STAT) &amp; CRT_HOTPLUG_MONITOR_MASK) !=</div><div class='add'>+	    CRT_HOTPLUG_MONITOR_NONE)</div><div class='add'>+		ret = true;</div><div class='add'>+</div><div class='add'>+	/* Restore the saved ADPA */</div><div class='add'>+	REG_WRITE(ADPA, adpa_orig);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum drm_connector_status cdv_intel_crt_detect(</div><div class='add'>+				struct drm_connector *connector, bool force)</div><div class='add'>+{</div><div class='add'>+	if (cdv_intel_crt_detect_hotplug(connector, force))</div><div class='add'>+		return connector_status_connected;</div><div class='add'>+	else</div><div class='add'>+		return connector_status_disconnected;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cdv_intel_crt_destroy(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(connector);</div><div class='add'>+</div><div class='add'>+	psb_intel_i2c_destroy(psb_intel_encoder-&gt;ddc_bus);</div><div class='add'>+	drm_sysfs_connector_remove(connector);</div><div class='add'>+	drm_connector_cleanup(connector);</div><div class='add'>+	kfree(connector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cdv_intel_crt_get_modes(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+				psb_intel_attached_encoder(connector);</div><div class='add'>+	return psb_intel_ddc_get_modes(connector, &amp;psb_intel_encoder-&gt;ddc_bus-&gt;adapter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cdv_intel_crt_set_property(struct drm_connector *connector,</div><div class='add'>+				  struct drm_property *property,</div><div class='add'>+				  uint64_t value)</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'>+ * Routines for controlling stuff on the analog port</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static const struct drm_encoder_helper_funcs cdv_intel_crt_helper_funcs = {</div><div class='add'>+	.dpms = cdv_intel_crt_dpms,</div><div class='add'>+	.mode_fixup = cdv_intel_crt_mode_fixup,</div><div class='add'>+	.prepare = psb_intel_encoder_prepare,</div><div class='add'>+	.commit = psb_intel_encoder_commit,</div><div class='add'>+	.mode_set = cdv_intel_crt_mode_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct drm_connector_funcs cdv_intel_crt_connector_funcs = {</div><div class='add'>+	.dpms = drm_helper_connector_dpms,</div><div class='add'>+	.detect = cdv_intel_crt_detect,</div><div class='add'>+	.fill_modes = drm_helper_probe_single_connector_modes,</div><div class='add'>+	.destroy = cdv_intel_crt_destroy,</div><div class='add'>+	.set_property = cdv_intel_crt_set_property,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct drm_connector_helper_funcs</div><div class='add'>+				cdv_intel_crt_connector_helper_funcs = {</div><div class='add'>+	.mode_valid = cdv_intel_crt_mode_valid,</div><div class='add'>+	.get_modes = cdv_intel_crt_get_modes,</div><div class='add'>+	.best_encoder = psb_intel_best_encoder,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void cdv_intel_crt_enc_destroy(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	drm_encoder_cleanup(encoder);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct drm_encoder_funcs cdv_intel_crt_enc_funcs = {</div><div class='add'>+	.destroy = cdv_intel_crt_enc_destroy,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void cdv_intel_crt_init(struct drm_device *dev,</div><div class='add'>+			struct psb_intel_mode_device *mode_dev)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct psb_intel_connector *psb_intel_connector;</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+	struct drm_encoder *encoder;</div><div class='add'>+</div><div class='add'>+	u32 i2c_reg;</div><div class='add'>+</div><div class='add'>+	psb_intel_encoder = kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL);</div><div class='add'>+	if (!psb_intel_encoder)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	psb_intel_connector = kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL);</div><div class='add'>+	if (!psb_intel_connector)</div><div class='add'>+		goto failed_connector;</div><div class='add'>+</div><div class='add'>+	connector = &amp;psb_intel_connector-&gt;base;</div><div class='add'>+	drm_connector_init(dev, connector,</div><div class='add'>+		&amp;cdv_intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);</div><div class='add'>+</div><div class='add'>+	encoder = &amp;psb_intel_encoder-&gt;base;</div><div class='add'>+	drm_encoder_init(dev, encoder,</div><div class='add'>+		&amp;cdv_intel_crt_enc_funcs, DRM_MODE_ENCODER_DAC);</div><div class='add'>+</div><div class='add'>+	psb_intel_connector_attach_encoder(psb_intel_connector,</div><div class='add'>+					   psb_intel_encoder);</div><div class='add'>+</div><div class='add'>+	/* Set up the DDC bus. */</div><div class='add'>+	i2c_reg = GPIOA;</div><div class='add'>+	/* Remove the following code for CDV */</div><div class='add'>+	/*</div><div class='add'>+	if (dev_priv-&gt;crt_ddc_bus != 0)</div><div class='add'>+		i2c_reg = dev_priv-&gt;crt_ddc_bus;</div><div class='add'>+	}*/</div><div class='add'>+	psb_intel_encoder-&gt;ddc_bus = psb_intel_i2c_create(dev,</div><div class='add'>+							  i2c_reg, "CRTDDC_A");</div><div class='add'>+	if (!psb_intel_encoder-&gt;ddc_bus) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;dev-&gt;pdev-&gt;dev, "DDC bus registration "</div><div class='add'>+			   "failed.\n");</div><div class='add'>+		goto failed_ddc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	psb_intel_encoder-&gt;type = INTEL_OUTPUT_ANALOG;</div><div class='add'>+	/*</div><div class='add'>+	psb_intel_output-&gt;clone_mask = (1 &lt;&lt; INTEL_ANALOG_CLONE_BIT);</div><div class='add'>+	psb_intel_output-&gt;crtc_mask = (1 &lt;&lt; 0) | (1 &lt;&lt; 1);</div><div class='add'>+	*/</div><div class='add'>+	connector-&gt;interlace_allowed = 0;</div><div class='add'>+	connector-&gt;doublescan_allowed = 0;</div><div class='add'>+</div><div class='add'>+	drm_encoder_helper_add(encoder, &amp;cdv_intel_crt_helper_funcs);</div><div class='add'>+	drm_connector_helper_add(connector,</div><div class='add'>+					&amp;cdv_intel_crt_connector_helper_funcs);</div><div class='add'>+</div><div class='add'>+	drm_sysfs_connector_add(connector);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+failed_ddc:</div><div class='add'>+	drm_encoder_cleanup(&amp;psb_intel_encoder-&gt;base);</div><div class='add'>+	drm_connector_cleanup(&amp;psb_intel_connector-&gt;base);</div><div class='add'>+	kfree(psb_intel_connector);</div><div class='add'>+failed_connector:</div><div class='add'>+	kfree(psb_intel_encoder);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/cdv_intel_display.c b/drivers/gpu/drm/gma500/cdv_intel_display.c<br/>new file mode 100644<br/>index 000000000000..18d11525095e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/cdv_intel_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/cdv_intel_display.c</a></div><div class='hunk'>@@ -0,0 +1,1508 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2006-2011 Intel Corporation</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Eric Anholt &lt;eric@anholt.net&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include "framebuffer.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_intel_drv.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include "psb_intel_display.h"</div><div class='add'>+#include "power.h"</div><div class='add'>+#include "cdv_device.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct cdv_intel_range_t {</div><div class='add'>+	int min, max;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cdv_intel_p2_t {</div><div class='add'>+	int dot_limit;</div><div class='add'>+	int p2_slow, p2_fast;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cdv_intel_clock_t {</div><div class='add'>+	/* given values */</div><div class='add'>+	int n;</div><div class='add'>+	int m1, m2;</div><div class='add'>+	int p1, p2;</div><div class='add'>+	/* derived values */</div><div class='add'>+	int dot;</div><div class='add'>+	int vco;</div><div class='add'>+	int m;</div><div class='add'>+	int p;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define INTEL_P2_NUM		      2</div><div class='add'>+</div><div class='add'>+struct cdv_intel_limit_t {</div><div class='add'>+	struct cdv_intel_range_t dot, vco, n, m, m1, m2, p, p1;</div><div class='add'>+	struct cdv_intel_p2_t p2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CDV_LIMIT_SINGLE_LVDS_96	0</div><div class='add'>+#define CDV_LIMIT_SINGLE_LVDS_100	1</div><div class='add'>+#define CDV_LIMIT_DAC_HDMI_27		2</div><div class='add'>+#define CDV_LIMIT_DAC_HDMI_96		3</div><div class='add'>+</div><div class='add'>+static const struct cdv_intel_limit_t cdv_intel_limits[] = {</div><div class='add'>+	{			/* CDV_SIGNLE_LVDS_96MHz */</div><div class='add'>+	 .dot = {.min = 20000, .max = 115500},</div><div class='add'>+	 .vco = {.min = 1800000, .max = 3600000},</div><div class='add'>+	 .n = {.min = 2, .max = 6},</div><div class='add'>+	 .m = {.min = 60, .max = 160},</div><div class='add'>+	 .m1 = {.min = 0, .max = 0},</div><div class='add'>+	 .m2 = {.min = 58, .max = 158},</div><div class='add'>+	 .p = {.min = 28, .max = 140},</div><div class='add'>+	 .p1 = {.min = 2, .max = 10},</div><div class='add'>+	 .p2 = {.dot_limit = 200000,</div><div class='add'>+		.p2_slow = 14, .p2_fast = 14},</div><div class='add'>+	 },</div><div class='add'>+	{			/* CDV_SINGLE_LVDS_100MHz */</div><div class='add'>+	 .dot = {.min = 20000, .max = 115500},</div><div class='add'>+	 .vco = {.min = 1800000, .max = 3600000},</div><div class='add'>+	 .n = {.min = 2, .max = 6},</div><div class='add'>+	 .m = {.min = 60, .max = 160},</div><div class='add'>+	 .m1 = {.min = 0, .max = 0},</div><div class='add'>+	 .m2 = {.min = 58, .max = 158},</div><div class='add'>+	 .p = {.min = 28, .max = 140},</div><div class='add'>+	 .p1 = {.min = 2, .max = 10},</div><div class='add'>+	 /* The single-channel range is 25-112Mhz, and dual-channel</div><div class='add'>+	  * is 80-224Mhz.  Prefer single channel as much as possible.</div><div class='add'>+	  */</div><div class='add'>+	 .p2 = {.dot_limit = 200000, .p2_slow = 14, .p2_fast = 14},</div><div class='add'>+	 },</div><div class='add'>+	{			/* CDV_DAC_HDMI_27MHz */</div><div class='add'>+	 .dot = {.min = 20000, .max = 400000},</div><div class='add'>+	 .vco = {.min = 1809000, .max = 3564000},</div><div class='add'>+	 .n = {.min = 1, .max = 1},</div><div class='add'>+	 .m = {.min = 67, .max = 132},</div><div class='add'>+	 .m1 = {.min = 0, .max = 0},</div><div class='add'>+	 .m2 = {.min = 65, .max = 130},</div><div class='add'>+	 .p = {.min = 5, .max = 90},</div><div class='add'>+	 .p1 = {.min = 1, .max = 9},</div><div class='add'>+	 .p2 = {.dot_limit = 225000, .p2_slow = 10, .p2_fast = 5},</div><div class='add'>+	 },</div><div class='add'>+	{			/* CDV_DAC_HDMI_96MHz */</div><div class='add'>+	 .dot = {.min = 20000, .max = 400000},</div><div class='add'>+	 .vco = {.min = 1800000, .max = 3600000},</div><div class='add'>+	 .n = {.min = 2, .max = 6},</div><div class='add'>+	 .m = {.min = 60, .max = 160},</div><div class='add'>+	 .m1 = {.min = 0, .max = 0},</div><div class='add'>+	 .m2 = {.min = 58, .max = 158},</div><div class='add'>+	 .p = {.min = 5, .max = 100},</div><div class='add'>+	 .p1 = {.min = 1, .max = 10},</div><div class='add'>+	 .p2 = {.dot_limit = 225000, .p2_slow = 10, .p2_fast = 5},</div><div class='add'>+	 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define _wait_for(COND, MS, W) ({ \</div><div class='add'>+	unsigned long timeout__ = jiffies + msecs_to_jiffies(MS);	\</div><div class='add'>+	int ret__ = 0;							\</div><div class='add'>+	while (!(COND)) {						\</div><div class='add'>+		if (time_after(jiffies, timeout__)) {			\</div><div class='add'>+			ret__ = -ETIMEDOUT;				\</div><div class='add'>+			break;						\</div><div class='add'>+		}							\</div><div class='add'>+		if (W &amp;&amp; !in_dbg_master())				\</div><div class='add'>+			msleep(W);					\</div><div class='add'>+	}								\</div><div class='add'>+	ret__;								\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define wait_for(COND, MS) _wait_for(COND, MS, 1)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int cdv_sb_read(struct drm_device *dev, u32 reg, u32 *val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = wait_for((REG_READ(SB_PCKT) &amp; SB_BUSY) == 0, 1000);</div><div class='add'>+	if (ret) {</div><div class='add'>+		DRM_ERROR("timeout waiting for SB to idle before read\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_WRITE(SB_ADDR, reg);</div><div class='add'>+	REG_WRITE(SB_PCKT,</div><div class='add'>+		   SET_FIELD(SB_OPCODE_READ, SB_OPCODE) |</div><div class='add'>+		   SET_FIELD(SB_DEST_DPLL, SB_DEST) |</div><div class='add'>+		   SET_FIELD(0xf, SB_BYTE_ENABLE));</div><div class='add'>+</div><div class='add'>+	ret = wait_for((REG_READ(SB_PCKT) &amp; SB_BUSY) == 0, 1000);</div><div class='add'>+	if (ret) {</div><div class='add'>+		DRM_ERROR("timeout waiting for SB to idle after read\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*val = REG_READ(SB_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 cdv_sb_write(struct drm_device *dev, u32 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	static bool dpio_debug = true;</div><div class='add'>+	u32 temp;</div><div class='add'>+</div><div class='add'>+	if (dpio_debug) {</div><div class='add'>+		if (cdv_sb_read(dev, reg, &amp;temp) == 0)</div><div class='add'>+			DRM_DEBUG_KMS("0x%08x: 0x%08x (before)\n", reg, temp);</div><div class='add'>+		DRM_DEBUG_KMS("0x%08x: 0x%08x\n", reg, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wait_for((REG_READ(SB_PCKT) &amp; SB_BUSY) == 0, 1000);</div><div class='add'>+	if (ret) {</div><div class='add'>+		DRM_ERROR("timeout waiting for SB to idle before write\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_WRITE(SB_ADDR, reg);</div><div class='add'>+	REG_WRITE(SB_DATA, val);</div><div class='add'>+	REG_WRITE(SB_PCKT,</div><div class='add'>+		   SET_FIELD(SB_OPCODE_WRITE, SB_OPCODE) |</div><div class='add'>+		   SET_FIELD(SB_DEST_DPLL, SB_DEST) |</div><div class='add'>+		   SET_FIELD(0xf, SB_BYTE_ENABLE));</div><div class='add'>+</div><div class='add'>+	ret = wait_for((REG_READ(SB_PCKT) &amp; SB_BUSY) == 0, 1000);</div><div class='add'>+	if (ret) {</div><div class='add'>+		DRM_ERROR("timeout waiting for SB to idle after write\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dpio_debug) {</div><div class='add'>+		if (cdv_sb_read(dev, reg, &amp;temp) == 0)</div><div class='add'>+			DRM_DEBUG_KMS("0x%08x: 0x%08x (after)\n", reg, temp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Reset the DPIO configuration register.  The BIOS does this at every</div><div class='add'>+ * mode set.</div><div class='add'>+ */</div><div class='add'>+static void cdv_sb_reset(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	REG_WRITE(DPIO_CFG, 0);</div><div class='add'>+	REG_READ(DPIO_CFG);</div><div class='add'>+	REG_WRITE(DPIO_CFG, DPIO_MODE_SELECT_0 | DPIO_CMN_RESET_N);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Unlike most Intel display engines, on Cedarview the DPLL registers</div><div class='add'>+ * are behind this sideband bus.  They must be programmed while the</div><div class='add'>+ * DPLL reference clock is on in the DPLL control register, but before</div><div class='add'>+ * the DPLL is enabled in the DPLL control register.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+cdv_dpll_set_clock_cdv(struct drm_device *dev, struct drm_crtc *crtc,</div><div class='add'>+			       struct cdv_intel_clock_t *clock)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_crtc *psb_crtc =</div><div class='add'>+				to_psb_intel_crtc(crtc);</div><div class='add'>+	int pipe = psb_crtc-&gt;pipe;</div><div class='add'>+	u32 m, n_vco, p;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;</div><div class='add'>+	u32 ref_value;</div><div class='add'>+</div><div class='add'>+	cdv_sb_reset(dev);</div><div class='add'>+</div><div class='add'>+	if ((REG_READ(dpll_reg) &amp; DPLL_SYNCLOCK_ENABLE) == 0) {</div><div class='add'>+		DRM_ERROR("Attempting to set DPLL with refclk disabled\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Follow the BIOS and write the REF/SFR Register. Hardcoded value */</div><div class='add'>+	ref_value = 0x68A701;</div><div class='add'>+</div><div class='add'>+	cdv_sb_write(dev, SB_REF_SFR(pipe), ref_value);</div><div class='add'>+</div><div class='add'>+	/* We don't know what the other fields of these regs are, so</div><div class='add'>+	 * leave them in place.</div><div class='add'>+	 */</div><div class='add'>+	ret = cdv_sb_read(dev, SB_M(pipe), &amp;m);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	m &amp;= ~SB_M_DIVIDER_MASK;</div><div class='add'>+	m |= ((clock-&gt;m2) &lt;&lt; SB_M_DIVIDER_SHIFT);</div><div class='add'>+	ret = cdv_sb_write(dev, SB_M(pipe), m);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = cdv_sb_read(dev, SB_N_VCO(pipe), &amp;n_vco);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Follow the BIOS to program the N_DIVIDER REG */</div><div class='add'>+	n_vco &amp;= 0xFFFF;</div><div class='add'>+	n_vco |= 0x107;</div><div class='add'>+	n_vco &amp;= ~(SB_N_VCO_SEL_MASK |</div><div class='add'>+		   SB_N_DIVIDER_MASK |</div><div class='add'>+		   SB_N_CB_TUNE_MASK);</div><div class='add'>+</div><div class='add'>+	n_vco |= ((clock-&gt;n) &lt;&lt; SB_N_DIVIDER_SHIFT);</div><div class='add'>+</div><div class='add'>+	if (clock-&gt;vco &lt; 2250000) {</div><div class='add'>+		n_vco |= (2 &lt;&lt; SB_N_CB_TUNE_SHIFT);</div><div class='add'>+		n_vco |= (0 &lt;&lt; SB_N_VCO_SEL_SHIFT);</div><div class='add'>+	} else if (clock-&gt;vco &lt; 2750000) {</div><div class='add'>+		n_vco |= (1 &lt;&lt; SB_N_CB_TUNE_SHIFT);</div><div class='add'>+		n_vco |= (1 &lt;&lt; SB_N_VCO_SEL_SHIFT);</div><div class='add'>+	} else if (clock-&gt;vco &lt; 3300000) {</div><div class='add'>+		n_vco |= (0 &lt;&lt; SB_N_CB_TUNE_SHIFT);</div><div class='add'>+		n_vco |= (2 &lt;&lt; SB_N_VCO_SEL_SHIFT);</div><div class='add'>+	} else {</div><div class='add'>+		n_vco |= (0 &lt;&lt; SB_N_CB_TUNE_SHIFT);</div><div class='add'>+		n_vco |= (3 &lt;&lt; SB_N_VCO_SEL_SHIFT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cdv_sb_write(dev, SB_N_VCO(pipe), n_vco);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = cdv_sb_read(dev, SB_P(pipe), &amp;p);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	p &amp;= ~(SB_P2_DIVIDER_MASK | SB_P1_DIVIDER_MASK);</div><div class='add'>+	p |= SET_FIELD(clock-&gt;p1, SB_P1_DIVIDER);</div><div class='add'>+	switch (clock-&gt;p2) {</div><div class='add'>+	case 5:</div><div class='add'>+		p |= SET_FIELD(SB_P2_5, SB_P2_DIVIDER);</div><div class='add'>+		break;</div><div class='add'>+	case 10:</div><div class='add'>+		p |= SET_FIELD(SB_P2_10, SB_P2_DIVIDER);</div><div class='add'>+		break;</div><div class='add'>+	case 14:</div><div class='add'>+		p |= SET_FIELD(SB_P2_14, SB_P2_DIVIDER);</div><div class='add'>+		break;</div><div class='add'>+	case 7:</div><div class='add'>+		p |= SET_FIELD(SB_P2_7, SB_P2_DIVIDER);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DRM_ERROR("Bad P2 clock: %d\n", clock-&gt;p2);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	ret = cdv_sb_write(dev, SB_P(pipe), p);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* always Program the Lane Register for the Pipe A*/</div><div class='add'>+	if (pipe == 0) {</div><div class='add'>+		/* Program the Lane0/1 for HDMI B */</div><div class='add'>+		u32 lane_reg, lane_value;</div><div class='add'>+</div><div class='add'>+		lane_reg = PSB_LANE0;</div><div class='add'>+		cdv_sb_read(dev, lane_reg, &amp;lane_value);</div><div class='add'>+		lane_value &amp;= ~(LANE_PLL_MASK);</div><div class='add'>+		lane_value |= LANE_PLL_ENABLE;</div><div class='add'>+		cdv_sb_write(dev, lane_reg, lane_value);</div><div class='add'>+</div><div class='add'>+		lane_reg = PSB_LANE1;</div><div class='add'>+		cdv_sb_read(dev, lane_reg, &amp;lane_value);</div><div class='add'>+		lane_value &amp;= ~(LANE_PLL_MASK);</div><div class='add'>+		lane_value |= LANE_PLL_ENABLE;</div><div class='add'>+		cdv_sb_write(dev, lane_reg, lane_value);</div><div class='add'>+</div><div class='add'>+		/* Program the Lane2/3 for HDMI C */</div><div class='add'>+		lane_reg = PSB_LANE2;</div><div class='add'>+		cdv_sb_read(dev, lane_reg, &amp;lane_value);</div><div class='add'>+		lane_value &amp;= ~(LANE_PLL_MASK);</div><div class='add'>+		lane_value |= LANE_PLL_ENABLE;</div><div class='add'>+		cdv_sb_write(dev, lane_reg, lane_value);</div><div class='add'>+</div><div class='add'>+		lane_reg = PSB_LANE3;</div><div class='add'>+		cdv_sb_read(dev, lane_reg, &amp;lane_value);</div><div class='add'>+		lane_value &amp;= ~(LANE_PLL_MASK);</div><div class='add'>+		lane_value |= LANE_PLL_ENABLE;</div><div class='add'>+		cdv_sb_write(dev, lane_reg, lane_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'>+/*</div><div class='add'>+ * Returns whether any encoder on the specified pipe is of the specified type</div><div class='add'>+ */</div><div class='add'>+bool cdv_intel_pipe_has_type(struct drm_crtc *crtc, int type)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct drm_mode_config *mode_config = &amp;dev-&gt;mode_config;</div><div class='add'>+	struct drm_connector *l_entry;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(l_entry, &amp;mode_config-&gt;connector_list, head) {</div><div class='add'>+		if (l_entry-&gt;encoder &amp;&amp; l_entry-&gt;encoder-&gt;crtc == crtc) {</div><div class='add'>+			struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(l_entry);</div><div class='add'>+			if (psb_intel_encoder-&gt;type == type)</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 const struct cdv_intel_limit_t *cdv_intel_limit(struct drm_crtc *crtc,</div><div class='add'>+							int refclk)</div><div class='add'>+{</div><div class='add'>+	const struct cdv_intel_limit_t *limit;</div><div class='add'>+	if (cdv_intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Now only single-channel LVDS is supported on CDV. If it is</div><div class='add'>+		 * incorrect, please add the dual-channel LVDS.</div><div class='add'>+		 */</div><div class='add'>+		if (refclk == 96000)</div><div class='add'>+			limit = &amp;cdv_intel_limits[CDV_LIMIT_SINGLE_LVDS_96];</div><div class='add'>+		else</div><div class='add'>+			limit = &amp;cdv_intel_limits[CDV_LIMIT_SINGLE_LVDS_100];</div><div class='add'>+	} else {</div><div class='add'>+		if (refclk == 27000)</div><div class='add'>+			limit = &amp;cdv_intel_limits[CDV_LIMIT_DAC_HDMI_27];</div><div class='add'>+		else</div><div class='add'>+			limit = &amp;cdv_intel_limits[CDV_LIMIT_DAC_HDMI_96];</div><div class='add'>+	}</div><div class='add'>+	return limit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* m1 is reserved as 0 in CDV, n is a ring counter */</div><div class='add'>+static void cdv_intel_clock(struct drm_device *dev,</div><div class='add'>+			int refclk, struct cdv_intel_clock_t *clock)</div><div class='add'>+{</div><div class='add'>+	clock-&gt;m = clock-&gt;m2 + 2;</div><div class='add'>+	clock-&gt;p = clock-&gt;p1 * clock-&gt;p2;</div><div class='add'>+	clock-&gt;vco = (refclk * clock-&gt;m) / clock-&gt;n;</div><div class='add'>+	clock-&gt;dot = clock-&gt;vco / clock-&gt;p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define INTELPllInvalid(s)   { /* ErrorF (s) */; return false; }</div><div class='add'>+static bool cdv_intel_PLL_is_valid(struct drm_crtc *crtc,</div><div class='add'>+				const struct cdv_intel_limit_t *limit,</div><div class='add'>+			       struct cdv_intel_clock_t *clock)</div><div class='add'>+{</div><div class='add'>+	if (clock-&gt;p1 &lt; limit-&gt;p1.min || limit-&gt;p1.max &lt; clock-&gt;p1)</div><div class='add'>+		INTELPllInvalid("p1 out of range\n");</div><div class='add'>+	if (clock-&gt;p &lt; limit-&gt;p.min || limit-&gt;p.max &lt; clock-&gt;p)</div><div class='add'>+		INTELPllInvalid("p out of range\n");</div><div class='add'>+	/* unnecessary to check the range of m(m1/M2)/n again */</div><div class='add'>+	if (clock-&gt;vco &lt; limit-&gt;vco.min || limit-&gt;vco.max &lt; clock-&gt;vco)</div><div class='add'>+		INTELPllInvalid("vco out of range\n");</div><div class='add'>+	/* XXX: We may need to be checking "Dot clock"</div><div class='add'>+	 * depending on the multiplier, connector, etc.,</div><div class='add'>+	 * rather than just a single range.</div><div class='add'>+	 */</div><div class='add'>+	if (clock-&gt;dot &lt; limit-&gt;dot.min || limit-&gt;dot.max &lt; clock-&gt;dot)</div><div class='add'>+		INTELPllInvalid("dot out of range\n");</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool cdv_intel_find_best_PLL(struct drm_crtc *crtc, int target,</div><div class='add'>+				int refclk,</div><div class='add'>+				struct cdv_intel_clock_t *best_clock)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct cdv_intel_clock_t clock;</div><div class='add'>+	const struct cdv_intel_limit_t *limit = cdv_intel_limit(crtc, refclk);</div><div class='add'>+	int err = target;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (cdv_intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &amp;&amp;</div><div class='add'>+	    (REG_READ(LVDS) &amp; LVDS_PORT_EN) != 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * For LVDS, if the panel is on, just rely on its current</div><div class='add'>+		 * settings for dual-channel.  We haven't figured out how to</div><div class='add'>+		 * reliably set up different single/dual channel state, if we</div><div class='add'>+		 * even can.</div><div class='add'>+		 */</div><div class='add'>+		if ((REG_READ(LVDS) &amp; LVDS_CLKB_POWER_MASK) ==</div><div class='add'>+		    LVDS_CLKB_POWER_UP)</div><div class='add'>+			clock.p2 = limit-&gt;p2.p2_fast;</div><div class='add'>+		else</div><div class='add'>+			clock.p2 = limit-&gt;p2.p2_slow;</div><div class='add'>+	} else {</div><div class='add'>+		if (target &lt; limit-&gt;p2.dot_limit)</div><div class='add'>+			clock.p2 = limit-&gt;p2.p2_slow;</div><div class='add'>+		else</div><div class='add'>+			clock.p2 = limit-&gt;p2.p2_fast;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(best_clock, 0, sizeof(*best_clock));</div><div class='add'>+	clock.m1 = 0;</div><div class='add'>+	/* m1 is reserved as 0 in CDV, n is a ring counter.</div><div class='add'>+	   So skip the m1 loop */</div><div class='add'>+	for (clock.n = limit-&gt;n.min; clock.n &lt;= limit-&gt;n.max; clock.n++) {</div><div class='add'>+		for (clock.m2 = limit-&gt;m2.min; clock.m2 &lt;= limit-&gt;m2.max;</div><div class='add'>+					     clock.m2++) {</div><div class='add'>+			for (clock.p1 = limit-&gt;p1.min;</div><div class='add'>+					clock.p1 &lt;= limit-&gt;p1.max;</div><div class='add'>+					clock.p1++) {</div><div class='add'>+				int this_err;</div><div class='add'>+</div><div class='add'>+				cdv_intel_clock(dev, refclk, &amp;clock);</div><div class='add'>+</div><div class='add'>+				if (!cdv_intel_PLL_is_valid(crtc,</div><div class='add'>+								limit, &amp;clock))</div><div class='add'>+						continue;</div><div class='add'>+</div><div class='add'>+				this_err = abs(clock.dot - target);</div><div class='add'>+				if (this_err &lt; err) {</div><div class='add'>+					*best_clock = clock;</div><div class='add'>+					err = this_err;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err != target;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cdv_intel_pipe_set_base(struct drm_crtc *crtc,</div><div class='add'>+			    int x, int y, struct drm_framebuffer *old_fb)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	struct psb_framebuffer *psbfb = to_psb_fb(crtc-&gt;fb);</div><div class='add'>+	int pipe = psb_intel_crtc-&gt;pipe;</div><div class='add'>+	unsigned long start, offset;</div><div class='add'>+	int dspbase = (pipe == 0 ? DSPABASE : DSPBBASE);</div><div class='add'>+	int dspsurf = (pipe == 0 ? DSPASURF : DSPBSURF);</div><div class='add'>+	int dspstride = (pipe == 0) ? DSPASTRIDE : DSPBSTRIDE;</div><div class='add'>+	int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;</div><div class='add'>+	u32 dspcntr;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!gma_power_begin(dev, true))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* no fb bound */</div><div class='add'>+	if (!crtc-&gt;fb) {</div><div class='add'>+		dev_err(dev-&gt;dev, "No FB bound\n");</div><div class='add'>+		goto psb_intel_pipe_cleaner;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* We are displaying this buffer, make sure it is actually loaded</div><div class='add'>+	   into the GTT */</div><div class='add'>+	ret = psb_gtt_pin(psbfb-&gt;gtt);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto psb_intel_pipe_set_base_exit;</div><div class='add'>+	start = psbfb-&gt;gtt-&gt;offset;</div><div class='add'>+	offset = y * crtc-&gt;fb-&gt;pitches[0] + x * (crtc-&gt;fb-&gt;bits_per_pixel / 8);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(dspstride, crtc-&gt;fb-&gt;pitches[0]);</div><div class='add'>+</div><div class='add'>+	dspcntr = REG_READ(dspcntr_reg);</div><div class='add'>+	dspcntr &amp;= ~DISPPLANE_PIXFORMAT_MASK;</div><div class='add'>+</div><div class='add'>+	switch (crtc-&gt;fb-&gt;bits_per_pixel) {</div><div class='add'>+	case 8:</div><div class='add'>+		dspcntr |= DISPPLANE_8BPP;</div><div class='add'>+		break;</div><div class='add'>+	case 16:</div><div class='add'>+		if (crtc-&gt;fb-&gt;depth == 15)</div><div class='add'>+			dspcntr |= DISPPLANE_15_16BPP;</div><div class='add'>+		else</div><div class='add'>+			dspcntr |= DISPPLANE_16BPP;</div><div class='add'>+		break;</div><div class='add'>+	case 24:</div><div class='add'>+	case 32:</div><div class='add'>+		dspcntr |= DISPPLANE_32BPP_NO_ALPHA;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev-&gt;dev, "Unknown color depth\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto psb_intel_pipe_set_base_exit;</div><div class='add'>+	}</div><div class='add'>+	REG_WRITE(dspcntr_reg, dspcntr);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev-&gt;dev,</div><div class='add'>+		"Writing base %08lX %08lX %d %d\n", start, offset, x, y);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(dspbase, offset);</div><div class='add'>+	REG_READ(dspbase);</div><div class='add'>+	REG_WRITE(dspsurf, start);</div><div class='add'>+	REG_READ(dspsurf);</div><div class='add'>+</div><div class='add'>+psb_intel_pipe_cleaner:</div><div class='add'>+	/* If there was a previous display we can now unpin it */</div><div class='add'>+	if (old_fb)</div><div class='add'>+		psb_gtt_unpin(to_psb_fb(old_fb)-&gt;gtt);</div><div class='add'>+</div><div class='add'>+psb_intel_pipe_set_base_exit:</div><div class='add'>+	gma_power_end(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Sets the power management mode of the pipe and plane.</div><div class='add'>+ *</div><div class='add'>+ * This code should probably grow support for turning the cursor off and back</div><div class='add'>+ * on appropriately at the same time as we're turning the pipe off/on.</div><div class='add'>+ */</div><div class='add'>+static void cdv_intel_crtc_dpms(struct drm_crtc *crtc, int mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	int pipe = psb_intel_crtc-&gt;pipe;</div><div class='add'>+	int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;</div><div class='add'>+	int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;</div><div class='add'>+	int dspbase_reg = (pipe == 0) ? DSPABASE : DSPBBASE;</div><div class='add'>+	int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;</div><div class='add'>+	u32 temp;</div><div class='add'>+	bool enabled;</div><div class='add'>+</div><div class='add'>+	/* XXX: When our outputs are all unaware of DPMS modes other than off</div><div class='add'>+	 * and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC.</div><div class='add'>+	 */</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case DRM_MODE_DPMS_ON:</div><div class='add'>+	case DRM_MODE_DPMS_STANDBY:</div><div class='add'>+	case DRM_MODE_DPMS_SUSPEND:</div><div class='add'>+		/* Enable the DPLL */</div><div class='add'>+		temp = REG_READ(dpll_reg);</div><div class='add'>+		if ((temp &amp; DPLL_VCO_ENABLE) == 0) {</div><div class='add'>+			REG_WRITE(dpll_reg, temp);</div><div class='add'>+			REG_READ(dpll_reg);</div><div class='add'>+			/* Wait for the clocks to stabilize. */</div><div class='add'>+			udelay(150);</div><div class='add'>+			REG_WRITE(dpll_reg, temp | DPLL_VCO_ENABLE);</div><div class='add'>+			REG_READ(dpll_reg);</div><div class='add'>+			/* Wait for the clocks to stabilize. */</div><div class='add'>+			udelay(150);</div><div class='add'>+			REG_WRITE(dpll_reg, temp | DPLL_VCO_ENABLE);</div><div class='add'>+			REG_READ(dpll_reg);</div><div class='add'>+			/* Wait for the clocks to stabilize. */</div><div class='add'>+			udelay(150);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Jim Bish - switch plan and pipe per scott */</div><div class='add'>+		/* Enable the plane */</div><div class='add'>+		temp = REG_READ(dspcntr_reg);</div><div class='add'>+		if ((temp &amp; DISPLAY_PLANE_ENABLE) == 0) {</div><div class='add'>+			REG_WRITE(dspcntr_reg,</div><div class='add'>+				  temp | DISPLAY_PLANE_ENABLE);</div><div class='add'>+			/* Flush the plane changes */</div><div class='add'>+			REG_WRITE(dspbase_reg, REG_READ(dspbase_reg));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		udelay(150);</div><div class='add'>+</div><div class='add'>+		/* Enable the pipe */</div><div class='add'>+		temp = REG_READ(pipeconf_reg);</div><div class='add'>+		if ((temp &amp; PIPEACONF_ENABLE) == 0)</div><div class='add'>+			REG_WRITE(pipeconf_reg, temp | PIPEACONF_ENABLE);</div><div class='add'>+</div><div class='add'>+		psb_intel_crtc_load_lut(crtc);</div><div class='add'>+</div><div class='add'>+		/* Give the overlay scaler a chance to enable</div><div class='add'>+		 * if it's on this pipe */</div><div class='add'>+		/* psb_intel_crtc_dpms_video(crtc, true); TODO */</div><div class='add'>+		break;</div><div class='add'>+	case DRM_MODE_DPMS_OFF:</div><div class='add'>+		/* Give the overlay scaler a chance to disable</div><div class='add'>+		 * if it's on this pipe */</div><div class='add'>+		/* psb_intel_crtc_dpms_video(crtc, FALSE); TODO */</div><div class='add'>+</div><div class='add'>+		/* Disable the VGA plane that we never use */</div><div class='add'>+		REG_WRITE(VGACNTRL, VGA_DISP_DISABLE);</div><div class='add'>+</div><div class='add'>+		/* Jim Bish - changed pipe/plane here as well. */</div><div class='add'>+</div><div class='add'>+		/* Wait for vblank for the disable to take effect */</div><div class='add'>+		cdv_intel_wait_for_vblank(dev);</div><div class='add'>+</div><div class='add'>+		/* Next, disable display pipes */</div><div class='add'>+		temp = REG_READ(pipeconf_reg);</div><div class='add'>+		if ((temp &amp; PIPEACONF_ENABLE) != 0) {</div><div class='add'>+			REG_WRITE(pipeconf_reg, temp &amp; ~PIPEACONF_ENABLE);</div><div class='add'>+			REG_READ(pipeconf_reg);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Wait for vblank for the disable to take effect. */</div><div class='add'>+		cdv_intel_wait_for_vblank(dev);</div><div class='add'>+</div><div class='add'>+		udelay(150);</div><div class='add'>+</div><div class='add'>+		/* Disable display plane */</div><div class='add'>+		temp = REG_READ(dspcntr_reg);</div><div class='add'>+		if ((temp &amp; DISPLAY_PLANE_ENABLE) != 0) {</div><div class='add'>+			REG_WRITE(dspcntr_reg,</div><div class='add'>+				  temp &amp; ~DISPLAY_PLANE_ENABLE);</div><div class='add'>+			/* Flush the plane changes */</div><div class='add'>+			REG_WRITE(dspbase_reg, REG_READ(dspbase_reg));</div><div class='add'>+			REG_READ(dspbase_reg);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		temp = REG_READ(dpll_reg);</div><div class='add'>+		if ((temp &amp; DPLL_VCO_ENABLE) != 0) {</div><div class='add'>+			REG_WRITE(dpll_reg, temp &amp; ~DPLL_VCO_ENABLE);</div><div class='add'>+			REG_READ(dpll_reg);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Wait for the clocks to turn off. */</div><div class='add'>+		udelay(150);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	enabled = crtc-&gt;enabled &amp;&amp; mode != DRM_MODE_DPMS_OFF;</div><div class='add'>+	/*Set FIFO Watermarks*/</div><div class='add'>+	REG_WRITE(DSPARB, 0x3F3E);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cdv_intel_crtc_prepare(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct drm_crtc_helper_funcs *crtc_funcs = crtc-&gt;helper_private;</div><div class='add'>+	crtc_funcs-&gt;dpms(crtc, DRM_MODE_DPMS_OFF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cdv_intel_crtc_commit(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct drm_crtc_helper_funcs *crtc_funcs = crtc-&gt;helper_private;</div><div class='add'>+	crtc_funcs-&gt;dpms(crtc, DRM_MODE_DPMS_ON);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cdv_intel_encoder_prepare(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	struct drm_encoder_helper_funcs *encoder_funcs =</div><div class='add'>+	    encoder-&gt;helper_private;</div><div class='add'>+	/* lvds has its own version of prepare see cdv_intel_lvds_prepare */</div><div class='add'>+	encoder_funcs-&gt;dpms(encoder, DRM_MODE_DPMS_OFF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cdv_intel_encoder_commit(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	struct drm_encoder_helper_funcs *encoder_funcs =</div><div class='add'>+	    encoder-&gt;helper_private;</div><div class='add'>+	/* lvds has its own version of commit see cdv_intel_lvds_commit */</div><div class='add'>+	encoder_funcs-&gt;dpms(encoder, DRM_MODE_DPMS_ON);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool cdv_intel_crtc_mode_fixup(struct drm_crtc *crtc,</div><div class='add'>+				  struct drm_display_mode *mode,</div><div class='add'>+				  struct drm_display_mode *adjusted_mode)</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'>+/**</div><div class='add'>+ * Return the pipe currently connected to the panel fitter,</div><div class='add'>+ * or -1 if the panel fitter is not present or not in use</div><div class='add'>+ */</div><div class='add'>+static int cdv_intel_panel_fitter_pipe(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	u32 pfit_control;</div><div class='add'>+</div><div class='add'>+	pfit_control = REG_READ(PFIT_CONTROL);</div><div class='add'>+</div><div class='add'>+	/* See if the panel fitter is in use */</div><div class='add'>+	if ((pfit_control &amp; PFIT_ENABLE) == 0)</div><div class='add'>+		return -1;</div><div class='add'>+	return (pfit_control &gt;&gt; 29) &amp; 0x3;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc,</div><div class='add'>+			       struct drm_display_mode *mode,</div><div class='add'>+			       struct drm_display_mode *adjusted_mode,</div><div class='add'>+			       int x, int y,</div><div class='add'>+			       struct drm_framebuffer *old_fb)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	int pipe = psb_intel_crtc-&gt;pipe;</div><div class='add'>+	int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;</div><div class='add'>+	int dpll_md_reg = (psb_intel_crtc-&gt;pipe == 0) ? DPLL_A_MD : DPLL_B_MD;</div><div class='add'>+	int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;</div><div class='add'>+	int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;</div><div class='add'>+	int htot_reg = (pipe == 0) ? HTOTAL_A : HTOTAL_B;</div><div class='add'>+	int hblank_reg = (pipe == 0) ? HBLANK_A : HBLANK_B;</div><div class='add'>+	int hsync_reg = (pipe == 0) ? HSYNC_A : HSYNC_B;</div><div class='add'>+	int vtot_reg = (pipe == 0) ? VTOTAL_A : VTOTAL_B;</div><div class='add'>+	int vblank_reg = (pipe == 0) ? VBLANK_A : VBLANK_B;</div><div class='add'>+	int vsync_reg = (pipe == 0) ? VSYNC_A : VSYNC_B;</div><div class='add'>+	int dspsize_reg = (pipe == 0) ? DSPASIZE : DSPBSIZE;</div><div class='add'>+	int dsppos_reg = (pipe == 0) ? DSPAPOS : DSPBPOS;</div><div class='add'>+	int pipesrc_reg = (pipe == 0) ? PIPEASRC : PIPEBSRC;</div><div class='add'>+	int refclk;</div><div class='add'>+	struct cdv_intel_clock_t clock;</div><div class='add'>+	u32 dpll = 0, dspcntr, pipeconf;</div><div class='add'>+	bool ok, is_sdvo = false, is_dvo = false;</div><div class='add'>+	bool is_crt = false, is_lvds = false, is_tv = false;</div><div class='add'>+	bool is_hdmi = false;</div><div class='add'>+	struct drm_mode_config *mode_config = &amp;dev-&gt;mode_config;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(connector, &amp;mode_config-&gt;connector_list, head) {</div><div class='add'>+		struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(connector);</div><div class='add'>+</div><div class='add'>+		if (!connector-&gt;encoder</div><div class='add'>+		    || connector-&gt;encoder-&gt;crtc != crtc)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (psb_intel_encoder-&gt;type) {</div><div class='add'>+		case INTEL_OUTPUT_LVDS:</div><div class='add'>+			is_lvds = true;</div><div class='add'>+			break;</div><div class='add'>+		case INTEL_OUTPUT_SDVO:</div><div class='add'>+			is_sdvo = true;</div><div class='add'>+			break;</div><div class='add'>+		case INTEL_OUTPUT_DVO:</div><div class='add'>+			is_dvo = true;</div><div class='add'>+			break;</div><div class='add'>+		case INTEL_OUTPUT_TVOUT:</div><div class='add'>+			is_tv = true;</div><div class='add'>+			break;</div><div class='add'>+		case INTEL_OUTPUT_ANALOG:</div><div class='add'>+			is_crt = true;</div><div class='add'>+			break;</div><div class='add'>+		case INTEL_OUTPUT_HDMI:</div><div class='add'>+			is_hdmi = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	refclk = 96000;</div><div class='add'>+</div><div class='add'>+	/* Hack selection about ref clk for CRT */</div><div class='add'>+	/* Select 27MHz as the reference clk for HDMI */</div><div class='add'>+	if (is_crt || is_hdmi)</div><div class='add'>+		refclk = 27000;</div><div class='add'>+</div><div class='add'>+	drm_mode_debug_printmodeline(adjusted_mode);</div><div class='add'>+</div><div class='add'>+	ok = cdv_intel_find_best_PLL(crtc, adjusted_mode-&gt;clock, refclk,</div><div class='add'>+				 &amp;clock);</div><div class='add'>+	if (!ok) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Couldn't find PLL settings for mode!\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dpll = DPLL_VGA_MODE_DIS;</div><div class='add'>+	if (is_tv) {</div><div class='add'>+		/* XXX: just matching BIOS for now */</div><div class='add'>+/*	dpll |= PLL_REF_INPUT_TVCLKINBC; */</div><div class='add'>+		dpll |= 3;</div><div class='add'>+	}</div><div class='add'>+		dpll |= PLL_REF_INPUT_DREFCLK;</div><div class='add'>+</div><div class='add'>+	dpll |= DPLL_SYNCLOCK_ENABLE;</div><div class='add'>+	dpll |= DPLL_VGA_MODE_DIS;</div><div class='add'>+	if (is_lvds)</div><div class='add'>+		dpll |= DPLLB_MODE_LVDS;</div><div class='add'>+	else</div><div class='add'>+		dpll |= DPLLB_MODE_DAC_SERIAL;</div><div class='add'>+	/* dpll |= (2 &lt;&lt; 11); */</div><div class='add'>+</div><div class='add'>+	/* setup pipeconf */</div><div class='add'>+	pipeconf = REG_READ(pipeconf_reg);</div><div class='add'>+</div><div class='add'>+	/* Set up the display plane register */</div><div class='add'>+	dspcntr = DISPPLANE_GAMMA_ENABLE;</div><div class='add'>+</div><div class='add'>+	if (pipe == 0)</div><div class='add'>+		dspcntr |= DISPPLANE_SEL_PIPE_A;</div><div class='add'>+	else</div><div class='add'>+		dspcntr |= DISPPLANE_SEL_PIPE_B;</div><div class='add'>+</div><div class='add'>+	dspcntr |= DISPLAY_PLANE_ENABLE;</div><div class='add'>+	pipeconf |= PIPEACONF_ENABLE;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(dpll_reg, dpll | DPLL_VGA_MODE_DIS | DPLL_SYNCLOCK_ENABLE);</div><div class='add'>+	REG_READ(dpll_reg);</div><div class='add'>+</div><div class='add'>+	cdv_dpll_set_clock_cdv(dev, crtc, &amp;clock);</div><div class='add'>+</div><div class='add'>+	udelay(150);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* The LVDS pin pair needs to be on before the DPLLs are enabled.</div><div class='add'>+	 * This is an exception to the general rule that mode_set doesn't turn</div><div class='add'>+	 * things on.</div><div class='add'>+	 */</div><div class='add'>+	if (is_lvds) {</div><div class='add'>+		u32 lvds = REG_READ(LVDS);</div><div class='add'>+</div><div class='add'>+		lvds |=</div><div class='add'>+		    LVDS_PORT_EN | LVDS_A0A2_CLKA_POWER_UP |</div><div class='add'>+		    LVDS_PIPEB_SELECT;</div><div class='add'>+		/* Set the B0-B3 data pairs corresponding to</div><div class='add'>+		 * whether we're going to</div><div class='add'>+		 * set the DPLLs for dual-channel mode or not.</div><div class='add'>+		 */</div><div class='add'>+		if (clock.p2 == 7)</div><div class='add'>+			lvds |= LVDS_B0B3_POWER_UP | LVDS_CLKB_POWER_UP;</div><div class='add'>+		else</div><div class='add'>+			lvds &amp;= ~(LVDS_B0B3_POWER_UP | LVDS_CLKB_POWER_UP);</div><div class='add'>+</div><div class='add'>+		/* It would be nice to set 24 vs 18-bit mode (LVDS_A3_POWER_UP)</div><div class='add'>+		 * appropriately here, but we need to look more</div><div class='add'>+		 * thoroughly into how panels behave in the two modes.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		REG_WRITE(LVDS, lvds);</div><div class='add'>+		REG_READ(LVDS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dpll |= DPLL_VCO_ENABLE;</div><div class='add'>+</div><div class='add'>+	/* Disable the panel fitter if it was on our pipe */</div><div class='add'>+	if (cdv_intel_panel_fitter_pipe(dev) == pipe)</div><div class='add'>+		REG_WRITE(PFIT_CONTROL, 0);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("Mode for pipe %c:\n", pipe == 0 ? 'A' : 'B');</div><div class='add'>+	drm_mode_debug_printmodeline(mode);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(dpll_reg,</div><div class='add'>+		(REG_READ(dpll_reg) &amp; ~DPLL_LOCK) | DPLL_VCO_ENABLE);</div><div class='add'>+	REG_READ(dpll_reg);</div><div class='add'>+	/* Wait for the clocks to stabilize. */</div><div class='add'>+	udelay(150); /* 42 usec w/o calibration, 110 with.  rounded up. */</div><div class='add'>+</div><div class='add'>+	if (!(REG_READ(dpll_reg) &amp; DPLL_LOCK)) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Failed to get DPLL lock\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		int sdvo_pixel_multiply = adjusted_mode-&gt;clock / mode-&gt;clock;</div><div class='add'>+		REG_WRITE(dpll_md_reg, (0 &lt;&lt; DPLL_MD_UDI_DIVIDER_SHIFT) | ((sdvo_pixel_multiply - 1) &lt;&lt; DPLL_MD_UDI_MULTIPLIER_SHIFT));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_WRITE(htot_reg, (adjusted_mode-&gt;crtc_hdisplay - 1) |</div><div class='add'>+		  ((adjusted_mode-&gt;crtc_htotal - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(hblank_reg, (adjusted_mode-&gt;crtc_hblank_start - 1) |</div><div class='add'>+		  ((adjusted_mode-&gt;crtc_hblank_end - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(hsync_reg, (adjusted_mode-&gt;crtc_hsync_start - 1) |</div><div class='add'>+		  ((adjusted_mode-&gt;crtc_hsync_end - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(vtot_reg, (adjusted_mode-&gt;crtc_vdisplay - 1) |</div><div class='add'>+		  ((adjusted_mode-&gt;crtc_vtotal - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(vblank_reg, (adjusted_mode-&gt;crtc_vblank_start - 1) |</div><div class='add'>+		  ((adjusted_mode-&gt;crtc_vblank_end - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(vsync_reg, (adjusted_mode-&gt;crtc_vsync_start - 1) |</div><div class='add'>+		  ((adjusted_mode-&gt;crtc_vsync_end - 1) &lt;&lt; 16));</div><div class='add'>+	/* pipesrc and dspsize control the size that is scaled from,</div><div class='add'>+	 * which should always be the user's requested size.</div><div class='add'>+	 */</div><div class='add'>+	REG_WRITE(dspsize_reg,</div><div class='add'>+		  ((mode-&gt;vdisplay - 1) &lt;&lt; 16) | (mode-&gt;hdisplay - 1));</div><div class='add'>+	REG_WRITE(dsppos_reg, 0);</div><div class='add'>+	REG_WRITE(pipesrc_reg,</div><div class='add'>+		  ((mode-&gt;hdisplay - 1) &lt;&lt; 16) | (mode-&gt;vdisplay - 1));</div><div class='add'>+	REG_WRITE(pipeconf_reg, pipeconf);</div><div class='add'>+	REG_READ(pipeconf_reg);</div><div class='add'>+</div><div class='add'>+	cdv_intel_wait_for_vblank(dev);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(dspcntr_reg, dspcntr);</div><div class='add'>+</div><div class='add'>+	/* Flush the plane changes */</div><div class='add'>+	{</div><div class='add'>+		struct drm_crtc_helper_funcs *crtc_funcs =</div><div class='add'>+		    crtc-&gt;helper_private;</div><div class='add'>+		crtc_funcs-&gt;mode_set_base(crtc, x, y, old_fb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cdv_intel_wait_for_vblank(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/** Loads the palette/gamma unit for the CRTC with the prepared values */</div><div class='add'>+void cdv_intel_crtc_load_lut(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv =</div><div class='add'>+				(struct drm_psb_private *)dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	int palreg = PALETTE_A;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* The clocks have to be on to load the palette. */</div><div class='add'>+	if (!crtc-&gt;enabled)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (psb_intel_crtc-&gt;pipe) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		palreg = PALETTE_B;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		palreg = PALETTE_C;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev-&gt;dev, "Illegal Pipe Number.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		for (i = 0; i &lt; 256; i++) {</div><div class='add'>+			REG_WRITE(palreg + 4 * i,</div><div class='add'>+				  ((psb_intel_crtc-&gt;lut_r[i] +</div><div class='add'>+				  psb_intel_crtc-&gt;lut_adj[i]) &lt;&lt; 16) |</div><div class='add'>+				  ((psb_intel_crtc-&gt;lut_g[i] +</div><div class='add'>+				  psb_intel_crtc-&gt;lut_adj[i]) &lt;&lt; 8) |</div><div class='add'>+				  (psb_intel_crtc-&gt;lut_b[i] +</div><div class='add'>+				  psb_intel_crtc-&gt;lut_adj[i]));</div><div class='add'>+		}</div><div class='add'>+		gma_power_end(dev);</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; 256; i++) {</div><div class='add'>+			dev_priv-&gt;save_palette_a[i] =</div><div class='add'>+				  ((psb_intel_crtc-&gt;lut_r[i] +</div><div class='add'>+				  psb_intel_crtc-&gt;lut_adj[i]) &lt;&lt; 16) |</div><div class='add'>+				  ((psb_intel_crtc-&gt;lut_g[i] +</div><div class='add'>+				  psb_intel_crtc-&gt;lut_adj[i]) &lt;&lt; 8) |</div><div class='add'>+				  (psb_intel_crtc-&gt;lut_b[i] +</div><div class='add'>+				  psb_intel_crtc-&gt;lut_adj[i]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Save HW states of giving crtc</div><div class='add'>+ */</div><div class='add'>+static void cdv_intel_crtc_save(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	/* struct drm_psb_private *dev_priv =</div><div class='add'>+			(struct drm_psb_private *)dev-&gt;dev_private; */</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	struct psb_intel_crtc_state *crtc_state = psb_intel_crtc-&gt;crtc_state;</div><div class='add'>+	int pipeA = (psb_intel_crtc-&gt;pipe == 0);</div><div class='add'>+	uint32_t paletteReg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!crtc_state) {</div><div class='add'>+		dev_dbg(dev-&gt;dev, "No CRTC state found\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	crtc_state-&gt;saveDSPCNTR = REG_READ(pipeA ? DSPACNTR : DSPBCNTR);</div><div class='add'>+	crtc_state-&gt;savePIPECONF = REG_READ(pipeA ? PIPEACONF : PIPEBCONF);</div><div class='add'>+	crtc_state-&gt;savePIPESRC = REG_READ(pipeA ? PIPEASRC : PIPEBSRC);</div><div class='add'>+	crtc_state-&gt;saveFP0 = REG_READ(pipeA ? FPA0 : FPB0);</div><div class='add'>+	crtc_state-&gt;saveFP1 = REG_READ(pipeA ? FPA1 : FPB1);</div><div class='add'>+	crtc_state-&gt;saveDPLL = REG_READ(pipeA ? DPLL_A : DPLL_B);</div><div class='add'>+	crtc_state-&gt;saveHTOTAL = REG_READ(pipeA ? HTOTAL_A : HTOTAL_B);</div><div class='add'>+	crtc_state-&gt;saveHBLANK = REG_READ(pipeA ? HBLANK_A : HBLANK_B);</div><div class='add'>+	crtc_state-&gt;saveHSYNC = REG_READ(pipeA ? HSYNC_A : HSYNC_B);</div><div class='add'>+	crtc_state-&gt;saveVTOTAL = REG_READ(pipeA ? VTOTAL_A : VTOTAL_B);</div><div class='add'>+	crtc_state-&gt;saveVBLANK = REG_READ(pipeA ? VBLANK_A : VBLANK_B);</div><div class='add'>+	crtc_state-&gt;saveVSYNC = REG_READ(pipeA ? VSYNC_A : VSYNC_B);</div><div class='add'>+	crtc_state-&gt;saveDSPSTRIDE = REG_READ(pipeA ? DSPASTRIDE : DSPBSTRIDE);</div><div class='add'>+</div><div class='add'>+	/*NOTE: DSPSIZE DSPPOS only for psb*/</div><div class='add'>+	crtc_state-&gt;saveDSPSIZE = REG_READ(pipeA ? DSPASIZE : DSPBSIZE);</div><div class='add'>+	crtc_state-&gt;saveDSPPOS = REG_READ(pipeA ? DSPAPOS : DSPBPOS);</div><div class='add'>+</div><div class='add'>+	crtc_state-&gt;saveDSPBASE = REG_READ(pipeA ? DSPABASE : DSPBBASE);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG("(%x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x)\n",</div><div class='add'>+			crtc_state-&gt;saveDSPCNTR,</div><div class='add'>+			crtc_state-&gt;savePIPECONF,</div><div class='add'>+			crtc_state-&gt;savePIPESRC,</div><div class='add'>+			crtc_state-&gt;saveFP0,</div><div class='add'>+			crtc_state-&gt;saveFP1,</div><div class='add'>+			crtc_state-&gt;saveDPLL,</div><div class='add'>+			crtc_state-&gt;saveHTOTAL,</div><div class='add'>+			crtc_state-&gt;saveHBLANK,</div><div class='add'>+			crtc_state-&gt;saveHSYNC,</div><div class='add'>+			crtc_state-&gt;saveVTOTAL,</div><div class='add'>+			crtc_state-&gt;saveVBLANK,</div><div class='add'>+			crtc_state-&gt;saveVSYNC,</div><div class='add'>+			crtc_state-&gt;saveDSPSTRIDE,</div><div class='add'>+			crtc_state-&gt;saveDSPSIZE,</div><div class='add'>+			crtc_state-&gt;saveDSPPOS,</div><div class='add'>+			crtc_state-&gt;saveDSPBASE</div><div class='add'>+		);</div><div class='add'>+</div><div class='add'>+	paletteReg = pipeA ? PALETTE_A : PALETTE_B;</div><div class='add'>+	for (i = 0; i &lt; 256; ++i)</div><div class='add'>+		crtc_state-&gt;savePalette[i] = REG_READ(paletteReg + (i &lt;&lt; 2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Restore HW states of giving crtc</div><div class='add'>+ */</div><div class='add'>+static void cdv_intel_crtc_restore(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	/* struct drm_psb_private * dev_priv =</div><div class='add'>+				(struct drm_psb_private *)dev-&gt;dev_private; */</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc =  to_psb_intel_crtc(crtc);</div><div class='add'>+	struct psb_intel_crtc_state *crtc_state = psb_intel_crtc-&gt;crtc_state;</div><div class='add'>+	/* struct drm_crtc_helper_funcs * crtc_funcs = crtc-&gt;helper_private; */</div><div class='add'>+	int pipeA = (psb_intel_crtc-&gt;pipe == 0);</div><div class='add'>+	uint32_t paletteReg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!crtc_state) {</div><div class='add'>+		dev_dbg(dev-&gt;dev, "No crtc state\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG(</div><div class='add'>+		"current:(%x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x)\n",</div><div class='add'>+		REG_READ(pipeA ? DSPACNTR : DSPBCNTR),</div><div class='add'>+		REG_READ(pipeA ? PIPEACONF : PIPEBCONF),</div><div class='add'>+		REG_READ(pipeA ? PIPEASRC : PIPEBSRC),</div><div class='add'>+		REG_READ(pipeA ? FPA0 : FPB0),</div><div class='add'>+		REG_READ(pipeA ? FPA1 : FPB1),</div><div class='add'>+		REG_READ(pipeA ? DPLL_A : DPLL_B),</div><div class='add'>+		REG_READ(pipeA ? HTOTAL_A : HTOTAL_B),</div><div class='add'>+		REG_READ(pipeA ? HBLANK_A : HBLANK_B),</div><div class='add'>+		REG_READ(pipeA ? HSYNC_A : HSYNC_B),</div><div class='add'>+		REG_READ(pipeA ? VTOTAL_A : VTOTAL_B),</div><div class='add'>+		REG_READ(pipeA ? VBLANK_A : VBLANK_B),</div><div class='add'>+		REG_READ(pipeA ? VSYNC_A : VSYNC_B),</div><div class='add'>+		REG_READ(pipeA ? DSPASTRIDE : DSPBSTRIDE),</div><div class='add'>+		REG_READ(pipeA ? DSPASIZE : DSPBSIZE),</div><div class='add'>+		REG_READ(pipeA ? DSPAPOS : DSPBPOS),</div><div class='add'>+		REG_READ(pipeA ? DSPABASE : DSPBBASE)</div><div class='add'>+		);</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG(</div><div class='add'>+		"saved: (%x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x)\n",</div><div class='add'>+		crtc_state-&gt;saveDSPCNTR,</div><div class='add'>+		crtc_state-&gt;savePIPECONF,</div><div class='add'>+		crtc_state-&gt;savePIPESRC,</div><div class='add'>+		crtc_state-&gt;saveFP0,</div><div class='add'>+		crtc_state-&gt;saveFP1,</div><div class='add'>+		crtc_state-&gt;saveDPLL,</div><div class='add'>+		crtc_state-&gt;saveHTOTAL,</div><div class='add'>+		crtc_state-&gt;saveHBLANK,</div><div class='add'>+		crtc_state-&gt;saveHSYNC,</div><div class='add'>+		crtc_state-&gt;saveVTOTAL,</div><div class='add'>+		crtc_state-&gt;saveVBLANK,</div><div class='add'>+		crtc_state-&gt;saveVSYNC,</div><div class='add'>+		crtc_state-&gt;saveDSPSTRIDE,</div><div class='add'>+		crtc_state-&gt;saveDSPSIZE,</div><div class='add'>+		crtc_state-&gt;saveDSPPOS,</div><div class='add'>+		crtc_state-&gt;saveDSPBASE</div><div class='add'>+		);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (crtc_state-&gt;saveDPLL &amp; DPLL_VCO_ENABLE) {</div><div class='add'>+		REG_WRITE(pipeA ? DPLL_A : DPLL_B,</div><div class='add'>+			crtc_state-&gt;saveDPLL &amp; ~DPLL_VCO_ENABLE);</div><div class='add'>+		REG_READ(pipeA ? DPLL_A : DPLL_B);</div><div class='add'>+		DRM_DEBUG("write dpll: %x\n",</div><div class='add'>+				REG_READ(pipeA ? DPLL_A : DPLL_B));</div><div class='add'>+		udelay(150);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_WRITE(pipeA ? FPA0 : FPB0, crtc_state-&gt;saveFP0);</div><div class='add'>+	REG_READ(pipeA ? FPA0 : FPB0);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(pipeA ? FPA1 : FPB1, crtc_state-&gt;saveFP1);</div><div class='add'>+	REG_READ(pipeA ? FPA1 : FPB1);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(pipeA ? DPLL_A : DPLL_B, crtc_state-&gt;saveDPLL);</div><div class='add'>+	REG_READ(pipeA ? DPLL_A : DPLL_B);</div><div class='add'>+	udelay(150);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(pipeA ? HTOTAL_A : HTOTAL_B, crtc_state-&gt;saveHTOTAL);</div><div class='add'>+	REG_WRITE(pipeA ? HBLANK_A : HBLANK_B, crtc_state-&gt;saveHBLANK);</div><div class='add'>+	REG_WRITE(pipeA ? HSYNC_A : HSYNC_B, crtc_state-&gt;saveHSYNC);</div><div class='add'>+	REG_WRITE(pipeA ? VTOTAL_A : VTOTAL_B, crtc_state-&gt;saveVTOTAL);</div><div class='add'>+	REG_WRITE(pipeA ? VBLANK_A : VBLANK_B, crtc_state-&gt;saveVBLANK);</div><div class='add'>+	REG_WRITE(pipeA ? VSYNC_A : VSYNC_B, crtc_state-&gt;saveVSYNC);</div><div class='add'>+	REG_WRITE(pipeA ? DSPASTRIDE : DSPBSTRIDE, crtc_state-&gt;saveDSPSTRIDE);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(pipeA ? DSPASIZE : DSPBSIZE, crtc_state-&gt;saveDSPSIZE);</div><div class='add'>+	REG_WRITE(pipeA ? DSPAPOS : DSPBPOS, crtc_state-&gt;saveDSPPOS);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(pipeA ? PIPEASRC : PIPEBSRC, crtc_state-&gt;savePIPESRC);</div><div class='add'>+	REG_WRITE(pipeA ? DSPABASE : DSPBBASE, crtc_state-&gt;saveDSPBASE);</div><div class='add'>+	REG_WRITE(pipeA ? PIPEACONF : PIPEBCONF, crtc_state-&gt;savePIPECONF);</div><div class='add'>+</div><div class='add'>+	cdv_intel_wait_for_vblank(dev);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(pipeA ? DSPACNTR : DSPBCNTR, crtc_state-&gt;saveDSPCNTR);</div><div class='add'>+	REG_WRITE(pipeA ? DSPABASE : DSPBBASE, crtc_state-&gt;saveDSPBASE);</div><div class='add'>+</div><div class='add'>+	cdv_intel_wait_for_vblank(dev);</div><div class='add'>+</div><div class='add'>+	paletteReg = pipeA ? PALETTE_A : PALETTE_B;</div><div class='add'>+	for (i = 0; i &lt; 256; ++i)</div><div class='add'>+		REG_WRITE(paletteReg + (i &lt;&lt; 2), crtc_state-&gt;savePalette[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cdv_intel_crtc_cursor_set(struct drm_crtc *crtc,</div><div class='add'>+				 struct drm_file *file_priv,</div><div class='add'>+				 uint32_t handle,</div><div class='add'>+				 uint32_t width, uint32_t height)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	int pipe = psb_intel_crtc-&gt;pipe;</div><div class='add'>+	uint32_t control = (pipe == 0) ? CURACNTR : CURBCNTR;</div><div class='add'>+	uint32_t base = (pipe == 0) ? CURABASE : CURBBASE;</div><div class='add'>+	uint32_t temp;</div><div class='add'>+	size_t addr = 0;</div><div class='add'>+	struct gtt_range *gt;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* if we want to turn of the cursor ignore width and height */</div><div class='add'>+	if (!handle) {</div><div class='add'>+		/* turn off the cursor */</div><div class='add'>+		temp = CURSOR_MODE_DISABLE;</div><div class='add'>+</div><div class='add'>+		if (gma_power_begin(dev, false)) {</div><div class='add'>+			REG_WRITE(control, temp);</div><div class='add'>+			REG_WRITE(base, 0);</div><div class='add'>+			gma_power_end(dev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* unpin the old GEM object */</div><div class='add'>+		if (psb_intel_crtc-&gt;cursor_obj) {</div><div class='add'>+			gt = container_of(psb_intel_crtc-&gt;cursor_obj,</div><div class='add'>+							struct gtt_range, gem);</div><div class='add'>+			psb_gtt_unpin(gt);</div><div class='add'>+			drm_gem_object_unreference(psb_intel_crtc-&gt;cursor_obj);</div><div class='add'>+			psb_intel_crtc-&gt;cursor_obj = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Currently we only support 64x64 cursors */</div><div class='add'>+	if (width != 64 || height != 64) {</div><div class='add'>+		dev_dbg(dev-&gt;dev, "we currently only support 64x64 cursors\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	obj = drm_gem_object_lookup(dev, file_priv, handle);</div><div class='add'>+	if (!obj)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (obj-&gt;size &lt; width * height * 4) {</div><div class='add'>+		dev_dbg(dev-&gt;dev, "buffer is to small\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gt = container_of(obj, struct gtt_range, gem);</div><div class='add'>+</div><div class='add'>+	/* Pin the memory into the GTT */</div><div class='add'>+	ret = psb_gtt_pin(gt);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Can not pin down handle 0x%x\n", handle);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	addr = gt-&gt;offset;	/* Or resource.start ??? */</div><div class='add'>+</div><div class='add'>+	psb_intel_crtc-&gt;cursor_addr = addr;</div><div class='add'>+</div><div class='add'>+	temp = 0;</div><div class='add'>+	/* set the pipe for the cursor */</div><div class='add'>+	temp |= (pipe &lt;&lt; 28);</div><div class='add'>+	temp |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		REG_WRITE(control, temp);</div><div class='add'>+		REG_WRITE(base, addr);</div><div class='add'>+		gma_power_end(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* unpin the old GEM object */</div><div class='add'>+	if (psb_intel_crtc-&gt;cursor_obj) {</div><div class='add'>+		gt = container_of(psb_intel_crtc-&gt;cursor_obj,</div><div class='add'>+							struct gtt_range, gem);</div><div class='add'>+		psb_gtt_unpin(gt);</div><div class='add'>+		drm_gem_object_unreference(psb_intel_crtc-&gt;cursor_obj);</div><div class='add'>+		psb_intel_crtc-&gt;cursor_obj = obj;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cdv_intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	int pipe = psb_intel_crtc-&gt;pipe;</div><div class='add'>+	uint32_t temp = 0;</div><div class='add'>+	uint32_t adder;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (x &lt; 0) {</div><div class='add'>+		temp |= (CURSOR_POS_SIGN &lt;&lt; CURSOR_X_SHIFT);</div><div class='add'>+		x = -x;</div><div class='add'>+	}</div><div class='add'>+	if (y &lt; 0) {</div><div class='add'>+		temp |= (CURSOR_POS_SIGN &lt;&lt; CURSOR_Y_SHIFT);</div><div class='add'>+		y = -y;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	temp |= ((x &amp; CURSOR_POS_MASK) &lt;&lt; CURSOR_X_SHIFT);</div><div class='add'>+	temp |= ((y &amp; CURSOR_POS_MASK) &lt;&lt; CURSOR_Y_SHIFT);</div><div class='add'>+</div><div class='add'>+	adder = psb_intel_crtc-&gt;cursor_addr;</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		REG_WRITE((pipe == 0) ? CURAPOS : CURBPOS, temp);</div><div class='add'>+		REG_WRITE((pipe == 0) ? CURABASE : CURBBASE, adder);</div><div class='add'>+		gma_power_end(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 cdv_intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red,</div><div class='add'>+			 u16 *green, u16 *blue, uint32_t start, uint32_t size)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	int i;</div><div class='add'>+	int end = (start + size &gt; 256) ? 256 : start + size;</div><div class='add'>+</div><div class='add'>+	for (i = start; i &lt; end; i++) {</div><div class='add'>+		psb_intel_crtc-&gt;lut_r[i] = red[i] &gt;&gt; 8;</div><div class='add'>+		psb_intel_crtc-&gt;lut_g[i] = green[i] &gt;&gt; 8;</div><div class='add'>+		psb_intel_crtc-&gt;lut_b[i] = blue[i] &gt;&gt; 8;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cdv_intel_crtc_load_lut(crtc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cdv_crtc_set_config(struct drm_mode_set *set)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct drm_device *dev = set-&gt;crtc-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (!dev_priv-&gt;rpm_enabled)</div><div class='add'>+		return drm_crtc_helper_set_config(set);</div><div class='add'>+</div><div class='add'>+	pm_runtime_forbid(&amp;dev-&gt;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ret = drm_crtc_helper_set_config(set);</div><div class='add'>+</div><div class='add'>+	pm_runtime_allow(&amp;dev-&gt;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/** Derive the pixel clock for the given refclk and divisors for 8xx chips. */</div><div class='add'>+</div><div class='add'>+/* FIXME: why are we using this, should it be cdv_ in this tree ? */</div><div class='add'>+</div><div class='add'>+static void i8xx_clock(int refclk, struct cdv_intel_clock_t *clock)</div><div class='add'>+{</div><div class='add'>+	clock-&gt;m = 5 * (clock-&gt;m1 + 2) + (clock-&gt;m2 + 2);</div><div class='add'>+	clock-&gt;p = clock-&gt;p1 * clock-&gt;p2;</div><div class='add'>+	clock-&gt;vco = refclk * clock-&gt;m / (clock-&gt;n + 2);</div><div class='add'>+	clock-&gt;dot = clock-&gt;vco / clock-&gt;p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns the clock of the currently programmed mode of the given pipe. */</div><div class='add'>+static int cdv_intel_crtc_clock_get(struct drm_device *dev,</div><div class='add'>+				struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	int pipe = psb_intel_crtc-&gt;pipe;</div><div class='add'>+	u32 dpll;</div><div class='add'>+	u32 fp;</div><div class='add'>+	struct cdv_intel_clock_t clock;</div><div class='add'>+	bool is_lvds;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		dpll = REG_READ((pipe == 0) ? DPLL_A : DPLL_B);</div><div class='add'>+		if ((dpll &amp; DISPLAY_RATE_SELECT_FPA1) == 0)</div><div class='add'>+			fp = REG_READ((pipe == 0) ? FPA0 : FPB0);</div><div class='add'>+		else</div><div class='add'>+			fp = REG_READ((pipe == 0) ? FPA1 : FPB1);</div><div class='add'>+		is_lvds = (pipe == 1) &amp;&amp; (REG_READ(LVDS) &amp; LVDS_PORT_EN);</div><div class='add'>+		gma_power_end(dev);</div><div class='add'>+	} else {</div><div class='add'>+		dpll = (pipe == 0) ?</div><div class='add'>+			dev_priv-&gt;saveDPLL_A : dev_priv-&gt;saveDPLL_B;</div><div class='add'>+</div><div class='add'>+		if ((dpll &amp; DISPLAY_RATE_SELECT_FPA1) == 0)</div><div class='add'>+			fp = (pipe == 0) ?</div><div class='add'>+				dev_priv-&gt;saveFPA0 :</div><div class='add'>+				dev_priv-&gt;saveFPB0;</div><div class='add'>+		else</div><div class='add'>+			fp = (pipe == 0) ?</div><div class='add'>+				dev_priv-&gt;saveFPA1 :</div><div class='add'>+				dev_priv-&gt;saveFPB1;</div><div class='add'>+</div><div class='add'>+		is_lvds = (pipe == 1) &amp;&amp; (dev_priv-&gt;saveLVDS &amp; LVDS_PORT_EN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clock.m1 = (fp &amp; FP_M1_DIV_MASK) &gt;&gt; FP_M1_DIV_SHIFT;</div><div class='add'>+	clock.m2 = (fp &amp; FP_M2_DIV_MASK) &gt;&gt; FP_M2_DIV_SHIFT;</div><div class='add'>+	clock.n = (fp &amp; FP_N_DIV_MASK) &gt;&gt; FP_N_DIV_SHIFT;</div><div class='add'>+</div><div class='add'>+	if (is_lvds) {</div><div class='add'>+		clock.p1 =</div><div class='add'>+		    ffs((dpll &amp;</div><div class='add'>+			 DPLL_FPA01_P1_POST_DIV_MASK_I830_LVDS) &gt;&gt;</div><div class='add'>+			DPLL_FPA01_P1_POST_DIV_SHIFT);</div><div class='add'>+		if (clock.p1 == 0) {</div><div class='add'>+			clock.p1 = 4;</div><div class='add'>+			dev_err(dev-&gt;dev, "PLL %d\n", dpll);</div><div class='add'>+		}</div><div class='add'>+		clock.p2 = 14;</div><div class='add'>+</div><div class='add'>+		if ((dpll &amp; PLL_REF_INPUT_MASK) ==</div><div class='add'>+		    PLLB_REF_INPUT_SPREADSPECTRUMIN) {</div><div class='add'>+			/* XXX: might not be 66MHz */</div><div class='add'>+			i8xx_clock(66000, &amp;clock);</div><div class='add'>+		} else</div><div class='add'>+			i8xx_clock(48000, &amp;clock);</div><div class='add'>+	} else {</div><div class='add'>+		if (dpll &amp; PLL_P1_DIVIDE_BY_TWO)</div><div class='add'>+			clock.p1 = 2;</div><div class='add'>+		else {</div><div class='add'>+			clock.p1 =</div><div class='add'>+			    ((dpll &amp;</div><div class='add'>+			      DPLL_FPA01_P1_POST_DIV_MASK_I830) &gt;&gt;</div><div class='add'>+			     DPLL_FPA01_P1_POST_DIV_SHIFT) + 2;</div><div class='add'>+		}</div><div class='add'>+		if (dpll &amp; PLL_P2_DIVIDE_BY_4)</div><div class='add'>+			clock.p2 = 4;</div><div class='add'>+		else</div><div class='add'>+			clock.p2 = 2;</div><div class='add'>+</div><div class='add'>+		i8xx_clock(48000, &amp;clock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* XXX: It would be nice to validate the clocks, but we can't reuse</div><div class='add'>+	 * i830PllIsValid() because it relies on the xf86_config connector</div><div class='add'>+	 * configuration being accurate, which it isn't necessarily.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return clock.dot;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/** Returns the currently programmed mode of the given pipe. */</div><div class='add'>+struct drm_display_mode *cdv_intel_crtc_mode_get(struct drm_device *dev,</div><div class='add'>+					     struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	int pipe = psb_intel_crtc-&gt;pipe;</div><div class='add'>+	struct drm_display_mode *mode;</div><div class='add'>+	int htot;</div><div class='add'>+	int hsync;</div><div class='add'>+	int vtot;</div><div class='add'>+	int vsync;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		htot = REG_READ((pipe == 0) ? HTOTAL_A : HTOTAL_B);</div><div class='add'>+		hsync = REG_READ((pipe == 0) ? HSYNC_A : HSYNC_B);</div><div class='add'>+		vtot = REG_READ((pipe == 0) ? VTOTAL_A : VTOTAL_B);</div><div class='add'>+		vsync = REG_READ((pipe == 0) ? VSYNC_A : VSYNC_B);</div><div class='add'>+		gma_power_end(dev);</div><div class='add'>+	} else {</div><div class='add'>+		htot = (pipe == 0) ?</div><div class='add'>+			dev_priv-&gt;saveHTOTAL_A : dev_priv-&gt;saveHTOTAL_B;</div><div class='add'>+		hsync = (pipe == 0) ?</div><div class='add'>+			dev_priv-&gt;saveHSYNC_A : dev_priv-&gt;saveHSYNC_B;</div><div class='add'>+		vtot = (pipe == 0) ?</div><div class='add'>+			dev_priv-&gt;saveVTOTAL_A : dev_priv-&gt;saveVTOTAL_B;</div><div class='add'>+		vsync = (pipe == 0) ?</div><div class='add'>+			dev_priv-&gt;saveVSYNC_A : dev_priv-&gt;saveVSYNC_B;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mode = kzalloc(sizeof(*mode), GFP_KERNEL);</div><div class='add'>+	if (!mode)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	mode-&gt;clock = cdv_intel_crtc_clock_get(dev, crtc);</div><div class='add'>+	mode-&gt;hdisplay = (htot &amp; 0xffff) + 1;</div><div class='add'>+	mode-&gt;htotal = ((htot &amp; 0xffff0000) &gt;&gt; 16) + 1;</div><div class='add'>+	mode-&gt;hsync_start = (hsync &amp; 0xffff) + 1;</div><div class='add'>+	mode-&gt;hsync_end = ((hsync &amp; 0xffff0000) &gt;&gt; 16) + 1;</div><div class='add'>+	mode-&gt;vdisplay = (vtot &amp; 0xffff) + 1;</div><div class='add'>+	mode-&gt;vtotal = ((vtot &amp; 0xffff0000) &gt;&gt; 16) + 1;</div><div class='add'>+	mode-&gt;vsync_start = (vsync &amp; 0xffff) + 1;</div><div class='add'>+	mode-&gt;vsync_end = ((vsync &amp; 0xffff0000) &gt;&gt; 16) + 1;</div><div class='add'>+</div><div class='add'>+	drm_mode_set_name(mode);</div><div class='add'>+	drm_mode_set_crtcinfo(mode, 0);</div><div class='add'>+</div><div class='add'>+	return mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cdv_intel_crtc_destroy(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+</div><div class='add'>+	kfree(psb_intel_crtc-&gt;crtc_state);</div><div class='add'>+	drm_crtc_cleanup(crtc);</div><div class='add'>+	kfree(psb_intel_crtc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct drm_crtc_helper_funcs cdv_intel_helper_funcs = {</div><div class='add'>+	.dpms = cdv_intel_crtc_dpms,</div><div class='add'>+	.mode_fixup = cdv_intel_crtc_mode_fixup,</div><div class='add'>+	.mode_set = cdv_intel_crtc_mode_set,</div><div class='add'>+	.mode_set_base = cdv_intel_pipe_set_base,</div><div class='add'>+	.prepare = cdv_intel_crtc_prepare,</div><div class='add'>+	.commit = cdv_intel_crtc_commit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct drm_crtc_funcs cdv_intel_crtc_funcs = {</div><div class='add'>+	.save = cdv_intel_crtc_save,</div><div class='add'>+	.restore = cdv_intel_crtc_restore,</div><div class='add'>+	.cursor_set = cdv_intel_crtc_cursor_set,</div><div class='add'>+	.cursor_move = cdv_intel_crtc_cursor_move,</div><div class='add'>+	.gamma_set = cdv_intel_crtc_gamma_set,</div><div class='add'>+	.set_config = cdv_crtc_set_config,</div><div class='add'>+	.destroy = cdv_intel_crtc_destroy,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set the default value of cursor control and base register</div><div class='add'>+ * to zero. This is a workaround for h/w defect on oaktrail</div><div class='add'>+ */</div><div class='add'>+void cdv_intel_cursor_init(struct drm_device *dev, int pipe)</div><div class='add'>+{</div><div class='add'>+	uint32_t control;</div><div class='add'>+	uint32_t base;</div><div class='add'>+</div><div class='add'>+	switch (pipe) {</div><div class='add'>+	case 0:</div><div class='add'>+		control = CURACNTR;</div><div class='add'>+		base = CURABASE;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		control = CURBCNTR;</div><div class='add'>+		base = CURBBASE;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		control = CURCCNTR;</div><div class='add'>+		base = CURCBASE;</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'>+	REG_WRITE(control, 0);</div><div class='add'>+	REG_WRITE(base, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c<br/>new file mode 100644<br/>index 000000000000..de25560e629d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/cdv_intel_hdmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/cdv_intel_hdmi.c</a></div><div class='hunk'>@@ -0,0 +1,392 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2006-2011 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='add'>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER</div><div class='add'>+ * DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *	jim liu &lt;jim.liu@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * FIXME:</div><div class='add'>+ *	We should probably make this generic and share it with Medfield</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include &lt;drm/drm.h&gt;</div><div class='add'>+#include &lt;drm/drm_crtc.h&gt;</div><div class='add'>+#include &lt;drm/drm_edid.h&gt;</div><div class='add'>+#include "psb_intel_drv.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+</div><div class='add'>+/* hdmi control bits */</div><div class='add'>+#define HDMI_NULL_PACKETS_DURING_VSYNC	(1 &lt;&lt; 9)</div><div class='add'>+#define HDMI_BORDER_ENABLE		(1 &lt;&lt; 7)</div><div class='add'>+#define HDMI_AUDIO_ENABLE		(1 &lt;&lt; 6)</div><div class='add'>+#define HDMI_VSYNC_ACTIVE_HIGH		(1 &lt;&lt; 4)</div><div class='add'>+#define HDMI_HSYNC_ACTIVE_HIGH		(1 &lt;&lt; 3)</div><div class='add'>+/* hdmi-b control bits */</div><div class='add'>+#define	HDMIB_PIPE_B_SELECT		(1 &lt;&lt; 30)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct mid_intel_hdmi_priv {</div><div class='add'>+	u32 hdmi_reg;</div><div class='add'>+	u32 save_HDMIB;</div><div class='add'>+	bool has_hdmi_sink;</div><div class='add'>+	bool has_hdmi_audio;</div><div class='add'>+	/* Should set this when detect hotplug */</div><div class='add'>+	bool hdmi_device_connected;</div><div class='add'>+	struct mdfld_hdmi_i2c *i2c_bus;</div><div class='add'>+	struct i2c_adapter *hdmi_i2c_adapter;	/* for control functions */</div><div class='add'>+	struct drm_device *dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void cdv_hdmi_mode_set(struct drm_encoder *encoder,</div><div class='add'>+			struct drm_display_mode *mode,</div><div class='add'>+			struct drm_display_mode *adjusted_mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder = to_psb_intel_encoder(encoder);</div><div class='add'>+	struct mid_intel_hdmi_priv *hdmi_priv = psb_intel_encoder-&gt;dev_priv;</div><div class='add'>+	u32 hdmib;</div><div class='add'>+	struct drm_crtc *crtc = encoder-&gt;crtc;</div><div class='add'>+	struct psb_intel_crtc *intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+</div><div class='add'>+	hdmib = (2 &lt;&lt; 10);</div><div class='add'>+</div><div class='add'>+	if (adjusted_mode-&gt;flags &amp; DRM_MODE_FLAG_PVSYNC)</div><div class='add'>+		hdmib |= HDMI_VSYNC_ACTIVE_HIGH;</div><div class='add'>+	if (adjusted_mode-&gt;flags &amp; DRM_MODE_FLAG_PHSYNC)</div><div class='add'>+		hdmib |= HDMI_HSYNC_ACTIVE_HIGH;</div><div class='add'>+</div><div class='add'>+	if (intel_crtc-&gt;pipe == 1)</div><div class='add'>+		hdmib |= HDMIB_PIPE_B_SELECT;</div><div class='add'>+</div><div class='add'>+	if (hdmi_priv-&gt;has_hdmi_audio) {</div><div class='add'>+		hdmib |= HDMI_AUDIO_ENABLE;</div><div class='add'>+		hdmib |= HDMI_NULL_PACKETS_DURING_VSYNC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_WRITE(hdmi_priv-&gt;hdmi_reg, hdmib);</div><div class='add'>+	REG_READ(hdmi_priv-&gt;hdmi_reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool cdv_hdmi_mode_fixup(struct drm_encoder *encoder,</div><div class='add'>+				  struct drm_display_mode *mode,</div><div class='add'>+				  struct drm_display_mode *adjusted_mode)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cdv_hdmi_dpms(struct drm_encoder *encoder, int mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+						to_psb_intel_encoder(encoder);</div><div class='add'>+	struct mid_intel_hdmi_priv *hdmi_priv = psb_intel_encoder-&gt;dev_priv;</div><div class='add'>+	u32 hdmib;</div><div class='add'>+</div><div class='add'>+	hdmib = REG_READ(hdmi_priv-&gt;hdmi_reg);</div><div class='add'>+</div><div class='add'>+	if (mode != DRM_MODE_DPMS_ON)</div><div class='add'>+		REG_WRITE(hdmi_priv-&gt;hdmi_reg, hdmib &amp; ~HDMIB_PORT_EN);</div><div class='add'>+	else</div><div class='add'>+		REG_WRITE(hdmi_priv-&gt;hdmi_reg, hdmib | HDMIB_PORT_EN);</div><div class='add'>+	REG_READ(hdmi_priv-&gt;hdmi_reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cdv_hdmi_save(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = connector-&gt;dev;</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(connector);</div><div class='add'>+	struct mid_intel_hdmi_priv *hdmi_priv = psb_intel_encoder-&gt;dev_priv;</div><div class='add'>+</div><div class='add'>+	hdmi_priv-&gt;save_HDMIB = REG_READ(hdmi_priv-&gt;hdmi_reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cdv_hdmi_restore(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = connector-&gt;dev;</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(connector);</div><div class='add'>+	struct mid_intel_hdmi_priv *hdmi_priv = psb_intel_encoder-&gt;dev_priv;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(hdmi_priv-&gt;hdmi_reg, hdmi_priv-&gt;save_HDMIB);</div><div class='add'>+	REG_READ(hdmi_priv-&gt;hdmi_reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum drm_connector_status cdv_hdmi_detect(</div><div class='add'>+				struct drm_connector *connector, bool force)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(connector);</div><div class='add'>+	struct psb_intel_connector *psb_intel_connector =</div><div class='add'>+					to_psb_intel_connector(connector);</div><div class='add'>+	struct mid_intel_hdmi_priv *hdmi_priv = psb_intel_encoder-&gt;dev_priv;</div><div class='add'>+	struct edid *edid = NULL;</div><div class='add'>+	enum drm_connector_status status = connector_status_disconnected;</div><div class='add'>+</div><div class='add'>+	edid = drm_get_edid(connector, &amp;psb_intel_encoder-&gt;i2c_bus-&gt;adapter);</div><div class='add'>+</div><div class='add'>+	hdmi_priv-&gt;has_hdmi_sink = false;</div><div class='add'>+	hdmi_priv-&gt;has_hdmi_audio = false;</div><div class='add'>+	if (edid) {</div><div class='add'>+		if (edid-&gt;input &amp; DRM_EDID_INPUT_DIGITAL) {</div><div class='add'>+			status = connector_status_connected;</div><div class='add'>+			hdmi_priv-&gt;has_hdmi_sink =</div><div class='add'>+						drm_detect_hdmi_monitor(edid);</div><div class='add'>+			hdmi_priv-&gt;has_hdmi_audio =</div><div class='add'>+						drm_detect_monitor_audio(edid);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		psb_intel_connector-&gt;base.display_info.raw_edid = NULL;</div><div class='add'>+		kfree(edid);</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cdv_hdmi_set_property(struct drm_connector *connector,</div><div class='add'>+				       struct drm_property *property,</div><div class='add'>+				       uint64_t value)</div><div class='add'>+{</div><div class='add'>+	struct drm_encoder *encoder = connector-&gt;encoder;</div><div class='add'>+</div><div class='add'>+	if (!strcmp(property-&gt;name, "scaling mode") &amp;&amp; encoder) {</div><div class='add'>+		struct psb_intel_crtc *crtc = to_psb_intel_crtc(encoder-&gt;crtc);</div><div class='add'>+		bool centre;</div><div class='add'>+		uint64_t curValue;</div><div class='add'>+</div><div class='add'>+		if (!crtc)</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		switch (value) {</div><div class='add'>+		case DRM_MODE_SCALE_FULLSCREEN:</div><div class='add'>+			break;</div><div class='add'>+		case DRM_MODE_SCALE_NO_SCALE:</div><div class='add'>+			break;</div><div class='add'>+		case DRM_MODE_SCALE_ASPECT:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (drm_connector_property_get_value(connector,</div><div class='add'>+							property, &amp;curValue))</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		if (curValue == value)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		if (drm_connector_property_set_value(connector,</div><div class='add'>+							property, value))</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		centre = (curValue == DRM_MODE_SCALE_NO_SCALE) ||</div><div class='add'>+			(value == DRM_MODE_SCALE_NO_SCALE);</div><div class='add'>+</div><div class='add'>+		if (crtc-&gt;saved_mode.hdisplay != 0 &amp;&amp;</div><div class='add'>+		    crtc-&gt;saved_mode.vdisplay != 0) {</div><div class='add'>+			if (centre) {</div><div class='add'>+				if (!drm_crtc_helper_set_mode(encoder-&gt;crtc, &amp;crtc-&gt;saved_mode,</div><div class='add'>+					    encoder-&gt;crtc-&gt;x, encoder-&gt;crtc-&gt;y, encoder-&gt;crtc-&gt;fb))</div><div class='add'>+					return -1;</div><div class='add'>+			} else {</div><div class='add'>+				struct drm_encoder_helper_funcs *helpers</div><div class='add'>+						    = encoder-&gt;helper_private;</div><div class='add'>+				helpers-&gt;mode_set(encoder, &amp;crtc-&gt;saved_mode,</div><div class='add'>+					     &amp;crtc-&gt;saved_adjusted_mode);</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'>+ * Return the list of HDMI DDC modes if available.</div><div class='add'>+ */</div><div class='add'>+static int cdv_hdmi_get_modes(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(connector);</div><div class='add'>+	struct edid *edid = NULL;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	edid = drm_get_edid(connector, &amp;psb_intel_encoder-&gt;i2c_bus-&gt;adapter);</div><div class='add'>+	if (edid) {</div><div class='add'>+		drm_mode_connector_update_edid_property(connector, edid);</div><div class='add'>+		ret = drm_add_edid_modes(connector, edid);</div><div class='add'>+		kfree(edid);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cdv_hdmi_mode_valid(struct drm_connector *connector,</div><div class='add'>+				 struct drm_display_mode *mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = connector-&gt;dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (mode-&gt;clock &gt; 165000)</div><div class='add'>+		return MODE_CLOCK_HIGH;</div><div class='add'>+	if (mode-&gt;clock &lt; 20000)</div><div class='add'>+		return MODE_CLOCK_HIGH;</div><div class='add'>+</div><div class='add'>+	/* just in case */</div><div class='add'>+	if (mode-&gt;flags &amp; DRM_MODE_FLAG_DBLSCAN)</div><div class='add'>+		return MODE_NO_DBLESCAN;</div><div class='add'>+</div><div class='add'>+	/* just in case */</div><div class='add'>+	if (mode-&gt;flags &amp; DRM_MODE_FLAG_INTERLACE)</div><div class='add'>+		return MODE_NO_INTERLACE;</div><div class='add'>+</div><div class='add'>+	/* We assume worst case scenario of 32 bpp here, since we don't know */</div><div class='add'>+	if ((ALIGN(mode-&gt;hdisplay * 4, 64) * mode-&gt;vdisplay) &gt;</div><div class='add'>+	    dev_priv-&gt;vram_stolen_size)</div><div class='add'>+		return MODE_MEM;</div><div class='add'>+</div><div class='add'>+	return MODE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cdv_hdmi_destroy(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(connector);</div><div class='add'>+</div><div class='add'>+	if (psb_intel_encoder-&gt;i2c_bus)</div><div class='add'>+		psb_intel_i2c_destroy(psb_intel_encoder-&gt;i2c_bus);</div><div class='add'>+	drm_sysfs_connector_remove(connector);</div><div class='add'>+	drm_connector_cleanup(connector);</div><div class='add'>+	kfree(connector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct drm_encoder_helper_funcs cdv_hdmi_helper_funcs = {</div><div class='add'>+	.dpms = cdv_hdmi_dpms,</div><div class='add'>+	.mode_fixup = cdv_hdmi_mode_fixup,</div><div class='add'>+	.prepare = psb_intel_encoder_prepare,</div><div class='add'>+	.mode_set = cdv_hdmi_mode_set,</div><div class='add'>+	.commit = psb_intel_encoder_commit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct drm_connector_helper_funcs</div><div class='add'>+					cdv_hdmi_connector_helper_funcs = {</div><div class='add'>+	.get_modes = cdv_hdmi_get_modes,</div><div class='add'>+	.mode_valid = cdv_hdmi_mode_valid,</div><div class='add'>+	.best_encoder = psb_intel_best_encoder,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct drm_connector_funcs cdv_hdmi_connector_funcs = {</div><div class='add'>+	.dpms = drm_helper_connector_dpms,</div><div class='add'>+	.save = cdv_hdmi_save,</div><div class='add'>+	.restore = cdv_hdmi_restore,</div><div class='add'>+	.detect = cdv_hdmi_detect,</div><div class='add'>+	.fill_modes = drm_helper_probe_single_connector_modes,</div><div class='add'>+	.set_property = cdv_hdmi_set_property,</div><div class='add'>+	.destroy = cdv_hdmi_destroy,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void cdv_hdmi_init(struct drm_device *dev,</div><div class='add'>+			struct psb_intel_mode_device *mode_dev, int reg)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder;</div><div class='add'>+	struct psb_intel_connector *psb_intel_connector;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+	struct drm_encoder *encoder;</div><div class='add'>+	struct mid_intel_hdmi_priv *hdmi_priv;</div><div class='add'>+	int ddc_bus;</div><div class='add'>+</div><div class='add'>+	psb_intel_encoder = kzalloc(sizeof(struct psb_intel_encoder),</div><div class='add'>+				    GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!psb_intel_encoder)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	psb_intel_connector = kzalloc(sizeof(struct psb_intel_connector),</div><div class='add'>+				      GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!psb_intel_connector)</div><div class='add'>+		goto err_connector;</div><div class='add'>+</div><div class='add'>+	hdmi_priv = kzalloc(sizeof(struct mid_intel_hdmi_priv), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!hdmi_priv)</div><div class='add'>+		goto err_priv;</div><div class='add'>+</div><div class='add'>+	connector = &amp;psb_intel_connector-&gt;base;</div><div class='add'>+	encoder = &amp;psb_intel_encoder-&gt;base;</div><div class='add'>+	drm_connector_init(dev, connector,</div><div class='add'>+			   &amp;cdv_hdmi_connector_funcs,</div><div class='add'>+			   DRM_MODE_CONNECTOR_DVID);</div><div class='add'>+</div><div class='add'>+	drm_encoder_init(dev, encoder, &amp;psb_intel_lvds_enc_funcs,</div><div class='add'>+			 DRM_MODE_ENCODER_TMDS);</div><div class='add'>+</div><div class='add'>+	psb_intel_connector_attach_encoder(psb_intel_connector,</div><div class='add'>+					   psb_intel_encoder);</div><div class='add'>+	psb_intel_encoder-&gt;type = INTEL_OUTPUT_HDMI;</div><div class='add'>+	hdmi_priv-&gt;hdmi_reg = reg;</div><div class='add'>+	hdmi_priv-&gt;has_hdmi_sink = false;</div><div class='add'>+	psb_intel_encoder-&gt;dev_priv = hdmi_priv;</div><div class='add'>+</div><div class='add'>+	drm_encoder_helper_add(encoder, &amp;cdv_hdmi_helper_funcs);</div><div class='add'>+	drm_connector_helper_add(connector,</div><div class='add'>+				 &amp;cdv_hdmi_connector_helper_funcs);</div><div class='add'>+	connector-&gt;display_info.subpixel_order = SubPixelHorizontalRGB;</div><div class='add'>+	connector-&gt;interlace_allowed = false;</div><div class='add'>+	connector-&gt;doublescan_allowed = false;</div><div class='add'>+</div><div class='add'>+	drm_connector_attach_property(connector,</div><div class='add'>+				      dev-&gt;mode_config.scaling_mode_property,</div><div class='add'>+				      DRM_MODE_SCALE_FULLSCREEN);</div><div class='add'>+</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case SDVOB:</div><div class='add'>+		ddc_bus = GPIOE;</div><div class='add'>+		break;</div><div class='add'>+	case SDVOC:</div><div class='add'>+		ddc_bus = GPIOD;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DRM_ERROR("unknown reg 0x%x for HDMI\n", reg);</div><div class='add'>+		goto failed_ddc;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	psb_intel_encoder-&gt;i2c_bus = psb_intel_i2c_create(dev,</div><div class='add'>+				ddc_bus, (reg == SDVOB) ? "HDMIB" : "HDMIC");</div><div class='add'>+</div><div class='add'>+	if (!psb_intel_encoder-&gt;i2c_bus) {</div><div class='add'>+		dev_err(dev-&gt;dev, "No ddc adapter available!\n");</div><div class='add'>+		goto failed_ddc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdmi_priv-&gt;hdmi_i2c_adapter =</div><div class='add'>+				&amp;(psb_intel_encoder-&gt;i2c_bus-&gt;adapter);</div><div class='add'>+	hdmi_priv-&gt;dev = dev;</div><div class='add'>+	drm_sysfs_connector_add(connector);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+failed_ddc:</div><div class='add'>+	drm_encoder_cleanup(encoder);</div><div class='add'>+	drm_connector_cleanup(connector);</div><div class='add'>+err_priv:</div><div class='add'>+	kfree(psb_intel_connector);</div><div class='add'>+err_connector:</div><div class='add'>+	kfree(psb_intel_encoder);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c<br/>new file mode 100644<br/>index 000000000000..50e744be9852<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/cdv_intel_lvds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/cdv_intel_lvds.c</a></div><div class='hunk'>@@ -0,0 +1,732 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2006-2011 Intel Corporation</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Eric Anholt &lt;eric@anholt.net&gt;</div><div class='add'>+ *	Dave Airlie &lt;airlied@linux.ie&gt;</div><div class='add'>+ *	Jesse Barnes &lt;jesse.barnes@intel.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+</div><div class='add'>+#include "intel_bios.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_intel_drv.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include "power.h"</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include "cdv_device.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * LVDS I2C backlight control macros</div><div class='add'>+ */</div><div class='add'>+#define BRIGHTNESS_MAX_LEVEL 100</div><div class='add'>+#define BRIGHTNESS_MASK 0xFF</div><div class='add'>+#define BLC_I2C_TYPE	0x01</div><div class='add'>+#define BLC_PWM_TYPT	0x02</div><div class='add'>+</div><div class='add'>+#define BLC_POLARITY_NORMAL 0</div><div class='add'>+#define BLC_POLARITY_INVERSE 1</div><div class='add'>+</div><div class='add'>+#define PSB_BLC_MAX_PWM_REG_FREQ       (0xFFFE)</div><div class='add'>+#define PSB_BLC_MIN_PWM_REG_FREQ	(0x2)</div><div class='add'>+#define PSB_BLC_PWM_PRECISION_FACTOR	(10)</div><div class='add'>+#define PSB_BACKLIGHT_PWM_CTL_SHIFT	(16)</div><div class='add'>+#define PSB_BACKLIGHT_PWM_POLARITY_BIT_CLEAR (0xFFFE)</div><div class='add'>+</div><div class='add'>+struct cdv_intel_lvds_priv {</div><div class='add'>+	/**</div><div class='add'>+	 * Saved LVDO output states</div><div class='add'>+	 */</div><div class='add'>+	uint32_t savePP_ON;</div><div class='add'>+	uint32_t savePP_OFF;</div><div class='add'>+	uint32_t saveLVDS;</div><div class='add'>+	uint32_t savePP_CONTROL;</div><div class='add'>+	uint32_t savePP_CYCLE;</div><div class='add'>+	uint32_t savePFIT_CONTROL;</div><div class='add'>+	uint32_t savePFIT_PGM_RATIOS;</div><div class='add'>+	uint32_t saveBLC_PWM_CTL;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns the maximum level of the backlight duty cycle field.</div><div class='add'>+ */</div><div class='add'>+static u32 cdv_intel_lvds_get_max_backlight(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 retval;</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		retval = ((REG_READ(BLC_PWM_CTL) &amp;</div><div class='add'>+			  BACKLIGHT_MODULATION_FREQ_MASK) &gt;&gt;</div><div class='add'>+			  BACKLIGHT_MODULATION_FREQ_SHIFT) * 2;</div><div class='add'>+</div><div class='add'>+		gma_power_end(dev);</div><div class='add'>+	} else</div><div class='add'>+		retval = ((dev_priv-&gt;saveBLC_PWM_CTL &amp;</div><div class='add'>+			  BACKLIGHT_MODULATION_FREQ_MASK) &gt;&gt;</div><div class='add'>+			  BACKLIGHT_MODULATION_FREQ_SHIFT) * 2;</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set LVDS backlight level by I2C command</div><div class='add'>+ */</div><div class='add'>+static int cdv_lvds_i2c_set_brightness(struct drm_device *dev,</div><div class='add'>+					unsigned int level)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_i2c_chan *lvds_i2c_bus = dev_priv-&gt;lvds_i2c_bus;</div><div class='add'>+	u8 out_buf[2];</div><div class='add'>+	unsigned int blc_i2c_brightness;</div><div class='add'>+</div><div class='add'>+	struct i2c_msg msgs[] = {</div><div class='add'>+		{</div><div class='add'>+			.addr = lvds_i2c_bus-&gt;slave_addr,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.len = 2,</div><div class='add'>+			.buf = out_buf,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	blc_i2c_brightness = BRIGHTNESS_MASK &amp; ((unsigned int)level *</div><div class='add'>+			     BRIGHTNESS_MASK /</div><div class='add'>+			     BRIGHTNESS_MAX_LEVEL);</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;lvds_bl-&gt;pol == BLC_POLARITY_INVERSE)</div><div class='add'>+		blc_i2c_brightness = BRIGHTNESS_MASK - blc_i2c_brightness;</div><div class='add'>+</div><div class='add'>+	out_buf[0] = dev_priv-&gt;lvds_bl-&gt;brightnesscmd;</div><div class='add'>+	out_buf[1] = (u8)blc_i2c_brightness;</div><div class='add'>+</div><div class='add'>+	if (i2c_transfer(&amp;lvds_i2c_bus-&gt;adapter, msgs, 1) == 1)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	DRM_ERROR("I2C transfer error\n");</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int cdv_lvds_pwm_set_brightness(struct drm_device *dev, int level)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	u32 max_pwm_blc;</div><div class='add'>+	u32 blc_pwm_duty_cycle;</div><div class='add'>+</div><div class='add'>+	max_pwm_blc = cdv_intel_lvds_get_max_backlight(dev);</div><div class='add'>+</div><div class='add'>+	/*BLC_PWM_CTL Should be initiated while backlight device init*/</div><div class='add'>+	BUG_ON((max_pwm_blc &amp; PSB_BLC_MAX_PWM_REG_FREQ) == 0);</div><div class='add'>+</div><div class='add'>+	blc_pwm_duty_cycle = level * max_pwm_blc / BRIGHTNESS_MAX_LEVEL;</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;lvds_bl-&gt;pol == BLC_POLARITY_INVERSE)</div><div class='add'>+		blc_pwm_duty_cycle = max_pwm_blc - blc_pwm_duty_cycle;</div><div class='add'>+</div><div class='add'>+	blc_pwm_duty_cycle &amp;= PSB_BACKLIGHT_PWM_POLARITY_BIT_CLEAR;</div><div class='add'>+	REG_WRITE(BLC_PWM_CTL,</div><div class='add'>+		  (max_pwm_blc &lt;&lt; PSB_BACKLIGHT_PWM_CTL_SHIFT) |</div><div class='add'>+		  (blc_pwm_duty_cycle));</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'>+ * Set LVDS backlight level either by I2C or PWM</div><div class='add'>+ */</div><div class='add'>+void cdv_intel_lvds_set_brightness(struct drm_device *dev, int level)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (!dev_priv-&gt;lvds_bl) {</div><div class='add'>+		DRM_ERROR("NO LVDS Backlight Info\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;lvds_bl-&gt;type == BLC_I2C_TYPE)</div><div class='add'>+		cdv_lvds_i2c_set_brightness(dev, level);</div><div class='add'>+	else</div><div class='add'>+		cdv_lvds_pwm_set_brightness(dev, level);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Sets the backlight level.</div><div class='add'>+ *</div><div class='add'>+ * level backlight level, from 0 to cdv_intel_lvds_get_max_backlight().</div><div class='add'>+ */</div><div class='add'>+static void cdv_intel_lvds_set_backlight(struct drm_device *dev, int level)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 blc_pwm_ctl;</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		blc_pwm_ctl =</div><div class='add'>+			REG_READ(BLC_PWM_CTL) &amp; ~BACKLIGHT_DUTY_CYCLE_MASK;</div><div class='add'>+		REG_WRITE(BLC_PWM_CTL,</div><div class='add'>+				(blc_pwm_ctl |</div><div class='add'>+				(level &lt;&lt; BACKLIGHT_DUTY_CYCLE_SHIFT)));</div><div class='add'>+		gma_power_end(dev);</div><div class='add'>+	} else {</div><div class='add'>+		blc_pwm_ctl = dev_priv-&gt;saveBLC_PWM_CTL &amp;</div><div class='add'>+				~BACKLIGHT_DUTY_CYCLE_MASK;</div><div class='add'>+		dev_priv-&gt;saveBLC_PWM_CTL = (blc_pwm_ctl |</div><div class='add'>+					(level &lt;&lt; BACKLIGHT_DUTY_CYCLE_SHIFT));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Sets the power state for the panel.</div><div class='add'>+ */</div><div class='add'>+static void cdv_intel_lvds_set_power(struct drm_device *dev,</div><div class='add'>+				     struct drm_encoder *encoder, bool on)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 pp_status;</div><div class='add'>+</div><div class='add'>+	if (!gma_power_begin(dev, true))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (on) {</div><div class='add'>+		REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) |</div><div class='add'>+			  POWER_TARGET_ON);</div><div class='add'>+		do {</div><div class='add'>+			pp_status = REG_READ(PP_STATUS);</div><div class='add'>+		} while ((pp_status &amp; PP_ON) == 0);</div><div class='add'>+</div><div class='add'>+		cdv_intel_lvds_set_backlight(dev,</div><div class='add'>+				dev_priv-&gt;mode_dev.backlight_duty_cycle);</div><div class='add'>+	} else {</div><div class='add'>+		cdv_intel_lvds_set_backlight(dev, 0);</div><div class='add'>+</div><div class='add'>+		REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) &amp;</div><div class='add'>+			  ~POWER_TARGET_ON);</div><div class='add'>+		do {</div><div class='add'>+			pp_status = REG_READ(PP_STATUS);</div><div class='add'>+		} while (pp_status &amp; PP_ON);</div><div class='add'>+	}</div><div class='add'>+	gma_power_end(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cdv_intel_lvds_encoder_dpms(struct drm_encoder *encoder, int mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	if (mode == DRM_MODE_DPMS_ON)</div><div class='add'>+		cdv_intel_lvds_set_power(dev, encoder, true);</div><div class='add'>+	else</div><div class='add'>+		cdv_intel_lvds_set_power(dev, encoder, false);</div><div class='add'>+	/* XXX: We never power down the LVDS pairs. */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cdv_intel_lvds_save(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cdv_intel_lvds_restore(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cdv_intel_lvds_mode_valid(struct drm_connector *connector,</div><div class='add'>+			      struct drm_display_mode *mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = connector-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_display_mode *fixed_mode =</div><div class='add'>+					dev_priv-&gt;mode_dev.panel_fixed_mode;</div><div class='add'>+</div><div class='add'>+	/* just in case */</div><div class='add'>+	if (mode-&gt;flags &amp; DRM_MODE_FLAG_DBLSCAN)</div><div class='add'>+		return MODE_NO_DBLESCAN;</div><div class='add'>+</div><div class='add'>+	/* just in case */</div><div class='add'>+	if (mode-&gt;flags &amp; DRM_MODE_FLAG_INTERLACE)</div><div class='add'>+		return MODE_NO_INTERLACE;</div><div class='add'>+</div><div class='add'>+	if (fixed_mode) {</div><div class='add'>+		if (mode-&gt;hdisplay &gt; fixed_mode-&gt;hdisplay)</div><div class='add'>+			return MODE_PANEL;</div><div class='add'>+		if (mode-&gt;vdisplay &gt; fixed_mode-&gt;vdisplay)</div><div class='add'>+			return MODE_PANEL;</div><div class='add'>+	}</div><div class='add'>+	return MODE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool cdv_intel_lvds_mode_fixup(struct drm_encoder *encoder,</div><div class='add'>+				  struct drm_display_mode *mode,</div><div class='add'>+				  struct drm_display_mode *adjusted_mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_mode_device *mode_dev = &amp;dev_priv-&gt;mode_dev;</div><div class='add'>+	struct drm_encoder *tmp_encoder;</div><div class='add'>+	struct drm_display_mode *panel_fixed_mode = mode_dev-&gt;panel_fixed_mode;</div><div class='add'>+</div><div class='add'>+	/* Should never happen!! */</div><div class='add'>+	list_for_each_entry(tmp_encoder, &amp;dev-&gt;mode_config.encoder_list,</div><div class='add'>+			    head) {</div><div class='add'>+		if (tmp_encoder != encoder</div><div class='add'>+		    &amp;&amp; tmp_encoder-&gt;crtc == encoder-&gt;crtc) {</div><div class='add'>+			printk(KERN_ERR "Can't enable LVDS and another "</div><div class='add'>+			       "encoder on the same pipe\n");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we have timings from the BIOS for the panel, put them in</div><div class='add'>+	 * to the adjusted mode.  The CRTC will be set up for this mode,</div><div class='add'>+	 * with the panel scaling set up to source from the H/VDisplay</div><div class='add'>+	 * of the original mode.</div><div class='add'>+	 */</div><div class='add'>+	if (panel_fixed_mode != NULL) {</div><div class='add'>+		adjusted_mode-&gt;hdisplay = panel_fixed_mode-&gt;hdisplay;</div><div class='add'>+		adjusted_mode-&gt;hsync_start = panel_fixed_mode-&gt;hsync_start;</div><div class='add'>+		adjusted_mode-&gt;hsync_end = panel_fixed_mode-&gt;hsync_end;</div><div class='add'>+		adjusted_mode-&gt;htotal = panel_fixed_mode-&gt;htotal;</div><div class='add'>+		adjusted_mode-&gt;vdisplay = panel_fixed_mode-&gt;vdisplay;</div><div class='add'>+		adjusted_mode-&gt;vsync_start = panel_fixed_mode-&gt;vsync_start;</div><div class='add'>+		adjusted_mode-&gt;vsync_end = panel_fixed_mode-&gt;vsync_end;</div><div class='add'>+		adjusted_mode-&gt;vtotal = panel_fixed_mode-&gt;vtotal;</div><div class='add'>+		adjusted_mode-&gt;clock = panel_fixed_mode-&gt;clock;</div><div class='add'>+		drm_mode_set_crtcinfo(adjusted_mode,</div><div class='add'>+				      CRTC_INTERLACE_HALVE_V);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * XXX: It would be nice to support lower refresh rates on the</div><div class='add'>+	 * panels to reduce power consumption, and perhaps match the</div><div class='add'>+	 * user's requested refresh rate.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cdv_intel_lvds_prepare(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_mode_device *mode_dev = &amp;dev_priv-&gt;mode_dev;</div><div class='add'>+</div><div class='add'>+	if (!gma_power_begin(dev, true))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mode_dev-&gt;saveBLC_PWM_CTL = REG_READ(BLC_PWM_CTL);</div><div class='add'>+	mode_dev-&gt;backlight_duty_cycle = (mode_dev-&gt;saveBLC_PWM_CTL &amp;</div><div class='add'>+					  BACKLIGHT_DUTY_CYCLE_MASK);</div><div class='add'>+</div><div class='add'>+	cdv_intel_lvds_set_power(dev, encoder, false);</div><div class='add'>+</div><div class='add'>+	gma_power_end(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cdv_intel_lvds_commit(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_mode_device *mode_dev = &amp;dev_priv-&gt;mode_dev;</div><div class='add'>+</div><div class='add'>+	if (mode_dev-&gt;backlight_duty_cycle == 0)</div><div class='add'>+		mode_dev-&gt;backlight_duty_cycle =</div><div class='add'>+		    cdv_intel_lvds_get_max_backlight(dev);</div><div class='add'>+</div><div class='add'>+	cdv_intel_lvds_set_power(dev, encoder, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cdv_intel_lvds_mode_set(struct drm_encoder *encoder,</div><div class='add'>+				struct drm_display_mode *mode,</div><div class='add'>+				struct drm_display_mode *adjusted_mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 pfit_control;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The LVDS pin pair will already have been turned on in the</div><div class='add'>+	 * cdv_intel_crtc_mode_set since it has a large impact on the DPLL</div><div class='add'>+	 * settings.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable automatic panel scaling so that non-native modes fill the</div><div class='add'>+	 * screen.  Should be enabled before the pipe is enabled, according to</div><div class='add'>+	 * register description and PRM.</div><div class='add'>+	 */</div><div class='add'>+	if (mode-&gt;hdisplay != adjusted_mode-&gt;hdisplay ||</div><div class='add'>+	    mode-&gt;vdisplay != adjusted_mode-&gt;vdisplay)</div><div class='add'>+		pfit_control = (PFIT_ENABLE | VERT_AUTO_SCALE |</div><div class='add'>+				HORIZ_AUTO_SCALE | VERT_INTERP_BILINEAR |</div><div class='add'>+				HORIZ_INTERP_BILINEAR);</div><div class='add'>+	else</div><div class='add'>+		pfit_control = 0;</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;lvds_dither)</div><div class='add'>+		pfit_control |= PANEL_8TO6_DITHER_ENABLE;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(PFIT_CONTROL, pfit_control);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Detect the LVDS connection.</div><div class='add'>+ *</div><div class='add'>+ * This always returns CONNECTOR_STATUS_CONNECTED.</div><div class='add'>+ * This connector should only have</div><div class='add'>+ * been set up if the LVDS was actually connected anyway.</div><div class='add'>+ */</div><div class='add'>+static enum drm_connector_status cdv_intel_lvds_detect(</div><div class='add'>+				struct drm_connector *connector, bool force)</div><div class='add'>+{</div><div class='add'>+	return connector_status_connected;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Return the list of DDC modes if available, or the BIOS fixed mode otherwise.</div><div class='add'>+ */</div><div class='add'>+static int cdv_intel_lvds_get_modes(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = connector-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(connector);</div><div class='add'>+	struct psb_intel_mode_device *mode_dev = &amp;dev_priv-&gt;mode_dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = psb_intel_ddc_get_modes(connector, &amp;psb_intel_encoder-&gt;i2c_bus-&gt;adapter);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Didn't get an EDID, so</div><div class='add'>+	 * Set wide sync ranges so we get all modes</div><div class='add'>+	 * handed to valid_mode for checking</div><div class='add'>+	 */</div><div class='add'>+	connector-&gt;display_info.min_vfreq = 0;</div><div class='add'>+	connector-&gt;display_info.max_vfreq = 200;</div><div class='add'>+	connector-&gt;display_info.min_hfreq = 0;</div><div class='add'>+	connector-&gt;display_info.max_hfreq = 200;</div><div class='add'>+	if (mode_dev-&gt;panel_fixed_mode != NULL) {</div><div class='add'>+		struct drm_display_mode *mode =</div><div class='add'>+		    drm_mode_duplicate(dev, mode_dev-&gt;panel_fixed_mode);</div><div class='add'>+		drm_mode_probed_add(connector, mode);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cdv_intel_lvds_destroy - unregister and free LVDS structures</div><div class='add'>+ * @connector: connector to free</div><div class='add'>+ *</div><div class='add'>+ * Unregister the DDC bus for this connector then free the driver private</div><div class='add'>+ * structure.</div><div class='add'>+ */</div><div class='add'>+void cdv_intel_lvds_destroy(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(connector);</div><div class='add'>+</div><div class='add'>+	if (psb_intel_encoder-&gt;i2c_bus)</div><div class='add'>+		psb_intel_i2c_destroy(psb_intel_encoder-&gt;i2c_bus);</div><div class='add'>+	drm_sysfs_connector_remove(connector);</div><div class='add'>+	drm_connector_cleanup(connector);</div><div class='add'>+	kfree(connector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cdv_intel_lvds_set_property(struct drm_connector *connector,</div><div class='add'>+				       struct drm_property *property,</div><div class='add'>+				       uint64_t value)</div><div class='add'>+{</div><div class='add'>+	struct drm_encoder *encoder = connector-&gt;encoder;</div><div class='add'>+</div><div class='add'>+	if (!strcmp(property-&gt;name, "scaling mode") &amp;&amp; encoder) {</div><div class='add'>+		struct psb_intel_crtc *crtc =</div><div class='add'>+					to_psb_intel_crtc(encoder-&gt;crtc);</div><div class='add'>+		uint64_t curValue;</div><div class='add'>+</div><div class='add'>+		if (!crtc)</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		switch (value) {</div><div class='add'>+		case DRM_MODE_SCALE_FULLSCREEN:</div><div class='add'>+			break;</div><div class='add'>+		case DRM_MODE_SCALE_NO_SCALE:</div><div class='add'>+			break;</div><div class='add'>+		case DRM_MODE_SCALE_ASPECT:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (drm_connector_property_get_value(connector,</div><div class='add'>+						     property,</div><div class='add'>+						     &amp;curValue))</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		if (curValue == value)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		if (drm_connector_property_set_value(connector,</div><div class='add'>+							property,</div><div class='add'>+							value))</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		if (crtc-&gt;saved_mode.hdisplay != 0 &amp;&amp;</div><div class='add'>+		    crtc-&gt;saved_mode.vdisplay != 0) {</div><div class='add'>+			if (!drm_crtc_helper_set_mode(encoder-&gt;crtc,</div><div class='add'>+						      &amp;crtc-&gt;saved_mode,</div><div class='add'>+						      encoder-&gt;crtc-&gt;x,</div><div class='add'>+						      encoder-&gt;crtc-&gt;y,</div><div class='add'>+						      encoder-&gt;crtc-&gt;fb))</div><div class='add'>+				return -1;</div><div class='add'>+		}</div><div class='add'>+	} else if (!strcmp(property-&gt;name, "backlight") &amp;&amp; encoder) {</div><div class='add'>+		if (drm_connector_property_set_value(connector,</div><div class='add'>+							property,</div><div class='add'>+							value))</div><div class='add'>+			return -1;</div><div class='add'>+		else {</div><div class='add'>+#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE</div><div class='add'>+			struct drm_psb_private *dev_priv =</div><div class='add'>+						encoder-&gt;dev-&gt;dev_private;</div><div class='add'>+			struct backlight_device *bd =</div><div class='add'>+						dev_priv-&gt;backlight_device;</div><div class='add'>+			bd-&gt;props.brightness = value;</div><div class='add'>+			backlight_update_status(bd);</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='add'>+	} else if (!strcmp(property-&gt;name, "DPMS") &amp;&amp; encoder) {</div><div class='add'>+		struct drm_encoder_helper_funcs *helpers =</div><div class='add'>+					encoder-&gt;helper_private;</div><div class='add'>+		helpers-&gt;dpms(encoder, value);</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 drm_encoder_helper_funcs</div><div class='add'>+					cdv_intel_lvds_helper_funcs = {</div><div class='add'>+	.dpms = cdv_intel_lvds_encoder_dpms,</div><div class='add'>+	.mode_fixup = cdv_intel_lvds_mode_fixup,</div><div class='add'>+	.prepare = cdv_intel_lvds_prepare,</div><div class='add'>+	.mode_set = cdv_intel_lvds_mode_set,</div><div class='add'>+	.commit = cdv_intel_lvds_commit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct drm_connector_helper_funcs</div><div class='add'>+				cdv_intel_lvds_connector_helper_funcs = {</div><div class='add'>+	.get_modes = cdv_intel_lvds_get_modes,</div><div class='add'>+	.mode_valid = cdv_intel_lvds_mode_valid,</div><div class='add'>+	.best_encoder = psb_intel_best_encoder,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct drm_connector_funcs cdv_intel_lvds_connector_funcs = {</div><div class='add'>+	.dpms = drm_helper_connector_dpms,</div><div class='add'>+	.save = cdv_intel_lvds_save,</div><div class='add'>+	.restore = cdv_intel_lvds_restore,</div><div class='add'>+	.detect = cdv_intel_lvds_detect,</div><div class='add'>+	.fill_modes = drm_helper_probe_single_connector_modes,</div><div class='add'>+	.set_property = cdv_intel_lvds_set_property,</div><div class='add'>+	.destroy = cdv_intel_lvds_destroy,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void cdv_intel_lvds_enc_destroy(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	drm_encoder_cleanup(encoder);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct drm_encoder_funcs cdv_intel_lvds_enc_funcs = {</div><div class='add'>+	.destroy = cdv_intel_lvds_enc_destroy,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cdv_intel_lvds_init - setup LVDS connectors on this device</div><div class='add'>+ * @dev: drm device</div><div class='add'>+ *</div><div class='add'>+ * Create the connector, register the LVDS DDC bus, and try to figure out what</div><div class='add'>+ * modes we can display on the LVDS panel (if present).</div><div class='add'>+ */</div><div class='add'>+void cdv_intel_lvds_init(struct drm_device *dev,</div><div class='add'>+		     struct psb_intel_mode_device *mode_dev)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder;</div><div class='add'>+	struct psb_intel_connector *psb_intel_connector;</div><div class='add'>+	struct cdv_intel_lvds_priv *lvds_priv;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+	struct drm_encoder *encoder;</div><div class='add'>+	struct drm_display_mode *scan;</div><div class='add'>+	struct drm_crtc *crtc;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 lvds;</div><div class='add'>+	int pipe;</div><div class='add'>+</div><div class='add'>+	psb_intel_encoder = kzalloc(sizeof(struct psb_intel_encoder),</div><div class='add'>+				    GFP_KERNEL);</div><div class='add'>+	if (!psb_intel_encoder)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	psb_intel_connector = kzalloc(sizeof(struct psb_intel_connector),</div><div class='add'>+				      GFP_KERNEL);</div><div class='add'>+	if (!psb_intel_connector)</div><div class='add'>+		goto failed_connector;</div><div class='add'>+</div><div class='add'>+	lvds_priv = kzalloc(sizeof(struct cdv_intel_lvds_priv), GFP_KERNEL);</div><div class='add'>+	if (!lvds_priv)</div><div class='add'>+		goto failed_lvds_priv;</div><div class='add'>+</div><div class='add'>+	psb_intel_encoder-&gt;dev_priv = lvds_priv;</div><div class='add'>+</div><div class='add'>+	connector = &amp;psb_intel_connector-&gt;base;</div><div class='add'>+	encoder = &amp;psb_intel_encoder-&gt;base;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	drm_connector_init(dev, connector,</div><div class='add'>+			   &amp;cdv_intel_lvds_connector_funcs,</div><div class='add'>+			   DRM_MODE_CONNECTOR_LVDS);</div><div class='add'>+</div><div class='add'>+	drm_encoder_init(dev, encoder,</div><div class='add'>+			 &amp;cdv_intel_lvds_enc_funcs,</div><div class='add'>+			 DRM_MODE_ENCODER_LVDS);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	psb_intel_connector_attach_encoder(psb_intel_connector,</div><div class='add'>+					   psb_intel_encoder);</div><div class='add'>+	psb_intel_encoder-&gt;type = INTEL_OUTPUT_LVDS;</div><div class='add'>+</div><div class='add'>+	drm_encoder_helper_add(encoder, &amp;cdv_intel_lvds_helper_funcs);</div><div class='add'>+	drm_connector_helper_add(connector,</div><div class='add'>+				 &amp;cdv_intel_lvds_connector_helper_funcs);</div><div class='add'>+	connector-&gt;display_info.subpixel_order = SubPixelHorizontalRGB;</div><div class='add'>+	connector-&gt;interlace_allowed = false;</div><div class='add'>+	connector-&gt;doublescan_allowed = false;</div><div class='add'>+</div><div class='add'>+	/*Attach connector properties*/</div><div class='add'>+	drm_connector_attach_property(connector,</div><div class='add'>+				      dev-&gt;mode_config.scaling_mode_property,</div><div class='add'>+				      DRM_MODE_SCALE_FULLSCREEN);</div><div class='add'>+	drm_connector_attach_property(connector,</div><div class='add'>+				      dev_priv-&gt;backlight_property,</div><div class='add'>+				      BRIGHTNESS_MAX_LEVEL);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * Set up I2C bus</div><div class='add'>+	 * FIXME: distroy i2c_bus when exit</div><div class='add'>+	 */</div><div class='add'>+	psb_intel_encoder-&gt;i2c_bus = psb_intel_i2c_create(dev,</div><div class='add'>+							 GPIOB,</div><div class='add'>+							 "LVDSBLC_B");</div><div class='add'>+	if (!psb_intel_encoder-&gt;i2c_bus) {</div><div class='add'>+		dev_printk(KERN_ERR,</div><div class='add'>+			&amp;dev-&gt;pdev-&gt;dev, "I2C bus registration failed.\n");</div><div class='add'>+		goto failed_blc_i2c;</div><div class='add'>+	}</div><div class='add'>+	psb_intel_encoder-&gt;i2c_bus-&gt;slave_addr = 0x2C;</div><div class='add'>+	dev_priv-&gt;lvds_i2c_bus = psb_intel_encoder-&gt;i2c_bus;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * LVDS discovery:</div><div class='add'>+	 * 1) check for EDID on DDC</div><div class='add'>+	 * 2) check for VBT data</div><div class='add'>+	 * 3) check to see if LVDS is already on</div><div class='add'>+	 *    if none of the above, no panel</div><div class='add'>+	 * 4) make sure lid is open</div><div class='add'>+	 *    if closed, act like it's not there for now</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Set up the DDC bus. */</div><div class='add'>+	psb_intel_encoder-&gt;ddc_bus = psb_intel_i2c_create(dev,</div><div class='add'>+							 GPIOC,</div><div class='add'>+							 "LVDSDDC_C");</div><div class='add'>+	if (!psb_intel_encoder-&gt;ddc_bus) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;dev-&gt;pdev-&gt;dev,</div><div class='add'>+			   "DDC bus registration " "failed.\n");</div><div class='add'>+		goto failed_ddc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Attempt to get the fixed panel mode from DDC.  Assume that the</div><div class='add'>+	 * preferred mode is the right one.</div><div class='add'>+	 */</div><div class='add'>+	psb_intel_ddc_get_modes(connector,</div><div class='add'>+				&amp;psb_intel_encoder-&gt;ddc_bus-&gt;adapter);</div><div class='add'>+	list_for_each_entry(scan, &amp;connector-&gt;probed_modes, head) {</div><div class='add'>+		if (scan-&gt;type &amp; DRM_MODE_TYPE_PREFERRED) {</div><div class='add'>+			mode_dev-&gt;panel_fixed_mode =</div><div class='add'>+			    drm_mode_duplicate(dev, scan);</div><div class='add'>+			goto out;	/* FIXME: check for quirks */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Failed to get EDID, what about VBT? do we need this?*/</div><div class='add'>+	if (dev_priv-&gt;lfp_lvds_vbt_mode) {</div><div class='add'>+		mode_dev-&gt;panel_fixed_mode =</div><div class='add'>+			drm_mode_duplicate(dev, dev_priv-&gt;lfp_lvds_vbt_mode);</div><div class='add'>+		if (mode_dev-&gt;panel_fixed_mode) {</div><div class='add'>+			mode_dev-&gt;panel_fixed_mode-&gt;type |=</div><div class='add'>+				DRM_MODE_TYPE_PREFERRED;</div><div class='add'>+			goto out;	/* FIXME: check for quirks */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * If we didn't get EDID, try checking if the panel is already turned</div><div class='add'>+	 * on.	If so, assume that whatever is currently programmed is the</div><div class='add'>+	 * correct mode.</div><div class='add'>+	 */</div><div class='add'>+	lvds = REG_READ(LVDS);</div><div class='add'>+	pipe = (lvds &amp; LVDS_PIPEB_SELECT) ? 1 : 0;</div><div class='add'>+	crtc = psb_intel_get_crtc_from_pipe(dev, pipe);</div><div class='add'>+</div><div class='add'>+	if (crtc &amp;&amp; (lvds &amp; LVDS_PORT_EN)) {</div><div class='add'>+		mode_dev-&gt;panel_fixed_mode =</div><div class='add'>+		    cdv_intel_crtc_mode_get(dev, crtc);</div><div class='add'>+		if (mode_dev-&gt;panel_fixed_mode) {</div><div class='add'>+			mode_dev-&gt;panel_fixed_mode-&gt;type |=</div><div class='add'>+			    DRM_MODE_TYPE_PREFERRED;</div><div class='add'>+			goto out;	/* FIXME: check for quirks */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we still don't have a mode after all that, give up. */</div><div class='add'>+	if (!mode_dev-&gt;panel_fixed_mode) {</div><div class='add'>+		DRM_DEBUG</div><div class='add'>+			("Found no modes on the lvds, ignoring the LVDS\n");</div><div class='add'>+		goto failed_find;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	drm_sysfs_connector_add(connector);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+failed_find:</div><div class='add'>+	printk(KERN_ERR "Failed find\n");</div><div class='add'>+	if (psb_intel_encoder-&gt;ddc_bus)</div><div class='add'>+		psb_intel_i2c_destroy(psb_intel_encoder-&gt;ddc_bus);</div><div class='add'>+failed_ddc:</div><div class='add'>+	printk(KERN_ERR "Failed DDC\n");</div><div class='add'>+	if (psb_intel_encoder-&gt;i2c_bus)</div><div class='add'>+		psb_intel_i2c_destroy(psb_intel_encoder-&gt;i2c_bus);</div><div class='add'>+failed_blc_i2c:</div><div class='add'>+	printk(KERN_ERR "Failed BLC\n");</div><div class='add'>+	drm_encoder_cleanup(encoder);</div><div class='add'>+	drm_connector_cleanup(connector);</div><div class='add'>+	kfree(lvds_priv);</div><div class='add'>+failed_lvds_priv:</div><div class='add'>+	kfree(psb_intel_connector);</div><div class='add'>+failed_connector:</div><div class='add'>+	kfree(psb_intel_encoder);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c<br/>new file mode 100644<br/>index 000000000000..791c0ef1a65b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/framebuffer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/framebuffer.c</a></div><div class='hunk'>@@ -0,0 +1,831 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ * Copyright (c) 2007-2011, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/console.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include &lt;drm/drm.h&gt;</div><div class='add'>+#include &lt;drm/drm_crtc.h&gt;</div><div class='add'>+#include &lt;drm/drm_fb_helper.h&gt;</div><div class='add'>+</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include "psb_intel_drv.h"</div><div class='add'>+#include "framebuffer.h"</div><div class='add'>+#include "gtt.h"</div><div class='add'>+</div><div class='add'>+static void psb_user_framebuffer_destroy(struct drm_framebuffer *fb);</div><div class='add'>+static int psb_user_framebuffer_create_handle(struct drm_framebuffer *fb,</div><div class='add'>+					      struct drm_file *file_priv,</div><div class='add'>+					      unsigned int *handle);</div><div class='add'>+</div><div class='add'>+static const struct drm_framebuffer_funcs psb_fb_funcs = {</div><div class='add'>+	.destroy = psb_user_framebuffer_destroy,</div><div class='add'>+	.create_handle = psb_user_framebuffer_create_handle,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CMAP_TOHW(_val, _width) ((((_val) &lt;&lt; (_width)) + 0x7FFF - (_val)) &gt;&gt; 16)</div><div class='add'>+</div><div class='add'>+static int psbfb_setcolreg(unsigned regno, unsigned red, unsigned green,</div><div class='add'>+			   unsigned blue, unsigned transp,</div><div class='add'>+			   struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	struct psb_fbdev *fbdev = info-&gt;par;</div><div class='add'>+	struct drm_framebuffer *fb = fbdev-&gt;psb_fb_helper.fb;</div><div class='add'>+	uint32_t v;</div><div class='add'>+</div><div class='add'>+	if (!fb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (regno &gt; 255)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	red = CMAP_TOHW(red, info-&gt;var.red.length);</div><div class='add'>+	blue = CMAP_TOHW(blue, info-&gt;var.blue.length);</div><div class='add'>+	green = CMAP_TOHW(green, info-&gt;var.green.length);</div><div class='add'>+	transp = CMAP_TOHW(transp, info-&gt;var.transp.length);</div><div class='add'>+</div><div class='add'>+	v = (red &lt;&lt; info-&gt;var.red.offset) |</div><div class='add'>+	    (green &lt;&lt; info-&gt;var.green.offset) |</div><div class='add'>+	    (blue &lt;&lt; info-&gt;var.blue.offset) |</div><div class='add'>+	    (transp &lt;&lt; info-&gt;var.transp.offset);</div><div class='add'>+</div><div class='add'>+	if (regno &lt; 16) {</div><div class='add'>+		switch (fb-&gt;bits_per_pixel) {</div><div class='add'>+		case 16:</div><div class='add'>+			((uint32_t *) info-&gt;pseudo_palette)[regno] = v;</div><div class='add'>+			break;</div><div class='add'>+		case 24:</div><div class='add'>+		case 32:</div><div class='add'>+			((uint32_t *) info-&gt;pseudo_palette)[regno] = v;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psbfb_pan(struct fb_var_screeninfo *var, struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	struct psb_fbdev *fbdev = info-&gt;par;</div><div class='add'>+	struct psb_framebuffer *psbfb = &amp;fbdev-&gt;pfb;</div><div class='add'>+	struct drm_device *dev = psbfb-&gt;base.dev;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	We have to poke our nose in here. The core fb code assumes</div><div class='add'>+	 *	panning is part of the hardware that can be invoked before</div><div class='add'>+	 *	the actual fb is mapped. In our case that isn't quite true.</div><div class='add'>+	 */</div><div class='add'>+	if (psbfb-&gt;gtt-&gt;npage) {</div><div class='add'>+		/* GTT roll shifts in 4K pages, we need to shift the right</div><div class='add'>+		   number of pages */</div><div class='add'>+		int pages = info-&gt;fix.line_length &gt;&gt; 12;</div><div class='add'>+		psb_gtt_roll(dev, psbfb-&gt;gtt, var-&gt;yoffset * pages);</div><div class='add'>+	}</div><div class='add'>+        return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psbfb_suspend(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_framebuffer *fb = 0;</div><div class='add'>+	struct psb_framebuffer *psbfb = to_psb_fb(fb);</div><div class='add'>+</div><div class='add'>+	console_lock();</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+	list_for_each_entry(fb, &amp;dev-&gt;mode_config.fb_list, head) {</div><div class='add'>+		struct fb_info *info = psbfb-&gt;fbdev;</div><div class='add'>+		fb_set_suspend(info, 1);</div><div class='add'>+		drm_fb_helper_blank(FB_BLANK_POWERDOWN, info);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+	console_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psbfb_resume(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_framebuffer *fb = 0;</div><div class='add'>+	struct psb_framebuffer *psbfb = to_psb_fb(fb);</div><div class='add'>+</div><div class='add'>+	console_lock();</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+	list_for_each_entry(fb, &amp;dev-&gt;mode_config.fb_list, head) {</div><div class='add'>+		struct fb_info *info = psbfb-&gt;fbdev;</div><div class='add'>+		fb_set_suspend(info, 0);</div><div class='add'>+		drm_fb_helper_blank(FB_BLANK_UNBLANK, info);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+	console_unlock();</div><div class='add'>+	drm_helper_disable_unused_functions(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psbfb_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='add'>+{</div><div class='add'>+	struct psb_framebuffer *psbfb = vma-&gt;vm_private_data;</div><div class='add'>+	struct drm_device *dev = psbfb-&gt;base.dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int page_num;</div><div class='add'>+	int i;</div><div class='add'>+	unsigned long address;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned long pfn;</div><div class='add'>+	/* FIXME: assumes fb at stolen base which may not be true */</div><div class='add'>+	unsigned long phys_addr = (unsigned long)dev_priv-&gt;stolen_base;</div><div class='add'>+</div><div class='add'>+	page_num = (vma-&gt;vm_end - vma-&gt;vm_start) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	address = (unsigned long)vmf-&gt;virtual_address;</div><div class='add'>+</div><div class='add'>+	vma-&gt;vm_page_prot = pgprot_noncached(vma-&gt;vm_page_prot);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; page_num; i++) {</div><div class='add'>+		pfn = (phys_addr &gt;&gt; PAGE_SHIFT);</div><div class='add'>+</div><div class='add'>+		ret = vm_insert_mixed(vma, address, pfn);</div><div class='add'>+		if (unlikely((ret == -EBUSY) || (ret != 0 &amp;&amp; i &gt; 0)))</div><div class='add'>+			break;</div><div class='add'>+		else if (unlikely(ret != 0)) {</div><div class='add'>+			ret = (ret == -ENOMEM) ? VM_FAULT_OOM : VM_FAULT_SIGBUS;</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		address += PAGE_SIZE;</div><div class='add'>+		phys_addr += PAGE_SIZE;</div><div class='add'>+	}</div><div class='add'>+	return VM_FAULT_NOPAGE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psbfb_vm_open(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psbfb_vm_close(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct vm_operations_struct psbfb_vm_ops = {</div><div class='add'>+	.fault	= psbfb_vm_fault,</div><div class='add'>+	.open	= psbfb_vm_open,</div><div class='add'>+	.close	= psbfb_vm_close</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int psbfb_mmap(struct fb_info *info, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	struct psb_fbdev *fbdev = info-&gt;par;</div><div class='add'>+	struct psb_framebuffer *psbfb = &amp;fbdev-&gt;pfb;</div><div class='add'>+</div><div class='add'>+	if (vma-&gt;vm_pgoff != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (vma-&gt;vm_pgoff &gt; (~0UL &gt;&gt; PAGE_SHIFT))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!psbfb-&gt;addr_space)</div><div class='add'>+		psbfb-&gt;addr_space = vma-&gt;vm_file-&gt;f_mapping;</div><div class='add'>+	/*</div><div class='add'>+	 * If this is a GEM object then info-&gt;screen_base is the virtual</div><div class='add'>+	 * kernel remapping of the object. FIXME: Review if this is</div><div class='add'>+	 * suitable for our mmap work</div><div class='add'>+	 */</div><div class='add'>+	vma-&gt;vm_ops = &amp;psbfb_vm_ops;</div><div class='add'>+	vma-&gt;vm_private_data = (void *)psbfb;</div><div class='add'>+	vma-&gt;vm_flags |= VM_RESERVED | VM_IO |</div><div class='add'>+					VM_MIXEDMAP | VM_DONTEXPAND;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psbfb_ioctl(struct fb_info *info, unsigned int cmd,</div><div class='add'>+						unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return -ENOTTY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fb_ops psbfb_ops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.fb_check_var = drm_fb_helper_check_var,</div><div class='add'>+	.fb_set_par = drm_fb_helper_set_par,</div><div class='add'>+	.fb_blank = drm_fb_helper_blank,</div><div class='add'>+	.fb_setcolreg = psbfb_setcolreg,</div><div class='add'>+	.fb_fillrect = cfb_fillrect,</div><div class='add'>+	.fb_copyarea = psbfb_copyarea,</div><div class='add'>+	.fb_imageblit = cfb_imageblit,</div><div class='add'>+	.fb_mmap = psbfb_mmap,</div><div class='add'>+	.fb_sync = psbfb_sync,</div><div class='add'>+	.fb_ioctl = psbfb_ioctl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct fb_ops psbfb_roll_ops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.fb_check_var = drm_fb_helper_check_var,</div><div class='add'>+	.fb_set_par = drm_fb_helper_set_par,</div><div class='add'>+	.fb_blank = drm_fb_helper_blank,</div><div class='add'>+	.fb_setcolreg = psbfb_setcolreg,</div><div class='add'>+	.fb_fillrect = cfb_fillrect,</div><div class='add'>+	.fb_copyarea = cfb_copyarea,</div><div class='add'>+	.fb_imageblit = cfb_imageblit,</div><div class='add'>+	.fb_pan_display = psbfb_pan,</div><div class='add'>+	.fb_mmap = psbfb_mmap,</div><div class='add'>+	.fb_sync = psbfb_sync,</div><div class='add'>+	.fb_ioctl = psbfb_ioctl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct fb_ops psbfb_unaccel_ops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.fb_check_var = drm_fb_helper_check_var,</div><div class='add'>+	.fb_set_par = drm_fb_helper_set_par,</div><div class='add'>+	.fb_blank = drm_fb_helper_blank,</div><div class='add'>+	.fb_setcolreg = psbfb_setcolreg,</div><div class='add'>+	.fb_fillrect = cfb_fillrect,</div><div class='add'>+	.fb_copyarea = cfb_copyarea,</div><div class='add'>+	.fb_imageblit = cfb_imageblit,</div><div class='add'>+	.fb_mmap = psbfb_mmap,</div><div class='add'>+	.fb_ioctl = psbfb_ioctl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_framebuffer_init	-	initialize a framebuffer</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *	@fb: framebuffer to set up</div><div class='add'>+ *	@mode_cmd: mode description</div><div class='add'>+ *	@gt: backing object</div><div class='add'>+ *</div><div class='add'>+ *	Configure and fill in the boilerplate for our frame buffer. Return</div><div class='add'>+ *	0 on success or an error code if we fail.</div><div class='add'>+ */</div><div class='add'>+static int psb_framebuffer_init(struct drm_device *dev,</div><div class='add'>+					struct psb_framebuffer *fb,</div><div class='add'>+					struct drm_mode_fb_cmd2 *mode_cmd,</div><div class='add'>+					struct gtt_range *gt)</div><div class='add'>+{</div><div class='add'>+	u32 bpp, depth;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	drm_fb_get_bpp_depth(mode_cmd-&gt;pixel_format, &amp;depth, &amp;bpp);</div><div class='add'>+</div><div class='add'>+	if (mode_cmd-&gt;pitches[0] &amp; 63)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	switch (bpp) {</div><div class='add'>+	case 8:</div><div class='add'>+	case 16:</div><div class='add'>+	case 24:</div><div class='add'>+	case 32:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	ret = drm_framebuffer_init(dev, &amp;fb-&gt;base, &amp;psb_fb_funcs);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;dev, "framebuffer init failed: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	drm_helper_mode_fill_fb_struct(&amp;fb-&gt;base, mode_cmd);</div><div class='add'>+	fb-&gt;gtt = gt;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_framebuffer_create	-	create a framebuffer backed by gt</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *	@mode_cmd: the description of the requested mode</div><div class='add'>+ *	@gt: the backing object</div><div class='add'>+ *</div><div class='add'>+ *	Create a framebuffer object backed by the gt, and fill in the</div><div class='add'>+ *	boilerplate required</div><div class='add'>+ *</div><div class='add'>+ *	TODO: review object references</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct drm_framebuffer *psb_framebuffer_create</div><div class='add'>+			(struct drm_device *dev,</div><div class='add'>+			 struct drm_mode_fb_cmd2 *mode_cmd,</div><div class='add'>+			 struct gtt_range *gt)</div><div class='add'>+{</div><div class='add'>+	struct psb_framebuffer *fb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	fb = kzalloc(sizeof(*fb), GFP_KERNEL);</div><div class='add'>+	if (!fb)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	ret = psb_framebuffer_init(dev, fb, mode_cmd, gt);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(fb);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+	return &amp;fb-&gt;base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psbfb_alloc		-	allocate frame buffer memory</div><div class='add'>+ *	@dev: the DRM device</div><div class='add'>+ *	@aligned_size: space needed</div><div class='add'>+ *	@force: fall back to GEM buffers if need be</div><div class='add'>+ *</div><div class='add'>+ *	Allocate the frame buffer. In the usual case we get a GTT range that</div><div class='add'>+ *	is stolen memory backed and life is simple. If there isn't sufficient</div><div class='add'>+ *	we fail as we don't have the virtual mapping space to really vmap it</div><div class='add'>+ *	and the kernel console code can't handle non linear framebuffers.</div><div class='add'>+ *</div><div class='add'>+ *	Re-address this as and if the framebuffer layer grows this ability.</div><div class='add'>+ */</div><div class='add'>+static struct gtt_range *psbfb_alloc(struct drm_device *dev, int aligned_size)</div><div class='add'>+{</div><div class='add'>+	struct gtt_range *backing;</div><div class='add'>+	/* Begin by trying to use stolen memory backing */</div><div class='add'>+	backing = psb_gtt_alloc_range(dev, aligned_size, "fb", 1);</div><div class='add'>+	if (backing) {</div><div class='add'>+		if (drm_gem_private_object_init(dev,</div><div class='add'>+					&amp;backing-&gt;gem, aligned_size) == 0)</div><div class='add'>+			return backing;</div><div class='add'>+		psb_gtt_free_range(dev, backing);</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'>+ *	psbfb_create		-	create a framebuffer</div><div class='add'>+ *	@fbdev: the framebuffer device</div><div class='add'>+ *	@sizes: specification of the layout</div><div class='add'>+ *</div><div class='add'>+ *	Create a framebuffer to the specifications provided</div><div class='add'>+ */</div><div class='add'>+static int psbfb_create(struct psb_fbdev *fbdev,</div><div class='add'>+				struct drm_fb_helper_surface_size *sizes)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = fbdev-&gt;psb_fb_helper.dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct fb_info *info;</div><div class='add'>+	struct drm_framebuffer *fb;</div><div class='add'>+	struct psb_framebuffer *psbfb = &amp;fbdev-&gt;pfb;</div><div class='add'>+	struct drm_mode_fb_cmd2 mode_cmd;</div><div class='add'>+	struct device *device = &amp;dev-&gt;pdev-&gt;dev;</div><div class='add'>+	int size;</div><div class='add'>+	int ret;</div><div class='add'>+	struct gtt_range *backing;</div><div class='add'>+	u32 bpp, depth;</div><div class='add'>+	int gtt_roll = 0;</div><div class='add'>+	int pitch_lines = 0;</div><div class='add'>+</div><div class='add'>+	mode_cmd.width = sizes-&gt;surface_width;</div><div class='add'>+	mode_cmd.height = sizes-&gt;surface_height;</div><div class='add'>+	bpp = sizes-&gt;surface_bpp;</div><div class='add'>+</div><div class='add'>+	/* No 24bit packed */</div><div class='add'>+	if (bpp == 24)</div><div class='add'>+		bpp = 32;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		/*</div><div class='add'>+		 * Acceleration via the GTT requires pitch to be</div><div class='add'>+		 * power of two aligned. Preferably page but less</div><div class='add'>+		 * is ok with some fonts</div><div class='add'>+		 */</div><div class='add'>+        	mode_cmd.pitches[0] =  ALIGN(mode_cmd.width * ((bpp + 7) / 8), 4096 &gt;&gt; pitch_lines);</div><div class='add'>+        	depth = sizes-&gt;surface_depth;</div><div class='add'>+</div><div class='add'>+        	size = mode_cmd.pitches[0] * mode_cmd.height;</div><div class='add'>+        	size = ALIGN(size, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+		/* Allocate the fb in the GTT with stolen page backing */</div><div class='add'>+		backing = psbfb_alloc(dev, size);</div><div class='add'>+</div><div class='add'>+		if (pitch_lines)</div><div class='add'>+			pitch_lines *= 2;</div><div class='add'>+		else</div><div class='add'>+			pitch_lines = 1;</div><div class='add'>+		gtt_roll++;</div><div class='add'>+	} while (backing == NULL &amp;&amp; pitch_lines &lt;= 16);</div><div class='add'>+</div><div class='add'>+	/* The final pitch we accepted if we succeeded */</div><div class='add'>+	pitch_lines /= 2;</div><div class='add'>+</div><div class='add'>+	if (backing == NULL) {</div><div class='add'>+		/*</div><div class='add'>+		 *	We couldn't get the space we wanted, fall back to the</div><div class='add'>+		 *	display engine requirement instead.  The HW requires</div><div class='add'>+		 *	the pitch to be 64 byte aligned</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		gtt_roll = 0;	/* Don't use GTT accelerated scrolling */</div><div class='add'>+		pitch_lines = 64;</div><div class='add'>+</div><div class='add'>+		mode_cmd.pitches[0] =  ALIGN(mode_cmd.width * ((bpp + 7) / 8), 64);</div><div class='add'>+</div><div class='add'>+		size = mode_cmd.pitches[0] * mode_cmd.height;</div><div class='add'>+		size = ALIGN(size, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+		/* Allocate the framebuffer in the GTT with stolen page backing */</div><div class='add'>+		backing = psbfb_alloc(dev, size);</div><div class='add'>+		if (backing == NULL)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	info = framebuffer_alloc(0, device);</div><div class='add'>+	if (!info) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_err1;</div><div class='add'>+	}</div><div class='add'>+	info-&gt;par = fbdev;</div><div class='add'>+</div><div class='add'>+	mode_cmd.pixel_format = drm_mode_legacy_fb_format(bpp, depth);</div><div class='add'>+</div><div class='add'>+	ret = psb_framebuffer_init(dev, psbfb, &amp;mode_cmd, backing);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unref;</div><div class='add'>+</div><div class='add'>+	fb = &amp;psbfb-&gt;base;</div><div class='add'>+	psbfb-&gt;fbdev = info;</div><div class='add'>+</div><div class='add'>+	fbdev-&gt;psb_fb_helper.fb = fb;</div><div class='add'>+	fbdev-&gt;psb_fb_helper.fbdev = info;</div><div class='add'>+</div><div class='add'>+	strcpy(info-&gt;fix.id, "psbfb");</div><div class='add'>+</div><div class='add'>+	info-&gt;flags = FBINFO_DEFAULT;</div><div class='add'>+	if (dev_priv-&gt;ops-&gt;accel_2d &amp;&amp; pitch_lines &gt; 8)	/* 2D engine */</div><div class='add'>+		info-&gt;fbops = &amp;psbfb_ops;</div><div class='add'>+	else if (gtt_roll) {	/* GTT rolling seems best */</div><div class='add'>+		info-&gt;fbops = &amp;psbfb_roll_ops;</div><div class='add'>+		info-&gt;flags |= FBINFO_HWACCEL_YPAN;</div><div class='add'>+	} else	/* Software */</div><div class='add'>+		info-&gt;fbops = &amp;psbfb_unaccel_ops;</div><div class='add'>+</div><div class='add'>+	ret = fb_alloc_cmap(&amp;info-&gt;cmap, 256, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_unref;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info-&gt;fix.smem_start = dev-&gt;mode_config.fb_base;</div><div class='add'>+	info-&gt;fix.smem_len = size;</div><div class='add'>+	info-&gt;fix.ywrapstep = gtt_roll;</div><div class='add'>+	info-&gt;fix.ypanstep = 0;</div><div class='add'>+</div><div class='add'>+	/* Accessed stolen memory directly */</div><div class='add'>+	info-&gt;screen_base = (char *)dev_priv-&gt;vram_addr +</div><div class='add'>+							backing-&gt;offset;</div><div class='add'>+	info-&gt;screen_size = size;</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;gtt.stolen_size) {</div><div class='add'>+		info-&gt;apertures = alloc_apertures(1);</div><div class='add'>+		if (!info-&gt;apertures) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out_unref;</div><div class='add'>+		}</div><div class='add'>+		info-&gt;apertures-&gt;ranges[0].base = dev-&gt;mode_config.fb_base;</div><div class='add'>+		info-&gt;apertures-&gt;ranges[0].size = dev_priv-&gt;gtt.stolen_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	drm_fb_helper_fill_fix(info, fb-&gt;pitches[0], fb-&gt;depth);</div><div class='add'>+	drm_fb_helper_fill_var(info, &amp;fbdev-&gt;psb_fb_helper,</div><div class='add'>+				sizes-&gt;fb_width, sizes-&gt;fb_height);</div><div class='add'>+</div><div class='add'>+	info-&gt;fix.mmio_start = pci_resource_start(dev-&gt;pdev, 0);</div><div class='add'>+	info-&gt;fix.mmio_len = pci_resource_len(dev-&gt;pdev, 0);</div><div class='add'>+</div><div class='add'>+	info-&gt;pixmap.size = 64 * 1024;</div><div class='add'>+	info-&gt;pixmap.buf_align = 8;</div><div class='add'>+	info-&gt;pixmap.access_align = 32;</div><div class='add'>+	info-&gt;pixmap.flags = FB_PIXMAP_SYSTEM;</div><div class='add'>+	info-&gt;pixmap.scan_align = 1;</div><div class='add'>+</div><div class='add'>+	dev_info(dev-&gt;dev, "allocated %dx%d fb\n",</div><div class='add'>+					psbfb-&gt;base.width, psbfb-&gt;base.height);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	return 0;</div><div class='add'>+out_unref:</div><div class='add'>+	if (backing-&gt;stolen)</div><div class='add'>+		psb_gtt_free_range(dev, backing);</div><div class='add'>+	else</div><div class='add'>+		drm_gem_object_unreference(&amp;backing-&gt;gem);</div><div class='add'>+out_err1:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	psb_gtt_free_range(dev, backing);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_user_framebuffer_create	-	create framebuffer</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *	@filp: client file</div><div class='add'>+ *	@cmd: mode request</div><div class='add'>+ *</div><div class='add'>+ *	Create a new framebuffer backed by a userspace GEM object</div><div class='add'>+ */</div><div class='add'>+static struct drm_framebuffer *psb_user_framebuffer_create</div><div class='add'>+			(struct drm_device *dev, struct drm_file *filp,</div><div class='add'>+			 struct drm_mode_fb_cmd2 *cmd)</div><div class='add'>+{</div><div class='add'>+	struct gtt_range *r;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	Find the GEM object and thus the gtt range object that is</div><div class='add'>+	 *	to back this space</div><div class='add'>+	 */</div><div class='add'>+	obj = drm_gem_object_lookup(dev, filp, cmd-&gt;handles[0]);</div><div class='add'>+	if (obj == NULL)</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='add'>+</div><div class='add'>+	/* Let the core code do all the work */</div><div class='add'>+	r = container_of(obj, struct gtt_range, gem);</div><div class='add'>+	return psb_framebuffer_create(dev, cmd, r);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psbfb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,</div><div class='add'>+							u16 blue, int regno)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psbfb_gamma_get(struct drm_crtc *crtc, u16 *red,</div><div class='add'>+					u16 *green, u16 *blue, int regno)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psbfb_probe(struct drm_fb_helper *helper,</div><div class='add'>+				struct drm_fb_helper_surface_size *sizes)</div><div class='add'>+{</div><div class='add'>+	struct psb_fbdev *psb_fbdev = (struct psb_fbdev *)helper;</div><div class='add'>+	int new_fb = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!helper-&gt;fb) {</div><div class='add'>+		ret = psbfb_create(psb_fbdev, sizes);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		new_fb = 1;</div><div class='add'>+	}</div><div class='add'>+	return new_fb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct drm_fb_helper_funcs psb_fb_helper_funcs = {</div><div class='add'>+	.gamma_set = psbfb_gamma_set,</div><div class='add'>+	.gamma_get = psbfb_gamma_get,</div><div class='add'>+	.fb_probe = psbfb_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int psb_fbdev_destroy(struct drm_device *dev, struct psb_fbdev *fbdev)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info;</div><div class='add'>+	struct psb_framebuffer *psbfb = &amp;fbdev-&gt;pfb;</div><div class='add'>+</div><div class='add'>+	if (fbdev-&gt;psb_fb_helper.fbdev) {</div><div class='add'>+		info = fbdev-&gt;psb_fb_helper.fbdev;</div><div class='add'>+		unregister_framebuffer(info);</div><div class='add'>+		if (info-&gt;cmap.len)</div><div class='add'>+			fb_dealloc_cmap(&amp;info-&gt;cmap);</div><div class='add'>+		framebuffer_release(info);</div><div class='add'>+	}</div><div class='add'>+	drm_fb_helper_fini(&amp;fbdev-&gt;psb_fb_helper);</div><div class='add'>+	drm_framebuffer_cleanup(&amp;psbfb-&gt;base);</div><div class='add'>+</div><div class='add'>+	if (psbfb-&gt;gtt)</div><div class='add'>+		drm_gem_object_unreference(&amp;psbfb-&gt;gtt-&gt;gem);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_fbdev_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct psb_fbdev *fbdev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	fbdev = kzalloc(sizeof(struct psb_fbdev), GFP_KERNEL);</div><div class='add'>+	if (!fbdev) {</div><div class='add'>+		dev_err(dev-&gt;dev, "no memory\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;fbdev = fbdev;</div><div class='add'>+	fbdev-&gt;psb_fb_helper.funcs = &amp;psb_fb_helper_funcs;</div><div class='add'>+</div><div class='add'>+	drm_fb_helper_init(dev, &amp;fbdev-&gt;psb_fb_helper, dev_priv-&gt;ops-&gt;crtcs,</div><div class='add'>+							INTELFB_CONN_LIMIT);</div><div class='add'>+</div><div class='add'>+	drm_fb_helper_single_add_all_connectors(&amp;fbdev-&gt;psb_fb_helper);</div><div class='add'>+	drm_fb_helper_initial_config(&amp;fbdev-&gt;psb_fb_helper, 32);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_fbdev_fini(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (!dev_priv-&gt;fbdev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	psb_fbdev_destroy(dev, dev_priv-&gt;fbdev);</div><div class='add'>+	kfree(dev_priv-&gt;fbdev);</div><div class='add'>+	dev_priv-&gt;fbdev = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psbfb_output_poll_changed(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_fbdev *fbdev = (struct psb_fbdev *)dev_priv-&gt;fbdev;</div><div class='add'>+	drm_fb_helper_hotplug_event(&amp;fbdev-&gt;psb_fb_helper);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_user_framebuffer_create_handle - add hamdle to a framebuffer</div><div class='add'>+ *	@fb: framebuffer</div><div class='add'>+ *	@file_priv: our DRM file</div><div class='add'>+ *	@handle: returned handle</div><div class='add'>+ *</div><div class='add'>+ *	Our framebuffer object is a GTT range which also contains a GEM</div><div class='add'>+ *	object. We need to turn it into a handle for userspace. GEM will do</div><div class='add'>+ *	the work for us</div><div class='add'>+ */</div><div class='add'>+static int psb_user_framebuffer_create_handle(struct drm_framebuffer *fb,</div><div class='add'>+					      struct drm_file *file_priv,</div><div class='add'>+					      unsigned int *handle)</div><div class='add'>+{</div><div class='add'>+	struct psb_framebuffer *psbfb = to_psb_fb(fb);</div><div class='add'>+	struct gtt_range *r = psbfb-&gt;gtt;</div><div class='add'>+	return drm_gem_handle_create(file_priv, &amp;r-&gt;gem, handle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_user_framebuffer_destroy	-	destruct user created fb</div><div class='add'>+ *	@fb: framebuffer</div><div class='add'>+ *</div><div class='add'>+ *	User framebuffers are backed by GEM objects so all we have to do is</div><div class='add'>+ *	clean up a bit and drop the reference, GEM will handle the fallout</div><div class='add'>+ */</div><div class='add'>+static void psb_user_framebuffer_destroy(struct drm_framebuffer *fb)</div><div class='add'>+{</div><div class='add'>+	struct psb_framebuffer *psbfb = to_psb_fb(fb);</div><div class='add'>+	struct gtt_range *r = psbfb-&gt;gtt;</div><div class='add'>+	struct drm_device *dev = fb-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_fbdev *fbdev = dev_priv-&gt;fbdev;</div><div class='add'>+	struct drm_crtc *crtc;</div><div class='add'>+	int reset = 0;</div><div class='add'>+</div><div class='add'>+	/* Should never get stolen memory for a user fb */</div><div class='add'>+	WARN_ON(r-&gt;stolen);</div><div class='add'>+</div><div class='add'>+	/* Check if we are erroneously live */</div><div class='add'>+	list_for_each_entry(crtc, &amp;dev-&gt;mode_config.crtc_list, head)</div><div class='add'>+		if (crtc-&gt;fb == fb)</div><div class='add'>+			reset = 1;</div><div class='add'>+</div><div class='add'>+	if (reset)</div><div class='add'>+		/*</div><div class='add'>+		 * Now force a sane response before we permit the DRM CRTC</div><div class='add'>+		 * layer to do stupid things like blank the display. Instead</div><div class='add'>+		 * we reset this framebuffer as if the user had forced a reset.</div><div class='add'>+		 * We must do this before the cleanup so that the DRM layer</div><div class='add'>+		 * doesn't get a chance to stick its oar in where it isn't</div><div class='add'>+		 * wanted.</div><div class='add'>+		 */</div><div class='add'>+		drm_fb_helper_restore_fbdev_mode(&amp;fbdev-&gt;psb_fb_helper);</div><div class='add'>+</div><div class='add'>+	/* Let DRM do its clean up */</div><div class='add'>+	drm_framebuffer_cleanup(fb);</div><div class='add'>+	/*  We are no longer using the resource in GEM */</div><div class='add'>+	drm_gem_object_unreference_unlocked(&amp;r-&gt;gem);</div><div class='add'>+	kfree(fb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct drm_mode_config_funcs psb_mode_funcs = {</div><div class='add'>+	.fb_create = psb_user_framebuffer_create,</div><div class='add'>+	.output_poll_changed = psbfb_output_poll_changed,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int psb_create_backlight_property(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_property *backlight;</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;backlight_property)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	backlight = drm_property_create(dev, DRM_MODE_PROP_RANGE,</div><div class='add'>+							"backlight", 2);</div><div class='add'>+	backlight-&gt;values[0] = 0;</div><div class='add'>+	backlight-&gt;values[1] = 100;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;backlight_property = backlight;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_setup_outputs(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+</div><div class='add'>+	drm_mode_create_scaling_mode_property(dev);</div><div class='add'>+	psb_create_backlight_property(dev);</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;ops-&gt;output_init(dev);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(connector, &amp;dev-&gt;mode_config.connector_list,</div><div class='add'>+			    head) {</div><div class='add'>+		struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+			psb_intel_attached_encoder(connector);</div><div class='add'>+		struct drm_encoder *encoder = &amp;psb_intel_encoder-&gt;base;</div><div class='add'>+		int crtc_mask = 0, clone_mask = 0;</div><div class='add'>+</div><div class='add'>+		/* valid crtcs */</div><div class='add'>+		switch (psb_intel_encoder-&gt;type) {</div><div class='add'>+		case INTEL_OUTPUT_ANALOG:</div><div class='add'>+			crtc_mask = (1 &lt;&lt; 0);</div><div class='add'>+			clone_mask = (1 &lt;&lt; INTEL_OUTPUT_ANALOG);</div><div class='add'>+			break;</div><div class='add'>+		case INTEL_OUTPUT_SDVO:</div><div class='add'>+			crtc_mask = ((1 &lt;&lt; 0) | (1 &lt;&lt; 1));</div><div class='add'>+			clone_mask = (1 &lt;&lt; INTEL_OUTPUT_SDVO);</div><div class='add'>+			break;</div><div class='add'>+		case INTEL_OUTPUT_LVDS:</div><div class='add'>+			if (IS_MRST(dev))</div><div class='add'>+				crtc_mask = (1 &lt;&lt; 0);</div><div class='add'>+			else</div><div class='add'>+				crtc_mask = (1 &lt;&lt; 1);</div><div class='add'>+			clone_mask = (1 &lt;&lt; INTEL_OUTPUT_LVDS);</div><div class='add'>+			break;</div><div class='add'>+		case INTEL_OUTPUT_MIPI:</div><div class='add'>+			crtc_mask = (1 &lt;&lt; 0);</div><div class='add'>+			clone_mask = (1 &lt;&lt; INTEL_OUTPUT_MIPI);</div><div class='add'>+			break;</div><div class='add'>+		case INTEL_OUTPUT_MIPI2:</div><div class='add'>+			crtc_mask = (1 &lt;&lt; 2);</div><div class='add'>+			clone_mask = (1 &lt;&lt; INTEL_OUTPUT_MIPI2);</div><div class='add'>+			break;</div><div class='add'>+		case INTEL_OUTPUT_HDMI:</div><div class='add'>+			if (IS_MFLD(dev))</div><div class='add'>+				crtc_mask = (1 &lt;&lt; 1);</div><div class='add'>+			else	</div><div class='add'>+				crtc_mask = (1 &lt;&lt; 0);</div><div class='add'>+			clone_mask = (1 &lt;&lt; INTEL_OUTPUT_HDMI);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		encoder-&gt;possible_crtcs = crtc_mask;</div><div class='add'>+		encoder-&gt;possible_clones =</div><div class='add'>+		    psb_intel_connector_clones(dev, clone_mask);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_modeset_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_mode_device *mode_dev = &amp;dev_priv-&gt;mode_dev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	drm_mode_config_init(dev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;mode_config.min_width = 0;</div><div class='add'>+	dev-&gt;mode_config.min_height = 0;</div><div class='add'>+</div><div class='add'>+	dev-&gt;mode_config.funcs = (void *) &amp;psb_mode_funcs;</div><div class='add'>+</div><div class='add'>+	/* set memory base */</div><div class='add'>+	/* Oaktrail and Poulsbo should use BAR 2*/</div><div class='add'>+	pci_read_config_dword(dev-&gt;pdev, PSB_BSM, (u32 *)</div><div class='add'>+					&amp;(dev-&gt;mode_config.fb_base));</div><div class='add'>+</div><div class='add'>+	/* num pipes is 2 for PSB but 1 for Mrst */</div><div class='add'>+	for (i = 0; i &lt; dev_priv-&gt;num_pipe; i++)</div><div class='add'>+		psb_intel_crtc_init(dev, i, mode_dev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;mode_config.max_width = 2048;</div><div class='add'>+	dev-&gt;mode_config.max_height = 2048;</div><div class='add'>+</div><div class='add'>+	psb_setup_outputs(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_modeset_cleanup(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	drm_kms_helper_poll_fini(dev);</div><div class='add'>+	psb_fbdev_fini(dev);</div><div class='add'>+	drm_mode_config_cleanup(dev);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/framebuffer.h b/drivers/gpu/drm/gma500/framebuffer.h<br/>new file mode 100644<br/>index 000000000000..989558a9e6ee<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/framebuffer.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/framebuffer.h</a></div><div class='hunk'>@@ -0,0 +1,47 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2008-2011, Intel Corporation</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *      Eric Anholt &lt;eric@anholt.net&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _FRAMEBUFFER_H_</div><div class='add'>+#define _FRAMEBUFFER_H_</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include &lt;drm/drm_fb_helper.h&gt;</div><div class='add'>+</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+</div><div class='add'>+struct psb_framebuffer {</div><div class='add'>+	struct drm_framebuffer base;</div><div class='add'>+	struct address_space *addr_space;</div><div class='add'>+	struct fb_info *fbdev;</div><div class='add'>+	struct gtt_range *gtt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct psb_fbdev {</div><div class='add'>+	struct drm_fb_helper psb_fb_helper;</div><div class='add'>+	struct psb_framebuffer pfb;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_psb_fb(x) container_of(x, struct psb_framebuffer, base)</div><div class='add'>+</div><div class='add'>+extern int psb_intel_connector_clones(struct drm_device *dev, int type_mask);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c<br/>new file mode 100644<br/>index 000000000000..9fbb86868e2e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/gem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/gem.c</a></div><div class='hunk'>@@ -0,0 +1,292 @@</div><div class='add'>+/*</div><div class='add'>+ *  psb GEM interface</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011, Intel Corporation.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ * Authors: Alan Cox</div><div class='add'>+ *</div><div class='add'>+ * TODO:</div><div class='add'>+ *	-	we need to work out if the MMU is relevant (eg for</div><div class='add'>+ *		accelerated operations on a GEM object)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include &lt;drm/drm.h&gt;</div><div class='add'>+#include "gma_drm.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+</div><div class='add'>+int psb_gem_init_object(struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_gem_free_object(struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	struct gtt_range *gtt = container_of(obj, struct gtt_range, gem);</div><div class='add'>+	drm_gem_object_release_wrap(obj);</div><div class='add'>+	/* This must occur last as it frees up the memory of the GEM object */</div><div class='add'>+	psb_gtt_free_range(obj-&gt;dev, gtt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_gem_get_aperture(struct drm_device *dev, void *data,</div><div class='add'>+				struct drm_file *file)</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'>+ *	psb_gem_dumb_map_gtt	-	buffer mapping for dumb interface</div><div class='add'>+ *	@file: our drm client file</div><div class='add'>+ *	@dev: drm device</div><div class='add'>+ *	@handle: GEM handle to the object (from dumb_create)</div><div class='add'>+ *</div><div class='add'>+ *	Do the necessary setup to allow the mapping of the frame buffer</div><div class='add'>+ *	into user memory. We don't have to do much here at the moment.</div><div class='add'>+ */</div><div class='add'>+int psb_gem_dumb_map_gtt(struct drm_file *file, struct drm_device *dev,</div><div class='add'>+			 uint32_t handle, uint64_t *offset)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+</div><div class='add'>+	if (!(dev-&gt;driver-&gt;driver_features &amp; DRIVER_GEM))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	/* GEM does all our handle to object mapping */</div><div class='add'>+	obj = drm_gem_object_lookup(dev, file, handle);</div><div class='add'>+	if (obj == NULL) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+	/* What validation is needed here ? */</div><div class='add'>+</div><div class='add'>+	/* Make it mmapable */</div><div class='add'>+	if (!obj-&gt;map_list.map) {</div><div class='add'>+		ret = gem_create_mmap_offset(obj);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+	/* GEM should really work out the hash offsets for us */</div><div class='add'>+	*offset = (u64)obj-&gt;map_list.hash.key &lt;&lt; PAGE_SHIFT;</div><div class='add'>+out:</div><div class='add'>+	drm_gem_object_unreference(obj);</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_gem_create		-	create a mappable object</div><div class='add'>+ *	@file: the DRM file of the client</div><div class='add'>+ *	@dev: our device</div><div class='add'>+ *	@size: the size requested</div><div class='add'>+ *	@handlep: returned handle (opaque number)</div><div class='add'>+ *</div><div class='add'>+ *	Create a GEM object, fill in the boilerplate and attach a handle to</div><div class='add'>+ *	it so that userspace can speak about it. This does the core work</div><div class='add'>+ *	for the various methods that do/will create GEM objects for things</div><div class='add'>+ */</div><div class='add'>+static int psb_gem_create(struct drm_file *file,</div><div class='add'>+	struct drm_device *dev, uint64_t size, uint32_t *handlep)</div><div class='add'>+{</div><div class='add'>+	struct gtt_range *r;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 handle;</div><div class='add'>+</div><div class='add'>+	size = roundup(size, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Allocate our object - for now a direct gtt range which is not</div><div class='add'>+	   stolen memory backed */</div><div class='add'>+	r = psb_gtt_alloc_range(dev, size, "gem", 0);</div><div class='add'>+	if (r == NULL) {</div><div class='add'>+		dev_err(dev-&gt;dev, "no memory for %lld byte GEM object\n", size);</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+	/* Initialize the extra goodies GEM needs to do all the hard work */</div><div class='add'>+	if (drm_gem_object_init(dev, &amp;r-&gt;gem, size) != 0) {</div><div class='add'>+		psb_gtt_free_range(dev, r);</div><div class='add'>+		/* GEM doesn't give an error code so use -ENOMEM */</div><div class='add'>+		dev_err(dev-&gt;dev, "GEM init failed for %lld\n", size);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	/* Give the object a handle so we can carry it more easily */</div><div class='add'>+	ret = drm_gem_handle_create(file, &amp;r-&gt;gem, &amp;handle);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;dev, "GEM handle failed for %p, %lld\n",</div><div class='add'>+							&amp;r-&gt;gem, size);</div><div class='add'>+		drm_gem_object_release(&amp;r-&gt;gem);</div><div class='add'>+		psb_gtt_free_range(dev, r);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	/* We have the initial and handle reference but need only one now */</div><div class='add'>+	drm_gem_object_unreference(&amp;r-&gt;gem);</div><div class='add'>+	*handlep = handle;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_gem_dumb_create	-	create a dumb buffer</div><div class='add'>+ *	@drm_file: our client file</div><div class='add'>+ *	@dev: our device</div><div class='add'>+ *	@args: the requested arguments copied from userspace</div><div class='add'>+ *</div><div class='add'>+ *	Allocate a buffer suitable for use for a frame buffer of the</div><div class='add'>+ *	form described by user space. Give userspace a handle by which</div><div class='add'>+ *	to reference it.</div><div class='add'>+ */</div><div class='add'>+int psb_gem_dumb_create(struct drm_file *file, struct drm_device *dev,</div><div class='add'>+			struct drm_mode_create_dumb *args)</div><div class='add'>+{</div><div class='add'>+	args-&gt;pitch = ALIGN(args-&gt;width * ((args-&gt;bpp + 7) / 8), 64);</div><div class='add'>+	args-&gt;size = args-&gt;pitch * args-&gt;height;</div><div class='add'>+	return psb_gem_create(file, dev, args-&gt;size, &amp;args-&gt;handle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_gem_dumb_destroy	-	destroy a dumb buffer</div><div class='add'>+ *	@file: client file</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *	@handle: the object handle</div><div class='add'>+ *</div><div class='add'>+ *	Destroy a handle that was created via psb_gem_dumb_create, at least</div><div class='add'>+ *	we hope it was created that way. i915 seems to assume the caller</div><div class='add'>+ *	does the checking but that might be worth review ! FIXME</div><div class='add'>+ */</div><div class='add'>+int psb_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev,</div><div class='add'>+			uint32_t handle)</div><div class='add'>+{</div><div class='add'>+	/* No special work needed, drop the reference and see what falls out */</div><div class='add'>+	return drm_gem_handle_delete(file, handle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_gem_fault		-	pagefault handler for GEM objects</div><div class='add'>+ *	@vma: the VMA of the GEM object</div><div class='add'>+ *	@vmf: fault detail</div><div class='add'>+ *</div><div class='add'>+ *	Invoked when a fault occurs on an mmap of a GEM managed area. GEM</div><div class='add'>+ *	does most of the work for us including the actual map/unmap calls</div><div class='add'>+ *	but we need to do the actual page work.</div><div class='add'>+ *</div><div class='add'>+ *	This code eventually needs to handle faulting objects in and out</div><div class='add'>+ *	of the GTT and repacking it when we run out of space. We can put</div><div class='add'>+ *	that off for now and for our simple uses</div><div class='add'>+ *</div><div class='add'>+ *	The VMA was set up by GEM. In doing so it also ensured that the</div><div class='add'>+ *	vma-&gt;vm_private_data points to the GEM object that is backing this</div><div class='add'>+ *	mapping.</div><div class='add'>+ */</div><div class='add'>+int psb_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='add'>+{</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	struct gtt_range *r;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned long pfn;</div><div class='add'>+	pgoff_t page_offset;</div><div class='add'>+	struct drm_device *dev;</div><div class='add'>+	struct drm_psb_private *dev_priv;</div><div class='add'>+</div><div class='add'>+	obj = vma-&gt;vm_private_data;	/* GEM object */</div><div class='add'>+	dev = obj-&gt;dev;</div><div class='add'>+	dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	r = container_of(obj, struct gtt_range, gem);	/* Get the gtt range */</div><div class='add'>+</div><div class='add'>+	/* Make sure we don't parallel update on a fault, nor move or remove</div><div class='add'>+	   something from beneath our feet */</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	/* For now the mmap pins the object and it stays pinned. As things</div><div class='add'>+	   stand that will do us no harm */</div><div class='add'>+	if (r-&gt;mmapping == 0) {</div><div class='add'>+		ret = psb_gtt_pin(r);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(dev-&gt;dev, "gma500: pin failed: %d\n", ret);</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+		r-&gt;mmapping = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Page relative to the VMA start - we must calculate this ourselves</div><div class='add'>+	   because vmf-&gt;pgoff is the fake GEM offset */</div><div class='add'>+	page_offset = ((unsigned long) vmf-&gt;virtual_address - vma-&gt;vm_start)</div><div class='add'>+				&gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	/* CPU view of the page, don't go via the GART for CPU writes */</div><div class='add'>+	if (r-&gt;stolen)</div><div class='add'>+		pfn = (dev_priv-&gt;stolen_base + r-&gt;offset) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	else</div><div class='add'>+		pfn = page_to_pfn(r-&gt;pages[page_offset]);</div><div class='add'>+	ret = vm_insert_pfn(vma, (unsigned long)vmf-&gt;virtual_address, pfn);</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	switch (ret) {</div><div class='add'>+	case 0:</div><div class='add'>+	case -ERESTARTSYS:</div><div class='add'>+	case -EINTR:</div><div class='add'>+		return VM_FAULT_NOPAGE;</div><div class='add'>+	case -ENOMEM:</div><div class='add'>+		return VM_FAULT_OOM;</div><div class='add'>+	default:</div><div class='add'>+		return VM_FAULT_SIGBUS;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_gem_create_stolen(struct drm_file *file, struct drm_device *dev,</div><div class='add'>+						int size, u32 *handle)</div><div class='add'>+{</div><div class='add'>+	struct gtt_range *gtt = psb_gtt_alloc_range(dev, size, "gem", 1);</div><div class='add'>+	if (gtt == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	if (drm_gem_private_object_init(dev, &amp;gtt-&gt;gem, size) != 0)</div><div class='add'>+		goto free_gtt;</div><div class='add'>+	if (drm_gem_handle_create(file, &amp;gtt-&gt;gem, handle) == 0)</div><div class='add'>+		return 0;</div><div class='add'>+free_gtt:</div><div class='add'>+	psb_gtt_free_range(dev, gtt);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	GEM interfaces for our specific client</div><div class='add'>+ */</div><div class='add'>+int psb_gem_create_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+					struct drm_file *file)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_gem_create *args = data;</div><div class='add'>+	int ret;</div><div class='add'>+	if (args-&gt;flags &amp; GMA_GEM_CREATE_STOLEN) {</div><div class='add'>+		ret = psb_gem_create_stolen(file, dev, args-&gt;size,</div><div class='add'>+							&amp;args-&gt;handle);</div><div class='add'>+		if (ret == 0)</div><div class='add'>+			return 0;</div><div class='add'>+		/* Fall throguh */</div><div class='add'>+		args-&gt;flags &amp;= ~GMA_GEM_CREATE_STOLEN;</div><div class='add'>+	}</div><div class='add'>+	return psb_gem_create(file, dev, args-&gt;size, &amp;args-&gt;handle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_gem_mmap_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+					struct drm_file *file)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_gem_mmap *args = data;</div><div class='add'>+	return dev-&gt;driver-&gt;dumb_map_offset(file, dev,</div><div class='add'>+						args-&gt;handle, &amp;args-&gt;offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/gem_glue.c b/drivers/gpu/drm/gma500/gem_glue.c<br/>new file mode 100644<br/>index 000000000000..daac12120653<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/gem_glue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/gem_glue.c</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ * Copyright (c) 2011, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include &lt;drm/drm.h&gt;</div><div class='add'>+</div><div class='add'>+void drm_gem_object_release_wrap(struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	/* Remove the list map if one is present */</div><div class='add'>+	if (obj-&gt;map_list.map) {</div><div class='add'>+		struct drm_gem_mm *mm = obj-&gt;dev-&gt;mm_private;</div><div class='add'>+		struct drm_map_list *list = &amp;obj-&gt;map_list;</div><div class='add'>+		drm_ht_remove_item(&amp;mm-&gt;offset_hash, &amp;list-&gt;hash);</div><div class='add'>+		drm_mm_put_block(list-&gt;file_offset_node);</div><div class='add'>+		kfree(list-&gt;map);</div><div class='add'>+		list-&gt;map = NULL;</div><div class='add'>+	}</div><div class='add'>+	drm_gem_object_release(obj);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	gem_create_mmap_offset		-	invent an mmap offset</div><div class='add'>+ *	@obj: our object</div><div class='add'>+ *</div><div class='add'>+ *	Standard implementation of offset generation for mmap as is</div><div class='add'>+ *	duplicated in several drivers. This belongs in GEM.</div><div class='add'>+ */</div><div class='add'>+int gem_create_mmap_offset(struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = obj-&gt;dev;</div><div class='add'>+	struct drm_gem_mm *mm = dev-&gt;mm_private;</div><div class='add'>+	struct drm_map_list *list;</div><div class='add'>+	struct drm_local_map *map;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	list = &amp;obj-&gt;map_list;</div><div class='add'>+	list-&gt;map = kzalloc(sizeof(struct drm_map_list), GFP_KERNEL);</div><div class='add'>+	if (list-&gt;map == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	map = list-&gt;map;</div><div class='add'>+	map-&gt;type = _DRM_GEM;</div><div class='add'>+	map-&gt;size = obj-&gt;size;</div><div class='add'>+	map-&gt;handle = obj;</div><div class='add'>+</div><div class='add'>+	list-&gt;file_offset_node = drm_mm_search_free(&amp;mm-&gt;offset_manager,</div><div class='add'>+					obj-&gt;size / PAGE_SIZE, 0, 0);</div><div class='add'>+	if (!list-&gt;file_offset_node) {</div><div class='add'>+		dev_err(dev-&gt;dev, "failed to allocate offset for bo %d\n",</div><div class='add'>+								obj-&gt;name);</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		goto free_it;</div><div class='add'>+	}</div><div class='add'>+	list-&gt;file_offset_node = drm_mm_get_block(list-&gt;file_offset_node,</div><div class='add'>+					obj-&gt;size / PAGE_SIZE, 0);</div><div class='add'>+	if (!list-&gt;file_offset_node) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto free_it;</div><div class='add'>+	}</div><div class='add'>+	list-&gt;hash.key = list-&gt;file_offset_node-&gt;start;</div><div class='add'>+	ret = drm_ht_insert_item(&amp;mm-&gt;offset_hash, &amp;list-&gt;hash);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;dev, "failed to add to map hash\n");</div><div class='add'>+		goto free_mm;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_mm:</div><div class='add'>+	drm_mm_put_block(list-&gt;file_offset_node);</div><div class='add'>+free_it:</div><div class='add'>+	kfree(list-&gt;map);</div><div class='add'>+	list-&gt;map = NULL;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/gem_glue.h b/drivers/gpu/drm/gma500/gem_glue.h<br/>new file mode 100644<br/>index 000000000000..ce5ce30f74db<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/gem_glue.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/gem_glue.h</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+extern void drm_gem_object_release_wrap(struct drm_gem_object *obj);</div><div class='add'>+extern int gem_create_mmap_offset(struct drm_gem_object *obj);</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/gtt.c b/drivers/gpu/drm/gma500/gtt.c<br/>new file mode 100644<br/>index 000000000000..e770bd190a5c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/gtt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/gtt.c</a></div><div class='hunk'>@@ -0,0 +1,553 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2007, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ * Authors: Thomas Hellstrom &lt;thomas-at-tungstengraphics.com&gt;</div><div class='add'>+ *	    Alan Cox &lt;alan@linux.intel.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	GTT resource allocator - manage page mappings in GTT space</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_gtt_mask_pte	-	generate GTT pte entry</div><div class='add'>+ *	@pfn: page number to encode</div><div class='add'>+ *	@type: type of memory in the GTT</div><div class='add'>+ *</div><div class='add'>+ *	Set the GTT entry for the appropriate memory type.</div><div class='add'>+ */</div><div class='add'>+static inline uint32_t psb_gtt_mask_pte(uint32_t pfn, int type)</div><div class='add'>+{</div><div class='add'>+	uint32_t mask = PSB_PTE_VALID;</div><div class='add'>+</div><div class='add'>+	if (type &amp; PSB_MMU_CACHED_MEMORY)</div><div class='add'>+		mask |= PSB_PTE_CACHED;</div><div class='add'>+	if (type &amp; PSB_MMU_RO_MEMORY)</div><div class='add'>+		mask |= PSB_PTE_RO;</div><div class='add'>+	if (type &amp; PSB_MMU_WO_MEMORY)</div><div class='add'>+		mask |= PSB_PTE_WO;</div><div class='add'>+</div><div class='add'>+	return (pfn &lt;&lt; PAGE_SHIFT) | mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_gtt_entry		-	find the GTT entries for a gtt_range</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *	@r: our GTT range</div><div class='add'>+ *</div><div class='add'>+ *	Given a gtt_range object return the GTT offset of the page table</div><div class='add'>+ *	entries for this gtt_range</div><div class='add'>+ */</div><div class='add'>+u32 *psb_gtt_entry(struct drm_device *dev, struct gtt_range *r)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	unsigned long offset;</div><div class='add'>+</div><div class='add'>+	offset = r-&gt;resource.start - dev_priv-&gt;gtt_mem-&gt;start;</div><div class='add'>+</div><div class='add'>+	return dev_priv-&gt;gtt_map + (offset &gt;&gt; PAGE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_gtt_insert	-	put an object into the GTT</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *	@r: our GTT range</div><div class='add'>+ *</div><div class='add'>+ *	Take our preallocated GTT range and insert the GEM object into</div><div class='add'>+ *	the GTT. This is protected via the gtt mutex which the caller</div><div class='add'>+ *	must hold.</div><div class='add'>+ */</div><div class='add'>+static int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r)</div><div class='add'>+{</div><div class='add'>+	u32 *gtt_slot, pte;</div><div class='add'>+	struct page **pages;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (r-&gt;pages == NULL) {</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'>+	WARN_ON(r-&gt;stolen);	/* refcount these maybe ? */</div><div class='add'>+</div><div class='add'>+	gtt_slot = psb_gtt_entry(dev, r);</div><div class='add'>+	pages = r-&gt;pages;</div><div class='add'>+</div><div class='add'>+	/* Make sure changes are visible to the GPU */</div><div class='add'>+	set_pages_array_uc(pages, r-&gt;npage);</div><div class='add'>+</div><div class='add'>+	/* Write our page entries into the GTT itself */</div><div class='add'>+	for (i = r-&gt;roll; i &lt; r-&gt;npage; i++) {</div><div class='add'>+		pte = psb_gtt_mask_pte(page_to_pfn(r-&gt;pages[i]), 0);</div><div class='add'>+		iowrite32(pte, gtt_slot++);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; r-&gt;roll; i++) {</div><div class='add'>+		pte = psb_gtt_mask_pte(page_to_pfn(r-&gt;pages[i]), 0);</div><div class='add'>+		iowrite32(pte, gtt_slot++);</div><div class='add'>+	}</div><div class='add'>+	/* Make sure all the entries are set before we return */</div><div class='add'>+	ioread32(gtt_slot - 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'>+ *	psb_gtt_remove	-	remove an object from the GTT</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *	@r: our GTT range</div><div class='add'>+ *</div><div class='add'>+ *	Remove a preallocated GTT range from the GTT. Overwrite all the</div><div class='add'>+ *	page table entries with the dummy page. This is protected via the gtt</div><div class='add'>+ *	mutex which the caller must hold.</div><div class='add'>+ */</div><div class='add'>+static void psb_gtt_remove(struct drm_device *dev, struct gtt_range *r)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 *gtt_slot, pte;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	WARN_ON(r-&gt;stolen);</div><div class='add'>+</div><div class='add'>+	gtt_slot = psb_gtt_entry(dev, r);</div><div class='add'>+	pte = psb_gtt_mask_pte(page_to_pfn(dev_priv-&gt;scratch_page), 0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; r-&gt;npage; i++)</div><div class='add'>+		iowrite32(pte, gtt_slot++);</div><div class='add'>+	ioread32(gtt_slot - 1);</div><div class='add'>+	set_pages_array_wb(r-&gt;pages, r-&gt;npage);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_gtt_roll	-	set scrolling position</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *	@r: the gtt mapping we are using</div><div class='add'>+ *	@roll: roll offset</div><div class='add'>+ *</div><div class='add'>+ *	Roll an existing pinned mapping by moving the pages through the GTT.</div><div class='add'>+ *	This allows us to implement hardware scrolling on the consoles without</div><div class='add'>+ *	a 2D engine</div><div class='add'>+ */</div><div class='add'>+void psb_gtt_roll(struct drm_device *dev, struct gtt_range *r, int roll)</div><div class='add'>+{</div><div class='add'>+	u32 *gtt_slot, pte;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (roll &gt;= r-&gt;npage) {</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r-&gt;roll = roll;</div><div class='add'>+</div><div class='add'>+	/* Not currently in the GTT - no worry we will write the mapping at</div><div class='add'>+	   the right position when it gets pinned */</div><div class='add'>+	if (!r-&gt;stolen &amp;&amp; !r-&gt;in_gart)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	gtt_slot = psb_gtt_entry(dev, r);</div><div class='add'>+</div><div class='add'>+	for (i = r-&gt;roll; i &lt; r-&gt;npage; i++) {</div><div class='add'>+		pte = psb_gtt_mask_pte(page_to_pfn(r-&gt;pages[i]), 0);</div><div class='add'>+		iowrite32(pte, gtt_slot++);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; r-&gt;roll; i++) {</div><div class='add'>+		pte = psb_gtt_mask_pte(page_to_pfn(r-&gt;pages[i]), 0);</div><div class='add'>+		iowrite32(pte, gtt_slot++);</div><div class='add'>+	}</div><div class='add'>+	ioread32(gtt_slot - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_gtt_attach_pages	-	attach and pin GEM pages</div><div class='add'>+ *	@gt: the gtt range</div><div class='add'>+ *</div><div class='add'>+ *	Pin and build an in kernel list of the pages that back our GEM object.</div><div class='add'>+ *	While we hold this the pages cannot be swapped out. This is protected</div><div class='add'>+ *	via the gtt mutex which the caller must hold.</div><div class='add'>+ */</div><div class='add'>+static int psb_gtt_attach_pages(struct gtt_range *gt)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode;</div><div class='add'>+	struct address_space *mapping;</div><div class='add'>+	int i;</div><div class='add'>+	struct page *p;</div><div class='add'>+	int pages = gt-&gt;gem.size / PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+	WARN_ON(gt-&gt;pages);</div><div class='add'>+</div><div class='add'>+	/* This is the shared memory object that backs the GEM resource */</div><div class='add'>+	inode = gt-&gt;gem.filp-&gt;f_path.dentry-&gt;d_inode;</div><div class='add'>+	mapping = inode-&gt;i_mapping;</div><div class='add'>+</div><div class='add'>+	gt-&gt;pages = kmalloc(pages * sizeof(struct page *), GFP_KERNEL);</div><div class='add'>+	if (gt-&gt;pages == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	gt-&gt;npage = pages;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pages; i++) {</div><div class='add'>+		/* FIXME: needs updating as per mail from Hugh Dickins */</div><div class='add'>+		p = read_cache_page_gfp(mapping, i,</div><div class='add'>+					__GFP_COLD | GFP_KERNEL);</div><div class='add'>+		if (IS_ERR(p))</div><div class='add'>+			goto err;</div><div class='add'>+		gt-&gt;pages[i] = p;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	while (i--)</div><div class='add'>+		page_cache_release(gt-&gt;pages[i]);</div><div class='add'>+	kfree(gt-&gt;pages);</div><div class='add'>+	gt-&gt;pages = NULL;</div><div class='add'>+	return PTR_ERR(p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_gtt_detach_pages	-	attach and pin GEM pages</div><div class='add'>+ *	@gt: the gtt range</div><div class='add'>+ *</div><div class='add'>+ *	Undo the effect of psb_gtt_attach_pages. At this point the pages</div><div class='add'>+ *	must have been removed from the GTT as they could now be paged out</div><div class='add'>+ *	and move bus address. This is protected via the gtt mutex which the</div><div class='add'>+ *	caller must hold.</div><div class='add'>+ */</div><div class='add'>+static void psb_gtt_detach_pages(struct gtt_range *gt)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; gt-&gt;npage; i++) {</div><div class='add'>+		/* FIXME: do we need to force dirty */</div><div class='add'>+		set_page_dirty(gt-&gt;pages[i]);</div><div class='add'>+		page_cache_release(gt-&gt;pages[i]);</div><div class='add'>+	}</div><div class='add'>+	kfree(gt-&gt;pages);</div><div class='add'>+	gt-&gt;pages = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_gtt_pin		-	pin pages into the GTT</div><div class='add'>+ *	@gt: range to pin</div><div class='add'>+ *</div><div class='add'>+ *	Pin a set of pages into the GTT. The pins are refcounted so that</div><div class='add'>+ *	multiple pins need multiple unpins to undo.</div><div class='add'>+ *</div><div class='add'>+ *	Non GEM backed objects treat this as a no-op as they are always GTT</div><div class='add'>+ *	backed objects.</div><div class='add'>+ */</div><div class='add'>+int psb_gtt_pin(struct gtt_range *gt)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct drm_device *dev = gt-&gt;gem.dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev_priv-&gt;gtt_mutex);</div><div class='add'>+</div><div class='add'>+	if (gt-&gt;in_gart == 0 &amp;&amp; gt-&gt;stolen == 0) {</div><div class='add'>+		ret = psb_gtt_attach_pages(gt);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+		ret = psb_gtt_insert(dev, gt);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			psb_gtt_detach_pages(gt);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	gt-&gt;in_gart++;</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev_priv-&gt;gtt_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_gtt_unpin		-	Drop a GTT pin requirement</div><div class='add'>+ *	@gt: range to pin</div><div class='add'>+ *</div><div class='add'>+ *	Undoes the effect of psb_gtt_pin. On the last drop the GEM object</div><div class='add'>+ *	will be removed from the GTT which will also drop the page references</div><div class='add'>+ *	and allow the VM to clean up or page stuff.</div><div class='add'>+ *</div><div class='add'>+ *	Non GEM backed objects treat this as a no-op as they are always GTT</div><div class='add'>+ *	backed objects.</div><div class='add'>+ */</div><div class='add'>+void psb_gtt_unpin(struct gtt_range *gt)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = gt-&gt;gem.dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev_priv-&gt;gtt_mutex);</div><div class='add'>+</div><div class='add'>+	WARN_ON(!gt-&gt;in_gart);</div><div class='add'>+</div><div class='add'>+	gt-&gt;in_gart--;</div><div class='add'>+	if (gt-&gt;in_gart == 0 &amp;&amp; gt-&gt;stolen == 0) {</div><div class='add'>+		psb_gtt_remove(dev, gt);</div><div class='add'>+		psb_gtt_detach_pages(gt);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;dev_priv-&gt;gtt_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	GTT resource allocator - allocate and manage GTT address space</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_gtt_alloc_range	-	allocate GTT address space</div><div class='add'>+ *	@dev: Our DRM device</div><div class='add'>+ *	@len: length (bytes) of address space required</div><div class='add'>+ *	@name: resource name</div><div class='add'>+ *	@backed: resource should be backed by stolen pages</div><div class='add'>+ *</div><div class='add'>+ *	Ask the kernel core to find us a suitable range of addresses</div><div class='add'>+ *	to use for a GTT mapping.</div><div class='add'>+ *</div><div class='add'>+ *	Returns a gtt_range structure describing the object, or NULL on</div><div class='add'>+ *	error. On successful return the resource is both allocated and marked</div><div class='add'>+ *	as in use.</div><div class='add'>+ */</div><div class='add'>+struct gtt_range *psb_gtt_alloc_range(struct drm_device *dev, int len,</div><div class='add'>+						const char *name, int backed)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct gtt_range *gt;</div><div class='add'>+	struct resource *r = dev_priv-&gt;gtt_mem;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned long start, end;</div><div class='add'>+</div><div class='add'>+	if (backed) {</div><div class='add'>+		/* The start of the GTT is the stolen pages */</div><div class='add'>+		start = r-&gt;start;</div><div class='add'>+		end = r-&gt;start + dev_priv-&gt;gtt.stolen_size - 1;</div><div class='add'>+	} else {</div><div class='add'>+		/* The rest we will use for GEM backed objects */</div><div class='add'>+		start = r-&gt;start + dev_priv-&gt;gtt.stolen_size;</div><div class='add'>+		end = r-&gt;end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gt = kzalloc(sizeof(struct gtt_range), GFP_KERNEL);</div><div class='add'>+	if (gt == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+	gt-&gt;resource.name = name;</div><div class='add'>+	gt-&gt;stolen = backed;</div><div class='add'>+	gt-&gt;in_gart = backed;</div><div class='add'>+	gt-&gt;roll = 0;</div><div class='add'>+	/* Ensure this is set for non GEM objects */</div><div class='add'>+	gt-&gt;gem.dev = dev;</div><div class='add'>+	ret = allocate_resource(dev_priv-&gt;gtt_mem, &amp;gt-&gt;resource,</div><div class='add'>+				len, start, end, PAGE_SIZE, NULL, NULL);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		gt-&gt;offset = gt-&gt;resource.start - r-&gt;start;</div><div class='add'>+		return gt;</div><div class='add'>+	}</div><div class='add'>+	kfree(gt);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_gtt_free_range	-	release GTT address space</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *	@gt: a mapping created with psb_gtt_alloc_range</div><div class='add'>+ *</div><div class='add'>+ *	Release a resource that was allocated with psb_gtt_alloc_range. If the</div><div class='add'>+ *	object has been pinned by mmap users we clean this up here currently.</div><div class='add'>+ */</div><div class='add'>+void psb_gtt_free_range(struct drm_device *dev, struct gtt_range *gt)</div><div class='add'>+{</div><div class='add'>+	/* Undo the mmap pin if we are destroying the object */</div><div class='add'>+	if (gt-&gt;mmapping) {</div><div class='add'>+		psb_gtt_unpin(gt);</div><div class='add'>+		gt-&gt;mmapping = 0;</div><div class='add'>+	}</div><div class='add'>+	WARN_ON(gt-&gt;in_gart &amp;&amp; !gt-&gt;stolen);</div><div class='add'>+	release_resource(&amp;gt-&gt;resource);</div><div class='add'>+	kfree(gt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_gtt_alloc(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	init_rwsem(&amp;dev_priv-&gt;gtt.sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_gtt_takedown(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;gtt_map) {</div><div class='add'>+		iounmap(dev_priv-&gt;gtt_map);</div><div class='add'>+		dev_priv-&gt;gtt_map = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (dev_priv-&gt;gtt_initialized) {</div><div class='add'>+		pci_write_config_word(dev-&gt;pdev, PSB_GMCH_CTRL,</div><div class='add'>+				      dev_priv-&gt;gmch_ctrl);</div><div class='add'>+		PSB_WVDC32(dev_priv-&gt;pge_ctl, PSB_PGETBL_CTL);</div><div class='add'>+		(void) PSB_RVDC32(PSB_PGETBL_CTL);</div><div class='add'>+	}</div><div class='add'>+	if (dev_priv-&gt;vram_addr)</div><div class='add'>+		iounmap(dev_priv-&gt;gtt_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_gtt_init(struct drm_device *dev, int resume)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	unsigned gtt_pages;</div><div class='add'>+	unsigned long stolen_size, vram_stolen_size;</div><div class='add'>+	unsigned i, num_pages;</div><div class='add'>+	unsigned pfn_base;</div><div class='add'>+	uint32_t vram_pages;</div><div class='add'>+	uint32_t dvmt_mode = 0;</div><div class='add'>+	struct psb_gtt *pg;</div><div class='add'>+</div><div class='add'>+	int ret = 0;</div><div class='add'>+	uint32_t pte;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;dev_priv-&gt;gtt_mutex);</div><div class='add'>+</div><div class='add'>+	psb_gtt_alloc(dev);</div><div class='add'>+	pg = &amp;dev_priv-&gt;gtt;</div><div class='add'>+</div><div class='add'>+	/* Enable the GTT */</div><div class='add'>+	pci_read_config_word(dev-&gt;pdev, PSB_GMCH_CTRL, &amp;dev_priv-&gt;gmch_ctrl);</div><div class='add'>+	pci_write_config_word(dev-&gt;pdev, PSB_GMCH_CTRL,</div><div class='add'>+			      dev_priv-&gt;gmch_ctrl | _PSB_GMCH_ENABLED);</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;pge_ctl = PSB_RVDC32(PSB_PGETBL_CTL);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;pge_ctl | _PSB_PGETBL_ENABLED, PSB_PGETBL_CTL);</div><div class='add'>+	(void) PSB_RVDC32(PSB_PGETBL_CTL);</div><div class='add'>+</div><div class='add'>+	/* The root resource we allocate address space from */</div><div class='add'>+	dev_priv-&gt;gtt_initialized = 1;</div><div class='add'>+</div><div class='add'>+	pg-&gt;gtt_phys_start = dev_priv-&gt;pge_ctl &amp; PAGE_MASK;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	The video mmu has a hw bug when accessing 0x0D0000000.</div><div class='add'>+	 *	Make gatt start at 0x0e000,0000. This doesn't actually</div><div class='add'>+	 *	matter for us but may do if the video acceleration ever</div><div class='add'>+	 *	gets opened up.</div><div class='add'>+	 */</div><div class='add'>+	pg-&gt;mmu_gatt_start = 0xE0000000;</div><div class='add'>+</div><div class='add'>+	pg-&gt;gtt_start = pci_resource_start(dev-&gt;pdev, PSB_GTT_RESOURCE);</div><div class='add'>+	gtt_pages = pci_resource_len(dev-&gt;pdev, PSB_GTT_RESOURCE)</div><div class='add'>+								&gt;&gt; PAGE_SHIFT;</div><div class='add'>+	/* Some CDV firmware doesn't report this currently. In which case the</div><div class='add'>+	   system has 64 gtt pages */</div><div class='add'>+	if (pg-&gt;gtt_start == 0 || gtt_pages == 0) {</div><div class='add'>+		dev_err(dev-&gt;dev, "GTT PCI BAR not initialized.\n");</div><div class='add'>+		gtt_pages = 64;</div><div class='add'>+		pg-&gt;gtt_start = dev_priv-&gt;pge_ctl;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pg-&gt;gatt_start = pci_resource_start(dev-&gt;pdev, PSB_GATT_RESOURCE);</div><div class='add'>+	pg-&gt;gatt_pages = pci_resource_len(dev-&gt;pdev, PSB_GATT_RESOURCE)</div><div class='add'>+								&gt;&gt; PAGE_SHIFT;</div><div class='add'>+	dev_priv-&gt;gtt_mem = &amp;dev-&gt;pdev-&gt;resource[PSB_GATT_RESOURCE];</div><div class='add'>+</div><div class='add'>+	if (pg-&gt;gatt_pages == 0 || pg-&gt;gatt_start == 0) {</div><div class='add'>+		static struct resource fudge;	/* Preferably peppermint */</div><div class='add'>+		/* This can occur on CDV SDV systems. Fudge it in this case.</div><div class='add'>+		   We really don't care what imaginary space is being allocated</div><div class='add'>+		   at this point */</div><div class='add'>+		dev_err(dev-&gt;dev, "GATT PCI BAR not initialized.\n");</div><div class='add'>+		pg-&gt;gatt_start = 0x40000000;</div><div class='add'>+		pg-&gt;gatt_pages = (128 * 1024 * 1024) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		/* This is a little confusing but in fact the GTT is providing</div><div class='add'>+		   a view from the GPU into memory and not vice versa. As such</div><div class='add'>+		   this is really allocating space that is not the same as the</div><div class='add'>+		   CPU address space on CDV */</div><div class='add'>+		fudge.start = 0x40000000;</div><div class='add'>+		fudge.end = 0x40000000 + 128 * 1024 * 1024 - 1;</div><div class='add'>+		fudge.name = "fudge";</div><div class='add'>+		fudge.flags = IORESOURCE_MEM;</div><div class='add'>+		dev_priv-&gt;gtt_mem = &amp;fudge;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_read_config_dword(dev-&gt;pdev, PSB_BSM, &amp;dev_priv-&gt;stolen_base);</div><div class='add'>+	vram_stolen_size = pg-&gt;gtt_phys_start - dev_priv-&gt;stolen_base</div><div class='add'>+								- PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+	stolen_size = vram_stolen_size;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Stolen memory information\n");</div><div class='add'>+	printk(KERN_INFO "       base in RAM: 0x%x\n", dev_priv-&gt;stolen_base);</div><div class='add'>+	printk(KERN_INFO "       size: %luK, calculated by (GTT RAM base) - (Stolen base), seems wrong\n",</div><div class='add'>+		vram_stolen_size/1024);</div><div class='add'>+	dvmt_mode = (dev_priv-&gt;gmch_ctrl &gt;&gt; 4) &amp; 0x7;</div><div class='add'>+	printk(KERN_INFO "      the correct size should be: %dM(dvmt mode=%d)\n",</div><div class='add'>+		(dvmt_mode == 1) ? 1 : (2 &lt;&lt; (dvmt_mode - 1)), dvmt_mode);</div><div class='add'>+</div><div class='add'>+	if (resume &amp;&amp; (gtt_pages != pg-&gt;gtt_pages) &amp;&amp;</div><div class='add'>+	    (stolen_size != pg-&gt;stolen_size)) {</div><div class='add'>+		dev_err(dev-&gt;dev, "GTT resume error.\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pg-&gt;gtt_pages = gtt_pages;</div><div class='add'>+	pg-&gt;stolen_size = stolen_size;</div><div class='add'>+	dev_priv-&gt;vram_stolen_size = vram_stolen_size;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	Map the GTT and the stolen memory area</div><div class='add'>+	 */</div><div class='add'>+	dev_priv-&gt;gtt_map = ioremap_nocache(pg-&gt;gtt_phys_start,</div><div class='add'>+						gtt_pages &lt;&lt; PAGE_SHIFT);</div><div class='add'>+	if (!dev_priv-&gt;gtt_map) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Failure to map gtt.\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;vram_addr = ioremap_wc(dev_priv-&gt;stolen_base, stolen_size);</div><div class='add'>+	if (!dev_priv-&gt;vram_addr) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Failure to map stolen base.\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Insert vram stolen pages into the GTT</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	pfn_base = dev_priv-&gt;stolen_base &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	vram_pages = num_pages = vram_stolen_size &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	printk(KERN_INFO"Set up %d stolen pages starting at 0x%08x, GTT offset %dK\n",</div><div class='add'>+		num_pages, pfn_base &lt;&lt; PAGE_SHIFT, 0);</div><div class='add'>+	for (i = 0; i &lt; num_pages; ++i) {</div><div class='add'>+		pte = psb_gtt_mask_pte(pfn_base + i, 0);</div><div class='add'>+		iowrite32(pte, dev_priv-&gt;gtt_map + i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Init rest of GTT to the scratch page to avoid accidents or scribbles</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	pfn_base = page_to_pfn(dev_priv-&gt;scratch_page);</div><div class='add'>+	pte = psb_gtt_mask_pte(pfn_base, 0);</div><div class='add'>+	for (; i &lt; gtt_pages; ++i)</div><div class='add'>+		iowrite32(pte, dev_priv-&gt;gtt_map + i);</div><div class='add'>+</div><div class='add'>+	(void) ioread32(dev_priv-&gt;gtt_map + i - 1);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	psb_gtt_takedown(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/gtt.h b/drivers/gpu/drm/gma500/gtt.h<br/>new file mode 100644<br/>index 000000000000..aa1742387f5a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/gtt.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/gtt.h</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ * Copyright (c) 2007-2008, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef _PSB_GTT_H_</div><div class='add'>+#define _PSB_GTT_H_</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+</div><div class='add'>+/* This wants cleaning up with respect to the psb_dev and un-needed stuff */</div><div class='add'>+struct psb_gtt {</div><div class='add'>+	uint32_t gatt_start;</div><div class='add'>+	uint32_t mmu_gatt_start;</div><div class='add'>+	uint32_t gtt_start;</div><div class='add'>+	uint32_t gtt_phys_start;</div><div class='add'>+	unsigned gtt_pages;</div><div class='add'>+	unsigned gatt_pages;</div><div class='add'>+	unsigned long stolen_size;</div><div class='add'>+	unsigned long vram_stolen_size;</div><div class='add'>+	struct rw_semaphore sem;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Exported functions */</div><div class='add'>+extern int psb_gtt_init(struct drm_device *dev, int resume);</div><div class='add'>+extern void psb_gtt_takedown(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+/* Each gtt_range describes an allocation in the GTT area */</div><div class='add'>+struct gtt_range {</div><div class='add'>+	struct resource resource;	/* Resource for our allocation */</div><div class='add'>+	u32 offset;			/* GTT offset of our object */</div><div class='add'>+	struct drm_gem_object gem;	/* GEM high level stuff */</div><div class='add'>+	int in_gart;			/* Currently in the GART (ref ct) */</div><div class='add'>+	bool stolen;			/* Backed from stolen RAM */</div><div class='add'>+	bool mmapping;			/* Is mmappable */</div><div class='add'>+	struct page **pages;		/* Backing pages if present */</div><div class='add'>+	int npage;			/* Number of backing pages */</div><div class='add'>+	int roll;			/* Roll applied to the GTT entries */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct gtt_range *psb_gtt_alloc_range(struct drm_device *dev, int len,</div><div class='add'>+						const char *name, int backed);</div><div class='add'>+extern void psb_gtt_kref_put(struct gtt_range *gt);</div><div class='add'>+extern void psb_gtt_free_range(struct drm_device *dev, struct gtt_range *gt);</div><div class='add'>+extern int psb_gtt_pin(struct gtt_range *gt);</div><div class='add'>+extern void psb_gtt_unpin(struct gtt_range *gt);</div><div class='add'>+extern void psb_gtt_roll(struct drm_device *dev,</div><div class='add'>+					struct gtt_range *gt, int roll);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/intel_bios.c b/drivers/gpu/drm/gma500/intel_bios.c<br/>new file mode 100644<br/>index 000000000000..d4d0c5b8bf91<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/intel_bios.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/intel_bios.c</a></div><div class='hunk'>@@ -0,0 +1,303 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2006 Intel Corporation</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *    Eric Anholt &lt;eric@anholt.net&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include &lt;drm/drm.h&gt;</div><div class='add'>+#include "gma_drm.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_intel_drv.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include "intel_bios.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void *find_section(struct bdb_header *bdb, int section_id)</div><div class='add'>+{</div><div class='add'>+	u8 *base = (u8 *)bdb;</div><div class='add'>+	int index = 0;</div><div class='add'>+	u16 total, current_size;</div><div class='add'>+	u8 current_id;</div><div class='add'>+</div><div class='add'>+	/* skip to first section */</div><div class='add'>+	index += bdb-&gt;header_size;</div><div class='add'>+	total = bdb-&gt;bdb_size;</div><div class='add'>+</div><div class='add'>+	/* walk the sections looking for section_id */</div><div class='add'>+	while (index &lt; total) {</div><div class='add'>+		current_id = *(base + index);</div><div class='add'>+		index++;</div><div class='add'>+		current_size = *((u16 *)(base + index));</div><div class='add'>+		index += 2;</div><div class='add'>+		if (current_id == section_id)</div><div class='add'>+			return base + index;</div><div class='add'>+		index += current_size;</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 fill_detail_timing_data(struct drm_display_mode *panel_fixed_mode,</div><div class='add'>+			struct lvds_dvo_timing *dvo_timing)</div><div class='add'>+{</div><div class='add'>+	panel_fixed_mode-&gt;hdisplay = (dvo_timing-&gt;hactive_hi &lt;&lt; 8) |</div><div class='add'>+		dvo_timing-&gt;hactive_lo;</div><div class='add'>+	panel_fixed_mode-&gt;hsync_start = panel_fixed_mode-&gt;hdisplay +</div><div class='add'>+		((dvo_timing-&gt;hsync_off_hi &lt;&lt; 8) | dvo_timing-&gt;hsync_off_lo);</div><div class='add'>+	panel_fixed_mode-&gt;hsync_end = panel_fixed_mode-&gt;hsync_start +</div><div class='add'>+		dvo_timing-&gt;hsync_pulse_width;</div><div class='add'>+	panel_fixed_mode-&gt;htotal = panel_fixed_mode-&gt;hdisplay +</div><div class='add'>+		((dvo_timing-&gt;hblank_hi &lt;&lt; 8) | dvo_timing-&gt;hblank_lo);</div><div class='add'>+</div><div class='add'>+	panel_fixed_mode-&gt;vdisplay = (dvo_timing-&gt;vactive_hi &lt;&lt; 8) |</div><div class='add'>+		dvo_timing-&gt;vactive_lo;</div><div class='add'>+	panel_fixed_mode-&gt;vsync_start = panel_fixed_mode-&gt;vdisplay +</div><div class='add'>+		dvo_timing-&gt;vsync_off;</div><div class='add'>+	panel_fixed_mode-&gt;vsync_end = panel_fixed_mode-&gt;vsync_start +</div><div class='add'>+		dvo_timing-&gt;vsync_pulse_width;</div><div class='add'>+	panel_fixed_mode-&gt;vtotal = panel_fixed_mode-&gt;vdisplay +</div><div class='add'>+		((dvo_timing-&gt;vblank_hi &lt;&lt; 8) | dvo_timing-&gt;vblank_lo);</div><div class='add'>+	panel_fixed_mode-&gt;clock = dvo_timing-&gt;clock * 10;</div><div class='add'>+	panel_fixed_mode-&gt;type = DRM_MODE_TYPE_PREFERRED;</div><div class='add'>+</div><div class='add'>+	/* Some VBTs have bogus h/vtotal values */</div><div class='add'>+	if (panel_fixed_mode-&gt;hsync_end &gt; panel_fixed_mode-&gt;htotal)</div><div class='add'>+		panel_fixed_mode-&gt;htotal = panel_fixed_mode-&gt;hsync_end + 1;</div><div class='add'>+	if (panel_fixed_mode-&gt;vsync_end &gt; panel_fixed_mode-&gt;vtotal)</div><div class='add'>+		panel_fixed_mode-&gt;vtotal = panel_fixed_mode-&gt;vsync_end + 1;</div><div class='add'>+</div><div class='add'>+	drm_mode_set_name(panel_fixed_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void parse_backlight_data(struct drm_psb_private *dev_priv,</div><div class='add'>+				struct bdb_header *bdb)</div><div class='add'>+{</div><div class='add'>+	struct bdb_lvds_backlight *vbt_lvds_bl = NULL;</div><div class='add'>+	struct bdb_lvds_backlight *lvds_bl;</div><div class='add'>+	u8 p_type = 0;</div><div class='add'>+	void *bl_start = NULL;</div><div class='add'>+	struct bdb_lvds_options *lvds_opts</div><div class='add'>+				= find_section(bdb, BDB_LVDS_OPTIONS);</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;lvds_bl = NULL;</div><div class='add'>+</div><div class='add'>+	if (lvds_opts)</div><div class='add'>+		p_type = lvds_opts-&gt;panel_type;</div><div class='add'>+	else</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bl_start = find_section(bdb, BDB_LVDS_BACKLIGHT);</div><div class='add'>+	vbt_lvds_bl = (struct bdb_lvds_backlight *)(bl_start + 1) + p_type;</div><div class='add'>+</div><div class='add'>+	lvds_bl = kzalloc(sizeof(*vbt_lvds_bl), GFP_KERNEL);</div><div class='add'>+	if (!lvds_bl) {</div><div class='add'>+		dev_err(dev_priv-&gt;dev-&gt;dev, "out of memory for backlight data\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	memcpy(lvds_bl, vbt_lvds_bl, sizeof(*vbt_lvds_bl));</div><div class='add'>+	dev_priv-&gt;lvds_bl = lvds_bl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Try to find integrated panel data */</div><div class='add'>+static void parse_lfp_panel_data(struct drm_psb_private *dev_priv,</div><div class='add'>+			    struct bdb_header *bdb)</div><div class='add'>+{</div><div class='add'>+	struct bdb_lvds_options *lvds_options;</div><div class='add'>+	struct bdb_lvds_lfp_data *lvds_lfp_data;</div><div class='add'>+	struct bdb_lvds_lfp_data_entry *entry;</div><div class='add'>+	struct lvds_dvo_timing *dvo_timing;</div><div class='add'>+	struct drm_display_mode *panel_fixed_mode;</div><div class='add'>+</div><div class='add'>+	/* Defaults if we can't find VBT info */</div><div class='add'>+	dev_priv-&gt;lvds_dither = 0;</div><div class='add'>+	dev_priv-&gt;lvds_vbt = 0;</div><div class='add'>+</div><div class='add'>+	lvds_options = find_section(bdb, BDB_LVDS_OPTIONS);</div><div class='add'>+	if (!lvds_options)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;lvds_dither = lvds_options-&gt;pixel_dither;</div><div class='add'>+	if (lvds_options-&gt;panel_type == 0xff)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	lvds_lfp_data = find_section(bdb, BDB_LVDS_LFP_DATA);</div><div class='add'>+	if (!lvds_lfp_data)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	entry = &amp;lvds_lfp_data-&gt;data[lvds_options-&gt;panel_type];</div><div class='add'>+	dvo_timing = &amp;entry-&gt;dvo_timing;</div><div class='add'>+</div><div class='add'>+	panel_fixed_mode = kzalloc(sizeof(*panel_fixed_mode),</div><div class='add'>+				      GFP_KERNEL);</div><div class='add'>+	if (panel_fixed_mode == NULL) {</div><div class='add'>+		dev_err(dev_priv-&gt;dev-&gt;dev, "out of memory for fixed panel mode\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;lvds_vbt = 1;</div><div class='add'>+	fill_detail_timing_data(panel_fixed_mode, dvo_timing);</div><div class='add'>+</div><div class='add'>+	if (panel_fixed_mode-&gt;htotal &gt; 0 &amp;&amp; panel_fixed_mode-&gt;vtotal &gt; 0) {</div><div class='add'>+		dev_priv-&gt;lfp_lvds_vbt_mode = panel_fixed_mode;</div><div class='add'>+		drm_mode_debug_printmodeline(panel_fixed_mode);</div><div class='add'>+	} else {</div><div class='add'>+		dev_dbg(dev_priv-&gt;dev-&gt;dev, "ignoring invalid LVDS VBT\n");</div><div class='add'>+		dev_priv-&gt;lvds_vbt = 0;</div><div class='add'>+		kfree(panel_fixed_mode);</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Try to find sdvo panel data */</div><div class='add'>+static void parse_sdvo_panel_data(struct drm_psb_private *dev_priv,</div><div class='add'>+		      struct bdb_header *bdb)</div><div class='add'>+{</div><div class='add'>+	struct bdb_sdvo_lvds_options *sdvo_lvds_options;</div><div class='add'>+	struct lvds_dvo_timing *dvo_timing;</div><div class='add'>+	struct drm_display_mode *panel_fixed_mode;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;sdvo_lvds_vbt_mode = NULL;</div><div class='add'>+</div><div class='add'>+	sdvo_lvds_options = find_section(bdb, BDB_SDVO_LVDS_OPTIONS);</div><div class='add'>+	if (!sdvo_lvds_options)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dvo_timing = find_section(bdb, BDB_SDVO_PANEL_DTDS);</div><div class='add'>+	if (!dvo_timing)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	panel_fixed_mode = kzalloc(sizeof(*panel_fixed_mode), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!panel_fixed_mode)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fill_detail_timing_data(panel_fixed_mode,</div><div class='add'>+			dvo_timing + sdvo_lvds_options-&gt;panel_type);</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;sdvo_lvds_vbt_mode = panel_fixed_mode;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void parse_general_features(struct drm_psb_private *dev_priv,</div><div class='add'>+		       struct bdb_header *bdb)</div><div class='add'>+{</div><div class='add'>+	struct bdb_general_features *general;</div><div class='add'>+</div><div class='add'>+	/* Set sensible defaults in case we can't find the general block */</div><div class='add'>+	dev_priv-&gt;int_tv_support = 1;</div><div class='add'>+	dev_priv-&gt;int_crt_support = 1;</div><div class='add'>+</div><div class='add'>+	general = find_section(bdb, BDB_GENERAL_FEATURES);</div><div class='add'>+	if (general) {</div><div class='add'>+		dev_priv-&gt;int_tv_support = general-&gt;int_tv_support;</div><div class='add'>+		dev_priv-&gt;int_crt_support = general-&gt;int_crt_support;</div><div class='add'>+		dev_priv-&gt;lvds_use_ssc = general-&gt;enable_ssc;</div><div class='add'>+</div><div class='add'>+		if (dev_priv-&gt;lvds_use_ssc) {</div><div class='add'>+			dev_priv-&gt;lvds_ssc_freq</div><div class='add'>+				= general-&gt;ssc_freq ? 100 : 96;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * psb_intel_init_bios - initialize VBIOS settings &amp; find VBT</div><div class='add'>+ * @dev: DRM device</div><div class='add'>+ *</div><div class='add'>+ * Loads the Video BIOS and checks that the VBT exists.  Sets scratch registers</div><div class='add'>+ * to appropriate values.</div><div class='add'>+ *</div><div class='add'>+ * VBT existence is a sanity check that is relied on by other i830_bios.c code.</div><div class='add'>+ * Note that it would be better to use a BIOS call to get the VBT, as BIOSes may</div><div class='add'>+ * feed an updated VBT back through that, compared to what we'll fetch using</div><div class='add'>+ * this method of groping around in the BIOS data.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, nonzero on failure.</div><div class='add'>+ */</div><div class='add'>+bool psb_intel_init_bios(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct pci_dev *pdev = dev-&gt;pdev;</div><div class='add'>+	struct vbt_header *vbt = NULL;</div><div class='add'>+	struct bdb_header *bdb;</div><div class='add'>+	u8 __iomem *bios;</div><div class='add'>+	size_t size;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bios = pci_map_rom(pdev, &amp;size);</div><div class='add'>+	if (!bios)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* Scour memory looking for the VBT signature */</div><div class='add'>+	for (i = 0; i + 4 &lt; size; i++) {</div><div class='add'>+		if (!memcmp(bios + i, "$VBT", 4)) {</div><div class='add'>+			vbt = (struct vbt_header *)(bios + i);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!vbt) {</div><div class='add'>+		dev_err(dev-&gt;dev, "VBT signature missing\n");</div><div class='add'>+		pci_unmap_rom(pdev, bios);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bdb = (struct bdb_header *)(bios + i + vbt-&gt;bdb_offset);</div><div class='add'>+</div><div class='add'>+	/* Grab useful general definitions */</div><div class='add'>+	parse_general_features(dev_priv, bdb);</div><div class='add'>+	parse_lfp_panel_data(dev_priv, bdb);</div><div class='add'>+	parse_sdvo_panel_data(dev_priv, bdb);</div><div class='add'>+	parse_backlight_data(dev_priv, bdb);</div><div class='add'>+</div><div class='add'>+	pci_unmap_rom(pdev, bios);</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'>+ * Destroy and free VBT data</div><div class='add'>+ */</div><div class='add'>+void psb_intel_destroy_bios(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_display_mode *sdvo_lvds_vbt_mode =</div><div class='add'>+				dev_priv-&gt;sdvo_lvds_vbt_mode;</div><div class='add'>+	struct drm_display_mode *lfp_lvds_vbt_mode =</div><div class='add'>+				dev_priv-&gt;lfp_lvds_vbt_mode;</div><div class='add'>+	struct bdb_lvds_backlight *lvds_bl =</div><div class='add'>+				dev_priv-&gt;lvds_bl;</div><div class='add'>+</div><div class='add'>+	/*free sdvo panel mode*/</div><div class='add'>+	if (sdvo_lvds_vbt_mode) {</div><div class='add'>+		dev_priv-&gt;sdvo_lvds_vbt_mode = NULL;</div><div class='add'>+		kfree(sdvo_lvds_vbt_mode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (lfp_lvds_vbt_mode) {</div><div class='add'>+		dev_priv-&gt;lfp_lvds_vbt_mode = NULL;</div><div class='add'>+		kfree(lfp_lvds_vbt_mode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (lvds_bl) {</div><div class='add'>+		dev_priv-&gt;lvds_bl = NULL;</div><div class='add'>+		kfree(lvds_bl);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/intel_bios.h b/drivers/gpu/drm/gma500/intel_bios.h<br/>new file mode 100644<br/>index 000000000000..70f1bf018183<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/intel_bios.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/intel_bios.h</a></div><div class='hunk'>@@ -0,0 +1,430 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2006 Intel Corporation</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *    Eric Anholt &lt;eric@anholt.net&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _I830_BIOS_H_</div><div class='add'>+#define _I830_BIOS_H_</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+</div><div class='add'>+struct vbt_header {</div><div class='add'>+	u8 signature[20];		/**&lt; Always starts with 'VBT$' */</div><div class='add'>+	u16 version;			/**&lt; decimal */</div><div class='add'>+	u16 header_size;		/**&lt; in bytes */</div><div class='add'>+	u16 vbt_size;			/**&lt; in bytes */</div><div class='add'>+	u8 vbt_checksum;</div><div class='add'>+	u8 reserved0;</div><div class='add'>+	u32 bdb_offset;			/**&lt; from beginning of VBT */</div><div class='add'>+	u32 aim_offset[4];		/**&lt; from beginning of VBT */</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct bdb_header {</div><div class='add'>+	u8 signature[16];		/**&lt; Always 'BIOS_DATA_BLOCK' */</div><div class='add'>+	u16 version;			/**&lt; decimal */</div><div class='add'>+	u16 header_size;		/**&lt; in bytes */</div><div class='add'>+	u16 bdb_size;			/**&lt; in bytes */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* strictly speaking, this is a "skip" block, but it has interesting info */</div><div class='add'>+struct vbios_data {</div><div class='add'>+	u8 type; /* 0 == desktop, 1 == mobile */</div><div class='add'>+	u8 relstage;</div><div class='add'>+	u8 chipset;</div><div class='add'>+	u8 lvds_present:1;</div><div class='add'>+	u8 tv_present:1;</div><div class='add'>+	u8 rsvd2:6; /* finish byte */</div><div class='add'>+	u8 rsvd3[4];</div><div class='add'>+	u8 signon[155];</div><div class='add'>+	u8 copyright[61];</div><div class='add'>+	u16 code_segment;</div><div class='add'>+	u8 dos_boot_mode;</div><div class='add'>+	u8 bandwidth_percent;</div><div class='add'>+	u8 rsvd4; /* popup memory size */</div><div class='add'>+	u8 resize_pci_bios;</div><div class='add'>+	u8 rsvd5; /* is crt already on ddc2 */</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * There are several types of BIOS data blocks (BDBs), each block has</div><div class='add'>+ * an ID and size in the first 3 bytes (ID in first, size in next 2).</div><div class='add'>+ * Known types are listed below.</div><div class='add'>+ */</div><div class='add'>+#define BDB_GENERAL_FEATURES	  1</div><div class='add'>+#define BDB_GENERAL_DEFINITIONS	  2</div><div class='add'>+#define BDB_OLD_TOGGLE_LIST	  3</div><div class='add'>+#define BDB_MODE_SUPPORT_LIST	  4</div><div class='add'>+#define BDB_GENERIC_MODE_TABLE	  5</div><div class='add'>+#define BDB_EXT_MMIO_REGS	  6</div><div class='add'>+#define BDB_SWF_IO		  7</div><div class='add'>+#define BDB_SWF_MMIO		  8</div><div class='add'>+#define BDB_DOT_CLOCK_TABLE	  9</div><div class='add'>+#define BDB_MODE_REMOVAL_TABLE	 10</div><div class='add'>+#define BDB_CHILD_DEVICE_TABLE	 11</div><div class='add'>+#define BDB_DRIVER_FEATURES	 12</div><div class='add'>+#define BDB_DRIVER_PERSISTENCE	 13</div><div class='add'>+#define BDB_EXT_TABLE_PTRS	 14</div><div class='add'>+#define BDB_DOT_CLOCK_OVERRIDE	 15</div><div class='add'>+#define BDB_DISPLAY_SELECT	 16</div><div class='add'>+/* 17 rsvd */</div><div class='add'>+#define BDB_DRIVER_ROTATION	 18</div><div class='add'>+#define BDB_DISPLAY_REMOVE	 19</div><div class='add'>+#define BDB_OEM_CUSTOM		 20</div><div class='add'>+#define BDB_EFP_LIST		 21 /* workarounds for VGA hsync/vsync */</div><div class='add'>+#define BDB_SDVO_LVDS_OPTIONS	 22</div><div class='add'>+#define BDB_SDVO_PANEL_DTDS	 23</div><div class='add'>+#define BDB_SDVO_LVDS_PNP_IDS	 24</div><div class='add'>+#define BDB_SDVO_LVDS_POWER_SEQ	 25</div><div class='add'>+#define BDB_TV_OPTIONS		 26</div><div class='add'>+#define BDB_LVDS_OPTIONS	 40</div><div class='add'>+#define BDB_LVDS_LFP_DATA_PTRS	 41</div><div class='add'>+#define BDB_LVDS_LFP_DATA	 42</div><div class='add'>+#define BDB_LVDS_BACKLIGHT	 43</div><div class='add'>+#define BDB_LVDS_POWER		 44</div><div class='add'>+#define BDB_SKIP		254 /* VBIOS private block, ignore */</div><div class='add'>+</div><div class='add'>+struct bdb_general_features {</div><div class='add'>+	/* bits 1 */</div><div class='add'>+	u8 panel_fitting:2;</div><div class='add'>+	u8 flexaim:1;</div><div class='add'>+	u8 msg_enable:1;</div><div class='add'>+	u8 clear_screen:3;</div><div class='add'>+	u8 color_flip:1;</div><div class='add'>+</div><div class='add'>+	/* bits 2 */</div><div class='add'>+	u8 download_ext_vbt:1;</div><div class='add'>+	u8 enable_ssc:1;</div><div class='add'>+	u8 ssc_freq:1;</div><div class='add'>+	u8 enable_lfp_on_override:1;</div><div class='add'>+	u8 disable_ssc_ddt:1;</div><div class='add'>+	u8 rsvd8:3; /* finish byte */</div><div class='add'>+</div><div class='add'>+	/* bits 3 */</div><div class='add'>+	u8 disable_smooth_vision:1;</div><div class='add'>+	u8 single_dvi:1;</div><div class='add'>+	u8 rsvd9:6; /* finish byte */</div><div class='add'>+</div><div class='add'>+	/* bits 4 */</div><div class='add'>+	u8 legacy_monitor_detect;</div><div class='add'>+</div><div class='add'>+	/* bits 5 */</div><div class='add'>+	u8 int_crt_support:1;</div><div class='add'>+	u8 int_tv_support:1;</div><div class='add'>+	u8 rsvd11:6; /* finish byte */</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct bdb_general_definitions {</div><div class='add'>+	/* DDC GPIO */</div><div class='add'>+	u8 crt_ddc_gmbus_pin;</div><div class='add'>+</div><div class='add'>+	/* DPMS bits */</div><div class='add'>+	u8 dpms_acpi:1;</div><div class='add'>+	u8 skip_boot_crt_detect:1;</div><div class='add'>+	u8 dpms_aim:1;</div><div class='add'>+	u8 rsvd1:5; /* finish byte */</div><div class='add'>+</div><div class='add'>+	/* boot device bits */</div><div class='add'>+	u8 boot_display[2];</div><div class='add'>+	u8 child_dev_size;</div><div class='add'>+</div><div class='add'>+	/* device info */</div><div class='add'>+	u8 tv_or_lvds_info[33];</div><div class='add'>+	u8 dev1[33];</div><div class='add'>+	u8 dev2[33];</div><div class='add'>+	u8 dev3[33];</div><div class='add'>+	u8 dev4[33];</div><div class='add'>+	/* may be another device block here on some platforms */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bdb_lvds_options {</div><div class='add'>+	u8 panel_type;</div><div class='add'>+	u8 rsvd1;</div><div class='add'>+	/* LVDS capabilities, stored in a dword */</div><div class='add'>+	u8 pfit_mode:2;</div><div class='add'>+	u8 pfit_text_mode_enhanced:1;</div><div class='add'>+	u8 pfit_gfx_mode_enhanced:1;</div><div class='add'>+	u8 pfit_ratio_auto:1;</div><div class='add'>+	u8 pixel_dither:1;</div><div class='add'>+	u8 lvds_edid:1;</div><div class='add'>+	u8 rsvd2:1;</div><div class='add'>+	u8 rsvd4;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct bdb_lvds_backlight {</div><div class='add'>+	u8 type:2;</div><div class='add'>+	u8 pol:1;</div><div class='add'>+	u8 gpio:3;</div><div class='add'>+	u8 gmbus:2;</div><div class='add'>+	u16 freq;</div><div class='add'>+	u8 minbrightness;</div><div class='add'>+	u8 i2caddr;</div><div class='add'>+	u8 brightnesscmd;</div><div class='add'>+	/*FIXME: more...*/</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/* LFP pointer table contains entries to the struct below */</div><div class='add'>+struct bdb_lvds_lfp_data_ptr {</div><div class='add'>+	u16 fp_timing_offset; /* offsets are from start of bdb */</div><div class='add'>+	u8 fp_table_size;</div><div class='add'>+	u16 dvo_timing_offset;</div><div class='add'>+	u8 dvo_table_size;</div><div class='add'>+	u16 panel_pnp_id_offset;</div><div class='add'>+	u8 pnp_table_size;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct bdb_lvds_lfp_data_ptrs {</div><div class='add'>+	u8 lvds_entries; /* followed by one or more lvds_data_ptr structs */</div><div class='add'>+	struct bdb_lvds_lfp_data_ptr ptr[16];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/* LFP data has 3 blocks per entry */</div><div class='add'>+struct lvds_fp_timing {</div><div class='add'>+	u16 x_res;</div><div class='add'>+	u16 y_res;</div><div class='add'>+	u32 lvds_reg;</div><div class='add'>+	u32 lvds_reg_val;</div><div class='add'>+	u32 pp_on_reg;</div><div class='add'>+	u32 pp_on_reg_val;</div><div class='add'>+	u32 pp_off_reg;</div><div class='add'>+	u32 pp_off_reg_val;</div><div class='add'>+	u32 pp_cycle_reg;</div><div class='add'>+	u32 pp_cycle_reg_val;</div><div class='add'>+	u32 pfit_reg;</div><div class='add'>+	u32 pfit_reg_val;</div><div class='add'>+	u16 terminator;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct lvds_dvo_timing {</div><div class='add'>+	u16 clock;		/**&lt; In 10khz */</div><div class='add'>+	u8 hactive_lo;</div><div class='add'>+	u8 hblank_lo;</div><div class='add'>+	u8 hblank_hi:4;</div><div class='add'>+	u8 hactive_hi:4;</div><div class='add'>+	u8 vactive_lo;</div><div class='add'>+	u8 vblank_lo;</div><div class='add'>+	u8 vblank_hi:4;</div><div class='add'>+	u8 vactive_hi:4;</div><div class='add'>+	u8 hsync_off_lo;</div><div class='add'>+	u8 hsync_pulse_width;</div><div class='add'>+	u8 vsync_pulse_width:4;</div><div class='add'>+	u8 vsync_off:4;</div><div class='add'>+	u8 rsvd0:6;</div><div class='add'>+	u8 hsync_off_hi:2;</div><div class='add'>+	u8 h_image;</div><div class='add'>+	u8 v_image;</div><div class='add'>+	u8 max_hv;</div><div class='add'>+	u8 h_border;</div><div class='add'>+	u8 v_border;</div><div class='add'>+	u8 rsvd1:3;</div><div class='add'>+	u8 digital:2;</div><div class='add'>+	u8 vsync_positive:1;</div><div class='add'>+	u8 hsync_positive:1;</div><div class='add'>+	u8 rsvd2:1;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct lvds_pnp_id {</div><div class='add'>+	u16 mfg_name;</div><div class='add'>+	u16 product_code;</div><div class='add'>+	u32 serial;</div><div class='add'>+	u8 mfg_week;</div><div class='add'>+	u8 mfg_year;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct bdb_lvds_lfp_data_entry {</div><div class='add'>+	struct lvds_fp_timing fp_timing;</div><div class='add'>+	struct lvds_dvo_timing dvo_timing;</div><div class='add'>+	struct lvds_pnp_id pnp_id;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct bdb_lvds_lfp_data {</div><div class='add'>+	struct bdb_lvds_lfp_data_entry data[16];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct aimdb_header {</div><div class='add'>+	char signature[16];</div><div class='add'>+	char oem_device[20];</div><div class='add'>+	u16 aimdb_version;</div><div class='add'>+	u16 aimdb_header_size;</div><div class='add'>+	u16 aimdb_size;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct aimdb_block {</div><div class='add'>+	u8 aimdb_id;</div><div class='add'>+	u16 aimdb_size;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct vch_panel_data {</div><div class='add'>+	u16 fp_timing_offset;</div><div class='add'>+	u8 fp_timing_size;</div><div class='add'>+	u16 dvo_timing_offset;</div><div class='add'>+	u8 dvo_timing_size;</div><div class='add'>+	u16 text_fitting_offset;</div><div class='add'>+	u8 text_fitting_size;</div><div class='add'>+	u16 graphics_fitting_offset;</div><div class='add'>+	u8 graphics_fitting_size;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct vch_bdb_22 {</div><div class='add'>+	struct aimdb_block aimdb_block;</div><div class='add'>+	struct vch_panel_data panels[16];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct bdb_sdvo_lvds_options {</div><div class='add'>+	u8 panel_backlight;</div><div class='add'>+	u8 h40_set_panel_type;</div><div class='add'>+	u8 panel_type;</div><div class='add'>+	u8 ssc_clk_freq;</div><div class='add'>+	u16 als_low_trip;</div><div class='add'>+	u16 als_high_trip;</div><div class='add'>+	u8 sclalarcoeff_tab_row_num;</div><div class='add'>+	u8 sclalarcoeff_tab_row_size;</div><div class='add'>+	u8 coefficient[8];</div><div class='add'>+	u8 panel_misc_bits_1;</div><div class='add'>+	u8 panel_misc_bits_2;</div><div class='add'>+	u8 panel_misc_bits_3;</div><div class='add'>+	u8 panel_misc_bits_4;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+extern bool psb_intel_init_bios(struct drm_device *dev);</div><div class='add'>+extern void psb_intel_destroy_bios(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Driver&lt;-&gt;VBIOS interaction occurs through scratch bits in</div><div class='add'>+ * GR18 &amp; SWF*.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* GR18 bits are set on display switch and hotkey events */</div><div class='add'>+#define GR18_DRIVER_SWITCH_EN	(1&lt;&lt;7) /* 0: VBIOS control, 1: driver control */</div><div class='add'>+#define GR18_HOTKEY_MASK	0x78 /* See also SWF4 15:0 */</div><div class='add'>+#define   GR18_HK_NONE		(0x0&lt;&lt;3)</div><div class='add'>+#define   GR18_HK_LFP_STRETCH	(0x1&lt;&lt;3)</div><div class='add'>+#define   GR18_HK_TOGGLE_DISP	(0x2&lt;&lt;3)</div><div class='add'>+#define   GR18_HK_DISP_SWITCH	(0x4&lt;&lt;3) /* see SWF14 15:0 for what to enable */</div><div class='add'>+#define   GR18_HK_POPUP_DISABLED (0x6&lt;&lt;3)</div><div class='add'>+#define   GR18_HK_POPUP_ENABLED	(0x7&lt;&lt;3)</div><div class='add'>+#define   GR18_HK_PFIT		(0x8&lt;&lt;3)</div><div class='add'>+#define   GR18_HK_APM_CHANGE	(0xa&lt;&lt;3)</div><div class='add'>+#define   GR18_HK_MULTIPLE	(0xc&lt;&lt;3)</div><div class='add'>+#define GR18_USER_INT_EN	(1&lt;&lt;2)</div><div class='add'>+#define GR18_A0000_FLUSH_EN	(1&lt;&lt;1)</div><div class='add'>+#define GR18_SMM_EN		(1&lt;&lt;0)</div><div class='add'>+</div><div class='add'>+/* Set by driver, cleared by VBIOS */</div><div class='add'>+#define SWF00_YRES_SHIFT	16</div><div class='add'>+#define SWF00_XRES_SHIFT	0</div><div class='add'>+#define SWF00_RES_MASK		0xffff</div><div class='add'>+</div><div class='add'>+/* Set by VBIOS at boot time and driver at runtime */</div><div class='add'>+#define SWF01_TV2_FORMAT_SHIFT	8</div><div class='add'>+#define SWF01_TV1_FORMAT_SHIFT	0</div><div class='add'>+#define SWF01_TV_FORMAT_MASK	0xffff</div><div class='add'>+</div><div class='add'>+#define SWF10_VBIOS_BLC_I2C_EN	(1&lt;&lt;29)</div><div class='add'>+#define SWF10_GTT_OVERRIDE_EN	(1&lt;&lt;28)</div><div class='add'>+#define SWF10_LFP_DPMS_OVR	(1&lt;&lt;27) /* override DPMS on display switch */</div><div class='add'>+#define SWF10_ACTIVE_TOGGLE_LIST_MASK (7&lt;&lt;24)</div><div class='add'>+#define   SWF10_OLD_TOGGLE	0x0</div><div class='add'>+#define   SWF10_TOGGLE_LIST_1	0x1</div><div class='add'>+#define   SWF10_TOGGLE_LIST_2	0x2</div><div class='add'>+#define   SWF10_TOGGLE_LIST_3	0x3</div><div class='add'>+#define   SWF10_TOGGLE_LIST_4	0x4</div><div class='add'>+#define SWF10_PANNING_EN	(1&lt;&lt;23)</div><div class='add'>+#define SWF10_DRIVER_LOADED	(1&lt;&lt;22)</div><div class='add'>+#define SWF10_EXTENDED_DESKTOP	(1&lt;&lt;21)</div><div class='add'>+#define SWF10_EXCLUSIVE_MODE	(1&lt;&lt;20)</div><div class='add'>+#define SWF10_OVERLAY_EN	(1&lt;&lt;19)</div><div class='add'>+#define SWF10_PLANEB_HOLDOFF	(1&lt;&lt;18)</div><div class='add'>+#define SWF10_PLANEA_HOLDOFF	(1&lt;&lt;17)</div><div class='add'>+#define SWF10_VGA_HOLDOFF	(1&lt;&lt;16)</div><div class='add'>+#define SWF10_ACTIVE_DISP_MASK	0xffff</div><div class='add'>+#define   SWF10_PIPEB_LFP2	(1&lt;&lt;15)</div><div class='add'>+#define   SWF10_PIPEB_EFP2	(1&lt;&lt;14)</div><div class='add'>+#define   SWF10_PIPEB_TV2	(1&lt;&lt;13)</div><div class='add'>+#define   SWF10_PIPEB_CRT2	(1&lt;&lt;12)</div><div class='add'>+#define   SWF10_PIPEB_LFP	(1&lt;&lt;11)</div><div class='add'>+#define   SWF10_PIPEB_EFP	(1&lt;&lt;10)</div><div class='add'>+#define   SWF10_PIPEB_TV	(1&lt;&lt;9)</div><div class='add'>+#define   SWF10_PIPEB_CRT	(1&lt;&lt;8)</div><div class='add'>+#define   SWF10_PIPEA_LFP2	(1&lt;&lt;7)</div><div class='add'>+#define   SWF10_PIPEA_EFP2	(1&lt;&lt;6)</div><div class='add'>+#define   SWF10_PIPEA_TV2	(1&lt;&lt;5)</div><div class='add'>+#define   SWF10_PIPEA_CRT2	(1&lt;&lt;4)</div><div class='add'>+#define   SWF10_PIPEA_LFP	(1&lt;&lt;3)</div><div class='add'>+#define   SWF10_PIPEA_EFP	(1&lt;&lt;2)</div><div class='add'>+#define   SWF10_PIPEA_TV	(1&lt;&lt;1)</div><div class='add'>+#define   SWF10_PIPEA_CRT	(1&lt;&lt;0)</div><div class='add'>+</div><div class='add'>+#define SWF11_MEMORY_SIZE_SHIFT	16</div><div class='add'>+#define SWF11_SV_TEST_EN	(1&lt;&lt;15)</div><div class='add'>+#define SWF11_IS_AGP		(1&lt;&lt;14)</div><div class='add'>+#define SWF11_DISPLAY_HOLDOFF	(1&lt;&lt;13)</div><div class='add'>+#define SWF11_DPMS_REDUCED	(1&lt;&lt;12)</div><div class='add'>+#define SWF11_IS_VBE_MODE	(1&lt;&lt;11)</div><div class='add'>+#define SWF11_PIPEB_ACCESS	(1&lt;&lt;10) /* 0 here means pipe a */</div><div class='add'>+#define SWF11_DPMS_MASK		0x07</div><div class='add'>+#define   SWF11_DPMS_OFF	(1&lt;&lt;2)</div><div class='add'>+#define   SWF11_DPMS_SUSPEND	(1&lt;&lt;1)</div><div class='add'>+#define   SWF11_DPMS_STANDBY	(1&lt;&lt;0)</div><div class='add'>+#define   SWF11_DPMS_ON		0</div><div class='add'>+</div><div class='add'>+#define SWF14_GFX_PFIT_EN	(1&lt;&lt;31)</div><div class='add'>+#define SWF14_TEXT_PFIT_EN	(1&lt;&lt;30)</div><div class='add'>+#define SWF14_LID_STATUS_CLOSED	(1&lt;&lt;29) /* 0 here means open */</div><div class='add'>+#define SWF14_POPUP_EN		(1&lt;&lt;28)</div><div class='add'>+#define SWF14_DISPLAY_HOLDOFF	(1&lt;&lt;27)</div><div class='add'>+#define SWF14_DISP_DETECT_EN	(1&lt;&lt;26)</div><div class='add'>+#define SWF14_DOCKING_STATUS_DOCKED (1&lt;&lt;25) /* 0 here means undocked */</div><div class='add'>+#define SWF14_DRIVER_STATUS	(1&lt;&lt;24)</div><div class='add'>+#define SWF14_OS_TYPE_WIN9X	(1&lt;&lt;23)</div><div class='add'>+#define SWF14_OS_TYPE_WINNT	(1&lt;&lt;22)</div><div class='add'>+/* 21:19 rsvd */</div><div class='add'>+#define SWF14_PM_TYPE_MASK	0x00070000</div><div class='add'>+#define   SWF14_PM_ACPI_VIDEO	(0x4 &lt;&lt; 16)</div><div class='add'>+#define   SWF14_PM_ACPI		(0x3 &lt;&lt; 16)</div><div class='add'>+#define   SWF14_PM_APM_12	(0x2 &lt;&lt; 16)</div><div class='add'>+#define   SWF14_PM_APM_11	(0x1 &lt;&lt; 16)</div><div class='add'>+#define SWF14_HK_REQUEST_MASK	0x0000ffff /* see GR18 6:3 for event type */</div><div class='add'>+	  /* if GR18 indicates a display switch */</div><div class='add'>+#define   SWF14_DS_PIPEB_LFP2_EN (1&lt;&lt;15)</div><div class='add'>+#define   SWF14_DS_PIPEB_EFP2_EN (1&lt;&lt;14)</div><div class='add'>+#define   SWF14_DS_PIPEB_TV2_EN  (1&lt;&lt;13)</div><div class='add'>+#define   SWF14_DS_PIPEB_CRT2_EN (1&lt;&lt;12)</div><div class='add'>+#define   SWF14_DS_PIPEB_LFP_EN  (1&lt;&lt;11)</div><div class='add'>+#define   SWF14_DS_PIPEB_EFP_EN  (1&lt;&lt;10)</div><div class='add'>+#define   SWF14_DS_PIPEB_TV_EN	 (1&lt;&lt;9)</div><div class='add'>+#define   SWF14_DS_PIPEB_CRT_EN  (1&lt;&lt;8)</div><div class='add'>+#define   SWF14_DS_PIPEA_LFP2_EN (1&lt;&lt;7)</div><div class='add'>+#define   SWF14_DS_PIPEA_EFP2_EN (1&lt;&lt;6)</div><div class='add'>+#define   SWF14_DS_PIPEA_TV2_EN  (1&lt;&lt;5)</div><div class='add'>+#define   SWF14_DS_PIPEA_CRT2_EN (1&lt;&lt;4)</div><div class='add'>+#define   SWF14_DS_PIPEA_LFP_EN  (1&lt;&lt;3)</div><div class='add'>+#define   SWF14_DS_PIPEA_EFP_EN  (1&lt;&lt;2)</div><div class='add'>+#define   SWF14_DS_PIPEA_TV_EN	 (1&lt;&lt;1)</div><div class='add'>+#define   SWF14_DS_PIPEA_CRT_EN  (1&lt;&lt;0)</div><div class='add'>+	  /* if GR18 indicates a panel fitting request */</div><div class='add'>+#define   SWF14_PFIT_EN		(1&lt;&lt;0) /* 0 means disable */</div><div class='add'>+	  /* if GR18 indicates an APM change request */</div><div class='add'>+#define   SWF14_APM_HIBERNATE	0x4</div><div class='add'>+#define   SWF14_APM_SUSPEND	0x3</div><div class='add'>+#define   SWF14_APM_STANDBY	0x1</div><div class='add'>+#define   SWF14_APM_RESTORE	0x0</div><div class='add'>+</div><div class='add'>+#endif /* _I830_BIOS_H_ */</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/intel_gmbus.c b/drivers/gpu/drm/gma500/intel_gmbus.c<br/>new file mode 100644<br/>index 000000000000..147584ac8d02<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/intel_gmbus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/intel_gmbus.c</a></div><div class='hunk'>@@ -0,0 +1,493 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2006 Dave Airlie &lt;airlied@linux.ie&gt;</div><div class='add'>+ * Copyright © 2006-2008,2010 Intel Corporation</div><div class='add'>+ *   Jesse Barnes &lt;jesse.barnes@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='add'>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER</div><div class='add'>+ * DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Eric Anholt &lt;eric@anholt.net&gt;</div><div class='add'>+ *	Chris Wilson &lt;chris@chris-wilson.co.uk&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/i2c-algo-bit.h&gt;</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "drm.h"</div><div class='add'>+#include "psb_intel_drv.h"</div><div class='add'>+#include "gma_drm.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+</div><div class='add'>+#define _wait_for(COND, MS, W) ({ \</div><div class='add'>+	unsigned long timeout__ = jiffies + msecs_to_jiffies(MS);	\</div><div class='add'>+	int ret__ = 0;							\</div><div class='add'>+	while (! (COND)) {						\</div><div class='add'>+		if (time_after(jiffies, timeout__)) {			\</div><div class='add'>+			ret__ = -ETIMEDOUT;				\</div><div class='add'>+			break;						\</div><div class='add'>+		}							\</div><div class='add'>+		if (W &amp;&amp; !(in_atomic() || in_dbg_master())) msleep(W);	\</div><div class='add'>+	}								\</div><div class='add'>+	ret__;								\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define wait_for(COND, MS) _wait_for(COND, MS, 1)</div><div class='add'>+#define wait_for_atomic(COND, MS) _wait_for(COND, MS, 0)</div><div class='add'>+</div><div class='add'>+/* Intel GPIO access functions */</div><div class='add'>+</div><div class='add'>+#define I2C_RISEFALL_TIME 20</div><div class='add'>+</div><div class='add'>+static inline struct intel_gmbus *</div><div class='add'>+to_intel_gmbus(struct i2c_adapter *i2c)</div><div class='add'>+{</div><div class='add'>+	return container_of(i2c, struct intel_gmbus, adapter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct intel_gpio {</div><div class='add'>+	struct i2c_adapter adapter;</div><div class='add'>+	struct i2c_algo_bit_data algo;</div><div class='add'>+	struct drm_psb_private *dev_priv;</div><div class='add'>+	u32 reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+gma_intel_i2c_reset(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	REG_WRITE(GMBUS0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void intel_i2c_quirk_set(struct drm_psb_private *dev_priv, bool enable)</div><div class='add'>+{</div><div class='add'>+	/* When using bit bashing for I2C, this bit needs to be set to 1 */</div><div class='add'>+	/* FIXME: We are never Pineview, right?</div><div class='add'>+</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (!IS_PINEVIEW(dev_priv-&gt;dev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	val = REG_READ(DSPCLK_GATE_D);</div><div class='add'>+	if (enable)</div><div class='add'>+		val |= DPCUNIT_CLOCK_GATE_DISABLE;</div><div class='add'>+	else</div><div class='add'>+		val &amp;= ~DPCUNIT_CLOCK_GATE_DISABLE;</div><div class='add'>+	REG_WRITE(DSPCLK_GATE_D, val);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+	*/</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 get_reserved(struct intel_gpio *gpio)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = gpio-&gt;dev_priv;</div><div class='add'>+	struct drm_device *dev = dev_priv-&gt;dev;</div><div class='add'>+	u32 reserved = 0;</div><div class='add'>+</div><div class='add'>+	/* On most chips, these bits must be preserved in software. */</div><div class='add'>+	reserved = REG_READ(gpio-&gt;reg) &amp;</div><div class='add'>+				     (GPIO_DATA_PULLUP_DISABLE |</div><div class='add'>+				      GPIO_CLOCK_PULLUP_DISABLE);</div><div class='add'>+</div><div class='add'>+	return reserved;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_clock(void *data)</div><div class='add'>+{</div><div class='add'>+	struct intel_gpio *gpio = data;</div><div class='add'>+	struct drm_psb_private *dev_priv = gpio-&gt;dev_priv;</div><div class='add'>+	struct drm_device *dev = dev_priv-&gt;dev;</div><div class='add'>+	u32 reserved = get_reserved(gpio);</div><div class='add'>+	REG_WRITE(gpio-&gt;reg, reserved | GPIO_CLOCK_DIR_MASK);</div><div class='add'>+	REG_WRITE(gpio-&gt;reg, reserved);</div><div class='add'>+	return (REG_READ(gpio-&gt;reg) &amp; GPIO_CLOCK_VAL_IN) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_data(void *data)</div><div class='add'>+{</div><div class='add'>+	struct intel_gpio *gpio = data;</div><div class='add'>+	struct drm_psb_private *dev_priv = gpio-&gt;dev_priv;</div><div class='add'>+	struct drm_device *dev = dev_priv-&gt;dev;</div><div class='add'>+	u32 reserved = get_reserved(gpio);</div><div class='add'>+	REG_WRITE(gpio-&gt;reg, reserved | GPIO_DATA_DIR_MASK);</div><div class='add'>+	REG_WRITE(gpio-&gt;reg, reserved);</div><div class='add'>+	return (REG_READ(gpio-&gt;reg) &amp; GPIO_DATA_VAL_IN) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_clock(void *data, int state_high)</div><div class='add'>+{</div><div class='add'>+	struct intel_gpio *gpio = data;</div><div class='add'>+	struct drm_psb_private *dev_priv = gpio-&gt;dev_priv;</div><div class='add'>+	struct drm_device *dev = dev_priv-&gt;dev;</div><div class='add'>+	u32 reserved = get_reserved(gpio);</div><div class='add'>+	u32 clock_bits;</div><div class='add'>+</div><div class='add'>+	if (state_high)</div><div class='add'>+		clock_bits = GPIO_CLOCK_DIR_IN | GPIO_CLOCK_DIR_MASK;</div><div class='add'>+	else</div><div class='add'>+		clock_bits = GPIO_CLOCK_DIR_OUT | GPIO_CLOCK_DIR_MASK |</div><div class='add'>+			GPIO_CLOCK_VAL_MASK;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(gpio-&gt;reg, reserved | clock_bits);</div><div class='add'>+	REG_READ(gpio-&gt;reg); /* Posting */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_data(void *data, int state_high)</div><div class='add'>+{</div><div class='add'>+	struct intel_gpio *gpio = data;</div><div class='add'>+	struct drm_psb_private *dev_priv = gpio-&gt;dev_priv;</div><div class='add'>+	struct drm_device *dev = dev_priv-&gt;dev;</div><div class='add'>+	u32 reserved = get_reserved(gpio);</div><div class='add'>+	u32 data_bits;</div><div class='add'>+</div><div class='add'>+	if (state_high)</div><div class='add'>+		data_bits = GPIO_DATA_DIR_IN | GPIO_DATA_DIR_MASK;</div><div class='add'>+	else</div><div class='add'>+		data_bits = GPIO_DATA_DIR_OUT | GPIO_DATA_DIR_MASK |</div><div class='add'>+			GPIO_DATA_VAL_MASK;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(gpio-&gt;reg, reserved | data_bits);</div><div class='add'>+	REG_READ(gpio-&gt;reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_adapter *</div><div class='add'>+intel_gpio_create(struct drm_psb_private *dev_priv, u32 pin)</div><div class='add'>+{</div><div class='add'>+	static const int map_pin_to_reg[] = {</div><div class='add'>+		0,</div><div class='add'>+		GPIOB,</div><div class='add'>+		GPIOA,</div><div class='add'>+		GPIOC,</div><div class='add'>+		GPIOD,</div><div class='add'>+		GPIOE,</div><div class='add'>+		0,</div><div class='add'>+		GPIOF,</div><div class='add'>+	};</div><div class='add'>+	struct intel_gpio *gpio;</div><div class='add'>+</div><div class='add'>+	if (pin &gt;= ARRAY_SIZE(map_pin_to_reg) || !map_pin_to_reg[pin])</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	gpio = kzalloc(sizeof(struct intel_gpio), GFP_KERNEL);</div><div class='add'>+	if (gpio == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	gpio-&gt;reg = map_pin_to_reg[pin];</div><div class='add'>+	gpio-&gt;dev_priv = dev_priv;</div><div class='add'>+</div><div class='add'>+	snprintf(gpio-&gt;adapter.name, sizeof(gpio-&gt;adapter.name),</div><div class='add'>+		 "gma500 GPIO%c", "?BACDE?F"[pin]);</div><div class='add'>+	gpio-&gt;adapter.owner = THIS_MODULE;</div><div class='add'>+	gpio-&gt;adapter.algo_data	= &amp;gpio-&gt;algo;</div><div class='add'>+	gpio-&gt;adapter.dev.parent = &amp;dev_priv-&gt;dev-&gt;pdev-&gt;dev;</div><div class='add'>+	gpio-&gt;algo.setsda = set_data;</div><div class='add'>+	gpio-&gt;algo.setscl = set_clock;</div><div class='add'>+	gpio-&gt;algo.getsda = get_data;</div><div class='add'>+	gpio-&gt;algo.getscl = get_clock;</div><div class='add'>+	gpio-&gt;algo.udelay = I2C_RISEFALL_TIME;</div><div class='add'>+	gpio-&gt;algo.timeout = usecs_to_jiffies(2200);</div><div class='add'>+	gpio-&gt;algo.data = gpio;</div><div class='add'>+</div><div class='add'>+	if (i2c_bit_add_bus(&amp;gpio-&gt;adapter))</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	return &amp;gpio-&gt;adapter;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(gpio);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+intel_i2c_quirk_xfer(struct drm_psb_private *dev_priv,</div><div class='add'>+		     struct i2c_adapter *adapter,</div><div class='add'>+		     struct i2c_msg *msgs,</div><div class='add'>+		     int num)</div><div class='add'>+{</div><div class='add'>+	struct intel_gpio *gpio = container_of(adapter,</div><div class='add'>+					       struct intel_gpio,</div><div class='add'>+					       adapter);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	gma_intel_i2c_reset(dev_priv-&gt;dev);</div><div class='add'>+</div><div class='add'>+	intel_i2c_quirk_set(dev_priv, true);</div><div class='add'>+	set_data(gpio, 1);</div><div class='add'>+	set_clock(gpio, 1);</div><div class='add'>+	udelay(I2C_RISEFALL_TIME);</div><div class='add'>+</div><div class='add'>+	ret = adapter-&gt;algo-&gt;master_xfer(adapter, msgs, num);</div><div class='add'>+</div><div class='add'>+	set_data(gpio, 1);</div><div class='add'>+	set_clock(gpio, 1);</div><div class='add'>+	intel_i2c_quirk_set(dev_priv, false);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+gmbus_xfer(struct i2c_adapter *adapter,</div><div class='add'>+	   struct i2c_msg *msgs,</div><div class='add'>+	   int num)</div><div class='add'>+{</div><div class='add'>+	struct intel_gmbus *bus = container_of(adapter,</div><div class='add'>+					       struct intel_gmbus,</div><div class='add'>+					       adapter);</div><div class='add'>+	struct drm_psb_private *dev_priv = adapter-&gt;algo_data;</div><div class='add'>+	struct drm_device *dev = dev_priv-&gt;dev;</div><div class='add'>+	int i, reg_offset;</div><div class='add'>+</div><div class='add'>+	if (bus-&gt;force_bit)</div><div class='add'>+		return intel_i2c_quirk_xfer(dev_priv,</div><div class='add'>+					    bus-&gt;force_bit, msgs, num);</div><div class='add'>+</div><div class='add'>+	reg_offset = 0;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(GMBUS0 + reg_offset, bus-&gt;reg0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		u16 len = msgs[i].len;</div><div class='add'>+		u8 *buf = msgs[i].buf;</div><div class='add'>+</div><div class='add'>+		if (msgs[i].flags &amp; I2C_M_RD) {</div><div class='add'>+			REG_WRITE(GMBUS1 + reg_offset,</div><div class='add'>+				   GMBUS_CYCLE_WAIT | (i + 1 == num ? GMBUS_CYCLE_STOP : 0) |</div><div class='add'>+				   (len &lt;&lt; GMBUS_BYTE_COUNT_SHIFT) |</div><div class='add'>+				   (msgs[i].addr &lt;&lt; GMBUS_SLAVE_ADDR_SHIFT) |</div><div class='add'>+				   GMBUS_SLAVE_READ | GMBUS_SW_RDY);</div><div class='add'>+			REG_READ(GMBUS2+reg_offset);</div><div class='add'>+			do {</div><div class='add'>+				u32 val, loop = 0;</div><div class='add'>+</div><div class='add'>+				if (wait_for(REG_READ(GMBUS2 + reg_offset) &amp; (GMBUS_SATOER | GMBUS_HW_RDY), 50))</div><div class='add'>+					goto timeout;</div><div class='add'>+				if (REG_READ(GMBUS2 + reg_offset) &amp; GMBUS_SATOER)</div><div class='add'>+					goto clear_err;</div><div class='add'>+</div><div class='add'>+				val = REG_READ(GMBUS3 + reg_offset);</div><div class='add'>+				do {</div><div class='add'>+					*buf++ = val &amp; 0xff;</div><div class='add'>+					val &gt;&gt;= 8;</div><div class='add'>+				} while (--len &amp;&amp; ++loop &lt; 4);</div><div class='add'>+			} while (len);</div><div class='add'>+		} else {</div><div class='add'>+			u32 val, loop;</div><div class='add'>+</div><div class='add'>+			val = loop = 0;</div><div class='add'>+			do {</div><div class='add'>+				val |= *buf++ &lt;&lt; (8 * loop);</div><div class='add'>+			} while (--len &amp;&amp; ++loop &lt; 4);</div><div class='add'>+</div><div class='add'>+			REG_WRITE(GMBUS3 + reg_offset, val);</div><div class='add'>+			REG_WRITE(GMBUS1 + reg_offset,</div><div class='add'>+				   (i + 1 == num ? GMBUS_CYCLE_STOP : GMBUS_CYCLE_WAIT) |</div><div class='add'>+				   (msgs[i].len &lt;&lt; GMBUS_BYTE_COUNT_SHIFT) |</div><div class='add'>+				   (msgs[i].addr &lt;&lt; GMBUS_SLAVE_ADDR_SHIFT) |</div><div class='add'>+				   GMBUS_SLAVE_WRITE | GMBUS_SW_RDY);</div><div class='add'>+			REG_READ(GMBUS2+reg_offset);</div><div class='add'>+</div><div class='add'>+			while (len) {</div><div class='add'>+				if (wait_for(REG_READ(GMBUS2 + reg_offset) &amp; (GMBUS_SATOER | GMBUS_HW_RDY), 50))</div><div class='add'>+					goto timeout;</div><div class='add'>+				if (REG_READ(GMBUS2 + reg_offset) &amp; GMBUS_SATOER)</div><div class='add'>+					goto clear_err;</div><div class='add'>+</div><div class='add'>+				val = loop = 0;</div><div class='add'>+				do {</div><div class='add'>+					val |= *buf++ &lt;&lt; (8 * loop);</div><div class='add'>+				} while (--len &amp;&amp; ++loop &lt; 4);</div><div class='add'>+</div><div class='add'>+				REG_WRITE(GMBUS3 + reg_offset, val);</div><div class='add'>+				REG_READ(GMBUS2+reg_offset);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i + 1 &lt; num &amp;&amp; wait_for(REG_READ(GMBUS2 + reg_offset) &amp; (GMBUS_SATOER | GMBUS_HW_WAIT_PHASE), 50))</div><div class='add'>+			goto timeout;</div><div class='add'>+		if (REG_READ(GMBUS2 + reg_offset) &amp; GMBUS_SATOER)</div><div class='add'>+			goto clear_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	goto done;</div><div class='add'>+</div><div class='add'>+clear_err:</div><div class='add'>+	/* Toggle the Software Clear Interrupt bit. This has the effect</div><div class='add'>+	 * of resetting the GMBUS controller and so clearing the</div><div class='add'>+	 * BUS_ERROR raised by the slave's NAK.</div><div class='add'>+	 */</div><div class='add'>+	REG_WRITE(GMBUS1 + reg_offset, GMBUS_SW_CLR_INT);</div><div class='add'>+	REG_WRITE(GMBUS1 + reg_offset, 0);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	/* Mark the GMBUS interface as disabled. We will re-enable it at the</div><div class='add'>+	 * start of the next xfer, till then let it sleep.</div><div class='add'>+	 */</div><div class='add'>+	REG_WRITE(GMBUS0 + reg_offset, 0);</div><div class='add'>+	return i;</div><div class='add'>+</div><div class='add'>+timeout:</div><div class='add'>+	DRM_INFO("GMBUS timed out, falling back to bit banging on pin %d [%s]\n",</div><div class='add'>+		 bus-&gt;reg0 &amp; 0xff, bus-&gt;adapter.name);</div><div class='add'>+	REG_WRITE(GMBUS0 + reg_offset, 0);</div><div class='add'>+</div><div class='add'>+	/* Hardware may not support GMBUS over these pins? Try GPIO bitbanging instead. */</div><div class='add'>+	bus-&gt;force_bit = intel_gpio_create(dev_priv, bus-&gt;reg0 &amp; 0xff);</div><div class='add'>+	if (!bus-&gt;force_bit)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return intel_i2c_quirk_xfer(dev_priv, bus-&gt;force_bit, msgs, num);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 gmbus_func(struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct intel_gmbus *bus = container_of(adapter,</div><div class='add'>+					       struct intel_gmbus,</div><div class='add'>+					       adapter);</div><div class='add'>+</div><div class='add'>+	if (bus-&gt;force_bit)</div><div class='add'>+		bus-&gt;force_bit-&gt;algo-&gt;functionality(bus-&gt;force_bit);</div><div class='add'>+</div><div class='add'>+	return (I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL |</div><div class='add'>+		/* I2C_FUNC_10BIT_ADDR | */</div><div class='add'>+		I2C_FUNC_SMBUS_READ_BLOCK_DATA |</div><div class='add'>+		I2C_FUNC_SMBUS_BLOCK_PROC_CALL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_algorithm gmbus_algorithm = {</div><div class='add'>+	.master_xfer	= gmbus_xfer,</div><div class='add'>+	.functionality	= gmbus_func</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * intel_gmbus_setup - instantiate all Intel i2c GMBuses</div><div class='add'>+ * @dev: DRM device</div><div class='add'>+ */</div><div class='add'>+int gma_intel_setup_gmbus(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	static const char *names[GMBUS_NUM_PORTS] = {</div><div class='add'>+		"disabled",</div><div class='add'>+		"ssc",</div><div class='add'>+		"vga",</div><div class='add'>+		"panel",</div><div class='add'>+		"dpc",</div><div class='add'>+		"dpb",</div><div class='add'>+		"reserved",</div><div class='add'>+		"dpd",</div><div class='add'>+	};</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;gmbus = kcalloc(sizeof(struct intel_gmbus), GMBUS_NUM_PORTS,</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (dev_priv-&gt;gmbus == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; GMBUS_NUM_PORTS; i++) {</div><div class='add'>+		struct intel_gmbus *bus = &amp;dev_priv-&gt;gmbus[i];</div><div class='add'>+</div><div class='add'>+		bus-&gt;adapter.owner = THIS_MODULE;</div><div class='add'>+		bus-&gt;adapter.class = I2C_CLASS_DDC;</div><div class='add'>+		snprintf(bus-&gt;adapter.name,</div><div class='add'>+			 sizeof(bus-&gt;adapter.name),</div><div class='add'>+			 "gma500 gmbus %s",</div><div class='add'>+			 names[i]);</div><div class='add'>+</div><div class='add'>+		bus-&gt;adapter.dev.parent = &amp;dev-&gt;pdev-&gt;dev;</div><div class='add'>+		bus-&gt;adapter.algo_data	= dev_priv;</div><div class='add'>+</div><div class='add'>+		bus-&gt;adapter.algo = &amp;gmbus_algorithm;</div><div class='add'>+		ret = i2c_add_adapter(&amp;bus-&gt;adapter);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		/* By default use a conservative clock rate */</div><div class='add'>+		bus-&gt;reg0 = i | GMBUS_RATE_100KHZ;</div><div class='add'>+</div><div class='add'>+		/* XXX force bit banging until GMBUS is fully debugged */</div><div class='add'>+		bus-&gt;force_bit = intel_gpio_create(dev_priv, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gma_intel_i2c_reset(dev_priv-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	while (--i) {</div><div class='add'>+		struct intel_gmbus *bus = &amp;dev_priv-&gt;gmbus[i];</div><div class='add'>+		i2c_del_adapter(&amp;bus-&gt;adapter);</div><div class='add'>+	}</div><div class='add'>+	kfree(dev_priv-&gt;gmbus);</div><div class='add'>+	dev_priv-&gt;gmbus = NULL;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void gma_intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed)</div><div class='add'>+{</div><div class='add'>+	struct intel_gmbus *bus = to_intel_gmbus(adapter);</div><div class='add'>+</div><div class='add'>+	/* speed:</div><div class='add'>+	 * 0x0 = 100 KHz</div><div class='add'>+	 * 0x1 = 50 KHz</div><div class='add'>+	 * 0x2 = 400 KHz</div><div class='add'>+	 * 0x3 = 1000 Khz</div><div class='add'>+	 */</div><div class='add'>+	bus-&gt;reg0 = (bus-&gt;reg0 &amp; ~(0x3 &lt;&lt; 8)) | (speed &lt;&lt; 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void gma_intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit)</div><div class='add'>+{</div><div class='add'>+	struct intel_gmbus *bus = to_intel_gmbus(adapter);</div><div class='add'>+</div><div class='add'>+	if (force_bit) {</div><div class='add'>+		if (bus-&gt;force_bit == NULL) {</div><div class='add'>+			struct drm_psb_private *dev_priv = adapter-&gt;algo_data;</div><div class='add'>+			bus-&gt;force_bit = intel_gpio_create(dev_priv,</div><div class='add'>+							   bus-&gt;reg0 &amp; 0xff);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (bus-&gt;force_bit) {</div><div class='add'>+			i2c_del_adapter(bus-&gt;force_bit);</div><div class='add'>+			kfree(bus-&gt;force_bit);</div><div class='add'>+			bus-&gt;force_bit = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void gma_intel_teardown_gmbus(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;gmbus == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; GMBUS_NUM_PORTS; i++) {</div><div class='add'>+		struct intel_gmbus *bus = &amp;dev_priv-&gt;gmbus[i];</div><div class='add'>+		if (bus-&gt;force_bit) {</div><div class='add'>+			i2c_del_adapter(bus-&gt;force_bit);</div><div class='add'>+			kfree(bus-&gt;force_bit);</div><div class='add'>+		}</div><div class='add'>+		i2c_del_adapter(&amp;bus-&gt;adapter);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(dev_priv-&gt;gmbus);</div><div class='add'>+	dev_priv-&gt;gmbus = NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/intel_i2c.c b/drivers/gpu/drm/gma500/intel_i2c.c<br/>new file mode 100644<br/>index 000000000000..98a28c209555<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/intel_i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/intel_i2c.c</a></div><div class='hunk'>@@ -0,0 +1,169 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2006-2007 Intel Corporation</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Eric Anholt &lt;eric@anholt.net&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/i2c-algo-bit.h&gt;</div><div class='add'>+</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Intel GPIO access functions</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define I2C_RISEFALL_TIME 20</div><div class='add'>+</div><div class='add'>+static int get_clock(void *data)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_i2c_chan *chan = data;</div><div class='add'>+	struct drm_device *dev = chan-&gt;drm_dev;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = REG_READ(chan-&gt;reg);</div><div class='add'>+	return (val &amp; GPIO_CLOCK_VAL_IN) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_data(void *data)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_i2c_chan *chan = data;</div><div class='add'>+	struct drm_device *dev = chan-&gt;drm_dev;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = REG_READ(chan-&gt;reg);</div><div class='add'>+	return (val &amp; GPIO_DATA_VAL_IN) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_clock(void *data, int state_high)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_i2c_chan *chan = data;</div><div class='add'>+	struct drm_device *dev = chan-&gt;drm_dev;</div><div class='add'>+	u32 reserved = 0, clock_bits;</div><div class='add'>+</div><div class='add'>+	/* On most chips, these bits must be preserved in software. */</div><div class='add'>+	reserved =</div><div class='add'>+		    REG_READ(chan-&gt;reg) &amp; (GPIO_DATA_PULLUP_DISABLE |</div><div class='add'>+					   GPIO_CLOCK_PULLUP_DISABLE);</div><div class='add'>+</div><div class='add'>+	if (state_high)</div><div class='add'>+		clock_bits = GPIO_CLOCK_DIR_IN | GPIO_CLOCK_DIR_MASK;</div><div class='add'>+	else</div><div class='add'>+		clock_bits = GPIO_CLOCK_DIR_OUT | GPIO_CLOCK_DIR_MASK |</div><div class='add'>+		    GPIO_CLOCK_VAL_MASK;</div><div class='add'>+	REG_WRITE(chan-&gt;reg, reserved | clock_bits);</div><div class='add'>+	udelay(I2C_RISEFALL_TIME);	/* wait for the line to change state */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_data(void *data, int state_high)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_i2c_chan *chan = data;</div><div class='add'>+	struct drm_device *dev = chan-&gt;drm_dev;</div><div class='add'>+	u32 reserved = 0, data_bits;</div><div class='add'>+</div><div class='add'>+	/* On most chips, these bits must be preserved in software. */</div><div class='add'>+	reserved =</div><div class='add'>+		    REG_READ(chan-&gt;reg) &amp; (GPIO_DATA_PULLUP_DISABLE |</div><div class='add'>+					   GPIO_CLOCK_PULLUP_DISABLE);</div><div class='add'>+</div><div class='add'>+	if (state_high)</div><div class='add'>+		data_bits = GPIO_DATA_DIR_IN | GPIO_DATA_DIR_MASK;</div><div class='add'>+	else</div><div class='add'>+		data_bits =</div><div class='add'>+		    GPIO_DATA_DIR_OUT | GPIO_DATA_DIR_MASK |</div><div class='add'>+		    GPIO_DATA_VAL_MASK;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(chan-&gt;reg, reserved | data_bits);</div><div class='add'>+	udelay(I2C_RISEFALL_TIME);	/* wait for the line to change state */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * psb_intel_i2c_create - instantiate an Intel i2c bus using the specified GPIO reg</div><div class='add'>+ * @dev: DRM device</div><div class='add'>+ * @output: driver specific output device</div><div class='add'>+ * @reg: GPIO reg to use</div><div class='add'>+ * @name: name for this bus</div><div class='add'>+ *</div><div class='add'>+ * Creates and registers a new i2c bus with the Linux i2c layer, for use</div><div class='add'>+ * in output probing and control (e.g. DDC or SDVO control functions).</div><div class='add'>+ *</div><div class='add'>+ * Possible values for @reg include:</div><div class='add'>+ *   %GPIOA</div><div class='add'>+ *   %GPIOB</div><div class='add'>+ *   %GPIOC</div><div class='add'>+ *   %GPIOD</div><div class='add'>+ *   %GPIOE</div><div class='add'>+ *   %GPIOF</div><div class='add'>+ *   %GPIOG</div><div class='add'>+ *   %GPIOH</div><div class='add'>+ * see PRM for details on how these different busses are used.</div><div class='add'>+ */</div><div class='add'>+struct psb_intel_i2c_chan *psb_intel_i2c_create(struct drm_device *dev,</div><div class='add'>+					const u32 reg, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_i2c_chan *chan;</div><div class='add'>+</div><div class='add'>+	chan = kzalloc(sizeof(struct psb_intel_i2c_chan), GFP_KERNEL);</div><div class='add'>+	if (!chan)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	chan-&gt;drm_dev = dev;</div><div class='add'>+	chan-&gt;reg = reg;</div><div class='add'>+	snprintf(chan-&gt;adapter.name, I2C_NAME_SIZE, "intel drm %s", name);</div><div class='add'>+	chan-&gt;adapter.owner = THIS_MODULE;</div><div class='add'>+	chan-&gt;adapter.algo_data = &amp;chan-&gt;algo;</div><div class='add'>+	chan-&gt;adapter.dev.parent = &amp;dev-&gt;pdev-&gt;dev;</div><div class='add'>+	chan-&gt;algo.setsda = set_data;</div><div class='add'>+	chan-&gt;algo.setscl = set_clock;</div><div class='add'>+	chan-&gt;algo.getsda = get_data;</div><div class='add'>+	chan-&gt;algo.getscl = get_clock;</div><div class='add'>+	chan-&gt;algo.udelay = 20;</div><div class='add'>+	chan-&gt;algo.timeout = usecs_to_jiffies(2200);</div><div class='add'>+	chan-&gt;algo.data = chan;</div><div class='add'>+</div><div class='add'>+	i2c_set_adapdata(&amp;chan-&gt;adapter, chan);</div><div class='add'>+</div><div class='add'>+	if (i2c_bit_add_bus(&amp;chan-&gt;adapter))</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	/* JJJ:  raise SCL and SDA? */</div><div class='add'>+	set_data(chan, 1);</div><div class='add'>+	set_clock(chan, 1);</div><div class='add'>+	udelay(20);</div><div class='add'>+</div><div class='add'>+	return chan;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(chan);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * psb_intel_i2c_destroy - unregister and free i2c bus resources</div><div class='add'>+ * @output: channel to free</div><div class='add'>+ *</div><div class='add'>+ * Unregister the adapter from the i2c layer, then free the structure.</div><div class='add'>+ */</div><div class='add'>+void psb_intel_i2c_destroy(struct psb_intel_i2c_chan *chan)</div><div class='add'>+{</div><div class='add'>+	if (!chan)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	i2c_del_adapter(&amp;chan-&gt;adapter);</div><div class='add'>+	kfree(chan);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/intel_opregion.c b/drivers/gpu/drm/gma500/intel_opregion.c<br/>new file mode 100644<br/>index 000000000000..d946bc1b17bf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/intel_opregion.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/intel_opregion.c</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2010 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='add'>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER</div><div class='add'>+ * DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * FIXME: resolve with the i915 version</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+</div><div class='add'>+struct opregion_header {</div><div class='add'>+	u8 signature[16];</div><div class='add'>+	u32 size;</div><div class='add'>+	u32 opregion_ver;</div><div class='add'>+	u8 bios_ver[32];</div><div class='add'>+	u8 vbios_ver[16];</div><div class='add'>+	u8 driver_ver[16];</div><div class='add'>+	u32 mboxes;</div><div class='add'>+	u8 reserved[164];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct opregion_apci {</div><div class='add'>+	/*FIXME: add it later*/</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct opregion_swsci {</div><div class='add'>+	/*FIXME: add it later*/</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct opregion_acpi {</div><div class='add'>+	/*FIXME: add it later*/</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+int gma_intel_opregion_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 opregion_phy;</div><div class='add'>+	void *base;</div><div class='add'>+	u32 *lid_state;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;lid_state = NULL;</div><div class='add'>+</div><div class='add'>+	pci_read_config_dword(dev-&gt;pdev, 0xfc, &amp;opregion_phy);</div><div class='add'>+	if (opregion_phy == 0)</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+</div><div class='add'>+	base = ioremap(opregion_phy, 8*1024);</div><div class='add'>+	if (!base)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	lid_state = base + 0x01ac;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;lid_state = lid_state;</div><div class='add'>+	dev_priv-&gt;lid_last_state = readl(lid_state);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int gma_intel_opregion_exit(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	if (dev_priv-&gt;lid_state)</div><div class='add'>+		iounmap(dev_priv-&gt;lid_state);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/mid_bios.c b/drivers/gpu/drm/gma500/mid_bios.c<br/>new file mode 100644<br/>index 000000000000..5eee9ad80da4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/mid_bios.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/mid_bios.c</a></div><div class='hunk'>@@ -0,0 +1,263 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ * Copyright (c) 2011, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+/* TODO</div><div class='add'>+ * - Split functions by vbt type</div><div class='add'>+ * - Make them all take drm_device</div><div class='add'>+ * - Check ioremap failures</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include &lt;drm/drm.h&gt;</div><div class='add'>+#include "gma_drm.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "mid_bios.h"</div><div class='add'>+</div><div class='add'>+static void mid_get_fuse_settings(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);</div><div class='add'>+	uint32_t fuse_value = 0;</div><div class='add'>+	uint32_t fuse_value_tmp = 0;</div><div class='add'>+</div><div class='add'>+#define FB_REG06 0xD0810600</div><div class='add'>+#define FB_MIPI_DISABLE  (1 &lt;&lt; 11)</div><div class='add'>+#define FB_REG09 0xD0810900</div><div class='add'>+#define FB_REG09 0xD0810900</div><div class='add'>+#define FB_SKU_MASK  0x7000</div><div class='add'>+#define FB_SKU_SHIFT 12</div><div class='add'>+#define FB_SKU_100 0</div><div class='add'>+#define FB_SKU_100L 1</div><div class='add'>+#define FB_SKU_83 2</div><div class='add'>+	if (pci_root == NULL) {</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	pci_write_config_dword(pci_root, 0xD0, FB_REG06);</div><div class='add'>+	pci_read_config_dword(pci_root, 0xD4, &amp;fuse_value);</div><div class='add'>+</div><div class='add'>+	/* FB_MIPI_DISABLE doesn't mean LVDS on with Medfield */</div><div class='add'>+	if (IS_MRST(dev))</div><div class='add'>+		dev_priv-&gt;iLVDS_enable = fuse_value &amp; FB_MIPI_DISABLE;</div><div class='add'>+</div><div class='add'>+	DRM_INFO("internal display is %s\n",</div><div class='add'>+		 dev_priv-&gt;iLVDS_enable ? "LVDS display" : "MIPI display");</div><div class='add'>+</div><div class='add'>+	 /* Prevent runtime suspend at start*/</div><div class='add'>+	 if (dev_priv-&gt;iLVDS_enable) {</div><div class='add'>+		dev_priv-&gt;is_lvds_on = true;</div><div class='add'>+		dev_priv-&gt;is_mipi_on = false;</div><div class='add'>+	} else {</div><div class='add'>+		dev_priv-&gt;is_mipi_on = true;</div><div class='add'>+		dev_priv-&gt;is_lvds_on = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;video_device_fuse = fuse_value;</div><div class='add'>+</div><div class='add'>+	pci_write_config_dword(pci_root, 0xD0, FB_REG09);</div><div class='add'>+	pci_read_config_dword(pci_root, 0xD4, &amp;fuse_value);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev-&gt;dev, "SKU values is 0x%x.\n", fuse_value);</div><div class='add'>+	fuse_value_tmp = (fuse_value &amp; FB_SKU_MASK) &gt;&gt; FB_SKU_SHIFT;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;fuse_reg_value = fuse_value;</div><div class='add'>+</div><div class='add'>+	switch (fuse_value_tmp) {</div><div class='add'>+	case FB_SKU_100:</div><div class='add'>+		dev_priv-&gt;core_freq = 200;</div><div class='add'>+		break;</div><div class='add'>+	case FB_SKU_100L:</div><div class='add'>+		dev_priv-&gt;core_freq = 100;</div><div class='add'>+		break;</div><div class='add'>+	case FB_SKU_83:</div><div class='add'>+		dev_priv-&gt;core_freq = 166;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_warn(dev-&gt;dev, "Invalid SKU values, SKU value = 0x%08x\n",</div><div class='add'>+								fuse_value_tmp);</div><div class='add'>+		dev_priv-&gt;core_freq = 0;</div><div class='add'>+	}</div><div class='add'>+	dev_dbg(dev-&gt;dev, "LNC core clk is %dMHz.\n", dev_priv-&gt;core_freq);</div><div class='add'>+	pci_dev_put(pci_root);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Get the revison ID, B0:D2:F0;0x08</div><div class='add'>+ */</div><div class='add'>+static void mid_get_pci_revID(struct drm_psb_private *dev_priv)</div><div class='add'>+{</div><div class='add'>+	uint32_t platform_rev_id = 0;</div><div class='add'>+	struct pci_dev *pci_gfx_root = pci_get_bus_and_slot(0, PCI_DEVFN(2, 0));</div><div class='add'>+</div><div class='add'>+	if (pci_gfx_root == NULL) {</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	pci_read_config_dword(pci_gfx_root, 0x08, &amp;platform_rev_id);</div><div class='add'>+	dev_priv-&gt;platform_rev_id = (uint8_t) platform_rev_id;</div><div class='add'>+	pci_dev_put(pci_gfx_root);</div><div class='add'>+	dev_dbg(dev_priv-&gt;dev-&gt;dev, "platform_rev_id is %x\n",</div><div class='add'>+					dev_priv-&gt;platform_rev_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mid_get_vbt_data(struct drm_psb_private *dev_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = dev_priv-&gt;dev;</div><div class='add'>+	struct oaktrail_vbt *vbt = &amp;dev_priv-&gt;vbt_data;</div><div class='add'>+	u32 addr;</div><div class='add'>+	u16 new_size;</div><div class='add'>+	u8 *vbt_virtual;</div><div class='add'>+	u8 bpi;</div><div class='add'>+	u8 number_desc = 0;</div><div class='add'>+	struct oaktrail_timing_info *dp_ti = &amp;dev_priv-&gt;gct_data.DTD;</div><div class='add'>+	struct gct_r10_timing_info ti;</div><div class='add'>+	void *pGCT;</div><div class='add'>+	struct pci_dev *pci_gfx_root = pci_get_bus_and_slot(0, PCI_DEVFN(2, 0));</div><div class='add'>+</div><div class='add'>+	/* Get the address of the platform config vbt, B0:D2:F0;0xFC */</div><div class='add'>+	pci_read_config_dword(pci_gfx_root, 0xFC, &amp;addr);</div><div class='add'>+	pci_dev_put(pci_gfx_root);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev-&gt;dev, "drm platform config address is %x\n", addr);</div><div class='add'>+</div><div class='add'>+	/* check for platform config address == 0. */</div><div class='add'>+	/* this means fw doesn't support vbt */</div><div class='add'>+</div><div class='add'>+	if (addr == 0) {</div><div class='add'>+		vbt-&gt;size = 0;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get the virtual address of the vbt */</div><div class='add'>+	vbt_virtual = ioremap(addr, sizeof(*vbt));</div><div class='add'>+	if (vbt_virtual == NULL) {</div><div class='add'>+		vbt-&gt;size = 0;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(vbt, vbt_virtual, sizeof(*vbt));</div><div class='add'>+	iounmap(vbt_virtual); /* Free virtual address space */</div><div class='add'>+</div><div class='add'>+	/* No matching signature don't process the data */</div><div class='add'>+	if (memcmp(vbt-&gt;signature, "$GCT", 4)) {</div><div class='add'>+		vbt-&gt;size = 0;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev-&gt;dev, "GCT revision is %x\n", vbt-&gt;revision);</div><div class='add'>+</div><div class='add'>+	switch (vbt-&gt;revision) {</div><div class='add'>+	case 0:</div><div class='add'>+		vbt-&gt;oaktrail_gct = ioremap(addr + sizeof(*vbt) - 4,</div><div class='add'>+					vbt-&gt;size - sizeof(*vbt) + 4);</div><div class='add'>+		pGCT = vbt-&gt;oaktrail_gct;</div><div class='add'>+		bpi = ((struct oaktrail_gct_v1 *)pGCT)-&gt;PD.BootPanelIndex;</div><div class='add'>+		dev_priv-&gt;gct_data.bpi = bpi;</div><div class='add'>+		dev_priv-&gt;gct_data.pt =</div><div class='add'>+			((struct oaktrail_gct_v1 *)pGCT)-&gt;PD.PanelType;</div><div class='add'>+		memcpy(&amp;dev_priv-&gt;gct_data.DTD,</div><div class='add'>+			&amp;((struct oaktrail_gct_v1 *)pGCT)-&gt;panel[bpi].DTD,</div><div class='add'>+				sizeof(struct oaktrail_timing_info));</div><div class='add'>+		dev_priv-&gt;gct_data.Panel_Port_Control =</div><div class='add'>+		  ((struct oaktrail_gct_v1 *)pGCT)-&gt;panel[bpi].Panel_Port_Control;</div><div class='add'>+		dev_priv-&gt;gct_data.Panel_MIPI_Display_Descriptor =</div><div class='add'>+			((struct oaktrail_gct_v1 *)pGCT)-&gt;panel[bpi].Panel_MIPI_Display_Descriptor;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		vbt-&gt;oaktrail_gct = ioremap(addr + sizeof(*vbt) - 4,</div><div class='add'>+					vbt-&gt;size - sizeof(*vbt) + 4);</div><div class='add'>+		pGCT = vbt-&gt;oaktrail_gct;</div><div class='add'>+		bpi = ((struct oaktrail_gct_v2 *)pGCT)-&gt;PD.BootPanelIndex;</div><div class='add'>+		dev_priv-&gt;gct_data.bpi = bpi;</div><div class='add'>+		dev_priv-&gt;gct_data.pt =</div><div class='add'>+			((struct oaktrail_gct_v2 *)pGCT)-&gt;PD.PanelType;</div><div class='add'>+		memcpy(&amp;dev_priv-&gt;gct_data.DTD,</div><div class='add'>+			&amp;((struct oaktrail_gct_v2 *)pGCT)-&gt;panel[bpi].DTD,</div><div class='add'>+				sizeof(struct oaktrail_timing_info));</div><div class='add'>+		dev_priv-&gt;gct_data.Panel_Port_Control =</div><div class='add'>+		  ((struct oaktrail_gct_v2 *)pGCT)-&gt;panel[bpi].Panel_Port_Control;</div><div class='add'>+		dev_priv-&gt;gct_data.Panel_MIPI_Display_Descriptor =</div><div class='add'>+			((struct oaktrail_gct_v2 *)pGCT)-&gt;panel[bpi].Panel_MIPI_Display_Descriptor;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10:</div><div class='add'>+		/*header definition changed from rev 01 (v2) to rev 10h. */</div><div class='add'>+		/*so, some values have changed location*/</div><div class='add'>+		new_size = vbt-&gt;checksum; /*checksum contains lo size byte*/</div><div class='add'>+		/*LSB of oaktrail_gct contains hi size byte*/</div><div class='add'>+		new_size |= ((0xff &amp; (unsigned int)(long)vbt-&gt;oaktrail_gct)) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+		vbt-&gt;checksum = vbt-&gt;size; /*size contains the checksum*/</div><div class='add'>+		if (new_size &gt; 0xff)</div><div class='add'>+			vbt-&gt;size = 0xff; /*restrict size to 255*/</div><div class='add'>+		else</div><div class='add'>+			vbt-&gt;size = new_size;</div><div class='add'>+</div><div class='add'>+		/* number of descriptors defined in the GCT */</div><div class='add'>+		number_desc = ((0xff00 &amp; (unsigned int)(long)vbt-&gt;oaktrail_gct)) &gt;&gt; 8;</div><div class='add'>+		bpi = ((0xff0000 &amp; (unsigned int)(long)vbt-&gt;oaktrail_gct)) &gt;&gt; 16;</div><div class='add'>+		vbt-&gt;oaktrail_gct = ioremap(addr + GCT_R10_HEADER_SIZE,</div><div class='add'>+				GCT_R10_DISPLAY_DESC_SIZE * number_desc);</div><div class='add'>+		pGCT = vbt-&gt;oaktrail_gct;</div><div class='add'>+		pGCT = (u8 *)pGCT + (bpi*GCT_R10_DISPLAY_DESC_SIZE);</div><div class='add'>+		dev_priv-&gt;gct_data.bpi = bpi; /*save boot panel id*/</div><div class='add'>+</div><div class='add'>+		/*copy the GCT display timings into a temp structure*/</div><div class='add'>+		memcpy(&amp;ti, pGCT, sizeof(struct gct_r10_timing_info));</div><div class='add'>+</div><div class='add'>+		/*now copy the temp struct into the dev_priv-&gt;gct_data*/</div><div class='add'>+		dp_ti-&gt;pixel_clock = ti.pixel_clock;</div><div class='add'>+		dp_ti-&gt;hactive_hi = ti.hactive_hi;</div><div class='add'>+		dp_ti-&gt;hactive_lo = ti.hactive_lo;</div><div class='add'>+		dp_ti-&gt;hblank_hi = ti.hblank_hi;</div><div class='add'>+		dp_ti-&gt;hblank_lo = ti.hblank_lo;</div><div class='add'>+		dp_ti-&gt;hsync_offset_hi = ti.hsync_offset_hi;</div><div class='add'>+		dp_ti-&gt;hsync_offset_lo = ti.hsync_offset_lo;</div><div class='add'>+		dp_ti-&gt;hsync_pulse_width_hi = ti.hsync_pulse_width_hi;</div><div class='add'>+		dp_ti-&gt;hsync_pulse_width_lo = ti.hsync_pulse_width_lo;</div><div class='add'>+		dp_ti-&gt;vactive_hi = ti.vactive_hi;</div><div class='add'>+		dp_ti-&gt;vactive_lo = ti.vactive_lo;</div><div class='add'>+		dp_ti-&gt;vblank_hi = ti.vblank_hi;</div><div class='add'>+		dp_ti-&gt;vblank_lo = ti.vblank_lo;</div><div class='add'>+		dp_ti-&gt;vsync_offset_hi = ti.vsync_offset_hi;</div><div class='add'>+		dp_ti-&gt;vsync_offset_lo = ti.vsync_offset_lo;</div><div class='add'>+		dp_ti-&gt;vsync_pulse_width_hi = ti.vsync_pulse_width_hi;</div><div class='add'>+		dp_ti-&gt;vsync_pulse_width_lo = ti.vsync_pulse_width_lo;</div><div class='add'>+</div><div class='add'>+		/* Move the MIPI_Display_Descriptor data from GCT to dev priv */</div><div class='add'>+		dev_priv-&gt;gct_data.Panel_MIPI_Display_Descriptor =</div><div class='add'>+							*((u8 *)pGCT + 0x0d);</div><div class='add'>+		dev_priv-&gt;gct_data.Panel_MIPI_Display_Descriptor |=</div><div class='add'>+						(*((u8 *)pGCT + 0x0e)) &lt;&lt; 8;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev-&gt;dev, "Unknown revision of GCT!\n");</div><div class='add'>+		vbt-&gt;size = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mid_chip_setup(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	mid_get_fuse_settings(dev);</div><div class='add'>+	mid_get_vbt_data(dev_priv);</div><div class='add'>+	mid_get_pci_revID(dev_priv);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/mid_bios.h b/drivers/gpu/drm/gma500/mid_bios.h<br/>new file mode 100644<br/>index 000000000000..00e7d564b7eb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/mid_bios.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/mid_bios.h</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ * Copyright (c) 2011, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+extern int mid_chip_setup(struct drm_device *dev);</div><div class='add'>+</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/mmu.c b/drivers/gpu/drm/gma500/mmu.c<br/>new file mode 100644<br/>index 000000000000..c904d73b1de3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/mmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/mmu.c</a></div><div class='hunk'>@@ -0,0 +1,858 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ * Copyright (c) 2007, Intel Corporation.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_reg.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Code for the SGX MMU:</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * clflush on one processor only:</div><div class='add'>+ * clflush should apparently flush the cache line on all processors in an</div><div class='add'>+ * SMP system.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * kmap atomic:</div><div class='add'>+ * The usage of the slots must be completely encapsulated within a spinlock, and</div><div class='add'>+ * no other functions that may be using the locks for other purposed may be</div><div class='add'>+ * called from within the locked region.</div><div class='add'>+ * Since the slots are per processor, this will guarantee that we are the only</div><div class='add'>+ * user.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TODO: Inserting ptes from an interrupt handler:</div><div class='add'>+ * This may be desirable for some SGX functionality where the GPU can fault in</div><div class='add'>+ * needed pages. For that, we need to make an atomic insert_pages function, that</div><div class='add'>+ * may fail.</div><div class='add'>+ * If it fails, the caller need to insert the page using a workqueue function,</div><div class='add'>+ * but on average it should be fast.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct psb_mmu_driver {</div><div class='add'>+	/* protects driver- and pd structures. Always take in read mode</div><div class='add'>+	 * before taking the page table spinlock.</div><div class='add'>+	 */</div><div class='add'>+	struct rw_semaphore sem;</div><div class='add'>+</div><div class='add'>+	/* protects page tables, directory tables and pt tables.</div><div class='add'>+	 * and pt structures.</div><div class='add'>+	 */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	atomic_t needs_tlbflush;</div><div class='add'>+</div><div class='add'>+	uint8_t __iomem *register_map;</div><div class='add'>+	struct psb_mmu_pd *default_pd;</div><div class='add'>+	/*uint32_t bif_ctrl;*/</div><div class='add'>+	int has_clflush;</div><div class='add'>+	int clflush_add;</div><div class='add'>+	unsigned long clflush_mask;</div><div class='add'>+</div><div class='add'>+	struct drm_psb_private *dev_priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct psb_mmu_pd;</div><div class='add'>+</div><div class='add'>+struct psb_mmu_pt {</div><div class='add'>+	struct psb_mmu_pd *pd;</div><div class='add'>+	uint32_t index;</div><div class='add'>+	uint32_t count;</div><div class='add'>+	struct page *p;</div><div class='add'>+	uint32_t *v;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct psb_mmu_pd {</div><div class='add'>+	struct psb_mmu_driver *driver;</div><div class='add'>+	int hw_context;</div><div class='add'>+	struct psb_mmu_pt **tables;</div><div class='add'>+	struct page *p;</div><div class='add'>+	struct page *dummy_pt;</div><div class='add'>+	struct page *dummy_page;</div><div class='add'>+	uint32_t pd_mask;</div><div class='add'>+	uint32_t invalid_pde;</div><div class='add'>+	uint32_t invalid_pte;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline uint32_t psb_mmu_pt_index(uint32_t offset)</div><div class='add'>+{</div><div class='add'>+	return (offset &gt;&gt; PSB_PTE_SHIFT) &amp; 0x3FF;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline uint32_t psb_mmu_pd_index(uint32_t offset)</div><div class='add'>+{</div><div class='add'>+	return offset &gt;&gt; PSB_PDE_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void psb_clflush(void *addr)</div><div class='add'>+{</div><div class='add'>+	__asm__ __volatile__("clflush (%0)\n" : : "r"(addr) : "memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void psb_mmu_clflush(struct psb_mmu_driver *driver,</div><div class='add'>+				   void *addr)</div><div class='add'>+{</div><div class='add'>+	if (!driver-&gt;has_clflush)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mb();</div><div class='add'>+	psb_clflush(addr);</div><div class='add'>+	mb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_page_clflush(struct psb_mmu_driver *driver, struct page* page)</div><div class='add'>+{</div><div class='add'>+	uint32_t clflush_add = driver-&gt;clflush_add &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	uint32_t clflush_count = PAGE_SIZE / clflush_add;</div><div class='add'>+	int i;</div><div class='add'>+	uint8_t *clf;</div><div class='add'>+</div><div class='add'>+	clf = kmap_atomic(page, KM_USER0);</div><div class='add'>+	mb();</div><div class='add'>+	for (i = 0; i &lt; clflush_count; ++i) {</div><div class='add'>+		psb_clflush(clf);</div><div class='add'>+		clf += clflush_add;</div><div class='add'>+	}</div><div class='add'>+	mb();</div><div class='add'>+	kunmap_atomic(clf, KM_USER0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_pages_clflush(struct psb_mmu_driver *driver,</div><div class='add'>+				struct page *page[], unsigned long num_pages)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!driver-&gt;has_clflush)</div><div class='add'>+		return ;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_pages; i++)</div><div class='add'>+		psb_page_clflush(driver, *page++);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_mmu_flush_pd_locked(struct psb_mmu_driver *driver,</div><div class='add'>+				    int force)</div><div class='add'>+{</div><div class='add'>+	atomic_set(&amp;driver-&gt;needs_tlbflush, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_mmu_flush_pd(struct psb_mmu_driver *driver, int force)</div><div class='add'>+{</div><div class='add'>+	down_write(&amp;driver-&gt;sem);</div><div class='add'>+	psb_mmu_flush_pd_locked(driver, force);</div><div class='add'>+	up_write(&amp;driver-&gt;sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_mmu_flush(struct psb_mmu_driver *driver, int rc_prot)</div><div class='add'>+{</div><div class='add'>+	if (rc_prot)</div><div class='add'>+		down_write(&amp;driver-&gt;sem);</div><div class='add'>+	if (rc_prot)</div><div class='add'>+		up_write(&amp;driver-&gt;sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_mmu_set_pd_context(struct psb_mmu_pd *pd, int hw_context)</div><div class='add'>+{</div><div class='add'>+	/*ttm_tt_cache_flush(&amp;pd-&gt;p, 1);*/</div><div class='add'>+	psb_pages_clflush(pd-&gt;driver, &amp;pd-&gt;p, 1);</div><div class='add'>+	down_write(&amp;pd-&gt;driver-&gt;sem);</div><div class='add'>+	wmb();</div><div class='add'>+	psb_mmu_flush_pd_locked(pd-&gt;driver, 1);</div><div class='add'>+	pd-&gt;hw_context = hw_context;</div><div class='add'>+	up_write(&amp;pd-&gt;driver-&gt;sem);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long psb_pd_addr_end(unsigned long addr,</div><div class='add'>+					    unsigned long end)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	addr = (addr + PSB_PDE_MASK + 1) &amp; ~PSB_PDE_MASK;</div><div class='add'>+	return (addr &lt; end) ? addr : end;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline uint32_t psb_mmu_mask_pte(uint32_t pfn, int type)</div><div class='add'>+{</div><div class='add'>+	uint32_t mask = PSB_PTE_VALID;</div><div class='add'>+</div><div class='add'>+	if (type &amp; PSB_MMU_CACHED_MEMORY)</div><div class='add'>+		mask |= PSB_PTE_CACHED;</div><div class='add'>+	if (type &amp; PSB_MMU_RO_MEMORY)</div><div class='add'>+		mask |= PSB_PTE_RO;</div><div class='add'>+	if (type &amp; PSB_MMU_WO_MEMORY)</div><div class='add'>+		mask |= PSB_PTE_WO;</div><div class='add'>+</div><div class='add'>+	return (pfn &lt;&lt; PAGE_SHIFT) | mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct psb_mmu_pd *psb_mmu_alloc_pd(struct psb_mmu_driver *driver,</div><div class='add'>+				    int trap_pagefaults, int invalid_type)</div><div class='add'>+{</div><div class='add'>+	struct psb_mmu_pd *pd = kmalloc(sizeof(*pd), GFP_KERNEL);</div><div class='add'>+	uint32_t *v;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!pd)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	pd-&gt;p = alloc_page(GFP_DMA32);</div><div class='add'>+	if (!pd-&gt;p)</div><div class='add'>+		goto out_err1;</div><div class='add'>+	pd-&gt;dummy_pt = alloc_page(GFP_DMA32);</div><div class='add'>+	if (!pd-&gt;dummy_pt)</div><div class='add'>+		goto out_err2;</div><div class='add'>+	pd-&gt;dummy_page = alloc_page(GFP_DMA32);</div><div class='add'>+	if (!pd-&gt;dummy_page)</div><div class='add'>+		goto out_err3;</div><div class='add'>+</div><div class='add'>+	if (!trap_pagefaults) {</div><div class='add'>+		pd-&gt;invalid_pde =</div><div class='add'>+		    psb_mmu_mask_pte(page_to_pfn(pd-&gt;dummy_pt),</div><div class='add'>+				     invalid_type);</div><div class='add'>+		pd-&gt;invalid_pte =</div><div class='add'>+		    psb_mmu_mask_pte(page_to_pfn(pd-&gt;dummy_page),</div><div class='add'>+				     invalid_type);</div><div class='add'>+	} else {</div><div class='add'>+		pd-&gt;invalid_pde = 0;</div><div class='add'>+		pd-&gt;invalid_pte = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	v = kmap(pd-&gt;dummy_pt);</div><div class='add'>+	for (i = 0; i &lt; (PAGE_SIZE / sizeof(uint32_t)); ++i)</div><div class='add'>+		v[i] = pd-&gt;invalid_pte;</div><div class='add'>+</div><div class='add'>+	kunmap(pd-&gt;dummy_pt);</div><div class='add'>+</div><div class='add'>+	v = kmap(pd-&gt;p);</div><div class='add'>+	for (i = 0; i &lt; (PAGE_SIZE / sizeof(uint32_t)); ++i)</div><div class='add'>+		v[i] = pd-&gt;invalid_pde;</div><div class='add'>+</div><div class='add'>+	kunmap(pd-&gt;p);</div><div class='add'>+</div><div class='add'>+	clear_page(kmap(pd-&gt;dummy_page));</div><div class='add'>+	kunmap(pd-&gt;dummy_page);</div><div class='add'>+</div><div class='add'>+	pd-&gt;tables = vmalloc_user(sizeof(struct psb_mmu_pt *) * 1024);</div><div class='add'>+	if (!pd-&gt;tables)</div><div class='add'>+		goto out_err4;</div><div class='add'>+</div><div class='add'>+	pd-&gt;hw_context = -1;</div><div class='add'>+	pd-&gt;pd_mask = PSB_PTE_VALID;</div><div class='add'>+	pd-&gt;driver = driver;</div><div class='add'>+</div><div class='add'>+	return pd;</div><div class='add'>+</div><div class='add'>+out_err4:</div><div class='add'>+	__free_page(pd-&gt;dummy_page);</div><div class='add'>+out_err3:</div><div class='add'>+	__free_page(pd-&gt;dummy_pt);</div><div class='add'>+out_err2:</div><div class='add'>+	__free_page(pd-&gt;p);</div><div class='add'>+out_err1:</div><div class='add'>+	kfree(pd);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_mmu_free_pt(struct psb_mmu_pt *pt)</div><div class='add'>+{</div><div class='add'>+	__free_page(pt-&gt;p);</div><div class='add'>+	kfree(pt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_mmu_free_pagedir(struct psb_mmu_pd *pd)</div><div class='add'>+{</div><div class='add'>+	struct psb_mmu_driver *driver = pd-&gt;driver;</div><div class='add'>+	struct psb_mmu_pt *pt;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;driver-&gt;sem);</div><div class='add'>+	if (pd-&gt;hw_context != -1)</div><div class='add'>+		psb_mmu_flush_pd_locked(driver, 1);</div><div class='add'>+</div><div class='add'>+	/* Should take the spinlock here, but we don't need to do that</div><div class='add'>+	   since we have the semaphore in write mode. */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 1024; ++i) {</div><div class='add'>+		pt = pd-&gt;tables[i];</div><div class='add'>+		if (pt)</div><div class='add'>+			psb_mmu_free_pt(pt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vfree(pd-&gt;tables);</div><div class='add'>+	__free_page(pd-&gt;dummy_page);</div><div class='add'>+	__free_page(pd-&gt;dummy_pt);</div><div class='add'>+	__free_page(pd-&gt;p);</div><div class='add'>+	kfree(pd);</div><div class='add'>+	up_write(&amp;driver-&gt;sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct psb_mmu_pt *psb_mmu_alloc_pt(struct psb_mmu_pd *pd)</div><div class='add'>+{</div><div class='add'>+	struct psb_mmu_pt *pt = kmalloc(sizeof(*pt), GFP_KERNEL);</div><div class='add'>+	void *v;</div><div class='add'>+	uint32_t clflush_add = pd-&gt;driver-&gt;clflush_add &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	uint32_t clflush_count = PAGE_SIZE / clflush_add;</div><div class='add'>+	spinlock_t *lock = &amp;pd-&gt;driver-&gt;lock;</div><div class='add'>+	uint8_t *clf;</div><div class='add'>+	uint32_t *ptes;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!pt)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	pt-&gt;p = alloc_page(GFP_DMA32);</div><div class='add'>+	if (!pt-&gt;p) {</div><div class='add'>+		kfree(pt);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(lock);</div><div class='add'>+</div><div class='add'>+	v = kmap_atomic(pt-&gt;p, KM_USER0);</div><div class='add'>+	clf = (uint8_t *) v;</div><div class='add'>+	ptes = (uint32_t *) v;</div><div class='add'>+	for (i = 0; i &lt; (PAGE_SIZE / sizeof(uint32_t)); ++i)</div><div class='add'>+		*ptes++ = pd-&gt;invalid_pte;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (pd-&gt;driver-&gt;has_clflush &amp;&amp; pd-&gt;hw_context != -1) {</div><div class='add'>+		mb();</div><div class='add'>+		for (i = 0; i &lt; clflush_count; ++i) {</div><div class='add'>+			psb_clflush(clf);</div><div class='add'>+			clf += clflush_add;</div><div class='add'>+		}</div><div class='add'>+		mb();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kunmap_atomic(v, KM_USER0);</div><div class='add'>+	spin_unlock(lock);</div><div class='add'>+</div><div class='add'>+	pt-&gt;count = 0;</div><div class='add'>+	pt-&gt;pd = pd;</div><div class='add'>+	pt-&gt;index = 0;</div><div class='add'>+</div><div class='add'>+	return pt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct psb_mmu_pt *psb_mmu_pt_alloc_map_lock(struct psb_mmu_pd *pd,</div><div class='add'>+					     unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	uint32_t index = psb_mmu_pd_index(addr);</div><div class='add'>+	struct psb_mmu_pt *pt;</div><div class='add'>+	uint32_t *v;</div><div class='add'>+	spinlock_t *lock = &amp;pd-&gt;driver-&gt;lock;</div><div class='add'>+</div><div class='add'>+	spin_lock(lock);</div><div class='add'>+	pt = pd-&gt;tables[index];</div><div class='add'>+	while (!pt) {</div><div class='add'>+		spin_unlock(lock);</div><div class='add'>+		pt = psb_mmu_alloc_pt(pd);</div><div class='add'>+		if (!pt)</div><div class='add'>+			return NULL;</div><div class='add'>+		spin_lock(lock);</div><div class='add'>+</div><div class='add'>+		if (pd-&gt;tables[index]) {</div><div class='add'>+			spin_unlock(lock);</div><div class='add'>+			psb_mmu_free_pt(pt);</div><div class='add'>+			spin_lock(lock);</div><div class='add'>+			pt = pd-&gt;tables[index];</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		v = kmap_atomic(pd-&gt;p, KM_USER0);</div><div class='add'>+		pd-&gt;tables[index] = pt;</div><div class='add'>+		v[index] = (page_to_pfn(pt-&gt;p) &lt;&lt; 12) | pd-&gt;pd_mask;</div><div class='add'>+		pt-&gt;index = index;</div><div class='add'>+		kunmap_atomic((void *) v, KM_USER0);</div><div class='add'>+</div><div class='add'>+		if (pd-&gt;hw_context != -1) {</div><div class='add'>+			psb_mmu_clflush(pd-&gt;driver, (void *) &amp;v[index]);</div><div class='add'>+			atomic_set(&amp;pd-&gt;driver-&gt;needs_tlbflush, 1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	pt-&gt;v = kmap_atomic(pt-&gt;p, KM_USER0);</div><div class='add'>+	return pt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct psb_mmu_pt *psb_mmu_pt_map_lock(struct psb_mmu_pd *pd,</div><div class='add'>+					      unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	uint32_t index = psb_mmu_pd_index(addr);</div><div class='add'>+	struct psb_mmu_pt *pt;</div><div class='add'>+	spinlock_t *lock = &amp;pd-&gt;driver-&gt;lock;</div><div class='add'>+</div><div class='add'>+	spin_lock(lock);</div><div class='add'>+	pt = pd-&gt;tables[index];</div><div class='add'>+	if (!pt) {</div><div class='add'>+		spin_unlock(lock);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	pt-&gt;v = kmap_atomic(pt-&gt;p, KM_USER0);</div><div class='add'>+	return pt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_mmu_pt_unmap_unlock(struct psb_mmu_pt *pt)</div><div class='add'>+{</div><div class='add'>+	struct psb_mmu_pd *pd = pt-&gt;pd;</div><div class='add'>+	uint32_t *v;</div><div class='add'>+</div><div class='add'>+	kunmap_atomic(pt-&gt;v, KM_USER0);</div><div class='add'>+	if (pt-&gt;count == 0) {</div><div class='add'>+		v = kmap_atomic(pd-&gt;p, KM_USER0);</div><div class='add'>+		v[pt-&gt;index] = pd-&gt;invalid_pde;</div><div class='add'>+		pd-&gt;tables[pt-&gt;index] = NULL;</div><div class='add'>+</div><div class='add'>+		if (pd-&gt;hw_context != -1) {</div><div class='add'>+			psb_mmu_clflush(pd-&gt;driver,</div><div class='add'>+					(void *) &amp;v[pt-&gt;index]);</div><div class='add'>+			atomic_set(&amp;pd-&gt;driver-&gt;needs_tlbflush, 1);</div><div class='add'>+		}</div><div class='add'>+		kunmap_atomic(pt-&gt;v, KM_USER0);</div><div class='add'>+		spin_unlock(&amp;pd-&gt;driver-&gt;lock);</div><div class='add'>+		psb_mmu_free_pt(pt);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;pd-&gt;driver-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void psb_mmu_set_pte(struct psb_mmu_pt *pt,</div><div class='add'>+				   unsigned long addr, uint32_t pte)</div><div class='add'>+{</div><div class='add'>+	pt-&gt;v[psb_mmu_pt_index(addr)] = pte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void psb_mmu_invalidate_pte(struct psb_mmu_pt *pt,</div><div class='add'>+					  unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	pt-&gt;v[psb_mmu_pt_index(addr)] = pt-&gt;pd-&gt;invalid_pte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void psb_mmu_mirror_gtt(struct psb_mmu_pd *pd,</div><div class='add'>+			uint32_t mmu_offset, uint32_t gtt_start,</div><div class='add'>+			uint32_t gtt_pages)</div><div class='add'>+{</div><div class='add'>+	uint32_t *v;</div><div class='add'>+	uint32_t start = psb_mmu_pd_index(mmu_offset);</div><div class='add'>+	struct psb_mmu_driver *driver = pd-&gt;driver;</div><div class='add'>+	int num_pages = gtt_pages;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;driver-&gt;sem);</div><div class='add'>+	spin_lock(&amp;driver-&gt;lock);</div><div class='add'>+</div><div class='add'>+	v = kmap_atomic(pd-&gt;p, KM_USER0);</div><div class='add'>+	v += start;</div><div class='add'>+</div><div class='add'>+	while (gtt_pages--) {</div><div class='add'>+		*v++ = gtt_start | pd-&gt;pd_mask;</div><div class='add'>+		gtt_start += PAGE_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*ttm_tt_cache_flush(&amp;pd-&gt;p, num_pages);*/</div><div class='add'>+	psb_pages_clflush(pd-&gt;driver, &amp;pd-&gt;p, num_pages);</div><div class='add'>+	kunmap_atomic(v, KM_USER0);</div><div class='add'>+	spin_unlock(&amp;driver-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (pd-&gt;hw_context != -1)</div><div class='add'>+		atomic_set(&amp;pd-&gt;driver-&gt;needs_tlbflush, 1);</div><div class='add'>+</div><div class='add'>+	up_read(&amp;pd-&gt;driver-&gt;sem);</div><div class='add'>+	psb_mmu_flush_pd(pd-&gt;driver, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct psb_mmu_pd *psb_mmu_get_default_pd(struct psb_mmu_driver *driver)</div><div class='add'>+{</div><div class='add'>+	struct psb_mmu_pd *pd;</div><div class='add'>+</div><div class='add'>+	/* down_read(&amp;driver-&gt;sem); */</div><div class='add'>+	pd = driver-&gt;default_pd;</div><div class='add'>+	/* up_read(&amp;driver-&gt;sem); */</div><div class='add'>+</div><div class='add'>+	return pd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns the physical address of the PD shared by sgx/msvdx */</div><div class='add'>+uint32_t psb_get_default_pd_addr(struct psb_mmu_driver *driver)</div><div class='add'>+{</div><div class='add'>+	struct psb_mmu_pd *pd;</div><div class='add'>+</div><div class='add'>+	pd = psb_mmu_get_default_pd(driver);</div><div class='add'>+	return page_to_pfn(pd-&gt;p) &lt;&lt; PAGE_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_mmu_driver_takedown(struct psb_mmu_driver *driver)</div><div class='add'>+{</div><div class='add'>+	psb_mmu_free_pagedir(driver-&gt;default_pd);</div><div class='add'>+	kfree(driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct psb_mmu_driver *psb_mmu_driver_init(uint8_t __iomem * registers,</div><div class='add'>+					int trap_pagefaults,</div><div class='add'>+					int invalid_type,</div><div class='add'>+					struct drm_psb_private *dev_priv)</div><div class='add'>+{</div><div class='add'>+	struct psb_mmu_driver *driver;</div><div class='add'>+</div><div class='add'>+	driver = kmalloc(sizeof(*driver), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!driver)</div><div class='add'>+		return NULL;</div><div class='add'>+	driver-&gt;dev_priv = dev_priv;</div><div class='add'>+</div><div class='add'>+	driver-&gt;default_pd = psb_mmu_alloc_pd(driver, trap_pagefaults,</div><div class='add'>+					      invalid_type);</div><div class='add'>+	if (!driver-&gt;default_pd)</div><div class='add'>+		goto out_err1;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;driver-&gt;lock);</div><div class='add'>+	init_rwsem(&amp;driver-&gt;sem);</div><div class='add'>+	down_write(&amp;driver-&gt;sem);</div><div class='add'>+	driver-&gt;register_map = registers;</div><div class='add'>+	atomic_set(&amp;driver-&gt;needs_tlbflush, 1);</div><div class='add'>+</div><div class='add'>+	driver-&gt;has_clflush = 0;</div><div class='add'>+</div><div class='add'>+	if (boot_cpu_has(X86_FEATURE_CLFLSH)) {</div><div class='add'>+		uint32_t tfms, misc, cap0, cap4, clflush_size;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * clflush size is determined at kernel setup for x86_64</div><div class='add'>+		 *  but not for i386. We have to do it here.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		cpuid(0x00000001, &amp;tfms, &amp;misc, &amp;cap0, &amp;cap4);</div><div class='add'>+		clflush_size = ((misc &gt;&gt; 8) &amp; 0xff) * 8;</div><div class='add'>+		driver-&gt;has_clflush = 1;</div><div class='add'>+		driver-&gt;clflush_add =</div><div class='add'>+		    PAGE_SIZE * clflush_size / sizeof(uint32_t);</div><div class='add'>+		driver-&gt;clflush_mask = driver-&gt;clflush_add - 1;</div><div class='add'>+		driver-&gt;clflush_mask = ~driver-&gt;clflush_mask;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	up_write(&amp;driver-&gt;sem);</div><div class='add'>+	return driver;</div><div class='add'>+</div><div class='add'>+out_err1:</div><div class='add'>+	kfree(driver);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_mmu_flush_ptes(struct psb_mmu_pd *pd,</div><div class='add'>+			       unsigned long address, uint32_t num_pages,</div><div class='add'>+			       uint32_t desired_tile_stride,</div><div class='add'>+			       uint32_t hw_tile_stride)</div><div class='add'>+{</div><div class='add'>+	struct psb_mmu_pt *pt;</div><div class='add'>+	uint32_t rows = 1;</div><div class='add'>+	uint32_t i;</div><div class='add'>+	unsigned long addr;</div><div class='add'>+	unsigned long end;</div><div class='add'>+	unsigned long next;</div><div class='add'>+	unsigned long add;</div><div class='add'>+	unsigned long row_add;</div><div class='add'>+	unsigned long clflush_add = pd-&gt;driver-&gt;clflush_add;</div><div class='add'>+	unsigned long clflush_mask = pd-&gt;driver-&gt;clflush_mask;</div><div class='add'>+</div><div class='add'>+	if (!pd-&gt;driver-&gt;has_clflush) {</div><div class='add'>+		/*ttm_tt_cache_flush(&amp;pd-&gt;p, num_pages);*/</div><div class='add'>+		psb_pages_clflush(pd-&gt;driver, &amp;pd-&gt;p, num_pages);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hw_tile_stride)</div><div class='add'>+		rows = num_pages / desired_tile_stride;</div><div class='add'>+	else</div><div class='add'>+		desired_tile_stride = num_pages;</div><div class='add'>+</div><div class='add'>+	add = desired_tile_stride &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	row_add = hw_tile_stride &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	mb();</div><div class='add'>+	for (i = 0; i &lt; rows; ++i) {</div><div class='add'>+</div><div class='add'>+		addr = address;</div><div class='add'>+		end = addr + add;</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			next = psb_pd_addr_end(addr, end);</div><div class='add'>+			pt = psb_mmu_pt_map_lock(pd, addr);</div><div class='add'>+			if (!pt)</div><div class='add'>+				continue;</div><div class='add'>+			do {</div><div class='add'>+				psb_clflush(&amp;pt-&gt;v</div><div class='add'>+					    [psb_mmu_pt_index(addr)]);</div><div class='add'>+			} while (addr +=</div><div class='add'>+				 clflush_add,</div><div class='add'>+				 (addr &amp; clflush_mask) &lt; next);</div><div class='add'>+</div><div class='add'>+			psb_mmu_pt_unmap_unlock(pt);</div><div class='add'>+		} while (addr = next, next != end);</div><div class='add'>+		address += row_add;</div><div class='add'>+	}</div><div class='add'>+	mb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_mmu_remove_pfn_sequence(struct psb_mmu_pd *pd,</div><div class='add'>+				 unsigned long address, uint32_t num_pages)</div><div class='add'>+{</div><div class='add'>+	struct psb_mmu_pt *pt;</div><div class='add'>+	unsigned long addr;</div><div class='add'>+	unsigned long end;</div><div class='add'>+	unsigned long next;</div><div class='add'>+	unsigned long f_address = address;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;pd-&gt;driver-&gt;sem);</div><div class='add'>+</div><div class='add'>+	addr = address;</div><div class='add'>+	end = addr + (num_pages &lt;&lt; PAGE_SHIFT);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		next = psb_pd_addr_end(addr, end);</div><div class='add'>+		pt = psb_mmu_pt_alloc_map_lock(pd, addr);</div><div class='add'>+		if (!pt)</div><div class='add'>+			goto out;</div><div class='add'>+		do {</div><div class='add'>+			psb_mmu_invalidate_pte(pt, addr);</div><div class='add'>+			--pt-&gt;count;</div><div class='add'>+		} while (addr += PAGE_SIZE, addr &lt; next);</div><div class='add'>+		psb_mmu_pt_unmap_unlock(pt);</div><div class='add'>+</div><div class='add'>+	} while (addr = next, next != end);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (pd-&gt;hw_context != -1)</div><div class='add'>+		psb_mmu_flush_ptes(pd, f_address, num_pages, 1, 1);</div><div class='add'>+</div><div class='add'>+	up_read(&amp;pd-&gt;driver-&gt;sem);</div><div class='add'>+</div><div class='add'>+	if (pd-&gt;hw_context != -1)</div><div class='add'>+		psb_mmu_flush(pd-&gt;driver, 0);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_mmu_remove_pages(struct psb_mmu_pd *pd, unsigned long address,</div><div class='add'>+			  uint32_t num_pages, uint32_t desired_tile_stride,</div><div class='add'>+			  uint32_t hw_tile_stride)</div><div class='add'>+{</div><div class='add'>+	struct psb_mmu_pt *pt;</div><div class='add'>+	uint32_t rows = 1;</div><div class='add'>+	uint32_t i;</div><div class='add'>+	unsigned long addr;</div><div class='add'>+	unsigned long end;</div><div class='add'>+	unsigned long next;</div><div class='add'>+	unsigned long add;</div><div class='add'>+	unsigned long row_add;</div><div class='add'>+	unsigned long f_address = address;</div><div class='add'>+</div><div class='add'>+	if (hw_tile_stride)</div><div class='add'>+		rows = num_pages / desired_tile_stride;</div><div class='add'>+	else</div><div class='add'>+		desired_tile_stride = num_pages;</div><div class='add'>+</div><div class='add'>+	add = desired_tile_stride &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	row_add = hw_tile_stride &lt;&lt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	/* down_read(&amp;pd-&gt;driver-&gt;sem); */</div><div class='add'>+</div><div class='add'>+	/* Make sure we only need to flush this processor's cache */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rows; ++i) {</div><div class='add'>+</div><div class='add'>+		addr = address;</div><div class='add'>+		end = addr + add;</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			next = psb_pd_addr_end(addr, end);</div><div class='add'>+			pt = psb_mmu_pt_map_lock(pd, addr);</div><div class='add'>+			if (!pt)</div><div class='add'>+				continue;</div><div class='add'>+			do {</div><div class='add'>+				psb_mmu_invalidate_pte(pt, addr);</div><div class='add'>+				--pt-&gt;count;</div><div class='add'>+</div><div class='add'>+			} while (addr += PAGE_SIZE, addr &lt; next);</div><div class='add'>+			psb_mmu_pt_unmap_unlock(pt);</div><div class='add'>+</div><div class='add'>+		} while (addr = next, next != end);</div><div class='add'>+		address += row_add;</div><div class='add'>+	}</div><div class='add'>+	if (pd-&gt;hw_context != -1)</div><div class='add'>+		psb_mmu_flush_ptes(pd, f_address, num_pages,</div><div class='add'>+				   desired_tile_stride, hw_tile_stride);</div><div class='add'>+</div><div class='add'>+	/* up_read(&amp;pd-&gt;driver-&gt;sem); */</div><div class='add'>+</div><div class='add'>+	if (pd-&gt;hw_context != -1)</div><div class='add'>+		psb_mmu_flush(pd-&gt;driver, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_mmu_insert_pfn_sequence(struct psb_mmu_pd *pd, uint32_t start_pfn,</div><div class='add'>+				unsigned long address, uint32_t num_pages,</div><div class='add'>+				int type)</div><div class='add'>+{</div><div class='add'>+	struct psb_mmu_pt *pt;</div><div class='add'>+	uint32_t pte;</div><div class='add'>+	unsigned long addr;</div><div class='add'>+	unsigned long end;</div><div class='add'>+	unsigned long next;</div><div class='add'>+	unsigned long f_address = address;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;pd-&gt;driver-&gt;sem);</div><div class='add'>+</div><div class='add'>+	addr = address;</div><div class='add'>+	end = addr + (num_pages &lt;&lt; PAGE_SHIFT);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		next = psb_pd_addr_end(addr, end);</div><div class='add'>+		pt = psb_mmu_pt_alloc_map_lock(pd, addr);</div><div class='add'>+		if (!pt) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		do {</div><div class='add'>+			pte = psb_mmu_mask_pte(start_pfn++, type);</div><div class='add'>+			psb_mmu_set_pte(pt, addr, pte);</div><div class='add'>+			pt-&gt;count++;</div><div class='add'>+		} while (addr += PAGE_SIZE, addr &lt; next);</div><div class='add'>+		psb_mmu_pt_unmap_unlock(pt);</div><div class='add'>+</div><div class='add'>+	} while (addr = next, next != end);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (pd-&gt;hw_context != -1)</div><div class='add'>+		psb_mmu_flush_ptes(pd, f_address, num_pages, 1, 1);</div><div class='add'>+</div><div class='add'>+	up_read(&amp;pd-&gt;driver-&gt;sem);</div><div class='add'>+</div><div class='add'>+	if (pd-&gt;hw_context != -1)</div><div class='add'>+		psb_mmu_flush(pd-&gt;driver, 1);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_mmu_insert_pages(struct psb_mmu_pd *pd, struct page **pages,</div><div class='add'>+			 unsigned long address, uint32_t num_pages,</div><div class='add'>+			 uint32_t desired_tile_stride,</div><div class='add'>+			 uint32_t hw_tile_stride, int type)</div><div class='add'>+{</div><div class='add'>+	struct psb_mmu_pt *pt;</div><div class='add'>+	uint32_t rows = 1;</div><div class='add'>+	uint32_t i;</div><div class='add'>+	uint32_t pte;</div><div class='add'>+	unsigned long addr;</div><div class='add'>+	unsigned long end;</div><div class='add'>+	unsigned long next;</div><div class='add'>+	unsigned long add;</div><div class='add'>+	unsigned long row_add;</div><div class='add'>+	unsigned long f_address = address;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (hw_tile_stride) {</div><div class='add'>+		if (num_pages % desired_tile_stride != 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		rows = num_pages / desired_tile_stride;</div><div class='add'>+	} else {</div><div class='add'>+		desired_tile_stride = num_pages;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	add = desired_tile_stride &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	row_add = hw_tile_stride &lt;&lt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;pd-&gt;driver-&gt;sem);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rows; ++i) {</div><div class='add'>+</div><div class='add'>+		addr = address;</div><div class='add'>+		end = addr + add;</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			next = psb_pd_addr_end(addr, end);</div><div class='add'>+			pt = psb_mmu_pt_alloc_map_lock(pd, addr);</div><div class='add'>+			if (!pt) {</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			do {</div><div class='add'>+				pte =</div><div class='add'>+				    psb_mmu_mask_pte(page_to_pfn(*pages++),</div><div class='add'>+						     type);</div><div class='add'>+				psb_mmu_set_pte(pt, addr, pte);</div><div class='add'>+				pt-&gt;count++;</div><div class='add'>+			} while (addr += PAGE_SIZE, addr &lt; next);</div><div class='add'>+			psb_mmu_pt_unmap_unlock(pt);</div><div class='add'>+</div><div class='add'>+		} while (addr = next, next != end);</div><div class='add'>+</div><div class='add'>+		address += row_add;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	if (pd-&gt;hw_context != -1)</div><div class='add'>+		psb_mmu_flush_ptes(pd, f_address, num_pages,</div><div class='add'>+				   desired_tile_stride, hw_tile_stride);</div><div class='add'>+</div><div class='add'>+	up_read(&amp;pd-&gt;driver-&gt;sem);</div><div class='add'>+</div><div class='add'>+	if (pd-&gt;hw_context != -1)</div><div class='add'>+		psb_mmu_flush(pd-&gt;driver, 1);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_mmu_virtual_to_pfn(struct psb_mmu_pd *pd, uint32_t virtual,</div><div class='add'>+			   unsigned long *pfn)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct psb_mmu_pt *pt;</div><div class='add'>+	uint32_t tmp;</div><div class='add'>+	spinlock_t *lock = &amp;pd-&gt;driver-&gt;lock;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;pd-&gt;driver-&gt;sem);</div><div class='add'>+	pt = psb_mmu_pt_map_lock(pd, virtual);</div><div class='add'>+	if (!pt) {</div><div class='add'>+		uint32_t *v;</div><div class='add'>+</div><div class='add'>+		spin_lock(lock);</div><div class='add'>+		v = kmap_atomic(pd-&gt;p, KM_USER0);</div><div class='add'>+		tmp = v[psb_mmu_pd_index(virtual)];</div><div class='add'>+		kunmap_atomic(v, KM_USER0);</div><div class='add'>+		spin_unlock(lock);</div><div class='add'>+</div><div class='add'>+		if (tmp != pd-&gt;invalid_pde || !(tmp &amp; PSB_PTE_VALID) ||</div><div class='add'>+		    !(pd-&gt;invalid_pte &amp; PSB_PTE_VALID)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		ret = 0;</div><div class='add'>+		*pfn = pd-&gt;invalid_pte &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	tmp = pt-&gt;v[psb_mmu_pt_index(virtual)];</div><div class='add'>+	if (!(tmp &amp; PSB_PTE_VALID)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		ret = 0;</div><div class='add'>+		*pfn = tmp &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	}</div><div class='add'>+	psb_mmu_pt_unmap_unlock(pt);</div><div class='add'>+out:</div><div class='add'>+	up_read(&amp;pd-&gt;driver-&gt;sem);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/oaktrail.h b/drivers/gpu/drm/gma500/oaktrail.h<br/>new file mode 100644<br/>index 000000000000..2da1f368f14e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/oaktrail.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/oaktrail.h</a></div><div class='hunk'>@@ -0,0 +1,252 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ * Copyright (c) 2007-2011, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+/* MID device specific descriptors */</div><div class='add'>+</div><div class='add'>+struct oaktrail_vbt {</div><div class='add'>+	s8 signature[4];	/*4 bytes,"$GCT" */</div><div class='add'>+	u8 revision;</div><div class='add'>+	u8 size;</div><div class='add'>+	u8 checksum;</div><div class='add'>+	void *oaktrail_gct;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct oaktrail_timing_info {</div><div class='add'>+	u16 pixel_clock;</div><div class='add'>+	u8 hactive_lo;</div><div class='add'>+	u8 hblank_lo;</div><div class='add'>+	u8 hblank_hi:4;</div><div class='add'>+	u8 hactive_hi:4;</div><div class='add'>+	u8 vactive_lo;</div><div class='add'>+	u8 vblank_lo;</div><div class='add'>+	u8 vblank_hi:4;</div><div class='add'>+	u8 vactive_hi:4;</div><div class='add'>+	u8 hsync_offset_lo;</div><div class='add'>+	u8 hsync_pulse_width_lo;</div><div class='add'>+	u8 vsync_pulse_width_lo:4;</div><div class='add'>+	u8 vsync_offset_lo:4;</div><div class='add'>+	u8 vsync_pulse_width_hi:2;</div><div class='add'>+	u8 vsync_offset_hi:2;</div><div class='add'>+	u8 hsync_pulse_width_hi:2;</div><div class='add'>+	u8 hsync_offset_hi:2;</div><div class='add'>+	u8 width_mm_lo;</div><div class='add'>+	u8 height_mm_lo;</div><div class='add'>+	u8 height_mm_hi:4;</div><div class='add'>+	u8 width_mm_hi:4;</div><div class='add'>+	u8 hborder;</div><div class='add'>+	u8 vborder;</div><div class='add'>+	u8 unknown0:1;</div><div class='add'>+	u8 hsync_positive:1;</div><div class='add'>+	u8 vsync_positive:1;</div><div class='add'>+	u8 separate_sync:2;</div><div class='add'>+	u8 stereo:1;</div><div class='add'>+	u8 unknown6:1;</div><div class='add'>+	u8 interlaced:1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct gct_r10_timing_info {</div><div class='add'>+	u16 pixel_clock;</div><div class='add'>+	u32 hactive_lo:8;</div><div class='add'>+	u32 hactive_hi:4;</div><div class='add'>+	u32 hblank_lo:8;</div><div class='add'>+	u32 hblank_hi:4;</div><div class='add'>+	u32 hsync_offset_lo:8;</div><div class='add'>+	u16 hsync_offset_hi:2;</div><div class='add'>+	u16 hsync_pulse_width_lo:8;</div><div class='add'>+	u16 hsync_pulse_width_hi:2;</div><div class='add'>+	u16 hsync_positive:1;</div><div class='add'>+	u16 rsvd_1:3;</div><div class='add'>+	u8  vactive_lo:8;</div><div class='add'>+	u16 vactive_hi:4;</div><div class='add'>+	u16 vblank_lo:8;</div><div class='add'>+	u16 vblank_hi:4;</div><div class='add'>+	u16 vsync_offset_lo:4;</div><div class='add'>+	u16 vsync_offset_hi:2;</div><div class='add'>+	u16 vsync_pulse_width_lo:4;</div><div class='add'>+	u16 vsync_pulse_width_hi:2;</div><div class='add'>+	u16 vsync_positive:1;</div><div class='add'>+	u16 rsvd_2:3;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct oaktrail_panel_descriptor_v1 {</div><div class='add'>+	u32 Panel_Port_Control; /* 1 dword, Register 0x61180 if LVDS */</div><div class='add'>+				/* 0x61190 if MIPI */</div><div class='add'>+	u32 Panel_Power_On_Sequencing;/*1 dword,Register 0x61208,*/</div><div class='add'>+	u32 Panel_Power_Off_Sequencing;/*1 dword,Register 0x6120C,*/</div><div class='add'>+	u32 Panel_Power_Cycle_Delay_and_Reference_Divisor;/* 1 dword */</div><div class='add'>+						/* Register 0x61210 */</div><div class='add'>+	struct oaktrail_timing_info DTD;/*18 bytes, Standard definition */</div><div class='add'>+	u16 Panel_Backlight_Inverter_Descriptor;/* 16 bits, as follows */</div><div class='add'>+				/* Bit 0, Frequency, 15 bits,0 - 32767Hz */</div><div class='add'>+			/* Bit 15, Polarity, 1 bit, 0: Normal, 1: Inverted */</div><div class='add'>+	u16 Panel_MIPI_Display_Descriptor;</div><div class='add'>+			/*16 bits, Defined as follows: */</div><div class='add'>+			/* if MIPI, 0x0000 if LVDS */</div><div class='add'>+			/* Bit 0, Type, 2 bits, */</div><div class='add'>+			/* 0: Type-1, */</div><div class='add'>+			/* 1: Type-2, */</div><div class='add'>+			/* 2: Type-3, */</div><div class='add'>+			/* 3: Type-4 */</div><div class='add'>+			/* Bit 2, Pixel Format, 4 bits */</div><div class='add'>+			/* Bit0: 16bpp (not supported in LNC), */</div><div class='add'>+			/* Bit1: 18bpp loosely packed, */</div><div class='add'>+			/* Bit2: 18bpp packed, */</div><div class='add'>+			/* Bit3: 24bpp */</div><div class='add'>+			/* Bit 6, Reserved, 2 bits, 00b */</div><div class='add'>+			/* Bit 8, Minimum Supported Frame Rate, 6 bits, 0 - 63Hz */</div><div class='add'>+			/* Bit 14, Reserved, 2 bits, 00b */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct oaktrail_panel_descriptor_v2 {</div><div class='add'>+	u32 Panel_Port_Control; /* 1 dword, Register 0x61180 if LVDS */</div><div class='add'>+				/* 0x61190 if MIPI */</div><div class='add'>+	u32 Panel_Power_On_Sequencing;/*1 dword,Register 0x61208,*/</div><div class='add'>+	u32 Panel_Power_Off_Sequencing;/*1 dword,Register 0x6120C,*/</div><div class='add'>+	u8 Panel_Power_Cycle_Delay_and_Reference_Divisor;/* 1 byte */</div><div class='add'>+						/* Register 0x61210 */</div><div class='add'>+	struct oaktrail_timing_info DTD;/*18 bytes, Standard definition */</div><div class='add'>+	u16 Panel_Backlight_Inverter_Descriptor;/*16 bits, as follows*/</div><div class='add'>+				/*Bit 0, Frequency, 16 bits, 0 - 32767Hz*/</div><div class='add'>+	u8 Panel_Initial_Brightness;/* [7:0] 0 - 100% */</div><div class='add'>+			/*Bit 7, Polarity, 1 bit,0: Normal, 1: Inverted*/</div><div class='add'>+	u16 Panel_MIPI_Display_Descriptor;</div><div class='add'>+			/*16 bits, Defined as follows: */</div><div class='add'>+			/* if MIPI, 0x0000 if LVDS */</div><div class='add'>+			/* Bit 0, Type, 2 bits, */</div><div class='add'>+			/* 0: Type-1, */</div><div class='add'>+			/* 1: Type-2, */</div><div class='add'>+			/* 2: Type-3, */</div><div class='add'>+			/* 3: Type-4 */</div><div class='add'>+			/* Bit 2, Pixel Format, 4 bits */</div><div class='add'>+			/* Bit0: 16bpp (not supported in LNC), */</div><div class='add'>+			/* Bit1: 18bpp loosely packed, */</div><div class='add'>+			/* Bit2: 18bpp packed, */</div><div class='add'>+			/* Bit3: 24bpp */</div><div class='add'>+			/* Bit 6, Reserved, 2 bits, 00b */</div><div class='add'>+			/* Bit 8, Minimum Supported Frame Rate, 6 bits, 0 - 63Hz */</div><div class='add'>+			/* Bit 14, Reserved, 2 bits, 00b */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union oaktrail_panel_rx {</div><div class='add'>+	struct {</div><div class='add'>+		u16 NumberOfLanes:2; /*Num of Lanes, 2 bits,0 = 1 lane,*/</div><div class='add'>+			/* 1 = 2 lanes, 2 = 3 lanes, 3 = 4 lanes. */</div><div class='add'>+		u16 MaxLaneFreq:3; /* 0: 100MHz, 1: 200MHz, 2: 300MHz, */</div><div class='add'>+		/*3: 400MHz, 4: 500MHz, 5: 600MHz, 6: 700MHz, 7: 800MHz.*/</div><div class='add'>+		u16 SupportedVideoTransferMode:2; /*0: Non-burst only */</div><div class='add'>+					/* 1: Burst and non-burst */</div><div class='add'>+					/* 2/3: Reserved */</div><div class='add'>+		u16 HSClkBehavior:1; /*0: Continuous, 1: Non-continuous*/</div><div class='add'>+		u16 DuoDisplaySupport:1; /*1 bit,0: No, 1: Yes*/</div><div class='add'>+		u16 ECC_ChecksumCapabilities:1;/*1 bit,0: No, 1: Yes*/</div><div class='add'>+		u16 BidirectionalCommunication:1;/*1 bit,0: No, 1: Yes */</div><div class='add'>+		u16 Rsvd:5;/*5 bits,00000b */</div><div class='add'>+	} panelrx;</div><div class='add'>+	u16 panel_receiver;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct oaktrail_gct_v1 {</div><div class='add'>+	union { /*8 bits,Defined as follows: */</div><div class='add'>+		struct {</div><div class='add'>+			u8 PanelType:4; /*4 bits, Bit field for panels*/</div><div class='add'>+					/* 0 - 3: 0 = LVDS, 1 = MIPI*/</div><div class='add'>+					/*2 bits,Specifies which of the*/</div><div class='add'>+			u8 BootPanelIndex:2;</div><div class='add'>+					/* 4 panels to use by default*/</div><div class='add'>+			u8 BootMIPI_DSI_RxIndex:2;/*Specifies which of*/</div><div class='add'>+					/* the 4 MIPI DSI receivers to use*/</div><div class='add'>+		} PD;</div><div class='add'>+		u8 PanelDescriptor;</div><div class='add'>+	};</div><div class='add'>+	struct oaktrail_panel_descriptor_v1 panel[4];/*panel descrs,38 bytes each*/</div><div class='add'>+	union oaktrail_panel_rx panelrx[4]; /* panel receivers*/</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct oaktrail_gct_v2 {</div><div class='add'>+	union { /*8 bits,Defined as follows: */</div><div class='add'>+		struct {</div><div class='add'>+			u8 PanelType:4; /*4 bits, Bit field for panels*/</div><div class='add'>+					/* 0 - 3: 0 = LVDS, 1 = MIPI*/</div><div class='add'>+					/*2 bits,Specifies which of the*/</div><div class='add'>+			u8 BootPanelIndex:2;</div><div class='add'>+					/* 4 panels to use by default*/</div><div class='add'>+			u8 BootMIPI_DSI_RxIndex:2;/*Specifies which of*/</div><div class='add'>+					/* the 4 MIPI DSI receivers to use*/</div><div class='add'>+		} PD;</div><div class='add'>+		u8 PanelDescriptor;</div><div class='add'>+	};</div><div class='add'>+	struct oaktrail_panel_descriptor_v2 panel[4];/*panel descrs,38 bytes each*/</div><div class='add'>+	union oaktrail_panel_rx panelrx[4]; /* panel receivers*/</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct oaktrail_gct_data {</div><div class='add'>+	u8 bpi; /* boot panel index, number of panel used during boot */</div><div class='add'>+	u8 pt; /* panel type, 4 bit field, 0=lvds, 1=mipi */</div><div class='add'>+	struct oaktrail_timing_info DTD; /* timing info for the selected panel */</div><div class='add'>+	u32 Panel_Port_Control;</div><div class='add'>+	u32 PP_On_Sequencing;/*1 dword,Register 0x61208,*/</div><div class='add'>+	u32 PP_Off_Sequencing;/*1 dword,Register 0x6120C,*/</div><div class='add'>+	u32 PP_Cycle_Delay;</div><div class='add'>+	u16 Panel_Backlight_Inverter_Descriptor;</div><div class='add'>+	u16 Panel_MIPI_Display_Descriptor;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MODE_SETTING_IN_CRTC		0x1</div><div class='add'>+#define MODE_SETTING_IN_ENCODER		0x2</div><div class='add'>+#define MODE_SETTING_ON_GOING		0x3</div><div class='add'>+#define MODE_SETTING_IN_DSR		0x4</div><div class='add'>+#define MODE_SETTING_ENCODER_DONE	0x8</div><div class='add'>+</div><div class='add'>+#define GCT_R10_HEADER_SIZE		16</div><div class='add'>+#define GCT_R10_DISPLAY_DESC_SIZE	28</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Moorestown HDMI interfaces</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct oaktrail_hdmi_dev {</div><div class='add'>+	struct pci_dev *dev;</div><div class='add'>+	void __iomem *regs;</div><div class='add'>+	unsigned int mmio, mmio_len;</div><div class='add'>+	int dpms_mode;</div><div class='add'>+	struct hdmi_i2c_dev *i2c_dev;</div><div class='add'>+</div><div class='add'>+	/* register state */</div><div class='add'>+	u32 saveDPLL_CTRL;</div><div class='add'>+	u32 saveDPLL_DIV_CTRL;</div><div class='add'>+	u32 saveDPLL_ADJUST;</div><div class='add'>+	u32 saveDPLL_UPDATE;</div><div class='add'>+	u32 saveDPLL_CLK_ENABLE;</div><div class='add'>+	u32 savePCH_HTOTAL_B;</div><div class='add'>+	u32 savePCH_HBLANK_B;</div><div class='add'>+	u32 savePCH_HSYNC_B;</div><div class='add'>+	u32 savePCH_VTOTAL_B;</div><div class='add'>+	u32 savePCH_VBLANK_B;</div><div class='add'>+	u32 savePCH_VSYNC_B;</div><div class='add'>+	u32 savePCH_PIPEBCONF;</div><div class='add'>+	u32 savePCH_PIPEBSRC;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern void oaktrail_hdmi_setup(struct drm_device *dev);</div><div class='add'>+extern void oaktrail_hdmi_teardown(struct drm_device *dev);</div><div class='add'>+extern int  oaktrail_hdmi_i2c_init(struct pci_dev *dev);</div><div class='add'>+extern void oaktrail_hdmi_i2c_exit(struct pci_dev *dev);</div><div class='add'>+extern void oaktrail_hdmi_save(struct drm_device *dev);</div><div class='add'>+extern void oaktrail_hdmi_restore(struct drm_device *dev);</div><div class='add'>+extern void oaktrail_hdmi_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev);</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/oaktrail_crtc.c b/drivers/gpu/drm/gma500/oaktrail_crtc.c<br/>new file mode 100644<br/>index 000000000000..9d12a3ee1600<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/oaktrail_crtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/oaktrail_crtc.c</a></div><div class='hunk'>@@ -0,0 +1,604 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2009 Intel Corporation</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include "framebuffer.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_intel_drv.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include "psb_intel_display.h"</div><div class='add'>+#include "power.h"</div><div class='add'>+</div><div class='add'>+struct psb_intel_range_t {</div><div class='add'>+	int min, max;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct oaktrail_limit_t {</div><div class='add'>+	struct psb_intel_range_t dot, m, p1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct oaktrail_clock_t {</div><div class='add'>+	/* derived values */</div><div class='add'>+	int dot;</div><div class='add'>+	int m;</div><div class='add'>+	int p1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MRST_LIMIT_LVDS_100L	    0</div><div class='add'>+#define MRST_LIMIT_LVDS_83	    1</div><div class='add'>+#define MRST_LIMIT_LVDS_100	    2</div><div class='add'>+</div><div class='add'>+#define MRST_DOT_MIN		  19750</div><div class='add'>+#define MRST_DOT_MAX		  120000</div><div class='add'>+#define MRST_M_MIN_100L		    20</div><div class='add'>+#define MRST_M_MIN_100		    10</div><div class='add'>+#define MRST_M_MIN_83		    12</div><div class='add'>+#define MRST_M_MAX_100L		    34</div><div class='add'>+#define MRST_M_MAX_100		    17</div><div class='add'>+#define MRST_M_MAX_83		    20</div><div class='add'>+#define MRST_P1_MIN		    2</div><div class='add'>+#define MRST_P1_MAX_0		    7</div><div class='add'>+#define MRST_P1_MAX_1		    8</div><div class='add'>+</div><div class='add'>+static const struct oaktrail_limit_t oaktrail_limits[] = {</div><div class='add'>+	{			/* MRST_LIMIT_LVDS_100L */</div><div class='add'>+	 .dot = {.min = MRST_DOT_MIN, .max = MRST_DOT_MAX},</div><div class='add'>+	 .m = {.min = MRST_M_MIN_100L, .max = MRST_M_MAX_100L},</div><div class='add'>+	 .p1 = {.min = MRST_P1_MIN, .max = MRST_P1_MAX_1},</div><div class='add'>+	 },</div><div class='add'>+	{			/* MRST_LIMIT_LVDS_83L */</div><div class='add'>+	 .dot = {.min = MRST_DOT_MIN, .max = MRST_DOT_MAX},</div><div class='add'>+	 .m = {.min = MRST_M_MIN_83, .max = MRST_M_MAX_83},</div><div class='add'>+	 .p1 = {.min = MRST_P1_MIN, .max = MRST_P1_MAX_0},</div><div class='add'>+	 },</div><div class='add'>+	{			/* MRST_LIMIT_LVDS_100 */</div><div class='add'>+	 .dot = {.min = MRST_DOT_MIN, .max = MRST_DOT_MAX},</div><div class='add'>+	 .m = {.min = MRST_M_MIN_100, .max = MRST_M_MAX_100},</div><div class='add'>+	 .p1 = {.min = MRST_P1_MIN, .max = MRST_P1_MAX_1},</div><div class='add'>+	 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MRST_M_MIN	    10</div><div class='add'>+static const u32 oaktrail_m_converts[] = {</div><div class='add'>+	0x2B, 0x15, 0x2A, 0x35, 0x1A, 0x0D, 0x26, 0x33, 0x19, 0x2C,</div><div class='add'>+	0x36, 0x3B, 0x1D, 0x2E, 0x37, 0x1B, 0x2D, 0x16, 0x0B, 0x25,</div><div class='add'>+	0x12, 0x09, 0x24, 0x32, 0x39, 0x1c,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct oaktrail_limit_t *oaktrail_limit(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	const struct oaktrail_limit_t *limit = NULL;</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)</div><div class='add'>+	    || psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_MIPI)) {</div><div class='add'>+		switch (dev_priv-&gt;core_freq) {</div><div class='add'>+		case 100:</div><div class='add'>+			limit = &amp;oaktrail_limits[MRST_LIMIT_LVDS_100L];</div><div class='add'>+			break;</div><div class='add'>+		case 166:</div><div class='add'>+			limit = &amp;oaktrail_limits[MRST_LIMIT_LVDS_83];</div><div class='add'>+			break;</div><div class='add'>+		case 200:</div><div class='add'>+			limit = &amp;oaktrail_limits[MRST_LIMIT_LVDS_100];</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		limit = NULL;</div><div class='add'>+		dev_err(dev-&gt;dev, "oaktrail_limit Wrong display type.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return limit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/** Derive the pixel clock for the given refclk and divisors for 8xx chips. */</div><div class='add'>+static void oaktrail_clock(int refclk, struct oaktrail_clock_t *clock)</div><div class='add'>+{</div><div class='add'>+	clock-&gt;dot = (refclk * clock-&gt;m) / (14 * clock-&gt;p1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mrstPrintPll(char *prefix, struct oaktrail_clock_t *clock)</div><div class='add'>+{</div><div class='add'>+	pr_debug("%s: dotclock = %d,  m = %d, p1 = %d.\n",</div><div class='add'>+	     prefix, clock-&gt;dot, clock-&gt;m, clock-&gt;p1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Returns a set of divisors for the desired target clock with the given refclk,</div><div class='add'>+ * or FALSE.  Divisor values are the actual divisors for</div><div class='add'>+ */</div><div class='add'>+static bool</div><div class='add'>+mrstFindBestPLL(struct drm_crtc *crtc, int target, int refclk,</div><div class='add'>+		struct oaktrail_clock_t *best_clock)</div><div class='add'>+{</div><div class='add'>+	struct oaktrail_clock_t clock;</div><div class='add'>+	const struct oaktrail_limit_t *limit = oaktrail_limit(crtc);</div><div class='add'>+	int err = target;</div><div class='add'>+</div><div class='add'>+	memset(best_clock, 0, sizeof(*best_clock));</div><div class='add'>+</div><div class='add'>+	for (clock.m = limit-&gt;m.min; clock.m &lt;= limit-&gt;m.max; clock.m++) {</div><div class='add'>+		for (clock.p1 = limit-&gt;p1.min; clock.p1 &lt;= limit-&gt;p1.max;</div><div class='add'>+		     clock.p1++) {</div><div class='add'>+			int this_err;</div><div class='add'>+</div><div class='add'>+			oaktrail_clock(refclk, &amp;clock);</div><div class='add'>+</div><div class='add'>+			this_err = abs(clock.dot - target);</div><div class='add'>+			if (this_err &lt; err) {</div><div class='add'>+				*best_clock = clock;</div><div class='add'>+				err = this_err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	dev_dbg(crtc-&gt;dev-&gt;dev, "mrstFindBestPLL err = %d.\n", err);</div><div class='add'>+	return err != target;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Sets the power management mode of the pipe and plane.</div><div class='add'>+ *</div><div class='add'>+ * This code should probably grow support for turning the cursor off and back</div><div class='add'>+ * on appropriately at the same time as we're turning the pipe off/on.</div><div class='add'>+ */</div><div class='add'>+static void oaktrail_crtc_dpms(struct drm_crtc *crtc, int mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	int pipe = psb_intel_crtc-&gt;pipe;</div><div class='add'>+	int dpll_reg = (pipe == 0) ? MRST_DPLL_A : DPLL_B;</div><div class='add'>+	int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;</div><div class='add'>+	int dspbase_reg = (pipe == 0) ? MRST_DSPABASE : DSPBBASE;</div><div class='add'>+	int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;</div><div class='add'>+	u32 temp;</div><div class='add'>+	bool enabled;</div><div class='add'>+</div><div class='add'>+	if (!gma_power_begin(dev, true))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* XXX: When our outputs are all unaware of DPMS modes other than off</div><div class='add'>+	 * and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC.</div><div class='add'>+	 */</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case DRM_MODE_DPMS_ON:</div><div class='add'>+	case DRM_MODE_DPMS_STANDBY:</div><div class='add'>+	case DRM_MODE_DPMS_SUSPEND:</div><div class='add'>+		/* Enable the DPLL */</div><div class='add'>+		temp = REG_READ(dpll_reg);</div><div class='add'>+		if ((temp &amp; DPLL_VCO_ENABLE) == 0) {</div><div class='add'>+			REG_WRITE(dpll_reg, temp);</div><div class='add'>+			REG_READ(dpll_reg);</div><div class='add'>+			/* Wait for the clocks to stabilize. */</div><div class='add'>+			udelay(150);</div><div class='add'>+			REG_WRITE(dpll_reg, temp | DPLL_VCO_ENABLE);</div><div class='add'>+			REG_READ(dpll_reg);</div><div class='add'>+			/* Wait for the clocks to stabilize. */</div><div class='add'>+			udelay(150);</div><div class='add'>+			REG_WRITE(dpll_reg, temp | DPLL_VCO_ENABLE);</div><div class='add'>+			REG_READ(dpll_reg);</div><div class='add'>+			/* Wait for the clocks to stabilize. */</div><div class='add'>+			udelay(150);</div><div class='add'>+		}</div><div class='add'>+		/* Enable the pipe */</div><div class='add'>+		temp = REG_READ(pipeconf_reg);</div><div class='add'>+		if ((temp &amp; PIPEACONF_ENABLE) == 0)</div><div class='add'>+			REG_WRITE(pipeconf_reg, temp | PIPEACONF_ENABLE);</div><div class='add'>+		/* Enable the plane */</div><div class='add'>+		temp = REG_READ(dspcntr_reg);</div><div class='add'>+		if ((temp &amp; DISPLAY_PLANE_ENABLE) == 0) {</div><div class='add'>+			REG_WRITE(dspcntr_reg,</div><div class='add'>+				  temp | DISPLAY_PLANE_ENABLE);</div><div class='add'>+			/* Flush the plane changes */</div><div class='add'>+			REG_WRITE(dspbase_reg, REG_READ(dspbase_reg));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		psb_intel_crtc_load_lut(crtc);</div><div class='add'>+</div><div class='add'>+		/* Give the overlay scaler a chance to enable</div><div class='add'>+		   if it's on this pipe */</div><div class='add'>+		/* psb_intel_crtc_dpms_video(crtc, true); TODO */</div><div class='add'>+		break;</div><div class='add'>+	case DRM_MODE_DPMS_OFF:</div><div class='add'>+		/* Give the overlay scaler a chance to disable</div><div class='add'>+		 * if it's on this pipe */</div><div class='add'>+		/* psb_intel_crtc_dpms_video(crtc, FALSE); TODO */</div><div class='add'>+</div><div class='add'>+		/* Disable the VGA plane that we never use */</div><div class='add'>+		REG_WRITE(VGACNTRL, VGA_DISP_DISABLE);</div><div class='add'>+		/* Disable display plane */</div><div class='add'>+		temp = REG_READ(dspcntr_reg);</div><div class='add'>+		if ((temp &amp; DISPLAY_PLANE_ENABLE) != 0) {</div><div class='add'>+			REG_WRITE(dspcntr_reg,</div><div class='add'>+				  temp &amp; ~DISPLAY_PLANE_ENABLE);</div><div class='add'>+			/* Flush the plane changes */</div><div class='add'>+			REG_WRITE(dspbase_reg, REG_READ(dspbase_reg));</div><div class='add'>+			REG_READ(dspbase_reg);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Next, disable display pipes */</div><div class='add'>+		temp = REG_READ(pipeconf_reg);</div><div class='add'>+		if ((temp &amp; PIPEACONF_ENABLE) != 0) {</div><div class='add'>+			REG_WRITE(pipeconf_reg, temp &amp; ~PIPEACONF_ENABLE);</div><div class='add'>+			REG_READ(pipeconf_reg);</div><div class='add'>+		}</div><div class='add'>+		/* Wait for for the pipe disable to take effect. */</div><div class='add'>+		psb_intel_wait_for_vblank(dev);</div><div class='add'>+</div><div class='add'>+		temp = REG_READ(dpll_reg);</div><div class='add'>+		if ((temp &amp; DPLL_VCO_ENABLE) != 0) {</div><div class='add'>+			REG_WRITE(dpll_reg, temp &amp; ~DPLL_VCO_ENABLE);</div><div class='add'>+			REG_READ(dpll_reg);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Wait for the clocks to turn off. */</div><div class='add'>+		udelay(150);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	enabled = crtc-&gt;enabled &amp;&amp; mode != DRM_MODE_DPMS_OFF;</div><div class='add'>+</div><div class='add'>+	/*Set FIFO Watermarks*/</div><div class='add'>+	REG_WRITE(DSPARB, 0x3FFF);</div><div class='add'>+	REG_WRITE(DSPFW1, 0x3F88080A);</div><div class='add'>+	REG_WRITE(DSPFW2, 0x0b060808);</div><div class='add'>+	REG_WRITE(DSPFW3, 0x0);</div><div class='add'>+	REG_WRITE(DSPFW4, 0x08030404);</div><div class='add'>+	REG_WRITE(DSPFW5, 0x04040404);</div><div class='add'>+	REG_WRITE(DSPFW6, 0x78);</div><div class='add'>+	REG_WRITE(0x70400, REG_READ(0x70400) | 0x4000);</div><div class='add'>+	/* Must write Bit 14 of the Chicken Bit Register */</div><div class='add'>+</div><div class='add'>+	gma_power_end(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Return the pipe currently connected to the panel fitter,</div><div class='add'>+ * or -1 if the panel fitter is not present or not in use</div><div class='add'>+ */</div><div class='add'>+static int oaktrail_panel_fitter_pipe(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	u32 pfit_control;</div><div class='add'>+</div><div class='add'>+	pfit_control = REG_READ(PFIT_CONTROL);</div><div class='add'>+</div><div class='add'>+	/* See if the panel fitter is in use */</div><div class='add'>+	if ((pfit_control &amp; PFIT_ENABLE) == 0)</div><div class='add'>+		return -1;</div><div class='add'>+	return (pfit_control &gt;&gt; 29) &amp; 3;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int oaktrail_crtc_mode_set(struct drm_crtc *crtc,</div><div class='add'>+			      struct drm_display_mode *mode,</div><div class='add'>+			      struct drm_display_mode *adjusted_mode,</div><div class='add'>+			      int x, int y,</div><div class='add'>+			      struct drm_framebuffer *old_fb)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int pipe = psb_intel_crtc-&gt;pipe;</div><div class='add'>+	int fp_reg = (pipe == 0) ? MRST_FPA0 : FPB0;</div><div class='add'>+	int dpll_reg = (pipe == 0) ? MRST_DPLL_A : DPLL_B;</div><div class='add'>+	int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;</div><div class='add'>+	int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;</div><div class='add'>+	int htot_reg = (pipe == 0) ? HTOTAL_A : HTOTAL_B;</div><div class='add'>+	int hblank_reg = (pipe == 0) ? HBLANK_A : HBLANK_B;</div><div class='add'>+	int hsync_reg = (pipe == 0) ? HSYNC_A : HSYNC_B;</div><div class='add'>+	int vtot_reg = (pipe == 0) ? VTOTAL_A : VTOTAL_B;</div><div class='add'>+	int vblank_reg = (pipe == 0) ? VBLANK_A : VBLANK_B;</div><div class='add'>+	int vsync_reg = (pipe == 0) ? VSYNC_A : VSYNC_B;</div><div class='add'>+	int pipesrc_reg = (pipe == 0) ? PIPEASRC : PIPEBSRC;</div><div class='add'>+	int refclk = 0;</div><div class='add'>+	struct oaktrail_clock_t clock;</div><div class='add'>+	u32 dpll = 0, fp = 0, dspcntr, pipeconf;</div><div class='add'>+	bool ok, is_sdvo = false;</div><div class='add'>+	bool is_crt = false, is_lvds = false, is_tv = false;</div><div class='add'>+	bool is_mipi = false;</div><div class='add'>+	struct drm_mode_config *mode_config = &amp;dev-&gt;mode_config;</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder = NULL;</div><div class='add'>+	uint64_t scalingType = DRM_MODE_SCALE_FULLSCREEN;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+</div><div class='add'>+	if (!gma_power_begin(dev, true))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;psb_intel_crtc-&gt;saved_mode,</div><div class='add'>+		mode,</div><div class='add'>+		sizeof(struct drm_display_mode));</div><div class='add'>+	memcpy(&amp;psb_intel_crtc-&gt;saved_adjusted_mode,</div><div class='add'>+		adjusted_mode,</div><div class='add'>+		sizeof(struct drm_display_mode));</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(connector, &amp;mode_config-&gt;connector_list, head) {</div><div class='add'>+		if (!connector-&gt;encoder || connector-&gt;encoder-&gt;crtc != crtc)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		psb_intel_encoder = psb_intel_attached_encoder(connector);</div><div class='add'>+</div><div class='add'>+		switch (psb_intel_encoder-&gt;type) {</div><div class='add'>+		case INTEL_OUTPUT_LVDS:</div><div class='add'>+			is_lvds = true;</div><div class='add'>+			break;</div><div class='add'>+		case INTEL_OUTPUT_SDVO:</div><div class='add'>+			is_sdvo = true;</div><div class='add'>+			break;</div><div class='add'>+		case INTEL_OUTPUT_TVOUT:</div><div class='add'>+			is_tv = true;</div><div class='add'>+			break;</div><div class='add'>+		case INTEL_OUTPUT_ANALOG:</div><div class='add'>+			is_crt = true;</div><div class='add'>+			break;</div><div class='add'>+		case INTEL_OUTPUT_MIPI:</div><div class='add'>+			is_mipi = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable the VGA plane that we never use */</div><div class='add'>+	REG_WRITE(VGACNTRL, VGA_DISP_DISABLE);</div><div class='add'>+</div><div class='add'>+	/* Disable the panel fitter if it was on our pipe */</div><div class='add'>+	if (oaktrail_panel_fitter_pipe(dev) == pipe)</div><div class='add'>+		REG_WRITE(PFIT_CONTROL, 0);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(pipesrc_reg,</div><div class='add'>+		  ((mode-&gt;crtc_hdisplay - 1) &lt;&lt; 16) |</div><div class='add'>+		  (mode-&gt;crtc_vdisplay - 1));</div><div class='add'>+</div><div class='add'>+	if (psb_intel_encoder)</div><div class='add'>+		drm_connector_property_get_value(connector,</div><div class='add'>+			dev-&gt;mode_config.scaling_mode_property, &amp;scalingType);</div><div class='add'>+</div><div class='add'>+	if (scalingType == DRM_MODE_SCALE_NO_SCALE) {</div><div class='add'>+		/* Moorestown doesn't have register support for centering so</div><div class='add'>+		 * we need to mess with the h/vblank and h/vsync start and</div><div class='add'>+		 * ends to get centering */</div><div class='add'>+		int offsetX = 0, offsetY = 0;</div><div class='add'>+</div><div class='add'>+		offsetX = (adjusted_mode-&gt;crtc_hdisplay -</div><div class='add'>+			   mode-&gt;crtc_hdisplay) / 2;</div><div class='add'>+		offsetY = (adjusted_mode-&gt;crtc_vdisplay -</div><div class='add'>+			   mode-&gt;crtc_vdisplay) / 2;</div><div class='add'>+</div><div class='add'>+		REG_WRITE(htot_reg, (mode-&gt;crtc_hdisplay - 1) |</div><div class='add'>+			((adjusted_mode-&gt;crtc_htotal - 1) &lt;&lt; 16));</div><div class='add'>+		REG_WRITE(vtot_reg, (mode-&gt;crtc_vdisplay - 1) |</div><div class='add'>+			((adjusted_mode-&gt;crtc_vtotal - 1) &lt;&lt; 16));</div><div class='add'>+		REG_WRITE(hblank_reg,</div><div class='add'>+			(adjusted_mode-&gt;crtc_hblank_start - offsetX - 1) |</div><div class='add'>+			((adjusted_mode-&gt;crtc_hblank_end - offsetX - 1) &lt;&lt; 16));</div><div class='add'>+		REG_WRITE(hsync_reg,</div><div class='add'>+			(adjusted_mode-&gt;crtc_hsync_start - offsetX - 1) |</div><div class='add'>+			((adjusted_mode-&gt;crtc_hsync_end - offsetX - 1) &lt;&lt; 16));</div><div class='add'>+		REG_WRITE(vblank_reg,</div><div class='add'>+			(adjusted_mode-&gt;crtc_vblank_start - offsetY - 1) |</div><div class='add'>+			((adjusted_mode-&gt;crtc_vblank_end - offsetY - 1) &lt;&lt; 16));</div><div class='add'>+		REG_WRITE(vsync_reg,</div><div class='add'>+			(adjusted_mode-&gt;crtc_vsync_start - offsetY - 1) |</div><div class='add'>+			((adjusted_mode-&gt;crtc_vsync_end - offsetY - 1) &lt;&lt; 16));</div><div class='add'>+	} else {</div><div class='add'>+		REG_WRITE(htot_reg, (adjusted_mode-&gt;crtc_hdisplay - 1) |</div><div class='add'>+			((adjusted_mode-&gt;crtc_htotal - 1) &lt;&lt; 16));</div><div class='add'>+		REG_WRITE(vtot_reg, (adjusted_mode-&gt;crtc_vdisplay - 1) |</div><div class='add'>+			((adjusted_mode-&gt;crtc_vtotal - 1) &lt;&lt; 16));</div><div class='add'>+		REG_WRITE(hblank_reg, (adjusted_mode-&gt;crtc_hblank_start - 1) |</div><div class='add'>+			((adjusted_mode-&gt;crtc_hblank_end - 1) &lt;&lt; 16));</div><div class='add'>+		REG_WRITE(hsync_reg, (adjusted_mode-&gt;crtc_hsync_start - 1) |</div><div class='add'>+			((adjusted_mode-&gt;crtc_hsync_end - 1) &lt;&lt; 16));</div><div class='add'>+		REG_WRITE(vblank_reg, (adjusted_mode-&gt;crtc_vblank_start - 1) |</div><div class='add'>+			((adjusted_mode-&gt;crtc_vblank_end - 1) &lt;&lt; 16));</div><div class='add'>+		REG_WRITE(vsync_reg, (adjusted_mode-&gt;crtc_vsync_start - 1) |</div><div class='add'>+			((adjusted_mode-&gt;crtc_vsync_end - 1) &lt;&lt; 16));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Flush the plane changes */</div><div class='add'>+	{</div><div class='add'>+		struct drm_crtc_helper_funcs *crtc_funcs =</div><div class='add'>+		    crtc-&gt;helper_private;</div><div class='add'>+		crtc_funcs-&gt;mode_set_base(crtc, x, y, old_fb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* setup pipeconf */</div><div class='add'>+	pipeconf = REG_READ(pipeconf_reg);</div><div class='add'>+</div><div class='add'>+	/* Set up the display plane register */</div><div class='add'>+	dspcntr = REG_READ(dspcntr_reg);</div><div class='add'>+	dspcntr |= DISPPLANE_GAMMA_ENABLE;</div><div class='add'>+</div><div class='add'>+	if (pipe == 0)</div><div class='add'>+		dspcntr |= DISPPLANE_SEL_PIPE_A;</div><div class='add'>+	else</div><div class='add'>+		dspcntr |= DISPPLANE_SEL_PIPE_B;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;dspcntr = dspcntr |= DISPLAY_PLANE_ENABLE;</div><div class='add'>+	dev_priv-&gt;pipeconf = pipeconf |= PIPEACONF_ENABLE;</div><div class='add'>+</div><div class='add'>+	if (is_mipi)</div><div class='add'>+		goto oaktrail_crtc_mode_set_exit;</div><div class='add'>+</div><div class='add'>+	refclk = dev_priv-&gt;core_freq * 1000;</div><div class='add'>+</div><div class='add'>+	dpll = 0;		/*BIT16 = 0 for 100MHz reference */</div><div class='add'>+</div><div class='add'>+	ok = mrstFindBestPLL(crtc, adjusted_mode-&gt;clock, refclk, &amp;clock);</div><div class='add'>+</div><div class='add'>+	if (!ok) {</div><div class='add'>+		dev_dbg(dev-&gt;dev, "mrstFindBestPLL fail in oaktrail_crtc_mode_set.\n");</div><div class='add'>+	} else {</div><div class='add'>+		dev_dbg(dev-&gt;dev, "oaktrail_crtc_mode_set pixel clock = %d,"</div><div class='add'>+			 "m = %x, p1 = %x.\n", clock.dot, clock.m,</div><div class='add'>+			 clock.p1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fp = oaktrail_m_converts[(clock.m - MRST_M_MIN)] &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	dpll |= DPLL_VGA_MODE_DIS;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	dpll |= DPLL_VCO_ENABLE;</div><div class='add'>+</div><div class='add'>+	if (is_lvds)</div><div class='add'>+		dpll |= DPLLA_MODE_LVDS;</div><div class='add'>+	else</div><div class='add'>+		dpll |= DPLLB_MODE_DAC_SERIAL;</div><div class='add'>+</div><div class='add'>+	if (is_sdvo) {</div><div class='add'>+		int sdvo_pixel_multiply =</div><div class='add'>+		    adjusted_mode-&gt;clock / mode-&gt;clock;</div><div class='add'>+</div><div class='add'>+		dpll |= DPLL_DVO_HIGH_SPEED;</div><div class='add'>+		dpll |=</div><div class='add'>+		    (sdvo_pixel_multiply -</div><div class='add'>+		     1) &lt;&lt; SDVO_MULTIPLIER_SHIFT_HIRES;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* compute bitmask from p1 value */</div><div class='add'>+	dpll |= (1 &lt;&lt; (clock.p1 - 2)) &lt;&lt; 17;</div><div class='add'>+</div><div class='add'>+	dpll |= DPLL_VCO_ENABLE;</div><div class='add'>+</div><div class='add'>+	mrstPrintPll("chosen", &amp;clock);</div><div class='add'>+</div><div class='add'>+	if (dpll &amp; DPLL_VCO_ENABLE) {</div><div class='add'>+		REG_WRITE(fp_reg, fp);</div><div class='add'>+		REG_WRITE(dpll_reg, dpll &amp; ~DPLL_VCO_ENABLE);</div><div class='add'>+		REG_READ(dpll_reg);</div><div class='add'>+		/* Check the DPLLA lock bit PIPEACONF[29] */</div><div class='add'>+		udelay(150);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_WRITE(fp_reg, fp);</div><div class='add'>+	REG_WRITE(dpll_reg, dpll);</div><div class='add'>+	REG_READ(dpll_reg);</div><div class='add'>+	/* Wait for the clocks to stabilize. */</div><div class='add'>+	udelay(150);</div><div class='add'>+</div><div class='add'>+	/* write it again -- the BIOS does, after all */</div><div class='add'>+	REG_WRITE(dpll_reg, dpll);</div><div class='add'>+	REG_READ(dpll_reg);</div><div class='add'>+	/* Wait for the clocks to stabilize. */</div><div class='add'>+	udelay(150);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(pipeconf_reg, pipeconf);</div><div class='add'>+	REG_READ(pipeconf_reg);</div><div class='add'>+	psb_intel_wait_for_vblank(dev);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(dspcntr_reg, dspcntr);</div><div class='add'>+	psb_intel_wait_for_vblank(dev);</div><div class='add'>+</div><div class='add'>+oaktrail_crtc_mode_set_exit:</div><div class='add'>+	gma_power_end(dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool oaktrail_crtc_mode_fixup(struct drm_crtc *crtc,</div><div class='add'>+				  struct drm_display_mode *mode,</div><div class='add'>+				  struct drm_display_mode *adjusted_mode)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int oaktrail_pipe_set_base(struct drm_crtc *crtc,</div><div class='add'>+			    int x, int y, struct drm_framebuffer *old_fb)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	struct psb_framebuffer *psbfb = to_psb_fb(crtc-&gt;fb);</div><div class='add'>+	int pipe = psb_intel_crtc-&gt;pipe;</div><div class='add'>+	unsigned long start, offset;</div><div class='add'>+</div><div class='add'>+	int dspbase = (pipe == 0 ? DSPALINOFF : DSPBBASE);</div><div class='add'>+	int dspsurf = (pipe == 0 ? DSPASURF : DSPBSURF);</div><div class='add'>+	int dspstride = (pipe == 0) ? DSPASTRIDE : DSPBSTRIDE;</div><div class='add'>+	int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;</div><div class='add'>+	u32 dspcntr;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* no fb bound */</div><div class='add'>+	if (!crtc-&gt;fb) {</div><div class='add'>+		dev_dbg(dev-&gt;dev, "No FB bound\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!gma_power_begin(dev, true))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	start = psbfb-&gt;gtt-&gt;offset;</div><div class='add'>+	offset = y * crtc-&gt;fb-&gt;pitches[0] + x * (crtc-&gt;fb-&gt;bits_per_pixel / 8);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(dspstride, crtc-&gt;fb-&gt;pitches[0]);</div><div class='add'>+</div><div class='add'>+	dspcntr = REG_READ(dspcntr_reg);</div><div class='add'>+	dspcntr &amp;= ~DISPPLANE_PIXFORMAT_MASK;</div><div class='add'>+</div><div class='add'>+	switch (crtc-&gt;fb-&gt;bits_per_pixel) {</div><div class='add'>+	case 8:</div><div class='add'>+		dspcntr |= DISPPLANE_8BPP;</div><div class='add'>+		break;</div><div class='add'>+	case 16:</div><div class='add'>+		if (crtc-&gt;fb-&gt;depth == 15)</div><div class='add'>+			dspcntr |= DISPPLANE_15_16BPP;</div><div class='add'>+		else</div><div class='add'>+			dspcntr |= DISPPLANE_16BPP;</div><div class='add'>+		break;</div><div class='add'>+	case 24:</div><div class='add'>+	case 32:</div><div class='add'>+		dspcntr |= DISPPLANE_32BPP_NO_ALPHA;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev-&gt;dev, "Unknown color depth\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto pipe_set_base_exit;</div><div class='add'>+	}</div><div class='add'>+	REG_WRITE(dspcntr_reg, dspcntr);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(dspbase, offset);</div><div class='add'>+	REG_READ(dspbase);</div><div class='add'>+	REG_WRITE(dspsurf, start);</div><div class='add'>+	REG_READ(dspsurf);</div><div class='add'>+</div><div class='add'>+pipe_set_base_exit:</div><div class='add'>+	gma_power_end(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void oaktrail_crtc_prepare(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct drm_crtc_helper_funcs *crtc_funcs = crtc-&gt;helper_private;</div><div class='add'>+	crtc_funcs-&gt;dpms(crtc, DRM_MODE_DPMS_OFF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void oaktrail_crtc_commit(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct drm_crtc_helper_funcs *crtc_funcs = crtc-&gt;helper_private;</div><div class='add'>+	crtc_funcs-&gt;dpms(crtc, DRM_MODE_DPMS_ON);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct drm_crtc_helper_funcs oaktrail_helper_funcs = {</div><div class='add'>+	.dpms = oaktrail_crtc_dpms,</div><div class='add'>+	.mode_fixup = oaktrail_crtc_mode_fixup,</div><div class='add'>+	.mode_set = oaktrail_crtc_mode_set,</div><div class='add'>+	.mode_set_base = oaktrail_pipe_set_base,</div><div class='add'>+	.prepare = oaktrail_crtc_prepare,</div><div class='add'>+	.commit = oaktrail_crtc_commit,</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/oaktrail_device.c b/drivers/gpu/drm/gma500/oaktrail_device.c<br/>new file mode 100644<br/>index 000000000000..63aea2f010d9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/oaktrail_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/oaktrail_device.c</a></div><div class='hunk'>@@ -0,0 +1,512 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ * Copyright (c) 2011, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/backlight.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include &lt;drm/drm.h&gt;</div><div class='add'>+#include "gma_drm.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_reg.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include &lt;asm/mrst.h&gt;</div><div class='add'>+#include &lt;asm/intel_scu_ipc.h&gt;</div><div class='add'>+#include "mid_bios.h"</div><div class='add'>+#include "intel_bios.h"</div><div class='add'>+</div><div class='add'>+static int oaktrail_output_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	if (dev_priv-&gt;iLVDS_enable)</div><div class='add'>+		oaktrail_lvds_init(dev, &amp;dev_priv-&gt;mode_dev);</div><div class='add'>+	else</div><div class='add'>+		dev_err(dev-&gt;dev, "DSI is not supported\n");</div><div class='add'>+	if (dev_priv-&gt;hdmi_priv)</div><div class='add'>+		oaktrail_hdmi_init(dev, &amp;dev_priv-&gt;mode_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Provide the low level interfaces for the Moorestown backlight</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE</div><div class='add'>+</div><div class='add'>+#define MRST_BLC_MAX_PWM_REG_FREQ	    0xFFFF</div><div class='add'>+#define BLC_PWM_PRECISION_FACTOR 100	/* 10000000 */</div><div class='add'>+#define BLC_PWM_FREQ_CALC_CONSTANT 32</div><div class='add'>+#define MHz 1000000</div><div class='add'>+#define BLC_ADJUSTMENT_MAX 100</div><div class='add'>+</div><div class='add'>+static struct backlight_device *oaktrail_backlight_device;</div><div class='add'>+static int oaktrail_brightness;</div><div class='add'>+</div><div class='add'>+static int oaktrail_set_brightness(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = bl_get_data(oaktrail_backlight_device);</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int level = bd-&gt;props.brightness;</div><div class='add'>+	u32 blc_pwm_ctl;</div><div class='add'>+	u32 max_pwm_blc;</div><div class='add'>+</div><div class='add'>+	/* Percentage 1-100% being valid */</div><div class='add'>+	if (level &lt; 1)</div><div class='add'>+		level = 1;</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, 0)) {</div><div class='add'>+		/* Calculate and set the brightness value */</div><div class='add'>+		max_pwm_blc = REG_READ(BLC_PWM_CTL) &gt;&gt; 16;</div><div class='add'>+		blc_pwm_ctl = level * max_pwm_blc / 100;</div><div class='add'>+</div><div class='add'>+		/* Adjust the backlight level with the percent in</div><div class='add'>+		 * dev_priv-&gt;blc_adj1;</div><div class='add'>+		 */</div><div class='add'>+		blc_pwm_ctl = blc_pwm_ctl * dev_priv-&gt;blc_adj1;</div><div class='add'>+		blc_pwm_ctl = blc_pwm_ctl / 100;</div><div class='add'>+</div><div class='add'>+		/* Adjust the backlight level with the percent in</div><div class='add'>+		 * dev_priv-&gt;blc_adj2;</div><div class='add'>+		 */</div><div class='add'>+		blc_pwm_ctl = blc_pwm_ctl * dev_priv-&gt;blc_adj2;</div><div class='add'>+		blc_pwm_ctl = blc_pwm_ctl / 100;</div><div class='add'>+</div><div class='add'>+		/* force PWM bit on */</div><div class='add'>+		REG_WRITE(BLC_PWM_CTL2, (0x80000000 | REG_READ(BLC_PWM_CTL2)));</div><div class='add'>+		REG_WRITE(BLC_PWM_CTL, (max_pwm_blc &lt;&lt; 16) | blc_pwm_ctl);</div><div class='add'>+		gma_power_end(dev);</div><div class='add'>+	}</div><div class='add'>+	oaktrail_brightness = level;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int oaktrail_get_brightness(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	/* return locally cached var instead of HW read (due to DPST etc.) */</div><div class='add'>+	/* FIXME: ideally return actual value in case firmware fiddled with</div><div class='add'>+	   it */</div><div class='add'>+	return oaktrail_brightness;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int device_backlight_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	unsigned long core_clock;</div><div class='add'>+	u16 bl_max_freq;</div><div class='add'>+	uint32_t value;</div><div class='add'>+	uint32_t blc_pwm_precision_factor;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;blc_adj1 = BLC_ADJUSTMENT_MAX;</div><div class='add'>+	dev_priv-&gt;blc_adj2 = BLC_ADJUSTMENT_MAX;</div><div class='add'>+	bl_max_freq = 256;</div><div class='add'>+	/* this needs to be set elsewhere */</div><div class='add'>+	blc_pwm_precision_factor = BLC_PWM_PRECISION_FACTOR;</div><div class='add'>+</div><div class='add'>+	core_clock = dev_priv-&gt;core_freq;</div><div class='add'>+</div><div class='add'>+	value = (core_clock * MHz) / BLC_PWM_FREQ_CALC_CONSTANT;</div><div class='add'>+	value *= blc_pwm_precision_factor;</div><div class='add'>+	value /= bl_max_freq;</div><div class='add'>+	value /= blc_pwm_precision_factor;</div><div class='add'>+</div><div class='add'>+	if (value &gt; (unsigned long long)MRST_BLC_MAX_PWM_REG_FREQ)</div><div class='add'>+			return -ERANGE;</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		REG_WRITE(BLC_PWM_CTL2, (0x80000000 | REG_READ(BLC_PWM_CTL2)));</div><div class='add'>+		REG_WRITE(BLC_PWM_CTL, value | (value &lt;&lt; 16));</div><div class='add'>+		gma_power_end(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 backlight_ops oaktrail_ops = {</div><div class='add'>+	.get_brightness = oaktrail_get_brightness,</div><div class='add'>+	.update_status  = oaktrail_set_brightness,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int oaktrail_backlight_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int ret;</div><div class='add'>+	struct backlight_properties props;</div><div class='add'>+</div><div class='add'>+	memset(&amp;props, 0, sizeof(struct backlight_properties));</div><div class='add'>+	props.max_brightness = 100;</div><div class='add'>+	props.type = BACKLIGHT_PLATFORM;</div><div class='add'>+</div><div class='add'>+	oaktrail_backlight_device = backlight_device_register("oaktrail-bl",</div><div class='add'>+				NULL, (void *)dev, &amp;oaktrail_ops, &amp;props);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(oaktrail_backlight_device))</div><div class='add'>+		return PTR_ERR(oaktrail_backlight_device);</div><div class='add'>+</div><div class='add'>+	ret = device_backlight_init(dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		backlight_device_unregister(oaktrail_backlight_device);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	oaktrail_backlight_device-&gt;props.brightness = 100;</div><div class='add'>+	oaktrail_backlight_device-&gt;props.max_brightness = 100;</div><div class='add'>+	backlight_update_status(oaktrail_backlight_device);</div><div class='add'>+	dev_priv-&gt;backlight_device = oaktrail_backlight_device;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Provide the Moorestown specific chip logic and low level methods</div><div class='add'>+ *	for power management</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void oaktrail_init_pm(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	oaktrail_save_display_registers	-	save registers lost on suspend</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *</div><div class='add'>+ *	Save the state we need in order to be able to restore the interface</div><div class='add'>+ *	upon resume from suspend</div><div class='add'>+ */</div><div class='add'>+static int oaktrail_save_display_registers(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int i;</div><div class='add'>+	u32 pp_stat;</div><div class='add'>+</div><div class='add'>+	/* Display arbitration control + watermarks */</div><div class='add'>+	dev_priv-&gt;saveDSPARB = PSB_RVDC32(DSPARB);</div><div class='add'>+	dev_priv-&gt;saveDSPFW1 = PSB_RVDC32(DSPFW1);</div><div class='add'>+	dev_priv-&gt;saveDSPFW2 = PSB_RVDC32(DSPFW2);</div><div class='add'>+	dev_priv-&gt;saveDSPFW3 = PSB_RVDC32(DSPFW3);</div><div class='add'>+	dev_priv-&gt;saveDSPFW4 = PSB_RVDC32(DSPFW4);</div><div class='add'>+	dev_priv-&gt;saveDSPFW5 = PSB_RVDC32(DSPFW5);</div><div class='add'>+	dev_priv-&gt;saveDSPFW6 = PSB_RVDC32(DSPFW6);</div><div class='add'>+	dev_priv-&gt;saveCHICKENBIT = PSB_RVDC32(DSPCHICKENBIT);</div><div class='add'>+</div><div class='add'>+	/* Pipe &amp; plane A info */</div><div class='add'>+	dev_priv-&gt;savePIPEACONF = PSB_RVDC32(PIPEACONF);</div><div class='add'>+	dev_priv-&gt;savePIPEASRC = PSB_RVDC32(PIPEASRC);</div><div class='add'>+	dev_priv-&gt;saveFPA0 = PSB_RVDC32(MRST_FPA0);</div><div class='add'>+	dev_priv-&gt;saveFPA1 = PSB_RVDC32(MRST_FPA1);</div><div class='add'>+	dev_priv-&gt;saveDPLL_A = PSB_RVDC32(MRST_DPLL_A);</div><div class='add'>+	dev_priv-&gt;saveHTOTAL_A = PSB_RVDC32(HTOTAL_A);</div><div class='add'>+	dev_priv-&gt;saveHBLANK_A = PSB_RVDC32(HBLANK_A);</div><div class='add'>+	dev_priv-&gt;saveHSYNC_A = PSB_RVDC32(HSYNC_A);</div><div class='add'>+	dev_priv-&gt;saveVTOTAL_A = PSB_RVDC32(VTOTAL_A);</div><div class='add'>+	dev_priv-&gt;saveVBLANK_A = PSB_RVDC32(VBLANK_A);</div><div class='add'>+	dev_priv-&gt;saveVSYNC_A = PSB_RVDC32(VSYNC_A);</div><div class='add'>+	dev_priv-&gt;saveBCLRPAT_A = PSB_RVDC32(BCLRPAT_A);</div><div class='add'>+	dev_priv-&gt;saveDSPACNTR = PSB_RVDC32(DSPACNTR);</div><div class='add'>+	dev_priv-&gt;saveDSPASTRIDE = PSB_RVDC32(DSPASTRIDE);</div><div class='add'>+	dev_priv-&gt;saveDSPAADDR = PSB_RVDC32(DSPABASE);</div><div class='add'>+	dev_priv-&gt;saveDSPASURF = PSB_RVDC32(DSPASURF);</div><div class='add'>+	dev_priv-&gt;saveDSPALINOFF = PSB_RVDC32(DSPALINOFF);</div><div class='add'>+	dev_priv-&gt;saveDSPATILEOFF = PSB_RVDC32(DSPATILEOFF);</div><div class='add'>+</div><div class='add'>+	/* Save cursor regs */</div><div class='add'>+	dev_priv-&gt;saveDSPACURSOR_CTRL = PSB_RVDC32(CURACNTR);</div><div class='add'>+	dev_priv-&gt;saveDSPACURSOR_BASE = PSB_RVDC32(CURABASE);</div><div class='add'>+	dev_priv-&gt;saveDSPACURSOR_POS = PSB_RVDC32(CURAPOS);</div><div class='add'>+</div><div class='add'>+	/* Save palette (gamma) */</div><div class='add'>+	for (i = 0; i &lt; 256; i++)</div><div class='add'>+		dev_priv-&gt;save_palette_a[i] = PSB_RVDC32(PALETTE_A + (i &lt;&lt; 2));</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;hdmi_priv)</div><div class='add'>+		oaktrail_hdmi_save(dev);</div><div class='add'>+</div><div class='add'>+	/* Save performance state */</div><div class='add'>+	dev_priv-&gt;savePERF_MODE = PSB_RVDC32(MRST_PERF_MODE);</div><div class='add'>+</div><div class='add'>+	/* LVDS state */</div><div class='add'>+	dev_priv-&gt;savePP_CONTROL = PSB_RVDC32(PP_CONTROL);</div><div class='add'>+	dev_priv-&gt;savePFIT_PGM_RATIOS = PSB_RVDC32(PFIT_PGM_RATIOS);</div><div class='add'>+	dev_priv-&gt;savePFIT_AUTO_RATIOS = PSB_RVDC32(PFIT_AUTO_RATIOS);</div><div class='add'>+	dev_priv-&gt;saveBLC_PWM_CTL = PSB_RVDC32(BLC_PWM_CTL);</div><div class='add'>+	dev_priv-&gt;saveBLC_PWM_CTL2 = PSB_RVDC32(BLC_PWM_CTL2);</div><div class='add'>+	dev_priv-&gt;saveLVDS = PSB_RVDC32(LVDS);</div><div class='add'>+	dev_priv-&gt;savePFIT_CONTROL = PSB_RVDC32(PFIT_CONTROL);</div><div class='add'>+	dev_priv-&gt;savePP_ON_DELAYS = PSB_RVDC32(LVDSPP_ON);</div><div class='add'>+	dev_priv-&gt;savePP_OFF_DELAYS = PSB_RVDC32(LVDSPP_OFF);</div><div class='add'>+	dev_priv-&gt;savePP_DIVISOR = PSB_RVDC32(PP_CYCLE);</div><div class='add'>+</div><div class='add'>+	/* HW overlay */</div><div class='add'>+	dev_priv-&gt;saveOV_OVADD = PSB_RVDC32(OV_OVADD);</div><div class='add'>+	dev_priv-&gt;saveOV_OGAMC0 = PSB_RVDC32(OV_OGAMC0);</div><div class='add'>+	dev_priv-&gt;saveOV_OGAMC1 = PSB_RVDC32(OV_OGAMC1);</div><div class='add'>+	dev_priv-&gt;saveOV_OGAMC2 = PSB_RVDC32(OV_OGAMC2);</div><div class='add'>+	dev_priv-&gt;saveOV_OGAMC3 = PSB_RVDC32(OV_OGAMC3);</div><div class='add'>+	dev_priv-&gt;saveOV_OGAMC4 = PSB_RVDC32(OV_OGAMC4);</div><div class='add'>+	dev_priv-&gt;saveOV_OGAMC5 = PSB_RVDC32(OV_OGAMC5);</div><div class='add'>+</div><div class='add'>+	/* DPST registers */</div><div class='add'>+	dev_priv-&gt;saveHISTOGRAM_INT_CONTROL_REG =</div><div class='add'>+					PSB_RVDC32(HISTOGRAM_INT_CONTROL);</div><div class='add'>+	dev_priv-&gt;saveHISTOGRAM_LOGIC_CONTROL_REG =</div><div class='add'>+					PSB_RVDC32(HISTOGRAM_LOGIC_CONTROL);</div><div class='add'>+	dev_priv-&gt;savePWM_CONTROL_LOGIC = PSB_RVDC32(PWM_CONTROL_LOGIC);</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;iLVDS_enable) {</div><div class='add'>+		/* Shut down the panel */</div><div class='add'>+		PSB_WVDC32(0, PP_CONTROL);</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			pp_stat = PSB_RVDC32(PP_STATUS);</div><div class='add'>+		} while (pp_stat &amp; 0x80000000);</div><div class='add'>+</div><div class='add'>+		/* Turn off the plane */</div><div class='add'>+		PSB_WVDC32(0x58000000, DSPACNTR);</div><div class='add'>+		/* Trigger the plane disable */</div><div class='add'>+		PSB_WVDC32(0, DSPASURF);</div><div class='add'>+</div><div class='add'>+		/* Wait ~4 ticks */</div><div class='add'>+		msleep(4);</div><div class='add'>+</div><div class='add'>+		/* Turn off pipe */</div><div class='add'>+		PSB_WVDC32(0x0, PIPEACONF);</div><div class='add'>+		/* Wait ~8 ticks */</div><div class='add'>+		msleep(8);</div><div class='add'>+</div><div class='add'>+		/* Turn off PLLs */</div><div class='add'>+		PSB_WVDC32(0, MRST_DPLL_A);</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'>+ *	oaktrail_restore_display_registers	-	restore lost register state</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *</div><div class='add'>+ *	Restore register state that was lost during suspend and resume.</div><div class='add'>+ */</div><div class='add'>+static int oaktrail_restore_display_registers(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 pp_stat;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Display arbitration + watermarks */</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPARB, DSPARB);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPFW1, DSPFW1);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPFW2, DSPFW2);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPFW3, DSPFW3);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPFW4, DSPFW4);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPFW5, DSPFW5);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPFW6, DSPFW6);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveCHICKENBIT, DSPCHICKENBIT);</div><div class='add'>+</div><div class='add'>+	/* Make sure VGA plane is off. it initializes to on after reset!*/</div><div class='add'>+	PSB_WVDC32(0x80000000, VGACNTRL);</div><div class='add'>+</div><div class='add'>+	/* set the plls */</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveFPA0, MRST_FPA0);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveFPA1, MRST_FPA1);</div><div class='add'>+</div><div class='add'>+	/* Actually enable it */</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDPLL_A, MRST_DPLL_A);</div><div class='add'>+	DRM_UDELAY(150);</div><div class='add'>+</div><div class='add'>+	/* Restore mode */</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveHTOTAL_A, HTOTAL_A);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveHBLANK_A, HBLANK_A);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveHSYNC_A, HSYNC_A);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveVTOTAL_A, VTOTAL_A);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveVBLANK_A, VBLANK_A);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveVSYNC_A, VSYNC_A);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;savePIPEASRC, PIPEASRC);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveBCLRPAT_A, BCLRPAT_A);</div><div class='add'>+</div><div class='add'>+	/* Restore performance mode*/</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;savePERF_MODE, MRST_PERF_MODE);</div><div class='add'>+</div><div class='add'>+	/* Enable the pipe*/</div><div class='add'>+	if (dev_priv-&gt;iLVDS_enable)</div><div class='add'>+		PSB_WVDC32(dev_priv-&gt;savePIPEACONF, PIPEACONF);</div><div class='add'>+</div><div class='add'>+	/* Set up the plane*/</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPALINOFF, DSPALINOFF);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPASTRIDE, DSPASTRIDE);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPATILEOFF, DSPATILEOFF);</div><div class='add'>+</div><div class='add'>+	/* Enable the plane */</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPACNTR, DSPACNTR);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPASURF, DSPASURF);</div><div class='add'>+</div><div class='add'>+	/* Enable Cursor A */</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPACURSOR_CTRL, CURACNTR);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPACURSOR_POS, CURAPOS);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPACURSOR_BASE, CURABASE);</div><div class='add'>+</div><div class='add'>+	/* Restore palette (gamma) */</div><div class='add'>+	for (i = 0; i &lt; 256; i++)</div><div class='add'>+		PSB_WVDC32(dev_priv-&gt;save_palette_a[i], PALETTE_A + (i &lt;&lt; 2));</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;hdmi_priv)</div><div class='add'>+		oaktrail_hdmi_restore(dev);</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;iLVDS_enable) {</div><div class='add'>+		PSB_WVDC32(dev_priv-&gt;saveBLC_PWM_CTL2, BLC_PWM_CTL2);</div><div class='add'>+		PSB_WVDC32(dev_priv-&gt;saveLVDS, LVDS); /*port 61180h*/</div><div class='add'>+		PSB_WVDC32(dev_priv-&gt;savePFIT_CONTROL, PFIT_CONTROL);</div><div class='add'>+		PSB_WVDC32(dev_priv-&gt;savePFIT_PGM_RATIOS, PFIT_PGM_RATIOS);</div><div class='add'>+		PSB_WVDC32(dev_priv-&gt;savePFIT_AUTO_RATIOS, PFIT_AUTO_RATIOS);</div><div class='add'>+		PSB_WVDC32(dev_priv-&gt;saveBLC_PWM_CTL, BLC_PWM_CTL);</div><div class='add'>+		PSB_WVDC32(dev_priv-&gt;savePP_ON_DELAYS, LVDSPP_ON);</div><div class='add'>+		PSB_WVDC32(dev_priv-&gt;savePP_OFF_DELAYS, LVDSPP_OFF);</div><div class='add'>+		PSB_WVDC32(dev_priv-&gt;savePP_DIVISOR, PP_CYCLE);</div><div class='add'>+		PSB_WVDC32(dev_priv-&gt;savePP_CONTROL, PP_CONTROL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait for cycle delay */</div><div class='add'>+	do {</div><div class='add'>+		pp_stat = PSB_RVDC32(PP_STATUS);</div><div class='add'>+	} while (pp_stat &amp; 0x08000000);</div><div class='add'>+</div><div class='add'>+	/* Wait for panel power up */</div><div class='add'>+	do {</div><div class='add'>+		pp_stat = PSB_RVDC32(PP_STATUS);</div><div class='add'>+	} while (pp_stat &amp; 0x10000000);</div><div class='add'>+</div><div class='add'>+	/* Restore HW overlay */</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveOV_OVADD, OV_OVADD);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveOV_OGAMC0, OV_OGAMC0);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveOV_OGAMC1, OV_OGAMC1);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveOV_OGAMC2, OV_OGAMC2);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveOV_OGAMC3, OV_OGAMC3);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveOV_OGAMC4, OV_OGAMC4);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveOV_OGAMC5, OV_OGAMC5);</div><div class='add'>+</div><div class='add'>+	/* DPST registers */</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveHISTOGRAM_INT_CONTROL_REG,</div><div class='add'>+						HISTOGRAM_INT_CONTROL);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveHISTOGRAM_LOGIC_CONTROL_REG,</div><div class='add'>+						HISTOGRAM_LOGIC_CONTROL);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;savePWM_CONTROL_LOGIC, PWM_CONTROL_LOGIC);</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'>+ *	oaktrail_power_down	-	power down the display island</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *</div><div class='add'>+ *	Power down the display interface of our device</div><div class='add'>+ */</div><div class='add'>+static int oaktrail_power_down(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 pwr_mask ;</div><div class='add'>+	u32 pwr_sts;</div><div class='add'>+</div><div class='add'>+	pwr_mask = PSB_PWRGT_DISPLAY_MASK;</div><div class='add'>+	outl(pwr_mask, dev_priv-&gt;ospm_base + PSB_PM_SSC);</div><div class='add'>+</div><div class='add'>+	while (true) {</div><div class='add'>+		pwr_sts = inl(dev_priv-&gt;ospm_base + PSB_PM_SSS);</div><div class='add'>+		if ((pwr_sts &amp; pwr_mask) == pwr_mask)</div><div class='add'>+			break;</div><div class='add'>+		else</div><div class='add'>+			udelay(10);</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'>+ * oaktrail_power_up</div><div class='add'>+ *</div><div class='add'>+ * Restore power to the specified island(s) (powergating)</div><div class='add'>+ */</div><div class='add'>+static int oaktrail_power_up(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 pwr_mask = PSB_PWRGT_DISPLAY_MASK;</div><div class='add'>+	u32 pwr_sts, pwr_cnt;</div><div class='add'>+</div><div class='add'>+	pwr_cnt = inl(dev_priv-&gt;ospm_base + PSB_PM_SSC);</div><div class='add'>+	pwr_cnt &amp;= ~pwr_mask;</div><div class='add'>+	outl(pwr_cnt, (dev_priv-&gt;ospm_base + PSB_PM_SSC));</div><div class='add'>+</div><div class='add'>+	while (true) {</div><div class='add'>+		pwr_sts = inl(dev_priv-&gt;ospm_base + PSB_PM_SSS);</div><div class='add'>+		if ((pwr_sts &amp; pwr_mask) == 0)</div><div class='add'>+			break;</div><div class='add'>+		else</div><div class='add'>+			udelay(10);</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 oaktrail_chip_setup(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct oaktrail_vbt *vbt = &amp;dev_priv-&gt;vbt_data;</div><div class='add'>+	int ret;</div><div class='add'>+	</div><div class='add'>+	ret = mid_chip_setup(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (vbt-&gt;size == 0) {</div><div class='add'>+		/* Now pull the BIOS data */</div><div class='add'>+		gma_intel_opregion_init(dev);</div><div class='add'>+		psb_intel_init_bios(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 oaktrail_teardown(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct oaktrail_vbt *vbt = &amp;dev_priv-&gt;vbt_data;</div><div class='add'>+</div><div class='add'>+	oaktrail_hdmi_teardown(dev);</div><div class='add'>+	if (vbt-&gt;size == 0)</div><div class='add'>+		psb_intel_destroy_bios(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct psb_ops oaktrail_chip_ops = {</div><div class='add'>+	.name = "Oaktrail",</div><div class='add'>+	.accel_2d = 1,</div><div class='add'>+	.pipes = 2,</div><div class='add'>+	.crtcs = 2,</div><div class='add'>+	.sgx_offset = MRST_SGX_OFFSET,</div><div class='add'>+</div><div class='add'>+	.chip_setup = oaktrail_chip_setup,</div><div class='add'>+	.chip_teardown = oaktrail_teardown,</div><div class='add'>+	.crtc_helper = &amp;oaktrail_helper_funcs,</div><div class='add'>+	.crtc_funcs = &amp;psb_intel_crtc_funcs,</div><div class='add'>+</div><div class='add'>+	.output_init = oaktrail_output_init,</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE</div><div class='add'>+	.backlight_init = oaktrail_backlight_init,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	.init_pm = oaktrail_init_pm,</div><div class='add'>+	.save_regs = oaktrail_save_display_registers,</div><div class='add'>+	.restore_regs = oaktrail_restore_display_registers,</div><div class='add'>+	.power_down = oaktrail_power_down,</div><div class='add'>+	.power_up = oaktrail_power_up,</div><div class='add'>+</div><div class='add'>+	.i2c_bus = 1,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c<br/>new file mode 100644<br/>index 000000000000..025d30970cc0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/oaktrail_hdmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/oaktrail_hdmi.c</a></div><div class='hunk'>@@ -0,0 +1,865 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2010 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='add'>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER</div><div class='add'>+ * DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Li Peng &lt;peng.li@intel.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include &lt;drm/drm.h&gt;</div><div class='add'>+#include "psb_intel_drv.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+</div><div class='add'>+#define HDMI_READ(reg)		readl(hdmi_dev-&gt;regs + (reg))</div><div class='add'>+#define HDMI_WRITE(reg, val)	writel(val, hdmi_dev-&gt;regs + (reg))</div><div class='add'>+</div><div class='add'>+#define HDMI_HCR	0x1000</div><div class='add'>+#define HCR_ENABLE_HDCP		(1 &lt;&lt; 5)</div><div class='add'>+#define HCR_ENABLE_AUDIO	(1 &lt;&lt; 2)</div><div class='add'>+#define HCR_ENABLE_PIXEL	(1 &lt;&lt; 1)</div><div class='add'>+#define HCR_ENABLE_TMDS		(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define HDMI_HICR	0x1004</div><div class='add'>+#define HDMI_HSR	0x1008</div><div class='add'>+#define HDMI_HISR	0x100C</div><div class='add'>+#define HDMI_DETECT_HDP		(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define HDMI_VIDEO_REG	0x3000</div><div class='add'>+#define HDMI_UNIT_EN		(1 &lt;&lt; 7)</div><div class='add'>+#define HDMI_MODE_OUTPUT	(1 &lt;&lt; 0)</div><div class='add'>+#define HDMI_HBLANK_A	0x3100</div><div class='add'>+</div><div class='add'>+#define HDMI_AUDIO_CTRL	0x4000</div><div class='add'>+#define HDMI_ENABLE_AUDIO	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define PCH_HTOTAL_B	0x3100</div><div class='add'>+#define PCH_HBLANK_B	0x3104</div><div class='add'>+#define PCH_HSYNC_B	0x3108</div><div class='add'>+#define PCH_VTOTAL_B	0x310C</div><div class='add'>+#define PCH_VBLANK_B	0x3110</div><div class='add'>+#define PCH_VSYNC_B	0x3114</div><div class='add'>+#define PCH_PIPEBSRC	0x311C</div><div class='add'>+</div><div class='add'>+#define PCH_PIPEB_DSL	0x3800</div><div class='add'>+#define PCH_PIPEB_SLC	0x3804</div><div class='add'>+#define PCH_PIPEBCONF	0x3808</div><div class='add'>+#define PCH_PIPEBSTAT	0x3824</div><div class='add'>+</div><div class='add'>+#define CDVO_DFT	0x5000</div><div class='add'>+#define CDVO_SLEWRATE	0x5004</div><div class='add'>+#define CDVO_STRENGTH	0x5008</div><div class='add'>+#define CDVO_RCOMP	0x500C</div><div class='add'>+</div><div class='add'>+#define DPLL_CTRL       0x6000</div><div class='add'>+#define DPLL_PDIV_SHIFT		16</div><div class='add'>+#define DPLL_PDIV_MASK		(0xf &lt;&lt; 16)</div><div class='add'>+#define DPLL_PWRDN		(1 &lt;&lt; 4)</div><div class='add'>+#define DPLL_RESET		(1 &lt;&lt; 3)</div><div class='add'>+#define DPLL_FASTEN		(1 &lt;&lt; 2)</div><div class='add'>+#define DPLL_ENSTAT		(1 &lt;&lt; 1)</div><div class='add'>+#define DPLL_DITHEN		(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define DPLL_DIV_CTRL   0x6004</div><div class='add'>+#define DPLL_CLKF_MASK		0xffffffc0</div><div class='add'>+#define DPLL_CLKR_MASK		(0x3f)</div><div class='add'>+</div><div class='add'>+#define DPLL_CLK_ENABLE 0x6008</div><div class='add'>+#define DPLL_EN_DISP		(1 &lt;&lt; 31)</div><div class='add'>+#define DPLL_SEL_HDMI		(1 &lt;&lt; 8)</div><div class='add'>+#define DPLL_EN_HDMI		(1 &lt;&lt; 1)</div><div class='add'>+#define DPLL_EN_VGA		(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define DPLL_ADJUST     0x600C</div><div class='add'>+#define DPLL_STATUS     0x6010</div><div class='add'>+#define DPLL_UPDATE     0x6014</div><div class='add'>+#define DPLL_DFT        0x6020</div><div class='add'>+</div><div class='add'>+struct intel_range {</div><div class='add'>+	int	min, max;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct oaktrail_hdmi_limit {</div><div class='add'>+	struct intel_range vco, np, nr, nf;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct oaktrail_hdmi_clock {</div><div class='add'>+	int np;</div><div class='add'>+	int nr;</div><div class='add'>+	int nf;</div><div class='add'>+	int dot;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define VCO_MIN		320000</div><div class='add'>+#define VCO_MAX		1650000</div><div class='add'>+#define	NP_MIN		1</div><div class='add'>+#define	NP_MAX		15</div><div class='add'>+#define	NR_MIN		1</div><div class='add'>+#define	NR_MAX		64</div><div class='add'>+#define NF_MIN		2</div><div class='add'>+#define NF_MAX		4095</div><div class='add'>+</div><div class='add'>+static const struct oaktrail_hdmi_limit oaktrail_hdmi_limit = {</div><div class='add'>+	.vco = { .min = VCO_MIN,		.max = VCO_MAX },</div><div class='add'>+	.np  = { .min = NP_MIN,			.max = NP_MAX  },</div><div class='add'>+	.nr  = { .min = NR_MIN,			.max = NR_MAX  },</div><div class='add'>+	.nf  = { .min = NF_MIN,			.max = NF_MAX  },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void wait_for_vblank(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	/* FIXME: Can we do this as a sleep ? */</div><div class='add'>+	/* Wait for 20ms, i.e. one cycle at 50hz. */</div><div class='add'>+	mdelay(20);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void scu_busy_loop(void *scu_base)</div><div class='add'>+{</div><div class='add'>+	u32 status = 0;</div><div class='add'>+	u32 loop_count = 0;</div><div class='add'>+</div><div class='add'>+	status = readl(scu_base + 0x04);</div><div class='add'>+	while (status &amp; 1) {</div><div class='add'>+		udelay(1); /* scu processing time is in few u secods */</div><div class='add'>+		status = readl(scu_base + 0x04);</div><div class='add'>+		loop_count++;</div><div class='add'>+		/* break if scu doesn't reset busy bit after huge retry */</div><div class='add'>+		if (loop_count &gt; 1000) {</div><div class='add'>+			DRM_DEBUG_KMS("SCU IPC timed out");</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 oaktrail_hdmi_reset(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	void *base;</div><div class='add'>+	/* FIXME: at least make these defines */</div><div class='add'>+	unsigned int scu_ipc_mmio = 0xff11c000;</div><div class='add'>+	int scu_len = 1024;</div><div class='add'>+</div><div class='add'>+	base = ioremap((resource_size_t)scu_ipc_mmio, scu_len);</div><div class='add'>+	if (base == NULL) {</div><div class='add'>+		DRM_ERROR("failed to map SCU mmio\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* scu ipc: assert hdmi controller reset */</div><div class='add'>+	writel(0xff11d118, base + 0x0c);</div><div class='add'>+	writel(0x7fffffdf, base + 0x80);</div><div class='add'>+	writel(0x42005, base + 0x0);</div><div class='add'>+	scu_busy_loop(base);</div><div class='add'>+</div><div class='add'>+	/* scu ipc: de-assert hdmi controller reset */</div><div class='add'>+	writel(0xff11d118, base + 0x0c);</div><div class='add'>+	writel(0x7fffffff, base + 0x80);</div><div class='add'>+	writel(0x42005, base + 0x0);</div><div class='add'>+	scu_busy_loop(base);</div><div class='add'>+</div><div class='add'>+	iounmap(base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void oaktrail_hdmi_audio_enable(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct oaktrail_hdmi_dev *hdmi_dev = dev_priv-&gt;hdmi_priv;</div><div class='add'>+</div><div class='add'>+	HDMI_WRITE(HDMI_HCR, 0x67);</div><div class='add'>+	HDMI_READ(HDMI_HCR);</div><div class='add'>+</div><div class='add'>+	HDMI_WRITE(0x51a8, 0x10);</div><div class='add'>+	HDMI_READ(0x51a8);</div><div class='add'>+</div><div class='add'>+	HDMI_WRITE(HDMI_AUDIO_CTRL, 0x1);</div><div class='add'>+	HDMI_READ(HDMI_AUDIO_CTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void oaktrail_hdmi_audio_disable(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct oaktrail_hdmi_dev *hdmi_dev = dev_priv-&gt;hdmi_priv;</div><div class='add'>+</div><div class='add'>+	HDMI_WRITE(0x51a8, 0x0);</div><div class='add'>+	HDMI_READ(0x51a8);</div><div class='add'>+</div><div class='add'>+	HDMI_WRITE(HDMI_AUDIO_CTRL, 0x0);</div><div class='add'>+	HDMI_READ(HDMI_AUDIO_CTRL);</div><div class='add'>+</div><div class='add'>+	HDMI_WRITE(HDMI_HCR, 0x47);</div><div class='add'>+	HDMI_READ(HDMI_HCR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void oaktrail_crtc_hdmi_dpms(struct drm_crtc *crtc, int mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	u32 temp;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case DRM_MODE_DPMS_OFF:</div><div class='add'>+		/* Disable VGACNTRL */</div><div class='add'>+		REG_WRITE(VGACNTRL, 0x80000000);</div><div class='add'>+</div><div class='add'>+		/* Disable plane */</div><div class='add'>+		temp = REG_READ(DSPBCNTR);</div><div class='add'>+		if ((temp &amp; DISPLAY_PLANE_ENABLE) != 0) {</div><div class='add'>+			REG_WRITE(DSPBCNTR, temp &amp; ~DISPLAY_PLANE_ENABLE);</div><div class='add'>+			REG_READ(DSPBCNTR);</div><div class='add'>+			/* Flush the plane changes */</div><div class='add'>+			REG_WRITE(DSPBSURF, REG_READ(DSPBSURF));</div><div class='add'>+			REG_READ(DSPBSURF);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Disable pipe B */</div><div class='add'>+		temp = REG_READ(PIPEBCONF);</div><div class='add'>+		if ((temp &amp; PIPEACONF_ENABLE) != 0) {</div><div class='add'>+			REG_WRITE(PIPEBCONF, temp &amp; ~PIPEACONF_ENABLE);</div><div class='add'>+			REG_READ(PIPEBCONF);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Disable LNW Pipes, etc */</div><div class='add'>+		temp = REG_READ(PCH_PIPEBCONF);</div><div class='add'>+		if ((temp &amp; PIPEACONF_ENABLE) != 0) {</div><div class='add'>+			REG_WRITE(PCH_PIPEBCONF, temp &amp; ~PIPEACONF_ENABLE);</div><div class='add'>+			REG_READ(PCH_PIPEBCONF);</div><div class='add'>+		}</div><div class='add'>+		/* wait for pipe off */</div><div class='add'>+		udelay(150);</div><div class='add'>+		/* Disable dpll */</div><div class='add'>+		temp = REG_READ(DPLL_CTRL);</div><div class='add'>+		if ((temp &amp; DPLL_PWRDN) == 0) {</div><div class='add'>+			REG_WRITE(DPLL_CTRL, temp | (DPLL_PWRDN | DPLL_RESET));</div><div class='add'>+			REG_WRITE(DPLL_STATUS, 0x1);</div><div class='add'>+		}</div><div class='add'>+		/* wait for dpll off */</div><div class='add'>+		udelay(150);</div><div class='add'>+		break;</div><div class='add'>+	case DRM_MODE_DPMS_ON:</div><div class='add'>+	case DRM_MODE_DPMS_STANDBY:</div><div class='add'>+	case DRM_MODE_DPMS_SUSPEND:</div><div class='add'>+		/* Enable dpll */</div><div class='add'>+		temp = REG_READ(DPLL_CTRL);</div><div class='add'>+		if ((temp &amp; DPLL_PWRDN) != 0) {</div><div class='add'>+			REG_WRITE(DPLL_CTRL, temp &amp; ~(DPLL_PWRDN | DPLL_RESET));</div><div class='add'>+			temp = REG_READ(DPLL_CLK_ENABLE);</div><div class='add'>+			REG_WRITE(DPLL_CLK_ENABLE, temp | DPLL_EN_DISP | DPLL_SEL_HDMI | DPLL_EN_HDMI);</div><div class='add'>+			REG_READ(DPLL_CLK_ENABLE);</div><div class='add'>+		}</div><div class='add'>+		/* wait for dpll warm up */</div><div class='add'>+		udelay(150);</div><div class='add'>+</div><div class='add'>+		/* Enable pipe B */</div><div class='add'>+		temp = REG_READ(PIPEBCONF);</div><div class='add'>+		if ((temp &amp; PIPEACONF_ENABLE) == 0) {</div><div class='add'>+			REG_WRITE(PIPEBCONF, temp | PIPEACONF_ENABLE);</div><div class='add'>+			REG_READ(PIPEBCONF);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Enable LNW Pipe B */</div><div class='add'>+		temp = REG_READ(PCH_PIPEBCONF);</div><div class='add'>+		if ((temp &amp; PIPEACONF_ENABLE) == 0) {</div><div class='add'>+			REG_WRITE(PCH_PIPEBCONF, temp | PIPEACONF_ENABLE);</div><div class='add'>+			REG_READ(PCH_PIPEBCONF);</div><div class='add'>+		}</div><div class='add'>+		wait_for_vblank(dev);</div><div class='add'>+</div><div class='add'>+		/* Enable plane */</div><div class='add'>+		temp = REG_READ(DSPBCNTR);</div><div class='add'>+		if ((temp &amp; DISPLAY_PLANE_ENABLE) == 0) {</div><div class='add'>+			REG_WRITE(DSPBCNTR, temp | DISPLAY_PLANE_ENABLE);</div><div class='add'>+			/* Flush the plane changes */</div><div class='add'>+			REG_WRITE(DSPBSURF, REG_READ(DSPBSURF));</div><div class='add'>+			REG_READ(DSPBSURF);</div><div class='add'>+		}</div><div class='add'>+		psb_intel_crtc_load_lut(crtc);</div><div class='add'>+	}</div><div class='add'>+	/* DSPARB */</div><div class='add'>+	REG_WRITE(DSPARB, 0x00003fbf);</div><div class='add'>+	/* FW1 */</div><div class='add'>+	REG_WRITE(0x70034, 0x3f880a0a);</div><div class='add'>+	/* FW2 */</div><div class='add'>+	REG_WRITE(0x70038, 0x0b060808);</div><div class='add'>+	/* FW4 */</div><div class='add'>+	REG_WRITE(0x70050, 0x08030404);</div><div class='add'>+	/* FW5 */</div><div class='add'>+	REG_WRITE(0x70054, 0x04040404);</div><div class='add'>+	/* LNC Chicken Bits */</div><div class='add'>+	REG_WRITE(0x70400, 0x4000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void oaktrail_hdmi_dpms(struct drm_encoder *encoder, int mode)</div><div class='add'>+{</div><div class='add'>+	static int dpms_mode = -1;</div><div class='add'>+</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct oaktrail_hdmi_dev *hdmi_dev = dev_priv-&gt;hdmi_priv;</div><div class='add'>+	u32 temp;</div><div class='add'>+</div><div class='add'>+	if (dpms_mode == mode)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (mode != DRM_MODE_DPMS_ON)</div><div class='add'>+		temp = 0x0;</div><div class='add'>+	else</div><div class='add'>+		temp = 0x99;</div><div class='add'>+</div><div class='add'>+	dpms_mode = mode;</div><div class='add'>+	HDMI_WRITE(HDMI_VIDEO_REG, temp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int htotal_calculate(struct drm_display_mode *mode)</div><div class='add'>+{</div><div class='add'>+	u32 htotal, new_crtc_htotal;</div><div class='add'>+</div><div class='add'>+	htotal = (mode-&gt;crtc_hdisplay - 1) | ((mode-&gt;crtc_htotal - 1) &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 1024 x 768  new_crtc_htotal = 0x1024;</div><div class='add'>+	 * 1280 x 1024 new_crtc_htotal = 0x0c34;</div><div class='add'>+	 */</div><div class='add'>+	new_crtc_htotal = (mode-&gt;crtc_htotal - 1) * 200 * 1000 / mode-&gt;clock;</div><div class='add'>+</div><div class='add'>+	return (mode-&gt;crtc_hdisplay - 1) | (new_crtc_htotal &lt;&lt; 16);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void oaktrail_hdmi_find_dpll(struct drm_crtc *crtc, int target,</div><div class='add'>+				int refclk, struct oaktrail_hdmi_clock *best_clock)</div><div class='add'>+{</div><div class='add'>+	int np_min, np_max, nr_min, nr_max;</div><div class='add'>+	int np, nr, nf;</div><div class='add'>+</div><div class='add'>+	np_min = DIV_ROUND_UP(oaktrail_hdmi_limit.vco.min, target * 10);</div><div class='add'>+	np_max = oaktrail_hdmi_limit.vco.max / (target * 10);</div><div class='add'>+	if (np_min &lt; oaktrail_hdmi_limit.np.min)</div><div class='add'>+		np_min = oaktrail_hdmi_limit.np.min;</div><div class='add'>+	if (np_max &gt; oaktrail_hdmi_limit.np.max)</div><div class='add'>+		np_max = oaktrail_hdmi_limit.np.max;</div><div class='add'>+</div><div class='add'>+	nr_min = DIV_ROUND_UP((refclk * 1000), (target * 10 * np_max));</div><div class='add'>+	nr_max = DIV_ROUND_UP((refclk * 1000), (target * 10 * np_min));</div><div class='add'>+	if (nr_min &lt; oaktrail_hdmi_limit.nr.min)</div><div class='add'>+		nr_min = oaktrail_hdmi_limit.nr.min;</div><div class='add'>+	if (nr_max &gt; oaktrail_hdmi_limit.nr.max)</div><div class='add'>+		nr_max = oaktrail_hdmi_limit.nr.max;</div><div class='add'>+</div><div class='add'>+	np = DIV_ROUND_UP((refclk * 1000), (target * 10 * nr_max));</div><div class='add'>+	nr = DIV_ROUND_UP((refclk * 1000), (target * 10 * np));</div><div class='add'>+	nf = DIV_ROUND_CLOSEST((target * 10 * np * nr), refclk);</div><div class='add'>+	DRM_DEBUG_KMS("np, nr, nf %d %d %d\n", np, nr, nf);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 1024 x 768  np = 1; nr = 0x26; nf = 0x0fd8000;</div><div class='add'>+	 * 1280 x 1024 np = 1; nr = 0x17; nf = 0x1034000;</div><div class='add'>+	 */</div><div class='add'>+	best_clock-&gt;np = np;</div><div class='add'>+	best_clock-&gt;nr = nr - 1;</div><div class='add'>+	best_clock-&gt;nf = (nf &lt;&lt; 14);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int oaktrail_crtc_hdmi_mode_set(struct drm_crtc *crtc,</div><div class='add'>+			    struct drm_display_mode *mode,</div><div class='add'>+			    struct drm_display_mode *adjusted_mode,</div><div class='add'>+			    int x, int y,</div><div class='add'>+			    struct drm_framebuffer *old_fb)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct oaktrail_hdmi_dev *hdmi_dev = dev_priv-&gt;hdmi_priv;</div><div class='add'>+	int pipe = 1;</div><div class='add'>+	int htot_reg = (pipe == 0) ? HTOTAL_A : HTOTAL_B;</div><div class='add'>+	int hblank_reg = (pipe == 0) ? HBLANK_A : HBLANK_B;</div><div class='add'>+	int hsync_reg = (pipe == 0) ? HSYNC_A : HSYNC_B;</div><div class='add'>+	int vtot_reg = (pipe == 0) ? VTOTAL_A : VTOTAL_B;</div><div class='add'>+	int vblank_reg = (pipe == 0) ? VBLANK_A : VBLANK_B;</div><div class='add'>+	int vsync_reg = (pipe == 0) ? VSYNC_A : VSYNC_B;</div><div class='add'>+	int dspsize_reg = (pipe == 0) ? DSPASIZE : DSPBSIZE;</div><div class='add'>+	int dsppos_reg = (pipe == 0) ? DSPAPOS : DSPBPOS;</div><div class='add'>+	int pipesrc_reg = (pipe == 0) ? PIPEASRC : PIPEBSRC;</div><div class='add'>+	int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;</div><div class='add'>+	int refclk;</div><div class='add'>+	struct oaktrail_hdmi_clock clock;</div><div class='add'>+	u32 dspcntr, pipeconf, dpll, temp;</div><div class='add'>+	int dspcntr_reg = DSPBCNTR;</div><div class='add'>+</div><div class='add'>+	/* Disable the VGA plane that we never use */</div><div class='add'>+	REG_WRITE(VGACNTRL, VGA_DISP_DISABLE);</div><div class='add'>+</div><div class='add'>+	/* XXX: Disable the panel fitter if it was on our pipe */</div><div class='add'>+</div><div class='add'>+	/* Disable dpll if necessary */</div><div class='add'>+	dpll = REG_READ(DPLL_CTRL);</div><div class='add'>+	if ((dpll &amp; DPLL_PWRDN) == 0) {</div><div class='add'>+		REG_WRITE(DPLL_CTRL, dpll | (DPLL_PWRDN | DPLL_RESET));</div><div class='add'>+		REG_WRITE(DPLL_DIV_CTRL, 0x00000000);</div><div class='add'>+		REG_WRITE(DPLL_STATUS, 0x1);</div><div class='add'>+	}</div><div class='add'>+	udelay(150);</div><div class='add'>+</div><div class='add'>+	/* reset controller: FIXME - can we sort out the ioremap mess ? */</div><div class='add'>+	iounmap(hdmi_dev-&gt;regs);</div><div class='add'>+	oaktrail_hdmi_reset(dev);</div><div class='add'>+</div><div class='add'>+	/* program and enable dpll */</div><div class='add'>+	refclk = 25000;</div><div class='add'>+	oaktrail_hdmi_find_dpll(crtc, adjusted_mode-&gt;clock, refclk, &amp;clock);</div><div class='add'>+</div><div class='add'>+	/* Setting DPLL */</div><div class='add'>+	dpll = REG_READ(DPLL_CTRL);</div><div class='add'>+	dpll &amp;= ~DPLL_PDIV_MASK;</div><div class='add'>+	dpll &amp;= ~(DPLL_PWRDN | DPLL_RESET);</div><div class='add'>+	REG_WRITE(DPLL_CTRL, 0x00000008);</div><div class='add'>+	REG_WRITE(DPLL_DIV_CTRL, ((clock.nf &lt;&lt; 6) | clock.nr));</div><div class='add'>+	REG_WRITE(DPLL_ADJUST, ((clock.nf &gt;&gt; 14) - 1));</div><div class='add'>+	REG_WRITE(DPLL_CTRL, (dpll | (clock.np &lt;&lt; DPLL_PDIV_SHIFT) | DPLL_ENSTAT | DPLL_DITHEN));</div><div class='add'>+	REG_WRITE(DPLL_UPDATE, 0x80000000);</div><div class='add'>+	REG_WRITE(DPLL_CLK_ENABLE, 0x80050102);</div><div class='add'>+	udelay(150);</div><div class='add'>+</div><div class='add'>+	hdmi_dev-&gt;regs = ioremap(hdmi_dev-&gt;mmio, hdmi_dev-&gt;mmio_len);</div><div class='add'>+	if (hdmi_dev-&gt;regs == NULL) {</div><div class='add'>+		DRM_ERROR("failed to do hdmi mmio mapping\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* configure HDMI */</div><div class='add'>+	HDMI_WRITE(0x1004, 0x1fd);</div><div class='add'>+	HDMI_WRITE(0x2000, 0x1);</div><div class='add'>+	HDMI_WRITE(0x2008, 0x0);</div><div class='add'>+	HDMI_WRITE(0x3130, 0x8);</div><div class='add'>+	HDMI_WRITE(0x101c, 0x1800810);</div><div class='add'>+</div><div class='add'>+	temp = htotal_calculate(adjusted_mode);</div><div class='add'>+	REG_WRITE(htot_reg, temp);</div><div class='add'>+	REG_WRITE(hblank_reg, (adjusted_mode-&gt;crtc_hblank_start - 1) | ((adjusted_mode-&gt;crtc_hblank_end - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(hsync_reg, (adjusted_mode-&gt;crtc_hsync_start - 1) | ((adjusted_mode-&gt;crtc_hsync_end - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(vtot_reg, (adjusted_mode-&gt;crtc_vdisplay - 1) | ((adjusted_mode-&gt;crtc_vtotal - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(vblank_reg, (adjusted_mode-&gt;crtc_vblank_start - 1) | ((adjusted_mode-&gt;crtc_vblank_end - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(vsync_reg, (adjusted_mode-&gt;crtc_vsync_start - 1) | ((adjusted_mode-&gt;crtc_vsync_end - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(pipesrc_reg,</div><div class='add'>+		((mode-&gt;crtc_hdisplay - 1) &lt;&lt; 16) |  (mode-&gt;crtc_vdisplay - 1));</div><div class='add'>+</div><div class='add'>+	REG_WRITE(PCH_HTOTAL_B, (adjusted_mode-&gt;crtc_hdisplay - 1) | ((adjusted_mode-&gt;crtc_htotal - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(PCH_HBLANK_B, (adjusted_mode-&gt;crtc_hblank_start - 1) | ((adjusted_mode-&gt;crtc_hblank_end - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(PCH_HSYNC_B, (adjusted_mode-&gt;crtc_hsync_start - 1) | ((adjusted_mode-&gt;crtc_hsync_end - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(PCH_VTOTAL_B, (adjusted_mode-&gt;crtc_vdisplay - 1) | ((adjusted_mode-&gt;crtc_vtotal - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(PCH_VBLANK_B, (adjusted_mode-&gt;crtc_vblank_start - 1) | ((adjusted_mode-&gt;crtc_vblank_end - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(PCH_VSYNC_B, (adjusted_mode-&gt;crtc_vsync_start - 1) | ((adjusted_mode-&gt;crtc_vsync_end - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(PCH_PIPEBSRC,</div><div class='add'>+		((mode-&gt;crtc_hdisplay - 1) &lt;&lt; 16) |  (mode-&gt;crtc_vdisplay - 1));</div><div class='add'>+</div><div class='add'>+	temp = adjusted_mode-&gt;crtc_hblank_end - adjusted_mode-&gt;crtc_hblank_start;</div><div class='add'>+	HDMI_WRITE(HDMI_HBLANK_A, ((adjusted_mode-&gt;crtc_hdisplay - 1) &lt;&lt; 16) |  temp);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(dspsize_reg,</div><div class='add'>+			((mode-&gt;vdisplay - 1) &lt;&lt; 16) | (mode-&gt;hdisplay - 1));</div><div class='add'>+	REG_WRITE(dsppos_reg, 0);</div><div class='add'>+</div><div class='add'>+	/* Flush the plane changes */</div><div class='add'>+	{</div><div class='add'>+		struct drm_crtc_helper_funcs *crtc_funcs = crtc-&gt;helper_private;</div><div class='add'>+		crtc_funcs-&gt;mode_set_base(crtc, x, y, old_fb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set up the display plane register */</div><div class='add'>+	dspcntr = REG_READ(dspcntr_reg);</div><div class='add'>+	dspcntr |= DISPPLANE_GAMMA_ENABLE;</div><div class='add'>+	dspcntr |= DISPPLANE_SEL_PIPE_B;</div><div class='add'>+	dspcntr |= DISPLAY_PLANE_ENABLE;</div><div class='add'>+</div><div class='add'>+	/* setup pipeconf */</div><div class='add'>+	pipeconf = REG_READ(pipeconf_reg);</div><div class='add'>+	pipeconf |= PIPEACONF_ENABLE;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(pipeconf_reg, pipeconf);</div><div class='add'>+	REG_READ(pipeconf_reg);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(PCH_PIPEBCONF, pipeconf);</div><div class='add'>+	REG_READ(PCH_PIPEBCONF);</div><div class='add'>+	wait_for_vblank(dev);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(dspcntr_reg, dspcntr);</div><div class='add'>+	wait_for_vblank(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 oaktrail_hdmi_mode_valid(struct drm_connector *connector,</div><div class='add'>+				struct drm_display_mode *mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = connector-&gt;dev-&gt;dev_private;</div><div class='add'>+	if (mode-&gt;clock &gt; 165000)</div><div class='add'>+		return MODE_CLOCK_HIGH;</div><div class='add'>+	if (mode-&gt;clock &lt; 20000)</div><div class='add'>+		return MODE_CLOCK_LOW;</div><div class='add'>+</div><div class='add'>+	if (mode-&gt;flags &amp; DRM_MODE_FLAG_DBLSCAN)</div><div class='add'>+		return MODE_NO_DBLESCAN;</div><div class='add'>+</div><div class='add'>+	/* We assume worst case scenario of 32 bpp here, since we don't know */</div><div class='add'>+	if ((ALIGN(mode-&gt;hdisplay * 4, 64) * mode-&gt;vdisplay) &gt;</div><div class='add'>+	    dev_priv-&gt;vram_stolen_size)</div><div class='add'>+		return MODE_MEM;</div><div class='add'>+</div><div class='add'>+	return MODE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool oaktrail_hdmi_mode_fixup(struct drm_encoder *encoder,</div><div class='add'>+				 struct drm_display_mode *mode,</div><div class='add'>+				 struct drm_display_mode *adjusted_mode)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum drm_connector_status</div><div class='add'>+oaktrail_hdmi_detect(struct drm_connector *connector, bool force)</div><div class='add'>+{</div><div class='add'>+	enum drm_connector_status status;</div><div class='add'>+	struct drm_device *dev = connector-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct oaktrail_hdmi_dev *hdmi_dev = dev_priv-&gt;hdmi_priv;</div><div class='add'>+	u32 temp;</div><div class='add'>+</div><div class='add'>+	temp = HDMI_READ(HDMI_HSR);</div><div class='add'>+	DRM_DEBUG_KMS("HDMI_HSR %x\n", temp);</div><div class='add'>+</div><div class='add'>+	if ((temp &amp; HDMI_DETECT_HDP) != 0)</div><div class='add'>+		status = connector_status_connected;</div><div class='add'>+	else</div><div class='add'>+		status = connector_status_disconnected;</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const unsigned char raw_edid[] = {</div><div class='add'>+	0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x10, 0xac, 0x2f, 0xa0,</div><div class='add'>+	0x53, 0x55, 0x33, 0x30, 0x16, 0x13, 0x01, 0x03, 0x0e, 0x3a, 0x24, 0x78,</div><div class='add'>+	0xea, 0xe9, 0xf5, 0xac, 0x51, 0x30, 0xb4, 0x25, 0x11, 0x50, 0x54, 0xa5,</div><div class='add'>+	0x4b, 0x00, 0x81, 0x80, 0xa9, 0x40, 0x71, 0x4f, 0xb3, 0x00, 0x01, 0x01,</div><div class='add'>+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x28, 0x3c, 0x80, 0xa0, 0x70, 0xb0,</div><div class='add'>+	0x23, 0x40, 0x30, 0x20, 0x36, 0x00, 0x46, 0x6c, 0x21, 0x00, 0x00, 0x1a,</div><div class='add'>+	0x00, 0x00, 0x00, 0xff, 0x00, 0x47, 0x4e, 0x37, 0x32, 0x31, 0x39, 0x35,</div><div class='add'>+	0x52, 0x30, 0x33, 0x55, 0x53, 0x0a, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x44,</div><div class='add'>+	0x45, 0x4c, 0x4c, 0x20, 0x32, 0x37, 0x30, 0x39, 0x57, 0x0a, 0x20, 0x20,</div><div class='add'>+	0x00, 0x00, 0x00, 0xfd, 0x00, 0x38, 0x4c, 0x1e, 0x53, 0x11, 0x00, 0x0a,</div><div class='add'>+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x8d</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int oaktrail_hdmi_get_modes(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = connector-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct i2c_adapter *i2c_adap;</div><div class='add'>+	struct edid *edid;</div><div class='add'>+	struct drm_display_mode *mode, *t;</div><div class='add'>+	int i = 0, ret = 0;</div><div class='add'>+</div><div class='add'>+	i2c_adap = i2c_get_adapter(3);</div><div class='add'>+	if (i2c_adap == NULL) {</div><div class='add'>+		DRM_ERROR("No ddc adapter available!\n");</div><div class='add'>+		edid = (struct edid *)raw_edid;</div><div class='add'>+	} else {</div><div class='add'>+		edid = (struct edid *)raw_edid;</div><div class='add'>+		/* FIXME ? edid = drm_get_edid(connector, i2c_adap); */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (edid) {</div><div class='add'>+		drm_mode_connector_update_edid_property(connector, edid);</div><div class='add'>+		ret = drm_add_edid_modes(connector, edid);</div><div class='add'>+		connector-&gt;display_info.raw_edid = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * prune modes that require frame buffer bigger than stolen mem</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry_safe(mode, t, &amp;connector-&gt;probed_modes, head) {</div><div class='add'>+		if ((mode-&gt;hdisplay * mode-&gt;vdisplay * 4) &gt;= dev_priv-&gt;vram_stolen_size) {</div><div class='add'>+			i++;</div><div class='add'>+			drm_mode_remove(connector, mode);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ret - i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void oaktrail_hdmi_mode_set(struct drm_encoder *encoder,</div><div class='add'>+			       struct drm_display_mode *mode,</div><div class='add'>+			       struct drm_display_mode *adjusted_mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+</div><div class='add'>+	oaktrail_hdmi_audio_enable(dev);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void oaktrail_hdmi_destroy(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct drm_encoder_helper_funcs oaktrail_hdmi_helper_funcs = {</div><div class='add'>+	.dpms = oaktrail_hdmi_dpms,</div><div class='add'>+	.mode_fixup = oaktrail_hdmi_mode_fixup,</div><div class='add'>+	.prepare = psb_intel_encoder_prepare,</div><div class='add'>+	.mode_set = oaktrail_hdmi_mode_set,</div><div class='add'>+	.commit = psb_intel_encoder_commit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct drm_connector_helper_funcs</div><div class='add'>+					oaktrail_hdmi_connector_helper_funcs = {</div><div class='add'>+	.get_modes = oaktrail_hdmi_get_modes,</div><div class='add'>+	.mode_valid = oaktrail_hdmi_mode_valid,</div><div class='add'>+	.best_encoder = psb_intel_best_encoder,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct drm_connector_funcs oaktrail_hdmi_connector_funcs = {</div><div class='add'>+	.dpms = drm_helper_connector_dpms,</div><div class='add'>+	.detect = oaktrail_hdmi_detect,</div><div class='add'>+	.fill_modes = drm_helper_probe_single_connector_modes,</div><div class='add'>+	.destroy = oaktrail_hdmi_destroy,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void oaktrail_hdmi_enc_destroy(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	drm_encoder_cleanup(encoder);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct drm_encoder_funcs oaktrail_hdmi_enc_funcs = {</div><div class='add'>+	.destroy = oaktrail_hdmi_enc_destroy,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void oaktrail_hdmi_init(struct drm_device *dev,</div><div class='add'>+					struct psb_intel_mode_device *mode_dev)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder;</div><div class='add'>+	struct psb_intel_connector *psb_intel_connector;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+	struct drm_encoder *encoder;</div><div class='add'>+</div><div class='add'>+	psb_intel_encoder = kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL);</div><div class='add'>+	if (!psb_intel_encoder)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	psb_intel_connector = kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL);</div><div class='add'>+	if (!psb_intel_connector)</div><div class='add'>+		goto failed_connector;</div><div class='add'>+</div><div class='add'>+	connector = &amp;psb_intel_connector-&gt;base;</div><div class='add'>+	encoder = &amp;psb_intel_encoder-&gt;base;</div><div class='add'>+	drm_connector_init(dev, connector,</div><div class='add'>+			   &amp;oaktrail_hdmi_connector_funcs,</div><div class='add'>+			   DRM_MODE_CONNECTOR_DVID);</div><div class='add'>+</div><div class='add'>+	drm_encoder_init(dev, encoder,</div><div class='add'>+			 &amp;oaktrail_hdmi_enc_funcs,</div><div class='add'>+			 DRM_MODE_ENCODER_TMDS);</div><div class='add'>+</div><div class='add'>+	psb_intel_connector_attach_encoder(psb_intel_connector,</div><div class='add'>+					   psb_intel_encoder);</div><div class='add'>+</div><div class='add'>+	psb_intel_encoder-&gt;type = INTEL_OUTPUT_HDMI;</div><div class='add'>+	drm_encoder_helper_add(encoder, &amp;oaktrail_hdmi_helper_funcs);</div><div class='add'>+	drm_connector_helper_add(connector, &amp;oaktrail_hdmi_connector_helper_funcs);</div><div class='add'>+</div><div class='add'>+	connector-&gt;display_info.subpixel_order = SubPixelHorizontalRGB;</div><div class='add'>+	connector-&gt;interlace_allowed = false;</div><div class='add'>+	connector-&gt;doublescan_allowed = false;</div><div class='add'>+	drm_sysfs_connector_add(connector);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+failed_connector:</div><div class='add'>+	kfree(psb_intel_encoder);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(hdmi_ids) = {</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080d) },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void oaktrail_hdmi_setup(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	struct oaktrail_hdmi_dev *hdmi_dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	pdev = pci_get_device(PCI_VENDOR_ID_INTEL, 0x080d, NULL);</div><div class='add'>+	if (!pdev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hdmi_dev = kzalloc(sizeof(struct oaktrail_hdmi_dev), GFP_KERNEL);</div><div class='add'>+	if (!hdmi_dev) {</div><div class='add'>+		dev_err(dev-&gt;dev, "failed to allocate memory\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	ret = pci_enable_device(pdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;dev, "failed to enable hdmi controller\n");</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdmi_dev-&gt;mmio = pci_resource_start(pdev, 0);</div><div class='add'>+	hdmi_dev-&gt;mmio_len = pci_resource_len(pdev, 0);</div><div class='add'>+	hdmi_dev-&gt;regs = ioremap(hdmi_dev-&gt;mmio, hdmi_dev-&gt;mmio_len);</div><div class='add'>+	if (!hdmi_dev-&gt;regs) {</div><div class='add'>+		dev_err(dev-&gt;dev, "failed to map hdmi mmio\n");</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdmi_dev-&gt;dev = pdev;</div><div class='add'>+	pci_set_drvdata(pdev, hdmi_dev);</div><div class='add'>+</div><div class='add'>+	/* Initialize i2c controller */</div><div class='add'>+	ret = oaktrail_hdmi_i2c_init(hdmi_dev-&gt;dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev-&gt;dev, "HDMI I2C initialization failed\n");</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;hdmi_priv = hdmi_dev;</div><div class='add'>+	oaktrail_hdmi_audio_disable(dev);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+free:</div><div class='add'>+	kfree(hdmi_dev);</div><div class='add'>+out:</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void oaktrail_hdmi_teardown(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct oaktrail_hdmi_dev *hdmi_dev = dev_priv-&gt;hdmi_priv;</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+</div><div class='add'>+	if (hdmi_dev) {</div><div class='add'>+		pdev = hdmi_dev-&gt;dev;</div><div class='add'>+		pci_set_drvdata(pdev, NULL);</div><div class='add'>+		oaktrail_hdmi_i2c_exit(pdev);</div><div class='add'>+		iounmap(hdmi_dev-&gt;regs);</div><div class='add'>+		kfree(hdmi_dev);</div><div class='add'>+		pci_dev_put(pdev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* save HDMI register state */</div><div class='add'>+void oaktrail_hdmi_save(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct oaktrail_hdmi_dev *hdmi_dev = dev_priv-&gt;hdmi_priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* dpll */</div><div class='add'>+	hdmi_dev-&gt;saveDPLL_CTRL = PSB_RVDC32(DPLL_CTRL);</div><div class='add'>+	hdmi_dev-&gt;saveDPLL_DIV_CTRL = PSB_RVDC32(DPLL_DIV_CTRL);</div><div class='add'>+	hdmi_dev-&gt;saveDPLL_ADJUST = PSB_RVDC32(DPLL_ADJUST);</div><div class='add'>+	hdmi_dev-&gt;saveDPLL_UPDATE = PSB_RVDC32(DPLL_UPDATE);</div><div class='add'>+	hdmi_dev-&gt;saveDPLL_CLK_ENABLE = PSB_RVDC32(DPLL_CLK_ENABLE);</div><div class='add'>+</div><div class='add'>+	/* pipe B */</div><div class='add'>+	dev_priv-&gt;savePIPEBCONF = PSB_RVDC32(PIPEBCONF);</div><div class='add'>+	dev_priv-&gt;savePIPEBSRC  = PSB_RVDC32(PIPEBSRC);</div><div class='add'>+	dev_priv-&gt;saveHTOTAL_B  = PSB_RVDC32(HTOTAL_B);</div><div class='add'>+	dev_priv-&gt;saveHBLANK_B  = PSB_RVDC32(HBLANK_B);</div><div class='add'>+	dev_priv-&gt;saveHSYNC_B   = PSB_RVDC32(HSYNC_B);</div><div class='add'>+	dev_priv-&gt;saveVTOTAL_B  = PSB_RVDC32(VTOTAL_B);</div><div class='add'>+	dev_priv-&gt;saveVBLANK_B  = PSB_RVDC32(VBLANK_B);</div><div class='add'>+	dev_priv-&gt;saveVSYNC_B   = PSB_RVDC32(VSYNC_B);</div><div class='add'>+</div><div class='add'>+	hdmi_dev-&gt;savePCH_PIPEBCONF = PSB_RVDC32(PCH_PIPEBCONF);</div><div class='add'>+	hdmi_dev-&gt;savePCH_PIPEBSRC = PSB_RVDC32(PCH_PIPEBSRC);</div><div class='add'>+	hdmi_dev-&gt;savePCH_HTOTAL_B = PSB_RVDC32(PCH_HTOTAL_B);</div><div class='add'>+	hdmi_dev-&gt;savePCH_HBLANK_B = PSB_RVDC32(PCH_HBLANK_B);</div><div class='add'>+	hdmi_dev-&gt;savePCH_HSYNC_B  = PSB_RVDC32(PCH_HSYNC_B);</div><div class='add'>+	hdmi_dev-&gt;savePCH_VTOTAL_B = PSB_RVDC32(PCH_VTOTAL_B);</div><div class='add'>+	hdmi_dev-&gt;savePCH_VBLANK_B = PSB_RVDC32(PCH_VBLANK_B);</div><div class='add'>+	hdmi_dev-&gt;savePCH_VSYNC_B  = PSB_RVDC32(PCH_VSYNC_B);</div><div class='add'>+</div><div class='add'>+	/* plane */</div><div class='add'>+	dev_priv-&gt;saveDSPBCNTR = PSB_RVDC32(DSPBCNTR);</div><div class='add'>+	dev_priv-&gt;saveDSPBSTRIDE = PSB_RVDC32(DSPBSTRIDE);</div><div class='add'>+	dev_priv-&gt;saveDSPBADDR = PSB_RVDC32(DSPBBASE);</div><div class='add'>+	dev_priv-&gt;saveDSPBSURF = PSB_RVDC32(DSPBSURF);</div><div class='add'>+	dev_priv-&gt;saveDSPBLINOFF = PSB_RVDC32(DSPBLINOFF);</div><div class='add'>+	dev_priv-&gt;saveDSPBTILEOFF = PSB_RVDC32(DSPBTILEOFF);</div><div class='add'>+</div><div class='add'>+	/* cursor B */</div><div class='add'>+	dev_priv-&gt;saveDSPBCURSOR_CTRL = PSB_RVDC32(CURBCNTR);</div><div class='add'>+	dev_priv-&gt;saveDSPBCURSOR_BASE = PSB_RVDC32(CURBBASE);</div><div class='add'>+	dev_priv-&gt;saveDSPBCURSOR_POS = PSB_RVDC32(CURBPOS);</div><div class='add'>+</div><div class='add'>+	/* save palette */</div><div class='add'>+	for (i = 0; i &lt; 256; i++)</div><div class='add'>+		dev_priv-&gt;save_palette_b[i] = PSB_RVDC32(PALETTE_B + (i &lt;&lt; 2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* restore HDMI register state */</div><div class='add'>+void oaktrail_hdmi_restore(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct oaktrail_hdmi_dev *hdmi_dev = dev_priv-&gt;hdmi_priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* dpll */</div><div class='add'>+	PSB_WVDC32(hdmi_dev-&gt;saveDPLL_CTRL, DPLL_CTRL);</div><div class='add'>+	PSB_WVDC32(hdmi_dev-&gt;saveDPLL_DIV_CTRL, DPLL_DIV_CTRL);</div><div class='add'>+	PSB_WVDC32(hdmi_dev-&gt;saveDPLL_ADJUST, DPLL_ADJUST);</div><div class='add'>+	PSB_WVDC32(hdmi_dev-&gt;saveDPLL_UPDATE, DPLL_UPDATE);</div><div class='add'>+	PSB_WVDC32(hdmi_dev-&gt;saveDPLL_CLK_ENABLE, DPLL_CLK_ENABLE);</div><div class='add'>+	DRM_UDELAY(150);</div><div class='add'>+</div><div class='add'>+	/* pipe */</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;savePIPEBSRC, PIPEBSRC);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveHTOTAL_B, HTOTAL_B);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveHBLANK_B, HBLANK_B);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveHSYNC_B,  HSYNC_B);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveVTOTAL_B, VTOTAL_B);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveVBLANK_B, VBLANK_B);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveVSYNC_B,  VSYNC_B);</div><div class='add'>+</div><div class='add'>+	PSB_WVDC32(hdmi_dev-&gt;savePCH_PIPEBSRC, PCH_PIPEBSRC);</div><div class='add'>+	PSB_WVDC32(hdmi_dev-&gt;savePCH_HTOTAL_B, PCH_HTOTAL_B);</div><div class='add'>+	PSB_WVDC32(hdmi_dev-&gt;savePCH_HBLANK_B, PCH_HBLANK_B);</div><div class='add'>+	PSB_WVDC32(hdmi_dev-&gt;savePCH_HSYNC_B,  PCH_HSYNC_B);</div><div class='add'>+	PSB_WVDC32(hdmi_dev-&gt;savePCH_VTOTAL_B, PCH_VTOTAL_B);</div><div class='add'>+	PSB_WVDC32(hdmi_dev-&gt;savePCH_VBLANK_B, PCH_VBLANK_B);</div><div class='add'>+	PSB_WVDC32(hdmi_dev-&gt;savePCH_VSYNC_B,  PCH_VSYNC_B);</div><div class='add'>+</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;savePIPEBCONF, PIPEBCONF);</div><div class='add'>+	PSB_WVDC32(hdmi_dev-&gt;savePCH_PIPEBCONF, PCH_PIPEBCONF);</div><div class='add'>+</div><div class='add'>+	/* plane */</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPBLINOFF, DSPBLINOFF);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPBSTRIDE, DSPBSTRIDE);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPBTILEOFF, DSPBTILEOFF);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPBCNTR, DSPBCNTR);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPBSURF, DSPBSURF);</div><div class='add'>+</div><div class='add'>+	/* cursor B */</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPBCURSOR_CTRL, CURBCNTR);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPBCURSOR_POS, CURBPOS);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPBCURSOR_BASE, CURBBASE);</div><div class='add'>+</div><div class='add'>+	/* restore palette */</div><div class='add'>+	for (i = 0; i &lt; 256; i++)</div><div class='add'>+		PSB_WVDC32(dev_priv-&gt;save_palette_b[i], PALETTE_B + (i &lt;&lt; 2));</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c b/drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c<br/>new file mode 100644<br/>index 000000000000..705440874ac0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c</a></div><div class='hunk'>@@ -0,0 +1,328 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2010 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='add'>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER</div><div class='add'>+ * DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Li Peng &lt;peng.li@intel.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+</div><div class='add'>+#define HDMI_READ(reg)		readl(hdmi_dev-&gt;regs + (reg))</div><div class='add'>+#define HDMI_WRITE(reg, val)	writel(val, hdmi_dev-&gt;regs + (reg))</div><div class='add'>+</div><div class='add'>+#define HDMI_HCR	0x1000</div><div class='add'>+#define HCR_DETECT_HDP		(1 &lt;&lt; 6)</div><div class='add'>+#define HCR_ENABLE_HDCP		(1 &lt;&lt; 5)</div><div class='add'>+#define HCR_ENABLE_AUDIO	(1 &lt;&lt; 2)</div><div class='add'>+#define HCR_ENABLE_PIXEL	(1 &lt;&lt; 1)</div><div class='add'>+#define HCR_ENABLE_TMDS		(1 &lt;&lt; 0)</div><div class='add'>+#define HDMI_HICR	0x1004</div><div class='add'>+#define HDMI_INTR_I2C_ERROR	(1 &lt;&lt; 4)</div><div class='add'>+#define HDMI_INTR_I2C_FULL	(1 &lt;&lt; 3)</div><div class='add'>+#define HDMI_INTR_I2C_DONE	(1 &lt;&lt; 2)</div><div class='add'>+#define HDMI_INTR_HPD		(1 &lt;&lt; 0)</div><div class='add'>+#define HDMI_HSR	0x1008</div><div class='add'>+#define HDMI_HISR	0x100C</div><div class='add'>+#define HDMI_HI2CRDB0	0x1200</div><div class='add'>+#define HDMI_HI2CHCR	0x1240</div><div class='add'>+#define HI2C_HDCP_WRITE		(0 &lt;&lt; 2)</div><div class='add'>+#define HI2C_HDCP_RI_READ	(1 &lt;&lt; 2)</div><div class='add'>+#define HI2C_HDCP_READ		(2 &lt;&lt; 2)</div><div class='add'>+#define HI2C_EDID_READ		(3 &lt;&lt; 2)</div><div class='add'>+#define HI2C_READ_CONTINUE	(1 &lt;&lt; 1)</div><div class='add'>+#define HI2C_ENABLE_TRANSACTION	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define HDMI_ICRH	0x1100</div><div class='add'>+#define HDMI_HI2CTDR0	0x1244</div><div class='add'>+#define HDMI_HI2CTDR1	0x1248</div><div class='add'>+</div><div class='add'>+#define I2C_STAT_INIT		0</div><div class='add'>+#define I2C_READ_DONE		1</div><div class='add'>+#define I2C_TRANSACTION_DONE	2</div><div class='add'>+</div><div class='add'>+struct hdmi_i2c_dev {</div><div class='add'>+	struct i2c_adapter *adap;</div><div class='add'>+	struct mutex i2c_lock;</div><div class='add'>+	struct completion complete;</div><div class='add'>+	int status;</div><div class='add'>+	struct i2c_msg *msg;</div><div class='add'>+	int buf_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void hdmi_i2c_irq_enable(struct oaktrail_hdmi_dev *hdmi_dev)</div><div class='add'>+{</div><div class='add'>+	u32 temp;</div><div class='add'>+</div><div class='add'>+	temp = HDMI_READ(HDMI_HICR);</div><div class='add'>+	temp |= (HDMI_INTR_I2C_ERROR | HDMI_INTR_I2C_FULL | HDMI_INTR_I2C_DONE);</div><div class='add'>+	HDMI_WRITE(HDMI_HICR, temp);</div><div class='add'>+	HDMI_READ(HDMI_HICR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_i2c_irq_disable(struct oaktrail_hdmi_dev *hdmi_dev)</div><div class='add'>+{</div><div class='add'>+	HDMI_WRITE(HDMI_HICR, 0x0);</div><div class='add'>+	HDMI_READ(HDMI_HICR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xfer_read(struct i2c_adapter *adap, struct i2c_msg *pmsg)</div><div class='add'>+{</div><div class='add'>+	struct oaktrail_hdmi_dev *hdmi_dev = i2c_get_adapdata(adap);</div><div class='add'>+	struct hdmi_i2c_dev *i2c_dev = hdmi_dev-&gt;i2c_dev;</div><div class='add'>+	u32 temp;</div><div class='add'>+</div><div class='add'>+	i2c_dev-&gt;status = I2C_STAT_INIT;</div><div class='add'>+	i2c_dev-&gt;msg = pmsg;</div><div class='add'>+	i2c_dev-&gt;buf_offset = 0;</div><div class='add'>+	INIT_COMPLETION(i2c_dev-&gt;complete);</div><div class='add'>+</div><div class='add'>+	/* Enable I2C transaction */</div><div class='add'>+	temp = ((pmsg-&gt;len) &lt;&lt; 20) | HI2C_EDID_READ | HI2C_ENABLE_TRANSACTION;</div><div class='add'>+	HDMI_WRITE(HDMI_HI2CHCR, temp);</div><div class='add'>+	HDMI_READ(HDMI_HI2CHCR);</div><div class='add'>+</div><div class='add'>+	while (i2c_dev-&gt;status != I2C_TRANSACTION_DONE)</div><div class='add'>+		wait_for_completion_interruptible_timeout(&amp;i2c_dev-&gt;complete,</div><div class='add'>+								10 * HZ);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xfer_write(struct i2c_adapter *adap, struct i2c_msg *pmsg)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * XXX: i2c write seems isn't useful for EDID probe, don't do anything</div><div class='add'>+	 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int oaktrail_hdmi_i2c_access(struct i2c_adapter *adap,</div><div class='add'>+				struct i2c_msg *pmsg,</div><div class='add'>+				int num)</div><div class='add'>+{</div><div class='add'>+	struct oaktrail_hdmi_dev *hdmi_dev = i2c_get_adapdata(adap);</div><div class='add'>+	struct hdmi_i2c_dev *i2c_dev = hdmi_dev-&gt;i2c_dev;</div><div class='add'>+	int i, err = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;i2c_dev-&gt;i2c_lock);</div><div class='add'>+</div><div class='add'>+	/* Enable i2c unit */</div><div class='add'>+	HDMI_WRITE(HDMI_ICRH, 0x00008760);</div><div class='add'>+</div><div class='add'>+	/* Enable irq */</div><div class='add'>+	hdmi_i2c_irq_enable(hdmi_dev);</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		if (pmsg-&gt;len &amp;&amp; pmsg-&gt;buf) {</div><div class='add'>+			if (pmsg-&gt;flags &amp; I2C_M_RD)</div><div class='add'>+				err = xfer_read(adap, pmsg);</div><div class='add'>+			else</div><div class='add'>+				err = xfer_write(adap, pmsg);</div><div class='add'>+		}</div><div class='add'>+		pmsg++;         /* next message */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable irq */</div><div class='add'>+	hdmi_i2c_irq_disable(hdmi_dev);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;i2c_dev-&gt;i2c_lock);</div><div class='add'>+</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 oaktrail_hdmi_i2c_func(struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	return I2C_FUNC_I2C | I2C_FUNC_10BIT_ADDR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_algorithm oaktrail_hdmi_i2c_algorithm = {</div><div class='add'>+	.master_xfer	= oaktrail_hdmi_i2c_access,</div><div class='add'>+	.functionality  = oaktrail_hdmi_i2c_func,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_adapter oaktrail_hdmi_i2c_adapter = {</div><div class='add'>+	.name		= "oaktrail_hdmi_i2c",</div><div class='add'>+	.nr		= 3,</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.class		= I2C_CLASS_DDC,</div><div class='add'>+	.algo		= &amp;oaktrail_hdmi_i2c_algorithm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void hdmi_i2c_read(struct oaktrail_hdmi_dev *hdmi_dev)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_i2c_dev *i2c_dev = hdmi_dev-&gt;i2c_dev;</div><div class='add'>+	struct i2c_msg *msg = i2c_dev-&gt;msg;</div><div class='add'>+	u8 *buf = msg-&gt;buf;</div><div class='add'>+	u32 temp;</div><div class='add'>+	int i, offset;</div><div class='add'>+</div><div class='add'>+	offset = i2c_dev-&gt;buf_offset;</div><div class='add'>+	for (i = 0; i &lt; 0x10; i++) {</div><div class='add'>+		temp = HDMI_READ(HDMI_HI2CRDB0 + (i * 4));</div><div class='add'>+		memcpy(buf + (offset + i * 4), &amp;temp, 4);</div><div class='add'>+	}</div><div class='add'>+	i2c_dev-&gt;buf_offset += (0x10 * 4);</div><div class='add'>+</div><div class='add'>+	/* clearing read buffer full intr */</div><div class='add'>+	temp = HDMI_READ(HDMI_HISR);</div><div class='add'>+	HDMI_WRITE(HDMI_HISR, temp | HDMI_INTR_I2C_FULL);</div><div class='add'>+	HDMI_READ(HDMI_HISR);</div><div class='add'>+</div><div class='add'>+	/* continue read transaction */</div><div class='add'>+	temp = HDMI_READ(HDMI_HI2CHCR);</div><div class='add'>+	HDMI_WRITE(HDMI_HI2CHCR, temp | HI2C_READ_CONTINUE);</div><div class='add'>+	HDMI_READ(HDMI_HI2CHCR);</div><div class='add'>+</div><div class='add'>+	i2c_dev-&gt;status = I2C_READ_DONE;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_i2c_transaction_done(struct oaktrail_hdmi_dev *hdmi_dev)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_i2c_dev *i2c_dev = hdmi_dev-&gt;i2c_dev;</div><div class='add'>+	u32 temp;</div><div class='add'>+</div><div class='add'>+	/* clear transaction done intr */</div><div class='add'>+	temp = HDMI_READ(HDMI_HISR);</div><div class='add'>+	HDMI_WRITE(HDMI_HISR, temp | HDMI_INTR_I2C_DONE);</div><div class='add'>+	HDMI_READ(HDMI_HISR);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	temp = HDMI_READ(HDMI_HI2CHCR);</div><div class='add'>+	HDMI_WRITE(HDMI_HI2CHCR, temp &amp; ~HI2C_ENABLE_TRANSACTION);</div><div class='add'>+	HDMI_READ(HDMI_HI2CHCR);</div><div class='add'>+</div><div class='add'>+	i2c_dev-&gt;status = I2C_TRANSACTION_DONE;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t oaktrail_hdmi_i2c_handler(int this_irq, void *dev)</div><div class='add'>+{</div><div class='add'>+	struct oaktrail_hdmi_dev *hdmi_dev = dev;</div><div class='add'>+	struct hdmi_i2c_dev *i2c_dev = hdmi_dev-&gt;i2c_dev;</div><div class='add'>+	u32 stat;</div><div class='add'>+</div><div class='add'>+	stat = HDMI_READ(HDMI_HISR);</div><div class='add'>+</div><div class='add'>+	if (stat &amp; HDMI_INTR_HPD) {</div><div class='add'>+		HDMI_WRITE(HDMI_HISR, stat | HDMI_INTR_HPD);</div><div class='add'>+		HDMI_READ(HDMI_HISR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (stat &amp; HDMI_INTR_I2C_FULL)</div><div class='add'>+		hdmi_i2c_read(hdmi_dev);</div><div class='add'>+</div><div class='add'>+	if (stat &amp; HDMI_INTR_I2C_DONE)</div><div class='add'>+		hdmi_i2c_transaction_done(hdmi_dev);</div><div class='add'>+</div><div class='add'>+	complete(&amp;i2c_dev-&gt;complete);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * choose alternate function 2 of GPIO pin 52, 53,</div><div class='add'>+ * which is used by HDMI I2C logic</div><div class='add'>+ */</div><div class='add'>+static void oaktrail_hdmi_i2c_gpio_fix(void)</div><div class='add'>+{</div><div class='add'>+	void *base;</div><div class='add'>+	unsigned int gpio_base = 0xff12c000;</div><div class='add'>+	int gpio_len = 0x1000;</div><div class='add'>+	u32 temp;</div><div class='add'>+</div><div class='add'>+	base = ioremap((resource_size_t)gpio_base, gpio_len);</div><div class='add'>+	if (base == NULL) {</div><div class='add'>+		DRM_ERROR("gpio ioremap fail\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	temp = readl(base + 0x44);</div><div class='add'>+	DRM_DEBUG_DRIVER("old gpio val %x\n", temp);</div><div class='add'>+	writel((temp | 0x00000a00), (base +  0x44));</div><div class='add'>+	temp = readl(base + 0x44);</div><div class='add'>+	DRM_DEBUG_DRIVER("new gpio val %x\n", temp);</div><div class='add'>+</div><div class='add'>+	iounmap(base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int oaktrail_hdmi_i2c_init(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct oaktrail_hdmi_dev *hdmi_dev;</div><div class='add'>+	struct hdmi_i2c_dev *i2c_dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	hdmi_dev = pci_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	i2c_dev = kzalloc(sizeof(struct hdmi_i2c_dev), GFP_KERNEL);</div><div class='add'>+	if (i2c_dev == NULL) {</div><div class='add'>+		DRM_ERROR("Can't allocate interface\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c_dev-&gt;adap = &amp;oaktrail_hdmi_i2c_adapter;</div><div class='add'>+	i2c_dev-&gt;status = I2C_STAT_INIT;</div><div class='add'>+	init_completion(&amp;i2c_dev-&gt;complete);</div><div class='add'>+	mutex_init(&amp;i2c_dev-&gt;i2c_lock);</div><div class='add'>+	i2c_set_adapdata(&amp;oaktrail_hdmi_i2c_adapter, hdmi_dev);</div><div class='add'>+	hdmi_dev-&gt;i2c_dev = i2c_dev;</div><div class='add'>+</div><div class='add'>+	/* Enable HDMI I2C function on gpio */</div><div class='add'>+	oaktrail_hdmi_i2c_gpio_fix();</div><div class='add'>+</div><div class='add'>+	/* request irq */</div><div class='add'>+	ret = request_irq(dev-&gt;irq, oaktrail_hdmi_i2c_handler, IRQF_SHARED,</div><div class='add'>+			  oaktrail_hdmi_i2c_adapter.name, hdmi_dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		DRM_ERROR("Failed to request IRQ for I2C controller\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Adapter registration */</div><div class='add'>+	ret = i2c_add_numbered_adapter(&amp;oaktrail_hdmi_i2c_adapter);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	kfree(i2c_dev);</div><div class='add'>+exit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void oaktrail_hdmi_i2c_exit(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct oaktrail_hdmi_dev *hdmi_dev;</div><div class='add'>+	struct hdmi_i2c_dev *i2c_dev;</div><div class='add'>+</div><div class='add'>+	hdmi_dev = pci_get_drvdata(dev);</div><div class='add'>+	if (i2c_del_adapter(&amp;oaktrail_hdmi_i2c_adapter))</div><div class='add'>+		DRM_DEBUG_DRIVER("Failed to delete hdmi-i2c adapter\n");</div><div class='add'>+</div><div class='add'>+	i2c_dev = hdmi_dev-&gt;i2c_dev;</div><div class='add'>+	kfree(i2c_dev);</div><div class='add'>+	free_irq(dev-&gt;irq, hdmi_dev);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma500/oaktrail_lvds.c<br/>new file mode 100644<br/>index 000000000000..238bbe105304<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/oaktrail_lvds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/oaktrail_lvds.c</a></div><div class='hunk'>@@ -0,0 +1,449 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2006-2009 Intel Corporation</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Eric Anholt &lt;eric@anholt.net&gt;</div><div class='add'>+ *	Dave Airlie &lt;airlied@linux.ie&gt;</div><div class='add'>+ *	Jesse Barnes &lt;jesse.barnes@intel.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include &lt;asm/mrst.h&gt;</div><div class='add'>+</div><div class='add'>+#include "intel_bios.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_intel_drv.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include "power.h"</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+</div><div class='add'>+/* The max/min PWM frequency in BPCR[31:17] - */</div><div class='add'>+/* The smallest number is 1 (not 0) that can fit in the</div><div class='add'>+ * 15-bit field of the and then*/</div><div class='add'>+/* shifts to the left by one bit to get the actual 16-bit</div><div class='add'>+ * value that the 15-bits correspond to.*/</div><div class='add'>+#define MRST_BLC_MAX_PWM_REG_FREQ	    0xFFFF</div><div class='add'>+#define BRIGHTNESS_MAX_LEVEL 100</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Sets the power state for the panel.</div><div class='add'>+ */</div><div class='add'>+static void oaktrail_lvds_set_power(struct drm_device *dev,</div><div class='add'>+				struct psb_intel_encoder *psb_intel_encoder,</div><div class='add'>+				bool on)</div><div class='add'>+{</div><div class='add'>+	u32 pp_status;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (!gma_power_begin(dev, true))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (on) {</div><div class='add'>+		REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) |</div><div class='add'>+			  POWER_TARGET_ON);</div><div class='add'>+		do {</div><div class='add'>+			pp_status = REG_READ(PP_STATUS);</div><div class='add'>+		} while ((pp_status &amp; (PP_ON | PP_READY)) == PP_READY);</div><div class='add'>+		dev_priv-&gt;is_lvds_on = true;</div><div class='add'>+		if (dev_priv-&gt;ops-&gt;lvds_bl_power)</div><div class='add'>+			dev_priv-&gt;ops-&gt;lvds_bl_power(dev, true);</div><div class='add'>+	} else {</div><div class='add'>+		if (dev_priv-&gt;ops-&gt;lvds_bl_power)</div><div class='add'>+			dev_priv-&gt;ops-&gt;lvds_bl_power(dev, false);</div><div class='add'>+		REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) &amp;</div><div class='add'>+			  ~POWER_TARGET_ON);</div><div class='add'>+		do {</div><div class='add'>+			pp_status = REG_READ(PP_STATUS);</div><div class='add'>+		} while (pp_status &amp; PP_ON);</div><div class='add'>+		dev_priv-&gt;is_lvds_on = false;</div><div class='add'>+		pm_request_idle(&amp;dev-&gt;pdev-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+	gma_power_end(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void oaktrail_lvds_dpms(struct drm_encoder *encoder, int mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+						to_psb_intel_encoder(encoder);</div><div class='add'>+</div><div class='add'>+	if (mode == DRM_MODE_DPMS_ON)</div><div class='add'>+		oaktrail_lvds_set_power(dev, psb_intel_encoder, true);</div><div class='add'>+	else</div><div class='add'>+		oaktrail_lvds_set_power(dev, psb_intel_encoder, false);</div><div class='add'>+</div><div class='add'>+	/* XXX: We never power down the LVDS pairs. */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void oaktrail_lvds_mode_set(struct drm_encoder *encoder,</div><div class='add'>+			       struct drm_display_mode *mode,</div><div class='add'>+			       struct drm_display_mode *adjusted_mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_mode_device *mode_dev = &amp;dev_priv-&gt;mode_dev;</div><div class='add'>+	struct drm_mode_config *mode_config = &amp;dev-&gt;mode_config;</div><div class='add'>+	struct drm_connector *connector = NULL;</div><div class='add'>+	struct drm_crtc *crtc = encoder-&gt;crtc;</div><div class='add'>+	u32 lvds_port;</div><div class='add'>+	uint64_t v = DRM_MODE_SCALE_FULLSCREEN;</div><div class='add'>+</div><div class='add'>+	if (!gma_power_begin(dev, true))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The LVDS pin pair will already have been turned on in the</div><div class='add'>+	 * psb_intel_crtc_mode_set since it has a large impact on the DPLL</div><div class='add'>+	 * settings.</div><div class='add'>+	 */</div><div class='add'>+	lvds_port = (REG_READ(LVDS) &amp;</div><div class='add'>+		    (~LVDS_PIPEB_SELECT)) |</div><div class='add'>+		    LVDS_PORT_EN |</div><div class='add'>+		    LVDS_BORDER_EN;</div><div class='add'>+</div><div class='add'>+	/* If the firmware says dither on Moorestown, or the BIOS does</div><div class='add'>+	   on Oaktrail then enable dithering */</div><div class='add'>+	if (mode_dev-&gt;panel_wants_dither || dev_priv-&gt;lvds_dither)</div><div class='add'>+		lvds_port |= MRST_PANEL_8TO6_DITHER_ENABLE;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(LVDS, lvds_port);</div><div class='add'>+</div><div class='add'>+	/* Find the connector we're trying to set up */</div><div class='add'>+	list_for_each_entry(connector, &amp;mode_config-&gt;connector_list, head) {</div><div class='add'>+		if (!connector-&gt;encoder || connector-&gt;encoder-&gt;crtc != crtc)</div><div class='add'>+			continue;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!connector) {</div><div class='add'>+		DRM_ERROR("Couldn't find connector when setting mode");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	drm_connector_property_get_value(</div><div class='add'>+		connector,</div><div class='add'>+		dev-&gt;mode_config.scaling_mode_property,</div><div class='add'>+		&amp;v);</div><div class='add'>+</div><div class='add'>+	if (v == DRM_MODE_SCALE_NO_SCALE)</div><div class='add'>+		REG_WRITE(PFIT_CONTROL, 0);</div><div class='add'>+	else if (v == DRM_MODE_SCALE_ASPECT) {</div><div class='add'>+		if ((mode-&gt;vdisplay != adjusted_mode-&gt;crtc_vdisplay) ||</div><div class='add'>+		    (mode-&gt;hdisplay != adjusted_mode-&gt;crtc_hdisplay)) {</div><div class='add'>+			if ((adjusted_mode-&gt;crtc_hdisplay * mode-&gt;vdisplay) ==</div><div class='add'>+			    (mode-&gt;hdisplay * adjusted_mode-&gt;crtc_vdisplay))</div><div class='add'>+				REG_WRITE(PFIT_CONTROL, PFIT_ENABLE);</div><div class='add'>+			else if ((adjusted_mode-&gt;crtc_hdisplay *</div><div class='add'>+				mode-&gt;vdisplay) &gt; (mode-&gt;hdisplay *</div><div class='add'>+				adjusted_mode-&gt;crtc_vdisplay))</div><div class='add'>+				REG_WRITE(PFIT_CONTROL, PFIT_ENABLE |</div><div class='add'>+					  PFIT_SCALING_MODE_PILLARBOX);</div><div class='add'>+			else</div><div class='add'>+				REG_WRITE(PFIT_CONTROL, PFIT_ENABLE |</div><div class='add'>+					  PFIT_SCALING_MODE_LETTERBOX);</div><div class='add'>+		} else</div><div class='add'>+			REG_WRITE(PFIT_CONTROL, PFIT_ENABLE);</div><div class='add'>+	} else /*(v == DRM_MODE_SCALE_FULLSCREEN)*/</div><div class='add'>+		REG_WRITE(PFIT_CONTROL, PFIT_ENABLE);</div><div class='add'>+</div><div class='add'>+	gma_power_end(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void oaktrail_lvds_prepare(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+						to_psb_intel_encoder(encoder);</div><div class='add'>+	struct psb_intel_mode_device *mode_dev = &amp;dev_priv-&gt;mode_dev;</div><div class='add'>+</div><div class='add'>+	if (!gma_power_begin(dev, true))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mode_dev-&gt;saveBLC_PWM_CTL = REG_READ(BLC_PWM_CTL);</div><div class='add'>+	mode_dev-&gt;backlight_duty_cycle = (mode_dev-&gt;saveBLC_PWM_CTL &amp;</div><div class='add'>+					  BACKLIGHT_DUTY_CYCLE_MASK);</div><div class='add'>+	oaktrail_lvds_set_power(dev, psb_intel_encoder, false);</div><div class='add'>+	gma_power_end(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 oaktrail_lvds_get_max_backlight(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 ret;</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		ret = ((REG_READ(BLC_PWM_CTL) &amp;</div><div class='add'>+			  BACKLIGHT_MODULATION_FREQ_MASK) &gt;&gt;</div><div class='add'>+			  BACKLIGHT_MODULATION_FREQ_SHIFT) * 2;</div><div class='add'>+</div><div class='add'>+		gma_power_end(dev);</div><div class='add'>+	} else</div><div class='add'>+		ret = ((dev_priv-&gt;saveBLC_PWM_CTL &amp;</div><div class='add'>+			  BACKLIGHT_MODULATION_FREQ_MASK) &gt;&gt;</div><div class='add'>+			  BACKLIGHT_MODULATION_FREQ_SHIFT) * 2;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void oaktrail_lvds_commit(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+						to_psb_intel_encoder(encoder);</div><div class='add'>+	struct psb_intel_mode_device *mode_dev = &amp;dev_priv-&gt;mode_dev;</div><div class='add'>+</div><div class='add'>+	if (mode_dev-&gt;backlight_duty_cycle == 0)</div><div class='add'>+		mode_dev-&gt;backlight_duty_cycle =</div><div class='add'>+					oaktrail_lvds_get_max_backlight(dev);</div><div class='add'>+	oaktrail_lvds_set_power(dev, psb_intel_encoder, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct drm_encoder_helper_funcs oaktrail_lvds_helper_funcs = {</div><div class='add'>+	.dpms = oaktrail_lvds_dpms,</div><div class='add'>+	.mode_fixup = psb_intel_lvds_mode_fixup,</div><div class='add'>+	.prepare = oaktrail_lvds_prepare,</div><div class='add'>+	.mode_set = oaktrail_lvds_mode_set,</div><div class='add'>+	.commit = oaktrail_lvds_commit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct drm_display_mode lvds_configuration_modes[] = {</div><div class='add'>+	/* hard coded fixed mode for TPO LTPS LPJ040K001A */</div><div class='add'>+	{ DRM_MODE("800x480",  DRM_MODE_TYPE_DRIVER, 33264, 800, 836,</div><div class='add'>+		   846, 1056, 0, 480, 489, 491, 525, 0, 0) },</div><div class='add'>+	/* hard coded fixed mode for LVDS 800x480 */</div><div class='add'>+	{ DRM_MODE("800x480",  DRM_MODE_TYPE_DRIVER, 30994, 800, 801,</div><div class='add'>+		   802, 1024, 0, 480, 481, 482, 525, 0, 0) },</div><div class='add'>+	/* hard coded fixed mode for Samsung 480wsvga LVDS 1024x600@75 */</div><div class='add'>+	{ DRM_MODE("1024x600", DRM_MODE_TYPE_DRIVER, 53990, 1024, 1072,</div><div class='add'>+		   1104, 1184, 0, 600, 603, 604, 608, 0, 0) },</div><div class='add'>+	/* hard coded fixed mode for Samsung 480wsvga LVDS 1024x600@75 */</div><div class='add'>+	{ DRM_MODE("1024x600", DRM_MODE_TYPE_DRIVER, 53990, 1024, 1104,</div><div class='add'>+		   1136, 1184, 0, 600, 603, 604, 608, 0, 0) },</div><div class='add'>+	/* hard coded fixed mode for Sharp wsvga LVDS 1024x600 */</div><div class='add'>+	{ DRM_MODE("1024x600", DRM_MODE_TYPE_DRIVER, 48885, 1024, 1124,</div><div class='add'>+		   1204, 1312, 0, 600, 607, 610, 621, 0, 0) },</div><div class='add'>+	/* hard coded fixed mode for LVDS 1024x768 */</div><div class='add'>+	{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 65000, 1024, 1048,</div><div class='add'>+		   1184, 1344, 0, 768, 771, 777, 806, 0, 0) },</div><div class='add'>+	/* hard coded fixed mode for LVDS 1366x768 */</div><div class='add'>+	{ DRM_MODE("1366x768", DRM_MODE_TYPE_DRIVER, 77500, 1366, 1430,</div><div class='add'>+		   1558, 1664, 0, 768, 769, 770, 776, 0, 0) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Returns the panel fixed mode from configuration. */</div><div class='add'>+</div><div class='add'>+static void oaktrail_lvds_get_configuration_mode(struct drm_device *dev,</div><div class='add'>+					struct psb_intel_mode_device *mode_dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_display_mode *mode = NULL;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct oaktrail_timing_info *ti = &amp;dev_priv-&gt;gct_data.DTD;</div><div class='add'>+</div><div class='add'>+	mode_dev-&gt;panel_fixed_mode = NULL;</div><div class='add'>+</div><div class='add'>+	/* Use the firmware provided data on Moorestown */</div><div class='add'>+	if (dev_priv-&gt;vbt_data.size != 0x00) { /*if non-zero, then use vbt*/</div><div class='add'>+		mode = kzalloc(sizeof(*mode), GFP_KERNEL);</div><div class='add'>+		if (!mode)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		mode-&gt;hdisplay = (ti-&gt;hactive_hi &lt;&lt; 8) | ti-&gt;hactive_lo;</div><div class='add'>+		mode-&gt;vdisplay = (ti-&gt;vactive_hi &lt;&lt; 8) | ti-&gt;vactive_lo;</div><div class='add'>+		mode-&gt;hsync_start = mode-&gt;hdisplay + \</div><div class='add'>+				((ti-&gt;hsync_offset_hi &lt;&lt; 8) | \</div><div class='add'>+				ti-&gt;hsync_offset_lo);</div><div class='add'>+		mode-&gt;hsync_end = mode-&gt;hsync_start + \</div><div class='add'>+				((ti-&gt;hsync_pulse_width_hi &lt;&lt; 8) | \</div><div class='add'>+				ti-&gt;hsync_pulse_width_lo);</div><div class='add'>+		mode-&gt;htotal = mode-&gt;hdisplay + ((ti-&gt;hblank_hi &lt;&lt; 8) | \</div><div class='add'>+							ti-&gt;hblank_lo);</div><div class='add'>+		mode-&gt;vsync_start = \</div><div class='add'>+			mode-&gt;vdisplay + ((ti-&gt;vsync_offset_hi &lt;&lt; 4) | \</div><div class='add'>+						ti-&gt;vsync_offset_lo);</div><div class='add'>+		mode-&gt;vsync_end = \</div><div class='add'>+			mode-&gt;vsync_start + ((ti-&gt;vsync_pulse_width_hi &lt;&lt; 4) | \</div><div class='add'>+						ti-&gt;vsync_pulse_width_lo);</div><div class='add'>+		mode-&gt;vtotal = mode-&gt;vdisplay + \</div><div class='add'>+				((ti-&gt;vblank_hi &lt;&lt; 8) | ti-&gt;vblank_lo);</div><div class='add'>+		mode-&gt;clock = ti-&gt;pixel_clock * 10;</div><div class='add'>+#if 0</div><div class='add'>+		printk(KERN_INFO "hdisplay is %d\n", mode-&gt;hdisplay);</div><div class='add'>+		printk(KERN_INFO "vdisplay is %d\n", mode-&gt;vdisplay);</div><div class='add'>+		printk(KERN_INFO "HSS is %d\n", mode-&gt;hsync_start);</div><div class='add'>+		printk(KERN_INFO "HSE is %d\n", mode-&gt;hsync_end);</div><div class='add'>+		printk(KERN_INFO "htotal is %d\n", mode-&gt;htotal);</div><div class='add'>+		printk(KERN_INFO "VSS is %d\n", mode-&gt;vsync_start);</div><div class='add'>+		printk(KERN_INFO "VSE is %d\n", mode-&gt;vsync_end);</div><div class='add'>+		printk(KERN_INFO "vtotal is %d\n", mode-&gt;vtotal);</div><div class='add'>+		printk(KERN_INFO "clock is %d\n", mode-&gt;clock);</div><div class='add'>+#endif</div><div class='add'>+		mode_dev-&gt;panel_fixed_mode = mode;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use the BIOS VBT mode if available */</div><div class='add'>+	if (mode_dev-&gt;panel_fixed_mode == NULL &amp;&amp; mode_dev-&gt;vbt_mode)</div><div class='add'>+		mode_dev-&gt;panel_fixed_mode = drm_mode_duplicate(dev,</div><div class='add'>+						mode_dev-&gt;vbt_mode);</div><div class='add'>+</div><div class='add'>+	/* Then try the LVDS VBT mode */</div><div class='add'>+	if (mode_dev-&gt;panel_fixed_mode == NULL)</div><div class='add'>+		if (dev_priv-&gt;lfp_lvds_vbt_mode)</div><div class='add'>+			mode_dev-&gt;panel_fixed_mode =</div><div class='add'>+				drm_mode_duplicate(dev,</div><div class='add'>+					dev_priv-&gt;lfp_lvds_vbt_mode);</div><div class='add'>+	/* Then guess */</div><div class='add'>+	if (mode_dev-&gt;panel_fixed_mode == NULL)</div><div class='add'>+		mode_dev-&gt;panel_fixed_mode</div><div class='add'>+			= drm_mode_duplicate(dev, &amp;lvds_configuration_modes[2]);</div><div class='add'>+</div><div class='add'>+	drm_mode_set_name(mode_dev-&gt;panel_fixed_mode);</div><div class='add'>+	drm_mode_set_crtcinfo(mode_dev-&gt;panel_fixed_mode, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * oaktrail_lvds_init - setup LVDS connectors on this device</div><div class='add'>+ * @dev: drm device</div><div class='add'>+ *</div><div class='add'>+ * Create the connector, register the LVDS DDC bus, and try to figure out what</div><div class='add'>+ * modes we can display on the LVDS panel (if present).</div><div class='add'>+ */</div><div class='add'>+void oaktrail_lvds_init(struct drm_device *dev,</div><div class='add'>+		    struct psb_intel_mode_device *mode_dev)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder;</div><div class='add'>+	struct psb_intel_connector *psb_intel_connector;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+	struct drm_encoder *encoder;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct edid *edid;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct i2c_adapter *i2c_adap;</div><div class='add'>+	struct drm_display_mode *scan;	/* *modes, *bios_mode; */</div><div class='add'>+</div><div class='add'>+	psb_intel_encoder = kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL);</div><div class='add'>+	if (!psb_intel_encoder)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	psb_intel_connector = kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL);</div><div class='add'>+	if (!psb_intel_connector)</div><div class='add'>+		goto failed_connector;</div><div class='add'>+</div><div class='add'>+	connector = &amp;psb_intel_connector-&gt;base;</div><div class='add'>+	encoder = &amp;psb_intel_encoder-&gt;base;</div><div class='add'>+	dev_priv-&gt;is_lvds_on = true;</div><div class='add'>+	drm_connector_init(dev, connector,</div><div class='add'>+			   &amp;psb_intel_lvds_connector_funcs,</div><div class='add'>+			   DRM_MODE_CONNECTOR_LVDS);</div><div class='add'>+</div><div class='add'>+	drm_encoder_init(dev, encoder, &amp;psb_intel_lvds_enc_funcs,</div><div class='add'>+			 DRM_MODE_ENCODER_LVDS);</div><div class='add'>+</div><div class='add'>+	psb_intel_connector_attach_encoder(psb_intel_connector,</div><div class='add'>+					   psb_intel_encoder);</div><div class='add'>+	psb_intel_encoder-&gt;type = INTEL_OUTPUT_LVDS;</div><div class='add'>+</div><div class='add'>+	drm_encoder_helper_add(encoder, &amp;oaktrail_lvds_helper_funcs);</div><div class='add'>+	drm_connector_helper_add(connector,</div><div class='add'>+				 &amp;psb_intel_lvds_connector_helper_funcs);</div><div class='add'>+	connector-&gt;display_info.subpixel_order = SubPixelHorizontalRGB;</div><div class='add'>+	connector-&gt;interlace_allowed = false;</div><div class='add'>+	connector-&gt;doublescan_allowed = false;</div><div class='add'>+</div><div class='add'>+	drm_connector_attach_property(connector,</div><div class='add'>+					dev-&gt;mode_config.scaling_mode_property,</div><div class='add'>+					DRM_MODE_SCALE_FULLSCREEN);</div><div class='add'>+	drm_connector_attach_property(connector,</div><div class='add'>+					dev_priv-&gt;backlight_property,</div><div class='add'>+					BRIGHTNESS_MAX_LEVEL);</div><div class='add'>+</div><div class='add'>+	mode_dev-&gt;panel_wants_dither = false;</div><div class='add'>+	if (dev_priv-&gt;vbt_data.size != 0x00)</div><div class='add'>+		mode_dev-&gt;panel_wants_dither = (dev_priv-&gt;gct_data.</div><div class='add'>+			Panel_Port_Control &amp; MRST_PANEL_8TO6_DITHER_ENABLE);</div><div class='add'>+        if (dev_priv-&gt;lvds_dither)</div><div class='add'>+                mode_dev-&gt;panel_wants_dither = 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * LVDS discovery:</div><div class='add'>+	 * 1) check for EDID on DDC</div><div class='add'>+	 * 2) check for VBT data</div><div class='add'>+	 * 3) check to see if LVDS is already on</div><div class='add'>+	 *    if none of the above, no panel</div><div class='add'>+	 * 4) make sure lid is open</div><div class='add'>+	 *    if closed, act like it's not there for now</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	i2c_adap = i2c_get_adapter(dev_priv-&gt;ops-&gt;i2c_bus);</div><div class='add'>+	if (i2c_adap == NULL)</div><div class='add'>+		dev_err(dev-&gt;dev, "No ddc adapter available!\n");</div><div class='add'>+	/*</div><div class='add'>+	 * Attempt to get the fixed panel mode from DDC.  Assume that the</div><div class='add'>+	 * preferred mode is the right one.</div><div class='add'>+	 */</div><div class='add'>+	if (i2c_adap) {</div><div class='add'>+		edid = drm_get_edid(connector, i2c_adap);</div><div class='add'>+		if (edid) {</div><div class='add'>+			drm_mode_connector_update_edid_property(connector,</div><div class='add'>+									edid);</div><div class='add'>+			ret = drm_add_edid_modes(connector, edid);</div><div class='add'>+			kfree(edid);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(scan, &amp;connector-&gt;probed_modes, head) {</div><div class='add'>+			if (scan-&gt;type &amp; DRM_MODE_TYPE_PREFERRED) {</div><div class='add'>+				mode_dev-&gt;panel_fixed_mode =</div><div class='add'>+				    drm_mode_duplicate(dev, scan);</div><div class='add'>+				goto out;	/* FIXME: check for quirks */</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * If we didn't get EDID, try geting panel timing</div><div class='add'>+	 * from configuration data</div><div class='add'>+	 */</div><div class='add'>+	oaktrail_lvds_get_configuration_mode(dev, mode_dev);</div><div class='add'>+</div><div class='add'>+	if (mode_dev-&gt;panel_fixed_mode) {</div><div class='add'>+		mode_dev-&gt;panel_fixed_mode-&gt;type |= DRM_MODE_TYPE_PREFERRED;</div><div class='add'>+		goto out;	/* FIXME: check for quirks */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we still don't have a mode after all that, give up. */</div><div class='add'>+	if (!mode_dev-&gt;panel_fixed_mode) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Found no modes on the lvds, ignoring the LVDS\n");</div><div class='add'>+		goto failed_find;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	drm_sysfs_connector_add(connector);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+failed_find:</div><div class='add'>+	dev_dbg(dev-&gt;dev, "No LVDS modes found, disabling.\n");</div><div class='add'>+	if (psb_intel_encoder-&gt;ddc_bus)</div><div class='add'>+		psb_intel_i2c_destroy(psb_intel_encoder-&gt;ddc_bus);</div><div class='add'>+</div><div class='add'>+/* failed_ddc: */</div><div class='add'>+</div><div class='add'>+	drm_encoder_cleanup(encoder);</div><div class='add'>+	drm_connector_cleanup(connector);</div><div class='add'>+	kfree(psb_intel_connector);</div><div class='add'>+failed_connector:</div><div class='add'>+	kfree(psb_intel_encoder);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/power.c b/drivers/gpu/drm/gma500/power.c<br/>new file mode 100644<br/>index 000000000000..94025693bae1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/power.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/power.c</a></div><div class='hunk'>@@ -0,0 +1,316 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ * Copyright (c) 2009-2011, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='add'>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,</div><div class='add'>+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *    Benjamin Defnet &lt;benjamin.r.defnet@intel.com&gt;</div><div class='add'>+ *    Rajesh Poornachandran &lt;rajesh.poornachandran@intel.com&gt;</div><div class='add'>+ * Massively reworked</div><div class='add'>+ *    Alan Cox &lt;alan@linux.intel.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "power.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_reg.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+</div><div class='add'>+static struct mutex power_mutex;	/* Serialize power ops */</div><div class='add'>+static spinlock_t power_ctrl_lock;	/* Serialize power claim */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	gma_power_init		-	initialise power manager</div><div class='add'>+ *	@dev: our device</div><div class='add'>+ *</div><div class='add'>+ *	Set up for power management tracking of our hardware.</div><div class='add'>+ */</div><div class='add'>+void gma_power_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	/* FIXME: Move APM/OSPM base into relevant device code */</div><div class='add'>+	dev_priv-&gt;apm_base = dev_priv-&gt;apm_reg &amp; 0xffff;</div><div class='add'>+	dev_priv-&gt;ospm_base &amp;= 0xffff;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;display_power = true;	/* We start active */</div><div class='add'>+	dev_priv-&gt;display_count = 0;	/* Currently no users */</div><div class='add'>+	dev_priv-&gt;suspended = false;	/* And not suspended */</div><div class='add'>+	spin_lock_init(&amp;power_ctrl_lock);</div><div class='add'>+	mutex_init(&amp;power_mutex);</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;ops-&gt;init_pm(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	gma_power_uninit	-	end power manager</div><div class='add'>+ *	@dev: device to end for</div><div class='add'>+ *</div><div class='add'>+ *	Undo the effects of gma_power_init</div><div class='add'>+ */</div><div class='add'>+void gma_power_uninit(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	pm_runtime_disable(&amp;dev-&gt;pdev-&gt;dev);</div><div class='add'>+	pm_runtime_set_suspended(&amp;dev-&gt;pdev-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	gma_suspend_display	-	suspend the display logic</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *</div><div class='add'>+ *	Suspend the display logic of the graphics interface</div><div class='add'>+ */</div><div class='add'>+static void gma_suspend_display(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;suspended)</div><div class='add'>+		return;</div><div class='add'>+	dev_priv-&gt;ops-&gt;save_regs(dev);</div><div class='add'>+	dev_priv-&gt;ops-&gt;power_down(dev);</div><div class='add'>+	dev_priv-&gt;display_power = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	gma_resume_display	-	resume display side logic</div><div class='add'>+ *</div><div class='add'>+ *	Resume the display hardware restoring state and enabling</div><div class='add'>+ *	as necessary.</div><div class='add'>+ */</div><div class='add'>+static void gma_resume_display(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;suspended == false)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* turn on the display power island */</div><div class='add'>+	dev_priv-&gt;ops-&gt;power_up(dev);</div><div class='add'>+	dev_priv-&gt;suspended = false;</div><div class='add'>+	dev_priv-&gt;display_power = true;</div><div class='add'>+</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;pge_ctl | _PSB_PGETBL_ENABLED, PSB_PGETBL_CTL);</div><div class='add'>+	pci_write_config_word(pdev, PSB_GMCH_CTRL,</div><div class='add'>+			dev_priv-&gt;gmch_ctrl | _PSB_GMCH_ENABLED);</div><div class='add'>+	dev_priv-&gt;ops-&gt;restore_regs(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	gma_suspend_pci		-	suspend PCI side</div><div class='add'>+ *	@pdev: PCI device</div><div class='add'>+ *</div><div class='add'>+ *	Perform the suspend processing on our PCI device state</div><div class='add'>+ */</div><div class='add'>+static void gma_suspend_pci(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int bsm, vbt;</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;suspended)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pci_save_state(pdev);</div><div class='add'>+	pci_read_config_dword(pdev, 0x5C, &amp;bsm);</div><div class='add'>+	dev_priv-&gt;saveBSM = bsm;</div><div class='add'>+	pci_read_config_dword(pdev, 0xFC, &amp;vbt);</div><div class='add'>+	dev_priv-&gt;saveVBT = vbt;</div><div class='add'>+	pci_read_config_dword(pdev, PSB_PCIx_MSI_ADDR_LOC, &amp;dev_priv-&gt;msi_addr);</div><div class='add'>+	pci_read_config_dword(pdev, PSB_PCIx_MSI_DATA_LOC, &amp;dev_priv-&gt;msi_data);</div><div class='add'>+</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	pci_set_power_state(pdev, PCI_D3hot);</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;suspended = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	gma_resume_pci		-	resume helper</div><div class='add'>+ *	@dev: our PCI device</div><div class='add'>+ *</div><div class='add'>+ *	Perform the resume processing on our PCI device state - rewrite</div><div class='add'>+ *	register state and re-enable the PCI device</div><div class='add'>+ */</div><div class='add'>+static bool gma_resume_pci(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!dev_priv-&gt;suspended)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	pci_set_power_state(pdev, PCI_D0);</div><div class='add'>+	pci_restore_state(pdev);</div><div class='add'>+	pci_write_config_dword(pdev, 0x5c, dev_priv-&gt;saveBSM);</div><div class='add'>+	pci_write_config_dword(pdev, 0xFC, dev_priv-&gt;saveVBT);</div><div class='add'>+	/* restoring MSI address and data in PCIx space */</div><div class='add'>+	pci_write_config_dword(pdev, PSB_PCIx_MSI_ADDR_LOC, dev_priv-&gt;msi_addr);</div><div class='add'>+	pci_write_config_dword(pdev, PSB_PCIx_MSI_DATA_LOC, dev_priv-&gt;msi_data);</div><div class='add'>+	ret = pci_enable_device(pdev);</div><div class='add'>+</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "pci_enable failed: %d\n", ret);</div><div class='add'>+	else</div><div class='add'>+		dev_priv-&gt;suspended = false;</div><div class='add'>+	return !dev_priv-&gt;suspended;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	gma_power_suspend		-	bus callback for suspend</div><div class='add'>+ *	@pdev: our PCI device</div><div class='add'>+ *	@state: suspend type</div><div class='add'>+ *</div><div class='add'>+ *	Called back by the PCI layer during a suspend of the system. We</div><div class='add'>+ *	perform the necessary shut down steps and save enough state that</div><div class='add'>+ *	we can undo this when resume is called.</div><div class='add'>+ */</div><div class='add'>+int gma_power_suspend(struct device *_dev)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = container_of(_dev, struct pci_dev, dev);</div><div class='add'>+	struct drm_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;power_mutex);</div><div class='add'>+	if (!dev_priv-&gt;suspended) {</div><div class='add'>+		if (dev_priv-&gt;display_count) {</div><div class='add'>+			mutex_unlock(&amp;power_mutex);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		psb_irq_uninstall(dev);</div><div class='add'>+		gma_suspend_display(dev);</div><div class='add'>+		gma_suspend_pci(pdev);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;power_mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	gma_power_resume		-	resume power</div><div class='add'>+ *	@pdev: PCI device</div><div class='add'>+ *</div><div class='add'>+ *	Resume the PCI side of the graphics and then the displays</div><div class='add'>+ */</div><div class='add'>+int gma_power_resume(struct device *_dev)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = container_of(_dev, struct pci_dev, dev);</div><div class='add'>+	struct drm_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;power_mutex);</div><div class='add'>+	gma_resume_pci(pdev);</div><div class='add'>+	gma_resume_display(pdev);</div><div class='add'>+	psb_irq_preinstall(dev);</div><div class='add'>+	psb_irq_postinstall(dev);</div><div class='add'>+	mutex_unlock(&amp;power_mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	gma_power_is_on		-	returne true if power is on</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *</div><div class='add'>+ *	Returns true if the display island power is on at this moment</div><div class='add'>+ */</div><div class='add'>+bool gma_power_is_on(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	return dev_priv-&gt;display_power;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	gma_power_begin		-	begin requiring power</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *	@force_on: true to force power on</div><div class='add'>+ *</div><div class='add'>+ *	Begin an action that requires the display power island is enabled.</div><div class='add'>+ *	We refcount the islands.</div><div class='add'>+ */</div><div class='add'>+bool gma_power_begin(struct drm_device *dev, bool force_on)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;power_ctrl_lock, flags);</div><div class='add'>+	/* Power already on ? */</div><div class='add'>+	if (dev_priv-&gt;display_power) {</div><div class='add'>+		dev_priv-&gt;display_count++;</div><div class='add'>+		pm_runtime_get(&amp;dev-&gt;pdev-&gt;dev);</div><div class='add'>+		spin_unlock_irqrestore(&amp;power_ctrl_lock, flags);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	if (force_on == false)</div><div class='add'>+		goto out_false;</div><div class='add'>+</div><div class='add'>+	/* Ok power up needed */</div><div class='add'>+	ret = gma_resume_pci(dev-&gt;pdev);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		psb_irq_preinstall(dev);</div><div class='add'>+		psb_irq_postinstall(dev);</div><div class='add'>+		pm_runtime_get(&amp;dev-&gt;pdev-&gt;dev);</div><div class='add'>+		dev_priv-&gt;display_count++;</div><div class='add'>+		spin_unlock_irqrestore(&amp;power_ctrl_lock, flags);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+out_false:</div><div class='add'>+	spin_unlock_irqrestore(&amp;power_ctrl_lock, flags);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	gma_power_end		-	end use of power</div><div class='add'>+ *	@dev: Our DRM device</div><div class='add'>+ *</div><div class='add'>+ *	Indicate that one of our gma_power_begin() requested periods when</div><div class='add'>+ *	the diplay island power is needed has completed.</div><div class='add'>+ */</div><div class='add'>+void gma_power_end(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	spin_lock_irqsave(&amp;power_ctrl_lock, flags);</div><div class='add'>+	dev_priv-&gt;display_count--;</div><div class='add'>+	WARN_ON(dev_priv-&gt;display_count &lt; 0);</div><div class='add'>+	spin_unlock_irqrestore(&amp;power_ctrl_lock, flags);</div><div class='add'>+	pm_runtime_put(&amp;dev-&gt;pdev-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return gma_power_suspend(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return gma_power_resume(dev);;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_runtime_idle(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *drmdev = pci_get_drvdata(to_pci_dev(dev));</div><div class='add'>+	struct drm_psb_private *dev_priv = drmdev-&gt;dev_private;</div><div class='add'>+	if (dev_priv-&gt;display_count)</div><div class='add'>+		return 0;</div><div class='add'>+	else</div><div class='add'>+		return 1;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/power.h b/drivers/gpu/drm/gma500/power.h<br/>new file mode 100644<br/>index 000000000000..1969d2ecb328<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/power.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/power.h</a></div><div class='hunk'>@@ -0,0 +1,67 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ * Copyright (c) 2009-2011, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</div><div class='add'>+</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='add'>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,</div><div class='add'>+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *    Benjamin Defnet &lt;benjamin.r.defnet@intel.com&gt;</div><div class='add'>+ *    Rajesh Poornachandran &lt;rajesh.poornachandran@intel.com&gt;</div><div class='add'>+ * Massively reworked</div><div class='add'>+ *    Alan Cox &lt;alan@linux.intel.com&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef _PSB_POWERMGMT_H_</div><div class='add'>+#define _PSB_POWERMGMT_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+</div><div class='add'>+void gma_power_init(struct drm_device *dev);</div><div class='add'>+void gma_power_uninit(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The kernel bus power management  will call these functions</div><div class='add'>+ */</div><div class='add'>+int gma_power_suspend(struct device *dev);</div><div class='add'>+int gma_power_resume(struct device *dev);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These are the functions the driver should use to wrap all hw access</div><div class='add'>+ * (i.e. register reads and writes)</div><div class='add'>+ */</div><div class='add'>+bool gma_power_begin(struct drm_device *dev, bool force);</div><div class='add'>+void gma_power_end(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Use this function to do an instantaneous check for if the hw is on.</div><div class='add'>+ * Only use this in cases where you know the mutex is already held such</div><div class='add'>+ * as in irq install/uninstall and you need to</div><div class='add'>+ * prevent a deadlock situation.  Otherwise use gma_power_begin().</div><div class='add'>+ */</div><div class='add'>+bool gma_power_is_on(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GFX-Runtime PM callbacks</div><div class='add'>+ */</div><div class='add'>+int psb_runtime_suspend(struct device *dev);</div><div class='add'>+int psb_runtime_resume(struct device *dev);</div><div class='add'>+int psb_runtime_idle(struct device *dev);</div><div class='add'>+</div><div class='add'>+#endif /*_PSB_POWERMGMT_H_*/</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/psb_device.c b/drivers/gpu/drm/gma500/psb_device.c<br/>new file mode 100644<br/>index 000000000000..e5f5906172b0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/psb_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/psb_device.c</a></div><div class='hunk'>@@ -0,0 +1,328 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ * Copyright (c) 2011, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/backlight.h&gt;</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include &lt;drm/drm.h&gt;</div><div class='add'>+#include "gma_drm.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_reg.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include "intel_bios.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int psb_output_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	psb_intel_lvds_init(dev, &amp;dev_priv-&gt;mode_dev);</div><div class='add'>+	psb_intel_sdvo_init(dev, SDVOB);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Poulsbo Backlight Interfaces</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define BLC_PWM_PRECISION_FACTOR 100	/* 10000000 */</div><div class='add'>+#define BLC_PWM_FREQ_CALC_CONSTANT 32</div><div class='add'>+#define MHz 1000000</div><div class='add'>+</div><div class='add'>+#define PSB_BLC_PWM_PRECISION_FACTOR    10</div><div class='add'>+#define PSB_BLC_MAX_PWM_REG_FREQ        0xFFFE</div><div class='add'>+#define PSB_BLC_MIN_PWM_REG_FREQ        0x2</div><div class='add'>+</div><div class='add'>+#define PSB_BACKLIGHT_PWM_POLARITY_BIT_CLEAR (0xFFFE)</div><div class='add'>+#define PSB_BACKLIGHT_PWM_CTL_SHIFT	(16)</div><div class='add'>+</div><div class='add'>+static int psb_brightness;</div><div class='add'>+static struct backlight_device *psb_backlight_device;</div><div class='add'>+</div><div class='add'>+static int psb_get_brightness(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	/* return locally cached var instead of HW read (due to DPST etc.) */</div><div class='add'>+	/* FIXME: ideally return actual value in case firmware fiddled with</div><div class='add'>+	   it */</div><div class='add'>+	return psb_brightness;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int psb_backlight_setup(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	unsigned long core_clock;</div><div class='add'>+	/* u32 bl_max_freq; */</div><div class='add'>+	/* unsigned long value; */</div><div class='add'>+	u16 bl_max_freq;</div><div class='add'>+	uint32_t value;</div><div class='add'>+	uint32_t blc_pwm_precision_factor;</div><div class='add'>+</div><div class='add'>+	/* get bl_max_freq and pol from dev_priv*/</div><div class='add'>+	if (!dev_priv-&gt;lvds_bl) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Has no valid LVDS backlight info\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	bl_max_freq = dev_priv-&gt;lvds_bl-&gt;freq;</div><div class='add'>+	blc_pwm_precision_factor = PSB_BLC_PWM_PRECISION_FACTOR;</div><div class='add'>+</div><div class='add'>+	core_clock = dev_priv-&gt;core_freq;</div><div class='add'>+</div><div class='add'>+	value = (core_clock * MHz) / BLC_PWM_FREQ_CALC_CONSTANT;</div><div class='add'>+	value *= blc_pwm_precision_factor;</div><div class='add'>+	value /= bl_max_freq;</div><div class='add'>+	value /= blc_pwm_precision_factor;</div><div class='add'>+</div><div class='add'>+	if (value &gt; (unsigned long long)PSB_BLC_MAX_PWM_REG_FREQ ||</div><div class='add'>+		 value &lt; (unsigned long long)PSB_BLC_MIN_PWM_REG_FREQ)</div><div class='add'>+				return -ERANGE;</div><div class='add'>+	else {</div><div class='add'>+		value &amp;= PSB_BACKLIGHT_PWM_POLARITY_BIT_CLEAR;</div><div class='add'>+		REG_WRITE(BLC_PWM_CTL,</div><div class='add'>+			(value &lt;&lt; PSB_BACKLIGHT_PWM_CTL_SHIFT) | (value));</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_set_brightness(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = bl_get_data(psb_backlight_device);</div><div class='add'>+	int level = bd-&gt;props.brightness;</div><div class='add'>+</div><div class='add'>+	/* Percentage 1-100% being valid */</div><div class='add'>+	if (level &lt; 1)</div><div class='add'>+		level = 1;</div><div class='add'>+</div><div class='add'>+	psb_intel_lvds_set_brightness(dev, level);</div><div class='add'>+	psb_brightness = level;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct backlight_ops psb_ops = {</div><div class='add'>+	.get_brightness = psb_get_brightness,</div><div class='add'>+	.update_status  = psb_set_brightness,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int psb_backlight_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int ret;</div><div class='add'>+	struct backlight_properties props;</div><div class='add'>+</div><div class='add'>+	memset(&amp;props, 0, sizeof(struct backlight_properties));</div><div class='add'>+	props.max_brightness = 100;</div><div class='add'>+	props.type = BACKLIGHT_PLATFORM;</div><div class='add'>+</div><div class='add'>+	psb_backlight_device = backlight_device_register("psb-bl",</div><div class='add'>+					NULL, (void *)dev, &amp;psb_ops, &amp;props);</div><div class='add'>+	if (IS_ERR(psb_backlight_device))</div><div class='add'>+		return PTR_ERR(psb_backlight_device);</div><div class='add'>+</div><div class='add'>+	ret = psb_backlight_setup(dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		backlight_device_unregister(psb_backlight_device);</div><div class='add'>+		psb_backlight_device = NULL;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	psb_backlight_device-&gt;props.brightness = 100;</div><div class='add'>+	psb_backlight_device-&gt;props.max_brightness = 100;</div><div class='add'>+	backlight_update_status(psb_backlight_device);</div><div class='add'>+	dev_priv-&gt;backlight_device = psb_backlight_device;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Provide the Poulsbo specific chip logic and low level methods</div><div class='add'>+ *	for power management</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void psb_init_pm(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	u32 gating = PSB_RSGX32(PSB_CR_CLKGATECTL);</div><div class='add'>+	gating &amp;= ~3;	/* Disable 2D clock gating */</div><div class='add'>+	gating |= 1;</div><div class='add'>+	PSB_WSGX32(gating, PSB_CR_CLKGATECTL);</div><div class='add'>+	PSB_RSGX32(PSB_CR_CLKGATECTL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_save_display_registers	-	save registers lost on suspend</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *</div><div class='add'>+ *	Save the state we need in order to be able to restore the interface</div><div class='add'>+ *	upon resume from suspend</div><div class='add'>+ */</div><div class='add'>+static int psb_save_display_registers(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_crtc *crtc;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+</div><div class='add'>+	/* Display arbitration control + watermarks */</div><div class='add'>+	dev_priv-&gt;saveDSPARB = PSB_RVDC32(DSPARB);</div><div class='add'>+	dev_priv-&gt;saveDSPFW1 = PSB_RVDC32(DSPFW1);</div><div class='add'>+	dev_priv-&gt;saveDSPFW2 = PSB_RVDC32(DSPFW2);</div><div class='add'>+	dev_priv-&gt;saveDSPFW3 = PSB_RVDC32(DSPFW3);</div><div class='add'>+	dev_priv-&gt;saveDSPFW4 = PSB_RVDC32(DSPFW4);</div><div class='add'>+	dev_priv-&gt;saveDSPFW5 = PSB_RVDC32(DSPFW5);</div><div class='add'>+	dev_priv-&gt;saveDSPFW6 = PSB_RVDC32(DSPFW6);</div><div class='add'>+	dev_priv-&gt;saveCHICKENBIT = PSB_RVDC32(DSPCHICKENBIT);</div><div class='add'>+</div><div class='add'>+	/* Save crtc and output state */</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+	list_for_each_entry(crtc, &amp;dev-&gt;mode_config.crtc_list, head) {</div><div class='add'>+		if (drm_helper_crtc_in_use(crtc))</div><div class='add'>+			crtc-&gt;funcs-&gt;save(crtc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(connector, &amp;dev-&gt;mode_config.connector_list, head)</div><div class='add'>+		connector-&gt;funcs-&gt;save(connector);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	psb_restore_display_registers	-	restore lost register state</div><div class='add'>+ *	@dev: our DRM device</div><div class='add'>+ *</div><div class='add'>+ *	Restore register state that was lost during suspend and resume.</div><div class='add'>+ */</div><div class='add'>+static int psb_restore_display_registers(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_crtc *crtc;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+</div><div class='add'>+	/* Display arbitration + watermarks */</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPARB, DSPARB);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPFW1, DSPFW1);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPFW2, DSPFW2);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPFW3, DSPFW3);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPFW4, DSPFW4);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPFW5, DSPFW5);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveDSPFW6, DSPFW6);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;saveCHICKENBIT, DSPCHICKENBIT);</div><div class='add'>+</div><div class='add'>+	/*make sure VGA plane is off. it initializes to on after reset!*/</div><div class='add'>+	PSB_WVDC32(0x80000000, VGACNTRL);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+	list_for_each_entry(crtc, &amp;dev-&gt;mode_config.crtc_list, head)</div><div class='add'>+		if (drm_helper_crtc_in_use(crtc))</div><div class='add'>+			crtc-&gt;funcs-&gt;restore(crtc);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(connector, &amp;dev-&gt;mode_config.connector_list, head)</div><div class='add'>+		connector-&gt;funcs-&gt;restore(connector);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_power_down(struct drm_device *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 psb_power_up(struct drm_device *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 psb_get_core_freq(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	uint32_t clock;</div><div class='add'>+	struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	/*pci_write_config_dword(pci_root, 0xD4, 0x00C32004);*/</div><div class='add'>+	/*pci_write_config_dword(pci_root, 0xD0, 0xE0033000);*/</div><div class='add'>+</div><div class='add'>+	pci_write_config_dword(pci_root, 0xD0, 0xD0050300);</div><div class='add'>+	pci_read_config_dword(pci_root, 0xD4, &amp;clock);</div><div class='add'>+	pci_dev_put(pci_root);</div><div class='add'>+</div><div class='add'>+	switch (clock &amp; 0x07) {</div><div class='add'>+	case 0:</div><div class='add'>+		dev_priv-&gt;core_freq = 100;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		dev_priv-&gt;core_freq = 133;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		dev_priv-&gt;core_freq = 150;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		dev_priv-&gt;core_freq = 178;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		dev_priv-&gt;core_freq = 200;</div><div class='add'>+		break;</div><div class='add'>+	case 5:</div><div class='add'>+	case 6:</div><div class='add'>+	case 7:</div><div class='add'>+		dev_priv-&gt;core_freq = 266;</div><div class='add'>+	default:</div><div class='add'>+		dev_priv-&gt;core_freq = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_chip_setup(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	psb_get_core_freq(dev);</div><div class='add'>+	gma_intel_setup_gmbus(dev);</div><div class='add'>+	gma_intel_opregion_init(dev);</div><div class='add'>+	psb_intel_init_bios(dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_chip_teardown(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	gma_intel_teardown_gmbus(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct psb_ops psb_chip_ops = {</div><div class='add'>+	.name = "Poulsbo",</div><div class='add'>+	.accel_2d = 1,</div><div class='add'>+	.pipes = 2,</div><div class='add'>+	.crtcs = 2,</div><div class='add'>+	.sgx_offset = PSB_SGX_OFFSET,</div><div class='add'>+	.chip_setup = psb_chip_setup,</div><div class='add'>+	.chip_teardown = psb_chip_teardown,</div><div class='add'>+</div><div class='add'>+	.crtc_helper = &amp;psb_intel_helper_funcs,</div><div class='add'>+	.crtc_funcs = &amp;psb_intel_crtc_funcs,</div><div class='add'>+</div><div class='add'>+	.output_init = psb_output_init,</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE</div><div class='add'>+	.backlight_init = psb_backlight_init,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	.init_pm = psb_init_pm,</div><div class='add'>+	.save_regs = psb_save_display_registers,</div><div class='add'>+	.restore_regs = psb_restore_display_registers,</div><div class='add'>+	.power_down = psb_power_down,</div><div class='add'>+	.power_up = psb_power_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c<br/>new file mode 100644<br/>index 000000000000..f14768f2b364<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/psb_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/psb_drv.c</a></div><div class='hunk'>@@ -0,0 +1,703 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ * Copyright (c) 2007-2011, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</div><div class='add'>+ * Copyright (c) 2008, Tungsten Graphics, Inc. Cedar Park, TX., USA.</div><div class='add'>+ * All Rights Reserved.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include &lt;drm/drm.h&gt;</div><div class='add'>+#include "gma_drm.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "framebuffer.h"</div><div class='add'>+#include "psb_reg.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include "intel_bios.h"</div><div class='add'>+#include "mid_bios.h"</div><div class='add'>+#include &lt;drm/drm_pciids.h&gt;</div><div class='add'>+#include "power.h"</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;acpi/video.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+static int drm_psb_trap_pagefaults;</div><div class='add'>+</div><div class='add'>+static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent);</div><div class='add'>+</div><div class='add'>+MODULE_PARM_DESC(trap_pagefaults, "Error and reset on MMU pagefaults");</div><div class='add'>+module_param_named(trap_pagefaults, drm_psb_trap_pagefaults, int, 0600);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {</div><div class='add'>+	{ 0x8086, 0x8108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;psb_chip_ops },</div><div class='add'>+	{ 0x8086, 0x8109, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;psb_chip_ops },</div><div class='add'>+#if defined(CONFIG_DRM_GMA600)</div><div class='add'>+	{ 0x8086, 0x4100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;oaktrail_chip_ops},</div><div class='add'>+	{ 0x8086, 0x4101, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;oaktrail_chip_ops},</div><div class='add'>+	{ 0x8086, 0x4102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;oaktrail_chip_ops},</div><div class='add'>+	{ 0x8086, 0x4103, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;oaktrail_chip_ops},</div><div class='add'>+	{ 0x8086, 0x4104, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;oaktrail_chip_ops},</div><div class='add'>+	{ 0x8086, 0x4105, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;oaktrail_chip_ops},</div><div class='add'>+	{ 0x8086, 0x4106, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;oaktrail_chip_ops},</div><div class='add'>+	{ 0x8086, 0x4107, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;oaktrail_chip_ops},</div><div class='add'>+	/* Atom E620 */</div><div class='add'>+	{ 0x8086, 0x4108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;oaktrail_chip_ops},</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_DRM_GMA3600)</div><div class='add'>+	{ 0x8086, 0x0be0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;cdv_chip_ops},</div><div class='add'>+	{ 0x8086, 0x0be1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;cdv_chip_ops},</div><div class='add'>+	{ 0x8086, 0x0be2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;cdv_chip_ops},</div><div class='add'>+	{ 0x8086, 0x0be3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;cdv_chip_ops},</div><div class='add'>+	{ 0x8086, 0x0be4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;cdv_chip_ops},</div><div class='add'>+	{ 0x8086, 0x0be5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;cdv_chip_ops},</div><div class='add'>+	{ 0x8086, 0x0be6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;cdv_chip_ops},</div><div class='add'>+	{ 0x8086, 0x0be7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &amp;cdv_chip_ops},</div><div class='add'>+#endif</div><div class='add'>+	{ 0, 0, 0}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pci, pciidlist);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Standard IOCTLs.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define DRM_IOCTL_PSB_ADB	\</div><div class='add'>+		DRM_IOWR(DRM_GMA_ADB + DRM_COMMAND_BASE, uint32_t)</div><div class='add'>+#define DRM_IOCTL_PSB_MODE_OPERATION	\</div><div class='add'>+		DRM_IOWR(DRM_GMA_MODE_OPERATION + DRM_COMMAND_BASE, \</div><div class='add'>+			 struct drm_psb_mode_operation_arg)</div><div class='add'>+#define DRM_IOCTL_PSB_STOLEN_MEMORY	\</div><div class='add'>+		DRM_IOWR(DRM_GMA_STOLEN_MEMORY + DRM_COMMAND_BASE, \</div><div class='add'>+			 struct drm_psb_stolen_memory_arg)</div><div class='add'>+#define DRM_IOCTL_PSB_GAMMA	\</div><div class='add'>+		DRM_IOWR(DRM_GMA_GAMMA + DRM_COMMAND_BASE, \</div><div class='add'>+			 struct drm_psb_dpst_lut_arg)</div><div class='add'>+#define DRM_IOCTL_PSB_DPST_BL	\</div><div class='add'>+		DRM_IOWR(DRM_GMA_DPST_BL + DRM_COMMAND_BASE, \</div><div class='add'>+			 uint32_t)</div><div class='add'>+#define DRM_IOCTL_PSB_GET_PIPE_FROM_CRTC_ID	\</div><div class='add'>+		DRM_IOWR(DRM_GMA_GET_PIPE_FROM_CRTC_ID + DRM_COMMAND_BASE, \</div><div class='add'>+			 struct drm_psb_get_pipe_from_crtc_id_arg)</div><div class='add'>+#define DRM_IOCTL_PSB_GEM_CREATE	\</div><div class='add'>+		DRM_IOWR(DRM_GMA_GEM_CREATE + DRM_COMMAND_BASE, \</div><div class='add'>+			 struct drm_psb_gem_create)</div><div class='add'>+#define DRM_IOCTL_PSB_GEM_MMAP	\</div><div class='add'>+		DRM_IOWR(DRM_GMA_GEM_MMAP + DRM_COMMAND_BASE, \</div><div class='add'>+			 struct drm_psb_gem_mmap)</div><div class='add'>+</div><div class='add'>+static int psb_adb_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			 struct drm_file *file_priv);</div><div class='add'>+static int psb_mode_operation_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+				    struct drm_file *file_priv);</div><div class='add'>+static int psb_stolen_memory_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+				   struct drm_file *file_priv);</div><div class='add'>+static int psb_gamma_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			   struct drm_file *file_priv);</div><div class='add'>+static int psb_dpst_bl_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			     struct drm_file *file_priv);</div><div class='add'>+</div><div class='add'>+#define PSB_IOCTL_DEF(ioctl, func, flags) \</div><div class='add'>+	[DRM_IOCTL_NR(ioctl) - DRM_COMMAND_BASE] = {ioctl, flags, func}</div><div class='add'>+</div><div class='add'>+static struct drm_ioctl_desc psb_ioctls[] = {</div><div class='add'>+	PSB_IOCTL_DEF(DRM_IOCTL_PSB_ADB, psb_adb_ioctl, DRM_AUTH),</div><div class='add'>+	PSB_IOCTL_DEF(DRM_IOCTL_PSB_MODE_OPERATION, psb_mode_operation_ioctl,</div><div class='add'>+		      DRM_AUTH),</div><div class='add'>+	PSB_IOCTL_DEF(DRM_IOCTL_PSB_STOLEN_MEMORY, psb_stolen_memory_ioctl,</div><div class='add'>+		      DRM_AUTH),</div><div class='add'>+	PSB_IOCTL_DEF(DRM_IOCTL_PSB_GAMMA, psb_gamma_ioctl, DRM_AUTH),</div><div class='add'>+	PSB_IOCTL_DEF(DRM_IOCTL_PSB_DPST_BL, psb_dpst_bl_ioctl, DRM_AUTH),</div><div class='add'>+	PSB_IOCTL_DEF(DRM_IOCTL_PSB_GET_PIPE_FROM_CRTC_ID,</div><div class='add'>+					psb_intel_get_pipe_from_crtc_id, 0),</div><div class='add'>+	PSB_IOCTL_DEF(DRM_IOCTL_PSB_GEM_CREATE, psb_gem_create_ioctl,</div><div class='add'>+						DRM_UNLOCKED | DRM_AUTH),</div><div class='add'>+	PSB_IOCTL_DEF(DRM_IOCTL_PSB_GEM_MMAP, psb_gem_mmap_ioctl,</div><div class='add'>+						DRM_UNLOCKED | DRM_AUTH),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void psb_lastclose(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_do_takedown(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_do_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_gtt *pg = &amp;dev_priv-&gt;gtt;</div><div class='add'>+</div><div class='add'>+	uint32_t stolen_gtt;</div><div class='add'>+</div><div class='add'>+	int ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (pg-&gt;mmu_gatt_start &amp; 0x0FFFFFFF) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Gatt must be 256M aligned. This is a bug.\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	stolen_gtt = (pg-&gt;stolen_size &gt;&gt; PAGE_SHIFT) * 4;</div><div class='add'>+	stolen_gtt = (stolen_gtt + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	stolen_gtt =</div><div class='add'>+	    (stolen_gtt &lt; pg-&gt;gtt_pages) ? stolen_gtt : pg-&gt;gtt_pages;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;gatt_free_offset = pg-&gt;mmu_gatt_start +</div><div class='add'>+	    (stolen_gtt &lt;&lt; PAGE_SHIFT) * 1024;</div><div class='add'>+</div><div class='add'>+	if (1 || drm_debug) {</div><div class='add'>+		uint32_t core_id = PSB_RSGX32(PSB_CR_CORE_ID);</div><div class='add'>+		uint32_t core_rev = PSB_RSGX32(PSB_CR_CORE_REVISION);</div><div class='add'>+		DRM_INFO("SGX core id = 0x%08x\n", core_id);</div><div class='add'>+		DRM_INFO("SGX core rev major = 0x%02x, minor = 0x%02x\n",</div><div class='add'>+			 (core_rev &amp; _PSB_CC_REVISION_MAJOR_MASK) &gt;&gt;</div><div class='add'>+			 _PSB_CC_REVISION_MAJOR_SHIFT,</div><div class='add'>+			 (core_rev &amp; _PSB_CC_REVISION_MINOR_MASK) &gt;&gt;</div><div class='add'>+			 _PSB_CC_REVISION_MINOR_SHIFT);</div><div class='add'>+		DRM_INFO</div><div class='add'>+		    ("SGX core rev maintenance = 0x%02x, designer = 0x%02x\n",</div><div class='add'>+		     (core_rev &amp; _PSB_CC_REVISION_MAINTENANCE_MASK) &gt;&gt;</div><div class='add'>+		     _PSB_CC_REVISION_MAINTENANCE_SHIFT,</div><div class='add'>+		     (core_rev &amp; _PSB_CC_REVISION_DESIGNER_MASK) &gt;&gt;</div><div class='add'>+		     _PSB_CC_REVISION_DESIGNER_SHIFT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;dev_priv-&gt;irqmask_lock);</div><div class='add'>+	spin_lock_init(&amp;dev_priv-&gt;lock_2d);</div><div class='add'>+</div><div class='add'>+	PSB_WSGX32(0x00000000, PSB_CR_BIF_BANK0);</div><div class='add'>+	PSB_WSGX32(0x00000000, PSB_CR_BIF_BANK1);</div><div class='add'>+	PSB_RSGX32(PSB_CR_BIF_BANK1);</div><div class='add'>+	PSB_WSGX32(PSB_RSGX32(PSB_CR_BIF_CTRL) | _PSB_MMU_ER_MASK,</div><div class='add'>+							PSB_CR_BIF_CTRL);</div><div class='add'>+	psb_spank(dev_priv);</div><div class='add'>+</div><div class='add'>+	/* mmu_gatt ?? */</div><div class='add'>+	PSB_WSGX32(pg-&gt;gatt_start, PSB_CR_BIF_TWOD_REQ_BASE);</div><div class='add'>+	return 0;</div><div class='add'>+out_err:</div><div class='add'>+	psb_do_takedown(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_driver_unload(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	/* Kill vblank etc here */</div><div class='add'>+</div><div class='add'>+	gma_backlight_exit(dev);</div><div class='add'>+</div><div class='add'>+	psb_modeset_cleanup(dev);</div><div class='add'>+</div><div class='add'>+	if (dev_priv) {</div><div class='add'>+		psb_lid_timer_takedown(dev_priv);</div><div class='add'>+		gma_intel_opregion_exit(dev);</div><div class='add'>+</div><div class='add'>+		if (dev_priv-&gt;ops-&gt;chip_teardown)</div><div class='add'>+			dev_priv-&gt;ops-&gt;chip_teardown(dev);</div><div class='add'>+		psb_do_takedown(dev);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		if (dev_priv-&gt;pf_pd) {</div><div class='add'>+			psb_mmu_free_pagedir(dev_priv-&gt;pf_pd);</div><div class='add'>+			dev_priv-&gt;pf_pd = NULL;</div><div class='add'>+		}</div><div class='add'>+		if (dev_priv-&gt;mmu) {</div><div class='add'>+			struct psb_gtt *pg = &amp;dev_priv-&gt;gtt;</div><div class='add'>+</div><div class='add'>+			down_read(&amp;pg-&gt;sem);</div><div class='add'>+			psb_mmu_remove_pfn_sequence(</div><div class='add'>+				psb_mmu_get_default_pd</div><div class='add'>+				(dev_priv-&gt;mmu),</div><div class='add'>+				pg-&gt;mmu_gatt_start,</div><div class='add'>+				dev_priv-&gt;vram_stolen_size &gt;&gt; PAGE_SHIFT);</div><div class='add'>+			up_read(&amp;pg-&gt;sem);</div><div class='add'>+			psb_mmu_driver_takedown(dev_priv-&gt;mmu);</div><div class='add'>+			dev_priv-&gt;mmu = NULL;</div><div class='add'>+		}</div><div class='add'>+		psb_gtt_takedown(dev);</div><div class='add'>+		if (dev_priv-&gt;scratch_page) {</div><div class='add'>+			__free_page(dev_priv-&gt;scratch_page);</div><div class='add'>+			dev_priv-&gt;scratch_page = NULL;</div><div class='add'>+		}</div><div class='add'>+		if (dev_priv-&gt;vdc_reg) {</div><div class='add'>+			iounmap(dev_priv-&gt;vdc_reg);</div><div class='add'>+			dev_priv-&gt;vdc_reg = NULL;</div><div class='add'>+		}</div><div class='add'>+		if (dev_priv-&gt;sgx_reg) {</div><div class='add'>+			iounmap(dev_priv-&gt;sgx_reg);</div><div class='add'>+			dev_priv-&gt;sgx_reg = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kfree(dev_priv);</div><div class='add'>+		dev-&gt;dev_private = NULL;</div><div class='add'>+</div><div class='add'>+		/*destroy VBT data*/</div><div class='add'>+		psb_intel_destroy_bios(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gma_power_uninit(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int psb_driver_load(struct drm_device *dev, unsigned long chipset)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv;</div><div class='add'>+	unsigned long resource_start;</div><div class='add'>+	struct psb_gtt *pg;</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+	int ret = -ENOMEM;</div><div class='add'>+	uint32_t tt_pages;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder;</div><div class='add'>+</div><div class='add'>+	dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);</div><div class='add'>+	if (dev_priv == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;ops = (struct psb_ops *)chipset;</div><div class='add'>+	dev_priv-&gt;dev = dev;</div><div class='add'>+	dev-&gt;dev_private = (void *) dev_priv;</div><div class='add'>+</div><div class='add'>+	if (!IS_PSB(dev)) {</div><div class='add'>+		if (pci_enable_msi(dev-&gt;pdev))</div><div class='add'>+			dev_warn(dev-&gt;dev, "Enabling MSI failed!\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;num_pipe = dev_priv-&gt;ops-&gt;pipes;</div><div class='add'>+</div><div class='add'>+	resource_start = pci_resource_start(dev-&gt;pdev, PSB_MMIO_RESOURCE);</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;vdc_reg =</div><div class='add'>+	    ioremap(resource_start + PSB_VDC_OFFSET, PSB_VDC_SIZE);</div><div class='add'>+	if (!dev_priv-&gt;vdc_reg)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;sgx_reg = ioremap(resource_start + dev_priv-&gt;ops-&gt;sgx_offset,</div><div class='add'>+							PSB_SGX_SIZE);</div><div class='add'>+	if (!dev_priv-&gt;sgx_reg)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	ret = dev_priv-&gt;ops-&gt;chip_setup(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	/* Init OSPM support */</div><div class='add'>+	gma_power_init(dev);</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;scratch_page = alloc_page(GFP_DMA32 | __GFP_ZERO);</div><div class='add'>+	if (!dev_priv-&gt;scratch_page)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	set_pages_uc(dev_priv-&gt;scratch_page, 1);</div><div class='add'>+</div><div class='add'>+	ret = psb_gtt_init(dev, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;mmu = psb_mmu_driver_init((void *)0,</div><div class='add'>+					drm_psb_trap_pagefaults, 0,</div><div class='add'>+					dev_priv);</div><div class='add'>+	if (!dev_priv-&gt;mmu)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	pg = &amp;dev_priv-&gt;gtt;</div><div class='add'>+</div><div class='add'>+	tt_pages = (pg-&gt;gatt_pages &lt; PSB_TT_PRIV0_PLIMIT) ?</div><div class='add'>+		(pg-&gt;gatt_pages) : PSB_TT_PRIV0_PLIMIT;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;pf_pd = psb_mmu_alloc_pd(dev_priv-&gt;mmu, 1, 0);</div><div class='add'>+	if (!dev_priv-&gt;pf_pd)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	psb_mmu_set_pd_context(psb_mmu_get_default_pd(dev_priv-&gt;mmu), 0);</div><div class='add'>+	psb_mmu_set_pd_context(dev_priv-&gt;pf_pd, 1);</div><div class='add'>+</div><div class='add'>+	ret = psb_do_init(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	PSB_WSGX32(0x20000000, PSB_CR_PDS_EXEC_BASE);</div><div class='add'>+	PSB_WSGX32(0x30000000, PSB_CR_BIF_3D_REQ_BASE);</div><div class='add'>+</div><div class='add'>+/*	igd_opregion_init(&amp;dev_priv-&gt;opregion_dev); */</div><div class='add'>+	acpi_video_register();</div><div class='add'>+	if (dev_priv-&gt;lid_state)</div><div class='add'>+		psb_lid_timer_init(dev_priv);</div><div class='add'>+</div><div class='add'>+	ret = drm_vblank_init(dev, dev_priv-&gt;num_pipe);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Install interrupt handlers prior to powering off SGX or else we will</div><div class='add'>+	 * crash.</div><div class='add'>+	 */</div><div class='add'>+	dev_priv-&gt;vdc_irq_mask = 0;</div><div class='add'>+	dev_priv-&gt;pipestat[0] = 0;</div><div class='add'>+	dev_priv-&gt;pipestat[1] = 0;</div><div class='add'>+	dev_priv-&gt;pipestat[2] = 0;</div><div class='add'>+	spin_lock_irqsave(&amp;dev_priv-&gt;irqmask_lock, irqflags);</div><div class='add'>+	PSB_WVDC32(0xFFFFFFFF, PSB_HWSTAM);</div><div class='add'>+	PSB_WVDC32(0x00000000, PSB_INT_ENABLE_R);</div><div class='add'>+	PSB_WVDC32(0xFFFFFFFF, PSB_INT_MASK_R);</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev_priv-&gt;irqmask_lock, irqflags);</div><div class='add'>+	if (IS_PSB(dev) &amp;&amp; drm_core_check_feature(dev, DRIVER_MODESET))</div><div class='add'>+		drm_irq_install(dev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;vblank_disable_allowed = 1;</div><div class='add'>+</div><div class='add'>+	dev-&gt;max_vblank_count = 0xffffff; /* only 24 bits of frame count */</div><div class='add'>+</div><div class='add'>+	dev-&gt;driver-&gt;get_vblank_counter = psb_get_vblank_counter;</div><div class='add'>+</div><div class='add'>+	psb_modeset_init(dev);</div><div class='add'>+	psb_fbdev_init(dev);</div><div class='add'>+	drm_kms_helper_poll_init(dev);</div><div class='add'>+</div><div class='add'>+	/* Only add backlight support if we have LVDS output */</div><div class='add'>+	list_for_each_entry(connector, &amp;dev-&gt;mode_config.connector_list,</div><div class='add'>+			    head) {</div><div class='add'>+		psb_intel_encoder = psb_intel_attached_encoder(connector);</div><div class='add'>+</div><div class='add'>+		switch (psb_intel_encoder-&gt;type) {</div><div class='add'>+		case INTEL_OUTPUT_LVDS:</div><div class='add'>+		case INTEL_OUTPUT_MIPI:</div><div class='add'>+			ret = gma_backlight_init(dev);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+#if 0</div><div class='add'>+	/*enable runtime pm at last*/</div><div class='add'>+	pm_runtime_enable(&amp;dev-&gt;pdev-&gt;dev);</div><div class='add'>+	pm_runtime_set_active(&amp;dev-&gt;pdev-&gt;dev);</div><div class='add'>+#endif</div><div class='add'>+	/*Intel drm driver load is done, continue doing pvr load*/</div><div class='add'>+	return 0;</div><div class='add'>+out_err:</div><div class='add'>+	psb_driver_unload(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_driver_device_is_agp(struct drm_device *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 get_brightness(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE</div><div class='add'>+	if (bd) {</div><div class='add'>+		bd-&gt;props.brightness = bd-&gt;ops-&gt;get_brightness(bd);</div><div class='add'>+		backlight_update_status(bd);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_dpst_bl_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+		       struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = psb_priv(dev);</div><div class='add'>+	uint32_t *arg = data;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;blc_adj2 = *arg;</div><div class='add'>+	get_brightness(dev_priv-&gt;backlight_device);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_adb_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = psb_priv(dev);</div><div class='add'>+	uint32_t *arg = data;</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;blc_adj1 = *arg;</div><div class='add'>+	get_brightness(dev_priv-&gt;backlight_device);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_gamma_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			   struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_dpst_lut_arg *lut_arg = data;</div><div class='add'>+	struct drm_mode_object *obj;</div><div class='add'>+	struct drm_crtc *crtc;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc;</div><div class='add'>+	int i = 0;</div><div class='add'>+	int32_t obj_id;</div><div class='add'>+</div><div class='add'>+	obj_id = lut_arg-&gt;output_id;</div><div class='add'>+	obj = drm_mode_object_find(dev, obj_id, DRM_MODE_OBJECT_CONNECTOR);</div><div class='add'>+	if (!obj) {</div><div class='add'>+		dev_dbg(dev-&gt;dev, "Invalid Connector object.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	connector = obj_to_connector(obj);</div><div class='add'>+	crtc = connector-&gt;encoder-&gt;crtc;</div><div class='add'>+	psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 256; i++)</div><div class='add'>+		psb_intel_crtc-&gt;lut_adj[i] = lut_arg-&gt;lut[i];</div><div class='add'>+</div><div class='add'>+	psb_intel_crtc_load_lut(crtc);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_mode_operation_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+				struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	uint32_t obj_id;</div><div class='add'>+	uint16_t op;</div><div class='add'>+	struct drm_mode_modeinfo *umode;</div><div class='add'>+	struct drm_display_mode *mode = NULL;</div><div class='add'>+	struct drm_psb_mode_operation_arg *arg;</div><div class='add'>+	struct drm_mode_object *obj;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+	struct drm_connector_helper_funcs *connector_funcs;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int resp = MODE_OK;</div><div class='add'>+</div><div class='add'>+	arg = (struct drm_psb_mode_operation_arg *)data;</div><div class='add'>+	obj_id = arg-&gt;obj_id;</div><div class='add'>+	op = arg-&gt;operation;</div><div class='add'>+</div><div class='add'>+	switch (op) {</div><div class='add'>+	case PSB_MODE_OPERATION_MODE_VALID:</div><div class='add'>+		umode = &amp;arg-&gt;mode;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+</div><div class='add'>+		obj = drm_mode_object_find(dev, obj_id,</div><div class='add'>+					DRM_MODE_OBJECT_CONNECTOR);</div><div class='add'>+		if (!obj) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto mode_op_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		connector = obj_to_connector(obj);</div><div class='add'>+</div><div class='add'>+		mode = drm_mode_create(dev);</div><div class='add'>+		if (!mode) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto mode_op_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* drm_crtc_convert_umode(mode, umode); */</div><div class='add'>+		{</div><div class='add'>+			mode-&gt;clock = umode-&gt;clock;</div><div class='add'>+			mode-&gt;hdisplay = umode-&gt;hdisplay;</div><div class='add'>+			mode-&gt;hsync_start = umode-&gt;hsync_start;</div><div class='add'>+			mode-&gt;hsync_end = umode-&gt;hsync_end;</div><div class='add'>+			mode-&gt;htotal = umode-&gt;htotal;</div><div class='add'>+			mode-&gt;hskew = umode-&gt;hskew;</div><div class='add'>+			mode-&gt;vdisplay = umode-&gt;vdisplay;</div><div class='add'>+			mode-&gt;vsync_start = umode-&gt;vsync_start;</div><div class='add'>+			mode-&gt;vsync_end = umode-&gt;vsync_end;</div><div class='add'>+			mode-&gt;vtotal = umode-&gt;vtotal;</div><div class='add'>+			mode-&gt;vscan = umode-&gt;vscan;</div><div class='add'>+			mode-&gt;vrefresh = umode-&gt;vrefresh;</div><div class='add'>+			mode-&gt;flags = umode-&gt;flags;</div><div class='add'>+			mode-&gt;type = umode-&gt;type;</div><div class='add'>+			strncpy(mode-&gt;name, umode-&gt;name, DRM_DISPLAY_MODE_LEN);</div><div class='add'>+			mode-&gt;name[DRM_DISPLAY_MODE_LEN-1] = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		connector_funcs = (struct drm_connector_helper_funcs *)</div><div class='add'>+				   connector-&gt;helper_private;</div><div class='add'>+</div><div class='add'>+		if (connector_funcs-&gt;mode_valid) {</div><div class='add'>+			resp = connector_funcs-&gt;mode_valid(connector, mode);</div><div class='add'>+			arg-&gt;data = resp;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*do some clean up work*/</div><div class='add'>+		if (mode)</div><div class='add'>+			drm_mode_destroy(dev, mode);</div><div class='add'>+mode_op_out:</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dev_dbg(dev-&gt;dev, "Unsupported psb mode operation\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_stolen_memory_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+				   struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = psb_priv(dev);</div><div class='add'>+	struct drm_psb_stolen_memory_arg *arg = data;</div><div class='add'>+</div><div class='add'>+	arg-&gt;base = dev_priv-&gt;stolen_base;</div><div class='add'>+	arg-&gt;size = dev_priv-&gt;vram_stolen_size;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_driver_open(struct drm_device *dev, struct drm_file *priv)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_driver_close(struct drm_device *dev, struct drm_file *priv)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long psb_unlocked_ioctl(struct file *filp, unsigned int cmd,</div><div class='add'>+			       unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct drm_file *file_priv = filp-&gt;private_data;</div><div class='add'>+	struct drm_device *dev = file_priv-&gt;minor-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	static unsigned int runtime_allowed;</div><div class='add'>+</div><div class='add'>+	if (runtime_allowed == 1 &amp;&amp; dev_priv-&gt;is_lvds_on) {</div><div class='add'>+		runtime_allowed++;</div><div class='add'>+		pm_runtime_allow(&amp;dev-&gt;pdev-&gt;dev);</div><div class='add'>+		dev_priv-&gt;rpm_enabled = 1;</div><div class='add'>+	}</div><div class='add'>+	return drm_ioctl(filp, cmd, arg);</div><div class='add'>+	/* FIXME: do we need to wrap the other side of this */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* When a client dies:</div><div class='add'>+ *    - Check for and clean up flipped page state</div><div class='add'>+ */</div><div class='add'>+void psb_driver_preclose(struct drm_device *dev, struct drm_file *priv)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	drm_put_dev(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops psb_pm_ops = {</div><div class='add'>+	.resume = gma_power_resume,</div><div class='add'>+	.suspend = gma_power_suspend,</div><div class='add'>+	.runtime_suspend = psb_runtime_suspend,</div><div class='add'>+	.runtime_resume = psb_runtime_resume,</div><div class='add'>+	.runtime_idle = psb_runtime_idle,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct vm_operations_struct psb_gem_vm_ops = {</div><div class='add'>+	.fault = psb_gem_fault,</div><div class='add'>+	.open = drm_gem_vm_open,</div><div class='add'>+	.close = drm_gem_vm_close,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations psb_gem_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = drm_open,</div><div class='add'>+	.release = drm_release,</div><div class='add'>+	.unlocked_ioctl = psb_unlocked_ioctl,</div><div class='add'>+	.mmap = drm_gem_mmap,</div><div class='add'>+	.poll = drm_poll,</div><div class='add'>+	.fasync = drm_fasync,</div><div class='add'>+	.read = drm_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct drm_driver driver = {</div><div class='add'>+	.driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | \</div><div class='add'>+			   DRIVER_IRQ_VBL | DRIVER_MODESET | DRIVER_GEM ,</div><div class='add'>+	.load = psb_driver_load,</div><div class='add'>+	.unload = psb_driver_unload,</div><div class='add'>+</div><div class='add'>+	.ioctls = psb_ioctls,</div><div class='add'>+	.num_ioctls = DRM_ARRAY_SIZE(psb_ioctls),</div><div class='add'>+	.device_is_agp = psb_driver_device_is_agp,</div><div class='add'>+	.irq_preinstall = psb_irq_preinstall,</div><div class='add'>+	.irq_postinstall = psb_irq_postinstall,</div><div class='add'>+	.irq_uninstall = psb_irq_uninstall,</div><div class='add'>+	.irq_handler = psb_irq_handler,</div><div class='add'>+	.enable_vblank = psb_enable_vblank,</div><div class='add'>+	.disable_vblank = psb_disable_vblank,</div><div class='add'>+	.get_vblank_counter = psb_get_vblank_counter,</div><div class='add'>+	.lastclose = psb_lastclose,</div><div class='add'>+	.open = psb_driver_open,</div><div class='add'>+	.preclose = psb_driver_preclose,</div><div class='add'>+	.postclose = psb_driver_close,</div><div class='add'>+	.reclaim_buffers = drm_core_reclaim_buffers,</div><div class='add'>+</div><div class='add'>+	.gem_init_object = psb_gem_init_object,</div><div class='add'>+	.gem_free_object = psb_gem_free_object,</div><div class='add'>+	.gem_vm_ops = &amp;psb_gem_vm_ops,</div><div class='add'>+	.dumb_create = psb_gem_dumb_create,</div><div class='add'>+	.dumb_map_offset = psb_gem_dumb_map_gtt,</div><div class='add'>+	.dumb_destroy = psb_gem_dumb_destroy,</div><div class='add'>+	.fops = &amp;psb_gem_fops,</div><div class='add'>+	.name = DRIVER_NAME,</div><div class='add'>+	.desc = DRIVER_DESC,</div><div class='add'>+	.date = PSB_DRM_DRIVER_DATE,</div><div class='add'>+	.major = PSB_DRM_DRIVER_MAJOR,</div><div class='add'>+	.minor = PSB_DRM_DRIVER_MINOR,</div><div class='add'>+	.patchlevel = PSB_DRM_DRIVER_PATCHLEVEL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pci_driver psb_pci_driver = {</div><div class='add'>+	.name = DRIVER_NAME,</div><div class='add'>+	.id_table = pciidlist,</div><div class='add'>+	.probe = psb_probe,</div><div class='add'>+	.remove = psb_remove,</div><div class='add'>+	.driver.pm = &amp;psb_pm_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	return drm_get_pci_dev(pdev, ent, &amp;driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init psb_init(void)</div><div class='add'>+{</div><div class='add'>+	return drm_pci_init(&amp;driver, &amp;psb_pci_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit psb_exit(void)</div><div class='add'>+{</div><div class='add'>+	drm_pci_exit(&amp;driver, &amp;psb_pci_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+late_initcall(psb_init);</div><div class='add'>+module_exit(psb_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Alan Cox &lt;alan@linux.intel.com&gt; and others");</div><div class='add'>+MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h<br/>new file mode 100644<br/>index 000000000000..eb1568a0da95<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/psb_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/psb_drv.h</a></div><div class='hunk'>@@ -0,0 +1,956 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ * Copyright (c) 2007-2011, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef _PSB_DRV_H_</div><div class='add'>+#define _PSB_DRV_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include "drm_global.h"</div><div class='add'>+#include "gem_glue.h"</div><div class='add'>+#include "gma_drm.h"</div><div class='add'>+#include "psb_reg.h"</div><div class='add'>+#include "psb_intel_drv.h"</div><div class='add'>+#include "gtt.h"</div><div class='add'>+#include "power.h"</div><div class='add'>+#include "oaktrail.h"</div><div class='add'>+</div><div class='add'>+/* Append new drm mode definition here, align with libdrm definition */</div><div class='add'>+#define DRM_MODE_SCALE_NO_SCALE   	2</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CHIP_PSB_8108 = 0,		/* Poulsbo */</div><div class='add'>+	CHIP_PSB_8109 = 1,		/* Poulsbo */</div><div class='add'>+	CHIP_MRST_4100 = 2,		/* Moorestown/Oaktrail */</div><div class='add'>+	CHIP_MFLD_0130 = 3,		/* Medfield */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IS_PSB(dev) (((dev)-&gt;pci_device &amp; 0xfffe) == 0x8108)</div><div class='add'>+#define IS_MRST(dev) (((dev)-&gt;pci_device &amp; 0xfffc) == 0x4100)</div><div class='add'>+#define IS_MFLD(dev) (((dev)-&gt;pci_device &amp; 0xfff8) == 0x0130)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Driver definitions</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define DRIVER_NAME "gma500"</div><div class='add'>+#define DRIVER_DESC "DRM driver for the Intel GMA500"</div><div class='add'>+</div><div class='add'>+#define PSB_DRM_DRIVER_DATE "2011-06-06"</div><div class='add'>+#define PSB_DRM_DRIVER_MAJOR 1</div><div class='add'>+#define PSB_DRM_DRIVER_MINOR 0</div><div class='add'>+#define PSB_DRM_DRIVER_PATCHLEVEL 0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Hardware offsets</div><div class='add'>+ */</div><div class='add'>+#define PSB_VDC_OFFSET		 0x00000000</div><div class='add'>+#define PSB_VDC_SIZE		 0x000080000</div><div class='add'>+#define MRST_MMIO_SIZE		 0x0000C0000</div><div class='add'>+#define MDFLD_MMIO_SIZE          0x000100000</div><div class='add'>+#define PSB_SGX_SIZE		 0x8000</div><div class='add'>+#define PSB_SGX_OFFSET		 0x00040000</div><div class='add'>+#define MRST_SGX_OFFSET		 0x00080000</div><div class='add'>+/*</div><div class='add'>+ *	PCI resource identifiers</div><div class='add'>+ */</div><div class='add'>+#define PSB_MMIO_RESOURCE	 0</div><div class='add'>+#define PSB_GATT_RESOURCE	 2</div><div class='add'>+#define PSB_GTT_RESOURCE	 3</div><div class='add'>+/*</div><div class='add'>+ *	PCI configuration</div><div class='add'>+ */</div><div class='add'>+#define PSB_GMCH_CTRL		 0x52</div><div class='add'>+#define PSB_BSM			 0x5C</div><div class='add'>+#define _PSB_GMCH_ENABLED	 0x4</div><div class='add'>+#define PSB_PGETBL_CTL		 0x2020</div><div class='add'>+#define _PSB_PGETBL_ENABLED	 0x00000001</div><div class='add'>+#define PSB_SGX_2D_SLAVE_PORT	 0x4000</div><div class='add'>+</div><div class='add'>+/* To get rid of */</div><div class='add'>+#define PSB_TT_PRIV0_LIMIT	 (256*1024*1024)</div><div class='add'>+#define PSB_TT_PRIV0_PLIMIT	 (PSB_TT_PRIV0_LIMIT &gt;&gt; PAGE_SHIFT)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	SGX side MMU definitions (these can probably go)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Flags for external memory type field.</div><div class='add'>+ */</div><div class='add'>+#define PSB_MMU_CACHED_MEMORY	  0x0001	/* Bind to MMU only */</div><div class='add'>+#define PSB_MMU_RO_MEMORY	  0x0002	/* MMU RO memory */</div><div class='add'>+#define PSB_MMU_WO_MEMORY	  0x0004	/* MMU WO memory */</div><div class='add'>+/*</div><div class='add'>+ *	PTE's and PDE's</div><div class='add'>+ */</div><div class='add'>+#define PSB_PDE_MASK		  0x003FFFFF</div><div class='add'>+#define PSB_PDE_SHIFT		  22</div><div class='add'>+#define PSB_PTE_SHIFT		  12</div><div class='add'>+/*</div><div class='add'>+ *	Cache control</div><div class='add'>+ */</div><div class='add'>+#define PSB_PTE_VALID		  0x0001	/* PTE / PDE valid */</div><div class='add'>+#define PSB_PTE_WO		  0x0002	/* Write only */</div><div class='add'>+#define PSB_PTE_RO		  0x0004	/* Read only */</div><div class='add'>+#define PSB_PTE_CACHED		  0x0008	/* CPU cache coherent */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	VDC registers and bits</div><div class='add'>+ */</div><div class='add'>+#define PSB_MSVDX_CLOCKGATING	  0x2064</div><div class='add'>+#define PSB_TOPAZ_CLOCKGATING	  0x2068</div><div class='add'>+#define PSB_HWSTAM		  0x2098</div><div class='add'>+#define PSB_INSTPM		  0x20C0</div><div class='add'>+#define PSB_INT_IDENTITY_R        0x20A4</div><div class='add'>+#define _MDFLD_PIPEC_EVENT_FLAG   (1&lt;&lt;2)</div><div class='add'>+#define _MDFLD_PIPEC_VBLANK_FLAG  (1&lt;&lt;3)</div><div class='add'>+#define _PSB_DPST_PIPEB_FLAG      (1&lt;&lt;4)</div><div class='add'>+#define _MDFLD_PIPEB_EVENT_FLAG   (1&lt;&lt;4)</div><div class='add'>+#define _PSB_VSYNC_PIPEB_FLAG	  (1&lt;&lt;5)</div><div class='add'>+#define _PSB_DPST_PIPEA_FLAG      (1&lt;&lt;6)</div><div class='add'>+#define _PSB_PIPEA_EVENT_FLAG     (1&lt;&lt;6)</div><div class='add'>+#define _PSB_VSYNC_PIPEA_FLAG	  (1&lt;&lt;7)</div><div class='add'>+#define _MDFLD_MIPIA_FLAG	  (1&lt;&lt;16)</div><div class='add'>+#define _MDFLD_MIPIC_FLAG	  (1&lt;&lt;17)</div><div class='add'>+#define _PSB_IRQ_SGX_FLAG	  (1&lt;&lt;18)</div><div class='add'>+#define _PSB_IRQ_MSVDX_FLAG	  (1&lt;&lt;19)</div><div class='add'>+#define _LNC_IRQ_TOPAZ_FLAG	  (1&lt;&lt;20)</div><div class='add'>+</div><div class='add'>+#define _PSB_PIPE_EVENT_FLAG	(_PSB_VSYNC_PIPEA_FLAG | \</div><div class='add'>+				 _PSB_VSYNC_PIPEB_FLAG)</div><div class='add'>+</div><div class='add'>+/* This flag includes all the display IRQ bits excepts the vblank irqs. */</div><div class='add'>+#define _MDFLD_DISP_ALL_IRQ_FLAG (_MDFLD_PIPEC_EVENT_FLAG | \</div><div class='add'>+				  _MDFLD_PIPEB_EVENT_FLAG | \</div><div class='add'>+				  _PSB_PIPEA_EVENT_FLAG | \</div><div class='add'>+				  _PSB_VSYNC_PIPEA_FLAG | \</div><div class='add'>+				  _MDFLD_MIPIA_FLAG | \</div><div class='add'>+				  _MDFLD_MIPIC_FLAG)</div><div class='add'>+#define PSB_INT_IDENTITY_R	  0x20A4</div><div class='add'>+#define PSB_INT_MASK_R		  0x20A8</div><div class='add'>+#define PSB_INT_ENABLE_R	  0x20A0</div><div class='add'>+</div><div class='add'>+#define _PSB_MMU_ER_MASK      0x0001FF00</div><div class='add'>+#define _PSB_MMU_ER_HOST      (1 &lt;&lt; 16)</div><div class='add'>+#define GPIOA			0x5010</div><div class='add'>+#define GPIOB			0x5014</div><div class='add'>+#define GPIOC			0x5018</div><div class='add'>+#define GPIOD			0x501c</div><div class='add'>+#define GPIOE			0x5020</div><div class='add'>+#define GPIOF			0x5024</div><div class='add'>+#define GPIOG			0x5028</div><div class='add'>+#define GPIOH			0x502c</div><div class='add'>+#define GPIO_CLOCK_DIR_MASK		(1 &lt;&lt; 0)</div><div class='add'>+#define GPIO_CLOCK_DIR_IN		(0 &lt;&lt; 1)</div><div class='add'>+#define GPIO_CLOCK_DIR_OUT		(1 &lt;&lt; 1)</div><div class='add'>+#define GPIO_CLOCK_VAL_MASK		(1 &lt;&lt; 2)</div><div class='add'>+#define GPIO_CLOCK_VAL_OUT		(1 &lt;&lt; 3)</div><div class='add'>+#define GPIO_CLOCK_VAL_IN		(1 &lt;&lt; 4)</div><div class='add'>+#define GPIO_CLOCK_PULLUP_DISABLE	(1 &lt;&lt; 5)</div><div class='add'>+#define GPIO_DATA_DIR_MASK		(1 &lt;&lt; 8)</div><div class='add'>+#define GPIO_DATA_DIR_IN		(0 &lt;&lt; 9)</div><div class='add'>+#define GPIO_DATA_DIR_OUT		(1 &lt;&lt; 9)</div><div class='add'>+#define GPIO_DATA_VAL_MASK		(1 &lt;&lt; 10)</div><div class='add'>+#define GPIO_DATA_VAL_OUT		(1 &lt;&lt; 11)</div><div class='add'>+#define GPIO_DATA_VAL_IN		(1 &lt;&lt; 12)</div><div class='add'>+#define GPIO_DATA_PULLUP_DISABLE	(1 &lt;&lt; 13)</div><div class='add'>+</div><div class='add'>+#define VCLK_DIVISOR_VGA0   0x6000</div><div class='add'>+#define VCLK_DIVISOR_VGA1   0x6004</div><div class='add'>+#define VCLK_POST_DIV	    0x6010</div><div class='add'>+</div><div class='add'>+#define PSB_COMM_2D (PSB_ENGINE_2D &lt;&lt; 4)</div><div class='add'>+#define PSB_COMM_3D (PSB_ENGINE_3D &lt;&lt; 4)</div><div class='add'>+#define PSB_COMM_TA (PSB_ENGINE_TA &lt;&lt; 4)</div><div class='add'>+#define PSB_COMM_HP (PSB_ENGINE_HP &lt;&lt; 4)</div><div class='add'>+#define PSB_COMM_USER_IRQ (1024 &gt;&gt; 2)</div><div class='add'>+#define PSB_COMM_USER_IRQ_LOST (PSB_COMM_USER_IRQ + 1)</div><div class='add'>+#define PSB_COMM_FW (2048 &gt;&gt; 2)</div><div class='add'>+</div><div class='add'>+#define PSB_UIRQ_VISTEST	       1</div><div class='add'>+#define PSB_UIRQ_OOM_REPLY	       2</div><div class='add'>+#define PSB_UIRQ_FIRE_TA_REPLY	       3</div><div class='add'>+#define PSB_UIRQ_FIRE_RASTER_REPLY     4</div><div class='add'>+</div><div class='add'>+#define PSB_2D_SIZE (256*1024*1024)</div><div class='add'>+#define PSB_MAX_RELOC_PAGES 1024</div><div class='add'>+</div><div class='add'>+#define PSB_LOW_REG_OFFS 0x0204</div><div class='add'>+#define PSB_HIGH_REG_OFFS 0x0600</div><div class='add'>+</div><div class='add'>+#define PSB_NUM_VBLANKS 2</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define PSB_2D_SIZE (256*1024*1024)</div><div class='add'>+#define PSB_MAX_RELOC_PAGES 1024</div><div class='add'>+</div><div class='add'>+#define PSB_LOW_REG_OFFS 0x0204</div><div class='add'>+#define PSB_HIGH_REG_OFFS 0x0600</div><div class='add'>+</div><div class='add'>+#define PSB_NUM_VBLANKS 2</div><div class='add'>+#define PSB_WATCHDOG_DELAY (DRM_HZ * 2)</div><div class='add'>+#define PSB_LID_DELAY (DRM_HZ / 10)</div><div class='add'>+</div><div class='add'>+#define MDFLD_PNW_B0 0x04</div><div class='add'>+#define MDFLD_PNW_C0 0x08</div><div class='add'>+</div><div class='add'>+#define MDFLD_DSR_2D_3D_0 	(1 &lt;&lt; 0)</div><div class='add'>+#define MDFLD_DSR_2D_3D_2 	(1 &lt;&lt; 1)</div><div class='add'>+#define MDFLD_DSR_CURSOR_0 	(1 &lt;&lt; 2)</div><div class='add'>+#define MDFLD_DSR_CURSOR_2	(1 &lt;&lt; 3)</div><div class='add'>+#define MDFLD_DSR_OVERLAY_0 	(1 &lt;&lt; 4)</div><div class='add'>+#define MDFLD_DSR_OVERLAY_2 	(1 &lt;&lt; 5)</div><div class='add'>+#define MDFLD_DSR_MIPI_CONTROL	(1 &lt;&lt; 6)</div><div class='add'>+#define MDFLD_DSR_DAMAGE_MASK_0	((1 &lt;&lt; 0) | (1 &lt;&lt; 2) | (1 &lt;&lt; 4))</div><div class='add'>+#define MDFLD_DSR_DAMAGE_MASK_2	((1 &lt;&lt; 1) | (1 &lt;&lt; 3) | (1 &lt;&lt; 5))</div><div class='add'>+#define MDFLD_DSR_2D_3D 	(MDFLD_DSR_2D_3D_0 | MDFLD_DSR_2D_3D_2)</div><div class='add'>+</div><div class='add'>+#define MDFLD_DSR_RR		45</div><div class='add'>+#define MDFLD_DPU_ENABLE 	(1 &lt;&lt; 31)</div><div class='add'>+#define MDFLD_DSR_FULLSCREEN 	(1 &lt;&lt; 30)</div><div class='add'>+#define MDFLD_DSR_DELAY		(DRM_HZ / MDFLD_DSR_RR)</div><div class='add'>+</div><div class='add'>+#define PSB_PWR_STATE_ON		1</div><div class='add'>+#define PSB_PWR_STATE_OFF		2</div><div class='add'>+</div><div class='add'>+#define PSB_PMPOLICY_NOPM		0</div><div class='add'>+#define PSB_PMPOLICY_CLOCKGATING	1</div><div class='add'>+#define PSB_PMPOLICY_POWERDOWN		2</div><div class='add'>+</div><div class='add'>+#define PSB_PMSTATE_POWERUP		0</div><div class='add'>+#define PSB_PMSTATE_CLOCKGATED		1</div><div class='add'>+#define PSB_PMSTATE_POWERDOWN		2</div><div class='add'>+#define PSB_PCIx_MSI_ADDR_LOC		0x94</div><div class='add'>+#define PSB_PCIx_MSI_DATA_LOC		0x98</div><div class='add'>+</div><div class='add'>+/* Medfield crystal settings */</div><div class='add'>+#define KSEL_CRYSTAL_19 1</div><div class='add'>+#define KSEL_BYPASS_19 5</div><div class='add'>+#define KSEL_BYPASS_25 6</div><div class='add'>+#define KSEL_BYPASS_83_100 7</div><div class='add'>+</div><div class='add'>+struct opregion_header;</div><div class='add'>+struct opregion_acpi;</div><div class='add'>+struct opregion_swsci;</div><div class='add'>+struct opregion_asle;</div><div class='add'>+</div><div class='add'>+struct psb_intel_opregion {</div><div class='add'>+	struct opregion_header *header;</div><div class='add'>+	struct opregion_acpi *acpi;</div><div class='add'>+	struct opregion_swsci *swsci;</div><div class='add'>+	struct opregion_asle *asle;</div><div class='add'>+	int enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sdvo_device_mapping {</div><div class='add'>+	u8 initialized;</div><div class='add'>+	u8 dvo_port;</div><div class='add'>+	u8 slave_addr;</div><div class='add'>+	u8 dvo_wiring;</div><div class='add'>+	u8 i2c_pin;</div><div class='add'>+	u8 i2c_speed;</div><div class='add'>+	u8 ddc_pin;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct intel_gmbus {</div><div class='add'>+	struct i2c_adapter adapter;</div><div class='add'>+	struct i2c_adapter *force_bit;</div><div class='add'>+	u32 reg0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct psb_ops;</div><div class='add'>+</div><div class='add'>+#define PSB_NUM_PIPE		3</div><div class='add'>+</div><div class='add'>+struct drm_psb_private {</div><div class='add'>+	struct drm_device *dev;</div><div class='add'>+	const struct psb_ops *ops;</div><div class='add'>+</div><div class='add'>+	struct psb_gtt gtt;</div><div class='add'>+</div><div class='add'>+	/* GTT Memory manager */</div><div class='add'>+	struct psb_gtt_mm *gtt_mm;</div><div class='add'>+	struct page *scratch_page;</div><div class='add'>+	u32 *gtt_map;</div><div class='add'>+	uint32_t stolen_base;</div><div class='add'>+	void *vram_addr;</div><div class='add'>+	unsigned long vram_stolen_size;</div><div class='add'>+	int gtt_initialized;</div><div class='add'>+	u16 gmch_ctrl;		/* Saved GTT setup */</div><div class='add'>+	u32 pge_ctl;</div><div class='add'>+</div><div class='add'>+	struct mutex gtt_mutex;</div><div class='add'>+	struct resource *gtt_mem;	/* Our PCI resource */</div><div class='add'>+</div><div class='add'>+	struct psb_mmu_driver *mmu;</div><div class='add'>+	struct psb_mmu_pd *pf_pd;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Register base</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	uint8_t *sgx_reg;</div><div class='add'>+	uint8_t *vdc_reg;</div><div class='add'>+	uint32_t gatt_free_offset;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Fencing / irq.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	uint32_t vdc_irq_mask;</div><div class='add'>+	uint32_t pipestat[PSB_NUM_PIPE];</div><div class='add'>+</div><div class='add'>+	spinlock_t irqmask_lock;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Power</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	bool suspended;</div><div class='add'>+	bool display_power;</div><div class='add'>+	int display_count;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Modesetting</div><div class='add'>+	 */</div><div class='add'>+	struct psb_intel_mode_device mode_dev;</div><div class='add'>+</div><div class='add'>+	struct drm_crtc *plane_to_crtc_mapping[PSB_NUM_PIPE];</div><div class='add'>+	struct drm_crtc *pipe_to_crtc_mapping[PSB_NUM_PIPE];</div><div class='add'>+	uint32_t num_pipe;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * OSPM info (Power management base) (can go ?)</div><div class='add'>+	 */</div><div class='add'>+	uint32_t ospm_base;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Sizes info</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	u32 fuse_reg_value;</div><div class='add'>+	u32 video_device_fuse;</div><div class='add'>+</div><div class='add'>+	/* PCI revision ID for B0:D2:F0 */</div><div class='add'>+	uint8_t platform_rev_id;</div><div class='add'>+</div><div class='add'>+	/* gmbus */</div><div class='add'>+	struct intel_gmbus *gmbus;</div><div class='add'>+</div><div class='add'>+	/* Used by SDVO */</div><div class='add'>+	int crt_ddc_pin;</div><div class='add'>+	/* FIXME: The mappings should be parsed from bios but for now we can</div><div class='add'>+		  pretend there are no mappings available */</div><div class='add'>+	struct sdvo_device_mapping sdvo_mappings[2];</div><div class='add'>+	u32 hotplug_supported_mask;</div><div class='add'>+	struct drm_property *broadcast_rgb_property;</div><div class='add'>+	struct drm_property *force_audio_property;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * LVDS info</div><div class='add'>+	 */</div><div class='add'>+	int backlight_duty_cycle;	/* restore backlight to this value */</div><div class='add'>+	bool panel_wants_dither;</div><div class='add'>+	struct drm_display_mode *panel_fixed_mode;</div><div class='add'>+	struct drm_display_mode *lfp_lvds_vbt_mode;</div><div class='add'>+	struct drm_display_mode *sdvo_lvds_vbt_mode;</div><div class='add'>+</div><div class='add'>+	struct bdb_lvds_backlight *lvds_bl; /* LVDS backlight info from VBT */</div><div class='add'>+	struct psb_intel_i2c_chan *lvds_i2c_bus; /* FIXME: Remove this? */</div><div class='add'>+</div><div class='add'>+	/* Feature bits from the VBIOS */</div><div class='add'>+	unsigned int int_tv_support:1;</div><div class='add'>+	unsigned int lvds_dither:1;</div><div class='add'>+	unsigned int lvds_vbt:1;</div><div class='add'>+	unsigned int int_crt_support:1;</div><div class='add'>+	unsigned int lvds_use_ssc:1;</div><div class='add'>+	int lvds_ssc_freq;</div><div class='add'>+	bool is_lvds_on;</div><div class='add'>+	bool is_mipi_on;</div><div class='add'>+	u32 mipi_ctrl_display;</div><div class='add'>+</div><div class='add'>+	unsigned int core_freq;</div><div class='add'>+	uint32_t iLVDS_enable;</div><div class='add'>+</div><div class='add'>+	/* Runtime PM state */</div><div class='add'>+	int rpm_enabled;</div><div class='add'>+</div><div class='add'>+	/* MID specific */</div><div class='add'>+	struct oaktrail_vbt vbt_data;</div><div class='add'>+	struct oaktrail_gct_data gct_data;</div><div class='add'>+</div><div class='add'>+	/* MIPI Panel type etc */</div><div class='add'>+	int panel_id;</div><div class='add'>+	bool dual_mipi;		/* dual display - DPI &amp; DBI */</div><div class='add'>+	bool dpi_panel_on;	/* The DPI panel power is on */</div><div class='add'>+	bool dpi_panel_on2;	/* The DPI panel power is on */</div><div class='add'>+	bool dbi_panel_on;	/* The DBI panel power is on */</div><div class='add'>+	bool dbi_panel_on2;	/* The DBI panel power is on */</div><div class='add'>+	u32 dsr_fb_update;	/* DSR FB update counter */</div><div class='add'>+</div><div class='add'>+	/* Moorestown HDMI state */</div><div class='add'>+	struct oaktrail_hdmi_dev *hdmi_priv;</div><div class='add'>+</div><div class='add'>+	/* Moorestown pipe config register value cache */</div><div class='add'>+	uint32_t pipeconf;</div><div class='add'>+	uint32_t pipeconf1;</div><div class='add'>+	uint32_t pipeconf2;</div><div class='add'>+</div><div class='add'>+	/* Moorestown plane control register value cache */</div><div class='add'>+	uint32_t dspcntr;</div><div class='add'>+	uint32_t dspcntr1;</div><div class='add'>+	uint32_t dspcntr2;</div><div class='add'>+</div><div class='add'>+	/* Moorestown MM backlight cache */</div><div class='add'>+	uint8_t saveBKLTCNT;</div><div class='add'>+	uint8_t saveBKLTREQ;</div><div class='add'>+	uint8_t saveBKLTBRTL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Register state</div><div class='add'>+	 */</div><div class='add'>+	uint32_t saveDSPACNTR;</div><div class='add'>+	uint32_t saveDSPBCNTR;</div><div class='add'>+	uint32_t savePIPEACONF;</div><div class='add'>+	uint32_t savePIPEBCONF;</div><div class='add'>+	uint32_t savePIPEASRC;</div><div class='add'>+	uint32_t savePIPEBSRC;</div><div class='add'>+	uint32_t saveFPA0;</div><div class='add'>+	uint32_t saveFPA1;</div><div class='add'>+	uint32_t saveDPLL_A;</div><div class='add'>+	uint32_t saveDPLL_A_MD;</div><div class='add'>+	uint32_t saveHTOTAL_A;</div><div class='add'>+	uint32_t saveHBLANK_A;</div><div class='add'>+	uint32_t saveHSYNC_A;</div><div class='add'>+	uint32_t saveVTOTAL_A;</div><div class='add'>+	uint32_t saveVBLANK_A;</div><div class='add'>+	uint32_t saveVSYNC_A;</div><div class='add'>+	uint32_t saveDSPASTRIDE;</div><div class='add'>+	uint32_t saveDSPASIZE;</div><div class='add'>+	uint32_t saveDSPAPOS;</div><div class='add'>+	uint32_t saveDSPABASE;</div><div class='add'>+	uint32_t saveDSPASURF;</div><div class='add'>+	uint32_t saveDSPASTATUS;</div><div class='add'>+	uint32_t saveFPB0;</div><div class='add'>+	uint32_t saveFPB1;</div><div class='add'>+	uint32_t saveDPLL_B;</div><div class='add'>+	uint32_t saveDPLL_B_MD;</div><div class='add'>+	uint32_t saveHTOTAL_B;</div><div class='add'>+	uint32_t saveHBLANK_B;</div><div class='add'>+	uint32_t saveHSYNC_B;</div><div class='add'>+	uint32_t saveVTOTAL_B;</div><div class='add'>+	uint32_t saveVBLANK_B;</div><div class='add'>+	uint32_t saveVSYNC_B;</div><div class='add'>+	uint32_t saveDSPBSTRIDE;</div><div class='add'>+	uint32_t saveDSPBSIZE;</div><div class='add'>+	uint32_t saveDSPBPOS;</div><div class='add'>+	uint32_t saveDSPBBASE;</div><div class='add'>+	uint32_t saveDSPBSURF;</div><div class='add'>+	uint32_t saveDSPBSTATUS;</div><div class='add'>+	uint32_t saveVCLK_DIVISOR_VGA0;</div><div class='add'>+	uint32_t saveVCLK_DIVISOR_VGA1;</div><div class='add'>+	uint32_t saveVCLK_POST_DIV;</div><div class='add'>+	uint32_t saveVGACNTRL;</div><div class='add'>+	uint32_t saveADPA;</div><div class='add'>+	uint32_t saveLVDS;</div><div class='add'>+	uint32_t saveDVOA;</div><div class='add'>+	uint32_t saveDVOB;</div><div class='add'>+	uint32_t saveDVOC;</div><div class='add'>+	uint32_t savePP_ON;</div><div class='add'>+	uint32_t savePP_OFF;</div><div class='add'>+	uint32_t savePP_CONTROL;</div><div class='add'>+	uint32_t savePP_CYCLE;</div><div class='add'>+	uint32_t savePFIT_CONTROL;</div><div class='add'>+	uint32_t savePaletteA[256];</div><div class='add'>+	uint32_t savePaletteB[256];</div><div class='add'>+	uint32_t saveBLC_PWM_CTL2;</div><div class='add'>+	uint32_t saveBLC_PWM_CTL;</div><div class='add'>+	uint32_t saveCLOCKGATING;</div><div class='add'>+	uint32_t saveDSPARB;</div><div class='add'>+	uint32_t saveDSPATILEOFF;</div><div class='add'>+	uint32_t saveDSPBTILEOFF;</div><div class='add'>+	uint32_t saveDSPAADDR;</div><div class='add'>+	uint32_t saveDSPBADDR;</div><div class='add'>+	uint32_t savePFIT_AUTO_RATIOS;</div><div class='add'>+	uint32_t savePFIT_PGM_RATIOS;</div><div class='add'>+	uint32_t savePP_ON_DELAYS;</div><div class='add'>+	uint32_t savePP_OFF_DELAYS;</div><div class='add'>+	uint32_t savePP_DIVISOR;</div><div class='add'>+	uint32_t saveBSM;</div><div class='add'>+	uint32_t saveVBT;</div><div class='add'>+	uint32_t saveBCLRPAT_A;</div><div class='add'>+	uint32_t saveBCLRPAT_B;</div><div class='add'>+	uint32_t saveDSPALINOFF;</div><div class='add'>+	uint32_t saveDSPBLINOFF;</div><div class='add'>+	uint32_t savePERF_MODE;</div><div class='add'>+	uint32_t saveDSPFW1;</div><div class='add'>+	uint32_t saveDSPFW2;</div><div class='add'>+	uint32_t saveDSPFW3;</div><div class='add'>+	uint32_t saveDSPFW4;</div><div class='add'>+	uint32_t saveDSPFW5;</div><div class='add'>+	uint32_t saveDSPFW6;</div><div class='add'>+	uint32_t saveCHICKENBIT;</div><div class='add'>+	uint32_t saveDSPACURSOR_CTRL;</div><div class='add'>+	uint32_t saveDSPBCURSOR_CTRL;</div><div class='add'>+	uint32_t saveDSPACURSOR_BASE;</div><div class='add'>+	uint32_t saveDSPBCURSOR_BASE;</div><div class='add'>+	uint32_t saveDSPACURSOR_POS;</div><div class='add'>+	uint32_t saveDSPBCURSOR_POS;</div><div class='add'>+	uint32_t save_palette_a[256];</div><div class='add'>+	uint32_t save_palette_b[256];</div><div class='add'>+	uint32_t saveOV_OVADD;</div><div class='add'>+	uint32_t saveOV_OGAMC0;</div><div class='add'>+	uint32_t saveOV_OGAMC1;</div><div class='add'>+	uint32_t saveOV_OGAMC2;</div><div class='add'>+	uint32_t saveOV_OGAMC3;</div><div class='add'>+	uint32_t saveOV_OGAMC4;</div><div class='add'>+	uint32_t saveOV_OGAMC5;</div><div class='add'>+	uint32_t saveOVC_OVADD;</div><div class='add'>+	uint32_t saveOVC_OGAMC0;</div><div class='add'>+	uint32_t saveOVC_OGAMC1;</div><div class='add'>+	uint32_t saveOVC_OGAMC2;</div><div class='add'>+	uint32_t saveOVC_OGAMC3;</div><div class='add'>+	uint32_t saveOVC_OGAMC4;</div><div class='add'>+	uint32_t saveOVC_OGAMC5;</div><div class='add'>+</div><div class='add'>+	/* MSI reg save */</div><div class='add'>+	uint32_t msi_addr;</div><div class='add'>+	uint32_t msi_data;</div><div class='add'>+</div><div class='add'>+	/* Medfield specific register save state */</div><div class='add'>+	uint32_t saveHDMIPHYMISCCTL;</div><div class='add'>+	uint32_t saveHDMIB_CONTROL;</div><div class='add'>+	uint32_t saveDSPCCNTR;</div><div class='add'>+	uint32_t savePIPECCONF;</div><div class='add'>+	uint32_t savePIPECSRC;</div><div class='add'>+	uint32_t saveHTOTAL_C;</div><div class='add'>+	uint32_t saveHBLANK_C;</div><div class='add'>+	uint32_t saveHSYNC_C;</div><div class='add'>+	uint32_t saveVTOTAL_C;</div><div class='add'>+	uint32_t saveVBLANK_C;</div><div class='add'>+	uint32_t saveVSYNC_C;</div><div class='add'>+	uint32_t saveDSPCSTRIDE;</div><div class='add'>+	uint32_t saveDSPCSIZE;</div><div class='add'>+	uint32_t saveDSPCPOS;</div><div class='add'>+	uint32_t saveDSPCSURF;</div><div class='add'>+	uint32_t saveDSPCSTATUS;</div><div class='add'>+	uint32_t saveDSPCLINOFF;</div><div class='add'>+	uint32_t saveDSPCTILEOFF;</div><div class='add'>+	uint32_t saveDSPCCURSOR_CTRL;</div><div class='add'>+	uint32_t saveDSPCCURSOR_BASE;</div><div class='add'>+	uint32_t saveDSPCCURSOR_POS;</div><div class='add'>+	uint32_t save_palette_c[256];</div><div class='add'>+	uint32_t saveOV_OVADD_C;</div><div class='add'>+	uint32_t saveOV_OGAMC0_C;</div><div class='add'>+	uint32_t saveOV_OGAMC1_C;</div><div class='add'>+	uint32_t saveOV_OGAMC2_C;</div><div class='add'>+	uint32_t saveOV_OGAMC3_C;</div><div class='add'>+	uint32_t saveOV_OGAMC4_C;</div><div class='add'>+	uint32_t saveOV_OGAMC5_C;</div><div class='add'>+</div><div class='add'>+	/* DSI register save */</div><div class='add'>+	uint32_t saveDEVICE_READY_REG;</div><div class='add'>+	uint32_t saveINTR_EN_REG;</div><div class='add'>+	uint32_t saveDSI_FUNC_PRG_REG;</div><div class='add'>+	uint32_t saveHS_TX_TIMEOUT_REG;</div><div class='add'>+	uint32_t saveLP_RX_TIMEOUT_REG;</div><div class='add'>+	uint32_t saveTURN_AROUND_TIMEOUT_REG;</div><div class='add'>+	uint32_t saveDEVICE_RESET_REG;</div><div class='add'>+	uint32_t saveDPI_RESOLUTION_REG;</div><div class='add'>+	uint32_t saveHORIZ_SYNC_PAD_COUNT_REG;</div><div class='add'>+	uint32_t saveHORIZ_BACK_PORCH_COUNT_REG;</div><div class='add'>+	uint32_t saveHORIZ_FRONT_PORCH_COUNT_REG;</div><div class='add'>+	uint32_t saveHORIZ_ACTIVE_AREA_COUNT_REG;</div><div class='add'>+	uint32_t saveVERT_SYNC_PAD_COUNT_REG;</div><div class='add'>+	uint32_t saveVERT_BACK_PORCH_COUNT_REG;</div><div class='add'>+	uint32_t saveVERT_FRONT_PORCH_COUNT_REG;</div><div class='add'>+	uint32_t saveHIGH_LOW_SWITCH_COUNT_REG;</div><div class='add'>+	uint32_t saveINIT_COUNT_REG;</div><div class='add'>+	uint32_t saveMAX_RET_PAK_REG;</div><div class='add'>+	uint32_t saveVIDEO_FMT_REG;</div><div class='add'>+	uint32_t saveEOT_DISABLE_REG;</div><div class='add'>+	uint32_t saveLP_BYTECLK_REG;</div><div class='add'>+	uint32_t saveHS_LS_DBI_ENABLE_REG;</div><div class='add'>+	uint32_t saveTXCLKESC_REG;</div><div class='add'>+	uint32_t saveDPHY_PARAM_REG;</div><div class='add'>+	uint32_t saveMIPI_CONTROL_REG;</div><div class='add'>+	uint32_t saveMIPI;</div><div class='add'>+	uint32_t saveMIPI_C;</div><div class='add'>+</div><div class='add'>+	/* DPST register save */</div><div class='add'>+	uint32_t saveHISTOGRAM_INT_CONTROL_REG;</div><div class='add'>+	uint32_t saveHISTOGRAM_LOGIC_CONTROL_REG;</div><div class='add'>+	uint32_t savePWM_CONTROL_LOGIC;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * DSI info. </div><div class='add'>+	 */</div><div class='add'>+	void * dbi_dsr_info;	</div><div class='add'>+	void * dbi_dpu_info;</div><div class='add'>+	void * dsi_configs[2];</div><div class='add'>+	/*</div><div class='add'>+	 * LID-Switch</div><div class='add'>+	 */</div><div class='add'>+	spinlock_t lid_lock;</div><div class='add'>+	struct timer_list lid_timer;</div><div class='add'>+	struct psb_intel_opregion opregion;</div><div class='add'>+	u32 *lid_state;</div><div class='add'>+	u32 lid_last_state;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Watchdog</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	uint32_t apm_reg;</div><div class='add'>+	uint16_t apm_base;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Used for modifying backlight from</div><div class='add'>+	 * xrandr -- consider removing and using HAL instead</div><div class='add'>+	 */</div><div class='add'>+	struct backlight_device *backlight_device;</div><div class='add'>+	struct drm_property *backlight_property;</div><div class='add'>+	uint32_t blc_adj1;</div><div class='add'>+	uint32_t blc_adj2;</div><div class='add'>+</div><div class='add'>+	void *fbdev;</div><div class='add'>+</div><div class='add'>+	/* 2D acceleration */</div><div class='add'>+	spinlock_t lock_2d;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Operations for each board type</div><div class='add'>+ */</div><div class='add'>+ </div><div class='add'>+struct psb_ops {</div><div class='add'>+	const char *name;</div><div class='add'>+	unsigned int accel_2d:1;</div><div class='add'>+	int pipes;		/* Number of output pipes */</div><div class='add'>+	int crtcs;		/* Number of CRTCs */</div><div class='add'>+	int sgx_offset;		/* Base offset of SGX device */</div><div class='add'>+</div><div class='add'>+	/* Sub functions */</div><div class='add'>+	struct drm_crtc_helper_funcs const *crtc_helper;</div><div class='add'>+	struct drm_crtc_funcs const *crtc_funcs;</div><div class='add'>+</div><div class='add'>+	/* Setup hooks */</div><div class='add'>+	int (*chip_setup)(struct drm_device *dev);</div><div class='add'>+	void (*chip_teardown)(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+	/* Display management hooks */</div><div class='add'>+	int (*output_init)(struct drm_device *dev);</div><div class='add'>+	/* Power management hooks */</div><div class='add'>+	void (*init_pm)(struct drm_device *dev);</div><div class='add'>+	int (*save_regs)(struct drm_device *dev);</div><div class='add'>+	int (*restore_regs)(struct drm_device *dev);</div><div class='add'>+	int (*power_up)(struct drm_device *dev);</div><div class='add'>+	int (*power_down)(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+	void (*lvds_bl_power)(struct drm_device *dev, bool on);</div><div class='add'>+#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE</div><div class='add'>+	/* Backlight */</div><div class='add'>+	int (*backlight_init)(struct drm_device *dev);</div><div class='add'>+#endif</div><div class='add'>+	int i2c_bus;		/* I2C bus identifier for Moorestown */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct psb_mmu_driver;</div><div class='add'>+</div><div class='add'>+extern int drm_crtc_probe_output_modes(struct drm_device *dev, int, int);</div><div class='add'>+extern int drm_pick_crtcs(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+static inline struct drm_psb_private *psb_priv(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	return (struct drm_psb_private *) dev-&gt;dev_private;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MMU stuff.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+extern struct psb_mmu_driver *psb_mmu_driver_init(uint8_t __iomem * registers,</div><div class='add'>+					int trap_pagefaults,</div><div class='add'>+					int invalid_type,</div><div class='add'>+					struct drm_psb_private *dev_priv);</div><div class='add'>+extern void psb_mmu_driver_takedown(struct psb_mmu_driver *driver);</div><div class='add'>+extern struct psb_mmu_pd *psb_mmu_get_default_pd(struct psb_mmu_driver</div><div class='add'>+						 *driver);</div><div class='add'>+extern void psb_mmu_mirror_gtt(struct psb_mmu_pd *pd, uint32_t mmu_offset,</div><div class='add'>+			       uint32_t gtt_start, uint32_t gtt_pages);</div><div class='add'>+extern struct psb_mmu_pd *psb_mmu_alloc_pd(struct psb_mmu_driver *driver,</div><div class='add'>+					   int trap_pagefaults,</div><div class='add'>+					   int invalid_type);</div><div class='add'>+extern void psb_mmu_free_pagedir(struct psb_mmu_pd *pd);</div><div class='add'>+extern void psb_mmu_flush(struct psb_mmu_driver *driver, int rc_prot);</div><div class='add'>+extern void psb_mmu_remove_pfn_sequence(struct psb_mmu_pd *pd,</div><div class='add'>+					unsigned long address,</div><div class='add'>+					uint32_t num_pages);</div><div class='add'>+extern int psb_mmu_insert_pfn_sequence(struct psb_mmu_pd *pd,</div><div class='add'>+				       uint32_t start_pfn,</div><div class='add'>+				       unsigned long address,</div><div class='add'>+				       uint32_t num_pages, int type);</div><div class='add'>+extern int psb_mmu_virtual_to_pfn(struct psb_mmu_pd *pd, uint32_t virtual,</div><div class='add'>+				  unsigned long *pfn);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable / disable MMU for different requestors.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+extern void psb_mmu_set_pd_context(struct psb_mmu_pd *pd, int hw_context);</div><div class='add'>+extern int psb_mmu_insert_pages(struct psb_mmu_pd *pd, struct page **pages,</div><div class='add'>+				unsigned long address, uint32_t num_pages,</div><div class='add'>+				uint32_t desired_tile_stride,</div><div class='add'>+				uint32_t hw_tile_stride, int type);</div><div class='add'>+extern void psb_mmu_remove_pages(struct psb_mmu_pd *pd,</div><div class='add'>+				 unsigned long address, uint32_t num_pages,</div><div class='add'>+				 uint32_t desired_tile_stride,</div><div class='add'>+				 uint32_t hw_tile_stride);</div><div class='add'>+/*</div><div class='add'>+ *psb_irq.c</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+extern irqreturn_t psb_irq_handler(DRM_IRQ_ARGS);</div><div class='add'>+extern int psb_irq_enable_dpst(struct drm_device *dev);</div><div class='add'>+extern int psb_irq_disable_dpst(struct drm_device *dev);</div><div class='add'>+extern void psb_irq_preinstall(struct drm_device *dev);</div><div class='add'>+extern int psb_irq_postinstall(struct drm_device *dev);</div><div class='add'>+extern void psb_irq_uninstall(struct drm_device *dev);</div><div class='add'>+extern void psb_irq_turn_on_dpst(struct drm_device *dev);</div><div class='add'>+extern void psb_irq_turn_off_dpst(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+extern void psb_irq_uninstall_islands(struct drm_device *dev, int hw_islands);</div><div class='add'>+extern int psb_vblank_wait2(struct drm_device *dev, unsigned int *sequence);</div><div class='add'>+extern int psb_vblank_wait(struct drm_device *dev, unsigned int *sequence);</div><div class='add'>+extern int psb_enable_vblank(struct drm_device *dev, int crtc);</div><div class='add'>+extern void psb_disable_vblank(struct drm_device *dev, int crtc);</div><div class='add'>+void</div><div class='add'>+psb_enable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+psb_disable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask);</div><div class='add'>+</div><div class='add'>+extern u32 psb_get_vblank_counter(struct drm_device *dev, int crtc);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * intel_opregion.c</div><div class='add'>+ */</div><div class='add'>+extern int gma_intel_opregion_init(struct drm_device *dev);</div><div class='add'>+extern int gma_intel_opregion_exit(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * framebuffer.c</div><div class='add'>+ */</div><div class='add'>+extern int psbfb_probed(struct drm_device *dev);</div><div class='add'>+extern int psbfb_remove(struct drm_device *dev,</div><div class='add'>+			struct drm_framebuffer *fb);</div><div class='add'>+/*</div><div class='add'>+ * accel_2d.c</div><div class='add'>+ */</div><div class='add'>+extern void psbfb_copyarea(struct fb_info *info,</div><div class='add'>+					const struct fb_copyarea *region);</div><div class='add'>+extern int psbfb_sync(struct fb_info *info);</div><div class='add'>+extern void psb_spank(struct drm_psb_private *dev_priv);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * psb_reset.c</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+extern void psb_lid_timer_init(struct drm_psb_private *dev_priv);</div><div class='add'>+extern void psb_lid_timer_takedown(struct drm_psb_private *dev_priv);</div><div class='add'>+extern void psb_print_pagefault(struct drm_psb_private *dev_priv);</div><div class='add'>+</div><div class='add'>+/* modesetting */</div><div class='add'>+extern void psb_modeset_init(struct drm_device *dev);</div><div class='add'>+extern void psb_modeset_cleanup(struct drm_device *dev);</div><div class='add'>+extern int psb_fbdev_init(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+/* backlight.c */</div><div class='add'>+int gma_backlight_init(struct drm_device *dev);</div><div class='add'>+void gma_backlight_exit(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+/* oaktrail_crtc.c */</div><div class='add'>+extern const struct drm_crtc_helper_funcs oaktrail_helper_funcs;</div><div class='add'>+</div><div class='add'>+/* oaktrail_lvds.c */</div><div class='add'>+extern void oaktrail_lvds_init(struct drm_device *dev,</div><div class='add'>+		    struct psb_intel_mode_device *mode_dev);</div><div class='add'>+</div><div class='add'>+/* psb_intel_display.c */</div><div class='add'>+extern const struct drm_crtc_helper_funcs psb_intel_helper_funcs;</div><div class='add'>+extern const struct drm_crtc_funcs psb_intel_crtc_funcs;</div><div class='add'>+</div><div class='add'>+/* psb_intel_lvds.c */</div><div class='add'>+extern const struct drm_connector_helper_funcs</div><div class='add'>+					psb_intel_lvds_connector_helper_funcs;</div><div class='add'>+extern const struct drm_connector_funcs psb_intel_lvds_connector_funcs;</div><div class='add'>+</div><div class='add'>+/* gem.c */</div><div class='add'>+extern int psb_gem_init_object(struct drm_gem_object *obj);</div><div class='add'>+extern void psb_gem_free_object(struct drm_gem_object *obj);</div><div class='add'>+extern int psb_gem_get_aperture(struct drm_device *dev, void *data,</div><div class='add'>+			struct drm_file *file);</div><div class='add'>+extern int psb_gem_dumb_create(struct drm_file *file, struct drm_device *dev,</div><div class='add'>+			struct drm_mode_create_dumb *args);</div><div class='add'>+extern int psb_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev,</div><div class='add'>+			uint32_t handle);</div><div class='add'>+extern int psb_gem_dumb_map_gtt(struct drm_file *file, struct drm_device *dev,</div><div class='add'>+			uint32_t handle, uint64_t *offset);</div><div class='add'>+extern int psb_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);</div><div class='add'>+extern int psb_gem_create_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			struct drm_file *file);</div><div class='add'>+extern int psb_gem_mmap_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+					struct drm_file *file);</div><div class='add'>+</div><div class='add'>+/* psb_device.c */</div><div class='add'>+extern const struct psb_ops psb_chip_ops;</div><div class='add'>+</div><div class='add'>+/* oaktrail_device.c */</div><div class='add'>+extern const struct psb_ops oaktrail_chip_ops;</div><div class='add'>+</div><div class='add'>+/* cdv_device.c */</div><div class='add'>+extern const struct psb_ops cdv_chip_ops;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Debug print bits setting</div><div class='add'>+ */</div><div class='add'>+#define PSB_D_GENERAL (1 &lt;&lt; 0)</div><div class='add'>+#define PSB_D_INIT    (1 &lt;&lt; 1)</div><div class='add'>+#define PSB_D_IRQ     (1 &lt;&lt; 2)</div><div class='add'>+#define PSB_D_ENTRY   (1 &lt;&lt; 3)</div><div class='add'>+/* debug the get H/V BP/FP count */</div><div class='add'>+#define PSB_D_HV      (1 &lt;&lt; 4)</div><div class='add'>+#define PSB_D_DBI_BF  (1 &lt;&lt; 5)</div><div class='add'>+#define PSB_D_PM      (1 &lt;&lt; 6)</div><div class='add'>+#define PSB_D_RENDER  (1 &lt;&lt; 7)</div><div class='add'>+#define PSB_D_REG     (1 &lt;&lt; 8)</div><div class='add'>+#define PSB_D_MSVDX   (1 &lt;&lt; 9)</div><div class='add'>+#define PSB_D_TOPAZ   (1 &lt;&lt; 10)</div><div class='add'>+</div><div class='add'>+extern int drm_psb_no_fb;</div><div class='add'>+extern int drm_idle_check_interval;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Utilities</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline u32 MRST_MSG_READ32(uint port, uint offset)</div><div class='add'>+{</div><div class='add'>+	int mcr = (0xD0&lt;&lt;24) | (port &lt;&lt; 16) | (offset &lt;&lt; 8);</div><div class='add'>+	uint32_t ret_val = 0;</div><div class='add'>+	struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);</div><div class='add'>+	pci_write_config_dword(pci_root, 0xD0, mcr);</div><div class='add'>+	pci_read_config_dword(pci_root, 0xD4, &amp;ret_val);</div><div class='add'>+	pci_dev_put(pci_root);</div><div class='add'>+	return ret_val;</div><div class='add'>+}</div><div class='add'>+static inline void MRST_MSG_WRITE32(uint port, uint offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	int mcr = (0xE0&lt;&lt;24) | (port &lt;&lt; 16) | (offset &lt;&lt; 8) | 0xF0;</div><div class='add'>+	struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);</div><div class='add'>+	pci_write_config_dword(pci_root, 0xD4, value);</div><div class='add'>+	pci_write_config_dword(pci_root, 0xD0, mcr);</div><div class='add'>+	pci_dev_put(pci_root);</div><div class='add'>+}</div><div class='add'>+static inline u32 MDFLD_MSG_READ32(uint port, uint offset)</div><div class='add'>+{</div><div class='add'>+	int mcr = (0x10&lt;&lt;24) | (port &lt;&lt; 16) | (offset &lt;&lt; 8);</div><div class='add'>+	uint32_t ret_val = 0;</div><div class='add'>+	struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);</div><div class='add'>+	pci_write_config_dword(pci_root, 0xD0, mcr);</div><div class='add'>+	pci_read_config_dword(pci_root, 0xD4, &amp;ret_val);</div><div class='add'>+	pci_dev_put(pci_root);</div><div class='add'>+	return ret_val;</div><div class='add'>+}</div><div class='add'>+static inline void MDFLD_MSG_WRITE32(uint port, uint offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	int mcr = (0x11&lt;&lt;24) | (port &lt;&lt; 16) | (offset &lt;&lt; 8) | 0xF0;</div><div class='add'>+	struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);</div><div class='add'>+	pci_write_config_dword(pci_root, 0xD4, value);</div><div class='add'>+	pci_write_config_dword(pci_root, 0xD0, mcr);</div><div class='add'>+	pci_dev_put(pci_root);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline uint32_t REGISTER_READ(struct drm_device *dev, uint32_t reg)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	return ioread32(dev_priv-&gt;vdc_reg + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define REG_READ(reg)	       REGISTER_READ(dev, (reg))</div><div class='add'>+</div><div class='add'>+static inline void REGISTER_WRITE(struct drm_device *dev, uint32_t reg,</div><div class='add'>+				      uint32_t val)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	iowrite32((val), dev_priv-&gt;vdc_reg + (reg));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define REG_WRITE(reg, val)	REGISTER_WRITE(dev, (reg), (val))</div><div class='add'>+</div><div class='add'>+static inline void REGISTER_WRITE16(struct drm_device *dev,</div><div class='add'>+					uint32_t reg, uint32_t val)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	iowrite16((val), dev_priv-&gt;vdc_reg + (reg));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define REG_WRITE16(reg, val)	  REGISTER_WRITE16(dev, (reg), (val))</div><div class='add'>+</div><div class='add'>+static inline void REGISTER_WRITE8(struct drm_device *dev,</div><div class='add'>+				       uint32_t reg, uint32_t val)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	iowrite8((val), dev_priv-&gt;vdc_reg + (reg));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define REG_WRITE8(reg, val)		REGISTER_WRITE8(dev, (reg), (val))</div><div class='add'>+</div><div class='add'>+#define PSB_WVDC32(_val, _offs)		iowrite32(_val, dev_priv-&gt;vdc_reg + (_offs))</div><div class='add'>+#define PSB_RVDC32(_offs)		ioread32(dev_priv-&gt;vdc_reg + (_offs))</div><div class='add'>+</div><div class='add'>+/* #define TRAP_SGX_PM_FAULT 1 */</div><div class='add'>+#ifdef TRAP_SGX_PM_FAULT</div><div class='add'>+#define PSB_RSGX32(_offs)						\</div><div class='add'>+({									\</div><div class='add'>+	if (inl(dev_priv-&gt;apm_base + PSB_APM_STS) &amp; 0x3) {		\</div><div class='add'>+		printk(KERN_ERR						\</div><div class='add'>+			"access sgx when it's off!! (READ) %s, %d\n",	\</div><div class='add'>+	       __FILE__, __LINE__);					\</div><div class='add'>+		melay(1000);						\</div><div class='add'>+	}								\</div><div class='add'>+	ioread32(dev_priv-&gt;sgx_reg + (_offs));				\</div><div class='add'>+})</div><div class='add'>+#else</div><div class='add'>+#define PSB_RSGX32(_offs)		ioread32(dev_priv-&gt;sgx_reg + (_offs))</div><div class='add'>+#endif</div><div class='add'>+#define PSB_WSGX32(_val, _offs)		iowrite32(_val, dev_priv-&gt;sgx_reg + (_offs))</div><div class='add'>+</div><div class='add'>+#define MSVDX_REG_DUMP 0</div><div class='add'>+</div><div class='add'>+#define PSB_WMSVDX32(_val, _offs)	iowrite32(_val, dev_priv-&gt;msvdx_reg + (_offs))</div><div class='add'>+#define PSB_RMSVDX32(_offs)		ioread32(dev_priv-&gt;msvdx_reg + (_offs))</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/psb_intel_display.c b/drivers/gpu/drm/gma500/psb_intel_display.c<br/>new file mode 100644<br/>index 000000000000..49e983508d5c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/psb_intel_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/psb_intel_display.c</a></div><div class='hunk'>@@ -0,0 +1,1446 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2006-2011 Intel Corporation</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Eric Anholt &lt;eric@anholt.net&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include "framebuffer.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_intel_drv.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include "psb_intel_display.h"</div><div class='add'>+#include "power.h"</div><div class='add'>+</div><div class='add'>+struct psb_intel_clock_t {</div><div class='add'>+	/* given values */</div><div class='add'>+	int n;</div><div class='add'>+	int m1, m2;</div><div class='add'>+	int p1, p2;</div><div class='add'>+	/* derived values */</div><div class='add'>+	int dot;</div><div class='add'>+	int vco;</div><div class='add'>+	int m;</div><div class='add'>+	int p;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct psb_intel_range_t {</div><div class='add'>+	int min, max;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct psb_intel_p2_t {</div><div class='add'>+	int dot_limit;</div><div class='add'>+	int p2_slow, p2_fast;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define INTEL_P2_NUM		      2</div><div class='add'>+</div><div class='add'>+struct psb_intel_limit_t {</div><div class='add'>+	struct psb_intel_range_t dot, vco, n, m, m1, m2, p, p1;</div><div class='add'>+	struct psb_intel_p2_t p2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define I8XX_DOT_MIN		  25000</div><div class='add'>+#define I8XX_DOT_MAX		 350000</div><div class='add'>+#define I8XX_VCO_MIN		 930000</div><div class='add'>+#define I8XX_VCO_MAX		1400000</div><div class='add'>+#define I8XX_N_MIN		      3</div><div class='add'>+#define I8XX_N_MAX		     16</div><div class='add'>+#define I8XX_M_MIN		     96</div><div class='add'>+#define I8XX_M_MAX		    140</div><div class='add'>+#define I8XX_M1_MIN		     18</div><div class='add'>+#define I8XX_M1_MAX		     26</div><div class='add'>+#define I8XX_M2_MIN		      6</div><div class='add'>+#define I8XX_M2_MAX		     16</div><div class='add'>+#define I8XX_P_MIN		      4</div><div class='add'>+#define I8XX_P_MAX		    128</div><div class='add'>+#define I8XX_P1_MIN		      2</div><div class='add'>+#define I8XX_P1_MAX		     33</div><div class='add'>+#define I8XX_P1_LVDS_MIN	      1</div><div class='add'>+#define I8XX_P1_LVDS_MAX	      6</div><div class='add'>+#define I8XX_P2_SLOW		      4</div><div class='add'>+#define I8XX_P2_FAST		      2</div><div class='add'>+#define I8XX_P2_LVDS_SLOW	      14</div><div class='add'>+#define I8XX_P2_LVDS_FAST	      14	/* No fast option */</div><div class='add'>+#define I8XX_P2_SLOW_LIMIT	 165000</div><div class='add'>+</div><div class='add'>+#define I9XX_DOT_MIN		  20000</div><div class='add'>+#define I9XX_DOT_MAX		 400000</div><div class='add'>+#define I9XX_VCO_MIN		1400000</div><div class='add'>+#define I9XX_VCO_MAX		2800000</div><div class='add'>+#define I9XX_N_MIN		      3</div><div class='add'>+#define I9XX_N_MAX		      8</div><div class='add'>+#define I9XX_M_MIN		     70</div><div class='add'>+#define I9XX_M_MAX		    120</div><div class='add'>+#define I9XX_M1_MIN		     10</div><div class='add'>+#define I9XX_M1_MAX		     20</div><div class='add'>+#define I9XX_M2_MIN		      5</div><div class='add'>+#define I9XX_M2_MAX		      9</div><div class='add'>+#define I9XX_P_SDVO_DAC_MIN	      5</div><div class='add'>+#define I9XX_P_SDVO_DAC_MAX	     80</div><div class='add'>+#define I9XX_P_LVDS_MIN		      7</div><div class='add'>+#define I9XX_P_LVDS_MAX		     98</div><div class='add'>+#define I9XX_P1_MIN		      1</div><div class='add'>+#define I9XX_P1_MAX		      8</div><div class='add'>+#define I9XX_P2_SDVO_DAC_SLOW		     10</div><div class='add'>+#define I9XX_P2_SDVO_DAC_FAST		      5</div><div class='add'>+#define I9XX_P2_SDVO_DAC_SLOW_LIMIT	 200000</div><div class='add'>+#define I9XX_P2_LVDS_SLOW		     14</div><div class='add'>+#define I9XX_P2_LVDS_FAST		      7</div><div class='add'>+#define I9XX_P2_LVDS_SLOW_LIMIT		 112000</div><div class='add'>+</div><div class='add'>+#define INTEL_LIMIT_I8XX_DVO_DAC    0</div><div class='add'>+#define INTEL_LIMIT_I8XX_LVDS	    1</div><div class='add'>+#define INTEL_LIMIT_I9XX_SDVO_DAC   2</div><div class='add'>+#define INTEL_LIMIT_I9XX_LVDS	    3</div><div class='add'>+</div><div class='add'>+static const struct psb_intel_limit_t psb_intel_limits[] = {</div><div class='add'>+	{			/* INTEL_LIMIT_I8XX_DVO_DAC */</div><div class='add'>+	 .dot = {.min = I8XX_DOT_MIN, .max = I8XX_DOT_MAX},</div><div class='add'>+	 .vco = {.min = I8XX_VCO_MIN, .max = I8XX_VCO_MAX},</div><div class='add'>+	 .n = {.min = I8XX_N_MIN, .max = I8XX_N_MAX},</div><div class='add'>+	 .m = {.min = I8XX_M_MIN, .max = I8XX_M_MAX},</div><div class='add'>+	 .m1 = {.min = I8XX_M1_MIN, .max = I8XX_M1_MAX},</div><div class='add'>+	 .m2 = {.min = I8XX_M2_MIN, .max = I8XX_M2_MAX},</div><div class='add'>+	 .p = {.min = I8XX_P_MIN, .max = I8XX_P_MAX},</div><div class='add'>+	 .p1 = {.min = I8XX_P1_MIN, .max = I8XX_P1_MAX},</div><div class='add'>+	 .p2 = {.dot_limit = I8XX_P2_SLOW_LIMIT,</div><div class='add'>+		.p2_slow = I8XX_P2_SLOW, .p2_fast = I8XX_P2_FAST},</div><div class='add'>+	 },</div><div class='add'>+	{			/* INTEL_LIMIT_I8XX_LVDS */</div><div class='add'>+	 .dot = {.min = I8XX_DOT_MIN, .max = I8XX_DOT_MAX},</div><div class='add'>+	 .vco = {.min = I8XX_VCO_MIN, .max = I8XX_VCO_MAX},</div><div class='add'>+	 .n = {.min = I8XX_N_MIN, .max = I8XX_N_MAX},</div><div class='add'>+	 .m = {.min = I8XX_M_MIN, .max = I8XX_M_MAX},</div><div class='add'>+	 .m1 = {.min = I8XX_M1_MIN, .max = I8XX_M1_MAX},</div><div class='add'>+	 .m2 = {.min = I8XX_M2_MIN, .max = I8XX_M2_MAX},</div><div class='add'>+	 .p = {.min = I8XX_P_MIN, .max = I8XX_P_MAX},</div><div class='add'>+	 .p1 = {.min = I8XX_P1_LVDS_MIN, .max = I8XX_P1_LVDS_MAX},</div><div class='add'>+	 .p2 = {.dot_limit = I8XX_P2_SLOW_LIMIT,</div><div class='add'>+		.p2_slow = I8XX_P2_LVDS_SLOW, .p2_fast = I8XX_P2_LVDS_FAST},</div><div class='add'>+	 },</div><div class='add'>+	{			/* INTEL_LIMIT_I9XX_SDVO_DAC */</div><div class='add'>+	 .dot = {.min = I9XX_DOT_MIN, .max = I9XX_DOT_MAX},</div><div class='add'>+	 .vco = {.min = I9XX_VCO_MIN, .max = I9XX_VCO_MAX},</div><div class='add'>+	 .n = {.min = I9XX_N_MIN, .max = I9XX_N_MAX},</div><div class='add'>+	 .m = {.min = I9XX_M_MIN, .max = I9XX_M_MAX},</div><div class='add'>+	 .m1 = {.min = I9XX_M1_MIN, .max = I9XX_M1_MAX},</div><div class='add'>+	 .m2 = {.min = I9XX_M2_MIN, .max = I9XX_M2_MAX},</div><div class='add'>+	 .p = {.min = I9XX_P_SDVO_DAC_MIN, .max = I9XX_P_SDVO_DAC_MAX},</div><div class='add'>+	 .p1 = {.min = I9XX_P1_MIN, .max = I9XX_P1_MAX},</div><div class='add'>+	 .p2 = {.dot_limit = I9XX_P2_SDVO_DAC_SLOW_LIMIT,</div><div class='add'>+		.p2_slow = I9XX_P2_SDVO_DAC_SLOW, .p2_fast =</div><div class='add'>+		I9XX_P2_SDVO_DAC_FAST},</div><div class='add'>+	 },</div><div class='add'>+	{			/* INTEL_LIMIT_I9XX_LVDS */</div><div class='add'>+	 .dot = {.min = I9XX_DOT_MIN, .max = I9XX_DOT_MAX},</div><div class='add'>+	 .vco = {.min = I9XX_VCO_MIN, .max = I9XX_VCO_MAX},</div><div class='add'>+	 .n = {.min = I9XX_N_MIN, .max = I9XX_N_MAX},</div><div class='add'>+	 .m = {.min = I9XX_M_MIN, .max = I9XX_M_MAX},</div><div class='add'>+	 .m1 = {.min = I9XX_M1_MIN, .max = I9XX_M1_MAX},</div><div class='add'>+	 .m2 = {.min = I9XX_M2_MIN, .max = I9XX_M2_MAX},</div><div class='add'>+	 .p = {.min = I9XX_P_LVDS_MIN, .max = I9XX_P_LVDS_MAX},</div><div class='add'>+	 .p1 = {.min = I9XX_P1_MIN, .max = I9XX_P1_MAX},</div><div class='add'>+	 /* The single-channel range is 25-112Mhz, and dual-channel</div><div class='add'>+	  * is 80-224Mhz.  Prefer single channel as much as possible.</div><div class='add'>+	  */</div><div class='add'>+	 .p2 = {.dot_limit = I9XX_P2_LVDS_SLOW_LIMIT,</div><div class='add'>+		.p2_slow = I9XX_P2_LVDS_SLOW, .p2_fast = I9XX_P2_LVDS_FAST},</div><div class='add'>+	 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct psb_intel_limit_t *psb_intel_limit(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	const struct psb_intel_limit_t *limit;</div><div class='add'>+</div><div class='add'>+	if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS))</div><div class='add'>+		limit = &amp;psb_intel_limits[INTEL_LIMIT_I9XX_LVDS];</div><div class='add'>+	else</div><div class='add'>+		limit = &amp;psb_intel_limits[INTEL_LIMIT_I9XX_SDVO_DAC];</div><div class='add'>+	return limit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/** Derive the pixel clock for the given refclk and divisors for 8xx chips. */</div><div class='add'>+</div><div class='add'>+static void i8xx_clock(int refclk, struct psb_intel_clock_t *clock)</div><div class='add'>+{</div><div class='add'>+	clock-&gt;m = 5 * (clock-&gt;m1 + 2) + (clock-&gt;m2 + 2);</div><div class='add'>+	clock-&gt;p = clock-&gt;p1 * clock-&gt;p2;</div><div class='add'>+	clock-&gt;vco = refclk * clock-&gt;m / (clock-&gt;n + 2);</div><div class='add'>+	clock-&gt;dot = clock-&gt;vco / clock-&gt;p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/** Derive the pixel clock for the given refclk and divisors for 9xx chips. */</div><div class='add'>+</div><div class='add'>+static void i9xx_clock(int refclk, struct psb_intel_clock_t *clock)</div><div class='add'>+{</div><div class='add'>+	clock-&gt;m = 5 * (clock-&gt;m1 + 2) + (clock-&gt;m2 + 2);</div><div class='add'>+	clock-&gt;p = clock-&gt;p1 * clock-&gt;p2;</div><div class='add'>+	clock-&gt;vco = refclk * clock-&gt;m / (clock-&gt;n + 2);</div><div class='add'>+	clock-&gt;dot = clock-&gt;vco / clock-&gt;p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_intel_clock(struct drm_device *dev, int refclk,</div><div class='add'>+			struct psb_intel_clock_t *clock)</div><div class='add'>+{</div><div class='add'>+	return i9xx_clock(refclk, clock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Returns whether any output on the specified pipe is of the specified type</div><div class='add'>+ */</div><div class='add'>+bool psb_intel_pipe_has_type(struct drm_crtc *crtc, int type)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct drm_mode_config *mode_config = &amp;dev-&gt;mode_config;</div><div class='add'>+	struct drm_connector *l_entry;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(l_entry, &amp;mode_config-&gt;connector_list, head) {</div><div class='add'>+		if (l_entry-&gt;encoder &amp;&amp; l_entry-&gt;encoder-&gt;crtc == crtc) {</div><div class='add'>+			struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(l_entry);</div><div class='add'>+			if (psb_intel_encoder-&gt;type == type)</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'>+#define INTELPllInvalid(s)   { /* ErrorF (s) */; return false; }</div><div class='add'>+/**</div><div class='add'>+ * Returns whether the given set of divisors are valid for a given refclk with</div><div class='add'>+ * the given connectors.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static bool psb_intel_PLL_is_valid(struct drm_crtc *crtc,</div><div class='add'>+			       struct psb_intel_clock_t *clock)</div><div class='add'>+{</div><div class='add'>+	const struct psb_intel_limit_t *limit = psb_intel_limit(crtc);</div><div class='add'>+</div><div class='add'>+	if (clock-&gt;p1 &lt; limit-&gt;p1.min || limit-&gt;p1.max &lt; clock-&gt;p1)</div><div class='add'>+		INTELPllInvalid("p1 out of range\n");</div><div class='add'>+	if (clock-&gt;p &lt; limit-&gt;p.min || limit-&gt;p.max &lt; clock-&gt;p)</div><div class='add'>+		INTELPllInvalid("p out of range\n");</div><div class='add'>+	if (clock-&gt;m2 &lt; limit-&gt;m2.min || limit-&gt;m2.max &lt; clock-&gt;m2)</div><div class='add'>+		INTELPllInvalid("m2 out of range\n");</div><div class='add'>+	if (clock-&gt;m1 &lt; limit-&gt;m1.min || limit-&gt;m1.max &lt; clock-&gt;m1)</div><div class='add'>+		INTELPllInvalid("m1 out of range\n");</div><div class='add'>+	if (clock-&gt;m1 &lt;= clock-&gt;m2)</div><div class='add'>+		INTELPllInvalid("m1 &lt;= m2\n");</div><div class='add'>+	if (clock-&gt;m &lt; limit-&gt;m.min || limit-&gt;m.max &lt; clock-&gt;m)</div><div class='add'>+		INTELPllInvalid("m out of range\n");</div><div class='add'>+	if (clock-&gt;n &lt; limit-&gt;n.min || limit-&gt;n.max &lt; clock-&gt;n)</div><div class='add'>+		INTELPllInvalid("n out of range\n");</div><div class='add'>+	if (clock-&gt;vco &lt; limit-&gt;vco.min || limit-&gt;vco.max &lt; clock-&gt;vco)</div><div class='add'>+		INTELPllInvalid("vco out of range\n");</div><div class='add'>+	/* XXX: We may need to be checking "Dot clock"</div><div class='add'>+	 * depending on the multiplier, connector, etc.,</div><div class='add'>+	 * rather than just a single range.</div><div class='add'>+	 */</div><div class='add'>+	if (clock-&gt;dot &lt; limit-&gt;dot.min || limit-&gt;dot.max &lt; clock-&gt;dot)</div><div class='add'>+		INTELPllInvalid("dot out of range\n");</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'>+ * Returns a set of divisors for the desired target clock with the given</div><div class='add'>+ * refclk, or FALSE.  The returned values represent the clock equation:</div><div class='add'>+ * reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + 2) / p1 / p2.</div><div class='add'>+ */</div><div class='add'>+static bool psb_intel_find_best_PLL(struct drm_crtc *crtc, int target,</div><div class='add'>+				int refclk,</div><div class='add'>+				struct psb_intel_clock_t *best_clock)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct psb_intel_clock_t clock;</div><div class='add'>+	const struct psb_intel_limit_t *limit = psb_intel_limit(crtc);</div><div class='add'>+	int err = target;</div><div class='add'>+</div><div class='add'>+	if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &amp;&amp;</div><div class='add'>+	    (REG_READ(LVDS) &amp; LVDS_PORT_EN) != 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * For LVDS, if the panel is on, just rely on its current</div><div class='add'>+		 * settings for dual-channel.  We haven't figured out how to</div><div class='add'>+		 * reliably set up different single/dual channel state, if we</div><div class='add'>+		 * even can.</div><div class='add'>+		 */</div><div class='add'>+		if ((REG_READ(LVDS) &amp; LVDS_CLKB_POWER_MASK) ==</div><div class='add'>+		    LVDS_CLKB_POWER_UP)</div><div class='add'>+			clock.p2 = limit-&gt;p2.p2_fast;</div><div class='add'>+		else</div><div class='add'>+			clock.p2 = limit-&gt;p2.p2_slow;</div><div class='add'>+	} else {</div><div class='add'>+		if (target &lt; limit-&gt;p2.dot_limit)</div><div class='add'>+			clock.p2 = limit-&gt;p2.p2_slow;</div><div class='add'>+		else</div><div class='add'>+			clock.p2 = limit-&gt;p2.p2_fast;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(best_clock, 0, sizeof(*best_clock));</div><div class='add'>+</div><div class='add'>+	for (clock.m1 = limit-&gt;m1.min; clock.m1 &lt;= limit-&gt;m1.max;</div><div class='add'>+	     clock.m1++) {</div><div class='add'>+		for (clock.m2 = limit-&gt;m2.min;</div><div class='add'>+		     clock.m2 &lt; clock.m1 &amp;&amp; clock.m2 &lt;= limit-&gt;m2.max;</div><div class='add'>+		     clock.m2++) {</div><div class='add'>+			for (clock.n = limit-&gt;n.min;</div><div class='add'>+			     clock.n &lt;= limit-&gt;n.max; clock.n++) {</div><div class='add'>+				for (clock.p1 = limit-&gt;p1.min;</div><div class='add'>+				     clock.p1 &lt;= limit-&gt;p1.max;</div><div class='add'>+				     clock.p1++) {</div><div class='add'>+					int this_err;</div><div class='add'>+</div><div class='add'>+					psb_intel_clock(dev, refclk, &amp;clock);</div><div class='add'>+</div><div class='add'>+					if (!psb_intel_PLL_is_valid</div><div class='add'>+					    (crtc, &amp;clock))</div><div class='add'>+						continue;</div><div class='add'>+</div><div class='add'>+					this_err = abs(clock.dot - target);</div><div class='add'>+					if (this_err &lt; err) {</div><div class='add'>+						*best_clock = clock;</div><div class='add'>+						err = this_err;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err != target;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_intel_wait_for_vblank(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	/* Wait for 20ms, i.e. one cycle at 50hz. */</div><div class='add'>+	mdelay(20);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_intel_pipe_set_base(struct drm_crtc *crtc,</div><div class='add'>+			    int x, int y, struct drm_framebuffer *old_fb)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	/* struct drm_i915_master_private *master_priv; */</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	struct psb_framebuffer *psbfb = to_psb_fb(crtc-&gt;fb);</div><div class='add'>+	int pipe = psb_intel_crtc-&gt;pipe;</div><div class='add'>+	unsigned long start, offset;</div><div class='add'>+	int dspbase = (pipe == 0 ? DSPABASE : DSPBBASE);</div><div class='add'>+	int dspsurf = (pipe == 0 ? DSPASURF : DSPBSURF);</div><div class='add'>+	int dspstride = (pipe == 0) ? DSPASTRIDE : DSPBSTRIDE;</div><div class='add'>+	int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;</div><div class='add'>+	u32 dspcntr;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!gma_power_begin(dev, true))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* no fb bound */</div><div class='add'>+	if (!crtc-&gt;fb) {</div><div class='add'>+		dev_dbg(dev-&gt;dev, "No FB bound\n");</div><div class='add'>+		goto psb_intel_pipe_cleaner;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We are displaying this buffer, make sure it is actually loaded</div><div class='add'>+	   into the GTT */</div><div class='add'>+	ret = psb_gtt_pin(psbfb-&gt;gtt);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto psb_intel_pipe_set_base_exit;</div><div class='add'>+	start = psbfb-&gt;gtt-&gt;offset;</div><div class='add'>+</div><div class='add'>+	offset = y * crtc-&gt;fb-&gt;pitches[0] + x * (crtc-&gt;fb-&gt;bits_per_pixel / 8);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(dspstride, crtc-&gt;fb-&gt;pitches[0]);</div><div class='add'>+</div><div class='add'>+	dspcntr = REG_READ(dspcntr_reg);</div><div class='add'>+	dspcntr &amp;= ~DISPPLANE_PIXFORMAT_MASK;</div><div class='add'>+</div><div class='add'>+	switch (crtc-&gt;fb-&gt;bits_per_pixel) {</div><div class='add'>+	case 8:</div><div class='add'>+		dspcntr |= DISPPLANE_8BPP;</div><div class='add'>+		break;</div><div class='add'>+	case 16:</div><div class='add'>+		if (crtc-&gt;fb-&gt;depth == 15)</div><div class='add'>+			dspcntr |= DISPPLANE_15_16BPP;</div><div class='add'>+		else</div><div class='add'>+			dspcntr |= DISPPLANE_16BPP;</div><div class='add'>+		break;</div><div class='add'>+	case 24:</div><div class='add'>+	case 32:</div><div class='add'>+		dspcntr |= DISPPLANE_32BPP_NO_ALPHA;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev-&gt;dev, "Unknown color depth\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		psb_gtt_unpin(psbfb-&gt;gtt);</div><div class='add'>+		goto psb_intel_pipe_set_base_exit;</div><div class='add'>+	}</div><div class='add'>+	REG_WRITE(dspcntr_reg, dspcntr);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (0 /* FIXMEAC - check what PSB needs */) {</div><div class='add'>+		REG_WRITE(dspbase, offset);</div><div class='add'>+		REG_READ(dspbase);</div><div class='add'>+		REG_WRITE(dspsurf, start);</div><div class='add'>+		REG_READ(dspsurf);</div><div class='add'>+	} else {</div><div class='add'>+		REG_WRITE(dspbase, start + offset);</div><div class='add'>+		REG_READ(dspbase);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+psb_intel_pipe_cleaner:</div><div class='add'>+	/* If there was a previous display we can now unpin it */</div><div class='add'>+	if (old_fb)</div><div class='add'>+		psb_gtt_unpin(to_psb_fb(old_fb)-&gt;gtt);</div><div class='add'>+</div><div class='add'>+psb_intel_pipe_set_base_exit:</div><div class='add'>+	gma_power_end(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Sets the power management mode of the pipe and plane.</div><div class='add'>+ *</div><div class='add'>+ * This code should probably grow support for turning the cursor off and back</div><div class='add'>+ * on appropriately at the same time as we're turning the pipe off/on.</div><div class='add'>+ */</div><div class='add'>+static void psb_intel_crtc_dpms(struct drm_crtc *crtc, int mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	/* struct drm_i915_master_private *master_priv; */</div><div class='add'>+	/* struct drm_i915_private *dev_priv = dev-&gt;dev_private; */</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	int pipe = psb_intel_crtc-&gt;pipe;</div><div class='add'>+	int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;</div><div class='add'>+	int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;</div><div class='add'>+	int dspbase_reg = (pipe == 0) ? DSPABASE : DSPBBASE;</div><div class='add'>+	int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;</div><div class='add'>+	u32 temp;</div><div class='add'>+	bool enabled;</div><div class='add'>+</div><div class='add'>+	/* XXX: When our outputs are all unaware of DPMS modes other than off</div><div class='add'>+	 * and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC.</div><div class='add'>+	 */</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case DRM_MODE_DPMS_ON:</div><div class='add'>+	case DRM_MODE_DPMS_STANDBY:</div><div class='add'>+	case DRM_MODE_DPMS_SUSPEND:</div><div class='add'>+		/* Enable the DPLL */</div><div class='add'>+		temp = REG_READ(dpll_reg);</div><div class='add'>+		if ((temp &amp; DPLL_VCO_ENABLE) == 0) {</div><div class='add'>+			REG_WRITE(dpll_reg, temp);</div><div class='add'>+			REG_READ(dpll_reg);</div><div class='add'>+			/* Wait for the clocks to stabilize. */</div><div class='add'>+			udelay(150);</div><div class='add'>+			REG_WRITE(dpll_reg, temp | DPLL_VCO_ENABLE);</div><div class='add'>+			REG_READ(dpll_reg);</div><div class='add'>+			/* Wait for the clocks to stabilize. */</div><div class='add'>+			udelay(150);</div><div class='add'>+			REG_WRITE(dpll_reg, temp | DPLL_VCO_ENABLE);</div><div class='add'>+			REG_READ(dpll_reg);</div><div class='add'>+			/* Wait for the clocks to stabilize. */</div><div class='add'>+			udelay(150);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Enable the pipe */</div><div class='add'>+		temp = REG_READ(pipeconf_reg);</div><div class='add'>+		if ((temp &amp; PIPEACONF_ENABLE) == 0)</div><div class='add'>+			REG_WRITE(pipeconf_reg, temp | PIPEACONF_ENABLE);</div><div class='add'>+</div><div class='add'>+		/* Enable the plane */</div><div class='add'>+		temp = REG_READ(dspcntr_reg);</div><div class='add'>+		if ((temp &amp; DISPLAY_PLANE_ENABLE) == 0) {</div><div class='add'>+			REG_WRITE(dspcntr_reg,</div><div class='add'>+				  temp | DISPLAY_PLANE_ENABLE);</div><div class='add'>+			/* Flush the plane changes */</div><div class='add'>+			REG_WRITE(dspbase_reg, REG_READ(dspbase_reg));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		psb_intel_crtc_load_lut(crtc);</div><div class='add'>+</div><div class='add'>+		/* Give the overlay scaler a chance to enable</div><div class='add'>+		 * if it's on this pipe */</div><div class='add'>+		/* psb_intel_crtc_dpms_video(crtc, true); TODO */</div><div class='add'>+		break;</div><div class='add'>+	case DRM_MODE_DPMS_OFF:</div><div class='add'>+		/* Give the overlay scaler a chance to disable</div><div class='add'>+		 * if it's on this pipe */</div><div class='add'>+		/* psb_intel_crtc_dpms_video(crtc, FALSE); TODO */</div><div class='add'>+</div><div class='add'>+		/* Disable the VGA plane that we never use */</div><div class='add'>+		REG_WRITE(VGACNTRL, VGA_DISP_DISABLE);</div><div class='add'>+</div><div class='add'>+		/* Disable display plane */</div><div class='add'>+		temp = REG_READ(dspcntr_reg);</div><div class='add'>+		if ((temp &amp; DISPLAY_PLANE_ENABLE) != 0) {</div><div class='add'>+			REG_WRITE(dspcntr_reg,</div><div class='add'>+				  temp &amp; ~DISPLAY_PLANE_ENABLE);</div><div class='add'>+			/* Flush the plane changes */</div><div class='add'>+			REG_WRITE(dspbase_reg, REG_READ(dspbase_reg));</div><div class='add'>+			REG_READ(dspbase_reg);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Next, disable display pipes */</div><div class='add'>+		temp = REG_READ(pipeconf_reg);</div><div class='add'>+		if ((temp &amp; PIPEACONF_ENABLE) != 0) {</div><div class='add'>+			REG_WRITE(pipeconf_reg, temp &amp; ~PIPEACONF_ENABLE);</div><div class='add'>+			REG_READ(pipeconf_reg);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Wait for vblank for the disable to take effect. */</div><div class='add'>+		psb_intel_wait_for_vblank(dev);</div><div class='add'>+</div><div class='add'>+		temp = REG_READ(dpll_reg);</div><div class='add'>+		if ((temp &amp; DPLL_VCO_ENABLE) != 0) {</div><div class='add'>+			REG_WRITE(dpll_reg, temp &amp; ~DPLL_VCO_ENABLE);</div><div class='add'>+			REG_READ(dpll_reg);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Wait for the clocks to turn off. */</div><div class='add'>+		udelay(150);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	enabled = crtc-&gt;enabled &amp;&amp; mode != DRM_MODE_DPMS_OFF;</div><div class='add'>+</div><div class='add'>+	/*Set FIFO Watermarks*/</div><div class='add'>+	REG_WRITE(DSPARB, 0x3F3E);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_intel_crtc_prepare(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct drm_crtc_helper_funcs *crtc_funcs = crtc-&gt;helper_private;</div><div class='add'>+	crtc_funcs-&gt;dpms(crtc, DRM_MODE_DPMS_OFF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_intel_crtc_commit(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct drm_crtc_helper_funcs *crtc_funcs = crtc-&gt;helper_private;</div><div class='add'>+	crtc_funcs-&gt;dpms(crtc, DRM_MODE_DPMS_ON);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_intel_encoder_prepare(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	struct drm_encoder_helper_funcs *encoder_funcs =</div><div class='add'>+	    encoder-&gt;helper_private;</div><div class='add'>+	/* lvds has its own version of prepare see psb_intel_lvds_prepare */</div><div class='add'>+	encoder_funcs-&gt;dpms(encoder, DRM_MODE_DPMS_OFF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_intel_encoder_commit(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	struct drm_encoder_helper_funcs *encoder_funcs =</div><div class='add'>+	    encoder-&gt;helper_private;</div><div class='add'>+	/* lvds has its own version of commit see psb_intel_lvds_commit */</div><div class='add'>+	encoder_funcs-&gt;dpms(encoder, DRM_MODE_DPMS_ON);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_intel_encoder_destroy(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_encoder *intel_encoder = to_psb_intel_encoder(encoder);</div><div class='add'>+</div><div class='add'>+	drm_encoder_cleanup(encoder);</div><div class='add'>+	kfree(intel_encoder);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_crtc_mode_fixup(struct drm_crtc *crtc,</div><div class='add'>+				  struct drm_display_mode *mode,</div><div class='add'>+				  struct drm_display_mode *adjusted_mode)</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'>+/**</div><div class='add'>+ * Return the pipe currently connected to the panel fitter,</div><div class='add'>+ * or -1 if the panel fitter is not present or not in use</div><div class='add'>+ */</div><div class='add'>+static int psb_intel_panel_fitter_pipe(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	u32 pfit_control;</div><div class='add'>+</div><div class='add'>+	pfit_control = REG_READ(PFIT_CONTROL);</div><div class='add'>+</div><div class='add'>+	/* See if the panel fitter is in use */</div><div class='add'>+	if ((pfit_control &amp; PFIT_ENABLE) == 0)</div><div class='add'>+		return -1;</div><div class='add'>+	/* Must be on PIPE 1 for PSB */</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_intel_crtc_mode_set(struct drm_crtc *crtc,</div><div class='add'>+			       struct drm_display_mode *mode,</div><div class='add'>+			       struct drm_display_mode *adjusted_mode,</div><div class='add'>+			       int x, int y,</div><div class='add'>+			       struct drm_framebuffer *old_fb)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	struct drm_crtc_helper_funcs *crtc_funcs = crtc-&gt;helper_private;</div><div class='add'>+	int pipe = psb_intel_crtc-&gt;pipe;</div><div class='add'>+	int fp_reg = (pipe == 0) ? FPA0 : FPB0;</div><div class='add'>+	int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;</div><div class='add'>+	int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;</div><div class='add'>+	int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;</div><div class='add'>+	int htot_reg = (pipe == 0) ? HTOTAL_A : HTOTAL_B;</div><div class='add'>+	int hblank_reg = (pipe == 0) ? HBLANK_A : HBLANK_B;</div><div class='add'>+	int hsync_reg = (pipe == 0) ? HSYNC_A : HSYNC_B;</div><div class='add'>+	int vtot_reg = (pipe == 0) ? VTOTAL_A : VTOTAL_B;</div><div class='add'>+	int vblank_reg = (pipe == 0) ? VBLANK_A : VBLANK_B;</div><div class='add'>+	int vsync_reg = (pipe == 0) ? VSYNC_A : VSYNC_B;</div><div class='add'>+	int dspsize_reg = (pipe == 0) ? DSPASIZE : DSPBSIZE;</div><div class='add'>+	int dsppos_reg = (pipe == 0) ? DSPAPOS : DSPBPOS;</div><div class='add'>+	int pipesrc_reg = (pipe == 0) ? PIPEASRC : PIPEBSRC;</div><div class='add'>+	int refclk;</div><div class='add'>+	struct psb_intel_clock_t clock;</div><div class='add'>+	u32 dpll = 0, fp = 0, dspcntr, pipeconf;</div><div class='add'>+	bool ok, is_sdvo = false, is_dvo = false;</div><div class='add'>+	bool is_crt = false, is_lvds = false, is_tv = false;</div><div class='add'>+	struct drm_mode_config *mode_config = &amp;dev-&gt;mode_config;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+</div><div class='add'>+	/* No scan out no play */</div><div class='add'>+	if (crtc-&gt;fb == NULL) {</div><div class='add'>+		crtc_funcs-&gt;mode_set_base(crtc, x, y, old_fb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(connector, &amp;mode_config-&gt;connector_list, head) {</div><div class='add'>+		struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(connector);</div><div class='add'>+</div><div class='add'>+		if (!connector-&gt;encoder</div><div class='add'>+		    || connector-&gt;encoder-&gt;crtc != crtc)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (psb_intel_encoder-&gt;type) {</div><div class='add'>+		case INTEL_OUTPUT_LVDS:</div><div class='add'>+			is_lvds = true;</div><div class='add'>+			break;</div><div class='add'>+		case INTEL_OUTPUT_SDVO:</div><div class='add'>+			is_sdvo = true;</div><div class='add'>+			break;</div><div class='add'>+		case INTEL_OUTPUT_DVO:</div><div class='add'>+			is_dvo = true;</div><div class='add'>+			break;</div><div class='add'>+		case INTEL_OUTPUT_TVOUT:</div><div class='add'>+			is_tv = true;</div><div class='add'>+			break;</div><div class='add'>+		case INTEL_OUTPUT_ANALOG:</div><div class='add'>+			is_crt = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	refclk = 96000;</div><div class='add'>+</div><div class='add'>+	ok = psb_intel_find_best_PLL(crtc, adjusted_mode-&gt;clock, refclk,</div><div class='add'>+				 &amp;clock);</div><div class='add'>+	if (!ok) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Couldn't find PLL settings for mode!\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fp = clock.n &lt;&lt; 16 | clock.m1 &lt;&lt; 8 | clock.m2;</div><div class='add'>+</div><div class='add'>+	dpll = DPLL_VGA_MODE_DIS;</div><div class='add'>+	if (is_lvds) {</div><div class='add'>+		dpll |= DPLLB_MODE_LVDS;</div><div class='add'>+		dpll |= DPLL_DVO_HIGH_SPEED;</div><div class='add'>+	} else</div><div class='add'>+		dpll |= DPLLB_MODE_DAC_SERIAL;</div><div class='add'>+	if (is_sdvo) {</div><div class='add'>+		int sdvo_pixel_multiply =</div><div class='add'>+			    adjusted_mode-&gt;clock / mode-&gt;clock;</div><div class='add'>+		dpll |= DPLL_DVO_HIGH_SPEED;</div><div class='add'>+		dpll |=</div><div class='add'>+		    (sdvo_pixel_multiply - 1) &lt;&lt; SDVO_MULTIPLIER_SHIFT_HIRES;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* compute bitmask from p1 value */</div><div class='add'>+	dpll |= (1 &lt;&lt; (clock.p1 - 1)) &lt;&lt; 16;</div><div class='add'>+	switch (clock.p2) {</div><div class='add'>+	case 5:</div><div class='add'>+		dpll |= DPLL_DAC_SERIAL_P2_CLOCK_DIV_5;</div><div class='add'>+		break;</div><div class='add'>+	case 7:</div><div class='add'>+		dpll |= DPLLB_LVDS_P2_CLOCK_DIV_7;</div><div class='add'>+		break;</div><div class='add'>+	case 10:</div><div class='add'>+		dpll |= DPLL_DAC_SERIAL_P2_CLOCK_DIV_10;</div><div class='add'>+		break;</div><div class='add'>+	case 14:</div><div class='add'>+		dpll |= DPLLB_LVDS_P2_CLOCK_DIV_14;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_tv) {</div><div class='add'>+		/* XXX: just matching BIOS for now */</div><div class='add'>+/*	dpll |= PLL_REF_INPUT_TVCLKINBC; */</div><div class='add'>+		dpll |= 3;</div><div class='add'>+	}</div><div class='add'>+	dpll |= PLL_REF_INPUT_DREFCLK;</div><div class='add'>+</div><div class='add'>+	/* setup pipeconf */</div><div class='add'>+	pipeconf = REG_READ(pipeconf_reg);</div><div class='add'>+</div><div class='add'>+	/* Set up the display plane register */</div><div class='add'>+	dspcntr = DISPPLANE_GAMMA_ENABLE;</div><div class='add'>+</div><div class='add'>+	if (pipe == 0)</div><div class='add'>+		dspcntr |= DISPPLANE_SEL_PIPE_A;</div><div class='add'>+	else</div><div class='add'>+		dspcntr |= DISPPLANE_SEL_PIPE_B;</div><div class='add'>+</div><div class='add'>+	dspcntr |= DISPLAY_PLANE_ENABLE;</div><div class='add'>+	pipeconf |= PIPEACONF_ENABLE;</div><div class='add'>+	dpll |= DPLL_VCO_ENABLE;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* Disable the panel fitter if it was on our pipe */</div><div class='add'>+	if (psb_intel_panel_fitter_pipe(dev) == pipe)</div><div class='add'>+		REG_WRITE(PFIT_CONTROL, 0);</div><div class='add'>+</div><div class='add'>+	drm_mode_debug_printmodeline(mode);</div><div class='add'>+</div><div class='add'>+	if (dpll &amp; DPLL_VCO_ENABLE) {</div><div class='add'>+		REG_WRITE(fp_reg, fp);</div><div class='add'>+		REG_WRITE(dpll_reg, dpll &amp; ~DPLL_VCO_ENABLE);</div><div class='add'>+		REG_READ(dpll_reg);</div><div class='add'>+		udelay(150);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The LVDS pin pair needs to be on before the DPLLs are enabled.</div><div class='add'>+	 * This is an exception to the general rule that mode_set doesn't turn</div><div class='add'>+	 * things on.</div><div class='add'>+	 */</div><div class='add'>+	if (is_lvds) {</div><div class='add'>+		u32 lvds = REG_READ(LVDS);</div><div class='add'>+</div><div class='add'>+		lvds &amp;= ~LVDS_PIPEB_SELECT;</div><div class='add'>+		if (pipe == 1)</div><div class='add'>+			lvds |= LVDS_PIPEB_SELECT;</div><div class='add'>+</div><div class='add'>+		lvds |= LVDS_PORT_EN | LVDS_A0A2_CLKA_POWER_UP;</div><div class='add'>+		/* Set the B0-B3 data pairs corresponding to</div><div class='add'>+		 * whether we're going to</div><div class='add'>+		 * set the DPLLs for dual-channel mode or not.</div><div class='add'>+		 */</div><div class='add'>+		lvds &amp;= ~(LVDS_B0B3_POWER_UP | LVDS_CLKB_POWER_UP);</div><div class='add'>+		if (clock.p2 == 7)</div><div class='add'>+			lvds |= LVDS_B0B3_POWER_UP | LVDS_CLKB_POWER_UP;</div><div class='add'>+</div><div class='add'>+		/* It would be nice to set 24 vs 18-bit mode (LVDS_A3_POWER_UP)</div><div class='add'>+		 * appropriately here, but we need to look more</div><div class='add'>+		 * thoroughly into how panels behave in the two modes.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		REG_WRITE(LVDS, lvds);</div><div class='add'>+		REG_READ(LVDS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_WRITE(fp_reg, fp);</div><div class='add'>+	REG_WRITE(dpll_reg, dpll);</div><div class='add'>+	REG_READ(dpll_reg);</div><div class='add'>+	/* Wait for the clocks to stabilize. */</div><div class='add'>+	udelay(150);</div><div class='add'>+</div><div class='add'>+	/* write it again -- the BIOS does, after all */</div><div class='add'>+	REG_WRITE(dpll_reg, dpll);</div><div class='add'>+</div><div class='add'>+	REG_READ(dpll_reg);</div><div class='add'>+	/* Wait for the clocks to stabilize. */</div><div class='add'>+	udelay(150);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(htot_reg, (adjusted_mode-&gt;crtc_hdisplay - 1) |</div><div class='add'>+		  ((adjusted_mode-&gt;crtc_htotal - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(hblank_reg, (adjusted_mode-&gt;crtc_hblank_start - 1) |</div><div class='add'>+		  ((adjusted_mode-&gt;crtc_hblank_end - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(hsync_reg, (adjusted_mode-&gt;crtc_hsync_start - 1) |</div><div class='add'>+		  ((adjusted_mode-&gt;crtc_hsync_end - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(vtot_reg, (adjusted_mode-&gt;crtc_vdisplay - 1) |</div><div class='add'>+		  ((adjusted_mode-&gt;crtc_vtotal - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(vblank_reg, (adjusted_mode-&gt;crtc_vblank_start - 1) |</div><div class='add'>+		  ((adjusted_mode-&gt;crtc_vblank_end - 1) &lt;&lt; 16));</div><div class='add'>+	REG_WRITE(vsync_reg, (adjusted_mode-&gt;crtc_vsync_start - 1) |</div><div class='add'>+		  ((adjusted_mode-&gt;crtc_vsync_end - 1) &lt;&lt; 16));</div><div class='add'>+	/* pipesrc and dspsize control the size that is scaled from,</div><div class='add'>+	 * which should always be the user's requested size.</div><div class='add'>+	 */</div><div class='add'>+	REG_WRITE(dspsize_reg,</div><div class='add'>+		  ((mode-&gt;vdisplay - 1) &lt;&lt; 16) | (mode-&gt;hdisplay - 1));</div><div class='add'>+	REG_WRITE(dsppos_reg, 0);</div><div class='add'>+	REG_WRITE(pipesrc_reg,</div><div class='add'>+		  ((mode-&gt;hdisplay - 1) &lt;&lt; 16) | (mode-&gt;vdisplay - 1));</div><div class='add'>+	REG_WRITE(pipeconf_reg, pipeconf);</div><div class='add'>+	REG_READ(pipeconf_reg);</div><div class='add'>+</div><div class='add'>+	psb_intel_wait_for_vblank(dev);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(dspcntr_reg, dspcntr);</div><div class='add'>+</div><div class='add'>+	/* Flush the plane changes */</div><div class='add'>+	crtc_funcs-&gt;mode_set_base(crtc, x, y, old_fb);</div><div class='add'>+</div><div class='add'>+	psb_intel_wait_for_vblank(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/** Loads the palette/gamma unit for the CRTC with the prepared values */</div><div class='add'>+void psb_intel_crtc_load_lut(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv =</div><div class='add'>+				(struct drm_psb_private *)dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	int palreg = PALETTE_A;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* The clocks have to be on to load the palette. */</div><div class='add'>+	if (!crtc-&gt;enabled)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (psb_intel_crtc-&gt;pipe) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		palreg = PALETTE_B;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		palreg = PALETTE_C;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev-&gt;dev, "Illegal Pipe Number.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		for (i = 0; i &lt; 256; i++) {</div><div class='add'>+			REG_WRITE(palreg + 4 * i,</div><div class='add'>+				  ((psb_intel_crtc-&gt;lut_r[i] +</div><div class='add'>+				  psb_intel_crtc-&gt;lut_adj[i]) &lt;&lt; 16) |</div><div class='add'>+				  ((psb_intel_crtc-&gt;lut_g[i] +</div><div class='add'>+				  psb_intel_crtc-&gt;lut_adj[i]) &lt;&lt; 8) |</div><div class='add'>+				  (psb_intel_crtc-&gt;lut_b[i] +</div><div class='add'>+				  psb_intel_crtc-&gt;lut_adj[i]));</div><div class='add'>+		}</div><div class='add'>+		gma_power_end(dev);</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; 256; i++) {</div><div class='add'>+			dev_priv-&gt;save_palette_a[i] =</div><div class='add'>+				  ((psb_intel_crtc-&gt;lut_r[i] +</div><div class='add'>+				  psb_intel_crtc-&gt;lut_adj[i]) &lt;&lt; 16) |</div><div class='add'>+				  ((psb_intel_crtc-&gt;lut_g[i] +</div><div class='add'>+				  psb_intel_crtc-&gt;lut_adj[i]) &lt;&lt; 8) |</div><div class='add'>+				  (psb_intel_crtc-&gt;lut_b[i] +</div><div class='add'>+				  psb_intel_crtc-&gt;lut_adj[i]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Save HW states of giving crtc</div><div class='add'>+ */</div><div class='add'>+static void psb_intel_crtc_save(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	/* struct drm_psb_private *dev_priv =</div><div class='add'>+			(struct drm_psb_private *)dev-&gt;dev_private; */</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	struct psb_intel_crtc_state *crtc_state = psb_intel_crtc-&gt;crtc_state;</div><div class='add'>+	int pipeA = (psb_intel_crtc-&gt;pipe == 0);</div><div class='add'>+	uint32_t paletteReg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!crtc_state) {</div><div class='add'>+		dev_err(dev-&gt;dev, "No CRTC state found\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	crtc_state-&gt;saveDSPCNTR = REG_READ(pipeA ? DSPACNTR : DSPBCNTR);</div><div class='add'>+	crtc_state-&gt;savePIPECONF = REG_READ(pipeA ? PIPEACONF : PIPEBCONF);</div><div class='add'>+	crtc_state-&gt;savePIPESRC = REG_READ(pipeA ? PIPEASRC : PIPEBSRC);</div><div class='add'>+	crtc_state-&gt;saveFP0 = REG_READ(pipeA ? FPA0 : FPB0);</div><div class='add'>+	crtc_state-&gt;saveFP1 = REG_READ(pipeA ? FPA1 : FPB1);</div><div class='add'>+	crtc_state-&gt;saveDPLL = REG_READ(pipeA ? DPLL_A : DPLL_B);</div><div class='add'>+	crtc_state-&gt;saveHTOTAL = REG_READ(pipeA ? HTOTAL_A : HTOTAL_B);</div><div class='add'>+	crtc_state-&gt;saveHBLANK = REG_READ(pipeA ? HBLANK_A : HBLANK_B);</div><div class='add'>+	crtc_state-&gt;saveHSYNC = REG_READ(pipeA ? HSYNC_A : HSYNC_B);</div><div class='add'>+	crtc_state-&gt;saveVTOTAL = REG_READ(pipeA ? VTOTAL_A : VTOTAL_B);</div><div class='add'>+	crtc_state-&gt;saveVBLANK = REG_READ(pipeA ? VBLANK_A : VBLANK_B);</div><div class='add'>+	crtc_state-&gt;saveVSYNC = REG_READ(pipeA ? VSYNC_A : VSYNC_B);</div><div class='add'>+	crtc_state-&gt;saveDSPSTRIDE = REG_READ(pipeA ? DSPASTRIDE : DSPBSTRIDE);</div><div class='add'>+</div><div class='add'>+	/*NOTE: DSPSIZE DSPPOS only for psb*/</div><div class='add'>+	crtc_state-&gt;saveDSPSIZE = REG_READ(pipeA ? DSPASIZE : DSPBSIZE);</div><div class='add'>+	crtc_state-&gt;saveDSPPOS = REG_READ(pipeA ? DSPAPOS : DSPBPOS);</div><div class='add'>+</div><div class='add'>+	crtc_state-&gt;saveDSPBASE = REG_READ(pipeA ? DSPABASE : DSPBBASE);</div><div class='add'>+</div><div class='add'>+	paletteReg = pipeA ? PALETTE_A : PALETTE_B;</div><div class='add'>+	for (i = 0; i &lt; 256; ++i)</div><div class='add'>+		crtc_state-&gt;savePalette[i] = REG_READ(paletteReg + (i &lt;&lt; 2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Restore HW states of giving crtc</div><div class='add'>+ */</div><div class='add'>+static void psb_intel_crtc_restore(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	/* struct drm_psb_private * dev_priv =</div><div class='add'>+				(struct drm_psb_private *)dev-&gt;dev_private; */</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc =  to_psb_intel_crtc(crtc);</div><div class='add'>+	struct psb_intel_crtc_state *crtc_state = psb_intel_crtc-&gt;crtc_state;</div><div class='add'>+	/* struct drm_crtc_helper_funcs * crtc_funcs = crtc-&gt;helper_private; */</div><div class='add'>+	int pipeA = (psb_intel_crtc-&gt;pipe == 0);</div><div class='add'>+	uint32_t paletteReg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!crtc_state) {</div><div class='add'>+		dev_err(dev-&gt;dev, "No crtc state\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (crtc_state-&gt;saveDPLL &amp; DPLL_VCO_ENABLE) {</div><div class='add'>+		REG_WRITE(pipeA ? DPLL_A : DPLL_B,</div><div class='add'>+			crtc_state-&gt;saveDPLL &amp; ~DPLL_VCO_ENABLE);</div><div class='add'>+		REG_READ(pipeA ? DPLL_A : DPLL_B);</div><div class='add'>+		udelay(150);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_WRITE(pipeA ? FPA0 : FPB0, crtc_state-&gt;saveFP0);</div><div class='add'>+	REG_READ(pipeA ? FPA0 : FPB0);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(pipeA ? FPA1 : FPB1, crtc_state-&gt;saveFP1);</div><div class='add'>+	REG_READ(pipeA ? FPA1 : FPB1);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(pipeA ? DPLL_A : DPLL_B, crtc_state-&gt;saveDPLL);</div><div class='add'>+	REG_READ(pipeA ? DPLL_A : DPLL_B);</div><div class='add'>+	udelay(150);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(pipeA ? HTOTAL_A : HTOTAL_B, crtc_state-&gt;saveHTOTAL);</div><div class='add'>+	REG_WRITE(pipeA ? HBLANK_A : HBLANK_B, crtc_state-&gt;saveHBLANK);</div><div class='add'>+	REG_WRITE(pipeA ? HSYNC_A : HSYNC_B, crtc_state-&gt;saveHSYNC);</div><div class='add'>+	REG_WRITE(pipeA ? VTOTAL_A : VTOTAL_B, crtc_state-&gt;saveVTOTAL);</div><div class='add'>+	REG_WRITE(pipeA ? VBLANK_A : VBLANK_B, crtc_state-&gt;saveVBLANK);</div><div class='add'>+	REG_WRITE(pipeA ? VSYNC_A : VSYNC_B, crtc_state-&gt;saveVSYNC);</div><div class='add'>+	REG_WRITE(pipeA ? DSPASTRIDE : DSPBSTRIDE, crtc_state-&gt;saveDSPSTRIDE);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(pipeA ? DSPASIZE : DSPBSIZE, crtc_state-&gt;saveDSPSIZE);</div><div class='add'>+	REG_WRITE(pipeA ? DSPAPOS : DSPBPOS, crtc_state-&gt;saveDSPPOS);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(pipeA ? PIPEASRC : PIPEBSRC, crtc_state-&gt;savePIPESRC);</div><div class='add'>+	REG_WRITE(pipeA ? DSPABASE : DSPBBASE, crtc_state-&gt;saveDSPBASE);</div><div class='add'>+	REG_WRITE(pipeA ? PIPEACONF : PIPEBCONF, crtc_state-&gt;savePIPECONF);</div><div class='add'>+</div><div class='add'>+	psb_intel_wait_for_vblank(dev);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(pipeA ? DSPACNTR : DSPBCNTR, crtc_state-&gt;saveDSPCNTR);</div><div class='add'>+	REG_WRITE(pipeA ? DSPABASE : DSPBBASE, crtc_state-&gt;saveDSPBASE);</div><div class='add'>+</div><div class='add'>+	psb_intel_wait_for_vblank(dev);</div><div class='add'>+</div><div class='add'>+	paletteReg = pipeA ? PALETTE_A : PALETTE_B;</div><div class='add'>+	for (i = 0; i &lt; 256; ++i)</div><div class='add'>+		REG_WRITE(paletteReg + (i &lt;&lt; 2), crtc_state-&gt;savePalette[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_intel_crtc_cursor_set(struct drm_crtc *crtc,</div><div class='add'>+				 struct drm_file *file_priv,</div><div class='add'>+				 uint32_t handle,</div><div class='add'>+				 uint32_t width, uint32_t height)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	int pipe = psb_intel_crtc-&gt;pipe;</div><div class='add'>+	uint32_t control = (pipe == 0) ? CURACNTR : CURBCNTR;</div><div class='add'>+	uint32_t base = (pipe == 0) ? CURABASE : CURBBASE;</div><div class='add'>+	uint32_t temp;</div><div class='add'>+	size_t addr = 0;</div><div class='add'>+	struct gtt_range *gt;</div><div class='add'>+	struct drm_gem_object *obj;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* if we want to turn of the cursor ignore width and height */</div><div class='add'>+	if (!handle) {</div><div class='add'>+		/* turn off the cursor */</div><div class='add'>+		temp = CURSOR_MODE_DISABLE;</div><div class='add'>+</div><div class='add'>+		if (gma_power_begin(dev, false)) {</div><div class='add'>+			REG_WRITE(control, temp);</div><div class='add'>+			REG_WRITE(base, 0);</div><div class='add'>+			gma_power_end(dev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Unpin the old GEM object */</div><div class='add'>+		if (psb_intel_crtc-&gt;cursor_obj) {</div><div class='add'>+			gt = container_of(psb_intel_crtc-&gt;cursor_obj,</div><div class='add'>+							struct gtt_range, gem);</div><div class='add'>+			psb_gtt_unpin(gt);</div><div class='add'>+			drm_gem_object_unreference(psb_intel_crtc-&gt;cursor_obj);</div><div class='add'>+			psb_intel_crtc-&gt;cursor_obj = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Currently we only support 64x64 cursors */</div><div class='add'>+	if (width != 64 || height != 64) {</div><div class='add'>+		dev_dbg(dev-&gt;dev, "we currently only support 64x64 cursors\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	obj = drm_gem_object_lookup(dev, file_priv, handle);</div><div class='add'>+	if (!obj)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (obj-&gt;size &lt; width * height * 4) {</div><div class='add'>+		dev_dbg(dev-&gt;dev, "buffer is to small\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gt = container_of(obj, struct gtt_range, gem);</div><div class='add'>+</div><div class='add'>+	/* Pin the memory into the GTT */</div><div class='add'>+	ret = psb_gtt_pin(gt);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Can not pin down handle 0x%x\n", handle);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	addr = gt-&gt;offset;	/* Or resource.start ??? */</div><div class='add'>+</div><div class='add'>+	psb_intel_crtc-&gt;cursor_addr = addr;</div><div class='add'>+</div><div class='add'>+	temp = 0;</div><div class='add'>+	/* set the pipe for the cursor */</div><div class='add'>+	temp |= (pipe &lt;&lt; 28);</div><div class='add'>+	temp |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		REG_WRITE(control, temp);</div><div class='add'>+		REG_WRITE(base, addr);</div><div class='add'>+		gma_power_end(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* unpin the old bo */</div><div class='add'>+	if (psb_intel_crtc-&gt;cursor_obj) {</div><div class='add'>+		gt = container_of(psb_intel_crtc-&gt;cursor_obj,</div><div class='add'>+							struct gtt_range, gem);</div><div class='add'>+		psb_gtt_unpin(gt);</div><div class='add'>+		drm_gem_object_unreference(psb_intel_crtc-&gt;cursor_obj);</div><div class='add'>+		psb_intel_crtc-&gt;cursor_obj = obj;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	int pipe = psb_intel_crtc-&gt;pipe;</div><div class='add'>+	uint32_t temp = 0;</div><div class='add'>+	uint32_t addr;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (x &lt; 0) {</div><div class='add'>+		temp |= (CURSOR_POS_SIGN &lt;&lt; CURSOR_X_SHIFT);</div><div class='add'>+		x = -x;</div><div class='add'>+	}</div><div class='add'>+	if (y &lt; 0) {</div><div class='add'>+		temp |= (CURSOR_POS_SIGN &lt;&lt; CURSOR_Y_SHIFT);</div><div class='add'>+		y = -y;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	temp |= ((x &amp; CURSOR_POS_MASK) &lt;&lt; CURSOR_X_SHIFT);</div><div class='add'>+	temp |= ((y &amp; CURSOR_POS_MASK) &lt;&lt; CURSOR_Y_SHIFT);</div><div class='add'>+</div><div class='add'>+	addr = psb_intel_crtc-&gt;cursor_addr;</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		REG_WRITE((pipe == 0) ? CURAPOS : CURBPOS, temp);</div><div class='add'>+		REG_WRITE((pipe == 0) ? CURABASE : CURBBASE, addr);</div><div class='add'>+		gma_power_end(dev);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red,</div><div class='add'>+			 u16 *green, u16 *blue, uint32_t type, uint32_t size)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (size != 256)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 256; i++) {</div><div class='add'>+		psb_intel_crtc-&gt;lut_r[i] = red[i] &gt;&gt; 8;</div><div class='add'>+		psb_intel_crtc-&gt;lut_g[i] = green[i] &gt;&gt; 8;</div><div class='add'>+		psb_intel_crtc-&gt;lut_b[i] = blue[i] &gt;&gt; 8;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	psb_intel_crtc_load_lut(crtc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_crtc_set_config(struct drm_mode_set *set)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct drm_device *dev = set-&gt;crtc-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (!dev_priv-&gt;rpm_enabled)</div><div class='add'>+		return drm_crtc_helper_set_config(set);</div><div class='add'>+</div><div class='add'>+	pm_runtime_forbid(&amp;dev-&gt;pdev-&gt;dev);</div><div class='add'>+	ret = drm_crtc_helper_set_config(set);</div><div class='add'>+	pm_runtime_allow(&amp;dev-&gt;pdev-&gt;dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns the clock of the currently programmed mode of the given pipe. */</div><div class='add'>+static int psb_intel_crtc_clock_get(struct drm_device *dev,</div><div class='add'>+				struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	int pipe = psb_intel_crtc-&gt;pipe;</div><div class='add'>+	u32 dpll;</div><div class='add'>+	u32 fp;</div><div class='add'>+	struct psb_intel_clock_t clock;</div><div class='add'>+	bool is_lvds;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		dpll = REG_READ((pipe == 0) ? DPLL_A : DPLL_B);</div><div class='add'>+		if ((dpll &amp; DISPLAY_RATE_SELECT_FPA1) == 0)</div><div class='add'>+			fp = REG_READ((pipe == 0) ? FPA0 : FPB0);</div><div class='add'>+		else</div><div class='add'>+			fp = REG_READ((pipe == 0) ? FPA1 : FPB1);</div><div class='add'>+		is_lvds = (pipe == 1) &amp;&amp; (REG_READ(LVDS) &amp; LVDS_PORT_EN);</div><div class='add'>+		gma_power_end(dev);</div><div class='add'>+	} else {</div><div class='add'>+		dpll = (pipe == 0) ?</div><div class='add'>+			dev_priv-&gt;saveDPLL_A : dev_priv-&gt;saveDPLL_B;</div><div class='add'>+</div><div class='add'>+		if ((dpll &amp; DISPLAY_RATE_SELECT_FPA1) == 0)</div><div class='add'>+			fp = (pipe == 0) ?</div><div class='add'>+				dev_priv-&gt;saveFPA0 :</div><div class='add'>+				dev_priv-&gt;saveFPB0;</div><div class='add'>+		else</div><div class='add'>+			fp = (pipe == 0) ?</div><div class='add'>+				dev_priv-&gt;saveFPA1 :</div><div class='add'>+				dev_priv-&gt;saveFPB1;</div><div class='add'>+</div><div class='add'>+		is_lvds = (pipe == 1) &amp;&amp; (dev_priv-&gt;saveLVDS &amp; LVDS_PORT_EN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clock.m1 = (fp &amp; FP_M1_DIV_MASK) &gt;&gt; FP_M1_DIV_SHIFT;</div><div class='add'>+	clock.m2 = (fp &amp; FP_M2_DIV_MASK) &gt;&gt; FP_M2_DIV_SHIFT;</div><div class='add'>+	clock.n = (fp &amp; FP_N_DIV_MASK) &gt;&gt; FP_N_DIV_SHIFT;</div><div class='add'>+</div><div class='add'>+	if (is_lvds) {</div><div class='add'>+		clock.p1 =</div><div class='add'>+		    ffs((dpll &amp;</div><div class='add'>+			 DPLL_FPA01_P1_POST_DIV_MASK_I830_LVDS) &gt;&gt;</div><div class='add'>+			DPLL_FPA01_P1_POST_DIV_SHIFT);</div><div class='add'>+		clock.p2 = 14;</div><div class='add'>+</div><div class='add'>+		if ((dpll &amp; PLL_REF_INPUT_MASK) ==</div><div class='add'>+		    PLLB_REF_INPUT_SPREADSPECTRUMIN) {</div><div class='add'>+			/* XXX: might not be 66MHz */</div><div class='add'>+			i8xx_clock(66000, &amp;clock);</div><div class='add'>+		} else</div><div class='add'>+			i8xx_clock(48000, &amp;clock);</div><div class='add'>+	} else {</div><div class='add'>+		if (dpll &amp; PLL_P1_DIVIDE_BY_TWO)</div><div class='add'>+			clock.p1 = 2;</div><div class='add'>+		else {</div><div class='add'>+			clock.p1 =</div><div class='add'>+			    ((dpll &amp;</div><div class='add'>+			      DPLL_FPA01_P1_POST_DIV_MASK_I830) &gt;&gt;</div><div class='add'>+			     DPLL_FPA01_P1_POST_DIV_SHIFT) + 2;</div><div class='add'>+		}</div><div class='add'>+		if (dpll &amp; PLL_P2_DIVIDE_BY_4)</div><div class='add'>+			clock.p2 = 4;</div><div class='add'>+		else</div><div class='add'>+			clock.p2 = 2;</div><div class='add'>+</div><div class='add'>+		i8xx_clock(48000, &amp;clock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* XXX: It would be nice to validate the clocks, but we can't reuse</div><div class='add'>+	 * i830PllIsValid() because it relies on the xf86_config connector</div><div class='add'>+	 * configuration being accurate, which it isn't necessarily.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return clock.dot;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/** Returns the currently programmed mode of the given pipe. */</div><div class='add'>+struct drm_display_mode *psb_intel_crtc_mode_get(struct drm_device *dev,</div><div class='add'>+					     struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	int pipe = psb_intel_crtc-&gt;pipe;</div><div class='add'>+	struct drm_display_mode *mode;</div><div class='add'>+	int htot;</div><div class='add'>+	int hsync;</div><div class='add'>+	int vtot;</div><div class='add'>+	int vsync;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		htot = REG_READ((pipe == 0) ? HTOTAL_A : HTOTAL_B);</div><div class='add'>+		hsync = REG_READ((pipe == 0) ? HSYNC_A : HSYNC_B);</div><div class='add'>+		vtot = REG_READ((pipe == 0) ? VTOTAL_A : VTOTAL_B);</div><div class='add'>+		vsync = REG_READ((pipe == 0) ? VSYNC_A : VSYNC_B);</div><div class='add'>+		gma_power_end(dev);</div><div class='add'>+	} else {</div><div class='add'>+		htot = (pipe == 0) ?</div><div class='add'>+			dev_priv-&gt;saveHTOTAL_A : dev_priv-&gt;saveHTOTAL_B;</div><div class='add'>+		hsync = (pipe == 0) ?</div><div class='add'>+			dev_priv-&gt;saveHSYNC_A : dev_priv-&gt;saveHSYNC_B;</div><div class='add'>+		vtot = (pipe == 0) ?</div><div class='add'>+			dev_priv-&gt;saveVTOTAL_A : dev_priv-&gt;saveVTOTAL_B;</div><div class='add'>+		vsync = (pipe == 0) ?</div><div class='add'>+			dev_priv-&gt;saveVSYNC_A : dev_priv-&gt;saveVSYNC_B;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mode = kzalloc(sizeof(*mode), GFP_KERNEL);</div><div class='add'>+	if (!mode)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	mode-&gt;clock = psb_intel_crtc_clock_get(dev, crtc);</div><div class='add'>+	mode-&gt;hdisplay = (htot &amp; 0xffff) + 1;</div><div class='add'>+	mode-&gt;htotal = ((htot &amp; 0xffff0000) &gt;&gt; 16) + 1;</div><div class='add'>+	mode-&gt;hsync_start = (hsync &amp; 0xffff) + 1;</div><div class='add'>+	mode-&gt;hsync_end = ((hsync &amp; 0xffff0000) &gt;&gt; 16) + 1;</div><div class='add'>+	mode-&gt;vdisplay = (vtot &amp; 0xffff) + 1;</div><div class='add'>+	mode-&gt;vtotal = ((vtot &amp; 0xffff0000) &gt;&gt; 16) + 1;</div><div class='add'>+	mode-&gt;vsync_start = (vsync &amp; 0xffff) + 1;</div><div class='add'>+	mode-&gt;vsync_end = ((vsync &amp; 0xffff0000) &gt;&gt; 16) + 1;</div><div class='add'>+</div><div class='add'>+	drm_mode_set_name(mode);</div><div class='add'>+	drm_mode_set_crtcinfo(mode, 0);</div><div class='add'>+</div><div class='add'>+	return mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_intel_crtc_destroy(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	struct gtt_range *gt;</div><div class='add'>+</div><div class='add'>+	/* Unpin the old GEM object */</div><div class='add'>+	if (psb_intel_crtc-&gt;cursor_obj) {</div><div class='add'>+		gt = container_of(psb_intel_crtc-&gt;cursor_obj,</div><div class='add'>+						struct gtt_range, gem);</div><div class='add'>+		psb_gtt_unpin(gt);</div><div class='add'>+		drm_gem_object_unreference(psb_intel_crtc-&gt;cursor_obj);</div><div class='add'>+		psb_intel_crtc-&gt;cursor_obj = NULL;</div><div class='add'>+	}</div><div class='add'>+	kfree(psb_intel_crtc-&gt;crtc_state);</div><div class='add'>+	drm_crtc_cleanup(crtc);</div><div class='add'>+	kfree(psb_intel_crtc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct drm_crtc_helper_funcs psb_intel_helper_funcs = {</div><div class='add'>+	.dpms = psb_intel_crtc_dpms,</div><div class='add'>+	.mode_fixup = psb_intel_crtc_mode_fixup,</div><div class='add'>+	.mode_set = psb_intel_crtc_mode_set,</div><div class='add'>+	.mode_set_base = psb_intel_pipe_set_base,</div><div class='add'>+	.prepare = psb_intel_crtc_prepare,</div><div class='add'>+	.commit = psb_intel_crtc_commit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct drm_crtc_funcs psb_intel_crtc_funcs = {</div><div class='add'>+	.save = psb_intel_crtc_save,</div><div class='add'>+	.restore = psb_intel_crtc_restore,</div><div class='add'>+	.cursor_set = psb_intel_crtc_cursor_set,</div><div class='add'>+	.cursor_move = psb_intel_crtc_cursor_move,</div><div class='add'>+	.gamma_set = psb_intel_crtc_gamma_set,</div><div class='add'>+	.set_config = psb_crtc_set_config,</div><div class='add'>+	.destroy = psb_intel_crtc_destroy,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set the default value of cursor control and base register</div><div class='add'>+ * to zero. This is a workaround for h/w defect on Oaktrail</div><div class='add'>+ */</div><div class='add'>+static void psb_intel_cursor_init(struct drm_device *dev, int pipe)</div><div class='add'>+{</div><div class='add'>+	u32 control[3] = { CURACNTR, CURBCNTR, CURCCNTR };</div><div class='add'>+	u32 base[3] = { CURABASE, CURBBASE, CURCBASE };</div><div class='add'>+</div><div class='add'>+	REG_WRITE(control[pipe], 0);</div><div class='add'>+	REG_WRITE(base[pipe], 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_intel_crtc_init(struct drm_device *dev, int pipe,</div><div class='add'>+		     struct psb_intel_mode_device *mode_dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc;</div><div class='add'>+	int i;</div><div class='add'>+	uint16_t *r_base, *g_base, *b_base;</div><div class='add'>+</div><div class='add'>+	/* We allocate a extra array of drm_connector pointers</div><div class='add'>+	 * for fbdev after the crtc */</div><div class='add'>+	psb_intel_crtc =</div><div class='add'>+	    kzalloc(sizeof(struct psb_intel_crtc) +</div><div class='add'>+		    (INTELFB_CONN_LIMIT * sizeof(struct drm_connector *)),</div><div class='add'>+		    GFP_KERNEL);</div><div class='add'>+	if (psb_intel_crtc == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	psb_intel_crtc-&gt;crtc_state =</div><div class='add'>+		kzalloc(sizeof(struct psb_intel_crtc_state), GFP_KERNEL);</div><div class='add'>+	if (!psb_intel_crtc-&gt;crtc_state) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Crtc state error: No memory\n");</div><div class='add'>+		kfree(psb_intel_crtc);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the CRTC operations from the chip specific data */</div><div class='add'>+	drm_crtc_init(dev, &amp;psb_intel_crtc-&gt;base, dev_priv-&gt;ops-&gt;crtc_funcs);</div><div class='add'>+</div><div class='add'>+	drm_mode_crtc_set_gamma_size(&amp;psb_intel_crtc-&gt;base, 256);</div><div class='add'>+	psb_intel_crtc-&gt;pipe = pipe;</div><div class='add'>+	psb_intel_crtc-&gt;plane = pipe;</div><div class='add'>+</div><div class='add'>+	r_base = psb_intel_crtc-&gt;base.gamma_store;</div><div class='add'>+	g_base = r_base + 256;</div><div class='add'>+	b_base = g_base + 256;</div><div class='add'>+	for (i = 0; i &lt; 256; i++) {</div><div class='add'>+		psb_intel_crtc-&gt;lut_r[i] = i;</div><div class='add'>+		psb_intel_crtc-&gt;lut_g[i] = i;</div><div class='add'>+		psb_intel_crtc-&gt;lut_b[i] = i;</div><div class='add'>+		r_base[i] = i &lt;&lt; 8;</div><div class='add'>+		g_base[i] = i &lt;&lt; 8;</div><div class='add'>+		b_base[i] = i &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+		psb_intel_crtc-&gt;lut_adj[i] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	psb_intel_crtc-&gt;mode_dev = mode_dev;</div><div class='add'>+	psb_intel_crtc-&gt;cursor_addr = 0;</div><div class='add'>+</div><div class='add'>+	drm_crtc_helper_add(&amp;psb_intel_crtc-&gt;base,</div><div class='add'>+						dev_priv-&gt;ops-&gt;crtc_helper);</div><div class='add'>+</div><div class='add'>+	/* Setup the array of drm_connector pointer array */</div><div class='add'>+	psb_intel_crtc-&gt;mode_set.crtc = &amp;psb_intel_crtc-&gt;base;</div><div class='add'>+	BUG_ON(pipe &gt;= ARRAY_SIZE(dev_priv-&gt;plane_to_crtc_mapping) ||</div><div class='add'>+	       dev_priv-&gt;plane_to_crtc_mapping[psb_intel_crtc-&gt;plane] != NULL);</div><div class='add'>+	dev_priv-&gt;plane_to_crtc_mapping[psb_intel_crtc-&gt;plane] =</div><div class='add'>+							&amp;psb_intel_crtc-&gt;base;</div><div class='add'>+	dev_priv-&gt;pipe_to_crtc_mapping[psb_intel_crtc-&gt;pipe] =</div><div class='add'>+							&amp;psb_intel_crtc-&gt;base;</div><div class='add'>+	psb_intel_crtc-&gt;mode_set.connectors =</div><div class='add'>+	    (struct drm_connector **) (psb_intel_crtc + 1);</div><div class='add'>+	psb_intel_crtc-&gt;mode_set.num_connectors = 0;</div><div class='add'>+	psb_intel_cursor_init(dev, pipe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,</div><div class='add'>+				struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_psb_get_pipe_from_crtc_id_arg *pipe_from_crtc_id = data;</div><div class='add'>+	struct drm_mode_object *drmmode_obj;</div><div class='add'>+	struct psb_intel_crtc *crtc;</div><div class='add'>+</div><div class='add'>+	if (!dev_priv) {</div><div class='add'>+		dev_err(dev-&gt;dev, "called with no initialization\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	drmmode_obj = drm_mode_object_find(dev, pipe_from_crtc_id-&gt;crtc_id,</div><div class='add'>+			DRM_MODE_OBJECT_CRTC);</div><div class='add'>+</div><div class='add'>+	if (!drmmode_obj) {</div><div class='add'>+		dev_err(dev-&gt;dev, "no such CRTC id\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	crtc = to_psb_intel_crtc(obj_to_crtc(drmmode_obj));</div><div class='add'>+	pipe_from_crtc_id-&gt;pipe = crtc-&gt;pipe;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct drm_crtc *psb_intel_get_crtc_from_pipe(struct drm_device *dev, int pipe)</div><div class='add'>+{</div><div class='add'>+	struct drm_crtc *crtc = NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(crtc, &amp;dev-&gt;mode_config.crtc_list, head) {</div><div class='add'>+		struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+		if (psb_intel_crtc-&gt;pipe == pipe)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return crtc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_intel_connector_clones(struct drm_device *dev, int type_mask)</div><div class='add'>+{</div><div class='add'>+	int index_mask = 0;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+	int entry = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(connector, &amp;dev-&gt;mode_config.connector_list,</div><div class='add'>+			    head) {</div><div class='add'>+		struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(connector);</div><div class='add'>+		if (type_mask &amp; (1 &lt;&lt; psb_intel_encoder-&gt;type))</div><div class='add'>+			index_mask |= (1 &lt;&lt; entry);</div><div class='add'>+		entry++;</div><div class='add'>+	}</div><div class='add'>+	return index_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void psb_intel_modeset_cleanup(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	drm_mode_config_cleanup(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* current intel driver doesn't take advantage of encoders</div><div class='add'>+   always give back the encoder for the connector</div><div class='add'>+*/</div><div class='add'>+struct drm_encoder *psb_intel_best_encoder(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(connector);</div><div class='add'>+</div><div class='add'>+	return &amp;psb_intel_encoder-&gt;base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_intel_connector_attach_encoder(struct psb_intel_connector *connector,</div><div class='add'>+					struct psb_intel_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	connector-&gt;encoder = encoder;</div><div class='add'>+	drm_mode_connector_attach_encoder(&amp;connector-&gt;base,</div><div class='add'>+					  &amp;encoder-&gt;base);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/psb_intel_display.h b/drivers/gpu/drm/gma500/psb_intel_display.h<br/>new file mode 100644<br/>index 000000000000..535b49a5e409<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/psb_intel_display.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/psb_intel_display.h</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+/* copyright (c) 2008, Intel Corporation</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ * Eric Anholt &lt;eric@anholt.net&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _INTEL_DISPLAY_H_</div><div class='add'>+#define _INTEL_DISPLAY_H_</div><div class='add'>+</div><div class='add'>+bool psb_intel_pipe_has_type(struct drm_crtc *crtc, int type);</div><div class='add'>+void psb_intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red,</div><div class='add'>+			 u16 *green, u16 *blue, uint32_t type, uint32_t size);</div><div class='add'>+void psb_intel_crtc_destroy(struct drm_crtc *crtc);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/psb_intel_drv.h b/drivers/gpu/drm/gma500/psb_intel_drv.h<br/>new file mode 100644<br/>index 000000000000..f40535e56689<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/psb_intel_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/psb_intel_drv.h</a></div><div class='hunk'>@@ -0,0 +1,289 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2009-2011, Intel Corporation.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __INTEL_DRV_H__</div><div class='add'>+#define __INTEL_DRV_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/i2c-algo-bit.h&gt;</div><div class='add'>+#include &lt;drm/drm_crtc.h&gt;</div><div class='add'>+#include &lt;drm/drm_crtc_helper.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Display related stuff</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* store information about an Ixxx DVO */</div><div class='add'>+/* The i830-&gt;i865 use multiple DVOs with multiple i2cs */</div><div class='add'>+/* the i915, i945 have a single sDVO i2c bus - which is different */</div><div class='add'>+#define MAX_OUTPUTS 6</div><div class='add'>+/* maximum connectors per crtcs in the mode set */</div><div class='add'>+#define INTELFB_CONN_LIMIT 4</div><div class='add'>+</div><div class='add'>+#define INTEL_I2C_BUS_DVO 1</div><div class='add'>+#define INTEL_I2C_BUS_SDVO 2</div><div class='add'>+</div><div class='add'>+/* Intel Pipe Clone Bit */</div><div class='add'>+#define INTEL_HDMIB_CLONE_BIT 1</div><div class='add'>+#define INTEL_HDMIC_CLONE_BIT 2</div><div class='add'>+#define INTEL_HDMID_CLONE_BIT 3</div><div class='add'>+#define INTEL_HDMIE_CLONE_BIT 4</div><div class='add'>+#define INTEL_HDMIF_CLONE_BIT 5</div><div class='add'>+#define INTEL_SDVO_NON_TV_CLONE_BIT 6</div><div class='add'>+#define INTEL_SDVO_TV_CLONE_BIT 7</div><div class='add'>+#define INTEL_SDVO_LVDS_CLONE_BIT 8</div><div class='add'>+#define INTEL_ANALOG_CLONE_BIT 9</div><div class='add'>+#define INTEL_TV_CLONE_BIT 10</div><div class='add'>+#define INTEL_DP_B_CLONE_BIT 11</div><div class='add'>+#define INTEL_DP_C_CLONE_BIT 12</div><div class='add'>+#define INTEL_DP_D_CLONE_BIT 13</div><div class='add'>+#define INTEL_LVDS_CLONE_BIT 14</div><div class='add'>+#define INTEL_DVO_TMDS_CLONE_BIT 15</div><div class='add'>+#define INTEL_DVO_LVDS_CLONE_BIT 16</div><div class='add'>+#define INTEL_EDP_CLONE_BIT 17</div><div class='add'>+</div><div class='add'>+/* these are outputs from the chip - integrated only</div><div class='add'>+ * external chips are via DVO or SDVO output */</div><div class='add'>+#define INTEL_OUTPUT_UNUSED 0</div><div class='add'>+#define INTEL_OUTPUT_ANALOG 1</div><div class='add'>+#define INTEL_OUTPUT_DVO 2</div><div class='add'>+#define INTEL_OUTPUT_SDVO 3</div><div class='add'>+#define INTEL_OUTPUT_LVDS 4</div><div class='add'>+#define INTEL_OUTPUT_TVOUT 5</div><div class='add'>+#define INTEL_OUTPUT_HDMI 6</div><div class='add'>+#define INTEL_OUTPUT_MIPI 7</div><div class='add'>+#define INTEL_OUTPUT_MIPI2 8</div><div class='add'>+</div><div class='add'>+#define INTEL_DVO_CHIP_NONE 0</div><div class='add'>+#define INTEL_DVO_CHIP_LVDS 1</div><div class='add'>+#define INTEL_DVO_CHIP_TMDS 2</div><div class='add'>+#define INTEL_DVO_CHIP_TVOUT 4</div><div class='add'>+</div><div class='add'>+#define INTEL_MODE_PIXEL_MULTIPLIER_SHIFT (0x0)</div><div class='add'>+#define INTEL_MODE_PIXEL_MULTIPLIER_MASK (0xf &lt;&lt; INTEL_MODE_PIXEL_MULTIPLIER_SHIFT)</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+psb_intel_mode_set_pixel_multiplier(struct drm_display_mode *mode,</div><div class='add'>+				int multiplier)</div><div class='add'>+{</div><div class='add'>+	mode-&gt;clock *= multiplier;</div><div class='add'>+	mode-&gt;private_flags |= multiplier;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+psb_intel_mode_get_pixel_multiplier(const struct drm_display_mode *mode)</div><div class='add'>+{</div><div class='add'>+	return (mode-&gt;private_flags &amp; INTEL_MODE_PIXEL_MULTIPLIER_MASK)</div><div class='add'>+	       &gt;&gt; INTEL_MODE_PIXEL_MULTIPLIER_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Hold information useally put on the device driver privates here,</div><div class='add'>+ * since it needs to be shared across multiple of devices drivers privates.</div><div class='add'>+ */</div><div class='add'>+struct psb_intel_mode_device {</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Abstracted memory manager operations</div><div class='add'>+	 */</div><div class='add'>+	 size_t(*bo_offset) (struct drm_device *dev, void *bo);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Cursor (Can go ?)</div><div class='add'>+	 */</div><div class='add'>+	int cursor_needs_physical;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * LVDS info</div><div class='add'>+	 */</div><div class='add'>+	int backlight_duty_cycle;	/* restore backlight to this value */</div><div class='add'>+	bool panel_wants_dither;</div><div class='add'>+	struct drm_display_mode *panel_fixed_mode;</div><div class='add'>+	struct drm_display_mode *panel_fixed_mode2;</div><div class='add'>+	struct drm_display_mode *vbt_mode;	/* if any */</div><div class='add'>+</div><div class='add'>+	uint32_t saveBLC_PWM_CTL;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct psb_intel_i2c_chan {</div><div class='add'>+	/* for getting at dev. private (mmio etc.) */</div><div class='add'>+	struct drm_device *drm_dev;</div><div class='add'>+	u32 reg;		/* GPIO reg */</div><div class='add'>+	struct i2c_adapter adapter;</div><div class='add'>+	struct i2c_algo_bit_data algo;</div><div class='add'>+	u8 slave_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct psb_intel_encoder {</div><div class='add'>+	struct drm_encoder base;</div><div class='add'>+	int type;</div><div class='add'>+	bool needs_tv_clock;</div><div class='add'>+	void (*hot_plug)(struct psb_intel_encoder *);</div><div class='add'>+	int crtc_mask;</div><div class='add'>+	int clone_mask;</div><div class='add'>+	void *dev_priv; /* For sdvo_priv, lvds_priv, etc... */</div><div class='add'>+</div><div class='add'>+	/* FIXME: Either make SDVO and LVDS store it's i2c here or give CDV it's</div><div class='add'>+	   own set of output privates */</div><div class='add'>+	struct psb_intel_i2c_chan *i2c_bus;</div><div class='add'>+	struct psb_intel_i2c_chan *ddc_bus;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct psb_intel_connector {</div><div class='add'>+	struct drm_connector base;</div><div class='add'>+	struct psb_intel_encoder *encoder;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct psb_intel_crtc_state {</div><div class='add'>+	uint32_t saveDSPCNTR;</div><div class='add'>+	uint32_t savePIPECONF;</div><div class='add'>+	uint32_t savePIPESRC;</div><div class='add'>+	uint32_t saveDPLL;</div><div class='add'>+	uint32_t saveFP0;</div><div class='add'>+	uint32_t saveFP1;</div><div class='add'>+	uint32_t saveHTOTAL;</div><div class='add'>+	uint32_t saveHBLANK;</div><div class='add'>+	uint32_t saveHSYNC;</div><div class='add'>+	uint32_t saveVTOTAL;</div><div class='add'>+	uint32_t saveVBLANK;</div><div class='add'>+	uint32_t saveVSYNC;</div><div class='add'>+	uint32_t saveDSPSTRIDE;</div><div class='add'>+	uint32_t saveDSPSIZE;</div><div class='add'>+	uint32_t saveDSPPOS;</div><div class='add'>+	uint32_t saveDSPBASE;</div><div class='add'>+	uint32_t savePalette[256];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct psb_intel_crtc {</div><div class='add'>+	struct drm_crtc base;</div><div class='add'>+	int pipe;</div><div class='add'>+	int plane;</div><div class='add'>+	uint32_t cursor_addr;</div><div class='add'>+	u8 lut_r[256], lut_g[256], lut_b[256];</div><div class='add'>+	u8 lut_adj[256];</div><div class='add'>+	struct psb_intel_framebuffer *fbdev_fb;</div><div class='add'>+	/* a mode_set for fbdev users on this crtc */</div><div class='add'>+	struct drm_mode_set mode_set;</div><div class='add'>+</div><div class='add'>+	/* GEM object that holds our cursor */</div><div class='add'>+	struct drm_gem_object *cursor_obj;</div><div class='add'>+</div><div class='add'>+	struct drm_display_mode saved_mode;</div><div class='add'>+	struct drm_display_mode saved_adjusted_mode;</div><div class='add'>+</div><div class='add'>+	struct psb_intel_mode_device *mode_dev;</div><div class='add'>+</div><div class='add'>+	/*crtc mode setting flags*/</div><div class='add'>+	u32 mode_flags;</div><div class='add'>+</div><div class='add'>+	/* Saved Crtc HW states */</div><div class='add'>+	struct psb_intel_crtc_state *crtc_state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_psb_intel_crtc(x)	\</div><div class='add'>+		container_of(x, struct psb_intel_crtc, base)</div><div class='add'>+#define to_psb_intel_connector(x) \</div><div class='add'>+		container_of(x, struct psb_intel_connector, base)</div><div class='add'>+#define to_psb_intel_encoder(x)	\</div><div class='add'>+		container_of(x, struct psb_intel_encoder, base)</div><div class='add'>+#define to_psb_intel_framebuffer(x)	\</div><div class='add'>+		container_of(x, struct psb_intel_framebuffer, base)</div><div class='add'>+</div><div class='add'>+struct psb_intel_i2c_chan *psb_intel_i2c_create(struct drm_device *dev,</div><div class='add'>+					const u32 reg, const char *name);</div><div class='add'>+void psb_intel_i2c_destroy(struct psb_intel_i2c_chan *chan);</div><div class='add'>+int psb_intel_ddc_get_modes(struct drm_connector *connector,</div><div class='add'>+			    struct i2c_adapter *adapter);</div><div class='add'>+extern bool psb_intel_ddc_probe(struct i2c_adapter *adapter);</div><div class='add'>+</div><div class='add'>+extern void psb_intel_crtc_init(struct drm_device *dev, int pipe,</div><div class='add'>+			    struct psb_intel_mode_device *mode_dev);</div><div class='add'>+extern void psb_intel_crt_init(struct drm_device *dev);</div><div class='add'>+extern bool psb_intel_sdvo_init(struct drm_device *dev, int output_device);</div><div class='add'>+extern void psb_intel_dvo_init(struct drm_device *dev);</div><div class='add'>+extern void psb_intel_tv_init(struct drm_device *dev);</div><div class='add'>+extern void psb_intel_lvds_init(struct drm_device *dev,</div><div class='add'>+			    struct psb_intel_mode_device *mode_dev);</div><div class='add'>+extern void psb_intel_lvds_set_brightness(struct drm_device *dev, int level);</div><div class='add'>+extern void oaktrail_lvds_init(struct drm_device *dev,</div><div class='add'>+			   struct psb_intel_mode_device *mode_dev);</div><div class='add'>+extern void oaktrail_wait_for_INTR_PKT_SENT(struct drm_device *dev);</div><div class='add'>+extern void oaktrail_dsi_init(struct drm_device *dev,</div><div class='add'>+			   struct psb_intel_mode_device *mode_dev);</div><div class='add'>+extern void mid_dsi_init(struct drm_device *dev,</div><div class='add'>+		    struct psb_intel_mode_device *mode_dev, int dsi_num);</div><div class='add'>+</div><div class='add'>+extern void psb_intel_crtc_load_lut(struct drm_crtc *crtc);</div><div class='add'>+extern void psb_intel_encoder_prepare(struct drm_encoder *encoder);</div><div class='add'>+extern void psb_intel_encoder_commit(struct drm_encoder *encoder);</div><div class='add'>+extern void psb_intel_encoder_destroy(struct drm_encoder *encoder);</div><div class='add'>+</div><div class='add'>+static inline struct psb_intel_encoder *psb_intel_attached_encoder(</div><div class='add'>+						struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	return to_psb_intel_connector(connector)-&gt;encoder;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern void psb_intel_connector_attach_encoder(</div><div class='add'>+					struct psb_intel_connector *connector,</div><div class='add'>+					struct psb_intel_encoder *encoder);</div><div class='add'>+</div><div class='add'>+extern struct drm_encoder *psb_intel_best_encoder(struct drm_connector</div><div class='add'>+					      *connector);</div><div class='add'>+</div><div class='add'>+extern struct drm_display_mode *psb_intel_crtc_mode_get(struct drm_device *dev,</div><div class='add'>+						    struct drm_crtc *crtc);</div><div class='add'>+extern void psb_intel_wait_for_vblank(struct drm_device *dev);</div><div class='add'>+extern int psb_intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,</div><div class='add'>+				struct drm_file *file_priv);</div><div class='add'>+extern struct drm_crtc *psb_intel_get_crtc_from_pipe(struct drm_device *dev,</div><div class='add'>+						 int pipe);</div><div class='add'>+extern struct drm_connector *psb_intel_sdvo_find(struct drm_device *dev,</div><div class='add'>+					     int sdvoB);</div><div class='add'>+extern int psb_intel_sdvo_supports_hotplug(struct drm_connector *connector);</div><div class='add'>+extern void psb_intel_sdvo_set_hotplug(struct drm_connector *connector,</div><div class='add'>+				   int enable);</div><div class='add'>+extern int intelfb_probe(struct drm_device *dev);</div><div class='add'>+extern int intelfb_remove(struct drm_device *dev,</div><div class='add'>+			  struct drm_framebuffer *fb);</div><div class='add'>+extern struct drm_framebuffer *psb_intel_framebuffer_create(struct drm_device</div><div class='add'>+							*dev, struct</div><div class='add'>+							drm_mode_fb_cmd</div><div class='add'>+							*mode_cmd,</div><div class='add'>+							void *mm_private);</div><div class='add'>+extern bool psb_intel_lvds_mode_fixup(struct drm_encoder *encoder,</div><div class='add'>+				      struct drm_display_mode *mode,</div><div class='add'>+				      struct drm_display_mode *adjusted_mode);</div><div class='add'>+extern int psb_intel_lvds_mode_valid(struct drm_connector *connector,</div><div class='add'>+				     struct drm_display_mode *mode);</div><div class='add'>+extern int psb_intel_lvds_set_property(struct drm_connector *connector,</div><div class='add'>+					struct drm_property *property,</div><div class='add'>+					uint64_t value);</div><div class='add'>+extern void psb_intel_lvds_destroy(struct drm_connector *connector);</div><div class='add'>+extern const struct drm_encoder_funcs psb_intel_lvds_enc_funcs;</div><div class='add'>+</div><div class='add'>+/* intel_gmbus.c */</div><div class='add'>+extern void gma_intel_i2c_reset(struct drm_device *dev);</div><div class='add'>+extern int gma_intel_setup_gmbus(struct drm_device *dev);</div><div class='add'>+extern void gma_intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);</div><div class='add'>+extern void gma_intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);</div><div class='add'>+extern void gma_intel_teardown_gmbus(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+#endif				/* __INTEL_DRV_H__ */</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c<br/>new file mode 100644<br/>index 000000000000..a25e4ca5e91c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/psb_intel_lvds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/psb_intel_lvds.c</a></div><div class='hunk'>@@ -0,0 +1,868 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2006-2007 Intel Corporation</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Eric Anholt &lt;eric@anholt.net&gt;</div><div class='add'>+ *	Dave Airlie &lt;airlied@linux.ie&gt;</div><div class='add'>+ *	Jesse Barnes &lt;jesse.barnes@intel.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+</div><div class='add'>+#include "intel_bios.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_intel_drv.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include "power.h"</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * LVDS I2C backlight control macros</div><div class='add'>+ */</div><div class='add'>+#define BRIGHTNESS_MAX_LEVEL 100</div><div class='add'>+#define BRIGHTNESS_MASK 0xFF</div><div class='add'>+#define BLC_I2C_TYPE	0x01</div><div class='add'>+#define BLC_PWM_TYPT	0x02</div><div class='add'>+</div><div class='add'>+#define BLC_POLARITY_NORMAL 0</div><div class='add'>+#define BLC_POLARITY_INVERSE 1</div><div class='add'>+</div><div class='add'>+#define PSB_BLC_MAX_PWM_REG_FREQ       (0xFFFE)</div><div class='add'>+#define PSB_BLC_MIN_PWM_REG_FREQ	(0x2)</div><div class='add'>+#define PSB_BLC_PWM_PRECISION_FACTOR	(10)</div><div class='add'>+#define PSB_BACKLIGHT_PWM_CTL_SHIFT	(16)</div><div class='add'>+#define PSB_BACKLIGHT_PWM_POLARITY_BIT_CLEAR (0xFFFE)</div><div class='add'>+</div><div class='add'>+struct psb_intel_lvds_priv {</div><div class='add'>+	/*</div><div class='add'>+	 * Saved LVDO output states</div><div class='add'>+	 */</div><div class='add'>+	uint32_t savePP_ON;</div><div class='add'>+	uint32_t savePP_OFF;</div><div class='add'>+	uint32_t saveLVDS;</div><div class='add'>+	uint32_t savePP_CONTROL;</div><div class='add'>+	uint32_t savePP_CYCLE;</div><div class='add'>+	uint32_t savePFIT_CONTROL;</div><div class='add'>+	uint32_t savePFIT_PGM_RATIOS;</div><div class='add'>+	uint32_t saveBLC_PWM_CTL;</div><div class='add'>+</div><div class='add'>+	struct psb_intel_i2c_chan *i2c_bus;</div><div class='add'>+	struct psb_intel_i2c_chan *ddc_bus;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns the maximum level of the backlight duty cycle field.</div><div class='add'>+ */</div><div class='add'>+static u32 psb_intel_lvds_get_max_backlight(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 ret;</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		ret = REG_READ(BLC_PWM_CTL);</div><div class='add'>+		gma_power_end(dev);</div><div class='add'>+	} else /* Powered off, use the saved value */</div><div class='add'>+		ret = dev_priv-&gt;saveBLC_PWM_CTL;</div><div class='add'>+</div><div class='add'>+	/* Top 15bits hold the frequency mask */</div><div class='add'>+	ret = (ret &amp;  BACKLIGHT_MODULATION_FREQ_MASK) &gt;&gt;</div><div class='add'>+					BACKLIGHT_MODULATION_FREQ_SHIFT;</div><div class='add'>+</div><div class='add'>+        ret *= 2;	/* Return a 16bit range as needed for setting */</div><div class='add'>+        if (ret == 0)</div><div class='add'>+                dev_err(dev-&gt;dev, "BL bug: Reg %08x save %08X\n",</div><div class='add'>+                        REG_READ(BLC_PWM_CTL), dev_priv-&gt;saveBLC_PWM_CTL);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set LVDS backlight level by I2C command</div><div class='add'>+ *</div><div class='add'>+ * FIXME: at some point we need to both track this for PM and also</div><div class='add'>+ * disable runtime pm on MRST if the brightness is nil (ie blanked)</div><div class='add'>+ */</div><div class='add'>+static int psb_lvds_i2c_set_brightness(struct drm_device *dev,</div><div class='add'>+					unsigned int level)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv =</div><div class='add'>+		(struct drm_psb_private *)dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	struct psb_intel_i2c_chan *lvds_i2c_bus = dev_priv-&gt;lvds_i2c_bus;</div><div class='add'>+	u8 out_buf[2];</div><div class='add'>+	unsigned int blc_i2c_brightness;</div><div class='add'>+</div><div class='add'>+	struct i2c_msg msgs[] = {</div><div class='add'>+		{</div><div class='add'>+			.addr = lvds_i2c_bus-&gt;slave_addr,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.len = 2,</div><div class='add'>+			.buf = out_buf,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	blc_i2c_brightness = BRIGHTNESS_MASK &amp; ((unsigned int)level *</div><div class='add'>+			     BRIGHTNESS_MASK /</div><div class='add'>+			     BRIGHTNESS_MAX_LEVEL);</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;lvds_bl-&gt;pol == BLC_POLARITY_INVERSE)</div><div class='add'>+		blc_i2c_brightness = BRIGHTNESS_MASK - blc_i2c_brightness;</div><div class='add'>+</div><div class='add'>+	out_buf[0] = dev_priv-&gt;lvds_bl-&gt;brightnesscmd;</div><div class='add'>+	out_buf[1] = (u8)blc_i2c_brightness;</div><div class='add'>+</div><div class='add'>+	if (i2c_transfer(&amp;lvds_i2c_bus-&gt;adapter, msgs, 1) == 1) {</div><div class='add'>+		dev_dbg(dev-&gt;dev, "I2C set brightness.(command, value) (%d, %d)\n",</div><div class='add'>+			dev_priv-&gt;lvds_bl-&gt;brightnesscmd,</div><div class='add'>+			blc_i2c_brightness);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_err(dev-&gt;dev, "I2C transfer error\n");</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int psb_lvds_pwm_set_brightness(struct drm_device *dev, int level)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv =</div><div class='add'>+			(struct drm_psb_private *)dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	u32 max_pwm_blc;</div><div class='add'>+	u32 blc_pwm_duty_cycle;</div><div class='add'>+</div><div class='add'>+	max_pwm_blc = psb_intel_lvds_get_max_backlight(dev);</div><div class='add'>+</div><div class='add'>+	/*BLC_PWM_CTL Should be initiated while backlight device init*/</div><div class='add'>+	BUG_ON(max_pwm_blc == 0);</div><div class='add'>+</div><div class='add'>+	blc_pwm_duty_cycle = level * max_pwm_blc / BRIGHTNESS_MAX_LEVEL;</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;lvds_bl-&gt;pol == BLC_POLARITY_INVERSE)</div><div class='add'>+		blc_pwm_duty_cycle = max_pwm_blc - blc_pwm_duty_cycle;</div><div class='add'>+</div><div class='add'>+	blc_pwm_duty_cycle &amp;= PSB_BACKLIGHT_PWM_POLARITY_BIT_CLEAR;</div><div class='add'>+	REG_WRITE(BLC_PWM_CTL,</div><div class='add'>+		  (max_pwm_blc &lt;&lt; PSB_BACKLIGHT_PWM_CTL_SHIFT) |</div><div class='add'>+		  (blc_pwm_duty_cycle));</div><div class='add'>+</div><div class='add'>+        dev_info(dev-&gt;dev, "Backlight lvds set brightness %08x\n",</div><div class='add'>+		  (max_pwm_blc &lt;&lt; PSB_BACKLIGHT_PWM_CTL_SHIFT) |</div><div class='add'>+		  (blc_pwm_duty_cycle));</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'>+ * Set LVDS backlight level either by I2C or PWM</div><div class='add'>+ */</div><div class='add'>+void psb_intel_lvds_set_brightness(struct drm_device *dev, int level)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev-&gt;dev, "backlight level is %d\n", level);</div><div class='add'>+</div><div class='add'>+	if (!dev_priv-&gt;lvds_bl) {</div><div class='add'>+		dev_err(dev-&gt;dev, "NO LVDS backlight info\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;lvds_bl-&gt;type == BLC_I2C_TYPE)</div><div class='add'>+		psb_lvds_i2c_set_brightness(dev, level);</div><div class='add'>+	else</div><div class='add'>+		psb_lvds_pwm_set_brightness(dev, level);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Sets the backlight level.</div><div class='add'>+ *</div><div class='add'>+ * level: backlight level, from 0 to psb_intel_lvds_get_max_backlight().</div><div class='add'>+ */</div><div class='add'>+static void psb_intel_lvds_set_backlight(struct drm_device *dev, int level)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 blc_pwm_ctl;</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		blc_pwm_ctl = REG_READ(BLC_PWM_CTL);</div><div class='add'>+		blc_pwm_ctl &amp;= ~BACKLIGHT_DUTY_CYCLE_MASK;</div><div class='add'>+		REG_WRITE(BLC_PWM_CTL,</div><div class='add'>+				(blc_pwm_ctl |</div><div class='add'>+				(level &lt;&lt; BACKLIGHT_DUTY_CYCLE_SHIFT)));</div><div class='add'>+		dev_priv-&gt;saveBLC_PWM_CTL = (blc_pwm_ctl |</div><div class='add'>+					(level &lt;&lt; BACKLIGHT_DUTY_CYCLE_SHIFT));</div><div class='add'>+		gma_power_end(dev);</div><div class='add'>+	} else {</div><div class='add'>+		blc_pwm_ctl = dev_priv-&gt;saveBLC_PWM_CTL &amp;</div><div class='add'>+				~BACKLIGHT_DUTY_CYCLE_MASK;</div><div class='add'>+		dev_priv-&gt;saveBLC_PWM_CTL = (blc_pwm_ctl |</div><div class='add'>+					(level &lt;&lt; BACKLIGHT_DUTY_CYCLE_SHIFT));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Sets the power state for the panel.</div><div class='add'>+ */</div><div class='add'>+static void psb_intel_lvds_set_power(struct drm_device *dev, bool on)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_mode_device *mode_dev = &amp;dev_priv-&gt;mode_dev;</div><div class='add'>+	u32 pp_status;</div><div class='add'>+</div><div class='add'>+	if (!gma_power_begin(dev, true)) {</div><div class='add'>+	        dev_err(dev-&gt;dev, "set power, chip off!\n");</div><div class='add'>+		return;</div><div class='add'>+        }</div><div class='add'>+        </div><div class='add'>+	if (on) {</div><div class='add'>+		REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) |</div><div class='add'>+			  POWER_TARGET_ON);</div><div class='add'>+		do {</div><div class='add'>+			pp_status = REG_READ(PP_STATUS);</div><div class='add'>+		} while ((pp_status &amp; PP_ON) == 0);</div><div class='add'>+</div><div class='add'>+		psb_intel_lvds_set_backlight(dev,</div><div class='add'>+					     mode_dev-&gt;backlight_duty_cycle);</div><div class='add'>+	} else {</div><div class='add'>+		psb_intel_lvds_set_backlight(dev, 0);</div><div class='add'>+</div><div class='add'>+		REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) &amp;</div><div class='add'>+			  ~POWER_TARGET_ON);</div><div class='add'>+		do {</div><div class='add'>+			pp_status = REG_READ(PP_STATUS);</div><div class='add'>+		} while (pp_status &amp; PP_ON);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gma_power_end(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_intel_lvds_encoder_dpms(struct drm_encoder *encoder, int mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (mode == DRM_MODE_DPMS_ON)</div><div class='add'>+		psb_intel_lvds_set_power(dev, true);</div><div class='add'>+	else</div><div class='add'>+		psb_intel_lvds_set_power(dev, false);</div><div class='add'>+</div><div class='add'>+	/* XXX: We never power down the LVDS pairs. */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_intel_lvds_save(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = connector-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv =</div><div class='add'>+		(struct drm_psb_private *)dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(connector);</div><div class='add'>+	struct psb_intel_lvds_priv *lvds_priv =</div><div class='add'>+		(struct psb_intel_lvds_priv *)psb_intel_encoder-&gt;dev_priv;</div><div class='add'>+</div><div class='add'>+	lvds_priv-&gt;savePP_ON = REG_READ(LVDSPP_ON);</div><div class='add'>+	lvds_priv-&gt;savePP_OFF = REG_READ(LVDSPP_OFF);</div><div class='add'>+	lvds_priv-&gt;saveLVDS = REG_READ(LVDS);</div><div class='add'>+	lvds_priv-&gt;savePP_CONTROL = REG_READ(PP_CONTROL);</div><div class='add'>+	lvds_priv-&gt;savePP_CYCLE = REG_READ(PP_CYCLE);</div><div class='add'>+	/*lvds_priv-&gt;savePP_DIVISOR = REG_READ(PP_DIVISOR);*/</div><div class='add'>+	lvds_priv-&gt;saveBLC_PWM_CTL = REG_READ(BLC_PWM_CTL);</div><div class='add'>+	lvds_priv-&gt;savePFIT_CONTROL = REG_READ(PFIT_CONTROL);</div><div class='add'>+	lvds_priv-&gt;savePFIT_PGM_RATIOS = REG_READ(PFIT_PGM_RATIOS);</div><div class='add'>+</div><div class='add'>+	/*TODO: move backlight_duty_cycle to psb_intel_lvds_priv*/</div><div class='add'>+	dev_priv-&gt;backlight_duty_cycle = (dev_priv-&gt;saveBLC_PWM_CTL &amp;</div><div class='add'>+						BACKLIGHT_DUTY_CYCLE_MASK);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the light is off at server startup,</div><div class='add'>+	 * just make it full brightness</div><div class='add'>+	 */</div><div class='add'>+	if (dev_priv-&gt;backlight_duty_cycle == 0)</div><div class='add'>+		dev_priv-&gt;backlight_duty_cycle =</div><div class='add'>+		psb_intel_lvds_get_max_backlight(dev);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev-&gt;dev, "(0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x)\n",</div><div class='add'>+			lvds_priv-&gt;savePP_ON,</div><div class='add'>+			lvds_priv-&gt;savePP_OFF,</div><div class='add'>+			lvds_priv-&gt;saveLVDS,</div><div class='add'>+			lvds_priv-&gt;savePP_CONTROL,</div><div class='add'>+			lvds_priv-&gt;savePP_CYCLE,</div><div class='add'>+			lvds_priv-&gt;saveBLC_PWM_CTL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_intel_lvds_restore(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = connector-&gt;dev;</div><div class='add'>+	u32 pp_status;</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(connector);</div><div class='add'>+	struct psb_intel_lvds_priv *lvds_priv =</div><div class='add'>+		(struct psb_intel_lvds_priv *)psb_intel_encoder-&gt;dev_priv;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev-&gt;dev, "(0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x)\n",</div><div class='add'>+			lvds_priv-&gt;savePP_ON,</div><div class='add'>+			lvds_priv-&gt;savePP_OFF,</div><div class='add'>+			lvds_priv-&gt;saveLVDS,</div><div class='add'>+			lvds_priv-&gt;savePP_CONTROL,</div><div class='add'>+			lvds_priv-&gt;savePP_CYCLE,</div><div class='add'>+			lvds_priv-&gt;saveBLC_PWM_CTL);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(BLC_PWM_CTL, lvds_priv-&gt;saveBLC_PWM_CTL);</div><div class='add'>+	REG_WRITE(PFIT_CONTROL, lvds_priv-&gt;savePFIT_CONTROL);</div><div class='add'>+	REG_WRITE(PFIT_PGM_RATIOS, lvds_priv-&gt;savePFIT_PGM_RATIOS);</div><div class='add'>+	REG_WRITE(LVDSPP_ON, lvds_priv-&gt;savePP_ON);</div><div class='add'>+	REG_WRITE(LVDSPP_OFF, lvds_priv-&gt;savePP_OFF);</div><div class='add'>+	/*REG_WRITE(PP_DIVISOR, lvds_priv-&gt;savePP_DIVISOR);*/</div><div class='add'>+	REG_WRITE(PP_CYCLE, lvds_priv-&gt;savePP_CYCLE);</div><div class='add'>+	REG_WRITE(PP_CONTROL, lvds_priv-&gt;savePP_CONTROL);</div><div class='add'>+	REG_WRITE(LVDS, lvds_priv-&gt;saveLVDS);</div><div class='add'>+</div><div class='add'>+	if (lvds_priv-&gt;savePP_CONTROL &amp; POWER_TARGET_ON) {</div><div class='add'>+		REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) |</div><div class='add'>+			POWER_TARGET_ON);</div><div class='add'>+		do {</div><div class='add'>+			pp_status = REG_READ(PP_STATUS);</div><div class='add'>+		} while ((pp_status &amp; PP_ON) == 0);</div><div class='add'>+	} else {</div><div class='add'>+		REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) &amp;</div><div class='add'>+			~POWER_TARGET_ON);</div><div class='add'>+		do {</div><div class='add'>+			pp_status = REG_READ(PP_STATUS);</div><div class='add'>+		} while (pp_status &amp; PP_ON);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_intel_lvds_mode_valid(struct drm_connector *connector,</div><div class='add'>+				 struct drm_display_mode *mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = connector-&gt;dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(connector);</div><div class='add'>+	struct drm_display_mode *fixed_mode =</div><div class='add'>+					dev_priv-&gt;mode_dev.panel_fixed_mode;</div><div class='add'>+</div><div class='add'>+	if (psb_intel_encoder-&gt;type == INTEL_OUTPUT_MIPI2)</div><div class='add'>+		fixed_mode = dev_priv-&gt;mode_dev.panel_fixed_mode2;</div><div class='add'>+</div><div class='add'>+	/* just in case */</div><div class='add'>+	if (mode-&gt;flags &amp; DRM_MODE_FLAG_DBLSCAN)</div><div class='add'>+		return MODE_NO_DBLESCAN;</div><div class='add'>+</div><div class='add'>+	/* just in case */</div><div class='add'>+	if (mode-&gt;flags &amp; DRM_MODE_FLAG_INTERLACE)</div><div class='add'>+		return MODE_NO_INTERLACE;</div><div class='add'>+</div><div class='add'>+	if (fixed_mode) {</div><div class='add'>+		if (mode-&gt;hdisplay &gt; fixed_mode-&gt;hdisplay)</div><div class='add'>+			return MODE_PANEL;</div><div class='add'>+		if (mode-&gt;vdisplay &gt; fixed_mode-&gt;vdisplay)</div><div class='add'>+			return MODE_PANEL;</div><div class='add'>+	}</div><div class='add'>+	return MODE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool psb_intel_lvds_mode_fixup(struct drm_encoder *encoder,</div><div class='add'>+				  struct drm_display_mode *mode,</div><div class='add'>+				  struct drm_display_mode *adjusted_mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_mode_device *mode_dev = &amp;dev_priv-&gt;mode_dev;</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc =</div><div class='add'>+				to_psb_intel_crtc(encoder-&gt;crtc);</div><div class='add'>+	struct drm_encoder *tmp_encoder;</div><div class='add'>+	struct drm_display_mode *panel_fixed_mode = mode_dev-&gt;panel_fixed_mode;</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+						to_psb_intel_encoder(encoder);</div><div class='add'>+</div><div class='add'>+	if (psb_intel_encoder-&gt;type == INTEL_OUTPUT_MIPI2)</div><div class='add'>+		panel_fixed_mode = mode_dev-&gt;panel_fixed_mode2;</div><div class='add'>+</div><div class='add'>+	/* PSB requires the LVDS is on pipe B, MRST has only one pipe anyway */</div><div class='add'>+	if (!IS_MRST(dev) &amp;&amp; psb_intel_crtc-&gt;pipe == 0) {</div><div class='add'>+		printk(KERN_ERR "Can't support LVDS on pipe A\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if (IS_MRST(dev) &amp;&amp; psb_intel_crtc-&gt;pipe != 0) {</div><div class='add'>+		printk(KERN_ERR "Must use PIPE A\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	/* Should never happen!! */</div><div class='add'>+	list_for_each_entry(tmp_encoder, &amp;dev-&gt;mode_config.encoder_list,</div><div class='add'>+			    head) {</div><div class='add'>+		if (tmp_encoder != encoder</div><div class='add'>+		    &amp;&amp; tmp_encoder-&gt;crtc == encoder-&gt;crtc) {</div><div class='add'>+			printk(KERN_ERR "Can't enable LVDS and another "</div><div class='add'>+			       "encoder on the same pipe\n");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we have timings from the BIOS for the panel, put them in</div><div class='add'>+	 * to the adjusted mode.  The CRTC will be set up for this mode,</div><div class='add'>+	 * with the panel scaling set up to source from the H/VDisplay</div><div class='add'>+	 * of the original mode.</div><div class='add'>+	 */</div><div class='add'>+	if (panel_fixed_mode != NULL) {</div><div class='add'>+		adjusted_mode-&gt;hdisplay = panel_fixed_mode-&gt;hdisplay;</div><div class='add'>+		adjusted_mode-&gt;hsync_start = panel_fixed_mode-&gt;hsync_start;</div><div class='add'>+		adjusted_mode-&gt;hsync_end = panel_fixed_mode-&gt;hsync_end;</div><div class='add'>+		adjusted_mode-&gt;htotal = panel_fixed_mode-&gt;htotal;</div><div class='add'>+		adjusted_mode-&gt;vdisplay = panel_fixed_mode-&gt;vdisplay;</div><div class='add'>+		adjusted_mode-&gt;vsync_start = panel_fixed_mode-&gt;vsync_start;</div><div class='add'>+		adjusted_mode-&gt;vsync_end = panel_fixed_mode-&gt;vsync_end;</div><div class='add'>+		adjusted_mode-&gt;vtotal = panel_fixed_mode-&gt;vtotal;</div><div class='add'>+		adjusted_mode-&gt;clock = panel_fixed_mode-&gt;clock;</div><div class='add'>+		drm_mode_set_crtcinfo(adjusted_mode,</div><div class='add'>+				      CRTC_INTERLACE_HALVE_V);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * XXX: It would be nice to support lower refresh rates on the</div><div class='add'>+	 * panels to reduce power consumption, and perhaps match the</div><div class='add'>+	 * user's requested refresh rate.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_intel_lvds_prepare(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_mode_device *mode_dev = &amp;dev_priv-&gt;mode_dev;</div><div class='add'>+</div><div class='add'>+	if (!gma_power_begin(dev, true))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mode_dev-&gt;saveBLC_PWM_CTL = REG_READ(BLC_PWM_CTL);</div><div class='add'>+	mode_dev-&gt;backlight_duty_cycle = (mode_dev-&gt;saveBLC_PWM_CTL &amp;</div><div class='add'>+					  BACKLIGHT_DUTY_CYCLE_MASK);</div><div class='add'>+</div><div class='add'>+	psb_intel_lvds_set_power(dev, false);</div><div class='add'>+</div><div class='add'>+	gma_power_end(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_intel_lvds_commit(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_mode_device *mode_dev = &amp;dev_priv-&gt;mode_dev;</div><div class='add'>+</div><div class='add'>+	if (mode_dev-&gt;backlight_duty_cycle == 0)</div><div class='add'>+		mode_dev-&gt;backlight_duty_cycle =</div><div class='add'>+		    psb_intel_lvds_get_max_backlight(dev);</div><div class='add'>+</div><div class='add'>+	psb_intel_lvds_set_power(dev, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_intel_lvds_mode_set(struct drm_encoder *encoder,</div><div class='add'>+				struct drm_display_mode *mode,</div><div class='add'>+				struct drm_display_mode *adjusted_mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 pfit_control;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The LVDS pin pair will already have been turned on in the</div><div class='add'>+	 * psb_intel_crtc_mode_set since it has a large impact on the DPLL</div><div class='add'>+	 * settings.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable automatic panel scaling so that non-native modes fill the</div><div class='add'>+	 * screen.  Should be enabled before the pipe is enabled, according to</div><div class='add'>+	 * register description and PRM.</div><div class='add'>+	 */</div><div class='add'>+	if (mode-&gt;hdisplay != adjusted_mode-&gt;hdisplay ||</div><div class='add'>+	    mode-&gt;vdisplay != adjusted_mode-&gt;vdisplay)</div><div class='add'>+		pfit_control = (PFIT_ENABLE | VERT_AUTO_SCALE |</div><div class='add'>+				HORIZ_AUTO_SCALE | VERT_INTERP_BILINEAR |</div><div class='add'>+				HORIZ_INTERP_BILINEAR);</div><div class='add'>+	else</div><div class='add'>+		pfit_control = 0;</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;lvds_dither)</div><div class='add'>+		pfit_control |= PANEL_8TO6_DITHER_ENABLE;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(PFIT_CONTROL, pfit_control);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Detect the LVDS connection.</div><div class='add'>+ *</div><div class='add'>+ * This always returns CONNECTOR_STATUS_CONNECTED.</div><div class='add'>+ * This connector should only have</div><div class='add'>+ * been set up if the LVDS was actually connected anyway.</div><div class='add'>+ */</div><div class='add'>+static enum drm_connector_status psb_intel_lvds_detect(struct drm_connector</div><div class='add'>+						   *connector, bool force)</div><div class='add'>+{</div><div class='add'>+	return connector_status_connected;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Return the list of DDC modes if available, or the BIOS fixed mode otherwise.</div><div class='add'>+ */</div><div class='add'>+static int psb_intel_lvds_get_modes(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = connector-&gt;dev;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_mode_device *mode_dev = &amp;dev_priv-&gt;mode_dev;</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(connector);</div><div class='add'>+	struct psb_intel_lvds_priv *lvds_priv = psb_intel_encoder-&gt;dev_priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!IS_MRST(dev))</div><div class='add'>+		ret = psb_intel_ddc_get_modes(connector, &amp;lvds_priv-&gt;i2c_bus-&gt;adapter);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Didn't get an EDID, so</div><div class='add'>+	 * Set wide sync ranges so we get all modes</div><div class='add'>+	 * handed to valid_mode for checking</div><div class='add'>+	 */</div><div class='add'>+	connector-&gt;display_info.min_vfreq = 0;</div><div class='add'>+	connector-&gt;display_info.max_vfreq = 200;</div><div class='add'>+	connector-&gt;display_info.min_hfreq = 0;</div><div class='add'>+	connector-&gt;display_info.max_hfreq = 200;</div><div class='add'>+</div><div class='add'>+	if (mode_dev-&gt;panel_fixed_mode != NULL) {</div><div class='add'>+		struct drm_display_mode *mode =</div><div class='add'>+		    drm_mode_duplicate(dev, mode_dev-&gt;panel_fixed_mode);</div><div class='add'>+		drm_mode_probed_add(connector, mode);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * psb_intel_lvds_destroy - unregister and free LVDS structures</div><div class='add'>+ * @connector: connector to free</div><div class='add'>+ *</div><div class='add'>+ * Unregister the DDC bus for this connector then free the driver private</div><div class='add'>+ * structure.</div><div class='add'>+ */</div><div class='add'>+void psb_intel_lvds_destroy(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder =</div><div class='add'>+					psb_intel_attached_encoder(connector);</div><div class='add'>+	struct psb_intel_lvds_priv *lvds_priv = psb_intel_encoder-&gt;dev_priv;</div><div class='add'>+</div><div class='add'>+	if (lvds_priv-&gt;ddc_bus)</div><div class='add'>+		psb_intel_i2c_destroy(lvds_priv-&gt;ddc_bus);</div><div class='add'>+	drm_sysfs_connector_remove(connector);</div><div class='add'>+	drm_connector_cleanup(connector);</div><div class='add'>+	kfree(connector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_intel_lvds_set_property(struct drm_connector *connector,</div><div class='add'>+				       struct drm_property *property,</div><div class='add'>+				       uint64_t value)</div><div class='add'>+{</div><div class='add'>+	struct drm_encoder *encoder = connector-&gt;encoder;</div><div class='add'>+</div><div class='add'>+	if (!encoder)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (!strcmp(property-&gt;name, "scaling mode")) {</div><div class='add'>+		struct psb_intel_crtc *crtc =</div><div class='add'>+					to_psb_intel_crtc(encoder-&gt;crtc);</div><div class='add'>+		uint64_t curval;</div><div class='add'>+</div><div class='add'>+		if (!crtc)</div><div class='add'>+			goto set_prop_error;</div><div class='add'>+</div><div class='add'>+		switch (value) {</div><div class='add'>+		case DRM_MODE_SCALE_FULLSCREEN:</div><div class='add'>+			break;</div><div class='add'>+		case DRM_MODE_SCALE_NO_SCALE:</div><div class='add'>+			break;</div><div class='add'>+		case DRM_MODE_SCALE_ASPECT:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			goto set_prop_error;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (drm_connector_property_get_value(connector,</div><div class='add'>+						     property,</div><div class='add'>+						     &amp;curval))</div><div class='add'>+			goto set_prop_error;</div><div class='add'>+</div><div class='add'>+		if (curval == value)</div><div class='add'>+			goto set_prop_done;</div><div class='add'>+</div><div class='add'>+		if (drm_connector_property_set_value(connector,</div><div class='add'>+							property,</div><div class='add'>+							value))</div><div class='add'>+			goto set_prop_error;</div><div class='add'>+</div><div class='add'>+		if (crtc-&gt;saved_mode.hdisplay != 0 &amp;&amp;</div><div class='add'>+		    crtc-&gt;saved_mode.vdisplay != 0) {</div><div class='add'>+			if (!drm_crtc_helper_set_mode(encoder-&gt;crtc,</div><div class='add'>+						      &amp;crtc-&gt;saved_mode,</div><div class='add'>+						      encoder-&gt;crtc-&gt;x,</div><div class='add'>+						      encoder-&gt;crtc-&gt;y,</div><div class='add'>+						      encoder-&gt;crtc-&gt;fb))</div><div class='add'>+				goto set_prop_error;</div><div class='add'>+		}</div><div class='add'>+	} else if (!strcmp(property-&gt;name, "backlight")) {</div><div class='add'>+		if (drm_connector_property_set_value(connector,</div><div class='add'>+							property,</div><div class='add'>+							value))</div><div class='add'>+			goto set_prop_error;</div><div class='add'>+		else {</div><div class='add'>+#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE</div><div class='add'>+			struct drm_psb_private *devp =</div><div class='add'>+						encoder-&gt;dev-&gt;dev_private;</div><div class='add'>+			struct backlight_device *bd = devp-&gt;backlight_device;</div><div class='add'>+			if (bd) {</div><div class='add'>+				bd-&gt;props.brightness = value;</div><div class='add'>+				backlight_update_status(bd);</div><div class='add'>+			}</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='add'>+	} else if (!strcmp(property-&gt;name, "DPMS")) {</div><div class='add'>+		struct drm_encoder_helper_funcs *hfuncs</div><div class='add'>+						= encoder-&gt;helper_private;</div><div class='add'>+		hfuncs-&gt;dpms(encoder, value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+set_prop_done:</div><div class='add'>+	return 0;</div><div class='add'>+set_prop_error:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct drm_encoder_helper_funcs psb_intel_lvds_helper_funcs = {</div><div class='add'>+	.dpms = psb_intel_lvds_encoder_dpms,</div><div class='add'>+	.mode_fixup = psb_intel_lvds_mode_fixup,</div><div class='add'>+	.prepare = psb_intel_lvds_prepare,</div><div class='add'>+	.mode_set = psb_intel_lvds_mode_set,</div><div class='add'>+	.commit = psb_intel_lvds_commit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct drm_connector_helper_funcs</div><div class='add'>+				psb_intel_lvds_connector_helper_funcs = {</div><div class='add'>+	.get_modes = psb_intel_lvds_get_modes,</div><div class='add'>+	.mode_valid = psb_intel_lvds_mode_valid,</div><div class='add'>+	.best_encoder = psb_intel_best_encoder,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct drm_connector_funcs psb_intel_lvds_connector_funcs = {</div><div class='add'>+	.dpms = drm_helper_connector_dpms,</div><div class='add'>+	.save = psb_intel_lvds_save,</div><div class='add'>+	.restore = psb_intel_lvds_restore,</div><div class='add'>+	.detect = psb_intel_lvds_detect,</div><div class='add'>+	.fill_modes = drm_helper_probe_single_connector_modes,</div><div class='add'>+	.set_property = psb_intel_lvds_set_property,</div><div class='add'>+	.destroy = psb_intel_lvds_destroy,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void psb_intel_lvds_enc_destroy(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	drm_encoder_cleanup(encoder);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct drm_encoder_funcs psb_intel_lvds_enc_funcs = {</div><div class='add'>+	.destroy = psb_intel_lvds_enc_destroy,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * psb_intel_lvds_init - setup LVDS connectors on this device</div><div class='add'>+ * @dev: drm device</div><div class='add'>+ *</div><div class='add'>+ * Create the connector, register the LVDS DDC bus, and try to figure out what</div><div class='add'>+ * modes we can display on the LVDS panel (if present).</div><div class='add'>+ */</div><div class='add'>+void psb_intel_lvds_init(struct drm_device *dev,</div><div class='add'>+			 struct psb_intel_mode_device *mode_dev)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder;</div><div class='add'>+	struct psb_intel_connector *psb_intel_connector;</div><div class='add'>+	struct psb_intel_lvds_priv *lvds_priv;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+	struct drm_encoder *encoder;</div><div class='add'>+	struct drm_display_mode *scan;	/* *modes, *bios_mode; */</div><div class='add'>+	struct drm_crtc *crtc;</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 lvds;</div><div class='add'>+	int pipe;</div><div class='add'>+</div><div class='add'>+	psb_intel_encoder =</div><div class='add'>+			kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!psb_intel_encoder) {</div><div class='add'>+		dev_err(dev-&gt;dev, "psb_intel_encoder allocation error\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	psb_intel_connector =</div><div class='add'>+		kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!psb_intel_connector) {</div><div class='add'>+		kfree(psb_intel_encoder);</div><div class='add'>+		dev_err(dev-&gt;dev, "psb_intel_connector allocation error\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lvds_priv = kzalloc(sizeof(struct psb_intel_lvds_priv), GFP_KERNEL);</div><div class='add'>+	if (!lvds_priv) {</div><div class='add'>+		dev_err(dev-&gt;dev, "LVDS private allocation error\n");</div><div class='add'>+		goto failed_connector;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	psb_intel_encoder-&gt;dev_priv = lvds_priv;</div><div class='add'>+</div><div class='add'>+	connector = &amp;psb_intel_connector-&gt;base;</div><div class='add'>+	encoder = &amp;psb_intel_encoder-&gt;base;</div><div class='add'>+	drm_connector_init(dev, connector,</div><div class='add'>+			   &amp;psb_intel_lvds_connector_funcs,</div><div class='add'>+			   DRM_MODE_CONNECTOR_LVDS);</div><div class='add'>+</div><div class='add'>+	drm_encoder_init(dev, encoder,</div><div class='add'>+			 &amp;psb_intel_lvds_enc_funcs,</div><div class='add'>+			 DRM_MODE_ENCODER_LVDS);</div><div class='add'>+</div><div class='add'>+	psb_intel_connector_attach_encoder(psb_intel_connector,</div><div class='add'>+					   psb_intel_encoder);</div><div class='add'>+	psb_intel_encoder-&gt;type = INTEL_OUTPUT_LVDS;</div><div class='add'>+</div><div class='add'>+	drm_encoder_helper_add(encoder, &amp;psb_intel_lvds_helper_funcs);</div><div class='add'>+	drm_connector_helper_add(connector,</div><div class='add'>+				 &amp;psb_intel_lvds_connector_helper_funcs);</div><div class='add'>+	connector-&gt;display_info.subpixel_order = SubPixelHorizontalRGB;</div><div class='add'>+	connector-&gt;interlace_allowed = false;</div><div class='add'>+	connector-&gt;doublescan_allowed = false;</div><div class='add'>+</div><div class='add'>+	/*Attach connector properties*/</div><div class='add'>+	drm_connector_attach_property(connector,</div><div class='add'>+				      dev-&gt;mode_config.scaling_mode_property,</div><div class='add'>+				      DRM_MODE_SCALE_FULLSCREEN);</div><div class='add'>+	drm_connector_attach_property(connector,</div><div class='add'>+				      dev_priv-&gt;backlight_property,</div><div class='add'>+				      BRIGHTNESS_MAX_LEVEL);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set up I2C bus</div><div class='add'>+	 * FIXME: distroy i2c_bus when exit</div><div class='add'>+	 */</div><div class='add'>+	lvds_priv-&gt;i2c_bus = psb_intel_i2c_create(dev, GPIOB, "LVDSBLC_B");</div><div class='add'>+	if (!lvds_priv-&gt;i2c_bus) {</div><div class='add'>+		dev_printk(KERN_ERR,</div><div class='add'>+			&amp;dev-&gt;pdev-&gt;dev, "I2C bus registration failed.\n");</div><div class='add'>+		goto failed_blc_i2c;</div><div class='add'>+	}</div><div class='add'>+	lvds_priv-&gt;i2c_bus-&gt;slave_addr = 0x2C;</div><div class='add'>+	dev_priv-&gt;lvds_i2c_bus =  lvds_priv-&gt;i2c_bus;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * LVDS discovery:</div><div class='add'>+	 * 1) check for EDID on DDC</div><div class='add'>+	 * 2) check for VBT data</div><div class='add'>+	 * 3) check to see if LVDS is already on</div><div class='add'>+	 *    if none of the above, no panel</div><div class='add'>+	 * 4) make sure lid is open</div><div class='add'>+	 *    if closed, act like it's not there for now</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Set up the DDC bus. */</div><div class='add'>+	lvds_priv-&gt;ddc_bus = psb_intel_i2c_create(dev, GPIOC, "LVDSDDC_C");</div><div class='add'>+	if (!lvds_priv-&gt;ddc_bus) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;dev-&gt;pdev-&gt;dev,</div><div class='add'>+			   "DDC bus registration " "failed.\n");</div><div class='add'>+		goto failed_ddc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Attempt to get the fixed panel mode from DDC.  Assume that the</div><div class='add'>+	 * preferred mode is the right one.</div><div class='add'>+	 */</div><div class='add'>+	psb_intel_ddc_get_modes(connector, &amp;lvds_priv-&gt;ddc_bus-&gt;adapter);</div><div class='add'>+	list_for_each_entry(scan, &amp;connector-&gt;probed_modes, head) {</div><div class='add'>+		if (scan-&gt;type &amp; DRM_MODE_TYPE_PREFERRED) {</div><div class='add'>+			mode_dev-&gt;panel_fixed_mode =</div><div class='add'>+			    drm_mode_duplicate(dev, scan);</div><div class='add'>+			goto out;	/* FIXME: check for quirks */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Failed to get EDID, what about VBT? do we need this? */</div><div class='add'>+	if (mode_dev-&gt;vbt_mode)</div><div class='add'>+		mode_dev-&gt;panel_fixed_mode =</div><div class='add'>+		    drm_mode_duplicate(dev, mode_dev-&gt;vbt_mode);</div><div class='add'>+</div><div class='add'>+	if (!mode_dev-&gt;panel_fixed_mode)</div><div class='add'>+		if (dev_priv-&gt;lfp_lvds_vbt_mode)</div><div class='add'>+			mode_dev-&gt;panel_fixed_mode =</div><div class='add'>+				drm_mode_duplicate(dev,</div><div class='add'>+					dev_priv-&gt;lfp_lvds_vbt_mode);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we didn't get EDID, try checking if the panel is already turned</div><div class='add'>+	 * on.	If so, assume that whatever is currently programmed is the</div><div class='add'>+	 * correct mode.</div><div class='add'>+	 */</div><div class='add'>+	lvds = REG_READ(LVDS);</div><div class='add'>+	pipe = (lvds &amp; LVDS_PIPEB_SELECT) ? 1 : 0;</div><div class='add'>+	crtc = psb_intel_get_crtc_from_pipe(dev, pipe);</div><div class='add'>+</div><div class='add'>+	if (crtc &amp;&amp; (lvds &amp; LVDS_PORT_EN)) {</div><div class='add'>+		mode_dev-&gt;panel_fixed_mode =</div><div class='add'>+		    psb_intel_crtc_mode_get(dev, crtc);</div><div class='add'>+		if (mode_dev-&gt;panel_fixed_mode) {</div><div class='add'>+			mode_dev-&gt;panel_fixed_mode-&gt;type |=</div><div class='add'>+			    DRM_MODE_TYPE_PREFERRED;</div><div class='add'>+			goto out;	/* FIXME: check for quirks */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we still don't have a mode after all that, give up. */</div><div class='add'>+	if (!mode_dev-&gt;panel_fixed_mode) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Found no modes on the lvds, ignoring the LVDS\n");</div><div class='add'>+		goto failed_find;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Blacklist machines with BIOSes that list an LVDS panel without</div><div class='add'>+	 * actually having one.</div><div class='add'>+	 */</div><div class='add'>+out:</div><div class='add'>+	drm_sysfs_connector_add(connector);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+failed_find:</div><div class='add'>+	if (lvds_priv-&gt;ddc_bus)</div><div class='add'>+		psb_intel_i2c_destroy(lvds_priv-&gt;ddc_bus);</div><div class='add'>+failed_ddc:</div><div class='add'>+	if (lvds_priv-&gt;i2c_bus)</div><div class='add'>+		psb_intel_i2c_destroy(lvds_priv-&gt;i2c_bus);</div><div class='add'>+failed_blc_i2c:</div><div class='add'>+	drm_encoder_cleanup(encoder);</div><div class='add'>+	drm_connector_cleanup(connector);</div><div class='add'>+failed_connector:</div><div class='add'>+	if (psb_intel_connector)</div><div class='add'>+		kfree(psb_intel_connector);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/psb_intel_modes.c b/drivers/gpu/drm/gma500/psb_intel_modes.c<br/>new file mode 100644<br/>index 000000000000..4fca0d6feebe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/psb_intel_modes.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/psb_intel_modes.c</a></div><div class='hunk'>@@ -0,0 +1,75 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2007 Intel Corporation</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ * Authers: Jesse Barnes &lt;jesse.barnes@intel.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include "psb_intel_drv.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * psb_intel_ddc_probe</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+bool psb_intel_ddc_probe(struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	u8 out_buf[] = { 0x0, 0x0 };</div><div class='add'>+	u8 buf[2];</div><div class='add'>+	int ret;</div><div class='add'>+	struct i2c_msg msgs[] = {</div><div class='add'>+		{</div><div class='add'>+		 .addr = 0x50,</div><div class='add'>+		 .flags = 0,</div><div class='add'>+		 .len = 1,</div><div class='add'>+		 .buf = out_buf,</div><div class='add'>+		 },</div><div class='add'>+		{</div><div class='add'>+		 .addr = 0x50,</div><div class='add'>+		 .flags = I2C_M_RD,</div><div class='add'>+		 .len = 1,</div><div class='add'>+		 .buf = buf,</div><div class='add'>+		 }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(adapter, msgs, 2);</div><div class='add'>+	if (ret == 2)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * psb_intel_ddc_get_modes - get modelist from monitor</div><div class='add'>+ * @connector: DRM connector device to use</div><div class='add'>+ *</div><div class='add'>+ * Fetch the EDID information from @connector using the DDC bus.</div><div class='add'>+ */</div><div class='add'>+int psb_intel_ddc_get_modes(struct drm_connector *connector,</div><div class='add'>+			    struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct edid *edid;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	edid = drm_get_edid(connector, adapter);</div><div class='add'>+	if (edid) {</div><div class='add'>+		drm_mode_connector_update_edid_property(connector, edid);</div><div class='add'>+		ret = drm_add_edid_modes(connector, edid);</div><div class='add'>+		kfree(edid);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/psb_intel_reg.h b/drivers/gpu/drm/gma500/psb_intel_reg.h<br/>new file mode 100644<br/>index 000000000000..fcc0af03d685<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/psb_intel_reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/psb_intel_reg.h</a></div><div class='hunk'>@@ -0,0 +1,1309 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2009, Intel Corporation.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ */</div><div class='add'>+#ifndef __PSB_INTEL_REG_H__</div><div class='add'>+#define __PSB_INTEL_REG_H__</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GPIO regs</div><div class='add'>+ */</div><div class='add'>+#define GPIOA			0x5010</div><div class='add'>+#define GPIOB			0x5014</div><div class='add'>+#define GPIOC			0x5018</div><div class='add'>+#define GPIOD			0x501c</div><div class='add'>+#define GPIOE			0x5020</div><div class='add'>+#define GPIOF			0x5024</div><div class='add'>+#define GPIOG			0x5028</div><div class='add'>+#define GPIOH			0x502c</div><div class='add'>+# define GPIO_CLOCK_DIR_MASK		(1 &lt;&lt; 0)</div><div class='add'>+# define GPIO_CLOCK_DIR_IN		(0 &lt;&lt; 1)</div><div class='add'>+# define GPIO_CLOCK_DIR_OUT		(1 &lt;&lt; 1)</div><div class='add'>+# define GPIO_CLOCK_VAL_MASK		(1 &lt;&lt; 2)</div><div class='add'>+# define GPIO_CLOCK_VAL_OUT		(1 &lt;&lt; 3)</div><div class='add'>+# define GPIO_CLOCK_VAL_IN		(1 &lt;&lt; 4)</div><div class='add'>+# define GPIO_CLOCK_PULLUP_DISABLE	(1 &lt;&lt; 5)</div><div class='add'>+# define GPIO_DATA_DIR_MASK		(1 &lt;&lt; 8)</div><div class='add'>+# define GPIO_DATA_DIR_IN		(0 &lt;&lt; 9)</div><div class='add'>+# define GPIO_DATA_DIR_OUT		(1 &lt;&lt; 9)</div><div class='add'>+# define GPIO_DATA_VAL_MASK		(1 &lt;&lt; 10)</div><div class='add'>+# define GPIO_DATA_VAL_OUT		(1 &lt;&lt; 11)</div><div class='add'>+# define GPIO_DATA_VAL_IN		(1 &lt;&lt; 12)</div><div class='add'>+# define GPIO_DATA_PULLUP_DISABLE	(1 &lt;&lt; 13)</div><div class='add'>+</div><div class='add'>+#define GMBUS0			0x5100 /* clock/port select */</div><div class='add'>+#define   GMBUS_RATE_100KHZ	(0&lt;&lt;8)</div><div class='add'>+#define   GMBUS_RATE_50KHZ	(1&lt;&lt;8)</div><div class='add'>+#define   GMBUS_RATE_400KHZ	(2&lt;&lt;8) /* reserved on Pineview */</div><div class='add'>+#define   GMBUS_RATE_1MHZ	(3&lt;&lt;8) /* reserved on Pineview */</div><div class='add'>+#define   GMBUS_HOLD_EXT	(1&lt;&lt;7) /* 300ns hold time, rsvd on Pineview */</div><div class='add'>+#define   GMBUS_PORT_DISABLED	0</div><div class='add'>+#define   GMBUS_PORT_SSC	1</div><div class='add'>+#define   GMBUS_PORT_VGADDC	2</div><div class='add'>+#define   GMBUS_PORT_PANEL	3</div><div class='add'>+#define   GMBUS_PORT_DPC	4 /* HDMIC */</div><div class='add'>+#define   GMBUS_PORT_DPB	5 /* SDVO, HDMIB */</div><div class='add'>+				  /* 6 reserved */</div><div class='add'>+#define   GMBUS_PORT_DPD	7 /* HDMID */</div><div class='add'>+#define   GMBUS_NUM_PORTS       8</div><div class='add'>+#define GMBUS1			0x5104 /* command/status */</div><div class='add'>+#define   GMBUS_SW_CLR_INT	(1&lt;&lt;31)</div><div class='add'>+#define   GMBUS_SW_RDY		(1&lt;&lt;30)</div><div class='add'>+#define   GMBUS_ENT		(1&lt;&lt;29) /* enable timeout */</div><div class='add'>+#define   GMBUS_CYCLE_NONE	(0&lt;&lt;25)</div><div class='add'>+#define   GMBUS_CYCLE_WAIT	(1&lt;&lt;25)</div><div class='add'>+#define   GMBUS_CYCLE_INDEX	(2&lt;&lt;25)</div><div class='add'>+#define   GMBUS_CYCLE_STOP	(4&lt;&lt;25)</div><div class='add'>+#define   GMBUS_BYTE_COUNT_SHIFT 16</div><div class='add'>+#define   GMBUS_SLAVE_INDEX_SHIFT 8</div><div class='add'>+#define   GMBUS_SLAVE_ADDR_SHIFT 1</div><div class='add'>+#define   GMBUS_SLAVE_READ	(1&lt;&lt;0)</div><div class='add'>+#define   GMBUS_SLAVE_WRITE	(0&lt;&lt;0)</div><div class='add'>+#define GMBUS2			0x5108 /* status */</div><div class='add'>+#define   GMBUS_INUSE		(1&lt;&lt;15)</div><div class='add'>+#define   GMBUS_HW_WAIT_PHASE	(1&lt;&lt;14)</div><div class='add'>+#define   GMBUS_STALL_TIMEOUT	(1&lt;&lt;13)</div><div class='add'>+#define   GMBUS_INT		(1&lt;&lt;12)</div><div class='add'>+#define   GMBUS_HW_RDY		(1&lt;&lt;11)</div><div class='add'>+#define   GMBUS_SATOER		(1&lt;&lt;10)</div><div class='add'>+#define   GMBUS_ACTIVE		(1&lt;&lt;9)</div><div class='add'>+#define GMBUS3			0x510c /* data buffer bytes 3-0 */</div><div class='add'>+#define GMBUS4			0x5110 /* interrupt mask (Pineview+) */</div><div class='add'>+#define   GMBUS_SLAVE_TIMEOUT_EN (1&lt;&lt;4)</div><div class='add'>+#define   GMBUS_NAK_EN		(1&lt;&lt;3)</div><div class='add'>+#define   GMBUS_IDLE_EN		(1&lt;&lt;2)</div><div class='add'>+#define   GMBUS_HW_WAIT_EN	(1&lt;&lt;1)</div><div class='add'>+#define   GMBUS_HW_RDY_EN	(1&lt;&lt;0)</div><div class='add'>+#define GMBUS5			0x5120 /* byte index */</div><div class='add'>+#define   GMBUS_2BYTE_INDEX_EN	(1&lt;&lt;31)</div><div class='add'>+</div><div class='add'>+#define BLC_PWM_CTL		0x61254</div><div class='add'>+#define BLC_PWM_CTL2		0x61250</div><div class='add'>+#define BLC_PWM_CTL_C		0x62254</div><div class='add'>+#define BLC_PWM_CTL2_C		0x62250</div><div class='add'>+#define BACKLIGHT_MODULATION_FREQ_SHIFT		(17)</div><div class='add'>+/*</div><div class='add'>+ * This is the most significant 15 bits of the number of backlight cycles in a</div><div class='add'>+ * complete cycle of the modulated backlight control.</div><div class='add'>+ *</div><div class='add'>+ * The actual value is this field multiplied by two.</div><div class='add'>+ */</div><div class='add'>+#define BACKLIGHT_MODULATION_FREQ_MASK	(0x7fff &lt;&lt; 17)</div><div class='add'>+#define BLM_LEGACY_MODE			(1 &lt;&lt; 16)</div><div class='add'>+/*</div><div class='add'>+ * This is the number of cycles out of the backlight modulation cycle for which</div><div class='add'>+ * the backlight is on.</div><div class='add'>+ *</div><div class='add'>+ * This field must be no greater than the number of cycles in the complete</div><div class='add'>+ * backlight modulation cycle.</div><div class='add'>+ */</div><div class='add'>+#define BACKLIGHT_DUTY_CYCLE_SHIFT	(0)</div><div class='add'>+#define BACKLIGHT_DUTY_CYCLE_MASK	(0xffff)</div><div class='add'>+</div><div class='add'>+#define I915_GCFGC			0xf0</div><div class='add'>+#define I915_LOW_FREQUENCY_ENABLE	(1 &lt;&lt; 7)</div><div class='add'>+#define I915_DISPLAY_CLOCK_190_200_MHZ	(0 &lt;&lt; 4)</div><div class='add'>+#define I915_DISPLAY_CLOCK_333_MHZ	(4 &lt;&lt; 4)</div><div class='add'>+#define I915_DISPLAY_CLOCK_MASK		(7 &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+#define I855_HPLLCC			0xc0</div><div class='add'>+#define I855_CLOCK_CONTROL_MASK		(3 &lt;&lt; 0)</div><div class='add'>+#define I855_CLOCK_133_200		(0 &lt;&lt; 0)</div><div class='add'>+#define I855_CLOCK_100_200		(1 &lt;&lt; 0)</div><div class='add'>+#define I855_CLOCK_100_133		(2 &lt;&lt; 0)</div><div class='add'>+#define I855_CLOCK_166_250		(3 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* I830 CRTC registers */</div><div class='add'>+#define HTOTAL_A		0x60000</div><div class='add'>+#define HBLANK_A		0x60004</div><div class='add'>+#define HSYNC_A			0x60008</div><div class='add'>+#define VTOTAL_A		0x6000c</div><div class='add'>+#define VBLANK_A		0x60010</div><div class='add'>+#define VSYNC_A			0x60014</div><div class='add'>+#define PIPEASRC		0x6001c</div><div class='add'>+#define BCLRPAT_A		0x60020</div><div class='add'>+#define VSYNCSHIFT_A		0x60028</div><div class='add'>+</div><div class='add'>+#define HTOTAL_B		0x61000</div><div class='add'>+#define HBLANK_B		0x61004</div><div class='add'>+#define HSYNC_B			0x61008</div><div class='add'>+#define VTOTAL_B		0x6100c</div><div class='add'>+#define VBLANK_B		0x61010</div><div class='add'>+#define VSYNC_B			0x61014</div><div class='add'>+#define PIPEBSRC		0x6101c</div><div class='add'>+#define BCLRPAT_B		0x61020</div><div class='add'>+#define VSYNCSHIFT_B		0x61028</div><div class='add'>+</div><div class='add'>+#define HTOTAL_C		0x62000</div><div class='add'>+#define HBLANK_C		0x62004</div><div class='add'>+#define HSYNC_C			0x62008</div><div class='add'>+#define VTOTAL_C		0x6200c</div><div class='add'>+#define VBLANK_C		0x62010</div><div class='add'>+#define VSYNC_C			0x62014</div><div class='add'>+#define PIPECSRC		0x6201c</div><div class='add'>+#define BCLRPAT_C		0x62020</div><div class='add'>+#define VSYNCSHIFT_C		0x62028</div><div class='add'>+</div><div class='add'>+#define PP_STATUS		0x61200</div><div class='add'>+# define PP_ON				(1 &lt;&lt; 31)</div><div class='add'>+/*</div><div class='add'>+ * Indicates that all dependencies of the panel are on:</div><div class='add'>+ *</div><div class='add'>+ * - PLL enabled</div><div class='add'>+ * - pipe enabled</div><div class='add'>+ * - LVDS/DVOB/DVOC on</div><div class='add'>+ */</div><div class='add'>+#define PP_READY			(1 &lt;&lt; 30)</div><div class='add'>+#define PP_SEQUENCE_NONE		(0 &lt;&lt; 28)</div><div class='add'>+#define PP_SEQUENCE_ON			(1 &lt;&lt; 28)</div><div class='add'>+#define PP_SEQUENCE_OFF			(2 &lt;&lt; 28)</div><div class='add'>+#define PP_SEQUENCE_MASK		0x30000000</div><div class='add'>+#define PP_CONTROL		0x61204</div><div class='add'>+#define POWER_TARGET_ON			(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define LVDSPP_ON		0x61208</div><div class='add'>+#define LVDSPP_OFF		0x6120c</div><div class='add'>+#define PP_CYCLE		0x61210</div><div class='add'>+</div><div class='add'>+#define PFIT_CONTROL		0x61230</div><div class='add'>+#define PFIT_ENABLE			(1 &lt;&lt; 31)</div><div class='add'>+#define PFIT_PIPE_MASK			(3 &lt;&lt; 29)</div><div class='add'>+#define PFIT_PIPE_SHIFT			29</div><div class='add'>+#define PFIT_SCALING_MODE_PILLARBOX	(1 &lt;&lt; 27)</div><div class='add'>+#define PFIT_SCALING_MODE_LETTERBOX	(3 &lt;&lt; 26)</div><div class='add'>+#define VERT_INTERP_DISABLE		(0 &lt;&lt; 10)</div><div class='add'>+#define VERT_INTERP_BILINEAR		(1 &lt;&lt; 10)</div><div class='add'>+#define VERT_INTERP_MASK		(3 &lt;&lt; 10)</div><div class='add'>+#define VERT_AUTO_SCALE			(1 &lt;&lt; 9)</div><div class='add'>+#define HORIZ_INTERP_DISABLE		(0 &lt;&lt; 6)</div><div class='add'>+#define HORIZ_INTERP_BILINEAR		(1 &lt;&lt; 6)</div><div class='add'>+#define HORIZ_INTERP_MASK		(3 &lt;&lt; 6)</div><div class='add'>+#define HORIZ_AUTO_SCALE		(1 &lt;&lt; 5)</div><div class='add'>+#define PANEL_8TO6_DITHER_ENABLE	(1 &lt;&lt; 3)</div><div class='add'>+</div><div class='add'>+#define PFIT_PGM_RATIOS		0x61234</div><div class='add'>+#define PFIT_VERT_SCALE_MASK			0xfff00000</div><div class='add'>+#define PFIT_HORIZ_SCALE_MASK			0x0000fff0</div><div class='add'>+</div><div class='add'>+#define PFIT_AUTO_RATIOS	0x61238</div><div class='add'>+</div><div class='add'>+#define DPLL_A			0x06014</div><div class='add'>+#define DPLL_B			0x06018</div><div class='add'>+#define DPLL_VCO_ENABLE			(1 &lt;&lt; 31)</div><div class='add'>+#define DPLL_DVO_HIGH_SPEED		(1 &lt;&lt; 30)</div><div class='add'>+#define DPLL_SYNCLOCK_ENABLE		(1 &lt;&lt; 29)</div><div class='add'>+#define DPLL_VGA_MODE_DIS		(1 &lt;&lt; 28)</div><div class='add'>+#define DPLLB_MODE_DAC_SERIAL		(1 &lt;&lt; 26)	/* i915 */</div><div class='add'>+#define DPLLB_MODE_LVDS			(2 &lt;&lt; 26)	/* i915 */</div><div class='add'>+#define DPLL_MODE_MASK			(3 &lt;&lt; 26)</div><div class='add'>+#define DPLL_DAC_SERIAL_P2_CLOCK_DIV_10	(0 &lt;&lt; 24)	/* i915 */</div><div class='add'>+#define DPLL_DAC_SERIAL_P2_CLOCK_DIV_5	(1 &lt;&lt; 24)	/* i915 */</div><div class='add'>+#define DPLLB_LVDS_P2_CLOCK_DIV_14	(0 &lt;&lt; 24)	/* i915 */</div><div class='add'>+#define DPLLB_LVDS_P2_CLOCK_DIV_7	(1 &lt;&lt; 24)	/* i915 */</div><div class='add'>+#define DPLL_P2_CLOCK_DIV_MASK		0x03000000	/* i915 */</div><div class='add'>+#define DPLL_FPA01_P1_POST_DIV_MASK	0x00ff0000	/* i915 */</div><div class='add'>+#define DPLL_LOCK			(1 &lt;&lt; 15)	/* CDV */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The i830 generation, in DAC/serial mode, defines p1 as two plus this</div><div class='add'>+ * bitfield, or just 2 if PLL_P1_DIVIDE_BY_TWO is set.</div><div class='add'>+ */</div><div class='add'>+# define DPLL_FPA01_P1_POST_DIV_MASK_I830	0x001f0000</div><div class='add'>+/*</div><div class='add'>+ * The i830 generation, in LVDS mode, defines P1 as the bit number set within</div><div class='add'>+ * this field (only one bit may be set).</div><div class='add'>+ */</div><div class='add'>+#define DPLL_FPA01_P1_POST_DIV_MASK_I830_LVDS	0x003f0000</div><div class='add'>+#define DPLL_FPA01_P1_POST_DIV_SHIFT	16</div><div class='add'>+#define PLL_P2_DIVIDE_BY_4		(1 &lt;&lt; 23)	/* i830, required</div><div class='add'>+							 * in DVO non-gang */</div><div class='add'>+# define PLL_P1_DIVIDE_BY_TWO		(1 &lt;&lt; 21)	/* i830 */</div><div class='add'>+#define PLL_REF_INPUT_DREFCLK		(0 &lt;&lt; 13)</div><div class='add'>+#define PLL_REF_INPUT_TVCLKINA		(1 &lt;&lt; 13)	/* i830 */</div><div class='add'>+#define PLL_REF_INPUT_TVCLKINBC		(2 &lt;&lt; 13)	/* SDVO</div><div class='add'>+								 * TVCLKIN */</div><div class='add'>+#define PLLB_REF_INPUT_SPREADSPECTRUMIN	(3 &lt;&lt; 13)</div><div class='add'>+#define PLL_REF_INPUT_MASK		(3 &lt;&lt; 13)</div><div class='add'>+#define PLL_LOAD_PULSE_PHASE_SHIFT	9</div><div class='add'>+/*</div><div class='add'>+ * Parallel to Serial Load Pulse phase selection.</div><div class='add'>+ * Selects the phase for the 10X DPLL clock for the PCIe</div><div class='add'>+ * digital display port. The range is 4 to 13; 10 or more</div><div class='add'>+ * is just a flip delay. The default is 6</div><div class='add'>+ */</div><div class='add'>+#define PLL_LOAD_PULSE_PHASE_MASK	(0xf &lt;&lt; PLL_LOAD_PULSE_PHASE_SHIFT)</div><div class='add'>+#define DISPLAY_RATE_SELECT_FPA1	(1 &lt;&lt; 8)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SDVO multiplier for 945G/GM. Not used on 965.</div><div class='add'>+ *</div><div class='add'>+ * DPLL_MD_UDI_MULTIPLIER_MASK</div><div class='add'>+ */</div><div class='add'>+#define SDVO_MULTIPLIER_MASK		0x000000ff</div><div class='add'>+#define SDVO_MULTIPLIER_SHIFT_HIRES	4</div><div class='add'>+#define SDVO_MULTIPLIER_SHIFT_VGA	0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PLL_MD</div><div class='add'>+ */</div><div class='add'>+/* Pipe A SDVO/UDI clock multiplier/divider register for G965. */</div><div class='add'>+#define DPLL_A_MD		0x0601c</div><div class='add'>+/* Pipe B SDVO/UDI clock multiplier/divider register for G965. */</div><div class='add'>+#define DPLL_B_MD		0x06020</div><div class='add'>+/*</div><div class='add'>+ * UDI pixel divider, controlling how many pixels are stuffed into a packet.</div><div class='add'>+ *</div><div class='add'>+ * Value is pixels minus 1.  Must be set to 1 pixel for SDVO.</div><div class='add'>+ */</div><div class='add'>+#define DPLL_MD_UDI_DIVIDER_MASK	0x3f000000</div><div class='add'>+#define DPLL_MD_UDI_DIVIDER_SHIFT	24</div><div class='add'>+/* UDI pixel divider for VGA, same as DPLL_MD_UDI_DIVIDER_MASK. */</div><div class='add'>+#define DPLL_MD_VGA_UDI_DIVIDER_MASK	0x003f0000</div><div class='add'>+#define DPLL_MD_VGA_UDI_DIVIDER_SHIFT	16</div><div class='add'>+/*</div><div class='add'>+ * SDVO/UDI pixel multiplier.</div><div class='add'>+ *</div><div class='add'>+ * SDVO requires that the bus clock rate be between 1 and 2 Ghz, and the bus</div><div class='add'>+ * clock rate is 10 times the DPLL clock.  At low resolution/refresh rate</div><div class='add'>+ * modes, the bus rate would be below the limits, so SDVO allows for stuffing</div><div class='add'>+ * dummy bytes in the datastream at an increased clock rate, with both sides of</div><div class='add'>+ * the link knowing how many bytes are fill.</div><div class='add'>+ *</div><div class='add'>+ * So, for a mode with a dotclock of 65Mhz, we would want to double the clock</div><div class='add'>+ * rate to 130Mhz to get a bus rate of 1.30Ghz.  The DPLL clock rate would be</div><div class='add'>+ * set to 130Mhz, and the SDVO multiplier set to 2x in this register and</div><div class='add'>+ * through an SDVO command.</div><div class='add'>+ *</div><div class='add'>+ * This register field has values of multiplication factor minus 1, with</div><div class='add'>+ * a maximum multiplier of 5 for SDVO.</div><div class='add'>+ */</div><div class='add'>+#define DPLL_MD_UDI_MULTIPLIER_MASK	0x00003f00</div><div class='add'>+#define DPLL_MD_UDI_MULTIPLIER_SHIFT	8</div><div class='add'>+/*</div><div class='add'>+ * SDVO/UDI pixel multiplier for VGA, same as DPLL_MD_UDI_MULTIPLIER_MASK.</div><div class='add'>+ * This best be set to the default value (3) or the CRT won't work. No,</div><div class='add'>+ * I don't entirely understand what this does...</div><div class='add'>+ */</div><div class='add'>+#define DPLL_MD_VGA_UDI_MULTIPLIER_MASK	0x0000003f</div><div class='add'>+#define DPLL_MD_VGA_UDI_MULTIPLIER_SHIFT 0</div><div class='add'>+</div><div class='add'>+#define DPLL_TEST		0x606c</div><div class='add'>+#define DPLLB_TEST_SDVO_DIV_1		(0 &lt;&lt; 22)</div><div class='add'>+#define DPLLB_TEST_SDVO_DIV_2		(1 &lt;&lt; 22)</div><div class='add'>+#define DPLLB_TEST_SDVO_DIV_4		(2 &lt;&lt; 22)</div><div class='add'>+#define DPLLB_TEST_SDVO_DIV_MASK	(3 &lt;&lt; 22)</div><div class='add'>+#define DPLLB_TEST_N_BYPASS		(1 &lt;&lt; 19)</div><div class='add'>+#define DPLLB_TEST_M_BYPASS		(1 &lt;&lt; 18)</div><div class='add'>+#define DPLLB_INPUT_BUFFER_ENABLE	(1 &lt;&lt; 16)</div><div class='add'>+#define DPLLA_TEST_N_BYPASS		(1 &lt;&lt; 3)</div><div class='add'>+#define DPLLA_TEST_M_BYPASS		(1 &lt;&lt; 2)</div><div class='add'>+#define DPLLA_INPUT_BUFFER_ENABLE	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define ADPA			0x61100</div><div class='add'>+#define ADPA_DAC_ENABLE			(1 &lt;&lt; 31)</div><div class='add'>+#define ADPA_DAC_DISABLE		0</div><div class='add'>+#define ADPA_PIPE_SELECT_MASK		(1 &lt;&lt; 30)</div><div class='add'>+#define ADPA_PIPE_A_SELECT		0</div><div class='add'>+#define ADPA_PIPE_B_SELECT		(1 &lt;&lt; 30)</div><div class='add'>+#define ADPA_USE_VGA_HVPOLARITY		(1 &lt;&lt; 15)</div><div class='add'>+#define ADPA_SETS_HVPOLARITY		0</div><div class='add'>+#define ADPA_VSYNC_CNTL_DISABLE		(1 &lt;&lt; 11)</div><div class='add'>+#define ADPA_VSYNC_CNTL_ENABLE		0</div><div class='add'>+#define ADPA_HSYNC_CNTL_DISABLE		(1 &lt;&lt; 10)</div><div class='add'>+#define ADPA_HSYNC_CNTL_ENABLE		0</div><div class='add'>+#define ADPA_VSYNC_ACTIVE_HIGH		(1 &lt;&lt; 4)</div><div class='add'>+#define ADPA_VSYNC_ACTIVE_LOW		0</div><div class='add'>+#define ADPA_HSYNC_ACTIVE_HIGH		(1 &lt;&lt; 3)</div><div class='add'>+#define ADPA_HSYNC_ACTIVE_LOW		0</div><div class='add'>+</div><div class='add'>+#define FPA0			0x06040</div><div class='add'>+#define FPA1			0x06044</div><div class='add'>+#define FPB0			0x06048</div><div class='add'>+#define FPB1			0x0604c</div><div class='add'>+#define FP_N_DIV_MASK			0x003f0000</div><div class='add'>+#define FP_N_DIV_SHIFT			16</div><div class='add'>+#define FP_M1_DIV_MASK			0x00003f00</div><div class='add'>+#define FP_M1_DIV_SHIFT			8</div><div class='add'>+#define FP_M2_DIV_MASK			0x0000003f</div><div class='add'>+#define FP_M2_DIV_SHIFT			0</div><div class='add'>+</div><div class='add'>+#define PORT_HOTPLUG_EN		0x61110</div><div class='add'>+#define SDVOB_HOTPLUG_INT_EN		(1 &lt;&lt; 26)</div><div class='add'>+#define SDVOC_HOTPLUG_INT_EN		(1 &lt;&lt; 25)</div><div class='add'>+#define TV_HOTPLUG_INT_EN		(1 &lt;&lt; 18)</div><div class='add'>+#define CRT_HOTPLUG_INT_EN		(1 &lt;&lt; 9)</div><div class='add'>+#define CRT_HOTPLUG_FORCE_DETECT	(1 &lt;&lt; 3)</div><div class='add'>+/* CDV.. */</div><div class='add'>+#define CRT_HOTPLUG_ACTIVATION_PERIOD_64	(1 &lt;&lt; 8)</div><div class='add'>+#define CRT_HOTPLUG_DAC_ON_TIME_2M		(0 &lt;&lt; 7)</div><div class='add'>+#define CRT_HOTPLUG_DAC_ON_TIME_4M		(1 &lt;&lt; 7)</div><div class='add'>+#define CRT_HOTPLUG_VOLTAGE_COMPARE_40		(0 &lt;&lt; 5)</div><div class='add'>+#define CRT_HOTPLUG_VOLTAGE_COMPARE_50		(1 &lt;&lt; 5)</div><div class='add'>+#define CRT_HOTPLUG_VOLTAGE_COMPARE_60		(2 &lt;&lt; 5)</div><div class='add'>+#define CRT_HOTPLUG_VOLTAGE_COMPARE_70		(3 &lt;&lt; 5)</div><div class='add'>+#define CRT_HOTPLUG_VOLTAGE_COMPARE_MASK	(3 &lt;&lt; 5)</div><div class='add'>+#define CRT_HOTPLUG_DETECT_DELAY_1G		(0 &lt;&lt; 4)</div><div class='add'>+#define CRT_HOTPLUG_DETECT_DELAY_2G		(1 &lt;&lt; 4)</div><div class='add'>+#define CRT_HOTPLUG_DETECT_VOLTAGE_325MV	(0 &lt;&lt; 2)</div><div class='add'>+#define CRT_HOTPLUG_DETECT_VOLTAGE_475MV	(1 &lt;&lt; 2)</div><div class='add'>+#define CRT_HOTPLUG_DETECT_MASK			0x000000F8</div><div class='add'>+</div><div class='add'>+#define PORT_HOTPLUG_STAT	0x61114</div><div class='add'>+#define CRT_HOTPLUG_INT_STATUS		(1 &lt;&lt; 11)</div><div class='add'>+#define TV_HOTPLUG_INT_STATUS		(1 &lt;&lt; 10)</div><div class='add'>+#define CRT_HOTPLUG_MONITOR_MASK	(3 &lt;&lt; 8)</div><div class='add'>+#define CRT_HOTPLUG_MONITOR_COLOR	(3 &lt;&lt; 8)</div><div class='add'>+#define CRT_HOTPLUG_MONITOR_MONO	(2 &lt;&lt; 8)</div><div class='add'>+#define CRT_HOTPLUG_MONITOR_NONE	(0 &lt;&lt; 8)</div><div class='add'>+#define SDVOC_HOTPLUG_INT_STATUS	(1 &lt;&lt; 7)</div><div class='add'>+#define SDVOB_HOTPLUG_INT_STATUS	(1 &lt;&lt; 6)</div><div class='add'>+</div><div class='add'>+#define SDVOB			0x61140</div><div class='add'>+#define SDVOC			0x61160</div><div class='add'>+#define SDVO_ENABLE			(1 &lt;&lt; 31)</div><div class='add'>+#define SDVO_PIPE_B_SELECT		(1 &lt;&lt; 30)</div><div class='add'>+#define SDVO_STALL_SELECT		(1 &lt;&lt; 29)</div><div class='add'>+#define SDVO_INTERRUPT_ENABLE		(1 &lt;&lt; 26)</div><div class='add'>+#define SDVO_COLOR_RANGE_16_235		(1 &lt;&lt; 8)</div><div class='add'>+#define SDVO_AUDIO_ENABLE		(1 &lt;&lt; 6)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * 915G/GM SDVO pixel multiplier.</div><div class='add'>+ *</div><div class='add'>+ * Programmed value is multiplier - 1, up to 5x.</div><div class='add'>+ *</div><div class='add'>+ * DPLL_MD_UDI_MULTIPLIER_MASK</div><div class='add'>+ */</div><div class='add'>+#define SDVO_PORT_MULTIPLY_MASK		(7 &lt;&lt; 23)</div><div class='add'>+#define SDVO_PORT_MULTIPLY_SHIFT	23</div><div class='add'>+#define SDVO_PHASE_SELECT_MASK		(15 &lt;&lt; 19)</div><div class='add'>+#define SDVO_PHASE_SELECT_DEFAULT	(6 &lt;&lt; 19)</div><div class='add'>+#define SDVO_CLOCK_OUTPUT_INVERT	(1 &lt;&lt; 18)</div><div class='add'>+#define SDVOC_GANG_MODE			(1 &lt;&lt; 16)</div><div class='add'>+#define SDVO_BORDER_ENABLE		(1 &lt;&lt; 7)</div><div class='add'>+#define SDVOB_PCIE_CONCURRENCY		(1 &lt;&lt; 3)</div><div class='add'>+#define SDVO_DETECTED			(1 &lt;&lt; 2)</div><div class='add'>+/* Bits to be preserved when writing */</div><div class='add'>+#define SDVOB_PRESERVE_MASK		((1 &lt;&lt; 17) | (1 &lt;&lt; 16) | (1 &lt;&lt; 14))</div><div class='add'>+#define SDVOC_PRESERVE_MASK		(1 &lt;&lt; 17)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This register controls the LVDS output enable, pipe selection, and data</div><div class='add'>+ * format selection.</div><div class='add'>+ *</div><div class='add'>+ * All of the clock/data pairs are force powered down by power sequencing.</div><div class='add'>+ */</div><div class='add'>+#define LVDS			0x61180</div><div class='add'>+/*</div><div class='add'>+ * Enables the LVDS port.  This bit must be set before DPLLs are enabled, as</div><div class='add'>+ * the DPLL semantics change when the LVDS is assigned to that pipe.</div><div class='add'>+ */</div><div class='add'>+#define LVDS_PORT_EN			(1 &lt;&lt; 31)</div><div class='add'>+/* Selects pipe B for LVDS data.  Must be set on pre-965. */</div><div class='add'>+#define LVDS_PIPEB_SELECT		(1 &lt;&lt; 30)</div><div class='add'>+</div><div class='add'>+/* Turns on border drawing to allow centered display. */</div><div class='add'>+#define LVDS_BORDER_EN			(1 &lt;&lt; 15)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enables the A0-A2 data pairs and CLKA, containing 18 bits of color data per</div><div class='add'>+ * pixel.</div><div class='add'>+ */</div><div class='add'>+#define LVDS_A0A2_CLKA_POWER_MASK	(3 &lt;&lt; 8)</div><div class='add'>+#define LVDS_A0A2_CLKA_POWER_DOWN	(0 &lt;&lt; 8)</div><div class='add'>+#define LVDS_A0A2_CLKA_POWER_UP		(3 &lt;&lt; 8)</div><div class='add'>+/*</div><div class='add'>+ * Controls the A3 data pair, which contains the additional LSBs for 24 bit</div><div class='add'>+ * mode.  Only enabled if LVDS_A0A2_CLKA_POWER_UP also indicates it should be</div><div class='add'>+ * on.</div><div class='add'>+ */</div><div class='add'>+#define LVDS_A3_POWER_MASK		(3 &lt;&lt; 6)</div><div class='add'>+#define LVDS_A3_POWER_DOWN		(0 &lt;&lt; 6)</div><div class='add'>+#define LVDS_A3_POWER_UP		(3 &lt;&lt; 6)</div><div class='add'>+/*</div><div class='add'>+ * Controls the CLKB pair.  This should only be set when LVDS_B0B3_POWER_UP</div><div class='add'>+ * is set.</div><div class='add'>+ */</div><div class='add'>+#define LVDS_CLKB_POWER_MASK		(3 &lt;&lt; 4)</div><div class='add'>+#define LVDS_CLKB_POWER_DOWN		(0 &lt;&lt; 4)</div><div class='add'>+#define LVDS_CLKB_POWER_UP		(3 &lt;&lt; 4)</div><div class='add'>+/*</div><div class='add'>+ * Controls the B0-B3 data pairs.  This must be set to match the DPLL p2</div><div class='add'>+ * setting for whether we are in dual-channel mode.  The B3 pair will</div><div class='add'>+ * additionally only be powered up when LVDS_A3_POWER_UP is set.</div><div class='add'>+ */</div><div class='add'>+#define LVDS_B0B3_POWER_MASK		(3 &lt;&lt; 2)</div><div class='add'>+#define LVDS_B0B3_POWER_DOWN		(0 &lt;&lt; 2)</div><div class='add'>+#define LVDS_B0B3_POWER_UP		(3 &lt;&lt; 2)</div><div class='add'>+</div><div class='add'>+#define PIPEACONF		0x70008</div><div class='add'>+#define PIPEACONF_ENABLE		(1 &lt;&lt; 31)</div><div class='add'>+#define PIPEACONF_DISABLE		0</div><div class='add'>+#define PIPEACONF_DOUBLE_WIDE		(1 &lt;&lt; 30)</div><div class='add'>+#define PIPECONF_ACTIVE			(1 &lt;&lt; 30)</div><div class='add'>+#define I965_PIPECONF_ACTIVE		(1 &lt;&lt; 30)</div><div class='add'>+#define PIPECONF_DSIPLL_LOCK		(1 &lt;&lt; 29)</div><div class='add'>+#define PIPEACONF_SINGLE_WIDE		0</div><div class='add'>+#define PIPEACONF_PIPE_UNLOCKED		0</div><div class='add'>+#define PIPEACONF_DSR			(1 &lt;&lt; 26)</div><div class='add'>+#define PIPEACONF_PIPE_LOCKED		(1 &lt;&lt; 25)</div><div class='add'>+#define PIPEACONF_PALETTE		0</div><div class='add'>+#define PIPECONF_FORCE_BORDER		(1 &lt;&lt; 25)</div><div class='add'>+#define PIPEACONF_GAMMA			(1 &lt;&lt; 24)</div><div class='add'>+#define PIPECONF_PROGRESSIVE		(0 &lt;&lt; 21)</div><div class='add'>+#define PIPECONF_INTERLACE_W_FIELD_INDICATION	(6 &lt;&lt; 21)</div><div class='add'>+#define PIPECONF_INTERLACE_FIELD_0_ONLY		(7 &lt;&lt; 21)</div><div class='add'>+#define PIPECONF_PLANE_OFF		(1 &lt;&lt; 19)</div><div class='add'>+#define PIPECONF_CURSOR_OFF		(1 &lt;&lt; 18)</div><div class='add'>+</div><div class='add'>+#define PIPEBCONF		0x71008</div><div class='add'>+#define PIPEBCONF_ENABLE		(1 &lt;&lt; 31)</div><div class='add'>+#define PIPEBCONF_DISABLE		0</div><div class='add'>+#define PIPEBCONF_DOUBLE_WIDE		(1 &lt;&lt; 30)</div><div class='add'>+#define PIPEBCONF_DISABLE		0</div><div class='add'>+#define PIPEBCONF_GAMMA			(1 &lt;&lt; 24)</div><div class='add'>+#define PIPEBCONF_PALETTE		0</div><div class='add'>+</div><div class='add'>+#define PIPECCONF		0x72008</div><div class='add'>+</div><div class='add'>+#define PIPEBGCMAXRED		0x71010</div><div class='add'>+#define PIPEBGCMAXGREEN		0x71014</div><div class='add'>+#define PIPEBGCMAXBLUE		0x71018</div><div class='add'>+</div><div class='add'>+#define PIPEASTAT		0x70024</div><div class='add'>+#define PIPEBSTAT		0x71024</div><div class='add'>+#define PIPECSTAT		0x72024</div><div class='add'>+#define PIPE_VBLANK_INTERRUPT_STATUS		(1UL &lt;&lt; 1)</div><div class='add'>+#define PIPE_START_VBLANK_INTERRUPT_STATUS	(1UL &lt;&lt; 2)</div><div class='add'>+#define PIPE_VBLANK_CLEAR			(1 &lt;&lt; 1)</div><div class='add'>+#define PIPE_VBLANK_STATUS			(1 &lt;&lt; 1)</div><div class='add'>+#define PIPE_TE_STATUS				(1UL &lt;&lt; 6)</div><div class='add'>+#define PIPE_DPST_EVENT_STATUS			(1UL &lt;&lt; 7)</div><div class='add'>+#define PIPE_VSYNC_CLEAR			(1UL &lt;&lt; 9)</div><div class='add'>+#define PIPE_VSYNC_STATUS			(1UL &lt;&lt; 9)</div><div class='add'>+#define PIPE_HDMI_AUDIO_UNDERRUN_STATUS		(1UL &lt;&lt; 10)</div><div class='add'>+#define PIPE_HDMI_AUDIO_BUFFER_DONE_STATUS	(1UL &lt;&lt; 11)</div><div class='add'>+#define PIPE_VBLANK_INTERRUPT_ENABLE		(1UL &lt;&lt; 17)</div><div class='add'>+#define PIPE_START_VBLANK_INTERRUPT_ENABLE	(1UL &lt;&lt; 18)</div><div class='add'>+#define PIPE_TE_ENABLE				(1UL &lt;&lt; 22)</div><div class='add'>+#define PIPE_DPST_EVENT_ENABLE			(1UL &lt;&lt; 23)</div><div class='add'>+#define PIPE_VSYNC_ENABL			(1UL &lt;&lt; 25)</div><div class='add'>+#define PIPE_HDMI_AUDIO_UNDERRUN		(1UL &lt;&lt; 26)</div><div class='add'>+#define PIPE_HDMI_AUDIO_BUFFER_DONE		(1UL &lt;&lt; 27)</div><div class='add'>+#define PIPE_HDMI_AUDIO_INT_MASK		(PIPE_HDMI_AUDIO_UNDERRUN | \</div><div class='add'>+						PIPE_HDMI_AUDIO_BUFFER_DONE)</div><div class='add'>+#define PIPE_EVENT_MASK ((1 &lt;&lt; 29)|(1 &lt;&lt; 28)|(1 &lt;&lt; 27)|(1 &lt;&lt; 26)|(1 &lt;&lt; 24)|(1 &lt;&lt; 23)|(1 &lt;&lt; 22)|(1 &lt;&lt; 21)|(1 &lt;&lt; 20)|(1 &lt;&lt; 16))</div><div class='add'>+#define PIPE_VBLANK_MASK ((1 &lt;&lt; 25)|(1 &lt;&lt; 24)|(1 &lt;&lt; 18)|(1 &lt;&lt; 17))</div><div class='add'>+#define HISTOGRAM_INT_CONTROL		0x61268</div><div class='add'>+#define HISTOGRAM_BIN_DATA		0X61264</div><div class='add'>+#define HISTOGRAM_LOGIC_CONTROL		0x61260</div><div class='add'>+#define PWM_CONTROL_LOGIC		0x61250</div><div class='add'>+#define PIPE_HOTPLUG_INTERRUPT_STATUS		(1UL &lt;&lt; 10)</div><div class='add'>+#define HISTOGRAM_INTERRUPT_ENABLE		(1UL &lt;&lt; 31)</div><div class='add'>+#define HISTOGRAM_LOGIC_ENABLE			(1UL &lt;&lt; 31)</div><div class='add'>+#define PWM_LOGIC_ENABLE			(1UL &lt;&lt; 31)</div><div class='add'>+#define PWM_PHASEIN_ENABLE			(1UL &lt;&lt; 25)</div><div class='add'>+#define PWM_PHASEIN_INT_ENABLE			(1UL &lt;&lt; 24)</div><div class='add'>+#define PWM_PHASEIN_VB_COUNT			0x00001f00</div><div class='add'>+#define PWM_PHASEIN_INC				0x0000001f</div><div class='add'>+#define HISTOGRAM_INT_CTRL_CLEAR		(1UL &lt;&lt; 30)</div><div class='add'>+#define DPST_YUV_LUMA_MODE			0</div><div class='add'>+</div><div class='add'>+struct dpst_ie_histogram_control {</div><div class='add'>+	union {</div><div class='add'>+		uint32_t data;</div><div class='add'>+		struct {</div><div class='add'>+			uint32_t bin_reg_index:7;</div><div class='add'>+			uint32_t reserved:4;</div><div class='add'>+			uint32_t bin_reg_func_select:1;</div><div class='add'>+			uint32_t sync_to_phase_in:1;</div><div class='add'>+			uint32_t alt_enhancement_mode:2;</div><div class='add'>+			uint32_t reserved1:1;</div><div class='add'>+			uint32_t sync_to_phase_in_count:8;</div><div class='add'>+			uint32_t histogram_mode_select:1;</div><div class='add'>+			uint32_t reserved2:4;</div><div class='add'>+			uint32_t ie_pipe_assignment:1;</div><div class='add'>+			uint32_t ie_mode_table_enabled:1;</div><div class='add'>+			uint32_t ie_histogram_enable:1;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpst_guardband {</div><div class='add'>+	union {</div><div class='add'>+		uint32_t data;</div><div class='add'>+		struct {</div><div class='add'>+			uint32_t guardband:22;</div><div class='add'>+			uint32_t guardband_interrupt_delay:8;</div><div class='add'>+			uint32_t interrupt_status:1;</div><div class='add'>+			uint32_t interrupt_enable:1;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PIPEAFRAMEHIGH		0x70040</div><div class='add'>+#define PIPEAFRAMEPIXEL		0x70044</div><div class='add'>+#define PIPEBFRAMEHIGH		0x71040</div><div class='add'>+#define PIPEBFRAMEPIXEL		0x71044</div><div class='add'>+#define PIPECFRAMEHIGH		0x72040</div><div class='add'>+#define PIPECFRAMEPIXEL		0x72044</div><div class='add'>+#define PIPE_FRAME_HIGH_MASK	0x0000ffff</div><div class='add'>+#define PIPE_FRAME_HIGH_SHIFT	0</div><div class='add'>+#define PIPE_FRAME_LOW_MASK	0xff000000</div><div class='add'>+#define PIPE_FRAME_LOW_SHIFT	24</div><div class='add'>+#define PIPE_PIXEL_MASK		0x00ffffff</div><div class='add'>+#define PIPE_PIXEL_SHIFT	0</div><div class='add'>+</div><div class='add'>+#define DSPARB			0x70030</div><div class='add'>+#define DSPFW1			0x70034</div><div class='add'>+#define DSPFW2			0x70038</div><div class='add'>+#define DSPFW3			0x7003c</div><div class='add'>+#define DSPFW4			0x70050</div><div class='add'>+#define DSPFW5			0x70054</div><div class='add'>+#define DSPFW6			0x70058</div><div class='add'>+#define DSPCHICKENBIT		0x70400</div><div class='add'>+#define DSPACNTR		0x70180</div><div class='add'>+#define DSPBCNTR		0x71180</div><div class='add'>+#define DSPCCNTR		0x72180</div><div class='add'>+#define DISPLAY_PLANE_ENABLE			(1 &lt;&lt; 31)</div><div class='add'>+#define DISPLAY_PLANE_DISABLE			0</div><div class='add'>+#define DISPPLANE_GAMMA_ENABLE			(1 &lt;&lt; 30)</div><div class='add'>+#define DISPPLANE_GAMMA_DISABLE			0</div><div class='add'>+#define DISPPLANE_PIXFORMAT_MASK		(0xf &lt;&lt; 26)</div><div class='add'>+#define DISPPLANE_8BPP				(0x2 &lt;&lt; 26)</div><div class='add'>+#define DISPPLANE_15_16BPP			(0x4 &lt;&lt; 26)</div><div class='add'>+#define DISPPLANE_16BPP				(0x5 &lt;&lt; 26)</div><div class='add'>+#define DISPPLANE_32BPP_NO_ALPHA		(0x6 &lt;&lt; 26)</div><div class='add'>+#define DISPPLANE_32BPP				(0x7 &lt;&lt; 26)</div><div class='add'>+#define DISPPLANE_STEREO_ENABLE			(1 &lt;&lt; 25)</div><div class='add'>+#define DISPPLANE_STEREO_DISABLE		0</div><div class='add'>+#define DISPPLANE_SEL_PIPE_MASK			(1 &lt;&lt; 24)</div><div class='add'>+#define DISPPLANE_SEL_PIPE_POS			24</div><div class='add'>+#define DISPPLANE_SEL_PIPE_A			0</div><div class='add'>+#define DISPPLANE_SEL_PIPE_B			(1 &lt;&lt; 24)</div><div class='add'>+#define DISPPLANE_SRC_KEY_ENABLE		(1 &lt;&lt; 22)</div><div class='add'>+#define DISPPLANE_SRC_KEY_DISABLE		0</div><div class='add'>+#define DISPPLANE_LINE_DOUBLE			(1 &lt;&lt; 20)</div><div class='add'>+#define DISPPLANE_NO_LINE_DOUBLE		0</div><div class='add'>+#define DISPPLANE_STEREO_POLARITY_FIRST		0</div><div class='add'>+#define DISPPLANE_STEREO_POLARITY_SECOND	(1 &lt;&lt; 18)</div><div class='add'>+/* plane B only */</div><div class='add'>+#define DISPPLANE_ALPHA_TRANS_ENABLE		(1 &lt;&lt; 15)</div><div class='add'>+#define DISPPLANE_ALPHA_TRANS_DISABLE		0</div><div class='add'>+#define DISPPLANE_SPRITE_ABOVE_DISPLAYA		0</div><div class='add'>+#define DISPPLANE_SPRITE_ABOVE_OVERLAY		(1)</div><div class='add'>+#define DISPPLANE_BOTTOM			(4)</div><div class='add'>+</div><div class='add'>+#define DSPABASE		0x70184</div><div class='add'>+#define DSPALINOFF		0x70184</div><div class='add'>+#define DSPASTRIDE		0x70188</div><div class='add'>+</div><div class='add'>+#define DSPBBASE		0x71184</div><div class='add'>+#define DSPBLINOFF		0X71184</div><div class='add'>+#define DSPBADDR		DSPBBASE</div><div class='add'>+#define DSPBSTRIDE		0x71188</div><div class='add'>+</div><div class='add'>+#define DSPCBASE		0x72184</div><div class='add'>+#define DSPCLINOFF		0x72184</div><div class='add'>+#define DSPCSTRIDE		0x72188</div><div class='add'>+</div><div class='add'>+#define DSPAKEYVAL		0x70194</div><div class='add'>+#define DSPAKEYMASK		0x70198</div><div class='add'>+</div><div class='add'>+#define DSPAPOS			0x7018C	/* reserved */</div><div class='add'>+#define DSPASIZE		0x70190</div><div class='add'>+#define DSPBPOS			0x7118C</div><div class='add'>+#define DSPBSIZE		0x71190</div><div class='add'>+#define DSPCPOS			0x7218C</div><div class='add'>+#define DSPCSIZE		0x72190</div><div class='add'>+</div><div class='add'>+#define DSPASURF		0x7019C</div><div class='add'>+#define DSPATILEOFF		0x701A4</div><div class='add'>+</div><div class='add'>+#define DSPBSURF		0x7119C</div><div class='add'>+#define DSPBTILEOFF		0x711A4</div><div class='add'>+</div><div class='add'>+#define DSPCSURF		0x7219C</div><div class='add'>+#define DSPCTILEOFF		0x721A4</div><div class='add'>+#define DSPCKEYMAXVAL		0x721A0</div><div class='add'>+#define DSPCKEYMINVAL		0x72194</div><div class='add'>+#define DSPCKEYMSK		0x72198</div><div class='add'>+</div><div class='add'>+#define VGACNTRL		0x71400</div><div class='add'>+#define VGA_DISP_DISABLE		(1 &lt;&lt; 31)</div><div class='add'>+#define VGA_2X_MODE			(1 &lt;&lt; 30)</div><div class='add'>+#define VGA_PIPE_B_SELECT		(1 &lt;&lt; 29)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Overlay registers</div><div class='add'>+ */</div><div class='add'>+#define OV_C_OFFSET		0x08000</div><div class='add'>+#define OV_OVADD		0x30000</div><div class='add'>+#define OV_DOVASTA		0x30008</div><div class='add'>+# define OV_PIPE_SELECT			((1 &lt;&lt; 6)|(1 &lt;&lt; 7))</div><div class='add'>+# define OV_PIPE_SELECT_POS		6</div><div class='add'>+# define OV_PIPE_A			0</div><div class='add'>+# define OV_PIPE_C			1</div><div class='add'>+#define OV_OGAMC5		0x30010</div><div class='add'>+#define OV_OGAMC4		0x30014</div><div class='add'>+#define OV_OGAMC3		0x30018</div><div class='add'>+#define OV_OGAMC2		0x3001C</div><div class='add'>+#define OV_OGAMC1		0x30020</div><div class='add'>+#define OV_OGAMC0		0x30024</div><div class='add'>+#define OVC_OVADD		0x38000</div><div class='add'>+#define OVC_DOVCSTA		0x38008</div><div class='add'>+#define OVC_OGAMC5		0x38010</div><div class='add'>+#define OVC_OGAMC4		0x38014</div><div class='add'>+#define OVC_OGAMC3		0x38018</div><div class='add'>+#define OVC_OGAMC2		0x3801C</div><div class='add'>+#define OVC_OGAMC1		0x38020</div><div class='add'>+#define OVC_OGAMC0		0x38024</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Some BIOS scratch area registers.  The 845 (and 830?) store the amount</div><div class='add'>+ * of video memory available to the BIOS in SWF1.</div><div class='add'>+ */</div><div class='add'>+#define SWF0			0x71410</div><div class='add'>+#define SWF1			0x71414</div><div class='add'>+#define SWF2			0x71418</div><div class='add'>+#define SWF3			0x7141c</div><div class='add'>+#define SWF4			0x71420</div><div class='add'>+#define SWF5			0x71424</div><div class='add'>+#define SWF6			0x71428</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 855 scratch registers.</div><div class='add'>+ */</div><div class='add'>+#define SWF00			0x70410</div><div class='add'>+#define SWF01			0x70414</div><div class='add'>+#define SWF02			0x70418</div><div class='add'>+#define SWF03			0x7041c</div><div class='add'>+#define SWF04			0x70420</div><div class='add'>+#define SWF05			0x70424</div><div class='add'>+#define SWF06			0x70428</div><div class='add'>+</div><div class='add'>+#define SWF10			SWF0</div><div class='add'>+#define SWF11			SWF1</div><div class='add'>+#define SWF12			SWF2</div><div class='add'>+#define SWF13			SWF3</div><div class='add'>+#define SWF14			SWF4</div><div class='add'>+#define SWF15			SWF5</div><div class='add'>+#define SWF16			SWF6</div><div class='add'>+</div><div class='add'>+#define SWF30			0x72414</div><div class='add'>+#define SWF31			0x72418</div><div class='add'>+#define SWF32			0x7241c</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Palette registers</div><div class='add'>+ */</div><div class='add'>+#define PALETTE_A		0x0a000</div><div class='add'>+#define PALETTE_B		0x0a800</div><div class='add'>+#define PALETTE_C		0x0ac00</div><div class='add'>+</div><div class='add'>+/* Cursor A &amp; B regs */</div><div class='add'>+#define CURACNTR		0x70080</div><div class='add'>+#define CURSOR_MODE_DISABLE		0x00</div><div class='add'>+#define CURSOR_MODE_64_32B_AX		0x07</div><div class='add'>+#define CURSOR_MODE_64_ARGB_AX		((1 &lt;&lt; 5) | CURSOR_MODE_64_32B_AX)</div><div class='add'>+#define MCURSOR_GAMMA_ENABLE		(1 &lt;&lt; 26)</div><div class='add'>+#define CURABASE		0x70084</div><div class='add'>+#define CURAPOS			0x70088</div><div class='add'>+#define CURSOR_POS_MASK			0x007FF</div><div class='add'>+#define CURSOR_POS_SIGN			0x8000</div><div class='add'>+#define CURSOR_X_SHIFT			0</div><div class='add'>+#define CURSOR_Y_SHIFT			16</div><div class='add'>+#define CURBCNTR		0x700c0</div><div class='add'>+#define CURBBASE		0x700c4</div><div class='add'>+#define CURBPOS			0x700c8</div><div class='add'>+#define CURCCNTR		0x700e0</div><div class='add'>+#define CURCBASE		0x700e4</div><div class='add'>+#define CURCPOS			0x700e8</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Interrupt Registers</div><div class='add'>+ */</div><div class='add'>+#define IER			0x020a0</div><div class='add'>+#define IIR			0x020a4</div><div class='add'>+#define IMR			0x020a8</div><div class='add'>+#define ISR			0x020ac</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MOORESTOWN delta registers</div><div class='add'>+ */</div><div class='add'>+#define MRST_DPLL_A		0x0f014</div><div class='add'>+#define MDFLD_DPLL_B		0x0f018</div><div class='add'>+#define MDFLD_INPUT_REF_SEL		(1 &lt;&lt; 14)</div><div class='add'>+#define MDFLD_VCO_SEL			(1 &lt;&lt; 16)</div><div class='add'>+#define DPLLA_MODE_LVDS			(2 &lt;&lt; 26)	/* mrst */</div><div class='add'>+#define MDFLD_PLL_LATCHEN		(1 &lt;&lt; 28)</div><div class='add'>+#define MDFLD_PWR_GATE_EN		(1 &lt;&lt; 30)</div><div class='add'>+#define MDFLD_P1_MASK			(0x1FF &lt;&lt; 17)</div><div class='add'>+#define MRST_FPA0		0x0f040</div><div class='add'>+#define MRST_FPA1		0x0f044</div><div class='add'>+#define MDFLD_DPLL_DIV0		0x0f048</div><div class='add'>+#define MDFLD_DPLL_DIV1		0x0f04c</div><div class='add'>+#define MRST_PERF_MODE		0x020f4</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MEDFIELD HDMI registers</div><div class='add'>+ */</div><div class='add'>+#define HDMIPHYMISCCTL		0x61134</div><div class='add'>+#define HDMI_PHY_POWER_DOWN		0x7f</div><div class='add'>+#define HDMIB_CONTROL		0x61140</div><div class='add'>+#define HDMIB_PORT_EN			(1 &lt;&lt; 31)</div><div class='add'>+#define HDMIB_PIPE_B_SELECT		(1 &lt;&lt; 30)</div><div class='add'>+#define HDMIB_NULL_PACKET		(1 &lt;&lt; 9)</div><div class='add'>+#define HDMIB_HDCP_PORT			(1 &lt;&lt; 5)</div><div class='add'>+</div><div class='add'>+/* #define LVDS			0x61180 */</div><div class='add'>+#define MRST_PANEL_8TO6_DITHER_ENABLE	(1 &lt;&lt; 25)</div><div class='add'>+#define MRST_PANEL_24_DOT_1_FORMAT	(1 &lt;&lt; 24)</div><div class='add'>+#define LVDS_A3_POWER_UP_0_OUTPUT	(1 &lt;&lt; 6)</div><div class='add'>+</div><div class='add'>+#define MIPI			0x61190</div><div class='add'>+#define MIPI_C			0x62190</div><div class='add'>+#define MIPI_PORT_EN			(1 &lt;&lt; 31)</div><div class='add'>+/* Turns on border drawing to allow centered display. */</div><div class='add'>+#define SEL_FLOPPED_HSTX		(1 &lt;&lt; 23)</div><div class='add'>+#define PASS_FROM_SPHY_TO_AFE		(1 &lt;&lt; 16)</div><div class='add'>+#define MIPI_BORDER_EN			(1 &lt;&lt; 15)</div><div class='add'>+#define MIPIA_3LANE_MIPIC_1LANE		0x1</div><div class='add'>+#define MIPIA_2LANE_MIPIC_2LANE		0x2</div><div class='add'>+#define TE_TRIGGER_DSI_PROTOCOL		(1 &lt;&lt; 2)</div><div class='add'>+#define TE_TRIGGER_GPIO_PIN		(1 &lt;&lt; 3)</div><div class='add'>+#define MIPI_TE_COUNT		0x61194</div><div class='add'>+</div><div class='add'>+/* #define PP_CONTROL	0x61204 */</div><div class='add'>+#define POWER_DOWN_ON_RESET		(1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+/* #define PFIT_CONTROL	0x61230 */</div><div class='add'>+#define PFIT_PIPE_SELECT		(3 &lt;&lt; 29)</div><div class='add'>+#define PFIT_PIPE_SELECT_SHIFT		(29)</div><div class='add'>+</div><div class='add'>+/* #define BLC_PWM_CTL		0x61254 */</div><div class='add'>+#define MRST_BACKLIGHT_MODULATION_FREQ_SHIFT	(16)</div><div class='add'>+#define MRST_BACKLIGHT_MODULATION_FREQ_MASK	(0xffff &lt;&lt; 16)</div><div class='add'>+</div><div class='add'>+/* #define PIPEACONF 0x70008 */</div><div class='add'>+#define PIPEACONF_PIPE_STATE		(1 &lt;&lt; 30)</div><div class='add'>+/* #define DSPACNTR		0x70180 */</div><div class='add'>+</div><div class='add'>+#define MRST_DSPABASE		0x7019c</div><div class='add'>+#define MRST_DSPBBASE		0x7119c</div><div class='add'>+#define MDFLD_DSPCBASE		0x7219c</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Moorestown registers.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	MIPI IP registers</div><div class='add'>+ */</div><div class='add'>+#define MIPIC_REG_OFFSET		0x800</div><div class='add'>+</div><div class='add'>+#define DEVICE_READY_REG		0xb000</div><div class='add'>+#define LP_OUTPUT_HOLD				(1 &lt;&lt; 16)</div><div class='add'>+#define EXIT_ULPS_DEV_READY			0x3</div><div class='add'>+#define LP_OUTPUT_HOLD_RELEASE			0x810000</div><div class='add'>+# define ENTERING_ULPS				(2 &lt;&lt; 1)</div><div class='add'>+# define EXITING_ULPS				(1 &lt;&lt; 1)</div><div class='add'>+# define ULPS_MASK				(3 &lt;&lt; 1)</div><div class='add'>+# define BUS_POSSESSION				(1 &lt;&lt; 3)</div><div class='add'>+#define INTR_STAT_REG			0xb004</div><div class='add'>+#define RX_SOT_ERROR				(1 &lt;&lt; 0)</div><div class='add'>+#define RX_SOT_SYNC_ERROR			(1 &lt;&lt; 1)</div><div class='add'>+#define RX_ESCAPE_MODE_ENTRY_ERROR		(1 &lt;&lt; 3)</div><div class='add'>+#define RX_LP_TX_SYNC_ERROR			(1 &lt;&lt; 4)</div><div class='add'>+#define RX_HS_RECEIVE_TIMEOUT_ERROR		(1 &lt;&lt; 5)</div><div class='add'>+#define RX_FALSE_CONTROL_ERROR			(1 &lt;&lt; 6)</div><div class='add'>+#define RX_ECC_SINGLE_BIT_ERROR			(1 &lt;&lt; 7)</div><div class='add'>+#define RX_ECC_MULTI_BIT_ERROR			(1 &lt;&lt; 8)</div><div class='add'>+#define RX_CHECKSUM_ERROR			(1 &lt;&lt; 9)</div><div class='add'>+#define RX_DSI_DATA_TYPE_NOT_RECOGNIZED		(1 &lt;&lt; 10)</div><div class='add'>+#define RX_DSI_VC_ID_INVALID			(1 &lt;&lt; 11)</div><div class='add'>+#define TX_FALSE_CONTROL_ERROR			(1 &lt;&lt; 12)</div><div class='add'>+#define TX_ECC_SINGLE_BIT_ERROR			(1 &lt;&lt; 13)</div><div class='add'>+#define TX_ECC_MULTI_BIT_ERROR			(1 &lt;&lt; 14)</div><div class='add'>+#define TX_CHECKSUM_ERROR			(1 &lt;&lt; 15)</div><div class='add'>+#define TX_DSI_DATA_TYPE_NOT_RECOGNIZED		(1 &lt;&lt; 16)</div><div class='add'>+#define TX_DSI_VC_ID_INVALID			(1 &lt;&lt; 17)</div><div class='add'>+#define HIGH_CONTENTION				(1 &lt;&lt; 18)</div><div class='add'>+#define LOW_CONTENTION				(1 &lt;&lt; 19)</div><div class='add'>+#define DPI_FIFO_UNDER_RUN			(1 &lt;&lt; 20)</div><div class='add'>+#define HS_TX_TIMEOUT				(1 &lt;&lt; 21)</div><div class='add'>+#define LP_RX_TIMEOUT				(1 &lt;&lt; 22)</div><div class='add'>+#define TURN_AROUND_ACK_TIMEOUT			(1 &lt;&lt; 23)</div><div class='add'>+#define ACK_WITH_NO_ERROR			(1 &lt;&lt; 24)</div><div class='add'>+#define HS_GENERIC_WR_FIFO_FULL			(1 &lt;&lt; 27)</div><div class='add'>+#define LP_GENERIC_WR_FIFO_FULL			(1 &lt;&lt; 28)</div><div class='add'>+#define SPL_PKT_SENT				(1 &lt;&lt; 30)</div><div class='add'>+#define INTR_EN_REG			0xb008</div><div class='add'>+#define DSI_FUNC_PRG_REG		0xb00c</div><div class='add'>+#define DPI_CHANNEL_NUMBER_POS			0x03</div><div class='add'>+#define DBI_CHANNEL_NUMBER_POS			0x05</div><div class='add'>+#define FMT_DPI_POS				0x07</div><div class='add'>+#define FMT_DBI_POS				0x0A</div><div class='add'>+#define DBI_DATA_WIDTH_POS			0x0D</div><div class='add'>+</div><div class='add'>+/* DPI PIXEL FORMATS */</div><div class='add'>+#define RGB_565_FMT				0x01	/* RGB 565 FORMAT */</div><div class='add'>+#define RGB_666_FMT				0x02	/* RGB 666 FORMAT */</div><div class='add'>+#define LRGB_666_FMT				0x03	/* RGB LOOSELY PACKED</div><div class='add'>+							 * 666 FORMAT</div><div class='add'>+							 */</div><div class='add'>+#define RGB_888_FMT				0x04	/* RGB 888 FORMAT */</div><div class='add'>+#define VIRTUAL_CHANNEL_NUMBER_0		0x00	/* Virtual channel 0 */</div><div class='add'>+#define VIRTUAL_CHANNEL_NUMBER_1		0x01	/* Virtual channel 1 */</div><div class='add'>+#define VIRTUAL_CHANNEL_NUMBER_2		0x02	/* Virtual channel 2 */</div><div class='add'>+#define VIRTUAL_CHANNEL_NUMBER_3		0x03	/* Virtual channel 3 */</div><div class='add'>+</div><div class='add'>+#define DBI_NOT_SUPPORTED			0x00	/* command mode</div><div class='add'>+							 * is not supported</div><div class='add'>+							 */</div><div class='add'>+#define DBI_DATA_WIDTH_16BIT			0x01	/* 16 bit data */</div><div class='add'>+#define DBI_DATA_WIDTH_9BIT			0x02	/* 9 bit data */</div><div class='add'>+#define DBI_DATA_WIDTH_8BIT			0x03	/* 8 bit data */</div><div class='add'>+#define DBI_DATA_WIDTH_OPT1			0x04	/* option 1 */</div><div class='add'>+#define DBI_DATA_WIDTH_OPT2			0x05	/* option 2 */</div><div class='add'>+</div><div class='add'>+#define HS_TX_TIMEOUT_REG		0xb010</div><div class='add'>+#define LP_RX_TIMEOUT_REG		0xb014</div><div class='add'>+#define TURN_AROUND_TIMEOUT_REG		0xb018</div><div class='add'>+#define DEVICE_RESET_REG		0xb01C</div><div class='add'>+#define DPI_RESOLUTION_REG		0xb020</div><div class='add'>+#define RES_V_POS				0x10</div><div class='add'>+#define DBI_RESOLUTION_REG		0xb024 /* Reserved for MDFLD */</div><div class='add'>+#define HORIZ_SYNC_PAD_COUNT_REG	0xb028</div><div class='add'>+#define HORIZ_BACK_PORCH_COUNT_REG	0xb02C</div><div class='add'>+#define HORIZ_FRONT_PORCH_COUNT_REG	0xb030</div><div class='add'>+#define HORIZ_ACTIVE_AREA_COUNT_REG	0xb034</div><div class='add'>+#define VERT_SYNC_PAD_COUNT_REG		0xb038</div><div class='add'>+#define VERT_BACK_PORCH_COUNT_REG	0xb03c</div><div class='add'>+#define VERT_FRONT_PORCH_COUNT_REG	0xb040</div><div class='add'>+#define HIGH_LOW_SWITCH_COUNT_REG	0xb044</div><div class='add'>+#define DPI_CONTROL_REG			0xb048</div><div class='add'>+#define DPI_SHUT_DOWN				(1 &lt;&lt; 0)</div><div class='add'>+#define DPI_TURN_ON				(1 &lt;&lt; 1)</div><div class='add'>+#define DPI_COLOR_MODE_ON			(1 &lt;&lt; 2)</div><div class='add'>+#define DPI_COLOR_MODE_OFF			(1 &lt;&lt; 3)</div><div class='add'>+#define DPI_BACK_LIGHT_ON			(1 &lt;&lt; 4)</div><div class='add'>+#define DPI_BACK_LIGHT_OFF			(1 &lt;&lt; 5)</div><div class='add'>+#define DPI_LP					(1 &lt;&lt; 6)</div><div class='add'>+#define DPI_DATA_REG			0xb04c</div><div class='add'>+#define DPI_BACK_LIGHT_ON_DATA			0x07</div><div class='add'>+#define DPI_BACK_LIGHT_OFF_DATA			0x17</div><div class='add'>+#define INIT_COUNT_REG			0xb050</div><div class='add'>+#define MAX_RET_PAK_REG			0xb054</div><div class='add'>+#define VIDEO_FMT_REG			0xb058</div><div class='add'>+#define COMPLETE_LAST_PCKT			(1 &lt;&lt; 2)</div><div class='add'>+#define EOT_DISABLE_REG			0xb05c</div><div class='add'>+#define ENABLE_CLOCK_STOPPING			(1 &lt;&lt; 1)</div><div class='add'>+#define LP_BYTECLK_REG			0xb060</div><div class='add'>+#define LP_GEN_DATA_REG			0xb064</div><div class='add'>+#define HS_GEN_DATA_REG			0xb068</div><div class='add'>+#define LP_GEN_CTRL_REG			0xb06C</div><div class='add'>+#define HS_GEN_CTRL_REG			0xb070</div><div class='add'>+#define DCS_CHANNEL_NUMBER_POS		0x6</div><div class='add'>+#define MCS_COMMANDS_POS		0x8</div><div class='add'>+#define WORD_COUNTS_POS			0x8</div><div class='add'>+#define MCS_PARAMETER_POS			0x10</div><div class='add'>+#define GEN_FIFO_STAT_REG		0xb074</div><div class='add'>+#define HS_DATA_FIFO_FULL			(1 &lt;&lt; 0)</div><div class='add'>+#define HS_DATA_FIFO_HALF_EMPTY			(1 &lt;&lt; 1)</div><div class='add'>+#define HS_DATA_FIFO_EMPTY			(1 &lt;&lt; 2)</div><div class='add'>+#define LP_DATA_FIFO_FULL			(1 &lt;&lt; 8)</div><div class='add'>+#define LP_DATA_FIFO_HALF_EMPTY			(1 &lt;&lt; 9)</div><div class='add'>+#define LP_DATA_FIFO_EMPTY			(1 &lt;&lt; 10)</div><div class='add'>+#define HS_CTRL_FIFO_FULL			(1 &lt;&lt; 16)</div><div class='add'>+#define HS_CTRL_FIFO_HALF_EMPTY			(1 &lt;&lt; 17)</div><div class='add'>+#define HS_CTRL_FIFO_EMPTY			(1 &lt;&lt; 18)</div><div class='add'>+#define LP_CTRL_FIFO_FULL			(1 &lt;&lt; 24)</div><div class='add'>+#define LP_CTRL_FIFO_HALF_EMPTY			(1 &lt;&lt; 25)</div><div class='add'>+#define LP_CTRL_FIFO_EMPTY			(1 &lt;&lt; 26)</div><div class='add'>+#define DBI_FIFO_EMPTY				(1 &lt;&lt; 27)</div><div class='add'>+#define DPI_FIFO_EMPTY				(1 &lt;&lt; 28)</div><div class='add'>+#define HS_LS_DBI_ENABLE_REG		0xb078</div><div class='add'>+#define TXCLKESC_REG			0xb07c</div><div class='add'>+#define DPHY_PARAM_REG			0xb080</div><div class='add'>+#define DBI_BW_CTRL_REG			0xb084</div><div class='add'>+#define CLK_LANE_SWT_REG		0xb088</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MIPI Adapter registers</div><div class='add'>+ */</div><div class='add'>+#define MIPI_CONTROL_REG		0xb104</div><div class='add'>+#define MIPI_2X_CLOCK_BITS			((1 &lt;&lt; 0) | (1 &lt;&lt; 1))</div><div class='add'>+#define MIPI_DATA_ADDRESS_REG		0xb108</div><div class='add'>+#define MIPI_DATA_LENGTH_REG		0xb10C</div><div class='add'>+#define MIPI_COMMAND_ADDRESS_REG	0xb110</div><div class='add'>+#define MIPI_COMMAND_LENGTH_REG		0xb114</div><div class='add'>+#define MIPI_READ_DATA_RETURN_REG0	0xb118</div><div class='add'>+#define MIPI_READ_DATA_RETURN_REG1	0xb11C</div><div class='add'>+#define MIPI_READ_DATA_RETURN_REG2	0xb120</div><div class='add'>+#define MIPI_READ_DATA_RETURN_REG3	0xb124</div><div class='add'>+#define MIPI_READ_DATA_RETURN_REG4	0xb128</div><div class='add'>+#define MIPI_READ_DATA_RETURN_REG5	0xb12C</div><div class='add'>+#define MIPI_READ_DATA_RETURN_REG6	0xb130</div><div class='add'>+#define MIPI_READ_DATA_RETURN_REG7	0xb134</div><div class='add'>+#define MIPI_READ_DATA_VALID_REG	0xb138</div><div class='add'>+</div><div class='add'>+/* DBI COMMANDS */</div><div class='add'>+#define soft_reset			0x01</div><div class='add'>+/*</div><div class='add'>+ *	The display module performs a software reset.</div><div class='add'>+ *	Registers are written with their SW Reset default values.</div><div class='add'>+ */</div><div class='add'>+#define get_power_mode			0x0a</div><div class='add'>+/*</div><div class='add'>+ *	The display module returns the current power mode</div><div class='add'>+ */</div><div class='add'>+#define get_address_mode		0x0b</div><div class='add'>+/*</div><div class='add'>+ *	The display module returns the current status.</div><div class='add'>+ */</div><div class='add'>+#define get_pixel_format		0x0c</div><div class='add'>+/*</div><div class='add'>+ *	This command gets the pixel format for the RGB image data</div><div class='add'>+ *	used by the interface.</div><div class='add'>+ */</div><div class='add'>+#define get_display_mode		0x0d</div><div class='add'>+/*</div><div class='add'>+ *	The display module returns the Display Image Mode status.</div><div class='add'>+ */</div><div class='add'>+#define get_signal_mode			0x0e</div><div class='add'>+/*</div><div class='add'>+ *	The display module returns the Display Signal Mode.</div><div class='add'>+ */</div><div class='add'>+#define get_diagnostic_result		0x0f</div><div class='add'>+/*</div><div class='add'>+ *	The display module returns the self-diagnostic results following</div><div class='add'>+ *	a Sleep Out command.</div><div class='add'>+ */</div><div class='add'>+#define enter_sleep_mode		0x10</div><div class='add'>+/*</div><div class='add'>+ *	This command causes the display module to enter the Sleep mode.</div><div class='add'>+ *	In this mode, all unnecessary blocks inside the display module are</div><div class='add'>+ *	disabled except interface communication. This is the lowest power</div><div class='add'>+ *	mode the display module supports.</div><div class='add'>+ */</div><div class='add'>+#define exit_sleep_mode			0x11</div><div class='add'>+/*</div><div class='add'>+ *	This command causes the display module to exit Sleep mode.</div><div class='add'>+ *	All blocks inside the display module are enabled.</div><div class='add'>+ */</div><div class='add'>+#define enter_partial_mode		0x12</div><div class='add'>+/*</div><div class='add'>+ *	This command causes the display module to enter the Partial Display</div><div class='add'>+ *	Mode. The Partial Display Mode window is described by the</div><div class='add'>+ *	set_partial_area command.</div><div class='add'>+ */</div><div class='add'>+#define enter_normal_mode		0x13</div><div class='add'>+/*</div><div class='add'>+ *	This command causes the display module to enter the Normal mode.</div><div class='add'>+ *	Normal Mode is defined as Partial Display mode and Scroll mode are off</div><div class='add'>+ */</div><div class='add'>+#define exit_invert_mode		0x20</div><div class='add'>+/*</div><div class='add'>+ *	This command causes the display module to stop inverting the image</div><div class='add'>+ *	data on the display device. The frame memory contents remain unchanged.</div><div class='add'>+ *	No status bits are changed.</div><div class='add'>+ */</div><div class='add'>+#define enter_invert_mode		0x21</div><div class='add'>+/*</div><div class='add'>+ *	This command causes the display module to invert the image data only on</div><div class='add'>+ *	the display device. The frame memory contents remain unchanged.</div><div class='add'>+ *	No status bits are changed.</div><div class='add'>+ */</div><div class='add'>+#define set_gamma_curve			0x26</div><div class='add'>+/*</div><div class='add'>+ *	This command selects the desired gamma curve for the display device.</div><div class='add'>+ *	Four fixed gamma curves are defined in section DCS spec.</div><div class='add'>+ */</div><div class='add'>+#define set_display_off			0x28</div><div class='add'>+/* ************************************************************************* *\</div><div class='add'>+This command causes the display module to stop displaying the image data</div><div class='add'>+on the display device. The frame memory contents remain unchanged.</div><div class='add'>+No status bits are changed.</div><div class='add'>+\* ************************************************************************* */</div><div class='add'>+#define set_display_on			0x29</div><div class='add'>+/* ************************************************************************* *\</div><div class='add'>+This command causes the display module to start displaying the image data</div><div class='add'>+on the display device. The frame memory contents remain unchanged.</div><div class='add'>+No status bits are changed.</div><div class='add'>+\* ************************************************************************* */</div><div class='add'>+#define set_column_address		0x2a</div><div class='add'>+/*</div><div class='add'>+ *	This command defines the column extent of the frame memory accessed by</div><div class='add'>+ *	the hostprocessor with the read_memory_continue and</div><div class='add'>+ *	write_memory_continue commands.</div><div class='add'>+ *	No status bits are changed.</div><div class='add'>+ */</div><div class='add'>+#define set_page_addr			0x2b</div><div class='add'>+/*</div><div class='add'>+ *	This command defines the page extent of the frame memory accessed by</div><div class='add'>+ *	the host processor with the write_memory_continue and</div><div class='add'>+ *	read_memory_continue command.</div><div class='add'>+ *	No status bits are changed.</div><div class='add'>+ */</div><div class='add'>+#define write_mem_start			0x2c</div><div class='add'>+/*</div><div class='add'>+ *	This command transfers image data from the host processor to the</div><div class='add'>+ *	display modules frame memory starting at the pixel location specified</div><div class='add'>+ *	by preceding set_column_address and set_page_address commands.</div><div class='add'>+ */</div><div class='add'>+#define set_partial_area		0x30</div><div class='add'>+/*</div><div class='add'>+ *	This command defines the Partial Display mode s display area.</div><div class='add'>+ *	There are two parameters associated with this command, the first</div><div class='add'>+ *	defines the Start Row (SR) and the second the End Row (ER). SR and ER</div><div class='add'>+ *	refer to the Frame Memory Line Pointer.</div><div class='add'>+ */</div><div class='add'>+#define set_scroll_area			0x33</div><div class='add'>+/*</div><div class='add'>+ *	This command defines the display modules Vertical Scrolling Area.</div><div class='add'>+ */</div><div class='add'>+#define set_tear_off			0x34</div><div class='add'>+/*</div><div class='add'>+ *	This command turns off the display modules Tearing Effect output</div><div class='add'>+ *	signal on the TE signal line.</div><div class='add'>+ */</div><div class='add'>+#define set_tear_on			0x35</div><div class='add'>+/*</div><div class='add'>+ *	This command turns on the display modules Tearing Effect output signal</div><div class='add'>+ *	on the TE signal line.</div><div class='add'>+ */</div><div class='add'>+#define set_address_mode		0x36</div><div class='add'>+/*</div><div class='add'>+ *	This command sets the data order for transfers from the host processor</div><div class='add'>+ *	to display modules frame memory,bits B[7:5] and B3, and from the</div><div class='add'>+ *	display modules frame memory to the display device, bits B[2:0] and B4.</div><div class='add'>+ */</div><div class='add'>+#define set_scroll_start		0x37</div><div class='add'>+/*</div><div class='add'>+ *	This command sets the start of the vertical scrolling area in the frame</div><div class='add'>+ *	memory. The vertical scrolling area is fully defined when this command</div><div class='add'>+ *	is used with the set_scroll_area command The set_scroll_start command</div><div class='add'>+ *	has one parameter, the Vertical Scroll Pointer. The VSP defines the</div><div class='add'>+ *	line in the frame memory that is written to the display device as the</div><div class='add'>+ *	first line of the vertical scroll area.</div><div class='add'>+ */</div><div class='add'>+#define exit_idle_mode			0x38</div><div class='add'>+/*</div><div class='add'>+ *	This command causes the display module to exit Idle mode.</div><div class='add'>+ */</div><div class='add'>+#define enter_idle_mode			0x39</div><div class='add'>+/*</div><div class='add'>+ *	This command causes the display module to enter Idle Mode.</div><div class='add'>+ *	In Idle Mode, color expression is reduced. Colors are shown on the</div><div class='add'>+ *	display device using the MSB of each of the R, G and B color</div><div class='add'>+ *	components in the frame memory</div><div class='add'>+ */</div><div class='add'>+#define set_pixel_format		0x3a</div><div class='add'>+/*</div><div class='add'>+ *	This command sets the pixel format for the RGB image data used by the</div><div class='add'>+ *	interface.</div><div class='add'>+ *	Bits D[6:4]  DPI Pixel Format Definition</div><div class='add'>+ *	Bits D[2:0]  DBI Pixel Format Definition</div><div class='add'>+ *	Bits D7 and D3 are not used.</div><div class='add'>+ */</div><div class='add'>+#define DCS_PIXEL_FORMAT_3bpp		0x1</div><div class='add'>+#define DCS_PIXEL_FORMAT_8bpp		0x2</div><div class='add'>+#define DCS_PIXEL_FORMAT_12bpp		0x3</div><div class='add'>+#define DCS_PIXEL_FORMAT_16bpp		0x5</div><div class='add'>+#define DCS_PIXEL_FORMAT_18bpp		0x6</div><div class='add'>+#define DCS_PIXEL_FORMAT_24bpp		0x7</div><div class='add'>+</div><div class='add'>+#define write_mem_cont			0x3c</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	This command transfers image data from the host processor to the</div><div class='add'>+ *	display module's frame memory continuing from the pixel location</div><div class='add'>+ *	following the previous write_memory_continue or write_memory_start</div><div class='add'>+ *	command.</div><div class='add'>+ */</div><div class='add'>+#define set_tear_scanline		0x44</div><div class='add'>+/*</div><div class='add'>+ *	This command turns on the display modules Tearing Effect output signal</div><div class='add'>+ *	on the TE signal line when the display module reaches line N.</div><div class='add'>+ */</div><div class='add'>+#define get_scanline			0x45</div><div class='add'>+/*</div><div class='add'>+ *	The display module returns the current scanline, N, used to update the</div><div class='add'>+ *	 display device. The total number of scanlines on a display device is</div><div class='add'>+ *	defined as VSYNC + VBP + VACT + VFP.The first scanline is defined as</div><div class='add'>+ *	the first line of V Sync and is denoted as Line 0.</div><div class='add'>+ *	When in Sleep Mode, the value returned by get_scanline is undefined.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* MCS or Generic COMMANDS */</div><div class='add'>+/* MCS/generic data type */</div><div class='add'>+#define GEN_SHORT_WRITE_0	0x03  /* generic short write, no parameters */</div><div class='add'>+#define GEN_SHORT_WRITE_1	0x13  /* generic short write, 1 parameters */</div><div class='add'>+#define GEN_SHORT_WRITE_2	0x23  /* generic short write, 2 parameters */</div><div class='add'>+#define GEN_READ_0		0x04  /* generic read, no parameters */</div><div class='add'>+#define GEN_READ_1		0x14  /* generic read, 1 parameters */</div><div class='add'>+#define GEN_READ_2		0x24  /* generic read, 2 parameters */</div><div class='add'>+#define GEN_LONG_WRITE		0x29  /* generic long write */</div><div class='add'>+#define MCS_SHORT_WRITE_0	0x05  /* MCS short write, no parameters */</div><div class='add'>+#define MCS_SHORT_WRITE_1	0x15  /* MCS short write, 1 parameters */</div><div class='add'>+#define MCS_READ		0x06  /* MCS read, no parameters */</div><div class='add'>+#define MCS_LONG_WRITE		0x39  /* MCS long write */</div><div class='add'>+/* MCS/generic commands */</div><div class='add'>+/* TPO MCS */</div><div class='add'>+#define write_display_profile		0x50</div><div class='add'>+#define write_display_brightness	0x51</div><div class='add'>+#define write_ctrl_display		0x53</div><div class='add'>+#define write_ctrl_cabc			0x55</div><div class='add'>+  #define UI_IMAGE		0x01</div><div class='add'>+  #define STILL_IMAGE		0x02</div><div class='add'>+  #define MOVING_IMAGE		0x03</div><div class='add'>+#define write_hysteresis		0x57</div><div class='add'>+#define write_gamma_setting		0x58</div><div class='add'>+#define write_cabc_min_bright		0x5e</div><div class='add'>+#define write_kbbc_profile		0x60</div><div class='add'>+/* TMD MCS */</div><div class='add'>+#define tmd_write_display_brightness 0x8c</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	This command is used to control ambient light, panel backlight</div><div class='add'>+ *	brightness and gamma settings.</div><div class='add'>+ */</div><div class='add'>+#define BRIGHT_CNTL_BLOCK_ON	(1 &lt;&lt; 5)</div><div class='add'>+#define AMBIENT_LIGHT_SENSE_ON	(1 &lt;&lt; 4)</div><div class='add'>+#define DISPLAY_DIMMING_ON	(1 &lt;&lt; 3)</div><div class='add'>+#define BACKLIGHT_ON		(1 &lt;&lt; 2)</div><div class='add'>+#define DISPLAY_BRIGHTNESS_AUTO	(1 &lt;&lt; 1)</div><div class='add'>+#define GAMMA_AUTO		(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* DCS Interface Pixel Formats */</div><div class='add'>+#define DCS_PIXEL_FORMAT_3BPP	0x1</div><div class='add'>+#define DCS_PIXEL_FORMAT_8BPP	0x2</div><div class='add'>+#define DCS_PIXEL_FORMAT_12BPP	0x3</div><div class='add'>+#define DCS_PIXEL_FORMAT_16BPP	0x5</div><div class='add'>+#define DCS_PIXEL_FORMAT_18BPP	0x6</div><div class='add'>+#define DCS_PIXEL_FORMAT_24BPP	0x7</div><div class='add'>+/* ONE PARAMETER READ DATA */</div><div class='add'>+#define addr_mode_data		0xfc</div><div class='add'>+#define diag_res_data		0x00</div><div class='add'>+#define disp_mode_data		0x23</div><div class='add'>+#define pxl_fmt_data		0x77</div><div class='add'>+#define pwr_mode_data		0x74</div><div class='add'>+#define sig_mode_data		0x00</div><div class='add'>+/* TWO PARAMETERS READ DATA */</div><div class='add'>+#define scanline_data1		0xff</div><div class='add'>+#define scanline_data2		0xff</div><div class='add'>+#define NON_BURST_MODE_SYNC_PULSE	0x01	/* Non Burst Mode</div><div class='add'>+						 * with Sync Pulse</div><div class='add'>+						 */</div><div class='add'>+#define NON_BURST_MODE_SYNC_EVENTS	0x02	/* Non Burst Mode</div><div class='add'>+						 * with Sync events</div><div class='add'>+						 */</div><div class='add'>+#define BURST_MODE			0x03	/* Burst Mode */</div><div class='add'>+#define DBI_COMMAND_BUFFER_SIZE		0x240   /* 0x32 */    /* 0x120 */</div><div class='add'>+						/* Allocate at least</div><div class='add'>+						 * 0x100 Byte with 32</div><div class='add'>+						 * byte alignment</div><div class='add'>+						 */</div><div class='add'>+#define DBI_DATA_BUFFER_SIZE		0x120	/* Allocate at least</div><div class='add'>+						 * 0x100 Byte with 32</div><div class='add'>+						 * byte alignment</div><div class='add'>+						 */</div><div class='add'>+#define DBI_CB_TIME_OUT			0xFFFF</div><div class='add'>+</div><div class='add'>+#define GEN_FB_TIME_OUT			2000</div><div class='add'>+</div><div class='add'>+#define SKU_83				0x01</div><div class='add'>+#define SKU_100				0x02</div><div class='add'>+#define SKU_100L			0x04</div><div class='add'>+#define SKU_BYPASS			0x08</div><div class='add'>+</div><div class='add'>+/* Some handy macros for playing with bitfields. */</div><div class='add'>+#define PSB_MASK(high, low) (((1&lt;&lt;((high)-(low)+1))-1)&lt;&lt;(low))</div><div class='add'>+#define SET_FIELD(value, field) (((value) &lt;&lt; field ## _SHIFT) &amp; field ## _MASK)</div><div class='add'>+#define GET_FIELD(word, field) (((word)  &amp; field ## _MASK) &gt;&gt; field ## _SHIFT)</div><div class='add'>+</div><div class='add'>+#define _PIPE(pipe, a, b) ((a) + (pipe)*((b)-(a)))</div><div class='add'>+</div><div class='add'>+/* PCI config space */</div><div class='add'>+</div><div class='add'>+#define SB_PCKT         0x02100 /* cedarview */</div><div class='add'>+# define SB_OPCODE_MASK                         PSB_MASK(31, 16)</div><div class='add'>+# define SB_OPCODE_SHIFT                        16</div><div class='add'>+# define SB_OPCODE_READ                         0</div><div class='add'>+# define SB_OPCODE_WRITE                        1</div><div class='add'>+# define SB_DEST_MASK                           PSB_MASK(15, 8)</div><div class='add'>+# define SB_DEST_SHIFT                          8</div><div class='add'>+# define SB_DEST_DPLL                           0x88</div><div class='add'>+# define SB_BYTE_ENABLE_MASK                    PSB_MASK(7, 4)</div><div class='add'>+# define SB_BYTE_ENABLE_SHIFT                   4</div><div class='add'>+# define SB_BUSY                                (1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* 32-bit value read/written from the DPIO reg. */</div><div class='add'>+#define SB_DATA		0x02104 /* cedarview */</div><div class='add'>+/* 32-bit address of the DPIO reg to be read/written. */</div><div class='add'>+#define SB_ADDR		0x02108 /* cedarview */</div><div class='add'>+#define DPIO_CFG	0x02110 /* cedarview */</div><div class='add'>+# define DPIO_MODE_SELECT_1			(1 &lt;&lt; 3)</div><div class='add'>+# define DPIO_MODE_SELECT_0			(1 &lt;&lt; 2)</div><div class='add'>+# define DPIO_SFR_BYPASS			(1 &lt;&lt; 1)</div><div class='add'>+/* reset is active low */</div><div class='add'>+# define DPIO_CMN_RESET_N			(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* Cedarview sideband registers */</div><div class='add'>+#define _SB_M_A			0x8008</div><div class='add'>+#define _SB_M_B			0x8028</div><div class='add'>+#define SB_M(pipe) _PIPE(pipe, _SB_M_A, _SB_M_B)</div><div class='add'>+# define SB_M_DIVIDER_MASK			(0xFF &lt;&lt; 24)</div><div class='add'>+# define SB_M_DIVIDER_SHIFT			24</div><div class='add'>+</div><div class='add'>+#define _SB_N_VCO_A		0x8014</div><div class='add'>+#define _SB_N_VCO_B		0x8034</div><div class='add'>+#define SB_N_VCO(pipe) _PIPE(pipe, _SB_N_VCO_A, _SB_N_VCO_B)</div><div class='add'>+#define SB_N_VCO_SEL_MASK			PSB_MASK(31, 30)</div><div class='add'>+#define SB_N_VCO_SEL_SHIFT			30</div><div class='add'>+#define SB_N_DIVIDER_MASK			PSB_MASK(29, 26)</div><div class='add'>+#define SB_N_DIVIDER_SHIFT			26</div><div class='add'>+#define SB_N_CB_TUNE_MASK			PSB_MASK(25, 24)</div><div class='add'>+#define SB_N_CB_TUNE_SHIFT			24</div><div class='add'>+</div><div class='add'>+#define _SB_REF_A		0x8018</div><div class='add'>+#define _SB_REF_B		0x8038</div><div class='add'>+#define SB_REF_SFR(pipe)	_PIPE(pipe, _SB_REF_A, _SB_REF_B)</div><div class='add'>+</div><div class='add'>+#define _SB_P_A			0x801c</div><div class='add'>+#define _SB_P_B			0x803c</div><div class='add'>+#define SB_P(pipe) _PIPE(pipe, _SB_P_A, _SB_P_B)</div><div class='add'>+#define SB_P2_DIVIDER_MASK			PSB_MASK(31, 30)</div><div class='add'>+#define SB_P2_DIVIDER_SHIFT			30</div><div class='add'>+#define SB_P2_10				0 /* HDMI, DP, DAC */</div><div class='add'>+#define SB_P2_5				1 /* DAC */</div><div class='add'>+#define SB_P2_14				2 /* LVDS single */</div><div class='add'>+#define SB_P2_7				3 /* LVDS double */</div><div class='add'>+#define SB_P1_DIVIDER_MASK			PSB_MASK(15, 12)</div><div class='add'>+#define SB_P1_DIVIDER_SHIFT			12</div><div class='add'>+</div><div class='add'>+#define PSB_LANE0		0x120</div><div class='add'>+#define PSB_LANE1		0x220</div><div class='add'>+#define PSB_LANE2		0x2320</div><div class='add'>+#define PSB_LANE3		0x2420</div><div class='add'>+</div><div class='add'>+#define LANE_PLL_MASK		(0x7 &lt;&lt; 20)</div><div class='add'>+#define LANE_PLL_ENABLE		(0x3 &lt;&lt; 20)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c<br/>new file mode 100644<br/>index 000000000000..88b42971c0fd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/psb_intel_sdvo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/psb_intel_sdvo.c</a></div><div class='hunk'>@@ -0,0 +1,2623 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2006 Dave Airlie &lt;airlied@linux.ie&gt;</div><div class='add'>+ * Copyright © 2006-2007 Intel Corporation</div><div class='add'>+ *   Jesse Barnes &lt;jesse.barnes@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='add'>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER</div><div class='add'>+ * DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Eric Anholt &lt;eric@anholt.net&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "drm.h"</div><div class='add'>+#include "drm_crtc.h"</div><div class='add'>+#include "drm_edid.h"</div><div class='add'>+#include "psb_intel_drv.h"</div><div class='add'>+#include "gma_drm.h"</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_intel_sdvo_regs.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+</div><div class='add'>+#define SDVO_TMDS_MASK (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1)</div><div class='add'>+#define SDVO_RGB_MASK  (SDVO_OUTPUT_RGB0 | SDVO_OUTPUT_RGB1)</div><div class='add'>+#define SDVO_LVDS_MASK (SDVO_OUTPUT_LVDS0 | SDVO_OUTPUT_LVDS1)</div><div class='add'>+#define SDVO_TV_MASK   (SDVO_OUTPUT_CVBS0 | SDVO_OUTPUT_SVID0)</div><div class='add'>+</div><div class='add'>+#define SDVO_OUTPUT_MASK (SDVO_TMDS_MASK | SDVO_RGB_MASK | SDVO_LVDS_MASK |\</div><div class='add'>+                         SDVO_TV_MASK)</div><div class='add'>+</div><div class='add'>+#define IS_TV(c)	(c-&gt;output_flag &amp; SDVO_TV_MASK)</div><div class='add'>+#define IS_TMDS(c)	(c-&gt;output_flag &amp; SDVO_TMDS_MASK)</div><div class='add'>+#define IS_LVDS(c)	(c-&gt;output_flag &amp; SDVO_LVDS_MASK)</div><div class='add'>+#define IS_TV_OR_LVDS(c) (c-&gt;output_flag &amp; (SDVO_TV_MASK | SDVO_LVDS_MASK))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const char *tv_format_names[] = {</div><div class='add'>+	"NTSC_M"   , "NTSC_J"  , "NTSC_443",</div><div class='add'>+	"PAL_B"    , "PAL_D"   , "PAL_G"   ,</div><div class='add'>+	"PAL_H"    , "PAL_I"   , "PAL_M"   ,</div><div class='add'>+	"PAL_N"    , "PAL_NC"  , "PAL_60"  ,</div><div class='add'>+	"SECAM_B"  , "SECAM_D" , "SECAM_G" ,</div><div class='add'>+	"SECAM_K"  , "SECAM_K1", "SECAM_L" ,</div><div class='add'>+	"SECAM_60"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TV_FORMAT_NUM  (sizeof(tv_format_names) / sizeof(*tv_format_names))</div><div class='add'>+</div><div class='add'>+struct psb_intel_sdvo {</div><div class='add'>+	struct psb_intel_encoder base;</div><div class='add'>+</div><div class='add'>+	struct i2c_adapter *i2c;</div><div class='add'>+	u8 slave_addr;</div><div class='add'>+</div><div class='add'>+	struct i2c_adapter ddc;</div><div class='add'>+</div><div class='add'>+	/* Register for the SDVO device: SDVOB or SDVOC */</div><div class='add'>+	int sdvo_reg;</div><div class='add'>+</div><div class='add'>+	/* Active outputs controlled by this SDVO output */</div><div class='add'>+	uint16_t controlled_output;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Capabilities of the SDVO device returned by</div><div class='add'>+	 * i830_sdvo_get_capabilities()</div><div class='add'>+	 */</div><div class='add'>+	struct psb_intel_sdvo_caps caps;</div><div class='add'>+</div><div class='add'>+	/* Pixel clock limitations reported by the SDVO device, in kHz */</div><div class='add'>+	int pixel_clock_min, pixel_clock_max;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	* For multiple function SDVO device,</div><div class='add'>+	* this is for current attached outputs.</div><div class='add'>+	*/</div><div class='add'>+	uint16_t attached_output;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * This is used to select the color range of RBG outputs in HDMI mode.</div><div class='add'>+	 * It is only valid when using TMDS encoding and 8 bit per color mode.</div><div class='add'>+	 */</div><div class='add'>+	uint32_t color_range;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * This is set if we're going to treat the device as TV-out.</div><div class='add'>+	 *</div><div class='add'>+	 * While we have these nice friendly flags for output types that ought</div><div class='add'>+	 * to decide this for us, the S-Video output on our HDMI+S-Video card</div><div class='add'>+	 * shows up as RGB1 (VGA).</div><div class='add'>+	 */</div><div class='add'>+	bool is_tv;</div><div class='add'>+</div><div class='add'>+	/* This is for current tv format name */</div><div class='add'>+	int tv_format_index;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * This is set if we treat the device as HDMI, instead of DVI.</div><div class='add'>+	 */</div><div class='add'>+	bool is_hdmi;</div><div class='add'>+	bool has_hdmi_monitor;</div><div class='add'>+	bool has_hdmi_audio;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * This is set if we detect output of sdvo device as LVDS and</div><div class='add'>+	 * have a valid fixed mode to use with the panel.</div><div class='add'>+	 */</div><div class='add'>+	bool is_lvds;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * This is sdvo fixed pannel mode pointer</div><div class='add'>+	 */</div><div class='add'>+	struct drm_display_mode *sdvo_lvds_fixed_mode;</div><div class='add'>+</div><div class='add'>+	/* DDC bus used by this SDVO encoder */</div><div class='add'>+	uint8_t ddc_bus;</div><div class='add'>+</div><div class='add'>+	/* Input timings for adjusted_mode */</div><div class='add'>+	struct psb_intel_sdvo_dtd input_dtd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct psb_intel_sdvo_connector {</div><div class='add'>+	struct psb_intel_connector base;</div><div class='add'>+</div><div class='add'>+	/* Mark the type of connector */</div><div class='add'>+	uint16_t output_flag;</div><div class='add'>+</div><div class='add'>+	int force_audio;</div><div class='add'>+</div><div class='add'>+	/* This contains all current supported TV format */</div><div class='add'>+	u8 tv_format_supported[TV_FORMAT_NUM];</div><div class='add'>+	int   format_supported_num;</div><div class='add'>+	struct drm_property *tv_format;</div><div class='add'>+</div><div class='add'>+	/* add the property for the SDVO-TV */</div><div class='add'>+	struct drm_property *left;</div><div class='add'>+	struct drm_property *right;</div><div class='add'>+	struct drm_property *top;</div><div class='add'>+	struct drm_property *bottom;</div><div class='add'>+	struct drm_property *hpos;</div><div class='add'>+	struct drm_property *vpos;</div><div class='add'>+	struct drm_property *contrast;</div><div class='add'>+	struct drm_property *saturation;</div><div class='add'>+	struct drm_property *hue;</div><div class='add'>+	struct drm_property *sharpness;</div><div class='add'>+	struct drm_property *flicker_filter;</div><div class='add'>+	struct drm_property *flicker_filter_adaptive;</div><div class='add'>+	struct drm_property *flicker_filter_2d;</div><div class='add'>+	struct drm_property *tv_chroma_filter;</div><div class='add'>+	struct drm_property *tv_luma_filter;</div><div class='add'>+	struct drm_property *dot_crawl;</div><div class='add'>+</div><div class='add'>+	/* add the property for the SDVO-TV/LVDS */</div><div class='add'>+	struct drm_property *brightness;</div><div class='add'>+</div><div class='add'>+	/* Add variable to record current setting for the above property */</div><div class='add'>+	u32	left_margin, right_margin, top_margin, bottom_margin;</div><div class='add'>+</div><div class='add'>+	/* this is to get the range of margin.*/</div><div class='add'>+	u32	max_hscan,  max_vscan;</div><div class='add'>+	u32	max_hpos, cur_hpos;</div><div class='add'>+	u32	max_vpos, cur_vpos;</div><div class='add'>+	u32	cur_brightness, max_brightness;</div><div class='add'>+	u32	cur_contrast,	max_contrast;</div><div class='add'>+	u32	cur_saturation, max_saturation;</div><div class='add'>+	u32	cur_hue,	max_hue;</div><div class='add'>+	u32	cur_sharpness,	max_sharpness;</div><div class='add'>+	u32	cur_flicker_filter,		max_flicker_filter;</div><div class='add'>+	u32	cur_flicker_filter_adaptive,	max_flicker_filter_adaptive;</div><div class='add'>+	u32	cur_flicker_filter_2d,		max_flicker_filter_2d;</div><div class='add'>+	u32	cur_tv_chroma_filter,	max_tv_chroma_filter;</div><div class='add'>+	u32	cur_tv_luma_filter,	max_tv_luma_filter;</div><div class='add'>+	u32	cur_dot_crawl,	max_dot_crawl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct psb_intel_sdvo *to_psb_intel_sdvo(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	return container_of(encoder, struct psb_intel_sdvo, base.base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct psb_intel_sdvo *intel_attached_sdvo(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	return container_of(psb_intel_attached_encoder(connector),</div><div class='add'>+			    struct psb_intel_sdvo, base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct psb_intel_sdvo_connector *to_psb_intel_sdvo_connector(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	return container_of(to_psb_intel_connector(connector), struct psb_intel_sdvo_connector, base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+psb_intel_sdvo_output_setup(struct psb_intel_sdvo *psb_intel_sdvo, uint16_t flags);</div><div class='add'>+static bool</div><div class='add'>+psb_intel_sdvo_tv_create_property(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+			      struct psb_intel_sdvo_connector *psb_intel_sdvo_connector,</div><div class='add'>+			      int type);</div><div class='add'>+static bool</div><div class='add'>+psb_intel_sdvo_create_enhance_property(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+				   struct psb_intel_sdvo_connector *psb_intel_sdvo_connector);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Writes the SDVOB or SDVOC with the given value, but always writes both</div><div class='add'>+ * SDVOB and SDVOC to work around apparent hardware issues (according to</div><div class='add'>+ * comments in the BIOS).</div><div class='add'>+ */</div><div class='add'>+static void psb_intel_sdvo_write_sdvox(struct psb_intel_sdvo *psb_intel_sdvo, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = psb_intel_sdvo-&gt;base.base.dev;</div><div class='add'>+	u32 bval = val, cval = val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (psb_intel_sdvo-&gt;sdvo_reg == SDVOB) {</div><div class='add'>+		cval = REG_READ(SDVOC);</div><div class='add'>+	} else {</div><div class='add'>+		bval = REG_READ(SDVOB);</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Write the registers twice for luck. Sometimes,</div><div class='add'>+	 * writing them only once doesn't appear to 'stick'.</div><div class='add'>+	 * The BIOS does this too. Yay, magic</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 2; i++)</div><div class='add'>+	{</div><div class='add'>+		REG_WRITE(SDVOB, bval);</div><div class='add'>+		REG_READ(SDVOB);</div><div class='add'>+		REG_WRITE(SDVOC, cval);</div><div class='add'>+		REG_READ(SDVOC);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_read_byte(struct psb_intel_sdvo *psb_intel_sdvo, u8 addr, u8 *ch)</div><div class='add'>+{</div><div class='add'>+	struct i2c_msg msgs[] = {</div><div class='add'>+		{</div><div class='add'>+			.addr = psb_intel_sdvo-&gt;slave_addr,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.len = 1,</div><div class='add'>+			.buf = &amp;addr,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.addr = psb_intel_sdvo-&gt;slave_addr,</div><div class='add'>+			.flags = I2C_M_RD,</div><div class='add'>+			.len = 1,</div><div class='add'>+			.buf = ch,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if ((ret = i2c_transfer(psb_intel_sdvo-&gt;i2c, msgs, 2)) == 2)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("i2c transfer returned %d\n", ret);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_NAME_ENTRY(cmd) {cmd, #cmd}</div><div class='add'>+/** Mapping of command numbers to names, for debug output */</div><div class='add'>+static const struct _sdvo_cmd_name {</div><div class='add'>+	u8 cmd;</div><div class='add'>+	const char *name;</div><div class='add'>+} sdvo_cmd_names[] = {</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_RESET),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_DEVICE_CAPS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_FIRMWARE_REV),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_TRAINED_INPUTS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_ACTIVE_OUTPUTS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_ACTIVE_OUTPUTS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_IN_OUT_MAP),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_IN_OUT_MAP),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_ATTACHED_DISPLAYS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HOT_PLUG_SUPPORT),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_ACTIVE_HOT_PLUG),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_ACTIVE_HOT_PLUG),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_INTERRUPT_EVENT_SOURCE),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TARGET_INPUT),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TARGET_OUTPUT),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_INPUT_TIMINGS_PART1),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_INPUT_TIMINGS_PART2),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_INPUT_TIMINGS_PART1),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_INPUT_TIMINGS_PART2),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_INPUT_TIMINGS_PART1),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_OUTPUT_TIMINGS_PART1),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_OUTPUT_TIMINGS_PART2),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OUTPUT_TIMINGS_PART1),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OUTPUT_TIMINGS_PART2),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_CREATE_PREFERRED_INPUT_TIMING),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART1),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART2),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_INPUT_PIXEL_CLOCK_RANGE),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OUTPUT_PIXEL_CLOCK_RANGE),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPPORTED_CLOCK_RATE_MULTS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_CLOCK_RATE_MULT),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_CLOCK_RATE_MULT),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPPORTED_TV_FORMATS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_TV_FORMAT),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TV_FORMAT),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPPORTED_POWER_STATES),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_POWER_STATE),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_ENCODER_POWER_STATE),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_DISPLAY_POWER_STATE),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_CONTROL_BUS_SWITCH),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SDTV_RESOLUTION_SUPPORT),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SCALED_HDTV_RESOLUTION_SUPPORT),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPPORTED_ENHANCEMENTS),</div><div class='add'>+</div><div class='add'>+    /* Add the op code for SDVO enhancements */</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_HPOS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HPOS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HPOS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_VPOS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_VPOS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_VPOS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_SATURATION),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SATURATION),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_SATURATION),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_HUE),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HUE),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HUE),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_CONTRAST),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_CONTRAST),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_CONTRAST),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_BRIGHTNESS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_BRIGHTNESS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_BRIGHTNESS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_OVERSCAN_H),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OVERSCAN_H),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_OVERSCAN_H),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_OVERSCAN_V),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OVERSCAN_V),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_OVERSCAN_V),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_FLICKER_FILTER),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_FLICKER_FILTER),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_FLICKER_FILTER),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_FLICKER_FILTER_ADAPTIVE),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_FLICKER_FILTER_ADAPTIVE),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_FLICKER_FILTER_ADAPTIVE),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_FLICKER_FILTER_2D),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_FLICKER_FILTER_2D),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_FLICKER_FILTER_2D),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_SHARPNESS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SHARPNESS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_SHARPNESS),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_DOT_CRAWL),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_DOT_CRAWL),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_TV_CHROMA_FILTER),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_TV_CHROMA_FILTER),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TV_CHROMA_FILTER),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_TV_LUMA_FILTER),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_TV_LUMA_FILTER),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TV_LUMA_FILTER),</div><div class='add'>+</div><div class='add'>+    /* HDMI op code */</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPP_ENCODE),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_ENCODE),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_ENCODE),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_PIXEL_REPLI),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_PIXEL_REPLI),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_COLORIMETRY_CAP),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_COLORIMETRY),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_COLORIMETRY),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_AUDIO_ENCRYPT_PREFER),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_AUDIO_STAT),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_AUDIO_STAT),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_INDEX),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HBUF_INDEX),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_INFO),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_AV_SPLIT),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HBUF_AV_SPLIT),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_TXRATE),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HBUF_TXRATE),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HBUF_DATA),</div><div class='add'>+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_DATA),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IS_SDVOB(reg)	(reg == SDVOB)</div><div class='add'>+#define SDVO_NAME(svdo) (IS_SDVOB((svdo)-&gt;sdvo_reg) ? "SDVOB" : "SDVOC")</div><div class='add'>+</div><div class='add'>+static void psb_intel_sdvo_debug_write(struct psb_intel_sdvo *psb_intel_sdvo, u8 cmd,</div><div class='add'>+				   const void *args, int args_len)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s: W: %02X ",</div><div class='add'>+				SDVO_NAME(psb_intel_sdvo), cmd);</div><div class='add'>+	for (i = 0; i &lt; args_len; i++)</div><div class='add'>+		DRM_LOG_KMS("%02X ", ((u8 *)args)[i]);</div><div class='add'>+	for (; i &lt; 8; i++)</div><div class='add'>+		DRM_LOG_KMS("   ");</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sdvo_cmd_names); i++) {</div><div class='add'>+		if (cmd == sdvo_cmd_names[i].cmd) {</div><div class='add'>+			DRM_LOG_KMS("(%s)", sdvo_cmd_names[i].name);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (i == ARRAY_SIZE(sdvo_cmd_names))</div><div class='add'>+		DRM_LOG_KMS("(%02X)", cmd);</div><div class='add'>+	DRM_LOG_KMS("\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *cmd_status_names[] = {</div><div class='add'>+	"Power on",</div><div class='add'>+	"Success",</div><div class='add'>+	"Not supported",</div><div class='add'>+	"Invalid arg",</div><div class='add'>+	"Pending",</div><div class='add'>+	"Target not specified",</div><div class='add'>+	"Scaling not supported"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_write_cmd(struct psb_intel_sdvo *psb_intel_sdvo, u8 cmd,</div><div class='add'>+				 const void *args, int args_len)</div><div class='add'>+{</div><div class='add'>+	u8 buf[args_len*2 + 2], status;</div><div class='add'>+	struct i2c_msg msgs[args_len + 3];</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_debug_write(psb_intel_sdvo, cmd, args, args_len);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; args_len; i++) {</div><div class='add'>+		msgs[i].addr = psb_intel_sdvo-&gt;slave_addr;</div><div class='add'>+		msgs[i].flags = 0;</div><div class='add'>+		msgs[i].len = 2;</div><div class='add'>+		msgs[i].buf = buf + 2 *i;</div><div class='add'>+		buf[2*i + 0] = SDVO_I2C_ARG_0 - i;</div><div class='add'>+		buf[2*i + 1] = ((u8*)args)[i];</div><div class='add'>+	}</div><div class='add'>+	msgs[i].addr = psb_intel_sdvo-&gt;slave_addr;</div><div class='add'>+	msgs[i].flags = 0;</div><div class='add'>+	msgs[i].len = 2;</div><div class='add'>+	msgs[i].buf = buf + 2*i;</div><div class='add'>+	buf[2*i + 0] = SDVO_I2C_OPCODE;</div><div class='add'>+	buf[2*i + 1] = cmd;</div><div class='add'>+</div><div class='add'>+	/* the following two are to read the response */</div><div class='add'>+	status = SDVO_I2C_CMD_STATUS;</div><div class='add'>+	msgs[i+1].addr = psb_intel_sdvo-&gt;slave_addr;</div><div class='add'>+	msgs[i+1].flags = 0;</div><div class='add'>+	msgs[i+1].len = 1;</div><div class='add'>+	msgs[i+1].buf = &amp;status;</div><div class='add'>+</div><div class='add'>+	msgs[i+2].addr = psb_intel_sdvo-&gt;slave_addr;</div><div class='add'>+	msgs[i+2].flags = I2C_M_RD;</div><div class='add'>+	msgs[i+2].len = 1;</div><div class='add'>+	msgs[i+2].buf = &amp;status;</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(psb_intel_sdvo-&gt;i2c, msgs, i+3);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		DRM_DEBUG_KMS("I2c transfer returned %d\n", ret);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if (ret != i+3) {</div><div class='add'>+		/* failure in I2C transfer */</div><div class='add'>+		DRM_DEBUG_KMS("I2c transfer returned %d/%d\n", ret, i+3);</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 psb_intel_sdvo_read_response(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+				     void *response, int response_len)</div><div class='add'>+{</div><div class='add'>+	u8 retry = 5;</div><div class='add'>+	u8 status;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s: R: ", SDVO_NAME(psb_intel_sdvo));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The documentation states that all commands will be</div><div class='add'>+	 * processed within 15µs, and that we need only poll</div><div class='add'>+	 * the status byte a maximum of 3 times in order for the</div><div class='add'>+	 * command to be complete.</div><div class='add'>+	 *</div><div class='add'>+	 * Check 5 times in case the hardware failed to read the docs.</div><div class='add'>+	 */</div><div class='add'>+	if (!psb_intel_sdvo_read_byte(psb_intel_sdvo,</div><div class='add'>+				  SDVO_I2C_CMD_STATUS,</div><div class='add'>+				  &amp;status))</div><div class='add'>+		goto log_fail;</div><div class='add'>+</div><div class='add'>+	while (status == SDVO_CMD_STATUS_PENDING &amp;&amp; retry--) {</div><div class='add'>+		udelay(15);</div><div class='add'>+		if (!psb_intel_sdvo_read_byte(psb_intel_sdvo,</div><div class='add'>+					  SDVO_I2C_CMD_STATUS,</div><div class='add'>+					  &amp;status))</div><div class='add'>+			goto log_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status &lt;= SDVO_CMD_STATUS_SCALING_NOT_SUPP)</div><div class='add'>+		DRM_LOG_KMS("(%s)", cmd_status_names[status]);</div><div class='add'>+	else</div><div class='add'>+		DRM_LOG_KMS("(??? %d)", status);</div><div class='add'>+</div><div class='add'>+	if (status != SDVO_CMD_STATUS_SUCCESS)</div><div class='add'>+		goto log_fail;</div><div class='add'>+</div><div class='add'>+	/* Read the command response */</div><div class='add'>+	for (i = 0; i &lt; response_len; i++) {</div><div class='add'>+		if (!psb_intel_sdvo_read_byte(psb_intel_sdvo,</div><div class='add'>+					  SDVO_I2C_RETURN_0 + i,</div><div class='add'>+					  &amp;((u8 *)response)[i]))</div><div class='add'>+			goto log_fail;</div><div class='add'>+		DRM_LOG_KMS(" %02X", ((u8 *)response)[i]);</div><div class='add'>+	}</div><div class='add'>+	DRM_LOG_KMS("\n");</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+log_fail:</div><div class='add'>+	DRM_LOG_KMS("... failed\n");</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_intel_sdvo_get_pixel_multiplier(struct drm_display_mode *mode)</div><div class='add'>+{</div><div class='add'>+	if (mode-&gt;clock &gt;= 100000)</div><div class='add'>+		return 1;</div><div class='add'>+	else if (mode-&gt;clock &gt;= 50000)</div><div class='add'>+		return 2;</div><div class='add'>+	else</div><div class='add'>+		return 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_set_control_bus_switch(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+					      u8 ddc_bus)</div><div class='add'>+{</div><div class='add'>+	/* This must be the immediately preceding write before the i2c xfer */</div><div class='add'>+	return psb_intel_sdvo_write_cmd(psb_intel_sdvo,</div><div class='add'>+				    SDVO_CMD_SET_CONTROL_BUS_SWITCH,</div><div class='add'>+				    &amp;ddc_bus, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_set_value(struct psb_intel_sdvo *psb_intel_sdvo, u8 cmd, const void *data, int len)</div><div class='add'>+{</div><div class='add'>+	if (!psb_intel_sdvo_write_cmd(psb_intel_sdvo, cmd, data, len))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return psb_intel_sdvo_read_response(psb_intel_sdvo, NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+psb_intel_sdvo_get_value(struct psb_intel_sdvo *psb_intel_sdvo, u8 cmd, void *value, int len)</div><div class='add'>+{</div><div class='add'>+	if (!psb_intel_sdvo_write_cmd(psb_intel_sdvo, cmd, NULL, 0))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return psb_intel_sdvo_read_response(psb_intel_sdvo, value, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_set_target_input(struct psb_intel_sdvo *psb_intel_sdvo)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo_set_target_input_args targets = {0};</div><div class='add'>+	return psb_intel_sdvo_set_value(psb_intel_sdvo,</div><div class='add'>+				    SDVO_CMD_SET_TARGET_INPUT,</div><div class='add'>+				    &amp;targets, sizeof(targets));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Return whether each input is trained.</div><div class='add'>+ *</div><div class='add'>+ * This function is making an assumption about the layout of the response,</div><div class='add'>+ * which should be checked against the docs.</div><div class='add'>+ */</div><div class='add'>+static bool psb_intel_sdvo_get_trained_inputs(struct psb_intel_sdvo *psb_intel_sdvo, bool *input_1, bool *input_2)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo_get_trained_inputs_response response;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(response) != 1);</div><div class='add'>+	if (!psb_intel_sdvo_get_value(psb_intel_sdvo, SDVO_CMD_GET_TRAINED_INPUTS,</div><div class='add'>+				  &amp;response, sizeof(response)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	*input_1 = response.input0_trained;</div><div class='add'>+	*input_2 = response.input1_trained;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_set_active_outputs(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+					  u16 outputs)</div><div class='add'>+{</div><div class='add'>+	return psb_intel_sdvo_set_value(psb_intel_sdvo,</div><div class='add'>+				    SDVO_CMD_SET_ACTIVE_OUTPUTS,</div><div class='add'>+				    &amp;outputs, sizeof(outputs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_set_encoder_power_state(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+					       int mode)</div><div class='add'>+{</div><div class='add'>+	u8 state = SDVO_ENCODER_STATE_ON;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case DRM_MODE_DPMS_ON:</div><div class='add'>+		state = SDVO_ENCODER_STATE_ON;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_MODE_DPMS_STANDBY:</div><div class='add'>+		state = SDVO_ENCODER_STATE_STANDBY;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_MODE_DPMS_SUSPEND:</div><div class='add'>+		state = SDVO_ENCODER_STATE_SUSPEND;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_MODE_DPMS_OFF:</div><div class='add'>+		state = SDVO_ENCODER_STATE_OFF;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return psb_intel_sdvo_set_value(psb_intel_sdvo,</div><div class='add'>+				    SDVO_CMD_SET_ENCODER_POWER_STATE, &amp;state, sizeof(state));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_get_input_pixel_clock_range(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+						   int *clock_min,</div><div class='add'>+						   int *clock_max)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo_pixel_clock_range clocks;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(clocks) != 4);</div><div class='add'>+	if (!psb_intel_sdvo_get_value(psb_intel_sdvo,</div><div class='add'>+				  SDVO_CMD_GET_INPUT_PIXEL_CLOCK_RANGE,</div><div class='add'>+				  &amp;clocks, sizeof(clocks)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Convert the values from units of 10 kHz to kHz. */</div><div class='add'>+	*clock_min = clocks.min * 10;</div><div class='add'>+	*clock_max = clocks.max * 10;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_set_target_output(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+					 u16 outputs)</div><div class='add'>+{</div><div class='add'>+	return psb_intel_sdvo_set_value(psb_intel_sdvo,</div><div class='add'>+				    SDVO_CMD_SET_TARGET_OUTPUT,</div><div class='add'>+				    &amp;outputs, sizeof(outputs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_set_timing(struct psb_intel_sdvo *psb_intel_sdvo, u8 cmd,</div><div class='add'>+				  struct psb_intel_sdvo_dtd *dtd)</div><div class='add'>+{</div><div class='add'>+	return psb_intel_sdvo_set_value(psb_intel_sdvo, cmd, &amp;dtd-&gt;part1, sizeof(dtd-&gt;part1)) &amp;&amp;</div><div class='add'>+		psb_intel_sdvo_set_value(psb_intel_sdvo, cmd + 1, &amp;dtd-&gt;part2, sizeof(dtd-&gt;part2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_set_input_timing(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+					 struct psb_intel_sdvo_dtd *dtd)</div><div class='add'>+{</div><div class='add'>+	return psb_intel_sdvo_set_timing(psb_intel_sdvo,</div><div class='add'>+				     SDVO_CMD_SET_INPUT_TIMINGS_PART1, dtd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_set_output_timing(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+					 struct psb_intel_sdvo_dtd *dtd)</div><div class='add'>+{</div><div class='add'>+	return psb_intel_sdvo_set_timing(psb_intel_sdvo,</div><div class='add'>+				     SDVO_CMD_SET_OUTPUT_TIMINGS_PART1, dtd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+psb_intel_sdvo_create_preferred_input_timing(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+					 uint16_t clock,</div><div class='add'>+					 uint16_t width,</div><div class='add'>+					 uint16_t height)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo_preferred_input_timing_args args;</div><div class='add'>+</div><div class='add'>+	memset(&amp;args, 0, sizeof(args));</div><div class='add'>+	args.clock = clock;</div><div class='add'>+	args.width = width;</div><div class='add'>+	args.height = height;</div><div class='add'>+	args.interlace = 0;</div><div class='add'>+</div><div class='add'>+	if (psb_intel_sdvo-&gt;is_lvds &amp;&amp;</div><div class='add'>+	   (psb_intel_sdvo-&gt;sdvo_lvds_fixed_mode-&gt;hdisplay != width ||</div><div class='add'>+	    psb_intel_sdvo-&gt;sdvo_lvds_fixed_mode-&gt;vdisplay != height))</div><div class='add'>+		args.scaled = 1;</div><div class='add'>+</div><div class='add'>+	return psb_intel_sdvo_set_value(psb_intel_sdvo,</div><div class='add'>+				    SDVO_CMD_CREATE_PREFERRED_INPUT_TIMING,</div><div class='add'>+				    &amp;args, sizeof(args));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_get_preferred_input_timing(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+						  struct psb_intel_sdvo_dtd *dtd)</div><div class='add'>+{</div><div class='add'>+	BUILD_BUG_ON(sizeof(dtd-&gt;part1) != 8);</div><div class='add'>+	BUILD_BUG_ON(sizeof(dtd-&gt;part2) != 8);</div><div class='add'>+	return psb_intel_sdvo_get_value(psb_intel_sdvo, SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART1,</div><div class='add'>+				    &amp;dtd-&gt;part1, sizeof(dtd-&gt;part1)) &amp;&amp;</div><div class='add'>+		psb_intel_sdvo_get_value(psb_intel_sdvo, SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART2,</div><div class='add'>+				     &amp;dtd-&gt;part2, sizeof(dtd-&gt;part2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_set_clock_rate_mult(struct psb_intel_sdvo *psb_intel_sdvo, u8 val)</div><div class='add'>+{</div><div class='add'>+	return psb_intel_sdvo_set_value(psb_intel_sdvo, SDVO_CMD_SET_CLOCK_RATE_MULT, &amp;val, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_intel_sdvo_get_dtd_from_mode(struct psb_intel_sdvo_dtd *dtd,</div><div class='add'>+					 const struct drm_display_mode *mode)</div><div class='add'>+{</div><div class='add'>+	uint16_t width, height;</div><div class='add'>+	uint16_t h_blank_len, h_sync_len, v_blank_len, v_sync_len;</div><div class='add'>+	uint16_t h_sync_offset, v_sync_offset;</div><div class='add'>+</div><div class='add'>+	width = mode-&gt;crtc_hdisplay;</div><div class='add'>+	height = mode-&gt;crtc_vdisplay;</div><div class='add'>+</div><div class='add'>+	/* do some mode translations */</div><div class='add'>+	h_blank_len = mode-&gt;crtc_hblank_end - mode-&gt;crtc_hblank_start;</div><div class='add'>+	h_sync_len = mode-&gt;crtc_hsync_end - mode-&gt;crtc_hsync_start;</div><div class='add'>+</div><div class='add'>+	v_blank_len = mode-&gt;crtc_vblank_end - mode-&gt;crtc_vblank_start;</div><div class='add'>+	v_sync_len = mode-&gt;crtc_vsync_end - mode-&gt;crtc_vsync_start;</div><div class='add'>+</div><div class='add'>+	h_sync_offset = mode-&gt;crtc_hsync_start - mode-&gt;crtc_hblank_start;</div><div class='add'>+	v_sync_offset = mode-&gt;crtc_vsync_start - mode-&gt;crtc_vblank_start;</div><div class='add'>+</div><div class='add'>+	dtd-&gt;part1.clock = mode-&gt;clock / 10;</div><div class='add'>+	dtd-&gt;part1.h_active = width &amp; 0xff;</div><div class='add'>+	dtd-&gt;part1.h_blank = h_blank_len &amp; 0xff;</div><div class='add'>+	dtd-&gt;part1.h_high = (((width &gt;&gt; 8) &amp; 0xf) &lt;&lt; 4) |</div><div class='add'>+		((h_blank_len &gt;&gt; 8) &amp; 0xf);</div><div class='add'>+	dtd-&gt;part1.v_active = height &amp; 0xff;</div><div class='add'>+	dtd-&gt;part1.v_blank = v_blank_len &amp; 0xff;</div><div class='add'>+	dtd-&gt;part1.v_high = (((height &gt;&gt; 8) &amp; 0xf) &lt;&lt; 4) |</div><div class='add'>+		((v_blank_len &gt;&gt; 8) &amp; 0xf);</div><div class='add'>+</div><div class='add'>+	dtd-&gt;part2.h_sync_off = h_sync_offset &amp; 0xff;</div><div class='add'>+	dtd-&gt;part2.h_sync_width = h_sync_len &amp; 0xff;</div><div class='add'>+	dtd-&gt;part2.v_sync_off_width = (v_sync_offset &amp; 0xf) &lt;&lt; 4 |</div><div class='add'>+		(v_sync_len &amp; 0xf);</div><div class='add'>+	dtd-&gt;part2.sync_off_width_high = ((h_sync_offset &amp; 0x300) &gt;&gt; 2) |</div><div class='add'>+		((h_sync_len &amp; 0x300) &gt;&gt; 4) | ((v_sync_offset &amp; 0x30) &gt;&gt; 2) |</div><div class='add'>+		((v_sync_len &amp; 0x30) &gt;&gt; 4);</div><div class='add'>+</div><div class='add'>+	dtd-&gt;part2.dtd_flags = 0x18;</div><div class='add'>+	if (mode-&gt;flags &amp; DRM_MODE_FLAG_PHSYNC)</div><div class='add'>+		dtd-&gt;part2.dtd_flags |= 0x2;</div><div class='add'>+	if (mode-&gt;flags &amp; DRM_MODE_FLAG_PVSYNC)</div><div class='add'>+		dtd-&gt;part2.dtd_flags |= 0x4;</div><div class='add'>+</div><div class='add'>+	dtd-&gt;part2.sdvo_flags = 0;</div><div class='add'>+	dtd-&gt;part2.v_sync_off_high = v_sync_offset &amp; 0xc0;</div><div class='add'>+	dtd-&gt;part2.reserved = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_intel_sdvo_get_mode_from_dtd(struct drm_display_mode * mode,</div><div class='add'>+					 const struct psb_intel_sdvo_dtd *dtd)</div><div class='add'>+{</div><div class='add'>+	mode-&gt;hdisplay = dtd-&gt;part1.h_active;</div><div class='add'>+	mode-&gt;hdisplay += ((dtd-&gt;part1.h_high &gt;&gt; 4) &amp; 0x0f) &lt;&lt; 8;</div><div class='add'>+	mode-&gt;hsync_start = mode-&gt;hdisplay + dtd-&gt;part2.h_sync_off;</div><div class='add'>+	mode-&gt;hsync_start += (dtd-&gt;part2.sync_off_width_high &amp; 0xc0) &lt;&lt; 2;</div><div class='add'>+	mode-&gt;hsync_end = mode-&gt;hsync_start + dtd-&gt;part2.h_sync_width;</div><div class='add'>+	mode-&gt;hsync_end += (dtd-&gt;part2.sync_off_width_high &amp; 0x30) &lt;&lt; 4;</div><div class='add'>+	mode-&gt;htotal = mode-&gt;hdisplay + dtd-&gt;part1.h_blank;</div><div class='add'>+	mode-&gt;htotal += (dtd-&gt;part1.h_high &amp; 0xf) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	mode-&gt;vdisplay = dtd-&gt;part1.v_active;</div><div class='add'>+	mode-&gt;vdisplay += ((dtd-&gt;part1.v_high &gt;&gt; 4) &amp; 0x0f) &lt;&lt; 8;</div><div class='add'>+	mode-&gt;vsync_start = mode-&gt;vdisplay;</div><div class='add'>+	mode-&gt;vsync_start += (dtd-&gt;part2.v_sync_off_width &gt;&gt; 4) &amp; 0xf;</div><div class='add'>+	mode-&gt;vsync_start += (dtd-&gt;part2.sync_off_width_high &amp; 0x0c) &lt;&lt; 2;</div><div class='add'>+	mode-&gt;vsync_start += dtd-&gt;part2.v_sync_off_high &amp; 0xc0;</div><div class='add'>+	mode-&gt;vsync_end = mode-&gt;vsync_start +</div><div class='add'>+		(dtd-&gt;part2.v_sync_off_width &amp; 0xf);</div><div class='add'>+	mode-&gt;vsync_end += (dtd-&gt;part2.sync_off_width_high &amp; 0x3) &lt;&lt; 4;</div><div class='add'>+	mode-&gt;vtotal = mode-&gt;vdisplay + dtd-&gt;part1.v_blank;</div><div class='add'>+	mode-&gt;vtotal += (dtd-&gt;part1.v_high &amp; 0xf) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	mode-&gt;clock = dtd-&gt;part1.clock * 10;</div><div class='add'>+</div><div class='add'>+	mode-&gt;flags &amp;= ~(DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC);</div><div class='add'>+	if (dtd-&gt;part2.dtd_flags &amp; 0x2)</div><div class='add'>+		mode-&gt;flags |= DRM_MODE_FLAG_PHSYNC;</div><div class='add'>+	if (dtd-&gt;part2.dtd_flags &amp; 0x4)</div><div class='add'>+		mode-&gt;flags |= DRM_MODE_FLAG_PVSYNC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_check_supp_encode(struct psb_intel_sdvo *psb_intel_sdvo)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo_encode encode;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(encode) != 2);</div><div class='add'>+	return psb_intel_sdvo_get_value(psb_intel_sdvo,</div><div class='add'>+				  SDVO_CMD_GET_SUPP_ENCODE,</div><div class='add'>+				  &amp;encode, sizeof(encode));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_set_encode(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+				  uint8_t mode)</div><div class='add'>+{</div><div class='add'>+	return psb_intel_sdvo_set_value(psb_intel_sdvo, SDVO_CMD_SET_ENCODE, &amp;mode, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_set_colorimetry(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+				       uint8_t mode)</div><div class='add'>+{</div><div class='add'>+	return psb_intel_sdvo_set_value(psb_intel_sdvo, SDVO_CMD_SET_COLORIMETRY, &amp;mode, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+static void psb_intel_sdvo_dump_hdmi_buf(struct psb_intel_sdvo *psb_intel_sdvo)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+	uint8_t set_buf_index[2];</div><div class='add'>+	uint8_t av_split;</div><div class='add'>+	uint8_t buf_size;</div><div class='add'>+	uint8_t buf[48];</div><div class='add'>+	uint8_t *pos;</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_get_value(encoder, SDVO_CMD_GET_HBUF_AV_SPLIT, &amp;av_split, 1);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= av_split; i++) {</div><div class='add'>+		set_buf_index[0] = i; set_buf_index[1] = 0;</div><div class='add'>+		psb_intel_sdvo_write_cmd(encoder, SDVO_CMD_SET_HBUF_INDEX,</div><div class='add'>+				     set_buf_index, 2);</div><div class='add'>+		psb_intel_sdvo_write_cmd(encoder, SDVO_CMD_GET_HBUF_INFO, NULL, 0);</div><div class='add'>+		psb_intel_sdvo_read_response(encoder, &amp;buf_size, 1);</div><div class='add'>+</div><div class='add'>+		pos = buf;</div><div class='add'>+		for (j = 0; j &lt;= buf_size; j += 8) {</div><div class='add'>+			psb_intel_sdvo_write_cmd(encoder, SDVO_CMD_GET_HBUF_DATA,</div><div class='add'>+					     NULL, 0);</div><div class='add'>+			psb_intel_sdvo_read_response(encoder, pos, 8);</div><div class='add'>+			pos += 8;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_set_avi_infoframe(struct psb_intel_sdvo *psb_intel_sdvo)</div><div class='add'>+{</div><div class='add'>+	DRM_INFO("HDMI is not supported yet");</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+#if 0</div><div class='add'>+	struct dip_infoframe avi_if = {</div><div class='add'>+		.type = DIP_TYPE_AVI,</div><div class='add'>+		.ver = DIP_VERSION_AVI,</div><div class='add'>+		.len = DIP_LEN_AVI,</div><div class='add'>+	};</div><div class='add'>+	uint8_t tx_rate = SDVO_HBUF_TX_VSYNC;</div><div class='add'>+	uint8_t set_buf_index[2] = { 1, 0 };</div><div class='add'>+	uint64_t *data = (uint64_t *)&amp;avi_if;</div><div class='add'>+	unsigned i;</div><div class='add'>+</div><div class='add'>+	intel_dip_infoframe_csum(&amp;avi_if);</div><div class='add'>+</div><div class='add'>+	if (!psb_intel_sdvo_set_value(psb_intel_sdvo,</div><div class='add'>+				  SDVO_CMD_SET_HBUF_INDEX,</div><div class='add'>+				  set_buf_index, 2))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sizeof(avi_if); i += 8) {</div><div class='add'>+		if (!psb_intel_sdvo_set_value(psb_intel_sdvo,</div><div class='add'>+					  SDVO_CMD_SET_HBUF_DATA,</div><div class='add'>+					  data, 8))</div><div class='add'>+			return false;</div><div class='add'>+		data++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return psb_intel_sdvo_set_value(psb_intel_sdvo,</div><div class='add'>+				    SDVO_CMD_SET_HBUF_TXRATE,</div><div class='add'>+				    &amp;tx_rate, 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_set_tv_format(struct psb_intel_sdvo *psb_intel_sdvo)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo_tv_format format;</div><div class='add'>+	uint32_t format_map;</div><div class='add'>+</div><div class='add'>+	format_map = 1 &lt;&lt; psb_intel_sdvo-&gt;tv_format_index;</div><div class='add'>+	memset(&amp;format, 0, sizeof(format));</div><div class='add'>+	memcpy(&amp;format, &amp;format_map, min(sizeof(format), sizeof(format_map)));</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(format) != 6);</div><div class='add'>+	return psb_intel_sdvo_set_value(psb_intel_sdvo,</div><div class='add'>+				    SDVO_CMD_SET_TV_FORMAT,</div><div class='add'>+				    &amp;format, sizeof(format));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+psb_intel_sdvo_set_output_timings_from_mode(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+					struct drm_display_mode *mode)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo_dtd output_dtd;</div><div class='add'>+</div><div class='add'>+	if (!psb_intel_sdvo_set_target_output(psb_intel_sdvo,</div><div class='add'>+					  psb_intel_sdvo-&gt;attached_output))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_get_dtd_from_mode(&amp;output_dtd, mode);</div><div class='add'>+	if (!psb_intel_sdvo_set_output_timing(psb_intel_sdvo, &amp;output_dtd))</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</div><div class='add'>+psb_intel_sdvo_set_input_timings_for_mode(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+					struct drm_display_mode *mode,</div><div class='add'>+					struct drm_display_mode *adjusted_mode)</div><div class='add'>+{</div><div class='add'>+	/* Reset the input timing to the screen. Assume always input 0. */</div><div class='add'>+	if (!psb_intel_sdvo_set_target_input(psb_intel_sdvo))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!psb_intel_sdvo_create_preferred_input_timing(psb_intel_sdvo,</div><div class='add'>+						      mode-&gt;clock / 10,</div><div class='add'>+						      mode-&gt;hdisplay,</div><div class='add'>+						      mode-&gt;vdisplay))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!psb_intel_sdvo_get_preferred_input_timing(psb_intel_sdvo,</div><div class='add'>+						   &amp;psb_intel_sdvo-&gt;input_dtd))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_get_mode_from_dtd(adjusted_mode, &amp;psb_intel_sdvo-&gt;input_dtd);</div><div class='add'>+</div><div class='add'>+	drm_mode_set_crtcinfo(adjusted_mode, 0);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_mode_fixup(struct drm_encoder *encoder,</div><div class='add'>+				  struct drm_display_mode *mode,</div><div class='add'>+				  struct drm_display_mode *adjusted_mode)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo *psb_intel_sdvo = to_psb_intel_sdvo(encoder);</div><div class='add'>+	int multiplier;</div><div class='add'>+</div><div class='add'>+	/* We need to construct preferred input timings based on our</div><div class='add'>+	 * output timings.  To do that, we have to set the output</div><div class='add'>+	 * timings, even though this isn't really the right place in</div><div class='add'>+	 * the sequence to do it. Oh well.</div><div class='add'>+	 */</div><div class='add'>+	if (psb_intel_sdvo-&gt;is_tv) {</div><div class='add'>+		if (!psb_intel_sdvo_set_output_timings_from_mode(psb_intel_sdvo, mode))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		(void) psb_intel_sdvo_set_input_timings_for_mode(psb_intel_sdvo,</div><div class='add'>+							     mode,</div><div class='add'>+							     adjusted_mode);</div><div class='add'>+	} else if (psb_intel_sdvo-&gt;is_lvds) {</div><div class='add'>+		if (!psb_intel_sdvo_set_output_timings_from_mode(psb_intel_sdvo,</div><div class='add'>+							     psb_intel_sdvo-&gt;sdvo_lvds_fixed_mode))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		(void) psb_intel_sdvo_set_input_timings_for_mode(psb_intel_sdvo,</div><div class='add'>+							     mode,</div><div class='add'>+							     adjusted_mode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make the CRTC code factor in the SDVO pixel multiplier.  The</div><div class='add'>+	 * SDVO device will factor out the multiplier during mode_set.</div><div class='add'>+	 */</div><div class='add'>+	multiplier = psb_intel_sdvo_get_pixel_multiplier(adjusted_mode);</div><div class='add'>+	psb_intel_mode_set_pixel_multiplier(adjusted_mode, multiplier);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_intel_sdvo_mode_set(struct drm_encoder *encoder,</div><div class='add'>+				struct drm_display_mode *mode,</div><div class='add'>+				struct drm_display_mode *adjusted_mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct drm_crtc *crtc = encoder-&gt;crtc;</div><div class='add'>+	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);</div><div class='add'>+	struct psb_intel_sdvo *psb_intel_sdvo = to_psb_intel_sdvo(encoder);</div><div class='add'>+	u32 sdvox;</div><div class='add'>+	struct psb_intel_sdvo_in_out_map in_out;</div><div class='add'>+	struct psb_intel_sdvo_dtd input_dtd;</div><div class='add'>+	int pixel_multiplier = psb_intel_mode_get_pixel_multiplier(adjusted_mode);</div><div class='add'>+	int rate;</div><div class='add'>+</div><div class='add'>+	if (!mode)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* First, set the input mapping for the first input to our controlled</div><div class='add'>+	 * output. This is only correct if we're a single-input device, in</div><div class='add'>+	 * which case the first input is the output from the appropriate SDVO</div><div class='add'>+	 * channel on the motherboard.  In a two-input device, the first input</div><div class='add'>+	 * will be SDVOB and the second SDVOC.</div><div class='add'>+	 */</div><div class='add'>+	in_out.in0 = psb_intel_sdvo-&gt;attached_output;</div><div class='add'>+	in_out.in1 = 0;</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_set_value(psb_intel_sdvo,</div><div class='add'>+			     SDVO_CMD_SET_IN_OUT_MAP,</div><div class='add'>+			     &amp;in_out, sizeof(in_out));</div><div class='add'>+</div><div class='add'>+	/* Set the output timings to the screen */</div><div class='add'>+	if (!psb_intel_sdvo_set_target_output(psb_intel_sdvo,</div><div class='add'>+					  psb_intel_sdvo-&gt;attached_output))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* We have tried to get input timing in mode_fixup, and filled into</div><div class='add'>+	 * adjusted_mode.</div><div class='add'>+	 */</div><div class='add'>+	if (psb_intel_sdvo-&gt;is_tv || psb_intel_sdvo-&gt;is_lvds) {</div><div class='add'>+		input_dtd = psb_intel_sdvo-&gt;input_dtd;</div><div class='add'>+	} else {</div><div class='add'>+		/* Set the output timing to the screen */</div><div class='add'>+		if (!psb_intel_sdvo_set_target_output(psb_intel_sdvo,</div><div class='add'>+						  psb_intel_sdvo-&gt;attached_output))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		psb_intel_sdvo_get_dtd_from_mode(&amp;input_dtd, adjusted_mode);</div><div class='add'>+		(void) psb_intel_sdvo_set_output_timing(psb_intel_sdvo, &amp;input_dtd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the input timing to the screen. Assume always input 0. */</div><div class='add'>+	if (!psb_intel_sdvo_set_target_input(psb_intel_sdvo))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (psb_intel_sdvo-&gt;has_hdmi_monitor) {</div><div class='add'>+		psb_intel_sdvo_set_encode(psb_intel_sdvo, SDVO_ENCODE_HDMI);</div><div class='add'>+		psb_intel_sdvo_set_colorimetry(psb_intel_sdvo,</div><div class='add'>+					   SDVO_COLORIMETRY_RGB256);</div><div class='add'>+		psb_intel_sdvo_set_avi_infoframe(psb_intel_sdvo);</div><div class='add'>+	} else</div><div class='add'>+		psb_intel_sdvo_set_encode(psb_intel_sdvo, SDVO_ENCODE_DVI);</div><div class='add'>+</div><div class='add'>+	if (psb_intel_sdvo-&gt;is_tv &amp;&amp;</div><div class='add'>+	    !psb_intel_sdvo_set_tv_format(psb_intel_sdvo))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	(void) psb_intel_sdvo_set_input_timing(psb_intel_sdvo, &amp;input_dtd);</div><div class='add'>+</div><div class='add'>+	switch (pixel_multiplier) {</div><div class='add'>+	default:</div><div class='add'>+	case 1: rate = SDVO_CLOCK_RATE_MULT_1X; break;</div><div class='add'>+	case 2: rate = SDVO_CLOCK_RATE_MULT_2X; break;</div><div class='add'>+	case 4: rate = SDVO_CLOCK_RATE_MULT_4X; break;</div><div class='add'>+	}</div><div class='add'>+	if (!psb_intel_sdvo_set_clock_rate_mult(psb_intel_sdvo, rate))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Set the SDVO control regs. */</div><div class='add'>+	sdvox = REG_READ(psb_intel_sdvo-&gt;sdvo_reg);</div><div class='add'>+	switch (psb_intel_sdvo-&gt;sdvo_reg) {</div><div class='add'>+	case SDVOB:</div><div class='add'>+		sdvox &amp;= SDVOB_PRESERVE_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case SDVOC:</div><div class='add'>+		sdvox &amp;= SDVOC_PRESERVE_MASK;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	sdvox |= (9 &lt;&lt; 19) | SDVO_BORDER_ENABLE;</div><div class='add'>+</div><div class='add'>+	if (psb_intel_crtc-&gt;pipe == 1)</div><div class='add'>+		sdvox |= SDVO_PIPE_B_SELECT;</div><div class='add'>+	if (psb_intel_sdvo-&gt;has_hdmi_audio)</div><div class='add'>+		sdvox |= SDVO_AUDIO_ENABLE;</div><div class='add'>+</div><div class='add'>+	/* FIXME: Check if this is needed for PSB</div><div class='add'>+	sdvox |= (pixel_multiplier - 1) &lt;&lt; SDVO_PORT_MULTIPLY_SHIFT;</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	if (input_dtd.part2.sdvo_flags &amp; SDVO_NEED_TO_STALL)</div><div class='add'>+		sdvox |= SDVO_STALL_SELECT;</div><div class='add'>+	psb_intel_sdvo_write_sdvox(psb_intel_sdvo, sdvox);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_intel_sdvo_dpms(struct drm_encoder *encoder, int mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct psb_intel_sdvo *psb_intel_sdvo = to_psb_intel_sdvo(encoder);</div><div class='add'>+	u32 temp;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case DRM_MODE_DPMS_ON:</div><div class='add'>+		DRM_DEBUG("DPMS_ON");</div><div class='add'>+		break;</div><div class='add'>+	case DRM_MODE_DPMS_OFF:</div><div class='add'>+		DRM_DEBUG("DPMS_OFF");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DRM_DEBUG("DPMS: %d", mode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mode != DRM_MODE_DPMS_ON) {</div><div class='add'>+		psb_intel_sdvo_set_active_outputs(psb_intel_sdvo, 0);</div><div class='add'>+		if (0)</div><div class='add'>+			psb_intel_sdvo_set_encoder_power_state(psb_intel_sdvo, mode);</div><div class='add'>+</div><div class='add'>+		if (mode == DRM_MODE_DPMS_OFF) {</div><div class='add'>+			temp = REG_READ(psb_intel_sdvo-&gt;sdvo_reg);</div><div class='add'>+			if ((temp &amp; SDVO_ENABLE) != 0) {</div><div class='add'>+				psb_intel_sdvo_write_sdvox(psb_intel_sdvo, temp &amp; ~SDVO_ENABLE);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		bool input1, input2;</div><div class='add'>+		int i;</div><div class='add'>+		u8 status;</div><div class='add'>+</div><div class='add'>+		temp = REG_READ(psb_intel_sdvo-&gt;sdvo_reg);</div><div class='add'>+		if ((temp &amp; SDVO_ENABLE) == 0)</div><div class='add'>+			psb_intel_sdvo_write_sdvox(psb_intel_sdvo, temp | SDVO_ENABLE);</div><div class='add'>+		for (i = 0; i &lt; 2; i++)</div><div class='add'>+			psb_intel_wait_for_vblank(dev);</div><div class='add'>+</div><div class='add'>+		status = psb_intel_sdvo_get_trained_inputs(psb_intel_sdvo, &amp;input1, &amp;input2);</div><div class='add'>+		/* Warn if the device reported failure to sync.</div><div class='add'>+		 * A lot of SDVO devices fail to notify of sync, but it's</div><div class='add'>+		 * a given it the status is a success, we succeeded.</div><div class='add'>+		 */</div><div class='add'>+		if (status == SDVO_CMD_STATUS_SUCCESS &amp;&amp; !input1) {</div><div class='add'>+			DRM_DEBUG_KMS("First %s output reported failure to "</div><div class='add'>+					"sync\n", SDVO_NAME(psb_intel_sdvo));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (0)</div><div class='add'>+			psb_intel_sdvo_set_encoder_power_state(psb_intel_sdvo, mode);</div><div class='add'>+		psb_intel_sdvo_set_active_outputs(psb_intel_sdvo, psb_intel_sdvo-&gt;attached_output);</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_intel_sdvo_mode_valid(struct drm_connector *connector,</div><div class='add'>+				 struct drm_display_mode *mode)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = connector-&gt;dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_sdvo *psb_intel_sdvo = intel_attached_sdvo(connector);</div><div class='add'>+</div><div class='add'>+	if (mode-&gt;flags &amp; DRM_MODE_FLAG_DBLSCAN)</div><div class='add'>+		return MODE_NO_DBLESCAN;</div><div class='add'>+</div><div class='add'>+	if (psb_intel_sdvo-&gt;pixel_clock_min &gt; mode-&gt;clock)</div><div class='add'>+		return MODE_CLOCK_LOW;</div><div class='add'>+</div><div class='add'>+	if (psb_intel_sdvo-&gt;pixel_clock_max &lt; mode-&gt;clock)</div><div class='add'>+		return MODE_CLOCK_HIGH;</div><div class='add'>+</div><div class='add'>+	if (psb_intel_sdvo-&gt;is_lvds) {</div><div class='add'>+		if (mode-&gt;hdisplay &gt; psb_intel_sdvo-&gt;sdvo_lvds_fixed_mode-&gt;hdisplay)</div><div class='add'>+			return MODE_PANEL;</div><div class='add'>+</div><div class='add'>+		if (mode-&gt;vdisplay &gt; psb_intel_sdvo-&gt;sdvo_lvds_fixed_mode-&gt;vdisplay)</div><div class='add'>+			return MODE_PANEL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We assume worst case scenario of 32 bpp here, since we don't know */</div><div class='add'>+	if ((ALIGN(mode-&gt;hdisplay * 4, 64) * mode-&gt;vdisplay) &gt;</div><div class='add'>+	    dev_priv-&gt;vram_stolen_size)</div><div class='add'>+		return MODE_MEM;</div><div class='add'>+</div><div class='add'>+	return MODE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_get_capabilities(struct psb_intel_sdvo *psb_intel_sdvo, struct psb_intel_sdvo_caps *caps)</div><div class='add'>+{</div><div class='add'>+	BUILD_BUG_ON(sizeof(*caps) != 8);</div><div class='add'>+	if (!psb_intel_sdvo_get_value(psb_intel_sdvo,</div><div class='add'>+				  SDVO_CMD_GET_DEVICE_CAPS,</div><div class='add'>+				  caps, sizeof(*caps)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("SDVO capabilities:\n"</div><div class='add'>+		      "  vendor_id: %d\n"</div><div class='add'>+		      "  device_id: %d\n"</div><div class='add'>+		      "  device_rev_id: %d\n"</div><div class='add'>+		      "  sdvo_version_major: %d\n"</div><div class='add'>+		      "  sdvo_version_minor: %d\n"</div><div class='add'>+		      "  sdvo_inputs_mask: %d\n"</div><div class='add'>+		      "  smooth_scaling: %d\n"</div><div class='add'>+		      "  sharp_scaling: %d\n"</div><div class='add'>+		      "  up_scaling: %d\n"</div><div class='add'>+		      "  down_scaling: %d\n"</div><div class='add'>+		      "  stall_support: %d\n"</div><div class='add'>+		      "  output_flags: %d\n",</div><div class='add'>+		      caps-&gt;vendor_id,</div><div class='add'>+		      caps-&gt;device_id,</div><div class='add'>+		      caps-&gt;device_rev_id,</div><div class='add'>+		      caps-&gt;sdvo_version_major,</div><div class='add'>+		      caps-&gt;sdvo_version_minor,</div><div class='add'>+		      caps-&gt;sdvo_inputs_mask,</div><div class='add'>+		      caps-&gt;smooth_scaling,</div><div class='add'>+		      caps-&gt;sharp_scaling,</div><div class='add'>+		      caps-&gt;up_scaling,</div><div class='add'>+		      caps-&gt;down_scaling,</div><div class='add'>+		      caps-&gt;stall_support,</div><div class='add'>+		      caps-&gt;output_flags);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* No use! */</div><div class='add'>+#if 0</div><div class='add'>+struct drm_connector* psb_intel_sdvo_find(struct drm_device *dev, int sdvoB)</div><div class='add'>+{</div><div class='add'>+	struct drm_connector *connector = NULL;</div><div class='add'>+	struct psb_intel_sdvo *iout = NULL;</div><div class='add'>+	struct psb_intel_sdvo *sdvo;</div><div class='add'>+</div><div class='add'>+	/* find the sdvo connector */</div><div class='add'>+	list_for_each_entry(connector, &amp;dev-&gt;mode_config.connector_list, head) {</div><div class='add'>+		iout = to_psb_intel_sdvo(connector);</div><div class='add'>+</div><div class='add'>+		if (iout-&gt;type != INTEL_OUTPUT_SDVO)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sdvo = iout-&gt;dev_priv;</div><div class='add'>+</div><div class='add'>+		if (sdvo-&gt;sdvo_reg == SDVOB &amp;&amp; sdvoB)</div><div class='add'>+			return connector;</div><div class='add'>+</div><div class='add'>+		if (sdvo-&gt;sdvo_reg == SDVOC &amp;&amp; !sdvoB)</div><div class='add'>+			return connector;</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'>+int psb_intel_sdvo_supports_hotplug(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	u8 response[2];</div><div class='add'>+	u8 status;</div><div class='add'>+	struct psb_intel_sdvo *psb_intel_sdvo;</div><div class='add'>+	DRM_DEBUG_KMS("\n");</div><div class='add'>+</div><div class='add'>+	if (!connector)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo = to_psb_intel_sdvo(connector);</div><div class='add'>+</div><div class='add'>+	return psb_intel_sdvo_get_value(psb_intel_sdvo, SDVO_CMD_GET_HOT_PLUG_SUPPORT,</div><div class='add'>+				    &amp;response, 2) &amp;&amp; response[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_intel_sdvo_set_hotplug(struct drm_connector *connector, int on)</div><div class='add'>+{</div><div class='add'>+	u8 response[2];</div><div class='add'>+	u8 status;</div><div class='add'>+	struct psb_intel_sdvo *psb_intel_sdvo = to_psb_intel_sdvo(connector);</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_write_cmd(psb_intel_sdvo, SDVO_CMD_GET_ACTIVE_HOT_PLUG, NULL, 0);</div><div class='add'>+	psb_intel_sdvo_read_response(psb_intel_sdvo, &amp;response, 2);</div><div class='add'>+</div><div class='add'>+	if (on) {</div><div class='add'>+		psb_intel_sdvo_write_cmd(psb_intel_sdvo, SDVO_CMD_GET_HOT_PLUG_SUPPORT, NULL, 0);</div><div class='add'>+		status = psb_intel_sdvo_read_response(psb_intel_sdvo, &amp;response, 2);</div><div class='add'>+</div><div class='add'>+		psb_intel_sdvo_write_cmd(psb_intel_sdvo, SDVO_CMD_SET_ACTIVE_HOT_PLUG, &amp;response, 2);</div><div class='add'>+	} else {</div><div class='add'>+		response[0] = 0;</div><div class='add'>+		response[1] = 0;</div><div class='add'>+		psb_intel_sdvo_write_cmd(psb_intel_sdvo, SDVO_CMD_SET_ACTIVE_HOT_PLUG, &amp;response, 2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_write_cmd(psb_intel_sdvo, SDVO_CMD_GET_ACTIVE_HOT_PLUG, NULL, 0);</div><div class='add'>+	psb_intel_sdvo_read_response(psb_intel_sdvo, &amp;response, 2);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+psb_intel_sdvo_multifunc_encoder(struct psb_intel_sdvo *psb_intel_sdvo)</div><div class='add'>+{</div><div class='add'>+	/* Is there more than one type of output? */</div><div class='add'>+	int caps = psb_intel_sdvo-&gt;caps.output_flags &amp; 0xf;</div><div class='add'>+	return caps &amp; -caps;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct edid *</div><div class='add'>+psb_intel_sdvo_get_edid(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo *sdvo = intel_attached_sdvo(connector);</div><div class='add'>+	return drm_get_edid(connector, &amp;sdvo-&gt;ddc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Mac mini hack -- use the same DDC as the analog connector */</div><div class='add'>+static struct edid *</div><div class='add'>+psb_intel_sdvo_get_analog_edid(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = connector-&gt;dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	return drm_get_edid(connector,</div><div class='add'>+			    &amp;dev_priv-&gt;gmbus[dev_priv-&gt;crt_ddc_pin].adapter);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum drm_connector_status</div><div class='add'>+psb_intel_sdvo_hdmi_sink_detect(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo *psb_intel_sdvo = intel_attached_sdvo(connector);</div><div class='add'>+	enum drm_connector_status status;</div><div class='add'>+	struct edid *edid;</div><div class='add'>+</div><div class='add'>+	edid = psb_intel_sdvo_get_edid(connector);</div><div class='add'>+</div><div class='add'>+	if (edid == NULL &amp;&amp; psb_intel_sdvo_multifunc_encoder(psb_intel_sdvo)) {</div><div class='add'>+		u8 ddc, saved_ddc = psb_intel_sdvo-&gt;ddc_bus;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Don't use the 1 as the argument of DDC bus switch to get</div><div class='add'>+		 * the EDID. It is used for SDVO SPD ROM.</div><div class='add'>+		 */</div><div class='add'>+		for (ddc = psb_intel_sdvo-&gt;ddc_bus &gt;&gt; 1; ddc &gt; 1; ddc &gt;&gt;= 1) {</div><div class='add'>+			psb_intel_sdvo-&gt;ddc_bus = ddc;</div><div class='add'>+			edid = psb_intel_sdvo_get_edid(connector);</div><div class='add'>+			if (edid)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * If we found the EDID on the other bus,</div><div class='add'>+		 * assume that is the correct DDC bus.</div><div class='add'>+		 */</div><div class='add'>+		if (edid == NULL)</div><div class='add'>+			psb_intel_sdvo-&gt;ddc_bus = saved_ddc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When there is no edid and no monitor is connected with VGA</div><div class='add'>+	 * port, try to use the CRT ddc to read the EDID for DVI-connector.</div><div class='add'>+	 */</div><div class='add'>+	if (edid == NULL)</div><div class='add'>+		edid = psb_intel_sdvo_get_analog_edid(connector);</div><div class='add'>+</div><div class='add'>+	status = connector_status_unknown;</div><div class='add'>+	if (edid != NULL) {</div><div class='add'>+		/* DDC bus is shared, match EDID to connector type */</div><div class='add'>+		if (edid-&gt;input &amp; DRM_EDID_INPUT_DIGITAL) {</div><div class='add'>+			status = connector_status_connected;</div><div class='add'>+			if (psb_intel_sdvo-&gt;is_hdmi) {</div><div class='add'>+				psb_intel_sdvo-&gt;has_hdmi_monitor = drm_detect_hdmi_monitor(edid);</div><div class='add'>+				psb_intel_sdvo-&gt;has_hdmi_audio = drm_detect_monitor_audio(edid);</div><div class='add'>+			}</div><div class='add'>+		} else</div><div class='add'>+			status = connector_status_disconnected;</div><div class='add'>+		connector-&gt;display_info.raw_edid = NULL;</div><div class='add'>+		kfree(edid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status == connector_status_connected) {</div><div class='add'>+		struct psb_intel_sdvo_connector *psb_intel_sdvo_connector = to_psb_intel_sdvo_connector(connector);</div><div class='add'>+		if (psb_intel_sdvo_connector-&gt;force_audio)</div><div class='add'>+			psb_intel_sdvo-&gt;has_hdmi_audio = psb_intel_sdvo_connector-&gt;force_audio &gt; 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'>+static enum drm_connector_status</div><div class='add'>+psb_intel_sdvo_detect(struct drm_connector *connector, bool force)</div><div class='add'>+{</div><div class='add'>+	uint16_t response;</div><div class='add'>+	struct psb_intel_sdvo *psb_intel_sdvo = intel_attached_sdvo(connector);</div><div class='add'>+	struct psb_intel_sdvo_connector *psb_intel_sdvo_connector = to_psb_intel_sdvo_connector(connector);</div><div class='add'>+	enum drm_connector_status ret;</div><div class='add'>+</div><div class='add'>+	if (!psb_intel_sdvo_write_cmd(psb_intel_sdvo,</div><div class='add'>+				  SDVO_CMD_GET_ATTACHED_DISPLAYS, NULL, 0))</div><div class='add'>+		return connector_status_unknown;</div><div class='add'>+</div><div class='add'>+	/* add 30ms delay when the output type might be TV */</div><div class='add'>+	if (psb_intel_sdvo-&gt;caps.output_flags &amp;</div><div class='add'>+	    (SDVO_OUTPUT_SVID0 | SDVO_OUTPUT_CVBS0))</div><div class='add'>+		mdelay(30);</div><div class='add'>+</div><div class='add'>+	if (!psb_intel_sdvo_read_response(psb_intel_sdvo, &amp;response, 2))</div><div class='add'>+		return connector_status_unknown;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("SDVO response %d %d [%x]\n",</div><div class='add'>+		      response &amp; 0xff, response &gt;&gt; 8,</div><div class='add'>+		      psb_intel_sdvo_connector-&gt;output_flag);</div><div class='add'>+</div><div class='add'>+	if (response == 0)</div><div class='add'>+		return connector_status_disconnected;</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo-&gt;attached_output = response;</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo-&gt;has_hdmi_monitor = false;</div><div class='add'>+	psb_intel_sdvo-&gt;has_hdmi_audio = false;</div><div class='add'>+</div><div class='add'>+	if ((psb_intel_sdvo_connector-&gt;output_flag &amp; response) == 0)</div><div class='add'>+		ret = connector_status_disconnected;</div><div class='add'>+	else if (IS_TMDS(psb_intel_sdvo_connector))</div><div class='add'>+		ret = psb_intel_sdvo_hdmi_sink_detect(connector);</div><div class='add'>+	else {</div><div class='add'>+		struct edid *edid;</div><div class='add'>+</div><div class='add'>+		/* if we have an edid check it matches the connection */</div><div class='add'>+		edid = psb_intel_sdvo_get_edid(connector);</div><div class='add'>+		if (edid == NULL)</div><div class='add'>+			edid = psb_intel_sdvo_get_analog_edid(connector);</div><div class='add'>+		if (edid != NULL) {</div><div class='add'>+			if (edid-&gt;input &amp; DRM_EDID_INPUT_DIGITAL)</div><div class='add'>+				ret = connector_status_disconnected;</div><div class='add'>+			else</div><div class='add'>+				ret = connector_status_connected;</div><div class='add'>+			connector-&gt;display_info.raw_edid = NULL;</div><div class='add'>+			kfree(edid);</div><div class='add'>+		} else</div><div class='add'>+			ret = connector_status_connected;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* May update encoder flag for like clock for SDVO TV, etc.*/</div><div class='add'>+	if (ret == connector_status_connected) {</div><div class='add'>+		psb_intel_sdvo-&gt;is_tv = false;</div><div class='add'>+		psb_intel_sdvo-&gt;is_lvds = false;</div><div class='add'>+		psb_intel_sdvo-&gt;base.needs_tv_clock = false;</div><div class='add'>+</div><div class='add'>+		if (response &amp; SDVO_TV_MASK) {</div><div class='add'>+			psb_intel_sdvo-&gt;is_tv = true;</div><div class='add'>+			psb_intel_sdvo-&gt;base.needs_tv_clock = true;</div><div class='add'>+		}</div><div class='add'>+		if (response &amp; SDVO_LVDS_MASK)</div><div class='add'>+			psb_intel_sdvo-&gt;is_lvds = psb_intel_sdvo-&gt;sdvo_lvds_fixed_mode != NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_intel_sdvo_get_ddc_modes(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct edid *edid;</div><div class='add'>+</div><div class='add'>+	/* set the bus switch and get the modes */</div><div class='add'>+	edid = psb_intel_sdvo_get_edid(connector);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Mac mini hack.  On this device, the DVI-I connector shares one DDC</div><div class='add'>+	 * link between analog and digital outputs. So, if the regular SDVO</div><div class='add'>+	 * DDC fails, check to see if the analog output is disconnected, in</div><div class='add'>+	 * which case we'll look there for the digital DDC data.</div><div class='add'>+	 */</div><div class='add'>+	if (edid == NULL)</div><div class='add'>+		edid = psb_intel_sdvo_get_analog_edid(connector);</div><div class='add'>+</div><div class='add'>+	if (edid != NULL) {</div><div class='add'>+		struct psb_intel_sdvo_connector *psb_intel_sdvo_connector = to_psb_intel_sdvo_connector(connector);</div><div class='add'>+		bool monitor_is_digital = !!(edid-&gt;input &amp; DRM_EDID_INPUT_DIGITAL);</div><div class='add'>+		bool connector_is_digital = !!IS_TMDS(psb_intel_sdvo_connector);</div><div class='add'>+</div><div class='add'>+		if (connector_is_digital == monitor_is_digital) {</div><div class='add'>+			drm_mode_connector_update_edid_property(connector, edid);</div><div class='add'>+			drm_add_edid_modes(connector, edid);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		connector-&gt;display_info.raw_edid = NULL;</div><div class='add'>+		kfree(edid);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set of SDVO TV modes.</div><div class='add'>+ * Note!  This is in reply order (see loop in get_tv_modes).</div><div class='add'>+ * XXX: all 60Hz refresh?</div><div class='add'>+ */</div><div class='add'>+static const struct drm_display_mode sdvo_tv_modes[] = {</div><div class='add'>+	{ DRM_MODE("320x200", DRM_MODE_TYPE_DRIVER, 5815, 320, 321, 384,</div><div class='add'>+		   416, 0, 200, 201, 232, 233, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	{ DRM_MODE("320x240", DRM_MODE_TYPE_DRIVER, 6814, 320, 321, 384,</div><div class='add'>+		   416, 0, 240, 241, 272, 273, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	{ DRM_MODE("400x300", DRM_MODE_TYPE_DRIVER, 9910, 400, 401, 464,</div><div class='add'>+		   496, 0, 300, 301, 332, 333, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	{ DRM_MODE("640x350", DRM_MODE_TYPE_DRIVER, 16913, 640, 641, 704,</div><div class='add'>+		   736, 0, 350, 351, 382, 383, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	{ DRM_MODE("640x400", DRM_MODE_TYPE_DRIVER, 19121, 640, 641, 704,</div><div class='add'>+		   736, 0, 400, 401, 432, 433, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 22654, 640, 641, 704,</div><div class='add'>+		   736, 0, 480, 481, 512, 513, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	{ DRM_MODE("704x480", DRM_MODE_TYPE_DRIVER, 24624, 704, 705, 768,</div><div class='add'>+		   800, 0, 480, 481, 512, 513, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	{ DRM_MODE("704x576", DRM_MODE_TYPE_DRIVER, 29232, 704, 705, 768,</div><div class='add'>+		   800, 0, 576, 577, 608, 609, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	{ DRM_MODE("720x350", DRM_MODE_TYPE_DRIVER, 18751, 720, 721, 784,</div><div class='add'>+		   816, 0, 350, 351, 382, 383, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	{ DRM_MODE("720x400", DRM_MODE_TYPE_DRIVER, 21199, 720, 721, 784,</div><div class='add'>+		   816, 0, 400, 401, 432, 433, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	{ DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 25116, 720, 721, 784,</div><div class='add'>+		   816, 0, 480, 481, 512, 513, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	{ DRM_MODE("720x540", DRM_MODE_TYPE_DRIVER, 28054, 720, 721, 784,</div><div class='add'>+		   816, 0, 540, 541, 572, 573, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	{ DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 29816, 720, 721, 784,</div><div class='add'>+		   816, 0, 576, 577, 608, 609, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	{ DRM_MODE("768x576", DRM_MODE_TYPE_DRIVER, 31570, 768, 769, 832,</div><div class='add'>+		   864, 0, 576, 577, 608, 609, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	{ DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 34030, 800, 801, 864,</div><div class='add'>+		   896, 0, 600, 601, 632, 633, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	{ DRM_MODE("832x624", DRM_MODE_TYPE_DRIVER, 36581, 832, 833, 896,</div><div class='add'>+		   928, 0, 624, 625, 656, 657, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	{ DRM_MODE("920x766", DRM_MODE_TYPE_DRIVER, 48707, 920, 921, 984,</div><div class='add'>+		   1016, 0, 766, 767, 798, 799, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	{ DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 53827, 1024, 1025, 1088,</div><div class='add'>+		   1120, 0, 768, 769, 800, 801, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+	{ DRM_MODE("1280x1024", DRM_MODE_TYPE_DRIVER, 87265, 1280, 1281, 1344,</div><div class='add'>+		   1376, 0, 1024, 1025, 1056, 1057, 0,</div><div class='add'>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void psb_intel_sdvo_get_tv_modes(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo *psb_intel_sdvo = intel_attached_sdvo(connector);</div><div class='add'>+	struct psb_intel_sdvo_sdtv_resolution_request tv_res;</div><div class='add'>+	uint32_t reply = 0, format_map = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Read the list of supported input resolutions for the selected TV</div><div class='add'>+	 * format.</div><div class='add'>+	 */</div><div class='add'>+	format_map = 1 &lt;&lt; psb_intel_sdvo-&gt;tv_format_index;</div><div class='add'>+	memcpy(&amp;tv_res, &amp;format_map,</div><div class='add'>+	       min(sizeof(format_map), sizeof(struct psb_intel_sdvo_sdtv_resolution_request)));</div><div class='add'>+</div><div class='add'>+	if (!psb_intel_sdvo_set_target_output(psb_intel_sdvo, psb_intel_sdvo-&gt;attached_output))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(tv_res) != 3);</div><div class='add'>+	if (!psb_intel_sdvo_write_cmd(psb_intel_sdvo,</div><div class='add'>+				  SDVO_CMD_GET_SDTV_RESOLUTION_SUPPORT,</div><div class='add'>+				  &amp;tv_res, sizeof(tv_res)))</div><div class='add'>+		return;</div><div class='add'>+	if (!psb_intel_sdvo_read_response(psb_intel_sdvo, &amp;reply, 3))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sdvo_tv_modes); i++)</div><div class='add'>+		if (reply &amp; (1 &lt;&lt; i)) {</div><div class='add'>+			struct drm_display_mode *nmode;</div><div class='add'>+			nmode = drm_mode_duplicate(connector-&gt;dev,</div><div class='add'>+						   &amp;sdvo_tv_modes[i]);</div><div class='add'>+			if (nmode)</div><div class='add'>+				drm_mode_probed_add(connector, nmode);</div><div class='add'>+		}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_intel_sdvo_get_lvds_modes(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo *psb_intel_sdvo = intel_attached_sdvo(connector);</div><div class='add'>+	struct drm_psb_private *dev_priv = connector-&gt;dev-&gt;dev_private;</div><div class='add'>+	struct drm_display_mode *newmode;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Attempt to get the mode list from DDC.</div><div class='add'>+	 * Assume that the preferred modes are</div><div class='add'>+	 * arranged in priority order.</div><div class='add'>+	 */</div><div class='add'>+	psb_intel_ddc_get_modes(connector, psb_intel_sdvo-&gt;i2c);</div><div class='add'>+	if (list_empty(&amp;connector-&gt;probed_modes) == false)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* Fetch modes from VBT */</div><div class='add'>+	if (dev_priv-&gt;sdvo_lvds_vbt_mode != NULL) {</div><div class='add'>+		newmode = drm_mode_duplicate(connector-&gt;dev,</div><div class='add'>+					     dev_priv-&gt;sdvo_lvds_vbt_mode);</div><div class='add'>+		if (newmode != NULL) {</div><div class='add'>+			/* Guarantee the mode is preferred */</div><div class='add'>+			newmode-&gt;type = (DRM_MODE_TYPE_PREFERRED |</div><div class='add'>+					 DRM_MODE_TYPE_DRIVER);</div><div class='add'>+			drm_mode_probed_add(connector, newmode);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+end:</div><div class='add'>+	list_for_each_entry(newmode, &amp;connector-&gt;probed_modes, head) {</div><div class='add'>+		if (newmode-&gt;type &amp; DRM_MODE_TYPE_PREFERRED) {</div><div class='add'>+			psb_intel_sdvo-&gt;sdvo_lvds_fixed_mode =</div><div class='add'>+				drm_mode_duplicate(connector-&gt;dev, newmode);</div><div class='add'>+</div><div class='add'>+			drm_mode_set_crtcinfo(psb_intel_sdvo-&gt;sdvo_lvds_fixed_mode,</div><div class='add'>+					      0);</div><div class='add'>+</div><div class='add'>+			psb_intel_sdvo-&gt;is_lvds = true;</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'>+static int psb_intel_sdvo_get_modes(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo_connector *psb_intel_sdvo_connector = to_psb_intel_sdvo_connector(connector);</div><div class='add'>+</div><div class='add'>+	if (IS_TV(psb_intel_sdvo_connector))</div><div class='add'>+		psb_intel_sdvo_get_tv_modes(connector);</div><div class='add'>+	else if (IS_LVDS(psb_intel_sdvo_connector))</div><div class='add'>+		psb_intel_sdvo_get_lvds_modes(connector);</div><div class='add'>+	else</div><div class='add'>+		psb_intel_sdvo_get_ddc_modes(connector);</div><div class='add'>+</div><div class='add'>+	return !list_empty(&amp;connector-&gt;probed_modes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+psb_intel_sdvo_destroy_enhance_property(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo_connector *psb_intel_sdvo_connector = to_psb_intel_sdvo_connector(connector);</div><div class='add'>+	struct drm_device *dev = connector-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;left)</div><div class='add'>+		drm_property_destroy(dev, psb_intel_sdvo_connector-&gt;left);</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;right)</div><div class='add'>+		drm_property_destroy(dev, psb_intel_sdvo_connector-&gt;right);</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;top)</div><div class='add'>+		drm_property_destroy(dev, psb_intel_sdvo_connector-&gt;top);</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;bottom)</div><div class='add'>+		drm_property_destroy(dev, psb_intel_sdvo_connector-&gt;bottom);</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;hpos)</div><div class='add'>+		drm_property_destroy(dev, psb_intel_sdvo_connector-&gt;hpos);</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;vpos)</div><div class='add'>+		drm_property_destroy(dev, psb_intel_sdvo_connector-&gt;vpos);</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;saturation)</div><div class='add'>+		drm_property_destroy(dev, psb_intel_sdvo_connector-&gt;saturation);</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;contrast)</div><div class='add'>+		drm_property_destroy(dev, psb_intel_sdvo_connector-&gt;contrast);</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;hue)</div><div class='add'>+		drm_property_destroy(dev, psb_intel_sdvo_connector-&gt;hue);</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;sharpness)</div><div class='add'>+		drm_property_destroy(dev, psb_intel_sdvo_connector-&gt;sharpness);</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;flicker_filter)</div><div class='add'>+		drm_property_destroy(dev, psb_intel_sdvo_connector-&gt;flicker_filter);</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;flicker_filter_2d)</div><div class='add'>+		drm_property_destroy(dev, psb_intel_sdvo_connector-&gt;flicker_filter_2d);</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;flicker_filter_adaptive)</div><div class='add'>+		drm_property_destroy(dev, psb_intel_sdvo_connector-&gt;flicker_filter_adaptive);</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;tv_luma_filter)</div><div class='add'>+		drm_property_destroy(dev, psb_intel_sdvo_connector-&gt;tv_luma_filter);</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;tv_chroma_filter)</div><div class='add'>+		drm_property_destroy(dev, psb_intel_sdvo_connector-&gt;tv_chroma_filter);</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;dot_crawl)</div><div class='add'>+		drm_property_destroy(dev, psb_intel_sdvo_connector-&gt;dot_crawl);</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;brightness)</div><div class='add'>+		drm_property_destroy(dev, psb_intel_sdvo_connector-&gt;brightness);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psb_intel_sdvo_destroy(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo_connector *psb_intel_sdvo_connector = to_psb_intel_sdvo_connector(connector);</div><div class='add'>+</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;tv_format)</div><div class='add'>+		drm_property_destroy(connector-&gt;dev,</div><div class='add'>+				     psb_intel_sdvo_connector-&gt;tv_format);</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_destroy_enhance_property(connector);</div><div class='add'>+	drm_sysfs_connector_remove(connector);</div><div class='add'>+	drm_connector_cleanup(connector);</div><div class='add'>+	kfree(connector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_detect_hdmi_audio(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo *psb_intel_sdvo = intel_attached_sdvo(connector);</div><div class='add'>+	struct edid *edid;</div><div class='add'>+	bool has_audio = false;</div><div class='add'>+</div><div class='add'>+	if (!psb_intel_sdvo-&gt;is_hdmi)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	edid = psb_intel_sdvo_get_edid(connector);</div><div class='add'>+	if (edid != NULL &amp;&amp; edid-&gt;input &amp; DRM_EDID_INPUT_DIGITAL)</div><div class='add'>+		has_audio = drm_detect_monitor_audio(edid);</div><div class='add'>+</div><div class='add'>+	return has_audio;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+psb_intel_sdvo_set_property(struct drm_connector *connector,</div><div class='add'>+			struct drm_property *property,</div><div class='add'>+			uint64_t val)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo *psb_intel_sdvo = intel_attached_sdvo(connector);</div><div class='add'>+	struct psb_intel_sdvo_connector *psb_intel_sdvo_connector = to_psb_intel_sdvo_connector(connector);</div><div class='add'>+	struct drm_psb_private *dev_priv = connector-&gt;dev-&gt;dev_private;</div><div class='add'>+	uint16_t temp_value;</div><div class='add'>+	uint8_t cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = drm_connector_property_set_value(connector, property, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (property == dev_priv-&gt;force_audio_property) {</div><div class='add'>+		int i = val;</div><div class='add'>+		bool has_audio;</div><div class='add'>+</div><div class='add'>+		if (i == psb_intel_sdvo_connector-&gt;force_audio)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		psb_intel_sdvo_connector-&gt;force_audio = i;</div><div class='add'>+</div><div class='add'>+		if (i == 0)</div><div class='add'>+			has_audio = psb_intel_sdvo_detect_hdmi_audio(connector);</div><div class='add'>+		else</div><div class='add'>+			has_audio = i &gt; 0;</div><div class='add'>+</div><div class='add'>+		if (has_audio == psb_intel_sdvo-&gt;has_hdmi_audio)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		psb_intel_sdvo-&gt;has_hdmi_audio = has_audio;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (property == dev_priv-&gt;broadcast_rgb_property) {</div><div class='add'>+		if (val == !!psb_intel_sdvo-&gt;color_range)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		psb_intel_sdvo-&gt;color_range = val ? SDVO_COLOR_RANGE_16_235 : 0;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define CHECK_PROPERTY(name, NAME) \</div><div class='add'>+	if (psb_intel_sdvo_connector-&gt;name == property) { \</div><div class='add'>+		if (psb_intel_sdvo_connector-&gt;cur_##name == temp_value) return 0; \</div><div class='add'>+		if (psb_intel_sdvo_connector-&gt;max_##name &lt; temp_value) return -EINVAL; \</div><div class='add'>+		cmd = SDVO_CMD_SET_##NAME; \</div><div class='add'>+		psb_intel_sdvo_connector-&gt;cur_##name = temp_value; \</div><div class='add'>+		goto set_value; \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (property == psb_intel_sdvo_connector-&gt;tv_format) {</div><div class='add'>+		if (val &gt;= TV_FORMAT_NUM)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (psb_intel_sdvo-&gt;tv_format_index ==</div><div class='add'>+		    psb_intel_sdvo_connector-&gt;tv_format_supported[val])</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		psb_intel_sdvo-&gt;tv_format_index = psb_intel_sdvo_connector-&gt;tv_format_supported[val];</div><div class='add'>+		goto done;</div><div class='add'>+	} else if (IS_TV_OR_LVDS(psb_intel_sdvo_connector)) {</div><div class='add'>+		temp_value = val;</div><div class='add'>+		if (psb_intel_sdvo_connector-&gt;left == property) {</div><div class='add'>+			drm_connector_property_set_value(connector,</div><div class='add'>+							 psb_intel_sdvo_connector-&gt;right, val);</div><div class='add'>+			if (psb_intel_sdvo_connector-&gt;left_margin == temp_value)</div><div class='add'>+				return 0;</div><div class='add'>+</div><div class='add'>+			psb_intel_sdvo_connector-&gt;left_margin = temp_value;</div><div class='add'>+			psb_intel_sdvo_connector-&gt;right_margin = temp_value;</div><div class='add'>+			temp_value = psb_intel_sdvo_connector-&gt;max_hscan -</div><div class='add'>+				psb_intel_sdvo_connector-&gt;left_margin;</div><div class='add'>+			cmd = SDVO_CMD_SET_OVERSCAN_H;</div><div class='add'>+			goto set_value;</div><div class='add'>+		} else if (psb_intel_sdvo_connector-&gt;right == property) {</div><div class='add'>+			drm_connector_property_set_value(connector,</div><div class='add'>+							 psb_intel_sdvo_connector-&gt;left, val);</div><div class='add'>+			if (psb_intel_sdvo_connector-&gt;right_margin == temp_value)</div><div class='add'>+				return 0;</div><div class='add'>+</div><div class='add'>+			psb_intel_sdvo_connector-&gt;left_margin = temp_value;</div><div class='add'>+			psb_intel_sdvo_connector-&gt;right_margin = temp_value;</div><div class='add'>+			temp_value = psb_intel_sdvo_connector-&gt;max_hscan -</div><div class='add'>+				psb_intel_sdvo_connector-&gt;left_margin;</div><div class='add'>+			cmd = SDVO_CMD_SET_OVERSCAN_H;</div><div class='add'>+			goto set_value;</div><div class='add'>+		} else if (psb_intel_sdvo_connector-&gt;top == property) {</div><div class='add'>+			drm_connector_property_set_value(connector,</div><div class='add'>+							 psb_intel_sdvo_connector-&gt;bottom, val);</div><div class='add'>+			if (psb_intel_sdvo_connector-&gt;top_margin == temp_value)</div><div class='add'>+				return 0;</div><div class='add'>+</div><div class='add'>+			psb_intel_sdvo_connector-&gt;top_margin = temp_value;</div><div class='add'>+			psb_intel_sdvo_connector-&gt;bottom_margin = temp_value;</div><div class='add'>+			temp_value = psb_intel_sdvo_connector-&gt;max_vscan -</div><div class='add'>+				psb_intel_sdvo_connector-&gt;top_margin;</div><div class='add'>+			cmd = SDVO_CMD_SET_OVERSCAN_V;</div><div class='add'>+			goto set_value;</div><div class='add'>+		} else if (psb_intel_sdvo_connector-&gt;bottom == property) {</div><div class='add'>+			drm_connector_property_set_value(connector,</div><div class='add'>+							 psb_intel_sdvo_connector-&gt;top, val);</div><div class='add'>+			if (psb_intel_sdvo_connector-&gt;bottom_margin == temp_value)</div><div class='add'>+				return 0;</div><div class='add'>+</div><div class='add'>+			psb_intel_sdvo_connector-&gt;top_margin = temp_value;</div><div class='add'>+			psb_intel_sdvo_connector-&gt;bottom_margin = temp_value;</div><div class='add'>+			temp_value = psb_intel_sdvo_connector-&gt;max_vscan -</div><div class='add'>+				psb_intel_sdvo_connector-&gt;top_margin;</div><div class='add'>+			cmd = SDVO_CMD_SET_OVERSCAN_V;</div><div class='add'>+			goto set_value;</div><div class='add'>+		}</div><div class='add'>+		CHECK_PROPERTY(hpos, HPOS)</div><div class='add'>+		CHECK_PROPERTY(vpos, VPOS)</div><div class='add'>+		CHECK_PROPERTY(saturation, SATURATION)</div><div class='add'>+		CHECK_PROPERTY(contrast, CONTRAST)</div><div class='add'>+		CHECK_PROPERTY(hue, HUE)</div><div class='add'>+		CHECK_PROPERTY(brightness, BRIGHTNESS)</div><div class='add'>+		CHECK_PROPERTY(sharpness, SHARPNESS)</div><div class='add'>+		CHECK_PROPERTY(flicker_filter, FLICKER_FILTER)</div><div class='add'>+		CHECK_PROPERTY(flicker_filter_2d, FLICKER_FILTER_2D)</div><div class='add'>+		CHECK_PROPERTY(flicker_filter_adaptive, FLICKER_FILTER_ADAPTIVE)</div><div class='add'>+		CHECK_PROPERTY(tv_chroma_filter, TV_CHROMA_FILTER)</div><div class='add'>+		CHECK_PROPERTY(tv_luma_filter, TV_LUMA_FILTER)</div><div class='add'>+		CHECK_PROPERTY(dot_crawl, DOT_CRAWL)</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL; /* unknown property */</div><div class='add'>+</div><div class='add'>+set_value:</div><div class='add'>+	if (!psb_intel_sdvo_set_value(psb_intel_sdvo, cmd, &amp;temp_value, 2))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	if (psb_intel_sdvo-&gt;base.base.crtc) {</div><div class='add'>+		struct drm_crtc *crtc = psb_intel_sdvo-&gt;base.base.crtc;</div><div class='add'>+		drm_crtc_helper_set_mode(crtc, &amp;crtc-&gt;mode, crtc-&gt;x,</div><div class='add'>+					 crtc-&gt;y, crtc-&gt;fb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+#undef CHECK_PROPERTY</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct drm_encoder_helper_funcs psb_intel_sdvo_helper_funcs = {</div><div class='add'>+	.dpms = psb_intel_sdvo_dpms,</div><div class='add'>+	.mode_fixup = psb_intel_sdvo_mode_fixup,</div><div class='add'>+	.prepare = psb_intel_encoder_prepare,</div><div class='add'>+	.mode_set = psb_intel_sdvo_mode_set,</div><div class='add'>+	.commit = psb_intel_encoder_commit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct drm_connector_funcs psb_intel_sdvo_connector_funcs = {</div><div class='add'>+	.dpms = drm_helper_connector_dpms,</div><div class='add'>+	.detect = psb_intel_sdvo_detect,</div><div class='add'>+	.fill_modes = drm_helper_probe_single_connector_modes,</div><div class='add'>+	.set_property = psb_intel_sdvo_set_property,</div><div class='add'>+	.destroy = psb_intel_sdvo_destroy,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct drm_connector_helper_funcs psb_intel_sdvo_connector_helper_funcs = {</div><div class='add'>+	.get_modes = psb_intel_sdvo_get_modes,</div><div class='add'>+	.mode_valid = psb_intel_sdvo_mode_valid,</div><div class='add'>+	.best_encoder = psb_intel_best_encoder,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void psb_intel_sdvo_enc_destroy(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo *psb_intel_sdvo = to_psb_intel_sdvo(encoder);</div><div class='add'>+</div><div class='add'>+	if (psb_intel_sdvo-&gt;sdvo_lvds_fixed_mode != NULL)</div><div class='add'>+		drm_mode_destroy(encoder-&gt;dev,</div><div class='add'>+				 psb_intel_sdvo-&gt;sdvo_lvds_fixed_mode);</div><div class='add'>+</div><div class='add'>+	i2c_del_adapter(&amp;psb_intel_sdvo-&gt;ddc);</div><div class='add'>+	psb_intel_encoder_destroy(encoder);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct drm_encoder_funcs psb_intel_sdvo_enc_funcs = {</div><div class='add'>+	.destroy = psb_intel_sdvo_enc_destroy,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+psb_intel_sdvo_guess_ddc_bus(struct psb_intel_sdvo *sdvo)</div><div class='add'>+{</div><div class='add'>+	/* FIXME: At the moment, ddc_bus = 2 is the only thing that works.</div><div class='add'>+	 * We need to figure out if this is true for all available poulsbo</div><div class='add'>+	 * hardware, or if we need to fiddle with the guessing code above.</div><div class='add'>+	 * The problem might go away if we can parse sdvo mappings from bios */</div><div class='add'>+	sdvo-&gt;ddc_bus = 2;</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+	uint16_t mask = 0;</div><div class='add'>+	unsigned int num_bits;</div><div class='add'>+</div><div class='add'>+	/* Make a mask of outputs less than or equal to our own priority in the</div><div class='add'>+	 * list.</div><div class='add'>+	 */</div><div class='add'>+	switch (sdvo-&gt;controlled_output) {</div><div class='add'>+	case SDVO_OUTPUT_LVDS1:</div><div class='add'>+		mask |= SDVO_OUTPUT_LVDS1;</div><div class='add'>+	case SDVO_OUTPUT_LVDS0:</div><div class='add'>+		mask |= SDVO_OUTPUT_LVDS0;</div><div class='add'>+	case SDVO_OUTPUT_TMDS1:</div><div class='add'>+		mask |= SDVO_OUTPUT_TMDS1;</div><div class='add'>+	case SDVO_OUTPUT_TMDS0:</div><div class='add'>+		mask |= SDVO_OUTPUT_TMDS0;</div><div class='add'>+	case SDVO_OUTPUT_RGB1:</div><div class='add'>+		mask |= SDVO_OUTPUT_RGB1;</div><div class='add'>+	case SDVO_OUTPUT_RGB0:</div><div class='add'>+		mask |= SDVO_OUTPUT_RGB0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Count bits to find what number we are in the priority list. */</div><div class='add'>+	mask &amp;= sdvo-&gt;caps.output_flags;</div><div class='add'>+	num_bits = hweight16(mask);</div><div class='add'>+	/* If more than 3 outputs, default to DDC bus 3 for now. */</div><div class='add'>+	if (num_bits &gt; 3)</div><div class='add'>+		num_bits = 3;</div><div class='add'>+</div><div class='add'>+	/* Corresponds to SDVO_CONTROL_BUS_DDCx */</div><div class='add'>+	sdvo-&gt;ddc_bus = 1 &lt;&lt; num_bits;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Choose the appropriate DDC bus for control bus switch command for this</div><div class='add'>+ * SDVO output based on the controlled output.</div><div class='add'>+ *</div><div class='add'>+ * DDC bus number assignment is in a priority order of RGB outputs, then TMDS</div><div class='add'>+ * outputs, then LVDS outputs.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+psb_intel_sdvo_select_ddc_bus(struct drm_psb_private *dev_priv,</div><div class='add'>+			  struct psb_intel_sdvo *sdvo, u32 reg)</div><div class='add'>+{</div><div class='add'>+	struct sdvo_device_mapping *mapping;</div><div class='add'>+</div><div class='add'>+	if (IS_SDVOB(reg))</div><div class='add'>+		mapping = &amp;(dev_priv-&gt;sdvo_mappings[0]);</div><div class='add'>+	else</div><div class='add'>+		mapping = &amp;(dev_priv-&gt;sdvo_mappings[1]);</div><div class='add'>+</div><div class='add'>+	if (mapping-&gt;initialized)</div><div class='add'>+		sdvo-&gt;ddc_bus = 1 &lt;&lt; ((mapping-&gt;ddc_pin &amp; 0xf0) &gt;&gt; 4);</div><div class='add'>+	else</div><div class='add'>+		psb_intel_sdvo_guess_ddc_bus(sdvo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+psb_intel_sdvo_select_i2c_bus(struct drm_psb_private *dev_priv,</div><div class='add'>+			  struct psb_intel_sdvo *sdvo, u32 reg)</div><div class='add'>+{</div><div class='add'>+	struct sdvo_device_mapping *mapping;</div><div class='add'>+	u8 pin, speed;</div><div class='add'>+</div><div class='add'>+	if (IS_SDVOB(reg))</div><div class='add'>+		mapping = &amp;dev_priv-&gt;sdvo_mappings[0];</div><div class='add'>+	else</div><div class='add'>+		mapping = &amp;dev_priv-&gt;sdvo_mappings[1];</div><div class='add'>+</div><div class='add'>+	pin = GMBUS_PORT_DPB;</div><div class='add'>+	speed = GMBUS_RATE_1MHZ &gt;&gt; 8;</div><div class='add'>+	if (mapping-&gt;initialized) {</div><div class='add'>+		pin = mapping-&gt;i2c_pin;</div><div class='add'>+		speed = mapping-&gt;i2c_speed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pin &lt; GMBUS_NUM_PORTS) {</div><div class='add'>+		sdvo-&gt;i2c = &amp;dev_priv-&gt;gmbus[pin].adapter;</div><div class='add'>+		gma_intel_gmbus_set_speed(sdvo-&gt;i2c, speed);</div><div class='add'>+		gma_intel_gmbus_force_bit(sdvo-&gt;i2c, true);</div><div class='add'>+	} else</div><div class='add'>+		sdvo-&gt;i2c = &amp;dev_priv-&gt;gmbus[GMBUS_PORT_DPB].adapter;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+psb_intel_sdvo_is_hdmi_connector(struct psb_intel_sdvo *psb_intel_sdvo, int device)</div><div class='add'>+{</div><div class='add'>+	return psb_intel_sdvo_check_supp_encode(psb_intel_sdvo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+psb_intel_sdvo_get_slave_addr(struct drm_device *dev, int sdvo_reg)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct sdvo_device_mapping *my_mapping, *other_mapping;</div><div class='add'>+</div><div class='add'>+	if (IS_SDVOB(sdvo_reg)) {</div><div class='add'>+		my_mapping = &amp;dev_priv-&gt;sdvo_mappings[0];</div><div class='add'>+		other_mapping = &amp;dev_priv-&gt;sdvo_mappings[1];</div><div class='add'>+	} else {</div><div class='add'>+		my_mapping = &amp;dev_priv-&gt;sdvo_mappings[1];</div><div class='add'>+		other_mapping = &amp;dev_priv-&gt;sdvo_mappings[0];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If the BIOS described our SDVO device, take advantage of it. */</div><div class='add'>+	if (my_mapping-&gt;slave_addr)</div><div class='add'>+		return my_mapping-&gt;slave_addr;</div><div class='add'>+</div><div class='add'>+	/* If the BIOS only described a different SDVO device, use the</div><div class='add'>+	 * address that it isn't using.</div><div class='add'>+	 */</div><div class='add'>+	if (other_mapping-&gt;slave_addr) {</div><div class='add'>+		if (other_mapping-&gt;slave_addr == 0x70)</div><div class='add'>+			return 0x72;</div><div class='add'>+		else</div><div class='add'>+			return 0x70;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No SDVO device info is found for another DVO port,</div><div class='add'>+	 * so use mapping assumption we had before BIOS parsing.</div><div class='add'>+	 */</div><div class='add'>+	if (IS_SDVOB(sdvo_reg))</div><div class='add'>+		return 0x70;</div><div class='add'>+	else</div><div class='add'>+		return 0x72;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+psb_intel_sdvo_connector_init(struct psb_intel_sdvo_connector *connector,</div><div class='add'>+			  struct psb_intel_sdvo *encoder)</div><div class='add'>+{</div><div class='add'>+	drm_connector_init(encoder-&gt;base.base.dev,</div><div class='add'>+			   &amp;connector-&gt;base.base,</div><div class='add'>+			   &amp;psb_intel_sdvo_connector_funcs,</div><div class='add'>+			   connector-&gt;base.base.connector_type);</div><div class='add'>+</div><div class='add'>+	drm_connector_helper_add(&amp;connector-&gt;base.base,</div><div class='add'>+				 &amp;psb_intel_sdvo_connector_helper_funcs);</div><div class='add'>+</div><div class='add'>+	connector-&gt;base.base.interlace_allowed = 0;</div><div class='add'>+	connector-&gt;base.base.doublescan_allowed = 0;</div><div class='add'>+	connector-&gt;base.base.display_info.subpixel_order = SubPixelHorizontalRGB;</div><div class='add'>+</div><div class='add'>+	psb_intel_connector_attach_encoder(&amp;connector-&gt;base, &amp;encoder-&gt;base);</div><div class='add'>+	drm_sysfs_connector_add(&amp;connector-&gt;base.base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+psb_intel_sdvo_add_hdmi_properties(struct psb_intel_sdvo_connector *connector)</div><div class='add'>+{</div><div class='add'>+	/* FIXME: We don't support HDMI at the moment</div><div class='add'>+	struct drm_device *dev = connector-&gt;base.base.dev;</div><div class='add'>+</div><div class='add'>+	intel_attach_force_audio_property(&amp;connector-&gt;base.base);</div><div class='add'>+	if (INTEL_INFO(dev)-&gt;gen &gt;= 4 &amp;&amp; IS_MOBILE(dev))</div><div class='add'>+		intel_attach_broadcast_rgb_property(&amp;connector-&gt;base.base);</div><div class='add'>+	*/</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+psb_intel_sdvo_dvi_init(struct psb_intel_sdvo *psb_intel_sdvo, int device)</div><div class='add'>+{</div><div class='add'>+	struct drm_encoder *encoder = &amp;psb_intel_sdvo-&gt;base.base;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+	struct psb_intel_connector *intel_connector;</div><div class='add'>+	struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);</div><div class='add'>+	if (!psb_intel_sdvo_connector)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (device == 0) {</div><div class='add'>+		psb_intel_sdvo-&gt;controlled_output |= SDVO_OUTPUT_TMDS0;</div><div class='add'>+		psb_intel_sdvo_connector-&gt;output_flag = SDVO_OUTPUT_TMDS0;</div><div class='add'>+	} else if (device == 1) {</div><div class='add'>+		psb_intel_sdvo-&gt;controlled_output |= SDVO_OUTPUT_TMDS1;</div><div class='add'>+		psb_intel_sdvo_connector-&gt;output_flag = SDVO_OUTPUT_TMDS1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	intel_connector = &amp;psb_intel_sdvo_connector-&gt;base;</div><div class='add'>+	connector = &amp;intel_connector-&gt;base;</div><div class='add'>+	// connector-&gt;polled = DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;</div><div class='add'>+	encoder-&gt;encoder_type = DRM_MODE_ENCODER_TMDS;</div><div class='add'>+	connector-&gt;connector_type = DRM_MODE_CONNECTOR_DVID;</div><div class='add'>+</div><div class='add'>+	if (psb_intel_sdvo_is_hdmi_connector(psb_intel_sdvo, device)) {</div><div class='add'>+		connector-&gt;connector_type = DRM_MODE_CONNECTOR_HDMIA;</div><div class='add'>+		psb_intel_sdvo-&gt;is_hdmi = true;</div><div class='add'>+	}</div><div class='add'>+	psb_intel_sdvo-&gt;base.clone_mask = ((1 &lt;&lt; INTEL_SDVO_NON_TV_CLONE_BIT) |</div><div class='add'>+				       (1 &lt;&lt; INTEL_ANALOG_CLONE_BIT));</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_connector_init(psb_intel_sdvo_connector, psb_intel_sdvo);</div><div class='add'>+	if (psb_intel_sdvo-&gt;is_hdmi)</div><div class='add'>+		psb_intel_sdvo_add_hdmi_properties(psb_intel_sdvo_connector);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+psb_intel_sdvo_tv_init(struct psb_intel_sdvo *psb_intel_sdvo, int type)</div><div class='add'>+{</div><div class='add'>+	struct drm_encoder *encoder = &amp;psb_intel_sdvo-&gt;base.base;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+	struct psb_intel_connector *intel_connector;</div><div class='add'>+	struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);</div><div class='add'>+	if (!psb_intel_sdvo_connector)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	intel_connector = &amp;psb_intel_sdvo_connector-&gt;base;</div><div class='add'>+	connector = &amp;intel_connector-&gt;base;</div><div class='add'>+	encoder-&gt;encoder_type = DRM_MODE_ENCODER_TVDAC;</div><div class='add'>+	connector-&gt;connector_type = DRM_MODE_CONNECTOR_SVIDEO;</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo-&gt;controlled_output |= type;</div><div class='add'>+	psb_intel_sdvo_connector-&gt;output_flag = type;</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo-&gt;is_tv = true;</div><div class='add'>+	psb_intel_sdvo-&gt;base.needs_tv_clock = true;</div><div class='add'>+	psb_intel_sdvo-&gt;base.clone_mask = 1 &lt;&lt; INTEL_SDVO_TV_CLONE_BIT;</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_connector_init(psb_intel_sdvo_connector, psb_intel_sdvo);</div><div class='add'>+</div><div class='add'>+	if (!psb_intel_sdvo_tv_create_property(psb_intel_sdvo, psb_intel_sdvo_connector, type))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (!psb_intel_sdvo_create_enhance_property(psb_intel_sdvo, psb_intel_sdvo_connector))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	psb_intel_sdvo_destroy(connector);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+psb_intel_sdvo_analog_init(struct psb_intel_sdvo *psb_intel_sdvo, int device)</div><div class='add'>+{</div><div class='add'>+	struct drm_encoder *encoder = &amp;psb_intel_sdvo-&gt;base.base;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+	struct psb_intel_connector *intel_connector;</div><div class='add'>+	struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);</div><div class='add'>+	if (!psb_intel_sdvo_connector)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	intel_connector = &amp;psb_intel_sdvo_connector-&gt;base;</div><div class='add'>+	connector = &amp;intel_connector-&gt;base;</div><div class='add'>+	connector-&gt;polled = DRM_CONNECTOR_POLL_CONNECT;</div><div class='add'>+	encoder-&gt;encoder_type = DRM_MODE_ENCODER_DAC;</div><div class='add'>+	connector-&gt;connector_type = DRM_MODE_CONNECTOR_VGA;</div><div class='add'>+</div><div class='add'>+	if (device == 0) {</div><div class='add'>+		psb_intel_sdvo-&gt;controlled_output |= SDVO_OUTPUT_RGB0;</div><div class='add'>+		psb_intel_sdvo_connector-&gt;output_flag = SDVO_OUTPUT_RGB0;</div><div class='add'>+	} else if (device == 1) {</div><div class='add'>+		psb_intel_sdvo-&gt;controlled_output |= SDVO_OUTPUT_RGB1;</div><div class='add'>+		psb_intel_sdvo_connector-&gt;output_flag = SDVO_OUTPUT_RGB1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo-&gt;base.clone_mask = ((1 &lt;&lt; INTEL_SDVO_NON_TV_CLONE_BIT) |</div><div class='add'>+				       (1 &lt;&lt; INTEL_ANALOG_CLONE_BIT));</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_connector_init(psb_intel_sdvo_connector,</div><div class='add'>+				  psb_intel_sdvo);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+psb_intel_sdvo_lvds_init(struct psb_intel_sdvo *psb_intel_sdvo, int device)</div><div class='add'>+{</div><div class='add'>+	struct drm_encoder *encoder = &amp;psb_intel_sdvo-&gt;base.base;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+	struct psb_intel_connector *intel_connector;</div><div class='add'>+	struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);</div><div class='add'>+	if (!psb_intel_sdvo_connector)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	intel_connector = &amp;psb_intel_sdvo_connector-&gt;base;</div><div class='add'>+	connector = &amp;intel_connector-&gt;base;</div><div class='add'>+	encoder-&gt;encoder_type = DRM_MODE_ENCODER_LVDS;</div><div class='add'>+	connector-&gt;connector_type = DRM_MODE_CONNECTOR_LVDS;</div><div class='add'>+</div><div class='add'>+	if (device == 0) {</div><div class='add'>+		psb_intel_sdvo-&gt;controlled_output |= SDVO_OUTPUT_LVDS0;</div><div class='add'>+		psb_intel_sdvo_connector-&gt;output_flag = SDVO_OUTPUT_LVDS0;</div><div class='add'>+	} else if (device == 1) {</div><div class='add'>+		psb_intel_sdvo-&gt;controlled_output |= SDVO_OUTPUT_LVDS1;</div><div class='add'>+		psb_intel_sdvo_connector-&gt;output_flag = SDVO_OUTPUT_LVDS1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo-&gt;base.clone_mask = ((1 &lt;&lt; INTEL_ANALOG_CLONE_BIT) |</div><div class='add'>+				       (1 &lt;&lt; INTEL_SDVO_LVDS_CLONE_BIT));</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_connector_init(psb_intel_sdvo_connector, psb_intel_sdvo);</div><div class='add'>+	if (!psb_intel_sdvo_create_enhance_property(psb_intel_sdvo, psb_intel_sdvo_connector))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	psb_intel_sdvo_destroy(connector);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+psb_intel_sdvo_output_setup(struct psb_intel_sdvo *psb_intel_sdvo, uint16_t flags)</div><div class='add'>+{</div><div class='add'>+	psb_intel_sdvo-&gt;is_tv = false;</div><div class='add'>+	psb_intel_sdvo-&gt;base.needs_tv_clock = false;</div><div class='add'>+	psb_intel_sdvo-&gt;is_lvds = false;</div><div class='add'>+</div><div class='add'>+	/* SDVO requires XXX1 function may not exist unless it has XXX0 function.*/</div><div class='add'>+</div><div class='add'>+	if (flags &amp; SDVO_OUTPUT_TMDS0)</div><div class='add'>+		if (!psb_intel_sdvo_dvi_init(psb_intel_sdvo, 0))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	if ((flags &amp; SDVO_TMDS_MASK) == SDVO_TMDS_MASK)</div><div class='add'>+		if (!psb_intel_sdvo_dvi_init(psb_intel_sdvo, 1))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	/* TV has no XXX1 function block */</div><div class='add'>+	if (flags &amp; SDVO_OUTPUT_SVID0)</div><div class='add'>+		if (!psb_intel_sdvo_tv_init(psb_intel_sdvo, SDVO_OUTPUT_SVID0))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; SDVO_OUTPUT_CVBS0)</div><div class='add'>+		if (!psb_intel_sdvo_tv_init(psb_intel_sdvo, SDVO_OUTPUT_CVBS0))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; SDVO_OUTPUT_RGB0)</div><div class='add'>+		if (!psb_intel_sdvo_analog_init(psb_intel_sdvo, 0))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	if ((flags &amp; SDVO_RGB_MASK) == SDVO_RGB_MASK)</div><div class='add'>+		if (!psb_intel_sdvo_analog_init(psb_intel_sdvo, 1))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; SDVO_OUTPUT_LVDS0)</div><div class='add'>+		if (!psb_intel_sdvo_lvds_init(psb_intel_sdvo, 0))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	if ((flags &amp; SDVO_LVDS_MASK) == SDVO_LVDS_MASK)</div><div class='add'>+		if (!psb_intel_sdvo_lvds_init(psb_intel_sdvo, 1))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	if ((flags &amp; SDVO_OUTPUT_MASK) == 0) {</div><div class='add'>+		unsigned char bytes[2];</div><div class='add'>+</div><div class='add'>+		psb_intel_sdvo-&gt;controlled_output = 0;</div><div class='add'>+		memcpy(bytes, &amp;psb_intel_sdvo-&gt;caps.output_flags, 2);</div><div class='add'>+		DRM_DEBUG_KMS("%s: Unknown SDVO output type (0x%02x%02x)\n",</div><div class='add'>+			      SDVO_NAME(psb_intel_sdvo),</div><div class='add'>+			      bytes[0], bytes[1]);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	psb_intel_sdvo-&gt;base.crtc_mask = (1 &lt;&lt; 0) | (1 &lt;&lt; 1);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_tv_create_property(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+					  struct psb_intel_sdvo_connector *psb_intel_sdvo_connector,</div><div class='add'>+					  int type)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = psb_intel_sdvo-&gt;base.base.dev;</div><div class='add'>+	struct psb_intel_sdvo_tv_format format;</div><div class='add'>+	uint32_t format_map, i;</div><div class='add'>+</div><div class='add'>+	if (!psb_intel_sdvo_set_target_output(psb_intel_sdvo, type))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(format) != 6);</div><div class='add'>+	if (!psb_intel_sdvo_get_value(psb_intel_sdvo,</div><div class='add'>+				  SDVO_CMD_GET_SUPPORTED_TV_FORMATS,</div><div class='add'>+				  &amp;format, sizeof(format)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;format_map, &amp;format, min(sizeof(format_map), sizeof(format)));</div><div class='add'>+</div><div class='add'>+	if (format_map == 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_connector-&gt;format_supported_num = 0;</div><div class='add'>+	for (i = 0 ; i &lt; TV_FORMAT_NUM; i++)</div><div class='add'>+		if (format_map &amp; (1 &lt;&lt; i))</div><div class='add'>+			psb_intel_sdvo_connector-&gt;tv_format_supported[psb_intel_sdvo_connector-&gt;format_supported_num++] = i;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_connector-&gt;tv_format =</div><div class='add'>+			drm_property_create(dev, DRM_MODE_PROP_ENUM,</div><div class='add'>+					    "mode", psb_intel_sdvo_connector-&gt;format_supported_num);</div><div class='add'>+	if (!psb_intel_sdvo_connector-&gt;tv_format)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; psb_intel_sdvo_connector-&gt;format_supported_num; i++)</div><div class='add'>+		drm_property_add_enum(</div><div class='add'>+				psb_intel_sdvo_connector-&gt;tv_format, i,</div><div class='add'>+				i, tv_format_names[psb_intel_sdvo_connector-&gt;tv_format_supported[i]]);</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo-&gt;tv_format_index = psb_intel_sdvo_connector-&gt;tv_format_supported[0];</div><div class='add'>+	drm_connector_attach_property(&amp;psb_intel_sdvo_connector-&gt;base.base,</div><div class='add'>+				      psb_intel_sdvo_connector-&gt;tv_format, 0);</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ENHANCEMENT(name, NAME) do { \</div><div class='add'>+	if (enhancements.name) { \</div><div class='add'>+		if (!psb_intel_sdvo_get_value(psb_intel_sdvo, SDVO_CMD_GET_MAX_##NAME, &amp;data_value, 4) || \</div><div class='add'>+		    !psb_intel_sdvo_get_value(psb_intel_sdvo, SDVO_CMD_GET_##NAME, &amp;response, 2)) \</div><div class='add'>+			return false; \</div><div class='add'>+		psb_intel_sdvo_connector-&gt;max_##name = data_value[0]; \</div><div class='add'>+		psb_intel_sdvo_connector-&gt;cur_##name = response; \</div><div class='add'>+		psb_intel_sdvo_connector-&gt;name = \</div><div class='add'>+			drm_property_create(dev, DRM_MODE_PROP_RANGE, #name, 2); \</div><div class='add'>+		if (!psb_intel_sdvo_connector-&gt;name) return false; \</div><div class='add'>+		psb_intel_sdvo_connector-&gt;name-&gt;values[0] = 0; \</div><div class='add'>+		psb_intel_sdvo_connector-&gt;name-&gt;values[1] = data_value[0]; \</div><div class='add'>+		drm_connector_attach_property(connector, \</div><div class='add'>+					      psb_intel_sdvo_connector-&gt;name, \</div><div class='add'>+					      psb_intel_sdvo_connector-&gt;cur_##name); \</div><div class='add'>+		DRM_DEBUG_KMS(#name ": max %d, default %d, current %d\n", \</div><div class='add'>+			      data_value[0], data_value[1], response); \</div><div class='add'>+	} \</div><div class='add'>+} while(0)</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+				      struct psb_intel_sdvo_connector *psb_intel_sdvo_connector,</div><div class='add'>+				      struct psb_intel_sdvo_enhancements_reply enhancements)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = psb_intel_sdvo-&gt;base.base.dev;</div><div class='add'>+	struct drm_connector *connector = &amp;psb_intel_sdvo_connector-&gt;base.base;</div><div class='add'>+	uint16_t response, data_value[2];</div><div class='add'>+</div><div class='add'>+	/* when horizontal overscan is supported, Add the left/right  property */</div><div class='add'>+	if (enhancements.overscan_h) {</div><div class='add'>+		if (!psb_intel_sdvo_get_value(psb_intel_sdvo,</div><div class='add'>+					  SDVO_CMD_GET_MAX_OVERSCAN_H,</div><div class='add'>+					  &amp;data_value, 4))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		if (!psb_intel_sdvo_get_value(psb_intel_sdvo,</div><div class='add'>+					  SDVO_CMD_GET_OVERSCAN_H,</div><div class='add'>+					  &amp;response, 2))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		psb_intel_sdvo_connector-&gt;max_hscan = data_value[0];</div><div class='add'>+		psb_intel_sdvo_connector-&gt;left_margin = data_value[0] - response;</div><div class='add'>+		psb_intel_sdvo_connector-&gt;right_margin = psb_intel_sdvo_connector-&gt;left_margin;</div><div class='add'>+		psb_intel_sdvo_connector-&gt;left =</div><div class='add'>+			drm_property_create(dev, DRM_MODE_PROP_RANGE,</div><div class='add'>+					    "left_margin", 2);</div><div class='add'>+		if (!psb_intel_sdvo_connector-&gt;left)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		psb_intel_sdvo_connector-&gt;left-&gt;values[0] = 0;</div><div class='add'>+		psb_intel_sdvo_connector-&gt;left-&gt;values[1] = data_value[0];</div><div class='add'>+		drm_connector_attach_property(connector,</div><div class='add'>+					      psb_intel_sdvo_connector-&gt;left,</div><div class='add'>+					      psb_intel_sdvo_connector-&gt;left_margin);</div><div class='add'>+</div><div class='add'>+		psb_intel_sdvo_connector-&gt;right =</div><div class='add'>+			drm_property_create(dev, DRM_MODE_PROP_RANGE,</div><div class='add'>+					    "right_margin", 2);</div><div class='add'>+		if (!psb_intel_sdvo_connector-&gt;right)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		psb_intel_sdvo_connector-&gt;right-&gt;values[0] = 0;</div><div class='add'>+		psb_intel_sdvo_connector-&gt;right-&gt;values[1] = data_value[0];</div><div class='add'>+		drm_connector_attach_property(connector,</div><div class='add'>+					      psb_intel_sdvo_connector-&gt;right,</div><div class='add'>+					      psb_intel_sdvo_connector-&gt;right_margin);</div><div class='add'>+		DRM_DEBUG_KMS("h_overscan: max %d, "</div><div class='add'>+			      "default %d, current %d\n",</div><div class='add'>+			      data_value[0], data_value[1], response);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enhancements.overscan_v) {</div><div class='add'>+		if (!psb_intel_sdvo_get_value(psb_intel_sdvo,</div><div class='add'>+					  SDVO_CMD_GET_MAX_OVERSCAN_V,</div><div class='add'>+					  &amp;data_value, 4))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		if (!psb_intel_sdvo_get_value(psb_intel_sdvo,</div><div class='add'>+					  SDVO_CMD_GET_OVERSCAN_V,</div><div class='add'>+					  &amp;response, 2))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		psb_intel_sdvo_connector-&gt;max_vscan = data_value[0];</div><div class='add'>+		psb_intel_sdvo_connector-&gt;top_margin = data_value[0] - response;</div><div class='add'>+		psb_intel_sdvo_connector-&gt;bottom_margin = psb_intel_sdvo_connector-&gt;top_margin;</div><div class='add'>+		psb_intel_sdvo_connector-&gt;top =</div><div class='add'>+			drm_property_create(dev, DRM_MODE_PROP_RANGE,</div><div class='add'>+					    "top_margin", 2);</div><div class='add'>+		if (!psb_intel_sdvo_connector-&gt;top)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		psb_intel_sdvo_connector-&gt;top-&gt;values[0] = 0;</div><div class='add'>+		psb_intel_sdvo_connector-&gt;top-&gt;values[1] = data_value[0];</div><div class='add'>+		drm_connector_attach_property(connector,</div><div class='add'>+					      psb_intel_sdvo_connector-&gt;top,</div><div class='add'>+					      psb_intel_sdvo_connector-&gt;top_margin);</div><div class='add'>+</div><div class='add'>+		psb_intel_sdvo_connector-&gt;bottom =</div><div class='add'>+			drm_property_create(dev, DRM_MODE_PROP_RANGE,</div><div class='add'>+					    "bottom_margin", 2);</div><div class='add'>+		if (!psb_intel_sdvo_connector-&gt;bottom)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		psb_intel_sdvo_connector-&gt;bottom-&gt;values[0] = 0;</div><div class='add'>+		psb_intel_sdvo_connector-&gt;bottom-&gt;values[1] = data_value[0];</div><div class='add'>+		drm_connector_attach_property(connector,</div><div class='add'>+					      psb_intel_sdvo_connector-&gt;bottom,</div><div class='add'>+					      psb_intel_sdvo_connector-&gt;bottom_margin);</div><div class='add'>+		DRM_DEBUG_KMS("v_overscan: max %d, "</div><div class='add'>+			      "default %d, current %d\n",</div><div class='add'>+			      data_value[0], data_value[1], response);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ENHANCEMENT(hpos, HPOS);</div><div class='add'>+	ENHANCEMENT(vpos, VPOS);</div><div class='add'>+	ENHANCEMENT(saturation, SATURATION);</div><div class='add'>+	ENHANCEMENT(contrast, CONTRAST);</div><div class='add'>+	ENHANCEMENT(hue, HUE);</div><div class='add'>+	ENHANCEMENT(sharpness, SHARPNESS);</div><div class='add'>+	ENHANCEMENT(brightness, BRIGHTNESS);</div><div class='add'>+	ENHANCEMENT(flicker_filter, FLICKER_FILTER);</div><div class='add'>+	ENHANCEMENT(flicker_filter_adaptive, FLICKER_FILTER_ADAPTIVE);</div><div class='add'>+	ENHANCEMENT(flicker_filter_2d, FLICKER_FILTER_2D);</div><div class='add'>+	ENHANCEMENT(tv_chroma_filter, TV_CHROMA_FILTER);</div><div class='add'>+	ENHANCEMENT(tv_luma_filter, TV_LUMA_FILTER);</div><div class='add'>+</div><div class='add'>+	if (enhancements.dot_crawl) {</div><div class='add'>+		if (!psb_intel_sdvo_get_value(psb_intel_sdvo, SDVO_CMD_GET_DOT_CRAWL, &amp;response, 2))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		psb_intel_sdvo_connector-&gt;max_dot_crawl = 1;</div><div class='add'>+		psb_intel_sdvo_connector-&gt;cur_dot_crawl = response &amp; 0x1;</div><div class='add'>+		psb_intel_sdvo_connector-&gt;dot_crawl =</div><div class='add'>+			drm_property_create(dev, DRM_MODE_PROP_RANGE, "dot_crawl", 2);</div><div class='add'>+		if (!psb_intel_sdvo_connector-&gt;dot_crawl)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		psb_intel_sdvo_connector-&gt;dot_crawl-&gt;values[0] = 0;</div><div class='add'>+		psb_intel_sdvo_connector-&gt;dot_crawl-&gt;values[1] = 1;</div><div class='add'>+		drm_connector_attach_property(connector,</div><div class='add'>+					      psb_intel_sdvo_connector-&gt;dot_crawl,</div><div class='add'>+					      psb_intel_sdvo_connector-&gt;cur_dot_crawl);</div><div class='add'>+		DRM_DEBUG_KMS("dot crawl: current %d\n", response);</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</div><div class='add'>+psb_intel_sdvo_create_enhance_property_lvds(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+					struct psb_intel_sdvo_connector *psb_intel_sdvo_connector,</div><div class='add'>+					struct psb_intel_sdvo_enhancements_reply enhancements)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = psb_intel_sdvo-&gt;base.base.dev;</div><div class='add'>+	struct drm_connector *connector = &amp;psb_intel_sdvo_connector-&gt;base.base;</div><div class='add'>+	uint16_t response, data_value[2];</div><div class='add'>+</div><div class='add'>+	ENHANCEMENT(brightness, BRIGHTNESS);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+#undef ENHANCEMENT</div><div class='add'>+</div><div class='add'>+static bool psb_intel_sdvo_create_enhance_property(struct psb_intel_sdvo *psb_intel_sdvo,</div><div class='add'>+					       struct psb_intel_sdvo_connector *psb_intel_sdvo_connector)</div><div class='add'>+{</div><div class='add'>+	union {</div><div class='add'>+		struct psb_intel_sdvo_enhancements_reply reply;</div><div class='add'>+		uint16_t response;</div><div class='add'>+	} enhancements;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(enhancements) != 2);</div><div class='add'>+</div><div class='add'>+	enhancements.response = 0;</div><div class='add'>+	psb_intel_sdvo_get_value(psb_intel_sdvo,</div><div class='add'>+			     SDVO_CMD_GET_SUPPORTED_ENHANCEMENTS,</div><div class='add'>+			     &amp;enhancements, sizeof(enhancements));</div><div class='add'>+	if (enhancements.response == 0) {</div><div class='add'>+		DRM_DEBUG_KMS("No enhancement is supported\n");</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IS_TV(psb_intel_sdvo_connector))</div><div class='add'>+		return psb_intel_sdvo_create_enhance_property_tv(psb_intel_sdvo, psb_intel_sdvo_connector, enhancements.reply);</div><div class='add'>+	else if(IS_LVDS(psb_intel_sdvo_connector))</div><div class='add'>+		return psb_intel_sdvo_create_enhance_property_lvds(psb_intel_sdvo, psb_intel_sdvo_connector, enhancements.reply);</div><div class='add'>+	else</div><div class='add'>+		return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psb_intel_sdvo_ddc_proxy_xfer(struct i2c_adapter *adapter,</div><div class='add'>+				     struct i2c_msg *msgs,</div><div class='add'>+				     int num)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo *sdvo = adapter-&gt;algo_data;</div><div class='add'>+</div><div class='add'>+	if (!psb_intel_sdvo_set_control_bus_switch(sdvo, sdvo-&gt;ddc_bus))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return sdvo-&gt;i2c-&gt;algo-&gt;master_xfer(sdvo-&gt;i2c, msgs, num);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 psb_intel_sdvo_ddc_proxy_func(struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct psb_intel_sdvo *sdvo = adapter-&gt;algo_data;</div><div class='add'>+	return sdvo-&gt;i2c-&gt;algo-&gt;functionality(sdvo-&gt;i2c);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_algorithm psb_intel_sdvo_ddc_proxy = {</div><div class='add'>+	.master_xfer	= psb_intel_sdvo_ddc_proxy_xfer,</div><div class='add'>+	.functionality	= psb_intel_sdvo_ddc_proxy_func</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+psb_intel_sdvo_init_ddc_proxy(struct psb_intel_sdvo *sdvo,</div><div class='add'>+			  struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	sdvo-&gt;ddc.owner = THIS_MODULE;</div><div class='add'>+	sdvo-&gt;ddc.class = I2C_CLASS_DDC;</div><div class='add'>+	snprintf(sdvo-&gt;ddc.name, I2C_NAME_SIZE, "SDVO DDC proxy");</div><div class='add'>+	sdvo-&gt;ddc.dev.parent = &amp;dev-&gt;pdev-&gt;dev;</div><div class='add'>+	sdvo-&gt;ddc.algo_data = sdvo;</div><div class='add'>+	sdvo-&gt;ddc.algo = &amp;psb_intel_sdvo_ddc_proxy;</div><div class='add'>+</div><div class='add'>+	return i2c_add_adapter(&amp;sdvo-&gt;ddc) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool psb_intel_sdvo_init(struct drm_device *dev, int sdvo_reg)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct psb_intel_encoder *psb_intel_encoder;</div><div class='add'>+	struct psb_intel_sdvo *psb_intel_sdvo;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo = kzalloc(sizeof(struct psb_intel_sdvo), GFP_KERNEL);</div><div class='add'>+	if (!psb_intel_sdvo)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo-&gt;sdvo_reg = sdvo_reg;</div><div class='add'>+	psb_intel_sdvo-&gt;slave_addr = psb_intel_sdvo_get_slave_addr(dev, sdvo_reg) &gt;&gt; 1;</div><div class='add'>+	psb_intel_sdvo_select_i2c_bus(dev_priv, psb_intel_sdvo, sdvo_reg);</div><div class='add'>+	if (!psb_intel_sdvo_init_ddc_proxy(psb_intel_sdvo, dev)) {</div><div class='add'>+		kfree(psb_intel_sdvo);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* encoder type will be decided later */</div><div class='add'>+	psb_intel_encoder = &amp;psb_intel_sdvo-&gt;base;</div><div class='add'>+	psb_intel_encoder-&gt;type = INTEL_OUTPUT_SDVO;</div><div class='add'>+	drm_encoder_init(dev, &amp;psb_intel_encoder-&gt;base, &amp;psb_intel_sdvo_enc_funcs, 0);</div><div class='add'>+</div><div class='add'>+	/* Read the regs to test if we can talk to the device */</div><div class='add'>+	for (i = 0; i &lt; 0x40; i++) {</div><div class='add'>+		u8 byte;</div><div class='add'>+</div><div class='add'>+		if (!psb_intel_sdvo_read_byte(psb_intel_sdvo, i, &amp;byte)) {</div><div class='add'>+			DRM_DEBUG_KMS("No SDVO device found on SDVO%c\n",</div><div class='add'>+				      IS_SDVOB(sdvo_reg) ? 'B' : 'C');</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IS_SDVOB(sdvo_reg))</div><div class='add'>+		dev_priv-&gt;hotplug_supported_mask |= SDVOB_HOTPLUG_INT_STATUS;</div><div class='add'>+	else</div><div class='add'>+		dev_priv-&gt;hotplug_supported_mask |= SDVOC_HOTPLUG_INT_STATUS;</div><div class='add'>+</div><div class='add'>+	drm_encoder_helper_add(&amp;psb_intel_encoder-&gt;base, &amp;psb_intel_sdvo_helper_funcs);</div><div class='add'>+</div><div class='add'>+	/* In default case sdvo lvds is false */</div><div class='add'>+	if (!psb_intel_sdvo_get_capabilities(psb_intel_sdvo, &amp;psb_intel_sdvo-&gt;caps))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (psb_intel_sdvo_output_setup(psb_intel_sdvo,</div><div class='add'>+				    psb_intel_sdvo-&gt;caps.output_flags) != true) {</div><div class='add'>+		DRM_DEBUG_KMS("SDVO output failed to setup on SDVO%c\n",</div><div class='add'>+			      IS_SDVOB(sdvo_reg) ? 'B' : 'C');</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	psb_intel_sdvo_select_ddc_bus(dev_priv, psb_intel_sdvo, sdvo_reg);</div><div class='add'>+</div><div class='add'>+	/* Set the input timing to the screen. Assume always input 0. */</div><div class='add'>+	if (!psb_intel_sdvo_set_target_input(psb_intel_sdvo))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (!psb_intel_sdvo_get_input_pixel_clock_range(psb_intel_sdvo,</div><div class='add'>+						    &amp;psb_intel_sdvo-&gt;pixel_clock_min,</div><div class='add'>+						    &amp;psb_intel_sdvo-&gt;pixel_clock_max))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_KMS("%s device VID/DID: %02X:%02X.%02X, "</div><div class='add'>+			"clock range %dMHz - %dMHz, "</div><div class='add'>+			"input 1: %c, input 2: %c, "</div><div class='add'>+			"output 1: %c, output 2: %c\n",</div><div class='add'>+			SDVO_NAME(psb_intel_sdvo),</div><div class='add'>+			psb_intel_sdvo-&gt;caps.vendor_id, psb_intel_sdvo-&gt;caps.device_id,</div><div class='add'>+			psb_intel_sdvo-&gt;caps.device_rev_id,</div><div class='add'>+			psb_intel_sdvo-&gt;pixel_clock_min / 1000,</div><div class='add'>+			psb_intel_sdvo-&gt;pixel_clock_max / 1000,</div><div class='add'>+			(psb_intel_sdvo-&gt;caps.sdvo_inputs_mask &amp; 0x1) ? 'Y' : 'N',</div><div class='add'>+			(psb_intel_sdvo-&gt;caps.sdvo_inputs_mask &amp; 0x2) ? 'Y' : 'N',</div><div class='add'>+			/* check currently supported outputs */</div><div class='add'>+			psb_intel_sdvo-&gt;caps.output_flags &amp;</div><div class='add'>+			(SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_RGB0) ? 'Y' : 'N',</div><div class='add'>+			psb_intel_sdvo-&gt;caps.output_flags &amp;</div><div class='add'>+			(SDVO_OUTPUT_TMDS1 | SDVO_OUTPUT_RGB1) ? 'Y' : 'N');</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	drm_encoder_cleanup(&amp;psb_intel_encoder-&gt;base);</div><div class='add'>+	i2c_del_adapter(&amp;psb_intel_sdvo-&gt;ddc);</div><div class='add'>+	kfree(psb_intel_sdvo);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo_regs.h b/drivers/gpu/drm/gma500/psb_intel_sdvo_regs.h<br/>new file mode 100644<br/>index 000000000000..600e79744d68<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/psb_intel_sdvo_regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/psb_intel_sdvo_regs.h</a></div><div class='hunk'>@@ -0,0 +1,723 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright ? 2006-2007 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='add'>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER</div><div class='add'>+ * DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Eric Anholt &lt;eric@anholt.net&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * @file SDVO command definitions and structures.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define SDVO_OUTPUT_FIRST   (0)</div><div class='add'>+#define SDVO_OUTPUT_TMDS0   (1 &lt;&lt; 0)</div><div class='add'>+#define SDVO_OUTPUT_RGB0    (1 &lt;&lt; 1)</div><div class='add'>+#define SDVO_OUTPUT_CVBS0   (1 &lt;&lt; 2)</div><div class='add'>+#define SDVO_OUTPUT_SVID0   (1 &lt;&lt; 3)</div><div class='add'>+#define SDVO_OUTPUT_YPRPB0  (1 &lt;&lt; 4)</div><div class='add'>+#define SDVO_OUTPUT_SCART0  (1 &lt;&lt; 5)</div><div class='add'>+#define SDVO_OUTPUT_LVDS0   (1 &lt;&lt; 6)</div><div class='add'>+#define SDVO_OUTPUT_TMDS1   (1 &lt;&lt; 8)</div><div class='add'>+#define SDVO_OUTPUT_RGB1    (1 &lt;&lt; 9)</div><div class='add'>+#define SDVO_OUTPUT_CVBS1   (1 &lt;&lt; 10)</div><div class='add'>+#define SDVO_OUTPUT_SVID1   (1 &lt;&lt; 11)</div><div class='add'>+#define SDVO_OUTPUT_YPRPB1  (1 &lt;&lt; 12)</div><div class='add'>+#define SDVO_OUTPUT_SCART1  (1 &lt;&lt; 13)</div><div class='add'>+#define SDVO_OUTPUT_LVDS1   (1 &lt;&lt; 14)</div><div class='add'>+#define SDVO_OUTPUT_LAST    (14)</div><div class='add'>+</div><div class='add'>+struct psb_intel_sdvo_caps {</div><div class='add'>+    u8 vendor_id;</div><div class='add'>+    u8 device_id;</div><div class='add'>+    u8 device_rev_id;</div><div class='add'>+    u8 sdvo_version_major;</div><div class='add'>+    u8 sdvo_version_minor;</div><div class='add'>+    unsigned int sdvo_inputs_mask:2;</div><div class='add'>+    unsigned int smooth_scaling:1;</div><div class='add'>+    unsigned int sharp_scaling:1;</div><div class='add'>+    unsigned int up_scaling:1;</div><div class='add'>+    unsigned int down_scaling:1;</div><div class='add'>+    unsigned int stall_support:1;</div><div class='add'>+    unsigned int pad:1;</div><div class='add'>+    u16 output_flags;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/** This matches the EDID DTD structure, more or less */</div><div class='add'>+struct psb_intel_sdvo_dtd {</div><div class='add'>+    struct {</div><div class='add'>+	u16 clock;		/**&lt; pixel clock, in 10kHz units */</div><div class='add'>+	u8 h_active;		/**&lt; lower 8 bits (pixels) */</div><div class='add'>+	u8 h_blank;		/**&lt; lower 8 bits (pixels) */</div><div class='add'>+	u8 h_high;		/**&lt; upper 4 bits each h_active, h_blank */</div><div class='add'>+	u8 v_active;		/**&lt; lower 8 bits (lines) */</div><div class='add'>+	u8 v_blank;		/**&lt; lower 8 bits (lines) */</div><div class='add'>+	u8 v_high;		/**&lt; upper 4 bits each v_active, v_blank */</div><div class='add'>+    } part1;</div><div class='add'>+</div><div class='add'>+    struct {</div><div class='add'>+	u8 h_sync_off;	/**&lt; lower 8 bits, from hblank start */</div><div class='add'>+	u8 h_sync_width;	/**&lt; lower 8 bits (pixels) */</div><div class='add'>+	/** lower 4 bits each vsync offset, vsync width */</div><div class='add'>+	u8 v_sync_off_width;</div><div class='add'>+	/**</div><div class='add'>+	 * 2 high bits of hsync offset, 2 high bits of hsync width,</div><div class='add'>+	 * bits 4-5 of vsync offset, and 2 high bits of vsync width.</div><div class='add'>+	 */</div><div class='add'>+	u8 sync_off_width_high;</div><div class='add'>+	u8 dtd_flags;</div><div class='add'>+	u8 sdvo_flags;</div><div class='add'>+	/** bits 6-7 of vsync offset at bits 6-7 */</div><div class='add'>+	u8 v_sync_off_high;</div><div class='add'>+	u8 reserved;</div><div class='add'>+    } part2;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct psb_intel_sdvo_pixel_clock_range {</div><div class='add'>+    u16 min;			/**&lt; pixel clock, in 10kHz units */</div><div class='add'>+    u16 max;			/**&lt; pixel clock, in 10kHz units */</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct psb_intel_sdvo_preferred_input_timing_args {</div><div class='add'>+    u16 clock;</div><div class='add'>+    u16 width;</div><div class='add'>+    u16 height;</div><div class='add'>+    u8	interlace:1;</div><div class='add'>+    u8	scaled:1;</div><div class='add'>+    u8	pad:6;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/* I2C registers for SDVO */</div><div class='add'>+#define SDVO_I2C_ARG_0				0x07</div><div class='add'>+#define SDVO_I2C_ARG_1				0x06</div><div class='add'>+#define SDVO_I2C_ARG_2				0x05</div><div class='add'>+#define SDVO_I2C_ARG_3				0x04</div><div class='add'>+#define SDVO_I2C_ARG_4				0x03</div><div class='add'>+#define SDVO_I2C_ARG_5				0x02</div><div class='add'>+#define SDVO_I2C_ARG_6				0x01</div><div class='add'>+#define SDVO_I2C_ARG_7				0x00</div><div class='add'>+#define SDVO_I2C_OPCODE				0x08</div><div class='add'>+#define SDVO_I2C_CMD_STATUS			0x09</div><div class='add'>+#define SDVO_I2C_RETURN_0			0x0a</div><div class='add'>+#define SDVO_I2C_RETURN_1			0x0b</div><div class='add'>+#define SDVO_I2C_RETURN_2			0x0c</div><div class='add'>+#define SDVO_I2C_RETURN_3			0x0d</div><div class='add'>+#define SDVO_I2C_RETURN_4			0x0e</div><div class='add'>+#define SDVO_I2C_RETURN_5			0x0f</div><div class='add'>+#define SDVO_I2C_RETURN_6			0x10</div><div class='add'>+#define SDVO_I2C_RETURN_7			0x11</div><div class='add'>+#define SDVO_I2C_VENDOR_BEGIN			0x20</div><div class='add'>+</div><div class='add'>+/* Status results */</div><div class='add'>+#define SDVO_CMD_STATUS_POWER_ON		0x0</div><div class='add'>+#define SDVO_CMD_STATUS_SUCCESS			0x1</div><div class='add'>+#define SDVO_CMD_STATUS_NOTSUPP			0x2</div><div class='add'>+#define SDVO_CMD_STATUS_INVALID_ARG		0x3</div><div class='add'>+#define SDVO_CMD_STATUS_PENDING			0x4</div><div class='add'>+#define SDVO_CMD_STATUS_TARGET_NOT_SPECIFIED	0x5</div><div class='add'>+#define SDVO_CMD_STATUS_SCALING_NOT_SUPP	0x6</div><div class='add'>+</div><div class='add'>+/* SDVO commands, argument/result registers */</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_RESET					0x01</div><div class='add'>+</div><div class='add'>+/** Returns a struct intel_sdvo_caps */</div><div class='add'>+#define SDVO_CMD_GET_DEVICE_CAPS			0x02</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_GET_FIRMWARE_REV			0x86</div><div class='add'>+# define SDVO_DEVICE_FIRMWARE_MINOR			SDVO_I2C_RETURN_0</div><div class='add'>+# define SDVO_DEVICE_FIRMWARE_MAJOR			SDVO_I2C_RETURN_1</div><div class='add'>+# define SDVO_DEVICE_FIRMWARE_PATCH			SDVO_I2C_RETURN_2</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Reports which inputs are trained (managed to sync).</div><div class='add'>+ *</div><div class='add'>+ * Devices must have trained within 2 vsyncs of a mode change.</div><div class='add'>+ */</div><div class='add'>+#define SDVO_CMD_GET_TRAINED_INPUTS			0x03</div><div class='add'>+struct psb_intel_sdvo_get_trained_inputs_response {</div><div class='add'>+    unsigned int input0_trained:1;</div><div class='add'>+    unsigned int input1_trained:1;</div><div class='add'>+    unsigned int pad:6;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/** Returns a struct intel_sdvo_output_flags of active outputs. */</div><div class='add'>+#define SDVO_CMD_GET_ACTIVE_OUTPUTS			0x04</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Sets the current set of active outputs.</div><div class='add'>+ *</div><div class='add'>+ * Takes a struct intel_sdvo_output_flags.  Must be preceded by a SET_IN_OUT_MAP</div><div class='add'>+ * on multi-output devices.</div><div class='add'>+ */</div><div class='add'>+#define SDVO_CMD_SET_ACTIVE_OUTPUTS			0x05</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Returns the current mapping of SDVO inputs to outputs on the device.</div><div class='add'>+ *</div><div class='add'>+ * Returns two struct intel_sdvo_output_flags structures.</div><div class='add'>+ */</div><div class='add'>+#define SDVO_CMD_GET_IN_OUT_MAP				0x06</div><div class='add'>+struct psb_intel_sdvo_in_out_map {</div><div class='add'>+    u16 in0, in1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Sets the current mapping of SDVO inputs to outputs on the device.</div><div class='add'>+ *</div><div class='add'>+ * Takes two struct i380_sdvo_output_flags structures.</div><div class='add'>+ */</div><div class='add'>+#define SDVO_CMD_SET_IN_OUT_MAP				0x07</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Returns a struct intel_sdvo_output_flags of attached displays.</div><div class='add'>+ */</div><div class='add'>+#define SDVO_CMD_GET_ATTACHED_DISPLAYS			0x0b</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Returns a struct intel_sdvo_ouptut_flags of displays supporting hot plugging.</div><div class='add'>+ */</div><div class='add'>+#define SDVO_CMD_GET_HOT_PLUG_SUPPORT			0x0c</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Takes a struct intel_sdvo_output_flags.</div><div class='add'>+ */</div><div class='add'>+#define SDVO_CMD_SET_ACTIVE_HOT_PLUG			0x0d</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Returns a struct intel_sdvo_output_flags of displays with hot plug</div><div class='add'>+ * interrupts enabled.</div><div class='add'>+ */</div><div class='add'>+#define SDVO_CMD_GET_ACTIVE_HOT_PLUG			0x0e</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_GET_INTERRUPT_EVENT_SOURCE		0x0f</div><div class='add'>+struct intel_sdvo_get_interrupt_event_source_response {</div><div class='add'>+    u16 interrupt_status;</div><div class='add'>+    unsigned int ambient_light_interrupt:1;</div><div class='add'>+    unsigned int hdmi_audio_encrypt_change:1;</div><div class='add'>+    unsigned int pad:6;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Selects which input is affected by future input commands.</div><div class='add'>+ *</div><div class='add'>+ * Commands affected include SET_INPUT_TIMINGS_PART[12],</div><div class='add'>+ * GET_INPUT_TIMINGS_PART[12], GET_PREFERRED_INPUT_TIMINGS_PART[12],</div><div class='add'>+ * GET_INPUT_PIXEL_CLOCK_RANGE, and CREATE_PREFERRED_INPUT_TIMINGS.</div><div class='add'>+ */</div><div class='add'>+#define SDVO_CMD_SET_TARGET_INPUT			0x10</div><div class='add'>+struct psb_intel_sdvo_set_target_input_args {</div><div class='add'>+    unsigned int target_1:1;</div><div class='add'>+    unsigned int pad:7;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Takes a struct intel_sdvo_output_flags of which outputs are targeted by</div><div class='add'>+ * future output commands.</div><div class='add'>+ *</div><div class='add'>+ * Affected commands inclue SET_OUTPUT_TIMINGS_PART[12],</div><div class='add'>+ * GET_OUTPUT_TIMINGS_PART[12], and GET_OUTPUT_PIXEL_CLOCK_RANGE.</div><div class='add'>+ */</div><div class='add'>+#define SDVO_CMD_SET_TARGET_OUTPUT			0x11</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_GET_INPUT_TIMINGS_PART1		0x12</div><div class='add'>+#define SDVO_CMD_GET_INPUT_TIMINGS_PART2		0x13</div><div class='add'>+#define SDVO_CMD_SET_INPUT_TIMINGS_PART1		0x14</div><div class='add'>+#define SDVO_CMD_SET_INPUT_TIMINGS_PART2		0x15</div><div class='add'>+#define SDVO_CMD_SET_OUTPUT_TIMINGS_PART1		0x16</div><div class='add'>+#define SDVO_CMD_SET_OUTPUT_TIMINGS_PART2		0x17</div><div class='add'>+#define SDVO_CMD_GET_OUTPUT_TIMINGS_PART1		0x18</div><div class='add'>+#define SDVO_CMD_GET_OUTPUT_TIMINGS_PART2		0x19</div><div class='add'>+/* Part 1 */</div><div class='add'>+# define SDVO_DTD_CLOCK_LOW				SDVO_I2C_ARG_0</div><div class='add'>+# define SDVO_DTD_CLOCK_HIGH				SDVO_I2C_ARG_1</div><div class='add'>+# define SDVO_DTD_H_ACTIVE				SDVO_I2C_ARG_2</div><div class='add'>+# define SDVO_DTD_H_BLANK				SDVO_I2C_ARG_3</div><div class='add'>+# define SDVO_DTD_H_HIGH				SDVO_I2C_ARG_4</div><div class='add'>+# define SDVO_DTD_V_ACTIVE				SDVO_I2C_ARG_5</div><div class='add'>+# define SDVO_DTD_V_BLANK				SDVO_I2C_ARG_6</div><div class='add'>+# define SDVO_DTD_V_HIGH				SDVO_I2C_ARG_7</div><div class='add'>+/* Part 2 */</div><div class='add'>+# define SDVO_DTD_HSYNC_OFF				SDVO_I2C_ARG_0</div><div class='add'>+# define SDVO_DTD_HSYNC_WIDTH				SDVO_I2C_ARG_1</div><div class='add'>+# define SDVO_DTD_VSYNC_OFF_WIDTH			SDVO_I2C_ARG_2</div><div class='add'>+# define SDVO_DTD_SYNC_OFF_WIDTH_HIGH			SDVO_I2C_ARG_3</div><div class='add'>+# define SDVO_DTD_DTD_FLAGS				SDVO_I2C_ARG_4</div><div class='add'>+# define SDVO_DTD_DTD_FLAG_INTERLACED				(1 &lt;&lt; 7)</div><div class='add'>+# define SDVO_DTD_DTD_FLAG_STEREO_MASK				(3 &lt;&lt; 5)</div><div class='add'>+# define SDVO_DTD_DTD_FLAG_INPUT_MASK				(3 &lt;&lt; 3)</div><div class='add'>+# define SDVO_DTD_DTD_FLAG_SYNC_MASK				(3 &lt;&lt; 1)</div><div class='add'>+# define SDVO_DTD_SDVO_FLAS				SDVO_I2C_ARG_5</div><div class='add'>+# define SDVO_DTD_SDVO_FLAG_STALL				(1 &lt;&lt; 7)</div><div class='add'>+# define SDVO_DTD_SDVO_FLAG_CENTERED				(0 &lt;&lt; 6)</div><div class='add'>+# define SDVO_DTD_SDVO_FLAG_UPPER_LEFT				(1 &lt;&lt; 6)</div><div class='add'>+# define SDVO_DTD_SDVO_FLAG_SCALING_MASK			(3 &lt;&lt; 4)</div><div class='add'>+# define SDVO_DTD_SDVO_FLAG_SCALING_NONE			(0 &lt;&lt; 4)</div><div class='add'>+# define SDVO_DTD_SDVO_FLAG_SCALING_SHARP			(1 &lt;&lt; 4)</div><div class='add'>+# define SDVO_DTD_SDVO_FLAG_SCALING_SMOOTH			(2 &lt;&lt; 4)</div><div class='add'>+# define SDVO_DTD_VSYNC_OFF_HIGH			SDVO_I2C_ARG_6</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Generates a DTD based on the given width, height, and flags.</div><div class='add'>+ *</div><div class='add'>+ * This will be supported by any device supporting scaling or interlaced</div><div class='add'>+ * modes.</div><div class='add'>+ */</div><div class='add'>+#define SDVO_CMD_CREATE_PREFERRED_INPUT_TIMING		0x1a</div><div class='add'>+# define SDVO_PREFERRED_INPUT_TIMING_CLOCK_LOW		SDVO_I2C_ARG_0</div><div class='add'>+# define SDVO_PREFERRED_INPUT_TIMING_CLOCK_HIGH		SDVO_I2C_ARG_1</div><div class='add'>+# define SDVO_PREFERRED_INPUT_TIMING_WIDTH_LOW		SDVO_I2C_ARG_2</div><div class='add'>+# define SDVO_PREFERRED_INPUT_TIMING_WIDTH_HIGH		SDVO_I2C_ARG_3</div><div class='add'>+# define SDVO_PREFERRED_INPUT_TIMING_HEIGHT_LOW		SDVO_I2C_ARG_4</div><div class='add'>+# define SDVO_PREFERRED_INPUT_TIMING_HEIGHT_HIGH	SDVO_I2C_ARG_5</div><div class='add'>+# define SDVO_PREFERRED_INPUT_TIMING_FLAGS		SDVO_I2C_ARG_6</div><div class='add'>+# define SDVO_PREFERRED_INPUT_TIMING_FLAGS_INTERLACED		(1 &lt;&lt; 0)</div><div class='add'>+# define SDVO_PREFERRED_INPUT_TIMING_FLAGS_SCALED		(1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART1	0x1b</div><div class='add'>+#define SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART2	0x1c</div><div class='add'>+</div><div class='add'>+/** Returns a struct intel_sdvo_pixel_clock_range */</div><div class='add'>+#define SDVO_CMD_GET_INPUT_PIXEL_CLOCK_RANGE		0x1d</div><div class='add'>+/** Returns a struct intel_sdvo_pixel_clock_range */</div><div class='add'>+#define SDVO_CMD_GET_OUTPUT_PIXEL_CLOCK_RANGE		0x1e</div><div class='add'>+</div><div class='add'>+/** Returns a byte bitfield containing SDVO_CLOCK_RATE_MULT_* flags */</div><div class='add'>+#define SDVO_CMD_GET_SUPPORTED_CLOCK_RATE_MULTS		0x1f</div><div class='add'>+</div><div class='add'>+/** Returns a byte containing a SDVO_CLOCK_RATE_MULT_* flag */</div><div class='add'>+#define SDVO_CMD_GET_CLOCK_RATE_MULT			0x20</div><div class='add'>+/** Takes a byte containing a SDVO_CLOCK_RATE_MULT_* flag */</div><div class='add'>+#define SDVO_CMD_SET_CLOCK_RATE_MULT			0x21</div><div class='add'>+# define SDVO_CLOCK_RATE_MULT_1X				(1 &lt;&lt; 0)</div><div class='add'>+# define SDVO_CLOCK_RATE_MULT_2X				(1 &lt;&lt; 1)</div><div class='add'>+# define SDVO_CLOCK_RATE_MULT_4X				(1 &lt;&lt; 3)</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_GET_SUPPORTED_TV_FORMATS		0x27</div><div class='add'>+/** 6 bytes of bit flags for TV formats shared by all TV format functions */</div><div class='add'>+struct psb_intel_sdvo_tv_format {</div><div class='add'>+    unsigned int ntsc_m:1;</div><div class='add'>+    unsigned int ntsc_j:1;</div><div class='add'>+    unsigned int ntsc_443:1;</div><div class='add'>+    unsigned int pal_b:1;</div><div class='add'>+    unsigned int pal_d:1;</div><div class='add'>+    unsigned int pal_g:1;</div><div class='add'>+    unsigned int pal_h:1;</div><div class='add'>+    unsigned int pal_i:1;</div><div class='add'>+</div><div class='add'>+    unsigned int pal_m:1;</div><div class='add'>+    unsigned int pal_n:1;</div><div class='add'>+    unsigned int pal_nc:1;</div><div class='add'>+    unsigned int pal_60:1;</div><div class='add'>+    unsigned int secam_b:1;</div><div class='add'>+    unsigned int secam_d:1;</div><div class='add'>+    unsigned int secam_g:1;</div><div class='add'>+    unsigned int secam_k:1;</div><div class='add'>+</div><div class='add'>+    unsigned int secam_k1:1;</div><div class='add'>+    unsigned int secam_l:1;</div><div class='add'>+    unsigned int secam_60:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_240m_1080i_59:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_240m_1080i_60:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_260m_1080i_59:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_260m_1080i_60:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080i_50:1;</div><div class='add'>+</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080i_59:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080i_60:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080p_23:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080p_24:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080p_25:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080p_29:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080p_30:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080p_50:1;</div><div class='add'>+</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080p_59:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080p_60:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_295m_1080i_50:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_295m_1080p_50:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_296m_720p_59:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_296m_720p_60:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_296m_720p_50:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_293m_480p_59:1;</div><div class='add'>+</div><div class='add'>+    unsigned int hdtv_std_smpte_170m_480i_59:1;</div><div class='add'>+    unsigned int hdtv_std_iturbt601_576i_50:1;</div><div class='add'>+    unsigned int hdtv_std_iturbt601_576p_50:1;</div><div class='add'>+    unsigned int hdtv_std_eia_7702a_480i_60:1;</div><div class='add'>+    unsigned int hdtv_std_eia_7702a_480p_60:1;</div><div class='add'>+    unsigned int pad:3;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_GET_TV_FORMAT				0x28</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_SET_TV_FORMAT				0x29</div><div class='add'>+</div><div class='add'>+/** Returns the resolutiosn that can be used with the given TV format */</div><div class='add'>+#define SDVO_CMD_GET_SDTV_RESOLUTION_SUPPORT		0x83</div><div class='add'>+struct psb_intel_sdvo_sdtv_resolution_request {</div><div class='add'>+    unsigned int ntsc_m:1;</div><div class='add'>+    unsigned int ntsc_j:1;</div><div class='add'>+    unsigned int ntsc_443:1;</div><div class='add'>+    unsigned int pal_b:1;</div><div class='add'>+    unsigned int pal_d:1;</div><div class='add'>+    unsigned int pal_g:1;</div><div class='add'>+    unsigned int pal_h:1;</div><div class='add'>+    unsigned int pal_i:1;</div><div class='add'>+</div><div class='add'>+    unsigned int pal_m:1;</div><div class='add'>+    unsigned int pal_n:1;</div><div class='add'>+    unsigned int pal_nc:1;</div><div class='add'>+    unsigned int pal_60:1;</div><div class='add'>+    unsigned int secam_b:1;</div><div class='add'>+    unsigned int secam_d:1;</div><div class='add'>+    unsigned int secam_g:1;</div><div class='add'>+    unsigned int secam_k:1;</div><div class='add'>+</div><div class='add'>+    unsigned int secam_k1:1;</div><div class='add'>+    unsigned int secam_l:1;</div><div class='add'>+    unsigned int secam_60:1;</div><div class='add'>+    unsigned int pad:5;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct psb_intel_sdvo_sdtv_resolution_reply {</div><div class='add'>+    unsigned int res_320x200:1;</div><div class='add'>+    unsigned int res_320x240:1;</div><div class='add'>+    unsigned int res_400x300:1;</div><div class='add'>+    unsigned int res_640x350:1;</div><div class='add'>+    unsigned int res_640x400:1;</div><div class='add'>+    unsigned int res_640x480:1;</div><div class='add'>+    unsigned int res_704x480:1;</div><div class='add'>+    unsigned int res_704x576:1;</div><div class='add'>+</div><div class='add'>+    unsigned int res_720x350:1;</div><div class='add'>+    unsigned int res_720x400:1;</div><div class='add'>+    unsigned int res_720x480:1;</div><div class='add'>+    unsigned int res_720x540:1;</div><div class='add'>+    unsigned int res_720x576:1;</div><div class='add'>+    unsigned int res_768x576:1;</div><div class='add'>+    unsigned int res_800x600:1;</div><div class='add'>+    unsigned int res_832x624:1;</div><div class='add'>+</div><div class='add'>+    unsigned int res_920x766:1;</div><div class='add'>+    unsigned int res_1024x768:1;</div><div class='add'>+    unsigned int res_1280x1024:1;</div><div class='add'>+    unsigned int pad:5;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/* Get supported resolution with squire pixel aspect ratio that can be</div><div class='add'>+   scaled for the requested HDTV format */</div><div class='add'>+#define SDVO_CMD_GET_SCALED_HDTV_RESOLUTION_SUPPORT		0x85</div><div class='add'>+</div><div class='add'>+struct psb_intel_sdvo_hdtv_resolution_request {</div><div class='add'>+    unsigned int hdtv_std_smpte_240m_1080i_59:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_240m_1080i_60:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_260m_1080i_59:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_260m_1080i_60:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080i_50:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080i_59:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080i_60:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080p_23:1;</div><div class='add'>+</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080p_24:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080p_25:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080p_29:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080p_30:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080p_50:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080p_59:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_274m_1080p_60:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_295m_1080i_50:1;</div><div class='add'>+</div><div class='add'>+    unsigned int hdtv_std_smpte_295m_1080p_50:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_296m_720p_59:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_296m_720p_60:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_296m_720p_50:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_293m_480p_59:1;</div><div class='add'>+    unsigned int hdtv_std_smpte_170m_480i_59:1;</div><div class='add'>+    unsigned int hdtv_std_iturbt601_576i_50:1;</div><div class='add'>+    unsigned int hdtv_std_iturbt601_576p_50:1;</div><div class='add'>+</div><div class='add'>+    unsigned int hdtv_std_eia_7702a_480i_60:1;</div><div class='add'>+    unsigned int hdtv_std_eia_7702a_480p_60:1;</div><div class='add'>+    unsigned int pad:6;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct psb_intel_sdvo_hdtv_resolution_reply {</div><div class='add'>+    unsigned int res_640x480:1;</div><div class='add'>+    unsigned int res_800x600:1;</div><div class='add'>+    unsigned int res_1024x768:1;</div><div class='add'>+    unsigned int res_1280x960:1;</div><div class='add'>+    unsigned int res_1400x1050:1;</div><div class='add'>+    unsigned int res_1600x1200:1;</div><div class='add'>+    unsigned int res_1920x1440:1;</div><div class='add'>+    unsigned int res_2048x1536:1;</div><div class='add'>+</div><div class='add'>+    unsigned int res_2560x1920:1;</div><div class='add'>+    unsigned int res_3200x2400:1;</div><div class='add'>+    unsigned int res_3840x2880:1;</div><div class='add'>+    unsigned int pad1:5;</div><div class='add'>+</div><div class='add'>+    unsigned int res_848x480:1;</div><div class='add'>+    unsigned int res_1064x600:1;</div><div class='add'>+    unsigned int res_1280x720:1;</div><div class='add'>+    unsigned int res_1360x768:1;</div><div class='add'>+    unsigned int res_1704x960:1;</div><div class='add'>+    unsigned int res_1864x1050:1;</div><div class='add'>+    unsigned int res_1920x1080:1;</div><div class='add'>+    unsigned int res_2128x1200:1;</div><div class='add'>+</div><div class='add'>+    unsigned int res_2560x1400:1;</div><div class='add'>+    unsigned int res_2728x1536:1;</div><div class='add'>+    unsigned int res_3408x1920:1;</div><div class='add'>+    unsigned int res_4264x2400:1;</div><div class='add'>+    unsigned int res_5120x2880:1;</div><div class='add'>+    unsigned int pad2:3;</div><div class='add'>+</div><div class='add'>+    unsigned int res_768x480:1;</div><div class='add'>+    unsigned int res_960x600:1;</div><div class='add'>+    unsigned int res_1152x720:1;</div><div class='add'>+    unsigned int res_1124x768:1;</div><div class='add'>+    unsigned int res_1536x960:1;</div><div class='add'>+    unsigned int res_1680x1050:1;</div><div class='add'>+    unsigned int res_1728x1080:1;</div><div class='add'>+    unsigned int res_1920x1200:1;</div><div class='add'>+</div><div class='add'>+    unsigned int res_2304x1440:1;</div><div class='add'>+    unsigned int res_2456x1536:1;</div><div class='add'>+    unsigned int res_3072x1920:1;</div><div class='add'>+    unsigned int res_3840x2400:1;</div><div class='add'>+    unsigned int res_4608x2880:1;</div><div class='add'>+    unsigned int pad3:3;</div><div class='add'>+</div><div class='add'>+    unsigned int res_1280x1024:1;</div><div class='add'>+    unsigned int pad4:7;</div><div class='add'>+</div><div class='add'>+    unsigned int res_1280x768:1;</div><div class='add'>+    unsigned int pad5:7;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/* Get supported power state returns info for encoder and monitor, rely on</div><div class='add'>+   last SetTargetInput and SetTargetOutput calls */</div><div class='add'>+#define SDVO_CMD_GET_SUPPORTED_POWER_STATES		0x2a</div><div class='add'>+/* Get power state returns info for encoder and monitor, rely on last</div><div class='add'>+   SetTargetInput and SetTargetOutput calls */</div><div class='add'>+#define SDVO_CMD_GET_POWER_STATE			0x2b</div><div class='add'>+#define SDVO_CMD_GET_ENCODER_POWER_STATE		0x2b</div><div class='add'>+#define SDVO_CMD_SET_ENCODER_POWER_STATE		0x2c</div><div class='add'>+# define SDVO_ENCODER_STATE_ON					(1 &lt;&lt; 0)</div><div class='add'>+# define SDVO_ENCODER_STATE_STANDBY				(1 &lt;&lt; 1)</div><div class='add'>+# define SDVO_ENCODER_STATE_SUSPEND				(1 &lt;&lt; 2)</div><div class='add'>+# define SDVO_ENCODER_STATE_OFF					(1 &lt;&lt; 3)</div><div class='add'>+# define SDVO_MONITOR_STATE_ON					(1 &lt;&lt; 4)</div><div class='add'>+# define SDVO_MONITOR_STATE_STANDBY				(1 &lt;&lt; 5)</div><div class='add'>+# define SDVO_MONITOR_STATE_SUSPEND				(1 &lt;&lt; 6)</div><div class='add'>+# define SDVO_MONITOR_STATE_OFF					(1 &lt;&lt; 7)</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_GET_MAX_PANEL_POWER_SEQUENCING		0x2d</div><div class='add'>+#define SDVO_CMD_GET_PANEL_POWER_SEQUENCING		0x2e</div><div class='add'>+#define SDVO_CMD_SET_PANEL_POWER_SEQUENCING		0x2f</div><div class='add'>+/**</div><div class='add'>+ * The panel power sequencing parameters are in units of milliseconds.</div><div class='add'>+ * The high fields are bits 8:9 of the 10-bit values.</div><div class='add'>+ */</div><div class='add'>+struct psb_sdvo_panel_power_sequencing {</div><div class='add'>+    u8 t0;</div><div class='add'>+    u8 t1;</div><div class='add'>+    u8 t2;</div><div class='add'>+    u8 t3;</div><div class='add'>+    u8 t4;</div><div class='add'>+</div><div class='add'>+    unsigned int t0_high:2;</div><div class='add'>+    unsigned int t1_high:2;</div><div class='add'>+    unsigned int t2_high:2;</div><div class='add'>+    unsigned int t3_high:2;</div><div class='add'>+</div><div class='add'>+    unsigned int t4_high:2;</div><div class='add'>+    unsigned int pad:6;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_GET_MAX_BACKLIGHT_LEVEL		0x30</div><div class='add'>+struct sdvo_max_backlight_reply {</div><div class='add'>+    u8 max_value;</div><div class='add'>+    u8 default_value;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_GET_BACKLIGHT_LEVEL			0x31</div><div class='add'>+#define SDVO_CMD_SET_BACKLIGHT_LEVEL			0x32</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_GET_AMBIENT_LIGHT			0x33</div><div class='add'>+struct sdvo_get_ambient_light_reply {</div><div class='add'>+    u16 trip_low;</div><div class='add'>+    u16 trip_high;</div><div class='add'>+    u16 value;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+#define SDVO_CMD_SET_AMBIENT_LIGHT			0x34</div><div class='add'>+struct sdvo_set_ambient_light_reply {</div><div class='add'>+    u16 trip_low;</div><div class='add'>+    u16 trip_high;</div><div class='add'>+    unsigned int enable:1;</div><div class='add'>+    unsigned int pad:7;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/* Set display power state */</div><div class='add'>+#define SDVO_CMD_SET_DISPLAY_POWER_STATE		0x7d</div><div class='add'>+# define SDVO_DISPLAY_STATE_ON				(1 &lt;&lt; 0)</div><div class='add'>+# define SDVO_DISPLAY_STATE_STANDBY			(1 &lt;&lt; 1)</div><div class='add'>+# define SDVO_DISPLAY_STATE_SUSPEND			(1 &lt;&lt; 2)</div><div class='add'>+# define SDVO_DISPLAY_STATE_OFF				(1 &lt;&lt; 3)</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_GET_SUPPORTED_ENHANCEMENTS		0x84</div><div class='add'>+struct psb_intel_sdvo_enhancements_reply {</div><div class='add'>+    unsigned int flicker_filter:1;</div><div class='add'>+    unsigned int flicker_filter_adaptive:1;</div><div class='add'>+    unsigned int flicker_filter_2d:1;</div><div class='add'>+    unsigned int saturation:1;</div><div class='add'>+    unsigned int hue:1;</div><div class='add'>+    unsigned int brightness:1;</div><div class='add'>+    unsigned int contrast:1;</div><div class='add'>+    unsigned int overscan_h:1;</div><div class='add'>+</div><div class='add'>+    unsigned int overscan_v:1;</div><div class='add'>+    unsigned int hpos:1;</div><div class='add'>+    unsigned int vpos:1;</div><div class='add'>+    unsigned int sharpness:1;</div><div class='add'>+    unsigned int dot_crawl:1;</div><div class='add'>+    unsigned int dither:1;</div><div class='add'>+    unsigned int tv_chroma_filter:1;</div><div class='add'>+    unsigned int tv_luma_filter:1;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/* Picture enhancement limits below are dependent on the current TV format,</div><div class='add'>+ * and thus need to be queried and set after it.</div><div class='add'>+ */</div><div class='add'>+#define SDVO_CMD_GET_MAX_FLICKER_FILTER			0x4d</div><div class='add'>+#define SDVO_CMD_GET_MAX_FLICKER_FILTER_ADAPTIVE	0x7b</div><div class='add'>+#define SDVO_CMD_GET_MAX_FLICKER_FILTER_2D		0x52</div><div class='add'>+#define SDVO_CMD_GET_MAX_SATURATION			0x55</div><div class='add'>+#define SDVO_CMD_GET_MAX_HUE				0x58</div><div class='add'>+#define SDVO_CMD_GET_MAX_BRIGHTNESS			0x5b</div><div class='add'>+#define SDVO_CMD_GET_MAX_CONTRAST			0x5e</div><div class='add'>+#define SDVO_CMD_GET_MAX_OVERSCAN_H			0x61</div><div class='add'>+#define SDVO_CMD_GET_MAX_OVERSCAN_V			0x64</div><div class='add'>+#define SDVO_CMD_GET_MAX_HPOS				0x67</div><div class='add'>+#define SDVO_CMD_GET_MAX_VPOS				0x6a</div><div class='add'>+#define SDVO_CMD_GET_MAX_SHARPNESS			0x6d</div><div class='add'>+#define SDVO_CMD_GET_MAX_TV_CHROMA_FILTER		0x74</div><div class='add'>+#define SDVO_CMD_GET_MAX_TV_LUMA_FILTER			0x77</div><div class='add'>+struct psb_intel_sdvo_enhancement_limits_reply {</div><div class='add'>+    u16 max_value;</div><div class='add'>+    u16 default_value;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_GET_LVDS_PANEL_INFORMATION		0x7f</div><div class='add'>+#define SDVO_CMD_SET_LVDS_PANEL_INFORMATION		0x80</div><div class='add'>+# define SDVO_LVDS_COLOR_DEPTH_18			(0 &lt;&lt; 0)</div><div class='add'>+# define SDVO_LVDS_COLOR_DEPTH_24			(1 &lt;&lt; 0)</div><div class='add'>+# define SDVO_LVDS_CONNECTOR_SPWG			(0 &lt;&lt; 2)</div><div class='add'>+# define SDVO_LVDS_CONNECTOR_OPENLDI			(1 &lt;&lt; 2)</div><div class='add'>+# define SDVO_LVDS_SINGLE_CHANNEL			(0 &lt;&lt; 4)</div><div class='add'>+# define SDVO_LVDS_DUAL_CHANNEL				(1 &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_GET_FLICKER_FILTER			0x4e</div><div class='add'>+#define SDVO_CMD_SET_FLICKER_FILTER			0x4f</div><div class='add'>+#define SDVO_CMD_GET_FLICKER_FILTER_ADAPTIVE		0x50</div><div class='add'>+#define SDVO_CMD_SET_FLICKER_FILTER_ADAPTIVE		0x51</div><div class='add'>+#define SDVO_CMD_GET_FLICKER_FILTER_2D			0x53</div><div class='add'>+#define SDVO_CMD_SET_FLICKER_FILTER_2D			0x54</div><div class='add'>+#define SDVO_CMD_GET_SATURATION				0x56</div><div class='add'>+#define SDVO_CMD_SET_SATURATION				0x57</div><div class='add'>+#define SDVO_CMD_GET_HUE				0x59</div><div class='add'>+#define SDVO_CMD_SET_HUE				0x5a</div><div class='add'>+#define SDVO_CMD_GET_BRIGHTNESS				0x5c</div><div class='add'>+#define SDVO_CMD_SET_BRIGHTNESS				0x5d</div><div class='add'>+#define SDVO_CMD_GET_CONTRAST				0x5f</div><div class='add'>+#define SDVO_CMD_SET_CONTRAST				0x60</div><div class='add'>+#define SDVO_CMD_GET_OVERSCAN_H				0x62</div><div class='add'>+#define SDVO_CMD_SET_OVERSCAN_H				0x63</div><div class='add'>+#define SDVO_CMD_GET_OVERSCAN_V				0x65</div><div class='add'>+#define SDVO_CMD_SET_OVERSCAN_V				0x66</div><div class='add'>+#define SDVO_CMD_GET_HPOS				0x68</div><div class='add'>+#define SDVO_CMD_SET_HPOS				0x69</div><div class='add'>+#define SDVO_CMD_GET_VPOS				0x6b</div><div class='add'>+#define SDVO_CMD_SET_VPOS				0x6c</div><div class='add'>+#define SDVO_CMD_GET_SHARPNESS				0x6e</div><div class='add'>+#define SDVO_CMD_SET_SHARPNESS				0x6f</div><div class='add'>+#define SDVO_CMD_GET_TV_CHROMA_FILTER			0x75</div><div class='add'>+#define SDVO_CMD_SET_TV_CHROMA_FILTER			0x76</div><div class='add'>+#define SDVO_CMD_GET_TV_LUMA_FILTER			0x78</div><div class='add'>+#define SDVO_CMD_SET_TV_LUMA_FILTER			0x79</div><div class='add'>+struct psb_intel_sdvo_enhancements_arg {</div><div class='add'>+    u16 value;</div><div class='add'>+}__attribute__((packed));</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_GET_DOT_CRAWL				0x70</div><div class='add'>+#define SDVO_CMD_SET_DOT_CRAWL				0x71</div><div class='add'>+# define SDVO_DOT_CRAWL_ON					(1 &lt;&lt; 0)</div><div class='add'>+# define SDVO_DOT_CRAWL_DEFAULT_ON				(1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_GET_DITHER				0x72</div><div class='add'>+#define SDVO_CMD_SET_DITHER				0x73</div><div class='add'>+# define SDVO_DITHER_ON						(1 &lt;&lt; 0)</div><div class='add'>+# define SDVO_DITHER_DEFAULT_ON					(1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+#define SDVO_CMD_SET_CONTROL_BUS_SWITCH			0x7a</div><div class='add'>+# define SDVO_CONTROL_BUS_PROM				(1 &lt;&lt; 0)</div><div class='add'>+# define SDVO_CONTROL_BUS_DDC1				(1 &lt;&lt; 1)</div><div class='add'>+# define SDVO_CONTROL_BUS_DDC2				(1 &lt;&lt; 2)</div><div class='add'>+# define SDVO_CONTROL_BUS_DDC3				(1 &lt;&lt; 3)</div><div class='add'>+</div><div class='add'>+/* HDMI op codes */</div><div class='add'>+#define SDVO_CMD_GET_SUPP_ENCODE	0x9d</div><div class='add'>+#define SDVO_CMD_GET_ENCODE		0x9e</div><div class='add'>+#define SDVO_CMD_SET_ENCODE		0x9f</div><div class='add'>+  #define SDVO_ENCODE_DVI	0x0</div><div class='add'>+  #define SDVO_ENCODE_HDMI	0x1</div><div class='add'>+#define SDVO_CMD_SET_PIXEL_REPLI	0x8b</div><div class='add'>+#define SDVO_CMD_GET_PIXEL_REPLI	0x8c</div><div class='add'>+#define SDVO_CMD_GET_COLORIMETRY_CAP	0x8d</div><div class='add'>+#define SDVO_CMD_SET_COLORIMETRY	0x8e</div><div class='add'>+  #define SDVO_COLORIMETRY_RGB256   0x0</div><div class='add'>+  #define SDVO_COLORIMETRY_RGB220   0x1</div><div class='add'>+  #define SDVO_COLORIMETRY_YCrCb422 0x3</div><div class='add'>+  #define SDVO_COLORIMETRY_YCrCb444 0x4</div><div class='add'>+#define SDVO_CMD_GET_COLORIMETRY	0x8f</div><div class='add'>+#define SDVO_CMD_GET_AUDIO_ENCRYPT_PREFER 0x90</div><div class='add'>+#define SDVO_CMD_SET_AUDIO_STAT		0x91</div><div class='add'>+#define SDVO_CMD_GET_AUDIO_STAT		0x92</div><div class='add'>+#define SDVO_CMD_SET_HBUF_INDEX		0x93</div><div class='add'>+#define SDVO_CMD_GET_HBUF_INDEX		0x94</div><div class='add'>+#define SDVO_CMD_GET_HBUF_INFO		0x95</div><div class='add'>+#define SDVO_CMD_SET_HBUF_AV_SPLIT	0x96</div><div class='add'>+#define SDVO_CMD_GET_HBUF_AV_SPLIT	0x97</div><div class='add'>+#define SDVO_CMD_SET_HBUF_DATA		0x98</div><div class='add'>+#define SDVO_CMD_GET_HBUF_DATA		0x99</div><div class='add'>+#define SDVO_CMD_SET_HBUF_TXRATE	0x9a</div><div class='add'>+#define SDVO_CMD_GET_HBUF_TXRATE	0x9b</div><div class='add'>+  #define SDVO_HBUF_TX_DISABLED	(0 &lt;&lt; 6)</div><div class='add'>+  #define SDVO_HBUF_TX_ONCE	(2 &lt;&lt; 6)</div><div class='add'>+  #define SDVO_HBUF_TX_VSYNC	(3 &lt;&lt; 6)</div><div class='add'>+#define SDVO_CMD_GET_AUDIO_TX_INFO	0x9c</div><div class='add'>+#define SDVO_NEED_TO_STALL  (1 &lt;&lt; 7)</div><div class='add'>+</div><div class='add'>+struct psb_intel_sdvo_encode {</div><div class='add'>+    u8 dvi_rev;</div><div class='add'>+    u8 hdmi_rev;</div><div class='add'>+} __attribute__ ((packed));</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/psb_irq.c b/drivers/gpu/drm/gma500/psb_irq.c<br/>new file mode 100644<br/>index 000000000000..7be802baceb5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/psb_irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/psb_irq.c</a></div><div class='hunk'>@@ -0,0 +1,564 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ * Copyright (c) 2007, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ * Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to</div><div class='add'>+ * develop this driver.</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_reg.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include "power.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * inline functions</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+psb_pipestat(int pipe)</div><div class='add'>+{</div><div class='add'>+	if (pipe == 0)</div><div class='add'>+		return PIPEASTAT;</div><div class='add'>+	if (pipe == 1)</div><div class='add'>+		return PIPEBSTAT;</div><div class='add'>+	if (pipe == 2)</div><div class='add'>+		return PIPECSTAT;</div><div class='add'>+	BUG();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+mid_pipe_event(int pipe)</div><div class='add'>+{</div><div class='add'>+	if (pipe == 0)</div><div class='add'>+		return _PSB_PIPEA_EVENT_FLAG;</div><div class='add'>+	if (pipe == 1)</div><div class='add'>+		return _MDFLD_PIPEB_EVENT_FLAG;</div><div class='add'>+	if (pipe == 2)</div><div class='add'>+		return _MDFLD_PIPEC_EVENT_FLAG;</div><div class='add'>+	BUG();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+mid_pipe_vsync(int pipe)</div><div class='add'>+{</div><div class='add'>+	if (pipe == 0)</div><div class='add'>+		return _PSB_VSYNC_PIPEA_FLAG;</div><div class='add'>+	if (pipe == 1)</div><div class='add'>+		return _PSB_VSYNC_PIPEB_FLAG;</div><div class='add'>+	if (pipe == 2)</div><div class='add'>+		return _MDFLD_PIPEC_VBLANK_FLAG;</div><div class='add'>+	BUG();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+mid_pipeconf(int pipe)</div><div class='add'>+{</div><div class='add'>+	if (pipe == 0)</div><div class='add'>+		return PIPEACONF;</div><div class='add'>+	if (pipe == 1)</div><div class='add'>+		return PIPEBCONF;</div><div class='add'>+	if (pipe == 2)</div><div class='add'>+		return PIPECCONF;</div><div class='add'>+	BUG();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+psb_enable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask)</div><div class='add'>+{</div><div class='add'>+	if ((dev_priv-&gt;pipestat[pipe] &amp; mask) != mask) {</div><div class='add'>+		u32 reg = psb_pipestat(pipe);</div><div class='add'>+		dev_priv-&gt;pipestat[pipe] |= mask;</div><div class='add'>+		/* Enable the interrupt, clear any pending status */</div><div class='add'>+		if (gma_power_begin(dev_priv-&gt;dev, false)) {</div><div class='add'>+			u32 writeVal = PSB_RVDC32(reg);</div><div class='add'>+			writeVal |= (mask | (mask &gt;&gt; 16));</div><div class='add'>+			PSB_WVDC32(writeVal, reg);</div><div class='add'>+			(void) PSB_RVDC32(reg);</div><div class='add'>+			gma_power_end(dev_priv-&gt;dev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+psb_disable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask)</div><div class='add'>+{</div><div class='add'>+	if ((dev_priv-&gt;pipestat[pipe] &amp; mask) != 0) {</div><div class='add'>+		u32 reg = psb_pipestat(pipe);</div><div class='add'>+		dev_priv-&gt;pipestat[pipe] &amp;= ~mask;</div><div class='add'>+		if (gma_power_begin(dev_priv-&gt;dev, false)) {</div><div class='add'>+			u32 writeVal = PSB_RVDC32(reg);</div><div class='add'>+			writeVal &amp;= ~mask;</div><div class='add'>+			PSB_WVDC32(writeVal, reg);</div><div class='add'>+			(void) PSB_RVDC32(reg);</div><div class='add'>+			gma_power_end(dev_priv-&gt;dev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mid_enable_pipe_event(struct drm_psb_private *dev_priv, int pipe)</div><div class='add'>+{</div><div class='add'>+	if (gma_power_begin(dev_priv-&gt;dev, false)) {</div><div class='add'>+		u32 pipe_event = mid_pipe_event(pipe);</div><div class='add'>+		dev_priv-&gt;vdc_irq_mask |= pipe_event;</div><div class='add'>+		PSB_WVDC32(~dev_priv-&gt;vdc_irq_mask, PSB_INT_MASK_R);</div><div class='add'>+		PSB_WVDC32(dev_priv-&gt;vdc_irq_mask, PSB_INT_ENABLE_R);</div><div class='add'>+		gma_power_end(dev_priv-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mid_disable_pipe_event(struct drm_psb_private *dev_priv, int pipe)</div><div class='add'>+{</div><div class='add'>+	if (dev_priv-&gt;pipestat[pipe] == 0) {</div><div class='add'>+		if (gma_power_begin(dev_priv-&gt;dev, false)) {</div><div class='add'>+			u32 pipe_event = mid_pipe_event(pipe);</div><div class='add'>+			dev_priv-&gt;vdc_irq_mask &amp;= ~pipe_event;</div><div class='add'>+			PSB_WVDC32(~dev_priv-&gt;vdc_irq_mask, PSB_INT_MASK_R);</div><div class='add'>+			PSB_WVDC32(dev_priv-&gt;vdc_irq_mask, PSB_INT_ENABLE_R);</div><div class='add'>+			gma_power_end(dev_priv-&gt;dev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Display controller interrupt handler for pipe event.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void mid_pipe_event_handler(struct drm_device *dev, int pipe)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv =</div><div class='add'>+	    (struct drm_psb_private *) dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	uint32_t pipe_stat_val = 0;</div><div class='add'>+	uint32_t pipe_stat_reg = psb_pipestat(pipe);</div><div class='add'>+	uint32_t pipe_enable = dev_priv-&gt;pipestat[pipe];</div><div class='add'>+	uint32_t pipe_status = dev_priv-&gt;pipestat[pipe] &gt;&gt; 16;</div><div class='add'>+	uint32_t pipe_clear;</div><div class='add'>+	uint32_t i = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;dev_priv-&gt;irqmask_lock);</div><div class='add'>+</div><div class='add'>+	pipe_stat_val = PSB_RVDC32(pipe_stat_reg);</div><div class='add'>+	pipe_stat_val &amp;= pipe_enable | pipe_status;</div><div class='add'>+	pipe_stat_val &amp;= pipe_stat_val &gt;&gt; 16;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;dev_priv-&gt;irqmask_lock);</div><div class='add'>+</div><div class='add'>+	/* Clear the 2nd level interrupt status bits</div><div class='add'>+	 * Sometimes the bits are very sticky so we repeat until they unstick */</div><div class='add'>+	for (i = 0; i &lt; 0xffff; i++) {</div><div class='add'>+		PSB_WVDC32(PSB_RVDC32(pipe_stat_reg), pipe_stat_reg);</div><div class='add'>+		pipe_clear = PSB_RVDC32(pipe_stat_reg) &amp; pipe_status;</div><div class='add'>+</div><div class='add'>+		if (pipe_clear == 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pipe_clear)</div><div class='add'>+		dev_err(dev-&gt;dev,</div><div class='add'>+		"%s, can't clear status bits for pipe %d, its value = 0x%x.\n",</div><div class='add'>+		__func__, pipe, PSB_RVDC32(pipe_stat_reg));</div><div class='add'>+</div><div class='add'>+	if (pipe_stat_val &amp; PIPE_VBLANK_STATUS)</div><div class='add'>+		drm_handle_vblank(dev, pipe);</div><div class='add'>+</div><div class='add'>+	if (pipe_stat_val &amp; PIPE_TE_STATUS)</div><div class='add'>+		drm_handle_vblank(dev, pipe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Display controller interrupt handler.</div><div class='add'>+ */</div><div class='add'>+static void psb_vdc_interrupt(struct drm_device *dev, uint32_t vdc_stat)</div><div class='add'>+{</div><div class='add'>+	if (vdc_stat &amp; _PSB_VSYNC_PIPEA_FLAG)</div><div class='add'>+		mid_pipe_event_handler(dev, 0);</div><div class='add'>+</div><div class='add'>+	if (vdc_stat &amp; _PSB_VSYNC_PIPEB_FLAG)</div><div class='add'>+		mid_pipe_event_handler(dev, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+irqreturn_t psb_irq_handler(DRM_IRQ_ARGS)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = (struct drm_device *) arg;</div><div class='add'>+	struct drm_psb_private *dev_priv =</div><div class='add'>+	    (struct drm_psb_private *) dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	uint32_t vdc_stat, dsp_int = 0, sgx_int = 0;</div><div class='add'>+	int handled = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;dev_priv-&gt;irqmask_lock);</div><div class='add'>+</div><div class='add'>+	vdc_stat = PSB_RVDC32(PSB_INT_IDENTITY_R);</div><div class='add'>+</div><div class='add'>+	if (vdc_stat &amp; _PSB_PIPE_EVENT_FLAG)</div><div class='add'>+		dsp_int = 1;</div><div class='add'>+</div><div class='add'>+	/* FIXME: Handle Medfield</div><div class='add'>+	if (vdc_stat &amp; _MDFLD_DISP_ALL_IRQ_FLAG)</div><div class='add'>+		dsp_int = 1;</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	if (vdc_stat &amp; _PSB_IRQ_SGX_FLAG)</div><div class='add'>+		sgx_int = 1;</div><div class='add'>+</div><div class='add'>+	vdc_stat &amp;= dev_priv-&gt;vdc_irq_mask;</div><div class='add'>+	spin_unlock(&amp;dev_priv-&gt;irqmask_lock);</div><div class='add'>+</div><div class='add'>+	if (dsp_int &amp;&amp; gma_power_is_on(dev)) {</div><div class='add'>+		psb_vdc_interrupt(dev, vdc_stat);</div><div class='add'>+		handled = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sgx_int) {</div><div class='add'>+		/* Not expected - we have it masked, shut it up */</div><div class='add'>+		u32 s, s2;</div><div class='add'>+		s = PSB_RSGX32(PSB_CR_EVENT_STATUS);</div><div class='add'>+		s2 = PSB_RSGX32(PSB_CR_EVENT_STATUS2);</div><div class='add'>+		PSB_WSGX32(s, PSB_CR_EVENT_HOST_CLEAR);</div><div class='add'>+		PSB_WSGX32(s2, PSB_CR_EVENT_HOST_CLEAR2);</div><div class='add'>+		/* if s &amp; _PSB_CE_TWOD_COMPLETE we have 2D done but</div><div class='add'>+		   we may as well poll even if we add that ! */</div><div class='add'>+		handled = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	PSB_WVDC32(vdc_stat, PSB_INT_IDENTITY_R);</div><div class='add'>+	(void) PSB_RVDC32(PSB_INT_IDENTITY_R);</div><div class='add'>+	DRM_READMEMORYBARRIER();</div><div class='add'>+</div><div class='add'>+	if (!handled)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_irq_preinstall(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv =</div><div class='add'>+	    (struct drm_psb_private *) dev-&gt;dev_private;</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dev_priv-&gt;irqmask_lock, irqflags);</div><div class='add'>+</div><div class='add'>+	if (gma_power_is_on(dev))</div><div class='add'>+		PSB_WVDC32(0xFFFFFFFF, PSB_HWSTAM);</div><div class='add'>+	if (dev-&gt;vblank_enabled[0])</div><div class='add'>+		dev_priv-&gt;vdc_irq_mask |= _PSB_VSYNC_PIPEA_FLAG;</div><div class='add'>+	if (dev-&gt;vblank_enabled[1])</div><div class='add'>+		dev_priv-&gt;vdc_irq_mask |= _PSB_VSYNC_PIPEB_FLAG;</div><div class='add'>+</div><div class='add'>+	/* FIXME: Handle Medfield irq mask</div><div class='add'>+	if (dev-&gt;vblank_enabled[1])</div><div class='add'>+		dev_priv-&gt;vdc_irq_mask |= _MDFLD_PIPEB_EVENT_FLAG;</div><div class='add'>+	if (dev-&gt;vblank_enabled[2])</div><div class='add'>+		dev_priv-&gt;vdc_irq_mask |= _MDFLD_PIPEC_EVENT_FLAG;</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	/* This register is safe even if display island is off */</div><div class='add'>+	PSB_WVDC32(~dev_priv-&gt;vdc_irq_mask, PSB_INT_MASK_R);</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev_priv-&gt;irqmask_lock, irqflags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_irq_postinstall(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv =</div><div class='add'>+	    (struct drm_psb_private *) dev-&gt;dev_private;</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dev_priv-&gt;irqmask_lock, irqflags);</div><div class='add'>+</div><div class='add'>+	/* This register is safe even if display island is off */</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;vdc_irq_mask, PSB_INT_ENABLE_R);</div><div class='add'>+	PSB_WVDC32(0xFFFFFFFF, PSB_HWSTAM);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;vblank_enabled[0])</div><div class='add'>+		psb_enable_pipestat(dev_priv, 0, PIPE_VBLANK_INTERRUPT_ENABLE);</div><div class='add'>+	else</div><div class='add'>+		psb_disable_pipestat(dev_priv, 0, PIPE_VBLANK_INTERRUPT_ENABLE);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;vblank_enabled[1])</div><div class='add'>+		psb_enable_pipestat(dev_priv, 1, PIPE_VBLANK_INTERRUPT_ENABLE);</div><div class='add'>+	else</div><div class='add'>+		psb_disable_pipestat(dev_priv, 1, PIPE_VBLANK_INTERRUPT_ENABLE);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;vblank_enabled[2])</div><div class='add'>+		psb_enable_pipestat(dev_priv, 2, PIPE_VBLANK_INTERRUPT_ENABLE);</div><div class='add'>+	else</div><div class='add'>+		psb_disable_pipestat(dev_priv, 2, PIPE_VBLANK_INTERRUPT_ENABLE);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev_priv-&gt;irqmask_lock, irqflags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_irq_uninstall(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv =</div><div class='add'>+	    (struct drm_psb_private *) dev-&gt;dev_private;</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dev_priv-&gt;irqmask_lock, irqflags);</div><div class='add'>+</div><div class='add'>+	PSB_WVDC32(0xFFFFFFFF, PSB_HWSTAM);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;vblank_enabled[0])</div><div class='add'>+		psb_disable_pipestat(dev_priv, 0, PIPE_VBLANK_INTERRUPT_ENABLE);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;vblank_enabled[1])</div><div class='add'>+		psb_disable_pipestat(dev_priv, 1, PIPE_VBLANK_INTERRUPT_ENABLE);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;vblank_enabled[2])</div><div class='add'>+		psb_disable_pipestat(dev_priv, 2, PIPE_VBLANK_INTERRUPT_ENABLE);</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;vdc_irq_mask &amp;= _PSB_IRQ_SGX_FLAG |</div><div class='add'>+				  _PSB_IRQ_MSVDX_FLAG |</div><div class='add'>+				  _LNC_IRQ_TOPAZ_FLAG;</div><div class='add'>+</div><div class='add'>+	/* These two registers are safe even if display island is off */</div><div class='add'>+	PSB_WVDC32(~dev_priv-&gt;vdc_irq_mask, PSB_INT_MASK_R);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;vdc_irq_mask, PSB_INT_ENABLE_R);</div><div class='add'>+</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	/* This register is safe even if display island is off */</div><div class='add'>+	PSB_WVDC32(PSB_RVDC32(PSB_INT_IDENTITY_R), PSB_INT_IDENTITY_R);</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev_priv-&gt;irqmask_lock, irqflags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_irq_turn_on_dpst(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv =</div><div class='add'>+		(struct drm_psb_private *) dev-&gt;dev_private;</div><div class='add'>+	u32 hist_reg;</div><div class='add'>+	u32 pwm_reg;</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		PSB_WVDC32(1 &lt;&lt; 31, HISTOGRAM_LOGIC_CONTROL);</div><div class='add'>+		hist_reg = PSB_RVDC32(HISTOGRAM_LOGIC_CONTROL);</div><div class='add'>+		PSB_WVDC32(1 &lt;&lt; 31, HISTOGRAM_INT_CONTROL);</div><div class='add'>+		hist_reg = PSB_RVDC32(HISTOGRAM_INT_CONTROL);</div><div class='add'>+</div><div class='add'>+		PSB_WVDC32(0x80010100, PWM_CONTROL_LOGIC);</div><div class='add'>+		pwm_reg = PSB_RVDC32(PWM_CONTROL_LOGIC);</div><div class='add'>+		PSB_WVDC32(pwm_reg | PWM_PHASEIN_ENABLE</div><div class='add'>+						| PWM_PHASEIN_INT_ENABLE,</div><div class='add'>+							   PWM_CONTROL_LOGIC);</div><div class='add'>+		pwm_reg = PSB_RVDC32(PWM_CONTROL_LOGIC);</div><div class='add'>+</div><div class='add'>+		psb_enable_pipestat(dev_priv, 0, PIPE_DPST_EVENT_ENABLE);</div><div class='add'>+</div><div class='add'>+		hist_reg = PSB_RVDC32(HISTOGRAM_INT_CONTROL);</div><div class='add'>+		PSB_WVDC32(hist_reg | HISTOGRAM_INT_CTRL_CLEAR,</div><div class='add'>+							HISTOGRAM_INT_CONTROL);</div><div class='add'>+		pwm_reg = PSB_RVDC32(PWM_CONTROL_LOGIC);</div><div class='add'>+		PSB_WVDC32(pwm_reg | 0x80010100 | PWM_PHASEIN_ENABLE,</div><div class='add'>+							PWM_CONTROL_LOGIC);</div><div class='add'>+</div><div class='add'>+		gma_power_end(dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_irq_enable_dpst(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv =</div><div class='add'>+		(struct drm_psb_private *) dev-&gt;dev_private;</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dev_priv-&gt;irqmask_lock, irqflags);</div><div class='add'>+</div><div class='add'>+	/* enable DPST */</div><div class='add'>+	mid_enable_pipe_event(dev_priv, 0);</div><div class='add'>+	psb_irq_turn_on_dpst(dev);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev_priv-&gt;irqmask_lock, irqflags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_irq_turn_off_dpst(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv =</div><div class='add'>+	    (struct drm_psb_private *) dev-&gt;dev_private;</div><div class='add'>+	u32 hist_reg;</div><div class='add'>+	u32 pwm_reg;</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		PSB_WVDC32(0x00000000, HISTOGRAM_INT_CONTROL);</div><div class='add'>+		hist_reg = PSB_RVDC32(HISTOGRAM_INT_CONTROL);</div><div class='add'>+</div><div class='add'>+		psb_disable_pipestat(dev_priv, 0, PIPE_DPST_EVENT_ENABLE);</div><div class='add'>+</div><div class='add'>+		pwm_reg = PSB_RVDC32(PWM_CONTROL_LOGIC);</div><div class='add'>+		PSB_WVDC32(pwm_reg &amp; !(PWM_PHASEIN_INT_ENABLE),</div><div class='add'>+							PWM_CONTROL_LOGIC);</div><div class='add'>+		pwm_reg = PSB_RVDC32(PWM_CONTROL_LOGIC);</div><div class='add'>+</div><div class='add'>+		gma_power_end(dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int psb_irq_disable_dpst(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv =</div><div class='add'>+	    (struct drm_psb_private *) dev-&gt;dev_private;</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dev_priv-&gt;irqmask_lock, irqflags);</div><div class='add'>+</div><div class='add'>+	mid_disable_pipe_event(dev_priv, 0);</div><div class='add'>+	psb_irq_turn_off_dpst(dev);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev_priv-&gt;irqmask_lock, irqflags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef PSB_FIXME</div><div class='add'>+static int psb_vblank_do_wait(struct drm_device *dev,</div><div class='add'>+			      unsigned int *sequence, atomic_t *counter)</div><div class='add'>+{</div><div class='add'>+	unsigned int cur_vblank;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	DRM_WAIT_ON(ret, dev-&gt;vbl_queue, 3 * DRM_HZ,</div><div class='add'>+		    (((cur_vblank = atomic_read(counter))</div><div class='add'>+		      - *sequence) &lt;= (1 &lt;&lt; 23)));</div><div class='add'>+	*sequence = cur_vblank;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * It is used to enable VBLANK interrupt</div><div class='add'>+ */</div><div class='add'>+int psb_enable_vblank(struct drm_device *dev, int pipe)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+	uint32_t reg_val = 0;</div><div class='add'>+	uint32_t pipeconf_reg = mid_pipeconf(pipe);</div><div class='add'>+</div><div class='add'>+	if (gma_power_begin(dev, false)) {</div><div class='add'>+		reg_val = REG_READ(pipeconf_reg);</div><div class='add'>+		gma_power_end(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(reg_val &amp; PIPEACONF_ENABLE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dev_priv-&gt;irqmask_lock, irqflags);</div><div class='add'>+</div><div class='add'>+	if (pipe == 0)</div><div class='add'>+		dev_priv-&gt;vdc_irq_mask |= _PSB_VSYNC_PIPEA_FLAG;</div><div class='add'>+	else if (pipe == 1)</div><div class='add'>+		dev_priv-&gt;vdc_irq_mask |= _PSB_VSYNC_PIPEB_FLAG;</div><div class='add'>+</div><div class='add'>+	PSB_WVDC32(~dev_priv-&gt;vdc_irq_mask, PSB_INT_MASK_R);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;vdc_irq_mask, PSB_INT_ENABLE_R);</div><div class='add'>+	psb_enable_pipestat(dev_priv, pipe, PIPE_VBLANK_INTERRUPT_ENABLE);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev_priv-&gt;irqmask_lock, irqflags);</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'>+ * It is used to disable VBLANK interrupt</div><div class='add'>+ */</div><div class='add'>+void psb_disable_vblank(struct drm_device *dev, int pipe)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dev_priv-&gt;irqmask_lock, irqflags);</div><div class='add'>+</div><div class='add'>+	if (pipe == 0)</div><div class='add'>+		dev_priv-&gt;vdc_irq_mask &amp;= ~_PSB_VSYNC_PIPEA_FLAG;</div><div class='add'>+	else if (pipe == 1)</div><div class='add'>+		dev_priv-&gt;vdc_irq_mask &amp;= ~_PSB_VSYNC_PIPEB_FLAG;</div><div class='add'>+</div><div class='add'>+	PSB_WVDC32(~dev_priv-&gt;vdc_irq_mask, PSB_INT_MASK_R);</div><div class='add'>+	PSB_WVDC32(dev_priv-&gt;vdc_irq_mask, PSB_INT_ENABLE_R);</div><div class='add'>+	psb_disable_pipestat(dev_priv, pipe, PIPE_VBLANK_INTERRUPT_ENABLE);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev_priv-&gt;irqmask_lock, irqflags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called from drm generic code, passed a 'crtc', which</div><div class='add'>+ * we use as a pipe index</div><div class='add'>+ */</div><div class='add'>+u32 psb_get_vblank_counter(struct drm_device *dev, int pipe)</div><div class='add'>+{</div><div class='add'>+	uint32_t high_frame = PIPEAFRAMEHIGH;</div><div class='add'>+	uint32_t low_frame = PIPEAFRAMEPIXEL;</div><div class='add'>+	uint32_t pipeconf_reg = PIPEACONF;</div><div class='add'>+	uint32_t reg_val = 0;</div><div class='add'>+	uint32_t high1 = 0, high2 = 0, low = 0, count = 0;</div><div class='add'>+</div><div class='add'>+	switch (pipe) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		high_frame = PIPEBFRAMEHIGH;</div><div class='add'>+		low_frame = PIPEBFRAMEPIXEL;</div><div class='add'>+		pipeconf_reg = PIPEBCONF;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		high_frame = PIPECFRAMEHIGH;</div><div class='add'>+		low_frame = PIPECFRAMEPIXEL;</div><div class='add'>+		pipeconf_reg = PIPECCONF;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev-&gt;dev, "%s, invalid pipe.\n", __func__);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!gma_power_begin(dev, false))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	reg_val = REG_READ(pipeconf_reg);</div><div class='add'>+</div><div class='add'>+	if (!(reg_val &amp; PIPEACONF_ENABLE)) {</div><div class='add'>+		dev_err(dev-&gt;dev, "trying to get vblank count for disabled pipe %d\n",</div><div class='add'>+								pipe);</div><div class='add'>+		goto psb_get_vblank_counter_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * High &amp; low register fields aren't synchronized, so make sure</div><div class='add'>+	 * we get a low value that's stable across two reads of the high</div><div class='add'>+	 * register.</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		high1 = ((REG_READ(high_frame) &amp; PIPE_FRAME_HIGH_MASK) &gt;&gt;</div><div class='add'>+			 PIPE_FRAME_HIGH_SHIFT);</div><div class='add'>+		low =  ((REG_READ(low_frame) &amp; PIPE_FRAME_LOW_MASK) &gt;&gt;</div><div class='add'>+			PIPE_FRAME_LOW_SHIFT);</div><div class='add'>+		high2 = ((REG_READ(high_frame) &amp; PIPE_FRAME_HIGH_MASK) &gt;&gt;</div><div class='add'>+			 PIPE_FRAME_HIGH_SHIFT);</div><div class='add'>+	} while (high1 != high2);</div><div class='add'>+</div><div class='add'>+	count = (high1 &lt;&lt; 8) | low;</div><div class='add'>+</div><div class='add'>+psb_get_vblank_counter_exit:</div><div class='add'>+</div><div class='add'>+	gma_power_end(dev);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/psb_irq.h b/drivers/gpu/drm/gma500/psb_irq.h<br/>new file mode 100644<br/>index 000000000000..216fda38b57d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/psb_irq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/psb_irq.h</a></div><div class='hunk'>@@ -0,0 +1,45 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ * Copyright (c) 2009-2011, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *    Benjamin Defnet &lt;benjamin.r.defnet@intel.com&gt;</div><div class='add'>+ *    Rajesh Poornachandran &lt;rajesh.poornachandran@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef _SYSIRQ_H_</div><div class='add'>+#define _SYSIRQ_H_</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+</div><div class='add'>+bool sysirq_init(struct drm_device *dev);</div><div class='add'>+void sysirq_uninit(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+void psb_irq_preinstall(struct drm_device *dev);</div><div class='add'>+int  psb_irq_postinstall(struct drm_device *dev);</div><div class='add'>+void psb_irq_uninstall(struct drm_device *dev);</div><div class='add'>+irqreturn_t psb_irq_handler(DRM_IRQ_ARGS);</div><div class='add'>+</div><div class='add'>+int psb_irq_enable_dpst(struct drm_device *dev);</div><div class='add'>+int psb_irq_disable_dpst(struct drm_device *dev);</div><div class='add'>+void psb_irq_turn_on_dpst(struct drm_device *dev);</div><div class='add'>+void psb_irq_turn_off_dpst(struct drm_device *dev);</div><div class='add'>+int  psb_enable_vblank(struct drm_device *dev, int pipe);</div><div class='add'>+void psb_disable_vblank(struct drm_device *dev, int pipe);</div><div class='add'>+u32  psb_get_vblank_counter(struct drm_device *dev, int pipe);</div><div class='add'>+</div><div class='add'>+#endif /* _SYSIRQ_H_ */</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/psb_lid.c b/drivers/gpu/drm/gma500/psb_lid.c<br/>new file mode 100644<br/>index 000000000000..b867aabe6bf3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/psb_lid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/psb_lid.c</a></div><div class='hunk'>@@ -0,0 +1,88 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ * Copyright (c) 2007, Intel Corporation.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+ *</div><div class='add'>+ * Authors: Thomas Hellstrom &lt;thomas-at-tungstengraphics-dot-com&gt;</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drmP.h&gt;</div><div class='add'>+#include "psb_drv.h"</div><div class='add'>+#include "psb_reg.h"</div><div class='add'>+#include "psb_intel_reg.h"</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+</div><div class='add'>+static void psb_lid_timer_func(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct drm_psb_private * dev_priv = (struct drm_psb_private *)data;</div><div class='add'>+	struct drm_device *dev = (struct drm_device *)dev_priv-&gt;dev;</div><div class='add'>+	struct timer_list *lid_timer = &amp;dev_priv-&gt;lid_timer;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	u32 *lid_state = dev_priv-&gt;lid_state;</div><div class='add'>+	u32 pp_status;</div><div class='add'>+</div><div class='add'>+	if (readl(lid_state) == dev_priv-&gt;lid_last_state)</div><div class='add'>+		goto lid_timer_schedule;</div><div class='add'>+</div><div class='add'>+	if ((readl(lid_state)) &amp; 0x01) {</div><div class='add'>+		/*lid state is open*/</div><div class='add'>+		REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) | POWER_TARGET_ON);</div><div class='add'>+		do {</div><div class='add'>+			pp_status = REG_READ(PP_STATUS);</div><div class='add'>+		} while ((pp_status &amp; PP_ON) == 0);</div><div class='add'>+</div><div class='add'>+		/*FIXME: should be backlight level before*/</div><div class='add'>+		psb_intel_lvds_set_brightness(dev, 100);</div><div class='add'>+	} else {</div><div class='add'>+		psb_intel_lvds_set_brightness(dev, 0);</div><div class='add'>+</div><div class='add'>+		REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) &amp; ~POWER_TARGET_ON);</div><div class='add'>+		do {</div><div class='add'>+			pp_status = REG_READ(PP_STATUS);</div><div class='add'>+		} while ((pp_status &amp; PP_ON) == 0);</div><div class='add'>+	}</div><div class='add'>+	dev_priv-&gt;lid_last_state =  readl(lid_state);</div><div class='add'>+</div><div class='add'>+lid_timer_schedule:</div><div class='add'>+	spin_lock_irqsave(&amp;dev_priv-&gt;lid_lock, irq_flags);</div><div class='add'>+	if (!timer_pending(lid_timer)) {</div><div class='add'>+		lid_timer-&gt;expires = jiffies + PSB_LID_DELAY;</div><div class='add'>+		add_timer(lid_timer);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev_priv-&gt;lid_lock, irq_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_lid_timer_init(struct drm_psb_private *dev_priv)</div><div class='add'>+{</div><div class='add'>+	struct timer_list *lid_timer = &amp;dev_priv-&gt;lid_timer;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;dev_priv-&gt;lid_lock);</div><div class='add'>+	spin_lock_irqsave(&amp;dev_priv-&gt;lid_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+	init_timer(lid_timer);</div><div class='add'>+</div><div class='add'>+	lid_timer-&gt;data = (unsigned long)dev_priv;</div><div class='add'>+	lid_timer-&gt;function = psb_lid_timer_func;</div><div class='add'>+	lid_timer-&gt;expires = jiffies + PSB_LID_DELAY;</div><div class='add'>+</div><div class='add'>+	add_timer(lid_timer);</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev_priv-&gt;lid_lock, irq_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void psb_lid_timer_takedown(struct drm_psb_private *dev_priv)</div><div class='add'>+{</div><div class='add'>+	del_timer_sync(&amp;dev_priv-&gt;lid_timer);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/gpu/drm/gma500/psb_reg.h b/drivers/gpu/drm/gma500/psb_reg.h<br/>new file mode 100644<br/>index 000000000000..b81c7c1e9c2d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/gma500/psb_reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/gma500/psb_reg.h</a></div><div class='hunk'>@@ -0,0 +1,582 @@</div><div class='add'>+/**************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) (2005-2007) Imagination Technologies Limited.</div><div class='add'>+ * Copyright (c) 2007, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA..</div><div class='add'>+ *</div><div class='add'>+ **************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef _PSB_REG_H_</div><div class='add'>+#define _PSB_REG_H_</div><div class='add'>+</div><div class='add'>+#define PSB_CR_CLKGATECTL		0x0000</div><div class='add'>+#define _PSB_C_CLKGATECTL_AUTO_MAN_REG		(1 &lt;&lt; 24)</div><div class='add'>+#define _PSB_C_CLKGATECTL_USE_CLKG_SHIFT	(20)</div><div class='add'>+#define _PSB_C_CLKGATECTL_USE_CLKG_MASK		(0x3 &lt;&lt; 20)</div><div class='add'>+#define _PSB_C_CLKGATECTL_DPM_CLKG_SHIFT	(16)</div><div class='add'>+#define _PSB_C_CLKGATECTL_DPM_CLKG_MASK		(0x3 &lt;&lt; 16)</div><div class='add'>+#define _PSB_C_CLKGATECTL_TA_CLKG_SHIFT		(12)</div><div class='add'>+#define _PSB_C_CLKGATECTL_TA_CLKG_MASK		(0x3 &lt;&lt; 12)</div><div class='add'>+#define _PSB_C_CLKGATECTL_TSP_CLKG_SHIFT	(8)</div><div class='add'>+#define _PSB_C_CLKGATECTL_TSP_CLKG_MASK		(0x3 &lt;&lt; 8)</div><div class='add'>+#define _PSB_C_CLKGATECTL_ISP_CLKG_SHIFT	(4)</div><div class='add'>+#define _PSB_C_CLKGATECTL_ISP_CLKG_MASK		(0x3 &lt;&lt; 4)</div><div class='add'>+#define _PSB_C_CLKGATECTL_2D_CLKG_SHIFT		(0)</div><div class='add'>+#define _PSB_C_CLKGATECTL_2D_CLKG_MASK		(0x3 &lt;&lt; 0)</div><div class='add'>+#define _PSB_C_CLKGATECTL_CLKG_ENABLED		(0)</div><div class='add'>+#define _PSB_C_CLKGATECTL_CLKG_DISABLED		(1)</div><div class='add'>+#define _PSB_C_CLKGATECTL_CLKG_AUTO		(2)</div><div class='add'>+</div><div class='add'>+#define PSB_CR_CORE_ID			0x0010</div><div class='add'>+#define _PSB_CC_ID_ID_SHIFT			(16)</div><div class='add'>+#define _PSB_CC_ID_ID_MASK			(0xFFFF &lt;&lt; 16)</div><div class='add'>+#define _PSB_CC_ID_CONFIG_SHIFT			(0)</div><div class='add'>+#define _PSB_CC_ID_CONFIG_MASK			(0xFFFF &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define PSB_CR_CORE_REVISION		0x0014</div><div class='add'>+#define _PSB_CC_REVISION_DESIGNER_SHIFT		(24)</div><div class='add'>+#define _PSB_CC_REVISION_DESIGNER_MASK		(0xFF &lt;&lt; 24)</div><div class='add'>+#define _PSB_CC_REVISION_MAJOR_SHIFT		(16)</div><div class='add'>+#define _PSB_CC_REVISION_MAJOR_MASK		(0xFF &lt;&lt; 16)</div><div class='add'>+#define _PSB_CC_REVISION_MINOR_SHIFT		(8)</div><div class='add'>+#define _PSB_CC_REVISION_MINOR_MASK		(0xFF &lt;&lt; 8)</div><div class='add'>+#define _PSB_CC_REVISION_MAINTENANCE_SHIFT	(0)</div><div class='add'>+#define _PSB_CC_REVISION_MAINTENANCE_MASK	(0xFF &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define PSB_CR_DESIGNER_REV_FIELD1	0x0018</div><div class='add'>+</div><div class='add'>+#define PSB_CR_SOFT_RESET		0x0080</div><div class='add'>+#define _PSB_CS_RESET_TSP_RESET		(1 &lt;&lt; 6)</div><div class='add'>+#define _PSB_CS_RESET_ISP_RESET		(1 &lt;&lt; 5)</div><div class='add'>+#define _PSB_CS_RESET_USE_RESET		(1 &lt;&lt; 4)</div><div class='add'>+#define _PSB_CS_RESET_TA_RESET		(1 &lt;&lt; 3)</div><div class='add'>+#define _PSB_CS_RESET_DPM_RESET		(1 &lt;&lt; 2)</div><div class='add'>+#define _PSB_CS_RESET_TWOD_RESET	(1 &lt;&lt; 1)</div><div class='add'>+#define _PSB_CS_RESET_BIF_RESET			(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define PSB_CR_DESIGNER_REV_FIELD2	0x001C</div><div class='add'>+</div><div class='add'>+#define PSB_CR_EVENT_HOST_ENABLE2	0x0110</div><div class='add'>+</div><div class='add'>+#define PSB_CR_EVENT_STATUS2		0x0118</div><div class='add'>+</div><div class='add'>+#define PSB_CR_EVENT_HOST_CLEAR2	0x0114</div><div class='add'>+#define _PSB_CE2_BIF_REQUESTER_FAULT		(1 &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+#define PSB_CR_EVENT_STATUS		0x012C</div><div class='add'>+</div><div class='add'>+#define PSB_CR_EVENT_HOST_ENABLE	0x0130</div><div class='add'>+</div><div class='add'>+#define PSB_CR_EVENT_HOST_CLEAR		0x0134</div><div class='add'>+#define _PSB_CE_MASTER_INTERRUPT		(1 &lt;&lt; 31)</div><div class='add'>+#define _PSB_CE_TA_DPM_FAULT			(1 &lt;&lt; 28)</div><div class='add'>+#define _PSB_CE_TWOD_COMPLETE			(1 &lt;&lt; 27)</div><div class='add'>+#define _PSB_CE_DPM_OUT_OF_MEMORY_ZLS		(1 &lt;&lt; 25)</div><div class='add'>+#define _PSB_CE_DPM_TA_MEM_FREE			(1 &lt;&lt; 24)</div><div class='add'>+#define _PSB_CE_PIXELBE_END_RENDER		(1 &lt;&lt; 18)</div><div class='add'>+#define _PSB_CE_SW_EVENT			(1 &lt;&lt; 14)</div><div class='add'>+#define _PSB_CE_TA_FINISHED			(1 &lt;&lt; 13)</div><div class='add'>+#define _PSB_CE_TA_TERMINATE			(1 &lt;&lt; 12)</div><div class='add'>+#define _PSB_CE_DPM_REACHED_MEM_THRESH		(1 &lt;&lt; 3)</div><div class='add'>+#define _PSB_CE_DPM_OUT_OF_MEMORY_GBL		(1 &lt;&lt; 2)</div><div class='add'>+#define _PSB_CE_DPM_OUT_OF_MEMORY_MT		(1 &lt;&lt; 1)</div><div class='add'>+#define _PSB_CE_DPM_3D_MEM_FREE			(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define PSB_USE_OFFSET_MASK		0x0007FFFF</div><div class='add'>+#define PSB_USE_OFFSET_SIZE		(PSB_USE_OFFSET_MASK + 1)</div><div class='add'>+#define PSB_CR_USE_CODE_BASE0		0x0A0C</div><div class='add'>+#define PSB_CR_USE_CODE_BASE1		0x0A10</div><div class='add'>+#define PSB_CR_USE_CODE_BASE2		0x0A14</div><div class='add'>+#define PSB_CR_USE_CODE_BASE3		0x0A18</div><div class='add'>+#define PSB_CR_USE_CODE_BASE4		0x0A1C</div><div class='add'>+#define PSB_CR_USE_CODE_BASE5		0x0A20</div><div class='add'>+#define PSB_CR_USE_CODE_BASE6		0x0A24</div><div class='add'>+#define PSB_CR_USE_CODE_BASE7		0x0A28</div><div class='add'>+#define PSB_CR_USE_CODE_BASE8		0x0A2C</div><div class='add'>+#define PSB_CR_USE_CODE_BASE9		0x0A30</div><div class='add'>+#define PSB_CR_USE_CODE_BASE10		0x0A34</div><div class='add'>+#define PSB_CR_USE_CODE_BASE11		0x0A38</div><div class='add'>+#define PSB_CR_USE_CODE_BASE12		0x0A3C</div><div class='add'>+#define PSB_CR_USE_CODE_BASE13		0x0A40</div><div class='add'>+#define PSB_CR_USE_CODE_BASE14		0x0A44</div><div class='add'>+#define PSB_CR_USE_CODE_BASE15		0x0A48</div><div class='add'>+#define PSB_CR_USE_CODE_BASE(_i)	(0x0A0C + ((_i) &lt;&lt; 2))</div><div class='add'>+#define _PSB_CUC_BASE_DM_SHIFT			(25)</div><div class='add'>+#define _PSB_CUC_BASE_DM_MASK			(0x3 &lt;&lt; 25)</div><div class='add'>+#define _PSB_CUC_BASE_ADDR_SHIFT		(0)	/* 1024-bit aligned address? */</div><div class='add'>+#define _PSB_CUC_BASE_ADDR_ALIGNSHIFT		(7)</div><div class='add'>+#define _PSB_CUC_BASE_ADDR_MASK			(0x1FFFFFF &lt;&lt; 0)</div><div class='add'>+#define _PSB_CUC_DM_VERTEX			(0)</div><div class='add'>+#define _PSB_CUC_DM_PIXEL			(1)</div><div class='add'>+#define _PSB_CUC_DM_RESERVED			(2)</div><div class='add'>+#define _PSB_CUC_DM_EDM				(3)</div><div class='add'>+</div><div class='add'>+#define PSB_CR_PDS_EXEC_BASE		0x0AB8</div><div class='add'>+#define _PSB_CR_PDS_EXEC_BASE_ADDR_SHIFT	(20)	/* 1MB aligned address */</div><div class='add'>+#define _PSB_CR_PDS_EXEC_BASE_ADDR_ALIGNSHIFT	(20)</div><div class='add'>+</div><div class='add'>+#define PSB_CR_EVENT_KICKER		0x0AC4</div><div class='add'>+#define _PSB_CE_KICKER_ADDRESS_SHIFT		(4)	/* 128-bit aligned address */</div><div class='add'>+</div><div class='add'>+#define PSB_CR_EVENT_KICK		0x0AC8</div><div class='add'>+#define _PSB_CE_KICK_NOW			(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define PSB_CR_BIF_DIR_LIST_BASE1	0x0C38</div><div class='add'>+</div><div class='add'>+#define PSB_CR_BIF_CTRL			0x0C00</div><div class='add'>+#define _PSB_CB_CTRL_CLEAR_FAULT		(1 &lt;&lt; 4)</div><div class='add'>+#define _PSB_CB_CTRL_INVALDC			(1 &lt;&lt; 3)</div><div class='add'>+#define _PSB_CB_CTRL_FLUSH			(1 &lt;&lt; 2)</div><div class='add'>+</div><div class='add'>+#define PSB_CR_BIF_INT_STAT		0x0C04</div><div class='add'>+</div><div class='add'>+#define PSB_CR_BIF_FAULT		0x0C08</div><div class='add'>+#define _PSB_CBI_STAT_PF_N_RW			(1 &lt;&lt; 14)</div><div class='add'>+#define _PSB_CBI_STAT_FAULT_SHIFT		(0)</div><div class='add'>+#define _PSB_CBI_STAT_FAULT_MASK		(0x3FFF &lt;&lt; 0)</div><div class='add'>+#define _PSB_CBI_STAT_FAULT_CACHE		(1 &lt;&lt; 1)</div><div class='add'>+#define _PSB_CBI_STAT_FAULT_TA			(1 &lt;&lt; 2)</div><div class='add'>+#define _PSB_CBI_STAT_FAULT_VDM			(1 &lt;&lt; 3)</div><div class='add'>+#define _PSB_CBI_STAT_FAULT_2D			(1 &lt;&lt; 4)</div><div class='add'>+#define _PSB_CBI_STAT_FAULT_PBE			(1 &lt;&lt; 5)</div><div class='add'>+#define _PSB_CBI_STAT_FAULT_TSP			(1 &lt;&lt; 6)</div><div class='add'>+#define _PSB_CBI_STAT_FAULT_ISP			(1 &lt;&lt; 7)</div><div class='add'>+#define _PSB_CBI_STAT_FAULT_USSEPDS		(1 &lt;&lt; 8)</div><div class='add'>+#define _PSB_CBI_STAT_FAULT_HOST		(1 &lt;&lt; 9)</div><div class='add'>+</div><div class='add'>+#define PSB_CR_BIF_BANK0		0x0C78</div><div class='add'>+#define PSB_CR_BIF_BANK1		0x0C7C</div><div class='add'>+#define PSB_CR_BIF_DIR_LIST_BASE0	0x0C84</div><div class='add'>+#define PSB_CR_BIF_TWOD_REQ_BASE	0x0C88</div><div class='add'>+#define PSB_CR_BIF_3D_REQ_BASE		0x0CAC</div><div class='add'>+</div><div class='add'>+#define PSB_CR_2D_SOCIF			0x0E18</div><div class='add'>+#define _PSB_C2_SOCIF_FREESPACE_SHIFT		(0)</div><div class='add'>+#define _PSB_C2_SOCIF_FREESPACE_MASK		(0xFF &lt;&lt; 0)</div><div class='add'>+#define _PSB_C2_SOCIF_EMPTY			(0x80 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define PSB_CR_2D_BLIT_STATUS		0x0E04</div><div class='add'>+#define _PSB_C2B_STATUS_BUSY			(1 &lt;&lt; 24)</div><div class='add'>+#define _PSB_C2B_STATUS_COMPLETE_SHIFT		(0)</div><div class='add'>+#define _PSB_C2B_STATUS_COMPLETE_MASK		(0xFFFFFF &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 2D defs.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 2D Slave Port Data : Block Header's Object Type</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define	PSB_2D_CLIP_BH			(0x00000000)</div><div class='add'>+#define	PSB_2D_PAT_BH			(0x10000000)</div><div class='add'>+#define	PSB_2D_CTRL_BH			(0x20000000)</div><div class='add'>+#define	PSB_2D_SRC_OFF_BH		(0x30000000)</div><div class='add'>+#define	PSB_2D_MASK_OFF_BH		(0x40000000)</div><div class='add'>+#define	PSB_2D_RESERVED1_BH		(0x50000000)</div><div class='add'>+#define	PSB_2D_RESERVED2_BH		(0x60000000)</div><div class='add'>+#define	PSB_2D_FENCE_BH			(0x70000000)</div><div class='add'>+#define	PSB_2D_BLIT_BH			(0x80000000)</div><div class='add'>+#define	PSB_2D_SRC_SURF_BH		(0x90000000)</div><div class='add'>+#define	PSB_2D_DST_SURF_BH		(0xA0000000)</div><div class='add'>+#define	PSB_2D_PAT_SURF_BH		(0xB0000000)</div><div class='add'>+#define	PSB_2D_SRC_PAL_BH		(0xC0000000)</div><div class='add'>+#define	PSB_2D_PAT_PAL_BH		(0xD0000000)</div><div class='add'>+#define	PSB_2D_MASK_SURF_BH		(0xE0000000)</div><div class='add'>+#define	PSB_2D_FLUSH_BH			(0xF0000000)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clip Definition block (PSB_2D_CLIP_BH)</div><div class='add'>+ */</div><div class='add'>+#define PSB_2D_CLIPCOUNT_MAX		(1)</div><div class='add'>+#define PSB_2D_CLIPCOUNT_MASK		(0x00000000)</div><div class='add'>+#define PSB_2D_CLIPCOUNT_CLRMASK	(0xFFFFFFFF)</div><div class='add'>+#define PSB_2D_CLIPCOUNT_SHIFT		(0)</div><div class='add'>+/* clip rectangle min &amp; max */</div><div class='add'>+#define PSB_2D_CLIP_XMAX_MASK		(0x00FFF000)</div><div class='add'>+#define PSB_2D_CLIP_XMAX_CLRMASK	(0xFF000FFF)</div><div class='add'>+#define PSB_2D_CLIP_XMAX_SHIFT		(12)</div><div class='add'>+#define PSB_2D_CLIP_XMIN_MASK		(0x00000FFF)</div><div class='add'>+#define PSB_2D_CLIP_XMIN_CLRMASK	(0x00FFF000)</div><div class='add'>+#define PSB_2D_CLIP_XMIN_SHIFT		(0)</div><div class='add'>+/* clip rectangle offset */</div><div class='add'>+#define PSB_2D_CLIP_YMAX_MASK		(0x00FFF000)</div><div class='add'>+#define PSB_2D_CLIP_YMAX_CLRMASK	(0xFF000FFF)</div><div class='add'>+#define PSB_2D_CLIP_YMAX_SHIFT		(12)</div><div class='add'>+#define PSB_2D_CLIP_YMIN_MASK		(0x00000FFF)</div><div class='add'>+#define PSB_2D_CLIP_YMIN_CLRMASK	(0x00FFF000)</div><div class='add'>+#define PSB_2D_CLIP_YMIN_SHIFT		(0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Pattern Control (PSB_2D_PAT_BH)</div><div class='add'>+ */</div><div class='add'>+#define PSB_2D_PAT_HEIGHT_MASK		(0x0000001F)</div><div class='add'>+#define PSB_2D_PAT_HEIGHT_SHIFT		(0)</div><div class='add'>+#define PSB_2D_PAT_WIDTH_MASK		(0x000003E0)</div><div class='add'>+#define PSB_2D_PAT_WIDTH_SHIFT		(5)</div><div class='add'>+#define PSB_2D_PAT_YSTART_MASK		(0x00007C00)</div><div class='add'>+#define PSB_2D_PAT_YSTART_SHIFT		(10)</div><div class='add'>+#define PSB_2D_PAT_XSTART_MASK		(0x000F8000)</div><div class='add'>+#define PSB_2D_PAT_XSTART_SHIFT		(15)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 2D Control block (PSB_2D_CTRL_BH)</div><div class='add'>+ */</div><div class='add'>+/* Present Flags */</div><div class='add'>+#define PSB_2D_SRCCK_CTRL		(0x00000001)</div><div class='add'>+#define PSB_2D_DSTCK_CTRL		(0x00000002)</div><div class='add'>+#define PSB_2D_ALPHA_CTRL		(0x00000004)</div><div class='add'>+/* Colour Key Colour (SRC/DST)*/</div><div class='add'>+#define PSB_2D_CK_COL_MASK		(0xFFFFFFFF)</div><div class='add'>+#define PSB_2D_CK_COL_CLRMASK		(0x00000000)</div><div class='add'>+#define PSB_2D_CK_COL_SHIFT		(0)</div><div class='add'>+/* Colour Key Mask (SRC/DST)*/</div><div class='add'>+#define PSB_2D_CK_MASK_MASK		(0xFFFFFFFF)</div><div class='add'>+#define PSB_2D_CK_MASK_CLRMASK		(0x00000000)</div><div class='add'>+#define PSB_2D_CK_MASK_SHIFT		(0)</div><div class='add'>+/* Alpha Control (Alpha/RGB)*/</div><div class='add'>+#define PSB_2D_GBLALPHA_MASK		(0x000FF000)</div><div class='add'>+#define PSB_2D_GBLALPHA_CLRMASK		(0xFFF00FFF)</div><div class='add'>+#define PSB_2D_GBLALPHA_SHIFT		(12)</div><div class='add'>+#define PSB_2D_SRCALPHA_OP_MASK		(0x00700000)</div><div class='add'>+#define PSB_2D_SRCALPHA_OP_CLRMASK	(0xFF8FFFFF)</div><div class='add'>+#define PSB_2D_SRCALPHA_OP_SHIFT	(20)</div><div class='add'>+#define PSB_2D_SRCALPHA_OP_ONE		(0x00000000)</div><div class='add'>+#define PSB_2D_SRCALPHA_OP_SRC		(0x00100000)</div><div class='add'>+#define PSB_2D_SRCALPHA_OP_DST		(0x00200000)</div><div class='add'>+#define PSB_2D_SRCALPHA_OP_SG		(0x00300000)</div><div class='add'>+#define PSB_2D_SRCALPHA_OP_DG		(0x00400000)</div><div class='add'>+#define PSB_2D_SRCALPHA_OP_GBL		(0x00500000)</div><div class='add'>+#define PSB_2D_SRCALPHA_OP_ZERO		(0x00600000)</div><div class='add'>+#define PSB_2D_SRCALPHA_INVERT		(0x00800000)</div><div class='add'>+#define PSB_2D_SRCALPHA_INVERT_CLR	(0xFF7FFFFF)</div><div class='add'>+#define PSB_2D_DSTALPHA_OP_MASK		(0x07000000)</div><div class='add'>+#define PSB_2D_DSTALPHA_OP_CLRMASK	(0xF8FFFFFF)</div><div class='add'>+#define PSB_2D_DSTALPHA_OP_SHIFT	(24)</div><div class='add'>+#define PSB_2D_DSTALPHA_OP_ONE		(0x00000000)</div><div class='add'>+#define PSB_2D_DSTALPHA_OP_SRC		(0x01000000)</div><div class='add'>+#define PSB_2D_DSTALPHA_OP_DST		(0x02000000)</div><div class='add'>+#define PSB_2D_DSTALPHA_OP_SG		(0x03000000)</div><div class='add'>+#define PSB_2D_DSTALPHA_OP_DG		(0x04000000)</div><div class='add'>+#define PSB_2D_DSTALPHA_OP_GBL		(0x05000000)</div><div class='add'>+#define PSB_2D_DSTALPHA_OP_ZERO		(0x06000000)</div><div class='add'>+#define PSB_2D_DSTALPHA_INVERT		(0x08000000)</div><div class='add'>+#define PSB_2D_DSTALPHA_INVERT_CLR	(0xF7FFFFFF)</div><div class='add'>+</div><div class='add'>+#define PSB_2D_PRE_MULTIPLICATION_ENABLE	(0x10000000)</div><div class='add'>+#define PSB_2D_PRE_MULTIPLICATION_CLRMASK	(0xEFFFFFFF)</div><div class='add'>+#define PSB_2D_ZERO_SOURCE_ALPHA_ENABLE		(0x20000000)</div><div class='add'>+#define PSB_2D_ZERO_SOURCE_ALPHA_CLRMASK	(0xDFFFFFFF)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *Source Offset (PSB_2D_SRC_OFF_BH)</div><div class='add'>+ */</div><div class='add'>+#define PSB_2D_SRCOFF_XSTART_MASK	((0x00000FFF) &lt;&lt; 12)</div><div class='add'>+#define PSB_2D_SRCOFF_XSTART_SHIFT	(12)</div><div class='add'>+#define PSB_2D_SRCOFF_YSTART_MASK	(0x00000FFF)</div><div class='add'>+#define PSB_2D_SRCOFF_YSTART_SHIFT	(0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mask Offset (PSB_2D_MASK_OFF_BH)</div><div class='add'>+ */</div><div class='add'>+#define PSB_2D_MASKOFF_XSTART_MASK	((0x00000FFF) &lt;&lt; 12)</div><div class='add'>+#define PSB_2D_MASKOFF_XSTART_SHIFT	(12)</div><div class='add'>+#define PSB_2D_MASKOFF_YSTART_MASK	(0x00000FFF)</div><div class='add'>+#define PSB_2D_MASKOFF_YSTART_SHIFT	(0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 2D Fence (see PSB_2D_FENCE_BH): bits 0:27 are ignored</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *Blit Rectangle (PSB_2D_BLIT_BH)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PSB_2D_ROT_MASK			(3 &lt;&lt; 25)</div><div class='add'>+#define PSB_2D_ROT_CLRMASK		(~PSB_2D_ROT_MASK)</div><div class='add'>+#define PSB_2D_ROT_NONE			(0 &lt;&lt; 25)</div><div class='add'>+#define PSB_2D_ROT_90DEGS		(1 &lt;&lt; 25)</div><div class='add'>+#define PSB_2D_ROT_180DEGS		(2 &lt;&lt; 25)</div><div class='add'>+#define PSB_2D_ROT_270DEGS		(3 &lt;&lt; 25)</div><div class='add'>+</div><div class='add'>+#define PSB_2D_COPYORDER_MASK		(3 &lt;&lt; 23)</div><div class='add'>+#define PSB_2D_COPYORDER_CLRMASK	(~PSB_2D_COPYORDER_MASK)</div><div class='add'>+#define PSB_2D_COPYORDER_TL2BR		(0 &lt;&lt; 23)</div><div class='add'>+#define PSB_2D_COPYORDER_BR2TL		(1 &lt;&lt; 23)</div><div class='add'>+#define PSB_2D_COPYORDER_TR2BL		(2 &lt;&lt; 23)</div><div class='add'>+#define PSB_2D_COPYORDER_BL2TR		(3 &lt;&lt; 23)</div><div class='add'>+</div><div class='add'>+#define PSB_2D_DSTCK_CLRMASK		(0xFF9FFFFF)</div><div class='add'>+#define PSB_2D_DSTCK_DISABLE		(0x00000000)</div><div class='add'>+#define PSB_2D_DSTCK_PASS		(0x00200000)</div><div class='add'>+#define PSB_2D_DSTCK_REJECT		(0x00400000)</div><div class='add'>+</div><div class='add'>+#define PSB_2D_SRCCK_CLRMASK		(0xFFE7FFFF)</div><div class='add'>+#define PSB_2D_SRCCK_DISABLE		(0x00000000)</div><div class='add'>+#define PSB_2D_SRCCK_PASS		(0x00080000)</div><div class='add'>+#define PSB_2D_SRCCK_REJECT		(0x00100000)</div><div class='add'>+</div><div class='add'>+#define PSB_2D_CLIP_ENABLE		(0x00040000)</div><div class='add'>+</div><div class='add'>+#define PSB_2D_ALPHA_ENABLE		(0x00020000)</div><div class='add'>+</div><div class='add'>+#define PSB_2D_PAT_CLRMASK		(0xFFFEFFFF)</div><div class='add'>+#define PSB_2D_PAT_MASK			(0x00010000)</div><div class='add'>+#define PSB_2D_USE_PAT			(0x00010000)</div><div class='add'>+#define PSB_2D_USE_FILL			(0x00000000)</div><div class='add'>+/*</div><div class='add'>+ * Tungsten Graphics note on rop codes: If rop A and rop B are</div><div class='add'>+ * identical, the mask surface will not be read and need not be</div><div class='add'>+ * set up.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PSB_2D_ROP3B_MASK		(0x0000FF00)</div><div class='add'>+#define PSB_2D_ROP3B_CLRMASK		(0xFFFF00FF)</div><div class='add'>+#define PSB_2D_ROP3B_SHIFT		(8)</div><div class='add'>+/* rop code A */</div><div class='add'>+#define PSB_2D_ROP3A_MASK		(0x000000FF)</div><div class='add'>+#define PSB_2D_ROP3A_CLRMASK		(0xFFFFFF00)</div><div class='add'>+#define PSB_2D_ROP3A_SHIFT		(0)</div><div class='add'>+</div><div class='add'>+#define PSB_2D_ROP4_MASK		(0x0000FFFF)</div><div class='add'>+/*</div><div class='add'>+ *	DWORD0:	(Only pass if Pattern control == Use Fill Colour)</div><div class='add'>+ *	Fill Colour RGBA8888</div><div class='add'>+ */</div><div class='add'>+#define PSB_2D_FILLCOLOUR_MASK		(0xFFFFFFFF)</div><div class='add'>+#define PSB_2D_FILLCOLOUR_SHIFT		(0)</div><div class='add'>+/*</div><div class='add'>+ *	DWORD1: (Always Present)</div><div class='add'>+ *	X Start (Dest)</div><div class='add'>+ *	Y Start (Dest)</div><div class='add'>+ */</div><div class='add'>+#define PSB_2D_DST_XSTART_MASK		(0x00FFF000)</div><div class='add'>+#define PSB_2D_DST_XSTART_CLRMASK	(0xFF000FFF)</div><div class='add'>+#define PSB_2D_DST_XSTART_SHIFT		(12)</div><div class='add'>+#define PSB_2D_DST_YSTART_MASK		(0x00000FFF)</div><div class='add'>+#define PSB_2D_DST_YSTART_CLRMASK	(0xFFFFF000)</div><div class='add'>+#define PSB_2D_DST_YSTART_SHIFT		(0)</div><div class='add'>+/*</div><div class='add'>+ *	DWORD2: (Always Present)</div><div class='add'>+ *	X Size (Dest)</div><div class='add'>+ *	Y Size (Dest)</div><div class='add'>+ */</div><div class='add'>+#define PSB_2D_DST_XSIZE_MASK		(0x00FFF000)</div><div class='add'>+#define PSB_2D_DST_XSIZE_CLRMASK	(0xFF000FFF)</div><div class='add'>+#define PSB_2D_DST_XSIZE_SHIFT		(12)</div><div class='add'>+#define PSB_2D_DST_YSIZE_MASK		(0x00000FFF)</div><div class='add'>+#define PSB_2D_DST_YSIZE_CLRMASK	(0xFFFFF000)</div><div class='add'>+#define PSB_2D_DST_YSIZE_SHIFT		(0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Source Surface (PSB_2D_SRC_SURF_BH)</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='add'>+ * WORD 0</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PSB_2D_SRC_FORMAT_MASK		(0x00078000)</div><div class='add'>+#define PSB_2D_SRC_1_PAL		(0x00000000)</div><div class='add'>+#define PSB_2D_SRC_2_PAL		(0x00008000)</div><div class='add'>+#define PSB_2D_SRC_4_PAL		(0x00010000)</div><div class='add'>+#define PSB_2D_SRC_8_PAL		(0x00018000)</div><div class='add'>+#define PSB_2D_SRC_8_ALPHA		(0x00020000)</div><div class='add'>+#define PSB_2D_SRC_4_ALPHA		(0x00028000)</div><div class='add'>+#define PSB_2D_SRC_332RGB		(0x00030000)</div><div class='add'>+#define PSB_2D_SRC_4444ARGB		(0x00038000)</div><div class='add'>+#define PSB_2D_SRC_555RGB		(0x00040000)</div><div class='add'>+#define PSB_2D_SRC_1555ARGB		(0x00048000)</div><div class='add'>+#define PSB_2D_SRC_565RGB		(0x00050000)</div><div class='add'>+#define PSB_2D_SRC_0888ARGB		(0x00058000)</div><div class='add'>+#define PSB_2D_SRC_8888ARGB		(0x00060000)</div><div class='add'>+#define PSB_2D_SRC_8888UYVY		(0x00068000)</div><div class='add'>+#define PSB_2D_SRC_RESERVED		(0x00070000)</div><div class='add'>+#define PSB_2D_SRC_1555ARGB_LOOKUP	(0x00078000)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define PSB_2D_SRC_STRIDE_MASK		(0x00007FFF)</div><div class='add'>+#define PSB_2D_SRC_STRIDE_CLRMASK	(0xFFFF8000)</div><div class='add'>+#define PSB_2D_SRC_STRIDE_SHIFT		(0)</div><div class='add'>+/*</div><div class='add'>+ *  WORD 1 - Base Address</div><div class='add'>+ */</div><div class='add'>+#define PSB_2D_SRC_ADDR_MASK		(0x0FFFFFFC)</div><div class='add'>+#define PSB_2D_SRC_ADDR_CLRMASK		(0x00000003)</div><div class='add'>+#define PSB_2D_SRC_ADDR_SHIFT		(2)</div><div class='add'>+#define PSB_2D_SRC_ADDR_ALIGNSHIFT	(2)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Pattern Surface (PSB_2D_PAT_SURF_BH)</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='add'>+ *  WORD 0</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PSB_2D_PAT_FORMAT_MASK		(0x00078000)</div><div class='add'>+#define PSB_2D_PAT_1_PAL		(0x00000000)</div><div class='add'>+#define PSB_2D_PAT_2_PAL		(0x00008000)</div><div class='add'>+#define PSB_2D_PAT_4_PAL		(0x00010000)</div><div class='add'>+#define PSB_2D_PAT_8_PAL		(0x00018000)</div><div class='add'>+#define PSB_2D_PAT_8_ALPHA		(0x00020000)</div><div class='add'>+#define PSB_2D_PAT_4_ALPHA		(0x00028000)</div><div class='add'>+#define PSB_2D_PAT_332RGB		(0x00030000)</div><div class='add'>+#define PSB_2D_PAT_4444ARGB		(0x00038000)</div><div class='add'>+#define PSB_2D_PAT_555RGB		(0x00040000)</div><div class='add'>+#define PSB_2D_PAT_1555ARGB		(0x00048000)</div><div class='add'>+#define PSB_2D_PAT_565RGB		(0x00050000)</div><div class='add'>+#define PSB_2D_PAT_0888ARGB		(0x00058000)</div><div class='add'>+#define PSB_2D_PAT_8888ARGB		(0x00060000)</div><div class='add'>+</div><div class='add'>+#define PSB_2D_PAT_STRIDE_MASK		(0x00007FFF)</div><div class='add'>+#define PSB_2D_PAT_STRIDE_CLRMASK	(0xFFFF8000)</div><div class='add'>+#define PSB_2D_PAT_STRIDE_SHIFT		(0)</div><div class='add'>+/*</div><div class='add'>+ *  WORD 1 - Base Address</div><div class='add'>+ */</div><div class='add'>+#define PSB_2D_PAT_ADDR_MASK		(0x0FFFFFFC)</div><div class='add'>+#define PSB_2D_PAT_ADDR_CLRMASK		(0x00000003)</div><div class='add'>+#define PSB_2D_PAT_ADDR_SHIFT		(2)</div><div class='add'>+#define PSB_2D_PAT_ADDR_ALIGNSHIFT	(2)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Destination Surface (PSB_2D_DST_SURF_BH)</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='add'>+ * WORD 0</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PSB_2D_DST_FORMAT_MASK		(0x00078000)</div><div class='add'>+#define PSB_2D_DST_332RGB		(0x00030000)</div><div class='add'>+#define PSB_2D_DST_4444ARGB		(0x00038000)</div><div class='add'>+#define PSB_2D_DST_555RGB		(0x00040000)</div><div class='add'>+#define PSB_2D_DST_1555ARGB		(0x00048000)</div><div class='add'>+#define PSB_2D_DST_565RGB		(0x00050000)</div><div class='add'>+#define PSB_2D_DST_0888ARGB		(0x00058000)</div><div class='add'>+#define PSB_2D_DST_8888ARGB		(0x00060000)</div><div class='add'>+#define PSB_2D_DST_8888AYUV		(0x00070000)</div><div class='add'>+</div><div class='add'>+#define PSB_2D_DST_STRIDE_MASK		(0x00007FFF)</div><div class='add'>+#define PSB_2D_DST_STRIDE_CLRMASK	(0xFFFF8000)</div><div class='add'>+#define PSB_2D_DST_STRIDE_SHIFT		(0)</div><div class='add'>+/*</div><div class='add'>+ * WORD 1 - Base Address</div><div class='add'>+ */</div><div class='add'>+#define PSB_2D_DST_ADDR_MASK		(0x0FFFFFFC)</div><div class='add'>+#define PSB_2D_DST_ADDR_CLRMASK		(0x00000003)</div><div class='add'>+#define PSB_2D_DST_ADDR_SHIFT		(2)</div><div class='add'>+#define PSB_2D_DST_ADDR_ALIGNSHIFT	(2)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mask Surface (PSB_2D_MASK_SURF_BH)</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='add'>+ * WORD 0</div><div class='add'>+ */</div><div class='add'>+#define PSB_2D_MASK_STRIDE_MASK		(0x00007FFF)</div><div class='add'>+#define PSB_2D_MASK_STRIDE_CLRMASK	(0xFFFF8000)</div><div class='add'>+#define PSB_2D_MASK_STRIDE_SHIFT	(0)</div><div class='add'>+/*</div><div class='add'>+ *  WORD 1 - Base Address</div><div class='add'>+ */</div><div class='add'>+#define PSB_2D_MASK_ADDR_MASK		(0x0FFFFFFC)</div><div class='add'>+#define PSB_2D_MASK_ADDR_CLRMASK	(0x00000003)</div><div class='add'>+#define PSB_2D_MASK_ADDR_SHIFT		(2)</div><div class='add'>+#define PSB_2D_MASK_ADDR_ALIGNSHIFT	(2)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Source Palette (PSB_2D_SRC_PAL_BH)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PSB_2D_SRCPAL_ADDR_SHIFT	(0)</div><div class='add'>+#define PSB_2D_SRCPAL_ADDR_CLRMASK	(0xF0000007)</div><div class='add'>+#define PSB_2D_SRCPAL_ADDR_MASK		(0x0FFFFFF8)</div><div class='add'>+#define PSB_2D_SRCPAL_BYTEALIGN		(1024)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Pattern Palette (PSB_2D_PAT_PAL_BH)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PSB_2D_PATPAL_ADDR_SHIFT	(0)</div><div class='add'>+#define PSB_2D_PATPAL_ADDR_CLRMASK	(0xF0000007)</div><div class='add'>+#define PSB_2D_PATPAL_ADDR_MASK		(0x0FFFFFF8)</div><div class='add'>+#define PSB_2D_PATPAL_BYTEALIGN		(1024)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Rop3 Codes (2 LS bytes)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PSB_2D_ROP3_SRCCOPY		(0xCCCC)</div><div class='add'>+#define PSB_2D_ROP3_PATCOPY		(0xF0F0)</div><div class='add'>+#define PSB_2D_ROP3_WHITENESS		(0xFFFF)</div><div class='add'>+#define PSB_2D_ROP3_BLACKNESS		(0x0000)</div><div class='add'>+#define PSB_2D_ROP3_SRC			(0xCC)</div><div class='add'>+#define PSB_2D_ROP3_PAT			(0xF0)</div><div class='add'>+#define PSB_2D_ROP3_DST			(0xAA)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Sizes.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PSB_SCENE_HW_COOKIE_SIZE	16</div><div class='add'>+#define PSB_TA_MEM_HW_COOKIE_SIZE	16</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Scene stuff.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PSB_NUM_HW_SCENES		2</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Scheduler completion actions.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PSB_RASTER_BLOCK		0</div><div class='add'>+#define PSB_RASTER			1</div><div class='add'>+#define PSB_RETURN			2</div><div class='add'>+#define PSB_TA				3</div><div class='add'>+</div><div class='add'>+/* Power management */</div><div class='add'>+#define PSB_PUNIT_PORT			0x04</div><div class='add'>+#define PSB_OSPMBA			0x78</div><div class='add'>+#define PSB_APMBA			0x7a</div><div class='add'>+#define PSB_APM_CMD			0x0</div><div class='add'>+#define PSB_APM_STS			0x04</div><div class='add'>+#define PSB_PWRGT_VID_ENC_MASK		0x30</div><div class='add'>+#define PSB_PWRGT_VID_DEC_MASK		0xc</div><div class='add'>+#define PSB_PWRGT_GL3_MASK		0xc0</div><div class='add'>+</div><div class='add'>+#define PSB_PM_SSC			0x20</div><div class='add'>+#define PSB_PM_SSS			0x30</div><div class='add'>+#define PSB_PWRGT_DISPLAY_MASK		0xc /*on a different BA than video/gfx*/</div><div class='add'>+#define MDFLD_PWRGT_DISPLAY_A_CNTR	0x0000000c</div><div class='add'>+#define MDFLD_PWRGT_DISPLAY_B_CNTR	0x0000c000</div><div class='add'>+#define MDFLD_PWRGT_DISPLAY_C_CNTR	0x00030000</div><div class='add'>+#define MDFLD_PWRGT_DISP_MIPI_CNTR	0x000c0000</div><div class='add'>+#define MDFLD_PWRGT_DISPLAY_CNTR    (MDFLD_PWRGT_DISPLAY_A_CNTR | MDFLD_PWRGT_DISPLAY_B_CNTR | MDFLD_PWRGT_DISPLAY_C_CNTR | MDFLD_PWRGT_DISP_MIPI_CNTR) /* 0x000fc00c */</div><div class='add'>+/* Display SSS register bits are different in A0 vs. B0 */</div><div class='add'>+#define PSB_PWRGT_GFX_MASK		0x3</div><div class='add'>+#define MDFLD_PWRGT_DISPLAY_A_STS	0x000000c0</div><div class='add'>+#define MDFLD_PWRGT_DISPLAY_B_STS	0x00000300</div><div class='add'>+#define MDFLD_PWRGT_DISPLAY_C_STS	0x00000c00</div><div class='add'>+#define PSB_PWRGT_GFX_MASK_B0		0xc3</div><div class='add'>+#define MDFLD_PWRGT_DISPLAY_A_STS_B0	0x0000000c</div><div class='add'>+#define MDFLD_PWRGT_DISPLAY_B_STS_B0	0x0000c000</div><div class='add'>+#define MDFLD_PWRGT_DISPLAY_C_STS_B0	0x00030000</div><div class='add'>+#define MDFLD_PWRGT_DISP_MIPI_STS	0x000c0000</div><div class='add'>+#define MDFLD_PWRGT_DISPLAY_STS_A0    (MDFLD_PWRGT_DISPLAY_A_STS | MDFLD_PWRGT_DISPLAY_B_STS | MDFLD_PWRGT_DISPLAY_C_STS | MDFLD_PWRGT_DISP_MIPI_STS) /* 0x000fc00c */</div><div class='add'>+#define MDFLD_PWRGT_DISPLAY_STS_B0    (MDFLD_PWRGT_DISPLAY_A_STS_B0 | MDFLD_PWRGT_DISPLAY_B_STS_B0 | MDFLD_PWRGT_DISPLAY_C_STS_B0 | MDFLD_PWRGT_DISP_MIPI_STS) /* 0x000fc00c */</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c<br/>index 8f371e8d630f..f7c17b239833 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i810/i810_dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i810/i810_dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i810/i810_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i810/i810_dma.c</a></div><div class='hunk'>@@ -222,8 +222,6 @@ static int i810_dma_cleanup(struct drm_device *dev)</div><div class='ctx'> 			pci_free_consistent(dev-&gt;pdev, PAGE_SIZE,</div><div class='ctx'> 					    dev_priv-&gt;hw_status_page,</div><div class='ctx'> 					    dev_priv-&gt;dma_status_page);</div><div class='del'>-			/* Need to rewrite hardware status page */</div><div class='del'>-			I810_WRITE(0x02080, 0x1ffff000);</div><div class='ctx'> 		}</div><div class='ctx'> 		kfree(dev-&gt;dev_private);</div><div class='ctx'> 		dev-&gt;dev_private = NULL;</div><div class='hunk'>@@ -888,7 +886,7 @@ static int i810_flush_queue(struct drm_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Must be called with the lock held */</div><div class='del'>-static void i810_reclaim_buffers(struct drm_device *dev,</div><div class='add'>+void i810_driver_reclaim_buffers(struct drm_device *dev,</div><div class='ctx'> 				 struct drm_file *file_priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_device_dma *dma = dev-&gt;dma;</div><div class='hunk'>@@ -1225,12 +1223,17 @@ void i810_driver_preclose(struct drm_device *dev, struct drm_file *file_priv)</div><div class='ctx'> 		if (dev_priv-&gt;page_flipping)</div><div class='ctx'> 			i810_do_cleanup_pageflip(dev);</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-void i810_driver_reclaim_buffers_locked(struct drm_device *dev,</div><div class='del'>-					struct drm_file *file_priv)</div><div class='del'>-{</div><div class='del'>-	i810_reclaim_buffers(dev, file_priv);</div><div class='add'>+	if (file_priv-&gt;master &amp;&amp; file_priv-&gt;master-&gt;lock.hw_lock) {</div><div class='add'>+		drm_idlelock_take(&amp;file_priv-&gt;master-&gt;lock);</div><div class='add'>+		i810_driver_reclaim_buffers(dev, file_priv);</div><div class='add'>+		drm_idlelock_release(&amp;file_priv-&gt;master-&gt;lock);</div><div class='add'>+	} else {</div><div class='add'>+		/* master disappeared, clean up stuff anyway and hope nothing</div><div class='add'>+		 * goes wrong */</div><div class='add'>+		i810_driver_reclaim_buffers(dev, file_priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int i810_driver_dma_quiescent(struct drm_device *dev)</div><div class='head'>diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c<br/>index d4266bdf6fb4..053f1ee58393 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i810/i810_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i810/i810_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i810/i810_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i810/i810_drv.c</a></div><div class='hunk'>@@ -43,6 +43,17 @@ static struct pci_device_id pciidlist[] = {</div><div class='ctx'> 	i810_PCI_IDS</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct file_operations i810_driver_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = drm_open,</div><div class='add'>+	.release = drm_release,</div><div class='add'>+	.unlocked_ioctl = drm_ioctl,</div><div class='add'>+	.mmap = drm_mmap,</div><div class='add'>+	.poll = drm_poll,</div><div class='add'>+	.fasync = drm_fasync,</div><div class='add'>+	.llseek = noop_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct drm_driver driver = {</div><div class='ctx'> 	.driver_features =</div><div class='ctx'> 	    DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | DRIVER_USE_MTRR |</div><div class='hunk'>@@ -52,20 +63,9 @@ static struct drm_driver driver = {</div><div class='ctx'> 	.lastclose = i810_driver_lastclose,</div><div class='ctx'> 	.preclose = i810_driver_preclose,</div><div class='ctx'> 	.device_is_agp = i810_driver_device_is_agp,</div><div class='del'>-	.reclaim_buffers_locked = i810_driver_reclaim_buffers_locked,</div><div class='ctx'> 	.dma_quiescent = i810_driver_dma_quiescent,</div><div class='ctx'> 	.ioctls = i810_ioctls,</div><div class='del'>-	.fops = {</div><div class='del'>-		 .owner = THIS_MODULE,</div><div class='del'>-		 .open = drm_open,</div><div class='del'>-		 .release = drm_release,</div><div class='del'>-		 .unlocked_ioctl = drm_ioctl,</div><div class='del'>-		 .mmap = drm_mmap,</div><div class='del'>-		 .poll = drm_poll,</div><div class='del'>-		 .fasync = drm_fasync,</div><div class='del'>-		 .llseek = noop_llseek,</div><div class='del'>-	},</div><div class='del'>-</div><div class='add'>+	.fops = &amp;i810_driver_fops,</div><div class='ctx'> 	.name = DRIVER_NAME,</div><div class='ctx'> 	.desc = DRIVER_DESC,</div><div class='ctx'> 	.date = DRIVER_DATE,</div><div class='head'>diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h<br/>index c9339f481795..6e0acad9e0f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i810/i810_drv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i810/i810_drv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i810/i810_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i810/i810_drv.h</a></div><div class='hunk'>@@ -116,14 +116,12 @@ typedef struct drm_i810_private {</div><div class='ctx'> </div><div class='ctx'> 				/* i810_dma.c */</div><div class='ctx'> extern int i810_driver_dma_quiescent(struct drm_device *dev);</div><div class='del'>-extern void i810_driver_reclaim_buffers_locked(struct drm_device *dev,</div><div class='del'>-					       struct drm_file *file_priv);</div><div class='add'>+void i810_driver_reclaim_buffers(struct drm_device *dev,</div><div class='add'>+			         struct drm_file *file_priv);</div><div class='ctx'> extern int i810_driver_load(struct drm_device *, unsigned long flags);</div><div class='ctx'> extern void i810_driver_lastclose(struct drm_device *dev);</div><div class='ctx'> extern void i810_driver_preclose(struct drm_device *dev,</div><div class='ctx'> 				 struct drm_file *file_priv);</div><div class='del'>-extern void i810_driver_reclaim_buffers_locked(struct drm_device *dev,</div><div class='del'>-					       struct drm_file *file_priv);</div><div class='ctx'> extern int i810_driver_device_is_agp(struct drm_device *dev);</div><div class='ctx'> </div><div class='ctx'> extern long i810_ioctl(struct file *file, unsigned int cmd, unsigned long arg);</div><div class='head'>diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile<br/>index 0ae6a7c5020f..808b255d7fc6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i915/Makefile</a></div><div class='hunk'>@@ -28,6 +28,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \</div><div class='ctx'> 	  intel_dvo.o \</div><div class='ctx'> 	  intel_ringbuffer.o \</div><div class='ctx'> 	  intel_overlay.o \</div><div class='add'>+	  intel_sprite.o \</div><div class='ctx'> 	  intel_opregion.o \</div><div class='ctx'> 	  dvo_ch7xxx.o \</div><div class='ctx'> 	  dvo_ch7017.o \</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c<br/>index 004b048c5192..11807989f918 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/i915_debugfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/i915_debugfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/i915_debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i915/i915_debugfs.c</a></div><div class='hunk'>@@ -1001,7 +1001,7 @@ static int i915_inttoext_table(struct seq_file *m, void *unused)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int i915_drpc_info(struct seq_file *m, void *unused)</div><div class='add'>+static int ironlake_drpc_info(struct seq_file *m)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_info_node *node = (struct drm_info_node *) m-&gt;private;</div><div class='ctx'> 	struct drm_device *dev = node-&gt;minor-&gt;dev;</div><div class='hunk'>@@ -1068,6 +1068,90 @@ static int i915_drpc_info(struct seq_file *m, void *unused)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int gen6_drpc_info(struct seq_file *m)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct drm_info_node *node = (struct drm_info_node *) m-&gt;private;</div><div class='add'>+	struct drm_device *dev = node-&gt;minor-&gt;dev;</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 rpmodectl1, gt_core_status, rcctl1;</div><div class='add'>+	int count=0, ret;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	ret = mutex_lock_interruptible(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;dev_priv-&gt;forcewake_count)) {</div><div class='add'>+		seq_printf(m, "RC information inaccurate because userspace "</div><div class='add'>+			      "holds a reference \n");</div><div class='add'>+	} else {</div><div class='add'>+		/* NB: we cannot use forcewake, else we read the wrong values */</div><div class='add'>+		while (count++ &lt; 50 &amp;&amp; (I915_READ_NOTRACE(FORCEWAKE_ACK) &amp; 1))</div><div class='add'>+			udelay(10);</div><div class='add'>+		seq_printf(m, "RC information accurate: %s\n", yesno(count &lt; 51));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gt_core_status = readl(dev_priv-&gt;regs + GEN6_GT_CORE_STATUS);</div><div class='add'>+	trace_i915_reg_rw(false, GEN6_GT_CORE_STATUS, gt_core_status, 4);</div><div class='add'>+</div><div class='add'>+	rpmodectl1 = I915_READ(GEN6_RP_CONTROL);</div><div class='add'>+	rcctl1 = I915_READ(GEN6_RC_CONTROL);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "Video Turbo Mode: %s\n",</div><div class='add'>+		   yesno(rpmodectl1 &amp; GEN6_RP_MEDIA_TURBO));</div><div class='add'>+	seq_printf(m, "HW control enabled: %s\n",</div><div class='add'>+		   yesno(rpmodectl1 &amp; GEN6_RP_ENABLE));</div><div class='add'>+	seq_printf(m, "SW control enabled: %s\n",</div><div class='add'>+		   yesno((rpmodectl1 &amp; GEN6_RP_MEDIA_MODE_MASK) ==</div><div class='add'>+			  GEN6_RP_MEDIA_SW_MODE));</div><div class='add'>+	seq_printf(m, "RC6 Enabled: %s\n",</div><div class='add'>+		   yesno(rcctl1 &amp; GEN6_RC_CTL_RC1e_ENABLE));</div><div class='add'>+	seq_printf(m, "RC6 Enabled: %s\n",</div><div class='add'>+		   yesno(rcctl1 &amp; GEN6_RC_CTL_RC6_ENABLE));</div><div class='add'>+	seq_printf(m, "Deep RC6 Enabled: %s\n",</div><div class='add'>+		   yesno(rcctl1 &amp; GEN6_RC_CTL_RC6p_ENABLE));</div><div class='add'>+	seq_printf(m, "Deepest RC6 Enabled: %s\n",</div><div class='add'>+		   yesno(rcctl1 &amp; GEN6_RC_CTL_RC6pp_ENABLE));</div><div class='add'>+	seq_printf(m, "Current RC state: ");</div><div class='add'>+	switch (gt_core_status &amp; GEN6_RCn_MASK) {</div><div class='add'>+	case GEN6_RC0:</div><div class='add'>+		if (gt_core_status &amp; GEN6_CORE_CPD_STATE_MASK)</div><div class='add'>+			seq_printf(m, "Core Power Down\n");</div><div class='add'>+		else</div><div class='add'>+			seq_printf(m, "on\n");</div><div class='add'>+		break;</div><div class='add'>+	case GEN6_RC3:</div><div class='add'>+		seq_printf(m, "RC3\n");</div><div class='add'>+		break;</div><div class='add'>+	case GEN6_RC6:</div><div class='add'>+		seq_printf(m, "RC6\n");</div><div class='add'>+		break;</div><div class='add'>+	case GEN6_RC7:</div><div class='add'>+		seq_printf(m, "RC7\n");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		seq_printf(m, "Unknown\n");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "Core Power Down: %s\n",</div><div class='add'>+		   yesno(gt_core_status &amp; GEN6_CORE_CPD_STATE_MASK));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int i915_drpc_info(struct seq_file *m, void *unused)</div><div class='add'>+{</div><div class='add'>+	struct drm_info_node *node = (struct drm_info_node *) m-&gt;private;</div><div class='add'>+	struct drm_device *dev = node-&gt;minor-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (IS_GEN6(dev) || IS_GEN7(dev))</div><div class='add'>+		return gen6_drpc_info(m);</div><div class='add'>+	else</div><div class='add'>+		return ironlake_drpc_info(m);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int i915_fbc_status(struct seq_file *m, void *unused)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_info_node *node = (struct drm_info_node *) m-&gt;private;</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c<br/>index a9ae374861e7..5f4d5893e983 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/i915_dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/i915_dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/i915_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i915/i915_dma.c</a></div><div class='hunk'>@@ -781,6 +781,9 @@ static int i915_getparam(struct drm_device *dev, void *data,</div><div class='ctx'> 	case I915_PARAM_HAS_RELAXED_DELTA:</div><div class='ctx'> 		value = 1;</div><div class='ctx'> 		break;</div><div class='add'>+	case I915_PARAM_HAS_GEN7_SOL_RESET:</div><div class='add'>+		value = 1;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		DRM_DEBUG_DRIVER("Unknown parameter %d\n",</div><div class='ctx'> 				 param-&gt;param);</div><div class='hunk'>@@ -2305,6 +2308,8 @@ struct drm_ioctl_desc i915_ioctls[] = {</div><div class='ctx'> 	DRM_IOCTL_DEF_DRV(I915_GEM_MADVISE, i915_gem_madvise_ioctl, DRM_UNLOCKED),</div><div class='ctx'> 	DRM_IOCTL_DEF_DRV(I915_OVERLAY_PUT_IMAGE, intel_overlay_put_image, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),</div><div class='ctx'> 	DRM_IOCTL_DEF_DRV(I915_OVERLAY_ATTRS, intel_overlay_attrs, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),</div><div class='add'>+	DRM_IOCTL_DEF_DRV(I915_SET_SPRITE_COLORKEY, intel_sprite_set_colorkey, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),</div><div class='add'>+	DRM_IOCTL_DEF_DRV(I915_GET_SPRITE_COLORKEY, intel_sprite_get_colorkey, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c<br/>index a1103fc6597d..8f7187915b0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/i915_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/i915_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/i915_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i915/i915_drv.c</a></div><div class='hunk'>@@ -810,6 +810,21 @@ static struct vm_operations_struct i915_gem_vm_ops = {</div><div class='ctx'> 	.close = drm_gem_vm_close,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct file_operations i915_driver_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = drm_open,</div><div class='add'>+	.release = drm_release,</div><div class='add'>+	.unlocked_ioctl = drm_ioctl,</div><div class='add'>+	.mmap = drm_gem_mmap,</div><div class='add'>+	.poll = drm_poll,</div><div class='add'>+	.fasync = drm_fasync,</div><div class='add'>+	.read = drm_read,</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+	.compat_ioctl = i915_compat_ioctl,</div><div class='add'>+#endif</div><div class='add'>+	.llseek = noop_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct drm_driver driver = {</div><div class='ctx'> 	/* Don't use MTRRs here; the Xserver or userspace app should</div><div class='ctx'> 	 * deal with them for Intel hardware.</div><div class='hunk'>@@ -843,21 +858,7 @@ static struct drm_driver driver = {</div><div class='ctx'> 	.dumb_map_offset = i915_gem_mmap_gtt,</div><div class='ctx'> 	.dumb_destroy = i915_gem_dumb_destroy,</div><div class='ctx'> 	.ioctls = i915_ioctls,</div><div class='del'>-	.fops = {</div><div class='del'>-		 .owner = THIS_MODULE,</div><div class='del'>-		 .open = drm_open,</div><div class='del'>-		 .release = drm_release,</div><div class='del'>-		 .unlocked_ioctl = drm_ioctl,</div><div class='del'>-		 .mmap = drm_gem_mmap,</div><div class='del'>-		 .poll = drm_poll,</div><div class='del'>-		 .fasync = drm_fasync,</div><div class='del'>-		 .read = drm_read,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-		 .compat_ioctl = i915_compat_ioctl,</div><div class='del'>-#endif</div><div class='del'>-		 .llseek = noop_llseek,</div><div class='del'>-	},</div><div class='del'>-</div><div class='add'>+	.fops = &amp;i915_driver_fops,</div><div class='ctx'> 	.name = DRIVER_NAME,</div><div class='ctx'> 	.desc = DRIVER_DESC,</div><div class='ctx'> 	.date = DRIVER_DATE,</div><div class='hunk'>@@ -922,13 +923,6 @@ MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='ctx'> MODULE_LICENSE("GPL and additional rights");</div><div class='ctx'> </div><div class='del'>-/* We give fast paths for the really cool registers */</div><div class='del'>-#define NEEDS_FORCE_WAKE(dev_priv, reg) \</div><div class='del'>-	(((dev_priv)-&gt;info-&gt;gen &gt;= 6) &amp;&amp; \</div><div class='del'>-	 ((reg) &lt; 0x40000) &amp;&amp;		 \</div><div class='del'>-	 ((reg) != FORCEWAKE) &amp;&amp;	 \</div><div class='del'>-	 ((reg) != ECOBUS))</div><div class='del'>-</div><div class='ctx'> #define __i915_read(x, y) \</div><div class='ctx'> u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg) { \</div><div class='ctx'> 	u##x val = 0; \</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h<br/>index 554bef7a3b9c..602bc80baabb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/i915_drv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/i915_drv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/i915_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i915/i915_drv.h</a></div><div class='hunk'>@@ -207,6 +207,8 @@ struct drm_i915_display_funcs {</div><div class='ctx'> 	int (*get_display_clock_speed)(struct drm_device *dev);</div><div class='ctx'> 	int (*get_fifo_size)(struct drm_device *dev, int plane);</div><div class='ctx'> 	void (*update_wm)(struct drm_device *dev);</div><div class='add'>+	void (*update_sprite_wm)(struct drm_device *dev, int pipe,</div><div class='add'>+				 uint32_t sprite_width, int pixel_size);</div><div class='ctx'> 	int (*crtc_mode_set)(struct drm_crtc *crtc,</div><div class='ctx'> 			     struct drm_display_mode *mode,</div><div class='ctx'> 			     struct drm_display_mode *adjusted_mode,</div><div class='hunk'>@@ -337,6 +339,8 @@ typedef struct drm_i915_private {</div><div class='ctx'> 	struct timer_list hangcheck_timer;</div><div class='ctx'> 	int hangcheck_count;</div><div class='ctx'> 	uint32_t last_acthd;</div><div class='add'>+	uint32_t last_acthd_bsd;</div><div class='add'>+	uint32_t last_acthd_blt;</div><div class='ctx'> 	uint32_t last_instdone;</div><div class='ctx'> 	uint32_t last_instdone1;</div><div class='ctx'> </div><div class='hunk'>@@ -350,6 +354,7 @@ typedef struct drm_i915_private {</div><div class='ctx'> </div><div class='ctx'> 	/* overlay */</div><div class='ctx'> 	struct intel_overlay *overlay;</div><div class='add'>+	bool sprite_scaling_enabled;</div><div class='ctx'> </div><div class='ctx'> 	/* LVDS info */</div><div class='ctx'> 	int backlight_level;  /* restore backlight to this value */</div><div class='hunk'>@@ -1362,8 +1367,7 @@ void __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv);</div><div class='ctx'> #define NEEDS_FORCE_WAKE(dev_priv, reg) \</div><div class='ctx'> 	(((dev_priv)-&gt;info-&gt;gen &gt;= 6) &amp;&amp; \</div><div class='ctx'> 	 ((reg) &lt; 0x40000) &amp;&amp;		 \</div><div class='del'>-	 ((reg) != FORCEWAKE) &amp;&amp;	 \</div><div class='del'>-	 ((reg) != ECOBUS))</div><div class='add'>+	 ((reg) != FORCEWAKE))</div><div class='ctx'> </div><div class='ctx'> #define __i915_read(x, y) \</div><div class='ctx'> 	u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg);</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c<br/>index 8359dc777041..e55badb2d86d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/i915_gem.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/i915_gem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/i915_gem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i915/i915_gem.c</a></div><div class='hunk'>@@ -2006,9 +2006,9 @@ i915_wait_request(struct intel_ring_buffer *ring,</div><div class='ctx'> 					   || atomic_read(&amp;dev_priv-&gt;mm.wedged));</div><div class='ctx'> </div><div class='ctx'> 			ring-&gt;irq_put(ring);</div><div class='del'>-		} else if (wait_for(i915_seqno_passed(ring-&gt;get_seqno(ring),</div><div class='del'>-						      seqno) ||</div><div class='del'>-				    atomic_read(&amp;dev_priv-&gt;mm.wedged), 3000))</div><div class='add'>+		} else if (wait_for_atomic(i915_seqno_passed(ring-&gt;get_seqno(ring),</div><div class='add'>+							     seqno) ||</div><div class='add'>+					   atomic_read(&amp;dev_priv-&gt;mm.wedged), 3000))</div><div class='ctx'> 			ret = -EBUSY;</div><div class='ctx'> 		ring-&gt;waiting_seqno = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3309,6 +3309,10 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file)</div><div class='ctx'> </div><div class='ctx'> 			if (ret == 0 &amp;&amp; atomic_read(&amp;dev_priv-&gt;mm.wedged))</div><div class='ctx'> 				ret = -EIO;</div><div class='add'>+		} else if (wait_for_atomic(i915_seqno_passed(ring-&gt;get_seqno(ring),</div><div class='add'>+							     seqno) ||</div><div class='add'>+				    atomic_read(&amp;dev_priv-&gt;mm.wedged), 3000)) {</div><div class='add'>+			ret = -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </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 b9da8900ae4e..65e1f0043f9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/i915_gem_execbuffer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/i915_gem_execbuffer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/i915_gem_execbuffer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i915/i915_gem_execbuffer.c</a></div><div class='hunk'>@@ -971,6 +971,31 @@ i915_gem_execbuffer_retire_commands(struct drm_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='add'>+i915_reset_gen7_sol_offsets(struct drm_device *dev,</div><div class='add'>+			    struct intel_ring_buffer *ring)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	if (!IS_GEN7(dev) || ring != &amp;dev_priv-&gt;ring[RCS])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = intel_ring_begin(ring, 4 * 3);</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; 4; i++) {</div><div class='add'>+		intel_ring_emit(ring, MI_LOAD_REGISTER_IMM(1));</div><div class='add'>+		intel_ring_emit(ring, GEN7_SO_WRITE_OFFSET(i));</div><div class='add'>+		intel_ring_emit(ring, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	intel_ring_advance(ring);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='ctx'> i915_gem_do_execbuffer(struct drm_device *dev, void *data,</div><div class='ctx'> 		       struct drm_file *file,</div><div class='ctx'> 		       struct drm_i915_gem_execbuffer2 *args,</div><div class='hunk'>@@ -984,6 +1009,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,</div><div class='ctx'> 	struct intel_ring_buffer *ring;</div><div class='ctx'> 	u32 exec_start, exec_len;</div><div class='ctx'> 	u32 seqno;</div><div class='add'>+	u32 mask;</div><div class='ctx'> 	int ret, mode, i;</div><div class='ctx'> </div><div class='ctx'> 	if (!i915_gem_check_execbuffer(args)) {</div><div class='hunk'>@@ -1021,6 +1047,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mode = args-&gt;flags &amp; I915_EXEC_CONSTANTS_MASK;</div><div class='add'>+	mask = I915_EXEC_CONSTANTS_MASK;</div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case I915_EXEC_CONSTANTS_REL_GENERAL:</div><div class='ctx'> 	case I915_EXEC_CONSTANTS_ABSOLUTE:</div><div class='hunk'>@@ -1034,18 +1061,9 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,</div><div class='ctx'> 			    mode == I915_EXEC_CONSTANTS_REL_SURFACE)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> </div><div class='del'>-			ret = intel_ring_begin(ring, 4);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-			intel_ring_emit(ring, MI_NOOP);</div><div class='del'>-			intel_ring_emit(ring, MI_LOAD_REGISTER_IMM(1));</div><div class='del'>-			intel_ring_emit(ring, INSTPM);</div><div class='del'>-			intel_ring_emit(ring,</div><div class='del'>-					I915_EXEC_CONSTANTS_MASK &lt;&lt; 16 | mode);</div><div class='del'>-			intel_ring_advance(ring);</div><div class='del'>-</div><div class='del'>-			dev_priv-&gt;relative_constants_mode = mode;</div><div class='add'>+			/* The HW changed the meaning on this bit on gen6 */</div><div class='add'>+			if (INTEL_INFO(dev)-&gt;gen &gt;= 6)</div><div class='add'>+				mask &amp;= ~I915_EXEC_CONSTANTS_REL_SURFACE;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1176,6 +1194,27 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (ring == &amp;dev_priv-&gt;ring[RCS] &amp;&amp;</div><div class='add'>+	    mode != dev_priv-&gt;relative_constants_mode) {</div><div class='add'>+		ret = intel_ring_begin(ring, 4);</div><div class='add'>+		if (ret)</div><div class='add'>+				goto err;</div><div class='add'>+</div><div class='add'>+		intel_ring_emit(ring, MI_NOOP);</div><div class='add'>+		intel_ring_emit(ring, MI_LOAD_REGISTER_IMM(1));</div><div class='add'>+		intel_ring_emit(ring, INSTPM);</div><div class='add'>+		intel_ring_emit(ring, mask &lt;&lt; 16 | mode);</div><div class='add'>+		intel_ring_advance(ring);</div><div class='add'>+</div><div class='add'>+		dev_priv-&gt;relative_constants_mode = mode;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (args-&gt;flags &amp; I915_EXEC_GEN7_SOL_RESET) {</div><div class='add'>+		ret = i915_reset_gen7_sol_offsets(dev, ring);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	trace_i915_gem_ring_dispatch(ring, seqno);</div><div class='ctx'> </div><div class='ctx'> 	exec_start = batch_obj-&gt;gtt_offset + args-&gt;batch_start_offset;</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c<br/>index b40004b55977..5d433fc11ace 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/i915_irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/i915_irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/i915_irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i915/i915_irq.c</a></div><div class='hunk'>@@ -1205,7 +1205,7 @@ static void i915_pageflip_stall_check(struct drm_device *dev, int pipe)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		int dspaddr = DSPADDR(intel_crtc-&gt;plane);</div><div class='ctx'> 		stall_detected = I915_READ(dspaddr) == (obj-&gt;gtt_offset +</div><div class='del'>-							crtc-&gt;y * crtc-&gt;fb-&gt;pitch +</div><div class='add'>+							crtc-&gt;y * crtc-&gt;fb-&gt;pitches[0] +</div><div class='ctx'> 							crtc-&gt;x * crtc-&gt;fb-&gt;bits_per_pixel/8);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1649,13 +1649,6 @@ static bool kick_ring(struct intel_ring_buffer *ring)</div><div class='ctx'> 		I915_WRITE_CTL(ring, tmp);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='del'>-	if (IS_GEN6(dev) &amp;&amp;</div><div class='del'>-	    (tmp &amp; RING_WAIT_SEMAPHORE)) {</div><div class='del'>-		DRM_ERROR("Kicking stuck semaphore on %s\n",</div><div class='del'>-			  ring-&gt;name);</div><div class='del'>-		I915_WRITE_CTL(ring, tmp);</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1669,7 +1662,7 @@ void i915_hangcheck_elapsed(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_device *dev = (struct drm_device *)data;</div><div class='ctx'> 	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	uint32_t acthd, instdone, instdone1;</div><div class='add'>+	uint32_t acthd, instdone, instdone1, acthd_bsd, acthd_blt;</div><div class='ctx'> 	bool err = false;</div><div class='ctx'> </div><div class='ctx'> 	if (!i915_enable_hangcheck)</div><div class='hunk'>@@ -1686,16 +1679,21 @@ void i915_hangcheck_elapsed(unsigned long data)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (INTEL_INFO(dev)-&gt;gen &lt; 4) {</div><div class='del'>-		acthd = I915_READ(ACTHD);</div><div class='ctx'> 		instdone = I915_READ(INSTDONE);</div><div class='ctx'> 		instdone1 = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		acthd = I915_READ(ACTHD_I965);</div><div class='ctx'> 		instdone = I915_READ(INSTDONE_I965);</div><div class='ctx'> 		instdone1 = I915_READ(INSTDONE1);</div><div class='ctx'> 	}</div><div class='add'>+	acthd = intel_ring_get_active_head(&amp;dev_priv-&gt;ring[RCS]);</div><div class='add'>+	acthd_bsd = HAS_BSD(dev) ?</div><div class='add'>+		intel_ring_get_active_head(&amp;dev_priv-&gt;ring[VCS]) : 0;</div><div class='add'>+	acthd_blt = HAS_BLT(dev) ?</div><div class='add'>+		intel_ring_get_active_head(&amp;dev_priv-&gt;ring[BCS]) : 0;</div><div class='ctx'> </div><div class='ctx'> 	if (dev_priv-&gt;last_acthd == acthd &amp;&amp;</div><div class='add'>+	    dev_priv-&gt;last_acthd_bsd == acthd_bsd &amp;&amp;</div><div class='add'>+	    dev_priv-&gt;last_acthd_blt == acthd_blt &amp;&amp;</div><div class='ctx'> 	    dev_priv-&gt;last_instdone == instdone &amp;&amp;</div><div class='ctx'> 	    dev_priv-&gt;last_instdone1 == instdone1) {</div><div class='ctx'> 		if (dev_priv-&gt;hangcheck_count++ &gt; 1) {</div><div class='hunk'>@@ -1727,6 +1725,8 @@ void i915_hangcheck_elapsed(unsigned long data)</div><div class='ctx'> 		dev_priv-&gt;hangcheck_count = 0;</div><div class='ctx'> </div><div class='ctx'> 		dev_priv-&gt;last_acthd = acthd;</div><div class='add'>+		dev_priv-&gt;last_acthd_bsd = acthd_bsd;</div><div class='add'>+		dev_priv-&gt;last_acthd_blt = acthd_blt;</div><div class='ctx'> 		dev_priv-&gt;last_instdone = instdone;</div><div class='ctx'> 		dev_priv-&gt;last_instdone1 = instdone1;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h<br/>index a26d5b0a3690..c3afb783cb9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/i915_reg.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/i915_reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/i915_reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i915/i915_reg.h</a></div><div class='hunk'>@@ -442,6 +442,7 @@</div><div class='ctx'> #define   INSTPM_AGPBUSY_DIS (1&lt;&lt;11) /* gen3: when disabled, pending interrupts</div><div class='ctx'> 					will not assert AGPBUSY# and will only</div><div class='ctx'> 					be delivered when out of C3. */</div><div class='add'>+#define   INSTPM_FORCE_ORDERING				(1&lt;&lt;7) /* GEN6+ */</div><div class='ctx'> #define ACTHD	        0x020c8</div><div class='ctx'> #define FW_BLC		0x020d8</div><div class='ctx'> #define FW_BLC2		0x020dc</div><div class='hunk'>@@ -2321,6 +2322,7 @@</div><div class='ctx'> #define   PIPECONF_PROGRESSIVE	(0 &lt;&lt; 21)</div><div class='ctx'> #define   PIPECONF_INTERLACE_W_FIELD_INDICATION	(6 &lt;&lt; 21)</div><div class='ctx'> #define   PIPECONF_INTERLACE_FIELD_0_ONLY		(7 &lt;&lt; 21)</div><div class='add'>+#define   PIPECONF_INTERLACE_MASK	(7 &lt;&lt; 21)</div><div class='ctx'> #define   PIPECONF_CXSR_DOWNCLOCK	(1&lt;&lt;16)</div><div class='ctx'> #define   PIPECONF_BPP_MASK	(0x000000e0)</div><div class='ctx'> #define   PIPECONF_BPP_8	(0&lt;&lt;5)</div><div class='hunk'>@@ -2459,6 +2461,8 @@</div><div class='ctx'> #define WM3_LP_ILK		0x45110</div><div class='ctx'> #define  WM3_LP_EN		(1&lt;&lt;31)</div><div class='ctx'> #define WM1S_LP_ILK		0x45120</div><div class='add'>+#define WM2S_LP_IVB		0x45124</div><div class='add'>+#define WM3S_LP_IVB		0x45128</div><div class='ctx'> #define  WM1S_LP_EN		(1&lt;&lt;31)</div><div class='ctx'> </div><div class='ctx'> /* Memory latency timer register */</div><div class='hunk'>@@ -2675,6 +2679,140 @@</div><div class='ctx'> #define _DSPBSURF		0x7119C</div><div class='ctx'> #define _DSPBTILEOFF		0x711A4</div><div class='ctx'> </div><div class='add'>+/* Sprite A control */</div><div class='add'>+#define _DVSACNTR		0x72180</div><div class='add'>+#define   DVS_ENABLE		(1&lt;&lt;31)</div><div class='add'>+#define   DVS_GAMMA_ENABLE	(1&lt;&lt;30)</div><div class='add'>+#define   DVS_PIXFORMAT_MASK	(3&lt;&lt;25)</div><div class='add'>+#define   DVS_FORMAT_YUV422	(0&lt;&lt;25)</div><div class='add'>+#define   DVS_FORMAT_RGBX101010	(1&lt;&lt;25)</div><div class='add'>+#define   DVS_FORMAT_RGBX888	(2&lt;&lt;25)</div><div class='add'>+#define   DVS_FORMAT_RGBX161616	(3&lt;&lt;25)</div><div class='add'>+#define   DVS_SOURCE_KEY	(1&lt;&lt;22)</div><div class='add'>+#define   DVS_RGB_ORDER_RGBX	(1&lt;&lt;20)</div><div class='add'>+#define   DVS_YUV_BYTE_ORDER_MASK (3&lt;&lt;16)</div><div class='add'>+#define   DVS_YUV_ORDER_YUYV	(0&lt;&lt;16)</div><div class='add'>+#define   DVS_YUV_ORDER_UYVY	(1&lt;&lt;16)</div><div class='add'>+#define   DVS_YUV_ORDER_YVYU	(2&lt;&lt;16)</div><div class='add'>+#define   DVS_YUV_ORDER_VYUY	(3&lt;&lt;16)</div><div class='add'>+#define   DVS_DEST_KEY		(1&lt;&lt;2)</div><div class='add'>+#define   DVS_TRICKLE_FEED_DISABLE (1&lt;&lt;14)</div><div class='add'>+#define   DVS_TILED		(1&lt;&lt;10)</div><div class='add'>+#define _DVSALINOFF		0x72184</div><div class='add'>+#define _DVSASTRIDE		0x72188</div><div class='add'>+#define _DVSAPOS		0x7218c</div><div class='add'>+#define _DVSASIZE		0x72190</div><div class='add'>+#define _DVSAKEYVAL		0x72194</div><div class='add'>+#define _DVSAKEYMSK		0x72198</div><div class='add'>+#define _DVSASURF		0x7219c</div><div class='add'>+#define _DVSAKEYMAXVAL		0x721a0</div><div class='add'>+#define _DVSATILEOFF		0x721a4</div><div class='add'>+#define _DVSASURFLIVE		0x721ac</div><div class='add'>+#define _DVSASCALE		0x72204</div><div class='add'>+#define   DVS_SCALE_ENABLE	(1&lt;&lt;31)</div><div class='add'>+#define   DVS_FILTER_MASK	(3&lt;&lt;29)</div><div class='add'>+#define   DVS_FILTER_MEDIUM	(0&lt;&lt;29)</div><div class='add'>+#define   DVS_FILTER_ENHANCING	(1&lt;&lt;29)</div><div class='add'>+#define   DVS_FILTER_SOFTENING	(2&lt;&lt;29)</div><div class='add'>+#define   DVS_VERTICAL_OFFSET_HALF (1&lt;&lt;28) /* must be enabled below */</div><div class='add'>+#define   DVS_VERTICAL_OFFSET_ENABLE (1&lt;&lt;27)</div><div class='add'>+#define _DVSAGAMC		0x72300</div><div class='add'>+</div><div class='add'>+#define _DVSBCNTR		0x73180</div><div class='add'>+#define _DVSBLINOFF		0x73184</div><div class='add'>+#define _DVSBSTRIDE		0x73188</div><div class='add'>+#define _DVSBPOS		0x7318c</div><div class='add'>+#define _DVSBSIZE		0x73190</div><div class='add'>+#define _DVSBKEYVAL		0x73194</div><div class='add'>+#define _DVSBKEYMSK		0x73198</div><div class='add'>+#define _DVSBSURF		0x7319c</div><div class='add'>+#define _DVSBKEYMAXVAL		0x731a0</div><div class='add'>+#define _DVSBTILEOFF		0x731a4</div><div class='add'>+#define _DVSBSURFLIVE		0x731ac</div><div class='add'>+#define _DVSBSCALE		0x73204</div><div class='add'>+#define _DVSBGAMC		0x73300</div><div class='add'>+</div><div class='add'>+#define DVSCNTR(pipe) _PIPE(pipe, _DVSACNTR, _DVSBCNTR)</div><div class='add'>+#define DVSLINOFF(pipe) _PIPE(pipe, _DVSALINOFF, _DVSBLINOFF)</div><div class='add'>+#define DVSSTRIDE(pipe) _PIPE(pipe, _DVSASTRIDE, _DVSBSTRIDE)</div><div class='add'>+#define DVSPOS(pipe) _PIPE(pipe, _DVSAPOS, _DVSBPOS)</div><div class='add'>+#define DVSSURF(pipe) _PIPE(pipe, _DVSASURF, _DVSBSURF)</div><div class='add'>+#define DVSKEYMAX(pipe) _PIPE(pipe, _DVSAKEYMAXVAL, _DVSBKEYMAXVAL)</div><div class='add'>+#define DVSSIZE(pipe) _PIPE(pipe, _DVSASIZE, _DVSBSIZE)</div><div class='add'>+#define DVSSCALE(pipe) _PIPE(pipe, _DVSASCALE, _DVSBSCALE)</div><div class='add'>+#define DVSTILEOFF(pipe) _PIPE(pipe, _DVSATILEOFF, _DVSBTILEOFF)</div><div class='add'>+#define DVSKEYVAL(pipe) _PIPE(pipe, _DVSAKEYVAL, _DVSBKEYVAL)</div><div class='add'>+#define DVSKEYMSK(pipe) _PIPE(pipe, _DVSAKEYMSK, _DVSBKEYMSK)</div><div class='add'>+</div><div class='add'>+#define _SPRA_CTL		0x70280</div><div class='add'>+#define   SPRITE_ENABLE			(1&lt;&lt;31)</div><div class='add'>+#define   SPRITE_GAMMA_ENABLE		(1&lt;&lt;30)</div><div class='add'>+#define   SPRITE_PIXFORMAT_MASK		(7&lt;&lt;25)</div><div class='add'>+#define   SPRITE_FORMAT_YUV422		(0&lt;&lt;25)</div><div class='add'>+#define   SPRITE_FORMAT_RGBX101010	(1&lt;&lt;25)</div><div class='add'>+#define   SPRITE_FORMAT_RGBX888		(2&lt;&lt;25)</div><div class='add'>+#define   SPRITE_FORMAT_RGBX161616	(3&lt;&lt;25)</div><div class='add'>+#define   SPRITE_FORMAT_YUV444		(4&lt;&lt;25)</div><div class='add'>+#define   SPRITE_FORMAT_XR_BGR101010	(5&lt;&lt;25) /* Extended range */</div><div class='add'>+#define   SPRITE_CSC_ENABLE		(1&lt;&lt;24)</div><div class='add'>+#define   SPRITE_SOURCE_KEY		(1&lt;&lt;22)</div><div class='add'>+#define   SPRITE_RGB_ORDER_RGBX		(1&lt;&lt;20) /* only for 888 and 161616 */</div><div class='add'>+#define   SPRITE_YUV_TO_RGB_CSC_DISABLE	(1&lt;&lt;19)</div><div class='add'>+#define   SPRITE_YUV_CSC_FORMAT_BT709	(1&lt;&lt;18) /* 0 is BT601 */</div><div class='add'>+#define   SPRITE_YUV_BYTE_ORDER_MASK	(3&lt;&lt;16)</div><div class='add'>+#define   SPRITE_YUV_ORDER_YUYV		(0&lt;&lt;16)</div><div class='add'>+#define   SPRITE_YUV_ORDER_UYVY		(1&lt;&lt;16)</div><div class='add'>+#define   SPRITE_YUV_ORDER_YVYU		(2&lt;&lt;16)</div><div class='add'>+#define   SPRITE_YUV_ORDER_VYUY		(3&lt;&lt;16)</div><div class='add'>+#define   SPRITE_TRICKLE_FEED_DISABLE	(1&lt;&lt;14)</div><div class='add'>+#define   SPRITE_INT_GAMMA_ENABLE	(1&lt;&lt;13)</div><div class='add'>+#define   SPRITE_TILED			(1&lt;&lt;10)</div><div class='add'>+#define   SPRITE_DEST_KEY		(1&lt;&lt;2)</div><div class='add'>+#define _SPRA_LINOFF		0x70284</div><div class='add'>+#define _SPRA_STRIDE		0x70288</div><div class='add'>+#define _SPRA_POS		0x7028c</div><div class='add'>+#define _SPRA_SIZE		0x70290</div><div class='add'>+#define _SPRA_KEYVAL		0x70294</div><div class='add'>+#define _SPRA_KEYMSK		0x70298</div><div class='add'>+#define _SPRA_SURF		0x7029c</div><div class='add'>+#define _SPRA_KEYMAX		0x702a0</div><div class='add'>+#define _SPRA_TILEOFF		0x702a4</div><div class='add'>+#define _SPRA_SCALE		0x70304</div><div class='add'>+#define   SPRITE_SCALE_ENABLE	(1&lt;&lt;31)</div><div class='add'>+#define   SPRITE_FILTER_MASK	(3&lt;&lt;29)</div><div class='add'>+#define   SPRITE_FILTER_MEDIUM	(0&lt;&lt;29)</div><div class='add'>+#define   SPRITE_FILTER_ENHANCING	(1&lt;&lt;29)</div><div class='add'>+#define   SPRITE_FILTER_SOFTENING	(2&lt;&lt;29)</div><div class='add'>+#define   SPRITE_VERTICAL_OFFSET_HALF	(1&lt;&lt;28) /* must be enabled below */</div><div class='add'>+#define   SPRITE_VERTICAL_OFFSET_ENABLE	(1&lt;&lt;27)</div><div class='add'>+#define _SPRA_GAMC		0x70400</div><div class='add'>+</div><div class='add'>+#define _SPRB_CTL		0x71280</div><div class='add'>+#define _SPRB_LINOFF		0x71284</div><div class='add'>+#define _SPRB_STRIDE		0x71288</div><div class='add'>+#define _SPRB_POS		0x7128c</div><div class='add'>+#define _SPRB_SIZE		0x71290</div><div class='add'>+#define _SPRB_KEYVAL		0x71294</div><div class='add'>+#define _SPRB_KEYMSK		0x71298</div><div class='add'>+#define _SPRB_SURF		0x7129c</div><div class='add'>+#define _SPRB_KEYMAX		0x712a0</div><div class='add'>+#define _SPRB_TILEOFF		0x712a4</div><div class='add'>+#define _SPRB_SCALE		0x71304</div><div class='add'>+#define _SPRB_GAMC		0x71400</div><div class='add'>+</div><div class='add'>+#define SPRCTL(pipe) _PIPE(pipe, _SPRA_CTL, _SPRB_CTL)</div><div class='add'>+#define SPRLINOFF(pipe) _PIPE(pipe, _SPRA_LINOFF, _SPRB_LINOFF)</div><div class='add'>+#define SPRSTRIDE(pipe) _PIPE(pipe, _SPRA_STRIDE, _SPRB_STRIDE)</div><div class='add'>+#define SPRPOS(pipe) _PIPE(pipe, _SPRA_POS, _SPRB_POS)</div><div class='add'>+#define SPRSIZE(pipe) _PIPE(pipe, _SPRA_SIZE, _SPRB_SIZE)</div><div class='add'>+#define SPRKEYVAL(pipe) _PIPE(pipe, _SPRA_KEYVAL, _SPRB_KEYVAL)</div><div class='add'>+#define SPRKEYMSK(pipe) _PIPE(pipe, _SPRA_KEYMSK, _SPRB_KEYMSK)</div><div class='add'>+#define SPRSURF(pipe) _PIPE(pipe, _SPRA_SURF, _SPRB_SURF)</div><div class='add'>+#define SPRKEYMAX(pipe) _PIPE(pipe, _SPRA_KEYMAX, _SPRB_KEYMAX)</div><div class='add'>+#define SPRTILEOFF(pipe) _PIPE(pipe, _SPRA_TILEOFF, _SPRB_TILEOFF)</div><div class='add'>+#define SPRSCALE(pipe) _PIPE(pipe, _SPRA_SCALE, _SPRB_SCALE)</div><div class='add'>+#define SPRGAMC(pipe) _PIPE(pipe, _SPRA_GAMC, _SPRB_GAMC)</div><div class='add'>+</div><div class='ctx'> /* VBIOS regs */</div><div class='ctx'> #define VGACNTRL		0x71400</div><div class='ctx'> # define VGA_DISP_DISABLE			(1 &lt;&lt; 31)</div><div class='hunk'>@@ -2882,6 +3020,10 @@</div><div class='ctx'> #define   ILK_DPFC_DIS1		(1&lt;&lt;8)</div><div class='ctx'> #define   ILK_DPFC_DIS2		(1&lt;&lt;9)</div><div class='ctx'> </div><div class='add'>+#define IVB_CHICKEN3	0x4200c</div><div class='add'>+# define CHICKEN3_DGMG_REQ_OUT_FIX_DISABLE	(1 &lt;&lt; 5)</div><div class='add'>+# define CHICKEN3_DGMG_DONE_FIX_DISABLE		(1 &lt;&lt; 2)</div><div class='add'>+</div><div class='ctx'> #define DISP_ARB_CTL	0x45000</div><div class='ctx'> #define  DISP_TILE_SURFACE_SWIZZLING	(1&lt;&lt;13)</div><div class='ctx'> #define  DISP_FBC_WM_DIS		(1&lt;&lt;15)</div><div class='hunk'>@@ -3500,7 +3642,11 @@</div><div class='ctx'> #define   GEN6_CAGF_MASK			(0x7f &lt;&lt; GEN6_CAGF_SHIFT)</div><div class='ctx'> #define GEN6_RP_CONTROL				0xA024</div><div class='ctx'> #define   GEN6_RP_MEDIA_TURBO			(1&lt;&lt;11)</div><div class='del'>-#define   GEN6_RP_USE_NORMAL_FREQ		(1&lt;&lt;9)</div><div class='add'>+#define   GEN6_RP_MEDIA_MODE_MASK		(3&lt;&lt;9)</div><div class='add'>+#define   GEN6_RP_MEDIA_HW_TURBO_MODE		(3&lt;&lt;9)</div><div class='add'>+#define   GEN6_RP_MEDIA_HW_NORMAL_MODE		(2&lt;&lt;9)</div><div class='add'>+#define   GEN6_RP_MEDIA_HW_MODE			(1&lt;&lt;9)</div><div class='add'>+#define   GEN6_RP_MEDIA_SW_MODE			(0&lt;&lt;9)</div><div class='ctx'> #define   GEN6_RP_MEDIA_IS_GFX			(1&lt;&lt;8)</div><div class='ctx'> #define   GEN6_RP_ENABLE			(1&lt;&lt;7)</div><div class='ctx'> #define   GEN6_RP_UP_IDLE_MIN			(0x1&lt;&lt;3)</div><div class='hunk'>@@ -3557,6 +3703,14 @@</div><div class='ctx'> #define GEN6_PCODE_DATA				0x138128</div><div class='ctx'> #define   GEN6_PCODE_FREQ_IA_RATIO_SHIFT	8</div><div class='ctx'> </div><div class='add'>+#define GEN6_GT_CORE_STATUS		0x138060</div><div class='add'>+#define   GEN6_CORE_CPD_STATE_MASK	(7&lt;&lt;4)</div><div class='add'>+#define   GEN6_RCn_MASK			7</div><div class='add'>+#define   GEN6_RC0			0</div><div class='add'>+#define   GEN6_RC3			2</div><div class='add'>+#define   GEN6_RC6			3</div><div class='add'>+#define   GEN6_RC7			4</div><div class='add'>+</div><div class='ctx'> #define G4X_AUD_VID_DID			0x62020</div><div class='ctx'> #define INTEL_AUDIO_DEVCL		0x808629FB</div><div class='ctx'> #define INTEL_AUDIO_DEVBLC		0x80862801</div><div class='hunk'>@@ -3569,17 +3723,23 @@</div><div class='ctx'> #define G4X_ELD_ACK			(1 &lt;&lt; 4)</div><div class='ctx'> #define G4X_HDMIW_HDMIEDID		0x6210C</div><div class='ctx'> </div><div class='del'>-#define GEN5_HDMIW_HDMIEDID_A		0xE2050</div><div class='del'>-#define GEN5_AUD_CNTL_ST_A		0xE20B4</div><div class='del'>-#define GEN5_ELD_BUFFER_SIZE		(0x1f &lt;&lt; 10)</div><div class='del'>-#define GEN5_ELD_ADDRESS		(0x1f &lt;&lt; 5)</div><div class='del'>-#define GEN5_ELD_ACK			(1 &lt;&lt; 4)</div><div class='del'>-#define GEN5_AUD_CNTL_ST2		0xE20C0</div><div class='del'>-#define GEN5_ELD_VALIDB			(1 &lt;&lt; 0)</div><div class='del'>-#define GEN5_CP_READYB			(1 &lt;&lt; 1)</div><div class='del'>-</div><div class='del'>-#define GEN7_HDMIW_HDMIEDID_A		0xE5050</div><div class='del'>-#define GEN7_AUD_CNTRL_ST_A		0xE50B4</div><div class='del'>-#define GEN7_AUD_CNTRL_ST2		0xE50C0</div><div class='add'>+#define IBX_HDMIW_HDMIEDID_A		0xE2050</div><div class='add'>+#define IBX_AUD_CNTL_ST_A		0xE20B4</div><div class='add'>+#define IBX_ELD_BUFFER_SIZE		(0x1f &lt;&lt; 10)</div><div class='add'>+#define IBX_ELD_ADDRESS			(0x1f &lt;&lt; 5)</div><div class='add'>+#define IBX_ELD_ACK			(1 &lt;&lt; 4)</div><div class='add'>+#define IBX_AUD_CNTL_ST2		0xE20C0</div><div class='add'>+#define IBX_ELD_VALIDB			(1 &lt;&lt; 0)</div><div class='add'>+#define IBX_CP_READYB			(1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+#define CPT_HDMIW_HDMIEDID_A		0xE5050</div><div class='add'>+#define CPT_AUD_CNTL_ST_A		0xE50B4</div><div class='add'>+#define CPT_AUD_CNTRL_ST2		0xE50C0</div><div class='add'>+</div><div class='add'>+/* These are the 4 32-bit write offset registers for each stream</div><div class='add'>+ * output buffer.  It determines the offset from the</div><div class='add'>+ * 3DSTATE_SO_BUFFERs that the next streamed vertex output goes to.</div><div class='add'>+ */</div><div class='add'>+#define GEN7_SO_WRITE_OFFSET(n)		(0x5280 + (n) * 4)</div><div class='ctx'> </div><div class='ctx'> #endif /* _I915_REG_H_ */</div><div class='head'>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c<br/>index daa5743ccbd6..2a3f707caab8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/intel_display.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/intel_display.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/intel_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i915/intel_display.c</a></div><div class='hunk'>@@ -915,8 +915,8 @@ static void assert_panel_unlocked(struct drm_i915_private *dev_priv,</div><div class='ctx'> 	     pipe_name(pipe));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void assert_pipe(struct drm_i915_private *dev_priv,</div><div class='del'>-			enum pipe pipe, bool state)</div><div class='add'>+void assert_pipe(struct drm_i915_private *dev_priv,</div><div class='add'>+		 enum pipe pipe, bool state)</div><div class='ctx'> {</div><div class='ctx'> 	int reg;</div><div class='ctx'> 	u32 val;</div><div class='hunk'>@@ -929,8 +929,6 @@ static void assert_pipe(struct drm_i915_private *dev_priv,</div><div class='ctx'> 	     "pipe %c assertion failure (expected %s, current %s)\n",</div><div class='ctx'> 	     pipe_name(pipe), state_string(state), state_string(cur_state));</div><div class='ctx'> }</div><div class='del'>-#define assert_pipe_enabled(d, p) assert_pipe(d, p, true)</div><div class='del'>-#define assert_pipe_disabled(d, p) assert_pipe(d, p, false)</div><div class='ctx'> </div><div class='ctx'> static void assert_plane_enabled(struct drm_i915_private *dev_priv,</div><div class='ctx'> 				 enum plane plane)</div><div class='hunk'>@@ -1206,7 +1204,8 @@ static void intel_disable_pch_pll(struct drm_i915_private *dev_priv,</div><div class='ctx'> 				  enum pipe pipe)</div><div class='ctx'> {</div><div class='ctx'> 	int reg;</div><div class='del'>-	u32 val;</div><div class='add'>+	u32 val, pll_mask = TRANSC_DPLL_ENABLE | TRANSC_DPLLB_SEL,</div><div class='add'>+		pll_sel = TRANSC_DPLL_ENABLE;</div><div class='ctx'> </div><div class='ctx'> 	if (pipe &gt; 1)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1217,6 +1216,15 @@ static void intel_disable_pch_pll(struct drm_i915_private *dev_priv,</div><div class='ctx'> 	/* Make sure transcoder isn't still depending on us */</div><div class='ctx'> 	assert_transcoder_disabled(dev_priv, pipe);</div><div class='ctx'> </div><div class='add'>+	if (pipe == 0)</div><div class='add'>+		pll_sel |= TRANSC_DPLLA_SEL;</div><div class='add'>+	else if (pipe == 1)</div><div class='add'>+		pll_sel |= TRANSC_DPLLB_SEL;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if ((I915_READ(PCH_DPLL_SEL) &amp; pll_mask) == pll_sel)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	reg = PCH_DPLL(pipe);</div><div class='ctx'> 	val = I915_READ(reg);</div><div class='ctx'> 	val &amp;= ~DPLL_VCO_ENABLE;</div><div class='hunk'>@@ -1511,8 +1519,8 @@ static void i8xx_enable_fbc(struct drm_crtc *crtc, unsigned long interval)</div><div class='ctx'> 	u32 fbc_ctl, fbc_ctl2;</div><div class='ctx'> </div><div class='ctx'> 	cfb_pitch = dev_priv-&gt;cfb_size / FBC_LL_SIZE;</div><div class='del'>-	if (fb-&gt;pitch &lt; cfb_pitch)</div><div class='del'>-		cfb_pitch = fb-&gt;pitch;</div><div class='add'>+	if (fb-&gt;pitches[0] &lt; cfb_pitch)</div><div class='add'>+		cfb_pitch = fb-&gt;pitches[0];</div><div class='ctx'> </div><div class='ctx'> 	/* FBC_CTL wants 64B units */</div><div class='ctx'> 	cfb_pitch = (cfb_pitch / 64) - 1;</div><div class='hunk'>@@ -2073,11 +2081,11 @@ static int i9xx_update_plane(struct drm_crtc *crtc, struct drm_framebuffer *fb,</div><div class='ctx'> 	I915_WRITE(reg, dspcntr);</div><div class='ctx'> </div><div class='ctx'> 	Start = obj-&gt;gtt_offset;</div><div class='del'>-	Offset = y * fb-&gt;pitch + x * (fb-&gt;bits_per_pixel / 8);</div><div class='add'>+	Offset = y * fb-&gt;pitches[0] + x * (fb-&gt;bits_per_pixel / 8);</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("Writing base %08lX %08lX %d %d %d\n",</div><div class='del'>-		      Start, Offset, x, y, fb-&gt;pitch);</div><div class='del'>-	I915_WRITE(DSPSTRIDE(plane), fb-&gt;pitch);</div><div class='add'>+		      Start, Offset, x, y, fb-&gt;pitches[0]);</div><div class='add'>+	I915_WRITE(DSPSTRIDE(plane), fb-&gt;pitches[0]);</div><div class='ctx'> 	if (INTEL_INFO(dev)-&gt;gen &gt;= 4) {</div><div class='ctx'> 		I915_WRITE(DSPSURF(plane), Start);</div><div class='ctx'> 		I915_WRITE(DSPTILEOFF(plane), (y &lt;&lt; 16) | x);</div><div class='hunk'>@@ -2154,11 +2162,11 @@ static int ironlake_update_plane(struct drm_crtc *crtc,</div><div class='ctx'> 	I915_WRITE(reg, dspcntr);</div><div class='ctx'> </div><div class='ctx'> 	Start = obj-&gt;gtt_offset;</div><div class='del'>-	Offset = y * fb-&gt;pitch + x * (fb-&gt;bits_per_pixel / 8);</div><div class='add'>+	Offset = y * fb-&gt;pitches[0] + x * (fb-&gt;bits_per_pixel / 8);</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG_KMS("Writing base %08lX %08lX %d %d %d\n",</div><div class='del'>-		      Start, Offset, x, y, fb-&gt;pitch);</div><div class='del'>-	I915_WRITE(DSPSTRIDE(plane), fb-&gt;pitch);</div><div class='add'>+		      Start, Offset, x, y, fb-&gt;pitches[0]);</div><div class='add'>+	I915_WRITE(DSPSTRIDE(plane), fb-&gt;pitches[0]);</div><div class='ctx'> 	I915_WRITE(DSPSURF(plane), Start);</div><div class='ctx'> 	I915_WRITE(DSPTILEOFF(plane), (y &lt;&lt; 16) | x);</div><div class='ctx'> 	I915_WRITE(DSPADDR(plane), Offset);</div><div class='hunk'>@@ -4509,7 +4517,7 @@ static void ironlake_update_wm(struct drm_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sandybridge_update_wm(struct drm_device *dev)</div><div class='add'>+void sandybridge_update_wm(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	int latency = SNB_READ_WM0_LATENCY() * 100;	/* In unit 0.1us */</div><div class='hunk'>@@ -4569,7 +4577,8 @@ static void sandybridge_update_wm(struct drm_device *dev)</div><div class='ctx'> 	I915_WRITE(WM2_LP_ILK, 0);</div><div class='ctx'> 	I915_WRITE(WM1_LP_ILK, 0);</div><div class='ctx'> </div><div class='del'>-	if (!single_plane_enabled(enabled))</div><div class='add'>+	if (!single_plane_enabled(enabled) ||</div><div class='add'>+	    dev_priv-&gt;sprite_scaling_enabled)</div><div class='ctx'> 		return;</div><div class='ctx'> 	enabled = ffs(enabled) - 1;</div><div class='ctx'> </div><div class='hunk'>@@ -4619,6 +4628,149 @@ static void sandybridge_update_wm(struct drm_device *dev)</div><div class='ctx'> 		   cursor_wm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool</div><div class='add'>+sandybridge_compute_sprite_wm(struct drm_device *dev, int plane,</div><div class='add'>+			      uint32_t sprite_width, int pixel_size,</div><div class='add'>+			      const struct intel_watermark_params *display,</div><div class='add'>+			      int display_latency_ns, int *sprite_wm)</div><div class='add'>+{</div><div class='add'>+	struct drm_crtc *crtc;</div><div class='add'>+	int clock;</div><div class='add'>+	int entries, tlb_miss;</div><div class='add'>+</div><div class='add'>+	crtc = intel_get_crtc_for_plane(dev, plane);</div><div class='add'>+	if (crtc-&gt;fb == NULL || !crtc-&gt;enabled) {</div><div class='add'>+		*sprite_wm = display-&gt;guard_size;</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clock = crtc-&gt;mode.clock;</div><div class='add'>+</div><div class='add'>+	/* Use the small buffer method to calculate the sprite watermark */</div><div class='add'>+	entries = ((clock * pixel_size / 1000) * display_latency_ns) / 1000;</div><div class='add'>+	tlb_miss = display-&gt;fifo_size*display-&gt;cacheline_size -</div><div class='add'>+		sprite_width * 8;</div><div class='add'>+	if (tlb_miss &gt; 0)</div><div class='add'>+		entries += tlb_miss;</div><div class='add'>+	entries = DIV_ROUND_UP(entries, display-&gt;cacheline_size);</div><div class='add'>+	*sprite_wm = entries + display-&gt;guard_size;</div><div class='add'>+	if (*sprite_wm &gt; (int)display-&gt;max_wm)</div><div class='add'>+		*sprite_wm = display-&gt;max_wm;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+sandybridge_compute_sprite_srwm(struct drm_device *dev, int plane,</div><div class='add'>+				uint32_t sprite_width, int pixel_size,</div><div class='add'>+				const struct intel_watermark_params *display,</div><div class='add'>+				int latency_ns, int *sprite_wm)</div><div class='add'>+{</div><div class='add'>+	struct drm_crtc *crtc;</div><div class='add'>+	unsigned long line_time_us;</div><div class='add'>+	int clock;</div><div class='add'>+	int line_count, line_size;</div><div class='add'>+	int small, large;</div><div class='add'>+	int entries;</div><div class='add'>+</div><div class='add'>+	if (!latency_ns) {</div><div class='add'>+		*sprite_wm = 0;</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	crtc = intel_get_crtc_for_plane(dev, plane);</div><div class='add'>+	clock = crtc-&gt;mode.clock;</div><div class='add'>+</div><div class='add'>+	line_time_us = (sprite_width * 1000) / clock;</div><div class='add'>+	line_count = (latency_ns / line_time_us + 1000) / 1000;</div><div class='add'>+	line_size = sprite_width * pixel_size;</div><div class='add'>+</div><div class='add'>+	/* Use the minimum of the small and large buffer method for primary */</div><div class='add'>+	small = ((clock * pixel_size / 1000) * latency_ns) / 1000;</div><div class='add'>+	large = line_count * line_size;</div><div class='add'>+</div><div class='add'>+	entries = DIV_ROUND_UP(min(small, large), display-&gt;cacheline_size);</div><div class='add'>+	*sprite_wm = entries + display-&gt;guard_size;</div><div class='add'>+</div><div class='add'>+	return *sprite_wm &gt; 0x3ff ? false : true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sandybridge_update_sprite_wm(struct drm_device *dev, int pipe,</div><div class='add'>+					 uint32_t sprite_width, int pixel_size)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int latency = SNB_READ_WM0_LATENCY() * 100;	/* In unit 0.1us */</div><div class='add'>+	int sprite_wm, reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (pipe) {</div><div class='add'>+	case 0:</div><div class='add'>+		reg = WM0_PIPEA_ILK;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		reg = WM0_PIPEB_ILK;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		reg = WM0_PIPEC_IVB;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return; /* bad pipe */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = sandybridge_compute_sprite_wm(dev, pipe, sprite_width, pixel_size,</div><div class='add'>+					    &amp;sandybridge_display_wm_info,</div><div class='add'>+					    latency, &amp;sprite_wm);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		DRM_DEBUG_KMS("failed to compute sprite wm for pipe %d\n",</div><div class='add'>+			      pipe);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	I915_WRITE(reg, I915_READ(reg) | (sprite_wm &lt;&lt; WM0_PIPE_SPRITE_SHIFT));</div><div class='add'>+	DRM_DEBUG_KMS("sprite watermarks For pipe %d - %d\n", pipe, sprite_wm);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	ret = sandybridge_compute_sprite_srwm(dev, pipe, sprite_width,</div><div class='add'>+					      pixel_size,</div><div class='add'>+					      &amp;sandybridge_display_srwm_info,</div><div class='add'>+					      SNB_READ_WM1_LATENCY() * 500,</div><div class='add'>+					      &amp;sprite_wm);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		DRM_DEBUG_KMS("failed to compute sprite lp1 wm on pipe %d\n",</div><div class='add'>+			      pipe);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	I915_WRITE(WM1S_LP_ILK, sprite_wm);</div><div class='add'>+</div><div class='add'>+	/* Only IVB has two more LP watermarks for sprite */</div><div class='add'>+	if (!IS_IVYBRIDGE(dev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = sandybridge_compute_sprite_srwm(dev, pipe, sprite_width,</div><div class='add'>+					      pixel_size,</div><div class='add'>+					      &amp;sandybridge_display_srwm_info,</div><div class='add'>+					      SNB_READ_WM2_LATENCY() * 500,</div><div class='add'>+					      &amp;sprite_wm);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		DRM_DEBUG_KMS("failed to compute sprite lp2 wm on pipe %d\n",</div><div class='add'>+			      pipe);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	I915_WRITE(WM2S_LP_IVB, sprite_wm);</div><div class='add'>+</div><div class='add'>+	ret = sandybridge_compute_sprite_srwm(dev, pipe, sprite_width,</div><div class='add'>+					      pixel_size,</div><div class='add'>+					      &amp;sandybridge_display_srwm_info,</div><div class='add'>+					      SNB_READ_WM3_LATENCY() * 500,</div><div class='add'>+					      &amp;sprite_wm);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		DRM_DEBUG_KMS("failed to compute sprite lp3 wm on pipe %d\n",</div><div class='add'>+			      pipe);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	I915_WRITE(WM3S_LP_IVB, sprite_wm);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * intel_update_watermarks - update FIFO watermark values based on current modes</div><div class='ctx'>  *</div><div class='hunk'>@@ -4659,6 +4811,16 @@ static void intel_update_watermarks(struct drm_device *dev)</div><div class='ctx'> 		dev_priv-&gt;display.update_wm(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void intel_update_sprite_watermarks(struct drm_device *dev, int pipe,</div><div class='add'>+				    uint32_t sprite_width, int pixel_size)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;display.update_sprite_wm)</div><div class='add'>+		dev_priv-&gt;display.update_sprite_wm(dev, pipe, sprite_width,</div><div class='add'>+						   pixel_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool intel_panel_use_ssc(struct drm_i915_private *dev_priv)</div><div class='ctx'> {</div><div class='ctx'> 	if (i915_panel_use_ssc &gt;= 0)</div><div class='hunk'>@@ -5155,7 +5317,7 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc,</div><div class='ctx'> 		adjusted_mode-&gt;crtc_vsync_end -= 1;</div><div class='ctx'> 		adjusted_mode-&gt;crtc_vsync_start -= 1;</div><div class='ctx'> 	} else</div><div class='del'>-		pipeconf &amp;= ~PIPECONF_INTERLACE_W_FIELD_INDICATION; /* progressive */</div><div class='add'>+		pipeconf &amp;= ~PIPECONF_INTERLACE_MASK; /* progressive */</div><div class='ctx'> </div><div class='ctx'> 	I915_WRITE(HTOTAL(pipe),</div><div class='ctx'> 		   (adjusted_mode-&gt;crtc_hdisplay - 1) |</div><div class='hunk'>@@ -5822,14 +5984,45 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,</div><div class='ctx'> </div><div class='ctx'> 	ret = dev_priv-&gt;display.crtc_mode_set(crtc, mode, adjusted_mode,</div><div class='ctx'> 					      x, y, old_fb);</div><div class='del'>-</div><div class='ctx'> 	drm_vblank_post_modeset(dev, pipe);</div><div class='ctx'> </div><div class='del'>-	intel_crtc-&gt;dpms_mode = DRM_MODE_DPMS_ON;</div><div class='add'>+	if (ret)</div><div class='add'>+		intel_crtc-&gt;dpms_mode = DRM_MODE_DPMS_OFF;</div><div class='add'>+	else</div><div class='add'>+		intel_crtc-&gt;dpms_mode = DRM_MODE_DPMS_ON;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool intel_eld_uptodate(struct drm_connector *connector,</div><div class='add'>+			       int reg_eldv, uint32_t bits_eldv,</div><div class='add'>+			       int reg_elda, uint32_t bits_elda,</div><div class='add'>+			       int reg_edid)</div><div class='add'>+{</div><div class='add'>+	struct drm_i915_private *dev_priv = connector-&gt;dev-&gt;dev_private;</div><div class='add'>+	uint8_t *eld = connector-&gt;eld;</div><div class='add'>+	uint32_t i;</div><div class='add'>+</div><div class='add'>+	i = I915_READ(reg_eldv);</div><div class='add'>+	i &amp;= bits_eldv;</div><div class='add'>+</div><div class='add'>+	if (!eld[0])</div><div class='add'>+		return !i;</div><div class='add'>+</div><div class='add'>+	if (!i)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	i = I915_READ(reg_elda);</div><div class='add'>+	i &amp;= ~bits_elda;</div><div class='add'>+	I915_WRITE(reg_elda, i);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; eld[2]; i++)</div><div class='add'>+		if (I915_READ(reg_edid) != *((uint32_t *)eld + 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='ctx'> static void g4x_write_eld(struct drm_connector *connector,</div><div class='ctx'> 			  struct drm_crtc *crtc)</div><div class='ctx'> {</div><div class='hunk'>@@ -5846,6 +6039,12 @@ static void g4x_write_eld(struct drm_connector *connector,</div><div class='ctx'> 	else</div><div class='ctx'> 		eldv = G4X_ELDV_DEVCTG;</div><div class='ctx'> </div><div class='add'>+	if (intel_eld_uptodate(connector,</div><div class='add'>+			       G4X_AUD_CNTL_ST, eldv,</div><div class='add'>+			       G4X_AUD_CNTL_ST, G4X_ELD_ADDR,</div><div class='add'>+			       G4X_HDMIW_HDMIEDID))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	i = I915_READ(G4X_AUD_CNTL_ST);</div><div class='ctx'> 	i &amp;= ~(eldv | G4X_ELD_ADDR);</div><div class='ctx'> 	len = (i &gt;&gt; 9) &amp; 0x1f;		/* ELD buffer size */</div><div class='hunk'>@@ -5876,14 +6075,14 @@ static void ironlake_write_eld(struct drm_connector *connector,</div><div class='ctx'> 	int aud_cntl_st;</div><div class='ctx'> 	int aud_cntrl_st2;</div><div class='ctx'> </div><div class='del'>-	if (IS_IVYBRIDGE(connector-&gt;dev)) {</div><div class='del'>-		hdmiw_hdmiedid = GEN7_HDMIW_HDMIEDID_A;</div><div class='del'>-		aud_cntl_st = GEN7_AUD_CNTRL_ST_A;</div><div class='del'>-		aud_cntrl_st2 = GEN7_AUD_CNTRL_ST2;</div><div class='add'>+	if (HAS_PCH_IBX(connector-&gt;dev)) {</div><div class='add'>+		hdmiw_hdmiedid = IBX_HDMIW_HDMIEDID_A;</div><div class='add'>+		aud_cntl_st = IBX_AUD_CNTL_ST_A;</div><div class='add'>+		aud_cntrl_st2 = IBX_AUD_CNTL_ST2;</div><div class='ctx'> 	} else {</div><div class='del'>-		hdmiw_hdmiedid = GEN5_HDMIW_HDMIEDID_A;</div><div class='del'>-		aud_cntl_st = GEN5_AUD_CNTL_ST_A;</div><div class='del'>-		aud_cntrl_st2 = GEN5_AUD_CNTL_ST2;</div><div class='add'>+		hdmiw_hdmiedid = CPT_HDMIW_HDMIEDID_A;</div><div class='add'>+		aud_cntl_st = CPT_AUD_CNTL_ST_A;</div><div class='add'>+		aud_cntrl_st2 = CPT_AUD_CNTRL_ST2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	i = to_intel_crtc(crtc)-&gt;pipe;</div><div class='hunk'>@@ -5897,14 +6096,25 @@ static void ironlake_write_eld(struct drm_connector *connector,</div><div class='ctx'> 	if (!i) {</div><div class='ctx'> 		DRM_DEBUG_DRIVER("Audio directed to unknown port\n");</div><div class='ctx'> 		/* operate blindly on all ports */</div><div class='del'>-		eldv = GEN5_ELD_VALIDB;</div><div class='del'>-		eldv |= GEN5_ELD_VALIDB &lt;&lt; 4;</div><div class='del'>-		eldv |= GEN5_ELD_VALIDB &lt;&lt; 8;</div><div class='add'>+		eldv = IBX_ELD_VALIDB;</div><div class='add'>+		eldv |= IBX_ELD_VALIDB &lt;&lt; 4;</div><div class='add'>+		eldv |= IBX_ELD_VALIDB &lt;&lt; 8;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		DRM_DEBUG_DRIVER("ELD on port %c\n", 'A' + i);</div><div class='del'>-		eldv = GEN5_ELD_VALIDB &lt;&lt; ((i - 1) * 4);</div><div class='add'>+		eldv = IBX_ELD_VALIDB &lt;&lt; ((i - 1) * 4);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT)) {</div><div class='add'>+		DRM_DEBUG_DRIVER("ELD: DisplayPort detected\n");</div><div class='add'>+		eld[5] |= (1 &lt;&lt; 2);	/* Conn_Type, 0x1 = DisplayPort */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (intel_eld_uptodate(connector,</div><div class='add'>+			       aud_cntrl_st2, eldv,</div><div class='add'>+			       aud_cntl_st, IBX_ELD_ADDRESS,</div><div class='add'>+			       hdmiw_hdmiedid))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	i = I915_READ(aud_cntrl_st2);</div><div class='ctx'> 	i &amp;= ~eldv;</div><div class='ctx'> 	I915_WRITE(aud_cntrl_st2, i);</div><div class='hunk'>@@ -5912,13 +6122,8 @@ static void ironlake_write_eld(struct drm_connector *connector,</div><div class='ctx'> 	if (!eld[0])</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT)) {</div><div class='del'>-		DRM_DEBUG_DRIVER("ELD: DisplayPort detected\n");</div><div class='del'>-		eld[5] |= (1 &lt;&lt; 2);	/* Conn_Type, 0x1 = DisplayPort */</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	i = I915_READ(aud_cntl_st);</div><div class='del'>-	i &amp;= ~GEN5_ELD_ADDRESS;</div><div class='add'>+	i &amp;= ~IBX_ELD_ADDRESS;</div><div class='ctx'> 	I915_WRITE(aud_cntl_st, i);</div><div class='ctx'> </div><div class='ctx'> 	len = min_t(uint8_t, eld[2], 21);	/* 84 bytes of hw ELD buffer */</div><div class='hunk'>@@ -6298,7 +6503,7 @@ static struct drm_display_mode load_detect_mode = {</div><div class='ctx'> </div><div class='ctx'> static struct drm_framebuffer *</div><div class='ctx'> intel_framebuffer_create(struct drm_device *dev,</div><div class='del'>-			 struct drm_mode_fb_cmd *mode_cmd,</div><div class='add'>+			 struct drm_mode_fb_cmd2 *mode_cmd,</div><div class='ctx'> 			 struct drm_i915_gem_object *obj)</div><div class='ctx'> {</div><div class='ctx'> 	struct intel_framebuffer *intel_fb;</div><div class='hunk'>@@ -6340,7 +6545,7 @@ intel_framebuffer_create_for_mode(struct drm_device *dev,</div><div class='ctx'> 				  int depth, int bpp)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_i915_gem_object *obj;</div><div class='del'>-	struct drm_mode_fb_cmd mode_cmd;</div><div class='add'>+	struct drm_mode_fb_cmd2 mode_cmd;</div><div class='ctx'> </div><div class='ctx'> 	obj = i915_gem_alloc_object(dev,</div><div class='ctx'> 				    intel_framebuffer_size_for_mode(mode, bpp));</div><div class='hunk'>@@ -6349,9 +6554,9 @@ intel_framebuffer_create_for_mode(struct drm_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	mode_cmd.width = mode-&gt;hdisplay;</div><div class='ctx'> 	mode_cmd.height = mode-&gt;vdisplay;</div><div class='del'>-	mode_cmd.depth = depth;</div><div class='del'>-	mode_cmd.bpp = bpp;</div><div class='del'>-	mode_cmd.pitch = intel_framebuffer_pitch_for_width(mode_cmd.width, bpp);</div><div class='add'>+	mode_cmd.pitches[0] = intel_framebuffer_pitch_for_width(mode_cmd.width,</div><div class='add'>+								bpp);</div><div class='add'>+	mode_cmd.pixel_format = 0;</div><div class='ctx'> </div><div class='ctx'> 	return intel_framebuffer_create(dev, &amp;mode_cmd, obj);</div><div class='ctx'> }</div><div class='hunk'>@@ -6372,11 +6577,11 @@ mode_fits_in_fbdev(struct drm_device *dev,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	fb = &amp;dev_priv-&gt;fbdev-&gt;ifb.base;</div><div class='del'>-	if (fb-&gt;pitch &lt; intel_framebuffer_pitch_for_width(mode-&gt;hdisplay,</div><div class='del'>-							  fb-&gt;bits_per_pixel))</div><div class='add'>+	if (fb-&gt;pitches[0] &lt; intel_framebuffer_pitch_for_width(mode-&gt;hdisplay,</div><div class='add'>+							       fb-&gt;bits_per_pixel))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (obj-&gt;base.size &lt; mode-&gt;vdisplay * fb-&gt;pitch)</div><div class='add'>+	if (obj-&gt;base.size &lt; mode-&gt;vdisplay * fb-&gt;pitches[0])</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	return fb;</div><div class='hunk'>@@ -7009,7 +7214,7 @@ static int intel_gen2_queue_flip(struct drm_device *dev,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Offset into the new buffer for cases of shared fbs between CRTCs */</div><div class='del'>-	offset = crtc-&gt;y * fb-&gt;pitch + crtc-&gt;x * fb-&gt;bits_per_pixel/8;</div><div class='add'>+	offset = crtc-&gt;y * fb-&gt;pitches[0] + crtc-&gt;x * fb-&gt;bits_per_pixel/8;</div><div class='ctx'> </div><div class='ctx'> 	ret = BEGIN_LP_RING(6);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -7026,7 +7231,7 @@ static int intel_gen2_queue_flip(struct drm_device *dev,</div><div class='ctx'> 	OUT_RING(MI_NOOP);</div><div class='ctx'> 	OUT_RING(MI_DISPLAY_FLIP |</div><div class='ctx'> 		 MI_DISPLAY_FLIP_PLANE(intel_crtc-&gt;plane));</div><div class='del'>-	OUT_RING(fb-&gt;pitch);</div><div class='add'>+	OUT_RING(fb-&gt;pitches[0]);</div><div class='ctx'> 	OUT_RING(obj-&gt;gtt_offset + offset);</div><div class='ctx'> 	OUT_RING(MI_NOOP);</div><div class='ctx'> 	ADVANCE_LP_RING();</div><div class='hunk'>@@ -7050,7 +7255,7 @@ static int intel_gen3_queue_flip(struct drm_device *dev,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Offset into the new buffer for cases of shared fbs between CRTCs */</div><div class='del'>-	offset = crtc-&gt;y * fb-&gt;pitch + crtc-&gt;x * fb-&gt;bits_per_pixel/8;</div><div class='add'>+	offset = crtc-&gt;y * fb-&gt;pitches[0] + crtc-&gt;x * fb-&gt;bits_per_pixel/8;</div><div class='ctx'> </div><div class='ctx'> 	ret = BEGIN_LP_RING(6);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -7064,7 +7269,7 @@ static int intel_gen3_queue_flip(struct drm_device *dev,</div><div class='ctx'> 	OUT_RING(MI_NOOP);</div><div class='ctx'> 	OUT_RING(MI_DISPLAY_FLIP_I915 |</div><div class='ctx'> 		 MI_DISPLAY_FLIP_PLANE(intel_crtc-&gt;plane));</div><div class='del'>-	OUT_RING(fb-&gt;pitch);</div><div class='add'>+	OUT_RING(fb-&gt;pitches[0]);</div><div class='ctx'> 	OUT_RING(obj-&gt;gtt_offset + offset);</div><div class='ctx'> 	OUT_RING(MI_NOOP);</div><div class='ctx'> </div><div class='hunk'>@@ -7097,7 +7302,7 @@ static int intel_gen4_queue_flip(struct drm_device *dev,</div><div class='ctx'> 	 */</div><div class='ctx'> 	OUT_RING(MI_DISPLAY_FLIP |</div><div class='ctx'> 		 MI_DISPLAY_FLIP_PLANE(intel_crtc-&gt;plane));</div><div class='del'>-	OUT_RING(fb-&gt;pitch);</div><div class='add'>+	OUT_RING(fb-&gt;pitches[0]);</div><div class='ctx'> 	OUT_RING(obj-&gt;gtt_offset | obj-&gt;tiling_mode);</div><div class='ctx'> </div><div class='ctx'> 	/* XXX Enabling the panel-fitter across page-flip is so far</div><div class='hunk'>@@ -7132,7 +7337,7 @@ static int intel_gen6_queue_flip(struct drm_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	OUT_RING(MI_DISPLAY_FLIP |</div><div class='ctx'> 		 MI_DISPLAY_FLIP_PLANE(intel_crtc-&gt;plane));</div><div class='del'>-	OUT_RING(fb-&gt;pitch | obj-&gt;tiling_mode);</div><div class='add'>+	OUT_RING(fb-&gt;pitches[0] | obj-&gt;tiling_mode);</div><div class='ctx'> 	OUT_RING(obj-&gt;gtt_offset);</div><div class='ctx'> </div><div class='ctx'> 	pf = I915_READ(PF_CTL(intel_crtc-&gt;pipe)) &amp; PF_ENABLE;</div><div class='hunk'>@@ -7168,7 +7373,7 @@ static int intel_gen7_queue_flip(struct drm_device *dev,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	intel_ring_emit(ring, MI_DISPLAY_FLIP_I915 | (intel_crtc-&gt;plane &lt;&lt; 19));</div><div class='del'>-	intel_ring_emit(ring, (fb-&gt;pitch | obj-&gt;tiling_mode));</div><div class='add'>+	intel_ring_emit(ring, (fb-&gt;pitches[0] | obj-&gt;tiling_mode));</div><div class='ctx'> 	intel_ring_emit(ring, (obj-&gt;gtt_offset));</div><div class='ctx'> 	intel_ring_emit(ring, (MI_NOOP));</div><div class='ctx'> 	intel_ring_advance(ring);</div><div class='hunk'>@@ -7594,7 +7799,7 @@ static const struct drm_framebuffer_funcs intel_fb_funcs = {</div><div class='ctx'> </div><div class='ctx'> int intel_framebuffer_init(struct drm_device *dev,</div><div class='ctx'> 			   struct intel_framebuffer *intel_fb,</div><div class='del'>-			   struct drm_mode_fb_cmd *mode_cmd,</div><div class='add'>+			   struct drm_mode_fb_cmd2 *mode_cmd,</div><div class='ctx'> 			   struct drm_i915_gem_object *obj)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -7602,21 +7807,25 @@ int intel_framebuffer_init(struct drm_device *dev,</div><div class='ctx'> 	if (obj-&gt;tiling_mode == I915_TILING_Y)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (mode_cmd-&gt;pitch &amp; 63)</div><div class='add'>+	if (mode_cmd-&gt;pitches[0] &amp; 63)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	switch (mode_cmd-&gt;bpp) {</div><div class='del'>-	case 8:</div><div class='del'>-	case 16:</div><div class='del'>-		/* Only pre-ILK can handle 5:5:5 */</div><div class='del'>-		if (mode_cmd-&gt;depth == 15 &amp;&amp; !HAS_PCH_SPLIT(dev))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	switch (mode_cmd-&gt;pixel_format) {</div><div class='add'>+	case DRM_FORMAT_RGB332:</div><div class='add'>+	case DRM_FORMAT_RGB565:</div><div class='add'>+	case DRM_FORMAT_XRGB8888:</div><div class='add'>+	case DRM_FORMAT_ARGB8888:</div><div class='add'>+	case DRM_FORMAT_XRGB2101010:</div><div class='add'>+	case DRM_FORMAT_ARGB2101010:</div><div class='add'>+		/* RGB formats are common across chipsets */</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='del'>-	case 24:</div><div class='del'>-	case 32:</div><div class='add'>+	case DRM_FORMAT_YUYV:</div><div class='add'>+	case DRM_FORMAT_UYVY:</div><div class='add'>+	case DRM_FORMAT_YVYU:</div><div class='add'>+	case DRM_FORMAT_VYUY:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='add'>+		DRM_ERROR("unsupported pixel format\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -7634,11 +7843,12 @@ int intel_framebuffer_init(struct drm_device *dev,</div><div class='ctx'> static struct drm_framebuffer *</div><div class='ctx'> intel_user_framebuffer_create(struct drm_device *dev,</div><div class='ctx'> 			      struct drm_file *filp,</div><div class='del'>-			      struct drm_mode_fb_cmd *mode_cmd)</div><div class='add'>+			      struct drm_mode_fb_cmd2 *mode_cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_i915_gem_object *obj;</div><div class='ctx'> </div><div class='del'>-	obj = to_intel_bo(drm_gem_object_lookup(dev, filp, mode_cmd-&gt;handle));</div><div class='add'>+	obj = to_intel_bo(drm_gem_object_lookup(dev, filp,</div><div class='add'>+						mode_cmd-&gt;handles[0]));</div><div class='ctx'> 	if (&amp;obj-&gt;base == NULL)</div><div class='ctx'> 		return ERR_PTR(-ENOENT);</div><div class='ctx'> </div><div class='hunk'>@@ -7995,7 +8205,7 @@ void gen6_enable_rps(struct drm_i915_private *dev_priv)</div><div class='ctx'> 	I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);</div><div class='ctx'> 	I915_WRITE(GEN6_RP_CONTROL,</div><div class='ctx'> 		   GEN6_RP_MEDIA_TURBO |</div><div class='del'>-		   GEN6_RP_USE_NORMAL_FREQ |</div><div class='add'>+		   GEN6_RP_MEDIA_HW_MODE |</div><div class='ctx'> 		   GEN6_RP_MEDIA_IS_GFX |</div><div class='ctx'> 		   GEN6_RP_ENABLE |</div><div class='ctx'> 		   GEN6_RP_UP_BUSY_AVG |</div><div class='hunk'>@@ -8250,6 +8460,10 @@ static void ivybridge_init_clock_gating(struct drm_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	I915_WRITE(ILK_DSPCLK_GATE, IVB_VRHUNIT_CLK_GATE);</div><div class='ctx'> </div><div class='add'>+	I915_WRITE(IVB_CHICKEN3,</div><div class='add'>+		   CHICKEN3_DGMG_REQ_OUT_FIX_DISABLE |</div><div class='add'>+		   CHICKEN3_DGMG_DONE_FIX_DISABLE);</div><div class='add'>+</div><div class='ctx'> 	for_each_pipe(pipe) {</div><div class='ctx'> 		I915_WRITE(DSPCNTR(pipe),</div><div class='ctx'> 			   I915_READ(DSPCNTR(pipe)) |</div><div class='hunk'>@@ -8543,9 +8757,15 @@ static void intel_init_display(struct drm_device *dev)</div><div class='ctx'> 		if (IS_IVYBRIDGE(dev)) {</div><div class='ctx'> 			u32	ecobus;</div><div class='ctx'> </div><div class='add'>+			/* A small trick here - if the bios hasn't configured MT forcewake,</div><div class='add'>+			 * and if the device is in RC6, then force_wake_mt_get will not wake</div><div class='add'>+			 * the device and the ECOBUS read will return zero. Which will be</div><div class='add'>+			 * (correctly) interpreted by the test below as MT forcewake being</div><div class='add'>+			 * disabled.</div><div class='add'>+			 */</div><div class='ctx'> 			mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> 			__gen6_gt_force_wake_mt_get(dev_priv);</div><div class='del'>-			ecobus = I915_READ(ECOBUS);</div><div class='add'>+			ecobus = I915_READ_NOTRACE(ECOBUS);</div><div class='ctx'> 			__gen6_gt_force_wake_mt_put(dev_priv);</div><div class='ctx'> 			mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -8577,6 +8797,7 @@ static void intel_init_display(struct drm_device *dev)</div><div class='ctx'> 		} else if (IS_GEN6(dev)) {</div><div class='ctx'> 			if (SNB_READ_WM0_LATENCY()) {</div><div class='ctx'> 				dev_priv-&gt;display.update_wm = sandybridge_update_wm;</div><div class='add'>+				dev_priv-&gt;display.update_sprite_wm = sandybridge_update_sprite_wm;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				DRM_DEBUG_KMS("Failed to read display plane latency. "</div><div class='ctx'> 					      "Disable CxSR\n");</div><div class='hunk'>@@ -8590,6 +8811,7 @@ static void intel_init_display(struct drm_device *dev)</div><div class='ctx'> 			dev_priv-&gt;display.fdi_link_train = ivb_manual_fdi_link_train;</div><div class='ctx'> 			if (SNB_READ_WM0_LATENCY()) {</div><div class='ctx'> 				dev_priv-&gt;display.update_wm = sandybridge_update_wm;</div><div class='add'>+				dev_priv-&gt;display.update_sprite_wm = sandybridge_update_sprite_wm;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				DRM_DEBUG_KMS("Failed to read display plane latency. "</div><div class='ctx'> 					      "Disable CxSR\n");</div><div class='hunk'>@@ -8773,7 +8995,7 @@ static void i915_disable_vga(struct drm_device *dev)</div><div class='ctx'> void intel_modeset_init(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	int i;</div><div class='add'>+	int i, ret;</div><div class='ctx'> </div><div class='ctx'> 	drm_mode_config_init(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -8803,6 +9025,12 @@ void intel_modeset_init(struct drm_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; dev_priv-&gt;num_pipe; i++) {</div><div class='ctx'> 		intel_crtc_init(dev, i);</div><div class='add'>+		if (HAS_PCH_SPLIT(dev)) {</div><div class='add'>+			ret = intel_plane_init(dev, i);</div><div class='add'>+			if (ret)</div><div class='add'>+				DRM_ERROR("plane %d init failed: %d\n",</div><div class='add'>+					  i, ret);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Just disable it once at startup */</div><div class='head'>diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c<br/>index 92b041b66e49..db3b461ad412 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/intel_dp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/intel_dp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/intel_dp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i915/intel_dp.c</a></div><div class='hunk'>@@ -1926,6 +1926,7 @@ intel_dp_link_down(struct intel_dp *intel_dp)</div><div class='ctx'> 			intel_wait_for_vblank(dev, to_intel_crtc(crtc)-&gt;pipe);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	DP &amp;= ~DP_AUDIO_OUTPUT_ENABLE;</div><div class='ctx'> 	I915_WRITE(intel_dp-&gt;output_reg, DP &amp; ~DP_PORT_EN);</div><div class='ctx'> 	POSTING_READ(intel_dp-&gt;output_reg);</div><div class='ctx'> 	msleep(intel_dp-&gt;panel_power_down_delay);</div><div class='head'>diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h<br/>index a1b4343814e8..1348705faf6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/intel_drv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/intel_drv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/intel_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i915/intel_drv.h</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #define __INTEL_DRV_H__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='add'>+#include "i915_drm.h"</div><div class='ctx'> #include "i915_drv.h"</div><div class='ctx'> #include "drm_crtc.h"</div><div class='ctx'> #include "drm_crtc_helper.h"</div><div class='hunk'>@@ -39,7 +40,7 @@</div><div class='ctx'> 			ret__ = -ETIMEDOUT;				\</div><div class='ctx'> 			break;						\</div><div class='ctx'> 		}							\</div><div class='del'>-		if (W &amp;&amp; !(in_atomic() || in_dbg_master())) msleep(W);	\</div><div class='add'>+		if (W &amp;&amp; drm_can_sleep()) msleep(W);	\</div><div class='ctx'> 	}								\</div><div class='ctx'> 	ret__;								\</div><div class='ctx'> })</div><div class='hunk'>@@ -47,13 +48,6 @@</div><div class='ctx'> #define wait_for(COND, MS) _wait_for(COND, MS, 1)</div><div class='ctx'> #define wait_for_atomic(COND, MS) _wait_for(COND, MS, 0)</div><div class='ctx'> </div><div class='del'>-#define MSLEEP(x) do { \</div><div class='del'>-	if (in_dbg_master()) \</div><div class='del'>-		mdelay(x); \</div><div class='del'>-	else \</div><div class='del'>-		msleep(x); \</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='ctx'> #define KHz(x) (1000*x)</div><div class='ctx'> #define MHz(x) KHz(1000*x)</div><div class='ctx'> </div><div class='hunk'>@@ -177,10 +171,32 @@ struct intel_crtc {</div><div class='ctx'> 	bool use_pll_a;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct intel_plane {</div><div class='add'>+	struct drm_plane base;</div><div class='add'>+	enum pipe pipe;</div><div class='add'>+	struct drm_i915_gem_object *obj;</div><div class='add'>+	bool primary_disabled;</div><div class='add'>+	int max_downscale;</div><div class='add'>+	u32 lut_r[1024], lut_g[1024], lut_b[1024];</div><div class='add'>+	void (*update_plane)(struct drm_plane *plane,</div><div class='add'>+			     struct drm_framebuffer *fb,</div><div class='add'>+			     struct drm_i915_gem_object *obj,</div><div class='add'>+			     int crtc_x, int crtc_y,</div><div class='add'>+			     unsigned int crtc_w, unsigned int crtc_h,</div><div class='add'>+			     uint32_t x, uint32_t y,</div><div class='add'>+			     uint32_t src_w, uint32_t src_h);</div><div class='add'>+	void (*disable_plane)(struct drm_plane *plane);</div><div class='add'>+	int (*update_colorkey)(struct drm_plane *plane,</div><div class='add'>+			       struct drm_intel_sprite_colorkey *key);</div><div class='add'>+	void (*get_colorkey)(struct drm_plane *plane,</div><div class='add'>+			     struct drm_intel_sprite_colorkey *key);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define to_intel_crtc(x) container_of(x, struct intel_crtc, base)</div><div class='ctx'> #define to_intel_connector(x) container_of(x, struct intel_connector, base)</div><div class='ctx'> #define to_intel_encoder(x) container_of(x, struct intel_encoder, base)</div><div class='ctx'> #define to_intel_framebuffer(x) container_of(x, struct intel_framebuffer, base)</div><div class='add'>+#define to_intel_plane(x) container_of(x, struct intel_plane, base)</div><div class='ctx'> </div><div class='ctx'> #define DIP_HEADER_SIZE	5</div><div class='ctx'> </div><div class='hunk'>@@ -290,6 +306,7 @@ intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode,</div><div class='ctx'> extern bool intel_dpd_is_edp(struct drm_device *dev);</div><div class='ctx'> extern void intel_edp_link_config(struct intel_encoder *, int *, int *);</div><div class='ctx'> extern bool intel_encoder_is_pch_edp(struct drm_encoder *encoder);</div><div class='add'>+extern int intel_plane_init(struct drm_device *dev, enum pipe pipe);</div><div class='ctx'> </div><div class='ctx'> /* intel_panel.c */</div><div class='ctx'> extern void intel_fixed_panel_mode(struct drm_display_mode *fixed_mode,</div><div class='hunk'>@@ -360,7 +377,7 @@ extern int intel_pin_and_fence_fb_obj(struct drm_device *dev,</div><div class='ctx'> </div><div class='ctx'> extern int intel_framebuffer_init(struct drm_device *dev,</div><div class='ctx'> 				  struct intel_framebuffer *ifb,</div><div class='del'>-				  struct drm_mode_fb_cmd *mode_cmd,</div><div class='add'>+				  struct drm_mode_fb_cmd2 *mode_cmd,</div><div class='ctx'> 				  struct drm_i915_gem_object *obj);</div><div class='ctx'> extern int intel_fbdev_init(struct drm_device *dev);</div><div class='ctx'> extern void intel_fbdev_fini(struct drm_device *dev);</div><div class='hunk'>@@ -380,9 +397,25 @@ extern int intel_overlay_attrs(struct drm_device *dev, void *data,</div><div class='ctx'> extern void intel_fb_output_poll_changed(struct drm_device *dev);</div><div class='ctx'> extern void intel_fb_restore_mode(struct drm_device *dev);</div><div class='ctx'> </div><div class='add'>+extern void assert_pipe(struct drm_i915_private *dev_priv, enum pipe pipe,</div><div class='add'>+			bool state);</div><div class='add'>+#define assert_pipe_enabled(d, p) assert_pipe(d, p, true)</div><div class='add'>+#define assert_pipe_disabled(d, p) assert_pipe(d, p, false)</div><div class='add'>+</div><div class='ctx'> extern void intel_init_clock_gating(struct drm_device *dev);</div><div class='ctx'> extern void intel_write_eld(struct drm_encoder *encoder,</div><div class='ctx'> 			    struct drm_display_mode *mode);</div><div class='ctx'> extern void intel_cpt_verify_modeset(struct drm_device *dev, int pipe);</div><div class='ctx'> </div><div class='add'>+/* For use by IVB LP watermark workaround in intel_sprite.c */</div><div class='add'>+extern void sandybridge_update_wm(struct drm_device *dev);</div><div class='add'>+extern void intel_update_sprite_watermarks(struct drm_device *dev, int pipe,</div><div class='add'>+					   uint32_t sprite_width,</div><div class='add'>+					   int pixel_size);</div><div class='add'>+</div><div class='add'>+extern int intel_sprite_set_colorkey(struct drm_device *dev, void *data,</div><div class='add'>+				     struct drm_file *file_priv);</div><div class='add'>+extern int intel_sprite_get_colorkey(struct drm_device *dev, void *data,</div><div class='add'>+				     struct drm_file *file_priv);</div><div class='add'>+</div><div class='ctx'> #endif /* __INTEL_DRV_H__ */</div><div class='head'>diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c<br/>index ec49bae73382..571375a3eef4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/intel_fb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/intel_fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/intel_fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i915/intel_fb.c</a></div><div class='hunk'>@@ -65,7 +65,7 @@ static int intelfb_create(struct intel_fbdev *ifbdev,</div><div class='ctx'> 	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	struct fb_info *info;</div><div class='ctx'> 	struct drm_framebuffer *fb;</div><div class='del'>-	struct drm_mode_fb_cmd mode_cmd;</div><div class='add'>+	struct drm_mode_fb_cmd2 mode_cmd;</div><div class='ctx'> 	struct drm_i915_gem_object *obj;</div><div class='ctx'> 	struct device *device = &amp;dev-&gt;pdev-&gt;dev;</div><div class='ctx'> 	int size, ret;</div><div class='hunk'>@@ -77,11 +77,12 @@ static int intelfb_create(struct intel_fbdev *ifbdev,</div><div class='ctx'> 	mode_cmd.width = sizes-&gt;surface_width;</div><div class='ctx'> 	mode_cmd.height = sizes-&gt;surface_height;</div><div class='ctx'> </div><div class='del'>-	mode_cmd.bpp = sizes-&gt;surface_bpp;</div><div class='del'>-	mode_cmd.pitch = ALIGN(mode_cmd.width * ((mode_cmd.bpp + 7) / 8), 64);</div><div class='del'>-	mode_cmd.depth = sizes-&gt;surface_depth;</div><div class='add'>+	mode_cmd.pitches[0] = ALIGN(mode_cmd.width * ((sizes-&gt;surface_bpp + 7) /</div><div class='add'>+						      8), 64);</div><div class='add'>+	mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes-&gt;surface_bpp,</div><div class='add'>+							  sizes-&gt;surface_depth);</div><div class='ctx'> </div><div class='del'>-	size = mode_cmd.pitch * mode_cmd.height;</div><div class='add'>+	size = mode_cmd.pitches[0] * mode_cmd.height;</div><div class='ctx'> 	size = ALIGN(size, PAGE_SIZE);</div><div class='ctx'> 	obj = i915_gem_alloc_object(dev, size);</div><div class='ctx'> 	if (!obj) {</div><div class='hunk'>@@ -148,7 +149,7 @@ static int intelfb_create(struct intel_fbdev *ifbdev,</div><div class='ctx'> </div><div class='ctx'> //	memset(info-&gt;screen_base, 0, size);</div><div class='ctx'> </div><div class='del'>-	drm_fb_helper_fill_fix(info, fb-&gt;pitch, fb-&gt;depth);</div><div class='add'>+	drm_fb_helper_fill_fix(info, fb-&gt;pitches[0], fb-&gt;depth);</div><div class='ctx'> 	drm_fb_helper_fill_var(info, &amp;ifbdev-&gt;helper, sizes-&gt;fb_width, sizes-&gt;fb_height);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;pixmap.size = 64*1024;</div><div class='hunk'>@@ -269,8 +270,14 @@ void intel_fb_restore_mode(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_mode_config *config = &amp;dev-&gt;mode_config;</div><div class='add'>+	struct drm_plane *plane;</div><div class='ctx'> </div><div class='ctx'> 	ret = drm_fb_helper_restore_fbdev_mode(&amp;dev_priv-&gt;fbdev-&gt;helper);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		DRM_DEBUG("failed to restore crtc mode\n");</div><div class='add'>+</div><div class='add'>+	/* Be sure to shut off any planes that may be active */</div><div class='add'>+	list_for_each_entry(plane, &amp;config-&gt;plane_list, head)</div><div class='add'>+		plane-&gt;funcs-&gt;disable_plane(plane);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c<br/>index d4f5a0b2120d..64541f7ef900 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/intel_hdmi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/intel_hdmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/intel_hdmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i915/intel_hdmi.c</a></div><div class='hunk'>@@ -269,6 +269,10 @@ static void intel_hdmi_dpms(struct drm_encoder *encoder, int mode)</div><div class='ctx'> 	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);</div><div class='ctx'> 	u32 temp;</div><div class='add'>+	u32 enable_bits = SDVO_ENABLE;</div><div class='add'>+</div><div class='add'>+	if (intel_hdmi-&gt;has_audio)</div><div class='add'>+		enable_bits |= SDVO_AUDIO_ENABLE;</div><div class='ctx'> </div><div class='ctx'> 	temp = I915_READ(intel_hdmi-&gt;sdvox_reg);</div><div class='ctx'> </div><div class='hunk'>@@ -281,9 +285,9 @@ static void intel_hdmi_dpms(struct drm_encoder *encoder, int mode)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (mode != DRM_MODE_DPMS_ON) {</div><div class='del'>-		temp &amp;= ~SDVO_ENABLE;</div><div class='add'>+		temp &amp;= ~enable_bits;</div><div class='ctx'> 	} else {</div><div class='del'>-		temp |= SDVO_ENABLE;</div><div class='add'>+		temp |= enable_bits;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	I915_WRITE(intel_hdmi-&gt;sdvox_reg, temp);</div><div class='head'>diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c<br/>index ca70e2f10445..77e729d4e4f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/intel_ringbuffer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/intel_ringbuffer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/intel_ringbuffer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i915/intel_ringbuffer.c</a></div><div class='hunk'>@@ -414,6 +414,11 @@ static int init_render_ring(struct intel_ring_buffer *ring)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (INTEL_INFO(dev)-&gt;gen &gt;= 6) {</div><div class='add'>+		I915_WRITE(INSTPM,</div><div class='add'>+			   INSTPM_FORCE_ORDERING &lt;&lt; 16 | INSTPM_FORCE_ORDERING);</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'>@@ -787,6 +792,17 @@ ring_add_request(struct intel_ring_buffer *ring,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='add'>+gen7_blt_ring_get_irq(struct intel_ring_buffer *ring)</div><div class='add'>+{</div><div class='add'>+	/* The BLT ring on IVB appears to have broken synchronization</div><div class='add'>+	 * between the seqno write and the interrupt, so that the</div><div class='add'>+	 * interrupt appears first.  Returning false here makes</div><div class='add'>+	 * i915_wait_request() do a polling loop, instead.</div><div class='add'>+	 */</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='ctx'> gen6_ring_get_irq(struct intel_ring_buffer *ring, u32 gflag, u32 rflag)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_device *dev = ring-&gt;dev;</div><div class='hunk'>@@ -1119,7 +1135,16 @@ int intel_wait_ring_buffer(struct intel_ring_buffer *ring, int n)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	trace_i915_ring_wait_begin(ring);</div><div class='del'>-	end = jiffies + 3 * HZ;</div><div class='add'>+	if (drm_core_check_feature(dev, DRIVER_GEM))</div><div class='add'>+		/* With GEM the hangcheck timer should kick us out of the loop,</div><div class='add'>+		 * leaving it early runs the risk of corrupting GEM state (due</div><div class='add'>+		 * to running on almost untested codepaths). But on resume</div><div class='add'>+		 * timers don't work yet, so prevent a complete hang in that</div><div class='add'>+		 * case by choosing an insanely large timeout. */</div><div class='add'>+		end = jiffies + 60 * HZ;</div><div class='add'>+	else</div><div class='add'>+		end = jiffies + 3 * HZ;</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='ctx'> 		ring-&gt;head = I915_READ_HEAD(ring);</div><div class='ctx'> 		ring-&gt;space = ring_space(ring);</div><div class='hunk'>@@ -1552,5 +1577,8 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	*ring = gen6_blt_ring;</div><div class='ctx'> </div><div class='add'>+	if (IS_GEN7(dev))</div><div class='add'>+		ring-&gt;irq_get = gen7_blt_ring_get_irq;</div><div class='add'>+</div><div class='ctx'> 	return intel_init_ring_buffer(dev, ring);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/i915/intel_sdvo_regs.h b/drivers/gpu/drm/i915/intel_sdvo_regs.h<br/>index 4aa6f343e49a..6b7b22f4d63e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/intel_sdvo_regs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/i915/intel_sdvo_regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/intel_sdvo_regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i915/intel_sdvo_regs.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright © 2006-2007 Intel Corporation</div><div class='add'>+ * Copyright © 2006-2007 Intel Corporation</div><div class='ctx'>  *</div><div class='ctx'>  * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='ctx'>  * copy of this software and associated documentation files (the "Software"),</div><div class='head'>diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c<br/>new file mode 100644<br/>index 000000000000..d13989fda501<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/i915/intel_sprite.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/i915/intel_sprite.c</a></div><div class='hunk'>@@ -0,0 +1,668 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2011 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the next</div><div class='add'>+ * paragraph) shall be included in all copies or substantial portions of the</div><div class='add'>+ * Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='add'>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,</div><div class='add'>+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *   Jesse Barnes &lt;jbarnes@virtuousgeek.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * New plane/sprite handling.</div><div class='add'>+ *</div><div class='add'>+ * The older chips had a separate interface for programming plane related</div><div class='add'>+ * registers; newer ones are much simpler and we can use the new DRM plane</div><div class='add'>+ * support.</div><div class='add'>+ */</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "drm_crtc.h"</div><div class='add'>+#include "drm_fourcc.h"</div><div class='add'>+#include "intel_drv.h"</div><div class='add'>+#include "i915_drm.h"</div><div class='add'>+#include "i915_drv.h"</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ivb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,</div><div class='add'>+		 struct drm_i915_gem_object *obj, int crtc_x, int crtc_y,</div><div class='add'>+		 unsigned int crtc_w, unsigned int crtc_h,</div><div class='add'>+		 uint32_t x, uint32_t y,</div><div class='add'>+		 uint32_t src_w, uint32_t src_h)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = plane-&gt;dev;</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct intel_plane *intel_plane = to_intel_plane(plane);</div><div class='add'>+	int pipe = intel_plane-&gt;pipe;</div><div class='add'>+	u32 sprctl, sprscale = 0;</div><div class='add'>+	int pixel_size;</div><div class='add'>+</div><div class='add'>+	sprctl = I915_READ(SPRCTL(pipe));</div><div class='add'>+</div><div class='add'>+	/* Mask out pixel format bits in case we change it */</div><div class='add'>+	sprctl &amp;= ~SPRITE_PIXFORMAT_MASK;</div><div class='add'>+	sprctl &amp;= ~SPRITE_RGB_ORDER_RGBX;</div><div class='add'>+	sprctl &amp;= ~SPRITE_YUV_BYTE_ORDER_MASK;</div><div class='add'>+</div><div class='add'>+	switch (fb-&gt;pixel_format) {</div><div class='add'>+	case DRM_FORMAT_XBGR8888:</div><div class='add'>+		sprctl |= SPRITE_FORMAT_RGBX888;</div><div class='add'>+		pixel_size = 4;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_FORMAT_XRGB8888:</div><div class='add'>+		sprctl |= SPRITE_FORMAT_RGBX888 | SPRITE_RGB_ORDER_RGBX;</div><div class='add'>+		pixel_size = 4;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_FORMAT_YUYV:</div><div class='add'>+		sprctl |= SPRITE_FORMAT_YUV422 | SPRITE_YUV_ORDER_YUYV;</div><div class='add'>+		pixel_size = 2;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_FORMAT_YVYU:</div><div class='add'>+		sprctl |= SPRITE_FORMAT_YUV422 | SPRITE_YUV_ORDER_YVYU;</div><div class='add'>+		pixel_size = 2;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_FORMAT_UYVY:</div><div class='add'>+		sprctl |= SPRITE_FORMAT_YUV422 | SPRITE_YUV_ORDER_UYVY;</div><div class='add'>+		pixel_size = 2;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_FORMAT_VYUY:</div><div class='add'>+		sprctl |= SPRITE_FORMAT_YUV422 | SPRITE_YUV_ORDER_VYUY;</div><div class='add'>+		pixel_size = 2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DRM_DEBUG_DRIVER("bad pixel format, assuming RGBX888\n");</div><div class='add'>+		sprctl |= DVS_FORMAT_RGBX888;</div><div class='add'>+		pixel_size = 4;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (obj-&gt;tiling_mode != I915_TILING_NONE)</div><div class='add'>+		sprctl |= SPRITE_TILED;</div><div class='add'>+</div><div class='add'>+	/* must disable */</div><div class='add'>+	sprctl |= SPRITE_TRICKLE_FEED_DISABLE;</div><div class='add'>+	sprctl |= SPRITE_ENABLE;</div><div class='add'>+	sprctl |= SPRITE_DEST_KEY;</div><div class='add'>+</div><div class='add'>+	/* Sizes are 0 based */</div><div class='add'>+	src_w--;</div><div class='add'>+	src_h--;</div><div class='add'>+	crtc_w--;</div><div class='add'>+	crtc_h--;</div><div class='add'>+</div><div class='add'>+	intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IVB workaround: must disable low power watermarks for at least</div><div class='add'>+	 * one frame before enabling scaling.  LP watermarks can be re-enabled</div><div class='add'>+	 * when scaling is disabled.</div><div class='add'>+	 */</div><div class='add'>+	if (crtc_w != src_w || crtc_h != src_h) {</div><div class='add'>+		dev_priv-&gt;sprite_scaling_enabled = true;</div><div class='add'>+		sandybridge_update_wm(dev);</div><div class='add'>+		intel_wait_for_vblank(dev, pipe);</div><div class='add'>+		sprscale = SPRITE_SCALE_ENABLE | (src_w &lt;&lt; 16) | src_h;</div><div class='add'>+	} else {</div><div class='add'>+		dev_priv-&gt;sprite_scaling_enabled = false;</div><div class='add'>+		/* potentially re-enable LP watermarks */</div><div class='add'>+		sandybridge_update_wm(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	I915_WRITE(SPRSTRIDE(pipe), fb-&gt;pitches[0]);</div><div class='add'>+	I915_WRITE(SPRPOS(pipe), (crtc_y &lt;&lt; 16) | crtc_x);</div><div class='add'>+	if (obj-&gt;tiling_mode != I915_TILING_NONE) {</div><div class='add'>+		I915_WRITE(SPRTILEOFF(pipe), (y &lt;&lt; 16) | x);</div><div class='add'>+	} else {</div><div class='add'>+		unsigned long offset;</div><div class='add'>+</div><div class='add'>+		offset = y * fb-&gt;pitches[0] + x * (fb-&gt;bits_per_pixel / 8);</div><div class='add'>+		I915_WRITE(SPRLINOFF(pipe), offset);</div><div class='add'>+	}</div><div class='add'>+	I915_WRITE(SPRSIZE(pipe), (crtc_h &lt;&lt; 16) | crtc_w);</div><div class='add'>+	I915_WRITE(SPRSCALE(pipe), sprscale);</div><div class='add'>+	I915_WRITE(SPRCTL(pipe), sprctl);</div><div class='add'>+	I915_WRITE(SPRSURF(pipe), obj-&gt;gtt_offset);</div><div class='add'>+	POSTING_READ(SPRSURF(pipe));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ivb_disable_plane(struct drm_plane *plane)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = plane-&gt;dev;</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct intel_plane *intel_plane = to_intel_plane(plane);</div><div class='add'>+	int pipe = intel_plane-&gt;pipe;</div><div class='add'>+</div><div class='add'>+	I915_WRITE(SPRCTL(pipe), I915_READ(SPRCTL(pipe)) &amp; ~SPRITE_ENABLE);</div><div class='add'>+	/* Can't leave the scaler enabled... */</div><div class='add'>+	I915_WRITE(SPRSCALE(pipe), 0);</div><div class='add'>+	/* Activate double buffered register update */</div><div class='add'>+	I915_WRITE(SPRSURF(pipe), 0);</div><div class='add'>+	POSTING_READ(SPRSURF(pipe));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ivb_update_colorkey(struct drm_plane *plane,</div><div class='add'>+		    struct drm_intel_sprite_colorkey *key)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = plane-&gt;dev;</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct intel_plane *intel_plane;</div><div class='add'>+	u32 sprctl;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	intel_plane = to_intel_plane(plane);</div><div class='add'>+</div><div class='add'>+	I915_WRITE(SPRKEYVAL(intel_plane-&gt;pipe), key-&gt;min_value);</div><div class='add'>+	I915_WRITE(SPRKEYMAX(intel_plane-&gt;pipe), key-&gt;max_value);</div><div class='add'>+	I915_WRITE(SPRKEYMSK(intel_plane-&gt;pipe), key-&gt;channel_mask);</div><div class='add'>+</div><div class='add'>+	sprctl = I915_READ(SPRCTL(intel_plane-&gt;pipe));</div><div class='add'>+	sprctl &amp;= ~(SPRITE_SOURCE_KEY | SPRITE_DEST_KEY);</div><div class='add'>+	if (key-&gt;flags &amp; I915_SET_COLORKEY_DESTINATION)</div><div class='add'>+		sprctl |= SPRITE_DEST_KEY;</div><div class='add'>+	else if (key-&gt;flags &amp; I915_SET_COLORKEY_SOURCE)</div><div class='add'>+		sprctl |= SPRITE_SOURCE_KEY;</div><div class='add'>+	I915_WRITE(SPRCTL(intel_plane-&gt;pipe), sprctl);</div><div class='add'>+</div><div class='add'>+	POSTING_READ(SPRKEYMSK(intel_plane-&gt;pipe));</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ivb_get_colorkey(struct drm_plane *plane, struct drm_intel_sprite_colorkey *key)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = plane-&gt;dev;</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct intel_plane *intel_plane;</div><div class='add'>+	u32 sprctl;</div><div class='add'>+</div><div class='add'>+	intel_plane = to_intel_plane(plane);</div><div class='add'>+</div><div class='add'>+	key-&gt;min_value = I915_READ(SPRKEYVAL(intel_plane-&gt;pipe));</div><div class='add'>+	key-&gt;max_value = I915_READ(SPRKEYMAX(intel_plane-&gt;pipe));</div><div class='add'>+	key-&gt;channel_mask = I915_READ(SPRKEYMSK(intel_plane-&gt;pipe));</div><div class='add'>+	key-&gt;flags = 0;</div><div class='add'>+</div><div class='add'>+	sprctl = I915_READ(SPRCTL(intel_plane-&gt;pipe));</div><div class='add'>+</div><div class='add'>+	if (sprctl &amp; SPRITE_DEST_KEY)</div><div class='add'>+		key-&gt;flags = I915_SET_COLORKEY_DESTINATION;</div><div class='add'>+	else if (sprctl &amp; SPRITE_SOURCE_KEY)</div><div class='add'>+		key-&gt;flags = I915_SET_COLORKEY_SOURCE;</div><div class='add'>+	else</div><div class='add'>+		key-&gt;flags = I915_SET_COLORKEY_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+snb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,</div><div class='add'>+		 struct drm_i915_gem_object *obj, int crtc_x, int crtc_y,</div><div class='add'>+		 unsigned int crtc_w, unsigned int crtc_h,</div><div class='add'>+		 uint32_t x, uint32_t y,</div><div class='add'>+		 uint32_t src_w, uint32_t src_h)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = plane-&gt;dev;</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct intel_plane *intel_plane = to_intel_plane(plane);</div><div class='add'>+	int pipe = intel_plane-&gt;pipe, pixel_size;</div><div class='add'>+	u32 dvscntr, dvsscale = 0;</div><div class='add'>+</div><div class='add'>+	dvscntr = I915_READ(DVSCNTR(pipe));</div><div class='add'>+</div><div class='add'>+	/* Mask out pixel format bits in case we change it */</div><div class='add'>+	dvscntr &amp;= ~DVS_PIXFORMAT_MASK;</div><div class='add'>+	dvscntr &amp;= ~DVS_RGB_ORDER_RGBX;</div><div class='add'>+	dvscntr &amp;= ~DVS_YUV_BYTE_ORDER_MASK;</div><div class='add'>+</div><div class='add'>+	switch (fb-&gt;pixel_format) {</div><div class='add'>+	case DRM_FORMAT_XBGR8888:</div><div class='add'>+		dvscntr |= DVS_FORMAT_RGBX888;</div><div class='add'>+		pixel_size = 4;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_FORMAT_XRGB8888:</div><div class='add'>+		dvscntr |= DVS_FORMAT_RGBX888 | DVS_RGB_ORDER_RGBX;</div><div class='add'>+		pixel_size = 4;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_FORMAT_YUYV:</div><div class='add'>+		dvscntr |= DVS_FORMAT_YUV422 | DVS_YUV_ORDER_YUYV;</div><div class='add'>+		pixel_size = 2;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_FORMAT_YVYU:</div><div class='add'>+		dvscntr |= DVS_FORMAT_YUV422 | DVS_YUV_ORDER_YVYU;</div><div class='add'>+		pixel_size = 2;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_FORMAT_UYVY:</div><div class='add'>+		dvscntr |= DVS_FORMAT_YUV422 | DVS_YUV_ORDER_UYVY;</div><div class='add'>+		pixel_size = 2;</div><div class='add'>+		break;</div><div class='add'>+	case DRM_FORMAT_VYUY:</div><div class='add'>+		dvscntr |= DVS_FORMAT_YUV422 | DVS_YUV_ORDER_VYUY;</div><div class='add'>+		pixel_size = 2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		DRM_DEBUG_DRIVER("bad pixel format, assuming RGBX888\n");</div><div class='add'>+		dvscntr |= DVS_FORMAT_RGBX888;</div><div class='add'>+		pixel_size = 4;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (obj-&gt;tiling_mode != I915_TILING_NONE)</div><div class='add'>+		dvscntr |= DVS_TILED;</div><div class='add'>+</div><div class='add'>+	/* must disable */</div><div class='add'>+	dvscntr |= DVS_TRICKLE_FEED_DISABLE;</div><div class='add'>+	dvscntr |= DVS_ENABLE;</div><div class='add'>+</div><div class='add'>+	/* Sizes are 0 based */</div><div class='add'>+	src_w--;</div><div class='add'>+	src_h--;</div><div class='add'>+	crtc_w--;</div><div class='add'>+	crtc_h--;</div><div class='add'>+</div><div class='add'>+	intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size);</div><div class='add'>+</div><div class='add'>+	if (crtc_w != src_w || crtc_h != src_h)</div><div class='add'>+		dvsscale = DVS_SCALE_ENABLE | (src_w &lt;&lt; 16) | src_h;</div><div class='add'>+</div><div class='add'>+	I915_WRITE(DVSSTRIDE(pipe), fb-&gt;pitches[0]);</div><div class='add'>+	I915_WRITE(DVSPOS(pipe), (crtc_y &lt;&lt; 16) | crtc_x);</div><div class='add'>+	if (obj-&gt;tiling_mode != I915_TILING_NONE) {</div><div class='add'>+		I915_WRITE(DVSTILEOFF(pipe), (y &lt;&lt; 16) | x);</div><div class='add'>+	} else {</div><div class='add'>+		unsigned long offset;</div><div class='add'>+</div><div class='add'>+		offset = y * fb-&gt;pitches[0] + x * (fb-&gt;bits_per_pixel / 8);</div><div class='add'>+		I915_WRITE(DVSLINOFF(pipe), offset);</div><div class='add'>+	}</div><div class='add'>+	I915_WRITE(DVSSIZE(pipe), (crtc_h &lt;&lt; 16) | crtc_w);</div><div class='add'>+	I915_WRITE(DVSSCALE(pipe), dvsscale);</div><div class='add'>+	I915_WRITE(DVSCNTR(pipe), dvscntr);</div><div class='add'>+	I915_WRITE(DVSSURF(pipe), obj-&gt;gtt_offset);</div><div class='add'>+	POSTING_READ(DVSSURF(pipe));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+snb_disable_plane(struct drm_plane *plane)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = plane-&gt;dev;</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct intel_plane *intel_plane = to_intel_plane(plane);</div><div class='add'>+	int pipe = intel_plane-&gt;pipe;</div><div class='add'>+</div><div class='add'>+	I915_WRITE(DVSCNTR(pipe), I915_READ(DVSCNTR(pipe)) &amp; ~DVS_ENABLE);</div><div class='add'>+	/* Disable the scaler */</div><div class='add'>+	I915_WRITE(DVSSCALE(pipe), 0);</div><div class='add'>+	/* Flush double buffered register updates */</div><div class='add'>+	I915_WRITE(DVSSURF(pipe), 0);</div><div class='add'>+	POSTING_READ(DVSSURF(pipe));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+intel_enable_primary(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);</div><div class='add'>+	int reg = DSPCNTR(intel_crtc-&gt;plane);</div><div class='add'>+</div><div class='add'>+	I915_WRITE(reg, I915_READ(reg) | DISPLAY_PLANE_ENABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+intel_disable_primary(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);</div><div class='add'>+	int reg = DSPCNTR(intel_crtc-&gt;plane);</div><div class='add'>+</div><div class='add'>+	I915_WRITE(reg, I915_READ(reg) &amp; ~DISPLAY_PLANE_ENABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+snb_update_colorkey(struct drm_plane *plane,</div><div class='add'>+		    struct drm_intel_sprite_colorkey *key)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = plane-&gt;dev;</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct intel_plane *intel_plane;</div><div class='add'>+	u32 dvscntr;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	intel_plane = to_intel_plane(plane);</div><div class='add'>+</div><div class='add'>+	I915_WRITE(DVSKEYVAL(intel_plane-&gt;pipe), key-&gt;min_value);</div><div class='add'>+	I915_WRITE(DVSKEYMAX(intel_plane-&gt;pipe), key-&gt;max_value);</div><div class='add'>+	I915_WRITE(DVSKEYMSK(intel_plane-&gt;pipe), key-&gt;channel_mask);</div><div class='add'>+</div><div class='add'>+	dvscntr = I915_READ(DVSCNTR(intel_plane-&gt;pipe));</div><div class='add'>+	dvscntr &amp;= ~(DVS_SOURCE_KEY | DVS_DEST_KEY);</div><div class='add'>+	if (key-&gt;flags &amp; I915_SET_COLORKEY_DESTINATION)</div><div class='add'>+		dvscntr |= DVS_DEST_KEY;</div><div class='add'>+	else if (key-&gt;flags &amp; I915_SET_COLORKEY_SOURCE)</div><div class='add'>+		dvscntr |= DVS_SOURCE_KEY;</div><div class='add'>+	I915_WRITE(DVSCNTR(intel_plane-&gt;pipe), dvscntr);</div><div class='add'>+</div><div class='add'>+	POSTING_READ(DVSKEYMSK(intel_plane-&gt;pipe));</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+snb_get_colorkey(struct drm_plane *plane, struct drm_intel_sprite_colorkey *key)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = plane-&gt;dev;</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct intel_plane *intel_plane;</div><div class='add'>+	u32 dvscntr;</div><div class='add'>+</div><div class='add'>+	intel_plane = to_intel_plane(plane);</div><div class='add'>+</div><div class='add'>+	key-&gt;min_value = I915_READ(DVSKEYVAL(intel_plane-&gt;pipe));</div><div class='add'>+	key-&gt;max_value = I915_READ(DVSKEYMAX(intel_plane-&gt;pipe));</div><div class='add'>+	key-&gt;channel_mask = I915_READ(DVSKEYMSK(intel_plane-&gt;pipe));</div><div class='add'>+	key-&gt;flags = 0;</div><div class='add'>+</div><div class='add'>+	dvscntr = I915_READ(DVSCNTR(intel_plane-&gt;pipe));</div><div class='add'>+</div><div class='add'>+	if (dvscntr &amp; DVS_DEST_KEY)</div><div class='add'>+		key-&gt;flags = I915_SET_COLORKEY_DESTINATION;</div><div class='add'>+	else if (dvscntr &amp; DVS_SOURCE_KEY)</div><div class='add'>+		key-&gt;flags = I915_SET_COLORKEY_SOURCE;</div><div class='add'>+	else</div><div class='add'>+		key-&gt;flags = I915_SET_COLORKEY_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,</div><div class='add'>+		   struct drm_framebuffer *fb, int crtc_x, int crtc_y,</div><div class='add'>+		   unsigned int crtc_w, unsigned int crtc_h,</div><div class='add'>+		   uint32_t src_x, uint32_t src_y,</div><div class='add'>+		   uint32_t src_w, uint32_t src_h)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = plane-&gt;dev;</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);</div><div class='add'>+	struct intel_plane *intel_plane = to_intel_plane(plane);</div><div class='add'>+	struct intel_framebuffer *intel_fb;</div><div class='add'>+	struct drm_i915_gem_object *obj, *old_obj;</div><div class='add'>+	int pipe = intel_plane-&gt;pipe;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int x = src_x &gt;&gt; 16, y = src_y &gt;&gt; 16;</div><div class='add'>+	int primary_w = crtc-&gt;mode.hdisplay, primary_h = crtc-&gt;mode.vdisplay;</div><div class='add'>+	bool disable_primary = false;</div><div class='add'>+</div><div class='add'>+	intel_fb = to_intel_framebuffer(fb);</div><div class='add'>+	obj = intel_fb-&gt;obj;</div><div class='add'>+</div><div class='add'>+	old_obj = intel_plane-&gt;obj;</div><div class='add'>+</div><div class='add'>+	/* Pipe must be running... */</div><div class='add'>+	if (!(I915_READ(PIPECONF(pipe)) &amp; PIPECONF_ENABLE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (crtc_x &gt;= primary_w || crtc_y &gt;= primary_h)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Don't modify another pipe's plane */</div><div class='add'>+	if (intel_plane-&gt;pipe != intel_crtc-&gt;pipe)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clamp the width &amp; height into the visible area.  Note we don't</div><div class='add'>+	 * try to scale the source if part of the visible region is offscreen.</div><div class='add'>+	 * The caller must handle that by adjusting source offset and size.</div><div class='add'>+	 */</div><div class='add'>+	if ((crtc_x &lt; 0) &amp;&amp; ((crtc_x + crtc_w) &gt; 0)) {</div><div class='add'>+		crtc_w += crtc_x;</div><div class='add'>+		crtc_x = 0;</div><div class='add'>+	}</div><div class='add'>+	if ((crtc_x + crtc_w) &lt;= 0) /* Nothing to display */</div><div class='add'>+		goto out;</div><div class='add'>+	if ((crtc_x + crtc_w) &gt; primary_w)</div><div class='add'>+		crtc_w = primary_w - crtc_x;</div><div class='add'>+</div><div class='add'>+	if ((crtc_y &lt; 0) &amp;&amp; ((crtc_y + crtc_h) &gt; 0)) {</div><div class='add'>+		crtc_h += crtc_y;</div><div class='add'>+		crtc_y = 0;</div><div class='add'>+	}</div><div class='add'>+	if ((crtc_y + crtc_h) &lt;= 0) /* Nothing to display */</div><div class='add'>+		goto out;</div><div class='add'>+	if (crtc_y + crtc_h &gt; primary_h)</div><div class='add'>+		crtc_h = primary_h - crtc_y;</div><div class='add'>+</div><div class='add'>+	if (!crtc_w || !crtc_h) /* Again, nothing to display */</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We can take a larger source and scale it down, but</div><div class='add'>+	 * only so much...  16x is the max on SNB.</div><div class='add'>+	 */</div><div class='add'>+	if (((src_w * src_h) / (crtc_w * crtc_h)) &gt; intel_plane-&gt;max_downscale)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the sprite is completely covering the primary plane,</div><div class='add'>+	 * we can disable the primary and save power.</div><div class='add'>+	 */</div><div class='add'>+	if ((crtc_x == 0) &amp;&amp; (crtc_y == 0) &amp;&amp;</div><div class='add'>+	    (crtc_w == primary_w) &amp;&amp; (crtc_h == primary_h))</div><div class='add'>+		disable_primary = true;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	ret = intel_pin_and_fence_fb_obj(dev, obj, NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		DRM_ERROR("failed to pin object\n");</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	intel_plane-&gt;obj = obj;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Be sure to re-enable the primary before the sprite is no longer</div><div class='add'>+	 * covering it fully.</div><div class='add'>+	 */</div><div class='add'>+	if (!disable_primary &amp;&amp; intel_plane-&gt;primary_disabled) {</div><div class='add'>+		intel_enable_primary(crtc);</div><div class='add'>+		intel_plane-&gt;primary_disabled = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	intel_plane-&gt;update_plane(plane, fb, obj, crtc_x, crtc_y,</div><div class='add'>+				  crtc_w, crtc_h, x, y, src_w, src_h);</div><div class='add'>+</div><div class='add'>+	if (disable_primary) {</div><div class='add'>+		intel_disable_primary(crtc);</div><div class='add'>+		intel_plane-&gt;primary_disabled = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Unpin old obj after new one is active to avoid ugliness */</div><div class='add'>+	if (old_obj) {</div><div class='add'>+		/*</div><div class='add'>+		 * It's fairly common to simply update the position of</div><div class='add'>+		 * an existing object.  In that case, we don't need to</div><div class='add'>+		 * wait for vblank to avoid ugliness, we only need to</div><div class='add'>+		 * do the pin &amp; ref bookkeeping.</div><div class='add'>+		 */</div><div class='add'>+		if (old_obj != obj) {</div><div class='add'>+			mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+			intel_wait_for_vblank(dev, to_intel_crtc(crtc)-&gt;pipe);</div><div class='add'>+			mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		}</div><div class='add'>+		i915_gem_object_unpin(old_obj);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</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</div><div class='add'>+intel_disable_plane(struct drm_plane *plane)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = plane-&gt;dev;</div><div class='add'>+	struct intel_plane *intel_plane = to_intel_plane(plane);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (intel_plane-&gt;primary_disabled) {</div><div class='add'>+		intel_enable_primary(plane-&gt;crtc);</div><div class='add'>+		intel_plane-&gt;primary_disabled = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	intel_plane-&gt;disable_plane(plane);</div><div class='add'>+</div><div class='add'>+	if (!intel_plane-&gt;obj)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+	i915_gem_object_unpin(intel_plane-&gt;obj);</div><div class='add'>+	intel_plane-&gt;obj = NULL;</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+out:</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void intel_destroy_plane(struct drm_plane *plane)</div><div class='add'>+{</div><div class='add'>+	struct intel_plane *intel_plane = to_intel_plane(plane);</div><div class='add'>+	intel_disable_plane(plane);</div><div class='add'>+	drm_plane_cleanup(plane);</div><div class='add'>+	kfree(intel_plane);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int intel_sprite_set_colorkey(struct drm_device *dev, void *data,</div><div class='add'>+			      struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_intel_sprite_colorkey *set = data;</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_mode_object *obj;</div><div class='add'>+	struct drm_plane *plane;</div><div class='add'>+	struct intel_plane *intel_plane;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!dev_priv)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Make sure we don't try to enable both src &amp; dest simultaneously */</div><div class='add'>+	if ((set-&gt;flags &amp; (I915_SET_COLORKEY_DESTINATION | I915_SET_COLORKEY_SOURCE)) == (I915_SET_COLORKEY_DESTINATION | I915_SET_COLORKEY_SOURCE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+</div><div class='add'>+	obj = drm_mode_object_find(dev, set-&gt;plane_id, DRM_MODE_OBJECT_PLANE);</div><div class='add'>+	if (!obj) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	plane = obj_to_plane(obj);</div><div class='add'>+	intel_plane = to_intel_plane(plane);</div><div class='add'>+	ret = intel_plane-&gt;update_colorkey(plane, set);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int intel_sprite_get_colorkey(struct drm_device *dev, void *data,</div><div class='add'>+			      struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct drm_intel_sprite_colorkey *get = data;</div><div class='add'>+	struct drm_i915_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_mode_object *obj;</div><div class='add'>+	struct drm_plane *plane;</div><div class='add'>+	struct intel_plane *intel_plane;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!dev_priv)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+</div><div class='add'>+	obj = drm_mode_object_find(dev, get-&gt;plane_id, DRM_MODE_OBJECT_PLANE);</div><div class='add'>+	if (!obj) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	plane = obj_to_plane(obj);</div><div class='add'>+	intel_plane = to_intel_plane(plane);</div><div class='add'>+	intel_plane-&gt;get_colorkey(plane, get);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mode_config.mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct drm_plane_funcs intel_plane_funcs = {</div><div class='add'>+	.update_plane = intel_update_plane,</div><div class='add'>+	.disable_plane = intel_disable_plane,</div><div class='add'>+	.destroy = intel_destroy_plane,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static uint32_t snb_plane_formats[] = {</div><div class='add'>+	DRM_FORMAT_XBGR8888,</div><div class='add'>+	DRM_FORMAT_XRGB8888,</div><div class='add'>+	DRM_FORMAT_YUYV,</div><div class='add'>+	DRM_FORMAT_YVYU,</div><div class='add'>+	DRM_FORMAT_UYVY,</div><div class='add'>+	DRM_FORMAT_VYUY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+intel_plane_init(struct drm_device *dev, enum pipe pipe)</div><div class='add'>+{</div><div class='add'>+	struct intel_plane *intel_plane;</div><div class='add'>+	unsigned long possible_crtcs;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!(IS_GEN6(dev) || IS_GEN7(dev))) {</div><div class='add'>+		DRM_ERROR("new plane code only for SNB+\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	intel_plane = kzalloc(sizeof(struct intel_plane), GFP_KERNEL);</div><div class='add'>+	if (!intel_plane)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (IS_GEN6(dev)) {</div><div class='add'>+		intel_plane-&gt;max_downscale = 16;</div><div class='add'>+		intel_plane-&gt;update_plane = snb_update_plane;</div><div class='add'>+		intel_plane-&gt;disable_plane = snb_disable_plane;</div><div class='add'>+		intel_plane-&gt;update_colorkey = snb_update_colorkey;</div><div class='add'>+		intel_plane-&gt;get_colorkey = snb_get_colorkey;</div><div class='add'>+	} else if (IS_GEN7(dev)) {</div><div class='add'>+		intel_plane-&gt;max_downscale = 2;</div><div class='add'>+		intel_plane-&gt;update_plane = ivb_update_plane;</div><div class='add'>+		intel_plane-&gt;disable_plane = ivb_disable_plane;</div><div class='add'>+		intel_plane-&gt;update_colorkey = ivb_update_colorkey;</div><div class='add'>+		intel_plane-&gt;get_colorkey = ivb_get_colorkey;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	intel_plane-&gt;pipe = pipe;</div><div class='add'>+	possible_crtcs = (1 &lt;&lt; pipe);</div><div class='add'>+	ret = drm_plane_init(dev, &amp;intel_plane-&gt;base, possible_crtcs,</div><div class='add'>+			     &amp;intel_plane_funcs, snb_plane_formats,</div><div class='add'>+			     ARRAY_SIZE(snb_plane_formats), false);</div><div class='add'>+	if (ret)</div><div class='add'>+		kfree(intel_plane);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c<br/>index 33daa29eea66..f9a925d58819 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/mga/mga_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/mga/mga_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/mga/mga_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/mga/mga_drv.c</a></div><div class='hunk'>@@ -44,6 +44,20 @@ static struct pci_device_id pciidlist[] = {</div><div class='ctx'> 	mga_PCI_IDS</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct file_operations mga_driver_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = drm_open,</div><div class='add'>+	.release = drm_release,</div><div class='add'>+	.unlocked_ioctl = drm_ioctl,</div><div class='add'>+	.mmap = drm_mmap,</div><div class='add'>+	.poll = drm_poll,</div><div class='add'>+	.fasync = drm_fasync,</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+	.compat_ioctl = mga_compat_ioctl,</div><div class='add'>+#endif</div><div class='add'>+	.llseek = noop_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct drm_driver driver = {</div><div class='ctx'> 	.driver_features =</div><div class='ctx'> 	    DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA |</div><div class='hunk'>@@ -64,20 +78,7 @@ static struct drm_driver driver = {</div><div class='ctx'> 	.reclaim_buffers = drm_core_reclaim_buffers,</div><div class='ctx'> 	.ioctls = mga_ioctls,</div><div class='ctx'> 	.dma_ioctl = mga_dma_buffers,</div><div class='del'>-	.fops = {</div><div class='del'>-		.owner = THIS_MODULE,</div><div class='del'>-		.open = drm_open,</div><div class='del'>-		.release = drm_release,</div><div class='del'>-		.unlocked_ioctl = drm_ioctl,</div><div class='del'>-		.mmap = drm_mmap,</div><div class='del'>-		.poll = drm_poll,</div><div class='del'>-		.fasync = drm_fasync,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-		.compat_ioctl = mga_compat_ioctl,</div><div class='del'>-#endif</div><div class='del'>-		.llseek = noop_llseek,</div><div class='del'>-	},</div><div class='del'>-</div><div class='add'>+	.fops = &amp;mga_driver_fops,</div><div class='ctx'> 	.name = DRIVER_NAME,</div><div class='ctx'> 	.desc = DRIVER_DESC,</div><div class='ctx'> 	.date = DRIVER_DATE,</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile<br/>index 35ef5b1e3566..9f27e3d9e69a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/Makefile</a></div><div class='hunk'>@@ -9,9 +9,9 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \</div><div class='ctx'>              nouveau_bo.o nouveau_fence.o nouveau_gem.o nouveau_ttm.o \</div><div class='ctx'>              nouveau_hw.o nouveau_calc.o nouveau_bios.o nouveau_i2c.o \</div><div class='ctx'>              nouveau_display.o nouveau_connector.o nouveau_fbcon.o \</div><div class='del'>-             nouveau_dp.o nouveau_ramht.o \</div><div class='add'>+             nouveau_hdmi.o nouveau_dp.o nouveau_ramht.o \</div><div class='ctx'> 	     nouveau_pm.o nouveau_volt.o nouveau_perf.o nouveau_temp.o \</div><div class='del'>-	     nouveau_mm.o nouveau_vm.o \</div><div class='add'>+	     nouveau_mm.o nouveau_vm.o nouveau_mxm.o nouveau_gpio.o \</div><div class='ctx'>              nv04_timer.o \</div><div class='ctx'>              nv04_mc.o nv40_mc.o nv50_mc.o \</div><div class='ctx'>              nv04_fb.o nv10_fb.o nv30_fb.o nv40_fb.o nv50_fb.o nvc0_fb.o \</div><div class='hunk'>@@ -19,9 +19,12 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \</div><div class='ctx'>              nv04_graph.o nv10_graph.o nv20_graph.o \</div><div class='ctx'>              nv40_graph.o nv50_graph.o nvc0_graph.o \</div><div class='ctx'>              nv40_grctx.o nv50_grctx.o nvc0_grctx.o \</div><div class='del'>-             nv84_crypt.o \</div><div class='add'>+             nv84_crypt.o nv98_crypt.o \</div><div class='ctx'>              nva3_copy.o nvc0_copy.o \</div><div class='ctx'>              nv31_mpeg.o nv50_mpeg.o \</div><div class='add'>+             nv84_bsp.o \</div><div class='add'>+             nv84_vp.o \</div><div class='add'>+             nv98_ppp.o \</div><div class='ctx'>              nv04_instmem.o nv50_instmem.o nvc0_instmem.o \</div><div class='ctx'>              nv04_dac.o nv04_dfp.o nv04_tv.o nv17_tv.o nv17_tv_modes.o \</div><div class='ctx'>              nv04_crtc.o nv04_display.o nv04_cursor.o \</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c<br/>index 525744d593c1..7814a760c164 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_acpi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_acpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_acpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_acpi.c</a></div><div class='hunk'>@@ -18,12 +18,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/vga_switcheroo.h&gt;</div><div class='ctx'> </div><div class='del'>-#define NOUVEAU_DSM_SUPPORTED 0x00</div><div class='del'>-#define NOUVEAU_DSM_SUPPORTED_FUNCTIONS 0x00</div><div class='del'>-</div><div class='del'>-#define NOUVEAU_DSM_ACTIVE 0x01</div><div class='del'>-#define NOUVEAU_DSM_ACTIVE_QUERY 0x00</div><div class='del'>-</div><div class='ctx'> #define NOUVEAU_DSM_LED 0x02</div><div class='ctx'> #define NOUVEAU_DSM_LED_STATE 0x00</div><div class='ctx'> #define NOUVEAU_DSM_LED_OFF 0x10</div><div class='hunk'>@@ -35,6 +29,9 @@</div><div class='ctx'> #define NOUVEAU_DSM_POWER_SPEED 0x01</div><div class='ctx'> #define NOUVEAU_DSM_POWER_STAMINA 0x02</div><div class='ctx'> </div><div class='add'>+#define NOUVEAU_DSM_OPTIMUS_FN 0x1A</div><div class='add'>+#define NOUVEAU_DSM_OPTIMUS_ARGS 0x03000001</div><div class='add'>+</div><div class='ctx'> static struct nouveau_dsm_priv {</div><div class='ctx'> 	bool dsm_detected;</div><div class='ctx'> 	bool optimus_detected;</div><div class='hunk'>@@ -61,7 +58,8 @@ static int nouveau_optimus_dsm(acpi_handle handle, int func, int arg, uint32_t *</div><div class='ctx'> 	struct acpi_object_list input;</div><div class='ctx'> 	union acpi_object params[4];</div><div class='ctx'> 	union acpi_object *obj;</div><div class='del'>-	int err;</div><div class='add'>+	int i, err;</div><div class='add'>+	char args_buff[4];</div><div class='ctx'> </div><div class='ctx'> 	input.count = 4;</div><div class='ctx'> 	input.pointer = params;</div><div class='hunk'>@@ -73,7 +71,11 @@ static int nouveau_optimus_dsm(acpi_handle handle, int func, int arg, uint32_t *</div><div class='ctx'> 	params[2].type = ACPI_TYPE_INTEGER;</div><div class='ctx'> 	params[2].integer.value = func;</div><div class='ctx'> 	params[3].type = ACPI_TYPE_BUFFER;</div><div class='del'>-	params[3].buffer.length = 0;</div><div class='add'>+	params[3].buffer.length = 4;</div><div class='add'>+	/* ACPI is little endian, AABBCCDD becomes {DD,CC,BB,AA} */</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		args_buff[i] = (arg &gt;&gt; i * 8) &amp; 0xFF;</div><div class='add'>+	params[3].buffer.pointer = args_buff;</div><div class='ctx'> </div><div class='ctx'> 	err = acpi_evaluate_object(handle, "_DSM", &amp;input, &amp;output);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -148,6 +150,23 @@ static int nouveau_dsm(acpi_handle handle, int func, int arg, uint32_t *result)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Returns 1 if a DSM function is usable and 0 otherwise */</div><div class='add'>+static int nouveau_test_dsm(acpi_handle test_handle,</div><div class='add'>+	int (*dsm_func)(acpi_handle, int, int, uint32_t *),</div><div class='add'>+	int sfnc)</div><div class='add'>+{</div><div class='add'>+	u32 result = 0;</div><div class='add'>+</div><div class='add'>+	/* Function 0 returns a Buffer containing available functions. The args</div><div class='add'>+	 * parameter is ignored for function 0, so just put 0 in it */</div><div class='add'>+	if (dsm_func(test_handle, 0, 0, &amp;result))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* ACPI Spec v4 9.14.1: if bit 0 is zero, no function is supported. If</div><div class='add'>+	 * the n-th bit is enabled, function n is supported */</div><div class='add'>+	return result &amp; 1 &amp;&amp; result &amp; (1 &lt;&lt; sfnc);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int nouveau_dsm_switch_mux(acpi_handle handle, int mux_id)</div><div class='ctx'> {</div><div class='ctx'> 	mxm_wmi_call_mxmx(mux_id == NOUVEAU_DSM_LED_STAMINA ? MXM_MXDS_ADAPTER_IGD : MXM_MXDS_ADAPTER_0);</div><div class='hunk'>@@ -168,6 +187,10 @@ static int nouveau_dsm_set_discrete_state(acpi_handle handle, enum vga_switchero</div><div class='ctx'> </div><div class='ctx'> static int nouveau_dsm_switchto(enum vga_switcheroo_client_id id)</div><div class='ctx'> {</div><div class='add'>+	/* perhaps the _DSM functions are mutually exclusive, but prepare for</div><div class='add'>+	 * the future */</div><div class='add'>+	if (!nouveau_dsm_priv.dsm_detected &amp;&amp; nouveau_dsm_priv.optimus_detected)</div><div class='add'>+		return 0;</div><div class='ctx'> 	if (id == VGA_SWITCHEROO_IGD)</div><div class='ctx'> 		return nouveau_dsm_switch_mux(nouveau_dsm_priv.dhandle, NOUVEAU_DSM_LED_STAMINA);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -180,6 +203,11 @@ static int nouveau_dsm_power_state(enum vga_switcheroo_client_id id,</div><div class='ctx'> 	if (id == VGA_SWITCHEROO_IGD)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/* Optimus laptops have the card already disabled in</div><div class='add'>+	 * nouveau_switcheroo_set_state */</div><div class='add'>+	if (!nouveau_dsm_priv.dsm_detected &amp;&amp; nouveau_dsm_priv.optimus_detected)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	return nouveau_dsm_set_discrete_state(nouveau_dsm_priv.dhandle, state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -212,8 +240,7 @@ static int nouveau_dsm_pci_probe(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_handle dhandle, nvidia_handle;</div><div class='ctx'> 	acpi_status status;</div><div class='del'>-	int ret, retval = 0;</div><div class='del'>-	uint32_t result;</div><div class='add'>+	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	dhandle = DEVICE_ACPI_HANDLE(&amp;pdev-&gt;dev);</div><div class='ctx'> 	if (!dhandle)</div><div class='hunk'>@@ -224,13 +251,11 @@ static int nouveau_dsm_pci_probe(struct pci_dev *pdev)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = nouveau_dsm(dhandle, NOUVEAU_DSM_SUPPORTED,</div><div class='del'>-			  NOUVEAU_DSM_SUPPORTED_FUNCTIONS, &amp;result);</div><div class='del'>-	if (ret == 0)</div><div class='add'>+	if (nouveau_test_dsm(dhandle, nouveau_dsm, NOUVEAU_DSM_POWER))</div><div class='ctx'> 		retval |= NOUVEAU_DSM_HAS_MUX;</div><div class='ctx'> </div><div class='del'>-	ret = nouveau_optimus_dsm(dhandle, 0, 0, &amp;result);</div><div class='del'>-	if (ret == 0)</div><div class='add'>+	if (nouveau_test_dsm(dhandle, nouveau_optimus_dsm,</div><div class='add'>+		NOUVEAU_DSM_OPTIMUS_FN))</div><div class='ctx'> 		retval |= NOUVEAU_DSM_HAS_OPT;</div><div class='ctx'> </div><div class='ctx'> 	if (retval)</div><div class='hunk'>@@ -269,15 +294,22 @@ static bool nouveau_dsm_detect(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vga_count == 2 &amp;&amp; has_dsm &amp;&amp; guid_valid) {</div><div class='del'>-		acpi_get_name(nouveau_dsm_priv.dhandle, ACPI_FULL_PATHNAME, &amp;buffer);</div><div class='add'>+		acpi_get_name(nouveau_dsm_priv.dhandle, ACPI_FULL_PATHNAME,</div><div class='add'>+			&amp;buffer);</div><div class='ctx'> 		printk(KERN_INFO "VGA switcheroo: detected DSM switching method %s handle\n",</div><div class='del'>-		       acpi_method_name);</div><div class='add'>+			acpi_method_name);</div><div class='ctx'> 		nouveau_dsm_priv.dsm_detected = true;</div><div class='ctx'> 		ret = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (has_optimus == 1)</div><div class='add'>+	if (has_optimus == 1) {</div><div class='add'>+		acpi_get_name(nouveau_dsm_priv.dhandle, ACPI_FULL_PATHNAME,</div><div class='add'>+			&amp;buffer);</div><div class='add'>+		printk(KERN_INFO "VGA switcheroo: detected Optimus DSM method %s handle\n",</div><div class='add'>+			acpi_method_name);</div><div class='ctx'> 		nouveau_dsm_priv.optimus_detected = true;</div><div class='add'>+		ret = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -293,6 +325,17 @@ void nouveau_register_dsm_handler(void)</div><div class='ctx'> 	vga_switcheroo_register_handler(&amp;nouveau_dsm_handler);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Must be called for Optimus models before the card can be turned off */</div><div class='add'>+void nouveau_switcheroo_optimus_dsm(void)</div><div class='add'>+{</div><div class='add'>+	u32 result = 0;</div><div class='add'>+	if (!nouveau_dsm_priv.optimus_detected)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	nouveau_optimus_dsm(nouveau_dsm_priv.dhandle, NOUVEAU_DSM_OPTIMUS_FN,</div><div class='add'>+		NOUVEAU_DSM_OPTIMUS_ARGS, &amp;result);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void nouveau_unregister_dsm_handler(void)</div><div class='ctx'> {</div><div class='ctx'> 	vga_switcheroo_unregister_handler();</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c<br/>index 5fc201b49d30..e5cbead85e50 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_bios.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_bios.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_bios.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_bios.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include "nouveau_drv.h"</div><div class='ctx'> #include "nouveau_hw.h"</div><div class='ctx'> #include "nouveau_encoder.h"</div><div class='add'>+#include "nouveau_gpio.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io-mapping.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -34,9 +35,6 @@</div><div class='ctx'> #define NV_CIO_CRE_44_HEADA 0x0</div><div class='ctx'> #define NV_CIO_CRE_44_HEADB 0x3</div><div class='ctx'> #define FEATURE_MOBILE 0x10	/* also FEATURE_QUADRO for BMP */</div><div class='del'>-#define LEGACY_I2C_CRT 0x80</div><div class='del'>-#define LEGACY_I2C_PANEL 0x81</div><div class='del'>-#define LEGACY_I2C_TV 0x82</div><div class='ctx'> </div><div class='ctx'> #define EDID1_LEN 128</div><div class='ctx'> </div><div class='hunk'>@@ -723,115 +721,19 @@ static int dcb_entry_idx_from_crtchead(struct drm_device *dev)</div><div class='ctx'> 	return dcb_entry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-read_dcb_i2c_entry(struct drm_device *dev, int dcb_version, uint8_t *i2ctable, int index, struct dcb_i2c_entry *i2c)</div><div class='del'>-{</div><div class='del'>-	uint8_t dcb_i2c_ver = dcb_version, headerlen = 0, entry_len = 4;</div><div class='del'>-	int i2c_entries = DCB_MAX_NUM_I2C_ENTRIES;</div><div class='del'>-	int recordoffset = 0, rdofs = 1, wrofs = 0;</div><div class='del'>-	uint8_t port_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!i2ctable)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (dcb_version &gt;= 0x30) {</div><div class='del'>-		if (i2ctable[0] != dcb_version) /* necessary? */</div><div class='del'>-			NV_WARN(dev,</div><div class='del'>-				"DCB I2C table version mismatch (%02X vs %02X)\n",</div><div class='del'>-				i2ctable[0], dcb_version);</div><div class='del'>-		dcb_i2c_ver = i2ctable[0];</div><div class='del'>-		headerlen = i2ctable[1];</div><div class='del'>-		if (i2ctable[2] &lt;= DCB_MAX_NUM_I2C_ENTRIES)</div><div class='del'>-			i2c_entries = i2ctable[2];</div><div class='del'>-		else</div><div class='del'>-			NV_WARN(dev,</div><div class='del'>-				"DCB I2C table has more entries than indexable "</div><div class='del'>-				"(%d entries, max %d)\n", i2ctable[2],</div><div class='del'>-				DCB_MAX_NUM_I2C_ENTRIES);</div><div class='del'>-		entry_len = i2ctable[3];</div><div class='del'>-		/* [4] is i2c_default_indices, read in parse_dcb_table() */</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * It's your own fault if you call this function on a DCB 1.1 BIOS --</div><div class='del'>-	 * the test below is for DCB 1.2</div><div class='del'>-	 */</div><div class='del'>-	if (dcb_version &lt; 0x14) {</div><div class='del'>-		recordoffset = 2;</div><div class='del'>-		rdofs = 0;</div><div class='del'>-		wrofs = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (index == 0xf)</div><div class='del'>-		return 0;</div><div class='del'>-	if (index &gt;= i2c_entries) {</div><div class='del'>-		NV_ERROR(dev, "DCB I2C index too big (%d &gt;= %d)\n",</div><div class='del'>-			 index, i2ctable[2]);</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-	if (i2ctable[headerlen + entry_len * index + 3] == 0xff) {</div><div class='del'>-		NV_ERROR(dev, "DCB I2C entry invalid\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dcb_i2c_ver &gt;= 0x30) {</div><div class='del'>-		port_type = i2ctable[headerlen + recordoffset + 3 + entry_len * index];</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Fixup for chips using same address offset for read and</div><div class='del'>-		 * write.</div><div class='del'>-		 */</div><div class='del'>-		if (port_type == 4)	/* seen on C51 */</div><div class='del'>-			rdofs = wrofs = 1;</div><div class='del'>-		if (port_type &gt;= 5)	/* G80+ */</div><div class='del'>-			rdofs = wrofs = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dcb_i2c_ver &gt;= 0x40) {</div><div class='del'>-		if (port_type != 5 &amp;&amp; port_type != 6)</div><div class='del'>-			NV_WARN(dev, "DCB I2C table has port type %d\n", port_type);</div><div class='del'>-</div><div class='del'>-		i2c-&gt;entry = ROM32(i2ctable[headerlen + recordoffset + entry_len * index]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	i2c-&gt;port_type = port_type;</div><div class='del'>-	i2c-&gt;read = i2ctable[headerlen + recordoffset + rdofs + entry_len * index];</div><div class='del'>-	i2c-&gt;write = i2ctable[headerlen + recordoffset + wrofs + entry_len * index];</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct nouveau_i2c_chan *</div><div class='ctx'> init_i2c_device_find(struct drm_device *dev, int i2c_index)</div><div class='ctx'> {</div><div class='del'>-	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct dcb_table *dcb = &amp;dev_priv-&gt;vbios.dcb;</div><div class='del'>-</div><div class='ctx'> 	if (i2c_index == 0xff) {</div><div class='add'>+		struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+		struct dcb_table *dcb = &amp;dev_priv-&gt;vbios.dcb;</div><div class='ctx'> 		/* note: dcb_entry_idx_from_crtchead needs pre-script set-up */</div><div class='del'>-		int idx = dcb_entry_idx_from_crtchead(dev), shift = 0;</div><div class='del'>-		int default_indices = dcb-&gt;i2c_default_indices;</div><div class='add'>+		int idx = dcb_entry_idx_from_crtchead(dev);</div><div class='ctx'> </div><div class='add'>+		i2c_index = NV_I2C_DEFAULT(0);</div><div class='ctx'> 		if (idx != 0x7f &amp;&amp; dcb-&gt;entry[idx].i2c_upper_default)</div><div class='del'>-			shift = 4;</div><div class='del'>-</div><div class='del'>-		i2c_index = (default_indices &gt;&gt; shift) &amp; 0xf;</div><div class='add'>+			i2c_index = NV_I2C_DEFAULT(1);</div><div class='ctx'> 	}</div><div class='del'>-	if (i2c_index == 0x80)	/* g80+ */</div><div class='del'>-		i2c_index = dcb-&gt;i2c_default_indices &amp; 0xf;</div><div class='del'>-	else</div><div class='del'>-	if (i2c_index == 0x81)</div><div class='del'>-		i2c_index = (dcb-&gt;i2c_default_indices &amp; 0xf0) &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	if (i2c_index &gt;= DCB_MAX_NUM_I2C_ENTRIES) {</div><div class='del'>-		NV_ERROR(dev, "invalid i2c_index 0x%x\n", i2c_index);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Make sure i2c table entry has been parsed, it may not</div><div class='del'>-	 * have been if this is a bus not referenced by a DCB encoder</div><div class='del'>-	 */</div><div class='del'>-	read_dcb_i2c_entry(dev, dcb-&gt;version, dcb-&gt;i2c_table,</div><div class='del'>-			   i2c_index, &amp;dcb-&gt;i2c[i2c_index]);</div><div class='ctx'> </div><div class='ctx'> 	return nouveau_i2c_find(dev, i2c_index);</div><div class='ctx'> }</div><div class='hunk'>@@ -1199,13 +1101,9 @@ init_dp_condition(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)</div><div class='ctx'> </div><div class='ctx'> 	switch (cond) {</div><div class='ctx'> 	case 0:</div><div class='del'>-	{</div><div class='del'>-		struct dcb_connector_table_entry *ent =</div><div class='del'>-			&amp;bios-&gt;dcb.connector.entry[dcb-&gt;connector];</div><div class='del'>-</div><div class='del'>-		if (ent-&gt;type != DCB_CONNECTOR_eDP)</div><div class='add'>+		entry = dcb_conn(dev, dcb-&gt;connector);</div><div class='add'>+		if (!entry || entry[0] != DCB_CONNECTOR_eDP)</div><div class='ctx'> 			iexec-&gt;execute = false;</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='ctx'> 	case 2:</div><div class='hunk'>@@ -3227,49 +3125,6 @@ init_8d(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-init_gpio_unknv50(struct nvbios *bios, struct dcb_gpio_entry *gpio)</div><div class='del'>-{</div><div class='del'>-	const uint32_t nv50_gpio_ctl[2] = { 0xe100, 0xe28c };</div><div class='del'>-	u32 r, s, v;</div><div class='del'>-</div><div class='del'>-	/* Not a clue, needs de-magicing */</div><div class='del'>-	r = nv50_gpio_ctl[gpio-&gt;line &gt;&gt; 4];</div><div class='del'>-	s = (gpio-&gt;line &amp; 0x0f);</div><div class='del'>-	v = bios_rd32(bios, r) &amp; ~(0x00010001 &lt;&lt; s);</div><div class='del'>-	switch ((gpio-&gt;entry &amp; 0x06000000) &gt;&gt; 25) {</div><div class='del'>-	case 1:</div><div class='del'>-		v |= (0x00000001 &lt;&lt; s);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		v |= (0x00010000 &lt;&lt; s);</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'>-	bios_wr32(bios, r, v);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_gpio_unknvd0(struct nvbios *bios, struct dcb_gpio_entry *gpio)</div><div class='del'>-{</div><div class='del'>-	u32 v, i;</div><div class='del'>-</div><div class='del'>-	v  = bios_rd32(bios, 0x00d610 + (gpio-&gt;line * 4));</div><div class='del'>-	v &amp;= 0xffffff00;</div><div class='del'>-	v |= (gpio-&gt;entry &amp; 0x00ff0000) &gt;&gt; 16;</div><div class='del'>-	bios_wr32(bios, 0x00d610 + (gpio-&gt;line * 4), v);</div><div class='del'>-</div><div class='del'>-	i = (gpio-&gt;entry &amp; 0x1f000000) &gt;&gt; 24;</div><div class='del'>-	if (i) {</div><div class='del'>-		v  = bios_rd32(bios, 0x00d640 + ((i - 1) * 4));</div><div class='del'>-		v &amp;= 0xffffff00;</div><div class='del'>-		v |= gpio-&gt;line;</div><div class='del'>-		bios_wr32(bios, 0x00d640 + ((i - 1) * 4), v);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> init_gpio(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)</div><div class='ctx'> {</div><div class='hunk'>@@ -3282,35 +3137,8 @@ init_gpio(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)</div><div class='ctx'> 	 * each GPIO according to various values listed in each entry</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	struct drm_nouveau_private *dev_priv = bios-&gt;dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (dev_priv-&gt;card_type &lt; NV_50) {</div><div class='del'>-		NV_ERROR(bios-&gt;dev, "INIT_GPIO on unsupported chipset\n");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!iexec-&gt;execute)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; bios-&gt;dcb.gpio.entries; i++) {</div><div class='del'>-		struct dcb_gpio_entry *gpio = &amp;bios-&gt;dcb.gpio.entry[i];</div><div class='del'>-</div><div class='del'>-		BIOSLOG(bios, "0x%04X: Entry: 0x%08X\n", offset, gpio-&gt;entry);</div><div class='del'>-</div><div class='del'>-		BIOSLOG(bios, "0x%04X: set gpio 0x%02x, state %d\n",</div><div class='del'>-			offset, gpio-&gt;tag, gpio-&gt;state_default);</div><div class='del'>-</div><div class='del'>-		if (!bios-&gt;execute)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		pgpio-&gt;set(bios-&gt;dev, gpio-&gt;tag, gpio-&gt;state_default);</div><div class='del'>-		if (dev_priv-&gt;card_type &lt; NV_D0)</div><div class='del'>-			init_gpio_unknv50(bios, gpio);</div><div class='del'>-		else</div><div class='del'>-			init_gpio_unknvd0(bios, gpio);</div><div class='del'>-	}</div><div class='add'>+	if (iexec-&gt;execute &amp;&amp; bios-&gt;execute)</div><div class='add'>+		nouveau_gpio_reset(bios-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -4407,18 +4235,6 @@ int nouveau_bios_parse_lvds_table(struct drm_device *dev, int pxclk, bool *dl, b</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Dell Latitude D620 reports a too-high value for the dual-link</div><div class='del'>-	 * transition freq, causing us to program the panel incorrectly.</div><div class='del'>-	 *</div><div class='del'>-	 * It doesn't appear the VBIOS actually uses its transition freq</div><div class='del'>-	 * (90000kHz), instead it uses the "Number of LVDS channels" field</div><div class='del'>-	 * out of the panel ID structure (http://www.spwg.org/).</div><div class='del'>-	 *</div><div class='del'>-	 * For the moment, a quirk will do :)</div><div class='del'>-	 */</div><div class='del'>-	if (nv_match_device(dev, 0x01d7, 0x1028, 0x01c2))</div><div class='del'>-		bios-&gt;fp.duallink_transition_clk = 80000;</div><div class='del'>-</div><div class='ctx'> 	/* set dual_link flag for EDID case */</div><div class='ctx'> 	if (pxclk &amp;&amp; (chip_version &lt; 0x25 || chip_version &gt; 0x28))</div><div class='ctx'> 		bios-&gt;fp.dual_link = (pxclk &gt;= bios-&gt;fp.duallink_transition_clk);</div><div class='hunk'>@@ -4541,7 +4357,7 @@ nouveau_bios_run_display_table(struct drm_device *dev, u16 type, int pclk,</div><div class='ctx'> 	NV_DEBUG_KMS(dev, "Searching for output entry for %d %d %d\n",</div><div class='ctx'> 			dcbent-&gt;type, dcbent-&gt;location, dcbent-&gt;or);</div><div class='ctx'> 	for (i = 0; i &lt; table[3]; i++) {</div><div class='del'>-		otable = ROMPTR(bios, table[table[1] + (i * table[2])]);</div><div class='add'>+		otable = ROMPTR(dev, table[table[1] + (i * table[2])]);</div><div class='ctx'> 		if (otable &amp;&amp; bios_encoder_match(dcbent, ROM32(otable[0])))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4719,7 +4535,7 @@ static struct pll_mapping nv84_pll_mapping[] = {</div><div class='ctx'> 	{ PLL_CORE  , 0x004028 },</div><div class='ctx'> 	{ PLL_SHADER, 0x004020 },</div><div class='ctx'> 	{ PLL_MEMORY, 0x004008 },</div><div class='del'>-	{ PLL_UNK05 , 0x004030 },</div><div class='add'>+	{ PLL_VDEC  , 0x004030 },</div><div class='ctx'> 	{ PLL_UNK41 , 0x00e818 },</div><div class='ctx'> 	{ PLL_VPLL0 , 0x614100 },</div><div class='ctx'> 	{ PLL_VPLL1 , 0x614900 },</div><div class='hunk'>@@ -5485,6 +5301,9 @@ bit_table(struct drm_device *dev, u8 id, struct bit_entry *bit)</div><div class='ctx'> 	struct nvbios *bios = &amp;dev_priv-&gt;vbios;</div><div class='ctx'> 	u8 entries, *entry;</div><div class='ctx'> </div><div class='add'>+	if (bios-&gt;type != NVBIOS_BIT)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	entries = bios-&gt;data[bios-&gt;offset + 10];</div><div class='ctx'> 	entry   = &amp;bios-&gt;data[bios-&gt;offset + 12];</div><div class='ctx'> 	while (entries--) {</div><div class='hunk'>@@ -5493,7 +5312,7 @@ bit_table(struct drm_device *dev, u8 id, struct bit_entry *bit)</div><div class='ctx'> 			bit-&gt;version = entry[1];</div><div class='ctx'> 			bit-&gt;length = ROM16(entry[2]);</div><div class='ctx'> 			bit-&gt;offset = ROM16(entry[4]);</div><div class='del'>-			bit-&gt;data = ROMPTR(bios, entry[4]);</div><div class='add'>+			bit-&gt;data = ROMPTR(dev, entry[4]);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -5598,10 +5417,6 @@ static int parse_bmp_structure(struct drm_device *dev, struct nvbios *bios, unsi</div><div class='ctx'> 	uint16_t legacy_scripts_offset, legacy_i2c_offset;</div><div class='ctx'> </div><div class='ctx'> 	/* load needed defaults in case we can't parse this info */</div><div class='del'>-	bios-&gt;dcb.i2c[0].write = NV_CIO_CRE_DDC_WR__INDEX;</div><div class='del'>-	bios-&gt;dcb.i2c[0].read = NV_CIO_CRE_DDC_STATUS__INDEX;</div><div class='del'>-	bios-&gt;dcb.i2c[1].write = NV_CIO_CRE_DDC0_WR__INDEX;</div><div class='del'>-	bios-&gt;dcb.i2c[1].read = NV_CIO_CRE_DDC0_STATUS__INDEX;</div><div class='ctx'> 	bios-&gt;digital_min_front_porch = 0x4b;</div><div class='ctx'> 	bios-&gt;fmaxvco = 256000;</div><div class='ctx'> 	bios-&gt;fminvco = 128000;</div><div class='hunk'>@@ -5709,14 +5524,6 @@ static int parse_bmp_structure(struct drm_device *dev, struct nvbios *bios, unsi</div><div class='ctx'> 	bios-&gt;legacy.i2c_indices.crt = bios-&gt;data[legacy_i2c_offset];</div><div class='ctx'> 	bios-&gt;legacy.i2c_indices.tv = bios-&gt;data[legacy_i2c_offset + 1];</div><div class='ctx'> 	bios-&gt;legacy.i2c_indices.panel = bios-&gt;data[legacy_i2c_offset + 2];</div><div class='del'>-	if (bios-&gt;data[legacy_i2c_offset + 4])</div><div class='del'>-		bios-&gt;dcb.i2c[0].write = bios-&gt;data[legacy_i2c_offset + 4];</div><div class='del'>-	if (bios-&gt;data[legacy_i2c_offset + 5])</div><div class='del'>-		bios-&gt;dcb.i2c[0].read = bios-&gt;data[legacy_i2c_offset + 5];</div><div class='del'>-	if (bios-&gt;data[legacy_i2c_offset + 6])</div><div class='del'>-		bios-&gt;dcb.i2c[1].write = bios-&gt;data[legacy_i2c_offset + 6];</div><div class='del'>-	if (bios-&gt;data[legacy_i2c_offset + 7])</div><div class='del'>-		bios-&gt;dcb.i2c[1].read = bios-&gt;data[legacy_i2c_offset + 7];</div><div class='ctx'> </div><div class='ctx'> 	if (bmplength &gt; 74) {</div><div class='ctx'> 		bios-&gt;fmaxvco = ROM32(bmp[67]);</div><div class='hunk'>@@ -5767,286 +5574,128 @@ static uint16_t findstr(uint8_t *data, int n, const uint8_t *str, int len)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dcb_gpio_entry *</div><div class='del'>-new_gpio_entry(struct nvbios *bios)</div><div class='del'>-{</div><div class='del'>-	struct drm_device *dev = bios-&gt;dev;</div><div class='del'>-	struct dcb_gpio_table *gpio = &amp;bios-&gt;dcb.gpio;</div><div class='del'>-</div><div class='del'>-	if (gpio-&gt;entries &gt;= DCB_MAX_NUM_GPIO_ENTRIES) {</div><div class='del'>-		NV_ERROR(dev, "exceeded maximum number of gpio entries!!\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return &amp;gpio-&gt;entry[gpio-&gt;entries++];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct dcb_gpio_entry *</div><div class='del'>-nouveau_bios_gpio_entry(struct drm_device *dev, enum dcb_gpio_tag tag)</div><div class='add'>+void *</div><div class='add'>+dcb_table(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nvbios *bios = &amp;dev_priv-&gt;vbios;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; bios-&gt;dcb.gpio.entries; i++) {</div><div class='del'>-		if (bios-&gt;dcb.gpio.entry[i].tag != tag)</div><div class='del'>-			continue;</div><div class='add'>+	u8 *dcb = NULL;</div><div class='ctx'> </div><div class='del'>-		return &amp;bios-&gt;dcb.gpio.entry[i];</div><div class='add'>+	if (dev_priv-&gt;card_type &gt; NV_04)</div><div class='add'>+		dcb = ROMPTR(dev, dev_priv-&gt;vbios.data[0x36]);</div><div class='add'>+	if (!dcb) {</div><div class='add'>+		NV_WARNONCE(dev, "No DCB data found in VBIOS\n");</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_dcb_gpio_table(struct nvbios *bios)</div><div class='del'>-{</div><div class='del'>-	struct drm_device *dev = bios-&gt;dev;</div><div class='del'>-	struct dcb_gpio_entry *e;</div><div class='del'>-	u8 headerlen, entries, recordlen;</div><div class='del'>-	u8 *dcb, *gpio = NULL, *entry;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	dcb = ROMPTR(bios, bios-&gt;data[0x36]);</div><div class='add'>+	if (dcb[0] &gt;= 0x41) {</div><div class='add'>+		NV_WARNONCE(dev, "DCB version 0x%02x unknown\n", dcb[0]);</div><div class='add'>+		return NULL;</div><div class='add'>+	} else</div><div class='ctx'> 	if (dcb[0] &gt;= 0x30) {</div><div class='del'>-		gpio = ROMPTR(bios, dcb[10]);</div><div class='del'>-		if (!gpio)</div><div class='del'>-			goto no_table;</div><div class='del'>-</div><div class='del'>-		headerlen = gpio[1];</div><div class='del'>-		entries   = gpio[2];</div><div class='del'>-		recordlen = gpio[3];</div><div class='add'>+		if (ROM32(dcb[6]) == 0x4edcbdcb)</div><div class='add'>+			return dcb;</div><div class='ctx'> 	} else</div><div class='del'>-	if (dcb[0] &gt;= 0x22 &amp;&amp; dcb[-1] &gt;= 0x13) {</div><div class='del'>-		gpio = ROMPTR(bios, dcb[-15]);</div><div class='del'>-		if (!gpio)</div><div class='del'>-			goto no_table;</div><div class='del'>-</div><div class='del'>-		headerlen = 3;</div><div class='del'>-		entries   = gpio[2];</div><div class='del'>-		recordlen = gpio[1];</div><div class='add'>+	if (dcb[0] &gt;= 0x20) {</div><div class='add'>+		if (ROM32(dcb[4]) == 0x4edcbdcb)</div><div class='add'>+			return dcb;</div><div class='ctx'> 	} else</div><div class='del'>-	if (dcb[0] &gt;= 0x22) {</div><div class='del'>-		/* No GPIO table present, parse the TVDAC GPIO data. */</div><div class='del'>-		uint8_t *tvdac_gpio = &amp;dcb[-5];</div><div class='del'>-</div><div class='del'>-		if (tvdac_gpio[0] &amp; 1) {</div><div class='del'>-			e = new_gpio_entry(bios);</div><div class='del'>-			e-&gt;tag = DCB_GPIO_TVDAC0;</div><div class='del'>-			e-&gt;line = tvdac_gpio[1] &gt;&gt; 4;</div><div class='del'>-			e-&gt;invert = tvdac_gpio[0] &amp; 2;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		goto no_table;</div><div class='add'>+	if (dcb[0] &gt;= 0x15) {</div><div class='add'>+		if (!memcmp(&amp;dcb[-7], "DEV_REC", 7))</div><div class='add'>+			return dcb;</div><div class='ctx'> 	} else {</div><div class='del'>-		NV_DEBUG(dev, "no/unknown gpio table on DCB 0x%02x\n", dcb[0]);</div><div class='del'>-		goto no_table;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	entry = gpio + headerlen;</div><div class='del'>-	for (i = 0; i &lt; entries; i++, entry += recordlen) {</div><div class='del'>-		e = new_gpio_entry(bios);</div><div class='del'>-		if (!e)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (gpio[0] &lt; 0x40) {</div><div class='del'>-			e-&gt;entry = ROM16(entry[0]);</div><div class='del'>-			e-&gt;tag = (e-&gt;entry &amp; 0x07e0) &gt;&gt; 5;</div><div class='del'>-			if (e-&gt;tag == 0x3f) {</div><div class='del'>-				bios-&gt;dcb.gpio.entries--;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			e-&gt;line = (e-&gt;entry &amp; 0x001f);</div><div class='del'>-			e-&gt;invert = ((e-&gt;entry &amp; 0xf800) &gt;&gt; 11) != 4;</div><div class='del'>-		} else {</div><div class='del'>-			e-&gt;entry = ROM32(entry[0]);</div><div class='del'>-			e-&gt;tag = (e-&gt;entry &amp; 0x0000ff00) &gt;&gt; 8;</div><div class='del'>-			if (e-&gt;tag == 0xff) {</div><div class='del'>-				bios-&gt;dcb.gpio.entries--;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			e-&gt;line = (e-&gt;entry &amp; 0x0000001f) &gt;&gt; 0;</div><div class='del'>-			if (gpio[0] == 0x40) {</div><div class='del'>-				e-&gt;state_default = (e-&gt;entry &amp; 0x01000000) &gt;&gt; 24;</div><div class='del'>-				e-&gt;state[0] = (e-&gt;entry &amp; 0x18000000) &gt;&gt; 27;</div><div class='del'>-				e-&gt;state[1] = (e-&gt;entry &amp; 0x60000000) &gt;&gt; 29;</div><div class='del'>-			} else {</div><div class='del'>-				e-&gt;state_default = (e-&gt;entry &amp; 0x00000080) &gt;&gt; 7;</div><div class='del'>-				e-&gt;state[0] = (entry[4] &gt;&gt; 4) &amp; 3;</div><div class='del'>-				e-&gt;state[1] = (entry[4] &gt;&gt; 6) &amp; 3;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-no_table:</div><div class='del'>-	/* Apple iMac G4 NV18 */</div><div class='del'>-	if (nv_match_device(dev, 0x0189, 0x10de, 0x0010)) {</div><div class='del'>-		e = new_gpio_entry(bios);</div><div class='del'>-		if (e) {</div><div class='del'>-			e-&gt;tag = DCB_GPIO_TVDAC0;</div><div class='del'>-			e-&gt;line = 4;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct dcb_connector_table_entry *</div><div class='del'>-nouveau_bios_connector_entry(struct drm_device *dev, int index)</div><div class='del'>-{</div><div class='del'>-	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nvbios *bios = &amp;dev_priv-&gt;vbios;</div><div class='del'>-	struct dcb_connector_table_entry *cte;</div><div class='del'>-</div><div class='del'>-	if (index &gt;= bios-&gt;dcb.connector.entries)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	cte = &amp;bios-&gt;dcb.connector.entry[index];</div><div class='del'>-	if (cte-&gt;type == 0xff)</div><div class='add'>+		/*</div><div class='add'>+		 * v1.4 (some NV15/16, NV11+) seems the same as v1.5, but</div><div class='add'>+		 * always has the same single (crt) entry, even when tv-out</div><div class='add'>+		 * present, so the conclusion is this version cannot really</div><div class='add'>+		 * be used.</div><div class='add'>+		 *</div><div class='add'>+		 * v1.2 tables (some NV6/10, and NV15+) normally have the</div><div class='add'>+		 * same 5 entries, which are not specific to the card and so</div><div class='add'>+		 * no use.</div><div class='add'>+		 *</div><div class='add'>+		 * v1.2 does have an I2C table that read_dcb_i2c_table can</div><div class='add'>+		 * handle, but cards exist (nv11 in #14821) with a bad i2c</div><div class='add'>+		 * table pointer, so use the indices parsed in</div><div class='add'>+		 * parse_bmp_structure.</div><div class='add'>+		 *</div><div class='add'>+		 * v1.1 (NV5+, maybe some NV4) is entirely unhelpful</div><div class='add'>+		 */</div><div class='add'>+		NV_WARNONCE(dev, "No useful DCB data in VBIOS\n");</div><div class='ctx'> 		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return cte;</div><div class='add'>+	NV_WARNONCE(dev, "DCB header validation failed\n");</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static enum dcb_connector_type</div><div class='del'>-divine_connector_type(struct nvbios *bios, int index)</div><div class='add'>+void *</div><div class='add'>+dcb_outp(struct drm_device *dev, u8 idx)</div><div class='ctx'> {</div><div class='del'>-	struct dcb_table *dcb = &amp;bios-&gt;dcb;</div><div class='del'>-	unsigned encoders = 0, type = DCB_CONNECTOR_NONE;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; dcb-&gt;entries; i++) {</div><div class='del'>-		if (dcb-&gt;entry[i].connector == index)</div><div class='del'>-			encoders |= (1 &lt;&lt; dcb-&gt;entry[i].type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (encoders &amp; (1 &lt;&lt; OUTPUT_DP)) {</div><div class='del'>-		if (encoders &amp; (1 &lt;&lt; OUTPUT_TMDS))</div><div class='del'>-			type = DCB_CONNECTOR_DP;</div><div class='del'>-		else</div><div class='del'>-			type = DCB_CONNECTOR_eDP;</div><div class='del'>-	} else</div><div class='del'>-	if (encoders &amp; (1 &lt;&lt; OUTPUT_TMDS)) {</div><div class='del'>-		if (encoders &amp; (1 &lt;&lt; OUTPUT_ANALOG))</div><div class='del'>-			type = DCB_CONNECTOR_DVI_I;</div><div class='del'>-		else</div><div class='del'>-			type = DCB_CONNECTOR_DVI_D;</div><div class='del'>-	} else</div><div class='del'>-	if (encoders &amp; (1 &lt;&lt; OUTPUT_ANALOG)) {</div><div class='del'>-		type = DCB_CONNECTOR_VGA;</div><div class='add'>+	u8 *dcb = dcb_table(dev);</div><div class='add'>+	if (dcb &amp;&amp; dcb[0] &gt;= 0x30) {</div><div class='add'>+		if (idx &lt; dcb[2])</div><div class='add'>+			return dcb + dcb[1] + (idx * dcb[3]);</div><div class='ctx'> 	} else</div><div class='del'>-	if (encoders &amp; (1 &lt;&lt; OUTPUT_LVDS)) {</div><div class='del'>-		type = DCB_CONNECTOR_LVDS;</div><div class='add'>+	if (dcb &amp;&amp; dcb[0] &gt;= 0x20) {</div><div class='add'>+		u8 *i2c = ROMPTR(dev, dcb[2]);</div><div class='add'>+		u8 *ent = dcb + 8 + (idx * 8);</div><div class='add'>+		if (i2c &amp;&amp; ent &lt; i2c)</div><div class='add'>+			return ent;</div><div class='ctx'> 	} else</div><div class='del'>-	if (encoders &amp; (1 &lt;&lt; OUTPUT_TV)) {</div><div class='del'>-		type = DCB_CONNECTOR_TV_0;</div><div class='add'>+	if (dcb &amp;&amp; dcb[0] &gt;= 0x15) {</div><div class='add'>+		u8 *i2c = ROMPTR(dev, dcb[2]);</div><div class='add'>+		u8 *ent = dcb + 4 + (idx * 10);</div><div class='add'>+		if (i2c &amp;&amp; ent &lt; i2c)</div><div class='add'>+			return ent;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return type;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-apply_dcb_connector_quirks(struct nvbios *bios, int idx)</div><div class='del'>-{</div><div class='del'>-	struct dcb_connector_table_entry *cte = &amp;bios-&gt;dcb.connector.entry[idx];</div><div class='del'>-	struct drm_device *dev = bios-&gt;dev;</div><div class='add'>+int</div><div class='add'>+dcb_outp_foreach(struct drm_device *dev, void *data,</div><div class='add'>+		 int (*exec)(struct drm_device *, void *, int idx, u8 *outp))</div><div class='add'>+{</div><div class='add'>+	int ret, idx = -1;</div><div class='add'>+	u8 *outp = NULL;</div><div class='add'>+	while ((outp = dcb_outp(dev, ++idx))) {</div><div class='add'>+		if (ROM32(outp[0]) == 0x00000000)</div><div class='add'>+			break; /* seen on an NV11 with DCB v1.5 */</div><div class='add'>+		if (ROM32(outp[0]) == 0xffffffff)</div><div class='add'>+			break; /* seen on an NV17 with DCB v2.0 */</div><div class='add'>+</div><div class='add'>+		if ((outp[0] &amp; 0x0f) == OUTPUT_UNUSED)</div><div class='add'>+			continue;</div><div class='add'>+		if ((outp[0] &amp; 0x0f) == OUTPUT_EOL)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-	/* Gigabyte NX85T */</div><div class='del'>-	if (nv_match_device(dev, 0x0421, 0x1458, 0x344c)) {</div><div class='del'>-		if (cte-&gt;type == DCB_CONNECTOR_HDMI_1)</div><div class='del'>-			cte-&gt;type = DCB_CONNECTOR_DVI_I;</div><div class='add'>+		ret = exec(dev, data, idx, outp);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Gigabyte GV-NX86T512H */</div><div class='del'>-	if (nv_match_device(dev, 0x0402, 0x1458, 0x3455)) {</div><div class='del'>-		if (cte-&gt;type == DCB_CONNECTOR_HDMI_1)</div><div class='del'>-			cte-&gt;type = DCB_CONNECTOR_DVI_I;</div><div class='del'>-	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const u8 hpd_gpio[16] = {</div><div class='del'>-	0xff, 0x07, 0x08, 0xff, 0xff, 0x51, 0x52, 0xff,</div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0x5e, 0x5f, 0x60,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_dcb_connector_table(struct nvbios *bios)</div><div class='add'>+u8 *</div><div class='add'>+dcb_conntab(struct drm_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct drm_device *dev = bios-&gt;dev;</div><div class='del'>-	struct dcb_connector_table *ct = &amp;bios-&gt;dcb.connector;</div><div class='del'>-	struct dcb_connector_table_entry *cte;</div><div class='del'>-	uint8_t *conntab = &amp;bios-&gt;data[bios-&gt;dcb.connector_table_ptr];</div><div class='del'>-	uint8_t *entry;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!bios-&gt;dcb.connector_table_ptr) {</div><div class='del'>-		NV_DEBUG_KMS(dev, "No DCB connector table present\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	NV_INFO(dev, "DCB connector table: VHER 0x%02x %d %d %d\n",</div><div class='del'>-		conntab[0], conntab[1], conntab[2], conntab[3]);</div><div class='del'>-	if ((conntab[0] != 0x30 &amp;&amp; conntab[0] != 0x40) ||</div><div class='del'>-	    (conntab[3] != 2 &amp;&amp; conntab[3] != 4)) {</div><div class='del'>-		NV_ERROR(dev, "  Unknown!  Please report.\n");</div><div class='del'>-		return;</div><div class='add'>+	u8 *dcb = dcb_table(dev);</div><div class='add'>+	if (dcb &amp;&amp; dcb[0] &gt;= 0x30 &amp;&amp; dcb[1] &gt;= 0x16) {</div><div class='add'>+		u8 *conntab = ROMPTR(dev, dcb[0x14]);</div><div class='add'>+		if (conntab &amp;&amp; conntab[0] &gt;= 0x30 &amp;&amp; conntab[0] &lt;= 0x40)</div><div class='add'>+			return conntab;</div><div class='ctx'> 	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ct-&gt;entries = conntab[2];</div><div class='del'>-</div><div class='del'>-	entry = conntab + conntab[1];</div><div class='del'>-	cte = &amp;ct-&gt;entry[0];</div><div class='del'>-	for (i = 0; i &lt; conntab[2]; i++, entry += conntab[3], cte++) {</div><div class='del'>-		cte-&gt;index = i;</div><div class='del'>-		if (conntab[3] == 2)</div><div class='del'>-			cte-&gt;entry = ROM16(entry[0]);</div><div class='del'>-		else</div><div class='del'>-			cte-&gt;entry = ROM32(entry[0]);</div><div class='del'>-</div><div class='del'>-		cte-&gt;type  = (cte-&gt;entry &amp; 0x000000ff) &gt;&gt; 0;</div><div class='del'>-		cte-&gt;index2 = (cte-&gt;entry &amp; 0x00000f00) &gt;&gt; 8;</div><div class='del'>-</div><div class='del'>-		cte-&gt;gpio_tag = ffs((cte-&gt;entry &amp; 0x07033000) &gt;&gt; 12);</div><div class='del'>-		cte-&gt;gpio_tag = hpd_gpio[cte-&gt;gpio_tag];</div><div class='del'>-</div><div class='del'>-		if (cte-&gt;type == 0xff)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		apply_dcb_connector_quirks(bios, i);</div><div class='del'>-</div><div class='del'>-		NV_INFO(dev, "  %d: 0x%08x: type 0x%02x idx %d tag 0x%02x\n",</div><div class='del'>-			i, cte-&gt;entry, cte-&gt;type, cte-&gt;index, cte-&gt;gpio_tag);</div><div class='del'>-</div><div class='del'>-		/* check for known types, fallback to guessing the type</div><div class='del'>-		 * from attached encoders if we hit an unknown.</div><div class='del'>-		 */</div><div class='del'>-		switch (cte-&gt;type) {</div><div class='del'>-		case DCB_CONNECTOR_VGA:</div><div class='del'>-		case DCB_CONNECTOR_TV_0:</div><div class='del'>-		case DCB_CONNECTOR_TV_1:</div><div class='del'>-		case DCB_CONNECTOR_TV_3:</div><div class='del'>-		case DCB_CONNECTOR_DVI_I:</div><div class='del'>-		case DCB_CONNECTOR_DVI_D:</div><div class='del'>-		case DCB_CONNECTOR_LVDS:</div><div class='del'>-		case DCB_CONNECTOR_LVDS_SPWG:</div><div class='del'>-		case DCB_CONNECTOR_DP:</div><div class='del'>-		case DCB_CONNECTOR_eDP:</div><div class='del'>-		case DCB_CONNECTOR_HDMI_0:</div><div class='del'>-		case DCB_CONNECTOR_HDMI_1:</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			cte-&gt;type = divine_connector_type(bios, cte-&gt;index);</div><div class='del'>-			NV_WARN(dev, "unknown type, using 0x%02x\n", cte-&gt;type);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (nouveau_override_conntype) {</div><div class='del'>-			int type = divine_connector_type(bios, cte-&gt;index);</div><div class='del'>-			if (type != cte-&gt;type)</div><div class='del'>-				NV_WARN(dev, " -&gt; type 0x%02x\n", cte-&gt;type);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='add'>+u8 *</div><div class='add'>+dcb_conn(struct drm_device *dev, u8 idx)</div><div class='add'>+{</div><div class='add'>+	u8 *conntab = dcb_conntab(dev);</div><div class='add'>+	if (conntab &amp;&amp; idx &lt; conntab[2])</div><div class='add'>+		return conntab + conntab[1] + (idx * conntab[3]);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dcb_entry *new_dcb_entry(struct dcb_table *dcb)</div><div class='hunk'>@@ -6079,8 +5728,7 @@ parse_dcb20_entry(struct drm_device *dev, struct dcb_table *dcb,</div><div class='ctx'> 	entry-&gt;type = conn &amp; 0xf;</div><div class='ctx'> 	entry-&gt;i2c_index = (conn &gt;&gt; 4) &amp; 0xf;</div><div class='ctx'> 	entry-&gt;heads = (conn &gt;&gt; 8) &amp; 0xf;</div><div class='del'>-	if (dcb-&gt;version &gt;= 0x40)</div><div class='del'>-		entry-&gt;connector = (conn &gt;&gt; 12) &amp; 0xf;</div><div class='add'>+	entry-&gt;connector = (conn &gt;&gt; 12) &amp; 0xf;</div><div class='ctx'> 	entry-&gt;bus = (conn &gt;&gt; 16) &amp; 0xf;</div><div class='ctx'> 	entry-&gt;location = (conn &gt;&gt; 20) &amp; 0x3;</div><div class='ctx'> 	entry-&gt;or = (conn &gt;&gt; 24) &amp; 0xf;</div><div class='hunk'>@@ -6252,25 +5900,6 @@ parse_dcb15_entry(struct drm_device *dev, struct dcb_table *dcb,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool parse_dcb_entry(struct drm_device *dev, struct dcb_table *dcb,</div><div class='del'>-			    uint32_t conn, uint32_t conf)</div><div class='del'>-{</div><div class='del'>-	struct dcb_entry *entry = new_dcb_entry(dcb);</div><div class='del'>-	bool ret;</div><div class='del'>-</div><div class='del'>-	if (dcb-&gt;version &gt;= 0x20)</div><div class='del'>-		ret = parse_dcb20_entry(dev, dcb, conn, conf, entry);</div><div class='del'>-	else</div><div class='del'>-		ret = parse_dcb15_entry(dev, dcb, conn, conf, entry);</div><div class='del'>-	if (!ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	read_dcb_i2c_entry(dev, dcb-&gt;version, dcb-&gt;i2c_table,</div><div class='del'>-			   entry-&gt;i2c_index, &amp;dcb-&gt;i2c[entry-&gt;i2c_index]);</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static</div><div class='ctx'> void merge_like_dcb_entries(struct drm_device *dev, struct dcb_table *dcb)</div><div class='ctx'> {</div><div class='hunk'>@@ -6431,154 +6060,118 @@ fabricate_dcb_encoder_table(struct drm_device *dev, struct nvbios *bios)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Make up some sane defaults */</div><div class='del'>-	fabricate_dcb_output(dcb, OUTPUT_ANALOG, LEGACY_I2C_CRT, 1, 1);</div><div class='add'>+	fabricate_dcb_output(dcb, OUTPUT_ANALOG,</div><div class='add'>+			     bios-&gt;legacy.i2c_indices.crt, 1, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (nv04_tv_identify(dev, bios-&gt;legacy.i2c_indices.tv) &gt;= 0)</div><div class='del'>-		fabricate_dcb_output(dcb, OUTPUT_TV, LEGACY_I2C_TV,</div><div class='add'>+		fabricate_dcb_output(dcb, OUTPUT_TV,</div><div class='add'>+				     bios-&gt;legacy.i2c_indices.tv,</div><div class='ctx'> 				     all_heads, 0);</div><div class='ctx'> </div><div class='ctx'> 	else if (bios-&gt;tmds.output0_script_ptr ||</div><div class='ctx'> 		 bios-&gt;tmds.output1_script_ptr)</div><div class='del'>-		fabricate_dcb_output(dcb, OUTPUT_TMDS, LEGACY_I2C_PANEL,</div><div class='add'>+		fabricate_dcb_output(dcb, OUTPUT_TMDS,</div><div class='add'>+				     bios-&gt;legacy.i2c_indices.panel,</div><div class='ctx'> 				     all_heads, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-parse_dcb_table(struct drm_device *dev, struct nvbios *bios)</div><div class='add'>+parse_dcb_entry(struct drm_device *dev, void *data, int idx, u8 *outp)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct dcb_table *dcb = &amp;bios-&gt;dcb;</div><div class='del'>-	uint16_t dcbptr = 0, i2ctabptr = 0;</div><div class='del'>-	uint8_t *dcbtable;</div><div class='del'>-	uint8_t headerlen = 0x4, entries = DCB_MAX_NUM_ENTRIES;</div><div class='del'>-	bool configblock = true;</div><div class='del'>-	int recordlength = 8, confofs = 4;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* get the offset from 0x36 */</div><div class='del'>-	if (dev_priv-&gt;card_type &gt; NV_04) {</div><div class='del'>-		dcbptr = ROM16(bios-&gt;data[0x36]);</div><div class='del'>-		if (dcbptr == 0x0000)</div><div class='del'>-			NV_WARN(dev, "No output data (DCB) found in BIOS\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* this situation likely means a really old card, pre DCB */</div><div class='del'>-	if (dcbptr == 0x0) {</div><div class='del'>-		fabricate_dcb_encoder_table(dev, bios);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dcbtable = &amp;bios-&gt;data[dcbptr];</div><div class='del'>-</div><div class='del'>-	/* get DCB version */</div><div class='del'>-	dcb-&gt;version = dcbtable[0];</div><div class='del'>-	NV_TRACE(dev, "Found Display Configuration Block version %d.%d\n",</div><div class='del'>-		 dcb-&gt;version &gt;&gt; 4, dcb-&gt;version &amp; 0xf);</div><div class='del'>-</div><div class='del'>-	if (dcb-&gt;version &gt;= 0x20) { /* NV17+ */</div><div class='del'>-		uint32_t sig;</div><div class='add'>+	struct dcb_table *dcb = &amp;dev_priv-&gt;vbios.dcb;</div><div class='add'>+	u32 conf = (dcb-&gt;version &gt;= 0x20) ? ROM32(outp[4]) : ROM32(outp[6]);</div><div class='add'>+	u32 conn = ROM32(outp[0]);</div><div class='add'>+	bool ret;</div><div class='ctx'> </div><div class='del'>-		if (dcb-&gt;version &gt;= 0x30) { /* NV40+ */</div><div class='del'>-			headerlen = dcbtable[1];</div><div class='del'>-			entries = dcbtable[2];</div><div class='del'>-			recordlength = dcbtable[3];</div><div class='del'>-			i2ctabptr = ROM16(dcbtable[4]);</div><div class='del'>-			sig = ROM32(dcbtable[6]);</div><div class='del'>-			dcb-&gt;gpio_table_ptr = ROM16(dcbtable[10]);</div><div class='del'>-			dcb-&gt;connector_table_ptr = ROM16(dcbtable[20]);</div><div class='del'>-		} else {</div><div class='del'>-			i2ctabptr = ROM16(dcbtable[2]);</div><div class='del'>-			sig = ROM32(dcbtable[4]);</div><div class='del'>-			headerlen = 8;</div><div class='del'>-		}</div><div class='add'>+	if (apply_dcb_encoder_quirks(dev, idx, &amp;conn, &amp;conf)) {</div><div class='add'>+		struct dcb_entry *entry = new_dcb_entry(dcb);</div><div class='ctx'> </div><div class='del'>-		if (sig != 0x4edcbdcb) {</div><div class='del'>-			NV_ERROR(dev, "Bad Display Configuration Block "</div><div class='del'>-					"signature (%08X)\n", sig);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	} else if (dcb-&gt;version &gt;= 0x15) { /* some NV11 and NV20 */</div><div class='del'>-		char sig[8] = { 0 };</div><div class='add'>+		NV_TRACEWARN(dev, "DCB outp %02d: %08x %08x\n", idx, conn, conf);</div><div class='ctx'> </div><div class='del'>-		strncpy(sig, (char *)&amp;dcbtable[-7], 7);</div><div class='del'>-		i2ctabptr = ROM16(dcbtable[2]);</div><div class='del'>-		recordlength = 10;</div><div class='del'>-		confofs = 6;</div><div class='add'>+		if (dcb-&gt;version &gt;= 0x20)</div><div class='add'>+			ret = parse_dcb20_entry(dev, dcb, conn, conf, entry);</div><div class='add'>+		else</div><div class='add'>+			ret = parse_dcb15_entry(dev, dcb, conn, conf, entry);</div><div class='add'>+		if (!ret)</div><div class='add'>+			return 1; /* stop parsing */</div><div class='ctx'> </div><div class='del'>-		if (strcmp(sig, "DEV_REC")) {</div><div class='del'>-			NV_ERROR(dev, "Bad Display Configuration Block "</div><div class='del'>-					"signature (%s)\n", sig);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * v1.4 (some NV15/16, NV11+) seems the same as v1.5, but always</div><div class='del'>-		 * has the same single (crt) entry, even when tv-out present, so</div><div class='del'>-		 * the conclusion is this version cannot really be used.</div><div class='del'>-		 * v1.2 tables (some NV6/10, and NV15+) normally have the same</div><div class='del'>-		 * 5 entries, which are not specific to the card and so no use.</div><div class='del'>-		 * v1.2 does have an I2C table that read_dcb_i2c_table can</div><div class='del'>-		 * handle, but cards exist (nv11 in #14821) with a bad i2c table</div><div class='del'>-		 * pointer, so use the indices parsed in parse_bmp_structure.</div><div class='del'>-		 * v1.1 (NV5+, maybe some NV4) is entirely unhelpful</div><div class='add'>+		/* Ignore the I2C index for on-chip TV-out, as there</div><div class='add'>+		 * are cards with bogus values (nv31m in bug 23212),</div><div class='add'>+		 * and it's otherwise useless.</div><div class='ctx'> 		 */</div><div class='del'>-		NV_TRACEWARN(dev, "No useful information in BIOS output table; "</div><div class='del'>-				  "adding all possible outputs\n");</div><div class='del'>-		fabricate_dcb_encoder_table(dev, bios);</div><div class='del'>-		return 0;</div><div class='add'>+		if (entry-&gt;type == OUTPUT_TV &amp;&amp;</div><div class='add'>+		    entry-&gt;location == DCB_LOC_ON_CHIP)</div><div class='add'>+			entry-&gt;i2c_index = 0x0f;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!i2ctabptr)</div><div class='del'>-		NV_WARN(dev, "No pointer to DCB I2C port table\n");</div><div class='del'>-	else {</div><div class='del'>-		dcb-&gt;i2c_table = &amp;bios-&gt;data[i2ctabptr];</div><div class='del'>-		if (dcb-&gt;version &gt;= 0x30)</div><div class='del'>-			dcb-&gt;i2c_default_indices = dcb-&gt;i2c_table[4];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Parse the "management" I2C bus, used for hardware</div><div class='del'>-		 * monitoring and some external TMDS transmitters.</div><div class='del'>-		 */</div><div class='del'>-		if (dcb-&gt;version &gt;= 0x22) {</div><div class='del'>-			int idx = (dcb-&gt;version &gt;= 0x40 ?</div><div class='del'>-				   dcb-&gt;i2c_default_indices &amp; 0xf :</div><div class='del'>-				   2);</div><div class='add'>+static void</div><div class='add'>+dcb_fake_connectors(struct nvbios *bios)</div><div class='add'>+{</div><div class='add'>+	struct dcb_table *dcbt = &amp;bios-&gt;dcb;</div><div class='add'>+	u8 map[16] = { };</div><div class='add'>+	int i, idx = 0;</div><div class='ctx'> </div><div class='del'>-			read_dcb_i2c_entry(dev, dcb-&gt;version, dcb-&gt;i2c_table,</div><div class='del'>-					   idx, &amp;dcb-&gt;i2c[idx]);</div><div class='del'>-		}</div><div class='add'>+	/* heuristic: if we ever get a non-zero connector field, assume</div><div class='add'>+	 * that all the indices are valid and we don't need fake them.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; dcbt-&gt;entries; i++) {</div><div class='add'>+		if (dcbt-&gt;entry[i].connector)</div><div class='add'>+			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (entries &gt; DCB_MAX_NUM_ENTRIES)</div><div class='del'>-		entries = DCB_MAX_NUM_ENTRIES;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; entries; i++) {</div><div class='del'>-		uint32_t connection, config = 0;</div><div class='del'>-</div><div class='del'>-		connection = ROM32(dcbtable[headerlen + recordlength * i]);</div><div class='del'>-		if (configblock)</div><div class='del'>-			config = ROM32(dcbtable[headerlen + confofs + recordlength * i]);</div><div class='del'>-</div><div class='del'>-		/* seen on an NV11 with DCB v1.5 */</div><div class='del'>-		if (connection == 0x00000000)</div><div class='del'>-			break;</div><div class='add'>+	/* no useful connector info available, we need to make it up</div><div class='add'>+	 * ourselves.  the rule here is: anything on the same i2c bus</div><div class='add'>+	 * is considered to be on the same connector.  any output</div><div class='add'>+	 * without an associated i2c bus is assigned its own unique</div><div class='add'>+	 * connector index.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; dcbt-&gt;entries; i++) {</div><div class='add'>+		u8 i2c = dcbt-&gt;entry[i].i2c_index;</div><div class='add'>+		if (i2c == 0x0f) {</div><div class='add'>+			dcbt-&gt;entry[i].connector = idx++;</div><div class='add'>+		} else {</div><div class='add'>+			if (!map[i2c])</div><div class='add'>+				map[i2c] = ++idx;</div><div class='add'>+			dcbt-&gt;entry[i].connector = map[i2c] - 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* seen on an NV17 with DCB v2.0 */</div><div class='del'>-		if (connection == 0xffffffff)</div><div class='del'>-			break;</div><div class='add'>+	/* if we created more than one connector, destroy the connector</div><div class='add'>+	 * table - just in case it has random, rather than stub, entries.</div><div class='add'>+	 */</div><div class='add'>+	if (i &gt; 1) {</div><div class='add'>+		u8 *conntab = dcb_conntab(bios-&gt;dev);</div><div class='add'>+		if (conntab)</div><div class='add'>+			conntab[0] = 0x00;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if ((connection &amp; 0x0000000f) == 0x0000000f)</div><div class='del'>-			continue;</div><div class='add'>+static int</div><div class='add'>+parse_dcb_table(struct drm_device *dev, struct nvbios *bios)</div><div class='add'>+{</div><div class='add'>+	struct dcb_table *dcb = &amp;bios-&gt;dcb;</div><div class='add'>+	u8 *dcbt, *conn;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	dcbt = dcb_table(dev);</div><div class='add'>+	if (!dcbt) {</div><div class='add'>+		/* handle pre-DCB boards */</div><div class='add'>+		if (bios-&gt;type == NVBIOS_BMP) {</div><div class='add'>+			fabricate_dcb_encoder_table(dev, bios);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (!apply_dcb_encoder_quirks(dev, i, &amp;connection, &amp;config))</div><div class='del'>-			continue;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		NV_TRACEWARN(dev, "Raw DCB entry %d: %08x %08x\n",</div><div class='del'>-			     dcb-&gt;entries, connection, config);</div><div class='add'>+	NV_TRACE(dev, "DCB version %d.%d\n", dcbt[0] &gt;&gt; 4, dcbt[0] &amp; 0xf);</div><div class='ctx'> </div><div class='del'>-		if (!parse_dcb_entry(dev, dcb, connection, config))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='add'>+	dcb-&gt;version = dcbt[0];</div><div class='add'>+	dcb_outp_foreach(dev, NULL, parse_dcb_entry);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * apart for v2.1+ not being known for requiring merging, this</div><div class='hunk'>@@ -6590,77 +6183,19 @@ parse_dcb_table(struct drm_device *dev, struct nvbios *bios)</div><div class='ctx'> 	if (!dcb-&gt;entries)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	parse_dcb_gpio_table(bios);</div><div class='del'>-	parse_dcb_connector_table(bios);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fixup_legacy_connector(struct nvbios *bios)</div><div class='del'>-{</div><div class='del'>-	struct dcb_table *dcb = &amp;bios-&gt;dcb;</div><div class='del'>-	int i, i2c, i2c_conn[DCB_MAX_NUM_I2C_ENTRIES] = { };</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * DCB 3.0 also has the table in most cases, but there are some cards</div><div class='del'>-	 * where the table is filled with stub entries, and the DCB entriy</div><div class='del'>-	 * indices are all 0.  We don't need the connector indices on pre-G80</div><div class='del'>-	 * chips (yet?) so limit the use to DCB 4.0 and above.</div><div class='del'>-	 */</div><div class='del'>-	if (dcb-&gt;version &gt;= 0x40)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dcb-&gt;connector.entries = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * No known connector info before v3.0, so make it up.  the rule here</div><div class='del'>-	 * is: anything on the same i2c bus is considered to be on the same</div><div class='del'>-	 * connector.  any output without an associated i2c bus is assigned</div><div class='del'>-	 * its own unique connector index.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; dcb-&gt;entries; i++) {</div><div class='del'>-		/*</div><div class='del'>-		 * Ignore the I2C index for on-chip TV-out, as there</div><div class='del'>-		 * are cards with bogus values (nv31m in bug 23212),</div><div class='del'>-		 * and it's otherwise useless.</div><div class='del'>-		 */</div><div class='del'>-		if (dcb-&gt;entry[i].type == OUTPUT_TV &amp;&amp;</div><div class='del'>-		    dcb-&gt;entry[i].location == DCB_LOC_ON_CHIP)</div><div class='del'>-			dcb-&gt;entry[i].i2c_index = 0xf;</div><div class='del'>-		i2c = dcb-&gt;entry[i].i2c_index;</div><div class='del'>-</div><div class='del'>-		if (i2c_conn[i2c]) {</div><div class='del'>-			dcb-&gt;entry[i].connector = i2c_conn[i2c] - 1;</div><div class='del'>-			continue;</div><div class='add'>+	/* dump connector table entries to log, if any exist */</div><div class='add'>+	idx = -1;</div><div class='add'>+	while ((conn = dcb_conn(dev, ++idx))) {</div><div class='add'>+		if (conn[0] != 0xff) {</div><div class='add'>+			NV_TRACE(dev, "DCB conn %02d: ", idx);</div><div class='add'>+			if (dcb_conntab(dev)[3] &lt; 4)</div><div class='add'>+				printk("%04x\n", ROM16(conn[0]));</div><div class='add'>+			else</div><div class='add'>+				printk("%08x\n", ROM32(conn[0]));</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		dcb-&gt;entry[i].connector = dcb-&gt;connector.entries++;</div><div class='del'>-		if (i2c != 0xf)</div><div class='del'>-			i2c_conn[i2c] = dcb-&gt;connector.entries;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Fake the connector table as well as just connector indices */</div><div class='del'>-	for (i = 0; i &lt; dcb-&gt;connector.entries; i++) {</div><div class='del'>-		dcb-&gt;connector.entry[i].index = i;</div><div class='del'>-		dcb-&gt;connector.entry[i].type = divine_connector_type(bios, i);</div><div class='del'>-		dcb-&gt;connector.entry[i].gpio_tag = 0xff;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fixup_legacy_i2c(struct nvbios *bios)</div><div class='del'>-{</div><div class='del'>-	struct dcb_table *dcb = &amp;bios-&gt;dcb;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; dcb-&gt;entries; i++) {</div><div class='del'>-		if (dcb-&gt;entry[i].i2c_index == LEGACY_I2C_CRT)</div><div class='del'>-			dcb-&gt;entry[i].i2c_index = bios-&gt;legacy.i2c_indices.crt;</div><div class='del'>-		if (dcb-&gt;entry[i].i2c_index == LEGACY_I2C_PANEL)</div><div class='del'>-			dcb-&gt;entry[i].i2c_index = bios-&gt;legacy.i2c_indices.panel;</div><div class='del'>-		if (dcb-&gt;entry[i].i2c_index == LEGACY_I2C_TV)</div><div class='del'>-			dcb-&gt;entry[i].i2c_index = bios-&gt;legacy.i2c_indices.tv;</div><div class='ctx'> 	}</div><div class='add'>+	dcb_fake_connectors(bios);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int load_nv17_hwsq_ucode_entry(struct drm_device *dev, struct nvbios *bios, uint16_t hwsq_offset, int entry)</div><div class='hunk'>@@ -6879,19 +6414,6 @@ nouveau_run_vbios_init(struct drm_device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-nouveau_bios_i2c_devices_takedown(struct drm_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nvbios *bios = &amp;dev_priv-&gt;vbios;</div><div class='del'>-	struct dcb_i2c_entry *entry;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	entry = &amp;bios-&gt;dcb.i2c[0];</div><div class='del'>-	for (i = 0; i &lt; DCB_MAX_NUM_I2C_ENTRIES; i++, entry++)</div><div class='del'>-		nouveau_i2c_fini(dev, entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool</div><div class='ctx'> nouveau_bios_posted(struct drm_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -6928,12 +6450,17 @@ nouveau_bios_init(struct drm_device *dev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = parse_dcb_table(dev, bios);</div><div class='add'>+	ret = nouveau_i2c_init(dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	fixup_legacy_i2c(bios);</div><div class='del'>-	fixup_legacy_connector(bios);</div><div class='add'>+	ret = nouveau_mxm_init(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = parse_dcb_table(dev, bios);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!bios-&gt;major_version)	/* we don't run version 0 bios */</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -6971,5 +6498,6 @@ nouveau_bios_init(struct drm_device *dev)</div><div class='ctx'> void</div><div class='ctx'> nouveau_bios_takedown(struct drm_device *dev)</div><div class='ctx'> {</div><div class='del'>-	nouveau_bios_i2c_devices_takedown(dev);</div><div class='add'>+	nouveau_mxm_fini(dev);</div><div class='add'>+	nouveau_i2c_fini(dev);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h<br/>index 8adb69e4a6b1..1e382ad5a2b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_bios.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_bios.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_bios.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_bios.h</a></div><div class='hunk'>@@ -34,9 +34,14 @@</div><div class='ctx'> </div><div class='ctx'> #define DCB_LOC_ON_CHIP 0</div><div class='ctx'> </div><div class='del'>-#define ROM16(x) le16_to_cpu(*(uint16_t *)&amp;(x))</div><div class='del'>-#define ROM32(x) le32_to_cpu(*(uint32_t *)&amp;(x))</div><div class='del'>-#define ROMPTR(bios, x) (ROM16(x) ? &amp;(bios)-&gt;data[ROM16(x)] : NULL)</div><div class='add'>+#define ROM16(x) le16_to_cpu(*(u16 *)&amp;(x))</div><div class='add'>+#define ROM32(x) le32_to_cpu(*(u32 *)&amp;(x))</div><div class='add'>+#define ROM48(x) ({ u8 *p = &amp;(x); (u64)ROM16(p[4]) &lt;&lt; 32 | ROM32(p[0]); })</div><div class='add'>+#define ROM64(x) le64_to_cpu(*(u64 *)&amp;(x))</div><div class='add'>+#define ROMPTR(d,x) ({            \</div><div class='add'>+	struct drm_nouveau_private *dev_priv = (d)-&gt;dev_private; \</div><div class='add'>+	ROM16(x) ? &amp;dev_priv-&gt;vbios.data[ROM16(x)] : NULL; \</div><div class='add'>+})</div><div class='ctx'> </div><div class='ctx'> struct bit_entry {</div><div class='ctx'> 	uint8_t  id;</div><div class='hunk'>@@ -48,30 +53,12 @@ struct bit_entry {</div><div class='ctx'> </div><div class='ctx'> int bit_table(struct drm_device *, u8 id, struct bit_entry *);</div><div class='ctx'> </div><div class='del'>-struct dcb_i2c_entry {</div><div class='del'>-	uint32_t entry;</div><div class='del'>-	uint8_t port_type;</div><div class='del'>-	uint8_t read, write;</div><div class='del'>-	struct nouveau_i2c_chan *chan;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum dcb_gpio_tag {</div><div class='ctx'> 	DCB_GPIO_TVDAC0 = 0xc,</div><div class='ctx'> 	DCB_GPIO_TVDAC1 = 0x2d,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct dcb_gpio_entry {</div><div class='del'>-	enum dcb_gpio_tag tag;</div><div class='del'>-	int line;</div><div class='del'>-	bool invert;</div><div class='del'>-	uint32_t entry;</div><div class='del'>-	uint8_t state_default;</div><div class='del'>-	uint8_t state[2];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct dcb_gpio_table {</div><div class='del'>-	int entries;</div><div class='del'>-	struct dcb_gpio_entry entry[DCB_MAX_NUM_GPIO_ENTRIES];</div><div class='add'>+	DCB_GPIO_PWM_FAN = 0x9,</div><div class='add'>+	DCB_GPIO_FAN_SENSE = 0x3d,</div><div class='add'>+	DCB_GPIO_UNUSED = 0xff</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum dcb_connector_type {</div><div class='hunk'>@@ -90,20 +77,6 @@ enum dcb_connector_type {</div><div class='ctx'> 	DCB_CONNECTOR_NONE = 0xff</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dcb_connector_table_entry {</div><div class='del'>-	uint8_t index;</div><div class='del'>-	uint32_t entry;</div><div class='del'>-	enum dcb_connector_type type;</div><div class='del'>-	uint8_t index2;</div><div class='del'>-	uint8_t gpio_tag;</div><div class='del'>-	void *drm;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct dcb_connector_table {</div><div class='del'>-	int entries;</div><div class='del'>-	struct dcb_connector_table_entry entry[DCB_MAX_NUM_CONNECTOR_ENTRIES];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum dcb_type {</div><div class='ctx'> 	OUTPUT_ANALOG = 0,</div><div class='ctx'> 	OUTPUT_TV = 1,</div><div class='hunk'>@@ -111,6 +84,7 @@ enum dcb_type {</div><div class='ctx'> 	OUTPUT_LVDS = 3,</div><div class='ctx'> 	OUTPUT_DP = 6,</div><div class='ctx'> 	OUTPUT_EOL = 14, /* DCB 4.0+, appears to be end-of-list */</div><div class='add'>+	OUTPUT_UNUSED = 15,</div><div class='ctx'> 	OUTPUT_ANY = -1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -155,18 +129,8 @@ struct dcb_entry {</div><div class='ctx'> </div><div class='ctx'> struct dcb_table {</div><div class='ctx'> 	uint8_t version;</div><div class='del'>-</div><div class='ctx'> 	int entries;</div><div class='ctx'> 	struct dcb_entry entry[DCB_MAX_NUM_ENTRIES];</div><div class='del'>-</div><div class='del'>-	uint8_t *i2c_table;</div><div class='del'>-	uint8_t i2c_default_indices;</div><div class='del'>-	struct dcb_i2c_entry i2c[DCB_MAX_NUM_I2C_ENTRIES];</div><div class='del'>-</div><div class='del'>-	uint16_t gpio_table_ptr;</div><div class='del'>-	struct dcb_gpio_table gpio;</div><div class='del'>-	uint16_t connector_table_ptr;</div><div class='del'>-	struct dcb_connector_table connector;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum nouveau_or {</div><div class='hunk'>@@ -195,7 +159,7 @@ enum pll_types {</div><div class='ctx'> 	PLL_SHADER = 0x02,</div><div class='ctx'> 	PLL_UNK03  = 0x03,</div><div class='ctx'> 	PLL_MEMORY = 0x04,</div><div class='del'>-	PLL_UNK05  = 0x05,</div><div class='add'>+	PLL_VDEC   = 0x05,</div><div class='ctx'> 	PLL_UNK40  = 0x40,</div><div class='ctx'> 	PLL_UNK41  = 0x41,</div><div class='ctx'> 	PLL_UNK42  = 0x42,</div><div class='hunk'>@@ -333,4 +297,11 @@ struct nvbios {</div><div class='ctx'> 	} legacy;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void *dcb_table(struct drm_device *);</div><div class='add'>+void *dcb_outp(struct drm_device *, u8 idx);</div><div class='add'>+int dcb_outp_foreach(struct drm_device *, void *data,</div><div class='add'>+		     int (*)(struct drm_device *, void *, int idx, u8 *outp));</div><div class='add'>+u8 *dcb_conntab(struct drm_device *);</div><div class='add'>+u8 *dcb_conn(struct drm_device *, u8 idx);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c<br/>index 7cc37e690860..724b41a2b9e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_bo.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_bo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_bo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_bo.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "drmP.h"</div><div class='add'>+#include "ttm/ttm_page_alloc.h"</div><div class='ctx'> </div><div class='ctx'> #include "nouveau_drm.h"</div><div class='ctx'> #include "nouveau_drv.h"</div><div class='hunk'>@@ -92,6 +93,7 @@ nouveau_bo_new(struct drm_device *dev, int size, int align,</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	struct nouveau_bo *nvbo;</div><div class='add'>+	size_t acc_size;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	nvbo = kzalloc(sizeof(struct nouveau_bo), GFP_KERNEL);</div><div class='hunk'>@@ -114,9 +116,12 @@ nouveau_bo_new(struct drm_device *dev, int size, int align,</div><div class='ctx'> 	nvbo-&gt;bo.mem.num_pages = size &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	nouveau_bo_placement_set(nvbo, flags, 0);</div><div class='ctx'> </div><div class='add'>+	acc_size = ttm_bo_dma_acc_size(&amp;dev_priv-&gt;ttm.bdev, size,</div><div class='add'>+				       sizeof(struct nouveau_bo));</div><div class='add'>+</div><div class='ctx'> 	ret = ttm_bo_init(&amp;dev_priv-&gt;ttm.bdev, &amp;nvbo-&gt;bo, size,</div><div class='ctx'> 			  ttm_bo_type_device, &amp;nvbo-&gt;placement,</div><div class='del'>-			  align &gt;&gt; PAGE_SHIFT, 0, false, NULL, size,</div><div class='add'>+			  align &gt;&gt; PAGE_SHIFT, 0, false, NULL, acc_size,</div><div class='ctx'> 			  nouveau_bo_del_ttm);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		/* ttm will call nouveau_bo_del_ttm if it fails.. */</div><div class='hunk'>@@ -343,8 +348,10 @@ nouveau_bo_wr32(struct nouveau_bo *nvbo, unsigned index, u32 val)</div><div class='ctx'> 		*mem = val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ttm_backend *</div><div class='del'>-nouveau_bo_create_ttm_backend_entry(struct ttm_bo_device *bdev)</div><div class='add'>+static struct ttm_tt *</div><div class='add'>+nouveau_ttm_tt_create(struct ttm_bo_device *bdev,</div><div class='add'>+		      unsigned long size, uint32_t page_flags,</div><div class='add'>+		      struct page *dummy_read_page)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = nouveau_bdev(bdev);</div><div class='ctx'> 	struct drm_device *dev = dev_priv-&gt;dev;</div><div class='hunk'>@@ -352,11 +359,13 @@ nouveau_bo_create_ttm_backend_entry(struct ttm_bo_device *bdev)</div><div class='ctx'> 	switch (dev_priv-&gt;gart_info.type) {</div><div class='ctx'> #if __OS_HAS_AGP</div><div class='ctx'> 	case NOUVEAU_GART_AGP:</div><div class='del'>-		return ttm_agp_backend_init(bdev, dev-&gt;agp-&gt;bridge);</div><div class='add'>+		return ttm_agp_tt_create(bdev, dev-&gt;agp-&gt;bridge,</div><div class='add'>+					 size, page_flags, dummy_read_page);</div><div class='ctx'> #endif</div><div class='ctx'> 	case NOUVEAU_GART_PDMA:</div><div class='ctx'> 	case NOUVEAU_GART_HW:</div><div class='del'>-		return nouveau_sgdma_init_ttm(dev);</div><div class='add'>+		return nouveau_sgdma_create_ttm(bdev, size, page_flags,</div><div class='add'>+						dummy_read_page);</div><div class='ctx'> 	default:</div><div class='ctx'> 		NV_ERROR(dev, "Unknown GART type %d\n",</div><div class='ctx'> 			 dev_priv-&gt;gart_info.type);</div><div class='hunk'>@@ -673,8 +682,7 @@ nouveau_vma_getmap(struct nouveau_channel *chan, struct nouveau_bo *nvbo,</div><div class='ctx'> 	if (mem-&gt;mem_type == TTM_PL_VRAM)</div><div class='ctx'> 		nouveau_vm_map(vma, node);</div><div class='ctx'> 	else</div><div class='del'>-		nouveau_vm_map_sg(vma, 0, mem-&gt;num_pages &lt;&lt; PAGE_SHIFT,</div><div class='del'>-				  node, node-&gt;pages);</div><div class='add'>+		nouveau_vm_map_sg(vma, 0, mem-&gt;num_pages &lt;&lt; PAGE_SHIFT, node);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -801,19 +809,18 @@ out:</div><div class='ctx'> static void</div><div class='ctx'> nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, struct ttm_mem_reg *new_mem)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_mem *node = new_mem-&gt;mm_node;</div><div class='ctx'> 	struct nouveau_bo *nvbo = nouveau_bo(bo);</div><div class='ctx'> 	struct nouveau_vma *vma;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(vma, &amp;nvbo-&gt;vma_list, head) {</div><div class='del'>-		if (new_mem-&gt;mem_type == TTM_PL_VRAM) {</div><div class='add'>+		if (new_mem &amp;&amp; new_mem-&gt;mem_type == TTM_PL_VRAM) {</div><div class='ctx'> 			nouveau_vm_map(vma, new_mem-&gt;mm_node);</div><div class='ctx'> 		} else</div><div class='del'>-		if (new_mem-&gt;mem_type == TTM_PL_TT &amp;&amp;</div><div class='add'>+		if (new_mem &amp;&amp; new_mem-&gt;mem_type == TTM_PL_TT &amp;&amp;</div><div class='ctx'> 		    nvbo-&gt;page_shift == vma-&gt;vm-&gt;spg_shift) {</div><div class='ctx'> 			nouveau_vm_map_sg(vma, 0, new_mem-&gt;</div><div class='ctx'> 					  num_pages &lt;&lt; PAGE_SHIFT,</div><div class='del'>-					  node, node-&gt;pages);</div><div class='add'>+					  new_mem-&gt;mm_node);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			nouveau_vm_unmap(vma);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1044,8 +1051,94 @@ nouveau_bo_fence(struct nouveau_bo *nvbo, struct nouveau_fence *fence)</div><div class='ctx'> 	nouveau_fence_unref(&amp;old_fence);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+nouveau_ttm_tt_populate(struct ttm_tt *ttm)</div><div class='add'>+{</div><div class='add'>+	struct ttm_dma_tt *ttm_dma = (void *)ttm;</div><div class='add'>+	struct drm_nouveau_private *dev_priv;</div><div class='add'>+	struct drm_device *dev;</div><div class='add'>+	unsigned i;</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	if (ttm-&gt;state != tt_unpopulated)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev_priv = nouveau_bdev(ttm-&gt;bdev);</div><div class='add'>+	dev = dev_priv-&gt;dev;</div><div class='add'>+</div><div class='add'>+#if __OS_HAS_AGP</div><div class='add'>+	if (dev_priv-&gt;gart_info.type == NOUVEAU_GART_AGP) {</div><div class='add'>+		return ttm_agp_tt_populate(ttm);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SWIOTLB</div><div class='add'>+	if (swiotlb_nr_tbl()) {</div><div class='add'>+		return ttm_dma_populate((void *)ttm, dev-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	r = ttm_pool_populate(ttm);</div><div class='add'>+	if (r) {</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ttm-&gt;num_pages; i++) {</div><div class='add'>+		ttm_dma-&gt;dma_address[i] = pci_map_page(dev-&gt;pdev, ttm-&gt;pages[i],</div><div class='add'>+						   0, PAGE_SIZE,</div><div class='add'>+						   PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+		if (pci_dma_mapping_error(dev-&gt;pdev, ttm_dma-&gt;dma_address[i])) {</div><div class='add'>+			while (--i) {</div><div class='add'>+				pci_unmap_page(dev-&gt;pdev, ttm_dma-&gt;dma_address[i],</div><div class='add'>+					       PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+				ttm_dma-&gt;dma_address[i] = 0;</div><div class='add'>+			}</div><div class='add'>+			ttm_pool_unpopulate(ttm);</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 void</div><div class='add'>+nouveau_ttm_tt_unpopulate(struct ttm_tt *ttm)</div><div class='add'>+{</div><div class='add'>+	struct ttm_dma_tt *ttm_dma = (void *)ttm;</div><div class='add'>+	struct drm_nouveau_private *dev_priv;</div><div class='add'>+	struct drm_device *dev;</div><div class='add'>+	unsigned i;</div><div class='add'>+</div><div class='add'>+	dev_priv = nouveau_bdev(ttm-&gt;bdev);</div><div class='add'>+	dev = dev_priv-&gt;dev;</div><div class='add'>+</div><div class='add'>+#if __OS_HAS_AGP</div><div class='add'>+	if (dev_priv-&gt;gart_info.type == NOUVEAU_GART_AGP) {</div><div class='add'>+		ttm_agp_tt_unpopulate(ttm);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SWIOTLB</div><div class='add'>+	if (swiotlb_nr_tbl()) {</div><div class='add'>+		ttm_dma_unpopulate((void *)ttm, dev-&gt;dev);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ttm-&gt;num_pages; i++) {</div><div class='add'>+		if (ttm_dma-&gt;dma_address[i]) {</div><div class='add'>+			pci_unmap_page(dev-&gt;pdev, ttm_dma-&gt;dma_address[i],</div><div class='add'>+				       PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ttm_pool_unpopulate(ttm);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct ttm_bo_driver nouveau_bo_driver = {</div><div class='del'>-	.create_ttm_backend_entry = nouveau_bo_create_ttm_backend_entry,</div><div class='add'>+	.ttm_tt_create = &amp;nouveau_ttm_tt_create,</div><div class='add'>+	.ttm_tt_populate = &amp;nouveau_ttm_tt_populate,</div><div class='add'>+	.ttm_tt_unpopulate = &amp;nouveau_ttm_tt_unpopulate,</div><div class='ctx'> 	.invalidate_caches = nouveau_bo_invalidate_caches,</div><div class='ctx'> 	.init_mem_type = nouveau_bo_init_mem_type,</div><div class='ctx'> 	.evict_flags = nouveau_bo_evict_flags,</div><div class='hunk'>@@ -1091,7 +1184,7 @@ nouveau_bo_vma_add(struct nouveau_bo *nvbo, struct nouveau_vm *vm,</div><div class='ctx'> 		nouveau_vm_map(vma, nvbo-&gt;bo.mem.mm_node);</div><div class='ctx'> 	else</div><div class='ctx'> 	if (nvbo-&gt;bo.mem.mem_type == TTM_PL_TT)</div><div class='del'>-		nouveau_vm_map_sg(vma, 0, size, node, node-&gt;pages);</div><div class='add'>+		nouveau_vm_map_sg(vma, 0, size, node);</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail(&amp;vma-&gt;head, &amp;nvbo-&gt;vma_list);</div><div class='ctx'> 	vma-&gt;refcount = 1;</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c<br/>index bb6ec9ef8676..a018defb7621 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_channel.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_channel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_channel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_channel.c</a></div><div class='hunk'>@@ -187,6 +187,8 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret,</div><div class='ctx'> 	nouveau_dma_pre_init(chan);</div><div class='ctx'> 	chan-&gt;user_put = 0x40;</div><div class='ctx'> 	chan-&gt;user_get = 0x44;</div><div class='add'>+	if (dev_priv-&gt;card_type &gt;= NV_50)</div><div class='add'>+                chan-&gt;user_get_hi = 0x60;</div><div class='ctx'> </div><div class='ctx'> 	/* disable the fifo caches */</div><div class='ctx'> 	pfifo-&gt;reassign(dev, false);</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c<br/>index cea6696b1906..f3ce34be082a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_connector.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_connector.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_connector.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_connector.c</a></div><div class='hunk'>@@ -35,6 +35,7 @@</div><div class='ctx'> #include "nouveau_encoder.h"</div><div class='ctx'> #include "nouveau_crtc.h"</div><div class='ctx'> #include "nouveau_connector.h"</div><div class='add'>+#include "nouveau_gpio.h"</div><div class='ctx'> #include "nouveau_hw.h"</div><div class='ctx'> </div><div class='ctx'> static void nouveau_connector_hotplug(void *, int);</div><div class='hunk'>@@ -78,29 +79,11 @@ nouveau_encoder_connector_get(struct nouveau_encoder *encoder)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*TODO: This could use improvement, and learn to handle the fixed</div><div class='del'>- *      BIOS tables etc.  It's fine currently, for its only user.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-nouveau_connector_bpp(struct drm_connector *connector)</div><div class='del'>-{</div><div class='del'>-	struct nouveau_connector *nv_connector = nouveau_connector(connector);</div><div class='del'>-</div><div class='del'>-	if (nv_connector-&gt;edid &amp;&amp; nv_connector-&gt;edid-&gt;revision &gt;= 4) {</div><div class='del'>-		u8 bpc = ((nv_connector-&gt;edid-&gt;input &amp; 0x70) &gt;&gt; 3) + 4;</div><div class='del'>-		if (bpc &gt; 4)</div><div class='del'>-			return bpc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 18;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> nouveau_connector_destroy(struct drm_connector *connector)</div><div class='ctx'> {</div><div class='ctx'> 	struct nouveau_connector *nv_connector = nouveau_connector(connector);</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv;</div><div class='del'>-	struct nouveau_gpio_engine *pgpio;</div><div class='ctx'> 	struct drm_device *dev;</div><div class='ctx'> </div><div class='ctx'> 	if (!nv_connector)</div><div class='hunk'>@@ -110,10 +93,9 @@ nouveau_connector_destroy(struct drm_connector *connector)</div><div class='ctx'> 	dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	NV_DEBUG_KMS(dev, "\n");</div><div class='ctx'> </div><div class='del'>-	pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='del'>-	if (pgpio-&gt;irq_unregister) {</div><div class='del'>-		pgpio-&gt;irq_unregister(dev, nv_connector-&gt;dcb-&gt;gpio_tag,</div><div class='del'>-				      nouveau_connector_hotplug, connector);</div><div class='add'>+	if (nv_connector-&gt;hpd != DCB_GPIO_UNUSED) {</div><div class='add'>+		nouveau_gpio_isr_del(dev, 0, nv_connector-&gt;hpd, 0xff,</div><div class='add'>+				     nouveau_connector_hotplug, connector);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(nv_connector-&gt;edid);</div><div class='hunk'>@@ -198,6 +180,10 @@ nouveau_connector_set_encoder(struct drm_connector *connector,</div><div class='ctx'> 		return;</div><div class='ctx'> 	nv_connector-&gt;detected_encoder = nv_encoder;</div><div class='ctx'> </div><div class='add'>+	if (dev_priv-&gt;card_type &gt;= NV_50) {</div><div class='add'>+		connector-&gt;interlace_allowed = true;</div><div class='add'>+		connector-&gt;doublescan_allowed = true;</div><div class='add'>+	} else</div><div class='ctx'> 	if (nv_encoder-&gt;dcb-&gt;type == OUTPUT_LVDS ||</div><div class='ctx'> 	    nv_encoder-&gt;dcb-&gt;type == OUTPUT_TMDS) {</div><div class='ctx'> 		connector-&gt;doublescan_allowed = false;</div><div class='hunk'>@@ -214,7 +200,7 @@ nouveau_connector_set_encoder(struct drm_connector *connector,</div><div class='ctx'> 			connector-&gt;interlace_allowed = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (nv_connector-&gt;dcb-&gt;type == DCB_CONNECTOR_DVI_I) {</div><div class='add'>+	if (nv_connector-&gt;type == DCB_CONNECTOR_DVI_I) {</div><div class='ctx'> 		drm_connector_property_set_value(connector,</div><div class='ctx'> 			dev-&gt;mode_config.dvi_i_subconnector_property,</div><div class='ctx'> 			nv_encoder-&gt;dcb-&gt;type == OUTPUT_TMDS ?</div><div class='hunk'>@@ -397,7 +383,7 @@ nouveau_connector_force(struct drm_connector *connector)</div><div class='ctx'> 	struct nouveau_encoder *nv_encoder;</div><div class='ctx'> 	int type;</div><div class='ctx'> </div><div class='del'>-	if (nv_connector-&gt;dcb-&gt;type == DCB_CONNECTOR_DVI_I) {</div><div class='add'>+	if (nv_connector-&gt;type == DCB_CONNECTOR_DVI_I) {</div><div class='ctx'> 		if (connector-&gt;force == DRM_FORCE_ON_DIGITAL)</div><div class='ctx'> 			type = OUTPUT_TMDS;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -420,15 +406,21 @@ static int</div><div class='ctx'> nouveau_connector_set_property(struct drm_connector *connector,</div><div class='ctx'> 			       struct drm_property *property, uint64_t value)</div><div class='ctx'> {</div><div class='add'>+	struct drm_nouveau_private *dev_priv = connector-&gt;dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_display_engine *disp = &amp;dev_priv-&gt;engine.display;</div><div class='ctx'> 	struct nouveau_connector *nv_connector = nouveau_connector(connector);</div><div class='ctx'> 	struct nouveau_encoder *nv_encoder = nv_connector-&gt;detected_encoder;</div><div class='ctx'> 	struct drm_encoder *encoder = to_drm_encoder(nv_encoder);</div><div class='ctx'> 	struct drm_device *dev = connector-&gt;dev;</div><div class='add'>+	struct nouveau_crtc *nv_crtc;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	nv_crtc = NULL;</div><div class='add'>+	if (connector-&gt;encoder &amp;&amp; connector-&gt;encoder-&gt;crtc)</div><div class='add'>+		nv_crtc = nouveau_crtc(connector-&gt;encoder-&gt;crtc);</div><div class='add'>+</div><div class='ctx'> 	/* Scaling mode */</div><div class='ctx'> 	if (property == dev-&gt;mode_config.scaling_mode_property) {</div><div class='del'>-		struct nouveau_crtc *nv_crtc = NULL;</div><div class='ctx'> 		bool modeset = false;</div><div class='ctx'> </div><div class='ctx'> 		switch (value) {</div><div class='hunk'>@@ -454,8 +446,6 @@ nouveau_connector_set_property(struct drm_connector *connector,</div><div class='ctx'> 			modeset = true;</div><div class='ctx'> 		nv_connector-&gt;scaling_mode = value;</div><div class='ctx'> </div><div class='del'>-		if (connector-&gt;encoder &amp;&amp; connector-&gt;encoder-&gt;crtc)</div><div class='del'>-			nv_crtc = nouveau_crtc(connector-&gt;encoder-&gt;crtc);</div><div class='ctx'> 		if (!nv_crtc)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -467,7 +457,7 @@ nouveau_connector_set_property(struct drm_connector *connector,</div><div class='ctx'> 			if (!ret)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 		} else {</div><div class='del'>-			ret = nv_crtc-&gt;set_scale(nv_crtc, value, true);</div><div class='add'>+			ret = nv_crtc-&gt;set_scale(nv_crtc, true);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				return ret;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -475,23 +465,58 @@ nouveau_connector_set_property(struct drm_connector *connector,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Dithering */</div><div class='del'>-	if (property == dev-&gt;mode_config.dithering_mode_property) {</div><div class='del'>-		struct nouveau_crtc *nv_crtc = NULL;</div><div class='add'>+	/* Underscan */</div><div class='add'>+	if (property == disp-&gt;underscan_property) {</div><div class='add'>+		if (nv_connector-&gt;underscan != value) {</div><div class='add'>+			nv_connector-&gt;underscan = value;</div><div class='add'>+			if (!nv_crtc || !nv_crtc-&gt;set_scale)</div><div class='add'>+				return 0;</div><div class='ctx'> </div><div class='del'>-		if (value == DRM_MODE_DITHERING_ON)</div><div class='del'>-			nv_connector-&gt;use_dithering = true;</div><div class='del'>-		else</div><div class='del'>-			nv_connector-&gt;use_dithering = false;</div><div class='add'>+			return nv_crtc-&gt;set_scale(nv_crtc, 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'>+	if (property == disp-&gt;underscan_hborder_property) {</div><div class='add'>+		if (nv_connector-&gt;underscan_hborder != value) {</div><div class='add'>+			nv_connector-&gt;underscan_hborder = value;</div><div class='add'>+			if (!nv_crtc || !nv_crtc-&gt;set_scale)</div><div class='add'>+				return 0;</div><div class='add'>+</div><div class='add'>+			return nv_crtc-&gt;set_scale(nv_crtc, 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'>+	if (property == disp-&gt;underscan_vborder_property) {</div><div class='add'>+		if (nv_connector-&gt;underscan_vborder != value) {</div><div class='add'>+			nv_connector-&gt;underscan_vborder = value;</div><div class='add'>+			if (!nv_crtc || !nv_crtc-&gt;set_scale)</div><div class='add'>+				return 0;</div><div class='add'>+</div><div class='add'>+			return nv_crtc-&gt;set_scale(nv_crtc, 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'>+	/* Dithering */</div><div class='add'>+	if (property == disp-&gt;dithering_mode) {</div><div class='add'>+		nv_connector-&gt;dithering_mode = value;</div><div class='add'>+		if (!nv_crtc || !nv_crtc-&gt;set_dither)</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='del'>-		if (connector-&gt;encoder &amp;&amp; connector-&gt;encoder-&gt;crtc)</div><div class='del'>-			nv_crtc = nouveau_crtc(connector-&gt;encoder-&gt;crtc);</div><div class='add'>+		return nv_crtc-&gt;set_dither(nv_crtc, true);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	if (property == disp-&gt;dithering_depth) {</div><div class='add'>+		nv_connector-&gt;dithering_depth = value;</div><div class='ctx'> 		if (!nv_crtc || !nv_crtc-&gt;set_dither)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		return nv_crtc-&gt;set_dither(nv_crtc, nv_connector-&gt;use_dithering,</div><div class='del'>-					   true);</div><div class='add'>+		return nv_crtc-&gt;set_dither(nv_crtc, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (nv_encoder &amp;&amp; nv_encoder-&gt;dcb-&gt;type == OUTPUT_TV)</div><div class='hunk'>@@ -602,6 +627,46 @@ nouveau_connector_scaler_modes_add(struct drm_connector *connector)</div><div class='ctx'> 	return modes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+nouveau_connector_detect_depth(struct drm_connector *connector)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = connector-&gt;dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_connector *nv_connector = nouveau_connector(connector);</div><div class='add'>+	struct nouveau_encoder *nv_encoder = nv_connector-&gt;detected_encoder;</div><div class='add'>+	struct nvbios *bios = &amp;dev_priv-&gt;vbios;</div><div class='add'>+	struct drm_display_mode *mode = nv_connector-&gt;native_mode;</div><div class='add'>+	bool duallink;</div><div class='add'>+</div><div class='add'>+	/* if the edid is feeling nice enough to provide this info, use it */</div><div class='add'>+	if (nv_connector-&gt;edid &amp;&amp; connector-&gt;display_info.bpc)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* if not, we're out of options unless we're LVDS, default to 6bpc */</div><div class='add'>+	connector-&gt;display_info.bpc = 6;</div><div class='add'>+	if (nv_encoder-&gt;dcb-&gt;type != OUTPUT_LVDS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* LVDS: panel straps */</div><div class='add'>+	if (bios-&gt;fp_no_ddc) {</div><div class='add'>+		if (bios-&gt;fp.if_is_24bit)</div><div class='add'>+			connector-&gt;display_info.bpc = 8;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* LVDS: DDC panel, need to first determine the number of links to</div><div class='add'>+	 * know which if_is_24bit flag to check...</div><div class='add'>+	 */</div><div class='add'>+	if (nv_connector-&gt;edid &amp;&amp;</div><div class='add'>+	    nv_connector-&gt;type == DCB_CONNECTOR_LVDS_SPWG)</div><div class='add'>+		duallink = ((u8 *)nv_connector-&gt;edid)[121] == 2;</div><div class='add'>+	else</div><div class='add'>+		duallink = mode-&gt;clock &gt;= bios-&gt;fp.duallink_transition_clk;</div><div class='add'>+</div><div class='add'>+	if ((!duallink &amp;&amp; (bios-&gt;fp.strapless_is_24bit &amp; 1)) ||</div><div class='add'>+	    ( duallink &amp;&amp; (bios-&gt;fp.strapless_is_24bit &amp; 2)))</div><div class='add'>+		connector-&gt;display_info.bpc = 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> nouveau_connector_get_modes(struct drm_connector *connector)</div><div class='ctx'> {</div><div class='hunk'>@@ -631,6 +696,12 @@ nouveau_connector_get_modes(struct drm_connector *connector)</div><div class='ctx'> 		nv_connector-&gt;native_mode = drm_mode_duplicate(dev, &amp;mode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Determine display colour depth for everything except LVDS now,</div><div class='add'>+	 * DP requires this before mode_valid() is called.</div><div class='add'>+	 */</div><div class='add'>+	if (connector-&gt;connector_type != DRM_MODE_CONNECTOR_LVDS)</div><div class='add'>+		nouveau_connector_detect_depth(connector);</div><div class='add'>+</div><div class='ctx'> 	/* Find the native mode if this is a digital panel, if we didn't</div><div class='ctx'> 	 * find any modes through DDC previously add the native mode to</div><div class='ctx'> 	 * the list of modes.</div><div class='hunk'>@@ -646,12 +717,19 @@ nouveau_connector_get_modes(struct drm_connector *connector)</div><div class='ctx'> 		ret = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Determine LVDS colour depth, must happen after determining</div><div class='add'>+	 * "native" mode as some VBIOS tables require us to use the</div><div class='add'>+	 * pixel clock as part of the lookup...</div><div class='add'>+	 */</div><div class='add'>+	if (connector-&gt;connector_type == DRM_MODE_CONNECTOR_LVDS)</div><div class='add'>+		nouveau_connector_detect_depth(connector);</div><div class='add'>+</div><div class='ctx'> 	if (nv_encoder-&gt;dcb-&gt;type == OUTPUT_TV)</div><div class='ctx'> 		ret = get_slave_funcs(encoder)-&gt;get_modes(encoder, connector);</div><div class='ctx'> </div><div class='del'>-	if (nv_connector-&gt;dcb-&gt;type == DCB_CONNECTOR_LVDS ||</div><div class='del'>-	    nv_connector-&gt;dcb-&gt;type == DCB_CONNECTOR_LVDS_SPWG ||</div><div class='del'>-	    nv_connector-&gt;dcb-&gt;type == DCB_CONNECTOR_eDP)</div><div class='add'>+	if (nv_connector-&gt;type == DCB_CONNECTOR_LVDS ||</div><div class='add'>+	    nv_connector-&gt;type == DCB_CONNECTOR_LVDS_SPWG ||</div><div class='add'>+	    nv_connector-&gt;type == DCB_CONNECTOR_eDP)</div><div class='ctx'> 		ret += nouveau_connector_scaler_modes_add(connector);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -710,7 +788,7 @@ nouveau_connector_mode_valid(struct drm_connector *connector,</div><div class='ctx'> 	case OUTPUT_DP:</div><div class='ctx'> 		max_clock  = nv_encoder-&gt;dp.link_nr;</div><div class='ctx'> 		max_clock *= nv_encoder-&gt;dp.link_bw;</div><div class='del'>-		clock = clock * nouveau_connector_bpp(connector) / 10;</div><div class='add'>+		clock = clock * (connector-&gt;display_info.bpc * 3) / 10;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		BUG_ON(1);</div><div class='hunk'>@@ -768,96 +846,175 @@ nouveau_connector_funcs_lvds = {</div><div class='ctx'> 	.force = nouveau_connector_force</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+drm_conntype_from_dcb(enum dcb_connector_type dcb)</div><div class='add'>+{</div><div class='add'>+	switch (dcb) {</div><div class='add'>+	case DCB_CONNECTOR_VGA      : return DRM_MODE_CONNECTOR_VGA;</div><div class='add'>+	case DCB_CONNECTOR_TV_0     :</div><div class='add'>+	case DCB_CONNECTOR_TV_1     :</div><div class='add'>+	case DCB_CONNECTOR_TV_3     : return DRM_MODE_CONNECTOR_TV;</div><div class='add'>+	case DCB_CONNECTOR_DVI_I    : return DRM_MODE_CONNECTOR_DVII;</div><div class='add'>+	case DCB_CONNECTOR_DVI_D    : return DRM_MODE_CONNECTOR_DVID;</div><div class='add'>+	case DCB_CONNECTOR_LVDS     :</div><div class='add'>+	case DCB_CONNECTOR_LVDS_SPWG: return DRM_MODE_CONNECTOR_LVDS;</div><div class='add'>+	case DCB_CONNECTOR_DP       : return DRM_MODE_CONNECTOR_DisplayPort;</div><div class='add'>+	case DCB_CONNECTOR_eDP      : return DRM_MODE_CONNECTOR_eDP;</div><div class='add'>+	case DCB_CONNECTOR_HDMI_0   :</div><div class='add'>+	case DCB_CONNECTOR_HDMI_1   : return DRM_MODE_CONNECTOR_HDMIA;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return DRM_MODE_CONNECTOR_Unknown;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct drm_connector *</div><div class='ctx'> nouveau_connector_create(struct drm_device *dev, int index)</div><div class='ctx'> {</div><div class='ctx'> 	const struct drm_connector_funcs *funcs = &amp;nouveau_connector_funcs;</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='add'>+	struct nouveau_display_engine *disp = &amp;dev_priv-&gt;engine.display;</div><div class='ctx'> 	struct nouveau_connector *nv_connector = NULL;</div><div class='del'>-	struct dcb_connector_table_entry *dcb = NULL;</div><div class='ctx'> 	struct drm_connector *connector;</div><div class='ctx'> 	int type, ret = 0;</div><div class='add'>+	bool dummy;</div><div class='ctx'> </div><div class='ctx'> 	NV_DEBUG_KMS(dev, "\n");</div><div class='ctx'> </div><div class='del'>-	if (index &gt;= dev_priv-&gt;vbios.dcb.connector.entries)</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-</div><div class='del'>-	dcb = &amp;dev_priv-&gt;vbios.dcb.connector.entry[index];</div><div class='del'>-	if (dcb-&gt;drm)</div><div class='del'>-		return dcb-&gt;drm;</div><div class='del'>-</div><div class='del'>-	switch (dcb-&gt;type) {</div><div class='del'>-	case DCB_CONNECTOR_VGA:</div><div class='del'>-		type = DRM_MODE_CONNECTOR_VGA;</div><div class='del'>-		break;</div><div class='del'>-	case DCB_CONNECTOR_TV_0:</div><div class='del'>-	case DCB_CONNECTOR_TV_1:</div><div class='del'>-	case DCB_CONNECTOR_TV_3:</div><div class='del'>-		type = DRM_MODE_CONNECTOR_TV;</div><div class='del'>-		break;</div><div class='del'>-	case DCB_CONNECTOR_DVI_I:</div><div class='del'>-		type = DRM_MODE_CONNECTOR_DVII;</div><div class='del'>-		break;</div><div class='del'>-	case DCB_CONNECTOR_DVI_D:</div><div class='del'>-		type = DRM_MODE_CONNECTOR_DVID;</div><div class='del'>-		break;</div><div class='del'>-	case DCB_CONNECTOR_HDMI_0:</div><div class='del'>-	case DCB_CONNECTOR_HDMI_1:</div><div class='del'>-		type = DRM_MODE_CONNECTOR_HDMIA;</div><div class='del'>-		break;</div><div class='del'>-	case DCB_CONNECTOR_LVDS:</div><div class='del'>-	case DCB_CONNECTOR_LVDS_SPWG:</div><div class='del'>-		type = DRM_MODE_CONNECTOR_LVDS;</div><div class='del'>-		funcs = &amp;nouveau_connector_funcs_lvds;</div><div class='del'>-		break;</div><div class='del'>-	case DCB_CONNECTOR_DP:</div><div class='del'>-		type = DRM_MODE_CONNECTOR_DisplayPort;</div><div class='del'>-		break;</div><div class='del'>-	case DCB_CONNECTOR_eDP:</div><div class='del'>-		type = DRM_MODE_CONNECTOR_eDP;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		NV_ERROR(dev, "unknown connector type: 0x%02x!!\n", dcb-&gt;type);</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='add'>+	list_for_each_entry(connector, &amp;dev-&gt;mode_config.connector_list, head) {</div><div class='add'>+		nv_connector = nouveau_connector(connector);</div><div class='add'>+		if (nv_connector-&gt;index == index)</div><div class='add'>+			return connector;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nv_connector = kzalloc(sizeof(*nv_connector), GFP_KERNEL);</div><div class='ctx'> 	if (!nv_connector)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	nv_connector-&gt;dcb = dcb;</div><div class='add'>+</div><div class='ctx'> 	connector = &amp;nv_connector-&gt;base;</div><div class='add'>+	nv_connector-&gt;index = index;</div><div class='add'>+</div><div class='add'>+	/* attempt to parse vbios connector type and hotplug gpio */</div><div class='add'>+	nv_connector-&gt;dcb = dcb_conn(dev, index);</div><div class='add'>+	if (nv_connector-&gt;dcb) {</div><div class='add'>+		static const u8 hpd[16] = {</div><div class='add'>+			0xff, 0x07, 0x08, 0xff, 0xff, 0x51, 0x52, 0xff,</div><div class='add'>+			0xff, 0xff, 0xff, 0xff, 0xff, 0x5e, 0x5f, 0x60,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		u32 entry = ROM16(nv_connector-&gt;dcb[0]);</div><div class='add'>+		if (dcb_conntab(dev)[3] &gt;= 4)</div><div class='add'>+			entry |= (u32)ROM16(nv_connector-&gt;dcb[2]) &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+		nv_connector-&gt;hpd = ffs((entry &amp; 0x07033000) &gt;&gt; 12);</div><div class='add'>+		nv_connector-&gt;hpd = hpd[nv_connector-&gt;hpd];</div><div class='add'>+</div><div class='add'>+		nv_connector-&gt;type = nv_connector-&gt;dcb[0];</div><div class='add'>+		if (drm_conntype_from_dcb(nv_connector-&gt;type) ==</div><div class='add'>+					  DRM_MODE_CONNECTOR_Unknown) {</div><div class='add'>+			NV_WARN(dev, "unknown connector type %02x\n",</div><div class='add'>+				nv_connector-&gt;type);</div><div class='add'>+			nv_connector-&gt;type = DCB_CONNECTOR_NONE;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* defaults, will get overridden in detect() */</div><div class='del'>-	connector-&gt;interlace_allowed = false;</div><div class='del'>-	connector-&gt;doublescan_allowed = false;</div><div class='add'>+		/* Gigabyte NX85T */</div><div class='add'>+		if (nv_match_device(dev, 0x0421, 0x1458, 0x344c)) {</div><div class='add'>+			if (nv_connector-&gt;type == DCB_CONNECTOR_HDMI_1)</div><div class='add'>+				nv_connector-&gt;type = DCB_CONNECTOR_DVI_I;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	drm_connector_init(dev, connector, funcs, type);</div><div class='del'>-	drm_connector_helper_add(connector, &amp;nouveau_connector_helper_funcs);</div><div class='add'>+		/* Gigabyte GV-NX86T512H */</div><div class='add'>+		if (nv_match_device(dev, 0x0402, 0x1458, 0x3455)) {</div><div class='add'>+			if (nv_connector-&gt;type == DCB_CONNECTOR_HDMI_1)</div><div class='add'>+				nv_connector-&gt;type = DCB_CONNECTOR_DVI_I;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		nv_connector-&gt;type = DCB_CONNECTOR_NONE;</div><div class='add'>+		nv_connector-&gt;hpd = DCB_GPIO_UNUSED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* no vbios data, or an unknown dcb connector type - attempt to</div><div class='add'>+	 * figure out something suitable ourselves</div><div class='add'>+	 */</div><div class='add'>+	if (nv_connector-&gt;type == DCB_CONNECTOR_NONE) {</div><div class='add'>+		struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+		struct dcb_table *dcbt = &amp;dev_priv-&gt;vbios.dcb;</div><div class='add'>+		u32 encoders = 0;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; dcbt-&gt;entries; i++) {</div><div class='add'>+			if (dcbt-&gt;entry[i].connector == nv_connector-&gt;index)</div><div class='add'>+				encoders |= (1 &lt;&lt; dcbt-&gt;entry[i].type);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* Check if we need dithering enabled */</div><div class='del'>-	if (connector-&gt;connector_type == DRM_MODE_CONNECTOR_LVDS) {</div><div class='del'>-		bool dummy, is_24bit = false;</div><div class='add'>+		if (encoders &amp; (1 &lt;&lt; OUTPUT_DP)) {</div><div class='add'>+			if (encoders &amp; (1 &lt;&lt; OUTPUT_TMDS))</div><div class='add'>+				nv_connector-&gt;type = DCB_CONNECTOR_DP;</div><div class='add'>+			else</div><div class='add'>+				nv_connector-&gt;type = DCB_CONNECTOR_eDP;</div><div class='add'>+		} else</div><div class='add'>+		if (encoders &amp; (1 &lt;&lt; OUTPUT_TMDS)) {</div><div class='add'>+			if (encoders &amp; (1 &lt;&lt; OUTPUT_ANALOG))</div><div class='add'>+				nv_connector-&gt;type = DCB_CONNECTOR_DVI_I;</div><div class='add'>+			else</div><div class='add'>+				nv_connector-&gt;type = DCB_CONNECTOR_DVI_D;</div><div class='add'>+		} else</div><div class='add'>+		if (encoders &amp; (1 &lt;&lt; OUTPUT_ANALOG)) {</div><div class='add'>+			nv_connector-&gt;type = DCB_CONNECTOR_VGA;</div><div class='add'>+		} else</div><div class='add'>+		if (encoders &amp; (1 &lt;&lt; OUTPUT_LVDS)) {</div><div class='add'>+			nv_connector-&gt;type = DCB_CONNECTOR_LVDS;</div><div class='add'>+		} else</div><div class='add'>+		if (encoders &amp; (1 &lt;&lt; OUTPUT_TV)) {</div><div class='add'>+			nv_connector-&gt;type = DCB_CONNECTOR_TV_0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		ret = nouveau_bios_parse_lvds_table(dev, 0, &amp;dummy, &amp;is_24bit);</div><div class='add'>+	type = drm_conntype_from_dcb(nv_connector-&gt;type);</div><div class='add'>+	if (type == DRM_MODE_CONNECTOR_LVDS) {</div><div class='add'>+		ret = nouveau_bios_parse_lvds_table(dev, 0, &amp;dummy, &amp;dummy);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			NV_ERROR(dev, "Error parsing LVDS table, disabling "</div><div class='del'>-				 "LVDS\n");</div><div class='del'>-			goto fail;</div><div class='add'>+			NV_ERROR(dev, "Error parsing LVDS table, disabling\n");</div><div class='add'>+			kfree(nv_connector);</div><div class='add'>+			return ERR_PTR(ret);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		nv_connector-&gt;use_dithering = !is_24bit;</div><div class='add'>+		funcs = &amp;nouveau_connector_funcs_lvds;</div><div class='add'>+	} else {</div><div class='add'>+		funcs = &amp;nouveau_connector_funcs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* defaults, will get overridden in detect() */</div><div class='add'>+	connector-&gt;interlace_allowed = false;</div><div class='add'>+	connector-&gt;doublescan_allowed = false;</div><div class='add'>+</div><div class='add'>+	drm_connector_init(dev, connector, funcs, type);</div><div class='add'>+	drm_connector_helper_add(connector, &amp;nouveau_connector_helper_funcs);</div><div class='add'>+</div><div class='ctx'> 	/* Init DVI-I specific properties */</div><div class='del'>-	if (dcb-&gt;type == DCB_CONNECTOR_DVI_I) {</div><div class='del'>-		drm_mode_create_dvi_i_properties(dev);</div><div class='add'>+	if (nv_connector-&gt;type == DCB_CONNECTOR_DVI_I)</div><div class='ctx'> 		drm_connector_attach_property(connector, dev-&gt;mode_config.dvi_i_subconnector_property, 0);</div><div class='del'>-		drm_connector_attach_property(connector, dev-&gt;mode_config.dvi_i_select_subconnector_property, 0);</div><div class='add'>+</div><div class='add'>+	/* Add overscan compensation options to digital outputs */</div><div class='add'>+	if (disp-&gt;underscan_property &amp;&amp;</div><div class='add'>+	    (nv_connector-&gt;type == DCB_CONNECTOR_DVI_D ||</div><div class='add'>+	     nv_connector-&gt;type == DCB_CONNECTOR_DVI_I ||</div><div class='add'>+	     nv_connector-&gt;type == DCB_CONNECTOR_HDMI_0 ||</div><div class='add'>+	     nv_connector-&gt;type == DCB_CONNECTOR_HDMI_1 ||</div><div class='add'>+	     nv_connector-&gt;type == DCB_CONNECTOR_DP)) {</div><div class='add'>+		drm_connector_attach_property(connector,</div><div class='add'>+					      disp-&gt;underscan_property,</div><div class='add'>+					      UNDERSCAN_OFF);</div><div class='add'>+		drm_connector_attach_property(connector,</div><div class='add'>+					      disp-&gt;underscan_hborder_property,</div><div class='add'>+					      0);</div><div class='add'>+		drm_connector_attach_property(connector,</div><div class='add'>+					      disp-&gt;underscan_vborder_property,</div><div class='add'>+					      0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (dcb-&gt;type) {</div><div class='add'>+	switch (nv_connector-&gt;type) {</div><div class='ctx'> 	case DCB_CONNECTOR_VGA:</div><div class='ctx'> 		if (dev_priv-&gt;card_type &gt;= NV_50) {</div><div class='ctx'> 			drm_connector_attach_property(connector,</div><div class='hunk'>@@ -876,32 +1033,32 @@ nouveau_connector_create(struct drm_device *dev, int index)</div><div class='ctx'> 		drm_connector_attach_property(connector,</div><div class='ctx'> 				dev-&gt;mode_config.scaling_mode_property,</div><div class='ctx'> 				nv_connector-&gt;scaling_mode);</div><div class='del'>-		drm_connector_attach_property(connector,</div><div class='del'>-				dev-&gt;mode_config.dithering_mode_property,</div><div class='del'>-				nv_connector-&gt;use_dithering ?</div><div class='del'>-				DRM_MODE_DITHERING_ON : DRM_MODE_DITHERING_OFF);</div><div class='add'>+		if (disp-&gt;dithering_mode) {</div><div class='add'>+			nv_connector-&gt;dithering_mode = DITHERING_MODE_AUTO;</div><div class='add'>+			drm_connector_attach_property(connector,</div><div class='add'>+						disp-&gt;dithering_mode,</div><div class='add'>+						nv_connector-&gt;dithering_mode);</div><div class='add'>+		}</div><div class='add'>+		if (disp-&gt;dithering_depth) {</div><div class='add'>+			nv_connector-&gt;dithering_depth = DITHERING_DEPTH_AUTO;</div><div class='add'>+			drm_connector_attach_property(connector,</div><div class='add'>+						disp-&gt;dithering_depth,</div><div class='add'>+						nv_connector-&gt;dithering_depth);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (nv_connector-&gt;dcb-&gt;gpio_tag != 0xff &amp;&amp; pgpio-&gt;irq_register) {</div><div class='del'>-		pgpio-&gt;irq_register(dev, nv_connector-&gt;dcb-&gt;gpio_tag,</div><div class='del'>-				    nouveau_connector_hotplug, connector);</div><div class='del'>-</div><div class='del'>-		connector-&gt;polled = DRM_CONNECTOR_POLL_HPD;</div><div class='del'>-	} else {</div><div class='del'>-		connector-&gt;polled = DRM_CONNECTOR_POLL_CONNECT;</div><div class='add'>+	connector-&gt;polled = DRM_CONNECTOR_POLL_CONNECT;</div><div class='add'>+	if (nv_connector-&gt;hpd != DCB_GPIO_UNUSED) {</div><div class='add'>+		ret = nouveau_gpio_isr_add(dev, 0, nv_connector-&gt;hpd, 0xff,</div><div class='add'>+					   nouveau_connector_hotplug,</div><div class='add'>+					   connector);</div><div class='add'>+		if (ret == 0)</div><div class='add'>+			connector-&gt;polled = DRM_CONNECTOR_POLL_HPD;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	drm_sysfs_connector_add(connector);</div><div class='del'>-</div><div class='del'>-	dcb-&gt;drm = connector;</div><div class='del'>-	return dcb-&gt;drm;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	drm_connector_cleanup(connector);</div><div class='del'>-	kfree(connector);</div><div class='del'>-	return ERR_PTR(ret);</div><div class='del'>-</div><div class='add'>+	return connector;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.h b/drivers/gpu/drm/nouveau/nouveau_connector.h<br/>index 711b1e9203af..e4857021304c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_connector.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_connector.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_connector.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_connector.h</a></div><div class='hunk'>@@ -30,13 +30,43 @@</div><div class='ctx'> #include "drm_edid.h"</div><div class='ctx'> #include "nouveau_i2c.h"</div><div class='ctx'> </div><div class='add'>+enum nouveau_underscan_type {</div><div class='add'>+	UNDERSCAN_OFF,</div><div class='add'>+	UNDERSCAN_ON,</div><div class='add'>+	UNDERSCAN_AUTO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* the enum values specifically defined here match nv50/nvd0 hw values, and</div><div class='add'>+ * the code relies on this</div><div class='add'>+ */</div><div class='add'>+enum nouveau_dithering_mode {</div><div class='add'>+	DITHERING_MODE_OFF = 0x00,</div><div class='add'>+	DITHERING_MODE_ON = 0x01,</div><div class='add'>+	DITHERING_MODE_DYNAMIC2X2 = 0x10 | DITHERING_MODE_ON,</div><div class='add'>+	DITHERING_MODE_STATIC2X2 = 0x18 | DITHERING_MODE_ON,</div><div class='add'>+	DITHERING_MODE_TEMPORAL = 0x20 | DITHERING_MODE_ON,</div><div class='add'>+	DITHERING_MODE_AUTO</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum nouveau_dithering_depth {</div><div class='add'>+	DITHERING_DEPTH_6BPC = 0x00,</div><div class='add'>+	DITHERING_DEPTH_8BPC = 0x02,</div><div class='add'>+	DITHERING_DEPTH_AUTO</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct nouveau_connector {</div><div class='ctx'> 	struct drm_connector base;</div><div class='add'>+	enum dcb_connector_type type;</div><div class='add'>+	u8 index;</div><div class='add'>+	u8 *dcb;</div><div class='add'>+	u8 hpd;</div><div class='ctx'> </div><div class='del'>-	struct dcb_connector_table_entry *dcb;</div><div class='del'>-</div><div class='add'>+	int dithering_mode;</div><div class='add'>+	int dithering_depth;</div><div class='ctx'> 	int scaling_mode;</div><div class='del'>-	bool use_dithering;</div><div class='add'>+	enum nouveau_underscan_type underscan;</div><div class='add'>+	u32 underscan_hborder;</div><div class='add'>+	u32 underscan_vborder;</div><div class='ctx'> </div><div class='ctx'> 	struct nouveau_encoder *detected_encoder;</div><div class='ctx'> 	struct edid *edid;</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_crtc.h b/drivers/gpu/drm/nouveau/nouveau_crtc.h<br/>index bf8e1289953d..686f6b4a1da3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_crtc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_crtc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_crtc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_crtc.h</a></div><div class='hunk'>@@ -32,8 +32,6 @@ struct nouveau_crtc {</div><div class='ctx'> </div><div class='ctx'> 	int index;</div><div class='ctx'> </div><div class='del'>-	struct drm_display_mode *mode;</div><div class='del'>-</div><div class='ctx'> 	uint32_t dpms_saved_fp_control;</div><div class='ctx'> 	uint32_t fp_users;</div><div class='ctx'> 	int saturation;</div><div class='hunk'>@@ -67,8 +65,8 @@ struct nouveau_crtc {</div><div class='ctx'> 		int depth;</div><div class='ctx'> 	} lut;</div><div class='ctx'> </div><div class='del'>-	int (*set_dither)(struct nouveau_crtc *crtc, bool on, bool update);</div><div class='del'>-	int (*set_scale)(struct nouveau_crtc *crtc, int mode, bool update);</div><div class='add'>+	int (*set_dither)(struct nouveau_crtc *crtc, bool update);</div><div class='add'>+	int (*set_scale)(struct nouveau_crtc *crtc, bool update);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct nouveau_crtc *nouveau_crtc(struct drm_crtc *crtc)</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c<br/>index 8e1592368cce..fa2ec491f6a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_debugfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_debugfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_debugfs.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@ nouveau_debugfs_channel_info(struct seq_file *m, void *data)</div><div class='ctx'> 	seq_printf(m, "channel id    : %d\n", chan-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "cpu fifo state:\n");</div><div class='del'>-	seq_printf(m, "          base: 0x%08x\n", chan-&gt;pushbuf_base);</div><div class='add'>+	seq_printf(m, "          base: 0x%10llx\n", chan-&gt;pushbuf_base);</div><div class='ctx'> 	seq_printf(m, "           max: 0x%08x\n", chan-&gt;dma.max &lt;&lt; 2);</div><div class='ctx'> 	seq_printf(m, "           cur: 0x%08x\n", chan-&gt;dma.cur &lt;&lt; 2);</div><div class='ctx'> 	seq_printf(m, "           put: 0x%08x\n", chan-&gt;dma.put &lt;&lt; 2);</div><div class='hunk'>@@ -178,6 +178,7 @@ static struct drm_info_list nouveau_debugfs_list[] = {</div><div class='ctx'> 	{ "memory", nouveau_debugfs_memory_info, 0, NULL },</div><div class='ctx'> 	{ "vbios.rom", nouveau_debugfs_vbios_image, 0, NULL },</div><div class='ctx'> 	{ "ttm_page_pool", ttm_page_alloc_debugfs, 0, NULL },</div><div class='add'>+	{ "ttm_dma_page_pool", ttm_dma_page_alloc_debugfs, 0, NULL },</div><div class='ctx'> };</div><div class='ctx'> #define NOUVEAU_DEBUGFS_ENTRIES ARRAY_SIZE(nouveau_debugfs_list)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c<br/>index b12fd2c80812..3cb52bc52b21 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_display.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_display.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_display.c</a></div><div class='hunk'>@@ -32,6 +32,8 @@</div><div class='ctx'> #include "nouveau_hw.h"</div><div class='ctx'> #include "nouveau_crtc.h"</div><div class='ctx'> #include "nouveau_dma.h"</div><div class='add'>+#include "nouveau_connector.h"</div><div class='add'>+#include "nouveau_gpio.h"</div><div class='ctx'> #include "nv50_display.h"</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -64,7 +66,7 @@ static const struct drm_framebuffer_funcs nouveau_framebuffer_funcs = {</div><div class='ctx'> int</div><div class='ctx'> nouveau_framebuffer_init(struct drm_device *dev,</div><div class='ctx'> 			 struct nouveau_framebuffer *nv_fb,</div><div class='del'>-			 struct drm_mode_fb_cmd *mode_cmd,</div><div class='add'>+			 struct drm_mode_fb_cmd2 *mode_cmd,</div><div class='ctx'> 			 struct nouveau_bo *nvbo)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='hunk'>@@ -107,14 +109,14 @@ nouveau_framebuffer_init(struct drm_device *dev,</div><div class='ctx'> </div><div class='ctx'> 		if (!tile_flags) {</div><div class='ctx'> 			if (dev_priv-&gt;card_type &lt; NV_D0)</div><div class='del'>-				nv_fb-&gt;r_pitch = 0x00100000 | fb-&gt;pitch;</div><div class='add'>+				nv_fb-&gt;r_pitch = 0x00100000 | fb-&gt;pitches[0];</div><div class='ctx'> 			else</div><div class='del'>-				nv_fb-&gt;r_pitch = 0x01000000 | fb-&gt;pitch;</div><div class='add'>+				nv_fb-&gt;r_pitch = 0x01000000 | fb-&gt;pitches[0];</div><div class='ctx'> 		} else {</div><div class='ctx'> 			u32 mode = nvbo-&gt;tile_mode;</div><div class='ctx'> 			if (dev_priv-&gt;card_type &gt;= NV_C0)</div><div class='ctx'> 				mode &gt;&gt;= 4;</div><div class='del'>-			nv_fb-&gt;r_pitch = ((fb-&gt;pitch / 4) &lt;&lt; 4) | mode;</div><div class='add'>+			nv_fb-&gt;r_pitch = ((fb-&gt;pitches[0] / 4) &lt;&lt; 4) | mode;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -124,13 +126,13 @@ nouveau_framebuffer_init(struct drm_device *dev,</div><div class='ctx'> static struct drm_framebuffer *</div><div class='ctx'> nouveau_user_framebuffer_create(struct drm_device *dev,</div><div class='ctx'> 				struct drm_file *file_priv,</div><div class='del'>-				struct drm_mode_fb_cmd *mode_cmd)</div><div class='add'>+				struct drm_mode_fb_cmd2 *mode_cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct nouveau_framebuffer *nouveau_fb;</div><div class='ctx'> 	struct drm_gem_object *gem;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	gem = drm_gem_object_lookup(dev, file_priv, mode_cmd-&gt;handle);</div><div class='add'>+	gem = drm_gem_object_lookup(dev, file_priv, mode_cmd-&gt;handles[0]);</div><div class='ctx'> 	if (!gem)</div><div class='ctx'> 		return ERR_PTR(-ENOENT);</div><div class='ctx'> </div><div class='hunk'>@@ -147,11 +149,186 @@ nouveau_user_framebuffer_create(struct drm_device *dev,</div><div class='ctx'> 	return &amp;nouveau_fb-&gt;base;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct drm_mode_config_funcs nouveau_mode_config_funcs = {</div><div class='add'>+static const struct drm_mode_config_funcs nouveau_mode_config_funcs = {</div><div class='ctx'> 	.fb_create = nouveau_user_framebuffer_create,</div><div class='ctx'> 	.output_poll_changed = nouveau_fbcon_output_poll_changed,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+struct drm_prop_enum_list {</div><div class='add'>+	u8 gen_mask;</div><div class='add'>+	int type;</div><div class='add'>+	char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct drm_prop_enum_list underscan[] = {</div><div class='add'>+	{ 6, UNDERSCAN_AUTO, "auto" },</div><div class='add'>+	{ 6, UNDERSCAN_OFF, "off" },</div><div class='add'>+	{ 6, UNDERSCAN_ON, "on" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct drm_prop_enum_list dither_mode[] = {</div><div class='add'>+	{ 7, DITHERING_MODE_AUTO, "auto" },</div><div class='add'>+	{ 7, DITHERING_MODE_OFF, "off" },</div><div class='add'>+	{ 1, DITHERING_MODE_ON, "on" },</div><div class='add'>+	{ 6, DITHERING_MODE_STATIC2X2, "static 2x2" },</div><div class='add'>+	{ 6, DITHERING_MODE_DYNAMIC2X2, "dynamic 2x2" },</div><div class='add'>+	{ 4, DITHERING_MODE_TEMPORAL, "temporal" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct drm_prop_enum_list dither_depth[] = {</div><div class='add'>+	{ 6, DITHERING_DEPTH_AUTO, "auto" },</div><div class='add'>+	{ 6, DITHERING_DEPTH_6BPC, "6 bpc" },</div><div class='add'>+	{ 6, DITHERING_DEPTH_8BPC, "8 bpc" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PROP_ENUM(p,gen,n,list) do {                                           \</div><div class='add'>+	struct drm_prop_enum_list *l = (list);                                 \</div><div class='add'>+	int c = 0;                                                             \</div><div class='add'>+	while (l-&gt;gen_mask) {                                                  \</div><div class='add'>+		if (l-&gt;gen_mask &amp; (1 &lt;&lt; (gen)))                                \</div><div class='add'>+			c++;                                                   \</div><div class='add'>+		l++;                                                           \</div><div class='add'>+	}                                                                      \</div><div class='add'>+	if (c) {                                                               \</div><div class='add'>+		p = drm_property_create(dev, DRM_MODE_PROP_ENUM, n, c);        \</div><div class='add'>+		l = (list);                                                    \</div><div class='add'>+		c = 0;                                                         \</div><div class='add'>+		while (p &amp;&amp; l-&gt;gen_mask) {                                     \</div><div class='add'>+			if (l-&gt;gen_mask &amp; (1 &lt;&lt; (gen))) {                      \</div><div class='add'>+				drm_property_add_enum(p, c, l-&gt;type, l-&gt;name); \</div><div class='add'>+				c++;                                           \</div><div class='add'>+			}                                                      \</div><div class='add'>+			l++;                                                   \</div><div class='add'>+		}                                                              \</div><div class='add'>+	}                                                                      \</div><div class='add'>+} while(0)</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nouveau_display_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_display_engine *disp = &amp;dev_priv-&gt;engine.display;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = disp-&gt;init(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	drm_kms_helper_poll_enable(dev);</div><div class='add'>+</div><div class='add'>+	/* enable hotplug interrupts */</div><div class='add'>+	list_for_each_entry(connector, &amp;dev-&gt;mode_config.connector_list, head) {</div><div class='add'>+		struct nouveau_connector *conn = nouveau_connector(connector);</div><div class='add'>+		nouveau_gpio_irq(dev, 0, conn-&gt;hpd, 0xff, true);</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</div><div class='add'>+nouveau_display_fini(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_display_engine *disp = &amp;dev_priv-&gt;engine.display;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+</div><div class='add'>+	/* disable hotplug interrupts */</div><div class='add'>+	list_for_each_entry(connector, &amp;dev-&gt;mode_config.connector_list, head) {</div><div class='add'>+		struct nouveau_connector *conn = nouveau_connector(connector);</div><div class='add'>+		nouveau_gpio_irq(dev, 0, conn-&gt;hpd, 0xff, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	drm_kms_helper_poll_disable(dev);</div><div class='add'>+	disp-&gt;fini(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nouveau_display_create(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_display_engine *disp = &amp;dev_priv-&gt;engine.display;</div><div class='add'>+	int ret, gen;</div><div class='add'>+</div><div class='add'>+	drm_mode_config_init(dev);</div><div class='add'>+	drm_mode_create_scaling_mode_property(dev);</div><div class='add'>+	drm_mode_create_dvi_i_properties(dev);</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;card_type &lt; NV_50)</div><div class='add'>+		gen = 0;</div><div class='add'>+	else</div><div class='add'>+	if (dev_priv-&gt;card_type &lt; NV_D0)</div><div class='add'>+		gen = 1;</div><div class='add'>+	else</div><div class='add'>+		gen = 2;</div><div class='add'>+</div><div class='add'>+	PROP_ENUM(disp-&gt;dithering_mode, gen, "dithering mode", dither_mode);</div><div class='add'>+	PROP_ENUM(disp-&gt;dithering_depth, gen, "dithering depth", dither_depth);</div><div class='add'>+	PROP_ENUM(disp-&gt;underscan_property, gen, "underscan", underscan);</div><div class='add'>+</div><div class='add'>+	disp-&gt;underscan_hborder_property =</div><div class='add'>+		drm_property_create(dev, DRM_MODE_PROP_RANGE,</div><div class='add'>+				    "underscan hborder", 2);</div><div class='add'>+	disp-&gt;underscan_hborder_property-&gt;values[0] = 0;</div><div class='add'>+	disp-&gt;underscan_hborder_property-&gt;values[1] = 128;</div><div class='add'>+</div><div class='add'>+	disp-&gt;underscan_vborder_property =</div><div class='add'>+		drm_property_create(dev, DRM_MODE_PROP_RANGE,</div><div class='add'>+				    "underscan vborder", 2);</div><div class='add'>+	disp-&gt;underscan_vborder_property-&gt;values[0] = 0;</div><div class='add'>+	disp-&gt;underscan_vborder_property-&gt;values[1] = 128;</div><div class='add'>+</div><div class='add'>+	dev-&gt;mode_config.funcs = (void *)&amp;nouveau_mode_config_funcs;</div><div class='add'>+	dev-&gt;mode_config.fb_base = pci_resource_start(dev-&gt;pdev, 1);</div><div class='add'>+</div><div class='add'>+	dev-&gt;mode_config.min_width = 0;</div><div class='add'>+	dev-&gt;mode_config.min_height = 0;</div><div class='add'>+	if (dev_priv-&gt;card_type &lt; NV_10) {</div><div class='add'>+		dev-&gt;mode_config.max_width = 2048;</div><div class='add'>+		dev-&gt;mode_config.max_height = 2048;</div><div class='add'>+	} else</div><div class='add'>+	if (dev_priv-&gt;card_type &lt; NV_50) {</div><div class='add'>+		dev-&gt;mode_config.max_width = 4096;</div><div class='add'>+		dev-&gt;mode_config.max_height = 4096;</div><div class='add'>+	} else {</div><div class='add'>+		dev-&gt;mode_config.max_width = 8192;</div><div class='add'>+		dev-&gt;mode_config.max_height = 8192;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	drm_kms_helper_poll_init(dev);</div><div class='add'>+	drm_kms_helper_poll_disable(dev);</div><div class='add'>+</div><div class='add'>+	ret = disp-&gt;create(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;mode_config.num_crtc) {</div><div class='add'>+		ret = drm_vblank_init(dev, dev-&gt;mode_config.num_crtc);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+nouveau_display_destroy(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_display_engine *disp = &amp;dev_priv-&gt;engine.display;</div><div class='add'>+</div><div class='add'>+	drm_vblank_cleanup(dev);</div><div class='add'>+</div><div class='add'>+	disp-&gt;destroy(dev);</div><div class='add'>+</div><div class='add'>+	drm_kms_helper_poll_fini(dev);</div><div class='add'>+	drm_mode_config_cleanup(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int</div><div class='ctx'> nouveau_vblank_enable(struct drm_device *dev, int crtc)</div><div class='ctx'> {</div><div class='hunk'>@@ -294,7 +471,7 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,</div><div class='ctx'> 	/* Initialize a page flip struct */</div><div class='ctx'> 	*s = (struct nouveau_page_flip_state)</div><div class='ctx'> 		{ { }, event, nouveau_crtc(crtc)-&gt;index,</div><div class='del'>-		  fb-&gt;bits_per_pixel, fb-&gt;pitch, crtc-&gt;x, crtc-&gt;y,</div><div class='add'>+		  fb-&gt;bits_per_pixel, fb-&gt;pitches[0], crtc-&gt;x, crtc-&gt;y,</div><div class='ctx'> 		  new_bo-&gt;bo.offset };</div><div class='ctx'> </div><div class='ctx'> 	/* Choose the channel the flip will be handled in */</div><div class='hunk'>@@ -305,7 +482,10 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,</div><div class='ctx'> </div><div class='ctx'> 	/* Emit a page flip */</div><div class='ctx'> 	if (dev_priv-&gt;card_type &gt;= NV_50) {</div><div class='del'>-		ret = nv50_display_flip_next(crtc, fb, chan);</div><div class='add'>+		if (dev_priv-&gt;card_type &gt;= NV_D0)</div><div class='add'>+			ret = nvd0_display_flip_next(crtc, fb, chan, 0);</div><div class='add'>+		else</div><div class='add'>+			ret = nv50_display_flip_next(crtc, fb, chan);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			nouveau_channel_put(&amp;chan);</div><div class='ctx'> 			goto fail_unreserve;</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c<br/>index 00bc6eaad558..4c2e4e5925fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_dma.c</a></div><div class='hunk'>@@ -134,11 +134,13 @@ OUT_RINGp(struct nouveau_channel *chan, const void *data, unsigned nr_dwords)</div><div class='ctx'>  *  -EBUSY if timeout exceeded</div><div class='ctx'>  */</div><div class='ctx'> static inline int</div><div class='del'>-READ_GET(struct nouveau_channel *chan, uint32_t *prev_get, uint32_t *timeout)</div><div class='add'>+READ_GET(struct nouveau_channel *chan, uint64_t *prev_get, int *timeout)</div><div class='ctx'> {</div><div class='del'>-	uint32_t val;</div><div class='add'>+	uint64_t val;</div><div class='ctx'> </div><div class='ctx'> 	val = nvchan_rd32(chan, chan-&gt;user_get);</div><div class='add'>+        if (chan-&gt;user_get_hi)</div><div class='add'>+                val |= (uint64_t)nvchan_rd32(chan, chan-&gt;user_get_hi) &lt;&lt; 32;</div><div class='ctx'> </div><div class='ctx'> 	/* reset counter as long as GET is still advancing, this is</div><div class='ctx'> 	 * to avoid misdetecting a GPU lockup if the GPU happens to</div><div class='hunk'>@@ -218,8 +220,8 @@ nv50_dma_push_wait(struct nouveau_channel *chan, int count)</div><div class='ctx'> static int</div><div class='ctx'> nv50_dma_wait(struct nouveau_channel *chan, int slots, int count)</div><div class='ctx'> {</div><div class='del'>-	uint32_t cnt = 0, prev_get = 0;</div><div class='del'>-	int ret;</div><div class='add'>+	uint64_t prev_get = 0;</div><div class='add'>+	int ret, cnt = 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = nv50_dma_push_wait(chan, slots + 1);</div><div class='ctx'> 	if (unlikely(ret))</div><div class='hunk'>@@ -261,8 +263,8 @@ nv50_dma_wait(struct nouveau_channel *chan, int slots, int count)</div><div class='ctx'> int</div><div class='ctx'> nouveau_dma_wait(struct nouveau_channel *chan, int slots, int size)</div><div class='ctx'> {</div><div class='del'>-	uint32_t prev_get = 0, cnt = 0;</div><div class='del'>-	int get;</div><div class='add'>+	uint64_t prev_get = 0;</div><div class='add'>+	int cnt = 0, get;</div><div class='ctx'> </div><div class='ctx'> 	if (chan-&gt;dma.ib_max)</div><div class='ctx'> 		return nv50_dma_wait(chan, slots, size);</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c<br/>index de5efe71fefd..9b93b703ceab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_dp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_dp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_dp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_dp.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include "nouveau_connector.h"</div><div class='ctx'> #include "nouveau_encoder.h"</div><div class='ctx'> #include "nouveau_crtc.h"</div><div class='add'>+#include "nouveau_gpio.h"</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * aux channel util functions</div><div class='hunk'>@@ -273,8 +274,6 @@ nouveau_dp_tu_update(struct drm_device *dev, int or, int link, u32 clk, u32 bpp)</div><div class='ctx'> u8 *</div><div class='ctx'> nouveau_dp_bios_data(struct drm_device *dev, struct dcb_entry *dcb, u8 **entry)</div><div class='ctx'> {</div><div class='del'>-	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nvbios *bios = &amp;dev_priv-&gt;vbios;</div><div class='ctx'> 	struct bit_entry d;</div><div class='ctx'> 	u8 *table;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -289,7 +288,7 @@ nouveau_dp_bios_data(struct drm_device *dev, struct dcb_entry *dcb, u8 **entry)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	table = ROMPTR(bios, d.data[0]);</div><div class='add'>+	table = ROMPTR(dev, d.data[0]);</div><div class='ctx'> 	if (!table) {</div><div class='ctx'> 		NV_ERROR(dev, "displayport table pointer invalid\n");</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -306,7 +305,7 @@ nouveau_dp_bios_data(struct drm_device *dev, struct dcb_entry *dcb, u8 **entry)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; table[3]; i++) {</div><div class='del'>-		*entry = ROMPTR(bios, table[table[1] + (i * table[2])]);</div><div class='add'>+		*entry = ROMPTR(dev, table[table[1] + (i * table[2])]);</div><div class='ctx'> 		if (*entry &amp;&amp; bios_encoder_match(dcb, ROM32((*entry)[0])))</div><div class='ctx'> 			return table;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -336,7 +335,6 @@ struct dp_state {</div><div class='ctx'> static void</div><div class='ctx'> dp_set_link_config(struct drm_device *dev, struct dp_state *dp)</div><div class='ctx'> {</div><div class='del'>-	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	int or = dp-&gt;or, link = dp-&gt;link;</div><div class='ctx'> 	u8 *entry, sink[2];</div><div class='ctx'> 	u32 dp_ctrl;</div><div class='hunk'>@@ -360,7 +358,7 @@ dp_set_link_config(struct drm_device *dev, struct dp_state *dp)</div><div class='ctx'> 	 * table, that has (among other things) pointers to more scripts that</div><div class='ctx'> 	 * need to be executed, this time depending on link speed.</div><div class='ctx'> 	 */</div><div class='del'>-	entry = ROMPTR(&amp;dev_priv-&gt;vbios, dp-&gt;entry[10]);</div><div class='add'>+	entry = ROMPTR(dev, dp-&gt;entry[10]);</div><div class='ctx'> 	if (entry) {</div><div class='ctx'> 		if (dp-&gt;table[0] &lt; 0x30) {</div><div class='ctx'> 			while (dp-&gt;link_bw &lt; (ROM16(entry[0]) * 10))</div><div class='hunk'>@@ -559,8 +557,6 @@ dp_link_train_eq(struct drm_device *dev, struct dp_state *dp)</div><div class='ctx'> bool</div><div class='ctx'> nouveau_dp_link_train(struct drm_encoder *encoder, u32 datarate)</div><div class='ctx'> {</div><div class='del'>-	struct drm_nouveau_private *dev_priv = encoder-&gt;dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='ctx'> 	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);</div><div class='ctx'> 	struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder-&gt;crtc);</div><div class='ctx'> 	struct nouveau_connector *nv_connector =</div><div class='hunk'>@@ -581,7 +577,7 @@ nouveau_dp_link_train(struct drm_encoder *encoder, u32 datarate)</div><div class='ctx'> </div><div class='ctx'> 	dp.dcb = nv_encoder-&gt;dcb;</div><div class='ctx'> 	dp.crtc = nv_crtc-&gt;index;</div><div class='del'>-	dp.auxch = auxch-&gt;rd;</div><div class='add'>+	dp.auxch = auxch-&gt;drive;</div><div class='ctx'> 	dp.or = nv_encoder-&gt;or;</div><div class='ctx'> 	dp.link = !(nv_encoder-&gt;dcb-&gt;sorconf.link &amp; 1);</div><div class='ctx'> 	dp.dpcd = nv_encoder-&gt;dp.dpcd;</div><div class='hunk'>@@ -590,7 +586,7 @@ nouveau_dp_link_train(struct drm_encoder *encoder, u32 datarate)</div><div class='ctx'> 	 * we take during link training (DP_SET_POWER is one), we need</div><div class='ctx'> 	 * to ignore them for the moment to avoid races.</div><div class='ctx'> 	 */</div><div class='del'>-	pgpio-&gt;irq_enable(dev, nv_connector-&gt;dcb-&gt;gpio_tag, false);</div><div class='add'>+	nouveau_gpio_irq(dev, 0, nv_connector-&gt;hpd, 0xff, false);</div><div class='ctx'> </div><div class='ctx'> 	/* enable down-spreading, if possible */</div><div class='ctx'> 	if (dp.table[1] &gt;= 16) {</div><div class='hunk'>@@ -639,7 +635,7 @@ nouveau_dp_link_train(struct drm_encoder *encoder, u32 datarate)</div><div class='ctx'> 	nouveau_bios_run_init_table(dev, ROM16(dp.entry[8]), dp.dcb, dp.crtc);</div><div class='ctx'> </div><div class='ctx'> 	/* re-enable hotplug detect */</div><div class='del'>-	pgpio-&gt;irq_enable(dev, nv_connector-&gt;dcb-&gt;gpio_tag, true);</div><div class='add'>+	nouveau_gpio_irq(dev, 0, nv_connector-&gt;hpd, 0xff, true);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -656,7 +652,7 @@ nouveau_dp_detect(struct drm_encoder *encoder)</div><div class='ctx'> 	if (!auxch)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	ret = auxch_tx(dev, auxch-&gt;rd, 9, DP_DPCD_REV, dpcd, 8);</div><div class='add'>+	ret = auxch_tx(dev, auxch-&gt;drive, 9, DP_DPCD_REV, dpcd, 8);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -684,7 +680,7 @@ int</div><div class='ctx'> nouveau_dp_auxch(struct nouveau_i2c_chan *auxch, int cmd, int addr,</div><div class='ctx'> 		 uint8_t *data, int data_nr)</div><div class='ctx'> {</div><div class='del'>-	return auxch_tx(auxch-&gt;dev, auxch-&gt;rd, cmd, addr, data, data_nr);</div><div class='add'>+	return auxch_tx(auxch-&gt;dev, auxch-&gt;drive, cmd, addr, data, data_nr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c<br/>index 9791d13c9e3b..e4a7cfe7898d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_drv.c</a></div><div class='hunk'>@@ -124,6 +124,10 @@ MODULE_PARM_DESC(ctxfw, "Use external HUB/GPC ucode (fermi)\n");</div><div class='ctx'> int nouveau_ctxfw;</div><div class='ctx'> module_param_named(ctxfw, nouveau_ctxfw, int, 0400);</div><div class='ctx'> </div><div class='add'>+MODULE_PARM_DESC(ctxfw, "Santise DCB table according to MXM-SIS\n");</div><div class='add'>+int nouveau_mxmdcb = 1;</div><div class='add'>+module_param_named(mxmdcb, nouveau_mxmdcb, int, 0400);</div><div class='add'>+</div><div class='ctx'> int nouveau_fbpercrtc;</div><div class='ctx'> #if 0</div><div class='ctx'> module_param_named(fbpercrtc, nouveau_fbpercrtc, int, 0400);</div><div class='hunk'>@@ -178,8 +182,11 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state)</div><div class='ctx'> 	if (dev-&gt;switch_power_state == DRM_SWITCH_POWER_OFF)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	NV_INFO(dev, "Disabling fbcon acceleration...\n");</div><div class='del'>-	nouveau_fbcon_save_disable_accel(dev);</div><div class='add'>+	NV_INFO(dev, "Disabling display...\n");</div><div class='add'>+	nouveau_display_fini(dev);</div><div class='add'>+</div><div class='add'>+	NV_INFO(dev, "Disabling fbcon...\n");</div><div class='add'>+	nouveau_fbcon_set_suspend(dev, 1);</div><div class='ctx'> </div><div class='ctx'> 	NV_INFO(dev, "Unpinning framebuffer(s)...\n");</div><div class='ctx'> 	list_for_each_entry(crtc, &amp;dev-&gt;mode_config.crtc_list, head) {</div><div class='hunk'>@@ -220,7 +227,7 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state)</div><div class='ctx'> </div><div class='ctx'> 		ret = dev_priv-&gt;eng[e]-&gt;fini(dev, e, true);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			NV_ERROR(dev, "... engine %d failed: %d\n", i, ret);</div><div class='add'>+			NV_ERROR(dev, "... engine %d failed: %d\n", e, ret);</div><div class='ctx'> 			goto out_abort;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -246,10 +253,6 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state)</div><div class='ctx'> 		pci_set_power_state(pdev, PCI_D3hot);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	console_lock();</div><div class='del'>-	nouveau_fbcon_set_suspend(dev, 1);</div><div class='del'>-	console_unlock();</div><div class='del'>-	nouveau_fbcon_restore_accel(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_abort:</div><div class='hunk'>@@ -275,8 +278,6 @@ nouveau_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> 	if (dev-&gt;switch_power_state == DRM_SWITCH_POWER_OFF)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	nouveau_fbcon_save_disable_accel(dev);</div><div class='del'>-</div><div class='ctx'> 	NV_INFO(dev, "We're back, enabling device...\n");</div><div class='ctx'> 	pci_set_power_state(pdev, PCI_D0);</div><div class='ctx'> 	pci_restore_state(pdev);</div><div class='hunk'>@@ -296,8 +297,6 @@ nouveau_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	nouveau_pm_resume(dev);</div><div class='del'>-</div><div class='ctx'> 	if (dev_priv-&gt;gart_info.type == NOUVEAU_GART_AGP) {</div><div class='ctx'> 		ret = nouveau_mem_init_agp(dev);</div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -337,6 +336,8 @@ nouveau_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	nouveau_pm_resume(dev);</div><div class='add'>+</div><div class='ctx'> 	NV_INFO(dev, "Restoring mode...\n");</div><div class='ctx'> 	list_for_each_entry(crtc, &amp;dev-&gt;mode_config.crtc_list, head) {</div><div class='ctx'> 		struct nouveau_framebuffer *nouveau_fb;</div><div class='hunk'>@@ -358,16 +359,10 @@ nouveau_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> 			NV_ERROR(dev, "Could not pin/map cursor.\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	engine-&gt;display.init(dev);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(crtc, &amp;dev-&gt;mode_config.crtc_list, head) {</div><div class='del'>-		struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);</div><div class='del'>-		u32 offset = nv_crtc-&gt;cursor.nvbo-&gt;bo.offset;</div><div class='add'>+	nouveau_fbcon_set_suspend(dev, 0);</div><div class='add'>+	nouveau_fbcon_zfill_all(dev);</div><div class='ctx'> </div><div class='del'>-		nv_crtc-&gt;cursor.set_offset(nv_crtc, offset);</div><div class='del'>-		nv_crtc-&gt;cursor.set_pos(nv_crtc, nv_crtc-&gt;cursor_saved_x,</div><div class='del'>-						 nv_crtc-&gt;cursor_saved_y);</div><div class='del'>-	}</div><div class='add'>+	nouveau_display_init(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Force CLUT to get re-loaded during modeset */</div><div class='ctx'> 	list_for_each_entry(crtc, &amp;dev-&gt;mode_config.crtc_list, head) {</div><div class='hunk'>@@ -376,18 +371,35 @@ nouveau_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> 		nv_crtc-&gt;lut.depth = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	console_lock();</div><div class='del'>-	nouveau_fbcon_set_suspend(dev, 0);</div><div class='del'>-	console_unlock();</div><div class='add'>+	drm_helper_resume_force_mode(dev);</div><div class='ctx'> </div><div class='del'>-	nouveau_fbcon_zfill_all(dev);</div><div class='add'>+	list_for_each_entry(crtc, &amp;dev-&gt;mode_config.crtc_list, head) {</div><div class='add'>+		struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);</div><div class='add'>+		u32 offset = nv_crtc-&gt;cursor.nvbo-&gt;bo.offset;</div><div class='ctx'> </div><div class='del'>-	drm_helper_resume_force_mode(dev);</div><div class='add'>+		nv_crtc-&gt;cursor.set_offset(nv_crtc, offset);</div><div class='add'>+		nv_crtc-&gt;cursor.set_pos(nv_crtc, nv_crtc-&gt;cursor_saved_x,</div><div class='add'>+						 nv_crtc-&gt;cursor_saved_y);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	nouveau_fbcon_restore_accel(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct file_operations nouveau_driver_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = drm_open,</div><div class='add'>+	.release = drm_release,</div><div class='add'>+	.unlocked_ioctl = drm_ioctl,</div><div class='add'>+	.mmap = nouveau_ttm_mmap,</div><div class='add'>+	.poll = drm_poll,</div><div class='add'>+	.fasync = drm_fasync,</div><div class='add'>+	.read = drm_read,</div><div class='add'>+#if defined(CONFIG_COMPAT)</div><div class='add'>+	.compat_ioctl = nouveau_compat_ioctl,</div><div class='add'>+#endif</div><div class='add'>+	.llseek = noop_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct drm_driver driver = {</div><div class='ctx'> 	.driver_features =</div><div class='ctx'> 		DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG |</div><div class='hunk'>@@ -413,21 +425,7 @@ static struct drm_driver driver = {</div><div class='ctx'> 	.disable_vblank = nouveau_vblank_disable,</div><div class='ctx'> 	.reclaim_buffers = drm_core_reclaim_buffers,</div><div class='ctx'> 	.ioctls = nouveau_ioctls,</div><div class='del'>-	.fops = {</div><div class='del'>-		.owner = THIS_MODULE,</div><div class='del'>-		.open = drm_open,</div><div class='del'>-		.release = drm_release,</div><div class='del'>-		.unlocked_ioctl = drm_ioctl,</div><div class='del'>-		.mmap = nouveau_ttm_mmap,</div><div class='del'>-		.poll = drm_poll,</div><div class='del'>-		.fasync = drm_fasync,</div><div class='del'>-		.read = drm_read,</div><div class='del'>-#if defined(CONFIG_COMPAT)</div><div class='del'>-		.compat_ioctl = nouveau_compat_ioctl,</div><div class='del'>-#endif</div><div class='del'>-		.llseek = noop_llseek,</div><div class='del'>-	},</div><div class='del'>-</div><div class='add'>+	.fops = &amp;nouveau_driver_fops,</div><div class='ctx'> 	.gem_init_object = nouveau_gem_object_new,</div><div class='ctx'> 	.gem_free_object = nouveau_gem_object_del,</div><div class='ctx'> 	.gem_open_object = nouveau_gem_object_open,</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h<br/>index 4c0be3a4ed88..b82709828931 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_drv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_drv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_drv.h</a></div><div class='hunk'>@@ -163,6 +163,9 @@ enum nouveau_flags {</div><div class='ctx'> #define NVOBJ_ENGINE_COPY0	3</div><div class='ctx'> #define NVOBJ_ENGINE_COPY1	4</div><div class='ctx'> #define NVOBJ_ENGINE_MPEG	5</div><div class='add'>+#define NVOBJ_ENGINE_PPP	NVOBJ_ENGINE_MPEG</div><div class='add'>+#define NVOBJ_ENGINE_BSP	6</div><div class='add'>+#define NVOBJ_ENGINE_VP		7</div><div class='ctx'> #define NVOBJ_ENGINE_DISPLAY	15</div><div class='ctx'> #define NVOBJ_ENGINE_NR		16</div><div class='ctx'> </div><div class='hunk'>@@ -229,6 +232,7 @@ struct nouveau_channel {</div><div class='ctx'> 	/* mapping of the regs controlling the fifo */</div><div class='ctx'> 	void __iomem *user;</div><div class='ctx'> 	uint32_t user_get;</div><div class='add'>+	uint32_t user_get_hi;</div><div class='ctx'> 	uint32_t user_put;</div><div class='ctx'> </div><div class='ctx'> 	/* Fencing */</div><div class='hunk'>@@ -246,7 +250,7 @@ struct nouveau_channel {</div><div class='ctx'> 	struct nouveau_gpuobj *pushbuf;</div><div class='ctx'> 	struct nouveau_bo     *pushbuf_bo;</div><div class='ctx'> 	struct nouveau_vma     pushbuf_vma;</div><div class='del'>-	uint32_t               pushbuf_base;</div><div class='add'>+	uint64_t               pushbuf_base;</div><div class='ctx'> </div><div class='ctx'> 	/* Notifier memory */</div><div class='ctx'> 	struct nouveau_bo *notifier_bo;</div><div class='hunk'>@@ -393,24 +397,25 @@ struct nouveau_display_engine {</div><div class='ctx'> 	int (*early_init)(struct drm_device *);</div><div class='ctx'> 	void (*late_takedown)(struct drm_device *);</div><div class='ctx'> 	int (*create)(struct drm_device *);</div><div class='del'>-	int (*init)(struct drm_device *);</div><div class='ctx'> 	void (*destroy)(struct drm_device *);</div><div class='add'>+	int (*init)(struct drm_device *);</div><div class='add'>+	void (*fini)(struct drm_device *);</div><div class='add'>+</div><div class='add'>+	struct drm_property *dithering_mode;</div><div class='add'>+	struct drm_property *dithering_depth;</div><div class='add'>+	struct drm_property *underscan_property;</div><div class='add'>+	struct drm_property *underscan_hborder_property;</div><div class='add'>+	struct drm_property *underscan_vborder_property;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nouveau_gpio_engine {</div><div class='del'>-	void *priv;</div><div class='del'>-</div><div class='del'>-	int  (*init)(struct drm_device *);</div><div class='del'>-	void (*takedown)(struct drm_device *);</div><div class='del'>-</div><div class='del'>-	int  (*get)(struct drm_device *, enum dcb_gpio_tag);</div><div class='del'>-	int  (*set)(struct drm_device *, enum dcb_gpio_tag, int state);</div><div class='del'>-</div><div class='del'>-	int  (*irq_register)(struct drm_device *, enum dcb_gpio_tag,</div><div class='del'>-			     void (*)(void *, int), void *);</div><div class='del'>-	void (*irq_unregister)(struct drm_device *, enum dcb_gpio_tag,</div><div class='del'>-			       void (*)(void *, int), void *);</div><div class='del'>-	bool (*irq_enable)(struct drm_device *, enum dcb_gpio_tag, bool on);</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	struct list_head isr;</div><div class='add'>+	int (*init)(struct drm_device *);</div><div class='add'>+	void (*fini)(struct drm_device *);</div><div class='add'>+	int (*drive)(struct drm_device *, int line, int dir, int out);</div><div class='add'>+	int (*sense)(struct drm_device *, int line);</div><div class='add'>+	void (*irq_enable)(struct drm_device *, int line, bool);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nouveau_pm_voltage_level {</div><div class='hunk'>@@ -484,7 +489,7 @@ struct nouveau_pm_level {</div><div class='ctx'> 	u32 copy;</div><div class='ctx'> 	u32 daemon;</div><div class='ctx'> 	u32 vdec;</div><div class='del'>-	u32 unk05;	/* nv50:nva3, roughly.. */</div><div class='add'>+	u32 dom6;</div><div class='ctx'> 	u32 unka0;	/* nva3:nvc0 */</div><div class='ctx'> 	u32 hub01;	/* nvc0- */</div><div class='ctx'> 	u32 hub06;	/* nvc0- */</div><div class='hunk'>@@ -518,6 +523,12 @@ struct nouveau_pm_memtimings {</div><div class='ctx'> 	int nr_timing;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct nouveau_pm_fan {</div><div class='add'>+	u32 min_duty;</div><div class='add'>+	u32 max_duty;</div><div class='add'>+	u32 pwm_freq;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct nouveau_pm_engine {</div><div class='ctx'> 	struct nouveau_pm_voltage voltage;</div><div class='ctx'> 	struct nouveau_pm_level perflvl[NOUVEAU_PM_MAX_LEVEL];</div><div class='hunk'>@@ -525,6 +536,8 @@ struct nouveau_pm_engine {</div><div class='ctx'> 	struct nouveau_pm_memtimings memtimings;</div><div class='ctx'> 	struct nouveau_pm_temp_sensor_constants sensor_constants;</div><div class='ctx'> 	struct nouveau_pm_threshold_temp threshold_temp;</div><div class='add'>+	struct nouveau_pm_fan fan;</div><div class='add'>+	u32 pwm_divisor;</div><div class='ctx'> </div><div class='ctx'> 	struct nouveau_pm_level boot;</div><div class='ctx'> 	struct nouveau_pm_level *cur;</div><div class='hunk'>@@ -532,19 +545,14 @@ struct nouveau_pm_engine {</div><div class='ctx'> 	struct device *hwmon;</div><div class='ctx'> 	struct notifier_block acpi_nb;</div><div class='ctx'> </div><div class='del'>-	int (*clock_get)(struct drm_device *, u32 id);</div><div class='del'>-	void *(*clock_pre)(struct drm_device *, struct nouveau_pm_level *,</div><div class='del'>-			   u32 id, int khz);</div><div class='del'>-	void (*clock_set)(struct drm_device *, void *);</div><div class='del'>-</div><div class='ctx'> 	int  (*clocks_get)(struct drm_device *, struct nouveau_pm_level *);</div><div class='ctx'> 	void *(*clocks_pre)(struct drm_device *, struct nouveau_pm_level *);</div><div class='del'>-	void (*clocks_set)(struct drm_device *, void *);</div><div class='add'>+	int (*clocks_set)(struct drm_device *, void *);</div><div class='ctx'> </div><div class='ctx'> 	int (*voltage_get)(struct drm_device *);</div><div class='ctx'> 	int (*voltage_set)(struct drm_device *, int voltage);</div><div class='del'>-	int (*fanspeed_get)(struct drm_device *);</div><div class='del'>-	int (*fanspeed_set)(struct drm_device *, int fanspeed);</div><div class='add'>+	int (*pwm_get)(struct drm_device *, int line, u32*, u32*);</div><div class='add'>+	int (*pwm_set)(struct drm_device *, int line, u32, u32);</div><div class='ctx'> 	int (*temp_get)(struct drm_device *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -780,6 +788,8 @@ struct drm_nouveau_private {</div><div class='ctx'> 	struct nouveau_vm *chan_vm;</div><div class='ctx'> </div><div class='ctx'> 	struct nvbios vbios;</div><div class='add'>+	u8 *mxms;</div><div class='add'>+	struct list_head i2c_ports;</div><div class='ctx'> </div><div class='ctx'> 	struct nv04_mode_state mode_reg;</div><div class='ctx'> 	struct nv04_mode_state saved_reg;</div><div class='hunk'>@@ -850,6 +860,7 @@ extern char *nouveau_perflvl;</div><div class='ctx'> extern int nouveau_perflvl_wr;</div><div class='ctx'> extern int nouveau_msi;</div><div class='ctx'> extern int nouveau_ctxfw;</div><div class='add'>+extern int nouveau_mxmdcb;</div><div class='ctx'> </div><div class='ctx'> extern int nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state);</div><div class='ctx'> extern int nouveau_pci_resume(struct pci_dev *pdev);</div><div class='hunk'>@@ -1000,7 +1011,10 @@ extern int nouveau_sgdma_init(struct drm_device *);</div><div class='ctx'> extern void nouveau_sgdma_takedown(struct drm_device *);</div><div class='ctx'> extern uint32_t nouveau_sgdma_get_physical(struct drm_device *,</div><div class='ctx'> 					   uint32_t offset);</div><div class='del'>-extern struct ttm_backend *nouveau_sgdma_init_ttm(struct drm_device *);</div><div class='add'>+extern struct ttm_tt *nouveau_sgdma_create_ttm(struct ttm_bo_device *bdev,</div><div class='add'>+					       unsigned long size,</div><div class='add'>+					       uint32_t page_flags,</div><div class='add'>+					       struct page *dummy_read_page);</div><div class='ctx'> </div><div class='ctx'> /* nouveau_debugfs.c */</div><div class='ctx'> #if defined(CONFIG_DRM_NOUVEAU_DEBUG)</div><div class='hunk'>@@ -1041,12 +1055,14 @@ extern int  nouveau_dma_wait(struct nouveau_channel *, int slots, int size);</div><div class='ctx'> #if defined(CONFIG_ACPI)</div><div class='ctx'> void nouveau_register_dsm_handler(void);</div><div class='ctx'> void nouveau_unregister_dsm_handler(void);</div><div class='add'>+void nouveau_switcheroo_optimus_dsm(void);</div><div class='ctx'> int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);</div><div class='ctx'> bool nouveau_acpi_rom_supported(struct pci_dev *pdev);</div><div class='ctx'> int nouveau_acpi_edid(struct drm_device *, struct drm_connector *);</div><div class='ctx'> #else</div><div class='ctx'> static inline void nouveau_register_dsm_handler(void) {}</div><div class='ctx'> static inline void nouveau_unregister_dsm_handler(void) {}</div><div class='add'>+static inline void nouveau_switcheroo_optimus_dsm(void) {}</div><div class='ctx'> static inline bool nouveau_acpi_rom_supported(struct pci_dev *pdev) { return false; }</div><div class='ctx'> static inline int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len) { return -EINVAL; }</div><div class='ctx'> static inline int nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector) { return -EINVAL; }</div><div class='hunk'>@@ -1072,8 +1088,6 @@ extern int nouveau_run_vbios_init(struct drm_device *);</div><div class='ctx'> extern void nouveau_bios_run_init_table(struct drm_device *, uint16_t table,</div><div class='ctx'> 					struct dcb_entry *, int crtc);</div><div class='ctx'> extern void nouveau_bios_init_exec(struct drm_device *, uint16_t table);</div><div class='del'>-extern struct dcb_gpio_entry *nouveau_bios_gpio_entry(struct drm_device *,</div><div class='del'>-						      enum dcb_gpio_tag);</div><div class='ctx'> extern struct dcb_connector_table_entry *</div><div class='ctx'> nouveau_bios_connector_entry(struct drm_device *, int index);</div><div class='ctx'> extern u32 get_pll_register(struct drm_device *, enum pll_types);</div><div class='hunk'>@@ -1091,11 +1105,18 @@ extern int call_lvds_script(struct drm_device *, struct dcb_entry *, int head,</div><div class='ctx'> 			    enum LVDS_script, int pxclk);</div><div class='ctx'> bool bios_encoder_match(struct dcb_entry *, u32 hash);</div><div class='ctx'> </div><div class='add'>+/* nouveau_mxm.c */</div><div class='add'>+int  nouveau_mxm_init(struct drm_device *dev);</div><div class='add'>+void nouveau_mxm_fini(struct drm_device *dev);</div><div class='add'>+</div><div class='ctx'> /* nouveau_ttm.c */</div><div class='ctx'> int nouveau_ttm_global_init(struct drm_nouveau_private *);</div><div class='ctx'> void nouveau_ttm_global_release(struct drm_nouveau_private *);</div><div class='ctx'> int nouveau_ttm_mmap(struct file *, struct vm_area_struct *);</div><div class='ctx'> </div><div class='add'>+/* nouveau_hdmi.c */</div><div class='add'>+void nouveau_hdmi_mode_set(struct drm_encoder *, struct drm_display_mode *);</div><div class='add'>+</div><div class='ctx'> /* nouveau_dp.c */</div><div class='ctx'> int nouveau_dp_auxch(struct nouveau_i2c_chan *auxch, int cmd, int addr,</div><div class='ctx'> 		     uint8_t *data, int data_nr);</div><div class='hunk'>@@ -1222,6 +1243,9 @@ extern int  nvc0_graph_isr_chid(struct drm_device *dev, u64 inst);</div><div class='ctx'> /* nv84_crypt.c */</div><div class='ctx'> extern int  nv84_crypt_create(struct drm_device *);</div><div class='ctx'> </div><div class='add'>+/* nv98_crypt.c */</div><div class='add'>+extern int  nv98_crypt_create(struct drm_device *dev);</div><div class='add'>+</div><div class='ctx'> /* nva3_copy.c */</div><div class='ctx'> extern int  nva3_copy_create(struct drm_device *dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1234,6 +1258,17 @@ extern int  nv31_mpeg_create(struct drm_device *dev);</div><div class='ctx'> /* nv50_mpeg.c */</div><div class='ctx'> extern int  nv50_mpeg_create(struct drm_device *dev);</div><div class='ctx'> </div><div class='add'>+/* nv84_bsp.c */</div><div class='add'>+/* nv98_bsp.c */</div><div class='add'>+extern int  nv84_bsp_create(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+/* nv84_vp.c */</div><div class='add'>+/* nv98_vp.c */</div><div class='add'>+extern int  nv84_vp_create(struct drm_device *dev);</div><div class='add'>+</div><div class='add'>+/* nv98_ppp.c */</div><div class='add'>+extern int  nv98_ppp_create(struct drm_device *dev);</div><div class='add'>+</div><div class='ctx'> /* nv04_instmem.c */</div><div class='ctx'> extern int  nv04_instmem_init(struct drm_device *);</div><div class='ctx'> extern void nv04_instmem_takedown(struct drm_device *);</div><div class='hunk'>@@ -1311,13 +1346,19 @@ extern int nv17_tv_create(struct drm_connector *, struct dcb_entry *);</div><div class='ctx'> extern int nv04_display_early_init(struct drm_device *);</div><div class='ctx'> extern void nv04_display_late_takedown(struct drm_device *);</div><div class='ctx'> extern int nv04_display_create(struct drm_device *);</div><div class='del'>-extern int nv04_display_init(struct drm_device *);</div><div class='ctx'> extern void nv04_display_destroy(struct drm_device *);</div><div class='add'>+extern int nv04_display_init(struct drm_device *);</div><div class='add'>+extern void nv04_display_fini(struct drm_device *);</div><div class='ctx'> </div><div class='ctx'> /* nvd0_display.c */</div><div class='ctx'> extern int nvd0_display_create(struct drm_device *);</div><div class='del'>-extern int nvd0_display_init(struct drm_device *);</div><div class='ctx'> extern void nvd0_display_destroy(struct drm_device *);</div><div class='add'>+extern int nvd0_display_init(struct drm_device *);</div><div class='add'>+extern void nvd0_display_fini(struct drm_device *);</div><div class='add'>+struct nouveau_bo *nvd0_display_crtc_sema(struct drm_device *, int crtc);</div><div class='add'>+void nvd0_display_flip_stop(struct drm_crtc *);</div><div class='add'>+int nvd0_display_flip_next(struct drm_crtc *, struct drm_framebuffer *,</div><div class='add'>+			   struct nouveau_channel *, u32 swap_interval);</div><div class='ctx'> </div><div class='ctx'> /* nv04_crtc.c */</div><div class='ctx'> extern int nv04_crtc_create(struct drm_device *, int index);</div><div class='hunk'>@@ -1412,6 +1453,10 @@ extern int nouveau_gem_ioctl_info(struct drm_device *, void *,</div><div class='ctx'> 				  struct drm_file *);</div><div class='ctx'> </div><div class='ctx'> /* nouveau_display.c */</div><div class='add'>+int nouveau_display_create(struct drm_device *dev);</div><div class='add'>+void nouveau_display_destroy(struct drm_device *dev);</div><div class='add'>+int nouveau_display_init(struct drm_device *dev);</div><div class='add'>+void nouveau_display_fini(struct drm_device *dev);</div><div class='ctx'> int nouveau_vblank_enable(struct drm_device *dev, int crtc);</div><div class='ctx'> void nouveau_vblank_disable(struct drm_device *dev, int crtc);</div><div class='ctx'> int nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,</div><div class='hunk'>@@ -1426,23 +1471,22 @@ int nouveau_display_dumb_destroy(struct drm_file *, struct drm_device *,</div><div class='ctx'> 				 uint32_t handle);</div><div class='ctx'> </div><div class='ctx'> /* nv10_gpio.c */</div><div class='del'>-int nv10_gpio_get(struct drm_device *dev, enum dcb_gpio_tag tag);</div><div class='del'>-int nv10_gpio_set(struct drm_device *dev, enum dcb_gpio_tag tag, int state);</div><div class='add'>+int nv10_gpio_init(struct drm_device *dev);</div><div class='add'>+void nv10_gpio_fini(struct drm_device *dev);</div><div class='add'>+int nv10_gpio_drive(struct drm_device *dev, int line, int dir, int out);</div><div class='add'>+int nv10_gpio_sense(struct drm_device *dev, int line);</div><div class='add'>+void nv10_gpio_irq_enable(struct drm_device *, int line, bool on);</div><div class='ctx'> </div><div class='ctx'> /* nv50_gpio.c */</div><div class='ctx'> int nv50_gpio_init(struct drm_device *dev);</div><div class='ctx'> void nv50_gpio_fini(struct drm_device *dev);</div><div class='del'>-int nv50_gpio_get(struct drm_device *dev, enum dcb_gpio_tag tag);</div><div class='del'>-int nv50_gpio_set(struct drm_device *dev, enum dcb_gpio_tag tag, int state);</div><div class='del'>-int nvd0_gpio_get(struct drm_device *dev, enum dcb_gpio_tag tag);</div><div class='del'>-int nvd0_gpio_set(struct drm_device *dev, enum dcb_gpio_tag tag, int state);</div><div class='del'>-int  nv50_gpio_irq_register(struct drm_device *, enum dcb_gpio_tag,</div><div class='del'>-			    void (*)(void *, int), void *);</div><div class='del'>-void nv50_gpio_irq_unregister(struct drm_device *, enum dcb_gpio_tag,</div><div class='del'>-			      void (*)(void *, int), void *);</div><div class='del'>-bool nv50_gpio_irq_enable(struct drm_device *, enum dcb_gpio_tag, bool on);</div><div class='del'>-</div><div class='del'>-/* nv50_calc. */</div><div class='add'>+int nv50_gpio_drive(struct drm_device *dev, int line, int dir, int out);</div><div class='add'>+int nv50_gpio_sense(struct drm_device *dev, int line);</div><div class='add'>+void nv50_gpio_irq_enable(struct drm_device *, int line, bool on);</div><div class='add'>+int nvd0_gpio_drive(struct drm_device *dev, int line, int dir, int out);</div><div class='add'>+int nvd0_gpio_sense(struct drm_device *dev, int line);</div><div class='add'>+</div><div class='add'>+/* nv50_calc.c */</div><div class='ctx'> int nv50_calc_pll(struct drm_device *, struct pll_lims *, int clk,</div><div class='ctx'> 		  int *N1, int *M1, int *N2, int *M2, int *P);</div><div class='ctx'> int nva3_calc_pll(struct drm_device *, struct pll_lims *,</div><div class='hunk'>@@ -1565,6 +1609,13 @@ extern void nv_wo32(struct nouveau_gpuobj *, u32 offset, u32 val);</div><div class='ctx'> #define NV_TRACEWARN(d, fmt, arg...) NV_PRINTK(KERN_NOTICE, d, fmt, ##arg)</div><div class='ctx'> #define NV_TRACE(d, fmt, arg...) NV_PRINTK(KERN_INFO, d, fmt, ##arg)</div><div class='ctx'> #define NV_WARN(d, fmt, arg...) NV_PRINTK(KERN_WARNING, d, fmt, ##arg)</div><div class='add'>+#define NV_WARNONCE(d, fmt, arg...) do {                                       \</div><div class='add'>+	static int _warned = 0;                                                \</div><div class='add'>+	if (!_warned) {                                                        \</div><div class='add'>+		NV_WARN(d, fmt, ##arg);                                        \</div><div class='add'>+		_warned = 1;                                                   \</div><div class='add'>+	}                                                                      \</div><div class='add'>+} while(0)</div><div class='ctx'> </div><div class='ctx'> /* nouveau_reg_debug bitmask */</div><div class='ctx'> enum {</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_fb.h b/drivers/gpu/drm/nouveau/nouveau_fb.h<br/>index 95c843e684bb..f3fb649fe454 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_fb.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_fb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_fb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_fb.h</a></div><div class='hunk'>@@ -42,8 +42,6 @@ nouveau_framebuffer(struct drm_framebuffer *fb)</div><div class='ctx'> 	return container_of(fb, struct nouveau_framebuffer, base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern const struct drm_mode_config_funcs nouveau_mode_config_funcs;</div><div class='del'>-</div><div class='ctx'> int nouveau_framebuffer_init(struct drm_device *dev, struct nouveau_framebuffer *nouveau_fb,</div><div class='del'>-			     struct drm_mode_fb_cmd *mode_cmd, struct nouveau_bo *nvbo);</div><div class='add'>+			     struct drm_mode_fb_cmd2 *mode_cmd, struct nouveau_bo *nvbo);</div><div class='ctx'> #endif /* __NOUVEAU_FB_H__ */</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c<br/>index 3a4cc32b9e44..9892218d7452 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_fbcon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_fbcon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_fbcon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_fbcon.c</a></div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/vga_switcheroo.h&gt;</div><div class='add'>+#include &lt;linux/console.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> #include "drm.h"</div><div class='hunk'>@@ -281,7 +282,7 @@ nouveau_fbcon_create(struct nouveau_fbdev *nfbdev,</div><div class='ctx'> 	struct nouveau_framebuffer *nouveau_fb;</div><div class='ctx'> 	struct nouveau_channel *chan;</div><div class='ctx'> 	struct nouveau_bo *nvbo;</div><div class='del'>-	struct drm_mode_fb_cmd mode_cmd;</div><div class='add'>+	struct drm_mode_fb_cmd2 mode_cmd;</div><div class='ctx'> 	struct pci_dev *pdev = dev-&gt;pdev;</div><div class='ctx'> 	struct device *device = &amp;pdev-&gt;dev;</div><div class='ctx'> 	int size, ret;</div><div class='hunk'>@@ -289,12 +290,13 @@ nouveau_fbcon_create(struct nouveau_fbdev *nfbdev,</div><div class='ctx'> 	mode_cmd.width = sizes-&gt;surface_width;</div><div class='ctx'> 	mode_cmd.height = sizes-&gt;surface_height;</div><div class='ctx'> </div><div class='del'>-	mode_cmd.bpp = sizes-&gt;surface_bpp;</div><div class='del'>-	mode_cmd.pitch = mode_cmd.width * (mode_cmd.bpp &gt;&gt; 3);</div><div class='del'>-	mode_cmd.pitch = roundup(mode_cmd.pitch, 256);</div><div class='del'>-	mode_cmd.depth = sizes-&gt;surface_depth;</div><div class='add'>+	mode_cmd.pitches[0] = mode_cmd.width * (sizes-&gt;surface_bpp &gt;&gt; 3);</div><div class='add'>+	mode_cmd.pitches[0] = roundup(mode_cmd.pitches[0], 256);</div><div class='ctx'> </div><div class='del'>-	size = mode_cmd.pitch * mode_cmd.height;</div><div class='add'>+	mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes-&gt;surface_bpp,</div><div class='add'>+							  sizes-&gt;surface_depth);</div><div class='add'>+</div><div class='add'>+	size = mode_cmd.pitches[0] * mode_cmd.height;</div><div class='ctx'> 	size = roundup(size, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	ret = nouveau_gem_new(dev, size, 0, NOUVEAU_GEM_DOMAIN_VRAM,</div><div class='hunk'>@@ -369,7 +371,7 @@ nouveau_fbcon_create(struct nouveau_fbdev *nfbdev,</div><div class='ctx'> 	info-&gt;screen_base = nvbo_kmap_obj_iovirtual(nouveau_fb-&gt;nvbo);</div><div class='ctx'> 	info-&gt;screen_size = size;</div><div class='ctx'> </div><div class='del'>-	drm_fb_helper_fill_fix(info, fb-&gt;pitch, fb-&gt;depth);</div><div class='add'>+	drm_fb_helper_fill_fix(info, fb-&gt;pitches[0], fb-&gt;depth);</div><div class='ctx'> 	drm_fb_helper_fill_var(info, &amp;nfbdev-&gt;helper, sizes-&gt;fb_width, sizes-&gt;fb_height);</div><div class='ctx'> </div><div class='ctx'> 	/* Set aperture base/size for vesafb takeover */</div><div class='hunk'>@@ -547,7 +549,13 @@ void nouveau_fbcon_restore_accel(struct drm_device *dev)</div><div class='ctx'> void nouveau_fbcon_set_suspend(struct drm_device *dev, int state)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	console_lock();</div><div class='add'>+	if (state == 0)</div><div class='add'>+		nouveau_fbcon_save_disable_accel(dev);</div><div class='ctx'> 	fb_set_suspend(dev_priv-&gt;nfbdev-&gt;helper.fbdev, state);</div><div class='add'>+	if (state == 1)</div><div class='add'>+		nouveau_fbcon_restore_accel(dev);</div><div class='add'>+	console_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void nouveau_fbcon_zfill_all(struct drm_device *dev)</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_gpio.c b/drivers/gpu/drm/nouveau/nouveau_gpio.c<br/>new file mode 100644<br/>index 000000000000..a580cc62337a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_gpio.c</a></div><div class='hunk'>@@ -0,0 +1,400 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2011 Red Hat Inc.</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice shall be included in</div><div class='add'>+ * all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR</div><div class='add'>+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,</div><div class='add'>+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ * OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors: Ben Skeggs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "nouveau_drv.h"</div><div class='add'>+#include "nouveau_i2c.h"</div><div class='add'>+#include "nouveau_gpio.h"</div><div class='add'>+</div><div class='add'>+static u8 *</div><div class='add'>+dcb_gpio_table(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 *dcb = dcb_table(dev);</div><div class='add'>+	if (dcb) {</div><div class='add'>+		if (dcb[0] &gt;= 0x30 &amp;&amp; dcb[1] &gt;= 0x0c)</div><div class='add'>+			return ROMPTR(dev, dcb[0x0a]);</div><div class='add'>+		if (dcb[0] &gt;= 0x22 &amp;&amp; dcb[-1] &gt;= 0x13)</div><div class='add'>+			return ROMPTR(dev, dcb[-15]);</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *</div><div class='add'>+dcb_gpio_entry(struct drm_device *dev, int idx, int ent, u8 *version)</div><div class='add'>+{</div><div class='add'>+	u8 *table = dcb_gpio_table(dev);</div><div class='add'>+	if (table) {</div><div class='add'>+		*version = table[0];</div><div class='add'>+		if (*version &lt; 0x30 &amp;&amp; ent &lt; table[2])</div><div class='add'>+			return table + 3 + (ent * table[1]);</div><div class='add'>+		else if (ent &lt; table[2])</div><div class='add'>+			return table + table[1] + (ent * table[3]);</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nouveau_gpio_drive(struct drm_device *dev, int idx, int line, int dir, int out)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='add'>+</div><div class='add'>+	return pgpio-&gt;drive ? pgpio-&gt;drive(dev, line, dir, out) : -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nouveau_gpio_sense(struct drm_device *dev, int idx, int line)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='add'>+</div><div class='add'>+	return pgpio-&gt;sense ? pgpio-&gt;sense(dev, line) : -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nouveau_gpio_find(struct drm_device *dev, int idx, u8 func, u8 line,</div><div class='add'>+		  struct gpio_func *gpio)</div><div class='add'>+{</div><div class='add'>+	u8 *table, *entry, version;</div><div class='add'>+	int i = -1;</div><div class='add'>+</div><div class='add'>+	if (line == 0xff &amp;&amp; func == 0xff)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	while ((entry = dcb_gpio_entry(dev, idx, ++i, &amp;version))) {</div><div class='add'>+		if (version &lt; 0x40) {</div><div class='add'>+			u16 data = ROM16(entry[0]);</div><div class='add'>+			*gpio = (struct gpio_func) {</div><div class='add'>+				.line = (data &amp; 0x001f) &gt;&gt; 0,</div><div class='add'>+				.func = (data &amp; 0x07e0) &gt;&gt; 5,</div><div class='add'>+				.log[0] = (data &amp; 0x1800) &gt;&gt; 11,</div><div class='add'>+				.log[1] = (data &amp; 0x6000) &gt;&gt; 13,</div><div class='add'>+			};</div><div class='add'>+		} else</div><div class='add'>+		if (version &lt; 0x41) {</div><div class='add'>+			*gpio = (struct gpio_func) {</div><div class='add'>+				.line = entry[0] &amp; 0x1f,</div><div class='add'>+				.func = entry[1],</div><div class='add'>+				.log[0] = (entry[3] &amp; 0x18) &gt;&gt; 3,</div><div class='add'>+				.log[1] = (entry[3] &amp; 0x60) &gt;&gt; 5,</div><div class='add'>+			};</div><div class='add'>+		} else {</div><div class='add'>+			*gpio = (struct gpio_func) {</div><div class='add'>+				.line = entry[0] &amp; 0x3f,</div><div class='add'>+				.func = entry[1],</div><div class='add'>+				.log[0] = (entry[4] &amp; 0x30) &gt;&gt; 4,</div><div class='add'>+				.log[1] = (entry[4] &amp; 0xc0) &gt;&gt; 6,</div><div class='add'>+			};</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((line == 0xff || line == gpio-&gt;line) &amp;&amp;</div><div class='add'>+		    (func == 0xff || func == gpio-&gt;func))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* DCB 2.2, fixed TVDAC GPIO data */</div><div class='add'>+	if ((table = dcb_table(dev)) &amp;&amp; table[0] &gt;= 0x22) {</div><div class='add'>+		if (func == DCB_GPIO_TVDAC0) {</div><div class='add'>+			*gpio = (struct gpio_func) {</div><div class='add'>+				.func = DCB_GPIO_TVDAC0,</div><div class='add'>+				.line = table[-4] &gt;&gt; 4,</div><div class='add'>+				.log[0] = !!(table[-5] &amp; 2),</div><div class='add'>+				.log[1] =  !(table[-5] &amp; 2),</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'>+	/* Apple iMac G4 NV18 */</div><div class='add'>+	if (nv_match_device(dev, 0x0189, 0x10de, 0x0010)) {</div><div class='add'>+		if (func == DCB_GPIO_TVDAC0) {</div><div class='add'>+			*gpio = (struct gpio_func) {</div><div class='add'>+				.func = DCB_GPIO_TVDAC0,</div><div class='add'>+				.line = 4,</div><div class='add'>+				.log[0] = 0,</div><div class='add'>+				.log[1] = 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'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nouveau_gpio_set(struct drm_device *dev, int idx, u8 tag, u8 line, int state)</div><div class='add'>+{</div><div class='add'>+	struct gpio_func gpio;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = nouveau_gpio_find(dev, idx, tag, line, &amp;gpio);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		int dir = !!(gpio.log[state] &amp; 0x02);</div><div class='add'>+		int out = !!(gpio.log[state] &amp; 0x01);</div><div class='add'>+		ret = nouveau_gpio_drive(dev, idx, gpio.line, dir, out);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nouveau_gpio_get(struct drm_device *dev, int idx, u8 tag, u8 line)</div><div class='add'>+{</div><div class='add'>+	struct gpio_func gpio;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = nouveau_gpio_find(dev, idx, tag, line, &amp;gpio);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		ret = nouveau_gpio_sense(dev, idx, gpio.line);</div><div class='add'>+		if (ret &gt;= 0)</div><div class='add'>+			ret = (ret == (gpio.log[1] &amp; 1));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nouveau_gpio_irq(struct drm_device *dev, int idx, u8 tag, u8 line, bool on)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='add'>+	struct gpio_func gpio;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = nouveau_gpio_find(dev, idx, tag, line, &amp;gpio);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		if (idx == 0 &amp;&amp; pgpio-&gt;irq_enable)</div><div class='add'>+			pgpio-&gt;irq_enable(dev, gpio.line, on);</div><div class='add'>+		else</div><div class='add'>+			ret = -ENODEV;</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'>+struct gpio_isr {</div><div class='add'>+	struct drm_device *dev;</div><div class='add'>+	struct list_head head;</div><div class='add'>+	struct work_struct work;</div><div class='add'>+	int idx;</div><div class='add'>+	struct gpio_func func;</div><div class='add'>+	void (*handler)(void *, int);</div><div class='add'>+	void *data;</div><div class='add'>+	bool inhibit;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nouveau_gpio_isr_bh(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct gpio_isr *isr = container_of(work, struct gpio_isr, work);</div><div class='add'>+	struct drm_device *dev = isr-&gt;dev;</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int state;</div><div class='add'>+</div><div class='add'>+	state = nouveau_gpio_get(dev, isr-&gt;idx, isr-&gt;func.func, isr-&gt;func.line);</div><div class='add'>+	if (state &gt;= 0)</div><div class='add'>+		isr-&gt;handler(isr-&gt;data, state);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pgpio-&gt;lock, flags);</div><div class='add'>+	isr-&gt;inhibit = false;</div><div class='add'>+	spin_unlock_irqrestore(&amp;pgpio-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+nouveau_gpio_isr(struct drm_device *dev, int idx, u32 line_mask)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='add'>+	struct gpio_isr *isr;</div><div class='add'>+</div><div class='add'>+	if (idx != 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;pgpio-&gt;lock);</div><div class='add'>+	list_for_each_entry(isr, &amp;pgpio-&gt;isr, head) {</div><div class='add'>+		if (line_mask &amp; (1 &lt;&lt; isr-&gt;func.line)) {</div><div class='add'>+			if (isr-&gt;inhibit)</div><div class='add'>+				continue;</div><div class='add'>+			isr-&gt;inhibit = true;</div><div class='add'>+			schedule_work(&amp;isr-&gt;work);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;pgpio-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nouveau_gpio_isr_add(struct drm_device *dev, int idx, u8 tag, u8 line,</div><div class='add'>+		     void (*handler)(void *, int), void *data)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='add'>+	struct gpio_isr *isr;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	isr = kzalloc(sizeof(*isr), GFP_KERNEL);</div><div class='add'>+	if (!isr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = nouveau_gpio_find(dev, idx, tag, line, &amp;isr-&gt;func);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(isr);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;isr-&gt;work, nouveau_gpio_isr_bh);</div><div class='add'>+	isr-&gt;dev = dev;</div><div class='add'>+	isr-&gt;handler = handler;</div><div class='add'>+	isr-&gt;data = data;</div><div class='add'>+	isr-&gt;idx = idx;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pgpio-&gt;lock, flags);</div><div class='add'>+	list_add(&amp;isr-&gt;head, &amp;pgpio-&gt;isr);</div><div class='add'>+	spin_unlock_irqrestore(&amp;pgpio-&gt;lock, flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+nouveau_gpio_isr_del(struct drm_device *dev, int idx, u8 tag, u8 line,</div><div class='add'>+		     void (*handler)(void *, int), void *data)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='add'>+	struct gpio_isr *isr, *tmp;</div><div class='add'>+	struct gpio_func func;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	LIST_HEAD(tofree);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = nouveau_gpio_find(dev, idx, tag, line, &amp;func);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		spin_lock_irqsave(&amp;pgpio-&gt;lock, flags);</div><div class='add'>+		list_for_each_entry_safe(isr, tmp, &amp;pgpio-&gt;isr, head) {</div><div class='add'>+			if (memcmp(&amp;isr-&gt;func, &amp;func, sizeof(func)) ||</div><div class='add'>+			    isr-&gt;idx != idx ||</div><div class='add'>+			    isr-&gt;handler != handler || isr-&gt;data != data)</div><div class='add'>+				continue;</div><div class='add'>+			list_move(&amp;isr-&gt;head, &amp;tofree);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;pgpio-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		list_for_each_entry_safe(isr, tmp, &amp;tofree, head) {</div><div class='add'>+			flush_work_sync(&amp;isr-&gt;work);</div><div class='add'>+			kfree(isr);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nouveau_gpio_create(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;pgpio-&gt;isr);</div><div class='add'>+	spin_lock_init(&amp;pgpio-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return nouveau_gpio_init(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+nouveau_gpio_destroy(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='add'>+</div><div class='add'>+	nouveau_gpio_fini(dev);</div><div class='add'>+	BUG_ON(!list_empty(&amp;pgpio-&gt;isr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nouveau_gpio_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (pgpio-&gt;init)</div><div class='add'>+		ret = pgpio-&gt;init(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+nouveau_gpio_fini(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='add'>+</div><div class='add'>+	if (pgpio-&gt;fini)</div><div class='add'>+		pgpio-&gt;fini(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+nouveau_gpio_reset(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u8 *entry, version;</div><div class='add'>+	int ent = -1;</div><div class='add'>+</div><div class='add'>+	while ((entry = dcb_gpio_entry(dev, 0, ++ent, &amp;version))) {</div><div class='add'>+		u8 func = 0xff, line, defs, unk0, unk1;</div><div class='add'>+		if (version &gt;= 0x41) {</div><div class='add'>+			defs = !!(entry[0] &amp; 0x80);</div><div class='add'>+			line = entry[0] &amp; 0x3f;</div><div class='add'>+			func = entry[1];</div><div class='add'>+			unk0 = entry[2];</div><div class='add'>+			unk1 = entry[3] &amp; 0x1f;</div><div class='add'>+		} else</div><div class='add'>+		if (version &gt;= 0x40) {</div><div class='add'>+			line = entry[0] &amp; 0x1f;</div><div class='add'>+			func = entry[1];</div><div class='add'>+			defs = !!(entry[3] &amp; 0x01);</div><div class='add'>+			unk0 = !!(entry[3] &amp; 0x02);</div><div class='add'>+			unk1 = !!(entry[3] &amp; 0x04);</div><div class='add'>+		} else {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (func == 0xff)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		nouveau_gpio_func_set(dev, func, defs);</div><div class='add'>+</div><div class='add'>+		if (dev_priv-&gt;card_type &gt;= NV_D0) {</div><div class='add'>+			nv_mask(dev, 0x00d610 + (line * 4), 0xff, unk0);</div><div class='add'>+			if (unk1--)</div><div class='add'>+				nv_mask(dev, 0x00d640 + (unk1 * 4), 0xff, line);</div><div class='add'>+		} else</div><div class='add'>+		if (dev_priv-&gt;card_type &gt;= NV_50) {</div><div class='add'>+			static const u32 regs[] = { 0xe100, 0xe28c };</div><div class='add'>+			u32 val = (unk1 &lt;&lt; 16) | unk0;</div><div class='add'>+			u32 reg = regs[line &gt;&gt; 4]; line &amp;= 0x0f;</div><div class='add'>+</div><div class='add'>+			nv_mask(dev, reg, 0x00010001 &lt;&lt; line, val &lt;&lt; line);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_gpio.h b/drivers/gpu/drm/nouveau/nouveau_gpio.h<br/>new file mode 100644<br/>index 000000000000..64c5cb077ace<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_gpio.h</a></div><div class='hunk'>@@ -0,0 +1,71 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2011 Red Hat Inc.</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice shall be included in</div><div class='add'>+ * all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR</div><div class='add'>+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,</div><div class='add'>+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ * OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __NOUVEAU_GPIO_H__</div><div class='add'>+#define __NOUVEAU_GPIO_H__</div><div class='add'>+</div><div class='add'>+struct gpio_func {</div><div class='add'>+	u8 func;</div><div class='add'>+	u8 line;</div><div class='add'>+	u8 log[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* nouveau_gpio.c */</div><div class='add'>+int  nouveau_gpio_create(struct drm_device *);</div><div class='add'>+void nouveau_gpio_destroy(struct drm_device *);</div><div class='add'>+int  nouveau_gpio_init(struct drm_device *);</div><div class='add'>+void nouveau_gpio_fini(struct drm_device *);</div><div class='add'>+void nouveau_gpio_reset(struct drm_device *);</div><div class='add'>+int  nouveau_gpio_drive(struct drm_device *, int idx, int line,</div><div class='add'>+			int dir, int out);</div><div class='add'>+int  nouveau_gpio_sense(struct drm_device *, int idx, int line);</div><div class='add'>+int  nouveau_gpio_find(struct drm_device *, int idx, u8 tag, u8 line,</div><div class='add'>+		       struct gpio_func *);</div><div class='add'>+int  nouveau_gpio_set(struct drm_device *, int idx, u8 tag, u8 line, int state);</div><div class='add'>+int  nouveau_gpio_get(struct drm_device *, int idx, u8 tag, u8 line);</div><div class='add'>+int  nouveau_gpio_irq(struct drm_device *, int idx, u8 tag, u8 line, bool on);</div><div class='add'>+void nouveau_gpio_isr(struct drm_device *, int idx, u32 mask);</div><div class='add'>+int  nouveau_gpio_isr_add(struct drm_device *, int idx, u8 tag, u8 line,</div><div class='add'>+			  void (*)(void *, int state), void *data);</div><div class='add'>+void nouveau_gpio_isr_del(struct drm_device *, int idx, u8 tag, u8 line,</div><div class='add'>+			  void (*)(void *, int state), void *data);</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+nouveau_gpio_func_valid(struct drm_device *dev, u8 tag)</div><div class='add'>+{</div><div class='add'>+	struct gpio_func func;</div><div class='add'>+	return (nouveau_gpio_find(dev, 0, tag, 0xff, &amp;func)) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+nouveau_gpio_func_set(struct drm_device *dev, u8 tag, int state)</div><div class='add'>+{</div><div class='add'>+	return nouveau_gpio_set(dev, 0, tag, 0xff, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+nouveau_gpio_func_get(struct drm_device *dev, u8 tag)</div><div class='add'>+{</div><div class='add'>+	return nouveau_gpio_get(dev, 0, tag, 0xff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_hdmi.c b/drivers/gpu/drm/nouveau/nouveau_hdmi.c<br/>new file mode 100644<br/>index 000000000000..59ea1c14eca0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_hdmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_hdmi.c</a></div><div class='hunk'>@@ -0,0 +1,258 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2011 Red Hat Inc.</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice shall be included in</div><div class='add'>+ * all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR</div><div class='add'>+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,</div><div class='add'>+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ * OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors: Ben Skeggs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "nouveau_drv.h"</div><div class='add'>+#include "nouveau_connector.h"</div><div class='add'>+#include "nouveau_encoder.h"</div><div class='add'>+#include "nouveau_crtc.h"</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+hdmi_sor(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = encoder-&gt;dev-&gt;dev_private;</div><div class='add'>+	if (dev_priv-&gt;chipset &lt; 0xa3)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+hdmi_base(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);</div><div class='add'>+	struct nouveau_crtc *nv_crtc = nouveau_crtc(nv_encoder-&gt;crtc);</div><div class='add'>+	if (!hdmi_sor(encoder))</div><div class='add'>+		return 0x616500 + (nv_crtc-&gt;index * 0x800);</div><div class='add'>+	return 0x61c500 + (nv_encoder-&gt;or * 0x800);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+hdmi_wr32(struct drm_encoder *encoder, u32 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	nv_wr32(encoder-&gt;dev, hdmi_base(encoder) + reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+hdmi_rd32(struct drm_encoder *encoder, u32 reg)</div><div class='add'>+{</div><div class='add'>+	return nv_rd32(encoder-&gt;dev, hdmi_base(encoder) + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+hdmi_mask(struct drm_encoder *encoder, u32 reg, u32 mask, u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 tmp = hdmi_rd32(encoder, reg);</div><div class='add'>+	hdmi_wr32(encoder, reg, (tmp &amp; ~mask) | val);</div><div class='add'>+	return tmp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nouveau_audio_disconnect(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	u32 or = nv_encoder-&gt;or * 0x800;</div><div class='add'>+</div><div class='add'>+	if (hdmi_sor(encoder)) {</div><div class='add'>+		nv_mask(dev, 0x61c448 + or, 0x00000003, 0x00000000);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nouveau_audio_mode_set(struct drm_encoder *encoder,</div><div class='add'>+		       struct drm_display_mode *mode)</div><div class='add'>+{</div><div class='add'>+	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);</div><div class='add'>+	struct nouveau_connector *nv_connector;</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	u32 or = nv_encoder-&gt;or * 0x800;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	nv_connector = nouveau_encoder_connector_get(nv_encoder);</div><div class='add'>+	if (!drm_detect_monitor_audio(nv_connector-&gt;edid)) {</div><div class='add'>+		nouveau_audio_disconnect(encoder);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdmi_sor(encoder)) {</div><div class='add'>+		nv_mask(dev, 0x61c448 + or, 0x00000001, 0x00000001);</div><div class='add'>+</div><div class='add'>+		drm_edid_to_eld(&amp;nv_connector-&gt;base, nv_connector-&gt;edid);</div><div class='add'>+		if (nv_connector-&gt;base.eld[0]) {</div><div class='add'>+			u8 *eld = nv_connector-&gt;base.eld;</div><div class='add'>+			for (i = 0; i &lt; eld[2] * 4; i++)</div><div class='add'>+				nv_wr32(dev, 0x61c440 + or, (i &lt;&lt; 8) | eld[i]);</div><div class='add'>+			for (i = eld[2] * 4; i &lt; 0x60; i++)</div><div class='add'>+				nv_wr32(dev, 0x61c440 + or, (i &lt;&lt; 8) | 0x00);</div><div class='add'>+			nv_mask(dev, 0x61c448 + or, 0x00000002, 0x00000002);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nouveau_hdmi_infoframe(struct drm_encoder *encoder, u32 ctrl, u8 *frame)</div><div class='add'>+{</div><div class='add'>+	/* calculate checksum for the infoframe */</div><div class='add'>+	u8 sum = 0, i;</div><div class='add'>+	for (i = 0; i &lt; frame[2]; i++)</div><div class='add'>+		sum += frame[i];</div><div class='add'>+	frame[3] = 256 - sum;</div><div class='add'>+</div><div class='add'>+	/* disable infoframe, and write header */</div><div class='add'>+	hdmi_mask(encoder, ctrl + 0x00, 0x00000001, 0x00000000);</div><div class='add'>+	hdmi_wr32(encoder, ctrl + 0x08, *(u32 *)frame &amp; 0xffffff);</div><div class='add'>+</div><div class='add'>+	/* register scans tell me the audio infoframe has only one set of</div><div class='add'>+	 * subpack regs, according to tegra (gee nvidia, it'd be nice if we</div><div class='add'>+	 * could get those docs too!), the hdmi block pads out the rest of</div><div class='add'>+	 * the packet on its own.</div><div class='add'>+	 */</div><div class='add'>+	if (ctrl == 0x020)</div><div class='add'>+		frame[2] = 6;</div><div class='add'>+</div><div class='add'>+	/* write out checksum and data, weird weird 7 byte register pairs */</div><div class='add'>+	for (i = 0; i &lt; frame[2] + 1; i += 7) {</div><div class='add'>+		u32 rsubpack = ctrl + 0x0c + ((i / 7) * 8);</div><div class='add'>+		u32 *subpack = (u32 *)&amp;frame[3 + i];</div><div class='add'>+		hdmi_wr32(encoder, rsubpack + 0, subpack[0]);</div><div class='add'>+		hdmi_wr32(encoder, rsubpack + 4, subpack[1] &amp; 0xffffff);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enable the infoframe */</div><div class='add'>+	hdmi_mask(encoder, ctrl, 0x00000001, 0x00000001);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nouveau_hdmi_video_infoframe(struct drm_encoder *encoder,</div><div class='add'>+			     struct drm_display_mode *mode)</div><div class='add'>+{</div><div class='add'>+	const u8 Y = 0, A = 0, B = 0, S = 0, C = 0, M = 0, R = 0;</div><div class='add'>+	const u8 ITC = 0, EC = 0, Q = 0, SC = 0, VIC = 0, PR = 0;</div><div class='add'>+	const u8 bar_top = 0, bar_bottom = 0, bar_left = 0, bar_right = 0;</div><div class='add'>+	u8 frame[20];</div><div class='add'>+</div><div class='add'>+	frame[0x00] = 0x82; /* AVI infoframe */</div><div class='add'>+	frame[0x01] = 0x02; /* version */</div><div class='add'>+	frame[0x02] = 0x0d; /* length */</div><div class='add'>+	frame[0x03] = 0x00;</div><div class='add'>+	frame[0x04] = (Y &lt;&lt; 5) | (A &lt;&lt; 4) | (B &lt;&lt; 2) | S;</div><div class='add'>+	frame[0x05] = (C &lt;&lt; 6) | (M &lt;&lt; 4) | R;</div><div class='add'>+	frame[0x06] = (ITC &lt;&lt; 7) | (EC &lt;&lt; 4) | (Q &lt;&lt; 2) | SC;</div><div class='add'>+	frame[0x07] = VIC;</div><div class='add'>+	frame[0x08] = PR;</div><div class='add'>+	frame[0x09] = bar_top &amp; 0xff;</div><div class='add'>+	frame[0x0a] = bar_top &gt;&gt; 8;</div><div class='add'>+	frame[0x0b] = bar_bottom &amp; 0xff;</div><div class='add'>+	frame[0x0c] = bar_bottom &gt;&gt; 8;</div><div class='add'>+	frame[0x0d] = bar_left &amp; 0xff;</div><div class='add'>+	frame[0x0e] = bar_left &gt;&gt; 8;</div><div class='add'>+	frame[0x0f] = bar_right &amp; 0xff;</div><div class='add'>+	frame[0x10] = bar_right &gt;&gt; 8;</div><div class='add'>+	frame[0x11] = 0x00;</div><div class='add'>+	frame[0x12] = 0x00;</div><div class='add'>+	frame[0x13] = 0x00;</div><div class='add'>+</div><div class='add'>+	nouveau_hdmi_infoframe(encoder, 0x020, frame);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nouveau_hdmi_audio_infoframe(struct drm_encoder *encoder,</div><div class='add'>+			     struct drm_display_mode *mode)</div><div class='add'>+{</div><div class='add'>+	const u8 CT = 0x00, CC = 0x01, ceaSS = 0x00, SF = 0x00, FMT = 0x00;</div><div class='add'>+	const u8 CA = 0x00, DM_INH = 0, LSV = 0x00;</div><div class='add'>+	u8 frame[12];</div><div class='add'>+</div><div class='add'>+	frame[0x00] = 0x84;	/* Audio infoframe */</div><div class='add'>+	frame[0x01] = 0x01;	/* version */</div><div class='add'>+	frame[0x02] = 0x0a;	/* length */</div><div class='add'>+	frame[0x03] = 0x00;</div><div class='add'>+	frame[0x04] = (CT &lt;&lt; 4) | CC;</div><div class='add'>+	frame[0x05] = (SF &lt;&lt; 2) | ceaSS;</div><div class='add'>+	frame[0x06] = FMT;</div><div class='add'>+	frame[0x07] = CA;</div><div class='add'>+	frame[0x08] = (DM_INH &lt;&lt; 7) | (LSV &lt;&lt; 3);</div><div class='add'>+	frame[0x09] = 0x00;</div><div class='add'>+	frame[0x0a] = 0x00;</div><div class='add'>+	frame[0x0b] = 0x00;</div><div class='add'>+</div><div class='add'>+	nouveau_hdmi_infoframe(encoder, 0x000, frame);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nouveau_hdmi_disconnect(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	nouveau_audio_disconnect(encoder);</div><div class='add'>+</div><div class='add'>+	/* disable audio and avi infoframes */</div><div class='add'>+	hdmi_mask(encoder, 0x000, 0x00000001, 0x00000000);</div><div class='add'>+	hdmi_mask(encoder, 0x020, 0x00000001, 0x00000000);</div><div class='add'>+</div><div class='add'>+	/* disable hdmi */</div><div class='add'>+	hdmi_mask(encoder, 0x0a4, 0x40000000, 0x00000000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+nouveau_hdmi_mode_set(struct drm_encoder *encoder,</div><div class='add'>+		      struct drm_display_mode *mode)</div><div class='add'>+{</div><div class='add'>+	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);</div><div class='add'>+	struct nouveau_connector *nv_connector;</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	u32 max_ac_packet, rekey;</div><div class='add'>+</div><div class='add'>+	nv_connector = nouveau_encoder_connector_get(nv_encoder);</div><div class='add'>+	if (!mode || !nv_connector || !nv_connector-&gt;edid ||</div><div class='add'>+	    !drm_detect_hdmi_monitor(nv_connector-&gt;edid)) {</div><div class='add'>+		nouveau_hdmi_disconnect(encoder);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nouveau_hdmi_video_infoframe(encoder, mode);</div><div class='add'>+	nouveau_hdmi_audio_infoframe(encoder, mode);</div><div class='add'>+</div><div class='add'>+	hdmi_mask(encoder, 0x0d0, 0x00070001, 0x00010001); /* SPARE, HW_CTS */</div><div class='add'>+	hdmi_mask(encoder, 0x068, 0x00010101, 0x00000000); /* ACR_CTRL, ?? */</div><div class='add'>+	hdmi_mask(encoder, 0x078, 0x80000000, 0x80000000); /* ACR_0441_ENABLE */</div><div class='add'>+</div><div class='add'>+	nv_mask(dev, 0x61733c, 0x00100000, 0x00100000); /* RESETF */</div><div class='add'>+	nv_mask(dev, 0x61733c, 0x10000000, 0x10000000); /* LOOKUP_EN */</div><div class='add'>+	nv_mask(dev, 0x61733c, 0x00100000, 0x00000000); /* !RESETF */</div><div class='add'>+</div><div class='add'>+	/* value matches nvidia binary driver, and tegra constant */</div><div class='add'>+	rekey = 56;</div><div class='add'>+</div><div class='add'>+	max_ac_packet  = mode-&gt;htotal - mode-&gt;hdisplay;</div><div class='add'>+	max_ac_packet -= rekey;</div><div class='add'>+	max_ac_packet -= 18; /* constant from tegra */</div><div class='add'>+	max_ac_packet /= 32;</div><div class='add'>+</div><div class='add'>+	/* enable hdmi */</div><div class='add'>+	hdmi_mask(encoder, 0x0a4, 0x5f1f003f, 0x40000000 | /* enable */</div><div class='add'>+					      0x1f000000 | /* unknown */</div><div class='add'>+					      max_ac_packet &lt;&lt; 16 |</div><div class='add'>+					      rekey);</div><div class='add'>+</div><div class='add'>+	nouveau_audio_mode_set(encoder, mode);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_hwsq.h b/drivers/gpu/drm/nouveau/nouveau_hwsq.h<br/>new file mode 100644<br/>index 000000000000..697687593a81<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_hwsq.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_hwsq.h</a></div><div class='hunk'>@@ -0,0 +1,115 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2010 Red Hat Inc.</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice shall be included in</div><div class='add'>+ * all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR</div><div class='add'>+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,</div><div class='add'>+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ * OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors: Ben Skeggs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __NOUVEAU_HWSQ_H__</div><div class='add'>+#define __NOUVEAU_HWSQ_H__</div><div class='add'>+</div><div class='add'>+struct hwsq_ucode {</div><div class='add'>+	u8 data[0x200];</div><div class='add'>+	union {</div><div class='add'>+		u8  *u08;</div><div class='add'>+		u16 *u16;</div><div class='add'>+		u32 *u32;</div><div class='add'>+	} ptr;</div><div class='add'>+	u16 len;</div><div class='add'>+</div><div class='add'>+	u32 reg;</div><div class='add'>+	u32 val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+hwsq_init(struct hwsq_ucode *hwsq)</div><div class='add'>+{</div><div class='add'>+	hwsq-&gt;ptr.u08 = hwsq-&gt;data;</div><div class='add'>+	hwsq-&gt;reg = 0xffffffff;</div><div class='add'>+	hwsq-&gt;val = 0xffffffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+hwsq_fini(struct hwsq_ucode *hwsq)</div><div class='add'>+{</div><div class='add'>+	do {</div><div class='add'>+		*hwsq-&gt;ptr.u08++ = 0x7f;</div><div class='add'>+		hwsq-&gt;len = hwsq-&gt;ptr.u08 - hwsq-&gt;data;</div><div class='add'>+	} while (hwsq-&gt;len &amp; 3);</div><div class='add'>+	hwsq-&gt;ptr.u08 = hwsq-&gt;data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+hwsq_usec(struct hwsq_ucode *hwsq, u8 usec)</div><div class='add'>+{</div><div class='add'>+	u32 shift = 0;</div><div class='add'>+	while (usec &amp; ~3) {</div><div class='add'>+		usec &gt;&gt;= 2;</div><div class='add'>+		shift++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*hwsq-&gt;ptr.u08++ = (shift &lt;&lt; 2) | usec;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+hwsq_setf(struct hwsq_ucode *hwsq, u8 flag, int val)</div><div class='add'>+{</div><div class='add'>+	flag += 0x80;</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		flag += 0x20;</div><div class='add'>+	if (val &gt;= 1)</div><div class='add'>+		flag += 0x20;</div><div class='add'>+	*hwsq-&gt;ptr.u08++ = flag;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+hwsq_op5f(struct hwsq_ucode *hwsq, u8 v0, u8 v1)</div><div class='add'>+{</div><div class='add'>+	*hwsq-&gt;ptr.u08++ = 0x5f;</div><div class='add'>+	*hwsq-&gt;ptr.u08++ = v0;</div><div class='add'>+	*hwsq-&gt;ptr.u08++ = v1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+hwsq_wr32(struct hwsq_ucode *hwsq, u32 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	if (val != hwsq-&gt;val) {</div><div class='add'>+		if ((val &amp; 0xffff0000) == (hwsq-&gt;val &amp; 0xffff0000)) {</div><div class='add'>+			*hwsq-&gt;ptr.u08++ = 0x42;</div><div class='add'>+			*hwsq-&gt;ptr.u16++ = (val &amp; 0x0000ffff);</div><div class='add'>+		} else {</div><div class='add'>+			*hwsq-&gt;ptr.u08++ = 0xe2;</div><div class='add'>+			*hwsq-&gt;ptr.u32++ = val;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hwsq-&gt;val = val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((reg &amp; 0xffff0000) == (hwsq-&gt;reg &amp; 0xffff0000)) {</div><div class='add'>+		*hwsq-&gt;ptr.u08++ = 0x40;</div><div class='add'>+		*hwsq-&gt;ptr.u16++ = (reg &amp; 0x0000ffff);</div><div class='add'>+	} else {</div><div class='add'>+		*hwsq-&gt;ptr.u08++ = 0xe0;</div><div class='add'>+		*hwsq-&gt;ptr.u32++ = reg;</div><div class='add'>+	}</div><div class='add'>+	hwsq-&gt;reg = reg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/nouveau_i2c.c<br/>index d39b2202b197..820ae7f52044 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_i2c.c</a></div><div class='hunk'>@@ -29,262 +29,465 @@</div><div class='ctx'> #include "nouveau_i2c.h"</div><div class='ctx'> #include "nouveau_hw.h"</div><div class='ctx'> </div><div class='add'>+#define T_TIMEOUT  2200000</div><div class='add'>+#define T_RISEFALL 1000</div><div class='add'>+#define T_HOLD     5000</div><div class='add'>+</div><div class='ctx'> static void</div><div class='del'>-nv04_i2c_setscl(void *data, int state)</div><div class='add'>+i2c_drive_scl(void *data, int state)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_i2c_chan *i2c = data;</div><div class='del'>-	struct drm_device *dev = i2c-&gt;dev;</div><div class='del'>-	uint8_t val;</div><div class='del'>-</div><div class='del'>-	val = (NVReadVgaCrtc(dev, 0, i2c-&gt;wr) &amp; 0xd0) | (state ? 0x20 : 0);</div><div class='del'>-	NVWriteVgaCrtc(dev, 0, i2c-&gt;wr, val | 0x01);</div><div class='add'>+	struct nouveau_i2c_chan *port = data;</div><div class='add'>+	if (port-&gt;type == 0) {</div><div class='add'>+		u8 val = NVReadVgaCrtc(port-&gt;dev, 0, port-&gt;drive);</div><div class='add'>+		if (state) val |= 0x20;</div><div class='add'>+		else	   val &amp;= 0xdf;</div><div class='add'>+		NVWriteVgaCrtc(port-&gt;dev, 0, port-&gt;drive, val | 0x01);</div><div class='add'>+	} else</div><div class='add'>+	if (port-&gt;type == 4) {</div><div class='add'>+		nv_mask(port-&gt;dev, port-&gt;drive, 0x2f, state ? 0x21 : 0x01);</div><div class='add'>+	} else</div><div class='add'>+	if (port-&gt;type == 5) {</div><div class='add'>+		if (state) port-&gt;state |= 0x01;</div><div class='add'>+		else	   port-&gt;state &amp;= 0xfe;</div><div class='add'>+		nv_wr32(port-&gt;dev, port-&gt;drive, 4 | port-&gt;state);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-nv04_i2c_setsda(void *data, int state)</div><div class='add'>+i2c_drive_sda(void *data, int state)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_i2c_chan *i2c = data;</div><div class='del'>-	struct drm_device *dev = i2c-&gt;dev;</div><div class='del'>-	uint8_t val;</div><div class='del'>-</div><div class='del'>-	val = (NVReadVgaCrtc(dev, 0, i2c-&gt;wr) &amp; 0xe0) | (state ? 0x10 : 0);</div><div class='del'>-	NVWriteVgaCrtc(dev, 0, i2c-&gt;wr, val | 0x01);</div><div class='add'>+	struct nouveau_i2c_chan *port = data;</div><div class='add'>+	if (port-&gt;type == 0) {</div><div class='add'>+		u8 val = NVReadVgaCrtc(port-&gt;dev, 0, port-&gt;drive);</div><div class='add'>+		if (state) val |= 0x10;</div><div class='add'>+		else	   val &amp;= 0xef;</div><div class='add'>+		NVWriteVgaCrtc(port-&gt;dev, 0, port-&gt;drive, val | 0x01);</div><div class='add'>+	} else</div><div class='add'>+	if (port-&gt;type == 4) {</div><div class='add'>+		nv_mask(port-&gt;dev, port-&gt;drive, 0x1f, state ? 0x11 : 0x01);</div><div class='add'>+	} else</div><div class='add'>+	if (port-&gt;type == 5) {</div><div class='add'>+		if (state) port-&gt;state |= 0x02;</div><div class='add'>+		else	   port-&gt;state &amp;= 0xfd;</div><div class='add'>+		nv_wr32(port-&gt;dev, port-&gt;drive, 4 | port-&gt;state);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nv04_i2c_getscl(void *data)</div><div class='add'>+i2c_sense_scl(void *data)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_i2c_chan *i2c = data;</div><div class='del'>-	struct drm_device *dev = i2c-&gt;dev;</div><div class='del'>-</div><div class='del'>-	return !!(NVReadVgaCrtc(dev, 0, i2c-&gt;rd) &amp; 4);</div><div class='add'>+	struct nouveau_i2c_chan *port = data;</div><div class='add'>+	struct drm_nouveau_private *dev_priv = port-&gt;dev-&gt;dev_private;</div><div class='add'>+	if (port-&gt;type == 0) {</div><div class='add'>+		return !!(NVReadVgaCrtc(port-&gt;dev, 0, port-&gt;sense) &amp; 0x04);</div><div class='add'>+	} else</div><div class='add'>+	if (port-&gt;type == 4) {</div><div class='add'>+		return !!(nv_rd32(port-&gt;dev, port-&gt;sense) &amp; 0x00040000);</div><div class='add'>+	} else</div><div class='add'>+	if (port-&gt;type == 5) {</div><div class='add'>+		if (dev_priv-&gt;card_type &lt; NV_D0)</div><div class='add'>+			return !!(nv_rd32(port-&gt;dev, port-&gt;sense) &amp; 0x01);</div><div class='add'>+		else</div><div class='add'>+			return !!(nv_rd32(port-&gt;dev, port-&gt;sense) &amp; 0x10);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nv04_i2c_getsda(void *data)</div><div class='add'>+i2c_sense_sda(void *data)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_i2c_chan *i2c = data;</div><div class='del'>-	struct drm_device *dev = i2c-&gt;dev;</div><div class='del'>-</div><div class='del'>-	return !!(NVReadVgaCrtc(dev, 0, i2c-&gt;rd) &amp; 8);</div><div class='add'>+	struct nouveau_i2c_chan *port = data;</div><div class='add'>+	struct drm_nouveau_private *dev_priv = port-&gt;dev-&gt;dev_private;</div><div class='add'>+	if (port-&gt;type == 0) {</div><div class='add'>+		return !!(NVReadVgaCrtc(port-&gt;dev, 0, port-&gt;sense) &amp; 0x08);</div><div class='add'>+	} else</div><div class='add'>+	if (port-&gt;type == 4) {</div><div class='add'>+		return !!(nv_rd32(port-&gt;dev, port-&gt;sense) &amp; 0x00080000);</div><div class='add'>+	} else</div><div class='add'>+	if (port-&gt;type == 5) {</div><div class='add'>+		if (dev_priv-&gt;card_type &lt; NV_D0)</div><div class='add'>+			return !!(nv_rd32(port-&gt;dev, port-&gt;sense) &amp; 0x02);</div><div class='add'>+		else</div><div class='add'>+			return !!(nv_rd32(port-&gt;dev, port-&gt;sense) &amp; 0x20);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-nv4e_i2c_setscl(void *data, int state)</div><div class='add'>+i2c_delay(struct nouveau_i2c_chan *port, u32 nsec)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_i2c_chan *i2c = data;</div><div class='del'>-	struct drm_device *dev = i2c-&gt;dev;</div><div class='del'>-	uint8_t val;</div><div class='del'>-</div><div class='del'>-	val = (nv_rd32(dev, i2c-&gt;wr) &amp; 0xd0) | (state ? 0x20 : 0);</div><div class='del'>-	nv_wr32(dev, i2c-&gt;wr, val | 0x01);</div><div class='add'>+	udelay((nsec + 500) / 1000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-nv4e_i2c_setsda(void *data, int state)</div><div class='add'>+static bool</div><div class='add'>+i2c_raise_scl(struct nouveau_i2c_chan *port)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_i2c_chan *i2c = data;</div><div class='del'>-	struct drm_device *dev = i2c-&gt;dev;</div><div class='del'>-	uint8_t val;</div><div class='add'>+	u32 timeout = T_TIMEOUT / T_RISEFALL;</div><div class='add'>+</div><div class='add'>+	i2c_drive_scl(port, 1);</div><div class='add'>+	do {</div><div class='add'>+		i2c_delay(port, T_RISEFALL);</div><div class='add'>+	} while (!i2c_sense_scl(port) &amp;&amp; --timeout);</div><div class='ctx'> </div><div class='del'>-	val = (nv_rd32(dev, i2c-&gt;wr) &amp; 0xe0) | (state ? 0x10 : 0);</div><div class='del'>-	nv_wr32(dev, i2c-&gt;wr, val | 0x01);</div><div class='add'>+	return timeout != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nv4e_i2c_getscl(void *data)</div><div class='add'>+i2c_start(struct nouveau_i2c_chan *port)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_i2c_chan *i2c = data;</div><div class='del'>-	struct drm_device *dev = i2c-&gt;dev;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	port-&gt;state  = i2c_sense_scl(port);</div><div class='add'>+	port-&gt;state |= i2c_sense_sda(port) &lt;&lt; 1;</div><div class='add'>+	if (port-&gt;state != 3) {</div><div class='add'>+		i2c_drive_scl(port, 0);</div><div class='add'>+		i2c_drive_sda(port, 1);</div><div class='add'>+		if (!i2c_raise_scl(port))</div><div class='add'>+			ret = -EBUSY;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return !!((nv_rd32(dev, i2c-&gt;rd) &gt;&gt; 16) &amp; 4);</div><div class='add'>+	i2c_drive_sda(port, 0);</div><div class='add'>+	i2c_delay(port, T_HOLD);</div><div class='add'>+	i2c_drive_scl(port, 0);</div><div class='add'>+	i2c_delay(port, T_HOLD);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-nv4e_i2c_getsda(void *data)</div><div class='add'>+static void</div><div class='add'>+i2c_stop(struct nouveau_i2c_chan *port)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_i2c_chan *i2c = data;</div><div class='del'>-	struct drm_device *dev = i2c-&gt;dev;</div><div class='del'>-</div><div class='del'>-	return !!((nv_rd32(dev, i2c-&gt;rd) &gt;&gt; 16) &amp; 8);</div><div class='add'>+	i2c_drive_scl(port, 0);</div><div class='add'>+	i2c_drive_sda(port, 0);</div><div class='add'>+	i2c_delay(port, T_RISEFALL);</div><div class='add'>+</div><div class='add'>+	i2c_drive_scl(port, 1);</div><div class='add'>+	i2c_delay(port, T_HOLD);</div><div class='add'>+	i2c_drive_sda(port, 1);</div><div class='add'>+	i2c_delay(port, T_HOLD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const uint32_t nv50_i2c_port[] = {</div><div class='del'>-	0x00e138, 0x00e150, 0x00e168, 0x00e180,</div><div class='del'>-	0x00e254, 0x00e274, 0x00e764, 0x00e780,</div><div class='del'>-	0x00e79c, 0x00e7b8</div><div class='del'>-};</div><div class='del'>-#define NV50_I2C_PORTS ARRAY_SIZE(nv50_i2c_port)</div><div class='del'>-</div><div class='ctx'> static int</div><div class='del'>-nv50_i2c_getscl(void *data)</div><div class='add'>+i2c_bitw(struct nouveau_i2c_chan *port, int sda)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_i2c_chan *i2c = data;</div><div class='del'>-	struct drm_device *dev = i2c-&gt;dev;</div><div class='add'>+	i2c_drive_sda(port, sda);</div><div class='add'>+	i2c_delay(port, T_RISEFALL);</div><div class='ctx'> </div><div class='del'>-	return !!(nv_rd32(dev, i2c-&gt;rd) &amp; 1);</div><div class='del'>-}</div><div class='add'>+	if (!i2c_raise_scl(port))</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	i2c_delay(port, T_HOLD);</div><div class='ctx'> </div><div class='add'>+	i2c_drive_scl(port, 0);</div><div class='add'>+	i2c_delay(port, T_HOLD);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nv50_i2c_getsda(void *data)</div><div class='add'>+i2c_bitr(struct nouveau_i2c_chan *port)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_i2c_chan *i2c = data;</div><div class='del'>-	struct drm_device *dev = i2c-&gt;dev;</div><div class='add'>+	int sda;</div><div class='add'>+</div><div class='add'>+	i2c_drive_sda(port, 1);</div><div class='add'>+	i2c_delay(port, T_RISEFALL);</div><div class='ctx'> </div><div class='del'>-	return !!(nv_rd32(dev, i2c-&gt;rd) &amp; 2);</div><div class='add'>+	if (!i2c_raise_scl(port))</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	i2c_delay(port, T_HOLD);</div><div class='add'>+</div><div class='add'>+	sda = i2c_sense_sda(port);</div><div class='add'>+</div><div class='add'>+	i2c_drive_scl(port, 0);</div><div class='add'>+	i2c_delay(port, T_HOLD);</div><div class='add'>+	return sda;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-nv50_i2c_setscl(void *data, int state)</div><div class='add'>+static int</div><div class='add'>+i2c_get_byte(struct nouveau_i2c_chan *port, u8 *byte, bool last)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_i2c_chan *i2c = data;</div><div class='add'>+	int i, bit;</div><div class='add'>+</div><div class='add'>+	*byte = 0;</div><div class='add'>+	for (i = 7; i &gt;= 0; i--) {</div><div class='add'>+		bit = i2c_bitr(port);</div><div class='add'>+		if (bit &lt; 0)</div><div class='add'>+			return bit;</div><div class='add'>+		*byte |= bit &lt;&lt; i;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	nv_wr32(i2c-&gt;dev, i2c-&gt;wr, 4 | (i2c-&gt;data ? 2 : 0) | (state ? 1 : 0));</div><div class='add'>+	return i2c_bitw(port, last ? 1 : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-nv50_i2c_setsda(void *data, int state)</div><div class='add'>+static int</div><div class='add'>+i2c_put_byte(struct nouveau_i2c_chan *port, u8 byte)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_i2c_chan *i2c = data;</div><div class='add'>+	int i, ret;</div><div class='add'>+	for (i = 7; i &gt;= 0; i--) {</div><div class='add'>+		ret = i2c_bitw(port, !!(byte &amp; (1 &lt;&lt; i)));</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	nv_mask(i2c-&gt;dev, i2c-&gt;wr, 0x00000006, 4 | (state ? 2 : 0));</div><div class='del'>-	i2c-&gt;data = state;</div><div class='add'>+	ret = i2c_bitr(port);</div><div class='add'>+	if (ret == 1) /* nack */</div><div class='add'>+		ret = -EIO;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nvd0_i2c_getscl(void *data)</div><div class='add'>+i2c_addr(struct nouveau_i2c_chan *port, struct i2c_msg *msg)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_i2c_chan *i2c = data;</div><div class='del'>-	return !!(nv_rd32(i2c-&gt;dev, i2c-&gt;rd) &amp; 0x10);</div><div class='add'>+	u32 addr = msg-&gt;addr &lt;&lt; 1;</div><div class='add'>+	if (msg-&gt;flags &amp; I2C_M_RD)</div><div class='add'>+		addr |= 1;</div><div class='add'>+	return i2c_put_byte(port, addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nvd0_i2c_getsda(void *data)</div><div class='add'>+i2c_bit_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_i2c_chan *i2c = data;</div><div class='del'>-	return !!(nv_rd32(i2c-&gt;dev, i2c-&gt;rd) &amp; 0x20);</div><div class='add'>+	struct nouveau_i2c_chan *port = (struct nouveau_i2c_chan *)adap;</div><div class='add'>+	struct i2c_msg *msg = msgs;</div><div class='add'>+	int ret = 0, mcnt = num;</div><div class='add'>+</div><div class='add'>+	while (!ret &amp;&amp; mcnt--) {</div><div class='add'>+		u8 remaining = msg-&gt;len;</div><div class='add'>+		u8 *ptr = msg-&gt;buf;</div><div class='add'>+</div><div class='add'>+		ret = i2c_start(port);</div><div class='add'>+		if (ret == 0)</div><div class='add'>+			ret = i2c_addr(port, msg);</div><div class='add'>+</div><div class='add'>+		if (msg-&gt;flags &amp; I2C_M_RD) {</div><div class='add'>+			while (!ret &amp;&amp; remaining--)</div><div class='add'>+				ret = i2c_get_byte(port, ptr++, !remaining);</div><div class='add'>+		} else {</div><div class='add'>+			while (!ret &amp;&amp; remaining--)</div><div class='add'>+				ret = i2c_put_byte(port, *ptr++);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msg++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c_stop(port);</div><div class='add'>+	return (ret &lt; 0) ? ret : num;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-nouveau_i2c_init(struct drm_device *dev, struct dcb_i2c_entry *entry, int index)</div><div class='add'>+static u32</div><div class='add'>+i2c_bit_func(struct i2c_adapter *adap)</div><div class='ctx'> {</div><div class='del'>-	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_i2c_chan *i2c;</div><div class='del'>-	int ret;</div><div class='add'>+	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct i2c_algorithm i2c_bit_algo = {</div><div class='add'>+	.master_xfer = i2c_bit_xfer,</div><div class='add'>+	.functionality = i2c_bit_func</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const uint32_t nv50_i2c_port[] = {</div><div class='add'>+	0x00e138, 0x00e150, 0x00e168, 0x00e180,</div><div class='add'>+	0x00e254, 0x00e274, 0x00e764, 0x00e780,</div><div class='add'>+	0x00e79c, 0x00e7b8</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	if (entry-&gt;chan)</div><div class='del'>-		return -EEXIST;</div><div class='add'>+static u8 *</div><div class='add'>+i2c_table(struct drm_device *dev, u8 *version)</div><div class='add'>+{</div><div class='add'>+	u8 *dcb = dcb_table(dev), *i2c = NULL;</div><div class='add'>+	if (dcb) {</div><div class='add'>+		if (dcb[0] &gt;= 0x15)</div><div class='add'>+			i2c = ROMPTR(dev, dcb[2]);</div><div class='add'>+		if (dcb[0] &gt;= 0x30)</div><div class='add'>+			i2c = ROMPTR(dev, dcb[4]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (dev_priv-&gt;card_type &gt;= NV_50 &amp;&amp;</div><div class='del'>-	    dev_priv-&gt;card_type &lt;= NV_C0 &amp;&amp; entry-&gt;read &gt;= NV50_I2C_PORTS) {</div><div class='del'>-		NV_ERROR(dev, "unknown i2c port %d\n", entry-&gt;read);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	/* early revisions had no version number, use dcb version */</div><div class='add'>+	if (i2c) {</div><div class='add'>+		*version = dcb[0];</div><div class='add'>+		if (*version &gt;= 0x30)</div><div class='add'>+			*version = i2c[0];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	i2c = kzalloc(sizeof(*i2c), GFP_KERNEL);</div><div class='del'>-	if (i2c == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	switch (entry-&gt;port_type) {</div><div class='del'>-	case 0:</div><div class='del'>-		i2c-&gt;bit.setsda = nv04_i2c_setsda;</div><div class='del'>-		i2c-&gt;bit.setscl = nv04_i2c_setscl;</div><div class='del'>-		i2c-&gt;bit.getsda = nv04_i2c_getsda;</div><div class='del'>-		i2c-&gt;bit.getscl = nv04_i2c_getscl;</div><div class='del'>-		i2c-&gt;rd = entry-&gt;read;</div><div class='del'>-		i2c-&gt;wr = entry-&gt;write;</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		i2c-&gt;bit.setsda = nv4e_i2c_setsda;</div><div class='del'>-		i2c-&gt;bit.setscl = nv4e_i2c_setscl;</div><div class='del'>-		i2c-&gt;bit.getsda = nv4e_i2c_getsda;</div><div class='del'>-		i2c-&gt;bit.getscl = nv4e_i2c_getscl;</div><div class='del'>-		i2c-&gt;rd = 0x600800 + entry-&gt;read;</div><div class='del'>-		i2c-&gt;wr = 0x600800 + entry-&gt;write;</div><div class='del'>-		break;</div><div class='del'>-	case 5:</div><div class='del'>-		i2c-&gt;bit.setsda = nv50_i2c_setsda;</div><div class='del'>-		i2c-&gt;bit.setscl = nv50_i2c_setscl;</div><div class='del'>-		if (dev_priv-&gt;card_type &lt; NV_D0) {</div><div class='del'>-			i2c-&gt;bit.getsda = nv50_i2c_getsda;</div><div class='del'>-			i2c-&gt;bit.getscl = nv50_i2c_getscl;</div><div class='del'>-			i2c-&gt;rd = nv50_i2c_port[entry-&gt;read];</div><div class='del'>-			i2c-&gt;wr = i2c-&gt;rd;</div><div class='del'>-		} else {</div><div class='del'>-			i2c-&gt;bit.getsda = nvd0_i2c_getsda;</div><div class='del'>-			i2c-&gt;bit.getscl = nvd0_i2c_getscl;</div><div class='del'>-			i2c-&gt;rd = 0x00d014 + (entry-&gt;read * 0x20);</div><div class='del'>-			i2c-&gt;wr = i2c-&gt;rd;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case 6:</div><div class='del'>-		i2c-&gt;rd = entry-&gt;read;</div><div class='del'>-		i2c-&gt;wr = entry-&gt;write;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		NV_ERROR(dev, "DCB I2C port type %d unknown\n",</div><div class='del'>-			 entry-&gt;port_type);</div><div class='del'>-		kfree(i2c);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	return i2c;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nouveau_i2c_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nvbios *bios = &amp;dev_priv-&gt;vbios;</div><div class='add'>+	struct nouveau_i2c_chan *port;</div><div class='add'>+	u8 *i2c, *entry, legacy[2][4] = {};</div><div class='add'>+	u8 version, entries, recordlen;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev_priv-&gt;i2c_ports);</div><div class='add'>+</div><div class='add'>+	i2c = i2c_table(dev, &amp;version);</div><div class='add'>+	if (!i2c) {</div><div class='add'>+		u8 *bmp = &amp;bios-&gt;data[bios-&gt;offset];</div><div class='add'>+		if (bios-&gt;type != NVBIOS_BMP)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+</div><div class='add'>+		legacy[0][0] = NV_CIO_CRE_DDC_WR__INDEX;</div><div class='add'>+		legacy[0][1] = NV_CIO_CRE_DDC_STATUS__INDEX;</div><div class='add'>+		legacy[1][0] = NV_CIO_CRE_DDC0_WR__INDEX;</div><div class='add'>+		legacy[1][1] = NV_CIO_CRE_DDC0_STATUS__INDEX;</div><div class='add'>+</div><div class='add'>+		/* BMP (from v4.0) has i2c info in the structure, it's in a</div><div class='add'>+		 * fixed location on earlier VBIOS</div><div class='add'>+		 */</div><div class='add'>+		if (bmp[5] &lt; 4)</div><div class='add'>+			i2c = &amp;bios-&gt;data[0x48];</div><div class='add'>+		else</div><div class='add'>+			i2c = &amp;bmp[0x36];</div><div class='add'>+</div><div class='add'>+		if (i2c[4]) legacy[0][0] = i2c[4];</div><div class='add'>+		if (i2c[5]) legacy[0][1] = i2c[5];</div><div class='add'>+		if (i2c[6]) legacy[1][0] = i2c[6];</div><div class='add'>+		if (i2c[7]) legacy[1][1] = i2c[7];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snprintf(i2c-&gt;adapter.name, sizeof(i2c-&gt;adapter.name),</div><div class='del'>-		 "nouveau-%s-%d", pci_name(dev-&gt;pdev), index);</div><div class='del'>-	i2c-&gt;adapter.owner = THIS_MODULE;</div><div class='del'>-	i2c-&gt;adapter.dev.parent = &amp;dev-&gt;pdev-&gt;dev;</div><div class='del'>-	i2c-&gt;dev = dev;</div><div class='del'>-	i2c_set_adapdata(&amp;i2c-&gt;adapter, i2c);</div><div class='del'>-</div><div class='del'>-	if (entry-&gt;port_type &lt; 6) {</div><div class='del'>-		i2c-&gt;adapter.algo_data = &amp;i2c-&gt;bit;</div><div class='del'>-		i2c-&gt;bit.udelay = 40;</div><div class='del'>-		i2c-&gt;bit.timeout = usecs_to_jiffies(5000);</div><div class='del'>-		i2c-&gt;bit.data = i2c;</div><div class='del'>-		ret = i2c_bit_add_bus(&amp;i2c-&gt;adapter);</div><div class='add'>+	if (i2c &amp;&amp; version &gt;= 0x30) {</div><div class='add'>+		entry     = i2c[1] + i2c;</div><div class='add'>+		entries   = i2c[2];</div><div class='add'>+		recordlen = i2c[3];</div><div class='add'>+	} else</div><div class='add'>+	if (i2c) {</div><div class='add'>+		entry     = i2c;</div><div class='add'>+		entries   = 16;</div><div class='add'>+		recordlen = 4;</div><div class='ctx'> 	} else {</div><div class='del'>-		i2c-&gt;adapter.algo = &amp;nouveau_dp_i2c_algo;</div><div class='del'>-		ret = i2c_add_adapter(&amp;i2c-&gt;adapter);</div><div class='add'>+		entry     = legacy[0];</div><div class='add'>+		entries   = 2;</div><div class='add'>+		recordlen = 4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ret) {</div><div class='del'>-		NV_ERROR(dev, "Failed to register i2c %d\n", index);</div><div class='del'>-		kfree(i2c);</div><div class='del'>-		return ret;</div><div class='add'>+	for (i = 0; i &lt; entries; i++, entry += recordlen) {</div><div class='add'>+		port = kzalloc(sizeof(*port), GFP_KERNEL);</div><div class='add'>+		if (port == NULL) {</div><div class='add'>+			nouveau_i2c_fini(dev);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		port-&gt;type = entry[3];</div><div class='add'>+		if (version &lt; 0x30) {</div><div class='add'>+			port-&gt;type &amp;= 0x07;</div><div class='add'>+			if (port-&gt;type == 0x07)</div><div class='add'>+				port-&gt;type = 0xff;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (port-&gt;type == 0xff) {</div><div class='add'>+			kfree(port);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (port-&gt;type) {</div><div class='add'>+		case 0: /* NV04:NV50 */</div><div class='add'>+			port-&gt;drive = entry[0];</div><div class='add'>+			port-&gt;sense = entry[1];</div><div class='add'>+			port-&gt;adapter.algo = &amp;i2c_bit_algo;</div><div class='add'>+			break;</div><div class='add'>+		case 4: /* NV4E */</div><div class='add'>+			port-&gt;drive = 0x600800 + entry[1];</div><div class='add'>+			port-&gt;sense = port-&gt;drive;</div><div class='add'>+			port-&gt;adapter.algo = &amp;i2c_bit_algo;</div><div class='add'>+			break;</div><div class='add'>+		case 5: /* NV50- */</div><div class='add'>+			port-&gt;drive = entry[0] &amp; 0x0f;</div><div class='add'>+			if (dev_priv-&gt;card_type &lt; NV_D0) {</div><div class='add'>+				if (port-&gt;drive &gt;= ARRAY_SIZE(nv50_i2c_port))</div><div class='add'>+					break;</div><div class='add'>+				port-&gt;drive = nv50_i2c_port[port-&gt;drive];</div><div class='add'>+				port-&gt;sense = port-&gt;drive;</div><div class='add'>+			} else {</div><div class='add'>+				port-&gt;drive = 0x00d014 + (port-&gt;drive * 0x20);</div><div class='add'>+				port-&gt;sense = port-&gt;drive;</div><div class='add'>+			}</div><div class='add'>+			port-&gt;adapter.algo = &amp;i2c_bit_algo;</div><div class='add'>+			break;</div><div class='add'>+		case 6: /* NV50- DP AUX */</div><div class='add'>+			port-&gt;drive = entry[0];</div><div class='add'>+			port-&gt;sense = port-&gt;drive;</div><div class='add'>+			port-&gt;adapter.algo = &amp;nouveau_dp_i2c_algo;</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 (!port-&gt;adapter.algo) {</div><div class='add'>+			NV_ERROR(dev, "I2C%d: type %d index %x/%x unknown\n",</div><div class='add'>+				 i, port-&gt;type, port-&gt;drive, port-&gt;sense);</div><div class='add'>+			kfree(port);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		snprintf(port-&gt;adapter.name, sizeof(port-&gt;adapter.name),</div><div class='add'>+			 "nouveau-%s-%d", pci_name(dev-&gt;pdev), i);</div><div class='add'>+		port-&gt;adapter.owner = THIS_MODULE;</div><div class='add'>+		port-&gt;adapter.dev.parent = &amp;dev-&gt;pdev-&gt;dev;</div><div class='add'>+		port-&gt;dev = dev;</div><div class='add'>+		port-&gt;index = i;</div><div class='add'>+		port-&gt;dcb = ROM32(entry[0]);</div><div class='add'>+		i2c_set_adapdata(&amp;port-&gt;adapter, i2c);</div><div class='add'>+</div><div class='add'>+		ret = i2c_add_adapter(&amp;port-&gt;adapter);</div><div class='add'>+		if (ret) {</div><div class='add'>+			NV_ERROR(dev, "I2C%d: failed register: %d\n", i, ret);</div><div class='add'>+			kfree(port);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;port-&gt;head, &amp;dev_priv-&gt;i2c_ports);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	entry-&gt;chan = i2c;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='del'>-nouveau_i2c_fini(struct drm_device *dev, struct dcb_i2c_entry *entry)</div><div class='add'>+nouveau_i2c_fini(struct drm_device *dev)</div><div class='ctx'> {</div><div class='del'>-	if (!entry-&gt;chan)</div><div class='del'>-		return;</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_i2c_chan *port, *tmp;</div><div class='ctx'> </div><div class='del'>-	i2c_del_adapter(&amp;entry-&gt;chan-&gt;adapter);</div><div class='del'>-	kfree(entry-&gt;chan);</div><div class='del'>-	entry-&gt;chan = NULL;</div><div class='add'>+	list_for_each_entry_safe(port, tmp, &amp;dev_priv-&gt;i2c_ports, head) {</div><div class='add'>+		i2c_del_adapter(&amp;port-&gt;adapter);</div><div class='add'>+		kfree(port);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct nouveau_i2c_chan *</div><div class='del'>-nouveau_i2c_find(struct drm_device *dev, int index)</div><div class='add'>+nouveau_i2c_find(struct drm_device *dev, u8 index)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct dcb_i2c_entry *i2c = &amp;dev_priv-&gt;vbios.dcb.i2c[index];</div><div class='add'>+	struct nouveau_i2c_chan *port;</div><div class='add'>+</div><div class='add'>+	if (index == NV_I2C_DEFAULT(0) ||</div><div class='add'>+	    index == NV_I2C_DEFAULT(1)) {</div><div class='add'>+		u8 version, *i2c = i2c_table(dev, &amp;version);</div><div class='add'>+		if (i2c &amp;&amp; version &gt;= 0x30) {</div><div class='add'>+			if (index == NV_I2C_DEFAULT(0))</div><div class='add'>+				index = (i2c[4] &amp; 0x0f);</div><div class='add'>+			else</div><div class='add'>+				index = (i2c[4] &amp; 0xf0) &gt;&gt; 4;</div><div class='add'>+		} else {</div><div class='add'>+			index = 2;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (index &gt;= DCB_MAX_NUM_I2C_ENTRIES)</div><div class='del'>-		return NULL;</div><div class='add'>+	list_for_each_entry(port, &amp;dev_priv-&gt;i2c_ports, head) {</div><div class='add'>+		if (port-&gt;index == index)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (dev_priv-&gt;card_type &gt;= NV_50 &amp;&amp; (i2c-&gt;entry &amp; 0x00000100)) {</div><div class='del'>-		uint32_t reg = 0xe500, val;</div><div class='add'>+	if (&amp;port-&gt;head == &amp;dev_priv-&gt;i2c_ports)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-		if (i2c-&gt;port_type == 6) {</div><div class='del'>-			reg += i2c-&gt;read * 0x50;</div><div class='add'>+	if (dev_priv-&gt;card_type &gt;= NV_50 &amp;&amp; (port-&gt;dcb &amp; 0x00000100)) {</div><div class='add'>+		u32 reg = 0x00e500, val;</div><div class='add'>+		if (port-&gt;type == 6) {</div><div class='add'>+			reg += port-&gt;drive * 0x50;</div><div class='ctx'> 			val  = 0x2002;</div><div class='ctx'> 		} else {</div><div class='del'>-			reg += ((i2c-&gt;entry &amp; 0x1e00) &gt;&gt; 9) * 0x50;</div><div class='add'>+			reg += ((port-&gt;dcb &amp; 0x1e00) &gt;&gt; 9) * 0x50;</div><div class='ctx'> 			val  = 0xe001;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -294,9 +497,7 @@ nouveau_i2c_find(struct drm_device *dev, int index)</div><div class='ctx'> 		nv_mask(dev, reg + 0x00, 0x0000f003, val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!i2c-&gt;chan &amp;&amp; nouveau_i2c_init(dev, i2c, index))</div><div class='del'>-		return NULL;</div><div class='del'>-	return i2c-&gt;chan;</div><div class='add'>+	return port;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool</div><div class='hunk'>@@ -331,9 +532,13 @@ nouveau_i2c_identify(struct drm_device *dev, const char *what,</div><div class='ctx'> 	struct nouveau_i2c_chan *i2c = nouveau_i2c_find(dev, index);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	NV_DEBUG(dev, "Probing %ss on I2C bus: %d\n", what, index);</div><div class='add'>+	if (!i2c) {</div><div class='add'>+		NV_DEBUG(dev, "No bus when probing %s on %d\n", what, index);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i2c &amp;&amp; info[i].addr; i++) {</div><div class='add'>+	NV_DEBUG(dev, "Probing %ss on I2C bus: %d\n", what, i2c-&gt;index);</div><div class='add'>+	for (i = 0; info[i].addr; i++) {</div><div class='ctx'> 		if (nouveau_probe_i2c_addr(i2c, info[i].addr) &amp;&amp;</div><div class='ctx'> 		    (!match || match(i2c, &amp;info[i]))) {</div><div class='ctx'> 			NV_INFO(dev, "Detected %s: %s\n", what, info[i].type);</div><div class='hunk'>@@ -342,6 +547,5 @@ nouveau_i2c_identify(struct drm_device *dev, const char *what,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	NV_DEBUG(dev, "No devices found.\n");</div><div class='del'>-</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.h b/drivers/gpu/drm/nouveau/nouveau_i2c.h<br/>index 422b62fd8272..4d2e4e9031be 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_i2c.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_i2c.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_i2c.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_i2c.h</a></div><div class='hunk'>@@ -27,20 +27,25 @@</div><div class='ctx'> #include &lt;linux/i2c-algo-bit.h&gt;</div><div class='ctx'> #include "drm_dp_helper.h"</div><div class='ctx'> </div><div class='del'>-struct dcb_i2c_entry;</div><div class='add'>+#define NV_I2C_PORT(n)    (0x00 + (n))</div><div class='add'>+#define NV_I2C_PORT_NUM    0x10</div><div class='add'>+#define NV_I2C_DEFAULT(n) (0x80 + (n))</div><div class='ctx'> </div><div class='ctx'> struct nouveau_i2c_chan {</div><div class='ctx'> 	struct i2c_adapter adapter;</div><div class='ctx'> 	struct drm_device *dev;</div><div class='del'>-	struct i2c_algo_bit_data bit;</div><div class='del'>-	unsigned rd;</div><div class='del'>-	unsigned wr;</div><div class='del'>-	unsigned data;</div><div class='add'>+	struct list_head head;</div><div class='add'>+	u8  index;</div><div class='add'>+	u8  type;</div><div class='add'>+	u32 dcb;</div><div class='add'>+	u32 drive;</div><div class='add'>+	u32 sense;</div><div class='add'>+	u32 state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int nouveau_i2c_init(struct drm_device *, struct dcb_i2c_entry *, int index);</div><div class='del'>-void nouveau_i2c_fini(struct drm_device *, struct dcb_i2c_entry *);</div><div class='del'>-struct nouveau_i2c_chan *nouveau_i2c_find(struct drm_device *, int index);</div><div class='add'>+int  nouveau_i2c_init(struct drm_device *);</div><div class='add'>+void nouveau_i2c_fini(struct drm_device *);</div><div class='add'>+struct nouveau_i2c_chan *nouveau_i2c_find(struct drm_device *, u8 index);</div><div class='ctx'> bool nouveau_probe_i2c_addr(struct nouveau_i2c_chan *i2c, int addr);</div><div class='ctx'> int nouveau_i2c_identify(struct drm_device *dev, const char *what,</div><div class='ctx'> 			 struct i2c_board_info *info,</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c<br/>index 36bec4807701..c3a5745e9c79 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_mem.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_mem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_mem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_mem.c</a></div><div class='hunk'>@@ -407,6 +407,12 @@ nouveau_mem_vram_init(struct drm_device *dev)</div><div class='ctx'> 	ret = pci_set_dma_mask(dev-&gt;pdev, DMA_BIT_MASK(dma_bits));</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='add'>+	ret = pci_set_consistent_dma_mask(dev-&gt;pdev, DMA_BIT_MASK(dma_bits));</div><div class='add'>+	if (ret) {</div><div class='add'>+		/* Reset to default value. */</div><div class='add'>+		pci_set_consistent_dma_mask(dev-&gt;pdev, DMA_BIT_MASK(32));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	ret = nouveau_ttm_global_init(dev_priv);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -638,10 +644,10 @@ nouveau_mem_timing_init(struct drm_device *dev)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		if (P.version == 1)</div><div class='del'>-			hdr = (struct nouveau_pm_tbl_header *) ROMPTR(bios, P.data[4]);</div><div class='add'>+			hdr = (struct nouveau_pm_tbl_header *) ROMPTR(dev, P.data[4]);</div><div class='ctx'> 		else</div><div class='ctx'> 		if (P.version == 2)</div><div class='del'>-			hdr = (struct nouveau_pm_tbl_header *) ROMPTR(bios, P.data[8]);</div><div class='add'>+			hdr = (struct nouveau_pm_tbl_header *) ROMPTR(dev, P.data[8]);</div><div class='ctx'> 		else {</div><div class='ctx'> 			NV_WARN(dev, "unknown mem for BIT P %d\n", P.version);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_mxm.c b/drivers/gpu/drm/nouveau/nouveau_mxm.c<br/>new file mode 100644<br/>index 000000000000..8bccddf4eff0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_mxm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_mxm.c</a></div><div class='hunk'>@@ -0,0 +1,677 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2011 Red Hat Inc.</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice shall be included in</div><div class='add'>+ * all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR</div><div class='add'>+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,</div><div class='add'>+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ * OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors: Ben Skeggs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "nouveau_drv.h"</div><div class='add'>+</div><div class='add'>+#define MXM_DBG(dev, fmt, args...) NV_DEBUG((dev), "MXM: " fmt, ##args)</div><div class='add'>+#define MXM_MSG(dev, fmt, args...) NV_INFO((dev), "MXM: " fmt, ##args)</div><div class='add'>+</div><div class='add'>+static u8 *</div><div class='add'>+mxms_data(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	return dev_priv-&gt;mxms;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16</div><div class='add'>+mxms_version(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 *mxms = mxms_data(dev);</div><div class='add'>+	u16 version = (mxms[4] &lt;&lt; 8) | mxms[5];</div><div class='add'>+	switch (version ) {</div><div class='add'>+	case 0x0200:</div><div class='add'>+	case 0x0201:</div><div class='add'>+	case 0x0300:</div><div class='add'>+		return version;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	MXM_DBG(dev, "unknown version %d.%d\n", mxms[4], mxms[5]);</div><div class='add'>+	return 0x0000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16</div><div class='add'>+mxms_headerlen(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	return 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16</div><div class='add'>+mxms_structlen(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	return *(u16 *)&amp;mxms_data(dev)[6];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+mxms_checksum(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	u16 size = mxms_headerlen(dev) + mxms_structlen(dev);</div><div class='add'>+	u8 *mxms = mxms_data(dev), sum = 0;</div><div class='add'>+	while (size--)</div><div class='add'>+		sum += *mxms++;</div><div class='add'>+	if (sum) {</div><div class='add'>+		MXM_DBG(dev, "checksum invalid\n");</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</div><div class='add'>+mxms_valid(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 *mxms = mxms_data(dev);</div><div class='add'>+	if (*(u32 *)mxms != 0x5f4d584d) {</div><div class='add'>+		MXM_DBG(dev, "signature invalid\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mxms_version(dev) || !mxms_checksum(dev))</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</div><div class='add'>+mxms_foreach(struct drm_device *dev, u8 types,</div><div class='add'>+	     bool (*exec)(struct drm_device *, u8 *, void *), void *info)</div><div class='add'>+{</div><div class='add'>+	u8 *mxms = mxms_data(dev);</div><div class='add'>+	u8 *desc = mxms + mxms_headerlen(dev);</div><div class='add'>+	u8 *fini = desc + mxms_structlen(dev) - 1;</div><div class='add'>+	while (desc &lt; fini) {</div><div class='add'>+		u8 type = desc[0] &amp; 0x0f;</div><div class='add'>+		u8 headerlen = 0;</div><div class='add'>+		u8 recordlen = 0;</div><div class='add'>+		u8 entries = 0;</div><div class='add'>+</div><div class='add'>+		switch (type) {</div><div class='add'>+		case 0: /* Output Device Structure */</div><div class='add'>+			if (mxms_version(dev) &gt;= 0x0300)</div><div class='add'>+				headerlen = 8;</div><div class='add'>+			else</div><div class='add'>+				headerlen = 6;</div><div class='add'>+			break;</div><div class='add'>+		case 1: /* System Cooling Capability Structure */</div><div class='add'>+		case 2: /* Thermal Structure */</div><div class='add'>+		case 3: /* Input Power Structure */</div><div class='add'>+			headerlen = 4;</div><div class='add'>+			break;</div><div class='add'>+		case 4: /* GPIO Device Structure */</div><div class='add'>+			headerlen = 4;</div><div class='add'>+			recordlen = 2;</div><div class='add'>+			entries   = (ROM32(desc[0]) &amp; 0x01f00000) &gt;&gt; 20;</div><div class='add'>+			break;</div><div class='add'>+		case 5: /* Vendor Specific Structure */</div><div class='add'>+			headerlen = 8;</div><div class='add'>+			break;</div><div class='add'>+		case 6: /* Backlight Control Structure */</div><div class='add'>+			if (mxms_version(dev) &gt;= 0x0300) {</div><div class='add'>+				headerlen = 4;</div><div class='add'>+				recordlen = 8;</div><div class='add'>+				entries   = (desc[1] &amp; 0xf0) &gt;&gt; 4;</div><div class='add'>+			} else {</div><div class='add'>+				headerlen = 8;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case 7: /* Fan Control Structure */</div><div class='add'>+			headerlen = 8;</div><div class='add'>+			recordlen = 4;</div><div class='add'>+			entries   = desc[1] &amp; 0x07;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			MXM_DBG(dev, "unknown descriptor type %d\n", type);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((drm_debug &amp; DRM_UT_DRIVER) &amp;&amp; (exec == NULL)) {</div><div class='add'>+			static const char * mxms_desc_name[] = {</div><div class='add'>+				"ODS", "SCCS", "TS", "IPS",</div><div class='add'>+				"GSD", "VSS", "BCS", "FCS",</div><div class='add'>+			};</div><div class='add'>+			u8 *dump = desc;</div><div class='add'>+			int i, j;</div><div class='add'>+</div><div class='add'>+			MXM_DBG(dev, "%4s: ", mxms_desc_name[type]);</div><div class='add'>+			for (j = headerlen - 1; j &gt;= 0; j--)</div><div class='add'>+				printk("%02x", dump[j]);</div><div class='add'>+			printk("\n");</div><div class='add'>+			dump += headerlen;</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; entries; i++, dump += recordlen) {</div><div class='add'>+				MXM_DBG(dev, "      ");</div><div class='add'>+				for (j = recordlen - 1; j &gt;= 0; j--)</div><div class='add'>+					printk("%02x", dump[j]);</div><div class='add'>+				printk("\n");</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (types &amp; (1 &lt;&lt; type)) {</div><div class='add'>+			if (!exec(dev, desc, info))</div><div class='add'>+				return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		desc += headerlen + (entries * recordlen);</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 u8 *</div><div class='add'>+mxm_table(struct drm_device *dev, u8 *size)</div><div class='add'>+{</div><div class='add'>+	struct bit_entry x;</div><div class='add'>+</div><div class='add'>+	if (bit_table(dev, 'x', &amp;x)) {</div><div class='add'>+		MXM_DBG(dev, "BIT 'x' table not present\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (x.version != 1 || x.length &lt; 3) {</div><div class='add'>+		MXM_MSG(dev, "BIT x table %d/%d unknown\n",</div><div class='add'>+			x.version, x.length);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*size = x.length;</div><div class='add'>+	return x.data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* These map MXM v2.x digital connection values to the appropriate SOR/link,</div><div class='add'>+ * hopefully they're correct for all boards within the same chipset...</div><div class='add'>+ *</div><div class='add'>+ * MXM v3.x VBIOS are nicer and provide pointers to these tables.</div><div class='add'>+ */</div><div class='add'>+static u8 nv84_sor_map[16] = {</div><div class='add'>+	0x00, 0x12, 0x22, 0x11, 0x32, 0x31, 0x11, 0x31,</div><div class='add'>+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 nv92_sor_map[16] = {</div><div class='add'>+	0x00, 0x12, 0x22, 0x11, 0x32, 0x31, 0x11, 0x31,</div><div class='add'>+	0x11, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 nv94_sor_map[16] = {</div><div class='add'>+	0x00, 0x14, 0x24, 0x11, 0x34, 0x31, 0x11, 0x31,</div><div class='add'>+	0x11, 0x31, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 nv96_sor_map[16] = {</div><div class='add'>+	0x00, 0x14, 0x24, 0x00, 0x34, 0x00, 0x11, 0x31,</div><div class='add'>+	0x11, 0x31, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 nv98_sor_map[16] = {</div><div class='add'>+	0x00, 0x14, 0x12, 0x11, 0x00, 0x31, 0x11, 0x31,</div><div class='add'>+	0x11, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+mxm_sor_map(struct drm_device *dev, u8 conn)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u8 len, *mxm = mxm_table(dev, &amp;len);</div><div class='add'>+	if (mxm &amp;&amp; len &gt;= 6) {</div><div class='add'>+		u8 *map = ROMPTR(dev, mxm[4]);</div><div class='add'>+		if (map) {</div><div class='add'>+			if (map[0] == 0x10) {</div><div class='add'>+				if (conn &lt; map[3])</div><div class='add'>+					return map[map[1] + conn];</div><div class='add'>+				return 0x00;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			MXM_MSG(dev, "unknown sor map 0x%02x\n", map[0]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;chipset == 0x84 || dev_priv-&gt;chipset == 0x86)</div><div class='add'>+		return nv84_sor_map[conn];</div><div class='add'>+	if (dev_priv-&gt;chipset == 0x92)</div><div class='add'>+		return nv92_sor_map[conn];</div><div class='add'>+	if (dev_priv-&gt;chipset == 0x94)</div><div class='add'>+		return nv94_sor_map[conn];</div><div class='add'>+	if (dev_priv-&gt;chipset == 0x96)</div><div class='add'>+		return nv96_sor_map[conn];</div><div class='add'>+	if (dev_priv-&gt;chipset == 0x98)</div><div class='add'>+		return nv98_sor_map[conn];</div><div class='add'>+</div><div class='add'>+	MXM_MSG(dev, "missing sor map\n");</div><div class='add'>+	return 0x00;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+mxm_ddc_map(struct drm_device *dev, u8 port)</div><div class='add'>+{</div><div class='add'>+	u8 len, *mxm = mxm_table(dev, &amp;len);</div><div class='add'>+	if (mxm &amp;&amp; len &gt;= 8) {</div><div class='add'>+		u8 *map = ROMPTR(dev, mxm[6]);</div><div class='add'>+		if (map) {</div><div class='add'>+			if (map[0] == 0x10) {</div><div class='add'>+				if (port &lt; map[3])</div><div class='add'>+					return map[map[1] + port];</div><div class='add'>+				return 0x00;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			MXM_MSG(dev, "unknown ddc map 0x%02x\n", map[0]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* v2.x: directly write port as dcb i2cidx */</div><div class='add'>+	return (port &lt;&lt; 4) | port;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct mxms_odev {</div><div class='add'>+	u8 outp_type;</div><div class='add'>+	u8 conn_type;</div><div class='add'>+	u8 ddc_port;</div><div class='add'>+	u8 dig_conn;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mxms_output_device(struct drm_device *dev, u8 *pdata, struct mxms_odev *desc)</div><div class='add'>+{</div><div class='add'>+	u64 data = ROM32(pdata[0]);</div><div class='add'>+	if (mxms_version(dev) &gt;= 0x0300)</div><div class='add'>+		data |= (u64)ROM16(pdata[4]) &lt;&lt; 32;</div><div class='add'>+</div><div class='add'>+	desc-&gt;outp_type = (data &amp; 0x00000000000000f0ULL) &gt;&gt; 4;</div><div class='add'>+	desc-&gt;ddc_port  = (data &amp; 0x0000000000000f00ULL) &gt;&gt; 8;</div><div class='add'>+	desc-&gt;conn_type = (data &amp; 0x000000000001f000ULL) &gt;&gt; 12;</div><div class='add'>+	desc-&gt;dig_conn  = (data &amp; 0x0000000000780000ULL) &gt;&gt; 19;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct context {</div><div class='add'>+	u32 *outp;</div><div class='add'>+	struct mxms_odev desc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+mxm_match_tmds_partner(struct drm_device *dev, u8 *data, void *info)</div><div class='add'>+{</div><div class='add'>+	struct context *ctx = info;</div><div class='add'>+	struct mxms_odev desc;</div><div class='add'>+</div><div class='add'>+	mxms_output_device(dev, data, &amp;desc);</div><div class='add'>+	if (desc.outp_type == 2 &amp;&amp;</div><div class='add'>+	    desc.dig_conn == ctx-&gt;desc.dig_conn)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+mxm_match_dcb(struct drm_device *dev, u8 *data, void *info)</div><div class='add'>+{</div><div class='add'>+	struct context *ctx = info;</div><div class='add'>+	u64 desc = *(u64 *)data;</div><div class='add'>+</div><div class='add'>+	mxms_output_device(dev, data, &amp;ctx-&gt;desc);</div><div class='add'>+</div><div class='add'>+	/* match dcb encoder type to mxm-ods device type */</div><div class='add'>+	if ((ctx-&gt;outp[0] &amp; 0x0000000f) != ctx-&gt;desc.outp_type)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* digital output, have some extra stuff to match here, there's a</div><div class='add'>+	 * table in the vbios that provides a mapping from the mxm digital</div><div class='add'>+	 * connection enum values to SOR/link</div><div class='add'>+	 */</div><div class='add'>+	if ((desc &amp; 0x00000000000000f0) &gt;= 0x20) {</div><div class='add'>+		/* check against sor index */</div><div class='add'>+		u8 link = mxm_sor_map(dev, ctx-&gt;desc.dig_conn);</div><div class='add'>+		if ((ctx-&gt;outp[0] &amp; 0x0f000000) != (link &amp; 0x0f) &lt;&lt; 24)</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		/* check dcb entry has a compatible link field */</div><div class='add'>+		link = (link &amp; 0x30) &gt;&gt; 4;</div><div class='add'>+		if ((link &amp; ((ctx-&gt;outp[1] &amp; 0x00000030) &gt;&gt; 4)) != link)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* mark this descriptor accounted for by setting invalid device type,</div><div class='add'>+	 * except of course some manufactures don't follow specs properly and</div><div class='add'>+	 * we need to avoid killing off the TMDS function on DP connectors</div><div class='add'>+	 * if MXM-SIS is missing an entry for it.</div><div class='add'>+	 */</div><div class='add'>+	data[0] &amp;= ~0xf0;</div><div class='add'>+	if (ctx-&gt;desc.outp_type == 6 &amp;&amp; ctx-&gt;desc.conn_type == 6 &amp;&amp;</div><div class='add'>+	    mxms_foreach(dev, 0x01, mxm_match_tmds_partner, ctx)) {</div><div class='add'>+		data[0] |= 0x20; /* modify descriptor to match TMDS now */</div><div class='add'>+	} else {</div><div class='add'>+		data[0] |= 0xf0;</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</div><div class='add'>+mxm_dcb_sanitise_entry(struct drm_device *dev, void *data, int idx, u8 *dcbe)</div><div class='add'>+{</div><div class='add'>+	struct context ctx = { .outp = (u32 *)dcbe };</div><div class='add'>+	u8 type, i2cidx, link;</div><div class='add'>+	u8 *conn;</div><div class='add'>+</div><div class='add'>+	/* look for an output device structure that matches this dcb entry.</div><div class='add'>+	 * if one isn't found, disable it.</div><div class='add'>+	 */</div><div class='add'>+	if (mxms_foreach(dev, 0x01, mxm_match_dcb, &amp;ctx)) {</div><div class='add'>+		MXM_DBG(dev, "disable %d: 0x%08x 0x%08x\n",</div><div class='add'>+			idx, ctx.outp[0], ctx.outp[1]);</div><div class='add'>+		ctx.outp[0] |= 0x0000000f;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* modify the output's ddc/aux port, there's a pointer to a table</div><div class='add'>+	 * with the mapping from mxm ddc/aux port to dcb i2c_index in the</div><div class='add'>+	 * vbios mxm table</div><div class='add'>+	 */</div><div class='add'>+	i2cidx = mxm_ddc_map(dev, ctx.desc.ddc_port);</div><div class='add'>+	if ((ctx.outp[0] &amp; 0x0000000f) != OUTPUT_DP)</div><div class='add'>+		i2cidx = (i2cidx &amp; 0x0f) &lt;&lt; 4;</div><div class='add'>+	else</div><div class='add'>+		i2cidx = (i2cidx &amp; 0xf0);</div><div class='add'>+</div><div class='add'>+	if (i2cidx != 0xf0) {</div><div class='add'>+		ctx.outp[0] &amp;= ~0x000000f0;</div><div class='add'>+		ctx.outp[0] |= i2cidx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* override dcb sorconf.link, based on what mxm data says */</div><div class='add'>+	switch (ctx.desc.outp_type) {</div><div class='add'>+	case 0x00: /* Analog CRT */</div><div class='add'>+	case 0x01: /* Analog TV/HDTV */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		link = mxm_sor_map(dev, ctx.desc.dig_conn) &amp; 0x30;</div><div class='add'>+		ctx.outp[1] &amp;= ~0x00000030;</div><div class='add'>+		ctx.outp[1] |= link;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we may need to fixup various other vbios tables based on what</div><div class='add'>+	 * the descriptor says the connector type should be.</div><div class='add'>+	 *</div><div class='add'>+	 * in a lot of cases, the vbios tables will claim DVI-I is possible,</div><div class='add'>+	 * and the mxm data says the connector is really HDMI.  another</div><div class='add'>+	 * common example is DP-&gt;eDP.</div><div class='add'>+	 */</div><div class='add'>+	conn = dcb_conn(dev, (ctx.outp[0] &amp; 0x0000f000) &gt;&gt; 12);</div><div class='add'>+	type = conn[0];</div><div class='add'>+	switch (ctx.desc.conn_type) {</div><div class='add'>+	case 0x01: /* LVDS */</div><div class='add'>+		ctx.outp[1] |= 0x00000004; /* use_power_scripts */</div><div class='add'>+		/* XXX: modify default link width in LVDS table */</div><div class='add'>+		break;</div><div class='add'>+	case 0x02: /* HDMI */</div><div class='add'>+		type = DCB_CONNECTOR_HDMI_1;</div><div class='add'>+		break;</div><div class='add'>+	case 0x03: /* DVI-D */</div><div class='add'>+		type = DCB_CONNECTOR_DVI_D;</div><div class='add'>+		break;</div><div class='add'>+	case 0x0e: /* eDP, falls through to DPint */</div><div class='add'>+		ctx.outp[1] |= 0x00010000;</div><div class='add'>+	case 0x07: /* DP internal, wtf is this?? HP8670w */</div><div class='add'>+		ctx.outp[1] |= 0x00000004; /* use_power_scripts? */</div><div class='add'>+		type = DCB_CONNECTOR_eDP;</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 (mxms_version(dev) &gt;= 0x0300)</div><div class='add'>+		conn[0] = type;</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'>+mxm_show_unmatched(struct drm_device *dev, u8 *data, void *info)</div><div class='add'>+{</div><div class='add'>+	u64 desc = *(u64 *)data;</div><div class='add'>+	if ((desc &amp; 0xf0) != 0xf0)</div><div class='add'>+		MXM_MSG(dev, "unmatched output device 0x%016llx\n", desc);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mxm_dcb_sanitise(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 *dcb = dcb_table(dev);</div><div class='add'>+	if (!dcb || dcb[0] != 0x40) {</div><div class='add'>+		MXM_DBG(dev, "unsupported DCB version\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dcb_outp_foreach(dev, NULL, mxm_dcb_sanitise_entry);</div><div class='add'>+	mxms_foreach(dev, 0x01, mxm_show_unmatched, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+mxm_shadow_rom_fetch(struct nouveau_i2c_chan *i2c, u8 addr,</div><div class='add'>+		     u8 offset, u8 size, u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct i2c_msg msgs[] = {</div><div class='add'>+		{ .addr = addr, .flags = 0, .len = 1, .buf = &amp;offset },</div><div class='add'>+		{ .addr = addr, .flags = I2C_M_RD, .len = size, .buf = data, },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return i2c_transfer(&amp;i2c-&gt;adapter, msgs, 2) == 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+mxm_shadow_rom(struct drm_device *dev, u8 version)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_i2c_chan *i2c = NULL;</div><div class='add'>+	u8 i2cidx, mxms[6], addr, size;</div><div class='add'>+</div><div class='add'>+	i2cidx = mxm_ddc_map(dev, 1 /* LVDS_DDC */) &amp; 0x0f;</div><div class='add'>+	if (i2cidx &lt; 0x0f)</div><div class='add'>+		i2c = nouveau_i2c_find(dev, i2cidx);</div><div class='add'>+	if (!i2c)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	addr = 0x54;</div><div class='add'>+	if (!mxm_shadow_rom_fetch(i2c, addr, 0, 6, mxms)) {</div><div class='add'>+		addr = 0x56;</div><div class='add'>+		if (!mxm_shadow_rom_fetch(i2c, addr, 0, 6, mxms))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;mxms = mxms;</div><div class='add'>+	size = mxms_headerlen(dev) + mxms_structlen(dev);</div><div class='add'>+	dev_priv-&gt;mxms = kmalloc(size, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;mxms &amp;&amp;</div><div class='add'>+	    mxm_shadow_rom_fetch(i2c, addr, 0, size, dev_priv-&gt;mxms))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	kfree(dev_priv-&gt;mxms);</div><div class='add'>+	dev_priv-&gt;mxms = NULL;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ACPI)</div><div class='add'>+static bool</div><div class='add'>+mxm_shadow_dsm(struct drm_device *dev, u8 version)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	static char muid[] = {</div><div class='add'>+		0x00, 0xA4, 0x04, 0x40, 0x7D, 0x91, 0xF2, 0x4C,</div><div class='add'>+		0xB8, 0x9C, 0x79, 0xB6, 0x2F, 0xD5, 0x56, 0x65</div><div class='add'>+	};</div><div class='add'>+	u32 mxms_args[] = { 0x00000000 };</div><div class='add'>+	union acpi_object args[4] = {</div><div class='add'>+		/* _DSM MUID */</div><div class='add'>+		{ .buffer.type = 3,</div><div class='add'>+		  .buffer.length = sizeof(muid),</div><div class='add'>+		  .buffer.pointer = muid,</div><div class='add'>+		},</div><div class='add'>+		/* spec says this can be zero to mean "highest revision", but</div><div class='add'>+		 * of course there's at least one bios out there which fails</div><div class='add'>+		 * unless you pass in exactly the version it supports..</div><div class='add'>+		 */</div><div class='add'>+		{ .integer.type = ACPI_TYPE_INTEGER,</div><div class='add'>+		  .integer.value = (version &amp; 0xf0) &lt;&lt; 4 | (version &amp; 0x0f),</div><div class='add'>+		},</div><div class='add'>+		/* MXMS function */</div><div class='add'>+		{ .integer.type = ACPI_TYPE_INTEGER,</div><div class='add'>+		  .integer.value = 0x00000010,</div><div class='add'>+		},</div><div class='add'>+		/* Pointer to MXMS arguments */</div><div class='add'>+		{ .buffer.type = ACPI_TYPE_BUFFER,</div><div class='add'>+		  .buffer.length = sizeof(mxms_args),</div><div class='add'>+		  .buffer.pointer = (char *)mxms_args,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	struct acpi_object_list list = { ARRAY_SIZE(args), args };</div><div class='add'>+	struct acpi_buffer retn = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='add'>+	union acpi_object *obj;</div><div class='add'>+	acpi_handle handle;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	handle = DEVICE_ACPI_HANDLE(&amp;dev-&gt;pdev-&gt;dev);</div><div class='add'>+	if (!handle)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ret = acpi_evaluate_object(handle, "_DSM", &amp;list, &amp;retn);</div><div class='add'>+	if (ret) {</div><div class='add'>+		MXM_DBG(dev, "DSM MXMS failed: %d\n", ret);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	obj = retn.pointer;</div><div class='add'>+	if (obj-&gt;type == ACPI_TYPE_BUFFER) {</div><div class='add'>+		dev_priv-&gt;mxms = kmemdup(obj-&gt;buffer.pointer,</div><div class='add'>+					 obj-&gt;buffer.length, GFP_KERNEL);</div><div class='add'>+	} else</div><div class='add'>+	if (obj-&gt;type == ACPI_TYPE_INTEGER) {</div><div class='add'>+		MXM_DBG(dev, "DSM MXMS returned 0x%llx\n", obj-&gt;integer.value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(obj);</div><div class='add'>+	return dev_priv-&gt;mxms != NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ACPI_WMI) || defined(CONFIG_ACPI_WMI_MODULE)</div><div class='add'>+</div><div class='add'>+#define WMI_WMMX_GUID "F6CB5C3C-9CAE-4EBD-B577-931EA32A2CC0"</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+mxm_shadow_wmi(struct drm_device *dev, u8 version)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 mxms_args[] = { 0x534D584D /* MXMS */, version, 0 };</div><div class='add'>+	struct acpi_buffer args = { sizeof(mxms_args), mxms_args };</div><div class='add'>+	struct acpi_buffer retn = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='add'>+	union acpi_object *obj;</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	if (!wmi_has_guid(WMI_WMMX_GUID))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	status = wmi_evaluate_method(WMI_WMMX_GUID, 0, 0, &amp;args, &amp;retn);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		MXM_DBG(dev, "WMMX MXMS returned %d\n", status);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	obj = retn.pointer;</div><div class='add'>+	if (obj-&gt;type == ACPI_TYPE_BUFFER) {</div><div class='add'>+		dev_priv-&gt;mxms = kmemdup(obj-&gt;buffer.pointer,</div><div class='add'>+					 obj-&gt;buffer.length, GFP_KERNEL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(obj);</div><div class='add'>+	return dev_priv-&gt;mxms != NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct mxm_shadow_h {</div><div class='add'>+	const char *name;</div><div class='add'>+	bool (*exec)(struct drm_device *, u8 version);</div><div class='add'>+} _mxm_shadow[] = {</div><div class='add'>+	{ "ROM", mxm_shadow_rom },</div><div class='add'>+#if defined(CONFIG_ACPI)</div><div class='add'>+	{ "DSM", mxm_shadow_dsm },</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_ACPI_WMI) || defined(CONFIG_ACPI_WMI_MODULE)</div><div class='add'>+	{ "WMI", mxm_shadow_wmi },</div><div class='add'>+#endif</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mxm_shadow(struct drm_device *dev, u8 version)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct mxm_shadow_h *shadow = _mxm_shadow;</div><div class='add'>+	do {</div><div class='add'>+		MXM_DBG(dev, "checking %s\n", shadow-&gt;name);</div><div class='add'>+		if (shadow-&gt;exec(dev, version)) {</div><div class='add'>+			if (mxms_valid(dev))</div><div class='add'>+				return 0;</div><div class='add'>+			kfree(dev_priv-&gt;mxms);</div><div class='add'>+			dev_priv-&gt;mxms = NULL;</div><div class='add'>+		}</div><div class='add'>+	} while ((++shadow)-&gt;name);</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nouveau_mxm_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 mxm_size, *mxm = mxm_table(dev, &amp;mxm_size);</div><div class='add'>+	if (!mxm || !mxm[0]) {</div><div class='add'>+		MXM_MSG(dev, "no VBIOS data, nothing to do\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	MXM_MSG(dev, "BIOS version %d.%d\n", mxm[0] &gt;&gt; 4, mxm[0] &amp; 0x0f);</div><div class='add'>+</div><div class='add'>+	if (mxm_shadow(dev, mxm[0])) {</div><div class='add'>+		MXM_MSG(dev, "failed to locate valid SIS\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	MXM_MSG(dev, "MXMS Version %d.%d\n",</div><div class='add'>+		mxms_version(dev) &gt;&gt; 8, mxms_version(dev) &amp; 0xff);</div><div class='add'>+	mxms_foreach(dev, 0, NULL, NULL);</div><div class='add'>+</div><div class='add'>+	if (nouveau_mxmdcb)</div><div class='add'>+		mxm_dcb_sanitise(dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+nouveau_mxm_fini(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	kfree(dev_priv-&gt;mxms);</div><div class='add'>+	dev_priv-&gt;mxms = NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_notifier.c b/drivers/gpu/drm/nouveau/nouveau_notifier.c<br/>index 6abdbe6530a7..2ef883c4bbc1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_notifier.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_notifier.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_notifier.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_notifier.c</a></div><div class='hunk'>@@ -115,7 +115,7 @@ nouveau_notifier_alloc(struct nouveau_channel *chan, uint32_t handle,</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	struct nouveau_gpuobj *nobj = NULL;</div><div class='ctx'> 	struct drm_mm_node *mem;</div><div class='del'>-	uint32_t offset;</div><div class='add'>+	uint64_t offset;</div><div class='ctx'> 	int target, ret;</div><div class='ctx'> </div><div class='ctx'> 	mem = drm_mm_search_free_in_range(&amp;chan-&gt;notifier_heap, size, 0,</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c<br/>index 960c0ae0c0c3..cc419fae794b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_object.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_object.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_object.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_object.c</a></div><div class='hunk'>@@ -723,14 +723,14 @@ nvc0_gpuobj_channel_init(struct nouveau_channel *chan, struct nouveau_vm *vm)</div><div class='ctx'> 	nv_wo32(chan-&gt;ramin, 0x020c, 0x000000ff);</div><div class='ctx'> </div><div class='ctx'> 	/* map display semaphore buffers into channel's vm */</div><div class='del'>-	if (dev_priv-&gt;card_type &gt;= NV_D0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		struct nv50_display_crtc *dispc = &amp;nv50_display(dev)-&gt;crtc[i];</div><div class='del'>-</div><div class='del'>-		ret = nouveau_bo_vma_add(dispc-&gt;sem.bo, chan-&gt;vm,</div><div class='del'>-					 &amp;chan-&gt;dispc_vma[i]);</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;mode_config.num_crtc; i++) {</div><div class='add'>+		struct nouveau_bo *bo;</div><div class='add'>+		if (dev_priv-&gt;card_type &gt;= NV_D0)</div><div class='add'>+			bo = nvd0_display_crtc_sema(dev, i);</div><div class='add'>+		else</div><div class='add'>+			bo = nv50_display(dev)-&gt;crtc[i].sem.bo;</div><div class='add'>+</div><div class='add'>+		ret = nouveau_bo_vma_add(bo, chan-&gt;vm, &amp;chan-&gt;dispc_vma[i]);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -879,9 +879,14 @@ nouveau_gpuobj_channel_takedown(struct nouveau_channel *chan)</div><div class='ctx'> </div><div class='ctx'> 	NV_DEBUG(dev, "ch%d\n", chan-&gt;id);</div><div class='ctx'> </div><div class='del'>-	if (dev_priv-&gt;card_type &gt;= NV_50 &amp;&amp; dev_priv-&gt;card_type &lt;= NV_C0) {</div><div class='add'>+	if (dev_priv-&gt;card_type &gt;= NV_D0) {</div><div class='add'>+		for (i = 0; i &lt; dev-&gt;mode_config.num_crtc; i++) {</div><div class='add'>+			struct nouveau_bo *bo = nvd0_display_crtc_sema(dev, i);</div><div class='add'>+			nouveau_bo_vma_del(bo, &amp;chan-&gt;dispc_vma[i]);</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+	if (dev_priv-&gt;card_type &gt;= NV_50) {</div><div class='ctx'> 		struct nv50_display *disp = nv50_display(dev);</div><div class='del'>-</div><div class='ctx'> 		for (i = 0; i &lt; dev-&gt;mode_config.num_crtc; i++) {</div><div class='ctx'> 			struct nv50_display_crtc *dispc = &amp;disp-&gt;crtc[i];</div><div class='ctx'> 			nouveau_bo_vma_del(dispc-&gt;sem.bo, &amp;chan-&gt;dispc_vma[i]);</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c<br/>index 33d03fbf00df..58f497343cec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_perf.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_perf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_perf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_perf.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@ legacy_perf_init(struct drm_device *dev)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	perf = ROMPTR(bios, bmp[0x73]);</div><div class='add'>+	perf = ROMPTR(dev, bmp[0x73]);</div><div class='ctx'> 	if (!perf) {</div><div class='ctx'> 		NV_DEBUG(dev, "No memclock table pointer found.\n");</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -87,7 +87,7 @@ nouveau_perf_timing(struct drm_device *dev, struct bit_entry *P,</div><div class='ctx'> 	 * ramcfg to select the correct subentry</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (P-&gt;version == 2) {</div><div class='del'>-		u8 *tmap = ROMPTR(bios, P-&gt;data[4]);</div><div class='add'>+		u8 *tmap = ROMPTR(dev, P-&gt;data[4]);</div><div class='ctx'> 		if (!tmap) {</div><div class='ctx'> 			NV_DEBUG(dev, "no timing map pointer\n");</div><div class='ctx'> 			return NULL;</div><div class='hunk'>@@ -140,7 +140,6 @@ nouveau_perf_voltage(struct drm_device *dev, struct bit_entry *P,</div><div class='ctx'> 		     struct nouveau_pm_level *perflvl)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nvbios *bios = &amp;dev_priv-&gt;vbios;</div><div class='ctx'> 	u8 *vmap;</div><div class='ctx'> 	int id;</div><div class='ctx'> </div><div class='hunk'>@@ -165,7 +164,7 @@ nouveau_perf_voltage(struct drm_device *dev, struct bit_entry *P,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vmap = ROMPTR(bios, P-&gt;data[32]);</div><div class='add'>+	vmap = ROMPTR(dev, P-&gt;data[32]);</div><div class='ctx'> 	if (!vmap) {</div><div class='ctx'> 		NV_DEBUG(dev, "volt map table pointer invalid\n");</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -200,12 +199,14 @@ nouveau_perf_init(struct drm_device *dev)</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		perf = ROMPTR(bios, P.data[0]);</div><div class='add'>+		perf = ROMPTR(dev, P.data[0]);</div><div class='ctx'> 		version   = perf[0];</div><div class='ctx'> 		headerlen = perf[1];</div><div class='ctx'> 		if (version &lt; 0x40) {</div><div class='ctx'> 			recordlen = perf[3] + (perf[4] * perf[5]);</div><div class='ctx'> 			entries   = perf[2];</div><div class='add'>+</div><div class='add'>+			pm-&gt;pwm_divisor = ROM16(perf[6]);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			recordlen = perf[2] + (perf[3] * perf[4]);</div><div class='ctx'> 			entries   = perf[5];</div><div class='hunk'>@@ -216,7 +217,7 @@ nouveau_perf_init(struct drm_device *dev)</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		perf = ROMPTR(bios, bios-&gt;data[bios-&gt;offset + 0x94]);</div><div class='add'>+		perf = ROMPTR(dev, bios-&gt;data[bios-&gt;offset + 0x94]);</div><div class='ctx'> 		if (!perf) {</div><div class='ctx'> 			NV_DEBUG(dev, "perf table pointer invalid\n");</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -283,7 +284,6 @@ nouveau_perf_init(struct drm_device *dev)</div><div class='ctx'> 				perflvl-&gt;memory = ROM16(entry[11]) * 1000;</div><div class='ctx'> 			else</div><div class='ctx'> 				perflvl-&gt;memory = ROM16(entry[11]) * 2000;</div><div class='del'>-</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x25:</div><div class='ctx'> 			perflvl-&gt;fanspeed = entry[4];</div><div class='hunk'>@@ -300,8 +300,8 @@ nouveau_perf_init(struct drm_device *dev)</div><div class='ctx'> 			perflvl-&gt;core = ROM16(entry[8]) * 1000;</div><div class='ctx'> 			perflvl-&gt;shader = ROM16(entry[10]) * 1000;</div><div class='ctx'> 			perflvl-&gt;memory = ROM16(entry[12]) * 1000;</div><div class='del'>-			/*XXX: confirm on 0x35 */</div><div class='del'>-			perflvl-&gt;unk05 = ROM16(entry[16]) * 1000;</div><div class='add'>+			perflvl-&gt;vdec = ROM16(entry[16]) * 1000;</div><div class='add'>+			perflvl-&gt;dom6 = ROM16(entry[20]) * 1000;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x40:</div><div class='ctx'> #define subent(n) (ROM16(entry[perf[2] + ((n) * perf[3])]) &amp; 0xfff) * 1000</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c<br/>index a539fd257921..9064d7f19794 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_pm.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "nouveau_drv.h"</div><div class='ctx'> #include "nouveau_pm.h"</div><div class='add'>+#include "nouveau_gpio.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='hunk'>@@ -35,22 +36,95 @@</div><div class='ctx'> #include &lt;linux/hwmon-sysfs.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nouveau_pm_clock_set(struct drm_device *dev, struct nouveau_pm_level *perflvl,</div><div class='del'>-		     u8 id, u32 khz)</div><div class='add'>+nouveau_pwmfan_get(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	struct nouveau_pm_engine *pm = &amp;dev_priv-&gt;engine.pm;</div><div class='del'>-	void *pre_state;</div><div class='add'>+	struct gpio_func gpio;</div><div class='add'>+	u32 divs, duty;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (khz == 0)</div><div class='del'>-		return 0;</div><div class='add'>+	if (!pm-&gt;pwm_get)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	ret = nouveau_gpio_find(dev, 0, DCB_GPIO_PWM_FAN, 0xff, &amp;gpio);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		ret = pm-&gt;pwm_get(dev, gpio.line, &amp;divs, &amp;duty);</div><div class='add'>+		if (ret == 0) {</div><div class='add'>+			divs = max(divs, duty);</div><div class='add'>+			if (dev_priv-&gt;card_type &lt;= NV_40 || (gpio.log[0] &amp; 1))</div><div class='add'>+				duty = divs - duty;</div><div class='add'>+			return (duty * 100) / divs;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return nouveau_gpio_func_get(dev, gpio.func) * 100;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nouveau_pwmfan_set(struct drm_device *dev, int percent)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_pm_engine *pm = &amp;dev_priv-&gt;engine.pm;</div><div class='add'>+	struct gpio_func gpio;</div><div class='add'>+	u32 divs, duty;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!pm-&gt;pwm_set)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	ret = nouveau_gpio_find(dev, 0, DCB_GPIO_PWM_FAN, 0xff, &amp;gpio);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		divs = pm-&gt;pwm_divisor;</div><div class='add'>+		if (pm-&gt;fan.pwm_freq) {</div><div class='add'>+			/*XXX: PNVIO clock more than likely... */</div><div class='add'>+			divs = 135000 / pm-&gt;fan.pwm_freq;</div><div class='add'>+			if (dev_priv-&gt;chipset &lt; 0xa3)</div><div class='add'>+				divs /= 4;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		duty = ((divs * percent) + 99) / 100;</div><div class='add'>+		if (dev_priv-&gt;card_type &lt;= NV_40 || (gpio.log[0] &amp; 1))</div><div class='add'>+			duty = divs - duty;</div><div class='ctx'> </div><div class='del'>-	pre_state = pm-&gt;clock_pre(dev, perflvl, id, khz);</div><div class='del'>-	if (IS_ERR(pre_state))</div><div class='del'>-		return PTR_ERR(pre_state);</div><div class='add'>+		return pm-&gt;pwm_set(dev, gpio.line, divs, duty);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nouveau_pm_perflvl_aux(struct drm_device *dev, struct nouveau_pm_level *perflvl,</div><div class='add'>+		       struct nouveau_pm_level *a, struct nouveau_pm_level *b)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_pm_engine *pm = &amp;dev_priv-&gt;engine.pm;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*XXX: not on all boards, we should control based on temperature</div><div class='add'>+	 *     on recent boards..  or maybe on some other factor we don't</div><div class='add'>+	 *     know about?</div><div class='add'>+	 */</div><div class='add'>+	if (a-&gt;fanspeed &amp;&amp; b-&gt;fanspeed &amp;&amp; b-&gt;fanspeed &gt; a-&gt;fanspeed) {</div><div class='add'>+		ret = nouveau_pwmfan_set(dev, perflvl-&gt;fanspeed);</div><div class='add'>+		if (ret &amp;&amp; ret != -ENODEV) {</div><div class='add'>+			NV_ERROR(dev, "fanspeed set failed: %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'>+	if (pm-&gt;voltage.supported &amp;&amp; pm-&gt;voltage_set) {</div><div class='add'>+		if (perflvl-&gt;volt_min &amp;&amp; b-&gt;volt_min &gt; a-&gt;volt_min) {</div><div class='add'>+			ret = pm-&gt;voltage_set(dev, perflvl-&gt;volt_min);</div><div class='add'>+			if (ret) {</div><div class='add'>+				NV_ERROR(dev, "voltage set failed: %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'> </div><div class='del'>-	if (pre_state)</div><div class='del'>-		pm-&gt;clock_set(dev, pre_state);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -59,31 +133,24 @@ nouveau_pm_perflvl_set(struct drm_device *dev, struct nouveau_pm_level *perflvl)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	struct nouveau_pm_engine *pm = &amp;dev_priv-&gt;engine.pm;</div><div class='add'>+	void *state;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (perflvl == pm-&gt;cur)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (pm-&gt;voltage.supported &amp;&amp; pm-&gt;voltage_set &amp;&amp; perflvl-&gt;volt_min) {</div><div class='del'>-		ret = pm-&gt;voltage_set(dev, perflvl-&gt;volt_min);</div><div class='del'>-		if (ret) {</div><div class='del'>-			NV_ERROR(dev, "voltage_set %d failed: %d\n",</div><div class='del'>-				 perflvl-&gt;volt_min, ret);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	ret = nouveau_pm_perflvl_aux(dev, perflvl, pm-&gt;cur, perflvl);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (pm-&gt;clocks_pre) {</div><div class='del'>-		void *state = pm-&gt;clocks_pre(dev, perflvl);</div><div class='del'>-		if (IS_ERR(state))</div><div class='del'>-			return PTR_ERR(state);</div><div class='del'>-		pm-&gt;clocks_set(dev, state);</div><div class='del'>-	} else</div><div class='del'>-	if (pm-&gt;clock_set) {</div><div class='del'>-		nouveau_pm_clock_set(dev, perflvl, PLL_CORE, perflvl-&gt;core);</div><div class='del'>-		nouveau_pm_clock_set(dev, perflvl, PLL_SHADER, perflvl-&gt;shader);</div><div class='del'>-		nouveau_pm_clock_set(dev, perflvl, PLL_MEMORY, perflvl-&gt;memory);</div><div class='del'>-		nouveau_pm_clock_set(dev, perflvl, PLL_UNK05, perflvl-&gt;unk05);</div><div class='del'>-	}</div><div class='add'>+	state = pm-&gt;clocks_pre(dev, perflvl);</div><div class='add'>+	if (IS_ERR(state))</div><div class='add'>+		return PTR_ERR(state);</div><div class='add'>+	pm-&gt;clocks_set(dev, state);</div><div class='add'>+</div><div class='add'>+	ret = nouveau_pm_perflvl_aux(dev, perflvl, perflvl, pm-&gt;cur);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	pm-&gt;cur = perflvl;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -130,28 +197,9 @@ nouveau_pm_perflvl_get(struct drm_device *dev, struct nouveau_pm_level *perflvl)</div><div class='ctx'> </div><div class='ctx'> 	memset(perflvl, 0, sizeof(*perflvl));</div><div class='ctx'> </div><div class='del'>-	if (pm-&gt;clocks_get) {</div><div class='del'>-		ret = pm-&gt;clocks_get(dev, perflvl);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	} else</div><div class='del'>-	if (pm-&gt;clock_get) {</div><div class='del'>-		ret = pm-&gt;clock_get(dev, PLL_CORE);</div><div class='del'>-		if (ret &gt; 0)</div><div class='del'>-			perflvl-&gt;core = ret;</div><div class='del'>-</div><div class='del'>-		ret = pm-&gt;clock_get(dev, PLL_MEMORY);</div><div class='del'>-		if (ret &gt; 0)</div><div class='del'>-			perflvl-&gt;memory = ret;</div><div class='del'>-</div><div class='del'>-		ret = pm-&gt;clock_get(dev, PLL_SHADER);</div><div class='del'>-		if (ret &gt; 0)</div><div class='del'>-			perflvl-&gt;shader = ret;</div><div class='del'>-</div><div class='del'>-		ret = pm-&gt;clock_get(dev, PLL_UNK05);</div><div class='del'>-		if (ret &gt; 0)</div><div class='del'>-			perflvl-&gt;unk05 = ret;</div><div class='del'>-	}</div><div class='add'>+	ret = pm-&gt;clocks_get(dev, perflvl);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (pm-&gt;voltage.supported &amp;&amp; pm-&gt;voltage_get) {</div><div class='ctx'> 		ret = pm-&gt;voltage_get(dev);</div><div class='hunk'>@@ -161,6 +209,10 @@ nouveau_pm_perflvl_get(struct drm_device *dev, struct nouveau_pm_level *perflvl)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = nouveau_pwmfan_get(dev);</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		perflvl-&gt;fanspeed = ret;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -412,6 +464,172 @@ static SENSOR_DEVICE_ATTR(update_rate, S_IRUGO,</div><div class='ctx'> 						nouveau_hwmon_show_update_rate,</div><div class='ctx'> 						NULL, 0);</div><div class='ctx'> </div><div class='add'>+static ssize_t</div><div class='add'>+nouveau_hwmon_show_fan0_input(struct device *d, struct device_attribute *attr,</div><div class='add'>+			      char *buf)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = dev_get_drvdata(d);</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_timer_engine *ptimer = &amp;dev_priv-&gt;engine.timer;</div><div class='add'>+	struct gpio_func gpio;</div><div class='add'>+	u32 cycles, cur, prev;</div><div class='add'>+	u64 start;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = nouveau_gpio_find(dev, 0, DCB_GPIO_FAN_SENSE, 0xff, &amp;gpio);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Monitor the GPIO input 0x3b for 250ms.</div><div class='add'>+	 * When the fan spins, it changes the value of GPIO FAN_SENSE.</div><div class='add'>+	 * We get 4 changes (0 -&gt; 1 -&gt; 0 -&gt; 1 -&gt; [...]) per complete rotation.</div><div class='add'>+	 */</div><div class='add'>+	start = ptimer-&gt;read(dev);</div><div class='add'>+	prev = nouveau_gpio_sense(dev, 0, gpio.line);</div><div class='add'>+	cycles = 0;</div><div class='add'>+	do {</div><div class='add'>+		cur = nouveau_gpio_sense(dev, 0, gpio.line);</div><div class='add'>+		if (prev != cur) {</div><div class='add'>+			cycles++;</div><div class='add'>+			prev = cur;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		usleep_range(500, 1000); /* supports 0 &lt; rpm &lt; 7500 */</div><div class='add'>+	} while (ptimer-&gt;read(dev) - start &lt; 250000000);</div><div class='add'>+</div><div class='add'>+	/* interpolate to get rpm */</div><div class='add'>+	return sprintf(buf, "%i\n", cycles / 4 * 4 * 60);</div><div class='add'>+}</div><div class='add'>+static SENSOR_DEVICE_ATTR(fan0_input, S_IRUGO, nouveau_hwmon_show_fan0_input,</div><div class='add'>+			  NULL, 0);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+nouveau_hwmon_get_pwm0(struct device *d, struct device_attribute *a, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = dev_get_drvdata(d);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = nouveau_pwmfan_get(dev);</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, "%i\n", ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+nouveau_hwmon_set_pwm0(struct device *d, struct device_attribute *a,</div><div class='add'>+		       const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = dev_get_drvdata(d);</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_pm_engine *pm = &amp;dev_priv-&gt;engine.pm;</div><div class='add'>+	int ret = -ENODEV;</div><div class='add'>+	long value;</div><div class='add'>+</div><div class='add'>+	if (nouveau_perflvl_wr != 7777)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (strict_strtol(buf, 10, &amp;value) == -EINVAL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (value &lt; pm-&gt;fan.min_duty)</div><div class='add'>+		value = pm-&gt;fan.min_duty;</div><div class='add'>+	if (value &gt; pm-&gt;fan.max_duty)</div><div class='add'>+		value = pm-&gt;fan.max_duty;</div><div class='add'>+</div><div class='add'>+	ret = nouveau_pwmfan_set(dev, value);</div><div class='add'>+	if (ret)</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 SENSOR_DEVICE_ATTR(pwm0, S_IRUGO | S_IWUSR,</div><div class='add'>+			  nouveau_hwmon_get_pwm0,</div><div class='add'>+			  nouveau_hwmon_set_pwm0, 0);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+nouveau_hwmon_get_pwm0_min(struct device *d,</div><div class='add'>+			   struct device_attribute *a, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = dev_get_drvdata(d);</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_pm_engine *pm = &amp;dev_priv-&gt;engine.pm;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%i\n", pm-&gt;fan.min_duty);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+nouveau_hwmon_set_pwm0_min(struct device *d, struct device_attribute *a,</div><div class='add'>+			   const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = dev_get_drvdata(d);</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_pm_engine *pm = &amp;dev_priv-&gt;engine.pm;</div><div class='add'>+	long value;</div><div class='add'>+</div><div class='add'>+	if (strict_strtol(buf, 10, &amp;value) == -EINVAL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (value &lt; 0)</div><div class='add'>+		value = 0;</div><div class='add'>+</div><div class='add'>+	if (pm-&gt;fan.max_duty - value &lt; 10)</div><div class='add'>+		value = pm-&gt;fan.max_duty - 10;</div><div class='add'>+</div><div class='add'>+	if (value &lt; 10)</div><div class='add'>+		pm-&gt;fan.min_duty = 10;</div><div class='add'>+	else</div><div class='add'>+		pm-&gt;fan.min_duty = value;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm0_min, S_IRUGO | S_IWUSR,</div><div class='add'>+			  nouveau_hwmon_get_pwm0_min,</div><div class='add'>+			  nouveau_hwmon_set_pwm0_min, 0);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+nouveau_hwmon_get_pwm0_max(struct device *d,</div><div class='add'>+			   struct device_attribute *a, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = dev_get_drvdata(d);</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_pm_engine *pm = &amp;dev_priv-&gt;engine.pm;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%i\n", pm-&gt;fan.max_duty);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+nouveau_hwmon_set_pwm0_max(struct device *d, struct device_attribute *a,</div><div class='add'>+			   const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct drm_device *dev = dev_get_drvdata(d);</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_pm_engine *pm = &amp;dev_priv-&gt;engine.pm;</div><div class='add'>+	long value;</div><div class='add'>+</div><div class='add'>+	if (strict_strtol(buf, 10, &amp;value) == -EINVAL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (value &lt; 0)</div><div class='add'>+		value = 0;</div><div class='add'>+</div><div class='add'>+	if (value - pm-&gt;fan.min_duty &lt; 10)</div><div class='add'>+		value = pm-&gt;fan.min_duty + 10;</div><div class='add'>+</div><div class='add'>+	if (value &gt; 100)</div><div class='add'>+		pm-&gt;fan.max_duty = 100;</div><div class='add'>+	else</div><div class='add'>+		pm-&gt;fan.max_duty = value;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm0_max, S_IRUGO | S_IWUSR,</div><div class='add'>+			  nouveau_hwmon_get_pwm0_max,</div><div class='add'>+			  nouveau_hwmon_set_pwm0_max, 0);</div><div class='add'>+</div><div class='ctx'> static struct attribute *hwmon_attributes[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_temp1_input.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp1_max.dev_attr.attr,</div><div class='hunk'>@@ -420,20 +638,36 @@ static struct attribute *hwmon_attributes[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_update_rate.dev_attr.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='add'>+static struct attribute *hwmon_fan_rpm_attributes[] = {</div><div class='add'>+	&amp;sensor_dev_attr_fan0_input.dev_attr.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+static struct attribute *hwmon_pwm_fan_attributes[] = {</div><div class='add'>+	&amp;sensor_dev_attr_pwm0.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm0_min.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm0_max.dev_attr.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static const struct attribute_group hwmon_attrgroup = {</div><div class='ctx'> 	.attrs = hwmon_attributes,</div><div class='ctx'> };</div><div class='add'>+static const struct attribute_group hwmon_fan_rpm_attrgroup = {</div><div class='add'>+	.attrs = hwmon_fan_rpm_attributes,</div><div class='add'>+};</div><div class='add'>+static const struct attribute_group hwmon_pwm_fan_attrgroup = {</div><div class='add'>+	.attrs = hwmon_pwm_fan_attributes,</div><div class='add'>+};</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> nouveau_hwmon_init(struct drm_device *dev)</div><div class='ctx'> {</div><div class='del'>-#if defined(CONFIG_HWMON) || (defined(MODULE) &amp;&amp; defined(CONFIG_HWMON_MODULE))</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	struct nouveau_pm_engine *pm = &amp;dev_priv-&gt;engine.pm;</div><div class='add'>+#if defined(CONFIG_HWMON) || (defined(MODULE) &amp;&amp; defined(CONFIG_HWMON_MODULE))</div><div class='ctx'> 	struct device *hwmon_dev;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!pm-&gt;temp_get)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -446,17 +680,46 @@ nouveau_hwmon_init(struct drm_device *dev)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev_set_drvdata(hwmon_dev, dev);</div><div class='add'>+</div><div class='add'>+	/* default sysfs entries */</div><div class='ctx'> 	ret = sysfs_create_group(&amp;dev-&gt;pdev-&gt;dev.kobj, &amp;hwmon_attrgroup);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		NV_ERROR(dev,</div><div class='del'>-			"Unable to create hwmon sysfs file: %d\n", ret);</div><div class='del'>-		hwmon_device_unregister(hwmon_dev);</div><div class='del'>-		return ret;</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if the card has a pwm fan */</div><div class='add'>+	/*XXX: incorrect, need better detection for this, some boards have</div><div class='add'>+	 *     the gpio entries for pwm fan control even when there's no</div><div class='add'>+	 *     actual fan connected to it... therm table? */</div><div class='add'>+	if (nouveau_pwmfan_get(dev) &gt;= 0) {</div><div class='add'>+		ret = sysfs_create_group(&amp;dev-&gt;pdev-&gt;dev.kobj,</div><div class='add'>+					 &amp;hwmon_pwm_fan_attrgroup);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if the card can read the fan rpm */</div><div class='add'>+	if (nouveau_gpio_func_valid(dev, DCB_GPIO_FAN_SENSE)) {</div><div class='add'>+		ret = sysfs_create_group(&amp;dev-&gt;pdev-&gt;dev.kobj,</div><div class='add'>+					 &amp;hwmon_fan_rpm_attrgroup);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pm-&gt;hwmon = hwmon_dev;</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	NV_ERROR(dev, "Unable to create some hwmon sysfs files: %d\n", ret);</div><div class='add'>+	hwmon_device_unregister(hwmon_dev);</div><div class='add'>+	pm-&gt;hwmon = NULL;</div><div class='add'>+	return ret;</div><div class='add'>+#else</div><div class='add'>+	pm-&gt;hwmon = NULL;</div><div class='ctx'> 	return 0;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -468,6 +731,9 @@ nouveau_hwmon_fini(struct drm_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (pm-&gt;hwmon) {</div><div class='ctx'> 		sysfs_remove_group(&amp;dev-&gt;pdev-&gt;dev.kobj, &amp;hwmon_attrgroup);</div><div class='add'>+		sysfs_remove_group(&amp;dev-&gt;pdev-&gt;dev.kobj, &amp;hwmon_pwm_fan_attrgroup);</div><div class='add'>+		sysfs_remove_group(&amp;dev-&gt;pdev-&gt;dev.kobj, &amp;hwmon_fan_rpm_attrgroup);</div><div class='add'>+</div><div class='ctx'> 		hwmon_device_unregister(pm-&gt;hwmon);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.h b/drivers/gpu/drm/nouveau/nouveau_pm.h<br/>index 8ac02cdd03a1..2f8e14fbcff8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_pm.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_pm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_pm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_pm.h</a></div><div class='hunk'>@@ -47,29 +47,33 @@ void nouveau_mem_timing_init(struct drm_device *);</div><div class='ctx'> void nouveau_mem_timing_fini(struct drm_device *);</div><div class='ctx'> </div><div class='ctx'> /* nv04_pm.c */</div><div class='del'>-int nv04_pm_clock_get(struct drm_device *, u32 id);</div><div class='del'>-void *nv04_pm_clock_pre(struct drm_device *, struct nouveau_pm_level *,</div><div class='del'>-			u32 id, int khz);</div><div class='del'>-void nv04_pm_clock_set(struct drm_device *, void *);</div><div class='add'>+int nv04_pm_clocks_get(struct drm_device *, struct nouveau_pm_level *);</div><div class='add'>+void *nv04_pm_clocks_pre(struct drm_device *, struct nouveau_pm_level *);</div><div class='add'>+int nv04_pm_clocks_set(struct drm_device *, void *);</div><div class='ctx'> </div><div class='ctx'> /* nv40_pm.c */</div><div class='ctx'> int nv40_pm_clocks_get(struct drm_device *, struct nouveau_pm_level *);</div><div class='ctx'> void *nv40_pm_clocks_pre(struct drm_device *, struct nouveau_pm_level *);</div><div class='del'>-void nv40_pm_clocks_set(struct drm_device *, void *);</div><div class='add'>+int nv40_pm_clocks_set(struct drm_device *, void *);</div><div class='add'>+int nv40_pm_pwm_get(struct drm_device *, int, u32 *, u32 *);</div><div class='add'>+int nv40_pm_pwm_set(struct drm_device *, int, u32, u32);</div><div class='ctx'> </div><div class='ctx'> /* nv50_pm.c */</div><div class='del'>-int nv50_pm_clock_get(struct drm_device *, u32 id);</div><div class='del'>-void *nv50_pm_clock_pre(struct drm_device *, struct nouveau_pm_level *,</div><div class='del'>-			u32 id, int khz);</div><div class='del'>-void nv50_pm_clock_set(struct drm_device *, void *);</div><div class='add'>+int nv50_pm_clocks_get(struct drm_device *, struct nouveau_pm_level *);</div><div class='add'>+void *nv50_pm_clocks_pre(struct drm_device *, struct nouveau_pm_level *);</div><div class='add'>+int nv50_pm_clocks_set(struct drm_device *, void *);</div><div class='add'>+int nv50_pm_pwm_get(struct drm_device *, int, u32 *, u32 *);</div><div class='add'>+int nv50_pm_pwm_set(struct drm_device *, int, u32, u32);</div><div class='ctx'> </div><div class='ctx'> /* nva3_pm.c */</div><div class='ctx'> int nva3_pm_clocks_get(struct drm_device *, struct nouveau_pm_level *);</div><div class='ctx'> void *nva3_pm_clocks_pre(struct drm_device *, struct nouveau_pm_level *);</div><div class='del'>-void nva3_pm_clocks_set(struct drm_device *, void *);</div><div class='add'>+int nva3_pm_clocks_set(struct drm_device *, void *);</div><div class='ctx'> </div><div class='ctx'> /* nvc0_pm.c */</div><div class='ctx'> int nvc0_pm_clocks_get(struct drm_device *, struct nouveau_pm_level *);</div><div class='add'>+void *nvc0_pm_clocks_pre(struct drm_device *, struct nouveau_pm_level *);</div><div class='add'>+int nvc0_pm_clocks_set(struct drm_device *, void *);</div><div class='ctx'> </div><div class='ctx'> /* nouveau_temp.c */</div><div class='ctx'> void nouveau_temp_init(struct drm_device *dev);</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c<br/>index c8a463b76c89..47f245edf538 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_sgdma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_sgdma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_sgdma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_sgdma.c</a></div><div class='hunk'>@@ -8,91 +8,30 @@</div><div class='ctx'> #define NV_CTXDMA_PAGE_MASK  (NV_CTXDMA_PAGE_SIZE - 1)</div><div class='ctx'> </div><div class='ctx'> struct nouveau_sgdma_be {</div><div class='del'>-	struct ttm_backend backend;</div><div class='add'>+	/* this has to be the first field so populate/unpopulated in</div><div class='add'>+	 * nouve_bo.c works properly, otherwise have to move them here</div><div class='add'>+	 */</div><div class='add'>+	struct ttm_dma_tt ttm;</div><div class='ctx'> 	struct drm_device *dev;</div><div class='del'>-</div><div class='del'>-	dma_addr_t *pages;</div><div class='del'>-	unsigned nr_pages;</div><div class='del'>-	bool unmap_pages;</div><div class='del'>-</div><div class='ctx'> 	u64 offset;</div><div class='del'>-	bool bound;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-nouveau_sgdma_populate(struct ttm_backend *be, unsigned long num_pages,</div><div class='del'>-		       struct page **pages, struct page *dummy_read_page,</div><div class='del'>-		       dma_addr_t *dma_addrs)</div><div class='del'>-{</div><div class='del'>-	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)be;</div><div class='del'>-	struct drm_device *dev = nvbe-&gt;dev;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	NV_DEBUG(nvbe-&gt;dev, "num_pages = %ld\n", num_pages);</div><div class='del'>-</div><div class='del'>-	nvbe-&gt;pages = dma_addrs;</div><div class='del'>-	nvbe-&gt;nr_pages = num_pages;</div><div class='del'>-	nvbe-&gt;unmap_pages = true;</div><div class='del'>-</div><div class='del'>-	/* this code path isn't called and is incorrect anyways */</div><div class='del'>-	if (0) { /* dma_addrs[0] != DMA_ERROR_CODE) { */</div><div class='del'>-		nvbe-&gt;unmap_pages = false;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_pages; i++) {</div><div class='del'>-		nvbe-&gt;pages[i] = pci_map_page(dev-&gt;pdev, pages[i], 0,</div><div class='del'>-					      PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);</div><div class='del'>-		if (pci_dma_mapping_error(dev-&gt;pdev, nvbe-&gt;pages[i])) {</div><div class='del'>-			nvbe-&gt;nr_pages = --i;</div><div class='del'>-			be-&gt;func-&gt;clear(be);</div><div class='del'>-			return -EFAULT;</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 void</div><div class='del'>-nouveau_sgdma_clear(struct ttm_backend *be)</div><div class='add'>+nouveau_sgdma_destroy(struct ttm_tt *ttm)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)be;</div><div class='del'>-	struct drm_device *dev = nvbe-&gt;dev;</div><div class='del'>-</div><div class='del'>-	if (nvbe-&gt;bound)</div><div class='del'>-		be-&gt;func-&gt;unbind(be);</div><div class='add'>+	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;</div><div class='ctx'> </div><div class='del'>-	if (nvbe-&gt;unmap_pages) {</div><div class='del'>-		while (nvbe-&gt;nr_pages--) {</div><div class='del'>-			pci_unmap_page(dev-&gt;pdev, nvbe-&gt;pages[nvbe-&gt;nr_pages],</div><div class='del'>-				       PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);</div><div class='del'>-		}</div><div class='del'>-		nvbe-&gt;unmap_pages = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nvbe-&gt;pages = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nouveau_sgdma_destroy(struct ttm_backend *be)</div><div class='del'>-{</div><div class='del'>-	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)be;</div><div class='del'>-</div><div class='del'>-	if (be) {</div><div class='add'>+	if (ttm) {</div><div class='ctx'> 		NV_DEBUG(nvbe-&gt;dev, "\n");</div><div class='del'>-</div><div class='del'>-		if (nvbe) {</div><div class='del'>-			if (nvbe-&gt;pages)</div><div class='del'>-				be-&gt;func-&gt;clear(be);</div><div class='del'>-			kfree(nvbe);</div><div class='del'>-		}</div><div class='add'>+		ttm_dma_tt_fini(&amp;nvbe-&gt;ttm);</div><div class='add'>+		kfree(nvbe);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nv04_sgdma_bind(struct ttm_backend *be, struct ttm_mem_reg *mem)</div><div class='add'>+nv04_sgdma_bind(struct ttm_tt *ttm, struct ttm_mem_reg *mem)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)be;</div><div class='add'>+	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;</div><div class='ctx'> 	struct drm_device *dev = nvbe-&gt;dev;</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	struct nouveau_gpuobj *gpuobj = dev_priv-&gt;gart_info.sg_ctxdma;</div><div class='hunk'>@@ -102,8 +41,8 @@ nv04_sgdma_bind(struct ttm_backend *be, struct ttm_mem_reg *mem)</div><div class='ctx'> </div><div class='ctx'> 	nvbe-&gt;offset = mem-&gt;start &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	pte = (nvbe-&gt;offset &gt;&gt; NV_CTXDMA_PAGE_SHIFT) + 2;</div><div class='del'>-	for (i = 0; i &lt; nvbe-&gt;nr_pages; i++) {</div><div class='del'>-		dma_addr_t dma_offset = nvbe-&gt;pages[i];</div><div class='add'>+	for (i = 0; i &lt; ttm-&gt;num_pages; i++) {</div><div class='add'>+		dma_addr_t dma_offset = nvbe-&gt;ttm.dma_address[i];</div><div class='ctx'> 		uint32_t offset_l = lower_32_bits(dma_offset);</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; PAGE_SIZE / NV_CTXDMA_PAGE_SIZE; j++, pte++) {</div><div class='hunk'>@@ -112,14 +51,13 @@ nv04_sgdma_bind(struct ttm_backend *be, struct ttm_mem_reg *mem)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nvbe-&gt;bound = true;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nv04_sgdma_unbind(struct ttm_backend *be)</div><div class='add'>+nv04_sgdma_unbind(struct ttm_tt *ttm)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)be;</div><div class='add'>+	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;</div><div class='ctx'> 	struct drm_device *dev = nvbe-&gt;dev;</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	struct nouveau_gpuobj *gpuobj = dev_priv-&gt;gart_info.sg_ctxdma;</div><div class='hunk'>@@ -127,22 +65,19 @@ nv04_sgdma_unbind(struct ttm_backend *be)</div><div class='ctx'> </div><div class='ctx'> 	NV_DEBUG(dev, "\n");</div><div class='ctx'> </div><div class='del'>-	if (!nvbe-&gt;bound)</div><div class='add'>+	if (ttm-&gt;state != tt_bound)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	pte = (nvbe-&gt;offset &gt;&gt; NV_CTXDMA_PAGE_SHIFT) + 2;</div><div class='del'>-	for (i = 0; i &lt; nvbe-&gt;nr_pages; i++) {</div><div class='add'>+	for (i = 0; i &lt; ttm-&gt;num_pages; i++) {</div><div class='ctx'> 		for (j = 0; j &lt; PAGE_SIZE / NV_CTXDMA_PAGE_SIZE; j++, pte++)</div><div class='ctx'> 			nv_wo32(gpuobj, (pte * 4) + 0, 0x00000000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nvbe-&gt;bound = false;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ttm_backend_func nv04_sgdma_backend = {</div><div class='del'>-	.populate		= nouveau_sgdma_populate,</div><div class='del'>-	.clear			= nouveau_sgdma_clear,</div><div class='ctx'> 	.bind			= nv04_sgdma_bind,</div><div class='ctx'> 	.unbind			= nv04_sgdma_unbind,</div><div class='ctx'> 	.destroy		= nouveau_sgdma_destroy</div><div class='hunk'>@@ -161,14 +96,14 @@ nv41_sgdma_flush(struct nouveau_sgdma_be *nvbe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nv41_sgdma_bind(struct ttm_backend *be, struct ttm_mem_reg *mem)</div><div class='add'>+nv41_sgdma_bind(struct ttm_tt *ttm, struct ttm_mem_reg *mem)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)be;</div><div class='add'>+	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = nvbe-&gt;dev-&gt;dev_private;</div><div class='ctx'> 	struct nouveau_gpuobj *pgt = dev_priv-&gt;gart_info.sg_ctxdma;</div><div class='del'>-	dma_addr_t *list = nvbe-&gt;pages;</div><div class='add'>+	dma_addr_t *list = nvbe-&gt;ttm.dma_address;</div><div class='ctx'> 	u32 pte = mem-&gt;start &lt;&lt; 2;</div><div class='del'>-	u32 cnt = nvbe-&gt;nr_pages;</div><div class='add'>+	u32 cnt = ttm-&gt;num_pages;</div><div class='ctx'> </div><div class='ctx'> 	nvbe-&gt;offset = mem-&gt;start &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='hunk'>@@ -178,18 +113,17 @@ nv41_sgdma_bind(struct ttm_backend *be, struct ttm_mem_reg *mem)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nv41_sgdma_flush(nvbe);</div><div class='del'>-	nvbe-&gt;bound = true;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nv41_sgdma_unbind(struct ttm_backend *be)</div><div class='add'>+nv41_sgdma_unbind(struct ttm_tt *ttm)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)be;</div><div class='add'>+	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = nvbe-&gt;dev-&gt;dev_private;</div><div class='ctx'> 	struct nouveau_gpuobj *pgt = dev_priv-&gt;gart_info.sg_ctxdma;</div><div class='ctx'> 	u32 pte = (nvbe-&gt;offset &gt;&gt; 12) &lt;&lt; 2;</div><div class='del'>-	u32 cnt = nvbe-&gt;nr_pages;</div><div class='add'>+	u32 cnt = ttm-&gt;num_pages;</div><div class='ctx'> </div><div class='ctx'> 	while (cnt--) {</div><div class='ctx'> 		nv_wo32(pgt, pte, 0x00000000);</div><div class='hunk'>@@ -197,24 +131,22 @@ nv41_sgdma_unbind(struct ttm_backend *be)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nv41_sgdma_flush(nvbe);</div><div class='del'>-	nvbe-&gt;bound = false;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ttm_backend_func nv41_sgdma_backend = {</div><div class='del'>-	.populate		= nouveau_sgdma_populate,</div><div class='del'>-	.clear			= nouveau_sgdma_clear,</div><div class='ctx'> 	.bind			= nv41_sgdma_bind,</div><div class='ctx'> 	.unbind			= nv41_sgdma_unbind,</div><div class='ctx'> 	.destroy		= nouveau_sgdma_destroy</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-nv44_sgdma_flush(struct nouveau_sgdma_be *nvbe)</div><div class='add'>+nv44_sgdma_flush(struct ttm_tt *ttm)</div><div class='ctx'> {</div><div class='add'>+	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;</div><div class='ctx'> 	struct drm_device *dev = nvbe-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	nv_wr32(dev, 0x100814, (nvbe-&gt;nr_pages - 1) &lt;&lt; 12);</div><div class='add'>+	nv_wr32(dev, 0x100814, (ttm-&gt;num_pages - 1) &lt;&lt; 12);</div><div class='ctx'> 	nv_wr32(dev, 0x100808, nvbe-&gt;offset | 0x20);</div><div class='ctx'> 	if (!nv_wait(dev, 0x100808, 0x00000001, 0x00000001))</div><div class='ctx'> 		NV_ERROR(dev, "gart flush timeout: 0x%08x\n",</div><div class='hunk'>@@ -273,14 +205,14 @@ nv44_sgdma_fill(struct nouveau_gpuobj *pgt, dma_addr_t *list, u32 base, u32 cnt)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nv44_sgdma_bind(struct ttm_backend *be, struct ttm_mem_reg *mem)</div><div class='add'>+nv44_sgdma_bind(struct ttm_tt *ttm, struct ttm_mem_reg *mem)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)be;</div><div class='add'>+	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = nvbe-&gt;dev-&gt;dev_private;</div><div class='ctx'> 	struct nouveau_gpuobj *pgt = dev_priv-&gt;gart_info.sg_ctxdma;</div><div class='del'>-	dma_addr_t *list = nvbe-&gt;pages;</div><div class='add'>+	dma_addr_t *list = nvbe-&gt;ttm.dma_address;</div><div class='ctx'> 	u32 pte = mem-&gt;start &lt;&lt; 2, tmp[4];</div><div class='del'>-	u32 cnt = nvbe-&gt;nr_pages;</div><div class='add'>+	u32 cnt = ttm-&gt;num_pages;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	nvbe-&gt;offset = mem-&gt;start &lt;&lt; PAGE_SHIFT;</div><div class='hunk'>@@ -308,19 +240,18 @@ nv44_sgdma_bind(struct ttm_backend *be, struct ttm_mem_reg *mem)</div><div class='ctx'> 	if (cnt)</div><div class='ctx'> 		nv44_sgdma_fill(pgt, list, pte, cnt);</div><div class='ctx'> </div><div class='del'>-	nv44_sgdma_flush(nvbe);</div><div class='del'>-	nvbe-&gt;bound = true;</div><div class='add'>+	nv44_sgdma_flush(ttm);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nv44_sgdma_unbind(struct ttm_backend *be)</div><div class='add'>+nv44_sgdma_unbind(struct ttm_tt *ttm)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)be;</div><div class='add'>+	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = nvbe-&gt;dev-&gt;dev_private;</div><div class='ctx'> 	struct nouveau_gpuobj *pgt = dev_priv-&gt;gart_info.sg_ctxdma;</div><div class='ctx'> 	u32 pte = (nvbe-&gt;offset &gt;&gt; 12) &lt;&lt; 2;</div><div class='del'>-	u32 cnt = nvbe-&gt;nr_pages;</div><div class='add'>+	u32 cnt = ttm-&gt;num_pages;</div><div class='ctx'> </div><div class='ctx'> 	if (pte &amp; 0x0000000c) {</div><div class='ctx'> 		u32  max = 4 - ((pte &gt;&gt; 2) &amp; 0x3);</div><div class='hunk'>@@ -342,55 +273,47 @@ nv44_sgdma_unbind(struct ttm_backend *be)</div><div class='ctx'> 	if (cnt)</div><div class='ctx'> 		nv44_sgdma_fill(pgt, NULL, pte, cnt);</div><div class='ctx'> </div><div class='del'>-	nv44_sgdma_flush(nvbe);</div><div class='del'>-	nvbe-&gt;bound = false;</div><div class='add'>+	nv44_sgdma_flush(ttm);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ttm_backend_func nv44_sgdma_backend = {</div><div class='del'>-	.populate		= nouveau_sgdma_populate,</div><div class='del'>-	.clear			= nouveau_sgdma_clear,</div><div class='ctx'> 	.bind			= nv44_sgdma_bind,</div><div class='ctx'> 	.unbind			= nv44_sgdma_unbind,</div><div class='ctx'> 	.destroy		= nouveau_sgdma_destroy</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nv50_sgdma_bind(struct ttm_backend *be, struct ttm_mem_reg *mem)</div><div class='add'>+nv50_sgdma_bind(struct ttm_tt *ttm, struct ttm_mem_reg *mem)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)be;</div><div class='add'>+	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;</div><div class='ctx'> 	struct nouveau_mem *node = mem-&gt;mm_node;</div><div class='add'>+</div><div class='ctx'> 	/* noop: bound in move_notify() */</div><div class='del'>-	node-&gt;pages = nvbe-&gt;pages;</div><div class='del'>-	nvbe-&gt;pages = (dma_addr_t *)node;</div><div class='del'>-	nvbe-&gt;bound = true;</div><div class='add'>+	node-&gt;pages = nvbe-&gt;ttm.dma_address;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nv50_sgdma_unbind(struct ttm_backend *be)</div><div class='add'>+nv50_sgdma_unbind(struct ttm_tt *ttm)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)be;</div><div class='del'>-	struct nouveau_mem *node = (struct nouveau_mem *)nvbe-&gt;pages;</div><div class='ctx'> 	/* noop: unbound in move_notify() */</div><div class='del'>-	nvbe-&gt;pages = node-&gt;pages;</div><div class='del'>-	node-&gt;pages = NULL;</div><div class='del'>-	nvbe-&gt;bound = false;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ttm_backend_func nv50_sgdma_backend = {</div><div class='del'>-	.populate		= nouveau_sgdma_populate,</div><div class='del'>-	.clear			= nouveau_sgdma_clear,</div><div class='ctx'> 	.bind			= nv50_sgdma_bind,</div><div class='ctx'> 	.unbind			= nv50_sgdma_unbind,</div><div class='ctx'> 	.destroy		= nouveau_sgdma_destroy</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct ttm_backend *</div><div class='del'>-nouveau_sgdma_init_ttm(struct drm_device *dev)</div><div class='add'>+struct ttm_tt *</div><div class='add'>+nouveau_sgdma_create_ttm(struct ttm_bo_device *bdev,</div><div class='add'>+			 unsigned long size, uint32_t page_flags,</div><div class='add'>+			 struct page *dummy_read_page)</div><div class='ctx'> {</div><div class='del'>-	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct drm_nouveau_private *dev_priv = nouveau_bdev(bdev);</div><div class='add'>+	struct drm_device *dev = dev_priv-&gt;dev;</div><div class='ctx'> 	struct nouveau_sgdma_be *nvbe;</div><div class='ctx'> </div><div class='ctx'> 	nvbe = kzalloc(sizeof(*nvbe), GFP_KERNEL);</div><div class='hunk'>@@ -398,9 +321,13 @@ nouveau_sgdma_init_ttm(struct drm_device *dev)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	nvbe-&gt;dev = dev;</div><div class='add'>+	nvbe-&gt;ttm.ttm.func = dev_priv-&gt;gart_info.func;</div><div class='ctx'> </div><div class='del'>-	nvbe-&gt;backend.func = dev_priv-&gt;gart_info.func;</div><div class='del'>-	return &amp;nvbe-&gt;backend;</div><div class='add'>+	if (ttm_dma_tt_init(&amp;nvbe-&gt;ttm, bdev, size, page_flags, dummy_read_page)) {</div><div class='add'>+		kfree(nvbe);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	return &amp;nvbe-&gt;ttm.ttm;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c<br/>index d8831ab42bb9..f80c5e0762ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_state.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_state.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_state.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_state.c</a></div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'> #include "nouveau_drm.h"</div><div class='ctx'> #include "nouveau_fbcon.h"</div><div class='ctx'> #include "nouveau_ramht.h"</div><div class='add'>+#include "nouveau_gpio.h"</div><div class='ctx'> #include "nouveau_pm.h"</div><div class='ctx'> #include "nv50_display.h"</div><div class='ctx'> </div><div class='hunk'>@@ -80,16 +81,12 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)</div><div class='ctx'> 		engine-&gt;display.early_init	= nv04_display_early_init;</div><div class='ctx'> 		engine-&gt;display.late_takedown	= nv04_display_late_takedown;</div><div class='ctx'> 		engine-&gt;display.create		= nv04_display_create;</div><div class='del'>-		engine-&gt;display.init		= nv04_display_init;</div><div class='ctx'> 		engine-&gt;display.destroy		= nv04_display_destroy;</div><div class='del'>-		engine-&gt;gpio.init		= nouveau_stub_init;</div><div class='del'>-		engine-&gt;gpio.takedown		= nouveau_stub_takedown;</div><div class='del'>-		engine-&gt;gpio.get		= NULL;</div><div class='del'>-		engine-&gt;gpio.set		= NULL;</div><div class='del'>-		engine-&gt;gpio.irq_enable		= NULL;</div><div class='del'>-		engine-&gt;pm.clock_get		= nv04_pm_clock_get;</div><div class='del'>-		engine-&gt;pm.clock_pre		= nv04_pm_clock_pre;</div><div class='del'>-		engine-&gt;pm.clock_set		= nv04_pm_clock_set;</div><div class='add'>+		engine-&gt;display.init		= nv04_display_init;</div><div class='add'>+		engine-&gt;display.fini		= nv04_display_fini;</div><div class='add'>+		engine-&gt;pm.clocks_get		= nv04_pm_clocks_get;</div><div class='add'>+		engine-&gt;pm.clocks_pre		= nv04_pm_clocks_pre;</div><div class='add'>+		engine-&gt;pm.clocks_set		= nv04_pm_clocks_set;</div><div class='ctx'> 		engine-&gt;vram.init		= nouveau_mem_detect;</div><div class='ctx'> 		engine-&gt;vram.takedown		= nouveau_stub_takedown;</div><div class='ctx'> 		engine-&gt;vram.flags_valid	= nouveau_mem_flags_valid;</div><div class='hunk'>@@ -129,16 +126,14 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)</div><div class='ctx'> 		engine-&gt;display.early_init	= nv04_display_early_init;</div><div class='ctx'> 		engine-&gt;display.late_takedown	= nv04_display_late_takedown;</div><div class='ctx'> 		engine-&gt;display.create		= nv04_display_create;</div><div class='del'>-		engine-&gt;display.init		= nv04_display_init;</div><div class='ctx'> 		engine-&gt;display.destroy		= nv04_display_destroy;</div><div class='del'>-		engine-&gt;gpio.init		= nouveau_stub_init;</div><div class='del'>-		engine-&gt;gpio.takedown		= nouveau_stub_takedown;</div><div class='del'>-		engine-&gt;gpio.get		= nv10_gpio_get;</div><div class='del'>-		engine-&gt;gpio.set		= nv10_gpio_set;</div><div class='del'>-		engine-&gt;gpio.irq_enable		= NULL;</div><div class='del'>-		engine-&gt;pm.clock_get		= nv04_pm_clock_get;</div><div class='del'>-		engine-&gt;pm.clock_pre		= nv04_pm_clock_pre;</div><div class='del'>-		engine-&gt;pm.clock_set		= nv04_pm_clock_set;</div><div class='add'>+		engine-&gt;display.init		= nv04_display_init;</div><div class='add'>+		engine-&gt;display.fini		= nv04_display_fini;</div><div class='add'>+		engine-&gt;gpio.drive		= nv10_gpio_drive;</div><div class='add'>+		engine-&gt;gpio.sense		= nv10_gpio_sense;</div><div class='add'>+		engine-&gt;pm.clocks_get		= nv04_pm_clocks_get;</div><div class='add'>+		engine-&gt;pm.clocks_pre		= nv04_pm_clocks_pre;</div><div class='add'>+		engine-&gt;pm.clocks_set		= nv04_pm_clocks_set;</div><div class='ctx'> 		engine-&gt;vram.init		= nouveau_mem_detect;</div><div class='ctx'> 		engine-&gt;vram.takedown		= nouveau_stub_takedown;</div><div class='ctx'> 		engine-&gt;vram.flags_valid	= nouveau_mem_flags_valid;</div><div class='hunk'>@@ -178,16 +173,14 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)</div><div class='ctx'> 		engine-&gt;display.early_init	= nv04_display_early_init;</div><div class='ctx'> 		engine-&gt;display.late_takedown	= nv04_display_late_takedown;</div><div class='ctx'> 		engine-&gt;display.create		= nv04_display_create;</div><div class='del'>-		engine-&gt;display.init		= nv04_display_init;</div><div class='ctx'> 		engine-&gt;display.destroy		= nv04_display_destroy;</div><div class='del'>-		engine-&gt;gpio.init		= nouveau_stub_init;</div><div class='del'>-		engine-&gt;gpio.takedown		= nouveau_stub_takedown;</div><div class='del'>-		engine-&gt;gpio.get		= nv10_gpio_get;</div><div class='del'>-		engine-&gt;gpio.set		= nv10_gpio_set;</div><div class='del'>-		engine-&gt;gpio.irq_enable		= NULL;</div><div class='del'>-		engine-&gt;pm.clock_get		= nv04_pm_clock_get;</div><div class='del'>-		engine-&gt;pm.clock_pre		= nv04_pm_clock_pre;</div><div class='del'>-		engine-&gt;pm.clock_set		= nv04_pm_clock_set;</div><div class='add'>+		engine-&gt;display.init		= nv04_display_init;</div><div class='add'>+		engine-&gt;display.fini		= nv04_display_fini;</div><div class='add'>+		engine-&gt;gpio.drive		= nv10_gpio_drive;</div><div class='add'>+		engine-&gt;gpio.sense		= nv10_gpio_sense;</div><div class='add'>+		engine-&gt;pm.clocks_get		= nv04_pm_clocks_get;</div><div class='add'>+		engine-&gt;pm.clocks_pre		= nv04_pm_clocks_pre;</div><div class='add'>+		engine-&gt;pm.clocks_set		= nv04_pm_clocks_set;</div><div class='ctx'> 		engine-&gt;vram.init		= nouveau_mem_detect;</div><div class='ctx'> 		engine-&gt;vram.takedown		= nouveau_stub_takedown;</div><div class='ctx'> 		engine-&gt;vram.flags_valid	= nouveau_mem_flags_valid;</div><div class='hunk'>@@ -227,16 +220,14 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)</div><div class='ctx'> 		engine-&gt;display.early_init	= nv04_display_early_init;</div><div class='ctx'> 		engine-&gt;display.late_takedown	= nv04_display_late_takedown;</div><div class='ctx'> 		engine-&gt;display.create		= nv04_display_create;</div><div class='del'>-		engine-&gt;display.init		= nv04_display_init;</div><div class='ctx'> 		engine-&gt;display.destroy		= nv04_display_destroy;</div><div class='del'>-		engine-&gt;gpio.init		= nouveau_stub_init;</div><div class='del'>-		engine-&gt;gpio.takedown		= nouveau_stub_takedown;</div><div class='del'>-		engine-&gt;gpio.get		= nv10_gpio_get;</div><div class='del'>-		engine-&gt;gpio.set		= nv10_gpio_set;</div><div class='del'>-		engine-&gt;gpio.irq_enable		= NULL;</div><div class='del'>-		engine-&gt;pm.clock_get		= nv04_pm_clock_get;</div><div class='del'>-		engine-&gt;pm.clock_pre		= nv04_pm_clock_pre;</div><div class='del'>-		engine-&gt;pm.clock_set		= nv04_pm_clock_set;</div><div class='add'>+		engine-&gt;display.init		= nv04_display_init;</div><div class='add'>+		engine-&gt;display.fini		= nv04_display_fini;</div><div class='add'>+		engine-&gt;gpio.drive		= nv10_gpio_drive;</div><div class='add'>+		engine-&gt;gpio.sense		= nv10_gpio_sense;</div><div class='add'>+		engine-&gt;pm.clocks_get		= nv04_pm_clocks_get;</div><div class='add'>+		engine-&gt;pm.clocks_pre		= nv04_pm_clocks_pre;</div><div class='add'>+		engine-&gt;pm.clocks_set		= nv04_pm_clocks_set;</div><div class='ctx'> 		engine-&gt;pm.voltage_get		= nouveau_voltage_gpio_get;</div><div class='ctx'> 		engine-&gt;pm.voltage_set		= nouveau_voltage_gpio_set;</div><div class='ctx'> 		engine-&gt;vram.init		= nouveau_mem_detect;</div><div class='hunk'>@@ -279,19 +270,22 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)</div><div class='ctx'> 		engine-&gt;display.early_init	= nv04_display_early_init;</div><div class='ctx'> 		engine-&gt;display.late_takedown	= nv04_display_late_takedown;</div><div class='ctx'> 		engine-&gt;display.create		= nv04_display_create;</div><div class='del'>-		engine-&gt;display.init		= nv04_display_init;</div><div class='ctx'> 		engine-&gt;display.destroy		= nv04_display_destroy;</div><div class='del'>-		engine-&gt;gpio.init		= nouveau_stub_init;</div><div class='del'>-		engine-&gt;gpio.takedown		= nouveau_stub_takedown;</div><div class='del'>-		engine-&gt;gpio.get		= nv10_gpio_get;</div><div class='del'>-		engine-&gt;gpio.set		= nv10_gpio_set;</div><div class='del'>-		engine-&gt;gpio.irq_enable		= NULL;</div><div class='add'>+		engine-&gt;display.init		= nv04_display_init;</div><div class='add'>+		engine-&gt;display.fini		= nv04_display_fini;</div><div class='add'>+		engine-&gt;gpio.init		= nv10_gpio_init;</div><div class='add'>+		engine-&gt;gpio.fini		= nv10_gpio_fini;</div><div class='add'>+		engine-&gt;gpio.drive		= nv10_gpio_drive;</div><div class='add'>+		engine-&gt;gpio.sense		= nv10_gpio_sense;</div><div class='add'>+		engine-&gt;gpio.irq_enable		= nv10_gpio_irq_enable;</div><div class='ctx'> 		engine-&gt;pm.clocks_get		= nv40_pm_clocks_get;</div><div class='ctx'> 		engine-&gt;pm.clocks_pre		= nv40_pm_clocks_pre;</div><div class='ctx'> 		engine-&gt;pm.clocks_set		= nv40_pm_clocks_set;</div><div class='ctx'> 		engine-&gt;pm.voltage_get		= nouveau_voltage_gpio_get;</div><div class='ctx'> 		engine-&gt;pm.voltage_set		= nouveau_voltage_gpio_set;</div><div class='ctx'> 		engine-&gt;pm.temp_get		= nv40_temp_get;</div><div class='add'>+		engine-&gt;pm.pwm_get		= nv40_pm_pwm_get;</div><div class='add'>+		engine-&gt;pm.pwm_set		= nv40_pm_pwm_set;</div><div class='ctx'> 		engine-&gt;vram.init		= nouveau_mem_detect;</div><div class='ctx'> 		engine-&gt;vram.takedown		= nouveau_stub_takedown;</div><div class='ctx'> 		engine-&gt;vram.flags_valid	= nouveau_mem_flags_valid;</div><div class='hunk'>@@ -334,14 +328,13 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)</div><div class='ctx'> 		engine-&gt;display.early_init	= nv50_display_early_init;</div><div class='ctx'> 		engine-&gt;display.late_takedown	= nv50_display_late_takedown;</div><div class='ctx'> 		engine-&gt;display.create		= nv50_display_create;</div><div class='del'>-		engine-&gt;display.init		= nv50_display_init;</div><div class='ctx'> 		engine-&gt;display.destroy		= nv50_display_destroy;</div><div class='add'>+		engine-&gt;display.init		= nv50_display_init;</div><div class='add'>+		engine-&gt;display.fini		= nv50_display_fini;</div><div class='ctx'> 		engine-&gt;gpio.init		= nv50_gpio_init;</div><div class='del'>-		engine-&gt;gpio.takedown		= nv50_gpio_fini;</div><div class='del'>-		engine-&gt;gpio.get		= nv50_gpio_get;</div><div class='del'>-		engine-&gt;gpio.set		= nv50_gpio_set;</div><div class='del'>-		engine-&gt;gpio.irq_register	= nv50_gpio_irq_register;</div><div class='del'>-		engine-&gt;gpio.irq_unregister	= nv50_gpio_irq_unregister;</div><div class='add'>+		engine-&gt;gpio.fini		= nv50_gpio_fini;</div><div class='add'>+		engine-&gt;gpio.drive		= nv50_gpio_drive;</div><div class='add'>+		engine-&gt;gpio.sense		= nv50_gpio_sense;</div><div class='ctx'> 		engine-&gt;gpio.irq_enable		= nv50_gpio_irq_enable;</div><div class='ctx'> 		switch (dev_priv-&gt;chipset) {</div><div class='ctx'> 		case 0x84:</div><div class='hunk'>@@ -354,9 +347,9 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)</div><div class='ctx'> 		case 0xaa:</div><div class='ctx'> 		case 0xac:</div><div class='ctx'> 		case 0x50:</div><div class='del'>-			engine-&gt;pm.clock_get	= nv50_pm_clock_get;</div><div class='del'>-			engine-&gt;pm.clock_pre	= nv50_pm_clock_pre;</div><div class='del'>-			engine-&gt;pm.clock_set	= nv50_pm_clock_set;</div><div class='add'>+			engine-&gt;pm.clocks_get	= nv50_pm_clocks_get;</div><div class='add'>+			engine-&gt;pm.clocks_pre	= nv50_pm_clocks_pre;</div><div class='add'>+			engine-&gt;pm.clocks_set	= nv50_pm_clocks_set;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			engine-&gt;pm.clocks_get	= nva3_pm_clocks_get;</div><div class='hunk'>@@ -370,6 +363,8 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)</div><div class='ctx'> 			engine-&gt;pm.temp_get	= nv84_temp_get;</div><div class='ctx'> 		else</div><div class='ctx'> 			engine-&gt;pm.temp_get	= nv40_temp_get;</div><div class='add'>+		engine-&gt;pm.pwm_get		= nv50_pm_pwm_get;</div><div class='add'>+		engine-&gt;pm.pwm_set		= nv50_pm_pwm_set;</div><div class='ctx'> 		engine-&gt;vram.init		= nv50_vram_init;</div><div class='ctx'> 		engine-&gt;vram.takedown		= nv50_vram_fini;</div><div class='ctx'> 		engine-&gt;vram.get		= nv50_vram_new;</div><div class='hunk'>@@ -407,14 +402,13 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)</div><div class='ctx'> 		engine-&gt;display.early_init	= nv50_display_early_init;</div><div class='ctx'> 		engine-&gt;display.late_takedown	= nv50_display_late_takedown;</div><div class='ctx'> 		engine-&gt;display.create		= nv50_display_create;</div><div class='del'>-		engine-&gt;display.init		= nv50_display_init;</div><div class='ctx'> 		engine-&gt;display.destroy		= nv50_display_destroy;</div><div class='add'>+		engine-&gt;display.init		= nv50_display_init;</div><div class='add'>+		engine-&gt;display.fini		= nv50_display_fini;</div><div class='ctx'> 		engine-&gt;gpio.init		= nv50_gpio_init;</div><div class='del'>-		engine-&gt;gpio.takedown		= nouveau_stub_takedown;</div><div class='del'>-		engine-&gt;gpio.get		= nv50_gpio_get;</div><div class='del'>-		engine-&gt;gpio.set		= nv50_gpio_set;</div><div class='del'>-		engine-&gt;gpio.irq_register	= nv50_gpio_irq_register;</div><div class='del'>-		engine-&gt;gpio.irq_unregister	= nv50_gpio_irq_unregister;</div><div class='add'>+		engine-&gt;gpio.fini		= nv50_gpio_fini;</div><div class='add'>+		engine-&gt;gpio.drive		= nv50_gpio_drive;</div><div class='add'>+		engine-&gt;gpio.sense		= nv50_gpio_sense;</div><div class='ctx'> 		engine-&gt;gpio.irq_enable		= nv50_gpio_irq_enable;</div><div class='ctx'> 		engine-&gt;vram.init		= nvc0_vram_init;</div><div class='ctx'> 		engine-&gt;vram.takedown		= nv50_vram_fini;</div><div class='hunk'>@@ -423,8 +417,12 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)</div><div class='ctx'> 		engine-&gt;vram.flags_valid	= nvc0_vram_flags_valid;</div><div class='ctx'> 		engine-&gt;pm.temp_get		= nv84_temp_get;</div><div class='ctx'> 		engine-&gt;pm.clocks_get		= nvc0_pm_clocks_get;</div><div class='add'>+		engine-&gt;pm.clocks_pre		= nvc0_pm_clocks_pre;</div><div class='add'>+		engine-&gt;pm.clocks_set		= nvc0_pm_clocks_set;</div><div class='ctx'> 		engine-&gt;pm.voltage_get		= nouveau_voltage_gpio_get;</div><div class='ctx'> 		engine-&gt;pm.voltage_set		= nouveau_voltage_gpio_set;</div><div class='add'>+		engine-&gt;pm.pwm_get		= nv50_pm_pwm_get;</div><div class='add'>+		engine-&gt;pm.pwm_set		= nv50_pm_pwm_set;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0xd0:</div><div class='ctx'> 		engine-&gt;instmem.init		= nvc0_instmem_init;</div><div class='hunk'>@@ -457,21 +455,23 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)</div><div class='ctx'> 		engine-&gt;display.early_init	= nouveau_stub_init;</div><div class='ctx'> 		engine-&gt;display.late_takedown	= nouveau_stub_takedown;</div><div class='ctx'> 		engine-&gt;display.create		= nvd0_display_create;</div><div class='del'>-		engine-&gt;display.init		= nvd0_display_init;</div><div class='ctx'> 		engine-&gt;display.destroy		= nvd0_display_destroy;</div><div class='add'>+		engine-&gt;display.init		= nvd0_display_init;</div><div class='add'>+		engine-&gt;display.fini		= nvd0_display_fini;</div><div class='ctx'> 		engine-&gt;gpio.init		= nv50_gpio_init;</div><div class='del'>-		engine-&gt;gpio.takedown		= nouveau_stub_takedown;</div><div class='del'>-		engine-&gt;gpio.get		= nvd0_gpio_get;</div><div class='del'>-		engine-&gt;gpio.set		= nvd0_gpio_set;</div><div class='del'>-		engine-&gt;gpio.irq_register	= nv50_gpio_irq_register;</div><div class='del'>-		engine-&gt;gpio.irq_unregister	= nv50_gpio_irq_unregister;</div><div class='add'>+		engine-&gt;gpio.fini		= nv50_gpio_fini;</div><div class='add'>+		engine-&gt;gpio.drive		= nvd0_gpio_drive;</div><div class='add'>+		engine-&gt;gpio.sense		= nvd0_gpio_sense;</div><div class='ctx'> 		engine-&gt;gpio.irq_enable		= nv50_gpio_irq_enable;</div><div class='ctx'> 		engine-&gt;vram.init		= nvc0_vram_init;</div><div class='ctx'> 		engine-&gt;vram.takedown		= nv50_vram_fini;</div><div class='ctx'> 		engine-&gt;vram.get		= nvc0_vram_new;</div><div class='ctx'> 		engine-&gt;vram.put		= nv50_vram_del;</div><div class='ctx'> 		engine-&gt;vram.flags_valid	= nvc0_vram_flags_valid;</div><div class='add'>+		engine-&gt;pm.temp_get		= nv84_temp_get;</div><div class='ctx'> 		engine-&gt;pm.clocks_get		= nvc0_pm_clocks_get;</div><div class='add'>+		engine-&gt;pm.clocks_pre		= nvc0_pm_clocks_pre;</div><div class='add'>+		engine-&gt;pm.clocks_set		= nvc0_pm_clocks_set;</div><div class='ctx'> 		engine-&gt;pm.voltage_get		= nouveau_voltage_gpio_get;</div><div class='ctx'> 		engine-&gt;pm.voltage_set		= nouveau_voltage_gpio_set;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -525,6 +525,7 @@ static void nouveau_switcheroo_set_state(struct pci_dev *pdev,</div><div class='ctx'> 		printk(KERN_ERR "VGA switcheroo: switched nouveau off\n");</div><div class='ctx'> 		dev-&gt;switch_power_state = DRM_SWITCH_POWER_CHANGING;</div><div class='ctx'> 		drm_kms_helper_poll_disable(dev);</div><div class='add'>+		nouveau_switcheroo_optimus_dsm();</div><div class='ctx'> 		nouveau_pci_suspend(pdev, pmm);</div><div class='ctx'> 		dev-&gt;switch_power_state = DRM_SWITCH_POWER_OFF;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -615,7 +616,7 @@ nouveau_card_init(struct drm_device *dev)</div><div class='ctx'> 		goto out_gart;</div><div class='ctx'> </div><div class='ctx'> 	/* PGPIO */</div><div class='del'>-	ret = engine-&gt;gpio.init(dev);</div><div class='add'>+	ret = nouveau_gpio_create(dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_mc;</div><div class='ctx'> </div><div class='hunk'>@@ -648,6 +649,7 @@ nouveau_card_init(struct drm_device *dev)</div><div class='ctx'> 			nv50_graph_create(dev);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case NV_C0:</div><div class='add'>+		case NV_D0:</div><div class='ctx'> 			nvc0_graph_create(dev);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -663,6 +665,11 @@ nouveau_card_init(struct drm_device *dev)</div><div class='ctx'> 		case 0xa0:</div><div class='ctx'> 			nv84_crypt_create(dev);</div><div class='ctx'> 			break;</div><div class='add'>+		case 0x98:</div><div class='add'>+		case 0xaa:</div><div class='add'>+		case 0xac:</div><div class='add'>+			nv98_crypt_create(dev);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		switch (dev_priv-&gt;card_type) {</div><div class='hunk'>@@ -684,15 +691,25 @@ nouveau_card_init(struct drm_device *dev)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (dev_priv-&gt;chipset &gt;= 0xa3 || dev_priv-&gt;chipset == 0x98) {</div><div class='add'>+			nv84_bsp_create(dev);</div><div class='add'>+			nv84_vp_create(dev);</div><div class='add'>+			nv98_ppp_create(dev);</div><div class='add'>+		} else</div><div class='add'>+		if (dev_priv-&gt;chipset &gt;= 0x84) {</div><div class='add'>+			nv50_mpeg_create(dev);</div><div class='add'>+			nv84_bsp_create(dev);</div><div class='add'>+			nv84_vp_create(dev);</div><div class='add'>+		} else</div><div class='add'>+		if (dev_priv-&gt;chipset &gt;= 0x50) {</div><div class='add'>+			nv50_mpeg_create(dev);</div><div class='add'>+		} else</div><div class='ctx'> 		if (dev_priv-&gt;card_type == NV_40 ||</div><div class='ctx'> 		    dev_priv-&gt;chipset == 0x31 ||</div><div class='ctx'> 		    dev_priv-&gt;chipset == 0x34 ||</div><div class='del'>-		    dev_priv-&gt;chipset == 0x36)</div><div class='add'>+		    dev_priv-&gt;chipset == 0x36) {</div><div class='ctx'> 			nv31_mpeg_create(dev);</div><div class='del'>-		else</div><div class='del'>-		if (dev_priv-&gt;card_type == NV_50 &amp;&amp;</div><div class='del'>-		    (dev_priv-&gt;chipset &lt; 0x98 || dev_priv-&gt;chipset == 0xa0))</div><div class='del'>-			nv50_mpeg_create(dev);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		for (e = 0; e &lt; NVOBJ_ENGINE_NR; e++) {</div><div class='ctx'> 			if (dev_priv-&gt;eng[e]) {</div><div class='hunk'>@@ -712,27 +729,7 @@ nouveau_card_init(struct drm_device *dev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_fifo;</div><div class='ctx'> </div><div class='del'>-	/* initialise general modesetting */</div><div class='del'>-	drm_mode_config_init(dev);</div><div class='del'>-	drm_mode_create_scaling_mode_property(dev);</div><div class='del'>-	drm_mode_create_dithering_property(dev);</div><div class='del'>-	dev-&gt;mode_config.funcs = (void *)&amp;nouveau_mode_config_funcs;</div><div class='del'>-	dev-&gt;mode_config.fb_base = pci_resource_start(dev-&gt;pdev, 1);</div><div class='del'>-	dev-&gt;mode_config.min_width = 0;</div><div class='del'>-	dev-&gt;mode_config.min_height = 0;</div><div class='del'>-	if (dev_priv-&gt;card_type &lt; NV_10) {</div><div class='del'>-		dev-&gt;mode_config.max_width = 2048;</div><div class='del'>-		dev-&gt;mode_config.max_height = 2048;</div><div class='del'>-	} else</div><div class='del'>-	if (dev_priv-&gt;card_type &lt; NV_50) {</div><div class='del'>-		dev-&gt;mode_config.max_width = 4096;</div><div class='del'>-		dev-&gt;mode_config.max_height = 4096;</div><div class='del'>-	} else {</div><div class='del'>-		dev-&gt;mode_config.max_width = 8192;</div><div class='del'>-		dev-&gt;mode_config.max_height = 8192;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = engine-&gt;display.create(dev);</div><div class='add'>+	ret = nouveau_display_create(dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_irq;</div><div class='ctx'> </div><div class='hunk'>@@ -752,12 +749,11 @@ nouveau_card_init(struct drm_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;mode_config.num_crtc) {</div><div class='del'>-		ret = drm_vblank_init(dev, dev-&gt;mode_config.num_crtc);</div><div class='add'>+		ret = nouveau_display_init(dev);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out_chan;</div><div class='ctx'> </div><div class='ctx'> 		nouveau_fbcon_init(dev);</div><div class='del'>-		drm_kms_helper_poll_init(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -768,7 +764,7 @@ out_fence:</div><div class='ctx'> 	nouveau_fence_fini(dev);</div><div class='ctx'> out_disp:</div><div class='ctx'> 	nouveau_backlight_exit(dev);</div><div class='del'>-	engine-&gt;display.destroy(dev);</div><div class='add'>+	nouveau_display_destroy(dev);</div><div class='ctx'> out_irq:</div><div class='ctx'> 	nouveau_irq_fini(dev);</div><div class='ctx'> out_fifo:</div><div class='hunk'>@@ -788,7 +784,7 @@ out_engine:</div><div class='ctx'> out_timer:</div><div class='ctx'> 	engine-&gt;timer.takedown(dev);</div><div class='ctx'> out_gpio:</div><div class='del'>-	engine-&gt;gpio.takedown(dev);</div><div class='add'>+	nouveau_gpio_destroy(dev);</div><div class='ctx'> out_mc:</div><div class='ctx'> 	engine-&gt;mc.takedown(dev);</div><div class='ctx'> out_gart:</div><div class='hunk'>@@ -818,9 +814,8 @@ static void nouveau_card_takedown(struct drm_device *dev)</div><div class='ctx'> 	int e;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;mode_config.num_crtc) {</div><div class='del'>-		drm_kms_helper_poll_fini(dev);</div><div class='ctx'> 		nouveau_fbcon_fini(dev);</div><div class='del'>-		drm_vblank_cleanup(dev);</div><div class='add'>+		nouveau_display_fini(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev_priv-&gt;channel) {</div><div class='hunk'>@@ -829,8 +824,7 @@ static void nouveau_card_takedown(struct drm_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nouveau_backlight_exit(dev);</div><div class='del'>-	engine-&gt;display.destroy(dev);</div><div class='del'>-	drm_mode_config_cleanup(dev);</div><div class='add'>+	nouveau_display_destroy(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!dev_priv-&gt;noaccel) {</div><div class='ctx'> 		engine-&gt;fifo.takedown(dev);</div><div class='hunk'>@@ -843,7 +837,7 @@ static void nouveau_card_takedown(struct drm_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	engine-&gt;fb.takedown(dev);</div><div class='ctx'> 	engine-&gt;timer.takedown(dev);</div><div class='del'>-	engine-&gt;gpio.takedown(dev);</div><div class='add'>+	nouveau_gpio_destroy(dev);</div><div class='ctx'> 	engine-&gt;mc.takedown(dev);</div><div class='ctx'> 	engine-&gt;display.late_takedown(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1110,13 +1104,11 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)</div><div class='ctx'> 	dev_priv-&gt;noaccel = !!nouveau_noaccel;</div><div class='ctx'> 	if (nouveau_noaccel == -1) {</div><div class='ctx'> 		switch (dev_priv-&gt;chipset) {</div><div class='del'>-#if 0</div><div class='del'>-		case 0xXX: /* known broken */</div><div class='add'>+		case 0xd9: /* known broken */</div><div class='ctx'> 			NV_INFO(dev, "acceleration disabled by default, pass "</div><div class='ctx'> 				     "noaccel=0 to force enable\n");</div><div class='ctx'> 			dev_priv-&gt;noaccel = true;</div><div class='ctx'> 			break;</div><div class='del'>-#endif</div><div class='ctx'> 		default:</div><div class='ctx'> 			dev_priv-&gt;noaccel = false;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1238,7 +1230,7 @@ int nouveau_ioctl_getparam(struct drm_device *dev, void *data,</div><div class='ctx'> 		getparam-&gt;value = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NOUVEAU_GETPARAM_HAS_PAGEFLIP:</div><div class='del'>-		getparam-&gt;value = dev_priv-&gt;card_type &lt; NV_D0;</div><div class='add'>+		getparam-&gt;value = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NOUVEAU_GETPARAM_GRAPH_UNITS:</div><div class='ctx'> 		/* NV40 and NV50 versions are quite different, but register</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_temp.c b/drivers/gpu/drm/nouveau/nouveau_temp.c<br/>index 5a46446dd5a8..0f5a30160556 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_temp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_temp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_temp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_temp.c</a></div><div class='hunk'>@@ -55,6 +55,10 @@ nouveau_temp_vbios_parse(struct drm_device *dev, u8 *temp)</div><div class='ctx'> 	temps-&gt;down_clock = 100;</div><div class='ctx'> 	temps-&gt;fan_boost = 90;</div><div class='ctx'> </div><div class='add'>+	/* Set the default range for the pwm fan */</div><div class='add'>+	pm-&gt;fan.min_duty = 30;</div><div class='add'>+	pm-&gt;fan.max_duty = 100;</div><div class='add'>+</div><div class='ctx'> 	/* Set the known default values to setup the temperature sensor */</div><div class='ctx'> 	if (dev_priv-&gt;card_type &gt;= NV_40) {</div><div class='ctx'> 		switch (dev_priv-&gt;chipset) {</div><div class='hunk'>@@ -156,11 +160,26 @@ nouveau_temp_vbios_parse(struct drm_device *dev, u8 *temp)</div><div class='ctx'> 		case 0x13:</div><div class='ctx'> 			sensor-&gt;slope_div = value;</div><div class='ctx'> 			break;</div><div class='add'>+		case 0x22:</div><div class='add'>+			pm-&gt;fan.min_duty = value &amp; 0xff;</div><div class='add'>+			pm-&gt;fan.max_duty = (value &amp; 0xff00) &gt;&gt; 8;</div><div class='add'>+			break;</div><div class='add'>+		case 0x26:</div><div class='add'>+			pm-&gt;fan.pwm_freq = value;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		temp += recordlen;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nouveau_temp_safety_checks(dev);</div><div class='add'>+</div><div class='add'>+	/* check the fan min/max settings */</div><div class='add'>+	if (pm-&gt;fan.min_duty &lt; 10)</div><div class='add'>+		pm-&gt;fan.min_duty = 10;</div><div class='add'>+	if (pm-&gt;fan.max_duty &gt; 100)</div><div class='add'>+		pm-&gt;fan.max_duty = 100;</div><div class='add'>+	if (pm-&gt;fan.max_duty &lt; pm-&gt;fan.min_duty)</div><div class='add'>+		pm-&gt;fan.max_duty = pm-&gt;fan.min_duty;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -267,8 +286,6 @@ probe_monitoring_device(struct nouveau_i2c_chan *i2c,</div><div class='ctx'> static void</div><div class='ctx'> nouveau_temp_probe_i2c(struct drm_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct dcb_table *dcb = &amp;dev_priv-&gt;vbios.dcb;</div><div class='ctx'> 	struct i2c_board_info info[] = {</div><div class='ctx'> 		{ I2C_BOARD_INFO("w83l785ts", 0x2d) },</div><div class='ctx'> 		{ I2C_BOARD_INFO("w83781d", 0x2d) },</div><div class='hunk'>@@ -277,11 +294,9 @@ nouveau_temp_probe_i2c(struct drm_device *dev)</div><div class='ctx'> 		{ I2C_BOARD_INFO("lm99", 0x4c) },</div><div class='ctx'> 		{ }</div><div class='ctx'> 	};</div><div class='del'>-	int idx = (dcb-&gt;version &gt;= 0x40 ?</div><div class='del'>-		   dcb-&gt;i2c_default_indices &amp; 0xf : 2);</div><div class='ctx'> </div><div class='ctx'> 	nouveau_i2c_identify(dev, "monitoring device", info,</div><div class='del'>-			     probe_monitoring_device, idx);</div><div class='add'>+			     probe_monitoring_device, NV_I2C_DEFAULT(0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -297,9 +312,9 @@ nouveau_temp_init(struct drm_device *dev)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		if (P.version == 1)</div><div class='del'>-			temp = ROMPTR(bios, P.data[12]);</div><div class='add'>+			temp = ROMPTR(dev, P.data[12]);</div><div class='ctx'> 		else if (P.version == 2)</div><div class='del'>-			temp = ROMPTR(bios, P.data[16]);</div><div class='add'>+			temp = ROMPTR(dev, P.data[16]);</div><div class='ctx'> 		else</div><div class='ctx'> 			NV_WARN(dev, "unknown temp for BIT P %d\n", P.version);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_vm.c b/drivers/gpu/drm/nouveau/nouveau_vm.c<br/>index ef0832b29ad2..2bf6c0350b4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_vm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_vm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_vm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_vm.c</a></div><div class='hunk'>@@ -78,9 +78,10 @@ nouveau_vm_map(struct nouveau_vma *vma, struct nouveau_mem *node)</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> nouveau_vm_map_sg(struct nouveau_vma *vma, u64 delta, u64 length,</div><div class='del'>-		  struct nouveau_mem *mem, dma_addr_t *list)</div><div class='add'>+		  struct nouveau_mem *mem)</div><div class='ctx'> {</div><div class='ctx'> 	struct nouveau_vm *vm = vma-&gt;vm;</div><div class='add'>+	dma_addr_t *list = mem-&gt;pages;</div><div class='ctx'> 	int big = vma-&gt;node-&gt;type != vm-&gt;spg_shift;</div><div class='ctx'> 	u32 offset = vma-&gt;node-&gt;offset + (delta &gt;&gt; 12);</div><div class='ctx'> 	u32 bits = vma-&gt;node-&gt;type - 12;</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_vm.h b/drivers/gpu/drm/nouveau/nouveau_vm.h<br/>index 6ce995f7797e..4fb6e728734d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_vm.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_vm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_vm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_vm.h</a></div><div class='hunk'>@@ -89,7 +89,7 @@ void nouveau_vm_map_at(struct nouveau_vma *, u64 offset, struct nouveau_mem *);</div><div class='ctx'> void nouveau_vm_unmap(struct nouveau_vma *);</div><div class='ctx'> void nouveau_vm_unmap_at(struct nouveau_vma *, u64 offset, u64 length);</div><div class='ctx'> void nouveau_vm_map_sg(struct nouveau_vma *, u64 offset, u64 length,</div><div class='del'>-		       struct nouveau_mem *, dma_addr_t *);</div><div class='add'>+		       struct nouveau_mem *);</div><div class='ctx'> </div><div class='ctx'> /* nv50_vm.c */</div><div class='ctx'> void nv50_vm_map_pgt(struct nouveau_gpuobj *pgd, u32 pde,</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nouveau_volt.c b/drivers/gpu/drm/nouveau/nouveau_volt.c<br/>index 86d03e15735d..b010cb997b34 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_volt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nouveau_volt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nouveau_volt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nouveau_volt.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "nouveau_drv.h"</div><div class='ctx'> #include "nouveau_pm.h"</div><div class='add'>+#include "nouveau_gpio.h"</div><div class='ctx'> </div><div class='ctx'> static const enum dcb_gpio_tag vidtag[] = { 0x04, 0x05, 0x06, 0x1a, 0x73 };</div><div class='ctx'> static int nr_vidtag = sizeof(vidtag) / sizeof(vidtag[0]);</div><div class='hunk'>@@ -34,7 +35,6 @@ int</div><div class='ctx'> nouveau_voltage_gpio_get(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_gpio_engine *gpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='ctx'> 	struct nouveau_pm_voltage *volt = &amp;dev_priv-&gt;engine.pm.voltage;</div><div class='ctx'> 	u8 vid = 0;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -43,7 +43,7 @@ nouveau_voltage_gpio_get(struct drm_device *dev)</div><div class='ctx'> 		if (!(volt-&gt;vid_mask &amp; (1 &lt;&lt; i)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		vid |= gpio-&gt;get(dev, vidtag[i]) &lt;&lt; i;</div><div class='add'>+		vid |= nouveau_gpio_func_get(dev, vidtag[i]) &lt;&lt; i;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return nouveau_volt_lvl_lookup(dev, vid);</div><div class='hunk'>@@ -53,7 +53,6 @@ int</div><div class='ctx'> nouveau_voltage_gpio_set(struct drm_device *dev, int voltage)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_gpio_engine *gpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='ctx'> 	struct nouveau_pm_voltage *volt = &amp;dev_priv-&gt;engine.pm.voltage;</div><div class='ctx'> 	int vid, i;</div><div class='ctx'> </div><div class='hunk'>@@ -65,7 +64,7 @@ nouveau_voltage_gpio_set(struct drm_device *dev, int voltage)</div><div class='ctx'> 		if (!(volt-&gt;vid_mask &amp; (1 &lt;&lt; i)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		gpio-&gt;set(dev, vidtag[i], !!(vid &amp; (1 &lt;&lt; i)));</div><div class='add'>+		nouveau_gpio_func_set(dev, vidtag[i], !!(vid &amp; (1 &lt;&lt; i)));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -117,10 +116,10 @@ nouveau_volt_init(struct drm_device *dev)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		if (P.version == 1)</div><div class='del'>-			volt = ROMPTR(bios, P.data[16]);</div><div class='add'>+			volt = ROMPTR(dev, P.data[16]);</div><div class='ctx'> 		else</div><div class='ctx'> 		if (P.version == 2)</div><div class='del'>-			volt = ROMPTR(bios, P.data[12]);</div><div class='add'>+			volt = ROMPTR(dev, P.data[12]);</div><div class='ctx'> 		else {</div><div class='ctx'> 			NV_WARN(dev, "unknown volt for BIT P %d\n", P.version);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -130,7 +129,7 @@ nouveau_volt_init(struct drm_device *dev)</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		volt = ROMPTR(bios, bios-&gt;data[bios-&gt;offset + 0x98]);</div><div class='add'>+		volt = ROMPTR(dev, bios-&gt;data[bios-&gt;offset + 0x98]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!volt) {</div><div class='hunk'>@@ -194,7 +193,7 @@ nouveau_volt_init(struct drm_device *dev)</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!nouveau_bios_gpio_entry(dev, vidtag[i])) {</div><div class='add'>+		if (!nouveau_gpio_func_valid(dev, vidtag[i])) {</div><div class='ctx'> 			NV_DEBUG(dev, "vid bit %d has no gpio tag\n", i);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv04_crtc.c b/drivers/gpu/drm/nouveau/nv04_crtc.c<br/>index 5e45398a9e2d..728d07584d39 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv04_crtc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv04_crtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv04_crtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv04_crtc.c</a></div><div class='hunk'>@@ -364,7 +364,7 @@ nv_crtc_mode_set_vga(struct drm_crtc *crtc, struct drm_display_mode *mode)</div><div class='ctx'> 	regp-&gt;CRTC[NV_CIO_CR_VRE_INDEX] = 1 &lt;&lt; 5 | XLATE(vertEnd, 0, NV_CIO_CR_VRE_3_0);</div><div class='ctx'> 	regp-&gt;CRTC[NV_CIO_CR_VDE_INDEX] = vertDisplay;</div><div class='ctx'> 	/* framebuffer can be larger than crtc scanout area. */</div><div class='del'>-	regp-&gt;CRTC[NV_CIO_CR_OFFSET_INDEX] = fb-&gt;pitch / 8;</div><div class='add'>+	regp-&gt;CRTC[NV_CIO_CR_OFFSET_INDEX] = fb-&gt;pitches[0] / 8;</div><div class='ctx'> 	regp-&gt;CRTC[NV_CIO_CR_ULINE_INDEX] = 0x00;</div><div class='ctx'> 	regp-&gt;CRTC[NV_CIO_CR_VBS_INDEX] = vertBlankStart;</div><div class='ctx'> 	regp-&gt;CRTC[NV_CIO_CR_VBE_INDEX] = vertBlankEnd;</div><div class='hunk'>@@ -377,9 +377,9 @@ nv_crtc_mode_set_vga(struct drm_crtc *crtc, struct drm_display_mode *mode)</div><div class='ctx'> </div><div class='ctx'> 	/* framebuffer can be larger than crtc scanout area. */</div><div class='ctx'> 	regp-&gt;CRTC[NV_CIO_CRE_RPC0_INDEX] =</div><div class='del'>-		XLATE(fb-&gt;pitch / 8, 8, NV_CIO_CRE_RPC0_OFFSET_10_8);</div><div class='add'>+		XLATE(fb-&gt;pitches[0] / 8, 8, NV_CIO_CRE_RPC0_OFFSET_10_8);</div><div class='ctx'> 	regp-&gt;CRTC[NV_CIO_CRE_42] =</div><div class='del'>-		XLATE(fb-&gt;pitch / 8, 11, NV_CIO_CRE_42_OFFSET_11);</div><div class='add'>+		XLATE(fb-&gt;pitches[0] / 8, 11, NV_CIO_CRE_42_OFFSET_11);</div><div class='ctx'> 	regp-&gt;CRTC[NV_CIO_CRE_RPC1_INDEX] = mode-&gt;crtc_hdisplay &lt; 1280 ?</div><div class='ctx'> 					    MASK(NV_CIO_CRE_RPC1_LARGE) : 0x00;</div><div class='ctx'> 	regp-&gt;CRTC[NV_CIO_CRE_LSR_INDEX] = XLATE(horizBlankEnd, 6, NV_CIO_CRE_LSR_HBE_6) |</div><div class='hunk'>@@ -835,18 +835,18 @@ nv04_crtc_do_mode_set_base(struct drm_crtc *crtc,</div><div class='ctx'> 	NVWriteRAMDAC(dev, nv_crtc-&gt;index, NV_PRAMDAC_GENERAL_CONTROL,</div><div class='ctx'> 		      regp-&gt;ramdac_gen_ctrl);</div><div class='ctx'> </div><div class='del'>-	regp-&gt;CRTC[NV_CIO_CR_OFFSET_INDEX] = drm_fb-&gt;pitch &gt;&gt; 3;</div><div class='add'>+	regp-&gt;CRTC[NV_CIO_CR_OFFSET_INDEX] = drm_fb-&gt;pitches[0] &gt;&gt; 3;</div><div class='ctx'> 	regp-&gt;CRTC[NV_CIO_CRE_RPC0_INDEX] =</div><div class='del'>-		XLATE(drm_fb-&gt;pitch &gt;&gt; 3, 8, NV_CIO_CRE_RPC0_OFFSET_10_8);</div><div class='add'>+		XLATE(drm_fb-&gt;pitches[0] &gt;&gt; 3, 8, NV_CIO_CRE_RPC0_OFFSET_10_8);</div><div class='ctx'> 	regp-&gt;CRTC[NV_CIO_CRE_42] =</div><div class='del'>-		XLATE(drm_fb-&gt;pitch / 8, 11, NV_CIO_CRE_42_OFFSET_11);</div><div class='add'>+		XLATE(drm_fb-&gt;pitches[0] / 8, 11, NV_CIO_CRE_42_OFFSET_11);</div><div class='ctx'> 	crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_RPC0_INDEX);</div><div class='ctx'> 	crtc_wr_cio_state(crtc, regp, NV_CIO_CR_OFFSET_INDEX);</div><div class='ctx'> 	crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_42);</div><div class='ctx'> </div><div class='ctx'> 	/* Update the framebuffer location. */</div><div class='ctx'> 	regp-&gt;fb_start = nv_crtc-&gt;fb.offset &amp; ~3;</div><div class='del'>-	regp-&gt;fb_start += (y * drm_fb-&gt;pitch) + (x * drm_fb-&gt;bits_per_pixel / 8);</div><div class='add'>+	regp-&gt;fb_start += (y * drm_fb-&gt;pitches[0]) + (x * drm_fb-&gt;bits_per_pixel / 8);</div><div class='ctx'> 	nv_set_crtc_base(dev, nv_crtc-&gt;index, regp-&gt;fb_start);</div><div class='ctx'> </div><div class='ctx'> 	/* Update the arbitration parameters. */</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv04_dac.c b/drivers/gpu/drm/nouveau/nv04_dac.c<br/>index e000455e06d0..8300266ffaea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv04_dac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv04_dac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv04_dac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv04_dac.c</a></div><div class='hunk'>@@ -32,6 +32,7 @@</div><div class='ctx'> #include "nouveau_connector.h"</div><div class='ctx'> #include "nouveau_crtc.h"</div><div class='ctx'> #include "nouveau_hw.h"</div><div class='add'>+#include "nouveau_gpio.h"</div><div class='ctx'> #include "nvreg.h"</div><div class='ctx'> </div><div class='ctx'> int nv04_dac_output_offset(struct drm_encoder *encoder)</div><div class='hunk'>@@ -220,7 +221,6 @@ uint32_t nv17_dac_sample_load(struct drm_encoder *encoder)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_device *dev = encoder-&gt;dev;</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_gpio_engine *gpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='ctx'> 	struct dcb_entry *dcb = nouveau_encoder(encoder)-&gt;dcb;</div><div class='ctx'> 	uint32_t sample, testval, regoffset = nv04_dac_output_offset(encoder);</div><div class='ctx'> 	uint32_t saved_powerctrl_2 = 0, saved_powerctrl_4 = 0, saved_routput,</div><div class='hunk'>@@ -252,11 +252,11 @@ uint32_t nv17_dac_sample_load(struct drm_encoder *encoder)</div><div class='ctx'> 		nvWriteMC(dev, NV_PBUS_POWERCTRL_4, saved_powerctrl_4 &amp; 0xffffffcf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	saved_gpio1 = gpio-&gt;get(dev, DCB_GPIO_TVDAC1);</div><div class='del'>-	saved_gpio0 = gpio-&gt;get(dev, DCB_GPIO_TVDAC0);</div><div class='add'>+	saved_gpio1 = nouveau_gpio_func_get(dev, DCB_GPIO_TVDAC1);</div><div class='add'>+	saved_gpio0 = nouveau_gpio_func_get(dev, DCB_GPIO_TVDAC0);</div><div class='ctx'> </div><div class='del'>-	gpio-&gt;set(dev, DCB_GPIO_TVDAC1, dcb-&gt;type == OUTPUT_TV);</div><div class='del'>-	gpio-&gt;set(dev, DCB_GPIO_TVDAC0, dcb-&gt;type == OUTPUT_TV);</div><div class='add'>+	nouveau_gpio_func_set(dev, DCB_GPIO_TVDAC1, dcb-&gt;type == OUTPUT_TV);</div><div class='add'>+	nouveau_gpio_func_set(dev, DCB_GPIO_TVDAC0, dcb-&gt;type == OUTPUT_TV);</div><div class='ctx'> </div><div class='ctx'> 	msleep(4);</div><div class='ctx'> </div><div class='hunk'>@@ -306,8 +306,8 @@ uint32_t nv17_dac_sample_load(struct drm_encoder *encoder)</div><div class='ctx'> 		nvWriteMC(dev, NV_PBUS_POWERCTRL_4, saved_powerctrl_4);</div><div class='ctx'> 	nvWriteMC(dev, NV_PBUS_POWERCTRL_2, saved_powerctrl_2);</div><div class='ctx'> </div><div class='del'>-	gpio-&gt;set(dev, DCB_GPIO_TVDAC1, saved_gpio1);</div><div class='del'>-	gpio-&gt;set(dev, DCB_GPIO_TVDAC0, saved_gpio0);</div><div class='add'>+	nouveau_gpio_func_set(dev, DCB_GPIO_TVDAC1, saved_gpio1);</div><div class='add'>+	nouveau_gpio_func_set(dev, DCB_GPIO_TVDAC0, saved_gpio0);</div><div class='ctx'> </div><div class='ctx'> 	return sample;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv04_dfp.c b/drivers/gpu/drm/nouveau/nv04_dfp.c<br/>index 12098bf839c4..2258746016f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv04_dfp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv04_dfp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv04_dfp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv04_dfp.c</a></div><div class='hunk'>@@ -289,6 +289,7 @@ static void nv04_dfp_mode_set(struct drm_encoder *encoder,</div><div class='ctx'> 	struct nouveau_connector *nv_connector = nouveau_crtc_connector_get(nv_crtc);</div><div class='ctx'> 	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);</div><div class='ctx'> 	struct drm_display_mode *output_mode = &amp;nv_encoder-&gt;mode;</div><div class='add'>+	struct drm_connector *connector = &amp;nv_connector-&gt;base;</div><div class='ctx'> 	uint32_t mode_ratio, panel_ratio;</div><div class='ctx'> </div><div class='ctx'> 	NV_DEBUG_KMS(dev, "Output mode on CRTC %d:\n", nv_crtc-&gt;index);</div><div class='hunk'>@@ -340,10 +341,15 @@ static void nv04_dfp_mode_set(struct drm_encoder *encoder,</div><div class='ctx'> 	    output_mode-&gt;clock &gt; 165000)</div><div class='ctx'> 		regp-&gt;fp_control |= (2 &lt;&lt; 24);</div><div class='ctx'> 	if (nv_encoder-&gt;dcb-&gt;type == OUTPUT_LVDS) {</div><div class='del'>-		bool duallink, dummy;</div><div class='add'>+		bool duallink = false, dummy;</div><div class='add'>+		if (nv_connector-&gt;edid &amp;&amp;</div><div class='add'>+		    nv_connector-&gt;type == DCB_CONNECTOR_LVDS_SPWG) {</div><div class='add'>+			duallink = (((u8 *)nv_connector-&gt;edid)[121] == 2);</div><div class='add'>+		} else {</div><div class='add'>+			nouveau_bios_parse_lvds_table(dev, output_mode-&gt;clock,</div><div class='add'>+						      &amp;duallink, &amp;dummy);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		nouveau_bios_parse_lvds_table(dev, output_mode-&gt;clock,</div><div class='del'>-					      &amp;duallink, &amp;dummy);</div><div class='ctx'> 		if (duallink)</div><div class='ctx'> 			regp-&gt;fp_control |= (8 &lt;&lt; 28);</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -407,7 +413,9 @@ static void nv04_dfp_mode_set(struct drm_encoder *encoder,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Output property. */</div><div class='del'>-	if (nv_connector-&gt;use_dithering) {</div><div class='add'>+	if ((nv_connector-&gt;dithering_mode == DITHERING_MODE_ON) ||</div><div class='add'>+	    (nv_connector-&gt;dithering_mode == DITHERING_MODE_AUTO &amp;&amp;</div><div class='add'>+	     encoder-&gt;crtc-&gt;fb-&gt;depth &gt; connector-&gt;display_info.bpc * 3)) {</div><div class='ctx'> 		if (dev_priv-&gt;chipset == 0x11)</div><div class='ctx'> 			regp-&gt;dither = savep-&gt;dither | 0x00010000;</div><div class='ctx'> 		else {</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv04_display.c b/drivers/gpu/drm/nouveau/nv04_display.c<br/>index 6bd8518d7b2e..7047d37e8dab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv04_display.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv04_display.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv04_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv04_display.c</a></div><div class='hunk'>@@ -243,6 +243,11 @@ nv04_display_init(struct drm_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void</div><div class='add'>+nv04_display_fini(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> nv04_vblank_crtc0_isr(struct drm_device *dev)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv04_pm.c b/drivers/gpu/drm/nouveau/nv04_pm.c<br/>index 9ae92a87b8cc..6e7589918fa9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv04_pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv04_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv04_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv04_pm.c</a></div><div class='hunk'>@@ -27,68 +27,111 @@</div><div class='ctx'> #include "nouveau_hw.h"</div><div class='ctx'> #include "nouveau_pm.h"</div><div class='ctx'> </div><div class='del'>-struct nv04_pm_state {</div><div class='add'>+int</div><div class='add'>+nv04_pm_clocks_get(struct drm_device *dev, struct nouveau_pm_level *perflvl)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = nouveau_hw_get_clock(dev, PLL_CORE);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	perflvl-&gt;core = ret;</div><div class='add'>+</div><div class='add'>+	ret = nouveau_hw_get_clock(dev, PLL_MEMORY);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	perflvl-&gt;memory = ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct nv04_pm_clock {</div><div class='ctx'> 	struct pll_lims pll;</div><div class='ctx'> 	struct nouveau_pll_vals calc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-nv04_pm_clock_get(struct drm_device *dev, u32 id)</div><div class='add'>+struct nv04_pm_state {</div><div class='add'>+	struct nv04_pm_clock core;</div><div class='add'>+	struct nv04_pm_clock memory;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+calc_pll(struct drm_device *dev, u32 id, int khz, struct nv04_pm_clock *clk)</div><div class='ctx'> {</div><div class='del'>-	return nouveau_hw_get_clock(dev, id);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = get_pll_limits(dev, id, &amp;clk-&gt;pll);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = nouveau_calc_pll_mnp(dev, &amp;clk-&gt;pll, khz, &amp;clk-&gt;calc);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void *</div><div class='del'>-nv04_pm_clock_pre(struct drm_device *dev, struct nouveau_pm_level *perflvl,</div><div class='del'>-		  u32 id, int khz)</div><div class='add'>+nv04_pm_clocks_pre(struct drm_device *dev, struct nouveau_pm_level *perflvl)</div><div class='ctx'> {</div><div class='del'>-	struct nv04_pm_state *state;</div><div class='add'>+	struct nv04_pm_state *info;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	state = kzalloc(sizeof(*state), GFP_KERNEL);</div><div class='del'>-	if (!state)</div><div class='add'>+	info = kzalloc(sizeof(*info), GFP_KERNEL);</div><div class='add'>+	if (!info)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	ret = get_pll_limits(dev, id, &amp;state-&gt;pll);</div><div class='del'>-	if (ret) {</div><div class='del'>-		kfree(state);</div><div class='del'>-		return (ret == -ENOENT) ? NULL : ERR_PTR(ret);</div><div class='del'>-	}</div><div class='add'>+	ret = calc_pll(dev, PLL_CORE, perflvl-&gt;core, &amp;info-&gt;core);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='del'>-	ret = nouveau_calc_pll_mnp(dev, &amp;state-&gt;pll, khz, &amp;state-&gt;calc);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		kfree(state);</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='add'>+	if (perflvl-&gt;memory) {</div><div class='add'>+		ret = calc_pll(dev, PLL_MEMORY, perflvl-&gt;memory, &amp;info-&gt;memory);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return state;</div><div class='add'>+	return info;</div><div class='add'>+error:</div><div class='add'>+	kfree(info);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-nv04_pm_clock_set(struct drm_device *dev, void *pre_state)</div><div class='add'>+static void</div><div class='add'>+prog_pll(struct drm_device *dev, struct nv04_pm_clock *clk)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_timer_engine *ptimer = &amp;dev_priv-&gt;engine.timer;</div><div class='del'>-	struct nv04_pm_state *state = pre_state;</div><div class='del'>-	u32 reg = state-&gt;pll.reg;</div><div class='add'>+	u32 reg = clk-&gt;pll.reg;</div><div class='ctx'> </div><div class='ctx'> 	/* thank the insane nouveau_hw_setpll() interface for this */</div><div class='ctx'> 	if (dev_priv-&gt;card_type &gt;= NV_40)</div><div class='ctx'> 		reg += 4;</div><div class='ctx'> </div><div class='del'>-	nouveau_hw_setpll(dev, reg, &amp;state-&gt;calc);</div><div class='add'>+	nouveau_hw_setpll(dev, reg, &amp;clk-&gt;calc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nv04_pm_clocks_set(struct drm_device *dev, void *pre_state)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nouveau_timer_engine *ptimer = &amp;dev_priv-&gt;engine.timer;</div><div class='add'>+	struct nv04_pm_state *state = pre_state;</div><div class='add'>+</div><div class='add'>+	prog_pll(dev, &amp;state-&gt;core);</div><div class='ctx'> </div><div class='del'>-	if (dev_priv-&gt;card_type &lt; NV_30 &amp;&amp; reg == NV_PRAMDAC_MPLL_COEFF) {</div><div class='del'>-		if (dev_priv-&gt;card_type == NV_20)</div><div class='del'>-			nv_mask(dev, 0x1002c4, 0, 1 &lt;&lt; 20);</div><div class='add'>+	if (state-&gt;memory.pll.reg) {</div><div class='add'>+		prog_pll(dev, &amp;state-&gt;memory);</div><div class='add'>+		if (dev_priv-&gt;card_type &lt; NV_30) {</div><div class='add'>+			if (dev_priv-&gt;card_type == NV_20)</div><div class='add'>+				nv_mask(dev, 0x1002c4, 0, 1 &lt;&lt; 20);</div><div class='ctx'> </div><div class='del'>-		/* Reset the DLLs */</div><div class='del'>-		nv_mask(dev, 0x1002c0, 0, 1 &lt;&lt; 8);</div><div class='add'>+			/* Reset the DLLs */</div><div class='add'>+			nv_mask(dev, 0x1002c0, 0, 1 &lt;&lt; 8);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (reg == NV_PRAMDAC_NVPLL_COEFF)</div><div class='del'>-		ptimer-&gt;init(dev);</div><div class='add'>+	ptimer-&gt;init(dev);</div><div class='ctx'> </div><div class='ctx'> 	kfree(state);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv04_timer.c b/drivers/gpu/drm/nouveau/nv04_timer.c<br/>index 263301b809dd..55c945290e52 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv04_timer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv04_timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv04_timer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv04_timer.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #include "drm.h"</div><div class='ctx'> #include "nouveau_drv.h"</div><div class='ctx'> #include "nouveau_drm.h"</div><div class='add'>+#include "nouveau_hw.h"</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> nv04_timer_init(struct drm_device *dev)</div><div class='hunk'>@@ -17,7 +18,7 @@ nv04_timer_init(struct drm_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* determine base clock for timer source */</div><div class='ctx'> 	if (dev_priv-&gt;chipset &lt; 0x40) {</div><div class='del'>-		n = dev_priv-&gt;engine.pm.clock_get(dev, PLL_CORE);</div><div class='add'>+		n = nouveau_hw_get_clock(dev, PLL_CORE);</div><div class='ctx'> 	} else</div><div class='ctx'> 	if (dev_priv-&gt;chipset == 0x40) {</div><div class='ctx'> 		/*XXX: figure this out */</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv10_gpio.c b/drivers/gpu/drm/nouveau/nv10_gpio.c<br/>index 007fc29e2f86..550ad3fcf0af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv10_gpio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv10_gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv10_gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv10_gpio.c</a></div><div class='hunk'>@@ -27,66 +27,97 @@</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> #include "nouveau_drv.h"</div><div class='ctx'> #include "nouveau_hw.h"</div><div class='add'>+#include "nouveau_gpio.h"</div><div class='ctx'> </div><div class='del'>-static bool</div><div class='del'>-get_gpio_location(struct dcb_gpio_entry *ent, uint32_t *reg, uint32_t *shift,</div><div class='del'>-		  uint32_t *mask)</div><div class='add'>+int</div><div class='add'>+nv10_gpio_sense(struct drm_device *dev, int line)</div><div class='ctx'> {</div><div class='del'>-	if (ent-&gt;line &lt; 2) {</div><div class='del'>-		*reg = NV_PCRTC_GPIO;</div><div class='del'>-		*shift = ent-&gt;line * 16;</div><div class='del'>-		*mask = 0x11;</div><div class='del'>-</div><div class='del'>-	} else if (ent-&gt;line &lt; 10) {</div><div class='del'>-		*reg = NV_PCRTC_GPIO_EXT;</div><div class='del'>-		*shift = (ent-&gt;line - 2) * 4;</div><div class='del'>-		*mask = 0x3;</div><div class='add'>+	if (line &lt; 2) {</div><div class='add'>+		line = line * 16;</div><div class='add'>+		line = NVReadCRTC(dev, 0, NV_PCRTC_GPIO) &gt;&gt; line;</div><div class='add'>+		return !!(line &amp; 0x0100);</div><div class='add'>+	} else</div><div class='add'>+	if (line &lt; 10) {</div><div class='add'>+		line = (line - 2) * 4;</div><div class='add'>+		line = NVReadCRTC(dev, 0, NV_PCRTC_GPIO_EXT) &gt;&gt; line;</div><div class='add'>+		return !!(line &amp; 0x04);</div><div class='add'>+	} else</div><div class='add'>+	if (line &lt; 14) {</div><div class='add'>+		line = (line - 10) * 4;</div><div class='add'>+		line = NVReadCRTC(dev, 0, NV_PCRTC_850) &gt;&gt; line;</div><div class='add'>+		return !!(line &amp; 0x04);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	} else if (ent-&gt;line &lt; 14) {</div><div class='del'>-		*reg = NV_PCRTC_850;</div><div class='del'>-		*shift = (ent-&gt;line - 10) * 4;</div><div class='del'>-		*mask = 0x3;</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+int</div><div class='add'>+nv10_gpio_drive(struct drm_device *dev, int line, int dir, int out)</div><div class='add'>+{</div><div class='add'>+	u32 reg, mask, data;</div><div class='add'>+</div><div class='add'>+	if (line &lt; 2) {</div><div class='add'>+		line = line * 16;</div><div class='add'>+		reg  = NV_PCRTC_GPIO;</div><div class='add'>+		mask = 0x00000011;</div><div class='add'>+		data = (dir &lt;&lt; 4) | out;</div><div class='add'>+	} else</div><div class='add'>+	if (line &lt; 10) {</div><div class='add'>+		line = (line - 2) * 4;</div><div class='add'>+		reg  = NV_PCRTC_GPIO_EXT;</div><div class='add'>+		mask = 0x00000003 &lt;&lt; ((line - 2) * 4);</div><div class='add'>+		data = (dir &lt;&lt; 1) | out;</div><div class='add'>+	} else</div><div class='add'>+	if (line &lt; 14) {</div><div class='add'>+		line = (line - 10) * 4;</div><div class='add'>+		reg  = NV_PCRTC_850;</div><div class='add'>+		mask = 0x00000003;</div><div class='add'>+		data = (dir &lt;&lt; 1) | out;</div><div class='ctx'> 	} else {</div><div class='del'>-		return false;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return true;</div><div class='add'>+	mask = NVReadCRTC(dev, 0, reg) &amp; ~(mask &lt;&lt; line);</div><div class='add'>+	NVWriteCRTC(dev, 0, reg, mask | (data &lt;&lt; line));</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-nv10_gpio_get(struct drm_device *dev, enum dcb_gpio_tag tag)</div><div class='add'>+void</div><div class='add'>+nv10_gpio_irq_enable(struct drm_device *dev, int line, bool on)</div><div class='ctx'> {</div><div class='del'>-	struct dcb_gpio_entry *ent = nouveau_bios_gpio_entry(dev, tag);</div><div class='del'>-	uint32_t reg, shift, mask, value;</div><div class='add'>+	u32 mask = 0x00010001 &lt;&lt; line;</div><div class='ctx'> </div><div class='del'>-	if (!ent)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	nv_wr32(dev, 0x001104, mask);</div><div class='add'>+	nv_mask(dev, 0x001144, mask, on ? mask : 0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (!get_gpio_location(ent, &amp;reg, &amp;shift, &amp;mask))</div><div class='del'>-		return -ENODEV;</div><div class='add'>+static void</div><div class='add'>+nv10_gpio_isr(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	u32 intr = nv_rd32(dev, 0x1104);</div><div class='add'>+	u32 hi = (intr &amp; 0x0000ffff) &gt;&gt; 0;</div><div class='add'>+	u32 lo = (intr &amp; 0xffff0000) &gt;&gt; 16;</div><div class='ctx'> </div><div class='del'>-	value = NVReadCRTC(dev, 0, reg) &gt;&gt; shift;</div><div class='add'>+	nouveau_gpio_isr(dev, 0, hi | lo);</div><div class='ctx'> </div><div class='del'>-	return (ent-&gt;invert ? 1 : 0) ^ (value &amp; 1);</div><div class='add'>+	nv_wr32(dev, 0x001104, intr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-nv10_gpio_set(struct drm_device *dev, enum dcb_gpio_tag tag, int state)</div><div class='add'>+nv10_gpio_init(struct drm_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct dcb_gpio_entry *ent = nouveau_bios_gpio_entry(dev, tag);</div><div class='del'>-	uint32_t reg, shift, mask, value;</div><div class='del'>-</div><div class='del'>-	if (!ent)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (!get_gpio_location(ent, &amp;reg, &amp;shift, &amp;mask))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	value = ((ent-&gt;invert ? 1 : 0) ^ (state ? 1 : 0)) &lt;&lt; shift;</div><div class='del'>-	mask = ~(mask &lt;&lt; shift);</div><div class='del'>-</div><div class='del'>-	NVWriteCRTC(dev, 0, reg, value | (NVReadCRTC(dev, 0, reg) &amp; mask));</div><div class='del'>-</div><div class='add'>+	nv_wr32(dev, 0x001140, 0x00000000);</div><div class='add'>+	nv_wr32(dev, 0x001100, 0xffffffff);</div><div class='add'>+	nv_wr32(dev, 0x001144, 0x00000000);</div><div class='add'>+	nv_wr32(dev, 0x001104, 0xffffffff);</div><div class='add'>+	nouveau_irq_register(dev, 28, nv10_gpio_isr); /* PBUS */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+nv10_gpio_fini(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	nv_wr32(dev, 0x001140, 0x00000000);</div><div class='add'>+	nv_wr32(dev, 0x001144, 0x00000000);</div><div class='add'>+	nouveau_irq_unregister(dev, 28);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c<br/>index 3900cebba560..696d7e7dc2a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv17_tv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv17_tv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv17_tv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv17_tv.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> #include "nouveau_encoder.h"</div><div class='ctx'> #include "nouveau_connector.h"</div><div class='ctx'> #include "nouveau_crtc.h"</div><div class='add'>+#include "nouveau_gpio.h"</div><div class='ctx'> #include "nouveau_hw.h"</div><div class='ctx'> #include "nv17_tv.h"</div><div class='ctx'> </div><div class='hunk'>@@ -37,7 +38,6 @@ static uint32_t nv42_tv_sample_load(struct drm_encoder *encoder)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_device *dev = encoder-&gt;dev;</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_gpio_engine *gpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='ctx'> 	uint32_t testval, regoffset = nv04_dac_output_offset(encoder);</div><div class='ctx'> 	uint32_t gpio0, gpio1, fp_htotal, fp_hsync_start, fp_hsync_end,</div><div class='ctx'> 		fp_control, test_ctrl, dacclk, ctv_14, ctv_1c, ctv_6c;</div><div class='hunk'>@@ -53,8 +53,8 @@ static uint32_t nv42_tv_sample_load(struct drm_encoder *encoder)</div><div class='ctx'> 	head = (dacclk &amp; 0x100) &gt;&gt; 8;</div><div class='ctx'> </div><div class='ctx'> 	/* Save the previous state. */</div><div class='del'>-	gpio1 = gpio-&gt;get(dev, DCB_GPIO_TVDAC1);</div><div class='del'>-	gpio0 = gpio-&gt;get(dev, DCB_GPIO_TVDAC0);</div><div class='add'>+	gpio1 = nouveau_gpio_func_get(dev, DCB_GPIO_TVDAC1);</div><div class='add'>+	gpio0 = nouveau_gpio_func_get(dev, DCB_GPIO_TVDAC0);</div><div class='ctx'> 	fp_htotal = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_HTOTAL);</div><div class='ctx'> 	fp_hsync_start = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_START);</div><div class='ctx'> 	fp_hsync_end = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_END);</div><div class='hunk'>@@ -65,8 +65,8 @@ static uint32_t nv42_tv_sample_load(struct drm_encoder *encoder)</div><div class='ctx'> 	ctv_6c = NVReadRAMDAC(dev, head, 0x680c6c);</div><div class='ctx'> </div><div class='ctx'> 	/* Prepare the DAC for load detection.  */</div><div class='del'>-	gpio-&gt;set(dev, DCB_GPIO_TVDAC1, true);</div><div class='del'>-	gpio-&gt;set(dev, DCB_GPIO_TVDAC0, true);</div><div class='add'>+	nouveau_gpio_func_set(dev, DCB_GPIO_TVDAC1, true);</div><div class='add'>+	nouveau_gpio_func_set(dev, DCB_GPIO_TVDAC0, true);</div><div class='ctx'> </div><div class='ctx'> 	NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HTOTAL, 1343);</div><div class='ctx'> 	NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_START, 1047);</div><div class='hunk'>@@ -111,8 +111,8 @@ static uint32_t nv42_tv_sample_load(struct drm_encoder *encoder)</div><div class='ctx'> 	NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_END, fp_hsync_end);</div><div class='ctx'> 	NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_START, fp_hsync_start);</div><div class='ctx'> 	NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HTOTAL, fp_htotal);</div><div class='del'>-	gpio-&gt;set(dev, DCB_GPIO_TVDAC1, gpio1);</div><div class='del'>-	gpio-&gt;set(dev, DCB_GPIO_TVDAC0, gpio0);</div><div class='add'>+	nouveau_gpio_func_set(dev, DCB_GPIO_TVDAC1, gpio1);</div><div class='add'>+	nouveau_gpio_func_set(dev, DCB_GPIO_TVDAC0, gpio0);</div><div class='ctx'> </div><div class='ctx'> 	return sample;</div><div class='ctx'> }</div><div class='hunk'>@@ -357,8 +357,6 @@ static bool nv17_tv_mode_fixup(struct drm_encoder *encoder,</div><div class='ctx'> static void  nv17_tv_dpms(struct drm_encoder *encoder, int mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_device *dev = encoder-&gt;dev;</div><div class='del'>-	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_gpio_engine *gpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='ctx'> 	struct nv17_tv_state *regs = &amp;to_tv_enc(encoder)-&gt;state;</div><div class='ctx'> 	struct nv17_tv_norm_params *tv_norm = get_tv_norm(encoder);</div><div class='ctx'> </div><div class='hunk'>@@ -383,8 +381,8 @@ static void  nv17_tv_dpms(struct drm_encoder *encoder, int mode)</div><div class='ctx'> </div><div class='ctx'> 	nv_load_ptv(dev, regs, 200);</div><div class='ctx'> </div><div class='del'>-	gpio-&gt;set(dev, DCB_GPIO_TVDAC1, mode == DRM_MODE_DPMS_ON);</div><div class='del'>-	gpio-&gt;set(dev, DCB_GPIO_TVDAC0, mode == DRM_MODE_DPMS_ON);</div><div class='add'>+	nouveau_gpio_func_set(dev, DCB_GPIO_TVDAC1, mode == DRM_MODE_DPMS_ON);</div><div class='add'>+	nouveau_gpio_func_set(dev, DCB_GPIO_TVDAC0, mode == DRM_MODE_DPMS_ON);</div><div class='ctx'> </div><div class='ctx'> 	nv04_dac_update_dacclk(encoder, mode == DRM_MODE_DPMS_ON);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv40_pm.c b/drivers/gpu/drm/nouveau/nv40_pm.c<br/>index e676b0d53478..c7615381c5d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv40_pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv40_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv40_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv40_pm.c</a></div><div class='hunk'>@@ -222,7 +222,7 @@ nv40_pm_gr_idle(void *data)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='add'>+int</div><div class='ctx'> nv40_pm_clocks_set(struct drm_device *dev, void *pre_state)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='hunk'>@@ -231,7 +231,7 @@ nv40_pm_clocks_set(struct drm_device *dev, void *pre_state)</div><div class='ctx'> 	struct bit_entry M;</div><div class='ctx'> 	u32 crtc_mask = 0;</div><div class='ctx'> 	u8 sr1[2];</div><div class='del'>-	int i;</div><div class='add'>+	int i, ret = -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	/* determine which CRTCs are active, fetch VGA_SR1 for each */</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='hunk'>@@ -263,6 +263,8 @@ nv40_pm_clocks_set(struct drm_device *dev, void *pre_state)</div><div class='ctx'> 	if (!nv_wait_cb(dev, nv40_pm_gr_idle, dev))</div><div class='ctx'> 		goto resume;</div><div class='ctx'> </div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='ctx'> 	/* set engine clocks */</div><div class='ctx'> 	nv_mask(dev, 0x00c040, 0x00000333, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x004004, info-&gt;npll_coef);</div><div class='hunk'>@@ -345,4 +347,48 @@ resume:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;dev_priv-&gt;context_switch_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	kfree(info);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nv40_pm_pwm_get(struct drm_device *dev, int line, u32 *divs, u32 *duty)</div><div class='add'>+{</div><div class='add'>+	if (line == 2) {</div><div class='add'>+		u32 reg = nv_rd32(dev, 0x0010f0);</div><div class='add'>+		if (reg &amp; 0x80000000) {</div><div class='add'>+			*duty = (reg &amp; 0x7fff0000) &gt;&gt; 16;</div><div class='add'>+			*divs = (reg &amp; 0x00007fff);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+	if (line == 9) {</div><div class='add'>+		u32 reg = nv_rd32(dev, 0x0015f4);</div><div class='add'>+		if (reg &amp; 0x80000000) {</div><div class='add'>+			*divs = nv_rd32(dev, 0x0015f8);</div><div class='add'>+			*duty = (reg &amp; 0x7fffffff);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		NV_ERROR(dev, "unknown pwm ctrl for gpio %d\n", line);</div><div class='add'>+		return -ENODEV;</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'>+int</div><div class='add'>+nv40_pm_pwm_set(struct drm_device *dev, int line, u32 divs, u32 duty)</div><div class='add'>+{</div><div class='add'>+	if (line == 2) {</div><div class='add'>+		nv_wr32(dev, 0x0010f0, 0x80000000 | (duty &lt;&lt; 16) | divs);</div><div class='add'>+	} else</div><div class='add'>+	if (line == 9) {</div><div class='add'>+		nv_wr32(dev, 0x0015f8, divs);</div><div class='add'>+		nv_wr32(dev, 0x0015f4, duty | 0x80000000);</div><div class='add'>+	} else {</div><div class='add'>+		NV_ERROR(dev, "unknown pwm ctrl for gpio %d\n", line);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c<br/>index 882080e0b4f5..8f6c2ace3adf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_crtc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_crtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_crtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv50_crtc.c</a></div><div class='hunk'>@@ -132,33 +132,42 @@ nv50_crtc_blank(struct nouveau_crtc *nv_crtc, bool blanked)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nv50_crtc_set_dither(struct nouveau_crtc *nv_crtc, bool on, bool update)</div><div class='add'>+nv50_crtc_set_dither(struct nouveau_crtc *nv_crtc, bool update)</div><div class='ctx'> {</div><div class='del'>-	struct drm_device *dev = nv_crtc-&gt;base.dev;</div><div class='del'>-	struct nouveau_channel *evo = nv50_display(dev)-&gt;master;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	NV_DEBUG_KMS(dev, "\n");</div><div class='add'>+	struct nouveau_channel *evo = nv50_display(nv_crtc-&gt;base.dev)-&gt;master;</div><div class='add'>+	struct nouveau_connector *nv_connector;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+	int head = nv_crtc-&gt;index, ret;</div><div class='add'>+	u32 mode = 0x00;</div><div class='ctx'> </div><div class='del'>-	ret = RING_SPACE(evo, 2 + (update ? 2 : 0));</div><div class='del'>-	if (ret) {</div><div class='del'>-		NV_ERROR(dev, "no space while setting dither\n");</div><div class='del'>-		return ret;</div><div class='add'>+	nv_connector = nouveau_crtc_connector_get(nv_crtc);</div><div class='add'>+	connector = &amp;nv_connector-&gt;base;</div><div class='add'>+	if (nv_connector-&gt;dithering_mode == DITHERING_MODE_AUTO) {</div><div class='add'>+		if (nv_crtc-&gt;base.fb-&gt;depth &gt; connector-&gt;display_info.bpc * 3)</div><div class='add'>+			mode = DITHERING_MODE_DYNAMIC2X2;</div><div class='add'>+	} else {</div><div class='add'>+		mode = nv_connector-&gt;dithering_mode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	BEGIN_RING(evo, 0, NV50_EVO_CRTC(nv_crtc-&gt;index, DITHER_CTRL), 1);</div><div class='del'>-	if (on)</div><div class='del'>-		OUT_RING(evo, NV50_EVO_CRTC_DITHER_CTRL_ON);</div><div class='del'>-	else</div><div class='del'>-		OUT_RING(evo, NV50_EVO_CRTC_DITHER_CTRL_OFF);</div><div class='add'>+	if (nv_connector-&gt;dithering_depth == DITHERING_DEPTH_AUTO) {</div><div class='add'>+		if (connector-&gt;display_info.bpc &gt;= 8)</div><div class='add'>+			mode |= DITHERING_DEPTH_8BPC;</div><div class='add'>+	} else {</div><div class='add'>+		mode |= nv_connector-&gt;dithering_depth;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (update) {</div><div class='del'>-		BEGIN_RING(evo, 0, NV50_EVO_UPDATE, 1);</div><div class='del'>-		OUT_RING(evo, 0);</div><div class='del'>-		FIRE_RING(evo);</div><div class='add'>+	ret = RING_SPACE(evo, 2 + (update ? 2 : 0));</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		BEGIN_RING(evo, 0, NV50_EVO_CRTC(head, DITHER_CTRL), 1);</div><div class='add'>+		OUT_RING  (evo, mode);</div><div class='add'>+		if (update) {</div><div class='add'>+			BEGIN_RING(evo, 0, NV50_EVO_UPDATE, 1);</div><div class='add'>+			OUT_RING  (evo, 0);</div><div class='add'>+			FIRE_RING (evo);</div><div class='add'>+		}</div><div class='ctx'> 	}</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'> struct nouveau_connector *</div><div class='hunk'>@@ -180,80 +189,103 @@ nouveau_crtc_connector_get(struct nouveau_crtc *nv_crtc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nv50_crtc_set_scale(struct nouveau_crtc *nv_crtc, int scaling_mode, bool update)</div><div class='add'>+nv50_crtc_set_scale(struct nouveau_crtc *nv_crtc, bool update)</div><div class='ctx'> {</div><div class='del'>-	struct nouveau_connector *nv_connector =</div><div class='del'>-		nouveau_crtc_connector_get(nv_crtc);</div><div class='del'>-	struct drm_device *dev = nv_crtc-&gt;base.dev;</div><div class='add'>+	struct nouveau_connector *nv_connector;</div><div class='add'>+	struct drm_crtc *crtc = &amp;nv_crtc-&gt;base;</div><div class='add'>+	struct drm_device *dev = crtc-&gt;dev;</div><div class='ctx'> 	struct nouveau_channel *evo = nv50_display(dev)-&gt;master;</div><div class='del'>-	struct drm_display_mode *native_mode = NULL;</div><div class='del'>-	struct drm_display_mode *mode = &amp;nv_crtc-&gt;base.mode;</div><div class='del'>-	uint32_t outX, outY, horiz, vert;</div><div class='del'>-	int ret;</div><div class='add'>+	struct drm_display_mode *umode = &amp;crtc-&gt;mode;</div><div class='add'>+	struct drm_display_mode *omode;</div><div class='add'>+	int scaling_mode, ret;</div><div class='add'>+	u32 ctrl = 0, oX, oY;</div><div class='ctx'> </div><div class='ctx'> 	NV_DEBUG_KMS(dev, "\n");</div><div class='ctx'> </div><div class='del'>-	switch (scaling_mode) {</div><div class='del'>-	case DRM_MODE_SCALE_NONE:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		if (!nv_connector || !nv_connector-&gt;native_mode) {</div><div class='del'>-			NV_ERROR(dev, "No native mode, forcing panel scaling\n");</div><div class='del'>-			scaling_mode = DRM_MODE_SCALE_NONE;</div><div class='add'>+	nv_connector = nouveau_crtc_connector_get(nv_crtc);</div><div class='add'>+	if (!nv_connector || !nv_connector-&gt;native_mode) {</div><div class='add'>+		NV_ERROR(dev, "no native mode, forcing panel scaling\n");</div><div class='add'>+		scaling_mode = DRM_MODE_SCALE_NONE;</div><div class='add'>+	} else {</div><div class='add'>+		scaling_mode = nv_connector-&gt;scaling_mode;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* start off at the resolution we programmed the crtc for, this</div><div class='add'>+	 * effectively handles NONE/FULL scaling</div><div class='add'>+	 */</div><div class='add'>+	if (scaling_mode != DRM_MODE_SCALE_NONE)</div><div class='add'>+		omode = nv_connector-&gt;native_mode;</div><div class='add'>+	else</div><div class='add'>+		omode = umode;</div><div class='add'>+</div><div class='add'>+	oX = omode-&gt;hdisplay;</div><div class='add'>+	oY = omode-&gt;vdisplay;</div><div class='add'>+	if (omode-&gt;flags &amp; DRM_MODE_FLAG_DBLSCAN)</div><div class='add'>+		oY *= 2;</div><div class='add'>+</div><div class='add'>+	/* add overscan compensation if necessary, will keep the aspect</div><div class='add'>+	 * ratio the same as the backend mode unless overridden by the</div><div class='add'>+	 * user setting both hborder and vborder properties.</div><div class='add'>+	 */</div><div class='add'>+	if (nv_connector &amp;&amp; ( nv_connector-&gt;underscan == UNDERSCAN_ON ||</div><div class='add'>+			     (nv_connector-&gt;underscan == UNDERSCAN_AUTO &amp;&amp;</div><div class='add'>+			      nv_connector-&gt;edid &amp;&amp;</div><div class='add'>+			      drm_detect_hdmi_monitor(nv_connector-&gt;edid)))) {</div><div class='add'>+		u32 bX = nv_connector-&gt;underscan_hborder;</div><div class='add'>+		u32 bY = nv_connector-&gt;underscan_vborder;</div><div class='add'>+		u32 aspect = (oY &lt;&lt; 19) / oX;</div><div class='add'>+</div><div class='add'>+		if (bX) {</div><div class='add'>+			oX -= (bX * 2);</div><div class='add'>+			if (bY) oY -= (bY * 2);</div><div class='add'>+			else    oY  = ((oX * aspect) + (aspect / 2)) &gt;&gt; 19;</div><div class='ctx'> 		} else {</div><div class='del'>-			native_mode = nv_connector-&gt;native_mode;</div><div class='add'>+			oX -= (oX &gt;&gt; 4) + 32;</div><div class='add'>+			if (bY) oY -= (bY * 2);</div><div class='add'>+			else    oY  = ((oX * aspect) + (aspect / 2)) &gt;&gt; 19;</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* handle CENTER/ASPECT scaling, taking into account the areas</div><div class='add'>+	 * removed already for overscan compensation</div><div class='add'>+	 */</div><div class='ctx'> 	switch (scaling_mode) {</div><div class='add'>+	case DRM_MODE_SCALE_CENTER:</div><div class='add'>+		oX = min((u32)umode-&gt;hdisplay, oX);</div><div class='add'>+		oY = min((u32)umode-&gt;vdisplay, oY);</div><div class='add'>+		/* fall-through */</div><div class='ctx'> 	case DRM_MODE_SCALE_ASPECT:</div><div class='del'>-		horiz = (native_mode-&gt;hdisplay &lt;&lt; 19) / mode-&gt;hdisplay;</div><div class='del'>-		vert = (native_mode-&gt;vdisplay &lt;&lt; 19) / mode-&gt;vdisplay;</div><div class='del'>-</div><div class='del'>-		if (vert &gt; horiz) {</div><div class='del'>-			outX = (mode-&gt;hdisplay * horiz) &gt;&gt; 19;</div><div class='del'>-			outY = (mode-&gt;vdisplay * horiz) &gt;&gt; 19;</div><div class='add'>+		if (oY &lt; oX) {</div><div class='add'>+			u32 aspect = (umode-&gt;hdisplay &lt;&lt; 19) / umode-&gt;vdisplay;</div><div class='add'>+			oX = ((oY * aspect) + (aspect / 2)) &gt;&gt; 19;</div><div class='ctx'> 		} else {</div><div class='del'>-			outX = (mode-&gt;hdisplay * vert) &gt;&gt; 19;</div><div class='del'>-			outY = (mode-&gt;vdisplay * vert) &gt;&gt; 19;</div><div class='add'>+			u32 aspect = (umode-&gt;vdisplay &lt;&lt; 19) / umode-&gt;hdisplay;</div><div class='add'>+			oY = ((oX * aspect) + (aspect / 2)) &gt;&gt; 19;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-	case DRM_MODE_SCALE_FULLSCREEN:</div><div class='del'>-		outX = native_mode-&gt;hdisplay;</div><div class='del'>-		outY = native_mode-&gt;vdisplay;</div><div class='del'>-		break;</div><div class='del'>-	case DRM_MODE_SCALE_CENTER:</div><div class='del'>-	case DRM_MODE_SCALE_NONE:</div><div class='ctx'> 	default:</div><div class='del'>-		outX = mode-&gt;hdisplay;</div><div class='del'>-		outY = mode-&gt;vdisplay;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = RING_SPACE(evo, update ? 7 : 5);</div><div class='add'>+	if (umode-&gt;hdisplay != oX || umode-&gt;vdisplay != oY ||</div><div class='add'>+	    umode-&gt;flags &amp; DRM_MODE_FLAG_INTERLACE ||</div><div class='add'>+	    umode-&gt;flags &amp; DRM_MODE_FLAG_DBLSCAN)</div><div class='add'>+		ctrl |= NV50_EVO_CRTC_SCALE_CTRL_ACTIVE;</div><div class='add'>+</div><div class='add'>+	ret = RING_SPACE(evo, 5);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/* Got a better name for SCALER_ACTIVE? */</div><div class='del'>-	/* One day i've got to really figure out why this is needed. */</div><div class='ctx'> 	BEGIN_RING(evo, 0, NV50_EVO_CRTC(nv_crtc-&gt;index, SCALE_CTRL), 1);</div><div class='del'>-	if ((mode-&gt;flags &amp; DRM_MODE_FLAG_DBLSCAN) ||</div><div class='del'>-	    (mode-&gt;flags &amp; DRM_MODE_FLAG_INTERLACE) ||</div><div class='del'>-	    mode-&gt;hdisplay != outX || mode-&gt;vdisplay != outY) {</div><div class='del'>-		OUT_RING(evo, NV50_EVO_CRTC_SCALE_CTRL_ACTIVE);</div><div class='del'>-	} else {</div><div class='del'>-		OUT_RING(evo, NV50_EVO_CRTC_SCALE_CTRL_INACTIVE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	OUT_RING  (evo, ctrl);</div><div class='ctx'> 	BEGIN_RING(evo, 0, NV50_EVO_CRTC(nv_crtc-&gt;index, SCALE_RES1), 2);</div><div class='del'>-	OUT_RING(evo, outY &lt;&lt; 16 | outX);</div><div class='del'>-	OUT_RING(evo, outY &lt;&lt; 16 | outX);</div><div class='add'>+	OUT_RING  (evo, oY &lt;&lt; 16 | oX);</div><div class='add'>+	OUT_RING  (evo, oY &lt;&lt; 16 | oX);</div><div class='ctx'> </div><div class='ctx'> 	if (update) {</div><div class='del'>-		BEGIN_RING(evo, 0, NV50_EVO_UPDATE, 1);</div><div class='del'>-		OUT_RING(evo, 0);</div><div class='del'>-		FIRE_RING(evo);</div><div class='add'>+		nv50_display_flip_stop(crtc);</div><div class='add'>+		nv50_display_sync(dev);</div><div class='add'>+		nv50_display_flip_next(crtc, crtc-&gt;fb, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -333,7 +365,6 @@ nv50_crtc_destroy(struct drm_crtc *crtc)</div><div class='ctx'> 	nouveau_bo_ref(NULL, &amp;nv_crtc-&gt;lut.nvbo);</div><div class='ctx'> 	nouveau_bo_unmap(nv_crtc-&gt;cursor.nvbo);</div><div class='ctx'> 	nouveau_bo_ref(NULL, &amp;nv_crtc-&gt;cursor.nvbo);</div><div class='del'>-	kfree(nv_crtc-&gt;mode);</div><div class='ctx'> 	kfree(nv_crtc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -441,39 +472,6 @@ nv50_crtc_dpms(struct drm_crtc *crtc, int mode)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-nv50_crtc_wait_complete(struct drm_crtc *crtc)</div><div class='del'>-{</div><div class='del'>-	struct drm_device *dev = crtc-&gt;dev;</div><div class='del'>-	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_timer_engine *ptimer = &amp;dev_priv-&gt;engine.timer;</div><div class='del'>-	struct nv50_display *disp = nv50_display(dev);</div><div class='del'>-	struct nouveau_channel *evo = disp-&gt;master;</div><div class='del'>-	u64 start;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = RING_SPACE(evo, 6);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	BEGIN_RING(evo, 0, 0x0084, 1);</div><div class='del'>-	OUT_RING  (evo, 0x80000000);</div><div class='del'>-	BEGIN_RING(evo, 0, 0x0080, 1);</div><div class='del'>-	OUT_RING  (evo, 0);</div><div class='del'>-	BEGIN_RING(evo, 0, 0x0084, 1);</div><div class='del'>-	OUT_RING  (evo, 0x00000000);</div><div class='del'>-</div><div class='del'>-	nv_wo32(disp-&gt;ntfy, 0x000, 0x00000000);</div><div class='del'>-	FIRE_RING (evo);</div><div class='del'>-</div><div class='del'>-	start = ptimer-&gt;read(dev);</div><div class='del'>-	do {</div><div class='del'>-		if (nv_ro32(disp-&gt;ntfy, 0x000))</div><div class='del'>-			return 0;</div><div class='del'>-	} while (ptimer-&gt;read(dev) - start &lt; 2000000000ULL);</div><div class='del'>-</div><div class='del'>-	return -EBUSY;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> nv50_crtc_prepare(struct drm_crtc *crtc)</div><div class='ctx'> {</div><div class='hunk'>@@ -497,7 +495,7 @@ nv50_crtc_commit(struct drm_crtc *crtc)</div><div class='ctx'> </div><div class='ctx'> 	nv50_crtc_blank(nv_crtc, false);</div><div class='ctx'> 	drm_vblank_post_modeset(dev, nv_crtc-&gt;index);</div><div class='del'>-	nv50_crtc_wait_complete(crtc);</div><div class='add'>+	nv50_display_sync(dev);</div><div class='ctx'> 	nv50_display_flip_next(crtc, crtc-&gt;fb, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -593,90 +591,76 @@ nv50_crtc_do_mode_set_base(struct drm_crtc *crtc,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nv50_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode,</div><div class='del'>-		   struct drm_display_mode *adjusted_mode, int x, int y,</div><div class='add'>+nv50_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *umode,</div><div class='add'>+		   struct drm_display_mode *mode, int x, int y,</div><div class='ctx'> 		   struct drm_framebuffer *old_fb)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_device *dev = crtc-&gt;dev;</div><div class='ctx'> 	struct nouveau_channel *evo = nv50_display(dev)-&gt;master;</div><div class='ctx'> 	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);</div><div class='del'>-	struct nouveau_connector *nv_connector = NULL;</div><div class='del'>-	uint32_t hsync_dur,  vsync_dur, hsync_start_to_end, vsync_start_to_end;</div><div class='del'>-	uint32_t hunk1, vunk1, vunk2a, vunk2b;</div><div class='add'>+	u32 head = nv_crtc-&gt;index * 0x400;</div><div class='add'>+	u32 ilace = (mode-&gt;flags &amp; DRM_MODE_FLAG_INTERLACE) ? 2 : 1;</div><div class='add'>+	u32 vscan = (mode-&gt;flags &amp; DRM_MODE_FLAG_DBLSCAN) ? 2 : 1;</div><div class='add'>+	u32 hactive, hsynce, hbackp, hfrontp, hblanke, hblanks;</div><div class='add'>+	u32 vactive, vsynce, vbackp, vfrontp, vblanke, vblanks;</div><div class='add'>+	u32 vblan2e = 0, vblan2s = 1;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* Find the connector attached to this CRTC */</div><div class='del'>-	nv_connector = nouveau_crtc_connector_get(nv_crtc);</div><div class='del'>-</div><div class='del'>-	*nv_crtc-&gt;mode = *adjusted_mode;</div><div class='del'>-</div><div class='del'>-	NV_DEBUG_KMS(dev, "index %d\n", nv_crtc-&gt;index);</div><div class='add'>+	/* hw timing description looks like this:</div><div class='add'>+	 *</div><div class='add'>+	 * &lt;sync&gt; &lt;back porch&gt; &lt;---------display---------&gt; &lt;front porch&gt;</div><div class='add'>+	 * ______</div><div class='add'>+	 *       |____________|---------------------------|____________|</div><div class='add'>+	 *</div><div class='add'>+	 *       ^ synce      ^ blanke                    ^ blanks     ^ active</div><div class='add'>+	 *</div><div class='add'>+	 * interlaced modes also have 2 additional values pointing at the end</div><div class='add'>+	 * and start of the next field's blanking period.</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='del'>-	hsync_dur = adjusted_mode-&gt;hsync_end - adjusted_mode-&gt;hsync_start;</div><div class='del'>-	vsync_dur = adjusted_mode-&gt;vsync_end - adjusted_mode-&gt;vsync_start;</div><div class='del'>-	hsync_start_to_end = adjusted_mode-&gt;htotal - adjusted_mode-&gt;hsync_start;</div><div class='del'>-	vsync_start_to_end = adjusted_mode-&gt;vtotal - adjusted_mode-&gt;vsync_start;</div><div class='del'>-	/* I can't give this a proper name, anyone else can? */</div><div class='del'>-	hunk1 = adjusted_mode-&gt;htotal -</div><div class='del'>-		adjusted_mode-&gt;hsync_start + adjusted_mode-&gt;hdisplay;</div><div class='del'>-	vunk1 = adjusted_mode-&gt;vtotal -</div><div class='del'>-		adjusted_mode-&gt;vsync_start + adjusted_mode-&gt;vdisplay;</div><div class='del'>-	/* Another strange value, this time only for interlaced adjusted_modes. */</div><div class='del'>-	vunk2a = 2 * adjusted_mode-&gt;vtotal -</div><div class='del'>-		 adjusted_mode-&gt;vsync_start + adjusted_mode-&gt;vdisplay;</div><div class='del'>-	vunk2b = adjusted_mode-&gt;vtotal -</div><div class='del'>-		 adjusted_mode-&gt;vsync_start + adjusted_mode-&gt;vtotal;</div><div class='del'>-</div><div class='del'>-	if (adjusted_mode-&gt;flags &amp; DRM_MODE_FLAG_INTERLACE) {</div><div class='del'>-		vsync_dur /= 2;</div><div class='del'>-		vsync_start_to_end  /= 2;</div><div class='del'>-		vunk1 /= 2;</div><div class='del'>-		vunk2a /= 2;</div><div class='del'>-		vunk2b /= 2;</div><div class='del'>-		/* magic */</div><div class='del'>-		if (adjusted_mode-&gt;flags &amp; DRM_MODE_FLAG_DBLSCAN) {</div><div class='del'>-			vsync_start_to_end -= 1;</div><div class='del'>-			vunk1 -= 1;</div><div class='del'>-			vunk2a -= 1;</div><div class='del'>-			vunk2b -= 1;</div><div class='del'>-		}</div><div class='add'>+	hactive = mode-&gt;htotal;</div><div class='add'>+	hsynce  = mode-&gt;hsync_end - mode-&gt;hsync_start - 1;</div><div class='add'>+	hbackp  = mode-&gt;htotal - mode-&gt;hsync_end;</div><div class='add'>+	hblanke = hsynce + hbackp;</div><div class='add'>+	hfrontp = mode-&gt;hsync_start - mode-&gt;hdisplay;</div><div class='add'>+	hblanks = mode-&gt;htotal - hfrontp - 1;</div><div class='add'>+</div><div class='add'>+	vactive = mode-&gt;vtotal * vscan / ilace;</div><div class='add'>+	vsynce  = ((mode-&gt;vsync_end - mode-&gt;vsync_start) * vscan / ilace) - 1;</div><div class='add'>+	vbackp  = (mode-&gt;vtotal - mode-&gt;vsync_end) * vscan / ilace;</div><div class='add'>+	vblanke = vsynce + vbackp;</div><div class='add'>+	vfrontp = (mode-&gt;vsync_start - mode-&gt;vdisplay) * vscan / ilace;</div><div class='add'>+	vblanks = vactive - vfrontp - 1;</div><div class='add'>+	if (mode-&gt;flags &amp; DRM_MODE_FLAG_INTERLACE) {</div><div class='add'>+		vblan2e = vactive + vsynce + vbackp;</div><div class='add'>+		vblan2s = vblan2e + (mode-&gt;vdisplay * vscan / ilace);</div><div class='add'>+		vactive = (vactive * 2) + 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = RING_SPACE(evo, 17);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	BEGIN_RING(evo, 0, NV50_EVO_CRTC(nv_crtc-&gt;index, CLOCK), 2);</div><div class='del'>-	OUT_RING(evo, adjusted_mode-&gt;clock | 0x800000);</div><div class='del'>-	OUT_RING(evo, (adjusted_mode-&gt;flags &amp; DRM_MODE_FLAG_INTERLACE) ? 2 : 0);</div><div class='del'>-</div><div class='del'>-	BEGIN_RING(evo, 0, NV50_EVO_CRTC(nv_crtc-&gt;index, DISPLAY_START), 5);</div><div class='del'>-	OUT_RING(evo, 0);</div><div class='del'>-	OUT_RING(evo, (adjusted_mode-&gt;vtotal &lt;&lt; 16) | adjusted_mode-&gt;htotal);</div><div class='del'>-	OUT_RING(evo, (vsync_dur - 1) &lt;&lt; 16 | (hsync_dur - 1));</div><div class='del'>-	OUT_RING(evo, (vsync_start_to_end - 1) &lt;&lt; 16 |</div><div class='del'>-			(hsync_start_to_end - 1));</div><div class='del'>-	OUT_RING(evo, (vunk1 - 1) &lt;&lt; 16 | (hunk1 - 1));</div><div class='del'>-</div><div class='del'>-	if (adjusted_mode-&gt;flags &amp; DRM_MODE_FLAG_INTERLACE) {</div><div class='del'>-		BEGIN_RING(evo, 0, NV50_EVO_CRTC(nv_crtc-&gt;index, UNK0824), 1);</div><div class='del'>-		OUT_RING(evo, (vunk2b - 1) &lt;&lt; 16 | (vunk2a - 1));</div><div class='del'>-	} else {</div><div class='del'>-		OUT_RING(evo, 0);</div><div class='del'>-		OUT_RING(evo, 0);</div><div class='add'>+	ret = RING_SPACE(evo, 18);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		BEGIN_RING(evo, 0, 0x0804 + head, 2);</div><div class='add'>+		OUT_RING  (evo, 0x00800000 | mode-&gt;clock);</div><div class='add'>+		OUT_RING  (evo, (ilace == 2) ? 2 : 0);</div><div class='add'>+		BEGIN_RING(evo, 0, 0x0810 + head, 6);</div><div class='add'>+		OUT_RING  (evo, 0x00000000); /* border colour */</div><div class='add'>+		OUT_RING  (evo, (vactive &lt;&lt; 16) | hactive);</div><div class='add'>+		OUT_RING  (evo, ( vsynce &lt;&lt; 16) | hsynce);</div><div class='add'>+		OUT_RING  (evo, (vblanke &lt;&lt; 16) | hblanke);</div><div class='add'>+		OUT_RING  (evo, (vblanks &lt;&lt; 16) | hblanks);</div><div class='add'>+		OUT_RING  (evo, (vblan2e &lt;&lt; 16) | vblan2s);</div><div class='add'>+		BEGIN_RING(evo, 0, 0x082c + head, 1);</div><div class='add'>+		OUT_RING  (evo, 0x00000000);</div><div class='add'>+		BEGIN_RING(evo, 0, 0x0900 + head, 1);</div><div class='add'>+		OUT_RING  (evo, 0x00000311); /* makes sync channel work */</div><div class='add'>+		BEGIN_RING(evo, 0, 0x08c8 + head, 1);</div><div class='add'>+		OUT_RING  (evo, (umode-&gt;vdisplay &lt;&lt; 16) | umode-&gt;hdisplay);</div><div class='add'>+		BEGIN_RING(evo, 0, 0x08d4 + head, 1);</div><div class='add'>+		OUT_RING  (evo, 0x00000000); /* screen position */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	BEGIN_RING(evo, 0, NV50_EVO_CRTC(nv_crtc-&gt;index, UNK082C), 1);</div><div class='del'>-	OUT_RING(evo, 0);</div><div class='del'>-</div><div class='del'>-	/* This is the actual resolution of the mode. */</div><div class='del'>-	BEGIN_RING(evo, 0, NV50_EVO_CRTC(nv_crtc-&gt;index, REAL_RES), 1);</div><div class='del'>-	OUT_RING(evo, (mode-&gt;vdisplay &lt;&lt; 16) | mode-&gt;hdisplay);</div><div class='del'>-	BEGIN_RING(evo, 0, NV50_EVO_CRTC(nv_crtc-&gt;index, SCALE_CENTER_OFFSET), 1);</div><div class='del'>-	OUT_RING(evo, NV50_EVO_CRTC_SCALE_CENTER_OFFSET_VAL(0, 0));</div><div class='del'>-</div><div class='del'>-	nv_crtc-&gt;set_dither(nv_crtc, nv_connector-&gt;use_dithering, false);</div><div class='del'>-	nv_crtc-&gt;set_scale(nv_crtc, nv_connector-&gt;scaling_mode, false);</div><div class='add'>+	nv_crtc-&gt;set_dither(nv_crtc, false);</div><div class='add'>+	nv_crtc-&gt;set_scale(nv_crtc, false);</div><div class='ctx'> </div><div class='ctx'> 	return nv50_crtc_do_mode_set_base(crtc, old_fb, x, y, false);</div><div class='ctx'> }</div><div class='hunk'>@@ -692,7 +676,7 @@ nv50_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = nv50_crtc_wait_complete(crtc);</div><div class='add'>+	ret = nv50_display_sync(crtc-&gt;dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -711,7 +695,7 @@ nv50_crtc_mode_set_base_atomic(struct drm_crtc *crtc,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return nv50_crtc_wait_complete(crtc);</div><div class='add'>+	return nv50_display_sync(crtc-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct drm_crtc_helper_funcs nv50_crtc_helper_funcs = {</div><div class='hunk'>@@ -737,12 +721,6 @@ nv50_crtc_create(struct drm_device *dev, int index)</div><div class='ctx'> 	if (!nv_crtc)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	nv_crtc-&gt;mode = kzalloc(sizeof(*nv_crtc-&gt;mode), GFP_KERNEL);</div><div class='del'>-	if (!nv_crtc-&gt;mode) {</div><div class='del'>-		kfree(nv_crtc);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Default CLUT parameters, will be activated on the hw upon</div><div class='ctx'> 	 * first mode set.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -764,7 +742,6 @@ nv50_crtc_create(struct drm_device *dev, int index)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='del'>-		kfree(nv_crtc-&gt;mode);</div><div class='ctx'> 		kfree(nv_crtc);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv50_dac.c b/drivers/gpu/drm/nouveau/nv50_dac.c<br/>index 808f3ec8f827..a0f2bebf49e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_dac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_dac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_dac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv50_dac.c</a></div><div class='hunk'>@@ -200,11 +200,6 @@ nv50_dac_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-nv50_dac_prepare(struct drm_encoder *encoder)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='ctx'> nv50_dac_commit(struct drm_encoder *encoder)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='hunk'>@@ -266,7 +261,7 @@ static const struct drm_encoder_helper_funcs nv50_dac_helper_funcs = {</div><div class='ctx'> 	.save = nv50_dac_save,</div><div class='ctx'> 	.restore = nv50_dac_restore,</div><div class='ctx'> 	.mode_fixup = nv50_dac_mode_fixup,</div><div class='del'>-	.prepare = nv50_dac_prepare,</div><div class='add'>+	.prepare = nv50_dac_disconnect,</div><div class='ctx'> 	.commit = nv50_dac_commit,</div><div class='ctx'> 	.mode_set = nv50_dac_mode_set,</div><div class='ctx'> 	.get_crtc = nv50_dac_crtc_get,</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c<br/>index 06de250fe617..7ba28e08ee31 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_display.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_display.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv50_display.c</a></div><div class='hunk'>@@ -50,9 +50,53 @@ nv50_sor_nr(struct drm_device *dev)</div><div class='ctx'> 	return 4;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+evo_icmd(struct drm_device *dev, int ch, u32 mthd, u32 data)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	nv_mask(dev, 0x610300 + (ch * 0x08), 0x00000001, 0x00000001);</div><div class='add'>+	nv_wr32(dev, 0x610304 + (ch * 0x08), data);</div><div class='add'>+	nv_wr32(dev, 0x610300 + (ch * 0x08), 0x80000001 | mthd);</div><div class='add'>+	if (!nv_wait(dev, 0x610300 + (ch * 0x08), 0x80000000, 0x00000000))</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+	if (ret || (nouveau_reg_debug &amp; NOUVEAU_REG_DEBUG_EVO))</div><div class='add'>+		NV_INFO(dev, "EvoPIO: %d 0x%04x 0x%08x\n", ch, mthd, data);</div><div class='add'>+	nv_mask(dev, 0x610300 + (ch * 0x08), 0x00000001, 0x00000000);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int</div><div class='ctx'> nv50_display_early_init(struct drm_device *dev)</div><div class='ctx'> {</div><div class='add'>+	u32 ctrl = nv_rd32(dev, 0x610200);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* check if master evo channel is already active, a good a sign as any</div><div class='add'>+	 * that the display engine is in a weird state (hibernate/kexec), if</div><div class='add'>+	 * it is, do our best to reset the display engine...</div><div class='add'>+	 */</div><div class='add'>+	if ((ctrl &amp; 0x00000003) == 0x00000003) {</div><div class='add'>+		NV_INFO(dev, "PDISP: EVO(0) 0x%08x, resetting...\n", ctrl);</div><div class='add'>+</div><div class='add'>+		/* deactivate both heads first, PDISP will disappear forever</div><div class='add'>+		 * (well, until you power cycle) on some boards as soon as</div><div class='add'>+		 * PMC_ENABLE is hit unless they are..</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; 2; i++) {</div><div class='add'>+			evo_icmd(dev, 0, 0x0880 + (i * 0x400), 0x05000000);</div><div class='add'>+			evo_icmd(dev, 0, 0x089c + (i * 0x400), 0);</div><div class='add'>+			evo_icmd(dev, 0, 0x0840 + (i * 0x400), 0);</div><div class='add'>+			evo_icmd(dev, 0, 0x0844 + (i * 0x400), 0);</div><div class='add'>+			evo_icmd(dev, 0, 0x085c + (i * 0x400), 0);</div><div class='add'>+			evo_icmd(dev, 0, 0x0874 + (i * 0x400), 0);</div><div class='add'>+		}</div><div class='add'>+		evo_icmd(dev, 0, 0x0080, 0);</div><div class='add'>+</div><div class='add'>+		/* reset PDISP */</div><div class='add'>+		nv_mask(dev, 0x000200, 0x40000000, 0x00000000);</div><div class='add'>+		nv_mask(dev, 0x000200, 0x40000000, 0x40000000);</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'>@@ -62,11 +106,40 @@ nv50_display_late_takedown(struct drm_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-nv50_display_init(struct drm_device *dev)</div><div class='add'>+nv50_display_sync(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='del'>-	struct drm_connector *connector;</div><div class='add'>+	struct nouveau_timer_engine *ptimer = &amp;dev_priv-&gt;engine.timer;</div><div class='add'>+	struct nv50_display *disp = nv50_display(dev);</div><div class='add'>+	struct nouveau_channel *evo = disp-&gt;master;</div><div class='add'>+	u64 start;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = RING_SPACE(evo, 6);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		BEGIN_RING(evo, 0, 0x0084, 1);</div><div class='add'>+		OUT_RING  (evo, 0x80000000);</div><div class='add'>+		BEGIN_RING(evo, 0, 0x0080, 1);</div><div class='add'>+		OUT_RING  (evo, 0);</div><div class='add'>+		BEGIN_RING(evo, 0, 0x0084, 1);</div><div class='add'>+		OUT_RING  (evo, 0x00000000);</div><div class='add'>+</div><div class='add'>+		nv_wo32(disp-&gt;ntfy, 0x000, 0x00000000);</div><div class='add'>+		FIRE_RING (evo);</div><div class='add'>+</div><div class='add'>+		start = ptimer-&gt;read(dev);</div><div class='add'>+		do {</div><div class='add'>+			if (nv_ro32(disp-&gt;ntfy, 0x000))</div><div class='add'>+				return 0;</div><div class='add'>+		} while (ptimer-&gt;read(dev) - start &lt; 2000000000ULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EBUSY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nv50_display_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='ctx'> 	struct nouveau_channel *evo;</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> 	u32 val;</div><div class='hunk'>@@ -161,16 +234,6 @@ nv50_display_init(struct drm_device *dev)</div><div class='ctx'> 		     NV50_PDISPLAY_INTR_EN_1_CLK_UNK20 |</div><div class='ctx'> 		     NV50_PDISPLAY_INTR_EN_1_CLK_UNK40);</div><div class='ctx'> </div><div class='del'>-	/* enable hotplug interrupts */</div><div class='del'>-	list_for_each_entry(connector, &amp;dev-&gt;mode_config.connector_list, head) {</div><div class='del'>-		struct nouveau_connector *conn = nouveau_connector(connector);</div><div class='del'>-</div><div class='del'>-		if (conn-&gt;dcb-&gt;gpio_tag == 0xff)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		pgpio-&gt;irq_enable(dev, conn-&gt;dcb-&gt;gpio_tag, true);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ret = nv50_evo_init(dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -178,36 +241,19 @@ nv50_display_init(struct drm_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	nv_wr32(dev, NV50_PDISPLAY_OBJECTS, (evo-&gt;ramin-&gt;vinst &gt;&gt; 8) | 9);</div><div class='ctx'> </div><div class='del'>-	ret = RING_SPACE(evo, 15);</div><div class='add'>+	ret = RING_SPACE(evo, 3);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	BEGIN_RING(evo, 0, NV50_EVO_UNK84, 2);</div><div class='del'>-	OUT_RING(evo, NV50_EVO_UNK84_NOTIFY_DISABLED);</div><div class='del'>-	OUT_RING(evo, NvEvoSync);</div><div class='del'>-	BEGIN_RING(evo, 0, NV50_EVO_CRTC(0, FB_DMA), 1);</div><div class='del'>-	OUT_RING(evo, NV50_EVO_CRTC_FB_DMA_HANDLE_NONE);</div><div class='del'>-	BEGIN_RING(evo, 0, NV50_EVO_CRTC(0, UNK0800), 1);</div><div class='del'>-	OUT_RING(evo, 0);</div><div class='del'>-	BEGIN_RING(evo, 0, NV50_EVO_CRTC(0, DISPLAY_START), 1);</div><div class='del'>-	OUT_RING(evo, 0);</div><div class='del'>-	BEGIN_RING(evo, 0, NV50_EVO_CRTC(0, UNK082C), 1);</div><div class='del'>-	OUT_RING(evo, 0);</div><div class='del'>-	/* required to make display sync channels not hate life */</div><div class='del'>-	BEGIN_RING(evo, 0, NV50_EVO_CRTC(0, UNK900), 1);</div><div class='del'>-	OUT_RING  (evo, 0x00000311);</div><div class='del'>-	BEGIN_RING(evo, 0, NV50_EVO_CRTC(1, UNK900), 1);</div><div class='del'>-	OUT_RING  (evo, 0x00000311);</div><div class='del'>-	FIRE_RING(evo);</div><div class='del'>-	if (!nv_wait(dev, 0x640004, 0xffffffff, evo-&gt;dma.put &lt;&lt; 2))</div><div class='del'>-		NV_ERROR(dev, "evo pushbuf stalled\n");</div><div class='del'>-</div><div class='add'>+	OUT_RING  (evo, NV50_EVO_UNK84_NOTIFY_DISABLED);</div><div class='add'>+	OUT_RING  (evo, NvEvoSync);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return nv50_display_sync(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nv50_display_disable(struct drm_device *dev)</div><div class='add'>+void</div><div class='add'>+nv50_display_fini(struct drm_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	struct nv50_display *disp = nv50_display(dev);</div><div class='ctx'> 	struct nouveau_channel *evo = disp-&gt;master;</div><div class='ctx'> 	struct drm_crtc *drm_crtc;</div><div class='hunk'>@@ -270,18 +316,10 @@ static int nv50_display_disable(struct drm_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* disable interrupts. */</div><div class='ctx'> 	nv_wr32(dev, NV50_PDISPLAY_INTR_EN_1, 0x00000000);</div><div class='del'>-</div><div class='del'>-	/* disable hotplug interrupts */</div><div class='del'>-	nv_wr32(dev, 0xe054, 0xffffffff);</div><div class='del'>-	nv_wr32(dev, 0xe050, 0x00000000);</div><div class='del'>-	if (dev_priv-&gt;chipset &gt;= 0x90) {</div><div class='del'>-		nv_wr32(dev, 0xe074, 0xffffffff);</div><div class='del'>-		nv_wr32(dev, 0xe070, 0x00000000);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int nv50_display_create(struct drm_device *dev)</div><div class='add'>+int</div><div class='add'>+nv50_display_create(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	struct dcb_table *dcb = &amp;dev_priv-&gt;vbios.dcb;</div><div class='hunk'>@@ -341,7 +379,7 @@ int nv50_display_create(struct drm_device *dev)</div><div class='ctx'> 	tasklet_init(&amp;priv-&gt;tasklet, nv50_display_bh, (unsigned long)dev);</div><div class='ctx'> 	nouveau_irq_register(dev, 26, nv50_display_isr);</div><div class='ctx'> </div><div class='del'>-	ret = nv50_display_init(dev);</div><div class='add'>+	ret = nv50_evo_create(dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		nv50_display_destroy(dev);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -357,7 +395,7 @@ nv50_display_destroy(struct drm_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	NV_DEBUG_KMS(dev, "\n");</div><div class='ctx'> </div><div class='del'>-	nv50_display_disable(dev);</div><div class='add'>+	nv50_evo_destroy(dev);</div><div class='ctx'> 	nouveau_irq_unregister(dev, 26);</div><div class='ctx'> 	kfree(disp);</div><div class='ctx'> }</div><div class='hunk'>@@ -521,7 +559,7 @@ nv50_display_script_select(struct drm_device *dev, struct dcb_entry *dcb,</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* determine number of lvds links */</div><div class='ctx'> 			if (nv_connector &amp;&amp; nv_connector-&gt;edid &amp;&amp;</div><div class='del'>-			    nv_connector-&gt;dcb-&gt;type == DCB_CONNECTOR_LVDS_SPWG) {</div><div class='add'>+			    nv_connector-&gt;type == DCB_CONNECTOR_LVDS_SPWG) {</div><div class='ctx'> 				/* http://www.spwg.org */</div><div class='ctx'> 				if (((u8 *)nv_connector-&gt;edid)[121] == 2)</div><div class='ctx'> 					script |= 0x0100;</div><div class='hunk'>@@ -722,8 +760,8 @@ nv50_display_unk20_handler(struct drm_device *dev)</div><div class='ctx'> 	if (crtc &gt;= 0) {</div><div class='ctx'> 		pclk  = nv_rd32(dev, NV50_PDISPLAY_CRTC_P(crtc, CLOCK));</div><div class='ctx'> 		pclk &amp;= 0x003fffff;</div><div class='del'>-</div><div class='del'>-		nv50_crtc_set_clock(dev, crtc, pclk);</div><div class='add'>+		if (pclk)</div><div class='add'>+			nv50_crtc_set_clock(dev, crtc, pclk);</div><div class='ctx'> </div><div class='ctx'> 		tmp = nv_rd32(dev, NV50_PDISPLAY_CRTC_CLK_CTRL2(crtc));</div><div class='ctx'> 		tmp &amp;= ~0x000000f;</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv50_display.h b/drivers/gpu/drm/nouveau/nv50_display.h<br/>index c2da503a22aa..95874f7c043c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_display.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_display.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_display.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv50_display.h</a></div><div class='hunk'>@@ -69,14 +69,18 @@ int nv50_display_early_init(struct drm_device *dev);</div><div class='ctx'> void nv50_display_late_takedown(struct drm_device *dev);</div><div class='ctx'> int nv50_display_create(struct drm_device *dev);</div><div class='ctx'> int nv50_display_init(struct drm_device *dev);</div><div class='add'>+void nv50_display_fini(struct drm_device *dev);</div><div class='ctx'> void nv50_display_destroy(struct drm_device *dev);</div><div class='ctx'> int nv50_crtc_blank(struct nouveau_crtc *, bool blank);</div><div class='ctx'> int nv50_crtc_set_clock(struct drm_device *, int head, int pclk);</div><div class='ctx'> </div><div class='add'>+int  nv50_display_sync(struct drm_device *);</div><div class='ctx'> int  nv50_display_flip_next(struct drm_crtc *, struct drm_framebuffer *,</div><div class='ctx'> 			    struct nouveau_channel *chan);</div><div class='ctx'> void nv50_display_flip_stop(struct drm_crtc *);</div><div class='ctx'> </div><div class='add'>+int  nv50_evo_create(struct drm_device *dev);</div><div class='add'>+void nv50_evo_destroy(struct drm_device *dev);</div><div class='ctx'> int  nv50_evo_init(struct drm_device *dev);</div><div class='ctx'> void nv50_evo_fini(struct drm_device *dev);</div><div class='ctx'> void nv50_evo_dmaobj_init(struct nouveau_gpuobj *, u32 memtype, u64 base,</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv50_evo.c b/drivers/gpu/drm/nouveau/nv50_evo.c<br/>index c99d9751880c..9b962e989d7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_evo.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_evo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_evo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv50_evo.c</a></div><div class='hunk'>@@ -218,7 +218,7 @@ nv50_evo_channel_fini(struct nouveau_channel *evo)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+void</div><div class='ctx'> nv50_evo_destroy(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct nv50_display *disp = nv50_display(dev);</div><div class='hunk'>@@ -235,7 +235,7 @@ nv50_evo_destroy(struct drm_device *dev)</div><div class='ctx'> 	nv50_evo_channel_del(&amp;disp-&gt;master);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+int</div><div class='ctx'> nv50_evo_create(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='hunk'>@@ -388,12 +388,6 @@ nv50_evo_init(struct drm_device *dev)</div><div class='ctx'> 	struct nv50_display *disp = nv50_display(dev);</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> </div><div class='del'>-	if (!disp-&gt;master) {</div><div class='del'>-		ret = nv50_evo_create(dev);</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 = nv50_evo_channel_init(disp-&gt;master);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -420,6 +414,4 @@ nv50_evo_fini(struct drm_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (disp-&gt;master)</div><div class='ctx'> 		nv50_evo_channel_fini(disp-&gt;master);</div><div class='del'>-</div><div class='del'>-	nv50_evo_destroy(dev);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c<br/>index c34a074f7ea1..3bc2a565c20b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_fifo.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_fifo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_fifo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv50_fifo.c</a></div><div class='hunk'>@@ -230,6 +230,7 @@ nv50_fifo_create_context(struct nouveau_channel *chan)</div><div class='ctx'> 	struct drm_device *dev = chan-&gt;dev;</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	struct nouveau_gpuobj *ramfc = NULL;</div><div class='add'>+        uint64_t ib_offset = chan-&gt;pushbuf_base + chan-&gt;dma.ib_base * 4;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -280,8 +281,9 @@ nv50_fifo_create_context(struct nouveau_channel *chan)</div><div class='ctx'> 	nv_wo32(ramfc, 0x7c, 0x30000001);</div><div class='ctx'> 	nv_wo32(ramfc, 0x78, 0x00000000);</div><div class='ctx'> 	nv_wo32(ramfc, 0x3c, 0x403f6078);</div><div class='del'>-	nv_wo32(ramfc, 0x50, chan-&gt;pushbuf_base + chan-&gt;dma.ib_base * 4);</div><div class='del'>-	nv_wo32(ramfc, 0x54, drm_order(chan-&gt;dma.ib_max + 1) &lt;&lt; 16);</div><div class='add'>+	nv_wo32(ramfc, 0x50, lower_32_bits(ib_offset));</div><div class='add'>+	nv_wo32(ramfc, 0x54, upper_32_bits(ib_offset) |</div><div class='add'>+                drm_order(chan-&gt;dma.ib_max + 1) &lt;&lt; 16);</div><div class='ctx'> </div><div class='ctx'> 	if (dev_priv-&gt;chipset != 0x50) {</div><div class='ctx'> 		nv_wo32(chan-&gt;ramin, 0, chan-&gt;id);</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv50_gpio.c b/drivers/gpu/drm/nouveau/nv50_gpio.c<br/>index 793a5ccca121..f429e6a8ca7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_gpio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv50_gpio.c</a></div><div class='hunk'>@@ -25,229 +25,95 @@</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> #include "nouveau_drv.h"</div><div class='ctx'> #include "nouveau_hw.h"</div><div class='add'>+#include "nouveau_gpio.h"</div><div class='ctx'> </div><div class='ctx'> #include "nv50_display.h"</div><div class='ctx'> </div><div class='del'>-static void nv50_gpio_isr(struct drm_device *dev);</div><div class='del'>-static void nv50_gpio_isr_bh(struct work_struct *work);</div><div class='del'>-</div><div class='del'>-struct nv50_gpio_priv {</div><div class='del'>-	struct list_head handlers;</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct nv50_gpio_handler {</div><div class='del'>-	struct drm_device *dev;</div><div class='del'>-	struct list_head head;</div><div class='del'>-	struct work_struct work;</div><div class='del'>-	bool inhibit;</div><div class='del'>-</div><div class='del'>-	struct dcb_gpio_entry *gpio;</div><div class='del'>-</div><div class='del'>-	void (*handler)(void *data, int state);</div><div class='del'>-	void *data;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int</div><div class='del'>-nv50_gpio_location(struct dcb_gpio_entry *gpio, uint32_t *reg, uint32_t *shift)</div><div class='add'>+nv50_gpio_location(int line, u32 *reg, u32 *shift)</div><div class='ctx'> {</div><div class='ctx'> 	const uint32_t nv50_gpio_reg[4] = { 0xe104, 0xe108, 0xe280, 0xe284 };</div><div class='ctx'> </div><div class='del'>-	if (gpio-&gt;line &gt;= 32)</div><div class='add'>+	if (line &gt;= 32)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	*reg = nv50_gpio_reg[gpio-&gt;line &gt;&gt; 3];</div><div class='del'>-	*shift = (gpio-&gt;line &amp; 7) &lt;&lt; 2;</div><div class='add'>+	*reg = nv50_gpio_reg[line &gt;&gt; 3];</div><div class='add'>+	*shift = (line &amp; 7) &lt;&lt; 2;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-nv50_gpio_get(struct drm_device *dev, enum dcb_gpio_tag tag)</div><div class='add'>+nv50_gpio_drive(struct drm_device *dev, int line, int dir, int out)</div><div class='ctx'> {</div><div class='del'>-	struct dcb_gpio_entry *gpio;</div><div class='del'>-	uint32_t r, s, v;</div><div class='del'>-</div><div class='del'>-	gpio = nouveau_bios_gpio_entry(dev, tag);</div><div class='del'>-	if (!gpio)</div><div class='del'>-		return -ENOENT;</div><div class='add'>+	u32 reg, shift;</div><div class='ctx'> </div><div class='del'>-	if (nv50_gpio_location(gpio, &amp;r, &amp;s))</div><div class='add'>+	if (nv50_gpio_location(line, &amp;reg, &amp;shift))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	v = nv_rd32(dev, r) &gt;&gt; (s + 2);</div><div class='del'>-	return ((v &amp; 1) == (gpio-&gt;state[1] &amp; 1));</div><div class='add'>+	nv_mask(dev, reg, 7 &lt;&lt; shift, (((dir ^ 1) &lt;&lt; 1) | out) &lt;&lt; shift);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-nv50_gpio_set(struct drm_device *dev, enum dcb_gpio_tag tag, int state)</div><div class='add'>+nv50_gpio_sense(struct drm_device *dev, int line)</div><div class='ctx'> {</div><div class='del'>-	struct dcb_gpio_entry *gpio;</div><div class='del'>-	uint32_t r, s, v;</div><div class='del'>-</div><div class='del'>-	gpio = nouveau_bios_gpio_entry(dev, tag);</div><div class='del'>-	if (!gpio)</div><div class='del'>-		return -ENOENT;</div><div class='add'>+	u32 reg, shift;</div><div class='ctx'> </div><div class='del'>-	if (nv50_gpio_location(gpio, &amp;r, &amp;s))</div><div class='add'>+	if (nv50_gpio_location(line, &amp;reg, &amp;shift))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	v  = nv_rd32(dev, r) &amp; ~(0x3 &lt;&lt; s);</div><div class='del'>-	v |= (gpio-&gt;state[state] ^ 2) &lt;&lt; s;</div><div class='del'>-	nv_wr32(dev, r, v);</div><div class='del'>-	return 0;</div><div class='add'>+	return !!(nv_rd32(dev, reg) &amp; (4 &lt;&lt; shift));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-nvd0_gpio_get(struct drm_device *dev, enum dcb_gpio_tag tag)</div><div class='add'>+void</div><div class='add'>+nv50_gpio_irq_enable(struct drm_device *dev, int line, bool on)</div><div class='ctx'> {</div><div class='del'>-	struct dcb_gpio_entry *gpio;</div><div class='del'>-	u32 v;</div><div class='del'>-</div><div class='del'>-	gpio = nouveau_bios_gpio_entry(dev, tag);</div><div class='del'>-	if (!gpio)</div><div class='del'>-		return -ENOENT;</div><div class='add'>+	u32 reg  = line &lt; 16 ? 0xe050 : 0xe070;</div><div class='add'>+	u32 mask = 0x00010001 &lt;&lt; (line &amp; 0xf);</div><div class='ctx'> </div><div class='del'>-	v  = nv_rd32(dev, 0x00d610 + (gpio-&gt;line * 4));</div><div class='del'>-	v &amp;= 0x00004000;</div><div class='del'>-	return (!!v == (gpio-&gt;state[1] &amp; 1));</div><div class='add'>+	nv_wr32(dev, reg + 4, mask);</div><div class='add'>+	nv_mask(dev, reg + 0, mask, on ? mask : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-nvd0_gpio_set(struct drm_device *dev, enum dcb_gpio_tag tag, int state)</div><div class='add'>+nvd0_gpio_drive(struct drm_device *dev, int line, int dir, int out)</div><div class='ctx'> {</div><div class='del'>-	struct dcb_gpio_entry *gpio;</div><div class='del'>-	u32 v;</div><div class='del'>-</div><div class='del'>-	gpio = nouveau_bios_gpio_entry(dev, tag);</div><div class='del'>-	if (!gpio)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	v = gpio-&gt;state[state] ^ 2;</div><div class='del'>-</div><div class='del'>-	nv_mask(dev, 0x00d610 + (gpio-&gt;line * 4), 0x00003000, v &lt;&lt; 12);</div><div class='add'>+	u32 data = ((dir ^ 1) &lt;&lt; 13) | (out &lt;&lt; 12);</div><div class='add'>+	nv_mask(dev, 0x00d610 + (line * 4), 0x00003000, data);</div><div class='add'>+	nv_mask(dev, 0x00d604, 0x00000001, 0x00000001); /* update? */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-nv50_gpio_irq_register(struct drm_device *dev, enum dcb_gpio_tag tag,</div><div class='del'>-		       void (*handler)(void *, int), void *data)</div><div class='add'>+nvd0_gpio_sense(struct drm_device *dev, int line)</div><div class='ctx'> {</div><div class='del'>-	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='del'>-	struct nv50_gpio_priv *priv = pgpio-&gt;priv;</div><div class='del'>-	struct nv50_gpio_handler *gpioh;</div><div class='del'>-	struct dcb_gpio_entry *gpio;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	gpio = nouveau_bios_gpio_entry(dev, tag);</div><div class='del'>-	if (!gpio)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	gpioh = kzalloc(sizeof(*gpioh), GFP_KERNEL);</div><div class='del'>-	if (!gpioh)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;gpioh-&gt;work, nv50_gpio_isr_bh);</div><div class='del'>-	gpioh-&gt;dev  = dev;</div><div class='del'>-	gpioh-&gt;gpio = gpio;</div><div class='del'>-	gpioh-&gt;handler = handler;</div><div class='del'>-	gpioh-&gt;data = data;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	list_add(&amp;gpioh-&gt;head, &amp;priv-&gt;handlers);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-	return 0;</div><div class='add'>+	return !!(nv_rd32(dev, 0x00d610 + (line * 4)) &amp; 0x00004000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-nv50_gpio_irq_unregister(struct drm_device *dev, enum dcb_gpio_tag tag,</div><div class='del'>-			 void (*handler)(void *, int), void *data)</div><div class='del'>-{</div><div class='del'>-	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='del'>-	struct nv50_gpio_priv *priv = pgpio-&gt;priv;</div><div class='del'>-	struct nv50_gpio_handler *gpioh, *tmp;</div><div class='del'>-	struct dcb_gpio_entry *gpio;</div><div class='del'>-	LIST_HEAD(tofree);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	gpio = nouveau_bios_gpio_entry(dev, tag);</div><div class='del'>-	if (!gpio)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	list_for_each_entry_safe(gpioh, tmp, &amp;priv-&gt;handlers, head) {</div><div class='del'>-		if (gpioh-&gt;gpio != gpio ||</div><div class='del'>-		    gpioh-&gt;handler != handler ||</div><div class='del'>-		    gpioh-&gt;data != data)</div><div class='del'>-			continue;</div><div class='del'>-		list_move(&amp;gpioh-&gt;head, &amp;tofree);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(gpioh, tmp, &amp;tofree, head) {</div><div class='del'>-		flush_work_sync(&amp;gpioh-&gt;work);</div><div class='del'>-		kfree(gpioh);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool</div><div class='del'>-nv50_gpio_irq_enable(struct drm_device *dev, enum dcb_gpio_tag tag, bool on)</div><div class='del'>-{</div><div class='del'>-	struct dcb_gpio_entry *gpio;</div><div class='del'>-	u32 reg, mask;</div><div class='del'>-</div><div class='del'>-	gpio = nouveau_bios_gpio_entry(dev, tag);</div><div class='del'>-	if (!gpio)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	reg  = gpio-&gt;line &lt; 16 ? 0xe050 : 0xe070;</div><div class='del'>-	mask = 0x00010001 &lt;&lt; (gpio-&gt;line &amp; 0xf);</div><div class='del'>-</div><div class='del'>-	nv_wr32(dev, reg + 4, mask);</div><div class='del'>-	reg = nv_mask(dev, reg + 0, mask, on ? mask : 0);</div><div class='del'>-	return (reg &amp; mask) == mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-nv50_gpio_create(struct drm_device *dev)</div><div class='add'>+static void</div><div class='add'>+nv50_gpio_isr(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='del'>-	struct nv50_gpio_priv *priv;</div><div class='del'>-</div><div class='del'>-	priv = kzalloc(sizeof(*priv), GFP_KERNEL);</div><div class='del'>-	if (!priv)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	u32 intr0, intr1 = 0;</div><div class='add'>+	u32 hi, lo;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;priv-&gt;handlers);</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;lock);</div><div class='del'>-	pgpio-&gt;priv = priv;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	intr0 = nv_rd32(dev, 0xe054) &amp; nv_rd32(dev, 0xe050);</div><div class='add'>+	if (dev_priv-&gt;chipset &gt;= 0x90)</div><div class='add'>+		intr1 = nv_rd32(dev, 0xe074) &amp; nv_rd32(dev, 0xe070);</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-nv50_gpio_destroy(struct drm_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='add'>+	hi = (intr0 &amp; 0x0000ffff) | (intr1 &lt;&lt; 16);</div><div class='add'>+	lo = (intr0 &gt;&gt; 16) | (intr1 &amp; 0xffff0000);</div><div class='add'>+	nouveau_gpio_isr(dev, 0, hi | lo);</div><div class='ctx'> </div><div class='del'>-	kfree(pgpio-&gt;priv);</div><div class='del'>-	pgpio-&gt;priv = NULL;</div><div class='add'>+	nv_wr32(dev, 0xe054, intr0);</div><div class='add'>+	if (dev_priv-&gt;chipset &gt;= 0x90)</div><div class='add'>+		nv_wr32(dev, 0xe074, intr1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> nv50_gpio_init(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!pgpio-&gt;priv) {</div><div class='del'>-		ret = nv50_gpio_create(dev);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* disable, and ack any pending gpio interrupts */</div><div class='ctx'> 	nv_wr32(dev, 0xe050, 0x00000000);</div><div class='hunk'>@@ -270,64 +136,4 @@ nv50_gpio_fini(struct drm_device *dev)</div><div class='ctx'> 	if (dev_priv-&gt;chipset &gt;= 0x90)</div><div class='ctx'> 		nv_wr32(dev, 0xe070, 0x00000000);</div><div class='ctx'> 	nouveau_irq_unregister(dev, 21);</div><div class='del'>-</div><div class='del'>-	nv50_gpio_destroy(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nv50_gpio_isr_bh(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct nv50_gpio_handler *gpioh =</div><div class='del'>-		container_of(work, struct nv50_gpio_handler, work);</div><div class='del'>-	struct drm_nouveau_private *dev_priv = gpioh-&gt;dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='del'>-	struct nv50_gpio_priv *priv = pgpio-&gt;priv;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int state;</div><div class='del'>-</div><div class='del'>-	state = pgpio-&gt;get(gpioh-&gt;dev, gpioh-&gt;gpio-&gt;tag);</div><div class='del'>-	if (state &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	gpioh-&gt;handler(gpioh-&gt;data, state);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	gpioh-&gt;inhibit = false;</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nv50_gpio_isr(struct drm_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='del'>-	struct nouveau_gpio_engine *pgpio = &amp;dev_priv-&gt;engine.gpio;</div><div class='del'>-	struct nv50_gpio_priv *priv = pgpio-&gt;priv;</div><div class='del'>-	struct nv50_gpio_handler *gpioh;</div><div class='del'>-	u32 intr0, intr1 = 0;</div><div class='del'>-	u32 hi, lo, ch;</div><div class='del'>-</div><div class='del'>-	intr0 = nv_rd32(dev, 0xe054) &amp; nv_rd32(dev, 0xe050);</div><div class='del'>-	if (dev_priv-&gt;chipset &gt;= 0x90)</div><div class='del'>-		intr1 = nv_rd32(dev, 0xe074) &amp; nv_rd32(dev, 0xe070);</div><div class='del'>-</div><div class='del'>-	hi = (intr0 &amp; 0x0000ffff) | (intr1 &lt;&lt; 16);</div><div class='del'>-	lo = (intr0 &gt;&gt; 16) | (intr1 &amp; 0xffff0000);</div><div class='del'>-	ch = hi | lo;</div><div class='del'>-</div><div class='del'>-	nv_wr32(dev, 0xe054, intr0);</div><div class='del'>-	if (dev_priv-&gt;chipset &gt;= 0x90)</div><div class='del'>-		nv_wr32(dev, 0xe074, intr1);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;priv-&gt;lock);</div><div class='del'>-	list_for_each_entry(gpioh, &amp;priv-&gt;handlers, head) {</div><div class='del'>-		if (!(ch &amp; (1 &lt;&lt; gpioh-&gt;gpio-&gt;line)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (gpioh-&gt;inhibit)</div><div class='del'>-			continue;</div><div class='del'>-		gpioh-&gt;inhibit = true;</div><div class='del'>-</div><div class='del'>-		schedule_work(&amp;gpioh-&gt;work);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;priv-&gt;lock);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c<br/>index ac601f7c4e1a..33d5711a918d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_graph.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_graph.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_graph.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv50_graph.c</a></div><div class='hunk'>@@ -616,9 +616,9 @@ nv50_pgraph_tp_trap(struct drm_device *dev, int type, uint32_t ustatus_old,</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 7: /* MP error */</div><div class='del'>-			if (ustatus &amp; 0x00010000) {</div><div class='add'>+			if (ustatus &amp; 0x04030000) {</div><div class='ctx'> 				nv50_pgraph_mp_trap(dev, i, display);</div><div class='del'>-				ustatus &amp;= ~0x00010000;</div><div class='add'>+				ustatus &amp;= ~0x04030000;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 8: /* TPDMA error */</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv50_pm.c b/drivers/gpu/drm/nouveau/nv50_pm.c<br/>index 3d5a86b98282..03937212e9d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv50_pm.c</a></div><div class='hunk'>@@ -25,122 +25,745 @@</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> #include "nouveau_drv.h"</div><div class='ctx'> #include "nouveau_bios.h"</div><div class='add'>+#include "nouveau_hw.h"</div><div class='ctx'> #include "nouveau_pm.h"</div><div class='add'>+#include "nouveau_hwsq.h"</div><div class='ctx'> </div><div class='del'>-struct nv50_pm_state {</div><div class='del'>-	struct nouveau_pm_level *perflvl;</div><div class='del'>-	struct pll_lims pll;</div><div class='del'>-	enum pll_types type;</div><div class='del'>-	int N, M, P;</div><div class='add'>+enum clk_src {</div><div class='add'>+	clk_src_crystal,</div><div class='add'>+	clk_src_href,</div><div class='add'>+	clk_src_hclk,</div><div class='add'>+	clk_src_hclkm3,</div><div class='add'>+	clk_src_hclkm3d2,</div><div class='add'>+	clk_src_host,</div><div class='add'>+	clk_src_nvclk,</div><div class='add'>+	clk_src_sclk,</div><div class='add'>+	clk_src_mclk,</div><div class='add'>+	clk_src_vdec,</div><div class='add'>+	clk_src_dom6</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static u32 read_clk(struct drm_device *, enum clk_src);</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+read_div(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	switch (dev_priv-&gt;chipset) {</div><div class='add'>+	case 0x50: /* it exists, but only has bit 31, not the dividers.. */</div><div class='add'>+	case 0x84:</div><div class='add'>+	case 0x86:</div><div class='add'>+	case 0x98:</div><div class='add'>+	case 0xa0:</div><div class='add'>+		return nv_rd32(dev, 0x004700);</div><div class='add'>+	case 0x92:</div><div class='add'>+	case 0x94:</div><div class='add'>+	case 0x96:</div><div class='add'>+		return nv_rd32(dev, 0x004800);</div><div class='add'>+	default:</div><div class='add'>+		return 0x00000000;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+read_pll_src(struct drm_device *dev, u32 base)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 coef, ref = read_clk(dev, clk_src_crystal);</div><div class='add'>+	u32 rsel = nv_rd32(dev, 0x00e18c);</div><div class='add'>+	int P, N, M, id;</div><div class='add'>+</div><div class='add'>+	switch (dev_priv-&gt;chipset) {</div><div class='add'>+	case 0x50:</div><div class='add'>+	case 0xa0:</div><div class='add'>+		switch (base) {</div><div class='add'>+		case 0x4020:</div><div class='add'>+		case 0x4028: id = !!(rsel &amp; 0x00000004); break;</div><div class='add'>+		case 0x4008: id = !!(rsel &amp; 0x00000008); break;</div><div class='add'>+		case 0x4030: id = 0; break;</div><div class='add'>+		default:</div><div class='add'>+			NV_ERROR(dev, "ref: bad pll 0x%06x\n", base);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		coef = nv_rd32(dev, 0x00e81c + (id * 0x0c));</div><div class='add'>+		ref *=  (coef &amp; 0x01000000) ? 2 : 4;</div><div class='add'>+		P    =  (coef &amp; 0x00070000) &gt;&gt; 16;</div><div class='add'>+		N    = ((coef &amp; 0x0000ff00) &gt;&gt; 8) + 1;</div><div class='add'>+		M    = ((coef &amp; 0x000000ff) &gt;&gt; 0) + 1;</div><div class='add'>+		break;</div><div class='add'>+	case 0x84:</div><div class='add'>+	case 0x86:</div><div class='add'>+	case 0x92:</div><div class='add'>+		coef = nv_rd32(dev, 0x00e81c);</div><div class='add'>+		P    = (coef &amp; 0x00070000) &gt;&gt; 16;</div><div class='add'>+		N    = (coef &amp; 0x0000ff00) &gt;&gt; 8;</div><div class='add'>+		M    = (coef &amp; 0x000000ff) &gt;&gt; 0;</div><div class='add'>+		break;</div><div class='add'>+	case 0x94:</div><div class='add'>+	case 0x96:</div><div class='add'>+	case 0x98:</div><div class='add'>+		rsel = nv_rd32(dev, 0x00c050);</div><div class='add'>+		switch (base) {</div><div class='add'>+		case 0x4020: rsel = (rsel &amp; 0x00000003) &gt;&gt; 0; break;</div><div class='add'>+		case 0x4008: rsel = (rsel &amp; 0x0000000c) &gt;&gt; 2; break;</div><div class='add'>+		case 0x4028: rsel = (rsel &amp; 0x00001800) &gt;&gt; 11; break;</div><div class='add'>+		case 0x4030: rsel = 3; break;</div><div class='add'>+		default:</div><div class='add'>+			NV_ERROR(dev, "ref: bad pll 0x%06x\n", base);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (rsel) {</div><div class='add'>+		case 0: id = 1; break;</div><div class='add'>+		case 1: return read_clk(dev, clk_src_crystal);</div><div class='add'>+		case 2: return read_clk(dev, clk_src_href);</div><div class='add'>+		case 3: id = 0; break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		coef =  nv_rd32(dev, 0x00e81c + (id * 0x28));</div><div class='add'>+		P    = (nv_rd32(dev, 0x00e824 + (id * 0x28)) &gt;&gt; 16) &amp; 7;</div><div class='add'>+		P   += (coef &amp; 0x00070000) &gt;&gt; 16;</div><div class='add'>+		N    = (coef &amp; 0x0000ff00) &gt;&gt; 8;</div><div class='add'>+		M    = (coef &amp; 0x000000ff) &gt;&gt; 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUG_ON(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (M)</div><div class='add'>+		return (ref * N / M) &gt;&gt; P;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+read_pll_ref(struct drm_device *dev, u32 base)</div><div class='add'>+{</div><div class='add'>+	u32 src, mast = nv_rd32(dev, 0x00c040);</div><div class='add'>+</div><div class='add'>+	switch (base) {</div><div class='add'>+	case 0x004028:</div><div class='add'>+		src = !!(mast &amp; 0x00200000);</div><div class='add'>+		break;</div><div class='add'>+	case 0x004020:</div><div class='add'>+		src = !!(mast &amp; 0x00400000);</div><div class='add'>+		break;</div><div class='add'>+	case 0x004008:</div><div class='add'>+		src = !!(mast &amp; 0x00010000);</div><div class='add'>+		break;</div><div class='add'>+	case 0x004030:</div><div class='add'>+		src = !!(mast &amp; 0x02000000);</div><div class='add'>+		break;</div><div class='add'>+	case 0x00e810:</div><div class='add'>+		return read_clk(dev, clk_src_crystal);</div><div class='add'>+	default:</div><div class='add'>+		NV_ERROR(dev, "bad pll 0x%06x\n", base);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (src)</div><div class='add'>+		return read_clk(dev, clk_src_href);</div><div class='add'>+	return read_pll_src(dev, base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+read_pll(struct drm_device *dev, u32 base)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 mast = nv_rd32(dev, 0x00c040);</div><div class='add'>+	u32 ctrl = nv_rd32(dev, base + 0);</div><div class='add'>+	u32 coef = nv_rd32(dev, base + 4);</div><div class='add'>+	u32 ref = read_pll_ref(dev, base);</div><div class='add'>+	u32 clk = 0;</div><div class='add'>+	int N1, N2, M1, M2;</div><div class='add'>+</div><div class='add'>+	if (base == 0x004028 &amp;&amp; (mast &amp; 0x00100000)) {</div><div class='add'>+		/* wtf, appears to only disable post-divider on nva0 */</div><div class='add'>+		if (dev_priv-&gt;chipset != 0xa0)</div><div class='add'>+			return read_clk(dev, clk_src_dom6);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	N2 = (coef &amp; 0xff000000) &gt;&gt; 24;</div><div class='add'>+	M2 = (coef &amp; 0x00ff0000) &gt;&gt; 16;</div><div class='add'>+	N1 = (coef &amp; 0x0000ff00) &gt;&gt; 8;</div><div class='add'>+	M1 = (coef &amp; 0x000000ff);</div><div class='add'>+	if ((ctrl &amp; 0x80000000) &amp;&amp; M1) {</div><div class='add'>+		clk = ref * N1 / M1;</div><div class='add'>+		if ((ctrl &amp; 0x40000100) == 0x40000000) {</div><div class='add'>+			if (M2)</div><div class='add'>+				clk = clk * N2 / M2;</div><div class='add'>+			else</div><div class='add'>+				clk = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return clk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+read_clk(struct drm_device *dev, enum clk_src src)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 mast = nv_rd32(dev, 0x00c040);</div><div class='add'>+	u32 P = 0;</div><div class='add'>+</div><div class='add'>+	switch (src) {</div><div class='add'>+	case clk_src_crystal:</div><div class='add'>+		return dev_priv-&gt;crystal;</div><div class='add'>+	case clk_src_href:</div><div class='add'>+		return 100000; /* PCIE reference clock */</div><div class='add'>+	case clk_src_hclk:</div><div class='add'>+		return read_clk(dev, clk_src_href) * 27778 / 10000;</div><div class='add'>+	case clk_src_hclkm3:</div><div class='add'>+		return read_clk(dev, clk_src_hclk) * 3;</div><div class='add'>+	case clk_src_hclkm3d2:</div><div class='add'>+		return read_clk(dev, clk_src_hclk) * 3 / 2;</div><div class='add'>+	case clk_src_host:</div><div class='add'>+		switch (mast &amp; 0x30000000) {</div><div class='add'>+		case 0x00000000: return read_clk(dev, clk_src_href);</div><div class='add'>+		case 0x10000000: break;</div><div class='add'>+		case 0x20000000: /* !0x50 */</div><div class='add'>+		case 0x30000000: return read_clk(dev, clk_src_hclk);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case clk_src_nvclk:</div><div class='add'>+		if (!(mast &amp; 0x00100000))</div><div class='add'>+			P = (nv_rd32(dev, 0x004028) &amp; 0x00070000) &gt;&gt; 16;</div><div class='add'>+		switch (mast &amp; 0x00000003) {</div><div class='add'>+		case 0x00000000: return read_clk(dev, clk_src_crystal) &gt;&gt; P;</div><div class='add'>+		case 0x00000001: return read_clk(dev, clk_src_dom6);</div><div class='add'>+		case 0x00000002: return read_pll(dev, 0x004020) &gt;&gt; P;</div><div class='add'>+		case 0x00000003: return read_pll(dev, 0x004028) &gt;&gt; P;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case clk_src_sclk:</div><div class='add'>+		P = (nv_rd32(dev, 0x004020) &amp; 0x00070000) &gt;&gt; 16;</div><div class='add'>+		switch (mast &amp; 0x00000030) {</div><div class='add'>+		case 0x00000000:</div><div class='add'>+			if (mast &amp; 0x00000080)</div><div class='add'>+				return read_clk(dev, clk_src_host) &gt;&gt; P;</div><div class='add'>+			return read_clk(dev, clk_src_crystal) &gt;&gt; P;</div><div class='add'>+		case 0x00000010: break;</div><div class='add'>+		case 0x00000020: return read_pll(dev, 0x004028) &gt;&gt; P;</div><div class='add'>+		case 0x00000030: return read_pll(dev, 0x004020) &gt;&gt; P;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case clk_src_mclk:</div><div class='add'>+		P = (nv_rd32(dev, 0x004008) &amp; 0x00070000) &gt;&gt; 16;</div><div class='add'>+		if (nv_rd32(dev, 0x004008) &amp; 0x00000200) {</div><div class='add'>+			switch (mast &amp; 0x0000c000) {</div><div class='add'>+			case 0x00000000:</div><div class='add'>+				return read_clk(dev, clk_src_crystal) &gt;&gt; P;</div><div class='add'>+			case 0x00008000:</div><div class='add'>+			case 0x0000c000:</div><div class='add'>+				return read_clk(dev, clk_src_href) &gt;&gt; P;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			return read_pll(dev, 0x004008) &gt;&gt; P;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case clk_src_vdec:</div><div class='add'>+		P = (read_div(dev) &amp; 0x00000700) &gt;&gt; 8;</div><div class='add'>+		switch (dev_priv-&gt;chipset) {</div><div class='add'>+		case 0x84:</div><div class='add'>+		case 0x86:</div><div class='add'>+		case 0x92:</div><div class='add'>+		case 0x94:</div><div class='add'>+		case 0x96:</div><div class='add'>+		case 0xa0:</div><div class='add'>+			switch (mast &amp; 0x00000c00) {</div><div class='add'>+			case 0x00000000:</div><div class='add'>+				if (dev_priv-&gt;chipset == 0xa0) /* wtf?? */</div><div class='add'>+					return read_clk(dev, clk_src_nvclk) &gt;&gt; P;</div><div class='add'>+				return read_clk(dev, clk_src_crystal) &gt;&gt; P;</div><div class='add'>+			case 0x00000400:</div><div class='add'>+				return 0;</div><div class='add'>+			case 0x00000800:</div><div class='add'>+				if (mast &amp; 0x01000000)</div><div class='add'>+					return read_pll(dev, 0x004028) &gt;&gt; P;</div><div class='add'>+				return read_pll(dev, 0x004030) &gt;&gt; P;</div><div class='add'>+			case 0x00000c00:</div><div class='add'>+				return read_clk(dev, clk_src_nvclk) &gt;&gt; P;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case 0x98:</div><div class='add'>+			switch (mast &amp; 0x00000c00) {</div><div class='add'>+			case 0x00000000:</div><div class='add'>+				return read_clk(dev, clk_src_nvclk) &gt;&gt; P;</div><div class='add'>+			case 0x00000400:</div><div class='add'>+				return 0;</div><div class='add'>+			case 0x00000800:</div><div class='add'>+				return read_clk(dev, clk_src_hclkm3d2) &gt;&gt; P;</div><div class='add'>+			case 0x00000c00:</div><div class='add'>+				return read_clk(dev, clk_src_mclk) &gt;&gt; P;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case clk_src_dom6:</div><div class='add'>+		switch (dev_priv-&gt;chipset) {</div><div class='add'>+		case 0x50:</div><div class='add'>+		case 0xa0:</div><div class='add'>+			return read_pll(dev, 0x00e810) &gt;&gt; 2;</div><div class='add'>+		case 0x84:</div><div class='add'>+		case 0x86:</div><div class='add'>+		case 0x92:</div><div class='add'>+		case 0x94:</div><div class='add'>+		case 0x96:</div><div class='add'>+		case 0x98:</div><div class='add'>+			P = (read_div(dev) &amp; 0x00000007) &gt;&gt; 0;</div><div class='add'>+			switch (mast &amp; 0x0c000000) {</div><div class='add'>+			case 0x00000000: return read_clk(dev, clk_src_href);</div><div class='add'>+			case 0x04000000: break;</div><div class='add'>+			case 0x08000000: return read_clk(dev, clk_src_hclk);</div><div class='add'>+			case 0x0c000000:</div><div class='add'>+				return read_clk(dev, clk_src_hclkm3) &gt;&gt; P;</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'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	NV_DEBUG(dev, "unknown clock source %d 0x%08x\n", src, mast);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int</div><div class='del'>-nv50_pm_clock_get(struct drm_device *dev, u32 id)</div><div class='add'>+nv50_pm_clocks_get(struct drm_device *dev, struct nouveau_pm_level *perflvl)</div><div class='ctx'> {</div><div class='del'>-	struct pll_lims pll;</div><div class='del'>-	int P, N, M, ret;</div><div class='del'>-	u32 reg0, reg1;</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	if (dev_priv-&gt;chipset == 0xaa ||</div><div class='add'>+	    dev_priv-&gt;chipset == 0xac)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = get_pll_limits(dev, id, &amp;pll);</div><div class='add'>+	perflvl-&gt;core   = read_clk(dev, clk_src_nvclk);</div><div class='add'>+	perflvl-&gt;shader = read_clk(dev, clk_src_sclk);</div><div class='add'>+	perflvl-&gt;memory = read_clk(dev, clk_src_mclk);</div><div class='add'>+	if (dev_priv-&gt;chipset != 0x50) {</div><div class='add'>+		perflvl-&gt;vdec = read_clk(dev, clk_src_vdec);</div><div class='add'>+		perflvl-&gt;dom6 = read_clk(dev, clk_src_dom6);</div><div 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 nv50_pm_state {</div><div class='add'>+	struct hwsq_ucode mclk_hwsq;</div><div class='add'>+	u32 mscript;</div><div class='add'>+</div><div class='add'>+	u32 emast;</div><div class='add'>+	u32 nctrl;</div><div class='add'>+	u32 ncoef;</div><div class='add'>+	u32 sctrl;</div><div class='add'>+	u32 scoef;</div><div class='add'>+</div><div class='add'>+	u32 amast;</div><div class='add'>+	u32 pdivs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+calc_pll(struct drm_device *dev, u32 reg, struct pll_lims *pll,</div><div class='add'>+	 u32 clk, int *N1, int *M1, int *log2P)</div><div class='add'>+{</div><div class='add'>+	struct nouveau_pll_vals coef;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = get_pll_limits(dev, reg, pll);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	pll-&gt;vco2.maxfreq = 0;</div><div class='add'>+	pll-&gt;refclk = read_pll_ref(dev, reg);</div><div class='add'>+	if (!pll-&gt;refclk)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	reg0 = nv_rd32(dev, pll.reg + 0);</div><div class='del'>-	reg1 = nv_rd32(dev, pll.reg + 4);</div><div class='add'>+	ret = nouveau_calc_pll_mnp(dev, pll, clk, &amp;coef);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	if ((reg0 &amp; 0x80000000) == 0) {</div><div class='del'>-		if (id == PLL_SHADER) {</div><div class='del'>-			NV_DEBUG(dev, "Shader PLL is disabled. "</div><div class='del'>-				"Shader clock is twice the core\n");</div><div class='del'>-			ret = nv50_pm_clock_get(dev, PLL_CORE);</div><div class='del'>-			if (ret &gt; 0)</div><div class='del'>-				return ret &lt;&lt; 1;</div><div class='del'>-		} else if (id == PLL_MEMORY) {</div><div class='del'>-			NV_DEBUG(dev, "Memory PLL is disabled. "</div><div class='del'>-				"Memory clock is equal to the ref_clk\n");</div><div class='del'>-			return pll.refclk;</div><div class='add'>+	*N1 = coef.N1;</div><div class='add'>+	*M1 = coef.M1;</div><div class='add'>+	*log2P = coef.log2P;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+calc_div(u32 src, u32 target, int *div)</div><div class='add'>+{</div><div class='add'>+	u32 clk0 = src, clk1 = src;</div><div class='add'>+	for (*div = 0; *div &lt;= 7; (*div)++) {</div><div class='add'>+		if (clk0 &lt;= target) {</div><div class='add'>+			clk1 = clk0 &lt;&lt; (*div ? 1 : 0);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='add'>+		clk0 &gt;&gt;= 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (target - clk0 &lt;= clk1 - target)</div><div class='add'>+		return clk0;</div><div class='add'>+	(*div)--;</div><div class='add'>+	return clk1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+clk_same(u32 a, u32 b)</div><div class='add'>+{</div><div class='add'>+	return ((a / 1000) == (b / 1000));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+calc_mclk(struct drm_device *dev, u32 freq, struct hwsq_ucode *hwsq)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct pll_lims pll;</div><div class='add'>+	u32 mast = nv_rd32(dev, 0x00c040);</div><div class='add'>+	u32 ctrl = nv_rd32(dev, 0x004008);</div><div class='add'>+	u32 coef = nv_rd32(dev, 0x00400c);</div><div class='add'>+	u32 orig = ctrl;</div><div class='add'>+	u32 crtc_mask = 0;</div><div class='add'>+	int N, M, P;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	/* use pcie refclock if possible, otherwise use mpll */</div><div class='add'>+	ctrl &amp;= ~0x81ff0200;</div><div class='add'>+	if (clk_same(freq, read_clk(dev, clk_src_href))) {</div><div class='add'>+		ctrl |= 0x00000200 | (pll.log2p_bias &lt;&lt; 19);</div><div class='add'>+	} else {</div><div class='add'>+		ret = calc_pll(dev, 0x4008, &amp;pll, freq, &amp;N, &amp;M, &amp;P);</div><div class='add'>+		if (ret == 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ctrl |= 0x80000000 | (P &lt;&lt; 22) | (P &lt;&lt; 16);</div><div class='add'>+		ctrl |= pll.log2p_bias &lt;&lt; 19;</div><div class='add'>+		coef  = (N &lt;&lt; 8) | M;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mast &amp;= ~0xc0000000; /* get MCLK_2 from HREF */</div><div class='add'>+	mast |=  0x0000c000; /* use MCLK_2 as MPLL_BYPASS clock */</div><div class='add'>+</div><div class='add'>+	/* determine active crtcs */</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		if (nv_rd32(dev, NV50_PDISPLAY_CRTC_C(i, CLOCK)))</div><div class='add'>+			crtc_mask |= (1 &lt;&lt; i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* build the ucode which will reclock the memory for us */</div><div class='add'>+	hwsq_init(hwsq);</div><div class='add'>+	if (crtc_mask) {</div><div class='add'>+		hwsq_op5f(hwsq, crtc_mask, 0x00); /* wait for scanout */</div><div class='add'>+		hwsq_op5f(hwsq, crtc_mask, 0x01); /* wait for vblank */</div><div class='ctx'> 	}</div><div class='add'>+	if (dev_priv-&gt;chipset &gt;= 0x92)</div><div class='add'>+		hwsq_wr32(hwsq, 0x611200, 0x00003300); /* disable scanout */</div><div class='add'>+	hwsq_setf(hwsq, 0x10, 0); /* disable bus access */</div><div class='add'>+	hwsq_op5f(hwsq, 0x00, 0x01); /* no idea :s */</div><div class='add'>+</div><div class='add'>+	/* prepare memory controller */</div><div class='add'>+	hwsq_wr32(hwsq, 0x1002d4, 0x00000001); /* precharge banks and idle */</div><div class='add'>+	hwsq_wr32(hwsq, 0x1002d0, 0x00000001); /* force refresh */</div><div class='add'>+	hwsq_wr32(hwsq, 0x100210, 0x00000000); /* stop the automatic refresh */</div><div class='add'>+	hwsq_wr32(hwsq, 0x1002dc, 0x00000001); /* start self refresh mode */</div><div class='ctx'> </div><div class='del'>-	P = (reg0 &amp; 0x00070000) &gt;&gt; 16;</div><div class='del'>-	N = (reg1 &amp; 0x0000ff00) &gt;&gt; 8;</div><div class='del'>-	M = (reg1 &amp; 0x000000ff);</div><div class='add'>+	/* reclock memory */</div><div class='add'>+	hwsq_wr32(hwsq, 0xc040, mast);</div><div class='add'>+	hwsq_wr32(hwsq, 0x4008, orig | 0x00000200); /* bypass MPLL */</div><div class='add'>+	hwsq_wr32(hwsq, 0x400c, coef);</div><div class='add'>+	hwsq_wr32(hwsq, 0x4008, ctrl);</div><div class='ctx'> </div><div class='del'>-	return ((pll.refclk * N / M) &gt;&gt; P);</div><div class='add'>+	/* restart memory controller */</div><div class='add'>+	hwsq_wr32(hwsq, 0x1002d4, 0x00000001); /* precharge banks and idle */</div><div class='add'>+	hwsq_wr32(hwsq, 0x1002dc, 0x00000000); /* stop self refresh mode */</div><div class='add'>+	hwsq_wr32(hwsq, 0x100210, 0x80000000); /* restart automatic refresh */</div><div class='add'>+	hwsq_usec(hwsq, 12); /* wait for the PLL to stabilize */</div><div class='add'>+</div><div class='add'>+	hwsq_usec(hwsq, 48); /* may be unnecessary: causes flickering */</div><div class='add'>+	hwsq_setf(hwsq, 0x10, 1); /* enable bus access */</div><div class='add'>+	hwsq_op5f(hwsq, 0x00, 0x00); /* no idea, reverse of 0x00, 0x01? */</div><div class='add'>+	if (dev_priv-&gt;chipset &gt;= 0x92)</div><div class='add'>+		hwsq_wr32(hwsq, 0x611200, 0x00003330); /* enable scanout */</div><div class='add'>+	hwsq_fini(hwsq);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void *</div><div class='del'>-nv50_pm_clock_pre(struct drm_device *dev, struct nouveau_pm_level *perflvl,</div><div class='del'>-		  u32 id, int khz)</div><div class='add'>+nv50_pm_clocks_pre(struct drm_device *dev, struct nouveau_pm_level *perflvl)</div><div class='ctx'> {</div><div class='del'>-	struct nv50_pm_state *state;</div><div class='del'>-	int dummy, ret;</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nv50_pm_state *info;</div><div class='add'>+	struct pll_lims pll;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	int N, M, P1, P2;</div><div class='add'>+	u32 clk, out;</div><div class='ctx'> </div><div class='del'>-	state = kzalloc(sizeof(*state), GFP_KERNEL);</div><div class='del'>-	if (!state)</div><div class='add'>+	if (dev_priv-&gt;chipset == 0xaa ||</div><div class='add'>+	    dev_priv-&gt;chipset == 0xac)</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+</div><div class='add'>+	info = kmalloc(sizeof(*info), GFP_KERNEL);</div><div class='add'>+	if (!info)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	state-&gt;type = id;</div><div class='del'>-	state-&gt;perflvl = perflvl;</div><div class='ctx'> </div><div class='del'>-	ret = get_pll_limits(dev, id, &amp;state-&gt;pll);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		kfree(state);</div><div class='del'>-		return (ret == -ENOENT) ? NULL : ERR_PTR(ret);</div><div class='add'>+	/* core: for the moment at least, always use nvpll */</div><div class='add'>+	clk = calc_pll(dev, 0x4028, &amp;pll, perflvl-&gt;core, &amp;N, &amp;M, &amp;P1);</div><div class='add'>+	if (clk == 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	info-&gt;emast = 0x00000003;</div><div class='add'>+	info-&gt;nctrl = 0x80000000 | (P1 &lt;&lt; 19) | (P1 &lt;&lt; 16);</div><div class='add'>+	info-&gt;ncoef = (N &lt;&lt; 8) | M;</div><div class='add'>+</div><div class='add'>+	/* shader: tie to nvclk if possible, otherwise use spll.  have to be</div><div class='add'>+	 * very careful that the shader clock is at least twice the core, or</div><div class='add'>+	 * some chipsets will be very unhappy.  i expect most or all of these</div><div class='add'>+	 * cases will be handled by tying to nvclk, but it's possible there's</div><div class='add'>+	 * corners</div><div class='add'>+	 */</div><div class='add'>+	if (P1-- &amp;&amp; perflvl-&gt;shader == (perflvl-&gt;core &lt;&lt; 1)) {</div><div class='add'>+		info-&gt;emast |= 0x00000020;</div><div class='add'>+		info-&gt;sctrl  = 0x00000000 | (P1 &lt;&lt; 19) | (P1 &lt;&lt; 16);</div><div class='add'>+		info-&gt;scoef  = nv_rd32(dev, 0x004024);</div><div class='add'>+	} else {</div><div class='add'>+		clk = calc_pll(dev, 0x4020, &amp;pll, perflvl-&gt;shader, &amp;N, &amp;M, &amp;P1);</div><div class='add'>+		if (clk == 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		info-&gt;emast |= 0x00000030;</div><div class='add'>+		info-&gt;sctrl  = 0x80000000 | (P1 &lt;&lt; 19) | (P1 &lt;&lt; 16);</div><div class='add'>+		info-&gt;scoef  = (N &lt;&lt; 8) | M;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* memory: build hwsq ucode which we'll use to reclock memory */</div><div class='add'>+	info-&gt;mclk_hwsq.len = 0;</div><div class='add'>+	if (perflvl-&gt;memory) {</div><div class='add'>+		clk = calc_mclk(dev, perflvl-&gt;memory, &amp;info-&gt;mclk_hwsq);</div><div class='add'>+		if (clk &lt; 0) {</div><div class='add'>+			ret = clk;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		info-&gt;mscript = perflvl-&gt;memscript;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* vdec: avoid modifying xpll until we know exactly how the other</div><div class='add'>+	 * clock domains work, i suspect at least some of them can also be</div><div class='add'>+	 * tied to xpll...</div><div class='add'>+	 */</div><div class='add'>+	info-&gt;amast = nv_rd32(dev, 0x00c040);</div><div class='add'>+	info-&gt;pdivs = read_div(dev);</div><div class='add'>+	if (perflvl-&gt;vdec) {</div><div class='add'>+		/* see how close we can get using nvclk as a source */</div><div class='add'>+		clk = calc_div(perflvl-&gt;core, perflvl-&gt;vdec, &amp;P1);</div><div class='add'>+</div><div class='add'>+		/* see how close we can get using xpll/hclk as a source */</div><div class='add'>+		if (dev_priv-&gt;chipset != 0x98)</div><div class='add'>+			out = read_pll(dev, 0x004030);</div><div class='add'>+		else</div><div class='add'>+			out = read_clk(dev, clk_src_hclkm3d2);</div><div class='add'>+		out = calc_div(out, perflvl-&gt;vdec, &amp;P2);</div><div class='add'>+</div><div class='add'>+		/* select whichever gets us closest */</div><div class='add'>+		info-&gt;amast &amp;= ~0x00000c00;</div><div class='add'>+		info-&gt;pdivs &amp;= ~0x00000700;</div><div class='add'>+		if (abs((int)perflvl-&gt;vdec - clk) &lt;=</div><div class='add'>+		    abs((int)perflvl-&gt;vdec - out)) {</div><div class='add'>+			if (dev_priv-&gt;chipset != 0x98)</div><div class='add'>+				info-&gt;amast |= 0x00000c00;</div><div class='add'>+			info-&gt;pdivs |= P1 &lt;&lt; 8;</div><div class='add'>+		} else {</div><div class='add'>+			info-&gt;amast |= 0x00000800;</div><div class='add'>+			info-&gt;pdivs |= P2 &lt;&lt; 8;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* dom6: nfi what this is, but we're limited to various combinations</div><div class='add'>+	 * of the host clock frequency</div><div class='add'>+	 */</div><div class='add'>+	if (perflvl-&gt;dom6) {</div><div class='add'>+		info-&gt;amast &amp;= ~0x0c000000;</div><div class='add'>+		if (clk_same(perflvl-&gt;dom6, read_clk(dev, clk_src_href))) {</div><div class='add'>+			info-&gt;amast |= 0x00000000;</div><div class='add'>+		} else</div><div class='add'>+		if (clk_same(perflvl-&gt;dom6, read_clk(dev, clk_src_hclk))) {</div><div class='add'>+			info-&gt;amast |= 0x08000000;</div><div class='add'>+		} else {</div><div class='add'>+			clk = read_clk(dev, clk_src_hclk) * 3;</div><div class='add'>+			clk = calc_div(clk, perflvl-&gt;dom6, &amp;P1);</div><div class='add'>+</div><div class='add'>+			info-&gt;amast |= 0x0c000000;</div><div class='add'>+			info-&gt;pdivs  = (info-&gt;pdivs &amp; ~0x00000007) | P1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = nv50_calc_pll(dev, &amp;state-&gt;pll, khz, &amp;state-&gt;N, &amp;state-&gt;M,</div><div class='del'>-			    &amp;dummy, &amp;dummy, &amp;state-&gt;P);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		kfree(state);</div><div class='del'>-		return ERR_PTR(ret);</div><div class='add'>+	return info;</div><div class='add'>+error:</div><div class='add'>+	kfree(info);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+prog_mclk(struct drm_device *dev, struct hwsq_ucode *hwsq)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	u32 hwsq_data, hwsq_kick;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (dev_priv-&gt;chipset &lt; 0x90) {</div><div class='add'>+		hwsq_data = 0x001400;</div><div class='add'>+		hwsq_kick = 0x00000003;</div><div class='add'>+	} else {</div><div class='add'>+		hwsq_data = 0x080000;</div><div class='add'>+		hwsq_kick = 0x00000001;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return state;</div><div class='add'>+	/* upload hwsq ucode */</div><div class='add'>+	nv_mask(dev, 0x001098, 0x00000008, 0x00000000);</div><div class='add'>+	nv_wr32(dev, 0x001304, 0x00000000);</div><div class='add'>+	for (i = 0; i &lt; hwsq-&gt;len / 4; i++)</div><div class='add'>+		nv_wr32(dev, hwsq_data + (i * 4), hwsq-&gt;ptr.u32[i]);</div><div class='add'>+	nv_mask(dev, 0x001098, 0x00000018, 0x00000018);</div><div class='add'>+</div><div class='add'>+	/* launch, and wait for completion */</div><div class='add'>+	nv_wr32(dev, 0x00130c, hwsq_kick);</div><div class='add'>+	if (!nv_wait(dev, 0x001308, 0x00000100, 0x00000000)) {</div><div class='add'>+		NV_ERROR(dev, "hwsq ucode exec timed out\n");</div><div class='add'>+		NV_ERROR(dev, "0x001308: 0x%08x\n", nv_rd32(dev, 0x001308));</div><div class='add'>+		for (i = 0; i &lt; hwsq-&gt;len / 4; i++) {</div><div class='add'>+			NV_ERROR(dev, "0x%06x: 0x%08x\n", 0x1400 + (i * 4),</div><div class='add'>+				 nv_rd32(dev, 0x001400 + (i * 4)));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return -EIO;</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'>-void</div><div class='del'>-nv50_pm_clock_set(struct drm_device *dev, void *pre_state)</div><div class='add'>+int</div><div class='add'>+nv50_pm_clocks_set(struct drm_device *dev, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct nv50_pm_state *state = pre_state;</div><div class='del'>-	struct nouveau_pm_level *perflvl = state-&gt;perflvl;</div><div class='del'>-	u32 reg = state-&gt;pll.reg, tmp;</div><div class='del'>-	struct bit_entry BIT_M;</div><div class='del'>-	u16 script;</div><div class='del'>-	int N = state-&gt;N;</div><div class='del'>-	int M = state-&gt;M;</div><div class='del'>-	int P = state-&gt;P;</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nv50_pm_state *info = data;</div><div class='add'>+	struct bit_entry M;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;type == PLL_MEMORY &amp;&amp; perflvl-&gt;memscript &amp;&amp;</div><div class='del'>-	    bit_table(dev, 'M', &amp;BIT_M) == 0 &amp;&amp;</div><div class='del'>-	    BIT_M.version == 1 &amp;&amp; BIT_M.length &gt;= 0x0b) {</div><div class='del'>-		script = ROM16(BIT_M.data[0x05]);</div><div class='del'>-		if (script)</div><div class='del'>-			nouveau_bios_run_init_table(dev, script, NULL, -1);</div><div class='del'>-		script = ROM16(BIT_M.data[0x07]);</div><div class='del'>-		if (script)</div><div class='del'>-			nouveau_bios_run_init_table(dev, script, NULL, -1);</div><div class='del'>-		script = ROM16(BIT_M.data[0x09]);</div><div class='del'>-		if (script)</div><div class='del'>-			nouveau_bios_run_init_table(dev, script, NULL, -1);</div><div class='add'>+	/* halt and idle execution engines */</div><div class='add'>+	nv_mask(dev, 0x002504, 0x00000001, 0x00000001);</div><div class='add'>+	if (!nv_wait(dev, 0x002504, 0x00000010, 0x00000010))</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='del'>-		nouveau_bios_run_init_table(dev, perflvl-&gt;memscript, NULL, -1);</div><div class='add'>+	/* memory: it is *very* important we change this first, the ucode</div><div class='add'>+	 * we build in pre() now has hardcoded 0xc040 values, which can't</div><div class='add'>+	 * change before we execute it or the engine clocks may end up</div><div class='add'>+	 * messed up.</div><div class='add'>+	 */</div><div class='add'>+	if (info-&gt;mclk_hwsq.len) {</div><div class='add'>+		/* execute some scripts that do ??? from the vbios.. */</div><div class='add'>+		if (!bit_table(dev, 'M', &amp;M) &amp;&amp; M.version == 1) {</div><div class='add'>+			if (M.length &gt;= 6)</div><div class='add'>+				nouveau_bios_init_exec(dev, ROM16(M.data[5]));</div><div class='add'>+			if (M.length &gt;= 8)</div><div class='add'>+				nouveau_bios_init_exec(dev, ROM16(M.data[7]));</div><div class='add'>+			if (M.length &gt;= 10)</div><div class='add'>+				nouveau_bios_init_exec(dev, ROM16(M.data[9]));</div><div class='add'>+			nouveau_bios_init_exec(dev, info-&gt;mscript);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = prog_mclk(dev, &amp;info-&gt;mclk_hwsq);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto resume;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;type == PLL_MEMORY) {</div><div class='del'>-		nv_wr32(dev, 0x100210, 0);</div><div class='del'>-		nv_wr32(dev, 0x1002dc, 1);</div><div class='add'>+	/* reclock vdec/dom6 */</div><div class='add'>+	nv_mask(dev, 0x00c040, 0x00000c00, 0x00000000);</div><div class='add'>+	switch (dev_priv-&gt;chipset) {</div><div class='add'>+	case 0x92:</div><div class='add'>+	case 0x94:</div><div class='add'>+	case 0x96:</div><div class='add'>+		nv_mask(dev, 0x004800, 0x00000707, info-&gt;pdivs);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		nv_mask(dev, 0x004700, 0x00000707, info-&gt;pdivs);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='add'>+	nv_mask(dev, 0x00c040, 0x0c000c00, info-&gt;amast);</div><div class='ctx'> </div><div class='del'>-	tmp  = nv_rd32(dev, reg + 0) &amp; 0xfff8ffff;</div><div class='del'>-	tmp |= 0x80000000 | (P &lt;&lt; 16);</div><div class='del'>-	nv_wr32(dev, reg + 0, tmp);</div><div class='del'>-	nv_wr32(dev, reg + 4, (N &lt;&lt; 8) | M);</div><div class='add'>+	/* core/shader: make sure sclk/nvclk are disconnected from their</div><div class='add'>+	 * plls (nvclk to dom6, sclk to hclk), modify the plls, and</div><div class='add'>+	 * reconnect sclk/nvclk to their new clock source</div><div class='add'>+	 */</div><div class='add'>+	if (dev_priv-&gt;chipset &lt; 0x92)</div><div class='add'>+		nv_mask(dev, 0x00c040, 0x001000b0, 0x00100080); /* grrr! */</div><div class='add'>+	else</div><div class='add'>+		nv_mask(dev, 0x00c040, 0x000000b3, 0x00000081);</div><div class='add'>+	nv_mask(dev, 0x004020, 0xc03f0100, info-&gt;sctrl);</div><div class='add'>+	nv_wr32(dev, 0x004024, info-&gt;scoef);</div><div class='add'>+	nv_mask(dev, 0x004028, 0xc03f0100, info-&gt;nctrl);</div><div class='add'>+	nv_wr32(dev, 0x00402c, info-&gt;ncoef);</div><div class='add'>+	nv_mask(dev, 0x00c040, 0x00100033, info-&gt;emast);</div><div class='add'>+</div><div class='add'>+	goto resume;</div><div class='add'>+error:</div><div class='add'>+	ret = -EBUSY;</div><div class='add'>+resume:</div><div class='add'>+	nv_mask(dev, 0x002504, 0x00000001, 0x00000000);</div><div class='add'>+	kfree(info);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;type == PLL_MEMORY) {</div><div class='del'>-		nv_wr32(dev, 0x1002dc, 0);</div><div class='del'>-		nv_wr32(dev, 0x100210, 0x80000000);</div><div class='add'>+static int</div><div class='add'>+pwm_info(struct drm_device *dev, int *line, int *ctrl, int *indx)</div><div class='add'>+{</div><div class='add'>+	if (*line == 0x04) {</div><div class='add'>+		*ctrl = 0x00e100;</div><div class='add'>+		*line = 4;</div><div class='add'>+		*indx = 0;</div><div class='add'>+	} else</div><div class='add'>+	if (*line == 0x09) {</div><div class='add'>+		*ctrl = 0x00e100;</div><div class='add'>+		*line = 9;</div><div class='add'>+		*indx = 1;</div><div class='add'>+	} else</div><div class='add'>+	if (*line == 0x10) {</div><div class='add'>+		*ctrl = 0x00e28c;</div><div class='add'>+		*line = 0;</div><div class='add'>+		*indx = 0;</div><div class='add'>+	} else {</div><div class='add'>+		NV_ERROR(dev, "unknown pwm ctrl for gpio %d\n", *line);</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'>+int</div><div class='add'>+nv50_pm_pwm_get(struct drm_device *dev, int line, u32 *divs, u32 *duty)</div><div class='add'>+{</div><div class='add'>+	int ctrl, id, ret = pwm_info(dev, &amp;line, &amp;ctrl, &amp;id);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (nv_rd32(dev, ctrl) &amp; (1 &lt;&lt; line)) {</div><div class='add'>+		*divs = nv_rd32(dev, 0x00e114 + (id * 8));</div><div class='add'>+		*duty = nv_rd32(dev, 0x00e118 + (id * 8));</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(state);</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int</div><div class='add'>+nv50_pm_pwm_set(struct drm_device *dev, int line, u32 divs, u32 duty)</div><div class='add'>+{</div><div class='add'>+	int ctrl, id, ret = pwm_info(dev, &amp;line, &amp;ctrl, &amp;id);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	nv_mask(dev, ctrl, 0x00010001 &lt;&lt; line, 0x00000001 &lt;&lt; line);</div><div class='add'>+	nv_wr32(dev, 0x00e114 + (id * 8), divs);</div><div class='add'>+	nv_wr32(dev, 0x00e118 + (id * 8), duty | 0x80000000);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c<br/>index 2633aa8554eb..c4423ba9c9bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_sor.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_sor.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_sor.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv50_sor.c</a></div><div class='hunk'>@@ -60,6 +60,8 @@ nv50_sor_disconnect(struct drm_encoder *encoder)</div><div class='ctx'> 	BEGIN_RING(evo, 0, NV50_EVO_UPDATE, 1);</div><div class='ctx'> 	OUT_RING  (evo, 0);</div><div class='ctx'> </div><div class='add'>+	nouveau_hdmi_mode_set(encoder, NULL);</div><div class='add'>+</div><div class='ctx'> 	nv_encoder-&gt;crtc = NULL;</div><div class='ctx'> 	nv_encoder-&gt;last_dpms = DRM_MODE_DPMS_OFF;</div><div class='ctx'> }</div><div class='hunk'>@@ -172,6 +174,12 @@ nv50_sor_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode,</div><div class='ctx'> static void</div><div class='ctx'> nv50_sor_prepare(struct drm_encoder *encoder)</div><div class='ctx'> {</div><div class='add'>+	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);</div><div class='add'>+	nv50_sor_disconnect(encoder);</div><div class='add'>+	if (nv_encoder-&gt;dcb-&gt;type == OUTPUT_DP) {</div><div class='add'>+		/* avoid race between link training and supervisor intr */</div><div class='add'>+		nv50_display_sync(encoder-&gt;dev);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -180,8 +188,8 @@ nv50_sor_commit(struct drm_encoder *encoder)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,</div><div class='del'>-		  struct drm_display_mode *adjusted_mode)</div><div class='add'>+nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *umode,</div><div class='add'>+		  struct drm_display_mode *mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct nouveau_channel *evo = nv50_display(encoder-&gt;dev)-&gt;master;</div><div class='ctx'> 	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);</div><div class='hunk'>@@ -193,24 +201,27 @@ nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,</div><div class='ctx'> </div><div class='ctx'> 	NV_DEBUG_KMS(dev, "or %d type %d -&gt; crtc %d\n",</div><div class='ctx'> 		     nv_encoder-&gt;or, nv_encoder-&gt;dcb-&gt;type, crtc-&gt;index);</div><div class='add'>+	nv_encoder-&gt;crtc = encoder-&gt;crtc;</div><div class='ctx'> </div><div class='ctx'> 	switch (nv_encoder-&gt;dcb-&gt;type) {</div><div class='ctx'> 	case OUTPUT_TMDS:</div><div class='ctx'> 		if (nv_encoder-&gt;dcb-&gt;sorconf.link &amp; 1) {</div><div class='del'>-			if (adjusted_mode-&gt;clock &lt; 165000)</div><div class='add'>+			if (mode-&gt;clock &lt; 165000)</div><div class='ctx'> 				mode_ctl = 0x0100;</div><div class='ctx'> 			else</div><div class='ctx'> 				mode_ctl = 0x0500;</div><div class='ctx'> 		} else</div><div class='ctx'> 			mode_ctl = 0x0200;</div><div class='add'>+</div><div class='add'>+		nouveau_hdmi_mode_set(encoder, mode);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case OUTPUT_DP:</div><div class='ctx'> 		nv_connector = nouveau_encoder_connector_get(nv_encoder);</div><div class='ctx'> 		if (nv_connector &amp;&amp; nv_connector-&gt;base.display_info.bpc == 6) {</div><div class='del'>-			nv_encoder-&gt;dp.datarate = crtc-&gt;mode-&gt;clock * 18 / 8;</div><div class='add'>+			nv_encoder-&gt;dp.datarate = mode-&gt;clock * 18 / 8;</div><div class='ctx'> 			mode_ctl |= 0x00020000;</div><div class='ctx'> 		} else {</div><div class='del'>-			nv_encoder-&gt;dp.datarate = crtc-&gt;mode-&gt;clock * 24 / 8;</div><div class='add'>+			nv_encoder-&gt;dp.datarate = mode-&gt;clock * 24 / 8;</div><div class='ctx'> 			mode_ctl |= 0x00050000;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -228,10 +239,10 @@ nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,</div><div class='ctx'> 	else</div><div class='ctx'> 		mode_ctl |= NV50_EVO_SOR_MODE_CTRL_CRTC0;</div><div class='ctx'> </div><div class='del'>-	if (adjusted_mode-&gt;flags &amp; DRM_MODE_FLAG_NHSYNC)</div><div class='add'>+	if (mode-&gt;flags &amp; DRM_MODE_FLAG_NHSYNC)</div><div class='ctx'> 		mode_ctl |= NV50_EVO_SOR_MODE_CTRL_NHSYNC;</div><div class='ctx'> </div><div class='del'>-	if (adjusted_mode-&gt;flags &amp; DRM_MODE_FLAG_NVSYNC)</div><div class='add'>+	if (mode-&gt;flags &amp; DRM_MODE_FLAG_NVSYNC)</div><div class='ctx'> 		mode_ctl |= NV50_EVO_SOR_MODE_CTRL_NVSYNC;</div><div class='ctx'> </div><div class='ctx'> 	nv50_sor_dpms(encoder, DRM_MODE_DPMS_ON);</div><div class='hunk'>@@ -239,12 +250,11 @@ nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,</div><div class='ctx'> 	ret = RING_SPACE(evo, 2);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		NV_ERROR(dev, "no space while connecting SOR\n");</div><div class='add'>+		nv_encoder-&gt;crtc = NULL;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	BEGIN_RING(evo, 0, NV50_EVO_SOR(nv_encoder-&gt;or, MODE_CTRL), 1);</div><div class='ctx'> 	OUT_RING(evo, mode_ctl);</div><div class='del'>-</div><div class='del'>-	nv_encoder-&gt;crtc = encoder-&gt;crtc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct drm_crtc *</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv50_vm.c b/drivers/gpu/drm/nouveau/nv50_vm.c<br/>index 40b84f22d819..6f38ceae3aa4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_vm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nv50_vm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv50_vm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv50_vm.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@ nv50_vm_map_pgt(struct nouveau_gpuobj *pgd, u32 pde,</div><div class='ctx'> 			phys |= 0x60;</div><div class='ctx'> 		else if (coverage &lt;= 64 * 1024 * 1024)</div><div class='ctx'> 			phys |= 0x40;</div><div class='del'>-		else if (coverage &lt; 128 * 1024 * 1024)</div><div class='add'>+		else if (coverage &lt;= 128 * 1024 * 1024)</div><div class='ctx'> 			phys |= 0x20;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv84_bsp.c b/drivers/gpu/drm/nouveau/nv84_bsp.c<br/>new file mode 100644<br/>index 000000000000..74875739bcc0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv84_bsp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv84_bsp.c</a></div><div class='hunk'>@@ -0,0 +1,83 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2011 Red Hat Inc.</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice shall be included in</div><div class='add'>+ * all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR</div><div class='add'>+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,</div><div class='add'>+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ * OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors: Ben Skeggs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "nouveau_drv.h"</div><div class='add'>+#include "nouveau_util.h"</div><div class='add'>+#include "nouveau_vm.h"</div><div class='add'>+#include "nouveau_ramht.h"</div><div class='add'>+</div><div class='add'>+/*XXX: This stub is currently used on NV98+ also, as soon as this becomes</div><div class='add'>+ *     more than just an enable/disable stub this needs to be split out to</div><div class='add'>+ *     nv98_bsp.c...</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct nv84_bsp_engine {</div><div class='add'>+	struct nouveau_exec_engine base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nv84_bsp_fini(struct drm_device *dev, int engine, bool suspend)</div><div class='add'>+{</div><div class='add'>+	if (!(nv_rd32(dev, 0x000200) &amp; 0x00008000))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nv_mask(dev, 0x000200, 0x00008000, 0x00000000);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nv84_bsp_init(struct drm_device *dev, int engine)</div><div class='add'>+{</div><div class='add'>+	nv_mask(dev, 0x000200, 0x00008000, 0x00000000);</div><div class='add'>+	nv_mask(dev, 0x000200, 0x00008000, 0x00008000);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nv84_bsp_destroy(struct drm_device *dev, int engine)</div><div class='add'>+{</div><div class='add'>+	struct nv84_bsp_engine *pbsp = nv_engine(dev, engine);</div><div class='add'>+</div><div class='add'>+	NVOBJ_ENGINE_DEL(dev, BSP);</div><div class='add'>+</div><div class='add'>+	kfree(pbsp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nv84_bsp_create(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct nv84_bsp_engine *pbsp;</div><div class='add'>+</div><div class='add'>+	pbsp = kzalloc(sizeof(*pbsp), GFP_KERNEL);</div><div class='add'>+	if (!pbsp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pbsp-&gt;base.destroy = nv84_bsp_destroy;</div><div class='add'>+	pbsp-&gt;base.init = nv84_bsp_init;</div><div class='add'>+	pbsp-&gt;base.fini = nv84_bsp_fini;</div><div class='add'>+</div><div class='add'>+	NVOBJ_ENGINE_ADD(dev, BSP, &amp;pbsp-&gt;base);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv84_vp.c b/drivers/gpu/drm/nouveau/nv84_vp.c<br/>new file mode 100644<br/>index 000000000000..6570d300ab85<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv84_vp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv84_vp.c</a></div><div class='hunk'>@@ -0,0 +1,83 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2011 Red Hat Inc.</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice shall be included in</div><div class='add'>+ * all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR</div><div class='add'>+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,</div><div class='add'>+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ * OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors: Ben Skeggs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "nouveau_drv.h"</div><div class='add'>+#include "nouveau_util.h"</div><div class='add'>+#include "nouveau_vm.h"</div><div class='add'>+#include "nouveau_ramht.h"</div><div class='add'>+</div><div class='add'>+/*XXX: This stub is currently used on NV98+ also, as soon as this becomes</div><div class='add'>+ *     more than just an enable/disable stub this needs to be split out to</div><div class='add'>+ *     nv98_vp.c...</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct nv84_vp_engine {</div><div class='add'>+	struct nouveau_exec_engine base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nv84_vp_fini(struct drm_device *dev, int engine, bool suspend)</div><div class='add'>+{</div><div class='add'>+	if (!(nv_rd32(dev, 0x000200) &amp; 0x00020000))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nv_mask(dev, 0x000200, 0x00020000, 0x00000000);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nv84_vp_init(struct drm_device *dev, int engine)</div><div class='add'>+{</div><div class='add'>+	nv_mask(dev, 0x000200, 0x00020000, 0x00000000);</div><div class='add'>+	nv_mask(dev, 0x000200, 0x00020000, 0x00020000);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nv84_vp_destroy(struct drm_device *dev, int engine)</div><div class='add'>+{</div><div class='add'>+	struct nv84_vp_engine *pvp = nv_engine(dev, engine);</div><div class='add'>+</div><div class='add'>+	NVOBJ_ENGINE_DEL(dev, VP);</div><div class='add'>+</div><div class='add'>+	kfree(pvp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nv84_vp_create(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct nv84_vp_engine *pvp;</div><div class='add'>+</div><div class='add'>+	pvp = kzalloc(sizeof(*pvp), GFP_KERNEL);</div><div class='add'>+	if (!pvp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pvp-&gt;base.destroy = nv84_vp_destroy;</div><div class='add'>+	pvp-&gt;base.init = nv84_vp_init;</div><div class='add'>+	pvp-&gt;base.fini = nv84_vp_fini;</div><div class='add'>+</div><div class='add'>+	NVOBJ_ENGINE_ADD(dev, VP, &amp;pvp-&gt;base);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv98_crypt.c b/drivers/gpu/drm/nouveau/nv98_crypt.c<br/>new file mode 100644<br/>index 000000000000..db94ff0a9fab<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv98_crypt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv98_crypt.c</a></div><div class='hunk'>@@ -0,0 +1,78 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2011 Red Hat Inc.</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice shall be included in</div><div class='add'>+ * all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR</div><div class='add'>+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,</div><div class='add'>+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ * OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors: Ben Skeggs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "nouveau_drv.h"</div><div class='add'>+#include "nouveau_util.h"</div><div class='add'>+#include "nouveau_vm.h"</div><div class='add'>+#include "nouveau_ramht.h"</div><div class='add'>+</div><div class='add'>+struct nv98_crypt_engine {</div><div class='add'>+	struct nouveau_exec_engine base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nv98_crypt_fini(struct drm_device *dev, int engine, bool suspend)</div><div class='add'>+{</div><div class='add'>+	if (!(nv_rd32(dev, 0x000200) &amp; 0x00004000))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nv_mask(dev, 0x000200, 0x00004000, 0x00000000);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nv98_crypt_init(struct drm_device *dev, int engine)</div><div class='add'>+{</div><div class='add'>+	nv_mask(dev, 0x000200, 0x00004000, 0x00000000);</div><div class='add'>+	nv_mask(dev, 0x000200, 0x00004000, 0x00004000);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nv98_crypt_destroy(struct drm_device *dev, int engine)</div><div class='add'>+{</div><div class='add'>+	struct nv98_crypt_engine *pcrypt = nv_engine(dev, engine);</div><div class='add'>+</div><div class='add'>+	NVOBJ_ENGINE_DEL(dev, CRYPT);</div><div class='add'>+</div><div class='add'>+	kfree(pcrypt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nv98_crypt_create(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct nv98_crypt_engine *pcrypt;</div><div class='add'>+</div><div class='add'>+	pcrypt = kzalloc(sizeof(*pcrypt), GFP_KERNEL);</div><div class='add'>+	if (!pcrypt)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pcrypt-&gt;base.destroy = nv98_crypt_destroy;</div><div class='add'>+	pcrypt-&gt;base.init = nv98_crypt_init;</div><div class='add'>+	pcrypt-&gt;base.fini = nv98_crypt_fini;</div><div class='add'>+</div><div class='add'>+	NVOBJ_ENGINE_ADD(dev, CRYPT, &amp;pcrypt-&gt;base);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nv98_ppp.c b/drivers/gpu/drm/nouveau/nv98_ppp.c<br/>new file mode 100644<br/>index 000000000000..a987dd6e0036<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nv98_ppp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nv98_ppp.c</a></div><div class='hunk'>@@ -0,0 +1,78 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2011 Red Hat Inc.</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice shall be included in</div><div class='add'>+ * all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR</div><div class='add'>+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,</div><div class='add'>+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ * OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors: Ben Skeggs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "nouveau_drv.h"</div><div class='add'>+#include "nouveau_util.h"</div><div class='add'>+#include "nouveau_vm.h"</div><div class='add'>+#include "nouveau_ramht.h"</div><div class='add'>+</div><div class='add'>+struct nv98_ppp_engine {</div><div class='add'>+	struct nouveau_exec_engine base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nv98_ppp_fini(struct drm_device *dev, int engine, bool suspend)</div><div class='add'>+{</div><div class='add'>+	if (!(nv_rd32(dev, 0x000200) &amp; 0x00000002))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nv_mask(dev, 0x000200, 0x00000002, 0x00000000);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+nv98_ppp_init(struct drm_device *dev, int engine)</div><div class='add'>+{</div><div class='add'>+	nv_mask(dev, 0x000200, 0x00000002, 0x00000000);</div><div class='add'>+	nv_mask(dev, 0x000200, 0x00000002, 0x00000002);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nv98_ppp_destroy(struct drm_device *dev, int engine)</div><div class='add'>+{</div><div class='add'>+	struct nv98_ppp_engine *pppp = nv_engine(dev, engine);</div><div class='add'>+</div><div class='add'>+	NVOBJ_ENGINE_DEL(dev, PPP);</div><div class='add'>+</div><div class='add'>+	kfree(pppp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nv98_ppp_create(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct nv98_ppp_engine *pppp;</div><div class='add'>+</div><div class='add'>+	pppp = kzalloc(sizeof(*pppp), GFP_KERNEL);</div><div class='add'>+	if (!pppp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pppp-&gt;base.destroy = nv98_ppp_destroy;</div><div class='add'>+	pppp-&gt;base.init = nv98_ppp_init;</div><div class='add'>+	pppp-&gt;base.fini = nv98_ppp_fini;</div><div class='add'>+</div><div class='add'>+	NVOBJ_ENGINE_ADD(dev, PPP, &amp;pppp-&gt;base);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nva3_copy.fuc b/drivers/gpu/drm/nouveau/nva3_copy.fuc<br/>index eaf35f8321ee..abc36626fef0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nva3_copy.fuc?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nva3_copy.fuc</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nva3_copy.fuc?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nva3_copy.fuc</a></div><div class='hunk'>@@ -31,8 +31,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> ifdef(`NVA3',</div><div class='del'>-.section nva3_pcopy_data,</div><div class='del'>-.section nvc0_pcopy_data</div><div class='add'>+.section #nva3_pcopy_data</div><div class='add'>+,</div><div class='add'>+.section #nvc0_pcopy_data</div><div class='ctx'> )</div><div class='ctx'> </div><div class='ctx'> ctx_object:                   .b32 0</div><div class='hunk'>@@ -42,7 +43,7 @@ ctx_dma_query:                .b32 0</div><div class='ctx'> ctx_dma_src:                  .b32 0</div><div class='ctx'> ctx_dma_dst:                  .b32 0</div><div class='ctx'> ,)</div><div class='del'>-.equ ctx_dma_count 3</div><div class='add'>+.equ #ctx_dma_count 3</div><div class='ctx'> ctx_query_address_high:       .b32 0</div><div class='ctx'> ctx_query_address_low:        .b32 0</div><div class='ctx'> ctx_query_counter:            .b32 0</div><div class='hunk'>@@ -78,64 +79,65 @@ ctx_ycnt:                     .b32 0</div><div class='ctx'> dispatch_table:</div><div class='ctx'> // mthd 0x0000, NAME</div><div class='ctx'> .b16 0x000 1</div><div class='del'>-.b32 ctx_object                     ~0xffffffff</div><div class='add'>+.b32 #ctx_object                     ~0xffffffff</div><div class='ctx'> // mthd 0x0100, NOP</div><div class='ctx'> .b16 0x040 1</div><div class='del'>-.b32 0x00010000 + cmd_nop           ~0xffffffff</div><div class='add'>+.b32 0x00010000 + #cmd_nop           ~0xffffffff</div><div class='ctx'> // mthd 0x0140, PM_TRIGGER</div><div class='ctx'> .b16 0x050 1</div><div class='del'>-.b32 0x00010000 + cmd_pm_trigger    ~0xffffffff</div><div class='add'>+.b32 0x00010000 + #cmd_pm_trigger    ~0xffffffff</div><div class='ctx'> ifdef(`NVA3', `</div><div class='ctx'> // mthd 0x0180-0x018c, DMA_</div><div class='del'>-.b16 0x060 ctx_dma_count</div><div class='add'>+.b16 0x060 #ctx_dma_count</div><div class='ctx'> dispatch_dma:</div><div class='del'>-.b32 0x00010000 + cmd_dma           ~0xffffffff</div><div class='del'>-.b32 0x00010000 + cmd_dma           ~0xffffffff</div><div class='del'>-.b32 0x00010000 + cmd_dma           ~0xffffffff</div><div class='add'>+.b32 0x00010000 + #cmd_dma           ~0xffffffff</div><div class='add'>+.b32 0x00010000 + #cmd_dma           ~0xffffffff</div><div class='add'>+.b32 0x00010000 + #cmd_dma           ~0xffffffff</div><div class='ctx'> ',)</div><div class='ctx'> // mthd 0x0200-0x0218, SRC_TILE</div><div class='ctx'> .b16 0x80 7</div><div class='del'>-.b32 ctx_src_tile_mode              ~0x00000fff</div><div class='del'>-.b32 ctx_src_xsize                  ~0x0007ffff</div><div class='del'>-.b32 ctx_src_ysize                  ~0x00001fff</div><div class='del'>-.b32 ctx_src_zsize                  ~0x000007ff</div><div class='del'>-.b32 ctx_src_zoff                   ~0x00000fff</div><div class='del'>-.b32 ctx_src_xoff                   ~0x0007ffff</div><div class='del'>-.b32 ctx_src_yoff                   ~0x00001fff</div><div class='add'>+.b32 #ctx_src_tile_mode              ~0x00000fff</div><div class='add'>+.b32 #ctx_src_xsize                  ~0x0007ffff</div><div class='add'>+.b32 #ctx_src_ysize                  ~0x00001fff</div><div class='add'>+.b32 #ctx_src_zsize                  ~0x000007ff</div><div class='add'>+.b32 #ctx_src_zoff                   ~0x00000fff</div><div class='add'>+.b32 #ctx_src_xoff                   ~0x0007ffff</div><div class='add'>+.b32 #ctx_src_yoff                   ~0x00001fff</div><div class='ctx'> // mthd 0x0220-0x0238, DST_TILE</div><div class='ctx'> .b16 0x88 7</div><div class='del'>-.b32 ctx_dst_tile_mode              ~0x00000fff</div><div class='del'>-.b32 ctx_dst_xsize                  ~0x0007ffff</div><div class='del'>-.b32 ctx_dst_ysize                  ~0x00001fff</div><div class='del'>-.b32 ctx_dst_zsize                  ~0x000007ff</div><div class='del'>-.b32 ctx_dst_zoff                   ~0x00000fff</div><div class='del'>-.b32 ctx_dst_xoff                   ~0x0007ffff</div><div class='del'>-.b32 ctx_dst_yoff                   ~0x00001fff</div><div class='add'>+.b32 #ctx_dst_tile_mode              ~0x00000fff</div><div class='add'>+.b32 #ctx_dst_xsize                  ~0x0007ffff</div><div class='add'>+.b32 #ctx_dst_ysize                  ~0x00001fff</div><div class='add'>+.b32 #ctx_dst_zsize                  ~0x000007ff</div><div class='add'>+.b32 #ctx_dst_zoff                   ~0x00000fff</div><div class='add'>+.b32 #ctx_dst_xoff                   ~0x0007ffff</div><div class='add'>+.b32 #ctx_dst_yoff                   ~0x00001fff</div><div class='ctx'> // mthd 0x0300-0x0304, EXEC, WRCACHE_FLUSH</div><div class='ctx'> .b16 0xc0 2</div><div class='del'>-.b32 0x00010000 + cmd_exec          ~0xffffffff</div><div class='del'>-.b32 0x00010000 + cmd_wrcache_flush ~0xffffffff</div><div class='add'>+.b32 0x00010000 + #cmd_exec          ~0xffffffff</div><div class='add'>+.b32 0x00010000 + #cmd_wrcache_flush ~0xffffffff</div><div class='ctx'> // mthd 0x030c-0x0340, various stuff</div><div class='ctx'> .b16 0xc3 14</div><div class='del'>-.b32 ctx_src_address_high           ~0x000000ff</div><div class='del'>-.b32 ctx_src_address_low            ~0xfffffff0</div><div class='del'>-.b32 ctx_dst_address_high           ~0x000000ff</div><div class='del'>-.b32 ctx_dst_address_low            ~0xfffffff0</div><div class='del'>-.b32 ctx_src_pitch                  ~0x0007ffff</div><div class='del'>-.b32 ctx_dst_pitch                  ~0x0007ffff</div><div class='del'>-.b32 ctx_xcnt                       ~0x0000ffff</div><div class='del'>-.b32 ctx_ycnt                       ~0x00001fff</div><div class='del'>-.b32 ctx_format                     ~0x0333ffff</div><div class='del'>-.b32 ctx_swz_const0                 ~0xffffffff</div><div class='del'>-.b32 ctx_swz_const1                 ~0xffffffff</div><div class='del'>-.b32 ctx_query_address_high         ~0x000000ff</div><div class='del'>-.b32 ctx_query_address_low          ~0xffffffff</div><div class='del'>-.b32 ctx_query_counter              ~0xffffffff</div><div class='add'>+.b32 #ctx_src_address_high           ~0x000000ff</div><div class='add'>+.b32 #ctx_src_address_low            ~0xfffffff0</div><div class='add'>+.b32 #ctx_dst_address_high           ~0x000000ff</div><div class='add'>+.b32 #ctx_dst_address_low            ~0xfffffff0</div><div class='add'>+.b32 #ctx_src_pitch                  ~0x0007ffff</div><div class='add'>+.b32 #ctx_dst_pitch                  ~0x0007ffff</div><div class='add'>+.b32 #ctx_xcnt                       ~0x0000ffff</div><div class='add'>+.b32 #ctx_ycnt                       ~0x00001fff</div><div class='add'>+.b32 #ctx_format                     ~0x0333ffff</div><div class='add'>+.b32 #ctx_swz_const0                 ~0xffffffff</div><div class='add'>+.b32 #ctx_swz_const1                 ~0xffffffff</div><div class='add'>+.b32 #ctx_query_address_high         ~0x000000ff</div><div class='add'>+.b32 #ctx_query_address_low          ~0xffffffff</div><div class='add'>+.b32 #ctx_query_counter              ~0xffffffff</div><div class='ctx'> .b16 0x800 0</div><div class='ctx'> </div><div class='ctx'> ifdef(`NVA3',</div><div class='del'>-.section nva3_pcopy_code,</div><div class='del'>-.section nvc0_pcopy_code</div><div class='add'>+.section #nva3_pcopy_code</div><div class='add'>+,</div><div class='add'>+.section #nvc0_pcopy_code</div><div class='ctx'> )</div><div class='ctx'> </div><div class='ctx'> main:</div><div class='hunk'>@@ -143,12 +145,12 @@ main:</div><div class='ctx'>    mov $sp $r0</div><div class='ctx'> </div><div class='ctx'>    // setup i0 handler and route fifo and ctxswitch to it</div><div class='del'>-   mov $r1 ih</div><div class='add'>+   mov $r1 #ih</div><div class='ctx'>    mov $iv0 $r1</div><div class='ctx'>    mov $r1 0x400</div><div class='ctx'>    movw $r2 0xfff3</div><div class='ctx'>    sethi $r2 0</div><div class='del'>-   iowr I[$r2 + 0x300] $r2</div><div class='add'>+   iowr I[$r1 + 0x300] $r2</div><div class='ctx'> </div><div class='ctx'>    // enable interrupts</div><div class='ctx'>    or $r2 0xc</div><div class='hunk'>@@ -164,19 +166,19 @@ main:</div><div class='ctx'>    bset $flags $p0</div><div class='ctx'>    spin:</div><div class='ctx'>       sleep $p0</div><div class='del'>-      bra spin</div><div class='add'>+      bra #spin</div><div class='ctx'> </div><div class='ctx'> // i0 handler</div><div class='ctx'> ih:</div><div class='ctx'>    iord $r1 I[$r0 + 0x200]</div><div class='ctx'> </div><div class='ctx'>    and $r2 $r1 0x00000008</div><div class='del'>-   bra e ih_no_chsw</div><div class='del'>-      call chsw</div><div class='add'>+   bra e #ih_no_chsw</div><div class='add'>+      call #chsw</div><div class='ctx'>    ih_no_chsw:</div><div class='ctx'>    and $r2 $r1 0x00000004</div><div class='del'>-   bra e ih_no_cmd</div><div class='del'>-      call dispatch</div><div class='add'>+   bra e #ih_no_cmd</div><div class='add'>+      call #dispatch</div><div class='ctx'> </div><div class='ctx'>    ih_no_cmd:</div><div class='ctx'>    and $r1 $r1 0x0000000c</div><div class='hunk'>@@ -235,9 +237,9 @@ ifdef(`NVA3', `</div><div class='ctx'>    sethi $r4 0x60000</div><div class='ctx'> </div><div class='ctx'>    // swap!</div><div class='del'>-   bra $p1 swctx_load</div><div class='add'>+   bra $p1 #swctx_load</div><div class='ctx'>       xdst $r0 $r4</div><div class='del'>-      bra swctx_done</div><div class='add'>+      bra #swctx_done</div><div class='ctx'>    swctx_load:</div><div class='ctx'>       xdld $r0 $r4</div><div class='ctx'>    swctx_done:</div><div class='hunk'>@@ -251,9 +253,9 @@ chsw:</div><div class='ctx'> </div><div class='ctx'>    // if it's active, unload it and return</div><div class='ctx'>    xbit $r15 $r3 0x1e</div><div class='del'>-   bra e chsw_no_unload</div><div class='add'>+   bra e #chsw_no_unload</div><div class='ctx'>       bclr $flags $p1</div><div class='del'>-      call swctx</div><div class='add'>+      call #swctx</div><div class='ctx'>       bclr $r3 0x1e</div><div class='ctx'>       iowr I[$r2] $r3</div><div class='ctx'>       mov $r4 1</div><div class='hunk'>@@ -266,20 +268,20 @@ chsw:</div><div class='ctx'> </div><div class='ctx'>    // is there a channel waiting to be loaded?</div><div class='ctx'>    xbit $r13 $r3 0x1e</div><div class='del'>-   bra e chsw_finish_load</div><div class='add'>+   bra e #chsw_finish_load</div><div class='ctx'>       bset $flags $p1</div><div class='del'>-      call swctx</div><div class='add'>+      call #swctx</div><div class='ctx'> ifdef(`NVA3',</div><div class='ctx'>       // load dma objects back into TARGET regs</div><div class='del'>-      mov $r5 ctx_dma</div><div class='del'>-      mov $r6 ctx_dma_count</div><div class='add'>+      mov $r5 #ctx_dma</div><div class='add'>+      mov $r6 #ctx_dma_count</div><div class='ctx'>       chsw_load_ctx_dma:</div><div class='ctx'>          ld b32 $r7 D[$r5 + $r6 * 4]</div><div class='ctx'>          add b32 $r8 $r6 0x180</div><div class='ctx'>          shl b32 $r8 8</div><div class='ctx'>          iowr I[$r8] $r7</div><div class='ctx'>          sub b32 $r6 1</div><div class='del'>-         bra nc chsw_load_ctx_dma</div><div class='add'>+         bra nc #chsw_load_ctx_dma</div><div class='ctx'> ,)</div><div class='ctx'> </div><div class='ctx'>    chsw_finish_load:</div><div class='hunk'>@@ -297,7 +299,7 @@ dispatch:</div><div class='ctx'>    shl b32 $r2 0x10</div><div class='ctx'> </div><div class='ctx'>    // lookup method in the dispatch table, ILLEGAL_MTHD if not found</div><div class='del'>-   mov $r5 dispatch_table</div><div class='add'>+   mov $r5 #dispatch_table</div><div class='ctx'>    clear b32 $r6</div><div class='ctx'>    clear b32 $r7</div><div class='ctx'>    dispatch_loop:</div><div class='hunk'>@@ -305,14 +307,14 @@ dispatch:</div><div class='ctx'>       ld b16 $r7 D[$r5 + 2]</div><div class='ctx'>       add b32 $r5 4</div><div class='ctx'>       cmpu b32 $r4 $r6</div><div class='del'>-      bra c dispatch_illegal_mthd</div><div class='add'>+      bra c #dispatch_illegal_mthd</div><div class='ctx'>       add b32 $r7 $r6</div><div class='ctx'>       cmpu b32 $r4 $r7</div><div class='del'>-      bra c dispatch_valid_mthd</div><div class='add'>+      bra c #dispatch_valid_mthd</div><div class='ctx'>       sub b32 $r7 $r6</div><div class='ctx'>       shl b32 $r7 3</div><div class='ctx'>       add b32 $r5 $r7</div><div class='del'>-      bra dispatch_loop</div><div class='add'>+      bra #dispatch_loop</div><div class='ctx'> </div><div class='ctx'>    // ensure no bits set in reserved fields, INVALID_BITFIELD</div><div class='ctx'>    dispatch_valid_mthd:</div><div class='hunk'>@@ -322,20 +324,20 @@ dispatch:</div><div class='ctx'>    ld b32 $r5 D[$r4 + 4]</div><div class='ctx'>    and $r5 $r3</div><div class='ctx'>    cmpu b32 $r5 0</div><div class='del'>-   bra ne dispatch_invalid_bitfield</div><div class='add'>+   bra ne #dispatch_invalid_bitfield</div><div class='ctx'> </div><div class='ctx'>    // depending on dispatch flags: execute method, or save data as state</div><div class='ctx'>    ld b16 $r5 D[$r4 + 0]</div><div class='ctx'>    ld b16 $r6 D[$r4 + 2]</div><div class='ctx'>    cmpu b32 $r6 0</div><div class='del'>-   bra ne dispatch_cmd</div><div class='add'>+   bra ne #dispatch_cmd</div><div class='ctx'>       st b32 D[$r5] $r3</div><div class='del'>-      bra dispatch_done</div><div class='add'>+      bra #dispatch_done</div><div class='ctx'>    dispatch_cmd:</div><div class='ctx'>       bclr $flags $p1</div><div class='ctx'>       call $r5</div><div class='del'>-      bra $p1 dispatch_error</div><div class='del'>-      bra dispatch_done</div><div class='add'>+      bra $p1 #dispatch_error</div><div class='add'>+      bra #dispatch_done</div><div class='ctx'> </div><div class='ctx'>    dispatch_invalid_bitfield:</div><div class='ctx'>    or $r2 2</div><div class='hunk'>@@ -353,7 +355,7 @@ dispatch:</div><div class='ctx'>       iord $r2 I[$r0 + 0x200]</div><div class='ctx'>       and $r2 0x40</div><div class='ctx'>       cmpu b32 $r2 0</div><div class='del'>-      bra ne hostirq_wait</div><div class='add'>+      bra ne #hostirq_wait</div><div class='ctx'> </div><div class='ctx'>    dispatch_done:</div><div class='ctx'>    mov $r2 0x1d00</div><div class='hunk'>@@ -409,10 +411,10 @@ ifdef(`NVA3',</div><div class='ctx'> //       $r2: hostirq state</div><div class='ctx'> //       $r3: data</div><div class='ctx'> cmd_dma:</div><div class='del'>-   sub b32 $r4 dispatch_dma</div><div class='add'>+   sub b32 $r4 #dispatch_dma</div><div class='ctx'>    shr b32 $r4 1</div><div class='ctx'>    bset $r3 0x1e</div><div class='del'>-   st b32 D[$r4 + ctx_dma] $r3</div><div class='add'>+   st b32 D[$r4 + #ctx_dma] $r3</div><div class='ctx'>    add b32 $r4 0x600</div><div class='ctx'>    shl b32 $r4 6</div><div class='ctx'>    iowr I[$r4] $r3</div><div class='hunk'>@@ -430,7 +432,7 @@ cmd_exec_set_format:</div><div class='ctx'>    st b32 D[$sp + 0x0c] $r0</div><div class='ctx'> </div><div class='ctx'>    // extract cpp, src_ncomp and dst_ncomp from FORMAT</div><div class='del'>-   ld b32 $r4 D[$r0 + ctx_format]</div><div class='add'>+   ld b32 $r4 D[$r0 + #ctx_format]</div><div class='ctx'>    extr $r5 $r4 16:17</div><div class='ctx'>    add b32 $r5 1</div><div class='ctx'>    extr $r6 $r4 20:21</div><div class='hunk'>@@ -448,22 +450,22 @@ cmd_exec_set_format:</div><div class='ctx'>       clear b32 $r11</div><div class='ctx'>       bpc_loop:</div><div class='ctx'>          cmpu b8 $r10 4</div><div class='del'>-         bra nc cmp_c0</div><div class='add'>+         bra nc #cmp_c0</div><div class='ctx'>             mulu $r12 $r10 $r5</div><div class='ctx'>             add b32 $r12 $r11</div><div class='ctx'>             bset $flags $p2</div><div class='del'>-            bra bpc_next</div><div class='add'>+            bra #bpc_next</div><div class='ctx'>          cmp_c0:</div><div class='del'>-         bra ne cmp_c1</div><div class='add'>+         bra ne #cmp_c1</div><div class='ctx'>             mov $r12 0x10</div><div class='ctx'>             add b32 $r12 $r11</div><div class='del'>-            bra bpc_next</div><div class='add'>+            bra #bpc_next</div><div class='ctx'>          cmp_c1:</div><div class='ctx'>          cmpu b8 $r10 6</div><div class='del'>-         bra nc cmp_zero</div><div class='add'>+         bra nc #cmp_zero</div><div class='ctx'>             mov $r12 0x14</div><div class='ctx'>             add b32 $r12 $r11</div><div class='del'>-            bra bpc_next</div><div class='add'>+            bra #bpc_next</div><div class='ctx'>          cmp_zero:</div><div class='ctx'>             mov $r12 0x80</div><div class='ctx'>          bpc_next:</div><div class='hunk'>@@ -471,22 +473,22 @@ cmd_exec_set_format:</div><div class='ctx'>          add b32 $r8 1</div><div class='ctx'>          add b32 $r11 1</div><div class='ctx'>          cmpu b32 $r11 $r5</div><div class='del'>-         bra c bpc_loop</div><div class='add'>+         bra c #bpc_loop</div><div class='ctx'>       add b32 $r9 1</div><div class='ctx'>       cmpu b32 $r9 $r7</div><div class='del'>-      bra c ncomp_loop</div><div class='add'>+      bra c #ncomp_loop</div><div class='ctx'> </div><div class='ctx'>    // SRC_XCNT = (xcnt * src_cpp), or 0 if no src ref in swz (hw will hang)</div><div class='ctx'>    mulu $r6 $r5</div><div class='del'>-   st b32 D[$r0 + ctx_src_cpp] $r6</div><div class='del'>-   ld b32 $r8 D[$r0 + ctx_xcnt]</div><div class='add'>+   st b32 D[$r0 + #ctx_src_cpp] $r6</div><div class='add'>+   ld b32 $r8 D[$r0 + #ctx_xcnt]</div><div class='ctx'>    mulu $r6 $r8</div><div class='del'>-   bra $p2 dst_xcnt</div><div class='add'>+   bra $p2 #dst_xcnt</div><div class='ctx'>    clear b32 $r6</div><div class='ctx'> </div><div class='ctx'>    dst_xcnt:</div><div class='ctx'>    mulu $r7 $r5</div><div class='del'>-   st b32 D[$r0 + ctx_dst_cpp] $r7</div><div class='add'>+   st b32 D[$r0 + #ctx_dst_cpp] $r7</div><div class='ctx'>    mulu $r7 $r8</div><div class='ctx'> </div><div class='ctx'>    mov $r5 0x810</div><div class='hunk'>@@ -494,10 +496,10 @@ cmd_exec_set_format:</div><div class='ctx'>    iowr I[$r5 + 0x000] $r6</div><div class='ctx'>    iowr I[$r5 + 0x100] $r7</div><div class='ctx'>    add b32 $r5 0x800</div><div class='del'>-   ld b32 $r6 D[$r0 + ctx_dst_cpp]</div><div class='add'>+   ld b32 $r6 D[$r0 + #ctx_dst_cpp]</div><div class='ctx'>    sub b32 $r6 1</div><div class='ctx'>    shl b32 $r6 8</div><div class='del'>-   ld b32 $r7 D[$r0 + ctx_src_cpp]</div><div class='add'>+   ld b32 $r7 D[$r0 + #ctx_src_cpp]</div><div class='ctx'>    sub b32 $r7 1</div><div class='ctx'>    or $r6 $r7</div><div class='ctx'>    iowr I[$r5 + 0x000] $r6</div><div class='hunk'>@@ -511,9 +513,9 @@ cmd_exec_set_format:</div><div class='ctx'>    ld b32 $r6 D[$sp + 0x0c]</div><div class='ctx'>    iowr I[$r5 + 0x300] $r6</div><div class='ctx'>    add b32 $r5 0x400</div><div class='del'>-   ld b32 $r6 D[$r0 + ctx_swz_const0]</div><div class='add'>+   ld b32 $r6 D[$r0 + #ctx_swz_const0]</div><div class='ctx'>    iowr I[$r5 + 0x000] $r6</div><div class='del'>-   ld b32 $r6 D[$r0 + ctx_swz_const1]</div><div class='add'>+   ld b32 $r6 D[$r0 + #ctx_swz_const1]</div><div class='ctx'>    iowr I[$r5 + 0x100] $r6</div><div class='ctx'>    add $sp 0x10</div><div class='ctx'>    ret</div><div class='hunk'>@@ -543,7 +545,7 @@ cmd_exec_set_format:</div><div class='ctx'> //</div><div class='ctx'> cmd_exec_set_surface_tiled:</div><div class='ctx'>    // translate TILE_MODE into Tp, Th, Td shift values</div><div class='del'>-   ld b32 $r7 D[$r5 + ctx_src_tile_mode]</div><div class='add'>+   ld b32 $r7 D[$r5 + #ctx_src_tile_mode]</div><div class='ctx'>    extr $r9 $r7 8:11</div><div class='ctx'>    extr $r8 $r7 4:7</div><div class='ctx'> ifdef(`NVA3',</div><div class='hunk'>@@ -553,9 +555,9 @@ ifdef(`NVA3',</div><div class='ctx'> )</div><div class='ctx'>    extr $r7 $r7 0:3</div><div class='ctx'>    cmp b32 $r7 0xe</div><div class='del'>-   bra ne xtile64</div><div class='add'>+   bra ne #xtile64</div><div class='ctx'>    mov $r7 4</div><div class='del'>-   bra xtileok</div><div class='add'>+   bra #xtileok</div><div class='ctx'>    xtile64:</div><div class='ctx'>    xbit $r7 $flags $p2</div><div class='ctx'>    add b32 $r7 17</div><div class='hunk'>@@ -565,8 +567,8 @@ ifdef(`NVA3',</div><div class='ctx'> </div><div class='ctx'>    // Op = (x * cpp) &amp; ((1 &lt;&lt; Tp) - 1)</div><div class='ctx'>    // Tx = (x * cpp) &gt;&gt; Tp</div><div class='del'>-   ld b32 $r10 D[$r5 + ctx_src_xoff]</div><div class='del'>-   ld b32 $r11 D[$r5 + ctx_src_cpp]</div><div class='add'>+   ld b32 $r10 D[$r5 + #ctx_src_xoff]</div><div class='add'>+   ld b32 $r11 D[$r5 + #ctx_src_cpp]</div><div class='ctx'>    mulu $r10 $r11</div><div class='ctx'>    mov $r11 1</div><div class='ctx'>    shl b32 $r11 $r7</div><div class='hunk'>@@ -576,7 +578,7 @@ ifdef(`NVA3',</div><div class='ctx'> </div><div class='ctx'>    // Tyo = y &amp; ((1 &lt;&lt; Th) - 1)</div><div class='ctx'>    // Ty  = y &gt;&gt; Th</div><div class='del'>-   ld b32 $r13 D[$r5 + ctx_src_yoff]</div><div class='add'>+   ld b32 $r13 D[$r5 + #ctx_src_yoff]</div><div class='ctx'>    mov $r14 1</div><div class='ctx'>    shl b32 $r14 $r8</div><div class='ctx'>    sub b32 $r14 1</div><div class='hunk'>@@ -598,8 +600,8 @@ ifdef(`NVA3',</div><div class='ctx'>    add b32 $r12 $r11</div><div class='ctx'> </div><div class='ctx'>    // nTx = ((w * cpp) + ((1 &lt;&lt; Tp) - 1) &gt;&gt; Tp)</div><div class='del'>-   ld b32 $r15 D[$r5 + ctx_src_xsize]</div><div class='del'>-   ld b32 $r11 D[$r5 + ctx_src_cpp]</div><div class='add'>+   ld b32 $r15 D[$r5 + #ctx_src_xsize]</div><div class='add'>+   ld b32 $r11 D[$r5 + #ctx_src_cpp]</div><div class='ctx'>    mulu $r15 $r11</div><div class='ctx'>    mov $r11 1</div><div class='ctx'>    shl b32 $r11 $r7</div><div class='hunk'>@@ -609,7 +611,7 @@ ifdef(`NVA3',</div><div class='ctx'>    push $r15</div><div class='ctx'> </div><div class='ctx'>    // nTy = (h + ((1 &lt;&lt; Th) - 1)) &gt;&gt; Th</div><div class='del'>-   ld b32 $r15 D[$r5 + ctx_src_ysize]</div><div class='add'>+   ld b32 $r15 D[$r5 + #ctx_src_ysize]</div><div class='ctx'>    mov $r11 1</div><div class='ctx'>    shl b32 $r11 $r8</div><div class='ctx'>    sub b32 $r11 1</div><div class='hunk'>@@ -629,7 +631,7 @@ ifdef(`NVA3',</div><div class='ctx'>    // Tz  = z &gt;&gt; Td</div><div class='ctx'>    // Op += Tzo &lt;&lt; Tys</div><div class='ctx'>    // Ts  = Tys + Td</div><div class='del'>-   ld b32 $r8 D[$r5 + ctx_src_zoff]</div><div class='add'>+   ld b32 $r8 D[$r5 + #ctx_src_zoff]</div><div class='ctx'>    mov $r14 1</div><div class='ctx'>    shl b32 $r14 $r9</div><div class='ctx'>    sub b32 $r14 1</div><div class='hunk'>@@ -656,8 +658,8 @@ ifdef(`NVA3',</div><div class='ctx'> </div><div class='ctx'>    // SRC_ADDRESS_LOW   = (Ot + Op) &amp; 0xffffffff</div><div class='ctx'>    // CFG_ADDRESS_HIGH |= ((Ot + Op) &gt;&gt; 32) &lt;&lt; 16</div><div class='del'>-   ld b32 $r7 D[$r5 + ctx_src_address_low]</div><div class='del'>-   ld b32 $r8 D[$r5 + ctx_src_address_high]</div><div class='add'>+   ld b32 $r7 D[$r5 + #ctx_src_address_low]</div><div class='add'>+   ld b32 $r8 D[$r5 + #ctx_src_address_high]</div><div class='ctx'>    add b32 $r10 $r12</div><div class='ctx'>    add b32 $r7 $r10</div><div class='ctx'>    adc b32 $r8 0</div><div class='hunk'>@@ -677,14 +679,14 @@ cmd_exec_set_surface_linear:</div><div class='ctx'>    xbit $r6 $flags $p2</div><div class='ctx'>    add b32 $r6 0x202</div><div class='ctx'>    shl b32 $r6 8</div><div class='del'>-   ld b32 $r7 D[$r5 + ctx_src_address_low]</div><div class='add'>+   ld b32 $r7 D[$r5 + #ctx_src_address_low]</div><div class='ctx'>    iowr I[$r6 + 0x000] $r7</div><div class='ctx'>    add b32 $r6 0x400</div><div class='del'>-   ld b32 $r7 D[$r5 + ctx_src_address_high]</div><div class='add'>+   ld b32 $r7 D[$r5 + #ctx_src_address_high]</div><div class='ctx'>    shl b32 $r7 16</div><div class='ctx'>    iowr I[$r6 + 0x000] $r7</div><div class='ctx'>    add b32 $r6 0x400</div><div class='del'>-   ld b32 $r7 D[$r5 + ctx_src_pitch]</div><div class='add'>+   ld b32 $r7 D[$r5 + #ctx_src_pitch]</div><div class='ctx'>    iowr I[$r6 + 0x000] $r7</div><div class='ctx'>    ret</div><div class='ctx'> </div><div class='hunk'>@@ -697,7 +699,7 @@ cmd_exec_wait:</div><div class='ctx'>    loop:</div><div class='ctx'>       iord $r1 I[$r0]</div><div class='ctx'>       and $r1 1</div><div class='del'>-      bra ne loop</div><div class='add'>+      bra ne #loop</div><div class='ctx'>    pop $r1</div><div class='ctx'>    pop $r0</div><div class='ctx'>    ret</div><div class='hunk'>@@ -705,18 +707,18 @@ cmd_exec_wait:</div><div class='ctx'> cmd_exec_query:</div><div class='ctx'>    // if QUERY_SHORT not set, write out { -, 0, TIME_LO, TIME_HI }</div><div class='ctx'>    xbit $r4 $r3 13</div><div class='del'>-   bra ne query_counter</div><div class='del'>-      call cmd_exec_wait</div><div class='add'>+   bra ne #query_counter</div><div class='add'>+      call #cmd_exec_wait</div><div class='ctx'>       mov $r4 0x80c</div><div class='ctx'>       shl b32 $r4 6</div><div class='del'>-      ld b32 $r5 D[$r0 + ctx_query_address_low]</div><div class='add'>+      ld b32 $r5 D[$r0 + #ctx_query_address_low]</div><div class='ctx'>       add b32 $r5 4</div><div class='ctx'>       iowr I[$r4 + 0x000] $r5</div><div class='ctx'>       iowr I[$r4 + 0x100] $r0</div><div class='ctx'>       mov $r5 0xc</div><div class='ctx'>       iowr I[$r4 + 0x200] $r5</div><div class='ctx'>       add b32 $r4 0x400</div><div class='del'>-      ld b32 $r5 D[$r0 + ctx_query_address_high]</div><div class='add'>+      ld b32 $r5 D[$r0 + #ctx_query_address_high]</div><div class='ctx'>       shl b32 $r5 16</div><div class='ctx'>       iowr I[$r4 + 0x000] $r5</div><div class='ctx'>       add b32 $r4 0x500</div><div class='hunk'>@@ -741,16 +743,16 @@ cmd_exec_query:</div><div class='ctx'> </div><div class='ctx'>    // write COUNTER</div><div class='ctx'>    query_counter:</div><div class='del'>-   call cmd_exec_wait</div><div class='add'>+   call #cmd_exec_wait</div><div class='ctx'>    mov $r4 0x80c</div><div class='ctx'>    shl b32 $r4 6</div><div class='del'>-   ld b32 $r5 D[$r0 + ctx_query_address_low]</div><div class='add'>+   ld b32 $r5 D[$r0 + #ctx_query_address_low]</div><div class='ctx'>    iowr I[$r4 + 0x000] $r5</div><div class='ctx'>    iowr I[$r4 + 0x100] $r0</div><div class='ctx'>    mov $r5 0x4</div><div class='ctx'>    iowr I[$r4 + 0x200] $r5</div><div class='ctx'>    add b32 $r4 0x400</div><div class='del'>-   ld b32 $r5 D[$r0 + ctx_query_address_high]</div><div class='add'>+   ld b32 $r5 D[$r0 + #ctx_query_address_high]</div><div class='ctx'>    shl b32 $r5 16</div><div class='ctx'>    iowr I[$r4 + 0x000] $r5</div><div class='ctx'>    add b32 $r4 0x500</div><div class='hunk'>@@ -759,7 +761,7 @@ cmd_exec_query:</div><div class='ctx'>    mov $r5 0x00001110</div><div class='ctx'>    sethi $r5 0x13120000</div><div class='ctx'>    iowr I[$r4 + 0x100] $r5</div><div class='del'>-   ld b32 $r5 D[$r0 + ctx_query_counter]</div><div class='add'>+   ld b32 $r5 D[$r0 + #ctx_query_counter]</div><div class='ctx'>    add b32 $r4 0x500</div><div class='ctx'>    iowr I[$r4 + 0x000] $r5</div><div class='ctx'>    mov $r5 0x00002601</div><div class='hunk'>@@ -787,22 +789,22 @@ cmd_exec_query:</div><div class='ctx'> //       $r2: hostirq state</div><div class='ctx'> //       $r3: data</div><div class='ctx'> cmd_exec:</div><div class='del'>-   call cmd_exec_wait</div><div class='add'>+   call #cmd_exec_wait</div><div class='ctx'> </div><div class='ctx'>    // if format requested, call function to calculate it, otherwise</div><div class='ctx'>    // fill in cpp/xcnt for both surfaces as if (cpp == 1)</div><div class='ctx'>    xbit $r15 $r3 0</div><div class='del'>-   bra e cmd_exec_no_format</div><div class='del'>-      call cmd_exec_set_format</div><div class='add'>+   bra e #cmd_exec_no_format</div><div class='add'>+      call #cmd_exec_set_format</div><div class='ctx'>       mov $r4 0x200</div><div class='del'>-      bra cmd_exec_init_src_surface</div><div class='add'>+      bra #cmd_exec_init_src_surface</div><div class='ctx'>    cmd_exec_no_format:</div><div class='ctx'>       mov $r6 0x810</div><div class='ctx'>       shl b32 $r6 6</div><div class='ctx'>       mov $r7 1</div><div class='del'>-      st b32 D[$r0 + ctx_src_cpp] $r7</div><div class='del'>-      st b32 D[$r0 + ctx_dst_cpp] $r7</div><div class='del'>-      ld b32 $r7 D[$r0 + ctx_xcnt]</div><div class='add'>+      st b32 D[$r0 + #ctx_src_cpp] $r7</div><div class='add'>+      st b32 D[$r0 + #ctx_dst_cpp] $r7</div><div class='add'>+      ld b32 $r7 D[$r0 + #ctx_xcnt]</div><div class='ctx'>       iowr I[$r6 + 0x000] $r7</div><div class='ctx'>       iowr I[$r6 + 0x100] $r7</div><div class='ctx'>       clear b32 $r4</div><div class='hunk'>@@ -811,28 +813,28 @@ cmd_exec:</div><div class='ctx'>    bclr $flags $p2</div><div class='ctx'>    clear b32 $r5</div><div class='ctx'>    xbit $r15 $r3 4</div><div class='del'>-   bra e src_tiled</div><div class='del'>-      call cmd_exec_set_surface_linear</div><div class='del'>-      bra cmd_exec_init_dst_surface</div><div class='add'>+   bra e #src_tiled</div><div class='add'>+      call #cmd_exec_set_surface_linear</div><div class='add'>+      bra #cmd_exec_init_dst_surface</div><div class='ctx'>    src_tiled:</div><div class='del'>-      call cmd_exec_set_surface_tiled</div><div class='add'>+      call #cmd_exec_set_surface_tiled</div><div class='ctx'>       bset $r4 7</div><div class='ctx'> </div><div class='ctx'>    cmd_exec_init_dst_surface:</div><div class='ctx'>    bset $flags $p2</div><div class='del'>-   mov $r5 ctx_dst_address_high - ctx_src_address_high</div><div class='add'>+   mov $r5 #ctx_dst_address_high - #ctx_src_address_high</div><div class='ctx'>    xbit $r15 $r3 8</div><div class='del'>-   bra e dst_tiled</div><div class='del'>-      call cmd_exec_set_surface_linear</div><div class='del'>-      bra cmd_exec_kick</div><div class='add'>+   bra e #dst_tiled</div><div class='add'>+      call #cmd_exec_set_surface_linear</div><div class='add'>+      bra #cmd_exec_kick</div><div class='ctx'>    dst_tiled:</div><div class='del'>-      call cmd_exec_set_surface_tiled</div><div class='add'>+      call #cmd_exec_set_surface_tiled</div><div class='ctx'>       bset $r4 8</div><div class='ctx'> </div><div class='ctx'>    cmd_exec_kick:</div><div class='ctx'>    mov $r5 0x800</div><div class='ctx'>    shl b32 $r5 6</div><div class='del'>-   ld b32 $r6 D[$r0 + ctx_ycnt]</div><div class='add'>+   ld b32 $r6 D[$r0 + #ctx_ycnt]</div><div class='ctx'>    iowr I[$r5 + 0x100] $r6</div><div class='ctx'>    mov $r6 0x0041</div><div class='ctx'>    // SRC_TARGET = 1, DST_TARGET = 2</div><div class='hunk'>@@ -842,8 +844,8 @@ cmd_exec:</div><div class='ctx'> </div><div class='ctx'>    // if requested, queue up a QUERY write after the copy has completed</div><div class='ctx'>    xbit $r15 $r3 12</div><div class='del'>-   bra e cmd_exec_done</div><div class='del'>-      call cmd_exec_query</div><div class='add'>+   bra e #cmd_exec_done</div><div class='add'>+      call #cmd_exec_query</div><div class='ctx'> </div><div class='ctx'>    cmd_exec_done:</div><div class='ctx'>    ret</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nva3_copy.fuc.h b/drivers/gpu/drm/nouveau/nva3_copy.fuc.h<br/>index 2731de22ebe9..1f33fbdc00be 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nva3_copy.fuc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nva3_copy.fuc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nva3_copy.fuc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nva3_copy.fuc.h</a></div><div class='hunk'>@@ -152,7 +152,7 @@ uint32_t nva3_pcopy_code[] = {</div><div class='ctx'> 	0xf10010fe,</div><div class='ctx'> 	0xf1040017,</div><div class='ctx'> 	0xf0fff327,</div><div class='del'>-	0x22d00023,</div><div class='add'>+	0x12d00023,</div><div class='ctx'> 	0x0c25f0c0,</div><div class='ctx'> 	0xf40012d0,</div><div class='ctx'> 	0x17f11031,</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nva3_pm.c b/drivers/gpu/drm/nouveau/nva3_pm.c<br/>index 618c144b7a30..9e636e6ef6d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nva3_pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nva3_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nva3_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nva3_pm.c</a></div><div class='hunk'>@@ -287,12 +287,13 @@ nva3_pm_grcp_idle(void *data)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='add'>+int</div><div class='ctx'> nva3_pm_clocks_set(struct drm_device *dev, void *pre_state)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	struct nva3_pm_state *info = pre_state;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	int ret = -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	/* prevent any new grctx switches from starting */</div><div class='ctx'> 	spin_lock_irqsave(&amp;dev_priv-&gt;context_switch_lock, flags);</div><div class='hunk'>@@ -328,6 +329,8 @@ nva3_pm_clocks_set(struct drm_device *dev, void *pre_state)</div><div class='ctx'> 		nv_wr32(dev, 0x100210, 0x80000000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='ctx'> cleanup:</div><div class='ctx'> 	/* unfreeze PFIFO */</div><div class='ctx'> 	nv_mask(dev, 0x002504, 0x00000001, 0x00000000);</div><div class='hunk'>@@ -339,4 +342,5 @@ cleanup:</div><div class='ctx'> 		nv_mask(dev, 0x400824, 0x10000000, 0x10000000);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;dev_priv-&gt;context_switch_lock, flags);</div><div class='ctx'> 	kfree(info);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvc0_copy.fuc.h b/drivers/gpu/drm/nouveau/nvc0_copy.fuc.h<br/>index 419903880e9d..a8d17458ced1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_copy.fuc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_copy.fuc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_copy.fuc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nvc0_copy.fuc.h</a></div><div class='hunk'>@@ -145,7 +145,7 @@ uint32_t nvc0_pcopy_code[] = {</div><div class='ctx'> 	0xf10010fe,</div><div class='ctx'> 	0xf1040017,</div><div class='ctx'> 	0xf0fff327,</div><div class='del'>-	0x22d00023,</div><div class='add'>+	0x12d00023,</div><div class='ctx'> 	0x0c25f0c0,</div><div class='ctx'> 	0xf40012d0,</div><div class='ctx'> 	0x17f11031,</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.c b/drivers/gpu/drm/nouveau/nvc0_graph.c<br/>index ecfafd70cf0e..8ee3963f9030 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_graph.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_graph.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_graph.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nvc0_graph.c</a></div><div class='hunk'>@@ -875,14 +875,16 @@ nvc0_graph_create(struct drm_device *dev)</div><div class='ctx'> 	case 0xcf: /* 4/0/0/0, 3 */</div><div class='ctx'> 		priv-&gt;magic_not_rop_nr = 0x03;</div><div class='ctx'> 		break;</div><div class='add'>+	case 0xd9: /* 1/0/0/0, 1 */</div><div class='add'>+		priv-&gt;magic_not_rop_nr = 0x01;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!priv-&gt;magic_not_rop_nr) {</div><div class='ctx'> 		NV_ERROR(dev, "PGRAPH: unknown config: %d/%d/%d/%d, %d\n",</div><div class='ctx'> 			 priv-&gt;tp_nr[0], priv-&gt;tp_nr[1], priv-&gt;tp_nr[2],</div><div class='ctx'> 			 priv-&gt;tp_nr[3], priv-&gt;rop_nr);</div><div class='del'>-		/* use 0xc3's values... */</div><div class='del'>-		priv-&gt;magic_not_rop_nr = 0x03;</div><div class='add'>+		priv-&gt;magic_not_rop_nr = 0x00;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	NVOBJ_CLASS(dev, 0x902d, GR); /* 2D */</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.fuc b/drivers/gpu/drm/nouveau/nvc0_graph.fuc<br/>index 2a4b6dc8f9de..e6b228844a32 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_graph.fuc?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_graph.fuc</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_graph.fuc?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nvc0_graph.fuc</a></div><div class='hunk'>@@ -71,9 +71,9 @@ queue_put:</div><div class='ctx'> 	ld b32 $r9 D[$r13 + 0x4]	// PUT</div><div class='ctx'> 	xor $r8 8</div><div class='ctx'> 	cmpu b32 $r8 $r9</div><div class='del'>-	bra ne queue_put_next</div><div class='add'>+	bra ne #queue_put_next</div><div class='ctx'> 		mov $r15 E_CMD_OVERFLOW</div><div class='del'>-		call error</div><div class='add'>+		call #error</div><div class='ctx'> 		ret</div><div class='ctx'> </div><div class='ctx'> 	// store cmd/data on queue</div><div class='hunk'>@@ -104,7 +104,7 @@ queue_get:</div><div class='ctx'> 	ld b32 $r8 D[$r13 + 0x0]	// GET</div><div class='ctx'> 	ld b32 $r9 D[$r13 + 0x4]	// PUT</div><div class='ctx'> 	cmpu b32 $r8 $r9</div><div class='del'>-	bra e queue_get_done</div><div class='add'>+	bra e #queue_get_done</div><div class='ctx'> 		// fetch first cmd/data pair</div><div class='ctx'> 		and $r9 $r8 7</div><div class='ctx'> 		shl b32 $r9 3</div><div class='hunk'>@@ -135,9 +135,9 @@ nv_rd32:</div><div class='ctx'> 	nv_rd32_wait:</div><div class='ctx'> 		iord $r12 I[$r11 + 0x000]</div><div class='ctx'> 		xbit $r12 $r12 31</div><div class='del'>-		bra ne nv_rd32_wait</div><div class='add'>+		bra ne #nv_rd32_wait</div><div class='ctx'> 	mov $r10 6			// DONE_MMIO_RD</div><div class='del'>-	call wait_doneo</div><div class='add'>+	call #wait_doneo</div><div class='ctx'> 	iord $r15 I[$r11 + 0x100]	// MMIO_RDVAL</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='hunk'>@@ -157,7 +157,7 @@ nv_wr32:</div><div class='ctx'> 	nv_wr32_wait:</div><div class='ctx'> 		iord $r12 I[$r11 + 0x000]</div><div class='ctx'> 		xbit $r12 $r12 31</div><div class='del'>-		bra ne nv_wr32_wait</div><div class='add'>+		bra ne #nv_wr32_wait</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='ctx'> // (re)set watchdog timer</div><div class='hunk'>@@ -193,7 +193,7 @@ $1:</div><div class='ctx'> 		shl b32 $r8 6</div><div class='ctx'> 		iord $r8 I[$r8 + 0x000]	// DONE</div><div class='ctx'> 		xbit $r8 $r8 $r10</div><div class='del'>-		bra $2 wait_done_$1</div><div class='add'>+		bra $2 #wait_done_$1</div><div class='ctx'> 	trace_clr(T_WAIT)</div><div class='ctx'> 	ret</div><div class='ctx'> ')</div><div class='hunk'>@@ -216,7 +216,7 @@ mmctx_size:</div><div class='ctx'> 		add b32 $r9 $r8</div><div class='ctx'> 		add b32 $r14 4</div><div class='ctx'> 		cmpu b32 $r14 $r15</div><div class='del'>-		bra ne nv_mmctx_size_loop</div><div class='add'>+		bra ne #nv_mmctx_size_loop</div><div class='ctx'> 	mov b32 $r15 $r9</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='hunk'>@@ -238,12 +238,12 @@ mmctx_xfer:</div><div class='ctx'> 	shl b32 $r8 6</div><div class='ctx'> 	clear b32 $r9</div><div class='ctx'> 	or $r11 $r11</div><div class='del'>-	bra e mmctx_base_disabled</div><div class='add'>+	bra e #mmctx_base_disabled</div><div class='ctx'> 		iowr I[$r8 + 0x000] $r11	// MMCTX_BASE</div><div class='ctx'> 		bset $r9 0			// BASE_EN</div><div class='ctx'> 	mmctx_base_disabled:</div><div class='ctx'> 	or $r14 $r14</div><div class='del'>-	bra e mmctx_multi_disabled</div><div class='add'>+	bra e #mmctx_multi_disabled</div><div class='ctx'> 		iowr I[$r8 + 0x200] $r14 	// MMCTX_MULTI_STRIDE</div><div class='ctx'> 		iowr I[$r8 + 0x300] $r15 	// MMCTX_MULTI_MASK</div><div class='ctx'> 		bset $r9 1			// MULTI_EN</div><div class='hunk'>@@ -264,7 +264,7 @@ mmctx_xfer:</div><div class='ctx'> 		mmctx_wait_free:</div><div class='ctx'> 			iord $r14 I[$r8 + 0x000] // MMCTX_CTRL</div><div class='ctx'> 			and $r14 0x1f</div><div class='del'>-			bra e mmctx_wait_free</div><div class='add'>+			bra e #mmctx_wait_free</div><div class='ctx'> </div><div class='ctx'> 		// queue up an entry</div><div class='ctx'> 		ld b32 $r14 D[$r12]</div><div class='hunk'>@@ -272,19 +272,19 @@ mmctx_xfer:</div><div class='ctx'> 		iowr I[$r8 + 0x300] $r14</div><div class='ctx'> 		add b32 $r12 4</div><div class='ctx'> 		cmpu b32 $r12 $r13</div><div class='del'>-		bra ne mmctx_exec_loop</div><div class='add'>+		bra ne #mmctx_exec_loop</div><div class='ctx'> </div><div class='ctx'> 	xbit $r11 $r10 2</div><div class='del'>-	bra ne mmctx_stop</div><div class='add'>+	bra ne #mmctx_stop</div><div class='ctx'> 		// wait for queue to empty</div><div class='ctx'> 		mmctx_fini_wait:</div><div class='ctx'> 			iord $r11 I[$r8 + 0x000]	// MMCTX_CTRL</div><div class='ctx'> 			and $r11 0x1f</div><div class='ctx'> 			cmpu b32 $r11 0x10</div><div class='del'>-			bra ne mmctx_fini_wait</div><div class='add'>+			bra ne #mmctx_fini_wait</div><div class='ctx'> 		mov $r10 2				// DONE_MMCTX</div><div class='del'>-		call wait_donez</div><div class='del'>-		bra mmctx_done</div><div class='add'>+		call #wait_donez</div><div class='add'>+		bra #mmctx_done</div><div class='ctx'> 	mmctx_stop:</div><div class='ctx'> 		xbit $r11 $r10 0</div><div class='ctx'> 		shl b32 $r11 16			// DIR</div><div class='hunk'>@@ -295,7 +295,7 @@ mmctx_xfer:</div><div class='ctx'> 			// wait for STOP_TRIGGER to clear</div><div class='ctx'> 			iord $r11 I[$r8 + 0x000] // MMCTX_CTRL</div><div class='ctx'> 			xbit $r11 $r11 18</div><div class='del'>-			bra ne mmctx_stop_wait</div><div class='add'>+			bra ne #mmctx_stop_wait</div><div class='ctx'> 	mmctx_done:</div><div class='ctx'> 	trace_clr(T_MMCTX)</div><div class='ctx'> 	ret</div><div class='hunk'>@@ -305,7 +305,7 @@ mmctx_xfer:</div><div class='ctx'> strand_wait:</div><div class='ctx'> 	push $r10</div><div class='ctx'> 	mov $r10 2</div><div class='del'>-	call wait_donez</div><div class='add'>+	call #wait_donez</div><div class='ctx'> 	pop $r10</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='hunk'>@@ -316,7 +316,7 @@ strand_pre:</div><div class='ctx'> 	sethi $r8 0x20000</div><div class='ctx'> 	mov $r9 0xc</div><div class='ctx'> 	iowr I[$r8] $r9</div><div class='del'>-	call strand_wait</div><div class='add'>+	call #strand_wait</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='ctx'> // unknown - call after issuing strand commands</div><div class='hunk'>@@ -326,7 +326,7 @@ strand_post:</div><div class='ctx'> 	sethi $r8 0x20000</div><div class='ctx'> 	mov $r9 0xd</div><div class='ctx'> 	iowr I[$r8] $r9</div><div class='del'>-	call strand_wait</div><div class='add'>+	call #strand_wait</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='ctx'> // Selects strand set?!</div><div class='hunk'>@@ -341,11 +341,11 @@ strand_set:</div><div class='ctx'> 	iowr I[$r10 + 0x000] $r12		// 0x93c = 0xf</div><div class='ctx'> 	mov $r12 0xb</div><div class='ctx'> 	iowr I[$r11 + 0x000] $r12		// 0x928 = 0xb</div><div class='del'>-	call strand_wait</div><div class='add'>+	call #strand_wait</div><div class='ctx'> 	iowr I[$r10 + 0x000] $r14		// 0x93c = &lt;id&gt;</div><div class='ctx'> 	mov $r12 0xa</div><div class='ctx'> 	iowr I[$r11 + 0x000] $r12		// 0x928 = 0xa</div><div class='del'>-	call strand_wait</div><div class='add'>+	call #strand_wait</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='ctx'> // Initialise strand context data</div><div class='hunk'>@@ -357,22 +357,22 @@ strand_set:</div><div class='ctx'> //</div><div class='ctx'> strand_ctx_init:</div><div class='ctx'> 	trace_set(T_STRINIT)</div><div class='del'>-	call strand_pre</div><div class='add'>+	call #strand_pre</div><div class='ctx'> 	mov $r14 3</div><div class='del'>-	call strand_set</div><div class='add'>+	call #strand_set</div><div class='ctx'> 	mov $r10 0x46fc</div><div class='ctx'> 	sethi $r10 0x20000</div><div class='ctx'> 	add b32 $r11 $r10 0x400</div><div class='ctx'> 	iowr I[$r10 + 0x100] $r0	// STRAND_FIRST_GENE = 0</div><div class='ctx'> 	mov $r12 1</div><div class='ctx'> 	iowr I[$r11 + 0x000] $r12	// STRAND_CMD = LATCH_FIRST_GENE</div><div class='del'>-	call strand_wait</div><div class='add'>+	call #strand_wait</div><div class='ctx'> 	sub b32 $r12 $r0 1</div><div class='ctx'> 	iowr I[$r10 + 0x000] $r12	// STRAND_GENE_CNT = 0xffffffff</div><div class='ctx'> 	mov $r12 2</div><div class='ctx'> 	iowr I[$r11 + 0x000] $r12	// STRAND_CMD = LATCH_GENE_CNT</div><div class='del'>-	call strand_wait</div><div class='del'>-	call strand_post</div><div class='add'>+	call #strand_wait</div><div class='add'>+	call #strand_post</div><div class='ctx'> </div><div class='ctx'> 	// read the size of each strand, poke the context offset of</div><div class='ctx'> 	// each into STRAND_{SAVE,LOAD}_SWBASE now, no need to worry</div><div class='hunk'>@@ -391,7 +391,7 @@ strand_ctx_init:</div><div class='ctx'> 		add b32 $r14 $r10</div><div class='ctx'> 		add b32 $r8 4</div><div class='ctx'> 		sub b32 $r9 1</div><div class='del'>-		bra ne ctx_init_strand_loop</div><div class='add'>+		bra ne #ctx_init_strand_loop</div><div class='ctx'> </div><div class='ctx'> 	shl b32 $r14 8</div><div class='ctx'> 	sub b32 $r15 $r14 $r15</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.h b/drivers/gpu/drm/nouveau/nvc0_graph.h<br/>index 636fe9812f79..91d44ea662d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_graph.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_graph.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_graph.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nvc0_graph.h</a></div><div class='hunk'>@@ -87,6 +87,7 @@ nvc0_graph_class(struct drm_device *dev)</div><div class='ctx'> 	case 0xc1:</div><div class='ctx'> 		return 0x9197;</div><div class='ctx'> 	case 0xc8:</div><div class='add'>+	case 0xd9:</div><div class='ctx'> 		return 0x9297;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return 0;</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvc0_grctx.c b/drivers/gpu/drm/nouveau/nvc0_grctx.c<br/>index 96b0b93d94ca..de77842b31c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_grctx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_grctx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_grctx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nvc0_grctx.c</a></div><div class='hunk'>@@ -1268,6 +1268,17 @@ nvc0_grctx_generate_9039(struct drm_device *dev)</div><div class='ctx'> static void</div><div class='ctx'> nvc0_grctx_generate_90c0(struct drm_device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; dev_priv-&gt;chipset == 0xd9 &amp;&amp; i &lt; 4; i++) {</div><div class='add'>+		nv_mthd(dev, 0x90c0, 0x2700 + (i * 0x40), 0x00000000);</div><div class='add'>+		nv_mthd(dev, 0x90c0, 0x2720 + (i * 0x40), 0x00000000);</div><div class='add'>+		nv_mthd(dev, 0x90c0, 0x2704 + (i * 0x40), 0x00000000);</div><div class='add'>+		nv_mthd(dev, 0x90c0, 0x2724 + (i * 0x40), 0x00000000);</div><div class='add'>+		nv_mthd(dev, 0x90c0, 0x2708 + (i * 0x40), 0x00000000);</div><div class='add'>+		nv_mthd(dev, 0x90c0, 0x2728 + (i * 0x40), 0x00000000);</div><div class='add'>+	}</div><div class='ctx'> 	nv_mthd(dev, 0x90c0, 0x270c, 0x00000000);</div><div class='ctx'> 	nv_mthd(dev, 0x90c0, 0x272c, 0x00000000);</div><div class='ctx'> 	nv_mthd(dev, 0x90c0, 0x274c, 0x00000000);</div><div class='hunk'>@@ -1276,6 +1287,12 @@ nvc0_grctx_generate_90c0(struct drm_device *dev)</div><div class='ctx'> 	nv_mthd(dev, 0x90c0, 0x27ac, 0x00000000);</div><div class='ctx'> 	nv_mthd(dev, 0x90c0, 0x27cc, 0x00000000);</div><div class='ctx'> 	nv_mthd(dev, 0x90c0, 0x27ec, 0x00000000);</div><div class='add'>+	for (i = 0; dev_priv-&gt;chipset == 0xd9 &amp;&amp; i &lt; 4; i++) {</div><div class='add'>+		nv_mthd(dev, 0x90c0, 0x2710 + (i * 0x40), 0x00014000);</div><div class='add'>+		nv_mthd(dev, 0x90c0, 0x2730 + (i * 0x40), 0x00014000);</div><div class='add'>+		nv_mthd(dev, 0x90c0, 0x2714 + (i * 0x40), 0x00000040);</div><div class='add'>+		nv_mthd(dev, 0x90c0, 0x2734 + (i * 0x40), 0x00000040);</div><div class='add'>+	}</div><div class='ctx'> 	nv_mthd(dev, 0x90c0, 0x030c, 0x00000001);</div><div class='ctx'> 	nv_mthd(dev, 0x90c0, 0x1944, 0x00000000);</div><div class='ctx'> 	nv_mthd(dev, 0x90c0, 0x0758, 0x00000100);</div><div class='hunk'>@@ -1471,14 +1488,20 @@ nvc0_grctx_generate_shaders(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> </div><div class='del'>-	if (dev_priv-&gt;chipset != 0xc1) {</div><div class='del'>-		nv_wr32(dev, 0x405800, 0x078000bf);</div><div class='del'>-		nv_wr32(dev, 0x405830, 0x02180000);</div><div class='del'>-	} else {</div><div class='add'>+	if (dev_priv-&gt;chipset == 0xd9) {</div><div class='ctx'> 		nv_wr32(dev, 0x405800, 0x0f8000bf);</div><div class='ctx'> 		nv_wr32(dev, 0x405830, 0x02180218);</div><div class='add'>+		nv_wr32(dev, 0x405834, 0x08000000);</div><div class='add'>+	} else</div><div class='add'>+	if (dev_priv-&gt;chipset == 0xc1) {</div><div class='add'>+		nv_wr32(dev, 0x405800, 0x0f8000bf);</div><div class='add'>+		nv_wr32(dev, 0x405830, 0x02180218);</div><div class='add'>+		nv_wr32(dev, 0x405834, 0x00000000);</div><div class='add'>+	} else {</div><div class='add'>+		nv_wr32(dev, 0x405800, 0x078000bf);</div><div class='add'>+		nv_wr32(dev, 0x405830, 0x02180000);</div><div class='add'>+		nv_wr32(dev, 0x405834, 0x00000000);</div><div class='ctx'> 	}</div><div class='del'>-	nv_wr32(dev, 0x405834, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x405838, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x405854, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x405870, 0x00000001);</div><div class='hunk'>@@ -1509,7 +1532,10 @@ nvc0_grctx_generate_unk64xx(struct drm_device *dev)</div><div class='ctx'> 	nv_wr32(dev, 0x4064ac, 0x00003fff);</div><div class='ctx'> 	nv_wr32(dev, 0x4064b4, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x4064b8, 0x00000000);</div><div class='del'>-	if (dev_priv-&gt;chipset == 0xc1) {</div><div class='add'>+	if (dev_priv-&gt;chipset == 0xd9)</div><div class='add'>+		nv_wr32(dev, 0x4064bc, 0x00000000);</div><div class='add'>+	if (dev_priv-&gt;chipset == 0xc1 ||</div><div class='add'>+	    dev_priv-&gt;chipset == 0xd9) {</div><div class='ctx'> 		nv_wr32(dev, 0x4064c0, 0x80140078);</div><div class='ctx'> 		nv_wr32(dev, 0x4064c4, 0x0086ffff);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1550,10 +1576,23 @@ nvc0_grctx_generate_rop(struct drm_device *dev)</div><div class='ctx'> 	/* ROPC_BROADCAST */</div><div class='ctx'> 	nv_wr32(dev, 0x408800, 0x02802a3c);</div><div class='ctx'> 	nv_wr32(dev, 0x408804, 0x00000040);</div><div class='del'>-	nv_wr32(dev, 0x408808, chipset != 0xc1 ? 0x0003e00d : 0x1003e005);</div><div class='del'>-	nv_wr32(dev, 0x408900, 0x3080b801);</div><div class='del'>-	nv_wr32(dev, 0x408904, chipset != 0xc1 ? 0x02000001 : 0x62000001);</div><div class='del'>-	nv_wr32(dev, 0x408908, 0x00c80929);</div><div class='add'>+	if (chipset == 0xd9) {</div><div class='add'>+		nv_wr32(dev, 0x408808, 0x1043e005);</div><div class='add'>+		nv_wr32(dev, 0x408900, 0x3080b801);</div><div class='add'>+		nv_wr32(dev, 0x408904, 0x1043e005);</div><div class='add'>+		nv_wr32(dev, 0x408908, 0x00c8102f);</div><div class='add'>+	} else</div><div class='add'>+	if (chipset == 0xc1) {</div><div class='add'>+		nv_wr32(dev, 0x408808, 0x1003e005);</div><div class='add'>+		nv_wr32(dev, 0x408900, 0x3080b801);</div><div class='add'>+		nv_wr32(dev, 0x408904, 0x62000001);</div><div class='add'>+		nv_wr32(dev, 0x408908, 0x00c80929);</div><div class='add'>+	} else {</div><div class='add'>+		nv_wr32(dev, 0x408808, 0x0003e00d);</div><div class='add'>+		nv_wr32(dev, 0x408900, 0x3080b801);</div><div class='add'>+		nv_wr32(dev, 0x408904, 0x02000001);</div><div class='add'>+		nv_wr32(dev, 0x408908, 0x00c80929);</div><div class='add'>+	}</div><div class='ctx'> 	nv_wr32(dev, 0x40890c, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x408980, 0x0000011d);</div><div class='ctx'> }</div><div class='hunk'>@@ -1572,7 +1611,7 @@ nvc0_grctx_generate_gpc(struct drm_device *dev)</div><div class='ctx'> 	nv_wr32(dev, 0x418408, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x41840c, 0x00001008);</div><div class='ctx'> 	nv_wr32(dev, 0x418410, 0x0fff0fff);</div><div class='del'>-	nv_wr32(dev, 0x418414, 0x00200fff);</div><div class='add'>+	nv_wr32(dev, 0x418414, chipset != 0xd9 ? 0x00200fff : 0x02200fff);</div><div class='ctx'> 	nv_wr32(dev, 0x418450, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x418454, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x418458, 0x00000000);</div><div class='hunk'>@@ -1587,14 +1626,17 @@ nvc0_grctx_generate_gpc(struct drm_device *dev)</div><div class='ctx'> 	nv_wr32(dev, 0x418700, 0x00000002);</div><div class='ctx'> 	nv_wr32(dev, 0x418704, 0x00000080);</div><div class='ctx'> 	nv_wr32(dev, 0x418708, 0x00000000);</div><div class='del'>-	nv_wr32(dev, 0x41870c, 0x07c80000);</div><div class='add'>+	nv_wr32(dev, 0x41870c, chipset != 0xd9 ? 0x07c80000 : 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x418710, 0x00000000);</div><div class='del'>-	nv_wr32(dev, 0x418800, 0x0006860a);</div><div class='add'>+	nv_wr32(dev, 0x418800, chipset != 0xd9 ? 0x0006860a : 0x7006860a);</div><div class='ctx'> 	nv_wr32(dev, 0x418808, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x41880c, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x418810, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x418828, 0x00008442);</div><div class='del'>-	nv_wr32(dev, 0x418830, chipset != 0xc1 ? 0x00000001 : 0x10000001);</div><div class='add'>+	if (chipset == 0xc1 || chipset == 0xd9)</div><div class='add'>+		nv_wr32(dev, 0x418830, 0x10000001);</div><div class='add'>+	else</div><div class='add'>+		nv_wr32(dev, 0x418830, 0x00000001);</div><div class='ctx'> 	nv_wr32(dev, 0x4188d8, 0x00000008);</div><div class='ctx'> 	nv_wr32(dev, 0x4188e0, 0x01000000);</div><div class='ctx'> 	nv_wr32(dev, 0x4188e8, 0x00000000);</div><div class='hunk'>@@ -1602,7 +1644,12 @@ nvc0_grctx_generate_gpc(struct drm_device *dev)</div><div class='ctx'> 	nv_wr32(dev, 0x4188f0, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x4188f4, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x4188f8, 0x00000000);</div><div class='del'>-	nv_wr32(dev, 0x4188fc, chipset != 0xc1 ? 0x00100000 : 0x00100018);</div><div class='add'>+	if (chipset == 0xd9)</div><div class='add'>+		nv_wr32(dev, 0x4188fc, 0x20100008);</div><div class='add'>+	else if (chipset == 0xc1)</div><div class='add'>+		nv_wr32(dev, 0x4188fc, 0x00100018);</div><div class='add'>+	else</div><div class='add'>+		nv_wr32(dev, 0x4188fc, 0x00100000);</div><div class='ctx'> 	nv_wr32(dev, 0x41891c, 0x00ff00ff);</div><div class='ctx'> 	nv_wr32(dev, 0x418924, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x418928, 0x00ffff00);</div><div class='hunk'>@@ -1616,7 +1663,7 @@ nvc0_grctx_generate_gpc(struct drm_device *dev)</div><div class='ctx'> 		nv_wr32(dev, 0x418a14 + (i * 0x20), 0x00000000);</div><div class='ctx'> 		nv_wr32(dev, 0x418a18 + (i * 0x20), 0x00000000);</div><div class='ctx'> 	}</div><div class='del'>-	nv_wr32(dev, 0x418b00, 0x00000000);</div><div class='add'>+	nv_wr32(dev, 0x418b00, chipset != 0xd9 ? 0x00000000 : 0x00000006);</div><div class='ctx'> 	nv_wr32(dev, 0x418b08, 0x0a418820);</div><div class='ctx'> 	nv_wr32(dev, 0x418b0c, 0x062080e6);</div><div class='ctx'> 	nv_wr32(dev, 0x418b10, 0x020398a4);</div><div class='hunk'>@@ -1633,7 +1680,7 @@ nvc0_grctx_generate_gpc(struct drm_device *dev)</div><div class='ctx'> 	nv_wr32(dev, 0x418c24, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x418c28, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x418c2c, 0x00000000);</div><div class='del'>-	if (chipset == 0xc1)</div><div class='add'>+	if (chipset == 0xc1 || chipset == 0xd9)</div><div class='ctx'> 		nv_wr32(dev, 0x418c6c, 0x00000001);</div><div class='ctx'> 	nv_wr32(dev, 0x418c80, 0x20200004);</div><div class='ctx'> 	nv_wr32(dev, 0x418c8c, 0x00000001);</div><div class='hunk'>@@ -1653,7 +1700,10 @@ nvc0_grctx_generate_tp(struct drm_device *dev)</div><div class='ctx'> 	nv_wr32(dev, 0x419818, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x41983c, 0x00038bc7);</div><div class='ctx'> 	nv_wr32(dev, 0x419848, 0x00000000);</div><div class='del'>-	nv_wr32(dev, 0x419864, chipset != 0xc1 ? 0x0000012a : 0x00000129);</div><div class='add'>+	if (chipset == 0xc1 || chipset == 0xd9)</div><div class='add'>+		nv_wr32(dev, 0x419864, 0x00000129);</div><div class='add'>+	else</div><div class='add'>+		nv_wr32(dev, 0x419864, 0x0000012a);</div><div class='ctx'> 	nv_wr32(dev, 0x419888, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x419a00, 0x000001f0);</div><div class='ctx'> 	nv_wr32(dev, 0x419a04, 0x00000001);</div><div class='hunk'>@@ -1663,7 +1713,9 @@ nvc0_grctx_generate_tp(struct drm_device *dev)</div><div class='ctx'> 	nv_wr32(dev, 0x419a14, 0x00000200);</div><div class='ctx'> 	nv_wr32(dev, 0x419a1c, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x419a20, 0x00000800);</div><div class='del'>-	if (chipset != 0xc0 &amp;&amp; chipset != 0xc8)</div><div class='add'>+	if (chipset == 0xd9)</div><div class='add'>+		nv_wr32(dev, 0x00419ac4, 0x0017f440);</div><div class='add'>+	else if (chipset != 0xc0 &amp;&amp; chipset != 0xc8)</div><div class='ctx'> 		nv_wr32(dev, 0x00419ac4, 0x0007f440);</div><div class='ctx'> 	nv_wr32(dev, 0x419b00, 0x0a418820);</div><div class='ctx'> 	nv_wr32(dev, 0x419b04, 0x062080e6);</div><div class='hunk'>@@ -1672,21 +1724,33 @@ nvc0_grctx_generate_tp(struct drm_device *dev)</div><div class='ctx'> 	nv_wr32(dev, 0x419b10, 0x0a418820);</div><div class='ctx'> 	nv_wr32(dev, 0x419b14, 0x000000e6);</div><div class='ctx'> 	nv_wr32(dev, 0x419bd0, 0x00900103);</div><div class='del'>-	nv_wr32(dev, 0x419be0, chipset != 0xc1 ? 0x00000001 : 0x00400001);</div><div class='add'>+	if (chipset == 0xc1 || chipset == 0xd9)</div><div class='add'>+		nv_wr32(dev, 0x419be0, 0x00400001);</div><div class='add'>+	else</div><div class='add'>+		nv_wr32(dev, 0x419be0, 0x00000001);</div><div class='ctx'> 	nv_wr32(dev, 0x419be4, 0x00000000);</div><div class='del'>-	nv_wr32(dev, 0x419c00, 0x00000002);</div><div class='add'>+	nv_wr32(dev, 0x419c00, chipset != 0xd9 ? 0x00000002 : 0x0000000a);</div><div class='ctx'> 	nv_wr32(dev, 0x419c04, 0x00000006);</div><div class='ctx'> 	nv_wr32(dev, 0x419c08, 0x00000002);</div><div class='ctx'> 	nv_wr32(dev, 0x419c20, 0x00000000);</div><div class='del'>-	if (chipset == 0xce || chipset == 0xcf)</div><div class='add'>+	if (dev_priv-&gt;chipset == 0xd9) {</div><div class='add'>+		nv_wr32(dev, 0x419c24, 0x00084210);</div><div class='add'>+		nv_wr32(dev, 0x419c28, 0x3cf3cf3c);</div><div class='ctx'> 		nv_wr32(dev, 0x419cb0, 0x00020048);</div><div class='del'>-	else</div><div class='add'>+	} else</div><div class='add'>+	if (chipset == 0xce || chipset == 0xcf) {</div><div class='add'>+		nv_wr32(dev, 0x419cb0, 0x00020048);</div><div class='add'>+	} else {</div><div class='ctx'> 		nv_wr32(dev, 0x419cb0, 0x00060048);</div><div class='add'>+	}</div><div class='ctx'> 	nv_wr32(dev, 0x419ce8, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x419cf4, 0x00000183);</div><div class='del'>-	nv_wr32(dev, 0x419d20, chipset != 0xc1 ? 0x02180000 : 0x12180000);</div><div class='add'>+	if (chipset == 0xc1 || chipset == 0xd9)</div><div class='add'>+		nv_wr32(dev, 0x419d20, 0x12180000);</div><div class='add'>+	else</div><div class='add'>+		nv_wr32(dev, 0x419d20, 0x02180000);</div><div class='ctx'> 	nv_wr32(dev, 0x419d24, 0x00001fff);</div><div class='del'>-	if (chipset == 0xc1)</div><div class='add'>+	if (chipset == 0xc1 || chipset == 0xd9)</div><div class='ctx'> 		nv_wr32(dev, 0x419d44, 0x02180218);</div><div class='ctx'> 	nv_wr32(dev, 0x419e04, 0x00000000);</div><div class='ctx'> 	nv_wr32(dev, 0x419e08, 0x00000000);</div><div class='hunk'>@@ -1986,6 +2050,10 @@ nvc0_grctx_generate(struct nouveau_channel *chan)</div><div class='ctx'> 	nv_icmd(dev, 0x00000215, 0x00000040);</div><div class='ctx'> 	nv_icmd(dev, 0x00000216, 0x00000040);</div><div class='ctx'> 	nv_icmd(dev, 0x00000217, 0x00000040);</div><div class='add'>+	if (dev_priv-&gt;chipset == 0xd9) {</div><div class='add'>+		for (i = 0x0400; i &lt;= 0x0417; i++)</div><div class='add'>+			nv_icmd(dev, i, 0x00000040);</div><div class='add'>+	}</div><div class='ctx'> 	nv_icmd(dev, 0x00000218, 0x0000c080);</div><div class='ctx'> 	nv_icmd(dev, 0x00000219, 0x0000c080);</div><div class='ctx'> 	nv_icmd(dev, 0x0000021a, 0x0000c080);</div><div class='hunk'>@@ -1994,6 +2062,10 @@ nvc0_grctx_generate(struct nouveau_channel *chan)</div><div class='ctx'> 	nv_icmd(dev, 0x0000021d, 0x0000c080);</div><div class='ctx'> 	nv_icmd(dev, 0x0000021e, 0x0000c080);</div><div class='ctx'> 	nv_icmd(dev, 0x0000021f, 0x0000c080);</div><div class='add'>+	if (dev_priv-&gt;chipset == 0xd9) {</div><div class='add'>+		for (i = 0x0440; i &lt;= 0x0457; i++)</div><div class='add'>+			nv_icmd(dev, i, 0x0000c080);</div><div class='add'>+	}</div><div class='ctx'> 	nv_icmd(dev, 0x000000ad, 0x0000013e);</div><div class='ctx'> 	nv_icmd(dev, 0x000000e1, 0x00000010);</div><div class='ctx'> 	nv_icmd(dev, 0x00000290, 0x00000000);</div><div class='hunk'>@@ -2556,7 +2628,8 @@ nvc0_grctx_generate(struct nouveau_channel *chan)</div><div class='ctx'> 	nv_icmd(dev, 0x0000053f, 0xffff0000);</div><div class='ctx'> 	nv_icmd(dev, 0x00000585, 0x0000003f);</div><div class='ctx'> 	nv_icmd(dev, 0x00000576, 0x00000003);</div><div class='del'>-	if (dev_priv-&gt;chipset == 0xc1)</div><div class='add'>+	if (dev_priv-&gt;chipset == 0xc1 ||</div><div class='add'>+	    dev_priv-&gt;chipset == 0xd9)</div><div class='ctx'> 		nv_icmd(dev, 0x0000057b, 0x00000059);</div><div class='ctx'> 	nv_icmd(dev, 0x00000586, 0x00000040);</div><div class='ctx'> 	nv_icmd(dev, 0x00000582, 0x00000080);</div><div class='hunk'>@@ -2658,6 +2731,8 @@ nvc0_grctx_generate(struct nouveau_channel *chan)</div><div class='ctx'> 	nv_icmd(dev, 0x00000957, 0x00000003);</div><div class='ctx'> 	nv_icmd(dev, 0x0000095e, 0x20164010);</div><div class='ctx'> 	nv_icmd(dev, 0x0000095f, 0x00000020);</div><div class='add'>+	if (dev_priv-&gt;chipset == 0xd9)</div><div class='add'>+		nv_icmd(dev, 0x0000097d, 0x00000020);</div><div class='ctx'> 	nv_icmd(dev, 0x00000683, 0x00000006);</div><div class='ctx'> 	nv_icmd(dev, 0x00000685, 0x003fffff);</div><div class='ctx'> 	nv_icmd(dev, 0x00000687, 0x00000c48);</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvc0_grgpc.fuc b/drivers/gpu/drm/nouveau/nvc0_grgpc.fuc<br/>index 06f5e26d1e0f..15272be33b66 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_grgpc.fuc?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_grgpc.fuc</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_grgpc.fuc?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nvc0_grgpc.fuc</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'>  * - watchdog timer around ctx operations</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-.section nvc0_grgpc_data</div><div class='add'>+.section #nvc0_grgpc_data</div><div class='ctx'> include(`nvc0_graph.fuc')</div><div class='ctx'> gpc_id:			.b32 0</div><div class='ctx'> gpc_mmio_list_head:	.b32 0</div><div class='hunk'>@@ -48,40 +48,45 @@ cmd_queue:		queue_init</div><div class='ctx'> // chipset descriptions</div><div class='ctx'> chipsets:</div><div class='ctx'> .b8  0xc0 0 0 0</div><div class='del'>-.b16 nvc0_gpc_mmio_head</div><div class='del'>-.b16 nvc0_gpc_mmio_tail</div><div class='del'>-.b16 nvc0_tpc_mmio_head</div><div class='del'>-.b16 nvc0_tpc_mmio_tail</div><div class='add'>+.b16 #nvc0_gpc_mmio_head</div><div class='add'>+.b16 #nvc0_gpc_mmio_tail</div><div class='add'>+.b16 #nvc0_tpc_mmio_head</div><div class='add'>+.b16 #nvc0_tpc_mmio_tail</div><div class='ctx'> .b8  0xc1 0 0 0</div><div class='del'>-.b16 nvc0_gpc_mmio_head</div><div class='del'>-.b16 nvc1_gpc_mmio_tail</div><div class='del'>-.b16 nvc0_tpc_mmio_head</div><div class='del'>-.b16 nvc1_tpc_mmio_tail</div><div class='add'>+.b16 #nvc0_gpc_mmio_head</div><div class='add'>+.b16 #nvc1_gpc_mmio_tail</div><div class='add'>+.b16 #nvc0_tpc_mmio_head</div><div class='add'>+.b16 #nvc1_tpc_mmio_tail</div><div class='ctx'> .b8  0xc3 0 0 0</div><div class='del'>-.b16 nvc0_gpc_mmio_head</div><div class='del'>-.b16 nvc0_gpc_mmio_tail</div><div class='del'>-.b16 nvc0_tpc_mmio_head</div><div class='del'>-.b16 nvc3_tpc_mmio_tail</div><div class='add'>+.b16 #nvc0_gpc_mmio_head</div><div class='add'>+.b16 #nvc0_gpc_mmio_tail</div><div class='add'>+.b16 #nvc0_tpc_mmio_head</div><div class='add'>+.b16 #nvc3_tpc_mmio_tail</div><div class='ctx'> .b8  0xc4 0 0 0</div><div class='del'>-.b16 nvc0_gpc_mmio_head</div><div class='del'>-.b16 nvc0_gpc_mmio_tail</div><div class='del'>-.b16 nvc0_tpc_mmio_head</div><div class='del'>-.b16 nvc3_tpc_mmio_tail</div><div class='add'>+.b16 #nvc0_gpc_mmio_head</div><div class='add'>+.b16 #nvc0_gpc_mmio_tail</div><div class='add'>+.b16 #nvc0_tpc_mmio_head</div><div class='add'>+.b16 #nvc3_tpc_mmio_tail</div><div class='ctx'> .b8  0xc8 0 0 0</div><div class='del'>-.b16 nvc0_gpc_mmio_head</div><div class='del'>-.b16 nvc0_gpc_mmio_tail</div><div class='del'>-.b16 nvc0_tpc_mmio_head</div><div class='del'>-.b16 nvc0_tpc_mmio_tail</div><div class='add'>+.b16 #nvc0_gpc_mmio_head</div><div class='add'>+.b16 #nvc0_gpc_mmio_tail</div><div class='add'>+.b16 #nvc0_tpc_mmio_head</div><div class='add'>+.b16 #nvc0_tpc_mmio_tail</div><div class='ctx'> .b8  0xce 0 0 0</div><div class='del'>-.b16 nvc0_gpc_mmio_head</div><div class='del'>-.b16 nvc0_gpc_mmio_tail</div><div class='del'>-.b16 nvc0_tpc_mmio_head</div><div class='del'>-.b16 nvc3_tpc_mmio_tail</div><div class='add'>+.b16 #nvc0_gpc_mmio_head</div><div class='add'>+.b16 #nvc0_gpc_mmio_tail</div><div class='add'>+.b16 #nvc0_tpc_mmio_head</div><div class='add'>+.b16 #nvc3_tpc_mmio_tail</div><div class='ctx'> .b8  0xcf 0 0 0</div><div class='del'>-.b16 nvc0_gpc_mmio_head</div><div class='del'>-.b16 nvc0_gpc_mmio_tail</div><div class='del'>-.b16 nvc0_tpc_mmio_head</div><div class='del'>-.b16 nvcf_tpc_mmio_tail</div><div class='add'>+.b16 #nvc0_gpc_mmio_head</div><div class='add'>+.b16 #nvc0_gpc_mmio_tail</div><div class='add'>+.b16 #nvc0_tpc_mmio_head</div><div class='add'>+.b16 #nvcf_tpc_mmio_tail</div><div class='add'>+.b8  0xd9 0 0 0</div><div class='add'>+.b16 #nvd9_gpc_mmio_head</div><div class='add'>+.b16 #nvd9_gpc_mmio_tail</div><div class='add'>+.b16 #nvd9_tpc_mmio_head</div><div class='add'>+.b16 #nvd9_tpc_mmio_tail</div><div class='ctx'> .b8  0 0 0 0</div><div class='ctx'> </div><div class='ctx'> // GPC mmio lists</div><div class='hunk'>@@ -114,6 +119,35 @@ nvc0_gpc_mmio_tail:</div><div class='ctx'> mmctx_data(0x000c6c, 1);</div><div class='ctx'> nvc1_gpc_mmio_tail:</div><div class='ctx'> </div><div class='add'>+nvd9_gpc_mmio_head:</div><div class='add'>+mmctx_data(0x000380, 1)</div><div class='add'>+mmctx_data(0x000400, 2)</div><div class='add'>+mmctx_data(0x00040c, 3)</div><div class='add'>+mmctx_data(0x000450, 9)</div><div class='add'>+mmctx_data(0x000600, 1)</div><div class='add'>+mmctx_data(0x000684, 1)</div><div class='add'>+mmctx_data(0x000700, 5)</div><div class='add'>+mmctx_data(0x000800, 1)</div><div class='add'>+mmctx_data(0x000808, 3)</div><div class='add'>+mmctx_data(0x000828, 1)</div><div class='add'>+mmctx_data(0x000830, 1)</div><div class='add'>+mmctx_data(0x0008d8, 1)</div><div class='add'>+mmctx_data(0x0008e0, 1)</div><div class='add'>+mmctx_data(0x0008e8, 6)</div><div class='add'>+mmctx_data(0x00091c, 1)</div><div class='add'>+mmctx_data(0x000924, 3)</div><div class='add'>+mmctx_data(0x000b00, 1)</div><div class='add'>+mmctx_data(0x000b08, 6)</div><div class='add'>+mmctx_data(0x000bb8, 1)</div><div class='add'>+mmctx_data(0x000c08, 1)</div><div class='add'>+mmctx_data(0x000c10, 8)</div><div class='add'>+mmctx_data(0x000c6c, 1)</div><div class='add'>+mmctx_data(0x000c80, 1)</div><div class='add'>+mmctx_data(0x000c8c, 1)</div><div class='add'>+mmctx_data(0x001000, 3)</div><div class='add'>+mmctx_data(0x001014, 1)</div><div class='add'>+nvd9_gpc_mmio_tail:</div><div class='add'>+</div><div class='ctx'> // TPC mmio lists</div><div class='ctx'> nvc0_tpc_mmio_head:</div><div class='ctx'> mmctx_data(0x000018, 1)</div><div class='hunk'>@@ -146,9 +180,34 @@ nvc3_tpc_mmio_tail:</div><div class='ctx'> mmctx_data(0x000544, 1)</div><div class='ctx'> nvc1_tpc_mmio_tail:</div><div class='ctx'> </div><div class='add'>+nvd9_tpc_mmio_head:</div><div class='add'>+mmctx_data(0x000018, 1)</div><div class='add'>+mmctx_data(0x00003c, 1)</div><div class='add'>+mmctx_data(0x000048, 1)</div><div class='add'>+mmctx_data(0x000064, 1)</div><div class='add'>+mmctx_data(0x000088, 1)</div><div class='add'>+mmctx_data(0x000200, 6)</div><div class='add'>+mmctx_data(0x00021c, 2)</div><div class='add'>+mmctx_data(0x0002c4, 1)</div><div class='add'>+mmctx_data(0x000300, 6)</div><div class='add'>+mmctx_data(0x0003d0, 1)</div><div class='add'>+mmctx_data(0x0003e0, 2)</div><div class='add'>+mmctx_data(0x000400, 3)</div><div class='add'>+mmctx_data(0x000420, 3)</div><div class='add'>+mmctx_data(0x0004b0, 1)</div><div class='add'>+mmctx_data(0x0004e8, 1)</div><div class='add'>+mmctx_data(0x0004f4, 1)</div><div class='add'>+mmctx_data(0x000520, 2)</div><div class='add'>+mmctx_data(0x000544, 1)</div><div class='add'>+mmctx_data(0x000604, 4)</div><div class='add'>+mmctx_data(0x000644, 20)</div><div class='add'>+mmctx_data(0x000698, 1)</div><div class='add'>+mmctx_data(0x0006e0, 1)</div><div class='add'>+mmctx_data(0x000750, 3)</div><div class='add'>+nvd9_tpc_mmio_tail:</div><div class='ctx'> </div><div class='del'>-.section nvc0_grgpc_code</div><div class='del'>-bra init</div><div class='add'>+.section #nvc0_grgpc_code</div><div class='add'>+bra #init</div><div class='ctx'> define(`include_code')</div><div class='ctx'> include(`nvc0_graph.fuc')</div><div class='ctx'> </div><div class='hunk'>@@ -160,10 +219,10 @@ error:</div><div class='ctx'> 	push $r14</div><div class='ctx'> 	mov $r14 -0x67ec 	// 0x9814</div><div class='ctx'> 	sethi $r14 0x400000</div><div class='del'>-	call nv_wr32		// HUB_CTXCTL_CC_SCRATCH[5] = error code</div><div class='add'>+	call #nv_wr32		// HUB_CTXCTL_CC_SCRATCH[5] = error code</div><div class='ctx'> 	add b32 $r14 0x41c</div><div class='ctx'> 	mov $r15 1</div><div class='del'>-	call nv_wr32		// HUB_CTXCTL_INTR_UP_SET</div><div class='add'>+	call #nv_wr32		// HUB_CTXCTL_INTR_UP_SET</div><div class='ctx'> 	pop $r14</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='hunk'>@@ -190,7 +249,7 @@ init:</div><div class='ctx'> 	iowr I[$r1 + 0x000] $r2		// FIFO_ENABLE</div><div class='ctx'> </div><div class='ctx'> 	// setup i0 handler, and route all interrupts to it</div><div class='del'>-	mov $r1 ih</div><div class='add'>+	mov $r1 #ih</div><div class='ctx'> 	mov $iv0 $r1</div><div class='ctx'> 	mov $r1 0x400</div><div class='ctx'> 	iowr I[$r1 + 0x300] $r0		// INTR_DISPATCH</div><div class='hunk'>@@ -210,24 +269,24 @@ init:</div><div class='ctx'> 	and $r2 0x1f</div><div class='ctx'> 	shl b32 $r3 $r2</div><div class='ctx'> 	sub b32 $r3 1</div><div class='del'>-	st b32 D[$r0 + tpc_count] $r2</div><div class='del'>-	st b32 D[$r0 + tpc_mask] $r3</div><div class='add'>+	st b32 D[$r0 + #tpc_count] $r2</div><div class='add'>+	st b32 D[$r0 + #tpc_mask] $r3</div><div class='ctx'> 	add b32 $r1 0x400</div><div class='ctx'> 	iord $r2 I[$r1 + 0x000]		// MYINDEX</div><div class='del'>-	st b32 D[$r0 + gpc_id] $r2</div><div class='add'>+	st b32 D[$r0 + #gpc_id] $r2</div><div class='ctx'> </div><div class='ctx'> 	// find context data for this chipset</div><div class='ctx'> 	mov $r2 0x800</div><div class='ctx'> 	shl b32 $r2 6</div><div class='ctx'> 	iord $r2 I[$r2 + 0x000]		// CC_SCRATCH[0]</div><div class='del'>-	mov $r1 chipsets - 12</div><div class='add'>+	mov $r1 #chipsets - 12</div><div class='ctx'> 	init_find_chipset:</div><div class='ctx'> 		add b32 $r1 12</div><div class='ctx'> 		ld b32 $r3 D[$r1 + 0x00]</div><div class='ctx'> 		cmpu b32 $r3 $r2</div><div class='del'>-		bra e init_context</div><div class='add'>+		bra e #init_context</div><div class='ctx'> 		cmpu b32 $r3 0</div><div class='del'>-		bra ne init_find_chipset</div><div class='add'>+		bra ne #init_find_chipset</div><div class='ctx'> 		// unknown chipset</div><div class='ctx'> 		ret</div><div class='ctx'> </div><div class='hunk'>@@ -253,19 +312,19 @@ init:</div><div class='ctx'> 	clear b32 $r15</div><div class='ctx'> 	ld b16 $r14 D[$r1 + 4]</div><div class='ctx'> 	ld b16 $r15 D[$r1 + 6]</div><div class='del'>-	st b16 D[$r0 + gpc_mmio_list_head] $r14</div><div class='del'>-	st b16 D[$r0 + gpc_mmio_list_tail] $r15</div><div class='del'>-	call mmctx_size</div><div class='add'>+	st b16 D[$r0 + #gpc_mmio_list_head] $r14</div><div class='add'>+	st b16 D[$r0 + #gpc_mmio_list_tail] $r15</div><div class='add'>+	call #mmctx_size</div><div class='ctx'> 	add b32 $r2 $r15</div><div class='ctx'> 	add b32 $r3 $r15</div><div class='ctx'> </div><div class='ctx'> 	// calculate per-TPC mmio context size, store the list pointers</div><div class='ctx'> 	ld b16 $r14 D[$r1 + 8]</div><div class='ctx'> 	ld b16 $r15 D[$r1 + 10]</div><div class='del'>-	st b16 D[$r0 + tpc_mmio_list_head] $r14</div><div class='del'>-	st b16 D[$r0 + tpc_mmio_list_tail] $r15</div><div class='del'>-	call mmctx_size</div><div class='del'>-	ld b32 $r14 D[$r0 + tpc_count]</div><div class='add'>+	st b16 D[$r0 + #tpc_mmio_list_head] $r14</div><div class='add'>+	st b16 D[$r0 + #tpc_mmio_list_tail] $r15</div><div class='add'>+	call #mmctx_size</div><div class='add'>+	ld b32 $r14 D[$r0 + #tpc_count]</div><div class='ctx'> 	mulu $r14 $r15</div><div class='ctx'> 	add b32 $r2 $r14</div><div class='ctx'> 	add b32 $r3 $r14</div><div class='hunk'>@@ -283,7 +342,7 @@ init:</div><div class='ctx'> </div><div class='ctx'> 	// calculate size of strand context data</div><div class='ctx'> 	mov b32 $r15 $r2</div><div class='del'>-	call strand_ctx_init</div><div class='add'>+	call #strand_ctx_init</div><div class='ctx'> 	add b32 $r3 $r15</div><div class='ctx'> </div><div class='ctx'> 	// save context size, and tell HUB we're done</div><div class='hunk'>@@ -301,13 +360,13 @@ init:</div><div class='ctx'> main:</div><div class='ctx'> 	bset $flags $p0</div><div class='ctx'> 	sleep $p0</div><div class='del'>-	mov $r13 cmd_queue</div><div class='del'>-	call queue_get</div><div class='del'>-	bra $p1 main</div><div class='add'>+	mov $r13 #cmd_queue</div><div class='add'>+	call #queue_get</div><div class='add'>+	bra $p1 #main</div><div class='ctx'> </div><div class='ctx'> 	// 0x0000-0x0003 are all context transfers</div><div class='ctx'> 	cmpu b32 $r14 0x04</div><div class='del'>-	bra nc main_not_ctx_xfer</div><div class='add'>+	bra nc #main_not_ctx_xfer</div><div class='ctx'> 		// fetch $flags and mask off $p1/$p2</div><div class='ctx'> 		mov $r1 $flags</div><div class='ctx'> 		mov $r2 0x0006</div><div class='hunk'>@@ -318,14 +377,14 @@ main:</div><div class='ctx'> 		or $r1 $r14</div><div class='ctx'> 		mov $flags $r1</div><div class='ctx'> 		// transfer context data</div><div class='del'>-		call ctx_xfer</div><div class='del'>-		bra main</div><div class='add'>+		call #ctx_xfer</div><div class='add'>+		bra #main</div><div class='ctx'> </div><div class='ctx'> 	main_not_ctx_xfer:</div><div class='ctx'> 	shl b32 $r15 $r14 16</div><div class='ctx'> 	or $r15 E_BAD_COMMAND</div><div class='del'>-	call error</div><div class='del'>-	bra main</div><div class='add'>+	call #error</div><div class='add'>+	bra #main</div><div class='ctx'> </div><div class='ctx'> // interrupt handler</div><div class='ctx'> ih:</div><div class='hunk'>@@ -342,13 +401,13 @@ ih:</div><div class='ctx'> 	// incoming fifo command?</div><div class='ctx'> 	iord $r10 I[$r0 + 0x200]	// INTR</div><div class='ctx'> 	and $r11 $r10 0x00000004</div><div class='del'>-	bra e ih_no_fifo</div><div class='add'>+	bra e #ih_no_fifo</div><div class='ctx'> 		// queue incoming fifo command for later processing</div><div class='ctx'> 		mov $r11 0x1900</div><div class='del'>-		mov $r13 cmd_queue</div><div class='add'>+		mov $r13 #cmd_queue</div><div class='ctx'> 		iord $r14 I[$r11 + 0x100]	// FIFO_CMD</div><div class='ctx'> 		iord $r15 I[$r11 + 0x000]	// FIFO_DATA</div><div class='del'>-		call queue_put</div><div class='add'>+		call #queue_put</div><div class='ctx'> 		add b32 $r11 0x400</div><div class='ctx'> 		mov $r14 1</div><div class='ctx'> 		iowr I[$r11 + 0x000] $r14	// FIFO_ACK</div><div class='hunk'>@@ -374,11 +433,11 @@ ih:</div><div class='ctx'> //</div><div class='ctx'> hub_barrier_done:</div><div class='ctx'> 	mov $r15 1</div><div class='del'>-	ld b32 $r14 D[$r0 + gpc_id]</div><div class='add'>+	ld b32 $r14 D[$r0 + #gpc_id]</div><div class='ctx'> 	shl b32 $r15 $r14</div><div class='ctx'> 	mov $r14 -0x6be8 	// 0x409418 - HUB_BAR_SET</div><div class='ctx'> 	sethi $r14 0x400000</div><div class='del'>-	call nv_wr32</div><div class='add'>+	call #nv_wr32</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='ctx'> // Disables various things, waits a bit, and re-enables them..</div><div class='hunk'>@@ -395,7 +454,7 @@ ctx_redswitch:</div><div class='ctx'> 	mov $r15 8</div><div class='ctx'> 	ctx_redswitch_delay:</div><div class='ctx'> 		sub b32 $r15 1</div><div class='del'>-		bra ne ctx_redswitch_delay</div><div class='add'>+		bra ne #ctx_redswitch_delay</div><div class='ctx'> 	mov $r15 0xa20</div><div class='ctx'> 	iowr I[$r14] $r15	// GPC_RED_SWITCH = UNK11, ENABLE, POWER</div><div class='ctx'> 	ret</div><div class='hunk'>@@ -413,8 +472,8 @@ ctx_xfer:</div><div class='ctx'> 	mov $r1 0xa04</div><div class='ctx'> 	shl b32 $r1 6</div><div class='ctx'> 	iowr I[$r1 + 0x000] $r15// MEM_BASE</div><div class='del'>-	bra not $p1 ctx_xfer_not_load</div><div class='del'>-		call ctx_redswitch</div><div class='add'>+	bra not $p1 #ctx_xfer_not_load</div><div class='add'>+		call #ctx_redswitch</div><div class='ctx'> 	ctx_xfer_not_load:</div><div class='ctx'> </div><div class='ctx'> 	// strands</div><div class='hunk'>@@ -422,7 +481,7 @@ ctx_xfer:</div><div class='ctx'> 	sethi $r1 0x20000</div><div class='ctx'> 	mov $r2 0xc</div><div class='ctx'> 	iowr I[$r1] $r2		// STRAND_CMD(0x3f) = 0x0c</div><div class='del'>-	call strand_wait</div><div class='add'>+	call #strand_wait</div><div class='ctx'> 	mov $r2 0x47fc</div><div class='ctx'> 	sethi $r2 0x20000</div><div class='ctx'> 	iowr I[$r2] $r0		// STRAND_FIRST_GENE(0x3f) = 0x00</div><div class='hunk'>@@ -435,46 +494,46 @@ ctx_xfer:</div><div class='ctx'> 	or $r10 2		// first</div><div class='ctx'> 	mov $r11 0x0000</div><div class='ctx'> 	sethi $r11 0x500000</div><div class='del'>-	ld b32 $r12 D[$r0 + gpc_id]</div><div class='add'>+	ld b32 $r12 D[$r0 + #gpc_id]</div><div class='ctx'> 	shl b32 $r12 15</div><div class='ctx'> 	add b32 $r11 $r12	// base = NV_PGRAPH_GPCn</div><div class='del'>-	ld b32 $r12 D[$r0 + gpc_mmio_list_head]</div><div class='del'>-	ld b32 $r13 D[$r0 + gpc_mmio_list_tail]</div><div class='add'>+	ld b32 $r12 D[$r0 + #gpc_mmio_list_head]</div><div class='add'>+	ld b32 $r13 D[$r0 + #gpc_mmio_list_tail]</div><div class='ctx'> 	mov $r14 0		// not multi</div><div class='del'>-	call mmctx_xfer</div><div class='add'>+	call #mmctx_xfer</div><div class='ctx'> </div><div class='ctx'> 	// per-TPC mmio context</div><div class='ctx'> 	xbit $r10 $flags $p1	// direction</div><div class='ctx'> 	or $r10 4		// last</div><div class='ctx'> 	mov $r11 0x4000</div><div class='ctx'> 	sethi $r11 0x500000	// base = NV_PGRAPH_GPC0_TPC0</div><div class='del'>-	ld b32 $r12 D[$r0 + gpc_id]</div><div class='add'>+	ld b32 $r12 D[$r0 + #gpc_id]</div><div class='ctx'> 	shl b32 $r12 15</div><div class='ctx'> 	add b32 $r11 $r12	// base = NV_PGRAPH_GPCn_TPC0</div><div class='del'>-	ld b32 $r12 D[$r0 + tpc_mmio_list_head]</div><div class='del'>-	ld b32 $r13 D[$r0 + tpc_mmio_list_tail]</div><div class='del'>-	ld b32 $r15 D[$r0 + tpc_mask]</div><div class='add'>+	ld b32 $r12 D[$r0 + #tpc_mmio_list_head]</div><div class='add'>+	ld b32 $r13 D[$r0 + #tpc_mmio_list_tail]</div><div class='add'>+	ld b32 $r15 D[$r0 + #tpc_mask]</div><div class='ctx'> 	mov $r14 0x800		// stride = 0x800</div><div class='del'>-	call mmctx_xfer</div><div class='add'>+	call #mmctx_xfer</div><div class='ctx'> </div><div class='ctx'> 	// wait for strands to finish</div><div class='del'>-	call strand_wait</div><div class='add'>+	call #strand_wait</div><div class='ctx'> </div><div class='ctx'> 	// if load, or a save without a load following, do some</div><div class='ctx'> 	// unknown stuff that's done after finishing a block of</div><div class='ctx'> 	// strand commands</div><div class='del'>-	bra $p1 ctx_xfer_post</div><div class='del'>-	bra not $p2 ctx_xfer_done</div><div class='add'>+	bra $p1 #ctx_xfer_post</div><div class='add'>+	bra not $p2 #ctx_xfer_done</div><div class='ctx'> 	ctx_xfer_post:</div><div class='ctx'> 		mov $r1 0x4afc</div><div class='ctx'> 		sethi $r1 0x20000</div><div class='ctx'> 		mov $r2 0xd</div><div class='ctx'> 		iowr I[$r1] $r2		// STRAND_CMD(0x3f) = 0x0d</div><div class='del'>-		call strand_wait</div><div class='add'>+		call #strand_wait</div><div class='ctx'> </div><div class='ctx'> 	// mark completion in HUB's barrier</div><div class='ctx'> 	ctx_xfer_done:</div><div class='del'>-	call hub_barrier_done</div><div class='add'>+	call #hub_barrier_done</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='ctx'> .align 256</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvc0_grgpc.fuc.h b/drivers/gpu/drm/nouveau/nvc0_grgpc.fuc.h<br/>index 6f820324480e..a988b8ad00ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_grgpc.fuc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_grgpc.fuc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_grgpc.fuc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nvc0_grgpc.fuc.h</a></div><div class='hunk'>@@ -25,26 +25,29 @@ uint32_t nvc0_grgpc_data[] = {</div><div class='ctx'> 	0x00000000,</div><div class='ctx'> 	0x00000000,</div><div class='ctx'> 	0x000000c0,</div><div class='del'>-	0x011c00bc,</div><div class='del'>-	0x01700120,</div><div class='add'>+	0x012800c8,</div><div class='add'>+	0x01e40194,</div><div class='ctx'> 	0x000000c1,</div><div class='del'>-	0x012000bc,</div><div class='del'>-	0x01840120,</div><div class='add'>+	0x012c00c8,</div><div class='add'>+	0x01f80194,</div><div class='ctx'> 	0x000000c3,</div><div class='del'>-	0x011c00bc,</div><div class='del'>-	0x01800120,</div><div class='add'>+	0x012800c8,</div><div class='add'>+	0x01f40194,</div><div class='ctx'> 	0x000000c4,</div><div class='del'>-	0x011c00bc,</div><div class='del'>-	0x01800120,</div><div class='add'>+	0x012800c8,</div><div class='add'>+	0x01f40194,</div><div class='ctx'> 	0x000000c8,</div><div class='del'>-	0x011c00bc,</div><div class='del'>-	0x01700120,</div><div class='add'>+	0x012800c8,</div><div class='add'>+	0x01e40194,</div><div class='ctx'> 	0x000000ce,</div><div class='del'>-	0x011c00bc,</div><div class='del'>-	0x01800120,</div><div class='add'>+	0x012800c8,</div><div class='add'>+	0x01f40194,</div><div class='ctx'> 	0x000000cf,</div><div class='del'>-	0x011c00bc,</div><div class='del'>-	0x017c0120,</div><div class='add'>+	0x012800c8,</div><div class='add'>+	0x01f00194,</div><div class='add'>+	0x000000d9,</div><div class='add'>+	0x0194012c,</div><div class='add'>+	0x025401f8,</div><div class='ctx'> 	0x00000000,</div><div class='ctx'> 	0x00000380,</div><div class='ctx'> 	0x14000400,</div><div class='hunk'>@@ -71,6 +74,32 @@ uint32_t nvc0_grgpc_data[] = {</div><div class='ctx'> 	0x08001000,</div><div class='ctx'> 	0x00001014,</div><div class='ctx'> 	0x00000c6c,</div><div class='add'>+	0x00000380,</div><div class='add'>+	0x04000400,</div><div class='add'>+	0x0800040c,</div><div class='add'>+	0x20000450,</div><div class='add'>+	0x00000600,</div><div class='add'>+	0x00000684,</div><div class='add'>+	0x10000700,</div><div class='add'>+	0x00000800,</div><div class='add'>+	0x08000808,</div><div class='add'>+	0x00000828,</div><div class='add'>+	0x00000830,</div><div class='add'>+	0x000008d8,</div><div class='add'>+	0x000008e0,</div><div class='add'>+	0x140008e8,</div><div class='add'>+	0x0000091c,</div><div class='add'>+	0x08000924,</div><div class='add'>+	0x00000b00,</div><div class='add'>+	0x14000b08,</div><div class='add'>+	0x00000bb8,</div><div class='add'>+	0x00000c08,</div><div class='add'>+	0x1c000c10,</div><div class='add'>+	0x00000c6c,</div><div class='add'>+	0x00000c80,</div><div class='add'>+	0x00000c8c,</div><div class='add'>+	0x08001000,</div><div class='add'>+	0x00001014,</div><div class='ctx'> 	0x00000018,</div><div class='ctx'> 	0x0000003c,</div><div class='ctx'> 	0x00000048,</div><div class='hunk'>@@ -96,6 +125,29 @@ uint32_t nvc0_grgpc_data[] = {</div><div class='ctx'> 	0x000006e0,</div><div class='ctx'> 	0x000004bc,</div><div class='ctx'> 	0x00000544,</div><div class='add'>+	0x00000018,</div><div class='add'>+	0x0000003c,</div><div class='add'>+	0x00000048,</div><div class='add'>+	0x00000064,</div><div class='add'>+	0x00000088,</div><div class='add'>+	0x14000200,</div><div class='add'>+	0x0400021c,</div><div class='add'>+	0x000002c4,</div><div class='add'>+	0x14000300,</div><div class='add'>+	0x000003d0,</div><div class='add'>+	0x040003e0,</div><div class='add'>+	0x08000400,</div><div class='add'>+	0x08000420,</div><div class='add'>+	0x000004b0,</div><div class='add'>+	0x000004e8,</div><div class='add'>+	0x000004f4,</div><div class='add'>+	0x04000520,</div><div class='add'>+	0x00000544,</div><div class='add'>+	0x0c000604,</div><div class='add'>+	0x4c000644,</div><div class='add'>+	0x00000698,</div><div class='add'>+	0x000006e0,</div><div class='add'>+	0x08000750,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> uint32_t nvc0_grgpc_code[] = {</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvc0_grhub.fuc b/drivers/gpu/drm/nouveau/nvc0_grhub.fuc<br/>index e4f8c7e89ddd..98acddb2c5bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_grhub.fuc?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_grhub.fuc</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_grhub.fuc?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nvc0_grhub.fuc</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'>  *    m4 nvc0_grhub.fuc | envyas -a -w -m fuc -V nva3 -o nvc0_grhub.fuc.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-.section nvc0_grhub_data</div><div class='add'>+.section #nvc0_grhub_data</div><div class='ctx'> include(`nvc0_graph.fuc')</div><div class='ctx'> gpc_count:		.b32 0</div><div class='ctx'> rop_count:		.b32 0</div><div class='hunk'>@@ -39,26 +39,29 @@ ctx_current:		.b32 0</div><div class='ctx'> </div><div class='ctx'> chipsets:</div><div class='ctx'> .b8  0xc0 0 0 0</div><div class='del'>-.b16 nvc0_hub_mmio_head</div><div class='del'>-.b16 nvc0_hub_mmio_tail</div><div class='add'>+.b16 #nvc0_hub_mmio_head</div><div class='add'>+.b16 #nvc0_hub_mmio_tail</div><div class='ctx'> .b8  0xc1 0 0 0</div><div class='del'>-.b16 nvc0_hub_mmio_head</div><div class='del'>-.b16 nvc1_hub_mmio_tail</div><div class='add'>+.b16 #nvc0_hub_mmio_head</div><div class='add'>+.b16 #nvc1_hub_mmio_tail</div><div class='ctx'> .b8  0xc3 0 0 0</div><div class='del'>-.b16 nvc0_hub_mmio_head</div><div class='del'>-.b16 nvc0_hub_mmio_tail</div><div class='add'>+.b16 #nvc0_hub_mmio_head</div><div class='add'>+.b16 #nvc0_hub_mmio_tail</div><div class='ctx'> .b8  0xc4 0 0 0</div><div class='del'>-.b16 nvc0_hub_mmio_head</div><div class='del'>-.b16 nvc0_hub_mmio_tail</div><div class='add'>+.b16 #nvc0_hub_mmio_head</div><div class='add'>+.b16 #nvc0_hub_mmio_tail</div><div class='ctx'> .b8  0xc8 0 0 0</div><div class='del'>-.b16 nvc0_hub_mmio_head</div><div class='del'>-.b16 nvc0_hub_mmio_tail</div><div class='add'>+.b16 #nvc0_hub_mmio_head</div><div class='add'>+.b16 #nvc0_hub_mmio_tail</div><div class='ctx'> .b8  0xce 0 0 0</div><div class='del'>-.b16 nvc0_hub_mmio_head</div><div class='del'>-.b16 nvc0_hub_mmio_tail</div><div class='add'>+.b16 #nvc0_hub_mmio_head</div><div class='add'>+.b16 #nvc0_hub_mmio_tail</div><div class='ctx'> .b8  0xcf 0 0 0</div><div class='del'>-.b16 nvc0_hub_mmio_head</div><div class='del'>-.b16 nvc0_hub_mmio_tail</div><div class='add'>+.b16 #nvc0_hub_mmio_head</div><div class='add'>+.b16 #nvc0_hub_mmio_tail</div><div class='add'>+.b8  0xd9 0 0 0</div><div class='add'>+.b16 #nvd9_hub_mmio_head</div><div class='add'>+.b16 #nvd9_hub_mmio_tail</div><div class='ctx'> .b8  0 0 0 0</div><div class='ctx'> </div><div class='ctx'> nvc0_hub_mmio_head:</div><div class='hunk'>@@ -105,6 +108,48 @@ nvc0_hub_mmio_tail:</div><div class='ctx'> mmctx_data(0x4064c0, 2)</div><div class='ctx'> nvc1_hub_mmio_tail:</div><div class='ctx'> </div><div class='add'>+nvd9_hub_mmio_head:</div><div class='add'>+mmctx_data(0x17e91c, 2)</div><div class='add'>+mmctx_data(0x400204, 2)</div><div class='add'>+mmctx_data(0x404004, 10)</div><div class='add'>+mmctx_data(0x404044, 1)</div><div class='add'>+mmctx_data(0x404094, 14)</div><div class='add'>+mmctx_data(0x4040d0, 7)</div><div class='add'>+mmctx_data(0x4040f8, 1)</div><div class='add'>+mmctx_data(0x404130, 3)</div><div class='add'>+mmctx_data(0x404150, 3)</div><div class='add'>+mmctx_data(0x404164, 2)</div><div class='add'>+mmctx_data(0x404178, 2)</div><div class='add'>+mmctx_data(0x404200, 8)</div><div class='add'>+mmctx_data(0x404404, 14)</div><div class='add'>+mmctx_data(0x404460, 4)</div><div class='add'>+mmctx_data(0x404480, 1)</div><div class='add'>+mmctx_data(0x404498, 1)</div><div class='add'>+mmctx_data(0x404604, 4)</div><div class='add'>+mmctx_data(0x404618, 32)</div><div class='add'>+mmctx_data(0x404698, 21)</div><div class='add'>+mmctx_data(0x4046f0, 2)</div><div class='add'>+mmctx_data(0x404700, 22)</div><div class='add'>+mmctx_data(0x405800, 1)</div><div class='add'>+mmctx_data(0x405830, 3)</div><div class='add'>+mmctx_data(0x405854, 1)</div><div class='add'>+mmctx_data(0x405870, 4)</div><div class='add'>+mmctx_data(0x405a00, 2)</div><div class='add'>+mmctx_data(0x405a18, 1)</div><div class='add'>+mmctx_data(0x406020, 1)</div><div class='add'>+mmctx_data(0x406028, 4)</div><div class='add'>+mmctx_data(0x4064a8, 2)</div><div class='add'>+mmctx_data(0x4064b4, 5)</div><div class='add'>+mmctx_data(0x407804, 1)</div><div class='add'>+mmctx_data(0x40780c, 6)</div><div class='add'>+mmctx_data(0x4078bc, 1)</div><div class='add'>+mmctx_data(0x408000, 7)</div><div class='add'>+mmctx_data(0x408064, 1)</div><div class='add'>+mmctx_data(0x408800, 3)</div><div class='add'>+mmctx_data(0x408900, 4)</div><div class='add'>+mmctx_data(0x408980, 1)</div><div class='add'>+nvd9_hub_mmio_tail:</div><div class='add'>+</div><div class='ctx'> .align 256</div><div class='ctx'> chan_data:</div><div class='ctx'> chan_mmio_count:	.b32 0</div><div class='hunk'>@@ -113,8 +158,8 @@ chan_mmio_address:	.b32 0</div><div class='ctx'> .align 256</div><div class='ctx'> xfer_data: 		.b32 0</div><div class='ctx'> </div><div class='del'>-.section nvc0_grhub_code</div><div class='del'>-bra init</div><div class='add'>+.section #nvc0_grhub_code</div><div class='add'>+bra #init</div><div class='ctx'> define(`include_code')</div><div class='ctx'> include(`nvc0_graph.fuc')</div><div class='ctx'> </div><div class='hunk'>@@ -157,7 +202,7 @@ init:</div><div class='ctx'> 	iowr I[$r1 + 0x000] $r2	// FIFO_ENABLE</div><div class='ctx'> </div><div class='ctx'> 	// setup i0 handler, and route all interrupts to it</div><div class='del'>-	mov $r1 ih</div><div class='add'>+	mov $r1 #ih</div><div class='ctx'> 	mov $iv0 $r1</div><div class='ctx'> 	mov $r1 0x400</div><div class='ctx'> 	iowr I[$r1 + 0x300] $r0	// INTR_DISPATCH</div><div class='hunk'>@@ -201,11 +246,11 @@ init:</div><div class='ctx'> 	// fetch enabled GPC/ROP counts</div><div class='ctx'> 	mov $r14 -0x69fc	// 0x409604</div><div class='ctx'> 	sethi $r14 0x400000</div><div class='del'>-	call nv_rd32</div><div class='add'>+	call #nv_rd32</div><div class='ctx'> 	extr $r1 $r15 16:20</div><div class='del'>-	st b32 D[$r0 + rop_count] $r1</div><div class='add'>+	st b32 D[$r0 + #rop_count] $r1</div><div class='ctx'> 	and $r15 0x1f</div><div class='del'>-	st b32 D[$r0 + gpc_count] $r15</div><div class='add'>+	st b32 D[$r0 + #gpc_count] $r15</div><div class='ctx'> </div><div class='ctx'> 	// set BAR_REQMASK to GPC mask</div><div class='ctx'> 	mov $r1 1</div><div class='hunk'>@@ -220,14 +265,14 @@ init:</div><div class='ctx'> 	mov $r2 0x800</div><div class='ctx'> 	shl b32 $r2 6</div><div class='ctx'> 	iord $r2 I[$r2 + 0x000]		// CC_SCRATCH[0]</div><div class='del'>-	mov $r15 chipsets - 8</div><div class='add'>+	mov $r15 #chipsets - 8</div><div class='ctx'> 	init_find_chipset:</div><div class='ctx'> 		add b32 $r15 8</div><div class='ctx'> 		ld b32 $r3 D[$r15 + 0x00]</div><div class='ctx'> 		cmpu b32 $r3 $r2</div><div class='del'>-		bra e init_context</div><div class='add'>+		bra e #init_context</div><div class='ctx'> 		cmpu b32 $r3 0</div><div class='del'>-		bra ne init_find_chipset</div><div class='add'>+		bra ne #init_find_chipset</div><div class='ctx'> 		// unknown chipset</div><div class='ctx'> 		ret</div><div class='ctx'> </div><div class='hunk'>@@ -239,9 +284,9 @@ init:</div><div class='ctx'> 	ld b16 $r14 D[$r15 + 4]</div><div class='ctx'> 	ld b16 $r15 D[$r15 + 6]</div><div class='ctx'> 	sethi $r14 0</div><div class='del'>-	st b32 D[$r0 + hub_mmio_list_head] $r14</div><div class='del'>-	st b32 D[$r0 + hub_mmio_list_tail] $r15</div><div class='del'>-	call mmctx_size</div><div class='add'>+	st b32 D[$r0 + #hub_mmio_list_head] $r14</div><div class='add'>+	st b32 D[$r0 + #hub_mmio_list_tail] $r15</div><div class='add'>+	call #mmctx_size</div><div class='ctx'> </div><div class='ctx'> 	// set mmctx base addresses now so we don't have to do it later,</div><div class='ctx'> 	// they don't (currently) ever change</div><div class='hunk'>@@ -260,7 +305,7 @@ init:</div><div class='ctx'> 	add b32 $r1 1</div><div class='ctx'> 	shl b32 $r1 8</div><div class='ctx'> 	mov b32 $r15 $r1</div><div class='del'>-	call strand_ctx_init</div><div class='add'>+	call #strand_ctx_init</div><div class='ctx'> 	add b32 $r1 $r15</div><div class='ctx'> </div><div class='ctx'> 	// initialise each GPC in sequence by passing in the offset of its</div><div class='hunk'>@@ -271,40 +316,40 @@ init:</div><div class='ctx'> 	// when it has completed, and return the size of its context data</div><div class='ctx'> 	// in GPCn_CC_SCRATCH[1]</div><div class='ctx'> 	//</div><div class='del'>-	ld b32 $r3 D[$r0 + gpc_count]</div><div class='add'>+	ld b32 $r3 D[$r0 + #gpc_count]</div><div class='ctx'> 	mov $r4 0x2000</div><div class='ctx'> 	sethi $r4 0x500000</div><div class='ctx'> 	init_gpc:</div><div class='ctx'> 		// setup, and start GPC ucode running</div><div class='ctx'> 		add b32 $r14 $r4 0x804</div><div class='ctx'> 		mov b32 $r15 $r1</div><div class='del'>-		call nv_wr32			// CC_SCRATCH[1] = ctx offset</div><div class='add'>+		call #nv_wr32			// CC_SCRATCH[1] = ctx offset</div><div class='ctx'> 		add b32 $r14 $r4 0x800</div><div class='ctx'> 		mov b32 $r15 $r2</div><div class='del'>-		call nv_wr32			// CC_SCRATCH[0] = chipset</div><div class='add'>+		call #nv_wr32			// CC_SCRATCH[0] = chipset</div><div class='ctx'> 		add b32 $r14 $r4 0x10c</div><div class='ctx'> 		clear b32 $r15</div><div class='del'>-		call nv_wr32</div><div class='add'>+		call #nv_wr32</div><div class='ctx'> 		add b32 $r14 $r4 0x104</div><div class='del'>-		call nv_wr32			// ENTRY</div><div class='add'>+		call #nv_wr32			// ENTRY</div><div class='ctx'> 		add b32 $r14 $r4 0x100</div><div class='ctx'> 		mov $r15 2			// CTRL_START_TRIGGER</div><div class='del'>-		call nv_wr32			// CTRL</div><div class='add'>+		call #nv_wr32			// CTRL</div><div class='ctx'> </div><div class='ctx'> 		// wait for it to complete, and adjust context size</div><div class='ctx'> 		add b32 $r14 $r4 0x800</div><div class='ctx'> 		init_gpc_wait:</div><div class='del'>-			call nv_rd32</div><div class='add'>+			call #nv_rd32</div><div class='ctx'> 			xbit $r15 $r15 31</div><div class='del'>-			bra e init_gpc_wait</div><div class='add'>+			bra e #init_gpc_wait</div><div class='ctx'> 		add b32 $r14 $r4 0x804</div><div class='del'>-		call nv_rd32</div><div class='add'>+		call #nv_rd32</div><div class='ctx'> 		add b32 $r1 $r15</div><div class='ctx'> </div><div class='ctx'> 		// next!</div><div class='ctx'> 		add b32 $r4 0x8000</div><div class='ctx'> 		sub b32 $r3 1</div><div class='del'>-		bra ne init_gpc</div><div class='add'>+		bra ne #init_gpc</div><div class='ctx'> </div><div class='ctx'> 	// save context size, and tell host we're ready</div><div class='ctx'> 	mov $r2 0x800</div><div class='hunk'>@@ -322,13 +367,13 @@ main:</div><div class='ctx'> 	// sleep until we have something to do</div><div class='ctx'> 	bset $flags $p0</div><div class='ctx'> 	sleep $p0</div><div class='del'>-	mov $r13 cmd_queue</div><div class='del'>-	call queue_get</div><div class='del'>-	bra $p1 main</div><div class='add'>+	mov $r13 #cmd_queue</div><div class='add'>+	call #queue_get</div><div class='add'>+	bra $p1 #main</div><div class='ctx'> </div><div class='ctx'> 	// context switch, requested by GPU?</div><div class='ctx'> 	cmpu b32 $r14 0x4001</div><div class='del'>-	bra ne main_not_ctx_switch</div><div class='add'>+	bra ne #main_not_ctx_switch</div><div class='ctx'> 		trace_set(T_AUTO)</div><div class='ctx'> 		mov $r1 0xb00</div><div class='ctx'> 		shl b32 $r1 6</div><div class='hunk'>@@ -336,39 +381,39 @@ main:</div><div class='ctx'> 		iord $r1 I[$r1 + 0x000]		// CHAN_CUR</div><div class='ctx'> </div><div class='ctx'> 		xbit $r3 $r1 31</div><div class='del'>-		bra e chsw_no_prev</div><div class='add'>+		bra e #chsw_no_prev</div><div class='ctx'> 			xbit $r3 $r2 31</div><div class='del'>-			bra e chsw_prev_no_next</div><div class='add'>+			bra e #chsw_prev_no_next</div><div class='ctx'> 				push $r2</div><div class='ctx'> 				mov b32 $r2 $r1</div><div class='ctx'> 				trace_set(T_SAVE)</div><div class='ctx'> 				bclr $flags $p1</div><div class='ctx'> 				bset $flags $p2</div><div class='del'>-				call ctx_xfer</div><div class='add'>+				call #ctx_xfer</div><div class='ctx'> 				trace_clr(T_SAVE);</div><div class='ctx'> 				pop $r2</div><div class='ctx'> 				trace_set(T_LOAD);</div><div class='ctx'> 				bset $flags $p1</div><div class='del'>-				call ctx_xfer</div><div class='add'>+				call #ctx_xfer</div><div class='ctx'> 				trace_clr(T_LOAD);</div><div class='del'>-				bra chsw_done</div><div class='add'>+				bra #chsw_done</div><div class='ctx'> 			chsw_prev_no_next:</div><div class='ctx'> 				push $r2</div><div class='ctx'> 				mov b32 $r2 $r1</div><div class='ctx'> 				bclr $flags $p1</div><div class='ctx'> 				bclr $flags $p2</div><div class='del'>-				call ctx_xfer</div><div class='add'>+				call #ctx_xfer</div><div class='ctx'> 				pop $r2</div><div class='ctx'> 				mov $r1 0xb00</div><div class='ctx'> 				shl b32 $r1 6</div><div class='ctx'> 				iowr I[$r1] $r2</div><div class='del'>-				bra chsw_done</div><div class='add'>+				bra #chsw_done</div><div class='ctx'> 		chsw_no_prev:</div><div class='ctx'> 			xbit $r3 $r2 31</div><div class='del'>-			bra e chsw_done</div><div class='add'>+			bra e #chsw_done</div><div class='ctx'> 				bset $flags $p1</div><div class='ctx'> 				bclr $flags $p2</div><div class='del'>-				call ctx_xfer</div><div class='add'>+				call #ctx_xfer</div><div class='ctx'> </div><div class='ctx'> 		// ack the context switch request</div><div class='ctx'> 		chsw_done:</div><div class='hunk'>@@ -377,32 +422,32 @@ main:</div><div class='ctx'> 		mov $r2 1</div><div class='ctx'> 		iowr I[$r1 + 0x000] $r2		// 0x409b0c</div><div class='ctx'> 		trace_clr(T_AUTO)</div><div class='del'>-		bra main</div><div class='add'>+		bra #main</div><div class='ctx'> </div><div class='ctx'> 	// request to set current channel? (*not* a context switch)</div><div class='ctx'> 	main_not_ctx_switch:</div><div class='ctx'> 	cmpu b32 $r14 0x0001</div><div class='del'>-	bra ne main_not_ctx_chan</div><div class='add'>+	bra ne #main_not_ctx_chan</div><div class='ctx'> 		mov b32 $r2 $r15</div><div class='del'>-		call ctx_chan</div><div class='del'>-		bra main_done</div><div class='add'>+		call #ctx_chan</div><div class='add'>+		bra #main_done</div><div class='ctx'> </div><div class='ctx'> 	// request to store current channel context?</div><div class='ctx'> 	main_not_ctx_chan:</div><div class='ctx'> 	cmpu b32 $r14 0x0002</div><div class='del'>-	bra ne main_not_ctx_save</div><div class='add'>+	bra ne #main_not_ctx_save</div><div class='ctx'> 		trace_set(T_SAVE)</div><div class='ctx'> 		bclr $flags $p1</div><div class='ctx'> 		bclr $flags $p2</div><div class='del'>-		call ctx_xfer</div><div class='add'>+		call #ctx_xfer</div><div class='ctx'> 		trace_clr(T_SAVE)</div><div class='del'>-		bra main_done</div><div class='add'>+		bra #main_done</div><div class='ctx'> </div><div class='ctx'> 	main_not_ctx_save:</div><div class='ctx'> 		shl b32 $r15 $r14 16</div><div class='ctx'> 		or $r15 E_BAD_COMMAND</div><div class='del'>-		call error</div><div class='del'>-		bra main</div><div class='add'>+		call #error</div><div class='add'>+		bra #main</div><div class='ctx'> </div><div class='ctx'> 	main_done:</div><div class='ctx'> 	mov $r1 0x820</div><div class='hunk'>@@ -410,7 +455,7 @@ main:</div><div class='ctx'> 	clear b32 $r2</div><div class='ctx'> 	bset $r2 31</div><div class='ctx'> 	iowr I[$r1 + 0x000] $r2		// CC_SCRATCH[0] |= 0x80000000</div><div class='del'>-	bra main</div><div class='add'>+	bra #main</div><div class='ctx'> </div><div class='ctx'> // interrupt handler</div><div class='ctx'> ih:</div><div class='hunk'>@@ -427,13 +472,13 @@ ih:</div><div class='ctx'> 	// incoming fifo command?</div><div class='ctx'> 	iord $r10 I[$r0 + 0x200]	// INTR</div><div class='ctx'> 	and $r11 $r10 0x00000004</div><div class='del'>-	bra e ih_no_fifo</div><div class='add'>+	bra e #ih_no_fifo</div><div class='ctx'> 		// queue incoming fifo command for later processing</div><div class='ctx'> 		mov $r11 0x1900</div><div class='del'>-		mov $r13 cmd_queue</div><div class='add'>+		mov $r13 #cmd_queue</div><div class='ctx'> 		iord $r14 I[$r11 + 0x100]	// FIFO_CMD</div><div class='ctx'> 		iord $r15 I[$r11 + 0x000]	// FIFO_DATA</div><div class='del'>-		call queue_put</div><div class='add'>+		call #queue_put</div><div class='ctx'> 		add b32 $r11 0x400</div><div class='ctx'> 		mov $r14 1</div><div class='ctx'> 		iowr I[$r11 + 0x000] $r14	// FIFO_ACK</div><div class='hunk'>@@ -441,18 +486,18 @@ ih:</div><div class='ctx'> 	// context switch request?</div><div class='ctx'> 	ih_no_fifo:</div><div class='ctx'> 	and $r11 $r10 0x00000100</div><div class='del'>-	bra e ih_no_ctxsw</div><div class='add'>+	bra e #ih_no_ctxsw</div><div class='ctx'> 		// enqueue a context switch for later processing</div><div class='del'>-		mov $r13 cmd_queue</div><div class='add'>+		mov $r13 #cmd_queue</div><div class='ctx'> 		mov $r14 0x4001</div><div class='del'>-		call queue_put</div><div class='add'>+		call #queue_put</div><div class='ctx'> </div><div class='ctx'> 	// anything we didn't handle, bring it to the host's attention</div><div class='ctx'> 	ih_no_ctxsw:</div><div class='ctx'> 	mov $r11 0x104</div><div class='ctx'> 	not b32 $r11</div><div class='ctx'> 	and $r11 $r10 $r11</div><div class='del'>-	bra e ih_no_other</div><div class='add'>+	bra e #ih_no_other</div><div class='ctx'> 		mov $r10 0xc1c</div><div class='ctx'> 		shl b32 $r10 6</div><div class='ctx'> 		iowr I[$r10] $r11	// INTR_UP_SET</div><div class='hunk'>@@ -478,11 +523,11 @@ ctx_4160s:</div><div class='ctx'> 	mov $r14 0x4160</div><div class='ctx'> 	sethi $r14 0x400000</div><div class='ctx'> 	mov $r15 1</div><div class='del'>-	call nv_wr32</div><div class='add'>+	call #nv_wr32</div><div class='ctx'> 	ctx_4160s_wait:</div><div class='del'>-		call nv_rd32</div><div class='add'>+		call #nv_rd32</div><div class='ctx'> 		xbit $r15 $r15 4</div><div class='del'>-		bra e ctx_4160s_wait</div><div class='add'>+		bra e #ctx_4160s_wait</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='ctx'> // Without clearing again at end of xfer, some things cause PGRAPH</div><div class='hunk'>@@ -492,7 +537,7 @@ ctx_4160c:</div><div class='ctx'> 	mov $r14 0x4160</div><div class='ctx'> 	sethi $r14 0x400000</div><div class='ctx'> 	clear b32 $r15</div><div class='del'>-	call nv_wr32</div><div class='add'>+	call #nv_wr32</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='ctx'> // Again, not real sure</div><div class='hunk'>@@ -503,7 +548,7 @@ ctx_4170s:</div><div class='ctx'> 	mov $r14 0x4170</div><div class='ctx'> 	sethi $r14 0x400000</div><div class='ctx'> 	or $r15 0x10</div><div class='del'>-	call nv_wr32</div><div class='add'>+	call #nv_wr32</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='ctx'> // Waits for a ctx_4170s() call to complete</div><div class='hunk'>@@ -511,9 +556,9 @@ ctx_4170s:</div><div class='ctx'> ctx_4170w:</div><div class='ctx'> 	mov $r14 0x4170</div><div class='ctx'> 	sethi $r14 0x400000</div><div class='del'>-	call nv_rd32</div><div class='add'>+	call #nv_rd32</div><div class='ctx'> 	and $r15 0x10</div><div class='del'>-	bra ne ctx_4170w</div><div class='add'>+	bra ne #ctx_4170w</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='ctx'> // Disables various things, waits a bit, and re-enables them..</div><div class='hunk'>@@ -530,7 +575,7 @@ ctx_redswitch:</div><div class='ctx'> 	mov $r15 8</div><div class='ctx'> 	ctx_redswitch_delay:</div><div class='ctx'> 		sub b32 $r15 1</div><div class='del'>-		bra ne ctx_redswitch_delay</div><div class='add'>+		bra ne #ctx_redswitch_delay</div><div class='ctx'> 	mov $r15 0x770</div><div class='ctx'> 	iowr I[$r14] $r15	// HUB_RED_SWITCH = ENABLE_ALL, POWER_ALL</div><div class='ctx'> 	ret</div><div class='hunk'>@@ -546,10 +591,10 @@ ctx_86c:</div><div class='ctx'> 	iowr I[$r14] $r15	// HUB(0x86c) = val</div><div class='ctx'> 	mov $r14 -0x75ec</div><div class='ctx'> 	sethi $r14 0x400000</div><div class='del'>-	call nv_wr32		// ROP(0xa14) = val</div><div class='add'>+	call #nv_wr32		// ROP(0xa14) = val</div><div class='ctx'> 	mov $r14 -0x5794</div><div class='ctx'> 	sethi $r14 0x410000</div><div class='del'>-	call nv_wr32		// GPC(0x86c) = val</div><div class='add'>+	call #nv_wr32		// GPC(0x86c) = val</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='ctx'> // ctx_load - load's a channel's ctxctl data, and selects its vm</div><div class='hunk'>@@ -561,7 +606,7 @@ ctx_load:</div><div class='ctx'> </div><div class='ctx'> 	// switch to channel, somewhat magic in parts..</div><div class='ctx'> 	mov $r10 12		// DONE_UNK12</div><div class='del'>-	call wait_donez</div><div class='add'>+	call #wait_donez</div><div class='ctx'> 	mov $r1 0xa24</div><div class='ctx'> 	shl b32 $r1 6</div><div class='ctx'> 	iowr I[$r1 + 0x000] $r0	// 0x409a24</div><div class='hunk'>@@ -576,7 +621,7 @@ ctx_load:</div><div class='ctx'> 	ctx_chan_wait_0:</div><div class='ctx'> 		iord $r4 I[$r1 + 0x100]</div><div class='ctx'> 		and $r4 0x1f</div><div class='del'>-		bra ne ctx_chan_wait_0</div><div class='add'>+		bra ne #ctx_chan_wait_0</div><div class='ctx'> 	iowr I[$r3 + 0x000] $r2	// CHAN_CUR</div><div class='ctx'> </div><div class='ctx'> 	// load channel header, fetch PGRAPH context pointer</div><div class='hunk'>@@ -595,19 +640,19 @@ ctx_load:</div><div class='ctx'> 	sethi $r2 0x80000000</div><div class='ctx'> 	iowr I[$r1 + 0x000] $r2		// MEM_TARGET = vram</div><div class='ctx'> 	mov $r1 0x10			// chan + 0x0210</div><div class='del'>-	mov $r2 xfer_data</div><div class='add'>+	mov $r2 #xfer_data</div><div class='ctx'> 	sethi $r2 0x00020000		// 16 bytes</div><div class='ctx'> 	xdld $r1 $r2</div><div class='ctx'> 	xdwait</div><div class='ctx'> 	trace_clr(T_LCHAN)</div><div class='ctx'> </div><div class='ctx'> 	// update current context</div><div class='del'>-	ld b32 $r1 D[$r0 + xfer_data + 4]</div><div class='add'>+	ld b32 $r1 D[$r0 + #xfer_data + 4]</div><div class='ctx'> 	shl b32 $r1 24</div><div class='del'>-	ld b32 $r2 D[$r0 + xfer_data + 0]</div><div class='add'>+	ld b32 $r2 D[$r0 + #xfer_data + 0]</div><div class='ctx'> 	shr b32 $r2 8</div><div class='ctx'> 	or $r1 $r2</div><div class='del'>-	st b32 D[$r0 + ctx_current] $r1</div><div class='add'>+	st b32 D[$r0 + #ctx_current] $r1</div><div class='ctx'> </div><div class='ctx'> 	// set transfer base to start of context, and fetch context header</div><div class='ctx'> 	trace_set(T_LCTXH)</div><div class='hunk'>@@ -618,7 +663,7 @@ ctx_load:</div><div class='ctx'> 	mov $r1 0xa20</div><div class='ctx'> 	shl b32 $r1 6</div><div class='ctx'> 	iowr I[$r1 + 0x000] $r2		// MEM_TARGET = vm</div><div class='del'>-	mov $r1 chan_data</div><div class='add'>+	mov $r1 #chan_data</div><div class='ctx'> 	sethi $r1 0x00060000		// 256 bytes</div><div class='ctx'> 	xdld $r0 $r1</div><div class='ctx'> 	xdwait</div><div class='hunk'>@@ -635,10 +680,10 @@ ctx_load:</div><div class='ctx'> // In: $r2 channel address</div><div class='ctx'> //</div><div class='ctx'> ctx_chan:</div><div class='del'>-	call ctx_4160s</div><div class='del'>-	call ctx_load</div><div class='add'>+	call #ctx_4160s</div><div class='add'>+	call #ctx_load</div><div class='ctx'> 	mov $r10 12			// DONE_UNK12</div><div class='del'>-	call wait_donez</div><div class='add'>+	call #wait_donez</div><div class='ctx'> 	mov $r1 0xa10</div><div class='ctx'> 	shl b32 $r1 6</div><div class='ctx'> 	mov $r2 5</div><div class='hunk'>@@ -646,8 +691,8 @@ ctx_chan:</div><div class='ctx'> 	ctx_chan_wait:</div><div class='ctx'> 		iord $r2 I[$r1 + 0x000]</div><div class='ctx'> 		or $r2 $r2</div><div class='del'>-		bra ne ctx_chan_wait</div><div class='del'>-	call ctx_4160c</div><div class='add'>+		bra ne #ctx_chan_wait</div><div class='add'>+	call #ctx_4160c</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='ctx'> // Execute per-context state overrides list</div><div class='hunk'>@@ -661,7 +706,7 @@ ctx_chan:</div><div class='ctx'> //</div><div class='ctx'> ctx_mmio_exec:</div><div class='ctx'> 	// set transfer base to be the mmio list</div><div class='del'>-	ld b32 $r3 D[$r0 + chan_mmio_address]</div><div class='add'>+	ld b32 $r3 D[$r0 + #chan_mmio_address]</div><div class='ctx'> 	mov $r2 0xa04</div><div class='ctx'> 	shl b32 $r2 6</div><div class='ctx'> 	iowr I[$r2 + 0x000] $r3		// MEM_BASE</div><div class='hunk'>@@ -670,31 +715,31 @@ ctx_mmio_exec:</div><div class='ctx'> 	ctx_mmio_loop:</div><div class='ctx'> 		// fetch next 256 bytes of mmio list if necessary</div><div class='ctx'> 		and $r4 $r3 0xff</div><div class='del'>-		bra ne ctx_mmio_pull</div><div class='del'>-			mov $r5 xfer_data</div><div class='add'>+		bra ne #ctx_mmio_pull</div><div class='add'>+			mov $r5 #xfer_data</div><div class='ctx'> 			sethi $r5 0x00060000	// 256 bytes</div><div class='ctx'> 			xdld $r3 $r5</div><div class='ctx'> 			xdwait</div><div class='ctx'> </div><div class='ctx'> 		// execute a single list entry</div><div class='ctx'> 		ctx_mmio_pull:</div><div class='del'>-		ld b32 $r14 D[$r4 + xfer_data + 0x00]</div><div class='del'>-		ld b32 $r15 D[$r4 + xfer_data + 0x04]</div><div class='del'>-		call nv_wr32</div><div class='add'>+		ld b32 $r14 D[$r4 + #xfer_data + 0x00]</div><div class='add'>+		ld b32 $r15 D[$r4 + #xfer_data + 0x04]</div><div class='add'>+		call #nv_wr32</div><div class='ctx'> </div><div class='ctx'> 		// next!</div><div class='ctx'> 		add b32 $r3 8</div><div class='ctx'> 		sub b32 $r1 1</div><div class='del'>-		bra ne ctx_mmio_loop</div><div class='add'>+		bra ne #ctx_mmio_loop</div><div class='ctx'> </div><div class='ctx'> 	// set transfer base back to the current context</div><div class='ctx'> 	ctx_mmio_done:</div><div class='del'>-	ld b32 $r3 D[$r0 + ctx_current]</div><div class='add'>+	ld b32 $r3 D[$r0 + #ctx_current]</div><div class='ctx'> 	iowr I[$r2 + 0x000] $r3		// MEM_BASE</div><div class='ctx'> </div><div class='ctx'> 	// disable the mmio list now, we don't need/want to execute it again</div><div class='del'>-	st b32 D[$r0 + chan_mmio_count] $r0</div><div class='del'>-	mov $r1 chan_data</div><div class='add'>+	st b32 D[$r0 + #chan_mmio_count] $r0</div><div class='add'>+	mov $r1 #chan_data</div><div class='ctx'> 	sethi $r1 0x00060000		// 256 bytes</div><div class='ctx'> 	xdst $r0 $r1</div><div class='ctx'> 	xdwait</div><div class='hunk'>@@ -709,46 +754,46 @@ ctx_mmio_exec:</div><div class='ctx'> //		on load it means: "a save preceeded this load"</div><div class='ctx'> //</div><div class='ctx'> ctx_xfer:</div><div class='del'>-	bra not $p1 ctx_xfer_pre</div><div class='del'>-	bra $p2 ctx_xfer_pre_load</div><div class='add'>+	bra not $p1 #ctx_xfer_pre</div><div class='add'>+	bra $p2 #ctx_xfer_pre_load</div><div class='ctx'> 	ctx_xfer_pre:</div><div class='ctx'> 		mov $r15 0x10</div><div class='del'>-		call ctx_86c</div><div class='del'>-		call ctx_4160s</div><div class='del'>-		bra not $p1 ctx_xfer_exec</div><div class='add'>+		call #ctx_86c</div><div class='add'>+		call #ctx_4160s</div><div class='add'>+		bra not $p1 #ctx_xfer_exec</div><div class='ctx'> </div><div class='ctx'> 	ctx_xfer_pre_load:</div><div class='ctx'> 		mov $r15 2</div><div class='del'>-		call ctx_4170s</div><div class='del'>-		call ctx_4170w</div><div class='del'>-		call ctx_redswitch</div><div class='add'>+		call #ctx_4170s</div><div class='add'>+		call #ctx_4170w</div><div class='add'>+		call #ctx_redswitch</div><div class='ctx'> 		clear b32 $r15</div><div class='del'>-		call ctx_4170s</div><div class='del'>-		call ctx_load</div><div class='add'>+		call #ctx_4170s</div><div class='add'>+		call #ctx_load</div><div class='ctx'> </div><div class='ctx'> 	// fetch context pointer, and initiate xfer on all GPCs</div><div class='ctx'> 	ctx_xfer_exec:</div><div class='del'>-	ld b32 $r1 D[$r0 + ctx_current]</div><div class='add'>+	ld b32 $r1 D[$r0 + #ctx_current]</div><div class='ctx'> 	mov $r2 0x414</div><div class='ctx'> 	shl b32 $r2 6</div><div class='ctx'> 	iowr I[$r2 + 0x000] $r0	// BAR_STATUS = reset</div><div class='ctx'> 	mov $r14 -0x5b00</div><div class='ctx'> 	sethi $r14 0x410000</div><div class='ctx'> 	mov b32 $r15 $r1</div><div class='del'>-	call nv_wr32		// GPC_BCAST_WRCMD_DATA = ctx pointer</div><div class='add'>+	call #nv_wr32		// GPC_BCAST_WRCMD_DATA = ctx pointer</div><div class='ctx'> 	add b32 $r14 4</div><div class='ctx'> 	xbit $r15 $flags $p1</div><div class='ctx'> 	xbit $r2 $flags $p2</div><div class='ctx'> 	shl b32 $r2 1</div><div class='ctx'> 	or $r15 $r2</div><div class='del'>-	call nv_wr32		// GPC_BCAST_WRCMD_CMD = GPC_XFER(type)</div><div class='add'>+	call #nv_wr32		// GPC_BCAST_WRCMD_CMD = GPC_XFER(type)</div><div class='ctx'> </div><div class='ctx'> 	// strands</div><div class='ctx'> 	mov $r1 0x4afc</div><div class='ctx'> 	sethi $r1 0x20000</div><div class='ctx'> 	mov $r2 0xc</div><div class='ctx'> 	iowr I[$r1] $r2		// STRAND_CMD(0x3f) = 0x0c</div><div class='del'>-	call strand_wait</div><div class='add'>+	call #strand_wait</div><div class='ctx'> 	mov $r2 0x47fc</div><div class='ctx'> 	sethi $r2 0x20000</div><div class='ctx'> 	iowr I[$r2] $r0		// STRAND_FIRST_GENE(0x3f) = 0x00</div><div class='hunk'>@@ -760,22 +805,22 @@ ctx_xfer:</div><div class='ctx'> 	xbit $r10 $flags $p1	// direction</div><div class='ctx'> 	or $r10 6		// first, last</div><div class='ctx'> 	mov $r11 0		// base = 0</div><div class='del'>-	ld b32 $r12 D[$r0 + hub_mmio_list_head]</div><div class='del'>-	ld b32 $r13 D[$r0 + hub_mmio_list_tail]</div><div class='add'>+	ld b32 $r12 D[$r0 + #hub_mmio_list_head]</div><div class='add'>+	ld b32 $r13 D[$r0 + #hub_mmio_list_tail]</div><div class='ctx'> 	mov $r14 0		// not multi</div><div class='del'>-	call mmctx_xfer</div><div class='add'>+	call #mmctx_xfer</div><div class='ctx'> </div><div class='ctx'> 	// wait for GPCs to all complete</div><div class='ctx'> 	mov $r10 8		// DONE_BAR</div><div class='del'>-	call wait_doneo</div><div class='add'>+	call #wait_doneo</div><div class='ctx'> </div><div class='ctx'> 	// wait for strand xfer to complete</div><div class='del'>-	call strand_wait</div><div class='add'>+	call #strand_wait</div><div class='ctx'> </div><div class='ctx'> 	// post-op</div><div class='del'>-	bra $p1 ctx_xfer_post</div><div class='add'>+	bra $p1 #ctx_xfer_post</div><div class='ctx'> 		mov $r10 12		// DONE_UNK12</div><div class='del'>-		call wait_donez</div><div class='add'>+		call #wait_donez</div><div class='ctx'> 		mov $r1 0xa10</div><div class='ctx'> 		shl b32 $r1 6</div><div class='ctx'> 		mov $r2 5</div><div class='hunk'>@@ -783,27 +828,27 @@ ctx_xfer:</div><div class='ctx'> 		ctx_xfer_post_save_wait:</div><div class='ctx'> 			iord $r2 I[$r1]</div><div class='ctx'> 			or $r2 $r2</div><div class='del'>-			bra ne ctx_xfer_post_save_wait</div><div class='add'>+			bra ne #ctx_xfer_post_save_wait</div><div class='ctx'> </div><div class='del'>-	bra $p2 ctx_xfer_done</div><div class='add'>+	bra $p2 #ctx_xfer_done</div><div class='ctx'> 	ctx_xfer_post:</div><div class='ctx'> 		mov $r15 2</div><div class='del'>-		call ctx_4170s</div><div class='add'>+		call #ctx_4170s</div><div class='ctx'> 		clear b32 $r15</div><div class='del'>-		call ctx_86c</div><div class='del'>-		call strand_post</div><div class='del'>-		call ctx_4170w</div><div class='add'>+		call #ctx_86c</div><div class='add'>+		call #strand_post</div><div class='add'>+		call #ctx_4170w</div><div class='ctx'> 		clear b32 $r15</div><div class='del'>-		call ctx_4170s</div><div class='add'>+		call #ctx_4170s</div><div class='ctx'> </div><div class='del'>-		bra not $p1 ctx_xfer_no_post_mmio</div><div class='del'>-		ld b32 $r1 D[$r0 + chan_mmio_count]</div><div class='add'>+		bra not $p1 #ctx_xfer_no_post_mmio</div><div class='add'>+		ld b32 $r1 D[$r0 + #chan_mmio_count]</div><div class='ctx'> 		or $r1 $r1</div><div class='del'>-		bra e ctx_xfer_no_post_mmio</div><div class='del'>-			call ctx_mmio_exec</div><div class='add'>+		bra e #ctx_xfer_no_post_mmio</div><div class='add'>+			call #ctx_mmio_exec</div><div class='ctx'> </div><div class='ctx'> 		ctx_xfer_no_post_mmio:</div><div class='del'>-		call ctx_4160c</div><div class='add'>+		call #ctx_4160c</div><div class='ctx'> </div><div class='ctx'> 	ctx_xfer_done:</div><div class='ctx'> 	ret</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvc0_grhub.fuc.h b/drivers/gpu/drm/nouveau/nvc0_grhub.fuc.h<br/>index 241d3263f1e5..c5ed307abeb9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_grhub.fuc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_grhub.fuc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_grhub.fuc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nvc0_grhub.fuc.h</a></div><div class='hunk'>@@ -23,19 +23,21 @@ uint32_t nvc0_grhub_data[] = {</div><div class='ctx'> 	0x00000000,</div><div class='ctx'> 	0x00000000,</div><div class='ctx'> 	0x000000c0,</div><div class='del'>-	0x01340098,</div><div class='add'>+	0x013c00a0,</div><div class='ctx'> 	0x000000c1,</div><div class='del'>-	0x01380098,</div><div class='add'>+	0x014000a0,</div><div class='ctx'> 	0x000000c3,</div><div class='del'>-	0x01340098,</div><div class='add'>+	0x013c00a0,</div><div class='ctx'> 	0x000000c4,</div><div class='del'>-	0x01340098,</div><div class='add'>+	0x013c00a0,</div><div class='ctx'> 	0x000000c8,</div><div class='del'>-	0x01340098,</div><div class='add'>+	0x013c00a0,</div><div class='ctx'> 	0x000000ce,</div><div class='del'>-	0x01340098,</div><div class='add'>+	0x013c00a0,</div><div class='ctx'> 	0x000000cf,</div><div class='del'>-	0x01340098,</div><div class='add'>+	0x013c00a0,</div><div class='add'>+	0x000000d9,</div><div class='add'>+	0x01dc0140,</div><div class='ctx'> 	0x00000000,</div><div class='ctx'> 	0x0417e91c,</div><div class='ctx'> 	0x04400204,</div><div class='hunk'>@@ -77,47 +79,45 @@ uint32_t nvc0_grhub_data[] = {</div><div class='ctx'> 	0x0c408900,</div><div class='ctx'> 	0x00408980,</div><div class='ctx'> 	0x044064c0,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='del'>-	0x00000000,</div><div class='add'>+	0x0417e91c,</div><div class='add'>+	0x04400204,</div><div class='add'>+	0x24404004,</div><div class='add'>+	0x00404044,</div><div class='add'>+	0x34404094,</div><div class='add'>+	0x184040d0,</div><div class='add'>+	0x004040f8,</div><div class='add'>+	0x08404130,</div><div class='add'>+	0x08404150,</div><div class='add'>+	0x04404164,</div><div class='add'>+	0x04404178,</div><div class='add'>+	0x1c404200,</div><div class='add'>+	0x34404404,</div><div class='add'>+	0x0c404460,</div><div class='add'>+	0x00404480,</div><div class='add'>+	0x00404498,</div><div class='add'>+	0x0c404604,</div><div class='add'>+	0x7c404618,</div><div class='add'>+	0x50404698,</div><div class='add'>+	0x044046f0,</div><div class='add'>+	0x54404700,</div><div class='add'>+	0x00405800,</div><div class='add'>+	0x08405830,</div><div class='add'>+	0x00405854,</div><div class='add'>+	0x0c405870,</div><div class='add'>+	0x04405a00,</div><div class='add'>+	0x00405a18,</div><div class='add'>+	0x00406020,</div><div class='add'>+	0x0c406028,</div><div class='add'>+	0x044064a8,</div><div class='add'>+	0x104064b4,</div><div class='add'>+	0x00407804,</div><div class='add'>+	0x1440780c,</div><div class='add'>+	0x004078bc,</div><div class='add'>+	0x18408000,</div><div class='add'>+	0x00408064,</div><div class='add'>+	0x08408800,</div><div class='add'>+	0x0c408900,</div><div class='add'>+	0x00408980,</div><div class='ctx'> 	0x00000000,</div><div class='ctx'> 	0x00000000,</div><div class='ctx'> 	0x00000000,</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvc0_pm.c b/drivers/gpu/drm/nouveau/nvc0_pm.c<br/>index 929aded35cb5..e9992f62c1c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvc0_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvc0_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nvc0_pm.c</a></div><div class='hunk'>@@ -153,3 +153,240 @@ nvc0_pm_clocks_get(struct drm_device *dev, struct nouveau_pm_level *perflvl)</div><div class='ctx'> 	perflvl-&gt;vdec   = read_clk(dev, 0x0e);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+struct nvc0_pm_clock {</div><div class='add'>+	u32 freq;</div><div class='add'>+	u32 ssel;</div><div class='add'>+	u32 mdiv;</div><div class='add'>+	u32 dsrc;</div><div class='add'>+	u32 ddiv;</div><div class='add'>+	u32 coef;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nvc0_pm_state {</div><div class='add'>+	struct nvc0_pm_clock eng[16];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+calc_div(struct drm_device *dev, int clk, u32 ref, u32 freq, u32 *ddiv)</div><div class='add'>+{</div><div class='add'>+	u32 div = min((ref * 2) / freq, (u32)65);</div><div class='add'>+	if (div &lt; 2)</div><div class='add'>+		div = 2;</div><div class='add'>+</div><div class='add'>+	*ddiv = div - 2;</div><div class='add'>+	return (ref * 2) / div;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+calc_src(struct drm_device *dev, int clk, u32 freq, u32 *dsrc, u32 *ddiv)</div><div class='add'>+{</div><div class='add'>+	u32 sclk;</div><div class='add'>+</div><div class='add'>+	/* use one of the fixed frequencies if possible */</div><div class='add'>+	*ddiv = 0x00000000;</div><div class='add'>+	switch (freq) {</div><div class='add'>+	case  27000:</div><div class='add'>+	case 108000:</div><div class='add'>+		*dsrc = 0x00000000;</div><div class='add'>+		if (freq == 108000)</div><div class='add'>+			*dsrc |= 0x00030000;</div><div class='add'>+		return freq;</div><div class='add'>+	case 100000:</div><div class='add'>+		*dsrc = 0x00000002;</div><div class='add'>+		return freq;</div><div class='add'>+	default:</div><div class='add'>+		*dsrc = 0x00000003;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* otherwise, calculate the closest divider */</div><div class='add'>+	sclk = read_vco(dev, clk);</div><div class='add'>+	if (clk &lt; 7)</div><div class='add'>+		sclk = calc_div(dev, clk, sclk, freq, ddiv);</div><div class='add'>+	return sclk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+calc_pll(struct drm_device *dev, int clk, u32 freq, u32 *coef)</div><div class='add'>+{</div><div class='add'>+	struct pll_lims limits;</div><div class='add'>+	int N, M, P, ret;</div><div class='add'>+</div><div class='add'>+	ret = get_pll_limits(dev, 0x137000 + (clk * 0x20), &amp;limits);</div><div class='add'>+	if (ret)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	limits.refclk = read_div(dev, clk, 0x137120, 0x137140);</div><div class='add'>+	if (!limits.refclk)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = nva3_calc_pll(dev, &amp;limits, freq, &amp;N, NULL, &amp;M, &amp;P);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	*coef = (P &lt;&lt; 16) | (N &lt;&lt; 8) | M;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* A (likely rather simplified and incomplete) view of the clock tree</div><div class='add'>+ *</div><div class='add'>+ * Key:</div><div class='add'>+ *</div><div class='add'>+ * S: source select</div><div class='add'>+ * D: divider</div><div class='add'>+ * P: pll</div><div class='add'>+ * F: switch</div><div class='add'>+ *</div><div class='add'>+ * Engine clocks:</div><div class='add'>+ *</div><div class='add'>+ * 137250(D) ---- 137100(F0) ---- 137160(S)/1371d0(D) ------------------- ref</div><div class='add'>+ *                      (F1) ---- 1370X0(P) ---- 137120(S)/137140(D) ---- ref</div><div class='add'>+ *</div><div class='add'>+ * Not all registers exist for all clocks.  For example: clocks &gt;= 8 don't</div><div class='add'>+ * have their own PLL (all tied to clock 7's PLL when in PLL mode), nor do</div><div class='add'>+ * they have the divider at 1371d0, though the source selection at 137160</div><div class='add'>+ * still exists.  You must use the divider at 137250 for these instead.</div><div class='add'>+ *</div><div class='add'>+ * Memory clock:</div><div class='add'>+ *</div><div class='add'>+ * TBD, read_mem() above is likely very wrong...</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+calc_clk(struct drm_device *dev, int clk, struct nvc0_pm_clock *info, u32 freq)</div><div class='add'>+{</div><div class='add'>+	u32 src0, div0, div1D, div1P = 0;</div><div class='add'>+	u32 clk0, clk1 = 0;</div><div class='add'>+</div><div class='add'>+	/* invalid clock domain */</div><div class='add'>+	if (!freq)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* first possible path, using only dividers */</div><div class='add'>+	clk0 = calc_src(dev, clk, freq, &amp;src0, &amp;div0);</div><div class='add'>+	clk0 = calc_div(dev, clk, clk0, freq, &amp;div1D);</div><div class='add'>+</div><div class='add'>+	/* see if we can get any closer using PLLs */</div><div class='add'>+	if (clk0 != freq) {</div><div class='add'>+		if (clk &lt; 7)</div><div class='add'>+			clk1 = calc_pll(dev, clk, freq, &amp;info-&gt;coef);</div><div class='add'>+		else</div><div class='add'>+			clk1 = read_pll(dev, 0x1370e0);</div><div class='add'>+		clk1 = calc_div(dev, clk, clk1, freq, &amp;div1P);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* select the method which gets closest to target freq */</div><div class='add'>+	if (abs((int)freq - clk0) &lt;= abs((int)freq - clk1)) {</div><div class='add'>+		info-&gt;dsrc = src0;</div><div class='add'>+		if (div0) {</div><div class='add'>+			info-&gt;ddiv |= 0x80000000;</div><div class='add'>+			info-&gt;ddiv |= div0 &lt;&lt; 8;</div><div class='add'>+			info-&gt;ddiv |= div0;</div><div class='add'>+		}</div><div class='add'>+		if (div1D) {</div><div class='add'>+			info-&gt;mdiv |= 0x80000000;</div><div class='add'>+			info-&gt;mdiv |= div1D;</div><div class='add'>+		}</div><div class='add'>+		info-&gt;ssel = 0;</div><div class='add'>+		info-&gt;freq = clk0;</div><div class='add'>+	} else {</div><div class='add'>+		if (div1P) {</div><div class='add'>+			info-&gt;mdiv |= 0x80000000;</div><div class='add'>+			info-&gt;mdiv |= div1P &lt;&lt; 8;</div><div class='add'>+		}</div><div class='add'>+		info-&gt;ssel = (1 &lt;&lt; clk);</div><div class='add'>+		info-&gt;freq = clk1;</div><div 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 *</div><div class='add'>+nvc0_pm_clocks_pre(struct drm_device *dev, struct nouveau_pm_level *perflvl)</div><div class='add'>+{</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct nvc0_pm_state *info;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	info = kzalloc(sizeof(*info), GFP_KERNEL);</div><div class='add'>+	if (!info)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	/* NFI why this is still in the performance table, the ROPCs appear</div><div class='add'>+	 * to get their clock from clock 2 ("hub07", actually hub05 on this</div><div class='add'>+	 * chip, but, anyway...) as well.  nvatiming confirms hub05 and ROP</div><div class='add'>+	 * are always the same freq with the binary driver even when the</div><div class='add'>+	 * performance table says they should differ.</div><div class='add'>+	 */</div><div class='add'>+	if (dev_priv-&gt;chipset == 0xd9)</div><div class='add'>+		perflvl-&gt;rop = 0;</div><div class='add'>+</div><div class='add'>+	if ((ret = calc_clk(dev, 0x00, &amp;info-&gt;eng[0x00], perflvl-&gt;shader)) ||</div><div class='add'>+	    (ret = calc_clk(dev, 0x01, &amp;info-&gt;eng[0x01], perflvl-&gt;rop)) ||</div><div class='add'>+	    (ret = calc_clk(dev, 0x02, &amp;info-&gt;eng[0x02], perflvl-&gt;hub07)) ||</div><div class='add'>+	    (ret = calc_clk(dev, 0x07, &amp;info-&gt;eng[0x07], perflvl-&gt;hub06)) ||</div><div class='add'>+	    (ret = calc_clk(dev, 0x08, &amp;info-&gt;eng[0x08], perflvl-&gt;hub01)) ||</div><div class='add'>+	    (ret = calc_clk(dev, 0x09, &amp;info-&gt;eng[0x09], perflvl-&gt;copy)) ||</div><div class='add'>+	    (ret = calc_clk(dev, 0x0c, &amp;info-&gt;eng[0x0c], perflvl-&gt;daemon)) ||</div><div class='add'>+	    (ret = calc_clk(dev, 0x0e, &amp;info-&gt;eng[0x0e], perflvl-&gt;vdec))) {</div><div class='add'>+		kfree(info);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return info;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+prog_clk(struct drm_device *dev, int clk, struct nvc0_pm_clock *info)</div><div class='add'>+{</div><div class='add'>+	/* program dividers at 137160/1371d0 first */</div><div class='add'>+	if (clk &lt; 7 &amp;&amp; !info-&gt;ssel) {</div><div class='add'>+		nv_mask(dev, 0x1371d0 + (clk * 0x04), 0x80003f3f, info-&gt;ddiv);</div><div class='add'>+		nv_wr32(dev, 0x137160 + (clk * 0x04), info-&gt;dsrc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* switch clock to non-pll mode */</div><div class='add'>+	nv_mask(dev, 0x137100, (1 &lt;&lt; clk), 0x00000000);</div><div class='add'>+	nv_wait(dev, 0x137100, (1 &lt;&lt; clk), 0x00000000);</div><div class='add'>+</div><div class='add'>+	/* reprogram pll */</div><div class='add'>+	if (clk &lt; 7) {</div><div class='add'>+		/* make sure it's disabled first... */</div><div class='add'>+		u32 base = 0x137000 + (clk * 0x20);</div><div class='add'>+		u32 ctrl = nv_rd32(dev, base + 0x00);</div><div class='add'>+		if (ctrl &amp; 0x00000001) {</div><div class='add'>+			nv_mask(dev, base + 0x00, 0x00000004, 0x00000000);</div><div class='add'>+			nv_mask(dev, base + 0x00, 0x00000001, 0x00000000);</div><div class='add'>+		}</div><div class='add'>+		/* program it to new values, if necessary */</div><div class='add'>+		if (info-&gt;ssel) {</div><div class='add'>+			nv_wr32(dev, base + 0x04, info-&gt;coef);</div><div class='add'>+			nv_mask(dev, base + 0x00, 0x00000001, 0x00000001);</div><div class='add'>+			nv_wait(dev, base + 0x00, 0x00020000, 0x00020000);</div><div class='add'>+			nv_mask(dev, base + 0x00, 0x00020004, 0x00000004);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* select pll/non-pll mode, and program final clock divider */</div><div class='add'>+	nv_mask(dev, 0x137100, (1 &lt;&lt; clk), info-&gt;ssel);</div><div class='add'>+	nv_wait(dev, 0x137100, (1 &lt;&lt; clk), info-&gt;ssel);</div><div class='add'>+	nv_mask(dev, 0x137250 + (clk * 0x04), 0x00003f3f, info-&gt;mdiv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nvc0_pm_clocks_set(struct drm_device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct nvc0_pm_state *info = data;</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'>+		if (!info-&gt;eng[i].freq)</div><div class='add'>+			continue;</div><div class='add'>+		prog_clk(dev, i, &amp;info-&gt;eng[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(info);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c<br/>index cb006a718e70..d2ba2f07400b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvd0_display.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/nouveau/nvd0_display.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/nouveau/nvd0_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/nouveau/nvd0_display.c</a></div><div class='hunk'>@@ -35,12 +35,34 @@</div><div class='ctx'> #include "nouveau_fb.h"</div><div class='ctx'> #include "nv50_display.h"</div><div class='ctx'> </div><div class='add'>+#define EVO_DMA_NR 9</div><div class='add'>+</div><div class='add'>+#define EVO_MASTER  (0x00)</div><div class='add'>+#define EVO_FLIP(c) (0x01 + (c))</div><div class='add'>+#define EVO_OVLY(c) (0x05 + (c))</div><div class='add'>+#define EVO_OIMM(c) (0x09 + (c))</div><div class='add'>+#define EVO_CURS(c) (0x0d + (c))</div><div class='add'>+</div><div class='add'>+/* offsets in shared sync bo of various structures */</div><div class='add'>+#define EVO_SYNC(c, o) ((c) * 0x0100 + (o))</div><div class='add'>+#define EVO_MAST_NTFY     EVO_SYNC(  0, 0x00)</div><div class='add'>+#define EVO_FLIP_SEM0(c)  EVO_SYNC((c), 0x00)</div><div class='add'>+#define EVO_FLIP_SEM1(c)  EVO_SYNC((c), 0x10)</div><div class='add'>+</div><div class='add'>+struct evo {</div><div class='add'>+	int idx;</div><div class='add'>+	dma_addr_t handle;</div><div class='add'>+	u32 *ptr;</div><div class='add'>+	struct {</div><div class='add'>+		u32 offset;</div><div class='add'>+		u16 value;</div><div class='add'>+	} sem;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct nvd0_display {</div><div class='ctx'> 	struct nouveau_gpuobj *mem;</div><div class='del'>-	struct {</div><div class='del'>-		dma_addr_t handle;</div><div class='del'>-		u32 *ptr;</div><div class='del'>-	} evo[1];</div><div class='add'>+	struct nouveau_bo *sync;</div><div class='add'>+	struct evo evo[9];</div><div class='ctx'> </div><div class='ctx'> 	struct tasklet_struct tasklet;</div><div class='ctx'> 	u32 modeset;</div><div class='hunk'>@@ -53,6 +75,15 @@ nvd0_display(struct drm_device *dev)</div><div class='ctx'> 	return dev_priv-&gt;engine.display.priv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct drm_crtc *</div><div class='add'>+nvd0_display_crtc_get(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	return nouveau_encoder(encoder)-&gt;crtc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * EVO channel helpers</div><div class='add'>+ *****************************************************************************/</div><div class='ctx'> static inline int</div><div class='ctx'> evo_icmd(struct drm_device *dev, int id, u32 mthd, u32 data)</div><div class='ctx'> {</div><div class='hunk'>@@ -84,6 +115,9 @@ evo_wait(struct drm_device *dev, int id, int nr)</div><div class='ctx'> 		put = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (nouveau_reg_debug &amp; NOUVEAU_REG_DEBUG_EVO)</div><div class='add'>+		NV_INFO(dev, "Evo%d: %p START\n", id, disp-&gt;evo[id].ptr + put);</div><div class='add'>+</div><div class='ctx'> 	return disp-&gt;evo[id].ptr + put;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -91,40 +125,264 @@ static void</div><div class='ctx'> evo_kick(u32 *push, struct drm_device *dev, int id)</div><div class='ctx'> {</div><div class='ctx'> 	struct nvd0_display *disp = nvd0_display(dev);</div><div class='add'>+</div><div class='add'>+	if (nouveau_reg_debug &amp; NOUVEAU_REG_DEBUG_EVO) {</div><div class='add'>+		u32 curp = nv_rd32(dev, 0x640000 + (id * 0x1000)) &gt;&gt; 2;</div><div class='add'>+		u32 *cur = disp-&gt;evo[id].ptr + curp;</div><div class='add'>+</div><div class='add'>+		while (cur &lt; push)</div><div class='add'>+			NV_INFO(dev, "Evo%d: 0x%08x\n", id, *cur++);</div><div class='add'>+		NV_INFO(dev, "Evo%d: %p KICK!\n", id, push);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	nv_wr32(dev, 0x640000 + (id * 0x1000), (push - disp-&gt;evo[id].ptr) &lt;&lt; 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define evo_mthd(p,m,s) *((p)++) = (((s) &lt;&lt; 18) | (m))</div><div class='ctx'> #define evo_data(p,d)   *((p)++) = (d)</div><div class='ctx'> </div><div class='del'>-static struct drm_crtc *</div><div class='del'>-nvd0_display_crtc_get(struct drm_encoder *encoder)</div><div class='add'>+static int</div><div class='add'>+evo_init_dma(struct drm_device *dev, int ch)</div><div class='ctx'> {</div><div class='del'>-	return nouveau_encoder(encoder)-&gt;crtc;</div><div class='add'>+	struct nvd0_display *disp = nvd0_display(dev);</div><div class='add'>+	u32 flags;</div><div class='add'>+</div><div class='add'>+	flags = 0x00000000;</div><div class='add'>+	if (ch == EVO_MASTER)</div><div class='add'>+		flags |= 0x01000000;</div><div class='add'>+</div><div class='add'>+	nv_wr32(dev, 0x610494 + (ch * 0x0010), (disp-&gt;evo[ch].handle &gt;&gt; 8) | 3);</div><div class='add'>+	nv_wr32(dev, 0x610498 + (ch * 0x0010), 0x00010000);</div><div class='add'>+	nv_wr32(dev, 0x61049c + (ch * 0x0010), 0x00000001);</div><div class='add'>+	nv_mask(dev, 0x610490 + (ch * 0x0010), 0x00000010, 0x00000010);</div><div class='add'>+	nv_wr32(dev, 0x640000 + (ch * 0x1000), 0x00000000);</div><div class='add'>+	nv_wr32(dev, 0x610490 + (ch * 0x0010), 0x00000013 | flags);</div><div class='add'>+	if (!nv_wait(dev, 0x610490 + (ch * 0x0010), 0x80000000, 0x00000000)) {</div><div class='add'>+		NV_ERROR(dev, "PDISP: ch%d 0x%08x\n", ch,</div><div class='add'>+			      nv_rd32(dev, 0x610490 + (ch * 0x0010)));</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nv_mask(dev, 0x610090, (1 &lt;&lt; ch), (1 &lt;&lt; ch));</div><div class='add'>+	nv_mask(dev, 0x6100a0, (1 &lt;&lt; ch), (1 &lt;&lt; ch));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+evo_fini_dma(struct drm_device *dev, int ch)</div><div class='add'>+{</div><div class='add'>+	if (!(nv_rd32(dev, 0x610490 + (ch * 0x0010)) &amp; 0x00000010))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	nv_mask(dev, 0x610490 + (ch * 0x0010), 0x00000010, 0x00000000);</div><div class='add'>+	nv_mask(dev, 0x610490 + (ch * 0x0010), 0x00000003, 0x00000000);</div><div class='add'>+	nv_wait(dev, 0x610490 + (ch * 0x0010), 0x80000000, 0x00000000);</div><div class='add'>+	nv_mask(dev, 0x610090, (1 &lt;&lt; ch), 0x00000000);</div><div class='add'>+	nv_mask(dev, 0x6100a0, (1 &lt;&lt; ch), 0x00000000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+evo_piow(struct drm_device *dev, int ch, u16 mthd, u32 data)</div><div class='add'>+{</div><div class='add'>+	nv_wr32(dev, 0x640000 + (ch * 0x1000) + mthd, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+evo_init_pio(struct drm_device *dev, int ch)</div><div class='add'>+{</div><div class='add'>+	nv_wr32(dev, 0x610490 + (ch * 0x0010), 0x00000001);</div><div class='add'>+	if (!nv_wait(dev, 0x610490 + (ch * 0x0010), 0x00010000, 0x00010000)) {</div><div class='add'>+		NV_ERROR(dev, "PDISP: ch%d 0x%08x\n", ch,</div><div class='add'>+			      nv_rd32(dev, 0x610490 + (ch * 0x0010)));</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nv_mask(dev, 0x610090, (1 &lt;&lt; ch), (1 &lt;&lt; ch));</div><div class='add'>+	nv_mask(dev, 0x6100a0, (1 &lt;&lt; ch), (1 &lt;&lt; ch));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+evo_fini_pio(struct drm_device *dev, int ch)</div><div class='add'>+{</div><div class='add'>+	if (!(nv_rd32(dev, 0x610490 + (ch * 0x0010)) &amp; 0x00000001))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	nv_mask(dev, 0x610490 + (ch * 0x0010), 0x00000010, 0x00000010);</div><div class='add'>+	nv_mask(dev, 0x610490 + (ch * 0x0010), 0x00000001, 0x00000000);</div><div class='add'>+	nv_wait(dev, 0x610490 + (ch * 0x0010), 0x00010000, 0x00000000);</div><div class='add'>+	nv_mask(dev, 0x610090, (1 &lt;&lt; ch), 0x00000000);</div><div class='add'>+	nv_mask(dev, 0x6100a0, (1 &lt;&lt; ch), 0x00000000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+evo_sync_wait(void *data)</div><div class='add'>+{</div><div class='add'>+	return nouveau_bo_rd32(data, EVO_MAST_NTFY) != 0x00000000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+evo_sync(struct drm_device *dev, int ch)</div><div class='add'>+{</div><div class='add'>+	struct nvd0_display *disp = nvd0_display(dev);</div><div class='add'>+	u32 *push = evo_wait(dev, ch, 8);</div><div class='add'>+	if (push) {</div><div class='add'>+		nouveau_bo_wr32(disp-&gt;sync, EVO_MAST_NTFY, 0x00000000);</div><div class='add'>+		evo_mthd(push, 0x0084, 1);</div><div class='add'>+		evo_data(push, 0x80000000 | EVO_MAST_NTFY);</div><div class='add'>+		evo_mthd(push, 0x0080, 2);</div><div class='add'>+		evo_data(push, 0x00000000);</div><div class='add'>+		evo_data(push, 0x00000000);</div><div class='add'>+		evo_kick(push, dev, ch);</div><div class='add'>+		if (nv_wait_cb(dev, evo_sync_wait, disp-&gt;sync))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EBUSY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * Page flipping channel</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+struct nouveau_bo *</div><div class='add'>+nvd0_display_crtc_sema(struct drm_device *dev, int crtc)</div><div class='add'>+{</div><div class='add'>+	return nvd0_display(dev)-&gt;sync;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+nvd0_display_flip_stop(struct drm_crtc *crtc)</div><div class='add'>+{</div><div class='add'>+	struct nvd0_display *disp = nvd0_display(crtc-&gt;dev);</div><div class='add'>+	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);</div><div class='add'>+	struct evo *evo = &amp;disp-&gt;evo[EVO_FLIP(nv_crtc-&gt;index)];</div><div class='add'>+	u32 *push;</div><div class='add'>+</div><div class='add'>+	push = evo_wait(crtc-&gt;dev, evo-&gt;idx, 8);</div><div class='add'>+	if (push) {</div><div class='add'>+		evo_mthd(push, 0x0084, 1);</div><div class='add'>+		evo_data(push, 0x00000000);</div><div class='add'>+		evo_mthd(push, 0x0094, 1);</div><div class='add'>+		evo_data(push, 0x00000000);</div><div class='add'>+		evo_mthd(push, 0x00c0, 1);</div><div class='add'>+		evo_data(push, 0x00000000);</div><div class='add'>+		evo_mthd(push, 0x0080, 1);</div><div class='add'>+		evo_data(push, 0x00000000);</div><div class='add'>+		evo_kick(push, crtc-&gt;dev, evo-&gt;idx);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+nvd0_display_flip_next(struct drm_crtc *crtc, struct drm_framebuffer *fb,</div><div class='add'>+		       struct nouveau_channel *chan, u32 swap_interval)</div><div class='add'>+{</div><div class='add'>+	struct nouveau_framebuffer *nv_fb = nouveau_framebuffer(fb);</div><div class='add'>+	struct nvd0_display *disp = nvd0_display(crtc-&gt;dev);</div><div class='add'>+	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);</div><div class='add'>+	struct evo *evo = &amp;disp-&gt;evo[EVO_FLIP(nv_crtc-&gt;index)];</div><div class='add'>+	u64 offset;</div><div class='add'>+	u32 *push;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	swap_interval &lt;&lt;= 4;</div><div class='add'>+	if (swap_interval == 0)</div><div class='add'>+		swap_interval |= 0x100;</div><div class='add'>+</div><div class='add'>+	push = evo_wait(crtc-&gt;dev, evo-&gt;idx, 128);</div><div class='add'>+	if (unlikely(push == NULL))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* synchronise with the rendering channel, if necessary */</div><div class='add'>+	if (likely(chan)) {</div><div class='add'>+		ret = RING_SPACE(chan, 10);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		offset  = chan-&gt;dispc_vma[nv_crtc-&gt;index].offset;</div><div class='add'>+		offset += evo-&gt;sem.offset;</div><div class='add'>+</div><div class='add'>+		BEGIN_NVC0(chan, 2, NvSubM2MF, 0x0010, 4);</div><div class='add'>+		OUT_RING  (chan, upper_32_bits(offset));</div><div class='add'>+		OUT_RING  (chan, lower_32_bits(offset));</div><div class='add'>+		OUT_RING  (chan, 0xf00d0000 | evo-&gt;sem.value);</div><div class='add'>+		OUT_RING  (chan, 0x1002);</div><div class='add'>+		BEGIN_NVC0(chan, 2, NvSubM2MF, 0x0010, 4);</div><div class='add'>+		OUT_RING  (chan, upper_32_bits(offset));</div><div class='add'>+		OUT_RING  (chan, lower_32_bits(offset ^ 0x10));</div><div class='add'>+		OUT_RING  (chan, 0x74b1e000);</div><div class='add'>+		OUT_RING  (chan, 0x1001);</div><div class='add'>+		FIRE_RING (chan);</div><div class='add'>+	} else {</div><div class='add'>+		nouveau_bo_wr32(disp-&gt;sync, evo-&gt;sem.offset / 4,</div><div class='add'>+				0xf00d0000 | evo-&gt;sem.value);</div><div class='add'>+		evo_sync(crtc-&gt;dev, EVO_MASTER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* queue the flip */</div><div class='add'>+	evo_mthd(push, 0x0100, 1);</div><div class='add'>+	evo_data(push, 0xfffe0000);</div><div class='add'>+	evo_mthd(push, 0x0084, 1);</div><div class='add'>+	evo_data(push, swap_interval);</div><div class='add'>+	if (!(swap_interval &amp; 0x00000100)) {</div><div class='add'>+		evo_mthd(push, 0x00e0, 1);</div><div class='add'>+		evo_data(push, 0x40000000);</div><div class='add'>+	}</div><div class='add'>+	evo_mthd(push, 0x0088, 4);</div><div class='add'>+	evo_data(push, evo-&gt;sem.offset);</div><div class='add'>+	evo_data(push, 0xf00d0000 | evo-&gt;sem.value);</div><div class='add'>+	evo_data(push, 0x74b1e000);</div><div class='add'>+	evo_data(push, NvEvoSync);</div><div class='add'>+	evo_mthd(push, 0x00a0, 2);</div><div class='add'>+	evo_data(push, 0x00000000);</div><div class='add'>+	evo_data(push, 0x00000000);</div><div class='add'>+	evo_mthd(push, 0x00c0, 1);</div><div class='add'>+	evo_data(push, nv_fb-&gt;r_dma);</div><div class='add'>+	evo_mthd(push, 0x0110, 2);</div><div class='add'>+	evo_data(push, 0x00000000);</div><div class='add'>+	evo_data(push, 0x00000000);</div><div class='add'>+	evo_mthd(push, 0x0400, 5);</div><div class='add'>+	evo_data(push, nv_fb-&gt;nvbo-&gt;bo.offset &gt;&gt; 8);</div><div class='add'>+	evo_data(push, 0);</div><div class='add'>+	evo_data(push, (fb-&gt;height &lt;&lt; 16) | fb-&gt;width);</div><div class='add'>+	evo_data(push, nv_fb-&gt;r_pitch);</div><div class='add'>+	evo_data(push, nv_fb-&gt;r_format);</div><div class='add'>+	evo_mthd(push, 0x0080, 1);</div><div class='add'>+	evo_data(push, 0x00000000);</div><div class='add'>+	evo_kick(push, crtc-&gt;dev, evo-&gt;idx);</div><div class='add'>+</div><div class='add'>+	evo-&gt;sem.offset ^= 0x10;</div><div class='add'>+	evo-&gt;sem.value++;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * CRTC</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> static int</div><div class='del'>-nvd0_crtc_set_dither(struct nouveau_crtc *nv_crtc, bool on, bool update)</div><div class='add'>+nvd0_crtc_set_dither(struct nouveau_crtc *nv_crtc, bool update)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_device *dev = nv_crtc-&gt;base.dev;</div><div class='del'>-	u32 *push, mode;</div><div class='add'>+	struct nouveau_connector *nv_connector;</div><div class='add'>+	struct drm_connector *connector;</div><div class='add'>+	u32 *push, mode = 0x00;</div><div class='ctx'> </div><div class='del'>-	mode = 0x00000000;</div><div class='del'>-	if (on) {</div><div class='del'>-		/* 0x11: 6bpc dynamic 2x2</div><div class='del'>-		 * 0x13: 8bpc dynamic 2x2</div><div class='del'>-		 * 0x19: 6bpc static 2x2</div><div class='del'>-		 * 0x1b: 8bpc static 2x2</div><div class='del'>-		 * 0x21: 6bpc temporal</div><div class='del'>-		 * 0x23: 8bpc temporal</div><div class='del'>-		 */</div><div class='del'>-		mode = 0x00000011;</div><div class='add'>+	nv_connector = nouveau_crtc_connector_get(nv_crtc);</div><div class='add'>+	connector = &amp;nv_connector-&gt;base;</div><div class='add'>+	if (nv_connector-&gt;dithering_mode == DITHERING_MODE_AUTO) {</div><div class='add'>+		if (nv_crtc-&gt;base.fb-&gt;depth &gt; connector-&gt;display_info.bpc * 3)</div><div class='add'>+			mode = DITHERING_MODE_DYNAMIC2X2;</div><div class='add'>+	} else {</div><div class='add'>+		mode = nv_connector-&gt;dithering_mode;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nv_connector-&gt;dithering_depth == DITHERING_DEPTH_AUTO) {</div><div class='add'>+		if (connector-&gt;display_info.bpc &gt;= 8)</div><div class='add'>+			mode |= DITHERING_DEPTH_8BPC;</div><div class='add'>+	} else {</div><div class='add'>+		mode |= nv_connector-&gt;dithering_depth;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	push = evo_wait(dev, 0, 4);</div><div class='add'>+	push = evo_wait(dev, EVO_MASTER, 4);</div><div class='ctx'> 	if (push) {</div><div class='ctx'> 		evo_mthd(push, 0x0490 + (nv_crtc-&gt;index * 0x300), 1);</div><div class='ctx'> 		evo_data(push, mode);</div><div class='hunk'>@@ -132,63 +390,98 @@ nvd0_crtc_set_dither(struct nouveau_crtc *nv_crtc, bool on, bool update)</div><div class='ctx'> 			evo_mthd(push, 0x0080, 1);</div><div class='ctx'> 			evo_data(push, 0x00000000);</div><div class='ctx'> 		}</div><div class='del'>-		evo_kick(push, dev, 0);</div><div class='add'>+		evo_kick(push, dev, EVO_MASTER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-nvd0_crtc_set_scale(struct nouveau_crtc *nv_crtc, int type, bool update)</div><div class='add'>+nvd0_crtc_set_scale(struct nouveau_crtc *nv_crtc, bool update)</div><div class='ctx'> {</div><div class='del'>-	struct drm_display_mode *mode = &amp;nv_crtc-&gt;base.mode;</div><div class='add'>+	struct drm_display_mode *omode, *umode = &amp;nv_crtc-&gt;base.mode;</div><div class='ctx'> 	struct drm_device *dev = nv_crtc-&gt;base.dev;</div><div class='add'>+	struct drm_crtc *crtc = &amp;nv_crtc-&gt;base;</div><div class='ctx'> 	struct nouveau_connector *nv_connector;</div><div class='del'>-	u32 *push, outX, outY;</div><div class='del'>-</div><div class='del'>-	outX = mode-&gt;hdisplay;</div><div class='del'>-	outY = mode-&gt;vdisplay;</div><div class='add'>+	int mode = DRM_MODE_SCALE_NONE;</div><div class='add'>+	u32 oX, oY, *push;</div><div class='ctx'> </div><div class='add'>+	/* start off at the resolution we programmed the crtc for, this</div><div class='add'>+	 * effectively handles NONE/FULL scaling</div><div class='add'>+	 */</div><div class='ctx'> 	nv_connector = nouveau_crtc_connector_get(nv_crtc);</div><div class='del'>-	if (nv_connector &amp;&amp; nv_connector-&gt;native_mode) {</div><div class='del'>-		struct drm_display_mode *native = nv_connector-&gt;native_mode;</div><div class='del'>-		u32 xratio = (native-&gt;hdisplay &lt;&lt; 19) / mode-&gt;hdisplay;</div><div class='del'>-		u32 yratio = (native-&gt;vdisplay &lt;&lt; 19) / mode-&gt;vdisplay;</div><div class='del'>-</div><div class='del'>-		switch (type) {</div><div class='del'>-		case DRM_MODE_SCALE_ASPECT:</div><div class='del'>-			if (xratio &gt; yratio) {</div><div class='del'>-				outX = (mode-&gt;hdisplay * yratio) &gt;&gt; 19;</div><div class='del'>-				outY = (mode-&gt;vdisplay * yratio) &gt;&gt; 19;</div><div class='del'>-			} else {</div><div class='del'>-				outX = (mode-&gt;hdisplay * xratio) &gt;&gt; 19;</div><div class='del'>-				outY = (mode-&gt;vdisplay * xratio) &gt;&gt; 19;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case DRM_MODE_SCALE_FULLSCREEN:</div><div class='del'>-			outX = native-&gt;hdisplay;</div><div class='del'>-			outY = native-&gt;vdisplay;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='add'>+	if (nv_connector &amp;&amp; nv_connector-&gt;native_mode)</div><div class='add'>+		mode = nv_connector-&gt;scaling_mode;</div><div class='add'>+</div><div class='add'>+	if (mode != DRM_MODE_SCALE_NONE)</div><div class='add'>+		omode = nv_connector-&gt;native_mode;</div><div class='add'>+	else</div><div class='add'>+		omode = umode;</div><div class='add'>+</div><div class='add'>+	oX = omode-&gt;hdisplay;</div><div class='add'>+	oY = omode-&gt;vdisplay;</div><div class='add'>+	if (omode-&gt;flags &amp; DRM_MODE_FLAG_DBLSCAN)</div><div class='add'>+		oY *= 2;</div><div class='add'>+</div><div class='add'>+	/* add overscan compensation if necessary, will keep the aspect</div><div class='add'>+	 * ratio the same as the backend mode unless overridden by the</div><div class='add'>+	 * user setting both hborder and vborder properties.</div><div class='add'>+	 */</div><div class='add'>+	if (nv_connector &amp;&amp; ( nv_connector-&gt;underscan == UNDERSCAN_ON ||</div><div class='add'>+			     (nv_connector-&gt;underscan == UNDERSCAN_AUTO &amp;&amp;</div><div class='add'>+			      nv_connector-&gt;edid &amp;&amp;</div><div class='add'>+			      drm_detect_hdmi_monitor(nv_connector-&gt;edid)))) {</div><div class='add'>+		u32 bX = nv_connector-&gt;underscan_hborder;</div><div class='add'>+		u32 bY = nv_connector-&gt;underscan_vborder;</div><div class='add'>+		u32 aspect = (oY &lt;&lt; 19) / oX;</div><div class='add'>+</div><div class='add'>+		if (bX) {</div><div class='add'>+			oX -= (bX * 2);</div><div class='add'>+			if (bY) oY -= (bY * 2);</div><div class='add'>+			else    oY  = ((oX * aspect) + (aspect / 2)) &gt;&gt; 19;</div><div class='add'>+		} else {</div><div class='add'>+			oX -= (oX &gt;&gt; 4) + 32;</div><div class='add'>+			if (bY) oY -= (bY * 2);</div><div class='add'>+			else    oY  = ((oX * aspect) + (aspect / 2)) &gt;&gt; 19;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* handle CENTER/ASPECT scaling, taking into account the areas</div><div class='add'>+	 * removed already for overscan compensation</div><div class='add'>+	 */</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case DRM_MODE_SCALE_CENTER:</div><div class='add'>+		oX = min((u32)umode-&gt;hdisplay, oX);</div><div class='add'>+		oY = min((u32)umode-&gt;vdisplay, oY);</div><div class='add'>+		/* fall-through */</div><div class='add'>+	case DRM_MODE_SCALE_ASPECT:</div><div class='add'>+		if (oY &lt; oX) {</div><div class='add'>+			u32 aspect = (umode-&gt;hdisplay &lt;&lt; 19) / umode-&gt;vdisplay;</div><div class='add'>+			oX = ((oY * aspect) + (aspect / 2)) &gt;&gt; 19;</div><div class='add'>+		} else {</div><div class='add'>+			u32 aspect = (umode-&gt;vdisplay &lt;&lt; 19) / umode-&gt;hdisplay;</div><div class='add'>+			oY = ((oX * aspect) + (aspect / 2)) &gt;&gt; 19;</div><div class='ctx'> 		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	push = evo_wait(dev, 0, 16);</div><div class='add'>+	push = evo_wait(dev, EVO_MASTER, 8);</div><div class='ctx'> 	if (push) {</div><div class='ctx'> 		evo_mthd(push, 0x04c0 + (nv_crtc-&gt;index * 0x300), 3);</div><div class='del'>-		evo_data(push, (outY &lt;&lt; 16) | outX);</div><div class='del'>-		evo_data(push, (outY &lt;&lt; 16) | outX);</div><div class='del'>-		evo_data(push, (outY &lt;&lt; 16) | outX);</div><div class='add'>+		evo_data(push, (oY &lt;&lt; 16) | oX);</div><div class='add'>+		evo_data(push, (oY &lt;&lt; 16) | oX);</div><div class='add'>+		evo_data(push, (oY &lt;&lt; 16) | oX);</div><div class='ctx'> 		evo_mthd(push, 0x0494 + (nv_crtc-&gt;index * 0x300), 1);</div><div class='ctx'> 		evo_data(push, 0x00000000);</div><div class='ctx'> 		evo_mthd(push, 0x04b8 + (nv_crtc-&gt;index * 0x300), 1);</div><div class='del'>-		evo_data(push, (mode-&gt;vdisplay &lt;&lt; 16) | mode-&gt;hdisplay);</div><div class='add'>+		evo_data(push, (umode-&gt;vdisplay &lt;&lt; 16) | umode-&gt;hdisplay);</div><div class='add'>+		evo_kick(push, dev, EVO_MASTER);</div><div class='ctx'> 		if (update) {</div><div class='del'>-			evo_mthd(push, 0x0080, 1);</div><div class='del'>-			evo_data(push, 0x00000000);</div><div class='add'>+			nvd0_display_flip_stop(crtc);</div><div class='add'>+			nvd0_display_flip_next(crtc, crtc-&gt;fb, NULL, 1);</div><div class='ctx'> 		}</div><div class='del'>-		evo_kick(push, dev, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -201,7 +494,7 @@ nvd0_crtc_set_image(struct nouveau_crtc *nv_crtc, struct drm_framebuffer *fb,</div><div class='ctx'> 	struct nouveau_framebuffer *nvfb = nouveau_framebuffer(fb);</div><div class='ctx'> 	u32 *push;</div><div class='ctx'> </div><div class='del'>-	push = evo_wait(fb-&gt;dev, 0, 16);</div><div class='add'>+	push = evo_wait(fb-&gt;dev, EVO_MASTER, 16);</div><div class='ctx'> 	if (push) {</div><div class='ctx'> 		evo_mthd(push, 0x0460 + (nv_crtc-&gt;index * 0x300), 1);</div><div class='ctx'> 		evo_data(push, nvfb-&gt;nvbo-&gt;bo.offset &gt;&gt; 8);</div><div class='hunk'>@@ -216,7 +509,7 @@ nvd0_crtc_set_image(struct nouveau_crtc *nv_crtc, struct drm_framebuffer *fb,</div><div class='ctx'> 			evo_mthd(push, 0x0080, 1);</div><div class='ctx'> 			evo_data(push, 0x00000000);</div><div class='ctx'> 		}</div><div class='del'>-		evo_kick(push, fb-&gt;dev, 0);</div><div class='add'>+		evo_kick(push, fb-&gt;dev, EVO_MASTER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nv_crtc-&gt;fb.tile_flags = nvfb-&gt;r_dma;</div><div class='hunk'>@@ -227,7 +520,7 @@ static void</div><div class='ctx'> nvd0_crtc_cursor_show(struct nouveau_crtc *nv_crtc, bool show, bool update)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_device *dev = nv_crtc-&gt;base.dev;</div><div class='del'>-	u32 *push = evo_wait(dev, 0, 16);</div><div class='add'>+	u32 *push = evo_wait(dev, EVO_MASTER, 16);</div><div class='ctx'> 	if (push) {</div><div class='ctx'> 		if (show) {</div><div class='ctx'> 			evo_mthd(push, 0x0480 + (nv_crtc-&gt;index * 0x300), 2);</div><div class='hunk'>@@ -247,7 +540,7 @@ nvd0_crtc_cursor_show(struct nouveau_crtc *nv_crtc, bool show, bool update)</div><div class='ctx'> 			evo_data(push, 0x00000000);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		evo_kick(push, dev, 0);</div><div class='add'>+		evo_kick(push, dev, EVO_MASTER);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -262,7 +555,9 @@ nvd0_crtc_prepare(struct drm_crtc *crtc)</div><div class='ctx'> 	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);</div><div class='ctx'> 	u32 *push;</div><div class='ctx'> </div><div class='del'>-	push = evo_wait(crtc-&gt;dev, 0, 2);</div><div class='add'>+	nvd0_display_flip_stop(crtc);</div><div class='add'>+</div><div class='add'>+	push = evo_wait(crtc-&gt;dev, EVO_MASTER, 2);</div><div class='ctx'> 	if (push) {</div><div class='ctx'> 		evo_mthd(push, 0x0474 + (nv_crtc-&gt;index * 0x300), 1);</div><div class='ctx'> 		evo_data(push, 0x00000000);</div><div class='hunk'>@@ -270,7 +565,7 @@ nvd0_crtc_prepare(struct drm_crtc *crtc)</div><div class='ctx'> 		evo_data(push, 0x03000000);</div><div class='ctx'> 		evo_mthd(push, 0x045c + (nv_crtc-&gt;index * 0x300), 1);</div><div class='ctx'> 		evo_data(push, 0x00000000);</div><div class='del'>-		evo_kick(push, crtc-&gt;dev, 0);</div><div class='add'>+		evo_kick(push, crtc-&gt;dev, EVO_MASTER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nvd0_crtc_cursor_show(nv_crtc, false, false);</div><div class='hunk'>@@ -282,7 +577,7 @@ nvd0_crtc_commit(struct drm_crtc *crtc)</div><div class='ctx'> 	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);</div><div class='ctx'> 	u32 *push;</div><div class='ctx'> </div><div class='del'>-	push = evo_wait(crtc-&gt;dev, 0, 32);</div><div class='add'>+	push = evo_wait(crtc-&gt;dev, EVO_MASTER, 32);</div><div class='ctx'> 	if (push) {</div><div class='ctx'> 		evo_mthd(push, 0x0474 + (nv_crtc-&gt;index * 0x300), 1);</div><div class='ctx'> 		evo_data(push, nv_crtc-&gt;fb.tile_flags);</div><div class='hunk'>@@ -295,10 +590,11 @@ nvd0_crtc_commit(struct drm_crtc *crtc)</div><div class='ctx'> 		evo_data(push, NvEvoVRAM);</div><div class='ctx'> 		evo_mthd(push, 0x0430 + (nv_crtc-&gt;index * 0x300), 1);</div><div class='ctx'> 		evo_data(push, 0xffffff00);</div><div class='del'>-		evo_kick(push, crtc-&gt;dev, 0);</div><div class='add'>+		evo_kick(push, crtc-&gt;dev, EVO_MASTER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nvd0_crtc_cursor_show(nv_crtc, nv_crtc-&gt;cursor.visible, true);</div><div class='add'>+	nvd0_crtc_cursor_show(nv_crtc, nv_crtc-&gt;cursor.visible, false);</div><div class='add'>+	nvd0_display_flip_next(crtc, crtc-&gt;fb, NULL, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='hunk'>@@ -333,21 +629,35 @@ nvd0_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *umode,</div><div class='ctx'> {</div><div class='ctx'> 	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);</div><div class='ctx'> 	struct nouveau_connector *nv_connector;</div><div class='del'>-	u32 htotal = mode-&gt;htotal;</div><div class='del'>-	u32 vtotal = mode-&gt;vtotal;</div><div class='del'>-	u32 hsyncw = mode-&gt;hsync_end - mode-&gt;hsync_start - 1;</div><div class='del'>-	u32 vsyncw = mode-&gt;vsync_end - mode-&gt;vsync_start - 1;</div><div class='del'>-	u32 hfrntp = mode-&gt;hsync_start - mode-&gt;hdisplay;</div><div class='del'>-	u32 vfrntp = mode-&gt;vsync_start - mode-&gt;vdisplay;</div><div class='del'>-	u32 hbackp = mode-&gt;htotal - mode-&gt;hsync_end;</div><div class='del'>-	u32 vbackp = mode-&gt;vtotal - mode-&gt;vsync_end;</div><div class='del'>-	u32 hss2be = hsyncw + hbackp;</div><div class='del'>-	u32 vss2be = vsyncw + vbackp;</div><div class='del'>-	u32 hss2de = htotal - hfrntp;</div><div class='del'>-	u32 vss2de = vtotal - vfrntp;</div><div class='add'>+	u32 ilace = (mode-&gt;flags &amp; DRM_MODE_FLAG_INTERLACE) ? 2 : 1;</div><div class='add'>+	u32 vscan = (mode-&gt;flags &amp; DRM_MODE_FLAG_DBLSCAN) ? 2 : 1;</div><div class='add'>+	u32 hactive, hsynce, hbackp, hfrontp, hblanke, hblanks;</div><div class='add'>+	u32 vactive, vsynce, vbackp, vfrontp, vblanke, vblanks;</div><div class='add'>+	u32 vblan2e = 0, vblan2s = 1;</div><div class='add'>+	u32 magic = 0x31ec6000;</div><div class='ctx'> 	u32 syncs, *push;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	hactive = mode-&gt;htotal;</div><div class='add'>+	hsynce  = mode-&gt;hsync_end - mode-&gt;hsync_start - 1;</div><div class='add'>+	hbackp  = mode-&gt;htotal - mode-&gt;hsync_end;</div><div class='add'>+	hblanke = hsynce + hbackp;</div><div class='add'>+	hfrontp = mode-&gt;hsync_start - mode-&gt;hdisplay;</div><div class='add'>+	hblanks = mode-&gt;htotal - hfrontp - 1;</div><div class='add'>+</div><div class='add'>+	vactive = mode-&gt;vtotal * vscan / ilace;</div><div class='add'>+	vsynce  = ((mode-&gt;vsync_end - mode-&gt;vsync_start) * vscan / ilace) - 1;</div><div class='add'>+	vbackp  = (mode-&gt;vtotal - mode-&gt;vsync_end) * vscan / ilace;</div><div class='add'>+	vblanke = vsynce + vbackp;</div><div class='add'>+	vfrontp = (mode-&gt;vsync_start - mode-&gt;vdisplay) * vscan / ilace;</div><div class='add'>+	vblanks = vactive - vfrontp - 1;</div><div class='add'>+	if (mode-&gt;flags &amp; DRM_MODE_FLAG_INTERLACE) {</div><div class='add'>+		vblan2e = vactive + vsynce + vbackp;</div><div class='add'>+		vblan2s = vblan2e + (mode-&gt;vdisplay * vscan / ilace);</div><div class='add'>+		vactive = (vactive * 2) + 1;</div><div class='add'>+		magic  |= 0x00000001;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	syncs = 0x00000001;</div><div class='ctx'> 	if (mode-&gt;flags &amp; DRM_MODE_FLAG_NHSYNC)</div><div class='ctx'> 		syncs |= 0x00000008;</div><div class='hunk'>@@ -358,28 +668,33 @@ nvd0_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *umode,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	push = evo_wait(crtc-&gt;dev, 0, 64);</div><div class='add'>+	push = evo_wait(crtc-&gt;dev, EVO_MASTER, 64);</div><div class='ctx'> 	if (push) {</div><div class='del'>-		evo_mthd(push, 0x0410 + (nv_crtc-&gt;index * 0x300), 5);</div><div class='add'>+		evo_mthd(push, 0x0410 + (nv_crtc-&gt;index * 0x300), 6);</div><div class='ctx'> 		evo_data(push, 0x00000000);</div><div class='del'>-		evo_data(push, (vtotal &lt;&lt; 16) | htotal);</div><div class='del'>-		evo_data(push, (vsyncw &lt;&lt; 16) | hsyncw);</div><div class='del'>-		evo_data(push, (vss2be &lt;&lt; 16) | hss2be);</div><div class='del'>-		evo_data(push, (vss2de &lt;&lt; 16) | hss2de);</div><div class='add'>+		evo_data(push, (vactive &lt;&lt; 16) | hactive);</div><div class='add'>+		evo_data(push, ( vsynce &lt;&lt; 16) | hsynce);</div><div class='add'>+		evo_data(push, (vblanke &lt;&lt; 16) | hblanke);</div><div class='add'>+		evo_data(push, (vblanks &lt;&lt; 16) | hblanks);</div><div class='add'>+		evo_data(push, (vblan2e &lt;&lt; 16) | vblan2s);</div><div class='ctx'> 		evo_mthd(push, 0x042c + (nv_crtc-&gt;index * 0x300), 1);</div><div class='ctx'> 		evo_data(push, 0x00000000); /* ??? */</div><div class='ctx'> 		evo_mthd(push, 0x0450 + (nv_crtc-&gt;index * 0x300), 3);</div><div class='ctx'> 		evo_data(push, mode-&gt;clock * 1000);</div><div class='ctx'> 		evo_data(push, 0x00200000); /* ??? */</div><div class='ctx'> 		evo_data(push, mode-&gt;clock * 1000);</div><div class='del'>-		evo_mthd(push, 0x0404 + (nv_crtc-&gt;index * 0x300), 1);</div><div class='add'>+		evo_mthd(push, 0x0404 + (nv_crtc-&gt;index * 0x300), 2);</div><div class='ctx'> 		evo_data(push, syncs);</div><div class='del'>-		evo_kick(push, crtc-&gt;dev, 0);</div><div class='add'>+		evo_data(push, magic);</div><div class='add'>+		evo_mthd(push, 0x04d0 + (nv_crtc-&gt;index * 0x300), 2);</div><div class='add'>+		evo_data(push, 0x00000311);</div><div class='add'>+		evo_data(push, 0x00000100);</div><div class='add'>+		evo_kick(push, crtc-&gt;dev, EVO_MASTER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nv_connector = nouveau_crtc_connector_get(nv_crtc);</div><div class='del'>-	nvd0_crtc_set_dither(nv_crtc, nv_connector-&gt;use_dithering, false);</div><div class='del'>-	nvd0_crtc_set_scale(nv_crtc, nv_connector-&gt;scaling_mode, false);</div><div class='add'>+	nvd0_crtc_set_dither(nv_crtc, false);</div><div class='add'>+	nvd0_crtc_set_scale(nv_crtc, false);</div><div class='ctx'> 	nvd0_crtc_set_image(nv_crtc, crtc-&gt;fb, x, y, false);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -400,7 +715,9 @@ nvd0_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	nvd0_display_flip_stop(crtc);</div><div class='ctx'> 	nvd0_crtc_set_image(nv_crtc, crtc-&gt;fb, x, y, true);</div><div class='add'>+	nvd0_display_flip_next(crtc, crtc-&gt;fb, NULL, 1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -410,6 +727,7 @@ nvd0_crtc_mode_set_base_atomic(struct drm_crtc *crtc,</div><div class='ctx'> 			       enum mode_set_atomic state)</div><div class='ctx'> {</div><div class='ctx'> 	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);</div><div class='add'>+	nvd0_display_flip_stop(crtc);</div><div class='ctx'> 	nvd0_crtc_set_image(nv_crtc, fb, x, y, true);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -472,10 +790,10 @@ static int</div><div class='ctx'> nvd0_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)</div><div class='ctx'> {</div><div class='ctx'> 	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);</div><div class='del'>-	const u32 data = (y &lt;&lt; 16) | x;</div><div class='add'>+	int ch = EVO_CURS(nv_crtc-&gt;index);</div><div class='ctx'> </div><div class='del'>-	nv_wr32(crtc-&gt;dev, 0x64d084 + (nv_crtc-&gt;index * 0x1000), data);</div><div class='del'>-	nv_wr32(crtc-&gt;dev, 0x64d080 + (nv_crtc-&gt;index * 0x1000), 0x00000000);</div><div class='add'>+	evo_piow(crtc-&gt;dev, ch, 0x0084, (y &lt;&lt; 16) | x);</div><div class='add'>+	evo_piow(crtc-&gt;dev, ch, 0x0080, 0x00000000);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -525,6 +843,7 @@ static const struct drm_crtc_funcs nvd0_crtc_func = {</div><div class='ctx'> 	.gamma_set = nvd0_crtc_gamma_set,</div><div class='ctx'> 	.set_config = drm_crtc_helper_set_config,</div><div class='ctx'> 	.destroy = nvd0_crtc_destroy,</div><div class='add'>+	.page_flip = nouveau_crtc_page_flip,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -659,12 +978,12 @@ nvd0_dac_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,</div><div class='ctx'> </div><div class='ctx'> 	nvd0_dac_dpms(encoder, DRM_MODE_DPMS_ON);</div><div class='ctx'> </div><div class='del'>-	push = evo_wait(encoder-&gt;dev, 0, 4);</div><div class='add'>+	push = evo_wait(encoder-&gt;dev, EVO_MASTER, 4);</div><div class='ctx'> 	if (push) {</div><div class='ctx'> 		evo_mthd(push, 0x0180 + (nv_encoder-&gt;or * 0x20), 2);</div><div class='ctx'> 		evo_data(push, 1 &lt;&lt; nv_crtc-&gt;index);</div><div class='ctx'> 		evo_data(push, 0x00ff);</div><div class='del'>-		evo_kick(push, encoder-&gt;dev, 0);</div><div class='add'>+		evo_kick(push, encoder-&gt;dev, EVO_MASTER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nv_encoder-&gt;crtc = encoder-&gt;crtc;</div><div class='hunk'>@@ -680,13 +999,13 @@ nvd0_dac_disconnect(struct drm_encoder *encoder)</div><div class='ctx'> 	if (nv_encoder-&gt;crtc) {</div><div class='ctx'> 		nvd0_crtc_prepare(nv_encoder-&gt;crtc);</div><div class='ctx'> </div><div class='del'>-		push = evo_wait(dev, 0, 4);</div><div class='add'>+		push = evo_wait(dev, EVO_MASTER, 4);</div><div class='ctx'> 		if (push) {</div><div class='ctx'> 			evo_mthd(push, 0x0180 + (nv_encoder-&gt;or * 0x20), 1);</div><div class='ctx'> 			evo_data(push, 0x00000000);</div><div class='ctx'> 			evo_mthd(push, 0x0080, 1);</div><div class='ctx'> 			evo_data(push, 0x00000000);</div><div class='del'>-			evo_kick(push, dev, 0);</div><div class='add'>+			evo_kick(push, dev, EVO_MASTER);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		nv_encoder-&gt;crtc = NULL;</div><div class='hunk'>@@ -760,6 +1079,108 @@ nvd0_dac_create(struct drm_connector *connector, struct dcb_entry *dcbe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='add'>+ * Audio</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+static void</div><div class='add'>+nvd0_audio_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode)</div><div class='add'>+{</div><div class='add'>+	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);</div><div class='add'>+	struct nouveau_connector *nv_connector;</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	int i, or = nv_encoder-&gt;or * 0x30;</div><div class='add'>+</div><div class='add'>+	nv_connector = nouveau_encoder_connector_get(nv_encoder);</div><div class='add'>+	if (!drm_detect_monitor_audio(nv_connector-&gt;edid))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	nv_mask(dev, 0x10ec10 + or, 0x80000003, 0x80000001);</div><div class='add'>+</div><div class='add'>+	drm_edid_to_eld(&amp;nv_connector-&gt;base, nv_connector-&gt;edid);</div><div class='add'>+	if (nv_connector-&gt;base.eld[0]) {</div><div class='add'>+		u8 *eld = nv_connector-&gt;base.eld;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; eld[2] * 4; i++)</div><div class='add'>+			nv_wr32(dev, 0x10ec00 + or, (i &lt;&lt; 8) | eld[i]);</div><div class='add'>+		for (i = eld[2] * 4; i &lt; 0x60; i++)</div><div class='add'>+			nv_wr32(dev, 0x10ec00 + or, (i &lt;&lt; 8) | 0x00);</div><div class='add'>+</div><div class='add'>+		nv_mask(dev, 0x10ec10 + or, 0x80000002, 0x80000002);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nvd0_audio_disconnect(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	int or = nv_encoder-&gt;or * 0x30;</div><div class='add'>+</div><div class='add'>+	nv_mask(dev, 0x10ec10 + or, 0x80000003, 0x80000000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * HDMI</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+static void</div><div class='add'>+nvd0_hdmi_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode)</div><div class='add'>+{</div><div class='add'>+	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);</div><div class='add'>+	struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder-&gt;crtc);</div><div class='add'>+	struct nouveau_connector *nv_connector;</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	int head = nv_crtc-&gt;index * 0x800;</div><div class='add'>+	u32 rekey = 56; /* binary driver, and tegra constant */</div><div class='add'>+	u32 max_ac_packet;</div><div class='add'>+</div><div class='add'>+	nv_connector = nouveau_encoder_connector_get(nv_encoder);</div><div class='add'>+	if (!drm_detect_hdmi_monitor(nv_connector-&gt;edid))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	max_ac_packet  = mode-&gt;htotal - mode-&gt;hdisplay;</div><div class='add'>+	max_ac_packet -= rekey;</div><div class='add'>+	max_ac_packet -= 18; /* constant from tegra */</div><div class='add'>+	max_ac_packet /= 32;</div><div class='add'>+</div><div class='add'>+	/* AVI InfoFrame */</div><div class='add'>+	nv_mask(dev, 0x616714 + head, 0x00000001, 0x00000000);</div><div class='add'>+	nv_wr32(dev, 0x61671c + head, 0x000d0282);</div><div class='add'>+	nv_wr32(dev, 0x616720 + head, 0x0000006f);</div><div class='add'>+	nv_wr32(dev, 0x616724 + head, 0x00000000);</div><div class='add'>+	nv_wr32(dev, 0x616728 + head, 0x00000000);</div><div class='add'>+	nv_wr32(dev, 0x61672c + head, 0x00000000);</div><div class='add'>+	nv_mask(dev, 0x616714 + head, 0x00000001, 0x00000001);</div><div class='add'>+</div><div class='add'>+	/* ??? InfoFrame? */</div><div class='add'>+	nv_mask(dev, 0x6167a4 + head, 0x00000001, 0x00000000);</div><div class='add'>+	nv_wr32(dev, 0x6167ac + head, 0x00000010);</div><div class='add'>+	nv_mask(dev, 0x6167a4 + head, 0x00000001, 0x00000001);</div><div class='add'>+</div><div class='add'>+	/* HDMI_CTRL */</div><div class='add'>+	nv_mask(dev, 0x616798 + head, 0x401f007f, 0x40000000 | rekey |</div><div class='add'>+						  max_ac_packet &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	/* NFI, audio doesn't work without it though.. */</div><div class='add'>+	nv_mask(dev, 0x616548 + head, 0x00000070, 0x00000000);</div><div class='add'>+</div><div class='add'>+	nvd0_audio_mode_set(encoder, mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+nvd0_hdmi_disconnect(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);</div><div class='add'>+	struct nouveau_crtc *nv_crtc = nouveau_crtc(nv_encoder-&gt;crtc);</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	int head = nv_crtc-&gt;index * 0x800;</div><div class='add'>+</div><div class='add'>+	nvd0_audio_disconnect(encoder);</div><div class='add'>+</div><div class='add'>+	nv_mask(dev, 0x616798 + head, 0x40000000, 0x00000000);</div><div class='add'>+	nv_mask(dev, 0x6167a4 + head, 0x00000001, 0x00000000);</div><div class='add'>+	nv_mask(dev, 0x616714 + head, 0x00000001, 0x00000000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='ctx'>  * SOR</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> static void</div><div class='hunk'>@@ -829,7 +1250,8 @@ static void</div><div class='ctx'> nvd0_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *umode,</div><div class='ctx'> 		  struct drm_display_mode *mode)</div><div class='ctx'> {</div><div class='del'>-	struct drm_nouveau_private *dev_priv = encoder-&gt;dev-&gt;dev_private;</div><div class='add'>+	struct drm_device *dev = encoder-&gt;dev;</div><div class='add'>+	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);</div><div class='ctx'> 	struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder-&gt;crtc);</div><div class='ctx'> 	struct nouveau_connector *nv_connector;</div><div class='hunk'>@@ -852,6 +1274,8 @@ nvd0_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *umode,</div><div class='ctx'> 		or_config = (mode_ctrl &amp; 0x00000f00) &gt;&gt; 8;</div><div class='ctx'> 		if (mode-&gt;clock &gt;= 165000)</div><div class='ctx'> 			or_config |= 0x0100;</div><div class='add'>+</div><div class='add'>+		nvd0_hdmi_mode_set(encoder, mode);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case OUTPUT_LVDS:</div><div class='ctx'> 		or_config = (mode_ctrl &amp; 0x00000f00) &gt;&gt; 8;</div><div class='hunk'>@@ -861,7 +1285,7 @@ nvd0_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *umode,</div><div class='ctx'> 			if (bios-&gt;fp.if_is_24bit)</div><div class='ctx'> 				or_config |= 0x0200;</div><div class='ctx'> 		} else {</div><div class='del'>-			if (nv_connector-&gt;dcb-&gt;type == DCB_CONNECTOR_LVDS_SPWG) {</div><div class='add'>+			if (nv_connector-&gt;type == DCB_CONNECTOR_LVDS_SPWG) {</div><div class='ctx'> 				if (((u8 *)nv_connector-&gt;edid)[121] == 2)</div><div class='ctx'> 					or_config |= 0x0100;</div><div class='ctx'> 			} else</div><div class='hunk'>@@ -889,12 +1313,12 @@ nvd0_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *umode,</div><div class='ctx'> </div><div class='ctx'> 	nvd0_sor_dpms(encoder, DRM_MODE_DPMS_ON);</div><div class='ctx'> </div><div class='del'>-	push = evo_wait(encoder-&gt;dev, 0, 4);</div><div class='add'>+	push = evo_wait(dev, EVO_MASTER, 4);</div><div class='ctx'> 	if (push) {</div><div class='ctx'> 		evo_mthd(push, 0x0200 + (nv_encoder-&gt;or * 0x20), 2);</div><div class='ctx'> 		evo_data(push, mode_ctrl);</div><div class='ctx'> 		evo_data(push, or_config);</div><div class='del'>-		evo_kick(push, encoder-&gt;dev, 0);</div><div class='add'>+		evo_kick(push, dev, EVO_MASTER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nv_encoder-&gt;crtc = encoder-&gt;crtc;</div><div class='hunk'>@@ -910,15 +1334,17 @@ nvd0_sor_disconnect(struct drm_encoder *encoder)</div><div class='ctx'> 	if (nv_encoder-&gt;crtc) {</div><div class='ctx'> 		nvd0_crtc_prepare(nv_encoder-&gt;crtc);</div><div class='ctx'> </div><div class='del'>-		push = evo_wait(dev, 0, 4);</div><div class='add'>+		push = evo_wait(dev, EVO_MASTER, 4);</div><div class='ctx'> 		if (push) {</div><div class='ctx'> 			evo_mthd(push, 0x0200 + (nv_encoder-&gt;or * 0x20), 1);</div><div class='ctx'> 			evo_data(push, 0x00000000);</div><div class='ctx'> 			evo_mthd(push, 0x0080, 1);</div><div class='ctx'> 			evo_data(push, 0x00000000);</div><div class='del'>-			evo_kick(push, dev, 0);</div><div class='add'>+			evo_kick(push, dev, EVO_MASTER);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		nvd0_hdmi_disconnect(encoder);</div><div class='add'>+</div><div class='ctx'> 		nv_encoder-&gt;crtc = NULL;</div><div class='ctx'> 		nv_encoder-&gt;last_dpms = DRM_MODE_DPMS_OFF;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1159,6 +1585,12 @@ nvd0_display_intr(struct drm_device *dev)</div><div class='ctx'> 	struct nvd0_display *disp = nvd0_display(dev);</div><div class='ctx'> 	u32 intr = nv_rd32(dev, 0x610088);</div><div class='ctx'> </div><div class='add'>+	if (intr &amp; 0x00000001) {</div><div class='add'>+		u32 stat = nv_rd32(dev, 0x61008c);</div><div class='add'>+		nv_wr32(dev, 0x61008c, stat);</div><div class='add'>+		intr &amp;= ~0x00000001;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (intr &amp; 0x00000002) {</div><div class='ctx'> 		u32 stat = nv_rd32(dev, 0x61009c);</div><div class='ctx'> 		int chid = ffs(stat) - 1;</div><div class='hunk'>@@ -1215,38 +1647,29 @@ nvd0_display_intr(struct drm_device *dev)</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * Init</div><div class='ctx'>  *****************************************************************************/</div><div class='del'>-static void</div><div class='add'>+void</div><div class='ctx'> nvd0_display_fini(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	/* fini cursors */</div><div class='del'>-	for (i = 14; i &gt;= 13; i--) {</div><div class='del'>-		if (!(nv_rd32(dev, 0x610490 + (i * 0x10)) &amp; 0x00000001))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		nv_mask(dev, 0x610490 + (i * 0x10), 0x00000001, 0x00000000);</div><div class='del'>-		nv_wait(dev, 0x610490 + (i * 0x10), 0x00010000, 0x00000000);</div><div class='del'>-		nv_mask(dev, 0x610090, 1 &lt;&lt; i, 0x00000000);</div><div class='del'>-		nv_mask(dev, 0x6100a0, 1 &lt;&lt; i, 0x00000000);</div><div class='add'>+	/* fini cursors + overlays + flips */</div><div class='add'>+	for (i = 1; i &gt;= 0; i--) {</div><div class='add'>+		evo_fini_pio(dev, EVO_CURS(i));</div><div class='add'>+		evo_fini_pio(dev, EVO_OIMM(i));</div><div class='add'>+		evo_fini_dma(dev, EVO_OVLY(i));</div><div class='add'>+		evo_fini_dma(dev, EVO_FLIP(i));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* fini master */</div><div class='del'>-	if (nv_rd32(dev, 0x610490) &amp; 0x00000010) {</div><div class='del'>-		nv_mask(dev, 0x610490, 0x00000010, 0x00000000);</div><div class='del'>-		nv_mask(dev, 0x610490, 0x00000003, 0x00000000);</div><div class='del'>-		nv_wait(dev, 0x610490, 0x80000000, 0x00000000);</div><div class='del'>-		nv_mask(dev, 0x610090, 0x00000001, 0x00000000);</div><div class='del'>-		nv_mask(dev, 0x6100a0, 0x00000001, 0x00000000);</div><div class='del'>-	}</div><div class='add'>+	evo_fini_dma(dev, EVO_MASTER);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> nvd0_display_init(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct nvd0_display *disp = nvd0_display(dev);</div><div class='add'>+	int ret, i;</div><div class='ctx'> 	u32 *push;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (nv_rd32(dev, 0x6100ac) &amp; 0x00000100) {</div><div class='ctx'> 		nv_wr32(dev, 0x6100ac, 0x00000100);</div><div class='hunk'>@@ -1271,7 +1694,7 @@ nvd0_display_init(struct drm_device *dev)</div><div class='ctx'> 		nv_wr32(dev, 0x6301c4 + (i * 0x800), sor);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;mode_config.num_crtc; i++) {</div><div class='ctx'> 		u32 crtc0 = nv_rd32(dev, 0x616104 + (i * 0x800));</div><div class='ctx'> 		u32 crtc1 = nv_rd32(dev, 0x616108 + (i * 0x800));</div><div class='ctx'> 		u32 crtc2 = nv_rd32(dev, 0x61610c + (i * 0x800));</div><div class='hunk'>@@ -1285,36 +1708,24 @@ nvd0_display_init(struct drm_device *dev)</div><div class='ctx'> 	nv_mask(dev, 0x6100b0, 0x00000307, 0x00000307);</div><div class='ctx'> </div><div class='ctx'> 	/* init master */</div><div class='del'>-	nv_wr32(dev, 0x610494, (disp-&gt;evo[0].handle &gt;&gt; 8) | 3);</div><div class='del'>-	nv_wr32(dev, 0x610498, 0x00010000);</div><div class='del'>-	nv_wr32(dev, 0x61049c, 0x00000001);</div><div class='del'>-	nv_mask(dev, 0x610490, 0x00000010, 0x00000010);</div><div class='del'>-	nv_wr32(dev, 0x640000, 0x00000000);</div><div class='del'>-	nv_wr32(dev, 0x610490, 0x01000013);</div><div class='del'>-	if (!nv_wait(dev, 0x610490, 0x80000000, 0x00000000)) {</div><div class='del'>-		NV_ERROR(dev, "PDISP: master 0x%08x\n",</div><div class='del'>-			 nv_rd32(dev, 0x610490));</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	ret = evo_init_dma(dev, EVO_MASTER);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* init flips + overlays + cursors */</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;mode_config.num_crtc; i++) {</div><div class='add'>+		if ((ret = evo_init_dma(dev, EVO_FLIP(i))) ||</div><div class='add'>+		    (ret = evo_init_dma(dev, EVO_OVLY(i))) ||</div><div class='add'>+		    (ret = evo_init_pio(dev, EVO_OIMM(i))) ||</div><div class='add'>+		    (ret = evo_init_pio(dev, EVO_CURS(i))))</div><div class='add'>+			goto error;</div><div class='ctx'> 	}</div><div class='del'>-	nv_mask(dev, 0x610090, 0x00000001, 0x00000001);</div><div class='del'>-	nv_mask(dev, 0x6100a0, 0x00000001, 0x00000001);</div><div class='ctx'> </div><div class='del'>-	/* init cursors */</div><div class='del'>-	for (i = 13; i &lt;= 14; i++) {</div><div class='del'>-		nv_wr32(dev, 0x610490 + (i * 0x10), 0x00000001);</div><div class='del'>-		if (!nv_wait(dev, 0x610490 + (i * 0x10), 0x00010000, 0x00010000)) {</div><div class='del'>-			NV_ERROR(dev, "PDISP: curs%d 0x%08x\n", i,</div><div class='del'>-				 nv_rd32(dev, 0x610490 + (i * 0x10)));</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		nv_mask(dev, 0x610090, 1 &lt;&lt; i, 1 &lt;&lt; i);</div><div class='del'>-		nv_mask(dev, 0x6100a0, 1 &lt;&lt; i, 1 &lt;&lt; i);</div><div class='add'>+	push = evo_wait(dev, EVO_MASTER, 32);</div><div class='add'>+	if (!push) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto error;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	push = evo_wait(dev, 0, 32);</div><div class='del'>-	if (!push)</div><div class='del'>-		return -EBUSY;</div><div class='ctx'> 	evo_mthd(push, 0x0088, 1);</div><div class='ctx'> 	evo_data(push, NvEvoSync);</div><div class='ctx'> 	evo_mthd(push, 0x0084, 1);</div><div class='hunk'>@@ -1323,9 +1734,12 @@ nvd0_display_init(struct drm_device *dev)</div><div class='ctx'> 	evo_data(push, 0x80000000);</div><div class='ctx'> 	evo_mthd(push, 0x008c, 1);</div><div class='ctx'> 	evo_data(push, 0x00000000);</div><div class='del'>-	evo_kick(push, dev, 0);</div><div class='add'>+	evo_kick(push, dev, EVO_MASTER);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+error:</div><div class='add'>+	if (ret)</div><div class='add'>+		nvd0_display_fini(dev);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -1334,11 +1748,16 @@ nvd0_display_destroy(struct drm_device *dev)</div><div class='ctx'> 	struct drm_nouveau_private *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	struct nvd0_display *disp = nvd0_display(dev);</div><div class='ctx'> 	struct pci_dev *pdev = dev-&gt;pdev;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	nvd0_display_fini(dev);</div><div class='add'>+	for (i = 0; i &lt; EVO_DMA_NR; i++) {</div><div class='add'>+		struct evo *evo = &amp;disp-&gt;evo[i];</div><div class='add'>+		pci_free_consistent(pdev, PAGE_SIZE, evo-&gt;ptr, evo-&gt;handle);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	pci_free_consistent(pdev, PAGE_SIZE, disp-&gt;evo[0].ptr, disp-&gt;evo[0].handle);</div><div class='ctx'> 	nouveau_gpuobj_ref(NULL, &amp;disp-&gt;mem);</div><div class='add'>+	nouveau_bo_unmap(disp-&gt;sync);</div><div class='add'>+	nouveau_bo_ref(NULL, &amp;disp-&gt;sync);</div><div class='ctx'> 	nouveau_irq_unregister(dev, 26);</div><div class='ctx'> </div><div class='ctx'> 	dev_priv-&gt;engine.display.priv = NULL;</div><div class='hunk'>@@ -1410,61 +1829,83 @@ nvd0_display_create(struct drm_device *dev)</div><div class='ctx'> 	tasklet_init(&amp;disp-&gt;tasklet, nvd0_display_bh, (unsigned long)dev);</div><div class='ctx'> 	nouveau_irq_register(dev, 26, nvd0_display_intr);</div><div class='ctx'> </div><div class='add'>+	/* small shared memory area we use for notifiers and semaphores */</div><div class='add'>+	ret = nouveau_bo_new(dev, 4096, 0x1000, TTM_PL_FLAG_VRAM,</div><div class='add'>+			     0, 0x0000, &amp;disp-&gt;sync);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		ret = nouveau_bo_pin(disp-&gt;sync, TTM_PL_FLAG_VRAM);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = nouveau_bo_map(disp-&gt;sync);</div><div class='add'>+		if (ret)</div><div class='add'>+			nouveau_bo_ref(NULL, &amp;disp-&gt;sync);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	/* hash table and dma objects for the memory areas we care about */</div><div class='ctx'> 	ret = nouveau_gpuobj_new(dev, NULL, 0x4000, 0x10000,</div><div class='ctx'> 				 NVOBJ_FLAG_ZERO_ALLOC, &amp;disp-&gt;mem);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1000, 0x00000049);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1004, (disp-&gt;mem-&gt;vinst + 0x2000) &gt;&gt; 8);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1008, (disp-&gt;mem-&gt;vinst + 0x2fff) &gt;&gt; 8);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x100c, 0x00000000);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1010, 0x00000000);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1014, 0x00000000);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x0000, NvEvoSync);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x0004, (0x1000 &lt;&lt; 9) | 0x00000001);</div><div class='del'>-</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1020, 0x00000049);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1024, 0x00000000);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1028, (dev_priv-&gt;vram_size - 1) &gt;&gt; 8);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x102c, 0x00000000);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1030, 0x00000000);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1034, 0x00000000);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x0008, NvEvoVRAM);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x000c, (0x1020 &lt;&lt; 9) | 0x00000001);</div><div class='del'>-</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1040, 0x00000009);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1044, 0x00000000);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1048, (dev_priv-&gt;vram_size - 1) &gt;&gt; 8);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x104c, 0x00000000);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1050, 0x00000000);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1054, 0x00000000);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x0010, NvEvoVRAM_LP);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x0014, (0x1040 &lt;&lt; 9) | 0x00000001);</div><div class='del'>-</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1060, 0x0fe00009);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1064, 0x00000000);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1068, (dev_priv-&gt;vram_size - 1) &gt;&gt; 8);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x106c, 0x00000000);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1070, 0x00000000);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x1074, 0x00000000);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x0018, NvEvoFB32);</div><div class='del'>-	nv_wo32(disp-&gt;mem, 0x001c, (0x1060 &lt;&lt; 9) | 0x00000001);</div><div class='del'>-</div><div class='del'>-	pinstmem-&gt;flush(dev);</div><div class='add'>+	/* create evo dma channels */</div><div class='add'>+	for (i = 0; i &lt; EVO_DMA_NR; i++) {</div><div class='add'>+		struct evo *evo = &amp;disp-&gt;evo[i];</div><div class='add'>+		u64 offset = disp-&gt;sync-&gt;bo.offset;</div><div class='add'>+		u32 dmao = 0x1000 + (i * 0x100);</div><div class='add'>+		u32 hash = 0x0000 + (i * 0x040);</div><div class='add'>+</div><div class='add'>+		evo-&gt;idx = i;</div><div class='add'>+		evo-&gt;sem.offset = EVO_SYNC(evo-&gt;idx, 0x00);</div><div class='add'>+		evo-&gt;ptr = pci_alloc_consistent(pdev, PAGE_SIZE, &amp;evo-&gt;handle);</div><div class='add'>+		if (!evo-&gt;ptr) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* push buffers for evo channels */</div><div class='del'>-	disp-&gt;evo[0].ptr =</div><div class='del'>-		pci_alloc_consistent(pdev, PAGE_SIZE, &amp;disp-&gt;evo[0].handle);</div><div class='del'>-	if (!disp-&gt;evo[0].ptr) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x00, 0x00000049);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x04, (offset + 0x0000) &gt;&gt; 8);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x08, (offset + 0x0fff) &gt;&gt; 8);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x0c, 0x00000000);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x10, 0x00000000);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x14, 0x00000000);</div><div class='add'>+		nv_wo32(disp-&gt;mem, hash + 0x00, NvEvoSync);</div><div class='add'>+		nv_wo32(disp-&gt;mem, hash + 0x04, 0x00000001 | (i &lt;&lt; 27) |</div><div class='add'>+						((dmao + 0x00) &lt;&lt; 9));</div><div class='add'>+</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x20, 0x00000049);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x24, 0x00000000);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x28, (dev_priv-&gt;vram_size - 1) &gt;&gt; 8);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x2c, 0x00000000);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x30, 0x00000000);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x34, 0x00000000);</div><div class='add'>+		nv_wo32(disp-&gt;mem, hash + 0x08, NvEvoVRAM);</div><div class='add'>+		nv_wo32(disp-&gt;mem, hash + 0x0c, 0x00000001 | (i &lt;&lt; 27) |</div><div class='add'>+						((dmao + 0x20) &lt;&lt; 9));</div><div class='add'>+</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x40, 0x00000009);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x44, 0x00000000);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x48, (dev_priv-&gt;vram_size - 1) &gt;&gt; 8);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x4c, 0x00000000);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x50, 0x00000000);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x54, 0x00000000);</div><div class='add'>+		nv_wo32(disp-&gt;mem, hash + 0x10, NvEvoVRAM_LP);</div><div class='add'>+		nv_wo32(disp-&gt;mem, hash + 0x14, 0x00000001 | (i &lt;&lt; 27) |</div><div class='add'>+						((dmao + 0x40) &lt;&lt; 9));</div><div class='add'>+</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x60, 0x0fe00009);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x64, 0x00000000);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x68, (dev_priv-&gt;vram_size - 1) &gt;&gt; 8);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x6c, 0x00000000);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x70, 0x00000000);</div><div class='add'>+		nv_wo32(disp-&gt;mem, dmao + 0x74, 0x00000000);</div><div class='add'>+		nv_wo32(disp-&gt;mem, hash + 0x18, NvEvoFB32);</div><div class='add'>+		nv_wo32(disp-&gt;mem, hash + 0x1c, 0x00000001 | (i &lt;&lt; 27) |</div><div class='add'>+						((dmao + 0x60) &lt;&lt; 9));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = nvd0_display_init(dev);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+	pinstmem-&gt;flush(dev);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	if (ret)</div><div class='head'>diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c<br/>index 4c8796ba6dd8..6a5f4395838f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/r128/r128_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/r128/r128_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/r128/r128_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/r128/r128_drv.c</a></div><div class='hunk'>@@ -42,6 +42,20 @@ static struct pci_device_id pciidlist[] = {</div><div class='ctx'> 	r128_PCI_IDS</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct file_operations r128_driver_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = drm_open,</div><div class='add'>+	.release = drm_release,</div><div class='add'>+	.unlocked_ioctl = drm_ioctl,</div><div class='add'>+	.mmap = drm_mmap,</div><div class='add'>+	.poll = drm_poll,</div><div class='add'>+	.fasync = drm_fasync,</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+	.compat_ioctl = r128_compat_ioctl,</div><div class='add'>+#endif</div><div class='add'>+	.llseek = noop_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct drm_driver driver = {</div><div class='ctx'> 	.driver_features =</div><div class='ctx'> 	    DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |</div><div class='hunk'>@@ -60,21 +74,7 @@ static struct drm_driver driver = {</div><div class='ctx'> 	.reclaim_buffers = drm_core_reclaim_buffers,</div><div class='ctx'> 	.ioctls = r128_ioctls,</div><div class='ctx'> 	.dma_ioctl = r128_cce_buffers,</div><div class='del'>-	.fops = {</div><div class='del'>-		.owner = THIS_MODULE,</div><div class='del'>-		.open = drm_open,</div><div class='del'>-		.release = drm_release,</div><div class='del'>-		.unlocked_ioctl = drm_ioctl,</div><div class='del'>-		.mmap = drm_mmap,</div><div class='del'>-		.poll = drm_poll,</div><div class='del'>-		.fasync = drm_fasync,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-		.compat_ioctl = r128_compat_ioctl,</div><div class='del'>-#endif</div><div class='del'>-		.llseek = noop_llseek,</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+	.fops = &amp;r128_driver_fops,</div><div class='ctx'> 	.name = DRIVER_NAME,</div><div class='ctx'> 	.desc = DRIVER_DESC,</div><div class='ctx'> 	.date = DRIVER_DATE,</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile<br/>index cf8b4bc3e73d..2139fe893ec5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/Makefile</a></div><div class='hunk'>@@ -70,7 +70,8 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \</div><div class='ctx'> 	r200.o radeon_legacy_tv.o r600_cs.o r600_blit.o r600_blit_shaders.o \</div><div class='ctx'> 	r600_blit_kms.o radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o \</div><div class='ctx'> 	evergreen.o evergreen_cs.o evergreen_blit_shaders.o evergreen_blit_kms.o \</div><div class='del'>-	radeon_trace_points.o ni.o cayman_blit_shaders.o atombios_encoders.o</div><div class='add'>+	radeon_trace_points.o ni.o cayman_blit_shaders.o atombios_encoders.o \</div><div class='add'>+	radeon_semaphore.o radeon_sa.o</div><div class='ctx'> </div><div class='ctx'> radeon-$(CONFIG_COMPAT) += radeon_ioc32.o</div><div class='ctx'> radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o</div><div class='hunk'>@@ -78,4 +79,4 @@ radeon-$(CONFIG_ACPI) += radeon_acpi.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_DRM_RADEON)+= radeon.o</div><div class='ctx'> </div><div class='del'>-CFLAGS_radeon_trace_points.o := -I$(src)
\ No newline at end of file</div><div class='add'>+CFLAGS_radeon_trace_points.o := -I$(src)</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c<br/>index 14cc88aaf3a7..d1bd239cd9e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/atom.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/atom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/atom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/atom.c</a></div><div class='hunk'>@@ -665,6 +665,8 @@ static void atom_op_delay(atom_exec_context *ctx, int *ptr, int arg)</div><div class='ctx'> 	SDEBUG("   count: %d\n", count);</div><div class='ctx'> 	if (arg == ATOM_UNIT_MICROSEC)</div><div class='ctx'> 		udelay(count);</div><div class='add'>+	else if (!drm_can_sleep())</div><div class='add'>+		mdelay(count);</div><div class='ctx'> 	else</div><div class='ctx'> 		msleep(count);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c<br/>index 2b97262e3ab1..0fda830ef806 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/atombios_crtc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/atombios_crtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/atombios_crtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/atombios_crtc.c</a></div><div class='hunk'>@@ -554,7 +554,7 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,</div><div class='ctx'> 		if (encoder-&gt;crtc == crtc) {</div><div class='ctx'> 			radeon_encoder = to_radeon_encoder(encoder);</div><div class='ctx'> 			connector = radeon_get_connector_for_encoder(encoder);</div><div class='del'>-			if (connector)</div><div class='add'>+			if (connector &amp;&amp; connector-&gt;display_info.bpc)</div><div class='ctx'> 				bpc = connector-&gt;display_info.bpc;</div><div class='ctx'> 			encoder_mode = atombios_get_encoder_mode(encoder);</div><div class='ctx'> 			if ((radeon_encoder-&gt;devices &amp; (ATOM_DEVICE_LCD_SUPPORT | ATOM_DEVICE_DFP_SUPPORT)) ||</div><div class='hunk'>@@ -1184,7 +1184,7 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,</div><div class='ctx'> 	WREG32(EVERGREEN_GRPH_X_END + radeon_crtc-&gt;crtc_offset, target_fb-&gt;width);</div><div class='ctx'> 	WREG32(EVERGREEN_GRPH_Y_END + radeon_crtc-&gt;crtc_offset, target_fb-&gt;height);</div><div class='ctx'> </div><div class='del'>-	fb_pitch_pixels = target_fb-&gt;pitch / (target_fb-&gt;bits_per_pixel / 8);</div><div class='add'>+	fb_pitch_pixels = target_fb-&gt;pitches[0] / (target_fb-&gt;bits_per_pixel / 8);</div><div class='ctx'> 	WREG32(EVERGREEN_GRPH_PITCH + radeon_crtc-&gt;crtc_offset, fb_pitch_pixels);</div><div class='ctx'> 	WREG32(EVERGREEN_GRPH_ENABLE + radeon_crtc-&gt;crtc_offset, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -1353,7 +1353,7 @@ static int avivo_crtc_do_set_base(struct drm_crtc *crtc,</div><div class='ctx'> 	WREG32(AVIVO_D1GRPH_X_END + radeon_crtc-&gt;crtc_offset, target_fb-&gt;width);</div><div class='ctx'> 	WREG32(AVIVO_D1GRPH_Y_END + radeon_crtc-&gt;crtc_offset, target_fb-&gt;height);</div><div class='ctx'> </div><div class='del'>-	fb_pitch_pixels = target_fb-&gt;pitch / (target_fb-&gt;bits_per_pixel / 8);</div><div class='add'>+	fb_pitch_pixels = target_fb-&gt;pitches[0] / (target_fb-&gt;bits_per_pixel / 8);</div><div class='ctx'> 	WREG32(AVIVO_D1GRPH_PITCH + radeon_crtc-&gt;crtc_offset, fb_pitch_pixels);</div><div class='ctx'> 	WREG32(AVIVO_D1GRPH_ENABLE + radeon_crtc-&gt;crtc_offset, 1);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c<br/>index 39c04c1b8472..f1f06ca9f1f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/atombios_encoders.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/atombios_encoders.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/atombios_encoders.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/atombios_encoders.c</a></div><div class='hunk'>@@ -409,8 +409,6 @@ int</div><div class='ctx'> atombios_get_encoder_mode(struct drm_encoder *encoder)</div><div class='ctx'> {</div><div class='ctx'> 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);</div><div class='del'>-	struct drm_device *dev = encoder-&gt;dev;</div><div class='del'>-	struct radeon_device *rdev = dev-&gt;dev_private;</div><div class='ctx'> 	struct drm_connector *connector;</div><div class='ctx'> 	struct radeon_connector *radeon_connector;</div><div class='ctx'> 	struct radeon_connector_atom_dig *dig_connector;</div><div class='hunk'>@@ -434,13 +432,10 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)</div><div class='ctx'> 	switch (connector-&gt;connector_type) {</div><div class='ctx'> 	case DRM_MODE_CONNECTOR_DVII:</div><div class='ctx'> 	case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */</div><div class='del'>-		if (drm_detect_monitor_audio(radeon_connector-&gt;edid) &amp;&amp; radeon_audio) {</div><div class='del'>-			/* fix me */</div><div class='del'>-			if (ASIC_IS_DCE4(rdev))</div><div class='del'>-				return ATOM_ENCODER_MODE_DVI;</div><div class='del'>-			else</div><div class='del'>-				return ATOM_ENCODER_MODE_HDMI;</div><div class='del'>-		} else if (radeon_connector-&gt;use_digital)</div><div class='add'>+		if (drm_detect_monitor_audio(radeon_connector-&gt;edid) &amp;&amp;</div><div class='add'>+		    radeon_audio)</div><div class='add'>+			return ATOM_ENCODER_MODE_HDMI;</div><div class='add'>+		else if (radeon_connector-&gt;use_digital)</div><div class='ctx'> 			return ATOM_ENCODER_MODE_DVI;</div><div class='ctx'> 		else</div><div class='ctx'> 			return ATOM_ENCODER_MODE_CRT;</div><div class='hunk'>@@ -448,13 +443,10 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)</div><div class='ctx'> 	case DRM_MODE_CONNECTOR_DVID:</div><div class='ctx'> 	case DRM_MODE_CONNECTOR_HDMIA:</div><div class='ctx'> 	default:</div><div class='del'>-		if (drm_detect_monitor_audio(radeon_connector-&gt;edid) &amp;&amp; radeon_audio) {</div><div class='del'>-			/* fix me */</div><div class='del'>-			if (ASIC_IS_DCE4(rdev))</div><div class='del'>-				return ATOM_ENCODER_MODE_DVI;</div><div class='del'>-			else</div><div class='del'>-				return ATOM_ENCODER_MODE_HDMI;</div><div class='del'>-		} else</div><div class='add'>+		if (drm_detect_monitor_audio(radeon_connector-&gt;edid) &amp;&amp;</div><div class='add'>+		    radeon_audio)</div><div class='add'>+			return ATOM_ENCODER_MODE_HDMI;</div><div class='add'>+		else</div><div class='ctx'> 			return ATOM_ENCODER_MODE_DVI;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DRM_MODE_CONNECTOR_LVDS:</div><div class='hunk'>@@ -465,13 +457,10 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)</div><div class='ctx'> 		if ((dig_connector-&gt;dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||</div><div class='ctx'> 		    (dig_connector-&gt;dp_sink_type == CONNECTOR_OBJECT_ID_eDP))</div><div class='ctx'> 			return ATOM_ENCODER_MODE_DP;</div><div class='del'>-		else if (drm_detect_monitor_audio(radeon_connector-&gt;edid) &amp;&amp; radeon_audio) {</div><div class='del'>-			/* fix me */</div><div class='del'>-			if (ASIC_IS_DCE4(rdev))</div><div class='del'>-				return ATOM_ENCODER_MODE_DVI;</div><div class='del'>-			else</div><div class='del'>-				return ATOM_ENCODER_MODE_HDMI;</div><div class='del'>-		} else</div><div class='add'>+		else if (drm_detect_monitor_audio(radeon_connector-&gt;edid) &amp;&amp;</div><div class='add'>+			 radeon_audio)</div><div class='add'>+			return ATOM_ENCODER_MODE_HDMI;</div><div class='add'>+		else</div><div class='ctx'> 			return ATOM_ENCODER_MODE_DVI;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DRM_MODE_CONNECTOR_eDP:</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c<br/>index 92c9628c572d..636660fca8c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/evergreen.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/evergreen.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/evergreen.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/evergreen.c</a></div><div class='hunk'>@@ -40,6 +40,8 @@</div><div class='ctx'> static void evergreen_gpu_init(struct radeon_device *rdev);</div><div class='ctx'> void evergreen_fini(struct radeon_device *rdev);</div><div class='ctx'> void evergreen_pcie_gen2_enable(struct radeon_device *rdev);</div><div class='add'>+extern void cayman_cp_int_cntl_setup(struct radeon_device *rdev,</div><div class='add'>+				     int ring, u32 cp_int_cntl);</div><div class='ctx'> </div><div class='ctx'> void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1311,18 +1313,20 @@ void evergreen_mc_program(struct radeon_device *rdev)</div><div class='ctx'>  */</div><div class='ctx'> void evergreen_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[ib-&gt;fence-&gt;ring];</div><div class='add'>+</div><div class='ctx'> 	/* set to DX10/11 mode */</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_MODE_CONTROL, 0));</div><div class='del'>-	radeon_ring_write(rdev, 1);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_MODE_CONTROL, 0));</div><div class='add'>+	radeon_ring_write(ring, 1);</div><div class='ctx'> 	/* FIXME: implement */</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_INDIRECT_BUFFER, 2));</div><div class='del'>-	radeon_ring_write(rdev,</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_INDIRECT_BUFFER, 2));</div><div class='add'>+	radeon_ring_write(ring,</div><div class='ctx'> #ifdef __BIG_ENDIAN</div><div class='ctx'> 			  (2 &lt;&lt; 0) |</div><div class='ctx'> #endif</div><div class='ctx'> 			  (ib-&gt;gpu_addr &amp; 0xFFFFFFFC));</div><div class='del'>-	radeon_ring_write(rdev, upper_32_bits(ib-&gt;gpu_addr) &amp; 0xFF);</div><div class='del'>-	radeon_ring_write(rdev, ib-&gt;length_dw);</div><div class='add'>+	radeon_ring_write(ring, upper_32_bits(ib-&gt;gpu_addr) &amp; 0xFF);</div><div class='add'>+	radeon_ring_write(ring, ib-&gt;length_dw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1360,71 +1364,73 @@ static int evergreen_cp_load_microcode(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> static int evergreen_cp_start(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	int r, i;</div><div class='ctx'> 	uint32_t cp_me;</div><div class='ctx'> </div><div class='del'>-	r = radeon_ring_lock(rdev, 7);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, 7);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		DRM_ERROR("radeon: cp failed to lock ring (%d).\n", r);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_ME_INITIALIZE, 5));</div><div class='del'>-	radeon_ring_write(rdev, 0x1);</div><div class='del'>-	radeon_ring_write(rdev, 0x0);</div><div class='del'>-	radeon_ring_write(rdev, rdev-&gt;config.evergreen.max_hw_contexts - 1);</div><div class='del'>-	radeon_ring_write(rdev, PACKET3_ME_INITIALIZE_DEVICE_ID(1));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_unlock_commit(rdev);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_ME_INITIALIZE, 5));</div><div class='add'>+	radeon_ring_write(ring, 0x1);</div><div class='add'>+	radeon_ring_write(ring, 0x0);</div><div class='add'>+	radeon_ring_write(ring, rdev-&gt;config.evergreen.max_hw_contexts - 1);</div><div class='add'>+	radeon_ring_write(ring, PACKET3_ME_INITIALIZE_DEVICE_ID(1));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> </div><div class='ctx'> 	cp_me = 0xff;</div><div class='ctx'> 	WREG32(CP_ME_CNTL, cp_me);</div><div class='ctx'> </div><div class='del'>-	r = radeon_ring_lock(rdev, evergreen_default_size + 19);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, evergreen_default_size + 19);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		DRM_ERROR("radeon: cp failed to lock ring (%d).\n", r);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* setup clear context state */</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_PREAMBLE_CNTL, 0));</div><div class='del'>-	radeon_ring_write(rdev, PACKET3_PREAMBLE_BEGIN_CLEAR_STATE);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_PREAMBLE_CNTL, 0));</div><div class='add'>+	radeon_ring_write(ring, PACKET3_PREAMBLE_BEGIN_CLEAR_STATE);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; evergreen_default_size; i++)</div><div class='del'>-		radeon_ring_write(rdev, evergreen_default_state[i]);</div><div class='add'>+		radeon_ring_write(ring, evergreen_default_state[i]);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_PREAMBLE_CNTL, 0));</div><div class='del'>-	radeon_ring_write(rdev, PACKET3_PREAMBLE_END_CLEAR_STATE);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_PREAMBLE_CNTL, 0));</div><div class='add'>+	radeon_ring_write(ring, PACKET3_PREAMBLE_END_CLEAR_STATE);</div><div class='ctx'> </div><div class='ctx'> 	/* set clear context state */</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_CLEAR_STATE, 0));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_CLEAR_STATE, 0));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* SQ_VTX_BASE_VTX_LOC */</div><div class='del'>-	radeon_ring_write(rdev, 0xc0026f00);</div><div class='del'>-	radeon_ring_write(rdev, 0x00000000);</div><div class='del'>-	radeon_ring_write(rdev, 0x00000000);</div><div class='del'>-	radeon_ring_write(rdev, 0x00000000);</div><div class='add'>+	radeon_ring_write(ring, 0xc0026f00);</div><div class='add'>+	radeon_ring_write(ring, 0x00000000);</div><div class='add'>+	radeon_ring_write(ring, 0x00000000);</div><div class='add'>+	radeon_ring_write(ring, 0x00000000);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear consts */</div><div class='del'>-	radeon_ring_write(rdev, 0xc0036f00);</div><div class='del'>-	radeon_ring_write(rdev, 0x00000bc4);</div><div class='del'>-	radeon_ring_write(rdev, 0xffffffff);</div><div class='del'>-	radeon_ring_write(rdev, 0xffffffff);</div><div class='del'>-	radeon_ring_write(rdev, 0xffffffff);</div><div class='add'>+	radeon_ring_write(ring, 0xc0036f00);</div><div class='add'>+	radeon_ring_write(ring, 0x00000bc4);</div><div class='add'>+	radeon_ring_write(ring, 0xffffffff);</div><div class='add'>+	radeon_ring_write(ring, 0xffffffff);</div><div class='add'>+	radeon_ring_write(ring, 0xffffffff);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, 0xc0026900);</div><div class='del'>-	radeon_ring_write(rdev, 0x00000316);</div><div class='del'>-	radeon_ring_write(rdev, 0x0000000e); /* VGT_VERTEX_REUSE_BLOCK_CNTL */</div><div class='del'>-	radeon_ring_write(rdev, 0x00000010); /*  */</div><div class='add'>+	radeon_ring_write(ring, 0xc0026900);</div><div class='add'>+	radeon_ring_write(ring, 0x00000316);</div><div class='add'>+	radeon_ring_write(ring, 0x0000000e); /* VGT_VERTEX_REUSE_BLOCK_CNTL */</div><div class='add'>+	radeon_ring_write(ring, 0x00000010); /*  */</div><div class='ctx'> </div><div class='del'>-	radeon_ring_unlock_commit(rdev);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int evergreen_cp_resume(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> 	u32 rb_bufsz;</div><div class='ctx'> 	int r;</div><div class='hunk'>@@ -1442,13 +1448,13 @@ int evergreen_cp_resume(struct radeon_device *rdev)</div><div class='ctx'> 	RREG32(GRBM_SOFT_RESET);</div><div class='ctx'> </div><div class='ctx'> 	/* Set ring buffer size */</div><div class='del'>-	rb_bufsz = drm_order(rdev-&gt;cp.ring_size / 8);</div><div class='add'>+	rb_bufsz = drm_order(ring-&gt;ring_size / 8);</div><div class='ctx'> 	tmp = (drm_order(RADEON_GPU_PAGE_SIZE/8) &lt;&lt; 8) | rb_bufsz;</div><div class='ctx'> #ifdef __BIG_ENDIAN</div><div class='ctx'> 	tmp |= BUF_SWAP_32BIT;</div><div class='ctx'> #endif</div><div class='ctx'> 	WREG32(CP_RB_CNTL, tmp);</div><div class='del'>-	WREG32(CP_SEM_WAIT_TIMER, 0x4);</div><div class='add'>+	WREG32(CP_SEM_WAIT_TIMER, 0x0);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the write pointer delay */</div><div class='ctx'> 	WREG32(CP_RB_WPTR_DELAY, 0);</div><div class='hunk'>@@ -1456,8 +1462,8 @@ int evergreen_cp_resume(struct radeon_device *rdev)</div><div class='ctx'> 	/* Initialize the ring buffer's read and write pointers */</div><div class='ctx'> 	WREG32(CP_RB_CNTL, tmp | RB_RPTR_WR_ENA);</div><div class='ctx'> 	WREG32(CP_RB_RPTR_WR, 0);</div><div class='del'>-	rdev-&gt;cp.wptr = 0;</div><div class='del'>-	WREG32(CP_RB_WPTR, rdev-&gt;cp.wptr);</div><div class='add'>+	ring-&gt;wptr = 0;</div><div class='add'>+	WREG32(CP_RB_WPTR, ring-&gt;wptr);</div><div class='ctx'> </div><div class='ctx'> 	/* set the wb address wether it's enabled or not */</div><div class='ctx'> 	WREG32(CP_RB_RPTR_ADDR,</div><div class='hunk'>@@ -1475,16 +1481,16 @@ int evergreen_cp_resume(struct radeon_device *rdev)</div><div class='ctx'> 	mdelay(1);</div><div class='ctx'> 	WREG32(CP_RB_CNTL, tmp);</div><div class='ctx'> </div><div class='del'>-	WREG32(CP_RB_BASE, rdev-&gt;cp.gpu_addr &gt;&gt; 8);</div><div class='add'>+	WREG32(CP_RB_BASE, ring-&gt;gpu_addr &gt;&gt; 8);</div><div class='ctx'> 	WREG32(CP_DEBUG, (1 &lt;&lt; 27) | (1 &lt;&lt; 28));</div><div class='ctx'> </div><div class='del'>-	rdev-&gt;cp.rptr = RREG32(CP_RB_RPTR);</div><div class='add'>+	ring-&gt;rptr = RREG32(CP_RB_RPTR);</div><div class='ctx'> </div><div class='ctx'> 	evergreen_cp_start(rdev);</div><div class='del'>-	rdev-&gt;cp.ready = true;</div><div class='del'>-	r = radeon_ring_test(rdev);</div><div class='add'>+	ring-&gt;ready = true;</div><div class='add'>+	r = radeon_ring_test(rdev, ring);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		rdev-&gt;cp.ready = false;</div><div class='add'>+		ring-&gt;ready = false;</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2353,7 +2359,7 @@ int evergreen_mc_init(struct radeon_device *rdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool evergreen_gpu_is_lockup(struct radeon_device *rdev)</div><div class='add'>+bool evergreen_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring)</div><div class='ctx'> {</div><div class='ctx'> 	u32 srbm_status;</div><div class='ctx'> 	u32 grbm_status;</div><div class='hunk'>@@ -2366,19 +2372,19 @@ bool evergreen_gpu_is_lockup(struct radeon_device *rdev)</div><div class='ctx'> 	grbm_status_se0 = RREG32(GRBM_STATUS_SE0);</div><div class='ctx'> 	grbm_status_se1 = RREG32(GRBM_STATUS_SE1);</div><div class='ctx'> 	if (!(grbm_status &amp; GUI_ACTIVE)) {</div><div class='del'>-		r100_gpu_lockup_update(lockup, &amp;rdev-&gt;cp);</div><div class='add'>+		r100_gpu_lockup_update(lockup, ring);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* force CP activities */</div><div class='del'>-	r = radeon_ring_lock(rdev, 2);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, 2);</div><div class='ctx'> 	if (!r) {</div><div class='ctx'> 		/* PACKET2 NOP */</div><div class='del'>-		radeon_ring_write(rdev, 0x80000000);</div><div class='del'>-		radeon_ring_write(rdev, 0x80000000);</div><div class='del'>-		radeon_ring_unlock_commit(rdev);</div><div class='add'>+		radeon_ring_write(ring, 0x80000000);</div><div class='add'>+		radeon_ring_write(ring, 0x80000000);</div><div class='add'>+		radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> 	}</div><div class='del'>-	rdev-&gt;cp.rptr = RREG32(CP_RB_RPTR);</div><div class='del'>-	return r100_gpu_cp_is_lockup(rdev, lockup, &amp;rdev-&gt;cp);</div><div class='add'>+	ring-&gt;rptr = RREG32(CP_RB_RPTR);</div><div class='add'>+	return r100_gpu_cp_is_lockup(rdev, lockup, ring);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int evergreen_gpu_soft_reset(struct radeon_device *rdev)</div><div class='hunk'>@@ -2470,7 +2476,13 @@ void evergreen_disable_interrupt_state(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> </div><div class='del'>-	WREG32(CP_INT_CNTL, CNTX_BUSY_INT_ENABLE | CNTX_EMPTY_INT_ENABLE);</div><div class='add'>+	if (rdev-&gt;family &gt;= CHIP_CAYMAN) {</div><div class='add'>+		cayman_cp_int_cntl_setup(rdev, 0,</div><div class='add'>+					 CNTX_BUSY_INT_ENABLE | CNTX_EMPTY_INT_ENABLE);</div><div class='add'>+		cayman_cp_int_cntl_setup(rdev, 1, 0);</div><div class='add'>+		cayman_cp_int_cntl_setup(rdev, 2, 0);</div><div class='add'>+	} else</div><div class='add'>+		WREG32(CP_INT_CNTL, CNTX_BUSY_INT_ENABLE | CNTX_EMPTY_INT_ENABLE);</div><div class='ctx'> 	WREG32(GRBM_INT_CNTL, 0);</div><div class='ctx'> 	WREG32(INT_MASK + EVERGREEN_CRTC0_REGISTER_OFFSET, 0);</div><div class='ctx'> 	WREG32(INT_MASK + EVERGREEN_CRTC1_REGISTER_OFFSET, 0);</div><div class='hunk'>@@ -2515,6 +2527,7 @@ void evergreen_disable_interrupt_state(struct radeon_device *rdev)</div><div class='ctx'> int evergreen_irq_set(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 cp_int_cntl = CNTX_BUSY_INT_ENABLE | CNTX_EMPTY_INT_ENABLE;</div><div class='add'>+	u32 cp_int_cntl1 = 0, cp_int_cntl2 = 0;</div><div class='ctx'> 	u32 crtc1 = 0, crtc2 = 0, crtc3 = 0, crtc4 = 0, crtc5 = 0, crtc6 = 0;</div><div class='ctx'> 	u32 hpd1, hpd2, hpd3, hpd4, hpd5, hpd6;</div><div class='ctx'> 	u32 grbm_int_cntl = 0;</div><div class='hunk'>@@ -2539,11 +2552,28 @@ int evergreen_irq_set(struct radeon_device *rdev)</div><div class='ctx'> 	hpd5 = RREG32(DC_HPD5_INT_CONTROL) &amp; ~DC_HPDx_INT_EN;</div><div class='ctx'> 	hpd6 = RREG32(DC_HPD6_INT_CONTROL) &amp; ~DC_HPDx_INT_EN;</div><div class='ctx'> </div><div class='del'>-	if (rdev-&gt;irq.sw_int) {</div><div class='del'>-		DRM_DEBUG("evergreen_irq_set: sw int\n");</div><div class='del'>-		cp_int_cntl |= RB_INT_ENABLE;</div><div class='del'>-		cp_int_cntl |= TIME_STAMP_INT_ENABLE;</div><div class='add'>+	if (rdev-&gt;family &gt;= CHIP_CAYMAN) {</div><div class='add'>+		/* enable CP interrupts on all rings */</div><div class='add'>+		if (rdev-&gt;irq.sw_int[RADEON_RING_TYPE_GFX_INDEX]) {</div><div class='add'>+			DRM_DEBUG("evergreen_irq_set: sw int gfx\n");</div><div class='add'>+			cp_int_cntl |= TIME_STAMP_INT_ENABLE;</div><div class='add'>+		}</div><div class='add'>+		if (rdev-&gt;irq.sw_int[CAYMAN_RING_TYPE_CP1_INDEX]) {</div><div class='add'>+			DRM_DEBUG("evergreen_irq_set: sw int cp1\n");</div><div class='add'>+			cp_int_cntl1 |= TIME_STAMP_INT_ENABLE;</div><div class='add'>+		}</div><div class='add'>+		if (rdev-&gt;irq.sw_int[CAYMAN_RING_TYPE_CP2_INDEX]) {</div><div class='add'>+			DRM_DEBUG("evergreen_irq_set: sw int cp2\n");</div><div class='add'>+			cp_int_cntl2 |= TIME_STAMP_INT_ENABLE;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (rdev-&gt;irq.sw_int[RADEON_RING_TYPE_GFX_INDEX]) {</div><div class='add'>+			DRM_DEBUG("evergreen_irq_set: sw int gfx\n");</div><div class='add'>+			cp_int_cntl |= RB_INT_ENABLE;</div><div class='add'>+			cp_int_cntl |= TIME_STAMP_INT_ENABLE;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (rdev-&gt;irq.crtc_vblank_int[0] ||</div><div class='ctx'> 	    rdev-&gt;irq.pflip[0]) {</div><div class='ctx'> 		DRM_DEBUG("evergreen_irq_set: vblank 0\n");</div><div class='hunk'>@@ -2603,7 +2633,12 @@ int evergreen_irq_set(struct radeon_device *rdev)</div><div class='ctx'> 		grbm_int_cntl |= GUI_IDLE_INT_ENABLE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	WREG32(CP_INT_CNTL, cp_int_cntl);</div><div class='add'>+	if (rdev-&gt;family &gt;= CHIP_CAYMAN) {</div><div class='add'>+		cayman_cp_int_cntl_setup(rdev, 0, cp_int_cntl);</div><div class='add'>+		cayman_cp_int_cntl_setup(rdev, 1, cp_int_cntl1);</div><div class='add'>+		cayman_cp_int_cntl_setup(rdev, 2, cp_int_cntl2);</div><div class='add'>+	} else</div><div class='add'>+		WREG32(CP_INT_CNTL, cp_int_cntl);</div><div class='ctx'> 	WREG32(GRBM_INT_CNTL, grbm_int_cntl);</div><div class='ctx'> </div><div class='ctx'> 	WREG32(INT_MASK + EVERGREEN_CRTC0_REGISTER_OFFSET, crtc1);</div><div class='hunk'>@@ -3018,11 +3053,24 @@ restart_ih:</div><div class='ctx'> 		case 177: /* CP_INT in IB1 */</div><div class='ctx'> 		case 178: /* CP_INT in IB2 */</div><div class='ctx'> 			DRM_DEBUG("IH: CP int: 0x%08x\n", src_data);</div><div class='del'>-			radeon_fence_process(rdev);</div><div class='add'>+			radeon_fence_process(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 181: /* CP EOP event */</div><div class='ctx'> 			DRM_DEBUG("IH: CP EOP\n");</div><div class='del'>-			radeon_fence_process(rdev);</div><div class='add'>+			if (rdev-&gt;family &gt;= CHIP_CAYMAN) {</div><div class='add'>+				switch (src_data) {</div><div class='add'>+				case 0:</div><div class='add'>+					radeon_fence_process(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='add'>+					break;</div><div class='add'>+				case 1:</div><div class='add'>+					radeon_fence_process(rdev, CAYMAN_RING_TYPE_CP1_INDEX);</div><div class='add'>+					break;</div><div class='add'>+				case 2:</div><div class='add'>+					radeon_fence_process(rdev, CAYMAN_RING_TYPE_CP2_INDEX);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			} else</div><div class='add'>+				radeon_fence_process(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 233: /* GUI IDLE */</div><div class='ctx'> 			DRM_DEBUG("IH: GUI idle\n");</div><div class='hunk'>@@ -3052,6 +3100,7 @@ restart_ih:</div><div class='ctx'> </div><div class='ctx'> static int evergreen_startup(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	/* enable pcie gen2 link */</div><div class='hunk'>@@ -3106,6 +3155,12 @@ static int evergreen_startup(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_fence_driver_start_ring(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed initializing CP fences (%d).\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Enable IRQ */</div><div class='ctx'> 	r = r600_irq_init(rdev);</div><div class='ctx'> 	if (r) {</div><div class='hunk'>@@ -3115,7 +3170,9 @@ static int evergreen_startup(struct radeon_device *rdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	evergreen_irq_set(rdev);</div><div class='ctx'> </div><div class='del'>-	r = radeon_ring_init(rdev, rdev-&gt;cp.ring_size);</div><div class='add'>+	r = radeon_ring_init(rdev, ring, ring-&gt;ring_size, RADEON_WB_CP_RPTR_OFFSET,</div><div class='add'>+			     R600_CP_RB_RPTR, R600_CP_RB_WPTR,</div><div class='add'>+			     0, 0xfffff, RADEON_CP_PACKET2);</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> 	r = evergreen_cp_load_microcode(rdev);</div><div class='hunk'>@@ -3125,6 +3182,22 @@ static int evergreen_startup(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_ib_pool_start(rdev);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	r = r600_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("radeon: failed testing IB (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = r600_audio_init(rdev);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("radeon: audio init failed\n");</div><div class='add'>+		return r;</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'>@@ -3144,31 +3217,30 @@ int evergreen_resume(struct radeon_device *rdev)</div><div class='ctx'> 	/* post card */</div><div class='ctx'> 	atom_asic_init(rdev-&gt;mode_info.atom_context);</div><div class='ctx'> </div><div class='add'>+	rdev-&gt;accel_working = true;</div><div class='ctx'> 	r = evergreen_startup(rdev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		DRM_ERROR("evergreen startup failed on resume\n");</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	r = r600_ib_test(rdev);</div><div class='del'>-	if (r) {</div><div class='del'>-		DRM_ERROR("radeon: failed testing IB (%d).\n", r);</div><div class='del'>-		return r;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return r;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int evergreen_suspend(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='add'>+</div><div class='add'>+	r600_audio_fini(rdev);</div><div class='ctx'> 	/* FIXME: we should wait for ring to be empty */</div><div class='add'>+	radeon_ib_pool_suspend(rdev);</div><div class='add'>+	r600_blit_suspend(rdev);</div><div class='ctx'> 	r700_cp_stop(rdev);</div><div class='del'>-	rdev-&gt;cp.ready = false;</div><div class='add'>+	ring-&gt;ready = false;</div><div class='ctx'> 	evergreen_irq_suspend(rdev);</div><div class='ctx'> 	radeon_wb_disable(rdev);</div><div class='ctx'> 	evergreen_pcie_gart_disable(rdev);</div><div class='del'>-	r600_blit_suspend(rdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3243,8 +3315,8 @@ int evergreen_init(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='del'>-	rdev-&gt;cp.ring_obj = NULL;</div><div class='del'>-	r600_ring_init(rdev, 1024 * 1024);</div><div class='add'>+	rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX].ring_obj = NULL;</div><div class='add'>+	r600_ring_init(rdev, &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX], 1024 * 1024);</div><div class='ctx'> </div><div class='ctx'> 	rdev-&gt;ih.ring_obj = NULL;</div><div class='ctx'> 	r600_ih_ring_init(rdev, 64 * 1024);</div><div class='hunk'>@@ -3253,29 +3325,24 @@ int evergreen_init(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_ib_pool_init(rdev);</div><div class='ctx'> 	rdev-&gt;accel_working = true;</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "IB initialization failed (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	r = evergreen_startup(rdev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		dev_err(rdev-&gt;dev, "disabling GPU acceleration\n");</div><div class='ctx'> 		r700_cp_fini(rdev);</div><div class='ctx'> 		r600_irq_fini(rdev);</div><div class='ctx'> 		radeon_wb_fini(rdev);</div><div class='add'>+		r100_ib_fini(rdev);</div><div class='ctx'> 		radeon_irq_kms_fini(rdev);</div><div class='ctx'> 		evergreen_pcie_gart_fini(rdev);</div><div class='ctx'> 		rdev-&gt;accel_working = false;</div><div class='ctx'> 	}</div><div class='del'>-	if (rdev-&gt;accel_working) {</div><div class='del'>-		r = radeon_ib_pool_init(rdev);</div><div class='del'>-		if (r) {</div><div class='del'>-			DRM_ERROR("radeon: failed initializing IB pool (%d).\n", r);</div><div class='del'>-			rdev-&gt;accel_working = false;</div><div class='del'>-		}</div><div class='del'>-		r = r600_ib_test(rdev);</div><div class='del'>-		if (r) {</div><div class='del'>-			DRM_ERROR("radeon: failed testing IB (%d).\n", r);</div><div class='del'>-			rdev-&gt;accel_working = false;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Don't start up if the MC ucode is missing on BTC parts.</div><div class='ctx'> 	 * The default clocks and voltages before the MC ucode</div><div class='hunk'>@@ -3293,15 +3360,17 @@ int evergreen_init(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> void evergreen_fini(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	r600_audio_fini(rdev);</div><div class='ctx'> 	r600_blit_fini(rdev);</div><div class='ctx'> 	r700_cp_fini(rdev);</div><div class='ctx'> 	r600_irq_fini(rdev);</div><div class='ctx'> 	radeon_wb_fini(rdev);</div><div class='del'>-	radeon_ib_pool_fini(rdev);</div><div class='add'>+	r100_ib_fini(rdev);</div><div class='ctx'> 	radeon_irq_kms_fini(rdev);</div><div class='ctx'> 	evergreen_pcie_gart_fini(rdev);</div><div class='ctx'> 	r600_vram_scratch_fini(rdev);</div><div class='ctx'> 	radeon_gem_fini(rdev);</div><div class='add'>+	radeon_semaphore_driver_fini(rdev);</div><div class='ctx'> 	radeon_fence_driver_fini(rdev);</div><div class='ctx'> 	radeon_agp_fini(rdev);</div><div class='ctx'> 	radeon_bo_fini(rdev);</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/evergreen_blit_kms.c b/drivers/gpu/drm/radeon/evergreen_blit_kms.c<br/>index 914e5af84163..2379849515c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/evergreen_blit_kms.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/evergreen_blit_kms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/evergreen_blit_kms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/evergreen_blit_kms.c</a></div><div class='hunk'>@@ -49,6 +49,7 @@ static void</div><div class='ctx'> set_render_target(struct radeon_device *rdev, int format,</div><div class='ctx'> 		  int w, int h, u64 gpu_addr)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	u32 cb_color_info;</div><div class='ctx'> 	int pitch, slice;</div><div class='ctx'> </div><div class='hunk'>@@ -62,23 +63,23 @@ set_render_target(struct radeon_device *rdev, int format,</div><div class='ctx'> 	pitch = (w / 8) - 1;</div><div class='ctx'> 	slice = ((w * h) / 64) - 1;</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 15));</div><div class='del'>-	radeon_ring_write(rdev, (CB_COLOR0_BASE - PACKET3_SET_CONTEXT_REG_START) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, gpu_addr &gt;&gt; 8);</div><div class='del'>-	radeon_ring_write(rdev, pitch);</div><div class='del'>-	radeon_ring_write(rdev, slice);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, cb_color_info);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, (w - 1) | ((h - 1) &lt;&lt; 16));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 15));</div><div class='add'>+	radeon_ring_write(ring, (CB_COLOR0_BASE - PACKET3_SET_CONTEXT_REG_START) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, gpu_addr &gt;&gt; 8);</div><div class='add'>+	radeon_ring_write(ring, pitch);</div><div class='add'>+	radeon_ring_write(ring, slice);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, cb_color_info);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, (w - 1) | ((h - 1) &lt;&lt; 16));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* emits 5dw */</div><div class='hunk'>@@ -87,6 +88,7 @@ cp_set_surface_sync(struct radeon_device *rdev,</div><div class='ctx'> 		    u32 sync_type, u32 size,</div><div class='ctx'> 		    u64 mc_addr)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	u32 cp_coher_size;</div><div class='ctx'> </div><div class='ctx'> 	if (size == 0xffffffff)</div><div class='hunk'>@@ -99,39 +101,40 @@ cp_set_surface_sync(struct radeon_device *rdev,</div><div class='ctx'> 		 * to the RB directly. For IBs, the CP programs this as part of the</div><div class='ctx'> 		 * surface_sync packet.</div><div class='ctx'> 		 */</div><div class='del'>-		radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONFIG_REG, 1));</div><div class='del'>-		radeon_ring_write(rdev, (0x85e8 - PACKET3_SET_CONFIG_REG_START) &gt;&gt; 2);</div><div class='del'>-		radeon_ring_write(rdev, 0); /* CP_COHER_CNTL2 */</div><div class='add'>+		radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));</div><div class='add'>+		radeon_ring_write(ring, (0x85e8 - PACKET3_SET_CONFIG_REG_START) &gt;&gt; 2);</div><div class='add'>+		radeon_ring_write(ring, 0); /* CP_COHER_CNTL2 */</div><div class='ctx'> 	}</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SURFACE_SYNC, 3));</div><div class='del'>-	radeon_ring_write(rdev, sync_type);</div><div class='del'>-	radeon_ring_write(rdev, cp_coher_size);</div><div class='del'>-	radeon_ring_write(rdev, mc_addr &gt;&gt; 8);</div><div class='del'>-	radeon_ring_write(rdev, 10); /* poll interval */</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SURFACE_SYNC, 3));</div><div class='add'>+	radeon_ring_write(ring, sync_type);</div><div class='add'>+	radeon_ring_write(ring, cp_coher_size);</div><div class='add'>+	radeon_ring_write(ring, mc_addr &gt;&gt; 8);</div><div class='add'>+	radeon_ring_write(ring, 10); /* poll interval */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* emits 11dw + 1 surface sync = 16dw */</div><div class='ctx'> static void</div><div class='ctx'> set_shaders(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	u64 gpu_addr;</div><div class='ctx'> </div><div class='ctx'> 	/* VS */</div><div class='ctx'> 	gpu_addr = rdev-&gt;r600_blit.shader_gpu_addr + rdev-&gt;r600_blit.vs_offset;</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 3));</div><div class='del'>-	radeon_ring_write(rdev, (SQ_PGM_START_VS - PACKET3_SET_CONTEXT_REG_START) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, gpu_addr &gt;&gt; 8);</div><div class='del'>-	radeon_ring_write(rdev, 2);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 3));</div><div class='add'>+	radeon_ring_write(ring, (SQ_PGM_START_VS - PACKET3_SET_CONTEXT_REG_START) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, gpu_addr &gt;&gt; 8);</div><div class='add'>+	radeon_ring_write(ring, 2);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* PS */</div><div class='ctx'> 	gpu_addr = rdev-&gt;r600_blit.shader_gpu_addr + rdev-&gt;r600_blit.ps_offset;</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 4));</div><div class='del'>-	radeon_ring_write(rdev, (SQ_PGM_START_PS - PACKET3_SET_CONTEXT_REG_START) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, gpu_addr &gt;&gt; 8);</div><div class='del'>-	radeon_ring_write(rdev, 1);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, 2);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 4));</div><div class='add'>+	radeon_ring_write(ring, (SQ_PGM_START_PS - PACKET3_SET_CONTEXT_REG_START) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, gpu_addr &gt;&gt; 8);</div><div class='add'>+	radeon_ring_write(ring, 1);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, 2);</div><div class='ctx'> </div><div class='ctx'> 	gpu_addr = rdev-&gt;r600_blit.shader_gpu_addr + rdev-&gt;r600_blit.vs_offset;</div><div class='ctx'> 	cp_set_surface_sync(rdev, PACKET3_SH_ACTION_ENA, 512, gpu_addr);</div><div class='hunk'>@@ -141,6 +144,7 @@ set_shaders(struct radeon_device *rdev)</div><div class='ctx'> static void</div><div class='ctx'> set_vtx_resource(struct radeon_device *rdev, u64 gpu_addr)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	u32 sq_vtx_constant_word2, sq_vtx_constant_word3;</div><div class='ctx'> </div><div class='ctx'> 	/* high addr, stride */</div><div class='hunk'>@@ -155,16 +159,16 @@ set_vtx_resource(struct radeon_device *rdev, u64 gpu_addr)</div><div class='ctx'> 		SQ_VTCX_SEL_Z(SQ_SEL_Z) |</div><div class='ctx'> 		SQ_VTCX_SEL_W(SQ_SEL_W);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_RESOURCE, 8));</div><div class='del'>-	radeon_ring_write(rdev, 0x580);</div><div class='del'>-	radeon_ring_write(rdev, gpu_addr &amp; 0xffffffff);</div><div class='del'>-	radeon_ring_write(rdev, 48 - 1); /* size */</div><div class='del'>-	radeon_ring_write(rdev, sq_vtx_constant_word2);</div><div class='del'>-	radeon_ring_write(rdev, sq_vtx_constant_word3);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, S__SQ_CONSTANT_TYPE(SQ_TEX_VTX_VALID_BUFFER));</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_RESOURCE, 8));</div><div class='add'>+	radeon_ring_write(ring, 0x580);</div><div class='add'>+	radeon_ring_write(ring, gpu_addr &amp; 0xffffffff);</div><div class='add'>+	radeon_ring_write(ring, 48 - 1); /* size */</div><div class='add'>+	radeon_ring_write(ring, sq_vtx_constant_word2);</div><div class='add'>+	radeon_ring_write(ring, sq_vtx_constant_word3);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, S__SQ_CONSTANT_TYPE(SQ_TEX_VTX_VALID_BUFFER));</div><div class='ctx'> </div><div class='ctx'> 	if ((rdev-&gt;family == CHIP_CEDAR) ||</div><div class='ctx'> 	    (rdev-&gt;family == CHIP_PALM) ||</div><div class='hunk'>@@ -185,6 +189,7 @@ set_tex_resource(struct radeon_device *rdev,</div><div class='ctx'> 		 int format, int w, int h, int pitch,</div><div class='ctx'> 		 u64 gpu_addr, u32 size)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	u32 sq_tex_resource_word0, sq_tex_resource_word1;</div><div class='ctx'> 	u32 sq_tex_resource_word4, sq_tex_resource_word7;</div><div class='ctx'> </div><div class='hunk'>@@ -208,16 +213,16 @@ set_tex_resource(struct radeon_device *rdev,</div><div class='ctx'> 	cp_set_surface_sync(rdev,</div><div class='ctx'> 			    PACKET3_TC_ACTION_ENA, size, gpu_addr);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_RESOURCE, 8));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, sq_tex_resource_word0);</div><div class='del'>-	radeon_ring_write(rdev, sq_tex_resource_word1);</div><div class='del'>-	radeon_ring_write(rdev, gpu_addr &gt;&gt; 8);</div><div class='del'>-	radeon_ring_write(rdev, gpu_addr &gt;&gt; 8);</div><div class='del'>-	radeon_ring_write(rdev, sq_tex_resource_word4);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, sq_tex_resource_word7);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_RESOURCE, 8));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, sq_tex_resource_word0);</div><div class='add'>+	radeon_ring_write(ring, sq_tex_resource_word1);</div><div class='add'>+	radeon_ring_write(ring, gpu_addr &gt;&gt; 8);</div><div class='add'>+	radeon_ring_write(ring, gpu_addr &gt;&gt; 8);</div><div class='add'>+	radeon_ring_write(ring, sq_tex_resource_word4);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, sq_tex_resource_word7);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* emits 12 */</div><div class='hunk'>@@ -225,6 +230,7 @@ static void</div><div class='ctx'> set_scissors(struct radeon_device *rdev, int x1, int y1,</div><div class='ctx'> 	     int x2, int y2)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	/* workaround some hw bugs */</div><div class='ctx'> 	if (x2 == 0)</div><div class='ctx'> 		x1 = 1;</div><div class='hunk'>@@ -235,43 +241,44 @@ set_scissors(struct radeon_device *rdev, int x1, int y1,</div><div class='ctx'> 			x2 = 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 2));</div><div class='del'>-	radeon_ring_write(rdev, (PA_SC_SCREEN_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_START) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, (x1 &lt;&lt; 0) | (y1 &lt;&lt; 16));</div><div class='del'>-	radeon_ring_write(rdev, (x2 &lt;&lt; 0) | (y2 &lt;&lt; 16));</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 2));</div><div class='add'>+	radeon_ring_write(ring, (PA_SC_SCREEN_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_START) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, (x1 &lt;&lt; 0) | (y1 &lt;&lt; 16));</div><div class='add'>+	radeon_ring_write(ring, (x2 &lt;&lt; 0) | (y2 &lt;&lt; 16));</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 2));</div><div class='del'>-	radeon_ring_write(rdev, (PA_SC_GENERIC_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_START) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, (x1 &lt;&lt; 0) | (y1 &lt;&lt; 16) | (1 &lt;&lt; 31));</div><div class='del'>-	radeon_ring_write(rdev, (x2 &lt;&lt; 0) | (y2 &lt;&lt; 16));</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 2));</div><div class='add'>+	radeon_ring_write(ring, (PA_SC_GENERIC_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_START) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, (x1 &lt;&lt; 0) | (y1 &lt;&lt; 16) | (1 &lt;&lt; 31));</div><div class='add'>+	radeon_ring_write(ring, (x2 &lt;&lt; 0) | (y2 &lt;&lt; 16));</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 2));</div><div class='del'>-	radeon_ring_write(rdev, (PA_SC_WINDOW_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_START) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, (x1 &lt;&lt; 0) | (y1 &lt;&lt; 16) | (1 &lt;&lt; 31));</div><div class='del'>-	radeon_ring_write(rdev, (x2 &lt;&lt; 0) | (y2 &lt;&lt; 16));</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 2));</div><div class='add'>+	radeon_ring_write(ring, (PA_SC_WINDOW_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_START) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, (x1 &lt;&lt; 0) | (y1 &lt;&lt; 16) | (1 &lt;&lt; 31));</div><div class='add'>+	radeon_ring_write(ring, (x2 &lt;&lt; 0) | (y2 &lt;&lt; 16));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* emits 10 */</div><div class='ctx'> static void</div><div class='ctx'> draw_auto(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONFIG_REG, 1));</div><div class='del'>-	radeon_ring_write(rdev, (VGT_PRIMITIVE_TYPE - PACKET3_SET_CONFIG_REG_START) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, DI_PT_RECTLIST);</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, (VGT_PRIMITIVE_TYPE - PACKET3_SET_CONFIG_REG_START) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, DI_PT_RECTLIST);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_INDEX_TYPE, 0));</div><div class='del'>-	radeon_ring_write(rdev,</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_INDEX_TYPE, 0));</div><div class='add'>+	radeon_ring_write(ring,</div><div class='ctx'> #ifdef __BIG_ENDIAN</div><div class='ctx'> 			  (2 &lt;&lt; 2) |</div><div class='ctx'> #endif</div><div class='ctx'> 			  DI_INDEX_SIZE_16_BIT);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_NUM_INSTANCES, 0));</div><div class='del'>-	radeon_ring_write(rdev, 1);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_NUM_INSTANCES, 0));</div><div class='add'>+	radeon_ring_write(ring, 1);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_DRAW_INDEX_AUTO, 1));</div><div class='del'>-	radeon_ring_write(rdev, 3);</div><div class='del'>-	radeon_ring_write(rdev, DI_SRC_SEL_AUTO_INDEX);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_DRAW_INDEX_AUTO, 1));</div><div class='add'>+	radeon_ring_write(ring, 3);</div><div class='add'>+	radeon_ring_write(ring, DI_SRC_SEL_AUTO_INDEX);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -279,6 +286,7 @@ draw_auto(struct radeon_device *rdev)</div><div class='ctx'> static void</div><div class='ctx'> set_default_state(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	u32 sq_config, sq_gpr_resource_mgmt_1, sq_gpr_resource_mgmt_2, sq_gpr_resource_mgmt_3;</div><div class='ctx'> 	u32 sq_thread_resource_mgmt, sq_thread_resource_mgmt_2;</div><div class='ctx'> 	u32 sq_stack_resource_mgmt_1, sq_stack_resource_mgmt_2, sq_stack_resource_mgmt_3;</div><div class='hunk'>@@ -292,8 +300,8 @@ set_default_state(struct radeon_device *rdev)</div><div class='ctx'> 	int dwords;</div><div class='ctx'> </div><div class='ctx'> 	/* set clear context state */</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_CLEAR_STATE, 0));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_CLEAR_STATE, 0));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (rdev-&gt;family &lt; CHIP_CAYMAN) {</div><div class='ctx'> 		switch (rdev-&gt;family) {</div><div class='hunk'>@@ -550,60 +558,60 @@ set_default_state(struct radeon_device *rdev)</div><div class='ctx'> 					    NUM_LS_STACK_ENTRIES(num_ls_stack_entries));</div><div class='ctx'> </div><div class='ctx'> 		/* disable dyn gprs */</div><div class='del'>-		radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONFIG_REG, 1));</div><div class='del'>-		radeon_ring_write(rdev, (SQ_DYN_GPR_CNTL_PS_FLUSH_REQ - PACKET3_SET_CONFIG_REG_START) &gt;&gt; 2);</div><div class='del'>-		radeon_ring_write(rdev, 0);</div><div class='add'>+		radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));</div><div class='add'>+		radeon_ring_write(ring, (SQ_DYN_GPR_CNTL_PS_FLUSH_REQ - PACKET3_SET_CONFIG_REG_START) &gt;&gt; 2);</div><div class='add'>+		radeon_ring_write(ring, 0);</div><div class='ctx'> </div><div class='ctx'> 		/* setup LDS */</div><div class='del'>-		radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONFIG_REG, 1));</div><div class='del'>-		radeon_ring_write(rdev, (SQ_LDS_RESOURCE_MGMT - PACKET3_SET_CONFIG_REG_START) &gt;&gt; 2);</div><div class='del'>-		radeon_ring_write(rdev, 0x10001000);</div><div class='add'>+		radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));</div><div class='add'>+		radeon_ring_write(ring, (SQ_LDS_RESOURCE_MGMT - PACKET3_SET_CONFIG_REG_START) &gt;&gt; 2);</div><div class='add'>+		radeon_ring_write(ring, 0x10001000);</div><div class='ctx'> </div><div class='ctx'> 		/* SQ config */</div><div class='del'>-		radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONFIG_REG, 11));</div><div class='del'>-		radeon_ring_write(rdev, (SQ_CONFIG - PACKET3_SET_CONFIG_REG_START) &gt;&gt; 2);</div><div class='del'>-		radeon_ring_write(rdev, sq_config);</div><div class='del'>-		radeon_ring_write(rdev, sq_gpr_resource_mgmt_1);</div><div class='del'>-		radeon_ring_write(rdev, sq_gpr_resource_mgmt_2);</div><div class='del'>-		radeon_ring_write(rdev, sq_gpr_resource_mgmt_3);</div><div class='del'>-		radeon_ring_write(rdev, 0);</div><div class='del'>-		radeon_ring_write(rdev, 0);</div><div class='del'>-		radeon_ring_write(rdev, sq_thread_resource_mgmt);</div><div class='del'>-		radeon_ring_write(rdev, sq_thread_resource_mgmt_2);</div><div class='del'>-		radeon_ring_write(rdev, sq_stack_resource_mgmt_1);</div><div class='del'>-		radeon_ring_write(rdev, sq_stack_resource_mgmt_2);</div><div class='del'>-		radeon_ring_write(rdev, sq_stack_resource_mgmt_3);</div><div class='add'>+		radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 11));</div><div class='add'>+		radeon_ring_write(ring, (SQ_CONFIG - PACKET3_SET_CONFIG_REG_START) &gt;&gt; 2);</div><div class='add'>+		radeon_ring_write(ring, sq_config);</div><div class='add'>+		radeon_ring_write(ring, sq_gpr_resource_mgmt_1);</div><div class='add'>+		radeon_ring_write(ring, sq_gpr_resource_mgmt_2);</div><div class='add'>+		radeon_ring_write(ring, sq_gpr_resource_mgmt_3);</div><div class='add'>+		radeon_ring_write(ring, 0);</div><div class='add'>+		radeon_ring_write(ring, 0);</div><div class='add'>+		radeon_ring_write(ring, sq_thread_resource_mgmt);</div><div class='add'>+		radeon_ring_write(ring, sq_thread_resource_mgmt_2);</div><div class='add'>+		radeon_ring_write(ring, sq_stack_resource_mgmt_1);</div><div class='add'>+		radeon_ring_write(ring, sq_stack_resource_mgmt_2);</div><div class='add'>+		radeon_ring_write(ring, sq_stack_resource_mgmt_3);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* CONTEXT_CONTROL */</div><div class='del'>-	radeon_ring_write(rdev, 0xc0012800);</div><div class='del'>-	radeon_ring_write(rdev, 0x80000000);</div><div class='del'>-	radeon_ring_write(rdev, 0x80000000);</div><div class='add'>+	radeon_ring_write(ring, 0xc0012800);</div><div class='add'>+	radeon_ring_write(ring, 0x80000000);</div><div class='add'>+	radeon_ring_write(ring, 0x80000000);</div><div class='ctx'> </div><div class='ctx'> 	/* SQ_VTX_BASE_VTX_LOC */</div><div class='del'>-	radeon_ring_write(rdev, 0xc0026f00);</div><div class='del'>-	radeon_ring_write(rdev, 0x00000000);</div><div class='del'>-	radeon_ring_write(rdev, 0x00000000);</div><div class='del'>-	radeon_ring_write(rdev, 0x00000000);</div><div class='add'>+	radeon_ring_write(ring, 0xc0026f00);</div><div class='add'>+	radeon_ring_write(ring, 0x00000000);</div><div class='add'>+	radeon_ring_write(ring, 0x00000000);</div><div class='add'>+	radeon_ring_write(ring, 0x00000000);</div><div class='ctx'> </div><div class='ctx'> 	/* SET_SAMPLER */</div><div class='del'>-	radeon_ring_write(rdev, 0xc0036e00);</div><div class='del'>-	radeon_ring_write(rdev, 0x00000000);</div><div class='del'>-	radeon_ring_write(rdev, 0x00000012);</div><div class='del'>-	radeon_ring_write(rdev, 0x00000000);</div><div class='del'>-	radeon_ring_write(rdev, 0x00000000);</div><div class='add'>+	radeon_ring_write(ring, 0xc0036e00);</div><div class='add'>+	radeon_ring_write(ring, 0x00000000);</div><div class='add'>+	radeon_ring_write(ring, 0x00000012);</div><div class='add'>+	radeon_ring_write(ring, 0x00000000);</div><div class='add'>+	radeon_ring_write(ring, 0x00000000);</div><div class='ctx'> </div><div class='ctx'> 	/* set to DX10/11 mode */</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_MODE_CONTROL, 0));</div><div class='del'>-	radeon_ring_write(rdev, 1);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_MODE_CONTROL, 0));</div><div class='add'>+	radeon_ring_write(ring, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* emit an IB pointing at default state */</div><div class='ctx'> 	dwords = ALIGN(rdev-&gt;r600_blit.state_len, 0x10);</div><div class='ctx'> 	gpu_addr = rdev-&gt;r600_blit.shader_gpu_addr + rdev-&gt;r600_blit.state_offset;</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_INDIRECT_BUFFER, 2));</div><div class='del'>-	radeon_ring_write(rdev, gpu_addr &amp; 0xFFFFFFFC);</div><div class='del'>-	radeon_ring_write(rdev, upper_32_bits(gpu_addr) &amp; 0xFF);</div><div class='del'>-	radeon_ring_write(rdev, dwords);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_INDIRECT_BUFFER, 2));</div><div class='add'>+	radeon_ring_write(ring, gpu_addr &amp; 0xFFFFFFFC);</div><div class='add'>+	radeon_ring_write(ring, upper_32_bits(gpu_addr) &amp; 0xFF);</div><div class='add'>+	radeon_ring_write(ring, dwords);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c<br/>index cd4590aae154..8e8cd85e5c00 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/evergreen_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/evergreen_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/evergreen_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/evergreen_cs.c</a></div><div class='hunk'>@@ -520,7 +520,7 @@ static int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DB_Z_INFO:</div><div class='ctx'> 		track-&gt;db_z_info = radeon_get_ib_value(p, idx);</div><div class='del'>-		if (!p-&gt;keep_tiling_flags) {</div><div class='add'>+		if (!(p-&gt;cs_flags &amp; RADEON_CS_KEEP_TILING_FLAGS)) {</div><div class='ctx'> 			r = evergreen_cs_packet_next_reloc(p, &amp;reloc);</div><div class='ctx'> 			if (r) {</div><div class='ctx'> 				dev_warn(p-&gt;dev, "bad SET_CONTEXT_REG "</div><div class='hunk'>@@ -649,7 +649,7 @@ static int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)</div><div class='ctx'> 	case CB_COLOR7_INFO:</div><div class='ctx'> 		tmp = (reg - CB_COLOR0_INFO) / 0x3c;</div><div class='ctx'> 		track-&gt;cb_color_info[tmp] = radeon_get_ib_value(p, idx);</div><div class='del'>-		if (!p-&gt;keep_tiling_flags) {</div><div class='add'>+		if (!(p-&gt;cs_flags &amp; RADEON_CS_KEEP_TILING_FLAGS)) {</div><div class='ctx'> 			r = evergreen_cs_packet_next_reloc(p, &amp;reloc);</div><div class='ctx'> 			if (r) {</div><div class='ctx'> 				dev_warn(p-&gt;dev, "bad SET_CONTEXT_REG "</div><div class='hunk'>@@ -666,7 +666,7 @@ static int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)</div><div class='ctx'> 	case CB_COLOR11_INFO:</div><div class='ctx'> 		tmp = ((reg - CB_COLOR8_INFO) / 0x1c) + 8;</div><div class='ctx'> 		track-&gt;cb_color_info[tmp] = radeon_get_ib_value(p, idx);</div><div class='del'>-		if (!p-&gt;keep_tiling_flags) {</div><div class='add'>+		if (!(p-&gt;cs_flags &amp; RADEON_CS_KEEP_TILING_FLAGS)) {</div><div class='ctx'> 			r = evergreen_cs_packet_next_reloc(p, &amp;reloc);</div><div class='ctx'> 			if (r) {</div><div class='ctx'> 				dev_warn(p-&gt;dev, "bad SET_CONTEXT_REG "</div><div class='hunk'>@@ -1355,7 +1355,7 @@ static int evergreen_packet3_check(struct radeon_cs_parser *p,</div><div class='ctx'> 					return -EINVAL;</div><div class='ctx'> 				}</div><div class='ctx'> 				ib[idx+1+(i*8)+2] += (u32)((reloc-&gt;lobj.gpu_offset &gt;&gt; 8) &amp; 0xffffffff);</div><div class='del'>-				if (!p-&gt;keep_tiling_flags) {</div><div class='add'>+				if (!(p-&gt;cs_flags &amp; RADEON_CS_KEEP_TILING_FLAGS)) {</div><div class='ctx'> 					ib[idx+1+(i*8)+1] |=</div><div class='ctx'> 						TEX_ARRAY_MODE(evergreen_cs_get_aray_mode(reloc-&gt;lobj.tiling_flags));</div><div class='ctx'> 					if (reloc-&gt;lobj.tiling_flags &amp; RADEON_TILING_MACRO) {</div><div class='hunk'>@@ -1572,3 +1572,242 @@ int evergreen_cs_parse(struct radeon_cs_parser *p)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* vm parser */</div><div class='add'>+static bool evergreen_vm_reg_valid(u32 reg)</div><div class='add'>+{</div><div class='add'>+	/* context regs are fine */</div><div class='add'>+	if (reg &gt;= 0x28000)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* check config regs */</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case GRBM_GFX_INDEX:</div><div class='add'>+	case VGT_VTX_VECT_EJECT_REG:</div><div class='add'>+	case VGT_CACHE_INVALIDATION:</div><div class='add'>+	case VGT_GS_VERTEX_REUSE:</div><div class='add'>+	case VGT_PRIMITIVE_TYPE:</div><div class='add'>+	case VGT_INDEX_TYPE:</div><div class='add'>+	case VGT_NUM_INDICES:</div><div class='add'>+	case VGT_NUM_INSTANCES:</div><div class='add'>+	case VGT_COMPUTE_DIM_X:</div><div class='add'>+	case VGT_COMPUTE_DIM_Y:</div><div class='add'>+	case VGT_COMPUTE_DIM_Z:</div><div class='add'>+	case VGT_COMPUTE_START_X:</div><div class='add'>+	case VGT_COMPUTE_START_Y:</div><div class='add'>+	case VGT_COMPUTE_START_Z:</div><div class='add'>+	case VGT_COMPUTE_INDEX:</div><div class='add'>+	case VGT_COMPUTE_THREAD_GROUP_SIZE:</div><div class='add'>+	case VGT_HS_OFFCHIP_PARAM:</div><div class='add'>+	case PA_CL_ENHANCE:</div><div class='add'>+	case PA_SU_LINE_STIPPLE_VALUE:</div><div class='add'>+	case PA_SC_LINE_STIPPLE_STATE:</div><div class='add'>+	case PA_SC_ENHANCE:</div><div class='add'>+	case SQ_DYN_GPR_CNTL_PS_FLUSH_REQ:</div><div class='add'>+	case SQ_DYN_GPR_SIMD_LOCK_EN:</div><div class='add'>+	case SQ_CONFIG:</div><div class='add'>+	case SQ_GPR_RESOURCE_MGMT_1:</div><div class='add'>+	case SQ_GLOBAL_GPR_RESOURCE_MGMT_1:</div><div class='add'>+	case SQ_GLOBAL_GPR_RESOURCE_MGMT_2:</div><div class='add'>+	case SQ_CONST_MEM_BASE:</div><div class='add'>+	case SQ_STATIC_THREAD_MGMT_1:</div><div class='add'>+	case SQ_STATIC_THREAD_MGMT_2:</div><div class='add'>+	case SQ_STATIC_THREAD_MGMT_3:</div><div class='add'>+	case SPI_CONFIG_CNTL:</div><div class='add'>+	case SPI_CONFIG_CNTL_1:</div><div class='add'>+	case TA_CNTL_AUX:</div><div class='add'>+	case DB_DEBUG:</div><div class='add'>+	case DB_DEBUG2:</div><div class='add'>+	case DB_DEBUG3:</div><div class='add'>+	case DB_DEBUG4:</div><div class='add'>+	case DB_WATERMARKS:</div><div class='add'>+	case TD_PS_BORDER_COLOR_INDEX:</div><div class='add'>+	case TD_PS_BORDER_COLOR_RED:</div><div class='add'>+	case TD_PS_BORDER_COLOR_GREEN:</div><div class='add'>+	case TD_PS_BORDER_COLOR_BLUE:</div><div class='add'>+	case TD_PS_BORDER_COLOR_ALPHA:</div><div class='add'>+	case TD_VS_BORDER_COLOR_INDEX:</div><div class='add'>+	case TD_VS_BORDER_COLOR_RED:</div><div class='add'>+	case TD_VS_BORDER_COLOR_GREEN:</div><div class='add'>+	case TD_VS_BORDER_COLOR_BLUE:</div><div class='add'>+	case TD_VS_BORDER_COLOR_ALPHA:</div><div class='add'>+	case TD_GS_BORDER_COLOR_INDEX:</div><div class='add'>+	case TD_GS_BORDER_COLOR_RED:</div><div class='add'>+	case TD_GS_BORDER_COLOR_GREEN:</div><div class='add'>+	case TD_GS_BORDER_COLOR_BLUE:</div><div class='add'>+	case TD_GS_BORDER_COLOR_ALPHA:</div><div class='add'>+	case TD_HS_BORDER_COLOR_INDEX:</div><div class='add'>+	case TD_HS_BORDER_COLOR_RED:</div><div class='add'>+	case TD_HS_BORDER_COLOR_GREEN:</div><div class='add'>+	case TD_HS_BORDER_COLOR_BLUE:</div><div class='add'>+	case TD_HS_BORDER_COLOR_ALPHA:</div><div class='add'>+	case TD_LS_BORDER_COLOR_INDEX:</div><div class='add'>+	case TD_LS_BORDER_COLOR_RED:</div><div class='add'>+	case TD_LS_BORDER_COLOR_GREEN:</div><div class='add'>+	case TD_LS_BORDER_COLOR_BLUE:</div><div class='add'>+	case TD_LS_BORDER_COLOR_ALPHA:</div><div class='add'>+	case TD_CS_BORDER_COLOR_INDEX:</div><div class='add'>+	case TD_CS_BORDER_COLOR_RED:</div><div class='add'>+	case TD_CS_BORDER_COLOR_GREEN:</div><div class='add'>+	case TD_CS_BORDER_COLOR_BLUE:</div><div class='add'>+	case TD_CS_BORDER_COLOR_ALPHA:</div><div class='add'>+	case SQ_ESGS_RING_SIZE:</div><div class='add'>+	case SQ_GSVS_RING_SIZE:</div><div class='add'>+	case SQ_ESTMP_RING_SIZE:</div><div class='add'>+	case SQ_GSTMP_RING_SIZE:</div><div class='add'>+	case SQ_HSTMP_RING_SIZE:</div><div class='add'>+	case SQ_LSTMP_RING_SIZE:</div><div class='add'>+	case SQ_PSTMP_RING_SIZE:</div><div class='add'>+	case SQ_VSTMP_RING_SIZE:</div><div class='add'>+	case SQ_ESGS_RING_ITEMSIZE:</div><div class='add'>+	case SQ_ESTMP_RING_ITEMSIZE:</div><div class='add'>+	case SQ_GSTMP_RING_ITEMSIZE:</div><div class='add'>+	case SQ_GSVS_RING_ITEMSIZE:</div><div class='add'>+	case SQ_GS_VERT_ITEMSIZE:</div><div class='add'>+	case SQ_GS_VERT_ITEMSIZE_1:</div><div class='add'>+	case SQ_GS_VERT_ITEMSIZE_2:</div><div class='add'>+	case SQ_GS_VERT_ITEMSIZE_3:</div><div class='add'>+	case SQ_GSVS_RING_OFFSET_1:</div><div class='add'>+	case SQ_GSVS_RING_OFFSET_2:</div><div class='add'>+	case SQ_GSVS_RING_OFFSET_3:</div><div class='add'>+	case SQ_HSTMP_RING_ITEMSIZE:</div><div class='add'>+	case SQ_LSTMP_RING_ITEMSIZE:</div><div class='add'>+	case SQ_PSTMP_RING_ITEMSIZE:</div><div class='add'>+	case SQ_VSTMP_RING_ITEMSIZE:</div><div class='add'>+	case VGT_TF_RING_SIZE:</div><div class='add'>+	case SQ_ESGS_RING_BASE:</div><div class='add'>+	case SQ_GSVS_RING_BASE:</div><div class='add'>+	case SQ_ESTMP_RING_BASE:</div><div class='add'>+	case SQ_GSTMP_RING_BASE:</div><div class='add'>+	case SQ_HSTMP_RING_BASE:</div><div class='add'>+	case SQ_LSTMP_RING_BASE:</div><div class='add'>+	case SQ_PSTMP_RING_BASE:</div><div class='add'>+	case SQ_VSTMP_RING_BASE:</div><div class='add'>+	case CAYMAN_VGT_OFFCHIP_LDS_BASE:</div><div class='add'>+	case CAYMAN_SQ_EX_ALLOC_TABLE_SLOTS:</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 int evergreen_vm_packet3_check(struct radeon_device *rdev,</div><div class='add'>+				      u32 *ib, struct radeon_cs_packet *pkt)</div><div class='add'>+{</div><div class='add'>+	u32 idx = pkt-&gt;idx + 1;</div><div class='add'>+	u32 idx_value = ib[idx];</div><div class='add'>+	u32 start_reg, end_reg, reg, i;</div><div class='add'>+</div><div class='add'>+	switch (pkt-&gt;opcode) {</div><div class='add'>+	case PACKET3_NOP:</div><div class='add'>+	case PACKET3_SET_BASE:</div><div class='add'>+	case PACKET3_CLEAR_STATE:</div><div class='add'>+	case PACKET3_INDEX_BUFFER_SIZE:</div><div class='add'>+	case PACKET3_DISPATCH_DIRECT:</div><div class='add'>+	case PACKET3_DISPATCH_INDIRECT:</div><div class='add'>+	case PACKET3_MODE_CONTROL:</div><div class='add'>+	case PACKET3_SET_PREDICATION:</div><div class='add'>+	case PACKET3_COND_EXEC:</div><div class='add'>+	case PACKET3_PRED_EXEC:</div><div class='add'>+	case PACKET3_DRAW_INDIRECT:</div><div class='add'>+	case PACKET3_DRAW_INDEX_INDIRECT:</div><div class='add'>+	case PACKET3_INDEX_BASE:</div><div class='add'>+	case PACKET3_DRAW_INDEX_2:</div><div class='add'>+	case PACKET3_CONTEXT_CONTROL:</div><div class='add'>+	case PACKET3_DRAW_INDEX_OFFSET:</div><div class='add'>+	case PACKET3_INDEX_TYPE:</div><div class='add'>+	case PACKET3_DRAW_INDEX:</div><div class='add'>+	case PACKET3_DRAW_INDEX_AUTO:</div><div class='add'>+	case PACKET3_DRAW_INDEX_IMMD:</div><div class='add'>+	case PACKET3_NUM_INSTANCES:</div><div class='add'>+	case PACKET3_DRAW_INDEX_MULTI_AUTO:</div><div class='add'>+	case PACKET3_STRMOUT_BUFFER_UPDATE:</div><div class='add'>+	case PACKET3_DRAW_INDEX_OFFSET_2:</div><div class='add'>+	case PACKET3_DRAW_INDEX_MULTI_ELEMENT:</div><div class='add'>+	case PACKET3_MPEG_INDEX:</div><div class='add'>+	case PACKET3_WAIT_REG_MEM:</div><div class='add'>+	case PACKET3_MEM_WRITE:</div><div class='add'>+	case PACKET3_SURFACE_SYNC:</div><div class='add'>+	case PACKET3_EVENT_WRITE:</div><div class='add'>+	case PACKET3_EVENT_WRITE_EOP:</div><div class='add'>+	case PACKET3_EVENT_WRITE_EOS:</div><div class='add'>+	case PACKET3_SET_CONTEXT_REG:</div><div class='add'>+	case PACKET3_SET_BOOL_CONST:</div><div class='add'>+	case PACKET3_SET_LOOP_CONST:</div><div class='add'>+	case PACKET3_SET_RESOURCE:</div><div class='add'>+	case PACKET3_SET_SAMPLER:</div><div class='add'>+	case PACKET3_SET_CTL_CONST:</div><div class='add'>+	case PACKET3_SET_RESOURCE_OFFSET:</div><div class='add'>+	case PACKET3_SET_CONTEXT_REG_INDIRECT:</div><div class='add'>+	case PACKET3_SET_RESOURCE_INDIRECT:</div><div class='add'>+	case CAYMAN_PACKET3_DEALLOC_STATE:</div><div class='add'>+		break;</div><div class='add'>+	case PACKET3_COND_WRITE:</div><div class='add'>+		if (idx_value &amp; 0x100) {</div><div class='add'>+			reg = ib[idx + 5] * 4;</div><div class='add'>+			if (!evergreen_vm_reg_valid(reg))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case PACKET3_COPY_DW:</div><div class='add'>+		if (idx_value &amp; 0x2) {</div><div class='add'>+			reg = ib[idx + 3] * 4;</div><div class='add'>+			if (!evergreen_vm_reg_valid(reg))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case PACKET3_SET_CONFIG_REG:</div><div class='add'>+		start_reg = (idx_value &lt;&lt; 2) + PACKET3_SET_CONFIG_REG_START;</div><div class='add'>+		end_reg = 4 * pkt-&gt;count + start_reg - 4;</div><div class='add'>+		if ((start_reg &lt; PACKET3_SET_CONFIG_REG_START) ||</div><div class='add'>+		    (start_reg &gt;= PACKET3_SET_CONFIG_REG_END) ||</div><div class='add'>+		    (end_reg &gt;= PACKET3_SET_CONFIG_REG_END)) {</div><div class='add'>+			DRM_ERROR("bad PACKET3_SET_CONFIG_REG\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; pkt-&gt;count; i++) {</div><div class='add'>+			reg = start_reg + (4 * i);</div><div class='add'>+			if (!evergreen_vm_reg_valid(reg))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		}</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'>+int evergreen_ib_parse(struct radeon_device *rdev, struct radeon_ib *ib)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 idx = 0;</div><div class='add'>+	struct radeon_cs_packet pkt;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		pkt.idx = idx;</div><div class='add'>+		pkt.type = CP_PACKET_GET_TYPE(ib-&gt;ptr[idx]);</div><div class='add'>+		pkt.count = CP_PACKET_GET_COUNT(ib-&gt;ptr[idx]);</div><div class='add'>+		pkt.one_reg_wr = 0;</div><div class='add'>+		switch (pkt.type) {</div><div class='add'>+		case PACKET_TYPE0:</div><div class='add'>+			dev_err(rdev-&gt;dev, "Packet0 not allowed!\n");</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		case PACKET_TYPE2:</div><div class='add'>+			idx += 1;</div><div class='add'>+			break;</div><div class='add'>+		case PACKET_TYPE3:</div><div class='add'>+			pkt.opcode = CP_PACKET3_GET_OPCODE(ib-&gt;ptr[idx]);</div><div class='add'>+			ret = evergreen_vm_packet3_check(rdev, ib-&gt;ptr, &amp;pkt);</div><div class='add'>+			idx += pkt.count + 2;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			dev_err(rdev-&gt;dev, "Unknown packet type %d !\n", pkt.type);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	} while (idx &lt; ib-&gt;length_dw);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/evergreen_reg.h b/drivers/gpu/drm/radeon/evergreen_reg.h<br/>index 7d7f2155e34c..4215de95477e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/evergreen_reg.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/evergreen_reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/evergreen_reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/evergreen_reg.h</a></div><div class='hunk'>@@ -35,6 +35,14 @@</div><div class='ctx'> #define EVERGREEN_P1PLL_SS_CNTL                         0x414</div><div class='ctx'> #define EVERGREEN_P2PLL_SS_CNTL                         0x454</div><div class='ctx'> #       define EVERGREEN_PxPLL_SS_EN                    (1 &lt;&lt; 12)</div><div class='add'>+</div><div class='add'>+#define EVERGREEN_AUDIO_PLL1_MUL			0x5b0</div><div class='add'>+#define EVERGREEN_AUDIO_PLL1_DIV			0x5b4</div><div class='add'>+#define EVERGREEN_AUDIO_PLL1_UNK			0x5bc</div><div class='add'>+</div><div class='add'>+#define EVERGREEN_AUDIO_ENABLE				0x5e78</div><div class='add'>+#define EVERGREEN_AUDIO_VENDOR_ID			0x5ec0</div><div class='add'>+</div><div class='ctx'> /* GRPH blocks at 0x6800, 0x7400, 0x10000, 0x10c00, 0x11800, 0x12400 */</div><div class='ctx'> #define EVERGREEN_GRPH_ENABLE                           0x6800</div><div class='ctx'> #define EVERGREEN_GRPH_CONTROL                          0x6804</div><div class='hunk'>@@ -220,4 +228,9 @@</div><div class='ctx'> #define EVERGREEN_DC_GPIO_HPD_EN                        0x64b8</div><div class='ctx'> #define EVERGREEN_DC_GPIO_HPD_Y                         0x64bc</div><div class='ctx'> </div><div class='add'>+/* HDMI blocks at 0x7030, 0x7c30, 0x10830, 0x11430, 0x12030, 0x12c30 */</div><div class='add'>+#define EVERGREEN_HDMI_BASE				0x7030</div><div class='add'>+</div><div class='add'>+#define EVERGREEN_HDMI_CONFIG_OFFSET			0xf0</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/evergreend.h b/drivers/gpu/drm/radeon/evergreend.h<br/>index e00039e59a75..b502216d42af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/evergreend.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/evergreend.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/evergreend.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/evergreend.h</a></div><div class='hunk'>@@ -242,6 +242,7 @@</div><div class='ctx'> #define	PA_CL_ENHANCE					0x8A14</div><div class='ctx'> #define		CLIP_VTX_REORDER_ENA				(1 &lt;&lt; 0)</div><div class='ctx'> #define		NUM_CLIP_SEQ(x)					((x) &lt;&lt; 1)</div><div class='add'>+#define	PA_SC_ENHANCE					0x8BF0</div><div class='ctx'> #define PA_SC_AA_CONFIG					0x28C04</div><div class='ctx'> #define         MSAA_NUM_SAMPLES_SHIFT                  0</div><div class='ctx'> #define         MSAA_NUM_SAMPLES_MASK                   0x3</div><div class='hunk'>@@ -319,6 +320,8 @@</div><div class='ctx'> #define	SQ_GPR_RESOURCE_MGMT_3				0x8C0C</div><div class='ctx'> #define		NUM_HS_GPRS(x)					((x) &lt;&lt; 0)</div><div class='ctx'> #define		NUM_LS_GPRS(x)					((x) &lt;&lt; 16)</div><div class='add'>+#define	SQ_GLOBAL_GPR_RESOURCE_MGMT_1			0x8C10</div><div class='add'>+#define	SQ_GLOBAL_GPR_RESOURCE_MGMT_2			0x8C14</div><div class='ctx'> #define	SQ_THREAD_RESOURCE_MGMT				0x8C18</div><div class='ctx'> #define		NUM_PS_THREADS(x)				((x) &lt;&lt; 0)</div><div class='ctx'> #define		NUM_VS_THREADS(x)				((x) &lt;&lt; 8)</div><div class='hunk'>@@ -337,6 +340,10 @@</div><div class='ctx'> #define		NUM_HS_STACK_ENTRIES(x)				((x) &lt;&lt; 0)</div><div class='ctx'> #define		NUM_LS_STACK_ENTRIES(x)				((x) &lt;&lt; 16)</div><div class='ctx'> #define	SQ_DYN_GPR_CNTL_PS_FLUSH_REQ    		0x8D8C</div><div class='add'>+#define	SQ_DYN_GPR_SIMD_LOCK_EN    			0x8D94</div><div class='add'>+#define	SQ_STATIC_THREAD_MGMT_1    			0x8E20</div><div class='add'>+#define	SQ_STATIC_THREAD_MGMT_2    			0x8E24</div><div class='add'>+#define	SQ_STATIC_THREAD_MGMT_3    			0x8E28</div><div class='ctx'> #define	SQ_LDS_RESOURCE_MGMT    			0x8E2C</div><div class='ctx'> </div><div class='ctx'> #define	SQ_MS_FIFO_SIZES				0x8CF0</div><div class='hunk'>@@ -691,6 +698,7 @@</div><div class='ctx'> #define	PACKET3_DRAW_INDEX_MULTI_ELEMENT		0x36</div><div class='ctx'> #define	PACKET3_MEM_SEMAPHORE				0x39</div><div class='ctx'> #define	PACKET3_MPEG_INDEX				0x3A</div><div class='add'>+#define	PACKET3_COPY_DW					0x3B</div><div class='ctx'> #define	PACKET3_WAIT_REG_MEM				0x3C</div><div class='ctx'> #define	PACKET3_MEM_WRITE				0x3D</div><div class='ctx'> #define	PACKET3_INDIRECT_BUFFER				0x32</div><div class='hunk'>@@ -768,6 +776,8 @@</div><div class='ctx'> #define			SQ_TEX_VTX_VALID_TEXTURE			0x2</div><div class='ctx'> #define			SQ_TEX_VTX_VALID_BUFFER				0x3</div><div class='ctx'> </div><div class='add'>+#define VGT_VTX_VECT_EJECT_REG				0x88b0</div><div class='add'>+</div><div class='ctx'> #define SQ_CONST_MEM_BASE				0x8df8</div><div class='ctx'> </div><div class='ctx'> #define SQ_ESGS_RING_BASE				0x8c40</div><div class='hunk'>@@ -892,8 +902,27 @@</div><div class='ctx'> #define PA_SC_SCREEN_SCISSOR_TL                         0x28030</div><div class='ctx'> #define PA_SC_GENERIC_SCISSOR_TL                        0x28240</div><div class='ctx'> #define PA_SC_WINDOW_SCISSOR_TL                         0x28204</div><div class='del'>-#define VGT_PRIMITIVE_TYPE                              0x8958</div><div class='ctx'> </div><div class='add'>+#define VGT_PRIMITIVE_TYPE                              0x8958</div><div class='add'>+#define VGT_INDEX_TYPE                                  0x895C</div><div class='add'>+</div><div class='add'>+#define VGT_NUM_INDICES                                 0x8970</div><div class='add'>+</div><div class='add'>+#define VGT_COMPUTE_DIM_X                               0x8990</div><div class='add'>+#define VGT_COMPUTE_DIM_Y                               0x8994</div><div class='add'>+#define VGT_COMPUTE_DIM_Z                               0x8998</div><div class='add'>+#define VGT_COMPUTE_START_X                             0x899C</div><div class='add'>+#define VGT_COMPUTE_START_Y                             0x89A0</div><div class='add'>+#define VGT_COMPUTE_START_Z                             0x89A4</div><div class='add'>+#define VGT_COMPUTE_INDEX                               0x89A8</div><div class='add'>+#define VGT_COMPUTE_THREAD_GROUP_SIZE                   0x89AC</div><div class='add'>+#define VGT_HS_OFFCHIP_PARAM                            0x89B0</div><div class='add'>+</div><div class='add'>+#define DB_DEBUG					0x9830</div><div class='add'>+#define DB_DEBUG2					0x9834</div><div class='add'>+#define DB_DEBUG3					0x9838</div><div class='add'>+#define DB_DEBUG4					0x983C</div><div class='add'>+#define DB_WATERMARKS					0x9854</div><div class='ctx'> #define DB_DEPTH_CONTROL				0x28800</div><div class='ctx'> #define DB_DEPTH_VIEW					0x28008</div><div class='ctx'> #define DB_HTILE_DATA_BASE				0x28014</div><div class='hunk'>@@ -1189,8 +1218,40 @@</div><div class='ctx'> #define SQ_VTX_CONSTANT_WORD6_0                         0x30018</div><div class='ctx'> #define SQ_VTX_CONSTANT_WORD7_0                         0x3001c</div><div class='ctx'> </div><div class='add'>+#define TD_PS_BORDER_COLOR_INDEX                        0xA400</div><div class='add'>+#define TD_PS_BORDER_COLOR_RED                          0xA404</div><div class='add'>+#define TD_PS_BORDER_COLOR_GREEN                        0xA408</div><div class='add'>+#define TD_PS_BORDER_COLOR_BLUE                         0xA40C</div><div class='add'>+#define TD_PS_BORDER_COLOR_ALPHA                        0xA410</div><div class='add'>+#define TD_VS_BORDER_COLOR_INDEX                        0xA414</div><div class='add'>+#define TD_VS_BORDER_COLOR_RED                          0xA418</div><div class='add'>+#define TD_VS_BORDER_COLOR_GREEN                        0xA41C</div><div class='add'>+#define TD_VS_BORDER_COLOR_BLUE                         0xA420</div><div class='add'>+#define TD_VS_BORDER_COLOR_ALPHA                        0xA424</div><div class='add'>+#define TD_GS_BORDER_COLOR_INDEX                        0xA428</div><div class='add'>+#define TD_GS_BORDER_COLOR_RED                          0xA42C</div><div class='add'>+#define TD_GS_BORDER_COLOR_GREEN                        0xA430</div><div class='add'>+#define TD_GS_BORDER_COLOR_BLUE                         0xA434</div><div class='add'>+#define TD_GS_BORDER_COLOR_ALPHA                        0xA438</div><div class='add'>+#define TD_HS_BORDER_COLOR_INDEX                        0xA43C</div><div class='add'>+#define TD_HS_BORDER_COLOR_RED                          0xA440</div><div class='add'>+#define TD_HS_BORDER_COLOR_GREEN                        0xA444</div><div class='add'>+#define TD_HS_BORDER_COLOR_BLUE                         0xA448</div><div class='add'>+#define TD_HS_BORDER_COLOR_ALPHA                        0xA44C</div><div class='add'>+#define TD_LS_BORDER_COLOR_INDEX                        0xA450</div><div class='add'>+#define TD_LS_BORDER_COLOR_RED                          0xA454</div><div class='add'>+#define TD_LS_BORDER_COLOR_GREEN                        0xA458</div><div class='add'>+#define TD_LS_BORDER_COLOR_BLUE                         0xA45C</div><div class='add'>+#define TD_LS_BORDER_COLOR_ALPHA                        0xA460</div><div class='add'>+#define TD_CS_BORDER_COLOR_INDEX                        0xA464</div><div class='add'>+#define TD_CS_BORDER_COLOR_RED                          0xA468</div><div class='add'>+#define TD_CS_BORDER_COLOR_GREEN                        0xA46C</div><div class='add'>+#define TD_CS_BORDER_COLOR_BLUE                         0xA470</div><div class='add'>+#define TD_CS_BORDER_COLOR_ALPHA                        0xA474</div><div class='add'>+</div><div class='ctx'> /* cayman 3D regs */</div><div class='del'>-#define CAYMAN_VGT_OFFCHIP_LDS_BASE			0x89B0</div><div class='add'>+#define CAYMAN_VGT_OFFCHIP_LDS_BASE			0x89B4</div><div class='add'>+#define CAYMAN_SQ_EX_ALLOC_TABLE_SLOTS			0x8E48</div><div class='ctx'> #define CAYMAN_DB_EQAA					0x28804</div><div class='ctx'> #define CAYMAN_DB_DEPTH_INFO				0x2803C</div><div class='ctx'> #define CAYMAN_PA_SC_AA_CONFIG				0x28BE0</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c<br/>index 0e5799857465..321137295400 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/ni.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/ni.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/ni.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/ni.c</a></div><div class='hunk'>@@ -934,7 +934,7 @@ void cayman_pcie_gart_tlb_flush(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> int cayman_pcie_gart_enable(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='del'>-	int r;</div><div class='add'>+	int i, r;</div><div class='ctx'> </div><div class='ctx'> 	if (rdev-&gt;gart.robj == NULL) {</div><div class='ctx'> 		dev_err(rdev-&gt;dev, "No VRAM object for PCIE GART.\n");</div><div class='hunk'>@@ -945,9 +945,12 @@ int cayman_pcie_gart_enable(struct radeon_device *rdev)</div><div class='ctx'> 		return r;</div><div class='ctx'> 	radeon_gart_restore(rdev);</div><div class='ctx'> 	/* Setup TLB control */</div><div class='del'>-	WREG32(MC_VM_MX_L1_TLB_CNTL, ENABLE_L1_TLB |</div><div class='add'>+	WREG32(MC_VM_MX_L1_TLB_CNTL,</div><div class='add'>+	       (0xA &lt;&lt; 7) |</div><div class='add'>+	       ENABLE_L1_TLB |</div><div class='ctx'> 	       ENABLE_L1_FRAGMENT_PROCESSING |</div><div class='ctx'> 	       SYSTEM_ACCESS_MODE_NOT_IN_SYS |</div><div class='add'>+	       ENABLE_ADVANCED_DRIVER_MODEL |</div><div class='ctx'> 	       SYSTEM_APERTURE_UNMAPPED_ACCESS_PASS_THRU);</div><div class='ctx'> 	/* Setup L2 cache */</div><div class='ctx'> 	WREG32(VM_L2_CNTL, ENABLE_L2_CACHE |</div><div class='hunk'>@@ -967,9 +970,26 @@ int cayman_pcie_gart_enable(struct radeon_device *rdev)</div><div class='ctx'> 	WREG32(VM_CONTEXT0_CNTL2, 0);</div><div class='ctx'> 	WREG32(VM_CONTEXT0_CNTL, ENABLE_CONTEXT | PAGE_TABLE_DEPTH(0) |</div><div class='ctx'> 				RANGE_PROTECTION_FAULT_ENABLE_DEFAULT);</div><div class='del'>-	/* disable context1-7 */</div><div class='add'>+</div><div class='add'>+	WREG32(0x15D4, 0);</div><div class='add'>+	WREG32(0x15D8, 0);</div><div class='add'>+	WREG32(0x15DC, 0);</div><div class='add'>+</div><div class='add'>+	/* empty context1-7 */</div><div class='add'>+	for (i = 1; i &lt; 8; i++) {</div><div class='add'>+		WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR + (i &lt;&lt; 2), 0);</div><div class='add'>+		WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR + (i &lt;&lt; 2), 0);</div><div class='add'>+		WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i &lt;&lt; 2),</div><div class='add'>+			rdev-&gt;gart.table_addr &gt;&gt; 12);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enable context1-7 */</div><div class='add'>+	WREG32(VM_CONTEXT1_PROTECTION_FAULT_DEFAULT_ADDR,</div><div class='add'>+	       (u32)(rdev-&gt;dummy_page.addr &gt;&gt; 12));</div><div class='ctx'> 	WREG32(VM_CONTEXT1_CNTL2, 0);</div><div class='ctx'> 	WREG32(VM_CONTEXT1_CNTL, 0);</div><div class='add'>+	WREG32(VM_CONTEXT1_CNTL, ENABLE_CONTEXT | PAGE_TABLE_DEPTH(0) |</div><div class='add'>+				RANGE_PROTECTION_FAULT_ENABLE_DEFAULT);</div><div class='ctx'> </div><div class='ctx'> 	cayman_pcie_gart_tlb_flush(rdev);</div><div class='ctx'> 	DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n",</div><div class='hunk'>@@ -1006,9 +1026,69 @@ void cayman_pcie_gart_fini(struct radeon_device *rdev)</div><div class='ctx'> 	radeon_gart_fini(rdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void cayman_cp_int_cntl_setup(struct radeon_device *rdev,</div><div class='add'>+			      int ring, u32 cp_int_cntl)</div><div class='add'>+{</div><div class='add'>+	u32 srbm_gfx_cntl = RREG32(SRBM_GFX_CNTL) &amp; ~3;</div><div class='add'>+</div><div class='add'>+	WREG32(SRBM_GFX_CNTL, srbm_gfx_cntl | (ring &amp; 3));</div><div class='add'>+	WREG32(CP_INT_CNTL, cp_int_cntl);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * CP.</div><div class='ctx'>  */</div><div class='add'>+void cayman_fence_ring_emit(struct radeon_device *rdev,</div><div class='add'>+			    struct radeon_fence *fence)</div><div class='add'>+{</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[fence-&gt;ring];</div><div class='add'>+	u64 addr = rdev-&gt;fence_drv[fence-&gt;ring].gpu_addr;</div><div class='add'>+</div><div class='add'>+	/* flush read cache over gart for this vmid */</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, (CP_COHER_CNTL2 - PACKET3_SET_CONFIG_REG_START) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SURFACE_SYNC, 3));</div><div class='add'>+	radeon_ring_write(ring, PACKET3_TC_ACTION_ENA | PACKET3_SH_ACTION_ENA);</div><div class='add'>+	radeon_ring_write(ring, 0xFFFFFFFF);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, 10); /* poll interval */</div><div class='add'>+	/* EVENT_WRITE_EOP - flush caches, send int */</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_EVENT_WRITE_EOP, 4));</div><div class='add'>+	radeon_ring_write(ring, EVENT_TYPE(CACHE_FLUSH_AND_INV_EVENT_TS) | EVENT_INDEX(5));</div><div class='add'>+	radeon_ring_write(ring, addr &amp; 0xffffffff);</div><div class='add'>+	radeon_ring_write(ring, (upper_32_bits(addr) &amp; 0xff) | DATA_SEL(1) | INT_SEL(2));</div><div class='add'>+	radeon_ring_write(ring, fence-&gt;seq);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cayman_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib)</div><div class='add'>+{</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[ib-&gt;fence-&gt;ring];</div><div class='add'>+</div><div class='add'>+	/* set to DX10/11 mode */</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_MODE_CONTROL, 0));</div><div class='add'>+	radeon_ring_write(ring, 1);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_INDIRECT_BUFFER, 2));</div><div class='add'>+	radeon_ring_write(ring,</div><div class='add'>+#ifdef __BIG_ENDIAN</div><div class='add'>+			  (2 &lt;&lt; 0) |</div><div class='add'>+#endif</div><div class='add'>+			  (ib-&gt;gpu_addr &amp; 0xFFFFFFFC));</div><div class='add'>+	radeon_ring_write(ring, upper_32_bits(ib-&gt;gpu_addr) &amp; 0xFF);</div><div class='add'>+	radeon_ring_write(ring, ib-&gt;length_dw | (ib-&gt;vm_id &lt;&lt; 24));</div><div class='add'>+</div><div class='add'>+	/* flush read cache over gart for this vmid */</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, (CP_COHER_CNTL2 - PACKET3_SET_CONFIG_REG_START) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, ib-&gt;vm_id);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SURFACE_SYNC, 3));</div><div class='add'>+	radeon_ring_write(ring, PACKET3_TC_ACTION_ENA | PACKET3_SH_ACTION_ENA);</div><div class='add'>+	radeon_ring_write(ring, 0xFFFFFFFF);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, 10); /* poll interval */</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void cayman_cp_enable(struct radeon_device *rdev, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	if (enable)</div><div class='hunk'>@@ -1049,63 +1129,64 @@ static int cayman_cp_load_microcode(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> static int cayman_cp_start(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	int r, i;</div><div class='ctx'> </div><div class='del'>-	r = radeon_ring_lock(rdev, 7);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, 7);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		DRM_ERROR("radeon: cp failed to lock ring (%d).\n", r);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_ME_INITIALIZE, 5));</div><div class='del'>-	radeon_ring_write(rdev, 0x1);</div><div class='del'>-	radeon_ring_write(rdev, 0x0);</div><div class='del'>-	radeon_ring_write(rdev, rdev-&gt;config.cayman.max_hw_contexts - 1);</div><div class='del'>-	radeon_ring_write(rdev, PACKET3_ME_INITIALIZE_DEVICE_ID(1));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_unlock_commit(rdev);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_ME_INITIALIZE, 5));</div><div class='add'>+	radeon_ring_write(ring, 0x1);</div><div class='add'>+	radeon_ring_write(ring, 0x0);</div><div class='add'>+	radeon_ring_write(ring, rdev-&gt;config.cayman.max_hw_contexts - 1);</div><div class='add'>+	radeon_ring_write(ring, PACKET3_ME_INITIALIZE_DEVICE_ID(1));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> </div><div class='ctx'> 	cayman_cp_enable(rdev, true);</div><div class='ctx'> </div><div class='del'>-	r = radeon_ring_lock(rdev, cayman_default_size + 19);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, cayman_default_size + 19);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		DRM_ERROR("radeon: cp failed to lock ring (%d).\n", r);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* setup clear context state */</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_PREAMBLE_CNTL, 0));</div><div class='del'>-	radeon_ring_write(rdev, PACKET3_PREAMBLE_BEGIN_CLEAR_STATE);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_PREAMBLE_CNTL, 0));</div><div class='add'>+	radeon_ring_write(ring, PACKET3_PREAMBLE_BEGIN_CLEAR_STATE);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; cayman_default_size; i++)</div><div class='del'>-		radeon_ring_write(rdev, cayman_default_state[i]);</div><div class='add'>+		radeon_ring_write(ring, cayman_default_state[i]);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_PREAMBLE_CNTL, 0));</div><div class='del'>-	radeon_ring_write(rdev, PACKET3_PREAMBLE_END_CLEAR_STATE);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_PREAMBLE_CNTL, 0));</div><div class='add'>+	radeon_ring_write(ring, PACKET3_PREAMBLE_END_CLEAR_STATE);</div><div class='ctx'> </div><div class='ctx'> 	/* set clear context state */</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_CLEAR_STATE, 0));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_CLEAR_STATE, 0));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* SQ_VTX_BASE_VTX_LOC */</div><div class='del'>-	radeon_ring_write(rdev, 0xc0026f00);</div><div class='del'>-	radeon_ring_write(rdev, 0x00000000);</div><div class='del'>-	radeon_ring_write(rdev, 0x00000000);</div><div class='del'>-	radeon_ring_write(rdev, 0x00000000);</div><div class='add'>+	radeon_ring_write(ring, 0xc0026f00);</div><div class='add'>+	radeon_ring_write(ring, 0x00000000);</div><div class='add'>+	radeon_ring_write(ring, 0x00000000);</div><div class='add'>+	radeon_ring_write(ring, 0x00000000);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear consts */</div><div class='del'>-	radeon_ring_write(rdev, 0xc0036f00);</div><div class='del'>-	radeon_ring_write(rdev, 0x00000bc4);</div><div class='del'>-	radeon_ring_write(rdev, 0xffffffff);</div><div class='del'>-	radeon_ring_write(rdev, 0xffffffff);</div><div class='del'>-	radeon_ring_write(rdev, 0xffffffff);</div><div class='add'>+	radeon_ring_write(ring, 0xc0036f00);</div><div class='add'>+	radeon_ring_write(ring, 0x00000bc4);</div><div class='add'>+	radeon_ring_write(ring, 0xffffffff);</div><div class='add'>+	radeon_ring_write(ring, 0xffffffff);</div><div class='add'>+	radeon_ring_write(ring, 0xffffffff);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, 0xc0026900);</div><div class='del'>-	radeon_ring_write(rdev, 0x00000316);</div><div class='del'>-	radeon_ring_write(rdev, 0x0000000e); /* VGT_VERTEX_REUSE_BLOCK_CNTL */</div><div class='del'>-	radeon_ring_write(rdev, 0x00000010); /*  */</div><div class='add'>+	radeon_ring_write(ring, 0xc0026900);</div><div class='add'>+	radeon_ring_write(ring, 0x00000316);</div><div class='add'>+	radeon_ring_write(ring, 0x0000000e); /* VGT_VERTEX_REUSE_BLOCK_CNTL */</div><div class='add'>+	radeon_ring_write(ring, 0x00000010); /*  */</div><div class='ctx'> </div><div class='del'>-	radeon_ring_unlock_commit(rdev);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> </div><div class='ctx'> 	/* XXX init other rings */</div><div class='ctx'> </div><div class='hunk'>@@ -1115,11 +1196,12 @@ static int cayman_cp_start(struct radeon_device *rdev)</div><div class='ctx'> static void cayman_cp_fini(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	cayman_cp_enable(rdev, false);</div><div class='del'>-	radeon_ring_fini(rdev);</div><div class='add'>+	radeon_ring_fini(rdev, &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cayman_cp_resume(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring;</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> 	u32 rb_bufsz;</div><div class='ctx'> 	int r;</div><div class='hunk'>@@ -1136,7 +1218,7 @@ int cayman_cp_resume(struct radeon_device *rdev)</div><div class='ctx'> 	WREG32(GRBM_SOFT_RESET, 0);</div><div class='ctx'> 	RREG32(GRBM_SOFT_RESET);</div><div class='ctx'> </div><div class='del'>-	WREG32(CP_SEM_WAIT_TIMER, 0x4);</div><div class='add'>+	WREG32(CP_SEM_WAIT_TIMER, 0x0);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the write pointer delay */</div><div class='ctx'> 	WREG32(CP_RB_WPTR_DELAY, 0);</div><div class='hunk'>@@ -1145,7 +1227,8 @@ int cayman_cp_resume(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> 	/* ring 0 - compute and gfx */</div><div class='ctx'> 	/* Set ring buffer size */</div><div class='del'>-	rb_bufsz = drm_order(rdev-&gt;cp.ring_size / 8);</div><div class='add'>+	ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='add'>+	rb_bufsz = drm_order(ring-&gt;ring_size / 8);</div><div class='ctx'> 	tmp = (drm_order(RADEON_GPU_PAGE_SIZE/8) &lt;&lt; 8) | rb_bufsz;</div><div class='ctx'> #ifdef __BIG_ENDIAN</div><div class='ctx'> 	tmp |= BUF_SWAP_32BIT;</div><div class='hunk'>@@ -1154,8 +1237,8 @@ int cayman_cp_resume(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the ring buffer's read and write pointers */</div><div class='ctx'> 	WREG32(CP_RB0_CNTL, tmp | RB_RPTR_WR_ENA);</div><div class='del'>-	rdev-&gt;cp.wptr = 0;</div><div class='del'>-	WREG32(CP_RB0_WPTR, rdev-&gt;cp.wptr);</div><div class='add'>+	ring-&gt;wptr = 0;</div><div class='add'>+	WREG32(CP_RB0_WPTR, ring-&gt;wptr);</div><div class='ctx'> </div><div class='ctx'> 	/* set the wb address wether it's enabled or not */</div><div class='ctx'> 	WREG32(CP_RB0_RPTR_ADDR, (rdev-&gt;wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) &amp; 0xFFFFFFFC);</div><div class='hunk'>@@ -1172,13 +1255,14 @@ int cayman_cp_resume(struct radeon_device *rdev)</div><div class='ctx'> 	mdelay(1);</div><div class='ctx'> 	WREG32(CP_RB0_CNTL, tmp);</div><div class='ctx'> </div><div class='del'>-	WREG32(CP_RB0_BASE, rdev-&gt;cp.gpu_addr &gt;&gt; 8);</div><div class='add'>+	WREG32(CP_RB0_BASE, ring-&gt;gpu_addr &gt;&gt; 8);</div><div class='ctx'> </div><div class='del'>-	rdev-&gt;cp.rptr = RREG32(CP_RB0_RPTR);</div><div class='add'>+	ring-&gt;rptr = RREG32(CP_RB0_RPTR);</div><div class='ctx'> </div><div class='ctx'> 	/* ring1  - compute only */</div><div class='ctx'> 	/* Set ring buffer size */</div><div class='del'>-	rb_bufsz = drm_order(rdev-&gt;cp1.ring_size / 8);</div><div class='add'>+	ring = &amp;rdev-&gt;ring[CAYMAN_RING_TYPE_CP1_INDEX];</div><div class='add'>+	rb_bufsz = drm_order(ring-&gt;ring_size / 8);</div><div class='ctx'> 	tmp = (drm_order(RADEON_GPU_PAGE_SIZE/8) &lt;&lt; 8) | rb_bufsz;</div><div class='ctx'> #ifdef __BIG_ENDIAN</div><div class='ctx'> 	tmp |= BUF_SWAP_32BIT;</div><div class='hunk'>@@ -1187,8 +1271,8 @@ int cayman_cp_resume(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the ring buffer's read and write pointers */</div><div class='ctx'> 	WREG32(CP_RB1_CNTL, tmp | RB_RPTR_WR_ENA);</div><div class='del'>-	rdev-&gt;cp1.wptr = 0;</div><div class='del'>-	WREG32(CP_RB1_WPTR, rdev-&gt;cp1.wptr);</div><div class='add'>+	ring-&gt;wptr = 0;</div><div class='add'>+	WREG32(CP_RB1_WPTR, ring-&gt;wptr);</div><div class='ctx'> </div><div class='ctx'> 	/* set the wb address wether it's enabled or not */</div><div class='ctx'> 	WREG32(CP_RB1_RPTR_ADDR, (rdev-&gt;wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) &amp; 0xFFFFFFFC);</div><div class='hunk'>@@ -1197,13 +1281,14 @@ int cayman_cp_resume(struct radeon_device *rdev)</div><div class='ctx'> 	mdelay(1);</div><div class='ctx'> 	WREG32(CP_RB1_CNTL, tmp);</div><div class='ctx'> </div><div class='del'>-	WREG32(CP_RB1_BASE, rdev-&gt;cp1.gpu_addr &gt;&gt; 8);</div><div class='add'>+	WREG32(CP_RB1_BASE, ring-&gt;gpu_addr &gt;&gt; 8);</div><div class='ctx'> </div><div class='del'>-	rdev-&gt;cp1.rptr = RREG32(CP_RB1_RPTR);</div><div class='add'>+	ring-&gt;rptr = RREG32(CP_RB1_RPTR);</div><div class='ctx'> </div><div class='ctx'> 	/* ring2 - compute only */</div><div class='ctx'> 	/* Set ring buffer size */</div><div class='del'>-	rb_bufsz = drm_order(rdev-&gt;cp2.ring_size / 8);</div><div class='add'>+	ring = &amp;rdev-&gt;ring[CAYMAN_RING_TYPE_CP2_INDEX];</div><div class='add'>+	rb_bufsz = drm_order(ring-&gt;ring_size / 8);</div><div class='ctx'> 	tmp = (drm_order(RADEON_GPU_PAGE_SIZE/8) &lt;&lt; 8) | rb_bufsz;</div><div class='ctx'> #ifdef __BIG_ENDIAN</div><div class='ctx'> 	tmp |= BUF_SWAP_32BIT;</div><div class='hunk'>@@ -1212,8 +1297,8 @@ int cayman_cp_resume(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the ring buffer's read and write pointers */</div><div class='ctx'> 	WREG32(CP_RB2_CNTL, tmp | RB_RPTR_WR_ENA);</div><div class='del'>-	rdev-&gt;cp2.wptr = 0;</div><div class='del'>-	WREG32(CP_RB2_WPTR, rdev-&gt;cp2.wptr);</div><div class='add'>+	ring-&gt;wptr = 0;</div><div class='add'>+	WREG32(CP_RB2_WPTR, ring-&gt;wptr);</div><div class='ctx'> </div><div class='ctx'> 	/* set the wb address wether it's enabled or not */</div><div class='ctx'> 	WREG32(CP_RB2_RPTR_ADDR, (rdev-&gt;wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) &amp; 0xFFFFFFFC);</div><div class='hunk'>@@ -1222,28 +1307,28 @@ int cayman_cp_resume(struct radeon_device *rdev)</div><div class='ctx'> 	mdelay(1);</div><div class='ctx'> 	WREG32(CP_RB2_CNTL, tmp);</div><div class='ctx'> </div><div class='del'>-	WREG32(CP_RB2_BASE, rdev-&gt;cp2.gpu_addr &gt;&gt; 8);</div><div class='add'>+	WREG32(CP_RB2_BASE, ring-&gt;gpu_addr &gt;&gt; 8);</div><div class='ctx'> </div><div class='del'>-	rdev-&gt;cp2.rptr = RREG32(CP_RB2_RPTR);</div><div class='add'>+	ring-&gt;rptr = RREG32(CP_RB2_RPTR);</div><div class='ctx'> </div><div class='ctx'> 	/* start the rings */</div><div class='ctx'> 	cayman_cp_start(rdev);</div><div class='del'>-	rdev-&gt;cp.ready = true;</div><div class='del'>-	rdev-&gt;cp1.ready = true;</div><div class='del'>-	rdev-&gt;cp2.ready = true;</div><div class='add'>+	rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX].ready = true;</div><div class='add'>+	rdev-&gt;ring[CAYMAN_RING_TYPE_CP1_INDEX].ready = false;</div><div class='add'>+	rdev-&gt;ring[CAYMAN_RING_TYPE_CP2_INDEX].ready = false;</div><div class='ctx'> 	/* this only test cp0 */</div><div class='del'>-	r = radeon_ring_test(rdev);</div><div class='add'>+	r = radeon_ring_test(rdev, &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX]);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		rdev-&gt;cp.ready = false;</div><div class='del'>-		rdev-&gt;cp1.ready = false;</div><div class='del'>-		rdev-&gt;cp2.ready = false;</div><div class='add'>+		rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX].ready = false;</div><div class='add'>+		rdev-&gt;ring[CAYMAN_RING_TYPE_CP1_INDEX].ready = false;</div><div class='add'>+		rdev-&gt;ring[CAYMAN_RING_TYPE_CP2_INDEX].ready = false;</div><div class='ctx'> 		return r;</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'>-bool cayman_gpu_is_lockup(struct radeon_device *rdev)</div><div class='add'>+bool cayman_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring)</div><div class='ctx'> {</div><div class='ctx'> 	u32 srbm_status;</div><div class='ctx'> 	u32 grbm_status;</div><div class='hunk'>@@ -1256,20 +1341,20 @@ bool cayman_gpu_is_lockup(struct radeon_device *rdev)</div><div class='ctx'> 	grbm_status_se0 = RREG32(GRBM_STATUS_SE0);</div><div class='ctx'> 	grbm_status_se1 = RREG32(GRBM_STATUS_SE1);</div><div class='ctx'> 	if (!(grbm_status &amp; GUI_ACTIVE)) {</div><div class='del'>-		r100_gpu_lockup_update(lockup, &amp;rdev-&gt;cp);</div><div class='add'>+		r100_gpu_lockup_update(lockup, ring);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* force CP activities */</div><div class='del'>-	r = radeon_ring_lock(rdev, 2);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, 2);</div><div class='ctx'> 	if (!r) {</div><div class='ctx'> 		/* PACKET2 NOP */</div><div class='del'>-		radeon_ring_write(rdev, 0x80000000);</div><div class='del'>-		radeon_ring_write(rdev, 0x80000000);</div><div class='del'>-		radeon_ring_unlock_commit(rdev);</div><div class='add'>+		radeon_ring_write(ring, 0x80000000);</div><div class='add'>+		radeon_ring_write(ring, 0x80000000);</div><div class='add'>+		radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* XXX deal with CP0,1,2 */</div><div class='del'>-	rdev-&gt;cp.rptr = RREG32(CP_RB0_RPTR);</div><div class='del'>-	return r100_gpu_cp_is_lockup(rdev, lockup, &amp;rdev-&gt;cp);</div><div class='add'>+	ring-&gt;rptr = RREG32(ring-&gt;rptr_reg);</div><div class='add'>+	return r100_gpu_cp_is_lockup(rdev, lockup, ring);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cayman_gpu_soft_reset(struct radeon_device *rdev)</div><div class='hunk'>@@ -1289,6 +1374,15 @@ static int cayman_gpu_soft_reset(struct radeon_device *rdev)</div><div class='ctx'> 		RREG32(GRBM_STATUS_SE1));</div><div class='ctx'> 	dev_info(rdev-&gt;dev, "  SRBM_STATUS=0x%08X\n",</div><div class='ctx'> 		RREG32(SRBM_STATUS));</div><div class='add'>+	dev_info(rdev-&gt;dev, "  VM_CONTEXT0_PROTECTION_FAULT_ADDR   0x%08X\n",</div><div class='add'>+		 RREG32(0x14F8));</div><div class='add'>+	dev_info(rdev-&gt;dev, "  VM_CONTEXT0_PROTECTION_FAULT_STATUS 0x%08X\n",</div><div class='add'>+		 RREG32(0x14D8));</div><div class='add'>+	dev_info(rdev-&gt;dev, "  VM_CONTEXT1_PROTECTION_FAULT_ADDR   0x%08X\n",</div><div class='add'>+		 RREG32(0x14FC));</div><div class='add'>+	dev_info(rdev-&gt;dev, "  VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n",</div><div class='add'>+		 RREG32(0x14DC));</div><div class='add'>+</div><div class='ctx'> 	evergreen_mc_stop(rdev, &amp;save);</div><div class='ctx'> 	if (evergreen_mc_wait_for_idle(rdev)) {</div><div class='ctx'> 		dev_warn(rdev-&gt;dev, "Wait for MC idle timedout !\n");</div><div class='hunk'>@@ -1319,6 +1413,7 @@ static int cayman_gpu_soft_reset(struct radeon_device *rdev)</div><div class='ctx'> 	(void)RREG32(GRBM_SOFT_RESET);</div><div class='ctx'> 	/* Wait a little for things to settle down */</div><div class='ctx'> 	udelay(50);</div><div class='add'>+</div><div class='ctx'> 	dev_info(rdev-&gt;dev, "  GRBM_STATUS=0x%08X\n",</div><div class='ctx'> 		RREG32(GRBM_STATUS));</div><div class='ctx'> 	dev_info(rdev-&gt;dev, "  GRBM_STATUS_SE0=0x%08X\n",</div><div class='hunk'>@@ -1338,6 +1433,7 @@ int cayman_asic_reset(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> static int cayman_startup(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	/* enable pcie gen2 link */</div><div class='hunk'>@@ -1378,6 +1474,24 @@ static int cayman_startup(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_fence_driver_start_ring(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed initializing CP fences (%d).\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = radeon_fence_driver_start_ring(rdev, CAYMAN_RING_TYPE_CP1_INDEX);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed initializing CP fences (%d).\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = radeon_fence_driver_start_ring(rdev, CAYMAN_RING_TYPE_CP2_INDEX);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed initializing CP fences (%d).\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Enable IRQ */</div><div class='ctx'> 	r = r600_irq_init(rdev);</div><div class='ctx'> 	if (r) {</div><div class='hunk'>@@ -1387,7 +1501,9 @@ static int cayman_startup(struct radeon_device *rdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	evergreen_irq_set(rdev);</div><div class='ctx'> </div><div class='del'>-	r = radeon_ring_init(rdev, rdev-&gt;cp.ring_size);</div><div class='add'>+	r = radeon_ring_init(rdev, ring, ring-&gt;ring_size, RADEON_WB_CP_RPTR_OFFSET,</div><div class='add'>+			     CP_RB0_RPTR, CP_RB0_WPTR,</div><div class='add'>+			     0, 0xfffff, RADEON_CP_PACKET2);</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> 	r = cayman_cp_load_microcode(rdev);</div><div class='hunk'>@@ -1397,6 +1513,21 @@ static int cayman_startup(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_ib_pool_start(rdev);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	r = r600_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("radeon: failed testing IB (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = radeon_vm_manager_start(rdev);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1411,32 +1542,26 @@ int cayman_resume(struct radeon_device *rdev)</div><div class='ctx'> 	/* post card */</div><div class='ctx'> 	atom_asic_init(rdev-&gt;mode_info.atom_context);</div><div class='ctx'> </div><div class='add'>+	rdev-&gt;accel_working = true;</div><div class='ctx'> 	r = cayman_startup(rdev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		DRM_ERROR("cayman startup failed on resume\n");</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	r = r600_ib_test(rdev);</div><div class='del'>-	if (r) {</div><div class='del'>-		DRM_ERROR("radeon: failled testing IB (%d).\n", r);</div><div class='del'>-		return r;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return r;</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cayman_suspend(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	/* FIXME: we should wait for ring to be empty */</div><div class='add'>+	radeon_ib_pool_suspend(rdev);</div><div class='add'>+	radeon_vm_manager_suspend(rdev);</div><div class='add'>+	r600_blit_suspend(rdev);</div><div class='ctx'> 	cayman_cp_enable(rdev, false);</div><div class='del'>-	rdev-&gt;cp.ready = false;</div><div class='add'>+	rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX].ready = false;</div><div class='ctx'> 	evergreen_irq_suspend(rdev);</div><div class='ctx'> 	radeon_wb_disable(rdev);</div><div class='ctx'> 	cayman_pcie_gart_disable(rdev);</div><div class='del'>-	r600_blit_suspend(rdev);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1448,6 +1573,7 @@ int cayman_suspend(struct radeon_device *rdev)</div><div class='ctx'>  */</div><div class='ctx'> int cayman_init(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	/* This don't do much */</div><div class='hunk'>@@ -1500,8 +1626,8 @@ int cayman_init(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='del'>-	rdev-&gt;cp.ring_obj = NULL;</div><div class='del'>-	r600_ring_init(rdev, 1024 * 1024);</div><div class='add'>+	ring-&gt;ring_obj = NULL;</div><div class='add'>+	r600_ring_init(rdev, ring, 1024 * 1024);</div><div class='ctx'> </div><div class='ctx'> 	rdev-&gt;ih.ring_obj = NULL;</div><div class='ctx'> 	r600_ih_ring_init(rdev, 64 * 1024);</div><div class='hunk'>@@ -1510,29 +1636,29 @@ int cayman_init(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_ib_pool_init(rdev);</div><div class='ctx'> 	rdev-&gt;accel_working = true;</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "IB initialization failed (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='add'>+	}</div><div class='add'>+	r = radeon_vm_manager_init(rdev);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "vm manager initialization failed (%d).\n", r);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	r = cayman_startup(rdev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		dev_err(rdev-&gt;dev, "disabling GPU acceleration\n");</div><div class='ctx'> 		cayman_cp_fini(rdev);</div><div class='ctx'> 		r600_irq_fini(rdev);</div><div class='ctx'> 		radeon_wb_fini(rdev);</div><div class='add'>+		r100_ib_fini(rdev);</div><div class='add'>+		radeon_vm_manager_fini(rdev);</div><div class='ctx'> 		radeon_irq_kms_fini(rdev);</div><div class='ctx'> 		cayman_pcie_gart_fini(rdev);</div><div class='ctx'> 		rdev-&gt;accel_working = false;</div><div class='ctx'> 	}</div><div class='del'>-	if (rdev-&gt;accel_working) {</div><div class='del'>-		r = radeon_ib_pool_init(rdev);</div><div class='del'>-		if (r) {</div><div class='del'>-			DRM_ERROR("radeon: failed initializing IB pool (%d).\n", r);</div><div class='del'>-			rdev-&gt;accel_working = false;</div><div class='del'>-		}</div><div class='del'>-		r = r600_ib_test(rdev);</div><div class='del'>-		if (r) {</div><div class='del'>-			DRM_ERROR("radeon: failed testing IB (%d).\n", r);</div><div class='del'>-			rdev-&gt;accel_working = false;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Don't start up if the MC ucode is missing.</div><div class='ctx'> 	 * The default clocks and voltages before the MC ucode</div><div class='hunk'>@@ -1552,11 +1678,13 @@ void cayman_fini(struct radeon_device *rdev)</div><div class='ctx'> 	cayman_cp_fini(rdev);</div><div class='ctx'> 	r600_irq_fini(rdev);</div><div class='ctx'> 	radeon_wb_fini(rdev);</div><div class='del'>-	radeon_ib_pool_fini(rdev);</div><div class='add'>+	radeon_vm_manager_fini(rdev);</div><div class='add'>+	r100_ib_fini(rdev);</div><div class='ctx'> 	radeon_irq_kms_fini(rdev);</div><div class='ctx'> 	cayman_pcie_gart_fini(rdev);</div><div class='ctx'> 	r600_vram_scratch_fini(rdev);</div><div class='ctx'> 	radeon_gem_fini(rdev);</div><div class='add'>+	radeon_semaphore_driver_fini(rdev);</div><div class='ctx'> 	radeon_fence_driver_fini(rdev);</div><div class='ctx'> 	radeon_bo_fini(rdev);</div><div class='ctx'> 	radeon_atombios_fini(rdev);</div><div class='hunk'>@@ -1564,3 +1692,84 @@ void cayman_fini(struct radeon_device *rdev)</div><div class='ctx'> 	rdev-&gt;bios = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * vm</div><div class='add'>+ */</div><div class='add'>+int cayman_vm_init(struct radeon_device *rdev)</div><div class='add'>+{</div><div class='add'>+	/* number of VMs */</div><div class='add'>+	rdev-&gt;vm_manager.nvm = 8;</div><div class='add'>+	/* base offset of vram pages */</div><div class='add'>+	rdev-&gt;vm_manager.vram_base_offset = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cayman_vm_fini(struct radeon_device *rdev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cayman_vm_bind(struct radeon_device *rdev, struct radeon_vm *vm, int id)</div><div class='add'>+{</div><div class='add'>+	WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR + (id &lt;&lt; 2), 0);</div><div class='add'>+	WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR + (id &lt;&lt; 2), vm-&gt;last_pfn);</div><div class='add'>+	WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (id &lt;&lt; 2), vm-&gt;pt_gpu_addr &gt;&gt; 12);</div><div class='add'>+	/* flush hdp cache */</div><div class='add'>+	WREG32(HDP_MEM_COHERENCY_FLUSH_CNTL, 0x1);</div><div class='add'>+	/* bits 0-7 are the VM contexts0-7 */</div><div class='add'>+	WREG32(VM_INVALIDATE_REQUEST, 1 &lt;&lt; id);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cayman_vm_unbind(struct radeon_device *rdev, struct radeon_vm *vm)</div><div class='add'>+{</div><div class='add'>+	WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR + (vm-&gt;id &lt;&lt; 2), 0);</div><div class='add'>+	WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR + (vm-&gt;id &lt;&lt; 2), 0);</div><div class='add'>+	WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (vm-&gt;id &lt;&lt; 2), 0);</div><div class='add'>+	/* flush hdp cache */</div><div class='add'>+	WREG32(HDP_MEM_COHERENCY_FLUSH_CNTL, 0x1);</div><div class='add'>+	/* bits 0-7 are the VM contexts0-7 */</div><div class='add'>+	WREG32(VM_INVALIDATE_REQUEST, 1 &lt;&lt; vm-&gt;id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cayman_vm_tlb_flush(struct radeon_device *rdev, struct radeon_vm *vm)</div><div class='add'>+{</div><div class='add'>+	if (vm-&gt;id == -1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* flush hdp cache */</div><div class='add'>+	WREG32(HDP_MEM_COHERENCY_FLUSH_CNTL, 0x1);</div><div class='add'>+	/* bits 0-7 are the VM contexts0-7 */</div><div class='add'>+	WREG32(VM_INVALIDATE_REQUEST, 1 &lt;&lt; vm-&gt;id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define R600_PTE_VALID     (1 &lt;&lt; 0)</div><div class='add'>+#define R600_PTE_SYSTEM    (1 &lt;&lt; 1)</div><div class='add'>+#define R600_PTE_SNOOPED   (1 &lt;&lt; 2)</div><div class='add'>+#define R600_PTE_READABLE  (1 &lt;&lt; 5)</div><div class='add'>+#define R600_PTE_WRITEABLE (1 &lt;&lt; 6)</div><div class='add'>+</div><div class='add'>+uint32_t cayman_vm_page_flags(struct radeon_device *rdev,</div><div class='add'>+			      struct radeon_vm *vm,</div><div class='add'>+			      uint32_t flags)</div><div class='add'>+{</div><div class='add'>+	uint32_t r600_flags = 0;</div><div class='add'>+</div><div class='add'>+	r600_flags |= (flags &amp; RADEON_VM_PAGE_VALID) ? R600_PTE_VALID : 0;</div><div class='add'>+	r600_flags |= (flags &amp; RADEON_VM_PAGE_READABLE) ? R600_PTE_READABLE : 0;</div><div class='add'>+	r600_flags |= (flags &amp; RADEON_VM_PAGE_WRITEABLE) ? R600_PTE_WRITEABLE : 0;</div><div class='add'>+	if (flags &amp; RADEON_VM_PAGE_SYSTEM) {</div><div class='add'>+		r600_flags |= R600_PTE_SYSTEM;</div><div class='add'>+		r600_flags |= (flags &amp; RADEON_VM_PAGE_SNOOPED) ? R600_PTE_SNOOPED : 0;</div><div class='add'>+	}</div><div class='add'>+	return r600_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cayman_vm_set_page(struct radeon_device *rdev, struct radeon_vm *vm,</div><div class='add'>+			unsigned pfn, uint64_t addr, uint32_t flags)</div><div class='add'>+{</div><div class='add'>+	void __iomem *ptr = (void *)vm-&gt;pt;</div><div class='add'>+</div><div class='add'>+	addr = addr &amp; 0xFFFFFFFFFFFFF000ULL;</div><div class='add'>+	addr |= flags;</div><div class='add'>+	writeq(addr, ptr + (pfn * 8));</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/nid.h b/drivers/gpu/drm/radeon/nid.h<br/>index 4672869cdb26..f9df2a645e79 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/nid.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/nid.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/nid.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/nid.h</a></div><div class='hunk'>@@ -42,6 +42,9 @@</div><div class='ctx'> #define CAYMAN_MAX_TCC_MASK          0xFF</div><div class='ctx'> </div><div class='ctx'> #define DMIF_ADDR_CONFIG  				0xBD4</div><div class='add'>+#define	SRBM_GFX_CNTL				        0x0E44</div><div class='add'>+#define		RINGID(x)					(((x) &amp; 0x3) &lt;&lt; 0)</div><div class='add'>+#define		VMID(x)						(((x) &amp; 0x7) &lt;&lt; 0)</div><div class='ctx'> #define	SRBM_STATUS				        0x0E50</div><div class='ctx'> </div><div class='ctx'> #define VM_CONTEXT0_REQUEST_RESPONSE			0x1470</div><div class='hunk'>@@ -219,6 +222,7 @@</div><div class='ctx'> #define	SCRATCH_UMSK					0x8540</div><div class='ctx'> #define	SCRATCH_ADDR					0x8544</div><div class='ctx'> #define	CP_SEM_WAIT_TIMER				0x85BC</div><div class='add'>+#define	CP_COHER_CNTL2					0x85E8</div><div class='ctx'> #define CP_ME_CNTL					0x86D8</div><div class='ctx'> #define		CP_ME_HALT					(1 &lt;&lt; 28)</div><div class='ctx'> #define		CP_PFP_HALT					(1 &lt;&lt; 26)</div><div class='hunk'>@@ -394,6 +398,12 @@</div><div class='ctx'> #define	CP_RB0_RPTR_ADDR				0xC10C</div><div class='ctx'> #define	CP_RB0_RPTR_ADDR_HI				0xC110</div><div class='ctx'> #define	CP_RB0_WPTR					0xC114</div><div class='add'>+</div><div class='add'>+#define CP_INT_CNTL                                     0xC124</div><div class='add'>+#       define CNTX_BUSY_INT_ENABLE                     (1 &lt;&lt; 19)</div><div class='add'>+#       define CNTX_EMPTY_INT_ENABLE                    (1 &lt;&lt; 20)</div><div class='add'>+#       define TIME_STAMP_INT_ENABLE                    (1 &lt;&lt; 26)</div><div class='add'>+</div><div class='ctx'> #define	CP_RB1_BASE					0xC180</div><div class='ctx'> #define	CP_RB1_CNTL					0xC184</div><div class='ctx'> #define	CP_RB1_RPTR_ADDR				0xC188</div><div class='hunk'>@@ -411,6 +421,10 @@</div><div class='ctx'> #define	CP_ME_RAM_DATA					0xC160</div><div class='ctx'> #define	CP_DEBUG					0xC1FC</div><div class='ctx'> </div><div class='add'>+#define VGT_EVENT_INITIATOR                             0x28a90</div><div class='add'>+#       define CACHE_FLUSH_AND_INV_EVENT_TS                     (0x14 &lt;&lt; 0)</div><div class='add'>+#       define CACHE_FLUSH_AND_INV_EVENT                        (0x16 &lt;&lt; 0)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * PM4</div><div class='ctx'>  */</div><div class='hunk'>@@ -445,6 +459,7 @@</div><div class='ctx'> #define	PACKET3_DISPATCH_DIRECT				0x15</div><div class='ctx'> #define	PACKET3_DISPATCH_INDIRECT			0x16</div><div class='ctx'> #define	PACKET3_INDIRECT_BUFFER_END			0x17</div><div class='add'>+#define	PACKET3_MODE_CONTROL				0x18</div><div class='ctx'> #define	PACKET3_SET_PREDICATION				0x20</div><div class='ctx'> #define	PACKET3_REG_RMW					0x21</div><div class='ctx'> #define	PACKET3_COND_EXEC				0x22</div><div class='hunk'>@@ -494,7 +509,27 @@</div><div class='ctx'> #define		PACKET3_ME_INITIALIZE_DEVICE_ID(x) ((x) &lt;&lt; 16)</div><div class='ctx'> #define	PACKET3_COND_WRITE				0x45</div><div class='ctx'> #define	PACKET3_EVENT_WRITE				0x46</div><div class='add'>+#define		EVENT_TYPE(x)                           ((x) &lt;&lt; 0)</div><div class='add'>+#define		EVENT_INDEX(x)                          ((x) &lt;&lt; 8)</div><div class='add'>+                /* 0 - any non-TS event</div><div class='add'>+		 * 1 - ZPASS_DONE</div><div class='add'>+		 * 2 - SAMPLE_PIPELINESTAT</div><div class='add'>+		 * 3 - SAMPLE_STREAMOUTSTAT*</div><div class='add'>+		 * 4 - *S_PARTIAL_FLUSH</div><div class='add'>+		 * 5 - TS events</div><div class='add'>+		 */</div><div class='ctx'> #define	PACKET3_EVENT_WRITE_EOP				0x47</div><div class='add'>+#define		DATA_SEL(x)                             ((x) &lt;&lt; 29)</div><div class='add'>+                /* 0 - discard</div><div class='add'>+		 * 1 - send low 32bit data</div><div class='add'>+		 * 2 - send 64bit data</div><div class='add'>+		 * 3 - send 64bit counter value</div><div class='add'>+		 */</div><div class='add'>+#define		INT_SEL(x)                              ((x) &lt;&lt; 24)</div><div class='add'>+                /* 0 - none</div><div class='add'>+		 * 1 - interrupt only (DATA_SEL = 0)</div><div class='add'>+		 * 2 - interrupt when data write is confirmed</div><div class='add'>+		 */</div><div class='ctx'> #define	PACKET3_EVENT_WRITE_EOS				0x48</div><div class='ctx'> #define	PACKET3_PREAMBLE_CNTL				0x4A</div><div class='ctx'> #              define PACKET3_PREAMBLE_BEGIN_CLEAR_STATE     (2 &lt;&lt; 28)</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c<br/>index bfc08f6320f8..bfd36ab643a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r100.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/r100.c</a></div><div class='hunk'>@@ -667,7 +667,7 @@ int r100_irq_set(struct radeon_device *rdev)</div><div class='ctx'> 		WREG32(R_000040_GEN_INT_CNTL, 0);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	if (rdev-&gt;irq.sw_int) {</div><div class='add'>+	if (rdev-&gt;irq.sw_int[RADEON_RING_TYPE_GFX_INDEX]) {</div><div class='ctx'> 		tmp |= RADEON_SW_INT_ENABLE;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rdev-&gt;irq.gui_idle) {</div><div class='hunk'>@@ -739,7 +739,7 @@ int r100_irq_process(struct radeon_device *rdev)</div><div class='ctx'> 	while (status) {</div><div class='ctx'> 		/* SW interrupt */</div><div class='ctx'> 		if (status &amp; RADEON_SW_INT_TEST) {</div><div class='del'>-			radeon_fence_process(rdev);</div><div class='add'>+			radeon_fence_process(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* gui idle interrupt */</div><div class='ctx'> 		if (status &amp; RADEON_GUI_IDLE_STAT) {</div><div class='hunk'>@@ -811,25 +811,36 @@ u32 r100_get_vblank_counter(struct radeon_device *rdev, int crtc)</div><div class='ctx'> void r100_fence_ring_emit(struct radeon_device *rdev,</div><div class='ctx'> 			  struct radeon_fence *fence)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[fence-&gt;ring];</div><div class='add'>+</div><div class='ctx'> 	/* We have to make sure that caches are flushed before</div><div class='ctx'> 	 * CPU might read something from VRAM. */</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='del'>-	radeon_ring_write(rdev, RADEON_RB3D_DC_FLUSH_ALL);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_RB3D_ZCACHE_CTLSTAT, 0));</div><div class='del'>-	radeon_ring_write(rdev, RADEON_RB3D_ZC_FLUSH_ALL);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='add'>+	radeon_ring_write(ring, RADEON_RB3D_DC_FLUSH_ALL);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_RB3D_ZCACHE_CTLSTAT, 0));</div><div class='add'>+	radeon_ring_write(ring, RADEON_RB3D_ZC_FLUSH_ALL);</div><div class='ctx'> 	/* Wait until IDLE &amp; CLEAN */</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='del'>-	radeon_ring_write(rdev, RADEON_WAIT_2D_IDLECLEAN | RADEON_WAIT_3D_IDLECLEAN);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_HOST_PATH_CNTL, 0));</div><div class='del'>-	radeon_ring_write(rdev, rdev-&gt;config.r100.hdp_cntl |</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='add'>+	radeon_ring_write(ring, RADEON_WAIT_2D_IDLECLEAN | RADEON_WAIT_3D_IDLECLEAN);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_HOST_PATH_CNTL, 0));</div><div class='add'>+	radeon_ring_write(ring, rdev-&gt;config.r100.hdp_cntl |</div><div class='ctx'> 				RADEON_HDP_READ_BUFFER_INVALIDATE);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_HOST_PATH_CNTL, 0));</div><div class='del'>-	radeon_ring_write(rdev, rdev-&gt;config.r100.hdp_cntl);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_HOST_PATH_CNTL, 0));</div><div class='add'>+	radeon_ring_write(ring, rdev-&gt;config.r100.hdp_cntl);</div><div class='ctx'> 	/* Emit fence sequence &amp; fire IRQ */</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(rdev-&gt;fence_drv.scratch_reg, 0));</div><div class='del'>-	radeon_ring_write(rdev, fence-&gt;seq);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_GEN_INT_STATUS, 0));</div><div class='del'>-	radeon_ring_write(rdev, RADEON_SW_INT_FIRE);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(rdev-&gt;fence_drv[fence-&gt;ring].scratch_reg, 0));</div><div class='add'>+	radeon_ring_write(ring, fence-&gt;seq);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_GEN_INT_STATUS, 0));</div><div class='add'>+	radeon_ring_write(ring, RADEON_SW_INT_FIRE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void r100_semaphore_ring_emit(struct radeon_device *rdev,</div><div class='add'>+			      struct radeon_ring *ring,</div><div class='add'>+			      struct radeon_semaphore *semaphore,</div><div class='add'>+			      bool emit_wait)</div><div class='add'>+{</div><div class='add'>+	/* Unused on older asics, since we don't have semaphores or multiple rings */</div><div class='add'>+	BUG();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int r100_copy_blit(struct radeon_device *rdev,</div><div class='hunk'>@@ -838,6 +849,7 @@ int r100_copy_blit(struct radeon_device *rdev,</div><div class='ctx'> 		   unsigned num_gpu_pages,</div><div class='ctx'> 		   struct radeon_fence *fence)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	uint32_t cur_pages;</div><div class='ctx'> 	uint32_t stride_bytes = RADEON_GPU_PAGE_SIZE;</div><div class='ctx'> 	uint32_t pitch;</div><div class='hunk'>@@ -855,7 +867,7 @@ int r100_copy_blit(struct radeon_device *rdev,</div><div class='ctx'> </div><div class='ctx'> 	/* Ask for enough room for blit + flush + fence */</div><div class='ctx'> 	ndw = 64 + (10 * num_loops);</div><div class='del'>-	r = radeon_ring_lock(rdev, ndw);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, ndw);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		DRM_ERROR("radeon: moving bo (%d) asking for %u dw.\n", r, ndw);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -869,8 +881,8 @@ int r100_copy_blit(struct radeon_device *rdev,</div><div class='ctx'> </div><div class='ctx'> 		/* pages are in Y direction - height</div><div class='ctx'> 		   page width in X direction - width */</div><div class='del'>-		radeon_ring_write(rdev, PACKET3(PACKET3_BITBLT_MULTI, 8));</div><div class='del'>-		radeon_ring_write(rdev,</div><div class='add'>+		radeon_ring_write(ring, PACKET3(PACKET3_BITBLT_MULTI, 8));</div><div class='add'>+		radeon_ring_write(ring,</div><div class='ctx'> 				  RADEON_GMC_SRC_PITCH_OFFSET_CNTL |</div><div class='ctx'> 				  RADEON_GMC_DST_PITCH_OFFSET_CNTL |</div><div class='ctx'> 				  RADEON_GMC_SRC_CLIPPING |</div><div class='hunk'>@@ -882,26 +894,26 @@ int r100_copy_blit(struct radeon_device *rdev,</div><div class='ctx'> 				  RADEON_DP_SRC_SOURCE_MEMORY |</div><div class='ctx'> 				  RADEON_GMC_CLR_CMP_CNTL_DIS |</div><div class='ctx'> 				  RADEON_GMC_WR_MSK_DIS);</div><div class='del'>-		radeon_ring_write(rdev, (pitch &lt;&lt; 22) | (src_offset &gt;&gt; 10));</div><div class='del'>-		radeon_ring_write(rdev, (pitch &lt;&lt; 22) | (dst_offset &gt;&gt; 10));</div><div class='del'>-		radeon_ring_write(rdev, (0x1fff) | (0x1fff &lt;&lt; 16));</div><div class='del'>-		radeon_ring_write(rdev, 0);</div><div class='del'>-		radeon_ring_write(rdev, (0x1fff) | (0x1fff &lt;&lt; 16));</div><div class='del'>-		radeon_ring_write(rdev, num_gpu_pages);</div><div class='del'>-		radeon_ring_write(rdev, num_gpu_pages);</div><div class='del'>-		radeon_ring_write(rdev, cur_pages | (stride_pixels &lt;&lt; 16));</div><div class='del'>-	}</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_DSTCACHE_CTLSTAT, 0));</div><div class='del'>-	radeon_ring_write(rdev, RADEON_RB2D_DC_FLUSH_ALL);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='del'>-	radeon_ring_write(rdev,</div><div class='add'>+		radeon_ring_write(ring, (pitch &lt;&lt; 22) | (src_offset &gt;&gt; 10));</div><div class='add'>+		radeon_ring_write(ring, (pitch &lt;&lt; 22) | (dst_offset &gt;&gt; 10));</div><div class='add'>+		radeon_ring_write(ring, (0x1fff) | (0x1fff &lt;&lt; 16));</div><div class='add'>+		radeon_ring_write(ring, 0);</div><div class='add'>+		radeon_ring_write(ring, (0x1fff) | (0x1fff &lt;&lt; 16));</div><div class='add'>+		radeon_ring_write(ring, num_gpu_pages);</div><div class='add'>+		radeon_ring_write(ring, num_gpu_pages);</div><div class='add'>+		radeon_ring_write(ring, cur_pages | (stride_pixels &lt;&lt; 16));</div><div class='add'>+	}</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_DSTCACHE_CTLSTAT, 0));</div><div class='add'>+	radeon_ring_write(ring, RADEON_RB2D_DC_FLUSH_ALL);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='add'>+	radeon_ring_write(ring,</div><div class='ctx'> 			  RADEON_WAIT_2D_IDLECLEAN |</div><div class='ctx'> 			  RADEON_WAIT_HOST_IDLECLEAN |</div><div class='ctx'> 			  RADEON_WAIT_DMA_GUI_IDLE);</div><div class='ctx'> 	if (fence) {</div><div class='ctx'> 		r = radeon_fence_emit(rdev, fence);</div><div class='ctx'> 	}</div><div class='del'>-	radeon_ring_unlock_commit(rdev);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -922,19 +934,20 @@ static int r100_cp_wait_for_idle(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> void r100_ring_start(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	r = radeon_ring_lock(rdev, 2);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, 2);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_ISYNC_CNTL, 0));</div><div class='del'>-	radeon_ring_write(rdev,</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_ISYNC_CNTL, 0));</div><div class='add'>+	radeon_ring_write(ring,</div><div class='ctx'> 			  RADEON_ISYNC_ANY2D_IDLE3D |</div><div class='ctx'> 			  RADEON_ISYNC_ANY3D_IDLE2D |</div><div class='ctx'> 			  RADEON_ISYNC_WAIT_IDLEGUI |</div><div class='ctx'> 			  RADEON_ISYNC_CPSCRATCH_IDLEGUI);</div><div class='del'>-	radeon_ring_unlock_commit(rdev);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1035,6 +1048,7 @@ static void r100_cp_load_microcode(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> int r100_cp_init(struct radeon_device *rdev, unsigned ring_size)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	unsigned rb_bufsz;</div><div class='ctx'> 	unsigned rb_blksz;</div><div class='ctx'> 	unsigned max_fetch;</div><div class='hunk'>@@ -1060,7 +1074,9 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size)</div><div class='ctx'> 	rb_bufsz = drm_order(ring_size / 8);</div><div class='ctx'> 	ring_size = (1 &lt;&lt; (rb_bufsz + 1)) * 4;</div><div class='ctx'> 	r100_cp_load_microcode(rdev);</div><div class='del'>-	r = radeon_ring_init(rdev, ring_size);</div><div class='add'>+	r = radeon_ring_init(rdev, ring, ring_size, RADEON_WB_CP_RPTR_OFFSET,</div><div class='add'>+			     RADEON_CP_RB_RPTR, RADEON_CP_RB_WPTR,</div><div class='add'>+			     0, 0x7fffff, RADEON_CP_PACKET2);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1069,7 +1085,7 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size)</div><div class='ctx'> 	rb_blksz = 9;</div><div class='ctx'> 	/* cp will read 128bytes at a time (4 dwords) */</div><div class='ctx'> 	max_fetch = 1;</div><div class='del'>-	rdev-&gt;cp.align_mask = 16 - 1;</div><div class='add'>+	ring-&gt;align_mask = 16 - 1;</div><div class='ctx'> 	/* Write to CP_RB_WPTR will be delayed for pre_write_timer clocks */</div><div class='ctx'> 	pre_write_timer = 64;</div><div class='ctx'> 	/* Force CP_RB_WPTR write if written more than one time before the</div><div class='hunk'>@@ -1099,13 +1115,13 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size)</div><div class='ctx'> 	WREG32(RADEON_CP_RB_CNTL, tmp | RADEON_RB_NO_UPDATE);</div><div class='ctx'> </div><div class='ctx'> 	/* Set ring address */</div><div class='del'>-	DRM_INFO("radeon: ring at 0x%016lX\n", (unsigned long)rdev-&gt;cp.gpu_addr);</div><div class='del'>-	WREG32(RADEON_CP_RB_BASE, rdev-&gt;cp.gpu_addr);</div><div class='add'>+	DRM_INFO("radeon: ring at 0x%016lX\n", (unsigned long)ring-&gt;gpu_addr);</div><div class='add'>+	WREG32(RADEON_CP_RB_BASE, ring-&gt;gpu_addr);</div><div class='ctx'> 	/* Force read &amp; write ptr to 0 */</div><div class='ctx'> 	WREG32(RADEON_CP_RB_CNTL, tmp | RADEON_RB_RPTR_WR_ENA | RADEON_RB_NO_UPDATE);</div><div class='ctx'> 	WREG32(RADEON_CP_RB_RPTR_WR, 0);</div><div class='del'>-	rdev-&gt;cp.wptr = 0;</div><div class='del'>-	WREG32(RADEON_CP_RB_WPTR, rdev-&gt;cp.wptr);</div><div class='add'>+	ring-&gt;wptr = 0;</div><div class='add'>+	WREG32(RADEON_CP_RB_WPTR, ring-&gt;wptr);</div><div class='ctx'> </div><div class='ctx'> 	/* set the wb address whether it's enabled or not */</div><div class='ctx'> 	WREG32(R_00070C_CP_RB_RPTR_ADDR,</div><div class='hunk'>@@ -1121,7 +1137,7 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size)</div><div class='ctx'> </div><div class='ctx'> 	WREG32(RADEON_CP_RB_CNTL, tmp);</div><div class='ctx'> 	udelay(10);</div><div class='del'>-	rdev-&gt;cp.rptr = RREG32(RADEON_CP_RB_RPTR);</div><div class='add'>+	ring-&gt;rptr = RREG32(RADEON_CP_RB_RPTR);</div><div class='ctx'> 	/* Set cp mode to bus mastering &amp; enable cp*/</div><div class='ctx'> 	WREG32(RADEON_CP_CSQ_MODE,</div><div class='ctx'> 	       REG_SET(RADEON_INDIRECT2_START, indirect2_start) |</div><div class='hunk'>@@ -1130,12 +1146,12 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size)</div><div class='ctx'> 	WREG32(RADEON_CP_CSQ_MODE, 0x00004D4D);</div><div class='ctx'> 	WREG32(RADEON_CP_CSQ_CNTL, RADEON_CSQ_PRIBM_INDBM);</div><div class='ctx'> 	radeon_ring_start(rdev);</div><div class='del'>-	r = radeon_ring_test(rdev);</div><div class='add'>+	r = radeon_ring_test(rdev, ring);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		DRM_ERROR("radeon: cp isn't working (%d).\n", r);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-	rdev-&gt;cp.ready = true;</div><div class='add'>+	ring-&gt;ready = true;</div><div class='ctx'> 	radeon_ttm_set_active_vram_size(rdev, rdev-&gt;mc.real_vram_size);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1147,7 +1163,7 @@ void r100_cp_fini(struct radeon_device *rdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Disable ring */</div><div class='ctx'> 	r100_cp_disable(rdev);</div><div class='del'>-	radeon_ring_fini(rdev);</div><div class='add'>+	radeon_ring_fini(rdev, &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX]);</div><div class='ctx'> 	DRM_INFO("radeon: cp finalized\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1155,7 +1171,7 @@ void r100_cp_disable(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	/* Disable ring */</div><div class='ctx'> 	radeon_ttm_set_active_vram_size(rdev, rdev-&gt;mc.visible_vram_size);</div><div class='del'>-	rdev-&gt;cp.ready = false;</div><div class='add'>+	rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX].ready = false;</div><div class='ctx'> 	WREG32(RADEON_CP_CSQ_MODE, 0);</div><div class='ctx'> 	WREG32(RADEON_CP_CSQ_CNTL, 0);</div><div class='ctx'> 	WREG32(R_000770_SCRATCH_UMSK, 0);</div><div class='hunk'>@@ -1165,13 +1181,6 @@ void r100_cp_disable(struct radeon_device *rdev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void r100_cp_commit(struct radeon_device *rdev)</div><div class='del'>-{</div><div class='del'>-	WREG32(RADEON_CP_RB_WPTR, rdev-&gt;cp.wptr);</div><div class='del'>-	(void)RREG32(RADEON_CP_RB_WPTR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * CS functions</div><div class='ctx'>  */</div><div class='hunk'>@@ -2099,9 +2108,9 @@ int r100_mc_wait_for_idle(struct radeon_device *rdev)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void r100_gpu_lockup_update(struct r100_gpu_lockup *lockup, struct radeon_cp *cp)</div><div class='add'>+void r100_gpu_lockup_update(struct r100_gpu_lockup *lockup, struct radeon_ring *ring)</div><div class='ctx'> {</div><div class='del'>-	lockup-&gt;last_cp_rptr = cp-&gt;rptr;</div><div class='add'>+	lockup-&gt;last_cp_rptr = ring-&gt;rptr;</div><div class='ctx'> 	lockup-&gt;last_jiffies = jiffies;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2126,20 +2135,20 @@ void r100_gpu_lockup_update(struct r100_gpu_lockup *lockup, struct radeon_cp *cp</div><div class='ctx'>  * false positive when CP is just gived nothing to do.</div><div class='ctx'>  *</div><div class='ctx'>  **/</div><div class='del'>-bool r100_gpu_cp_is_lockup(struct radeon_device *rdev, struct r100_gpu_lockup *lockup, struct radeon_cp *cp)</div><div class='add'>+bool r100_gpu_cp_is_lockup(struct radeon_device *rdev, struct r100_gpu_lockup *lockup, struct radeon_ring *ring)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long cjiffies, elapsed;</div><div class='ctx'> </div><div class='ctx'> 	cjiffies = jiffies;</div><div class='ctx'> 	if (!time_after(cjiffies, lockup-&gt;last_jiffies)) {</div><div class='ctx'> 		/* likely a wrap around */</div><div class='del'>-		lockup-&gt;last_cp_rptr = cp-&gt;rptr;</div><div class='add'>+		lockup-&gt;last_cp_rptr = ring-&gt;rptr;</div><div class='ctx'> 		lockup-&gt;last_jiffies = jiffies;</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='del'>-	if (cp-&gt;rptr != lockup-&gt;last_cp_rptr) {</div><div class='add'>+	if (ring-&gt;rptr != lockup-&gt;last_cp_rptr) {</div><div class='ctx'> 		/* CP is still working no lockup */</div><div class='del'>-		lockup-&gt;last_cp_rptr = cp-&gt;rptr;</div><div class='add'>+		lockup-&gt;last_cp_rptr = ring-&gt;rptr;</div><div class='ctx'> 		lockup-&gt;last_jiffies = jiffies;</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2152,26 +2161,26 @@ bool r100_gpu_cp_is_lockup(struct radeon_device *rdev, struct r100_gpu_lockup *l</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool r100_gpu_is_lockup(struct radeon_device *rdev)</div><div class='add'>+bool r100_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring)</div><div class='ctx'> {</div><div class='ctx'> 	u32 rbbm_status;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	rbbm_status = RREG32(R_000E40_RBBM_STATUS);</div><div class='ctx'> 	if (!G_000E40_GUI_ACTIVE(rbbm_status)) {</div><div class='del'>-		r100_gpu_lockup_update(&amp;rdev-&gt;config.r100.lockup, &amp;rdev-&gt;cp);</div><div class='add'>+		r100_gpu_lockup_update(&amp;rdev-&gt;config.r100.lockup, ring);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* force CP activities */</div><div class='del'>-	r = radeon_ring_lock(rdev, 2);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, 2);</div><div class='ctx'> 	if (!r) {</div><div class='ctx'> 		/* PACKET2 NOP */</div><div class='del'>-		radeon_ring_write(rdev, 0x80000000);</div><div class='del'>-		radeon_ring_write(rdev, 0x80000000);</div><div class='del'>-		radeon_ring_unlock_commit(rdev);</div><div class='add'>+		radeon_ring_write(ring, 0x80000000);</div><div class='add'>+		radeon_ring_write(ring, 0x80000000);</div><div class='add'>+		radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> 	}</div><div class='del'>-	rdev-&gt;cp.rptr = RREG32(RADEON_CP_RB_RPTR);</div><div class='del'>-	return r100_gpu_cp_is_lockup(rdev, &amp;rdev-&gt;config.r100.lockup, &amp;rdev-&gt;cp);</div><div class='add'>+	ring-&gt;rptr = RREG32(ring-&gt;rptr_reg);</div><div class='add'>+	return r100_gpu_cp_is_lockup(rdev, &amp;rdev-&gt;config.r100.lockup, ring);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void r100_bm_disable(struct radeon_device *rdev)</div><div class='hunk'>@@ -2187,8 +2196,7 @@ void r100_bm_disable(struct radeon_device *rdev)</div><div class='ctx'> 	WREG32(R_000030_BUS_CNTL, (tmp &amp; 0xFFFFFFFF) | 0x00000040);</div><div class='ctx'> 	tmp = RREG32(RADEON_BUS_CNTL);</div><div class='ctx'> 	mdelay(1);</div><div class='del'>-	pci_read_config_word(rdev-&gt;pdev, 0x4, (u16*)&amp;tmp);</div><div class='del'>-	pci_write_config_word(rdev-&gt;pdev, 0x4, tmp &amp; 0xFFFB);</div><div class='add'>+	pci_clear_master(rdev-&gt;pdev);</div><div class='ctx'> 	mdelay(1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2579,21 +2587,22 @@ static int r100_debugfs_cp_ring_info(struct seq_file *m, void *data)</div><div class='ctx'> 	struct drm_info_node *node = (struct drm_info_node *) m-&gt;private;</div><div class='ctx'> 	struct drm_device *dev = node-&gt;minor-&gt;dev;</div><div class='ctx'> 	struct radeon_device *rdev = dev-&gt;dev_private;</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	uint32_t rdp, wdp;</div><div class='ctx'> 	unsigned count, i, j;</div><div class='ctx'> </div><div class='del'>-	radeon_ring_free_size(rdev);</div><div class='add'>+	radeon_ring_free_size(rdev, ring);</div><div class='ctx'> 	rdp = RREG32(RADEON_CP_RB_RPTR);</div><div class='ctx'> 	wdp = RREG32(RADEON_CP_RB_WPTR);</div><div class='del'>-	count = (rdp + rdev-&gt;cp.ring_size - wdp) &amp; rdev-&gt;cp.ptr_mask;</div><div class='add'>+	count = (rdp + ring-&gt;ring_size - wdp) &amp; ring-&gt;ptr_mask;</div><div class='ctx'> 	seq_printf(m, "CP_STAT 0x%08x\n", RREG32(RADEON_CP_STAT));</div><div class='ctx'> 	seq_printf(m, "CP_RB_WPTR 0x%08x\n", wdp);</div><div class='ctx'> 	seq_printf(m, "CP_RB_RPTR 0x%08x\n", rdp);</div><div class='del'>-	seq_printf(m, "%u free dwords in ring\n", rdev-&gt;cp.ring_free_dw);</div><div class='add'>+	seq_printf(m, "%u free dwords in ring\n", ring-&gt;ring_free_dw);</div><div class='ctx'> 	seq_printf(m, "%u dwords in ring\n", count);</div><div class='ctx'> 	for (j = 0; j &lt;= count; j++) {</div><div class='del'>-		i = (rdp + j) &amp; rdev-&gt;cp.ptr_mask;</div><div class='del'>-		seq_printf(m, "r[%04d]=0x%08x\n", i, rdev-&gt;cp.ring[i]);</div><div class='add'>+		i = (rdp + j) &amp; ring-&gt;ptr_mask;</div><div class='add'>+		seq_printf(m, "r[%04d]=0x%08x\n", i, ring-&gt;ring[i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3635,7 +3644,7 @@ void r100_cs_track_clear(struct radeon_device *rdev, struct r100_cs_track *track</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int r100_ring_test(struct radeon_device *rdev)</div><div class='add'>+int r100_ring_test(struct radeon_device *rdev, struct radeon_ring *ring)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t scratch;</div><div class='ctx'> 	uint32_t tmp = 0;</div><div class='hunk'>@@ -3648,15 +3657,15 @@ int r100_ring_test(struct radeon_device *rdev)</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> 	WREG32(scratch, 0xCAFEDEAD);</div><div class='del'>-	r = radeon_ring_lock(rdev, 2);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, 2);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		DRM_ERROR("radeon: cp failed to lock ring (%d).\n", r);</div><div class='ctx'> 		radeon_scratch_free(rdev, scratch);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(scratch, 0));</div><div class='del'>-	radeon_ring_write(rdev, 0xDEADBEEF);</div><div class='del'>-	radeon_ring_unlock_commit(rdev);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(scratch, 0));</div><div class='add'>+	radeon_ring_write(ring, 0xDEADBEEF);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> 	for (i = 0; i &lt; rdev-&gt;usec_timeout; i++) {</div><div class='ctx'> 		tmp = RREG32(scratch);</div><div class='ctx'> 		if (tmp == 0xDEADBEEF) {</div><div class='hunk'>@@ -3677,9 +3686,11 @@ int r100_ring_test(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> void r100_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib)</div><div class='ctx'> {</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_CP_IB_BASE, 1));</div><div class='del'>-	radeon_ring_write(rdev, ib-&gt;gpu_addr);</div><div class='del'>-	radeon_ring_write(rdev, ib-&gt;length_dw);</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='add'>+</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_CP_IB_BASE, 1));</div><div class='add'>+	radeon_ring_write(ring, ib-&gt;gpu_addr);</div><div class='add'>+	radeon_ring_write(ring, ib-&gt;length_dw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int r100_ib_test(struct radeon_device *rdev)</div><div class='hunk'>@@ -3696,7 +3707,7 @@ int r100_ib_test(struct radeon_device *rdev)</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> 	WREG32(scratch, 0xCAFEDEAD);</div><div class='del'>-	r = radeon_ib_get(rdev, &amp;ib);</div><div class='add'>+	r = radeon_ib_get(rdev, RADEON_RING_TYPE_GFX_INDEX, &amp;ib, 256);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3740,34 +3751,16 @@ int r100_ib_test(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> void r100_ib_fini(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	radeon_ib_pool_suspend(rdev);</div><div class='ctx'> 	radeon_ib_pool_fini(rdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int r100_ib_init(struct radeon_device *rdev)</div><div class='del'>-{</div><div class='del'>-	int r;</div><div class='del'>-</div><div class='del'>-	r = radeon_ib_pool_init(rdev);</div><div class='del'>-	if (r) {</div><div class='del'>-		dev_err(rdev-&gt;dev, "failed initializing IB pool (%d).\n", r);</div><div class='del'>-		r100_ib_fini(rdev);</div><div class='del'>-		return r;</div><div class='del'>-	}</div><div class='del'>-	r = r100_ib_test(rdev);</div><div class='del'>-	if (r) {</div><div class='del'>-		dev_err(rdev-&gt;dev, "failed testing IB (%d).\n", r);</div><div class='del'>-		r100_ib_fini(rdev);</div><div class='del'>-		return r;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void r100_mc_stop(struct radeon_device *rdev, struct r100_mc_save *save)</div><div class='ctx'> {</div><div class='ctx'> 	/* Shutdown CP we shouldn't need to do that but better be safe than</div><div class='ctx'> 	 * sorry</div><div class='ctx'> 	 */</div><div class='del'>-	rdev-&gt;cp.ready = false;</div><div class='add'>+	rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX].ready = false;</div><div class='ctx'> 	WREG32(R_000740_CP_CSQ_CNTL, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Save few CRTC registers */</div><div class='hunk'>@@ -3905,6 +3898,12 @@ static int r100_startup(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_fence_driver_start_ring(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed initializing CP fences (%d).\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Enable IRQ */</div><div class='ctx'> 	r100_irq_set(rdev);</div><div class='ctx'> 	rdev-&gt;config.r100.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);</div><div class='hunk'>@@ -3914,11 +3913,18 @@ static int r100_startup(struct radeon_device *rdev)</div><div class='ctx'> 		dev_err(rdev-&gt;dev, "failed initializing CP (%d).\n", r);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-	r = r100_ib_init(rdev);</div><div class='add'>+</div><div class='add'>+	r = radeon_ib_pool_start(rdev);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	r = r100_ib_test(rdev);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		dev_err(rdev-&gt;dev, "failed initializing IB (%d).\n", r);</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed testing IB (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='ctx'> 		return r;</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'>@@ -3941,11 +3947,14 @@ int r100_resume(struct radeon_device *rdev)</div><div class='ctx'> 	r100_clock_startup(rdev);</div><div class='ctx'> 	/* Initialize surface registers */</div><div class='ctx'> 	radeon_surface_init(rdev);</div><div class='add'>+</div><div class='add'>+	rdev-&gt;accel_working = true;</div><div class='ctx'> 	return r100_startup(rdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int r100_suspend(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	radeon_ib_pool_suspend(rdev);</div><div class='ctx'> 	r100_cp_disable(rdev);</div><div class='ctx'> 	radeon_wb_disable(rdev);</div><div class='ctx'> 	r100_irq_disable(rdev);</div><div class='hunk'>@@ -4064,7 +4073,14 @@ int r100_init(struct radeon_device *rdev)</div><div class='ctx'> 			return r;</div><div class='ctx'> 	}</div><div class='ctx'> 	r100_set_safe_registers(rdev);</div><div class='add'>+</div><div class='add'>+	r = radeon_ib_pool_init(rdev);</div><div class='ctx'> 	rdev-&gt;accel_working = true;</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "IB initialization failed (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	r = r100_startup(rdev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		/* Somethings want wront with the accel init stop accel */</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/r200.c b/drivers/gpu/drm/radeon/r200.c<br/>index a1f3ba063c2d..eba4cbfa78f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r200.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/r200.c</a></div><div class='hunk'>@@ -87,6 +87,7 @@ int r200_copy_dma(struct radeon_device *rdev,</div><div class='ctx'> 		  unsigned num_gpu_pages,</div><div class='ctx'> 		  struct radeon_fence *fence)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	uint32_t size;</div><div class='ctx'> 	uint32_t cur_size;</div><div class='ctx'> 	int i, num_loops;</div><div class='hunk'>@@ -95,33 +96,33 @@ int r200_copy_dma(struct radeon_device *rdev,</div><div class='ctx'> 	/* radeon pitch is /64 */</div><div class='ctx'> 	size = num_gpu_pages &lt;&lt; RADEON_GPU_PAGE_SHIFT;</div><div class='ctx'> 	num_loops = DIV_ROUND_UP(size, 0x1FFFFF);</div><div class='del'>-	r = radeon_ring_lock(rdev, num_loops * 4 + 64);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, num_loops * 4 + 64);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		DRM_ERROR("radeon: moving bo (%d).\n", r);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Must wait for 2D idle &amp; clean before DMA or hangs might happen */</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='del'>-	radeon_ring_write(rdev, (1 &lt;&lt; 16));</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='add'>+	radeon_ring_write(ring, (1 &lt;&lt; 16));</div><div class='ctx'> 	for (i = 0; i &lt; num_loops; i++) {</div><div class='ctx'> 		cur_size = size;</div><div class='ctx'> 		if (cur_size &gt; 0x1FFFFF) {</div><div class='ctx'> 			cur_size = 0x1FFFFF;</div><div class='ctx'> 		}</div><div class='ctx'> 		size -= cur_size;</div><div class='del'>-		radeon_ring_write(rdev, PACKET0(0x720, 2));</div><div class='del'>-		radeon_ring_write(rdev, src_offset);</div><div class='del'>-		radeon_ring_write(rdev, dst_offset);</div><div class='del'>-		radeon_ring_write(rdev, cur_size | (1 &lt;&lt; 31) | (1 &lt;&lt; 30));</div><div class='add'>+		radeon_ring_write(ring, PACKET0(0x720, 2));</div><div class='add'>+		radeon_ring_write(ring, src_offset);</div><div class='add'>+		radeon_ring_write(ring, dst_offset);</div><div class='add'>+		radeon_ring_write(ring, cur_size | (1 &lt;&lt; 31) | (1 &lt;&lt; 30));</div><div class='ctx'> 		src_offset += cur_size;</div><div class='ctx'> 		dst_offset += cur_size;</div><div class='ctx'> 	}</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='del'>-	radeon_ring_write(rdev, RADEON_WAIT_DMA_GUI_IDLE);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='add'>+	radeon_ring_write(ring, RADEON_WAIT_DMA_GUI_IDLE);</div><div class='ctx'> 	if (fence) {</div><div class='ctx'> 		r = radeon_fence_emit(rdev, fence);</div><div class='ctx'> 	}</div><div class='del'>-	radeon_ring_unlock_commit(rdev);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c<br/>index c93bc64707e1..3fc0d29a5f39 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r300.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r300.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/r300.c</a></div><div class='hunk'>@@ -175,37 +175,40 @@ void rv370_pcie_gart_fini(struct radeon_device *rdev)</div><div class='ctx'> void r300_fence_ring_emit(struct radeon_device *rdev,</div><div class='ctx'> 			  struct radeon_fence *fence)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[fence-&gt;ring];</div><div class='add'>+</div><div class='ctx'> 	/* Who ever call radeon_fence_emit should call ring_lock and ask</div><div class='ctx'> 	 * for enough space (today caller are ib schedule and buffer move) */</div><div class='ctx'> 	/* Write SC register so SC &amp; US assert idle */</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_RE_SCISSORS_TL, 0));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_RE_SCISSORS_BR, 0));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_RE_SCISSORS_TL, 0));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_RE_SCISSORS_BR, 0));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='ctx'> 	/* Flush 3D cache */</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='del'>-	radeon_ring_write(rdev, R300_RB3D_DC_FLUSH);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_RB3D_ZCACHE_CTLSTAT, 0));</div><div class='del'>-	radeon_ring_write(rdev, R300_ZC_FLUSH);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='add'>+	radeon_ring_write(ring, R300_RB3D_DC_FLUSH);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_RB3D_ZCACHE_CTLSTAT, 0));</div><div class='add'>+	radeon_ring_write(ring, R300_ZC_FLUSH);</div><div class='ctx'> 	/* Wait until IDLE &amp; CLEAN */</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='del'>-	radeon_ring_write(rdev, (RADEON_WAIT_3D_IDLECLEAN |</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='add'>+	radeon_ring_write(ring, (RADEON_WAIT_3D_IDLECLEAN |</div><div class='ctx'> 				 RADEON_WAIT_2D_IDLECLEAN |</div><div class='ctx'> 				 RADEON_WAIT_DMA_GUI_IDLE));</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_HOST_PATH_CNTL, 0));</div><div class='del'>-	radeon_ring_write(rdev, rdev-&gt;config.r300.hdp_cntl |</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_HOST_PATH_CNTL, 0));</div><div class='add'>+	radeon_ring_write(ring, rdev-&gt;config.r300.hdp_cntl |</div><div class='ctx'> 				RADEON_HDP_READ_BUFFER_INVALIDATE);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_HOST_PATH_CNTL, 0));</div><div class='del'>-	radeon_ring_write(rdev, rdev-&gt;config.r300.hdp_cntl);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_HOST_PATH_CNTL, 0));</div><div class='add'>+	radeon_ring_write(ring, rdev-&gt;config.r300.hdp_cntl);</div><div class='ctx'> 	/* Emit fence sequence &amp; fire IRQ */</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(rdev-&gt;fence_drv.scratch_reg, 0));</div><div class='del'>-	radeon_ring_write(rdev, fence-&gt;seq);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_GEN_INT_STATUS, 0));</div><div class='del'>-	radeon_ring_write(rdev, RADEON_SW_INT_FIRE);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(rdev-&gt;fence_drv[fence-&gt;ring].scratch_reg, 0));</div><div class='add'>+	radeon_ring_write(ring, fence-&gt;seq);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_GEN_INT_STATUS, 0));</div><div class='add'>+	radeon_ring_write(ring, RADEON_SW_INT_FIRE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void r300_ring_start(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	unsigned gb_tile_config;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='hunk'>@@ -227,44 +230,44 @@ void r300_ring_start(struct radeon_device *rdev)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	r = radeon_ring_lock(rdev, 64);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, 64);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_ISYNC_CNTL, 0));</div><div class='del'>-	radeon_ring_write(rdev,</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_ISYNC_CNTL, 0));</div><div class='add'>+	radeon_ring_write(ring,</div><div class='ctx'> 			  RADEON_ISYNC_ANY2D_IDLE3D |</div><div class='ctx'> 			  RADEON_ISYNC_ANY3D_IDLE2D |</div><div class='ctx'> 			  RADEON_ISYNC_WAIT_IDLEGUI |</div><div class='ctx'> 			  RADEON_ISYNC_CPSCRATCH_IDLEGUI);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_GB_TILE_CONFIG, 0));</div><div class='del'>-	radeon_ring_write(rdev, gb_tile_config);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='del'>-	radeon_ring_write(rdev,</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_GB_TILE_CONFIG, 0));</div><div class='add'>+	radeon_ring_write(ring, gb_tile_config);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='add'>+	radeon_ring_write(ring,</div><div class='ctx'> 			  RADEON_WAIT_2D_IDLECLEAN |</div><div class='ctx'> 			  RADEON_WAIT_3D_IDLECLEAN);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_DST_PIPE_CONFIG, 0));</div><div class='del'>-	radeon_ring_write(rdev, R300_PIPE_AUTO_CONFIG);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_GB_SELECT, 0));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_GB_ENABLE, 0));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='del'>-	radeon_ring_write(rdev, R300_RB3D_DC_FLUSH | R300_RB3D_DC_FREE);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_RB3D_ZCACHE_CTLSTAT, 0));</div><div class='del'>-	radeon_ring_write(rdev, R300_ZC_FLUSH | R300_ZC_FREE);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='del'>-	radeon_ring_write(rdev,</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_DST_PIPE_CONFIG, 0));</div><div class='add'>+	radeon_ring_write(ring, R300_PIPE_AUTO_CONFIG);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_GB_SELECT, 0));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_GB_ENABLE, 0));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='add'>+	radeon_ring_write(ring, R300_RB3D_DC_FLUSH | R300_RB3D_DC_FREE);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_RB3D_ZCACHE_CTLSTAT, 0));</div><div class='add'>+	radeon_ring_write(ring, R300_ZC_FLUSH | R300_ZC_FREE);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RADEON_WAIT_UNTIL, 0));</div><div class='add'>+	radeon_ring_write(ring,</div><div class='ctx'> 			  RADEON_WAIT_2D_IDLECLEAN |</div><div class='ctx'> 			  RADEON_WAIT_3D_IDLECLEAN);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_GB_AA_CONFIG, 0));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='del'>-	radeon_ring_write(rdev, R300_RB3D_DC_FLUSH | R300_RB3D_DC_FREE);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_RB3D_ZCACHE_CTLSTAT, 0));</div><div class='del'>-	radeon_ring_write(rdev, R300_ZC_FLUSH | R300_ZC_FREE);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_GB_MSPOS0, 0));</div><div class='del'>-	radeon_ring_write(rdev,</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_GB_AA_CONFIG, 0));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='add'>+	radeon_ring_write(ring, R300_RB3D_DC_FLUSH | R300_RB3D_DC_FREE);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_RB3D_ZCACHE_CTLSTAT, 0));</div><div class='add'>+	radeon_ring_write(ring, R300_ZC_FLUSH | R300_ZC_FREE);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_GB_MSPOS0, 0));</div><div class='add'>+	radeon_ring_write(ring,</div><div class='ctx'> 			  ((6 &lt;&lt; R300_MS_X0_SHIFT) |</div><div class='ctx'> 			   (6 &lt;&lt; R300_MS_Y0_SHIFT) |</div><div class='ctx'> 			   (6 &lt;&lt; R300_MS_X1_SHIFT) |</div><div class='hunk'>@@ -273,8 +276,8 @@ void r300_ring_start(struct radeon_device *rdev)</div><div class='ctx'> 			   (6 &lt;&lt; R300_MS_Y2_SHIFT) |</div><div class='ctx'> 			   (6 &lt;&lt; R300_MSBD0_Y_SHIFT) |</div><div class='ctx'> 			   (6 &lt;&lt; R300_MSBD0_X_SHIFT)));</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_GB_MSPOS1, 0));</div><div class='del'>-	radeon_ring_write(rdev,</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_GB_MSPOS1, 0));</div><div class='add'>+	radeon_ring_write(ring,</div><div class='ctx'> 			  ((6 &lt;&lt; R300_MS_X3_SHIFT) |</div><div class='ctx'> 			   (6 &lt;&lt; R300_MS_Y3_SHIFT) |</div><div class='ctx'> 			   (6 &lt;&lt; R300_MS_X4_SHIFT) |</div><div class='hunk'>@@ -282,16 +285,16 @@ void r300_ring_start(struct radeon_device *rdev)</div><div class='ctx'> 			   (6 &lt;&lt; R300_MS_X5_SHIFT) |</div><div class='ctx'> 			   (6 &lt;&lt; R300_MS_Y5_SHIFT) |</div><div class='ctx'> 			   (6 &lt;&lt; R300_MSBD1_SHIFT)));</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_GA_ENHANCE, 0));</div><div class='del'>-	radeon_ring_write(rdev, R300_GA_DEADLOCK_CNTL | R300_GA_FASTSYNC_CNTL);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_GA_POLY_MODE, 0));</div><div class='del'>-	radeon_ring_write(rdev,</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_GA_ENHANCE, 0));</div><div class='add'>+	radeon_ring_write(ring, R300_GA_DEADLOCK_CNTL | R300_GA_FASTSYNC_CNTL);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_GA_POLY_MODE, 0));</div><div class='add'>+	radeon_ring_write(ring,</div><div class='ctx'> 			  R300_FRONT_PTYPE_TRIANGE | R300_BACK_PTYPE_TRIANGE);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_GA_ROUND_MODE, 0));</div><div class='del'>-	radeon_ring_write(rdev,</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_GA_ROUND_MODE, 0));</div><div class='add'>+	radeon_ring_write(ring,</div><div class='ctx'> 			  R300_GEOMETRY_ROUND_NEAREST |</div><div class='ctx'> 			  R300_COLOR_ROUND_NEAREST);</div><div class='del'>-	radeon_ring_unlock_commit(rdev);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void r300_errata(struct radeon_device *rdev)</div><div class='hunk'>@@ -375,26 +378,26 @@ void r300_gpu_init(struct radeon_device *rdev)</div><div class='ctx'> 		 rdev-&gt;num_gb_pipes, rdev-&gt;num_z_pipes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool r300_gpu_is_lockup(struct radeon_device *rdev)</div><div class='add'>+bool r300_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring)</div><div class='ctx'> {</div><div class='ctx'> 	u32 rbbm_status;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	rbbm_status = RREG32(R_000E40_RBBM_STATUS);</div><div class='ctx'> 	if (!G_000E40_GUI_ACTIVE(rbbm_status)) {</div><div class='del'>-		r100_gpu_lockup_update(&amp;rdev-&gt;config.r300.lockup, &amp;rdev-&gt;cp);</div><div class='add'>+		r100_gpu_lockup_update(&amp;rdev-&gt;config.r300.lockup, ring);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* force CP activities */</div><div class='del'>-	r = radeon_ring_lock(rdev, 2);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, 2);</div><div class='ctx'> 	if (!r) {</div><div class='ctx'> 		/* PACKET2 NOP */</div><div class='del'>-		radeon_ring_write(rdev, 0x80000000);</div><div class='del'>-		radeon_ring_write(rdev, 0x80000000);</div><div class='del'>-		radeon_ring_unlock_commit(rdev);</div><div class='add'>+		radeon_ring_write(ring, 0x80000000);</div><div class='add'>+		radeon_ring_write(ring, 0x80000000);</div><div class='add'>+		radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> 	}</div><div class='del'>-	rdev-&gt;cp.rptr = RREG32(RADEON_CP_RB_RPTR);</div><div class='del'>-	return r100_gpu_cp_is_lockup(rdev, &amp;rdev-&gt;config.r300.lockup, &amp;rdev-&gt;cp);</div><div class='add'>+	ring-&gt;rptr = RREG32(RADEON_CP_RB_RPTR);</div><div class='add'>+	return r100_gpu_cp_is_lockup(rdev, &amp;rdev-&gt;config.r300.lockup, ring);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int r300_asic_reset(struct radeon_device *rdev)</div><div class='hunk'>@@ -701,7 +704,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p,</div><div class='ctx'> 			return r;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (p-&gt;keep_tiling_flags) {</div><div class='add'>+		if (p-&gt;cs_flags &amp; RADEON_CS_KEEP_TILING_FLAGS) {</div><div class='ctx'> 			ib[idx] = (idx_value &amp; 31) | /* keep the 1st 5 bits */</div><div class='ctx'> 				  ((idx_value &amp; ~31) + (u32)reloc-&gt;lobj.gpu_offset);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -765,7 +768,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p,</div><div class='ctx'> 		/* RB3D_COLORPITCH1 */</div><div class='ctx'> 		/* RB3D_COLORPITCH2 */</div><div class='ctx'> 		/* RB3D_COLORPITCH3 */</div><div class='del'>-		if (!p-&gt;keep_tiling_flags) {</div><div class='add'>+		if (!(p-&gt;cs_flags &amp; RADEON_CS_KEEP_TILING_FLAGS)) {</div><div class='ctx'> 			r = r100_cs_packet_next_reloc(p, &amp;reloc);</div><div class='ctx'> 			if (r) {</div><div class='ctx'> 				DRM_ERROR("No reloc for ib[%d]=0x%04X\n",</div><div class='hunk'>@@ -850,7 +853,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x4F24:</div><div class='ctx'> 		/* ZB_DEPTHPITCH */</div><div class='del'>-		if (!p-&gt;keep_tiling_flags) {</div><div class='add'>+		if (!(p-&gt;cs_flags &amp; RADEON_CS_KEEP_TILING_FLAGS)) {</div><div class='ctx'> 			r = r100_cs_packet_next_reloc(p, &amp;reloc);</div><div class='ctx'> 			if (r) {</div><div class='ctx'> 				DRM_ERROR("No reloc for ib[%d]=0x%04X\n",</div><div class='hunk'>@@ -1396,6 +1399,12 @@ static int r300_startup(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_fence_driver_start_ring(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed initializing CP fences (%d).\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Enable IRQ */</div><div class='ctx'> 	r100_irq_set(rdev);</div><div class='ctx'> 	rdev-&gt;config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);</div><div class='hunk'>@@ -1405,11 +1414,18 @@ static int r300_startup(struct radeon_device *rdev)</div><div class='ctx'> 		dev_err(rdev-&gt;dev, "failed initializing CP (%d).\n", r);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-	r = r100_ib_init(rdev);</div><div class='add'>+</div><div class='add'>+	r = radeon_ib_pool_start(rdev);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	r = r100_ib_test(rdev);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		dev_err(rdev-&gt;dev, "failed initializing IB (%d).\n", r);</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed testing IB (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='ctx'> 		return r;</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'>@@ -1434,11 +1450,14 @@ int r300_resume(struct radeon_device *rdev)</div><div class='ctx'> 	r300_clock_startup(rdev);</div><div class='ctx'> 	/* Initialize surface registers */</div><div class='ctx'> 	radeon_surface_init(rdev);</div><div class='add'>+</div><div class='add'>+	rdev-&gt;accel_working = true;</div><div class='ctx'> 	return r300_startup(rdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int r300_suspend(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	radeon_ib_pool_suspend(rdev);</div><div class='ctx'> 	r100_cp_disable(rdev);</div><div class='ctx'> 	radeon_wb_disable(rdev);</div><div class='ctx'> 	r100_irq_disable(rdev);</div><div class='hunk'>@@ -1539,7 +1558,14 @@ int r300_init(struct radeon_device *rdev)</div><div class='ctx'> 			return r;</div><div class='ctx'> 	}</div><div class='ctx'> 	r300_set_reg_safe(rdev);</div><div class='add'>+</div><div class='add'>+	r = radeon_ib_pool_init(rdev);</div><div class='ctx'> 	rdev-&gt;accel_working = true;</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "IB initialization failed (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	r = r300_startup(rdev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		/* Somethings want wront with the accel init stop accel */</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c<br/>index 417fab81812f..666e28fe509c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r420.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r420.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r420.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/r420.c</a></div><div class='hunk'>@@ -199,6 +199,8 @@ static void r420_clock_resume(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> static void r420_cp_errata_init(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='add'>+</div><div class='ctx'> 	/* RV410 and R420 can lock up if CP DMA to host memory happens</div><div class='ctx'> 	 * while the 2D engine is busy.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -206,22 +208,24 @@ static void r420_cp_errata_init(struct radeon_device *rdev)</div><div class='ctx'> 	 * of the CP init, apparently.</div><div class='ctx'> 	 */</div><div class='ctx'> 	radeon_scratch_get(rdev, &amp;rdev-&gt;config.r300.resync_scratch);</div><div class='del'>-	radeon_ring_lock(rdev, 8);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_CP_RESYNC_ADDR, 1));</div><div class='del'>-	radeon_ring_write(rdev, rdev-&gt;config.r300.resync_scratch);</div><div class='del'>-	radeon_ring_write(rdev, 0xDEADBEEF);</div><div class='del'>-	radeon_ring_unlock_commit(rdev);</div><div class='add'>+	radeon_ring_lock(rdev, ring, 8);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_CP_RESYNC_ADDR, 1));</div><div class='add'>+	radeon_ring_write(ring, rdev-&gt;config.r300.resync_scratch);</div><div class='add'>+	radeon_ring_write(ring, 0xDEADBEEF);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void r420_cp_errata_fini(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='add'>+</div><div class='ctx'> 	/* Catch the RESYNC we dispatched all the way back,</div><div class='ctx'> 	 * at the very beginning of the CP init.</div><div class='ctx'> 	 */</div><div class='del'>-	radeon_ring_lock(rdev, 8);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='del'>-	radeon_ring_write(rdev, R300_RB3D_DC_FINISH);</div><div class='del'>-	radeon_ring_unlock_commit(rdev);</div><div class='add'>+	radeon_ring_lock(rdev, ring, 8);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='add'>+	radeon_ring_write(ring, R300_RB3D_DC_FINISH);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> 	radeon_scratch_free(rdev, rdev-&gt;config.r300.resync_scratch);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -254,6 +258,12 @@ static int r420_startup(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_fence_driver_start_ring(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed initializing CP fences (%d).\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Enable IRQ */</div><div class='ctx'> 	r100_irq_set(rdev);</div><div class='ctx'> 	rdev-&gt;config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);</div><div class='hunk'>@@ -264,11 +274,18 @@ static int r420_startup(struct radeon_device *rdev)</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> 	r420_cp_errata_init(rdev);</div><div class='del'>-	r = r100_ib_init(rdev);</div><div class='add'>+</div><div class='add'>+	r = radeon_ib_pool_start(rdev);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	r = r100_ib_test(rdev);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		dev_err(rdev-&gt;dev, "failed initializing IB (%d).\n", r);</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed testing IB (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='ctx'> 		return r;</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'>@@ -297,11 +314,14 @@ int r420_resume(struct radeon_device *rdev)</div><div class='ctx'> 	r420_clock_resume(rdev);</div><div class='ctx'> 	/* Initialize surface registers */</div><div class='ctx'> 	radeon_surface_init(rdev);</div><div class='add'>+</div><div class='add'>+	rdev-&gt;accel_working = true;</div><div class='ctx'> 	return r420_startup(rdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int r420_suspend(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	radeon_ib_pool_suspend(rdev);</div><div class='ctx'> 	r420_cp_errata_fini(rdev);</div><div class='ctx'> 	r100_cp_disable(rdev);</div><div class='ctx'> 	radeon_wb_disable(rdev);</div><div class='hunk'>@@ -414,7 +434,14 @@ int r420_init(struct radeon_device *rdev)</div><div class='ctx'> 			return r;</div><div class='ctx'> 	}</div><div class='ctx'> 	r420_set_reg_safe(rdev);</div><div class='add'>+</div><div class='add'>+	r = radeon_ib_pool_init(rdev);</div><div class='ctx'> 	rdev-&gt;accel_working = true;</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "IB initialization failed (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	r = r420_startup(rdev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		/* Somethings want wront with the accel init stop accel */</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/r500_reg.h b/drivers/gpu/drm/radeon/r500_reg.h<br/>index fc437059918f..3bd8f1b1c606 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r500_reg.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r500_reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r500_reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/r500_reg.h</a></div><div class='hunk'>@@ -573,6 +573,7 @@</div><div class='ctx'> </div><div class='ctx'> #define AVIVO_TMDSA_CNTL                    0x7880</div><div class='ctx'> #   define AVIVO_TMDSA_CNTL_ENABLE               (1 &lt;&lt; 0)</div><div class='add'>+#   define AVIVO_TMDSA_CNTL_HDMI_EN              (1 &lt;&lt; 2)</div><div class='ctx'> #   define AVIVO_TMDSA_CNTL_HPD_MASK             (1 &lt;&lt; 4)</div><div class='ctx'> #   define AVIVO_TMDSA_CNTL_HPD_SELECT           (1 &lt;&lt; 8)</div><div class='ctx'> #   define AVIVO_TMDSA_CNTL_SYNC_PHASE           (1 &lt;&lt; 12)</div><div class='hunk'>@@ -633,6 +634,7 @@</div><div class='ctx'> </div><div class='ctx'> #define AVIVO_LVTMA_CNTL					0x7a80</div><div class='ctx'> #   define AVIVO_LVTMA_CNTL_ENABLE               (1 &lt;&lt; 0)</div><div class='add'>+#   define AVIVO_LVTMA_CNTL_HDMI_EN              (1 &lt;&lt; 2)</div><div class='ctx'> #   define AVIVO_LVTMA_CNTL_HPD_MASK             (1 &lt;&lt; 4)</div><div class='ctx'> #   define AVIVO_LVTMA_CNTL_HPD_SELECT           (1 &lt;&lt; 8)</div><div class='ctx'> #   define AVIVO_LVTMA_CNTL_SYNC_PHASE           (1 &lt;&lt; 12)</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c<br/>index 3081d07f8de5..4ae1615e752f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r520.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r520.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r520.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/r520.c</a></div><div class='hunk'>@@ -187,6 +187,12 @@ static int r520_startup(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_fence_driver_start_ring(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed initializing CP fences (%d).\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Enable IRQ */</div><div class='ctx'> 	rs600_irq_set(rdev);</div><div class='ctx'> 	rdev-&gt;config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);</div><div class='hunk'>@@ -196,9 +202,15 @@ static int r520_startup(struct radeon_device *rdev)</div><div class='ctx'> 		dev_err(rdev-&gt;dev, "failed initializing CP (%d).\n", r);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-	r = r100_ib_init(rdev);</div><div class='add'>+</div><div class='add'>+	r = radeon_ib_pool_start(rdev);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	r = r100_ib_test(rdev);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		dev_err(rdev-&gt;dev, "failed initializing IB (%d).\n", r);</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed testing IB (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -223,6 +235,8 @@ int r520_resume(struct radeon_device *rdev)</div><div class='ctx'> 	rv515_clock_startup(rdev);</div><div class='ctx'> 	/* Initialize surface registers */</div><div class='ctx'> 	radeon_surface_init(rdev);</div><div class='add'>+</div><div class='add'>+	rdev-&gt;accel_working = true;</div><div class='ctx'> 	return r520_startup(rdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -292,7 +306,14 @@ int r520_init(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> 	rv515_set_safe_registers(rdev);</div><div class='add'>+</div><div class='add'>+	r = radeon_ib_pool_init(rdev);</div><div class='ctx'> 	rdev-&gt;accel_working = true;</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "IB initialization failed (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	r = r520_startup(rdev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		/* Somethings want wront with the accel init stop accel */</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c<br/>index 9cdda0b3b081..4f08e5e6ee9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r600.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r600.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r600.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/r600.c</a></div><div class='hunk'>@@ -1344,7 +1344,7 @@ int r600_gpu_soft_reset(struct radeon_device *rdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool r600_gpu_is_lockup(struct radeon_device *rdev)</div><div class='add'>+bool r600_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring)</div><div class='ctx'> {</div><div class='ctx'> 	u32 srbm_status;</div><div class='ctx'> 	u32 grbm_status;</div><div class='hunk'>@@ -1361,19 +1361,19 @@ bool r600_gpu_is_lockup(struct radeon_device *rdev)</div><div class='ctx'> 	grbm_status = RREG32(R_008010_GRBM_STATUS);</div><div class='ctx'> 	grbm_status2 = RREG32(R_008014_GRBM_STATUS2);</div><div class='ctx'> 	if (!G_008010_GUI_ACTIVE(grbm_status)) {</div><div class='del'>-		r100_gpu_lockup_update(lockup, &amp;rdev-&gt;cp);</div><div class='add'>+		r100_gpu_lockup_update(lockup, ring);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* force CP activities */</div><div class='del'>-	r = radeon_ring_lock(rdev, 2);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, 2);</div><div class='ctx'> 	if (!r) {</div><div class='ctx'> 		/* PACKET2 NOP */</div><div class='del'>-		radeon_ring_write(rdev, 0x80000000);</div><div class='del'>-		radeon_ring_write(rdev, 0x80000000);</div><div class='del'>-		radeon_ring_unlock_commit(rdev);</div><div class='add'>+		radeon_ring_write(ring, 0x80000000);</div><div class='add'>+		radeon_ring_write(ring, 0x80000000);</div><div class='add'>+		radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> 	}</div><div class='del'>-	rdev-&gt;cp.rptr = RREG32(R600_CP_RB_RPTR);</div><div class='del'>-	return r100_gpu_cp_is_lockup(rdev, lockup, &amp;rdev-&gt;cp);</div><div class='add'>+	ring-&gt;rptr = RREG32(ring-&gt;rptr_reg);</div><div class='add'>+	return r100_gpu_cp_is_lockup(rdev, lockup, ring);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int r600_asic_reset(struct radeon_device *rdev)</div><div class='hunk'>@@ -2144,27 +2144,28 @@ static int r600_cp_load_microcode(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> int r600_cp_start(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	int r;</div><div class='ctx'> 	uint32_t cp_me;</div><div class='ctx'> </div><div class='del'>-	r = radeon_ring_lock(rdev, 7);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, 7);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		DRM_ERROR("radeon: cp failed to lock ring (%d).\n", r);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_ME_INITIALIZE, 5));</div><div class='del'>-	radeon_ring_write(rdev, 0x1);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_ME_INITIALIZE, 5));</div><div class='add'>+	radeon_ring_write(ring, 0x1);</div><div class='ctx'> 	if (rdev-&gt;family &gt;= CHIP_RV770) {</div><div class='del'>-		radeon_ring_write(rdev, 0x0);</div><div class='del'>-		radeon_ring_write(rdev, rdev-&gt;config.rv770.max_hw_contexts - 1);</div><div class='add'>+		radeon_ring_write(ring, 0x0);</div><div class='add'>+		radeon_ring_write(ring, rdev-&gt;config.rv770.max_hw_contexts - 1);</div><div class='ctx'> 	} else {</div><div class='del'>-		radeon_ring_write(rdev, 0x3);</div><div class='del'>-		radeon_ring_write(rdev, rdev-&gt;config.r600.max_hw_contexts - 1);</div><div class='add'>+		radeon_ring_write(ring, 0x3);</div><div class='add'>+		radeon_ring_write(ring, rdev-&gt;config.r600.max_hw_contexts - 1);</div><div class='ctx'> 	}</div><div class='del'>-	radeon_ring_write(rdev, PACKET3_ME_INITIALIZE_DEVICE_ID(1));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_unlock_commit(rdev);</div><div class='add'>+	radeon_ring_write(ring, PACKET3_ME_INITIALIZE_DEVICE_ID(1));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> </div><div class='ctx'> 	cp_me = 0xff;</div><div class='ctx'> 	WREG32(R_0086D8_CP_ME_CNTL, cp_me);</div><div class='hunk'>@@ -2173,6 +2174,7 @@ int r600_cp_start(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> int r600_cp_resume(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> 	u32 rb_bufsz;</div><div class='ctx'> 	int r;</div><div class='hunk'>@@ -2184,13 +2186,13 @@ int r600_cp_resume(struct radeon_device *rdev)</div><div class='ctx'> 	WREG32(GRBM_SOFT_RESET, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Set ring buffer size */</div><div class='del'>-	rb_bufsz = drm_order(rdev-&gt;cp.ring_size / 8);</div><div class='add'>+	rb_bufsz = drm_order(ring-&gt;ring_size / 8);</div><div class='ctx'> 	tmp = (drm_order(RADEON_GPU_PAGE_SIZE/8) &lt;&lt; 8) | rb_bufsz;</div><div class='ctx'> #ifdef __BIG_ENDIAN</div><div class='ctx'> 	tmp |= BUF_SWAP_32BIT;</div><div class='ctx'> #endif</div><div class='ctx'> 	WREG32(CP_RB_CNTL, tmp);</div><div class='del'>-	WREG32(CP_SEM_WAIT_TIMER, 0x4);</div><div class='add'>+	WREG32(CP_SEM_WAIT_TIMER, 0x0);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the write pointer delay */</div><div class='ctx'> 	WREG32(CP_RB_WPTR_DELAY, 0);</div><div class='hunk'>@@ -2198,8 +2200,8 @@ int r600_cp_resume(struct radeon_device *rdev)</div><div class='ctx'> 	/* Initialize the ring buffer's read and write pointers */</div><div class='ctx'> 	WREG32(CP_RB_CNTL, tmp | RB_RPTR_WR_ENA);</div><div class='ctx'> 	WREG32(CP_RB_RPTR_WR, 0);</div><div class='del'>-	rdev-&gt;cp.wptr = 0;</div><div class='del'>-	WREG32(CP_RB_WPTR, rdev-&gt;cp.wptr);</div><div class='add'>+	ring-&gt;wptr = 0;</div><div class='add'>+	WREG32(CP_RB_WPTR, ring-&gt;wptr);</div><div class='ctx'> </div><div class='ctx'> 	/* set the wb address whether it's enabled or not */</div><div class='ctx'> 	WREG32(CP_RB_RPTR_ADDR,</div><div class='hunk'>@@ -2217,42 +2219,36 @@ int r600_cp_resume(struct radeon_device *rdev)</div><div class='ctx'> 	mdelay(1);</div><div class='ctx'> 	WREG32(CP_RB_CNTL, tmp);</div><div class='ctx'> </div><div class='del'>-	WREG32(CP_RB_BASE, rdev-&gt;cp.gpu_addr &gt;&gt; 8);</div><div class='add'>+	WREG32(CP_RB_BASE, ring-&gt;gpu_addr &gt;&gt; 8);</div><div class='ctx'> 	WREG32(CP_DEBUG, (1 &lt;&lt; 27) | (1 &lt;&lt; 28));</div><div class='ctx'> </div><div class='del'>-	rdev-&gt;cp.rptr = RREG32(CP_RB_RPTR);</div><div class='add'>+	ring-&gt;rptr = RREG32(CP_RB_RPTR);</div><div class='ctx'> </div><div class='ctx'> 	r600_cp_start(rdev);</div><div class='del'>-	rdev-&gt;cp.ready = true;</div><div class='del'>-	r = radeon_ring_test(rdev);</div><div class='add'>+	ring-&gt;ready = true;</div><div class='add'>+	r = radeon_ring_test(rdev, ring);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		rdev-&gt;cp.ready = false;</div><div class='add'>+		ring-&gt;ready = false;</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void r600_cp_commit(struct radeon_device *rdev)</div><div class='del'>-{</div><div class='del'>-	WREG32(CP_RB_WPTR, rdev-&gt;cp.wptr);</div><div class='del'>-	(void)RREG32(CP_RB_WPTR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void r600_ring_init(struct radeon_device *rdev, unsigned ring_size)</div><div class='add'>+void r600_ring_init(struct radeon_device *rdev, struct radeon_ring *ring, unsigned ring_size)</div><div class='ctx'> {</div><div class='ctx'> 	u32 rb_bufsz;</div><div class='ctx'> </div><div class='ctx'> 	/* Align ring size */</div><div class='ctx'> 	rb_bufsz = drm_order(ring_size / 8);</div><div class='ctx'> 	ring_size = (1 &lt;&lt; (rb_bufsz + 1)) * 4;</div><div class='del'>-	rdev-&gt;cp.ring_size = ring_size;</div><div class='del'>-	rdev-&gt;cp.align_mask = 16 - 1;</div><div class='add'>+	ring-&gt;ring_size = ring_size;</div><div class='add'>+	ring-&gt;align_mask = 16 - 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void r600_cp_fini(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	r600_cp_stop(rdev);</div><div class='del'>-	radeon_ring_fini(rdev);</div><div class='add'>+	radeon_ring_fini(rdev, &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2271,11 +2267,11 @@ void r600_scratch_init(struct radeon_device *rdev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int r600_ring_test(struct radeon_device *rdev)</div><div class='add'>+int r600_ring_test(struct radeon_device *rdev, struct radeon_ring *ring)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t scratch;</div><div class='ctx'> 	uint32_t tmp = 0;</div><div class='del'>-	unsigned i;</div><div class='add'>+	unsigned i, ridx = radeon_ring_index(rdev, ring);</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	r = radeon_scratch_get(rdev, &amp;scratch);</div><div class='hunk'>@@ -2284,16 +2280,16 @@ int r600_ring_test(struct radeon_device *rdev)</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> 	WREG32(scratch, 0xCAFEDEAD);</div><div class='del'>-	r = radeon_ring_lock(rdev, 3);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, 3);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		DRM_ERROR("radeon: cp failed to lock ring (%d).\n", r);</div><div class='add'>+		DRM_ERROR("radeon: cp failed to lock ring %d (%d).\n", ridx, r);</div><div class='ctx'> 		radeon_scratch_free(rdev, scratch);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONFIG_REG, 1));</div><div class='del'>-	radeon_ring_write(rdev, ((scratch - PACKET3_SET_CONFIG_REG_OFFSET) &gt;&gt; 2));</div><div class='del'>-	radeon_ring_write(rdev, 0xDEADBEEF);</div><div class='del'>-	radeon_ring_unlock_commit(rdev);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, ((scratch - PACKET3_SET_CONFIG_REG_OFFSET) &gt;&gt; 2));</div><div class='add'>+	radeon_ring_write(ring, 0xDEADBEEF);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> 	for (i = 0; i &lt; rdev-&gt;usec_timeout; i++) {</div><div class='ctx'> 		tmp = RREG32(scratch);</div><div class='ctx'> 		if (tmp == 0xDEADBEEF)</div><div class='hunk'>@@ -2301,10 +2297,10 @@ int r600_ring_test(struct radeon_device *rdev)</div><div class='ctx'> 		DRM_UDELAY(1);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (i &lt; rdev-&gt;usec_timeout) {</div><div class='del'>-		DRM_INFO("ring test succeeded in %d usecs\n", i);</div><div class='add'>+		DRM_INFO("ring test on %d succeeded in %d usecs\n", ridx, i);</div><div class='ctx'> 	} else {</div><div class='del'>-		DRM_ERROR("radeon: ring test failed (scratch(0x%04X)=0x%08X)\n",</div><div class='del'>-			  scratch, tmp);</div><div class='add'>+		DRM_ERROR("radeon: ring %d test failed (scratch(0x%04X)=0x%08X)\n",</div><div class='add'>+			  ridx, scratch, tmp);</div><div class='ctx'> 		r = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	radeon_scratch_free(rdev, scratch);</div><div class='hunk'>@@ -2314,49 +2310,63 @@ int r600_ring_test(struct radeon_device *rdev)</div><div class='ctx'> void r600_fence_ring_emit(struct radeon_device *rdev,</div><div class='ctx'> 			  struct radeon_fence *fence)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[fence-&gt;ring];</div><div class='add'>+</div><div class='ctx'> 	if (rdev-&gt;wb.use_event) {</div><div class='del'>-		u64 addr = rdev-&gt;wb.gpu_addr + R600_WB_EVENT_OFFSET +</div><div class='del'>-			(u64)(rdev-&gt;fence_drv.scratch_reg - rdev-&gt;scratch.reg_base);</div><div class='add'>+		u64 addr = rdev-&gt;fence_drv[fence-&gt;ring].gpu_addr;</div><div class='ctx'> 		/* flush read cache over gart */</div><div class='del'>-		radeon_ring_write(rdev, PACKET3(PACKET3_SURFACE_SYNC, 3));</div><div class='del'>-		radeon_ring_write(rdev, PACKET3_TC_ACTION_ENA |</div><div class='add'>+		radeon_ring_write(ring, PACKET3(PACKET3_SURFACE_SYNC, 3));</div><div class='add'>+		radeon_ring_write(ring, PACKET3_TC_ACTION_ENA |</div><div class='ctx'> 					PACKET3_VC_ACTION_ENA |</div><div class='ctx'> 					PACKET3_SH_ACTION_ENA);</div><div class='del'>-		radeon_ring_write(rdev, 0xFFFFFFFF);</div><div class='del'>-		radeon_ring_write(rdev, 0);</div><div class='del'>-		radeon_ring_write(rdev, 10); /* poll interval */</div><div class='add'>+		radeon_ring_write(ring, 0xFFFFFFFF);</div><div class='add'>+		radeon_ring_write(ring, 0);</div><div class='add'>+		radeon_ring_write(ring, 10); /* poll interval */</div><div class='ctx'> 		/* EVENT_WRITE_EOP - flush caches, send int */</div><div class='del'>-		radeon_ring_write(rdev, PACKET3(PACKET3_EVENT_WRITE_EOP, 4));</div><div class='del'>-		radeon_ring_write(rdev, EVENT_TYPE(CACHE_FLUSH_AND_INV_EVENT_TS) | EVENT_INDEX(5));</div><div class='del'>-		radeon_ring_write(rdev, addr &amp; 0xffffffff);</div><div class='del'>-		radeon_ring_write(rdev, (upper_32_bits(addr) &amp; 0xff) | DATA_SEL(1) | INT_SEL(2));</div><div class='del'>-		radeon_ring_write(rdev, fence-&gt;seq);</div><div class='del'>-		radeon_ring_write(rdev, 0);</div><div class='add'>+		radeon_ring_write(ring, PACKET3(PACKET3_EVENT_WRITE_EOP, 4));</div><div class='add'>+		radeon_ring_write(ring, EVENT_TYPE(CACHE_FLUSH_AND_INV_EVENT_TS) | EVENT_INDEX(5));</div><div class='add'>+		radeon_ring_write(ring, addr &amp; 0xffffffff);</div><div class='add'>+		radeon_ring_write(ring, (upper_32_bits(addr) &amp; 0xff) | DATA_SEL(1) | INT_SEL(2));</div><div class='add'>+		radeon_ring_write(ring, fence-&gt;seq);</div><div class='add'>+		radeon_ring_write(ring, 0);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* flush read cache over gart */</div><div class='del'>-		radeon_ring_write(rdev, PACKET3(PACKET3_SURFACE_SYNC, 3));</div><div class='del'>-		radeon_ring_write(rdev, PACKET3_TC_ACTION_ENA |</div><div class='add'>+		radeon_ring_write(ring, PACKET3(PACKET3_SURFACE_SYNC, 3));</div><div class='add'>+		radeon_ring_write(ring, PACKET3_TC_ACTION_ENA |</div><div class='ctx'> 					PACKET3_VC_ACTION_ENA |</div><div class='ctx'> 					PACKET3_SH_ACTION_ENA);</div><div class='del'>-		radeon_ring_write(rdev, 0xFFFFFFFF);</div><div class='del'>-		radeon_ring_write(rdev, 0);</div><div class='del'>-		radeon_ring_write(rdev, 10); /* poll interval */</div><div class='del'>-		radeon_ring_write(rdev, PACKET3(PACKET3_EVENT_WRITE, 0));</div><div class='del'>-		radeon_ring_write(rdev, EVENT_TYPE(CACHE_FLUSH_AND_INV_EVENT) | EVENT_INDEX(0));</div><div class='add'>+		radeon_ring_write(ring, 0xFFFFFFFF);</div><div class='add'>+		radeon_ring_write(ring, 0);</div><div class='add'>+		radeon_ring_write(ring, 10); /* poll interval */</div><div class='add'>+		radeon_ring_write(ring, PACKET3(PACKET3_EVENT_WRITE, 0));</div><div class='add'>+		radeon_ring_write(ring, EVENT_TYPE(CACHE_FLUSH_AND_INV_EVENT) | EVENT_INDEX(0));</div><div class='ctx'> 		/* wait for 3D idle clean */</div><div class='del'>-		radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONFIG_REG, 1));</div><div class='del'>-		radeon_ring_write(rdev, (WAIT_UNTIL - PACKET3_SET_CONFIG_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-		radeon_ring_write(rdev, WAIT_3D_IDLE_bit | WAIT_3D_IDLECLEAN_bit);</div><div class='add'>+		radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));</div><div class='add'>+		radeon_ring_write(ring, (WAIT_UNTIL - PACKET3_SET_CONFIG_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+		radeon_ring_write(ring, WAIT_3D_IDLE_bit | WAIT_3D_IDLECLEAN_bit);</div><div class='ctx'> 		/* Emit fence sequence &amp; fire IRQ */</div><div class='del'>-		radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONFIG_REG, 1));</div><div class='del'>-		radeon_ring_write(rdev, ((rdev-&gt;fence_drv.scratch_reg - PACKET3_SET_CONFIG_REG_OFFSET) &gt;&gt; 2));</div><div class='del'>-		radeon_ring_write(rdev, fence-&gt;seq);</div><div class='add'>+		radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));</div><div class='add'>+		radeon_ring_write(ring, ((rdev-&gt;fence_drv[fence-&gt;ring].scratch_reg - PACKET3_SET_CONFIG_REG_OFFSET) &gt;&gt; 2));</div><div class='add'>+		radeon_ring_write(ring, fence-&gt;seq);</div><div class='ctx'> 		/* CP_INTERRUPT packet 3 no longer exists, use packet 0 */</div><div class='del'>-		radeon_ring_write(rdev, PACKET0(CP_INT_STATUS, 0));</div><div class='del'>-		radeon_ring_write(rdev, RB_INT_STAT);</div><div class='add'>+		radeon_ring_write(ring, PACKET0(CP_INT_STATUS, 0));</div><div class='add'>+		radeon_ring_write(ring, RB_INT_STAT);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void r600_semaphore_ring_emit(struct radeon_device *rdev,</div><div class='add'>+			      struct radeon_ring *ring,</div><div class='add'>+			      struct radeon_semaphore *semaphore,</div><div class='add'>+			      bool emit_wait)</div><div class='add'>+{</div><div class='add'>+	uint64_t addr = semaphore-&gt;gpu_addr;</div><div class='add'>+	unsigned sel = emit_wait ? PACKET3_SEM_SEL_WAIT : PACKET3_SEM_SEL_SIGNAL;</div><div class='add'>+</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_MEM_SEMAPHORE, 1));</div><div class='add'>+	radeon_ring_write(ring, addr &amp; 0xffffffff);</div><div class='add'>+	radeon_ring_write(ring, (upper_32_bits(addr) &amp; 0xff) | sel);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int r600_copy_blit(struct radeon_device *rdev,</div><div class='ctx'> 		   uint64_t src_offset,</div><div class='ctx'> 		   uint64_t dst_offset,</div><div class='hunk'>@@ -2409,6 +2419,7 @@ void r600_clear_surface_reg(struct radeon_device *rdev, int reg)</div><div class='ctx'> </div><div class='ctx'> int r600_startup(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	/* enable pcie gen2 link */</div><div class='hunk'>@@ -2447,6 +2458,12 @@ int r600_startup(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_fence_driver_start_ring(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed initializing CP fences (%d).\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Enable IRQ */</div><div class='ctx'> 	r = r600_irq_init(rdev);</div><div class='ctx'> 	if (r) {</div><div class='hunk'>@@ -2456,7 +2473,10 @@ int r600_startup(struct radeon_device *rdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	r600_irq_set(rdev);</div><div class='ctx'> </div><div class='del'>-	r = radeon_ring_init(rdev, rdev-&gt;cp.ring_size);</div><div class='add'>+	r = radeon_ring_init(rdev, ring, ring-&gt;ring_size, RADEON_WB_CP_RPTR_OFFSET,</div><div class='add'>+			     R600_CP_RB_RPTR, R600_CP_RB_WPTR,</div><div class='add'>+			     0, 0xfffff, RADEON_CP_PACKET2);</div><div class='add'>+</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> 	r = r600_cp_load_microcode(rdev);</div><div class='hunk'>@@ -2466,6 +2486,17 @@ int r600_startup(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_ib_pool_start(rdev);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	r = r600_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("radeon: failed testing IB (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='add'>+		return r;</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'>@@ -2494,18 +2525,13 @@ int r600_resume(struct radeon_device *rdev)</div><div class='ctx'> 	/* post card */</div><div class='ctx'> 	atom_asic_init(rdev-&gt;mode_info.atom_context);</div><div class='ctx'> </div><div class='add'>+	rdev-&gt;accel_working = true;</div><div class='ctx'> 	r = r600_startup(rdev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		DRM_ERROR("r600 startup failed on resume\n");</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	r = r600_ib_test(rdev);</div><div class='del'>-	if (r) {</div><div class='del'>-		DRM_ERROR("radeon: failed testing IB (%d).\n", r);</div><div class='del'>-		return r;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	r = r600_audio_init(rdev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		DRM_ERROR("radeon: audio resume failed\n");</div><div class='hunk'>@@ -2518,13 +2544,14 @@ int r600_resume(struct radeon_device *rdev)</div><div class='ctx'> int r600_suspend(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	r600_audio_fini(rdev);</div><div class='add'>+	radeon_ib_pool_suspend(rdev);</div><div class='add'>+	r600_blit_suspend(rdev);</div><div class='ctx'> 	/* FIXME: we should wait for ring to be empty */</div><div class='ctx'> 	r600_cp_stop(rdev);</div><div class='del'>-	rdev-&gt;cp.ready = false;</div><div class='add'>+	rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX].ready = false;</div><div class='ctx'> 	r600_irq_suspend(rdev);</div><div class='ctx'> 	radeon_wb_disable(rdev);</div><div class='ctx'> 	r600_pcie_gart_disable(rdev);</div><div class='del'>-	r600_blit_suspend(rdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2595,8 +2622,8 @@ int r600_init(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='del'>-	rdev-&gt;cp.ring_obj = NULL;</div><div class='del'>-	r600_ring_init(rdev, 1024 * 1024);</div><div class='add'>+	rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX].ring_obj = NULL;</div><div class='add'>+	r600_ring_init(rdev, &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX], 1024 * 1024);</div><div class='ctx'> </div><div class='ctx'> 	rdev-&gt;ih.ring_obj = NULL;</div><div class='ctx'> 	r600_ih_ring_init(rdev, 64 * 1024);</div><div class='hunk'>@@ -2605,30 +2632,24 @@ int r600_init(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_ib_pool_init(rdev);</div><div class='ctx'> 	rdev-&gt;accel_working = true;</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "IB initialization failed (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	r = r600_startup(rdev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		dev_err(rdev-&gt;dev, "disabling GPU acceleration\n");</div><div class='ctx'> 		r600_cp_fini(rdev);</div><div class='ctx'> 		r600_irq_fini(rdev);</div><div class='ctx'> 		radeon_wb_fini(rdev);</div><div class='add'>+		r100_ib_fini(rdev);</div><div class='ctx'> 		radeon_irq_kms_fini(rdev);</div><div class='ctx'> 		r600_pcie_gart_fini(rdev);</div><div class='ctx'> 		rdev-&gt;accel_working = false;</div><div class='ctx'> 	}</div><div class='del'>-	if (rdev-&gt;accel_working) {</div><div class='del'>-		r = radeon_ib_pool_init(rdev);</div><div class='del'>-		if (r) {</div><div class='del'>-			dev_err(rdev-&gt;dev, "IB initialization failed (%d).\n", r);</div><div class='del'>-			rdev-&gt;accel_working = false;</div><div class='del'>-		} else {</div><div class='del'>-			r = r600_ib_test(rdev);</div><div class='del'>-			if (r) {</div><div class='del'>-				dev_err(rdev-&gt;dev, "IB test failed (%d).\n", r);</div><div class='del'>-				rdev-&gt;accel_working = false;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	r = r600_audio_init(rdev);</div><div class='ctx'> 	if (r)</div><div class='hunk'>@@ -2643,12 +2664,13 @@ void r600_fini(struct radeon_device *rdev)</div><div class='ctx'> 	r600_cp_fini(rdev);</div><div class='ctx'> 	r600_irq_fini(rdev);</div><div class='ctx'> 	radeon_wb_fini(rdev);</div><div class='del'>-	radeon_ib_pool_fini(rdev);</div><div class='add'>+	r100_ib_fini(rdev);</div><div class='ctx'> 	radeon_irq_kms_fini(rdev);</div><div class='ctx'> 	r600_pcie_gart_fini(rdev);</div><div class='ctx'> 	r600_vram_scratch_fini(rdev);</div><div class='ctx'> 	radeon_agp_fini(rdev);</div><div class='ctx'> 	radeon_gem_fini(rdev);</div><div class='add'>+	radeon_semaphore_driver_fini(rdev);</div><div class='ctx'> 	radeon_fence_driver_fini(rdev);</div><div class='ctx'> 	radeon_bo_fini(rdev);</div><div class='ctx'> 	radeon_atombios_fini(rdev);</div><div class='hunk'>@@ -2662,18 +2684,20 @@ void r600_fini(struct radeon_device *rdev)</div><div class='ctx'>  */</div><div class='ctx'> void r600_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[ib-&gt;fence-&gt;ring];</div><div class='add'>+</div><div class='ctx'> 	/* FIXME: implement */</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_INDIRECT_BUFFER, 2));</div><div class='del'>-	radeon_ring_write(rdev,</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_INDIRECT_BUFFER, 2));</div><div class='add'>+	radeon_ring_write(ring,</div><div class='ctx'> #ifdef __BIG_ENDIAN</div><div class='ctx'> 			  (2 &lt;&lt; 0) |</div><div class='ctx'> #endif</div><div class='ctx'> 			  (ib-&gt;gpu_addr &amp; 0xFFFFFFFC));</div><div class='del'>-	radeon_ring_write(rdev, upper_32_bits(ib-&gt;gpu_addr) &amp; 0xFF);</div><div class='del'>-	radeon_ring_write(rdev, ib-&gt;length_dw);</div><div class='add'>+	radeon_ring_write(ring, upper_32_bits(ib-&gt;gpu_addr) &amp; 0xFF);</div><div class='add'>+	radeon_ring_write(ring, ib-&gt;length_dw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int r600_ib_test(struct radeon_device *rdev)</div><div class='add'>+int r600_ib_test(struct radeon_device *rdev, int ring)</div><div class='ctx'> {</div><div class='ctx'> 	struct radeon_ib *ib;</div><div class='ctx'> 	uint32_t scratch;</div><div class='hunk'>@@ -2687,7 +2711,7 @@ int r600_ib_test(struct radeon_device *rdev)</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> 	WREG32(scratch, 0xCAFEDEAD);</div><div class='del'>-	r = radeon_ib_get(rdev, &amp;ib);</div><div class='add'>+	r = radeon_ib_get(rdev, ring, &amp;ib, 256);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		DRM_ERROR("radeon: failed to get ib (%d).\n", r);</div><div class='ctx'> 		return r;</div><div class='hunk'>@@ -2728,7 +2752,7 @@ int r600_ib_test(struct radeon_device *rdev)</div><div class='ctx'> 		DRM_UDELAY(1);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (i &lt; rdev-&gt;usec_timeout) {</div><div class='del'>-		DRM_INFO("ib test succeeded in %u usecs\n", i);</div><div class='add'>+		DRM_INFO("ib test on ring %d succeeded in %u usecs\n", ib-&gt;fence-&gt;ring, i);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		DRM_ERROR("radeon: ib test failed (scratch(0x%04X)=0x%08X)\n",</div><div class='ctx'> 			  scratch, tmp);</div><div class='hunk'>@@ -3075,7 +3099,7 @@ int r600_irq_set(struct radeon_device *rdev)</div><div class='ctx'> 		hpd3 = RREG32(DC_HOT_PLUG_DETECT3_INT_CONTROL) &amp; ~DC_HPDx_INT_EN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rdev-&gt;irq.sw_int) {</div><div class='add'>+	if (rdev-&gt;irq.sw_int[RADEON_RING_TYPE_GFX_INDEX]) {</div><div class='ctx'> 		DRM_DEBUG("r600_irq_set: sw int\n");</div><div class='ctx'> 		cp_int_cntl |= RB_INT_ENABLE;</div><div class='ctx'> 		cp_int_cntl |= TIME_STAMP_INT_ENABLE;</div><div class='hunk'>@@ -3459,11 +3483,11 @@ restart_ih:</div><div class='ctx'> 		case 177: /* CP_INT in IB1 */</div><div class='ctx'> 		case 178: /* CP_INT in IB2 */</div><div class='ctx'> 			DRM_DEBUG("IH: CP int: 0x%08x\n", src_data);</div><div class='del'>-			radeon_fence_process(rdev);</div><div class='add'>+			radeon_fence_process(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 181: /* CP EOP event */</div><div class='ctx'> 			DRM_DEBUG("IH: CP EOP\n");</div><div class='del'>-			radeon_fence_process(rdev);</div><div class='add'>+			radeon_fence_process(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 233: /* GUI IDLE */</div><div class='ctx'> 			DRM_DEBUG("IH: GUI idle\n");</div><div class='hunk'>@@ -3496,30 +3520,6 @@ restart_ih:</div><div class='ctx'>  */</div><div class='ctx'> #if defined(CONFIG_DEBUG_FS)</div><div class='ctx'> </div><div class='del'>-static int r600_debugfs_cp_ring_info(struct seq_file *m, void *data)</div><div class='del'>-{</div><div class='del'>-	struct drm_info_node *node = (struct drm_info_node *) m-&gt;private;</div><div class='del'>-	struct drm_device *dev = node-&gt;minor-&gt;dev;</div><div class='del'>-	struct radeon_device *rdev = dev-&gt;dev_private;</div><div class='del'>-	unsigned count, i, j;</div><div class='del'>-</div><div class='del'>-	radeon_ring_free_size(rdev);</div><div class='del'>-	count = (rdev-&gt;cp.ring_size / 4) - rdev-&gt;cp.ring_free_dw;</div><div class='del'>-	seq_printf(m, "CP_STAT 0x%08x\n", RREG32(CP_STAT));</div><div class='del'>-	seq_printf(m, "CP_RB_WPTR 0x%08x\n", RREG32(CP_RB_WPTR));</div><div class='del'>-	seq_printf(m, "CP_RB_RPTR 0x%08x\n", RREG32(CP_RB_RPTR));</div><div class='del'>-	seq_printf(m, "driver's copy of the CP_RB_WPTR 0x%08x\n", rdev-&gt;cp.wptr);</div><div class='del'>-	seq_printf(m, "driver's copy of the CP_RB_RPTR 0x%08x\n", rdev-&gt;cp.rptr);</div><div class='del'>-	seq_printf(m, "%u free dwords in ring\n", rdev-&gt;cp.ring_free_dw);</div><div class='del'>-	seq_printf(m, "%u dwords in ring\n", count);</div><div class='del'>-	i = rdev-&gt;cp.rptr;</div><div class='del'>-	for (j = 0; j &lt;= count; j++) {</div><div class='del'>-		seq_printf(m, "r[%04d]=0x%08x\n", i, rdev-&gt;cp.ring[i]);</div><div class='del'>-		i = (i + 1) &amp; rdev-&gt;cp.ptr_mask;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int r600_debugfs_mc_info(struct seq_file *m, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_info_node *node = (struct drm_info_node *) m-&gt;private;</div><div class='hunk'>@@ -3533,7 +3533,6 @@ static int r600_debugfs_mc_info(struct seq_file *m, void *data)</div><div class='ctx'> </div><div class='ctx'> static struct drm_info_list r600_mc_info_list[] = {</div><div class='ctx'> 	{"r600_mc_info", r600_debugfs_mc_info, 0, NULL},</div><div class='del'>-	{"r600_ring_info", r600_debugfs_cp_ring_info, 0, NULL},</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c<br/>index 846fae576399..ba66f3093d46 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r600_audio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r600_audio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r600_audio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/r600_audio.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'>  */</div><div class='ctx'> static int r600_audio_chipset_supported(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='del'>-	return (rdev-&gt;family &gt;= CHIP_R600 &amp;&amp; rdev-&gt;family &lt; CHIP_CEDAR)</div><div class='add'>+	return (rdev-&gt;family &gt;= CHIP_R600 &amp;&amp; !ASIC_IS_DCE5(rdev))</div><div class='ctx'> 		|| rdev-&gt;family == CHIP_RS600</div><div class='ctx'> 		|| rdev-&gt;family == CHIP_RS690</div><div class='ctx'> 		|| rdev-&gt;family == CHIP_RS740;</div><div class='hunk'>@@ -161,8 +161,18 @@ static void r600_audio_update_hdmi(unsigned long param)</div><div class='ctx'>  */</div><div class='ctx'> static void r600_audio_engine_enable(struct radeon_device *rdev, bool enable)</div><div class='ctx'> {</div><div class='add'>+	u32 value = 0;</div><div class='ctx'> 	DRM_INFO("%s audio support\n", enable ? "Enabling" : "Disabling");</div><div class='del'>-	WREG32_P(R600_AUDIO_ENABLE, enable ? 0x81000000 : 0x0, ~0x81000000);</div><div class='add'>+	if (ASIC_IS_DCE4(rdev)) {</div><div class='add'>+		if (enable) {</div><div class='add'>+			value |= 0x81000000; /* Required to enable audio */</div><div class='add'>+			value |= 0x0e1000f0; /* fglrx sets that too */</div><div class='add'>+		}</div><div class='add'>+		WREG32(EVERGREEN_AUDIO_ENABLE, value);</div><div class='add'>+	} else {</div><div class='add'>+		WREG32_P(R600_AUDIO_ENABLE,</div><div class='add'>+			 enable ? 0x81000000 : 0x0, ~0x81000000);</div><div class='add'>+	}</div><div class='ctx'> 	rdev-&gt;audio_enabled = enable;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -248,22 +258,33 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (dig-&gt;dig_encoder) {</div><div class='del'>-	case 0:</div><div class='del'>-		WREG32(R600_AUDIO_PLL1_MUL, base_rate * 50);</div><div class='del'>-		WREG32(R600_AUDIO_PLL1_DIV, clock * 100);</div><div class='del'>-		WREG32(R600_AUDIO_CLK_SRCSEL, 0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 1:</div><div class='del'>-		WREG32(R600_AUDIO_PLL2_MUL, base_rate * 50);</div><div class='del'>-		WREG32(R600_AUDIO_PLL2_DIV, clock * 100);</div><div class='del'>-		WREG32(R600_AUDIO_CLK_SRCSEL, 1);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dev_err(rdev-&gt;dev, "Unsupported DIG on encoder 0x%02X\n",</div><div class='del'>-			  radeon_encoder-&gt;encoder_id);</div><div class='del'>-		return;</div><div class='add'>+	if (ASIC_IS_DCE4(rdev)) {</div><div class='add'>+		/* TODO: other PLLs? */</div><div class='add'>+		WREG32(EVERGREEN_AUDIO_PLL1_MUL, base_rate * 10);</div><div class='add'>+		WREG32(EVERGREEN_AUDIO_PLL1_DIV, clock * 10);</div><div class='add'>+		WREG32(EVERGREEN_AUDIO_PLL1_UNK, 0x00000071);</div><div class='add'>+</div><div class='add'>+		/* Some magic trigger or src sel? */</div><div class='add'>+		WREG32_P(0x5ac, 0x01, ~0x77);</div><div class='add'>+	} else {</div><div class='add'>+		switch (dig-&gt;dig_encoder) {</div><div class='add'>+		case 0:</div><div class='add'>+			WREG32(R600_AUDIO_PLL1_MUL, base_rate * 50);</div><div class='add'>+			WREG32(R600_AUDIO_PLL1_DIV, clock * 100);</div><div class='add'>+			WREG32(R600_AUDIO_CLK_SRCSEL, 0);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case 1:</div><div class='add'>+			WREG32(R600_AUDIO_PLL2_MUL, base_rate * 50);</div><div class='add'>+			WREG32(R600_AUDIO_PLL2_DIV, clock * 100);</div><div class='add'>+			WREG32(R600_AUDIO_CLK_SRCSEL, 1);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			dev_err(rdev-&gt;dev,</div><div class='add'>+				"Unsupported DIG on encoder 0x%02X\n",</div><div class='add'>+				radeon_encoder-&gt;encoder_id);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c<br/>index e09d2818f949..d996f4381130 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r600_blit_kms.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r600_blit_kms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r600_blit_kms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/r600_blit_kms.c</a></div><div class='hunk'>@@ -50,6 +50,7 @@ static void</div><div class='ctx'> set_render_target(struct radeon_device *rdev, int format,</div><div class='ctx'> 		  int w, int h, u64 gpu_addr)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	u32 cb_color_info;</div><div class='ctx'> 	int pitch, slice;</div><div class='ctx'> </div><div class='hunk'>@@ -63,38 +64,38 @@ set_render_target(struct radeon_device *rdev, int format,</div><div class='ctx'> 	pitch = (w / 8) - 1;</div><div class='ctx'> 	slice = ((w * h) / 64) - 1;</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='del'>-	radeon_ring_write(rdev, (CB_COLOR0_BASE - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, gpu_addr &gt;&gt; 8);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, (CB_COLOR0_BASE - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, gpu_addr &gt;&gt; 8);</div><div class='ctx'> </div><div class='ctx'> 	if (rdev-&gt;family &gt; CHIP_R600 &amp;&amp; rdev-&gt;family &lt; CHIP_RV770) {</div><div class='del'>-		radeon_ring_write(rdev, PACKET3(PACKET3_SURFACE_BASE_UPDATE, 0));</div><div class='del'>-		radeon_ring_write(rdev, 2 &lt;&lt; 0);</div><div class='add'>+		radeon_ring_write(ring, PACKET3(PACKET3_SURFACE_BASE_UPDATE, 0));</div><div class='add'>+		radeon_ring_write(ring, 2 &lt;&lt; 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='del'>-	radeon_ring_write(rdev, (CB_COLOR0_SIZE - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, (pitch &lt;&lt; 0) | (slice &lt;&lt; 10));</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, (CB_COLOR0_SIZE - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, (pitch &lt;&lt; 0) | (slice &lt;&lt; 10));</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='del'>-	radeon_ring_write(rdev, (CB_COLOR0_VIEW - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, (CB_COLOR0_VIEW - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='del'>-	radeon_ring_write(rdev, (CB_COLOR0_INFO - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, cb_color_info);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, (CB_COLOR0_INFO - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, cb_color_info);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='del'>-	radeon_ring_write(rdev, (CB_COLOR0_TILE - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, (CB_COLOR0_TILE - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='del'>-	radeon_ring_write(rdev, (CB_COLOR0_FRAG - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, (CB_COLOR0_FRAG - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='del'>-	radeon_ring_write(rdev, (CB_COLOR0_MASK - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, (CB_COLOR0_MASK - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* emits 5dw */</div><div class='hunk'>@@ -103,6 +104,7 @@ cp_set_surface_sync(struct radeon_device *rdev,</div><div class='ctx'> 		    u32 sync_type, u32 size,</div><div class='ctx'> 		    u64 mc_addr)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	u32 cp_coher_size;</div><div class='ctx'> </div><div class='ctx'> 	if (size == 0xffffffff)</div><div class='hunk'>@@ -110,17 +112,18 @@ cp_set_surface_sync(struct radeon_device *rdev,</div><div class='ctx'> 	else</div><div class='ctx'> 		cp_coher_size = ((size + 255) &gt;&gt; 8);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SURFACE_SYNC, 3));</div><div class='del'>-	radeon_ring_write(rdev, sync_type);</div><div class='del'>-	radeon_ring_write(rdev, cp_coher_size);</div><div class='del'>-	radeon_ring_write(rdev, mc_addr &gt;&gt; 8);</div><div class='del'>-	radeon_ring_write(rdev, 10); /* poll interval */</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SURFACE_SYNC, 3));</div><div class='add'>+	radeon_ring_write(ring, sync_type);</div><div class='add'>+	radeon_ring_write(ring, cp_coher_size);</div><div class='add'>+	radeon_ring_write(ring, mc_addr &gt;&gt; 8);</div><div class='add'>+	radeon_ring_write(ring, 10); /* poll interval */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* emits 21dw + 1 surface sync = 26dw */</div><div class='ctx'> static void</div><div class='ctx'> set_shaders(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	u64 gpu_addr;</div><div class='ctx'> 	u32 sq_pgm_resources;</div><div class='ctx'> </div><div class='hunk'>@@ -129,35 +132,35 @@ set_shaders(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> 	/* VS */</div><div class='ctx'> 	gpu_addr = rdev-&gt;r600_blit.shader_gpu_addr + rdev-&gt;r600_blit.vs_offset;</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='del'>-	radeon_ring_write(rdev, (SQ_PGM_START_VS - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, gpu_addr &gt;&gt; 8);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, (SQ_PGM_START_VS - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, gpu_addr &gt;&gt; 8);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='del'>-	radeon_ring_write(rdev, (SQ_PGM_RESOURCES_VS - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, sq_pgm_resources);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, (SQ_PGM_RESOURCES_VS - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, sq_pgm_resources);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='del'>-	radeon_ring_write(rdev, (SQ_PGM_CF_OFFSET_VS - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, (SQ_PGM_CF_OFFSET_VS - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* PS */</div><div class='ctx'> 	gpu_addr = rdev-&gt;r600_blit.shader_gpu_addr + rdev-&gt;r600_blit.ps_offset;</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='del'>-	radeon_ring_write(rdev, (SQ_PGM_START_PS - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, gpu_addr &gt;&gt; 8);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, (SQ_PGM_START_PS - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, gpu_addr &gt;&gt; 8);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='del'>-	radeon_ring_write(rdev, (SQ_PGM_RESOURCES_PS - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, sq_pgm_resources | (1 &lt;&lt; 28));</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, (SQ_PGM_RESOURCES_PS - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, sq_pgm_resources | (1 &lt;&lt; 28));</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='del'>-	radeon_ring_write(rdev, (SQ_PGM_EXPORTS_PS - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, 2);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, (SQ_PGM_EXPORTS_PS - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, 2);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='del'>-	radeon_ring_write(rdev, (SQ_PGM_CF_OFFSET_PS - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, (SQ_PGM_CF_OFFSET_PS - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='ctx'> </div><div class='ctx'> 	gpu_addr = rdev-&gt;r600_blit.shader_gpu_addr + rdev-&gt;r600_blit.vs_offset;</div><div class='ctx'> 	cp_set_surface_sync(rdev, PACKET3_SH_ACTION_ENA, 512, gpu_addr);</div><div class='hunk'>@@ -167,6 +170,7 @@ set_shaders(struct radeon_device *rdev)</div><div class='ctx'> static void</div><div class='ctx'> set_vtx_resource(struct radeon_device *rdev, u64 gpu_addr)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	u32 sq_vtx_constant_word2;</div><div class='ctx'> </div><div class='ctx'> 	sq_vtx_constant_word2 = SQ_VTXC_BASE_ADDR_HI(upper_32_bits(gpu_addr) &amp; 0xff) |</div><div class='hunk'>@@ -175,15 +179,15 @@ set_vtx_resource(struct radeon_device *rdev, u64 gpu_addr)</div><div class='ctx'> 	sq_vtx_constant_word2 |=  SQ_VTXC_ENDIAN_SWAP(SQ_ENDIAN_8IN32);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_RESOURCE, 7));</div><div class='del'>-	radeon_ring_write(rdev, 0x460);</div><div class='del'>-	radeon_ring_write(rdev, gpu_addr &amp; 0xffffffff);</div><div class='del'>-	radeon_ring_write(rdev, 48 - 1);</div><div class='del'>-	radeon_ring_write(rdev, sq_vtx_constant_word2);</div><div class='del'>-	radeon_ring_write(rdev, 1 &lt;&lt; 0);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, SQ_TEX_VTX_VALID_BUFFER &lt;&lt; 30);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_RESOURCE, 7));</div><div class='add'>+	radeon_ring_write(ring, 0x460);</div><div class='add'>+	radeon_ring_write(ring, gpu_addr &amp; 0xffffffff);</div><div class='add'>+	radeon_ring_write(ring, 48 - 1);</div><div class='add'>+	radeon_ring_write(ring, sq_vtx_constant_word2);</div><div class='add'>+	radeon_ring_write(ring, 1 &lt;&lt; 0);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, SQ_TEX_VTX_VALID_BUFFER &lt;&lt; 30);</div><div class='ctx'> </div><div class='ctx'> 	if ((rdev-&gt;family == CHIP_RV610) ||</div><div class='ctx'> 	    (rdev-&gt;family == CHIP_RV620) ||</div><div class='hunk'>@@ -203,6 +207,7 @@ set_tex_resource(struct radeon_device *rdev,</div><div class='ctx'> 		 int format, int w, int h, int pitch,</div><div class='ctx'> 		 u64 gpu_addr, u32 size)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	uint32_t sq_tex_resource_word0, sq_tex_resource_word1, sq_tex_resource_word4;</div><div class='ctx'> </div><div class='ctx'> 	if (h &lt; 1)</div><div class='hunk'>@@ -225,15 +230,15 @@ set_tex_resource(struct radeon_device *rdev,</div><div class='ctx'> 	cp_set_surface_sync(rdev,</div><div class='ctx'> 			    PACKET3_TC_ACTION_ENA, size, gpu_addr);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_RESOURCE, 7));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, sq_tex_resource_word0);</div><div class='del'>-	radeon_ring_write(rdev, sq_tex_resource_word1);</div><div class='del'>-	radeon_ring_write(rdev, gpu_addr &gt;&gt; 8);</div><div class='del'>-	radeon_ring_write(rdev, gpu_addr &gt;&gt; 8);</div><div class='del'>-	radeon_ring_write(rdev, sq_tex_resource_word4);</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, SQ_TEX_VTX_VALID_TEXTURE &lt;&lt; 30);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_RESOURCE, 7));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, sq_tex_resource_word0);</div><div class='add'>+	radeon_ring_write(ring, sq_tex_resource_word1);</div><div class='add'>+	radeon_ring_write(ring, gpu_addr &gt;&gt; 8);</div><div class='add'>+	radeon_ring_write(ring, gpu_addr &gt;&gt; 8);</div><div class='add'>+	radeon_ring_write(ring, sq_tex_resource_word4);</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, SQ_TEX_VTX_VALID_TEXTURE &lt;&lt; 30);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* emits 12 */</div><div class='hunk'>@@ -241,43 +246,45 @@ static void</div><div class='ctx'> set_scissors(struct radeon_device *rdev, int x1, int y1,</div><div class='ctx'> 	     int x2, int y2)</div><div class='ctx'> {</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 2));</div><div class='del'>-	radeon_ring_write(rdev, (PA_SC_SCREEN_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, (x1 &lt;&lt; 0) | (y1 &lt;&lt; 16));</div><div class='del'>-	radeon_ring_write(rdev, (x2 &lt;&lt; 0) | (y2 &lt;&lt; 16));</div><div class='del'>-</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 2));</div><div class='del'>-	radeon_ring_write(rdev, (PA_SC_GENERIC_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, (x1 &lt;&lt; 0) | (y1 &lt;&lt; 16) | (1 &lt;&lt; 31));</div><div class='del'>-	radeon_ring_write(rdev, (x2 &lt;&lt; 0) | (y2 &lt;&lt; 16));</div><div class='del'>-</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONTEXT_REG, 2));</div><div class='del'>-	radeon_ring_write(rdev, (PA_SC_WINDOW_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, (x1 &lt;&lt; 0) | (y1 &lt;&lt; 16) | (1 &lt;&lt; 31));</div><div class='del'>-	radeon_ring_write(rdev, (x2 &lt;&lt; 0) | (y2 &lt;&lt; 16));</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 2));</div><div class='add'>+	radeon_ring_write(ring, (PA_SC_SCREEN_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, (x1 &lt;&lt; 0) | (y1 &lt;&lt; 16));</div><div class='add'>+	radeon_ring_write(ring, (x2 &lt;&lt; 0) | (y2 &lt;&lt; 16));</div><div class='add'>+</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 2));</div><div class='add'>+	radeon_ring_write(ring, (PA_SC_GENERIC_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, (x1 &lt;&lt; 0) | (y1 &lt;&lt; 16) | (1 &lt;&lt; 31));</div><div class='add'>+	radeon_ring_write(ring, (x2 &lt;&lt; 0) | (y2 &lt;&lt; 16));</div><div class='add'>+</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 2));</div><div class='add'>+	radeon_ring_write(ring, (PA_SC_WINDOW_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, (x1 &lt;&lt; 0) | (y1 &lt;&lt; 16) | (1 &lt;&lt; 31));</div><div class='add'>+	radeon_ring_write(ring, (x2 &lt;&lt; 0) | (y2 &lt;&lt; 16));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* emits 10 */</div><div class='ctx'> static void</div><div class='ctx'> draw_auto(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONFIG_REG, 1));</div><div class='del'>-	radeon_ring_write(rdev, (VGT_PRIMITIVE_TYPE - PACKET3_SET_CONFIG_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, DI_PT_RECTLIST);</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));</div><div class='add'>+	radeon_ring_write(ring, (VGT_PRIMITIVE_TYPE - PACKET3_SET_CONFIG_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, DI_PT_RECTLIST);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_INDEX_TYPE, 0));</div><div class='del'>-	radeon_ring_write(rdev,</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_INDEX_TYPE, 0));</div><div class='add'>+	radeon_ring_write(ring,</div><div class='ctx'> #ifdef __BIG_ENDIAN</div><div class='ctx'> 			  (2 &lt;&lt; 2) |</div><div class='ctx'> #endif</div><div class='ctx'> 			  DI_INDEX_SIZE_16_BIT);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_NUM_INSTANCES, 0));</div><div class='del'>-	radeon_ring_write(rdev, 1);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_NUM_INSTANCES, 0));</div><div class='add'>+	radeon_ring_write(ring, 1);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_DRAW_INDEX_AUTO, 1));</div><div class='del'>-	radeon_ring_write(rdev, 3);</div><div class='del'>-	radeon_ring_write(rdev, DI_SRC_SEL_AUTO_INDEX);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_DRAW_INDEX_AUTO, 1));</div><div class='add'>+	radeon_ring_write(ring, 3);</div><div class='add'>+	radeon_ring_write(ring, DI_SRC_SEL_AUTO_INDEX);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -285,6 +292,7 @@ draw_auto(struct radeon_device *rdev)</div><div class='ctx'> static void</div><div class='ctx'> set_default_state(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	u32 sq_config, sq_gpr_resource_mgmt_1, sq_gpr_resource_mgmt_2;</div><div class='ctx'> 	u32 sq_thread_resource_mgmt, sq_stack_resource_mgmt_1, sq_stack_resource_mgmt_2;</div><div class='ctx'> 	int num_ps_gprs, num_vs_gprs, num_temp_gprs, num_gs_gprs, num_es_gprs;</div><div class='hunk'>@@ -440,24 +448,24 @@ set_default_state(struct radeon_device *rdev)</div><div class='ctx'> 	/* emit an IB pointing at default state */</div><div class='ctx'> 	dwords = ALIGN(rdev-&gt;r600_blit.state_len, 0x10);</div><div class='ctx'> 	gpu_addr = rdev-&gt;r600_blit.shader_gpu_addr + rdev-&gt;r600_blit.state_offset;</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_INDIRECT_BUFFER, 2));</div><div class='del'>-	radeon_ring_write(rdev,</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_INDIRECT_BUFFER, 2));</div><div class='add'>+	radeon_ring_write(ring,</div><div class='ctx'> #ifdef __BIG_ENDIAN</div><div class='ctx'> 			  (2 &lt;&lt; 0) |</div><div class='ctx'> #endif</div><div class='ctx'> 			  (gpu_addr &amp; 0xFFFFFFFC));</div><div class='del'>-	radeon_ring_write(rdev, upper_32_bits(gpu_addr) &amp; 0xFF);</div><div class='del'>-	radeon_ring_write(rdev, dwords);</div><div class='add'>+	radeon_ring_write(ring, upper_32_bits(gpu_addr) &amp; 0xFF);</div><div class='add'>+	radeon_ring_write(ring, dwords);</div><div class='ctx'> </div><div class='ctx'> 	/* SQ config */</div><div class='del'>-	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONFIG_REG, 6));</div><div class='del'>-	radeon_ring_write(rdev, (SQ_CONFIG - PACKET3_SET_CONFIG_REG_OFFSET) &gt;&gt; 2);</div><div class='del'>-	radeon_ring_write(rdev, sq_config);</div><div class='del'>-	radeon_ring_write(rdev, sq_gpr_resource_mgmt_1);</div><div class='del'>-	radeon_ring_write(rdev, sq_gpr_resource_mgmt_2);</div><div class='del'>-	radeon_ring_write(rdev, sq_thread_resource_mgmt);</div><div class='del'>-	radeon_ring_write(rdev, sq_stack_resource_mgmt_1);</div><div class='del'>-	radeon_ring_write(rdev, sq_stack_resource_mgmt_2);</div><div class='add'>+	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 6));</div><div class='add'>+	radeon_ring_write(ring, (SQ_CONFIG - PACKET3_SET_CONFIG_REG_OFFSET) &gt;&gt; 2);</div><div class='add'>+	radeon_ring_write(ring, sq_config);</div><div class='add'>+	radeon_ring_write(ring, sq_gpr_resource_mgmt_1);</div><div class='add'>+	radeon_ring_write(ring, sq_gpr_resource_mgmt_2);</div><div class='add'>+	radeon_ring_write(ring, sq_thread_resource_mgmt);</div><div class='add'>+	radeon_ring_write(ring, sq_stack_resource_mgmt_1);</div><div class='add'>+	radeon_ring_write(ring, sq_stack_resource_mgmt_2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static uint32_t i2f(uint32_t input)</div><div class='hunk'>@@ -611,16 +619,17 @@ void r600_blit_fini(struct radeon_device *rdev)</div><div class='ctx'> 	radeon_bo_unref(&amp;rdev-&gt;r600_blit.shader_obj);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int r600_vb_ib_get(struct radeon_device *rdev)</div><div class='add'>+static int r600_vb_ib_get(struct radeon_device *rdev, unsigned size)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='del'>-	r = radeon_ib_get(rdev, &amp;rdev-&gt;r600_blit.vb_ib);</div><div class='add'>+	r = radeon_ib_get(rdev, RADEON_RING_TYPE_GFX_INDEX,</div><div class='add'>+			  &amp;rdev-&gt;r600_blit.vb_ib, size);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		DRM_ERROR("failed to get IB for vertex buffer\n");</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rdev-&gt;r600_blit.vb_total = 64*1024;</div><div class='add'>+	rdev-&gt;r600_blit.vb_total = size;</div><div class='ctx'> 	rdev-&gt;r600_blit.vb_used = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -679,15 +688,12 @@ static unsigned r600_blit_create_rect(unsigned num_gpu_pages,</div><div class='ctx'> </div><div class='ctx'> int r600_blit_prepare_copy(struct radeon_device *rdev, unsigned num_gpu_pages)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	int r;</div><div class='ctx'> 	int ring_size;</div><div class='ctx'> 	int num_loops = 0;</div><div class='ctx'> 	int dwords_per_loop = rdev-&gt;r600_blit.ring_size_per_loop;</div><div class='ctx'> </div><div class='del'>-	r = r600_vb_ib_get(rdev);</div><div class='del'>-	if (r)</div><div class='del'>-		return r;</div><div class='del'>-</div><div class='ctx'> 	/* num loops */</div><div class='ctx'> 	while (num_gpu_pages) {</div><div class='ctx'> 		num_gpu_pages -=</div><div class='hunk'>@@ -696,10 +702,15 @@ int r600_blit_prepare_copy(struct radeon_device *rdev, unsigned num_gpu_pages)</div><div class='ctx'> 		num_loops++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* 48 bytes for vertex per loop */</div><div class='add'>+	r = r600_vb_ib_get(rdev, (num_loops*48)+256);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='ctx'> 	/* calculate number of loops correctly */</div><div class='ctx'> 	ring_size = num_loops * dwords_per_loop;</div><div class='ctx'> 	ring_size += rdev-&gt;r600_blit.ring_size_common;</div><div class='del'>-	r = radeon_ring_lock(rdev, ring_size);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, ring_size);</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='hunk'>@@ -718,7 +729,7 @@ void r600_blit_done_copy(struct radeon_device *rdev, struct radeon_fence *fence)</div><div class='ctx'> 	if (fence)</div><div class='ctx'> 		r = radeon_fence_emit(rdev, fence);</div><div class='ctx'> </div><div class='del'>-	radeon_ring_unlock_commit(rdev);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void r600_kms_blit_copy(struct radeon_device *rdev,</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c<br/>index c9db4931913f..84c546250955 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r600_cp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r600_cp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r600_cp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/r600_cp.c</a></div><div class='hunk'>@@ -1815,7 +1815,7 @@ static void r600_cp_init_ring_buffer(struct drm_device *dev,</div><div class='ctx'> 		     dev_priv-&gt;ring.size_l2qw);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	RADEON_WRITE(R600_CP_SEM_WAIT_TIMER, 0x4);</div><div class='add'>+	RADEON_WRITE(R600_CP_SEM_WAIT_TIMER, 0x0);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the write pointer delay */</div><div class='ctx'> 	RADEON_WRITE(R600_CP_RB_WPTR_DELAY, 0);</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c<br/>index cb1acffd2430..38ce5d0427e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r600_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r600_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r600_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/r600_cs.c</a></div><div class='hunk'>@@ -941,7 +941,7 @@ static int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)</div><div class='ctx'> 		track-&gt;db_depth_control = radeon_get_ib_value(p, idx);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case R_028010_DB_DEPTH_INFO:</div><div class='del'>-		if (!p-&gt;keep_tiling_flags &amp;&amp;</div><div class='add'>+		if (!(p-&gt;cs_flags &amp; RADEON_CS_KEEP_TILING_FLAGS) &amp;&amp;</div><div class='ctx'> 		    r600_cs_packet_next_is_pkt3_nop(p)) {</div><div class='ctx'> 			r = r600_cs_packet_next_reloc(p, &amp;reloc);</div><div class='ctx'> 			if (r) {</div><div class='hunk'>@@ -993,7 +993,7 @@ static int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)</div><div class='ctx'> 	case R_0280B4_CB_COLOR5_INFO:</div><div class='ctx'> 	case R_0280B8_CB_COLOR6_INFO:</div><div class='ctx'> 	case R_0280BC_CB_COLOR7_INFO:</div><div class='del'>-		if (!p-&gt;keep_tiling_flags &amp;&amp;</div><div class='add'>+		if (!(p-&gt;cs_flags &amp; RADEON_CS_KEEP_TILING_FLAGS) &amp;&amp;</div><div class='ctx'> 		     r600_cs_packet_next_is_pkt3_nop(p)) {</div><div class='ctx'> 			r = r600_cs_packet_next_reloc(p, &amp;reloc);</div><div class='ctx'> 			if (r) {</div><div class='hunk'>@@ -1293,7 +1293,7 @@ static int r600_check_texture_resource(struct radeon_cs_parser *p,  u32 idx,</div><div class='ctx'> 	mip_offset &lt;&lt;= 8;</div><div class='ctx'> </div><div class='ctx'> 	word0 = radeon_get_ib_value(p, idx + 0);</div><div class='del'>-	if (!p-&gt;keep_tiling_flags) {</div><div class='add'>+	if (!(p-&gt;cs_flags &amp; RADEON_CS_KEEP_TILING_FLAGS)) {</div><div class='ctx'> 		if (tiling_flags &amp; RADEON_TILING_MACRO)</div><div class='ctx'> 			word0 |= S_038000_TILE_MODE(V_038000_ARRAY_2D_TILED_THIN1);</div><div class='ctx'> 		else if (tiling_flags &amp; RADEON_TILING_MICRO)</div><div class='hunk'>@@ -1625,7 +1625,7 @@ static int r600_packet3_check(struct radeon_cs_parser *p,</div><div class='ctx'> 					return -EINVAL;</div><div class='ctx'> 				}</div><div class='ctx'> 				base_offset = (u32)((reloc-&gt;lobj.gpu_offset &gt;&gt; 8) &amp; 0xffffffff);</div><div class='del'>-				if (!p-&gt;keep_tiling_flags) {</div><div class='add'>+				if (!(p-&gt;cs_flags &amp; RADEON_CS_KEEP_TILING_FLAGS)) {</div><div class='ctx'> 					if (reloc-&gt;lobj.tiling_flags &amp; RADEON_TILING_MACRO)</div><div class='ctx'> 						ib[idx+1+(i*7)+0] |= S_038000_TILE_MODE(V_038000_ARRAY_2D_TILED_THIN1);</div><div class='ctx'> 					else if (reloc-&gt;lobj.tiling_flags &amp; RADEON_TILING_MICRO)</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c<br/>index f5ac7e788d81..0b5920671450 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r600_hdmi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r600_hdmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r600_hdmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/r600_hdmi.c</a></div><div class='hunk'>@@ -196,6 +196,13 @@ static void r600_hdmi_videoinfoframe(</div><div class='ctx'> 	frame[0xD] = (right_bar &gt;&gt; 8);</div><div class='ctx'> </div><div class='ctx'> 	r600_hdmi_infoframe_checksum(0x82, 0x02, 0x0D, frame);</div><div class='add'>+	/* Our header values (type, version, length) should be alright, Intel</div><div class='add'>+	 * is using the same. Checksum function also seems to be OK, it works</div><div class='add'>+	 * fine for audio infoframe. However calculated value is always lower</div><div class='add'>+	 * by 2 in comparison to fglrx. It breaks displaying anything in case</div><div class='add'>+	 * of TVs that strictly check the checksum. Hack it manually here to</div><div class='add'>+	 * workaround this issue. */</div><div class='add'>+	frame[0x0] += 2;</div><div class='ctx'> </div><div class='ctx'> 	WREG32(offset+R600_HDMI_VIDEOINFOFRAME_0,</div><div class='ctx'> 		frame[0x0] | (frame[0x1] &lt;&lt; 8) | (frame[0x2] &lt;&lt; 16) | (frame[0x3] &lt;&lt; 24));</div><div class='hunk'>@@ -313,7 +320,7 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod</div><div class='ctx'> 	struct radeon_device *rdev = dev-&gt;dev_private;</div><div class='ctx'> 	uint32_t offset = to_radeon_encoder(encoder)-&gt;hdmi_offset;</div><div class='ctx'> </div><div class='del'>-	if (ASIC_IS_DCE4(rdev))</div><div class='add'>+	if (ASIC_IS_DCE5(rdev))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!offset)</div><div class='hunk'>@@ -455,13 +462,31 @@ static void r600_hdmi_assign_block(struct drm_encoder *encoder)</div><div class='ctx'> 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);</div><div class='ctx'> 	struct radeon_encoder_atom_dig *dig = radeon_encoder-&gt;enc_priv;</div><div class='ctx'> </div><div class='add'>+	u16 eg_offsets[] = {</div><div class='add'>+		EVERGREEN_CRTC0_REGISTER_OFFSET,</div><div class='add'>+		EVERGREEN_CRTC1_REGISTER_OFFSET,</div><div class='add'>+		EVERGREEN_CRTC2_REGISTER_OFFSET,</div><div class='add'>+		EVERGREEN_CRTC3_REGISTER_OFFSET,</div><div class='add'>+		EVERGREEN_CRTC4_REGISTER_OFFSET,</div><div class='add'>+		EVERGREEN_CRTC5_REGISTER_OFFSET,</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	if (!dig) {</div><div class='ctx'> 		dev_err(rdev-&gt;dev, "Enabling HDMI on non-dig encoder\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ASIC_IS_DCE4(rdev)) {</div><div class='add'>+	if (ASIC_IS_DCE5(rdev)) {</div><div class='ctx'> 		/* TODO */</div><div class='add'>+	} else if (ASIC_IS_DCE4(rdev)) {</div><div class='add'>+		if (dig-&gt;dig_encoder &gt;= ARRAY_SIZE(eg_offsets)) {</div><div class='add'>+			dev_err(rdev-&gt;dev, "Enabling HDMI on unknown dig\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		radeon_encoder-&gt;hdmi_offset = EVERGREEN_HDMI_BASE +</div><div class='add'>+						eg_offsets[dig-&gt;dig_encoder];</div><div class='add'>+		radeon_encoder-&gt;hdmi_config_offset = radeon_encoder-&gt;hdmi_offset</div><div class='add'>+						+ EVERGREEN_HDMI_CONFIG_OFFSET;</div><div class='ctx'> 	} else if (ASIC_IS_DCE3(rdev)) {</div><div class='ctx'> 		radeon_encoder-&gt;hdmi_offset = dig-&gt;dig_encoder ?</div><div class='ctx'> 			R600_HDMI_BLOCK3 : R600_HDMI_BLOCK1;</div><div class='hunk'>@@ -484,7 +509,7 @@ void r600_hdmi_enable(struct drm_encoder *encoder)</div><div class='ctx'> 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);</div><div class='ctx'> 	uint32_t offset;</div><div class='ctx'> </div><div class='del'>-	if (ASIC_IS_DCE4(rdev))</div><div class='add'>+	if (ASIC_IS_DCE5(rdev))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!radeon_encoder-&gt;hdmi_offset) {</div><div class='hunk'>@@ -497,16 +522,24 @@ void r600_hdmi_enable(struct drm_encoder *encoder)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	offset = radeon_encoder-&gt;hdmi_offset;</div><div class='del'>-	if (ASIC_IS_DCE32(rdev) &amp;&amp; !ASIC_IS_DCE4(rdev)) {</div><div class='add'>+	if (ASIC_IS_DCE5(rdev)) {</div><div class='add'>+		/* TODO */</div><div class='add'>+	} else if (ASIC_IS_DCE4(rdev)) {</div><div class='add'>+		WREG32_P(radeon_encoder-&gt;hdmi_config_offset + 0xc, 0x1, ~0x1);</div><div class='add'>+	} else if (ASIC_IS_DCE32(rdev)) {</div><div class='ctx'> 		WREG32_P(radeon_encoder-&gt;hdmi_config_offset + 0x4, 0x1, ~0x1);</div><div class='del'>-	} else if (rdev-&gt;family &gt;= CHIP_R600 &amp;&amp; !ASIC_IS_DCE3(rdev)) {</div><div class='add'>+	} else if (ASIC_IS_DCE3(rdev)) {</div><div class='add'>+		/* TODO */</div><div class='add'>+	} else if (rdev-&gt;family &gt;= CHIP_R600) {</div><div class='ctx'> 		switch (radeon_encoder-&gt;encoder_id) {</div><div class='ctx'> 		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:</div><div class='del'>-			WREG32_P(AVIVO_TMDSA_CNTL, 0x4, ~0x4);</div><div class='add'>+			WREG32_P(AVIVO_TMDSA_CNTL, AVIVO_TMDSA_CNTL_HDMI_EN,</div><div class='add'>+				 ~AVIVO_TMDSA_CNTL_HDMI_EN);</div><div class='ctx'> 			WREG32(offset + R600_HDMI_ENABLE, 0x101);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ENCODER_OBJECT_ID_INTERNAL_LVTM1:</div><div class='del'>-			WREG32_P(AVIVO_LVTMA_CNTL, 0x4, ~0x4);</div><div class='add'>+			WREG32_P(AVIVO_LVTMA_CNTL, AVIVO_LVTMA_CNTL_HDMI_EN,</div><div class='add'>+				 ~AVIVO_LVTMA_CNTL_HDMI_EN);</div><div class='ctx'> 			WREG32(offset + R600_HDMI_ENABLE, 0x105);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -518,8 +551,8 @@ void r600_hdmi_enable(struct drm_encoder *encoder)</div><div class='ctx'> 	if (rdev-&gt;irq.installed</div><div class='ctx'> 	    &amp;&amp; rdev-&gt;family != CHIP_RS600</div><div class='ctx'> 	    &amp;&amp; rdev-&gt;family != CHIP_RS690</div><div class='del'>-	    &amp;&amp; rdev-&gt;family != CHIP_RS740) {</div><div class='del'>-</div><div class='add'>+	    &amp;&amp; rdev-&gt;family != CHIP_RS740</div><div class='add'>+	    &amp;&amp; !ASIC_IS_DCE4(rdev)) {</div><div class='ctx'> 		/* if irq is available use it */</div><div class='ctx'> 		rdev-&gt;irq.hdmi[offset == R600_HDMI_BLOCK1 ? 0 : 1] = true;</div><div class='ctx'> 		radeon_irq_set(rdev);</div><div class='hunk'>@@ -544,7 +577,7 @@ void r600_hdmi_disable(struct drm_encoder *encoder)</div><div class='ctx'> 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);</div><div class='ctx'> 	uint32_t offset;</div><div class='ctx'> </div><div class='del'>-	if (ASIC_IS_DCE4(rdev))</div><div class='add'>+	if (ASIC_IS_DCE5(rdev))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	offset = radeon_encoder-&gt;hdmi_offset;</div><div class='hunk'>@@ -563,16 +596,22 @@ void r600_hdmi_disable(struct drm_encoder *encoder)</div><div class='ctx'> 	/* disable polling */</div><div class='ctx'> 	r600_audio_disable_polling(encoder);</div><div class='ctx'> </div><div class='del'>-	if (ASIC_IS_DCE32(rdev) &amp;&amp; !ASIC_IS_DCE4(rdev)) {</div><div class='add'>+	if (ASIC_IS_DCE5(rdev)) {</div><div class='add'>+		/* TODO */</div><div class='add'>+	} else if (ASIC_IS_DCE4(rdev)) {</div><div class='add'>+		WREG32_P(radeon_encoder-&gt;hdmi_config_offset + 0xc, 0, ~0x1);</div><div class='add'>+	} else if (ASIC_IS_DCE32(rdev)) {</div><div class='ctx'> 		WREG32_P(radeon_encoder-&gt;hdmi_config_offset + 0x4, 0, ~0x1);</div><div class='ctx'> 	} else if (rdev-&gt;family &gt;= CHIP_R600 &amp;&amp; !ASIC_IS_DCE3(rdev)) {</div><div class='ctx'> 		switch (radeon_encoder-&gt;encoder_id) {</div><div class='ctx'> 		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:</div><div class='del'>-			WREG32_P(AVIVO_TMDSA_CNTL, 0, ~0x4);</div><div class='add'>+			WREG32_P(AVIVO_TMDSA_CNTL, 0,</div><div class='add'>+				 ~AVIVO_TMDSA_CNTL_HDMI_EN);</div><div class='ctx'> 			WREG32(offset + R600_HDMI_ENABLE, 0);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ENCODER_OBJECT_ID_INTERNAL_LVTM1:</div><div class='del'>-			WREG32_P(AVIVO_LVTMA_CNTL, 0, ~0x4);</div><div class='add'>+			WREG32_P(AVIVO_LVTMA_CNTL, 0,</div><div class='add'>+				 ~AVIVO_LVTMA_CNTL_HDMI_EN);</div><div class='ctx'> 			WREG32(offset + R600_HDMI_ENABLE, 0);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h<br/>index bfe1b5d92afe..3ee1fd7ef394 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r600d.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/r600d.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/r600d.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/r600d.h</a></div><div class='hunk'>@@ -831,6 +831,8 @@</div><div class='ctx'> #define	PACKET3_STRMOUT_BUFFER_UPDATE			0x34</div><div class='ctx'> #define	PACKET3_INDIRECT_BUFFER_MP			0x38</div><div class='ctx'> #define	PACKET3_MEM_SEMAPHORE				0x39</div><div class='add'>+#              define PACKET3_SEM_SEL_SIGNAL	    (0x6 &lt;&lt; 29)</div><div class='add'>+#              define PACKET3_SEM_SEL_WAIT	    (0x7 &lt;&lt; 29)</div><div class='ctx'> #define	PACKET3_MPEG_INDEX				0x3A</div><div class='ctx'> #define	PACKET3_WAIT_REG_MEM				0x3C</div><div class='ctx'> #define	PACKET3_MEM_WRITE				0x3D</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h<br/>index 8227e76b5c70..73e05cb85eca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon.h</a></div><div class='hunk'>@@ -107,6 +107,21 @@ extern int radeon_msi;</div><div class='ctx'> #define RADEONFB_CONN_LIMIT		4</div><div class='ctx'> #define RADEON_BIOS_NUM_SCRATCH		8</div><div class='ctx'> </div><div class='add'>+/* max number of rings */</div><div class='add'>+#define RADEON_NUM_RINGS 3</div><div class='add'>+</div><div class='add'>+/* internal ring indices */</div><div class='add'>+/* r1xx+ has gfx CP ring */</div><div class='add'>+#define RADEON_RING_TYPE_GFX_INDEX  0</div><div class='add'>+</div><div class='add'>+/* cayman has 2 compute CP rings */</div><div class='add'>+#define CAYMAN_RING_TYPE_CP1_INDEX 1</div><div class='add'>+#define CAYMAN_RING_TYPE_CP2_INDEX 2</div><div class='add'>+</div><div class='add'>+/* hardcode those limit for now */</div><div class='add'>+#define RADEON_VA_RESERVED_SIZE		(8 &lt;&lt; 20)</div><div class='add'>+#define RADEON_IB_VM_MAX_SIZE		(64 &lt;&lt; 10)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Errata workarounds.</div><div class='ctx'>  */</div><div class='hunk'>@@ -192,14 +207,15 @@ extern int sumo_get_temp(struct radeon_device *rdev);</div><div class='ctx'>  */</div><div class='ctx'> struct radeon_fence_driver {</div><div class='ctx'> 	uint32_t			scratch_reg;</div><div class='add'>+	uint64_t			gpu_addr;</div><div class='add'>+	volatile uint32_t		*cpu_addr;</div><div class='ctx'> 	atomic_t			seq;</div><div class='ctx'> 	uint32_t			last_seq;</div><div class='ctx'> 	unsigned long			last_jiffies;</div><div class='ctx'> 	unsigned long			last_timeout;</div><div class='ctx'> 	wait_queue_head_t		queue;</div><div class='del'>-	rwlock_t			lock;</div><div class='ctx'> 	struct list_head		created;</div><div class='del'>-	struct list_head		emited;</div><div class='add'>+	struct list_head		emitted;</div><div class='ctx'> 	struct list_head		signaled;</div><div class='ctx'> 	bool				initialized;</div><div class='ctx'> };</div><div class='hunk'>@@ -210,21 +226,26 @@ struct radeon_fence {</div><div class='ctx'> 	struct list_head		list;</div><div class='ctx'> 	/* protected by radeon_fence.lock */</div><div class='ctx'> 	uint32_t			seq;</div><div class='del'>-	bool				emited;</div><div class='add'>+	bool				emitted;</div><div class='ctx'> 	bool				signaled;</div><div class='add'>+	/* RB, DMA, etc. */</div><div class='add'>+	int				ring;</div><div class='add'>+	struct radeon_semaphore		*semaphore;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+int radeon_fence_driver_start_ring(struct radeon_device *rdev, int ring);</div><div class='ctx'> int radeon_fence_driver_init(struct radeon_device *rdev);</div><div class='ctx'> void radeon_fence_driver_fini(struct radeon_device *rdev);</div><div class='del'>-int radeon_fence_create(struct radeon_device *rdev, struct radeon_fence **fence);</div><div class='add'>+int radeon_fence_create(struct radeon_device *rdev, struct radeon_fence **fence, int ring);</div><div class='ctx'> int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence);</div><div class='del'>-void radeon_fence_process(struct radeon_device *rdev);</div><div class='add'>+void radeon_fence_process(struct radeon_device *rdev, int ring);</div><div class='ctx'> bool radeon_fence_signaled(struct radeon_fence *fence);</div><div class='ctx'> int radeon_fence_wait(struct radeon_fence *fence, bool interruptible);</div><div class='del'>-int radeon_fence_wait_next(struct radeon_device *rdev);</div><div class='del'>-int radeon_fence_wait_last(struct radeon_device *rdev);</div><div class='add'>+int radeon_fence_wait_next(struct radeon_device *rdev, int ring);</div><div class='add'>+int radeon_fence_wait_last(struct radeon_device *rdev, int ring);</div><div class='ctx'> struct radeon_fence *radeon_fence_ref(struct radeon_fence *fence);</div><div class='ctx'> void radeon_fence_unref(struct radeon_fence **fence);</div><div class='add'>+int radeon_fence_count_emitted(struct radeon_device *rdev, int ring);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Tiling registers</div><div class='hunk'>@@ -246,6 +267,21 @@ struct radeon_mman {</div><div class='ctx'> 	bool				initialized;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* bo virtual address in a specific vm */</div><div class='add'>+struct radeon_bo_va {</div><div class='add'>+	/* bo list is protected by bo being reserved */</div><div class='add'>+	struct list_head		bo_list;</div><div class='add'>+	/* vm list is protected by vm mutex */</div><div class='add'>+	struct list_head		vm_list;</div><div class='add'>+	/* constant after initialization */</div><div class='add'>+	struct radeon_vm		*vm;</div><div class='add'>+	struct radeon_bo		*bo;</div><div class='add'>+	uint64_t			soffset;</div><div class='add'>+	uint64_t			eoffset;</div><div class='add'>+	uint32_t			flags;</div><div class='add'>+	bool				valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct radeon_bo {</div><div class='ctx'> 	/* Protected by gem.mutex */</div><div class='ctx'> 	struct list_head		list;</div><div class='hunk'>@@ -259,6 +295,10 @@ struct radeon_bo {</div><div class='ctx'> 	u32				tiling_flags;</div><div class='ctx'> 	u32				pitch;</div><div class='ctx'> 	int				surface_reg;</div><div class='add'>+	/* list of all virtual address to which this bo</div><div class='add'>+	 * is associated to</div><div class='add'>+	 */</div><div class='add'>+	struct list_head		va;</div><div class='ctx'> 	/* Constant after initialization */</div><div class='ctx'> 	struct radeon_device		*rdev;</div><div class='ctx'> 	struct drm_gem_object		gem_base;</div><div class='hunk'>@@ -274,6 +314,48 @@ struct radeon_bo_list {</div><div class='ctx'> 	u32			tiling_flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* sub-allocation manager, it has to be protected by another lock.</div><div class='add'>+ * By conception this is an helper for other part of the driver</div><div class='add'>+ * like the indirect buffer or semaphore, which both have their</div><div class='add'>+ * locking.</div><div class='add'>+ *</div><div class='add'>+ * Principe is simple, we keep a list of sub allocation in offset</div><div class='add'>+ * order (first entry has offset == 0, last entry has the highest</div><div class='add'>+ * offset).</div><div class='add'>+ *</div><div class='add'>+ * When allocating new object we first check if there is room at</div><div class='add'>+ * the end total_size - (last_object_offset + last_object_size) &gt;=</div><div class='add'>+ * alloc_size. If so we allocate new object there.</div><div class='add'>+ *</div><div class='add'>+ * When there is not enough room at the end, we start waiting for</div><div class='add'>+ * each sub object until we reach object_offset+object_size &gt;=</div><div class='add'>+ * alloc_size, this object then become the sub object we return.</div><div class='add'>+ *</div><div class='add'>+ * Alignment can't be bigger than page size.</div><div class='add'>+ *</div><div class='add'>+ * Hole are not considered for allocation to keep things simple.</div><div class='add'>+ * Assumption is that there won't be hole (all object on same</div><div class='add'>+ * alignment).</div><div class='add'>+ */</div><div class='add'>+struct radeon_sa_manager {</div><div class='add'>+	struct radeon_bo	*bo;</div><div class='add'>+	struct list_head	sa_bo;</div><div class='add'>+	unsigned		size;</div><div class='add'>+	uint64_t		gpu_addr;</div><div class='add'>+	void			*cpu_ptr;</div><div class='add'>+	uint32_t		domain;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct radeon_sa_bo;</div><div class='add'>+</div><div class='add'>+/* sub-allocation buffer */</div><div class='add'>+struct radeon_sa_bo {</div><div class='add'>+	struct list_head		list;</div><div class='add'>+	struct radeon_sa_manager	*manager;</div><div class='add'>+	unsigned			offset;</div><div class='add'>+	unsigned			size;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * GEM objects.</div><div class='ctx'>  */</div><div class='hunk'>@@ -303,6 +385,46 @@ int radeon_mode_dumb_destroy(struct drm_file *file_priv,</div><div class='ctx'> 			     uint32_t handle);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Semaphores.</div><div class='add'>+ */</div><div class='add'>+struct radeon_ring;</div><div class='add'>+</div><div class='add'>+#define	RADEON_SEMAPHORE_BO_SIZE	256</div><div class='add'>+</div><div class='add'>+struct radeon_semaphore_driver {</div><div class='add'>+	rwlock_t			lock;</div><div class='add'>+	struct list_head		bo;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct radeon_semaphore_bo;</div><div class='add'>+</div><div class='add'>+/* everything here is constant */</div><div class='add'>+struct radeon_semaphore {</div><div class='add'>+	struct list_head		list;</div><div class='add'>+	uint64_t			gpu_addr;</div><div class='add'>+	uint32_t			*cpu_ptr;</div><div class='add'>+	struct radeon_semaphore_bo	*bo;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct radeon_semaphore_bo {</div><div class='add'>+	struct list_head		list;</div><div class='add'>+	struct radeon_ib		*ib;</div><div class='add'>+	struct list_head		free;</div><div class='add'>+	struct radeon_semaphore		semaphores[RADEON_SEMAPHORE_BO_SIZE/8];</div><div class='add'>+	unsigned			nused;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void radeon_semaphore_driver_fini(struct radeon_device *rdev);</div><div class='add'>+int radeon_semaphore_create(struct radeon_device *rdev,</div><div class='add'>+			    struct radeon_semaphore **semaphore);</div><div class='add'>+void radeon_semaphore_emit_signal(struct radeon_device *rdev, int ring,</div><div class='add'>+				  struct radeon_semaphore *semaphore);</div><div class='add'>+void radeon_semaphore_emit_wait(struct radeon_device *rdev, int ring,</div><div class='add'>+				struct radeon_semaphore *semaphore);</div><div class='add'>+void radeon_semaphore_free(struct radeon_device *rdev,</div><div class='add'>+			   struct radeon_semaphore *semaphore);</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * GART structures, functions &amp; helpers</div><div class='ctx'>  */</div><div class='ctx'> struct radeon_mc;</div><div class='hunk'>@@ -310,6 +432,7 @@ struct radeon_mc;</div><div class='ctx'> #define RADEON_GPU_PAGE_SIZE 4096</div><div class='ctx'> #define RADEON_GPU_PAGE_MASK (RADEON_GPU_PAGE_SIZE - 1)</div><div class='ctx'> #define RADEON_GPU_PAGE_SHIFT 12</div><div class='add'>+#define RADEON_GPU_PAGE_ALIGN(a) (((a) + RADEON_GPU_PAGE_MASK) &amp; ~RADEON_GPU_PAGE_MASK)</div><div class='ctx'> </div><div class='ctx'> struct radeon_gart {</div><div class='ctx'> 	dma_addr_t			table_addr;</div><div class='hunk'>@@ -320,7 +443,6 @@ struct radeon_gart {</div><div class='ctx'> 	unsigned			table_size;</div><div class='ctx'> 	struct page			**pages;</div><div class='ctx'> 	dma_addr_t			*pages_addr;</div><div class='del'>-	bool				*ttm_alloced;</div><div class='ctx'> 	bool				ready;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -434,7 +556,7 @@ union radeon_irq_stat_regs {</div><div class='ctx'> </div><div class='ctx'> struct radeon_irq {</div><div class='ctx'> 	bool		installed;</div><div class='del'>-	bool		sw_int;</div><div class='add'>+	bool		sw_int[RADEON_NUM_RINGS];</div><div class='ctx'> 	bool		crtc_vblank_int[RADEON_MAX_CRTCS];</div><div class='ctx'> 	bool		pflip[RADEON_MAX_CRTCS];</div><div class='ctx'> 	wait_queue_head_t	vblank_queue;</div><div class='hunk'>@@ -444,7 +566,7 @@ struct radeon_irq {</div><div class='ctx'> 	wait_queue_head_t	idle_queue;</div><div class='ctx'> 	bool		hdmi[RADEON_MAX_HDMI_BLOCKS];</div><div class='ctx'> 	spinlock_t sw_lock;</div><div class='del'>-	int sw_refcount;</div><div class='add'>+	int sw_refcount[RADEON_NUM_RINGS];</div><div class='ctx'> 	union radeon_irq_stat_regs stat_regs;</div><div class='ctx'> 	spinlock_t pflip_lock[RADEON_MAX_CRTCS];</div><div class='ctx'> 	int pflip_refcount[RADEON_MAX_CRTCS];</div><div class='hunk'>@@ -452,22 +574,23 @@ struct radeon_irq {</div><div class='ctx'> </div><div class='ctx'> int radeon_irq_kms_init(struct radeon_device *rdev);</div><div class='ctx'> void radeon_irq_kms_fini(struct radeon_device *rdev);</div><div class='del'>-void radeon_irq_kms_sw_irq_get(struct radeon_device *rdev);</div><div class='del'>-void radeon_irq_kms_sw_irq_put(struct radeon_device *rdev);</div><div class='add'>+void radeon_irq_kms_sw_irq_get(struct radeon_device *rdev, int ring);</div><div class='add'>+void radeon_irq_kms_sw_irq_put(struct radeon_device *rdev, int ring);</div><div class='ctx'> void radeon_irq_kms_pflip_irq_get(struct radeon_device *rdev, int crtc);</div><div class='ctx'> void radeon_irq_kms_pflip_irq_put(struct radeon_device *rdev, int crtc);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * CP &amp; ring.</div><div class='add'>+ * CP &amp; rings.</div><div class='ctx'>  */</div><div class='add'>+</div><div class='ctx'> struct radeon_ib {</div><div class='del'>-	struct list_head	list;</div><div class='add'>+	struct radeon_sa_bo	sa_bo;</div><div class='ctx'> 	unsigned		idx;</div><div class='add'>+	uint32_t		length_dw;</div><div class='ctx'> 	uint64_t		gpu_addr;</div><div class='del'>-	struct radeon_fence	*fence;</div><div class='ctx'> 	uint32_t		*ptr;</div><div class='del'>-	uint32_t		length_dw;</div><div class='del'>-	bool			free;</div><div class='add'>+	struct radeon_fence	*fence;</div><div class='add'>+	unsigned		vm_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -475,20 +598,22 @@ struct radeon_ib {</div><div class='ctx'>  * mutex protects scheduled_ibs, ready, alloc_bm</div><div class='ctx'>  */</div><div class='ctx'> struct radeon_ib_pool {</div><div class='del'>-	struct mutex		mutex;</div><div class='del'>-	struct radeon_bo	*robj;</div><div class='del'>-	struct list_head	bogus_ib;</div><div class='del'>-	struct radeon_ib	ibs[RADEON_IB_POOL_SIZE];</div><div class='del'>-	bool			ready;</div><div class='del'>-	unsigned		head_id;</div><div class='add'>+	struct mutex			mutex;</div><div class='add'>+	struct radeon_sa_manager	sa_manager;</div><div class='add'>+	struct radeon_ib		ibs[RADEON_IB_POOL_SIZE];</div><div class='add'>+	bool				ready;</div><div class='add'>+	unsigned			head_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct radeon_cp {</div><div class='add'>+struct radeon_ring {</div><div class='ctx'> 	struct radeon_bo	*ring_obj;</div><div class='ctx'> 	volatile uint32_t	*ring;</div><div class='ctx'> 	unsigned		rptr;</div><div class='add'>+	unsigned		rptr_offs;</div><div class='add'>+	unsigned		rptr_reg;</div><div class='ctx'> 	unsigned		wptr;</div><div class='ctx'> 	unsigned		wptr_old;</div><div class='add'>+	unsigned		wptr_reg;</div><div class='ctx'> 	unsigned		ring_size;</div><div class='ctx'> 	unsigned		ring_free_dw;</div><div class='ctx'> 	int			count_dw;</div><div class='hunk'>@@ -497,6 +622,61 @@ struct radeon_cp {</div><div class='ctx'> 	uint32_t		ptr_mask;</div><div class='ctx'> 	struct mutex		mutex;</div><div class='ctx'> 	bool			ready;</div><div class='add'>+	u32			ptr_reg_shift;</div><div class='add'>+	u32			ptr_reg_mask;</div><div class='add'>+	u32			nop;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * VM</div><div class='add'>+ */</div><div class='add'>+struct radeon_vm {</div><div class='add'>+	struct list_head		list;</div><div class='add'>+	struct list_head		va;</div><div class='add'>+	int				id;</div><div class='add'>+	unsigned			last_pfn;</div><div class='add'>+	u64				pt_gpu_addr;</div><div class='add'>+	u64				*pt;</div><div class='add'>+	struct radeon_sa_bo		sa_bo;</div><div class='add'>+	struct mutex			mutex;</div><div class='add'>+	/* last fence for cs using this vm */</div><div class='add'>+	struct radeon_fence		*fence;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct radeon_vm_funcs {</div><div class='add'>+	int (*init)(struct radeon_device *rdev);</div><div class='add'>+	void (*fini)(struct radeon_device *rdev);</div><div class='add'>+	/* cs mutex must be lock for schedule_ib */</div><div class='add'>+	int (*bind)(struct radeon_device *rdev, struct radeon_vm *vm, int id);</div><div class='add'>+	void (*unbind)(struct radeon_device *rdev, struct radeon_vm *vm);</div><div class='add'>+	void (*tlb_flush)(struct radeon_device *rdev, struct radeon_vm *vm);</div><div class='add'>+	uint32_t (*page_flags)(struct radeon_device *rdev,</div><div class='add'>+			       struct radeon_vm *vm,</div><div class='add'>+			       uint32_t flags);</div><div class='add'>+	void (*set_page)(struct radeon_device *rdev, struct radeon_vm *vm,</div><div class='add'>+			unsigned pfn, uint64_t addr, uint32_t flags);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct radeon_vm_manager {</div><div class='add'>+	struct list_head		lru_vm;</div><div class='add'>+	uint32_t			use_bitmap;</div><div class='add'>+	struct radeon_sa_manager	sa_manager;</div><div class='add'>+	uint32_t			max_pfn;</div><div class='add'>+	/* fields constant after init */</div><div class='add'>+	const struct radeon_vm_funcs	*funcs;</div><div class='add'>+	/* number of VMIDs */</div><div class='add'>+	unsigned			nvm;</div><div class='add'>+	/* vram base address for page table entry  */</div><div class='add'>+	u64				vram_base_offset;</div><div class='add'>+	/* is vm enabled? */</div><div class='add'>+	bool				enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * file private structure</div><div class='add'>+ */</div><div class='add'>+struct radeon_fpriv {</div><div class='add'>+	struct radeon_vm		vm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -506,6 +686,7 @@ struct r600_ih {</div><div class='ctx'> 	struct radeon_bo	*ring_obj;</div><div class='ctx'> 	volatile uint32_t	*ring;</div><div class='ctx'> 	unsigned		rptr;</div><div class='add'>+	unsigned		rptr_offs;</div><div class='ctx'> 	unsigned		wptr;</div><div class='ctx'> 	unsigned		wptr_old;</div><div class='ctx'> 	unsigned		ring_size;</div><div class='hunk'>@@ -549,23 +730,29 @@ struct r600_blit {</div><div class='ctx'> </div><div class='ctx'> void r600_blit_suspend(struct radeon_device *rdev);</div><div class='ctx'> </div><div class='del'>-int radeon_ib_get(struct radeon_device *rdev, struct radeon_ib **ib);</div><div class='add'>+int radeon_ib_get(struct radeon_device *rdev, int ring,</div><div class='add'>+		  struct radeon_ib **ib, unsigned size);</div><div class='ctx'> void radeon_ib_free(struct radeon_device *rdev, struct radeon_ib **ib);</div><div class='add'>+bool radeon_ib_try_free(struct radeon_device *rdev, struct radeon_ib *ib);</div><div class='ctx'> int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib);</div><div class='ctx'> int radeon_ib_pool_init(struct radeon_device *rdev);</div><div class='ctx'> void radeon_ib_pool_fini(struct radeon_device *rdev);</div><div class='add'>+int radeon_ib_pool_start(struct radeon_device *rdev);</div><div class='add'>+int radeon_ib_pool_suspend(struct radeon_device *rdev);</div><div class='ctx'> int radeon_ib_test(struct radeon_device *rdev);</div><div class='del'>-extern void radeon_ib_bogus_add(struct radeon_device *rdev, struct radeon_ib *ib);</div><div class='ctx'> /* Ring access between begin &amp; end cannot sleep */</div><div class='del'>-void radeon_ring_free_size(struct radeon_device *rdev);</div><div class='del'>-int radeon_ring_alloc(struct radeon_device *rdev, unsigned ndw);</div><div class='del'>-int radeon_ring_lock(struct radeon_device *rdev, unsigned ndw);</div><div class='del'>-void radeon_ring_commit(struct radeon_device *rdev);</div><div class='del'>-void radeon_ring_unlock_commit(struct radeon_device *rdev);</div><div class='del'>-void radeon_ring_unlock_undo(struct radeon_device *rdev);</div><div class='del'>-int radeon_ring_test(struct radeon_device *rdev);</div><div class='del'>-int radeon_ring_init(struct radeon_device *rdev, unsigned ring_size);</div><div class='del'>-void radeon_ring_fini(struct radeon_device *rdev);</div><div class='add'>+int radeon_ring_index(struct radeon_device *rdev, struct radeon_ring *cp);</div><div class='add'>+void radeon_ring_free_size(struct radeon_device *rdev, struct radeon_ring *cp);</div><div class='add'>+int radeon_ring_alloc(struct radeon_device *rdev, struct radeon_ring *cp, unsigned ndw);</div><div class='add'>+int radeon_ring_lock(struct radeon_device *rdev, struct radeon_ring *cp, unsigned ndw);</div><div class='add'>+void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *cp);</div><div class='add'>+void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *cp);</div><div class='add'>+void radeon_ring_unlock_undo(struct radeon_device *rdev, struct radeon_ring *cp);</div><div class='add'>+int radeon_ring_test(struct radeon_device *rdev, struct radeon_ring *cp);</div><div class='add'>+int radeon_ring_init(struct radeon_device *rdev, struct radeon_ring *cp, unsigned ring_size,</div><div class='add'>+		     unsigned rptr_offs, unsigned rptr_reg, unsigned wptr_reg,</div><div class='add'>+		     u32 ptr_reg_shift, u32 ptr_reg_mask, u32 nop);</div><div class='add'>+void radeon_ring_fini(struct radeon_device *rdev, struct radeon_ring *cp);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -582,12 +769,12 @@ struct radeon_cs_reloc {</div><div class='ctx'> struct radeon_cs_chunk {</div><div class='ctx'> 	uint32_t		chunk_id;</div><div class='ctx'> 	uint32_t		length_dw;</div><div class='del'>-	int kpage_idx[2];</div><div class='del'>-	uint32_t                *kpage[2];</div><div class='add'>+	int			kpage_idx[2];</div><div class='add'>+	uint32_t		*kpage[2];</div><div class='ctx'> 	uint32_t		*kdata;</div><div class='del'>-	void __user *user_ptr;</div><div class='del'>-	int last_copied_page;</div><div class='del'>-	int last_page_index;</div><div class='add'>+	void __user		*user_ptr;</div><div class='add'>+	int			last_copied_page;</div><div class='add'>+	int			last_page_index;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct radeon_cs_parser {</div><div class='hunk'>@@ -605,14 +792,18 @@ struct radeon_cs_parser {</div><div class='ctx'> 	struct radeon_cs_reloc	*relocs;</div><div class='ctx'> 	struct radeon_cs_reloc	**relocs_ptr;</div><div class='ctx'> 	struct list_head	validated;</div><div class='add'>+	bool			sync_to_ring[RADEON_NUM_RINGS];</div><div class='ctx'> 	/* indices of various chunks */</div><div class='ctx'> 	int			chunk_ib_idx;</div><div class='ctx'> 	int			chunk_relocs_idx;</div><div class='add'>+	int			chunk_flags_idx;</div><div class='ctx'> 	struct radeon_ib	*ib;</div><div class='ctx'> 	void			*track;</div><div class='ctx'> 	unsigned		family;</div><div class='ctx'> 	int			parser_error;</div><div class='del'>-	bool			keep_tiling_flags;</div><div class='add'>+	u32			cs_flags;</div><div class='add'>+	u32			ring;</div><div class='add'>+	s32			priority;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern int radeon_cs_update_pages(struct radeon_cs_parser *p, int pg_idx);</div><div class='hunk'>@@ -869,11 +1060,20 @@ void radeon_benchmark(struct radeon_device *rdev, int test_number);</div><div class='ctx'>  * Testing</div><div class='ctx'>  */</div><div class='ctx'> void radeon_test_moves(struct radeon_device *rdev);</div><div class='add'>+void radeon_test_ring_sync(struct radeon_device *rdev,</div><div class='add'>+			   struct radeon_ring *cpA,</div><div class='add'>+			   struct radeon_ring *cpB);</div><div class='add'>+void radeon_test_syncing(struct radeon_device *rdev);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Debugfs</div><div class='ctx'>  */</div><div class='add'>+struct radeon_debugfs {</div><div class='add'>+	struct drm_info_list	*files;</div><div class='add'>+	unsigned		num_files;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int radeon_debugfs_add_files(struct radeon_device *rdev,</div><div class='ctx'> 			     struct drm_info_list *files,</div><div class='ctx'> 			     unsigned nfiles);</div><div class='hunk'>@@ -889,21 +1089,27 @@ struct radeon_asic {</div><div class='ctx'> 	int (*resume)(struct radeon_device *rdev);</div><div class='ctx'> 	int (*suspend)(struct radeon_device *rdev);</div><div class='ctx'> 	void (*vga_set_state)(struct radeon_device *rdev, bool state);</div><div class='del'>-	bool (*gpu_is_lockup)(struct radeon_device *rdev);</div><div class='add'>+	bool (*gpu_is_lockup)(struct radeon_device *rdev, struct radeon_ring *cp);</div><div class='ctx'> 	int (*asic_reset)(struct radeon_device *rdev);</div><div class='ctx'> 	void (*gart_tlb_flush)(struct radeon_device *rdev);</div><div class='ctx'> 	int (*gart_set_page)(struct radeon_device *rdev, int i, uint64_t addr);</div><div class='ctx'> 	int (*cp_init)(struct radeon_device *rdev, unsigned ring_size);</div><div class='ctx'> 	void (*cp_fini)(struct radeon_device *rdev);</div><div class='ctx'> 	void (*cp_disable)(struct radeon_device *rdev);</div><div class='del'>-	void (*cp_commit)(struct radeon_device *rdev);</div><div class='ctx'> 	void (*ring_start)(struct radeon_device *rdev);</div><div class='del'>-	int (*ring_test)(struct radeon_device *rdev);</div><div class='del'>-	void (*ring_ib_execute)(struct radeon_device *rdev, struct radeon_ib *ib);</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		void (*ib_execute)(struct radeon_device *rdev, struct radeon_ib *ib);</div><div class='add'>+		int (*ib_parse)(struct radeon_device *rdev, struct radeon_ib *ib);</div><div class='add'>+		void (*emit_fence)(struct radeon_device *rdev, struct radeon_fence *fence);</div><div class='add'>+		void (*emit_semaphore)(struct radeon_device *rdev, struct radeon_ring *cp,</div><div class='add'>+				       struct radeon_semaphore *semaphore, bool emit_wait);</div><div class='add'>+	} ring[RADEON_NUM_RINGS];</div><div class='add'>+</div><div class='add'>+	int (*ring_test)(struct radeon_device *rdev, struct radeon_ring *cp);</div><div class='ctx'> 	int (*irq_set)(struct radeon_device *rdev);</div><div class='ctx'> 	int (*irq_process)(struct radeon_device *rdev);</div><div class='ctx'> 	u32 (*get_vblank_counter)(struct radeon_device *rdev, int crtc);</div><div class='del'>-	void (*fence_ring_emit)(struct radeon_device *rdev, struct radeon_fence *fence);</div><div class='ctx'> 	int (*cs_parse)(struct radeon_cs_parser *p);</div><div class='ctx'> 	int (*copy_blit)(struct radeon_device *rdev,</div><div class='ctx'> 			 uint64_t src_offset,</div><div class='hunk'>@@ -1132,6 +1338,8 @@ int radeon_gem_busy_ioctl(struct drm_device *dev, void *data,</div><div class='ctx'> 			  struct drm_file *filp);</div><div class='ctx'> int radeon_gem_wait_idle_ioctl(struct drm_device *dev, void *data,</div><div class='ctx'> 			      struct drm_file *filp);</div><div class='add'>+int radeon_gem_va_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			  struct drm_file *filp);</div><div class='ctx'> int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp);</div><div class='ctx'> int radeon_gem_set_tiling_ioctl(struct drm_device *dev, void *data,</div><div class='ctx'> 				struct drm_file *filp);</div><div class='hunk'>@@ -1231,11 +1439,10 @@ struct radeon_device {</div><div class='ctx'> 	struct radeon_mode_info		mode_info;</div><div class='ctx'> 	struct radeon_scratch		scratch;</div><div class='ctx'> 	struct radeon_mman		mman;</div><div class='del'>-	struct radeon_fence_driver	fence_drv;</div><div class='del'>-	struct radeon_cp		cp;</div><div class='del'>-	/* cayman compute rings */</div><div class='del'>-	struct radeon_cp		cp1;</div><div class='del'>-	struct radeon_cp		cp2;</div><div class='add'>+	rwlock_t			fence_lock;</div><div class='add'>+	struct radeon_fence_driver	fence_drv[RADEON_NUM_RINGS];</div><div class='add'>+	struct radeon_semaphore_driver	semaphore_drv;</div><div class='add'>+	struct radeon_ring		ring[RADEON_NUM_RINGS];</div><div class='ctx'> 	struct radeon_ib_pool		ib_pool;</div><div class='ctx'> 	struct radeon_irq		irq;</div><div class='ctx'> 	struct radeon_asic		*asic;</div><div class='hunk'>@@ -1279,6 +1486,13 @@ struct radeon_device {</div><div class='ctx'> 	struct drm_file *cmask_filp;</div><div class='ctx'> 	/* i2c buses */</div><div class='ctx'> 	struct radeon_i2c_chan *i2c_bus[RADEON_MAX_I2C_BUS];</div><div class='add'>+	/* debugfs */</div><div class='add'>+	struct radeon_debugfs	debugfs[RADEON_DEBUGFS_MAX_COMPONENTS];</div><div class='add'>+	unsigned 		debugfs_count;</div><div class='add'>+	/* virtual memory */</div><div class='add'>+	struct radeon_vm_manager	vm_manager;</div><div class='add'>+	/* ring used for bo copies */</div><div class='add'>+	u32				copy_ring;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int radeon_device_init(struct radeon_device *rdev,</div><div class='hunk'>@@ -1414,18 +1628,17 @@ void radeon_atombios_fini(struct radeon_device *rdev);</div><div class='ctx'> /*</div><div class='ctx'>  * RING helpers.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #if DRM_DEBUG_CODE == 0</div><div class='del'>-static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)</div><div class='add'>+static inline void radeon_ring_write(struct radeon_ring *ring, uint32_t v)</div><div class='ctx'> {</div><div class='del'>-	rdev-&gt;cp.ring[rdev-&gt;cp.wptr++] = v;</div><div class='del'>-	rdev-&gt;cp.wptr &amp;= rdev-&gt;cp.ptr_mask;</div><div class='del'>-	rdev-&gt;cp.count_dw--;</div><div class='del'>-	rdev-&gt;cp.ring_free_dw--;</div><div class='add'>+	ring-&gt;ring[ring-&gt;wptr++] = v;</div><div class='add'>+	ring-&gt;wptr &amp;= ring-&gt;ptr_mask;</div><div class='add'>+	ring-&gt;count_dw--;</div><div class='add'>+	ring-&gt;ring_free_dw--;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> /* With debugging this is just too big to inline */</div><div class='del'>-void radeon_ring_write(struct radeon_device *rdev, uint32_t v);</div><div class='add'>+void radeon_ring_write(struct radeon_ring *ring, uint32_t v);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1437,18 +1650,19 @@ void radeon_ring_write(struct radeon_device *rdev, uint32_t v);</div><div class='ctx'> #define radeon_suspend(rdev) (rdev)-&gt;asic-&gt;suspend((rdev))</div><div class='ctx'> #define radeon_cs_parse(p) rdev-&gt;asic-&gt;cs_parse((p))</div><div class='ctx'> #define radeon_vga_set_state(rdev, state) (rdev)-&gt;asic-&gt;vga_set_state((rdev), (state))</div><div class='del'>-#define radeon_gpu_is_lockup(rdev) (rdev)-&gt;asic-&gt;gpu_is_lockup((rdev))</div><div class='add'>+#define radeon_gpu_is_lockup(rdev, cp) (rdev)-&gt;asic-&gt;gpu_is_lockup((rdev), (cp))</div><div class='ctx'> #define radeon_asic_reset(rdev) (rdev)-&gt;asic-&gt;asic_reset((rdev))</div><div class='ctx'> #define radeon_gart_tlb_flush(rdev) (rdev)-&gt;asic-&gt;gart_tlb_flush((rdev))</div><div class='ctx'> #define radeon_gart_set_page(rdev, i, p) (rdev)-&gt;asic-&gt;gart_set_page((rdev), (i), (p))</div><div class='del'>-#define radeon_cp_commit(rdev) (rdev)-&gt;asic-&gt;cp_commit((rdev))</div><div class='ctx'> #define radeon_ring_start(rdev) (rdev)-&gt;asic-&gt;ring_start((rdev))</div><div class='del'>-#define radeon_ring_test(rdev) (rdev)-&gt;asic-&gt;ring_test((rdev))</div><div class='del'>-#define radeon_ring_ib_execute(rdev, ib) (rdev)-&gt;asic-&gt;ring_ib_execute((rdev), (ib))</div><div class='add'>+#define radeon_ring_test(rdev, cp) (rdev)-&gt;asic-&gt;ring_test((rdev), (cp))</div><div class='add'>+#define radeon_ring_ib_execute(rdev, r, ib) (rdev)-&gt;asic-&gt;ring[(r)].ib_execute((rdev), (ib))</div><div class='add'>+#define radeon_ring_ib_parse(rdev, r, ib) (rdev)-&gt;asic-&gt;ring[(r)].ib_parse((rdev), (ib))</div><div class='ctx'> #define radeon_irq_set(rdev) (rdev)-&gt;asic-&gt;irq_set((rdev))</div><div class='ctx'> #define radeon_irq_process(rdev) (rdev)-&gt;asic-&gt;irq_process((rdev))</div><div class='ctx'> #define radeon_get_vblank_counter(rdev, crtc) (rdev)-&gt;asic-&gt;get_vblank_counter((rdev), (crtc))</div><div class='del'>-#define radeon_fence_ring_emit(rdev, fence) (rdev)-&gt;asic-&gt;fence_ring_emit((rdev), (fence))</div><div class='add'>+#define radeon_fence_ring_emit(rdev, r, fence) (rdev)-&gt;asic-&gt;ring[(r)].emit_fence((rdev), (fence))</div><div class='add'>+#define radeon_semaphore_ring_emit(rdev, r, cp, semaphore, emit_wait) (rdev)-&gt;asic-&gt;ring[(r)].emit_semaphore((rdev), (cp), (semaphore), (emit_wait))</div><div class='ctx'> #define radeon_copy_blit(rdev, s, d, np, f) (rdev)-&gt;asic-&gt;copy_blit((rdev), (s), (d), (np), (f))</div><div class='ctx'> #define radeon_copy_dma(rdev, s, d, np, f) (rdev)-&gt;asic-&gt;copy_dma((rdev), (s), (d), (np), (f))</div><div class='ctx'> #define radeon_copy(rdev, s, d, np, f) (rdev)-&gt;asic-&gt;copy((rdev), (s), (d), (np), (f))</div><div class='hunk'>@@ -1503,6 +1717,33 @@ extern int radeon_suspend_kms(struct drm_device *dev, pm_message_t state);</div><div class='ctx'> extern void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * vm</div><div class='add'>+ */</div><div class='add'>+int radeon_vm_manager_init(struct radeon_device *rdev);</div><div class='add'>+void radeon_vm_manager_fini(struct radeon_device *rdev);</div><div class='add'>+int radeon_vm_manager_start(struct radeon_device *rdev);</div><div class='add'>+int radeon_vm_manager_suspend(struct radeon_device *rdev);</div><div class='add'>+int radeon_vm_init(struct radeon_device *rdev, struct radeon_vm *vm);</div><div class='add'>+void radeon_vm_fini(struct radeon_device *rdev, struct radeon_vm *vm);</div><div class='add'>+int radeon_vm_bind(struct radeon_device *rdev, struct radeon_vm *vm);</div><div class='add'>+void radeon_vm_unbind(struct radeon_device *rdev, struct radeon_vm *vm);</div><div class='add'>+int radeon_vm_bo_update_pte(struct radeon_device *rdev,</div><div class='add'>+			    struct radeon_vm *vm,</div><div class='add'>+			    struct radeon_bo *bo,</div><div class='add'>+			    struct ttm_mem_reg *mem);</div><div class='add'>+void radeon_vm_bo_invalidate(struct radeon_device *rdev,</div><div class='add'>+			     struct radeon_bo *bo);</div><div class='add'>+int radeon_vm_bo_add(struct radeon_device *rdev,</div><div class='add'>+		     struct radeon_vm *vm,</div><div class='add'>+		     struct radeon_bo *bo,</div><div class='add'>+		     uint64_t offset,</div><div class='add'>+		     uint32_t flags);</div><div class='add'>+int radeon_vm_bo_rmv(struct radeon_device *rdev,</div><div class='add'>+		     struct radeon_vm *vm,</div><div class='add'>+		     struct radeon_bo *bo);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * R600 vram scratch functions</div><div class='ctx'>  */</div><div class='ctx'> int r600_vram_scratch_init(struct radeon_device *rdev);</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c<br/>index a2e1eae114ef..36a6192ce862 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_asic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_asic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_asic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_asic.c</a></div><div class='hunk'>@@ -138,14 +138,18 @@ static struct radeon_asic r100_asic = {</div><div class='ctx'> 	.asic_reset = &amp;r100_asic_reset,</div><div class='ctx'> 	.gart_tlb_flush = &amp;r100_pci_gart_tlb_flush,</div><div class='ctx'> 	.gart_set_page = &amp;r100_pci_gart_set_page,</div><div class='del'>-	.cp_commit = &amp;r100_cp_commit,</div><div class='ctx'> 	.ring_start = &amp;r100_ring_start,</div><div class='ctx'> 	.ring_test = &amp;r100_ring_test,</div><div class='del'>-	.ring_ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+	.ring = {</div><div class='add'>+		[RADEON_RING_TYPE_GFX_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+			.emit_fence = &amp;r100_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r100_semaphore_ring_emit,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> 	.irq_set = &amp;r100_irq_set,</div><div class='ctx'> 	.irq_process = &amp;r100_irq_process,</div><div class='ctx'> 	.get_vblank_counter = &amp;r100_get_vblank_counter,</div><div class='del'>-	.fence_ring_emit = &amp;r100_fence_ring_emit,</div><div class='ctx'> 	.cs_parse = &amp;r100_cs_parse,</div><div class='ctx'> 	.copy_blit = &amp;r100_copy_blit,</div><div class='ctx'> 	.copy_dma = NULL,</div><div class='hunk'>@@ -186,14 +190,18 @@ static struct radeon_asic r200_asic = {</div><div class='ctx'> 	.asic_reset = &amp;r100_asic_reset,</div><div class='ctx'> 	.gart_tlb_flush = &amp;r100_pci_gart_tlb_flush,</div><div class='ctx'> 	.gart_set_page = &amp;r100_pci_gart_set_page,</div><div class='del'>-	.cp_commit = &amp;r100_cp_commit,</div><div class='ctx'> 	.ring_start = &amp;r100_ring_start,</div><div class='ctx'> 	.ring_test = &amp;r100_ring_test,</div><div class='del'>-	.ring_ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+	.ring = {</div><div class='add'>+		[RADEON_RING_TYPE_GFX_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+			.emit_fence = &amp;r100_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r100_semaphore_ring_emit,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> 	.irq_set = &amp;r100_irq_set,</div><div class='ctx'> 	.irq_process = &amp;r100_irq_process,</div><div class='ctx'> 	.get_vblank_counter = &amp;r100_get_vblank_counter,</div><div class='del'>-	.fence_ring_emit = &amp;r100_fence_ring_emit,</div><div class='ctx'> 	.cs_parse = &amp;r100_cs_parse,</div><div class='ctx'> 	.copy_blit = &amp;r100_copy_blit,</div><div class='ctx'> 	.copy_dma = &amp;r200_copy_dma,</div><div class='hunk'>@@ -233,14 +241,18 @@ static struct radeon_asic r300_asic = {</div><div class='ctx'> 	.asic_reset = &amp;r300_asic_reset,</div><div class='ctx'> 	.gart_tlb_flush = &amp;r100_pci_gart_tlb_flush,</div><div class='ctx'> 	.gart_set_page = &amp;r100_pci_gart_set_page,</div><div class='del'>-	.cp_commit = &amp;r100_cp_commit,</div><div class='ctx'> 	.ring_start = &amp;r300_ring_start,</div><div class='ctx'> 	.ring_test = &amp;r100_ring_test,</div><div class='del'>-	.ring_ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+	.ring = {</div><div class='add'>+		[RADEON_RING_TYPE_GFX_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+			.emit_fence = &amp;r300_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r100_semaphore_ring_emit,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> 	.irq_set = &amp;r100_irq_set,</div><div class='ctx'> 	.irq_process = &amp;r100_irq_process,</div><div class='ctx'> 	.get_vblank_counter = &amp;r100_get_vblank_counter,</div><div class='del'>-	.fence_ring_emit = &amp;r300_fence_ring_emit,</div><div class='ctx'> 	.cs_parse = &amp;r300_cs_parse,</div><div class='ctx'> 	.copy_blit = &amp;r100_copy_blit,</div><div class='ctx'> 	.copy_dma = &amp;r200_copy_dma,</div><div class='hunk'>@@ -281,14 +293,18 @@ static struct radeon_asic r300_asic_pcie = {</div><div class='ctx'> 	.asic_reset = &amp;r300_asic_reset,</div><div class='ctx'> 	.gart_tlb_flush = &amp;rv370_pcie_gart_tlb_flush,</div><div class='ctx'> 	.gart_set_page = &amp;rv370_pcie_gart_set_page,</div><div class='del'>-	.cp_commit = &amp;r100_cp_commit,</div><div class='ctx'> 	.ring_start = &amp;r300_ring_start,</div><div class='ctx'> 	.ring_test = &amp;r100_ring_test,</div><div class='del'>-	.ring_ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+	.ring = {</div><div class='add'>+		[RADEON_RING_TYPE_GFX_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+			.emit_fence = &amp;r300_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r100_semaphore_ring_emit,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> 	.irq_set = &amp;r100_irq_set,</div><div class='ctx'> 	.irq_process = &amp;r100_irq_process,</div><div class='ctx'> 	.get_vblank_counter = &amp;r100_get_vblank_counter,</div><div class='del'>-	.fence_ring_emit = &amp;r300_fence_ring_emit,</div><div class='ctx'> 	.cs_parse = &amp;r300_cs_parse,</div><div class='ctx'> 	.copy_blit = &amp;r100_copy_blit,</div><div class='ctx'> 	.copy_dma = &amp;r200_copy_dma,</div><div class='hunk'>@@ -328,14 +344,18 @@ static struct radeon_asic r420_asic = {</div><div class='ctx'> 	.asic_reset = &amp;r300_asic_reset,</div><div class='ctx'> 	.gart_tlb_flush = &amp;rv370_pcie_gart_tlb_flush,</div><div class='ctx'> 	.gart_set_page = &amp;rv370_pcie_gart_set_page,</div><div class='del'>-	.cp_commit = &amp;r100_cp_commit,</div><div class='ctx'> 	.ring_start = &amp;r300_ring_start,</div><div class='ctx'> 	.ring_test = &amp;r100_ring_test,</div><div class='del'>-	.ring_ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+	.ring = {</div><div class='add'>+		[RADEON_RING_TYPE_GFX_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+			.emit_fence = &amp;r300_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r100_semaphore_ring_emit,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> 	.irq_set = &amp;r100_irq_set,</div><div class='ctx'> 	.irq_process = &amp;r100_irq_process,</div><div class='ctx'> 	.get_vblank_counter = &amp;r100_get_vblank_counter,</div><div class='del'>-	.fence_ring_emit = &amp;r300_fence_ring_emit,</div><div class='ctx'> 	.cs_parse = &amp;r300_cs_parse,</div><div class='ctx'> 	.copy_blit = &amp;r100_copy_blit,</div><div class='ctx'> 	.copy_dma = &amp;r200_copy_dma,</div><div class='hunk'>@@ -376,14 +396,18 @@ static struct radeon_asic rs400_asic = {</div><div class='ctx'> 	.asic_reset = &amp;r300_asic_reset,</div><div class='ctx'> 	.gart_tlb_flush = &amp;rs400_gart_tlb_flush,</div><div class='ctx'> 	.gart_set_page = &amp;rs400_gart_set_page,</div><div class='del'>-	.cp_commit = &amp;r100_cp_commit,</div><div class='ctx'> 	.ring_start = &amp;r300_ring_start,</div><div class='ctx'> 	.ring_test = &amp;r100_ring_test,</div><div class='del'>-	.ring_ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+	.ring = {</div><div class='add'>+		[RADEON_RING_TYPE_GFX_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+			.emit_fence = &amp;r300_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r100_semaphore_ring_emit,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> 	.irq_set = &amp;r100_irq_set,</div><div class='ctx'> 	.irq_process = &amp;r100_irq_process,</div><div class='ctx'> 	.get_vblank_counter = &amp;r100_get_vblank_counter,</div><div class='del'>-	.fence_ring_emit = &amp;r300_fence_ring_emit,</div><div class='ctx'> 	.cs_parse = &amp;r300_cs_parse,</div><div class='ctx'> 	.copy_blit = &amp;r100_copy_blit,</div><div class='ctx'> 	.copy_dma = &amp;r200_copy_dma,</div><div class='hunk'>@@ -424,14 +448,18 @@ static struct radeon_asic rs600_asic = {</div><div class='ctx'> 	.asic_reset = &amp;rs600_asic_reset,</div><div class='ctx'> 	.gart_tlb_flush = &amp;rs600_gart_tlb_flush,</div><div class='ctx'> 	.gart_set_page = &amp;rs600_gart_set_page,</div><div class='del'>-	.cp_commit = &amp;r100_cp_commit,</div><div class='ctx'> 	.ring_start = &amp;r300_ring_start,</div><div class='ctx'> 	.ring_test = &amp;r100_ring_test,</div><div class='del'>-	.ring_ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+	.ring = {</div><div class='add'>+		[RADEON_RING_TYPE_GFX_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+			.emit_fence = &amp;r300_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r100_semaphore_ring_emit,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> 	.irq_set = &amp;rs600_irq_set,</div><div class='ctx'> 	.irq_process = &amp;rs600_irq_process,</div><div class='ctx'> 	.get_vblank_counter = &amp;rs600_get_vblank_counter,</div><div class='del'>-	.fence_ring_emit = &amp;r300_fence_ring_emit,</div><div class='ctx'> 	.cs_parse = &amp;r300_cs_parse,</div><div class='ctx'> 	.copy_blit = &amp;r100_copy_blit,</div><div class='ctx'> 	.copy_dma = &amp;r200_copy_dma,</div><div class='hunk'>@@ -472,14 +500,18 @@ static struct radeon_asic rs690_asic = {</div><div class='ctx'> 	.asic_reset = &amp;rs600_asic_reset,</div><div class='ctx'> 	.gart_tlb_flush = &amp;rs400_gart_tlb_flush,</div><div class='ctx'> 	.gart_set_page = &amp;rs400_gart_set_page,</div><div class='del'>-	.cp_commit = &amp;r100_cp_commit,</div><div class='ctx'> 	.ring_start = &amp;r300_ring_start,</div><div class='ctx'> 	.ring_test = &amp;r100_ring_test,</div><div class='del'>-	.ring_ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+	.ring = {</div><div class='add'>+		[RADEON_RING_TYPE_GFX_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+			.emit_fence = &amp;r300_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r100_semaphore_ring_emit,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> 	.irq_set = &amp;rs600_irq_set,</div><div class='ctx'> 	.irq_process = &amp;rs600_irq_process,</div><div class='ctx'> 	.get_vblank_counter = &amp;rs600_get_vblank_counter,</div><div class='del'>-	.fence_ring_emit = &amp;r300_fence_ring_emit,</div><div class='ctx'> 	.cs_parse = &amp;r300_cs_parse,</div><div class='ctx'> 	.copy_blit = &amp;r100_copy_blit,</div><div class='ctx'> 	.copy_dma = &amp;r200_copy_dma,</div><div class='hunk'>@@ -520,14 +552,18 @@ static struct radeon_asic rv515_asic = {</div><div class='ctx'> 	.asic_reset = &amp;rs600_asic_reset,</div><div class='ctx'> 	.gart_tlb_flush = &amp;rv370_pcie_gart_tlb_flush,</div><div class='ctx'> 	.gart_set_page = &amp;rv370_pcie_gart_set_page,</div><div class='del'>-	.cp_commit = &amp;r100_cp_commit,</div><div class='ctx'> 	.ring_start = &amp;rv515_ring_start,</div><div class='ctx'> 	.ring_test = &amp;r100_ring_test,</div><div class='del'>-	.ring_ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+	.ring = {</div><div class='add'>+		[RADEON_RING_TYPE_GFX_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+			.emit_fence = &amp;r300_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r100_semaphore_ring_emit,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> 	.irq_set = &amp;rs600_irq_set,</div><div class='ctx'> 	.irq_process = &amp;rs600_irq_process,</div><div class='ctx'> 	.get_vblank_counter = &amp;rs600_get_vblank_counter,</div><div class='del'>-	.fence_ring_emit = &amp;r300_fence_ring_emit,</div><div class='ctx'> 	.cs_parse = &amp;r300_cs_parse,</div><div class='ctx'> 	.copy_blit = &amp;r100_copy_blit,</div><div class='ctx'> 	.copy_dma = &amp;r200_copy_dma,</div><div class='hunk'>@@ -568,14 +604,18 @@ static struct radeon_asic r520_asic = {</div><div class='ctx'> 	.asic_reset = &amp;rs600_asic_reset,</div><div class='ctx'> 	.gart_tlb_flush = &amp;rv370_pcie_gart_tlb_flush,</div><div class='ctx'> 	.gart_set_page = &amp;rv370_pcie_gart_set_page,</div><div class='del'>-	.cp_commit = &amp;r100_cp_commit,</div><div class='ctx'> 	.ring_start = &amp;rv515_ring_start,</div><div class='ctx'> 	.ring_test = &amp;r100_ring_test,</div><div class='del'>-	.ring_ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+	.ring = {</div><div class='add'>+		[RADEON_RING_TYPE_GFX_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;r100_ring_ib_execute,</div><div class='add'>+			.emit_fence = &amp;r300_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r100_semaphore_ring_emit,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> 	.irq_set = &amp;rs600_irq_set,</div><div class='ctx'> 	.irq_process = &amp;rs600_irq_process,</div><div class='ctx'> 	.get_vblank_counter = &amp;rs600_get_vblank_counter,</div><div class='del'>-	.fence_ring_emit = &amp;r300_fence_ring_emit,</div><div class='ctx'> 	.cs_parse = &amp;r300_cs_parse,</div><div class='ctx'> 	.copy_blit = &amp;r100_copy_blit,</div><div class='ctx'> 	.copy_dma = &amp;r200_copy_dma,</div><div class='hunk'>@@ -611,18 +651,22 @@ static struct radeon_asic r600_asic = {</div><div class='ctx'> 	.fini = &amp;r600_fini,</div><div class='ctx'> 	.suspend = &amp;r600_suspend,</div><div class='ctx'> 	.resume = &amp;r600_resume,</div><div class='del'>-	.cp_commit = &amp;r600_cp_commit,</div><div class='ctx'> 	.vga_set_state = &amp;r600_vga_set_state,</div><div class='ctx'> 	.gpu_is_lockup = &amp;r600_gpu_is_lockup,</div><div class='ctx'> 	.asic_reset = &amp;r600_asic_reset,</div><div class='ctx'> 	.gart_tlb_flush = &amp;r600_pcie_gart_tlb_flush,</div><div class='ctx'> 	.gart_set_page = &amp;rs600_gart_set_page,</div><div class='ctx'> 	.ring_test = &amp;r600_ring_test,</div><div class='del'>-	.ring_ib_execute = &amp;r600_ring_ib_execute,</div><div class='add'>+	.ring = {</div><div class='add'>+		[RADEON_RING_TYPE_GFX_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;r600_ring_ib_execute,</div><div class='add'>+			.emit_fence = &amp;r600_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r600_semaphore_ring_emit,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> 	.irq_set = &amp;r600_irq_set,</div><div class='ctx'> 	.irq_process = &amp;r600_irq_process,</div><div class='ctx'> 	.get_vblank_counter = &amp;rs600_get_vblank_counter,</div><div class='del'>-	.fence_ring_emit = &amp;r600_fence_ring_emit,</div><div class='ctx'> 	.cs_parse = &amp;r600_cs_parse,</div><div class='ctx'> 	.copy_blit = &amp;r600_copy_blit,</div><div class='ctx'> 	.copy_dma = NULL,</div><div class='hunk'>@@ -658,18 +702,22 @@ static struct radeon_asic rs780_asic = {</div><div class='ctx'> 	.fini = &amp;r600_fini,</div><div class='ctx'> 	.suspend = &amp;r600_suspend,</div><div class='ctx'> 	.resume = &amp;r600_resume,</div><div class='del'>-	.cp_commit = &amp;r600_cp_commit,</div><div class='ctx'> 	.gpu_is_lockup = &amp;r600_gpu_is_lockup,</div><div class='ctx'> 	.vga_set_state = &amp;r600_vga_set_state,</div><div class='ctx'> 	.asic_reset = &amp;r600_asic_reset,</div><div class='ctx'> 	.gart_tlb_flush = &amp;r600_pcie_gart_tlb_flush,</div><div class='ctx'> 	.gart_set_page = &amp;rs600_gart_set_page,</div><div class='ctx'> 	.ring_test = &amp;r600_ring_test,</div><div class='del'>-	.ring_ib_execute = &amp;r600_ring_ib_execute,</div><div class='add'>+	.ring = {</div><div class='add'>+		[RADEON_RING_TYPE_GFX_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;r600_ring_ib_execute,</div><div class='add'>+			.emit_fence = &amp;r600_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r600_semaphore_ring_emit,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> 	.irq_set = &amp;r600_irq_set,</div><div class='ctx'> 	.irq_process = &amp;r600_irq_process,</div><div class='ctx'> 	.get_vblank_counter = &amp;rs600_get_vblank_counter,</div><div class='del'>-	.fence_ring_emit = &amp;r600_fence_ring_emit,</div><div class='ctx'> 	.cs_parse = &amp;r600_cs_parse,</div><div class='ctx'> 	.copy_blit = &amp;r600_copy_blit,</div><div class='ctx'> 	.copy_dma = NULL,</div><div class='hunk'>@@ -705,18 +753,22 @@ static struct radeon_asic rv770_asic = {</div><div class='ctx'> 	.fini = &amp;rv770_fini,</div><div class='ctx'> 	.suspend = &amp;rv770_suspend,</div><div class='ctx'> 	.resume = &amp;rv770_resume,</div><div class='del'>-	.cp_commit = &amp;r600_cp_commit,</div><div class='ctx'> 	.asic_reset = &amp;r600_asic_reset,</div><div class='ctx'> 	.gpu_is_lockup = &amp;r600_gpu_is_lockup,</div><div class='ctx'> 	.vga_set_state = &amp;r600_vga_set_state,</div><div class='ctx'> 	.gart_tlb_flush = &amp;r600_pcie_gart_tlb_flush,</div><div class='ctx'> 	.gart_set_page = &amp;rs600_gart_set_page,</div><div class='ctx'> 	.ring_test = &amp;r600_ring_test,</div><div class='del'>-	.ring_ib_execute = &amp;r600_ring_ib_execute,</div><div class='add'>+	.ring = {</div><div class='add'>+		[RADEON_RING_TYPE_GFX_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;r600_ring_ib_execute,</div><div class='add'>+			.emit_fence = &amp;r600_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r600_semaphore_ring_emit,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> 	.irq_set = &amp;r600_irq_set,</div><div class='ctx'> 	.irq_process = &amp;r600_irq_process,</div><div class='ctx'> 	.get_vblank_counter = &amp;rs600_get_vblank_counter,</div><div class='del'>-	.fence_ring_emit = &amp;r600_fence_ring_emit,</div><div class='ctx'> 	.cs_parse = &amp;r600_cs_parse,</div><div class='ctx'> 	.copy_blit = &amp;r600_copy_blit,</div><div class='ctx'> 	.copy_dma = NULL,</div><div class='hunk'>@@ -752,18 +804,22 @@ static struct radeon_asic evergreen_asic = {</div><div class='ctx'> 	.fini = &amp;evergreen_fini,</div><div class='ctx'> 	.suspend = &amp;evergreen_suspend,</div><div class='ctx'> 	.resume = &amp;evergreen_resume,</div><div class='del'>-	.cp_commit = &amp;r600_cp_commit,</div><div class='ctx'> 	.gpu_is_lockup = &amp;evergreen_gpu_is_lockup,</div><div class='ctx'> 	.asic_reset = &amp;evergreen_asic_reset,</div><div class='ctx'> 	.vga_set_state = &amp;r600_vga_set_state,</div><div class='ctx'> 	.gart_tlb_flush = &amp;evergreen_pcie_gart_tlb_flush,</div><div class='ctx'> 	.gart_set_page = &amp;rs600_gart_set_page,</div><div class='ctx'> 	.ring_test = &amp;r600_ring_test,</div><div class='del'>-	.ring_ib_execute = &amp;evergreen_ring_ib_execute,</div><div class='add'>+	.ring = {</div><div class='add'>+		[RADEON_RING_TYPE_GFX_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;evergreen_ring_ib_execute,</div><div class='add'>+			.emit_fence = &amp;r600_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r600_semaphore_ring_emit,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> 	.irq_set = &amp;evergreen_irq_set,</div><div class='ctx'> 	.irq_process = &amp;evergreen_irq_process,</div><div class='ctx'> 	.get_vblank_counter = &amp;evergreen_get_vblank_counter,</div><div class='del'>-	.fence_ring_emit = &amp;r600_fence_ring_emit,</div><div class='ctx'> 	.cs_parse = &amp;evergreen_cs_parse,</div><div class='ctx'> 	.copy_blit = &amp;r600_copy_blit,</div><div class='ctx'> 	.copy_dma = NULL,</div><div class='hunk'>@@ -799,18 +855,22 @@ static struct radeon_asic sumo_asic = {</div><div class='ctx'> 	.fini = &amp;evergreen_fini,</div><div class='ctx'> 	.suspend = &amp;evergreen_suspend,</div><div class='ctx'> 	.resume = &amp;evergreen_resume,</div><div class='del'>-	.cp_commit = &amp;r600_cp_commit,</div><div class='ctx'> 	.gpu_is_lockup = &amp;evergreen_gpu_is_lockup,</div><div class='ctx'> 	.asic_reset = &amp;evergreen_asic_reset,</div><div class='ctx'> 	.vga_set_state = &amp;r600_vga_set_state,</div><div class='ctx'> 	.gart_tlb_flush = &amp;evergreen_pcie_gart_tlb_flush,</div><div class='ctx'> 	.gart_set_page = &amp;rs600_gart_set_page,</div><div class='ctx'> 	.ring_test = &amp;r600_ring_test,</div><div class='del'>-	.ring_ib_execute = &amp;evergreen_ring_ib_execute,</div><div class='add'>+	.ring = {</div><div class='add'>+		[RADEON_RING_TYPE_GFX_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;evergreen_ring_ib_execute,</div><div class='add'>+			.emit_fence = &amp;r600_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r600_semaphore_ring_emit,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> 	.irq_set = &amp;evergreen_irq_set,</div><div class='ctx'> 	.irq_process = &amp;evergreen_irq_process,</div><div class='ctx'> 	.get_vblank_counter = &amp;evergreen_get_vblank_counter,</div><div class='del'>-	.fence_ring_emit = &amp;r600_fence_ring_emit,</div><div class='ctx'> 	.cs_parse = &amp;evergreen_cs_parse,</div><div class='ctx'> 	.copy_blit = &amp;r600_copy_blit,</div><div class='ctx'> 	.copy_dma = NULL,</div><div class='hunk'>@@ -846,18 +906,22 @@ static struct radeon_asic btc_asic = {</div><div class='ctx'> 	.fini = &amp;evergreen_fini,</div><div class='ctx'> 	.suspend = &amp;evergreen_suspend,</div><div class='ctx'> 	.resume = &amp;evergreen_resume,</div><div class='del'>-	.cp_commit = &amp;r600_cp_commit,</div><div class='ctx'> 	.gpu_is_lockup = &amp;evergreen_gpu_is_lockup,</div><div class='ctx'> 	.asic_reset = &amp;evergreen_asic_reset,</div><div class='ctx'> 	.vga_set_state = &amp;r600_vga_set_state,</div><div class='ctx'> 	.gart_tlb_flush = &amp;evergreen_pcie_gart_tlb_flush,</div><div class='ctx'> 	.gart_set_page = &amp;rs600_gart_set_page,</div><div class='ctx'> 	.ring_test = &amp;r600_ring_test,</div><div class='del'>-	.ring_ib_execute = &amp;evergreen_ring_ib_execute,</div><div class='add'>+	.ring = {</div><div class='add'>+		[RADEON_RING_TYPE_GFX_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;evergreen_ring_ib_execute,</div><div class='add'>+			.emit_fence = &amp;r600_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r600_semaphore_ring_emit,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> 	.irq_set = &amp;evergreen_irq_set,</div><div class='ctx'> 	.irq_process = &amp;evergreen_irq_process,</div><div class='ctx'> 	.get_vblank_counter = &amp;evergreen_get_vblank_counter,</div><div class='del'>-	.fence_ring_emit = &amp;r600_fence_ring_emit,</div><div class='ctx'> 	.cs_parse = &amp;evergreen_cs_parse,</div><div class='ctx'> 	.copy_blit = &amp;r600_copy_blit,</div><div class='ctx'> 	.copy_dma = NULL,</div><div class='hunk'>@@ -888,23 +952,50 @@ static struct radeon_asic btc_asic = {</div><div class='ctx'> 	.post_page_flip = &amp;evergreen_post_page_flip,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct radeon_vm_funcs cayman_vm_funcs = {</div><div class='add'>+	.init = &amp;cayman_vm_init,</div><div class='add'>+	.fini = &amp;cayman_vm_fini,</div><div class='add'>+	.bind = &amp;cayman_vm_bind,</div><div class='add'>+	.unbind = &amp;cayman_vm_unbind,</div><div class='add'>+	.tlb_flush = &amp;cayman_vm_tlb_flush,</div><div class='add'>+	.page_flags = &amp;cayman_vm_page_flags,</div><div class='add'>+	.set_page = &amp;cayman_vm_set_page,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct radeon_asic cayman_asic = {</div><div class='ctx'> 	.init = &amp;cayman_init,</div><div class='ctx'> 	.fini = &amp;cayman_fini,</div><div class='ctx'> 	.suspend = &amp;cayman_suspend,</div><div class='ctx'> 	.resume = &amp;cayman_resume,</div><div class='del'>-	.cp_commit = &amp;r600_cp_commit,</div><div class='ctx'> 	.gpu_is_lockup = &amp;cayman_gpu_is_lockup,</div><div class='ctx'> 	.asic_reset = &amp;cayman_asic_reset,</div><div class='ctx'> 	.vga_set_state = &amp;r600_vga_set_state,</div><div class='ctx'> 	.gart_tlb_flush = &amp;cayman_pcie_gart_tlb_flush,</div><div class='ctx'> 	.gart_set_page = &amp;rs600_gart_set_page,</div><div class='ctx'> 	.ring_test = &amp;r600_ring_test,</div><div class='del'>-	.ring_ib_execute = &amp;evergreen_ring_ib_execute,</div><div class='add'>+	.ring = {</div><div class='add'>+		[RADEON_RING_TYPE_GFX_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;cayman_ring_ib_execute,</div><div class='add'>+			.ib_parse = &amp;evergreen_ib_parse,</div><div class='add'>+			.emit_fence = &amp;cayman_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r600_semaphore_ring_emit,</div><div class='add'>+		},</div><div class='add'>+		[CAYMAN_RING_TYPE_CP1_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;cayman_ring_ib_execute,</div><div class='add'>+			.ib_parse = &amp;evergreen_ib_parse,</div><div class='add'>+			.emit_fence = &amp;cayman_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r600_semaphore_ring_emit,</div><div class='add'>+		},</div><div class='add'>+		[CAYMAN_RING_TYPE_CP2_INDEX] = {</div><div class='add'>+			.ib_execute = &amp;cayman_ring_ib_execute,</div><div class='add'>+			.ib_parse = &amp;evergreen_ib_parse,</div><div class='add'>+			.emit_fence = &amp;cayman_fence_ring_emit,</div><div class='add'>+			.emit_semaphore = &amp;r600_semaphore_ring_emit,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='ctx'> 	.irq_set = &amp;evergreen_irq_set,</div><div class='ctx'> 	.irq_process = &amp;evergreen_irq_process,</div><div class='ctx'> 	.get_vblank_counter = &amp;evergreen_get_vblank_counter,</div><div class='del'>-	.fence_ring_emit = &amp;r600_fence_ring_emit,</div><div class='ctx'> 	.cs_parse = &amp;evergreen_cs_parse,</div><div class='ctx'> 	.copy_blit = &amp;r600_copy_blit,</div><div class='ctx'> 	.copy_dma = NULL,</div><div class='hunk'>@@ -945,6 +1036,9 @@ int radeon_asic_init(struct radeon_device *rdev)</div><div class='ctx'> 	else</div><div class='ctx'> 		rdev-&gt;num_crtc = 2;</div><div class='ctx'> </div><div class='add'>+	/* set the ring used for bo copies */</div><div class='add'>+	rdev-&gt;copy_ring = RADEON_RING_TYPE_GFX_INDEX;</div><div class='add'>+</div><div class='ctx'> 	switch (rdev-&gt;family) {</div><div class='ctx'> 	case CHIP_R100:</div><div class='ctx'> 	case CHIP_RV100:</div><div class='hunk'>@@ -1050,6 +1144,7 @@ int radeon_asic_init(struct radeon_device *rdev)</div><div class='ctx'> 		rdev-&gt;asic = &amp;cayman_asic;</div><div class='ctx'> 		/* set num crtcs */</div><div class='ctx'> 		rdev-&gt;num_crtc = 6;</div><div class='add'>+		rdev-&gt;vm_manager.funcs = &amp;cayman_vm_funcs;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* FIXME: not supported yet */</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h<br/>index 59914842a729..6304aef0d9b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_asic.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_asic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_asic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_asic.h</a></div><div class='hunk'>@@ -58,17 +58,20 @@ void r100_fini(struct radeon_device *rdev);</div><div class='ctx'> int r100_suspend(struct radeon_device *rdev);</div><div class='ctx'> int r100_resume(struct radeon_device *rdev);</div><div class='ctx'> void r100_vga_set_state(struct radeon_device *rdev, bool state);</div><div class='del'>-bool r100_gpu_is_lockup(struct radeon_device *rdev);</div><div class='add'>+bool r100_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *cp);</div><div class='ctx'> int r100_asic_reset(struct radeon_device *rdev);</div><div class='ctx'> u32 r100_get_vblank_counter(struct radeon_device *rdev, int crtc);</div><div class='ctx'> void r100_pci_gart_tlb_flush(struct radeon_device *rdev);</div><div class='ctx'> int r100_pci_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr);</div><div class='del'>-void r100_cp_commit(struct radeon_device *rdev);</div><div class='ctx'> void r100_ring_start(struct radeon_device *rdev);</div><div class='ctx'> int r100_irq_set(struct radeon_device *rdev);</div><div class='ctx'> int r100_irq_process(struct radeon_device *rdev);</div><div class='ctx'> void r100_fence_ring_emit(struct radeon_device *rdev,</div><div class='ctx'> 			  struct radeon_fence *fence);</div><div class='add'>+void r100_semaphore_ring_emit(struct radeon_device *rdev,</div><div class='add'>+			      struct radeon_ring *cp,</div><div class='add'>+			      struct radeon_semaphore *semaphore,</div><div class='add'>+			      bool emit_wait);</div><div class='ctx'> int r100_cs_parse(struct radeon_cs_parser *p);</div><div class='ctx'> void r100_pll_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);</div><div class='ctx'> uint32_t r100_pll_rreg(struct radeon_device *rdev, uint32_t reg);</div><div class='hunk'>@@ -83,7 +86,7 @@ int r100_set_surface_reg(struct radeon_device *rdev, int reg,</div><div class='ctx'> void r100_clear_surface_reg(struct radeon_device *rdev, int reg);</div><div class='ctx'> void r100_bandwidth_update(struct radeon_device *rdev);</div><div class='ctx'> void r100_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib);</div><div class='del'>-int r100_ring_test(struct radeon_device *rdev);</div><div class='add'>+int r100_ring_test(struct radeon_device *rdev, struct radeon_ring *cp);</div><div class='ctx'> void r100_hpd_init(struct radeon_device *rdev);</div><div class='ctx'> void r100_hpd_fini(struct radeon_device *rdev);</div><div class='ctx'> bool r100_hpd_sense(struct radeon_device *rdev, enum radeon_hpd_id hpd);</div><div class='hunk'>@@ -101,12 +104,12 @@ void r100_pci_gart_disable(struct radeon_device *rdev);</div><div class='ctx'> int r100_debugfs_mc_info_init(struct radeon_device *rdev);</div><div class='ctx'> int r100_gui_wait_for_idle(struct radeon_device *rdev);</div><div class='ctx'> void r100_gpu_lockup_update(struct r100_gpu_lockup *lockup,</div><div class='del'>-			    struct radeon_cp *cp);</div><div class='add'>+			    struct radeon_ring *cp);</div><div class='ctx'> bool r100_gpu_cp_is_lockup(struct radeon_device *rdev,</div><div class='ctx'> 			   struct r100_gpu_lockup *lockup,</div><div class='del'>-			   struct radeon_cp *cp);</div><div class='add'>+			   struct radeon_ring *cp);</div><div class='ctx'> void r100_ib_fini(struct radeon_device *rdev);</div><div class='del'>-int r100_ib_init(struct radeon_device *rdev);</div><div class='add'>+int r100_ib_test(struct radeon_device *rdev);</div><div class='ctx'> void r100_irq_disable(struct radeon_device *rdev);</div><div class='ctx'> void r100_mc_stop(struct radeon_device *rdev, struct r100_mc_save *save);</div><div class='ctx'> void r100_mc_resume(struct radeon_device *rdev, struct r100_mc_save *save);</div><div class='hunk'>@@ -154,7 +157,7 @@ extern int r300_init(struct radeon_device *rdev);</div><div class='ctx'> extern void r300_fini(struct radeon_device *rdev);</div><div class='ctx'> extern int r300_suspend(struct radeon_device *rdev);</div><div class='ctx'> extern int r300_resume(struct radeon_device *rdev);</div><div class='del'>-extern bool r300_gpu_is_lockup(struct radeon_device *rdev);</div><div class='add'>+extern bool r300_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *cp);</div><div class='ctx'> extern int r300_asic_reset(struct radeon_device *rdev);</div><div class='ctx'> extern void r300_ring_start(struct radeon_device *rdev);</div><div class='ctx'> extern void r300_fence_ring_emit(struct radeon_device *rdev,</div><div class='hunk'>@@ -293,22 +296,25 @@ int r600_resume(struct radeon_device *rdev);</div><div class='ctx'> void r600_vga_set_state(struct radeon_device *rdev, bool state);</div><div class='ctx'> int r600_wb_init(struct radeon_device *rdev);</div><div class='ctx'> void r600_wb_fini(struct radeon_device *rdev);</div><div class='del'>-void r600_cp_commit(struct radeon_device *rdev);</div><div class='ctx'> void r600_pcie_gart_tlb_flush(struct radeon_device *rdev);</div><div class='ctx'> uint32_t r600_pciep_rreg(struct radeon_device *rdev, uint32_t reg);</div><div class='ctx'> void r600_pciep_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);</div><div class='ctx'> int r600_cs_parse(struct radeon_cs_parser *p);</div><div class='ctx'> void r600_fence_ring_emit(struct radeon_device *rdev,</div><div class='ctx'> 			  struct radeon_fence *fence);</div><div class='del'>-bool r600_gpu_is_lockup(struct radeon_device *rdev);</div><div class='add'>+void r600_semaphore_ring_emit(struct radeon_device *rdev,</div><div class='add'>+			      struct radeon_ring *cp,</div><div class='add'>+			      struct radeon_semaphore *semaphore,</div><div class='add'>+			      bool emit_wait);</div><div class='add'>+bool r600_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *cp);</div><div class='ctx'> int r600_asic_reset(struct radeon_device *rdev);</div><div class='ctx'> int r600_set_surface_reg(struct radeon_device *rdev, int reg,</div><div class='ctx'> 			 uint32_t tiling_flags, uint32_t pitch,</div><div class='ctx'> 			 uint32_t offset, uint32_t obj_size);</div><div class='ctx'> void r600_clear_surface_reg(struct radeon_device *rdev, int reg);</div><div class='del'>-int r600_ib_test(struct radeon_device *rdev);</div><div class='add'>+int r600_ib_test(struct radeon_device *rdev, int ring);</div><div class='ctx'> void r600_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib);</div><div class='del'>-int r600_ring_test(struct radeon_device *rdev);</div><div class='add'>+int r600_ring_test(struct radeon_device *rdev, struct radeon_ring *cp);</div><div class='ctx'> int r600_copy_blit(struct radeon_device *rdev,</div><div class='ctx'> 		   uint64_t src_offset, uint64_t dst_offset,</div><div class='ctx'> 		   unsigned num_gpu_pages, struct radeon_fence *fence);</div><div class='hunk'>@@ -328,7 +334,7 @@ extern int r600_get_pcie_lanes(struct radeon_device *rdev);</div><div class='ctx'> bool r600_card_posted(struct radeon_device *rdev);</div><div class='ctx'> void r600_cp_stop(struct radeon_device *rdev);</div><div class='ctx'> int r600_cp_start(struct radeon_device *rdev);</div><div class='del'>-void r600_ring_init(struct radeon_device *rdev, unsigned ring_size);</div><div class='add'>+void r600_ring_init(struct radeon_device *rdev, struct radeon_ring *cp, unsigned ring_size);</div><div class='ctx'> int r600_cp_resume(struct radeon_device *rdev);</div><div class='ctx'> void r600_cp_fini(struct radeon_device *rdev);</div><div class='ctx'> int r600_count_pipe_bits(uint32_t val);</div><div class='hunk'>@@ -397,7 +403,7 @@ int evergreen_init(struct radeon_device *rdev);</div><div class='ctx'> void evergreen_fini(struct radeon_device *rdev);</div><div class='ctx'> int evergreen_suspend(struct radeon_device *rdev);</div><div class='ctx'> int evergreen_resume(struct radeon_device *rdev);</div><div class='del'>-bool evergreen_gpu_is_lockup(struct radeon_device *rdev);</div><div class='add'>+bool evergreen_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *cp);</div><div class='ctx'> int evergreen_asic_reset(struct radeon_device *rdev);</div><div class='ctx'> void evergreen_bandwidth_update(struct radeon_device *rdev);</div><div class='ctx'> void evergreen_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib);</div><div class='hunk'>@@ -423,12 +429,26 @@ int evergreen_blit_init(struct radeon_device *rdev);</div><div class='ctx'> /*</div><div class='ctx'>  * cayman</div><div class='ctx'>  */</div><div class='add'>+void cayman_fence_ring_emit(struct radeon_device *rdev,</div><div class='add'>+			    struct radeon_fence *fence);</div><div class='ctx'> void cayman_pcie_gart_tlb_flush(struct radeon_device *rdev);</div><div class='ctx'> int cayman_init(struct radeon_device *rdev);</div><div class='ctx'> void cayman_fini(struct radeon_device *rdev);</div><div class='ctx'> int cayman_suspend(struct radeon_device *rdev);</div><div class='ctx'> int cayman_resume(struct radeon_device *rdev);</div><div class='del'>-bool cayman_gpu_is_lockup(struct radeon_device *rdev);</div><div class='add'>+bool cayman_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *cp);</div><div class='ctx'> int cayman_asic_reset(struct radeon_device *rdev);</div><div class='add'>+void cayman_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib);</div><div class='add'>+int cayman_vm_init(struct radeon_device *rdev);</div><div class='add'>+void cayman_vm_fini(struct radeon_device *rdev);</div><div class='add'>+int cayman_vm_bind(struct radeon_device *rdev, struct radeon_vm *vm, int id);</div><div class='add'>+void cayman_vm_unbind(struct radeon_device *rdev, struct radeon_vm *vm);</div><div class='add'>+void cayman_vm_tlb_flush(struct radeon_device *rdev, struct radeon_vm *vm);</div><div class='add'>+uint32_t cayman_vm_page_flags(struct radeon_device *rdev,</div><div class='add'>+			      struct radeon_vm *vm,</div><div class='add'>+			      uint32_t flags);</div><div class='add'>+void cayman_vm_set_page(struct radeon_device *rdev, struct radeon_vm *vm,</div><div class='add'>+			unsigned pfn, uint64_t addr, uint32_t flags);</div><div class='add'>+int evergreen_ib_parse(struct radeon_device *rdev, struct radeon_ib *ib);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_benchmark.c b/drivers/gpu/drm/radeon/radeon_benchmark.c<br/>index 17e1a9b2d8fb..815f2341ab94 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_benchmark.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_benchmark.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_benchmark.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_benchmark.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@ static int radeon_benchmark_do_move(struct radeon_device *rdev, unsigned size,</div><div class='ctx'> </div><div class='ctx'> 	start_jiffies = jiffies;</div><div class='ctx'> 	for (i = 0; i &lt; n; i++) {</div><div class='del'>-		r = radeon_fence_create(rdev, &amp;fence);</div><div class='add'>+		r = radeon_fence_create(rdev, &amp;fence, RADEON_RING_TYPE_GFX_INDEX);</div><div class='ctx'> 		if (r)</div><div class='ctx'> 			return r;</div><div class='ctx'> </div><div class='hunk'>@@ -229,21 +229,21 @@ void radeon_benchmark(struct radeon_device *rdev, int test_number)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 6:</div><div class='ctx'> 		/* GTT to VRAM, buffer size sweep, common modes */</div><div class='del'>-		for (i = 1; i &lt; RADEON_BENCHMARK_COMMON_MODES_N; i++)</div><div class='add'>+		for (i = 0; i &lt; RADEON_BENCHMARK_COMMON_MODES_N; i++)</div><div class='ctx'> 			radeon_benchmark_move(rdev, common_modes[i],</div><div class='ctx'> 					      RADEON_GEM_DOMAIN_GTT,</div><div class='ctx'> 					      RADEON_GEM_DOMAIN_VRAM);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 7:</div><div class='ctx'> 		/* VRAM to GTT, buffer size sweep, common modes */</div><div class='del'>-		for (i = 1; i &lt; RADEON_BENCHMARK_COMMON_MODES_N; i++)</div><div class='add'>+		for (i = 0; i &lt; RADEON_BENCHMARK_COMMON_MODES_N; i++)</div><div class='ctx'> 			radeon_benchmark_move(rdev, common_modes[i],</div><div class='ctx'> 					      RADEON_GEM_DOMAIN_VRAM,</div><div class='ctx'> 					      RADEON_GEM_DOMAIN_GTT);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 8:</div><div class='ctx'> 		/* VRAM to VRAM, buffer size sweep, common modes */</div><div class='del'>-		for (i = 1; i &lt; RADEON_BENCHMARK_COMMON_MODES_N; i++)</div><div class='add'>+		for (i = 0; i &lt; RADEON_BENCHMARK_COMMON_MODES_N; i++)</div><div class='ctx'> 			radeon_benchmark_move(rdev, common_modes[i],</div><div class='ctx'> 					      RADEON_GEM_DOMAIN_VRAM,</div><div class='ctx'> 					      RADEON_GEM_DOMAIN_VRAM);</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c<br/>index 29afd71e0840..435a3d970ab8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_cs.c</a></div><div class='hunk'>@@ -58,7 +58,7 @@ int radeon_cs_parser_relocs(struct radeon_cs_parser *p)</div><div class='ctx'> </div><div class='ctx'> 		duplicate = false;</div><div class='ctx'> 		r = (struct drm_radeon_cs_reloc *)&amp;chunk-&gt;kdata[i*4];</div><div class='del'>-		for (j = 0; j &lt; p-&gt;nrelocs; j++) {</div><div class='add'>+		for (j = 0; j &lt; i; j++) {</div><div class='ctx'> 			if (r-&gt;handle == p-&gt;relocs[j].handle) {</div><div class='ctx'> 				p-&gt;relocs_ptr[i] = &amp;p-&gt;relocs[j];</div><div class='ctx'> 				duplicate = true;</div><div class='hunk'>@@ -84,16 +84,75 @@ int radeon_cs_parser_relocs(struct radeon_cs_parser *p)</div><div class='ctx'> 			p-&gt;relocs[i].flags = r-&gt;flags;</div><div class='ctx'> 			radeon_bo_list_add_object(&amp;p-&gt;relocs[i].lobj,</div><div class='ctx'> 						  &amp;p-&gt;validated);</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+			if (p-&gt;relocs[i].robj-&gt;tbo.sync_obj &amp;&amp; !(r-&gt;flags &amp; RADEON_RELOC_DONT_SYNC)) {</div><div class='add'>+				struct radeon_fence *fence = p-&gt;relocs[i].robj-&gt;tbo.sync_obj;</div><div class='add'>+				if (!radeon_fence_signaled(fence)) {</div><div class='add'>+					p-&gt;sync_to_ring[fence-&gt;ring] = true;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		} else</div><div class='add'>+			p-&gt;relocs[i].handle = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return radeon_bo_list_validate(&amp;p-&gt;validated);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int radeon_cs_get_ring(struct radeon_cs_parser *p, u32 ring, s32 priority)</div><div class='add'>+{</div><div class='add'>+	p-&gt;priority = priority;</div><div class='add'>+</div><div class='add'>+	switch (ring) {</div><div class='add'>+	default:</div><div class='add'>+		DRM_ERROR("unknown ring id: %d\n", ring);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	case RADEON_CS_RING_GFX:</div><div class='add'>+		p-&gt;ring = RADEON_RING_TYPE_GFX_INDEX;</div><div class='add'>+		break;</div><div class='add'>+	case RADEON_CS_RING_COMPUTE:</div><div class='add'>+		/* for now */</div><div class='add'>+		p-&gt;ring = RADEON_RING_TYPE_GFX_INDEX;</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 radeon_cs_sync_rings(struct radeon_cs_parser *p)</div><div class='add'>+{</div><div class='add'>+	int i, r;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RADEON_NUM_RINGS; ++i) {</div><div class='add'>+		/* no need to sync to our own or unused rings */</div><div class='add'>+		if (i == p-&gt;ring || !p-&gt;sync_to_ring[i] || !p-&gt;rdev-&gt;ring[i].ready)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!p-&gt;ib-&gt;fence-&gt;semaphore) {</div><div class='add'>+			r = radeon_semaphore_create(p-&gt;rdev, &amp;p-&gt;ib-&gt;fence-&gt;semaphore);</div><div class='add'>+			if (r)</div><div class='add'>+				return r;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		r = radeon_ring_lock(p-&gt;rdev, &amp;p-&gt;rdev-&gt;ring[i], 3);</div><div class='add'>+		if (r)</div><div class='add'>+			return r;</div><div class='add'>+		radeon_semaphore_emit_signal(p-&gt;rdev, i, p-&gt;ib-&gt;fence-&gt;semaphore);</div><div class='add'>+		radeon_ring_unlock_commit(p-&gt;rdev, &amp;p-&gt;rdev-&gt;ring[i]);</div><div class='add'>+</div><div class='add'>+		r = radeon_ring_lock(p-&gt;rdev, &amp;p-&gt;rdev-&gt;ring[p-&gt;ring], 3);</div><div class='add'>+		if (r)</div><div class='add'>+			return r;</div><div class='add'>+		radeon_semaphore_emit_wait(p-&gt;rdev, p-&gt;ring, p-&gt;ib-&gt;fence-&gt;semaphore);</div><div class='add'>+		radeon_ring_unlock_commit(p-&gt;rdev, &amp;p-&gt;rdev-&gt;ring[p-&gt;ring]);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_radeon_cs *cs = data;</div><div class='ctx'> 	uint64_t *chunk_array_ptr;</div><div class='del'>-	unsigned size, i, flags = 0;</div><div class='add'>+	unsigned size, i;</div><div class='add'>+	u32 ring = RADEON_CS_RING_GFX;</div><div class='add'>+	s32 priority = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!cs-&gt;num_chunks) {</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -103,6 +162,7 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data)</div><div class='ctx'> 	p-&gt;idx = 0;</div><div class='ctx'> 	p-&gt;chunk_ib_idx = -1;</div><div class='ctx'> 	p-&gt;chunk_relocs_idx = -1;</div><div class='add'>+	p-&gt;chunk_flags_idx = -1;</div><div class='ctx'> 	p-&gt;chunks_array = kcalloc(cs-&gt;num_chunks, sizeof(uint64_t), GFP_KERNEL);</div><div class='ctx'> 	if (p-&gt;chunks_array == NULL) {</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -112,6 +172,7 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data)</div><div class='ctx'> 			       sizeof(uint64_t)*cs-&gt;num_chunks)) {</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='add'>+	p-&gt;cs_flags = 0;</div><div class='ctx'> 	p-&gt;nchunks = cs-&gt;num_chunks;</div><div class='ctx'> 	p-&gt;chunks = kcalloc(p-&gt;nchunks, sizeof(struct radeon_cs_chunk), GFP_KERNEL);</div><div class='ctx'> 	if (p-&gt;chunks == NULL) {</div><div class='hunk'>@@ -140,16 +201,19 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data)</div><div class='ctx'> 			if (p-&gt;chunks[i].length_dw == 0)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		if (p-&gt;chunks[i].chunk_id == RADEON_CHUNK_ID_FLAGS &amp;&amp;</div><div class='del'>-		    !p-&gt;chunks[i].length_dw) {</div><div class='del'>-			return -EINVAL;</div><div class='add'>+		if (p-&gt;chunks[i].chunk_id == RADEON_CHUNK_ID_FLAGS) {</div><div class='add'>+			p-&gt;chunk_flags_idx = i;</div><div class='add'>+			/* zero length flags aren't useful */</div><div class='add'>+			if (p-&gt;chunks[i].length_dw == 0)</div><div class='add'>+				return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		p-&gt;chunks[i].length_dw = user_chunk.length_dw;</div><div class='ctx'> 		p-&gt;chunks[i].user_ptr = (void __user *)(unsigned long)user_chunk.chunk_data;</div><div class='ctx'> </div><div class='ctx'> 		cdata = (uint32_t *)(unsigned long)user_chunk.chunk_data;</div><div class='del'>-		if (p-&gt;chunks[i].chunk_id != RADEON_CHUNK_ID_IB) {</div><div class='add'>+		if ((p-&gt;chunks[i].chunk_id == RADEON_CHUNK_ID_RELOCS) ||</div><div class='add'>+		    (p-&gt;chunks[i].chunk_id == RADEON_CHUNK_ID_FLAGS)) {</div><div class='ctx'> 			size = p-&gt;chunks[i].length_dw * sizeof(uint32_t);</div><div class='ctx'> 			p-&gt;chunks[i].kdata = kmalloc(size, GFP_KERNEL);</div><div class='ctx'> 			if (p-&gt;chunks[i].kdata == NULL) {</div><div class='hunk'>@@ -160,29 +224,58 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data)</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (p-&gt;chunks[i].chunk_id == RADEON_CHUNK_ID_FLAGS) {</div><div class='del'>-				flags = p-&gt;chunks[i].kdata[0];</div><div class='add'>+				p-&gt;cs_flags = p-&gt;chunks[i].kdata[0];</div><div class='add'>+				if (p-&gt;chunks[i].length_dw &gt; 1)</div><div class='add'>+					ring = p-&gt;chunks[i].kdata[1];</div><div class='add'>+				if (p-&gt;chunks[i].length_dw &gt; 2)</div><div class='add'>+					priority = (s32)p-&gt;chunks[i].kdata[2];</div><div class='ctx'> 			}</div><div class='del'>-		} else {</div><div class='del'>-			p-&gt;chunks[i].kpage[0] = kmalloc(PAGE_SIZE, GFP_KERNEL);</div><div class='del'>-			p-&gt;chunks[i].kpage[1] = kmalloc(PAGE_SIZE, GFP_KERNEL);</div><div class='del'>-			if (p-&gt;chunks[i].kpage[0] == NULL || p-&gt;chunks[i].kpage[1] == NULL) {</div><div class='del'>-				kfree(p-&gt;chunks[i].kpage[0]);</div><div class='del'>-				kfree(p-&gt;chunks[i].kpage[1]);</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			}</div><div class='del'>-			p-&gt;chunks[i].kpage_idx[0] = -1;</div><div class='del'>-			p-&gt;chunks[i].kpage_idx[1] = -1;</div><div class='del'>-			p-&gt;chunks[i].last_copied_page = -1;</div><div class='del'>-			p-&gt;chunks[i].last_page_index = ((p-&gt;chunks[i].length_dw * 4) - 1) / PAGE_SIZE;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (p-&gt;chunks[p-&gt;chunk_ib_idx].length_dw &gt; (16 * 1024)) {</div><div class='del'>-		DRM_ERROR("cs IB too big: %d\n",</div><div class='del'>-			  p-&gt;chunks[p-&gt;chunk_ib_idx].length_dw);</div><div class='add'>+</div><div class='add'>+	if ((p-&gt;cs_flags &amp; RADEON_CS_USE_VM) &amp;&amp;</div><div class='add'>+	    !p-&gt;rdev-&gt;vm_manager.enabled) {</div><div class='add'>+		DRM_ERROR("VM not active on asic!\n");</div><div class='add'>+		if (p-&gt;chunk_relocs_idx != -1)</div><div class='add'>+			kfree(p-&gt;chunks[p-&gt;chunk_relocs_idx].kdata);</div><div class='add'>+		if (p-&gt;chunk_flags_idx != -1)</div><div class='add'>+			kfree(p-&gt;chunks[p-&gt;chunk_flags_idx].kdata);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p-&gt;keep_tiling_flags = (flags &amp; RADEON_CS_KEEP_TILING_FLAGS) != 0;</div><div class='add'>+	if (radeon_cs_get_ring(p, ring, priority)) {</div><div class='add'>+		if (p-&gt;chunk_relocs_idx != -1)</div><div class='add'>+			kfree(p-&gt;chunks[p-&gt;chunk_relocs_idx].kdata);</div><div class='add'>+		if (p-&gt;chunk_flags_idx != -1)</div><div class='add'>+			kfree(p-&gt;chunks[p-&gt;chunk_flags_idx].kdata);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* deal with non-vm */</div><div class='add'>+	if ((p-&gt;chunk_ib_idx != -1) &amp;&amp;</div><div class='add'>+	    ((p-&gt;cs_flags &amp; RADEON_CS_USE_VM) == 0) &amp;&amp;</div><div class='add'>+	    (p-&gt;chunks[p-&gt;chunk_ib_idx].chunk_id == RADEON_CHUNK_ID_IB)) {</div><div class='add'>+		if (p-&gt;chunks[p-&gt;chunk_ib_idx].length_dw &gt; (16 * 1024)) {</div><div class='add'>+			DRM_ERROR("cs IB too big: %d\n",</div><div class='add'>+				  p-&gt;chunks[p-&gt;chunk_ib_idx].length_dw);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		p-&gt;chunks[p-&gt;chunk_ib_idx].kpage[0] = kmalloc(PAGE_SIZE, GFP_KERNEL);</div><div class='add'>+		p-&gt;chunks[p-&gt;chunk_ib_idx].kpage[1] = kmalloc(PAGE_SIZE, GFP_KERNEL);</div><div class='add'>+		if (p-&gt;chunks[p-&gt;chunk_ib_idx].kpage[0] == NULL ||</div><div class='add'>+		    p-&gt;chunks[p-&gt;chunk_ib_idx].kpage[1] == NULL) {</div><div class='add'>+			kfree(p-&gt;chunks[p-&gt;chunk_ib_idx].kpage[0]);</div><div class='add'>+			kfree(p-&gt;chunks[p-&gt;chunk_ib_idx].kpage[1]);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		p-&gt;chunks[p-&gt;chunk_ib_idx].kpage_idx[0] = -1;</div><div class='add'>+		p-&gt;chunks[p-&gt;chunk_ib_idx].kpage_idx[1] = -1;</div><div class='add'>+		p-&gt;chunks[p-&gt;chunk_ib_idx].last_copied_page = -1;</div><div class='add'>+		p-&gt;chunks[p-&gt;chunk_ib_idx].last_page_index =</div><div class='add'>+			((p-&gt;chunks[p-&gt;chunk_ib_idx].length_dw * 4) - 1) / PAGE_SIZE;</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'>@@ -224,11 +317,139 @@ static void radeon_cs_parser_fini(struct radeon_cs_parser *parser, int error)</div><div class='ctx'> 	radeon_ib_free(parser-&gt;rdev, &amp;parser-&gt;ib);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int radeon_cs_ib_chunk(struct radeon_device *rdev,</div><div class='add'>+			      struct radeon_cs_parser *parser)</div><div class='add'>+{</div><div class='add'>+	struct radeon_cs_chunk *ib_chunk;</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	if (parser-&gt;chunk_ib_idx == -1)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (parser-&gt;cs_flags &amp; RADEON_CS_USE_VM)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ib_chunk = &amp;parser-&gt;chunks[parser-&gt;chunk_ib_idx];</div><div class='add'>+	/* Copy the packet into the IB, the parser will read from the</div><div class='add'>+	 * input memory (cached) and write to the IB (which can be</div><div class='add'>+	 * uncached).</div><div class='add'>+	 */</div><div class='add'>+	r =  radeon_ib_get(rdev, parser-&gt;ring, &amp;parser-&gt;ib,</div><div class='add'>+			   ib_chunk-&gt;length_dw * 4);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to get ib !\n");</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+	parser-&gt;ib-&gt;length_dw = ib_chunk-&gt;length_dw;</div><div class='add'>+	r = radeon_cs_parse(parser);</div><div class='add'>+	if (r || parser-&gt;parser_error) {</div><div class='add'>+		DRM_ERROR("Invalid command stream !\n");</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+	r = radeon_cs_finish_pages(parser);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Invalid command stream !\n");</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+	r = radeon_cs_sync_rings(parser);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to synchronize rings !\n");</div><div class='add'>+	}</div><div class='add'>+	parser-&gt;ib-&gt;vm_id = 0;</div><div class='add'>+	r = radeon_ib_schedule(rdev, parser-&gt;ib);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to schedule IB !\n");</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int radeon_bo_vm_update_pte(struct radeon_cs_parser *parser,</div><div class='add'>+				   struct radeon_vm *vm)</div><div class='add'>+{</div><div class='add'>+	struct radeon_bo_list *lobj;</div><div class='add'>+	struct radeon_bo *bo;</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(lobj, &amp;parser-&gt;validated, tv.head) {</div><div class='add'>+		bo = lobj-&gt;bo;</div><div class='add'>+		r = radeon_vm_bo_update_pte(parser-&gt;rdev, vm, bo, &amp;bo-&gt;tbo.mem);</div><div class='add'>+		if (r) {</div><div class='add'>+			return r;</div><div 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 radeon_cs_ib_vm_chunk(struct radeon_device *rdev,</div><div class='add'>+				 struct radeon_cs_parser *parser)</div><div class='add'>+{</div><div class='add'>+	struct radeon_cs_chunk *ib_chunk;</div><div class='add'>+	struct radeon_fpriv *fpriv = parser-&gt;filp-&gt;driver_priv;</div><div class='add'>+	struct radeon_vm *vm = &amp;fpriv-&gt;vm;</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	if (parser-&gt;chunk_ib_idx == -1)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if ((parser-&gt;cs_flags &amp; RADEON_CS_USE_VM) == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ib_chunk = &amp;parser-&gt;chunks[parser-&gt;chunk_ib_idx];</div><div class='add'>+	if (ib_chunk-&gt;length_dw &gt; RADEON_IB_VM_MAX_SIZE) {</div><div class='add'>+		DRM_ERROR("cs IB too big: %d\n", ib_chunk-&gt;length_dw);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	r =  radeon_ib_get(rdev, parser-&gt;ring, &amp;parser-&gt;ib,</div><div class='add'>+			   ib_chunk-&gt;length_dw * 4);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to get ib !\n");</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+	parser-&gt;ib-&gt;length_dw = ib_chunk-&gt;length_dw;</div><div class='add'>+	/* Copy the packet into the IB */</div><div class='add'>+	if (DRM_COPY_FROM_USER(parser-&gt;ib-&gt;ptr, ib_chunk-&gt;user_ptr,</div><div class='add'>+			       ib_chunk-&gt;length_dw * 4)) {</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+	r = radeon_ring_ib_parse(rdev, parser-&gt;ring, parser-&gt;ib);</div><div class='add'>+	if (r) {</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;vm-&gt;mutex);</div><div class='add'>+	r = radeon_vm_bind(rdev, vm);</div><div class='add'>+	if (r) {</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	r = radeon_bo_vm_update_pte(parser, vm);</div><div class='add'>+	if (r) {</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	r = radeon_cs_sync_rings(parser);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to synchronize rings !\n");</div><div class='add'>+	}</div><div class='add'>+	parser-&gt;ib-&gt;vm_id = vm-&gt;id;</div><div class='add'>+	/* ib pool is bind at 0 in virtual address space to gpu_addr is the</div><div class='add'>+	 * offset inside the pool bo</div><div class='add'>+	 */</div><div class='add'>+	parser-&gt;ib-&gt;gpu_addr = parser-&gt;ib-&gt;sa_bo.offset;</div><div class='add'>+	r = radeon_ib_schedule(rdev, parser-&gt;ib);</div><div class='add'>+out:</div><div class='add'>+	if (!r) {</div><div class='add'>+		if (vm-&gt;fence) {</div><div class='add'>+			radeon_fence_unref(&amp;vm-&gt;fence);</div><div class='add'>+		}</div><div class='add'>+		vm-&gt;fence = radeon_fence_ref(parser-&gt;ib-&gt;fence);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;fpriv-&gt;vm.mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct radeon_device *rdev = dev-&gt;dev_private;</div><div class='ctx'> 	struct radeon_cs_parser parser;</div><div class='del'>-	struct radeon_cs_chunk *ib_chunk;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	radeon_mutex_lock(&amp;rdev-&gt;cs_mutex);</div><div class='hunk'>@@ -245,13 +466,6 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)</div><div class='ctx'> 		radeon_mutex_unlock(&amp;rdev-&gt;cs_mutex);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-	r =  radeon_ib_get(rdev, &amp;parser.ib);</div><div class='del'>-	if (r) {</div><div class='del'>-		DRM_ERROR("Failed to get ib !\n");</div><div class='del'>-		radeon_cs_parser_fini(&amp;parser, r);</div><div class='del'>-		radeon_mutex_unlock(&amp;rdev-&gt;cs_mutex);</div><div class='del'>-		return r;</div><div class='del'>-	}</div><div class='ctx'> 	r = radeon_cs_parser_relocs(&amp;parser);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		if (r != -ERESTARTSYS)</div><div class='hunk'>@@ -260,29 +474,15 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)</div><div class='ctx'> 		radeon_mutex_unlock(&amp;rdev-&gt;cs_mutex);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-	/* Copy the packet into the IB, the parser will read from the</div><div class='del'>-	 * input memory (cached) and write to the IB (which can be</div><div class='del'>-	 * uncached). */</div><div class='del'>-	ib_chunk = &amp;parser.chunks[parser.chunk_ib_idx];</div><div class='del'>-	parser.ib-&gt;length_dw = ib_chunk-&gt;length_dw;</div><div class='del'>-	r = radeon_cs_parse(&amp;parser);</div><div class='del'>-	if (r || parser.parser_error) {</div><div class='del'>-		DRM_ERROR("Invalid command stream !\n");</div><div class='del'>-		radeon_cs_parser_fini(&amp;parser, r);</div><div class='del'>-		radeon_mutex_unlock(&amp;rdev-&gt;cs_mutex);</div><div class='del'>-		return r;</div><div class='del'>-	}</div><div class='del'>-	r = radeon_cs_finish_pages(&amp;parser);</div><div class='add'>+	r = radeon_cs_ib_chunk(rdev, &amp;parser);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		DRM_ERROR("Invalid command stream !\n");</div><div class='del'>-		radeon_cs_parser_fini(&amp;parser, r);</div><div class='del'>-		radeon_mutex_unlock(&amp;rdev-&gt;cs_mutex);</div><div class='del'>-		return r;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	r = radeon_ib_schedule(rdev, parser.ib);</div><div class='add'>+	r = radeon_cs_ib_vm_chunk(rdev, &amp;parser);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		DRM_ERROR("Failed to schedule IB !\n");</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='ctx'> 	radeon_cs_parser_fini(&amp;parser, r);</div><div class='ctx'> 	radeon_mutex_unlock(&amp;rdev-&gt;cs_mutex);</div><div class='ctx'> 	return r;</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c<br/>index c4d00a171411..0afb13bd8dca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_device.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_device.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_device.c</a></div><div class='hunk'>@@ -224,8 +224,11 @@ int radeon_wb_init(struct radeon_device *rdev)</div><div class='ctx'> 	if (radeon_no_wb == 1)</div><div class='ctx'> 		rdev-&gt;wb.enabled = false;</div><div class='ctx'> 	else {</div><div class='del'>-		/* often unreliable on AGP */</div><div class='ctx'> 		if (rdev-&gt;flags &amp; RADEON_IS_AGP) {</div><div class='add'>+			/* often unreliable on AGP */</div><div class='add'>+			rdev-&gt;wb.enabled = false;</div><div class='add'>+		} else if (rdev-&gt;family &lt; CHIP_R300) {</div><div class='add'>+			/* often unreliable on pre-r300 */</div><div class='ctx'> 			rdev-&gt;wb.enabled = false;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			rdev-&gt;wb.enabled = true;</div><div class='hunk'>@@ -718,17 +721,24 @@ int radeon_device_init(struct radeon_device *rdev,</div><div class='ctx'> 	 * can recall function without having locking issues */</div><div class='ctx'> 	radeon_mutex_init(&amp;rdev-&gt;cs_mutex);</div><div class='ctx'> 	mutex_init(&amp;rdev-&gt;ib_pool.mutex);</div><div class='del'>-	mutex_init(&amp;rdev-&gt;cp.mutex);</div><div class='add'>+	for (i = 0; i &lt; RADEON_NUM_RINGS; ++i)</div><div class='add'>+		mutex_init(&amp;rdev-&gt;ring[i].mutex);</div><div class='ctx'> 	mutex_init(&amp;rdev-&gt;dc_hw_i2c_mutex);</div><div class='ctx'> 	if (rdev-&gt;family &gt;= CHIP_R600)</div><div class='ctx'> 		spin_lock_init(&amp;rdev-&gt;ih.lock);</div><div class='ctx'> 	mutex_init(&amp;rdev-&gt;gem.mutex);</div><div class='ctx'> 	mutex_init(&amp;rdev-&gt;pm.mutex);</div><div class='ctx'> 	mutex_init(&amp;rdev-&gt;vram_mutex);</div><div class='del'>-	rwlock_init(&amp;rdev-&gt;fence_drv.lock);</div><div class='add'>+	rwlock_init(&amp;rdev-&gt;fence_lock);</div><div class='add'>+	rwlock_init(&amp;rdev-&gt;semaphore_drv.lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;rdev-&gt;gem.objects);</div><div class='ctx'> 	init_waitqueue_head(&amp;rdev-&gt;irq.vblank_queue);</div><div class='ctx'> 	init_waitqueue_head(&amp;rdev-&gt;irq.idle_queue);</div><div class='add'>+	INIT_LIST_HEAD(&amp;rdev-&gt;semaphore_drv.bo);</div><div class='add'>+	/* initialize vm here */</div><div class='add'>+	rdev-&gt;vm_manager.use_bitmap = 1;</div><div class='add'>+	rdev-&gt;vm_manager.max_pfn = 1 &lt;&lt; 20;</div><div class='add'>+	INIT_LIST_HEAD(&amp;rdev-&gt;vm_manager.lru_vm);</div><div class='ctx'> </div><div class='ctx'> 	/* Set asic functions */</div><div class='ctx'> 	r = radeon_asic_init(rdev);</div><div class='hunk'>@@ -765,8 +775,14 @@ int radeon_device_init(struct radeon_device *rdev,</div><div class='ctx'> 	r = pci_set_dma_mask(rdev-&gt;pdev, DMA_BIT_MASK(dma_bits));</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		rdev-&gt;need_dma32 = true;</div><div class='add'>+		dma_bits = 32;</div><div class='ctx'> 		printk(KERN_WARNING "radeon: No suitable DMA available.\n");</div><div class='ctx'> 	}</div><div class='add'>+	r = pci_set_consistent_dma_mask(rdev-&gt;pdev, DMA_BIT_MASK(dma_bits));</div><div class='add'>+	if (r) {</div><div class='add'>+		pci_set_consistent_dma_mask(rdev-&gt;pdev, DMA_BIT_MASK(32));</div><div class='add'>+		printk(KERN_WARNING "radeon: No coherent DMA available.\n");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Registers mapping */</div><div class='ctx'> 	/* TODO: block userspace mapping of io register */</div><div class='hunk'>@@ -814,15 +830,20 @@ int radeon_device_init(struct radeon_device *rdev,</div><div class='ctx'> 		if (r)</div><div class='ctx'> 			return r;</div><div class='ctx'> 	}</div><div class='del'>-	if (radeon_testing) {</div><div class='add'>+	if ((radeon_testing &amp; 1)) {</div><div class='ctx'> 		radeon_test_moves(rdev);</div><div class='ctx'> 	}</div><div class='add'>+	if ((radeon_testing &amp; 2)) {</div><div class='add'>+		radeon_test_syncing(rdev);</div><div class='add'>+	}</div><div class='ctx'> 	if (radeon_benchmarking) {</div><div class='ctx'> 		radeon_benchmark(rdev, radeon_benchmarking);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void radeon_debugfs_remove_files(struct radeon_device *rdev);</div><div class='add'>+</div><div class='ctx'> void radeon_device_fini(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	DRM_INFO("radeon: finishing device.\n");</div><div class='hunk'>@@ -837,6 +858,7 @@ void radeon_device_fini(struct radeon_device *rdev)</div><div class='ctx'> 	rdev-&gt;rio_mem = NULL;</div><div class='ctx'> 	iounmap(rdev-&gt;rmmio);</div><div class='ctx'> 	rdev-&gt;rmmio = NULL;</div><div class='add'>+	radeon_debugfs_remove_files(rdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -848,7 +870,7 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t state)</div><div class='ctx'> 	struct radeon_device *rdev;</div><div class='ctx'> 	struct drm_crtc *crtc;</div><div class='ctx'> 	struct drm_connector *connector;</div><div class='del'>-	int r;</div><div class='add'>+	int i, r;</div><div class='ctx'> </div><div class='ctx'> 	if (dev == NULL || dev-&gt;dev_private == NULL) {</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -887,7 +909,8 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t state)</div><div class='ctx'> 	/* evict vram memory */</div><div class='ctx'> 	radeon_bo_evict_vram(rdev);</div><div class='ctx'> 	/* wait for gpu to finish processing current batch */</div><div class='del'>-	radeon_fence_wait_last(rdev);</div><div class='add'>+	for (i = 0; i &lt; RADEON_NUM_RINGS; i++)</div><div class='add'>+		radeon_fence_wait_last(rdev, i);</div><div class='ctx'> </div><div class='ctx'> 	radeon_save_bios_scratch_regs(rdev);</div><div class='ctx'> </div><div class='hunk'>@@ -986,36 +1009,29 @@ int radeon_gpu_reset(struct radeon_device *rdev)</div><div class='ctx'> /*</div><div class='ctx'>  * Debugfs</div><div class='ctx'>  */</div><div class='del'>-struct radeon_debugfs {</div><div class='del'>-	struct drm_info_list	*files;</div><div class='del'>-	unsigned		num_files;</div><div class='del'>-};</div><div class='del'>-static struct radeon_debugfs _radeon_debugfs[RADEON_DEBUGFS_MAX_COMPONENTS];</div><div class='del'>-static unsigned _radeon_debugfs_count = 0;</div><div class='del'>-</div><div class='ctx'> int radeon_debugfs_add_files(struct radeon_device *rdev,</div><div class='ctx'> 			     struct drm_info_list *files,</div><div class='ctx'> 			     unsigned nfiles)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; _radeon_debugfs_count; i++) {</div><div class='del'>-		if (_radeon_debugfs[i].files == files) {</div><div class='add'>+	for (i = 0; i &lt; rdev-&gt;debugfs_count; i++) {</div><div class='add'>+		if (rdev-&gt;debugfs[i].files == files) {</div><div class='ctx'> 			/* Already registered */</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	i = _radeon_debugfs_count + 1;</div><div class='add'>+	i = rdev-&gt;debugfs_count + 1;</div><div class='ctx'> 	if (i &gt; RADEON_DEBUGFS_MAX_COMPONENTS) {</div><div class='ctx'> 		DRM_ERROR("Reached maximum number of debugfs components.\n");</div><div class='ctx'> 		DRM_ERROR("Report so we increase "</div><div class='ctx'> 		          "RADEON_DEBUGFS_MAX_COMPONENTS.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	_radeon_debugfs[_radeon_debugfs_count].files = files;</div><div class='del'>-	_radeon_debugfs[_radeon_debugfs_count].num_files = nfiles;</div><div class='del'>-	_radeon_debugfs_count = i;</div><div class='add'>+	rdev-&gt;debugfs[rdev-&gt;debugfs_count].files = files;</div><div class='add'>+	rdev-&gt;debugfs[rdev-&gt;debugfs_count].num_files = nfiles;</div><div class='add'>+	rdev-&gt;debugfs_count = i;</div><div class='ctx'> #if defined(CONFIG_DEBUG_FS)</div><div class='ctx'> 	drm_debugfs_create_files(files, nfiles,</div><div class='ctx'> 				 rdev-&gt;ddev-&gt;control-&gt;debugfs_root,</div><div class='hunk'>@@ -1027,6 +1043,22 @@ int radeon_debugfs_add_files(struct radeon_device *rdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void radeon_debugfs_remove_files(struct radeon_device *rdev)</div><div class='add'>+{</div><div class='add'>+#if defined(CONFIG_DEBUG_FS)</div><div class='add'>+	unsigned i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rdev-&gt;debugfs_count; i++) {</div><div class='add'>+		drm_debugfs_remove_files(rdev-&gt;debugfs[i].files,</div><div class='add'>+					 rdev-&gt;debugfs[i].num_files,</div><div class='add'>+					 rdev-&gt;ddev-&gt;control);</div><div class='add'>+		drm_debugfs_remove_files(rdev-&gt;debugfs[i].files,</div><div class='add'>+					 rdev-&gt;debugfs[i].num_files,</div><div class='add'>+					 rdev-&gt;ddev-&gt;primary);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_DEBUG_FS)</div><div class='ctx'> int radeon_debugfs_init(struct drm_minor *minor)</div><div class='ctx'> {</div><div class='hunk'>@@ -1035,11 +1067,5 @@ int radeon_debugfs_init(struct drm_minor *minor)</div><div class='ctx'> </div><div class='ctx'> void radeon_debugfs_cleanup(struct drm_minor *minor)</div><div class='ctx'> {</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; _radeon_debugfs_count; i++) {</div><div class='del'>-		drm_debugfs_remove_files(_radeon_debugfs[i].files,</div><div class='del'>-					 _radeon_debugfs[i].num_files, minor);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c<br/>index a22d6e6a49a2..d3ffc18774a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_display.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_display.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_display.c</a></div><div class='hunk'>@@ -406,7 +406,7 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,</div><div class='ctx'> 	if (!ASIC_IS_AVIVO(rdev)) {</div><div class='ctx'> 		/* crtc offset is from display base addr not FB location */</div><div class='ctx'> 		base -= radeon_crtc-&gt;legacy_display_base_addr;</div><div class='del'>-		pitch_pixels = fb-&gt;pitch / (fb-&gt;bits_per_pixel / 8);</div><div class='add'>+		pitch_pixels = fb-&gt;pitches[0] / (fb-&gt;bits_per_pixel / 8);</div><div class='ctx'> </div><div class='ctx'> 		if (tiling_flags &amp; RADEON_TILING_MACRO) {</div><div class='ctx'> 			if (ASIC_IS_R300(rdev)) {</div><div class='hunk'>@@ -1081,7 +1081,7 @@ static const struct drm_framebuffer_funcs radeon_fb_funcs = {</div><div class='ctx'> void</div><div class='ctx'> radeon_framebuffer_init(struct drm_device *dev,</div><div class='ctx'> 			struct radeon_framebuffer *rfb,</div><div class='del'>-			struct drm_mode_fb_cmd *mode_cmd,</div><div class='add'>+			struct drm_mode_fb_cmd2 *mode_cmd,</div><div class='ctx'> 			struct drm_gem_object *obj)</div><div class='ctx'> {</div><div class='ctx'> 	rfb-&gt;obj = obj;</div><div class='hunk'>@@ -1092,15 +1092,15 @@ radeon_framebuffer_init(struct drm_device *dev,</div><div class='ctx'> static struct drm_framebuffer *</div><div class='ctx'> radeon_user_framebuffer_create(struct drm_device *dev,</div><div class='ctx'> 			       struct drm_file *file_priv,</div><div class='del'>-			       struct drm_mode_fb_cmd *mode_cmd)</div><div class='add'>+			       struct drm_mode_fb_cmd2 *mode_cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_gem_object *obj;</div><div class='ctx'> 	struct radeon_framebuffer *radeon_fb;</div><div class='ctx'> </div><div class='del'>-	obj = drm_gem_object_lookup(dev, file_priv, mode_cmd-&gt;handle);</div><div class='add'>+	obj = drm_gem_object_lookup(dev, file_priv, mode_cmd-&gt;handles[0]);</div><div class='ctx'> 	if (obj ==  NULL) {</div><div class='ctx'> 		dev_err(&amp;dev-&gt;pdev-&gt;dev, "No GEM object associated to handle 0x%08X, "</div><div class='del'>-			"can't create framebuffer\n", mode_cmd-&gt;handle);</div><div class='add'>+			"can't create framebuffer\n", mode_cmd-&gt;handles[0]);</div><div class='ctx'> 		return ERR_PTR(-ENOENT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c<br/>index 71499fc3daf5..8032f1fedb11 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_drv.c</a></div><div class='hunk'>@@ -54,9 +54,10 @@</div><div class='ctx'>  *   2.10.0 - fusion 2D tiling</div><div class='ctx'>  *   2.11.0 - backend map, initial compute support for the CS checker</div><div class='ctx'>  *   2.12.0 - RADEON_CS_KEEP_TILING_FLAGS</div><div class='add'>+ *   2.13.0 - virtual memory support</div><div class='ctx'>  */</div><div class='ctx'> #define KMS_DRIVER_MAJOR	2</div><div class='del'>-#define KMS_DRIVER_MINOR	12</div><div class='add'>+#define KMS_DRIVER_MINOR	13</div><div class='ctx'> #define KMS_DRIVER_PATCHLEVEL	0</div><div class='ctx'> int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);</div><div class='ctx'> int radeon_driver_unload_kms(struct drm_device *dev);</div><div class='hunk'>@@ -84,6 +85,10 @@ int radeon_dma_ioctl_kms(struct drm_device *dev, void *data,</div><div class='ctx'> 			 struct drm_file *file_priv);</div><div class='ctx'> int radeon_gem_object_init(struct drm_gem_object *obj);</div><div class='ctx'> void radeon_gem_object_free(struct drm_gem_object *obj);</div><div class='add'>+int radeon_gem_object_open(struct drm_gem_object *obj,</div><div class='add'>+				struct drm_file *file_priv);</div><div class='add'>+void radeon_gem_object_close(struct drm_gem_object *obj,</div><div class='add'>+				struct drm_file *file_priv);</div><div class='ctx'> extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, int crtc,</div><div class='ctx'> 				      int *vpos, int *hpos);</div><div class='ctx'> extern struct drm_ioctl_desc radeon_ioctls_kms[];</div><div class='hunk'>@@ -140,7 +145,7 @@ module_param_named(vramlimit, radeon_vram_limit, int, 0600);</div><div class='ctx'> MODULE_PARM_DESC(agpmode, "AGP Mode (-1 == PCI)");</div><div class='ctx'> module_param_named(agpmode, radeon_agpmode, int, 0444);</div><div class='ctx'> </div><div class='del'>-MODULE_PARM_DESC(gartsize, "Size of PCIE/IGP gart to setup in megabytes (32,64, etc)\n");</div><div class='add'>+MODULE_PARM_DESC(gartsize, "Size of PCIE/IGP gart to setup in megabytes (32, 64, etc)");</div><div class='ctx'> module_param_named(gartsize, radeon_gart_size, int, 0600);</div><div class='ctx'> </div><div class='ctx'> MODULE_PARM_DESC(benchmark, "Run benchmark");</div><div class='hunk'>@@ -206,6 +211,21 @@ static struct pci_device_id pciidlist[] = {</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, pciidlist);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static const struct file_operations radeon_driver_old_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = drm_open,</div><div class='add'>+	.release = drm_release,</div><div class='add'>+	.unlocked_ioctl = drm_ioctl,</div><div class='add'>+	.mmap = drm_mmap,</div><div class='add'>+	.poll = drm_poll,</div><div class='add'>+	.fasync = drm_fasync,</div><div class='add'>+	.read = drm_read,</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+	.compat_ioctl = radeon_compat_ioctl,</div><div class='add'>+#endif</div><div class='add'>+	.llseek = noop_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct drm_driver driver_old = {</div><div class='ctx'> 	.driver_features =</div><div class='ctx'> 	    DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |</div><div class='hunk'>@@ -232,21 +252,7 @@ static struct drm_driver driver_old = {</div><div class='ctx'> 	.reclaim_buffers = drm_core_reclaim_buffers,</div><div class='ctx'> 	.ioctls = radeon_ioctls,</div><div class='ctx'> 	.dma_ioctl = radeon_cp_buffers,</div><div class='del'>-	.fops = {</div><div class='del'>-		 .owner = THIS_MODULE,</div><div class='del'>-		 .open = drm_open,</div><div class='del'>-		 .release = drm_release,</div><div class='del'>-		 .unlocked_ioctl = drm_ioctl,</div><div class='del'>-		 .mmap = drm_mmap,</div><div class='del'>-		 .poll = drm_poll,</div><div class='del'>-		 .fasync = drm_fasync,</div><div class='del'>-		 .read = drm_read,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-		 .compat_ioctl = radeon_compat_ioctl,</div><div class='del'>-#endif</div><div class='del'>-		 .llseek = noop_llseek,</div><div class='del'>-	},</div><div class='del'>-</div><div class='add'>+	.fops = &amp;radeon_driver_old_fops,</div><div class='ctx'> 	.name = DRIVER_NAME,</div><div class='ctx'> 	.desc = DRIVER_DESC,</div><div class='ctx'> 	.date = DRIVER_DATE,</div><div class='hunk'>@@ -304,6 +310,20 @@ radeon_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> 	return radeon_resume_kms(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct file_operations radeon_driver_kms_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = drm_open,</div><div class='add'>+	.release = drm_release,</div><div class='add'>+	.unlocked_ioctl = drm_ioctl,</div><div class='add'>+	.mmap = radeon_mmap,</div><div class='add'>+	.poll = drm_poll,</div><div class='add'>+	.fasync = drm_fasync,</div><div class='add'>+	.read = drm_read,</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+	.compat_ioctl = radeon_kms_compat_ioctl,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct drm_driver kms_driver = {</div><div class='ctx'> 	.driver_features =</div><div class='ctx'> 	    DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |</div><div class='hunk'>@@ -335,24 +355,13 @@ static struct drm_driver kms_driver = {</div><div class='ctx'> 	.ioctls = radeon_ioctls_kms,</div><div class='ctx'> 	.gem_init_object = radeon_gem_object_init,</div><div class='ctx'> 	.gem_free_object = radeon_gem_object_free,</div><div class='add'>+	.gem_open_object = radeon_gem_object_open,</div><div class='add'>+	.gem_close_object = radeon_gem_object_close,</div><div class='ctx'> 	.dma_ioctl = radeon_dma_ioctl_kms,</div><div class='ctx'> 	.dumb_create = radeon_mode_dumb_create,</div><div class='ctx'> 	.dumb_map_offset = radeon_mode_dumb_mmap,</div><div class='ctx'> 	.dumb_destroy = radeon_mode_dumb_destroy,</div><div class='del'>-	.fops = {</div><div class='del'>-		 .owner = THIS_MODULE,</div><div class='del'>-		 .open = drm_open,</div><div class='del'>-		 .release = drm_release,</div><div class='del'>-		 .unlocked_ioctl = drm_ioctl,</div><div class='del'>-		 .mmap = radeon_mmap,</div><div class='del'>-		 .poll = drm_poll,</div><div class='del'>-		 .fasync = drm_fasync,</div><div class='del'>-		 .read = drm_read,</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-		 .compat_ioctl = radeon_kms_compat_ioctl,</div><div class='del'>-#endif</div><div class='del'>-	},</div><div class='del'>-</div><div class='add'>+	.fops = &amp;radeon_driver_kms_fops,</div><div class='ctx'> 	.name = DRIVER_NAME,</div><div class='ctx'> 	.desc = DRIVER_DESC,</div><div class='ctx'> 	.date = DRIVER_DATE,</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c<br/>index 0b7b486c97e8..cf2bf35b56b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_fb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_fb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_fb.c</a></div><div class='hunk'>@@ -103,7 +103,7 @@ static void radeonfb_destroy_pinned_object(struct drm_gem_object *gobj)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev,</div><div class='del'>-					 struct drm_mode_fb_cmd *mode_cmd,</div><div class='add'>+					 struct drm_mode_fb_cmd2 *mode_cmd,</div><div class='ctx'> 					 struct drm_gem_object **gobj_p)</div><div class='ctx'> {</div><div class='ctx'> 	struct radeon_device *rdev = rfbdev-&gt;rdev;</div><div class='hunk'>@@ -114,13 +114,17 @@ static int radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int aligned_size, size;</div><div class='ctx'> 	int height = mode_cmd-&gt;height;</div><div class='add'>+	u32 bpp, depth;</div><div class='add'>+</div><div class='add'>+	drm_fb_get_bpp_depth(mode_cmd-&gt;pixel_format, &amp;depth, &amp;bpp);</div><div class='ctx'> </div><div class='ctx'> 	/* need to align pitch with crtc limits */</div><div class='del'>-	mode_cmd-&gt;pitch = radeon_align_pitch(rdev, mode_cmd-&gt;width, mode_cmd-&gt;bpp, fb_tiled) * ((mode_cmd-&gt;bpp + 1) / 8);</div><div class='add'>+	mode_cmd-&gt;pitches[0] = radeon_align_pitch(rdev, mode_cmd-&gt;width, bpp,</div><div class='add'>+						  fb_tiled) * ((bpp + 1) / 8);</div><div class='ctx'> </div><div class='ctx'> 	if (rdev-&gt;family &gt;= CHIP_R600)</div><div class='ctx'> 		height = ALIGN(mode_cmd-&gt;height, 8);</div><div class='del'>-	size = mode_cmd-&gt;pitch * height;</div><div class='add'>+	size = mode_cmd-&gt;pitches[0] * height;</div><div class='ctx'> 	aligned_size = ALIGN(size, PAGE_SIZE);</div><div class='ctx'> 	ret = radeon_gem_object_create(rdev, aligned_size, 0,</div><div class='ctx'> 				       RADEON_GEM_DOMAIN_VRAM,</div><div class='hunk'>@@ -137,7 +141,7 @@ static int radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev,</div><div class='ctx'> 		tiling_flags = RADEON_TILING_MACRO;</div><div class='ctx'> </div><div class='ctx'> #ifdef __BIG_ENDIAN</div><div class='del'>-	switch (mode_cmd-&gt;bpp) {</div><div class='add'>+	switch (bpp) {</div><div class='ctx'> 	case 32:</div><div class='ctx'> 		tiling_flags |= RADEON_TILING_SWAP_32BIT;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -151,7 +155,7 @@ static int radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev,</div><div class='ctx'> 	if (tiling_flags) {</div><div class='ctx'> 		ret = radeon_bo_set_tiling_flags(rbo,</div><div class='ctx'> 						 tiling_flags | RADEON_TILING_SURFACE,</div><div class='del'>-						 mode_cmd-&gt;pitch);</div><div class='add'>+						 mode_cmd-&gt;pitches[0]);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			dev_err(rdev-&gt;dev, "FB failed to set tiling flags\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -187,7 +191,7 @@ static int radeonfb_create(struct radeon_fbdev *rfbdev,</div><div class='ctx'> 	struct radeon_device *rdev = rfbdev-&gt;rdev;</div><div class='ctx'> 	struct fb_info *info;</div><div class='ctx'> 	struct drm_framebuffer *fb = NULL;</div><div class='del'>-	struct drm_mode_fb_cmd mode_cmd;</div><div class='add'>+	struct drm_mode_fb_cmd2 mode_cmd;</div><div class='ctx'> 	struct drm_gem_object *gobj = NULL;</div><div class='ctx'> 	struct radeon_bo *rbo = NULL;</div><div class='ctx'> 	struct device *device = &amp;rdev-&gt;pdev-&gt;dev;</div><div class='hunk'>@@ -201,8 +205,8 @@ static int radeonfb_create(struct radeon_fbdev *rfbdev,</div><div class='ctx'> 	if ((sizes-&gt;surface_bpp == 24) &amp;&amp; ASIC_IS_AVIVO(rdev))</div><div class='ctx'> 		sizes-&gt;surface_bpp = 32;</div><div class='ctx'> </div><div class='del'>-	mode_cmd.bpp = sizes-&gt;surface_bpp;</div><div class='del'>-	mode_cmd.depth = sizes-&gt;surface_depth;</div><div class='add'>+	mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes-&gt;surface_bpp,</div><div class='add'>+							  sizes-&gt;surface_depth);</div><div class='ctx'> </div><div class='ctx'> 	ret = radeonfb_create_pinned_object(rfbdev, &amp;mode_cmd, &amp;gobj);</div><div class='ctx'> 	rbo = gem_to_radeon_bo(gobj);</div><div class='hunk'>@@ -228,7 +232,7 @@ static int radeonfb_create(struct radeon_fbdev *rfbdev,</div><div class='ctx'> </div><div class='ctx'> 	strcpy(info-&gt;fix.id, "radeondrmfb");</div><div class='ctx'> </div><div class='del'>-	drm_fb_helper_fill_fix(info, fb-&gt;pitch, fb-&gt;depth);</div><div class='add'>+	drm_fb_helper_fill_fix(info, fb-&gt;pitches[0], fb-&gt;depth);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;</div><div class='ctx'> 	info-&gt;fbops = &amp;radeonfb_ops;</div><div class='hunk'>@@ -271,7 +275,7 @@ static int radeonfb_create(struct radeon_fbdev *rfbdev,</div><div class='ctx'> 	DRM_INFO("vram apper at 0x%lX\n",  (unsigned long)rdev-&gt;mc.aper_base);</div><div class='ctx'> 	DRM_INFO("size %lu\n", (unsigned long)radeon_bo_size(rbo));</div><div class='ctx'> 	DRM_INFO("fb depth is %d\n", fb-&gt;depth);</div><div class='del'>-	DRM_INFO("   pitch is %d\n", fb-&gt;pitch);</div><div class='add'>+	DRM_INFO("   pitch is %d\n", fb-&gt;pitches[0]);</div><div class='ctx'> </div><div class='ctx'> 	vga_switcheroo_client_fb_set(rdev-&gt;ddev-&gt;pdev, info);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c<br/>index 76ec0e9ed8ae..64ea3dd9e6ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_fence.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_fence.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_fence.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_fence.c</a></div><div class='hunk'>@@ -40,32 +40,24 @@</div><div class='ctx'> #include "radeon.h"</div><div class='ctx'> #include "radeon_trace.h"</div><div class='ctx'> </div><div class='del'>-static void radeon_fence_write(struct radeon_device *rdev, u32 seq)</div><div class='add'>+static void radeon_fence_write(struct radeon_device *rdev, u32 seq, int ring)</div><div class='ctx'> {</div><div class='ctx'> 	if (rdev-&gt;wb.enabled) {</div><div class='del'>-		u32 scratch_index;</div><div class='del'>-		if (rdev-&gt;wb.use_event)</div><div class='del'>-			scratch_index = R600_WB_EVENT_OFFSET + rdev-&gt;fence_drv.scratch_reg - rdev-&gt;scratch.reg_base;</div><div class='del'>-		else</div><div class='del'>-			scratch_index = RADEON_WB_SCRATCH_OFFSET + rdev-&gt;fence_drv.scratch_reg - rdev-&gt;scratch.reg_base;</div><div class='del'>-		rdev-&gt;wb.wb[scratch_index/4] = cpu_to_le32(seq);</div><div class='del'>-	} else</div><div class='del'>-		WREG32(rdev-&gt;fence_drv.scratch_reg, seq);</div><div class='add'>+		*rdev-&gt;fence_drv[ring].cpu_addr = cpu_to_le32(seq);</div><div class='add'>+	} else {</div><div class='add'>+		WREG32(rdev-&gt;fence_drv[ring].scratch_reg, seq);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 radeon_fence_read(struct radeon_device *rdev)</div><div class='add'>+static u32 radeon_fence_read(struct radeon_device *rdev, int ring)</div><div class='ctx'> {</div><div class='del'>-	u32 seq;</div><div class='add'>+	u32 seq = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (rdev-&gt;wb.enabled) {</div><div class='del'>-		u32 scratch_index;</div><div class='del'>-		if (rdev-&gt;wb.use_event)</div><div class='del'>-			scratch_index = R600_WB_EVENT_OFFSET + rdev-&gt;fence_drv.scratch_reg - rdev-&gt;scratch.reg_base;</div><div class='del'>-		else</div><div class='del'>-			scratch_index = RADEON_WB_SCRATCH_OFFSET + rdev-&gt;fence_drv.scratch_reg - rdev-&gt;scratch.reg_base;</div><div class='del'>-		seq = le32_to_cpu(rdev-&gt;wb.wb[scratch_index/4]);</div><div class='del'>-	} else</div><div class='del'>-		seq = RREG32(rdev-&gt;fence_drv.scratch_reg);</div><div class='add'>+		seq = le32_to_cpu(*rdev-&gt;fence_drv[ring].cpu_addr);</div><div class='add'>+	} else {</div><div class='add'>+		seq = RREG32(rdev-&gt;fence_drv[ring].scratch_reg);</div><div class='add'>+	}</div><div class='ctx'> 	return seq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -73,28 +65,28 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long irq_flags;</div><div class='ctx'> </div><div class='del'>-	write_lock_irqsave(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='del'>-	if (fence-&gt;emited) {</div><div class='del'>-		write_unlock_irqrestore(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='add'>+	write_lock_irqsave(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='add'>+	if (fence-&gt;emitted) {</div><div class='add'>+		write_unlock_irqrestore(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	fence-&gt;seq = atomic_add_return(1, &amp;rdev-&gt;fence_drv.seq);</div><div class='del'>-	if (!rdev-&gt;cp.ready)</div><div class='add'>+	fence-&gt;seq = atomic_add_return(1, &amp;rdev-&gt;fence_drv[fence-&gt;ring].seq);</div><div class='add'>+	if (!rdev-&gt;ring[fence-&gt;ring].ready)</div><div class='ctx'> 		/* FIXME: cp is not running assume everythings is done right</div><div class='ctx'> 		 * away</div><div class='ctx'> 		 */</div><div class='del'>-		radeon_fence_write(rdev, fence-&gt;seq);</div><div class='add'>+		radeon_fence_write(rdev, fence-&gt;seq, fence-&gt;ring);</div><div class='ctx'> 	else</div><div class='del'>-		radeon_fence_ring_emit(rdev, fence);</div><div class='add'>+		radeon_fence_ring_emit(rdev, fence-&gt;ring, fence);</div><div class='ctx'> </div><div class='ctx'> 	trace_radeon_fence_emit(rdev-&gt;ddev, fence-&gt;seq);</div><div class='del'>-	fence-&gt;emited = true;</div><div class='del'>-	list_move_tail(&amp;fence-&gt;list, &amp;rdev-&gt;fence_drv.emited);</div><div class='del'>-	write_unlock_irqrestore(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='add'>+	fence-&gt;emitted = true;</div><div class='add'>+	list_move_tail(&amp;fence-&gt;list, &amp;rdev-&gt;fence_drv[fence-&gt;ring].emitted);</div><div class='add'>+	write_unlock_irqrestore(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool radeon_fence_poll_locked(struct radeon_device *rdev)</div><div class='add'>+static bool radeon_fence_poll_locked(struct radeon_device *rdev, int ring)</div><div class='ctx'> {</div><div class='ctx'> 	struct radeon_fence *fence;</div><div class='ctx'> 	struct list_head *i, *n;</div><div class='hunk'>@@ -102,34 +94,34 @@ static bool radeon_fence_poll_locked(struct radeon_device *rdev)</div><div class='ctx'> 	bool wake = false;</div><div class='ctx'> 	unsigned long cjiffies;</div><div class='ctx'> </div><div class='del'>-	seq = radeon_fence_read(rdev);</div><div class='del'>-	if (seq != rdev-&gt;fence_drv.last_seq) {</div><div class='del'>-		rdev-&gt;fence_drv.last_seq = seq;</div><div class='del'>-		rdev-&gt;fence_drv.last_jiffies = jiffies;</div><div class='del'>-		rdev-&gt;fence_drv.last_timeout = RADEON_FENCE_JIFFIES_TIMEOUT;</div><div class='add'>+	seq = radeon_fence_read(rdev, ring);</div><div class='add'>+	if (seq != rdev-&gt;fence_drv[ring].last_seq) {</div><div class='add'>+		rdev-&gt;fence_drv[ring].last_seq = seq;</div><div class='add'>+		rdev-&gt;fence_drv[ring].last_jiffies = jiffies;</div><div class='add'>+		rdev-&gt;fence_drv[ring].last_timeout = RADEON_FENCE_JIFFIES_TIMEOUT;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		cjiffies = jiffies;</div><div class='del'>-		if (time_after(cjiffies, rdev-&gt;fence_drv.last_jiffies)) {</div><div class='del'>-			cjiffies -= rdev-&gt;fence_drv.last_jiffies;</div><div class='del'>-			if (time_after(rdev-&gt;fence_drv.last_timeout, cjiffies)) {</div><div class='add'>+		if (time_after(cjiffies, rdev-&gt;fence_drv[ring].last_jiffies)) {</div><div class='add'>+			cjiffies -= rdev-&gt;fence_drv[ring].last_jiffies;</div><div class='add'>+			if (time_after(rdev-&gt;fence_drv[ring].last_timeout, cjiffies)) {</div><div class='ctx'> 				/* update the timeout */</div><div class='del'>-				rdev-&gt;fence_drv.last_timeout -= cjiffies;</div><div class='add'>+				rdev-&gt;fence_drv[ring].last_timeout -= cjiffies;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* the 500ms timeout is elapsed we should test</div><div class='ctx'> 				 * for GPU lockup</div><div class='ctx'> 				 */</div><div class='del'>-				rdev-&gt;fence_drv.last_timeout = 1;</div><div class='add'>+				rdev-&gt;fence_drv[ring].last_timeout = 1;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* wrap around update last jiffies, we will just wait</div><div class='ctx'> 			 * a little longer</div><div class='ctx'> 			 */</div><div class='del'>-			rdev-&gt;fence_drv.last_jiffies = cjiffies;</div><div class='add'>+			rdev-&gt;fence_drv[ring].last_jiffies = cjiffies;</div><div class='ctx'> 		}</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	n = NULL;</div><div class='del'>-	list_for_each(i, &amp;rdev-&gt;fence_drv.emited) {</div><div class='add'>+	list_for_each(i, &amp;rdev-&gt;fence_drv[ring].emitted) {</div><div class='ctx'> 		fence = list_entry(i, struct radeon_fence, list);</div><div class='ctx'> 		if (fence-&gt;seq == seq) {</div><div class='ctx'> 			n = i;</div><div class='hunk'>@@ -141,11 +133,11 @@ static bool radeon_fence_poll_locked(struct radeon_device *rdev)</div><div class='ctx'> 		i = n;</div><div class='ctx'> 		do {</div><div class='ctx'> 			n = i-&gt;prev;</div><div class='del'>-			list_move_tail(i, &amp;rdev-&gt;fence_drv.signaled);</div><div class='add'>+			list_move_tail(i, &amp;rdev-&gt;fence_drv[ring].signaled);</div><div class='ctx'> 			fence = list_entry(i, struct radeon_fence, list);</div><div class='ctx'> 			fence-&gt;signaled = true;</div><div class='ctx'> 			i = n;</div><div class='del'>-		} while (i != &amp;rdev-&gt;fence_drv.emited);</div><div class='add'>+		} while (i != &amp;rdev-&gt;fence_drv[ring].emitted);</div><div class='ctx'> 		wake = true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return wake;</div><div class='hunk'>@@ -157,14 +149,18 @@ static void radeon_fence_destroy(struct kref *kref)</div><div class='ctx'>         struct radeon_fence *fence;</div><div class='ctx'> </div><div class='ctx'> 	fence = container_of(kref, struct radeon_fence, kref);</div><div class='del'>-	write_lock_irqsave(&amp;fence-&gt;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='add'>+	write_lock_irqsave(&amp;fence-&gt;rdev-&gt;fence_lock, irq_flags);</div><div class='ctx'> 	list_del(&amp;fence-&gt;list);</div><div class='del'>-	fence-&gt;emited = false;</div><div class='del'>-	write_unlock_irqrestore(&amp;fence-&gt;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='add'>+	fence-&gt;emitted = false;</div><div class='add'>+	write_unlock_irqrestore(&amp;fence-&gt;rdev-&gt;fence_lock, irq_flags);</div><div class='add'>+	if (fence-&gt;semaphore)</div><div class='add'>+		radeon_semaphore_free(fence-&gt;rdev, fence-&gt;semaphore);</div><div class='ctx'> 	kfree(fence);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int radeon_fence_create(struct radeon_device *rdev, struct radeon_fence **fence)</div><div class='add'>+int radeon_fence_create(struct radeon_device *rdev,</div><div class='add'>+			struct radeon_fence **fence,</div><div class='add'>+			int ring)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long irq_flags;</div><div class='ctx'> </div><div class='hunk'>@@ -174,18 +170,19 @@ int radeon_fence_create(struct radeon_device *rdev, struct radeon_fence **fence)</div><div class='ctx'> 	}</div><div class='ctx'> 	kref_init(&amp;((*fence)-&gt;kref));</div><div class='ctx'> 	(*fence)-&gt;rdev = rdev;</div><div class='del'>-	(*fence)-&gt;emited = false;</div><div class='add'>+	(*fence)-&gt;emitted = false;</div><div class='ctx'> 	(*fence)-&gt;signaled = false;</div><div class='ctx'> 	(*fence)-&gt;seq = 0;</div><div class='add'>+	(*fence)-&gt;ring = ring;</div><div class='add'>+	(*fence)-&gt;semaphore = NULL;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;(*fence)-&gt;list);</div><div class='ctx'> </div><div class='del'>-	write_lock_irqsave(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='del'>-	list_add_tail(&amp;(*fence)-&gt;list, &amp;rdev-&gt;fence_drv.created);</div><div class='del'>-	write_unlock_irqrestore(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='add'>+	write_lock_irqsave(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='add'>+	list_add_tail(&amp;(*fence)-&gt;list, &amp;rdev-&gt;fence_drv[ring].created);</div><div class='add'>+	write_unlock_irqrestore(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> bool radeon_fence_signaled(struct radeon_fence *fence)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long irq_flags;</div><div class='hunk'>@@ -197,21 +194,21 @@ bool radeon_fence_signaled(struct radeon_fence *fence)</div><div class='ctx'> 	if (fence-&gt;rdev-&gt;gpu_lockup)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	write_lock_irqsave(&amp;fence-&gt;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='add'>+	write_lock_irqsave(&amp;fence-&gt;rdev-&gt;fence_lock, irq_flags);</div><div class='ctx'> 	signaled = fence-&gt;signaled;</div><div class='ctx'> 	/* if we are shuting down report all fence as signaled */</div><div class='ctx'> 	if (fence-&gt;rdev-&gt;shutdown) {</div><div class='ctx'> 		signaled = true;</div><div class='ctx'> 	}</div><div class='del'>-	if (!fence-&gt;emited) {</div><div class='del'>-		WARN(1, "Querying an unemited fence : %p !\n", fence);</div><div class='add'>+	if (!fence-&gt;emitted) {</div><div class='add'>+		WARN(1, "Querying an unemitted fence : %p !\n", fence);</div><div class='ctx'> 		signaled = true;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!signaled) {</div><div class='del'>-		radeon_fence_poll_locked(fence-&gt;rdev);</div><div class='add'>+		radeon_fence_poll_locked(fence-&gt;rdev, fence-&gt;ring);</div><div class='ctx'> 		signaled = fence-&gt;signaled;</div><div class='ctx'> 	}</div><div class='del'>-	write_unlock_irqrestore(&amp;fence-&gt;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='add'>+	write_unlock_irqrestore(&amp;fence-&gt;rdev-&gt;fence_lock, irq_flags);</div><div class='ctx'> 	return signaled;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -230,24 +227,24 @@ int radeon_fence_wait(struct radeon_fence *fence, bool intr)</div><div class='ctx'> 	if (radeon_fence_signaled(fence)) {</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	timeout = rdev-&gt;fence_drv.last_timeout;</div><div class='add'>+	timeout = rdev-&gt;fence_drv[fence-&gt;ring].last_timeout;</div><div class='ctx'> retry:</div><div class='ctx'> 	/* save current sequence used to check for GPU lockup */</div><div class='del'>-	seq = rdev-&gt;fence_drv.last_seq;</div><div class='add'>+	seq = rdev-&gt;fence_drv[fence-&gt;ring].last_seq;</div><div class='ctx'> 	trace_radeon_fence_wait_begin(rdev-&gt;ddev, seq);</div><div class='ctx'> 	if (intr) {</div><div class='del'>-		radeon_irq_kms_sw_irq_get(rdev);</div><div class='del'>-		r = wait_event_interruptible_timeout(rdev-&gt;fence_drv.queue,</div><div class='add'>+		radeon_irq_kms_sw_irq_get(rdev, fence-&gt;ring);</div><div class='add'>+		r = wait_event_interruptible_timeout(rdev-&gt;fence_drv[fence-&gt;ring].queue,</div><div class='ctx'> 				radeon_fence_signaled(fence), timeout);</div><div class='del'>-		radeon_irq_kms_sw_irq_put(rdev);</div><div class='add'>+		radeon_irq_kms_sw_irq_put(rdev, fence-&gt;ring);</div><div class='ctx'> 		if (unlikely(r &lt; 0)) {</div><div class='ctx'> 			return r;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		radeon_irq_kms_sw_irq_get(rdev);</div><div class='del'>-		r = wait_event_timeout(rdev-&gt;fence_drv.queue,</div><div class='add'>+		radeon_irq_kms_sw_irq_get(rdev, fence-&gt;ring);</div><div class='add'>+		r = wait_event_timeout(rdev-&gt;fence_drv[fence-&gt;ring].queue,</div><div class='ctx'> 			 radeon_fence_signaled(fence), timeout);</div><div class='del'>-		radeon_irq_kms_sw_irq_put(rdev);</div><div class='add'>+		radeon_irq_kms_sw_irq_put(rdev, fence-&gt;ring);</div><div class='ctx'> 	}</div><div class='ctx'> 	trace_radeon_fence_wait_end(rdev-&gt;ddev, seq);</div><div class='ctx'> 	if (unlikely(!radeon_fence_signaled(fence))) {</div><div class='hunk'>@@ -258,10 +255,11 @@ retry:</div><div class='ctx'> 			timeout = r;</div><div class='ctx'> 			goto retry;</div><div class='ctx'> 		}</div><div class='del'>-		/* don't protect read access to rdev-&gt;fence_drv.last_seq</div><div class='add'>+		/* don't protect read access to rdev-&gt;fence_drv[t].last_seq</div><div class='ctx'> 		 * if we experiencing a lockup the value doesn't change</div><div class='ctx'> 		 */</div><div class='del'>-		if (seq == rdev-&gt;fence_drv.last_seq &amp;&amp; radeon_gpu_is_lockup(rdev)) {</div><div class='add'>+		if (seq == rdev-&gt;fence_drv[fence-&gt;ring].last_seq &amp;&amp;</div><div class='add'>+		    radeon_gpu_is_lockup(rdev, &amp;rdev-&gt;ring[fence-&gt;ring])) {</div><div class='ctx'> 			/* good news we believe it's a lockup */</div><div class='ctx'> 			printk(KERN_WARNING "GPU lockup (waiting for 0x%08X last fence id 0x%08X)\n",</div><div class='ctx'> 			     fence-&gt;seq, seq);</div><div class='hunk'>@@ -272,20 +270,20 @@ retry:</div><div class='ctx'> 			r = radeon_gpu_reset(rdev);</div><div class='ctx'> 			if (r)</div><div class='ctx'> 				return r;</div><div class='del'>-			radeon_fence_write(rdev, fence-&gt;seq);</div><div class='add'>+			radeon_fence_write(rdev, fence-&gt;seq, fence-&gt;ring);</div><div class='ctx'> 			rdev-&gt;gpu_lockup = false;</div><div class='ctx'> 		}</div><div class='ctx'> 		timeout = RADEON_FENCE_JIFFIES_TIMEOUT;</div><div class='del'>-		write_lock_irqsave(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='del'>-		rdev-&gt;fence_drv.last_timeout = RADEON_FENCE_JIFFIES_TIMEOUT;</div><div class='del'>-		rdev-&gt;fence_drv.last_jiffies = jiffies;</div><div class='del'>-		write_unlock_irqrestore(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='add'>+		write_lock_irqsave(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='add'>+		rdev-&gt;fence_drv[fence-&gt;ring].last_timeout = RADEON_FENCE_JIFFIES_TIMEOUT;</div><div class='add'>+		rdev-&gt;fence_drv[fence-&gt;ring].last_jiffies = jiffies;</div><div class='add'>+		write_unlock_irqrestore(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='ctx'> 		goto retry;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int radeon_fence_wait_next(struct radeon_device *rdev)</div><div class='add'>+int radeon_fence_wait_next(struct radeon_device *rdev, int ring)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long irq_flags;</div><div class='ctx'> 	struct radeon_fence *fence;</div><div class='hunk'>@@ -294,21 +292,21 @@ int radeon_fence_wait_next(struct radeon_device *rdev)</div><div class='ctx'> 	if (rdev-&gt;gpu_lockup) {</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	write_lock_irqsave(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='del'>-	if (list_empty(&amp;rdev-&gt;fence_drv.emited)) {</div><div class='del'>-		write_unlock_irqrestore(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='add'>+	write_lock_irqsave(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='add'>+	if (list_empty(&amp;rdev-&gt;fence_drv[ring].emitted)) {</div><div class='add'>+		write_unlock_irqrestore(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	fence = list_entry(rdev-&gt;fence_drv.emited.next,</div><div class='add'>+	fence = list_entry(rdev-&gt;fence_drv[ring].emitted.next,</div><div class='ctx'> 			   struct radeon_fence, list);</div><div class='ctx'> 	radeon_fence_ref(fence);</div><div class='del'>-	write_unlock_irqrestore(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='add'>+	write_unlock_irqrestore(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='ctx'> 	r = radeon_fence_wait(fence, false);</div><div class='ctx'> 	radeon_fence_unref(&amp;fence);</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int radeon_fence_wait_last(struct radeon_device *rdev)</div><div class='add'>+int radeon_fence_wait_last(struct radeon_device *rdev, int ring)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long irq_flags;</div><div class='ctx'> 	struct radeon_fence *fence;</div><div class='hunk'>@@ -317,15 +315,15 @@ int radeon_fence_wait_last(struct radeon_device *rdev)</div><div class='ctx'> 	if (rdev-&gt;gpu_lockup) {</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	write_lock_irqsave(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='del'>-	if (list_empty(&amp;rdev-&gt;fence_drv.emited)) {</div><div class='del'>-		write_unlock_irqrestore(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='add'>+	write_lock_irqsave(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='add'>+	if (list_empty(&amp;rdev-&gt;fence_drv[ring].emitted)) {</div><div class='add'>+		write_unlock_irqrestore(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	fence = list_entry(rdev-&gt;fence_drv.emited.prev,</div><div class='add'>+	fence = list_entry(rdev-&gt;fence_drv[ring].emitted.prev,</div><div class='ctx'> 			   struct radeon_fence, list);</div><div class='ctx'> 	radeon_fence_ref(fence);</div><div class='del'>-	write_unlock_irqrestore(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='add'>+	write_unlock_irqrestore(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='ctx'> 	r = radeon_fence_wait(fence, false);</div><div class='ctx'> 	radeon_fence_unref(&amp;fence);</div><div class='ctx'> 	return r;</div><div class='hunk'>@@ -347,39 +345,95 @@ void radeon_fence_unref(struct radeon_fence **fence)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void radeon_fence_process(struct radeon_device *rdev)</div><div class='add'>+void radeon_fence_process(struct radeon_device *rdev, int ring)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long irq_flags;</div><div class='ctx'> 	bool wake;</div><div class='ctx'> </div><div class='del'>-	write_lock_irqsave(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='del'>-	wake = radeon_fence_poll_locked(rdev);</div><div class='del'>-	write_unlock_irqrestore(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='add'>+	write_lock_irqsave(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='add'>+	wake = radeon_fence_poll_locked(rdev, ring);</div><div class='add'>+	write_unlock_irqrestore(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='ctx'> 	if (wake) {</div><div class='del'>-		wake_up_all(&amp;rdev-&gt;fence_drv.queue);</div><div class='add'>+		wake_up_all(&amp;rdev-&gt;fence_drv[ring].queue);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int radeon_fence_driver_init(struct radeon_device *rdev)</div><div class='add'>+int radeon_fence_count_emitted(struct radeon_device *rdev, int ring)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	int not_processed = 0;</div><div class='add'>+</div><div class='add'>+	read_lock_irqsave(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='add'>+	if (!rdev-&gt;fence_drv[ring].initialized)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;rdev-&gt;fence_drv[ring].emitted)) {</div><div class='add'>+		struct list_head *ptr;</div><div class='add'>+		list_for_each(ptr, &amp;rdev-&gt;fence_drv[ring].emitted) {</div><div class='add'>+			/* count up to 3, that's enought info */</div><div class='add'>+			if (++not_processed &gt;= 3)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	read_unlock_irqrestore(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='add'>+	return not_processed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int radeon_fence_driver_start_ring(struct radeon_device *rdev, int ring)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long irq_flags;</div><div class='add'>+	uint64_t index;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	write_lock_irqsave(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='del'>-	r = radeon_scratch_get(rdev, &amp;rdev-&gt;fence_drv.scratch_reg);</div><div class='del'>-	if (r) {</div><div class='del'>-		dev_err(rdev-&gt;dev, "fence failed to get scratch register\n");</div><div class='del'>-		write_unlock_irqrestore(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='del'>-		return r;</div><div class='add'>+	write_lock_irqsave(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='add'>+	radeon_scratch_free(rdev, rdev-&gt;fence_drv[ring].scratch_reg);</div><div class='add'>+	if (rdev-&gt;wb.use_event) {</div><div class='add'>+		rdev-&gt;fence_drv[ring].scratch_reg = 0;</div><div class='add'>+		index = R600_WB_EVENT_OFFSET + ring * 4;</div><div class='add'>+	} else {</div><div class='add'>+		r = radeon_scratch_get(rdev, &amp;rdev-&gt;fence_drv[ring].scratch_reg);</div><div class='add'>+		if (r) {</div><div class='add'>+			dev_err(rdev-&gt;dev, "fence failed to get scratch register\n");</div><div class='add'>+			write_unlock_irqrestore(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='add'>+			return r;</div><div class='add'>+		}</div><div class='add'>+		index = RADEON_WB_SCRATCH_OFFSET +</div><div class='add'>+			rdev-&gt;fence_drv[ring].scratch_reg -</div><div class='add'>+			rdev-&gt;scratch.reg_base;</div><div class='ctx'> 	}</div><div class='del'>-	radeon_fence_write(rdev, 0);</div><div class='del'>-	atomic_set(&amp;rdev-&gt;fence_drv.seq, 0);</div><div class='del'>-	INIT_LIST_HEAD(&amp;rdev-&gt;fence_drv.created);</div><div class='del'>-	INIT_LIST_HEAD(&amp;rdev-&gt;fence_drv.emited);</div><div class='del'>-	INIT_LIST_HEAD(&amp;rdev-&gt;fence_drv.signaled);</div><div class='del'>-	init_waitqueue_head(&amp;rdev-&gt;fence_drv.queue);</div><div class='del'>-	rdev-&gt;fence_drv.initialized = true;</div><div class='del'>-	write_unlock_irqrestore(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='add'>+	rdev-&gt;fence_drv[ring].cpu_addr = &amp;rdev-&gt;wb.wb[index/4];</div><div class='add'>+	rdev-&gt;fence_drv[ring].gpu_addr = rdev-&gt;wb.gpu_addr + index;</div><div class='add'>+	radeon_fence_write(rdev, atomic_read(&amp;rdev-&gt;fence_drv[ring].seq), ring);</div><div class='add'>+	rdev-&gt;fence_drv[ring].initialized = true;</div><div class='add'>+	DRM_INFO("fence driver on ring %d use gpu addr 0x%08Lx and cpu addr 0x%p\n",</div><div class='add'>+		 ring, rdev-&gt;fence_drv[ring].gpu_addr, rdev-&gt;fence_drv[ring].cpu_addr);</div><div class='add'>+	write_unlock_irqrestore(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void radeon_fence_driver_init_ring(struct radeon_device *rdev, int ring)</div><div class='add'>+{</div><div class='add'>+	rdev-&gt;fence_drv[ring].scratch_reg = -1;</div><div class='add'>+	rdev-&gt;fence_drv[ring].cpu_addr = NULL;</div><div class='add'>+	rdev-&gt;fence_drv[ring].gpu_addr = 0;</div><div class='add'>+	atomic_set(&amp;rdev-&gt;fence_drv[ring].seq, 0);</div><div class='add'>+	INIT_LIST_HEAD(&amp;rdev-&gt;fence_drv[ring].created);</div><div class='add'>+	INIT_LIST_HEAD(&amp;rdev-&gt;fence_drv[ring].emitted);</div><div class='add'>+	INIT_LIST_HEAD(&amp;rdev-&gt;fence_drv[ring].signaled);</div><div class='add'>+	init_waitqueue_head(&amp;rdev-&gt;fence_drv[ring].queue);</div><div class='add'>+	rdev-&gt;fence_drv[ring].initialized = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int radeon_fence_driver_init(struct radeon_device *rdev)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	int ring;</div><div class='add'>+</div><div class='add'>+	write_lock_irqsave(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='add'>+	for (ring = 0; ring &lt; RADEON_NUM_RINGS; ring++) {</div><div class='add'>+		radeon_fence_driver_init_ring(rdev, ring);</div><div class='add'>+	}</div><div class='add'>+	write_unlock_irqrestore(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='ctx'> 	if (radeon_debugfs_fence_init(rdev)) {</div><div class='ctx'> 		dev_err(rdev-&gt;dev, "fence debugfs file creation failed\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -389,14 +443,18 @@ int radeon_fence_driver_init(struct radeon_device *rdev)</div><div class='ctx'> void radeon_fence_driver_fini(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long irq_flags;</div><div class='del'>-</div><div class='del'>-	if (!rdev-&gt;fence_drv.initialized)</div><div class='del'>-		return;</div><div class='del'>-	wake_up_all(&amp;rdev-&gt;fence_drv.queue);</div><div class='del'>-	write_lock_irqsave(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='del'>-	radeon_scratch_free(rdev, rdev-&gt;fence_drv.scratch_reg);</div><div class='del'>-	write_unlock_irqrestore(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='del'>-	rdev-&gt;fence_drv.initialized = false;</div><div class='add'>+	int ring;</div><div class='add'>+</div><div class='add'>+	for (ring = 0; ring &lt; RADEON_NUM_RINGS; ring++) {</div><div class='add'>+		if (!rdev-&gt;fence_drv[ring].initialized)</div><div class='add'>+			continue;</div><div class='add'>+		radeon_fence_wait_last(rdev, ring);</div><div class='add'>+		wake_up_all(&amp;rdev-&gt;fence_drv[ring].queue);</div><div class='add'>+		write_lock_irqsave(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='add'>+		radeon_scratch_free(rdev, rdev-&gt;fence_drv[ring].scratch_reg);</div><div class='add'>+		write_unlock_irqrestore(&amp;rdev-&gt;fence_lock, irq_flags);</div><div class='add'>+		rdev-&gt;fence_drv[ring].initialized = false;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -410,14 +468,21 @@ static int radeon_debugfs_fence_info(struct seq_file *m, void *data)</div><div class='ctx'> 	struct drm_device *dev = node-&gt;minor-&gt;dev;</div><div class='ctx'> 	struct radeon_device *rdev = dev-&gt;dev_private;</div><div class='ctx'> 	struct radeon_fence *fence;</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "Last signaled fence 0x%08X\n",</div><div class='del'>-		   radeon_fence_read(rdev));</div><div class='del'>-	if (!list_empty(&amp;rdev-&gt;fence_drv.emited)) {</div><div class='del'>-		   fence = list_entry(rdev-&gt;fence_drv.emited.prev,</div><div class='del'>-				      struct radeon_fence, list);</div><div class='del'>-		   seq_printf(m, "Last emited fence %p with 0x%08X\n",</div><div class='del'>-			      fence,  fence-&gt;seq);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RADEON_NUM_RINGS; ++i) {</div><div class='add'>+		if (!rdev-&gt;fence_drv[i].initialized)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		seq_printf(m, "--- ring %d ---\n", i);</div><div class='add'>+		seq_printf(m, "Last signaled fence 0x%08X\n",</div><div class='add'>+			   radeon_fence_read(rdev, i));</div><div class='add'>+		if (!list_empty(&amp;rdev-&gt;fence_drv[i].emitted)) {</div><div class='add'>+			fence = list_entry(rdev-&gt;fence_drv[i].emitted.prev,</div><div class='add'>+					   struct radeon_fence, list);</div><div class='add'>+			seq_printf(m, "Last emitted fence %p with 0x%08X\n",</div><div class='add'>+				   fence,  fence-&gt;seq);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c<br/>index ba7ab79e12c1..010dad8b66ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_gart.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_gart.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_gart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_gart.c</a></div><div class='hunk'>@@ -157,9 +157,6 @@ void radeon_gart_unbind(struct radeon_device *rdev, unsigned offset,</div><div class='ctx'> 	p = t / (PAGE_SIZE / RADEON_GPU_PAGE_SIZE);</div><div class='ctx'> 	for (i = 0; i &lt; pages; i++, p++) {</div><div class='ctx'> 		if (rdev-&gt;gart.pages[p]) {</div><div class='del'>-			if (!rdev-&gt;gart.ttm_alloced[p])</div><div class='del'>-				pci_unmap_page(rdev-&gt;pdev, rdev-&gt;gart.pages_addr[p],</div><div class='del'>-						PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);</div><div class='ctx'> 			rdev-&gt;gart.pages[p] = NULL;</div><div class='ctx'> 			rdev-&gt;gart.pages_addr[p] = rdev-&gt;dummy_page.addr;</div><div class='ctx'> 			page_base = rdev-&gt;gart.pages_addr[p];</div><div class='hunk'>@@ -191,23 +188,7 @@ int radeon_gart_bind(struct radeon_device *rdev, unsigned offset,</div><div class='ctx'> 	p = t / (PAGE_SIZE / RADEON_GPU_PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pages; i++, p++) {</div><div class='del'>-		/* we reverted the patch using dma_addr in TTM for now but this</div><div class='del'>-		 * code stops building on alpha so just comment it out for now */</div><div class='del'>-		if (0) { /*dma_addr[i] != DMA_ERROR_CODE) */</div><div class='del'>-			rdev-&gt;gart.ttm_alloced[p] = true;</div><div class='del'>-			rdev-&gt;gart.pages_addr[p] = dma_addr[i];</div><div class='del'>-		} else {</div><div class='del'>-			/* we need to support large memory configurations */</div><div class='del'>-			/* assume that unbind have already been call on the range */</div><div class='del'>-			rdev-&gt;gart.pages_addr[p] = pci_map_page(rdev-&gt;pdev, pagelist[i],</div><div class='del'>-							0, PAGE_SIZE,</div><div class='del'>-							PCI_DMA_BIDIRECTIONAL);</div><div class='del'>-			if (pci_dma_mapping_error(rdev-&gt;pdev, rdev-&gt;gart.pages_addr[p])) {</div><div class='del'>-				/* FIXME: failed to map page (return -ENOMEM?) */</div><div class='del'>-				radeon_gart_unbind(rdev, offset, pages);</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		rdev-&gt;gart.pages_addr[p] = dma_addr[i];</div><div class='ctx'> 		rdev-&gt;gart.pages[p] = pagelist[i];</div><div class='ctx'> 		if (rdev-&gt;gart.ptr) {</div><div class='ctx'> 			page_base = rdev-&gt;gart.pages_addr[p];</div><div class='hunk'>@@ -274,12 +255,6 @@ int radeon_gart_init(struct radeon_device *rdev)</div><div class='ctx'> 		radeon_gart_fini(rdev);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	rdev-&gt;gart.ttm_alloced = kzalloc(sizeof(bool) *</div><div class='del'>-					 rdev-&gt;gart.num_cpu_pages, GFP_KERNEL);</div><div class='del'>-	if (rdev-&gt;gart.ttm_alloced == NULL) {</div><div class='del'>-		radeon_gart_fini(rdev);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	/* set GART entry to point to the dummy page by default */</div><div class='ctx'> 	for (i = 0; i &lt; rdev-&gt;gart.num_cpu_pages; i++) {</div><div class='ctx'> 		rdev-&gt;gart.pages_addr[i] = rdev-&gt;dummy_page.addr;</div><div class='hunk'>@@ -296,10 +271,404 @@ void radeon_gart_fini(struct radeon_device *rdev)</div><div class='ctx'> 	rdev-&gt;gart.ready = false;</div><div class='ctx'> 	kfree(rdev-&gt;gart.pages);</div><div class='ctx'> 	kfree(rdev-&gt;gart.pages_addr);</div><div class='del'>-	kfree(rdev-&gt;gart.ttm_alloced);</div><div class='ctx'> 	rdev-&gt;gart.pages = NULL;</div><div class='ctx'> 	rdev-&gt;gart.pages_addr = NULL;</div><div class='del'>-	rdev-&gt;gart.ttm_alloced = NULL;</div><div class='ctx'> </div><div class='ctx'> 	radeon_dummy_page_fini(rdev);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * vm helpers</div><div class='add'>+ *</div><div class='add'>+ * TODO bind a default page at vm initialization for default address</div><div class='add'>+ */</div><div class='add'>+int radeon_vm_manager_init(struct radeon_device *rdev)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	rdev-&gt;vm_manager.enabled = false;</div><div class='add'>+</div><div class='add'>+	/* mark first vm as always in use, it's the system one */</div><div class='add'>+	r = radeon_sa_bo_manager_init(rdev, &amp;rdev-&gt;vm_manager.sa_manager,</div><div class='add'>+				      rdev-&gt;vm_manager.max_pfn * 8,</div><div class='add'>+				      RADEON_GEM_DOMAIN_VRAM);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed to allocate vm bo (%dKB)\n",</div><div class='add'>+			(rdev-&gt;vm_manager.max_pfn * 8) &gt;&gt; 10);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = rdev-&gt;vm_manager.funcs-&gt;init(rdev);</div><div class='add'>+	if (r == 0)</div><div class='add'>+		rdev-&gt;vm_manager.enabled = true;</div><div class='add'>+</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* cs mutex must be lock */</div><div class='add'>+static void radeon_vm_unbind_locked(struct radeon_device *rdev,</div><div class='add'>+				    struct radeon_vm *vm)</div><div class='add'>+{</div><div class='add'>+	struct radeon_bo_va *bo_va;</div><div class='add'>+</div><div class='add'>+	if (vm-&gt;id == -1) {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* wait for vm use to end */</div><div class='add'>+	if (vm-&gt;fence) {</div><div class='add'>+		radeon_fence_wait(vm-&gt;fence, false);</div><div class='add'>+		radeon_fence_unref(&amp;vm-&gt;fence);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* hw unbind */</div><div class='add'>+	rdev-&gt;vm_manager.funcs-&gt;unbind(rdev, vm);</div><div class='add'>+	rdev-&gt;vm_manager.use_bitmap &amp;= ~(1 &lt;&lt; vm-&gt;id);</div><div class='add'>+	list_del_init(&amp;vm-&gt;list);</div><div class='add'>+	vm-&gt;id = -1;</div><div class='add'>+	radeon_sa_bo_free(rdev, &amp;vm-&gt;sa_bo);</div><div class='add'>+	vm-&gt;pt = NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(bo_va, &amp;vm-&gt;va, vm_list) {</div><div class='add'>+		bo_va-&gt;valid = false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void radeon_vm_manager_fini(struct radeon_device *rdev)</div><div class='add'>+{</div><div class='add'>+	if (rdev-&gt;vm_manager.sa_manager.bo == NULL)</div><div class='add'>+		return;</div><div class='add'>+	radeon_vm_manager_suspend(rdev);</div><div class='add'>+	rdev-&gt;vm_manager.funcs-&gt;fini(rdev);</div><div class='add'>+	radeon_sa_bo_manager_fini(rdev, &amp;rdev-&gt;vm_manager.sa_manager);</div><div class='add'>+	rdev-&gt;vm_manager.enabled = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int radeon_vm_manager_start(struct radeon_device *rdev)</div><div class='add'>+{</div><div class='add'>+	if (rdev-&gt;vm_manager.sa_manager.bo == NULL) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return radeon_sa_bo_manager_start(rdev, &amp;rdev-&gt;vm_manager.sa_manager);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int radeon_vm_manager_suspend(struct radeon_device *rdev)</div><div class='add'>+{</div><div class='add'>+	struct radeon_vm *vm, *tmp;</div><div class='add'>+</div><div class='add'>+	radeon_mutex_lock(&amp;rdev-&gt;cs_mutex);</div><div class='add'>+	/* unbind all active vm */</div><div class='add'>+	list_for_each_entry_safe(vm, tmp, &amp;rdev-&gt;vm_manager.lru_vm, list) {</div><div class='add'>+		radeon_vm_unbind_locked(rdev, vm);</div><div class='add'>+	}</div><div class='add'>+	rdev-&gt;vm_manager.funcs-&gt;fini(rdev);</div><div class='add'>+	radeon_mutex_unlock(&amp;rdev-&gt;cs_mutex);</div><div class='add'>+	return radeon_sa_bo_manager_suspend(rdev, &amp;rdev-&gt;vm_manager.sa_manager);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* cs mutex must be lock */</div><div class='add'>+void radeon_vm_unbind(struct radeon_device *rdev, struct radeon_vm *vm)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;vm-&gt;mutex);</div><div class='add'>+	radeon_vm_unbind_locked(rdev, vm);</div><div class='add'>+	mutex_unlock(&amp;vm-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* cs mutex must be lock &amp; vm mutex must be lock */</div><div class='add'>+int radeon_vm_bind(struct radeon_device *rdev, struct radeon_vm *vm)</div><div class='add'>+{</div><div class='add'>+	struct radeon_vm *vm_evict;</div><div class='add'>+	unsigned i;</div><div class='add'>+	int id = -1, r;</div><div class='add'>+</div><div class='add'>+	if (vm == NULL) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vm-&gt;id != -1) {</div><div class='add'>+		/* update lru */</div><div class='add'>+		list_del_init(&amp;vm-&gt;list);</div><div class='add'>+		list_add_tail(&amp;vm-&gt;list, &amp;rdev-&gt;vm_manager.lru_vm);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	r = radeon_sa_bo_new(rdev, &amp;rdev-&gt;vm_manager.sa_manager, &amp;vm-&gt;sa_bo,</div><div class='add'>+			     RADEON_GPU_PAGE_ALIGN(vm-&gt;last_pfn * 8),</div><div class='add'>+			     RADEON_GPU_PAGE_SIZE);</div><div class='add'>+	if (r) {</div><div class='add'>+		if (list_empty(&amp;rdev-&gt;vm_manager.lru_vm)) {</div><div class='add'>+			return r;</div><div class='add'>+		}</div><div class='add'>+		vm_evict = list_first_entry(&amp;rdev-&gt;vm_manager.lru_vm, struct radeon_vm, list);</div><div class='add'>+		radeon_vm_unbind(rdev, vm_evict);</div><div class='add'>+		goto retry;</div><div class='add'>+	}</div><div class='add'>+	vm-&gt;pt = rdev-&gt;vm_manager.sa_manager.cpu_ptr;</div><div class='add'>+	vm-&gt;pt += (vm-&gt;sa_bo.offset &gt;&gt; 3);</div><div class='add'>+	vm-&gt;pt_gpu_addr = rdev-&gt;vm_manager.sa_manager.gpu_addr;</div><div class='add'>+	vm-&gt;pt_gpu_addr += vm-&gt;sa_bo.offset;</div><div class='add'>+	memset(vm-&gt;pt, 0, RADEON_GPU_PAGE_ALIGN(vm-&gt;last_pfn * 8));</div><div class='add'>+</div><div class='add'>+retry_id:</div><div class='add'>+	/* search for free vm */</div><div class='add'>+	for (i = 0; i &lt; rdev-&gt;vm_manager.nvm; i++) {</div><div class='add'>+		if (!(rdev-&gt;vm_manager.use_bitmap &amp; (1 &lt;&lt; i))) {</div><div class='add'>+			id = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* evict vm if necessary */</div><div class='add'>+	if (id == -1) {</div><div class='add'>+		vm_evict = list_first_entry(&amp;rdev-&gt;vm_manager.lru_vm, struct radeon_vm, list);</div><div class='add'>+		radeon_vm_unbind(rdev, vm_evict);</div><div class='add'>+		goto retry_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* do hw bind */</div><div class='add'>+	r = rdev-&gt;vm_manager.funcs-&gt;bind(rdev, vm, id);</div><div class='add'>+	if (r) {</div><div class='add'>+		radeon_sa_bo_free(rdev, &amp;vm-&gt;sa_bo);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+	rdev-&gt;vm_manager.use_bitmap |= 1 &lt;&lt; id;</div><div class='add'>+	vm-&gt;id = id;</div><div class='add'>+	list_add_tail(&amp;vm-&gt;list, &amp;rdev-&gt;vm_manager.lru_vm);</div><div class='add'>+	return radeon_vm_bo_update_pte(rdev, vm, rdev-&gt;ib_pool.sa_manager.bo,</div><div class='add'>+				       &amp;rdev-&gt;ib_pool.sa_manager.bo-&gt;tbo.mem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* object have to be reserved */</div><div class='add'>+int radeon_vm_bo_add(struct radeon_device *rdev,</div><div class='add'>+		     struct radeon_vm *vm,</div><div class='add'>+		     struct radeon_bo *bo,</div><div class='add'>+		     uint64_t offset,</div><div class='add'>+		     uint32_t flags)</div><div class='add'>+{</div><div class='add'>+	struct radeon_bo_va *bo_va, *tmp;</div><div class='add'>+	struct list_head *head;</div><div class='add'>+	uint64_t size = radeon_bo_size(bo), last_offset = 0;</div><div class='add'>+	unsigned last_pfn;</div><div class='add'>+</div><div class='add'>+	bo_va = kzalloc(sizeof(struct radeon_bo_va), GFP_KERNEL);</div><div class='add'>+	if (bo_va == NULL) {</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	bo_va-&gt;vm = vm;</div><div class='add'>+	bo_va-&gt;bo = bo;</div><div class='add'>+	bo_va-&gt;soffset = offset;</div><div class='add'>+	bo_va-&gt;eoffset = offset + size;</div><div class='add'>+	bo_va-&gt;flags = flags;</div><div class='add'>+	bo_va-&gt;valid = false;</div><div class='add'>+	INIT_LIST_HEAD(&amp;bo_va-&gt;bo_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;bo_va-&gt;vm_list);</div><div class='add'>+	/* make sure object fit at this offset */</div><div class='add'>+	if (bo_va-&gt;soffset &gt;= bo_va-&gt;eoffset) {</div><div class='add'>+		kfree(bo_va);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	last_pfn = bo_va-&gt;eoffset / RADEON_GPU_PAGE_SIZE;</div><div class='add'>+	if (last_pfn &gt; rdev-&gt;vm_manager.max_pfn) {</div><div class='add'>+		kfree(bo_va);</div><div class='add'>+		dev_err(rdev-&gt;dev, "va above limit (0x%08X &gt; 0x%08X)\n",</div><div class='add'>+			last_pfn, rdev-&gt;vm_manager.max_pfn);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;vm-&gt;mutex);</div><div class='add'>+	if (last_pfn &gt; vm-&gt;last_pfn) {</div><div class='add'>+		/* grow va space 32M by 32M */</div><div class='add'>+		unsigned align = ((32 &lt;&lt; 20) &gt;&gt; 12) - 1;</div><div class='add'>+		radeon_mutex_lock(&amp;rdev-&gt;cs_mutex);</div><div class='add'>+		radeon_vm_unbind_locked(rdev, vm);</div><div class='add'>+		radeon_mutex_unlock(&amp;rdev-&gt;cs_mutex);</div><div class='add'>+		vm-&gt;last_pfn = (last_pfn + align) &amp; ~align;</div><div class='add'>+	}</div><div class='add'>+	head = &amp;vm-&gt;va;</div><div class='add'>+	last_offset = 0;</div><div class='add'>+	list_for_each_entry(tmp, &amp;vm-&gt;va, vm_list) {</div><div class='add'>+		if (bo_va-&gt;soffset &gt;= last_offset &amp;&amp; bo_va-&gt;eoffset &lt; tmp-&gt;soffset) {</div><div class='add'>+			/* bo can be added before this one */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (bo_va-&gt;soffset &gt;= tmp-&gt;soffset &amp;&amp; bo_va-&gt;soffset &lt; tmp-&gt;eoffset) {</div><div class='add'>+			/* bo and tmp overlap, invalid offset */</div><div class='add'>+			dev_err(rdev-&gt;dev, "bo %p va 0x%08X conflict with (bo %p 0x%08X 0x%08X)\n",</div><div class='add'>+				bo, (unsigned)bo_va-&gt;soffset, tmp-&gt;bo,</div><div class='add'>+				(unsigned)tmp-&gt;soffset, (unsigned)tmp-&gt;eoffset);</div><div class='add'>+			kfree(bo_va);</div><div class='add'>+			mutex_unlock(&amp;vm-&gt;mutex);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		last_offset = tmp-&gt;eoffset;</div><div class='add'>+		head = &amp;tmp-&gt;vm_list;</div><div class='add'>+	}</div><div class='add'>+	list_add(&amp;bo_va-&gt;vm_list, head);</div><div class='add'>+	list_add_tail(&amp;bo_va-&gt;bo_list, &amp;bo-&gt;va);</div><div class='add'>+	mutex_unlock(&amp;vm-&gt;mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 radeon_vm_get_addr(struct radeon_device *rdev,</div><div class='add'>+			      struct ttm_mem_reg *mem,</div><div class='add'>+			      unsigned pfn)</div><div class='add'>+{</div><div class='add'>+	u64 addr = 0;</div><div class='add'>+</div><div class='add'>+	switch (mem-&gt;mem_type) {</div><div class='add'>+	case TTM_PL_VRAM:</div><div class='add'>+		addr = (mem-&gt;start &lt;&lt; PAGE_SHIFT);</div><div class='add'>+		addr += pfn * RADEON_GPU_PAGE_SIZE;</div><div class='add'>+		addr += rdev-&gt;vm_manager.vram_base_offset;</div><div class='add'>+		break;</div><div class='add'>+	case TTM_PL_TT:</div><div class='add'>+		/* offset inside page table */</div><div class='add'>+		addr = mem-&gt;start &lt;&lt; PAGE_SHIFT;</div><div class='add'>+		addr += pfn * RADEON_GPU_PAGE_SIZE;</div><div class='add'>+		addr = addr &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		/* page table offset */</div><div class='add'>+		addr = rdev-&gt;gart.pages_addr[addr];</div><div class='add'>+		/* in case cpu page size != gpu page size*/</div><div class='add'>+		addr += (pfn * RADEON_GPU_PAGE_SIZE) &amp; (~PAGE_MASK);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* object have to be reserved &amp; cs mutex took &amp; vm mutex took */</div><div class='add'>+int radeon_vm_bo_update_pte(struct radeon_device *rdev,</div><div class='add'>+			    struct radeon_vm *vm,</div><div class='add'>+			    struct radeon_bo *bo,</div><div class='add'>+			    struct ttm_mem_reg *mem)</div><div class='add'>+{</div><div class='add'>+	struct radeon_bo_va *bo_va;</div><div class='add'>+	unsigned ngpu_pages, i;</div><div class='add'>+	uint64_t addr = 0, pfn;</div><div class='add'>+	uint32_t flags;</div><div class='add'>+</div><div class='add'>+	/* nothing to do if vm isn't bound */</div><div class='add'>+	if (vm-&gt;id == -1)</div><div class='add'>+		return 0;;</div><div class='add'>+</div><div class='add'>+	bo_va = radeon_bo_va(bo, vm);</div><div class='add'>+	if (bo_va == NULL) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "bo %p not in vm %p\n", bo, vm);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bo_va-&gt;valid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ngpu_pages = radeon_bo_ngpu_pages(bo);</div><div class='add'>+	bo_va-&gt;flags &amp;= ~RADEON_VM_PAGE_VALID;</div><div class='add'>+	bo_va-&gt;flags &amp;= ~RADEON_VM_PAGE_SYSTEM;</div><div class='add'>+	if (mem) {</div><div class='add'>+		if (mem-&gt;mem_type != TTM_PL_SYSTEM) {</div><div class='add'>+			bo_va-&gt;flags |= RADEON_VM_PAGE_VALID;</div><div class='add'>+			bo_va-&gt;valid = true;</div><div class='add'>+		}</div><div class='add'>+		if (mem-&gt;mem_type == TTM_PL_TT) {</div><div class='add'>+			bo_va-&gt;flags |= RADEON_VM_PAGE_SYSTEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	pfn = bo_va-&gt;soffset / RADEON_GPU_PAGE_SIZE;</div><div class='add'>+	flags = rdev-&gt;vm_manager.funcs-&gt;page_flags(rdev, bo_va-&gt;vm, bo_va-&gt;flags);</div><div class='add'>+	for (i = 0, addr = 0; i &lt; ngpu_pages; i++) {</div><div class='add'>+		if (mem &amp;&amp; bo_va-&gt;valid) {</div><div class='add'>+			addr = radeon_vm_get_addr(rdev, mem, i);</div><div class='add'>+		}</div><div class='add'>+		rdev-&gt;vm_manager.funcs-&gt;set_page(rdev, bo_va-&gt;vm, i + pfn, addr, flags);</div><div class='add'>+	}</div><div class='add'>+	rdev-&gt;vm_manager.funcs-&gt;tlb_flush(rdev, bo_va-&gt;vm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* object have to be reserved */</div><div class='add'>+int radeon_vm_bo_rmv(struct radeon_device *rdev,</div><div class='add'>+		     struct radeon_vm *vm,</div><div class='add'>+		     struct radeon_bo *bo)</div><div class='add'>+{</div><div class='add'>+	struct radeon_bo_va *bo_va;</div><div class='add'>+</div><div class='add'>+	bo_va = radeon_bo_va(bo, vm);</div><div class='add'>+	if (bo_va == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	list_del(&amp;bo_va-&gt;bo_list);</div><div class='add'>+	mutex_lock(&amp;vm-&gt;mutex);</div><div class='add'>+	radeon_mutex_lock(&amp;rdev-&gt;cs_mutex);</div><div class='add'>+	radeon_vm_bo_update_pte(rdev, vm, bo, NULL);</div><div class='add'>+	radeon_mutex_unlock(&amp;rdev-&gt;cs_mutex);</div><div class='add'>+	list_del(&amp;bo_va-&gt;vm_list);</div><div class='add'>+	mutex_unlock(&amp;vm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	kfree(bo_va);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void radeon_vm_bo_invalidate(struct radeon_device *rdev,</div><div class='add'>+			     struct radeon_bo *bo)</div><div class='add'>+{</div><div class='add'>+	struct radeon_bo_va *bo_va;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!atomic_read(&amp;bo-&gt;tbo.reserved));</div><div class='add'>+	list_for_each_entry(bo_va, &amp;bo-&gt;va, bo_list) {</div><div class='add'>+		bo_va-&gt;valid = false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int radeon_vm_init(struct radeon_device *rdev, struct radeon_vm *vm)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	vm-&gt;id = -1;</div><div class='add'>+	vm-&gt;fence = NULL;</div><div class='add'>+	mutex_init(&amp;vm-&gt;mutex);</div><div class='add'>+	INIT_LIST_HEAD(&amp;vm-&gt;list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;vm-&gt;va);</div><div class='add'>+	vm-&gt;last_pfn = 0;</div><div class='add'>+	/* map the ib pool buffer at 0 in virtual address space, set</div><div class='add'>+	 * read only</div><div class='add'>+	 */</div><div class='add'>+	r = radeon_vm_bo_add(rdev, vm, rdev-&gt;ib_pool.sa_manager.bo, 0,</div><div class='add'>+			     RADEON_VM_PAGE_READABLE | RADEON_VM_PAGE_SNOOPED);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void radeon_vm_fini(struct radeon_device *rdev, struct radeon_vm *vm)</div><div class='add'>+{</div><div class='add'>+	struct radeon_bo_va *bo_va, *tmp;</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;vm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	radeon_mutex_lock(&amp;rdev-&gt;cs_mutex);</div><div class='add'>+	radeon_vm_unbind_locked(rdev, vm);</div><div class='add'>+	radeon_mutex_unlock(&amp;rdev-&gt;cs_mutex);</div><div class='add'>+</div><div class='add'>+	/* remove all bo */</div><div class='add'>+	r = radeon_bo_reserve(rdev-&gt;ib_pool.sa_manager.bo, false);</div><div class='add'>+	if (!r) {</div><div class='add'>+		bo_va = radeon_bo_va(rdev-&gt;ib_pool.sa_manager.bo, vm);</div><div class='add'>+		list_del_init(&amp;bo_va-&gt;bo_list);</div><div class='add'>+		list_del_init(&amp;bo_va-&gt;vm_list);</div><div class='add'>+		radeon_bo_unreserve(rdev-&gt;ib_pool.sa_manager.bo);</div><div class='add'>+		kfree(bo_va);</div><div class='add'>+	}</div><div class='add'>+	if (!list_empty(&amp;vm-&gt;va)) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "still active bo inside vm\n");</div><div class='add'>+	}</div><div class='add'>+	list_for_each_entry_safe(bo_va, tmp, &amp;vm-&gt;va, vm_list) {</div><div class='add'>+		list_del_init(&amp;bo_va-&gt;vm_list);</div><div class='add'>+		r = radeon_bo_reserve(bo_va-&gt;bo, false);</div><div class='add'>+		if (!r) {</div><div class='add'>+			list_del_init(&amp;bo_va-&gt;bo_list);</div><div class='add'>+			radeon_bo_unreserve(bo_va-&gt;bo);</div><div class='add'>+			kfree(bo_va);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;vm-&gt;mutex);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c<br/>index aa1ca2dea42f..7337850af2fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_gem.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_gem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_gem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_gem.c</a></div><div class='hunk'>@@ -142,6 +142,44 @@ void radeon_gem_fini(struct radeon_device *rdev)</div><div class='ctx'> 	radeon_bo_force_delete(rdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Call from drm_gem_handle_create which appear in both new and open ioctl</div><div class='add'>+ * case.</div><div class='add'>+ */</div><div class='add'>+int radeon_gem_object_open(struct drm_gem_object *obj, struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void radeon_gem_object_close(struct drm_gem_object *obj,</div><div class='add'>+			     struct drm_file *file_priv)</div><div class='add'>+{</div><div class='add'>+	struct radeon_bo *rbo = gem_to_radeon_bo(obj);</div><div class='add'>+	struct radeon_device *rdev = rbo-&gt;rdev;</div><div class='add'>+	struct radeon_fpriv *fpriv = file_priv-&gt;driver_priv;</div><div class='add'>+	struct radeon_vm *vm = &amp;fpriv-&gt;vm;</div><div class='add'>+	struct radeon_bo_va *bo_va, *tmp;</div><div class='add'>+</div><div class='add'>+	if (rdev-&gt;family &lt; CHIP_CAYMAN) {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (radeon_bo_reserve(rbo, false)) {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	list_for_each_entry_safe(bo_va, tmp, &amp;rbo-&gt;va, bo_list) {</div><div class='add'>+		if (bo_va-&gt;vm == vm) {</div><div class='add'>+			/* remove from this vm address space */</div><div class='add'>+			mutex_lock(&amp;vm-&gt;mutex);</div><div class='add'>+			list_del(&amp;bo_va-&gt;vm_list);</div><div class='add'>+			mutex_unlock(&amp;vm-&gt;mutex);</div><div class='add'>+			list_del(&amp;bo_va-&gt;bo_list);</div><div class='add'>+			kfree(bo_va);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	radeon_bo_unreserve(rbo);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * GEM ioctls.</div><div class='hunk'>@@ -152,6 +190,7 @@ int radeon_gem_info_ioctl(struct drm_device *dev, void *data,</div><div class='ctx'> 	struct radeon_device *rdev = dev-&gt;dev_private;</div><div class='ctx'> 	struct drm_radeon_gem_info *args = data;</div><div class='ctx'> 	struct ttm_mem_type_manager *man;</div><div class='add'>+	unsigned i;</div><div class='ctx'> </div><div class='ctx'> 	man = &amp;rdev-&gt;mman.bdev.man[TTM_PL_VRAM];</div><div class='ctx'> </div><div class='hunk'>@@ -160,8 +199,9 @@ int radeon_gem_info_ioctl(struct drm_device *dev, void *data,</div><div class='ctx'> 	if (rdev-&gt;stollen_vga_memory)</div><div class='ctx'> 		args-&gt;vram_visible -= radeon_bo_size(rdev-&gt;stollen_vga_memory);</div><div class='ctx'> 	args-&gt;vram_visible -= radeon_fbdev_total_size(rdev);</div><div class='del'>-	args-&gt;gart_size = rdev-&gt;mc.gtt_size - rdev-&gt;cp.ring_size - 4096 -</div><div class='del'>-		RADEON_IB_POOL_SIZE*64*1024;</div><div class='add'>+	args-&gt;gart_size = rdev-&gt;mc.gtt_size - 4096 - RADEON_IB_POOL_SIZE*64*1024;</div><div class='add'>+	for(i = 0; i &lt; RADEON_NUM_RINGS; ++i)</div><div class='add'>+		args-&gt;gart_size -= rdev-&gt;ring[i].ring_size;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -352,6 +392,109 @@ out:</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int radeon_gem_va_ioctl(struct drm_device *dev, void *data,</div><div class='add'>+			  struct drm_file *filp)</div><div class='add'>+{</div><div class='add'>+	struct drm_radeon_gem_va *args = data;</div><div class='add'>+	struct drm_gem_object *gobj;</div><div class='add'>+	struct radeon_device *rdev = dev-&gt;dev_private;</div><div class='add'>+	struct radeon_fpriv *fpriv = filp-&gt;driver_priv;</div><div class='add'>+	struct radeon_bo *rbo;</div><div class='add'>+	struct radeon_bo_va *bo_va;</div><div class='add'>+	u32 invalid_flags;</div><div class='add'>+	int r = 0;</div><div class='add'>+</div><div class='add'>+	if (!rdev-&gt;vm_manager.enabled) {</div><div class='add'>+		args-&gt;operation = RADEON_VA_RESULT_ERROR;</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* !! DONT REMOVE !!</div><div class='add'>+	 * We don't support vm_id yet, to be sure we don't have have broken</div><div class='add'>+	 * userspace, reject anyone trying to use non 0 value thus moving</div><div class='add'>+	 * forward we can use those fields without breaking existant userspace</div><div class='add'>+	 */</div><div class='add'>+	if (args-&gt;vm_id) {</div><div class='add'>+		args-&gt;operation = RADEON_VA_RESULT_ERROR;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (args-&gt;offset &lt; RADEON_VA_RESERVED_SIZE) {</div><div class='add'>+		dev_err(&amp;dev-&gt;pdev-&gt;dev,</div><div class='add'>+			"offset 0x%lX is in reserved area 0x%X\n",</div><div class='add'>+			(unsigned long)args-&gt;offset,</div><div class='add'>+			RADEON_VA_RESERVED_SIZE);</div><div class='add'>+		args-&gt;operation = RADEON_VA_RESULT_ERROR;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* don't remove, we need to enforce userspace to set the snooped flag</div><div class='add'>+	 * otherwise we will endup with broken userspace and we won't be able</div><div class='add'>+	 * to enable this feature without adding new interface</div><div class='add'>+	 */</div><div class='add'>+	invalid_flags = RADEON_VM_PAGE_VALID | RADEON_VM_PAGE_SYSTEM;</div><div class='add'>+	if ((args-&gt;flags &amp; invalid_flags)) {</div><div class='add'>+		dev_err(&amp;dev-&gt;pdev-&gt;dev, "invalid flags 0x%08X vs 0x%08X\n",</div><div class='add'>+			args-&gt;flags, invalid_flags);</div><div class='add'>+		args-&gt;operation = RADEON_VA_RESULT_ERROR;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!(args-&gt;flags &amp; RADEON_VM_PAGE_SNOOPED)) {</div><div class='add'>+		dev_err(&amp;dev-&gt;pdev-&gt;dev, "only supported snooped mapping for now\n");</div><div class='add'>+		args-&gt;operation = RADEON_VA_RESULT_ERROR;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (args-&gt;operation) {</div><div class='add'>+	case RADEON_VA_MAP:</div><div class='add'>+	case RADEON_VA_UNMAP:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(&amp;dev-&gt;pdev-&gt;dev, "unsupported operation %d\n",</div><div class='add'>+			args-&gt;operation);</div><div class='add'>+		args-&gt;operation = RADEON_VA_RESULT_ERROR;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gobj = drm_gem_object_lookup(dev, filp, args-&gt;handle);</div><div class='add'>+	if (gobj == NULL) {</div><div class='add'>+		args-&gt;operation = RADEON_VA_RESULT_ERROR;</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+	rbo = gem_to_radeon_bo(gobj);</div><div class='add'>+	r = radeon_bo_reserve(rbo, false);</div><div class='add'>+	if (r) {</div><div class='add'>+		args-&gt;operation = RADEON_VA_RESULT_ERROR;</div><div class='add'>+		drm_gem_object_unreference_unlocked(gobj);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+	switch (args-&gt;operation) {</div><div class='add'>+	case RADEON_VA_MAP:</div><div class='add'>+		bo_va = radeon_bo_va(rbo, &amp;fpriv-&gt;vm);</div><div class='add'>+		if (bo_va) {</div><div class='add'>+			args-&gt;operation = RADEON_VA_RESULT_VA_EXIST;</div><div class='add'>+			args-&gt;offset = bo_va-&gt;soffset;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		r = radeon_vm_bo_add(rdev, &amp;fpriv-&gt;vm, rbo,</div><div class='add'>+				     args-&gt;offset, args-&gt;flags);</div><div class='add'>+		break;</div><div class='add'>+	case RADEON_VA_UNMAP:</div><div class='add'>+		r = radeon_vm_bo_rmv(rdev, &amp;fpriv-&gt;vm, rbo);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	args-&gt;operation = RADEON_VA_RESULT_OK;</div><div class='add'>+	if (r) {</div><div class='add'>+		args-&gt;operation = RADEON_VA_RESULT_ERROR;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	radeon_bo_unreserve(rbo);</div><div class='add'>+	drm_gem_object_unreference_unlocked(gobj);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int radeon_mode_dumb_create(struct drm_file *file_priv,</div><div class='ctx'> 			    struct drm_device *dev,</div><div class='ctx'> 			    struct drm_mode_create_dumb *args)</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c<br/>index 8f86aeb26693..be38921bf761 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_irq_kms.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_irq_kms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_irq_kms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_irq_kms.c</a></div><div class='hunk'>@@ -65,7 +65,8 @@ void radeon_driver_irq_preinstall_kms(struct drm_device *dev)</div><div class='ctx'> 	unsigned i;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable *all* interrupts */</div><div class='del'>-	rdev-&gt;irq.sw_int = false;</div><div class='add'>+	for (i = 0; i &lt; RADEON_NUM_RINGS; i++)</div><div class='add'>+		rdev-&gt;irq.sw_int[i] = false;</div><div class='ctx'> 	rdev-&gt;irq.gui_idle = false;</div><div class='ctx'> 	for (i = 0; i &lt; RADEON_MAX_HPD_PINS; i++)</div><div class='ctx'> 		rdev-&gt;irq.hpd[i] = false;</div><div class='hunk'>@@ -81,9 +82,11 @@ void radeon_driver_irq_preinstall_kms(struct drm_device *dev)</div><div class='ctx'> int radeon_driver_irq_postinstall_kms(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct radeon_device *rdev = dev-&gt;dev_private;</div><div class='add'>+	unsigned i;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;max_vblank_count = 0x001fffff;</div><div class='del'>-	rdev-&gt;irq.sw_int = true;</div><div class='add'>+	for (i = 0; i &lt; RADEON_NUM_RINGS; i++)</div><div class='add'>+		rdev-&gt;irq.sw_int[i] = true;</div><div class='ctx'> 	radeon_irq_set(rdev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -97,7 +100,8 @@ void radeon_driver_irq_uninstall_kms(struct drm_device *dev)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Disable *all* interrupts */</div><div class='del'>-	rdev-&gt;irq.sw_int = false;</div><div class='add'>+	for (i = 0; i &lt; RADEON_NUM_RINGS; i++)</div><div class='add'>+		rdev-&gt;irq.sw_int[i] = false;</div><div class='ctx'> 	rdev-&gt;irq.gui_idle = false;</div><div class='ctx'> 	for (i = 0; i &lt; RADEON_MAX_HPD_PINS; i++)</div><div class='ctx'> 		rdev-&gt;irq.hpd[i] = false;</div><div class='hunk'>@@ -194,26 +198,26 @@ void radeon_irq_kms_fini(struct radeon_device *rdev)</div><div class='ctx'> 	flush_work_sync(&amp;rdev-&gt;hotplug_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void radeon_irq_kms_sw_irq_get(struct radeon_device *rdev)</div><div class='add'>+void radeon_irq_kms_sw_irq_get(struct radeon_device *rdev, int ring)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long irqflags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;rdev-&gt;irq.sw_lock, irqflags);</div><div class='del'>-	if (rdev-&gt;ddev-&gt;irq_enabled &amp;&amp; (++rdev-&gt;irq.sw_refcount == 1)) {</div><div class='del'>-		rdev-&gt;irq.sw_int = true;</div><div class='add'>+	if (rdev-&gt;ddev-&gt;irq_enabled &amp;&amp; (++rdev-&gt;irq.sw_refcount[ring] == 1)) {</div><div class='add'>+		rdev-&gt;irq.sw_int[ring] = true;</div><div class='ctx'> 		radeon_irq_set(rdev);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;rdev-&gt;irq.sw_lock, irqflags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void radeon_irq_kms_sw_irq_put(struct radeon_device *rdev)</div><div class='add'>+void radeon_irq_kms_sw_irq_put(struct radeon_device *rdev, int ring)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long irqflags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;rdev-&gt;irq.sw_lock, irqflags);</div><div class='del'>-	BUG_ON(rdev-&gt;ddev-&gt;irq_enabled &amp;&amp; rdev-&gt;irq.sw_refcount &lt;= 0);</div><div class='del'>-	if (rdev-&gt;ddev-&gt;irq_enabled &amp;&amp; (--rdev-&gt;irq.sw_refcount == 0)) {</div><div class='del'>-		rdev-&gt;irq.sw_int = false;</div><div class='add'>+	BUG_ON(rdev-&gt;ddev-&gt;irq_enabled &amp;&amp; rdev-&gt;irq.sw_refcount[ring] &lt;= 0);</div><div class='add'>+	if (rdev-&gt;ddev-&gt;irq_enabled &amp;&amp; (--rdev-&gt;irq.sw_refcount[ring] == 0)) {</div><div class='add'>+		rdev-&gt;irq.sw_int[ring] = false;</div><div class='ctx'> 		radeon_irq_set(rdev);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;rdev-&gt;irq.sw_lock, irqflags);</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c<br/>index be2c1224e68a..d3352889a870 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_kms.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_kms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_kms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_kms.c</a></div><div class='hunk'>@@ -250,6 +250,18 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case RADEON_INFO_VA_START:</div><div class='add'>+		/* this is where we report if vm is supported or not */</div><div class='add'>+		if (rdev-&gt;family &lt; CHIP_CAYMAN)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		value = RADEON_VA_RESERVED_SIZE;</div><div class='add'>+		break;</div><div class='add'>+	case RADEON_INFO_IB_VM_MAX_SIZE:</div><div class='add'>+		/* this is where we report if vm is supported or not */</div><div class='add'>+		if (rdev-&gt;family &lt; CHIP_CAYMAN)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		value = RADEON_IB_VM_MAX_SIZE;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		DRM_DEBUG_KMS("Invalid request %d\n", info-&gt;request);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -270,7 +282,6 @@ int radeon_driver_firstopen_kms(struct drm_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> void radeon_driver_lastclose_kms(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	vga_switcheroo_process_delayed_switch();</div><div class='hunk'>@@ -278,12 +289,45 @@ void radeon_driver_lastclose_kms(struct drm_device *dev)</div><div class='ctx'> </div><div class='ctx'> int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_device *rdev = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	file_priv-&gt;driver_priv = NULL;</div><div class='add'>+</div><div class='add'>+	/* new gpu have virtual address space support */</div><div class='add'>+	if (rdev-&gt;family &gt;= CHIP_CAYMAN) {</div><div class='add'>+		struct radeon_fpriv *fpriv;</div><div class='add'>+		int r;</div><div class='add'>+</div><div class='add'>+		fpriv = kzalloc(sizeof(*fpriv), GFP_KERNEL);</div><div class='add'>+		if (unlikely(!fpriv)) {</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		r = radeon_vm_init(rdev, &amp;fpriv-&gt;vm);</div><div class='add'>+		if (r) {</div><div class='add'>+			radeon_vm_fini(rdev, &amp;fpriv-&gt;vm);</div><div class='add'>+			kfree(fpriv);</div><div class='add'>+			return r;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		file_priv-&gt;driver_priv = fpriv;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void radeon_driver_postclose_kms(struct drm_device *dev,</div><div class='ctx'> 				 struct drm_file *file_priv)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_device *rdev = dev-&gt;dev_private;</div><div class='add'>+</div><div class='add'>+	/* new gpu have virtual address space support */</div><div class='add'>+	if (rdev-&gt;family &gt;= CHIP_CAYMAN &amp;&amp; file_priv-&gt;driver_priv) {</div><div class='add'>+		struct radeon_fpriv *fpriv = file_priv-&gt;driver_priv;</div><div class='add'>+</div><div class='add'>+		radeon_vm_fini(rdev, &amp;fpriv-&gt;vm);</div><div class='add'>+		kfree(fpriv);</div><div class='add'>+		file_priv-&gt;driver_priv = NULL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void radeon_driver_preclose_kms(struct drm_device *dev,</div><div class='hunk'>@@ -451,5 +495,6 @@ struct drm_ioctl_desc radeon_ioctls_kms[] = {</div><div class='ctx'> 	DRM_IOCTL_DEF_DRV(RADEON_GEM_SET_TILING, radeon_gem_set_tiling_ioctl, DRM_AUTH|DRM_UNLOCKED),</div><div class='ctx'> 	DRM_IOCTL_DEF_DRV(RADEON_GEM_GET_TILING, radeon_gem_get_tiling_ioctl, DRM_AUTH|DRM_UNLOCKED),</div><div class='ctx'> 	DRM_IOCTL_DEF_DRV(RADEON_GEM_BUSY, radeon_gem_busy_ioctl, DRM_AUTH|DRM_UNLOCKED),</div><div class='add'>+	DRM_IOCTL_DEF_DRV(RADEON_GEM_VA, radeon_gem_va_ioctl, DRM_AUTH|DRM_UNLOCKED),</div><div class='ctx'> };</div><div class='ctx'> int radeon_max_kms_ioctl = DRM_ARRAY_SIZE(radeon_ioctls_kms);</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c<br/>index daadf2111040..25a19c483075 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_legacy_crtc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_legacy_crtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_legacy_crtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_legacy_crtc.c</a></div><div class='hunk'>@@ -437,7 +437,7 @@ int radeon_crtc_do_set_base(struct drm_crtc *crtc,</div><div class='ctx'> </div><div class='ctx'> 	crtc_offset_cntl = 0;</div><div class='ctx'> </div><div class='del'>-	pitch_pixels = target_fb-&gt;pitch / (target_fb-&gt;bits_per_pixel / 8);</div><div class='add'>+	pitch_pixels = target_fb-&gt;pitches[0] / (target_fb-&gt;bits_per_pixel / 8);</div><div class='ctx'> 	crtc_pitch  = (((pitch_pixels * target_fb-&gt;bits_per_pixel) +</div><div class='ctx'> 			((target_fb-&gt;bits_per_pixel * 8) - 1)) /</div><div class='ctx'> 		       (target_fb-&gt;bits_per_pixel * 8));</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h<br/>index 2c2e75ef8a37..08ff857c8fd6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_mode.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_mode.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_mode.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_mode.h</a></div><div class='hunk'>@@ -643,7 +643,7 @@ extern void radeon_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green</div><div class='ctx'> 				     u16 *blue, int regno);</div><div class='ctx'> void radeon_framebuffer_init(struct drm_device *dev,</div><div class='ctx'> 			     struct radeon_framebuffer *rfb,</div><div class='del'>-			     struct drm_mode_fb_cmd *mode_cmd,</div><div class='add'>+			     struct drm_mode_fb_cmd2 *mode_cmd,</div><div class='ctx'> 			     struct drm_gem_object *obj);</div><div class='ctx'> </div><div class='ctx'> int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb);</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c<br/>index 1c851521f458..d45df1763598 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_object.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_object.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_object.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_object.c</a></div><div class='hunk'>@@ -46,6 +46,20 @@ static void radeon_bo_clear_surface_reg(struct radeon_bo *bo);</div><div class='ctx'>  * function are calling it.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+void radeon_bo_clear_va(struct radeon_bo *bo)</div><div class='add'>+{</div><div class='add'>+	struct radeon_bo_va *bo_va, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(bo_va, tmp, &amp;bo-&gt;va, bo_list) {</div><div class='add'>+		/* remove from all vm address space */</div><div class='add'>+		mutex_lock(&amp;bo_va-&gt;vm-&gt;mutex);</div><div class='add'>+		list_del(&amp;bo_va-&gt;vm_list);</div><div class='add'>+		mutex_unlock(&amp;bo_va-&gt;vm-&gt;mutex);</div><div class='add'>+		list_del(&amp;bo_va-&gt;bo_list);</div><div class='add'>+		kfree(bo_va);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void radeon_ttm_bo_destroy(struct ttm_buffer_object *tbo)</div><div class='ctx'> {</div><div class='ctx'> 	struct radeon_bo *bo;</div><div class='hunk'>@@ -55,6 +69,7 @@ static void radeon_ttm_bo_destroy(struct ttm_buffer_object *tbo)</div><div class='ctx'> 	list_del_init(&amp;bo-&gt;list);</div><div class='ctx'> 	mutex_unlock(&amp;bo-&gt;rdev-&gt;gem.mutex);</div><div class='ctx'> 	radeon_bo_clear_surface_reg(bo);</div><div class='add'>+	radeon_bo_clear_va(bo);</div><div class='ctx'> 	drm_gem_object_release(&amp;bo-&gt;gem_base);</div><div class='ctx'> 	kfree(bo);</div><div class='ctx'> }</div><div class='hunk'>@@ -95,6 +110,7 @@ int radeon_bo_create(struct radeon_device *rdev,</div><div class='ctx'> 	enum ttm_bo_type type;</div><div class='ctx'> 	unsigned long page_align = roundup(byte_align, PAGE_SIZE) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	unsigned long max_size = 0;</div><div class='add'>+	size_t acc_size;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	size = ALIGN(size, PAGE_SIZE);</div><div class='hunk'>@@ -117,6 +133,9 @@ int radeon_bo_create(struct radeon_device *rdev,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	acc_size = ttm_bo_dma_acc_size(&amp;rdev-&gt;mman.bdev, size,</div><div class='add'>+				       sizeof(struct radeon_bo));</div><div class='add'>+</div><div class='ctx'> retry:</div><div class='ctx'> 	bo = kzalloc(sizeof(struct radeon_bo), GFP_KERNEL);</div><div class='ctx'> 	if (bo == NULL)</div><div class='hunk'>@@ -130,12 +149,13 @@ retry:</div><div class='ctx'> 	bo-&gt;gem_base.driver_private = NULL;</div><div class='ctx'> 	bo-&gt;surface_reg = -1;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;bo-&gt;list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;bo-&gt;va);</div><div class='ctx'> 	radeon_ttm_placement_from_domain(bo, domain);</div><div class='ctx'> 	/* Kernel allocation are uninterruptible */</div><div class='ctx'> 	mutex_lock(&amp;rdev-&gt;vram_mutex);</div><div class='ctx'> 	r = ttm_bo_init(&amp;rdev-&gt;mman.bdev, &amp;bo-&gt;tbo, size, type,</div><div class='del'>-			&amp;bo-&gt;placement, page_align, 0, !kernel, NULL, size,</div><div class='del'>-			&amp;radeon_ttm_bo_destroy);</div><div class='add'>+			&amp;bo-&gt;placement, page_align, 0, !kernel, NULL,</div><div class='add'>+			acc_size, &amp;radeon_ttm_bo_destroy);</div><div class='ctx'> 	mutex_unlock(&amp;rdev-&gt;vram_mutex);</div><div class='ctx'> 	if (unlikely(r != 0)) {</div><div class='ctx'> 		if (r != -ERESTARTSYS) {</div><div class='hunk'>@@ -483,6 +503,7 @@ void radeon_bo_move_notify(struct ttm_buffer_object *bo,</div><div class='ctx'> 		return;</div><div class='ctx'> 	rbo = container_of(bo, struct radeon_bo, tbo);</div><div class='ctx'> 	radeon_bo_check_tiling(rbo, 0, 1);</div><div class='add'>+	radeon_vm_bo_invalidate(rbo-&gt;rdev, rbo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int radeon_bo_fault_reserve_notify(struct ttm_buffer_object *bo)</div><div class='hunk'>@@ -556,3 +577,16 @@ int radeon_bo_reserve(struct radeon_bo *bo, bool no_wait)</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* object have to be reserved */</div><div class='add'>+struct radeon_bo_va *radeon_bo_va(struct radeon_bo *rbo, struct radeon_vm *vm)</div><div class='add'>+{</div><div class='add'>+	struct radeon_bo_va *bo_va;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(bo_va, &amp;rbo-&gt;va, bo_list) {</div><div class='add'>+		if (bo_va-&gt;vm == vm) {</div><div class='add'>+			return bo_va;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_object.h b/drivers/gpu/drm/radeon/radeon_object.h<br/>index b07f0f9b8627..cde430308870 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_object.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_object.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_object.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_object.h</a></div><div class='hunk'>@@ -83,6 +83,16 @@ static inline bool radeon_bo_is_reserved(struct radeon_bo *bo)</div><div class='ctx'> 	return !!atomic_read(&amp;bo-&gt;tbo.reserved);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned radeon_bo_ngpu_pages(struct radeon_bo *bo)</div><div class='add'>+{</div><div class='add'>+	return (bo-&gt;tbo.num_pages &lt;&lt; PAGE_SHIFT) / RADEON_GPU_PAGE_SIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned radeon_bo_gpu_page_alignment(struct radeon_bo *bo)</div><div class='add'>+{</div><div class='add'>+	return (bo-&gt;tbo.mem.page_alignment &lt;&lt; PAGE_SHIFT) / RADEON_GPU_PAGE_SIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * radeon_bo_mmap_offset - return mmap offset of bo</div><div class='ctx'>  * @bo:	radeon object for which we query the offset</div><div class='hunk'>@@ -128,4 +138,26 @@ extern void radeon_bo_move_notify(struct ttm_buffer_object *bo,</div><div class='ctx'> 					struct ttm_mem_reg *mem);</div><div class='ctx'> extern int radeon_bo_fault_reserve_notify(struct ttm_buffer_object *bo);</div><div class='ctx'> extern int radeon_bo_get_surface_reg(struct radeon_bo *bo);</div><div class='add'>+extern struct radeon_bo_va *radeon_bo_va(struct radeon_bo *rbo,</div><div class='add'>+					 struct radeon_vm *vm);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sub allocation</div><div class='add'>+ */</div><div class='add'>+extern int radeon_sa_bo_manager_init(struct radeon_device *rdev,</div><div class='add'>+				     struct radeon_sa_manager *sa_manager,</div><div class='add'>+				     unsigned size, u32 domain);</div><div class='add'>+extern void radeon_sa_bo_manager_fini(struct radeon_device *rdev,</div><div class='add'>+				      struct radeon_sa_manager *sa_manager);</div><div class='add'>+extern int radeon_sa_bo_manager_start(struct radeon_device *rdev,</div><div class='add'>+				      struct radeon_sa_manager *sa_manager);</div><div class='add'>+extern int radeon_sa_bo_manager_suspend(struct radeon_device *rdev,</div><div class='add'>+					struct radeon_sa_manager *sa_manager);</div><div class='add'>+extern int radeon_sa_bo_new(struct radeon_device *rdev,</div><div class='add'>+			    struct radeon_sa_manager *sa_manager,</div><div class='add'>+			    struct radeon_sa_bo *sa_bo,</div><div class='add'>+			    unsigned size, unsigned align);</div><div class='add'>+extern void radeon_sa_bo_free(struct radeon_device *rdev,</div><div class='add'>+			      struct radeon_sa_bo *sa_bo);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c<br/>index 78a665bd9519..095148e29a1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_pm.c</a></div><div class='hunk'>@@ -252,7 +252,10 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;rdev-&gt;ddev-&gt;struct_mutex);</div><div class='ctx'> 	mutex_lock(&amp;rdev-&gt;vram_mutex);</div><div class='del'>-	mutex_lock(&amp;rdev-&gt;cp.mutex);</div><div class='add'>+	for (i = 0; i &lt; RADEON_NUM_RINGS; ++i) {</div><div class='add'>+		if (rdev-&gt;ring[i].ring_obj)</div><div class='add'>+			mutex_lock(&amp;rdev-&gt;ring[i].mutex);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* gui idle int has issues on older chips it seems */</div><div class='ctx'> 	if (rdev-&gt;family &gt;= CHIP_R600) {</div><div class='hunk'>@@ -268,12 +271,13 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev)</div><div class='ctx'> 			radeon_irq_set(rdev);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		if (rdev-&gt;cp.ready) {</div><div class='add'>+		struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='add'>+		if (ring-&gt;ready) {</div><div class='ctx'> 			struct radeon_fence *fence;</div><div class='del'>-			radeon_ring_alloc(rdev, 64);</div><div class='del'>-			radeon_fence_create(rdev, &amp;fence);</div><div class='add'>+			radeon_ring_alloc(rdev, ring, 64);</div><div class='add'>+			radeon_fence_create(rdev, &amp;fence, radeon_ring_index(rdev, ring));</div><div class='ctx'> 			radeon_fence_emit(rdev, fence);</div><div class='del'>-			radeon_ring_commit(rdev);</div><div class='add'>+			radeon_ring_commit(rdev, ring);</div><div class='ctx'> 			radeon_fence_wait(fence, false);</div><div class='ctx'> 			radeon_fence_unref(&amp;fence);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -307,7 +311,10 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> 	rdev-&gt;pm.dynpm_planned_action = DYNPM_ACTION_NONE;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;rdev-&gt;cp.mutex);</div><div class='add'>+	for (i = 0; i &lt; RADEON_NUM_RINGS; ++i) {</div><div class='add'>+		if (rdev-&gt;ring[i].ring_obj)</div><div class='add'>+			mutex_unlock(&amp;rdev-&gt;ring[i].mutex);</div><div class='add'>+	}</div><div class='ctx'> 	mutex_unlock(&amp;rdev-&gt;vram_mutex);</div><div class='ctx'> 	mutex_unlock(&amp;rdev-&gt;ddev-&gt;struct_mutex);</div><div class='ctx'> }</div><div class='hunk'>@@ -795,19 +802,14 @@ static void radeon_dynpm_idle_work_handler(struct work_struct *work)</div><div class='ctx'> 	resched = ttm_bo_lock_delayed_workqueue(&amp;rdev-&gt;mman.bdev);</div><div class='ctx'> 	mutex_lock(&amp;rdev-&gt;pm.mutex);</div><div class='ctx'> 	if (rdev-&gt;pm.dynpm_state == DYNPM_STATE_ACTIVE) {</div><div class='del'>-		unsigned long irq_flags;</div><div class='ctx'> 		int not_processed = 0;</div><div class='add'>+		int i;</div><div class='ctx'> </div><div class='del'>-		read_lock_irqsave(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='del'>-		if (!list_empty(&amp;rdev-&gt;fence_drv.emited)) {</div><div class='del'>-			struct list_head *ptr;</div><div class='del'>-			list_for_each(ptr, &amp;rdev-&gt;fence_drv.emited) {</div><div class='del'>-				/* count up to 3, that's enought info */</div><div class='del'>-				if (++not_processed &gt;= 3)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='add'>+		for (i = 0; i &lt; RADEON_NUM_RINGS; ++i) {</div><div class='add'>+			not_processed += radeon_fence_count_emitted(rdev, i);</div><div class='add'>+			if (not_processed &gt;= 3)</div><div class='add'>+				break;</div><div class='ctx'> 		}</div><div class='del'>-		read_unlock_irqrestore(&amp;rdev-&gt;fence_drv.lock, irq_flags);</div><div class='ctx'> </div><div class='ctx'> 		if (not_processed &gt;= 3) { /* should upclock */</div><div class='ctx'> 			if (rdev-&gt;pm.dynpm_planned_action == DYNPM_ACTION_DOWNCLOCK) {</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c<br/>index 49d58202202c..e8bc70933d1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_ring.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_ring.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_ring.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_ring.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> #include "atom.h"</div><div class='ctx'> </div><div class='ctx'> int radeon_debugfs_ib_init(struct radeon_device *rdev);</div><div class='add'>+int radeon_debugfs_ring_init(struct radeon_device *rdev);</div><div class='ctx'> </div><div class='ctx'> u32 radeon_get_ib_value(struct radeon_cs_parser *p, int idx)</div><div class='ctx'> {</div><div class='hunk'>@@ -60,105 +61,106 @@ u32 radeon_get_ib_value(struct radeon_cs_parser *p, int idx)</div><div class='ctx'> 	return idx_value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void radeon_ring_write(struct radeon_device *rdev, uint32_t v)</div><div class='add'>+void radeon_ring_write(struct radeon_ring *ring, uint32_t v)</div><div class='ctx'> {</div><div class='ctx'> #if DRM_DEBUG_CODE</div><div class='del'>-	if (rdev-&gt;cp.count_dw &lt;= 0) {</div><div class='add'>+	if (ring-&gt;count_dw &lt;= 0) {</div><div class='ctx'> 		DRM_ERROR("radeon: writting more dword to ring than expected !\n");</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	rdev-&gt;cp.ring[rdev-&gt;cp.wptr++] = v;</div><div class='del'>-	rdev-&gt;cp.wptr &amp;= rdev-&gt;cp.ptr_mask;</div><div class='del'>-	rdev-&gt;cp.count_dw--;</div><div class='del'>-	rdev-&gt;cp.ring_free_dw--;</div><div class='add'>+	ring-&gt;ring[ring-&gt;wptr++] = v;</div><div class='add'>+	ring-&gt;wptr &amp;= ring-&gt;ptr_mask;</div><div class='add'>+	ring-&gt;count_dw--;</div><div class='add'>+	ring-&gt;ring_free_dw--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void radeon_ib_bogus_cleanup(struct radeon_device *rdev)</div><div class='del'>-{</div><div class='del'>-	struct radeon_ib *ib, *n;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(ib, n, &amp;rdev-&gt;ib_pool.bogus_ib, list) {</div><div class='del'>-		list_del(&amp;ib-&gt;list);</div><div class='del'>-		vfree(ib-&gt;ptr);</div><div class='del'>-		kfree(ib);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void radeon_ib_bogus_add(struct radeon_device *rdev, struct radeon_ib *ib)</div><div class='add'>+/*</div><div class='add'>+ * IB.</div><div class='add'>+ */</div><div class='add'>+bool radeon_ib_try_free(struct radeon_device *rdev, struct radeon_ib *ib)</div><div class='ctx'> {</div><div class='del'>-	struct radeon_ib *bib;</div><div class='del'>-</div><div class='del'>-	bib = kmalloc(sizeof(*bib), GFP_KERNEL);</div><div class='del'>-	if (bib == NULL)</div><div class='del'>-		return;</div><div class='del'>-	bib-&gt;ptr = vmalloc(ib-&gt;length_dw * 4);</div><div class='del'>-	if (bib-&gt;ptr == NULL) {</div><div class='del'>-		kfree(bib);</div><div class='del'>-		return;</div><div class='add'>+	bool done = false;</div><div class='add'>+</div><div class='add'>+	/* only free ib which have been emited */</div><div class='add'>+	if (ib-&gt;fence &amp;&amp; ib-&gt;fence-&gt;emitted) {</div><div class='add'>+		if (radeon_fence_signaled(ib-&gt;fence)) {</div><div class='add'>+			radeon_fence_unref(&amp;ib-&gt;fence);</div><div class='add'>+			radeon_sa_bo_free(rdev, &amp;ib-&gt;sa_bo);</div><div class='add'>+			done = true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	memcpy(bib-&gt;ptr, ib-&gt;ptr, ib-&gt;length_dw * 4);</div><div class='del'>-	bib-&gt;length_dw = ib-&gt;length_dw;</div><div class='del'>-	mutex_lock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='del'>-	list_add_tail(&amp;bib-&gt;list, &amp;rdev-&gt;ib_pool.bogus_ib);</div><div class='del'>-	mutex_unlock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='add'>+	return done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * IB.</div><div class='del'>- */</div><div class='del'>-int radeon_ib_get(struct radeon_device *rdev, struct radeon_ib **ib)</div><div class='add'>+int radeon_ib_get(struct radeon_device *rdev, int ring,</div><div class='add'>+		  struct radeon_ib **ib, unsigned size)</div><div class='ctx'> {</div><div class='ctx'> 	struct radeon_fence *fence;</div><div class='del'>-	struct radeon_ib *nib;</div><div class='del'>-	int r = 0, i, c;</div><div class='add'>+	unsigned cretry = 0;</div><div class='add'>+	int r = 0, i, idx;</div><div class='ctx'> </div><div class='ctx'> 	*ib = NULL;</div><div class='del'>-	r = radeon_fence_create(rdev, &amp;fence);</div><div class='add'>+	/* align size on 256 bytes */</div><div class='add'>+	size = ALIGN(size, 256);</div><div class='add'>+</div><div class='add'>+	r = radeon_fence_create(rdev, &amp;fence, ring);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		dev_err(rdev-&gt;dev, "failed to create fence for new IB\n");</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='del'>-	for (i = rdev-&gt;ib_pool.head_id, c = 0, nib = NULL; c &lt; RADEON_IB_POOL_SIZE; c++, i++) {</div><div class='del'>-		i &amp;= (RADEON_IB_POOL_SIZE - 1);</div><div class='del'>-		if (rdev-&gt;ib_pool.ibs[i].free) {</div><div class='del'>-			nib = &amp;rdev-&gt;ib_pool.ibs[i];</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (nib == NULL) {</div><div class='del'>-		/* This should never happen, it means we allocated all</div><div class='del'>-		 * IB and haven't scheduled one yet, return EBUSY to</div><div class='del'>-		 * userspace hoping that on ioctl recall we get better</div><div class='del'>-		 * luck</div><div class='del'>-		 */</div><div class='del'>-		dev_err(rdev-&gt;dev, "no free indirect buffer !\n");</div><div class='add'>+	idx = rdev-&gt;ib_pool.head_id;</div><div class='add'>+retry:</div><div class='add'>+	if (cretry &gt; 5) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed to get an ib after 5 retry\n");</div><div class='ctx'> 		mutex_unlock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='ctx'> 		radeon_fence_unref(&amp;fence);</div><div class='del'>-		return -EBUSY;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	rdev-&gt;ib_pool.head_id = (nib-&gt;idx + 1) &amp; (RADEON_IB_POOL_SIZE - 1);</div><div class='del'>-	nib-&gt;free = false;</div><div class='del'>-	if (nib-&gt;fence) {</div><div class='del'>-		mutex_unlock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='del'>-		r = radeon_fence_wait(nib-&gt;fence, false);</div><div class='del'>-		if (r) {</div><div class='del'>-			dev_err(rdev-&gt;dev, "error waiting fence of IB(%u:0x%016lX:%u)\n",</div><div class='del'>-				nib-&gt;idx, (unsigned long)nib-&gt;gpu_addr, nib-&gt;length_dw);</div><div class='del'>-			mutex_lock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='del'>-			nib-&gt;free = true;</div><div class='del'>-			mutex_unlock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='del'>-			radeon_fence_unref(&amp;fence);</div><div class='del'>-			return r;</div><div class='add'>+	cretry++;</div><div class='add'>+	for (i = 0; i &lt; RADEON_IB_POOL_SIZE; i++) {</div><div class='add'>+		radeon_ib_try_free(rdev, &amp;rdev-&gt;ib_pool.ibs[idx]);</div><div class='add'>+		if (rdev-&gt;ib_pool.ibs[idx].fence == NULL) {</div><div class='add'>+			r = radeon_sa_bo_new(rdev, &amp;rdev-&gt;ib_pool.sa_manager,</div><div class='add'>+					     &amp;rdev-&gt;ib_pool.ibs[idx].sa_bo,</div><div class='add'>+					     size, 256);</div><div class='add'>+			if (!r) {</div><div class='add'>+				*ib = &amp;rdev-&gt;ib_pool.ibs[idx];</div><div class='add'>+				(*ib)-&gt;ptr = rdev-&gt;ib_pool.sa_manager.cpu_ptr;</div><div class='add'>+				(*ib)-&gt;ptr += ((*ib)-&gt;sa_bo.offset &gt;&gt; 2);</div><div class='add'>+				(*ib)-&gt;gpu_addr = rdev-&gt;ib_pool.sa_manager.gpu_addr;</div><div class='add'>+				(*ib)-&gt;gpu_addr += (*ib)-&gt;sa_bo.offset;</div><div class='add'>+				(*ib)-&gt;fence = fence;</div><div class='add'>+				(*ib)-&gt;vm_id = 0;</div><div class='add'>+				/* ib are most likely to be allocated in a ring fashion</div><div class='add'>+				 * thus rdev-&gt;ib_pool.head_id should be the id of the</div><div class='add'>+				 * oldest ib</div><div class='add'>+				 */</div><div class='add'>+				rdev-&gt;ib_pool.head_id = (1 + idx);</div><div class='add'>+				rdev-&gt;ib_pool.head_id &amp;= (RADEON_IB_POOL_SIZE - 1);</div><div class='add'>+				mutex_unlock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-		mutex_lock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='add'>+		idx = (idx + 1) &amp; (RADEON_IB_POOL_SIZE - 1);</div><div class='add'>+	}</div><div class='add'>+	/* this should be rare event, ie all ib scheduled none signaled yet.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; RADEON_IB_POOL_SIZE; i++) {</div><div class='add'>+		if (rdev-&gt;ib_pool.ibs[idx].fence &amp;&amp; rdev-&gt;ib_pool.ibs[idx].fence-&gt;emitted) {</div><div class='add'>+			r = radeon_fence_wait(rdev-&gt;ib_pool.ibs[idx].fence, false);</div><div class='add'>+			if (!r) {</div><div class='add'>+				goto retry;</div><div class='add'>+			}</div><div class='add'>+			/* an error happened */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		idx = (idx + 1) &amp; (RADEON_IB_POOL_SIZE - 1);</div><div class='ctx'> 	}</div><div class='del'>-	radeon_fence_unref(&amp;nib-&gt;fence);</div><div class='del'>-	nib-&gt;fence = fence;</div><div class='del'>-	nib-&gt;length_dw = 0;</div><div class='ctx'> 	mutex_unlock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='del'>-	*ib = nib;</div><div class='del'>-	return 0;</div><div class='add'>+	radeon_fence_unref(&amp;fence);</div><div class='add'>+	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void radeon_ib_free(struct radeon_device *rdev, struct radeon_ib **ib)</div><div class='hunk'>@@ -169,247 +171,255 @@ void radeon_ib_free(struct radeon_device *rdev, struct radeon_ib **ib)</div><div class='ctx'> 	if (tmp == NULL) {</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (!tmp-&gt;fence-&gt;emited)</div><div class='del'>-		radeon_fence_unref(&amp;tmp-&gt;fence);</div><div class='ctx'> 	mutex_lock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='del'>-	tmp-&gt;free = true;</div><div class='add'>+	if (tmp-&gt;fence &amp;&amp; !tmp-&gt;fence-&gt;emitted) {</div><div class='add'>+		radeon_sa_bo_free(rdev, &amp;tmp-&gt;sa_bo);</div><div class='add'>+		radeon_fence_unref(&amp;tmp-&gt;fence);</div><div class='add'>+	}</div><div class='ctx'> 	mutex_unlock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[ib-&gt;fence-&gt;ring];</div><div class='ctx'> 	int r = 0;</div><div class='ctx'> </div><div class='del'>-	if (!ib-&gt;length_dw || !rdev-&gt;cp.ready) {</div><div class='add'>+	if (!ib-&gt;length_dw || !ring-&gt;ready) {</div><div class='ctx'> 		/* TODO: Nothings in the ib we should report. */</div><div class='ctx'> 		DRM_ERROR("radeon: couldn't schedule IB(%u).\n", ib-&gt;idx);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* 64 dwords should be enough for fence too */</div><div class='del'>-	r = radeon_ring_lock(rdev, 64);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, 64);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		DRM_ERROR("radeon: scheduling IB failed (%d).\n", r);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-	radeon_ring_ib_execute(rdev, ib);</div><div class='add'>+	radeon_ring_ib_execute(rdev, ib-&gt;fence-&gt;ring, ib);</div><div class='ctx'> 	radeon_fence_emit(rdev, ib-&gt;fence);</div><div class='del'>-	mutex_lock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='del'>-	/* once scheduled IB is considered free and protected by the fence */</div><div class='del'>-	ib-&gt;free = true;</div><div class='del'>-	mutex_unlock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='del'>-	radeon_ring_unlock_commit(rdev);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int radeon_ib_pool_init(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='del'>-	void *ptr;</div><div class='del'>-	uint64_t gpu_addr;</div><div class='del'>-	int i;</div><div class='del'>-	int r = 0;</div><div class='add'>+	int i, r;</div><div class='ctx'> </div><div class='del'>-	if (rdev-&gt;ib_pool.robj)</div><div class='add'>+	mutex_lock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='add'>+	if (rdev-&gt;ib_pool.ready) {</div><div class='add'>+		mutex_unlock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='ctx'> 		return 0;</div><div class='del'>-	INIT_LIST_HEAD(&amp;rdev-&gt;ib_pool.bogus_ib);</div><div class='del'>-	/* Allocate 1M object buffer */</div><div class='del'>-	r = radeon_bo_create(rdev, RADEON_IB_POOL_SIZE*64*1024,</div><div class='del'>-			     PAGE_SIZE, true, RADEON_GEM_DOMAIN_GTT,</div><div class='del'>-			     &amp;rdev-&gt;ib_pool.robj);</div><div class='del'>-	if (r) {</div><div class='del'>-		DRM_ERROR("radeon: failed to ib pool (%d).\n", r);</div><div class='del'>-		return r;</div><div class='ctx'> 	}</div><div class='del'>-	r = radeon_bo_reserve(rdev-&gt;ib_pool.robj, false);</div><div class='del'>-	if (unlikely(r != 0))</div><div class='del'>-		return r;</div><div class='del'>-	r = radeon_bo_pin(rdev-&gt;ib_pool.robj, RADEON_GEM_DOMAIN_GTT, &amp;gpu_addr);</div><div class='del'>-	if (r) {</div><div class='del'>-		radeon_bo_unreserve(rdev-&gt;ib_pool.robj);</div><div class='del'>-		DRM_ERROR("radeon: failed to pin ib pool (%d).\n", r);</div><div class='del'>-		return r;</div><div class='del'>-	}</div><div class='del'>-	r = radeon_bo_kmap(rdev-&gt;ib_pool.robj, &amp;ptr);</div><div class='del'>-	radeon_bo_unreserve(rdev-&gt;ib_pool.robj);</div><div class='add'>+</div><div class='add'>+	r = radeon_sa_bo_manager_init(rdev, &amp;rdev-&gt;ib_pool.sa_manager,</div><div class='add'>+				      RADEON_IB_POOL_SIZE*64*1024,</div><div class='add'>+				      RADEON_GEM_DOMAIN_GTT);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		DRM_ERROR("radeon: failed to map ib pool (%d).\n", r);</div><div class='add'>+		mutex_unlock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-	for (i = 0; i &lt; RADEON_IB_POOL_SIZE; i++) {</div><div class='del'>-		unsigned offset;</div><div class='ctx'> </div><div class='del'>-		offset = i * 64 * 1024;</div><div class='del'>-		rdev-&gt;ib_pool.ibs[i].gpu_addr = gpu_addr + offset;</div><div class='del'>-		rdev-&gt;ib_pool.ibs[i].ptr = ptr + offset;</div><div class='add'>+	for (i = 0; i &lt; RADEON_IB_POOL_SIZE; i++) {</div><div class='add'>+		rdev-&gt;ib_pool.ibs[i].fence = NULL;</div><div class='ctx'> 		rdev-&gt;ib_pool.ibs[i].idx = i;</div><div class='ctx'> 		rdev-&gt;ib_pool.ibs[i].length_dw = 0;</div><div class='del'>-		rdev-&gt;ib_pool.ibs[i].free = true;</div><div class='add'>+		INIT_LIST_HEAD(&amp;rdev-&gt;ib_pool.ibs[i].sa_bo.list);</div><div class='ctx'> 	}</div><div class='ctx'> 	rdev-&gt;ib_pool.head_id = 0;</div><div class='ctx'> 	rdev-&gt;ib_pool.ready = true;</div><div class='ctx'> 	DRM_INFO("radeon: ib pool ready.\n");</div><div class='add'>+</div><div class='ctx'> 	if (radeon_debugfs_ib_init(rdev)) {</div><div class='ctx'> 		DRM_ERROR("Failed to register debugfs file for IB !\n");</div><div class='ctx'> 	}</div><div class='del'>-	return r;</div><div class='add'>+	if (radeon_debugfs_ring_init(rdev)) {</div><div class='add'>+		DRM_ERROR("Failed to register debugfs file for rings !\n");</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void radeon_ib_pool_fini(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='del'>-	int r;</div><div class='del'>-	struct radeon_bo *robj;</div><div class='add'>+	unsigned i;</div><div class='ctx'> </div><div class='del'>-	if (!rdev-&gt;ib_pool.ready) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='ctx'> 	mutex_lock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='del'>-	radeon_ib_bogus_cleanup(rdev);</div><div class='del'>-	robj = rdev-&gt;ib_pool.robj;</div><div class='del'>-	rdev-&gt;ib_pool.robj = NULL;</div><div class='del'>-	mutex_unlock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='del'>-</div><div class='del'>-	if (robj) {</div><div class='del'>-		r = radeon_bo_reserve(robj, false);</div><div class='del'>-		if (likely(r == 0)) {</div><div class='del'>-			radeon_bo_kunmap(robj);</div><div class='del'>-			radeon_bo_unpin(robj);</div><div class='del'>-			radeon_bo_unreserve(robj);</div><div class='add'>+	if (rdev-&gt;ib_pool.ready) {</div><div class='add'>+		for (i = 0; i &lt; RADEON_IB_POOL_SIZE; i++) {</div><div class='add'>+			radeon_sa_bo_free(rdev, &amp;rdev-&gt;ib_pool.ibs[i].sa_bo);</div><div class='add'>+			radeon_fence_unref(&amp;rdev-&gt;ib_pool.ibs[i].fence);</div><div class='ctx'> 		}</div><div class='del'>-		radeon_bo_unref(&amp;robj);</div><div class='add'>+		radeon_sa_bo_manager_fini(rdev, &amp;rdev-&gt;ib_pool.sa_manager);</div><div class='add'>+		rdev-&gt;ib_pool.ready = false;</div><div class='ctx'> 	}</div><div class='add'>+	mutex_unlock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int radeon_ib_pool_start(struct radeon_device *rdev)</div><div class='add'>+{</div><div class='add'>+	return radeon_sa_bo_manager_start(rdev, &amp;rdev-&gt;ib_pool.sa_manager);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int radeon_ib_pool_suspend(struct radeon_device *rdev)</div><div class='add'>+{</div><div class='add'>+	return radeon_sa_bo_manager_suspend(rdev, &amp;rdev-&gt;ib_pool.sa_manager);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Ring.</div><div class='ctx'>  */</div><div class='del'>-void radeon_ring_free_size(struct radeon_device *rdev)</div><div class='add'>+int radeon_ring_index(struct radeon_device *rdev, struct radeon_ring *ring)</div><div class='ctx'> {</div><div class='del'>-	if (rdev-&gt;wb.enabled)</div><div class='del'>-		rdev-&gt;cp.rptr = le32_to_cpu(rdev-&gt;wb.wb[RADEON_WB_CP_RPTR_OFFSET/4]);</div><div class='del'>-	else {</div><div class='del'>-		if (rdev-&gt;family &gt;= CHIP_R600)</div><div class='del'>-			rdev-&gt;cp.rptr = RREG32(R600_CP_RB_RPTR);</div><div class='del'>-		else</div><div class='del'>-			rdev-&gt;cp.rptr = RREG32(RADEON_CP_RB_RPTR);</div><div class='add'>+	/* r1xx-r5xx only has CP ring */</div><div class='add'>+	if (rdev-&gt;family &lt; CHIP_R600)</div><div class='add'>+		return RADEON_RING_TYPE_GFX_INDEX;</div><div class='add'>+</div><div class='add'>+	if (rdev-&gt;family &gt;= CHIP_CAYMAN) {</div><div class='add'>+		if (ring == &amp;rdev-&gt;ring[CAYMAN_RING_TYPE_CP1_INDEX])</div><div class='add'>+			return CAYMAN_RING_TYPE_CP1_INDEX;</div><div class='add'>+		else if (ring == &amp;rdev-&gt;ring[CAYMAN_RING_TYPE_CP2_INDEX])</div><div class='add'>+			return CAYMAN_RING_TYPE_CP2_INDEX;</div><div class='ctx'> 	}</div><div class='add'>+	return RADEON_RING_TYPE_GFX_INDEX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void radeon_ring_free_size(struct radeon_device *rdev, struct radeon_ring *ring)</div><div class='add'>+{</div><div class='add'>+	u32 rptr;</div><div class='add'>+</div><div class='add'>+	if (rdev-&gt;wb.enabled)</div><div class='add'>+		rptr = le32_to_cpu(rdev-&gt;wb.wb[ring-&gt;rptr_offs/4]);</div><div class='add'>+	else</div><div class='add'>+		rptr = RREG32(ring-&gt;rptr_reg);</div><div class='add'>+	ring-&gt;rptr = (rptr &amp; ring-&gt;ptr_reg_mask) &gt;&gt; ring-&gt;ptr_reg_shift;</div><div class='ctx'> 	/* This works because ring_size is a power of 2 */</div><div class='del'>-	rdev-&gt;cp.ring_free_dw = (rdev-&gt;cp.rptr + (rdev-&gt;cp.ring_size / 4));</div><div class='del'>-	rdev-&gt;cp.ring_free_dw -= rdev-&gt;cp.wptr;</div><div class='del'>-	rdev-&gt;cp.ring_free_dw &amp;= rdev-&gt;cp.ptr_mask;</div><div class='del'>-	if (!rdev-&gt;cp.ring_free_dw) {</div><div class='del'>-		rdev-&gt;cp.ring_free_dw = rdev-&gt;cp.ring_size / 4;</div><div class='add'>+	ring-&gt;ring_free_dw = (ring-&gt;rptr + (ring-&gt;ring_size / 4));</div><div class='add'>+	ring-&gt;ring_free_dw -= ring-&gt;wptr;</div><div class='add'>+	ring-&gt;ring_free_dw &amp;= ring-&gt;ptr_mask;</div><div class='add'>+	if (!ring-&gt;ring_free_dw) {</div><div class='add'>+		ring-&gt;ring_free_dw = ring-&gt;ring_size / 4;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int radeon_ring_alloc(struct radeon_device *rdev, unsigned ndw)</div><div class='add'>+</div><div class='add'>+int radeon_ring_alloc(struct radeon_device *rdev, struct radeon_ring *ring, unsigned ndw)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	/* Align requested size with padding so unlock_commit can</div><div class='ctx'> 	 * pad safely */</div><div class='del'>-	ndw = (ndw + rdev-&gt;cp.align_mask) &amp; ~rdev-&gt;cp.align_mask;</div><div class='del'>-	while (ndw &gt; (rdev-&gt;cp.ring_free_dw - 1)) {</div><div class='del'>-		radeon_ring_free_size(rdev);</div><div class='del'>-		if (ndw &lt; rdev-&gt;cp.ring_free_dw) {</div><div class='add'>+	ndw = (ndw + ring-&gt;align_mask) &amp; ~ring-&gt;align_mask;</div><div class='add'>+	while (ndw &gt; (ring-&gt;ring_free_dw - 1)) {</div><div class='add'>+		radeon_ring_free_size(rdev, ring);</div><div class='add'>+		if (ndw &lt; ring-&gt;ring_free_dw) {</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		r = radeon_fence_wait_next(rdev);</div><div class='add'>+		r = radeon_fence_wait_next(rdev, radeon_ring_index(rdev, ring));</div><div class='ctx'> 		if (r)</div><div class='ctx'> 			return r;</div><div class='ctx'> 	}</div><div class='del'>-	rdev-&gt;cp.count_dw = ndw;</div><div class='del'>-	rdev-&gt;cp.wptr_old = rdev-&gt;cp.wptr;</div><div class='add'>+	ring-&gt;count_dw = ndw;</div><div class='add'>+	ring-&gt;wptr_old = ring-&gt;wptr;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int radeon_ring_lock(struct radeon_device *rdev, unsigned ndw)</div><div class='add'>+int radeon_ring_lock(struct radeon_device *rdev, struct radeon_ring *ring, unsigned ndw)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;rdev-&gt;cp.mutex);</div><div class='del'>-	r = radeon_ring_alloc(rdev, ndw);</div><div class='add'>+	mutex_lock(&amp;ring-&gt;mutex);</div><div class='add'>+	r = radeon_ring_alloc(rdev, ring, ndw);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		mutex_unlock(&amp;rdev-&gt;cp.mutex);</div><div class='add'>+		mutex_unlock(&amp;ring-&gt;mutex);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void radeon_ring_commit(struct radeon_device *rdev)</div><div class='add'>+void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *ring)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned count_dw_pad;</div><div class='ctx'> 	unsigned i;</div><div class='ctx'> </div><div class='ctx'> 	/* We pad to match fetch size */</div><div class='del'>-	count_dw_pad = (rdev-&gt;cp.align_mask + 1) -</div><div class='del'>-		       (rdev-&gt;cp.wptr &amp; rdev-&gt;cp.align_mask);</div><div class='add'>+	count_dw_pad = (ring-&gt;align_mask + 1) -</div><div class='add'>+		       (ring-&gt;wptr &amp; ring-&gt;align_mask);</div><div class='ctx'> 	for (i = 0; i &lt; count_dw_pad; i++) {</div><div class='del'>-		radeon_ring_write(rdev, 2 &lt;&lt; 30);</div><div class='add'>+		radeon_ring_write(ring, ring-&gt;nop);</div><div class='ctx'> 	}</div><div class='ctx'> 	DRM_MEMORYBARRIER();</div><div class='del'>-	radeon_cp_commit(rdev);</div><div class='add'>+	WREG32(ring-&gt;wptr_reg, (ring-&gt;wptr &lt;&lt; ring-&gt;ptr_reg_shift) &amp; ring-&gt;ptr_reg_mask);</div><div class='add'>+	(void)RREG32(ring-&gt;wptr_reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void radeon_ring_unlock_commit(struct radeon_device *rdev)</div><div class='add'>+void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *ring)</div><div class='ctx'> {</div><div class='del'>-	radeon_ring_commit(rdev);</div><div class='del'>-	mutex_unlock(&amp;rdev-&gt;cp.mutex);</div><div class='add'>+	radeon_ring_commit(rdev, ring);</div><div class='add'>+	mutex_unlock(&amp;ring-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void radeon_ring_unlock_undo(struct radeon_device *rdev)</div><div class='add'>+void radeon_ring_unlock_undo(struct radeon_device *rdev, struct radeon_ring *ring)</div><div class='ctx'> {</div><div class='del'>-	rdev-&gt;cp.wptr = rdev-&gt;cp.wptr_old;</div><div class='del'>-	mutex_unlock(&amp;rdev-&gt;cp.mutex);</div><div class='add'>+	ring-&gt;wptr = ring-&gt;wptr_old;</div><div class='add'>+	mutex_unlock(&amp;ring-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int radeon_ring_init(struct radeon_device *rdev, unsigned ring_size)</div><div class='add'>+int radeon_ring_init(struct radeon_device *rdev, struct radeon_ring *ring, unsigned ring_size,</div><div class='add'>+		     unsigned rptr_offs, unsigned rptr_reg, unsigned wptr_reg,</div><div class='add'>+		     u32 ptr_reg_shift, u32 ptr_reg_mask, u32 nop)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	rdev-&gt;cp.ring_size = ring_size;</div><div class='add'>+	ring-&gt;ring_size = ring_size;</div><div class='add'>+	ring-&gt;rptr_offs = rptr_offs;</div><div class='add'>+	ring-&gt;rptr_reg = rptr_reg;</div><div class='add'>+	ring-&gt;wptr_reg = wptr_reg;</div><div class='add'>+	ring-&gt;ptr_reg_shift = ptr_reg_shift;</div><div class='add'>+	ring-&gt;ptr_reg_mask = ptr_reg_mask;</div><div class='add'>+	ring-&gt;nop = nop;</div><div class='ctx'> 	/* Allocate ring buffer */</div><div class='del'>-	if (rdev-&gt;cp.ring_obj == NULL) {</div><div class='del'>-		r = radeon_bo_create(rdev, rdev-&gt;cp.ring_size, PAGE_SIZE, true,</div><div class='add'>+	if (ring-&gt;ring_obj == NULL) {</div><div class='add'>+		r = radeon_bo_create(rdev, ring-&gt;ring_size, PAGE_SIZE, true,</div><div class='ctx'> 					RADEON_GEM_DOMAIN_GTT,</div><div class='del'>-					&amp;rdev-&gt;cp.ring_obj);</div><div class='add'>+					&amp;ring-&gt;ring_obj);</div><div class='ctx'> 		if (r) {</div><div class='ctx'> 			dev_err(rdev-&gt;dev, "(%d) ring create failed\n", r);</div><div class='ctx'> 			return r;</div><div class='ctx'> 		}</div><div class='del'>-		r = radeon_bo_reserve(rdev-&gt;cp.ring_obj, false);</div><div class='add'>+		r = radeon_bo_reserve(ring-&gt;ring_obj, false);</div><div class='ctx'> 		if (unlikely(r != 0))</div><div class='ctx'> 			return r;</div><div class='del'>-		r = radeon_bo_pin(rdev-&gt;cp.ring_obj, RADEON_GEM_DOMAIN_GTT,</div><div class='del'>-					&amp;rdev-&gt;cp.gpu_addr);</div><div class='add'>+		r = radeon_bo_pin(ring-&gt;ring_obj, RADEON_GEM_DOMAIN_GTT,</div><div class='add'>+					&amp;ring-&gt;gpu_addr);</div><div class='ctx'> 		if (r) {</div><div class='del'>-			radeon_bo_unreserve(rdev-&gt;cp.ring_obj);</div><div class='add'>+			radeon_bo_unreserve(ring-&gt;ring_obj);</div><div class='ctx'> 			dev_err(rdev-&gt;dev, "(%d) ring pin failed\n", r);</div><div class='ctx'> 			return r;</div><div class='ctx'> 		}</div><div class='del'>-		r = radeon_bo_kmap(rdev-&gt;cp.ring_obj,</div><div class='del'>-				       (void **)&amp;rdev-&gt;cp.ring);</div><div class='del'>-		radeon_bo_unreserve(rdev-&gt;cp.ring_obj);</div><div class='add'>+		r = radeon_bo_kmap(ring-&gt;ring_obj,</div><div class='add'>+				       (void **)&amp;ring-&gt;ring);</div><div class='add'>+		radeon_bo_unreserve(ring-&gt;ring_obj);</div><div class='ctx'> 		if (r) {</div><div class='ctx'> 			dev_err(rdev-&gt;dev, "(%d) ring map failed\n", r);</div><div class='ctx'> 			return r;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	rdev-&gt;cp.ptr_mask = (rdev-&gt;cp.ring_size / 4) - 1;</div><div class='del'>-	rdev-&gt;cp.ring_free_dw = rdev-&gt;cp.ring_size / 4;</div><div class='add'>+	ring-&gt;ptr_mask = (ring-&gt;ring_size / 4) - 1;</div><div class='add'>+	ring-&gt;ring_free_dw = ring-&gt;ring_size / 4;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void radeon_ring_fini(struct radeon_device *rdev)</div><div class='add'>+void radeon_ring_fini(struct radeon_device *rdev, struct radeon_ring *ring)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='ctx'> 	struct radeon_bo *ring_obj;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;rdev-&gt;cp.mutex);</div><div class='del'>-	ring_obj = rdev-&gt;cp.ring_obj;</div><div class='del'>-	rdev-&gt;cp.ring = NULL;</div><div class='del'>-	rdev-&gt;cp.ring_obj = NULL;</div><div class='del'>-	mutex_unlock(&amp;rdev-&gt;cp.mutex);</div><div class='add'>+	mutex_lock(&amp;ring-&gt;mutex);</div><div class='add'>+	ring_obj = ring-&gt;ring_obj;</div><div class='add'>+	ring-&gt;ring = NULL;</div><div class='add'>+	ring-&gt;ring_obj = NULL;</div><div class='add'>+	mutex_unlock(&amp;ring-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (ring_obj) {</div><div class='ctx'> 		r = radeon_bo_reserve(ring_obj, false);</div><div class='hunk'>@@ -422,72 +432,83 @@ void radeon_ring_fini(struct radeon_device *rdev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Debugfs info</div><div class='ctx'>  */</div><div class='ctx'> #if defined(CONFIG_DEBUG_FS)</div><div class='del'>-static int radeon_debugfs_ib_info(struct seq_file *m, void *data)</div><div class='add'>+</div><div class='add'>+static int radeon_debugfs_ring_info(struct seq_file *m, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_info_node *node = (struct drm_info_node *) m-&gt;private;</div><div class='del'>-	struct radeon_ib *ib = node-&gt;info_ent-&gt;data;</div><div class='del'>-	unsigned i;</div><div class='del'>-</div><div class='del'>-	if (ib == NULL) {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	seq_printf(m, "IB %04u\n", ib-&gt;idx);</div><div class='del'>-	seq_printf(m, "IB fence %p\n", ib-&gt;fence);</div><div class='del'>-	seq_printf(m, "IB size %05u dwords\n", ib-&gt;length_dw);</div><div class='del'>-	for (i = 0; i &lt; ib-&gt;length_dw; i++) {</div><div class='del'>-		seq_printf(m, "[%05u]=0x%08X\n", i, ib-&gt;ptr[i]);</div><div class='add'>+	struct drm_device *dev = node-&gt;minor-&gt;dev;</div><div class='add'>+	struct radeon_device *rdev = dev-&gt;dev_private;</div><div class='add'>+	int ridx = *(int*)node-&gt;info_ent-&gt;data;</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[ridx];</div><div class='add'>+	unsigned count, i, j;</div><div class='add'>+</div><div class='add'>+	radeon_ring_free_size(rdev, ring);</div><div class='add'>+	count = (ring-&gt;ring_size / 4) - ring-&gt;ring_free_dw;</div><div class='add'>+	seq_printf(m, "wptr(0x%04x): 0x%08x\n", ring-&gt;wptr_reg, RREG32(ring-&gt;wptr_reg));</div><div class='add'>+	seq_printf(m, "rptr(0x%04x): 0x%08x\n", ring-&gt;rptr_reg, RREG32(ring-&gt;rptr_reg));</div><div class='add'>+	seq_printf(m, "driver's copy of the wptr: 0x%08x\n", ring-&gt;wptr);</div><div class='add'>+	seq_printf(m, "driver's copy of the rptr: 0x%08x\n", ring-&gt;rptr);</div><div class='add'>+	seq_printf(m, "%u free dwords in ring\n", ring-&gt;ring_free_dw);</div><div class='add'>+	seq_printf(m, "%u dwords in ring\n", count);</div><div class='add'>+	i = ring-&gt;rptr;</div><div class='add'>+	for (j = 0; j &lt;= count; j++) {</div><div class='add'>+		seq_printf(m, "r[%04d]=0x%08x\n", i, ring-&gt;ring[i]);</div><div class='add'>+		i = (i + 1) &amp; ring-&gt;ptr_mask;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int radeon_debugfs_ib_bogus_info(struct seq_file *m, void *data)</div><div class='add'>+static int radeon_ring_type_gfx_index = RADEON_RING_TYPE_GFX_INDEX;</div><div class='add'>+static int cayman_ring_type_cp1_index = CAYMAN_RING_TYPE_CP1_INDEX;</div><div class='add'>+static int cayman_ring_type_cp2_index = CAYMAN_RING_TYPE_CP2_INDEX;</div><div class='add'>+</div><div class='add'>+static struct drm_info_list radeon_debugfs_ring_info_list[] = {</div><div class='add'>+	{"radeon_ring_gfx", radeon_debugfs_ring_info, 0, &amp;radeon_ring_type_gfx_index},</div><div class='add'>+	{"radeon_ring_cp1", radeon_debugfs_ring_info, 0, &amp;cayman_ring_type_cp1_index},</div><div class='add'>+	{"radeon_ring_cp2", radeon_debugfs_ring_info, 0, &amp;cayman_ring_type_cp2_index},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int radeon_debugfs_ib_info(struct seq_file *m, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_info_node *node = (struct drm_info_node *) m-&gt;private;</div><div class='del'>-	struct radeon_device *rdev = node-&gt;info_ent-&gt;data;</div><div class='del'>-	struct radeon_ib *ib;</div><div class='add'>+	struct radeon_ib *ib = node-&gt;info_ent-&gt;data;</div><div class='ctx'> 	unsigned i;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='del'>-	if (list_empty(&amp;rdev-&gt;ib_pool.bogus_ib)) {</div><div class='del'>-		mutex_unlock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='del'>-		seq_printf(m, "no bogus IB recorded\n");</div><div class='add'>+	if (ib == NULL) {</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	ib = list_first_entry(&amp;rdev-&gt;ib_pool.bogus_ib, struct radeon_ib, list);</div><div class='del'>-	list_del_init(&amp;ib-&gt;list);</div><div class='del'>-	mutex_unlock(&amp;rdev-&gt;ib_pool.mutex);</div><div class='add'>+	seq_printf(m, "IB %04u\n", ib-&gt;idx);</div><div class='add'>+	seq_printf(m, "IB fence %p\n", ib-&gt;fence);</div><div class='ctx'> 	seq_printf(m, "IB size %05u dwords\n", ib-&gt;length_dw);</div><div class='ctx'> 	for (i = 0; i &lt; ib-&gt;length_dw; i++) {</div><div class='ctx'> 		seq_printf(m, "[%05u]=0x%08X\n", i, ib-&gt;ptr[i]);</div><div class='ctx'> 	}</div><div class='del'>-	vfree(ib-&gt;ptr);</div><div class='del'>-	kfree(ib);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct drm_info_list radeon_debugfs_ib_list[RADEON_IB_POOL_SIZE];</div><div class='ctx'> static char radeon_debugfs_ib_names[RADEON_IB_POOL_SIZE][32];</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-static struct drm_info_list radeon_debugfs_ib_bogus_info_list[] = {</div><div class='del'>-	{"radeon_ib_bogus", radeon_debugfs_ib_bogus_info, 0, NULL},</div><div class='del'>-};</div><div class='add'>+int radeon_debugfs_ring_init(struct radeon_device *rdev)</div><div class='add'>+{</div><div class='add'>+#if defined(CONFIG_DEBUG_FS)</div><div class='add'>+	return radeon_debugfs_add_files(rdev, radeon_debugfs_ring_info_list,</div><div class='add'>+					ARRAY_SIZE(radeon_debugfs_ring_info_list));</div><div class='add'>+#else</div><div class='add'>+	return 0;</div><div class='ctx'> #endif</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> int radeon_debugfs_ib_init(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='ctx'> #if defined(CONFIG_DEBUG_FS)</div><div class='ctx'> 	unsigned i;</div><div class='del'>-	int r;</div><div class='ctx'> </div><div class='del'>-	radeon_debugfs_ib_bogus_info_list[0].data = rdev;</div><div class='del'>-	r = radeon_debugfs_add_files(rdev, radeon_debugfs_ib_bogus_info_list, 1);</div><div class='del'>-	if (r)</div><div class='del'>-		return r;</div><div class='ctx'> 	for (i = 0; i &lt; RADEON_IB_POOL_SIZE; i++) {</div><div class='ctx'> 		sprintf(radeon_debugfs_ib_names[i], "radeon_ib_%04u", i);</div><div class='ctx'> 		radeon_debugfs_ib_list[i].name = radeon_debugfs_ib_names[i];</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_sa.c b/drivers/gpu/drm/radeon/radeon_sa.c<br/>new file mode 100644<br/>index 000000000000..4cce47e7dc0d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_sa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_sa.c</a></div><div class='hunk'>@@ -0,0 +1,189 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2011 Red Hat Inc.</div><div class='add'>+ * All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the</div><div class='add'>+ * "Software"), to deal in the Software without restriction, including</div><div class='add'>+ * without limitation the rights to use, copy, modify, merge, publish,</div><div class='add'>+ * distribute, sub license, and/or sell copies of the Software, and to</div><div class='add'>+ * permit persons to whom the Software is furnished to do so, subject to</div><div class='add'>+ * the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL</div><div class='add'>+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,</div><div class='add'>+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR</div><div class='add'>+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE</div><div class='add'>+ * USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the</div><div class='add'>+ * next paragraph) shall be included in all copies or substantial portions</div><div class='add'>+ * of the Software.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='add'>+ * Authors:</div><div class='add'>+ *    Jerome Glisse &lt;glisse@freedesktop.org&gt;</div><div class='add'>+ */</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "drm.h"</div><div class='add'>+#include "radeon.h"</div><div class='add'>+</div><div class='add'>+int radeon_sa_bo_manager_init(struct radeon_device *rdev,</div><div class='add'>+			      struct radeon_sa_manager *sa_manager,</div><div class='add'>+			      unsigned size, u32 domain)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	sa_manager-&gt;bo = NULL;</div><div class='add'>+	sa_manager-&gt;size = size;</div><div class='add'>+	sa_manager-&gt;domain = domain;</div><div class='add'>+	INIT_LIST_HEAD(&amp;sa_manager-&gt;sa_bo);</div><div class='add'>+</div><div class='add'>+	r = radeon_bo_create(rdev, size, RADEON_GPU_PAGE_SIZE, true,</div><div class='add'>+			     RADEON_GEM_DOMAIN_CPU, &amp;sa_manager-&gt;bo);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "(%d) failed to allocate bo for manager\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void radeon_sa_bo_manager_fini(struct radeon_device *rdev,</div><div class='add'>+			       struct radeon_sa_manager *sa_manager)</div><div class='add'>+{</div><div class='add'>+	struct radeon_sa_bo *sa_bo, *tmp;</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;sa_manager-&gt;sa_bo)) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "sa_manager is not empty, clearing anyway\n");</div><div class='add'>+	}</div><div class='add'>+	list_for_each_entry_safe(sa_bo, tmp, &amp;sa_manager-&gt;sa_bo, list) {</div><div class='add'>+		list_del_init(&amp;sa_bo-&gt;list);</div><div class='add'>+	}</div><div class='add'>+	radeon_bo_unref(&amp;sa_manager-&gt;bo);</div><div class='add'>+	sa_manager-&gt;size = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int radeon_sa_bo_manager_start(struct radeon_device *rdev,</div><div class='add'>+			       struct radeon_sa_manager *sa_manager)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	if (sa_manager-&gt;bo == NULL) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "no bo for sa manager\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* map the buffer */</div><div class='add'>+	r = radeon_bo_reserve(sa_manager-&gt;bo, false);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "(%d) failed to reserve manager bo\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+	r = radeon_bo_pin(sa_manager-&gt;bo, sa_manager-&gt;domain, &amp;sa_manager-&gt;gpu_addr);</div><div class='add'>+	if (r) {</div><div class='add'>+		radeon_bo_unreserve(sa_manager-&gt;bo);</div><div class='add'>+		dev_err(rdev-&gt;dev, "(%d) failed to pin manager bo\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+	r = radeon_bo_kmap(sa_manager-&gt;bo, &amp;sa_manager-&gt;cpu_ptr);</div><div class='add'>+	radeon_bo_unreserve(sa_manager-&gt;bo);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int radeon_sa_bo_manager_suspend(struct radeon_device *rdev,</div><div class='add'>+				 struct radeon_sa_manager *sa_manager)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	if (sa_manager-&gt;bo == NULL) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "no bo for sa manager\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = radeon_bo_reserve(sa_manager-&gt;bo, false);</div><div class='add'>+	if (!r) {</div><div class='add'>+		radeon_bo_kunmap(sa_manager-&gt;bo);</div><div class='add'>+		radeon_bo_unpin(sa_manager-&gt;bo);</div><div class='add'>+		radeon_bo_unreserve(sa_manager-&gt;bo);</div><div class='add'>+	}</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Principe is simple, we keep a list of sub allocation in offset</div><div class='add'>+ * order (first entry has offset == 0, last entry has the highest</div><div class='add'>+ * offset).</div><div class='add'>+ *</div><div class='add'>+ * When allocating new object we first check if there is room at</div><div class='add'>+ * the end total_size - (last_object_offset + last_object_size) &gt;=</div><div class='add'>+ * alloc_size. If so we allocate new object there.</div><div class='add'>+ *</div><div class='add'>+ * When there is not enough room at the end, we start waiting for</div><div class='add'>+ * each sub object until we reach object_offset+object_size &gt;=</div><div class='add'>+ * alloc_size, this object then become the sub object we return.</div><div class='add'>+ *</div><div class='add'>+ * Alignment can't be bigger than page size</div><div class='add'>+ */</div><div class='add'>+int radeon_sa_bo_new(struct radeon_device *rdev,</div><div class='add'>+		     struct radeon_sa_manager *sa_manager,</div><div class='add'>+		     struct radeon_sa_bo *sa_bo,</div><div class='add'>+		     unsigned size, unsigned align)</div><div class='add'>+{</div><div class='add'>+	struct radeon_sa_bo *tmp;</div><div class='add'>+	struct list_head *head;</div><div class='add'>+	unsigned offset = 0, wasted = 0;</div><div class='add'>+</div><div class='add'>+	BUG_ON(align &gt; RADEON_GPU_PAGE_SIZE);</div><div class='add'>+	BUG_ON(size &gt; sa_manager-&gt;size);</div><div class='add'>+</div><div class='add'>+	/* no one ? */</div><div class='add'>+	head = sa_manager-&gt;sa_bo.prev;</div><div class='add'>+	if (list_empty(&amp;sa_manager-&gt;sa_bo)) {</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* look for a hole big enough */</div><div class='add'>+	offset = 0;</div><div class='add'>+	list_for_each_entry(tmp, &amp;sa_manager-&gt;sa_bo, list) {</div><div class='add'>+		/* room before this object ? */</div><div class='add'>+		if ((tmp-&gt;offset - offset) &gt;= size) {</div><div class='add'>+			head = tmp-&gt;list.prev;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		offset = tmp-&gt;offset + tmp-&gt;size;</div><div class='add'>+		wasted = offset % align;</div><div class='add'>+		if (wasted) {</div><div class='add'>+			wasted = align - wasted;</div><div class='add'>+		}</div><div class='add'>+		offset += wasted;</div><div class='add'>+	}</div><div class='add'>+	/* room at the end ? */</div><div class='add'>+	head = sa_manager-&gt;sa_bo.prev;</div><div class='add'>+	tmp = list_entry(head, struct radeon_sa_bo, list);</div><div class='add'>+	offset = tmp-&gt;offset + tmp-&gt;size;</div><div class='add'>+	wasted = offset % align;</div><div class='add'>+	if (wasted) {</div><div class='add'>+		wasted = align - wasted;</div><div class='add'>+	}</div><div class='add'>+	offset += wasted;</div><div class='add'>+	if ((sa_manager-&gt;size - offset) &lt; size) {</div><div class='add'>+		/* failed to find somethings big enough */</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	sa_bo-&gt;manager = sa_manager;</div><div class='add'>+	sa_bo-&gt;offset = offset;</div><div class='add'>+	sa_bo-&gt;size = size;</div><div class='add'>+	list_add(&amp;sa_bo-&gt;list, head);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void radeon_sa_bo_free(struct radeon_device *rdev, struct radeon_sa_bo *sa_bo)</div><div class='add'>+{</div><div class='add'>+	list_del_init(&amp;sa_bo-&gt;list);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_semaphore.c b/drivers/gpu/drm/radeon/radeon_semaphore.c<br/>new file mode 100644<br/>index 000000000000..61dd4e3c9209<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_semaphore.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_semaphore.c</a></div><div class='hunk'>@@ -0,0 +1,178 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2011 Christian König.</div><div class='add'>+ * All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the</div><div class='add'>+ * "Software"), to deal in the Software without restriction, including</div><div class='add'>+ * without limitation the rights to use, copy, modify, merge, publish,</div><div class='add'>+ * distribute, sub license, and/or sell copies of the Software, and to</div><div class='add'>+ * permit persons to whom the Software is furnished to do so, subject to</div><div class='add'>+ * the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL</div><div class='add'>+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,</div><div class='add'>+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR</div><div class='add'>+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE</div><div class='add'>+ * USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the</div><div class='add'>+ * next paragraph) shall be included in all copies or substantial portions</div><div class='add'>+ * of the Software.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='add'>+ * Authors:</div><div class='add'>+ *    Christian König &lt;deathsimple@vodafone.de&gt;</div><div class='add'>+ */</div><div class='add'>+#include "drmP.h"</div><div class='add'>+#include "drm.h"</div><div class='add'>+#include "radeon.h"</div><div class='add'>+</div><div class='add'>+static int radeon_semaphore_add_bo(struct radeon_device *rdev)</div><div class='add'>+{</div><div class='add'>+	struct radeon_semaphore_bo *bo;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	uint64_t gpu_addr;</div><div class='add'>+	uint32_t *cpu_ptr;</div><div class='add'>+	int r, i;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	bo = kmalloc(sizeof(struct radeon_semaphore_bo), GFP_KERNEL);</div><div class='add'>+	if (bo == NULL) {</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	INIT_LIST_HEAD(&amp;bo-&gt;free);</div><div class='add'>+	INIT_LIST_HEAD(&amp;bo-&gt;list);</div><div class='add'>+	bo-&gt;nused = 0;</div><div class='add'>+</div><div class='add'>+	r = radeon_ib_get(rdev, 0, &amp;bo-&gt;ib, RADEON_SEMAPHORE_BO_SIZE);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed to get a bo after 5 retry\n");</div><div class='add'>+		kfree(bo);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+	gpu_addr = rdev-&gt;ib_pool.sa_manager.gpu_addr;</div><div class='add'>+	gpu_addr += bo-&gt;ib-&gt;sa_bo.offset;</div><div class='add'>+	cpu_ptr = rdev-&gt;ib_pool.sa_manager.cpu_ptr;</div><div class='add'>+	cpu_ptr += (bo-&gt;ib-&gt;sa_bo.offset &gt;&gt; 2);</div><div class='add'>+	for (i = 0; i &lt; (RADEON_SEMAPHORE_BO_SIZE/8); i++) {</div><div class='add'>+		bo-&gt;semaphores[i].gpu_addr = gpu_addr;</div><div class='add'>+		bo-&gt;semaphores[i].cpu_ptr = cpu_ptr;</div><div class='add'>+		bo-&gt;semaphores[i].bo = bo;</div><div class='add'>+		list_add_tail(&amp;bo-&gt;semaphores[i].list, &amp;bo-&gt;free);</div><div class='add'>+		gpu_addr += 8;</div><div class='add'>+		cpu_ptr += 2;</div><div class='add'>+	}</div><div class='add'>+	write_lock_irqsave(&amp;rdev-&gt;semaphore_drv.lock, irq_flags);</div><div class='add'>+	list_add_tail(&amp;bo-&gt;list, &amp;rdev-&gt;semaphore_drv.bo);</div><div class='add'>+	write_unlock_irqrestore(&amp;rdev-&gt;semaphore_drv.lock, irq_flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void radeon_semaphore_del_bo_locked(struct radeon_device *rdev,</div><div class='add'>+					   struct radeon_semaphore_bo *bo)</div><div class='add'>+{</div><div class='add'>+	radeon_sa_bo_free(rdev, &amp;bo-&gt;ib-&gt;sa_bo);</div><div class='add'>+	radeon_fence_unref(&amp;bo-&gt;ib-&gt;fence);</div><div class='add'>+	list_del(&amp;bo-&gt;list);</div><div class='add'>+	kfree(bo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void radeon_semaphore_shrink_locked(struct radeon_device *rdev)</div><div class='add'>+{</div><div class='add'>+	struct radeon_semaphore_bo *bo, *n;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;rdev-&gt;semaphore_drv.bo)) {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	/* only shrink if first bo has free semaphore */</div><div class='add'>+	bo = list_first_entry(&amp;rdev-&gt;semaphore_drv.bo, struct radeon_semaphore_bo, list);</div><div class='add'>+	if (list_empty(&amp;bo-&gt;free)) {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	list_for_each_entry_safe_continue(bo, n, &amp;rdev-&gt;semaphore_drv.bo, list) {</div><div class='add'>+		if (bo-&gt;nused)</div><div class='add'>+			continue;</div><div class='add'>+		radeon_semaphore_del_bo_locked(rdev, bo);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int radeon_semaphore_create(struct radeon_device *rdev,</div><div class='add'>+			    struct radeon_semaphore **semaphore)</div><div class='add'>+{</div><div class='add'>+	struct radeon_semaphore_bo *bo;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	bool do_retry = true;</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	*semaphore = NULL;</div><div class='add'>+	write_lock_irqsave(&amp;rdev-&gt;semaphore_drv.lock, irq_flags);</div><div class='add'>+	list_for_each_entry(bo, &amp;rdev-&gt;semaphore_drv.bo, list) {</div><div class='add'>+		if (list_empty(&amp;bo-&gt;free))</div><div class='add'>+			continue;</div><div class='add'>+		*semaphore = list_first_entry(&amp;bo-&gt;free, struct radeon_semaphore, list);</div><div class='add'>+		(*semaphore)-&gt;cpu_ptr[0] = 0;</div><div class='add'>+		(*semaphore)-&gt;cpu_ptr[1] = 0;</div><div class='add'>+		list_del(&amp;(*semaphore)-&gt;list);</div><div class='add'>+		bo-&gt;nused++;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	write_unlock_irqrestore(&amp;rdev-&gt;semaphore_drv.lock, irq_flags);</div><div class='add'>+</div><div class='add'>+	if (*semaphore == NULL) {</div><div class='add'>+		if (do_retry) {</div><div class='add'>+			do_retry = false;</div><div class='add'>+			r = radeon_semaphore_add_bo(rdev);</div><div class='add'>+			if (r)</div><div class='add'>+				return r;</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void radeon_semaphore_emit_signal(struct radeon_device *rdev, int ring,</div><div class='add'>+			          struct radeon_semaphore *semaphore)</div><div class='add'>+{</div><div class='add'>+	radeon_semaphore_ring_emit(rdev, ring, &amp;rdev-&gt;ring[ring], semaphore, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void radeon_semaphore_emit_wait(struct radeon_device *rdev, int ring,</div><div class='add'>+			        struct radeon_semaphore *semaphore)</div><div class='add'>+{</div><div class='add'>+	radeon_semaphore_ring_emit(rdev, ring, &amp;rdev-&gt;ring[ring], semaphore, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void radeon_semaphore_free(struct radeon_device *rdev,</div><div class='add'>+			   struct radeon_semaphore *semaphore)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+</div><div class='add'>+	write_lock_irqsave(&amp;rdev-&gt;semaphore_drv.lock, irq_flags);</div><div class='add'>+	semaphore-&gt;bo-&gt;nused--;</div><div class='add'>+	list_add_tail(&amp;semaphore-&gt;list, &amp;semaphore-&gt;bo-&gt;free);</div><div class='add'>+	radeon_semaphore_shrink_locked(rdev);</div><div class='add'>+	write_unlock_irqrestore(&amp;rdev-&gt;semaphore_drv.lock, irq_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void radeon_semaphore_driver_fini(struct radeon_device *rdev)</div><div class='add'>+{</div><div class='add'>+	struct radeon_semaphore_bo *bo, *n;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+</div><div class='add'>+	write_lock_irqsave(&amp;rdev-&gt;semaphore_drv.lock, irq_flags);</div><div class='add'>+	/* we force to free everything */</div><div class='add'>+	list_for_each_entry_safe(bo, n, &amp;rdev-&gt;semaphore_drv.bo, list) {</div><div class='add'>+		if (!list_empty(&amp;bo-&gt;free)) {</div><div class='add'>+			dev_err(rdev-&gt;dev, "still in use semaphore\n");</div><div class='add'>+		}</div><div class='add'>+		radeon_semaphore_del_bo_locked(rdev, bo);</div><div class='add'>+	}</div><div class='add'>+	write_unlock_irqrestore(&amp;rdev-&gt;semaphore_drv.lock, irq_flags);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_test.c b/drivers/gpu/drm/radeon/radeon_test.c<br/>index 602fa3541c45..dc5dcf483aa3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_test.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_test.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_test.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_test.c</a></div><div class='hunk'>@@ -42,7 +42,9 @@ void radeon_test_moves(struct radeon_device *rdev)</div><div class='ctx'> 	/* Number of tests =</div><div class='ctx'> 	 * (Total GTT - IB pool - writeback page - ring buffers) / test size</div><div class='ctx'> 	 */</div><div class='del'>-	n = rdev-&gt;mc.gtt_size - RADEON_IB_POOL_SIZE*64*1024 - rdev-&gt;cp.ring_size;</div><div class='add'>+	n = rdev-&gt;mc.gtt_size - RADEON_IB_POOL_SIZE*64*1024;</div><div class='add'>+	for (i = 0; i &lt; RADEON_NUM_RINGS; ++i)</div><div class='add'>+		n -= rdev-&gt;ring[i].ring_size;</div><div class='ctx'> 	if (rdev-&gt;wb.wb_obj)</div><div class='ctx'> 		n -= RADEON_GPU_PAGE_SIZE;</div><div class='ctx'> 	if (rdev-&gt;ih.ring_obj)</div><div class='hunk'>@@ -104,7 +106,7 @@ void radeon_test_moves(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> 		radeon_bo_kunmap(gtt_obj[i]);</div><div class='ctx'> </div><div class='del'>-		r = radeon_fence_create(rdev, &amp;fence);</div><div class='add'>+		r = radeon_fence_create(rdev, &amp;fence, RADEON_RING_TYPE_GFX_INDEX);</div><div class='ctx'> 		if (r) {</div><div class='ctx'> 			DRM_ERROR("Failed to create GTT-&gt;VRAM fence %d\n", i);</div><div class='ctx'> 			goto out_cleanup;</div><div class='hunk'>@@ -153,7 +155,7 @@ void radeon_test_moves(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> 		radeon_bo_kunmap(vram_obj);</div><div class='ctx'> </div><div class='del'>-		r = radeon_fence_create(rdev, &amp;fence);</div><div class='add'>+		r = radeon_fence_create(rdev, &amp;fence, RADEON_RING_TYPE_GFX_INDEX);</div><div class='ctx'> 		if (r) {</div><div class='ctx'> 			DRM_ERROR("Failed to create VRAM-&gt;GTT fence %d\n", i);</div><div class='ctx'> 			goto out_cleanup;</div><div class='hunk'>@@ -232,3 +234,264 @@ out_cleanup:</div><div class='ctx'> 		printk(KERN_WARNING "Error while testing BO move.\n");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void radeon_test_ring_sync(struct radeon_device *rdev,</div><div class='add'>+			   struct radeon_ring *ringA,</div><div class='add'>+			   struct radeon_ring *ringB)</div><div class='add'>+{</div><div class='add'>+	struct radeon_fence *fence1 = NULL, *fence2 = NULL;</div><div class='add'>+	struct radeon_semaphore *semaphore = NULL;</div><div class='add'>+	int ridxA = radeon_ring_index(rdev, ringA);</div><div class='add'>+	int ridxB = radeon_ring_index(rdev, ringB);</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = radeon_fence_create(rdev, &amp;fence1, ridxA);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to create sync fence 1\n");</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+	r = radeon_fence_create(rdev, &amp;fence2, ridxA);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to create sync fence 2\n");</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = radeon_semaphore_create(rdev, &amp;semaphore);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to create semaphore\n");</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = radeon_ring_lock(rdev, ringA, 64);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to lock ring A %d\n", ridxA);</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+	radeon_semaphore_emit_wait(rdev, ridxA, semaphore);</div><div class='add'>+	radeon_fence_emit(rdev, fence1);</div><div class='add'>+	radeon_semaphore_emit_wait(rdev, ridxA, semaphore);</div><div class='add'>+	radeon_fence_emit(rdev, fence2);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ringA);</div><div class='add'>+</div><div class='add'>+	mdelay(1000);</div><div class='add'>+</div><div class='add'>+	if (radeon_fence_signaled(fence1)) {</div><div class='add'>+		DRM_ERROR("Fence 1 signaled without waiting for semaphore.\n");</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = radeon_ring_lock(rdev, ringB, 64);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to lock ring B %p\n", ringB);</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+	radeon_semaphore_emit_signal(rdev, ridxB, semaphore);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ringB);</div><div class='add'>+</div><div class='add'>+	r = radeon_fence_wait(fence1, false);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to wait for sync fence 1\n");</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mdelay(1000);</div><div class='add'>+</div><div class='add'>+	if (radeon_fence_signaled(fence2)) {</div><div class='add'>+		DRM_ERROR("Fence 2 signaled without waiting for semaphore.\n");</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = radeon_ring_lock(rdev, ringB, 64);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to lock ring B %p\n", ringB);</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+	radeon_semaphore_emit_signal(rdev, ridxB, semaphore);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ringB);</div><div class='add'>+</div><div class='add'>+	r = radeon_fence_wait(fence2, false);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to wait for sync fence 1\n");</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_cleanup:</div><div class='add'>+	if (semaphore)</div><div class='add'>+		radeon_semaphore_free(rdev, semaphore);</div><div class='add'>+</div><div class='add'>+	if (fence1)</div><div class='add'>+		radeon_fence_unref(&amp;fence1);</div><div class='add'>+</div><div class='add'>+	if (fence2)</div><div class='add'>+		radeon_fence_unref(&amp;fence2);</div><div class='add'>+</div><div class='add'>+	if (r)</div><div class='add'>+		printk(KERN_WARNING "Error while testing ring sync (%d).\n", r);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void radeon_test_ring_sync2(struct radeon_device *rdev,</div><div class='add'>+			    struct radeon_ring *ringA,</div><div class='add'>+			    struct radeon_ring *ringB,</div><div class='add'>+			    struct radeon_ring *ringC)</div><div class='add'>+{</div><div class='add'>+	struct radeon_fence *fenceA = NULL, *fenceB = NULL;</div><div class='add'>+	struct radeon_semaphore *semaphore = NULL;</div><div class='add'>+	int ridxA = radeon_ring_index(rdev, ringA);</div><div class='add'>+	int ridxB = radeon_ring_index(rdev, ringB);</div><div class='add'>+	int ridxC = radeon_ring_index(rdev, ringC);</div><div class='add'>+	bool sigA, sigB;</div><div class='add'>+	int i, r;</div><div class='add'>+</div><div class='add'>+	r = radeon_fence_create(rdev, &amp;fenceA, ridxA);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to create sync fence 1\n");</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+	r = radeon_fence_create(rdev, &amp;fenceB, ridxB);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to create sync fence 2\n");</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = radeon_semaphore_create(rdev, &amp;semaphore);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to create semaphore\n");</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = radeon_ring_lock(rdev, ringA, 64);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to lock ring A %d\n", ridxA);</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+	radeon_semaphore_emit_wait(rdev, ridxA, semaphore);</div><div class='add'>+	radeon_fence_emit(rdev, fenceA);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ringA);</div><div class='add'>+</div><div class='add'>+	r = radeon_ring_lock(rdev, ringB, 64);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to lock ring B %d\n", ridxB);</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+	radeon_semaphore_emit_wait(rdev, ridxB, semaphore);</div><div class='add'>+	radeon_fence_emit(rdev, fenceB);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ringB);</div><div class='add'>+</div><div class='add'>+	mdelay(1000);</div><div class='add'>+</div><div class='add'>+	if (radeon_fence_signaled(fenceA)) {</div><div class='add'>+		DRM_ERROR("Fence A signaled without waiting for semaphore.\n");</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+	if (radeon_fence_signaled(fenceB)) {</div><div class='add'>+		DRM_ERROR("Fence A signaled without waiting for semaphore.\n");</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = radeon_ring_lock(rdev, ringC, 64);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to lock ring B %p\n", ringC);</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+	radeon_semaphore_emit_signal(rdev, ridxC, semaphore);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ringC);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 30; ++i) {</div><div class='add'>+		mdelay(100);</div><div class='add'>+		sigA = radeon_fence_signaled(fenceA);</div><div class='add'>+		sigB = radeon_fence_signaled(fenceB);</div><div class='add'>+		if (sigA || sigB)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!sigA &amp;&amp; !sigB) {</div><div class='add'>+		DRM_ERROR("Neither fence A nor B has been signaled\n");</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	} else if (sigA &amp;&amp; sigB) {</div><div class='add'>+		DRM_ERROR("Both fence A and B has been signaled\n");</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DRM_INFO("Fence %c was first signaled\n", sigA ? 'A' : 'B');</div><div class='add'>+</div><div class='add'>+	r = radeon_ring_lock(rdev, ringC, 64);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to lock ring B %p\n", ringC);</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+	radeon_semaphore_emit_signal(rdev, ridxC, semaphore);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ringC);</div><div class='add'>+</div><div class='add'>+	mdelay(1000);</div><div class='add'>+</div><div class='add'>+	r = radeon_fence_wait(fenceA, false);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to wait for sync fence A\n");</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+	r = radeon_fence_wait(fenceB, false);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("Failed to wait for sync fence B\n");</div><div class='add'>+		goto out_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_cleanup:</div><div class='add'>+	if (semaphore)</div><div class='add'>+		radeon_semaphore_free(rdev, semaphore);</div><div class='add'>+</div><div class='add'>+	if (fenceA)</div><div class='add'>+		radeon_fence_unref(&amp;fenceA);</div><div class='add'>+</div><div class='add'>+	if (fenceB)</div><div class='add'>+		radeon_fence_unref(&amp;fenceB);</div><div class='add'>+</div><div class='add'>+	if (r)</div><div class='add'>+		printk(KERN_WARNING "Error while testing ring sync (%d).\n", r);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void radeon_test_syncing(struct radeon_device *rdev)</div><div class='add'>+{</div><div class='add'>+	int i, j, k;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; RADEON_NUM_RINGS; ++i) {</div><div class='add'>+		struct radeon_ring *ringA = &amp;rdev-&gt;ring[i];</div><div class='add'>+		if (!ringA-&gt;ready)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; i; ++j) {</div><div class='add'>+			struct radeon_ring *ringB = &amp;rdev-&gt;ring[j];</div><div class='add'>+			if (!ringB-&gt;ready)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			DRM_INFO("Testing syncing between rings %d and %d...\n", i, j);</div><div class='add'>+			radeon_test_ring_sync(rdev, ringA, ringB);</div><div class='add'>+</div><div class='add'>+			DRM_INFO("Testing syncing between rings %d and %d...\n", j, i);</div><div class='add'>+			radeon_test_ring_sync(rdev, ringB, ringA);</div><div class='add'>+</div><div class='add'>+			for (k = 0; k &lt; j; ++k) {</div><div class='add'>+				struct radeon_ring *ringC = &amp;rdev-&gt;ring[k];</div><div class='add'>+				if (!ringC-&gt;ready)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				DRM_INFO("Testing syncing between rings %d, %d and %d...\n", i, j, k);</div><div class='add'>+				radeon_test_ring_sync2(rdev, ringA, ringB, ringC);</div><div class='add'>+</div><div class='add'>+				DRM_INFO("Testing syncing between rings %d, %d and %d...\n", i, k, j);</div><div class='add'>+				radeon_test_ring_sync2(rdev, ringA, ringC, ringB);</div><div class='add'>+</div><div class='add'>+				DRM_INFO("Testing syncing between rings %d, %d and %d...\n", j, i, k);</div><div class='add'>+				radeon_test_ring_sync2(rdev, ringB, ringA, ringC);</div><div class='add'>+</div><div class='add'>+				DRM_INFO("Testing syncing between rings %d, %d and %d...\n", j, k, i);</div><div class='add'>+				radeon_test_ring_sync2(rdev, ringB, ringC, ringA);</div><div class='add'>+</div><div class='add'>+				DRM_INFO("Testing syncing between rings %d, %d and %d...\n", k, i, j);</div><div class='add'>+				radeon_test_ring_sync2(rdev, ringC, ringA, ringB);</div><div class='add'>+</div><div class='add'>+				DRM_INFO("Testing syncing between rings %d, %d and %d...\n", k, j, i);</div><div class='add'>+				radeon_test_ring_sync2(rdev, ringC, ringB, ringA);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c<br/>index 0b5468bfaf54..c421e77ace71 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_ttm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/radeon_ttm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/radeon_ttm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/radeon_ttm.c</a></div><div class='hunk'>@@ -114,24 +114,6 @@ static void radeon_ttm_global_fini(struct radeon_device *rdev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct ttm_backend *radeon_ttm_backend_create(struct radeon_device *rdev);</div><div class='del'>-</div><div class='del'>-static struct ttm_backend*</div><div class='del'>-radeon_create_ttm_backend_entry(struct ttm_bo_device *bdev)</div><div class='del'>-{</div><div class='del'>-	struct radeon_device *rdev;</div><div class='del'>-</div><div class='del'>-	rdev = radeon_get_rdev(bdev);</div><div class='del'>-#if __OS_HAS_AGP</div><div class='del'>-	if (rdev-&gt;flags &amp; RADEON_IS_AGP) {</div><div class='del'>-		return ttm_agp_backend_init(bdev, rdev-&gt;ddev-&gt;agp-&gt;bridge);</div><div class='del'>-	} else</div><div class='del'>-#endif</div><div class='del'>-	{</div><div class='del'>-		return radeon_ttm_backend_create(rdev);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int radeon_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -206,7 +188,7 @@ static void radeon_evict_flags(struct ttm_buffer_object *bo,</div><div class='ctx'> 	rbo = container_of(bo, struct radeon_bo, tbo);</div><div class='ctx'> 	switch (bo-&gt;mem.mem_type) {</div><div class='ctx'> 	case TTM_PL_VRAM:</div><div class='del'>-		if (rbo-&gt;rdev-&gt;cp.ready == false)</div><div class='add'>+		if (rbo-&gt;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX].ready == false)</div><div class='ctx'> 			radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_CPU);</div><div class='ctx'> 		else</div><div class='ctx'> 			radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_GTT);</div><div class='hunk'>@@ -241,10 +223,10 @@ static int radeon_move_blit(struct ttm_buffer_object *bo,</div><div class='ctx'> 	struct radeon_device *rdev;</div><div class='ctx'> 	uint64_t old_start, new_start;</div><div class='ctx'> 	struct radeon_fence *fence;</div><div class='del'>-	int r;</div><div class='add'>+	int r, i;</div><div class='ctx'> </div><div class='ctx'> 	rdev = radeon_get_rdev(bo-&gt;bdev);</div><div class='del'>-	r = radeon_fence_create(rdev, &amp;fence);</div><div class='add'>+	r = radeon_fence_create(rdev, &amp;fence, rdev-&gt;copy_ring);</div><div class='ctx'> 	if (unlikely(r)) {</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -273,13 +255,43 @@ static int radeon_move_blit(struct ttm_buffer_object *bo,</div><div class='ctx'> 		DRM_ERROR("Unknown placement %d\n", old_mem-&gt;mem_type);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	if (!rdev-&gt;cp.ready) {</div><div class='del'>-		DRM_ERROR("Trying to move memory with CP turned off.\n");</div><div class='add'>+	if (!rdev-&gt;ring[rdev-&gt;copy_ring].ready) {</div><div class='add'>+		DRM_ERROR("Trying to move memory with ring turned off.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON((PAGE_SIZE % RADEON_GPU_PAGE_SIZE) != 0);</div><div class='ctx'> </div><div class='add'>+	/* sync other rings */</div><div class='add'>+	if (rdev-&gt;family &gt;= CHIP_R600) {</div><div class='add'>+		for (i = 0; i &lt; RADEON_NUM_RINGS; ++i) {</div><div class='add'>+			/* no need to sync to our own or unused rings */</div><div class='add'>+			if (i == rdev-&gt;copy_ring || !rdev-&gt;ring[i].ready)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (!fence-&gt;semaphore) {</div><div class='add'>+				r = radeon_semaphore_create(rdev, &amp;fence-&gt;semaphore);</div><div class='add'>+				/* FIXME: handle semaphore error */</div><div class='add'>+				if (r)</div><div class='add'>+					continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			r = radeon_ring_lock(rdev, &amp;rdev-&gt;ring[i], 3);</div><div class='add'>+			/* FIXME: handle ring lock error */</div><div class='add'>+			if (r)</div><div class='add'>+				continue;</div><div class='add'>+			radeon_semaphore_emit_signal(rdev, i, fence-&gt;semaphore);</div><div class='add'>+			radeon_ring_unlock_commit(rdev, &amp;rdev-&gt;ring[i]);</div><div class='add'>+</div><div class='add'>+			r = radeon_ring_lock(rdev, &amp;rdev-&gt;ring[rdev-&gt;copy_ring], 3);</div><div class='add'>+			/* FIXME: handle ring lock error */</div><div class='add'>+			if (r)</div><div class='add'>+				continue;</div><div class='add'>+			radeon_semaphore_emit_wait(rdev, rdev-&gt;copy_ring, fence-&gt;semaphore);</div><div class='add'>+			radeon_ring_unlock_commit(rdev, &amp;rdev-&gt;ring[rdev-&gt;copy_ring]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	r = radeon_copy(rdev, old_start, new_start,</div><div class='ctx'> 			new_mem-&gt;num_pages * (PAGE_SIZE / RADEON_GPU_PAGE_SIZE), /* GPU pages */</div><div class='ctx'> 			fence);</div><div class='hunk'>@@ -398,7 +410,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo,</div><div class='ctx'> 		radeon_move_null(bo, new_mem);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	if (!rdev-&gt;cp.ready || rdev-&gt;asic-&gt;copy == NULL) {</div><div class='add'>+	if (!rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX].ready || rdev-&gt;asic-&gt;copy == NULL) {</div><div class='ctx'> 		/* use memcpy */</div><div class='ctx'> 		goto memcpy;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -515,8 +527,166 @@ static bool radeon_sync_obj_signaled(void *sync_obj, void *sync_arg)</div><div class='ctx'> 	return radeon_fence_signaled((struct radeon_fence *)sync_obj);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * TTM backend functions.</div><div class='add'>+ */</div><div class='add'>+struct radeon_ttm_tt {</div><div class='add'>+	struct ttm_dma_tt		ttm;</div><div class='add'>+	struct radeon_device		*rdev;</div><div class='add'>+	u64				offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int radeon_ttm_backend_bind(struct ttm_tt *ttm,</div><div class='add'>+				   struct ttm_mem_reg *bo_mem)</div><div class='add'>+{</div><div class='add'>+	struct radeon_ttm_tt *gtt = (void*)ttm;</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	gtt-&gt;offset = (unsigned long)(bo_mem-&gt;start &lt;&lt; PAGE_SHIFT);</div><div class='add'>+	if (!ttm-&gt;num_pages) {</div><div class='add'>+		WARN(1, "nothing to bind %lu pages for mreg %p back %p!\n",</div><div class='add'>+		     ttm-&gt;num_pages, bo_mem, ttm);</div><div class='add'>+	}</div><div class='add'>+	r = radeon_gart_bind(gtt-&gt;rdev, gtt-&gt;offset,</div><div class='add'>+			     ttm-&gt;num_pages, ttm-&gt;pages, gtt-&gt;ttm.dma_address);</div><div class='add'>+	if (r) {</div><div class='add'>+		DRM_ERROR("failed to bind %lu pages at 0x%08X\n",</div><div class='add'>+			  ttm-&gt;num_pages, (unsigned)gtt-&gt;offset);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int radeon_ttm_backend_unbind(struct ttm_tt *ttm)</div><div class='add'>+{</div><div class='add'>+	struct radeon_ttm_tt *gtt = (void *)ttm;</div><div class='add'>+</div><div class='add'>+	radeon_gart_unbind(gtt-&gt;rdev, gtt-&gt;offset, ttm-&gt;num_pages);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void radeon_ttm_backend_destroy(struct ttm_tt *ttm)</div><div class='add'>+{</div><div class='add'>+	struct radeon_ttm_tt *gtt = (void *)ttm;</div><div class='add'>+</div><div class='add'>+	ttm_dma_tt_fini(&amp;gtt-&gt;ttm);</div><div class='add'>+	kfree(gtt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ttm_backend_func radeon_backend_func = {</div><div class='add'>+	.bind = &amp;radeon_ttm_backend_bind,</div><div class='add'>+	.unbind = &amp;radeon_ttm_backend_unbind,</div><div class='add'>+	.destroy = &amp;radeon_ttm_backend_destroy,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ttm_tt *radeon_ttm_tt_create(struct ttm_bo_device *bdev,</div><div class='add'>+				    unsigned long size, uint32_t page_flags,</div><div class='add'>+				    struct page *dummy_read_page)</div><div class='add'>+{</div><div class='add'>+	struct radeon_device *rdev;</div><div class='add'>+	struct radeon_ttm_tt *gtt;</div><div class='add'>+</div><div class='add'>+	rdev = radeon_get_rdev(bdev);</div><div class='add'>+#if __OS_HAS_AGP</div><div class='add'>+	if (rdev-&gt;flags &amp; RADEON_IS_AGP) {</div><div class='add'>+		return ttm_agp_tt_create(bdev, rdev-&gt;ddev-&gt;agp-&gt;bridge,</div><div class='add'>+					 size, page_flags, dummy_read_page);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	gtt = kzalloc(sizeof(struct radeon_ttm_tt), GFP_KERNEL);</div><div class='add'>+	if (gtt == NULL) {</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	gtt-&gt;ttm.ttm.func = &amp;radeon_backend_func;</div><div class='add'>+	gtt-&gt;rdev = rdev;</div><div class='add'>+	if (ttm_dma_tt_init(&amp;gtt-&gt;ttm, bdev, size, page_flags, dummy_read_page)) {</div><div class='add'>+		kfree(gtt);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	return &amp;gtt-&gt;ttm.ttm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int radeon_ttm_tt_populate(struct ttm_tt *ttm)</div><div class='add'>+{</div><div class='add'>+	struct radeon_device *rdev;</div><div class='add'>+	struct radeon_ttm_tt *gtt = (void *)ttm;</div><div class='add'>+	unsigned i;</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	if (ttm-&gt;state != tt_unpopulated)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rdev = radeon_get_rdev(ttm-&gt;bdev);</div><div class='add'>+#if __OS_HAS_AGP</div><div class='add'>+	if (rdev-&gt;flags &amp; RADEON_IS_AGP) {</div><div class='add'>+		return ttm_agp_tt_populate(ttm);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SWIOTLB</div><div class='add'>+	if (swiotlb_nr_tbl()) {</div><div class='add'>+		return ttm_dma_populate(&amp;gtt-&gt;ttm, rdev-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	r = ttm_pool_populate(ttm);</div><div class='add'>+	if (r) {</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ttm-&gt;num_pages; i++) {</div><div class='add'>+		gtt-&gt;ttm.dma_address[i] = pci_map_page(rdev-&gt;pdev, ttm-&gt;pages[i],</div><div class='add'>+						       0, PAGE_SIZE,</div><div class='add'>+						       PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+		if (pci_dma_mapping_error(rdev-&gt;pdev, gtt-&gt;ttm.dma_address[i])) {</div><div class='add'>+			while (--i) {</div><div class='add'>+				pci_unmap_page(rdev-&gt;pdev, gtt-&gt;ttm.dma_address[i],</div><div class='add'>+					       PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+				gtt-&gt;ttm.dma_address[i] = 0;</div><div class='add'>+			}</div><div class='add'>+			ttm_pool_unpopulate(ttm);</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 void radeon_ttm_tt_unpopulate(struct ttm_tt *ttm)</div><div class='add'>+{</div><div class='add'>+	struct radeon_device *rdev;</div><div class='add'>+	struct radeon_ttm_tt *gtt = (void *)ttm;</div><div class='add'>+	unsigned i;</div><div class='add'>+</div><div class='add'>+	rdev = radeon_get_rdev(ttm-&gt;bdev);</div><div class='add'>+#if __OS_HAS_AGP</div><div class='add'>+	if (rdev-&gt;flags &amp; RADEON_IS_AGP) {</div><div class='add'>+		ttm_agp_tt_unpopulate(ttm);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SWIOTLB</div><div class='add'>+	if (swiotlb_nr_tbl()) {</div><div class='add'>+		ttm_dma_unpopulate(&amp;gtt-&gt;ttm, rdev-&gt;dev);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ttm-&gt;num_pages; i++) {</div><div class='add'>+		if (gtt-&gt;ttm.dma_address[i]) {</div><div class='add'>+			pci_unmap_page(rdev-&gt;pdev, gtt-&gt;ttm.dma_address[i],</div><div class='add'>+				       PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ttm_pool_unpopulate(ttm);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct ttm_bo_driver radeon_bo_driver = {</div><div class='del'>-	.create_ttm_backend_entry = &amp;radeon_create_ttm_backend_entry,</div><div class='add'>+	.ttm_tt_create = &amp;radeon_ttm_tt_create,</div><div class='add'>+	.ttm_tt_populate = &amp;radeon_ttm_tt_populate,</div><div class='add'>+	.ttm_tt_unpopulate = &amp;radeon_ttm_tt_unpopulate,</div><div class='ctx'> 	.invalidate_caches = &amp;radeon_invalidate_caches,</div><div class='ctx'> 	.init_mem_type = &amp;radeon_init_mem_type,</div><div class='ctx'> 	.evict_flags = &amp;radeon_evict_flags,</div><div class='hunk'>@@ -680,124 +850,6 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * TTM backend functions.</div><div class='del'>- */</div><div class='del'>-struct radeon_ttm_backend {</div><div class='del'>-	struct ttm_backend		backend;</div><div class='del'>-	struct radeon_device		*rdev;</div><div class='del'>-	unsigned long			num_pages;</div><div class='del'>-	struct page			**pages;</div><div class='del'>-	struct page			*dummy_read_page;</div><div class='del'>-	dma_addr_t			*dma_addrs;</div><div class='del'>-	bool				populated;</div><div class='del'>-	bool				bound;</div><div class='del'>-	unsigned			offset;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int radeon_ttm_backend_populate(struct ttm_backend *backend,</div><div class='del'>-				       unsigned long num_pages,</div><div class='del'>-				       struct page **pages,</div><div class='del'>-				       struct page *dummy_read_page,</div><div class='del'>-				       dma_addr_t *dma_addrs)</div><div class='del'>-{</div><div class='del'>-	struct radeon_ttm_backend *gtt;</div><div class='del'>-</div><div class='del'>-	gtt = container_of(backend, struct radeon_ttm_backend, backend);</div><div class='del'>-	gtt-&gt;pages = pages;</div><div class='del'>-	gtt-&gt;dma_addrs = dma_addrs;</div><div class='del'>-	gtt-&gt;num_pages = num_pages;</div><div class='del'>-	gtt-&gt;dummy_read_page = dummy_read_page;</div><div class='del'>-	gtt-&gt;populated = true;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void radeon_ttm_backend_clear(struct ttm_backend *backend)</div><div class='del'>-{</div><div class='del'>-	struct radeon_ttm_backend *gtt;</div><div class='del'>-</div><div class='del'>-	gtt = container_of(backend, struct radeon_ttm_backend, backend);</div><div class='del'>-	gtt-&gt;pages = NULL;</div><div class='del'>-	gtt-&gt;dma_addrs = NULL;</div><div class='del'>-	gtt-&gt;num_pages = 0;</div><div class='del'>-	gtt-&gt;dummy_read_page = NULL;</div><div class='del'>-	gtt-&gt;populated = false;</div><div class='del'>-	gtt-&gt;bound = false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int radeon_ttm_backend_bind(struct ttm_backend *backend,</div><div class='del'>-				   struct ttm_mem_reg *bo_mem)</div><div class='del'>-{</div><div class='del'>-	struct radeon_ttm_backend *gtt;</div><div class='del'>-	int r;</div><div class='del'>-</div><div class='del'>-	gtt = container_of(backend, struct radeon_ttm_backend, backend);</div><div class='del'>-	gtt-&gt;offset = bo_mem-&gt;start &lt;&lt; PAGE_SHIFT;</div><div class='del'>-	if (!gtt-&gt;num_pages) {</div><div class='del'>-		WARN(1, "nothing to bind %lu pages for mreg %p back %p!\n",</div><div class='del'>-		     gtt-&gt;num_pages, bo_mem, backend);</div><div class='del'>-	}</div><div class='del'>-	r = radeon_gart_bind(gtt-&gt;rdev, gtt-&gt;offset,</div><div class='del'>-			     gtt-&gt;num_pages, gtt-&gt;pages, gtt-&gt;dma_addrs);</div><div class='del'>-	if (r) {</div><div class='del'>-		DRM_ERROR("failed to bind %lu pages at 0x%08X\n",</div><div class='del'>-			  gtt-&gt;num_pages, gtt-&gt;offset);</div><div class='del'>-		return r;</div><div class='del'>-	}</div><div class='del'>-	gtt-&gt;bound = true;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int radeon_ttm_backend_unbind(struct ttm_backend *backend)</div><div class='del'>-{</div><div class='del'>-	struct radeon_ttm_backend *gtt;</div><div class='del'>-</div><div class='del'>-	gtt = container_of(backend, struct radeon_ttm_backend, backend);</div><div class='del'>-	radeon_gart_unbind(gtt-&gt;rdev, gtt-&gt;offset, gtt-&gt;num_pages);</div><div class='del'>-	gtt-&gt;bound = false;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void radeon_ttm_backend_destroy(struct ttm_backend *backend)</div><div class='del'>-{</div><div class='del'>-	struct radeon_ttm_backend *gtt;</div><div class='del'>-</div><div class='del'>-	gtt = container_of(backend, struct radeon_ttm_backend, backend);</div><div class='del'>-	if (gtt-&gt;bound) {</div><div class='del'>-		radeon_ttm_backend_unbind(backend);</div><div class='del'>-	}</div><div class='del'>-	kfree(gtt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct ttm_backend_func radeon_backend_func = {</div><div class='del'>-	.populate = &amp;radeon_ttm_backend_populate,</div><div class='del'>-	.clear = &amp;radeon_ttm_backend_clear,</div><div class='del'>-	.bind = &amp;radeon_ttm_backend_bind,</div><div class='del'>-	.unbind = &amp;radeon_ttm_backend_unbind,</div><div class='del'>-	.destroy = &amp;radeon_ttm_backend_destroy,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ttm_backend *radeon_ttm_backend_create(struct radeon_device *rdev)</div><div class='del'>-{</div><div class='del'>-	struct radeon_ttm_backend *gtt;</div><div class='del'>-</div><div class='del'>-	gtt = kzalloc(sizeof(struct radeon_ttm_backend), GFP_KERNEL);</div><div class='del'>-	if (gtt == NULL) {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	gtt-&gt;backend.bdev = &amp;rdev-&gt;mman.bdev;</div><div class='del'>-	gtt-&gt;backend.flags = 0;</div><div class='del'>-	gtt-&gt;backend.func = &amp;radeon_backend_func;</div><div class='del'>-	gtt-&gt;rdev = rdev;</div><div class='del'>-	gtt-&gt;pages = NULL;</div><div class='del'>-	gtt-&gt;num_pages = 0;</div><div class='del'>-	gtt-&gt;dummy_read_page = NULL;</div><div class='del'>-	gtt-&gt;populated = false;</div><div class='del'>-	gtt-&gt;bound = false;</div><div class='del'>-	return &amp;gtt-&gt;backend;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define RADEON_DEBUGFS_MEM_TYPES 2</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_DEBUG_FS)</div><div class='hunk'>@@ -820,8 +872,8 @@ static int radeon_mm_dump_table(struct seq_file *m, void *data)</div><div class='ctx'> static int radeon_ttm_debugfs_init(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='ctx'> #if defined(CONFIG_DEBUG_FS)</div><div class='del'>-	static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+1];</div><div class='del'>-	static char radeon_mem_types_names[RADEON_DEBUGFS_MEM_TYPES+1][32];</div><div class='add'>+	static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+2];</div><div class='add'>+	static char radeon_mem_types_names[RADEON_DEBUGFS_MEM_TYPES+2][32];</div><div class='ctx'> 	unsigned i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; RADEON_DEBUGFS_MEM_TYPES; i++) {</div><div class='hunk'>@@ -843,8 +895,17 @@ static int radeon_ttm_debugfs_init(struct radeon_device *rdev)</div><div class='ctx'> 	radeon_mem_types_list[i].name = radeon_mem_types_names[i];</div><div class='ctx'> 	radeon_mem_types_list[i].show = &amp;ttm_page_alloc_debugfs;</div><div class='ctx'> 	radeon_mem_types_list[i].driver_features = 0;</div><div class='del'>-	radeon_mem_types_list[i].data = NULL;</div><div class='del'>-	return radeon_debugfs_add_files(rdev, radeon_mem_types_list, RADEON_DEBUGFS_MEM_TYPES+1);</div><div class='add'>+	radeon_mem_types_list[i++].data = NULL;</div><div class='add'>+#ifdef CONFIG_SWIOTLB</div><div class='add'>+	if (swiotlb_nr_tbl()) {</div><div class='add'>+		sprintf(radeon_mem_types_names[i], "ttm_dma_page_pool");</div><div class='add'>+		radeon_mem_types_list[i].name = radeon_mem_types_names[i];</div><div class='add'>+		radeon_mem_types_list[i].show = &amp;ttm_dma_page_alloc_debugfs;</div><div class='add'>+		radeon_mem_types_list[i].driver_features = 0;</div><div class='add'>+		radeon_mem_types_list[i++].data = NULL;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return radeon_debugfs_add_files(rdev, radeon_mem_types_list, i);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c<br/>index 06b90c87f8f3..b0ce84a20a68 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/rs400.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/rs400.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/rs400.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/rs400.c</a></div><div class='hunk'>@@ -410,6 +410,12 @@ static int rs400_startup(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_fence_driver_start_ring(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed initializing CP fences (%d).\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Enable IRQ */</div><div class='ctx'> 	r100_irq_set(rdev);</div><div class='ctx'> 	rdev-&gt;config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);</div><div class='hunk'>@@ -419,11 +425,18 @@ static int rs400_startup(struct radeon_device *rdev)</div><div class='ctx'> 		dev_err(rdev-&gt;dev, "failed initializing CP (%d).\n", r);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-	r = r100_ib_init(rdev);</div><div class='add'>+</div><div class='add'>+	r = radeon_ib_pool_start(rdev);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	r = r100_ib_test(rdev);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		dev_err(rdev-&gt;dev, "failed initializing IB (%d).\n", r);</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed testing IB (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='ctx'> 		return r;</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'>@@ -447,11 +460,14 @@ int rs400_resume(struct radeon_device *rdev)</div><div class='ctx'> 	r300_clock_startup(rdev);</div><div class='ctx'> 	/* Initialize surface registers */</div><div class='ctx'> 	radeon_surface_init(rdev);</div><div class='add'>+</div><div class='add'>+	rdev-&gt;accel_working = true;</div><div class='ctx'> 	return rs400_startup(rdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int rs400_suspend(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	radeon_ib_pool_suspend(rdev);</div><div class='ctx'> 	r100_cp_disable(rdev);</div><div class='ctx'> 	radeon_wb_disable(rdev);</div><div class='ctx'> 	r100_irq_disable(rdev);</div><div class='hunk'>@@ -530,7 +546,14 @@ int rs400_init(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> 	r300_set_reg_safe(rdev);</div><div class='add'>+</div><div class='add'>+	r = radeon_ib_pool_init(rdev);</div><div class='ctx'> 	rdev-&gt;accel_working = true;</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "IB initialization failed (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	r = rs400_startup(rdev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		/* Somethings want wront with the accel init stop accel */</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c<br/>index b1053d640423..ec46eb45e34c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/rs600.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/rs600.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/rs600.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/rs600.c</a></div><div class='hunk'>@@ -322,16 +322,6 @@ void rs600_hpd_fini(struct radeon_device *rdev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void rs600_bm_disable(struct radeon_device *rdev)</div><div class='del'>-{</div><div class='del'>-	u32 tmp;</div><div class='del'>-</div><div class='del'>-	/* disable bus mastering */</div><div class='del'>-	pci_read_config_word(rdev-&gt;pdev, 0x4, (u16*)&amp;tmp);</div><div class='del'>-	pci_write_config_word(rdev-&gt;pdev, 0x4, tmp &amp; 0xFFFB);</div><div class='del'>-	mdelay(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int rs600_asic_reset(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct rv515_mc_save save;</div><div class='hunk'>@@ -355,7 +345,8 @@ int rs600_asic_reset(struct radeon_device *rdev)</div><div class='ctx'> 	WREG32(RADEON_CP_RB_CNTL, tmp);</div><div class='ctx'> 	pci_save_state(rdev-&gt;pdev);</div><div class='ctx'> 	/* disable bus mastering */</div><div class='del'>-	rs600_bm_disable(rdev);</div><div class='add'>+	pci_clear_master(rdev-&gt;pdev);</div><div class='add'>+	mdelay(1);</div><div class='ctx'> 	/* reset GA+VAP */</div><div class='ctx'> 	WREG32(R_0000F0_RBBM_SOFT_RESET, S_0000F0_SOFT_RESET_VAP(1) |</div><div class='ctx'> 					S_0000F0_SOFT_RESET_GA(1));</div><div class='hunk'>@@ -549,7 +540,7 @@ int rs600_irq_set(struct radeon_device *rdev)</div><div class='ctx'> 		WREG32(R_000040_GEN_INT_CNTL, 0);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	if (rdev-&gt;irq.sw_int) {</div><div class='add'>+	if (rdev-&gt;irq.sw_int[RADEON_RING_TYPE_GFX_INDEX]) {</div><div class='ctx'> 		tmp |= S_000040_SW_INT_EN(1);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rdev-&gt;irq.gui_idle) {</div><div class='hunk'>@@ -642,7 +633,7 @@ int rs600_irq_process(struct radeon_device *rdev)</div><div class='ctx'> 	while (status || rdev-&gt;irq.stat_regs.r500.disp_int) {</div><div class='ctx'> 		/* SW interrupt */</div><div class='ctx'> 		if (G_000044_SW_INT(status)) {</div><div class='del'>-			radeon_fence_process(rdev);</div><div class='add'>+			radeon_fence_process(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* GUI idle */</div><div class='ctx'> 		if (G_000040_GUI_IDLE(status)) {</div><div class='hunk'>@@ -849,6 +840,12 @@ static int rs600_startup(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_fence_driver_start_ring(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed initializing CP fences (%d).\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Enable IRQ */</div><div class='ctx'> 	rs600_irq_set(rdev);</div><div class='ctx'> 	rdev-&gt;config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);</div><div class='hunk'>@@ -858,15 +855,21 @@ static int rs600_startup(struct radeon_device *rdev)</div><div class='ctx'> 		dev_err(rdev-&gt;dev, "failed initializing CP (%d).\n", r);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-	r = r100_ib_init(rdev);</div><div class='add'>+</div><div class='add'>+	r = r600_audio_init(rdev);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		dev_err(rdev-&gt;dev, "failed initializing IB (%d).\n", r);</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed initializing audio\n");</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	r = r600_audio_init(rdev);</div><div class='add'>+	r = radeon_ib_pool_start(rdev);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	r = r100_ib_test(rdev);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		dev_err(rdev-&gt;dev, "failed initializing audio\n");</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed testing IB (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -891,11 +894,14 @@ int rs600_resume(struct radeon_device *rdev)</div><div class='ctx'> 	rv515_clock_startup(rdev);</div><div class='ctx'> 	/* Initialize surface registers */</div><div class='ctx'> 	radeon_surface_init(rdev);</div><div class='add'>+</div><div class='add'>+	rdev-&gt;accel_working = true;</div><div class='ctx'> 	return rs600_startup(rdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int rs600_suspend(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	radeon_ib_pool_suspend(rdev);</div><div class='ctx'> 	r600_audio_fini(rdev);</div><div class='ctx'> 	r100_cp_disable(rdev);</div><div class='ctx'> 	radeon_wb_disable(rdev);</div><div class='hunk'>@@ -976,7 +982,14 @@ int rs600_init(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> 	rs600_set_safe_registers(rdev);</div><div class='add'>+</div><div class='add'>+	r = radeon_ib_pool_init(rdev);</div><div class='ctx'> 	rdev-&gt;accel_working = true;</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "IB initialization failed (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	r = rs600_startup(rdev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		/* Somethings want wront with the accel init stop accel */</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c<br/>index a9049ed1a519..4f24a0fa8c82 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/rs690.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/rs690.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/rs690.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/rs690.c</a></div><div class='hunk'>@@ -621,6 +621,12 @@ static int rs690_startup(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_fence_driver_start_ring(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed initializing CP fences (%d).\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Enable IRQ */</div><div class='ctx'> 	rs600_irq_set(rdev);</div><div class='ctx'> 	rdev-&gt;config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);</div><div class='hunk'>@@ -630,15 +636,21 @@ static int rs690_startup(struct radeon_device *rdev)</div><div class='ctx'> 		dev_err(rdev-&gt;dev, "failed initializing CP (%d).\n", r);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-	r = r100_ib_init(rdev);</div><div class='add'>+</div><div class='add'>+	r = r600_audio_init(rdev);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		dev_err(rdev-&gt;dev, "failed initializing IB (%d).\n", r);</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed initializing audio\n");</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	r = r600_audio_init(rdev);</div><div class='add'>+	r = radeon_ib_pool_start(rdev);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	r = r100_ib_test(rdev);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		dev_err(rdev-&gt;dev, "failed initializing audio\n");</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed testing IB (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -663,11 +675,14 @@ int rs690_resume(struct radeon_device *rdev)</div><div class='ctx'> 	rv515_clock_startup(rdev);</div><div class='ctx'> 	/* Initialize surface registers */</div><div class='ctx'> 	radeon_surface_init(rdev);</div><div class='add'>+</div><div class='add'>+	rdev-&gt;accel_working = true;</div><div class='ctx'> 	return rs690_startup(rdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int rs690_suspend(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	radeon_ib_pool_suspend(rdev);</div><div class='ctx'> 	r600_audio_fini(rdev);</div><div class='ctx'> 	r100_cp_disable(rdev);</div><div class='ctx'> 	radeon_wb_disable(rdev);</div><div class='hunk'>@@ -749,7 +764,14 @@ int rs690_init(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> 	rs600_set_safe_registers(rdev);</div><div class='add'>+</div><div class='add'>+	r = radeon_ib_pool_init(rdev);</div><div class='ctx'> 	rdev-&gt;accel_working = true;</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "IB initialization failed (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	r = rs690_startup(rdev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		/* Somethings want wront with the accel init stop accel */</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c<br/>index 6613ee9ecca3..880637fd1946 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/rv515.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/rv515.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/rv515.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/rv515.c</a></div><div class='hunk'>@@ -55,44 +55,45 @@ void rv515_debugfs(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> void rv515_ring_start(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	r = radeon_ring_lock(rdev, 64);</div><div class='add'>+	r = radeon_ring_lock(rdev, ring, 64);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(ISYNC_CNTL, 0));</div><div class='del'>-	radeon_ring_write(rdev,</div><div class='add'>+	radeon_ring_write(ring, PACKET0(ISYNC_CNTL, 0));</div><div class='add'>+	radeon_ring_write(ring,</div><div class='ctx'> 			  ISYNC_ANY2D_IDLE3D |</div><div class='ctx'> 			  ISYNC_ANY3D_IDLE2D |</div><div class='ctx'> 			  ISYNC_WAIT_IDLEGUI |</div><div class='ctx'> 			  ISYNC_CPSCRATCH_IDLEGUI);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(WAIT_UNTIL, 0));</div><div class='del'>-	radeon_ring_write(rdev, WAIT_2D_IDLECLEAN | WAIT_3D_IDLECLEAN);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R300_DST_PIPE_CONFIG, 0));</div><div class='del'>-	radeon_ring_write(rdev, R300_PIPE_AUTO_CONFIG);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(GB_SELECT, 0));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(GB_ENABLE, 0));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(R500_SU_REG_DEST, 0));</div><div class='del'>-	radeon_ring_write(rdev, (1 &lt;&lt; rdev-&gt;num_gb_pipes) - 1);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(VAP_INDEX_OFFSET, 0));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='del'>-	radeon_ring_write(rdev, RB3D_DC_FLUSH | RB3D_DC_FREE);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(ZB_ZCACHE_CTLSTAT, 0));</div><div class='del'>-	radeon_ring_write(rdev, ZC_FLUSH | ZC_FREE);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(WAIT_UNTIL, 0));</div><div class='del'>-	radeon_ring_write(rdev, WAIT_2D_IDLECLEAN | WAIT_3D_IDLECLEAN);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(GB_AA_CONFIG, 0));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='del'>-	radeon_ring_write(rdev, RB3D_DC_FLUSH | RB3D_DC_FREE);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(ZB_ZCACHE_CTLSTAT, 0));</div><div class='del'>-	radeon_ring_write(rdev, ZC_FLUSH | ZC_FREE);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(GB_MSPOS0, 0));</div><div class='del'>-	radeon_ring_write(rdev,</div><div class='add'>+	radeon_ring_write(ring, PACKET0(WAIT_UNTIL, 0));</div><div class='add'>+	radeon_ring_write(ring, WAIT_2D_IDLECLEAN | WAIT_3D_IDLECLEAN);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R300_DST_PIPE_CONFIG, 0));</div><div class='add'>+	radeon_ring_write(ring, R300_PIPE_AUTO_CONFIG);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(GB_SELECT, 0));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(GB_ENABLE, 0));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(R500_SU_REG_DEST, 0));</div><div class='add'>+	radeon_ring_write(ring, (1 &lt;&lt; rdev-&gt;num_gb_pipes) - 1);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(VAP_INDEX_OFFSET, 0));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='add'>+	radeon_ring_write(ring, RB3D_DC_FLUSH | RB3D_DC_FREE);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(ZB_ZCACHE_CTLSTAT, 0));</div><div class='add'>+	radeon_ring_write(ring, ZC_FLUSH | ZC_FREE);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(WAIT_UNTIL, 0));</div><div class='add'>+	radeon_ring_write(ring, WAIT_2D_IDLECLEAN | WAIT_3D_IDLECLEAN);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(GB_AA_CONFIG, 0));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(RB3D_DSTCACHE_CTLSTAT, 0));</div><div class='add'>+	radeon_ring_write(ring, RB3D_DC_FLUSH | RB3D_DC_FREE);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(ZB_ZCACHE_CTLSTAT, 0));</div><div class='add'>+	radeon_ring_write(ring, ZC_FLUSH | ZC_FREE);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(GB_MSPOS0, 0));</div><div class='add'>+	radeon_ring_write(ring,</div><div class='ctx'> 			  ((6 &lt;&lt; MS_X0_SHIFT) |</div><div class='ctx'> 			   (6 &lt;&lt; MS_Y0_SHIFT) |</div><div class='ctx'> 			   (6 &lt;&lt; MS_X1_SHIFT) |</div><div class='hunk'>@@ -101,8 +102,8 @@ void rv515_ring_start(struct radeon_device *rdev)</div><div class='ctx'> 			   (6 &lt;&lt; MS_Y2_SHIFT) |</div><div class='ctx'> 			   (6 &lt;&lt; MSBD0_Y_SHIFT) |</div><div class='ctx'> 			   (6 &lt;&lt; MSBD0_X_SHIFT)));</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(GB_MSPOS1, 0));</div><div class='del'>-	radeon_ring_write(rdev,</div><div class='add'>+	radeon_ring_write(ring, PACKET0(GB_MSPOS1, 0));</div><div class='add'>+	radeon_ring_write(ring,</div><div class='ctx'> 			  ((6 &lt;&lt; MS_X3_SHIFT) |</div><div class='ctx'> 			   (6 &lt;&lt; MS_Y3_SHIFT) |</div><div class='ctx'> 			   (6 &lt;&lt; MS_X4_SHIFT) |</div><div class='hunk'>@@ -110,15 +111,15 @@ void rv515_ring_start(struct radeon_device *rdev)</div><div class='ctx'> 			   (6 &lt;&lt; MS_X5_SHIFT) |</div><div class='ctx'> 			   (6 &lt;&lt; MS_Y5_SHIFT) |</div><div class='ctx'> 			   (6 &lt;&lt; MSBD1_SHIFT)));</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(GA_ENHANCE, 0));</div><div class='del'>-	radeon_ring_write(rdev, GA_DEADLOCK_CNTL | GA_FASTSYNC_CNTL);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(GA_POLY_MODE, 0));</div><div class='del'>-	radeon_ring_write(rdev, FRONT_PTYPE_TRIANGE | BACK_PTYPE_TRIANGE);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(GA_ROUND_MODE, 0));</div><div class='del'>-	radeon_ring_write(rdev, GEOMETRY_ROUND_NEAREST | COLOR_ROUND_NEAREST);</div><div class='del'>-	radeon_ring_write(rdev, PACKET0(0x20C8, 0));</div><div class='del'>-	radeon_ring_write(rdev, 0);</div><div class='del'>-	radeon_ring_unlock_commit(rdev);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(GA_ENHANCE, 0));</div><div class='add'>+	radeon_ring_write(ring, GA_DEADLOCK_CNTL | GA_FASTSYNC_CNTL);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(GA_POLY_MODE, 0));</div><div class='add'>+	radeon_ring_write(ring, FRONT_PTYPE_TRIANGE | BACK_PTYPE_TRIANGE);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(GA_ROUND_MODE, 0));</div><div class='add'>+	radeon_ring_write(ring, GEOMETRY_ROUND_NEAREST | COLOR_ROUND_NEAREST);</div><div class='add'>+	radeon_ring_write(ring, PACKET0(0x20C8, 0));</div><div class='add'>+	radeon_ring_write(ring, 0);</div><div class='add'>+	radeon_ring_unlock_commit(rdev, ring);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int rv515_mc_wait_for_idle(struct radeon_device *rdev)</div><div class='hunk'>@@ -392,6 +393,12 @@ static int rv515_startup(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_fence_driver_start_ring(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed initializing CP fences (%d).\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Enable IRQ */</div><div class='ctx'> 	rs600_irq_set(rdev);</div><div class='ctx'> 	rdev-&gt;config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);</div><div class='hunk'>@@ -401,9 +408,15 @@ static int rv515_startup(struct radeon_device *rdev)</div><div class='ctx'> 		dev_err(rdev-&gt;dev, "failed initializing CP (%d).\n", r);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='del'>-	r = r100_ib_init(rdev);</div><div class='add'>+</div><div class='add'>+	r = radeon_ib_pool_start(rdev);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	r = r100_ib_test(rdev);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		dev_err(rdev-&gt;dev, "failed initializing IB (%d).\n", r);</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed testing IB (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -428,6 +441,8 @@ int rv515_resume(struct radeon_device *rdev)</div><div class='ctx'> 	rv515_clock_startup(rdev);</div><div class='ctx'> 	/* Initialize surface registers */</div><div class='ctx'> 	radeon_surface_init(rdev);</div><div class='add'>+</div><div class='add'>+	rdev-&gt;accel_working = true;</div><div class='ctx'> 	return rv515_startup(rdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -524,7 +539,14 @@ int rv515_init(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> 	rv515_set_safe_registers(rdev);</div><div class='add'>+</div><div class='add'>+	r = radeon_ib_pool_init(rdev);</div><div class='ctx'> 	rdev-&gt;accel_working = true;</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "IB initialization failed (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	r = rv515_startup(rdev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		/* Somethings want wront with the accel init stop accel */</div><div class='head'>diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c<br/>index 23ae1c60ab3d..a1668b659ddd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/rv770.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/radeon/rv770.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/radeon/rv770.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/radeon/rv770.c</a></div><div class='hunk'>@@ -357,7 +357,7 @@ static int rv770_cp_load_microcode(struct radeon_device *rdev)</div><div class='ctx'> void r700_cp_fini(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	r700_cp_stop(rdev);</div><div class='del'>-	radeon_ring_fini(rdev);</div><div class='add'>+	radeon_ring_fini(rdev, &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1043,6 +1043,7 @@ int rv770_mc_init(struct radeon_device *rdev)</div><div class='ctx'> </div><div class='ctx'> static int rv770_startup(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='add'>+	struct radeon_ring *ring = &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX];</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	/* enable pcie gen2 link */</div><div class='hunk'>@@ -1082,6 +1083,12 @@ static int rv770_startup(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_fence_driver_start_ring(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "failed initializing CP fences (%d).\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Enable IRQ */</div><div class='ctx'> 	r = r600_irq_init(rdev);</div><div class='ctx'> 	if (r) {</div><div class='hunk'>@@ -1091,7 +1098,9 @@ static int rv770_startup(struct radeon_device *rdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	r600_irq_set(rdev);</div><div class='ctx'> </div><div class='del'>-	r = radeon_ring_init(rdev, rdev-&gt;cp.ring_size);</div><div class='add'>+	r = radeon_ring_init(rdev, ring, ring-&gt;ring_size, RADEON_WB_CP_RPTR_OFFSET,</div><div class='add'>+			     R600_CP_RB_RPTR, R600_CP_RB_WPTR,</div><div class='add'>+			     0, 0xfffff, RADEON_CP_PACKET2);</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> 	r = rv770_cp_load_microcode(rdev);</div><div class='hunk'>@@ -1101,6 +1110,17 @@ static int rv770_startup(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_ib_pool_start(rdev);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	r = r600_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "IB test failed (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='add'>+		return r;</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'>@@ -1115,18 +1135,13 @@ int rv770_resume(struct radeon_device *rdev)</div><div class='ctx'> 	/* post card */</div><div class='ctx'> 	atom_asic_init(rdev-&gt;mode_info.atom_context);</div><div class='ctx'> </div><div class='add'>+	rdev-&gt;accel_working = true;</div><div class='ctx'> 	r = rv770_startup(rdev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		DRM_ERROR("r600 startup failed on resume\n");</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	r = r600_ib_test(rdev);</div><div class='del'>-	if (r) {</div><div class='del'>-		DRM_ERROR("radeon: failed testing IB (%d).\n", r);</div><div class='del'>-		return r;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	r = r600_audio_init(rdev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		dev_err(rdev-&gt;dev, "radeon: audio init failed\n");</div><div class='hunk'>@@ -1140,13 +1155,14 @@ int rv770_resume(struct radeon_device *rdev)</div><div class='ctx'> int rv770_suspend(struct radeon_device *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	r600_audio_fini(rdev);</div><div class='add'>+	radeon_ib_pool_suspend(rdev);</div><div class='add'>+	r600_blit_suspend(rdev);</div><div class='ctx'> 	/* FIXME: we should wait for ring to be empty */</div><div class='ctx'> 	r700_cp_stop(rdev);</div><div class='del'>-	rdev-&gt;cp.ready = false;</div><div class='add'>+	rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX].ready = false;</div><div class='ctx'> 	r600_irq_suspend(rdev);</div><div class='ctx'> 	radeon_wb_disable(rdev);</div><div class='ctx'> 	rv770_pcie_gart_disable(rdev);</div><div class='del'>-	r600_blit_suspend(rdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1215,8 +1231,8 @@ int rv770_init(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='del'>-	rdev-&gt;cp.ring_obj = NULL;</div><div class='del'>-	r600_ring_init(rdev, 1024 * 1024);</div><div class='add'>+	rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX].ring_obj = NULL;</div><div class='add'>+	r600_ring_init(rdev, &amp;rdev-&gt;ring[RADEON_RING_TYPE_GFX_INDEX], 1024 * 1024);</div><div class='ctx'> </div><div class='ctx'> 	rdev-&gt;ih.ring_obj = NULL;</div><div class='ctx'> 	r600_ih_ring_init(rdev, 64 * 1024);</div><div class='hunk'>@@ -1225,30 +1241,24 @@ int rv770_init(struct radeon_device *rdev)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	r = radeon_ib_pool_init(rdev);</div><div class='ctx'> 	rdev-&gt;accel_working = true;</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(rdev-&gt;dev, "IB initialization failed (%d).\n", r);</div><div class='add'>+		rdev-&gt;accel_working = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	r = rv770_startup(rdev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		dev_err(rdev-&gt;dev, "disabling GPU acceleration\n");</div><div class='ctx'> 		r700_cp_fini(rdev);</div><div class='ctx'> 		r600_irq_fini(rdev);</div><div class='ctx'> 		radeon_wb_fini(rdev);</div><div class='add'>+		r100_ib_fini(rdev);</div><div class='ctx'> 		radeon_irq_kms_fini(rdev);</div><div class='ctx'> 		rv770_pcie_gart_fini(rdev);</div><div class='ctx'> 		rdev-&gt;accel_working = false;</div><div class='ctx'> 	}</div><div class='del'>-	if (rdev-&gt;accel_working) {</div><div class='del'>-		r = radeon_ib_pool_init(rdev);</div><div class='del'>-		if (r) {</div><div class='del'>-			dev_err(rdev-&gt;dev, "IB initialization failed (%d).\n", r);</div><div class='del'>-			rdev-&gt;accel_working = false;</div><div class='del'>-		} else {</div><div class='del'>-			r = r600_ib_test(rdev);</div><div class='del'>-			if (r) {</div><div class='del'>-				dev_err(rdev-&gt;dev, "IB test failed (%d).\n", r);</div><div class='del'>-				rdev-&gt;accel_working = false;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	r = r600_audio_init(rdev);</div><div class='ctx'> 	if (r) {</div><div class='hunk'>@@ -1265,11 +1275,12 @@ void rv770_fini(struct radeon_device *rdev)</div><div class='ctx'> 	r700_cp_fini(rdev);</div><div class='ctx'> 	r600_irq_fini(rdev);</div><div class='ctx'> 	radeon_wb_fini(rdev);</div><div class='del'>-	radeon_ib_pool_fini(rdev);</div><div class='add'>+	r100_ib_fini(rdev);</div><div class='ctx'> 	radeon_irq_kms_fini(rdev);</div><div class='ctx'> 	rv770_pcie_gart_fini(rdev);</div><div class='ctx'> 	r600_vram_scratch_fini(rdev);</div><div class='ctx'> 	radeon_gem_fini(rdev);</div><div class='add'>+	radeon_semaphore_driver_fini(rdev);</div><div class='ctx'> 	radeon_fence_driver_fini(rdev);</div><div class='ctx'> 	radeon_agp_fini(rdev);</div><div class='ctx'> 	radeon_bo_fini(rdev);</div><div class='head'>diff --git a/drivers/gpu/drm/savage/savage_drv.c b/drivers/gpu/drm/savage/savage_drv.c<br/>index 5468d1cd3296..89afe0b83643 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/savage/savage_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/savage/savage_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/savage/savage_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/savage/savage_drv.c</a></div><div class='hunk'>@@ -35,6 +35,17 @@ static struct pci_device_id pciidlist[] = {</div><div class='ctx'> 	savage_PCI_IDS</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct file_operations savage_driver_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = drm_open,</div><div class='add'>+	.release = drm_release,</div><div class='add'>+	.unlocked_ioctl = drm_ioctl,</div><div class='add'>+	.mmap = drm_mmap,</div><div class='add'>+	.poll = drm_poll,</div><div class='add'>+	.fasync = drm_fasync,</div><div class='add'>+	.llseek = noop_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct drm_driver driver = {</div><div class='ctx'> 	.driver_features =</div><div class='ctx'> 	    DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_DMA | DRIVER_PCI_DMA,</div><div class='hunk'>@@ -46,17 +57,7 @@ static struct drm_driver driver = {</div><div class='ctx'> 	.reclaim_buffers = savage_reclaim_buffers,</div><div class='ctx'> 	.ioctls = savage_ioctls,</div><div class='ctx'> 	.dma_ioctl = savage_bci_buffers,</div><div class='del'>-	.fops = {</div><div class='del'>-		 .owner = THIS_MODULE,</div><div class='del'>-		 .open = drm_open,</div><div class='del'>-		 .release = drm_release,</div><div class='del'>-		 .unlocked_ioctl = drm_ioctl,</div><div class='del'>-		 .mmap = drm_mmap,</div><div class='del'>-		 .poll = drm_poll,</div><div class='del'>-		 .fasync = drm_fasync,</div><div class='del'>-		 .llseek = noop_llseek,</div><div class='del'>-	},</div><div class='del'>-</div><div class='add'>+	.fops = &amp;savage_driver_fops,</div><div class='ctx'> 	.name = DRIVER_NAME,</div><div class='ctx'> 	.desc = DRIVER_DESC,</div><div class='ctx'> 	.date = DRIVER_DATE,</div><div class='head'>diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c<br/>index a9c5716bea4e..06da063ece2e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/sis/sis_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/sis/sis_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/sis/sis_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/sis/sis_drv.c</a></div><div class='hunk'>@@ -48,9 +48,7 @@ static int sis_driver_load(struct drm_device *dev, unsigned long chipset)</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;dev_private = (void *)dev_priv;</div><div class='ctx'> 	dev_priv-&gt;chipset = chipset;</div><div class='del'>-	ret = drm_sman_init(&amp;dev_priv-&gt;sman, 2, 12, 8);</div><div class='del'>-	if (ret)</div><div class='del'>-		kfree(dev_priv);</div><div class='add'>+	idr_init(&amp;dev-&gt;object_name_idr);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -59,32 +57,60 @@ static int sis_driver_unload(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	drm_sis_private_t *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> </div><div class='del'>-	drm_sman_takedown(&amp;dev_priv-&gt;sman);</div><div class='add'>+	idr_remove_all(&amp;dev_priv-&gt;object_idr);</div><div class='add'>+	idr_destroy(&amp;dev_priv-&gt;object_idr);</div><div class='add'>+</div><div class='ctx'> 	kfree(dev_priv);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct file_operations sis_driver_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = drm_open,</div><div class='add'>+	.release = drm_release,</div><div class='add'>+	.unlocked_ioctl = drm_ioctl,</div><div class='add'>+	.mmap = drm_mmap,</div><div class='add'>+	.poll = drm_poll,</div><div class='add'>+	.fasync = drm_fasync,</div><div class='add'>+	.llseek = noop_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int sis_driver_open(struct drm_device *dev, struct drm_file *file)</div><div class='add'>+{</div><div class='add'>+	struct sis_file_private *file_priv;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_DRIVER("\n");</div><div class='add'>+	file_priv = kmalloc(sizeof(*file_priv), GFP_KERNEL);</div><div class='add'>+	if (!file_priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	file-&gt;driver_priv = file_priv;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;file_priv-&gt;obj_list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sis_driver_postclose(struct drm_device *dev, struct drm_file *file)</div><div class='add'>+{</div><div class='add'>+	struct sis_file_private *file_priv = file-&gt;driver_priv;</div><div class='add'>+</div><div class='add'>+	kfree(file_priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct drm_driver driver = {</div><div class='ctx'> 	.driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR,</div><div class='ctx'> 	.load = sis_driver_load,</div><div class='ctx'> 	.unload = sis_driver_unload,</div><div class='add'>+	.open = sis_driver_open,</div><div class='add'>+	.postclose = sis_driver_postclose,</div><div class='ctx'> 	.dma_quiescent = sis_idle,</div><div class='ctx'> 	.reclaim_buffers = NULL,</div><div class='ctx'> 	.reclaim_buffers_idlelocked = sis_reclaim_buffers_locked,</div><div class='ctx'> 	.lastclose = sis_lastclose,</div><div class='ctx'> 	.ioctls = sis_ioctls,</div><div class='del'>-	.fops = {</div><div class='del'>-		 .owner = THIS_MODULE,</div><div class='del'>-		 .open = drm_open,</div><div class='del'>-		 .release = drm_release,</div><div class='del'>-		 .unlocked_ioctl = drm_ioctl,</div><div class='del'>-		 .mmap = drm_mmap,</div><div class='del'>-		 .poll = drm_poll,</div><div class='del'>-		 .fasync = drm_fasync,</div><div class='del'>-		 .llseek = noop_llseek,</div><div class='del'>-	},</div><div class='del'>-</div><div class='add'>+	.fops = &amp;sis_driver_fops,</div><div class='ctx'> 	.name = DRIVER_NAME,</div><div class='ctx'> 	.desc = DRIVER_DESC,</div><div class='ctx'> 	.date = DRIVER_DATE,</div><div class='head'>diff --git a/drivers/gpu/drm/sis/sis_drv.h b/drivers/gpu/drm/sis/sis_drv.h<br/>index 194303c177ad..573758b2d2d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/sis/sis_drv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/sis/sis_drv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/sis/sis_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/sis/sis_drv.h</a></div><div class='hunk'>@@ -44,7 +44,7 @@ enum sis_family {</div><div class='ctx'> 	SIS_CHIP_315 = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#include "drm_sman.h"</div><div class='add'>+#include "drm_mm.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define SIS_BASE (dev_priv-&gt;mmio)</div><div class='hunk'>@@ -54,12 +54,15 @@ enum sis_family {</div><div class='ctx'> typedef struct drm_sis_private {</div><div class='ctx'> 	drm_local_map_t *mmio;</div><div class='ctx'> 	unsigned int idle_fault;</div><div class='del'>-	struct drm_sman sman;</div><div class='ctx'> 	unsigned int chipset;</div><div class='ctx'> 	int vram_initialized;</div><div class='ctx'> 	int agp_initialized;</div><div class='ctx'> 	unsigned long vram_offset;</div><div class='ctx'> 	unsigned long agp_offset;</div><div class='add'>+	struct drm_mm vram_mm;</div><div class='add'>+	struct drm_mm agp_mm;</div><div class='add'>+	/** Mapping of userspace keys to mm objects */</div><div class='add'>+	struct idr object_idr;</div><div class='ctx'> } drm_sis_private_t;</div><div class='ctx'> </div><div class='ctx'> extern int sis_idle(struct drm_device *dev);</div><div class='head'>diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c<br/>index 7fe2b63412ce..dd4a316c3d74 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/sis/sis_mm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/sis/sis_mm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/sis/sis_mm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/sis/sis_mm.c</a></div><div class='hunk'>@@ -41,40 +41,18 @@</div><div class='ctx'> #define AGP_TYPE 1</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+struct sis_memblock {</div><div class='add'>+	struct drm_mm_node mm_node;</div><div class='add'>+	struct sis_memreq req;</div><div class='add'>+	struct list_head owner_list;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_FB_SIS) || defined(CONFIG_FB_SIS_MODULE)</div><div class='ctx'> /* fb management via fb device */</div><div class='ctx'> </div><div class='ctx'> #define SIS_MM_ALIGN_SHIFT 0</div><div class='ctx'> #define SIS_MM_ALIGN_MASK 0</div><div class='ctx'> </div><div class='del'>-static void *sis_sman_mm_allocate(void *private, unsigned long size,</div><div class='del'>-				  unsigned alignment)</div><div class='del'>-{</div><div class='del'>-	struct sis_memreq req;</div><div class='del'>-</div><div class='del'>-	req.size = size;</div><div class='del'>-	sis_malloc(&amp;req);</div><div class='del'>-	if (req.size == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-	else</div><div class='del'>-		return (void *)(unsigned long)~req.offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sis_sman_mm_free(void *private, void *ref)</div><div class='del'>-{</div><div class='del'>-	sis_free(~((unsigned long)ref));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sis_sman_mm_destroy(void *private)</div><div class='del'>-{</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long sis_sman_mm_offset(void *private, void *ref)</div><div class='del'>-{</div><div class='del'>-	return ~((unsigned long)ref);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #else /* CONFIG_FB_SIS[_MODULE] */</div><div class='ctx'> </div><div class='ctx'> #define SIS_MM_ALIGN_SHIFT 4</div><div class='hunk'>@@ -86,30 +64,11 @@ static int sis_fb_init(struct drm_device *dev, void *data, struct drm_file *file</div><div class='ctx'> {</div><div class='ctx'> 	drm_sis_private_t *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	drm_sis_fb_t *fb = data;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-#if defined(CONFIG_FB_SIS) || defined(CONFIG_FB_SIS_MODULE)</div><div class='del'>-	{</div><div class='del'>-		struct drm_sman_mm sman_mm;</div><div class='del'>-		sman_mm.private = (void *)0xFFFFFFFF;</div><div class='del'>-		sman_mm.allocate = sis_sman_mm_allocate;</div><div class='del'>-		sman_mm.free = sis_sman_mm_free;</div><div class='del'>-		sman_mm.destroy = sis_sman_mm_destroy;</div><div class='del'>-		sman_mm.offset = sis_sman_mm_offset;</div><div class='del'>-		ret =</div><div class='del'>-		    drm_sman_set_manager(&amp;dev_priv-&gt;sman, VIDEO_TYPE, &amp;sman_mm);</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-	ret = drm_sman_set_range(&amp;dev_priv-&gt;sman, VIDEO_TYPE, 0,</div><div class='del'>-				 fb-&gt;size &gt;&gt; SIS_MM_ALIGN_SHIFT);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		DRM_ERROR("VRAM memory manager initialisation error\n");</div><div class='del'>-		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+	/* Unconditionally init the drm_mm, even though we don't use it when the</div><div class='add'>+	 * fb sis driver is available - make cleanup easier. */</div><div class='add'>+	drm_mm_init(&amp;dev_priv-&gt;vram_mm, 0, fb-&gt;size &gt;&gt; SIS_MM_ALIGN_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	dev_priv-&gt;vram_initialized = 1;</div><div class='ctx'> 	dev_priv-&gt;vram_offset = fb-&gt;offset;</div><div class='hunk'>@@ -120,13 +79,15 @@ static int sis_fb_init(struct drm_device *dev, void *data, struct drm_file *file</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sis_drm_alloc(struct drm_device *dev, struct drm_file *file_priv,</div><div class='add'>+static int sis_drm_alloc(struct drm_device *dev, struct drm_file *file,</div><div class='ctx'> 			 void *data, int pool)</div><div class='ctx'> {</div><div class='ctx'> 	drm_sis_private_t *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	drm_sis_mem_t *mem = data;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	struct drm_memblock_item *item;</div><div class='add'>+	int retval = 0, user_key;</div><div class='add'>+	struct sis_memblock *item;</div><div class='add'>+	struct sis_file_private *file_priv = file-&gt;driver_priv;</div><div class='add'>+	unsigned long offset;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -138,25 +99,68 @@ static int sis_drm_alloc(struct drm_device *dev, struct drm_file *file_priv,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mem-&gt;size = (mem-&gt;size + SIS_MM_ALIGN_MASK) &gt;&gt; SIS_MM_ALIGN_SHIFT;</div><div class='del'>-	item = drm_sman_alloc(&amp;dev_priv-&gt;sman, pool, mem-&gt;size, 0,</div><div class='del'>-			      (unsigned long)file_priv);</div><div class='add'>+	item = kzalloc(sizeof(*item), GFP_KERNEL);</div><div class='add'>+	if (!item) {</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		goto fail_alloc;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-	if (item) {</div><div class='del'>-		mem-&gt;offset = ((pool == 0) ?</div><div class='del'>-			      dev_priv-&gt;vram_offset : dev_priv-&gt;agp_offset) +</div><div class='del'>-		    (item-&gt;mm-&gt;</div><div class='del'>-		     offset(item-&gt;mm, item-&gt;mm_info) &lt;&lt; SIS_MM_ALIGN_SHIFT);</div><div class='del'>-		mem-&gt;free = item-&gt;user_hash.key;</div><div class='del'>-		mem-&gt;size = mem-&gt;size &lt;&lt; SIS_MM_ALIGN_SHIFT;</div><div class='add'>+	mem-&gt;size = (mem-&gt;size + SIS_MM_ALIGN_MASK) &gt;&gt; SIS_MM_ALIGN_SHIFT;</div><div class='add'>+	if (pool == AGP_TYPE) {</div><div class='add'>+		retval = drm_mm_insert_node(&amp;dev_priv-&gt;agp_mm,</div><div class='add'>+					    &amp;item-&gt;mm_node,</div><div class='add'>+					    mem-&gt;size, 0);</div><div class='add'>+		offset = item-&gt;mm_node.start;</div><div class='ctx'> 	} else {</div><div class='del'>-		mem-&gt;offset = 0;</div><div class='del'>-		mem-&gt;size = 0;</div><div class='del'>-		mem-&gt;free = 0;</div><div class='add'>+#if defined(CONFIG_FB_SIS) || defined(CONFIG_FB_SIS_MODULE)</div><div class='add'>+		item-&gt;req.size = mem-&gt;size;</div><div class='add'>+		sis_malloc(&amp;item-&gt;req);</div><div class='add'>+		if (item-&gt;req.size == 0)</div><div class='add'>+			retval = -ENOMEM;</div><div class='add'>+		offset = item-&gt;req.offset;</div><div class='add'>+#else</div><div class='add'>+		retval = drm_mm_insert_node(&amp;dev_priv-&gt;vram_mm,</div><div class='add'>+					    &amp;item-&gt;mm_node,</div><div class='add'>+					    mem-&gt;size, 0);</div><div class='add'>+		offset = item-&gt;mm_node.start;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+	if (retval)</div><div class='add'>+		goto fail_alloc;</div><div class='add'>+</div><div class='add'>+again:</div><div class='add'>+	if (idr_pre_get(&amp;dev_priv-&gt;object_idr, GFP_KERNEL) == 0) {</div><div class='ctx'> 		retval = -ENOMEM;</div><div class='add'>+		goto fail_idr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	retval = idr_get_new_above(&amp;dev_priv-&gt;object_idr, item, 1, &amp;user_key);</div><div class='add'>+	if (retval == -EAGAIN)</div><div class='add'>+		goto again;</div><div class='add'>+	if (retval)</div><div class='add'>+		goto fail_idr;</div><div class='add'>+</div><div class='add'>+	list_add(&amp;item-&gt;owner_list, &amp;file_priv-&gt;obj_list);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	mem-&gt;offset = ((pool == 0) ?</div><div class='add'>+		      dev_priv-&gt;vram_offset : dev_priv-&gt;agp_offset) +</div><div class='add'>+	    (offset &lt;&lt; SIS_MM_ALIGN_SHIFT);</div><div class='add'>+	mem-&gt;free = user_key;</div><div class='add'>+	mem-&gt;size = mem-&gt;size &lt;&lt; SIS_MM_ALIGN_SHIFT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_idr:</div><div class='add'>+	drm_mm_remove_node(&amp;item-&gt;mm_node);</div><div class='add'>+fail_alloc:</div><div class='add'>+	kfree(item);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	mem-&gt;offset = 0;</div><div class='add'>+	mem-&gt;size = 0;</div><div class='add'>+	mem-&gt;free = 0;</div><div class='add'>+</div><div class='ctx'> 	DRM_DEBUG("alloc %d, size = %d, offset = %d\n", pool, mem-&gt;size,</div><div class='ctx'> 		  mem-&gt;offset);</div><div class='ctx'> </div><div class='hunk'>@@ -167,14 +171,28 @@ static int sis_drm_free(struct drm_device *dev, void *data, struct drm_file *fil</div><div class='ctx'> {</div><div class='ctx'> 	drm_sis_private_t *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	drm_sis_mem_t *mem = data;</div><div class='del'>-	int ret;</div><div class='add'>+	struct sis_memblock *obj;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-	ret = drm_sman_free_key(&amp;dev_priv-&gt;sman, mem-&gt;free);</div><div class='add'>+	obj = idr_find(&amp;dev_priv-&gt;object_idr, mem-&gt;free);</div><div class='add'>+	if (obj == NULL) {</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	idr_remove(&amp;dev_priv-&gt;object_idr, mem-&gt;free);</div><div class='add'>+	list_del(&amp;obj-&gt;owner_list);</div><div class='add'>+	if (drm_mm_node_allocated(&amp;obj-&gt;mm_node))</div><div class='add'>+		drm_mm_remove_node(&amp;obj-&gt;mm_node);</div><div class='add'>+#if defined(CONFIG_FB_SIS) || defined(CONFIG_FB_SIS_MODULE)</div><div class='add'>+	else</div><div class='add'>+		sis_free(obj-&gt;req.offset);</div><div class='add'>+#endif</div><div class='add'>+	kfree(obj);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> 	DRM_DEBUG("free = 0x%lx\n", mem-&gt;free);</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 sis_fb_alloc(struct drm_device *dev, void *data,</div><div class='hunk'>@@ -188,18 +206,10 @@ static int sis_ioctl_agp_init(struct drm_device *dev, void *data,</div><div class='ctx'> {</div><div class='ctx'> 	drm_sis_private_t *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	drm_sis_agp_t *agp = data;</div><div class='del'>-	int ret;</div><div class='ctx'> 	dev_priv = dev-&gt;dev_private;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-	ret = drm_sman_set_range(&amp;dev_priv-&gt;sman, AGP_TYPE, 0,</div><div class='del'>-				 agp-&gt;size &gt;&gt; SIS_MM_ALIGN_SHIFT);</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		DRM_ERROR("AGP memory manager initialisation error\n");</div><div class='del'>-		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+	drm_mm_init(&amp;dev_priv-&gt;agp_mm, 0, agp-&gt;size &gt;&gt; SIS_MM_ALIGN_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	dev_priv-&gt;agp_initialized = 1;</div><div class='ctx'> 	dev_priv-&gt;agp_offset = agp-&gt;offset;</div><div class='hunk'>@@ -293,20 +303,26 @@ void sis_lastclose(struct drm_device *dev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-	drm_sman_cleanup(&amp;dev_priv-&gt;sman);</div><div class='del'>-	dev_priv-&gt;vram_initialized = 0;</div><div class='del'>-	dev_priv-&gt;agp_initialized = 0;</div><div class='add'>+	if (dev_priv-&gt;vram_initialized) {</div><div class='add'>+		drm_mm_takedown(&amp;dev_priv-&gt;vram_mm);</div><div class='add'>+		dev_priv-&gt;vram_initialized = 0;</div><div class='add'>+	}</div><div class='add'>+	if (dev_priv-&gt;agp_initialized) {</div><div class='add'>+		drm_mm_takedown(&amp;dev_priv-&gt;agp_mm);</div><div class='add'>+		dev_priv-&gt;agp_initialized = 0;</div><div class='add'>+	}</div><div class='ctx'> 	dev_priv-&gt;mmio = NULL;</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void sis_reclaim_buffers_locked(struct drm_device *dev,</div><div class='del'>-				struct drm_file *file_priv)</div><div class='add'>+				struct drm_file *file)</div><div class='ctx'> {</div><div class='del'>-	drm_sis_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct sis_file_private *file_priv = file-&gt;driver_priv;</div><div class='add'>+	struct sis_memblock *entry, *next;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-	if (drm_sman_owner_clean(&amp;dev_priv-&gt;sman, (unsigned long)file_priv)) {</div><div class='add'>+	if (list_empty(&amp;file_priv-&gt;obj_list)) {</div><div class='ctx'> 		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -314,7 +330,18 @@ void sis_reclaim_buffers_locked(struct drm_device *dev,</div><div class='ctx'> 	if (dev-&gt;driver-&gt;dma_quiescent)</div><div class='ctx'> 		dev-&gt;driver-&gt;dma_quiescent(dev);</div><div class='ctx'> </div><div class='del'>-	drm_sman_owner_cleanup(&amp;dev_priv-&gt;sman, (unsigned long)file_priv);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(entry, next, &amp;file_priv-&gt;obj_list,</div><div class='add'>+				 owner_list) {</div><div class='add'>+		list_del(&amp;entry-&gt;owner_list);</div><div class='add'>+		if (drm_mm_node_allocated(&amp;entry-&gt;mm_node))</div><div class='add'>+			drm_mm_remove_node(&amp;entry-&gt;mm_node);</div><div class='add'>+#if defined(CONFIG_FB_SIS) || defined(CONFIG_FB_SIS_MODULE)</div><div class='add'>+		else</div><div class='add'>+			sis_free(entry-&gt;req.offset);</div><div class='add'>+#endif</div><div class='add'>+		kfree(entry);</div><div class='add'>+	}</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.c b/drivers/gpu/drm/tdfx/tdfx_drv.c<br/>index cda29911e332..1613c78544c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/tdfx/tdfx_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/tdfx/tdfx_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/tdfx/tdfx_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/tdfx/tdfx_drv.c</a></div><div class='hunk'>@@ -41,20 +41,21 @@ static struct pci_device_id pciidlist[] = {</div><div class='ctx'> 	tdfx_PCI_IDS</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct file_operations tdfx_driver_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = drm_open,</div><div class='add'>+	.release = drm_release,</div><div class='add'>+	.unlocked_ioctl = drm_ioctl,</div><div class='add'>+	.mmap = drm_mmap,</div><div class='add'>+	.poll = drm_poll,</div><div class='add'>+	.fasync = drm_fasync,</div><div class='add'>+	.llseek = noop_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct drm_driver driver = {</div><div class='ctx'> 	.driver_features = DRIVER_USE_MTRR,</div><div class='ctx'> 	.reclaim_buffers = drm_core_reclaim_buffers,</div><div class='del'>-	.fops = {</div><div class='del'>-		 .owner = THIS_MODULE,</div><div class='del'>-		 .open = drm_open,</div><div class='del'>-		 .release = drm_release,</div><div class='del'>-		 .unlocked_ioctl = drm_ioctl,</div><div class='del'>-		 .mmap = drm_mmap,</div><div class='del'>-		 .poll = drm_poll,</div><div class='del'>-		 .fasync = drm_fasync,</div><div class='del'>-		 .llseek = noop_llseek,</div><div class='del'>-	},</div><div class='del'>-</div><div class='add'>+	.fops = &amp;tdfx_driver_fops,</div><div class='ctx'> 	.name = DRIVER_NAME,</div><div class='ctx'> 	.desc = DRIVER_DESC,</div><div class='ctx'> 	.date = DRIVER_DATE,</div><div class='head'>diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile<br/>index f3cf6f02c997..b2b33dde2afb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/ttm/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/ttm/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/ttm/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/ttm/Makefile</a></div><div class='hunk'>@@ -7,4 +7,8 @@ ttm-y := ttm_agp_backend.o ttm_memory.o ttm_tt.o ttm_bo.o \</div><div class='ctx'> 	ttm_object.o ttm_lock.o ttm_execbuf_util.o ttm_page_alloc.o \</div><div class='ctx'> 	ttm_bo_manager.o</div><div class='ctx'> </div><div class='add'>+ifeq ($(CONFIG_SWIOTLB),y)</div><div class='add'>+ttm-y += ttm_page_alloc_dma.o</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_DRM_TTM) += ttm.o</div><div class='head'>diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c<br/>index 1c4a72f681c1..747c1413fc95 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/ttm/ttm_agp_backend.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/ttm/ttm_agp_backend.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/ttm/ttm_agp_backend.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/ttm/ttm_agp_backend.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "ttm/ttm_module.h"</div><div class='ctx'> #include "ttm/ttm_bo_driver.h"</div><div class='add'>+#include "ttm/ttm_page_alloc.h"</div><div class='ctx'> #ifdef TTM_HAS_AGP</div><div class='ctx'> #include "ttm/ttm_placement.h"</div><div class='ctx'> #include &lt;linux/agp_backend.h&gt;</div><div class='hunk'>@@ -40,45 +41,33 @@</div><div class='ctx'> #include &lt;asm/agp.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct ttm_agp_backend {</div><div class='del'>-	struct ttm_backend backend;</div><div class='add'>+	struct ttm_tt ttm;</div><div class='ctx'> 	struct agp_memory *mem;</div><div class='ctx'> 	struct agp_bridge_data *bridge;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ttm_agp_populate(struct ttm_backend *backend,</div><div class='del'>-			    unsigned long num_pages, struct page **pages,</div><div class='del'>-			    struct page *dummy_read_page,</div><div class='del'>-			    dma_addr_t *dma_addrs)</div><div class='add'>+static int ttm_agp_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem)</div><div class='ctx'> {</div><div class='del'>-	struct ttm_agp_backend *agp_be =</div><div class='del'>-	    container_of(backend, struct ttm_agp_backend, backend);</div><div class='del'>-	struct page **cur_page, **last_page = pages + num_pages;</div><div class='add'>+	struct ttm_agp_backend *agp_be = container_of(ttm, struct ttm_agp_backend, ttm);</div><div class='add'>+	struct drm_mm_node *node = bo_mem-&gt;mm_node;</div><div class='ctx'> 	struct agp_memory *mem;</div><div class='add'>+	int ret, cached = (bo_mem-&gt;placement &amp; TTM_PL_FLAG_CACHED);</div><div class='add'>+	unsigned i;</div><div class='ctx'> </div><div class='del'>-	mem = agp_allocate_memory(agp_be-&gt;bridge, num_pages, AGP_USER_MEMORY);</div><div class='add'>+	mem = agp_allocate_memory(agp_be-&gt;bridge, ttm-&gt;num_pages, AGP_USER_MEMORY);</div><div class='ctx'> 	if (unlikely(mem == NULL))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	mem-&gt;page_count = 0;</div><div class='del'>-	for (cur_page = pages; cur_page &lt; last_page; ++cur_page) {</div><div class='del'>-		struct page *page = *cur_page;</div><div class='add'>+	for (i = 0; i &lt; ttm-&gt;num_pages; i++) {</div><div class='add'>+		struct page *page = ttm-&gt;pages[i];</div><div class='add'>+</div><div class='ctx'> 		if (!page)</div><div class='del'>-			page = dummy_read_page;</div><div class='add'>+			page = ttm-&gt;dummy_read_page;</div><div class='ctx'> </div><div class='ctx'> 		mem-&gt;pages[mem-&gt;page_count++] = page;</div><div class='ctx'> 	}</div><div class='ctx'> 	agp_be-&gt;mem = mem;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ttm_agp_bind(struct ttm_backend *backend, struct ttm_mem_reg *bo_mem)</div><div class='del'>-{</div><div class='del'>-	struct ttm_agp_backend *agp_be =</div><div class='del'>-	    container_of(backend, struct ttm_agp_backend, backend);</div><div class='del'>-	struct drm_mm_node *node = bo_mem-&gt;mm_node;</div><div class='del'>-	struct agp_memory *mem = agp_be-&gt;mem;</div><div class='del'>-	int cached = (bo_mem-&gt;placement &amp; TTM_PL_FLAG_CACHED);</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mem-&gt;is_flushed = 1;</div><div class='ctx'> 	mem-&gt;type = (cached) ? AGP_USER_CACHED_MEMORY : AGP_USER_MEMORY;</div><div class='hunk'>@@ -90,50 +79,39 @@ static int ttm_agp_bind(struct ttm_backend *backend, struct ttm_mem_reg *bo_mem)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ttm_agp_unbind(struct ttm_backend *backend)</div><div class='add'>+static int ttm_agp_unbind(struct ttm_tt *ttm)</div><div class='ctx'> {</div><div class='del'>-	struct ttm_agp_backend *agp_be =</div><div class='del'>-	    container_of(backend, struct ttm_agp_backend, backend);</div><div class='add'>+	struct ttm_agp_backend *agp_be = container_of(ttm, struct ttm_agp_backend, ttm);</div><div class='ctx'> </div><div class='del'>-	if (agp_be-&gt;mem-&gt;is_bound)</div><div class='del'>-		return agp_unbind_memory(agp_be-&gt;mem);</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ttm_agp_clear(struct ttm_backend *backend)</div><div class='del'>-{</div><div class='del'>-	struct ttm_agp_backend *agp_be =</div><div class='del'>-	    container_of(backend, struct ttm_agp_backend, backend);</div><div class='del'>-	struct agp_memory *mem = agp_be-&gt;mem;</div><div class='del'>-</div><div class='del'>-	if (mem) {</div><div class='del'>-		ttm_agp_unbind(backend);</div><div class='del'>-		agp_free_memory(mem);</div><div class='add'>+	if (agp_be-&gt;mem) {</div><div class='add'>+		if (agp_be-&gt;mem-&gt;is_bound)</div><div class='add'>+			return agp_unbind_memory(agp_be-&gt;mem);</div><div class='add'>+		agp_free_memory(agp_be-&gt;mem);</div><div class='add'>+		agp_be-&gt;mem = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	agp_be-&gt;mem = NULL;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ttm_agp_destroy(struct ttm_backend *backend)</div><div class='add'>+static void ttm_agp_destroy(struct ttm_tt *ttm)</div><div class='ctx'> {</div><div class='del'>-	struct ttm_agp_backend *agp_be =</div><div class='del'>-	    container_of(backend, struct ttm_agp_backend, backend);</div><div class='add'>+	struct ttm_agp_backend *agp_be = container_of(ttm, struct ttm_agp_backend, ttm);</div><div class='ctx'> </div><div class='ctx'> 	if (agp_be-&gt;mem)</div><div class='del'>-		ttm_agp_clear(backend);</div><div class='add'>+		ttm_agp_unbind(ttm);</div><div class='add'>+	ttm_tt_fini(ttm);</div><div class='ctx'> 	kfree(agp_be);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ttm_backend_func ttm_agp_func = {</div><div class='del'>-	.populate = ttm_agp_populate,</div><div class='del'>-	.clear = ttm_agp_clear,</div><div class='ctx'> 	.bind = ttm_agp_bind,</div><div class='ctx'> 	.unbind = ttm_agp_unbind,</div><div class='ctx'> 	.destroy = ttm_agp_destroy,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct ttm_backend *ttm_agp_backend_init(struct ttm_bo_device *bdev,</div><div class='del'>-					 struct agp_bridge_data *bridge)</div><div class='add'>+struct ttm_tt *ttm_agp_tt_create(struct ttm_bo_device *bdev,</div><div class='add'>+				 struct agp_bridge_data *bridge,</div><div class='add'>+				 unsigned long size, uint32_t page_flags,</div><div class='add'>+				 struct page *dummy_read_page)</div><div class='ctx'> {</div><div class='ctx'> 	struct ttm_agp_backend *agp_be;</div><div class='ctx'> </div><div class='hunk'>@@ -143,10 +121,29 @@ struct ttm_backend *ttm_agp_backend_init(struct ttm_bo_device *bdev,</div><div class='ctx'> </div><div class='ctx'> 	agp_be-&gt;mem = NULL;</div><div class='ctx'> 	agp_be-&gt;bridge = bridge;</div><div class='del'>-	agp_be-&gt;backend.func = &amp;ttm_agp_func;</div><div class='del'>-	agp_be-&gt;backend.bdev = bdev;</div><div class='del'>-	return &amp;agp_be-&gt;backend;</div><div class='add'>+	agp_be-&gt;ttm.func = &amp;ttm_agp_func;</div><div class='add'>+</div><div class='add'>+	if (ttm_tt_init(&amp;agp_be-&gt;ttm, bdev, size, page_flags, dummy_read_page)) {</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return &amp;agp_be-&gt;ttm;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ttm_agp_tt_create);</div><div class='add'>+</div><div class='add'>+int ttm_agp_tt_populate(struct ttm_tt *ttm)</div><div class='add'>+{</div><div class='add'>+	if (ttm-&gt;state != tt_unpopulated)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ttm_pool_populate(ttm);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ttm_agp_tt_populate);</div><div class='add'>+</div><div class='add'>+void ttm_agp_tt_unpopulate(struct ttm_tt *ttm)</div><div class='add'>+{</div><div class='add'>+	ttm_pool_unpopulate(ttm);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(ttm_agp_backend_init);</div><div class='add'>+EXPORT_SYMBOL(ttm_agp_tt_unpopulate);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c<br/>index 0bb0f5f713e6..2f0eab66ece6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/ttm/ttm_bo.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/ttm/ttm_bo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/ttm/ttm_bo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/ttm/ttm_bo.c</a></div><div class='hunk'>@@ -137,6 +137,7 @@ static void ttm_bo_release_list(struct kref *list_kref)</div><div class='ctx'> 	struct ttm_buffer_object *bo =</div><div class='ctx'> 	    container_of(list_kref, struct ttm_buffer_object, list_kref);</div><div class='ctx'> 	struct ttm_bo_device *bdev = bo-&gt;bdev;</div><div class='add'>+	size_t acc_size = bo-&gt;acc_size;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(atomic_read(&amp;bo-&gt;list_kref.refcount));</div><div class='ctx'> 	BUG_ON(atomic_read(&amp;bo-&gt;kref.refcount));</div><div class='hunk'>@@ -152,9 +153,9 @@ static void ttm_bo_release_list(struct kref *list_kref)</div><div class='ctx'> 	if (bo-&gt;destroy)</div><div class='ctx'> 		bo-&gt;destroy(bo);</div><div class='ctx'> 	else {</div><div class='del'>-		ttm_mem_global_free(bdev-&gt;glob-&gt;mem_glob, bo-&gt;acc_size);</div><div class='ctx'> 		kfree(bo);</div><div class='ctx'> 	}</div><div class='add'>+	ttm_mem_global_free(bdev-&gt;glob-&gt;mem_glob, acc_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ttm_bo_wait_unreserved(struct ttm_buffer_object *bo, bool interruptible)</div><div class='hunk'>@@ -337,27 +338,11 @@ static int ttm_bo_add_ttm(struct ttm_buffer_object *bo, bool zero_alloc)</div><div class='ctx'> 		if (zero_alloc)</div><div class='ctx'> 			page_flags |= TTM_PAGE_FLAG_ZERO_ALLOC;</div><div class='ctx'> 	case ttm_bo_type_kernel:</div><div class='del'>-		bo-&gt;ttm = ttm_tt_create(bdev, bo-&gt;num_pages &lt;&lt; PAGE_SHIFT,</div><div class='del'>-					page_flags, glob-&gt;dummy_read_page);</div><div class='add'>+		bo-&gt;ttm = bdev-&gt;driver-&gt;ttm_tt_create(bdev, bo-&gt;num_pages &lt;&lt; PAGE_SHIFT,</div><div class='add'>+						      page_flags, glob-&gt;dummy_read_page);</div><div class='ctx'> 		if (unlikely(bo-&gt;ttm == NULL))</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 		break;</div><div class='del'>-	case ttm_bo_type_user:</div><div class='del'>-		bo-&gt;ttm = ttm_tt_create(bdev, bo-&gt;num_pages &lt;&lt; PAGE_SHIFT,</div><div class='del'>-					page_flags | TTM_PAGE_FLAG_USER,</div><div class='del'>-					glob-&gt;dummy_read_page);</div><div class='del'>-		if (unlikely(bo-&gt;ttm == NULL)) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = ttm_tt_set_user(bo-&gt;ttm, current,</div><div class='del'>-				      bo-&gt;buffer_start, bo-&gt;num_pages);</div><div class='del'>-		if (unlikely(ret != 0)) {</div><div class='del'>-			ttm_tt_destroy(bo-&gt;ttm);</div><div class='del'>-			bo-&gt;ttm = NULL;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_ERR TTM_PFX "Illegal buffer object type\n");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='hunk'>@@ -419,9 +404,6 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bdev-&gt;driver-&gt;move_notify)</div><div class='del'>-		bdev-&gt;driver-&gt;move_notify(bo, mem);</div><div class='del'>-</div><div class='ctx'> 	if (!(old_man-&gt;flags &amp; TTM_MEMTYPE_FLAG_FIXED) &amp;&amp;</div><div class='ctx'> 	    !(new_man-&gt;flags &amp; TTM_MEMTYPE_FLAG_FIXED))</div><div class='ctx'> 		ret = ttm_bo_move_ttm(bo, evict, no_wait_reserve, no_wait_gpu, mem);</div><div class='hunk'>@@ -434,6 +416,9 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='add'>+	if (bdev-&gt;driver-&gt;move_notify)</div><div class='add'>+		bdev-&gt;driver-&gt;move_notify(bo, mem);</div><div class='add'>+</div><div class='ctx'> moved:</div><div class='ctx'> 	if (bo-&gt;evicted) {</div><div class='ctx'> 		ret = bdev-&gt;driver-&gt;invalidate_caches(bdev, bo-&gt;mem.placement);</div><div class='hunk'>@@ -472,6 +457,9 @@ out_err:</div><div class='ctx'> </div><div class='ctx'> static void ttm_bo_cleanup_memtype_use(struct ttm_buffer_object *bo)</div><div class='ctx'> {</div><div class='add'>+	if (bo-&gt;bdev-&gt;driver-&gt;move_notify)</div><div class='add'>+		bo-&gt;bdev-&gt;driver-&gt;move_notify(bo, NULL);</div><div class='add'>+</div><div class='ctx'> 	if (bo-&gt;ttm) {</div><div class='ctx'> 		ttm_tt_unbind(bo-&gt;ttm);</div><div class='ctx'> 		ttm_tt_destroy(bo-&gt;ttm);</div><div class='hunk'>@@ -913,16 +901,12 @@ static uint32_t ttm_bo_select_caching(struct ttm_mem_type_manager *man,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool ttm_bo_mt_compatible(struct ttm_mem_type_manager *man,</div><div class='del'>-				 bool disallow_fixed,</div><div class='ctx'> 				 uint32_t mem_type,</div><div class='ctx'> 				 uint32_t proposed_placement,</div><div class='ctx'> 				 uint32_t *masked_placement)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t cur_flags = ttm_bo_type_flags(mem_type);</div><div class='ctx'> </div><div class='del'>-	if ((man-&gt;flags &amp; TTM_MEMTYPE_FLAG_FIXED) &amp;&amp; disallow_fixed)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='ctx'> 	if ((cur_flags &amp; proposed_placement &amp; TTM_PL_MASK_MEM) == 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -967,7 +951,6 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,</div><div class='ctx'> 		man = &amp;bdev-&gt;man[mem_type];</div><div class='ctx'> </div><div class='ctx'> 		type_ok = ttm_bo_mt_compatible(man,</div><div class='del'>-						bo-&gt;type == ttm_bo_type_user,</div><div class='ctx'> 						mem_type,</div><div class='ctx'> 						placement-&gt;placement[i],</div><div class='ctx'> 						&amp;cur_flags);</div><div class='hunk'>@@ -1015,7 +998,6 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,</div><div class='ctx'> 		if (!man-&gt;has_type)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (!ttm_bo_mt_compatible(man,</div><div class='del'>-						bo-&gt;type == ttm_bo_type_user,</div><div class='ctx'> 						mem_type,</div><div class='ctx'> 						placement-&gt;busy_placement[i],</div><div class='ctx'> 						&amp;cur_flags))</div><div class='hunk'>@@ -1185,6 +1167,17 @@ int ttm_bo_init(struct ttm_bo_device *bdev,</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	unsigned long num_pages;</div><div class='add'>+	struct ttm_mem_global *mem_glob = bdev-&gt;glob-&gt;mem_glob;</div><div class='add'>+</div><div class='add'>+	ret = ttm_mem_global_alloc(mem_glob, acc_size, false, false);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR TTM_PFX "Out of kernel memory.\n");</div><div class='add'>+		if (destroy)</div><div class='add'>+			(*destroy)(bo);</div><div class='add'>+		else</div><div class='add'>+			kfree(bo);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	size += buffer_start &amp; ~PAGE_MASK;</div><div class='ctx'> 	num_pages = (size + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -1255,14 +1248,34 @@ out_err:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ttm_bo_init);</div><div class='ctx'> </div><div class='del'>-static inline size_t ttm_bo_size(struct ttm_bo_global *glob,</div><div class='del'>-				 unsigned long num_pages)</div><div class='add'>+size_t ttm_bo_acc_size(struct ttm_bo_device *bdev,</div><div class='add'>+		       unsigned long bo_size,</div><div class='add'>+		       unsigned struct_size)</div><div class='ctx'> {</div><div class='del'>-	size_t page_array_size = (num_pages * sizeof(void *) + PAGE_SIZE - 1) &amp;</div><div class='del'>-	    PAGE_MASK;</div><div class='add'>+	unsigned npages = (PAGE_ALIGN(bo_size)) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	size_t size = 0;</div><div class='ctx'> </div><div class='del'>-	return glob-&gt;ttm_bo_size + 2 * page_array_size;</div><div class='add'>+	size += ttm_round_pot(struct_size);</div><div class='add'>+	size += PAGE_ALIGN(npages * sizeof(void *));</div><div class='add'>+	size += ttm_round_pot(sizeof(struct ttm_tt));</div><div class='add'>+	return size;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ttm_bo_acc_size);</div><div class='add'>+</div><div class='add'>+size_t ttm_bo_dma_acc_size(struct ttm_bo_device *bdev,</div><div class='add'>+			   unsigned long bo_size,</div><div class='add'>+			   unsigned struct_size)</div><div class='add'>+{</div><div class='add'>+	unsigned npages = (PAGE_ALIGN(bo_size)) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	size_t size = 0;</div><div class='add'>+</div><div class='add'>+	size += ttm_round_pot(struct_size);</div><div class='add'>+	size += PAGE_ALIGN(npages * sizeof(void *));</div><div class='add'>+	size += PAGE_ALIGN(npages * sizeof(dma_addr_t));</div><div class='add'>+	size += ttm_round_pot(sizeof(struct ttm_dma_tt));</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ttm_bo_dma_acc_size);</div><div class='ctx'> </div><div class='ctx'> int ttm_bo_create(struct ttm_bo_device *bdev,</div><div class='ctx'> 			unsigned long size,</div><div class='hunk'>@@ -1276,10 +1289,10 @@ int ttm_bo_create(struct ttm_bo_device *bdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct ttm_buffer_object *bo;</div><div class='ctx'> 	struct ttm_mem_global *mem_glob = bdev-&gt;glob-&gt;mem_glob;</div><div class='add'>+	size_t acc_size;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	size_t acc_size =</div><div class='del'>-	    ttm_bo_size(bdev-&gt;glob, (size + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	acc_size = ttm_bo_acc_size(bdev, size, sizeof(struct ttm_buffer_object));</div><div class='ctx'> 	ret = ttm_mem_global_alloc(mem_glob, acc_size, false, false);</div><div class='ctx'> 	if (unlikely(ret != 0))</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -1465,13 +1478,6 @@ int ttm_bo_global_init(struct drm_global_reference *ref)</div><div class='ctx'> 		goto out_no_shrink;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	glob-&gt;ttm_bo_extra_size =</div><div class='del'>-		ttm_round_pot(sizeof(struct ttm_tt)) +</div><div class='del'>-		ttm_round_pot(sizeof(struct ttm_backend));</div><div class='del'>-</div><div class='del'>-	glob-&gt;ttm_bo_size = glob-&gt;ttm_bo_extra_size +</div><div class='del'>-		ttm_round_pot(sizeof(struct ttm_buffer_object));</div><div class='del'>-</div><div class='ctx'> 	atomic_set(&amp;glob-&gt;bo_count, 0);</div><div class='ctx'> </div><div class='ctx'> 	ret = kobject_init_and_add(</div><div class='head'>diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c<br/>index 082fcaea583f..f8187ead7b37 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/ttm/ttm_bo_util.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/ttm/ttm_bo_util.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/ttm/ttm_bo_util.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/ttm/ttm_bo_util.c</a></div><div class='hunk'>@@ -244,7 +244,7 @@ static int ttm_copy_io_ttm_page(struct ttm_tt *ttm, void *src,</div><div class='ctx'> 				unsigned long page,</div><div class='ctx'> 				pgprot_t prot)</div><div class='ctx'> {</div><div class='del'>-	struct page *d = ttm_tt_get_page(ttm, page);</div><div class='add'>+	struct page *d = ttm-&gt;pages[page];</div><div class='ctx'> 	void *dst;</div><div class='ctx'> </div><div class='ctx'> 	if (!d)</div><div class='hunk'>@@ -281,7 +281,7 @@ static int ttm_copy_ttm_io_page(struct ttm_tt *ttm, void *dst,</div><div class='ctx'> 				unsigned long page,</div><div class='ctx'> 				pgprot_t prot)</div><div class='ctx'> {</div><div class='del'>-	struct page *s = ttm_tt_get_page(ttm, page);</div><div class='add'>+	struct page *s = ttm-&gt;pages[page];</div><div class='ctx'> 	void *src;</div><div class='ctx'> </div><div class='ctx'> 	if (!s)</div><div class='hunk'>@@ -342,6 +342,12 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,</div><div class='ctx'> 	if (old_iomap == NULL &amp;&amp; ttm == NULL)</div><div class='ctx'> 		goto out2;</div><div class='ctx'> </div><div class='add'>+	if (ttm-&gt;state == tt_unpopulated) {</div><div class='add'>+		ret = ttm-&gt;bdev-&gt;driver-&gt;ttm_tt_populate(ttm);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	add = 0;</div><div class='ctx'> 	dir = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -439,6 +445,7 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo,</div><div class='ctx'> 	kref_init(&amp;fbo-&gt;list_kref);</div><div class='ctx'> 	kref_init(&amp;fbo-&gt;kref);</div><div class='ctx'> 	fbo-&gt;destroy = &amp;ttm_transfered_destroy;</div><div class='add'>+	fbo-&gt;acc_size = 0;</div><div class='ctx'> </div><div class='ctx'> 	*new_obj = fbo;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -502,10 +509,16 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo,</div><div class='ctx'> {</div><div class='ctx'> 	struct ttm_mem_reg *mem = &amp;bo-&gt;mem; pgprot_t prot;</div><div class='ctx'> 	struct ttm_tt *ttm = bo-&gt;ttm;</div><div class='del'>-	struct page *d;</div><div class='del'>-	int i;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!ttm);</div><div class='add'>+</div><div class='add'>+	if (ttm-&gt;state == tt_unpopulated) {</div><div class='add'>+		ret = ttm-&gt;bdev-&gt;driver-&gt;ttm_tt_populate(ttm);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (num_pages == 1 &amp;&amp; (mem-&gt;placement &amp; TTM_PL_FLAG_CACHED)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We're mapping a single page, and the desired</div><div class='hunk'>@@ -513,18 +526,9 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo,</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		map-&gt;bo_kmap_type = ttm_bo_map_kmap;</div><div class='del'>-		map-&gt;page = ttm_tt_get_page(ttm, start_page);</div><div class='add'>+		map-&gt;page = ttm-&gt;pages[start_page];</div><div class='ctx'> 		map-&gt;virtual = kmap(map-&gt;page);</div><div class='ctx'> 	} else {</div><div class='del'>-	    /*</div><div class='del'>-	     * Populate the part we're mapping;</div><div class='del'>-	     */</div><div class='del'>-		for (i = start_page; i &lt; start_page + num_pages; ++i) {</div><div class='del'>-			d = ttm_tt_get_page(ttm, i);</div><div class='del'>-			if (!d)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We need to use vmap to get the desired page protection</div><div class='ctx'> 		 * or to make the buffer object look contiguous.</div><div class='head'>diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c<br/>index 221b924acebe..54412848de88 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/ttm/ttm_bo_vm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/ttm/ttm_bo_vm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/ttm/ttm_bo_vm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/ttm/ttm_bo_vm.c</a></div><div class='hunk'>@@ -174,18 +174,23 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)</div><div class='ctx'> 		vma-&gt;vm_page_prot = (bo-&gt;mem.placement &amp; TTM_PL_FLAG_CACHED) ?</div><div class='ctx'> 		    vm_get_page_prot(vma-&gt;vm_flags) :</div><div class='ctx'> 		    ttm_io_prot(bo-&gt;mem.placement, vma-&gt;vm_page_prot);</div><div class='add'>+</div><div class='add'>+		/* Allocate all page at once, most common usage */</div><div class='add'>+		if (ttm-&gt;bdev-&gt;driver-&gt;ttm_tt_populate(ttm)) {</div><div class='add'>+			retval = VM_FAULT_OOM;</div><div class='add'>+			goto out_io_unlock;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Speculatively prefault a number of pages. Only error on</div><div class='ctx'> 	 * first page.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; TTM_BO_VM_NUM_PREFAULT; ++i) {</div><div class='ctx'> 		if (bo-&gt;mem.bus.is_iomem)</div><div class='ctx'> 			pfn = ((bo-&gt;mem.bus.base + bo-&gt;mem.bus.offset) &gt;&gt; PAGE_SHIFT) + page_offset;</div><div class='ctx'> 		else {</div><div class='del'>-			page = ttm_tt_get_page(ttm, page_offset);</div><div class='add'>+			page = ttm-&gt;pages[page_offset];</div><div class='ctx'> 			if (unlikely(!page &amp;&amp; i == 0)) {</div><div class='ctx'> 				retval = VM_FAULT_OOM;</div><div class='ctx'> 				goto out_io_unlock;</div><div class='head'>diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c<br/>index e70ddd82dc02..9eba8e9a4e9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/ttm/ttm_memory.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/ttm/ttm_memory.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/ttm/ttm_memory.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/ttm/ttm_memory.c</a></div><div class='hunk'>@@ -395,6 +395,7 @@ int ttm_mem_global_init(struct ttm_mem_global *glob)</div><div class='ctx'> 		       zone-&gt;name, (unsigned long long) zone-&gt;max_mem &gt;&gt; 10);</div><div class='ctx'> 	}</div><div class='ctx'> 	ttm_page_alloc_init(glob, glob-&gt;zone_kernel-&gt;max_mem/(2*PAGE_SIZE));</div><div class='add'>+	ttm_dma_page_alloc_init(glob, glob-&gt;zone_kernel-&gt;max_mem/(2*PAGE_SIZE));</div><div class='ctx'> 	return 0;</div><div class='ctx'> out_no_zone:</div><div class='ctx'> 	ttm_mem_global_release(glob);</div><div class='hunk'>@@ -409,6 +410,7 @@ void ttm_mem_global_release(struct ttm_mem_global *glob)</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='add'>+	ttm_dma_page_alloc_fini();</div><div class='ctx'> </div><div class='ctx'> 	flush_workqueue(glob-&gt;swap_queue);</div><div class='ctx'> 	destroy_workqueue(glob-&gt;swap_queue);</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 727e93daac3b..499debda791e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/ttm/ttm_page_alloc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/ttm/ttm_page_alloc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/ttm/ttm_page_alloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/ttm/ttm_page_alloc.c</a></div><div class='hunk'>@@ -619,8 +619,10 @@ static void ttm_page_pool_fill_locked(struct ttm_page_pool *pool,</div><div class='ctx'>  * @return count of pages still required to fulfill the request.</div><div class='ctx'>  */</div><div class='ctx'> static unsigned ttm_page_pool_get_pages(struct ttm_page_pool *pool,</div><div class='del'>-		struct list_head *pages, int ttm_flags,</div><div class='del'>-		enum ttm_caching_state cstate, unsigned count)</div><div class='add'>+					struct list_head *pages,</div><div class='add'>+					int ttm_flags,</div><div class='add'>+					enum ttm_caching_state cstate,</div><div class='add'>+					unsigned count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long irq_flags;</div><div class='ctx'> 	struct list_head *p;</div><div class='hunk'>@@ -660,17 +662,67 @@ out:</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Put all pages in pages list to correct pool to wait for reuse */</div><div class='add'>+static void ttm_put_pages(struct page **pages, unsigned npages, int flags,</div><div class='add'>+			  enum ttm_caching_state cstate)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	struct ttm_page_pool *pool = ttm_get_pool(flags, cstate);</div><div class='add'>+	unsigned i;</div><div class='add'>+</div><div class='add'>+	if (pool == NULL) {</div><div class='add'>+		/* No pool for this memory type so free the pages */</div><div class='add'>+		for (i = 0; i &lt; npages; i++) {</div><div class='add'>+			if (pages[i]) {</div><div class='add'>+				if (page_count(pages[i]) != 1)</div><div class='add'>+					printk(KERN_ERR TTM_PFX</div><div class='add'>+					       "Erroneous page count. "</div><div class='add'>+					       "Leaking pages.\n");</div><div class='add'>+				__free_page(pages[i]);</div><div class='add'>+				pages[i] = NULL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pool-&gt;lock, irq_flags);</div><div class='add'>+	for (i = 0; i &lt; npages; i++) {</div><div class='add'>+		if (pages[i]) {</div><div class='add'>+			if (page_count(pages[i]) != 1)</div><div class='add'>+				printk(KERN_ERR TTM_PFX</div><div class='add'>+				       "Erroneous page count. "</div><div class='add'>+				       "Leaking pages.\n");</div><div class='add'>+			list_add_tail(&amp;pages[i]-&gt;lru, &amp;pool-&gt;list);</div><div class='add'>+			pages[i] = NULL;</div><div class='add'>+			pool-&gt;npages++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* Check that we don't go over the pool limit */</div><div class='add'>+	npages = 0;</div><div class='add'>+	if (pool-&gt;npages &gt; _manager-&gt;options.max_size) {</div><div class='add'>+		npages = pool-&gt;npages - _manager-&gt;options.max_size;</div><div class='add'>+		/* free at least NUM_PAGES_TO_ALLOC number of pages</div><div class='add'>+		 * to reduce calls to set_memory_wb */</div><div class='add'>+		if (npages &lt; NUM_PAGES_TO_ALLOC)</div><div class='add'>+			npages = NUM_PAGES_TO_ALLOC;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;pool-&gt;lock, irq_flags);</div><div class='add'>+	if (npages)</div><div class='add'>+		ttm_page_pool_free(pool, npages);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * On success pages list will hold count number of correctly</div><div class='ctx'>  * cached pages.</div><div class='ctx'>  */</div><div class='del'>-int ttm_get_pages(struct list_head *pages, int flags,</div><div class='del'>-		  enum ttm_caching_state cstate, unsigned count,</div><div class='del'>-		  dma_addr_t *dma_address)</div><div class='add'>+static int ttm_get_pages(struct page **pages, unsigned npages, int flags,</div><div class='add'>+			 enum ttm_caching_state cstate)</div><div class='ctx'> {</div><div class='ctx'> 	struct ttm_page_pool *pool = ttm_get_pool(flags, cstate);</div><div class='add'>+	struct list_head plist;</div><div class='ctx'> 	struct page *p = NULL;</div><div class='ctx'> 	gfp_t gfp_flags = GFP_USER;</div><div class='add'>+	unsigned count;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	/* set zero flag for page allocation if required */</div><div class='hunk'>@@ -684,7 +736,7 @@ int ttm_get_pages(struct list_head *pages, int flags,</div><div class='ctx'> 		else</div><div class='ctx'> 			gfp_flags |= GFP_HIGHUSER;</div><div class='ctx'> </div><div class='del'>-		for (r = 0; r &lt; count; ++r) {</div><div class='add'>+		for (r = 0; r &lt; npages; ++r) {</div><div class='ctx'> 			p = alloc_page(gfp_flags);</div><div class='ctx'> 			if (!p) {</div><div class='ctx'> </div><div class='hunk'>@@ -693,87 +745,53 @@ int ttm_get_pages(struct list_head *pages, int flags,</div><div class='ctx'> 				return -ENOMEM;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			list_add(&amp;p-&gt;lru, pages);</div><div class='add'>+			pages[r] = p;</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	/* combine zero flag to pool flags */</div><div class='ctx'> 	gfp_flags |= pool-&gt;gfp_flags;</div><div class='ctx'> </div><div class='ctx'> 	/* First we take pages from the pool */</div><div class='del'>-	count = ttm_page_pool_get_pages(pool, pages, flags, cstate, count);</div><div class='add'>+	INIT_LIST_HEAD(&amp;plist);</div><div class='add'>+	npages = ttm_page_pool_get_pages(pool, &amp;plist, flags, cstate, npages);</div><div class='add'>+	count = 0;</div><div class='add'>+	list_for_each_entry(p, &amp;plist, lru) {</div><div class='add'>+		pages[count++] = p;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* clear the pages coming from the pool if requested */</div><div class='ctx'> 	if (flags &amp; TTM_PAGE_FLAG_ZERO_ALLOC) {</div><div class='del'>-		list_for_each_entry(p, pages, lru) {</div><div class='add'>+		list_for_each_entry(p, &amp;plist, lru) {</div><div class='ctx'> 			clear_page(page_address(p));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If pool didn't have enough pages allocate new one. */</div><div class='del'>-	if (count &gt; 0) {</div><div class='add'>+	if (npages &gt; 0) {</div><div class='ctx'> 		/* ttm_alloc_new_pages doesn't reference pool so we can run</div><div class='ctx'> 		 * multiple requests in parallel.</div><div class='ctx'> 		 **/</div><div class='del'>-		r = ttm_alloc_new_pages(pages, gfp_flags, flags, cstate, count);</div><div class='add'>+		INIT_LIST_HEAD(&amp;plist);</div><div class='add'>+		r = ttm_alloc_new_pages(&amp;plist, gfp_flags, flags, cstate, npages);</div><div class='add'>+		list_for_each_entry(p, &amp;plist, lru) {</div><div class='add'>+			pages[count++] = p;</div><div class='add'>+		}</div><div class='ctx'> 		if (r) {</div><div class='ctx'> 			/* If there is any pages in the list put them back to</div><div class='ctx'> 			 * the pool. */</div><div class='ctx'> 			printk(KERN_ERR TTM_PFX</div><div class='ctx'> 			       "Failed to allocate extra pages "</div><div class='ctx'> 			       "for large request.");</div><div class='del'>-			ttm_put_pages(pages, 0, flags, cstate, NULL);</div><div class='add'>+			ttm_put_pages(pages, count, flags, cstate);</div><div class='ctx'> 			return r;</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='del'>-/* Put all pages in pages list to correct pool to wait for reuse */</div><div class='del'>-void ttm_put_pages(struct list_head *pages, unsigned page_count, int flags,</div><div class='del'>-		   enum ttm_caching_state cstate, dma_addr_t *dma_address)</div><div class='del'>-{</div><div class='del'>-	unsigned long irq_flags;</div><div class='del'>-	struct ttm_page_pool *pool = ttm_get_pool(flags, cstate);</div><div class='del'>-	struct page *p, *tmp;</div><div class='del'>-</div><div class='del'>-	if (pool == NULL) {</div><div class='del'>-		/* No pool for this memory type so free the pages */</div><div class='del'>-</div><div class='del'>-		list_for_each_entry_safe(p, tmp, pages, lru) {</div><div class='del'>-			__free_page(p);</div><div class='del'>-		}</div><div class='del'>-		/* Make the pages list empty */</div><div class='del'>-		INIT_LIST_HEAD(pages);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (page_count == 0) {</div><div class='del'>-		list_for_each_entry_safe(p, tmp, pages, lru) {</div><div class='del'>-			++page_count;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;pool-&gt;lock, irq_flags);</div><div class='del'>-	list_splice_init(pages, &amp;pool-&gt;list);</div><div class='del'>-	pool-&gt;npages += page_count;</div><div class='del'>-	/* Check that we don't go over the pool limit */</div><div class='del'>-	page_count = 0;</div><div class='del'>-	if (pool-&gt;npages &gt; _manager-&gt;options.max_size) {</div><div class='del'>-		page_count = pool-&gt;npages - _manager-&gt;options.max_size;</div><div class='del'>-		/* free at least NUM_PAGES_TO_ALLOC number of pages</div><div class='del'>-		 * to reduce calls to set_memory_wb */</div><div class='del'>-		if (page_count &lt; NUM_PAGES_TO_ALLOC)</div><div class='del'>-			page_count = NUM_PAGES_TO_ALLOC;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;pool-&gt;lock, irq_flags);</div><div class='del'>-	if (page_count)</div><div class='del'>-		ttm_page_pool_free(pool, page_count);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void ttm_page_pool_init_locked(struct ttm_page_pool *pool, int flags,</div><div class='ctx'> 		char *name)</div><div class='ctx'> {</div><div class='hunk'>@@ -836,6 +854,62 @@ void ttm_page_alloc_fini(void)</div><div class='ctx'> 	_manager = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int ttm_pool_populate(struct ttm_tt *ttm)</div><div class='add'>+{</div><div class='add'>+	struct ttm_mem_global *mem_glob = ttm-&gt;glob-&gt;mem_glob;</div><div class='add'>+	unsigned i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ttm-&gt;state != tt_unpopulated)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ttm-&gt;num_pages; ++i) {</div><div class='add'>+		ret = ttm_get_pages(&amp;ttm-&gt;pages[i], 1,</div><div class='add'>+				    ttm-&gt;page_flags,</div><div class='add'>+				    ttm-&gt;caching_state);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			ttm_pool_unpopulate(ttm);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ttm_mem_global_alloc_page(mem_glob, ttm-&gt;pages[i],</div><div class='add'>+						false, false);</div><div class='add'>+		if (unlikely(ret != 0)) {</div><div class='add'>+			ttm_pool_unpopulate(ttm);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(ttm-&gt;page_flags &amp; TTM_PAGE_FLAG_SWAPPED)) {</div><div class='add'>+		ret = ttm_tt_swapin(ttm);</div><div class='add'>+		if (unlikely(ret != 0)) {</div><div class='add'>+			ttm_pool_unpopulate(ttm);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ttm-&gt;state = tt_unbound;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ttm_pool_populate);</div><div class='add'>+</div><div class='add'>+void ttm_pool_unpopulate(struct ttm_tt *ttm)</div><div class='add'>+{</div><div class='add'>+	unsigned i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ttm-&gt;num_pages; ++i) {</div><div class='add'>+		if (ttm-&gt;pages[i]) {</div><div class='add'>+			ttm_mem_global_free_page(ttm-&gt;glob-&gt;mem_glob,</div><div class='add'>+						 ttm-&gt;pages[i]);</div><div class='add'>+			ttm_put_pages(&amp;ttm-&gt;pages[i], 1,</div><div class='add'>+				      ttm-&gt;page_flags,</div><div class='add'>+				      ttm-&gt;caching_state);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	ttm-&gt;state = tt_unpopulated;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ttm_pool_unpopulate);</div><div class='add'>+</div><div class='ctx'> int ttm_page_alloc_debugfs(struct seq_file *m, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ttm_page_pool *p;</div><div class='head'>diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c<br/>new file mode 100644<br/>index 000000000000..0c46d8cdc6ea<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/ttm/ttm_page_alloc_dma.c</a></div><div class='hunk'>@@ -0,0 +1,1142 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2011 (c) Oracle Corp.</div><div class='add'>+</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sub license,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the</div><div class='add'>+ * next paragraph) shall be included in all copies or substantial portions</div><div class='add'>+ * of the Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL</div><div class='add'>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='add'>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER</div><div class='add'>+ * DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Author: Konrad Rzeszutek Wilk &lt;konrad.wilk@oracle.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * A simple DMA pool losely based on dmapool.c. It has certain advantages</div><div class='add'>+ * over the DMA pools:</div><div class='add'>+ * - Pool collects resently freed pages for reuse (and hooks up to</div><div class='add'>+ *   the shrinker).</div><div class='add'>+ * - Tracks currently in use pages</div><div class='add'>+ * - Tracks whether the page is UC, WB or cached (and reverts to WB</div><div class='add'>+ *   when freed).</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt; /* for seq_printf */</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/highmem.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='add'>+#include "ttm/ttm_bo_driver.h"</div><div class='add'>+#include "ttm/ttm_page_alloc.h"</div><div class='add'>+#ifdef TTM_HAS_AGP</div><div class='add'>+#include &lt;asm/agp.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define NUM_PAGES_TO_ALLOC		(PAGE_SIZE/sizeof(struct page *))</div><div class='add'>+#define SMALL_ALLOCATION		4</div><div class='add'>+#define FREE_ALL_PAGES			(~0U)</div><div class='add'>+/* times are in msecs */</div><div class='add'>+#define IS_UNDEFINED			(0)</div><div class='add'>+#define IS_WC				(1&lt;&lt;1)</div><div class='add'>+#define IS_UC				(1&lt;&lt;2)</div><div class='add'>+#define IS_CACHED			(1&lt;&lt;3)</div><div class='add'>+#define IS_DMA32			(1&lt;&lt;4)</div><div class='add'>+</div><div class='add'>+enum pool_type {</div><div class='add'>+	POOL_IS_UNDEFINED,</div><div class='add'>+	POOL_IS_WC = IS_WC,</div><div class='add'>+	POOL_IS_UC = IS_UC,</div><div class='add'>+	POOL_IS_CACHED = IS_CACHED,</div><div class='add'>+	POOL_IS_WC_DMA32 = IS_WC | IS_DMA32,</div><div class='add'>+	POOL_IS_UC_DMA32 = IS_UC | IS_DMA32,</div><div class='add'>+	POOL_IS_CACHED_DMA32 = IS_CACHED | IS_DMA32,</div><div class='add'>+};</div><div class='add'>+/*</div><div class='add'>+ * The pool structure. There are usually six pools:</div><div class='add'>+ *  - generic (not restricted to DMA32):</div><div class='add'>+ *      - write combined, uncached, cached.</div><div class='add'>+ *  - dma32 (up to 2^32 - so up 4GB):</div><div class='add'>+ *      - write combined, uncached, cached.</div><div class='add'>+ * for each 'struct device'. The 'cached' is for pages that are actively used.</div><div class='add'>+ * The other ones can be shrunk by the shrinker API if neccessary.</div><div class='add'>+ * @pools: The 'struct device-&gt;dma_pools' link.</div><div class='add'>+ * @type: Type of the pool</div><div class='add'>+ * @lock: Protects the inuse_list and free_list from concurrnet access. Must be</div><div class='add'>+ * used with irqsave/irqrestore variants because pool allocator maybe called</div><div class='add'>+ * from delayed work.</div><div class='add'>+ * @inuse_list: Pool of pages that are in use. The order is very important and</div><div class='add'>+ *   it is in the order that the TTM pages that are put back are in.</div><div class='add'>+ * @free_list: Pool of pages that are free to be used. No order requirements.</div><div class='add'>+ * @dev: The device that is associated with these pools.</div><div class='add'>+ * @size: Size used during DMA allocation.</div><div class='add'>+ * @npages_free: Count of available pages for re-use.</div><div class='add'>+ * @npages_in_use: Count of pages that are in use.</div><div class='add'>+ * @nfrees: Stats when pool is shrinking.</div><div class='add'>+ * @nrefills: Stats when the pool is grown.</div><div class='add'>+ * @gfp_flags: Flags to pass for alloc_page.</div><div class='add'>+ * @name: Name of the pool.</div><div class='add'>+ * @dev_name: Name derieved from dev - similar to how dev_info works.</div><div class='add'>+ *   Used during shutdown as the dev_info during release is unavailable.</div><div class='add'>+ */</div><div class='add'>+struct dma_pool {</div><div class='add'>+	struct list_head pools; /* The 'struct device-&gt;dma_pools link */</div><div class='add'>+	enum pool_type type;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	struct list_head inuse_list;</div><div class='add'>+	struct list_head free_list;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	unsigned size;</div><div class='add'>+	unsigned npages_free;</div><div class='add'>+	unsigned npages_in_use;</div><div class='add'>+	unsigned long nfrees; /* Stats when shrunk. */</div><div class='add'>+	unsigned long nrefills; /* Stats when grown. */</div><div class='add'>+	gfp_t gfp_flags;</div><div class='add'>+	char name[13]; /* "cached dma32" */</div><div class='add'>+	char dev_name[64]; /* Constructed from dev */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The accounting page keeping track of the allocated page along with</div><div class='add'>+ * the DMA address.</div><div class='add'>+ * @page_list: The link to the 'page_list' in 'struct dma_pool'.</div><div class='add'>+ * @vaddr: The virtual address of the page</div><div class='add'>+ * @dma: The bus address of the page. If the page is not allocated</div><div class='add'>+ *   via the DMA API, it will be -1.</div><div class='add'>+ */</div><div class='add'>+struct dma_page {</div><div class='add'>+	struct list_head page_list;</div><div class='add'>+	void *vaddr;</div><div class='add'>+	struct page *p;</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Limits for the pool. They are handled without locks because only place where</div><div class='add'>+ * they may change is in sysfs store. They won't have immediate effect anyway</div><div class='add'>+ * so forcing serialization to access them is pointless.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct ttm_pool_opts {</div><div class='add'>+	unsigned	alloc_size;</div><div class='add'>+	unsigned	max_size;</div><div class='add'>+	unsigned	small;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Contains the list of all of the 'struct device' and their corresponding</div><div class='add'>+ * DMA pools. Guarded by _mutex-&gt;lock.</div><div class='add'>+ * @pools: The link to 'struct ttm_pool_manager-&gt;pools'</div><div class='add'>+ * @dev: The 'struct device' associated with the 'pool'</div><div class='add'>+ * @pool: The 'struct dma_pool' associated with the 'dev'</div><div class='add'>+ */</div><div class='add'>+struct device_pools {</div><div class='add'>+	struct list_head pools;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct dma_pool *pool;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct ttm_pool_manager - Holds memory pools for fast allocation</div><div class='add'>+ *</div><div class='add'>+ * @lock: Lock used when adding/removing from pools</div><div class='add'>+ * @pools: List of 'struct device' and 'struct dma_pool' tuples.</div><div class='add'>+ * @options: Limits for the pool.</div><div class='add'>+ * @npools: Total amount of pools in existence.</div><div class='add'>+ * @shrinker: The structure used by [un|]register_shrinker</div><div class='add'>+ */</div><div class='add'>+struct ttm_pool_manager {</div><div class='add'>+	struct mutex		lock;</div><div class='add'>+	struct list_head	pools;</div><div class='add'>+	struct ttm_pool_opts	options;</div><div class='add'>+	unsigned		npools;</div><div class='add'>+	struct shrinker		mm_shrink;</div><div class='add'>+	struct kobject		kobj;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ttm_pool_manager *_manager;</div><div class='add'>+</div><div class='add'>+static struct attribute ttm_page_pool_max = {</div><div class='add'>+	.name = "pool_max_size",</div><div class='add'>+	.mode = S_IRUGO | S_IWUSR</div><div class='add'>+};</div><div class='add'>+static struct attribute ttm_page_pool_small = {</div><div class='add'>+	.name = "pool_small_allocation",</div><div class='add'>+	.mode = S_IRUGO | S_IWUSR</div><div class='add'>+};</div><div class='add'>+static struct attribute ttm_page_pool_alloc_size = {</div><div class='add'>+	.name = "pool_allocation_size",</div><div class='add'>+	.mode = S_IRUGO | S_IWUSR</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute *ttm_pool_attrs[] = {</div><div class='add'>+	&amp;ttm_page_pool_max,</div><div class='add'>+	&amp;ttm_page_pool_small,</div><div class='add'>+	&amp;ttm_page_pool_alloc_size,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ttm_pool_kobj_release(struct kobject *kobj)</div><div class='add'>+{</div><div class='add'>+	struct ttm_pool_manager *m =</div><div class='add'>+		container_of(kobj, struct ttm_pool_manager, kobj);</div><div class='add'>+	kfree(m);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ttm_pool_store(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+			      const char *buffer, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct ttm_pool_manager *m =</div><div class='add'>+		container_of(kobj, struct ttm_pool_manager, kobj);</div><div class='add'>+	int chars;</div><div class='add'>+	unsigned val;</div><div class='add'>+	chars = sscanf(buffer, "%u", &amp;val);</div><div class='add'>+	if (chars == 0)</div><div class='add'>+		return size;</div><div class='add'>+</div><div class='add'>+	/* Convert kb to number of pages */</div><div class='add'>+	val = val / (PAGE_SIZE &gt;&gt; 10);</div><div class='add'>+</div><div class='add'>+	if (attr == &amp;ttm_page_pool_max)</div><div class='add'>+		m-&gt;options.max_size = val;</div><div class='add'>+	else if (attr == &amp;ttm_page_pool_small)</div><div class='add'>+		m-&gt;options.small = val;</div><div class='add'>+	else if (attr == &amp;ttm_page_pool_alloc_size) {</div><div class='add'>+		if (val &gt; NUM_PAGES_TO_ALLOC*8) {</div><div class='add'>+			printk(KERN_ERR TTM_PFX</div><div class='add'>+			       "Setting allocation size to %lu "</div><div class='add'>+			       "is not allowed. Recommended size is "</div><div class='add'>+			       "%lu\n",</div><div class='add'>+			       NUM_PAGES_TO_ALLOC*(PAGE_SIZE &gt;&gt; 7),</div><div class='add'>+			       NUM_PAGES_TO_ALLOC*(PAGE_SIZE &gt;&gt; 10));</div><div class='add'>+			return size;</div><div class='add'>+		} else if (val &gt; NUM_PAGES_TO_ALLOC) {</div><div class='add'>+			printk(KERN_WARNING TTM_PFX</div><div class='add'>+			       "Setting allocation size to "</div><div class='add'>+			       "larger than %lu is not recommended.\n",</div><div class='add'>+			       NUM_PAGES_TO_ALLOC*(PAGE_SIZE &gt;&gt; 10));</div><div class='add'>+		}</div><div class='add'>+		m-&gt;options.alloc_size = val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ttm_pool_show(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+			     char *buffer)</div><div class='add'>+{</div><div class='add'>+	struct ttm_pool_manager *m =</div><div class='add'>+		container_of(kobj, struct ttm_pool_manager, kobj);</div><div class='add'>+	unsigned val = 0;</div><div class='add'>+</div><div class='add'>+	if (attr == &amp;ttm_page_pool_max)</div><div class='add'>+		val = m-&gt;options.max_size;</div><div class='add'>+	else if (attr == &amp;ttm_page_pool_small)</div><div class='add'>+		val = m-&gt;options.small;</div><div class='add'>+	else if (attr == &amp;ttm_page_pool_alloc_size)</div><div class='add'>+		val = m-&gt;options.alloc_size;</div><div class='add'>+</div><div class='add'>+	val = val * (PAGE_SIZE &gt;&gt; 10);</div><div class='add'>+</div><div class='add'>+	return snprintf(buffer, PAGE_SIZE, "%u\n", val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct sysfs_ops ttm_pool_sysfs_ops = {</div><div class='add'>+	.show = &amp;ttm_pool_show,</div><div class='add'>+	.store = &amp;ttm_pool_store,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kobj_type ttm_pool_kobj_type = {</div><div class='add'>+	.release = &amp;ttm_pool_kobj_release,</div><div class='add'>+	.sysfs_ops = &amp;ttm_pool_sysfs_ops,</div><div class='add'>+	.default_attrs = ttm_pool_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_X86</div><div class='add'>+static int set_pages_array_wb(struct page **pages, int addrinarray)</div><div class='add'>+{</div><div class='add'>+#ifdef TTM_HAS_AGP</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; addrinarray; i++)</div><div class='add'>+		unmap_page_from_agp(pages[i]);</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 set_pages_array_wc(struct page **pages, int addrinarray)</div><div class='add'>+{</div><div class='add'>+#ifdef TTM_HAS_AGP</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; addrinarray; i++)</div><div class='add'>+		map_page_into_agp(pages[i]);</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 set_pages_array_uc(struct page **pages, int addrinarray)</div><div class='add'>+{</div><div class='add'>+#ifdef TTM_HAS_AGP</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; addrinarray; i++)</div><div class='add'>+		map_page_into_agp(pages[i]);</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* for !CONFIG_X86 */</div><div class='add'>+</div><div class='add'>+static int ttm_set_pages_caching(struct dma_pool *pool,</div><div class='add'>+				 struct page **pages, unsigned cpages)</div><div class='add'>+{</div><div class='add'>+	int r = 0;</div><div class='add'>+	/* Set page caching */</div><div class='add'>+	if (pool-&gt;type &amp; IS_UC) {</div><div class='add'>+		r = set_pages_array_uc(pages, cpages);</div><div class='add'>+		if (r)</div><div class='add'>+			pr_err(TTM_PFX</div><div class='add'>+			       "%s: Failed to set %d pages to uc!\n",</div><div class='add'>+			       pool-&gt;dev_name, cpages);</div><div class='add'>+	}</div><div class='add'>+	if (pool-&gt;type &amp; IS_WC) {</div><div class='add'>+		r = set_pages_array_wc(pages, cpages);</div><div class='add'>+		if (r)</div><div class='add'>+			pr_err(TTM_PFX</div><div class='add'>+			       "%s: Failed to set %d pages to wc!\n",</div><div class='add'>+			       pool-&gt;dev_name, cpages);</div><div class='add'>+	}</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __ttm_dma_free_page(struct dma_pool *pool, struct dma_page *d_page)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t dma = d_page-&gt;dma;</div><div class='add'>+	dma_free_coherent(pool-&gt;dev, pool-&gt;size, d_page-&gt;vaddr, dma);</div><div class='add'>+</div><div class='add'>+	kfree(d_page);</div><div class='add'>+	d_page = NULL;</div><div class='add'>+}</div><div class='add'>+static struct dma_page *__ttm_dma_alloc_page(struct dma_pool *pool)</div><div class='add'>+{</div><div class='add'>+	struct dma_page *d_page;</div><div class='add'>+</div><div class='add'>+	d_page = kmalloc(sizeof(struct dma_page), GFP_KERNEL);</div><div class='add'>+	if (!d_page)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	d_page-&gt;vaddr = dma_alloc_coherent(pool-&gt;dev, pool-&gt;size,</div><div class='add'>+					   &amp;d_page-&gt;dma,</div><div class='add'>+					   pool-&gt;gfp_flags);</div><div class='add'>+	if (d_page-&gt;vaddr)</div><div class='add'>+		d_page-&gt;p = virt_to_page(d_page-&gt;vaddr);</div><div class='add'>+	else {</div><div class='add'>+		kfree(d_page);</div><div class='add'>+		d_page = NULL;</div><div class='add'>+	}</div><div class='add'>+	return d_page;</div><div class='add'>+}</div><div class='add'>+static enum pool_type ttm_to_type(int flags, enum ttm_caching_state cstate)</div><div class='add'>+{</div><div class='add'>+	enum pool_type type = IS_UNDEFINED;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; TTM_PAGE_FLAG_DMA32)</div><div class='add'>+		type |= IS_DMA32;</div><div class='add'>+	if (cstate == tt_cached)</div><div class='add'>+		type |= IS_CACHED;</div><div class='add'>+	else if (cstate == tt_uncached)</div><div class='add'>+		type |= IS_UC;</div><div class='add'>+	else</div><div class='add'>+		type |= IS_WC;</div><div class='add'>+</div><div class='add'>+	return type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ttm_pool_update_free_locked(struct dma_pool *pool,</div><div class='add'>+					unsigned freed_pages)</div><div class='add'>+{</div><div class='add'>+	pool-&gt;npages_free -= freed_pages;</div><div class='add'>+	pool-&gt;nfrees += freed_pages;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set memory back to wb and free the pages. */</div><div class='add'>+static void ttm_dma_pages_put(struct dma_pool *pool, struct list_head *d_pages,</div><div class='add'>+			      struct page *pages[], unsigned npages)</div><div class='add'>+{</div><div class='add'>+	struct dma_page *d_page, *tmp;</div><div class='add'>+</div><div class='add'>+	/* Don't set WB on WB page pool. */</div><div class='add'>+	if (npages &amp;&amp; !(pool-&gt;type &amp; IS_CACHED) &amp;&amp;</div><div class='add'>+	    set_pages_array_wb(pages, npages))</div><div class='add'>+		pr_err(TTM_PFX "%s: Failed to set %d pages to wb!\n",</div><div class='add'>+			pool-&gt;dev_name, npages);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(d_page, tmp, d_pages, page_list) {</div><div class='add'>+		list_del(&amp;d_page-&gt;page_list);</div><div class='add'>+		__ttm_dma_free_page(pool, d_page);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)</div><div class='add'>+{</div><div class='add'>+	/* Don't set WB on WB page pool. */</div><div class='add'>+	if (!(pool-&gt;type &amp; IS_CACHED) &amp;&amp; set_pages_array_wb(&amp;d_page-&gt;p, 1))</div><div class='add'>+		pr_err(TTM_PFX "%s: Failed to set %d pages to wb!\n",</div><div class='add'>+			pool-&gt;dev_name, 1);</div><div class='add'>+</div><div class='add'>+	list_del(&amp;d_page-&gt;page_list);</div><div class='add'>+	__ttm_dma_free_page(pool, d_page);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Free pages from pool.</div><div class='add'>+ *</div><div class='add'>+ * To prevent hogging the ttm_swap process we only free NUM_PAGES_TO_ALLOC</div><div class='add'>+ * number of pages in one go.</div><div class='add'>+ *</div><div class='add'>+ * @pool: to free the pages from</div><div class='add'>+ * @nr_free: If set to true will free all pages in pool</div><div class='add'>+ **/</div><div class='add'>+static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	struct dma_page *dma_p, *tmp;</div><div class='add'>+	struct page **pages_to_free;</div><div class='add'>+	struct list_head d_pages;</div><div class='add'>+	unsigned freed_pages = 0,</div><div class='add'>+		 npages_to_free = nr_free;</div><div class='add'>+</div><div class='add'>+	if (NUM_PAGES_TO_ALLOC &lt; nr_free)</div><div class='add'>+		npages_to_free = NUM_PAGES_TO_ALLOC;</div><div class='add'>+#if 0</div><div class='add'>+	if (nr_free &gt; 1) {</div><div class='add'>+		pr_debug("%s: (%s:%d) Attempting to free %d (%d) pages\n",</div><div class='add'>+			pool-&gt;dev_name, pool-&gt;name, current-&gt;pid,</div><div class='add'>+			npages_to_free, nr_free);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	pages_to_free = kmalloc(npages_to_free * sizeof(struct page *),</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!pages_to_free) {</div><div class='add'>+		pr_err(TTM_PFX</div><div class='add'>+		       "%s: Failed to allocate memory for pool free operation.\n",</div><div class='add'>+			pool-&gt;dev_name);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	INIT_LIST_HEAD(&amp;d_pages);</div><div class='add'>+restart:</div><div class='add'>+	spin_lock_irqsave(&amp;pool-&gt;lock, irq_flags);</div><div class='add'>+</div><div class='add'>+	/* We picking the oldest ones off the list */</div><div class='add'>+	list_for_each_entry_safe_reverse(dma_p, tmp, &amp;pool-&gt;free_list,</div><div class='add'>+					 page_list) {</div><div class='add'>+		if (freed_pages &gt;= npages_to_free)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Move the dma_page from one list to another. */</div><div class='add'>+		list_move(&amp;dma_p-&gt;page_list, &amp;d_pages);</div><div class='add'>+</div><div class='add'>+		pages_to_free[freed_pages++] = dma_p-&gt;p;</div><div class='add'>+		/* We can only remove NUM_PAGES_TO_ALLOC at a time. */</div><div class='add'>+		if (freed_pages &gt;= NUM_PAGES_TO_ALLOC) {</div><div class='add'>+</div><div class='add'>+			ttm_pool_update_free_locked(pool, freed_pages);</div><div class='add'>+			/**</div><div class='add'>+			 * Because changing page caching is costly</div><div class='add'>+			 * we unlock the pool to prevent stalling.</div><div class='add'>+			 */</div><div class='add'>+			spin_unlock_irqrestore(&amp;pool-&gt;lock, irq_flags);</div><div class='add'>+</div><div class='add'>+			ttm_dma_pages_put(pool, &amp;d_pages, pages_to_free,</div><div class='add'>+					  freed_pages);</div><div class='add'>+</div><div class='add'>+			INIT_LIST_HEAD(&amp;d_pages);</div><div class='add'>+</div><div class='add'>+			if (likely(nr_free != FREE_ALL_PAGES))</div><div class='add'>+				nr_free -= freed_pages;</div><div class='add'>+</div><div class='add'>+			if (NUM_PAGES_TO_ALLOC &gt;= nr_free)</div><div class='add'>+				npages_to_free = nr_free;</div><div class='add'>+			else</div><div class='add'>+				npages_to_free = NUM_PAGES_TO_ALLOC;</div><div class='add'>+</div><div class='add'>+			freed_pages = 0;</div><div class='add'>+</div><div class='add'>+			/* free all so restart the processing */</div><div class='add'>+			if (nr_free)</div><div class='add'>+				goto restart;</div><div class='add'>+</div><div class='add'>+			/* Not allowed to fall through or break because</div><div class='add'>+			 * following context is inside spinlock while we are</div><div class='add'>+			 * outside here.</div><div class='add'>+			 */</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* remove range of pages from the pool */</div><div class='add'>+	if (freed_pages) {</div><div class='add'>+		ttm_pool_update_free_locked(pool, freed_pages);</div><div class='add'>+		nr_free -= freed_pages;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;pool-&gt;lock, irq_flags);</div><div class='add'>+</div><div class='add'>+	if (freed_pages)</div><div class='add'>+		ttm_dma_pages_put(pool, &amp;d_pages, pages_to_free, freed_pages);</div><div class='add'>+out:</div><div class='add'>+	kfree(pages_to_free);</div><div class='add'>+	return nr_free;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ttm_dma_free_pool(struct device *dev, enum pool_type type)</div><div class='add'>+{</div><div class='add'>+	struct device_pools *p;</div><div class='add'>+	struct dma_pool *pool;</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;_manager-&gt;lock);</div><div class='add'>+	list_for_each_entry_reverse(p, &amp;_manager-&gt;pools, pools) {</div><div class='add'>+		if (p-&gt;dev != dev)</div><div class='add'>+			continue;</div><div class='add'>+		pool = p-&gt;pool;</div><div class='add'>+		if (pool-&gt;type != type)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		list_del(&amp;p-&gt;pools);</div><div class='add'>+		kfree(p);</div><div class='add'>+		_manager-&gt;npools--;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	list_for_each_entry_reverse(pool, &amp;dev-&gt;dma_pools, pools) {</div><div class='add'>+		if (pool-&gt;type != type)</div><div class='add'>+			continue;</div><div class='add'>+		/* Takes a spinlock.. */</div><div class='add'>+		ttm_dma_page_pool_free(pool, FREE_ALL_PAGES);</div><div class='add'>+		WARN_ON(((pool-&gt;npages_in_use + pool-&gt;npages_free) != 0));</div><div class='add'>+		/* This code path is called after _all_ references to the</div><div class='add'>+		 * struct device has been dropped - so nobody should be</div><div class='add'>+		 * touching it. In case somebody is trying to _add_ we are</div><div class='add'>+		 * guarded by the mutex. */</div><div class='add'>+		list_del(&amp;pool-&gt;pools);</div><div class='add'>+		kfree(pool);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;_manager-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On free-ing of the 'struct device' this deconstructor is run.</div><div class='add'>+ * Albeit the pool might have already been freed earlier.</div><div class='add'>+ */</div><div class='add'>+static void ttm_dma_pool_release(struct device *dev, void *res)</div><div class='add'>+{</div><div class='add'>+	struct dma_pool *pool = *(struct dma_pool **)res;</div><div class='add'>+</div><div class='add'>+	if (pool)</div><div class='add'>+		ttm_dma_free_pool(dev, pool-&gt;type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ttm_dma_pool_match(struct device *dev, void *res, void *match_data)</div><div class='add'>+{</div><div class='add'>+	return *(struct dma_pool **)res == match_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dma_pool *ttm_dma_pool_init(struct device *dev, gfp_t flags,</div><div class='add'>+					  enum pool_type type)</div><div class='add'>+{</div><div class='add'>+	char *n[] = {"wc", "uc", "cached", " dma32", "unknown",};</div><div class='add'>+	enum pool_type t[] = {IS_WC, IS_UC, IS_CACHED, IS_DMA32, IS_UNDEFINED};</div><div class='add'>+	struct device_pools *sec_pool = NULL;</div><div class='add'>+	struct dma_pool *pool = NULL, **ptr;</div><div class='add'>+	unsigned i;</div><div class='add'>+	int ret = -ENODEV;</div><div class='add'>+	char *p;</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ptr = devres_alloc(ttm_dma_pool_release, sizeof(*ptr), GFP_KERNEL);</div><div class='add'>+	if (!ptr)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pool = kmalloc_node(sizeof(struct dma_pool), GFP_KERNEL,</div><div class='add'>+			    dev_to_node(dev));</div><div class='add'>+	if (!pool)</div><div class='add'>+		goto err_mem;</div><div class='add'>+</div><div class='add'>+	sec_pool = kmalloc_node(sizeof(struct device_pools), GFP_KERNEL,</div><div class='add'>+				dev_to_node(dev));</div><div class='add'>+	if (!sec_pool)</div><div class='add'>+		goto err_mem;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;sec_pool-&gt;pools);</div><div class='add'>+	sec_pool-&gt;dev = dev;</div><div class='add'>+	sec_pool-&gt;pool =  pool;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;pool-&gt;free_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;pool-&gt;inuse_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;pool-&gt;pools);</div><div class='add'>+	spin_lock_init(&amp;pool-&gt;lock);</div><div class='add'>+	pool-&gt;dev = dev;</div><div class='add'>+	pool-&gt;npages_free = pool-&gt;npages_in_use = 0;</div><div class='add'>+	pool-&gt;nfrees = 0;</div><div class='add'>+	pool-&gt;gfp_flags = flags;</div><div class='add'>+	pool-&gt;size = PAGE_SIZE;</div><div class='add'>+	pool-&gt;type = type;</div><div class='add'>+	pool-&gt;nrefills = 0;</div><div class='add'>+	p = pool-&gt;name;</div><div class='add'>+	for (i = 0; i &lt; 5; i++) {</div><div class='add'>+		if (type &amp; t[i]) {</div><div class='add'>+			p += snprintf(p, sizeof(pool-&gt;name) - (p - pool-&gt;name),</div><div class='add'>+				      "%s", n[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	*p = 0;</div><div class='add'>+	/* We copy the name for pr_ calls b/c when dma_pool_destroy is called</div><div class='add'>+	 * - the kobj-&gt;name has already been deallocated.*/</div><div class='add'>+	snprintf(pool-&gt;dev_name, sizeof(pool-&gt;dev_name), "%s %s",</div><div class='add'>+		 dev_driver_string(dev), dev_name(dev));</div><div class='add'>+	mutex_lock(&amp;_manager-&gt;lock);</div><div class='add'>+	/* You can get the dma_pool from either the global: */</div><div class='add'>+	list_add(&amp;sec_pool-&gt;pools, &amp;_manager-&gt;pools);</div><div class='add'>+	_manager-&gt;npools++;</div><div class='add'>+	/* or from 'struct device': */</div><div class='add'>+	list_add(&amp;pool-&gt;pools, &amp;dev-&gt;dma_pools);</div><div class='add'>+	mutex_unlock(&amp;_manager-&gt;lock);</div><div class='add'>+</div><div class='add'>+	*ptr = pool;</div><div class='add'>+	devres_add(dev, ptr);</div><div class='add'>+</div><div class='add'>+	return pool;</div><div class='add'>+err_mem:</div><div class='add'>+	devres_free(ptr);</div><div class='add'>+	kfree(sec_pool);</div><div class='add'>+	kfree(pool);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dma_pool *ttm_dma_find_pool(struct device *dev,</div><div class='add'>+					  enum pool_type type)</div><div class='add'>+{</div><div class='add'>+	struct dma_pool *pool, *tmp, *found = NULL;</div><div class='add'>+</div><div class='add'>+	if (type == IS_UNDEFINED)</div><div class='add'>+		return found;</div><div class='add'>+</div><div class='add'>+	/* NB: We iterate on the 'struct dev' which has no spinlock, but</div><div class='add'>+	 * it does have a kref which we have taken. The kref is taken during</div><div class='add'>+	 * graphic driver loading - in the drm_pci_init it calls either</div><div class='add'>+	 * pci_dev_get or pci_register_driver which both end up taking a kref</div><div class='add'>+	 * on 'struct device'.</div><div class='add'>+	 *</div><div class='add'>+	 * On teardown, the graphic drivers end up quiescing the TTM (put_pages)</div><div class='add'>+	 * and calls the dev_res deconstructors: ttm_dma_pool_release. The nice</div><div class='add'>+	 * thing is at that point of time there are no pages associated with the</div><div class='add'>+	 * driver so this function will not be called.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry_safe(pool, tmp, &amp;dev-&gt;dma_pools, pools) {</div><div class='add'>+		if (pool-&gt;type != type)</div><div class='add'>+			continue;</div><div class='add'>+		found = pool;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return found;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Free pages the pages that failed to change the caching state. If there</div><div class='add'>+ * are pages that have changed their caching state already put them to the</div><div class='add'>+ * pool.</div><div class='add'>+ */</div><div class='add'>+static void ttm_dma_handle_caching_state_failure(struct dma_pool *pool,</div><div class='add'>+						 struct list_head *d_pages,</div><div class='add'>+						 struct page **failed_pages,</div><div class='add'>+						 unsigned cpages)</div><div class='add'>+{</div><div class='add'>+	struct dma_page *d_page, *tmp;</div><div class='add'>+	struct page *p;</div><div class='add'>+	unsigned i = 0;</div><div class='add'>+</div><div class='add'>+	p = failed_pages[0];</div><div class='add'>+	if (!p)</div><div class='add'>+		return;</div><div class='add'>+	/* Find the failed page. */</div><div class='add'>+	list_for_each_entry_safe(d_page, tmp, d_pages, page_list) {</div><div class='add'>+		if (d_page-&gt;p != p)</div><div class='add'>+			continue;</div><div class='add'>+		/* .. and then progress over the full list. */</div><div class='add'>+		list_del(&amp;d_page-&gt;page_list);</div><div class='add'>+		__ttm_dma_free_page(pool, d_page);</div><div class='add'>+		if (++i &lt; cpages)</div><div class='add'>+			p = failed_pages[i];</div><div class='add'>+		else</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'>+ * Allocate 'count' pages, and put 'need' number of them on the</div><div class='add'>+ * 'pages' and as well on the 'dma_address' starting at 'dma_offset' offset.</div><div class='add'>+ * The full list of pages should also be on 'd_pages'.</div><div class='add'>+ * We return zero for success, and negative numbers as errors.</div><div class='add'>+ */</div><div class='add'>+static int ttm_dma_pool_alloc_new_pages(struct dma_pool *pool,</div><div class='add'>+					struct list_head *d_pages,</div><div class='add'>+					unsigned count)</div><div class='add'>+{</div><div class='add'>+	struct page **caching_array;</div><div class='add'>+	struct dma_page *dma_p;</div><div class='add'>+	struct page *p;</div><div class='add'>+	int r = 0;</div><div class='add'>+	unsigned i, cpages;</div><div class='add'>+	unsigned max_cpages = min(count,</div><div class='add'>+			(unsigned)(PAGE_SIZE/sizeof(struct page *)));</div><div class='add'>+</div><div class='add'>+	/* allocate array for page caching change */</div><div class='add'>+	caching_array = kmalloc(max_cpages*sizeof(struct page *), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!caching_array) {</div><div class='add'>+		pr_err(TTM_PFX</div><div class='add'>+		       "%s: Unable to allocate table for new pages.",</div><div class='add'>+			pool-&gt;dev_name);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (count &gt; 1) {</div><div class='add'>+		pr_debug("%s: (%s:%d) Getting %d pages\n",</div><div class='add'>+			pool-&gt;dev_name, pool-&gt;name, current-&gt;pid,</div><div class='add'>+			count);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0, cpages = 0; i &lt; count; ++i) {</div><div class='add'>+		dma_p = __ttm_dma_alloc_page(pool);</div><div class='add'>+		if (!dma_p) {</div><div class='add'>+			pr_err(TTM_PFX "%s: Unable to get page %u.\n",</div><div class='add'>+				pool-&gt;dev_name, i);</div><div class='add'>+</div><div class='add'>+			/* store already allocated pages in the pool after</div><div class='add'>+			 * setting the caching state */</div><div class='add'>+			if (cpages) {</div><div class='add'>+				r = ttm_set_pages_caching(pool, caching_array,</div><div class='add'>+							  cpages);</div><div class='add'>+				if (r)</div><div class='add'>+					ttm_dma_handle_caching_state_failure(</div><div class='add'>+						pool, d_pages, caching_array,</div><div class='add'>+						cpages);</div><div class='add'>+			}</div><div class='add'>+			r = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		p = dma_p-&gt;p;</div><div class='add'>+#ifdef CONFIG_HIGHMEM</div><div class='add'>+		/* gfp flags of highmem page should never be dma32 so we</div><div class='add'>+		 * we should be fine in such case</div><div class='add'>+		 */</div><div class='add'>+		if (!PageHighMem(p))</div><div class='add'>+#endif</div><div class='add'>+		{</div><div class='add'>+			caching_array[cpages++] = p;</div><div class='add'>+			if (cpages == max_cpages) {</div><div class='add'>+				/* Note: Cannot hold the spinlock */</div><div class='add'>+				r = ttm_set_pages_caching(pool, caching_array,</div><div class='add'>+						 cpages);</div><div class='add'>+				if (r) {</div><div class='add'>+					ttm_dma_handle_caching_state_failure(</div><div class='add'>+						pool, d_pages, caching_array,</div><div class='add'>+						cpages);</div><div class='add'>+					goto out;</div><div class='add'>+				}</div><div class='add'>+				cpages = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		list_add(&amp;dma_p-&gt;page_list, d_pages);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cpages) {</div><div class='add'>+		r = ttm_set_pages_caching(pool, caching_array, cpages);</div><div class='add'>+		if (r)</div><div class='add'>+			ttm_dma_handle_caching_state_failure(pool, d_pages,</div><div class='add'>+					caching_array, cpages);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	kfree(caching_array);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * @return count of pages still required to fulfill the request.</div><div class='add'>+ */</div><div class='add'>+static int ttm_dma_page_pool_fill_locked(struct dma_pool *pool,</div><div class='add'>+					 unsigned long *irq_flags)</div><div class='add'>+{</div><div class='add'>+	unsigned count = _manager-&gt;options.small;</div><div class='add'>+	int r = pool-&gt;npages_free;</div><div class='add'>+</div><div class='add'>+	if (count &gt; pool-&gt;npages_free) {</div><div class='add'>+		struct list_head d_pages;</div><div class='add'>+</div><div class='add'>+		INIT_LIST_HEAD(&amp;d_pages);</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;pool-&gt;lock, *irq_flags);</div><div class='add'>+</div><div class='add'>+		/* Returns how many more are neccessary to fulfill the</div><div class='add'>+		 * request. */</div><div class='add'>+		r = ttm_dma_pool_alloc_new_pages(pool, &amp;d_pages, count);</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;pool-&gt;lock, *irq_flags);</div><div class='add'>+		if (!r) {</div><div class='add'>+			/* Add the fresh to the end.. */</div><div class='add'>+			list_splice(&amp;d_pages, &amp;pool-&gt;free_list);</div><div class='add'>+			++pool-&gt;nrefills;</div><div class='add'>+			pool-&gt;npages_free += count;</div><div class='add'>+			r = count;</div><div class='add'>+		} else {</div><div class='add'>+			struct dma_page *d_page;</div><div class='add'>+			unsigned cpages = 0;</div><div class='add'>+</div><div class='add'>+			pr_err(TTM_PFX "%s: Failed to fill %s pool (r:%d)!\n",</div><div class='add'>+				pool-&gt;dev_name, pool-&gt;name, r);</div><div class='add'>+</div><div class='add'>+			list_for_each_entry(d_page, &amp;d_pages, page_list) {</div><div class='add'>+				cpages++;</div><div class='add'>+			}</div><div class='add'>+			list_splice_tail(&amp;d_pages, &amp;pool-&gt;free_list);</div><div class='add'>+			pool-&gt;npages_free += cpages;</div><div class='add'>+			r = cpages;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * @return count of pages still required to fulfill the request.</div><div class='add'>+ * The populate list is actually a stack (not that is matters as TTM</div><div class='add'>+ * allocates one page at a time.</div><div class='add'>+ */</div><div class='add'>+static int ttm_dma_pool_get_pages(struct dma_pool *pool,</div><div class='add'>+				  struct ttm_dma_tt *ttm_dma,</div><div class='add'>+				  unsigned index)</div><div class='add'>+{</div><div class='add'>+	struct dma_page *d_page;</div><div class='add'>+	struct ttm_tt *ttm = &amp;ttm_dma-&gt;ttm;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	int count, r = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pool-&gt;lock, irq_flags);</div><div class='add'>+	count = ttm_dma_page_pool_fill_locked(pool, &amp;irq_flags);</div><div class='add'>+	if (count) {</div><div class='add'>+		d_page = list_first_entry(&amp;pool-&gt;free_list, struct dma_page, page_list);</div><div class='add'>+		ttm-&gt;pages[index] = d_page-&gt;p;</div><div class='add'>+		ttm_dma-&gt;dma_address[index] = d_page-&gt;dma;</div><div class='add'>+		list_move_tail(&amp;d_page-&gt;page_list, &amp;ttm_dma-&gt;pages_list);</div><div class='add'>+		r = 0;</div><div class='add'>+		pool-&gt;npages_in_use += 1;</div><div class='add'>+		pool-&gt;npages_free -= 1;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;pool-&gt;lock, irq_flags);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On success pages list will hold count number of correctly</div><div class='add'>+ * cached pages. On failure will hold the negative return value (-ENOMEM, etc).</div><div class='add'>+ */</div><div class='add'>+int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ttm_tt *ttm = &amp;ttm_dma-&gt;ttm;</div><div class='add'>+	struct ttm_mem_global *mem_glob = ttm-&gt;glob-&gt;mem_glob;</div><div class='add'>+	struct dma_pool *pool;</div><div class='add'>+	enum pool_type type;</div><div class='add'>+	unsigned i;</div><div class='add'>+	gfp_t gfp_flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ttm-&gt;state != tt_unpopulated)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	type = ttm_to_type(ttm-&gt;page_flags, ttm-&gt;caching_state);</div><div class='add'>+	if (ttm-&gt;page_flags &amp; TTM_PAGE_FLAG_DMA32)</div><div class='add'>+		gfp_flags = GFP_USER | GFP_DMA32;</div><div class='add'>+	else</div><div class='add'>+		gfp_flags = GFP_HIGHUSER;</div><div class='add'>+	if (ttm-&gt;page_flags &amp; TTM_PAGE_FLAG_ZERO_ALLOC)</div><div class='add'>+		gfp_flags |= __GFP_ZERO;</div><div class='add'>+</div><div class='add'>+	pool = ttm_dma_find_pool(dev, type);</div><div class='add'>+	if (!pool) {</div><div class='add'>+		pool = ttm_dma_pool_init(dev, gfp_flags, type);</div><div class='add'>+		if (IS_ERR_OR_NULL(pool)) {</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;ttm_dma-&gt;pages_list);</div><div class='add'>+	for (i = 0; i &lt; ttm-&gt;num_pages; ++i) {</div><div class='add'>+		ret = ttm_dma_pool_get_pages(pool, ttm_dma, i);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			ttm_dma_unpopulate(ttm_dma, dev);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ttm_mem_global_alloc_page(mem_glob, ttm-&gt;pages[i],</div><div class='add'>+						false, false);</div><div class='add'>+		if (unlikely(ret != 0)) {</div><div class='add'>+			ttm_dma_unpopulate(ttm_dma, dev);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(ttm-&gt;page_flags &amp; TTM_PAGE_FLAG_SWAPPED)) {</div><div class='add'>+		ret = ttm_tt_swapin(ttm);</div><div class='add'>+		if (unlikely(ret != 0)) {</div><div class='add'>+			ttm_dma_unpopulate(ttm_dma, dev);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ttm-&gt;state = tt_unbound;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ttm_dma_populate);</div><div class='add'>+</div><div class='add'>+/* Get good estimation how many pages are free in pools */</div><div class='add'>+static int ttm_dma_pool_get_num_unused_pages(void)</div><div class='add'>+{</div><div class='add'>+	struct device_pools *p;</div><div class='add'>+	unsigned total = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;_manager-&gt;lock);</div><div class='add'>+	list_for_each_entry(p, &amp;_manager-&gt;pools, pools)</div><div class='add'>+		total += p-&gt;pool-&gt;npages_free;</div><div class='add'>+	mutex_unlock(&amp;_manager-&gt;lock);</div><div class='add'>+	return total;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Put all pages in pages list to correct pool to wait for reuse */</div><div class='add'>+void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ttm_tt *ttm = &amp;ttm_dma-&gt;ttm;</div><div class='add'>+	struct dma_pool *pool;</div><div class='add'>+	struct dma_page *d_page, *next;</div><div class='add'>+	enum pool_type type;</div><div class='add'>+	bool is_cached = false;</div><div class='add'>+	unsigned count = 0, i, npages = 0;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+</div><div class='add'>+	type = ttm_to_type(ttm-&gt;page_flags, ttm-&gt;caching_state);</div><div class='add'>+	pool = ttm_dma_find_pool(dev, type);</div><div class='add'>+	if (!pool)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	is_cached = (ttm_dma_find_pool(pool-&gt;dev,</div><div class='add'>+		     ttm_to_type(ttm-&gt;page_flags, tt_cached)) == pool);</div><div class='add'>+</div><div class='add'>+	/* make sure pages array match list and count number of pages */</div><div class='add'>+	list_for_each_entry(d_page, &amp;ttm_dma-&gt;pages_list, page_list) {</div><div class='add'>+		ttm-&gt;pages[count] = d_page-&gt;p;</div><div class='add'>+		count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pool-&gt;lock, irq_flags);</div><div class='add'>+	pool-&gt;npages_in_use -= count;</div><div class='add'>+	if (is_cached) {</div><div class='add'>+		pool-&gt;nfrees += count;</div><div class='add'>+	} else {</div><div class='add'>+		pool-&gt;npages_free += count;</div><div class='add'>+		list_splice(&amp;ttm_dma-&gt;pages_list, &amp;pool-&gt;free_list);</div><div class='add'>+		npages = count;</div><div class='add'>+		if (pool-&gt;npages_free &gt; _manager-&gt;options.max_size) {</div><div class='add'>+			npages = pool-&gt;npages_free - _manager-&gt;options.max_size;</div><div class='add'>+			/* free at least NUM_PAGES_TO_ALLOC number of pages</div><div class='add'>+			 * to reduce calls to set_memory_wb */</div><div class='add'>+			if (npages &lt; NUM_PAGES_TO_ALLOC)</div><div class='add'>+				npages = NUM_PAGES_TO_ALLOC;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;pool-&gt;lock, irq_flags);</div><div class='add'>+</div><div class='add'>+	if (is_cached) {</div><div class='add'>+		list_for_each_entry_safe(d_page, next, &amp;ttm_dma-&gt;pages_list, page_list) {</div><div class='add'>+			ttm_mem_global_free_page(ttm-&gt;glob-&gt;mem_glob,</div><div class='add'>+						 d_page-&gt;p);</div><div class='add'>+			ttm_dma_page_put(pool, d_page);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; count; i++) {</div><div class='add'>+			ttm_mem_global_free_page(ttm-&gt;glob-&gt;mem_glob,</div><div class='add'>+						 ttm-&gt;pages[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;ttm_dma-&gt;pages_list);</div><div class='add'>+	for (i = 0; i &lt; ttm-&gt;num_pages; i++) {</div><div class='add'>+		ttm-&gt;pages[i] = NULL;</div><div class='add'>+		ttm_dma-&gt;dma_address[i] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* shrink pool if necessary (only on !is_cached pools)*/</div><div class='add'>+	if (npages)</div><div class='add'>+		ttm_dma_page_pool_free(pool, npages);</div><div class='add'>+	ttm-&gt;state = tt_unpopulated;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ttm_dma_unpopulate);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Callback for mm to request pool to reduce number of page held.</div><div class='add'>+ */</div><div class='add'>+static int ttm_dma_pool_mm_shrink(struct shrinker *shrink,</div><div class='add'>+				  struct shrink_control *sc)</div><div class='add'>+{</div><div class='add'>+	static atomic_t start_pool = ATOMIC_INIT(0);</div><div class='add'>+	unsigned idx = 0;</div><div class='add'>+	unsigned pool_offset = atomic_add_return(1, &amp;start_pool);</div><div class='add'>+	unsigned shrink_pages = sc-&gt;nr_to_scan;</div><div class='add'>+	struct device_pools *p;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;_manager-&gt;pools))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;_manager-&gt;lock);</div><div class='add'>+	pool_offset = pool_offset % _manager-&gt;npools;</div><div class='add'>+	list_for_each_entry(p, &amp;_manager-&gt;pools, pools) {</div><div class='add'>+		unsigned nr_free;</div><div class='add'>+</div><div class='add'>+		if (!p-&gt;dev)</div><div class='add'>+			continue;</div><div class='add'>+		if (shrink_pages == 0)</div><div class='add'>+			break;</div><div class='add'>+		/* Do it in round-robin fashion. */</div><div class='add'>+		if (++idx &lt; pool_offset)</div><div class='add'>+			continue;</div><div class='add'>+		nr_free = shrink_pages;</div><div class='add'>+		shrink_pages = ttm_dma_page_pool_free(p-&gt;pool, nr_free);</div><div class='add'>+		pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",</div><div class='add'>+			p-&gt;pool-&gt;dev_name, p-&gt;pool-&gt;name, current-&gt;pid, nr_free,</div><div class='add'>+			shrink_pages);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;_manager-&gt;lock);</div><div class='add'>+	/* return estimated number of unused pages in pool */</div><div class='add'>+	return ttm_dma_pool_get_num_unused_pages();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ttm_dma_pool_mm_shrink_init(struct ttm_pool_manager *manager)</div><div class='add'>+{</div><div class='add'>+	manager-&gt;mm_shrink.shrink = &amp;ttm_dma_pool_mm_shrink;</div><div class='add'>+	manager-&gt;mm_shrink.seeks = 1;</div><div class='add'>+	register_shrinker(&amp;manager-&gt;mm_shrink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ttm_dma_pool_mm_shrink_fini(struct ttm_pool_manager *manager)</div><div class='add'>+{</div><div class='add'>+	unregister_shrinker(&amp;manager-&gt;mm_shrink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ttm_dma_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages)</div><div class='add'>+{</div><div class='add'>+	int ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	WARN_ON(_manager);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO TTM_PFX "Initializing DMA pool allocator.\n");</div><div class='add'>+</div><div class='add'>+	_manager = kzalloc(sizeof(*_manager), GFP_KERNEL);</div><div class='add'>+	if (!_manager)</div><div class='add'>+		goto err_manager;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;_manager-&gt;lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;_manager-&gt;pools);</div><div class='add'>+</div><div class='add'>+	_manager-&gt;options.max_size = max_pages;</div><div class='add'>+	_manager-&gt;options.small = SMALL_ALLOCATION;</div><div class='add'>+	_manager-&gt;options.alloc_size = NUM_PAGES_TO_ALLOC;</div><div class='add'>+</div><div class='add'>+	/* This takes care of auto-freeing the _manager */</div><div class='add'>+	ret = kobject_init_and_add(&amp;_manager-&gt;kobj, &amp;ttm_pool_kobj_type,</div><div class='add'>+				   &amp;glob-&gt;kobj, "dma_pool");</div><div class='add'>+	if (unlikely(ret != 0)) {</div><div class='add'>+		kobject_put(&amp;_manager-&gt;kobj);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	ttm_dma_pool_mm_shrink_init(_manager);</div><div class='add'>+	return 0;</div><div class='add'>+err_manager:</div><div class='add'>+	kfree(_manager);</div><div class='add'>+	_manager = NULL;</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ttm_dma_page_alloc_fini(void)</div><div class='add'>+{</div><div class='add'>+	struct device_pools *p, *t;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO TTM_PFX "Finalizing DMA pool allocator.\n");</div><div class='add'>+	ttm_dma_pool_mm_shrink_fini(_manager);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe_reverse(p, t, &amp;_manager-&gt;pools, pools) {</div><div class='add'>+		dev_dbg(p-&gt;dev, "(%s:%d) Freeing.\n", p-&gt;pool-&gt;name,</div><div class='add'>+			current-&gt;pid);</div><div class='add'>+		WARN_ON(devres_destroy(p-&gt;dev, ttm_dma_pool_release,</div><div class='add'>+			ttm_dma_pool_match, p-&gt;pool));</div><div class='add'>+		ttm_dma_free_pool(p-&gt;dev, p-&gt;pool-&gt;type);</div><div class='add'>+	}</div><div class='add'>+	kobject_put(&amp;_manager-&gt;kobj);</div><div class='add'>+	_manager = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data)</div><div class='add'>+{</div><div class='add'>+	struct device_pools *p;</div><div class='add'>+	struct dma_pool *pool = NULL;</div><div class='add'>+	char *h[] = {"pool", "refills", "pages freed", "inuse", "available",</div><div class='add'>+		     "name", "virt", "busaddr"};</div><div class='add'>+</div><div class='add'>+	if (!_manager) {</div><div class='add'>+		seq_printf(m, "No pool allocator running.\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	seq_printf(m, "%13s %12s %13s %8s %8s %8s\n",</div><div class='add'>+		   h[0], h[1], h[2], h[3], h[4], h[5]);</div><div class='add'>+	mutex_lock(&amp;_manager-&gt;lock);</div><div class='add'>+	list_for_each_entry(p, &amp;_manager-&gt;pools, pools) {</div><div class='add'>+		struct device *dev = p-&gt;dev;</div><div class='add'>+		if (!dev)</div><div class='add'>+			continue;</div><div class='add'>+		pool = p-&gt;pool;</div><div class='add'>+		seq_printf(m, "%13s %12ld %13ld %8d %8d %8s\n",</div><div class='add'>+				pool-&gt;name, pool-&gt;nrefills,</div><div class='add'>+				pool-&gt;nfrees, pool-&gt;npages_in_use,</div><div class='add'>+				pool-&gt;npages_free,</div><div class='add'>+				pool-&gt;dev_name);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;_manager-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ttm_dma_page_alloc_debugfs);</div><div class='head'>diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c<br/>index f9cc548d6d98..2f75d203a2bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/ttm/ttm_tt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/ttm/ttm_tt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/ttm/ttm_tt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/ttm/ttm_tt.c</a></div><div class='hunk'>@@ -43,139 +43,20 @@</div><div class='ctx'> #include "ttm/ttm_placement.h"</div><div class='ctx'> #include "ttm/ttm_page_alloc.h"</div><div class='ctx'> </div><div class='del'>-static int ttm_tt_swapin(struct ttm_tt *ttm);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * Allocates storage for pointers to the pages that back the ttm.</div><div class='ctx'>  */</div><div class='ctx'> static void ttm_tt_alloc_page_directory(struct ttm_tt *ttm)</div><div class='ctx'> {</div><div class='del'>-	ttm-&gt;pages = drm_calloc_large(ttm-&gt;num_pages, sizeof(*ttm-&gt;pages));</div><div class='del'>-	ttm-&gt;dma_address = drm_calloc_large(ttm-&gt;num_pages,</div><div class='del'>-					    sizeof(*ttm-&gt;dma_address));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ttm_tt_free_page_directory(struct ttm_tt *ttm)</div><div class='del'>-{</div><div class='del'>-	drm_free_large(ttm-&gt;pages);</div><div class='del'>-	ttm-&gt;pages = NULL;</div><div class='del'>-	drm_free_large(ttm-&gt;dma_address);</div><div class='del'>-	ttm-&gt;dma_address = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ttm_tt_free_user_pages(struct ttm_tt *ttm)</div><div class='del'>-{</div><div class='del'>-	int write;</div><div class='del'>-	int dirty;</div><div class='del'>-	struct page *page;</div><div class='del'>-	int i;</div><div class='del'>-	struct ttm_backend *be = ttm-&gt;be;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!(ttm-&gt;page_flags &amp; TTM_PAGE_FLAG_USER));</div><div class='del'>-	write = ((ttm-&gt;page_flags &amp; TTM_PAGE_FLAG_WRITE) != 0);</div><div class='del'>-	dirty = ((ttm-&gt;page_flags &amp; TTM_PAGE_FLAG_USER_DIRTY) != 0);</div><div class='del'>-</div><div class='del'>-	if (be)</div><div class='del'>-		be-&gt;func-&gt;clear(be);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ttm-&gt;num_pages; ++i) {</div><div class='del'>-		page = ttm-&gt;pages[i];</div><div class='del'>-		if (page == NULL)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (page == ttm-&gt;dummy_read_page) {</div><div class='del'>-			BUG_ON(write);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (write &amp;&amp; dirty &amp;&amp; !PageReserved(page))</div><div class='del'>-			set_page_dirty_lock(page);</div><div class='del'>-</div><div class='del'>-		ttm-&gt;pages[i] = NULL;</div><div class='del'>-		ttm_mem_global_free(ttm-&gt;glob-&gt;mem_glob, PAGE_SIZE);</div><div class='del'>-		put_page(page);</div><div class='del'>-	}</div><div class='del'>-	ttm-&gt;state = tt_unpopulated;</div><div class='del'>-	ttm-&gt;first_himem_page = ttm-&gt;num_pages;</div><div class='del'>-	ttm-&gt;last_lomem_page = -1;</div><div class='add'>+	ttm-&gt;pages = drm_calloc_large(ttm-&gt;num_pages, sizeof(void*));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct page *__ttm_tt_get_page(struct ttm_tt *ttm, int index)</div><div class='add'>+static void ttm_dma_tt_alloc_page_directory(struct ttm_dma_tt *ttm)</div><div class='ctx'> {</div><div class='del'>-	struct page *p;</div><div class='del'>-	struct list_head h;</div><div class='del'>-	struct ttm_mem_global *mem_glob = ttm-&gt;glob-&gt;mem_glob;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	while (NULL == (p = ttm-&gt;pages[index])) {</div><div class='del'>-</div><div class='del'>-		INIT_LIST_HEAD(&amp;h);</div><div class='del'>-</div><div class='del'>-		ret = ttm_get_pages(&amp;h, ttm-&gt;page_flags, ttm-&gt;caching_state, 1,</div><div class='del'>-				    &amp;ttm-&gt;dma_address[index]);</div><div class='del'>-</div><div class='del'>-		if (ret != 0)</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		p = list_first_entry(&amp;h, struct page, lru);</div><div class='del'>-</div><div class='del'>-		ret = ttm_mem_global_alloc_page(mem_glob, p, false, false);</div><div class='del'>-		if (unlikely(ret != 0))</div><div class='del'>-			goto out_err;</div><div class='del'>-</div><div class='del'>-		if (PageHighMem(p))</div><div class='del'>-			ttm-&gt;pages[--ttm-&gt;first_himem_page] = p;</div><div class='del'>-		else</div><div class='del'>-			ttm-&gt;pages[++ttm-&gt;last_lomem_page] = p;</div><div class='del'>-	}</div><div class='del'>-	return p;</div><div class='del'>-out_err:</div><div class='del'>-	put_page(p);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct page *ttm_tt_get_page(struct ttm_tt *ttm, int index)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (unlikely(ttm-&gt;page_flags &amp; TTM_PAGE_FLAG_SWAPPED)) {</div><div class='del'>-		ret = ttm_tt_swapin(ttm);</div><div class='del'>-		if (unlikely(ret != 0))</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-	return __ttm_tt_get_page(ttm, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ttm_tt_populate(struct ttm_tt *ttm)</div><div class='del'>-{</div><div class='del'>-	struct page *page;</div><div class='del'>-	unsigned long i;</div><div class='del'>-	struct ttm_backend *be;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (ttm-&gt;state != tt_unpopulated)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (unlikely(ttm-&gt;page_flags &amp; TTM_PAGE_FLAG_SWAPPED)) {</div><div class='del'>-		ret = ttm_tt_swapin(ttm);</div><div class='del'>-		if (unlikely(ret != 0))</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	be = ttm-&gt;be;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ttm-&gt;num_pages; ++i) {</div><div class='del'>-		page = __ttm_tt_get_page(ttm, i);</div><div class='del'>-		if (!page)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	be-&gt;func-&gt;populate(be, ttm-&gt;num_pages, ttm-&gt;pages,</div><div class='del'>-			   ttm-&gt;dummy_read_page, ttm-&gt;dma_address);</div><div class='del'>-	ttm-&gt;state = tt_unbound;</div><div class='del'>-	return 0;</div><div class='add'>+	ttm-&gt;ttm.pages = drm_calloc_large(ttm-&gt;ttm.num_pages, sizeof(void*));</div><div class='add'>+	ttm-&gt;dma_address = drm_calloc_large(ttm-&gt;ttm.num_pages,</div><div class='add'>+					    sizeof(*ttm-&gt;dma_address));</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(ttm_tt_populate);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86</div><div class='ctx'> static inline int ttm_tt_set_page_caching(struct page *p,</div><div class='hunk'>@@ -278,153 +159,100 @@ int ttm_tt_set_placement_caching(struct ttm_tt *ttm, uint32_t placement)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ttm_tt_set_placement_caching);</div><div class='ctx'> </div><div class='del'>-static void ttm_tt_free_alloced_pages(struct ttm_tt *ttm)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	unsigned count = 0;</div><div class='del'>-	struct list_head h;</div><div class='del'>-	struct page *cur_page;</div><div class='del'>-	struct ttm_backend *be = ttm-&gt;be;</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;h);</div><div class='del'>-</div><div class='del'>-	if (be)</div><div class='del'>-		be-&gt;func-&gt;clear(be);</div><div class='del'>-	for (i = 0; i &lt; ttm-&gt;num_pages; ++i) {</div><div class='del'>-</div><div class='del'>-		cur_page = ttm-&gt;pages[i];</div><div class='del'>-		ttm-&gt;pages[i] = NULL;</div><div class='del'>-		if (cur_page) {</div><div class='del'>-			if (page_count(cur_page) != 1)</div><div class='del'>-				printk(KERN_ERR TTM_PFX</div><div class='del'>-				       "Erroneous page count. "</div><div class='del'>-				       "Leaking pages.\n");</div><div class='del'>-			ttm_mem_global_free_page(ttm-&gt;glob-&gt;mem_glob,</div><div class='del'>-						 cur_page);</div><div class='del'>-			list_add(&amp;cur_page-&gt;lru, &amp;h);</div><div class='del'>-			count++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ttm_put_pages(&amp;h, count, ttm-&gt;page_flags, ttm-&gt;caching_state,</div><div class='del'>-		      ttm-&gt;dma_address);</div><div class='del'>-	ttm-&gt;state = tt_unpopulated;</div><div class='del'>-	ttm-&gt;first_himem_page = ttm-&gt;num_pages;</div><div class='del'>-	ttm-&gt;last_lomem_page = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void ttm_tt_destroy(struct ttm_tt *ttm)</div><div class='ctx'> {</div><div class='del'>-	struct ttm_backend *be;</div><div class='del'>-</div><div class='ctx'> 	if (unlikely(ttm == NULL))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	be = ttm-&gt;be;</div><div class='del'>-	if (likely(be != NULL)) {</div><div class='del'>-		be-&gt;func-&gt;destroy(be);</div><div class='del'>-		ttm-&gt;be = NULL;</div><div class='add'>+	if (ttm-&gt;state == tt_bound) {</div><div class='add'>+		ttm_tt_unbind(ttm);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (likely(ttm-&gt;pages != NULL)) {</div><div class='del'>-		if (ttm-&gt;page_flags &amp; TTM_PAGE_FLAG_USER)</div><div class='del'>-			ttm_tt_free_user_pages(ttm);</div><div class='del'>-		else</div><div class='del'>-			ttm_tt_free_alloced_pages(ttm);</div><div class='del'>-</div><div class='del'>-		ttm_tt_free_page_directory(ttm);</div><div class='add'>+		ttm-&gt;bdev-&gt;driver-&gt;ttm_tt_unpopulate(ttm);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(ttm-&gt;page_flags &amp; TTM_PAGE_FLAG_PERSISTENT_SWAP) &amp;&amp;</div><div class='ctx'> 	    ttm-&gt;swap_storage)</div><div class='ctx'> 		fput(ttm-&gt;swap_storage);</div><div class='ctx'> </div><div class='del'>-	kfree(ttm);</div><div class='add'>+	ttm-&gt;swap_storage = NULL;</div><div class='add'>+	ttm-&gt;func-&gt;destroy(ttm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ttm_tt_set_user(struct ttm_tt *ttm,</div><div class='del'>-		    struct task_struct *tsk,</div><div class='del'>-		    unsigned long start, unsigned long num_pages)</div><div class='add'>+int ttm_tt_init(struct ttm_tt *ttm, struct ttm_bo_device *bdev,</div><div class='add'>+		unsigned long size, uint32_t page_flags,</div><div class='add'>+		struct page *dummy_read_page)</div><div class='ctx'> {</div><div class='del'>-	struct mm_struct *mm = tsk-&gt;mm;</div><div class='del'>-	int ret;</div><div class='del'>-	int write = (ttm-&gt;page_flags &amp; TTM_PAGE_FLAG_WRITE) != 0;</div><div class='del'>-	struct ttm_mem_global *mem_glob = ttm-&gt;glob-&gt;mem_glob;</div><div class='del'>-</div><div class='del'>-	BUG_ON(num_pages != ttm-&gt;num_pages);</div><div class='del'>-	BUG_ON((ttm-&gt;page_flags &amp; TTM_PAGE_FLAG_USER) == 0);</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * Account user pages as lowmem pages for now.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	ret = ttm_mem_global_alloc(mem_glob, num_pages * PAGE_SIZE,</div><div class='del'>-				   false, false);</div><div class='del'>-	if (unlikely(ret != 0))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	down_read(&amp;mm-&gt;mmap_sem);</div><div class='del'>-	ret = get_user_pages(tsk, mm, start, num_pages,</div><div class='del'>-			     write, 0, ttm-&gt;pages, NULL);</div><div class='del'>-	up_read(&amp;mm-&gt;mmap_sem);</div><div class='add'>+	ttm-&gt;bdev = bdev;</div><div class='add'>+	ttm-&gt;glob = bdev-&gt;glob;</div><div class='add'>+	ttm-&gt;num_pages = (size + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	ttm-&gt;caching_state = tt_cached;</div><div class='add'>+	ttm-&gt;page_flags = page_flags;</div><div class='add'>+	ttm-&gt;dummy_read_page = dummy_read_page;</div><div class='add'>+	ttm-&gt;state = tt_unpopulated;</div><div class='add'>+	ttm-&gt;swap_storage = NULL;</div><div class='ctx'> </div><div class='del'>-	if (ret != num_pages &amp;&amp; write) {</div><div class='del'>-		ttm_tt_free_user_pages(ttm);</div><div class='del'>-		ttm_mem_global_free(mem_glob, num_pages * PAGE_SIZE);</div><div class='add'>+	ttm_tt_alloc_page_directory(ttm);</div><div class='add'>+	if (!ttm-&gt;pages) {</div><div class='add'>+		ttm_tt_destroy(ttm);</div><div class='add'>+		printk(KERN_ERR TTM_PFX "Failed allocating page table\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ttm-&gt;tsk = tsk;</div><div class='del'>-	ttm-&gt;start = start;</div><div class='del'>-	ttm-&gt;state = tt_unbound;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ttm_tt_init);</div><div class='ctx'> </div><div class='del'>-struct ttm_tt *ttm_tt_create(struct ttm_bo_device *bdev, unsigned long size,</div><div class='del'>-			     uint32_t page_flags, struct page *dummy_read_page)</div><div class='add'>+void ttm_tt_fini(struct ttm_tt *ttm)</div><div class='ctx'> {</div><div class='del'>-	struct ttm_bo_driver *bo_driver = bdev-&gt;driver;</div><div class='del'>-	struct ttm_tt *ttm;</div><div class='del'>-</div><div class='del'>-	if (!bo_driver)</div><div class='del'>-		return NULL;</div><div class='add'>+	drm_free_large(ttm-&gt;pages);</div><div class='add'>+	ttm-&gt;pages = NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ttm_tt_fini);</div><div class='ctx'> </div><div class='del'>-	ttm = kzalloc(sizeof(*ttm), GFP_KERNEL);</div><div class='del'>-	if (!ttm)</div><div class='del'>-		return NULL;</div><div class='add'>+int ttm_dma_tt_init(struct ttm_dma_tt *ttm_dma, struct ttm_bo_device *bdev,</div><div class='add'>+		unsigned long size, uint32_t page_flags,</div><div class='add'>+		struct page *dummy_read_page)</div><div class='add'>+{</div><div class='add'>+	struct ttm_tt *ttm = &amp;ttm_dma-&gt;ttm;</div><div class='ctx'> </div><div class='add'>+	ttm-&gt;bdev = bdev;</div><div class='ctx'> 	ttm-&gt;glob = bdev-&gt;glob;</div><div class='ctx'> 	ttm-&gt;num_pages = (size + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	ttm-&gt;first_himem_page = ttm-&gt;num_pages;</div><div class='del'>-	ttm-&gt;last_lomem_page = -1;</div><div class='ctx'> 	ttm-&gt;caching_state = tt_cached;</div><div class='ctx'> 	ttm-&gt;page_flags = page_flags;</div><div class='del'>-</div><div class='ctx'> 	ttm-&gt;dummy_read_page = dummy_read_page;</div><div class='add'>+	ttm-&gt;state = tt_unpopulated;</div><div class='add'>+	ttm-&gt;swap_storage = NULL;</div><div class='ctx'> </div><div class='del'>-	ttm_tt_alloc_page_directory(ttm);</div><div class='del'>-	if (!ttm-&gt;pages) {</div><div class='add'>+	INIT_LIST_HEAD(&amp;ttm_dma-&gt;pages_list);</div><div class='add'>+	ttm_dma_tt_alloc_page_directory(ttm_dma);</div><div class='add'>+	if (!ttm-&gt;pages || !ttm_dma-&gt;dma_address) {</div><div class='ctx'> 		ttm_tt_destroy(ttm);</div><div class='ctx'> 		printk(KERN_ERR TTM_PFX "Failed allocating page table\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	ttm-&gt;be = bo_driver-&gt;create_ttm_backend_entry(bdev);</div><div class='del'>-	if (!ttm-&gt;be) {</div><div class='del'>-		ttm_tt_destroy(ttm);</div><div class='del'>-		printk(KERN_ERR TTM_PFX "Failed creating ttm backend entry\n");</div><div class='del'>-		return NULL;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	ttm-&gt;state = tt_unpopulated;</div><div class='del'>-	return ttm;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ttm_dma_tt_init);</div><div class='add'>+</div><div class='add'>+void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma)</div><div class='add'>+{</div><div class='add'>+	struct ttm_tt *ttm = &amp;ttm_dma-&gt;ttm;</div><div class='add'>+</div><div class='add'>+	drm_free_large(ttm-&gt;pages);</div><div class='add'>+	ttm-&gt;pages = NULL;</div><div class='add'>+	drm_free_large(ttm_dma-&gt;dma_address);</div><div class='add'>+	ttm_dma-&gt;dma_address = NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ttm_dma_tt_fini);</div><div class='ctx'> </div><div class='ctx'> void ttm_tt_unbind(struct ttm_tt *ttm)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct ttm_backend *be = ttm-&gt;be;</div><div class='ctx'> </div><div class='ctx'> 	if (ttm-&gt;state == tt_bound) {</div><div class='del'>-		ret = be-&gt;func-&gt;unbind(be);</div><div class='add'>+		ret = ttm-&gt;func-&gt;unbind(ttm);</div><div class='ctx'> 		BUG_ON(ret);</div><div class='ctx'> 		ttm-&gt;state = tt_unbound;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -433,7 +261,6 @@ void ttm_tt_unbind(struct ttm_tt *ttm)</div><div class='ctx'> int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct ttm_backend *be;</div><div class='ctx'> </div><div class='ctx'> 	if (!ttm)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -441,25 +268,21 @@ int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem)</div><div class='ctx'> 	if (ttm-&gt;state == tt_bound)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	be = ttm-&gt;be;</div><div class='del'>-</div><div class='del'>-	ret = ttm_tt_populate(ttm);</div><div class='add'>+	ret = ttm-&gt;bdev-&gt;driver-&gt;ttm_tt_populate(ttm);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = be-&gt;func-&gt;bind(be, bo_mem);</div><div class='add'>+	ret = ttm-&gt;func-&gt;bind(ttm, bo_mem);</div><div class='ctx'> 	if (unlikely(ret != 0))</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ttm-&gt;state = tt_bound;</div><div class='ctx'> </div><div class='del'>-	if (ttm-&gt;page_flags &amp; TTM_PAGE_FLAG_USER)</div><div class='del'>-		ttm-&gt;page_flags |= TTM_PAGE_FLAG_USER_DIRTY;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ttm_tt_bind);</div><div class='ctx'> </div><div class='del'>-static int ttm_tt_swapin(struct ttm_tt *ttm)</div><div class='add'>+int ttm_tt_swapin(struct ttm_tt *ttm)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *swap_space;</div><div class='ctx'> 	struct file *swap_storage;</div><div class='hunk'>@@ -470,16 +293,6 @@ static int ttm_tt_swapin(struct ttm_tt *ttm)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (ttm-&gt;page_flags &amp; TTM_PAGE_FLAG_USER) {</div><div class='del'>-		ret = ttm_tt_set_user(ttm, ttm-&gt;tsk, ttm-&gt;start,</div><div class='del'>-				      ttm-&gt;num_pages);</div><div class='del'>-		if (unlikely(ret != 0))</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		ttm-&gt;page_flags &amp;= ~TTM_PAGE_FLAG_SWAPPED;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	swap_storage = ttm-&gt;swap_storage;</div><div class='ctx'> 	BUG_ON(swap_storage == NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -491,7 +304,7 @@ static int ttm_tt_swapin(struct ttm_tt *ttm)</div><div class='ctx'> 			ret = PTR_ERR(from_page);</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> 		}</div><div class='del'>-		to_page = __ttm_tt_get_page(ttm, i);</div><div class='add'>+		to_page = ttm-&gt;pages[i];</div><div class='ctx'> 		if (unlikely(to_page == NULL))</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> </div><div class='hunk'>@@ -512,7 +325,6 @@ static int ttm_tt_swapin(struct ttm_tt *ttm)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> out_err:</div><div class='del'>-	ttm_tt_free_alloced_pages(ttm);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -530,18 +342,6 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage)</div><div class='ctx'> 	BUG_ON(ttm-&gt;state != tt_unbound &amp;&amp; ttm-&gt;state != tt_unpopulated);</div><div class='ctx'> 	BUG_ON(ttm-&gt;caching_state != tt_cached);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * For user buffers, just unpin the pages, as there should be</div><div class='del'>-	 * vma references.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (ttm-&gt;page_flags &amp; TTM_PAGE_FLAG_USER) {</div><div class='del'>-		ttm_tt_free_user_pages(ttm);</div><div class='del'>-		ttm-&gt;page_flags |= TTM_PAGE_FLAG_SWAPPED;</div><div class='del'>-		ttm-&gt;swap_storage = NULL;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (!persistent_swap_storage) {</div><div class='ctx'> 		swap_storage = shmem_file_setup("ttm swap",</div><div class='ctx'> 						ttm-&gt;num_pages &lt;&lt; PAGE_SHIFT,</div><div class='hunk'>@@ -576,7 +376,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage)</div><div class='ctx'> 		page_cache_release(to_page);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ttm_tt_free_alloced_pages(ttm);</div><div class='add'>+	ttm-&gt;bdev-&gt;driver-&gt;ttm_tt_unpopulate(ttm);</div><div class='ctx'> 	ttm-&gt;swap_storage = swap_storage;</div><div class='ctx'> 	ttm-&gt;page_flags |= TTM_PAGE_FLAG_SWAPPED;</div><div class='ctx'> 	if (persistent_swap_storage)</div><div class='head'>diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c<br/>index a83e86d3956c..02661f35f7a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/via/via_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/via/via_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/via/via_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/via/via_drv.c</a></div><div class='hunk'>@@ -30,16 +30,52 @@</div><div class='ctx'> </div><div class='ctx'> #include "drm_pciids.h"</div><div class='ctx'> </div><div class='add'>+static int via_driver_open(struct drm_device *dev, struct drm_file *file)</div><div class='add'>+{</div><div class='add'>+	struct via_file_private *file_priv;</div><div class='add'>+</div><div class='add'>+	DRM_DEBUG_DRIVER("\n");</div><div class='add'>+	file_priv = kmalloc(sizeof(*file_priv), GFP_KERNEL);</div><div class='add'>+	if (!file_priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	file-&gt;driver_priv = file_priv;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;file_priv-&gt;obj_list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void via_driver_postclose(struct drm_device *dev, struct drm_file *file)</div><div class='add'>+{</div><div class='add'>+	struct via_file_private *file_priv = file-&gt;driver_priv;</div><div class='add'>+</div><div class='add'>+	kfree(file_priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct pci_device_id pciidlist[] = {</div><div class='ctx'> 	viadrv_PCI_IDS</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct file_operations via_driver_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = drm_open,</div><div class='add'>+	.release = drm_release,</div><div class='add'>+	.unlocked_ioctl = drm_ioctl,</div><div class='add'>+	.mmap = drm_mmap,</div><div class='add'>+	.poll = drm_poll,</div><div class='add'>+	.fasync = drm_fasync,</div><div class='add'>+	.llseek = noop_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct drm_driver driver = {</div><div class='ctx'> 	.driver_features =</div><div class='ctx'> 	    DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_IRQ |</div><div class='ctx'> 	    DRIVER_IRQ_SHARED,</div><div class='ctx'> 	.load = via_driver_load,</div><div class='ctx'> 	.unload = via_driver_unload,</div><div class='add'>+	.open = via_driver_open,</div><div class='add'>+	.postclose = via_driver_postclose,</div><div class='ctx'> 	.context_dtor = via_final_context,</div><div class='ctx'> 	.get_vblank_counter = via_get_vblank_counter,</div><div class='ctx'> 	.enable_vblank = via_enable_vblank,</div><div class='hunk'>@@ -54,17 +90,7 @@ static struct drm_driver driver = {</div><div class='ctx'> 	.reclaim_buffers_idlelocked = via_reclaim_buffers_locked,</div><div class='ctx'> 	.lastclose = via_lastclose,</div><div class='ctx'> 	.ioctls = via_ioctls,</div><div class='del'>-	.fops = {</div><div class='del'>-		.owner = THIS_MODULE,</div><div class='del'>-		.open = drm_open,</div><div class='del'>-		.release = drm_release,</div><div class='del'>-		.unlocked_ioctl = drm_ioctl,</div><div class='del'>-		.mmap = drm_mmap,</div><div class='del'>-		.poll = drm_poll,</div><div class='del'>-		.fasync = drm_fasync,</div><div class='del'>-		.llseek = noop_llseek,</div><div class='del'>-		},</div><div class='del'>-</div><div class='add'>+	.fops = &amp;via_driver_fops,</div><div class='ctx'> 	.name = DRIVER_NAME,</div><div class='ctx'> 	.desc = DRIVER_DESC,</div><div class='ctx'> 	.date = DRIVER_DATE,</div><div class='head'>diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h<br/>index 9cf87d912325..88edacc93006 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/via/via_drv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/via/via_drv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/via/via_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/via/via_drv.h</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #ifndef _VIA_DRV_H_</div><div class='ctx'> #define _VIA_DRV_H_</div><div class='ctx'> </div><div class='del'>-#include "drm_sman.h"</div><div class='add'>+#include "drm_mm.h"</div><div class='ctx'> #define DRIVER_AUTHOR	"Various"</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME		"via"</div><div class='hunk'>@@ -88,9 +88,12 @@ typedef struct drm_via_private {</div><div class='ctx'> 	uint32_t irq_pending_mask;</div><div class='ctx'> 	int *irq_map;</div><div class='ctx'> 	unsigned int idle_fault;</div><div class='del'>-	struct drm_sman sman;</div><div class='ctx'> 	int vram_initialized;</div><div class='add'>+	struct drm_mm vram_mm;</div><div class='ctx'> 	int agp_initialized;</div><div class='add'>+	struct drm_mm agp_mm;</div><div class='add'>+	/** Mapping of userspace keys to mm objects */</div><div class='add'>+	struct idr object_idr;</div><div class='ctx'> 	unsigned long vram_offset;</div><div class='ctx'> 	unsigned long agp_offset;</div><div class='ctx'> 	drm_via_blitq_t blit_queues[VIA_NUM_BLIT_ENGINES];</div><div class='head'>diff --git a/drivers/gpu/drm/via/via_map.c b/drivers/gpu/drm/via/via_map.c<br/>index 6cca9a709f7a..a2ab34365151 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/via/via_map.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/via/via_map.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/via/via_map.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/via/via_map.c</a></div><div class='hunk'>@@ -104,15 +104,10 @@ int via_driver_load(struct drm_device *dev, unsigned long chipset)</div><div class='ctx'> </div><div class='ctx'> 	dev_priv-&gt;chipset = chipset;</div><div class='ctx'> </div><div class='del'>-	ret = drm_sman_init(&amp;dev_priv-&gt;sman, 2, 12, 8);</div><div class='del'>-	if (ret) {</div><div class='del'>-		kfree(dev_priv);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+	idr_init(&amp;dev-&gt;object_name_idr);</div><div class='ctx'> </div><div class='ctx'> 	ret = drm_vblank_init(dev, 1);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		drm_sman_takedown(&amp;dev_priv-&gt;sman);</div><div class='ctx'> 		kfree(dev_priv);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -124,7 +119,8 @@ int via_driver_unload(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	drm_via_private_t *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> </div><div class='del'>-	drm_sman_takedown(&amp;dev_priv-&gt;sman);</div><div class='add'>+	idr_remove_all(&amp;dev_priv-&gt;object_idr);</div><div class='add'>+	idr_destroy(&amp;dev_priv-&gt;object_idr);</div><div class='ctx'> </div><div class='ctx'> 	kfree(dev_priv);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/via/via_mm.c b/drivers/gpu/drm/via/via_mm.c<br/>index 6cc2dadae3ef..a3574d09a07d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/via/via_mm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/via/via_mm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/via/via_mm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/via/via_mm.c</a></div><div class='hunk'>@@ -28,26 +28,22 @@</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> #include "via_drm.h"</div><div class='ctx'> #include "via_drv.h"</div><div class='del'>-#include "drm_sman.h"</div><div class='ctx'> </div><div class='ctx'> #define VIA_MM_ALIGN_SHIFT 4</div><div class='ctx'> #define VIA_MM_ALIGN_MASK ((1 &lt;&lt; VIA_MM_ALIGN_SHIFT) - 1)</div><div class='ctx'> </div><div class='add'>+struct via_memblock {</div><div class='add'>+	struct drm_mm_node mm_node;</div><div class='add'>+	struct list_head owner_list;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int via_agp_init(struct drm_device *dev, void *data, struct drm_file *file_priv)</div><div class='ctx'> {</div><div class='ctx'> 	drm_via_agp_t *agp = data;</div><div class='ctx'> 	drm_via_private_t *dev_priv = (drm_via_private_t *) dev-&gt;dev_private;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-	ret = drm_sman_set_range(&amp;dev_priv-&gt;sman, VIA_MEM_AGP, 0,</div><div class='del'>-				 agp-&gt;size &gt;&gt; VIA_MM_ALIGN_SHIFT);</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		DRM_ERROR("AGP memory manager initialisation error\n");</div><div class='del'>-		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+	drm_mm_init(&amp;dev_priv-&gt;agp_mm, 0, agp-&gt;size &gt;&gt; VIA_MM_ALIGN_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	dev_priv-&gt;agp_initialized = 1;</div><div class='ctx'> 	dev_priv-&gt;agp_offset = agp-&gt;offset;</div><div class='hunk'>@@ -61,17 +57,9 @@ int via_fb_init(struct drm_device *dev, void *data, struct drm_file *file_priv)</div><div class='ctx'> {</div><div class='ctx'> 	drm_via_fb_t *fb = data;</div><div class='ctx'> 	drm_via_private_t *dev_priv = (drm_via_private_t *) dev-&gt;dev_private;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-	ret = drm_sman_set_range(&amp;dev_priv-&gt;sman, VIA_MEM_VIDEO, 0,</div><div class='del'>-				 fb-&gt;size &gt;&gt; VIA_MM_ALIGN_SHIFT);</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		DRM_ERROR("VRAM memory manager initialisation error\n");</div><div class='del'>-		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+	drm_mm_init(&amp;dev_priv-&gt;vram_mm, 0, fb-&gt;size &gt;&gt; VIA_MM_ALIGN_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	dev_priv-&gt;vram_initialized = 1;</div><div class='ctx'> 	dev_priv-&gt;vram_offset = fb-&gt;offset;</div><div class='hunk'>@@ -108,19 +96,25 @@ void via_lastclose(struct drm_device *dev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-	drm_sman_cleanup(&amp;dev_priv-&gt;sman);</div><div class='del'>-	dev_priv-&gt;vram_initialized = 0;</div><div class='del'>-	dev_priv-&gt;agp_initialized = 0;</div><div class='add'>+	if (dev_priv-&gt;vram_initialized) {</div><div class='add'>+		drm_mm_takedown(&amp;dev_priv-&gt;vram_mm);</div><div class='add'>+		dev_priv-&gt;vram_initialized = 0;</div><div class='add'>+	}</div><div class='add'>+	if (dev_priv-&gt;agp_initialized) {</div><div class='add'>+		drm_mm_takedown(&amp;dev_priv-&gt;agp_mm);</div><div class='add'>+		dev_priv-&gt;agp_initialized = 0;</div><div class='add'>+	}</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int via_mem_alloc(struct drm_device *dev, void *data,</div><div class='del'>-		  struct drm_file *file_priv)</div><div class='add'>+		  struct drm_file *file)</div><div class='ctx'> {</div><div class='ctx'> 	drm_via_mem_t *mem = data;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	struct drm_memblock_item *item;</div><div class='add'>+	int retval = 0, user_key;</div><div class='add'>+	struct via_memblock *item;</div><div class='ctx'> 	drm_via_private_t *dev_priv = (drm_via_private_t *) dev-&gt;dev_private;</div><div class='add'>+	struct via_file_private *file_priv = file-&gt;driver_priv;</div><div class='ctx'> 	unsigned long tmpSize;</div><div class='ctx'> </div><div class='ctx'> 	if (mem-&gt;type &gt; VIA_MEM_AGP) {</div><div class='hunk'>@@ -136,24 +130,57 @@ int via_mem_alloc(struct drm_device *dev, void *data,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	item = kzalloc(sizeof(*item), GFP_KERNEL);</div><div class='add'>+	if (!item) {</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		goto fail_alloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	tmpSize = (mem-&gt;size + VIA_MM_ALIGN_MASK) &gt;&gt; VIA_MM_ALIGN_SHIFT;</div><div class='del'>-	item = drm_sman_alloc(&amp;dev_priv-&gt;sman, mem-&gt;type, tmpSize, 0,</div><div class='del'>-			      (unsigned long)file_priv);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-	if (item) {</div><div class='del'>-		mem-&gt;offset = ((mem-&gt;type == VIA_MEM_VIDEO) ?</div><div class='del'>-			      dev_priv-&gt;vram_offset : dev_priv-&gt;agp_offset) +</div><div class='del'>-		    (item-&gt;mm-&gt;</div><div class='del'>-		     offset(item-&gt;mm, item-&gt;mm_info) &lt;&lt; VIA_MM_ALIGN_SHIFT);</div><div class='del'>-		mem-&gt;index = item-&gt;user_hash.key;</div><div class='del'>-	} else {</div><div class='del'>-		mem-&gt;offset = 0;</div><div class='del'>-		mem-&gt;size = 0;</div><div class='del'>-		mem-&gt;index = 0;</div><div class='del'>-		DRM_DEBUG("Video memory allocation failed\n");</div><div class='add'>+	if (mem-&gt;type == VIA_MEM_AGP)</div><div class='add'>+		retval = drm_mm_insert_node(&amp;dev_priv-&gt;agp_mm,</div><div class='add'>+					    &amp;item-&gt;mm_node,</div><div class='add'>+					    tmpSize, 0);</div><div class='add'>+	else</div><div class='add'>+		retval = drm_mm_insert_node(&amp;dev_priv-&gt;vram_mm,</div><div class='add'>+					    &amp;item-&gt;mm_node,</div><div class='add'>+					    tmpSize, 0);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto fail_alloc;</div><div class='add'>+</div><div class='add'>+again:</div><div class='add'>+	if (idr_pre_get(&amp;dev_priv-&gt;object_idr, GFP_KERNEL) == 0) {</div><div class='ctx'> 		retval = -ENOMEM;</div><div class='add'>+		goto fail_idr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	retval = idr_get_new_above(&amp;dev_priv-&gt;object_idr, item, 1, &amp;user_key);</div><div class='add'>+	if (retval == -EAGAIN)</div><div class='add'>+		goto again;</div><div class='add'>+	if (retval)</div><div class='add'>+		goto fail_idr;</div><div class='add'>+</div><div class='add'>+	list_add(&amp;item-&gt;owner_list, &amp;file_priv-&gt;obj_list);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	mem-&gt;offset = ((mem-&gt;type == VIA_MEM_VIDEO) ?</div><div class='add'>+		      dev_priv-&gt;vram_offset : dev_priv-&gt;agp_offset) +</div><div class='add'>+	    ((item-&gt;mm_node.start) &lt;&lt; VIA_MM_ALIGN_SHIFT);</div><div class='add'>+	mem-&gt;index = user_key;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_idr:</div><div class='add'>+	drm_mm_remove_node(&amp;item-&gt;mm_node);</div><div class='add'>+fail_alloc:</div><div class='add'>+	kfree(item);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='add'>+	mem-&gt;offset = 0;</div><div class='add'>+	mem-&gt;size = 0;</div><div class='add'>+	mem-&gt;index = 0;</div><div class='add'>+	DRM_DEBUG("Video memory allocation failed\n");</div><div class='add'>+</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -161,24 +188,35 @@ int via_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv)</div><div class='ctx'> {</div><div class='ctx'> 	drm_via_private_t *dev_priv = dev-&gt;dev_private;</div><div class='ctx'> 	drm_via_mem_t *mem = data;</div><div class='del'>-	int ret;</div><div class='add'>+	struct via_memblock *obj;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-	ret = drm_sman_free_key(&amp;dev_priv-&gt;sman, mem-&gt;index);</div><div class='add'>+	obj = idr_find(&amp;dev_priv-&gt;object_idr, mem-&gt;index);</div><div class='add'>+	if (obj == NULL) {</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	idr_remove(&amp;dev_priv-&gt;object_idr, mem-&gt;index);</div><div class='add'>+	list_del(&amp;obj-&gt;owner_list);</div><div class='add'>+	drm_mm_remove_node(&amp;obj-&gt;mm_node);</div><div class='add'>+	kfree(obj);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='add'>+</div><div class='ctx'> 	DRM_DEBUG("free = 0x%lx\n", mem-&gt;index);</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='ctx'> void via_reclaim_buffers_locked(struct drm_device *dev,</div><div class='del'>-				struct drm_file *file_priv)</div><div class='add'>+				struct drm_file *file)</div><div class='ctx'> {</div><div class='del'>-	drm_via_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	struct via_file_private *file_priv = file-&gt;driver_priv;</div><div class='add'>+	struct via_memblock *entry, *next;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;struct_mutex);</div><div class='del'>-	if (drm_sman_owner_clean(&amp;dev_priv-&gt;sman, (unsigned long)file_priv)) {</div><div class='add'>+	if (list_empty(&amp;file_priv-&gt;obj_list)) {</div><div class='ctx'> 		mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -186,7 +224,12 @@ void via_reclaim_buffers_locked(struct drm_device *dev,</div><div class='ctx'> 	if (dev-&gt;driver-&gt;dma_quiescent)</div><div class='ctx'> 		dev-&gt;driver-&gt;dma_quiescent(dev);</div><div class='ctx'> </div><div class='del'>-	drm_sman_owner_cleanup(&amp;dev_priv-&gt;sman, (unsigned long)file_priv);</div><div class='add'>+	list_for_each_entry_safe(entry, next, &amp;file_priv-&gt;obj_list,</div><div class='add'>+				 owner_list) {</div><div class='add'>+		list_del(&amp;entry-&gt;owner_list);</div><div class='add'>+		drm_mm_remove_node(&amp;entry-&gt;mm_node);</div><div class='add'>+		kfree(entry);</div><div class='add'>+	}</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;struct_mutex);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c<br/>index 5a72ed908232..1e2c0fb7f786 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include "vmwgfx_drv.h"</div><div class='ctx'> #include "ttm/ttm_bo_driver.h"</div><div class='ctx'> #include "ttm/ttm_placement.h"</div><div class='add'>+#include "ttm/ttm_page_alloc.h"</div><div class='ctx'> </div><div class='ctx'> static uint32_t vram_placement_flags = TTM_PL_FLAG_VRAM |</div><div class='ctx'> 	TTM_PL_FLAG_CACHED;</div><div class='hunk'>@@ -139,85 +140,63 @@ struct ttm_placement vmw_srf_placement = {</div><div class='ctx'> 	.busy_placement = gmr_vram_placement_flags</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct vmw_ttm_backend {</div><div class='del'>-	struct ttm_backend backend;</div><div class='del'>-	struct page **pages;</div><div class='del'>-	unsigned long num_pages;</div><div class='add'>+struct vmw_ttm_tt {</div><div class='add'>+	struct ttm_tt ttm;</div><div class='ctx'> 	struct vmw_private *dev_priv;</div><div class='ctx'> 	int gmr_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int vmw_ttm_populate(struct ttm_backend *backend,</div><div class='del'>-			    unsigned long num_pages, struct page **pages,</div><div class='del'>-			    struct page *dummy_read_page,</div><div class='del'>-			    dma_addr_t *dma_addrs)</div><div class='add'>+static int vmw_ttm_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem)</div><div class='ctx'> {</div><div class='del'>-	struct vmw_ttm_backend *vmw_be =</div><div class='del'>-	    container_of(backend, struct vmw_ttm_backend, backend);</div><div class='del'>-</div><div class='del'>-	vmw_be-&gt;pages = pages;</div><div class='del'>-	vmw_be-&gt;num_pages = num_pages;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vmw_ttm_bind(struct ttm_backend *backend, struct ttm_mem_reg *bo_mem)</div><div class='del'>-{</div><div class='del'>-	struct vmw_ttm_backend *vmw_be =</div><div class='del'>-	    container_of(backend, struct vmw_ttm_backend, backend);</div><div class='add'>+	struct vmw_ttm_tt *vmw_be = container_of(ttm, struct vmw_ttm_tt, ttm);</div><div class='ctx'> </div><div class='ctx'> 	vmw_be-&gt;gmr_id = bo_mem-&gt;start;</div><div class='ctx'> </div><div class='del'>-	return vmw_gmr_bind(vmw_be-&gt;dev_priv, vmw_be-&gt;pages,</div><div class='del'>-			    vmw_be-&gt;num_pages, vmw_be-&gt;gmr_id);</div><div class='add'>+	return vmw_gmr_bind(vmw_be-&gt;dev_priv, ttm-&gt;pages,</div><div class='add'>+			    ttm-&gt;num_pages, vmw_be-&gt;gmr_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vmw_ttm_unbind(struct ttm_backend *backend)</div><div class='add'>+static int vmw_ttm_unbind(struct ttm_tt *ttm)</div><div class='ctx'> {</div><div class='del'>-	struct vmw_ttm_backend *vmw_be =</div><div class='del'>-	    container_of(backend, struct vmw_ttm_backend, backend);</div><div class='add'>+	struct vmw_ttm_tt *vmw_be = container_of(ttm, struct vmw_ttm_tt, ttm);</div><div class='ctx'> </div><div class='ctx'> 	vmw_gmr_unbind(vmw_be-&gt;dev_priv, vmw_be-&gt;gmr_id);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vmw_ttm_clear(struct ttm_backend *backend)</div><div class='add'>+static void vmw_ttm_destroy(struct ttm_tt *ttm)</div><div class='ctx'> {</div><div class='del'>-	struct vmw_ttm_backend *vmw_be =</div><div class='del'>-		container_of(backend, struct vmw_ttm_backend, backend);</div><div class='del'>-</div><div class='del'>-	vmw_be-&gt;pages = NULL;</div><div class='del'>-	vmw_be-&gt;num_pages = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vmw_ttm_destroy(struct ttm_backend *backend)</div><div class='del'>-{</div><div class='del'>-	struct vmw_ttm_backend *vmw_be =</div><div class='del'>-	    container_of(backend, struct vmw_ttm_backend, backend);</div><div class='add'>+	struct vmw_ttm_tt *vmw_be = container_of(ttm, struct vmw_ttm_tt, ttm);</div><div class='ctx'> </div><div class='add'>+	ttm_tt_fini(ttm);</div><div class='ctx'> 	kfree(vmw_be);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ttm_backend_func vmw_ttm_func = {</div><div class='del'>-	.populate = vmw_ttm_populate,</div><div class='del'>-	.clear = vmw_ttm_clear,</div><div class='ctx'> 	.bind = vmw_ttm_bind,</div><div class='ctx'> 	.unbind = vmw_ttm_unbind,</div><div class='ctx'> 	.destroy = vmw_ttm_destroy,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct ttm_backend *vmw_ttm_backend_init(struct ttm_bo_device *bdev)</div><div class='add'>+struct ttm_tt *vmw_ttm_tt_create(struct ttm_bo_device *bdev,</div><div class='add'>+				 unsigned long size, uint32_t page_flags,</div><div class='add'>+				 struct page *dummy_read_page)</div><div class='ctx'> {</div><div class='del'>-	struct vmw_ttm_backend *vmw_be;</div><div class='add'>+	struct vmw_ttm_tt *vmw_be;</div><div class='ctx'> </div><div class='ctx'> 	vmw_be = kmalloc(sizeof(*vmw_be), GFP_KERNEL);</div><div class='ctx'> 	if (!vmw_be)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	vmw_be-&gt;backend.func = &amp;vmw_ttm_func;</div><div class='add'>+	vmw_be-&gt;ttm.func = &amp;vmw_ttm_func;</div><div class='ctx'> 	vmw_be-&gt;dev_priv = container_of(bdev, struct vmw_private, bdev);</div><div class='ctx'> </div><div class='del'>-	return &amp;vmw_be-&gt;backend;</div><div class='add'>+	if (ttm_tt_init(&amp;vmw_be-&gt;ttm, bdev, size, page_flags, dummy_read_page)) {</div><div class='add'>+		kfree(vmw_be);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return &amp;vmw_be-&gt;ttm;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int vmw_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags)</div><div class='hunk'>@@ -357,7 +336,9 @@ static int vmw_sync_obj_wait(void *sync_obj, void *sync_arg,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct ttm_bo_driver vmw_bo_driver = {</div><div class='del'>-	.create_ttm_backend_entry = vmw_ttm_backend_init,</div><div class='add'>+	.ttm_tt_create = &amp;vmw_ttm_tt_create,</div><div class='add'>+	.ttm_tt_populate = &amp;ttm_pool_populate,</div><div class='add'>+	.ttm_tt_unpopulate = &amp;ttm_pool_unpopulate,</div><div class='ctx'> 	.invalidate_caches = vmw_invalidate_caches,</div><div class='ctx'> 	.init_mem_type = vmw_init_mem_type,</div><div class='ctx'> 	.evict_flags = vmw_evict_flags,</div><div class='head'>diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c<br/>index dff8fc767152..f390f5f9cb68 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/vmwgfx/vmwgfx_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/vmwgfx/vmwgfx_drv.c</a></div><div class='hunk'>@@ -1064,6 +1064,21 @@ static const struct dev_pm_ops vmw_pm_ops = {</div><div class='ctx'> 	.resume = vmw_pm_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct file_operations vmwgfx_driver_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = drm_open,</div><div class='add'>+	.release = drm_release,</div><div class='add'>+	.unlocked_ioctl = vmw_unlocked_ioctl,</div><div class='add'>+	.mmap = vmw_mmap,</div><div class='add'>+	.poll = vmw_fops_poll,</div><div class='add'>+	.read = vmw_fops_read,</div><div class='add'>+	.fasync = drm_fasync,</div><div class='add'>+#if defined(CONFIG_COMPAT)</div><div class='add'>+	.compat_ioctl = drm_compat_ioctl,</div><div class='add'>+#endif</div><div class='add'>+	.llseek = noop_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct drm_driver driver = {</div><div class='ctx'> 	.driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED |</div><div class='ctx'> 	DRIVER_MODESET,</div><div class='hunk'>@@ -1088,20 +1103,7 @@ static struct drm_driver driver = {</div><div class='ctx'> 	.master_drop = vmw_master_drop,</div><div class='ctx'> 	.open = vmw_driver_open,</div><div class='ctx'> 	.postclose = vmw_postclose,</div><div class='del'>-	.fops = {</div><div class='del'>-		 .owner = THIS_MODULE,</div><div class='del'>-		 .open = drm_open,</div><div class='del'>-		 .release = drm_release,</div><div class='del'>-		 .unlocked_ioctl = vmw_unlocked_ioctl,</div><div class='del'>-		 .mmap = vmw_mmap,</div><div class='del'>-		 .poll = vmw_fops_poll,</div><div class='del'>-		 .read = vmw_fops_read,</div><div class='del'>-		 .fasync = drm_fasync,</div><div class='del'>-#if defined(CONFIG_COMPAT)</div><div class='del'>-		 .compat_ioctl = drm_compat_ioctl,</div><div class='del'>-#endif</div><div class='del'>-		 .llseek = noop_llseek,</div><div class='del'>-	},</div><div class='add'>+	.fops = &amp;vmwgfx_driver_fops,</div><div class='ctx'> 	.name = VMWGFX_DRIVER_NAME,</div><div class='ctx'> 	.desc = VMWGFX_DRIVER_DESC,</div><div class='ctx'> 	.date = VMWGFX_DRIVER_DATE,</div><div class='head'>diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c<br/>index f94b33ae2215..0af6ebdf205d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/vmwgfx/vmwgfx_kms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/vmwgfx/vmwgfx_kms.c</a></div><div class='hunk'>@@ -690,7 +690,7 @@ static int vmw_kms_new_framebuffer_surface(struct vmw_private *dev_priv,</div><div class='ctx'> </div><div class='ctx'> 	/* XXX get the first 3 from the surface info */</div><div class='ctx'> 	vfbs-&gt;base.base.bits_per_pixel = mode_cmd-&gt;bpp;</div><div class='del'>-	vfbs-&gt;base.base.pitch = mode_cmd-&gt;pitch;</div><div class='add'>+	vfbs-&gt;base.base.pitches[0] = mode_cmd-&gt;pitch;</div><div class='ctx'> 	vfbs-&gt;base.base.depth = mode_cmd-&gt;depth;</div><div class='ctx'> 	vfbs-&gt;base.base.width = mode_cmd-&gt;width;</div><div class='ctx'> 	vfbs-&gt;base.base.height = mode_cmd-&gt;height;</div><div class='hunk'>@@ -804,7 +804,7 @@ static int do_dmabuf_define_gmrfb(struct drm_file *file_priv,</div><div class='ctx'> 	cmd-&gt;body.format.bitsPerPixel = framebuffer-&gt;base.bits_per_pixel;</div><div class='ctx'> 	cmd-&gt;body.format.colorDepth = depth;</div><div class='ctx'> 	cmd-&gt;body.format.reserved = 0;</div><div class='del'>-	cmd-&gt;body.bytesPerLine = framebuffer-&gt;base.pitch;</div><div class='add'>+	cmd-&gt;body.bytesPerLine = framebuffer-&gt;base.pitches[0];</div><div class='ctx'> 	cmd-&gt;body.ptr.gmrId = framebuffer-&gt;user_handle;</div><div class='ctx'> 	cmd-&gt;body.ptr.offset = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1056,7 +1056,7 @@ static int vmw_kms_new_framebuffer_dmabuf(struct vmw_private *dev_priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	vfbd-&gt;base.base.bits_per_pixel = mode_cmd-&gt;bpp;</div><div class='del'>-	vfbd-&gt;base.base.pitch = mode_cmd-&gt;pitch;</div><div class='add'>+	vfbd-&gt;base.base.pitches[0] = mode_cmd-&gt;pitch;</div><div class='ctx'> 	vfbd-&gt;base.base.depth = mode_cmd-&gt;depth;</div><div class='ctx'> 	vfbd-&gt;base.base.width = mode_cmd-&gt;width;</div><div class='ctx'> 	vfbd-&gt;base.base.height = mode_cmd-&gt;height;</div><div class='hunk'>@@ -1085,7 +1085,7 @@ out_err1:</div><div class='ctx'> </div><div class='ctx'> static struct drm_framebuffer *vmw_kms_fb_create(struct drm_device *dev,</div><div class='ctx'> 						 struct drm_file *file_priv,</div><div class='del'>-						 struct drm_mode_fb_cmd *mode_cmd)</div><div class='add'>+						 struct drm_mode_fb_cmd2 *mode_cmd2)</div><div class='ctx'> {</div><div class='ctx'> 	struct vmw_private *dev_priv = vmw_priv(dev);</div><div class='ctx'> 	struct ttm_object_file *tfile = vmw_fpriv(file_priv)-&gt;tfile;</div><div class='hunk'>@@ -1093,8 +1093,16 @@ static struct drm_framebuffer *vmw_kms_fb_create(struct drm_device *dev,</div><div class='ctx'> 	struct vmw_surface *surface = NULL;</div><div class='ctx'> 	struct vmw_dma_buffer *bo = NULL;</div><div class='ctx'> 	struct ttm_base_object *user_obj;</div><div class='add'>+	struct drm_mode_fb_cmd mode_cmd;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	mode_cmd.width = mode_cmd2-&gt;width;</div><div class='add'>+	mode_cmd.height = mode_cmd2-&gt;height;</div><div class='add'>+	mode_cmd.pitch = mode_cmd2-&gt;pitches[0];</div><div class='add'>+	mode_cmd.handle = mode_cmd2-&gt;handles[0];</div><div class='add'>+	drm_fb_get_bpp_depth(mode_cmd2-&gt;pixel_format, &amp;mode_cmd.depth,</div><div class='add'>+				    &amp;mode_cmd.bpp);</div><div class='add'>+</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * This code should be conditioned on Screen Objects not being used.</div><div class='ctx'> 	 * If screen objects are used, we can allocate a GMR to hold the</div><div class='hunk'>@@ -1102,8 +1110,8 @@ static struct drm_framebuffer *vmw_kms_fb_create(struct drm_device *dev,</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (!vmw_kms_validate_mode_vram(dev_priv,</div><div class='del'>-					mode_cmd-&gt;pitch,</div><div class='del'>-					mode_cmd-&gt;height)) {</div><div class='add'>+					mode_cmd.pitch,</div><div class='add'>+					mode_cmd.height)) {</div><div class='ctx'> 		DRM_ERROR("VRAM size is too small for requested mode.\n");</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1117,15 +1125,19 @@ static struct drm_framebuffer *vmw_kms_fb_create(struct drm_device *dev,</div><div class='ctx'> 	 * command stream using user-space handles.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	user_obj = ttm_base_object_lookup(tfile, mode_cmd-&gt;handle);</div><div class='add'>+	user_obj = ttm_base_object_lookup(tfile, mode_cmd.handle);</div><div class='ctx'> 	if (unlikely(user_obj == NULL)) {</div><div class='ctx'> 		DRM_ERROR("Could not locate requested kms frame buffer.\n");</div><div class='ctx'> 		return ERR_PTR(-ENOENT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/**</div><div class='add'>+	 * End conditioned code.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='ctx'> 	/* returns either a dmabuf or surface */</div><div class='ctx'> 	ret = vmw_user_lookup_handle(dev_priv, tfile,</div><div class='del'>-				     mode_cmd-&gt;handle,</div><div class='add'>+				     mode_cmd.handle,</div><div class='ctx'> 				     &amp;surface, &amp;bo);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_out;</div><div class='hunk'>@@ -1133,10 +1145,10 @@ static struct drm_framebuffer *vmw_kms_fb_create(struct drm_device *dev,</div><div class='ctx'> 	/* Create the new framebuffer depending one what we got back */</div><div class='ctx'> 	if (bo)</div><div class='ctx'> 		ret = vmw_kms_new_framebuffer_dmabuf(dev_priv, bo, &amp;vfb,</div><div class='del'>-						     mode_cmd);</div><div class='add'>+						     &amp;mode_cmd);</div><div class='ctx'> 	else if (surface)</div><div class='ctx'> 		ret = vmw_kms_new_framebuffer_surface(dev_priv, file_priv,</div><div class='del'>-						      surface, &amp;vfb, mode_cmd);</div><div class='add'>+						      surface, &amp;vfb, &amp;mode_cmd);</div><div class='ctx'> 	else</div><div class='ctx'> 		BUG();</div><div class='ctx'> </div><div class='hunk'>@@ -1344,7 +1356,7 @@ int vmw_kms_readback(struct vmw_private *dev_priv,</div><div class='ctx'> 	cmd-&gt;body.format.bitsPerPixel = vfb-&gt;base.bits_per_pixel;</div><div class='ctx'> 	cmd-&gt;body.format.colorDepth = vfb-&gt;base.depth;</div><div class='ctx'> 	cmd-&gt;body.format.reserved = 0;</div><div class='del'>-	cmd-&gt;body.bytesPerLine = vfb-&gt;base.pitch;</div><div class='add'>+	cmd-&gt;body.bytesPerLine = vfb-&gt;base.pitches[0];</div><div class='ctx'> 	cmd-&gt;body.ptr.gmrId = vfb-&gt;user_handle;</div><div class='ctx'> 	cmd-&gt;body.ptr.offset = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h<br/>index e1cb8556355f..a4f7f034996a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/vmwgfx/vmwgfx_kms.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/vmwgfx/vmwgfx_kms.h</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #define VMWGFX_KMS_H_</div><div class='ctx'> </div><div class='ctx'> #include "drmP.h"</div><div class='add'>+#include "drm_crtc_helper.h"</div><div class='ctx'> #include "vmwgfx_drv.h"</div><div class='ctx'> </div><div class='ctx'> #define VMWGFX_NUM_DISPLAY_UNITS 8</div><div class='head'>diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c<br/>index 8f8dbd43c33d..f77b184be807 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c</a></div><div class='hunk'>@@ -95,7 +95,7 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		fb = entry-&gt;base.crtc.fb;</div><div class='ctx'> </div><div class='del'>-		return vmw_kms_write_svga(dev_priv, w, h, fb-&gt;pitch,</div><div class='add'>+		return vmw_kms_write_svga(dev_priv, w, h, fb-&gt;pitches[0],</div><div class='ctx'> 					  fb-&gt;bits_per_pixel, fb-&gt;depth);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -103,7 +103,7 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv)</div><div class='ctx'> 		entry = list_entry(lds-&gt;active.next, typeof(*entry), active);</div><div class='ctx'> 		fb = entry-&gt;base.crtc.fb;</div><div class='ctx'> </div><div class='del'>-		vmw_kms_write_svga(dev_priv, fb-&gt;width, fb-&gt;height, fb-&gt;pitch,</div><div class='add'>+		vmw_kms_write_svga(dev_priv, fb-&gt;width, fb-&gt;height, fb-&gt;pitches[0],</div><div class='ctx'> 				   fb-&gt;bits_per_pixel, fb-&gt;depth);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c<br/>index 1c7f09e26819..a37abb581cbb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpu/drm/vmwgfx/vmwgfx_resource.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/gpu/drm/vmwgfx/vmwgfx_resource.c</a></div><div class='hunk'>@@ -1540,29 +1540,10 @@ out_bad_surface:</div><div class='ctx'> /**</div><div class='ctx'>  * Buffer management.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-static size_t vmw_dmabuf_acc_size(struct ttm_bo_global *glob,</div><div class='del'>-				  unsigned long num_pages)</div><div class='del'>-{</div><div class='del'>-	static size_t bo_user_size = ~0;</div><div class='del'>-</div><div class='del'>-	size_t page_array_size =</div><div class='del'>-	    (num_pages * sizeof(void *) + PAGE_SIZE - 1) &amp; PAGE_MASK;</div><div class='del'>-</div><div class='del'>-	if (unlikely(bo_user_size == ~0)) {</div><div class='del'>-		bo_user_size = glob-&gt;ttm_bo_extra_size +</div><div class='del'>-		    ttm_round_pot(sizeof(struct vmw_dma_buffer));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bo_user_size + page_array_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void vmw_dmabuf_bo_free(struct ttm_buffer_object *bo)</div><div class='ctx'> {</div><div class='ctx'> 	struct vmw_dma_buffer *vmw_bo = vmw_dma_buffer(bo);</div><div class='del'>-	struct ttm_bo_global *glob = bo-&gt;glob;</div><div class='ctx'> </div><div class='del'>-	ttm_mem_global_free(glob-&gt;mem_glob, bo-&gt;acc_size);</div><div class='ctx'> 	kfree(vmw_bo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1573,24 +1554,12 @@ int vmw_dmabuf_init(struct vmw_private *dev_priv,</div><div class='ctx'> 		    void (*bo_free) (struct ttm_buffer_object *bo))</div><div class='ctx'> {</div><div class='ctx'> 	struct ttm_bo_device *bdev = &amp;dev_priv-&gt;bdev;</div><div class='del'>-	struct ttm_mem_global *mem_glob = bdev-&gt;glob-&gt;mem_glob;</div><div class='ctx'> 	size_t acc_size;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!bo_free);</div><div class='ctx'> </div><div class='del'>-	acc_size =</div><div class='del'>-	    vmw_dmabuf_acc_size(bdev-&gt;glob,</div><div class='del'>-				(size + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT);</div><div class='del'>-</div><div class='del'>-	ret = ttm_mem_global_alloc(mem_glob, acc_size, false, false);</div><div class='del'>-	if (unlikely(ret != 0)) {</div><div class='del'>-		/* we must free the bo here as</div><div class='del'>-		 * ttm_buffer_object_init does so as well */</div><div class='del'>-		bo_free(&amp;vmw_bo-&gt;base);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	acc_size = ttm_bo_acc_size(bdev, size, sizeof(struct vmw_dma_buffer));</div><div class='ctx'> 	memset(vmw_bo, 0, sizeof(*vmw_bo));</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;vmw_bo-&gt;validate_list);</div><div class='hunk'>@@ -1605,9 +1574,7 @@ int vmw_dmabuf_init(struct vmw_private *dev_priv,</div><div class='ctx'> static void vmw_user_dmabuf_destroy(struct ttm_buffer_object *bo)</div><div class='ctx'> {</div><div class='ctx'> 	struct vmw_user_dma_buffer *vmw_user_bo = vmw_user_dma_buffer(bo);</div><div class='del'>-	struct ttm_bo_global *glob = bo-&gt;glob;</div><div class='ctx'> </div><div class='del'>-	ttm_mem_global_free(glob-&gt;mem_glob, bo-&gt;acc_size);</div><div class='ctx'> 	kfree(vmw_user_bo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig<br/>index 22a4a051f221..a421abdd1ab7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/Kconfig</a></div><div class='hunk'>@@ -31,6 +31,11 @@ config HID</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='add'>+config HID_BATTERY_STRENGTH</div><div class='add'>+	bool</div><div class='add'>+	depends on HID &amp;&amp; POWER_SUPPLY &amp;&amp; HID = POWER_SUPPLY</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> config HIDRAW</div><div class='ctx'> 	bool "/dev/hidraw raw HID device support"</div><div class='ctx'> 	depends on HID</div><div class='hunk'>@@ -335,6 +340,7 @@ config HID_MULTITOUCH</div><div class='ctx'> 	  Say Y here if you have one of the following devices:</div><div class='ctx'> 	  - 3M PCT touch screens</div><div class='ctx'> 	  - ActionStar dual touch panels</div><div class='add'>+	  - Atmel panels</div><div class='ctx'> 	  - Cando dual touch panels</div><div class='ctx'> 	  - Chunghwa panels</div><div class='ctx'> 	  - CVTouch panels</div><div class='hunk'>@@ -349,12 +355,15 @@ config HID_MULTITOUCH</div><div class='ctx'> 	  - Lumio CrystalTouch panels</div><div class='ctx'> 	  - MosArt dual-touch panels</div><div class='ctx'> 	  - PenMount dual touch panels</div><div class='add'>+	  - PixArt optical touch screen</div><div class='ctx'> 	  - Pixcir dual touch panels</div><div class='add'>+	  - Quanta panels</div><div class='ctx'> 	  - eGalax dual-touch panels, including the Joojoo and Wetab tablets</div><div class='ctx'> 	  - Stantum multitouch panels</div><div class='ctx'> 	  - Touch International Panels</div><div class='ctx'> 	  - Unitec Panels</div><div class='ctx'> 	  - XAT optical touch panels</div><div class='add'>+	  - Xiroku optical touch panels</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='hunk'>@@ -466,12 +475,6 @@ config HID_PRIMAX</div><div class='ctx'> 	Support for Primax devices that are not fully compliant with the</div><div class='ctx'> 	HID standard.</div><div class='ctx'> </div><div class='del'>-config HID_QUANTA</div><div class='del'>-	tristate "Quanta Optical Touch panels"</div><div class='del'>-	depends on USB_HID</div><div class='del'>-	---help---</div><div class='del'>-	Support for Quanta Optical Touch dual-touch panels.</div><div class='del'>-</div><div class='ctx'> config HID_ROCCAT</div><div class='ctx'> 	tristate "Roccat special event support"</div><div class='ctx'> 	depends on USB_HID</div><div class='hunk'>@@ -492,6 +495,13 @@ config HID_ROCCAT_ARVO</div><div class='ctx'> 	---help---</div><div class='ctx'> 	Support for Roccat Arvo keyboard.</div><div class='ctx'> </div><div class='add'>+config HID_ROCCAT_ISKU</div><div class='add'>+	tristate "Roccat Isku keyboard support"</div><div class='add'>+	depends on USB_HID</div><div class='add'>+	depends on HID_ROCCAT</div><div class='add'>+	---help---</div><div class='add'>+	Support for Roccat Isku keyboard.</div><div class='add'>+</div><div class='ctx'> config HID_ROCCAT_KONE</div><div class='ctx'> 	tristate "Roccat Kone Mouse support"</div><div class='ctx'> 	depends on USB_HID</div><div class='hunk'>@@ -560,6 +570,12 @@ config GREENASIA_FF</div><div class='ctx'> 	(like MANTA Warrior MM816 and SpeedLink Strike2 SL-6635) or adapter</div><div class='ctx'> 	and want to enable force feedback support for it.</div><div class='ctx'> </div><div class='add'>+config HID_HYPERV_MOUSE</div><div class='add'>+	tristate "Microsoft Hyper-V mouse driver"</div><div class='add'>+	depends on HYPERV</div><div class='add'>+	---help---</div><div class='add'>+	Select this option to enable the Hyper-V mouse driver.</div><div class='add'>+</div><div class='ctx'> config HID_SMARTJOYPLUS</div><div class='ctx'> 	tristate "SmartJoy PLUS PS2/USB adapter support"</div><div class='ctx'> 	depends on USB_HID</div><div class='hunk'>@@ -620,9 +636,19 @@ config HID_WIIMOTE</div><div class='ctx'> 	depends on BT_HIDP</div><div class='ctx'> 	depends on LEDS_CLASS</div><div class='ctx'> 	select POWER_SUPPLY</div><div class='add'>+	select INPUT_FF_MEMLESS</div><div class='ctx'> 	---help---</div><div class='ctx'> 	Support for the Nintendo Wii Remote bluetooth device.</div><div class='ctx'> </div><div class='add'>+config HID_WIIMOTE_EXT</div><div class='add'>+	bool "Nintendo Wii Remote Extension support"</div><div class='add'>+	depends on HID_WIIMOTE</div><div class='add'>+	default HID_WIIMOTE</div><div class='add'>+	---help---</div><div class='add'>+	Support for extension controllers of the Nintendo Wii Remote. Say yes</div><div class='add'>+	here if you want to use the Nintendo Motion+, Nunchuck or Classic</div><div class='add'>+	extension controllers with your Wii Remote.</div><div class='add'>+</div><div class='ctx'> config HID_ZEROPLUS</div><div class='ctx'> 	tristate "Zeroplus based game controller support"</div><div class='ctx'> 	depends on USB_HID</div><div class='head'>diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile<br/>index 1e0d2a638b28..8aefdc963cce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/Makefile</a></div><div class='hunk'>@@ -25,6 +25,14 @@ ifdef CONFIG_LOGIWHEELS_FF</div><div class='ctx'> 	hid-logitech-y	+= hid-lg4ff.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='add'>+hid-wiimote-y		:= hid-wiimote-core.o</div><div class='add'>+ifdef CONFIG_HID_WIIMOTE_EXT</div><div class='add'>+	hid-wiimote-y	+= hid-wiimote-ext.o</div><div class='add'>+endif</div><div class='add'>+ifdef CONFIG_DEBUG_FS</div><div class='add'>+	hid-wiimote-y	+= hid-wiimote-debug.o</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_HID_A4TECH)	+= hid-a4tech.o</div><div class='ctx'> obj-$(CONFIG_HID_ACRUX)		+= hid-axff.o</div><div class='ctx'> obj-$(CONFIG_HID_APPLE)		+= hid-apple.o</div><div class='hunk'>@@ -38,6 +46,7 @@ obj-$(CONFIG_HID_ELECOM)	+= hid-elecom.o</div><div class='ctx'> obj-$(CONFIG_HID_EZKEY)		+= hid-ezkey.o</div><div class='ctx'> obj-$(CONFIG_HID_GYRATION)	+= hid-gyration.o</div><div class='ctx'> obj-$(CONFIG_HID_HOLTEK)	+= hid-holtekff.o</div><div class='add'>+obj-$(CONFIG_HID_HYPERV_MOUSE)	+= hid-hyperv.o</div><div class='ctx'> obj-$(CONFIG_HID_KENSINGTON)	+= hid-kensington.o</div><div class='ctx'> obj-$(CONFIG_HID_KEYTOUCH)	+= hid-keytouch.o</div><div class='ctx'> obj-$(CONFIG_HID_KYE)		+= hid-kye.o</div><div class='hunk'>@@ -51,7 +60,6 @@ obj-$(CONFIG_HID_MULTITOUCH)	+= hid-multitouch.o</div><div class='ctx'> obj-$(CONFIG_HID_NTRIG)		+= hid-ntrig.o</div><div class='ctx'> obj-$(CONFIG_HID_ORTEK)		+= hid-ortek.o</div><div class='ctx'> obj-$(CONFIG_HID_PRODIKEYS)	+= hid-prodikeys.o</div><div class='del'>-obj-$(CONFIG_HID_QUANTA)	+= hid-quanta.o</div><div class='ctx'> obj-$(CONFIG_HID_PANTHERLORD)	+= hid-pl.o</div><div class='ctx'> obj-$(CONFIG_HID_PETALYNX)	+= hid-petalynx.o</div><div class='ctx'> obj-$(CONFIG_HID_PICOLCD)	+= hid-picolcd.o</div><div class='hunk'>@@ -59,6 +67,7 @@ obj-$(CONFIG_HID_PRIMAX)	+= hid-primax.o</div><div class='ctx'> obj-$(CONFIG_HID_ROCCAT)	+= hid-roccat.o</div><div class='ctx'> obj-$(CONFIG_HID_ROCCAT_COMMON)	+= hid-roccat-common.o</div><div class='ctx'> obj-$(CONFIG_HID_ROCCAT_ARVO)	+= hid-roccat-arvo.o</div><div class='add'>+obj-$(CONFIG_HID_ROCCAT_ISKU)	+= hid-roccat-isku.o</div><div class='ctx'> obj-$(CONFIG_HID_ROCCAT_KONE)	+= hid-roccat-kone.o</div><div class='ctx'> obj-$(CONFIG_HID_ROCCAT_KONEPLUS)	+= hid-roccat-koneplus.o</div><div class='ctx'> obj-$(CONFIG_HID_ROCCAT_KOVAPLUS)	+= hid-roccat-kovaplus.o</div><div class='head'>diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c<br/>index af353842f75f..af08ce7207d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/hid-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-core.c</a></div><div class='hunk'>@@ -90,7 +90,7 @@ static struct hid_field *hid_register_field(struct hid_report *report, unsigned</div><div class='ctx'> 	struct hid_field *field;</div><div class='ctx'> </div><div class='ctx'> 	if (report-&gt;maxfield == HID_MAX_FIELDS) {</div><div class='del'>-		dbg_hid("too many fields in report\n");</div><div class='add'>+		hid_err(report-&gt;device, "too many fields in report\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -121,7 +121,7 @@ static int open_collection(struct hid_parser *parser, unsigned type)</div><div class='ctx'> 	usage = parser-&gt;local.usage[0];</div><div class='ctx'> </div><div class='ctx'> 	if (parser-&gt;collection_stack_ptr == HID_COLLECTION_STACK_SIZE) {</div><div class='del'>-		dbg_hid("collection stack overflow\n");</div><div class='add'>+		hid_err(parser-&gt;device, "collection stack overflow\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -129,7 +129,7 @@ static int open_collection(struct hid_parser *parser, unsigned type)</div><div class='ctx'> 		collection = kmalloc(sizeof(struct hid_collection) *</div><div class='ctx'> 				parser-&gt;device-&gt;collection_size * 2, GFP_KERNEL);</div><div class='ctx'> 		if (collection == NULL) {</div><div class='del'>-			dbg_hid("failed to reallocate collection array\n");</div><div class='add'>+			hid_err(parser-&gt;device, "failed to reallocate collection array\n");</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 		memcpy(collection, parser-&gt;device-&gt;collection,</div><div class='hunk'>@@ -165,7 +165,7 @@ static int open_collection(struct hid_parser *parser, unsigned type)</div><div class='ctx'> static int close_collection(struct hid_parser *parser)</div><div class='ctx'> {</div><div class='ctx'> 	if (!parser-&gt;collection_stack_ptr) {</div><div class='del'>-		dbg_hid("collection stack underflow\n");</div><div class='add'>+		hid_err(parser-&gt;device, "collection stack underflow\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	parser-&gt;collection_stack_ptr--;</div><div class='hunk'>@@ -197,7 +197,7 @@ static unsigned hid_lookup_collection(struct hid_parser *parser, unsigned type)</div><div class='ctx'> static int hid_add_usage(struct hid_parser *parser, unsigned usage)</div><div class='ctx'> {</div><div class='ctx'> 	if (parser-&gt;local.usage_index &gt;= HID_MAX_USAGES) {</div><div class='del'>-		dbg_hid("usage index exceeded\n");</div><div class='add'>+		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='hunk'>@@ -222,12 +222,13 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign</div><div class='ctx'> </div><div class='ctx'> 	report = hid_register_report(parser-&gt;device, report_type, parser-&gt;global.report_id);</div><div class='ctx'> 	if (!report) {</div><div class='del'>-		dbg_hid("hid_register_report failed\n");</div><div class='add'>+		hid_err(parser-&gt;device, "hid_register_report failed\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (parser-&gt;global.logical_maximum &lt; parser-&gt;global.logical_minimum) {</div><div class='del'>-		dbg_hid("logical range invalid %d %d\n", parser-&gt;global.logical_minimum, parser-&gt;global.logical_maximum);</div><div class='add'>+		hid_err(parser-&gt;device, "logical range invalid %d %d\n",</div><div class='add'>+				parser-&gt;global.logical_minimum, parser-&gt;global.logical_maximum);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -307,7 +308,7 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)</div><div class='ctx'> 	case HID_GLOBAL_ITEM_TAG_PUSH:</div><div class='ctx'> </div><div class='ctx'> 		if (parser-&gt;global_stack_ptr == HID_GLOBAL_STACK_SIZE) {</div><div class='del'>-			dbg_hid("global environment stack overflow\n");</div><div class='add'>+			hid_err(parser-&gt;device, "global environment stack overflow\n");</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -318,7 +319,7 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)</div><div class='ctx'> 	case HID_GLOBAL_ITEM_TAG_POP:</div><div class='ctx'> </div><div class='ctx'> 		if (!parser-&gt;global_stack_ptr) {</div><div class='del'>-			dbg_hid("global environment stack underflow\n");</div><div class='add'>+			hid_err(parser-&gt;device, "global environment stack underflow\n");</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -362,8 +363,8 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)</div><div class='ctx'> </div><div class='ctx'> 	case HID_GLOBAL_ITEM_TAG_REPORT_SIZE:</div><div class='ctx'> 		parser-&gt;global.report_size = item_udata(item);</div><div class='del'>-		if (parser-&gt;global.report_size &gt; 32) {</div><div class='del'>-			dbg_hid("invalid report_size %d\n",</div><div class='add'>+		if (parser-&gt;global.report_size &gt; 96) {</div><div class='add'>+			hid_err(parser-&gt;device, "invalid report_size %d\n",</div><div class='ctx'> 					parser-&gt;global.report_size);</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -372,7 +373,7 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)</div><div class='ctx'> 	case HID_GLOBAL_ITEM_TAG_REPORT_COUNT:</div><div class='ctx'> 		parser-&gt;global.report_count = item_udata(item);</div><div class='ctx'> 		if (parser-&gt;global.report_count &gt; HID_MAX_USAGES) {</div><div class='del'>-			dbg_hid("invalid report_count %d\n",</div><div class='add'>+			hid_err(parser-&gt;device, "invalid report_count %d\n",</div><div class='ctx'> 					parser-&gt;global.report_count);</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -381,13 +382,13 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)</div><div class='ctx'> 	case HID_GLOBAL_ITEM_TAG_REPORT_ID:</div><div class='ctx'> 		parser-&gt;global.report_id = item_udata(item);</div><div class='ctx'> 		if (parser-&gt;global.report_id == 0) {</div><div class='del'>-			dbg_hid("report_id 0 is invalid\n");</div><div class='add'>+			hid_err(parser-&gt;device, "report_id 0 is invalid\n");</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		dbg_hid("unknown global tag 0x%x\n", item-&gt;tag);</div><div class='add'>+		hid_err(parser-&gt;device, "unknown global tag 0x%x\n", item-&gt;tag);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -414,14 +415,14 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)</div><div class='ctx'> 			 * items and the first delimiter set.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (parser-&gt;local.delimiter_depth != 0) {</div><div class='del'>-				dbg_hid("nested delimiters\n");</div><div class='add'>+				hid_err(parser-&gt;device, "nested delimiters\n");</div><div class='ctx'> 				return -1;</div><div class='ctx'> 			}</div><div class='ctx'> 			parser-&gt;local.delimiter_depth++;</div><div class='ctx'> 			parser-&gt;local.delimiter_branch++;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (parser-&gt;local.delimiter_depth &lt; 1) {</div><div class='del'>-				dbg_hid("bogus close delimiter\n");</div><div class='add'>+				hid_err(parser-&gt;device, "bogus close delimiter\n");</div><div class='ctx'> 				return -1;</div><div class='ctx'> 			}</div><div class='ctx'> 			parser-&gt;local.delimiter_depth--;</div><div class='hunk'>@@ -506,7 +507,7 @@ static int hid_parser_main(struct hid_parser *parser, struct hid_item *item)</div><div class='ctx'> 		ret = hid_add_field(parser, HID_FEATURE_REPORT, data);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		dbg_hid("unknown main item tag 0x%x\n", item-&gt;tag);</div><div class='add'>+		hid_err(parser-&gt;device, "unknown main item tag 0x%x\n", item-&gt;tag);</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -678,12 +679,12 @@ int hid_parse_report(struct hid_device *device, __u8 *start,</div><div class='ctx'> 	while ((start = fetch_item(start, end, &amp;item)) != NULL) {</div><div class='ctx'> </div><div class='ctx'> 		if (item.format != HID_ITEM_FORMAT_SHORT) {</div><div class='del'>-			dbg_hid("unexpected long global item\n");</div><div class='add'>+			hid_err(device, "unexpected long global item\n");</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (dispatch_type[item.type](parser, &amp;item)) {</div><div class='del'>-			dbg_hid("item %u %u %u %u parsing failed\n",</div><div class='add'>+			hid_err(device, "item %u %u %u %u parsing failed\n",</div><div class='ctx'> 				item.format, (unsigned)item.size,</div><div class='ctx'> 				(unsigned)item.type, (unsigned)item.tag);</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -691,11 +692,11 @@ int hid_parse_report(struct hid_device *device, __u8 *start,</div><div class='ctx'> </div><div class='ctx'> 		if (start == end) {</div><div class='ctx'> 			if (parser-&gt;collection_stack_ptr) {</div><div class='del'>-				dbg_hid("unbalanced collection at end of report description\n");</div><div class='add'>+				hid_err(device, "unbalanced collection at end of report description\n");</div><div class='ctx'> 				goto err;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (parser-&gt;local.delimiter_depth) {</div><div class='del'>-				dbg_hid("unbalanced delimiter at end of report description\n");</div><div class='add'>+				hid_err(device, "unbalanced delimiter at end of report description\n");</div><div class='ctx'> 				goto err;</div><div class='ctx'> 			}</div><div class='ctx'> 			vfree(parser);</div><div class='hunk'>@@ -703,7 +704,7 @@ int hid_parse_report(struct hid_device *device, __u8 *start,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dbg_hid("item fetching failed at offset %d\n", (int)(end - start));</div><div class='add'>+	hid_err(device, "item fetching failed at offset %d\n", (int)(end - start));</div><div class='ctx'> err:</div><div class='ctx'> 	vfree(parser);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -873,7 +874,7 @@ static void hid_process_event(struct hid_device *hid, struct hid_field *field,</div><div class='ctx'> 		ret = hdrv-&gt;event(hid, field, usage, value);</div><div class='ctx'> 		if (ret != 0) {</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='del'>-				dbg_hid("%s's event failed with %d\n",</div><div class='add'>+				hid_err(hid, "%s's event failed with %d\n",</div><div class='ctx'> 						hdrv-&gt;name, ret);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -995,12 +996,13 @@ int hid_set_field(struct hid_field *field, unsigned offset, __s32 value)</div><div class='ctx'> 	hid_dump_input(field-&gt;report-&gt;device, field-&gt;usage + offset, value);</div><div class='ctx'> </div><div class='ctx'> 	if (offset &gt;= field-&gt;report_count) {</div><div class='del'>-		dbg_hid("offset (%d) exceeds report_count (%d)\n", offset, field-&gt;report_count);</div><div class='add'>+		hid_err(field-&gt;report-&gt;device, "offset (%d) exceeds report_count (%d)\n",</div><div class='add'>+				offset, field-&gt;report_count);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (field-&gt;logical_minimum &lt; 0) {</div><div class='ctx'> 		if (value != snto32(s32ton(value, size), size)) {</div><div class='del'>-			dbg_hid("value %d is out of range\n", value);</div><div class='add'>+			hid_err(field-&gt;report-&gt;device, "value %d is out of range\n", value);</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1157,7 +1159,7 @@ static bool hid_match_one_id(struct hid_device *hdev,</div><div class='ctx'> 		(id-&gt;product == HID_ANY_ID || id-&gt;product == hdev-&gt;product);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct hid_device_id *hid_match_id(struct hid_device *hdev,</div><div class='add'>+const struct hid_device_id *hid_match_id(struct hid_device *hdev,</div><div class='ctx'> 		const struct hid_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	for (; id-&gt;bus; id++)</div><div class='hunk'>@@ -1404,11 +1406,13 @@ static const struct hid_device_id hid_have_special_driver[] = {</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_TRUETOUCH) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0011) },</div><div class='del'>-	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },</div><div class='del'>-	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },</div><div class='del'>-	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },</div><div class='del'>-	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },</div><div class='del'>-	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },</div><div class='ctx'> 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },</div><div class='hunk'>@@ -1423,6 +1427,7 @@ static const struct hid_device_id hid_have_special_driver[] = {</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_HANVON, USB_DEVICE_ID_HANVON_MULTITOUCH) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_HANVON_ALT, USB_DEVICE_ID_HANVON_ALT_MULTITOUCH) },</div><div class='ctx'>  	{ HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM, USB_DEVICE_ID_IDEACOM_IDC6650) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK, USB_DEVICE_ID_HOLTEK_ON_LINE_GRIP) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_ILITEK, USB_DEVICE_ID_ILITEK_MULTITOUCH) },</div><div class='hunk'>@@ -1498,11 +1503,15 @@ static const struct hid_device_id hid_have_special_driver[] = {</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_PCI) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_KEYBOARD) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONE) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ARVO) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ISKU) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPLUS) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KOVAPLUS) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRED) },</div><div class='hunk'>@@ -1544,11 +1553,21 @@ static const struct hid_device_id hid_have_special_driver[] = {</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_DUAL_BOX_PRO) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_5_PRO) },</div><div class='ctx'> 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },</div><div class='add'>+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_XAT, USB_DEVICE_ID_XAT_CSR) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_SPX) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_MPX) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_CSR) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_SPX1) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_MPX1) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_CSR1) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_SPX2) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_MPX2) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_CSR2) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_X_TENSIONS, USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },</div><div class='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },</div><div class='hunk'>@@ -1768,6 +1787,7 @@ static const struct hid_device_id hid_ignore_list[] = {</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='ctx'> 	{ HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x0004) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x000a) },</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='head'>diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c<br/>index ee80d733801d..01dd9a7daf7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/hid-debug.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-debug.c</a></div><div class='hunk'>@@ -114,6 +114,14 @@ static const struct hid_usage_entry hid_usage_table[] = {</div><div class='ctx'>       {0, 0xbd, "FlareRelease"},</div><div class='ctx'>       {0, 0xbe, "LandingGear"},</div><div class='ctx'>       {0, 0xbf, "ToeBrake"},</div><div class='add'>+  {  6, 0, "GenericDeviceControls" },</div><div class='add'>+      {0, 0x20, "BatteryStrength" },</div><div class='add'>+      {0, 0x21, "WirelessChannel" },</div><div class='add'>+      {0, 0x22, "WirelessID" },</div><div class='add'>+      {0, 0x23, "DiscoverWirelessControl" },</div><div class='add'>+      {0, 0x24, "SecurityCodeCharacterEntered" },</div><div class='add'>+      {0, 0x25, "SecurityCodeCharactedErased" },</div><div class='add'>+      {0, 0x26, "SecurityCodeCleared" },</div><div class='ctx'>   {  7, 0, "Keyboard" },</div><div class='ctx'>   {  8, 0, "LED" },</div><div class='ctx'>       {0, 0x01, "NumLock"},</div><div class='head'>diff --git a/drivers/hid/hid-emsff.c b/drivers/hid/hid-emsff.c<br/>index 9bdde867a02f..2630d483d262 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/hid-emsff.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-emsff.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-emsff.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-emsff.c</a></div><div class='hunk'>@@ -140,7 +140,7 @@ err:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct hid_device_id ems_devices[] = {</div><div class='del'>-	{ HID_USB_DEVICE(USB_VENDOR_ID_EMS, 0x118) },</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(hid, ems_devices);</div><div class='head'>diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/hid/hid-hyperv.c<br/>index ccd39c70c527..0c33ae9cf0f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/hv/hv_mouse.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/hv/hv_mouse.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-hyperv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-hyperv.c</a></div><div class='hunk'>@@ -14,11 +14,8 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/hid.h&gt;</div><div class='ctx'> #include &lt;linux/hiddev.h&gt;</div><div class='hunk'>@@ -118,7 +115,6 @@ struct synthhid_input_report {</div><div class='ctx'> #define INPUTVSC_SEND_RING_BUFFER_SIZE		(10*PAGE_SIZE)</div><div class='ctx'> #define INPUTVSC_RECV_RING_BUFFER_SIZE		(10*PAGE_SIZE)</div><div class='ctx'> </div><div class='del'>-#define NBITS(x) (((x)/BITS_PER_LONG)+1)</div><div class='ctx'> </div><div class='ctx'> enum pipe_prot_msg_type {</div><div class='ctx'> 	PIPE_MESSAGE_INVALID,</div><div class='hunk'>@@ -148,7 +144,8 @@ struct  mousevsc_prt_msg {</div><div class='ctx'>  */</div><div class='ctx'> struct mousevsc_dev {</div><div class='ctx'> 	struct hv_device	*device;</div><div class='del'>-	unsigned char		init_complete;</div><div class='add'>+	bool			init_complete;</div><div class='add'>+	bool			connected;</div><div class='ctx'> 	struct mousevsc_prt_msg	protocol_req;</div><div class='ctx'> 	struct mousevsc_prt_msg	protocol_resp;</div><div class='ctx'> 	/* Synchronize the request/response if needed */</div><div class='hunk'>@@ -159,12 +156,11 @@ struct mousevsc_dev {</div><div class='ctx'> 	unsigned char		*report_desc;</div><div class='ctx'> 	u32			report_desc_size;</div><div class='ctx'> 	struct hv_input_dev_info hid_dev_info;</div><div class='del'>-	int			connected;</div><div class='ctx'> 	struct hid_device       *hid_device;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct mousevsc_dev *alloc_input_device(struct hv_device *device)</div><div class='add'>+static struct mousevsc_dev *mousevsc_alloc_device(struct hv_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct mousevsc_dev *input_dev;</div><div class='ctx'> </div><div class='hunk'>@@ -176,11 +172,12 @@ static struct mousevsc_dev *alloc_input_device(struct hv_device *device)</div><div class='ctx'> 	input_dev-&gt;device = device;</div><div class='ctx'> 	hv_set_drvdata(device, input_dev);</div><div class='ctx'> 	init_completion(&amp;input_dev-&gt;wait_event);</div><div class='add'>+	input_dev-&gt;init_complete = false;</div><div class='ctx'> </div><div class='ctx'> 	return input_dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void free_input_device(struct mousevsc_dev *device)</div><div class='add'>+static void mousevsc_free_device(struct mousevsc_dev *device)</div><div class='ctx'> {</div><div class='ctx'> 	kfree(device-&gt;hid_desc);</div><div class='ctx'> 	kfree(device-&gt;report_desc);</div><div class='hunk'>@@ -188,7 +185,6 @@ static void free_input_device(struct mousevsc_dev *device)</div><div class='ctx'> 	kfree(device);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,</div><div class='ctx'> 				struct synthhid_device_info *device_info)</div><div class='ctx'> {</div><div class='hunk'>@@ -196,14 +192,12 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,</div><div class='ctx'> 	struct hid_descriptor *desc;</div><div class='ctx'> 	struct mousevsc_prt_msg ack;</div><div class='ctx'> </div><div class='del'>-	/* Assume success for now */</div><div class='del'>-	input_device-&gt;dev_info_status = 0;</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;input_device-&gt;hid_dev_info, &amp;device_info-&gt;hid_dev_info,</div><div class='del'>-		sizeof(struct hv_input_dev_info));</div><div class='add'>+	input_device-&gt;dev_info_status = -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	input_device-&gt;hid_dev_info = device_info-&gt;hid_dev_info;</div><div class='ctx'> 	desc = &amp;device_info-&gt;hid_descriptor;</div><div class='del'>-	WARN_ON(desc-&gt;bLength == 0);</div><div class='add'>+	if (desc-&gt;bLength == 0)</div><div class='add'>+		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	input_device-&gt;hid_desc = kzalloc(desc-&gt;bLength, GFP_ATOMIC);</div><div class='ctx'> </div><div class='hunk'>@@ -213,13 +207,18 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,</div><div class='ctx'> 	memcpy(input_device-&gt;hid_desc, desc, desc-&gt;bLength);</div><div class='ctx'> </div><div class='ctx'> 	input_device-&gt;report_desc_size = desc-&gt;desc[0].wDescriptorLength;</div><div class='del'>-	if (input_device-&gt;report_desc_size == 0)</div><div class='add'>+	if (input_device-&gt;report_desc_size == 0) {</div><div class='add'>+		input_device-&gt;dev_info_status = -EINVAL;</div><div class='ctx'> 		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	input_device-&gt;report_desc = kzalloc(input_device-&gt;report_desc_size,</div><div class='ctx'> 					  GFP_ATOMIC);</div><div class='ctx'> </div><div class='del'>-	if (!input_device-&gt;report_desc)</div><div class='add'>+	if (!input_device-&gt;report_desc) {</div><div class='add'>+		input_device-&gt;dev_info_status = -ENOMEM;</div><div class='ctx'> 		goto cleanup;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy(input_device-&gt;report_desc,</div><div class='ctx'> 	       ((unsigned char *)desc) + desc-&gt;bLength,</div><div class='hunk'>@@ -242,22 +241,14 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,</div><div class='ctx'> 			(unsigned long)&amp;ack,</div><div class='ctx'> 			VM_PKT_DATA_INBAND,</div><div class='ctx'> 			VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);</div><div class='del'>-	if (ret != 0)</div><div class='del'>-		goto cleanup;</div><div class='del'>-</div><div class='del'>-	complete(&amp;input_device-&gt;wait_event);</div><div class='ctx'> </div><div class='del'>-	return;</div><div class='add'>+	if (!ret)</div><div class='add'>+		input_device-&gt;dev_info_status = 0;</div><div class='ctx'> </div><div class='ctx'> cleanup:</div><div class='del'>-	kfree(input_device-&gt;hid_desc);</div><div class='del'>-	input_device-&gt;hid_desc = NULL;</div><div class='del'>-</div><div class='del'>-	kfree(input_device-&gt;report_desc);</div><div class='del'>-	input_device-&gt;report_desc = NULL;</div><div class='del'>-</div><div class='del'>-	input_device-&gt;dev_info_status = -1;</div><div class='ctx'> 	complete(&amp;input_device-&gt;wait_event);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mousevsc_on_receive(struct hv_device *device,</div><div class='hunk'>@@ -274,10 +265,22 @@ static void mousevsc_on_receive(struct hv_device *device,</div><div class='ctx'> 	if (pipe_msg-&gt;type != PIPE_MESSAGE_DATA)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	hid_msg = (struct synthhid_msg *)&amp;pipe_msg-&gt;data[0];</div><div class='add'>+	hid_msg = (struct synthhid_msg *)pipe_msg-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	switch (hid_msg-&gt;header.type) {</div><div class='ctx'> 	case SYNTH_HID_PROTOCOL_RESPONSE:</div><div class='add'>+		/*</div><div class='add'>+		 * While it will be impossible for us to protect against</div><div class='add'>+		 * malicious/buggy hypervisor/host, add a check here to</div><div class='add'>+		 * ensure we don't corrupt memory.</div><div class='add'>+		 */</div><div class='add'>+		if ((pipe_msg-&gt;size + sizeof(struct pipe_prt_msg)</div><div class='add'>+			- sizeof(unsigned char))</div><div class='add'>+			&gt; sizeof(struct mousevsc_prt_msg)) {</div><div class='add'>+			WARN_ON(1);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		memcpy(&amp;input_dev-&gt;protocol_resp, pipe_msg,</div><div class='ctx'> 		       pipe_msg-&gt;size + sizeof(struct pipe_prt_msg) -</div><div class='ctx'> 		       sizeof(unsigned char));</div><div class='hunk'>@@ -292,11 +295,11 @@ static void mousevsc_on_receive(struct hv_device *device,</div><div class='ctx'> 		 * hid desc and report desc</div><div class='ctx'> 		 */</div><div class='ctx'> 		mousevsc_on_receive_device_info(input_dev,</div><div class='del'>-			(struct synthhid_device_info *)&amp;pipe_msg-&gt;data[0]);</div><div class='add'>+			(struct synthhid_device_info *)pipe_msg-&gt;data);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYNTH_HID_INPUT_REPORT:</div><div class='ctx'> 		input_report =</div><div class='del'>-			(struct synthhid_input_report *)&amp;pipe_msg-&gt;data[0];</div><div class='add'>+			(struct synthhid_input_report *)pipe_msg-&gt;data;</div><div class='ctx'> 		if (!input_dev-&gt;init_complete)</div><div class='ctx'> 			break;</div><div class='ctx'> 		hid_input_report(input_dev-&gt;hid_device,</div><div class='hunk'>@@ -313,73 +316,60 @@ static void mousevsc_on_receive(struct hv_device *device,</div><div class='ctx'> </div><div class='ctx'> static void mousevsc_on_channel_callback(void *context)</div><div class='ctx'> {</div><div class='del'>-	const int packetSize = 0x100;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	struct hv_device *device = (struct hv_device *)context;</div><div class='del'>-</div><div class='add'>+	const int packet_size = 0x100;</div><div class='add'>+	int ret;</div><div class='add'>+	struct hv_device *device = context;</div><div class='ctx'> 	u32 bytes_recvd;</div><div class='ctx'> 	u64 req_id;</div><div class='del'>-	unsigned char packet[0x100];</div><div class='ctx'> 	struct vmpacket_descriptor *desc;</div><div class='del'>-	unsigned char	*buffer = packet;</div><div class='del'>-	int	bufferlen = packetSize;</div><div class='add'>+	unsigned char	*buffer;</div><div class='add'>+	int	bufferlen = packet_size;</div><div class='ctx'> </div><div class='add'>+	buffer = kmalloc(bufferlen, GFP_ATOMIC);</div><div class='add'>+	if (!buffer)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		ret = vmbus_recvpacket_raw(device-&gt;channel, buffer,</div><div class='ctx'> 					bufferlen, &amp;bytes_recvd, &amp;req_id);</div><div class='ctx'> </div><div class='del'>-		if (ret == 0) {</div><div class='del'>-			if (bytes_recvd &gt; 0) {</div><div class='del'>-				desc = (struct vmpacket_descriptor *)buffer;</div><div class='del'>-</div><div class='del'>-				switch (desc-&gt;type) {</div><div class='del'>-				case VM_PKT_COMP:</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case VM_PKT_DATA_INBAND:</div><div class='del'>-					mousevsc_on_receive(</div><div class='del'>-						device, desc);</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				default:</div><div class='del'>-					pr_err("unhandled packet type %d, tid %llx len %d\n",</div><div class='del'>-						   desc-&gt;type,</div><div class='del'>-						   req_id,</div><div class='del'>-						   bytes_recvd);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				/* reset */</div><div class='del'>-				if (bufferlen &gt; packetSize) {</div><div class='del'>-					kfree(buffer);</div><div class='del'>-</div><div class='del'>-					buffer = packet;</div><div class='del'>-					bufferlen = packetSize;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				if (bufferlen &gt; packetSize) {</div><div class='del'>-					kfree(buffer);</div><div class='del'>-</div><div class='del'>-					buffer = packet;</div><div class='del'>-					bufferlen = packetSize;</div><div class='del'>-				}</div><div class='add'>+		switch (ret) {</div><div class='add'>+		case 0:</div><div class='add'>+			if (bytes_recvd &lt;= 0) {</div><div class='add'>+				kfree(buffer);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+			desc = (struct vmpacket_descriptor *)buffer;</div><div class='add'>+</div><div class='add'>+			switch (desc-&gt;type) {</div><div class='add'>+			case VM_PKT_COMP:</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			case VM_PKT_DATA_INBAND:</div><div class='add'>+				mousevsc_on_receive(device, desc);</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			default:</div><div class='add'>+				pr_err("unhandled packet type %d, tid %llx len %d\n",</div><div class='add'>+					desc-&gt;type, req_id, bytes_recvd);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-		} else if (ret == -ENOBUFS) {</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case -ENOBUFS:</div><div class='add'>+			kfree(buffer);</div><div class='ctx'> 			/* Handle large packet */</div><div class='ctx'> 			bufferlen = bytes_recvd;</div><div class='del'>-			buffer = kzalloc(bytes_recvd, GFP_ATOMIC);</div><div class='add'>+			buffer = kmalloc(bytes_recvd, GFP_ATOMIC);</div><div class='ctx'> </div><div class='del'>-			if (buffer == NULL) {</div><div class='del'>-				buffer = packet;</div><div class='del'>-				bufferlen = packetSize;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+			if (!buffer)</div><div class='add'>+				return;</div><div class='add'>+</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} while (1);</div><div class='ctx'> </div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mousevsc_connect_to_vsp(struct hv_device *device)</div><div class='hunk'>@@ -390,19 +380,15 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)</div><div class='ctx'> 	struct mousevsc_prt_msg *request;</div><div class='ctx'> 	struct mousevsc_prt_msg *response;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	request = &amp;input_dev-&gt;protocol_req;</div><div class='del'>-</div><div class='ctx'> 	memset(request, 0, sizeof(struct mousevsc_prt_msg));</div><div class='ctx'> </div><div class='ctx'> 	request-&gt;type = PIPE_MESSAGE_DATA;</div><div class='ctx'> 	request-&gt;size = sizeof(struct synthhid_protocol_request);</div><div class='del'>-</div><div class='ctx'> 	request-&gt;request.header.type = SYNTH_HID_PROTOCOL_REQUEST;</div><div class='ctx'> 	request-&gt;request.header.size = sizeof(unsigned int);</div><div class='ctx'> 	request-&gt;request.version_requested.version = SYNTHHID_INPUT_VERSION;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	ret = vmbus_sendpacket(device-&gt;channel, request,</div><div class='ctx'> 				sizeof(struct pipe_prt_msg) -</div><div class='ctx'> 				sizeof(unsigned char) +</div><div class='hunk'>@@ -410,11 +396,11 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)</div><div class='ctx'> 				(unsigned long)request,</div><div class='ctx'> 				VM_PKT_DATA_INBAND,</div><div class='ctx'> 				VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);</div><div class='del'>-	if (ret != 0)</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	t = wait_for_completion_timeout(&amp;input_dev-&gt;wait_event, 5*HZ);</div><div class='del'>-	if (t == 0) {</div><div class='add'>+	if (!t) {</div><div class='ctx'> 		ret = -ETIMEDOUT;</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -422,14 +408,14 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)</div><div class='ctx'> 	response = &amp;input_dev-&gt;protocol_resp;</div><div class='ctx'> </div><div class='ctx'> 	if (!response-&gt;response.approved) {</div><div class='del'>-		pr_err("synthhid protocol request failed (version %d)",</div><div class='add'>+		pr_err("synthhid protocol request failed (version %d)\n",</div><div class='ctx'> 		       SYNTHHID_INPUT_VERSION);</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	t = wait_for_completion_timeout(&amp;input_dev-&gt;wait_event, 5*HZ);</div><div class='del'>-	if (t == 0) {</div><div class='add'>+	if (!t) {</div><div class='ctx'> 		ret = -ETIMEDOUT;</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -438,11 +424,9 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)</div><div class='ctx'> 	 * We should have gotten the device attr, hid desc and report</div><div class='ctx'> 	 * desc at this point</div><div class='ctx'> 	 */</div><div class='del'>-	if (input_dev-&gt;dev_info_status)</div><div class='del'>-		ret = -ENOMEM;</div><div class='add'>+	ret = input_dev-&gt;dev_info_status;</div><div class='ctx'> </div><div class='ctx'> cleanup:</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -451,61 +435,40 @@ static int mousevsc_hid_open(struct hid_device *hid)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mousevsc_hid_start(struct hid_device *hid)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void mousevsc_hid_close(struct hid_device *hid)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mousevsc_hid_stop(struct hid_device *hid)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct hid_ll_driver mousevsc_ll_driver = {</div><div class='ctx'> 	.open = mousevsc_hid_open,</div><div class='ctx'> 	.close = mousevsc_hid_close,</div><div class='add'>+	.start = mousevsc_hid_start,</div><div class='add'>+	.stop = mousevsc_hid_stop,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct hid_driver mousevsc_hid_driver;</div><div class='ctx'> </div><div class='del'>-static void reportdesc_callback(struct hv_device *dev, void *packet, u32 len)</div><div class='del'>-{</div><div class='del'>-	struct hid_device *hid_dev;</div><div class='del'>-	struct mousevsc_dev *input_device = hv_get_drvdata(dev);</div><div class='del'>-</div><div class='del'>-	hid_dev = hid_allocate_device();</div><div class='del'>-	if (IS_ERR(hid_dev))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hid_dev-&gt;ll_driver = &amp;mousevsc_ll_driver;</div><div class='del'>-	hid_dev-&gt;driver = &amp;mousevsc_hid_driver;</div><div class='del'>-</div><div class='del'>-	if (hid_parse_report(hid_dev, packet, len))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hid_dev-&gt;bus = BUS_VIRTUAL;</div><div class='del'>-	hid_dev-&gt;vendor = input_device-&gt;hid_dev_info.vendor;</div><div class='del'>-	hid_dev-&gt;product = input_device-&gt;hid_dev_info.product;</div><div class='del'>-	hid_dev-&gt;version = input_device-&gt;hid_dev_info.version;</div><div class='del'>-</div><div class='del'>-	sprintf(hid_dev-&gt;name, "%s", "Microsoft Vmbus HID-compliant Mouse");</div><div class='del'>-</div><div class='del'>-	if (!hidinput_connect(hid_dev, 0)) {</div><div class='del'>-		hid_dev-&gt;claimed |= HID_CLAIMED_INPUT;</div><div class='del'>-</div><div class='del'>-		input_device-&gt;connected = 1;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	input_device-&gt;hid_device = hid_dev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mousevsc_on_device_add(struct hv_device *device)</div><div class='add'>+static int mousevsc_probe(struct hv_device *device,</div><div class='add'>+			const struct hv_vmbus_device_id *dev_id)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct mousevsc_dev *input_dev;</div><div class='add'>+	struct hid_device *hid_dev;</div><div class='ctx'> </div><div class='del'>-	input_dev = alloc_input_device(device);</div><div class='add'>+	input_dev = mousevsc_alloc_device(device);</div><div class='ctx'> </div><div class='ctx'> 	if (!input_dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	input_dev-&gt;init_complete = false;</div><div class='del'>-</div><div class='ctx'> 	ret = vmbus_open(device-&gt;channel,</div><div class='ctx'> 		INPUTVSC_SEND_RING_BUFFER_SIZE,</div><div class='ctx'> 		INPUTVSC_RECV_RING_BUFFER_SIZE,</div><div class='hunk'>@@ -515,54 +478,78 @@ static int mousevsc_on_device_add(struct hv_device *device)</div><div class='ctx'> 		device</div><div class='ctx'> 		);</div><div class='ctx'> </div><div class='del'>-	if (ret != 0) {</div><div class='del'>-		free_input_device(input_dev);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	if (ret)</div><div class='add'>+		goto probe_err0;</div><div class='ctx'> </div><div class='ctx'> 	ret = mousevsc_connect_to_vsp(device);</div><div class='ctx'> </div><div class='del'>-	if (ret != 0) {</div><div class='del'>-		vmbus_close(device-&gt;channel);</div><div class='del'>-		free_input_device(input_dev);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	if (ret)</div><div class='add'>+		goto probe_err1;</div><div class='ctx'> </div><div class='ctx'> 	/* workaround SA-167 */</div><div class='ctx'> 	if (input_dev-&gt;report_desc[14] == 0x25)</div><div class='ctx'> 		input_dev-&gt;report_desc[14] = 0x29;</div><div class='ctx'> </div><div class='del'>-	reportdesc_callback(device, input_dev-&gt;report_desc,</div><div class='del'>-			    input_dev-&gt;report_desc_size);</div><div class='add'>+	hid_dev = hid_allocate_device();</div><div class='add'>+	if (IS_ERR(hid_dev)) {</div><div class='add'>+		ret = PTR_ERR(hid_dev);</div><div class='add'>+		goto probe_err1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hid_dev-&gt;ll_driver = &amp;mousevsc_ll_driver;</div><div class='add'>+	hid_dev-&gt;driver = &amp;mousevsc_hid_driver;</div><div class='add'>+	hid_dev-&gt;bus = BUS_VIRTUAL;</div><div class='add'>+	hid_dev-&gt;vendor = input_dev-&gt;hid_dev_info.vendor;</div><div class='add'>+	hid_dev-&gt;product = input_dev-&gt;hid_dev_info.product;</div><div class='add'>+	hid_dev-&gt;version = input_dev-&gt;hid_dev_info.version;</div><div class='add'>+	input_dev-&gt;hid_device = hid_dev;</div><div class='add'>+</div><div class='add'>+	sprintf(hid_dev-&gt;name, "%s", "Microsoft Vmbus HID-compliant Mouse");</div><div class='add'>+</div><div class='add'>+	ret = hid_add_device(hid_dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto probe_err1;</div><div class='add'>+</div><div class='add'>+	ret = hid_parse_report(hid_dev, input_dev-&gt;report_desc,</div><div class='add'>+				input_dev-&gt;report_desc_size);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		hid_err(hid_dev, "parse failed\n");</div><div class='add'>+		goto probe_err2;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	ret = hid_hw_start(hid_dev, HID_CONNECT_HIDINPUT | HID_CONNECT_HIDDEV);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		hid_err(hid_dev, "hw start failed\n");</div><div class='add'>+		goto probe_err2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_dev-&gt;connected = true;</div><div class='ctx'> 	input_dev-&gt;init_complete = true;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int mousevsc_probe(struct hv_device *dev,</div><div class='del'>-			const struct hv_vmbus_device_id *dev_id)</div><div class='del'>-{</div><div class='add'>+probe_err2:</div><div class='add'>+	hid_destroy_device(hid_dev);</div><div class='ctx'> </div><div class='del'>-	return mousevsc_on_device_add(dev);</div><div class='add'>+probe_err1:</div><div class='add'>+	vmbus_close(device-&gt;channel);</div><div class='ctx'> </div><div class='add'>+probe_err0:</div><div class='add'>+	mousevsc_free_device(input_dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> static int mousevsc_remove(struct hv_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mousevsc_dev *input_dev = hv_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	vmbus_close(dev-&gt;channel);</div><div class='del'>-</div><div class='del'>-	if (input_dev-&gt;connected) {</div><div class='del'>-		hidinput_disconnect(input_dev-&gt;hid_device);</div><div class='del'>-		input_dev-&gt;connected = 0;</div><div class='del'>-		hid_destroy_device(input_dev-&gt;hid_device);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	free_input_device(input_dev);</div><div class='add'>+	hid_destroy_device(input_dev-&gt;hid_device);</div><div class='add'>+	mousevsc_free_device(input_dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -577,7 +564,7 @@ static const struct hv_vmbus_device_id id_table[] = {</div><div class='ctx'> MODULE_DEVICE_TABLE(vmbus, id_table);</div><div class='ctx'> </div><div class='ctx'> static struct  hv_driver mousevsc_drv = {</div><div class='del'>-	.name = "mousevsc",</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = id_table,</div><div class='ctx'> 	.probe = mousevsc_probe,</div><div class='ctx'> 	.remove = mousevsc_remove,</div><div class='head'>diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h<br/>index 4a441a6f9967..b8574cddd953 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/hid-ids.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-ids.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-ids.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-ids.h</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #define USB_VENDOR_ID_3M		0x0596</div><div class='ctx'> #define USB_DEVICE_ID_3M1968		0x0500</div><div class='ctx'> #define USB_DEVICE_ID_3M2256		0x0502</div><div class='add'>+#define USB_DEVICE_ID_3M3266		0x0506</div><div class='ctx'> </div><div class='ctx'> #define USB_VENDOR_ID_A4TECH		0x09da</div><div class='ctx'> #define USB_DEVICE_ID_A4TECH_WCP32PU	0x0006</div><div class='hunk'>@@ -124,6 +125,7 @@</div><div class='ctx'> #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI  0x0239</div><div class='ctx'> #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO   0x023a</div><div class='ctx'> #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b</div><div class='add'>+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI  0x0255</div><div class='ctx'> #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO   0x0256</div><div class='ctx'> #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY	0x030a</div><div class='ctx'> #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY	0x030b</div><div class='hunk'>@@ -145,6 +147,9 @@</div><div class='ctx'> #define USB_DEVICE_ID_ATEN_4PORTKVM	0x2205</div><div class='ctx'> #define USB_DEVICE_ID_ATEN_4PORTKVMC	0x2208</div><div class='ctx'> </div><div class='add'>+#define USB_VENDOR_ID_ATMEL		0x03eb</div><div class='add'>+#define USB_DEVICE_ID_ATMEL_MULTITOUCH	0x211c</div><div class='add'>+</div><div class='ctx'> #define USB_VENDOR_ID_AVERMEDIA		0x07ca</div><div class='ctx'> #define USB_DEVICE_ID_AVER_FM_MR800	0xb800</div><div class='ctx'> </div><div class='hunk'>@@ -230,11 +235,14 @@</div><div class='ctx'> </div><div class='ctx'> #define USB_VENDOR_ID_DWAV		0x0eef</div><div class='ctx'> #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER	0x0001</div><div class='del'>-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH	0x480d</div><div class='del'>-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1	0x720c</div><div class='del'>-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2	0x72a1</div><div class='del'>-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3	0x480e</div><div class='del'>-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4	0x726b</div><div class='add'>+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D	0x480d</div><div class='add'>+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E	0x480e</div><div class='add'>+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C	0x720c</div><div class='add'>+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B	0x726b</div><div class='add'>+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1	0x72a1</div><div class='add'>+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA	0x72fa</div><div class='add'>+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302	0x7302</div><div class='add'>+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001	0xa001</div><div class='ctx'> </div><div class='ctx'> #define USB_VENDOR_ID_ELECOM		0x056e</div><div class='ctx'> #define USB_DEVICE_ID_ELECOM_BM084	0x0061</div><div class='hunk'>@@ -356,6 +364,9 @@</div><div class='ctx'> #define USB_VENDOR_ID_HANVON		0x20b3</div><div class='ctx'> #define USB_DEVICE_ID_HANVON_MULTITOUCH	0x0a18</div><div class='ctx'> </div><div class='add'>+#define USB_VENDOR_ID_HANVON_ALT	0x22ed</div><div class='add'>+#define USB_DEVICE_ID_HANVON_ALT_MULTITOUCH	0x1010</div><div class='add'>+</div><div class='ctx'> #define USB_VENDOR_ID_HAPP		0x078b</div><div class='ctx'> #define USB_DEVICE_ID_UGCI_DRIVING	0x0010</div><div class='ctx'> #define USB_DEVICE_ID_UGCI_FLYING	0x0020</div><div class='hunk'>@@ -571,6 +582,11 @@</div><div class='ctx'> #define USB_VENDOR_ID_PI_ENGINEERING	0x05f3</div><div class='ctx'> #define USB_DEVICE_ID_PI_ENGINEERING_VEC_USB_FOOTPEDAL	0xff</div><div class='ctx'> </div><div class='add'>+#define USB_VENDOR_ID_PIXART				0x093a</div><div class='add'>+#define USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN	0x8001</div><div class='add'>+#define USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1	0x8002</div><div class='add'>+#define USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2	0x8003</div><div class='add'>+</div><div class='ctx'> #define USB_VENDOR_ID_PLAYDOTCOM	0x0b43</div><div class='ctx'> #define USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII	0x0003</div><div class='ctx'> </div><div class='hunk'>@@ -581,11 +597,14 @@</div><div class='ctx'> #define USB_DEVICE_ID_PRODIGE_CORDLESS	0x3062</div><div class='ctx'> </div><div class='ctx'> #define USB_VENDOR_ID_QUANTA		0x0408</div><div class='del'>-#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH	0x3000</div><div class='add'>+#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH		0x3000</div><div class='add'>+#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001		0x3001</div><div class='add'>+#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008		0x3008</div><div class='ctx'> #define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN	0x3001</div><div class='ctx'> </div><div class='ctx'> #define USB_VENDOR_ID_ROCCAT		0x1e7d</div><div class='ctx'> #define USB_DEVICE_ID_ROCCAT_ARVO	0x30d4</div><div class='add'>+#define USB_DEVICE_ID_ROCCAT_ISKU	0x319c</div><div class='ctx'> #define USB_DEVICE_ID_ROCCAT_KONE	0x2ced</div><div class='ctx'> #define USB_DEVICE_ID_ROCCAT_KONEPLUS	0x2d51</div><div class='ctx'> #define USB_DEVICE_ID_ROCCAT_KOVAPLUS	0x2d50</div><div class='hunk'>@@ -679,6 +698,7 @@</div><div class='ctx'> </div><div class='ctx'> #define USB_VENDOR_ID_WACOM		0x056a</div><div class='ctx'> #define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH	0x81</div><div class='add'>+#define USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH   0x00BD</div><div class='ctx'> </div><div class='ctx'> #define USB_VENDOR_ID_WALTOP				0x172f</div><div class='ctx'> #define USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH	0x0032</div><div class='hunk'>@@ -707,6 +727,17 @@</div><div class='ctx'> #define USB_VENDOR_ID_XAT	0x2505</div><div class='ctx'> #define USB_DEVICE_ID_XAT_CSR	0x0220</div><div class='ctx'> </div><div class='add'>+#define USB_VENDOR_ID_XIROKU		0x1477</div><div class='add'>+#define USB_DEVICE_ID_XIROKU_SPX	0x1006</div><div class='add'>+#define USB_DEVICE_ID_XIROKU_MPX	0x1007</div><div class='add'>+#define USB_DEVICE_ID_XIROKU_CSR	0x100e</div><div class='add'>+#define USB_DEVICE_ID_XIROKU_SPX1	0x1021</div><div class='add'>+#define USB_DEVICE_ID_XIROKU_CSR1	0x1022</div><div class='add'>+#define USB_DEVICE_ID_XIROKU_MPX1	0x1023</div><div class='add'>+#define USB_DEVICE_ID_XIROKU_SPX2	0x1024</div><div class='add'>+#define USB_DEVICE_ID_XIROKU_CSR2	0x1025</div><div class='add'>+#define USB_DEVICE_ID_XIROKU_MPX2	0x1026</div><div class='add'>+</div><div class='ctx'> #define USB_VENDOR_ID_YEALINK		0x6993</div><div class='ctx'> #define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K	0xb001</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c<br/>index f333139d1a48..9333d692a786 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/hid-input.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-input.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-input.c</a></div><div class='hunk'>@@ -32,6 +32,8 @@</div><div class='ctx'> #include &lt;linux/hid.h&gt;</div><div class='ctx'> #include &lt;linux/hid-debug.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+</div><div class='ctx'> #define unk	KEY_UNKNOWN</div><div class='ctx'> </div><div class='ctx'> static const unsigned char hid_keyboard[256] = {</div><div class='hunk'>@@ -271,6 +273,161 @@ static __s32 hidinput_calc_abs_res(const struct hid_field *field, __u16 code)</div><div class='ctx'> 	return logical_extents / physical_extents;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HID_BATTERY_STRENGTH</div><div class='add'>+static enum power_supply_property hidinput_battery_props[] = {</div><div class='add'>+	POWER_SUPPLY_PROP_PRESENT,</div><div class='add'>+	POWER_SUPPLY_PROP_ONLINE,</div><div class='add'>+	POWER_SUPPLY_PROP_CAPACITY,</div><div class='add'>+	POWER_SUPPLY_PROP_MODEL_NAME,</div><div class='add'>+	POWER_SUPPLY_PROP_STATUS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HID_BATTERY_QUIRK_PERCENT	(1 &lt;&lt; 0) /* always reports percent */</div><div class='add'>+#define HID_BATTERY_QUIRK_FEATURE	(1 &lt;&lt; 1) /* ask for feature report */</div><div class='add'>+</div><div class='add'>+static const struct hid_device_id hid_battery_quirks[] = {</div><div class='add'>+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,</div><div class='add'>+			       USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI),</div><div class='add'>+	  HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned find_battery_quirk(struct hid_device *hdev)</div><div class='add'>+{</div><div class='add'>+	unsigned quirks = 0;</div><div class='add'>+	const struct hid_device_id *match;</div><div class='add'>+</div><div class='add'>+	match = hid_match_id(hdev, hid_battery_quirks);</div><div class='add'>+	if (match != NULL)</div><div class='add'>+		quirks = match-&gt;driver_data;</div><div class='add'>+</div><div class='add'>+	return quirks;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hidinput_get_battery_property(struct power_supply *psy,</div><div class='add'>+					 enum power_supply_property prop,</div><div class='add'>+					 union power_supply_propval *val)</div><div class='add'>+{</div><div class='add'>+	struct hid_device *dev = container_of(psy, struct hid_device, battery);</div><div class='add'>+	int ret = 0;</div><div class='add'>+	__u8 buf[2] = {};</div><div class='add'>+</div><div class='add'>+	switch (prop) {</div><div class='add'>+	case POWER_SUPPLY_PROP_PRESENT:</div><div class='add'>+	case POWER_SUPPLY_PROP_ONLINE:</div><div class='add'>+		val-&gt;intval = 1;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case POWER_SUPPLY_PROP_CAPACITY:</div><div class='add'>+		ret = dev-&gt;hid_get_raw_report(dev, dev-&gt;battery_report_id,</div><div class='add'>+					      buf, sizeof(buf),</div><div class='add'>+					      dev-&gt;battery_report_type);</div><div class='add'>+</div><div class='add'>+		if (ret != 2) {</div><div class='add'>+			if (ret &gt;= 0)</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;battery_min &lt; dev-&gt;battery_max &amp;&amp;</div><div class='add'>+		    buf[1] &gt;= dev-&gt;battery_min &amp;&amp;</div><div class='add'>+		    buf[1] &lt;= dev-&gt;battery_max)</div><div class='add'>+			val-&gt;intval = (100 * (buf[1] - dev-&gt;battery_min)) /</div><div class='add'>+				(dev-&gt;battery_max - dev-&gt;battery_min);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case POWER_SUPPLY_PROP_MODEL_NAME:</div><div class='add'>+		val-&gt;strval = dev-&gt;name;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case POWER_SUPPLY_PROP_STATUS:</div><div class='add'>+		val-&gt;intval = POWER_SUPPLY_STATUS_DISCHARGING;</div><div class='add'>+		break;</div><div class='add'>+</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 bool hidinput_setup_battery(struct hid_device *dev, unsigned report_type, struct hid_field *field)</div><div class='add'>+{</div><div class='add'>+	struct power_supply *battery = &amp;dev-&gt;battery;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned quirks;</div><div class='add'>+	s32 min, max;</div><div class='add'>+</div><div class='add'>+	if (field-&gt;usage-&gt;hid != HID_DC_BATTERYSTRENGTH)</div><div class='add'>+		return false;	/* no match */</div><div class='add'>+</div><div class='add'>+	if (battery-&gt;name != NULL)</div><div class='add'>+		goto out;	/* already initialized? */</div><div class='add'>+</div><div class='add'>+	battery-&gt;name = kasprintf(GFP_KERNEL, "hid-%s-battery", dev-&gt;uniq);</div><div class='add'>+	if (battery-&gt;name == NULL)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	battery-&gt;type = POWER_SUPPLY_TYPE_BATTERY;</div><div class='add'>+	battery-&gt;properties = hidinput_battery_props;</div><div class='add'>+	battery-&gt;num_properties = ARRAY_SIZE(hidinput_battery_props);</div><div class='add'>+	battery-&gt;use_for_apm = 0;</div><div class='add'>+	battery-&gt;get_property = hidinput_get_battery_property;</div><div class='add'>+</div><div class='add'>+	quirks = find_battery_quirk(dev);</div><div class='add'>+</div><div class='add'>+	hid_dbg(dev, "device %x:%x:%x %d quirks %d\n",</div><div class='add'>+		dev-&gt;bus, dev-&gt;vendor, dev-&gt;product, dev-&gt;version, quirks);</div><div class='add'>+</div><div class='add'>+	min = field-&gt;logical_minimum;</div><div class='add'>+	max = field-&gt;logical_maximum;</div><div class='add'>+</div><div class='add'>+	if (quirks &amp; HID_BATTERY_QUIRK_PERCENT) {</div><div class='add'>+		min = 0;</div><div class='add'>+		max = 100;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (quirks &amp; HID_BATTERY_QUIRK_FEATURE)</div><div class='add'>+		report_type = HID_FEATURE_REPORT;</div><div class='add'>+</div><div class='add'>+	dev-&gt;battery_min = min;</div><div class='add'>+	dev-&gt;battery_max = max;</div><div class='add'>+	dev-&gt;battery_report_type = report_type;</div><div class='add'>+	dev-&gt;battery_report_id = field-&gt;report-&gt;id;</div><div class='add'>+</div><div class='add'>+	ret = power_supply_register(&amp;dev-&gt;dev, battery);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		hid_warn(dev, "can't register power supply: %d\n", ret);</div><div class='add'>+		kfree(battery-&gt;name);</div><div class='add'>+		battery-&gt;name = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hidinput_cleanup_battery(struct hid_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (!dev-&gt;battery.name)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	power_supply_unregister(&amp;dev-&gt;battery);</div><div class='add'>+	kfree(dev-&gt;battery.name);</div><div class='add'>+	dev-&gt;battery.name = NULL;</div><div class='add'>+}</div><div class='add'>+#else  /* !CONFIG_HID_BATTERY_STRENGTH */</div><div class='add'>+static bool hidinput_setup_battery(struct hid_device *dev, unsigned report_type,</div><div class='add'>+				   struct hid_field *field)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hidinput_cleanup_battery(struct hid_device *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif	/* CONFIG_HID_BATTERY_STRENGTH */</div><div class='add'>+</div><div class='ctx'> static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_field *field,</div><div class='ctx'> 				     struct hid_usage *usage)</div><div class='ctx'> {</div><div class='hunk'>@@ -629,6 +786,13 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case HID_UP_GENDEVCTRLS:</div><div class='add'>+		if (hidinput_setup_battery(device, HID_INPUT_REPORT, field))</div><div class='add'>+			goto ignore;</div><div class='add'>+		else</div><div class='add'>+			goto unknown;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case HID_UP_HPVENDOR:	/* Reported on a Dutch layout HP5308 */</div><div class='ctx'> 		set_bit(EV_REP, input-&gt;evbit);</div><div class='ctx'> 		switch (usage-&gt;hid &amp; HID_USAGE) {</div><div class='hunk'>@@ -822,6 +986,12 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Ignore out-of-range values as per HID specification, section 5.10 */</div><div class='add'>+	if (value &lt; field-&gt;logical_minimum || value &gt; field-&gt;logical_maximum) {</div><div class='add'>+		dbg_hid("Ignoring out-of-range value %x\n", value);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* report the usage code as scancode if the key status has changed */</div><div class='ctx'> 	if (usage-&gt;type == EV_KEY &amp;&amp; !!test_bit(usage-&gt;code, input-&gt;key) != value)</div><div class='ctx'> 		input_event(input, EV_MSC, MSC_SCAN, usage-&gt;hid);</div><div class='hunk'>@@ -861,6 +1031,48 @@ int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(hidinput_find_field);</div><div class='ctx'> </div><div class='add'>+struct hid_field *hidinput_get_led_field(struct hid_device *hid)</div><div class='add'>+{</div><div class='add'>+	struct hid_report *report;</div><div class='add'>+	struct hid_field *field;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(report,</div><div class='add'>+			    &amp;hid-&gt;report_enum[HID_OUTPUT_REPORT].report_list,</div><div class='add'>+			    list) {</div><div class='add'>+		for (i = 0; i &lt; report-&gt;maxfield; i++) {</div><div class='add'>+			field = report-&gt;field[i];</div><div class='add'>+			for (j = 0; j &lt; field-&gt;maxusage; j++)</div><div class='add'>+				if (field-&gt;usage[j].type == EV_LED)</div><div class='add'>+					return field;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hidinput_get_led_field);</div><div class='add'>+</div><div class='add'>+unsigned int hidinput_count_leds(struct hid_device *hid)</div><div class='add'>+{</div><div class='add'>+	struct hid_report *report;</div><div class='add'>+	struct hid_field *field;</div><div class='add'>+	int i, j;</div><div class='add'>+	unsigned int count = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(report,</div><div class='add'>+			    &amp;hid-&gt;report_enum[HID_OUTPUT_REPORT].report_list,</div><div class='add'>+			    list) {</div><div class='add'>+		for (i = 0; i &lt; report-&gt;maxfield; i++) {</div><div class='add'>+			field = report-&gt;field[i];</div><div class='add'>+			for (j = 0; j &lt; field-&gt;maxusage; j++)</div><div class='add'>+				if (field-&gt;usage[j].type == EV_LED &amp;&amp;</div><div class='add'>+				    field-&gt;value[j])</div><div class='add'>+					count += 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hidinput_count_leds);</div><div class='add'>+</div><div class='ctx'> static int hidinput_open(struct input_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct hid_device *hid = input_get_drvdata(dev);</div><div class='hunk'>@@ -882,15 +1094,17 @@ static void report_features(struct hid_device *hid)</div><div class='ctx'> 	struct hid_report *rep;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='del'>-	if (!drv-&gt;feature_mapping)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	rep_enum = &amp;hid-&gt;report_enum[HID_FEATURE_REPORT];</div><div class='ctx'> 	list_for_each_entry(rep, &amp;rep_enum-&gt;report_list, list)</div><div class='ctx'> 		for (i = 0; i &lt; rep-&gt;maxfield; i++)</div><div class='del'>-			for (j = 0; j &lt; rep-&gt;field[i]-&gt;maxusage; j++)</div><div class='del'>-				drv-&gt;feature_mapping(hid, rep-&gt;field[i],</div><div class='del'>-						     rep-&gt;field[i]-&gt;usage + j);</div><div class='add'>+			for (j = 0; j &lt; rep-&gt;field[i]-&gt;maxusage; j++) {</div><div class='add'>+				/* Verify if Battery Strength feature is available */</div><div class='add'>+				hidinput_setup_battery(hid, HID_FEATURE_REPORT, rep-&gt;field[i]);</div><div class='add'>+</div><div class='add'>+				if (drv-&gt;feature_mapping)</div><div class='add'>+					drv-&gt;feature_mapping(hid, rep-&gt;field[i],</div><div class='add'>+							     rep-&gt;field[i]-&gt;usage + j);</div><div class='add'>+			}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1010,6 +1224,8 @@ void hidinput_disconnect(struct hid_device *hid)</div><div class='ctx'> {</div><div class='ctx'> 	struct hid_input *hidinput, *next;</div><div class='ctx'> </div><div class='add'>+	hidinput_cleanup_battery(hid);</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry_safe(hidinput, next, &amp;hid-&gt;inputs, list) {</div><div class='ctx'> 		list_del(&amp;hidinput-&gt;list);</div><div class='ctx'> 		input_unregister_device(hidinput-&gt;input);</div><div class='head'>diff --git a/drivers/hid/hid-lg4ff.c b/drivers/hid/hid-lg4ff.c<br/>index 103f30d93f76..6ecc9e220440 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/hid-lg4ff.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-lg4ff.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-lg4ff.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-lg4ff.c</a></div><div class='hunk'>@@ -430,7 +430,7 @@ int lg4ff_init(struct hid_device *hid)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Add the device to device_list */</div><div class='del'>-	entry = (struct lg4ff_device_entry *)kzalloc(sizeof(struct lg4ff_device_entry), GFP_KERNEL);</div><div class='add'>+	entry = kzalloc(sizeof(struct lg4ff_device_entry), GFP_KERNEL);</div><div class='ctx'> 	if (!entry) {</div><div class='ctx'> 		hid_err(hid, "Cannot add device, insufficient memory.\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c<br/>index f1c909f1b239..24fc4423b937 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/hid-multitouch.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-multitouch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-multitouch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-multitouch.c</a></div><div class='hunk'>@@ -50,7 +50,6 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> #define MT_QUIRK_ALWAYS_VALID		(1 &lt;&lt; 4)</div><div class='ctx'> #define MT_QUIRK_VALID_IS_INRANGE	(1 &lt;&lt; 5)</div><div class='ctx'> #define MT_QUIRK_VALID_IS_CONFIDENCE	(1 &lt;&lt; 6)</div><div class='del'>-#define MT_QUIRK_EGALAX_XYZ_FIXUP	(1 &lt;&lt; 7)</div><div class='ctx'> #define MT_QUIRK_SLOT_IS_CONTACTID_MINUS_ONE	(1 &lt;&lt; 8)</div><div class='ctx'> </div><div class='ctx'> struct mt_slot {</div><div class='hunk'>@@ -60,9 +59,19 @@ struct mt_slot {</div><div class='ctx'> 	bool seen_in_this_frame;/* has this slot been updated */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mt_class {</div><div class='add'>+	__s32 name;	/* MT_CLS */</div><div class='add'>+	__s32 quirks;</div><div class='add'>+	__s32 sn_move;	/* Signal/noise ratio for move events */</div><div class='add'>+	__s32 sn_width;	/* Signal/noise ratio for width events */</div><div class='add'>+	__s32 sn_height;	/* Signal/noise ratio for height events */</div><div class='add'>+	__s32 sn_pressure;	/* Signal/noise ratio for pressure events */</div><div class='add'>+	__u8 maxcontacts;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mt_device {</div><div class='ctx'> 	struct mt_slot curdata;	/* placeholder of incoming data */</div><div class='del'>-	struct mt_class *mtclass;	/* our mt device class */</div><div class='add'>+	struct mt_class mtclass;	/* our mt device class */</div><div class='ctx'> 	unsigned last_field_index;	/* last field index of the report */</div><div class='ctx'> 	unsigned last_slot_field;	/* the last field of a slot */</div><div class='ctx'> 	int last_mt_collection;	/* last known mt-related collection */</div><div class='hunk'>@@ -74,30 +83,23 @@ struct mt_device {</div><div class='ctx'> 	struct mt_slot *slots;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mt_class {</div><div class='del'>-	__s32 name;	/* MT_CLS */</div><div class='del'>-	__s32 quirks;</div><div class='del'>-	__s32 sn_move;	/* Signal/noise ratio for move events */</div><div class='del'>-	__s32 sn_width;	/* Signal/noise ratio for width events */</div><div class='del'>-	__s32 sn_height;	/* Signal/noise ratio for height events */</div><div class='del'>-	__s32 sn_pressure;	/* Signal/noise ratio for pressure events */</div><div class='del'>-	__u8 maxcontacts;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* classes of device behavior */</div><div class='ctx'> #define MT_CLS_DEFAULT				0x0001</div><div class='ctx'> </div><div class='ctx'> #define MT_CLS_SERIAL				0x0002</div><div class='ctx'> #define MT_CLS_CONFIDENCE			0x0003</div><div class='del'>-#define MT_CLS_CONFIDENCE_MINUS_ONE		0x0004</div><div class='del'>-#define MT_CLS_DUAL_INRANGE_CONTACTID		0x0005</div><div class='del'>-#define MT_CLS_DUAL_INRANGE_CONTACTNUMBER	0x0006</div><div class='del'>-#define MT_CLS_DUAL_NSMU_CONTACTID		0x0007</div><div class='add'>+#define MT_CLS_CONFIDENCE_CONTACT_ID		0x0004</div><div class='add'>+#define MT_CLS_CONFIDENCE_MINUS_ONE		0x0005</div><div class='add'>+#define MT_CLS_DUAL_INRANGE_CONTACTID		0x0006</div><div class='add'>+#define MT_CLS_DUAL_INRANGE_CONTACTNUMBER	0x0007</div><div class='add'>+#define MT_CLS_DUAL_NSMU_CONTACTID		0x0008</div><div class='add'>+#define MT_CLS_INRANGE_CONTACTNUMBER		0x0009</div><div class='ctx'> </div><div class='ctx'> /* vendor specific classes */</div><div class='ctx'> #define MT_CLS_3M				0x0101</div><div class='ctx'> #define MT_CLS_CYPRESS				0x0102</div><div class='ctx'> #define MT_CLS_EGALAX				0x0103</div><div class='add'>+#define MT_CLS_EGALAX_SERIAL			0x0104</div><div class='ctx'> </div><div class='ctx'> #define MT_DEFAULT_MAXCONTACT	10</div><div class='ctx'> </div><div class='hunk'>@@ -133,13 +135,16 @@ static int find_slot_from_contactid(struct mt_device *td)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct mt_class mt_classes[] = {</div><div class='add'>+static struct mt_class mt_classes[] = {</div><div class='ctx'> 	{ .name = MT_CLS_DEFAULT,</div><div class='ctx'> 		.quirks = MT_QUIRK_NOT_SEEN_MEANS_UP },</div><div class='ctx'> 	{ .name = MT_CLS_SERIAL,</div><div class='ctx'> 		.quirks = MT_QUIRK_ALWAYS_VALID},</div><div class='ctx'> 	{ .name = MT_CLS_CONFIDENCE,</div><div class='ctx'> 		.quirks = MT_QUIRK_VALID_IS_CONFIDENCE },</div><div class='add'>+	{ .name = MT_CLS_CONFIDENCE_CONTACT_ID,</div><div class='add'>+		.quirks = MT_QUIRK_VALID_IS_CONFIDENCE |</div><div class='add'>+			MT_QUIRK_SLOT_IS_CONTACTID },</div><div class='ctx'> 	{ .name = MT_CLS_CONFIDENCE_MINUS_ONE,</div><div class='ctx'> 		.quirks = MT_QUIRK_VALID_IS_CONFIDENCE |</div><div class='ctx'> 			MT_QUIRK_SLOT_IS_CONTACTID_MINUS_ONE },</div><div class='hunk'>@@ -155,6 +160,9 @@ struct mt_class mt_classes[] = {</div><div class='ctx'> 		.quirks = MT_QUIRK_NOT_SEEN_MEANS_UP |</div><div class='ctx'> 			MT_QUIRK_SLOT_IS_CONTACTID,</div><div class='ctx'> 		.maxcontacts = 2 },</div><div class='add'>+	{ .name = MT_CLS_INRANGE_CONTACTNUMBER,</div><div class='add'>+		.quirks = MT_QUIRK_VALID_IS_INRANGE |</div><div class='add'>+			MT_QUIRK_SLOT_IS_CONTACTNUMBER },</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * vendor specific classes</div><div class='hunk'>@@ -171,9 +179,13 @@ struct mt_class mt_classes[] = {</div><div class='ctx'> 		.maxcontacts = 10 },</div><div class='ctx'> 	{ .name = MT_CLS_EGALAX,</div><div class='ctx'> 		.quirks =  MT_QUIRK_SLOT_IS_CONTACTID |</div><div class='del'>-			MT_QUIRK_VALID_IS_INRANGE |</div><div class='del'>-			MT_QUIRK_EGALAX_XYZ_FIXUP,</div><div class='del'>-		.maxcontacts = 2,</div><div class='add'>+			MT_QUIRK_VALID_IS_INRANGE,</div><div class='add'>+		.sn_move = 4096,</div><div class='add'>+		.sn_pressure = 32,</div><div class='add'>+	},</div><div class='add'>+	{ .name = MT_CLS_EGALAX_SERIAL,</div><div class='add'>+		.quirks =  MT_QUIRK_SLOT_IS_CONTACTID |</div><div class='add'>+			MT_QUIRK_ALWAYS_VALID,</div><div class='ctx'> 		.sn_move = 4096,</div><div class='ctx'> 		.sn_pressure = 32,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -181,6 +193,44 @@ struct mt_class mt_classes[] = {</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static ssize_t mt_show_quirks(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 hid_device *hdev = container_of(dev, struct hid_device, dev);</div><div class='add'>+	struct mt_device *td = hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%u\n", td-&gt;mtclass.quirks);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mt_set_quirks(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'>+	struct hid_device *hdev = container_of(dev, struct hid_device, dev);</div><div class='add'>+	struct mt_device *td = hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	if (kstrtoul(buf, 0, &amp;val))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	td-&gt;mtclass.quirks = val;</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(quirks, S_IWUSR | S_IRUGO, mt_show_quirks, mt_set_quirks);</div><div class='add'>+</div><div class='add'>+static struct attribute *sysfs_attrs[] = {</div><div class='add'>+	&amp;dev_attr_quirks.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute_group mt_attribute_group = {</div><div class='add'>+	.attrs = sysfs_attrs</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void mt_feature_mapping(struct hid_device *hdev,</div><div class='ctx'> 		struct hid_field *field, struct hid_usage *usage)</div><div class='ctx'> {</div><div class='hunk'>@@ -192,9 +242,9 @@ static void mt_feature_mapping(struct hid_device *hdev,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HID_DG_CONTACTMAX:</div><div class='ctx'> 		td-&gt;maxcontacts = field-&gt;value[0];</div><div class='del'>-		if (td-&gt;mtclass-&gt;maxcontacts)</div><div class='add'>+		if (td-&gt;mtclass.maxcontacts)</div><div class='ctx'> 			/* check if the maxcontacts is given by the class */</div><div class='del'>-			td-&gt;maxcontacts = td-&gt;mtclass-&gt;maxcontacts;</div><div class='add'>+			td-&gt;maxcontacts = td-&gt;mtclass.maxcontacts;</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -214,8 +264,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='ctx'> 		unsigned long **bit, int *max)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt_device *td = hid_get_drvdata(hdev);</div><div class='del'>-	struct mt_class *cls = td-&gt;mtclass;</div><div class='del'>-	__s32 quirks = cls-&gt;quirks;</div><div class='add'>+	struct mt_class *cls = &amp;td-&gt;mtclass;</div><div class='ctx'> </div><div class='ctx'> 	/* Only map fields from TouchScreen or TouchPad collections.</div><div class='ctx'>          * We need to ignore fields that belong to other collections</div><div class='hunk'>@@ -227,13 +276,17 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='ctx'> 	else</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/* eGalax devices provide a Digitizer.Stylus input which overrides</div><div class='add'>+	 * the correct Digitizers.Finger X/Y ranges.</div><div class='add'>+	 * Let's just ignore this input. */</div><div class='add'>+	if (field-&gt;physical == HID_DG_STYLUS)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='ctx'> 	switch (usage-&gt;hid &amp; HID_USAGE_PAGE) {</div><div class='ctx'> </div><div class='ctx'> 	case HID_UP_GENDESK:</div><div class='ctx'> 		switch (usage-&gt;hid) {</div><div class='ctx'> 		case HID_GD_X:</div><div class='del'>-			if (quirks &amp; MT_QUIRK_EGALAX_XYZ_FIXUP)</div><div class='del'>-				field-&gt;logical_maximum = 32760;</div><div class='ctx'> 			hid_map_usage(hi, usage, bit, max,</div><div class='ctx'> 					EV_ABS, ABS_MT_POSITION_X);</div><div class='ctx'> 			set_abs(hi-&gt;input, ABS_MT_POSITION_X, field,</div><div class='hunk'>@@ -246,8 +299,6 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='ctx'> 			}</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		case HID_GD_Y:</div><div class='del'>-			if (quirks &amp; MT_QUIRK_EGALAX_XYZ_FIXUP)</div><div class='del'>-				field-&gt;logical_maximum = 32760;</div><div class='ctx'> 			hid_map_usage(hi, usage, bit, max,</div><div class='ctx'> 					EV_ABS, ABS_MT_POSITION_Y);</div><div class='ctx'> 			set_abs(hi-&gt;input, ABS_MT_POSITION_Y, field,</div><div class='hunk'>@@ -315,8 +366,6 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='ctx'> 			}</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		case HID_DG_TIPPRESSURE:</div><div class='del'>-			if (quirks &amp; MT_QUIRK_EGALAX_XYZ_FIXUP)</div><div class='del'>-				field-&gt;logical_minimum = 0;</div><div class='ctx'> 			hid_map_usage(hi, usage, bit, max,</div><div class='ctx'> 					EV_ABS, ABS_MT_PRESSURE);</div><div class='ctx'> 			set_abs(hi-&gt;input, ABS_MT_PRESSURE, field,</div><div class='hunk'>@@ -363,7 +412,7 @@ static int mt_input_mapped(struct hid_device *hdev, struct hid_input *hi,</div><div class='ctx'> </div><div class='ctx'> static int mt_compute_slot(struct mt_device *td)</div><div class='ctx'> {</div><div class='del'>-	__s32 quirks = td-&gt;mtclass-&gt;quirks;</div><div class='add'>+	__s32 quirks = td-&gt;mtclass.quirks;</div><div class='ctx'> </div><div class='ctx'> 	if (quirks &amp; MT_QUIRK_SLOT_IS_CONTACTID)</div><div class='ctx'> 		return td-&gt;curdata.contactid;</div><div class='hunk'>@@ -407,7 +456,7 @@ static void mt_emit_event(struct mt_device *td, struct input_dev *input)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; td-&gt;maxcontacts; ++i) {</div><div class='ctx'> 		struct mt_slot *s = &amp;(td-&gt;slots[i]);</div><div class='del'>-		if ((td-&gt;mtclass-&gt;quirks &amp; MT_QUIRK_NOT_SEEN_MEANS_UP) &amp;&amp;</div><div class='add'>+		if ((td-&gt;mtclass.quirks &amp; MT_QUIRK_NOT_SEEN_MEANS_UP) &amp;&amp;</div><div class='ctx'> 			!s-&gt;seen_in_this_frame) {</div><div class='ctx'> 			s-&gt;touch_state = false;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -444,7 +493,7 @@ static int mt_event(struct hid_device *hid, struct hid_field *field,</div><div class='ctx'> 				struct hid_usage *usage, __s32 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt_device *td = hid_get_drvdata(hid);</div><div class='del'>-	__s32 quirks = td-&gt;mtclass-&gt;quirks;</div><div class='add'>+	__s32 quirks = td-&gt;mtclass.quirks;</div><div class='ctx'> </div><div class='ctx'> 	if (hid-&gt;claimed &amp; HID_CLAIMED_INPUT &amp;&amp; td-&gt;slots) {</div><div class='ctx'> 		switch (usage-&gt;hid) {</div><div class='hunk'>@@ -552,7 +601,7 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='ctx'> 		dev_err(&amp;hdev-&gt;dev, "cannot allocate multitouch data\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	td-&gt;mtclass = mtclass;</div><div class='add'>+	td-&gt;mtclass = *mtclass;</div><div class='ctx'> 	td-&gt;inputmode = -1;</div><div class='ctx'> 	td-&gt;last_mt_collection = -1;</div><div class='ctx'> 	hid_set_drvdata(hdev, td);</div><div class='hunk'>@@ -574,6 +623,8 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = sysfs_create_group(&amp;hdev-&gt;dev.kobj, &amp;mt_attribute_group);</div><div class='add'>+</div><div class='ctx'> 	mt_set_input_mode(hdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -594,6 +645,7 @@ static int mt_reset_resume(struct hid_device *hdev)</div><div class='ctx'> static void mt_remove(struct hid_device *hdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt_device *td = hid_get_drvdata(hdev);</div><div class='add'>+	sysfs_remove_group(&amp;hdev-&gt;dev.kobj, &amp;mt_attribute_group);</div><div class='ctx'> 	hid_hw_stop(hdev);</div><div class='ctx'> 	kfree(td-&gt;slots);</div><div class='ctx'> 	kfree(td);</div><div class='hunk'>@@ -609,12 +661,20 @@ static const struct hid_device_id mt_devices[] = {</div><div class='ctx'> 	{ .driver_data = MT_CLS_3M,</div><div class='ctx'> 		HID_USB_DEVICE(USB_VENDOR_ID_3M,</div><div class='ctx'> 			USB_DEVICE_ID_3M2256) },</div><div class='add'>+	{ .driver_data = MT_CLS_3M,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_3M,</div><div class='add'>+			USB_DEVICE_ID_3M3266) },</div><div class='ctx'> </div><div class='ctx'> 	/* ActionStar panels */</div><div class='ctx'> 	{ .driver_data = MT_CLS_DEFAULT,</div><div class='ctx'> 		HID_USB_DEVICE(USB_VENDOR_ID_ACTIONSTAR,</div><div class='ctx'> 			USB_DEVICE_ID_ACTIONSTAR_1011) },</div><div class='ctx'> </div><div class='add'>+	/* Atmel panels */</div><div class='add'>+	{ .driver_data = MT_CLS_SERIAL,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_ATMEL,</div><div class='add'>+			USB_DEVICE_ID_ATMEL_MULTITOUCH) },</div><div class='add'>+</div><div class='ctx'> 	/* Cando panels */</div><div class='ctx'> 	{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,</div><div class='ctx'> 		HID_USB_DEVICE(USB_VENDOR_ID_CANDO,</div><div class='hunk'>@@ -645,23 +705,32 @@ static const struct hid_device_id mt_devices[] = {</div><div class='ctx'> 			USB_DEVICE_ID_CYPRESS_TRUETOUCH) },</div><div class='ctx'> </div><div class='ctx'> 	/* eGalax devices (resistive) */</div><div class='del'>-	{  .driver_data = MT_CLS_EGALAX,</div><div class='add'>+	{ .driver_data = MT_CLS_EGALAX,</div><div class='ctx'> 		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,</div><div class='del'>-			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },</div><div class='del'>-	{  .driver_data = MT_CLS_EGALAX,</div><div class='add'>+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D) },</div><div class='add'>+	{ .driver_data = MT_CLS_EGALAX,</div><div class='ctx'> 		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,</div><div class='del'>-			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },</div><div class='add'>+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) },</div><div class='ctx'> </div><div class='ctx'> 	/* eGalax devices (capacitive) */</div><div class='del'>-	{  .driver_data = MT_CLS_EGALAX,</div><div class='add'>+	{ .driver_data = MT_CLS_EGALAX,</div><div class='ctx'> 		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,</div><div class='del'>-			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },</div><div class='del'>-	{  .driver_data = MT_CLS_EGALAX,</div><div class='add'>+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },</div><div class='add'>+	{ .driver_data = MT_CLS_EGALAX,</div><div class='ctx'> 		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,</div><div class='del'>-			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },</div><div class='del'>-	{  .driver_data = MT_CLS_EGALAX,</div><div class='add'>+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },</div><div class='add'>+	{ .driver_data = MT_CLS_EGALAX,</div><div class='ctx'> 		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,</div><div class='del'>-			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },</div><div class='add'>+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },</div><div class='add'>+	{ .driver_data = MT_CLS_EGALAX,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,</div><div class='add'>+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA) },</div><div class='add'>+	{ .driver_data = MT_CLS_EGALAX,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,</div><div class='add'>+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302) },</div><div class='add'>+	{ .driver_data = MT_CLS_EGALAX_SERIAL,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,</div><div class='add'>+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },</div><div class='ctx'> </div><div class='ctx'> 	/* Elo TouchSystems IntelliTouch Plus panel */</div><div class='ctx'> 	{ .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,</div><div class='hunk'>@@ -678,6 +747,11 @@ static const struct hid_device_id mt_devices[] = {</div><div class='ctx'> 		HID_USB_DEVICE(USB_VENDOR_ID_GOODTOUCH,</div><div class='ctx'> 			USB_DEVICE_ID_GOODTOUCH_000f) },</div><div class='ctx'> </div><div class='add'>+	/* Hanvon panels */</div><div class='add'>+	{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_HANVON_ALT,</div><div class='add'>+			USB_DEVICE_ID_HANVON_ALT_MULTITOUCH) },</div><div class='add'>+</div><div class='ctx'> 	/* Ideacom panel */</div><div class='ctx'> 	{ .driver_data = MT_CLS_SERIAL,</div><div class='ctx'> 		HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM,</div><div class='hunk'>@@ -722,6 +796,17 @@ static const struct hid_device_id mt_devices[] = {</div><div class='ctx'> 		HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT,</div><div class='ctx'> 			USB_DEVICE_ID_PENMOUNT_PCI) },</div><div class='ctx'> </div><div class='add'>+	/* PixArt optical touch screen */</div><div class='add'>+	{ .driver_data = MT_CLS_INRANGE_CONTACTNUMBER,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_PIXART,</div><div class='add'>+			USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN) },</div><div class='add'>+	{ .driver_data = MT_CLS_INRANGE_CONTACTNUMBER,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_PIXART,</div><div class='add'>+			USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1) },</div><div class='add'>+	{ .driver_data = MT_CLS_INRANGE_CONTACTNUMBER,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_PIXART,</div><div class='add'>+			USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2) },</div><div class='add'>+</div><div class='ctx'> 	/* PixCir-based panels */</div><div class='ctx'> 	{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID,</div><div class='ctx'> 		HID_USB_DEVICE(USB_VENDOR_ID_HANVON,</div><div class='hunk'>@@ -730,6 +815,17 @@ static const struct hid_device_id mt_devices[] = {</div><div class='ctx'> 		HID_USB_DEVICE(USB_VENDOR_ID_CANDO,</div><div class='ctx'> 			USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH) },</div><div class='ctx'> </div><div class='add'>+	/* Quanta-based panels */</div><div class='add'>+	{ .driver_data = MT_CLS_CONFIDENCE_CONTACT_ID,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_QUANTA,</div><div class='add'>+			USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },</div><div class='add'>+	{ .driver_data = MT_CLS_CONFIDENCE_CONTACT_ID,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_QUANTA,</div><div class='add'>+			USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001) },</div><div class='add'>+	{ .driver_data = MT_CLS_CONFIDENCE_CONTACT_ID,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_QUANTA,</div><div class='add'>+			USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008) },</div><div class='add'>+</div><div class='ctx'> 	/* Stantum panels */</div><div class='ctx'> 	{ .driver_data = MT_CLS_CONFIDENCE,</div><div class='ctx'> 		HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,</div><div class='hunk'>@@ -758,6 +854,35 @@ static const struct hid_device_id mt_devices[] = {</div><div class='ctx'> 		HID_USB_DEVICE(USB_VENDOR_ID_XAT,</div><div class='ctx'> 			USB_DEVICE_ID_XAT_CSR) },</div><div class='ctx'> </div><div class='add'>+	/* Xiroku */</div><div class='add'>+	{ .driver_data = MT_CLS_DEFAULT,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,</div><div class='add'>+			USB_DEVICE_ID_XIROKU_SPX) },</div><div class='add'>+	{ .driver_data = MT_CLS_DEFAULT,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,</div><div class='add'>+			USB_DEVICE_ID_XIROKU_MPX) },</div><div class='add'>+	{ .driver_data = MT_CLS_DEFAULT,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,</div><div class='add'>+			USB_DEVICE_ID_XIROKU_CSR) },</div><div class='add'>+	{ .driver_data = MT_CLS_DEFAULT,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,</div><div class='add'>+			USB_DEVICE_ID_XIROKU_SPX1) },</div><div class='add'>+	{ .driver_data = MT_CLS_DEFAULT,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,</div><div class='add'>+			USB_DEVICE_ID_XIROKU_MPX1) },</div><div class='add'>+	{ .driver_data = MT_CLS_DEFAULT,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,</div><div class='add'>+			USB_DEVICE_ID_XIROKU_CSR1) },</div><div class='add'>+	{ .driver_data = MT_CLS_DEFAULT,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,</div><div class='add'>+			USB_DEVICE_ID_XIROKU_SPX2) },</div><div class='add'>+	{ .driver_data = MT_CLS_DEFAULT,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,</div><div class='add'>+			USB_DEVICE_ID_XIROKU_MPX2) },</div><div class='add'>+	{ .driver_data = MT_CLS_DEFAULT,</div><div class='add'>+		HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,</div><div class='add'>+			USB_DEVICE_ID_XIROKU_CSR2) },</div><div class='add'>+</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(hid, mt_devices);</div><div class='head'>diff --git a/drivers/hid/hid-picolcd.c b/drivers/hid/hid-picolcd.c<br/>index 01e7d2cd7c26..12f9777c385d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/hid-picolcd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-picolcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-picolcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-picolcd.c</a></div><div class='hunk'>@@ -633,7 +633,7 @@ struct picolcd_fb_cleanup_item {</div><div class='ctx'> 	struct picolcd_fb_cleanup_item *next;</div><div class='ctx'> };</div><div class='ctx'> static struct picolcd_fb_cleanup_item *fb_pending;</div><div class='del'>-DEFINE_SPINLOCK(fb_pending_lock);</div><div class='add'>+static DEFINE_SPINLOCK(fb_pending_lock);</div><div class='ctx'> </div><div class='ctx'> static void picolcd_fb_do_cleanup(struct work_struct *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -658,7 +658,7 @@ static void picolcd_fb_do_cleanup(struct work_struct *data)</div><div class='ctx'> 	} while (item);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DECLARE_WORK(picolcd_fb_cleanup, picolcd_fb_do_cleanup);</div><div class='add'>+static DECLARE_WORK(picolcd_fb_cleanup, picolcd_fb_do_cleanup);</div><div class='ctx'> </div><div class='ctx'> static int picolcd_fb_open(struct fb_info *info, int u)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c<br/>index 070f93a5c11b..47ed74c46b6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/hid-pl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-pl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-pl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-pl.c</a></div><div class='hunk'>@@ -9,10 +9,10 @@</div><div class='ctx'>  *   - contains two reports, one for each port (HID_QUIRK_MULTI_INPUT)</div><div class='ctx'>  *</div><div class='ctx'>  *  0e8f:0003 "GreenAsia Inc.    USB Joystick     "</div><div class='del'>- *   - tested with König Gaming gamepad</div><div class='add'>+ *   - tested with König Gaming gamepad</div><div class='ctx'>  *</div><div class='ctx'>  *  0e8f:0003 "GASIA USB Gamepad"</div><div class='del'>- *   - another version of the König gamepad</div><div class='add'>+ *   - another version of the König gamepad</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (c) 2007, 2009 Anssi Hannula &lt;anssi.hannula@gmail.com&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/hid/hid-prodikeys.c b/drivers/hid/hid-prodikeys.c<br/>index f779009104eb..b71b77ab0dc7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/hid-prodikeys.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-prodikeys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-prodikeys.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-prodikeys.c</a></div><div class='hunk'>@@ -90,7 +90,7 @@ static const char longname[] = "Prodikeys PC-MIDI Keyboard";</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> module_param_array(id, charp, NULL, 0444);</div><div class='head'>diff --git a/drivers/hid/hid-quanta.c b/drivers/hid/hid-quanta.c<br/>deleted file mode 100644<br/>index 87a54df4d4ac..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/hid-quanta.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-quanta.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,261 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  HID driver for Quanta Optical Touch dual-touch panels</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) 2009-2010 Stephane Chatty &lt;chatty@enac.fr&gt;</div><div class='del'>- *</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 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'>-</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/hid.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Stephane Chatty &lt;chatty@enac.fr&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Quanta dual-touch panel");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-#include "hid-ids.h"</div><div class='del'>-</div><div class='del'>-struct quanta_data {</div><div class='del'>-	__u16 x, y;</div><div class='del'>-	__u8 id;</div><div class='del'>-	bool valid;		/* valid finger data, or just placeholder? */</div><div class='del'>-	bool first;		/* is this the first finger in this frame? */</div><div class='del'>-	bool activity_now;	/* at least one active finger in this frame? */</div><div class='del'>-	bool activity;		/* at least one active finger previously? */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int quanta_input_mapping(struct hid_device *hdev, struct hid_input *hi,</div><div class='del'>-		struct hid_field *field, struct hid_usage *usage,</div><div class='del'>-		unsigned long **bit, int *max)</div><div class='del'>-{</div><div class='del'>-	switch (usage-&gt;hid &amp; HID_USAGE_PAGE) {</div><div class='del'>-</div><div class='del'>-	case HID_UP_GENDESK:</div><div class='del'>-		switch (usage-&gt;hid) {</div><div class='del'>-		case HID_GD_X:</div><div class='del'>-			hid_map_usage(hi, usage, bit, max,</div><div class='del'>-					EV_ABS, ABS_MT_POSITION_X);</div><div class='del'>-			/* touchscreen emulation */</div><div class='del'>-			input_set_abs_params(hi-&gt;input, ABS_X,</div><div class='del'>-						field-&gt;logical_minimum,</div><div class='del'>-						field-&gt;logical_maximum, 0, 0);</div><div class='del'>-			return 1;</div><div class='del'>-		case HID_GD_Y:</div><div class='del'>-			hid_map_usage(hi, usage, bit, max,</div><div class='del'>-					EV_ABS, ABS_MT_POSITION_Y);</div><div class='del'>-			/* touchscreen emulation */</div><div class='del'>-			input_set_abs_params(hi-&gt;input, ABS_Y,</div><div class='del'>-						field-&gt;logical_minimum,</div><div class='del'>-						field-&gt;logical_maximum, 0, 0);</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case HID_UP_DIGITIZER:</div><div class='del'>-		switch (usage-&gt;hid) {</div><div class='del'>-		case HID_DG_CONFIDENCE:</div><div class='del'>-		case HID_DG_TIPSWITCH:</div><div class='del'>-		case HID_DG_INPUTMODE:</div><div class='del'>-		case HID_DG_DEVICEINDEX:</div><div class='del'>-		case HID_DG_CONTACTCOUNT:</div><div class='del'>-		case HID_DG_CONTACTMAX:</div><div class='del'>-		case HID_DG_TIPPRESSURE:</div><div class='del'>-		case HID_DG_WIDTH:</div><div class='del'>-		case HID_DG_HEIGHT:</div><div class='del'>-			return -1;</div><div class='del'>-		case HID_DG_INRANGE:</div><div class='del'>-			/* touchscreen emulation */</div><div class='del'>-			hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_TOUCH);</div><div class='del'>-			return 1;</div><div class='del'>-		case HID_DG_CONTACTID:</div><div class='del'>-			hid_map_usage(hi, usage, bit, max,</div><div class='del'>-					EV_ABS, ABS_MT_TRACKING_ID);</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case 0xff000000:</div><div class='del'>-		/* ignore vendor-specific features */</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quanta_input_mapped(struct hid_device *hdev, struct hid_input *hi,</div><div class='del'>-		struct hid_field *field, struct hid_usage *usage,</div><div class='del'>-		unsigned long **bit, int *max)</div><div class='del'>-{</div><div class='del'>-	if (usage-&gt;type == EV_KEY || usage-&gt;type == EV_ABS)</div><div class='del'>-		clear_bit(usage-&gt;code, *bit);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * this function is called when a whole finger has been parsed,</div><div class='del'>- * so that it can decide what to send to the input layer.</div><div class='del'>- */</div><div class='del'>-static void quanta_filter_event(struct quanta_data *td, struct input_dev *input)</div><div class='del'>-{</div><div class='del'>-	</div><div class='del'>-	td-&gt;first = !td-&gt;first; /* touchscreen emulation */</div><div class='del'>-</div><div class='del'>-	if (!td-&gt;valid) {</div><div class='del'>-		/*</div><div class='del'>-		 * touchscreen emulation: if no finger in this frame is valid</div><div class='del'>-		 * and there previously was finger activity, this is a release</div><div class='del'>-		 */ </div><div class='del'>-		if (!td-&gt;first &amp;&amp; !td-&gt;activity_now &amp;&amp; td-&gt;activity) {</div><div class='del'>-			input_event(input, EV_KEY, BTN_TOUCH, 0);</div><div class='del'>-			td-&gt;activity = false;</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	input_event(input, EV_ABS, ABS_MT_TRACKING_ID, td-&gt;id);</div><div class='del'>-	input_event(input, EV_ABS, ABS_MT_POSITION_X, td-&gt;x);</div><div class='del'>-	input_event(input, EV_ABS, ABS_MT_POSITION_Y, td-&gt;y);</div><div class='del'>-</div><div class='del'>-	input_mt_sync(input);</div><div class='del'>-	td-&gt;valid = false;</div><div class='del'>-</div><div class='del'>-	/* touchscreen emulation: if first active finger in this frame... */</div><div class='del'>-	if (!td-&gt;activity_now) {</div><div class='del'>-		/* if there was no previous activity, emit touch event */</div><div class='del'>-		if (!td-&gt;activity) {</div><div class='del'>-			input_event(input, EV_KEY, BTN_TOUCH, 1);</div><div class='del'>-			td-&gt;activity = true;</div><div class='del'>-		}</div><div class='del'>-		td-&gt;activity_now = true;</div><div class='del'>-		/* and in any case this is our preferred finger */</div><div class='del'>-		input_event(input, EV_ABS, ABS_X, td-&gt;x);</div><div class='del'>-		input_event(input, EV_ABS, ABS_Y, td-&gt;y);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int quanta_event(struct hid_device *hid, struct hid_field *field,</div><div class='del'>-				struct hid_usage *usage, __s32 value)</div><div class='del'>-{</div><div class='del'>-	struct quanta_data *td = hid_get_drvdata(hid);</div><div class='del'>-</div><div class='del'>-	if (hid-&gt;claimed &amp; HID_CLAIMED_INPUT) {</div><div class='del'>-		struct input_dev *input = field-&gt;hidinput-&gt;input;</div><div class='del'>-</div><div class='del'>-		switch (usage-&gt;hid) {</div><div class='del'>-		case HID_DG_INRANGE:</div><div class='del'>-			td-&gt;valid = !!value;</div><div class='del'>-			break;</div><div class='del'>-		case HID_GD_X:</div><div class='del'>-			td-&gt;x = value;</div><div class='del'>-			break;</div><div class='del'>-		case HID_GD_Y:</div><div class='del'>-			td-&gt;y = value;</div><div class='del'>-			quanta_filter_event(td, input);</div><div class='del'>-			break;</div><div class='del'>-		case HID_DG_CONTACTID:</div><div class='del'>-			td-&gt;id = value;</div><div class='del'>-			break;</div><div class='del'>-		case HID_DG_CONTACTCOUNT:</div><div class='del'>-			/* touch emulation: this is the last field in a frame */</div><div class='del'>-			td-&gt;first = false;</div><div class='del'>-			td-&gt;activity_now = false;</div><div class='del'>-			break;</div><div class='del'>-		case HID_DG_CONFIDENCE:</div><div class='del'>-		case HID_DG_TIPSWITCH:</div><div class='del'>-			/* avoid interference from generic hidinput handling */</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			/* fallback to the generic hidinput handling */</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* we have handled the hidinput part, now remains hiddev */</div><div class='del'>-	if (hid-&gt;claimed &amp; HID_CLAIMED_HIDDEV &amp;&amp; hid-&gt;hiddev_hid_event)</div><div class='del'>-		hid-&gt;hiddev_hid_event(hid, field, usage, value);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quanta_probe(struct hid_device *hdev, const struct hid_device_id *id)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct quanta_data *td;</div><div class='del'>-</div><div class='del'>-	td = kmalloc(sizeof(struct quanta_data), GFP_KERNEL);</div><div class='del'>-	if (!td) {</div><div class='del'>-		hid_err(hdev, "cannot allocate Quanta Touch data\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	td-&gt;valid = false;</div><div class='del'>-	td-&gt;activity = false;</div><div class='del'>-	td-&gt;activity_now = false;</div><div class='del'>-	td-&gt;first = false;</div><div class='del'>-	hid_set_drvdata(hdev, td);</div><div class='del'>-</div><div class='del'>-	ret = hid_parse(hdev);</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		kfree(td);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void quanta_remove(struct hid_device *hdev)</div><div class='del'>-{</div><div class='del'>-	hid_hw_stop(hdev);</div><div class='del'>-	kfree(hid_get_drvdata(hdev));</div><div class='del'>-	hid_set_drvdata(hdev, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct hid_device_id quanta_devices[] = {</div><div class='del'>-	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA,</div><div class='del'>-			USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },</div><div class='del'>-	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA,</div><div class='del'>-			USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(hid, quanta_devices);</div><div class='del'>-</div><div class='del'>-static const struct hid_usage_id quanta_grabbed_usages[] = {</div><div class='del'>-	{ HID_ANY_ID, HID_ANY_ID, HID_ANY_ID },</div><div class='del'>-	{ HID_ANY_ID - 1, HID_ANY_ID - 1, HID_ANY_ID - 1}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hid_driver quanta_driver = {</div><div class='del'>-	.name = "quanta-touch",</div><div class='del'>-	.id_table = quanta_devices,</div><div class='del'>-	.probe = quanta_probe,</div><div class='del'>-	.remove = quanta_remove,</div><div class='del'>-	.input_mapping = quanta_input_mapping,</div><div class='del'>-	.input_mapped = quanta_input_mapped,</div><div class='del'>-	.usage_table = quanta_grabbed_usages,</div><div class='del'>-	.event = quanta_event,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init quanta_init(void)</div><div class='del'>-{</div><div class='del'>-	return hid_register_driver(&amp;quanta_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit quanta_exit(void)</div><div class='del'>-{</div><div class='del'>-	hid_unregister_driver(&amp;quanta_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(quanta_init);</div><div class='del'>-module_exit(quanta_exit);</div><div class='del'>-</div><div class='head'>diff --git a/drivers/hid/hid-roccat-common.c b/drivers/hid/hid-roccat-common.c<br/>index b07e7f96a358..a6d93992c75a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/hid-roccat-common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-roccat-common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-roccat-common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-roccat-common.c</a></div><div class='hunk'>@@ -49,12 +49,10 @@ int roccat_common_send(struct usb_device *usb_dev, uint report_id,</div><div class='ctx'> 	char *buf;</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='del'>-	buf = kmalloc(size, GFP_KERNEL);</div><div class='add'>+	buf = kmemdup(data, size, GFP_KERNEL);</div><div class='ctx'> 	if (buf == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	memcpy(buf, data, size);</div><div class='del'>-</div><div class='ctx'> 	len = usb_control_msg(usb_dev, usb_sndctrlpipe(usb_dev, 0),</div><div class='ctx'> 			HID_REQ_SET_REPORT,</div><div class='ctx'> 			USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT,</div><div class='head'>diff --git a/drivers/hid/hid-roccat-isku.c b/drivers/hid/hid-roccat-isku.c<br/>new file mode 100644<br/>index 000000000000..0e4a0ab47142<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-roccat-isku.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-roccat-isku.c</a></div><div class='hunk'>@@ -0,0 +1,487 @@</div><div class='add'>+/*</div><div class='add'>+ * Roccat Isku driver for Linux</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Stefan Achatz &lt;erazor_de@users.sourceforge.net&gt;</div><div class='add'>+ */</div><div class='add'>+</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'>+/*</div><div class='add'>+ * Roccat Isku is a gamer keyboard with macro keys that can be configured in</div><div class='add'>+ * 5 profiles.</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/input.h&gt;</div><div class='add'>+#include &lt;linux/hid.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/hid-roccat.h&gt;</div><div class='add'>+#include "hid-ids.h"</div><div class='add'>+#include "hid-roccat-common.h"</div><div class='add'>+#include "hid-roccat-isku.h"</div><div class='add'>+</div><div class='add'>+static struct class *isku_class;</div><div class='add'>+</div><div class='add'>+static void isku_profile_activated(struct isku_device *isku, uint new_profile)</div><div class='add'>+{</div><div class='add'>+	isku-&gt;actual_profile = new_profile;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isku_receive(struct usb_device *usb_dev, uint command,</div><div class='add'>+		void *buf, uint size)</div><div class='add'>+{</div><div class='add'>+	return roccat_common_receive(usb_dev, command, buf, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isku_receive_control_status(struct usb_device *usb_dev)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+	struct isku_control control;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		msleep(50);</div><div class='add'>+		retval = isku_receive(usb_dev, ISKU_COMMAND_CONTROL,</div><div class='add'>+				&amp;control, sizeof(struct isku_control));</div><div class='add'>+</div><div class='add'>+		if (retval)</div><div class='add'>+			return retval;</div><div class='add'>+</div><div class='add'>+		switch (control.value) {</div><div class='add'>+		case ISKU_CONTROL_VALUE_STATUS_OK:</div><div class='add'>+			return 0;</div><div class='add'>+		case ISKU_CONTROL_VALUE_STATUS_WAIT:</div><div class='add'>+			continue;</div><div class='add'>+		case ISKU_CONTROL_VALUE_STATUS_INVALID:</div><div class='add'>+		/* seems to be critical - replug necessary */</div><div class='add'>+		case ISKU_CONTROL_VALUE_STATUS_OVERLOAD:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		default:</div><div class='add'>+			hid_err(usb_dev, "isku_receive_control_status: "</div><div class='add'>+					"unknown response value 0x%x\n",</div><div class='add'>+					control.value);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} while (1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isku_send(struct usb_device *usb_dev, uint command,</div><div class='add'>+		void const *buf, uint size)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	retval = roccat_common_send(usb_dev, command, buf, size);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	return isku_receive_control_status(usb_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isku_get_actual_profile(struct usb_device *usb_dev)</div><div class='add'>+{</div><div class='add'>+	struct isku_actual_profile buf;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	retval = isku_receive(usb_dev, ISKU_COMMAND_ACTUAL_PROFILE,</div><div class='add'>+			&amp;buf, sizeof(struct isku_actual_profile));</div><div class='add'>+	return retval ? retval : buf.actual_profile;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isku_set_actual_profile(struct usb_device *usb_dev, int new_profile)</div><div class='add'>+{</div><div class='add'>+	struct isku_actual_profile buf;</div><div class='add'>+</div><div class='add'>+	buf.command = ISKU_COMMAND_ACTUAL_PROFILE;</div><div class='add'>+	buf.size = sizeof(struct isku_actual_profile);</div><div class='add'>+	buf.actual_profile = new_profile;</div><div class='add'>+	return isku_send(usb_dev, ISKU_COMMAND_ACTUAL_PROFILE, &amp;buf,</div><div class='add'>+			sizeof(struct isku_actual_profile));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t isku_sysfs_show_actual_profile(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct isku_device *isku =</div><div class='add'>+			hid_get_drvdata(dev_get_drvdata(dev-&gt;parent-&gt;parent));</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%d\n", isku-&gt;actual_profile);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t isku_sysfs_set_actual_profile(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, char const *buf, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct isku_device *isku;</div><div class='add'>+	struct usb_device *usb_dev;</div><div class='add'>+	unsigned long profile;</div><div class='add'>+	int retval;</div><div class='add'>+	struct isku_roccat_report roccat_report;</div><div class='add'>+</div><div class='add'>+	dev = dev-&gt;parent-&gt;parent;</div><div class='add'>+	isku = hid_get_drvdata(dev_get_drvdata(dev));</div><div class='add'>+	usb_dev = interface_to_usbdev(to_usb_interface(dev));</div><div class='add'>+</div><div class='add'>+	retval = strict_strtoul(buf, 10, &amp;profile);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	if (profile &gt; 4)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;isku-&gt;isku_lock);</div><div class='add'>+</div><div class='add'>+	retval = isku_set_actual_profile(usb_dev, profile);</div><div class='add'>+	if (retval) {</div><div class='add'>+		mutex_unlock(&amp;isku-&gt;isku_lock);</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	isku_profile_activated(isku, profile);</div><div class='add'>+</div><div class='add'>+	roccat_report.event = ISKU_REPORT_BUTTON_EVENT_PROFILE;</div><div class='add'>+	roccat_report.data1 = profile + 1;</div><div class='add'>+	roccat_report.data2 = 0;</div><div class='add'>+	roccat_report.profile = profile + 1;</div><div class='add'>+	roccat_report_event(isku-&gt;chrdev_minor, (uint8_t const *)&amp;roccat_report);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;isku-&gt;isku_lock);</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_attribute isku_attributes[] = {</div><div class='add'>+	__ATTR(actual_profile, 0660,</div><div class='add'>+			isku_sysfs_show_actual_profile,</div><div class='add'>+			isku_sysfs_set_actual_profile),</div><div class='add'>+	__ATTR_NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t isku_sysfs_read(struct file *fp, struct kobject *kobj,</div><div class='add'>+		char *buf, loff_t off, size_t count,</div><div class='add'>+		size_t real_size, uint command)</div><div class='add'>+{</div><div class='add'>+	struct device *dev =</div><div class='add'>+			container_of(kobj, struct device, kobj)-&gt;parent-&gt;parent;</div><div class='add'>+	struct isku_device *isku = hid_get_drvdata(dev_get_drvdata(dev));</div><div class='add'>+	struct usb_device *usb_dev = interface_to_usbdev(to_usb_interface(dev));</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (off &gt;= real_size)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (off != 0 || count != real_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;isku-&gt;isku_lock);</div><div class='add'>+	retval = isku_receive(usb_dev, command, buf, real_size);</div><div class='add'>+	mutex_unlock(&amp;isku-&gt;isku_lock);</div><div class='add'>+</div><div class='add'>+	return retval ? retval : real_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t isku_sysfs_write(struct file *fp, struct kobject *kobj,</div><div class='add'>+		void const *buf, loff_t off, size_t count,</div><div class='add'>+		size_t real_size, uint command)</div><div class='add'>+{</div><div class='add'>+	struct device *dev =</div><div class='add'>+			container_of(kobj, struct device, kobj)-&gt;parent-&gt;parent;</div><div class='add'>+	struct isku_device *isku = hid_get_drvdata(dev_get_drvdata(dev));</div><div class='add'>+	struct usb_device *usb_dev = interface_to_usbdev(to_usb_interface(dev));</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (off != 0 || count != real_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;isku-&gt;isku_lock);</div><div class='add'>+	retval = isku_send(usb_dev, command, (void *)buf, real_size);</div><div class='add'>+	mutex_unlock(&amp;isku-&gt;isku_lock);</div><div class='add'>+</div><div class='add'>+	return retval ? retval : real_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ISKU_SYSFS_W(thingy, THINGY) \</div><div class='add'>+static ssize_t isku_sysfs_write_ ## thingy(struct file *fp, struct kobject *kobj, \</div><div class='add'>+		struct bin_attribute *attr, char *buf, \</div><div class='add'>+		loff_t off, size_t count) \</div><div class='add'>+{ \</div><div class='add'>+	return isku_sysfs_write(fp, kobj, buf, off, count, \</div><div class='add'>+			sizeof(struct isku_ ## thingy), ISKU_COMMAND_ ## THINGY); \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ISKU_SYSFS_R(thingy, THINGY) \</div><div class='add'>+static ssize_t isku_sysfs_read_ ## thingy(struct file *fp, struct kobject *kobj, \</div><div class='add'>+		struct bin_attribute *attr, char *buf, \</div><div class='add'>+		loff_t off, size_t count) \</div><div class='add'>+{ \</div><div class='add'>+	return isku_sysfs_read(fp, kobj, buf, off, count, \</div><div class='add'>+			sizeof(struct isku_ ## thingy), ISKU_COMMAND_ ## THINGY); \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ISKU_SYSFS_RW(thingy, THINGY) \</div><div class='add'>+ISKU_SYSFS_R(thingy, THINGY) \</div><div class='add'>+ISKU_SYSFS_W(thingy, THINGY)</div><div class='add'>+</div><div class='add'>+#define ISKU_BIN_ATTR_RW(thingy) \</div><div class='add'>+{ \</div><div class='add'>+	.attr = { .name = #thingy, .mode = 0660 }, \</div><div class='add'>+	.size = sizeof(struct isku_ ## thingy), \</div><div class='add'>+	.read = isku_sysfs_read_ ## thingy, \</div><div class='add'>+	.write = isku_sysfs_write_ ## thingy \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ISKU_BIN_ATTR_R(thingy) \</div><div class='add'>+{ \</div><div class='add'>+	.attr = { .name = #thingy, .mode = 0440 }, \</div><div class='add'>+	.size = sizeof(struct isku_ ## thingy), \</div><div class='add'>+	.read = isku_sysfs_read_ ## thingy, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ISKU_BIN_ATTR_W(thingy) \</div><div class='add'>+{ \</div><div class='add'>+	.attr = { .name = #thingy, .mode = 0220 }, \</div><div class='add'>+	.size = sizeof(struct isku_ ## thingy), \</div><div class='add'>+	.write = isku_sysfs_write_ ## thingy \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ISKU_SYSFS_RW(macro, MACRO)</div><div class='add'>+ISKU_SYSFS_RW(keys_function, KEYS_FUNCTION)</div><div class='add'>+ISKU_SYSFS_RW(keys_easyzone, KEYS_EASYZONE)</div><div class='add'>+ISKU_SYSFS_RW(keys_media, KEYS_MEDIA)</div><div class='add'>+ISKU_SYSFS_RW(keys_thumbster, KEYS_THUMBSTER)</div><div class='add'>+ISKU_SYSFS_RW(keys_macro, KEYS_MACRO)</div><div class='add'>+ISKU_SYSFS_RW(keys_capslock, KEYS_CAPSLOCK)</div><div class='add'>+ISKU_SYSFS_RW(light, LIGHT)</div><div class='add'>+ISKU_SYSFS_RW(key_mask, KEY_MASK)</div><div class='add'>+ISKU_SYSFS_RW(last_set, LAST_SET)</div><div class='add'>+ISKU_SYSFS_W(talk, TALK)</div><div class='add'>+ISKU_SYSFS_R(info, INFO)</div><div class='add'>+ISKU_SYSFS_W(control, CONTROL)</div><div class='add'>+</div><div class='add'>+static struct bin_attribute isku_bin_attributes[] = {</div><div class='add'>+	ISKU_BIN_ATTR_RW(macro),</div><div class='add'>+	ISKU_BIN_ATTR_RW(keys_function),</div><div class='add'>+	ISKU_BIN_ATTR_RW(keys_easyzone),</div><div class='add'>+	ISKU_BIN_ATTR_RW(keys_media),</div><div class='add'>+	ISKU_BIN_ATTR_RW(keys_thumbster),</div><div class='add'>+	ISKU_BIN_ATTR_RW(keys_macro),</div><div class='add'>+	ISKU_BIN_ATTR_RW(keys_capslock),</div><div class='add'>+	ISKU_BIN_ATTR_RW(light),</div><div class='add'>+	ISKU_BIN_ATTR_RW(key_mask),</div><div class='add'>+	ISKU_BIN_ATTR_RW(last_set),</div><div class='add'>+	ISKU_BIN_ATTR_W(talk),</div><div class='add'>+	ISKU_BIN_ATTR_R(info),</div><div class='add'>+	ISKU_BIN_ATTR_W(control),</div><div class='add'>+	__ATTR_NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int isku_init_isku_device_struct(struct usb_device *usb_dev,</div><div class='add'>+		struct isku_device *isku)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;isku-&gt;isku_lock);</div><div class='add'>+</div><div class='add'>+	retval = isku_get_actual_profile(usb_dev);</div><div class='add'>+	if (retval &lt; 0)</div><div class='add'>+		return retval;</div><div class='add'>+	isku_profile_activated(isku, retval);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isku_init_specials(struct hid_device *hdev)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(hdev-&gt;dev.parent);</div><div class='add'>+	struct usb_device *usb_dev = interface_to_usbdev(intf);</div><div class='add'>+	struct isku_device *isku;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (intf-&gt;cur_altsetting-&gt;desc.bInterfaceProtocol</div><div class='add'>+			!= ISKU_USB_INTERFACE_PROTOCOL) {</div><div class='add'>+		hid_set_drvdata(hdev, NULL);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	isku = kzalloc(sizeof(*isku), GFP_KERNEL);</div><div class='add'>+	if (!isku) {</div><div class='add'>+		hid_err(hdev, "can't alloc device descriptor\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	hid_set_drvdata(hdev, isku);</div><div class='add'>+</div><div class='add'>+	retval = isku_init_isku_device_struct(usb_dev, isku);</div><div class='add'>+	if (retval) {</div><div class='add'>+		hid_err(hdev, "couldn't init struct isku_device\n");</div><div class='add'>+		goto exit_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = roccat_connect(isku_class, hdev,</div><div class='add'>+			sizeof(struct isku_roccat_report));</div><div class='add'>+	if (retval &lt; 0) {</div><div class='add'>+		hid_err(hdev, "couldn't init char dev\n");</div><div class='add'>+	} else {</div><div class='add'>+		isku-&gt;chrdev_minor = retval;</div><div class='add'>+		isku-&gt;roccat_claimed = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+exit_free:</div><div class='add'>+	kfree(isku);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isku_remove_specials(struct hid_device *hdev)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(hdev-&gt;dev.parent);</div><div class='add'>+	struct isku_device *isku;</div><div class='add'>+</div><div class='add'>+	if (intf-&gt;cur_altsetting-&gt;desc.bInterfaceProtocol</div><div class='add'>+			!= ISKU_USB_INTERFACE_PROTOCOL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	isku = hid_get_drvdata(hdev);</div><div class='add'>+	if (isku-&gt;roccat_claimed)</div><div class='add'>+		roccat_disconnect(isku-&gt;chrdev_minor);</div><div class='add'>+	kfree(isku);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isku_probe(struct hid_device *hdev,</div><div class='add'>+		const struct hid_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int retval;</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, "parse failed\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = hid_hw_start(hdev, HID_CONNECT_DEFAULT);</div><div class='add'>+	if (retval) {</div><div class='add'>+		hid_err(hdev, "hw start failed\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = isku_init_specials(hdev);</div><div class='add'>+	if (retval) {</div><div class='add'>+		hid_err(hdev, "couldn't install keyboard\n");</div><div class='add'>+		goto exit_stop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+exit_stop:</div><div class='add'>+	hid_hw_stop(hdev);</div><div class='add'>+exit:</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isku_remove(struct hid_device *hdev)</div><div class='add'>+{</div><div class='add'>+	isku_remove_specials(hdev);</div><div class='add'>+	hid_hw_stop(hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isku_keep_values_up_to_date(struct isku_device *isku,</div><div class='add'>+		u8 const *data)</div><div class='add'>+{</div><div class='add'>+	struct isku_report_button const *button_report;</div><div class='add'>+</div><div class='add'>+	switch (data[0]) {</div><div class='add'>+	case ISKU_REPORT_NUMBER_BUTTON:</div><div class='add'>+		button_report = (struct isku_report_button const *)data;</div><div class='add'>+		switch (button_report-&gt;event) {</div><div class='add'>+		case ISKU_REPORT_BUTTON_EVENT_PROFILE:</div><div class='add'>+			isku_profile_activated(isku, button_report-&gt;data1 - 1);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isku_report_to_chrdev(struct isku_device const *isku,</div><div class='add'>+		u8 const *data)</div><div class='add'>+{</div><div class='add'>+	struct isku_roccat_report roccat_report;</div><div class='add'>+	struct isku_report_button const *button_report;</div><div class='add'>+</div><div class='add'>+	if (data[0] != ISKU_REPORT_NUMBER_BUTTON)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	button_report = (struct isku_report_button const *)data;</div><div class='add'>+</div><div class='add'>+	roccat_report.event = button_report-&gt;event;</div><div class='add'>+	roccat_report.data1 = button_report-&gt;data1;</div><div class='add'>+	roccat_report.data2 = button_report-&gt;data2;</div><div class='add'>+	roccat_report.profile = isku-&gt;actual_profile + 1;</div><div class='add'>+	roccat_report_event(isku-&gt;chrdev_minor,</div><div class='add'>+			(uint8_t const *)&amp;roccat_report);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isku_raw_event(struct hid_device *hdev,</div><div class='add'>+		struct hid_report *report, u8 *data, int size)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(hdev-&gt;dev.parent);</div><div class='add'>+	struct isku_device *isku = hid_get_drvdata(hdev);</div><div class='add'>+</div><div class='add'>+	if (intf-&gt;cur_altsetting-&gt;desc.bInterfaceProtocol</div><div class='add'>+			!= ISKU_USB_INTERFACE_PROTOCOL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (isku == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	isku_keep_values_up_to_date(isku, data);</div><div class='add'>+</div><div class='add'>+	if (isku-&gt;roccat_claimed)</div><div class='add'>+		isku_report_to_chrdev(isku, data);</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 hid_device_id isku_devices[] = {</div><div class='add'>+	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ISKU) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(hid, isku_devices);</div><div class='add'>+</div><div class='add'>+static struct hid_driver isku_driver = {</div><div class='add'>+		.name = "isku",</div><div class='add'>+		.id_table = isku_devices,</div><div class='add'>+		.probe = isku_probe,</div><div class='add'>+		.remove = isku_remove,</div><div class='add'>+		.raw_event = isku_raw_event</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init isku_init(void)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+	isku_class = class_create(THIS_MODULE, "isku");</div><div class='add'>+	if (IS_ERR(isku_class))</div><div class='add'>+		return PTR_ERR(isku_class);</div><div class='add'>+	isku_class-&gt;dev_attrs = isku_attributes;</div><div class='add'>+	isku_class-&gt;dev_bin_attrs = isku_bin_attributes;</div><div class='add'>+</div><div class='add'>+	retval = hid_register_driver(&amp;isku_driver);</div><div class='add'>+	if (retval)</div><div class='add'>+		class_destroy(isku_class);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit isku_exit(void)</div><div class='add'>+{</div><div class='add'>+	hid_unregister_driver(&amp;isku_driver);</div><div class='add'>+	class_destroy(isku_class);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(isku_init);</div><div class='add'>+module_exit(isku_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Stefan Achatz");</div><div class='add'>+MODULE_DESCRIPTION("USB Roccat Isku driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/hid/hid-roccat-isku.h b/drivers/hid/hid-roccat-isku.h<br/>new file mode 100644<br/>index 000000000000..075f6efaec58<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-roccat-isku.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-roccat-isku.h</a></div><div class='hunk'>@@ -0,0 +1,147 @@</div><div class='add'>+#ifndef __HID_ROCCAT_ISKU_H</div><div class='add'>+#define __HID_ROCCAT_ISKU_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2011 Stefan Achatz &lt;erazor_de@users.sourceforge.net&gt;</div><div class='add'>+ */</div><div class='add'>+</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/types.h&gt;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	ISKU_PROFILE_NUM = 5,</div><div class='add'>+	ISKU_USB_INTERFACE_PROTOCOL = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct isku_control {</div><div class='add'>+	uint8_t command; /* ISKU_COMMAND_CONTROL */</div><div class='add'>+	uint8_t value;</div><div class='add'>+	uint8_t request;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum isku_control_values {</div><div class='add'>+	ISKU_CONTROL_VALUE_STATUS_OVERLOAD = 0,</div><div class='add'>+	ISKU_CONTROL_VALUE_STATUS_OK = 1,</div><div class='add'>+	ISKU_CONTROL_VALUE_STATUS_INVALID = 2,</div><div class='add'>+	ISKU_CONTROL_VALUE_STATUS_WAIT = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct isku_actual_profile {</div><div class='add'>+	uint8_t command; /* ISKU_COMMAND_ACTUAL_PROFILE */</div><div class='add'>+	uint8_t size; /* always 3 */</div><div class='add'>+	uint8_t actual_profile;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct isku_key_mask {</div><div class='add'>+	uint8_t command; /* ISKU_COMMAND_KEY_MASK */</div><div class='add'>+	uint8_t size; /* 6 */</div><div class='add'>+	uint8_t profile_number; /* 0-4 */</div><div class='add'>+	uint8_t mask;</div><div class='add'>+	uint16_t checksum;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct isku_keys_function {</div><div class='add'>+	uint8_t data[0x29];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct isku_keys_easyzone {</div><div class='add'>+	uint8_t data[0x41];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct isku_keys_media {</div><div class='add'>+	uint8_t data[0x1d];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct isku_keys_thumbster {</div><div class='add'>+	uint8_t data[0x17];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct isku_keys_macro {</div><div class='add'>+	uint8_t data[0x23];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct isku_keys_capslock {</div><div class='add'>+	uint8_t data[0x6];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct isku_macro {</div><div class='add'>+	uint8_t data[0x823];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct isku_light {</div><div class='add'>+	uint8_t data[0xa];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct isku_info {</div><div class='add'>+	uint8_t data[2];</div><div class='add'>+	uint8_t firmware_version;</div><div class='add'>+	uint8_t unknown[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct isku_talk {</div><div class='add'>+	uint8_t data[0x10];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct isku_last_set {</div><div class='add'>+	uint8_t data[0x14];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum isku_commands {</div><div class='add'>+	ISKU_COMMAND_CONTROL = 0x4,</div><div class='add'>+	ISKU_COMMAND_ACTUAL_PROFILE = 0x5,</div><div class='add'>+	ISKU_COMMAND_KEY_MASK = 0x7,</div><div class='add'>+	ISKU_COMMAND_KEYS_FUNCTION = 0x8,</div><div class='add'>+	ISKU_COMMAND_KEYS_EASYZONE = 0x9,</div><div class='add'>+	ISKU_COMMAND_KEYS_MEDIA = 0xa,</div><div class='add'>+	ISKU_COMMAND_KEYS_THUMBSTER = 0xb,</div><div class='add'>+	ISKU_COMMAND_KEYS_MACRO = 0xd,</div><div class='add'>+	ISKU_COMMAND_MACRO = 0xe,</div><div class='add'>+	ISKU_COMMAND_INFO = 0xf,</div><div class='add'>+	ISKU_COMMAND_LIGHT = 0x10,</div><div class='add'>+	ISKU_COMMAND_KEYS_CAPSLOCK = 0x13,</div><div class='add'>+	ISKU_COMMAND_LAST_SET = 0x14,</div><div class='add'>+	ISKU_COMMAND_15 = 0x15,</div><div class='add'>+	ISKU_COMMAND_TALK = 0x16,</div><div class='add'>+	ISKU_COMMAND_FIRMWARE_WRITE = 0x1b,</div><div class='add'>+	ISKU_COMMAND_FIRMWARE_WRITE_CONTROL = 0x1c,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct isku_report_button {</div><div class='add'>+	uint8_t number; /* ISKU_REPORT_NUMBER_BUTTON */</div><div class='add'>+	uint8_t zero;</div><div class='add'>+	uint8_t event;</div><div class='add'>+	uint8_t data1;</div><div class='add'>+	uint8_t data2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum isku_report_numbers {</div><div class='add'>+	ISKU_REPORT_NUMBER_BUTTON = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum isku_report_button_events {</div><div class='add'>+	ISKU_REPORT_BUTTON_EVENT_PROFILE = 0x2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct isku_roccat_report {</div><div class='add'>+	uint8_t event;</div><div class='add'>+	uint8_t data1;</div><div class='add'>+	uint8_t data2;</div><div class='add'>+	uint8_t profile;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct isku_device {</div><div class='add'>+	int roccat_claimed;</div><div class='add'>+	int chrdev_minor;</div><div class='add'>+</div><div class='add'>+	struct mutex isku_lock;</div><div class='add'>+</div><div class='add'>+	int actual_profile;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c<br/>index e2072afb34bb..40090d602158 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/hid-roccat-kone.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-roccat-kone.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-roccat-kone.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-roccat-kone.c</a></div><div class='hunk'>@@ -78,12 +78,10 @@ static int kone_send(struct usb_device *usb_dev, uint usb_command,</div><div class='ctx'> 	char *buf;</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='del'>-	buf = kmalloc(size, GFP_KERNEL);</div><div class='add'>+	buf = kmemdup(data, size, GFP_KERNEL);</div><div class='ctx'> 	if (buf == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	memcpy(buf, data, size);</div><div class='del'>-</div><div class='ctx'> 	len = usb_control_msg(usb_dev, usb_sndctrlpipe(usb_dev, 0),</div><div class='ctx'> 			HID_REQ_SET_REPORT,</div><div class='ctx'> 			USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT,</div><div class='head'>diff --git a/drivers/hid/hid-twinhan.c b/drivers/hid/hid-twinhan.c<br/>index c40afc57fc8f..f23456b1fd4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/hid-twinhan.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-twinhan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-twinhan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-twinhan.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Based on hid-gyration.c</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2009 Bruno Prémont &lt;bonbons@linux-vserver.org&gt;</div><div class='add'>+ * Copyright (c) 2009 Bruno Prémont &lt;bonbons@linux-vserver.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c<br/>index 17bb88f782b6..b47e58b52d9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/hid-wacom.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-wacom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-wacom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-wacom.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  *  Copyright (c) 2008 Jiri Slaby &lt;jirislaby@gmail.com&gt;</div><div class='ctx'>  *  Copyright (c) 2006 Andrew Zabolotny &lt;zap@homelink.ru&gt;</div><div class='ctx'>  *  Copyright (c) 2009 Bastien Nocera &lt;hadess@hadess.net&gt;</div><div class='add'>+ *  Copyright (c) 2011 PrzemysÅ‚aw Firszt &lt;przemo@firszt.eu&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -33,6 +34,7 @@</div><div class='ctx'> struct wacom_data {</div><div class='ctx'> 	__u16 tool;</div><div class='ctx'> 	unsigned char butstate;</div><div class='add'>+	__u8 features;</div><div class='ctx'> 	unsigned char high_speed;</div><div class='ctx'> #ifdef CONFIG_HID_WACOM_POWER_SUPPLY</div><div class='ctx'> 	int battery_capacity;</div><div class='hunk'>@@ -47,12 +49,14 @@ static unsigned short batcap[8] = { 1, 15, 25, 35, 50, 70, 100, 0 };</div><div class='ctx'> </div><div class='ctx'> static enum power_supply_property wacom_battery_props[] = {</div><div class='ctx'> 	POWER_SUPPLY_PROP_PRESENT,</div><div class='del'>-	POWER_SUPPLY_PROP_CAPACITY</div><div class='add'>+	POWER_SUPPLY_PROP_CAPACITY,</div><div class='add'>+	POWER_SUPPLY_PROP_SCOPE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static enum power_supply_property wacom_ac_props[] = {</div><div class='ctx'> 	POWER_SUPPLY_PROP_PRESENT,</div><div class='del'>-	POWER_SUPPLY_PROP_ONLINE</div><div class='add'>+	POWER_SUPPLY_PROP_ONLINE,</div><div class='add'>+	POWER_SUPPLY_PROP_SCOPE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int wacom_battery_get_property(struct power_supply *psy,</div><div class='hunk'>@@ -68,6 +72,9 @@ static int wacom_battery_get_property(struct power_supply *psy,</div><div class='ctx'> 	case POWER_SUPPLY_PROP_PRESENT:</div><div class='ctx'> 		val-&gt;intval = 1;</div><div class='ctx'> 		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_SCOPE:</div><div class='add'>+		val-&gt;intval = POWER_SUPPLY_SCOPE_DEVICE;</div><div class='add'>+		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_CAPACITY:</div><div class='ctx'> 		/* show 100% battery capacity when charging */</div><div class='ctx'> 		if (power_state == 0)</div><div class='hunk'>@@ -99,6 +106,9 @@ static int wacom_ac_get_property(struct power_supply *psy,</div><div class='ctx'> 		else</div><div class='ctx'> 			val-&gt;intval = 0;</div><div class='ctx'> 		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_SCOPE:</div><div class='add'>+		val-&gt;intval = POWER_SUPPLY_SCOPE_DEVICE;</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'>@@ -107,6 +117,19 @@ static int wacom_ac_get_property(struct power_supply *psy,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void wacom_set_features(struct hid_device *hdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	__u8 rep_data[2];</div><div class='add'>+</div><div class='add'>+	/*set high speed, tablet mode*/</div><div class='add'>+	rep_data[0] = 0x03;</div><div class='add'>+	rep_data[1] = 0x20;</div><div class='add'>+	ret = hdev-&gt;hid_output_raw_report(hdev, rep_data, 2,</div><div class='add'>+				HID_FEATURE_REPORT);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void wacom_poke(struct hid_device *hdev, u8 speed)</div><div class='ctx'> {</div><div class='ctx'> 	struct wacom_data *wdata = hid_get_drvdata(hdev);</div><div class='hunk'>@@ -177,26 +200,13 @@ static ssize_t wacom_store_speed(struct device *dev,</div><div class='ctx'> static DEVICE_ATTR(speed, S_IRUGO | S_IWUSR | S_IWGRP,</div><div class='ctx'> 		wacom_show_speed, wacom_store_speed);</div><div class='ctx'> </div><div class='del'>-static int wacom_raw_event(struct hid_device *hdev, struct hid_report *report,</div><div class='del'>-		u8 *raw_data, int size)</div><div class='add'>+static int wacom_gr_parse_report(struct hid_device *hdev,</div><div class='add'>+			struct wacom_data *wdata,</div><div class='add'>+			struct input_dev *input, unsigned char *data)</div><div class='ctx'> {</div><div class='del'>-	struct wacom_data *wdata = hid_get_drvdata(hdev);</div><div class='del'>-	struct hid_input *hidinput;</div><div class='del'>-	struct input_dev *input;</div><div class='del'>-	unsigned char *data = (unsigned char *) raw_data;</div><div class='ctx'> 	int tool, x, y, rw;</div><div class='ctx'> </div><div class='del'>-	if (!(hdev-&gt;claimed &amp; HID_CLAIMED_INPUT))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	tool = 0;</div><div class='del'>-	hidinput = list_entry(hdev-&gt;inputs.next, struct hid_input, list);</div><div class='del'>-	input = hidinput-&gt;input;</div><div class='del'>-</div><div class='del'>-	/* Check if this is a tablet report */</div><div class='del'>-	if (data[0] != 0x03)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	/* Get X &amp; Y positions */</div><div class='ctx'> 	x = le16_to_cpu(*(__le16 *) &amp;data[2]);</div><div class='ctx'> 	y = le16_to_cpu(*(__le16 *) &amp;data[4]);</div><div class='hunk'>@@ -304,6 +314,121 @@ static int wacom_raw_event(struct hid_device *hdev, struct hid_report *report,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void wacom_i4_parse_pen_report(struct wacom_data *wdata,</div><div class='add'>+			struct input_dev *input, unsigned char *data)</div><div class='add'>+{</div><div class='add'>+	__u16 x, y, pressure;</div><div class='add'>+	__u32 id;</div><div class='add'>+</div><div class='add'>+	switch (data[1]) {</div><div class='add'>+	case 0x80: /* Out of proximity report */</div><div class='add'>+		wdata-&gt;tool = 0;</div><div class='add'>+		input_report_key(input, BTN_TOUCH, 0);</div><div class='add'>+		input_report_abs(input, ABS_PRESSURE, 0);</div><div class='add'>+		input_report_key(input, wdata-&gt;tool, 0);</div><div class='add'>+		input_sync(input);</div><div class='add'>+		break;</div><div class='add'>+	case 0xC2: /* Tool report */</div><div class='add'>+		id = ((data[2] &lt;&lt; 4) | (data[3] &gt;&gt; 4) |</div><div class='add'>+			((data[7] &amp; 0x0f) &lt;&lt; 20) |</div><div class='add'>+			((data[8] &amp; 0xf0) &lt;&lt; 12)) &amp; 0xfffff;</div><div class='add'>+</div><div class='add'>+		switch (id) {</div><div class='add'>+		case 0x802:</div><div class='add'>+			wdata-&gt;tool = BTN_TOOL_PEN;</div><div class='add'>+			break;</div><div class='add'>+		case 0x80A:</div><div class='add'>+			wdata-&gt;tool = BTN_TOOL_RUBBER;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default: /* Position/pressure report */</div><div class='add'>+		x = data[2] &lt;&lt; 9 | data[3] &lt;&lt; 1 | ((data[9] &amp; 0x02) &gt;&gt; 1);</div><div class='add'>+		y = data[4] &lt;&lt; 9 | data[5] &lt;&lt; 1 | (data[9] &amp; 0x01);</div><div class='add'>+		pressure = (data[6] &lt;&lt; 3) | ((data[7] &amp; 0xC0) &gt;&gt; 5)</div><div class='add'>+			| (data[1] &amp; 0x01);</div><div class='add'>+</div><div class='add'>+		input_report_key(input, BTN_TOUCH, pressure &gt; 1);</div><div class='add'>+</div><div class='add'>+		input_report_key(input, BTN_STYLUS, data[1] &amp; 0x02);</div><div class='add'>+		input_report_key(input, BTN_STYLUS2, data[1] &amp; 0x04);</div><div class='add'>+		input_report_key(input, wdata-&gt;tool, 1);</div><div class='add'>+		input_report_abs(input, ABS_X, x);</div><div class='add'>+		input_report_abs(input, ABS_Y, y);</div><div class='add'>+		input_report_abs(input, ABS_PRESSURE, pressure);</div><div class='add'>+		input_sync(input);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wacom_i4_parse_report(struct hid_device *hdev,</div><div class='add'>+			struct wacom_data *wdata,</div><div class='add'>+			struct input_dev *input, unsigned char *data)</div><div class='add'>+{</div><div class='add'>+	switch (data[0]) {</div><div class='add'>+	case 0x00: /* Empty report */</div><div class='add'>+		break;</div><div class='add'>+	case 0x02: /* Pen report */</div><div class='add'>+		wacom_i4_parse_pen_report(wdata, input, data);</div><div class='add'>+		break;</div><div class='add'>+	case 0x03: /* Features Report */</div><div class='add'>+		wdata-&gt;features = data[2];</div><div class='add'>+		break;</div><div class='add'>+	case 0x0C: /* Button report */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		hid_err(hdev, "Unknown report: %d,%d\n", data[0], data[1]);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wacom_raw_event(struct hid_device *hdev, struct hid_report *report,</div><div class='add'>+		u8 *raw_data, int size)</div><div class='add'>+{</div><div class='add'>+	struct wacom_data *wdata = hid_get_drvdata(hdev);</div><div class='add'>+	struct hid_input *hidinput;</div><div class='add'>+	struct input_dev *input;</div><div class='add'>+	unsigned char *data = (unsigned char *) raw_data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!(hdev-&gt;claimed &amp; HID_CLAIMED_INPUT))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hidinput = list_entry(hdev-&gt;inputs.next, struct hid_input, list);</div><div class='add'>+	input = hidinput-&gt;input;</div><div class='add'>+</div><div class='add'>+	/* Check if this is a tablet report */</div><div class='add'>+	if (data[0] != 0x03)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (hdev-&gt;product) {</div><div class='add'>+	case USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH:</div><div class='add'>+		return wacom_gr_parse_report(hdev, wdata, input, data);</div><div class='add'>+		break;</div><div class='add'>+	case USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH:</div><div class='add'>+		i = 1;</div><div class='add'>+</div><div class='add'>+		switch (data[0]) {</div><div class='add'>+		case 0x04:</div><div class='add'>+			wacom_i4_parse_report(hdev, wdata, input, data + i);</div><div class='add'>+			i += 10;</div><div class='add'>+			/* fall through */</div><div class='add'>+		case 0x03:</div><div class='add'>+			wacom_i4_parse_report(hdev, wdata, input, data + i);</div><div class='add'>+			i += 10;</div><div class='add'>+			wacom_i4_parse_report(hdev, wdata, input, data + i);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			hid_err(hdev, "Unknown report: %d,%d size:%d\n",</div><div class='add'>+					data[0], data[1], size);</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='add'>+</div><div class='ctx'> static int wacom_input_mapped(struct hid_device *hdev, struct hid_input *hi,</div><div class='ctx'> 	struct hid_field *field, struct hid_usage *usage, unsigned long **bit,</div><div class='ctx'> 								int *max)</div><div class='hunk'>@@ -338,10 +463,19 @@ static int wacom_input_mapped(struct hid_device *hdev, struct hid_input *hi,</div><div class='ctx'> 	__set_bit(BTN_TOOL_RUBBER, input-&gt;keybit);</div><div class='ctx'> 	__set_bit(BTN_TOOL_MOUSE, input-&gt;keybit);</div><div class='ctx'> </div><div class='del'>-	input_set_abs_params(input, ABS_X, 0, 16704, 4, 0);</div><div class='del'>-	input_set_abs_params(input, ABS_Y, 0, 12064, 4, 0);</div><div class='del'>-	input_set_abs_params(input, ABS_PRESSURE, 0, 511, 0, 0);</div><div class='del'>-	input_set_abs_params(input, ABS_DISTANCE, 0, 32, 0, 0);</div><div class='add'>+	switch (hdev-&gt;product) {</div><div class='add'>+	case USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH:</div><div class='add'>+		input_set_abs_params(input, ABS_X, 0, 16704, 4, 0);</div><div class='add'>+		input_set_abs_params(input, ABS_Y, 0, 12064, 4, 0);</div><div class='add'>+		input_set_abs_params(input, ABS_PRESSURE, 0, 511, 0, 0);</div><div class='add'>+		input_set_abs_params(input, ABS_DISTANCE, 0, 32, 0, 0);</div><div class='add'>+		break;</div><div class='add'>+	case USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH:</div><div class='add'>+		input_set_abs_params(input, ABS_X, 0, 40640, 4, 0);</div><div class='add'>+		input_set_abs_params(input, ABS_Y, 0, 25400, 4, 0);</div><div class='add'>+		input_set_abs_params(input, ABS_PRESSURE, 0, 2047, 0, 0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -378,8 +512,16 @@ static int wacom_probe(struct hid_device *hdev,</div><div class='ctx'> 		hid_warn(hdev,</div><div class='ctx'> 			 "can't create sysfs speed attribute err: %d\n", ret);</div><div class='ctx'> </div><div class='del'>-	/* Set Wacom mode 2 with high reporting speed */</div><div class='del'>-	wacom_poke(hdev, 1);</div><div class='add'>+	switch (hdev-&gt;product) {</div><div class='add'>+	case USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH:</div><div class='add'>+		/* Set Wacom mode 2 with high reporting speed */</div><div class='add'>+		wacom_poke(hdev, 1);</div><div class='add'>+		break;</div><div class='add'>+	case USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH:</div><div class='add'>+		wdata-&gt;features = 0;</div><div class='add'>+		wacom_set_features(hdev);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HID_WACOM_POWER_SUPPLY</div><div class='ctx'> 	wdata-&gt;battery.properties = wacom_battery_props;</div><div class='hunk'>@@ -389,6 +531,8 @@ static int wacom_probe(struct hid_device *hdev,</div><div class='ctx'> 	wdata-&gt;battery.type = POWER_SUPPLY_TYPE_BATTERY;</div><div class='ctx'> 	wdata-&gt;battery.use_for_apm = 0;</div><div class='ctx'> </div><div class='add'>+	power_supply_powers(&amp;wdata-&gt;battery, &amp;hdev-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	ret = power_supply_register(&amp;hdev-&gt;dev, &amp;wdata-&gt;battery);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		hid_warn(hdev, "can't create sysfs battery attribute, err: %d\n",</div><div class='hunk'>@@ -403,6 +547,8 @@ static int wacom_probe(struct hid_device *hdev,</div><div class='ctx'> 	wdata-&gt;ac.type = POWER_SUPPLY_TYPE_MAINS;</div><div class='ctx'> 	wdata-&gt;ac.use_for_apm = 0;</div><div class='ctx'> </div><div class='add'>+	power_supply_powers(&amp;wdata-&gt;battery, &amp;hdev-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	ret = power_supply_register(&amp;hdev-&gt;dev, &amp;wdata-&gt;ac);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		hid_warn(hdev,</div><div class='hunk'>@@ -441,6 +587,7 @@ static void wacom_remove(struct hid_device *hdev)</div><div class='ctx'> </div><div class='ctx'> static const struct hid_device_id wacom_devices[] = {</div><div class='ctx'> 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },</div><div class='add'>+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) },</div><div class='ctx'> </div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/hid/hid-wiimote.c b/drivers/hid/hid-wiimote-core.c<br/>index 76739c07fa3c..fc253b472f9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/hid-wiimote.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/hid-wiimote.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-wiimote-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-wiimote-core.c</a></div><div class='hunk'>@@ -20,91 +20,7 @@</div><div class='ctx'> #include &lt;linux/power_supply.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include "hid-ids.h"</div><div class='del'>-</div><div class='del'>-#define WIIMOTE_VERSION "0.2"</div><div class='del'>-#define WIIMOTE_NAME "Nintendo Wii Remote"</div><div class='del'>-#define WIIMOTE_BUFSIZE 32</div><div class='del'>-</div><div class='del'>-struct wiimote_buf {</div><div class='del'>-	__u8 data[HID_MAX_BUFFER_SIZE];</div><div class='del'>-	size_t size;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct wiimote_state {</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-	__u8 flags;</div><div class='del'>-	__u8 accel_split[2];</div><div class='del'>-</div><div class='del'>-	/* synchronous cmd requests */</div><div class='del'>-	struct mutex sync;</div><div class='del'>-	struct completion ready;</div><div class='del'>-	int cmd;</div><div class='del'>-	__u32 opt;</div><div class='del'>-</div><div class='del'>-	/* results of synchronous requests */</div><div class='del'>-	__u8 cmd_battery;</div><div class='del'>-	__u8 cmd_err;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct wiimote_data {</div><div class='del'>-	struct hid_device *hdev;</div><div class='del'>-	struct input_dev *input;</div><div class='del'>-	struct led_classdev *leds[4];</div><div class='del'>-	struct input_dev *accel;</div><div class='del'>-	struct input_dev *ir;</div><div class='del'>-	struct power_supply battery;</div><div class='del'>-</div><div class='del'>-	spinlock_t qlock;</div><div class='del'>-	__u8 head;</div><div class='del'>-	__u8 tail;</div><div class='del'>-	struct wiimote_buf outq[WIIMOTE_BUFSIZE];</div><div class='del'>-	struct work_struct worker;</div><div class='del'>-</div><div class='del'>-	struct wiimote_state state;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define WIIPROTO_FLAG_LED1		0x01</div><div class='del'>-#define WIIPROTO_FLAG_LED2		0x02</div><div class='del'>-#define WIIPROTO_FLAG_LED3		0x04</div><div class='del'>-#define WIIPROTO_FLAG_LED4		0x08</div><div class='del'>-#define WIIPROTO_FLAG_RUMBLE		0x10</div><div class='del'>-#define WIIPROTO_FLAG_ACCEL		0x20</div><div class='del'>-#define WIIPROTO_FLAG_IR_BASIC		0x40</div><div class='del'>-#define WIIPROTO_FLAG_IR_EXT		0x80</div><div class='del'>-#define WIIPROTO_FLAG_IR_FULL		0xc0 /* IR_BASIC | IR_EXT */</div><div class='del'>-#define WIIPROTO_FLAGS_LEDS (WIIPROTO_FLAG_LED1 | WIIPROTO_FLAG_LED2 | \</div><div class='del'>-					WIIPROTO_FLAG_LED3 | WIIPROTO_FLAG_LED4)</div><div class='del'>-#define WIIPROTO_FLAGS_IR (WIIPROTO_FLAG_IR_BASIC | WIIPROTO_FLAG_IR_EXT | \</div><div class='del'>-							WIIPROTO_FLAG_IR_FULL)</div><div class='del'>-</div><div class='del'>-/* return flag for led \num */</div><div class='del'>-#define WIIPROTO_FLAG_LED(num) (WIIPROTO_FLAG_LED1 &lt;&lt; (num - 1))</div><div class='del'>-</div><div class='del'>-enum wiiproto_reqs {</div><div class='del'>-	WIIPROTO_REQ_NULL = 0x0,</div><div class='del'>-	WIIPROTO_REQ_RUMBLE = 0x10,</div><div class='del'>-	WIIPROTO_REQ_LED = 0x11,</div><div class='del'>-	WIIPROTO_REQ_DRM = 0x12,</div><div class='del'>-	WIIPROTO_REQ_IR1 = 0x13,</div><div class='del'>-	WIIPROTO_REQ_SREQ = 0x15,</div><div class='del'>-	WIIPROTO_REQ_WMEM = 0x16,</div><div class='del'>-	WIIPROTO_REQ_RMEM = 0x17,</div><div class='del'>-	WIIPROTO_REQ_IR2 = 0x1a,</div><div class='del'>-	WIIPROTO_REQ_STATUS = 0x20,</div><div class='del'>-	WIIPROTO_REQ_DATA = 0x21,</div><div class='del'>-	WIIPROTO_REQ_RETURN = 0x22,</div><div class='del'>-	WIIPROTO_REQ_DRM_K = 0x30,</div><div class='del'>-	WIIPROTO_REQ_DRM_KA = 0x31,</div><div class='del'>-	WIIPROTO_REQ_DRM_KE = 0x32,</div><div class='del'>-	WIIPROTO_REQ_DRM_KAI = 0x33,</div><div class='del'>-	WIIPROTO_REQ_DRM_KEE = 0x34,</div><div class='del'>-	WIIPROTO_REQ_DRM_KAE = 0x35,</div><div class='del'>-	WIIPROTO_REQ_DRM_KIE = 0x36,</div><div class='del'>-	WIIPROTO_REQ_DRM_KAIE = 0x37,</div><div class='del'>-	WIIPROTO_REQ_DRM_E = 0x3d,</div><div class='del'>-	WIIPROTO_REQ_DRM_SKAI1 = 0x3e,</div><div class='del'>-	WIIPROTO_REQ_DRM_SKAI2 = 0x3f,</div><div class='del'>-};</div><div class='add'>+#include "hid-wiimote.h"</div><div class='ctx'> </div><div class='ctx'> enum wiiproto_keys {</div><div class='ctx'> 	WIIPROTO_KEY_LEFT,</div><div class='hunk'>@@ -136,55 +52,10 @@ static __u16 wiiproto_keymap[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static enum power_supply_property wiimote_battery_props[] = {</div><div class='del'>-	POWER_SUPPLY_PROP_CAPACITY</div><div class='add'>+	POWER_SUPPLY_PROP_CAPACITY,</div><div class='add'>+	POWER_SUPPLY_PROP_SCOPE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* requires the state.lock spinlock to be held */</div><div class='del'>-static inline bool wiimote_cmd_pending(struct wiimote_data *wdata, int cmd,</div><div class='del'>-								__u32 opt)</div><div class='del'>-{</div><div class='del'>-	return wdata-&gt;state.cmd == cmd &amp;&amp; wdata-&gt;state.opt == opt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* requires the state.lock spinlock to be held */</div><div class='del'>-static inline void wiimote_cmd_complete(struct wiimote_data *wdata)</div><div class='del'>-{</div><div class='del'>-	wdata-&gt;state.cmd = WIIPROTO_REQ_NULL;</div><div class='del'>-	complete(&amp;wdata-&gt;state.ready);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int wiimote_cmd_acquire(struct wiimote_data *wdata)</div><div class='del'>-{</div><div class='del'>-	return mutex_lock_interruptible(&amp;wdata-&gt;state.sync) ? -ERESTARTSYS : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* requires the state.lock spinlock to be held */</div><div class='del'>-static inline void wiimote_cmd_set(struct wiimote_data *wdata, int cmd,</div><div class='del'>-								__u32 opt)</div><div class='del'>-{</div><div class='del'>-	INIT_COMPLETION(wdata-&gt;state.ready);</div><div class='del'>-	wdata-&gt;state.cmd = cmd;</div><div class='del'>-	wdata-&gt;state.opt = opt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void wiimote_cmd_release(struct wiimote_data *wdata)</div><div class='del'>-{</div><div class='del'>-	mutex_unlock(&amp;wdata-&gt;state.sync);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int wiimote_cmd_wait(struct wiimote_data *wdata)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = wait_for_completion_interruptible_timeout(&amp;wdata-&gt;state.ready, HZ);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-	else if (ret == 0)</div><div class='del'>-		return -EIO;</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t wiimote_hid_send(struct hid_device *hdev, __u8 *buffer,</div><div class='ctx'> 								size_t count)</div><div class='ctx'> {</div><div class='hunk'>@@ -329,6 +200,7 @@ static void wiiproto_req_leds(struct wiimote_data *wdata, int leds)</div><div class='ctx'> static __u8 select_drm(struct wiimote_data *wdata)</div><div class='ctx'> {</div><div class='ctx'> 	__u8 ir = wdata-&gt;state.flags &amp; WIIPROTO_FLAGS_IR;</div><div class='add'>+	bool ext = wiiext_active(wdata);</div><div class='ctx'> </div><div class='ctx'> 	if (ir == WIIPROTO_FLAG_IR_BASIC) {</div><div class='ctx'> 		if (wdata-&gt;state.flags &amp; WIIPROTO_FLAG_ACCEL)</div><div class='hunk'>@@ -340,14 +212,21 @@ static __u8 select_drm(struct wiimote_data *wdata)</div><div class='ctx'> 	} else if (ir == WIIPROTO_FLAG_IR_FULL) {</div><div class='ctx'> 		return WIIPROTO_REQ_DRM_SKAI1;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (wdata-&gt;state.flags &amp; WIIPROTO_FLAG_ACCEL)</div><div class='del'>-			return WIIPROTO_REQ_DRM_KA;</div><div class='del'>-		else</div><div class='del'>-			return WIIPROTO_REQ_DRM_K;</div><div class='add'>+		if (wdata-&gt;state.flags &amp; WIIPROTO_FLAG_ACCEL) {</div><div class='add'>+			if (ext)</div><div class='add'>+				return WIIPROTO_REQ_DRM_KAE;</div><div class='add'>+			else</div><div class='add'>+				return WIIPROTO_REQ_DRM_KA;</div><div class='add'>+		} else {</div><div class='add'>+			if (ext)</div><div class='add'>+				return WIIPROTO_REQ_DRM_KE;</div><div class='add'>+			else</div><div class='add'>+				return WIIPROTO_REQ_DRM_K;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wiiproto_req_drm(struct wiimote_data *wdata, __u8 drm)</div><div class='add'>+void wiiproto_req_drm(struct wiimote_data *wdata, __u8 drm)</div><div class='ctx'> {</div><div class='ctx'> 	__u8 cmd[3];</div><div class='ctx'> </div><div class='hunk'>@@ -358,6 +237,7 @@ static void wiiproto_req_drm(struct wiimote_data *wdata, __u8 drm)</div><div class='ctx'> 	cmd[1] = 0;</div><div class='ctx'> 	cmd[2] = drm;</div><div class='ctx'> </div><div class='add'>+	wdata-&gt;state.drm = drm;</div><div class='ctx'> 	wiiproto_keep_rumble(wdata, &amp;cmd[1]);</div><div class='ctx'> 	wiimote_queue(wdata, cmd, sizeof(cmd));</div><div class='ctx'> }</div><div class='hunk'>@@ -440,8 +320,33 @@ static void wiiproto_req_wmem(struct wiimote_data *wdata, bool eeprom,</div><div class='ctx'> 	wiimote_queue(wdata, cmd, sizeof(cmd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void wiiproto_req_rmem(struct wiimote_data *wdata, bool eeprom, __u32 offset,</div><div class='add'>+								__u16 size)</div><div class='add'>+{</div><div class='add'>+	__u8 cmd[7];</div><div class='add'>+</div><div class='add'>+	if (size == 0) {</div><div class='add'>+		hid_warn(wdata-&gt;hdev, "Invalid length %d rmem request\n", size);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd[0] = WIIPROTO_REQ_RMEM;</div><div class='add'>+	cmd[1] = 0;</div><div class='add'>+	cmd[2] = (offset &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	cmd[3] = (offset &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	cmd[4] = offset &amp; 0xff;</div><div class='add'>+	cmd[5] = (size &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	cmd[6] = size &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	if (!eeprom)</div><div class='add'>+		cmd[1] |= 0x04;</div><div class='add'>+</div><div class='add'>+	wiiproto_keep_rumble(wdata, &amp;cmd[1]);</div><div class='add'>+	wiimote_queue(wdata, cmd, sizeof(cmd));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* requries the cmd-mutex to be held */</div><div class='del'>-static int wiimote_cmd_write(struct wiimote_data *wdata, __u32 offset,</div><div class='add'>+int wiimote_cmd_write(struct wiimote_data *wdata, __u32 offset,</div><div class='ctx'> 						const __u8 *wmem, __u8 size)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -459,6 +364,36 @@ static int wiimote_cmd_write(struct wiimote_data *wdata, __u32 offset,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* requries the cmd-mutex to be held */</div><div class='add'>+ssize_t wiimote_cmd_read(struct wiimote_data *wdata, __u32 offset, __u8 *rmem,</div><div class='add'>+								__u8 size)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;wdata-&gt;state.lock, flags);</div><div class='add'>+	wdata-&gt;state.cmd_read_size = size;</div><div class='add'>+	wdata-&gt;state.cmd_read_buf = rmem;</div><div class='add'>+	wiimote_cmd_set(wdata, WIIPROTO_REQ_RMEM, offset &amp; 0xffff);</div><div class='add'>+	wiiproto_req_rreg(wdata, offset, size);</div><div class='add'>+	spin_unlock_irqrestore(&amp;wdata-&gt;state.lock, flags);</div><div class='add'>+</div><div class='add'>+	ret = wiimote_cmd_wait(wdata);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;wdata-&gt;state.lock, flags);</div><div class='add'>+	wdata-&gt;state.cmd_read_buf = NULL;</div><div class='add'>+	spin_unlock_irqrestore(&amp;wdata-&gt;state.lock, flags);</div><div class='add'>+</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (wdata-&gt;state.cmd_read_size == 0)</div><div class='add'>+			ret = -EIO;</div><div class='add'>+		else</div><div class='add'>+			ret = wdata-&gt;state.cmd_read_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int wiimote_battery_get_property(struct power_supply *psy,</div><div class='ctx'> 						enum power_supply_property psp,</div><div class='ctx'> 						union power_supply_propval *val)</div><div class='hunk'>@@ -468,6 +403,11 @@ static int wiimote_battery_get_property(struct power_supply *psy,</div><div class='ctx'> 	int ret = 0, state;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	if (psp == POWER_SUPPLY_PROP_SCOPE) {</div><div class='add'>+		val-&gt;intval = POWER_SUPPLY_SCOPE_DEVICE;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = wiimote_cmd_acquire(wdata);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -862,6 +802,8 @@ static void handler_status(struct wiimote_data *wdata, const __u8 *payload)</div><div class='ctx'> 	/* on status reports the drm is reset so we need to resend the drm */</div><div class='ctx'> 	wiiproto_req_drm(wdata, WIIPROTO_REQ_NULL);</div><div class='ctx'> </div><div class='add'>+	wiiext_event(wdata, payload[2] &amp; 0x02);</div><div class='add'>+</div><div class='ctx'> 	if (wiimote_cmd_pending(wdata, WIIPROTO_REQ_SREQ, 0)) {</div><div class='ctx'> 		wdata-&gt;state.cmd_battery = payload[5];</div><div class='ctx'> 		wiimote_cmd_complete(wdata);</div><div class='hunk'>@@ -870,7 +812,23 @@ static void handler_status(struct wiimote_data *wdata, const __u8 *payload)</div><div class='ctx'> </div><div class='ctx'> static void handler_data(struct wiimote_data *wdata, const __u8 *payload)</div><div class='ctx'> {</div><div class='add'>+	__u16 offset = payload[3] &lt;&lt; 8 | payload[4];</div><div class='add'>+	__u8 size = (payload[2] &gt;&gt; 4) + 1;</div><div class='add'>+	__u8 err = payload[2] &amp; 0x0f;</div><div class='add'>+</div><div class='ctx'> 	handler_keys(wdata, payload);</div><div class='add'>+</div><div class='add'>+	if (wiimote_cmd_pending(wdata, WIIPROTO_REQ_RMEM, offset)) {</div><div class='add'>+		if (err)</div><div class='add'>+			size = 0;</div><div class='add'>+		else if (size &gt; wdata-&gt;state.cmd_read_size)</div><div class='add'>+			size = wdata-&gt;state.cmd_read_size;</div><div class='add'>+</div><div class='add'>+		wdata-&gt;state.cmd_read_size = size;</div><div class='add'>+		if (wdata-&gt;state.cmd_read_buf)</div><div class='add'>+			memcpy(wdata-&gt;state.cmd_read_buf, &amp;payload[5], size);</div><div class='add'>+		wiimote_cmd_complete(wdata);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void handler_return(struct wiimote_data *wdata, const __u8 *payload)</div><div class='hunk'>@@ -898,6 +856,7 @@ static void handler_drm_KA(struct wiimote_data *wdata, const __u8 *payload)</div><div class='ctx'> static void handler_drm_KE(struct wiimote_data *wdata, const __u8 *payload)</div><div class='ctx'> {</div><div class='ctx'> 	handler_keys(wdata, payload);</div><div class='add'>+	wiiext_handle(wdata, &amp;payload[2]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void handler_drm_KAI(struct wiimote_data *wdata, const __u8 *payload)</div><div class='hunk'>@@ -914,6 +873,7 @@ static void handler_drm_KAI(struct wiimote_data *wdata, const __u8 *payload)</div><div class='ctx'> static void handler_drm_KEE(struct wiimote_data *wdata, const __u8 *payload)</div><div class='ctx'> {</div><div class='ctx'> 	handler_keys(wdata, payload);</div><div class='add'>+	wiiext_handle(wdata, &amp;payload[2]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void handler_drm_KIE(struct wiimote_data *wdata, const __u8 *payload)</div><div class='hunk'>@@ -924,12 +884,14 @@ static void handler_drm_KIE(struct wiimote_data *wdata, const __u8 *payload)</div><div class='ctx'> 	ir_to_input2(wdata, &amp;payload[7], false);</div><div class='ctx'> 	ir_to_input3(wdata, &amp;payload[9], true);</div><div class='ctx'> 	input_sync(wdata-&gt;ir);</div><div class='add'>+	wiiext_handle(wdata, &amp;payload[12]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void handler_drm_KAE(struct wiimote_data *wdata, const __u8 *payload)</div><div class='ctx'> {</div><div class='ctx'> 	handler_keys(wdata, payload);</div><div class='ctx'> 	handler_accel(wdata, payload);</div><div class='add'>+	wiiext_handle(wdata, &amp;payload[5]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void handler_drm_KAIE(struct wiimote_data *wdata, const __u8 *payload)</div><div class='hunk'>@@ -941,10 +903,12 @@ static void handler_drm_KAIE(struct wiimote_data *wdata, const __u8 *payload)</div><div class='ctx'> 	ir_to_input2(wdata, &amp;payload[10], false);</div><div class='ctx'> 	ir_to_input3(wdata, &amp;payload[12], true);</div><div class='ctx'> 	input_sync(wdata-&gt;ir);</div><div class='add'>+	wiiext_handle(wdata, &amp;payload[15]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void handler_drm_E(struct wiimote_data *wdata, const __u8 *payload)</div><div class='ctx'> {</div><div class='add'>+	wiiext_handle(wdata, payload);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void handler_drm_SKAI1(struct wiimote_data *wdata, const __u8 *payload)</div><div class='hunk'>@@ -1182,6 +1146,7 @@ static struct wiimote_data *wiimote_create(struct hid_device *hdev)</div><div class='ctx'> 	spin_lock_init(&amp;wdata-&gt;state.lock);</div><div class='ctx'> 	init_completion(&amp;wdata-&gt;state.ready);</div><div class='ctx'> 	mutex_init(&amp;wdata-&gt;state.sync);</div><div class='add'>+	wdata-&gt;state.drm = WIIPROTO_REQ_DRM_K;</div><div class='ctx'> </div><div class='ctx'> 	return wdata;</div><div class='ctx'> </div><div class='hunk'>@@ -1196,6 +1161,8 @@ err:</div><div class='ctx'> </div><div class='ctx'> static void wiimote_destroy(struct wiimote_data *wdata)</div><div class='ctx'> {</div><div class='add'>+	wiidebug_deinit(wdata);</div><div class='add'>+	wiiext_deinit(wdata);</div><div class='ctx'> 	wiimote_leds_destroy(wdata);</div><div class='ctx'> </div><div class='ctx'> 	power_supply_unregister(&amp;wdata-&gt;battery);</div><div class='hunk'>@@ -1214,6 +1181,8 @@ static int wiimote_hid_probe(struct hid_device *hdev,</div><div class='ctx'> 	struct wiimote_data *wdata;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	hdev-&gt;quirks |= HID_QUIRK_NO_INIT_REPORTS;</div><div class='add'>+</div><div class='ctx'> 	wdata = wiimote_create(hdev);</div><div class='ctx'> 	if (!wdata) {</div><div class='ctx'> 		hid_err(hdev, "Can't alloc device\n");</div><div class='hunk'>@@ -1257,6 +1226,8 @@ static int wiimote_hid_probe(struct hid_device *hdev,</div><div class='ctx'> 	wdata-&gt;battery.type = POWER_SUPPLY_TYPE_BATTERY;</div><div class='ctx'> 	wdata-&gt;battery.use_for_apm = 0;</div><div class='ctx'> </div><div class='add'>+	power_supply_powers(&amp;wdata-&gt;battery, &amp;hdev-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	ret = power_supply_register(&amp;wdata-&gt;hdev-&gt;dev, &amp;wdata-&gt;battery);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		hid_err(hdev, "Cannot register battery device\n");</div><div class='hunk'>@@ -1267,6 +1238,14 @@ static int wiimote_hid_probe(struct hid_device *hdev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> </div><div class='add'>+	ret = wiiext_init(wdata);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	ret = wiidebug_init(wdata);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='ctx'> 	hid_info(hdev, "New device registered\n");</div><div class='ctx'> </div><div class='ctx'> 	/* by default set led1 after device initialization */</div><div class='hunk'>@@ -1343,4 +1322,3 @@ module_exit(wiimote_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("David Herrmann &lt;dh.herrmann@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION(WIIMOTE_NAME " Device Driver");</div><div class='del'>-MODULE_VERSION(WIIMOTE_VERSION);</div><div class='head'>diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c<br/>new file mode 100644<br/>index 000000000000..17dabc1f339e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-wiimote-debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-wiimote-debug.c</a></div><div class='hunk'>@@ -0,0 +1,227 @@</div><div class='add'>+/*</div><div class='add'>+ * Debug support for HID Nintendo Wiimote devices</div><div class='add'>+ * Copyright (c) 2011 David Herrmann</div><div class='add'>+ */</div><div class='add'>+</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/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.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 "hid-wiimote.h"</div><div class='add'>+</div><div class='add'>+struct wiimote_debug {</div><div class='add'>+	struct wiimote_data *wdata;</div><div class='add'>+	struct dentry *eeprom;</div><div class='add'>+	struct dentry *drm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int wiidebug_eeprom_open(struct inode *i, struct file *f)</div><div class='add'>+{</div><div class='add'>+	f-&gt;private_data = i-&gt;i_private;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,</div><div class='add'>+								loff_t *off)</div><div class='add'>+{</div><div class='add'>+	struct wiimote_debug *dbg = f-&gt;private_data;</div><div class='add'>+	struct wiimote_data *wdata = dbg-&gt;wdata;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	char buf[16];</div><div class='add'>+	__u16 size;</div><div class='add'>+</div><div class='add'>+	if (s == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (*off &gt; 0xffffff)</div><div class='add'>+		return 0;</div><div class='add'>+	if (s &gt; 16)</div><div class='add'>+		s = 16;</div><div class='add'>+</div><div class='add'>+	ret = wiimote_cmd_acquire(wdata);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;wdata-&gt;state.lock, flags);</div><div class='add'>+	wdata-&gt;state.cmd_read_size = s;</div><div class='add'>+	wdata-&gt;state.cmd_read_buf = buf;</div><div class='add'>+	wiimote_cmd_set(wdata, WIIPROTO_REQ_RMEM, *off &amp; 0xffff);</div><div class='add'>+	wiiproto_req_reeprom(wdata, *off, s);</div><div class='add'>+	spin_unlock_irqrestore(&amp;wdata-&gt;state.lock, flags);</div><div class='add'>+</div><div class='add'>+	ret = wiimote_cmd_wait(wdata);</div><div class='add'>+	if (!ret)</div><div class='add'>+		size = wdata-&gt;state.cmd_read_size;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;wdata-&gt;state.lock, flags);</div><div class='add'>+	wdata-&gt;state.cmd_read_buf = NULL;</div><div class='add'>+	spin_unlock_irqrestore(&amp;wdata-&gt;state.lock, flags);</div><div class='add'>+</div><div class='add'>+	wiimote_cmd_release(wdata);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	else if (size == 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(u, buf, size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	*off += size;</div><div class='add'>+	ret = size;</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 file_operations wiidebug_eeprom_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = wiidebug_eeprom_open,</div><div class='add'>+	.read = wiidebug_eeprom_read,</div><div class='add'>+	.llseek = generic_file_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *wiidebug_drmmap[] = {</div><div class='add'>+	[WIIPROTO_REQ_NULL] = "NULL",</div><div class='add'>+	[WIIPROTO_REQ_DRM_K] = "K",</div><div class='add'>+	[WIIPROTO_REQ_DRM_KA] = "KA",</div><div class='add'>+	[WIIPROTO_REQ_DRM_KE] = "KE",</div><div class='add'>+	[WIIPROTO_REQ_DRM_KAI] = "KAI",</div><div class='add'>+	[WIIPROTO_REQ_DRM_KEE] = "KEE",</div><div class='add'>+	[WIIPROTO_REQ_DRM_KAE] = "KAE",</div><div class='add'>+	[WIIPROTO_REQ_DRM_KIE] = "KIE",</div><div class='add'>+	[WIIPROTO_REQ_DRM_KAIE] = "KAIE",</div><div class='add'>+	[WIIPROTO_REQ_DRM_E] = "E",</div><div class='add'>+	[WIIPROTO_REQ_DRM_SKAI1] = "SKAI1",</div><div class='add'>+	[WIIPROTO_REQ_DRM_SKAI2] = "SKAI2",</div><div class='add'>+	[WIIPROTO_REQ_MAX] = NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int wiidebug_drm_show(struct seq_file *f, void *p)</div><div class='add'>+{</div><div class='add'>+	struct wiimote_debug *dbg = f-&gt;private;</div><div class='add'>+	const char *str = NULL;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	__u8 drm;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dbg-&gt;wdata-&gt;state.lock, flags);</div><div class='add'>+	drm = dbg-&gt;wdata-&gt;state.drm;</div><div class='add'>+	spin_unlock_irqrestore(&amp;dbg-&gt;wdata-&gt;state.lock, flags);</div><div class='add'>+</div><div class='add'>+	if (drm &lt; WIIPROTO_REQ_MAX)</div><div class='add'>+		str = wiidebug_drmmap[drm];</div><div class='add'>+	if (!str)</div><div class='add'>+		str = "unknown";</div><div class='add'>+</div><div class='add'>+	seq_printf(f, "%s\n", str);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wiidebug_drm_open(struct inode *i, struct file *f)</div><div class='add'>+{</div><div class='add'>+	return single_open(f, wiidebug_drm_show, i-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t wiidebug_drm_write(struct file *f, const char __user *u,</div><div class='add'>+							size_t s, loff_t *off)</div><div class='add'>+{</div><div class='add'>+	struct wiimote_debug *dbg = f-&gt;private_data;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	char buf[16];</div><div class='add'>+	ssize_t len;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (s == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	len = min((size_t) 15, s);</div><div class='add'>+	if (copy_from_user(buf, u, len))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	buf[15] = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WIIPROTO_REQ_MAX; ++i) {</div><div class='add'>+		if (!wiidebug_drmmap[i])</div><div class='add'>+			continue;</div><div class='add'>+		if (!strcasecmp(buf, wiidebug_drmmap[i]))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i == WIIPROTO_REQ_MAX)</div><div class='add'>+		i = simple_strtoul(buf, NULL, 10);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dbg-&gt;wdata-&gt;state.lock, flags);</div><div class='add'>+	wiiproto_req_drm(dbg-&gt;wdata, (__u8) i);</div><div class='add'>+	spin_unlock_irqrestore(&amp;dbg-&gt;wdata-&gt;state.lock, flags);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations wiidebug_drm_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = wiidebug_drm_open,</div><div class='add'>+	.read = seq_read,</div><div class='add'>+	.llseek = seq_lseek,</div><div class='add'>+	.write = wiidebug_drm_write,</div><div class='add'>+	.release = single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int wiidebug_init(struct wiimote_data *wdata)</div><div class='add'>+{</div><div class='add'>+	struct wiimote_debug *dbg;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dbg = kzalloc(sizeof(*dbg), GFP_KERNEL);</div><div class='add'>+	if (!dbg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dbg-&gt;wdata = wdata;</div><div class='add'>+</div><div class='add'>+	dbg-&gt;eeprom = debugfs_create_file("eeprom", S_IRUSR,</div><div class='add'>+		dbg-&gt;wdata-&gt;hdev-&gt;debug_dir, dbg, &amp;wiidebug_eeprom_fops);</div><div class='add'>+	if (!dbg-&gt;eeprom)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	dbg-&gt;drm = debugfs_create_file("drm", S_IRUSR,</div><div class='add'>+			dbg-&gt;wdata-&gt;hdev-&gt;debug_dir, dbg, &amp;wiidebug_drm_fops);</div><div class='add'>+	if (!dbg-&gt;drm)</div><div class='add'>+		goto err_drm;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;wdata-&gt;state.lock, flags);</div><div class='add'>+	wdata-&gt;debug = dbg;</div><div class='add'>+	spin_unlock_irqrestore(&amp;wdata-&gt;state.lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_drm:</div><div class='add'>+	debugfs_remove(dbg-&gt;eeprom);</div><div class='add'>+err:</div><div class='add'>+	kfree(dbg);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void wiidebug_deinit(struct wiimote_data *wdata)</div><div class='add'>+{</div><div class='add'>+	struct wiimote_debug *dbg = wdata-&gt;debug;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!dbg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;wdata-&gt;state.lock, flags);</div><div class='add'>+	wdata-&gt;debug = NULL;</div><div class='add'>+	spin_unlock_irqrestore(&amp;wdata-&gt;state.lock, flags);</div><div class='add'>+</div><div class='add'>+	debugfs_remove(dbg-&gt;drm);</div><div class='add'>+	debugfs_remove(dbg-&gt;eeprom);</div><div class='add'>+	kfree(dbg);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/hid/hid-wiimote-ext.c b/drivers/hid/hid-wiimote-ext.c<br/>new file mode 100644<br/>index 000000000000..aa958706c0e5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-wiimote-ext.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-wiimote-ext.c</a></div><div class='hunk'>@@ -0,0 +1,752 @@</div><div class='add'>+/*</div><div class='add'>+ * HID driver for Nintendo Wiimote extension devices</div><div class='add'>+ * Copyright (c) 2011 David Herrmann</div><div class='add'>+ */</div><div class='add'>+</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/atomic.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include "hid-wiimote.h"</div><div class='add'>+</div><div class='add'>+struct wiimote_ext {</div><div class='add'>+	struct wiimote_data *wdata;</div><div class='add'>+	struct work_struct worker;</div><div class='add'>+	struct input_dev *input;</div><div class='add'>+	struct input_dev *mp_input;</div><div class='add'>+</div><div class='add'>+	atomic_t opened;</div><div class='add'>+	atomic_t mp_opened;</div><div class='add'>+	bool plugged;</div><div class='add'>+	bool mp_plugged;</div><div class='add'>+	bool motionp;</div><div class='add'>+	__u8 ext_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wiiext_type {</div><div class='add'>+	WIIEXT_NONE,		/* placeholder */</div><div class='add'>+	WIIEXT_CLASSIC,		/* Nintendo classic controller */</div><div class='add'>+	WIIEXT_NUNCHUCK,	/* Nintendo nunchuck controller */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wiiext_keys {</div><div class='add'>+	WIIEXT_KEY_C,</div><div class='add'>+	WIIEXT_KEY_Z,</div><div class='add'>+	WIIEXT_KEY_A,</div><div class='add'>+	WIIEXT_KEY_B,</div><div class='add'>+	WIIEXT_KEY_X,</div><div class='add'>+	WIIEXT_KEY_Y,</div><div class='add'>+	WIIEXT_KEY_ZL,</div><div class='add'>+	WIIEXT_KEY_ZR,</div><div class='add'>+	WIIEXT_KEY_PLUS,</div><div class='add'>+	WIIEXT_KEY_MINUS,</div><div class='add'>+	WIIEXT_KEY_HOME,</div><div class='add'>+	WIIEXT_KEY_LEFT,</div><div class='add'>+	WIIEXT_KEY_RIGHT,</div><div class='add'>+	WIIEXT_KEY_UP,</div><div class='add'>+	WIIEXT_KEY_DOWN,</div><div class='add'>+	WIIEXT_KEY_LT,</div><div class='add'>+	WIIEXT_KEY_RT,</div><div class='add'>+	WIIEXT_KEY_COUNT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __u16 wiiext_keymap[] = {</div><div class='add'>+	BTN_C,		/* WIIEXT_KEY_C */</div><div class='add'>+	BTN_Z,		/* WIIEXT_KEY_Z */</div><div class='add'>+	BTN_A,		/* WIIEXT_KEY_A */</div><div class='add'>+	BTN_B,		/* WIIEXT_KEY_B */</div><div class='add'>+	BTN_X,		/* WIIEXT_KEY_X */</div><div class='add'>+	BTN_Y,		/* WIIEXT_KEY_Y */</div><div class='add'>+	BTN_TL2,	/* WIIEXT_KEY_ZL */</div><div class='add'>+	BTN_TR2,	/* WIIEXT_KEY_ZR */</div><div class='add'>+	KEY_NEXT,	/* WIIEXT_KEY_PLUS */</div><div class='add'>+	KEY_PREVIOUS,	/* WIIEXT_KEY_MINUS */</div><div class='add'>+	BTN_MODE,	/* WIIEXT_KEY_HOME */</div><div class='add'>+	KEY_LEFT,	/* WIIEXT_KEY_LEFT */</div><div class='add'>+	KEY_RIGHT,	/* WIIEXT_KEY_RIGHT */</div><div class='add'>+	KEY_UP,		/* WIIEXT_KEY_UP */</div><div class='add'>+	KEY_DOWN,	/* WIIEXT_KEY_DOWN */</div><div class='add'>+	BTN_TL,		/* WIIEXT_KEY_LT */</div><div class='add'>+	BTN_TR,		/* WIIEXT_KEY_RT */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* diable all extensions */</div><div class='add'>+static void ext_disable(struct wiimote_ext *ext)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	__u8 wmem = 0x55;</div><div class='add'>+</div><div class='add'>+	if (!wiimote_cmd_acquire(ext-&gt;wdata)) {</div><div class='add'>+		wiimote_cmd_write(ext-&gt;wdata, 0xa400f0, &amp;wmem, sizeof(wmem));</div><div class='add'>+		wiimote_cmd_release(ext-&gt;wdata);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ext-&gt;wdata-&gt;state.lock, flags);</div><div class='add'>+	ext-&gt;motionp = false;</div><div class='add'>+	ext-&gt;ext_type = WIIEXT_NONE;</div><div class='add'>+	wiiproto_req_drm(ext-&gt;wdata, WIIPROTO_REQ_NULL);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ext-&gt;wdata-&gt;state.lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool motionp_read(struct wiimote_ext *ext)</div><div class='add'>+{</div><div class='add'>+	__u8 rmem[2], wmem;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	bool avail = false;</div><div class='add'>+</div><div class='add'>+	if (!atomic_read(&amp;ext-&gt;mp_opened))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (wiimote_cmd_acquire(ext-&gt;wdata))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* initialize motion plus */</div><div class='add'>+	wmem = 0x55;</div><div class='add'>+	ret = wiimote_cmd_write(ext-&gt;wdata, 0xa600f0, &amp;wmem, sizeof(wmem));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* read motion plus ID */</div><div class='add'>+	ret = wiimote_cmd_read(ext-&gt;wdata, 0xa600fe, rmem, 2);</div><div class='add'>+	if (ret == 2 || rmem[1] == 0x5)</div><div class='add'>+		avail = true;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	wiimote_cmd_release(ext-&gt;wdata);</div><div class='add'>+	return avail;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __u8 ext_read(struct wiimote_ext *ext)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	__u8 rmem[2], wmem;</div><div class='add'>+	__u8 type = WIIEXT_NONE;</div><div class='add'>+</div><div class='add'>+	if (!ext-&gt;plugged || !atomic_read(&amp;ext-&gt;opened))</div><div class='add'>+		return WIIEXT_NONE;</div><div class='add'>+</div><div class='add'>+	if (wiimote_cmd_acquire(ext-&gt;wdata))</div><div class='add'>+		return WIIEXT_NONE;</div><div class='add'>+</div><div class='add'>+	/* initialize extension */</div><div class='add'>+	wmem = 0x55;</div><div class='add'>+	ret = wiimote_cmd_write(ext-&gt;wdata, 0xa400f0, &amp;wmem, sizeof(wmem));</div><div class='add'>+	if (!ret) {</div><div class='add'>+		/* disable encryption */</div><div class='add'>+		wmem = 0x0;</div><div class='add'>+		wiimote_cmd_write(ext-&gt;wdata, 0xa400fb, &amp;wmem, sizeof(wmem));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* read extension ID */</div><div class='add'>+	ret = wiimote_cmd_read(ext-&gt;wdata, 0xa400fe, rmem, 2);</div><div class='add'>+	if (ret == 2) {</div><div class='add'>+		if (rmem[0] == 0 &amp;&amp; rmem[1] == 0)</div><div class='add'>+			type = WIIEXT_NUNCHUCK;</div><div class='add'>+		else if (rmem[0] == 0x01 &amp;&amp; rmem[1] == 0x01)</div><div class='add'>+			type = WIIEXT_CLASSIC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wiimote_cmd_release(ext-&gt;wdata);</div><div class='add'>+</div><div class='add'>+	return type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ext_enable(struct wiimote_ext *ext, bool motionp, __u8 ext_type)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	__u8 wmem;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (motionp) {</div><div class='add'>+		if (wiimote_cmd_acquire(ext-&gt;wdata))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		if (ext_type == WIIEXT_CLASSIC)</div><div class='add'>+			wmem = 0x07;</div><div class='add'>+		else if (ext_type == WIIEXT_NUNCHUCK)</div><div class='add'>+			wmem = 0x05;</div><div class='add'>+		else</div><div class='add'>+			wmem = 0x04;</div><div class='add'>+</div><div class='add'>+		ret = wiimote_cmd_write(ext-&gt;wdata, 0xa600fe, &amp;wmem, sizeof(wmem));</div><div class='add'>+		wiimote_cmd_release(ext-&gt;wdata);</div><div class='add'>+		if (ret)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ext-&gt;wdata-&gt;state.lock, flags);</div><div class='add'>+	ext-&gt;motionp = motionp;</div><div class='add'>+	ext-&gt;ext_type = ext_type;</div><div class='add'>+	wiiproto_req_drm(ext-&gt;wdata, WIIPROTO_REQ_NULL);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ext-&gt;wdata-&gt;state.lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wiiext_worker(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct wiimote_ext *ext = container_of(work, struct wiimote_ext,</div><div class='add'>+									worker);</div><div class='add'>+	bool motionp;</div><div class='add'>+	__u8 ext_type;</div><div class='add'>+</div><div class='add'>+	ext_disable(ext);</div><div class='add'>+	motionp = motionp_read(ext);</div><div class='add'>+	ext_type = ext_read(ext);</div><div class='add'>+	ext_enable(ext, motionp, ext_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* schedule work only once, otherwise mark for reschedule */</div><div class='add'>+static void wiiext_schedule(struct wiimote_ext *ext)</div><div class='add'>+{</div><div class='add'>+	queue_work(system_nrt_wq, &amp;ext-&gt;worker);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Reacts on extension port events</div><div class='add'>+ * Whenever the driver gets an event from the wiimote that an extension has been</div><div class='add'>+ * plugged or unplugged, this funtion shall be called. It checks what extensions</div><div class='add'>+ * are connected and initializes and activates them.</div><div class='add'>+ * This can be called in atomic context. The initialization is done in a</div><div class='add'>+ * separate worker thread. The state.lock spinlock must be held by the caller.</div><div class='add'>+ */</div><div class='add'>+void wiiext_event(struct wiimote_data *wdata, bool plugged)</div><div class='add'>+{</div><div class='add'>+	if (!wdata-&gt;ext)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (wdata-&gt;ext-&gt;plugged == plugged)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	wdata-&gt;ext-&gt;plugged = plugged;</div><div class='add'>+</div><div class='add'>+	if (!plugged)</div><div class='add'>+		wdata-&gt;ext-&gt;mp_plugged = false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We need to call wiiext_schedule(wdata-&gt;ext) here, however, the</div><div class='add'>+	 * extension initialization logic is not fully understood and so</div><div class='add'>+	 * automatic initialization is not supported, yet.</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns true if the current DRM mode should contain extension data and false</div><div class='add'>+ * if there is no interest in extension data.</div><div class='add'>+ * All supported extensions send 6 byte extension data so any DRM that contains</div><div class='add'>+ * extension bytes is fine.</div><div class='add'>+ * The caller must hold the state.lock spinlock.</div><div class='add'>+ */</div><div class='add'>+bool wiiext_active(struct wiimote_data *wdata)</div><div class='add'>+{</div><div class='add'>+	if (!wdata-&gt;ext)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return wdata-&gt;ext-&gt;motionp || wdata-&gt;ext-&gt;ext_type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handler_motionp(struct wiimote_ext *ext, const __u8 *payload)</div><div class='add'>+{</div><div class='add'>+	__s32 x, y, z;</div><div class='add'>+	bool plugged;</div><div class='add'>+</div><div class='add'>+	/*        |   8    7    6    5    4    3 |  2  |  1  |</div><div class='add'>+	 *   -----+------------------------------+-----+-----+</div><div class='add'>+	 *    1   |               Yaw Speed &lt;7:0&gt;            |</div><div class='add'>+	 *    2   |              Roll Speed &lt;7:0&gt;            |</div><div class='add'>+	 *    3   |             Pitch Speed &lt;7:0&gt;            |</div><div class='add'>+	 *   -----+------------------------------+-----+-----+</div><div class='add'>+	 *    4   |       Yaw Speed &lt;13:8&gt;       | Yaw |Pitch|</div><div class='add'>+	 *   -----+------------------------------+-----+-----+</div><div class='add'>+	 *    5   |      Roll Speed &lt;13:8&gt;       |Roll | Ext |</div><div class='add'>+	 *   -----+------------------------------+-----+-----+</div><div class='add'>+	 *    6   |     Pitch Speed &lt;13:8&gt;       |  1  |  0  |</div><div class='add'>+	 *   -----+------------------------------+-----+-----+</div><div class='add'>+	 * The single bits Yaw, Roll, Pitch in the lower right corner specify</div><div class='add'>+	 * whether the wiimote is rotating fast (0) or slow (1). Speed for slow</div><div class='add'>+	 * roation is 440 deg/s and for fast rotation 2000 deg/s. To get a</div><div class='add'>+	 * linear scale we multiply by 2000/440 = ~4.5454 which is 18 for fast</div><div class='add'>+	 * and 9 for slow.</div><div class='add'>+	 * If the wiimote is not rotating the sensor reports 2^13 = 8192.</div><div class='add'>+	 * Ext specifies whether an extension is connected to the motionp.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	x = payload[0];</div><div class='add'>+	y = payload[1];</div><div class='add'>+	z = payload[2];</div><div class='add'>+</div><div class='add'>+	x |= (((__u16)payload[3]) &lt;&lt; 6) &amp; 0xff00;</div><div class='add'>+	y |= (((__u16)payload[4]) &lt;&lt; 6) &amp; 0xff00;</div><div class='add'>+	z |= (((__u16)payload[5]) &lt;&lt; 6) &amp; 0xff00;</div><div class='add'>+</div><div class='add'>+	x -= 8192;</div><div class='add'>+	y -= 8192;</div><div class='add'>+	z -= 8192;</div><div class='add'>+</div><div class='add'>+	if (!(payload[3] &amp; 0x02))</div><div class='add'>+		x *= 18;</div><div class='add'>+	else</div><div class='add'>+		x *= 9;</div><div class='add'>+	if (!(payload[4] &amp; 0x02))</div><div class='add'>+		y *= 18;</div><div class='add'>+	else</div><div class='add'>+		y *= 9;</div><div class='add'>+	if (!(payload[3] &amp; 0x01))</div><div class='add'>+		z *= 18;</div><div class='add'>+	else</div><div class='add'>+		z *= 9;</div><div class='add'>+</div><div class='add'>+	input_report_abs(ext-&gt;mp_input, ABS_RX, x);</div><div class='add'>+	input_report_abs(ext-&gt;mp_input, ABS_RY, y);</div><div class='add'>+	input_report_abs(ext-&gt;mp_input, ABS_RZ, z);</div><div class='add'>+	input_sync(ext-&gt;mp_input);</div><div class='add'>+</div><div class='add'>+	plugged = payload[5] &amp; 0x01;</div><div class='add'>+	if (plugged != ext-&gt;mp_plugged)</div><div class='add'>+		ext-&gt;mp_plugged = plugged;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handler_nunchuck(struct wiimote_ext *ext, const __u8 *payload)</div><div class='add'>+{</div><div class='add'>+	__s16 x, y, z, bx, by;</div><div class='add'>+</div><div class='add'>+	/*   Byte |   8    7 |  6    5 |  4    3 |  2 |  1  |</div><div class='add'>+	 *   -----+----------+---------+---------+----+-----+</div><div class='add'>+	 *    1   |              Button X &lt;7:0&gt;             |</div><div class='add'>+	 *    2   |              Button Y &lt;7:0&gt;             |</div><div class='add'>+	 *   -----+----------+---------+---------+----+-----+</div><div class='add'>+	 *    3   |               Speed X &lt;9:2&gt;             |</div><div class='add'>+	 *    4   |               Speed Y &lt;9:2&gt;             |</div><div class='add'>+	 *    5   |               Speed Z &lt;9:2&gt;             |</div><div class='add'>+	 *   -----+----------+---------+---------+----+-----+</div><div class='add'>+	 *    6   | Z &lt;1:0&gt;  | Y &lt;1:0&gt; | X &lt;1:0&gt; | BC | BZ  |</div><div class='add'>+	 *   -----+----------+---------+---------+----+-----+</div><div class='add'>+	 * Button X/Y is the analog stick. Speed X, Y and Z are the</div><div class='add'>+	 * accelerometer data in the same format as the wiimote's accelerometer.</div><div class='add'>+	 * The 6th byte contains the LSBs of the accelerometer data.</div><div class='add'>+	 * BC and BZ are the C and Z buttons: 0 means pressed</div><div class='add'>+	 *</div><div class='add'>+	 * If reported interleaved with motionp, then the layout changes. The</div><div class='add'>+	 * 5th and 6th byte changes to:</div><div class='add'>+	 *   -----+-----------------------------------+-----+</div><div class='add'>+	 *    5   |            Speed Z &lt;9:3&gt;          | EXT |</div><div class='add'>+	 *   -----+--------+-----+-----+----+----+----+-----+</div><div class='add'>+	 *    6   |Z &lt;2:1&gt; |Y &lt;1&gt;|X &lt;1&gt;| BC | BZ | 0  |  0  |</div><div class='add'>+	 *   -----+--------+-----+-----+----+----+----+-----+</div><div class='add'>+	 * All three accelerometer values lose their LSB. The other data is</div><div class='add'>+	 * still available but slightly moved.</div><div class='add'>+	 *</div><div class='add'>+	 * Center data for button values is 128. Center value for accelerometer</div><div class='add'>+	 * values it 512 / 0x200</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	bx = payload[0];</div><div class='add'>+	by = payload[1];</div><div class='add'>+	bx -= 128;</div><div class='add'>+	by -= 128;</div><div class='add'>+</div><div class='add'>+	x = payload[2] &lt;&lt; 2;</div><div class='add'>+	y = payload[3] &lt;&lt; 2;</div><div class='add'>+	z = payload[4] &lt;&lt; 2;</div><div class='add'>+</div><div class='add'>+	if (ext-&gt;motionp) {</div><div class='add'>+		x |= (payload[5] &gt;&gt; 3) &amp; 0x02;</div><div class='add'>+		y |= (payload[5] &gt;&gt; 4) &amp; 0x02;</div><div class='add'>+		z &amp;= ~0x4;</div><div class='add'>+		z |= (payload[5] &gt;&gt; 5) &amp; 0x06;</div><div class='add'>+	} else {</div><div class='add'>+		x |= (payload[5] &gt;&gt; 2) &amp; 0x03;</div><div class='add'>+		y |= (payload[5] &gt;&gt; 4) &amp; 0x03;</div><div class='add'>+		z |= (payload[5] &gt;&gt; 6) &amp; 0x03;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	x -= 0x200;</div><div class='add'>+	y -= 0x200;</div><div class='add'>+	z -= 0x200;</div><div class='add'>+</div><div class='add'>+	input_report_abs(ext-&gt;input, ABS_HAT0X, bx);</div><div class='add'>+	input_report_abs(ext-&gt;input, ABS_HAT0Y, by);</div><div class='add'>+</div><div class='add'>+	input_report_abs(ext-&gt;input, ABS_RX, x);</div><div class='add'>+	input_report_abs(ext-&gt;input, ABS_RY, y);</div><div class='add'>+	input_report_abs(ext-&gt;input, ABS_RZ, z);</div><div class='add'>+</div><div class='add'>+	if (ext-&gt;motionp) {</div><div class='add'>+		input_report_key(ext-&gt;input,</div><div class='add'>+			wiiext_keymap[WIIEXT_KEY_Z], !!(payload[5] &amp; 0x04));</div><div class='add'>+		input_report_key(ext-&gt;input,</div><div class='add'>+			wiiext_keymap[WIIEXT_KEY_C], !!(payload[5] &amp; 0x08));</div><div class='add'>+	} else {</div><div class='add'>+		input_report_key(ext-&gt;input,</div><div class='add'>+			wiiext_keymap[WIIEXT_KEY_Z], !!(payload[5] &amp; 0x01));</div><div class='add'>+		input_report_key(ext-&gt;input,</div><div class='add'>+			wiiext_keymap[WIIEXT_KEY_C], !!(payload[5] &amp; 0x02));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_sync(ext-&gt;input);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handler_classic(struct wiimote_ext *ext, const __u8 *payload)</div><div class='add'>+{</div><div class='add'>+	__s8 rx, ry, lx, ly, lt, rt;</div><div class='add'>+</div><div class='add'>+	/*   Byte |  8  |  7  |  6  |  5  |  4  |  3  |  2  |  1  |</div><div class='add'>+	 *   -----+-----+-----+-----+-----+-----+-----+-----+-----+</div><div class='add'>+	 *    1   | RX &lt;5:4&gt;  |              LX &lt;5:0&gt;             |</div><div class='add'>+	 *    2   | RX &lt;3:2&gt;  |              LY &lt;5:0&gt;             |</div><div class='add'>+	 *   -----+-----+-----+-----+-----------------------------+</div><div class='add'>+	 *    3   |RX&lt;1&gt;| LT &lt;5:4&gt;  |         RY &lt;5:1&gt;            |</div><div class='add'>+	 *   -----+-----+-----------+-----------------------------+</div><div class='add'>+	 *    4   |     LT &lt;3:1&gt;    |         RT &lt;5:1&gt;            |</div><div class='add'>+	 *   -----+-----+-----+-----+-----+-----+-----+-----+-----+</div><div class='add'>+	 *    5   | BDR | BDD | BLT | B-  | BH  | B+  | BRT |  1  |</div><div class='add'>+	 *   -----+-----+-----+-----+-----+-----+-----+-----+-----+</div><div class='add'>+	 *    6   | BZL | BB  | BY  | BA  | BX  | BZR | BDL | BDU |</div><div class='add'>+	 *   -----+-----+-----+-----+-----+-----+-----+-----+-----+</div><div class='add'>+	 * All buttons are 0 if pressed</div><div class='add'>+	 * RX and RY are right analog stick</div><div class='add'>+	 * LX and LY are left analog stick</div><div class='add'>+	 * LT is left trigger, RT is right trigger</div><div class='add'>+	 * BLT is 0 if left trigger is fully pressed</div><div class='add'>+	 * BRT is 0 if right trigger is fully pressed</div><div class='add'>+	 * BDR, BDD, BDL, BDU form the D-Pad with right, down, left, up buttons</div><div class='add'>+	 * BZL is left Z button and BZR is right Z button</div><div class='add'>+	 * B-, BH, B+ are +, HOME and - buttons</div><div class='add'>+	 * BB, BY, BA, BX are A, B, X, Y buttons</div><div class='add'>+	 * LSB of RX, RY, LT, and RT are not transmitted and always 0.</div><div class='add'>+	 *</div><div class='add'>+	 * With motionp enabled it changes slightly to this:</div><div class='add'>+	 *   Byte |  8  |  7  |  6  |  5  |  4  |  3  |  2  |  1  |</div><div class='add'>+	 *   -----+-----+-----+-----+-----+-----+-----+-----+-----+</div><div class='add'>+	 *    1   | RX &lt;4:3&gt;  |          LX &lt;5:1&gt;           | BDU |</div><div class='add'>+	 *    2   | RX &lt;2:1&gt;  |          LY &lt;5:1&gt;           | BDL |</div><div class='add'>+	 *   -----+-----+-----+-----+-----------------------+-----+</div><div class='add'>+	 *    3   |RX&lt;0&gt;| LT &lt;4:3&gt;  |         RY &lt;4:0&gt;            |</div><div class='add'>+	 *   -----+-----+-----------+-----------------------------+</div><div class='add'>+	 *    4   |     LT &lt;2:0&gt;    |         RT &lt;4:0&gt;            |</div><div class='add'>+	 *   -----+-----+-----+-----+-----+-----+-----+-----+-----+</div><div class='add'>+	 *    5   | BDR | BDD | BLT | B-  | BH  | B+  | BRT | EXT |</div><div class='add'>+	 *   -----+-----+-----+-----+-----+-----+-----+-----+-----+</div><div class='add'>+	 *    6   | BZL | BB  | BY  | BA  | BX  | BZR |  0  |  0  |</div><div class='add'>+	 *   -----+-----+-----+-----+-----+-----+-----+-----+-----+</div><div class='add'>+	 * Only the LSBs of LX and LY are lost. BDU and BDL are moved, the rest</div><div class='add'>+	 * is the same as before.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (ext-&gt;motionp) {</div><div class='add'>+		lx = payload[0] &amp; 0x3e;</div><div class='add'>+		ly = payload[0] &amp; 0x3e;</div><div class='add'>+	} else {</div><div class='add'>+		lx = payload[0] &amp; 0x3f;</div><div class='add'>+		ly = payload[0] &amp; 0x3f;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx = (payload[0] &gt;&gt; 3) &amp; 0x14;</div><div class='add'>+	rx |= (payload[1] &gt;&gt; 5) &amp; 0x06;</div><div class='add'>+	rx |= (payload[2] &gt;&gt; 7) &amp; 0x01;</div><div class='add'>+	ry = payload[2] &amp; 0x1f;</div><div class='add'>+</div><div class='add'>+	rt = payload[3] &amp; 0x1f;</div><div class='add'>+	lt = (payload[2] &gt;&gt; 2) &amp; 0x18;</div><div class='add'>+	lt |= (payload[3] &gt;&gt; 5) &amp; 0x07;</div><div class='add'>+</div><div class='add'>+	rx &lt;&lt;= 1;</div><div class='add'>+	ry &lt;&lt;= 1;</div><div class='add'>+	rt &lt;&lt;= 1;</div><div class='add'>+	lt &lt;&lt;= 1;</div><div class='add'>+</div><div class='add'>+	input_report_abs(ext-&gt;input, ABS_HAT1X, lx - 0x20);</div><div class='add'>+	input_report_abs(ext-&gt;input, ABS_HAT1Y, ly - 0x20);</div><div class='add'>+	input_report_abs(ext-&gt;input, ABS_HAT2X, rx - 0x20);</div><div class='add'>+	input_report_abs(ext-&gt;input, ABS_HAT2Y, ry - 0x20);</div><div class='add'>+	input_report_abs(ext-&gt;input, ABS_HAT3X, rt - 0x20);</div><div class='add'>+	input_report_abs(ext-&gt;input, ABS_HAT3Y, lt - 0x20);</div><div class='add'>+</div><div class='add'>+	input_report_key(ext-&gt;input, wiiext_keymap[WIIEXT_KEY_RIGHT],</div><div class='add'>+							!!(payload[4] &amp; 0x80));</div><div class='add'>+	input_report_key(ext-&gt;input, wiiext_keymap[WIIEXT_KEY_DOWN],</div><div class='add'>+							!!(payload[4] &amp; 0x40));</div><div class='add'>+	input_report_key(ext-&gt;input, wiiext_keymap[WIIEXT_KEY_LT],</div><div class='add'>+							!!(payload[4] &amp; 0x20));</div><div class='add'>+	input_report_key(ext-&gt;input, wiiext_keymap[WIIEXT_KEY_MINUS],</div><div class='add'>+							!!(payload[4] &amp; 0x10));</div><div class='add'>+	input_report_key(ext-&gt;input, wiiext_keymap[WIIEXT_KEY_HOME],</div><div class='add'>+							!!(payload[4] &amp; 0x08));</div><div class='add'>+	input_report_key(ext-&gt;input, wiiext_keymap[WIIEXT_KEY_PLUS],</div><div class='add'>+							!!(payload[4] &amp; 0x04));</div><div class='add'>+	input_report_key(ext-&gt;input, wiiext_keymap[WIIEXT_KEY_RT],</div><div class='add'>+							!!(payload[4] &amp; 0x02));</div><div class='add'>+	input_report_key(ext-&gt;input, wiiext_keymap[WIIEXT_KEY_ZL],</div><div class='add'>+							!!(payload[5] &amp; 0x80));</div><div class='add'>+	input_report_key(ext-&gt;input, wiiext_keymap[WIIEXT_KEY_B],</div><div class='add'>+							!!(payload[5] &amp; 0x40));</div><div class='add'>+	input_report_key(ext-&gt;input, wiiext_keymap[WIIEXT_KEY_Y],</div><div class='add'>+							!!(payload[5] &amp; 0x20));</div><div class='add'>+	input_report_key(ext-&gt;input, wiiext_keymap[WIIEXT_KEY_A],</div><div class='add'>+							!!(payload[5] &amp; 0x10));</div><div class='add'>+	input_report_key(ext-&gt;input, wiiext_keymap[WIIEXT_KEY_X],</div><div class='add'>+							!!(payload[5] &amp; 0x08));</div><div class='add'>+	input_report_key(ext-&gt;input, wiiext_keymap[WIIEXT_KEY_ZR],</div><div class='add'>+							!!(payload[5] &amp; 0x04));</div><div class='add'>+</div><div class='add'>+	if (ext-&gt;motionp) {</div><div class='add'>+		input_report_key(ext-&gt;input, wiiext_keymap[WIIEXT_KEY_UP],</div><div class='add'>+							!!(payload[0] &amp; 0x01));</div><div class='add'>+		input_report_key(ext-&gt;input, wiiext_keymap[WIIEXT_KEY_LEFT],</div><div class='add'>+							!!(payload[1] &amp; 0x01));</div><div class='add'>+	} else {</div><div class='add'>+		input_report_key(ext-&gt;input, wiiext_keymap[WIIEXT_KEY_UP],</div><div class='add'>+							!!(payload[5] &amp; 0x01));</div><div class='add'>+		input_report_key(ext-&gt;input, wiiext_keymap[WIIEXT_KEY_LEFT],</div><div class='add'>+							!!(payload[5] &amp; 0x02));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_sync(ext-&gt;input);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* call this with state.lock spinlock held */</div><div class='add'>+void wiiext_handle(struct wiimote_data *wdata, const __u8 *payload)</div><div class='add'>+{</div><div class='add'>+	struct wiimote_ext *ext = wdata-&gt;ext;</div><div class='add'>+</div><div class='add'>+	if (!ext)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ext-&gt;motionp &amp;&amp; (payload[5] &amp; 0x02)) {</div><div class='add'>+		handler_motionp(ext, payload);</div><div class='add'>+	} else if (ext-&gt;ext_type == WIIEXT_NUNCHUCK) {</div><div class='add'>+		handler_nunchuck(ext, payload);</div><div class='add'>+	} else if (ext-&gt;ext_type == WIIEXT_CLASSIC) {</div><div class='add'>+		handler_classic(ext, payload);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t wiiext_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+								char *buf)</div><div class='add'>+{</div><div class='add'>+	struct wiimote_data *wdata = dev_to_wii(dev);</div><div class='add'>+	__u8 type = WIIEXT_NONE;</div><div class='add'>+	bool motionp = false;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;wdata-&gt;state.lock, flags);</div><div class='add'>+	if (wdata-&gt;ext) {</div><div class='add'>+		motionp = wdata-&gt;ext-&gt;motionp;</div><div class='add'>+		type = wdata-&gt;ext-&gt;ext_type;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;wdata-&gt;state.lock, flags);</div><div class='add'>+</div><div class='add'>+	if (type == WIIEXT_NUNCHUCK) {</div><div class='add'>+		if (motionp)</div><div class='add'>+			return sprintf(buf, "motionp+nunchuck\n");</div><div class='add'>+		else</div><div class='add'>+			return sprintf(buf, "nunchuck\n");</div><div class='add'>+	} else if (type == WIIEXT_CLASSIC) {</div><div class='add'>+		if (motionp)</div><div class='add'>+			return sprintf(buf, "motionp+classic\n");</div><div class='add'>+		else</div><div class='add'>+			return sprintf(buf, "classic\n");</div><div class='add'>+	} else {</div><div class='add'>+		if (motionp)</div><div class='add'>+			return sprintf(buf, "motionp\n");</div><div class='add'>+		else</div><div class='add'>+			return sprintf(buf, "none\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(extension, S_IRUGO, wiiext_show, NULL);</div><div class='add'>+</div><div class='add'>+static int wiiext_input_open(struct input_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct wiimote_ext *ext = input_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_open(ext-&gt;wdata-&gt;hdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;ext-&gt;opened);</div><div class='add'>+	wiiext_schedule(ext);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wiiext_input_close(struct input_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct wiimote_ext *ext = input_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	atomic_dec(&amp;ext-&gt;opened);</div><div class='add'>+	wiiext_schedule(ext);</div><div class='add'>+	hid_hw_close(ext-&gt;wdata-&gt;hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wiiext_mp_open(struct input_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct wiimote_ext *ext = input_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = hid_hw_open(ext-&gt;wdata-&gt;hdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;ext-&gt;mp_opened);</div><div class='add'>+	wiiext_schedule(ext);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wiiext_mp_close(struct input_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct wiimote_ext *ext = input_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	atomic_dec(&amp;ext-&gt;mp_opened);</div><div class='add'>+	wiiext_schedule(ext);</div><div class='add'>+	hid_hw_close(ext-&gt;wdata-&gt;hdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Initializes the extension driver of a wiimote */</div><div class='add'>+int wiiext_init(struct wiimote_data *wdata)</div><div class='add'>+{</div><div class='add'>+	struct wiimote_ext *ext;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ext = kzalloc(sizeof(*ext), GFP_KERNEL);</div><div class='add'>+	if (!ext)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ext-&gt;wdata = wdata;</div><div class='add'>+	INIT_WORK(&amp;ext-&gt;worker, wiiext_worker);</div><div class='add'>+</div><div class='add'>+	ext-&gt;input = input_allocate_device();</div><div class='add'>+	if (!ext-&gt;input) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_input;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_set_drvdata(ext-&gt;input, ext);</div><div class='add'>+	ext-&gt;input-&gt;open = wiiext_input_open;</div><div class='add'>+	ext-&gt;input-&gt;close = wiiext_input_close;</div><div class='add'>+	ext-&gt;input-&gt;dev.parent = &amp;wdata-&gt;hdev-&gt;dev;</div><div class='add'>+	ext-&gt;input-&gt;id.bustype = wdata-&gt;hdev-&gt;bus;</div><div class='add'>+	ext-&gt;input-&gt;id.vendor = wdata-&gt;hdev-&gt;vendor;</div><div class='add'>+	ext-&gt;input-&gt;id.product = wdata-&gt;hdev-&gt;product;</div><div class='add'>+	ext-&gt;input-&gt;id.version = wdata-&gt;hdev-&gt;version;</div><div class='add'>+	ext-&gt;input-&gt;name = WIIMOTE_NAME " Extension";</div><div class='add'>+</div><div class='add'>+	set_bit(EV_KEY, ext-&gt;input-&gt;evbit);</div><div class='add'>+	for (i = 0; i &lt; WIIEXT_KEY_COUNT; ++i)</div><div class='add'>+		set_bit(wiiext_keymap[i], ext-&gt;input-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	set_bit(EV_ABS, ext-&gt;input-&gt;evbit);</div><div class='add'>+	set_bit(ABS_HAT0X, ext-&gt;input-&gt;absbit);</div><div class='add'>+	set_bit(ABS_HAT0Y, ext-&gt;input-&gt;absbit);</div><div class='add'>+	set_bit(ABS_HAT1X, ext-&gt;input-&gt;absbit);</div><div class='add'>+	set_bit(ABS_HAT1Y, ext-&gt;input-&gt;absbit);</div><div class='add'>+	set_bit(ABS_HAT2X, ext-&gt;input-&gt;absbit);</div><div class='add'>+	set_bit(ABS_HAT2Y, ext-&gt;input-&gt;absbit);</div><div class='add'>+	set_bit(ABS_HAT3X, ext-&gt;input-&gt;absbit);</div><div class='add'>+	set_bit(ABS_HAT3Y, ext-&gt;input-&gt;absbit);</div><div class='add'>+	input_set_abs_params(ext-&gt;input, ABS_HAT0X, -120, 120, 2, 4);</div><div class='add'>+	input_set_abs_params(ext-&gt;input, ABS_HAT0Y, -120, 120, 2, 4);</div><div class='add'>+	input_set_abs_params(ext-&gt;input, ABS_HAT1X, -30, 30, 1, 1);</div><div class='add'>+	input_set_abs_params(ext-&gt;input, ABS_HAT1Y, -30, 30, 1, 1);</div><div class='add'>+	input_set_abs_params(ext-&gt;input, ABS_HAT2X, -30, 30, 1, 1);</div><div class='add'>+	input_set_abs_params(ext-&gt;input, ABS_HAT2Y, -30, 30, 1, 1);</div><div class='add'>+	input_set_abs_params(ext-&gt;input, ABS_HAT3X, -30, 30, 1, 1);</div><div class='add'>+	input_set_abs_params(ext-&gt;input, ABS_HAT3Y, -30, 30, 1, 1);</div><div class='add'>+	set_bit(ABS_RX, ext-&gt;input-&gt;absbit);</div><div class='add'>+	set_bit(ABS_RY, ext-&gt;input-&gt;absbit);</div><div class='add'>+	set_bit(ABS_RZ, ext-&gt;input-&gt;absbit);</div><div class='add'>+	input_set_abs_params(ext-&gt;input, ABS_RX, -500, 500, 2, 4);</div><div class='add'>+	input_set_abs_params(ext-&gt;input, ABS_RY, -500, 500, 2, 4);</div><div class='add'>+	input_set_abs_params(ext-&gt;input, ABS_RZ, -500, 500, 2, 4);</div><div class='add'>+</div><div class='add'>+	ret = input_register_device(ext-&gt;input);</div><div class='add'>+	if (ret) {</div><div class='add'>+		input_free_device(ext-&gt;input);</div><div class='add'>+		goto err_input;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ext-&gt;mp_input = input_allocate_device();</div><div class='add'>+	if (!ext-&gt;mp_input) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_mp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_set_drvdata(ext-&gt;mp_input, ext);</div><div class='add'>+	ext-&gt;mp_input-&gt;open = wiiext_mp_open;</div><div class='add'>+	ext-&gt;mp_input-&gt;close = wiiext_mp_close;</div><div class='add'>+	ext-&gt;mp_input-&gt;dev.parent = &amp;wdata-&gt;hdev-&gt;dev;</div><div class='add'>+	ext-&gt;mp_input-&gt;id.bustype = wdata-&gt;hdev-&gt;bus;</div><div class='add'>+	ext-&gt;mp_input-&gt;id.vendor = wdata-&gt;hdev-&gt;vendor;</div><div class='add'>+	ext-&gt;mp_input-&gt;id.product = wdata-&gt;hdev-&gt;product;</div><div class='add'>+	ext-&gt;mp_input-&gt;id.version = wdata-&gt;hdev-&gt;version;</div><div class='add'>+	ext-&gt;mp_input-&gt;name = WIIMOTE_NAME " Motion+";</div><div class='add'>+</div><div class='add'>+	set_bit(EV_ABS, ext-&gt;mp_input-&gt;evbit);</div><div class='add'>+	set_bit(ABS_RX, ext-&gt;mp_input-&gt;absbit);</div><div class='add'>+	set_bit(ABS_RY, ext-&gt;mp_input-&gt;absbit);</div><div class='add'>+	set_bit(ABS_RZ, ext-&gt;mp_input-&gt;absbit);</div><div class='add'>+	input_set_abs_params(ext-&gt;mp_input, ABS_RX, -160000, 160000, 4, 8);</div><div class='add'>+	input_set_abs_params(ext-&gt;mp_input, ABS_RY, -160000, 160000, 4, 8);</div><div class='add'>+	input_set_abs_params(ext-&gt;mp_input, ABS_RZ, -160000, 160000, 4, 8);</div><div class='add'>+</div><div class='add'>+	ret = input_register_device(ext-&gt;mp_input);</div><div class='add'>+	if (ret) {</div><div class='add'>+		input_free_device(ext-&gt;mp_input);</div><div class='add'>+		goto err_mp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = device_create_file(&amp;wdata-&gt;hdev-&gt;dev, &amp;dev_attr_extension);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_dev;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;wdata-&gt;state.lock, flags);</div><div class='add'>+	wdata-&gt;ext = ext;</div><div class='add'>+	spin_unlock_irqrestore(&amp;wdata-&gt;state.lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_dev:</div><div class='add'>+	input_unregister_device(ext-&gt;mp_input);</div><div class='add'>+err_mp:</div><div class='add'>+	input_unregister_device(ext-&gt;input);</div><div class='add'>+err_input:</div><div class='add'>+	kfree(ext);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Deinitializes the extension driver of a wiimote */</div><div class='add'>+void wiiext_deinit(struct wiimote_data *wdata)</div><div class='add'>+{</div><div class='add'>+	struct wiimote_ext *ext = wdata-&gt;ext;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!ext)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We first unset wdata-&gt;ext to avoid further input from the wiimote</div><div class='add'>+	 * core. The worker thread does not access this pointer so it is not</div><div class='add'>+	 * affected by this.</div><div class='add'>+	 * We kill the worker after this so it does not get respawned during</div><div class='add'>+	 * deinitialization.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;wdata-&gt;state.lock, flags);</div><div class='add'>+	wdata-&gt;ext = NULL;</div><div class='add'>+	spin_unlock_irqrestore(&amp;wdata-&gt;state.lock, flags);</div><div class='add'>+</div><div class='add'>+	device_remove_file(&amp;wdata-&gt;hdev-&gt;dev, &amp;dev_attr_extension);</div><div class='add'>+	input_unregister_device(ext-&gt;mp_input);</div><div class='add'>+	input_unregister_device(ext-&gt;input);</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;ext-&gt;worker);</div><div class='add'>+	kfree(ext);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/hid/hid-wiimote.h b/drivers/hid/hid-wiimote.h<br/>new file mode 100644<br/>index 000000000000..c81dbeb086c5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/hid-wiimote.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/hid-wiimote.h</a></div><div class='hunk'>@@ -0,0 +1,208 @@</div><div class='add'>+#ifndef __HID_WIIMOTE_H</div><div class='add'>+#define __HID_WIIMOTE_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HID driver for Nintendo Wiimote devices</div><div class='add'>+ * Copyright (c) 2011 David Herrmann</div><div class='add'>+ */</div><div class='add'>+</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/completion.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/hid.h&gt;</div><div class='add'>+#include &lt;linux/input.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/power_supply.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+</div><div class='add'>+#define WIIMOTE_NAME "Nintendo Wii Remote"</div><div class='add'>+#define WIIMOTE_BUFSIZE 32</div><div class='add'>+</div><div class='add'>+#define WIIPROTO_FLAG_LED1		0x01</div><div class='add'>+#define WIIPROTO_FLAG_LED2		0x02</div><div class='add'>+#define WIIPROTO_FLAG_LED3		0x04</div><div class='add'>+#define WIIPROTO_FLAG_LED4		0x08</div><div class='add'>+#define WIIPROTO_FLAG_RUMBLE		0x10</div><div class='add'>+#define WIIPROTO_FLAG_ACCEL		0x20</div><div class='add'>+#define WIIPROTO_FLAG_IR_BASIC		0x40</div><div class='add'>+#define WIIPROTO_FLAG_IR_EXT		0x80</div><div class='add'>+#define WIIPROTO_FLAG_IR_FULL		0xc0 /* IR_BASIC | IR_EXT */</div><div class='add'>+#define WIIPROTO_FLAGS_LEDS (WIIPROTO_FLAG_LED1 | WIIPROTO_FLAG_LED2 | \</div><div class='add'>+					WIIPROTO_FLAG_LED3 | WIIPROTO_FLAG_LED4)</div><div class='add'>+#define WIIPROTO_FLAGS_IR (WIIPROTO_FLAG_IR_BASIC | WIIPROTO_FLAG_IR_EXT | \</div><div class='add'>+							WIIPROTO_FLAG_IR_FULL)</div><div class='add'>+</div><div class='add'>+/* return flag for led \num */</div><div class='add'>+#define WIIPROTO_FLAG_LED(num) (WIIPROTO_FLAG_LED1 &lt;&lt; (num - 1))</div><div class='add'>+</div><div class='add'>+struct wiimote_buf {</div><div class='add'>+	__u8 data[HID_MAX_BUFFER_SIZE];</div><div class='add'>+	size_t size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wiimote_state {</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	__u8 flags;</div><div class='add'>+	__u8 accel_split[2];</div><div class='add'>+	__u8 drm;</div><div class='add'>+</div><div class='add'>+	/* synchronous cmd requests */</div><div class='add'>+	struct mutex sync;</div><div class='add'>+	struct completion ready;</div><div class='add'>+	int cmd;</div><div class='add'>+	__u32 opt;</div><div class='add'>+</div><div class='add'>+	/* results of synchronous requests */</div><div class='add'>+	__u8 cmd_battery;</div><div class='add'>+	__u8 cmd_err;</div><div class='add'>+	__u8 *cmd_read_buf;</div><div class='add'>+	__u8 cmd_read_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wiimote_data {</div><div class='add'>+	struct hid_device *hdev;</div><div class='add'>+	struct input_dev *input;</div><div class='add'>+	struct led_classdev *leds[4];</div><div class='add'>+	struct input_dev *accel;</div><div class='add'>+	struct input_dev *ir;</div><div class='add'>+	struct power_supply battery;</div><div class='add'>+	struct wiimote_ext *ext;</div><div class='add'>+	struct wiimote_debug *debug;</div><div class='add'>+</div><div class='add'>+	spinlock_t qlock;</div><div class='add'>+	__u8 head;</div><div class='add'>+	__u8 tail;</div><div class='add'>+	struct wiimote_buf outq[WIIMOTE_BUFSIZE];</div><div class='add'>+	struct work_struct worker;</div><div class='add'>+</div><div class='add'>+	struct wiimote_state state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wiiproto_reqs {</div><div class='add'>+	WIIPROTO_REQ_NULL = 0x0,</div><div class='add'>+	WIIPROTO_REQ_RUMBLE = 0x10,</div><div class='add'>+	WIIPROTO_REQ_LED = 0x11,</div><div class='add'>+	WIIPROTO_REQ_DRM = 0x12,</div><div class='add'>+	WIIPROTO_REQ_IR1 = 0x13,</div><div class='add'>+	WIIPROTO_REQ_SREQ = 0x15,</div><div class='add'>+	WIIPROTO_REQ_WMEM = 0x16,</div><div class='add'>+	WIIPROTO_REQ_RMEM = 0x17,</div><div class='add'>+	WIIPROTO_REQ_IR2 = 0x1a,</div><div class='add'>+	WIIPROTO_REQ_STATUS = 0x20,</div><div class='add'>+	WIIPROTO_REQ_DATA = 0x21,</div><div class='add'>+	WIIPROTO_REQ_RETURN = 0x22,</div><div class='add'>+	WIIPROTO_REQ_DRM_K = 0x30,</div><div class='add'>+	WIIPROTO_REQ_DRM_KA = 0x31,</div><div class='add'>+	WIIPROTO_REQ_DRM_KE = 0x32,</div><div class='add'>+	WIIPROTO_REQ_DRM_KAI = 0x33,</div><div class='add'>+	WIIPROTO_REQ_DRM_KEE = 0x34,</div><div class='add'>+	WIIPROTO_REQ_DRM_KAE = 0x35,</div><div class='add'>+	WIIPROTO_REQ_DRM_KIE = 0x36,</div><div class='add'>+	WIIPROTO_REQ_DRM_KAIE = 0x37,</div><div class='add'>+	WIIPROTO_REQ_DRM_E = 0x3d,</div><div class='add'>+	WIIPROTO_REQ_DRM_SKAI1 = 0x3e,</div><div class='add'>+	WIIPROTO_REQ_DRM_SKAI2 = 0x3f,</div><div class='add'>+	WIIPROTO_REQ_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define dev_to_wii(pdev) hid_get_drvdata(container_of(pdev, struct hid_device, \</div><div class='add'>+									dev))</div><div class='add'>+</div><div class='add'>+extern void wiiproto_req_drm(struct wiimote_data *wdata, __u8 drm);</div><div class='add'>+extern int wiimote_cmd_write(struct wiimote_data *wdata, __u32 offset,</div><div class='add'>+						const __u8 *wmem, __u8 size);</div><div class='add'>+extern ssize_t wiimote_cmd_read(struct wiimote_data *wdata, __u32 offset,</div><div class='add'>+							__u8 *rmem, __u8 size);</div><div class='add'>+</div><div class='add'>+#define wiiproto_req_rreg(wdata, os, sz) \</div><div class='add'>+				wiiproto_req_rmem((wdata), false, (os), (sz))</div><div class='add'>+#define wiiproto_req_reeprom(wdata, os, sz) \</div><div class='add'>+				wiiproto_req_rmem((wdata), true, (os), (sz))</div><div class='add'>+extern void wiiproto_req_rmem(struct wiimote_data *wdata, bool eeprom,</div><div class='add'>+						__u32 offset, __u16 size);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HID_WIIMOTE_EXT</div><div class='add'>+</div><div class='add'>+extern int wiiext_init(struct wiimote_data *wdata);</div><div class='add'>+extern void wiiext_deinit(struct wiimote_data *wdata);</div><div class='add'>+extern void wiiext_event(struct wiimote_data *wdata, bool plugged);</div><div class='add'>+extern bool wiiext_active(struct wiimote_data *wdata);</div><div class='add'>+extern void wiiext_handle(struct wiimote_data *wdata, const __u8 *payload);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline int wiiext_init(void *u) { return 0; }</div><div class='add'>+static inline void wiiext_deinit(void *u) { }</div><div class='add'>+static inline void wiiext_event(void *u, bool p) { }</div><div class='add'>+static inline bool wiiext_active(void *u) { return false; }</div><div class='add'>+static inline void wiiext_handle(void *u, const __u8 *p) { }</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='add'>+</div><div class='add'>+extern int wiidebug_init(struct wiimote_data *wdata);</div><div class='add'>+extern void wiidebug_deinit(struct wiimote_data *wdata);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline int wiidebug_init(void *u) { return 0; }</div><div class='add'>+static inline void wiidebug_deinit(void *u) { }</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* requires the state.lock spinlock to be held */</div><div class='add'>+static inline bool wiimote_cmd_pending(struct wiimote_data *wdata, int cmd,</div><div class='add'>+								__u32 opt)</div><div class='add'>+{</div><div class='add'>+	return wdata-&gt;state.cmd == cmd &amp;&amp; wdata-&gt;state.opt == opt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* requires the state.lock spinlock to be held */</div><div class='add'>+static inline void wiimote_cmd_complete(struct wiimote_data *wdata)</div><div class='add'>+{</div><div class='add'>+	wdata-&gt;state.cmd = WIIPROTO_REQ_NULL;</div><div class='add'>+	complete(&amp;wdata-&gt;state.ready);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int wiimote_cmd_acquire(struct wiimote_data *wdata)</div><div class='add'>+{</div><div class='add'>+	return mutex_lock_interruptible(&amp;wdata-&gt;state.sync) ? -ERESTARTSYS : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* requires the state.lock spinlock to be held */</div><div class='add'>+static inline void wiimote_cmd_set(struct wiimote_data *wdata, int cmd,</div><div class='add'>+								__u32 opt)</div><div class='add'>+{</div><div class='add'>+	INIT_COMPLETION(wdata-&gt;state.ready);</div><div class='add'>+	wdata-&gt;state.cmd = cmd;</div><div class='add'>+	wdata-&gt;state.opt = opt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void wiimote_cmd_release(struct wiimote_data *wdata)</div><div class='add'>+{</div><div class='add'>+	mutex_unlock(&amp;wdata-&gt;state.sync);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int wiimote_cmd_wait(struct wiimote_data *wdata)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = wait_for_completion_interruptible_timeout(&amp;wdata-&gt;state.ready, HZ);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return -ERESTARTSYS;</div><div class='add'>+	else if (ret == 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c<br/>index b403fcef0b86..5bf91dbad59d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/usbhid/hid-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/usbhid/hid-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/usbhid/hid-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/usbhid/hid-core.c</a></div><div class='hunk'>@@ -197,16 +197,24 @@ static int usbhid_restart_out_queue(struct usbhid_device *usbhid)</div><div class='ctx'> {</div><div class='ctx'> 	struct hid_device *hid = usb_get_intfdata(usbhid-&gt;intf);</div><div class='ctx'> 	int kicked;</div><div class='add'>+	int r;</div><div class='ctx'> </div><div class='ctx'> 	if (!hid)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((kicked = (usbhid-&gt;outhead != usbhid-&gt;outtail))) {</div><div class='ctx'> 		dbg("Kicking head %d tail %d", usbhid-&gt;outhead, usbhid-&gt;outtail);</div><div class='add'>+</div><div class='add'>+		r = usb_autopm_get_interface_async(usbhid-&gt;intf);</div><div class='add'>+		if (r &lt; 0)</div><div class='add'>+			return r;</div><div class='add'>+		/* Asynchronously flush queue. */</div><div class='add'>+		set_bit(HID_OUT_RUNNING, &amp;usbhid-&gt;iofl);</div><div class='ctx'> 		if (hid_submit_out(hid)) {</div><div class='ctx'> 			clear_bit(HID_OUT_RUNNING, &amp;usbhid-&gt;iofl);</div><div class='del'>-			wake_up(&amp;usbhid-&gt;wait);</div><div class='add'>+			usb_autopm_put_interface_async(usbhid-&gt;intf);</div><div class='ctx'> 		}</div><div class='add'>+		wake_up(&amp;usbhid-&gt;wait);</div><div class='ctx'> 	}</div><div class='ctx'> 	return kicked;</div><div class='ctx'> }</div><div class='hunk'>@@ -215,6 +223,7 @@ static int usbhid_restart_ctrl_queue(struct usbhid_device *usbhid)</div><div class='ctx'> {</div><div class='ctx'> 	struct hid_device *hid = usb_get_intfdata(usbhid-&gt;intf);</div><div class='ctx'> 	int kicked;</div><div class='add'>+	int r;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(hid == NULL);</div><div class='ctx'> 	if (!hid)</div><div class='hunk'>@@ -222,10 +231,17 @@ static int usbhid_restart_ctrl_queue(struct usbhid_device *usbhid)</div><div class='ctx'> </div><div class='ctx'> 	if ((kicked = (usbhid-&gt;ctrlhead != usbhid-&gt;ctrltail))) {</div><div class='ctx'> 		dbg("Kicking head %d tail %d", usbhid-&gt;ctrlhead, usbhid-&gt;ctrltail);</div><div class='add'>+</div><div class='add'>+		r = usb_autopm_get_interface_async(usbhid-&gt;intf);</div><div class='add'>+		if (r &lt; 0)</div><div class='add'>+			return r;</div><div class='add'>+		/* Asynchronously flush queue. */</div><div class='add'>+		set_bit(HID_CTRL_RUNNING, &amp;usbhid-&gt;iofl);</div><div class='ctx'> 		if (hid_submit_ctrl(hid)) {</div><div class='ctx'> 			clear_bit(HID_CTRL_RUNNING, &amp;usbhid-&gt;iofl);</div><div class='del'>-			wake_up(&amp;usbhid-&gt;wait);</div><div class='add'>+			usb_autopm_put_interface_async(usbhid-&gt;intf);</div><div class='ctx'> 		}</div><div class='add'>+		wake_up(&amp;usbhid-&gt;wait);</div><div class='ctx'> 	}</div><div class='ctx'> 	return kicked;</div><div class='ctx'> }</div><div class='hunk'>@@ -304,30 +320,21 @@ static int hid_submit_out(struct hid_device *hid)</div><div class='ctx'> 	report = usbhid-&gt;out[usbhid-&gt;outtail].report;</div><div class='ctx'> 	raw_report = usbhid-&gt;out[usbhid-&gt;outtail].raw_report;</div><div class='ctx'> </div><div class='del'>-	r = usb_autopm_get_interface_async(usbhid-&gt;intf);</div><div class='del'>-	if (r &lt; 0)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if the device hasn't been woken, we leave the output</div><div class='del'>-	 * to resume()</div><div class='del'>-	 */</div><div class='del'>-	if (!test_bit(HID_REPORTED_IDLE, &amp;usbhid-&gt;iofl)) {</div><div class='del'>-		usbhid-&gt;urbout-&gt;transfer_buffer_length = ((report-&gt;size - 1) &gt;&gt; 3) + 1 + (report-&gt;id &gt; 0);</div><div class='del'>-		usbhid-&gt;urbout-&gt;dev = hid_to_usb_dev(hid);</div><div class='del'>-		memcpy(usbhid-&gt;outbuf, raw_report, usbhid-&gt;urbout-&gt;transfer_buffer_length);</div><div class='del'>-		kfree(raw_report);</div><div class='add'>+	usbhid-&gt;urbout-&gt;transfer_buffer_length = ((report-&gt;size - 1) &gt;&gt; 3) +</div><div class='add'>+						 1 + (report-&gt;id &gt; 0);</div><div class='add'>+	usbhid-&gt;urbout-&gt;dev = hid_to_usb_dev(hid);</div><div class='add'>+	memcpy(usbhid-&gt;outbuf, raw_report,</div><div class='add'>+	       usbhid-&gt;urbout-&gt;transfer_buffer_length);</div><div class='add'>+	kfree(raw_report);</div><div class='ctx'> </div><div class='del'>-		dbg_hid("submitting out urb\n");</div><div class='add'>+	dbg_hid("submitting out urb\n");</div><div class='ctx'> </div><div class='del'>-		if (usb_submit_urb(usbhid-&gt;urbout, GFP_ATOMIC)) {</div><div class='del'>-			hid_err(hid, "usb_submit_urb(out) failed\n");</div><div class='del'>-			usb_autopm_put_interface_async(usbhid-&gt;intf);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		usbhid-&gt;last_out = jiffies;</div><div class='add'>+	r = usb_submit_urb(usbhid-&gt;urbout, GFP_ATOMIC);</div><div class='add'>+	if (r &lt; 0) {</div><div class='add'>+		hid_err(hid, "usb_submit_urb(out) failed: %d\n", r);</div><div class='add'>+		return r;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	usbhid-&gt;last_out = jiffies;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -343,50 +350,48 @@ static int hid_submit_ctrl(struct hid_device *hid)</div><div class='ctx'> 	raw_report = usbhid-&gt;ctrl[usbhid-&gt;ctrltail].raw_report;</div><div class='ctx'> 	dir = usbhid-&gt;ctrl[usbhid-&gt;ctrltail].dir;</div><div class='ctx'> </div><div class='del'>-	r = usb_autopm_get_interface_async(usbhid-&gt;intf);</div><div class='del'>-	if (r &lt; 0)</div><div class='del'>-		return -1;</div><div class='del'>-	if (!test_bit(HID_REPORTED_IDLE, &amp;usbhid-&gt;iofl)) {</div><div class='del'>-		len = ((report-&gt;size - 1) &gt;&gt; 3) + 1 + (report-&gt;id &gt; 0);</div><div class='del'>-		if (dir == USB_DIR_OUT) {</div><div class='del'>-			usbhid-&gt;urbctrl-&gt;pipe = usb_sndctrlpipe(hid_to_usb_dev(hid), 0);</div><div class='del'>-			usbhid-&gt;urbctrl-&gt;transfer_buffer_length = len;</div><div class='del'>-			memcpy(usbhid-&gt;ctrlbuf, raw_report, len);</div><div class='del'>-			kfree(raw_report);</div><div class='del'>-		} else {</div><div class='del'>-			int maxpacket, padlen;</div><div class='del'>-</div><div class='del'>-			usbhid-&gt;urbctrl-&gt;pipe = usb_rcvctrlpipe(hid_to_usb_dev(hid), 0);</div><div class='del'>-			maxpacket = usb_maxpacket(hid_to_usb_dev(hid), usbhid-&gt;urbctrl-&gt;pipe, 0);</div><div class='del'>-			if (maxpacket &gt; 0) {</div><div class='del'>-				padlen = DIV_ROUND_UP(len, maxpacket);</div><div class='del'>-				padlen *= maxpacket;</div><div class='del'>-				if (padlen &gt; usbhid-&gt;bufsize)</div><div class='del'>-					padlen = usbhid-&gt;bufsize;</div><div class='del'>-			} else</div><div class='del'>-				padlen = 0;</div><div class='del'>-			usbhid-&gt;urbctrl-&gt;transfer_buffer_length = padlen;</div><div class='del'>-		}</div><div class='del'>-		usbhid-&gt;urbctrl-&gt;dev = hid_to_usb_dev(hid);</div><div class='del'>-</div><div class='del'>-		usbhid-&gt;cr-&gt;bRequestType = USB_TYPE_CLASS | USB_RECIP_INTERFACE | dir;</div><div class='del'>-		usbhid-&gt;cr-&gt;bRequest = (dir == USB_DIR_OUT) ? HID_REQ_SET_REPORT : HID_REQ_GET_REPORT;</div><div class='del'>-		usbhid-&gt;cr-&gt;wValue = cpu_to_le16(((report-&gt;type + 1) &lt;&lt; 8) | report-&gt;id);</div><div class='del'>-		usbhid-&gt;cr-&gt;wIndex = cpu_to_le16(usbhid-&gt;ifnum);</div><div class='del'>-		usbhid-&gt;cr-&gt;wLength = cpu_to_le16(len);</div><div class='del'>-</div><div class='del'>-		dbg_hid("submitting ctrl urb: %s wValue=0x%04x wIndex=0x%04x wLength=%u\n",</div><div class='del'>-			usbhid-&gt;cr-&gt;bRequest == HID_REQ_SET_REPORT ? "Set_Report" : "Get_Report",</div><div class='del'>-			usbhid-&gt;cr-&gt;wValue, usbhid-&gt;cr-&gt;wIndex, usbhid-&gt;cr-&gt;wLength);</div><div class='del'>-</div><div class='del'>-		if (usb_submit_urb(usbhid-&gt;urbctrl, GFP_ATOMIC)) {</div><div class='del'>-			usb_autopm_put_interface_async(usbhid-&gt;intf);</div><div class='del'>-			hid_err(hid, "usb_submit_urb(ctrl) failed\n");</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		usbhid-&gt;last_ctrl = jiffies;</div><div class='add'>+	len = ((report-&gt;size - 1) &gt;&gt; 3) + 1 + (report-&gt;id &gt; 0);</div><div class='add'>+	if (dir == USB_DIR_OUT) {</div><div class='add'>+		usbhid-&gt;urbctrl-&gt;pipe = usb_sndctrlpipe(hid_to_usb_dev(hid), 0);</div><div class='add'>+		usbhid-&gt;urbctrl-&gt;transfer_buffer_length = len;</div><div class='add'>+		memcpy(usbhid-&gt;ctrlbuf, raw_report, len);</div><div class='add'>+		kfree(raw_report);</div><div class='add'>+	} else {</div><div class='add'>+		int maxpacket, padlen;</div><div class='add'>+</div><div class='add'>+		usbhid-&gt;urbctrl-&gt;pipe = usb_rcvctrlpipe(hid_to_usb_dev(hid), 0);</div><div class='add'>+		maxpacket = usb_maxpacket(hid_to_usb_dev(hid),</div><div class='add'>+					  usbhid-&gt;urbctrl-&gt;pipe, 0);</div><div class='add'>+		if (maxpacket &gt; 0) {</div><div class='add'>+			padlen = DIV_ROUND_UP(len, maxpacket);</div><div class='add'>+			padlen *= maxpacket;</div><div class='add'>+			if (padlen &gt; usbhid-&gt;bufsize)</div><div class='add'>+				padlen = usbhid-&gt;bufsize;</div><div class='add'>+		} else</div><div class='add'>+			padlen = 0;</div><div class='add'>+		usbhid-&gt;urbctrl-&gt;transfer_buffer_length = padlen;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	usbhid-&gt;urbctrl-&gt;dev = hid_to_usb_dev(hid);</div><div class='add'>+</div><div class='add'>+	usbhid-&gt;cr-&gt;bRequestType = USB_TYPE_CLASS | USB_RECIP_INTERFACE | dir;</div><div class='add'>+	usbhid-&gt;cr-&gt;bRequest = (dir == USB_DIR_OUT) ? HID_REQ_SET_REPORT :</div><div class='add'>+						      HID_REQ_GET_REPORT;</div><div class='add'>+	usbhid-&gt;cr-&gt;wValue = cpu_to_le16(((report-&gt;type + 1) &lt;&lt; 8) |</div><div class='add'>+					 report-&gt;id);</div><div class='add'>+	usbhid-&gt;cr-&gt;wIndex = cpu_to_le16(usbhid-&gt;ifnum);</div><div class='add'>+	usbhid-&gt;cr-&gt;wLength = cpu_to_le16(len);</div><div class='add'>+</div><div class='add'>+	dbg_hid("submitting ctrl urb: %s wValue=0x%04x wIndex=0x%04x wLength=%u\n",</div><div class='add'>+		usbhid-&gt;cr-&gt;bRequest == HID_REQ_SET_REPORT ? "Set_Report" :</div><div class='add'>+							     "Get_Report",</div><div class='add'>+		usbhid-&gt;cr-&gt;wValue, usbhid-&gt;cr-&gt;wIndex, usbhid-&gt;cr-&gt;wLength);</div><div class='add'>+</div><div class='add'>+	r = usb_submit_urb(usbhid-&gt;urbctrl, GFP_ATOMIC);</div><div class='add'>+	if (r &lt; 0) {</div><div class='add'>+		hid_err(hid, "usb_submit_urb(ctrl) failed: %d\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+	usbhid-&gt;last_ctrl = jiffies;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -423,11 +428,8 @@ static void hid_irq_out(struct urb *urb)</div><div class='ctx'> 	else</div><div class='ctx'> 		usbhid-&gt;outtail = (usbhid-&gt;outtail + 1) &amp; (HID_OUTPUT_FIFO_SIZE - 1);</div><div class='ctx'> </div><div class='del'>-	if (usbhid-&gt;outhead != usbhid-&gt;outtail) {</div><div class='del'>-		if (hid_submit_out(hid)) {</div><div class='del'>-			clear_bit(HID_OUT_RUNNING, &amp;usbhid-&gt;iofl);</div><div class='del'>-			wake_up(&amp;usbhid-&gt;wait);</div><div class='del'>-		}</div><div class='add'>+	if (usbhid-&gt;outhead != usbhid-&gt;outtail &amp;&amp; !hid_submit_out(hid)) {</div><div class='add'>+		/* Successfully submitted next urb in queue */</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;usbhid-&gt;lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -474,13 +476,9 @@ static void hid_ctrl(struct urb *urb)</div><div class='ctx'> 	else</div><div class='ctx'> 		usbhid-&gt;ctrltail = (usbhid-&gt;ctrltail + 1) &amp; (HID_CONTROL_FIFO_SIZE - 1);</div><div class='ctx'> </div><div class='del'>-	if (usbhid-&gt;ctrlhead != usbhid-&gt;ctrltail) {</div><div class='del'>-		if (hid_submit_ctrl(hid)) {</div><div class='del'>-			clear_bit(HID_CTRL_RUNNING, &amp;usbhid-&gt;iofl);</div><div class='del'>-			wake_up(&amp;usbhid-&gt;wait);</div><div class='del'>-		}</div><div class='add'>+	if (usbhid-&gt;ctrlhead != usbhid-&gt;ctrltail &amp;&amp; !hid_submit_ctrl(hid)) {</div><div class='add'>+		/* Successfully submitted next urb in queue */</div><div class='ctx'> 		spin_unlock(&amp;usbhid-&gt;lock);</div><div class='del'>-		usb_autopm_put_interface_async(usbhid-&gt;intf);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -515,9 +513,23 @@ static void __usbhid_submit_report(struct hid_device *hid, struct hid_report *re</div><div class='ctx'> 		usbhid-&gt;out[usbhid-&gt;outhead].report = report;</div><div class='ctx'> 		usbhid-&gt;outhead = head;</div><div class='ctx'> </div><div class='add'>+		/* Try to awake from autosuspend... */</div><div class='add'>+		if (usb_autopm_get_interface_async(usbhid-&gt;intf) &lt; 0)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * But if still suspended, leave urb enqueued, don't submit.</div><div class='add'>+		 * Submission will occur if/when resume() drains the queue.</div><div class='add'>+		 */</div><div class='add'>+		if (test_bit(HID_REPORTED_IDLE, &amp;usbhid-&gt;iofl))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='ctx'> 		if (!test_and_set_bit(HID_OUT_RUNNING, &amp;usbhid-&gt;iofl)) {</div><div class='del'>-			if (hid_submit_out(hid))</div><div class='add'>+			if (hid_submit_out(hid)) {</div><div class='ctx'> 				clear_bit(HID_OUT_RUNNING, &amp;usbhid-&gt;iofl);</div><div class='add'>+				usb_autopm_put_interface_async(usbhid-&gt;intf);</div><div class='add'>+			}</div><div class='add'>+			wake_up(&amp;usbhid-&gt;wait);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * the queue is known to run</div><div class='hunk'>@@ -549,9 +561,23 @@ static void __usbhid_submit_report(struct hid_device *hid, struct hid_report *re</div><div class='ctx'> 	usbhid-&gt;ctrl[usbhid-&gt;ctrlhead].dir = dir;</div><div class='ctx'> 	usbhid-&gt;ctrlhead = head;</div><div class='ctx'> </div><div class='add'>+	/* Try to awake from autosuspend... */</div><div class='add'>+	if (usb_autopm_get_interface_async(usbhid-&gt;intf) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If already suspended, leave urb enqueued, but don't submit.</div><div class='add'>+	 * Submission will occur if/when resume() drains the queue.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(HID_REPORTED_IDLE, &amp;usbhid-&gt;iofl))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (!test_and_set_bit(HID_CTRL_RUNNING, &amp;usbhid-&gt;iofl)) {</div><div class='del'>-		if (hid_submit_ctrl(hid))</div><div class='add'>+		if (hid_submit_ctrl(hid)) {</div><div class='ctx'> 			clear_bit(HID_CTRL_RUNNING, &amp;usbhid-&gt;iofl);</div><div class='add'>+			usb_autopm_put_interface_async(usbhid-&gt;intf);</div><div class='add'>+		}</div><div class='add'>+		wake_up(&amp;usbhid-&gt;wait);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * the queue is known to run</div><div class='hunk'>@@ -576,6 +602,30 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(usbhid_submit_report);</div><div class='ctx'> </div><div class='add'>+/* Workqueue routine to send requests to change LEDs */</div><div class='add'>+static void hid_led(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct usbhid_device *usbhid =</div><div class='add'>+		container_of(work, struct usbhid_device, led_work);</div><div class='add'>+	struct hid_device *hid = usbhid-&gt;hid;</div><div class='add'>+	struct hid_field *field;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	field = hidinput_get_led_field(hid);</div><div class='add'>+	if (!field) {</div><div class='add'>+		hid_warn(hid, "LED event field not found\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;usbhid-&gt;lock, flags);</div><div class='add'>+	if (!test_bit(HID_DISCONNECTED, &amp;usbhid-&gt;iofl)) {</div><div class='add'>+		usbhid-&gt;ledcount = hidinput_count_leds(hid);</div><div class='add'>+		hid_dbg(usbhid-&gt;hid, "New ledcount = %u\n", usbhid-&gt;ledcount);</div><div class='add'>+		__usbhid_submit_report(hid, field-&gt;report, USB_DIR_OUT);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;usbhid-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int usb_hidinput_input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)</div><div class='ctx'> {</div><div class='ctx'> 	struct hid_device *hid = input_get_drvdata(dev);</div><div class='hunk'>@@ -595,17 +645,15 @@ static int usb_hidinput_input_event(struct input_dev *dev, unsigned int type, un</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;usbhid-&gt;lock, flags);</div><div class='ctx'> 	hid_set_field(field, offset, value);</div><div class='del'>-	if (value) {</div><div class='del'>-		spin_lock_irqsave(&amp;usbhid-&gt;lock, flags);</div><div class='del'>-		usbhid-&gt;ledcount++;</div><div class='del'>-		spin_unlock_irqrestore(&amp;usbhid-&gt;lock, flags);</div><div class='del'>-	} else {</div><div class='del'>-		spin_lock_irqsave(&amp;usbhid-&gt;lock, flags);</div><div class='del'>-		usbhid-&gt;ledcount--;</div><div class='del'>-		spin_unlock_irqrestore(&amp;usbhid-&gt;lock, flags);</div><div class='del'>-	}</div><div class='del'>-	usbhid_submit_report(hid, field-&gt;report, USB_DIR_OUT);</div><div class='add'>+	spin_unlock_irqrestore(&amp;usbhid-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Defer performing requested LED action.</div><div class='add'>+	 * This is more likely gather all LED changes into a single URB.</div><div class='add'>+	 */</div><div class='add'>+	schedule_work(&amp;usbhid-&gt;led_work);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1100,7 +1148,7 @@ static void usbhid_stop(struct hid_device *hid)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(HID_STARTED, &amp;usbhid-&gt;iofl);</div><div class='del'>-	spin_lock_irq(&amp;usbhid-&gt;lock);	/* Sync with error handler */</div><div class='add'>+	spin_lock_irq(&amp;usbhid-&gt;lock);	/* Sync with error and led handlers */</div><div class='ctx'> 	set_bit(HID_DISCONNECTED, &amp;usbhid-&gt;iofl);</div><div class='ctx'> 	spin_unlock_irq(&amp;usbhid-&gt;lock);</div><div class='ctx'> 	usb_kill_urb(usbhid-&gt;urbin);</div><div class='hunk'>@@ -1234,6 +1282,8 @@ static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id *</div><div class='ctx'> 	setup_timer(&amp;usbhid-&gt;io_retry, hid_retry_timeout, (unsigned long) hid);</div><div class='ctx'> 	spin_lock_init(&amp;usbhid-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	INIT_WORK(&amp;usbhid-&gt;led_work, hid_led);</div><div class='add'>+</div><div class='ctx'> 	ret = hid_add_device(hid);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		if (ret != -ENODEV)</div><div class='hunk'>@@ -1266,6 +1316,7 @@ static void hid_cancel_delayed_stuff(struct usbhid_device *usbhid)</div><div class='ctx'> {</div><div class='ctx'> 	del_timer_sync(&amp;usbhid-&gt;io_retry);</div><div class='ctx'> 	cancel_work_sync(&amp;usbhid-&gt;reset_work);</div><div class='add'>+	cancel_work_sync(&amp;usbhid-&gt;led_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hid_cease_io(struct usbhid_device *usbhid)</div><div class='hunk'>@@ -1367,16 +1418,6 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message)</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ignoreled &amp;&amp; PMSG_IS_AUTO(message)) {</div><div class='del'>-		spin_lock_irq(&amp;usbhid-&gt;lock);</div><div class='del'>-		if (test_bit(HID_LED_ON, &amp;usbhid-&gt;iofl)) {</div><div class='del'>-			spin_unlock_irq(&amp;usbhid-&gt;lock);</div><div class='del'>-			usbhid_mark_busy(usbhid);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irq(&amp;usbhid-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	hid_cancel_delayed_stuff(usbhid);</div><div class='ctx'> 	hid_cease_io(usbhid);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c<br/>index 5028d60a22a1..c831af937481 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/usbhid/hid-quirks.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/usbhid/hid-quirks.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/usbhid/hid-quirks.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/usbhid/hid-quirks.c</a></div><div class='hunk'>@@ -47,6 +47,7 @@ static const struct hid_blacklist {</div><div class='ctx'> </div><div class='ctx'> 	{ USB_VENDOR_ID_AFATECH, USB_DEVICE_ID_AFATECH_AF9016, HID_QUIRK_FULLSPEED_INTERVAL },</div><div class='ctx'> </div><div class='add'>+	{ USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II, HID_QUIRK_MULTI_INPUT },</div><div class='ctx'> 	{ USB_VENDOR_ID_ETURBOTOUCH, USB_DEVICE_ID_ETURBOTOUCH, HID_QUIRK_MULTI_INPUT },</div><div class='ctx'> 	{ USB_VENDOR_ID_GREENASIA, USB_DEVICE_ID_GREENASIA_DUAL_USB_JOYPAD, HID_QUIRK_MULTI_INPUT },</div><div class='ctx'> 	{ USB_VENDOR_ID_PANTHERLORD, USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK, HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS },</div><div class='hunk'>@@ -67,6 +68,9 @@ static const struct hid_blacklist {</div><div class='ctx'> 	{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET },</div><div class='ctx'> 	{ USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },</div><div class='ctx'> 	{ USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },</div><div class='add'>+	{ USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NO_INIT_REPORTS },</div><div class='add'>+	{ USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS },</div><div class='add'>+	{ USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2, HID_QUIRK_NO_INIT_REPORTS },</div><div class='ctx'> 	{ USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET },</div><div class='ctx'> 	{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NOGET },</div><div class='ctx'> 	{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },</div><div class='head'>diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c<br/>index 4ef02b269a71..7c297d305d5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/usbhid/hiddev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/usbhid/hiddev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/usbhid/hiddev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/usbhid/hiddev.c</a></div><div class='hunk'>@@ -859,7 +859,7 @@ static const struct file_operations hiddev_fops = {</div><div class='ctx'> 	.llseek		= noop_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *hiddev_devnode(struct device *dev, mode_t *mode)</div><div class='add'>+static char *hiddev_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev));</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h<br/>index 1673cac93d77..cb8f703efde5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/usbhid/usbhid.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/usbhid/usbhid.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/usbhid/usbhid.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/usbhid/usbhid.h</a></div><div class='hunk'>@@ -55,7 +55,6 @@ struct usb_interface *usbhid_find_interface(int minor);</div><div class='ctx'> #define HID_STARTED		8</div><div class='ctx'> #define HID_REPORTED_IDLE	9</div><div class='ctx'> #define HID_KEYS_PRESSED	10</div><div class='del'>-#define HID_LED_ON		11</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * USB-specific HID struct, to be pointed to</div><div class='hunk'>@@ -97,6 +96,8 @@ struct usbhid_device {</div><div class='ctx'> 	struct work_struct reset_work;                                  /* Task context for resets */</div><div class='ctx'> 	wait_queue_head_t wait;						/* For sleeping */</div><div class='ctx'> 	int ledcount;							/* counting the number of active leds */</div><div class='add'>+</div><div class='add'>+	struct work_struct led_work;					/* Task context for setting LEDs */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define	hid_to_usb_dev(hid_dev) \</div><div class='head'>diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c<br/>index 065817329f03..796086980f4a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/usbhid/usbkbd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/usbhid/usbkbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/usbhid/usbkbd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/usbhid/usbkbd.c</a></div><div class='hunk'>@@ -64,6 +64,32 @@ static const unsigned char usb_kbd_keycode[256] = {</div><div class='ctx'> 	150,158,159,128,136,177,178,176,142,152,173,140</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct usb_kbd - state of each attached keyboard</div><div class='add'>+ * @dev:	input device associated with this keyboard</div><div class='add'>+ * @usbdev:	usb device associated with this keyboard</div><div class='add'>+ * @old:	data received in the past from the @irq URB representing which</div><div class='add'>+ *		keys were pressed. By comparing with the current list of keys</div><div class='add'>+ *		that are pressed, we are able to see key releases.</div><div class='add'>+ * @irq:	URB for receiving a list of keys that are pressed when a</div><div class='add'>+ *		new key is pressed or a key that was pressed is released.</div><div class='add'>+ * @led:	URB for sending LEDs (e.g. numlock, ...)</div><div class='add'>+ * @newleds:	data that will be sent with the @led URB representing which LEDs</div><div class='add'>+ 		should be on</div><div class='add'>+ * @name:	Name of the keyboard. @dev's name field points to this buffer</div><div class='add'>+ * @phys:	Physical path of the keyboard. @dev's phys field points to this</div><div class='add'>+ *		buffer</div><div class='add'>+ * @new:	Buffer for the @irq URB</div><div class='add'>+ * @cr:		Control request for @led URB</div><div class='add'>+ * @leds:	Buffer for the @led URB</div><div class='add'>+ * @new_dma:	DMA address for @irq URB</div><div class='add'>+ * @leds_dma:	DMA address for @led URB</div><div class='add'>+ * @leds_lock:	spinlock that protects @leds, @newleds, and @led_urb_submitted</div><div class='add'>+ * @led_urb_submitted: indicates whether @led is in progress, i.e. it has been</div><div class='add'>+ *		submitted and its completion handler has not returned yet</div><div class='add'>+ *		without	resubmitting @led</div><div class='add'>+ */</div><div class='ctx'> struct usb_kbd {</div><div class='ctx'> 	struct input_dev *dev;</div><div class='ctx'> 	struct usb_device *usbdev;</div><div class='hunk'>@@ -78,6 +104,10 @@ struct usb_kbd {</div><div class='ctx'> 	unsigned char *leds;</div><div class='ctx'> 	dma_addr_t new_dma;</div><div class='ctx'> 	dma_addr_t leds_dma;</div><div class='add'>+	</div><div class='add'>+	spinlock_t leds_lock;</div><div class='add'>+	bool led_urb_submitted;</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void usb_kbd_irq(struct urb *urb)</div><div class='hunk'>@@ -136,44 +166,66 @@ resubmit:</div><div class='ctx'> static int usb_kbd_event(struct input_dev *dev, unsigned int type,</div><div class='ctx'> 			 unsigned int code, int value)</div><div class='ctx'> {</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	struct usb_kbd *kbd = input_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (type != EV_LED)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;kbd-&gt;leds_lock, flags);</div><div class='ctx'> 	kbd-&gt;newleds = (!!test_bit(LED_KANA,    dev-&gt;led) &lt;&lt; 3) | (!!test_bit(LED_COMPOSE, dev-&gt;led) &lt;&lt; 3) |</div><div class='ctx'> 		       (!!test_bit(LED_SCROLLL, dev-&gt;led) &lt;&lt; 2) | (!!test_bit(LED_CAPSL,   dev-&gt;led) &lt;&lt; 1) |</div><div class='ctx'> 		       (!!test_bit(LED_NUML,    dev-&gt;led));</div><div class='ctx'> </div><div class='del'>-	if (kbd-&gt;led-&gt;status == -EINPROGRESS)</div><div class='add'>+	if (kbd-&gt;led_urb_submitted){</div><div class='add'>+		spin_unlock_irqrestore(&amp;kbd-&gt;leds_lock, flags);</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (*(kbd-&gt;leds) == kbd-&gt;newleds)</div><div class='add'>+	if (*(kbd-&gt;leds) == kbd-&gt;newleds){</div><div class='add'>+		spin_unlock_irqrestore(&amp;kbd-&gt;leds_lock, flags);</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	*(kbd-&gt;leds) = kbd-&gt;newleds;</div><div class='add'>+	</div><div class='ctx'> 	kbd-&gt;led-&gt;dev = kbd-&gt;usbdev;</div><div class='ctx'> 	if (usb_submit_urb(kbd-&gt;led, GFP_ATOMIC))</div><div class='ctx'> 		pr_err("usb_submit_urb(leds) failed\n");</div><div class='del'>-</div><div class='add'>+	else</div><div class='add'>+		kbd-&gt;led_urb_submitted = true;</div><div class='add'>+	</div><div class='add'>+	spin_unlock_irqrestore(&amp;kbd-&gt;leds_lock, flags);</div><div class='add'>+	</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void usb_kbd_led(struct urb *urb)</div><div class='ctx'> {</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	struct usb_kbd *kbd = urb-&gt;context;</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;status)</div><div class='ctx'> 		hid_warn(urb-&gt;dev, "led urb status %d received\n",</div><div class='ctx'> 			 urb-&gt;status);</div><div class='ctx'> </div><div class='del'>-	if (*(kbd-&gt;leds) == kbd-&gt;newleds)</div><div class='add'>+	spin_lock_irqsave(&amp;kbd-&gt;leds_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (*(kbd-&gt;leds) == kbd-&gt;newleds){</div><div class='add'>+		kbd-&gt;led_urb_submitted = false;</div><div class='add'>+		spin_unlock_irqrestore(&amp;kbd-&gt;leds_lock, flags);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	*(kbd-&gt;leds) = kbd-&gt;newleds;</div><div class='add'>+	</div><div class='ctx'> 	kbd-&gt;led-&gt;dev = kbd-&gt;usbdev;</div><div class='del'>-	if (usb_submit_urb(kbd-&gt;led, GFP_ATOMIC))</div><div class='add'>+	if (usb_submit_urb(kbd-&gt;led, GFP_ATOMIC)){</div><div class='ctx'> 		hid_err(urb-&gt;dev, "usb_submit_urb(leds) failed\n");</div><div class='add'>+		kbd-&gt;led_urb_submitted = false;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;kbd-&gt;leds_lock, flags);</div><div class='add'>+	</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int usb_kbd_open(struct input_dev *dev)</div><div class='hunk'>@@ -252,6 +304,7 @@ static int usb_kbd_probe(struct usb_interface *iface,</div><div class='ctx'> </div><div class='ctx'> 	kbd-&gt;usbdev = dev;</div><div class='ctx'> 	kbd-&gt;dev = input_dev;</div><div class='add'>+	spin_lock_init(&amp;kbd-&gt;leds_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;manufacturer)</div><div class='ctx'> 		strlcpy(kbd-&gt;name, dev-&gt;manufacturer, sizeof(kbd-&gt;name));</div><div class='hunk'>@@ -334,6 +387,7 @@ static void usb_kbd_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	if (kbd) {</div><div class='ctx'> 		usb_kill_urb(kbd-&gt;irq);</div><div class='ctx'> 		input_unregister_device(kbd-&gt;dev);</div><div class='add'>+		usb_kill_urb(kbd-&gt;led);</div><div class='ctx'> 		usb_kbd_free_mem(interface_to_usbdev(intf), kbd);</div><div class='ctx'> 		kfree(kbd);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -354,19 +408,4 @@ static struct usb_driver usb_kbd_driver = {</div><div class='ctx'> 	.id_table =	usb_kbd_id_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init usb_kbd_init(void)</div><div class='del'>-{</div><div class='del'>-	int result = usb_register(&amp;usb_kbd_driver);</div><div class='del'>-	if (result == 0)</div><div class='del'>-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='del'>-				DRIVER_DESC "\n");</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit usb_kbd_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;usb_kbd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(usb_kbd_init);</div><div class='del'>-module_exit(usb_kbd_exit);</div><div class='add'>+module_usb_driver(usb_kbd_driver);</div><div class='head'>diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c<br/>index 79b2bf81a059..0f6be45d43d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hid/usbhid/usbmouse.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hid/usbhid/usbmouse.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hid/usbhid/usbmouse.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hid/usbhid/usbmouse.c</a></div><div class='hunk'>@@ -241,19 +241,4 @@ static struct usb_driver usb_mouse_driver = {</div><div class='ctx'> 	.id_table	= usb_mouse_id_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init usb_mouse_init(void)</div><div class='del'>-{</div><div class='del'>-	int retval = usb_register(&amp;usb_mouse_driver);</div><div class='del'>-	if (retval == 0)</div><div class='del'>-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='del'>-				DRIVER_DESC "\n");</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit usb_mouse_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;usb_mouse_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(usb_mouse_init);</div><div class='del'>-module_exit(usb_mouse_exit);</div><div class='add'>+module_usb_driver(usb_mouse_driver);</div><div class='head'>diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig<br/>index 9fa09ac000ad..70f5dde1cc52 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hv/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hv/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hv/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hv/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='add'>+menu "Microsoft Hyper-V guest support"</div><div class='add'>+</div><div class='ctx'> config HYPERV</div><div class='ctx'> 	tristate "Microsoft Hyper-V client drivers"</div><div class='ctx'> 	depends on X86 &amp;&amp; ACPI &amp;&amp; PCI</div><div class='hunk'>@@ -11,4 +13,4 @@ config HYPERV_UTILS</div><div class='ctx'> 	help</div><div class='ctx'> 	  Select this option to enable the Hyper-V Utilities.</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+endmenu</div><div class='head'>diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c<br/>index 12b85ff957fd..36484db36baf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hv/channel_mgmt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hv/channel_mgmt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hv/channel_mgmt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hv/channel_mgmt.c</a></div><div class='hunk'>@@ -223,6 +223,17 @@ static void vmbus_process_rescind_offer(struct work_struct *work)</div><div class='ctx'> 	vmbus_device_unregister(channel-&gt;device_obj);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void vmbus_free_channels(void)</div><div class='add'>+{</div><div class='add'>+	struct vmbus_channel *channel;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(channel, &amp;vmbus_connection.chn_list, listentry) {</div><div class='add'>+		vmbus_device_unregister(channel-&gt;device_obj);</div><div class='add'>+		kfree(channel-&gt;device_obj);</div><div class='add'>+		free_channel(channel);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * vmbus_process_offer - Process the offer by creating a channel/device</div><div class='ctx'>  * associated with this offer</div><div class='hunk'>@@ -287,6 +298,7 @@ static void vmbus_process_offer(struct work_struct *work)</div><div class='ctx'> 		spin_lock_irqsave(&amp;vmbus_connection.channel_lock, flags);</div><div class='ctx'> 		list_del(&amp;newchannel-&gt;listentry);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;vmbus_connection.channel_lock, flags);</div><div class='add'>+		kfree(newchannel-&gt;device_obj);</div><div class='ctx'> </div><div class='ctx'> 		free_channel(newchannel);</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c<br/>index 0fb100ed91a3..12aa97f31f93 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hv/hv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hv/hv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hv/hv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hv/hv.c</a></div><div class='hunk'>@@ -164,11 +164,6 @@ int hv_init(void)</div><div class='ctx'> </div><div class='ctx'> 	max_leaf = query_hypervisor_info();</div><div class='ctx'> </div><div class='del'>-	rdmsrl(HV_X64_MSR_GUEST_OS_ID, hv_context.guestid);</div><div class='del'>-</div><div class='del'>-	if (hv_context.guestid != 0)</div><div class='del'>-		goto cleanup;</div><div class='del'>-</div><div class='ctx'> 	/* Write our OS info */</div><div class='ctx'> 	wrmsrl(HV_X64_MSR_GUEST_OS_ID, HV_LINUX_GUEST_ID);</div><div class='ctx'> 	hv_context.guestid = HV_LINUX_GUEST_ID;</div><div class='hunk'>@@ -237,6 +232,9 @@ void hv_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	union hv_x64_msr_hypercall_contents hypercall_msr;</div><div class='ctx'> </div><div class='add'>+	/* Reset our OS id */</div><div class='add'>+	wrmsrl(HV_X64_MSR_GUEST_OS_ID, 0);</div><div class='add'>+</div><div class='ctx'> 	kfree(hv_context.signal_event_buffer);</div><div class='ctx'> 	hv_context.signal_event_buffer = NULL;</div><div class='ctx'> 	hv_context.signal_event_param = NULL;</div><div class='head'>diff --git a/drivers/hv/hv_kvp.c b/drivers/hv/hv_kvp.c<br/>index 89f52440fcf4..0e8343f585bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hv/hv_kvp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hv/hv_kvp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hv/hv_kvp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hv/hv_kvp.c</a></div><div class='hunk'>@@ -212,11 +212,13 @@ kvp_respond_to_host(char *key, char *value, int error)</div><div class='ctx'> 	 * The windows host expects the key/value pair to be encoded</div><div class='ctx'> 	 * in utf16.</div><div class='ctx'> 	 */</div><div class='del'>-	keylen = utf8s_to_utf16s(key_name, strlen(key_name),</div><div class='del'>-				(wchar_t *)kvp_data-&gt;data.key);</div><div class='add'>+	keylen = utf8s_to_utf16s(key_name, strlen(key_name), UTF16_HOST_ENDIAN,</div><div class='add'>+				(wchar_t *) kvp_data-&gt;data.key,</div><div class='add'>+				HV_KVP_EXCHANGE_MAX_KEY_SIZE / 2);</div><div class='ctx'> 	kvp_data-&gt;data.key_size = 2*(keylen + 1); /* utf16 encoding */</div><div class='del'>-	valuelen = utf8s_to_utf16s(value, strlen(value),</div><div class='del'>-				(wchar_t *)kvp_data-&gt;data.value);</div><div class='add'>+	valuelen = utf8s_to_utf16s(value, strlen(value), UTF16_HOST_ENDIAN,</div><div class='add'>+				(wchar_t *) kvp_data-&gt;data.value,</div><div class='add'>+				HV_KVP_EXCHANGE_MAX_VALUE_SIZE / 2);</div><div class='ctx'> 	kvp_data-&gt;data.value_size = 2*(valuelen + 1); /* utf16 encoding */</div><div class='ctx'> </div><div class='ctx'> 	kvp_data-&gt;data.value_type = REG_SZ; /* all our values are strings */</div><div class='head'>diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h<br/>index 0aee1122734c..6d7d286d5440 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hv/hyperv_vmbus.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hv/hyperv_vmbus.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hv/hyperv_vmbus.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hv/hyperv_vmbus.h</a></div><div class='hunk'>@@ -611,6 +611,7 @@ void vmbus_device_unregister(struct hv_device *device_obj);</div><div class='ctx'> </div><div class='ctx'> struct vmbus_channel *relid2channel(u32 relid);</div><div class='ctx'> </div><div class='add'>+void vmbus_free_channels(void);</div><div class='ctx'> </div><div class='ctx'> /* Connection interface */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c<br/>index 0c048dd8013f..a220e5746d67 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hv/vmbus_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hv/vmbus_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hv/vmbus_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hv/vmbus_drv.c</a></div><div class='hunk'>@@ -62,6 +62,14 @@ struct hv_device_info {</div><div class='ctx'> 	struct hv_dev_port_info outbound;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int vmbus_exists(void)</div><div class='add'>+{</div><div class='add'>+	if (hv_acpi_dev == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static void get_channel_info(struct hv_device *device,</div><div class='ctx'> 			     struct hv_device_info *info)</div><div class='hunk'>@@ -590,6 +598,10 @@ int __vmbus_driver_register(struct hv_driver *hv_driver, struct module *owner, c</div><div class='ctx'> </div><div class='ctx'> 	pr_info("registering driver %s\n", hv_driver-&gt;name);</div><div class='ctx'> </div><div class='add'>+	ret = vmbus_exists();</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	hv_driver-&gt;driver.name = hv_driver-&gt;name;</div><div class='ctx'> 	hv_driver-&gt;driver.owner = owner;</div><div class='ctx'> 	hv_driver-&gt;driver.mod_name = mod_name;</div><div class='hunk'>@@ -614,8 +626,8 @@ void vmbus_driver_unregister(struct hv_driver *hv_driver)</div><div class='ctx'> {</div><div class='ctx'> 	pr_info("unregistering driver %s\n", hv_driver-&gt;name);</div><div class='ctx'> </div><div class='del'>-	driver_unregister(&amp;hv_driver-&gt;driver);</div><div class='del'>-</div><div class='add'>+	if (!vmbus_exists())</div><div class='add'>+		driver_unregister(&amp;hv_driver-&gt;driver);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(vmbus_driver_unregister);</div><div class='ctx'> </div><div class='hunk'>@@ -776,11 +788,23 @@ static int __init hv_acpi_init(void)</div><div class='ctx'> </div><div class='ctx'> cleanup:</div><div class='ctx'> 	acpi_bus_unregister_driver(&amp;vmbus_acpi_driver);</div><div class='add'>+	hv_acpi_dev = NULL;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __exit vmbus_exit(void)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	free_irq(irq, hv_acpi_dev);</div><div class='add'>+	vmbus_free_channels();</div><div class='add'>+	bus_unregister(&amp;hv_bus);</div><div class='add'>+	hv_cleanup();</div><div class='add'>+	acpi_bus_unregister_driver(&amp;vmbus_acpi_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_VERSION(HV_DRV_VERSION);</div><div class='ctx'> </div><div class='del'>-module_init(hv_acpi_init);</div><div class='add'>+subsys_initcall(hv_acpi_init);</div><div class='add'>+module_exit(vmbus_exit);</div><div class='head'>diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig<br/>index 91be41f60809..02260406b9e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/Kconfig</a></div><div class='hunk'>@@ -367,11 +367,11 @@ config SENSORS_F71882FG</div><div class='ctx'> 	  will be called f71882fg.</div><div class='ctx'> </div><div class='ctx'> config SENSORS_F75375S</div><div class='del'>-	tristate "Fintek F75375S/SP and F75373"</div><div class='add'>+	tristate "Fintek F75375S/SP, F75373 and F75387"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes here you get support for hardware monitoring</div><div class='del'>-	  features of the Fintek F75375S/SP and F75373</div><div class='add'>+	  features of the Fintek F75375S/SP, F75373 and F75387</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 f75375s.</div><div class='hunk'>@@ -474,8 +474,8 @@ config SENSORS_IT87</div><div class='ctx'> 	select HWMON_VID</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes here you get support for ITE IT8705F, IT8712F,</div><div class='del'>-	  IT8716F, IT8718F, IT8720F, IT8721F, IT8726F and IT8758E sensor</div><div class='del'>-	  chips, and the SiS960 clone.</div><div class='add'>+	  IT8716F, IT8718F, IT8720F, IT8721F, IT8726F, IT8728F and IT8758E</div><div class='add'>+	  sensor chips, and the SiS960 clone.</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 it87.</div><div class='hunk'>@@ -515,11 +515,11 @@ config SENSORS_LINEAGE</div><div class='ctx'> 	  will be called lineage-pem.</div><div class='ctx'> </div><div class='ctx'> config SENSORS_LM63</div><div class='del'>-	tristate "National Semiconductor LM63 and LM64"</div><div class='add'>+	tristate "National Semiconductor LM63 and compatibles"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes here you get support for the National</div><div class='del'>-	  Semiconductor LM63 and LM64 remote diode digital temperature</div><div class='add'>+	  Semiconductor LM63, LM64, and LM96163 remote diode digital temperature</div><div class='ctx'> 	  sensors with integrated fan control.  Such chips are found</div><div class='ctx'> 	  on the Tyan S4882 (Thunder K8QS Pro) motherboard, among</div><div class='ctx'> 	  others.</div><div class='head'>diff --git a/drivers/hwmon/abituguru.c b/drivers/hwmon/abituguru.c<br/>index 65a35cf5b3c5..3b728e8f169b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/abituguru.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/abituguru.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/abituguru.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/abituguru.c</a></div><div class='hunk'>@@ -145,7 +145,7 @@ static const u8 abituguru_pwm_max[5] = { 0, 255, 255, 75, 75 };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Insmod parameters */</div><div class='del'>-static int force;</div><div class='add'>+static bool force;</div><div class='ctx'> module_param(force, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(force, "Set to one to force detection.");</div><div class='ctx'> static int bank1_types[ABIT_UGURU_MAX_BANK1_SENSORS] = { -1, -1, -1, -1, -1,</div><div class='head'>diff --git a/drivers/hwmon/abituguru3.c b/drivers/hwmon/abituguru3.c<br/>index d30855a75786..34a14a77e008 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/abituguru3.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/abituguru3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/abituguru3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/abituguru3.c</a></div><div class='hunk'>@@ -603,11 +603,11 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Insmod parameters */</div><div class='del'>-static int force;</div><div class='add'>+static bool force;</div><div class='ctx'> module_param(force, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(force, "Set to one to force detection.");</div><div class='ctx'> /* Default verbose is 1, since this driver is still in the testing phase */</div><div class='del'>-static int verbose = 1;</div><div class='add'>+static bool verbose = 1;</div><div class='ctx'> module_param(verbose, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(verbose, "Enable/disable verbose error reporting");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c<br/>index 66f67293341e..554f046bcf20 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/acpi_power_meter.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/acpi_power_meter.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/acpi_power_meter.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/acpi_power_meter.c</a></div><div class='hunk'>@@ -58,7 +58,7 @@ ACPI_MODULE_NAME(ACPI_POWER_METER_NAME);</div><div class='ctx'> #define POWER_ALARM_NAME	"power1_alarm"</div><div class='ctx'> </div><div class='ctx'> static int cap_in_hardware;</div><div class='del'>-static int force_cap_on;</div><div class='add'>+static bool force_cap_on;</div><div class='ctx'> </div><div class='ctx'> static int can_cap_in_hardware(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -170,7 +170,7 @@ static ssize_t set_avg_interval(struct device *dev,</div><div class='ctx'> 	unsigned long long data;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	res = strict_strtoul(buf, 10, &amp;temp);</div><div class='add'>+	res = kstrtoul(buf, 10, &amp;temp);</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='hunk'>@@ -241,7 +241,7 @@ static ssize_t set_cap(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	unsigned long long data;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	res = strict_strtoul(buf, 10, &amp;temp);</div><div class='add'>+	res = kstrtoul(buf, 10, &amp;temp);</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='hunk'>@@ -311,7 +311,7 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	int res;</div><div class='ctx'> 	unsigned long temp;</div><div class='ctx'> </div><div class='del'>-	res = strict_strtoul(buf, 10, &amp;temp);</div><div class='add'>+	res = kstrtoul(buf, 10, &amp;temp);</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/adcxx.c b/drivers/hwmon/adcxx.c<br/>index b2cacbe707a8..ceb24a365176 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/adcxx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/adcxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/adcxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/adcxx.c</a></div><div class='hunk'>@@ -125,7 +125,7 @@ static ssize_t adcxx_set_max(struct device *dev,</div><div class='ctx'> 	struct adcxx *adc = spi_get_drvdata(spi);</div><div class='ctx'> 	unsigned long value;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;value))</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;value))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (mutex_lock_interruptible(&amp;adc-&gt;lock))</div><div class='head'>diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c<br/>index 1ad0a885c5a5..0158cc35cb2e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/adm1021.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/adm1021.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/adm1021.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/adm1021.c</a></div><div class='hunk'>@@ -103,7 +103,7 @@ static int adm1021_remove(struct i2c_client *client);</div><div class='ctx'> static struct adm1021_data *adm1021_update_device(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> /* (amalysh) read only mode, otherwise any limit's writing confuse BIOS */</div><div class='del'>-static int read_only;</div><div class='add'>+static bool read_only;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static const struct i2c_device_id adm1021_id[] = {</div><div class='head'>diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c<br/>index 0683e6be662c..97e2cfb0bc93 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/adm1031.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/adm1031.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/adm1031.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/adm1031.c</a></div><div class='hunk'>@@ -155,7 +155,8 @@ adm1031_write_value(struct i2c_client *client, u8 reg, unsigned int value)</div><div class='ctx'> #define TEMP_OFFSET_FROM_REG(val)	TEMP_FROM_REG((val) &lt; 0 ? \</div><div class='ctx'> 						      (val) | 0x70 : (val))</div><div class='ctx'> </div><div class='del'>-#define FAN_FROM_REG(reg, div)		((reg) ? (11250 * 60) / ((reg) * (div)) : 0)</div><div class='add'>+#define FAN_FROM_REG(reg, div)		((reg) ? \</div><div class='add'>+					 (11250 * 60) / ((reg) * (div)) : 0)</div><div class='ctx'> </div><div class='ctx'> static int FAN_TO_REG(int reg, int div)</div><div class='ctx'> {</div><div class='hunk'>@@ -174,8 +175,8 @@ static int FAN_TO_REG(int reg, int div)</div><div class='ctx'> 	(((reg) &amp; 0x1F) | (((val) &lt;&lt; 5) &amp; 0xe0))</div><div class='ctx'> </div><div class='ctx'> #define AUTO_TEMP_MIN_TO_REG(val, reg)	\</div><div class='del'>-	((((val)/500) &amp; 0xf8)|((reg) &amp; 0x7))</div><div class='del'>-#define AUTO_TEMP_RANGE_FROM_REG(reg)	(5000 * (1&lt;&lt; ((reg)&amp;0x7)))</div><div class='add'>+	((((val) / 500) &amp; 0xf8) | ((reg) &amp; 0x7))</div><div class='add'>+#define AUTO_TEMP_RANGE_FROM_REG(reg)	(5000 * (1 &lt;&lt; ((reg) &amp; 0x7)))</div><div class='ctx'> #define AUTO_TEMP_MIN_FROM_REG(reg)	(1000 * ((((reg) &gt;&gt; 3) &amp; 0x1f) &lt;&lt; 2))</div><div class='ctx'> </div><div class='ctx'> #define AUTO_TEMP_MIN_FROM_REG_DEG(reg)	((((reg) &gt;&gt; 3) &amp; 0x1f) &lt;&lt; 2)</div><div class='hunk'>@@ -202,7 +203,7 @@ static int AUTO_TEMP_MAX_TO_REG(int val, int reg, int pwm)</div><div class='ctx'> </div><div class='ctx'> /* FAN auto control */</div><div class='ctx'> #define GET_FAN_AUTO_BITFIELD(data, idx)	\</div><div class='del'>-	(*(data)-&gt;chan_select_table)[FAN_CHAN_FROM_REG((data)-&gt;conf1)][idx%2]</div><div class='add'>+	(*(data)-&gt;chan_select_table)[FAN_CHAN_FROM_REG((data)-&gt;conf1)][idx % 2]</div><div class='ctx'> </div><div class='ctx'> /* The tables below contains the possible values for the auto fan</div><div class='ctx'>  * control bitfields. the index in the table is the register value.</div><div class='hunk'>@@ -230,7 +231,7 @@ static const auto_chan_table_t auto_channel_select_table_adm1030 = {</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> get_fan_auto_nearest(struct adm1031_data *data,</div><div class='del'>-		     int chan, u8 val, u8 reg, u8 * new_reg)</div><div class='add'>+		     int chan, u8 val, u8 reg, u8 *new_reg)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int first_match = -1, exact_match = -1;</div><div class='hunk'>@@ -258,13 +259,13 @@ get_fan_auto_nearest(struct adm1031_data *data,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (exact_match &gt;= 0) {</div><div class='add'>+	if (exact_match &gt;= 0)</div><div class='ctx'> 		*new_reg = exact_match;</div><div class='del'>-	} else if (first_match &gt;= 0) {</div><div class='add'>+	else if (first_match &gt;= 0)</div><div class='ctx'> 		*new_reg = first_match;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -283,23 +284,28 @@ set_fan_auto_channel(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct adm1031_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='del'>-	int val = simple_strtol(buf, NULL, 10);</div><div class='add'>+	long val;</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 old_fan_mode;</div><div class='ctx'> </div><div class='add'>+	ret = kstrtol(buf, 10, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	old_fan_mode = data-&gt;conf1;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='del'>-	if ((ret = get_fan_auto_nearest(data, nr, val, data-&gt;conf1, &amp;reg))) {</div><div class='add'>+	ret = get_fan_auto_nearest(data, nr, val, data-&gt;conf1, &amp;reg);</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	data-&gt;conf1 = FAN_CHAN_TO_REG(reg, data-&gt;conf1);</div><div class='ctx'> 	if ((data-&gt;conf1 &amp; ADM1031_CONF1_AUTO_MODE) ^</div><div class='ctx'> 	    (old_fan_mode &amp; ADM1031_CONF1_AUTO_MODE)) {</div><div class='del'>-		if (data-&gt;conf1 &amp; ADM1031_CONF1_AUTO_MODE){</div><div class='add'>+		if (data-&gt;conf1 &amp; ADM1031_CONF1_AUTO_MODE) {</div><div class='ctx'> 			/* Switch to Auto Fan Mode</div><div class='ctx'> 			 * Save PWM registers</div><div class='ctx'> 			 * Set PWM registers to 33% Both */</div><div class='hunk'>@@ -350,7 +356,12 @@ set_auto_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct adm1031_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='del'>-	int val = simple_strtol(buf, NULL, 10);</div><div class='add'>+	long val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtol(buf, 10, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;auto_temp[nr] = AUTO_TEMP_MIN_TO_REG(val, data-&gt;auto_temp[nr]);</div><div class='hunk'>@@ -374,10 +385,16 @@ set_auto_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct adm1031_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='del'>-	int val = simple_strtol(buf, NULL, 10);</div><div class='add'>+	long val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtol(buf, 10, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='del'>-	data-&gt;temp_max[nr] = AUTO_TEMP_MAX_TO_REG(val, data-&gt;auto_temp[nr], data-&gt;pwm[nr]);</div><div class='add'>+	data-&gt;temp_max[nr] = AUTO_TEMP_MAX_TO_REG(val, data-&gt;auto_temp[nr],</div><div class='add'>+						  data-&gt;pwm[nr]);</div><div class='ctx'> 	adm1031_write_value(client, ADM1031_REG_AUTO_TEMP(nr),</div><div class='ctx'> 			    data-&gt;temp_max[nr]);</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -410,8 +427,12 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct adm1031_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='del'>-	int val = simple_strtol(buf, NULL, 10);</div><div class='del'>-	int reg;</div><div class='add'>+	long val;</div><div class='add'>+	int ret, reg;</div><div class='add'>+</div><div class='add'>+	ret = kstrtol(buf, 10, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	if ((data-&gt;conf1 &amp; ADM1031_CONF1_AUTO_MODE) &amp;&amp;</div><div class='hunk'>@@ -449,9 +470,13 @@ static int trust_fan_readings(struct adm1031_data *data, int chan)</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;conf1 &amp; ADM1031_CONF1_AUTO_MODE) {</div><div class='ctx'> 		switch (data-&gt;conf1 &amp; 0x60) {</div><div class='del'>-		case 0x00:	/* remote temp1 controls fan1 remote temp2 controls fan2 */</div><div class='add'>+		case 0x00:</div><div class='add'>+			/*</div><div class='add'>+			 * remote temp1 controls fan1,</div><div class='add'>+			 * remote temp2 controls fan2</div><div class='add'>+			 */</div><div class='ctx'> 			res = data-&gt;temp[chan+1] &gt;=</div><div class='del'>-			      AUTO_TEMP_MIN_FROM_REG_DEG(data-&gt;auto_temp[chan+1]);</div><div class='add'>+			    AUTO_TEMP_MIN_FROM_REG_DEG(data-&gt;auto_temp[chan+1]);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x20:	/* remote temp1 controls both fans */</div><div class='ctx'> 			res =</div><div class='hunk'>@@ -515,7 +540,12 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct adm1031_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='del'>-	int val = simple_strtol(buf, NULL, 10);</div><div class='add'>+	long val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtol(buf, 10, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	if (val) {</div><div class='hunk'>@@ -534,10 +564,15 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct adm1031_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='del'>-	int val = simple_strtol(buf, NULL, 10);</div><div class='add'>+	long val;</div><div class='ctx'> 	u8 tmp;</div><div class='ctx'> 	int old_div;</div><div class='ctx'> 	int new_min;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtol(buf, 10, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	tmp = val == 8 ? 0xc0 :</div><div class='ctx'> 	      val == 4 ? 0x80 :</div><div class='hunk'>@@ -631,9 +666,13 @@ static ssize_t set_temp_offset(struct device *dev,</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct adm1031_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='del'>-	int val;</div><div class='add'>+	long val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtol(buf, 10, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	val = simple_strtol(buf, NULL, 10);</div><div class='ctx'> 	val = SENSORS_LIMIT(val, -15000, 15000);</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;temp_offset[nr] = TEMP_OFFSET_TO_REG(val);</div><div class='hunk'>@@ -648,9 +687,13 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct adm1031_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='del'>-	int val;</div><div class='add'>+	long val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtol(buf, 10, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	val = simple_strtol(buf, NULL, 10);</div><div class='ctx'> 	val = SENSORS_LIMIT(val, -55000, nr == 0 ? 127750 : 127875);</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;temp_min[nr] = TEMP_TO_REG(val);</div><div class='hunk'>@@ -665,9 +708,13 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct adm1031_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='del'>-	int val;</div><div class='add'>+	long val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtol(buf, 10, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	val = simple_strtol(buf, NULL, 10);</div><div class='ctx'> 	val = SENSORS_LIMIT(val, -55000, nr == 0 ? 127750 : 127875);</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;temp_max[nr] = TEMP_TO_REG(val);</div><div class='hunk'>@@ -682,9 +729,13 @@ static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct adm1031_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='del'>-	int val;</div><div class='add'>+	long val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtol(buf, 10, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	val = simple_strtol(buf, NULL, 10);</div><div class='ctx'> 	val = SENSORS_LIMIT(val, -55000, nr == 0 ? 127750 : 127875);</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;temp_crit[nr] = TEMP_TO_REG(val);</div><div class='hunk'>@@ -711,7 +762,8 @@ temp_reg(2);</div><div class='ctx'> temp_reg(3);</div><div class='ctx'> </div><div class='ctx'> /* Alarms */</div><div class='del'>-static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct adm1031_data *data = adm1031_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", data-&gt;alarm);</div><div class='hunk'>@@ -767,7 +819,7 @@ static ssize_t set_update_interval(struct device *dev,</div><div class='ctx'> 	int i, err;</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -919,12 +971,13 @@ static int adm1031_probe(struct i2c_client *client,</div><div class='ctx'> 	adm1031_init_client(client);</div><div class='ctx'> </div><div class='ctx'> 	/* Register sysfs hooks */</div><div class='del'>-	if ((err = sysfs_create_group(&amp;client-&gt;dev.kobj, &amp;adm1031_group)))</div><div class='add'>+	err = sysfs_create_group(&amp;client-&gt;dev.kobj, &amp;adm1031_group);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto exit_free;</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;chip_type == adm1031) {</div><div class='del'>-		if ((err = sysfs_create_group(&amp;client-&gt;dev.kobj,</div><div class='del'>-						&amp;adm1031_group_opt)))</div><div class='add'>+		err = sysfs_create_group(&amp;client-&gt;dev.kobj, &amp;adm1031_group_opt);</div><div class='add'>+		if (err)</div><div class='ctx'> 			goto exit_remove;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -970,14 +1023,13 @@ static void adm1031_init_client(struct i2c_client *client)</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Initialize the ADM1031 chip (enables fan speed reading ) */</div><div class='ctx'> 	read_val = adm1031_read_value(client, ADM1031_REG_CONF2);</div><div class='del'>-	if ((read_val | mask) != read_val) {</div><div class='del'>-	    adm1031_write_value(client, ADM1031_REG_CONF2, read_val | mask);</div><div class='del'>-	}</div><div class='add'>+	if ((read_val | mask) != read_val)</div><div class='add'>+		adm1031_write_value(client, ADM1031_REG_CONF2, read_val | mask);</div><div class='ctx'> </div><div class='ctx'> 	read_val = adm1031_read_value(client, ADM1031_REG_CONF1);</div><div class='ctx'> 	if ((read_val | ADM1031_CONF1_MONITOR_ENABLE) != read_val) {</div><div class='del'>-	    adm1031_write_value(client, ADM1031_REG_CONF1, read_val |</div><div class='del'>-				ADM1031_CONF1_MONITOR_ENABLE);</div><div class='add'>+		adm1031_write_value(client, ADM1031_REG_CONF1,</div><div class='add'>+				    read_val | ADM1031_CONF1_MONITOR_ENABLE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Read the chip's update rate */</div><div class='hunk'>@@ -1024,8 +1076,7 @@ static struct adm1031_data *adm1031_update_device(struct device *dev)</div><div class='ctx'> 				/* oldh is actually newer */</div><div class='ctx'> 				if (newh != oldh)</div><div class='ctx'> 					dev_warn(&amp;client-&gt;dev,</div><div class='del'>-						 "Remote temperature may be "</div><div class='del'>-						 "wrong.\n");</div><div class='add'>+					  "Remote temperature may be wrong.\n");</div><div class='ctx'> #endif</div><div class='ctx'> 			}</div><div class='ctx'> 			data-&gt;temp[chan] = newh;</div><div class='hunk'>@@ -1052,22 +1103,24 @@ static struct adm1031_data *adm1031_update_device(struct device *dev)</div><div class='ctx'> 		data-&gt;conf2 = adm1031_read_value(client, ADM1031_REG_CONF2);</div><div class='ctx'> </div><div class='ctx'> 		data-&gt;alarm = adm1031_read_value(client, ADM1031_REG_STATUS(0))</div><div class='del'>-			     | (adm1031_read_value(client, ADM1031_REG_STATUS(1))</div><div class='del'>-				&lt;&lt; 8);</div><div class='del'>-		if (data-&gt;chip_type == adm1030) {</div><div class='add'>+		    | (adm1031_read_value(client, ADM1031_REG_STATUS(1)) &lt;&lt; 8);</div><div class='add'>+		if (data-&gt;chip_type == adm1030)</div><div class='ctx'> 			data-&gt;alarm &amp;= 0xc0ff;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		for (chan=0; chan&lt;(data-&gt;chip_type == adm1030 ? 1 : 2); chan++) {</div><div class='add'>+		for (chan = 0; chan &lt; (data-&gt;chip_type == adm1030 ? 1 : 2);</div><div class='add'>+		     chan++) {</div><div class='ctx'> 			data-&gt;fan_div[chan] =</div><div class='del'>-			    adm1031_read_value(client, ADM1031_REG_FAN_DIV(chan));</div><div class='add'>+			    adm1031_read_value(client,</div><div class='add'>+					       ADM1031_REG_FAN_DIV(chan));</div><div class='ctx'> 			data-&gt;fan_min[chan] =</div><div class='del'>-			    adm1031_read_value(client, ADM1031_REG_FAN_MIN(chan));</div><div class='add'>+			    adm1031_read_value(client,</div><div class='add'>+					       ADM1031_REG_FAN_MIN(chan));</div><div class='ctx'> 			data-&gt;fan[chan] =</div><div class='del'>-			    adm1031_read_value(client, ADM1031_REG_FAN_SPEED(chan));</div><div class='add'>+			    adm1031_read_value(client,</div><div class='add'>+					       ADM1031_REG_FAN_SPEED(chan));</div><div class='ctx'> 			data-&gt;pwm[chan] =</div><div class='del'>-			    0xf &amp; (adm1031_read_value(client, ADM1031_REG_PWM) &gt;&gt;</div><div class='del'>-				   (4*chan));</div><div class='add'>+			  (adm1031_read_value(client,</div><div class='add'>+					ADM1031_REG_PWM) &gt;&gt; (4 * chan)) &amp; 0x0f;</div><div class='ctx'> 		}</div><div class='ctx'> 		data-&gt;last_updated = jiffies;</div><div class='ctx'> 		data-&gt;valid = 1;</div><div class='head'>diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c<br/>index 9e234b981b83..3f63f5f9741d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/adm9240.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/adm9240.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/adm9240.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/adm9240.c</a></div><div class='hunk'>@@ -503,7 +503,7 @@ static ssize_t chassis_clear(struct device *dev,</div><div class='ctx'> 	struct adm9240_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) || val != 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) || val != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='head'>diff --git a/drivers/hwmon/ads7828.c b/drivers/hwmon/ads7828.c<br/>index cfcc3b6fb6bf..ed60242d6a0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/ads7828.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/ads7828.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/ads7828.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/ads7828.c</a></div><div class='hunk'>@@ -48,8 +48,8 @@ static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,</div><div class='ctx'> 	I2C_CLIENT_END };</div><div class='ctx'> </div><div class='ctx'> /* Module parameters */</div><div class='del'>-static int se_input = 1; /* Default is SE, 0 == diff */</div><div class='del'>-static int int_vref = 1; /* Default is internal ref ON */</div><div class='add'>+static bool se_input = 1; /* Default is SE, 0 == diff */</div><div class='add'>+static bool int_vref = 1; /* Default is internal ref ON */</div><div class='ctx'> static int vref_mv = ADS7828_INT_VREF_MV; /* set if vref != 2.5V */</div><div class='ctx'> module_param(se_input, bool, S_IRUGO);</div><div class='ctx'> module_param(int_vref, bool, S_IRUGO);</div><div class='head'>diff --git a/drivers/hwmon/adt7411.c b/drivers/hwmon/adt7411.c<br/>index 5cc3e3784b42..5b02f7a91018 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/adt7411.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/adt7411.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/adt7411.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/adt7411.c</a></div><div class='hunk'>@@ -197,7 +197,7 @@ static ssize_t adt7411_set_bit(struct device *dev,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned long flag;</div><div class='ctx'> </div><div class='del'>-	ret = strict_strtoul(buf, 0, &amp;flag);</div><div class='add'>+	ret = kstrtoul(buf, 0, &amp;flag);</div><div class='ctx'> 	if (ret || flag &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/adt7462.c b/drivers/hwmon/adt7462.c<br/>index 2af0c7b6b4e4..7a1494846cfd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/adt7462.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/adt7462.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/adt7462.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/adt7462.c</a></div><div class='hunk'>@@ -833,7 +833,7 @@ static ssize_t set_temp_min(struct device *dev,</div><div class='ctx'> 	struct adt7462_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp) || !temp_enabled(data, attr-&gt;index))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp) || !temp_enabled(data, attr-&gt;index))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = DIV_ROUND_CLOSEST(temp, 1000) + 64;</div><div class='hunk'>@@ -871,7 +871,7 @@ static ssize_t set_temp_max(struct device *dev,</div><div class='ctx'> 	struct adt7462_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp) || !temp_enabled(data, attr-&gt;index))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp) || !temp_enabled(data, attr-&gt;index))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = DIV_ROUND_CLOSEST(temp, 1000) + 64;</div><div class='hunk'>@@ -935,7 +935,7 @@ static ssize_t set_volt_max(struct device *dev,</div><div class='ctx'> 	int x = voltage_multiplier(data, attr-&gt;index);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp) || !x)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp) || !x)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp *= 1000; /* convert mV to uV */</div><div class='hunk'>@@ -977,7 +977,7 @@ static ssize_t set_volt_min(struct device *dev,</div><div class='ctx'> 	int x = voltage_multiplier(data, attr-&gt;index);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp) || !x)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp) || !x)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp *= 1000; /* convert mV to uV */</div><div class='hunk'>@@ -1066,7 +1066,7 @@ static ssize_t set_fan_min(struct device *dev,</div><div class='ctx'> 	struct adt7462_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp) || !temp ||</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp) || !temp ||</div><div class='ctx'> 	    !fan_enabled(data, attr-&gt;index))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -1115,7 +1115,7 @@ static ssize_t set_force_pwm_max(struct device *dev,</div><div class='ctx'> 	long temp;</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;lock);</div><div class='hunk'>@@ -1147,7 +1147,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	struct adt7462_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = SENSORS_LIMIT(temp, 0, 255);</div><div class='hunk'>@@ -1177,7 +1177,7 @@ static ssize_t set_pwm_max(struct device *dev,</div><div class='ctx'> 	struct adt7462_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = SENSORS_LIMIT(temp, 0, 255);</div><div class='hunk'>@@ -1209,7 +1209,7 @@ static ssize_t set_pwm_min(struct device *dev,</div><div class='ctx'> 	struct adt7462_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = SENSORS_LIMIT(temp, 0, 255);</div><div class='hunk'>@@ -1243,7 +1243,7 @@ static ssize_t set_pwm_hyst(struct device *dev,</div><div class='ctx'> 	struct adt7462_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = DIV_ROUND_CLOSEST(temp, 1000);</div><div class='hunk'>@@ -1289,7 +1289,7 @@ static ssize_t set_pwm_tmax(struct device *dev,</div><div class='ctx'> 	int tmin, trange_value;</div><div class='ctx'> 	long trange;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;trange))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;trange))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* trange = tmax - tmin */</div><div class='hunk'>@@ -1330,7 +1330,7 @@ static ssize_t set_pwm_tmin(struct device *dev,</div><div class='ctx'> 	struct adt7462_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = DIV_ROUND_CLOSEST(temp, 1000) + 64;</div><div class='hunk'>@@ -1387,7 +1387,7 @@ static ssize_t set_pwm_auto(struct device *dev,</div><div class='ctx'> 	struct adt7462_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (temp) {</div><div class='hunk'>@@ -1446,7 +1446,7 @@ static ssize_t set_pwm_auto_temp(struct device *dev,</div><div class='ctx'> 	struct adt7462_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = cvt_auto_temp(temp);</div><div class='head'>diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c<br/>index c6d1ce059aea..5e10c79f2dfd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/adt7470.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/adt7470.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/adt7470.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/adt7470.c</a></div><div class='hunk'>@@ -449,7 +449,7 @@ static ssize_t set_auto_update_interval(struct device *dev,</div><div class='ctx'> 	struct adt7470_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = SENSORS_LIMIT(temp, 0, 60000);</div><div class='hunk'>@@ -478,7 +478,7 @@ static ssize_t set_num_temp_sensors(struct device *dev,</div><div class='ctx'> 	struct adt7470_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = SENSORS_LIMIT(temp, -1, 10);</div><div class='hunk'>@@ -511,7 +511,7 @@ static ssize_t set_temp_min(struct device *dev,</div><div class='ctx'> 	struct adt7470_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = DIV_ROUND_CLOSEST(temp, 1000);</div><div class='hunk'>@@ -545,7 +545,7 @@ static ssize_t set_temp_max(struct device *dev,</div><div class='ctx'> 	struct adt7470_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = DIV_ROUND_CLOSEST(temp, 1000);</div><div class='hunk'>@@ -600,7 +600,7 @@ static ssize_t set_fan_max(struct device *dev,</div><div class='ctx'> 	struct adt7470_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp) || !temp)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp) || !temp)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = FAN_RPM_TO_PERIOD(temp);</div><div class='hunk'>@@ -637,7 +637,7 @@ static ssize_t set_fan_min(struct device *dev,</div><div class='ctx'> 	struct adt7470_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp) || !temp)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp) || !temp)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = FAN_RPM_TO_PERIOD(temp);</div><div class='hunk'>@@ -682,7 +682,7 @@ static ssize_t set_force_pwm_max(struct device *dev,</div><div class='ctx'> 	long temp;</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;lock);</div><div class='hunk'>@@ -714,7 +714,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	struct adt7470_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = SENSORS_LIMIT(temp, 0, 255);</div><div class='hunk'>@@ -746,7 +746,7 @@ static ssize_t set_pwm_max(struct device *dev,</div><div class='ctx'> 	struct adt7470_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = SENSORS_LIMIT(temp, 0, 255);</div><div class='hunk'>@@ -779,7 +779,7 @@ static ssize_t set_pwm_min(struct device *dev,</div><div class='ctx'> 	struct adt7470_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = SENSORS_LIMIT(temp, 0, 255);</div><div class='hunk'>@@ -822,7 +822,7 @@ static ssize_t set_pwm_tmin(struct device *dev,</div><div class='ctx'> 	struct adt7470_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = DIV_ROUND_CLOSEST(temp, 1000);</div><div class='hunk'>@@ -859,7 +859,7 @@ static ssize_t set_pwm_auto(struct device *dev,</div><div class='ctx'> 	long temp;</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (attr-&gt;index % 2)</div><div class='hunk'>@@ -919,7 +919,7 @@ static ssize_t set_pwm_auto_temp(struct device *dev,</div><div class='ctx'> 	long temp;</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;temp))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;temp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = cvt_auto_temp(temp);</div><div class='head'>diff --git a/drivers/hwmon/adt7475.c b/drivers/hwmon/adt7475.c<br/>index b5fcd87931cb..7dab3547fee5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/adt7475.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/adt7475.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/adt7475.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/adt7475.c</a></div><div class='hunk'>@@ -343,7 +343,7 @@ static ssize_t set_voltage(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	unsigned char reg;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;lock);</div><div class='hunk'>@@ -432,7 +432,7 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int temp;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;lock);</div><div class='hunk'>@@ -546,7 +546,7 @@ static ssize_t set_point2(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int temp;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;lock);</div><div class='hunk'>@@ -602,7 +602,7 @@ static ssize_t set_tach(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct adt7475_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;lock);</div><div class='hunk'>@@ -653,7 +653,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	unsigned char reg = 0;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;lock);</div><div class='hunk'>@@ -758,7 +758,7 @@ static ssize_t set_pwmchan(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int r;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;lock);</div><div class='hunk'>@@ -781,7 +781,7 @@ static ssize_t set_pwmctrl(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int r;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;lock);</div><div class='hunk'>@@ -819,7 +819,7 @@ static ssize_t set_pwmfreq(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int out;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	out = find_nearest(val, pwmfreq_table, ARRAY_SIZE(pwmfreq_table));</div><div class='hunk'>@@ -853,7 +853,7 @@ static ssize_t set_pwm_at_crit(struct device *dev,</div><div class='ctx'> 	struct adt7475_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (val != 0 &amp;&amp; val != 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -883,7 +883,7 @@ static ssize_t set_vrm(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	struct adt7475_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (val &lt; 0 || val &gt; 255)</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/hwmon/amc6821.c b/drivers/hwmon/amc6821.c<br/>index 4033974d1bb3..89a6b9da0ec3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/amc6821.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/amc6821.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/amc6821.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/amc6821.c</a></div><div class='hunk'>@@ -238,7 +238,7 @@ static ssize_t set_temp(</div><div class='ctx'> 	int ix = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	int ret = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	int ret = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	val = SENSORS_LIMIT(val / 1000, -128, 127);</div><div class='hunk'>@@ -327,7 +327,7 @@ static ssize_t set_pwm1(</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct amc6821_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long val;</div><div class='del'>-	int ret = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	int ret = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -356,7 +356,7 @@ static ssize_t set_pwm1_enable(</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct amc6821_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long val;</div><div class='del'>-	int config = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	int config = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (config)</div><div class='ctx'> 		return config;</div><div class='ctx'> </div><div class='hunk'>@@ -477,7 +477,7 @@ static ssize_t set_temp_auto_point_temp(</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> 	int dpwm;</div><div class='ctx'> 	long val;</div><div class='del'>-	int ret = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	int ret = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -556,7 +556,7 @@ static ssize_t set_pwm1_auto_point_pwm(</div><div class='ctx'> 	struct amc6821_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	int dpwm;</div><div class='ctx'> 	long val;</div><div class='del'>-	int ret = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	int ret = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -623,7 +623,7 @@ static ssize_t set_fan(</div><div class='ctx'> 	struct amc6821_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long val;</div><div class='ctx'> 	int ix = to_sensor_dev_attr(attr)-&gt;index;</div><div class='del'>-	int ret = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	int ret = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	val = 1 &gt; val ? 0xFFFF : 6000000/val;</div><div class='hunk'>@@ -665,7 +665,7 @@ static ssize_t set_fan1_div(</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct amc6821_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long val;</div><div class='del'>-	int config = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	int config = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (config)</div><div class='ctx'> 		return config;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c<br/>index 4c0743660e9c..b9895531240d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/applesmc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/applesmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/applesmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/applesmc.c</a></div><div class='hunk'>@@ -782,7 +782,7 @@ static ssize_t applesmc_store_fan_speed(struct device *dev,</div><div class='ctx'> 	char newkey[5];</div><div class='ctx'> 	u8 buffer[2];</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(sysfsbuf, 10, &amp;speed) &lt; 0 || speed &gt;= 0x4000)</div><div class='add'>+	if (kstrtoul(sysfsbuf, 10, &amp;speed) &lt; 0 || speed &gt;= 0x4000)</div><div class='ctx'> 		return -EINVAL;		/* Bigger than a 14-bit value */</div><div class='ctx'> </div><div class='ctx'> 	sprintf(newkey, fan_speed_fmt[to_option(attr)], to_index(attr));</div><div class='hunk'>@@ -822,7 +822,7 @@ static ssize_t applesmc_store_fan_manual(struct device *dev,</div><div class='ctx'> 	unsigned long input;</div><div class='ctx'> 	u16 val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(sysfsbuf, 10, &amp;input) &lt; 0)</div><div class='add'>+	if (kstrtoul(sysfsbuf, 10, &amp;input) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ret = applesmc_read_key(FANS_MANUAL, buffer, 2);</div><div class='hunk'>@@ -977,7 +977,7 @@ static ssize_t applesmc_key_at_index_store(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long newkey;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(sysfsbuf, 10, &amp;newkey) &lt; 0</div><div class='add'>+	if (kstrtoul(sysfsbuf, 10, &amp;newkey) &lt; 0</div><div class='ctx'> 	    || newkey &gt;= smcreg.key_count)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/asc7621.c b/drivers/hwmon/asc7621.c<br/>index d2596cec18b5..3efd32449982 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/asc7621.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/asc7621.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/asc7621.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/asc7621.c</a></div><div class='hunk'>@@ -188,7 +188,7 @@ static ssize_t store_u8(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	SETUP_STORE_data_param(dev, attr);</div><div class='ctx'> 	long reqval;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;reqval))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;reqval))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	reqval = SENSORS_LIMIT(reqval, 0, 255);</div><div class='hunk'>@@ -221,7 +221,7 @@ static ssize_t store_bitmask(struct device *dev,</div><div class='ctx'> 	long reqval;</div><div class='ctx'> 	u8 currval;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;reqval))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;reqval))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	reqval = SENSORS_LIMIT(reqval, 0, param-&gt;mask[0]);</div><div class='hunk'>@@ -265,7 +265,7 @@ static ssize_t store_fan16(struct device *dev,</div><div class='ctx'> 	SETUP_STORE_data_param(dev, attr);</div><div class='ctx'> 	long reqval;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;reqval))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;reqval))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* If a minimum RPM of zero is requested, then we set the register to</div><div class='hunk'>@@ -338,7 +338,7 @@ static ssize_t store_in8(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	long reqval;</div><div class='ctx'> 	u8 nr = sda-&gt;index;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;reqval))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;reqval))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	reqval = SENSORS_LIMIT(reqval, 0, 0xffff);</div><div class='hunk'>@@ -371,7 +371,7 @@ static ssize_t store_temp8(struct device *dev,</div><div class='ctx'> 	long reqval;</div><div class='ctx'> 	s8 temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;reqval))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;reqval))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	reqval = SENSORS_LIMIT(reqval, -127000, 127000);</div><div class='hunk'>@@ -427,7 +427,7 @@ static ssize_t store_temp62(struct device *dev,</div><div class='ctx'> 	long reqval, i, f;</div><div class='ctx'> 	s8 temp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;reqval))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;reqval))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	reqval = SENSORS_LIMIT(reqval, -32000, 31750);</div><div class='hunk'>@@ -482,7 +482,7 @@ static ssize_t store_ap2_temp(struct device *dev,</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u8 currval, newval = 0;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;reqval))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;reqval))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -538,7 +538,7 @@ static ssize_t store_pwm_ac(struct device *dev,</div><div class='ctx'> 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;reqval))</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;reqval))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (reqval &gt; 31)</div><div class='hunk'>@@ -601,7 +601,7 @@ static ssize_t store_pwm_enable(struct device *dev,</div><div class='ctx'> 	long reqval;</div><div class='ctx'> 	u8 currval, config, altbit, newval, minoff = 255;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;reqval))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;reqval))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (reqval) {</div><div class='hunk'>@@ -675,7 +675,7 @@ static ssize_t store_pwm_freq(struct device *dev,</div><div class='ctx'> 	u8 currval, newval = 255;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;reqval))</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;reqval))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(asc7621_pwm_freq_map); i++) {</div><div class='hunk'>@@ -724,7 +724,7 @@ static ssize_t store_pwm_ast(struct device *dev,</div><div class='ctx'> 	u8 currval, newval = 255;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;reqval))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;reqval))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(asc7621_pwm_auto_spinup_map); i++) {</div><div class='hunk'>@@ -771,7 +771,7 @@ static ssize_t store_temp_st(struct device *dev,</div><div class='ctx'> 	u8 currval, newval = 255;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;reqval))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;reqval))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(asc7621_temp_smoothing_time_map); i++) {</div><div class='head'>diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c<br/>index 1fdef885341c..a6c6ec36615e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/coretemp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/coretemp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/coretemp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/coretemp.c</a></div><div class='hunk'>@@ -190,7 +190,8 @@ static ssize_t show_temp(struct device *dev,</div><div class='ctx'> 	return tdata-&gt;valid ? sprintf(buf, "%d\n", tdata-&gt;temp) : -EAGAIN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)</div><div class='add'>+static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,</div><div class='add'>+				  struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* The 100C is default for both mobile and non mobile CPUs */</div><div class='ctx'> </div><div class='hunk'>@@ -284,7 +285,8 @@ static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)</div><div class='ctx'> 	return tjmax;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)</div><div class='add'>+static int __cpuinit get_tjmax(struct cpuinfo_x86 *c, u32 id,</div><div class='add'>+			       struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u32 eax, edx;</div><div class='hunk'>@@ -323,7 +325,8 @@ static int get_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)</div><div class='ctx'> 	return adjust_tjmax(c, id, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int create_name_attr(struct platform_data *pdata, struct device *dev)</div><div class='add'>+static int __devinit create_name_attr(struct platform_data *pdata,</div><div class='add'>+				      struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	sysfs_attr_init(&amp;pdata-&gt;name_attr.attr);</div><div class='ctx'> 	pdata-&gt;name_attr.attr.name = "name";</div><div class='hunk'>@@ -332,8 +335,8 @@ static int create_name_attr(struct platform_data *pdata, struct device *dev)</div><div class='ctx'> 	return device_create_file(dev, &amp;pdata-&gt;name_attr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int create_core_attrs(struct temp_data *tdata, struct device *dev,</div><div class='del'>-				int attr_no)</div><div class='add'>+static int __cpuinit create_core_attrs(struct temp_data *tdata,</div><div class='add'>+				       struct device *dev, int attr_no)</div><div class='ctx'> {</div><div class='ctx'> 	int err, i;</div><div class='ctx'> 	static ssize_t (*const rd_ptr[TOTAL_ATTRS]) (struct device *dev,</div><div class='hunk'>@@ -383,7 +386,7 @@ static int __cpuinit chk_ucode_version(unsigned int cpu)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct platform_device *coretemp_get_pdev(unsigned int cpu)</div><div class='add'>+static struct platform_device __cpuinit *coretemp_get_pdev(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	u16 phys_proc_id = TO_PHYS_ID(cpu);</div><div class='ctx'> 	struct pdev_entry *p;</div><div class='hunk'>@@ -400,7 +403,8 @@ static struct platform_device *coretemp_get_pdev(unsigned int cpu)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct temp_data *init_temp_data(unsigned int cpu, int pkg_flag)</div><div class='add'>+static struct temp_data __cpuinit *init_temp_data(unsigned int cpu,</div><div class='add'>+						  int pkg_flag)</div><div class='ctx'> {</div><div class='ctx'> 	struct temp_data *tdata;</div><div class='ctx'> </div><div class='hunk'>@@ -418,7 +422,7 @@ static struct temp_data *init_temp_data(unsigned int cpu, int pkg_flag)</div><div class='ctx'> 	return tdata;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int create_core_data(struct platform_device *pdev,</div><div class='add'>+static int __cpuinit create_core_data(struct platform_device *pdev,</div><div class='ctx'> 				unsigned int cpu, int pkg_flag)</div><div class='ctx'> {</div><div class='ctx'> 	struct temp_data *tdata;</div><div class='hunk'>@@ -489,7 +493,7 @@ exit_free:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void coretemp_add_core(unsigned int cpu, int pkg_flag)</div><div class='add'>+static void __cpuinit coretemp_add_core(unsigned int cpu, int pkg_flag)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *pdev = coretemp_get_pdev(cpu);</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -618,7 +622,7 @@ exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void coretemp_device_remove(unsigned int cpu)</div><div class='add'>+static void __cpuinit coretemp_device_remove(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct pdev_entry *p, *n;</div><div class='ctx'> 	u16 phys_proc_id = TO_PHYS_ID(cpu);</div><div class='hunk'>@@ -634,7 +638,7 @@ static void coretemp_device_remove(unsigned int cpu)</div><div class='ctx'> 	mutex_unlock(&amp;pdev_list_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool is_any_core_online(struct platform_data *pdata)</div><div class='add'>+static bool __cpuinit is_any_core_online(struct platform_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c<br/>index d9c592713919..ffb229af7861 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/dme1737.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/dme1737.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/dme1737.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/dme1737.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'> static struct platform_device *pdev;</div><div class='ctx'> </div><div class='ctx'> /* Module load parameters */</div><div class='del'>-static int force_start;</div><div class='add'>+static bool force_start;</div><div class='ctx'> module_param(force_start, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(force_start, "Force the chip to start monitoring inputs");</div><div class='ctx'> </div><div class='hunk'>@@ -53,7 +53,7 @@ static unsigned short force_id;</div><div class='ctx'> module_param(force_id, ushort, 0);</div><div class='ctx'> MODULE_PARM_DESC(force_id, "Override the detected device ID");</div><div class='ctx'> </div><div class='del'>-static int probe_all_addr;</div><div class='add'>+static bool probe_all_addr;</div><div class='ctx'> module_param(probe_all_addr, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(probe_all_addr, "Include probing of non-standard LPC "</div><div class='ctx'> 		 "addresses");</div><div class='hunk'>@@ -1223,7 +1223,7 @@ static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct attribute *dme1737_pwm_chmod_attr[];</div><div class='del'>-static void dme1737_chmod_file(struct device*, struct attribute*, mode_t);</div><div class='add'>+static void dme1737_chmod_file(struct device*, struct attribute*, umode_t);</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		       const char *buf, size_t count)</div><div class='hunk'>@@ -1961,7 +1961,7 @@ static inline void dme1737_sio_outb(int sio_cip, int reg, int val)</div><div class='ctx'> static int dme1737_i2c_get_features(int, struct dme1737_data*);</div><div class='ctx'> </div><div class='ctx'> static void dme1737_chmod_file(struct device *dev,</div><div class='del'>-			       struct attribute *attr, mode_t mode)</div><div class='add'>+			       struct attribute *attr, umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	if (sysfs_chmod_file(&amp;dev-&gt;kobj, attr, mode)) {</div><div class='ctx'> 		dev_warn(dev, "Failed to change permissions of %s.\n",</div><div class='hunk'>@@ -1971,7 +1971,7 @@ static void dme1737_chmod_file(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> static void dme1737_chmod_group(struct device *dev,</div><div class='ctx'> 				const struct attribute_group *group,</div><div class='del'>-				mode_t mode)</div><div class='add'>+				umode_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct attribute **attr;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/ds620.c b/drivers/hwmon/ds620.c<br/>index 225ae4f36583..300c3d4d67df 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/ds620.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/ds620.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/ds620.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/ds620.c</a></div><div class='hunk'>@@ -161,7 +161,7 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct ds620_data *data = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='del'>-	res = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	res = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> </div><div class='ctx'> 	if (res)</div><div class='ctx'> 		return res;</div><div class='head'>diff --git a/drivers/hwmon/emc1403.c b/drivers/hwmon/emc1403.c<br/>index cd2a6e437aec..270ffab711cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/emc1403.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/emc1403.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/emc1403.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/emc1403.c</a></div><div class='hunk'>@@ -80,7 +80,7 @@ static ssize_t store_temp(struct device *dev,</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	retval = i2c_smbus_write_byte_data(client, sda-&gt;index,</div><div class='ctx'> 					DIV_ROUND_CLOSEST(val, 1000));</div><div class='hunk'>@@ -98,7 +98,7 @@ static ssize_t store_bit(struct device *dev,</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;mutex);</div><div class='hunk'>@@ -151,7 +151,7 @@ static ssize_t store_hyst(struct device *dev,</div><div class='ctx'> 	int hyst;</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;mutex);</div><div class='head'>diff --git a/drivers/hwmon/emc2103.c b/drivers/hwmon/emc2103.c<br/>index af914ad93ece..865063914d76 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/emc2103.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/emc2103.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/emc2103.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/emc2103.c</a></div><div class='hunk'>@@ -55,7 +55,7 @@ static const u8 REG_TEMP_MAX[4] = { 0x34, 0x30, 0x31, 0x32 };</div><div class='ctx'>  * it.  Default is to leave the device in the state it's already in (-1).</div><div class='ctx'>  * This parameter allows APD mode to be optionally forced on or off */</div><div class='ctx'> static int apd = -1;</div><div class='del'>-module_param(apd, bool, 0);</div><div class='add'>+module_param(apd, bint, 0);</div><div class='ctx'> MODULE_PARM_DESC(init, "Set to zero to disable anti-parallel diode mode");</div><div class='ctx'> </div><div class='ctx'> struct temperature {</div><div class='hunk'>@@ -244,7 +244,7 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	struct emc2103_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	int result = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	int result = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (result &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -268,7 +268,7 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	struct emc2103_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	int result = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	int result = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (result &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -314,7 +314,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	int new_range_bits, old_div = 8 / data-&gt;fan_multiplier;</div><div class='ctx'> 	long new_div;</div><div class='ctx'> </div><div class='del'>-	int status = strict_strtol(buf, 10, &amp;new_div);</div><div class='add'>+	int status = kstrtol(buf, 10, &amp;new_div);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -388,7 +388,7 @@ static ssize_t set_fan_target(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	long rpm_target;</div><div class='ctx'> </div><div class='del'>-	int result = strict_strtol(buf, 10, &amp;rpm_target);</div><div class='add'>+	int result = kstrtol(buf, 10, &amp;rpm_target);</div><div class='ctx'> 	if (result &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -434,7 +434,7 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	long new_value;</div><div class='ctx'> 	u8 conf_reg;</div><div class='ctx'> </div><div class='del'>-	int result = strict_strtol(buf, 10, &amp;new_value);</div><div class='add'>+	int result = kstrtol(buf, 10, &amp;new_value);</div><div class='ctx'> 	if (result &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/emc6w201.c b/drivers/hwmon/emc6w201.c<br/>index 0064432f361f..6ebb9b738c9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/emc6w201.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/emc6w201.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/emc6w201.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/emc6w201.c</a></div><div class='hunk'>@@ -212,7 +212,7 @@ static ssize_t set_in(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	long val;</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -249,7 +249,7 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	long val;</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -291,7 +291,7 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</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/drivers/hwmon/f71882fg.c b/drivers/hwmon/f71882fg.c<br/>index 59dd881c71d8..e50305819f01 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/f71882fg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/f71882fg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/f71882fg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/f71882fg.c</a></div><div class='hunk'>@@ -1333,7 +1333,7 @@ static ssize_t store_fan_full_speed(struct device *dev,</div><div class='ctx'> 	int err, nr = to_sensor_dev_attr_2(devattr)-&gt;index;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1367,7 +1367,7 @@ static ssize_t store_fan_beep(struct device *dev, struct device_attribute</div><div class='ctx'> 	int err, nr = to_sensor_dev_attr_2(devattr)-&gt;index;</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1420,7 +1420,7 @@ static ssize_t store_in_max(struct device *dev, struct device_attribute</div><div class='ctx'> 	int err;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1454,7 +1454,7 @@ static ssize_t store_in_beep(struct device *dev, struct device_attribute</div><div class='ctx'> 	int err, nr = to_sensor_dev_attr_2(devattr)-&gt;index;</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1524,7 +1524,7 @@ static ssize_t store_temp_max(struct device *dev, struct device_attribute</div><div class='ctx'> 	int err, nr = to_sensor_dev_attr_2(devattr)-&gt;index;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1566,7 +1566,7 @@ static ssize_t store_temp_max_hyst(struct device *dev, struct device_attribute</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1609,7 +1609,7 @@ static ssize_t store_temp_crit(struct device *dev, struct device_attribute</div><div class='ctx'> 	int err, nr = to_sensor_dev_attr_2(devattr)-&gt;index;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1670,7 +1670,7 @@ static ssize_t store_temp_beep(struct device *dev, struct device_attribute</div><div class='ctx'> 	int err, nr = to_sensor_dev_attr_2(devattr)-&gt;index;</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1737,7 +1737,7 @@ static ssize_t store_pwm(struct device *dev,</div><div class='ctx'> 	int err, nr = to_sensor_dev_attr_2(devattr)-&gt;index;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1788,7 +1788,7 @@ static ssize_t store_simple_pwm(struct device *dev,</div><div class='ctx'> 	int err, nr = to_sensor_dev_attr_2(devattr)-&gt;index;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1835,7 +1835,7 @@ static ssize_t store_pwm_enable(struct device *dev, struct device_attribute</div><div class='ctx'> 	int err, nr = to_sensor_dev_attr_2(devattr)-&gt;index;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1915,7 +1915,7 @@ static ssize_t store_pwm_auto_point_pwm(struct device *dev,</div><div class='ctx'> 	int point = to_sensor_dev_attr_2(devattr)-&gt;nr;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1969,7 +1969,7 @@ static ssize_t store_pwm_auto_point_temp_hyst(struct device *dev,</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -2015,7 +2015,7 @@ static ssize_t store_pwm_interpolate(struct device *dev,</div><div class='ctx'> 	int err, nr = to_sensor_dev_attr_2(devattr)-&gt;index;</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -2055,7 +2055,7 @@ static ssize_t store_pwm_auto_point_channel(struct device *dev,</div><div class='ctx'> 	int err, nr = to_sensor_dev_attr_2(devattr)-&gt;index;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -2106,7 +2106,7 @@ static ssize_t store_pwm_auto_point_temp(struct device *dev,</div><div class='ctx'> 	int point = to_sensor_dev_attr_2(devattr)-&gt;nr;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c<br/>index 95cbfb3a7077..eedf574ab539 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/f75375s.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/f75375s.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/f75375s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/f75375s.c</a></div><div class='hunk'>@@ -1,16 +1,19 @@</div><div class='ctx'> /*</div><div class='del'>- * f75375s.c - driver for the Fintek F75375/SP and F75373</div><div class='del'>- *             hardware monitoring features</div><div class='add'>+ * f75375s.c - driver for the Fintek F75375/SP, F75373 and</div><div class='add'>+ *             F75387SG/RG hardware monitoring features</div><div class='ctx'>  * Copyright (C) 2006-2007  Riku Voipio</div><div class='ctx'>  *</div><div class='ctx'>  * Datasheets available at:</div><div class='ctx'>  *</div><div class='ctx'>  * f75375:</div><div class='del'>- * http://www.fintek.com.tw/files/productfiles/F75375_V026P.pdf </div><div class='add'>+ * http://www.fintek.com.tw/files/productfiles/F75375_V026P.pdf</div><div class='ctx'>  *</div><div class='ctx'>  * f75373:</div><div class='ctx'>  * http://www.fintek.com.tw/files/productfiles/F75373_V025P.pdf</div><div class='ctx'>  *</div><div class='add'>+ * f75387:</div><div class='add'>+ * http://www.fintek.com.tw/files/productfiles/F75387_V027P.pdf</div><div class='add'>+ *</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='ctx'>  * the Free Software Foundation; either version 2 of the License, or</div><div class='hunk'>@@ -40,7 +43,7 @@</div><div class='ctx'> /* Addresses to scan */</div><div class='ctx'> static const unsigned short normal_i2c[] = { 0x2d, 0x2e, I2C_CLIENT_END };</div><div class='ctx'> </div><div class='del'>-enum chips { f75373, f75375 };</div><div class='add'>+enum chips { f75373, f75375, f75387 };</div><div class='ctx'> </div><div class='ctx'> /* Fintek F75375 registers  */</div><div class='ctx'> #define F75375_REG_CONFIG0		0x0</div><div class='hunk'>@@ -59,6 +62,7 @@ enum chips { f75373, f75375 };</div><div class='ctx'> #define F75375_REG_VOLT_LOW(nr)		(0x21 + (nr) * 2)</div><div class='ctx'> </div><div class='ctx'> #define F75375_REG_TEMP(nr)		(0x14 + (nr))</div><div class='add'>+#define F75387_REG_TEMP11_LSB(nr)	(0x1a + (nr))</div><div class='ctx'> #define F75375_REG_TEMP_HIGH(nr)	(0x28 + (nr) * 2)</div><div class='ctx'> #define F75375_REG_TEMP_HYST(nr)	(0x29 + (nr) * 2)</div><div class='ctx'> </div><div class='hunk'>@@ -78,8 +82,11 @@ enum chips { f75373, f75375 };</div><div class='ctx'> #define F75375_REG_PWM1_DROP_DUTY	0x6B</div><div class='ctx'> #define F75375_REG_PWM2_DROP_DUTY	0x6C</div><div class='ctx'> </div><div class='del'>-#define FAN_CTRL_LINEAR(nr)		(4 + nr)</div><div class='add'>+#define F75375_FAN_CTRL_LINEAR(nr)	(4 + nr)</div><div class='add'>+#define F75387_FAN_CTRL_LINEAR(nr)	(1 + ((nr) * 4))</div><div class='ctx'> #define FAN_CTRL_MODE(nr)		(4 + ((nr) * 2))</div><div class='add'>+#define F75387_FAN_DUTY_MODE(nr)	(2 + ((nr) * 4))</div><div class='add'>+#define F75387_FAN_MANU_MODE(nr)	((nr) * 4)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Data structures and manipulation thereof</div><div class='hunk'>@@ -102,13 +109,18 @@ struct f75375_data {</div><div class='ctx'> 	u8 in_min[4];</div><div class='ctx'> 	u16 fan[2];</div><div class='ctx'> 	u16 fan_min[2];</div><div class='del'>-	u16 fan_full[2];</div><div class='del'>-	u16 fan_exp[2];</div><div class='add'>+	u16 fan_max[2];</div><div class='add'>+	u16 fan_target[2];</div><div class='ctx'> 	u8 fan_timer;</div><div class='ctx'> 	u8 pwm[2];</div><div class='ctx'> 	u8 pwm_mode[2];</div><div class='ctx'> 	u8 pwm_enable[2];</div><div class='del'>-	s8 temp[2];</div><div class='add'>+	/*</div><div class='add'>+	 * f75387: For remote temperature reading, it uses signed 11-bit</div><div class='add'>+	 * values with LSB = 0.125 degree Celsius, left-justified in 16-bit</div><div class='add'>+	 * registers. For original 8-bit temp readings, the LSB just is 0.</div><div class='add'>+	 */</div><div class='add'>+	s16 temp11[2];</div><div class='ctx'> 	s8 temp_high[2];</div><div class='ctx'> 	s8 temp_max_hyst[2];</div><div class='ctx'> };</div><div class='hunk'>@@ -122,6 +134,7 @@ static int f75375_remove(struct i2c_client *client);</div><div class='ctx'> static const struct i2c_device_id f75375_id[] = {</div><div class='ctx'> 	{ "f75373", f75373 },</div><div class='ctx'> 	{ "f75375", f75375 },</div><div class='add'>+	{ "f75387", f75387 },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, f75375_id);</div><div class='hunk'>@@ -146,8 +159,8 @@ static inline int f75375_read8(struct i2c_client *client, u8 reg)</div><div class='ctx'> /* in most cases, should be called while holding update_lock */</div><div class='ctx'> static inline u16 f75375_read16(struct i2c_client *client, u8 reg)</div><div class='ctx'> {</div><div class='del'>-	return ((i2c_smbus_read_byte_data(client, reg) &lt;&lt; 8)</div><div class='del'>-		| i2c_smbus_read_byte_data(client, reg + 1));</div><div class='add'>+	return (i2c_smbus_read_byte_data(client, reg) &lt;&lt; 8)</div><div class='add'>+		| i2c_smbus_read_byte_data(client, reg + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void f75375_write8(struct i2c_client *client, u8 reg,</div><div class='hunk'>@@ -181,11 +194,11 @@ static struct f75375_data *f75375_update_device(struct device *dev)</div><div class='ctx'> 				f75375_read8(client, F75375_REG_TEMP_HIGH(nr));</div><div class='ctx'> 			data-&gt;temp_max_hyst[nr] =</div><div class='ctx'> 				f75375_read8(client, F75375_REG_TEMP_HYST(nr));</div><div class='del'>-			data-&gt;fan_full[nr] =</div><div class='add'>+			data-&gt;fan_max[nr] =</div><div class='ctx'> 				f75375_read16(client, F75375_REG_FAN_FULL(nr));</div><div class='ctx'> 			data-&gt;fan_min[nr] =</div><div class='ctx'> 				f75375_read16(client, F75375_REG_FAN_MIN(nr));</div><div class='del'>-			data-&gt;fan_exp[nr] =</div><div class='add'>+			data-&gt;fan_target[nr] =</div><div class='ctx'> 				f75375_read16(client, F75375_REG_FAN_EXP(nr));</div><div class='ctx'> 			data-&gt;pwm[nr] =	f75375_read8(client,</div><div class='ctx'> 				F75375_REG_FAN_PWM_DUTY(nr));</div><div class='hunk'>@@ -205,8 +218,14 @@ static struct f75375_data *f75375_update_device(struct device *dev)</div><div class='ctx'> 	if (time_after(jiffies, data-&gt;last_updated + 2 * HZ)</div><div class='ctx'> 		|| !data-&gt;valid) {</div><div class='ctx'> 		for (nr = 0; nr &lt; 2; nr++) {</div><div class='del'>-			data-&gt;temp[nr] =</div><div class='del'>-				f75375_read8(client, F75375_REG_TEMP(nr));</div><div class='add'>+			/* assign MSB, therefore shift it by 8 bits */</div><div class='add'>+			data-&gt;temp11[nr] =</div><div class='add'>+				f75375_read8(client, F75375_REG_TEMP(nr)) &lt;&lt; 8;</div><div class='add'>+			if (data-&gt;kind == f75387)</div><div class='add'>+				/* merge F75387's temperature LSB (11-bit) */</div><div class='add'>+				data-&gt;temp11[nr] |=</div><div class='add'>+					f75375_read8(client,</div><div class='add'>+						     F75387_REG_TEMP11_LSB(nr));</div><div class='ctx'> 			data-&gt;fan[nr] =</div><div class='ctx'> 				f75375_read16(client, F75375_REG_FAN(nr));</div><div class='ctx'> 		}</div><div class='hunk'>@@ -226,14 +245,14 @@ static inline u16 rpm_from_reg(u16 reg)</div><div class='ctx'> {</div><div class='ctx'> 	if (reg == 0 || reg == 0xffff)</div><div class='ctx'> 		return 0;</div><div class='del'>-	return (1500000 / reg);</div><div class='add'>+	return 1500000 / reg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u16 rpm_to_reg(int rpm)</div><div class='ctx'> {</div><div class='ctx'> 	if (rpm &lt; 367 || rpm &gt; 0xffff)</div><div class='ctx'> 		return 0xffff;</div><div class='del'>-	return (1500000 / rpm);</div><div class='add'>+	return 1500000 / rpm;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -242,7 +261,12 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct f75375_data *data = i2c_get_clientdata(client);</div><div class='del'>-	int val = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;fan_min[nr] = rpm_to_reg(val);</div><div class='hunk'>@@ -251,17 +275,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'>-static ssize_t set_fan_exp(struct device *dev, struct device_attribute *attr,</div><div class='add'>+static ssize_t set_fan_target(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		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 i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct f75375_data *data = i2c_get_clientdata(client);</div><div class='del'>-	int val = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='del'>-	data-&gt;fan_exp[nr] = rpm_to_reg(val);</div><div class='del'>-	f75375_write16(client, F75375_REG_FAN_EXP(nr), data-&gt;fan_exp[nr]);</div><div class='add'>+	data-&gt;fan_target[nr] = rpm_to_reg(val);</div><div class='add'>+	f75375_write16(client, F75375_REG_FAN_EXP(nr), data-&gt;fan_target[nr]);</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -272,7 +301,12 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct f75375_data *data = i2c_get_clientdata(client);</div><div class='del'>-	int val = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;pwm[nr] = SENSORS_LIMIT(val, 0, 255);</div><div class='hunk'>@@ -294,28 +328,54 @@ static int set_pwm_enable_direct(struct i2c_client *client, int nr, int val)</div><div class='ctx'> 	struct f75375_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	u8 fanmode;</div><div class='ctx'> </div><div class='del'>-	if (val &lt; 0 || val &gt; 4)</div><div class='add'>+	if (val &lt; 0 || val &gt; 3)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	fanmode = f75375_read8(client, F75375_REG_FAN_TIMER);</div><div class='del'>-	fanmode &amp;= ~(3 &lt;&lt; FAN_CTRL_MODE(nr));</div><div class='del'>-</div><div class='del'>-	switch (val) {</div><div class='del'>-	case 0: /* Full speed */</div><div class='del'>-		fanmode  |= (3 &lt;&lt; FAN_CTRL_MODE(nr));</div><div class='del'>-		data-&gt;pwm[nr] = 255;</div><div class='del'>-		f75375_write8(client, F75375_REG_FAN_PWM_DUTY(nr),</div><div class='del'>-				data-&gt;pwm[nr]);</div><div class='del'>-		break;</div><div class='del'>-	case 1: /* PWM */</div><div class='del'>-		fanmode  |= (3 &lt;&lt; FAN_CTRL_MODE(nr));</div><div class='del'>-		break;</div><div class='del'>-	case 2: /* AUTOMATIC*/</div><div class='del'>-		fanmode  |= (2 &lt;&lt; FAN_CTRL_MODE(nr));</div><div class='del'>-		break;</div><div class='del'>-	case 3: /* fan speed */</div><div class='del'>-		break;</div><div class='add'>+	if (data-&gt;kind == f75387) {</div><div class='add'>+		/* clear each fanX_mode bit before setting them properly */</div><div class='add'>+		fanmode &amp;= ~(1 &lt;&lt; F75387_FAN_DUTY_MODE(nr));</div><div class='add'>+		fanmode &amp;= ~(1 &lt;&lt; F75387_FAN_MANU_MODE(nr));</div><div class='add'>+		switch (val) {</div><div class='add'>+		case 0: /* full speed */</div><div class='add'>+			fanmode |= (1 &lt;&lt; F75387_FAN_MANU_MODE(nr));</div><div class='add'>+			fanmode |= (1 &lt;&lt; F75387_FAN_DUTY_MODE(nr));</div><div class='add'>+			data-&gt;pwm[nr] = 255;</div><div class='add'>+			f75375_write8(client, F75375_REG_FAN_PWM_DUTY(nr),</div><div class='add'>+					data-&gt;pwm[nr]);</div><div class='add'>+			break;</div><div class='add'>+		case 1: /* PWM */</div><div class='add'>+			fanmode  |= (1 &lt;&lt; F75387_FAN_MANU_MODE(nr));</div><div class='add'>+			fanmode  |= (1 &lt;&lt; F75387_FAN_DUTY_MODE(nr));</div><div class='add'>+			break;</div><div class='add'>+		case 2: /* AUTOMATIC*/</div><div class='add'>+			fanmode  |=  (1 &lt;&lt; F75387_FAN_DUTY_MODE(nr));</div><div class='add'>+			break;</div><div class='add'>+		case 3: /* fan speed */</div><div class='add'>+			fanmode |= (1 &lt;&lt; F75387_FAN_MANU_MODE(nr));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* clear each fanX_mode bit before setting them properly */</div><div class='add'>+		fanmode &amp;= ~(3 &lt;&lt; FAN_CTRL_MODE(nr));</div><div class='add'>+		switch (val) {</div><div class='add'>+		case 0: /* full speed */</div><div class='add'>+			fanmode  |= (3 &lt;&lt; FAN_CTRL_MODE(nr));</div><div class='add'>+			data-&gt;pwm[nr] = 255;</div><div class='add'>+			f75375_write8(client, F75375_REG_FAN_PWM_DUTY(nr),</div><div class='add'>+					data-&gt;pwm[nr]);</div><div class='add'>+			break;</div><div class='add'>+		case 1: /* PWM */</div><div class='add'>+			fanmode  |= (3 &lt;&lt; FAN_CTRL_MODE(nr));</div><div class='add'>+			break;</div><div class='add'>+		case 2: /* AUTOMATIC*/</div><div class='add'>+			fanmode  |= (2 &lt;&lt; FAN_CTRL_MODE(nr));</div><div class='add'>+			break;</div><div class='add'>+		case 3: /* fan speed */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	f75375_write8(client, F75375_REG_FAN_TIMER, fanmode);</div><div class='ctx'> 	data-&gt;pwm_enable[nr] = val;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -327,8 +387,12 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct f75375_data *data = i2c_get_clientdata(client);</div><div class='del'>-	int val = simple_strtoul(buf, NULL, 10);</div><div class='del'>-	int err = 0;</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	err = set_pwm_enable_direct(client, nr, val);</div><div class='hunk'>@@ -342,20 +406,39 @@ static ssize_t set_pwm_mode(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct f75375_data *data = i2c_get_clientdata(client);</div><div class='del'>-	int val = simple_strtoul(buf, NULL, 10);</div><div class='del'>-	u8 conf = 0;</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int err;</div><div class='add'>+	u8 conf;</div><div class='add'>+	char reg, ctrl;</div><div class='add'>+</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (!(val == 0 || val == 1))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* F75373 does not support DC (linear voltage) fan control mode */</div><div class='add'>+	if (data-&gt;kind == f75373 &amp;&amp; val == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* take care for different registers */</div><div class='add'>+	if (data-&gt;kind == f75387) {</div><div class='add'>+		reg = F75375_REG_FAN_TIMER;</div><div class='add'>+		ctrl = F75387_FAN_CTRL_LINEAR(nr);</div><div class='add'>+	} else {</div><div class='add'>+		reg = F75375_REG_CONFIG1;</div><div class='add'>+		ctrl = F75375_FAN_CTRL_LINEAR(nr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='del'>-	conf = f75375_read8(client, F75375_REG_CONFIG1);</div><div class='del'>-	conf &amp;= ~(1 &lt;&lt; FAN_CTRL_LINEAR(nr));</div><div class='add'>+	conf = f75375_read8(client, reg);</div><div class='add'>+	conf &amp;= ~(1 &lt;&lt; ctrl);</div><div class='ctx'> </div><div class='ctx'> 	if (val == 0)</div><div class='del'>-		conf |= (1 &lt;&lt; FAN_CTRL_LINEAR(nr)) ;</div><div class='add'>+		conf |= (1 &lt;&lt; ctrl);</div><div class='ctx'> </div><div class='del'>-	f75375_write8(client, F75375_REG_CONFIG1, conf);</div><div class='add'>+	f75375_write8(client, reg, conf);</div><div class='ctx'> 	data-&gt;pwm_mode[nr] = val;</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -410,7 +493,13 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct f75375_data *data = i2c_get_clientdata(client);</div><div class='del'>-	int val = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	val = SENSORS_LIMIT(VOLT_TO_REG(val), 0, 0xff);</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;in_max[nr] = val;</div><div class='hunk'>@@ -425,7 +514,13 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct f75375_data *data = i2c_get_clientdata(client);</div><div class='del'>-	int val = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	val = SENSORS_LIMIT(VOLT_TO_REG(val), 0, 0xff);</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;in_min[nr] = val;</div><div class='hunk'>@@ -435,13 +530,14 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> }</div><div class='ctx'> #define TEMP_FROM_REG(val) ((val) * 1000)</div><div class='ctx'> #define TEMP_TO_REG(val) ((val) / 1000)</div><div class='add'>+#define TEMP11_FROM_REG(reg)	((reg) / 32 * 125)</div><div class='ctx'> </div><div class='del'>-static ssize_t show_temp(struct device *dev, struct device_attribute *attr,</div><div class='add'>+static ssize_t show_temp11(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='ctx'> 	struct f75375_data *data = f75375_update_device(dev);</div><div class='del'>-	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp[nr]));</div><div class='add'>+	return sprintf(buf, "%d\n", TEMP11_FROM_REG(data-&gt;temp11[nr]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -466,7 +562,13 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct f75375_data *data = i2c_get_clientdata(client);</div><div class='del'>-	int val = simple_strtol(buf, NULL, 10);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	val = SENSORS_LIMIT(TEMP_TO_REG(val), 0, 127);</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;temp_high[nr] = val;</div><div class='hunk'>@@ -481,7 +583,13 @@ static ssize_t set_temp_max_hyst(struct device *dev,</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct f75375_data *data = i2c_get_clientdata(client);</div><div class='del'>-	int val = simple_strtol(buf, NULL, 10);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	val = SENSORS_LIMIT(TEMP_TO_REG(val), 0, 127);</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;temp_max_hyst[nr] = val;</div><div class='hunk'>@@ -502,8 +610,8 @@ static ssize_t show_##thing(struct device *dev, struct device_attribute *attr, \</div><div class='ctx'> </div><div class='ctx'> show_fan(fan);</div><div class='ctx'> show_fan(fan_min);</div><div class='del'>-show_fan(fan_full);</div><div class='del'>-show_fan(fan_exp);</div><div class='add'>+show_fan(fan_max);</div><div class='add'>+show_fan(fan_target);</div><div class='ctx'> </div><div class='ctx'> static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, show_in, NULL, 0);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(in0_max, S_IRUGO|S_IWUSR,</div><div class='hunk'>@@ -525,28 +633,28 @@ static SENSOR_DEVICE_ATTR(in3_max, S_IRUGO|S_IWUSR,</div><div class='ctx'> 	show_in_max, set_in_max, 3);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(in3_min, S_IRUGO|S_IWUSR,</div><div class='ctx'> 	show_in_min, set_in_min, 3);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp11, NULL, 0);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp1_max_hyst, S_IRUGO|S_IWUSR,</div><div class='ctx'> 	show_temp_max_hyst, set_temp_max_hyst, 0);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp1_max, S_IRUGO|S_IWUSR,</div><div class='ctx'> 	show_temp_max, set_temp_max, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp, NULL, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp11, NULL, 1);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp2_max_hyst, S_IRUGO|S_IWUSR,</div><div class='ctx'> 	show_temp_max_hyst, set_temp_max_hyst, 1);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp2_max, S_IRUGO|S_IWUSR,</div><div class='ctx'> 	show_temp_max, set_temp_max, 1);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_full, S_IRUGO, show_fan_full, NULL, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR(fan1_max, S_IRUGO, show_fan_max, NULL, 0);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(fan1_min, S_IRUGO|S_IWUSR,</div><div class='ctx'> 	show_fan_min, set_fan_min, 0);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan1_exp, S_IRUGO|S_IWUSR,</div><div class='del'>-	show_fan_exp, set_fan_exp, 0);</div><div class='add'>+static SENSOR_DEVICE_ATTR(fan1_target, S_IRUGO|S_IWUSR,</div><div class='add'>+	show_fan_target, set_fan_target, 0);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, show_fan, NULL, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_full, S_IRUGO, show_fan_full, NULL, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR(fan2_max, S_IRUGO, show_fan_max, NULL, 1);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(fan2_min, S_IRUGO|S_IWUSR,</div><div class='ctx'> 	show_fan_min, set_fan_min, 1);</div><div class='del'>-static SENSOR_DEVICE_ATTR(fan2_exp, S_IRUGO|S_IWUSR,</div><div class='del'>-	show_fan_exp, set_fan_exp, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR(fan2_target, S_IRUGO|S_IWUSR,</div><div class='add'>+	show_fan_target, set_fan_target, 1);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO|S_IWUSR,</div><div class='ctx'> 	show_pwm, set_pwm, 0);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(pwm1_enable, S_IRUGO|S_IWUSR,</div><div class='hunk'>@@ -568,13 +676,13 @@ static struct attribute *f75375_attributes[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_temp2_max.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp2_max_hyst.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_fan1_input.dev_attr.attr,</div><div class='del'>-	&amp;sensor_dev_attr_fan1_full.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan1_max.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_fan1_min.dev_attr.attr,</div><div class='del'>-	&amp;sensor_dev_attr_fan1_exp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan1_target.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_fan2_input.dev_attr.attr,</div><div class='del'>-	&amp;sensor_dev_attr_fan2_full.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan2_max.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_fan2_min.dev_attr.attr,</div><div class='del'>-	&amp;sensor_dev_attr_fan2_exp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_fan2_target.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_pwm1.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_pwm1_enable.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_pwm1_mode.dev_attr.attr,</div><div class='hunk'>@@ -604,6 +712,51 @@ static void f75375_init(struct i2c_client *client, struct f75375_data *data,</div><div class='ctx'> 		struct f75375s_platform_data *f75375s_pdata)</div><div class='ctx'> {</div><div class='ctx'> 	int nr;</div><div class='add'>+</div><div class='add'>+	if (!f75375s_pdata) {</div><div class='add'>+		u8 conf, mode;</div><div class='add'>+		int nr;</div><div class='add'>+</div><div class='add'>+		conf = f75375_read8(client, F75375_REG_CONFIG1);</div><div class='add'>+		mode = f75375_read8(client, F75375_REG_FAN_TIMER);</div><div class='add'>+		for (nr = 0; nr &lt; 2; nr++) {</div><div class='add'>+			if (data-&gt;kind == f75387) {</div><div class='add'>+				bool manu, duty;</div><div class='add'>+</div><div class='add'>+				if (!(conf &amp; (1 &lt;&lt; F75387_FAN_CTRL_LINEAR(nr))))</div><div class='add'>+					data-&gt;pwm_mode[nr] = 1;</div><div class='add'>+</div><div class='add'>+				manu = ((mode &gt;&gt; F75387_FAN_MANU_MODE(nr)) &amp; 1);</div><div class='add'>+				duty = ((mode &gt;&gt; F75387_FAN_DUTY_MODE(nr)) &amp; 1);</div><div class='add'>+				if (manu &amp;&amp; duty)</div><div class='add'>+					/* speed */</div><div class='add'>+					data-&gt;pwm_enable[nr] = 3;</div><div class='add'>+				else if (!manu &amp;&amp; duty)</div><div class='add'>+					/* automatic */</div><div class='add'>+					data-&gt;pwm_enable[nr] = 2;</div><div class='add'>+				else</div><div class='add'>+					/* manual */</div><div class='add'>+					data-&gt;pwm_enable[nr] = 1;</div><div class='add'>+			} else {</div><div class='add'>+				if (!(conf &amp; (1 &lt;&lt; F75375_FAN_CTRL_LINEAR(nr))))</div><div class='add'>+					data-&gt;pwm_mode[nr] = 1;</div><div class='add'>+</div><div class='add'>+				switch ((mode &gt;&gt; FAN_CTRL_MODE(nr)) &amp; 3) {</div><div class='add'>+				case 0:		/* speed */</div><div class='add'>+					data-&gt;pwm_enable[nr] = 3;</div><div class='add'>+					break;</div><div class='add'>+				case 1:		/* automatic */</div><div class='add'>+					data-&gt;pwm_enable[nr] = 2;</div><div class='add'>+					break;</div><div class='add'>+				default:	/* manual */</div><div class='add'>+					data-&gt;pwm_enable[nr] = 1;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	set_pwm_enable_direct(client, 0, f75375s_pdata-&gt;pwm_enable[0]);</div><div class='ctx'> 	set_pwm_enable_direct(client, 1, f75375s_pdata-&gt;pwm_enable[1]);</div><div class='ctx'> 	for (nr = 0; nr &lt; 2; nr++) {</div><div class='hunk'>@@ -624,14 +777,16 @@ static int f75375_probe(struct i2c_client *client,</div><div class='ctx'> 	if (!i2c_check_functionality(client-&gt;adapter,</div><div class='ctx'> 				I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (!(data = kzalloc(sizeof(struct f75375_data), GFP_KERNEL)))</div><div class='add'>+	data = kzalloc(sizeof(struct f75375_data), GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </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;kind = id-&gt;driver_data;</div><div class='ctx'> </div><div class='del'>-	if ((err = sysfs_create_group(&amp;client-&gt;dev.kobj, &amp;f75375_group)))</div><div class='add'>+	err = sysfs_create_group(&amp;client-&gt;dev.kobj, &amp;f75375_group);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto exit_free;</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;kind == f75375) {</div><div class='hunk'>@@ -653,8 +808,7 @@ static int f75375_probe(struct i2c_client *client,</div><div class='ctx'> 		goto exit_remove;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (f75375s_pdata != NULL)</div><div class='del'>-		f75375_init(client, data, f75375s_pdata);</div><div class='add'>+	f75375_init(client, data, f75375s_pdata);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -685,10 +839,15 @@ static int f75375_detect(struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 	vendid = f75375_read16(client, F75375_REG_VENDOR);</div><div class='ctx'> 	chipid = f75375_read16(client, F75375_CHIP_ID);</div><div class='del'>-	if (chipid == 0x0306 &amp;&amp; vendid == 0x1934)</div><div class='add'>+	if (vendid != 0x1934)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (chipid == 0x0306)</div><div class='ctx'> 		name = "f75375";</div><div class='del'>-	else if (chipid == 0x0204 &amp;&amp; vendid == 0x1934)</div><div class='add'>+	else if (chipid == 0x0204)</div><div class='ctx'> 		name = "f75373";</div><div class='add'>+	else if (chipid == 0x0410)</div><div class='add'>+		name = "f75387";</div><div class='ctx'> 	else</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='hunk'>@@ -711,7 +870,7 @@ static void __exit sensors_f75375_exit(void)</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Riku Voipio");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("F75373/F75375 hardware monitoring driver");</div><div class='add'>+MODULE_DESCRIPTION("F75373/F75375/F75387 hardware monitoring driver");</div><div class='ctx'> </div><div class='ctx'> module_init(sensors_f75375_init);</div><div class='ctx'> module_exit(sensors_f75375_exit);</div><div class='head'>diff --git a/drivers/hwmon/g760a.c b/drivers/hwmon/g760a.c<br/>index 1d6a6fa31fb4..781277ddbaa5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/g760a.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/g760a.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/g760a.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/g760a.c</a></div><div class='hunk'>@@ -166,7 +166,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	struct g760a_data *data = g760a_update_client(dev);</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='head'>diff --git a/drivers/hwmon/gpio-fan.c b/drivers/hwmon/gpio-fan.c<br/>index 9ba38f318ffb..2ce8c44a0e07 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/gpio-fan.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/gpio-fan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/gpio-fan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/gpio-fan.c</a></div><div class='hunk'>@@ -224,7 +224,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int speed_index;</div><div class='ctx'> 	int ret = count;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;pwm) || pwm &gt; 255)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;pwm) || pwm &gt; 255)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;fan_data-&gt;lock);</div><div class='hunk'>@@ -257,7 +257,7 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct gpio_fan_data *fan_data = dev_get_drvdata(dev);</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) || val &gt; 1)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) || val &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (fan_data-&gt;pwm_enable == val)</div><div class='hunk'>@@ -314,7 +314,7 @@ static ssize_t set_rpm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	unsigned long rpm;</div><div class='ctx'> 	int ret = count;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;rpm))</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;rpm))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;fan_data-&gt;lock);</div><div class='head'>diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c<br/>index 6a967d7dbdee..cc2981f749a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/ibmaem.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/ibmaem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/ibmaem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/ibmaem.c</a></div><div class='hunk'>@@ -904,7 +904,7 @@ static ssize_t aem_set_power_period(struct device *dev,</div><div class='ctx'> 	unsigned long temp;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	res = strict_strtoul(buf, 10, &amp;temp);</div><div class='add'>+	res = kstrtoul(buf, 10, &amp;temp);</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c<br/>index d912649fac50..0054d6f9cec9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/it87.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/it87.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/it87.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/it87.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'>  *            IT8720F  Super I/O chip w/LPC interface</div><div class='ctx'>  *            IT8721F  Super I/O chip w/LPC interface</div><div class='ctx'>  *            IT8726F  Super I/O chip w/LPC interface</div><div class='add'>+ *            IT8728F  Super I/O chip w/LPC interface</div><div class='ctx'>  *            IT8758E  Super I/O chip w/LPC interface</div><div class='ctx'>  *            Sis950   A clone of the IT8705F</div><div class='ctx'>  *</div><div class='hunk'>@@ -58,7 +59,7 @@</div><div class='ctx'> </div><div class='ctx'> #define DRVNAME "it87"</div><div class='ctx'> </div><div class='del'>-enum chips { it87, it8712, it8716, it8718, it8720, it8721 };</div><div class='add'>+enum chips { it87, it8712, it8716, it8718, it8720, it8721, it8728 };</div><div class='ctx'> </div><div class='ctx'> static unsigned short force_id;</div><div class='ctx'> module_param(force_id, ushort, 0);</div><div class='hunk'>@@ -135,6 +136,7 @@ static inline void superio_exit(void)</div><div class='ctx'> #define IT8720F_DEVID 0x8720</div><div class='ctx'> #define IT8721F_DEVID 0x8721</div><div class='ctx'> #define IT8726F_DEVID 0x8726</div><div class='add'>+#define IT8728F_DEVID 0x8728</div><div class='ctx'> #define IT87_ACT_REG  0x30</div><div class='ctx'> #define IT87_BASE_REG 0x60</div><div class='ctx'> </div><div class='hunk'>@@ -146,10 +148,10 @@ static inline void superio_exit(void)</div><div class='ctx'> #define IT87_SIO_BEEP_PIN_REG	0xf6	/* Beep pin mapping */</div><div class='ctx'> </div><div class='ctx'> /* Update battery voltage after every reading if true */</div><div class='del'>-static int update_vbat;</div><div class='add'>+static bool update_vbat;</div><div class='ctx'> </div><div class='ctx'> /* Not all BIOSes properly configure the PWM registers */</div><div class='del'>-static int fix_pwm_polarity;</div><div class='add'>+static bool fix_pwm_polarity;</div><div class='ctx'> </div><div class='ctx'> /* Many IT87 constants specified below */</div><div class='ctx'> </div><div class='hunk'>@@ -274,11 +276,31 @@ struct it87_data {</div><div class='ctx'> 	s8 auto_temp[3][5];	/* [nr][0] is point1_temp_hyst */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline int has_12mv_adc(const struct it87_data *data)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * IT8721F and later have a 12 mV ADC, also with internal scaling</div><div class='add'>+	 * on selected inputs.</div><div class='add'>+	 */</div><div class='add'>+	return data-&gt;type == it8721</div><div class='add'>+	    || data-&gt;type == it8728;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int has_newer_autopwm(const struct it87_data *data)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * IT8721F and later have separate registers for the temperature</div><div class='add'>+	 * mapping and the manual duty cycle.</div><div class='add'>+	 */</div><div class='add'>+	return data-&gt;type == it8721</div><div class='add'>+	    || data-&gt;type == it8728;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u8 in_to_reg(const struct it87_data *data, int nr, long val)</div><div class='ctx'> {</div><div class='ctx'> 	long lsb;</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;type == it8721) {</div><div class='add'>+	if (has_12mv_adc(data)) {</div><div class='ctx'> 		if (data-&gt;in_scaled &amp; (1 &lt;&lt; nr))</div><div class='ctx'> 			lsb = 24;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -292,7 +314,7 @@ static u8 in_to_reg(const struct it87_data *data, int nr, long val)</div><div class='ctx'> </div><div class='ctx'> static int in_from_reg(const struct it87_data *data, int nr, int val)</div><div class='ctx'> {</div><div class='del'>-	if (data-&gt;type == it8721) {</div><div class='add'>+	if (has_12mv_adc(data)) {</div><div class='ctx'> 		if (data-&gt;in_scaled &amp; (1 &lt;&lt; nr))</div><div class='ctx'> 			return val * 24;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -329,7 +351,7 @@ static inline u16 FAN16_TO_REG(long rpm)</div><div class='ctx'> </div><div class='ctx'> static u8 pwm_to_reg(const struct it87_data *data, long val)</div><div class='ctx'> {</div><div class='del'>-	if (data-&gt;type == it8721)</div><div class='add'>+	if (has_newer_autopwm(data))</div><div class='ctx'> 		return val;</div><div class='ctx'> 	else</div><div class='ctx'> 		return val &gt;&gt; 1;</div><div class='hunk'>@@ -337,7 +359,7 @@ static u8 pwm_to_reg(const struct it87_data *data, long val)</div><div class='ctx'> </div><div class='ctx'> static int pwm_from_reg(const struct it87_data *data, u8 reg)</div><div class='ctx'> {</div><div class='del'>-	if (data-&gt;type == it8721)</div><div class='add'>+	if (has_newer_autopwm(data))</div><div class='ctx'> 		return reg;</div><div class='ctx'> 	else</div><div class='ctx'> 		return (reg &amp; 0x7f) &lt;&lt; 1;</div><div class='hunk'>@@ -374,7 +396,8 @@ static inline int has_16bit_fans(const struct it87_data *data)</div><div class='ctx'> 	    || data-&gt;type == it8716</div><div class='ctx'> 	    || data-&gt;type == it8718</div><div class='ctx'> 	    || data-&gt;type == it8720</div><div class='del'>-	    || data-&gt;type == it8721;</div><div class='add'>+	    || data-&gt;type == it8721</div><div class='add'>+	    || data-&gt;type == it8728;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int has_old_autopwm(const struct it87_data *data)</div><div class='hunk'>@@ -444,7 +467,7 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct it87_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -463,7 +486,7 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct it87_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -539,7 +562,7 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct it87_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -557,7 +580,7 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct it87_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -604,7 +627,7 @@ static ssize_t set_sensor(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	long val;</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	reg = it87_read_value(data, IT87_REG_TEMP_ENABLE);</div><div class='hunk'>@@ -718,7 +741,7 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	long val;</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -751,7 +774,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int min;</div><div class='ctx'> 	u8 old;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -820,7 +843,7 @@ static ssize_t set_pwm_enable(struct device *dev,</div><div class='ctx'> 	struct it87_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val) &lt; 0 || val &lt; 0 || val &gt; 2)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val) &lt; 0 || val &lt; 0 || val &gt; 2)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Check trip points before switching to automatic mode */</div><div class='hunk'>@@ -842,7 +865,7 @@ static ssize_t set_pwm_enable(struct device *dev,</div><div class='ctx'> 				 data-&gt;fan_main_ctrl);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (val == 1)				/* Manual mode */</div><div class='del'>-			data-&gt;pwm_ctrl[nr] = data-&gt;type == it8721 ?</div><div class='add'>+			data-&gt;pwm_ctrl[nr] = has_newer_autopwm(data) ?</div><div class='ctx'> 					     data-&gt;pwm_temp_map[nr] :</div><div class='ctx'> 					     data-&gt;pwm_duty[nr];</div><div class='ctx'> 		else					/* Automatic mode */</div><div class='hunk'>@@ -866,11 +889,11 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct it87_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val) &lt; 0 || val &lt; 0 || val &gt; 255)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val) &lt; 0 || val &lt; 0 || val &gt; 255)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='del'>-	if (data-&gt;type == it8721) {</div><div class='add'>+	if (has_newer_autopwm(data)) {</div><div class='ctx'> 		/* If we are in automatic mode, the PWM duty cycle register</div><div class='ctx'> 		 * is read-only so we can't write the value */</div><div class='ctx'> 		if (data-&gt;pwm_ctrl[nr] &amp; 0x80) {</div><div class='hunk'>@@ -900,7 +923,7 @@ static ssize_t set_pwm_freq(struct device *dev,</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Search for the nearest available frequency */</div><div class='hunk'>@@ -949,7 +972,7 @@ static ssize_t set_pwm_temp_map(struct device *dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (val) {</div><div class='hunk'>@@ -1001,7 +1024,7 @@ static ssize_t set_auto_pwm(struct device *dev,</div><div class='ctx'> 	int point = sensor_attr-&gt;index;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val) &lt; 0 || val &lt; 0 || val &gt; 255)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val) &lt; 0 || val &lt; 0 || val &gt; 255)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -1034,7 +1057,7 @@ static ssize_t set_auto_temp(struct device *dev,</div><div class='ctx'> 	int point = sensor_attr-&gt;index;</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val) &lt; 0 || val &lt; -128000 || val &gt; 127000)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val) &lt; 0 || val &lt; -128000 || val &gt; 127000)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -1126,7 +1149,7 @@ static ssize_t set_fan16_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct it87_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -1180,7 +1203,7 @@ static ssize_t clear_intrusion(struct device *dev, struct device_attribute</div><div class='ctx'> 	long val;</div><div class='ctx'> 	int config;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val) &lt; 0 || val != 0)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val) &lt; 0 || val != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -1231,7 +1254,7 @@ static ssize_t set_beep(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct it87_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val) &lt; 0</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val) &lt; 0</div><div class='ctx'> 	 || (val != 0 &amp;&amp; val != 1))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -1278,7 +1301,7 @@ static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct it87_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;vrm = val;</div><div class='hunk'>@@ -1311,8 +1334,8 @@ static ssize_t show_label(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct it87_data *data = dev_get_drvdata(dev);</div><div class='ctx'> 	int nr = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%s\n", data-&gt;type == it8721 ? labels_it8721[nr]</div><div class='del'>-							 : labels[nr]);</div><div class='add'>+	return sprintf(buf, "%s\n", has_12mv_adc(data) ? labels_it8721[nr]</div><div class='add'>+						       : labels[nr]);</div><div class='ctx'> }</div><div class='ctx'> static SENSOR_DEVICE_ATTR(in3_label, S_IRUGO, show_label, NULL, 0);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(in7_label, S_IRUGO, show_label, NULL, 1);</div><div class='hunk'>@@ -1605,6 +1628,9 @@ static int __init it87_find(unsigned short *address,</div><div class='ctx'> 	case IT8721F_DEVID:</div><div class='ctx'> 		sio_data-&gt;type = it8721;</div><div class='ctx'> 		break;</div><div class='add'>+	case IT8728F_DEVID:</div><div class='add'>+		sio_data-&gt;type = it8728;</div><div class='add'>+		break;</div><div class='ctx'> 	case 0xffff:	/* No device at all */</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1646,8 +1672,11 @@ static int __init it87_find(unsigned short *address,</div><div class='ctx'> 		superio_select(GPIO);</div><div class='ctx'> </div><div class='ctx'> 		reg = superio_inb(IT87_SIO_GPIO3_REG);</div><div class='del'>-		if (sio_data-&gt;type == it8721) {</div><div class='del'>-			/* The IT8721F/IT8758E doesn't have VID pins at all */</div><div class='add'>+		if (sio_data-&gt;type == it8721 || sio_data-&gt;type == it8728) {</div><div class='add'>+			/*</div><div class='add'>+			 * The IT8721F/IT8758E doesn't have VID pins at all,</div><div class='add'>+			 * not sure about the IT8728F.</div><div class='add'>+			 */</div><div class='ctx'> 			sio_data-&gt;skip_vid = 1;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* We need at least 4 VID pins */</div><div class='hunk'>@@ -1692,7 +1721,8 @@ static int __init it87_find(unsigned short *address,</div><div class='ctx'> 		}</div><div class='ctx'> 		if (reg &amp; (1 &lt;&lt; 0))</div><div class='ctx'> 			sio_data-&gt;internal |= (1 &lt;&lt; 0);</div><div class='del'>-		if ((reg &amp; (1 &lt;&lt; 1)) || sio_data-&gt;type == it8721)</div><div class='add'>+		if ((reg &amp; (1 &lt;&lt; 1)) || sio_data-&gt;type == it8721 ||</div><div class='add'>+		    sio_data-&gt;type == it8728)</div><div class='ctx'> 			sio_data-&gt;internal |= (1 &lt;&lt; 1);</div><div class='ctx'> </div><div class='ctx'> 		sio_data-&gt;beep_pin = superio_inb(IT87_SIO_BEEP_PIN_REG) &amp; 0x3f;</div><div class='hunk'>@@ -1770,6 +1800,7 @@ static int __devinit it87_probe(struct platform_device *pdev)</div><div class='ctx'> 		"it8718",</div><div class='ctx'> 		"it8720",</div><div class='ctx'> 		"it8721",</div><div class='add'>+		"it8728",</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_IO, 0);</div><div class='hunk'>@@ -1807,7 +1838,7 @@ static int __devinit it87_probe(struct platform_device *pdev)</div><div class='ctx'> 	enable_pwm_interface = it87_check_pwm(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Starting with IT8721F, we handle scaling of internal voltages */</div><div class='del'>-	if (data-&gt;type == it8721) {</div><div class='add'>+	if (has_12mv_adc(data)) {</div><div class='ctx'> 		if (sio_data-&gt;internal &amp; (1 &lt;&lt; 0))</div><div class='ctx'> 			data-&gt;in_scaled |= (1 &lt;&lt; 3);	/* in3 is AVCC */</div><div class='ctx'> 		if (sio_data-&gt;internal &amp; (1 &lt;&lt; 1))</div><div class='hunk'>@@ -2093,7 +2124,7 @@ static void __devinit it87_init_device(struct platform_device *pdev)</div><div class='ctx'> static void it87_update_pwm_ctrl(struct it87_data *data, int nr)</div><div class='ctx'> {</div><div class='ctx'> 	data-&gt;pwm_ctrl[nr] = it87_read_value(data, IT87_REG_PWM(nr));</div><div class='del'>-	if (data-&gt;type == it8721) {</div><div class='add'>+	if (has_newer_autopwm(data)) {</div><div class='ctx'> 		data-&gt;pwm_temp_map[nr] = data-&gt;pwm_ctrl[nr] &amp; 0x03;</div><div class='ctx'> 		data-&gt;pwm_duty[nr] = it87_read_value(data,</div><div class='ctx'> 						     IT87_REG_PWM_DUTY(nr));</div><div class='head'>diff --git a/drivers/hwmon/jc42.c b/drivers/hwmon/jc42.c<br/>index 2d3d72805ff4..28c09eead36b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/jc42.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/jc42.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/jc42.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/jc42.c</a></div><div class='hunk'>@@ -309,7 +309,7 @@ static ssize_t set_##value(struct device *dev,				\</div><div class='ctx'> 	struct jc42_data *data = i2c_get_clientdata(client);		\</div><div class='ctx'> 	int err, ret = count;						\</div><div class='ctx'> 	long val;							\</div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val) &lt; 0)				\</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val) &lt; 0)				\</div><div class='ctx'> 		return -EINVAL;						\</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);					\</div><div class='ctx'> 	data-&gt;value = jc42_temp_to_reg(val, data-&gt;extended);		\</div><div class='hunk'>@@ -337,7 +337,7 @@ static ssize_t set_temp_crit_hyst(struct device *dev,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int ret = count;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	diff = jc42_temp_from_reg(data-&gt;temp_crit) - val;</div><div class='hunk'>@@ -413,7 +413,7 @@ static struct attribute *jc42_attributes[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static mode_t jc42_attribute_mode(struct kobject *kobj,</div><div class='add'>+static umode_t jc42_attribute_mode(struct kobject *kobj,</div><div class='ctx'> 				  struct attribute *attr, int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = container_of(kobj, struct device, kobj);</div><div class='head'>diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c<br/>index 508cb291f71b..5e6457a6644d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/lm63.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/lm63.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/lm63.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/lm63.c</a></div><div class='hunk'>@@ -47,10 +47,14 @@</div><div class='ctx'> #include &lt;linux/err.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='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Addresses to scan</div><div class='del'>- * Address is fully defined internally and cannot be changed.</div><div class='add'>+ * Address is fully defined internally and cannot be changed except for</div><div class='add'>+ * LM64 which has one pin dedicated to address selection.</div><div class='add'>+ * LM63 and LM96163 have address 0x4c.</div><div class='add'>+ * LM64 can have address 0x18 or 0x4e.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static const unsigned short normal_i2c[] = { 0x18, 0x4c, 0x4e, I2C_CLIENT_END };</div><div class='hunk'>@@ -60,6 +64,7 @@ static const unsigned short normal_i2c[] = { 0x18, 0x4c, 0x4e, I2C_CLIENT_END };</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define LM63_REG_CONFIG1		0x03</div><div class='add'>+#define LM63_REG_CONVRATE		0x04</div><div class='ctx'> #define LM63_REG_CONFIG2		0xBF</div><div class='ctx'> #define LM63_REG_CONFIG_FAN		0x4A</div><div class='ctx'> </div><div class='hunk'>@@ -70,6 +75,9 @@ static const unsigned short normal_i2c[] = { 0x18, 0x4c, 0x4e, I2C_CLIENT_END };</div><div class='ctx'> </div><div class='ctx'> #define LM63_REG_PWM_VALUE		0x4C</div><div class='ctx'> #define LM63_REG_PWM_FREQ		0x4D</div><div class='add'>+#define LM63_REG_LUT_TEMP_HYST		0x4F</div><div class='add'>+#define LM63_REG_LUT_TEMP(nr)		(0x50 + 2 * (nr))</div><div class='add'>+#define LM63_REG_LUT_PWM(nr)		(0x51 + 2 * (nr))</div><div class='ctx'> </div><div class='ctx'> #define LM63_REG_LOCAL_TEMP		0x00</div><div class='ctx'> #define LM63_REG_LOCAL_HIGH		0x05</div><div class='hunk'>@@ -91,6 +99,16 @@ static const unsigned short normal_i2c[] = { 0x18, 0x4c, 0x4e, I2C_CLIENT_END };</div><div class='ctx'> #define LM63_REG_MAN_ID			0xFE</div><div class='ctx'> #define LM63_REG_CHIP_ID		0xFF</div><div class='ctx'> </div><div class='add'>+#define LM96163_REG_TRUTHERM		0x30</div><div class='add'>+#define LM96163_REG_REMOTE_TEMP_U_MSB	0x31</div><div class='add'>+#define LM96163_REG_REMOTE_TEMP_U_LSB	0x32</div><div class='add'>+#define LM96163_REG_CONFIG_ENHANCED	0x45</div><div class='add'>+</div><div class='add'>+#define LM63_MAX_CONVRATE		9</div><div class='add'>+</div><div class='add'>+#define LM63_MAX_CONVRATE_HZ		32</div><div class='add'>+#define LM96163_MAX_CONVRATE_HZ		26</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Conversions and various macros</div><div class='ctx'>  * For tachometer counts, the LM63 uses 16-bit values.</div><div class='hunk'>@@ -112,15 +130,24 @@ static const unsigned short normal_i2c[] = { 0x18, 0x4c, 0x4e, I2C_CLIENT_END };</div><div class='ctx'> 				 (val) &gt;= 127000 ? 127 : \</div><div class='ctx'> 				 (val) &lt; 0 ? ((val) - 500) / 1000 : \</div><div class='ctx'> 				 ((val) + 500) / 1000)</div><div class='add'>+#define TEMP8U_TO_REG(val)	((val) &lt;= 0 ? 0 : \</div><div class='add'>+				 (val) &gt;= 255000 ? 255 : \</div><div class='add'>+				 ((val) + 500) / 1000)</div><div class='ctx'> #define TEMP11_FROM_REG(reg)	((reg) / 32 * 125)</div><div class='ctx'> #define TEMP11_TO_REG(val)	((val) &lt;= -128000 ? 0x8000 : \</div><div class='ctx'> 				 (val) &gt;= 127875 ? 0x7FE0 : \</div><div class='ctx'> 				 (val) &lt; 0 ? ((val) - 62) / 125 * 32 : \</div><div class='ctx'> 				 ((val) + 62) / 125 * 32)</div><div class='add'>+#define TEMP11U_TO_REG(val)	((val) &lt;= 0 ? 0 : \</div><div class='add'>+				 (val) &gt;= 255875 ? 0xFFE0 : \</div><div class='add'>+				 ((val) + 62) / 125 * 32)</div><div class='ctx'> #define HYST_TO_REG(val)	((val) &lt;= 0 ? 0 : \</div><div class='ctx'> 				 (val) &gt;= 127000 ? 127 : \</div><div class='ctx'> 				 ((val) + 500) / 1000)</div><div class='ctx'> </div><div class='add'>+#define UPDATE_INTERVAL(max, rate) \</div><div class='add'>+			((1000 &lt;&lt; (LM63_MAX_CONVRATE - (rate))) / (max))</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Functions declaration</div><div class='ctx'>  */</div><div class='hunk'>@@ -134,7 +161,7 @@ static struct lm63_data *lm63_update_device(struct device *dev);</div><div class='ctx'> static int lm63_detect(struct i2c_client *client, struct i2c_board_info *info);</div><div class='ctx'> static void lm63_init_client(struct i2c_client *client);</div><div class='ctx'> </div><div class='del'>-enum chips { lm63, lm64 };</div><div class='add'>+enum chips { lm63, lm64, lm96163 };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Driver data (common to all clients)</div><div class='hunk'>@@ -143,6 +170,7 @@ enum chips { lm63, lm64 };</div><div class='ctx'> static const struct i2c_device_id lm63_id[] = {</div><div class='ctx'> 	{ "lm63", lm63 },</div><div class='ctx'> 	{ "lm64", lm64 },</div><div class='add'>+	{ "lm96163", lm96163 },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, lm63_id);</div><div class='hunk'>@@ -167,26 +195,53 @@ struct lm63_data {</div><div class='ctx'> 	struct device *hwmon_dev;</div><div class='ctx'> 	struct mutex update_lock;</div><div class='ctx'> 	char valid; /* zero until following fields are valid */</div><div class='add'>+	char lut_valid; /* zero until lut fields are valid */</div><div class='ctx'> 	unsigned long last_updated; /* in jiffies */</div><div class='del'>-	int kind;</div><div class='add'>+	unsigned long lut_last_updated; /* in jiffies */</div><div class='add'>+	enum chips kind;</div><div class='ctx'> 	int temp2_offset;</div><div class='ctx'> </div><div class='add'>+	int update_interval;	/* in milliseconds */</div><div class='add'>+	int max_convrate_hz;</div><div class='add'>+	int lut_size;		/* 8 or 12 */</div><div class='add'>+</div><div class='ctx'> 	/* registers values */</div><div class='ctx'> 	u8 config, config_fan;</div><div class='ctx'> 	u16 fan[2];	/* 0: input</div><div class='ctx'> 			   1: low limit */</div><div class='ctx'> 	u8 pwm1_freq;</div><div class='del'>-	u8 pwm1_value;</div><div class='del'>-	s8 temp8[3];	/* 0: local input</div><div class='add'>+	u8 pwm1[13];	/* 0: current output</div><div class='add'>+			   1-12: lookup table */</div><div class='add'>+	s8 temp8[15];	/* 0: local input</div><div class='ctx'> 			   1: local high limit</div><div class='del'>-			   2: remote critical limit */</div><div class='del'>-	s16 temp11[3];	/* 0: remote input</div><div class='add'>+			   2: remote critical limit</div><div class='add'>+			   3-14: lookup table */</div><div class='add'>+	s16 temp11[4];	/* 0: remote input</div><div class='ctx'> 			   1: remote low limit</div><div class='del'>-			   2: remote high limit */</div><div class='add'>+			   2: remote high limit</div><div class='add'>+			   3: remote offset */</div><div class='add'>+	u16 temp11u;	/* remote input (unsigned) */</div><div class='ctx'> 	u8 temp2_crit_hyst;</div><div class='add'>+	u8 lut_temp_hyst;</div><div class='ctx'> 	u8 alarms;</div><div class='add'>+	bool pwm_highres;</div><div class='add'>+	bool lut_temp_highres;</div><div class='add'>+	bool remote_unsigned; /* true if unsigned remote upper limits */</div><div class='add'>+	bool trutherm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline int temp8_from_reg(struct lm63_data *data, int nr)</div><div class='add'>+{</div><div class='add'>+	if (data-&gt;remote_unsigned)</div><div class='add'>+		return TEMP8_FROM_REG((u8)data-&gt;temp8[nr]);</div><div class='add'>+	return TEMP8_FROM_REG(data-&gt;temp8[nr]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int lut_temp_from_reg(struct lm63_data *data, int nr)</div><div class='add'>+{</div><div class='add'>+	return data-&gt;temp8[nr] * (data-&gt;lut_temp_highres ? 500 : 1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Sysfs callback functions and files</div><div class='ctx'>  */</div><div class='hunk'>@@ -204,7 +259,12 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *dummy,</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct lm63_data *data = i2c_get_clientdata(client);</div><div class='del'>-	unsigned long val = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;fan[1] = FAN_TO_REG(val);</div><div class='hunk'>@@ -216,13 +276,22 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *dummy,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_pwm1(struct device *dev, struct device_attribute *dummy,</div><div class='add'>+static ssize_t show_pwm1(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 			 char *buf)</div><div class='ctx'> {</div><div class='add'>+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct lm63_data *data = lm63_update_device(dev);</div><div class='del'>-	return sprintf(buf, "%d\n", data-&gt;pwm1_value &gt;= 2 * data-&gt;pwm1_freq ?</div><div class='del'>-		       255 : (data-&gt;pwm1_value * 255 + data-&gt;pwm1_freq) /</div><div class='del'>-		       (2 * data-&gt;pwm1_freq));</div><div class='add'>+	int nr = attr-&gt;index;</div><div class='add'>+	int pwm;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;pwm_highres)</div><div class='add'>+		pwm = data-&gt;pwm1[nr];</div><div class='add'>+	else</div><div class='add'>+		pwm = data-&gt;pwm1[nr] &gt;= 2 * data-&gt;pwm1_freq ?</div><div class='add'>+		       255 : (data-&gt;pwm1[nr] * 255 + data-&gt;pwm1_freq) /</div><div class='add'>+		       (2 * data-&gt;pwm1_freq);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", pwm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_pwm1(struct device *dev, struct device_attribute *dummy,</div><div class='hunk'>@@ -231,22 +300,26 @@ static ssize_t set_pwm1(struct device *dev, struct device_attribute *dummy,</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct lm63_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	unsigned long val;</div><div class='del'>-	</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	if (!(data-&gt;config_fan &amp; 0x20)) /* register is read-only */</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	val = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	val = SENSORS_LIMIT(val, 0, 255);</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='del'>-	data-&gt;pwm1_value = val &lt;= 0 ? 0 :</div><div class='del'>-			   val &gt;= 255 ? 2 * data-&gt;pwm1_freq :</div><div class='del'>-			   (val * data-&gt;pwm1_freq * 2 + 127) / 255;</div><div class='del'>-	i2c_smbus_write_byte_data(client, LM63_REG_PWM_VALUE, data-&gt;pwm1_value);</div><div class='add'>+	data-&gt;pwm1[0] = data-&gt;pwm_highres ? val :</div><div class='add'>+			(val * data-&gt;pwm1_freq * 2 + 127) / 255;</div><div class='add'>+	i2c_smbus_write_byte_data(client, LM63_REG_PWM_VALUE, data-&gt;pwm1[0]);</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_pwm1_enable(struct device *dev, struct device_attribute *dummy,</div><div class='del'>-				char *buf)</div><div class='add'>+static ssize_t show_pwm1_enable(struct device *dev,</div><div class='add'>+				struct device_attribute *dummy, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm63_data *data = lm63_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%d\n", data-&gt;config_fan &amp; 0x20 ? 1 : 2);</div><div class='hunk'>@@ -273,21 +346,47 @@ static ssize_t show_remote_temp8(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct lm63_data *data = lm63_update_device(dev);</div><div class='del'>-	return sprintf(buf, "%d\n", TEMP8_FROM_REG(data-&gt;temp8[attr-&gt;index])</div><div class='add'>+	return sprintf(buf, "%d\n", temp8_from_reg(data, attr-&gt;index)</div><div class='add'>+		       + data-&gt;temp2_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_lut_temp(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 sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='add'>+	struct lm63_data *data = lm63_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", lut_temp_from_reg(data, attr-&gt;index)</div><div class='ctx'> 		       + data-&gt;temp2_offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_local_temp8(struct device *dev,</div><div class='del'>-			       struct device_attribute *dummy,</div><div class='del'>-			       const char *buf, size_t count)</div><div class='add'>+static ssize_t set_temp8(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+			 const char *buf, size_t count)</div><div class='ctx'> {</div><div class='add'>+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct lm63_data *data = i2c_get_clientdata(client);</div><div class='del'>-	long val = simple_strtol(buf, NULL, 10);</div><div class='add'>+	int nr = attr-&gt;index;</div><div class='add'>+	int reg = nr == 2 ? LM63_REG_REMOTE_TCRIT : LM63_REG_LOCAL_HIGH;</div><div class='add'>+	long val;</div><div class='add'>+	int err;</div><div class='add'>+	int temp;</div><div class='add'>+</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='del'>-	data-&gt;temp8[1] = TEMP8_TO_REG(val);</div><div class='del'>-	i2c_smbus_write_byte_data(client, LM63_REG_LOCAL_HIGH, data-&gt;temp8[1]);</div><div class='add'>+	if (nr == 2) {</div><div class='add'>+		if (data-&gt;remote_unsigned)</div><div class='add'>+			temp = TEMP8U_TO_REG(val - data-&gt;temp2_offset);</div><div class='add'>+		else</div><div class='add'>+			temp = TEMP8_TO_REG(val - data-&gt;temp2_offset);</div><div class='add'>+	} else {</div><div class='add'>+		temp = TEMP8_TO_REG(val);</div><div class='add'>+	}</div><div class='add'>+	data-&gt;temp8[nr] = temp;</div><div class='add'>+	i2c_smbus_write_byte_data(client, reg, temp);</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -297,28 +396,56 @@ static ssize_t show_temp11(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct lm63_data *data = lm63_update_device(dev);</div><div class='del'>-	return sprintf(buf, "%d\n", TEMP11_FROM_REG(data-&gt;temp11[attr-&gt;index])</div><div class='del'>-		       + data-&gt;temp2_offset);</div><div class='add'>+	int nr = attr-&gt;index;</div><div class='add'>+	int temp;</div><div class='add'>+</div><div class='add'>+	if (!nr) {</div><div class='add'>+		/*</div><div class='add'>+		 * Use unsigned temperature unless its value is zero.</div><div class='add'>+		 * If it is zero, use signed temperature.</div><div class='add'>+		 */</div><div class='add'>+		if (data-&gt;temp11u)</div><div class='add'>+			temp = TEMP11_FROM_REG(data-&gt;temp11u);</div><div class='add'>+		else</div><div class='add'>+			temp = TEMP11_FROM_REG(data-&gt;temp11[nr]);</div><div class='add'>+	} else {</div><div class='add'>+		if (data-&gt;remote_unsigned &amp;&amp; nr == 2)</div><div class='add'>+			temp = TEMP11_FROM_REG((u16)data-&gt;temp11[nr]);</div><div class='add'>+		else</div><div class='add'>+			temp = TEMP11_FROM_REG(data-&gt;temp11[nr]);</div><div class='add'>+	}</div><div class='add'>+	return sprintf(buf, "%d\n", temp + data-&gt;temp2_offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 			  const char *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	static const u8 reg[4] = {</div><div class='add'>+	static const u8 reg[6] = {</div><div class='ctx'> 		LM63_REG_REMOTE_LOW_MSB,</div><div class='ctx'> 		LM63_REG_REMOTE_LOW_LSB,</div><div class='ctx'> 		LM63_REG_REMOTE_HIGH_MSB,</div><div class='ctx'> 		LM63_REG_REMOTE_HIGH_LSB,</div><div class='add'>+		LM63_REG_REMOTE_OFFSET_MSB,</div><div class='add'>+		LM63_REG_REMOTE_OFFSET_LSB,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct lm63_data *data = i2c_get_clientdata(client);</div><div class='del'>-	long val = simple_strtol(buf, NULL, 10);</div><div class='add'>+	long val;</div><div class='add'>+	int err;</div><div class='ctx'> 	int nr = attr-&gt;index;</div><div class='ctx'> </div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='del'>-	data-&gt;temp11[nr] = TEMP11_TO_REG(val - data-&gt;temp2_offset);</div><div class='add'>+	if (data-&gt;remote_unsigned &amp;&amp; nr == 2)</div><div class='add'>+		data-&gt;temp11[nr] = TEMP11U_TO_REG(val - data-&gt;temp2_offset);</div><div class='add'>+	else</div><div class='add'>+		data-&gt;temp11[nr] = TEMP11_TO_REG(val - data-&gt;temp2_offset);</div><div class='add'>+</div><div class='ctx'> 	i2c_smbus_write_byte_data(client, reg[(nr - 1) * 2],</div><div class='ctx'> 				  data-&gt;temp11[nr] &gt;&gt; 8);</div><div class='ctx'> 	i2c_smbus_write_byte_data(client, reg[(nr - 1) * 2 + 1],</div><div class='hunk'>@@ -327,35 +454,143 @@ static ssize_t set_temp11(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'>-/* Hysteresis register holds a relative value, while we want to present</div><div class='del'>-   an absolute to user-space */</div><div class='del'>-static ssize_t show_temp2_crit_hyst(struct device *dev, struct device_attribute *dummy,</div><div class='del'>-				    char *buf)</div><div class='add'>+/*</div><div class='add'>+ * Hysteresis register holds a relative value, while we want to present</div><div class='add'>+ * an absolute to user-space</div><div class='add'>+ */</div><div class='add'>+static ssize_t show_temp2_crit_hyst(struct device *dev,</div><div class='add'>+				    struct device_attribute *dummy, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm63_data *data = lm63_update_device(dev);</div><div class='del'>-	return sprintf(buf, "%d\n", TEMP8_FROM_REG(data-&gt;temp8[2])</div><div class='add'>+	return sprintf(buf, "%d\n", temp8_from_reg(data, 2)</div><div class='ctx'> 		       + data-&gt;temp2_offset</div><div class='ctx'> 		       - TEMP8_FROM_REG(data-&gt;temp2_crit_hyst));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* And now the other way around, user-space provides an absolute</div><div class='del'>-   hysteresis value and we have to store a relative one */</div><div class='del'>-static ssize_t set_temp2_crit_hyst(struct device *dev, struct device_attribute *dummy,</div><div class='add'>+static ssize_t show_lut_temp_hyst(struct device *dev,</div><div class='add'>+				  struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='add'>+	struct lm63_data *data = lm63_update_device(dev);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", lut_temp_from_reg(data, attr-&gt;index)</div><div class='add'>+		       + data-&gt;temp2_offset</div><div class='add'>+		       - TEMP8_FROM_REG(data-&gt;lut_temp_hyst));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * And now the other way around, user-space provides an absolute</div><div class='add'>+ * hysteresis value and we have to store a relative one</div><div class='add'>+ */</div><div class='add'>+static ssize_t set_temp2_crit_hyst(struct device *dev,</div><div class='add'>+				   struct device_attribute *dummy,</div><div class='ctx'> 				   const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct lm63_data *data = i2c_get_clientdata(client);</div><div class='del'>-	long val = simple_strtol(buf, NULL, 10);</div><div class='add'>+	long val;</div><div class='add'>+	int err;</div><div class='ctx'> 	long hyst;</div><div class='ctx'> </div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='del'>-	hyst = TEMP8_FROM_REG(data-&gt;temp8[2]) + data-&gt;temp2_offset - val;</div><div class='add'>+	hyst = temp8_from_reg(data, 2) + data-&gt;temp2_offset - val;</div><div class='ctx'> 	i2c_smbus_write_byte_data(client, LM63_REG_REMOTE_TCRIT_HYST,</div><div class='ctx'> 				  HYST_TO_REG(hyst));</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Set conversion rate.</div><div class='add'>+ * client-&gt;update_lock must be held when calling this function.</div><div class='add'>+ */</div><div class='add'>+static void lm63_set_convrate(struct i2c_client *client, struct lm63_data *data,</div><div class='add'>+			      unsigned int interval)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned int update_interval;</div><div class='add'>+</div><div class='add'>+	/* Shift calculations to avoid rounding errors */</div><div class='add'>+	interval &lt;&lt;= 6;</div><div class='add'>+</div><div class='add'>+	/* find the nearest update rate */</div><div class='add'>+	update_interval = (1 &lt;&lt; (LM63_MAX_CONVRATE + 6)) * 1000</div><div class='add'>+	  / data-&gt;max_convrate_hz;</div><div class='add'>+	for (i = 0; i &lt; LM63_MAX_CONVRATE; i++, update_interval &gt;&gt;= 1)</div><div class='add'>+		if (interval &gt;= update_interval * 3 / 4)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	i2c_smbus_write_byte_data(client, LM63_REG_CONVRATE, i);</div><div class='add'>+	data-&gt;update_interval = UPDATE_INTERVAL(data-&gt;max_convrate_hz, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_update_interval(struct device *dev,</div><div class='add'>+				    struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct lm63_data *data = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%u\n", data-&gt;update_interval);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t set_update_interval(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'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct lm63_data *data = i2c_get_clientdata(client);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	lm63_set_convrate(client, data, SENSORS_LIMIT(val, 0, 100000));</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</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 show_type(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			 char *buf)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct lm63_data *data = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, data-&gt;trutherm ? "1\n" : "2\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t set_type(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 i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct lm63_data *data = i2c_get_clientdata(client);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 reg;</div><div class='add'>+</div><div class='add'>+	ret = kstrtoul(buf, 10, &amp;val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (val != 1 &amp;&amp; val != 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	data-&gt;trutherm = val == 1;</div><div class='add'>+	reg = i2c_smbus_read_byte_data(client, LM96163_REG_TRUTHERM) &amp; ~0x02;</div><div class='add'>+	i2c_smbus_write_byte_data(client, LM96163_REG_TRUTHERM,</div><div class='add'>+				  reg | (data-&gt;trutherm ? 0x02 : 0x00));</div><div class='add'>+	data-&gt;valid = 0;</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t show_alarms(struct device *dev, struct device_attribute *dummy,</div><div class='ctx'> 			   char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -377,27 +612,87 @@ static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 0);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(fan1_min, S_IWUSR | S_IRUGO, show_fan,</div><div class='ctx'> 	set_fan, 1);</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(pwm1, S_IWUSR | S_IRUGO, show_pwm1, set_pwm1);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1, S_IWUSR | S_IRUGO, show_pwm1, set_pwm1, 0);</div><div class='ctx'> static DEVICE_ATTR(pwm1_enable, S_IRUGO, show_pwm1_enable, NULL);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point1_pwm, S_IRUGO, show_pwm1, NULL, 1);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point1_temp, S_IRUGO,</div><div class='add'>+	show_lut_temp, NULL, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point1_temp_hyst, S_IRUGO,</div><div class='add'>+	show_lut_temp_hyst, NULL, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point2_pwm, S_IRUGO, show_pwm1, NULL, 2);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point2_temp, S_IRUGO,</div><div class='add'>+	show_lut_temp, NULL, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point2_temp_hyst, S_IRUGO,</div><div class='add'>+	show_lut_temp_hyst, NULL, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point3_pwm, S_IRUGO, show_pwm1, NULL, 3);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point3_temp, S_IRUGO,</div><div class='add'>+	show_lut_temp, NULL, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point3_temp_hyst, S_IRUGO,</div><div class='add'>+	show_lut_temp_hyst, NULL, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point4_pwm, S_IRUGO, show_pwm1, NULL, 4);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point4_temp, S_IRUGO,</div><div class='add'>+	show_lut_temp, NULL, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point4_temp_hyst, S_IRUGO,</div><div class='add'>+	show_lut_temp_hyst, NULL, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point5_pwm, S_IRUGO, show_pwm1, NULL, 5);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point5_temp, S_IRUGO,</div><div class='add'>+	show_lut_temp, NULL, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point5_temp_hyst, S_IRUGO,</div><div class='add'>+	show_lut_temp_hyst, NULL, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point6_pwm, S_IRUGO, show_pwm1, NULL, 6);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point6_temp, S_IRUGO,</div><div class='add'>+	show_lut_temp, NULL, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point6_temp_hyst, S_IRUGO,</div><div class='add'>+	show_lut_temp_hyst, NULL, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point7_pwm, S_IRUGO, show_pwm1, NULL, 7);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point7_temp, S_IRUGO,</div><div class='add'>+	show_lut_temp, NULL, 9);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point7_temp_hyst, S_IRUGO,</div><div class='add'>+	show_lut_temp_hyst, NULL, 9);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point8_pwm, S_IRUGO, show_pwm1, NULL, 8);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point8_temp, S_IRUGO,</div><div class='add'>+	show_lut_temp, NULL, 10);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point8_temp_hyst, S_IRUGO,</div><div class='add'>+	show_lut_temp_hyst, NULL, 10);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point9_pwm, S_IRUGO, show_pwm1, NULL, 9);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point9_temp, S_IRUGO,</div><div class='add'>+	show_lut_temp, NULL, 11);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point9_temp_hyst, S_IRUGO,</div><div class='add'>+	show_lut_temp_hyst, NULL, 11);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point10_pwm, S_IRUGO, show_pwm1, NULL, 10);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point10_temp, S_IRUGO,</div><div class='add'>+	show_lut_temp, NULL, 12);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point10_temp_hyst, S_IRUGO,</div><div class='add'>+	show_lut_temp_hyst, NULL, 12);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point11_pwm, S_IRUGO, show_pwm1, NULL, 11);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point11_temp, S_IRUGO,</div><div class='add'>+	show_lut_temp, NULL, 13);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point11_temp_hyst, S_IRUGO,</div><div class='add'>+	show_lut_temp_hyst, NULL, 13);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point12_pwm, S_IRUGO, show_pwm1, NULL, 12);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point12_temp, S_IRUGO,</div><div class='add'>+	show_lut_temp, NULL, 14);</div><div class='add'>+static SENSOR_DEVICE_ATTR(pwm1_auto_point12_temp_hyst, S_IRUGO,</div><div class='add'>+	show_lut_temp_hyst, NULL, 14);</div><div class='ctx'> </div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_local_temp8, NULL, 0);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_local_temp8,</div><div class='del'>-	set_local_temp8, 1);</div><div class='add'>+	set_temp8, 1);</div><div class='ctx'> </div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp11, NULL, 0);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_temp11,</div><div class='ctx'> 	set_temp11, 1);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp11,</div><div class='ctx'> 	set_temp11, 2);</div><div class='del'>-/*</div><div class='del'>- * On LM63, temp2_crit can be set only once, which should be job</div><div class='del'>- * of the bootloader.</div><div class='del'>- */</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp2_offset, S_IWUSR | S_IRUGO, show_temp11,</div><div class='add'>+	set_temp11, 3);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp2_crit, S_IRUGO, show_remote_temp8,</div><div class='del'>-	NULL, 2);</div><div class='add'>+	set_temp8, 2);</div><div class='ctx'> static DEVICE_ATTR(temp2_crit_hyst, S_IWUSR | S_IRUGO, show_temp2_crit_hyst,</div><div class='ctx'> 	set_temp2_crit_hyst);</div><div class='ctx'> </div><div class='add'>+static DEVICE_ATTR(temp2_type, S_IWUSR | S_IRUGO, show_type, set_type);</div><div class='add'>+</div><div class='ctx'> /* Individual alarm files */</div><div class='ctx'> static SENSOR_DEVICE_ATTR(fan1_min_alarm, S_IRUGO, show_alarm, NULL, 0);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO, show_alarm, NULL, 1);</div><div class='hunk'>@@ -408,14 +703,43 @@ static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL, 6);</div><div class='ctx'> /* Raw alarm file for compatibility */</div><div class='ctx'> static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);</div><div class='ctx'> </div><div class='add'>+static DEVICE_ATTR(update_interval, S_IRUGO | S_IWUSR, show_update_interval,</div><div class='add'>+		   set_update_interval);</div><div class='add'>+</div><div class='ctx'> static struct attribute *lm63_attributes[] = {</div><div class='del'>-	&amp;dev_attr_pwm1.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1.dev_attr.attr,</div><div class='ctx'> 	&amp;dev_attr_pwm1_enable.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point1_pwm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point1_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point1_temp_hyst.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point2_pwm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point2_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point2_temp_hyst.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point3_pwm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point3_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point3_temp_hyst.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point4_pwm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point4_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point4_temp_hyst.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point5_pwm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point5_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point5_temp_hyst.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point6_pwm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point6_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point6_temp_hyst.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point7_pwm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point7_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point7_temp_hyst.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point8_pwm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point8_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point8_temp_hyst.dev_attr.attr,</div><div class='add'>+</div><div class='ctx'> 	&amp;sensor_dev_attr_temp1_input.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp2_input.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp2_min.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp1_max.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp2_max.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_temp2_offset.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp2_crit.dev_attr.attr,</div><div class='ctx'> 	&amp;dev_attr_temp2_crit_hyst.attr,</div><div class='ctx'> </div><div class='hunk'>@@ -425,10 +749,54 @@ static struct attribute *lm63_attributes[] = {</div><div class='ctx'> 	&amp;sensor_dev_attr_temp2_max_alarm.dev_attr.attr,</div><div class='ctx'> 	&amp;sensor_dev_attr_temp1_max_alarm.dev_attr.attr,</div><div class='ctx'> 	&amp;dev_attr_alarms.attr,</div><div class='add'>+	&amp;dev_attr_update_interval.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct attribute *lm63_attributes_extra_lut[] = {</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point9_pwm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point9_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point9_temp_hyst.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point10_pwm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point10_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point10_temp_hyst.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point11_pwm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point11_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point11_temp_hyst.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point12_pwm.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point12_temp.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_pwm1_auto_point12_temp_hyst.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 lm63_group_extra_lut = {</div><div class='add'>+	.attrs = lm63_attributes_extra_lut,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On LM63, temp2_crit can be set only once, which should be job</div><div class='add'>+ * of the bootloader.</div><div class='add'>+ * On LM64, temp2_crit can always be set.</div><div class='add'>+ * On LM96163, temp2_crit can be set if bit 1 of the configuration</div><div class='add'>+ * register is true.</div><div class='add'>+ */</div><div class='add'>+static umode_t lm63_attribute_mode(struct kobject *kobj,</div><div class='add'>+				   struct attribute *attr, int index)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = container_of(kobj, struct device, kobj);</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct lm63_data *data = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	if (attr == &amp;sensor_dev_attr_temp2_crit.dev_attr.attr</div><div class='add'>+	    &amp;&amp; (data-&gt;kind == lm64 ||</div><div class='add'>+		(data-&gt;kind == lm96163 &amp;&amp; (data-&gt;config &amp; 0x02))))</div><div class='add'>+		return attr-&gt;mode | S_IWUSR;</div><div class='add'>+</div><div class='add'>+	return attr-&gt;mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct attribute_group lm63_group = {</div><div class='add'>+	.is_visible = lm63_attribute_mode,</div><div class='ctx'> 	.attrs = lm63_attributes,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -487,6 +855,8 @@ static int lm63_detect(struct i2c_client *new_client,</div><div class='ctx'> 		strlcpy(info-&gt;type, "lm63", I2C_NAME_SIZE);</div><div class='ctx'> 	else if (chip_id == 0x51 &amp;&amp; (address == 0x18 || address == 0x4e))</div><div class='ctx'> 		strlcpy(info-&gt;type, "lm64", I2C_NAME_SIZE);</div><div class='add'>+	else if (chip_id == 0x49 &amp;&amp; address == 0x4c)</div><div class='add'>+		strlcpy(info-&gt;type, "lm96163", I2C_NAME_SIZE);</div><div class='ctx'> 	else</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='hunk'>@@ -518,12 +888,24 @@ static int lm63_probe(struct i2c_client *new_client,</div><div class='ctx'> 	lm63_init_client(new_client);</div><div class='ctx'> </div><div class='ctx'> 	/* Register sysfs hooks */</div><div class='del'>-	if ((err = sysfs_create_group(&amp;new_client-&gt;dev.kobj,</div><div class='del'>-				      &amp;lm63_group)))</div><div class='add'>+	err = sysfs_create_group(&amp;new_client-&gt;dev.kobj, &amp;lm63_group);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto exit_free;</div><div class='ctx'> 	if (data-&gt;config &amp; 0x04) { /* tachometer enabled */</div><div class='del'>-		if ((err = sysfs_create_group(&amp;new_client-&gt;dev.kobj,</div><div class='del'>-					      &amp;lm63_group_fan1)))</div><div class='add'>+		err = sysfs_create_group(&amp;new_client-&gt;dev.kobj,</div><div class='add'>+					 &amp;lm63_group_fan1);</div><div class='add'>+		if (err)</div><div class='add'>+			goto exit_remove_files;</div><div class='add'>+	}</div><div class='add'>+	if (data-&gt;kind == lm96163) {</div><div class='add'>+		err = device_create_file(&amp;new_client-&gt;dev,</div><div class='add'>+					 &amp;dev_attr_temp2_type);</div><div class='add'>+		if (err)</div><div class='add'>+			goto exit_remove_files;</div><div class='add'>+</div><div class='add'>+		err = sysfs_create_group(&amp;new_client-&gt;dev.kobj,</div><div class='add'>+					 &amp;lm63_group_extra_lut);</div><div class='add'>+		if (err)</div><div class='ctx'> 			goto exit_remove_files;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -538,17 +920,25 @@ static int lm63_probe(struct i2c_client *new_client,</div><div class='ctx'> exit_remove_files:</div><div class='ctx'> 	sysfs_remove_group(&amp;new_client-&gt;dev.kobj, &amp;lm63_group);</div><div class='ctx'> 	sysfs_remove_group(&amp;new_client-&gt;dev.kobj, &amp;lm63_group_fan1);</div><div class='add'>+	if (data-&gt;kind == lm96163) {</div><div class='add'>+		device_remove_file(&amp;new_client-&gt;dev, &amp;dev_attr_temp2_type);</div><div class='add'>+		sysfs_remove_group(&amp;new_client-&gt;dev.kobj,</div><div class='add'>+				   &amp;lm63_group_extra_lut);</div><div class='add'>+	}</div><div class='ctx'> exit_free:</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Idealy we shouldn't have to initialize anything, since the BIOS</div><div class='del'>-   should have taken care of everything */</div><div class='add'>+/*</div><div class='add'>+ * Ideally we shouldn't have to initialize anything, since the BIOS</div><div class='add'>+ * should have taken care of everything</div><div class='add'>+ */</div><div class='ctx'> static void lm63_init_client(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm63_data *data = i2c_get_clientdata(client);</div><div class='add'>+	u8 convrate;</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;config = i2c_smbus_read_byte_data(client, LM63_REG_CONFIG1);</div><div class='ctx'> 	data-&gt;config_fan = i2c_smbus_read_byte_data(client,</div><div class='hunk'>@@ -561,16 +951,57 @@ static void lm63_init_client(struct i2c_client *client)</div><div class='ctx'> 		i2c_smbus_write_byte_data(client, LM63_REG_CONFIG1,</div><div class='ctx'> 					  data-&gt;config);</div><div class='ctx'> 	}</div><div class='add'>+	/* Tachometer is always enabled on LM64 */</div><div class='add'>+	if (data-&gt;kind == lm64)</div><div class='add'>+		data-&gt;config |= 0x04;</div><div class='ctx'> </div><div class='ctx'> 	/* We may need pwm1_freq before ever updating the client data */</div><div class='ctx'> 	data-&gt;pwm1_freq = i2c_smbus_read_byte_data(client, LM63_REG_PWM_FREQ);</div><div class='ctx'> 	if (data-&gt;pwm1_freq == 0)</div><div class='ctx'> 		data-&gt;pwm1_freq = 1;</div><div class='ctx'> </div><div class='add'>+	switch (data-&gt;kind) {</div><div class='add'>+	case lm63:</div><div class='add'>+	case lm64:</div><div class='add'>+		data-&gt;max_convrate_hz = LM63_MAX_CONVRATE_HZ;</div><div class='add'>+		data-&gt;lut_size = 8;</div><div class='add'>+		break;</div><div class='add'>+	case lm96163:</div><div class='add'>+		data-&gt;max_convrate_hz = LM96163_MAX_CONVRATE_HZ;</div><div class='add'>+		data-&gt;lut_size = 12;</div><div class='add'>+		data-&gt;trutherm</div><div class='add'>+		  = i2c_smbus_read_byte_data(client,</div><div class='add'>+					     LM96163_REG_TRUTHERM) &amp; 0x02;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	convrate = i2c_smbus_read_byte_data(client, LM63_REG_CONVRATE);</div><div class='add'>+	if (unlikely(convrate &gt; LM63_MAX_CONVRATE))</div><div class='add'>+		convrate = LM63_MAX_CONVRATE;</div><div class='add'>+	data-&gt;update_interval = UPDATE_INTERVAL(data-&gt;max_convrate_hz,</div><div class='add'>+						convrate);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For LM96163, check if high resolution PWM</div><div class='add'>+	 * and unsigned temperature format is enabled.</div><div class='add'>+	 */</div><div class='add'>+	if (data-&gt;kind == lm96163) {</div><div class='add'>+		u8 config_enhanced</div><div class='add'>+		  = i2c_smbus_read_byte_data(client,</div><div class='add'>+					     LM96163_REG_CONFIG_ENHANCED);</div><div class='add'>+		if (config_enhanced &amp; 0x20)</div><div class='add'>+			data-&gt;lut_temp_highres = true;</div><div class='add'>+		if ((config_enhanced &amp; 0x10)</div><div class='add'>+		    &amp;&amp; !(data-&gt;config_fan &amp; 0x08) &amp;&amp; data-&gt;pwm1_freq == 8)</div><div class='add'>+			data-&gt;pwm_highres = true;</div><div class='add'>+		if (config_enhanced &amp; 0x08)</div><div class='add'>+			data-&gt;remote_unsigned = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Show some debug info about the LM63 configuration */</div><div class='del'>-	dev_dbg(&amp;client-&gt;dev, "Alert/tach pin configured for %s\n",</div><div class='del'>-		(data-&gt;config &amp; 0x04) ? "tachometer input" :</div><div class='del'>-		"alert output");</div><div class='add'>+	if (data-&gt;kind == lm63)</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "Alert/tach pin configured for %s\n",</div><div class='add'>+			(data-&gt;config &amp; 0x04) ? "tachometer input" :</div><div class='add'>+			"alert output");</div><div class='ctx'> 	dev_dbg(&amp;client-&gt;dev, "PWM clock %s kHz, output frequency %u Hz\n",</div><div class='ctx'> 		(data-&gt;config_fan &amp; 0x08) ? "1.4" : "360",</div><div class='ctx'> 		((data-&gt;config_fan &amp; 0x08) ? 700 : 180000) / data-&gt;pwm1_freq);</div><div class='hunk'>@@ -586,6 +1017,10 @@ static int lm63_remove(struct i2c_client *client)</div><div class='ctx'> 	hwmon_device_unregister(data-&gt;hwmon_dev);</div><div class='ctx'> 	sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm63_group);</div><div class='ctx'> 	sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm63_group_fan1);</div><div class='add'>+	if (data-&gt;kind == lm96163) {</div><div class='add'>+		device_remove_file(&amp;client-&gt;dev, &amp;dev_attr_temp2_type);</div><div class='add'>+		sysfs_remove_group(&amp;client-&gt;dev.kobj, &amp;lm63_group_extra_lut);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(data);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -595,10 +1030,15 @@ static struct lm63_data *lm63_update_device(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct lm63_data *data = i2c_get_clientdata(client);</div><div class='add'>+	unsigned long next_update;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='del'>-	if (time_after(jiffies, data-&gt;last_updated + HZ) || !data-&gt;valid) {</div><div class='add'>+	next_update = data-&gt;last_updated</div><div class='add'>+	  + msecs_to_jiffies(data-&gt;update_interval) + 1;</div><div class='add'>+</div><div class='add'>+	if (time_after(jiffies, next_update) || !data-&gt;valid) {</div><div class='ctx'> 		if (data-&gt;config &amp; 0x04) { /* tachometer enabled  */</div><div class='ctx'> 			/* order matters for fan1_input */</div><div class='ctx'> 			data-&gt;fan[0] = i2c_smbus_read_byte_data(client,</div><div class='hunk'>@@ -615,8 +1055,8 @@ static struct lm63_data *lm63_update_device(struct device *dev)</div><div class='ctx'> 				  LM63_REG_PWM_FREQ);</div><div class='ctx'> 		if (data-&gt;pwm1_freq == 0)</div><div class='ctx'> 			data-&gt;pwm1_freq = 1;</div><div class='del'>-		data-&gt;pwm1_value = i2c_smbus_read_byte_data(client,</div><div class='del'>-				   LM63_REG_PWM_VALUE);</div><div class='add'>+		data-&gt;pwm1[0] = i2c_smbus_read_byte_data(client,</div><div class='add'>+				LM63_REG_PWM_VALUE);</div><div class='ctx'> </div><div class='ctx'> 		data-&gt;temp8[0] = i2c_smbus_read_byte_data(client,</div><div class='ctx'> 				 LM63_REG_LOCAL_TEMP);</div><div class='hunk'>@@ -636,6 +1076,17 @@ static struct lm63_data *lm63_update_device(struct device *dev)</div><div class='ctx'> 				  LM63_REG_REMOTE_HIGH_MSB) &lt;&lt; 8)</div><div class='ctx'> 				| i2c_smbus_read_byte_data(client,</div><div class='ctx'> 				  LM63_REG_REMOTE_HIGH_LSB);</div><div class='add'>+		data-&gt;temp11[3] = (i2c_smbus_read_byte_data(client,</div><div class='add'>+				  LM63_REG_REMOTE_OFFSET_MSB) &lt;&lt; 8)</div><div class='add'>+				| i2c_smbus_read_byte_data(client,</div><div class='add'>+				  LM63_REG_REMOTE_OFFSET_LSB);</div><div class='add'>+</div><div class='add'>+		if (data-&gt;kind == lm96163)</div><div class='add'>+			data-&gt;temp11u = (i2c_smbus_read_byte_data(client,</div><div class='add'>+					LM96163_REG_REMOTE_TEMP_U_MSB) &lt;&lt; 8)</div><div class='add'>+				      | i2c_smbus_read_byte_data(client,</div><div class='add'>+					LM96163_REG_REMOTE_TEMP_U_LSB);</div><div class='add'>+</div><div class='ctx'> 		data-&gt;temp8[2] = i2c_smbus_read_byte_data(client,</div><div class='ctx'> 				 LM63_REG_REMOTE_TCRIT);</div><div class='ctx'> 		data-&gt;temp2_crit_hyst = i2c_smbus_read_byte_data(client,</div><div class='hunk'>@@ -648,6 +1099,21 @@ static struct lm63_data *lm63_update_device(struct device *dev)</div><div class='ctx'> 		data-&gt;valid = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (time_after(jiffies, data-&gt;lut_last_updated + 5 * HZ) ||</div><div class='add'>+	    !data-&gt;lut_valid) {</div><div class='add'>+		for (i = 0; i &lt; data-&gt;lut_size; i++) {</div><div class='add'>+			data-&gt;pwm1[1 + i] = i2c_smbus_read_byte_data(client,</div><div class='add'>+					    LM63_REG_LUT_PWM(i));</div><div class='add'>+			data-&gt;temp8[3 + i] = i2c_smbus_read_byte_data(client,</div><div class='add'>+					     LM63_REG_LUT_TEMP(i));</div><div class='add'>+		}</div><div class='add'>+		data-&gt;lut_temp_hyst = i2c_smbus_read_byte_data(client,</div><div class='add'>+				      LM63_REG_LUT_TEMP_HYST);</div><div class='add'>+</div><div class='add'>+		data-&gt;lut_last_updated = jiffies;</div><div class='add'>+		data-&gt;lut_valid = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	return data;</div><div class='head'>diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c<br/>index 9e64d96620d3..9c8093c4b307 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/lm73.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/lm73.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/lm73.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/lm73.c</a></div><div class='hunk'>@@ -50,7 +50,7 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	long temp;</div><div class='ctx'> 	short value;</div><div class='ctx'> </div><div class='del'>-	int status = strict_strtol(buf, 10, &amp;temp);</div><div class='add'>+	int status = kstrtol(buf, 10, &amp;temp);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c<br/>index 1888dd0fc05f..b3311b1d3d92 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/lm75.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/lm75.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/lm75.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/lm75.c</a></div><div class='hunk'>@@ -93,6 +93,10 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *da,</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);</div><div class='ctx'> 	struct lm75_data *data = lm75_update_device(dev);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(data))</div><div class='add'>+		return PTR_ERR(data);</div><div class='add'>+</div><div class='ctx'> 	return sprintf(buf, "%d\n",</div><div class='ctx'> 		       LM75_TEMP_FROM_REG(data-&gt;temp[attr-&gt;index]));</div><div class='ctx'> }</div><div class='hunk'>@@ -107,7 +111,7 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *da,</div><div class='ctx'> 	long temp;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = strict_strtol(buf, 10, &amp;temp);</div><div class='add'>+	error = kstrtol(buf, 10, &amp;temp);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -402,6 +406,7 @@ static struct lm75_data *lm75_update_device(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct lm75_data *data = i2c_get_clientdata(client);</div><div class='add'>+	struct lm75_data *ret = data;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -414,19 +419,23 @@ static struct lm75_data *lm75_update_device(struct device *dev)</div><div class='ctx'> 			int status;</div><div class='ctx'> </div><div class='ctx'> 			status = lm75_read_value(client, LM75_REG_TEMP[i]);</div><div class='del'>-			if (status &lt; 0)</div><div class='del'>-				dev_dbg(&amp;client-&gt;dev, "reg %d, err %d\n",</div><div class='del'>-						LM75_REG_TEMP[i], status);</div><div class='del'>-			else</div><div class='del'>-				data-&gt;temp[i] = status;</div><div class='add'>+			if (unlikely(status &lt; 0)) {</div><div class='add'>+				dev_dbg(dev,</div><div class='add'>+					"LM75: Failed to read value: reg %d, error %d\n",</div><div class='add'>+					LM75_REG_TEMP[i], status);</div><div class='add'>+				ret = ERR_PTR(status);</div><div class='add'>+				data-&gt;valid = 0;</div><div class='add'>+				goto abort;</div><div class='add'>+			}</div><div class='add'>+			data-&gt;temp[i] = status;</div><div class='ctx'> 		}</div><div class='ctx'> 		data-&gt;last_updated = jiffies;</div><div class='ctx'> 		data-&gt;valid = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+abort:</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='del'>-</div><div class='del'>-	return data;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*-----------------------------------------------------------------------*/</div><div class='head'>diff --git a/drivers/hwmon/lm75.h b/drivers/hwmon/lm75.h<br/>index e547a3eb4de3..89aa9098ba5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/lm75.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/lm75.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/lm75.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/lm75.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>     lm75.h - Part of lm_sensors, Linux kernel modules for hardware</div><div class='del'>-             monitoring</div><div class='add'>+	      monitoring</div><div class='ctx'>     Copyright (c) 2003 Mark M. Hoffman &lt;mhoffman@lightlink.com&gt;</div><div class='ctx'> </div><div class='ctx'>     This program is free software; you can redistribute it and/or modify</div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'> static inline u16 LM75_TEMP_TO_REG(long temp)</div><div class='ctx'> {</div><div class='ctx'> 	int ntemp = SENSORS_LIMIT(temp, LM75_TEMP_MIN, LM75_TEMP_MAX);</div><div class='del'>-	ntemp += (ntemp&lt;0 ? -250 : 250);</div><div class='add'>+	ntemp += (ntemp &lt; 0 ? -250 : 250);</div><div class='ctx'> 	return (u16)((ntemp / 500) &lt;&lt; 7);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -47,4 +47,3 @@ static inline int LM75_TEMP_FROM_REG(u16 reg)</div><div class='ctx'> 	   guarantee arithmetic shift and preserve the sign */</div><div class='ctx'> 	return ((s16)reg / 128) * 500;</div><div class='ctx'> }</div><div class='del'>-</div><div class='head'>diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c<br/>index 18a0e6c5fe88..0891b38ffec0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/lm80.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/lm80.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/lm80.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/lm80.c</a></div><div class='hunk'>@@ -66,19 +66,19 @@ static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,</div><div class='ctx'>    these macros are called: arguments may be evaluated more than once.</div><div class='ctx'>    Fixing this is just not worth it. */</div><div class='ctx'> </div><div class='del'>-#define IN_TO_REG(val)		(SENSORS_LIMIT(((val)+5)/10,0,255))</div><div class='del'>-#define IN_FROM_REG(val)	((val)*10)</div><div class='add'>+#define IN_TO_REG(val)		(SENSORS_LIMIT(((val) + 5) / 10, 0, 255))</div><div class='add'>+#define IN_FROM_REG(val)	((val) * 10)</div><div class='ctx'> </div><div class='ctx'> static inline unsigned char FAN_TO_REG(unsigned rpm, unsigned div)</div><div class='ctx'> {</div><div class='ctx'> 	if (rpm == 0)</div><div class='ctx'> 		return 255;</div><div class='ctx'> 	rpm = SENSORS_LIMIT(rpm, 1, 1000000);</div><div class='del'>-	return SENSORS_LIMIT((1350000 + rpm*div / 2) / (rpm*div), 1, 254);</div><div class='add'>+	return SENSORS_LIMIT((1350000 + rpm * div / 2) / (rpm * div), 1, 254);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define FAN_FROM_REG(val,div)	((val)==0?-1:\</div><div class='del'>-				(val)==255?0:1350000/((div)*(val)))</div><div class='add'>+#define FAN_FROM_REG(val, div)	((val) == 0 ? -1 : \</div><div class='add'>+				(val) == 255 ? 0 : 1350000/((div) * (val)))</div><div class='ctx'> </div><div class='ctx'> static inline long TEMP_FROM_REG(u16 temp)</div><div class='ctx'> {</div><div class='hunk'>@@ -93,10 +93,11 @@ static inline long TEMP_FROM_REG(u16 temp)</div><div class='ctx'> 	return res / 10;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define TEMP_LIMIT_FROM_REG(val)	(((val)&gt;0x80?(val)-0x100:(val))*1000)</div><div class='add'>+#define TEMP_LIMIT_FROM_REG(val)	(((val) &gt; 0x80 ? \</div><div class='add'>+	(val) - 0x100 : (val)) * 1000)</div><div class='ctx'> </div><div class='del'>-#define TEMP_LIMIT_TO_REG(val)		SENSORS_LIMIT((val)&lt;0?\</div><div class='del'>-					((val)-500)/1000:((val)+500)/1000,0,255)</div><div class='add'>+#define TEMP_LIMIT_TO_REG(val)		SENSORS_LIMIT((val) &lt; 0 ? \</div><div class='add'>+	((val) - 500) / 1000 : ((val) + 500) / 1000, 0, 255)</div><div class='ctx'> </div><div class='ctx'> #define DIV_FROM_REG(val)		(1 &lt;&lt; (val))</div><div class='ctx'> </div><div class='hunk'>@@ -164,7 +165,8 @@ static struct i2c_driver lm80_driver = {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define show_in(suffix, value) \</div><div class='del'>-static ssize_t show_in_##suffix(struct device *dev, struct device_attribute *attr, char *buf) \</div><div class='add'>+static ssize_t show_in_##suffix(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 lm80_data *data = lm80_update_device(dev); \</div><div class='hunk'>@@ -175,14 +177,14 @@ show_in(max, in_max)</div><div class='ctx'> show_in(input, in)</div><div class='ctx'> </div><div class='ctx'> #define set_in(suffix, value, reg) \</div><div class='del'>-static ssize_t set_in_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \</div><div class='del'>-	size_t count) \</div><div class='add'>+static ssize_t set_in_##suffix(struct device *dev, \</div><div class='add'>+	struct device_attribute *attr, 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 i2c_client *client = to_i2c_client(dev); \</div><div class='ctx'> 	struct lm80_data *data = i2c_get_clientdata(client); \</div><div class='ctx'> 	long val = simple_strtol(buf, NULL, 10); \</div><div class='del'>- \</div><div class='add'>+\</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);\</div><div class='ctx'> 	data-&gt;value[nr] = IN_TO_REG(val); \</div><div class='ctx'> 	lm80_write_value(client, reg(nr), data-&gt;value[nr]); \</div><div class='hunk'>@@ -193,7 +195,8 @@ set_in(min, in_min, LM80_REG_IN_MIN)</div><div class='ctx'> set_in(max, in_max, LM80_REG_IN_MAX)</div><div class='ctx'> </div><div class='ctx'> #define show_fan(suffix, value) \</div><div class='del'>-static ssize_t show_fan_##suffix(struct device *dev, struct device_attribute *attr, char *buf) \</div><div class='add'>+static ssize_t show_fan_##suffix(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 lm80_data *data = lm80_update_device(dev); \</div><div class='hunk'>@@ -245,10 +248,18 @@ static ssize_t set_fan_div(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'> 	switch (val) {</div><div class='del'>-	case 1: data-&gt;fan_div[nr] = 0; break;</div><div class='del'>-	case 2: data-&gt;fan_div[nr] = 1; break;</div><div class='del'>-	case 4: data-&gt;fan_div[nr] = 2; break;</div><div class='del'>-	case 8: data-&gt;fan_div[nr] = 3; break;</div><div class='add'>+	case 1:</div><div class='add'>+		data-&gt;fan_div[nr] = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		data-&gt;fan_div[nr] = 1;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		data-&gt;fan_div[nr] = 2;</div><div class='add'>+		break;</div><div class='add'>+	case 8:</div><div class='add'>+		data-&gt;fan_div[nr] = 3;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_err(&amp;client-&gt;dev, "fan_div value %ld not "</div><div class='ctx'> 			"supported. Choose one of 1, 2, 4 or 8!\n", val);</div><div class='hunk'>@@ -268,14 +279,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'>-static ssize_t show_temp_input1(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t show_temp_input1(struct device *dev,</div><div class='add'>+	struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lm80_data *data = lm80_update_device(dev);</div><div class='ctx'> 	return sprintf(buf, "%ld\n", TEMP_FROM_REG(data-&gt;temp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define show_temp(suffix, value) \</div><div class='del'>-static ssize_t show_temp_##suffix(struct device *dev, struct device_attribute *attr, char *buf) \</div><div class='add'>+static ssize_t show_temp_##suffix(struct device *dev, \</div><div class='add'>+	struct device_attribute *attr, char *buf) \</div><div class='ctx'> { \</div><div class='ctx'> 	struct lm80_data *data = lm80_update_device(dev); \</div><div class='ctx'> 	return sprintf(buf, "%d\n", TEMP_LIMIT_FROM_REG(data-&gt;value)); \</div><div class='hunk'>@@ -286,13 +299,13 @@ show_temp(os_max, temp_os_max);</div><div class='ctx'> show_temp(os_hyst, temp_os_hyst);</div><div class='ctx'> </div><div class='ctx'> #define set_temp(suffix, value, reg) \</div><div class='del'>-static ssize_t set_temp_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \</div><div class='del'>-	size_t count) \</div><div class='add'>+static ssize_t set_temp_##suffix(struct device *dev, \</div><div class='add'>+	struct device_attribute *attr, const char *buf, size_t count) \</div><div class='ctx'> { \</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev); \</div><div class='ctx'> 	struct lm80_data *data = i2c_get_clientdata(client); \</div><div class='ctx'> 	long val = simple_strtoul(buf, NULL, 10); \</div><div class='del'>- \</div><div class='add'>+\</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock); \</div><div class='ctx'> 	data-&gt;value = TEMP_LIMIT_TO_REG(val); \</div><div class='ctx'> 	lm80_write_value(client, reg, data-&gt;value); \</div><div class='hunk'>@@ -366,13 +379,13 @@ static SENSOR_DEVICE_ATTR(fan2_div, S_IWUSR | S_IRUGO,</div><div class='ctx'> 		show_fan_div, set_fan_div, 1);</div><div class='ctx'> static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp_input1, NULL);</div><div class='ctx'> static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp_hot_max,</div><div class='del'>-    set_temp_hot_max);</div><div class='add'>+	set_temp_hot_max);</div><div class='ctx'> static DEVICE_ATTR(temp1_max_hyst, S_IWUSR | S_IRUGO, show_temp_hot_hyst,</div><div class='del'>-    set_temp_hot_hyst);</div><div class='add'>+	set_temp_hot_hyst);</div><div class='ctx'> static DEVICE_ATTR(temp1_crit, S_IWUSR | S_IRUGO, show_temp_os_max,</div><div class='del'>-    set_temp_os_max);</div><div class='add'>+	set_temp_os_max);</div><div class='ctx'> static DEVICE_ATTR(temp1_crit_hyst, S_IWUSR | S_IRUGO, show_temp_os_hyst,</div><div class='del'>-    set_temp_os_hyst);</div><div class='add'>+	set_temp_os_hyst);</div><div class='ctx'> static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0);</div><div class='ctx'> static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1);</div><div class='hunk'>@@ -459,7 +472,7 @@ static int lm80_detect(struct i2c_client *client, struct i2c_board_info *info)</div><div class='ctx'> 		if ((i2c_smbus_read_byte_data(client, i + 0x40) != cur)</div><div class='ctx'> 		 || (i2c_smbus_read_byte_data(client, i + 0x80) != cur)</div><div class='ctx'> 		 || (i2c_smbus_read_byte_data(client, i + 0xc0) != cur))</div><div class='del'>-		    return -ENODEV;</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	strlcpy(info-&gt;type, "lm80", I2C_NAME_SIZE);</div><div class='hunk'>@@ -490,7 +503,8 @@ static int lm80_probe(struct i2c_client *client,</div><div class='ctx'> 	data-&gt;fan_min[1] = lm80_read_value(client, LM80_REG_FAN_MIN(2));</div><div class='ctx'> </div><div class='ctx'> 	/* Register sysfs hooks */</div><div class='del'>-	if ((err = sysfs_create_group(&amp;client-&gt;dev.kobj, &amp;lm80_group)))</div><div class='add'>+	err = sysfs_create_group(&amp;client-&gt;dev.kobj, &amp;lm80_group);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto error_free;</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;hwmon_dev = hwmon_device_register(&amp;client-&gt;dev);</div><div class='head'>diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c<br/>index 615bc4f4e530..d2dd5f90496d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/lm90.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/lm90.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/lm90.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/lm90.c</a></div><div class='hunk'>@@ -730,7 +730,7 @@ static ssize_t set_temp8(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	long val;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -798,7 +798,7 @@ static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr,</div><div class='ctx'> 	long val;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -859,7 +859,7 @@ static ssize_t set_temphyst(struct device *dev, struct device_attribute *dummy,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int temp;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -912,12 +912,12 @@ static ssize_t set_update_interval(struct device *dev,</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='del'>-	lm90_set_convrate(client, data, val);</div><div class='add'>+	lm90_set_convrate(client, data, SENSORS_LIMIT(val, 0, 100000));</div><div class='ctx'> 	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -1080,7 +1080,7 @@ static ssize_t set_pec(struct device *dev, struct device_attribute *dummy,</div><div class='ctx'> 	long val;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</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/drivers/hwmon/lm93.c b/drivers/hwmon/lm93.c<br/>index 3b43df418613..8bd6c5c9e05b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/lm93.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/lm93.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/lm93.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/lm93.c</a></div><div class='hunk'>@@ -151,12 +151,12 @@ static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };</div><div class='ctx'> </div><div class='ctx'> /* Insmod parameters */</div><div class='ctx'> </div><div class='del'>-static int disable_block;</div><div class='add'>+static bool disable_block;</div><div class='ctx'> module_param(disable_block, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(disable_block,</div><div class='ctx'> 	"Set to non-zero to disable SMBus block data transactions.");</div><div class='ctx'> </div><div class='del'>-static int init;</div><div class='add'>+static bool init;</div><div class='ctx'> module_param(init, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(init, "Set to non-zero to force chip initialization.");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/lm95241.c b/drivers/hwmon/lm95241.c<br/>index 513901d592a9..70bca671e083 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/lm95241.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/lm95241.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/lm95241.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/lm95241.c</a></div><div class='hunk'>@@ -169,7 +169,7 @@ static ssize_t set_type(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int shift;</div><div class='ctx'> 	u8 mask = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (val != 1 &amp;&amp; val != 2)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -216,7 +216,7 @@ static ssize_t set_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lm95241_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (val &lt; -128000)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -254,7 +254,7 @@ static ssize_t set_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lm95241_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (val &gt;= 256000)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -290,7 +290,7 @@ static ssize_t set_interval(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lm95241_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;interval = val * HZ / 1000;</div><div class='head'>diff --git a/drivers/hwmon/lm95245.c b/drivers/hwmon/lm95245.c<br/>index dce9e68241e6..5e5fc1b0ace1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/lm95245.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/lm95245.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/lm95245.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/lm95245.c</a></div><div class='hunk'>@@ -254,7 +254,7 @@ static ssize_t set_limit(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int index = to_sensor_dev_attr(attr)-&gt;index;</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	val /= 1000;</div><div class='hunk'>@@ -279,7 +279,7 @@ static ssize_t set_crit_hyst(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lm95245_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	val /= 1000;</div><div class='hunk'>@@ -316,7 +316,7 @@ static ssize_t set_type(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lm95245_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (val != 1 &amp;&amp; val != 2)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -363,7 +363,7 @@ static ssize_t set_interval(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct lm95245_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='head'>diff --git a/drivers/hwmon/ltc4261.c b/drivers/hwmon/ltc4261.c<br/>index 4b50601027d3..ce5235560f01 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/ltc4261.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/ltc4261.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/ltc4261.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/ltc4261.c</a></div><div class='hunk'>@@ -85,6 +85,7 @@ static struct ltc4261_data *ltc4261_update_device(struct device *dev)</div><div class='ctx'> 					"Failed to read ADC value: error %d\n",</div><div class='ctx'> 					val);</div><div class='ctx'> 				ret = ERR_PTR(val);</div><div class='add'>+				data-&gt;valid = 0;</div><div class='ctx'> 				goto abort;</div><div class='ctx'> 			}</div><div class='ctx'> 			data-&gt;regs[i] = val;</div><div class='head'>diff --git a/drivers/hwmon/max1111.c b/drivers/hwmon/max1111.c<br/>index c97b78ef9116..482ca901db30 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/max1111.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/max1111.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/max1111.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/max1111.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  * Copyright (C) 2004-2005 Richard Purdie</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2008 Marvell International Ltd.</div><div class='del'>- * 	Eric Miao &lt;eric.miao@marvell.com&gt;</div><div class='add'>+ *	Eric Miao &lt;eric.miao@marvell.com&gt;</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 version 2 as</div><div class='hunk'>@@ -106,11 +106,14 @@ static ssize_t show_adc(struct device *dev,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%d\n", ret);</div><div class='add'>+	/* assume the reference voltage to be 2.048V, with an 8-bit sample,</div><div class='add'>+	 * the LSB weight is 8mV</div><div class='add'>+	 */</div><div class='add'>+	return sprintf(buf, "%d\n", ret * 8);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define MAX1111_ADC_ATTR(_id)		\</div><div class='del'>-	SENSOR_DEVICE_ATTR(adc##_id##_in, S_IRUGO, show_adc, NULL, _id)</div><div class='add'>+	SENSOR_DEVICE_ATTR(in##_id##_input, S_IRUGO, show_adc, NULL, _id)</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);</div><div class='ctx'> static MAX1111_ADC_ATTR(0);</div><div class='hunk'>@@ -120,10 +123,10 @@ static MAX1111_ADC_ATTR(3);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *max1111_attributes[] = {</div><div class='ctx'> 	&amp;dev_attr_name.attr,</div><div class='del'>-	&amp;sensor_dev_attr_adc0_in.dev_attr.attr,</div><div class='del'>-	&amp;sensor_dev_attr_adc1_in.dev_attr.attr,</div><div class='del'>-	&amp;sensor_dev_attr_adc2_in.dev_attr.attr,</div><div class='del'>-	&amp;sensor_dev_attr_adc3_in.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in0_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in1_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in2_input.dev_attr.attr,</div><div class='add'>+	&amp;sensor_dev_attr_in3_input.dev_attr.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/max16065.c b/drivers/hwmon/max16065.c<br/>index 385886a4f224..f8e323ac6cb3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/max16065.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/max16065.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/max16065.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/max16065.c</a></div><div class='hunk'>@@ -230,7 +230,7 @@ static ssize_t max16065_set_limit(struct device *dev,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int limit;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='ctx'> 	if (unlikely(err &lt; 0))</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/max1668.c b/drivers/hwmon/max1668.c<br/>index 20d1b2ddffb6..88953f99e914 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/max1668.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/max1668.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/max1668.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/max1668.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@ static unsigned short max1668_addr_list[] = {</div><div class='ctx'> #define DEV_ID_MAX1989		0xb</div><div class='ctx'> </div><div class='ctx'> /* read only mode module parameter */</div><div class='del'>-static int read_only;</div><div class='add'>+static bool read_only;</div><div class='ctx'> module_param(read_only, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(read_only, "Don't set any values, read only mode");</div><div class='ctx'> </div><div class='hunk'>@@ -335,10 +335,10 @@ static struct attribute *max1668_attribute_unique[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static mode_t max1668_attribute_mode(struct kobject *kobj,</div><div class='add'>+static umode_t max1668_attribute_mode(struct kobject *kobj,</div><div class='ctx'> 				     struct attribute *attr, int index)</div><div class='ctx'> {</div><div class='del'>-	int ret = S_IRUGO;</div><div class='add'>+	umode_t ret = S_IRUGO;</div><div class='ctx'> 	if (read_only)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	if (attr == &amp;sensor_dev_attr_temp1_max.dev_attr.attr ||</div><div class='head'>diff --git a/drivers/hwmon/max6639.c b/drivers/hwmon/max6639.c<br/>index f20d9978ee78..e10a092c603c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/max6639.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/max6639.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/max6639.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/max6639.c</a></div><div class='hunk'>@@ -208,7 +208,7 @@ static ssize_t set_temp_max(struct device *dev,</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	res = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	res = kstrtoul(buf, 10, &amp;val);</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='hunk'>@@ -241,7 +241,7 @@ static ssize_t set_temp_crit(struct device *dev,</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	res = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	res = kstrtoul(buf, 10, &amp;val);</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='hunk'>@@ -275,7 +275,7 @@ static ssize_t set_temp_emergency(struct device *dev,</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	res = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	res = kstrtoul(buf, 10, &amp;val);</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='hunk'>@@ -308,7 +308,7 @@ static ssize_t set_pwm(struct device *dev,</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	res = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	res = kstrtoul(buf, 10, &amp;val);</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/max6642.c b/drivers/hwmon/max6642.c<br/>index e855d3b0bd1f..209e8a526eb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/max6642.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/max6642.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/max6642.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/max6642.c</a></div><div class='hunk'>@@ -234,7 +234,7 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct max6642_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	struct sensor_device_attribute_2 *attr2 = to_sensor_dev_attr_2(attr);</div><div class='ctx'> </div><div class='del'>-	err = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</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/drivers/hwmon/max6650.c b/drivers/hwmon/max6650.c<br/>index ece3aafa54b3..2fc034aeca09 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/max6650.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/max6650.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/max6650.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/max6650.c</a></div><div class='hunk'>@@ -464,7 +464,7 @@ static SENSOR_DEVICE_ATTR(gpio1_alarm, S_IRUGO, get_alarm, NULL,</div><div class='ctx'> static SENSOR_DEVICE_ATTR(gpio2_alarm, S_IRUGO, get_alarm, NULL,</div><div class='ctx'> 			  MAX6650_ALRM_GPIO2);</div><div class='ctx'> </div><div class='del'>-static mode_t max6650_attrs_visible(struct kobject *kobj, struct attribute *a,</div><div class='add'>+static umode_t max6650_attrs_visible(struct kobject *kobj, struct attribute *a,</div><div class='ctx'> 				    int n)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = container_of(kobj, struct device, kobj);</div><div class='head'>diff --git a/drivers/hwmon/pc87427.c b/drivers/hwmon/pc87427.c<br/>index 8da2181630b1..cb35461d52d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/pc87427.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/pc87427.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/pc87427.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/pc87427.c</a></div><div class='hunk'>@@ -418,7 +418,7 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	int iobase = data-&gt;address[LD_FAN];</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;lock);</div><div class='hunk'>@@ -572,7 +572,7 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute</div><div class='ctx'> 	int nr = to_sensor_dev_attr(devattr)-&gt;index;</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0 || val &gt; 2)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0 || val &gt; 2)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	/* Can't go to automatic mode if it isn't configured */</div><div class='ctx'> 	if (val == 2 &amp;&amp; !(data-&gt;pwm_auto_ok &amp; (1 &lt;&lt; nr)))</div><div class='hunk'>@@ -604,7 +604,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute</div><div class='ctx'> 	int iobase = data-&gt;address[LD_FAN];</div><div class='ctx'> 	u8 mode;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0 || val &gt; 0xff)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0 || val &gt; 0xff)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;lock);</div><div class='head'>diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig<br/>index 4b26f51920ba..cfec923f42b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/pmbus/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/pmbus/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/pmbus/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/pmbus/Kconfig</a></div><div class='hunk'>@@ -19,8 +19,8 @@ config SENSORS_PMBUS</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes here you get hardware monitoring support for generic</div><div class='del'>-	  PMBus devices, including but not limited to ADP4000, BMR450, BMR451,</div><div class='del'>-	  BMR453, BMR454, NCP4200, and NCP4208.</div><div class='add'>+	  PMBus devices, including but not limited to ADP4000, BMR453, BMR454,</div><div class='add'>+	  NCP4200, and NCP4208.</div><div class='ctx'> </div><div class='ctx'> 	  This driver can also be built as a module. If so, the module will</div><div class='ctx'> 	  be called pmbus.</div><div class='hunk'>@@ -113,8 +113,9 @@ config SENSORS_ZL6100</div><div class='ctx'> 	default n</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes here you get hardware monitoring support for Intersil</div><div class='del'>-	  ZL2004, ZL2006, ZL2008, ZL2105, ZL2106, ZL6100, and ZL6105 Digital</div><div class='del'>-	  DC/DC Controllers.</div><div class='add'>+	  ZL2004, ZL2005, ZL2006, ZL2008, ZL2105, ZL2106, ZL6100, and ZL6105</div><div class='add'>+	  Digital DC/DC Controllers, as well as for Ericsson BMR450, BMR451,</div><div class='add'>+	  BMR462, BMR463, and BMR464.</div><div class='ctx'> </div><div class='ctx'> 	  This driver can also be built as a module. If so, the module will</div><div class='ctx'> 	  be called zl6100.</div><div class='head'>diff --git a/drivers/hwmon/pmbus/adm1275.c b/drivers/hwmon/pmbus/adm1275.c<br/>index 980a4d9d5028..81c7c2ead6f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/pmbus/adm1275.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/pmbus/adm1275.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/pmbus/adm1275.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/pmbus/adm1275.c</a></div><div class='hunk'>@@ -170,35 +170,71 @@ static int adm1275_read_byte_data(struct i2c_client *client, int page, int reg)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct i2c_device_id adm1275_id[] = {</div><div class='add'>+	{ "adm1275", adm1275 },</div><div class='add'>+	{ "adm1276", adm1276 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, adm1275_id);</div><div class='add'>+</div><div class='ctx'> static int adm1275_probe(struct i2c_client *client,</div><div class='ctx'> 			 const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='add'>+	u8 block_buffer[I2C_SMBUS_BLOCK_MAX + 1];</div><div class='ctx'> 	int config, device_config;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct pmbus_driver_info *info;</div><div class='ctx'> 	struct adm1275_data *data;</div><div class='add'>+	const struct i2c_device_id *mid;</div><div class='ctx'> </div><div class='ctx'> 	if (!i2c_check_functionality(client-&gt;adapter,</div><div class='del'>-				     I2C_FUNC_SMBUS_READ_BYTE_DATA))</div><div class='add'>+				     I2C_FUNC_SMBUS_READ_BYTE_DATA</div><div class='add'>+				     | I2C_FUNC_SMBUS_BLOCK_DATA))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	data = kzalloc(sizeof(struct adm1275_data), GFP_KERNEL);</div><div class='del'>-	if (!data)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	ret = i2c_smbus_read_block_data(client, PMBUS_MFR_ID, block_buffer);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Failed to read Manufacturer ID\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	if (ret != 3 || strncmp(block_buffer, "ADI", 3)) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Unsupported Manufacturer ID\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	config = i2c_smbus_read_byte_data(client, ADM1275_PMON_CONFIG);</div><div class='del'>-	if (config &lt; 0) {</div><div class='del'>-		ret = config;</div><div class='del'>-		goto err_mem;</div><div class='add'>+	ret = i2c_smbus_read_block_data(client, PMBUS_MFR_MODEL, block_buffer);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Failed to read Manufacturer Model\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	for (mid = adm1275_id; mid-&gt;name[0]; mid++) {</div><div class='add'>+		if (!strncasecmp(mid-&gt;name, block_buffer, strlen(mid-&gt;name)))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (!mid-&gt;name[0]) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Unsupported device\n");</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (id-&gt;driver_data != mid-&gt;driver_data)</div><div class='add'>+		dev_notice(&amp;client-&gt;dev,</div><div class='add'>+			   "Device mismatch: Configured %s, detected %s\n",</div><div class='add'>+			   id-&gt;name, mid-&gt;name);</div><div class='add'>+</div><div class='add'>+	config = i2c_smbus_read_byte_data(client, ADM1275_PMON_CONFIG);</div><div class='add'>+	if (config &lt; 0)</div><div class='add'>+		return config;</div><div class='add'>+</div><div class='ctx'> 	device_config = i2c_smbus_read_byte_data(client, ADM1275_DEVICE_CONFIG);</div><div class='del'>-	if (device_config &lt; 0) {</div><div class='del'>-		ret = device_config;</div><div class='del'>-		goto err_mem;</div><div class='del'>-	}</div><div class='add'>+	if (device_config &lt; 0)</div><div class='add'>+		return device_config;</div><div class='add'>+</div><div class='add'>+	data = kzalloc(sizeof(struct adm1275_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;id = mid-&gt;driver_data;</div><div class='ctx'> </div><div class='del'>-	data-&gt;id = id-&gt;driver_data;</div><div class='ctx'> 	info = &amp;data-&gt;info;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;pages = 1;</div><div class='hunk'>@@ -233,7 +269,7 @@ static int adm1275_probe(struct i2c_client *client,</div><div class='ctx'> 	if (device_config &amp; ADM1275_IOUT_WARN2_SELECT)</div><div class='ctx'> 		data-&gt;have_oc_fault = true;</div><div class='ctx'> </div><div class='del'>-	switch (id-&gt;driver_data) {</div><div class='add'>+	switch (data-&gt;id) {</div><div class='ctx'> 	case adm1275:</div><div class='ctx'> 		if (config &amp; ADM1275_VIN_VOUT_SELECT)</div><div class='ctx'> 			info-&gt;func[0] |=</div><div class='hunk'>@@ -281,13 +317,6 @@ static int adm1275_remove(struct i2c_client *client)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct i2c_device_id adm1275_id[] = {</div><div class='del'>-	{ "adm1275", adm1275 },</div><div class='del'>-	{ "adm1276", adm1276 },</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(i2c, adm1275_id);</div><div class='del'>-</div><div class='ctx'> static struct i2c_driver adm1275_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		   .name = "adm1275",</div><div class='head'>diff --git a/drivers/hwmon/pmbus/pmbus.c b/drivers/hwmon/pmbus/pmbus.c<br/>index 995e873197e3..18a385e753d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/pmbus/pmbus.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/pmbus/pmbus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/pmbus/pmbus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/pmbus/pmbus.c</a></div><div class='hunk'>@@ -200,8 +200,6 @@ static int pmbus_remove(struct i2c_client *client)</div><div class='ctx'>  */</div><div class='ctx'> static const struct i2c_device_id pmbus_id[] = {</div><div class='ctx'> 	{"adp4000", 1},</div><div class='del'>-	{"bmr450", 1},</div><div class='del'>-	{"bmr451", 1},</div><div class='ctx'> 	{"bmr453", 1},</div><div class='ctx'> 	{"bmr454", 1},</div><div class='ctx'> 	{"ncp4200", 1},</div><div class='head'>diff --git a/drivers/hwmon/pmbus/zl6100.c b/drivers/hwmon/pmbus/zl6100.c<br/>index 2bc980006f83..48c7b4a716ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/pmbus/zl6100.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/pmbus/zl6100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/pmbus/zl6100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/pmbus/zl6100.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include "pmbus.h"</div><div class='ctx'> </div><div class='del'>-enum chips { zl2004, zl2006, zl2008, zl2105, zl2106, zl6100, zl6105 };</div><div class='add'>+enum chips { zl2004, zl2005, zl2006, zl2008, zl2105, zl2106, zl6100, zl6105 };</div><div class='ctx'> </div><div class='ctx'> struct zl6100_data {</div><div class='ctx'> 	int id;</div><div class='hunk'>@@ -38,8 +38,11 @@ struct zl6100_data {</div><div class='ctx'> </div><div class='ctx'> #define to_zl6100_data(x)  container_of(x, struct zl6100_data, info)</div><div class='ctx'> </div><div class='add'>+#define ZL6100_MFR_CONFIG		0xd0</div><div class='ctx'> #define ZL6100_DEVICE_ID		0xe4</div><div class='ctx'> </div><div class='add'>+#define ZL6100_MFR_XTEMP_ENABLE		(1 &lt;&lt; 7)</div><div class='add'>+</div><div class='ctx'> #define ZL6100_WAIT_TIME		1000	/* uS	*/</div><div class='ctx'> </div><div class='ctx'> static ushort delay = ZL6100_WAIT_TIME;</div><div class='hunk'>@@ -65,6 +68,19 @@ static int zl6100_read_word_data(struct i2c_client *client, int page, int reg)</div><div class='ctx'> 	if (page || reg &gt;= PMBUS_VIRT_BASE)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='add'>+	if (data-&gt;id == zl2005) {</div><div class='add'>+		/*</div><div class='add'>+		 * Limit register detection is not reliable on ZL2005.</div><div class='add'>+		 * Make sure registers are not erroneously detected.</div><div class='add'>+		 */</div><div class='add'>+		switch (reg) {</div><div class='add'>+		case PMBUS_VOUT_OV_WARN_LIMIT:</div><div class='add'>+		case PMBUS_VOUT_UV_WARN_LIMIT:</div><div class='add'>+		case PMBUS_IOUT_OC_WARN_LIMIT:</div><div class='add'>+			return -ENXIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	zl6100_wait(data);</div><div class='ctx'> 	ret = pmbus_read_word_data(client, page, reg);</div><div class='ctx'> 	data-&gt;access = ktime_get();</div><div class='hunk'>@@ -122,7 +138,13 @@ static int zl6100_write_byte(struct i2c_client *client, int page, u8 value)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct i2c_device_id zl6100_id[] = {</div><div class='add'>+	{"bmr450", zl2005},</div><div class='add'>+	{"bmr451", zl2005},</div><div class='add'>+	{"bmr462", zl2008},</div><div class='add'>+	{"bmr463", zl2008},</div><div class='add'>+	{"bmr464", zl2008},</div><div class='ctx'> 	{"zl2004", zl2004},</div><div class='add'>+	{"zl2005", zl2005},</div><div class='ctx'> 	{"zl2006", zl2006},</div><div class='ctx'> 	{"zl2008", zl2008},</div><div class='ctx'> 	{"zl2105", zl2105},</div><div class='hunk'>@@ -143,7 +165,7 @@ static int zl6100_probe(struct i2c_client *client,</div><div class='ctx'> 	const struct i2c_device_id *mid;</div><div class='ctx'> </div><div class='ctx'> 	if (!i2c_check_functionality(client-&gt;adapter,</div><div class='del'>-				     I2C_FUNC_SMBUS_READ_BYTE_DATA</div><div class='add'>+				     I2C_FUNC_SMBUS_READ_WORD_DATA</div><div class='ctx'> 				     | I2C_FUNC_SMBUS_READ_BLOCK_DATA))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='hunk'>@@ -177,8 +199,9 @@ static int zl6100_probe(struct i2c_client *client,</div><div class='ctx'> 	data-&gt;id = mid-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * ZL2008, ZL2105, and ZL6100 are known to require a wait time</div><div class='add'>+	 * ZL2005, ZL2008, ZL2105, and ZL6100 are known to require a wait time</div><div class='ctx'> 	 * between I2C accesses. ZL2004 and ZL6105 are known to be safe.</div><div class='add'>+	 * Other chips have not yet been tested.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Only clear the wait time for chips known to be safe. The wait time</div><div class='ctx'> 	 * can be cleared later for additional chips if tests show that it</div><div class='hunk'>@@ -190,12 +213,9 @@ static int zl6100_probe(struct i2c_client *client,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since there was a direct I2C device access above, wait before</div><div class='ctx'> 	 * accessing the chip again.</div><div class='del'>-	 * Set the timestamp, wait, then set it again. This should provide</div><div class='del'>-	 * enough buffer time to be safe.</div><div class='ctx'> 	 */</div><div class='ctx'> 	data-&gt;access = ktime_get();</div><div class='ctx'> 	zl6100_wait(data);</div><div class='del'>-	data-&gt;access = ktime_get();</div><div class='ctx'> </div><div class='ctx'> 	info = &amp;data-&gt;info;</div><div class='ctx'> </div><div class='hunk'>@@ -203,7 +223,16 @@ static int zl6100_probe(struct i2c_client *client,</div><div class='ctx'> 	info-&gt;func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_STATUS_INPUT</div><div class='ctx'> 	  | PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT</div><div class='ctx'> 	  | PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT</div><div class='del'>-	  | PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2 | PMBUS_HAVE_STATUS_TEMP;</div><div class='add'>+	  | PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP;</div><div class='add'>+</div><div class='add'>+	ret = i2c_smbus_read_word_data(client, ZL6100_MFR_CONFIG);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_mem;</div><div class='add'>+	if (ret &amp; ZL6100_MFR_XTEMP_ENABLE)</div><div class='add'>+		info-&gt;func[0] |= PMBUS_HAVE_TEMP2;</div><div class='add'>+</div><div class='add'>+	data-&gt;access = ktime_get();</div><div class='add'>+	zl6100_wait(data);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;read_word_data = zl6100_read_word_data;</div><div class='ctx'> 	info-&gt;read_byte_data = zl6100_read_byte_data;</div><div class='head'>diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c<br/>index fe4104c6b764..6ddeae049058 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/sht15.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/sht15.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/sht15.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/sht15.c</a></div><div class='hunk'>@@ -683,7 +683,7 @@ static ssize_t sht15_store_heater(struct device *dev,</div><div class='ctx'> 	long value;</div><div class='ctx'> 	u8 status;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;value))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;value))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;read_lock);</div><div class='head'>diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c<br/>index 643aa8c94535..c08eee21d76e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/tmp102.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/tmp102.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/tmp102.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/tmp102.c</a></div><div class='hunk'>@@ -112,7 +112,7 @@ static ssize_t tmp102_set_temp(struct device *dev,</div><div class='ctx'> 	long val;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	val = SENSORS_LIMIT(val, -256000, 255000);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/tmp401.c b/drivers/hwmon/tmp401.c<br/>index ad8d535235c5..8b9a77486d57 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/tmp401.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/tmp401.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/tmp401.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/tmp401.c</a></div><div class='hunk'>@@ -334,7 +334,7 @@ static ssize_t store_temp_min(struct device *dev, struct device_attribute</div><div class='ctx'> 	long val;</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	reg = tmp401_temp_to_register(val, data-&gt;config);</div><div class='hunk'>@@ -361,7 +361,7 @@ static ssize_t store_temp_max(struct device *dev, struct device_attribute</div><div class='ctx'> 	long val;</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	reg = tmp401_temp_to_register(val, data-&gt;config);</div><div class='hunk'>@@ -388,7 +388,7 @@ static ssize_t store_temp_crit(struct device *dev, struct device_attribute</div><div class='ctx'> 	long val;</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	reg = tmp401_crit_temp_to_register(val, data-&gt;config);</div><div class='hunk'>@@ -413,7 +413,7 @@ static ssize_t store_temp_crit_hyst(struct device *dev, struct device_attribute</div><div class='ctx'> 	long val;</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;config &amp; TMP401_CONFIG_RANGE)</div><div class='hunk'>@@ -447,7 +447,7 @@ static ssize_t reset_temp_history(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtol(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (val != 1) {</div><div class='head'>diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c<br/>index 0517a8f09d35..c48381f2cd02 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/tmp421.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/tmp421.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/tmp421.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/tmp421.c</a></div><div class='hunk'>@@ -157,7 +157,7 @@ static ssize_t show_fault(struct device *dev,</div><div class='ctx'> 		return sprintf(buf, "0\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static mode_t tmp421_is_visible(struct kobject *kobj, struct attribute *a,</div><div class='add'>+static umode_t tmp421_is_visible(struct kobject *kobj, struct attribute *a,</div><div class='ctx'> 				int n)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = container_of(kobj, struct device, kobj);</div><div class='head'>diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c<br/>index 93f5fc7d6059..0e0af0445222 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/w83627ehf.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/w83627ehf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/w83627ehf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/w83627ehf.c</a></div><div class='hunk'>@@ -937,7 +937,7 @@ store_in_##reg(struct device *dev, struct device_attribute *attr, \</div><div class='ctx'> 	int nr = sensor_attr-&gt;index; \</div><div class='ctx'> 	unsigned long val; \</div><div class='ctx'> 	int err; \</div><div class='del'>-	err = strict_strtoul(buf, 10, &amp;val); \</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val); \</div><div class='ctx'> 	if (err &lt; 0) \</div><div class='ctx'> 		return err; \</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock); \</div><div class='hunk'>@@ -1054,7 +1054,7 @@ store_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	unsigned int reg;</div><div class='ctx'> 	u8 new_div;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1199,7 +1199,7 @@ store_##reg(struct device *dev, struct device_attribute *attr, \</div><div class='ctx'> 	int nr = sensor_attr-&gt;index; \</div><div class='ctx'> 	int err; \</div><div class='ctx'> 	long val; \</div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val); \</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val); \</div><div class='ctx'> 	if (err &lt; 0) \</div><div class='ctx'> 		return err; \</div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock); \</div><div class='hunk'>@@ -1324,7 +1324,7 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1351,7 +1351,7 @@ store_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1376,7 +1376,7 @@ store_pwm_enable(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1430,7 +1430,7 @@ store_target_temp(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	long val;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1455,7 +1455,7 @@ store_tolerance(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	long val;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtol(buf, 10, &amp;val);</div><div class='add'>+	err = kstrtol(buf, 10, &amp;val);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1556,7 +1556,7 @@ store_##reg(struct device *dev, struct device_attribute *attr, \</div><div class='ctx'> 	int nr = sensor_attr-&gt;index; \</div><div class='ctx'> 	unsigned long val; \</div><div class='ctx'> 	int err; \</div><div class='del'>-	err = strict_strtoul(buf, 10, &amp;val); \</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val); \</div><div class='ctx'> 	if (err &lt; 0) \</div><div class='ctx'> 		return err; \</div><div class='ctx'> 	val = SENSORS_LIMIT(val, 1, 255); \</div><div class='hunk'>@@ -1595,7 +1595,7 @@ store_##reg(struct device *dev, struct device_attribute *attr, \</div><div class='ctx'> 	int nr = sensor_attr-&gt;index; \</div><div class='ctx'> 	unsigned long val; \</div><div class='ctx'> 	int err; \</div><div class='del'>-	err = strict_strtoul(buf, 10, &amp;val); \</div><div class='add'>+	err = kstrtoul(buf, 10, &amp;val); \</div><div class='ctx'> 	if (err &lt; 0) \</div><div class='ctx'> 		return err; \</div><div class='ctx'> 	val = step_time_to_reg(val, data-&gt;pwm_mode[nr]); \</div><div class='hunk'>@@ -1702,7 +1702,7 @@ clear_caseopen(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	u16 reg, mask;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) || val != 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) || val != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mask = to_sensor_dev_attr_2(attr)-&gt;nr;</div><div class='head'>diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c<br/>index bde50e34d013..374118f2b9f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/w83627hf.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/w83627hf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/w83627hf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/w83627hf.c</a></div><div class='hunk'>@@ -71,7 +71,7 @@ module_param(force_i2c, byte, 0);</div><div class='ctx'> MODULE_PARM_DESC(force_i2c,</div><div class='ctx'> 		 "Initialize the i2c address of the sensors");</div><div class='ctx'> </div><div class='del'>-static int init = 1;</div><div class='add'>+static bool init = 1;</div><div class='ctx'> module_param(init, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(init, "Set to zero to bypass chip initialization");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c<br/>index 65b685e2c7b7..17a8fa2d9ae9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/w83781d.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/w83781d.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/w83781d.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/w83781d.c</a></div><div class='hunk'>@@ -67,11 +67,11 @@ module_param_array(force_subclients, short, NULL, 0);</div><div class='ctx'> MODULE_PARM_DESC(force_subclients, "List of subclient addresses: "</div><div class='ctx'> 		    "{bus, clientaddr, subclientaddr1, subclientaddr2}");</div><div class='ctx'> </div><div class='del'>-static int reset;</div><div class='add'>+static bool reset;</div><div class='ctx'> module_param(reset, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(reset, "Set to one to reset chip on load");</div><div class='ctx'> </div><div class='del'>-static int init = 1;</div><div class='add'>+static bool init = 1;</div><div class='ctx'> module_param(init, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(init, "Set to zero to bypass chip initialization");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c<br/>index 8c2844e5691c..35aa5149307a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/w83791d.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/w83791d.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/w83791d.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/w83791d.c</a></div><div class='hunk'>@@ -58,11 +58,11 @@ module_param_array(force_subclients, short, NULL, 0);</div><div class='ctx'> MODULE_PARM_DESC(force_subclients, "List of subclient addresses: "</div><div class='ctx'> 			"{bus, clientaddr, subclientaddr1, subclientaddr2}");</div><div class='ctx'> </div><div class='del'>-static int reset;</div><div class='add'>+static bool reset;</div><div class='ctx'> module_param(reset, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(reset, "Set to one to force a hardware chip reset");</div><div class='ctx'> </div><div class='del'>-static int init;</div><div class='add'>+static bool init;</div><div class='ctx'> module_param(init, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(init, "Set to one to force extra software initialization");</div><div class='ctx'> </div><div class='hunk'>@@ -711,7 +711,7 @@ static ssize_t store_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -756,7 +756,7 @@ static ssize_t store_pwmenable(struct device *dev,</div><div class='ctx'> 	u8 val_shift = 0;</div><div class='ctx'> 	u8 keep_mask = 0;</div><div class='ctx'> </div><div class='del'>-	int ret = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	int ret = kstrtoul(buf, 10, &amp;val);</div><div class='ctx'> </div><div class='ctx'> 	if (ret || val &lt; 1 || val &gt; 3)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -819,7 +819,7 @@ static ssize_t store_temp_target(struct device *dev,</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	u8 target_mask;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -863,7 +863,7 @@ static ssize_t store_temp_tolerance(struct device *dev,</div><div class='ctx'> 	u8 val_shift = 0;</div><div class='ctx'> 	u8 keep_mask = 0;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (nr) {</div><div class='head'>diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c<br/>index f3e7130c4cda..d3100eab6b2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/w83792d.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/w83792d.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/w83792d.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/w83792d.c</a></div><div class='hunk'>@@ -56,7 +56,7 @@ module_param_array(force_subclients, short, NULL, 0);</div><div class='ctx'> MODULE_PARM_DESC(force_subclients, "List of subclient addresses: "</div><div class='ctx'> 			"{bus, clientaddr, subclientaddr1, subclientaddr2}");</div><div class='ctx'> </div><div class='del'>-static int init;</div><div class='add'>+static bool init;</div><div class='ctx'> module_param(init, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(init, "Set to one to force chip initialization");</div><div class='ctx'> </div><div class='hunk'>@@ -749,7 +749,7 @@ store_chassis_clear(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) || val != 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) || val != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='head'>diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c<br/>index 854f9117f1aa..45ec7e7c3c27 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/w83793.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/w83793.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/w83793.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/w83793.c</a></div><div class='hunk'>@@ -61,7 +61,7 @@ module_param_array(force_subclients, short, NULL, 0);</div><div class='ctx'> MODULE_PARM_DESC(force_subclients, "List of subclient addresses: "</div><div class='ctx'> 		       "{bus, clientaddr, subclientaddr1, subclientaddr2}");</div><div class='ctx'> </div><div class='del'>-static int reset;</div><div class='add'>+static bool reset;</div><div class='ctx'> module_param(reset, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(reset, "Set to 1 to reset chip, not recommended");</div><div class='ctx'> </div><div class='hunk'>@@ -450,7 +450,7 @@ store_chassis_clear(struct device *dev,</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) || val != 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) || val != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='head'>diff --git a/drivers/hwmon/w83795.c b/drivers/hwmon/w83795.c<br/>index 845232d7f611..aa58b25565bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/w83795.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/w83795.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/w83795.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/w83795.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@ static const unsigned short normal_i2c[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int reset;</div><div class='add'>+static bool reset;</div><div class='ctx'> module_param(reset, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(reset, "Set to 1 to reset chip, not recommended");</div><div class='ctx'> </div><div class='hunk'>@@ -730,7 +730,7 @@ store_beep(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	u8 beep_bit = 1 &lt;&lt; shift;</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (val != 0 &amp;&amp; val != 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -755,7 +755,7 @@ store_chassis_clear(struct device *dev,</div><div class='ctx'> 	struct w83795_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0 || val != 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0 || val != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -801,7 +801,7 @@ store_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct w83795_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val))</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	val = fan_to_reg(val);</div><div class='ctx'> </div><div class='hunk'>@@ -863,7 +863,7 @@ store_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int index = sensor_attr-&gt;index;</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -924,7 +924,7 @@ store_pwm_enable(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (val &lt; 1 || val &gt; 2)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1021,7 +1021,7 @@ store_temp_src(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	unsigned long channel;</div><div class='ctx'> 	u8 val = index / 2;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;channel) &lt; 0 ||</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;channel) &lt; 0 ||</div><div class='ctx'> 	    channel &lt; 1 || channel &gt; 14)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -1088,7 +1088,7 @@ store_temp_pwm_enable(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int index = sensor_attr-&gt;index;</div><div class='ctx'> 	unsigned long tmp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;tmp) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;tmp) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (nr) {</div><div class='hunk'>@@ -1149,7 +1149,7 @@ store_fanin(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int index = sensor_attr-&gt;index;</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -1198,7 +1198,7 @@ store_temp_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	u8 tmp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	val /= 1000;</div><div class='ctx'> </div><div class='hunk'>@@ -1257,7 +1257,7 @@ store_sf4_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int index = sensor_attr-&gt;index;</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -1293,7 +1293,7 @@ store_sf4_temp(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	int index = sensor_attr-&gt;index;</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	val /= 1000;</div><div class='ctx'> </div><div class='hunk'>@@ -1333,7 +1333,7 @@ store_temp(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct w83795_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long tmp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;tmp) &lt; 0)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;tmp) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -1394,7 +1394,7 @@ store_dts_ext(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct w83795_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	long tmp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;tmp) &lt; 0)</div><div class='add'>+	if (kstrtol(buf, 10, &amp;tmp) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='hunk'>@@ -1436,7 +1436,7 @@ store_temp_mode(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	u8 tmp;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if ((val != 4) &amp;&amp; (val != 3))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1512,7 +1512,7 @@ store_in(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	u8 tmp;</div><div class='ctx'> 	u8 lsb_idx;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	val = in_to_reg(index, val);</div><div class='ctx'> </div><div class='hunk'>@@ -1569,7 +1569,7 @@ store_sf_setup(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct w83795_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) &lt; 0)</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;val) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (nr) {</div><div class='head'>diff --git a/drivers/hwmon/w83l786ng.c b/drivers/hwmon/w83l786ng.c<br/>index 0254e181893d..063bd9508d8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/w83l786ng.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/hwmon/w83l786ng.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/w83l786ng.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/hwmon/w83l786ng.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@ static const unsigned short normal_i2c[] = { 0x2e, 0x2f, I2C_CLIENT_END };</div><div class='ctx'> </div><div class='ctx'> /* Insmod parameters */</div><div class='ctx'> </div><div class='del'>-static int reset;</div><div class='add'>+static bool reset;</div><div class='ctx'> module_param(reset, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(reset, "Set to 1 to reset chip, not recommended");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig<br/>index a3afac4be734..3101dd59e379 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/Kconfig</a></div><div class='hunk'>@@ -299,11 +299,11 @@ config I2C_AT91</div><div class='ctx'> 	  unless your system can cope with those limitations.</div><div class='ctx'> </div><div class='ctx'> config I2C_AU1550</div><div class='del'>-	tristate "Au1550/Au1200 SMBus interface"</div><div class='add'>+	tristate "Au1550/Au1200/Au1300 SMBus interface"</div><div class='ctx'> 	depends on MIPS_ALCHEMY</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes to this option, support will be included for the</div><div class='del'>-	  Au1550 and Au1200 SMBus interface.</div><div class='add'>+	  Au1550/Au1200/Au1300 SMBus interface.</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-au1550.</div><div class='hunk'>@@ -682,19 +682,19 @@ config I2C_XILINX</div><div class='ctx'> 	  will be called xilinx_i2c.</div><div class='ctx'> </div><div class='ctx'> config I2C_EG20T</div><div class='del'>-	tristate "Intel EG20T PCH / OKI SEMICONDUCTOR IOH(ML7213/ML7223)"</div><div class='add'>+	tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) I2C"</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver is for PCH(Platform controller Hub) I2C of EG20T which</div><div class='ctx'> 	  is an IOH(Input/Output Hub) for x86 embedded processor.</div><div class='ctx'> 	  This driver can access PCH I2C bus device.</div><div class='ctx'> </div><div class='del'>-	  This driver also can be used for OKI SEMICONDUCTOR IOH(Input/</div><div class='del'>-	  Output Hub), ML7213 and ML7223.</div><div class='del'>-	  ML7213 IOH is for IVI(In-Vehicle Infotainment) use and ML7223 IOH is</div><div class='del'>-	  for MP(Media Phone) use.</div><div class='del'>-	  ML7213/ML7223 is companion chip for Intel Atom E6xx series.</div><div class='del'>-	  ML7213/ML7223 is completely compatible for Intel EG20T PCH.</div><div class='add'>+	  This driver also can be used for LAPIS Semiconductor IOH(Input/</div><div class='add'>+	  Output Hub), ML7213, ML7223 and ML7831.</div><div class='add'>+	  ML7213 IOH is for IVI(In-Vehicle Infotainment) use, ML7223 IOH is</div><div class='add'>+	  for MP(Media Phone) use and ML7831 IOH is for general purpose use.</div><div class='add'>+	  ML7213/ML7223/ML7831 is companion chip for Intel Atom E6xx series.</div><div class='add'>+	  ML7213/ML7223/ML7831 is completely compatible for Intel EG20T PCH.</div><div class='ctx'> </div><div class='ctx'> comment "External I2C/SMBus adapter drivers"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c<br/>index b6807db7b36f..e66d248fc126 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-ali1535.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-ali1535.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-ali1535.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-ali1535.c</a></div><div class='hunk'>@@ -132,7 +132,8 @@</div><div class='ctx'> #define	ALI1535_SMBIO_EN	0x04	/* SMB I/O Space enable		*/</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver ali1535_driver;</div><div class='del'>-static unsigned short ali1535_smba;</div><div class='add'>+static unsigned long ali1535_smba;</div><div class='add'>+static unsigned short ali1535_offset;</div><div class='ctx'> </div><div class='ctx'> /* Detect whether a ALI1535 can be found, and initialize it, where necessary.</div><div class='ctx'>    Note the differences between kernels with the old PCI BIOS interface and</div><div class='hunk'>@@ -140,7 +141,7 @@ static unsigned short ali1535_smba;</div><div class='ctx'>    defined to make the transition easier. */</div><div class='ctx'> static int __devinit ali1535_setup(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	int retval = -ENODEV;</div><div class='add'>+	int retval;</div><div class='ctx'> 	unsigned char temp;</div><div class='ctx'> </div><div class='ctx'> 	/* Check the following things:</div><div class='hunk'>@@ -149,15 +150,28 @@ static int __devinit ali1535_setup(struct pci_dev *dev)</div><div class='ctx'> 		- We can use the addresses</div><div class='ctx'> 	*/</div><div class='ctx'> </div><div class='add'>+	retval = pci_enable_device(dev);</div><div class='add'>+	if (retval) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "ALI1535_smb can't enable device\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Determine the address of the SMBus area */</div><div class='del'>-	pci_read_config_word(dev, SMBBA, &amp;ali1535_smba);</div><div class='del'>-	ali1535_smba &amp;= (0xffff &amp; ~(ALI1535_SMB_IOSIZE - 1));</div><div class='del'>-	if (ali1535_smba == 0) {</div><div class='add'>+	pci_read_config_word(dev, SMBBA, &amp;ali1535_offset);</div><div class='add'>+	dev_dbg(&amp;dev-&gt;dev, "ALI1535_smb is at offset 0x%04x\n", ali1535_offset);</div><div class='add'>+	ali1535_offset &amp;= (0xffff &amp; ~(ALI1535_SMB_IOSIZE - 1));</div><div class='add'>+	if (ali1535_offset == 0) {</div><div class='ctx'> 		dev_warn(&amp;dev-&gt;dev,</div><div class='ctx'> 			"ALI1535_smb region uninitialized - upgrade BIOS?\n");</div><div class='add'>+		retval = -ENODEV;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (pci_resource_flags(dev, 0) &amp; IORESOURCE_IO)</div><div class='add'>+		ali1535_smba = pci_resource_start(dev, 0) + ali1535_offset;</div><div class='add'>+	else</div><div class='add'>+		ali1535_smba = ali1535_offset;</div><div class='add'>+</div><div class='ctx'> 	retval = acpi_check_region(ali1535_smba, ALI1535_SMB_IOSIZE,</div><div class='ctx'> 				   ali1535_driver.name);</div><div class='ctx'> 	if (retval)</div><div class='hunk'>@@ -165,8 +179,9 @@ static int __devinit ali1535_setup(struct pci_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (!request_region(ali1535_smba, ALI1535_SMB_IOSIZE,</div><div class='ctx'> 			    ali1535_driver.name)) {</div><div class='del'>-		dev_err(&amp;dev-&gt;dev, "ALI1535_smb region 0x%x already in use!\n",</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "ALI1535_smb region 0x%lx already in use!\n",</div><div class='ctx'> 			ali1535_smba);</div><div class='add'>+		retval = -EBUSY;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -174,6 +189,7 @@ static int __devinit ali1535_setup(struct pci_dev *dev)</div><div class='ctx'> 	pci_read_config_byte(dev, SMBCFG, &amp;temp);</div><div class='ctx'> 	if ((temp &amp; ALI1535_SMBIO_EN) == 0) {</div><div class='ctx'> 		dev_err(&amp;dev-&gt;dev, "SMB device not enabled - upgrade BIOS?\n");</div><div class='add'>+		retval = -ENODEV;</div><div class='ctx'> 		goto exit_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -181,6 +197,7 @@ static int __devinit ali1535_setup(struct pci_dev *dev)</div><div class='ctx'> 	pci_read_config_byte(dev, SMBHSTCFG, &amp;temp);</div><div class='ctx'> 	if ((temp &amp; 1) == 0) {</div><div class='ctx'> 		dev_err(&amp;dev-&gt;dev, "SMBus controller not enabled - upgrade BIOS?\n");</div><div class='add'>+		retval = -ENODEV;</div><div class='ctx'> 		goto exit_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -196,14 +213,13 @@ static int __devinit ali1535_setup(struct pci_dev *dev)</div><div class='ctx'> 	*/</div><div class='ctx'> 	pci_read_config_byte(dev, SMBREV, &amp;temp);</div><div class='ctx'> 	dev_dbg(&amp;dev-&gt;dev, "SMBREV = 0x%X\n", temp);</div><div class='del'>-	dev_dbg(&amp;dev-&gt;dev, "ALI1535_smba = 0x%X\n", ali1535_smba);</div><div class='add'>+	dev_dbg(&amp;dev-&gt;dev, "ALI1535_smba = 0x%lx\n", ali1535_smba);</div><div class='ctx'> </div><div class='del'>-	retval = 0;</div><div class='del'>-exit:</div><div class='del'>-	return retval;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> exit_free:</div><div class='ctx'> 	release_region(ali1535_smba, ALI1535_SMB_IOSIZE);</div><div class='add'>+exit:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -498,7 +514,7 @@ static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_</div><div class='ctx'> 	ali1535_adapter.dev.parent = &amp;dev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	snprintf(ali1535_adapter.name, sizeof(ali1535_adapter.name),</div><div class='del'>-		"SMBus ALI1535 adapter at %04x", ali1535_smba);</div><div class='add'>+		"SMBus ALI1535 adapter at %04x", ali1535_offset);</div><div class='ctx'> 	return i2c_add_adapter(&amp;ali1535_adapter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c<br/>index a409cfcf0629..47ae0091e027 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-ali1563.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-ali1563.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-ali1563.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-ali1563.c</a></div><div class='hunk'>@@ -417,7 +417,7 @@ static void __devexit ali1563_remove(struct pci_dev * dev)</div><div class='ctx'> 	ali1563_shutdown(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct pci_device_id ali1563_id_table[] __devinitconst = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(ali1563_id_table) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1563) },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c<br/>index 83e8a60cdc86..087ea9caa74d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-ali15x3.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-ali15x3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-ali15x3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-ali15x3.c</a></div><div class='hunk'>@@ -477,7 +477,7 @@ static struct i2c_adapter ali15x3_adapter = {</div><div class='ctx'> 	.algo		= &amp;smbus_algorithm,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct pci_device_id ali15x3_ids[] = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(ali15x3_ids) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101) },</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c<br/>index 03bcd07c4697..eb778bf15c18 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-amd756.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-amd756.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-amd756.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-amd756.c</a></div><div class='hunk'>@@ -308,7 +308,7 @@ static const char* chipname[] = {</div><div class='ctx'> 	"nVidia nForce", "AMD8111",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct pci_device_id amd756_ids[] = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(amd756_ids) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_740B),</div><div class='ctx'> 	  .driver_data = AMD756 },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7413),</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c<br/>index 6b6a6b1d7025..e5ac53b99b04 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-amd8111.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-amd8111.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-amd8111.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-amd8111.c</a></div><div class='hunk'>@@ -415,7 +415,7 @@ static const struct i2c_algorithm smbus_algorithm = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static const struct pci_device_id amd8111_ids[] = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(amd8111_ids) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_SMBUS2) },</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c<br/>index 305c07504f7e..1679deef9c89 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-at91.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-at91.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-at91.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-at91.c</a></div><div class='hunk'>@@ -295,9 +295,6 @@ static int at91_i2c_resume(struct platform_device *pdev)</div><div class='ctx'> #define at91_i2c_resume		NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* work with "modprobe at91_i2c" from hotplugging or coldplugging */</div><div class='del'>-MODULE_ALIAS("platform:at91_i2c");</div><div class='del'>-</div><div class='ctx'> static struct platform_driver at91_i2c_driver = {</div><div class='ctx'> 	.probe		= at91_i2c_probe,</div><div class='ctx'> 	.remove		= __devexit_p(at91_i2c_remove),</div><div class='hunk'>@@ -309,19 +306,9 @@ static struct platform_driver at91_i2c_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init at91_i2c_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;at91_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit at91_i2c_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;at91_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(at91_i2c_init);</div><div class='del'>-module_exit(at91_i2c_exit);</div><div class='add'>+module_platform_driver(at91_i2c_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Rick Bronson");</div><div class='ctx'> MODULE_DESCRIPTION("I2C (TWI) driver for Atmel AT91");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("platform:at91_i2c");</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c<br/>index f314d7f433d3..582d616db346 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-au1550.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-au1550.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-au1550.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-au1550.c</a></div><div class='hunk'>@@ -426,20 +426,9 @@ static struct platform_driver au1xpsc_smbus_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(i2c_au1550_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init i2c_au1550_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;au1xpsc_smbus_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit i2c_au1550_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;au1xpsc_smbus_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(au1xpsc_smbus_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Dan Malek, Embedded Edge, LLC.");</div><div class='ctx'> MODULE_DESCRIPTION("SMBus adapter Alchemy pb1550");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS("platform:au1xpsc_smbus");</div><div class='del'>-</div><div class='del'>-module_init (i2c_au1550_init);</div><div class='del'>-module_exit (i2c_au1550_exit);</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c<br/>index b1d9cd28d8da..c1e1096ba069 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-cpm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-cpm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-cpm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-cpm.c</a></div><div class='hunk'>@@ -724,18 +724,7 @@ static struct platform_driver cpm_i2c_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init cpm_i2c_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;cpm_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cpm_i2c_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;cpm_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(cpm_i2c_init);</div><div class='del'>-module_exit(cpm_i2c_exit);</div><div class='add'>+module_platform_driver(cpm_i2c_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jochen Friedrich &lt;jochen@scram.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("I2C-Bus adapter routines for CPM boards");</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c<br/>index 9e89e7313d62..37f42113af31 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-designware-pcidrv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-designware-pcidrv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-designware-pcidrv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-designware-pcidrv.c</a></div><div class='hunk'>@@ -349,7 +349,7 @@ static void __devexit i2c_dw_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> /* work with hotplug and coldplug */</div><div class='ctx'> MODULE_ALIAS("i2c_designware-pci");</div><div class='ctx'> </div><div class='del'>-DEFINE_PCI_DEVICE_TABLE(i2_designware_pci_ids) = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(i2_designware_pci_ids) = {</div><div class='ctx'> 	/* Moorestown */</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, 0x0802), moorestown_0 },</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, 0x0803), moorestown_1 },</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c<br/>index 2d3657ab1258..5244c4724df7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-designware-platdrv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-designware-platdrv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-designware-platdrv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-designware-platdrv.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> #include &lt;linux/sched.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='add'>+#include &lt;linux/of_i2c.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='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -137,6 +138,7 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev)</div><div class='ctx'> 			sizeof(adap-&gt;name));</div><div class='ctx'> 	adap-&gt;algo = &amp;i2c_dw_algo;</div><div class='ctx'> 	adap-&gt;dev.parent = &amp;pdev-&gt;dev;</div><div class='add'>+	adap-&gt;dev.of_node = pdev-&gt;dev.of_node;</div><div class='ctx'> </div><div class='ctx'> 	adap-&gt;nr = pdev-&gt;id;</div><div class='ctx'> 	r = i2c_add_numbered_adapter(adap);</div><div class='hunk'>@@ -144,6 +146,7 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev)</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failure adding adapter\n");</div><div class='ctx'> 		goto err_free_irq;</div><div class='ctx'> 	}</div><div class='add'>+	of_i2c_register_devices(adap);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -187,6 +190,14 @@ static int __devexit dw_i2c_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_OF</div><div class='add'>+static const struct of_device_id dw_i2c_of_match[] = {</div><div class='add'>+	{ .compatible = "snps,designware-i2c", },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, dw_i2c_of_match);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* work with hotplug and coldplug */</div><div class='ctx'> MODULE_ALIAS("platform:i2c_designware");</div><div class='ctx'> </div><div class='hunk'>@@ -195,6 +206,7 @@ static struct platform_driver dw_i2c_driver = {</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "i2c_designware",</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='add'>+		.of_match_table = of_match_ptr(dw_i2c_of_match),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c<br/>index 76366716a854..7eb19a5222f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-diolan-u2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-diolan-u2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-diolan-u2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-diolan-u2c.c</a></div><div class='hunk'>@@ -515,20 +515,7 @@ static struct usb_driver diolan_u2c_driver = {</div><div class='ctx'> 	.id_table = diolan_u2c_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init diolan_u2c_init(void)</div><div class='del'>-{</div><div class='del'>-	/* register this driver with the USB subsystem */</div><div class='del'>-	return usb_register(&amp;diolan_u2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit diolan_u2c_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver with the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;diolan_u2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(diolan_u2c_init);</div><div class='del'>-module_exit(diolan_u2c_exit);</div><div class='add'>+module_usb_driver(diolan_u2c_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Guenter Roeck &lt;guenter.roeck@ericsson.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_NAME " driver");</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c<br/>index 18936ac9d51c..ca8877641040 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-eg20t.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-eg20t.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-eg20t.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-eg20t.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2010 OKI SEMICONDUCTOR CO., LTD.</div><div class='add'>+ * Copyright (C) 2011 LAPIS Semiconductor Co., Ltd.</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'>@@ -136,7 +136,8 @@</div><div class='ctx'> /*</div><div class='ctx'> Set the number of I2C instance max</div><div class='ctx'> Intel EG20T PCH :		1ch</div><div class='del'>-OKI SEMICONDUCTOR ML7213 IOH :	2ch</div><div class='add'>+LAPIS Semiconductor ML7213 IOH :	2ch</div><div class='add'>+LAPIS Semiconductor ML7831 IOH :	1ch</div><div class='ctx'> */</div><div class='ctx'> #define PCH_I2C_MAX_DEV			2</div><div class='ctx'> </div><div class='hunk'>@@ -180,15 +181,17 @@ static int pch_clk = 50000;	/* specifies I2C clock speed in KHz */</div><div class='ctx'> static wait_queue_head_t pch_event;</div><div class='ctx'> static DEFINE_MUTEX(pch_mutex);</div><div class='ctx'> </div><div class='del'>-/* Definition for ML7213 by OKI SEMICONDUCTOR */</div><div class='add'>+/* Definition for ML7213 by LAPIS Semiconductor */</div><div class='ctx'> #define PCI_VENDOR_ID_ROHM		0x10DB</div><div class='ctx'> #define PCI_DEVICE_ID_ML7213_I2C	0x802D</div><div class='ctx'> #define PCI_DEVICE_ID_ML7223_I2C	0x8010</div><div class='add'>+#define PCI_DEVICE_ID_ML7831_I2C	0x8817</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id __devinitdata pch_pcidev_id[] = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(pch_pcidev_id) = {</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_I2C),   1, },</div><div class='ctx'> 	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_I2C), 2, },</div><div class='ctx'> 	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_I2C), 1, },</div><div class='add'>+	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_I2C), 1, },</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -243,7 +246,7 @@ static void pch_i2c_init(struct i2c_algo_pch_data *adap)</div><div class='ctx'> 	if (pch_clk &gt; PCH_MAX_CLK)</div><div class='ctx'> 		pch_clk = 62500;</div><div class='ctx'> </div><div class='del'>-	pch_i2cbc = (pch_clk + (pch_i2c_speed * 4)) / pch_i2c_speed * 8;</div><div class='add'>+	pch_i2cbc = (pch_clk + (pch_i2c_speed * 4)) / (pch_i2c_speed * 8);</div><div class='ctx'> 	/* Set transfer speed in I2CBC */</div><div class='ctx'> 	iowrite32(pch_i2cbc, p + PCH_I2CBC);</div><div class='ctx'> </div><div class='hunk'>@@ -918,7 +921,9 @@ static int __devinit pch_i2c_probe(struct pci_dev *pdev,</div><div class='ctx'> 		pch_adap-&gt;dev.parent = &amp;pdev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 		pch_i2c_init(&amp;adap_info-&gt;pch_data[i]);</div><div class='del'>-		ret = i2c_add_adapter(pch_adap);</div><div class='add'>+</div><div class='add'>+		pch_adap-&gt;nr = i;</div><div class='add'>+		ret = i2c_add_numbered_adapter(pch_adap);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			pch_pci_err(pdev, "i2c_add_adapter[ch:%d] FAILED\n", i);</div><div class='ctx'> 			goto err_add_adapter;</div><div class='hunk'>@@ -1058,8 +1063,8 @@ static void __exit pch_pci_exit(void)</div><div class='ctx'> }</div><div class='ctx'> module_exit(pch_pci_exit);</div><div class='ctx'> </div><div class='del'>-MODULE_DESCRIPTION("Intel EG20T PCH/OKI SEMICONDUCTOR ML7213 IOH I2C Driver");</div><div class='add'>+MODULE_DESCRIPTION("Intel EG20T PCH/LAPIS Semico ML7213/ML7223/ML7831 IOH I2C");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Tomoya MORINAGA. &lt;tomoya-linux@dsn.okisemi.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Tomoya MORINAGA. &lt;tomoya-linux@dsn.lapis-semi.com&gt;");</div><div class='ctx'> module_param(pch_i2c_speed, int, (S_IRUSR | S_IWUSR));</div><div class='ctx'> module_param(pch_clk, int, (S_IRUSR | S_IWUSR));</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c<br/>index 63bb1cc2a042..19515df61021 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-highlander.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-highlander.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-highlander.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-highlander.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@ struct highlander_i2c_dev {</div><div class='ctx'> 	size_t			buf_len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int iic_force_poll, iic_force_normal;</div><div class='add'>+static bool iic_force_poll, iic_force_normal;</div><div class='ctx'> static int iic_timeout = 1000, iic_read_delay;</div><div class='ctx'> </div><div class='ctx'> static inline void highlander_i2c_irq_enable(struct highlander_i2c_dev *dev)</div><div class='hunk'>@@ -468,18 +468,7 @@ static struct platform_driver highlander_i2c_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(highlander_i2c_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init highlander_i2c_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;highlander_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit highlander_i2c_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;highlander_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(highlander_i2c_init);</div><div class='del'>-module_exit(highlander_i2c_exit);</div><div class='add'>+module_platform_driver(highlander_i2c_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Paul Mundt");</div><div class='ctx'> MODULE_DESCRIPTION("Renesas Highlander FPGA I2C/SMBus adapter");</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-hydra.c b/drivers/i2c/busses/i2c-hydra.c<br/>index 9ff1695d8458..c527de17db4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-hydra.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-hydra.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-hydra.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-hydra.c</a></div><div class='hunk'>@@ -105,7 +105,7 @@ static struct i2c_adapter hydra_adap = {</div><div class='ctx'> 	.algo_data	= &amp;hydra_bit_data,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct pci_device_id hydra_ids[] = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(hydra_ids) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_HYDRA) },</div><div class='ctx'> 	{ 0, }</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 ab26840d0c70..5d2e2816831f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-i801.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-i801.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-i801.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-i801.c</a></div><div class='hunk'>@@ -609,7 +609,7 @@ static const struct i2c_algorithm smbus_algorithm = {</div><div class='ctx'> 	.functionality	= i801_func,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct pci_device_id i801_ids[] = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(i801_ids) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_3) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_3) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_2) },</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c<br/>index 3c110fbc409b..806e225f3de7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-ibm_iic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-ibm_iic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-ibm_iic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-ibm_iic.c</a></div><div class='hunk'>@@ -51,11 +51,11 @@</div><div class='ctx'> MODULE_DESCRIPTION("IBM IIC driver v" DRIVER_VERSION);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static int iic_force_poll;</div><div class='add'>+static bool iic_force_poll;</div><div class='ctx'> module_param(iic_force_poll, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(iic_force_poll, "Force polling mode");</div><div class='ctx'> </div><div class='del'>-static int iic_force_fast;</div><div class='add'>+static bool iic_force_fast;</div><div class='ctx'> module_param(iic_force_fast, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(iic_force_fast, "Force fast mode (400 kHz)");</div><div class='ctx'> </div><div class='hunk'>@@ -815,15 +815,4 @@ static struct platform_driver ibm_iic_driver = {</div><div class='ctx'> 	.remove	= __devexit_p(iic_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init iic_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ibm_iic_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit iic_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ibm_iic_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(iic_init);</div><div class='del'>-module_exit(iic_exit);</div><div class='add'>+module_platform_driver(ibm_iic_driver);</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-intel-mid.c b/drivers/i2c/busses/i2c-intel-mid.c<br/>index e828ac85cfa7..365bad5b890b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-intel-mid.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-intel-mid.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-intel-mid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-intel-mid.c</a></div><div class='hunk'>@@ -1093,7 +1093,7 @@ static void __devexit intel_mid_i2c_remove(struct pci_dev *dev)</div><div class='ctx'> 	pci_release_region(dev, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id intel_mid_i2c_ids[] = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(intel_mid_i2c_ids) = {</div><div class='ctx'> 	/* Moorestown */</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, 0x0802), 0 },</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, 0x0803), 1 },</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c<br/>index f09c9319a2ba..93f147a96b62 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-iop3xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-iop3xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-iop3xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-iop3xx.c</a></div><div class='hunk'>@@ -523,21 +523,7 @@ static struct platform_driver iop3xx_i2c_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init </div><div class='del'>-i2c_iop3xx_init (void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;iop3xx_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit </div><div class='del'>-i2c_iop3xx_exit (void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;iop3xx_i2c_driver);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init (i2c_iop3xx_init);</div><div class='del'>-module_exit (i2c_iop3xx_exit);</div><div class='add'>+module_platform_driver(iop3xx_i2c_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("D-TACQ Solutions Ltd &lt;www.d-tacq.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("IOP3xx iic algorithm and driver");</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-isch.c b/drivers/i2c/busses/i2c-isch.c<br/>index 0682f8f277b0..6561d275b8cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-isch.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-isch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-isch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-isch.c</a></div><div class='hunk'>@@ -306,20 +306,9 @@ static struct platform_driver smbus_sch_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(smbus_sch_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init i2c_sch_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;smbus_sch_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit i2c_sch_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;smbus_sch_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(smbus_sch_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jacob Pan &lt;jacob.jun.pan@intel.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Intel SCH SMBus driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-module_init(i2c_sch_init);</div><div class='del'>-module_exit(i2c_sch_exit);</div><div class='ctx'> MODULE_ALIAS("platform:isch_smbus");</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-ixp2000.c b/drivers/i2c/busses/i2c-ixp2000.c<br/>index c01e9519f6c1..5d263f9014d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-ixp2000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-ixp2000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-ixp2000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-ixp2000.c</a></div><div class='hunk'>@@ -148,18 +148,7 @@ static struct platform_driver ixp2000_i2c_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ixp2000_i2c_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ixp2000_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ixp2000_i2c_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ixp2000_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ixp2000_i2c_init);</div><div class='del'>-module_exit(ixp2000_i2c_exit);</div><div class='add'>+module_platform_driver(ixp2000_i2c_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR ("Deepak Saxena &lt;dsaxena@plexity.net&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("IXP2000 GPIO-based I2C bus driver");</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c<br/>index 107397a606b4..a8ebb84e23f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-mpc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-mpc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-mpc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-mpc.c</a></div><div class='hunk'>@@ -715,18 +715,7 @@ static struct platform_driver mpc_i2c_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init fsl_i2c_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;mpc_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit fsl_i2c_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;mpc_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(fsl_i2c_init);</div><div class='del'>-module_exit(fsl_i2c_exit);</div><div class='add'>+module_platform_driver(mpc_i2c_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Adrian Cox &lt;adrian@humboldt.co.uk&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("I2C-Bus adapter for MPC107 bridge and "</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c<br/>index a9941c65f226..4f44a33017b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-mv64xxx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-mv64xxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-mv64xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-mv64xxx.c</a></div><div class='hunk'>@@ -611,20 +611,7 @@ static struct platform_driver mv64xxx_i2c_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init</div><div class='del'>-mv64xxx_i2c_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;mv64xxx_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-mv64xxx_i2c_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;mv64xxx_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(mv64xxx_i2c_init);</div><div class='del'>-module_exit(mv64xxx_i2c_exit);</div><div class='add'>+module_platform_driver(mv64xxx_i2c_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Mark A. Greer &lt;mgreer@mvista.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Marvell mv64xxx host bridge i2c ctlr driver");</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c<br/>index ff1e127dfea8..43a96a123920 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-nforce2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-nforce2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-nforce2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-nforce2.c</a></div><div class='hunk'>@@ -309,7 +309,7 @@ static struct i2c_algorithm smbus_algorithm = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static const struct pci_device_id nforce2_ids[] = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(nforce2_ids) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_SMBUS) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3_SMBUS) },</div><div class='hunk'>@@ -356,7 +356,7 @@ static int __devinit nforce2_probe_smb (struct pci_dev *dev, int bar,</div><div class='ctx'> 	error = acpi_check_region(smbus-&gt;base, smbus-&gt;size,</div><div class='ctx'> 				  nforce2_driver.name);</div><div class='ctx'> 	if (error)</div><div class='del'>-		return -1;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	if (!request_region(smbus-&gt;base, smbus-&gt;size, nforce2_driver.name)) {</div><div class='ctx'> 		dev_err(&amp;smbus-&gt;adapter.dev, "Error requesting region %02x .. %02X for %s\n",</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c<br/>index 1b46a9d9f907..18068dee48f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-ocores.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-ocores.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-ocores.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-ocores.c</a></div><div class='hunk'>@@ -394,9 +394,6 @@ static struct of_device_id ocores_i2c_match[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, ocores_i2c_match);</div><div class='ctx'> </div><div class='del'>-/* work with hotplug and coldplug */</div><div class='del'>-MODULE_ALIAS("platform:ocores-i2c");</div><div class='del'>-</div><div class='ctx'> static struct platform_driver ocores_i2c_driver = {</div><div class='ctx'> 	.probe   = ocores_i2c_probe,</div><div class='ctx'> 	.remove  = __devexit_p(ocores_i2c_remove),</div><div class='hunk'>@@ -409,19 +406,9 @@ static struct platform_driver ocores_i2c_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ocores_i2c_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ocores_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ocores_i2c_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ocores_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ocores_i2c_init);</div><div class='del'>-module_exit(ocores_i2c_exit);</div><div class='add'>+module_platform_driver(ocores_i2c_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Peter Korsgaard &lt;jacmet@sunsite.dk&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("OpenCores I2C bus driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("platform:ocores-i2c");</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c<br/>index 56dbe54e8811..ee139a598814 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-octeon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-octeon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-octeon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-octeon.c</a></div><div class='hunk'>@@ -629,24 +629,10 @@ static struct platform_driver octeon_i2c_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init octeon_i2c_init(void)</div><div class='del'>-{</div><div class='del'>-	int rv;</div><div class='del'>-</div><div class='del'>-	rv = platform_driver_register(&amp;octeon_i2c_driver);</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit octeon_i2c_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;octeon_i2c_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(octeon_i2c_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Michael Lawnick &lt;michael.lawnick.ext@nsn.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("I2C-Bus adapter for Cavium OCTEON processors");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> MODULE_ALIAS("platform:" DRV_NAME);</div><div class='del'>-</div><div class='del'>-module_init(octeon_i2c_init);</div><div class='del'>-module_exit(octeon_i2c_exit);</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c<br/>index fa23faa20f0e..f713eac55047 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-omap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-omap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-omap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-omap.c</a></div><div class='hunk'>@@ -37,6 +37,9 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_i2c.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-omap.h&gt;</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='hunk'>@@ -182,7 +185,9 @@ struct omap_i2c_dev {</div><div class='ctx'> 	u32			latency;	/* maximum mpu wkup latency */</div><div class='ctx'> 	void			(*set_mpu_wkup_lat)(struct device *dev,</div><div class='ctx'> 						    long latency);</div><div class='del'>-	u32			speed;		/* Speed of bus in Khz */</div><div class='add'>+	u32			speed;		/* Speed of bus in kHz */</div><div class='add'>+	u32			dtrev;		/* extra revision from DT */</div><div class='add'>+	u32			flags;</div><div class='ctx'> 	u16			cmd_err;</div><div class='ctx'> 	u8			*buf;</div><div class='ctx'> 	u8			*regs;</div><div class='hunk'>@@ -235,7 +240,7 @@ static const u8 reg_map_ip_v2[] = {</div><div class='ctx'> 	[OMAP_I2C_BUF_REG] = 0x94,</div><div class='ctx'> 	[OMAP_I2C_CNT_REG] = 0x98,</div><div class='ctx'> 	[OMAP_I2C_DATA_REG] = 0x9c,</div><div class='del'>-	[OMAP_I2C_SYSC_REG] = 0x20,</div><div class='add'>+	[OMAP_I2C_SYSC_REG] = 0x10,</div><div class='ctx'> 	[OMAP_I2C_CON_REG] = 0xa4,</div><div class='ctx'> 	[OMAP_I2C_OA_REG] = 0xa8,</div><div class='ctx'> 	[OMAP_I2C_SA_REG] = 0xac,</div><div class='hunk'>@@ -266,11 +271,7 @@ static inline u16 omap_i2c_read_reg(struct omap_i2c_dev *i2c_dev, int reg)</div><div class='ctx'> </div><div class='ctx'> static void omap_i2c_unidle(struct omap_i2c_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct omap_i2c_bus_platform_data *pdata;</div><div class='del'>-</div><div class='del'>-	pdata = dev-&gt;dev-&gt;platform_data;</div><div class='del'>-</div><div class='del'>-	if (pdata-&gt;flags &amp; OMAP_I2C_FLAG_RESET_REGS_POSTIDLE) {</div><div class='add'>+	if (dev-&gt;flags &amp; OMAP_I2C_FLAG_RESET_REGS_POSTIDLE) {</div><div class='ctx'> 		omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);</div><div class='ctx'> 		omap_i2c_write_reg(dev, OMAP_I2C_PSC_REG, dev-&gt;pscstate);</div><div class='ctx'> 		omap_i2c_write_reg(dev, OMAP_I2C_SCLL_REG, dev-&gt;scllstate);</div><div class='hunk'>@@ -291,13 +292,10 @@ static void omap_i2c_unidle(struct omap_i2c_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static void omap_i2c_idle(struct omap_i2c_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct omap_i2c_bus_platform_data *pdata;</div><div class='ctx'> 	u16 iv;</div><div class='ctx'> </div><div class='del'>-	pdata = dev-&gt;dev-&gt;platform_data;</div><div class='del'>-</div><div class='ctx'> 	dev-&gt;iestate = omap_i2c_read_reg(dev, OMAP_I2C_IE_REG);</div><div class='del'>-	if (pdata-&gt;rev == OMAP_I2C_IP_VERSION_2)</div><div class='add'>+	if (dev-&gt;dtrev == OMAP_I2C_IP_VERSION_2)</div><div class='ctx'> 		omap_i2c_write_reg(dev, OMAP_I2C_IP_V2_IRQENABLE_CLR, 1);</div><div class='ctx'> 	else</div><div class='ctx'> 		omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, 0);</div><div class='hunk'>@@ -320,9 +318,6 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)</div><div class='ctx'> 	unsigned long timeout;</div><div class='ctx'> 	unsigned long internal_clk = 0;</div><div class='ctx'> 	struct clk *fclk;</div><div class='del'>-	struct omap_i2c_bus_platform_data *pdata;</div><div class='del'>-</div><div class='del'>-	pdata = dev-&gt;dev-&gt;platform_data;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;rev &gt;= OMAP_I2C_OMAP1_REV_2) {</div><div class='ctx'> 		/* Disable I2C controller before soft reset */</div><div class='hunk'>@@ -373,7 +368,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;flags &amp; OMAP_I2C_FLAG_ALWAYS_ARMXOR_CLK) {</div><div class='add'>+	if (dev-&gt;flags &amp; OMAP_I2C_FLAG_ALWAYS_ARMXOR_CLK) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The I2C functional clock is the armxor_ck, so there's</div><div class='ctx'> 		 * no need to get "armxor_ck" separately.  Now, if OMAP2420</div><div class='hunk'>@@ -397,7 +392,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)</div><div class='ctx'> 			psc = fclk_rate / 12000000;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(pdata-&gt;flags &amp; OMAP_I2C_FLAG_SIMPLE_CLOCK)) {</div><div class='add'>+	if (!(dev-&gt;flags &amp; OMAP_I2C_FLAG_SIMPLE_CLOCK)) {</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * HSI2C controller internal clk rate should be 19.2 Mhz for</div><div class='hunk'>@@ -406,7 +401,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)</div><div class='ctx'> 		 * The filter is iclk (fclk for HS) period.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (dev-&gt;speed &gt; 400 ||</div><div class='del'>-			       pdata-&gt;flags &amp; OMAP_I2C_FLAG_FORCE_19200_INT_CLK)</div><div class='add'>+			       dev-&gt;flags &amp; OMAP_I2C_FLAG_FORCE_19200_INT_CLK)</div><div class='ctx'> 			internal_clk = 19200;</div><div class='ctx'> 		else if (dev-&gt;speed &gt; 100)</div><div class='ctx'> 			internal_clk = 9600;</div><div class='hunk'>@@ -475,7 +470,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;errata = 0;</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;flags &amp; OMAP_I2C_FLAG_APPLY_ERRATA_I207)</div><div class='add'>+	if (dev-&gt;flags &amp; OMAP_I2C_FLAG_APPLY_ERRATA_I207)</div><div class='ctx'> 		dev-&gt;errata |= I2C_OMAP_ERRATA_I207;</div><div class='ctx'> </div><div class='ctx'> 	/* Enable interrupts */</div><div class='hunk'>@@ -484,7 +479,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)</div><div class='ctx'> 			OMAP_I2C_IE_AL)  | ((dev-&gt;fifo_size) ?</div><div class='ctx'> 				(OMAP_I2C_IE_RDR | OMAP_I2C_IE_XDR) : 0);</div><div class='ctx'> 	omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, dev-&gt;iestate);</div><div class='del'>-	if (pdata-&gt;flags &amp; OMAP_I2C_FLAG_RESET_REGS_POSTIDLE) {</div><div class='add'>+	if (dev-&gt;flags &amp; OMAP_I2C_FLAG_RESET_REGS_POSTIDLE) {</div><div class='ctx'> 		dev-&gt;pscstate = psc;</div><div class='ctx'> 		dev-&gt;scllstate = scll;</div><div class='ctx'> 		dev-&gt;sclhstate = sclh;</div><div class='hunk'>@@ -804,9 +799,6 @@ omap_i2c_isr(int this_irq, void *dev_id)</div><div class='ctx'> 	u16 bits;</div><div class='ctx'> 	u16 stat, w;</div><div class='ctx'> 	int err, count = 0;</div><div class='del'>-	struct omap_i2c_bus_platform_data *pdata;</div><div class='del'>-</div><div class='del'>-	pdata = dev-&gt;dev-&gt;platform_data;</div><div class='ctx'> </div><div class='ctx'> 	if (pm_runtime_suspended(dev-&gt;dev))</div><div class='ctx'> 		return IRQ_NONE;</div><div class='hunk'>@@ -830,11 +822,9 @@ complete:</div><div class='ctx'> 				~(OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR |</div><div class='ctx'> 				OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR));</div><div class='ctx'> </div><div class='del'>-		if (stat &amp; OMAP_I2C_STAT_NACK) {</div><div class='add'>+		if (stat &amp; OMAP_I2C_STAT_NACK)</div><div class='ctx'> 			err |= OMAP_I2C_STAT_NACK;</div><div class='del'>-			omap_i2c_write_reg(dev, OMAP_I2C_CON_REG,</div><div class='del'>-					   OMAP_I2C_CON_STP);</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		if (stat &amp; OMAP_I2C_STAT_AL) {</div><div class='ctx'> 			dev_err(dev-&gt;dev, "Arbitration lost\n");</div><div class='ctx'> 			err |= OMAP_I2C_STAT_AL;</div><div class='hunk'>@@ -875,7 +865,7 @@ complete:</div><div class='ctx'> 					 * Data reg in 2430, omap3 and</div><div class='ctx'> 					 * omap4 is 8 bit wide</div><div class='ctx'> 					 */</div><div class='del'>-					if (pdata-&gt;flags &amp;</div><div class='add'>+					if (dev-&gt;flags &amp;</div><div class='ctx'> 						 OMAP_I2C_FLAG_16BIT_DATA_REG) {</div><div class='ctx'> 						if (dev-&gt;buf_len) {</div><div class='ctx'> 							*dev-&gt;buf++ = w &gt;&gt; 8;</div><div class='hunk'>@@ -918,7 +908,7 @@ complete:</div><div class='ctx'> 					 * Data reg in 2430, omap3 and</div><div class='ctx'> 					 * omap4 is 8 bit wide</div><div class='ctx'> 					 */</div><div class='del'>-					if (pdata-&gt;flags &amp;</div><div class='add'>+					if (dev-&gt;flags &amp;</div><div class='ctx'> 						 OMAP_I2C_FLAG_16BIT_DATA_REG) {</div><div class='ctx'> 						if (dev-&gt;buf_len) {</div><div class='ctx'> 							w |= *dev-&gt;buf++ &lt;&lt; 8;</div><div class='hunk'>@@ -965,6 +955,32 @@ static const struct i2c_algorithm omap_i2c_algo = {</div><div class='ctx'> 	.functionality	= omap_i2c_func,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+static struct omap_i2c_bus_platform_data omap3_pdata = {</div><div class='add'>+	.rev = OMAP_I2C_IP_VERSION_1,</div><div class='add'>+	.flags = OMAP_I2C_FLAG_APPLY_ERRATA_I207 |</div><div class='add'>+		 OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |</div><div class='add'>+		 OMAP_I2C_FLAG_BUS_SHIFT_2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_i2c_bus_platform_data omap4_pdata = {</div><div class='add'>+	.rev = OMAP_I2C_IP_VERSION_2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id omap_i2c_of_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "ti,omap4-i2c",</div><div class='add'>+		.data = &amp;omap4_pdata,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "ti,omap3-i2c",</div><div class='add'>+		.data = &amp;omap3_pdata,</div><div class='add'>+	},</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, omap_i2c_of_match);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int __devinit</div><div class='ctx'> omap_i2c_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -972,9 +988,10 @@ omap_i2c_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct i2c_adapter	*adap;</div><div class='ctx'> 	struct resource		*mem, *irq, *ioarea;</div><div class='ctx'> 	struct omap_i2c_bus_platform_data *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	struct device_node	*node = pdev-&gt;dev.of_node;</div><div class='add'>+	const struct of_device_id *match;</div><div class='ctx'> 	irq_handler_t isr;</div><div class='ctx'> 	int r;</div><div class='del'>-	u32 speed = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* NOTE: driver uses the static register mapping */</div><div class='ctx'> 	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='hunk'>@@ -1001,15 +1018,24 @@ omap_i2c_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err_release_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pdata != NULL) {</div><div class='del'>-		speed = pdata-&gt;clkrate;</div><div class='add'>+	match = of_match_device(omap_i2c_of_match, &amp;pdev-&gt;dev);</div><div class='add'>+	if (match) {</div><div class='add'>+		u32 freq = 100000; /* default to 100000 Hz */</div><div class='add'>+</div><div class='add'>+		pdata = match-&gt;data;</div><div class='add'>+		dev-&gt;dtrev = pdata-&gt;rev;</div><div class='add'>+		dev-&gt;flags = pdata-&gt;flags;</div><div class='add'>+</div><div class='add'>+		of_property_read_u32(node, "clock-frequency", &amp;freq);</div><div class='add'>+		/* convert DT freq value in Hz into kHz for speed */</div><div class='add'>+		dev-&gt;speed = freq / 1000;</div><div class='add'>+	} else if (pdata != NULL) {</div><div class='add'>+		dev-&gt;speed = pdata-&gt;clkrate;</div><div class='add'>+		dev-&gt;flags = pdata-&gt;flags;</div><div class='ctx'> 		dev-&gt;set_mpu_wkup_lat = pdata-&gt;set_mpu_wkup_lat;</div><div class='del'>-	} else {</div><div class='del'>-		speed = 100;	/* Default speed */</div><div class='del'>-		dev-&gt;set_mpu_wkup_lat = NULL;</div><div class='add'>+		dev-&gt;dtrev = pdata-&gt;rev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;speed = speed;</div><div class='ctx'> 	dev-&gt;dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	dev-&gt;irq = irq-&gt;start;</div><div class='ctx'> 	dev-&gt;base = ioremap(mem-&gt;start, resource_size(mem));</div><div class='hunk'>@@ -1020,9 +1046,9 @@ omap_i2c_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, dev);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;reg_shift = (pdata-&gt;flags &gt;&gt; OMAP_I2C_FLAG_BUS_SHIFT__SHIFT) &amp; 3;</div><div class='add'>+	dev-&gt;reg_shift = (dev-&gt;flags &gt;&gt; OMAP_I2C_FLAG_BUS_SHIFT__SHIFT) &amp; 3;</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;rev == OMAP_I2C_IP_VERSION_2)</div><div class='add'>+	if (dev-&gt;dtrev == OMAP_I2C_IP_VERSION_2)</div><div class='ctx'> 		dev-&gt;regs = (u8 *)reg_map_ip_v2;</div><div class='ctx'> 	else</div><div class='ctx'> 		dev-&gt;regs = (u8 *)reg_map_ip_v1;</div><div class='hunk'>@@ -1035,7 +1061,7 @@ omap_i2c_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (dev-&gt;rev &lt;= OMAP_I2C_REV_ON_3430)</div><div class='ctx'> 		dev-&gt;errata |= I2C_OMAP3_1P153;</div><div class='ctx'> </div><div class='del'>-	if (!(pdata-&gt;flags &amp; OMAP_I2C_FLAG_NO_FIFO)) {</div><div class='add'>+	if (!(dev-&gt;flags &amp; OMAP_I2C_FLAG_NO_FIFO)) {</div><div class='ctx'> 		u16 s;</div><div class='ctx'> </div><div class='ctx'> 		/* Set up the fifo size - Get total size */</div><div class='hunk'>@@ -1058,7 +1084,7 @@ omap_i2c_probe(struct platform_device *pdev)</div><div class='ctx'> 		/* calculate wakeup latency constraint for MPU */</div><div class='ctx'> 		if (dev-&gt;set_mpu_wkup_lat != NULL)</div><div class='ctx'> 			dev-&gt;latency = (1000000 * dev-&gt;fifo_size) /</div><div class='del'>-				       (1000 * speed / 8);</div><div class='add'>+				       (1000 * dev-&gt;speed / 8);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* reset ASAP, clearing any IRQs */</div><div class='hunk'>@@ -1074,7 +1100,7 @@ omap_i2c_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_info(dev-&gt;dev, "bus %d rev%d.%d.%d at %d kHz\n", pdev-&gt;id,</div><div class='del'>-		 pdata-&gt;rev, dev-&gt;rev &gt;&gt; 4, dev-&gt;rev &amp; 0xf, dev-&gt;speed);</div><div class='add'>+		 dev-&gt;dtrev, dev-&gt;rev &gt;&gt; 4, dev-&gt;rev &amp; 0xf, dev-&gt;speed);</div><div class='ctx'> </div><div class='ctx'> 	pm_runtime_put(dev-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1085,6 +1111,7 @@ omap_i2c_probe(struct platform_device *pdev)</div><div class='ctx'> 	strlcpy(adap-&gt;name, "OMAP I2C adapter", sizeof(adap-&gt;name));</div><div class='ctx'> 	adap-&gt;algo = &amp;omap_i2c_algo;</div><div class='ctx'> 	adap-&gt;dev.parent = &amp;pdev-&gt;dev;</div><div class='add'>+	adap-&gt;dev.of_node = pdev-&gt;dev.of_node;</div><div class='ctx'> </div><div class='ctx'> 	/* i2c device drivers may be active on return from add_adapter() */</div><div class='ctx'> 	adap-&gt;nr = pdev-&gt;id;</div><div class='hunk'>@@ -1094,6 +1121,8 @@ omap_i2c_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err_free_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	of_i2c_register_devices(adap);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_free_irq:</div><div class='hunk'>@@ -1166,6 +1195,7 @@ static struct platform_driver omap_i2c_driver = {</div><div class='ctx'> 		.name	= "omap_i2c",</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 		.pm	= OMAP_I2C_PM_OPS,</div><div class='add'>+		.of_match_table = of_match_ptr(omap_i2c_of_match),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/busses/i2c-pasemi.c b/drivers/i2c/busses/i2c-pasemi.c<br/>index 837b8c1aa02a..eaaea73209c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-pasemi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-pasemi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-pasemi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-pasemi.c</a></div><div class='hunk'>@@ -401,7 +401,7 @@ static void __devexit pasemi_smb_remove(struct pci_dev *dev)</div><div class='ctx'> 	kfree(smbus);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct pci_device_id pasemi_smb_ids[] = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(pasemi_smb_ids) = {</div><div class='ctx'> 	{ PCI_DEVICE(0x1959, 0xa003) },</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-pca-platform.c b/drivers/i2c/busses/i2c-pca-platform.c<br/>index ace67995d7de..2adbf1a8fdea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-pca-platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-pca-platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-pca-platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-pca-platform.c</a></div><div class='hunk'>@@ -286,20 +286,8 @@ static struct platform_driver i2c_pca_pf_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init i2c_pca_pf_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;i2c_pca_pf_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit i2c_pca_pf_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;i2c_pca_pf_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(i2c_pca_pf_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Wolfram Sang &lt;w.sang@pengutronix.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("I2C-PCA9564/PCA9665 platform driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-module_init(i2c_pca_pf_init);</div><div class='del'>-module_exit(i2c_pca_pf_exit);</div><div class='del'>-</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c<br/>index 6d14ac2e3c41..c14d48dd601a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-piix4.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-piix4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-piix4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-piix4.c</a></div><div class='hunk'>@@ -472,7 +472,7 @@ static struct i2c_adapter piix4_adapter = {</div><div class='ctx'> 	.algo		= &amp;smbus_algorithm,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct pci_device_id piix4_ids[] = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(piix4_ids) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443MX_3) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_3) },</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c<br/>index 127051b06921..07b7447ecbc9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-pmcmsp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-pmcmsp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-pmcmsp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-pmcmsp.c</a></div><div class='hunk'>@@ -627,9 +627,6 @@ static struct i2c_adapter pmcmsptwi_adapter = {</div><div class='ctx'> 	.name		= DRV_NAME,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* work with hotplug and coldplug */</div><div class='del'>-MODULE_ALIAS("platform:" DRV_NAME);</div><div class='del'>-</div><div class='ctx'> static struct platform_driver pmcmsptwi_driver = {</div><div class='ctx'> 	.probe  = pmcmsptwi_probe,</div><div class='ctx'> 	.remove	= __devexit_p(pmcmsptwi_remove),</div><div class='hunk'>@@ -639,18 +636,8 @@ static struct platform_driver pmcmsptwi_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pmcmsptwi_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pmcmsptwi_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit pmcmsptwi_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pmcmsptwi_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(pmcmsptwi_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("PMC MSP TWI/SMBus/I2C driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-module_init(pmcmsptwi_init);</div><div class='del'>-module_exit(pmcmsptwi_exit);</div><div class='add'>+MODULE_ALIAS("platform:" DRV_NAME);</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c<br/>index b289ec99eeba..7b397c6f607e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-powermac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-powermac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-powermac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-powermac.c</a></div><div class='hunk'>@@ -312,10 +312,6 @@ static int __devinit i2c_powermac_probe(struct platform_device *dev)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* work with hotplug and coldplug */</div><div class='del'>-MODULE_ALIAS("platform:i2c-powermac");</div><div class='del'>-</div><div class='ctx'> static struct platform_driver i2c_powermac_driver = {</div><div class='ctx'> 	.probe = i2c_powermac_probe,</div><div class='ctx'> 	.remove = __devexit_p(i2c_powermac_remove),</div><div class='hunk'>@@ -325,17 +321,6 @@ static struct platform_driver i2c_powermac_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init i2c_powermac_init(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_register(&amp;i2c_powermac_driver);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+module_platform_driver(i2c_powermac_driver);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static void __exit i2c_powermac_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;i2c_powermac_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(i2c_powermac_init);</div><div class='del'>-module_exit(i2c_powermac_cleanup);</div><div class='add'>+MODULE_ALIAS("platform:i2c-powermac");</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-puv3.c b/drivers/i2c/busses/i2c-puv3.c<br/>index fac673940849..93709fbe30eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-puv3.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-puv3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-puv3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-puv3.c</a></div><div class='hunk'>@@ -276,8 +276,6 @@ static int puv3_i2c_resume(struct platform_device *dev)</div><div class='ctx'> #define puv3_i2c_resume NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-MODULE_ALIAS("platform:puv3_i2c");</div><div class='del'>-</div><div class='ctx'> static struct platform_driver puv3_i2c_driver = {</div><div class='ctx'> 	.probe		= puv3_i2c_probe,</div><div class='ctx'> 	.remove		= __devexit_p(puv3_i2c_remove),</div><div class='hunk'>@@ -289,18 +287,8 @@ static struct platform_driver puv3_i2c_driver = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init puv3_i2c_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;puv3_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit puv3_i2c_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;puv3_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(puv3_i2c_init);</div><div class='del'>-module_exit(puv3_i2c_exit);</div><div class='add'>+module_platform_driver(puv3_i2c_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("PKUnity v3 I2C driver");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS("platform:puv3_i2c");</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-pxa-pci.c b/drivers/i2c/busses/i2c-pxa-pci.c<br/>index 632e088760a3..a05817980556 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-pxa-pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-pxa-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-pxa-pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-pxa-pci.c</a></div><div class='hunk'>@@ -150,7 +150,7 @@ static void __devexit ce4100_i2c_remove(struct pci_dev *dev)</div><div class='ctx'> 	kfree(sds);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id ce4100_i2c_devices[] __devinitdata = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(ce4100_i2c_devices) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2e68)},</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c<br/>index a67132b2e092..c0c9dffbdb12 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-sh7760.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-sh7760.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-sh7760.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-sh7760.c</a></div><div class='hunk'>@@ -560,18 +560,7 @@ static struct platform_driver sh7760_i2c_drv = {</div><div class='ctx'> 	.remove		= __devexit_p(sh7760_i2c_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sh7760_i2c_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sh7760_i2c_drv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sh7760_i2c_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sh7760_i2c_drv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sh7760_i2c_init);</div><div class='del'>-module_exit(sh7760_i2c_exit);</div><div class='add'>+module_platform_driver(sh7760_i2c_drv);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("SH7760 I2C bus driver");</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-simtec.c b/drivers/i2c/busses/i2c-simtec.c<br/>index 2fc08fbf67a2..4fc87e7c94c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-simtec.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-simtec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-simtec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-simtec.c</a></div><div class='hunk'>@@ -156,12 +156,8 @@ static int simtec_i2c_remove(struct platform_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* device driver */</div><div class='ctx'> </div><div class='del'>-/* work with hotplug and coldplug */</div><div class='del'>-MODULE_ALIAS("platform:simtec-i2c");</div><div class='del'>-</div><div class='ctx'> static struct platform_driver simtec_i2c_driver = {</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name		= "simtec-i2c",</div><div class='hunk'>@@ -171,19 +167,9 @@ static struct platform_driver simtec_i2c_driver = {</div><div class='ctx'> 	.remove		= simtec_i2c_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init i2c_adap_simtec_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;simtec_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit i2c_adap_simtec_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;simtec_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(i2c_adap_simtec_init);</div><div class='del'>-module_exit(i2c_adap_simtec_exit);</div><div class='add'>+module_platform_driver(simtec_i2c_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Simtec Generic I2C Bus driver");</div><div class='ctx'> MODULE_AUTHOR("Ben Dooks &lt;ben@simtec.co.uk&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("platform:simtec-i2c");</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c<br/>index 437586611d4a..87e5126d449c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-sis5595.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-sis5595.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-sis5595.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-sis5595.c</a></div><div class='hunk'>@@ -147,7 +147,7 @@ static int __devinit sis5595_setup(struct pci_dev *SIS5595_dev)</div><div class='ctx'> 	u16 a;</div><div class='ctx'> 	u8 val;</div><div class='ctx'> 	int *i;</div><div class='del'>-	int retval = -ENODEV;</div><div class='add'>+	int retval;</div><div class='ctx'> </div><div class='ctx'> 	/* Look for imposters */</div><div class='ctx'> 	for (i = blacklist; *i != 0; i++) {</div><div class='hunk'>@@ -223,7 +223,7 @@ static int __devinit sis5595_setup(struct pci_dev *SIS5595_dev)</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='ctx'> 	release_region(sis5595_base + SMB_INDEX, 2);</div><div class='del'>-	return retval;</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sis5595_transaction(struct i2c_adapter *adap)</div><div class='hunk'>@@ -369,7 +369,7 @@ static struct i2c_adapter sis5595_adapter = {</div><div class='ctx'> 	.algo		= &amp;smbus_algorithm,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct pci_device_id sis5595_ids[] __devinitconst = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(sis5595_ids) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, </div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c<br/>index e6f539e26f65..15cf78f65ce0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-sis630.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-sis630.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-sis630.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-sis630.c</a></div><div class='hunk'>@@ -93,8 +93,8 @@</div><div class='ctx'> static struct pci_driver sis630_driver;</div><div class='ctx'> </div><div class='ctx'> /* insmod parameters */</div><div class='del'>-static int high_clock;</div><div class='del'>-static int force;</div><div class='add'>+static bool high_clock;</div><div class='add'>+static bool force;</div><div class='ctx'> module_param(high_clock, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(high_clock, "Set Host Master Clock to 56KHz (default 14KHz).");</div><div class='ctx'> module_param(force, bool, 0);</div><div class='hunk'>@@ -393,7 +393,7 @@ static int __devinit sis630_setup(struct pci_dev *sis630_dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char b;</div><div class='ctx'> 	struct pci_dev *dummy = NULL;</div><div class='del'>-	int retval = -ENODEV, i;</div><div class='add'>+	int retval, i;</div><div class='ctx'> </div><div class='ctx'> 	/* check for supported SiS devices */</div><div class='ctx'> 	for (i=0; supported[i] &gt; 0 ; i++) {</div><div class='hunk'>@@ -418,18 +418,21 @@ static int __devinit sis630_setup(struct pci_dev *sis630_dev)</div><div class='ctx'> 	*/</div><div class='ctx'> 	if (pci_read_config_byte(sis630_dev, SIS630_BIOS_CTL_REG,&amp;b)) {</div><div class='ctx'> 		dev_err(&amp;sis630_dev-&gt;dev, "Error: Can't read bios ctl reg\n");</div><div class='add'>+		retval = -ENODEV;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* if ACPI already enabled , do nothing */</div><div class='ctx'> 	if (!(b &amp; 0x80) &amp;&amp;</div><div class='ctx'> 	    pci_write_config_byte(sis630_dev, SIS630_BIOS_CTL_REG, b | 0x80)) {</div><div class='ctx'> 		dev_err(&amp;sis630_dev-&gt;dev, "Error: Can't enable ACPI\n");</div><div class='add'>+		retval = -ENODEV;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Determine the ACPI base address */</div><div class='ctx'> 	if (pci_read_config_word(sis630_dev,SIS630_ACPI_BASE_REG,&amp;acpi_base)) {</div><div class='ctx'> 		dev_err(&amp;sis630_dev-&gt;dev, "Error: Can't determine ACPI base address\n");</div><div class='add'>+		retval = -ENODEV;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -445,6 +448,7 @@ static int __devinit sis630_setup(struct pci_dev *sis630_dev)</div><div class='ctx'> 			    sis630_driver.name)) {</div><div class='ctx'> 		dev_err(&amp;sis630_dev-&gt;dev, "SMBus registers 0x%04x-0x%04x already "</div><div class='ctx'> 			"in use!\n", acpi_base + SMB_STS, acpi_base + SMB_SAA);</div><div class='add'>+		retval = -EBUSY;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -468,7 +472,7 @@ static struct i2c_adapter sis630_adapter = {</div><div class='ctx'> 	.algo		= &amp;smbus_algorithm,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct pci_device_id sis630_ids[] __devinitconst = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(sis630_ids) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_LPC) },</div><div class='ctx'> 	{ 0, }</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c<br/>index 86837f0c4cb9..cc5d149413f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-sis96x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-sis96x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-sis96x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-sis96x.c</a></div><div class='hunk'>@@ -245,7 +245,7 @@ static struct i2c_adapter sis96x_adapter = {</div><div class='ctx'> 	.algo		= &amp;smbus_algorithm,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct pci_device_id sis96x_ids[] = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(sis96x_ids) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_SMBUS) },</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c<br/>index 46b6500c5478..6381604696d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-tegra.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-tegra.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-tegra.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-tegra.c</a></div><div class='hunk'>@@ -558,7 +558,7 @@ static const struct i2c_algorithm tegra_i2c_algo = {</div><div class='ctx'> 	.functionality	= tegra_i2c_func,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int tegra_i2c_probe(struct platform_device *pdev)</div><div class='add'>+static int __devinit tegra_i2c_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct tegra_i2c_dev *i2c_dev;</div><div class='ctx'> 	struct tegra_i2c_platform_data *pdata = pdev-&gt;dev.platform_data;</div><div class='hunk'>@@ -636,7 +636,10 @@ static int tegra_i2c_probe(struct platform_device *pdev)</div><div class='ctx'> 			i2c_dev-&gt;bus_clk_rate = be32_to_cpup(prop);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pdev-&gt;id == 3)</div><div class='add'>+	if (pdev-&gt;dev.of_node)</div><div class='add'>+		i2c_dev-&gt;is_dvc = of_device_is_compatible(pdev-&gt;dev.of_node,</div><div class='add'>+						"nvidia,tegra20-i2c-dvc");</div><div class='add'>+	else if (pdev-&gt;id == 3)</div><div class='ctx'> 		i2c_dev-&gt;is_dvc = 1;</div><div class='ctx'> 	init_completion(&amp;i2c_dev-&gt;msg_complete);</div><div class='ctx'> </div><div class='hunk'>@@ -690,7 +693,7 @@ err_iounmap:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tegra_i2c_remove(struct platform_device *pdev)</div><div class='add'>+static int __devexit tegra_i2c_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct tegra_i2c_dev *i2c_dev = platform_get_drvdata(pdev);</div><div class='ctx'> 	i2c_del_adapter(&amp;i2c_dev-&gt;adapter);</div><div class='hunk'>@@ -742,6 +745,7 @@ static int tegra_i2c_resume(struct platform_device *pdev)</div><div class='ctx'> /* Match table for of_platform binding */</div><div class='ctx'> static const struct of_device_id tegra_i2c_of_match[] __devinitconst = {</div><div class='ctx'> 	{ .compatible = "nvidia,tegra20-i2c", },</div><div class='add'>+	{ .compatible = "nvidia,tegra20-i2c-dvc", },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, tegra_i2c_of_match);</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-tiny-usb.c b/drivers/i2c/busses/i2c-tiny-usb.c<br/>index d03b04002f0d..f07307ff360d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-tiny-usb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-tiny-usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-tiny-usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-tiny-usb.c</a></div><div class='hunk'>@@ -262,20 +262,7 @@ static struct usb_driver i2c_tiny_usb_driver = {</div><div class='ctx'> 	.id_table	= i2c_tiny_usb_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init usb_i2c_tiny_usb_init(void)</div><div class='del'>-{</div><div class='del'>-	/* register this driver with the USB subsystem */</div><div class='del'>-	return usb_register(&amp;i2c_tiny_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit usb_i2c_tiny_usb_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver with the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;i2c_tiny_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(usb_i2c_tiny_usb_init);</div><div class='del'>-module_exit(usb_i2c_tiny_usb_exit);</div><div class='add'>+module_usb_driver(i2c_tiny_usb_driver);</div><div class='ctx'> </div><div class='ctx'> /* ----- end of usb layer ------------------------------------------------ */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/busses/i2c-via.c b/drivers/i2c/busses/i2c-via.c<br/>index 7799fe5bda88..713d31ade26b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-via.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-via.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-via.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-via.c</a></div><div class='hunk'>@@ -89,7 +89,7 @@ static struct i2c_adapter vt586b_adapter = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static const struct pci_device_id vt586b_ids[] __devinitconst = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(vt586b_ids) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3) },</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c<br/>index 0b012f1f8ac5..333011c83d52 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-viapro.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-viapro.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-viapro.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-viapro.c</a></div><div class='hunk'>@@ -91,7 +91,7 @@ static unsigned short SMBHSTCFG = 0xD2;</div><div class='ctx'> </div><div class='ctx'> /* If force is set to anything different from 0, we forcibly enable the</div><div class='ctx'>    VT596. DANGEROUS! */</div><div class='del'>-static int force;</div><div class='add'>+static bool force;</div><div class='ctx'> module_param(force, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(force, "Forcibly enable the SMBus. DANGEROUS!");</div><div class='ctx'> </div><div class='hunk'>@@ -324,7 +324,7 @@ static int __devinit vt596_probe(struct pci_dev *pdev,</div><div class='ctx'> 				 const struct pci_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char temp;</div><div class='del'>-	int error = -ENODEV;</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='ctx'> 	/* Determine the address of the SMBus areas */</div><div class='ctx'> 	if (force_addr) {</div><div class='hunk'>@@ -390,6 +390,7 @@ found:</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "SMBUS: Error: Host SMBus "</div><div class='ctx'> 				"controller not enabled! - upgrade BIOS or "</div><div class='ctx'> 				"use force=1\n");</div><div class='add'>+			error = -ENODEV;</div><div class='ctx'> 			goto release_region;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -422,9 +423,11 @@ found:</div><div class='ctx'> 		 "SMBus Via Pro adapter at %04x", vt596_smba);</div><div class='ctx'> </div><div class='ctx'> 	vt596_pdev = pci_dev_get(pdev);</div><div class='del'>-	if (i2c_add_adapter(&amp;vt596_adapter)) {</div><div class='add'>+	error = i2c_add_adapter(&amp;vt596_adapter);</div><div class='add'>+	if (error) {</div><div class='ctx'> 		pci_dev_put(vt596_pdev);</div><div class='ctx'> 		vt596_pdev = NULL;</div><div class='add'>+		goto release_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Always return failure here.  This is to allow other drivers to bind</div><div class='hunk'>@@ -438,7 +441,7 @@ release_region:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct pci_device_id vt596_ids[] = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(vt596_ids) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C596_3),</div><div class='ctx'> 	  .driver_data = SMBBA1 },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C596B_3),</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c<br/>index 4bb68f35caf2..2bded7647ef2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-xiic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/i2c-xiic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-xiic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/i2c-xiic.c</a></div><div class='hunk'>@@ -426,7 +426,7 @@ static void xiic_process(struct xiic_i2c *i2c)</div><div class='ctx'> 			xiic_wakeup(i2c, STATE_ERROR);</div><div class='ctx'> </div><div class='ctx'> 	} else if (pend &amp; (XIIC_INTR_TX_EMPTY_MASK | XIIC_INTR_TX_HALF_MASK)) {</div><div class='del'>-		/* Transmit register/FIFO is empty or ½ empty */</div><div class='add'>+		/* Transmit register/FIFO is empty or ½ empty */</div><div class='ctx'> </div><div class='ctx'> 		clr = pend &amp;</div><div class='ctx'> 			(XIIC_INTR_TX_EMPTY_MASK | XIIC_INTR_TX_HALF_MASK);</div><div class='hunk'>@@ -795,10 +795,6 @@ static int __devexit xiic_i2c_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='del'>-/* work with hotplug and coldplug */</div><div class='del'>-MODULE_ALIAS("platform:"DRIVER_NAME);</div><div class='del'>-</div><div class='ctx'> static struct platform_driver xiic_i2c_driver = {</div><div class='ctx'> 	.probe   = xiic_i2c_probe,</div><div class='ctx'> 	.remove  = __devexit_p(xiic_i2c_remove),</div><div class='hunk'>@@ -808,19 +804,9 @@ static struct platform_driver xiic_i2c_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init xiic_i2c_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;xiic_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit xiic_i2c_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;xiic_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(xiic_i2c_init);</div><div class='del'>-module_exit(xiic_i2c_exit);</div><div class='add'>+module_platform_driver(xiic_i2c_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("info@mocean-labs.com");</div><div class='ctx'> MODULE_DESCRIPTION("Xilinx I2C bus driver");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS("platform:"DRIVER_NAME);</div><div class='head'>diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c<br/>index 91e349c884c5..2eacb7784d56 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/scx200_acb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/busses/scx200_acb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/scx200_acb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/busses/scx200_acb.c</a></div><div class='hunk'>@@ -559,7 +559,7 @@ static struct platform_driver scx200_pci_driver = {</div><div class='ctx'> 	.remove = __devexit_p(scx200_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct pci_device_id scx200_isa[] __initconst = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(scx200_isa) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE) },</div><div class='ctx'> 	{ 0, }</div><div class='head'>diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c<br/>index 57a45ce84b2d..10e7f1e76586 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/i2c-dev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/i2c-dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/i2c-dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/i2c-dev.c</a></div><div class='hunk'>@@ -251,15 +251,10 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,</div><div class='ctx'> 	if (rdwr_arg.nmsgs &gt; I2C_RDRW_IOCTL_MAX_MSGS)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	rdwr_pa = kmalloc(rdwr_arg.nmsgs * sizeof(struct i2c_msg), GFP_KERNEL);</div><div class='del'>-	if (!rdwr_pa)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(rdwr_pa, rdwr_arg.msgs,</div><div class='del'>-			   rdwr_arg.nmsgs * sizeof(struct i2c_msg))) {</div><div class='del'>-		kfree(rdwr_pa);</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='add'>+	rdwr_pa = memdup_user(rdwr_arg.msgs,</div><div class='add'>+			      rdwr_arg.nmsgs * sizeof(struct i2c_msg));</div><div class='add'>+	if (IS_ERR(rdwr_pa))</div><div class='add'>+		return PTR_ERR(rdwr_pa);</div><div class='ctx'> </div><div class='ctx'> 	data_ptrs = kmalloc(rdwr_arg.nmsgs * sizeof(u8 __user *), GFP_KERNEL);</div><div class='ctx'> 	if (data_ptrs == NULL) {</div><div class='head'>diff --git a/drivers/i2c/muxes/gpio-i2cmux.c b/drivers/i2c/muxes/gpio-i2cmux.c<br/>index 7b6ce624cd6e..e5fa695eb0fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/muxes/gpio-i2cmux.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/i2c/muxes/gpio-i2cmux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/muxes/gpio-i2cmux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/i2c/muxes/gpio-i2cmux.c</a></div><div class='hunk'>@@ -165,18 +165,7 @@ static struct platform_driver gpiomux_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init gpiomux_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;gpiomux_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit gpiomux_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;gpiomux_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(gpiomux_init);</div><div class='del'>-module_exit(gpiomux_exit);</div><div class='add'>+module_platform_driver(gpiomux_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("GPIO-based I2C multiplexer driver");</div><div class='ctx'> MODULE_AUTHOR("Peter Korsgaard &lt;peter.korsgaard@barco.com&gt;");</div><div class='head'>diff --git a/drivers/ide/ali14xx.c b/drivers/ide/ali14xx.c<br/>index 25b9fe3a9f8e..d3be99fb4154 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ali14xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/ali14xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ali14xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ide/ali14xx.c</a></div><div class='hunk'>@@ -221,7 +221,7 @@ static int __init ali14xx_probe(void)</div><div class='ctx'> 	return ide_legacy_device_add(&amp;ali14xx_port_info, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int probe_ali14xx;</div><div class='add'>+static bool probe_ali14xx;</div><div class='ctx'> </div><div class='ctx'> module_param_named(probe, probe_ali14xx, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(probe, "probe for ALI M14xx chipsets");</div><div class='head'>diff --git a/drivers/ide/at91_ide.c b/drivers/ide/at91_ide.c<br/>index 6dede8f366c5..41d415529479 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/at91_ide.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/at91_ide.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/at91_ide.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ide/at91_ide.c</a></div><div class='hunk'>@@ -314,7 +314,7 @@ static int __init at91_ide_probe(struct platform_device *pdev)</div><div class='ctx'> 	apply_timings(board-&gt;chipselect, 0, ide_timing_find_mode(XFER_PIO_0), 0);</div><div class='ctx'> </div><div class='ctx'> 	/* with GPIO interrupt we have to do quirks in handler */</div><div class='del'>-	if (board-&gt;irq_pin &gt;= PIN_BASE)</div><div class='add'>+	if (gpio_is_valid(board-&gt;irq_pin))</div><div class='ctx'> 		host-&gt;irq_handler = at91_irq_handler;</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;ports[0]-&gt;select_data = board-&gt;chipselect;</div><div class='head'>diff --git a/drivers/ide/cmd640.c b/drivers/ide/cmd640.c<br/>index a81bd7575792..14717304b388 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/cmd640.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/cmd640.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/cmd640.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ide/cmd640.c</a></div><div class='hunk'>@@ -111,7 +111,7 @@</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME "cmd640"</div><div class='ctx'> </div><div class='del'>-static int cmd640_vlb;</div><div class='add'>+static bool cmd640_vlb;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * CMD640 specific registers definition.</div><div class='head'>diff --git a/drivers/ide/dtc2278.c b/drivers/ide/dtc2278.c<br/>index 6929f7fce93a..46af4743b3e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/dtc2278.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/dtc2278.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/dtc2278.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ide/dtc2278.c</a></div><div class='hunk'>@@ -130,7 +130,7 @@ static int __init dtc2278_probe(void)</div><div class='ctx'> 	return ide_legacy_device_add(&amp;dtc2278_port_info, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int probe_dtc2278;</div><div class='add'>+static bool probe_dtc2278;</div><div class='ctx'> </div><div class='ctx'> module_param_named(probe, probe_dtc2278, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(probe, "probe for DTC2278xx chipsets");</div><div class='head'>diff --git a/drivers/ide/gayle.c b/drivers/ide/gayle.c<br/>index 3feaa26410be..51beb85250d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/gayle.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/gayle.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/gayle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ide/gayle.c</a></div><div class='hunk'>@@ -50,7 +50,7 @@</div><div class='ctx'> 					       GAYLE_NUM_HWIFS-1)</div><div class='ctx'> #define GAYLE_HAS_CONTROL_REG	(!ide_doubler)</div><div class='ctx'> </div><div class='del'>-static int ide_doubler;</div><div class='add'>+static bool ide_doubler;</div><div class='ctx'> module_param_named(doubler, ide_doubler, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(doubler, "enable support for IDE doublers");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/ht6560b.c b/drivers/ide/ht6560b.c<br/>index 808bcdcbf8e1..986f2513eab4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ht6560b.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/ht6560b.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ht6560b.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ide/ht6560b.c</a></div><div class='hunk'>@@ -317,7 +317,7 @@ static void __init ht6560b_init_dev(ide_drive_t *drive)</div><div class='ctx'> 	ide_set_drivedata(drive, (void *)t);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int probe_ht6560b;</div><div class='add'>+static bool probe_ht6560b;</div><div class='ctx'> </div><div class='ctx'> module_param_named(probe, probe_ht6560b, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(probe, "probe for HT6560B chipset");</div><div class='head'>diff --git a/drivers/ide/ide-4drives.c b/drivers/ide/ide-4drives.c<br/>index 979d342c338a..547d7cf2e016 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-4drives.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/ide-4drives.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-4drives.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ide/ide-4drives.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME "ide-4drives"</div><div class='ctx'> </div><div class='del'>-static int probe_4drives;</div><div class='add'>+static bool probe_4drives;</div><div class='ctx'> </div><div class='ctx'> module_param_named(probe, probe_4drives, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(probe, "probe for generic IDE chipset with 4 drives/port");</div><div class='head'>diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c<br/>index f22edc66b030..f1a6796b165c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-acpi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/ide-acpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-acpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ide/ide-acpi.c</a></div><div class='hunk'>@@ -53,15 +53,15 @@ struct ide_acpi_hwif_link {</div><div class='ctx'> #define DEBPRINT(fmt, args...)	do {} while (0)</div><div class='ctx'> #endif	/* DEBUGGING */</div><div class='ctx'> </div><div class='del'>-static int ide_noacpi;</div><div class='add'>+static bool ide_noacpi;</div><div class='ctx'> module_param_named(noacpi, ide_noacpi, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(noacpi, "disable IDE ACPI support");</div><div class='ctx'> </div><div class='del'>-static int ide_acpigtf;</div><div class='add'>+static bool ide_acpigtf;</div><div class='ctx'> module_param_named(acpigtf, ide_acpigtf, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(acpigtf, "enable IDE ACPI _GTF support");</div><div class='ctx'> </div><div class='del'>-static int ide_acpionboot;</div><div class='add'>+static bool ide_acpionboot;</div><div class='ctx'> module_param_named(acpionboot, ide_acpionboot, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(acpionboot, "call IDE ACPI methods on boot");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/ide-floppy_ioctl.c b/drivers/ide/ide-floppy_ioctl.c<br/>index d267b7affad6..a22ca8467010 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-floppy_ioctl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/ide-floppy_ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-floppy_ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ide/ide-floppy_ioctl.c</a></div><div class='hunk'>@@ -292,8 +292,7 @@ int ide_floppy_ioctl(ide_drive_t *drive, struct block_device *bdev,</div><div class='ctx'> 	 * and CDROM_SEND_PACKET (legacy) ioctls</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (cmd != CDROM_SEND_PACKET &amp;&amp; cmd != SCSI_IOCTL_SEND_COMMAND)</div><div class='del'>-		err = scsi_cmd_ioctl(bdev-&gt;bd_disk-&gt;queue, bdev-&gt;bd_disk,</div><div class='del'>-				mode, cmd, argp);</div><div class='add'>+		err = scsi_cmd_blk_ioctl(bdev, mode, cmd, argp);</div><div class='ctx'> </div><div class='ctx'> 	if (err == -ENOTTY)</div><div class='ctx'> 		err = generic_ide_ioctl(drive, bdev, cmd, arg);</div><div class='head'>diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c<br/>index a743e68a8903..7f56b738d762 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-pci-generic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/ide-pci-generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-pci-generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ide/ide-pci-generic.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME "ide_pci_generic"</div><div class='ctx'> </div><div class='del'>-static int ide_generic_all;		/* Set to claim all devices */</div><div class='add'>+static bool ide_generic_all;		/* Set to claim all devices */</div><div class='ctx'> </div><div class='ctx'> module_param_named(all_generic_ide, ide_generic_all, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE storage controllers.");</div><div class='head'>diff --git a/drivers/ide/qd65xx.c b/drivers/ide/qd65xx.c<br/>index 3f0244fd8e62..8bbfe5557c7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/qd65xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/qd65xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/qd65xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ide/qd65xx.c</a></div><div class='hunk'>@@ -417,7 +417,7 @@ static int __init qd_probe(int base)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int probe_qd65xx;</div><div class='add'>+static bool probe_qd65xx;</div><div class='ctx'> </div><div class='ctx'> module_param_named(probe, probe_qd65xx, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(probe, "probe for QD65xx chipsets");</div><div class='head'>diff --git a/drivers/ide/umc8672.c b/drivers/ide/umc8672.c<br/>index 47adcd09cb26..5cfb78120669 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/umc8672.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ide/umc8672.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/umc8672.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ide/umc8672.c</a></div><div class='hunk'>@@ -160,7 +160,7 @@ static int __init umc8672_probe(void)</div><div class='ctx'> 	return ide_legacy_device_add(&amp;umc8672_port_info, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int probe_umc8672;</div><div class='add'>+static bool probe_umc8672;</div><div class='ctx'> </div><div class='ctx'> module_param_named(probe, probe_umc8672, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(probe, "probe for UMC8672 chipset");</div><div class='head'>diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c<br/>index 5d2f8e13cf0e..20bce51c2e82 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/idle/intel_idle.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/idle/intel_idle.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/idle/intel_idle.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/idle/intel_idle.c</a></div><div class='hunk'>@@ -197,7 +197,7 @@ static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = {</div><div class='ctx'> 		.enter = &amp;intel_idle },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int get_driver_data(int cstate)</div><div class='add'>+static long get_driver_data(int cstate)</div><div class='ctx'> {</div><div class='ctx'> 	int driver_data;</div><div class='ctx'> 	switch (cstate) {</div><div class='hunk'>@@ -232,6 +232,7 @@ static int get_driver_data(int cstate)</div><div class='ctx'>  * @drv: cpuidle driver</div><div class='ctx'>  * @index: index of cpuidle state</div><div class='ctx'>  *</div><div class='add'>+ * Must be called under local_irq_disable().</div><div class='ctx'>  */</div><div class='ctx'> static int intel_idle(struct cpuidle_device *dev,</div><div class='ctx'> 		struct cpuidle_driver *drv, int index)</div><div class='hunk'>@@ -247,8 +248,6 @@ static int intel_idle(struct cpuidle_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	cstate = (((eax) &gt;&gt; MWAIT_SUBSTATE_SIZE) &amp; MWAIT_CSTATE_MASK) + 1;</div><div class='ctx'> </div><div class='del'>-	local_irq_disable();</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * leave_mm() to avoid costly and often unnecessary wakeups</div><div class='ctx'> 	 * for flushing the user TLB's associated with the active mm.</div><div class='hunk'>@@ -348,7 +347,8 @@ static int intel_idle_probe(void)</div><div class='ctx'> 	cpuid(CPUID_MWAIT_LEAF, &amp;eax, &amp;ebx, &amp;ecx, &amp;mwait_substates);</div><div class='ctx'> </div><div class='ctx'> 	if (!(ecx &amp; CPUID5_ECX_EXTENSIONS_SUPPORTED) ||</div><div class='del'>-		!(ecx &amp; CPUID5_ECX_INTERRUPT_BREAK))</div><div class='add'>+	    !(ecx &amp; CPUID5_ECX_INTERRUPT_BREAK) ||</div><div class='add'>+	    !mwait_substates)</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug(PREFIX "MWAIT substates: 0x%x\n", mwait_substates);</div><div class='hunk'>@@ -394,7 +394,7 @@ static int intel_idle_probe(void)</div><div class='ctx'> 	if (boot_cpu_has(X86_FEATURE_ARAT))	/* Always Reliable APIC Timer */</div><div class='ctx'> 		lapic_timer_reliable_states = LAPIC_TIMER_ALWAYS_RELIABLE;</div><div class='ctx'> 	else {</div><div class='del'>-		smp_call_function(__setup_broadcast_timer, (void *)true, 1);</div><div class='add'>+		on_each_cpu(__setup_broadcast_timer, (void *)true, 1);</div><div class='ctx'> 		register_cpu_notifier(&amp;setup_broadcast_notifier);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -471,71 +471,67 @@ static int intel_idle_cpuidle_driver_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (auto_demotion_disable_flags)</div><div class='del'>-		smp_call_function(auto_demotion_disable, NULL, 1);</div><div class='add'>+		on_each_cpu(auto_demotion_disable, NULL, 1);</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='ctx'> /*</div><div class='del'>- * intel_idle_cpuidle_devices_init()</div><div class='add'>+ * intel_idle_cpu_init()</div><div class='ctx'>  * allocate, initialize, register cpuidle_devices</div><div class='add'>+ * @cpu: cpu/core to initialize</div><div class='ctx'>  */</div><div class='del'>-static int intel_idle_cpuidle_devices_init(void)</div><div class='add'>+int intel_idle_cpu_init(int cpu)</div><div class='ctx'> {</div><div class='del'>-	int i, cstate;</div><div class='add'>+	int cstate;</div><div class='ctx'> 	struct cpuidle_device *dev;</div><div class='ctx'> </div><div class='del'>-	intel_idle_cpuidle_devices = alloc_percpu(struct cpuidle_device);</div><div class='del'>-	if (intel_idle_cpuidle_devices == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	for_each_online_cpu(i) {</div><div class='del'>-		dev = per_cpu_ptr(intel_idle_cpuidle_devices, i);</div><div class='add'>+	dev = per_cpu_ptr(intel_idle_cpuidle_devices, cpu);</div><div class='ctx'> </div><div class='del'>-		dev-&gt;state_count = 1;</div><div class='add'>+	dev-&gt;state_count = 1;</div><div class='ctx'> </div><div class='del'>-		for (cstate = 1; cstate &lt; MWAIT_MAX_NUM_CSTATES; ++cstate) {</div><div class='del'>-			int num_substates;</div><div class='add'>+	for (cstate = 1; cstate &lt; MWAIT_MAX_NUM_CSTATES; ++cstate) {</div><div class='add'>+		int num_substates;</div><div class='ctx'> </div><div class='del'>-			if (cstate &gt; max_cstate) {</div><div class='del'>-				printk(PREFIX "max_cstate %d reached\n",</div><div class='del'>-					max_cstate);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+		if (cstate &gt; max_cstate) {</div><div class='add'>+			printk(PREFIX "max_cstate %d reached\n",</div><div class='add'>+			       max_cstate);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			/* does the state exist in CPUID.MWAIT? */</div><div class='del'>-			num_substates = (mwait_substates &gt;&gt; ((cstate) * 4))</div><div class='del'>-						&amp; MWAIT_SUBSTATE_MASK;</div><div class='del'>-			if (num_substates == 0)</div><div class='del'>-				continue;</div><div class='del'>-			/* is the state not enabled? */</div><div class='del'>-			if (cpuidle_state_table[cstate].enter == NULL) {</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='add'>+		/* does the state exist in CPUID.MWAIT? */</div><div class='add'>+		num_substates = (mwait_substates &gt;&gt; ((cstate) * 4))</div><div class='add'>+			&amp; MWAIT_SUBSTATE_MASK;</div><div class='add'>+		if (num_substates == 0)</div><div class='add'>+			continue;</div><div class='add'>+		/* is the state not enabled? */</div><div class='add'>+		if (cpuidle_state_table[cstate].enter == NULL)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-			dev-&gt;states_usage[dev-&gt;state_count].driver_data =</div><div class='del'>-				(void *)get_driver_data(cstate);</div><div class='add'>+		dev-&gt;states_usage[dev-&gt;state_count].driver_data =</div><div class='add'>+			(void *)get_driver_data(cstate);</div><div class='ctx'> </div><div class='ctx'> 			dev-&gt;state_count += 1;</div><div class='ctx'> 		}</div><div class='add'>+	dev-&gt;cpu = cpu;</div><div class='ctx'> </div><div class='del'>-		dev-&gt;cpu = i;</div><div class='del'>-		if (cpuidle_register_device(dev)) {</div><div class='del'>-			pr_debug(PREFIX "cpuidle_register_device %d failed!\n",</div><div class='del'>-				 i);</div><div class='del'>-			intel_idle_cpuidle_devices_uninit();</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='add'>+	if (cpuidle_register_device(dev)) {</div><div class='add'>+		pr_debug(PREFIX "cpuidle_register_device %d failed!\n", cpu);</div><div class='add'>+		intel_idle_cpuidle_devices_uninit();</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (auto_demotion_disable_flags)</div><div class='add'>+		smp_call_function_single(cpu, auto_demotion_disable, NULL, 1);</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='ctx'> static int __init intel_idle_init(void)</div><div class='ctx'> {</div><div class='del'>-	int retval;</div><div class='add'>+	int retval, i;</div><div class='ctx'> </div><div class='ctx'> 	/* Do not load intel_idle at all for now if idle= is passed */</div><div class='ctx'> 	if (boot_option_idle_override != IDLE_NO_OVERRIDE)</div><div class='hunk'>@@ -553,10 +549,16 @@ static int __init intel_idle_init(void)</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	retval = intel_idle_cpuidle_devices_init();</div><div class='del'>-	if (retval) {</div><div class='del'>-		cpuidle_unregister_driver(&amp;intel_idle_driver);</div><div class='del'>-		return retval;</div><div class='add'>+	intel_idle_cpuidle_devices = alloc_percpu(struct cpuidle_device);</div><div class='add'>+	if (intel_idle_cpuidle_devices == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for_each_online_cpu(i) {</div><div class='add'>+		retval = intel_idle_cpu_init(i);</div><div class='add'>+		if (retval) {</div><div class='add'>+			cpuidle_unregister_driver(&amp;intel_idle_driver);</div><div class='add'>+			return retval;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -568,7 +570,7 @@ static void __exit intel_idle_exit(void)</div><div class='ctx'> 	cpuidle_unregister_driver(&amp;intel_idle_driver);</div><div class='ctx'> </div><div class='ctx'> 	if (lapic_timer_reliable_states != LAPIC_TIMER_ALWAYS_RELIABLE) {</div><div class='del'>-		smp_call_function(__setup_broadcast_timer, (void *)false, 1);</div><div class='add'>+		on_each_cpu(__setup_broadcast_timer, (void *)false, 1);</div><div class='ctx'> 		unregister_cpu_notifier(&amp;setup_broadcast_notifier);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c<br/>index eb0e2ccc79ae..73d453159408 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee802154/fakehard.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ieee802154/fakehard.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee802154/fakehard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ieee802154/fakehard.c</a></div><div class='hunk'>@@ -343,7 +343,7 @@ static void ieee802154_fake_setup(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	dev-&gt;addr_len		= IEEE802154_ADDR_LEN;</div><div class='ctx'> 	memset(dev-&gt;broadcast, 0xff, IEEE802154_ADDR_LEN);</div><div class='del'>-	dev-&gt;features		= NETIF_F_NO_CSUM;</div><div class='add'>+	dev-&gt;features		= NETIF_F_HW_CSUM;</div><div class='ctx'> 	dev-&gt;needed_tailroom	= 2; /* FCS */</div><div class='ctx'> 	dev-&gt;mtu		= 127;</div><div class='ctx'> 	dev-&gt;tx_queue_len	= 10;</div><div class='head'>diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig<br/>index 0f9a84c1046a..eb0add311dc8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/Kconfig</a></div><div class='hunk'>@@ -55,6 +55,7 @@ source "drivers/infiniband/hw/nes/Kconfig"</div><div class='ctx'> source "drivers/infiniband/ulp/ipoib/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/infiniband/ulp/srp/Kconfig"</div><div class='add'>+source "drivers/infiniband/ulp/srpt/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/infiniband/ulp/iser/Kconfig"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/Makefile b/drivers/infiniband/Makefile<br/>index 9cc7a47d3e67..a3b2d8eac86e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/Makefile</a></div><div class='hunk'>@@ -10,4 +10,5 @@ obj-$(CONFIG_MLX4_INFINIBAND)		+= hw/mlx4/</div><div class='ctx'> obj-$(CONFIG_INFINIBAND_NES)		+= hw/nes/</div><div class='ctx'> obj-$(CONFIG_INFINIBAND_IPOIB)		+= ulp/ipoib/</div><div class='ctx'> obj-$(CONFIG_INFINIBAND_SRP)		+= ulp/srp/</div><div class='add'>+obj-$(CONFIG_INFINIBAND_SRPT)		+= ulp/srpt/</div><div class='ctx'> obj-$(CONFIG_INFINIBAND_ISER)		+= ulp/iser/</div><div class='head'>diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c<br/>index e9cf51b1343b..1612cfd50f39 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/addr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/core/addr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/addr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/core/addr.c</a></div><div class='hunk'>@@ -178,6 +178,25 @@ static void queue_req(struct addr_req *req)</div><div class='ctx'> 	mutex_unlock(&amp;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dst_fetch_ha(struct dst_entry *dst, struct rdma_dev_addr *addr)</div><div class='add'>+{</div><div class='add'>+	struct neighbour *n;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	n = dst_get_neighbour_noref(dst);</div><div class='add'>+	if (!n || !(n-&gt;nud_state &amp; NUD_VALID)) {</div><div class='add'>+		if (n)</div><div class='add'>+			neigh_event_send(n, NULL);</div><div class='add'>+		ret = -ENODATA;</div><div class='add'>+	} else {</div><div class='add'>+		ret = rdma_copy_addr(addr, dst-&gt;dev, n-&gt;ha);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int addr4_resolve(struct sockaddr_in *src_in,</div><div class='ctx'> 			 struct sockaddr_in *dst_in,</div><div class='ctx'> 			 struct rdma_dev_addr *addr)</div><div class='hunk'>@@ -185,7 +204,6 @@ static int addr4_resolve(struct sockaddr_in *src_in,</div><div class='ctx'> 	__be32 src_ip = src_in-&gt;sin_addr.s_addr;</div><div class='ctx'> 	__be32 dst_ip = dst_in-&gt;sin_addr.s_addr;</div><div class='ctx'> 	struct rtable *rt;</div><div class='del'>-	struct neighbour *neigh;</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -214,20 +232,7 @@ static int addr4_resolve(struct sockaddr_in *src_in,</div><div class='ctx'> 		goto put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	neigh = neigh_lookup(&amp;arp_tbl, &amp;rt-&gt;rt_gateway, rt-&gt;dst.dev);</div><div class='del'>-	if (!neigh || !(neigh-&gt;nud_state &amp; NUD_VALID)) {</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		neigh_event_send(dst_get_neighbour(&amp;rt-&gt;dst), NULL);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		ret = -ENODATA;</div><div class='del'>-		if (neigh)</div><div class='del'>-			goto release;</div><div class='del'>-		goto put;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = rdma_copy_addr(addr, neigh-&gt;dev, neigh-&gt;ha);</div><div class='del'>-release:</div><div class='del'>-	neigh_release(neigh);</div><div class='add'>+	ret = dst_fetch_ha(&amp;rt-&gt;dst, addr);</div><div class='ctx'> put:</div><div class='ctx'> 	ip_rt_put(rt);</div><div class='ctx'> out:</div><div class='hunk'>@@ -240,13 +245,12 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,</div><div class='ctx'> 			 struct rdma_dev_addr *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct flowi6 fl6;</div><div class='del'>-	struct neighbour *neigh;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;fl6, 0, sizeof fl6);</div><div class='del'>-	ipv6_addr_copy(&amp;fl6.daddr, &amp;dst_in-&gt;sin6_addr);</div><div class='del'>-	ipv6_addr_copy(&amp;fl6.saddr, &amp;src_in-&gt;sin6_addr);</div><div class='add'>+	fl6.daddr = dst_in-&gt;sin6_addr;</div><div class='add'>+	fl6.saddr = src_in-&gt;sin6_addr;</div><div class='ctx'> 	fl6.flowi6_oif = addr-&gt;bound_dev_if;</div><div class='ctx'> </div><div class='ctx'> 	dst = ip6_route_output(&amp;init_net, NULL, &amp;fl6);</div><div class='hunk'>@@ -260,7 +264,7 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,</div><div class='ctx'> 			goto put;</div><div class='ctx'> </div><div class='ctx'> 		src_in-&gt;sin6_family = AF_INET6;</div><div class='del'>-		ipv6_addr_copy(&amp;src_in-&gt;sin6_addr, &amp;fl6.saddr);</div><div class='add'>+		src_in-&gt;sin6_addr = fl6.saddr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dst-&gt;dev-&gt;flags &amp; IFF_LOOPBACK) {</div><div class='hunk'>@@ -276,16 +280,7 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,</div><div class='ctx'> 		goto put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	neigh = dst_get_neighbour(dst);</div><div class='del'>-	if (!neigh || !(neigh-&gt;nud_state &amp; NUD_VALID)) {</div><div class='del'>-		if (neigh)</div><div class='del'>-			neigh_event_send(neigh, NULL);</div><div class='del'>-		ret = -ENODATA;</div><div class='del'>-	} else {</div><div class='del'>-		ret = rdma_copy_addr(addr, dst-&gt;dev, neigh-&gt;ha);</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	ret = dst_fetch_ha(dst, addr);</div><div class='ctx'> put:</div><div class='ctx'> 	dst_release(dst);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c<br/>index 8b72f39202fb..c889aaef3416 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/cm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/core/cm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/cm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/core/cm.c</a></div><div class='hunk'>@@ -3659,7 +3659,7 @@ static struct kobj_type cm_port_obj_type = {</div><div class='ctx'> 	.release = cm_release_port_obj</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *cm_devnode(struct device *dev, mode_t *mode)</div><div class='add'>+static char *cm_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	if (mode)</div><div class='ctx'> 		*mode = 0666;</div><div class='head'>diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h<br/>index 505db2a59e7f..7da9b2102341 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/cm_msgs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/core/cm_msgs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/cm_msgs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/core/cm_msgs.h</a></div><div class='hunk'>@@ -799,6 +799,7 @@ struct cm_apr_msg {</div><div class='ctx'> </div><div class='ctx'> 	u8 info_length;</div><div class='ctx'> 	u8 ap_status;</div><div class='add'>+	__be16 rsvd;</div><div class='ctx'> 	u8 info[IB_CM_APR_INFO_LENGTH];</div><div class='ctx'> </div><div class='ctx'> 	u8 private_data[IB_CM_APR_PRIVATE_DATA_SIZE];</div><div class='head'>diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c<br/>index d0d4aa9f4802..e3e470fecaa9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/cma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/core/cma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/cma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/core/cma.c</a></div><div class='hunk'>@@ -1110,7 +1110,7 @@ static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id,</div><div class='ctx'> 	if (cma_any_addr((struct sockaddr *) &amp;rt-&gt;addr.src_addr)) {</div><div class='ctx'> 		rt-&gt;addr.dev_addr.dev_type = ARPHRD_INFINIBAND;</div><div class='ctx'> 		rdma_addr_set_sgid(&amp;rt-&gt;addr.dev_addr, &amp;rt-&gt;path_rec[0].sgid);</div><div class='del'>-		ib_addr_set_pkey(&amp;rt-&gt;addr.dev_addr, rt-&gt;path_rec[0].pkey);</div><div class='add'>+		ib_addr_set_pkey(&amp;rt-&gt;addr.dev_addr, be16_to_cpu(rt-&gt;path_rec[0].pkey));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = rdma_translate_ip((struct sockaddr *) &amp;rt-&gt;addr.src_addr,</div><div class='ctx'> 					&amp;rt-&gt;addr.dev_addr);</div><div class='hunk'>@@ -2005,11 +2005,11 @@ static int cma_resolve_loopback(struct rdma_id_private *id_priv)</div><div class='ctx'> 	if (cma_zero_addr(src)) {</div><div class='ctx'> 		dst = (struct sockaddr *) &amp;id_priv-&gt;id.route.addr.dst_addr;</div><div class='ctx'> 		if ((src-&gt;sa_family = dst-&gt;sa_family) == AF_INET) {</div><div class='del'>-			((struct sockaddr_in *) src)-&gt;sin_addr.s_addr =</div><div class='del'>-				((struct sockaddr_in *) dst)-&gt;sin_addr.s_addr;</div><div class='add'>+			((struct sockaddr_in *)src)-&gt;sin_addr =</div><div class='add'>+				((struct sockaddr_in *)dst)-&gt;sin_addr;</div><div class='ctx'> 		} else {</div><div class='del'>-			ipv6_addr_copy(&amp;((struct sockaddr_in6 *) src)-&gt;sin6_addr,</div><div class='del'>-				       &amp;((struct sockaddr_in6 *) dst)-&gt;sin6_addr);</div><div class='add'>+			((struct sockaddr_in6 *)src)-&gt;sin6_addr =</div><div class='add'>+				((struct sockaddr_in6 *)dst)-&gt;sin6_addr;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2926,7 +2926,7 @@ static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast)</div><div class='ctx'> 	mutex_lock(&amp;id_priv-&gt;qp_mutex);</div><div class='ctx'> 	if (!status &amp;&amp; id_priv-&gt;id.qp)</div><div class='ctx'> 		status = ib_attach_mcast(id_priv-&gt;id.qp, &amp;multicast-&gt;rec.mgid,</div><div class='del'>-					 multicast-&gt;rec.mlid);</div><div class='add'>+					 be16_to_cpu(multicast-&gt;rec.mlid));</div><div class='ctx'> 	mutex_unlock(&amp;id_priv-&gt;qp_mutex);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;event, 0, sizeof event);</div><div class='hunk'>@@ -3187,7 +3187,7 @@ void rdma_leave_multicast(struct rdma_cm_id *id, struct sockaddr *addr)</div><div class='ctx'> 			if (id-&gt;qp)</div><div class='ctx'> 				ib_detach_mcast(id-&gt;qp,</div><div class='ctx'> 						&amp;mc-&gt;multicast.ib-&gt;rec.mgid,</div><div class='del'>-						mc-&gt;multicast.ib-&gt;rec.mlid);</div><div class='add'>+						be16_to_cpu(mc-&gt;multicast.ib-&gt;rec.mlid));</div><div class='ctx'> 			if (rdma_node_get_transport(id_priv-&gt;cma_dev-&gt;device-&gt;node_type) == RDMA_TRANSPORT_IB) {</div><div class='ctx'> 				switch (rdma_port_get_link_layer(id-&gt;device, id-&gt;port_num)) {</div><div class='ctx'> 				case IB_LINK_LAYER_INFINIBAND:</div><div class='head'>diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c<br/>index b8a0b4a7811b..06f08713f487 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/ucm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/core/ucm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/ucm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/core/ucm.c</a></div><div class='hunk'>@@ -106,9 +106,6 @@ enum {</div><div class='ctx'> 	IB_UCM_MAX_DEVICES = 32</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* ib_cm and ib_user_cm modules share /sys/class/infiniband_cm */</div><div class='del'>-extern struct class cm_class;</div><div class='del'>-</div><div class='ctx'> #define IB_UCM_BASE_DEV MKDEV(IB_UCM_MAJOR, IB_UCM_BASE_MINOR)</div><div class='ctx'> </div><div class='ctx'> static void ib_ucm_add_one(struct ib_device *device);</div><div class='head'>diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c<br/>index 07db22997e97..f0d588f8859e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/user_mad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/core/user_mad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/user_mad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/core/user_mad.c</a></div><div class='hunk'>@@ -1175,7 +1175,7 @@ static void ib_umad_remove_one(struct ib_device *device)</div><div class='ctx'> 	kref_put(&amp;umad_dev-&gt;ref, ib_umad_release_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char *umad_devnode(struct device *dev, mode_t *mode)</div><div class='add'>+static char *umad_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	return kasprintf(GFP_KERNEL, "infiniband/%s", dev_name(dev));</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c<br/>index 254f1649c734..b930da4c0c63 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/uverbs_cmd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/core/uverbs_cmd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/uverbs_cmd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/core/uverbs_cmd.c</a></div><div class='hunk'>@@ -241,11 +241,24 @@ static struct ib_qp *idr_read_qp(int qp_handle, struct ib_ucontext *context)</div><div class='ctx'> 	return idr_read_obj(&amp;ib_uverbs_qp_idr, qp_handle, context, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct ib_qp *idr_write_qp(int qp_handle, struct ib_ucontext *context)</div><div class='add'>+{</div><div class='add'>+	struct ib_uobject *uobj;</div><div class='add'>+</div><div class='add'>+	uobj = idr_write_uobj(&amp;ib_uverbs_qp_idr, qp_handle, context);</div><div class='add'>+	return uobj ? uobj-&gt;object : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void put_qp_read(struct ib_qp *qp)</div><div class='ctx'> {</div><div class='ctx'> 	put_uobj_read(qp-&gt;uobject);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void put_qp_write(struct ib_qp *qp)</div><div class='add'>+{</div><div class='add'>+	put_uobj_write(qp-&gt;uobject);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct ib_srq *idr_read_srq(int srq_handle, struct ib_ucontext *context)</div><div class='ctx'> {</div><div class='ctx'> 	return idr_read_obj(&amp;ib_uverbs_srq_idr, srq_handle, context, 0);</div><div class='hunk'>@@ -2375,7 +2388,7 @@ ssize_t ib_uverbs_attach_mcast(struct ib_uverbs_file *file,</div><div class='ctx'> 	if (copy_from_user(&amp;cmd, buf, sizeof cmd))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	qp = idr_read_qp(cmd.qp_handle, file-&gt;ucontext);</div><div class='add'>+	qp = idr_write_qp(cmd.qp_handle, file-&gt;ucontext);</div><div class='ctx'> 	if (!qp)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -2404,7 +2417,7 @@ ssize_t ib_uverbs_attach_mcast(struct ib_uverbs_file *file,</div><div class='ctx'> 		kfree(mcast);</div><div class='ctx'> </div><div class='ctx'> out_put:</div><div class='del'>-	put_qp_read(qp);</div><div class='add'>+	put_qp_write(qp);</div><div class='ctx'> </div><div class='ctx'> 	return ret ? ret : in_len;</div><div class='ctx'> }</div><div class='hunk'>@@ -2422,7 +2435,7 @@ ssize_t ib_uverbs_detach_mcast(struct ib_uverbs_file *file,</div><div class='ctx'> 	if (copy_from_user(&amp;cmd, buf, sizeof cmd))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	qp = idr_read_qp(cmd.qp_handle, file-&gt;ucontext);</div><div class='add'>+	qp = idr_write_qp(cmd.qp_handle, file-&gt;ucontext);</div><div class='ctx'> 	if (!qp)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -2441,14 +2454,14 @@ ssize_t ib_uverbs_detach_mcast(struct ib_uverbs_file *file,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> out_put:</div><div class='del'>-	put_qp_read(qp);</div><div class='add'>+	put_qp_write(qp);</div><div class='ctx'> </div><div class='ctx'> 	return ret ? ret : in_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __uverbs_create_xsrq(struct ib_uverbs_file *file,</div><div class='del'>-			 struct ib_uverbs_create_xsrq *cmd,</div><div class='del'>-			 struct ib_udata *udata)</div><div class='add'>+static int __uverbs_create_xsrq(struct ib_uverbs_file *file,</div><div class='add'>+				struct ib_uverbs_create_xsrq *cmd,</div><div class='add'>+				struct ib_udata *udata)</div><div class='ctx'> {</div><div class='ctx'> 	struct ib_uverbs_create_srq_resp resp;</div><div class='ctx'> 	struct ib_usrq_object           *obj;</div><div class='head'>diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c<br/>index 879636746373..604556d73d25 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/uverbs_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/core/uverbs_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/uverbs_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/core/uverbs_main.c</a></div><div class='hunk'>@@ -846,7 +846,7 @@ static void ib_uverbs_remove_one(struct ib_device *device)</div><div class='ctx'> 	kfree(uverbs_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char *uverbs_devnode(struct device *dev, mode_t *mode)</div><div class='add'>+static char *uverbs_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	if (mode)</div><div class='ctx'> 		*mode = 0666;</div><div class='head'>diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c<br/>index c88b12beef25..740dcc065cf2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/cxgb3/iwch_cm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/cxgb3/iwch_cm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/cxgb3/iwch_cm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/cxgb3/iwch_cm.c</a></div><div class='hunk'>@@ -1338,7 +1338,6 @@ static int pass_accept_req(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)</div><div class='ctx'> 	struct iwch_ep *child_ep, *parent_ep = ctx;</div><div class='ctx'> 	struct cpl_pass_accept_req *req = cplhdr(skb);</div><div class='ctx'> 	unsigned int hwtid = GET_TID(req);</div><div class='del'>-	struct neighbour *neigh;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='ctx'> 	struct l2t_entry *l2t;</div><div class='ctx'> 	struct rtable *rt;</div><div class='hunk'>@@ -1375,10 +1374,7 @@ static int pass_accept_req(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)</div><div class='ctx'> 		goto reject;</div><div class='ctx'> 	}</div><div class='ctx'> 	dst = &amp;rt-&gt;dst;</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	neigh = dst_get_neighbour(dst);</div><div class='del'>-	l2t = t3_l2t_get(tdev, neigh, neigh-&gt;dev);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	l2t = t3_l2t_get(tdev, dst, NULL);</div><div class='ctx'> 	if (!l2t) {</div><div class='ctx'> 		printk(KERN_ERR MOD "%s - failed to allocate l2t entry!\n",</div><div class='ctx'> 		       __func__);</div><div class='hunk'>@@ -1889,7 +1885,6 @@ static int is_loopback_dst(struct iw_cm_id *cm_id)</div><div class='ctx'> int iwch_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwch_dev *h = to_iwch_dev(cm_id-&gt;device);</div><div class='del'>-	struct neighbour *neigh;</div><div class='ctx'> 	struct iwch_ep *ep;</div><div class='ctx'> 	struct rtable *rt;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -1947,13 +1942,7 @@ int iwch_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)</div><div class='ctx'> 		goto fail3;</div><div class='ctx'> 	}</div><div class='ctx'> 	ep-&gt;dst = &amp;rt-&gt;dst;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	neigh = dst_get_neighbour(ep-&gt;dst);</div><div class='del'>-</div><div class='del'>-	/* get a l2t entry */</div><div class='del'>-	ep-&gt;l2t = t3_l2t_get(ep-&gt;com.tdev, neigh, neigh-&gt;dev);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	ep-&gt;l2t = t3_l2t_get(ep-&gt;com.tdev, ep-&gt;dst, NULL);</div><div class='ctx'> 	if (!ep-&gt;l2t) {</div><div class='ctx'> 		printk(KERN_ERR MOD "%s - cannot alloc l2e.\n", __func__);</div><div class='ctx'> 		err = -ENOMEM;</div><div class='head'>diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c<br/>index 0747004313ad..0668bb3472d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/cxgb4/cm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/cxgb4/cm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/cxgb4/cm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/cxgb4/cm.c</a></div><div class='hunk'>@@ -1556,6 +1556,67 @@ static void get_4tuple(struct cpl_pass_accept_req *req,</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int import_ep(struct c4iw_ep *ep, __be32 peer_ip, struct dst_entry *dst,</div><div class='add'>+		     struct c4iw_dev *cdev, bool clear_mpa_v1)</div><div class='add'>+{</div><div class='add'>+	struct neighbour *n;</div><div class='add'>+	int err, step;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	n = dst_get_neighbour_noref(dst);</div><div class='add'>+	err = -ENODEV;</div><div class='add'>+	if (!n)</div><div class='add'>+		goto out;</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	if (n-&gt;dev-&gt;flags &amp; IFF_LOOPBACK) {</div><div class='add'>+		struct net_device *pdev;</div><div class='add'>+</div><div class='add'>+		pdev = ip_dev_find(&amp;init_net, peer_ip);</div><div class='add'>+		ep-&gt;l2t = cxgb4_l2t_get(cdev-&gt;rdev.lldi.l2t,</div><div class='add'>+					n, pdev, 0);</div><div class='add'>+		if (!ep-&gt;l2t)</div><div class='add'>+			goto out;</div><div class='add'>+		ep-&gt;mtu = pdev-&gt;mtu;</div><div class='add'>+		ep-&gt;tx_chan = cxgb4_port_chan(pdev);</div><div class='add'>+		ep-&gt;smac_idx = (cxgb4_port_viid(pdev) &amp; 0x7F) &lt;&lt; 1;</div><div class='add'>+		step = cdev-&gt;rdev.lldi.ntxq /</div><div class='add'>+			cdev-&gt;rdev.lldi.nchan;</div><div class='add'>+		ep-&gt;txq_idx = cxgb4_port_idx(pdev) * step;</div><div class='add'>+		step = cdev-&gt;rdev.lldi.nrxq /</div><div class='add'>+			cdev-&gt;rdev.lldi.nchan;</div><div class='add'>+		ep-&gt;ctrlq_idx = cxgb4_port_idx(pdev);</div><div class='add'>+		ep-&gt;rss_qid = cdev-&gt;rdev.lldi.rxq_ids[</div><div class='add'>+			cxgb4_port_idx(pdev) * step];</div><div class='add'>+		dev_put(pdev);</div><div class='add'>+	} else {</div><div class='add'>+		ep-&gt;l2t = cxgb4_l2t_get(cdev-&gt;rdev.lldi.l2t,</div><div class='add'>+					n, n-&gt;dev, 0);</div><div class='add'>+		if (!ep-&gt;l2t)</div><div class='add'>+			goto out;</div><div class='add'>+		ep-&gt;mtu = dst_mtu(ep-&gt;dst);</div><div class='add'>+		ep-&gt;tx_chan = cxgb4_port_chan(n-&gt;dev);</div><div class='add'>+		ep-&gt;smac_idx = (cxgb4_port_viid(n-&gt;dev) &amp; 0x7F) &lt;&lt; 1;</div><div class='add'>+		step = cdev-&gt;rdev.lldi.ntxq /</div><div class='add'>+			cdev-&gt;rdev.lldi.nchan;</div><div class='add'>+		ep-&gt;txq_idx = cxgb4_port_idx(n-&gt;dev) * step;</div><div class='add'>+		ep-&gt;ctrlq_idx = cxgb4_port_idx(n-&gt;dev);</div><div class='add'>+		step = cdev-&gt;rdev.lldi.nrxq /</div><div class='add'>+			cdev-&gt;rdev.lldi.nchan;</div><div class='add'>+		ep-&gt;rss_qid = cdev-&gt;rdev.lldi.rxq_ids[</div><div class='add'>+			cxgb4_port_idx(n-&gt;dev) * step];</div><div class='add'>+</div><div class='add'>+		if (clear_mpa_v1) {</div><div class='add'>+			ep-&gt;retry_with_mpa_v1 = 0;</div><div class='add'>+			ep-&gt;tried_with_mpa_v1 = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	err = 0;</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct c4iw_ep *child_ep, *parent_ep;</div><div class='hunk'>@@ -1563,18 +1624,11 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	unsigned int stid = GET_POPEN_TID(ntohl(req-&gt;tos_stid));</div><div class='ctx'> 	struct tid_info *t = dev-&gt;rdev.lldi.tids;</div><div class='ctx'> 	unsigned int hwtid = GET_TID(req);</div><div class='del'>-	struct neighbour *neigh;</div><div class='ctx'> 	struct dst_entry *dst;</div><div class='del'>-	struct l2t_entry *l2t;</div><div class='ctx'> 	struct rtable *rt;</div><div class='ctx'> 	__be32 local_ip, peer_ip;</div><div class='ctx'> 	__be16 local_port, peer_port;</div><div class='del'>-	struct net_device *pdev;</div><div class='del'>-	u32 tx_chan, smac_idx;</div><div class='del'>-	u16 rss_qid;</div><div class='del'>-	u32 mtu;</div><div class='del'>-	int step;</div><div class='del'>-	int txq_idx, ctrlq_idx;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	parent_ep = lookup_stid(t, stid);</div><div class='ctx'> 	PDBG("%s parent ep %p tid %u\n", __func__, parent_ep, hwtid);</div><div class='hunk'>@@ -1596,49 +1650,24 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 		goto reject;</div><div class='ctx'> 	}</div><div class='ctx'> 	dst = &amp;rt-&gt;dst;</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	neigh = dst_get_neighbour(dst);</div><div class='del'>-	if (neigh-&gt;dev-&gt;flags &amp; IFF_LOOPBACK) {</div><div class='del'>-		pdev = ip_dev_find(&amp;init_net, peer_ip);</div><div class='del'>-		BUG_ON(!pdev);</div><div class='del'>-		l2t = cxgb4_l2t_get(dev-&gt;rdev.lldi.l2t, neigh, pdev, 0);</div><div class='del'>-		mtu = pdev-&gt;mtu;</div><div class='del'>-		tx_chan = cxgb4_port_chan(pdev);</div><div class='del'>-		smac_idx = (cxgb4_port_viid(pdev) &amp; 0x7F) &lt;&lt; 1;</div><div class='del'>-		step = dev-&gt;rdev.lldi.ntxq / dev-&gt;rdev.lldi.nchan;</div><div class='del'>-		txq_idx = cxgb4_port_idx(pdev) * step;</div><div class='del'>-		ctrlq_idx = cxgb4_port_idx(pdev);</div><div class='del'>-		step = dev-&gt;rdev.lldi.nrxq / dev-&gt;rdev.lldi.nchan;</div><div class='del'>-		rss_qid = dev-&gt;rdev.lldi.rxq_ids[cxgb4_port_idx(pdev) * step];</div><div class='del'>-		dev_put(pdev);</div><div class='del'>-	} else {</div><div class='del'>-		l2t = cxgb4_l2t_get(dev-&gt;rdev.lldi.l2t, neigh, neigh-&gt;dev, 0);</div><div class='del'>-		mtu = dst_mtu(dst);</div><div class='del'>-		tx_chan = cxgb4_port_chan(neigh-&gt;dev);</div><div class='del'>-		smac_idx = (cxgb4_port_viid(neigh-&gt;dev) &amp; 0x7F) &lt;&lt; 1;</div><div class='del'>-		step = dev-&gt;rdev.lldi.ntxq / dev-&gt;rdev.lldi.nchan;</div><div class='del'>-		txq_idx = cxgb4_port_idx(neigh-&gt;dev) * step;</div><div class='del'>-		ctrlq_idx = cxgb4_port_idx(neigh-&gt;dev);</div><div class='del'>-		step = dev-&gt;rdev.lldi.nrxq / dev-&gt;rdev.lldi.nchan;</div><div class='del'>-		rss_qid = dev-&gt;rdev.lldi.rxq_ids[</div><div class='del'>-			  cxgb4_port_idx(neigh-&gt;dev) * step];</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	if (!l2t) {</div><div class='del'>-		printk(KERN_ERR MOD "%s - failed to allocate l2t entry!\n",</div><div class='add'>+</div><div class='add'>+	child_ep = alloc_ep(sizeof(*child_ep), GFP_KERNEL);</div><div class='add'>+	if (!child_ep) {</div><div class='add'>+		printk(KERN_ERR MOD "%s - failed to allocate ep entry!\n",</div><div class='ctx'> 		       __func__);</div><div class='ctx'> 		dst_release(dst);</div><div class='ctx'> 		goto reject;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	child_ep = alloc_ep(sizeof(*child_ep), GFP_KERNEL);</div><div class='del'>-	if (!child_ep) {</div><div class='del'>-		printk(KERN_ERR MOD "%s - failed to allocate ep entry!\n",</div><div class='add'>+	err = import_ep(child_ep, peer_ip, dst, dev, false);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR MOD "%s - failed to allocate l2t entry!\n",</div><div class='ctx'> 		       __func__);</div><div class='del'>-		cxgb4_l2t_release(l2t);</div><div class='ctx'> 		dst_release(dst);</div><div class='add'>+		kfree(child_ep);</div><div class='ctx'> 		goto reject;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	state_set(&amp;child_ep-&gt;com, CONNECTING);</div><div class='ctx'> 	child_ep-&gt;com.dev = dev;</div><div class='ctx'> 	child_ep-&gt;com.cm_id = NULL;</div><div class='hunk'>@@ -1651,18 +1680,11 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)</div><div class='ctx'> 	c4iw_get_ep(&amp;parent_ep-&gt;com);</div><div class='ctx'> 	child_ep-&gt;parent_ep = parent_ep;</div><div class='ctx'> 	child_ep-&gt;tos = GET_POPEN_TOS(ntohl(req-&gt;tos_stid));</div><div class='del'>-	child_ep-&gt;l2t = l2t;</div><div class='ctx'> 	child_ep-&gt;dst = dst;</div><div class='ctx'> 	child_ep-&gt;hwtid = hwtid;</div><div class='del'>-	child_ep-&gt;tx_chan = tx_chan;</div><div class='del'>-	child_ep-&gt;smac_idx = smac_idx;</div><div class='del'>-	child_ep-&gt;rss_qid = rss_qid;</div><div class='del'>-	child_ep-&gt;mtu = mtu;</div><div class='del'>-	child_ep-&gt;txq_idx = txq_idx;</div><div class='del'>-	child_ep-&gt;ctrlq_idx = ctrlq_idx;</div><div class='ctx'> </div><div class='ctx'> 	PDBG("%s tx_chan %u smac_idx %u rss_qid %u\n", __func__,</div><div class='del'>-	     tx_chan, smac_idx, rss_qid);</div><div class='add'>+	     child_ep-&gt;tx_chan, child_ep-&gt;smac_idx, child_ep-&gt;rss_qid);</div><div class='ctx'> </div><div class='ctx'> 	init_timer(&amp;child_ep-&gt;timer);</div><div class='ctx'> 	cxgb4_insert_tid(t, child_ep, hwtid);</div><div class='hunk'>@@ -1792,11 +1814,8 @@ static int is_neg_adv_abort(unsigned int status)</div><div class='ctx'> </div><div class='ctx'> static int c4iw_reconnect(struct c4iw_ep *ep)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	struct rtable *rt;</div><div class='del'>-	struct net_device *pdev;</div><div class='del'>-	struct neighbour *neigh;</div><div class='del'>-	int step;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	PDBG("%s qp %p cm_id %p\n", __func__, ep-&gt;com.qp, ep-&gt;com.cm_id);</div><div class='ctx'> 	init_timer(&amp;ep-&gt;timer);</div><div class='hunk'>@@ -1824,47 +1843,10 @@ static int c4iw_reconnect(struct c4iw_ep *ep)</div><div class='ctx'> 	}</div><div class='ctx'> 	ep-&gt;dst = &amp;rt-&gt;dst;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	neigh = dst_get_neighbour(ep-&gt;dst);</div><div class='del'>-</div><div class='del'>-	/* get a l2t entry */</div><div class='del'>-	if (neigh-&gt;dev-&gt;flags &amp; IFF_LOOPBACK) {</div><div class='del'>-		PDBG("%s LOOPBACK\n", __func__);</div><div class='del'>-		pdev = ip_dev_find(&amp;init_net,</div><div class='del'>-				   ep-&gt;com.cm_id-&gt;remote_addr.sin_addr.s_addr);</div><div class='del'>-		ep-&gt;l2t = cxgb4_l2t_get(ep-&gt;com.dev-&gt;rdev.lldi.l2t,</div><div class='del'>-					neigh, pdev, 0);</div><div class='del'>-		ep-&gt;mtu = pdev-&gt;mtu;</div><div class='del'>-		ep-&gt;tx_chan = cxgb4_port_chan(pdev);</div><div class='del'>-		ep-&gt;smac_idx = (cxgb4_port_viid(pdev) &amp; 0x7F) &lt;&lt; 1;</div><div class='del'>-		step = ep-&gt;com.dev-&gt;rdev.lldi.ntxq /</div><div class='del'>-			ep-&gt;com.dev-&gt;rdev.lldi.nchan;</div><div class='del'>-		ep-&gt;txq_idx = cxgb4_port_idx(pdev) * step;</div><div class='del'>-		step = ep-&gt;com.dev-&gt;rdev.lldi.nrxq /</div><div class='del'>-			ep-&gt;com.dev-&gt;rdev.lldi.nchan;</div><div class='del'>-		ep-&gt;ctrlq_idx = cxgb4_port_idx(pdev);</div><div class='del'>-		ep-&gt;rss_qid = ep-&gt;com.dev-&gt;rdev.lldi.rxq_ids[</div><div class='del'>-			cxgb4_port_idx(pdev) * step];</div><div class='del'>-		dev_put(pdev);</div><div class='del'>-	} else {</div><div class='del'>-		ep-&gt;l2t = cxgb4_l2t_get(ep-&gt;com.dev-&gt;rdev.lldi.l2t,</div><div class='del'>-					neigh, neigh-&gt;dev, 0);</div><div class='del'>-		ep-&gt;mtu = dst_mtu(ep-&gt;dst);</div><div class='del'>-		ep-&gt;tx_chan = cxgb4_port_chan(neigh-&gt;dev);</div><div class='del'>-		ep-&gt;smac_idx = (cxgb4_port_viid(neigh-&gt;dev) &amp; 0x7F) &lt;&lt; 1;</div><div class='del'>-		step = ep-&gt;com.dev-&gt;rdev.lldi.ntxq /</div><div class='del'>-			ep-&gt;com.dev-&gt;rdev.lldi.nchan;</div><div class='del'>-		ep-&gt;txq_idx = cxgb4_port_idx(neigh-&gt;dev) * step;</div><div class='del'>-		ep-&gt;ctrlq_idx = cxgb4_port_idx(neigh-&gt;dev);</div><div class='del'>-		step = ep-&gt;com.dev-&gt;rdev.lldi.nrxq /</div><div class='del'>-			ep-&gt;com.dev-&gt;rdev.lldi.nchan;</div><div class='del'>-		ep-&gt;rss_qid = ep-&gt;com.dev-&gt;rdev.lldi.rxq_ids[</div><div class='del'>-			cxgb4_port_idx(neigh-&gt;dev) * step];</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	if (!ep-&gt;l2t) {</div><div class='add'>+	err = import_ep(ep, ep-&gt;com.cm_id-&gt;remote_addr.sin_addr.s_addr,</div><div class='add'>+			ep-&gt;dst, ep-&gt;com.dev, false);</div><div class='add'>+	if (err) {</div><div class='ctx'> 		printk(KERN_ERR MOD "%s - cannot alloc l2e.\n", __func__);</div><div class='del'>-		err = -ENOMEM;</div><div class='ctx'> 		goto fail4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2240,13 +2222,10 @@ err:</div><div class='ctx'> </div><div class='ctx'> int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	struct c4iw_dev *dev = to_c4iw_dev(cm_id-&gt;device);</div><div class='ctx'> 	struct c4iw_ep *ep;</div><div class='ctx'> 	struct rtable *rt;</div><div class='del'>-	struct net_device *pdev;</div><div class='del'>-	struct neighbour *neigh;</div><div class='del'>-	int step;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((conn_param-&gt;ord &gt; c4iw_max_read_depth) ||</div><div class='ctx'> 	    (conn_param-&gt;ird &gt; c4iw_max_read_depth)) {</div><div class='hunk'>@@ -2307,49 +2286,10 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)</div><div class='ctx'> 	}</div><div class='ctx'> 	ep-&gt;dst = &amp;rt-&gt;dst;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	neigh = dst_get_neighbour(ep-&gt;dst);</div><div class='del'>-</div><div class='del'>-	/* get a l2t entry */</div><div class='del'>-	if (neigh-&gt;dev-&gt;flags &amp; IFF_LOOPBACK) {</div><div class='del'>-		PDBG("%s LOOPBACK\n", __func__);</div><div class='del'>-		pdev = ip_dev_find(&amp;init_net,</div><div class='del'>-				   cm_id-&gt;remote_addr.sin_addr.s_addr);</div><div class='del'>-		ep-&gt;l2t = cxgb4_l2t_get(ep-&gt;com.dev-&gt;rdev.lldi.l2t,</div><div class='del'>-					neigh, pdev, 0);</div><div class='del'>-		ep-&gt;mtu = pdev-&gt;mtu;</div><div class='del'>-		ep-&gt;tx_chan = cxgb4_port_chan(pdev);</div><div class='del'>-		ep-&gt;smac_idx = (cxgb4_port_viid(pdev) &amp; 0x7F) &lt;&lt; 1;</div><div class='del'>-		step = ep-&gt;com.dev-&gt;rdev.lldi.ntxq /</div><div class='del'>-		       ep-&gt;com.dev-&gt;rdev.lldi.nchan;</div><div class='del'>-		ep-&gt;txq_idx = cxgb4_port_idx(pdev) * step;</div><div class='del'>-		step = ep-&gt;com.dev-&gt;rdev.lldi.nrxq /</div><div class='del'>-		       ep-&gt;com.dev-&gt;rdev.lldi.nchan;</div><div class='del'>-		ep-&gt;ctrlq_idx = cxgb4_port_idx(pdev);</div><div class='del'>-		ep-&gt;rss_qid = ep-&gt;com.dev-&gt;rdev.lldi.rxq_ids[</div><div class='del'>-			      cxgb4_port_idx(pdev) * step];</div><div class='del'>-		dev_put(pdev);</div><div class='del'>-	} else {</div><div class='del'>-		ep-&gt;l2t = cxgb4_l2t_get(ep-&gt;com.dev-&gt;rdev.lldi.l2t,</div><div class='del'>-					neigh, neigh-&gt;dev, 0);</div><div class='del'>-		ep-&gt;mtu = dst_mtu(ep-&gt;dst);</div><div class='del'>-		ep-&gt;tx_chan = cxgb4_port_chan(neigh-&gt;dev);</div><div class='del'>-		ep-&gt;smac_idx = (cxgb4_port_viid(neigh-&gt;dev) &amp; 0x7F) &lt;&lt; 1;</div><div class='del'>-		step = ep-&gt;com.dev-&gt;rdev.lldi.ntxq /</div><div class='del'>-		       ep-&gt;com.dev-&gt;rdev.lldi.nchan;</div><div class='del'>-		ep-&gt;txq_idx = cxgb4_port_idx(neigh-&gt;dev) * step;</div><div class='del'>-		ep-&gt;ctrlq_idx = cxgb4_port_idx(neigh-&gt;dev);</div><div class='del'>-		step = ep-&gt;com.dev-&gt;rdev.lldi.nrxq /</div><div class='del'>-		       ep-&gt;com.dev-&gt;rdev.lldi.nchan;</div><div class='del'>-		ep-&gt;rss_qid = ep-&gt;com.dev-&gt;rdev.lldi.rxq_ids[</div><div class='del'>-			      cxgb4_port_idx(neigh-&gt;dev) * step];</div><div class='del'>-		ep-&gt;retry_with_mpa_v1 = 0;</div><div class='del'>-		ep-&gt;tried_with_mpa_v1 = 0;</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	if (!ep-&gt;l2t) {</div><div class='add'>+	err = import_ep(ep, cm_id-&gt;remote_addr.sin_addr.s_addr,</div><div class='add'>+			ep-&gt;dst, ep-&gt;com.dev, true);</div><div class='add'>+	if (err) {</div><div class='ctx'> 		printk(KERN_ERR MOD "%s - cannot alloc l2e.\n", __func__);</div><div class='del'>-		err = -ENOMEM;</div><div class='ctx'> 		goto fail4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/ehca/ehca_classes.h b/drivers/infiniband/hw/ehca/ehca_classes.h<br/>index aaf6023a4835..f08f6eaf3fa8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ehca/ehca_classes.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/ehca/ehca_classes.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ehca/ehca_classes.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/ehca/ehca_classes.h</a></div><div class='hunk'>@@ -379,8 +379,8 @@ extern spinlock_t shca_list_lock;</div><div class='ctx'> </div><div class='ctx'> extern int ehca_static_rate;</div><div class='ctx'> extern int ehca_port_act_time;</div><div class='del'>-extern int ehca_use_hp_mr;</div><div class='del'>-extern int ehca_scaling_code;</div><div class='add'>+extern bool ehca_use_hp_mr;</div><div class='add'>+extern bool ehca_scaling_code;</div><div class='ctx'> extern int ehca_lock_hcalls;</div><div class='ctx'> extern int ehca_nr_ports;</div><div class='ctx'> extern int ehca_max_cq;</div><div class='head'>diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c<br/>index c240e9972cb0..832e7a7d0aee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ehca/ehca_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/ehca/ehca_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ehca/ehca_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/ehca/ehca_main.c</a></div><div class='hunk'>@@ -59,16 +59,16 @@ MODULE_AUTHOR("Christoph Raisch &lt;raisch@de.ibm.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("IBM eServer HCA InfiniBand Device Driver");</div><div class='ctx'> MODULE_VERSION(HCAD_VERSION);</div><div class='ctx'> </div><div class='del'>-static int ehca_open_aqp1     = 0;</div><div class='add'>+static bool ehca_open_aqp1    = 0;</div><div class='ctx'> static int ehca_hw_level      = 0;</div><div class='del'>-static int ehca_poll_all_eqs  = 1;</div><div class='add'>+static bool ehca_poll_all_eqs = 1;</div><div class='ctx'> </div><div class='ctx'> int ehca_debug_level   = 0;</div><div class='ctx'> int ehca_nr_ports      = -1;</div><div class='del'>-int ehca_use_hp_mr     = 0;</div><div class='add'>+bool ehca_use_hp_mr    = 0;</div><div class='ctx'> int ehca_port_act_time = 30;</div><div class='ctx'> int ehca_static_rate   = -1;</div><div class='del'>-int ehca_scaling_code  = 0;</div><div class='add'>+bool ehca_scaling_code = 0;</div><div class='ctx'> int ehca_lock_hcalls   = -1;</div><div class='ctx'> int ehca_max_cq        = -1;</div><div class='ctx'> int ehca_max_qp        = -1;</div><div class='hunk'>@@ -82,7 +82,7 @@ module_param_named(port_act_time, ehca_port_act_time, int,  S_IRUGO);</div><div class='ctx'> module_param_named(poll_all_eqs,  ehca_poll_all_eqs,  bool, S_IRUGO);</div><div class='ctx'> module_param_named(static_rate,   ehca_static_rate,   int,  S_IRUGO);</div><div class='ctx'> module_param_named(scaling_code,  ehca_scaling_code,  bool, S_IRUGO);</div><div class='del'>-module_param_named(lock_hcalls,   ehca_lock_hcalls,   bool, S_IRUGO);</div><div class='add'>+module_param_named(lock_hcalls,   ehca_lock_hcalls,   bint, S_IRUGO);</div><div class='ctx'> module_param_named(number_of_cqs, ehca_max_cq,        int,  S_IRUGO);</div><div class='ctx'> module_param_named(number_of_qps, ehca_max_qp,        int,  S_IRUGO);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c<br/>index 31ae1b108aea..b7d4216db3c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_fs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/ipath/ipath_fs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_fs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/ipath/ipath_fs.c</a></div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> static struct super_block *ipath_super;</div><div class='ctx'> </div><div class='ctx'> static int ipathfs_mknod(struct inode *dir, struct dentry *dentry,</div><div class='del'>-			 int mode, const struct file_operations *fops,</div><div class='add'>+			 umode_t mode, const struct file_operations *fops,</div><div class='ctx'> 			 void *data)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -61,7 +61,7 @@ static int ipathfs_mknod(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	inode-&gt;i_mode = mode;</div><div class='ctx'> 	inode-&gt;i_atime = inode-&gt;i_mtime = inode-&gt;i_ctime = CURRENT_TIME;</div><div class='ctx'> 	inode-&gt;i_private = data;</div><div class='del'>-	if ((mode &amp; S_IFMT) == S_IFDIR) {</div><div class='add'>+	if (S_ISDIR(mode)) {</div><div class='ctx'> 		inode-&gt;i_op = &amp;simple_dir_inode_operations;</div><div class='ctx'> 		inc_nlink(inode);</div><div class='ctx'> 		inc_nlink(dir);</div><div class='hunk'>@@ -76,7 +76,7 @@ bail:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int create_file(const char *name, mode_t mode,</div><div class='add'>+static int create_file(const char *name, umode_t mode,</div><div class='ctx'> 		       struct dentry *parent, struct dentry **dentry,</div><div class='ctx'> 		       const struct file_operations *fops, void *data)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/infiniband/hw/mlx4/ah.c b/drivers/infiniband/hw/mlx4/ah.c<br/>index 4b8f9c49397e..a251becdaa98 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mlx4/ah.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/mlx4/ah.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mlx4/ah.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/mlx4/ah.c</a></div><div class='hunk'>@@ -126,7 +126,7 @@ static struct ib_ah *create_iboe_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr</div><div class='ctx'> 		ah-&gt;av.ib.dlid = cpu_to_be16(0xc000);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(ah-&gt;av.eth.dgid, ah_attr-&gt;grh.dgid.raw, 16);</div><div class='del'>-	ah-&gt;av.eth.sl_tclass_flowlabel = cpu_to_be32(ah_attr-&gt;sl &lt;&lt; 28);</div><div class='add'>+	ah-&gt;av.eth.sl_tclass_flowlabel = cpu_to_be32(ah_attr-&gt;sl &lt;&lt; 29);</div><div class='ctx'> </div><div class='ctx'> 	return &amp;ah-&gt;ibah;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c<br/>index e8df155bc3b0..5ecf38d97269 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mlx4/cq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/mlx4/cq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mlx4/cq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/mlx4/cq.c</a></div><div class='hunk'>@@ -715,13 +715,17 @@ repoll:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		wc-&gt;slid	   = be16_to_cpu(cqe-&gt;rlid);</div><div class='del'>-		wc-&gt;sl		   = be16_to_cpu(cqe-&gt;sl_vid) &gt;&gt; 12;</div><div class='ctx'> 		g_mlpath_rqpn	   = be32_to_cpu(cqe-&gt;g_mlpath_rqpn);</div><div class='ctx'> 		wc-&gt;src_qp	   = g_mlpath_rqpn &amp; 0xffffff;</div><div class='ctx'> 		wc-&gt;dlid_path_bits = (g_mlpath_rqpn &gt;&gt; 24) &amp; 0x7f;</div><div class='ctx'> 		wc-&gt;wc_flags	  |= g_mlpath_rqpn &amp; 0x80000000 ? IB_WC_GRH : 0;</div><div class='ctx'> 		wc-&gt;pkey_index     = be32_to_cpu(cqe-&gt;immed_rss_invalid) &amp; 0x7f;</div><div class='ctx'> 		wc-&gt;csum_ok	   = mlx4_ib_ipoib_csum_ok(cqe-&gt;status, cqe-&gt;checksum);</div><div class='add'>+		if (rdma_port_get_link_layer(wc-&gt;qp-&gt;device,</div><div class='add'>+				(*cur_qp)-&gt;port) == IB_LINK_LAYER_ETHERNET)</div><div class='add'>+			wc-&gt;sl  = be16_to_cpu(cqe-&gt;sl_vid) &gt;&gt; 13;</div><div class='add'>+		else</div><div class='add'>+			wc-&gt;sl  = be16_to_cpu(cqe-&gt;sl_vid) &gt;&gt; 12;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c<br/>index f36da994a85a..95c94d8f0254 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mlx4/mad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/mlx4/mad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mlx4/mad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/mlx4/mad.c</a></div><div class='hunk'>@@ -109,7 +109,8 @@ int mlx4_MAD_IFC(struct mlx4_ib_dev *dev, int ignore_mkey, int ignore_bkey,</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_cmd_box(dev-&gt;dev, inmailbox-&gt;dma, outmailbox-&gt;dma,</div><div class='ctx'> 			   in_modifier, op_modifier,</div><div class='del'>-			   MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C);</div><div class='add'>+			   MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C,</div><div class='add'>+			   MLX4_CMD_NATIVE);</div><div class='ctx'> </div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		memcpy(response_mad, outmailbox-&gt;buf, 256);</div><div class='hunk'>@@ -330,7 +331,8 @@ static int iboe_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,</div><div class='ctx'> 		return IB_MAD_RESULT_FAILURE;</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_cmd_box(dev-&gt;dev, 0, mailbox-&gt;dma, inmod, 0,</div><div class='del'>-			   MLX4_CMD_QUERY_IF_STAT, MLX4_CMD_TIME_CLASS_C);</div><div class='add'>+			   MLX4_CMD_QUERY_IF_STAT, MLX4_CMD_TIME_CLASS_C,</div><div class='add'>+			   MLX4_CMD_WRAPPED);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		err = IB_MAD_RESULT_FAILURE;</div><div class='ctx'> 	else {</div><div class='head'>diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c<br/>index 18836cdf1e10..7b445df6a667 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mlx4/main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/mlx4/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mlx4/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/mlx4/main.c</a></div><div class='hunk'>@@ -177,7 +177,7 @@ mlx4_ib_port_link_layer(struct ib_device *device, u8 port_num)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_dev *dev = to_mdev(device)-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	return dev-&gt;caps.port_mask &amp; (1 &lt;&lt; (port_num - 1)) ?</div><div class='add'>+	return dev-&gt;caps.port_mask[port_num] == MLX4_PORT_TYPE_IB ?</div><div class='ctx'> 		IB_LINK_LAYER_INFINIBAND : IB_LINK_LAYER_ETHERNET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -434,7 +434,7 @@ static int mlx4_ib_modify_device(struct ib_device *ibdev, int mask,</div><div class='ctx'> 	memset(mailbox-&gt;buf, 0, 256);</div><div class='ctx'> 	memcpy(mailbox-&gt;buf, props-&gt;node_desc, 64);</div><div class='ctx'> 	mlx4_cmd(to_mdev(ibdev)-&gt;dev, mailbox-&gt;dma, 1, 0,</div><div class='del'>-		 MLX4_CMD_SET_NODE, MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+		 MLX4_CMD_SET_NODE, MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);</div><div class='ctx'> </div><div class='ctx'> 	mlx4_free_cmd_mailbox(to_mdev(ibdev)-&gt;dev, mailbox);</div><div class='ctx'> </div><div class='hunk'>@@ -463,7 +463,7 @@ static int mlx4_SET_PORT(struct mlx4_ib_dev *dev, u8 port, int reset_qkey_viols,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_cmd(dev-&gt;dev, mailbox-&gt;dma, port, is_eth, MLX4_CMD_SET_PORT,</div><div class='del'>-		       MLX4_CMD_TIME_CLASS_B);</div><div class='add'>+		       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);</div><div class='ctx'> </div><div class='ctx'> 	mlx4_free_cmd_mailbox(dev-&gt;dev, mailbox);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -899,7 +899,8 @@ static void update_gids_task(struct work_struct *work)</div><div class='ctx'> 	memcpy(gids, gw-&gt;gids, sizeof gw-&gt;gids);</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_cmd(dev, mailbox-&gt;dma, MLX4_SET_PORT_GID_TABLE &lt;&lt; 8 | gw-&gt;port,</div><div class='del'>-		       1, MLX4_CMD_SET_PORT, MLX4_CMD_TIME_CLASS_B);</div><div class='add'>+		       1, MLX4_CMD_SET_PORT, MLX4_CMD_TIME_CLASS_B,</div><div class='add'>+		       MLX4_CMD_NATIVE);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		printk(KERN_WARNING "set port command failed\n");</div><div class='ctx'> 	else {</div><div class='hunk'>@@ -1074,6 +1075,11 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	printk_once(KERN_INFO "%s", mlx4_ib_version);</div><div class='ctx'> </div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		printk(KERN_WARNING "IB not yet supported in SRIOV\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mlx4_foreach_ib_transport_port(i, dev)</div><div class='ctx'> 		num_ports++;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c<br/>index a16f0c8e6f3f..aa2aefa4236c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mlx4/qp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/mlx4/qp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mlx4/qp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/mlx4/qp.c</a></div><div class='hunk'>@@ -962,7 +962,7 @@ static int mlx4_set_path(struct mlx4_ib_dev *dev, const struct ib_ah_attr *ah,</div><div class='ctx'> </div><div class='ctx'> 	if (is_eth) {</div><div class='ctx'> 		path-&gt;sched_queue = MLX4_IB_DEFAULT_SCHED_QUEUE |</div><div class='del'>-			((port - 1) &lt;&lt; 6) | ((ah-&gt;sl &amp; 7) &lt;&lt; 3) | ((ah-&gt;sl &amp; 8) &gt;&gt; 1);</div><div class='add'>+			((port - 1) &lt;&lt; 6) | ((ah-&gt;sl &amp; 7) &lt;&lt; 3);</div><div class='ctx'> </div><div class='ctx'> 		if (!(ah-&gt;ah_flags &amp; IB_AH_GRH))</div><div class='ctx'> 			return -1;</div><div class='hunk'>@@ -1437,7 +1437,7 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_send_wr *wr,</div><div class='ctx'> 			u16 pcp;</div><div class='ctx'> </div><div class='ctx'> 			sqp-&gt;ud_header.vlan.type = cpu_to_be16(MLX4_IB_IBOE_ETHERTYPE);</div><div class='del'>-			pcp = (be32_to_cpu(ah-&gt;av.ib.sl_tclass_flowlabel) &gt;&gt; 27 &amp; 3) &lt;&lt; 13;</div><div class='add'>+			pcp = (be32_to_cpu(ah-&gt;av.ib.sl_tclass_flowlabel) &gt;&gt; 29) &lt;&lt; 13;</div><div class='ctx'> 			sqp-&gt;ud_header.vlan.tag = cpu_to_be16(vlan | pcp);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c<br/>index 5965b3df8f2f..7013da5e9eda 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/nes/nes.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/nes/nes.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/nes/nes.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/nes/nes.c</a></div><div class='hunk'>@@ -96,7 +96,7 @@ unsigned int wqm_quanta = 0x10000;</div><div class='ctx'> module_param(wqm_quanta, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(wqm_quanta, "WQM quanta");</div><div class='ctx'> </div><div class='del'>-static unsigned int limit_maxrdreqsz;</div><div class='add'>+static bool limit_maxrdreqsz;</div><div class='ctx'> module_param(limit_maxrdreqsz, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");</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 0a52d72371ee..425065b36b8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/nes/nes_cm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/nes/nes_cm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/nes/nes_cm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/nes/nes_cm.c</a></div><div class='hunk'>@@ -1348,7 +1348,8 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi</div><div class='ctx'> 	else</div><div class='ctx'> 		netdev = nesvnic-&gt;netdev;</div><div class='ctx'> </div><div class='del'>-	neigh = neigh_lookup(&amp;arp_tbl, &amp;rt-&gt;rt_gateway, netdev);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	neigh = dst_get_neighbour_noref(&amp;rt-&gt;dst);</div><div class='ctx'> 	if (neigh) {</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='hunk'>@@ -1359,7 +1360,6 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi</div><div class='ctx'> 				if (!memcmp(nesadapter-&gt;arp_table[arpindex].mac_addr,</div><div class='ctx'> 					    neigh-&gt;ha, ETH_ALEN)) {</div><div class='ctx'> 					/* Mac address same as in nes_arp_table */</div><div class='del'>-					neigh_release(neigh);</div><div class='ctx'> 					ip_rt_put(rt);</div><div class='ctx'> 					return rc;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1373,15 +1373,11 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi</div><div class='ctx'> 					     dst_ip, NES_ARP_ADD);</div><div class='ctx'> 			rc = nes_arp_table(nesvnic-&gt;nesdev, dst_ip, NULL,</div><div class='ctx'> 					   NES_ARP_RESOLVE);</div><div class='add'>+		} else {</div><div class='add'>+			neigh_event_send(neigh, NULL);</div><div class='ctx'> 		}</div><div class='del'>-		neigh_release(neigh);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((neigh == NULL) || (!(neigh-&gt;nud_state &amp; NUD_VALID))) {</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		neigh_event_send(dst_get_neighbour(&amp;rt-&gt;dst), NULL);</div><div class='del'>-		rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	ip_rt_put(rt);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -2838,6 +2834,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)</div><div class='ctx'> 		issue_disconn = 1;</div><div class='ctx'> 		issue_close = 1;</div><div class='ctx'> 		nesqp-&gt;cm_id = NULL;</div><div class='add'>+		del_timer(&amp;nesqp-&gt;terminate_timer);</div><div class='ctx'> 		if (nesqp-&gt;flush_issued == 0) {</div><div class='ctx'> 			nesqp-&gt;flush_issued = 1;</div><div class='ctx'> 			issue_flush = 1;</div><div class='head'>diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c<br/>index 7c0ff19ce382..055f4b545df0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/nes/nes_hw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/nes/nes_hw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/nes/nes_hw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/nes/nes_hw.c</a></div><div class='hunk'>@@ -1529,7 +1529,7 @@ int nes_init_phy(struct nes_device *nesdev)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* setup 10G MDIO operation */</div><div class='ctx'> 		tx_config &amp;= 0xFFFFFFE3;</div><div class='del'>-		tx_config |= 0x15;</div><div class='add'>+		tx_config |= 0x1D;</div><div class='ctx'> 	}</div><div class='ctx'> 	nes_write_indexed(nesdev, NES_IDX_MAC_TX_CONFIG, tx_config);</div><div class='ctx'> </div><div class='hunk'>@@ -3619,10 +3619,6 @@ static void nes_process_iwarp_aeqe(struct nes_device *nesdev,</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case NES_AEQE_AEID_LLP_CLOSE_COMPLETE:</div><div class='del'>-			if (nesqp-&gt;term_flags) {</div><div class='del'>-				nes_terminate_done(nesqp, 0);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='ctx'> 			spin_lock_irqsave(&amp;nesqp-&gt;lock, flags);</div><div class='ctx'> 			nesqp-&gt;hw_iwarp_state = iwarp_state;</div><div class='ctx'> 			nesqp-&gt;hw_tcp_state = tcp_state;</div><div class='head'>diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c<br/>index c00d2f3f8966..4b3fa711a247 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/nes/nes_nic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/nes/nes_nic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/nes/nes_nic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/nes/nes_nic.c</a></div><div class='hunk'>@@ -1589,7 +1589,7 @@ static const struct ethtool_ops nes_ethtool_ops = {</div><div class='ctx'> 	.set_pauseparam = nes_netdev_set_pauseparam,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void nes_vlan_mode(struct net_device *netdev, struct nes_device *nesdev, u32 features)</div><div class='add'>+static void nes_vlan_mode(struct net_device *netdev, struct nes_device *nesdev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct nes_adapter *nesadapter = nesdev-&gt;nesadapter;</div><div class='ctx'> 	u32 u32temp;</div><div class='hunk'>@@ -1610,7 +1610,7 @@ static void nes_vlan_mode(struct net_device *netdev, struct nes_device *nesdev,</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;nesadapter-&gt;phy_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 nes_fix_features(struct net_device *netdev, u32 features)</div><div class='add'>+static netdev_features_t nes_fix_features(struct net_device *netdev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since there is no support for separate rx/tx vlan accel</div><div class='hunk'>@@ -1624,7 +1624,7 @@ static u32 nes_fix_features(struct net_device *netdev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nes_set_features(struct net_device *netdev, u32 features)</div><div class='add'>+static int nes_set_features(struct net_device *netdev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct nes_vnic *nesvnic = netdev_priv(netdev);</div><div class='ctx'> 	struct nes_device *nesdev = nesvnic-&gt;nesdev;</div><div class='head'>diff --git a/drivers/infiniband/hw/nes/nes_utils.c b/drivers/infiniband/hw/nes/nes_utils.c<br/>index cd10968bfa22..8b4c2ff54888 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/nes/nes_utils.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/nes/nes_utils.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/nes/nes_utils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/nes/nes_utils.c</a></div><div class='hunk'>@@ -56,7 +56,7 @@ static u16 nes_read16_eeprom(void __iomem *addr, u16 offset);</div><div class='ctx'> u32 mh_detected;</div><div class='ctx'> u32 mh_pauses_sent;</div><div class='ctx'> </div><div class='del'>-u32 nes_set_pau(struct nes_device *nesdev)</div><div class='add'>+static u32 nes_set_pau(struct nes_device *nesdev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ret = 0;</div><div class='ctx'> 	u32 counter;</div><div class='head'>diff --git a/drivers/infiniband/hw/qib/qib_7220.h b/drivers/infiniband/hw/qib/qib_7220.h<br/>index 21f374aa0631..a5356cb4252e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_7220.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_7220.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_7220.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/qib/qib_7220.h</a></div><div class='hunk'>@@ -97,7 +97,7 @@ struct qib_chippport_specific {</div><div class='ctx'> 	u64 iblnkerrsnap;</div><div class='ctx'> 	u64 ibcctrl; /* kr_ibcctrl shadow */</div><div class='ctx'> 	u64 ibcddrctrl; /* kr_ibcddrctrl shadow */</div><div class='del'>-	u64 chase_end;</div><div class='add'>+	unsigned long chase_end;</div><div class='ctx'> 	u32 last_delay_mult;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/qib/qib_driver.c b/drivers/infiniband/hw/qib/qib_driver.c<br/>index c90a55f4120f..6fc9365ba8a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_driver.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/qib/qib_driver.c</a></div><div class='hunk'>@@ -371,9 +371,8 @@ static u32 qib_rcv_hdrerr(struct qib_ctxtdata *rcd, struct qib_pportdata *ppd,</div><div class='ctx'> 						lnh == QIB_LRH_GRH,</div><div class='ctx'> 						qp,</div><div class='ctx'> 						be32_to_cpu(ohdr-&gt;bth[0]));</div><div class='del'>-				if (ruc_res) {</div><div class='add'>+				if (ruc_res)</div><div class='ctx'> 					goto unlock;</div><div class='del'>-				}</div><div class='ctx'> </div><div class='ctx'> 				/* Only deal with RDMA Writes for now */</div><div class='ctx'> 				if (opcode &lt;</div><div class='head'>diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c<br/>index df7fa251dcdc..05e0f17c5b44 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_fs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_fs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_fs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/qib/qib_fs.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@ static struct super_block *qib_super;</div><div class='ctx'> #define private2dd(file) ((file)-&gt;f_dentry-&gt;d_inode-&gt;i_private)</div><div class='ctx'> </div><div class='ctx'> static int qibfs_mknod(struct inode *dir, struct dentry *dentry,</div><div class='del'>-		       int mode, const struct file_operations *fops,</div><div class='add'>+		       umode_t mode, const struct file_operations *fops,</div><div class='ctx'> 		       void *data)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -67,7 +67,7 @@ static int qibfs_mknod(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 	inode-&gt;i_mtime = inode-&gt;i_atime;</div><div class='ctx'> 	inode-&gt;i_ctime = inode-&gt;i_atime;</div><div class='ctx'> 	inode-&gt;i_private = data;</div><div class='del'>-	if ((mode &amp; S_IFMT) == S_IFDIR) {</div><div class='add'>+	if (S_ISDIR(mode)) {</div><div class='ctx'> 		inode-&gt;i_op = &amp;simple_dir_inode_operations;</div><div class='ctx'> 		inc_nlink(inode);</div><div class='ctx'> 		inc_nlink(dir);</div><div class='hunk'>@@ -82,7 +82,7 @@ bail:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int create_file(const char *name, mode_t mode,</div><div class='add'>+static int create_file(const char *name, umode_t mode,</div><div class='ctx'> 		       struct dentry *parent, struct dentry **dentry,</div><div class='ctx'> 		       const struct file_operations *fops, void *data)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c<br/>index 781a802a321f..4f18e2d332df 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_iba6120.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_iba6120.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_iba6120.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/qib/qib_iba6120.c</a></div><div class='hunk'>@@ -2076,9 +2076,11 @@ static void qib_6120_config_ctxts(struct qib_devdata *dd)</div><div class='ctx'> static void qib_update_6120_usrhead(struct qib_ctxtdata *rcd, u64 hd,</div><div class='ctx'> 				    u32 updegr, u32 egrhd, u32 npkts)</div><div class='ctx'> {</div><div class='del'>-	qib_write_ureg(rcd-&gt;dd, ur_rcvhdrhead, hd, rcd-&gt;ctxt);</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='add'>+	mmiowb();</div><div class='add'>+	qib_write_ureg(rcd-&gt;dd, ur_rcvhdrhead, hd, rcd-&gt;ctxt);</div><div class='add'>+	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 439d3c503cd5..3c722f79d6f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_iba7220.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_iba7220.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_iba7220.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/qib/qib_iba7220.c</a></div><div class='hunk'>@@ -1051,7 +1051,7 @@ static void reenable_7220_chase(unsigned long opaque)</div><div class='ctx'> static void handle_7220_chase(struct qib_pportdata *ppd, u64 ibcst)</div><div class='ctx'> {</div><div class='ctx'> 	u8 ibclt;</div><div class='del'>-	u64 tnow;</div><div class='add'>+	unsigned long tnow;</div><div class='ctx'> </div><div class='ctx'> 	ibclt = (u8)SYM_FIELD(ibcst, IBCStatus, LinkTrainingState);</div><div class='ctx'> </div><div class='hunk'>@@ -1066,9 +1066,9 @@ static void handle_7220_chase(struct qib_pportdata *ppd, u64 ibcst)</div><div class='ctx'> 	case IB_7220_LT_STATE_CFGWAITRMT:</div><div class='ctx'> 	case IB_7220_LT_STATE_TXREVLANES:</div><div class='ctx'> 	case IB_7220_LT_STATE_CFGENH:</div><div class='del'>-		tnow = get_jiffies_64();</div><div class='add'>+		tnow = jiffies;</div><div class='ctx'> 		if (ppd-&gt;cpspec-&gt;chase_end &amp;&amp;</div><div class='del'>-		    time_after64(tnow, ppd-&gt;cpspec-&gt;chase_end)) {</div><div class='add'>+		    time_after(tnow, ppd-&gt;cpspec-&gt;chase_end)) {</div><div class='ctx'> 			ppd-&gt;cpspec-&gt;chase_end = 0;</div><div class='ctx'> 			qib_set_ib_7220_lstate(ppd,</div><div class='ctx'> 				QLOGIC_IB_IBCC_LINKCMD_DOWN,</div><div class='hunk'>@@ -2725,9 +2725,11 @@ static int qib_7220_set_loopback(struct qib_pportdata *ppd, const char *what)</div><div class='ctx'> static void qib_update_7220_usrhead(struct qib_ctxtdata *rcd, u64 hd,</div><div class='ctx'> 				    u32 updegr, u32 egrhd, u32 npkts)</div><div class='ctx'> {</div><div class='del'>-	qib_write_ureg(rcd-&gt;dd, ur_rcvhdrhead, hd, rcd-&gt;ctxt);</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='add'>+	mmiowb();</div><div class='add'>+	qib_write_ureg(rcd-&gt;dd, ur_rcvhdrhead, hd, rcd-&gt;ctxt);</div><div class='add'>+	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 1d5895941e19..41e92089e41b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_iba7322.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_iba7322.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_iba7322.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/qib/qib_iba7322.c</a></div><div class='hunk'>@@ -615,8 +615,8 @@ struct qib_chippport_specific {</div><div class='ctx'> 	u64 ibmalfsnap;</div><div class='ctx'> 	u64 ibcctrl_a; /* krp_ibcctrl_a shadow */</div><div class='ctx'> 	u64 ibcctrl_b; /* krp_ibcctrl_b shadow */</div><div class='del'>-	u64 qdr_dfe_time;</div><div class='del'>-	u64 chase_end;</div><div class='add'>+	unsigned long qdr_dfe_time;</div><div class='add'>+	unsigned long chase_end;</div><div class='ctx'> 	u32 autoneg_tries;</div><div class='ctx'> 	u32 recovery_init;</div><div class='ctx'> 	u32 qdr_dfe_on;</div><div class='hunk'>@@ -1672,7 +1672,8 @@ static void reenable_chase(unsigned long opaque)</div><div class='ctx'> 		QLOGIC_IB_IBCC_LINKINITCMD_POLL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void disable_chase(struct qib_pportdata *ppd, u64 tnow, u8 ibclt)</div><div class='add'>+static void disable_chase(struct qib_pportdata *ppd, unsigned long tnow,</div><div class='add'>+		u8 ibclt)</div><div class='ctx'> {</div><div class='ctx'> 	ppd-&gt;cpspec-&gt;chase_end = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1688,7 +1689,7 @@ static void disable_chase(struct qib_pportdata *ppd, u64 tnow, u8 ibclt)</div><div class='ctx'> static void handle_serdes_issues(struct qib_pportdata *ppd, u64 ibcst)</div><div class='ctx'> {</div><div class='ctx'> 	u8 ibclt;</div><div class='del'>-	u64 tnow;</div><div class='add'>+	unsigned long tnow;</div><div class='ctx'> </div><div class='ctx'> 	ibclt = (u8)SYM_FIELD(ibcst, IBCStatusA_0, LinkTrainingState);</div><div class='ctx'> </div><div class='hunk'>@@ -1703,9 +1704,9 @@ static void handle_serdes_issues(struct qib_pportdata *ppd, u64 ibcst)</div><div class='ctx'> 	case IB_7322_LT_STATE_CFGWAITRMT:</div><div class='ctx'> 	case IB_7322_LT_STATE_TXREVLANES:</div><div class='ctx'> 	case IB_7322_LT_STATE_CFGENH:</div><div class='del'>-		tnow = get_jiffies_64();</div><div class='add'>+		tnow = jiffies;</div><div class='ctx'> 		if (ppd-&gt;cpspec-&gt;chase_end &amp;&amp;</div><div class='del'>-		     time_after64(tnow, ppd-&gt;cpspec-&gt;chase_end))</div><div class='add'>+		     time_after(tnow, ppd-&gt;cpspec-&gt;chase_end))</div><div class='ctx'> 			disable_chase(ppd, tnow, ibclt);</div><div class='ctx'> 		else if (!ppd-&gt;cpspec-&gt;chase_end)</div><div class='ctx'> 			ppd-&gt;cpspec-&gt;chase_end = tnow + QIB_CHASE_TIME;</div><div class='hunk'>@@ -2714,7 +2715,7 @@ static noinline void unknown_7322_gpio_intr(struct qib_devdata *dd)</div><div class='ctx'> 			pins &gt;&gt;= SYM_LSB(EXTStatus, GPIOIn);</div><div class='ctx'> 			if (!(pins &amp; mask)) {</div><div class='ctx'> 				++handled;</div><div class='del'>-				qd-&gt;t_insert = get_jiffies_64();</div><div class='add'>+				qd-&gt;t_insert = jiffies;</div><div class='ctx'> 				queue_work(ib_wq, &amp;qd-&gt;work);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3602,7 +3603,7 @@ static void qib_7322_config_ctxts(struct qib_devdata *dd)</div><div class='ctx'> 	if (qib_rcvhdrcnt)</div><div class='ctx'> 		dd-&gt;rcvhdrcnt = max(dd-&gt;cspec-&gt;rcvegrcnt, qib_rcvhdrcnt);</div><div class='ctx'> 	else</div><div class='del'>-		dd-&gt;rcvhdrcnt = max(dd-&gt;cspec-&gt;rcvegrcnt,</div><div class='add'>+		dd-&gt;rcvhdrcnt = 2 * max(dd-&gt;cspec-&gt;rcvegrcnt,</div><div class='ctx'> 				    dd-&gt;num_pports &gt; 1 ? 1024U : 2048U);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4082,10 +4083,12 @@ static void qib_update_7322_usrhead(struct qib_ctxtdata *rcd, u64 hd,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (hd &gt;&gt; IBA7322_HDRHEAD_PKTINT_SHIFT)</div><div class='ctx'> 		adjust_rcv_timeout(rcd, npkts);</div><div class='del'>-	qib_write_ureg(rcd-&gt;dd, ur_rcvhdrhead, hd, rcd-&gt;ctxt);</div><div class='del'>-	qib_write_ureg(rcd-&gt;dd, ur_rcvhdrhead, hd, rcd-&gt;ctxt);</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='add'>+	mmiowb();</div><div class='add'>+	qib_write_ureg(rcd-&gt;dd, ur_rcvhdrhead, hd, rcd-&gt;ctxt);</div><div class='add'>+	qib_write_ureg(rcd-&gt;dd, ur_rcvhdrhead, hd, rcd-&gt;ctxt);</div><div class='add'>+	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='hunk'>@@ -4794,7 +4797,7 @@ static void qib_get_7322_faststats(unsigned long opaque)</div><div class='ctx'> 		    (ppd-&gt;lflags &amp; (QIBL_LINKINIT | QIBL_LINKARMED |</div><div class='ctx'> 				    QIBL_LINKACTIVE)) &amp;&amp;</div><div class='ctx'> 		    ppd-&gt;cpspec-&gt;qdr_dfe_time &amp;&amp;</div><div class='del'>-		    time_after64(get_jiffies_64(), ppd-&gt;cpspec-&gt;qdr_dfe_time)) {</div><div class='add'>+		    time_is_before_jiffies(ppd-&gt;cpspec-&gt;qdr_dfe_time)) {</div><div class='ctx'> 			ppd-&gt;cpspec-&gt;qdr_dfe_on = 0;</div><div class='ctx'> </div><div class='ctx'> 			qib_write_kreg_port(ppd, krp_static_adapt_dis(2),</div><div class='hunk'>@@ -5240,7 +5243,7 @@ static int qib_7322_ib_updown(struct qib_pportdata *ppd, int ibup, u64 ibcs)</div><div class='ctx'> 			/* schedule the qsfp refresh which should turn the link</div><div class='ctx'> 			   off */</div><div class='ctx'> 			if (ppd-&gt;dd-&gt;flags &amp; QIB_HAS_QSFP) {</div><div class='del'>-				qd-&gt;t_insert = get_jiffies_64();</div><div class='add'>+				qd-&gt;t_insert = jiffies;</div><div class='ctx'> 				queue_work(ib_wq, &amp;qd-&gt;work);</div><div class='ctx'> 			}</div><div class='ctx'> 			spin_lock_irqsave(&amp;ppd-&gt;sdma_lock, flags);</div><div class='hunk'>@@ -5592,7 +5595,7 @@ static void qsfp_7322_event(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct qib_qsfp_data *qd;</div><div class='ctx'> 	struct qib_pportdata *ppd;</div><div class='del'>-	u64 pwrup;</div><div class='add'>+	unsigned long pwrup;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 le2;</div><div class='hunk'>@@ -5620,8 +5623,7 @@ static void qsfp_7322_event(struct work_struct *work)</div><div class='ctx'> 		 * to insertion.</div><div class='ctx'> 		 */</div><div class='ctx'> 		while (1) {</div><div class='del'>-			u64 now = get_jiffies_64();</div><div class='del'>-			if (time_after64(now, pwrup))</div><div class='add'>+			if (time_is_before_jiffies(pwrup))</div><div class='ctx'> 				break;</div><div class='ctx'> 			msleep(20);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -7506,7 +7508,7 @@ static int serdes_7322_init_old(struct qib_pportdata *ppd)</div><div class='ctx'> </div><div class='ctx'> static int serdes_7322_init_new(struct qib_pportdata *ppd)</div><div class='ctx'> {</div><div class='del'>-	u64 tstart;</div><div class='add'>+	unsigned long tend;</div><div class='ctx'> 	u32 le_val, rxcaldone;</div><div class='ctx'> 	int chan, chan_done = (1 &lt;&lt; SERDES_CHANS) - 1;</div><div class='ctx'> </div><div class='hunk'>@@ -7611,10 +7613,8 @@ static int serdes_7322_init_new(struct qib_pportdata *ppd)</div><div class='ctx'> 	msleep(20);</div><div class='ctx'> 	/*       Start Calibration */</div><div class='ctx'> 	ibsd_wr_allchans(ppd, 4, (1 &lt;&lt; 10), BMASK(10, 10));</div><div class='del'>-	tstart = get_jiffies_64();</div><div class='del'>-	while (chan_done &amp;&amp;</div><div class='del'>-	       !time_after64(get_jiffies_64(),</div><div class='del'>-			tstart + msecs_to_jiffies(500))) {</div><div class='add'>+	tend = jiffies + msecs_to_jiffies(500);</div><div class='add'>+	while (chan_done &amp;&amp; !time_is_before_jiffies(tend)) {</div><div class='ctx'> 		msleep(20);</div><div class='ctx'> 		for (chan = 0; chan &lt; SERDES_CHANS; ++chan) {</div><div class='ctx'> 			rxcaldone = ahb_mod(ppd-&gt;dd, IBSD(ppd-&gt;hw_pidx),</div><div class='head'>diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c<br/>index 58b0f8ad4a29..cf0cd30adc8d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/qib/qib_init.c</a></div><div class='hunk'>@@ -1015,7 +1015,7 @@ static int __devinit qib_init_one(struct pci_dev *,</div><div class='ctx'> #define DRIVER_LOAD_MSG "QLogic " QIB_DRV_NAME " loaded: "</div><div class='ctx'> #define PFX QIB_DRV_NAME ": "</div><div class='ctx'> </div><div class='del'>-static const struct pci_device_id qib_pci_tbl[] = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(qib_pci_tbl) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_PATHSCALE, PCI_DEVICE_ID_QLOGIC_IB_6120) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_IB_7220) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_IB_7322) },</div><div class='head'>diff --git a/drivers/infiniband/hw/qib/qib_pcie.c b/drivers/infiniband/hw/qib/qib_pcie.c<br/>index 97a8bdf68e60..f695061d688e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_pcie.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_pcie.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/qib/qib_pcie.c</a></div><div class='hunk'>@@ -560,9 +560,9 @@ static int qib_tune_pcie_coalesce(struct qib_devdata *dd)</div><div class='ctx'>  * BIOS may not set PCIe bus-utilization parameters for best performance.</div><div class='ctx'>  * Check and optionally adjust them to maximize our throughput.</div><div class='ctx'>  */</div><div class='del'>-static int qib_pcie_caps;</div><div class='add'>+static int qib_pcie_caps = 0x51;</div><div class='ctx'> module_param_named(pcie_caps, qib_pcie_caps, int, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(pcie_caps, "Max PCIe tuning: Payload (4lsb), ReadReq (D4..7)");</div><div class='add'>+MODULE_PARM_DESC(pcie_caps, "Max PCIe tuning: Payload (0..3), ReadReq (4..7)");</div><div class='ctx'> </div><div class='ctx'> static int qib_tune_pcie_caps(struct qib_devdata *dd)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/infiniband/hw/qib/qib_qsfp.h b/drivers/infiniband/hw/qib/qib_qsfp.h<br/>index 46002a9417c0..91908f533a2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_qsfp.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_qsfp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_qsfp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/qib/qib_qsfp.h</a></div><div class='hunk'>@@ -177,7 +177,7 @@ struct qib_qsfp_data {</div><div class='ctx'> 	struct qib_pportdata *ppd;</div><div class='ctx'> 	struct work_struct work;</div><div class='ctx'> 	struct qib_qsfp_cache cache;</div><div class='del'>-	u64 t_insert;</div><div class='add'>+	unsigned long t_insert;</div><div class='ctx'> 	u8 modpresent;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/qib/qib_sd7220.c b/drivers/infiniband/hw/qib/qib_sd7220.c<br/>index de1a4b2f33c0..ac065dd6b693 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_sd7220.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_sd7220.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_sd7220.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/qib/qib_sd7220.c</a></div><div class='hunk'>@@ -300,7 +300,7 @@ bail:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qib_sd_trimdone_monitor(struct qib_devdata *dd,</div><div class='del'>-       const char *where)</div><div class='add'>+	const char *where)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, chn, baduns;</div><div class='ctx'> 	u64 val;</div><div class='head'>diff --git a/drivers/infiniband/hw/qib/qib_sysfs.c b/drivers/infiniband/hw/qib/qib_sysfs.c<br/>index 78fbd56879d4..dae51604cfcd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_sysfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/qib/qib_sysfs.c</a></div><div class='hunk'>@@ -150,7 +150,7 @@ static ssize_t show_status(struct qib_pportdata *ppd, char *buf)</div><div class='ctx'>  * For userland compatibility, these offsets must remain fixed.</div><div class='ctx'>  * They are strings for QIB_STATUS_*</div><div class='ctx'>  */</div><div class='del'>-static const char *qib_status_str[] = {</div><div class='add'>+static const char * const qib_status_str[] = {</div><div class='ctx'> 	"Initted",</div><div class='ctx'> 	"",</div><div class='ctx'> 	"",</div><div class='head'>diff --git a/drivers/infiniband/hw/qib/qib_verbs.c b/drivers/infiniband/hw/qib/qib_verbs.c<br/>index a894762da462..7b6c3bffa9d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_verbs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/hw/qib/qib_verbs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/qib/qib_verbs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/hw/qib/qib_verbs.c</a></div><div class='hunk'>@@ -913,8 +913,8 @@ static void copy_io(u32 __iomem *piobuf, struct qib_sge_state *ss,</div><div class='ctx'> 		__raw_writel(last, piobuf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct qib_verbs_txreq *get_txreq(struct qib_ibdev *dev,</div><div class='del'>-					 struct qib_qp *qp, int *retp)</div><div class='add'>+static noinline struct qib_verbs_txreq *__get_txreq(struct qib_ibdev *dev,</div><div class='add'>+					   struct qib_qp *qp)</div><div class='ctx'> {</div><div class='ctx'> 	struct qib_verbs_txreq *tx;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -926,8 +926,9 @@ static struct qib_verbs_txreq *get_txreq(struct qib_ibdev *dev,</div><div class='ctx'> 		struct list_head *l = dev-&gt;txreq_free.next;</div><div class='ctx'> </div><div class='ctx'> 		list_del(l);</div><div class='add'>+		spin_unlock(&amp;dev-&gt;pending_lock);</div><div class='add'>+		spin_unlock_irqrestore(&amp;qp-&gt;s_lock, flags);</div><div class='ctx'> 		tx = list_entry(l, struct qib_verbs_txreq, txreq.list);</div><div class='del'>-		*retp = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (ib_qib_state_ops[qp-&gt;state] &amp; QIB_PROCESS_RECV_OK &amp;&amp;</div><div class='ctx'> 		    list_empty(&amp;qp-&gt;iowait)) {</div><div class='hunk'>@@ -935,14 +936,33 @@ static struct qib_verbs_txreq *get_txreq(struct qib_ibdev *dev,</div><div class='ctx'> 			qp-&gt;s_flags |= QIB_S_WAIT_TX;</div><div class='ctx'> 			list_add_tail(&amp;qp-&gt;iowait, &amp;dev-&gt;txwait);</div><div class='ctx'> 		}</div><div class='del'>-		tx = NULL;</div><div class='ctx'> 		qp-&gt;s_flags &amp;= ~QIB_S_BUSY;</div><div class='del'>-		*retp = -EBUSY;</div><div class='add'>+		spin_unlock(&amp;dev-&gt;pending_lock);</div><div class='add'>+		spin_unlock_irqrestore(&amp;qp-&gt;s_lock, flags);</div><div class='add'>+		tx = ERR_PTR(-EBUSY);</div><div class='ctx'> 	}</div><div class='add'>+	return tx;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;dev-&gt;pending_lock);</div><div class='del'>-	spin_unlock_irqrestore(&amp;qp-&gt;s_lock, flags);</div><div class='add'>+static inline struct qib_verbs_txreq *get_txreq(struct qib_ibdev *dev,</div><div class='add'>+					 struct qib_qp *qp)</div><div class='add'>+{</div><div class='add'>+	struct qib_verbs_txreq *tx;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;dev-&gt;pending_lock, flags);</div><div class='add'>+	/* assume the list non empty */</div><div class='add'>+	if (likely(!list_empty(&amp;dev-&gt;txreq_free))) {</div><div class='add'>+		struct list_head *l = dev-&gt;txreq_free.next;</div><div class='add'>+</div><div class='add'>+		list_del(l);</div><div class='add'>+		spin_unlock_irqrestore(&amp;dev-&gt;pending_lock, flags);</div><div class='add'>+		tx = list_entry(l, struct qib_verbs_txreq, txreq.list);</div><div class='add'>+	} else {</div><div class='add'>+		/* call slow path to get the extra lock */</div><div class='add'>+		spin_unlock_irqrestore(&amp;dev-&gt;pending_lock, flags);</div><div class='add'>+		tx =  __get_txreq(dev, qp);</div><div class='add'>+	}</div><div class='ctx'> 	return tx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1122,9 +1142,9 @@ static int qib_verbs_send_dma(struct qib_qp *qp, struct qib_ib_header *hdr,</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tx = get_txreq(dev, qp, &amp;ret);</div><div class='del'>-	if (!tx)</div><div class='del'>-		goto bail;</div><div class='add'>+	tx = get_txreq(dev, qp);</div><div class='add'>+	if (IS_ERR(tx))</div><div class='add'>+		goto bail_tx;</div><div class='ctx'> </div><div class='ctx'> 	control = dd-&gt;f_setpbc_control(ppd, plen, qp-&gt;s_srate,</div><div class='ctx'> 				       be16_to_cpu(hdr-&gt;lrh[0]) &gt;&gt; 12);</div><div class='hunk'>@@ -1195,6 +1215,9 @@ unaligned:</div><div class='ctx'> 	ibp-&gt;n_unaligned++;</div><div class='ctx'> bail:</div><div class='ctx'> 	return ret;</div><div class='add'>+bail_tx:</div><div class='add'>+	ret = PTR_ERR(tx);</div><div class='add'>+	goto bail;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c<br/>index 83695b48b010..3514ca05deea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/ulp/ipoib/ipoib_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/ulp/ipoib/ipoib_main.c</a></div><div class='hunk'>@@ -171,7 +171,7 @@ static int ipoib_stop(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 ipoib_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static netdev_features_t ipoib_fix_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipoib_dev_priv *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -556,15 +556,13 @@ static int path_rec_start(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called with rcu_read_lock */</div><div class='del'>-static void neigh_add_path(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+static void neigh_add_path(struct sk_buff *skb, struct neighbour *n, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipoib_dev_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct ipoib_path *path;</div><div class='ctx'> 	struct ipoib_neigh *neigh;</div><div class='del'>-	struct neighbour *n;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	n = dst_get_neighbour(skb_dst(skb));</div><div class='ctx'> 	neigh = ipoib_neigh_alloc(n, skb-&gt;dev);</div><div class='ctx'> 	if (!neigh) {</div><div class='ctx'> 		++dev-&gt;stats.tx_dropped;</div><div class='hunk'>@@ -638,16 +636,13 @@ err_drop:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called with rcu_read_lock */</div><div class='del'>-static void ipoib_path_lookup(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+static void ipoib_path_lookup(struct sk_buff *skb, struct neighbour *n, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipoib_dev_priv *priv = netdev_priv(skb-&gt;dev);</div><div class='del'>-	struct dst_entry *dst = skb_dst(skb);</div><div class='del'>-	struct neighbour *n;</div><div class='ctx'> </div><div class='ctx'> 	/* Look up path record for unicasts */</div><div class='del'>-	n = dst_get_neighbour(dst);</div><div class='ctx'> 	if (n-&gt;ha[4] != 0xff) {</div><div class='del'>-		neigh_add_path(skb, dev);</div><div class='add'>+		neigh_add_path(skb, n, dev);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -723,12 +718,17 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	if (likely(skb_dst(skb)))</div><div class='del'>-		n = dst_get_neighbour(skb_dst(skb));</div><div class='del'>-</div><div class='add'>+	if (likely(skb_dst(skb))) {</div><div class='add'>+		n = dst_get_neighbour_noref(skb_dst(skb));</div><div class='add'>+		if (!n) {</div><div class='add'>+			++dev-&gt;stats.tx_dropped;</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	if (likely(n)) {</div><div class='ctx'> 		if (unlikely(!*to_ipoib_neigh(n))) {</div><div class='del'>-			ipoib_path_lookup(skb, dev);</div><div class='add'>+			ipoib_path_lookup(skb, n, dev);</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -751,7 +751,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			list_del(&amp;neigh-&gt;list);</div><div class='ctx'> 			ipoib_neigh_free(dev, neigh);</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-			ipoib_path_lookup(skb, dev);</div><div class='add'>+			ipoib_path_lookup(skb, n, dev);</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -841,7 +841,7 @@ static int ipoib_hard_header(struct sk_buff *skb,</div><div class='ctx'> 	dst = skb_dst(skb);</div><div class='ctx'> 	n = NULL;</div><div class='ctx'> 	if (dst)</div><div class='del'>-		n = dst_get_neighbour_raw(dst);</div><div class='add'>+		n = dst_get_neighbour_noref_raw(dst);</div><div class='ctx'> 	if ((!dst || !n) &amp;&amp; daddr) {</div><div class='ctx'> 		struct ipoib_pseudoheader *phdr =</div><div class='ctx'> 			(struct ipoib_pseudoheader *) skb_push(skb, sizeof *phdr);</div><div class='hunk'>@@ -1222,6 +1222,8 @@ static struct net_device *ipoib_add_port(const char *format,</div><div class='ctx'> 	priv-&gt;dev-&gt;mtu  = IPOIB_UD_MTU(priv-&gt;max_ib_mtu);</div><div class='ctx'> 	priv-&gt;mcast_mtu  = priv-&gt;admin_mtu = priv-&gt;dev-&gt;mtu;</div><div class='ctx'> </div><div class='add'>+	priv-&gt;dev-&gt;neigh_priv_len = sizeof(struct ipoib_neigh);</div><div class='add'>+</div><div class='ctx'> 	result = ib_query_pkey(hca, port, 0, &amp;priv-&gt;pkey);</div><div class='ctx'> 	if (result) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: ib_query_pkey port %d failed (ret = %d)\n",</div><div class='head'>diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c<br/>index 873bff97e69e..f7ff9dd66cda 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_multicast.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/ulp/ipoib/ipoib_multicast.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_multicast.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/ulp/ipoib/ipoib_multicast.c</a></div><div class='hunk'>@@ -269,7 +269,7 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast,</div><div class='ctx'> </div><div class='ctx'> 		skb-&gt;dev = dev;</div><div class='ctx'> 		if (dst)</div><div class='del'>-			n = dst_get_neighbour_raw(dst);</div><div class='add'>+			n = dst_get_neighbour_noref_raw(dst);</div><div class='ctx'> 		if (!dst || !n) {</div><div class='ctx'> 			/* put pseudoheader back on for next time */</div><div class='ctx'> 			skb_push(skb, sizeof (struct ipoib_pseudoheader));</div><div class='hunk'>@@ -728,7 +728,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='ctx'> 		if (dst)</div><div class='del'>-			n = dst_get_neighbour(dst);</div><div class='add'>+			n = dst_get_neighbour_noref(dst);</div><div class='ctx'> 		if (n &amp;&amp; !*to_ipoib_neigh(n)) {</div><div class='ctx'> 			struct ipoib_neigh *neigh = ipoib_neigh_alloc(n,</div><div class='ctx'> 								      skb-&gt;dev);</div><div class='head'>diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c<br/>index 7e7373a700e6..9a43cb07f294 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/iser/iscsi_iser.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/infiniband/ulp/iser/iscsi_iser.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/iser/iscsi_iser.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/ulp/iser/iscsi_iser.c</a></div><div class='hunk'>@@ -638,7 +638,7 @@ iscsi_iser_ep_disconnect(struct iscsi_endpoint *ep)</div><div class='ctx'> 	iser_conn_terminate(ib_conn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static mode_t iser_attr_is_visible(int param_type, int param)</div><div class='add'>+static umode_t iser_attr_is_visible(int param_type, int param)</div><div class='ctx'> {</div><div class='ctx'> 	switch (param_type) {</div><div class='ctx'> 	case ISCSI_HOST_PARAM:</div><div class='head'>diff --git a/drivers/infiniband/ulp/srpt/Kconfig b/drivers/infiniband/ulp/srpt/Kconfig<br/>new file mode 100644<br/>index 000000000000..31ee83d528d9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/srpt/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/ulp/srpt/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+config INFINIBAND_SRPT</div><div class='add'>+	tristate "InfiniBand SCSI RDMA Protocol target support"</div><div class='add'>+	depends on INFINIBAND &amp;&amp; TARGET_CORE</div><div class='add'>+	---help---</div><div class='add'>+</div><div class='add'>+	  Support for the SCSI RDMA Protocol (SRP) Target driver. The</div><div class='add'>+	  SRP protocol is a protocol that allows an initiator to access</div><div class='add'>+	  a block storage device on another host (target) over a network</div><div class='add'>+	  that supports the RDMA protocol. Currently the RDMA protocol is</div><div class='add'>+	  supported by InfiniBand and by iWarp network hardware. More</div><div class='add'>+	  information about the SRP protocol can be found on the website</div><div class='add'>+	  of the INCITS T10 technical committee (http://www.t10.org/).</div><div class='head'>diff --git a/drivers/infiniband/ulp/srpt/Makefile b/drivers/infiniband/ulp/srpt/Makefile<br/>new file mode 100644<br/>index 000000000000..e3ee4bdfffa5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/srpt/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/ulp/srpt/Makefile</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+ccflags-y			:= -Idrivers/target</div><div class='add'>+obj-$(CONFIG_INFINIBAND_SRPT)	+= ib_srpt.o</div><div class='head'>diff --git a/drivers/infiniband/ulp/srpt/ib_dm_mad.h b/drivers/infiniband/ulp/srpt/ib_dm_mad.h<br/>new file mode 100644<br/>index 000000000000..fb1de1f6f297<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/srpt/ib_dm_mad.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/ulp/srpt/ib_dm_mad.h</a></div><div class='hunk'>@@ -0,0 +1,139 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2006 - 2009 Mellanox Technology Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the</div><div class='add'>+ * OpenIB.org BSD license below:</div><div class='add'>+ *</div><div class='add'>+ *     Redistribution and use in source and binary forms, with or</div><div class='add'>+ *     without modification, are permitted provided that the following</div><div class='add'>+ *     conditions are met:</div><div class='add'>+ *</div><div class='add'>+ *      - Redistributions of source code must retain the above</div><div class='add'>+ *        copyright notice, this list of conditions and the following</div><div class='add'>+ *        disclaimer.</div><div class='add'>+ *</div><div class='add'>+ *      - Redistributions in binary form must reproduce the above</div><div class='add'>+ *        copyright notice, this list of conditions and the following</div><div class='add'>+ *        disclaimer in the documentation and/or other materials</div><div class='add'>+ *        provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef IB_DM_MAD_H</div><div class='add'>+#define IB_DM_MAD_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;rdma/ib_mad.h&gt;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	/*</div><div class='add'>+	 * See also section 13.4.7 Status Field, table 115 MAD Common Status</div><div class='add'>+	 * Field Bit Values and also section 16.3.1.1 Status Field in the</div><div class='add'>+	 * InfiniBand Architecture Specification.</div><div class='add'>+	 */</div><div class='add'>+	DM_MAD_STATUS_UNSUP_METHOD = 0x0008,</div><div class='add'>+	DM_MAD_STATUS_UNSUP_METHOD_ATTR = 0x000c,</div><div class='add'>+	DM_MAD_STATUS_INVALID_FIELD = 0x001c,</div><div class='add'>+	DM_MAD_STATUS_NO_IOC = 0x0100,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * See also the Device Management chapter, section 16.3.3 Attributes,</div><div class='add'>+	 * table 279 Device Management Attributes in the InfiniBand</div><div class='add'>+	 * Architecture Specification.</div><div class='add'>+	 */</div><div class='add'>+	DM_ATTR_CLASS_PORT_INFO = 0x01,</div><div class='add'>+	DM_ATTR_IOU_INFO = 0x10,</div><div class='add'>+	DM_ATTR_IOC_PROFILE = 0x11,</div><div class='add'>+	DM_ATTR_SVC_ENTRIES = 0x12</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ib_dm_hdr {</div><div class='add'>+	u8 reserved[28];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Structure of management datagram sent by the SRP target implementation.</div><div class='add'>+ * Contains a management datagram header, reliable multi-packet transaction</div><div class='add'>+ * protocol (RMPP) header and ib_dm_hdr. Notes:</div><div class='add'>+ * - The SRP target implementation does not use RMPP or ib_dm_hdr when sending</div><div class='add'>+ *   management datagrams.</div><div class='add'>+ * - The header size must be exactly 64 bytes (IB_MGMT_DEVICE_HDR), since this</div><div class='add'>+ *   is the header size that is passed to ib_create_send_mad() in ib_srpt.c.</div><div class='add'>+ * - The maximum supported size for a management datagram when not using RMPP</div><div class='add'>+ *   is 256 bytes -- 64 bytes header and 192 (IB_MGMT_DEVICE_DATA) bytes data.</div><div class='add'>+ */</div><div class='add'>+struct ib_dm_mad {</div><div class='add'>+	struct ib_mad_hdr mad_hdr;</div><div class='add'>+	struct ib_rmpp_hdr rmpp_hdr;</div><div class='add'>+	struct ib_dm_hdr dm_hdr;</div><div class='add'>+	u8 data[IB_MGMT_DEVICE_DATA];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IOUnitInfo as defined in section 16.3.3.3 IOUnitInfo of the InfiniBand</div><div class='add'>+ * Architecture Specification.</div><div class='add'>+ */</div><div class='add'>+struct ib_dm_iou_info {</div><div class='add'>+	__be16 change_id;</div><div class='add'>+	u8 max_controllers;</div><div class='add'>+	u8 op_rom;</div><div class='add'>+	u8 controller_list[128];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IOControllerprofile as defined in section 16.3.3.4 IOControllerProfile of</div><div class='add'>+ * the InfiniBand Architecture Specification.</div><div class='add'>+ */</div><div class='add'>+struct ib_dm_ioc_profile {</div><div class='add'>+	__be64 guid;</div><div class='add'>+	__be32 vendor_id;</div><div class='add'>+	__be32 device_id;</div><div class='add'>+	__be16 device_version;</div><div class='add'>+	__be16 reserved1;</div><div class='add'>+	__be32 subsys_vendor_id;</div><div class='add'>+	__be32 subsys_device_id;</div><div class='add'>+	__be16 io_class;</div><div class='add'>+	__be16 io_subclass;</div><div class='add'>+	__be16 protocol;</div><div class='add'>+	__be16 protocol_version;</div><div class='add'>+	__be16 service_conn;</div><div class='add'>+	__be16 initiators_supported;</div><div class='add'>+	__be16 send_queue_depth;</div><div class='add'>+	u8 reserved2;</div><div class='add'>+	u8 rdma_read_depth;</div><div class='add'>+	__be32 send_size;</div><div class='add'>+	__be32 rdma_size;</div><div class='add'>+	u8 op_cap_mask;</div><div class='add'>+	u8 svc_cap_mask;</div><div class='add'>+	u8 num_svc_entries;</div><div class='add'>+	u8 reserved3[9];</div><div class='add'>+	u8 id_string[64];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ib_dm_svc_entry {</div><div class='add'>+	u8 name[40];</div><div class='add'>+	__be64 id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * See also section 16.3.3.5 ServiceEntries in the InfiniBand Architecture</div><div class='add'>+ * Specification. See also section B.7, table B.8 in the T10 SRP r16a document.</div><div class='add'>+ */</div><div class='add'>+struct ib_dm_svc_entries {</div><div class='add'>+	struct ib_dm_svc_entry service_entries[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c<br/>new file mode 100644<br/>index 000000000000..cd5d05e22a77<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/srpt/ib_srpt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/ulp/srpt/ib_srpt.c</a></div><div class='hunk'>@@ -0,0 +1,4073 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2006 - 2009 Mellanox Technology Inc.  All rights reserved.</div><div class='add'>+ * Copyright (C) 2008 - 2011 Bart Van Assche &lt;bvanassche@acm.org&gt;.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the</div><div class='add'>+ * OpenIB.org BSD license below:</div><div class='add'>+ *</div><div class='add'>+ *     Redistribution and use in source and binary forms, with or</div><div class='add'>+ *     without modification, are permitted provided that the following</div><div class='add'>+ *     conditions are met:</div><div class='add'>+ *</div><div class='add'>+ *      - Redistributions of source code must retain the above</div><div class='add'>+ *        copyright notice, this list of conditions and the following</div><div class='add'>+ *        disclaimer.</div><div class='add'>+ *</div><div class='add'>+ *      - Redistributions in binary form must reproduce the above</div><div class='add'>+ *        copyright notice, this list of conditions and the following</div><div class='add'>+ *        disclaimer in the documentation and/or other materials</div><div class='add'>+ *        provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</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/slab.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_tcq.h&gt;</div><div class='add'>+#include &lt;target/configfs_macros.h&gt;</div><div class='add'>+#include &lt;target/target_core_base.h&gt;</div><div class='add'>+#include &lt;target/target_core_fabric_configfs.h&gt;</div><div class='add'>+#include &lt;target/target_core_fabric.h&gt;</div><div class='add'>+#include &lt;target/target_core_configfs.h&gt;</div><div class='add'>+#include "ib_srpt.h"</div><div class='add'>+</div><div class='add'>+/* Name of this kernel module. */</div><div class='add'>+#define DRV_NAME		"ib_srpt"</div><div class='add'>+#define DRV_VERSION		"2.0.0"</div><div class='add'>+#define DRV_RELDATE		"2011-02-14"</div><div class='add'>+</div><div class='add'>+#define SRPT_ID_STRING	"Linux SRP target"</div><div class='add'>+</div><div class='add'>+#undef pr_fmt</div><div class='add'>+#define pr_fmt(fmt) DRV_NAME " " fmt</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Vu Pham and Bart Van Assche");</div><div class='add'>+MODULE_DESCRIPTION("InfiniBand SCSI RDMA Protocol target "</div><div class='add'>+		   "v" DRV_VERSION " (" DRV_RELDATE ")");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Global Variables</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static u64 srpt_service_guid;</div><div class='add'>+static spinlock_t srpt_dev_lock;       /* Protects srpt_dev_list. */</div><div class='add'>+static struct list_head srpt_dev_list; /* List of srpt_device structures. */</div><div class='add'>+</div><div class='add'>+static unsigned srp_max_req_size = DEFAULT_MAX_REQ_SIZE;</div><div class='add'>+module_param(srp_max_req_size, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(srp_max_req_size,</div><div class='add'>+		 "Maximum size of SRP request messages in bytes.");</div><div class='add'>+</div><div class='add'>+static int srpt_srq_size = DEFAULT_SRPT_SRQ_SIZE;</div><div class='add'>+module_param(srpt_srq_size, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(srpt_srq_size,</div><div class='add'>+		 "Shared receive queue (SRQ) size.");</div><div class='add'>+</div><div class='add'>+static int srpt_get_u64_x(char *buffer, struct kernel_param *kp)</div><div class='add'>+{</div><div class='add'>+	return sprintf(buffer, "0x%016llx", *(u64 *)kp-&gt;arg);</div><div class='add'>+}</div><div class='add'>+module_param_call(srpt_service_guid, NULL, srpt_get_u64_x, &amp;srpt_service_guid,</div><div class='add'>+		  0444);</div><div class='add'>+MODULE_PARM_DESC(srpt_service_guid,</div><div class='add'>+		 "Using this value for ioc_guid, id_ext, and cm_listen_id"</div><div class='add'>+		 " instead of using the node_guid of the first HCA.");</div><div class='add'>+</div><div class='add'>+static struct ib_client srpt_client;</div><div class='add'>+static struct target_fabric_configfs *srpt_target;</div><div class='add'>+static void srpt_release_channel(struct srpt_rdma_ch *ch);</div><div class='add'>+static int srpt_queue_status(struct se_cmd *cmd);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * opposite_dma_dir() - Swap DMA_TO_DEVICE and DMA_FROM_DEVICE.</div><div class='add'>+ */</div><div class='add'>+static inline</div><div class='add'>+enum dma_data_direction opposite_dma_dir(enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	switch (dir) {</div><div class='add'>+	case DMA_TO_DEVICE:	return DMA_FROM_DEVICE;</div><div class='add'>+	case DMA_FROM_DEVICE:	return DMA_TO_DEVICE;</div><div class='add'>+	default:		return dir;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_sdev_name() - Return the name associated with the HCA.</div><div class='add'>+ *</div><div class='add'>+ * Examples are ib0, ib1, ...</div><div class='add'>+ */</div><div class='add'>+static inline const char *srpt_sdev_name(struct srpt_device *sdev)</div><div class='add'>+{</div><div class='add'>+	return sdev-&gt;device-&gt;name;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum rdma_ch_state srpt_get_ch_state(struct srpt_rdma_ch *ch)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	enum rdma_ch_state state;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ch-&gt;spinlock, flags);</div><div class='add'>+	state = ch-&gt;state;</div><div class='add'>+	spin_unlock_irqrestore(&amp;ch-&gt;spinlock, flags);</div><div class='add'>+	return state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum rdma_ch_state</div><div class='add'>+srpt_set_ch_state(struct srpt_rdma_ch *ch, enum rdma_ch_state new_state)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	enum rdma_ch_state prev;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ch-&gt;spinlock, flags);</div><div class='add'>+	prev = ch-&gt;state;</div><div class='add'>+	ch-&gt;state = new_state;</div><div class='add'>+	spin_unlock_irqrestore(&amp;ch-&gt;spinlock, flags);</div><div class='add'>+	return prev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_test_and_set_ch_state() - Test and set the channel state.</div><div class='add'>+ *</div><div class='add'>+ * Returns true if and only if the channel state has been set to the new state.</div><div class='add'>+ */</div><div class='add'>+static bool</div><div class='add'>+srpt_test_and_set_ch_state(struct srpt_rdma_ch *ch, enum rdma_ch_state old,</div><div class='add'>+			   enum rdma_ch_state new)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	enum rdma_ch_state prev;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ch-&gt;spinlock, flags);</div><div class='add'>+	prev = ch-&gt;state;</div><div class='add'>+	if (prev == old)</div><div class='add'>+		ch-&gt;state = new;</div><div class='add'>+	spin_unlock_irqrestore(&amp;ch-&gt;spinlock, flags);</div><div class='add'>+	return prev == old;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_event_handler() - Asynchronous IB event callback function.</div><div class='add'>+ *</div><div class='add'>+ * Callback function called by the InfiniBand core when an asynchronous IB</div><div class='add'>+ * event occurs. This callback may occur in interrupt context. See also</div><div class='add'>+ * section 11.5.2, Set Asynchronous Event Handler in the InfiniBand</div><div class='add'>+ * Architecture Specification.</div><div class='add'>+ */</div><div class='add'>+static void srpt_event_handler(struct ib_event_handler *handler,</div><div class='add'>+			       struct ib_event *event)</div><div class='add'>+{</div><div class='add'>+	struct srpt_device *sdev;</div><div class='add'>+	struct srpt_port *sport;</div><div class='add'>+</div><div class='add'>+	sdev = ib_get_client_data(event-&gt;device, &amp;srpt_client);</div><div class='add'>+	if (!sdev || sdev-&gt;device != event-&gt;device)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pr_debug("ASYNC event= %d on device= %s\n", event-&gt;event,</div><div class='add'>+		 srpt_sdev_name(sdev));</div><div class='add'>+</div><div class='add'>+	switch (event-&gt;event) {</div><div class='add'>+	case IB_EVENT_PORT_ERR:</div><div class='add'>+		if (event-&gt;element.port_num &lt;= sdev-&gt;device-&gt;phys_port_cnt) {</div><div class='add'>+			sport = &amp;sdev-&gt;port[event-&gt;element.port_num - 1];</div><div class='add'>+			sport-&gt;lid = 0;</div><div class='add'>+			sport-&gt;sm_lid = 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case IB_EVENT_PORT_ACTIVE:</div><div class='add'>+	case IB_EVENT_LID_CHANGE:</div><div class='add'>+	case IB_EVENT_PKEY_CHANGE:</div><div class='add'>+	case IB_EVENT_SM_CHANGE:</div><div class='add'>+	case IB_EVENT_CLIENT_REREGISTER:</div><div class='add'>+		/* Refresh port data asynchronously. */</div><div class='add'>+		if (event-&gt;element.port_num &lt;= sdev-&gt;device-&gt;phys_port_cnt) {</div><div class='add'>+			sport = &amp;sdev-&gt;port[event-&gt;element.port_num - 1];</div><div class='add'>+			if (!sport-&gt;lid &amp;&amp; !sport-&gt;sm_lid)</div><div class='add'>+				schedule_work(&amp;sport-&gt;work);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "received unrecognized IB event %d\n",</div><div class='add'>+		       event-&gt;event);</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'>+ * srpt_srq_event() - SRQ event callback function.</div><div class='add'>+ */</div><div class='add'>+static void srpt_srq_event(struct ib_event *event, void *ctx)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO "SRQ event %d\n", event-&gt;event);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_qp_event() - QP event callback function.</div><div class='add'>+ */</div><div class='add'>+static void srpt_qp_event(struct ib_event *event, struct srpt_rdma_ch *ch)</div><div class='add'>+{</div><div class='add'>+	pr_debug("QP event %d on cm_id=%p sess_name=%s state=%d\n",</div><div class='add'>+		 event-&gt;event, ch-&gt;cm_id, ch-&gt;sess_name, srpt_get_ch_state(ch));</div><div class='add'>+</div><div class='add'>+	switch (event-&gt;event) {</div><div class='add'>+	case IB_EVENT_COMM_EST:</div><div class='add'>+		ib_cm_notify(ch-&gt;cm_id, event-&gt;event);</div><div class='add'>+		break;</div><div class='add'>+	case IB_EVENT_QP_LAST_WQE_REACHED:</div><div class='add'>+		if (srpt_test_and_set_ch_state(ch, CH_DRAINING,</div><div class='add'>+					       CH_RELEASING))</div><div class='add'>+			srpt_release_channel(ch);</div><div class='add'>+		else</div><div class='add'>+			pr_debug("%s: state %d - ignored LAST_WQE.\n",</div><div class='add'>+				 ch-&gt;sess_name, srpt_get_ch_state(ch));</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "received unrecognized IB QP event %d\n",</div><div class='add'>+		       event-&gt;event);</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'>+ * srpt_set_ioc() - Helper function for initializing an IOUnitInfo structure.</div><div class='add'>+ *</div><div class='add'>+ * @slot: one-based slot number.</div><div class='add'>+ * @value: four-bit value.</div><div class='add'>+ *</div><div class='add'>+ * Copies the lowest four bits of value in element slot of the array of four</div><div class='add'>+ * bit elements called c_list (controller list). The index slot is one-based.</div><div class='add'>+ */</div><div class='add'>+static void srpt_set_ioc(u8 *c_list, u32 slot, u8 value)</div><div class='add'>+{</div><div class='add'>+	u16 id;</div><div class='add'>+	u8 tmp;</div><div class='add'>+</div><div class='add'>+	id = (slot - 1) / 2;</div><div class='add'>+	if (slot &amp; 0x1) {</div><div class='add'>+		tmp = c_list[id] &amp; 0xf;</div><div class='add'>+		c_list[id] = (value &lt;&lt; 4) | tmp;</div><div class='add'>+	} else {</div><div class='add'>+		tmp = c_list[id] &amp; 0xf0;</div><div class='add'>+		c_list[id] = (value &amp; 0xf) | tmp;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_get_class_port_info() - Copy ClassPortInfo to a management datagram.</div><div class='add'>+ *</div><div class='add'>+ * See also section 16.3.3.1 ClassPortInfo in the InfiniBand Architecture</div><div class='add'>+ * Specification.</div><div class='add'>+ */</div><div class='add'>+static void srpt_get_class_port_info(struct ib_dm_mad *mad)</div><div class='add'>+{</div><div class='add'>+	struct ib_class_port_info *cif;</div><div class='add'>+</div><div class='add'>+	cif = (struct ib_class_port_info *)mad-&gt;data;</div><div class='add'>+	memset(cif, 0, sizeof *cif);</div><div class='add'>+	cif-&gt;base_version = 1;</div><div class='add'>+	cif-&gt;class_version = 1;</div><div class='add'>+	cif-&gt;resp_time_value = 20;</div><div class='add'>+</div><div class='add'>+	mad-&gt;mad_hdr.status = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_get_iou() - Write IOUnitInfo to a management datagram.</div><div class='add'>+ *</div><div class='add'>+ * See also section 16.3.3.3 IOUnitInfo in the InfiniBand Architecture</div><div class='add'>+ * Specification. See also section B.7, table B.6 in the SRP r16a document.</div><div class='add'>+ */</div><div class='add'>+static void srpt_get_iou(struct ib_dm_mad *mad)</div><div class='add'>+{</div><div class='add'>+	struct ib_dm_iou_info *ioui;</div><div class='add'>+	u8 slot;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ioui = (struct ib_dm_iou_info *)mad-&gt;data;</div><div class='add'>+	ioui-&gt;change_id = __constant_cpu_to_be16(1);</div><div class='add'>+	ioui-&gt;max_controllers = 16;</div><div class='add'>+</div><div class='add'>+	/* set present for slot 1 and empty for the rest */</div><div class='add'>+	srpt_set_ioc(ioui-&gt;controller_list, 1, 1);</div><div class='add'>+	for (i = 1, slot = 2; i &lt; 16; i++, slot++)</div><div class='add'>+		srpt_set_ioc(ioui-&gt;controller_list, slot, 0);</div><div class='add'>+</div><div class='add'>+	mad-&gt;mad_hdr.status = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_get_ioc() - Write IOControllerprofile to a management datagram.</div><div class='add'>+ *</div><div class='add'>+ * See also section 16.3.3.4 IOControllerProfile in the InfiniBand</div><div class='add'>+ * Architecture Specification. See also section B.7, table B.7 in the SRP</div><div class='add'>+ * r16a document.</div><div class='add'>+ */</div><div class='add'>+static void srpt_get_ioc(struct srpt_port *sport, u32 slot,</div><div class='add'>+			 struct ib_dm_mad *mad)</div><div class='add'>+{</div><div class='add'>+	struct srpt_device *sdev = sport-&gt;sdev;</div><div class='add'>+	struct ib_dm_ioc_profile *iocp;</div><div class='add'>+</div><div class='add'>+	iocp = (struct ib_dm_ioc_profile *)mad-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (!slot || slot &gt; 16) {</div><div class='add'>+		mad-&gt;mad_hdr.status</div><div class='add'>+			= __constant_cpu_to_be16(DM_MAD_STATUS_INVALID_FIELD);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (slot &gt; 2) {</div><div class='add'>+		mad-&gt;mad_hdr.status</div><div class='add'>+			= __constant_cpu_to_be16(DM_MAD_STATUS_NO_IOC);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(iocp, 0, sizeof *iocp);</div><div class='add'>+	strcpy(iocp-&gt;id_string, SRPT_ID_STRING);</div><div class='add'>+	iocp-&gt;guid = cpu_to_be64(srpt_service_guid);</div><div class='add'>+	iocp-&gt;vendor_id = cpu_to_be32(sdev-&gt;dev_attr.vendor_id);</div><div class='add'>+	iocp-&gt;device_id = cpu_to_be32(sdev-&gt;dev_attr.vendor_part_id);</div><div class='add'>+	iocp-&gt;device_version = cpu_to_be16(sdev-&gt;dev_attr.hw_ver);</div><div class='add'>+	iocp-&gt;subsys_vendor_id = cpu_to_be32(sdev-&gt;dev_attr.vendor_id);</div><div class='add'>+	iocp-&gt;subsys_device_id = 0x0;</div><div class='add'>+	iocp-&gt;io_class = __constant_cpu_to_be16(SRP_REV16A_IB_IO_CLASS);</div><div class='add'>+	iocp-&gt;io_subclass = __constant_cpu_to_be16(SRP_IO_SUBCLASS);</div><div class='add'>+	iocp-&gt;protocol = __constant_cpu_to_be16(SRP_PROTOCOL);</div><div class='add'>+	iocp-&gt;protocol_version = __constant_cpu_to_be16(SRP_PROTOCOL_VERSION);</div><div class='add'>+	iocp-&gt;send_queue_depth = cpu_to_be16(sdev-&gt;srq_size);</div><div class='add'>+	iocp-&gt;rdma_read_depth = 4;</div><div class='add'>+	iocp-&gt;send_size = cpu_to_be32(srp_max_req_size);</div><div class='add'>+	iocp-&gt;rdma_size = cpu_to_be32(min(sport-&gt;port_attrib.srp_max_rdma_size,</div><div class='add'>+					  1U &lt;&lt; 24));</div><div class='add'>+	iocp-&gt;num_svc_entries = 1;</div><div class='add'>+	iocp-&gt;op_cap_mask = SRP_SEND_TO_IOC | SRP_SEND_FROM_IOC |</div><div class='add'>+		SRP_RDMA_READ_FROM_IOC | SRP_RDMA_WRITE_FROM_IOC;</div><div class='add'>+</div><div class='add'>+	mad-&gt;mad_hdr.status = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_get_svc_entries() - Write ServiceEntries to a management datagram.</div><div class='add'>+ *</div><div class='add'>+ * See also section 16.3.3.5 ServiceEntries in the InfiniBand Architecture</div><div class='add'>+ * Specification. See also section B.7, table B.8 in the SRP r16a document.</div><div class='add'>+ */</div><div class='add'>+static void srpt_get_svc_entries(u64 ioc_guid,</div><div class='add'>+				 u16 slot, u8 hi, u8 lo, struct ib_dm_mad *mad)</div><div class='add'>+{</div><div class='add'>+	struct ib_dm_svc_entries *svc_entries;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!ioc_guid);</div><div class='add'>+</div><div class='add'>+	if (!slot || slot &gt; 16) {</div><div class='add'>+		mad-&gt;mad_hdr.status</div><div class='add'>+			= __constant_cpu_to_be16(DM_MAD_STATUS_INVALID_FIELD);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (slot &gt; 2 || lo &gt; hi || hi &gt; 1) {</div><div class='add'>+		mad-&gt;mad_hdr.status</div><div class='add'>+			= __constant_cpu_to_be16(DM_MAD_STATUS_NO_IOC);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	svc_entries = (struct ib_dm_svc_entries *)mad-&gt;data;</div><div class='add'>+	memset(svc_entries, 0, sizeof *svc_entries);</div><div class='add'>+	svc_entries-&gt;service_entries[0].id = cpu_to_be64(ioc_guid);</div><div class='add'>+	snprintf(svc_entries-&gt;service_entries[0].name,</div><div class='add'>+		 sizeof(svc_entries-&gt;service_entries[0].name),</div><div class='add'>+		 "%s%016llx",</div><div class='add'>+		 SRP_SERVICE_NAME_PREFIX,</div><div class='add'>+		 ioc_guid);</div><div class='add'>+</div><div class='add'>+	mad-&gt;mad_hdr.status = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_mgmt_method_get() - Process a received management datagram.</div><div class='add'>+ * @sp:      source port through which the MAD has been received.</div><div class='add'>+ * @rq_mad:  received MAD.</div><div class='add'>+ * @rsp_mad: response MAD.</div><div class='add'>+ */</div><div class='add'>+static void srpt_mgmt_method_get(struct srpt_port *sp, struct ib_mad *rq_mad,</div><div class='add'>+				 struct ib_dm_mad *rsp_mad)</div><div class='add'>+{</div><div class='add'>+	u16 attr_id;</div><div class='add'>+	u32 slot;</div><div class='add'>+	u8 hi, lo;</div><div class='add'>+</div><div class='add'>+	attr_id = be16_to_cpu(rq_mad-&gt;mad_hdr.attr_id);</div><div class='add'>+	switch (attr_id) {</div><div class='add'>+	case DM_ATTR_CLASS_PORT_INFO:</div><div class='add'>+		srpt_get_class_port_info(rsp_mad);</div><div class='add'>+		break;</div><div class='add'>+	case DM_ATTR_IOU_INFO:</div><div class='add'>+		srpt_get_iou(rsp_mad);</div><div class='add'>+		break;</div><div class='add'>+	case DM_ATTR_IOC_PROFILE:</div><div class='add'>+		slot = be32_to_cpu(rq_mad-&gt;mad_hdr.attr_mod);</div><div class='add'>+		srpt_get_ioc(sp, slot, rsp_mad);</div><div class='add'>+		break;</div><div class='add'>+	case DM_ATTR_SVC_ENTRIES:</div><div class='add'>+		slot = be32_to_cpu(rq_mad-&gt;mad_hdr.attr_mod);</div><div class='add'>+		hi = (u8) ((slot &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+		lo = (u8) (slot &amp; 0xff);</div><div class='add'>+		slot = (u16) ((slot &gt;&gt; 16) &amp; 0xffff);</div><div class='add'>+		srpt_get_svc_entries(srpt_service_guid,</div><div class='add'>+				     slot, hi, lo, rsp_mad);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		rsp_mad-&gt;mad_hdr.status =</div><div class='add'>+		    __constant_cpu_to_be16(DM_MAD_STATUS_UNSUP_METHOD_ATTR);</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'>+ * srpt_mad_send_handler() - Post MAD-send callback function.</div><div class='add'>+ */</div><div class='add'>+static void srpt_mad_send_handler(struct ib_mad_agent *mad_agent,</div><div class='add'>+				  struct ib_mad_send_wc *mad_wc)</div><div class='add'>+{</div><div class='add'>+	ib_destroy_ah(mad_wc-&gt;send_buf-&gt;ah);</div><div class='add'>+	ib_free_send_mad(mad_wc-&gt;send_buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_mad_recv_handler() - MAD reception callback function.</div><div class='add'>+ */</div><div class='add'>+static void srpt_mad_recv_handler(struct ib_mad_agent *mad_agent,</div><div class='add'>+				  struct ib_mad_recv_wc *mad_wc)</div><div class='add'>+{</div><div class='add'>+	struct srpt_port *sport = (struct srpt_port *)mad_agent-&gt;context;</div><div class='add'>+	struct ib_ah *ah;</div><div class='add'>+	struct ib_mad_send_buf *rsp;</div><div class='add'>+	struct ib_dm_mad *dm_mad;</div><div class='add'>+</div><div class='add'>+	if (!mad_wc || !mad_wc-&gt;recv_buf.mad)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ah = ib_create_ah_from_wc(mad_agent-&gt;qp-&gt;pd, mad_wc-&gt;wc,</div><div class='add'>+				  mad_wc-&gt;recv_buf.grh, mad_agent-&gt;port_num);</div><div class='add'>+	if (IS_ERR(ah))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(offsetof(struct ib_dm_mad, data) != IB_MGMT_DEVICE_HDR);</div><div class='add'>+</div><div class='add'>+	rsp = ib_create_send_mad(mad_agent, mad_wc-&gt;wc-&gt;src_qp,</div><div class='add'>+				 mad_wc-&gt;wc-&gt;pkey_index, 0,</div><div class='add'>+				 IB_MGMT_DEVICE_HDR, IB_MGMT_DEVICE_DATA,</div><div class='add'>+				 GFP_KERNEL);</div><div class='add'>+	if (IS_ERR(rsp))</div><div class='add'>+		goto err_rsp;</div><div class='add'>+</div><div class='add'>+	rsp-&gt;ah = ah;</div><div class='add'>+</div><div class='add'>+	dm_mad = rsp-&gt;mad;</div><div class='add'>+	memcpy(dm_mad, mad_wc-&gt;recv_buf.mad, sizeof *dm_mad);</div><div class='add'>+	dm_mad-&gt;mad_hdr.method = IB_MGMT_METHOD_GET_RESP;</div><div class='add'>+	dm_mad-&gt;mad_hdr.status = 0;</div><div class='add'>+</div><div class='add'>+	switch (mad_wc-&gt;recv_buf.mad-&gt;mad_hdr.method) {</div><div class='add'>+	case IB_MGMT_METHOD_GET:</div><div class='add'>+		srpt_mgmt_method_get(sport, mad_wc-&gt;recv_buf.mad, dm_mad);</div><div class='add'>+		break;</div><div class='add'>+	case IB_MGMT_METHOD_SET:</div><div class='add'>+		dm_mad-&gt;mad_hdr.status =</div><div class='add'>+		    __constant_cpu_to_be16(DM_MAD_STATUS_UNSUP_METHOD_ATTR);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dm_mad-&gt;mad_hdr.status =</div><div class='add'>+		    __constant_cpu_to_be16(DM_MAD_STATUS_UNSUP_METHOD);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ib_post_send_mad(rsp, NULL)) {</div><div class='add'>+		ib_free_recv_mad(mad_wc);</div><div class='add'>+		/* will destroy_ah &amp; free_send_mad in send completion */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ib_free_send_mad(rsp);</div><div class='add'>+</div><div class='add'>+err_rsp:</div><div class='add'>+	ib_destroy_ah(ah);</div><div class='add'>+err:</div><div class='add'>+	ib_free_recv_mad(mad_wc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_refresh_port() - Configure a HCA port.</div><div class='add'>+ *</div><div class='add'>+ * Enable InfiniBand management datagram processing, update the cached sm_lid,</div><div class='add'>+ * lid and gid values, and register a callback function for processing MADs</div><div class='add'>+ * on the specified port.</div><div class='add'>+ *</div><div class='add'>+ * Note: It is safe to call this function more than once for the same port.</div><div class='add'>+ */</div><div class='add'>+static int srpt_refresh_port(struct srpt_port *sport)</div><div class='add'>+{</div><div class='add'>+	struct ib_mad_reg_req reg_req;</div><div class='add'>+	struct ib_port_modify port_modify;</div><div class='add'>+	struct ib_port_attr port_attr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(&amp;port_modify, 0, sizeof port_modify);</div><div class='add'>+	port_modify.set_port_cap_mask = IB_PORT_DEVICE_MGMT_SUP;</div><div class='add'>+	port_modify.clr_port_cap_mask = 0;</div><div class='add'>+</div><div class='add'>+	ret = ib_modify_port(sport-&gt;sdev-&gt;device, sport-&gt;port, 0, &amp;port_modify);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_mod_port;</div><div class='add'>+</div><div class='add'>+	ret = ib_query_port(sport-&gt;sdev-&gt;device, sport-&gt;port, &amp;port_attr);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_query_port;</div><div class='add'>+</div><div class='add'>+	sport-&gt;sm_lid = port_attr.sm_lid;</div><div class='add'>+	sport-&gt;lid = port_attr.lid;</div><div class='add'>+</div><div class='add'>+	ret = ib_query_gid(sport-&gt;sdev-&gt;device, sport-&gt;port, 0, &amp;sport-&gt;gid);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_query_port;</div><div class='add'>+</div><div class='add'>+	if (!sport-&gt;mad_agent) {</div><div class='add'>+		memset(&amp;reg_req, 0, sizeof reg_req);</div><div class='add'>+		reg_req.mgmt_class = IB_MGMT_CLASS_DEVICE_MGMT;</div><div class='add'>+		reg_req.mgmt_class_version = IB_MGMT_BASE_VERSION;</div><div class='add'>+		set_bit(IB_MGMT_METHOD_GET, reg_req.method_mask);</div><div class='add'>+		set_bit(IB_MGMT_METHOD_SET, reg_req.method_mask);</div><div class='add'>+</div><div class='add'>+		sport-&gt;mad_agent = ib_register_mad_agent(sport-&gt;sdev-&gt;device,</div><div class='add'>+							 sport-&gt;port,</div><div class='add'>+							 IB_QPT_GSI,</div><div class='add'>+							 &amp;reg_req, 0,</div><div class='add'>+							 srpt_mad_send_handler,</div><div class='add'>+							 srpt_mad_recv_handler,</div><div class='add'>+							 sport);</div><div class='add'>+		if (IS_ERR(sport-&gt;mad_agent)) {</div><div class='add'>+			ret = PTR_ERR(sport-&gt;mad_agent);</div><div class='add'>+			sport-&gt;mad_agent = NULL;</div><div class='add'>+			goto err_query_port;</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_query_port:</div><div class='add'>+</div><div class='add'>+	port_modify.set_port_cap_mask = 0;</div><div class='add'>+	port_modify.clr_port_cap_mask = IB_PORT_DEVICE_MGMT_SUP;</div><div class='add'>+	ib_modify_port(sport-&gt;sdev-&gt;device, sport-&gt;port, 0, &amp;port_modify);</div><div class='add'>+</div><div class='add'>+err_mod_port:</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'>+ * srpt_unregister_mad_agent() - Unregister MAD callback functions.</div><div class='add'>+ *</div><div class='add'>+ * Note: It is safe to call this function more than once for the same device.</div><div class='add'>+ */</div><div class='add'>+static void srpt_unregister_mad_agent(struct srpt_device *sdev)</div><div class='add'>+{</div><div class='add'>+	struct ib_port_modify port_modify = {</div><div class='add'>+		.clr_port_cap_mask = IB_PORT_DEVICE_MGMT_SUP,</div><div class='add'>+	};</div><div class='add'>+	struct srpt_port *sport;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt;= sdev-&gt;device-&gt;phys_port_cnt; i++) {</div><div class='add'>+		sport = &amp;sdev-&gt;port[i - 1];</div><div class='add'>+		WARN_ON(sport-&gt;port != i);</div><div class='add'>+		if (ib_modify_port(sdev-&gt;device, i, 0, &amp;port_modify) &lt; 0)</div><div class='add'>+			printk(KERN_ERR "disabling MAD processing failed.\n");</div><div class='add'>+		if (sport-&gt;mad_agent) {</div><div class='add'>+			ib_unregister_mad_agent(sport-&gt;mad_agent);</div><div class='add'>+			sport-&gt;mad_agent = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_alloc_ioctx() - Allocate an SRPT I/O context structure.</div><div class='add'>+ */</div><div class='add'>+static struct srpt_ioctx *srpt_alloc_ioctx(struct srpt_device *sdev,</div><div class='add'>+					   int ioctx_size, int dma_size,</div><div class='add'>+					   enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	struct srpt_ioctx *ioctx;</div><div class='add'>+</div><div class='add'>+	ioctx = kmalloc(ioctx_size, GFP_KERNEL);</div><div class='add'>+	if (!ioctx)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ioctx-&gt;buf = kmalloc(dma_size, GFP_KERNEL);</div><div class='add'>+	if (!ioctx-&gt;buf)</div><div class='add'>+		goto err_free_ioctx;</div><div class='add'>+</div><div class='add'>+	ioctx-&gt;dma = ib_dma_map_single(sdev-&gt;device, ioctx-&gt;buf, dma_size, dir);</div><div class='add'>+	if (ib_dma_mapping_error(sdev-&gt;device, ioctx-&gt;dma))</div><div class='add'>+		goto err_free_buf;</div><div class='add'>+</div><div class='add'>+	return ioctx;</div><div class='add'>+</div><div class='add'>+err_free_buf:</div><div class='add'>+	kfree(ioctx-&gt;buf);</div><div class='add'>+err_free_ioctx:</div><div class='add'>+	kfree(ioctx);</div><div class='add'>+err:</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_free_ioctx() - Free an SRPT I/O context structure.</div><div class='add'>+ */</div><div class='add'>+static void srpt_free_ioctx(struct srpt_device *sdev, struct srpt_ioctx *ioctx,</div><div class='add'>+			    int dma_size, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	if (!ioctx)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ib_dma_unmap_single(sdev-&gt;device, ioctx-&gt;dma, dma_size, dir);</div><div class='add'>+	kfree(ioctx-&gt;buf);</div><div class='add'>+	kfree(ioctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_alloc_ioctx_ring() - Allocate a ring of SRPT I/O context structures.</div><div class='add'>+ * @sdev:       Device to allocate the I/O context ring for.</div><div class='add'>+ * @ring_size:  Number of elements in the I/O context ring.</div><div class='add'>+ * @ioctx_size: I/O context size.</div><div class='add'>+ * @dma_size:   DMA buffer size.</div><div class='add'>+ * @dir:        DMA data direction.</div><div class='add'>+ */</div><div class='add'>+static struct srpt_ioctx **srpt_alloc_ioctx_ring(struct srpt_device *sdev,</div><div class='add'>+				int ring_size, int ioctx_size,</div><div class='add'>+				int dma_size, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	struct srpt_ioctx **ring;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	WARN_ON(ioctx_size != sizeof(struct srpt_recv_ioctx)</div><div class='add'>+		&amp;&amp; ioctx_size != sizeof(struct srpt_send_ioctx));</div><div class='add'>+</div><div class='add'>+	ring = kmalloc(ring_size * sizeof(ring[0]), GFP_KERNEL);</div><div class='add'>+	if (!ring)</div><div class='add'>+		goto out;</div><div class='add'>+	for (i = 0; i &lt; ring_size; ++i) {</div><div class='add'>+		ring[i] = srpt_alloc_ioctx(sdev, ioctx_size, dma_size, dir);</div><div class='add'>+		if (!ring[i])</div><div class='add'>+			goto err;</div><div class='add'>+		ring[i]-&gt;index = i;</div><div class='add'>+	}</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	while (--i &gt;= 0)</div><div class='add'>+		srpt_free_ioctx(sdev, ring[i], dma_size, dir);</div><div class='add'>+	kfree(ring);</div><div class='add'>+out:</div><div class='add'>+	return ring;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_free_ioctx_ring() - Free the ring of SRPT I/O context structures.</div><div class='add'>+ */</div><div class='add'>+static void srpt_free_ioctx_ring(struct srpt_ioctx **ioctx_ring,</div><div class='add'>+				 struct srpt_device *sdev, int ring_size,</div><div class='add'>+				 int dma_size, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ring_size; ++i)</div><div class='add'>+		srpt_free_ioctx(sdev, ioctx_ring[i], dma_size, dir);</div><div class='add'>+	kfree(ioctx_ring);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_get_cmd_state() - Get the state of a SCSI command.</div><div class='add'>+ */</div><div class='add'>+static enum srpt_command_state srpt_get_cmd_state(struct srpt_send_ioctx *ioctx)</div><div class='add'>+{</div><div class='add'>+	enum srpt_command_state state;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!ioctx);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ioctx-&gt;spinlock, flags);</div><div class='add'>+	state = ioctx-&gt;state;</div><div class='add'>+	spin_unlock_irqrestore(&amp;ioctx-&gt;spinlock, flags);</div><div class='add'>+	return state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_set_cmd_state() - Set the state of a SCSI command.</div><div class='add'>+ *</div><div class='add'>+ * Does not modify the state of aborted commands. Returns the previous command</div><div class='add'>+ * state.</div><div class='add'>+ */</div><div class='add'>+static enum srpt_command_state srpt_set_cmd_state(struct srpt_send_ioctx *ioctx,</div><div class='add'>+						  enum srpt_command_state new)</div><div class='add'>+{</div><div class='add'>+	enum srpt_command_state previous;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!ioctx);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ioctx-&gt;spinlock, flags);</div><div class='add'>+	previous = ioctx-&gt;state;</div><div class='add'>+	if (previous != SRPT_STATE_DONE)</div><div class='add'>+		ioctx-&gt;state = new;</div><div class='add'>+	spin_unlock_irqrestore(&amp;ioctx-&gt;spinlock, flags);</div><div class='add'>+</div><div class='add'>+	return previous;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_test_and_set_cmd_state() - Test and set the state of a command.</div><div class='add'>+ *</div><div class='add'>+ * Returns true if and only if the previous command state was equal to 'old'.</div><div class='add'>+ */</div><div class='add'>+static bool srpt_test_and_set_cmd_state(struct srpt_send_ioctx *ioctx,</div><div class='add'>+					enum srpt_command_state old,</div><div class='add'>+					enum srpt_command_state new)</div><div class='add'>+{</div><div class='add'>+	enum srpt_command_state previous;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!ioctx);</div><div class='add'>+	WARN_ON(old == SRPT_STATE_DONE);</div><div class='add'>+	WARN_ON(new == SRPT_STATE_NEW);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ioctx-&gt;spinlock, flags);</div><div class='add'>+	previous = ioctx-&gt;state;</div><div class='add'>+	if (previous == old)</div><div class='add'>+		ioctx-&gt;state = new;</div><div class='add'>+	spin_unlock_irqrestore(&amp;ioctx-&gt;spinlock, flags);</div><div class='add'>+	return previous == old;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_post_recv() - Post an IB receive request.</div><div class='add'>+ */</div><div class='add'>+static int srpt_post_recv(struct srpt_device *sdev,</div><div class='add'>+			  struct srpt_recv_ioctx *ioctx)</div><div class='add'>+{</div><div class='add'>+	struct ib_sge list;</div><div class='add'>+	struct ib_recv_wr wr, *bad_wr;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!sdev);</div><div class='add'>+	wr.wr_id = encode_wr_id(SRPT_RECV, ioctx-&gt;ioctx.index);</div><div class='add'>+</div><div class='add'>+	list.addr = ioctx-&gt;ioctx.dma;</div><div class='add'>+	list.length = srp_max_req_size;</div><div class='add'>+	list.lkey = sdev-&gt;mr-&gt;lkey;</div><div class='add'>+</div><div class='add'>+	wr.next = NULL;</div><div class='add'>+	wr.sg_list = &amp;list;</div><div class='add'>+	wr.num_sge = 1;</div><div class='add'>+</div><div class='add'>+	return ib_post_srq_recv(sdev-&gt;srq, &amp;wr, &amp;bad_wr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_post_send() - Post an IB send request.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero upon success and a non-zero value upon failure.</div><div class='add'>+ */</div><div class='add'>+static int srpt_post_send(struct srpt_rdma_ch *ch,</div><div class='add'>+			  struct srpt_send_ioctx *ioctx, int len)</div><div class='add'>+{</div><div class='add'>+	struct ib_sge list;</div><div class='add'>+	struct ib_send_wr wr, *bad_wr;</div><div class='add'>+	struct srpt_device *sdev = ch-&gt;sport-&gt;sdev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;ch-&gt;req_lim);</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	if (unlikely(atomic_dec_return(&amp;ch-&gt;sq_wr_avail) &lt; 0)) {</div><div class='add'>+		printk(KERN_WARNING "IB send queue full (needed 1)\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ib_dma_sync_single_for_device(sdev-&gt;device, ioctx-&gt;ioctx.dma, len,</div><div class='add'>+				      DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	list.addr = ioctx-&gt;ioctx.dma;</div><div class='add'>+	list.length = len;</div><div class='add'>+	list.lkey = sdev-&gt;mr-&gt;lkey;</div><div class='add'>+</div><div class='add'>+	wr.next = NULL;</div><div class='add'>+	wr.wr_id = encode_wr_id(SRPT_SEND, ioctx-&gt;ioctx.index);</div><div class='add'>+	wr.sg_list = &amp;list;</div><div class='add'>+	wr.num_sge = 1;</div><div class='add'>+	wr.opcode = IB_WR_SEND;</div><div class='add'>+	wr.send_flags = IB_SEND_SIGNALED;</div><div class='add'>+</div><div class='add'>+	ret = ib_post_send(ch-&gt;qp, &amp;wr, &amp;bad_wr);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		atomic_inc(&amp;ch-&gt;sq_wr_avail);</div><div class='add'>+		atomic_dec(&amp;ch-&gt;req_lim);</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'>+ * srpt_get_desc_tbl() - Parse the data descriptors of an SRP_CMD request.</div><div class='add'>+ * @ioctx: Pointer to the I/O context associated with the request.</div><div class='add'>+ * @srp_cmd: Pointer to the SRP_CMD request data.</div><div class='add'>+ * @dir: Pointer to the variable to which the transfer direction will be</div><div class='add'>+ *   written.</div><div class='add'>+ * @data_len: Pointer to the variable to which the total data length of all</div><div class='add'>+ *   descriptors in the SRP_CMD request will be written.</div><div class='add'>+ *</div><div class='add'>+ * This function initializes ioctx-&gt;nrbuf and ioctx-&gt;r_bufs.</div><div class='add'>+ *</div><div class='add'>+ * Returns -EINVAL when the SRP_CMD request contains inconsistent descriptors;</div><div class='add'>+ * -ENOMEM when memory allocation fails and zero upon success.</div><div class='add'>+ */</div><div class='add'>+static int srpt_get_desc_tbl(struct srpt_send_ioctx *ioctx,</div><div class='add'>+			     struct srp_cmd *srp_cmd,</div><div class='add'>+			     enum dma_data_direction *dir, u64 *data_len)</div><div class='add'>+{</div><div class='add'>+	struct srp_indirect_buf *idb;</div><div class='add'>+	struct srp_direct_buf *db;</div><div class='add'>+	unsigned add_cdb_offset;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The pointer computations below will only be compiled correctly</div><div class='add'>+	 * if srp_cmd::add_data is declared as s8*, u8*, s8[] or u8[], so check</div><div class='add'>+	 * whether srp_cmd::add_data has been declared as a byte pointer.</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(!__same_type(srp_cmd-&gt;add_data[0], (s8)0)</div><div class='add'>+		     &amp;&amp; !__same_type(srp_cmd-&gt;add_data[0], (u8)0));</div><div class='add'>+</div><div class='add'>+	BUG_ON(!dir);</div><div class='add'>+	BUG_ON(!data_len);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	*data_len = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The lower four bits of the buffer format field contain the DATA-IN</div><div class='add'>+	 * buffer descriptor format, and the highest four bits contain the</div><div class='add'>+	 * DATA-OUT buffer descriptor format.</div><div class='add'>+	 */</div><div class='add'>+	*dir = DMA_NONE;</div><div class='add'>+	if (srp_cmd-&gt;buf_fmt &amp; 0xf)</div><div class='add'>+		/* DATA-IN: transfer data from target to initiator (read). */</div><div class='add'>+		*dir = DMA_FROM_DEVICE;</div><div class='add'>+	else if (srp_cmd-&gt;buf_fmt &gt;&gt; 4)</div><div class='add'>+		/* DATA-OUT: transfer data from initiator to target (write). */</div><div class='add'>+		*dir = DMA_TO_DEVICE;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * According to the SRP spec, the lower two bits of the 'ADDITIONAL</div><div class='add'>+	 * CDB LENGTH' field are reserved and the size in bytes of this field</div><div class='add'>+	 * is four times the value specified in bits 3..7. Hence the "&amp; ~3".</div><div class='add'>+	 */</div><div class='add'>+	add_cdb_offset = srp_cmd-&gt;add_cdb_len &amp; ~3;</div><div class='add'>+	if (((srp_cmd-&gt;buf_fmt &amp; 0xf) == SRP_DATA_DESC_DIRECT) ||</div><div class='add'>+	    ((srp_cmd-&gt;buf_fmt &gt;&gt; 4) == SRP_DATA_DESC_DIRECT)) {</div><div class='add'>+		ioctx-&gt;n_rbuf = 1;</div><div class='add'>+		ioctx-&gt;rbufs = &amp;ioctx-&gt;single_rbuf;</div><div class='add'>+</div><div class='add'>+		db = (struct srp_direct_buf *)(srp_cmd-&gt;add_data</div><div class='add'>+					       + add_cdb_offset);</div><div class='add'>+		memcpy(ioctx-&gt;rbufs, db, sizeof *db);</div><div class='add'>+		*data_len = be32_to_cpu(db-&gt;len);</div><div class='add'>+	} else if (((srp_cmd-&gt;buf_fmt &amp; 0xf) == SRP_DATA_DESC_INDIRECT) ||</div><div class='add'>+		   ((srp_cmd-&gt;buf_fmt &gt;&gt; 4) == SRP_DATA_DESC_INDIRECT)) {</div><div class='add'>+		idb = (struct srp_indirect_buf *)(srp_cmd-&gt;add_data</div><div class='add'>+						  + add_cdb_offset);</div><div class='add'>+</div><div class='add'>+		ioctx-&gt;n_rbuf = be32_to_cpu(idb-&gt;table_desc.len) / sizeof *db;</div><div class='add'>+</div><div class='add'>+		if (ioctx-&gt;n_rbuf &gt;</div><div class='add'>+		    (srp_cmd-&gt;data_out_desc_cnt + srp_cmd-&gt;data_in_desc_cnt)) {</div><div class='add'>+			printk(KERN_ERR "received unsupported SRP_CMD request"</div><div class='add'>+			       " type (%u out + %u in != %u / %zu)\n",</div><div class='add'>+			       srp_cmd-&gt;data_out_desc_cnt,</div><div class='add'>+			       srp_cmd-&gt;data_in_desc_cnt,</div><div class='add'>+			       be32_to_cpu(idb-&gt;table_desc.len),</div><div class='add'>+			       sizeof(*db));</div><div class='add'>+			ioctx-&gt;n_rbuf = 0;</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ioctx-&gt;n_rbuf == 1)</div><div class='add'>+			ioctx-&gt;rbufs = &amp;ioctx-&gt;single_rbuf;</div><div class='add'>+		else {</div><div class='add'>+			ioctx-&gt;rbufs =</div><div class='add'>+				kmalloc(ioctx-&gt;n_rbuf * sizeof *db, GFP_ATOMIC);</div><div class='add'>+			if (!ioctx-&gt;rbufs) {</div><div class='add'>+				ioctx-&gt;n_rbuf = 0;</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		db = idb-&gt;desc_list;</div><div class='add'>+		memcpy(ioctx-&gt;rbufs, db, ioctx-&gt;n_rbuf * sizeof *db);</div><div class='add'>+		*data_len = be32_to_cpu(idb-&gt;len);</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'>+ * srpt_init_ch_qp() - Initialize queue pair attributes.</div><div class='add'>+ *</div><div class='add'>+ * Initialized the attributes of queue pair 'qp' by allowing local write,</div><div class='add'>+ * remote read and remote write. Also transitions 'qp' to state IB_QPS_INIT.</div><div class='add'>+ */</div><div class='add'>+static int srpt_init_ch_qp(struct srpt_rdma_ch *ch, struct ib_qp *qp)</div><div class='add'>+{</div><div class='add'>+	struct ib_qp_attr *attr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	attr = kzalloc(sizeof *attr, GFP_KERNEL);</div><div class='add'>+	if (!attr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	attr-&gt;qp_state = IB_QPS_INIT;</div><div class='add'>+	attr-&gt;qp_access_flags = IB_ACCESS_LOCAL_WRITE | IB_ACCESS_REMOTE_READ |</div><div class='add'>+	    IB_ACCESS_REMOTE_WRITE;</div><div class='add'>+	attr-&gt;port_num = ch-&gt;sport-&gt;port;</div><div class='add'>+	attr-&gt;pkey_index = 0;</div><div class='add'>+</div><div class='add'>+	ret = ib_modify_qp(qp, attr,</div><div class='add'>+			   IB_QP_STATE | IB_QP_ACCESS_FLAGS | IB_QP_PORT |</div><div class='add'>+			   IB_QP_PKEY_INDEX);</div><div class='add'>+</div><div class='add'>+	kfree(attr);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_ch_qp_rtr() - Change the state of a channel to 'ready to receive' (RTR).</div><div class='add'>+ * @ch: channel of the queue pair.</div><div class='add'>+ * @qp: queue pair to change the state of.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero upon success and a negative value upon failure.</div><div class='add'>+ *</div><div class='add'>+ * Note: currently a struct ib_qp_attr takes 136 bytes on a 64-bit system.</div><div class='add'>+ * If this structure ever becomes larger, it might be necessary to allocate</div><div class='add'>+ * it dynamically instead of on the stack.</div><div class='add'>+ */</div><div class='add'>+static int srpt_ch_qp_rtr(struct srpt_rdma_ch *ch, struct ib_qp *qp)</div><div class='add'>+{</div><div class='add'>+	struct ib_qp_attr qp_attr;</div><div class='add'>+	int attr_mask;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	qp_attr.qp_state = IB_QPS_RTR;</div><div class='add'>+	ret = ib_cm_init_qp_attr(ch-&gt;cm_id, &amp;qp_attr, &amp;attr_mask);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	qp_attr.max_dest_rd_atomic = 4;</div><div class='add'>+</div><div class='add'>+	ret = ib_modify_qp(qp, &amp;qp_attr, attr_mask);</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'>+ * srpt_ch_qp_rts() - Change the state of a channel to 'ready to send' (RTS).</div><div class='add'>+ * @ch: channel of the queue pair.</div><div class='add'>+ * @qp: queue pair to change the state of.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero upon success and a negative value upon failure.</div><div class='add'>+ *</div><div class='add'>+ * Note: currently a struct ib_qp_attr takes 136 bytes on a 64-bit system.</div><div class='add'>+ * If this structure ever becomes larger, it might be necessary to allocate</div><div class='add'>+ * it dynamically instead of on the stack.</div><div class='add'>+ */</div><div class='add'>+static int srpt_ch_qp_rts(struct srpt_rdma_ch *ch, struct ib_qp *qp)</div><div class='add'>+{</div><div class='add'>+	struct ib_qp_attr qp_attr;</div><div class='add'>+	int attr_mask;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	qp_attr.qp_state = IB_QPS_RTS;</div><div class='add'>+	ret = ib_cm_init_qp_attr(ch-&gt;cm_id, &amp;qp_attr, &amp;attr_mask);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	qp_attr.max_rd_atomic = 4;</div><div class='add'>+</div><div class='add'>+	ret = ib_modify_qp(qp, &amp;qp_attr, attr_mask);</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'>+ * srpt_ch_qp_err() - Set the channel queue pair state to 'error'.</div><div class='add'>+ */</div><div class='add'>+static int srpt_ch_qp_err(struct srpt_rdma_ch *ch)</div><div class='add'>+{</div><div class='add'>+	struct ib_qp_attr qp_attr;</div><div class='add'>+</div><div class='add'>+	qp_attr.qp_state = IB_QPS_ERR;</div><div class='add'>+	return ib_modify_qp(ch-&gt;qp, &amp;qp_attr, IB_QP_STATE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_unmap_sg_to_ib_sge() - Unmap an IB SGE list.</div><div class='add'>+ */</div><div class='add'>+static void srpt_unmap_sg_to_ib_sge(struct srpt_rdma_ch *ch,</div><div class='add'>+				    struct srpt_send_ioctx *ioctx)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	enum dma_data_direction dir;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!ch);</div><div class='add'>+	BUG_ON(!ioctx);</div><div class='add'>+	BUG_ON(ioctx-&gt;n_rdma &amp;&amp; !ioctx-&gt;rdma_ius);</div><div class='add'>+</div><div class='add'>+	while (ioctx-&gt;n_rdma)</div><div class='add'>+		kfree(ioctx-&gt;rdma_ius[--ioctx-&gt;n_rdma].sge);</div><div class='add'>+</div><div class='add'>+	kfree(ioctx-&gt;rdma_ius);</div><div class='add'>+	ioctx-&gt;rdma_ius = NULL;</div><div class='add'>+</div><div class='add'>+	if (ioctx-&gt;mapped_sg_count) {</div><div class='add'>+		sg = ioctx-&gt;sg;</div><div class='add'>+		WARN_ON(!sg);</div><div class='add'>+		dir = ioctx-&gt;cmd.data_direction;</div><div class='add'>+		BUG_ON(dir == DMA_NONE);</div><div class='add'>+		ib_dma_unmap_sg(ch-&gt;sport-&gt;sdev-&gt;device, sg, ioctx-&gt;sg_cnt,</div><div class='add'>+				opposite_dma_dir(dir));</div><div class='add'>+		ioctx-&gt;mapped_sg_count = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_map_sg_to_ib_sge() - Map an SG list to an IB SGE list.</div><div class='add'>+ */</div><div class='add'>+static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch,</div><div class='add'>+				 struct srpt_send_ioctx *ioctx)</div><div class='add'>+{</div><div class='add'>+	struct se_cmd *cmd;</div><div class='add'>+	struct scatterlist *sg, *sg_orig;</div><div class='add'>+	int sg_cnt;</div><div class='add'>+	enum dma_data_direction dir;</div><div class='add'>+	struct rdma_iu *riu;</div><div class='add'>+	struct srp_direct_buf *db;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	struct ib_sge *sge;</div><div class='add'>+	u64 raddr;</div><div class='add'>+	u32 rsize;</div><div class='add'>+	u32 tsize;</div><div class='add'>+	u32 dma_len;</div><div class='add'>+	int count, nrdma;</div><div class='add'>+	int i, j, k;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!ch);</div><div class='add'>+	BUG_ON(!ioctx);</div><div class='add'>+	cmd = &amp;ioctx-&gt;cmd;</div><div class='add'>+	dir = cmd-&gt;data_direction;</div><div class='add'>+	BUG_ON(dir == DMA_NONE);</div><div class='add'>+</div><div class='add'>+	transport_do_task_sg_chain(cmd);</div><div class='add'>+	ioctx-&gt;sg = sg = sg_orig = cmd-&gt;t_tasks_sg_chained;</div><div class='add'>+	ioctx-&gt;sg_cnt = sg_cnt = cmd-&gt;t_tasks_sg_chained_no;</div><div class='add'>+</div><div class='add'>+	count = ib_dma_map_sg(ch-&gt;sport-&gt;sdev-&gt;device, sg, sg_cnt,</div><div class='add'>+			      opposite_dma_dir(dir));</div><div class='add'>+	if (unlikely(!count))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	ioctx-&gt;mapped_sg_count = count;</div><div class='add'>+</div><div class='add'>+	if (ioctx-&gt;rdma_ius &amp;&amp; ioctx-&gt;n_rdma_ius)</div><div class='add'>+		nrdma = ioctx-&gt;n_rdma_ius;</div><div class='add'>+	else {</div><div class='add'>+		nrdma = (count + SRPT_DEF_SG_PER_WQE - 1) / SRPT_DEF_SG_PER_WQE</div><div class='add'>+			+ ioctx-&gt;n_rbuf;</div><div class='add'>+</div><div class='add'>+		ioctx-&gt;rdma_ius = kzalloc(nrdma * sizeof *riu, GFP_KERNEL);</div><div class='add'>+		if (!ioctx-&gt;rdma_ius)</div><div class='add'>+			goto free_mem;</div><div class='add'>+</div><div class='add'>+		ioctx-&gt;n_rdma_ius = nrdma;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	db = ioctx-&gt;rbufs;</div><div class='add'>+	tsize = cmd-&gt;data_length;</div><div class='add'>+	dma_len = sg_dma_len(&amp;sg[0]);</div><div class='add'>+	riu = ioctx-&gt;rdma_ius;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For each remote desc - calculate the #ib_sge.</div><div class='add'>+	 * If #ib_sge &lt; SRPT_DEF_SG_PER_WQE per rdma operation then</div><div class='add'>+	 *      each remote desc rdma_iu is required a rdma wr;</div><div class='add'>+	 * else</div><div class='add'>+	 *      we need to allocate extra rdma_iu to carry extra #ib_sge in</div><div class='add'>+	 *      another rdma wr</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0, j = 0;</div><div class='add'>+	     j &lt; count &amp;&amp; i &lt; ioctx-&gt;n_rbuf &amp;&amp; tsize &gt; 0; ++i, ++riu, ++db) {</div><div class='add'>+		rsize = be32_to_cpu(db-&gt;len);</div><div class='add'>+		raddr = be64_to_cpu(db-&gt;va);</div><div class='add'>+		riu-&gt;raddr = raddr;</div><div class='add'>+		riu-&gt;rkey = be32_to_cpu(db-&gt;key);</div><div class='add'>+		riu-&gt;sge_cnt = 0;</div><div class='add'>+</div><div class='add'>+		/* calculate how many sge required for this remote_buf */</div><div class='add'>+		while (rsize &gt; 0 &amp;&amp; tsize &gt; 0) {</div><div class='add'>+</div><div class='add'>+			if (rsize &gt;= dma_len) {</div><div class='add'>+				tsize -= dma_len;</div><div class='add'>+				rsize -= dma_len;</div><div class='add'>+				raddr += dma_len;</div><div class='add'>+</div><div class='add'>+				if (tsize &gt; 0) {</div><div class='add'>+					++j;</div><div class='add'>+					if (j &lt; count) {</div><div class='add'>+						sg = sg_next(sg);</div><div class='add'>+						dma_len = sg_dma_len(sg);</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				tsize -= rsize;</div><div class='add'>+				dma_len -= rsize;</div><div class='add'>+				rsize = 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			++riu-&gt;sge_cnt;</div><div class='add'>+</div><div class='add'>+			if (rsize &gt; 0 &amp;&amp; riu-&gt;sge_cnt == SRPT_DEF_SG_PER_WQE) {</div><div class='add'>+				++ioctx-&gt;n_rdma;</div><div class='add'>+				riu-&gt;sge =</div><div class='add'>+				    kmalloc(riu-&gt;sge_cnt * sizeof *riu-&gt;sge,</div><div class='add'>+					    GFP_KERNEL);</div><div class='add'>+				if (!riu-&gt;sge)</div><div class='add'>+					goto free_mem;</div><div class='add'>+</div><div class='add'>+				++riu;</div><div class='add'>+				riu-&gt;sge_cnt = 0;</div><div class='add'>+				riu-&gt;raddr = raddr;</div><div class='add'>+				riu-&gt;rkey = be32_to_cpu(db-&gt;key);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		++ioctx-&gt;n_rdma;</div><div class='add'>+		riu-&gt;sge = kmalloc(riu-&gt;sge_cnt * sizeof *riu-&gt;sge,</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+		if (!riu-&gt;sge)</div><div class='add'>+			goto free_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	db = ioctx-&gt;rbufs;</div><div class='add'>+	tsize = cmd-&gt;data_length;</div><div class='add'>+	riu = ioctx-&gt;rdma_ius;</div><div class='add'>+	sg = sg_orig;</div><div class='add'>+	dma_len = sg_dma_len(&amp;sg[0]);</div><div class='add'>+	dma_addr = sg_dma_address(&amp;sg[0]);</div><div class='add'>+</div><div class='add'>+	/* this second loop is really mapped sg_addres to rdma_iu-&gt;ib_sge */</div><div class='add'>+	for (i = 0, j = 0;</div><div class='add'>+	     j &lt; count &amp;&amp; i &lt; ioctx-&gt;n_rbuf &amp;&amp; tsize &gt; 0; ++i, ++riu, ++db) {</div><div class='add'>+		rsize = be32_to_cpu(db-&gt;len);</div><div class='add'>+		sge = riu-&gt;sge;</div><div class='add'>+		k = 0;</div><div class='add'>+</div><div class='add'>+		while (rsize &gt; 0 &amp;&amp; tsize &gt; 0) {</div><div class='add'>+			sge-&gt;addr = dma_addr;</div><div class='add'>+			sge-&gt;lkey = ch-&gt;sport-&gt;sdev-&gt;mr-&gt;lkey;</div><div class='add'>+</div><div class='add'>+			if (rsize &gt;= dma_len) {</div><div class='add'>+				sge-&gt;length =</div><div class='add'>+					(tsize &lt; dma_len) ? tsize : dma_len;</div><div class='add'>+				tsize -= dma_len;</div><div class='add'>+				rsize -= dma_len;</div><div class='add'>+</div><div class='add'>+				if (tsize &gt; 0) {</div><div class='add'>+					++j;</div><div class='add'>+					if (j &lt; count) {</div><div class='add'>+						sg = sg_next(sg);</div><div class='add'>+						dma_len = sg_dma_len(sg);</div><div class='add'>+						dma_addr = sg_dma_address(sg);</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				sge-&gt;length = (tsize &lt; rsize) ? tsize : rsize;</div><div class='add'>+				tsize -= rsize;</div><div class='add'>+				dma_len -= rsize;</div><div class='add'>+				dma_addr += rsize;</div><div class='add'>+				rsize = 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			++k;</div><div class='add'>+			if (k == riu-&gt;sge_cnt &amp;&amp; rsize &gt; 0 &amp;&amp; tsize &gt; 0) {</div><div class='add'>+				++riu;</div><div class='add'>+				sge = riu-&gt;sge;</div><div class='add'>+				k = 0;</div><div class='add'>+			} else if (rsize &gt; 0 &amp;&amp; tsize &gt; 0)</div><div class='add'>+				++sge;</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'>+free_mem:</div><div class='add'>+	srpt_unmap_sg_to_ib_sge(ch, ioctx);</div><div class='add'>+</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_get_send_ioctx() - Obtain an I/O context for sending to the initiator.</div><div class='add'>+ */</div><div class='add'>+static struct srpt_send_ioctx *srpt_get_send_ioctx(struct srpt_rdma_ch *ch)</div><div class='add'>+{</div><div class='add'>+	struct srpt_send_ioctx *ioctx;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!ch);</div><div class='add'>+</div><div class='add'>+	ioctx = NULL;</div><div class='add'>+	spin_lock_irqsave(&amp;ch-&gt;spinlock, flags);</div><div class='add'>+	if (!list_empty(&amp;ch-&gt;free_list)) {</div><div class='add'>+		ioctx = list_first_entry(&amp;ch-&gt;free_list,</div><div class='add'>+					 struct srpt_send_ioctx, free_list);</div><div class='add'>+		list_del(&amp;ioctx-&gt;free_list);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;ch-&gt;spinlock, flags);</div><div class='add'>+</div><div class='add'>+	if (!ioctx)</div><div class='add'>+		return ioctx;</div><div class='add'>+</div><div class='add'>+	BUG_ON(ioctx-&gt;ch != ch);</div><div class='add'>+	kref_init(&amp;ioctx-&gt;kref);</div><div class='add'>+	spin_lock_init(&amp;ioctx-&gt;spinlock);</div><div class='add'>+	ioctx-&gt;state = SRPT_STATE_NEW;</div><div class='add'>+	ioctx-&gt;n_rbuf = 0;</div><div class='add'>+	ioctx-&gt;rbufs = NULL;</div><div class='add'>+	ioctx-&gt;n_rdma = 0;</div><div class='add'>+	ioctx-&gt;n_rdma_ius = 0;</div><div class='add'>+	ioctx-&gt;rdma_ius = NULL;</div><div class='add'>+	ioctx-&gt;mapped_sg_count = 0;</div><div class='add'>+	init_completion(&amp;ioctx-&gt;tx_done);</div><div class='add'>+	ioctx-&gt;queue_status_only = false;</div><div class='add'>+	/*</div><div class='add'>+	 * transport_init_se_cmd() does not initialize all fields, so do it</div><div class='add'>+	 * here.</div><div class='add'>+	 */</div><div class='add'>+	memset(&amp;ioctx-&gt;cmd, 0, sizeof(ioctx-&gt;cmd));</div><div class='add'>+	memset(&amp;ioctx-&gt;sense_data, 0, sizeof(ioctx-&gt;sense_data));</div><div class='add'>+</div><div class='add'>+	return ioctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_put_send_ioctx() - Free up resources.</div><div class='add'>+ */</div><div class='add'>+static void srpt_put_send_ioctx(struct srpt_send_ioctx *ioctx)</div><div class='add'>+{</div><div class='add'>+	struct srpt_rdma_ch *ch;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!ioctx);</div><div class='add'>+	ch = ioctx-&gt;ch;</div><div class='add'>+	BUG_ON(!ch);</div><div class='add'>+</div><div class='add'>+	WARN_ON(srpt_get_cmd_state(ioctx) != SRPT_STATE_DONE);</div><div class='add'>+</div><div class='add'>+	srpt_unmap_sg_to_ib_sge(ioctx-&gt;ch, ioctx);</div><div class='add'>+	transport_generic_free_cmd(&amp;ioctx-&gt;cmd, 0);</div><div class='add'>+</div><div class='add'>+	if (ioctx-&gt;n_rbuf &gt; 1) {</div><div class='add'>+		kfree(ioctx-&gt;rbufs);</div><div class='add'>+		ioctx-&gt;rbufs = NULL;</div><div class='add'>+		ioctx-&gt;n_rbuf = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ch-&gt;spinlock, flags);</div><div class='add'>+	list_add(&amp;ioctx-&gt;free_list, &amp;ch-&gt;free_list);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ch-&gt;spinlock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void srpt_put_send_ioctx_kref(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	srpt_put_send_ioctx(container_of(kref, struct srpt_send_ioctx, kref));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_abort_cmd() - Abort a SCSI command.</div><div class='add'>+ * @ioctx:   I/O context associated with the SCSI command.</div><div class='add'>+ * @context: Preferred execution context.</div><div class='add'>+ */</div><div class='add'>+static int srpt_abort_cmd(struct srpt_send_ioctx *ioctx)</div><div class='add'>+{</div><div class='add'>+	enum srpt_command_state state;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!ioctx);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the command is in a state where the target core is waiting for</div><div class='add'>+	 * the ib_srpt driver, change the state to the next state. Changing</div><div class='add'>+	 * the state of the command from SRPT_STATE_NEED_DATA to</div><div class='add'>+	 * SRPT_STATE_DATA_IN ensures that srpt_xmit_response() will call this</div><div class='add'>+	 * function a second time.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ioctx-&gt;spinlock, flags);</div><div class='add'>+	state = ioctx-&gt;state;</div><div class='add'>+	switch (state) {</div><div class='add'>+	case SRPT_STATE_NEED_DATA:</div><div class='add'>+		ioctx-&gt;state = SRPT_STATE_DATA_IN;</div><div class='add'>+		break;</div><div class='add'>+	case SRPT_STATE_DATA_IN:</div><div class='add'>+	case SRPT_STATE_CMD_RSP_SENT:</div><div class='add'>+	case SRPT_STATE_MGMT_RSP_SENT:</div><div class='add'>+		ioctx-&gt;state = SRPT_STATE_DONE;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;ioctx-&gt;spinlock, flags);</div><div class='add'>+</div><div class='add'>+	if (state == SRPT_STATE_DONE)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	pr_debug("Aborting cmd with state %d and tag %lld\n", state,</div><div class='add'>+		 ioctx-&gt;tag);</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case SRPT_STATE_NEW:</div><div class='add'>+	case SRPT_STATE_DATA_IN:</div><div class='add'>+	case SRPT_STATE_MGMT:</div><div class='add'>+		/*</div><div class='add'>+		 * Do nothing - defer abort processing until</div><div class='add'>+		 * srpt_queue_response() is invoked.</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON(!transport_check_aborted_status(&amp;ioctx-&gt;cmd, false));</div><div class='add'>+		break;</div><div class='add'>+	case SRPT_STATE_NEED_DATA:</div><div class='add'>+		/* DMA_TO_DEVICE (write) - RDMA read error. */</div><div class='add'>+		atomic_set(&amp;ioctx-&gt;cmd.transport_lun_stop, 1);</div><div class='add'>+		transport_generic_handle_data(&amp;ioctx-&gt;cmd);</div><div class='add'>+		break;</div><div class='add'>+	case SRPT_STATE_CMD_RSP_SENT:</div><div class='add'>+		/*</div><div class='add'>+		 * SRP_RSP sending failed or the SRP_RSP send completion has</div><div class='add'>+		 * not been received in time.</div><div class='add'>+		 */</div><div class='add'>+		srpt_unmap_sg_to_ib_sge(ioctx-&gt;ch, ioctx);</div><div class='add'>+		atomic_set(&amp;ioctx-&gt;cmd.transport_lun_stop, 1);</div><div class='add'>+		kref_put(&amp;ioctx-&gt;kref, srpt_put_send_ioctx_kref);</div><div class='add'>+		break;</div><div class='add'>+	case SRPT_STATE_MGMT_RSP_SENT:</div><div class='add'>+		srpt_set_cmd_state(ioctx, SRPT_STATE_DONE);</div><div class='add'>+		kref_put(&amp;ioctx-&gt;kref, srpt_put_send_ioctx_kref);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON("ERROR: unexpected command state");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_handle_send_err_comp() - Process an IB_WC_SEND error completion.</div><div class='add'>+ */</div><div class='add'>+static void srpt_handle_send_err_comp(struct srpt_rdma_ch *ch, u64 wr_id)</div><div class='add'>+{</div><div class='add'>+	struct srpt_send_ioctx *ioctx;</div><div class='add'>+	enum srpt_command_state state;</div><div class='add'>+	struct se_cmd *cmd;</div><div class='add'>+	u32 index;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;ch-&gt;sq_wr_avail);</div><div class='add'>+</div><div class='add'>+	index = idx_from_wr_id(wr_id);</div><div class='add'>+	ioctx = ch-&gt;ioctx_ring[index];</div><div class='add'>+	state = srpt_get_cmd_state(ioctx);</div><div class='add'>+	cmd = &amp;ioctx-&gt;cmd;</div><div class='add'>+</div><div class='add'>+	WARN_ON(state != SRPT_STATE_CMD_RSP_SENT</div><div class='add'>+		&amp;&amp; state != SRPT_STATE_MGMT_RSP_SENT</div><div class='add'>+		&amp;&amp; state != SRPT_STATE_NEED_DATA</div><div class='add'>+		&amp;&amp; state != SRPT_STATE_DONE);</div><div class='add'>+</div><div class='add'>+	/* If SRP_RSP sending failed, undo the ch-&gt;req_lim change. */</div><div class='add'>+	if (state == SRPT_STATE_CMD_RSP_SENT</div><div class='add'>+	    || state == SRPT_STATE_MGMT_RSP_SENT)</div><div class='add'>+		atomic_dec(&amp;ch-&gt;req_lim);</div><div class='add'>+</div><div class='add'>+	srpt_abort_cmd(ioctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_handle_send_comp() - Process an IB send completion notification.</div><div class='add'>+ */</div><div class='add'>+static void srpt_handle_send_comp(struct srpt_rdma_ch *ch,</div><div class='add'>+				  struct srpt_send_ioctx *ioctx)</div><div class='add'>+{</div><div class='add'>+	enum srpt_command_state state;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;ch-&gt;sq_wr_avail);</div><div class='add'>+</div><div class='add'>+	state = srpt_set_cmd_state(ioctx, SRPT_STATE_DONE);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(state != SRPT_STATE_CMD_RSP_SENT</div><div class='add'>+		    &amp;&amp; state != SRPT_STATE_MGMT_RSP_SENT</div><div class='add'>+		    &amp;&amp; state != SRPT_STATE_DONE))</div><div class='add'>+		pr_debug("state = %d\n", state);</div><div class='add'>+</div><div class='add'>+	if (state != SRPT_STATE_DONE)</div><div class='add'>+		kref_put(&amp;ioctx-&gt;kref, srpt_put_send_ioctx_kref);</div><div class='add'>+	else</div><div class='add'>+		printk(KERN_ERR "IB completion has been received too late for"</div><div class='add'>+		       " wr_id = %u.\n", ioctx-&gt;ioctx.index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_handle_rdma_comp() - Process an IB RDMA completion notification.</div><div class='add'>+ *</div><div class='add'>+ * Note: transport_generic_handle_data() is asynchronous so unmapping the</div><div class='add'>+ * data that has been transferred via IB RDMA must be postponed until the</div><div class='add'>+ * check_stop_free() callback.</div><div class='add'>+ */</div><div class='add'>+static void srpt_handle_rdma_comp(struct srpt_rdma_ch *ch,</div><div class='add'>+				  struct srpt_send_ioctx *ioctx,</div><div class='add'>+				  enum srpt_opcode opcode)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(ioctx-&gt;n_rdma &lt;= 0);</div><div class='add'>+	atomic_add(ioctx-&gt;n_rdma, &amp;ch-&gt;sq_wr_avail);</div><div class='add'>+</div><div class='add'>+	if (opcode == SRPT_RDMA_READ_LAST) {</div><div class='add'>+		if (srpt_test_and_set_cmd_state(ioctx, SRPT_STATE_NEED_DATA,</div><div class='add'>+						SRPT_STATE_DATA_IN))</div><div class='add'>+			transport_generic_handle_data(&amp;ioctx-&gt;cmd);</div><div class='add'>+		else</div><div class='add'>+			printk(KERN_ERR "%s[%d]: wrong state = %d\n", __func__,</div><div class='add'>+			       __LINE__, srpt_get_cmd_state(ioctx));</div><div class='add'>+	} else if (opcode == SRPT_RDMA_ABORT) {</div><div class='add'>+		ioctx-&gt;rdma_aborted = true;</div><div class='add'>+	} else {</div><div class='add'>+		WARN(true, "unexpected opcode %d\n", opcode);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_handle_rdma_err_comp() - Process an IB RDMA error completion.</div><div class='add'>+ */</div><div class='add'>+static void srpt_handle_rdma_err_comp(struct srpt_rdma_ch *ch,</div><div class='add'>+				      struct srpt_send_ioctx *ioctx,</div><div class='add'>+				      enum srpt_opcode opcode)</div><div class='add'>+{</div><div class='add'>+	struct se_cmd *cmd;</div><div class='add'>+	enum srpt_command_state state;</div><div class='add'>+</div><div class='add'>+	cmd = &amp;ioctx-&gt;cmd;</div><div class='add'>+	state = srpt_get_cmd_state(ioctx);</div><div class='add'>+	switch (opcode) {</div><div class='add'>+	case SRPT_RDMA_READ_LAST:</div><div class='add'>+		if (ioctx-&gt;n_rdma &lt;= 0) {</div><div class='add'>+			printk(KERN_ERR "Received invalid RDMA read"</div><div class='add'>+			       " error completion with idx %d\n",</div><div class='add'>+			       ioctx-&gt;ioctx.index);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		atomic_add(ioctx-&gt;n_rdma, &amp;ch-&gt;sq_wr_avail);</div><div class='add'>+		if (state == SRPT_STATE_NEED_DATA)</div><div class='add'>+			srpt_abort_cmd(ioctx);</div><div class='add'>+		else</div><div class='add'>+			printk(KERN_ERR "%s[%d]: wrong state = %d\n",</div><div class='add'>+			       __func__, __LINE__, state);</div><div class='add'>+		break;</div><div class='add'>+	case SRPT_RDMA_WRITE_LAST:</div><div class='add'>+		atomic_set(&amp;ioctx-&gt;cmd.transport_lun_stop, 1);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "%s[%d]: opcode = %u\n", __func__,</div><div class='add'>+		       __LINE__, opcode);</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'>+ * srpt_build_cmd_rsp() - Build an SRP_RSP response.</div><div class='add'>+ * @ch: RDMA channel through which the request has been received.</div><div class='add'>+ * @ioctx: I/O context associated with the SRP_CMD request. The response will</div><div class='add'>+ *   be built in the buffer ioctx-&gt;buf points at and hence this function will</div><div class='add'>+ *   overwrite the request data.</div><div class='add'>+ * @tag: tag of the request for which this response is being generated.</div><div class='add'>+ * @status: value for the STATUS field of the SRP_RSP information unit.</div><div class='add'>+ *</div><div class='add'>+ * Returns the size in bytes of the SRP_RSP response.</div><div class='add'>+ *</div><div class='add'>+ * An SRP_RSP response contains a SCSI status or service response. See also</div><div class='add'>+ * section 6.9 in the SRP r16a document for the format of an SRP_RSP</div><div class='add'>+ * response. See also SPC-2 for more information about sense data.</div><div class='add'>+ */</div><div class='add'>+static int srpt_build_cmd_rsp(struct srpt_rdma_ch *ch,</div><div class='add'>+			      struct srpt_send_ioctx *ioctx, u64 tag,</div><div class='add'>+			      int status)</div><div class='add'>+{</div><div class='add'>+	struct srp_rsp *srp_rsp;</div><div class='add'>+	const u8 *sense_data;</div><div class='add'>+	int sense_data_len, max_sense_len;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The lowest bit of all SAM-3 status codes is zero (see also</div><div class='add'>+	 * paragraph 5.3 in SAM-3).</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(status &amp; 1);</div><div class='add'>+</div><div class='add'>+	srp_rsp = ioctx-&gt;ioctx.buf;</div><div class='add'>+	BUG_ON(!srp_rsp);</div><div class='add'>+</div><div class='add'>+	sense_data = ioctx-&gt;sense_data;</div><div class='add'>+	sense_data_len = ioctx-&gt;cmd.scsi_sense_length;</div><div class='add'>+	WARN_ON(sense_data_len &gt; sizeof(ioctx-&gt;sense_data));</div><div class='add'>+</div><div class='add'>+	memset(srp_rsp, 0, sizeof *srp_rsp);</div><div class='add'>+	srp_rsp-&gt;opcode = SRP_RSP;</div><div class='add'>+	srp_rsp-&gt;req_lim_delta =</div><div class='add'>+		__constant_cpu_to_be32(1 + atomic_xchg(&amp;ch-&gt;req_lim_delta, 0));</div><div class='add'>+	srp_rsp-&gt;tag = tag;</div><div class='add'>+	srp_rsp-&gt;status = status;</div><div class='add'>+</div><div class='add'>+	if (sense_data_len) {</div><div class='add'>+		BUILD_BUG_ON(MIN_MAX_RSP_SIZE &lt;= sizeof(*srp_rsp));</div><div class='add'>+		max_sense_len = ch-&gt;max_ti_iu_len - sizeof(*srp_rsp);</div><div class='add'>+		if (sense_data_len &gt; max_sense_len) {</div><div class='add'>+			printk(KERN_WARNING "truncated sense data from %d to %d"</div><div class='add'>+			       " bytes\n", sense_data_len, max_sense_len);</div><div class='add'>+			sense_data_len = max_sense_len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		srp_rsp-&gt;flags |= SRP_RSP_FLAG_SNSVALID;</div><div class='add'>+		srp_rsp-&gt;sense_data_len = cpu_to_be32(sense_data_len);</div><div class='add'>+		memcpy(srp_rsp + 1, sense_data, sense_data_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sizeof(*srp_rsp) + sense_data_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_build_tskmgmt_rsp() - Build a task management response.</div><div class='add'>+ * @ch:       RDMA channel through which the request has been received.</div><div class='add'>+ * @ioctx:    I/O context in which the SRP_RSP response will be built.</div><div class='add'>+ * @rsp_code: RSP_CODE that will be stored in the response.</div><div class='add'>+ * @tag:      Tag of the request for which this response is being generated.</div><div class='add'>+ *</div><div class='add'>+ * Returns the size in bytes of the SRP_RSP response.</div><div class='add'>+ *</div><div class='add'>+ * An SRP_RSP response contains a SCSI status or service response. See also</div><div class='add'>+ * section 6.9 in the SRP r16a document for the format of an SRP_RSP</div><div class='add'>+ * response.</div><div class='add'>+ */</div><div class='add'>+static int srpt_build_tskmgmt_rsp(struct srpt_rdma_ch *ch,</div><div class='add'>+				  struct srpt_send_ioctx *ioctx,</div><div class='add'>+				  u8 rsp_code, u64 tag)</div><div class='add'>+{</div><div class='add'>+	struct srp_rsp *srp_rsp;</div><div class='add'>+	int resp_data_len;</div><div class='add'>+	int resp_len;</div><div class='add'>+</div><div class='add'>+	resp_data_len = (rsp_code == SRP_TSK_MGMT_SUCCESS) ? 0 : 4;</div><div class='add'>+	resp_len = sizeof(*srp_rsp) + resp_data_len;</div><div class='add'>+</div><div class='add'>+	srp_rsp = ioctx-&gt;ioctx.buf;</div><div class='add'>+	BUG_ON(!srp_rsp);</div><div class='add'>+	memset(srp_rsp, 0, sizeof *srp_rsp);</div><div class='add'>+</div><div class='add'>+	srp_rsp-&gt;opcode = SRP_RSP;</div><div class='add'>+	srp_rsp-&gt;req_lim_delta = __constant_cpu_to_be32(1</div><div class='add'>+				    + atomic_xchg(&amp;ch-&gt;req_lim_delta, 0));</div><div class='add'>+	srp_rsp-&gt;tag = tag;</div><div class='add'>+</div><div class='add'>+	if (rsp_code != SRP_TSK_MGMT_SUCCESS) {</div><div class='add'>+		srp_rsp-&gt;flags |= SRP_RSP_FLAG_RSPVALID;</div><div class='add'>+		srp_rsp-&gt;resp_data_len = cpu_to_be32(resp_data_len);</div><div class='add'>+		srp_rsp-&gt;data[3] = rsp_code;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return resp_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define NO_SUCH_LUN ((uint64_t)-1LL)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SCSI LUN addressing method. See also SAM-2 and the section about</div><div class='add'>+ * eight byte LUNs.</div><div class='add'>+ */</div><div class='add'>+enum scsi_lun_addr_method {</div><div class='add'>+	SCSI_LUN_ADDR_METHOD_PERIPHERAL   = 0,</div><div class='add'>+	SCSI_LUN_ADDR_METHOD_FLAT         = 1,</div><div class='add'>+	SCSI_LUN_ADDR_METHOD_LUN          = 2,</div><div class='add'>+	SCSI_LUN_ADDR_METHOD_EXTENDED_LUN = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * srpt_unpack_lun() - Convert from network LUN to linear LUN.</div><div class='add'>+ *</div><div class='add'>+ * Convert an 2-byte, 4-byte, 6-byte or 8-byte LUN structure in network byte</div><div class='add'>+ * order (big endian) to a linear LUN. Supports three LUN addressing methods:</div><div class='add'>+ * peripheral, flat and logical unit. See also SAM-2, section 4.9.4 (page 40).</div><div class='add'>+ */</div><div class='add'>+static uint64_t srpt_unpack_lun(const uint8_t *lun, int len)</div><div class='add'>+{</div><div class='add'>+	uint64_t res = NO_SUCH_LUN;</div><div class='add'>+	int addressing_method;</div><div class='add'>+</div><div class='add'>+	if (unlikely(len &lt; 2)) {</div><div class='add'>+		printk(KERN_ERR "Illegal LUN length %d, expected 2 bytes or "</div><div class='add'>+		       "more", len);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (len) {</div><div class='add'>+	case 8:</div><div class='add'>+		if ((*((__be64 *)lun) &amp;</div><div class='add'>+		     __constant_cpu_to_be64(0x0000FFFFFFFFFFFFLL)) != 0)</div><div class='add'>+			goto out_err;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		if (*((__be16 *)&amp;lun[2]) != 0)</div><div class='add'>+			goto out_err;</div><div class='add'>+		break;</div><div class='add'>+	case 6:</div><div class='add'>+		if (*((__be32 *)&amp;lun[2]) != 0)</div><div class='add'>+			goto out_err;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	addressing_method = (*lun) &gt;&gt; 6; /* highest two bits of byte 0 */</div><div class='add'>+	switch (addressing_method) {</div><div class='add'>+	case SCSI_LUN_ADDR_METHOD_PERIPHERAL:</div><div class='add'>+	case SCSI_LUN_ADDR_METHOD_FLAT:</div><div class='add'>+	case SCSI_LUN_ADDR_METHOD_LUN:</div><div class='add'>+		res = *(lun + 1) | (((*lun) &amp; 0x3f) &lt;&lt; 8);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SCSI_LUN_ADDR_METHOD_EXTENDED_LUN:</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "Unimplemented LUN addressing method %u",</div><div class='add'>+		       addressing_method);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return res;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	printk(KERN_ERR "Support for multi-level LUNs has not yet been"</div><div class='add'>+	       " implemented");</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int srpt_check_stop_free(struct se_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct srpt_send_ioctx *ioctx;</div><div class='add'>+</div><div class='add'>+	ioctx = container_of(cmd, struct srpt_send_ioctx, cmd);</div><div class='add'>+	return kref_put(&amp;ioctx-&gt;kref, srpt_put_send_ioctx_kref);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_handle_cmd() - Process SRP_CMD.</div><div class='add'>+ */</div><div class='add'>+static int srpt_handle_cmd(struct srpt_rdma_ch *ch,</div><div class='add'>+			   struct srpt_recv_ioctx *recv_ioctx,</div><div class='add'>+			   struct srpt_send_ioctx *send_ioctx)</div><div class='add'>+{</div><div class='add'>+	struct se_cmd *cmd;</div><div class='add'>+	struct srp_cmd *srp_cmd;</div><div class='add'>+	uint64_t unpacked_lun;</div><div class='add'>+	u64 data_len;</div><div class='add'>+	enum dma_data_direction dir;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!send_ioctx);</div><div class='add'>+</div><div class='add'>+	srp_cmd = recv_ioctx-&gt;ioctx.buf;</div><div class='add'>+	kref_get(&amp;send_ioctx-&gt;kref);</div><div class='add'>+	cmd = &amp;send_ioctx-&gt;cmd;</div><div class='add'>+	send_ioctx-&gt;tag = srp_cmd-&gt;tag;</div><div class='add'>+</div><div class='add'>+	switch (srp_cmd-&gt;task_attr) {</div><div class='add'>+	case SRP_CMD_SIMPLE_Q:</div><div class='add'>+		cmd-&gt;sam_task_attr = MSG_SIMPLE_TAG;</div><div class='add'>+		break;</div><div class='add'>+	case SRP_CMD_ORDERED_Q:</div><div class='add'>+	default:</div><div class='add'>+		cmd-&gt;sam_task_attr = MSG_ORDERED_TAG;</div><div class='add'>+		break;</div><div class='add'>+	case SRP_CMD_HEAD_OF_Q:</div><div class='add'>+		cmd-&gt;sam_task_attr = MSG_HEAD_TAG;</div><div class='add'>+		break;</div><div class='add'>+	case SRP_CMD_ACA:</div><div class='add'>+		cmd-&gt;sam_task_attr = MSG_ACA_TAG;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = srpt_get_desc_tbl(send_ioctx, srp_cmd, &amp;dir, &amp;data_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR "0x%llx: parsing SRP descriptor table failed.\n",</div><div class='add'>+		       srp_cmd-&gt;tag);</div><div class='add'>+		cmd-&gt;se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;</div><div class='add'>+		cmd-&gt;scsi_sense_reason = TCM_INVALID_CDB_FIELD;</div><div class='add'>+		goto send_sense;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd-&gt;data_length = data_len;</div><div class='add'>+	cmd-&gt;data_direction = dir;</div><div class='add'>+	unpacked_lun = srpt_unpack_lun((uint8_t *)&amp;srp_cmd-&gt;lun,</div><div class='add'>+				       sizeof(srp_cmd-&gt;lun));</div><div class='add'>+	if (transport_lookup_cmd_lun(cmd, unpacked_lun) &lt; 0)</div><div class='add'>+		goto send_sense;</div><div class='add'>+	ret = transport_generic_allocate_tasks(cmd, srp_cmd-&gt;cdb);</div><div class='add'>+	if (cmd-&gt;se_cmd_flags &amp; SCF_SCSI_RESERVATION_CONFLICT)</div><div class='add'>+		srpt_queue_status(cmd);</div><div class='add'>+	else if (cmd-&gt;se_cmd_flags &amp; SCF_SCSI_CDB_EXCEPTION)</div><div class='add'>+		goto send_sense;</div><div class='add'>+	else</div><div class='add'>+		WARN_ON_ONCE(ret);</div><div class='add'>+</div><div class='add'>+	transport_handle_cdb_direct(cmd);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+send_sense:</div><div class='add'>+	transport_send_check_condition_and_sense(cmd, cmd-&gt;scsi_sense_reason,</div><div class='add'>+						 0);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_rx_mgmt_fn_tag() - Process a task management function by tag.</div><div class='add'>+ * @ch: RDMA channel of the task management request.</div><div class='add'>+ * @fn: Task management function to perform.</div><div class='add'>+ * @req_tag: Tag of the SRP task management request.</div><div class='add'>+ * @mgmt_ioctx: I/O context of the task management request.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero if the target core will process the task management</div><div class='add'>+ * request asynchronously.</div><div class='add'>+ *</div><div class='add'>+ * Note: It is assumed that the initiator serializes tag-based task management</div><div class='add'>+ * requests.</div><div class='add'>+ */</div><div class='add'>+static int srpt_rx_mgmt_fn_tag(struct srpt_send_ioctx *ioctx, u64 tag)</div><div class='add'>+{</div><div class='add'>+	struct srpt_device *sdev;</div><div class='add'>+	struct srpt_rdma_ch *ch;</div><div class='add'>+	struct srpt_send_ioctx *target;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	ch = ioctx-&gt;ch;</div><div class='add'>+	BUG_ON(!ch);</div><div class='add'>+	BUG_ON(!ch-&gt;sport);</div><div class='add'>+	sdev = ch-&gt;sport-&gt;sdev;</div><div class='add'>+	BUG_ON(!sdev);</div><div class='add'>+	spin_lock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+	for (i = 0; i &lt; ch-&gt;rq_size; ++i) {</div><div class='add'>+		target = ch-&gt;ioctx_ring[i];</div><div class='add'>+		if (target-&gt;cmd.se_lun == ioctx-&gt;cmd.se_lun &amp;&amp;</div><div class='add'>+		    target-&gt;tag == tag &amp;&amp;</div><div class='add'>+		    srpt_get_cmd_state(target) != SRPT_STATE_DONE) {</div><div class='add'>+			ret = 0;</div><div class='add'>+			/* now let the target core abort &amp;target-&gt;cmd; */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int srp_tmr_to_tcm(int fn)</div><div class='add'>+{</div><div class='add'>+	switch (fn) {</div><div class='add'>+	case SRP_TSK_ABORT_TASK:</div><div class='add'>+		return TMR_ABORT_TASK;</div><div class='add'>+	case SRP_TSK_ABORT_TASK_SET:</div><div class='add'>+		return TMR_ABORT_TASK_SET;</div><div class='add'>+	case SRP_TSK_CLEAR_TASK_SET:</div><div class='add'>+		return TMR_CLEAR_TASK_SET;</div><div class='add'>+	case SRP_TSK_LUN_RESET:</div><div class='add'>+		return TMR_LUN_RESET;</div><div class='add'>+	case SRP_TSK_CLEAR_ACA:</div><div class='add'>+		return TMR_CLEAR_ACA;</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'>+/**</div><div class='add'>+ * srpt_handle_tsk_mgmt() - Process an SRP_TSK_MGMT information unit.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if and only if the request will be processed by the target core.</div><div class='add'>+ *</div><div class='add'>+ * For more information about SRP_TSK_MGMT information units, see also section</div><div class='add'>+ * 6.7 in the SRP r16a document.</div><div class='add'>+ */</div><div class='add'>+static void srpt_handle_tsk_mgmt(struct srpt_rdma_ch *ch,</div><div class='add'>+				 struct srpt_recv_ioctx *recv_ioctx,</div><div class='add'>+				 struct srpt_send_ioctx *send_ioctx)</div><div class='add'>+{</div><div class='add'>+	struct srp_tsk_mgmt *srp_tsk;</div><div class='add'>+	struct se_cmd *cmd;</div><div class='add'>+	uint64_t unpacked_lun;</div><div class='add'>+	int tcm_tmr;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!send_ioctx);</div><div class='add'>+</div><div class='add'>+	srp_tsk = recv_ioctx-&gt;ioctx.buf;</div><div class='add'>+	cmd = &amp;send_ioctx-&gt;cmd;</div><div class='add'>+</div><div class='add'>+	pr_debug("recv tsk_mgmt fn %d for task_tag %lld and cmd tag %lld"</div><div class='add'>+		 " cm_id %p sess %p\n", srp_tsk-&gt;tsk_mgmt_func,</div><div class='add'>+		 srp_tsk-&gt;task_tag, srp_tsk-&gt;tag, ch-&gt;cm_id, ch-&gt;sess);</div><div class='add'>+</div><div class='add'>+	srpt_set_cmd_state(send_ioctx, SRPT_STATE_MGMT);</div><div class='add'>+	send_ioctx-&gt;tag = srp_tsk-&gt;tag;</div><div class='add'>+	tcm_tmr = srp_tmr_to_tcm(srp_tsk-&gt;tsk_mgmt_func);</div><div class='add'>+	if (tcm_tmr &lt; 0) {</div><div class='add'>+		send_ioctx-&gt;cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;</div><div class='add'>+		send_ioctx-&gt;cmd.se_tmr_req-&gt;response =</div><div class='add'>+			TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED;</div><div class='add'>+		goto process_tmr;</div><div class='add'>+	}</div><div class='add'>+	cmd-&gt;se_tmr_req = core_tmr_alloc_req(cmd, NULL, tcm_tmr, GFP_KERNEL);</div><div class='add'>+	if (!cmd-&gt;se_tmr_req) {</div><div class='add'>+		send_ioctx-&gt;cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;</div><div class='add'>+		send_ioctx-&gt;cmd.se_tmr_req-&gt;response = TMR_FUNCTION_REJECTED;</div><div class='add'>+		goto process_tmr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	unpacked_lun = srpt_unpack_lun((uint8_t *)&amp;srp_tsk-&gt;lun,</div><div class='add'>+				       sizeof(srp_tsk-&gt;lun));</div><div class='add'>+	res = transport_lookup_tmr_lun(&amp;send_ioctx-&gt;cmd, unpacked_lun);</div><div class='add'>+	if (res) {</div><div class='add'>+		pr_debug("rejecting TMR for LUN %lld\n", unpacked_lun);</div><div class='add'>+		send_ioctx-&gt;cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;</div><div class='add'>+		send_ioctx-&gt;cmd.se_tmr_req-&gt;response = TMR_LUN_DOES_NOT_EXIST;</div><div class='add'>+		goto process_tmr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (srp_tsk-&gt;tsk_mgmt_func == SRP_TSK_ABORT_TASK)</div><div class='add'>+		srpt_rx_mgmt_fn_tag(send_ioctx, srp_tsk-&gt;task_tag);</div><div class='add'>+</div><div class='add'>+process_tmr:</div><div class='add'>+	kref_get(&amp;send_ioctx-&gt;kref);</div><div class='add'>+	if (!(send_ioctx-&gt;cmd.se_cmd_flags &amp; SCF_SCSI_CDB_EXCEPTION))</div><div class='add'>+		transport_generic_handle_tmr(&amp;send_ioctx-&gt;cmd);</div><div class='add'>+	else</div><div class='add'>+		transport_send_check_condition_and_sense(cmd,</div><div class='add'>+						cmd-&gt;scsi_sense_reason, 0);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_handle_new_iu() - Process a newly received information unit.</div><div class='add'>+ * @ch:    RDMA channel through which the information unit has been received.</div><div class='add'>+ * @ioctx: SRPT I/O context associated with the information unit.</div><div class='add'>+ */</div><div class='add'>+static void srpt_handle_new_iu(struct srpt_rdma_ch *ch,</div><div class='add'>+			       struct srpt_recv_ioctx *recv_ioctx,</div><div class='add'>+			       struct srpt_send_ioctx *send_ioctx)</div><div class='add'>+{</div><div class='add'>+	struct srp_cmd *srp_cmd;</div><div class='add'>+	enum rdma_ch_state ch_state;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!ch);</div><div class='add'>+	BUG_ON(!recv_ioctx);</div><div class='add'>+</div><div class='add'>+	ib_dma_sync_single_for_cpu(ch-&gt;sport-&gt;sdev-&gt;device,</div><div class='add'>+				   recv_ioctx-&gt;ioctx.dma, srp_max_req_size,</div><div class='add'>+				   DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+	ch_state = srpt_get_ch_state(ch);</div><div class='add'>+	if (unlikely(ch_state == CH_CONNECTING)) {</div><div class='add'>+		list_add_tail(&amp;recv_ioctx-&gt;wait_list, &amp;ch-&gt;cmd_wait_list);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(ch_state != CH_LIVE))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	srp_cmd = recv_ioctx-&gt;ioctx.buf;</div><div class='add'>+	if (srp_cmd-&gt;opcode == SRP_CMD || srp_cmd-&gt;opcode == SRP_TSK_MGMT) {</div><div class='add'>+		if (!send_ioctx)</div><div class='add'>+			send_ioctx = srpt_get_send_ioctx(ch);</div><div class='add'>+		if (unlikely(!send_ioctx)) {</div><div class='add'>+			list_add_tail(&amp;recv_ioctx-&gt;wait_list,</div><div class='add'>+				      &amp;ch-&gt;cmd_wait_list);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	transport_init_se_cmd(&amp;send_ioctx-&gt;cmd, &amp;srpt_target-&gt;tf_ops, ch-&gt;sess,</div><div class='add'>+			      0, DMA_NONE, MSG_SIMPLE_TAG,</div><div class='add'>+			      send_ioctx-&gt;sense_data);</div><div class='add'>+</div><div class='add'>+	switch (srp_cmd-&gt;opcode) {</div><div class='add'>+	case SRP_CMD:</div><div class='add'>+		srpt_handle_cmd(ch, recv_ioctx, send_ioctx);</div><div class='add'>+		break;</div><div class='add'>+	case SRP_TSK_MGMT:</div><div class='add'>+		srpt_handle_tsk_mgmt(ch, recv_ioctx, send_ioctx);</div><div class='add'>+		break;</div><div class='add'>+	case SRP_I_LOGOUT:</div><div class='add'>+		printk(KERN_ERR "Not yet implemented: SRP_I_LOGOUT\n");</div><div class='add'>+		break;</div><div class='add'>+	case SRP_CRED_RSP:</div><div class='add'>+		pr_debug("received SRP_CRED_RSP\n");</div><div class='add'>+		break;</div><div class='add'>+	case SRP_AER_RSP:</div><div class='add'>+		pr_debug("received SRP_AER_RSP\n");</div><div class='add'>+		break;</div><div class='add'>+	case SRP_RSP:</div><div class='add'>+		printk(KERN_ERR "Received SRP_RSP\n");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "received IU with unknown opcode 0x%x\n",</div><div class='add'>+		       srp_cmd-&gt;opcode);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	srpt_post_recv(ch-&gt;sport-&gt;sdev, recv_ioctx);</div><div class='add'>+out:</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void srpt_process_rcv_completion(struct ib_cq *cq,</div><div class='add'>+					struct srpt_rdma_ch *ch,</div><div class='add'>+					struct ib_wc *wc)</div><div class='add'>+{</div><div class='add'>+	struct srpt_device *sdev = ch-&gt;sport-&gt;sdev;</div><div class='add'>+	struct srpt_recv_ioctx *ioctx;</div><div class='add'>+	u32 index;</div><div class='add'>+</div><div class='add'>+	index = idx_from_wr_id(wc-&gt;wr_id);</div><div class='add'>+	if (wc-&gt;status == IB_WC_SUCCESS) {</div><div class='add'>+		int req_lim;</div><div class='add'>+</div><div class='add'>+		req_lim = atomic_dec_return(&amp;ch-&gt;req_lim);</div><div class='add'>+		if (unlikely(req_lim &lt; 0))</div><div class='add'>+			printk(KERN_ERR "req_lim = %d &lt; 0\n", req_lim);</div><div class='add'>+		ioctx = sdev-&gt;ioctx_ring[index];</div><div class='add'>+		srpt_handle_new_iu(ch, ioctx, NULL);</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_INFO "receiving failed for idx %u with status %d\n",</div><div class='add'>+		       index, wc-&gt;status);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_process_send_completion() - Process an IB send completion.</div><div class='add'>+ *</div><div class='add'>+ * Note: Although this has not yet been observed during tests, at least in</div><div class='add'>+ * theory it is possible that the srpt_get_send_ioctx() call invoked by</div><div class='add'>+ * srpt_handle_new_iu() fails. This is possible because the req_lim_delta</div><div class='add'>+ * value in each response is set to one, and it is possible that this response</div><div class='add'>+ * makes the initiator send a new request before the send completion for that</div><div class='add'>+ * response has been processed. This could e.g. happen if the call to</div><div class='add'>+ * srpt_put_send_iotcx() is delayed because of a higher priority interrupt or</div><div class='add'>+ * if IB retransmission causes generation of the send completion to be</div><div class='add'>+ * delayed. Incoming information units for which srpt_get_send_ioctx() fails</div><div class='add'>+ * are queued on cmd_wait_list. The code below processes these delayed</div><div class='add'>+ * requests one at a time.</div><div class='add'>+ */</div><div class='add'>+static void srpt_process_send_completion(struct ib_cq *cq,</div><div class='add'>+					 struct srpt_rdma_ch *ch,</div><div class='add'>+					 struct ib_wc *wc)</div><div class='add'>+{</div><div class='add'>+	struct srpt_send_ioctx *send_ioctx;</div><div class='add'>+	uint32_t index;</div><div class='add'>+	enum srpt_opcode opcode;</div><div class='add'>+</div><div class='add'>+	index = idx_from_wr_id(wc-&gt;wr_id);</div><div class='add'>+	opcode = opcode_from_wr_id(wc-&gt;wr_id);</div><div class='add'>+	send_ioctx = ch-&gt;ioctx_ring[index];</div><div class='add'>+	if (wc-&gt;status == IB_WC_SUCCESS) {</div><div class='add'>+		if (opcode == SRPT_SEND)</div><div class='add'>+			srpt_handle_send_comp(ch, send_ioctx);</div><div class='add'>+		else {</div><div class='add'>+			WARN_ON(opcode != SRPT_RDMA_ABORT &amp;&amp;</div><div class='add'>+				wc-&gt;opcode != IB_WC_RDMA_READ);</div><div class='add'>+			srpt_handle_rdma_comp(ch, send_ioctx, opcode);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (opcode == SRPT_SEND) {</div><div class='add'>+			printk(KERN_INFO "sending response for idx %u failed"</div><div class='add'>+			       " with status %d\n", index, wc-&gt;status);</div><div class='add'>+			srpt_handle_send_err_comp(ch, wc-&gt;wr_id);</div><div class='add'>+		} else if (opcode != SRPT_RDMA_MID) {</div><div class='add'>+			printk(KERN_INFO "RDMA t %d for idx %u failed with"</div><div class='add'>+				" status %d", opcode, index, wc-&gt;status);</div><div class='add'>+			srpt_handle_rdma_err_comp(ch, send_ioctx, opcode);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (unlikely(opcode == SRPT_SEND</div><div class='add'>+			&amp;&amp; !list_empty(&amp;ch-&gt;cmd_wait_list)</div><div class='add'>+			&amp;&amp; srpt_get_ch_state(ch) == CH_LIVE</div><div class='add'>+			&amp;&amp; (send_ioctx = srpt_get_send_ioctx(ch)) != NULL)) {</div><div class='add'>+		struct srpt_recv_ioctx *recv_ioctx;</div><div class='add'>+</div><div class='add'>+		recv_ioctx = list_first_entry(&amp;ch-&gt;cmd_wait_list,</div><div class='add'>+					      struct srpt_recv_ioctx,</div><div class='add'>+					      wait_list);</div><div class='add'>+		list_del(&amp;recv_ioctx-&gt;wait_list);</div><div class='add'>+		srpt_handle_new_iu(ch, recv_ioctx, send_ioctx);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void srpt_process_completion(struct ib_cq *cq, struct srpt_rdma_ch *ch)</div><div class='add'>+{</div><div class='add'>+	struct ib_wc *const wc = ch-&gt;wc;</div><div class='add'>+	int i, n;</div><div class='add'>+</div><div class='add'>+	WARN_ON(cq != ch-&gt;cq);</div><div class='add'>+</div><div class='add'>+	ib_req_notify_cq(cq, IB_CQ_NEXT_COMP);</div><div class='add'>+	while ((n = ib_poll_cq(cq, ARRAY_SIZE(ch-&gt;wc), wc)) &gt; 0) {</div><div class='add'>+		for (i = 0; i &lt; n; i++) {</div><div class='add'>+			if (opcode_from_wr_id(wc[i].wr_id) == SRPT_RECV)</div><div class='add'>+				srpt_process_rcv_completion(cq, ch, &amp;wc[i]);</div><div class='add'>+			else</div><div class='add'>+				srpt_process_send_completion(cq, ch, &amp;wc[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_completion() - IB completion queue callback function.</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ * - It is guaranteed that a completion handler will never be invoked</div><div class='add'>+ *   concurrently on two different CPUs for the same completion queue. See also</div><div class='add'>+ *   Documentation/infiniband/core_locking.txt and the implementation of</div><div class='add'>+ *   handle_edge_irq() in kernel/irq/chip.c.</div><div class='add'>+ * - When threaded IRQs are enabled, completion handlers are invoked in thread</div><div class='add'>+ *   context instead of interrupt context.</div><div class='add'>+ */</div><div class='add'>+static void srpt_completion(struct ib_cq *cq, void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct srpt_rdma_ch *ch = ctx;</div><div class='add'>+</div><div class='add'>+	wake_up_interruptible(&amp;ch-&gt;wait_queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int srpt_compl_thread(void *arg)</div><div class='add'>+{</div><div class='add'>+	struct srpt_rdma_ch *ch;</div><div class='add'>+</div><div class='add'>+	/* Hibernation / freezing of the SRPT kernel thread is not supported. */</div><div class='add'>+	current-&gt;flags |= PF_NOFREEZE;</div><div class='add'>+</div><div class='add'>+	ch = arg;</div><div class='add'>+	BUG_ON(!ch);</div><div class='add'>+	printk(KERN_INFO "Session %s: kernel thread %s (PID %d) started\n",</div><div class='add'>+	       ch-&gt;sess_name, ch-&gt;thread-&gt;comm, current-&gt;pid);</div><div class='add'>+	while (!kthread_should_stop()) {</div><div class='add'>+		wait_event_interruptible(ch-&gt;wait_queue,</div><div class='add'>+			(srpt_process_completion(ch-&gt;cq, ch),</div><div class='add'>+			 kthread_should_stop()));</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_INFO "Session %s: kernel thread %s (PID %d) stopped\n",</div><div class='add'>+	       ch-&gt;sess_name, ch-&gt;thread-&gt;comm, current-&gt;pid);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_create_ch_ib() - Create receive and send completion queues.</div><div class='add'>+ */</div><div class='add'>+static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)</div><div class='add'>+{</div><div class='add'>+	struct ib_qp_init_attr *qp_init;</div><div class='add'>+	struct srpt_port *sport = ch-&gt;sport;</div><div class='add'>+	struct srpt_device *sdev = sport-&gt;sdev;</div><div class='add'>+	u32 srp_sq_size = sport-&gt;port_attrib.srp_sq_size;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	WARN_ON(ch-&gt;rq_size &lt; 1);</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	qp_init = kzalloc(sizeof *qp_init, GFP_KERNEL);</div><div class='add'>+	if (!qp_init)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ch-&gt;cq = ib_create_cq(sdev-&gt;device, srpt_completion, NULL, ch,</div><div class='add'>+			      ch-&gt;rq_size + srp_sq_size, 0);</div><div class='add'>+	if (IS_ERR(ch-&gt;cq)) {</div><div class='add'>+		ret = PTR_ERR(ch-&gt;cq);</div><div class='add'>+		printk(KERN_ERR "failed to create CQ cqe= %d ret= %d\n",</div><div class='add'>+		       ch-&gt;rq_size + srp_sq_size, ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qp_init-&gt;qp_context = (void *)ch;</div><div class='add'>+	qp_init-&gt;event_handler</div><div class='add'>+		= (void(*)(struct ib_event *, void*))srpt_qp_event;</div><div class='add'>+	qp_init-&gt;send_cq = ch-&gt;cq;</div><div class='add'>+	qp_init-&gt;recv_cq = ch-&gt;cq;</div><div class='add'>+	qp_init-&gt;srq = sdev-&gt;srq;</div><div class='add'>+	qp_init-&gt;sq_sig_type = IB_SIGNAL_REQ_WR;</div><div class='add'>+	qp_init-&gt;qp_type = IB_QPT_RC;</div><div class='add'>+	qp_init-&gt;cap.max_send_wr = srp_sq_size;</div><div class='add'>+	qp_init-&gt;cap.max_send_sge = SRPT_DEF_SG_PER_WQE;</div><div class='add'>+</div><div class='add'>+	ch-&gt;qp = ib_create_qp(sdev-&gt;pd, qp_init);</div><div class='add'>+	if (IS_ERR(ch-&gt;qp)) {</div><div class='add'>+		ret = PTR_ERR(ch-&gt;qp);</div><div class='add'>+		printk(KERN_ERR "failed to create_qp ret= %d\n", ret);</div><div class='add'>+		goto err_destroy_cq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;ch-&gt;sq_wr_avail, qp_init-&gt;cap.max_send_wr);</div><div class='add'>+</div><div class='add'>+	pr_debug("%s: max_cqe= %d max_sge= %d sq_size = %d cm_id= %p\n",</div><div class='add'>+		 __func__, ch-&gt;cq-&gt;cqe, qp_init-&gt;cap.max_send_sge,</div><div class='add'>+		 qp_init-&gt;cap.max_send_wr, ch-&gt;cm_id);</div><div class='add'>+</div><div class='add'>+	ret = srpt_init_ch_qp(ch, ch-&gt;qp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_destroy_qp;</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;ch-&gt;wait_queue);</div><div class='add'>+</div><div class='add'>+	pr_debug("creating thread for session %s\n", ch-&gt;sess_name);</div><div class='add'>+</div><div class='add'>+	ch-&gt;thread = kthread_run(srpt_compl_thread, ch, "ib_srpt_compl");</div><div class='add'>+	if (IS_ERR(ch-&gt;thread)) {</div><div class='add'>+		printk(KERN_ERR "failed to create kernel thread %ld\n",</div><div class='add'>+		       PTR_ERR(ch-&gt;thread));</div><div class='add'>+		ch-&gt;thread = NULL;</div><div class='add'>+		goto err_destroy_qp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(qp_init);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+err_destroy_qp:</div><div class='add'>+	ib_destroy_qp(ch-&gt;qp);</div><div class='add'>+err_destroy_cq:</div><div class='add'>+	ib_destroy_cq(ch-&gt;cq);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void srpt_destroy_ch_ib(struct srpt_rdma_ch *ch)</div><div class='add'>+{</div><div class='add'>+	if (ch-&gt;thread)</div><div class='add'>+		kthread_stop(ch-&gt;thread);</div><div class='add'>+</div><div class='add'>+	ib_destroy_qp(ch-&gt;qp);</div><div class='add'>+	ib_destroy_cq(ch-&gt;cq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __srpt_close_ch() - Close an RDMA channel by setting the QP error state.</div><div class='add'>+ *</div><div class='add'>+ * Reset the QP and make sure all resources associated with the channel will</div><div class='add'>+ * be deallocated at an appropriate time.</div><div class='add'>+ *</div><div class='add'>+ * Note: The caller must hold ch-&gt;sport-&gt;sdev-&gt;spinlock.</div><div class='add'>+ */</div><div class='add'>+static void __srpt_close_ch(struct srpt_rdma_ch *ch)</div><div class='add'>+{</div><div class='add'>+	struct srpt_device *sdev;</div><div class='add'>+	enum rdma_ch_state prev_state;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	sdev = ch-&gt;sport-&gt;sdev;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ch-&gt;spinlock, flags);</div><div class='add'>+	prev_state = ch-&gt;state;</div><div class='add'>+	switch (prev_state) {</div><div class='add'>+	case CH_CONNECTING:</div><div class='add'>+	case CH_LIVE:</div><div class='add'>+		ch-&gt;state = CH_DISCONNECTING;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;ch-&gt;spinlock, flags);</div><div class='add'>+</div><div class='add'>+	switch (prev_state) {</div><div class='add'>+	case CH_CONNECTING:</div><div class='add'>+		ib_send_cm_rej(ch-&gt;cm_id, IB_CM_REJ_NO_RESOURCES, NULL, 0,</div><div class='add'>+			       NULL, 0);</div><div class='add'>+		/* fall through */</div><div class='add'>+	case CH_LIVE:</div><div class='add'>+		if (ib_send_cm_dreq(ch-&gt;cm_id, NULL, 0) &lt; 0)</div><div class='add'>+			printk(KERN_ERR "sending CM DREQ failed.\n");</div><div class='add'>+		break;</div><div class='add'>+	case CH_DISCONNECTING:</div><div class='add'>+		break;</div><div class='add'>+	case CH_DRAINING:</div><div class='add'>+	case CH_RELEASING:</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'>+ * srpt_close_ch() - Close an RDMA channel.</div><div class='add'>+ */</div><div class='add'>+static void srpt_close_ch(struct srpt_rdma_ch *ch)</div><div class='add'>+{</div><div class='add'>+	struct srpt_device *sdev;</div><div class='add'>+</div><div class='add'>+	sdev = ch-&gt;sport-&gt;sdev;</div><div class='add'>+	spin_lock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+	__srpt_close_ch(ch);</div><div class='add'>+	spin_unlock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_drain_channel() - Drain a channel by resetting the IB queue pair.</div><div class='add'>+ * @cm_id: Pointer to the CM ID of the channel to be drained.</div><div class='add'>+ *</div><div class='add'>+ * Note: Must be called from inside srpt_cm_handler to avoid a race between</div><div class='add'>+ * accessing sdev-&gt;spinlock and the call to kfree(sdev) in srpt_remove_one()</div><div class='add'>+ * (the caller of srpt_cm_handler holds the cm_id spinlock; srpt_remove_one()</div><div class='add'>+ * waits until all target sessions for the associated IB device have been</div><div class='add'>+ * unregistered and target session registration involves a call to</div><div class='add'>+ * ib_destroy_cm_id(), which locks the cm_id spinlock and hence waits until</div><div class='add'>+ * this function has finished).</div><div class='add'>+ */</div><div class='add'>+static void srpt_drain_channel(struct ib_cm_id *cm_id)</div><div class='add'>+{</div><div class='add'>+	struct srpt_device *sdev;</div><div class='add'>+	struct srpt_rdma_ch *ch;</div><div class='add'>+	int ret;</div><div class='add'>+	bool do_reset = false;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(irqs_disabled());</div><div class='add'>+</div><div class='add'>+	sdev = cm_id-&gt;context;</div><div class='add'>+	BUG_ON(!sdev);</div><div class='add'>+	spin_lock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+	list_for_each_entry(ch, &amp;sdev-&gt;rch_list, list) {</div><div class='add'>+		if (ch-&gt;cm_id == cm_id) {</div><div class='add'>+			do_reset = srpt_test_and_set_ch_state(ch,</div><div class='add'>+					CH_CONNECTING, CH_DRAINING) ||</div><div class='add'>+				   srpt_test_and_set_ch_state(ch,</div><div class='add'>+					CH_LIVE, CH_DRAINING) ||</div><div class='add'>+				   srpt_test_and_set_ch_state(ch,</div><div class='add'>+					CH_DISCONNECTING, CH_DRAINING);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+</div><div class='add'>+	if (do_reset) {</div><div class='add'>+		ret = srpt_ch_qp_err(ch);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			printk(KERN_ERR "Setting queue pair in error state"</div><div class='add'>+			       " failed: %d\n", ret);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_find_channel() - Look up an RDMA channel.</div><div class='add'>+ * @cm_id: Pointer to the CM ID of the channel to be looked up.</div><div class='add'>+ *</div><div class='add'>+ * Return NULL if no matching RDMA channel has been found.</div><div class='add'>+ */</div><div class='add'>+static struct srpt_rdma_ch *srpt_find_channel(struct srpt_device *sdev,</div><div class='add'>+					      struct ib_cm_id *cm_id)</div><div class='add'>+{</div><div class='add'>+	struct srpt_rdma_ch *ch;</div><div class='add'>+	bool found;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(irqs_disabled());</div><div class='add'>+	BUG_ON(!sdev);</div><div class='add'>+</div><div class='add'>+	found = false;</div><div class='add'>+	spin_lock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+	list_for_each_entry(ch, &amp;sdev-&gt;rch_list, list) {</div><div class='add'>+		if (ch-&gt;cm_id == cm_id) {</div><div class='add'>+			found = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+</div><div class='add'>+	return found ? ch : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_release_channel() - Release channel resources.</div><div class='add'>+ *</div><div class='add'>+ * Schedules the actual release because:</div><div class='add'>+ * - Calling the ib_destroy_cm_id() call from inside an IB CM callback would</div><div class='add'>+ *   trigger a deadlock.</div><div class='add'>+ * - It is not safe to call TCM transport_* functions from interrupt context.</div><div class='add'>+ */</div><div class='add'>+static void srpt_release_channel(struct srpt_rdma_ch *ch)</div><div class='add'>+{</div><div class='add'>+	schedule_work(&amp;ch-&gt;release_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void srpt_release_channel_work(struct work_struct *w)</div><div class='add'>+{</div><div class='add'>+	struct srpt_rdma_ch *ch;</div><div class='add'>+	struct srpt_device *sdev;</div><div class='add'>+</div><div class='add'>+	ch = container_of(w, struct srpt_rdma_ch, release_work);</div><div class='add'>+	pr_debug("ch = %p; ch-&gt;sess = %p; release_done = %p\n", ch, ch-&gt;sess,</div><div class='add'>+		 ch-&gt;release_done);</div><div class='add'>+</div><div class='add'>+	sdev = ch-&gt;sport-&gt;sdev;</div><div class='add'>+	BUG_ON(!sdev);</div><div class='add'>+</div><div class='add'>+	transport_deregister_session_configfs(ch-&gt;sess);</div><div class='add'>+	transport_deregister_session(ch-&gt;sess);</div><div class='add'>+	ch-&gt;sess = NULL;</div><div class='add'>+</div><div class='add'>+	srpt_destroy_ch_ib(ch);</div><div class='add'>+</div><div class='add'>+	srpt_free_ioctx_ring((struct srpt_ioctx **)ch-&gt;ioctx_ring,</div><div class='add'>+			     ch-&gt;sport-&gt;sdev, ch-&gt;rq_size,</div><div class='add'>+			     ch-&gt;rsp_size, DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+	list_del(&amp;ch-&gt;list);</div><div class='add'>+	spin_unlock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+</div><div class='add'>+	ib_destroy_cm_id(ch-&gt;cm_id);</div><div class='add'>+</div><div class='add'>+	if (ch-&gt;release_done)</div><div class='add'>+		complete(ch-&gt;release_done);</div><div class='add'>+</div><div class='add'>+	wake_up(&amp;sdev-&gt;ch_releaseQ);</div><div class='add'>+</div><div class='add'>+	kfree(ch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct srpt_node_acl *__srpt_lookup_acl(struct srpt_port *sport,</div><div class='add'>+					       u8 i_port_id[16])</div><div class='add'>+{</div><div class='add'>+	struct srpt_node_acl *nacl;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(nacl, &amp;sport-&gt;port_acl_list, list)</div><div class='add'>+		if (memcmp(nacl-&gt;i_port_id, i_port_id,</div><div class='add'>+			   sizeof(nacl-&gt;i_port_id)) == 0)</div><div class='add'>+			return nacl;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct srpt_node_acl *srpt_lookup_acl(struct srpt_port *sport,</div><div class='add'>+					     u8 i_port_id[16])</div><div class='add'>+{</div><div class='add'>+	struct srpt_node_acl *nacl;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;sport-&gt;port_acl_lock);</div><div class='add'>+	nacl = __srpt_lookup_acl(sport, i_port_id);</div><div class='add'>+	spin_unlock_irq(&amp;sport-&gt;port_acl_lock);</div><div class='add'>+</div><div class='add'>+	return nacl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_cm_req_recv() - Process the event IB_CM_REQ_RECEIVED.</div><div class='add'>+ *</div><div class='add'>+ * Ownership of the cm_id is transferred to the target session if this</div><div class='add'>+ * functions returns zero. Otherwise the caller remains the owner of cm_id.</div><div class='add'>+ */</div><div class='add'>+static int srpt_cm_req_recv(struct ib_cm_id *cm_id,</div><div class='add'>+			    struct ib_cm_req_event_param *param,</div><div class='add'>+			    void *private_data)</div><div class='add'>+{</div><div class='add'>+	struct srpt_device *sdev = cm_id-&gt;context;</div><div class='add'>+	struct srpt_port *sport = &amp;sdev-&gt;port[param-&gt;port - 1];</div><div class='add'>+	struct srp_login_req *req;</div><div class='add'>+	struct srp_login_rsp *rsp;</div><div class='add'>+	struct srp_login_rej *rej;</div><div class='add'>+	struct ib_cm_rep_param *rep_param;</div><div class='add'>+	struct srpt_rdma_ch *ch, *tmp_ch;</div><div class='add'>+	struct srpt_node_acl *nacl;</div><div class='add'>+	u32 it_iu_len;</div><div class='add'>+	int i;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(irqs_disabled());</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!sdev || !private_data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	req = (struct srp_login_req *)private_data;</div><div class='add'>+</div><div class='add'>+	it_iu_len = be32_to_cpu(req-&gt;req_it_iu_len);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Received SRP_LOGIN_REQ with i_port_id 0x%llx:0x%llx,"</div><div class='add'>+	       " t_port_id 0x%llx:0x%llx and it_iu_len %d on port %d"</div><div class='add'>+	       " (guid=0x%llx:0x%llx)\n",</div><div class='add'>+	       be64_to_cpu(*(__be64 *)&amp;req-&gt;initiator_port_id[0]),</div><div class='add'>+	       be64_to_cpu(*(__be64 *)&amp;req-&gt;initiator_port_id[8]),</div><div class='add'>+	       be64_to_cpu(*(__be64 *)&amp;req-&gt;target_port_id[0]),</div><div class='add'>+	       be64_to_cpu(*(__be64 *)&amp;req-&gt;target_port_id[8]),</div><div class='add'>+	       it_iu_len,</div><div class='add'>+	       param-&gt;port,</div><div class='add'>+	       be64_to_cpu(*(__be64 *)&amp;sdev-&gt;port[param-&gt;port - 1].gid.raw[0]),</div><div class='add'>+	       be64_to_cpu(*(__be64 *)&amp;sdev-&gt;port[param-&gt;port - 1].gid.raw[8]));</div><div class='add'>+</div><div class='add'>+	rsp = kzalloc(sizeof *rsp, GFP_KERNEL);</div><div class='add'>+	rej = kzalloc(sizeof *rej, GFP_KERNEL);</div><div class='add'>+	rep_param = kzalloc(sizeof *rep_param, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!rsp || !rej || !rep_param) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (it_iu_len &gt; srp_max_req_size || it_iu_len &lt; 64) {</div><div class='add'>+		rej-&gt;reason = __constant_cpu_to_be32(</div><div class='add'>+				SRP_LOGIN_REJ_REQ_IT_IU_LENGTH_TOO_LARGE);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		printk(KERN_ERR "rejected SRP_LOGIN_REQ because its"</div><div class='add'>+		       " length (%d bytes) is out of range (%d .. %d)\n",</div><div class='add'>+		       it_iu_len, 64, srp_max_req_size);</div><div class='add'>+		goto reject;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!sport-&gt;enabled) {</div><div class='add'>+		rej-&gt;reason = __constant_cpu_to_be32(</div><div class='add'>+			     SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		printk(KERN_ERR "rejected SRP_LOGIN_REQ because the target port"</div><div class='add'>+		       " has not yet been enabled\n");</div><div class='add'>+		goto reject;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((req-&gt;req_flags &amp; SRP_MTCH_ACTION) == SRP_MULTICHAN_SINGLE) {</div><div class='add'>+		rsp-&gt;rsp_flags = SRP_LOGIN_RSP_MULTICHAN_NO_CHAN;</div><div class='add'>+</div><div class='add'>+		spin_lock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+</div><div class='add'>+		list_for_each_entry_safe(ch, tmp_ch, &amp;sdev-&gt;rch_list, list) {</div><div class='add'>+			if (!memcmp(ch-&gt;i_port_id, req-&gt;initiator_port_id, 16)</div><div class='add'>+			    &amp;&amp; !memcmp(ch-&gt;t_port_id, req-&gt;target_port_id, 16)</div><div class='add'>+			    &amp;&amp; param-&gt;port == ch-&gt;sport-&gt;port</div><div class='add'>+			    &amp;&amp; param-&gt;listen_id == ch-&gt;sport-&gt;sdev-&gt;cm_id</div><div class='add'>+			    &amp;&amp; ch-&gt;cm_id) {</div><div class='add'>+				enum rdma_ch_state ch_state;</div><div class='add'>+</div><div class='add'>+				ch_state = srpt_get_ch_state(ch);</div><div class='add'>+				if (ch_state != CH_CONNECTING</div><div class='add'>+				    &amp;&amp; ch_state != CH_LIVE)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				/* found an existing channel */</div><div class='add'>+				pr_debug("Found existing channel %s"</div><div class='add'>+					 " cm_id= %p state= %d\n",</div><div class='add'>+					 ch-&gt;sess_name, ch-&gt;cm_id, ch_state);</div><div class='add'>+</div><div class='add'>+				__srpt_close_ch(ch);</div><div class='add'>+</div><div class='add'>+				rsp-&gt;rsp_flags =</div><div class='add'>+					SRP_LOGIN_RSP_MULTICHAN_TERMINATED;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_unlock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+</div><div class='add'>+	} else</div><div class='add'>+		rsp-&gt;rsp_flags = SRP_LOGIN_RSP_MULTICHAN_MAINTAINED;</div><div class='add'>+</div><div class='add'>+	if (*(__be64 *)req-&gt;target_port_id != cpu_to_be64(srpt_service_guid)</div><div class='add'>+	    || *(__be64 *)(req-&gt;target_port_id + 8) !=</div><div class='add'>+	       cpu_to_be64(srpt_service_guid)) {</div><div class='add'>+		rej-&gt;reason = __constant_cpu_to_be32(</div><div class='add'>+				SRP_LOGIN_REJ_UNABLE_ASSOCIATE_CHANNEL);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		printk(KERN_ERR "rejected SRP_LOGIN_REQ because it"</div><div class='add'>+		       " has an invalid target port identifier.\n");</div><div class='add'>+		goto reject;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ch = kzalloc(sizeof *ch, GFP_KERNEL);</div><div class='add'>+	if (!ch) {</div><div class='add'>+		rej-&gt;reason = __constant_cpu_to_be32(</div><div class='add'>+					SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);</div><div class='add'>+		printk(KERN_ERR "rejected SRP_LOGIN_REQ because no memory.\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto reject;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;ch-&gt;release_work, srpt_release_channel_work);</div><div class='add'>+	memcpy(ch-&gt;i_port_id, req-&gt;initiator_port_id, 16);</div><div class='add'>+	memcpy(ch-&gt;t_port_id, req-&gt;target_port_id, 16);</div><div class='add'>+	ch-&gt;sport = &amp;sdev-&gt;port[param-&gt;port - 1];</div><div class='add'>+	ch-&gt;cm_id = cm_id;</div><div class='add'>+	/*</div><div class='add'>+	 * Avoid QUEUE_FULL conditions by limiting the number of buffers used</div><div class='add'>+	 * for the SRP protocol to the command queue size.</div><div class='add'>+	 */</div><div class='add'>+	ch-&gt;rq_size = SRPT_RQ_SIZE;</div><div class='add'>+	spin_lock_init(&amp;ch-&gt;spinlock);</div><div class='add'>+	ch-&gt;state = CH_CONNECTING;</div><div class='add'>+	INIT_LIST_HEAD(&amp;ch-&gt;cmd_wait_list);</div><div class='add'>+	ch-&gt;rsp_size = ch-&gt;sport-&gt;port_attrib.srp_max_rsp_size;</div><div class='add'>+</div><div class='add'>+	ch-&gt;ioctx_ring = (struct srpt_send_ioctx **)</div><div class='add'>+		srpt_alloc_ioctx_ring(ch-&gt;sport-&gt;sdev, ch-&gt;rq_size,</div><div class='add'>+				      sizeof(*ch-&gt;ioctx_ring[0]),</div><div class='add'>+				      ch-&gt;rsp_size, DMA_TO_DEVICE);</div><div class='add'>+	if (!ch-&gt;ioctx_ring)</div><div class='add'>+		goto free_ch;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;ch-&gt;free_list);</div><div class='add'>+	for (i = 0; i &lt; ch-&gt;rq_size; i++) {</div><div class='add'>+		ch-&gt;ioctx_ring[i]-&gt;ch = ch;</div><div class='add'>+		list_add_tail(&amp;ch-&gt;ioctx_ring[i]-&gt;free_list, &amp;ch-&gt;free_list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = srpt_create_ch_ib(ch);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rej-&gt;reason = __constant_cpu_to_be32(</div><div class='add'>+				SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);</div><div class='add'>+		printk(KERN_ERR "rejected SRP_LOGIN_REQ because creating"</div><div class='add'>+		       " a new RDMA channel failed.\n");</div><div class='add'>+		goto free_ring;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = srpt_ch_qp_rtr(ch, ch-&gt;qp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rej-&gt;reason = __constant_cpu_to_be32(</div><div class='add'>+				SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);</div><div class='add'>+		printk(KERN_ERR "rejected SRP_LOGIN_REQ because enabling"</div><div class='add'>+		       " RTR failed (error code = %d)\n", ret);</div><div class='add'>+		goto destroy_ib;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Use the initator port identifier as the session name.</div><div class='add'>+	 */</div><div class='add'>+	snprintf(ch-&gt;sess_name, sizeof(ch-&gt;sess_name), "0x%016llx%016llx",</div><div class='add'>+			be64_to_cpu(*(__be64 *)ch-&gt;i_port_id),</div><div class='add'>+			be64_to_cpu(*(__be64 *)(ch-&gt;i_port_id + 8)));</div><div class='add'>+</div><div class='add'>+	pr_debug("registering session %s\n", ch-&gt;sess_name);</div><div class='add'>+</div><div class='add'>+	nacl = srpt_lookup_acl(sport, ch-&gt;i_port_id);</div><div class='add'>+	if (!nacl) {</div><div class='add'>+		printk(KERN_INFO "Rejected login because no ACL has been"</div><div class='add'>+		       " configured yet for initiator %s.\n", ch-&gt;sess_name);</div><div class='add'>+		rej-&gt;reason = __constant_cpu_to_be32(</div><div class='add'>+				SRP_LOGIN_REJ_CHANNEL_LIMIT_REACHED);</div><div class='add'>+		goto destroy_ib;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ch-&gt;sess = transport_init_session();</div><div class='add'>+	if (!ch-&gt;sess) {</div><div class='add'>+		rej-&gt;reason = __constant_cpu_to_be32(</div><div class='add'>+				SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);</div><div class='add'>+		pr_debug("Failed to create session\n");</div><div class='add'>+		goto deregister_session;</div><div class='add'>+	}</div><div class='add'>+	ch-&gt;sess-&gt;se_node_acl = &amp;nacl-&gt;nacl;</div><div class='add'>+	transport_register_session(&amp;sport-&gt;port_tpg_1, &amp;nacl-&gt;nacl, ch-&gt;sess, ch);</div><div class='add'>+</div><div class='add'>+	pr_debug("Establish connection sess=%p name=%s cm_id=%p\n", ch-&gt;sess,</div><div class='add'>+		 ch-&gt;sess_name, ch-&gt;cm_id);</div><div class='add'>+</div><div class='add'>+	/* create srp_login_response */</div><div class='add'>+	rsp-&gt;opcode = SRP_LOGIN_RSP;</div><div class='add'>+	rsp-&gt;tag = req-&gt;tag;</div><div class='add'>+	rsp-&gt;max_it_iu_len = req-&gt;req_it_iu_len;</div><div class='add'>+	rsp-&gt;max_ti_iu_len = req-&gt;req_it_iu_len;</div><div class='add'>+	ch-&gt;max_ti_iu_len = it_iu_len;</div><div class='add'>+	rsp-&gt;buf_fmt = __constant_cpu_to_be16(SRP_BUF_FORMAT_DIRECT</div><div class='add'>+					      | SRP_BUF_FORMAT_INDIRECT);</div><div class='add'>+	rsp-&gt;req_lim_delta = cpu_to_be32(ch-&gt;rq_size);</div><div class='add'>+	atomic_set(&amp;ch-&gt;req_lim, ch-&gt;rq_size);</div><div class='add'>+	atomic_set(&amp;ch-&gt;req_lim_delta, 0);</div><div class='add'>+</div><div class='add'>+	/* create cm reply */</div><div class='add'>+	rep_param-&gt;qp_num = ch-&gt;qp-&gt;qp_num;</div><div class='add'>+	rep_param-&gt;private_data = (void *)rsp;</div><div class='add'>+	rep_param-&gt;private_data_len = sizeof *rsp;</div><div class='add'>+	rep_param-&gt;rnr_retry_count = 7;</div><div class='add'>+	rep_param-&gt;flow_control = 1;</div><div class='add'>+	rep_param-&gt;failover_accepted = 0;</div><div class='add'>+	rep_param-&gt;srq = 1;</div><div class='add'>+	rep_param-&gt;responder_resources = 4;</div><div class='add'>+	rep_param-&gt;initiator_depth = 4;</div><div class='add'>+</div><div class='add'>+	ret = ib_send_cm_rep(cm_id, rep_param);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR "sending SRP_LOGIN_REQ response failed"</div><div class='add'>+		       " (error code = %d)\n", ret);</div><div class='add'>+		goto release_channel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+	list_add_tail(&amp;ch-&gt;list, &amp;sdev-&gt;rch_list);</div><div class='add'>+	spin_unlock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+release_channel:</div><div class='add'>+	srpt_set_ch_state(ch, CH_RELEASING);</div><div class='add'>+	transport_deregister_session_configfs(ch-&gt;sess);</div><div class='add'>+</div><div class='add'>+deregister_session:</div><div class='add'>+	transport_deregister_session(ch-&gt;sess);</div><div class='add'>+	ch-&gt;sess = NULL;</div><div class='add'>+</div><div class='add'>+destroy_ib:</div><div class='add'>+	srpt_destroy_ch_ib(ch);</div><div class='add'>+</div><div class='add'>+free_ring:</div><div class='add'>+	srpt_free_ioctx_ring((struct srpt_ioctx **)ch-&gt;ioctx_ring,</div><div class='add'>+			     ch-&gt;sport-&gt;sdev, ch-&gt;rq_size,</div><div class='add'>+			     ch-&gt;rsp_size, DMA_TO_DEVICE);</div><div class='add'>+free_ch:</div><div class='add'>+	kfree(ch);</div><div class='add'>+</div><div class='add'>+reject:</div><div class='add'>+	rej-&gt;opcode = SRP_LOGIN_REJ;</div><div class='add'>+	rej-&gt;tag = req-&gt;tag;</div><div class='add'>+	rej-&gt;buf_fmt = __constant_cpu_to_be16(SRP_BUF_FORMAT_DIRECT</div><div class='add'>+					      | SRP_BUF_FORMAT_INDIRECT);</div><div class='add'>+</div><div class='add'>+	ib_send_cm_rej(cm_id, IB_CM_REJ_CONSUMER_DEFINED, NULL, 0,</div><div class='add'>+			     (void *)rej, sizeof *rej);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(rep_param);</div><div class='add'>+	kfree(rsp);</div><div class='add'>+	kfree(rej);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void srpt_cm_rej_recv(struct ib_cm_id *cm_id)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO "Received IB REJ for cm_id %p.\n", cm_id);</div><div class='add'>+	srpt_drain_channel(cm_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_cm_rtu_recv() - Process an IB_CM_RTU_RECEIVED or USER_ESTABLISHED event.</div><div class='add'>+ *</div><div class='add'>+ * An IB_CM_RTU_RECEIVED message indicates that the connection is established</div><div class='add'>+ * and that the recipient may begin transmitting (RTU = ready to use).</div><div class='add'>+ */</div><div class='add'>+static void srpt_cm_rtu_recv(struct ib_cm_id *cm_id)</div><div class='add'>+{</div><div class='add'>+	struct srpt_rdma_ch *ch;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ch = srpt_find_channel(cm_id-&gt;context, cm_id);</div><div class='add'>+	BUG_ON(!ch);</div><div class='add'>+</div><div class='add'>+	if (srpt_test_and_set_ch_state(ch, CH_CONNECTING, CH_LIVE)) {</div><div class='add'>+		struct srpt_recv_ioctx *ioctx, *ioctx_tmp;</div><div class='add'>+</div><div class='add'>+		ret = srpt_ch_qp_rts(ch, ch-&gt;qp);</div><div class='add'>+</div><div class='add'>+		list_for_each_entry_safe(ioctx, ioctx_tmp, &amp;ch-&gt;cmd_wait_list,</div><div class='add'>+					 wait_list) {</div><div class='add'>+			list_del(&amp;ioctx-&gt;wait_list);</div><div class='add'>+			srpt_handle_new_iu(ch, ioctx, NULL);</div><div class='add'>+		}</div><div class='add'>+		if (ret)</div><div class='add'>+			srpt_close_ch(ch);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void srpt_cm_timewait_exit(struct ib_cm_id *cm_id)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO "Received IB TimeWait exit for cm_id %p.\n", cm_id);</div><div class='add'>+	srpt_drain_channel(cm_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void srpt_cm_rep_error(struct ib_cm_id *cm_id)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO "Received IB REP error for cm_id %p.\n", cm_id);</div><div class='add'>+	srpt_drain_channel(cm_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_cm_dreq_recv() - Process reception of a DREQ message.</div><div class='add'>+ */</div><div class='add'>+static void srpt_cm_dreq_recv(struct ib_cm_id *cm_id)</div><div class='add'>+{</div><div class='add'>+	struct srpt_rdma_ch *ch;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	bool send_drep = false;</div><div class='add'>+</div><div class='add'>+	ch = srpt_find_channel(cm_id-&gt;context, cm_id);</div><div class='add'>+	BUG_ON(!ch);</div><div class='add'>+</div><div class='add'>+	pr_debug("cm_id= %p ch-&gt;state= %d\n", cm_id, srpt_get_ch_state(ch));</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ch-&gt;spinlock, flags);</div><div class='add'>+	switch (ch-&gt;state) {</div><div class='add'>+	case CH_CONNECTING:</div><div class='add'>+	case CH_LIVE:</div><div class='add'>+		send_drep = true;</div><div class='add'>+		ch-&gt;state = CH_DISCONNECTING;</div><div class='add'>+		break;</div><div class='add'>+	case CH_DISCONNECTING:</div><div class='add'>+	case CH_DRAINING:</div><div class='add'>+	case CH_RELEASING:</div><div class='add'>+		WARN(true, "unexpected channel state %d\n", ch-&gt;state);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;ch-&gt;spinlock, flags);</div><div class='add'>+</div><div class='add'>+	if (send_drep) {</div><div class='add'>+		if (ib_send_cm_drep(ch-&gt;cm_id, NULL, 0) &lt; 0)</div><div class='add'>+			printk(KERN_ERR "Sending IB DREP failed.\n");</div><div class='add'>+		printk(KERN_INFO "Received DREQ and sent DREP for session %s.\n",</div><div class='add'>+		       ch-&gt;sess_name);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_cm_drep_recv() - Process reception of a DREP message.</div><div class='add'>+ */</div><div class='add'>+static void srpt_cm_drep_recv(struct ib_cm_id *cm_id)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO "Received InfiniBand DREP message for cm_id %p.\n",</div><div class='add'>+	       cm_id);</div><div class='add'>+	srpt_drain_channel(cm_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_cm_handler() - IB connection manager callback function.</div><div class='add'>+ *</div><div class='add'>+ * A non-zero return value will cause the caller destroy the CM ID.</div><div class='add'>+ *</div><div class='add'>+ * Note: srpt_cm_handler() must only return a non-zero value when transferring</div><div class='add'>+ * ownership of the cm_id to a channel by srpt_cm_req_recv() failed. Returning</div><div class='add'>+ * a non-zero value in any other case will trigger a race with the</div><div class='add'>+ * ib_destroy_cm_id() call in srpt_release_channel().</div><div class='add'>+ */</div><div class='add'>+static int srpt_cm_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	switch (event-&gt;event) {</div><div class='add'>+	case IB_CM_REQ_RECEIVED:</div><div class='add'>+		ret = srpt_cm_req_recv(cm_id, &amp;event-&gt;param.req_rcvd,</div><div class='add'>+				       event-&gt;private_data);</div><div class='add'>+		break;</div><div class='add'>+	case IB_CM_REJ_RECEIVED:</div><div class='add'>+		srpt_cm_rej_recv(cm_id);</div><div class='add'>+		break;</div><div class='add'>+	case IB_CM_RTU_RECEIVED:</div><div class='add'>+	case IB_CM_USER_ESTABLISHED:</div><div class='add'>+		srpt_cm_rtu_recv(cm_id);</div><div class='add'>+		break;</div><div class='add'>+	case IB_CM_DREQ_RECEIVED:</div><div class='add'>+		srpt_cm_dreq_recv(cm_id);</div><div class='add'>+		break;</div><div class='add'>+	case IB_CM_DREP_RECEIVED:</div><div class='add'>+		srpt_cm_drep_recv(cm_id);</div><div class='add'>+		break;</div><div class='add'>+	case IB_CM_TIMEWAIT_EXIT:</div><div class='add'>+		srpt_cm_timewait_exit(cm_id);</div><div class='add'>+		break;</div><div class='add'>+	case IB_CM_REP_ERROR:</div><div class='add'>+		srpt_cm_rep_error(cm_id);</div><div class='add'>+		break;</div><div class='add'>+	case IB_CM_DREQ_ERROR:</div><div class='add'>+		printk(KERN_INFO "Received IB DREQ ERROR event.\n");</div><div class='add'>+		break;</div><div class='add'>+	case IB_CM_MRA_RECEIVED:</div><div class='add'>+		printk(KERN_INFO "Received IB MRA event\n");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "received unrecognized IB CM event %d\n",</div><div class='add'>+		       event-&gt;event);</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'>+ * srpt_perform_rdmas() - Perform IB RDMA.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero upon success or a negative number upon failure.</div><div class='add'>+ */</div><div class='add'>+static int srpt_perform_rdmas(struct srpt_rdma_ch *ch,</div><div class='add'>+			      struct srpt_send_ioctx *ioctx)</div><div class='add'>+{</div><div class='add'>+	struct ib_send_wr wr;</div><div class='add'>+	struct ib_send_wr *bad_wr;</div><div class='add'>+	struct rdma_iu *riu;</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+	int sq_wr_avail;</div><div class='add'>+	enum dma_data_direction dir;</div><div class='add'>+	const int n_rdma = ioctx-&gt;n_rdma;</div><div class='add'>+</div><div class='add'>+	dir = ioctx-&gt;cmd.data_direction;</div><div class='add'>+	if (dir == DMA_TO_DEVICE) {</div><div class='add'>+		/* write */</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		sq_wr_avail = atomic_sub_return(n_rdma, &amp;ch-&gt;sq_wr_avail);</div><div class='add'>+		if (sq_wr_avail &lt; 0) {</div><div class='add'>+			printk(KERN_WARNING "IB send queue full (needed %d)\n",</div><div class='add'>+			       n_rdma);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ioctx-&gt;rdma_aborted = false;</div><div class='add'>+	ret = 0;</div><div class='add'>+	riu = ioctx-&gt;rdma_ius;</div><div class='add'>+	memset(&amp;wr, 0, sizeof wr);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n_rdma; ++i, ++riu) {</div><div class='add'>+		if (dir == DMA_FROM_DEVICE) {</div><div class='add'>+			wr.opcode = IB_WR_RDMA_WRITE;</div><div class='add'>+			wr.wr_id = encode_wr_id(i == n_rdma - 1 ?</div><div class='add'>+						SRPT_RDMA_WRITE_LAST :</div><div class='add'>+						SRPT_RDMA_MID,</div><div class='add'>+						ioctx-&gt;ioctx.index);</div><div class='add'>+		} else {</div><div class='add'>+			wr.opcode = IB_WR_RDMA_READ;</div><div class='add'>+			wr.wr_id = encode_wr_id(i == n_rdma - 1 ?</div><div class='add'>+						SRPT_RDMA_READ_LAST :</div><div class='add'>+						SRPT_RDMA_MID,</div><div class='add'>+						ioctx-&gt;ioctx.index);</div><div class='add'>+		}</div><div class='add'>+		wr.next = NULL;</div><div class='add'>+		wr.wr.rdma.remote_addr = riu-&gt;raddr;</div><div class='add'>+		wr.wr.rdma.rkey = riu-&gt;rkey;</div><div class='add'>+		wr.num_sge = riu-&gt;sge_cnt;</div><div class='add'>+		wr.sg_list = riu-&gt;sge;</div><div class='add'>+</div><div class='add'>+		/* only get completion event for the last rdma write */</div><div class='add'>+		if (i == (n_rdma - 1) &amp;&amp; dir == DMA_TO_DEVICE)</div><div class='add'>+			wr.send_flags = IB_SEND_SIGNALED;</div><div class='add'>+</div><div class='add'>+		ret = ib_post_send(ch-&gt;qp, &amp;wr, &amp;bad_wr);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		printk(KERN_ERR "%s[%d]: ib_post_send() returned %d for %d/%d",</div><div class='add'>+				 __func__, __LINE__, ret, i, n_rdma);</div><div class='add'>+	if (ret &amp;&amp; i &gt; 0) {</div><div class='add'>+		wr.num_sge = 0;</div><div class='add'>+		wr.wr_id = encode_wr_id(SRPT_RDMA_ABORT, ioctx-&gt;ioctx.index);</div><div class='add'>+		wr.send_flags = IB_SEND_SIGNALED;</div><div class='add'>+		while (ch-&gt;state == CH_LIVE &amp;&amp;</div><div class='add'>+			ib_post_send(ch-&gt;qp, &amp;wr, &amp;bad_wr) != 0) {</div><div class='add'>+			printk(KERN_INFO "Trying to abort failed RDMA transfer [%d]",</div><div class='add'>+				ioctx-&gt;ioctx.index);</div><div class='add'>+			msleep(1000);</div><div class='add'>+		}</div><div class='add'>+		while (ch-&gt;state != CH_RELEASING &amp;&amp; !ioctx-&gt;rdma_aborted) {</div><div class='add'>+			printk(KERN_INFO "Waiting until RDMA abort finished [%d]",</div><div class='add'>+				ioctx-&gt;ioctx.index);</div><div class='add'>+			msleep(1000);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	if (unlikely(dir == DMA_TO_DEVICE &amp;&amp; ret &lt; 0))</div><div class='add'>+		atomic_add(n_rdma, &amp;ch-&gt;sq_wr_avail);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_xfer_data() - Start data transfer from initiator to target.</div><div class='add'>+ */</div><div class='add'>+static int srpt_xfer_data(struct srpt_rdma_ch *ch,</div><div class='add'>+			  struct srpt_send_ioctx *ioctx)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = srpt_map_sg_to_ib_sge(ch, ioctx);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR "%s[%d] ret=%d\n", __func__, __LINE__, ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = srpt_perform_rdmas(ch, ioctx);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (ret == -EAGAIN || ret == -ENOMEM)</div><div class='add'>+			printk(KERN_INFO "%s[%d] queue full -- ret=%d\n",</div><div class='add'>+				   __func__, __LINE__, ret);</div><div class='add'>+		else</div><div class='add'>+			printk(KERN_ERR "%s[%d] fatal error -- ret=%d\n",</div><div class='add'>+			       __func__, __LINE__, ret);</div><div class='add'>+		goto out_unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+out_unmap:</div><div class='add'>+	srpt_unmap_sg_to_ib_sge(ch, ioctx);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int srpt_write_pending_status(struct se_cmd *se_cmd)</div><div class='add'>+{</div><div class='add'>+	struct srpt_send_ioctx *ioctx;</div><div class='add'>+</div><div class='add'>+	ioctx = container_of(se_cmd, struct srpt_send_ioctx, cmd);</div><div class='add'>+	return srpt_get_cmd_state(ioctx) == SRPT_STATE_NEED_DATA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * srpt_write_pending() - Start data transfer from initiator to target (write).</div><div class='add'>+ */</div><div class='add'>+static int srpt_write_pending(struct se_cmd *se_cmd)</div><div class='add'>+{</div><div class='add'>+	struct srpt_rdma_ch *ch;</div><div class='add'>+	struct srpt_send_ioctx *ioctx;</div><div class='add'>+	enum srpt_command_state new_state;</div><div class='add'>+	enum rdma_ch_state ch_state;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ioctx = container_of(se_cmd, struct srpt_send_ioctx, cmd);</div><div class='add'>+</div><div class='add'>+	new_state = srpt_set_cmd_state(ioctx, SRPT_STATE_NEED_DATA);</div><div class='add'>+	WARN_ON(new_state == SRPT_STATE_DONE);</div><div class='add'>+</div><div class='add'>+	ch = ioctx-&gt;ch;</div><div class='add'>+	BUG_ON(!ch);</div><div class='add'>+</div><div class='add'>+	ch_state = srpt_get_ch_state(ch);</div><div class='add'>+	switch (ch_state) {</div><div class='add'>+	case CH_CONNECTING:</div><div class='add'>+		WARN(true, "unexpected channel state %d\n", ch_state);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	case CH_LIVE:</div><div class='add'>+		break;</div><div class='add'>+	case CH_DISCONNECTING:</div><div class='add'>+	case CH_DRAINING:</div><div class='add'>+	case CH_RELEASING:</div><div class='add'>+		pr_debug("cmd with tag %lld: channel disconnecting\n",</div><div class='add'>+			 ioctx-&gt;tag);</div><div class='add'>+		srpt_set_cmd_state(ioctx, SRPT_STATE_DATA_IN);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	ret = srpt_xfer_data(ch, ioctx);</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 u8 tcm_to_srp_tsk_mgmt_status(const int tcm_mgmt_status)</div><div class='add'>+{</div><div class='add'>+	switch (tcm_mgmt_status) {</div><div class='add'>+	case TMR_FUNCTION_COMPLETE:</div><div class='add'>+		return SRP_TSK_MGMT_SUCCESS;</div><div class='add'>+	case TMR_FUNCTION_REJECTED:</div><div class='add'>+		return SRP_TSK_MGMT_FUNC_NOT_SUPP;</div><div class='add'>+	}</div><div class='add'>+	return SRP_TSK_MGMT_FAILED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_queue_response() - Transmits the response to a SCSI command.</div><div class='add'>+ *</div><div class='add'>+ * Callback function called by the TCM core. Must not block since it can be</div><div class='add'>+ * invoked on the context of the IB completion handler.</div><div class='add'>+ */</div><div class='add'>+static int srpt_queue_response(struct se_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct srpt_rdma_ch *ch;</div><div class='add'>+	struct srpt_send_ioctx *ioctx;</div><div class='add'>+	enum srpt_command_state state;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='add'>+	enum dma_data_direction dir;</div><div class='add'>+	int resp_len;</div><div class='add'>+	u8 srp_tm_status;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+	ioctx = container_of(cmd, struct srpt_send_ioctx, cmd);</div><div class='add'>+	ch = ioctx-&gt;ch;</div><div class='add'>+	BUG_ON(!ch);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ioctx-&gt;spinlock, flags);</div><div class='add'>+	state = ioctx-&gt;state;</div><div class='add'>+	switch (state) {</div><div class='add'>+	case SRPT_STATE_NEW:</div><div class='add'>+	case SRPT_STATE_DATA_IN:</div><div class='add'>+		ioctx-&gt;state = SRPT_STATE_CMD_RSP_SENT;</div><div class='add'>+		break;</div><div class='add'>+	case SRPT_STATE_MGMT:</div><div class='add'>+		ioctx-&gt;state = SRPT_STATE_MGMT_RSP_SENT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN(true, "ch %p; cmd %d: unexpected command state %d\n",</div><div class='add'>+			ch, ioctx-&gt;ioctx.index, ioctx-&gt;state);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;ioctx-&gt;spinlock, flags);</div><div class='add'>+</div><div class='add'>+	if (unlikely(transport_check_aborted_status(&amp;ioctx-&gt;cmd, false)</div><div class='add'>+		     || WARN_ON_ONCE(state == SRPT_STATE_CMD_RSP_SENT))) {</div><div class='add'>+		atomic_inc(&amp;ch-&gt;req_lim_delta);</div><div class='add'>+		srpt_abort_cmd(ioctx);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dir = ioctx-&gt;cmd.data_direction;</div><div class='add'>+</div><div class='add'>+	/* For read commands, transfer the data to the initiator. */</div><div class='add'>+	if (dir == DMA_FROM_DEVICE &amp;&amp; ioctx-&gt;cmd.data_length &amp;&amp;</div><div class='add'>+	    !ioctx-&gt;queue_status_only) {</div><div class='add'>+		ret = srpt_xfer_data(ch, ioctx);</div><div class='add'>+		if (ret) {</div><div class='add'>+			printk(KERN_ERR "xfer_data failed for tag %llu\n",</div><div class='add'>+			       ioctx-&gt;tag);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (state != SRPT_STATE_MGMT)</div><div class='add'>+		resp_len = srpt_build_cmd_rsp(ch, ioctx, ioctx-&gt;tag,</div><div class='add'>+					      cmd-&gt;scsi_status);</div><div class='add'>+	else {</div><div class='add'>+		srp_tm_status</div><div class='add'>+			= tcm_to_srp_tsk_mgmt_status(cmd-&gt;se_tmr_req-&gt;response);</div><div class='add'>+		resp_len = srpt_build_tskmgmt_rsp(ch, ioctx, srp_tm_status,</div><div class='add'>+						 ioctx-&gt;tag);</div><div class='add'>+	}</div><div class='add'>+	ret = srpt_post_send(ch, ioctx, resp_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR "sending cmd response failed for tag %llu\n",</div><div class='add'>+		       ioctx-&gt;tag);</div><div class='add'>+		srpt_unmap_sg_to_ib_sge(ch, ioctx);</div><div class='add'>+		srpt_set_cmd_state(ioctx, SRPT_STATE_DONE);</div><div class='add'>+		kref_put(&amp;ioctx-&gt;kref, srpt_put_send_ioctx_kref);</div><div class='add'>+	}</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 srpt_queue_status(struct se_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct srpt_send_ioctx *ioctx;</div><div class='add'>+</div><div class='add'>+	ioctx = container_of(cmd, struct srpt_send_ioctx, cmd);</div><div class='add'>+	BUG_ON(ioctx-&gt;sense_data != cmd-&gt;sense_buffer);</div><div class='add'>+	if (cmd-&gt;se_cmd_flags &amp;</div><div class='add'>+	    (SCF_TRANSPORT_TASK_SENSE | SCF_EMULATED_TASK_SENSE))</div><div class='add'>+		WARN_ON(cmd-&gt;scsi_status != SAM_STAT_CHECK_CONDITION);</div><div class='add'>+	ioctx-&gt;queue_status_only = true;</div><div class='add'>+	return srpt_queue_response(cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void srpt_refresh_port_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct srpt_port *sport = container_of(work, struct srpt_port, work);</div><div class='add'>+</div><div class='add'>+	srpt_refresh_port(sport);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int srpt_ch_list_empty(struct srpt_device *sdev)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+	res = list_empty(&amp;sdev-&gt;rch_list);</div><div class='add'>+	spin_unlock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_release_sdev() - Free the channel resources associated with a target.</div><div class='add'>+ */</div><div class='add'>+static int srpt_release_sdev(struct srpt_device *sdev)</div><div class='add'>+{</div><div class='add'>+	struct srpt_rdma_ch *ch, *tmp_ch;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(irqs_disabled());</div><div class='add'>+</div><div class='add'>+	BUG_ON(!sdev);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+	list_for_each_entry_safe(ch, tmp_ch, &amp;sdev-&gt;rch_list, list)</div><div class='add'>+		__srpt_close_ch(ch);</div><div class='add'>+	spin_unlock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+</div><div class='add'>+	res = wait_event_interruptible(sdev-&gt;ch_releaseQ,</div><div class='add'>+				       srpt_ch_list_empty(sdev));</div><div class='add'>+	if (res)</div><div class='add'>+		printk(KERN_ERR "%s: interrupted.\n", __func__);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct srpt_port *__srpt_lookup_port(const char *name)</div><div class='add'>+{</div><div class='add'>+	struct ib_device *dev;</div><div class='add'>+	struct srpt_device *sdev;</div><div class='add'>+	struct srpt_port *sport;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(sdev, &amp;srpt_dev_list, list) {</div><div class='add'>+		dev = sdev-&gt;device;</div><div class='add'>+		if (!dev)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; dev-&gt;phys_port_cnt; i++) {</div><div class='add'>+			sport = &amp;sdev-&gt;port[i];</div><div class='add'>+</div><div class='add'>+			if (!strcmp(sport-&gt;port_guid, name))</div><div class='add'>+				return sport;</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 srpt_port *srpt_lookup_port(const char *name)</div><div class='add'>+{</div><div class='add'>+	struct srpt_port *sport;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;srpt_dev_lock);</div><div class='add'>+	sport = __srpt_lookup_port(name);</div><div class='add'>+	spin_unlock(&amp;srpt_dev_lock);</div><div class='add'>+</div><div class='add'>+	return sport;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_add_one() - Infiniband device addition callback function.</div><div class='add'>+ */</div><div class='add'>+static void srpt_add_one(struct ib_device *device)</div><div class='add'>+{</div><div class='add'>+	struct srpt_device *sdev;</div><div class='add'>+	struct srpt_port *sport;</div><div class='add'>+	struct ib_srq_init_attr srq_attr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	pr_debug("device = %p, device-&gt;dma_ops = %p\n", device,</div><div class='add'>+		 device-&gt;dma_ops);</div><div class='add'>+</div><div class='add'>+	sdev = kzalloc(sizeof *sdev, GFP_KERNEL);</div><div class='add'>+	if (!sdev)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	sdev-&gt;device = device;</div><div class='add'>+	INIT_LIST_HEAD(&amp;sdev-&gt;rch_list);</div><div class='add'>+	init_waitqueue_head(&amp;sdev-&gt;ch_releaseQ);</div><div class='add'>+	spin_lock_init(&amp;sdev-&gt;spinlock);</div><div class='add'>+</div><div class='add'>+	if (ib_query_device(device, &amp;sdev-&gt;dev_attr))</div><div class='add'>+		goto free_dev;</div><div class='add'>+</div><div class='add'>+	sdev-&gt;pd = ib_alloc_pd(device);</div><div class='add'>+	if (IS_ERR(sdev-&gt;pd))</div><div class='add'>+		goto free_dev;</div><div class='add'>+</div><div class='add'>+	sdev-&gt;mr = ib_get_dma_mr(sdev-&gt;pd, IB_ACCESS_LOCAL_WRITE);</div><div class='add'>+	if (IS_ERR(sdev-&gt;mr))</div><div class='add'>+		goto err_pd;</div><div class='add'>+</div><div class='add'>+	sdev-&gt;srq_size = min(srpt_srq_size, sdev-&gt;dev_attr.max_srq_wr);</div><div class='add'>+</div><div class='add'>+	srq_attr.event_handler = srpt_srq_event;</div><div class='add'>+	srq_attr.srq_context = (void *)sdev;</div><div class='add'>+	srq_attr.attr.max_wr = sdev-&gt;srq_size;</div><div class='add'>+	srq_attr.attr.max_sge = 1;</div><div class='add'>+	srq_attr.attr.srq_limit = 0;</div><div class='add'>+</div><div class='add'>+	sdev-&gt;srq = ib_create_srq(sdev-&gt;pd, &amp;srq_attr);</div><div class='add'>+	if (IS_ERR(sdev-&gt;srq))</div><div class='add'>+		goto err_mr;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s: create SRQ #wr= %d max_allow=%d dev= %s\n",</div><div class='add'>+		 __func__, sdev-&gt;srq_size, sdev-&gt;dev_attr.max_srq_wr,</div><div class='add'>+		 device-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (!srpt_service_guid)</div><div class='add'>+		srpt_service_guid = be64_to_cpu(device-&gt;node_guid);</div><div class='add'>+</div><div class='add'>+	sdev-&gt;cm_id = ib_create_cm_id(device, srpt_cm_handler, sdev);</div><div class='add'>+	if (IS_ERR(sdev-&gt;cm_id))</div><div class='add'>+		goto err_srq;</div><div class='add'>+</div><div class='add'>+	/* print out target login information */</div><div class='add'>+	pr_debug("Target login info: id_ext=%016llx,ioc_guid=%016llx,"</div><div class='add'>+		 "pkey=ffff,service_id=%016llx\n", srpt_service_guid,</div><div class='add'>+		 srpt_service_guid, srpt_service_guid);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We do not have a consistent service_id (ie. also id_ext of target_id)</div><div class='add'>+	 * to identify this target. We currently use the guid of the first HCA</div><div class='add'>+	 * in the system as service_id; therefore, the target_id will change</div><div class='add'>+	 * if this HCA is gone bad and replaced by different HCA</div><div class='add'>+	 */</div><div class='add'>+	if (ib_cm_listen(sdev-&gt;cm_id, cpu_to_be64(srpt_service_guid), 0, NULL))</div><div class='add'>+		goto err_cm;</div><div class='add'>+</div><div class='add'>+	INIT_IB_EVENT_HANDLER(&amp;sdev-&gt;event_handler, sdev-&gt;device,</div><div class='add'>+			      srpt_event_handler);</div><div class='add'>+	if (ib_register_event_handler(&amp;sdev-&gt;event_handler))</div><div class='add'>+		goto err_cm;</div><div class='add'>+</div><div class='add'>+	sdev-&gt;ioctx_ring = (struct srpt_recv_ioctx **)</div><div class='add'>+		srpt_alloc_ioctx_ring(sdev, sdev-&gt;srq_size,</div><div class='add'>+				      sizeof(*sdev-&gt;ioctx_ring[0]),</div><div class='add'>+				      srp_max_req_size, DMA_FROM_DEVICE);</div><div class='add'>+	if (!sdev-&gt;ioctx_ring)</div><div class='add'>+		goto err_event;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sdev-&gt;srq_size; ++i)</div><div class='add'>+		srpt_post_recv(sdev, sdev-&gt;ioctx_ring[i]);</div><div class='add'>+</div><div class='add'>+	WARN_ON(sdev-&gt;device-&gt;phys_port_cnt</div><div class='add'>+		&gt; sizeof(sdev-&gt;port)/sizeof(sdev-&gt;port[0]));</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt;= sdev-&gt;device-&gt;phys_port_cnt; i++) {</div><div class='add'>+		sport = &amp;sdev-&gt;port[i - 1];</div><div class='add'>+		sport-&gt;sdev = sdev;</div><div class='add'>+		sport-&gt;port = i;</div><div class='add'>+		sport-&gt;port_attrib.srp_max_rdma_size = DEFAULT_MAX_RDMA_SIZE;</div><div class='add'>+		sport-&gt;port_attrib.srp_max_rsp_size = DEFAULT_MAX_RSP_SIZE;</div><div class='add'>+		sport-&gt;port_attrib.srp_sq_size = DEF_SRPT_SQ_SIZE;</div><div class='add'>+		INIT_WORK(&amp;sport-&gt;work, srpt_refresh_port_work);</div><div class='add'>+		INIT_LIST_HEAD(&amp;sport-&gt;port_acl_list);</div><div class='add'>+		spin_lock_init(&amp;sport-&gt;port_acl_lock);</div><div class='add'>+</div><div class='add'>+		if (srpt_refresh_port(sport)) {</div><div class='add'>+			printk(KERN_ERR "MAD registration failed for %s-%d.\n",</div><div class='add'>+			       srpt_sdev_name(sdev), i);</div><div class='add'>+			goto err_ring;</div><div class='add'>+		}</div><div class='add'>+		snprintf(sport-&gt;port_guid, sizeof(sport-&gt;port_guid),</div><div class='add'>+			"0x%016llx%016llx",</div><div class='add'>+			be64_to_cpu(sport-&gt;gid.global.subnet_prefix),</div><div class='add'>+			be64_to_cpu(sport-&gt;gid.global.interface_id));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;srpt_dev_lock);</div><div class='add'>+	list_add_tail(&amp;sdev-&gt;list, &amp;srpt_dev_list);</div><div class='add'>+	spin_unlock(&amp;srpt_dev_lock);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	ib_set_client_data(device, &amp;srpt_client, sdev);</div><div class='add'>+	pr_debug("added %s.\n", device-&gt;name);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err_ring:</div><div class='add'>+	srpt_free_ioctx_ring((struct srpt_ioctx **)sdev-&gt;ioctx_ring, sdev,</div><div class='add'>+			     sdev-&gt;srq_size, srp_max_req_size,</div><div class='add'>+			     DMA_FROM_DEVICE);</div><div class='add'>+err_event:</div><div class='add'>+	ib_unregister_event_handler(&amp;sdev-&gt;event_handler);</div><div class='add'>+err_cm:</div><div class='add'>+	ib_destroy_cm_id(sdev-&gt;cm_id);</div><div class='add'>+err_srq:</div><div class='add'>+	ib_destroy_srq(sdev-&gt;srq);</div><div class='add'>+err_mr:</div><div class='add'>+	ib_dereg_mr(sdev-&gt;mr);</div><div class='add'>+err_pd:</div><div class='add'>+	ib_dealloc_pd(sdev-&gt;pd);</div><div class='add'>+free_dev:</div><div class='add'>+	kfree(sdev);</div><div class='add'>+err:</div><div class='add'>+	sdev = NULL;</div><div class='add'>+	printk(KERN_INFO "%s(%s) failed.\n", __func__, device-&gt;name);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_remove_one() - InfiniBand device removal callback function.</div><div class='add'>+ */</div><div class='add'>+static void srpt_remove_one(struct ib_device *device)</div><div class='add'>+{</div><div class='add'>+	struct srpt_device *sdev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	sdev = ib_get_client_data(device, &amp;srpt_client);</div><div class='add'>+	if (!sdev) {</div><div class='add'>+		printk(KERN_INFO "%s(%s): nothing to do.\n", __func__,</div><div class='add'>+		       device-&gt;name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	srpt_unregister_mad_agent(sdev);</div><div class='add'>+</div><div class='add'>+	ib_unregister_event_handler(&amp;sdev-&gt;event_handler);</div><div class='add'>+</div><div class='add'>+	/* Cancel any work queued by the just unregistered IB event handler. */</div><div class='add'>+	for (i = 0; i &lt; sdev-&gt;device-&gt;phys_port_cnt; i++)</div><div class='add'>+		cancel_work_sync(&amp;sdev-&gt;port[i].work);</div><div class='add'>+</div><div class='add'>+	ib_destroy_cm_id(sdev-&gt;cm_id);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Unregistering a target must happen after destroying sdev-&gt;cm_id</div><div class='add'>+	 * such that no new SRP_LOGIN_REQ information units can arrive while</div><div class='add'>+	 * destroying the target.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock(&amp;srpt_dev_lock);</div><div class='add'>+	list_del(&amp;sdev-&gt;list);</div><div class='add'>+	spin_unlock(&amp;srpt_dev_lock);</div><div class='add'>+	srpt_release_sdev(sdev);</div><div class='add'>+</div><div class='add'>+	ib_destroy_srq(sdev-&gt;srq);</div><div class='add'>+	ib_dereg_mr(sdev-&gt;mr);</div><div class='add'>+	ib_dealloc_pd(sdev-&gt;pd);</div><div class='add'>+</div><div class='add'>+	srpt_free_ioctx_ring((struct srpt_ioctx **)sdev-&gt;ioctx_ring, sdev,</div><div class='add'>+			     sdev-&gt;srq_size, srp_max_req_size, DMA_FROM_DEVICE);</div><div class='add'>+	sdev-&gt;ioctx_ring = NULL;</div><div class='add'>+	kfree(sdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ib_client srpt_client = {</div><div class='add'>+	.name = DRV_NAME,</div><div class='add'>+	.add = srpt_add_one,</div><div class='add'>+	.remove = srpt_remove_one</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int srpt_check_true(struct se_portal_group *se_tpg)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int srpt_check_false(struct se_portal_group *se_tpg)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *srpt_get_fabric_name(void)</div><div class='add'>+{</div><div class='add'>+	return "srpt";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 srpt_get_fabric_proto_ident(struct se_portal_group *se_tpg)</div><div class='add'>+{</div><div class='add'>+	return SCSI_TRANSPORTID_PROTOCOLID_SRP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *srpt_get_fabric_wwn(struct se_portal_group *tpg)</div><div class='add'>+{</div><div class='add'>+	struct srpt_port *sport = container_of(tpg, struct srpt_port, port_tpg_1);</div><div class='add'>+</div><div class='add'>+	return sport-&gt;port_guid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 srpt_get_tag(struct se_portal_group *tpg)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 srpt_get_default_depth(struct se_portal_group *se_tpg)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 srpt_get_pr_transport_id(struct se_portal_group *se_tpg,</div><div class='add'>+				    struct se_node_acl *se_nacl,</div><div class='add'>+				    struct t10_pr_registration *pr_reg,</div><div class='add'>+				    int *format_code, unsigned char *buf)</div><div class='add'>+{</div><div class='add'>+	struct srpt_node_acl *nacl;</div><div class='add'>+	struct spc_rdma_transport_id *tr_id;</div><div class='add'>+</div><div class='add'>+	nacl = container_of(se_nacl, struct srpt_node_acl, nacl);</div><div class='add'>+	tr_id = (void *)buf;</div><div class='add'>+	tr_id-&gt;protocol_identifier = SCSI_TRANSPORTID_PROTOCOLID_SRP;</div><div class='add'>+	memcpy(tr_id-&gt;i_port_id, nacl-&gt;i_port_id, sizeof(tr_id-&gt;i_port_id));</div><div class='add'>+	return sizeof(*tr_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 srpt_get_pr_transport_id_len(struct se_portal_group *se_tpg,</div><div class='add'>+					struct se_node_acl *se_nacl,</div><div class='add'>+					struct t10_pr_registration *pr_reg,</div><div class='add'>+					int *format_code)</div><div class='add'>+{</div><div class='add'>+	*format_code = 0;</div><div class='add'>+	return sizeof(struct spc_rdma_transport_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *srpt_parse_pr_out_transport_id(struct se_portal_group *se_tpg,</div><div class='add'>+					    const char *buf, u32 *out_tid_len,</div><div class='add'>+					    char **port_nexus_ptr)</div><div class='add'>+{</div><div class='add'>+	struct spc_rdma_transport_id *tr_id;</div><div class='add'>+</div><div class='add'>+	*port_nexus_ptr = NULL;</div><div class='add'>+	*out_tid_len = sizeof(struct spc_rdma_transport_id);</div><div class='add'>+	tr_id = (void *)buf;</div><div class='add'>+	return (char *)tr_id-&gt;i_port_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct se_node_acl *srpt_alloc_fabric_acl(struct se_portal_group *se_tpg)</div><div class='add'>+{</div><div class='add'>+	struct srpt_node_acl *nacl;</div><div class='add'>+</div><div class='add'>+	nacl = kzalloc(sizeof(struct srpt_node_acl), GFP_KERNEL);</div><div class='add'>+	if (!nacl) {</div><div class='add'>+		printk(KERN_ERR "Unable to alocate struct srpt_node_acl\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return &amp;nacl-&gt;nacl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void srpt_release_fabric_acl(struct se_portal_group *se_tpg,</div><div class='add'>+				    struct se_node_acl *se_nacl)</div><div class='add'>+{</div><div class='add'>+	struct srpt_node_acl *nacl;</div><div class='add'>+</div><div class='add'>+	nacl = container_of(se_nacl, struct srpt_node_acl, nacl);</div><div class='add'>+	kfree(nacl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 srpt_tpg_get_inst_index(struct se_portal_group *se_tpg)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void srpt_release_cmd(struct se_cmd *se_cmd)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_shutdown_session() - Whether or not a session may be shut down.</div><div class='add'>+ */</div><div class='add'>+static int srpt_shutdown_session(struct se_session *se_sess)</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'>+ * srpt_close_session() - Forcibly close a session.</div><div class='add'>+ *</div><div class='add'>+ * Callback function invoked by the TCM core to clean up sessions associated</div><div class='add'>+ * with a node ACL when the user invokes</div><div class='add'>+ * rmdir /sys/kernel/config/target/$driver/$port/$tpg/acls/$i_port_id</div><div class='add'>+ */</div><div class='add'>+static void srpt_close_session(struct se_session *se_sess)</div><div class='add'>+{</div><div class='add'>+	DECLARE_COMPLETION_ONSTACK(release_done);</div><div class='add'>+	struct srpt_rdma_ch *ch;</div><div class='add'>+	struct srpt_device *sdev;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	ch = se_sess-&gt;fabric_sess_ptr;</div><div class='add'>+	WARN_ON(ch-&gt;sess != se_sess);</div><div class='add'>+</div><div class='add'>+	pr_debug("ch %p state %d\n", ch, srpt_get_ch_state(ch));</div><div class='add'>+</div><div class='add'>+	sdev = ch-&gt;sport-&gt;sdev;</div><div class='add'>+	spin_lock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+	BUG_ON(ch-&gt;release_done);</div><div class='add'>+	ch-&gt;release_done = &amp;release_done;</div><div class='add'>+	__srpt_close_ch(ch);</div><div class='add'>+	spin_unlock_irq(&amp;sdev-&gt;spinlock);</div><div class='add'>+</div><div class='add'>+	res = wait_for_completion_timeout(&amp;release_done, 60 * HZ);</div><div class='add'>+	WARN_ON(res &lt;= 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * To do: Find out whether stop_session() has a meaning for transports</div><div class='add'>+ * other than iSCSI.</div><div class='add'>+ */</div><div class='add'>+static void srpt_stop_session(struct se_session *se_sess, int sess_sleep,</div><div class='add'>+			      int conn_sleep)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void srpt_reset_nexus(struct se_session *sess)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_ERR "This is the SRP protocol, not iSCSI\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int srpt_sess_logged_in(struct se_session *se_sess)</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'>+ * srpt_sess_get_index() - Return the value of scsiAttIntrPortIndex (SCSI-MIB).</div><div class='add'>+ *</div><div class='add'>+ * A quote from RFC 4455 (SCSI-MIB) about this MIB object:</div><div class='add'>+ * This object represents an arbitrary integer used to uniquely identify a</div><div class='add'>+ * particular attached remote initiator port to a particular SCSI target port</div><div class='add'>+ * within a particular SCSI target device within a particular SCSI instance.</div><div class='add'>+ */</div><div class='add'>+static u32 srpt_sess_get_index(struct se_session *se_sess)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void srpt_set_default_node_attrs(struct se_node_acl *nacl)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 srpt_get_task_tag(struct se_cmd *se_cmd)</div><div class='add'>+{</div><div class='add'>+	struct srpt_send_ioctx *ioctx;</div><div class='add'>+</div><div class='add'>+	ioctx = container_of(se_cmd, struct srpt_send_ioctx, cmd);</div><div class='add'>+	return ioctx-&gt;tag;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Note: only used from inside debug printk's by the TCM core. */</div><div class='add'>+static int srpt_get_tcm_cmd_state(struct se_cmd *se_cmd)</div><div class='add'>+{</div><div class='add'>+	struct srpt_send_ioctx *ioctx;</div><div class='add'>+</div><div class='add'>+	ioctx = container_of(se_cmd, struct srpt_send_ioctx, cmd);</div><div class='add'>+	return srpt_get_cmd_state(ioctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 srpt_set_fabric_sense_len(struct se_cmd *cmd, u32 sense_length)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 srpt_get_fabric_sense_len(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int srpt_is_state_remove(struct se_cmd *se_cmd)</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'>+ * srpt_parse_i_port_id() - Parse an initiator port ID.</div><div class='add'>+ * @name: ASCII representation of a 128-bit initiator port ID.</div><div class='add'>+ * @i_port_id: Binary 128-bit port ID.</div><div class='add'>+ */</div><div class='add'>+static int srpt_parse_i_port_id(u8 i_port_id[16], const char *name)</div><div class='add'>+{</div><div class='add'>+	const char *p;</div><div class='add'>+	unsigned len, count, leading_zero_bytes;</div><div class='add'>+	int ret, rc;</div><div class='add'>+</div><div class='add'>+	p = name;</div><div class='add'>+	if (strnicmp(p, "0x", 2) == 0)</div><div class='add'>+		p += 2;</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	len = strlen(p);</div><div class='add'>+	if (len % 2)</div><div class='add'>+		goto out;</div><div class='add'>+	count = min(len / 2, 16U);</div><div class='add'>+	leading_zero_bytes = 16 - count;</div><div class='add'>+	memset(i_port_id, 0, leading_zero_bytes);</div><div class='add'>+	rc = hex2bin(i_port_id + leading_zero_bytes, p, count);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		pr_debug("hex2bin failed for srpt_parse_i_port_id: %d\n", rc);</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='add'>+/*</div><div class='add'>+ * configfs callback function invoked for</div><div class='add'>+ * mkdir /sys/kernel/config/target/$driver/$port/$tpg/acls/$i_port_id</div><div class='add'>+ */</div><div class='add'>+static struct se_node_acl *srpt_make_nodeacl(struct se_portal_group *tpg,</div><div class='add'>+					     struct config_group *group,</div><div class='add'>+					     const char *name)</div><div class='add'>+{</div><div class='add'>+	struct srpt_port *sport = container_of(tpg, struct srpt_port, port_tpg_1);</div><div class='add'>+	struct se_node_acl *se_nacl, *se_nacl_new;</div><div class='add'>+	struct srpt_node_acl *nacl;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 nexus_depth = 1;</div><div class='add'>+	u8 i_port_id[16];</div><div class='add'>+</div><div class='add'>+	if (srpt_parse_i_port_id(i_port_id, name) &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "invalid initiator port ID %s\n", name);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	se_nacl_new = srpt_alloc_fabric_acl(tpg);</div><div class='add'>+	if (!se_nacl_new) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * nacl_new may be released by core_tpg_add_initiator_node_acl()</div><div class='add'>+	 * when converting a node ACL from demo mode to explict</div><div class='add'>+	 */</div><div class='add'>+	se_nacl = core_tpg_add_initiator_node_acl(tpg, se_nacl_new, name,</div><div class='add'>+						  nexus_depth);</div><div class='add'>+	if (IS_ERR(se_nacl)) {</div><div class='add'>+		ret = PTR_ERR(se_nacl);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	/* Locate our struct srpt_node_acl and set sdev and i_port_id. */</div><div class='add'>+	nacl = container_of(se_nacl, struct srpt_node_acl, nacl);</div><div class='add'>+	memcpy(&amp;nacl-&gt;i_port_id[0], &amp;i_port_id[0], 16);</div><div class='add'>+	nacl-&gt;sport = sport;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;sport-&gt;port_acl_lock);</div><div class='add'>+	list_add_tail(&amp;nacl-&gt;list, &amp;sport-&gt;port_acl_list);</div><div class='add'>+	spin_unlock_irq(&amp;sport-&gt;port_acl_lock);</div><div class='add'>+</div><div class='add'>+	return se_nacl;</div><div class='add'>+err:</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * configfs callback function invoked for</div><div class='add'>+ * rmdir /sys/kernel/config/target/$driver/$port/$tpg/acls/$i_port_id</div><div class='add'>+ */</div><div class='add'>+static void srpt_drop_nodeacl(struct se_node_acl *se_nacl)</div><div class='add'>+{</div><div class='add'>+	struct srpt_node_acl *nacl;</div><div class='add'>+	struct srpt_device *sdev;</div><div class='add'>+	struct srpt_port *sport;</div><div class='add'>+</div><div class='add'>+	nacl = container_of(se_nacl, struct srpt_node_acl, nacl);</div><div class='add'>+	sport = nacl-&gt;sport;</div><div class='add'>+	sdev = sport-&gt;sdev;</div><div class='add'>+	spin_lock_irq(&amp;sport-&gt;port_acl_lock);</div><div class='add'>+	list_del(&amp;nacl-&gt;list);</div><div class='add'>+	spin_unlock_irq(&amp;sport-&gt;port_acl_lock);</div><div class='add'>+	core_tpg_del_initiator_node_acl(&amp;sport-&gt;port_tpg_1, se_nacl, 1);</div><div class='add'>+	srpt_release_fabric_acl(NULL, se_nacl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t srpt_tpg_attrib_show_srp_max_rdma_size(</div><div class='add'>+	struct se_portal_group *se_tpg,</div><div class='add'>+	char *page)</div><div class='add'>+{</div><div class='add'>+	struct srpt_port *sport = container_of(se_tpg, struct srpt_port, port_tpg_1);</div><div class='add'>+</div><div class='add'>+	return sprintf(page, "%u\n", sport-&gt;port_attrib.srp_max_rdma_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t srpt_tpg_attrib_store_srp_max_rdma_size(</div><div class='add'>+	struct se_portal_group *se_tpg,</div><div class='add'>+	const char *page,</div><div class='add'>+	size_t count)</div><div class='add'>+{</div><div class='add'>+	struct srpt_port *sport = container_of(se_tpg, struct srpt_port, port_tpg_1);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = strict_strtoul(page, 0, &amp;val);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pr_err("strict_strtoul() failed with ret: %d\n", ret);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (val &gt; MAX_SRPT_RDMA_SIZE) {</div><div class='add'>+		pr_err("val: %lu exceeds MAX_SRPT_RDMA_SIZE: %d\n", val,</div><div class='add'>+			MAX_SRPT_RDMA_SIZE);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (val &lt; DEFAULT_MAX_RDMA_SIZE) {</div><div class='add'>+		pr_err("val: %lu smaller than DEFAULT_MAX_RDMA_SIZE: %d\n",</div><div class='add'>+			val, DEFAULT_MAX_RDMA_SIZE);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	sport-&gt;port_attrib.srp_max_rdma_size = val;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TF_TPG_ATTRIB_ATTR(srpt, srp_max_rdma_size, S_IRUGO | S_IWUSR);</div><div class='add'>+</div><div class='add'>+static ssize_t srpt_tpg_attrib_show_srp_max_rsp_size(</div><div class='add'>+	struct se_portal_group *se_tpg,</div><div class='add'>+	char *page)</div><div class='add'>+{</div><div class='add'>+	struct srpt_port *sport = container_of(se_tpg, struct srpt_port, port_tpg_1);</div><div class='add'>+</div><div class='add'>+	return sprintf(page, "%u\n", sport-&gt;port_attrib.srp_max_rsp_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t srpt_tpg_attrib_store_srp_max_rsp_size(</div><div class='add'>+	struct se_portal_group *se_tpg,</div><div class='add'>+	const char *page,</div><div class='add'>+	size_t count)</div><div class='add'>+{</div><div class='add'>+	struct srpt_port *sport = container_of(se_tpg, struct srpt_port, port_tpg_1);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = strict_strtoul(page, 0, &amp;val);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pr_err("strict_strtoul() failed with ret: %d\n", ret);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (val &gt; MAX_SRPT_RSP_SIZE) {</div><div class='add'>+		pr_err("val: %lu exceeds MAX_SRPT_RSP_SIZE: %d\n", val,</div><div class='add'>+			MAX_SRPT_RSP_SIZE);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (val &lt; MIN_MAX_RSP_SIZE) {</div><div class='add'>+		pr_err("val: %lu smaller than MIN_MAX_RSP_SIZE: %d\n", val,</div><div class='add'>+			MIN_MAX_RSP_SIZE);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	sport-&gt;port_attrib.srp_max_rsp_size = val;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TF_TPG_ATTRIB_ATTR(srpt, srp_max_rsp_size, S_IRUGO | S_IWUSR);</div><div class='add'>+</div><div class='add'>+static ssize_t srpt_tpg_attrib_show_srp_sq_size(</div><div class='add'>+	struct se_portal_group *se_tpg,</div><div class='add'>+	char *page)</div><div class='add'>+{</div><div class='add'>+	struct srpt_port *sport = container_of(se_tpg, struct srpt_port, port_tpg_1);</div><div class='add'>+</div><div class='add'>+	return sprintf(page, "%u\n", sport-&gt;port_attrib.srp_sq_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t srpt_tpg_attrib_store_srp_sq_size(</div><div class='add'>+	struct se_portal_group *se_tpg,</div><div class='add'>+	const char *page,</div><div class='add'>+	size_t count)</div><div class='add'>+{</div><div class='add'>+	struct srpt_port *sport = container_of(se_tpg, struct srpt_port, port_tpg_1);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = strict_strtoul(page, 0, &amp;val);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pr_err("strict_strtoul() failed with ret: %d\n", ret);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (val &gt; MAX_SRPT_SRQ_SIZE) {</div><div class='add'>+		pr_err("val: %lu exceeds MAX_SRPT_SRQ_SIZE: %d\n", val,</div><div class='add'>+			MAX_SRPT_SRQ_SIZE);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (val &lt; MIN_SRPT_SRQ_SIZE) {</div><div class='add'>+		pr_err("val: %lu smaller than MIN_SRPT_SRQ_SIZE: %d\n", val,</div><div class='add'>+			MIN_SRPT_SRQ_SIZE);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	sport-&gt;port_attrib.srp_sq_size = val;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TF_TPG_ATTRIB_ATTR(srpt, srp_sq_size, S_IRUGO | S_IWUSR);</div><div class='add'>+</div><div class='add'>+static struct configfs_attribute *srpt_tpg_attrib_attrs[] = {</div><div class='add'>+	&amp;srpt_tpg_attrib_srp_max_rdma_size.attr,</div><div class='add'>+	&amp;srpt_tpg_attrib_srp_max_rsp_size.attr,</div><div class='add'>+	&amp;srpt_tpg_attrib_srp_sq_size.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t srpt_tpg_show_enable(</div><div class='add'>+	struct se_portal_group *se_tpg,</div><div class='add'>+	char *page)</div><div class='add'>+{</div><div class='add'>+	struct srpt_port *sport = container_of(se_tpg, struct srpt_port, port_tpg_1);</div><div class='add'>+</div><div class='add'>+	return snprintf(page, PAGE_SIZE, "%d\n", (sport-&gt;enabled) ? 1: 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t srpt_tpg_store_enable(</div><div class='add'>+	struct se_portal_group *se_tpg,</div><div class='add'>+	const char *page,</div><div class='add'>+	size_t count)</div><div class='add'>+{</div><div class='add'>+	struct srpt_port *sport = container_of(se_tpg, struct srpt_port, port_tpg_1);</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+        int ret;</div><div class='add'>+</div><div class='add'>+	ret = strict_strtoul(page, 0, &amp;tmp);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "Unable to extract srpt_tpg_store_enable\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((tmp != 0) &amp;&amp; (tmp != 1)) {</div><div class='add'>+		printk(KERN_ERR "Illegal value for srpt_tpg_store_enable: %lu\n", tmp);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (tmp == 1)</div><div class='add'>+		sport-&gt;enabled = true;</div><div class='add'>+	else</div><div class='add'>+		sport-&gt;enabled = false;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TF_TPG_BASE_ATTR(srpt, enable, S_IRUGO | S_IWUSR);</div><div class='add'>+</div><div class='add'>+static struct configfs_attribute *srpt_tpg_attrs[] = {</div><div class='add'>+	&amp;srpt_tpg_enable.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * configfs callback invoked for</div><div class='add'>+ * mkdir /sys/kernel/config/target/$driver/$port/$tpg</div><div class='add'>+ */</div><div class='add'>+static struct se_portal_group *srpt_make_tpg(struct se_wwn *wwn,</div><div class='add'>+					     struct config_group *group,</div><div class='add'>+					     const char *name)</div><div class='add'>+{</div><div class='add'>+	struct srpt_port *sport = container_of(wwn, struct srpt_port, port_wwn);</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	/* Initialize sport-&gt;port_wwn and sport-&gt;port_tpg_1 */</div><div class='add'>+	res = core_tpg_register(&amp;srpt_target-&gt;tf_ops, &amp;sport-&gt;port_wwn,</div><div class='add'>+			&amp;sport-&gt;port_tpg_1, sport, TRANSPORT_TPG_TYPE_NORMAL);</div><div class='add'>+	if (res)</div><div class='add'>+		return ERR_PTR(res);</div><div class='add'>+</div><div class='add'>+	return &amp;sport-&gt;port_tpg_1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * configfs callback invoked for</div><div class='add'>+ * rmdir /sys/kernel/config/target/$driver/$port/$tpg</div><div class='add'>+ */</div><div class='add'>+static void srpt_drop_tpg(struct se_portal_group *tpg)</div><div class='add'>+{</div><div class='add'>+	struct srpt_port *sport = container_of(tpg,</div><div class='add'>+				struct srpt_port, port_tpg_1);</div><div class='add'>+</div><div class='add'>+	sport-&gt;enabled = false;</div><div class='add'>+	core_tpg_deregister(&amp;sport-&gt;port_tpg_1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * configfs callback invoked for</div><div class='add'>+ * mkdir /sys/kernel/config/target/$driver/$port</div><div class='add'>+ */</div><div class='add'>+static struct se_wwn *srpt_make_tport(struct target_fabric_configfs *tf,</div><div class='add'>+				      struct config_group *group,</div><div class='add'>+				      const char *name)</div><div class='add'>+{</div><div class='add'>+	struct srpt_port *sport;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	sport = srpt_lookup_port(name);</div><div class='add'>+	pr_debug("make_tport(%s)\n", name);</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (!sport)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return &amp;sport-&gt;port_wwn;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * configfs callback invoked for</div><div class='add'>+ * rmdir /sys/kernel/config/target/$driver/$port</div><div class='add'>+ */</div><div class='add'>+static void srpt_drop_tport(struct se_wwn *wwn)</div><div class='add'>+{</div><div class='add'>+	struct srpt_port *sport = container_of(wwn, struct srpt_port, port_wwn);</div><div class='add'>+</div><div class='add'>+	pr_debug("drop_tport(%s\n", config_item_name(&amp;sport-&gt;port_wwn.wwn_group.cg_item));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t srpt_wwn_show_attr_version(struct target_fabric_configfs *tf,</div><div class='add'>+					      char *buf)</div><div class='add'>+{</div><div class='add'>+	return scnprintf(buf, PAGE_SIZE, "%s\n", DRV_VERSION);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TF_WWN_ATTR_RO(srpt, version);</div><div class='add'>+</div><div class='add'>+static struct configfs_attribute *srpt_wwn_attrs[] = {</div><div class='add'>+	&amp;srpt_wwn_version.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct target_core_fabric_ops srpt_template = {</div><div class='add'>+	.get_fabric_name		= srpt_get_fabric_name,</div><div class='add'>+	.get_fabric_proto_ident		= srpt_get_fabric_proto_ident,</div><div class='add'>+	.tpg_get_wwn			= srpt_get_fabric_wwn,</div><div class='add'>+	.tpg_get_tag			= srpt_get_tag,</div><div class='add'>+	.tpg_get_default_depth		= srpt_get_default_depth,</div><div class='add'>+	.tpg_get_pr_transport_id	= srpt_get_pr_transport_id,</div><div class='add'>+	.tpg_get_pr_transport_id_len	= srpt_get_pr_transport_id_len,</div><div class='add'>+	.tpg_parse_pr_out_transport_id	= srpt_parse_pr_out_transport_id,</div><div class='add'>+	.tpg_check_demo_mode		= srpt_check_false,</div><div class='add'>+	.tpg_check_demo_mode_cache	= srpt_check_true,</div><div class='add'>+	.tpg_check_demo_mode_write_protect = srpt_check_true,</div><div class='add'>+	.tpg_check_prod_mode_write_protect = srpt_check_false,</div><div class='add'>+	.tpg_alloc_fabric_acl		= srpt_alloc_fabric_acl,</div><div class='add'>+	.tpg_release_fabric_acl		= srpt_release_fabric_acl,</div><div class='add'>+	.tpg_get_inst_index		= srpt_tpg_get_inst_index,</div><div class='add'>+	.release_cmd			= srpt_release_cmd,</div><div class='add'>+	.check_stop_free		= srpt_check_stop_free,</div><div class='add'>+	.shutdown_session		= srpt_shutdown_session,</div><div class='add'>+	.close_session			= srpt_close_session,</div><div class='add'>+	.stop_session			= srpt_stop_session,</div><div class='add'>+	.fall_back_to_erl0		= srpt_reset_nexus,</div><div class='add'>+	.sess_logged_in			= srpt_sess_logged_in,</div><div class='add'>+	.sess_get_index			= srpt_sess_get_index,</div><div class='add'>+	.sess_get_initiator_sid		= NULL,</div><div class='add'>+	.write_pending			= srpt_write_pending,</div><div class='add'>+	.write_pending_status		= srpt_write_pending_status,</div><div class='add'>+	.set_default_node_attributes	= srpt_set_default_node_attrs,</div><div class='add'>+	.get_task_tag			= srpt_get_task_tag,</div><div class='add'>+	.get_cmd_state			= srpt_get_tcm_cmd_state,</div><div class='add'>+	.queue_data_in			= srpt_queue_response,</div><div class='add'>+	.queue_status			= srpt_queue_status,</div><div class='add'>+	.queue_tm_rsp			= srpt_queue_response,</div><div class='add'>+	.get_fabric_sense_len		= srpt_get_fabric_sense_len,</div><div class='add'>+	.set_fabric_sense_len		= srpt_set_fabric_sense_len,</div><div class='add'>+	.is_state_remove		= srpt_is_state_remove,</div><div class='add'>+	/*</div><div class='add'>+	 * Setup function pointers for generic logic in</div><div class='add'>+	 * target_core_fabric_configfs.c</div><div class='add'>+	 */</div><div class='add'>+	.fabric_make_wwn		= srpt_make_tport,</div><div class='add'>+	.fabric_drop_wwn		= srpt_drop_tport,</div><div class='add'>+	.fabric_make_tpg		= srpt_make_tpg,</div><div class='add'>+	.fabric_drop_tpg		= srpt_drop_tpg,</div><div class='add'>+	.fabric_post_link		= NULL,</div><div class='add'>+	.fabric_pre_unlink		= NULL,</div><div class='add'>+	.fabric_make_np			= NULL,</div><div class='add'>+	.fabric_drop_np			= NULL,</div><div class='add'>+	.fabric_make_nodeacl		= srpt_make_nodeacl,</div><div class='add'>+	.fabric_drop_nodeacl		= srpt_drop_nodeacl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srpt_init_module() - Kernel module initialization.</div><div class='add'>+ *</div><div class='add'>+ * Note: Since ib_register_client() registers callback functions, and since at</div><div class='add'>+ * least one of these callback functions (srpt_add_one()) calls target core</div><div class='add'>+ * functions, this driver must be registered with the target core before</div><div class='add'>+ * ib_register_client() is called.</div><div class='add'>+ */</div><div class='add'>+static int __init srpt_init_module(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (srp_max_req_size &lt; MIN_MAX_REQ_SIZE) {</div><div class='add'>+		printk(KERN_ERR "invalid value %d for kernel module parameter"</div><div class='add'>+		       " srp_max_req_size -- must be at least %d.\n",</div><div class='add'>+		       srp_max_req_size, MIN_MAX_REQ_SIZE);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (srpt_srq_size &lt; MIN_SRPT_SRQ_SIZE</div><div class='add'>+	    || srpt_srq_size &gt; MAX_SRPT_SRQ_SIZE) {</div><div class='add'>+		printk(KERN_ERR "invalid value %d for kernel module parameter"</div><div class='add'>+		       " srpt_srq_size -- must be in the range [%d..%d].\n",</div><div class='add'>+		       srpt_srq_size, MIN_SRPT_SRQ_SIZE, MAX_SRPT_SRQ_SIZE);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;srpt_dev_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;srpt_dev_list);</div><div class='add'>+</div><div class='add'>+	ret = -ENODEV;</div><div class='add'>+	srpt_target = target_fabric_configfs_init(THIS_MODULE, "srpt");</div><div class='add'>+	if (!srpt_target) {</div><div class='add'>+		printk(KERN_ERR "couldn't register\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	srpt_target-&gt;tf_ops = srpt_template;</div><div class='add'>+</div><div class='add'>+	/* Enable SG chaining */</div><div class='add'>+	srpt_target-&gt;tf_ops.task_sg_chaining = true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set up default attribute lists.</div><div class='add'>+	 */</div><div class='add'>+	srpt_target-&gt;tf_cit_tmpl.tfc_wwn_cit.ct_attrs = srpt_wwn_attrs;</div><div class='add'>+	srpt_target-&gt;tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = srpt_tpg_attrs;</div><div class='add'>+	srpt_target-&gt;tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = srpt_tpg_attrib_attrs;</div><div class='add'>+	srpt_target-&gt;tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;</div><div class='add'>+	srpt_target-&gt;tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;</div><div class='add'>+	srpt_target-&gt;tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;</div><div class='add'>+	srpt_target-&gt;tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;</div><div class='add'>+	srpt_target-&gt;tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;</div><div class='add'>+	srpt_target-&gt;tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;</div><div class='add'>+</div><div class='add'>+	ret = target_fabric_configfs_register(srpt_target);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "couldn't register\n");</div><div class='add'>+		goto out_free_target;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ib_register_client(&amp;srpt_client);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR "couldn't register IB client\n");</div><div class='add'>+		goto out_unregister_target;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_unregister_target:</div><div class='add'>+	target_fabric_configfs_deregister(srpt_target);</div><div class='add'>+	srpt_target = NULL;</div><div class='add'>+out_free_target:</div><div class='add'>+	if (srpt_target)</div><div class='add'>+		target_fabric_configfs_free(srpt_target);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit srpt_cleanup_module(void)</div><div class='add'>+{</div><div class='add'>+	ib_unregister_client(&amp;srpt_client);</div><div class='add'>+	target_fabric_configfs_deregister(srpt_target);</div><div class='add'>+	srpt_target = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(srpt_init_module);</div><div class='add'>+module_exit(srpt_cleanup_module);</div><div class='head'>diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.h b/drivers/infiniband/ulp/srpt/ib_srpt.h<br/>new file mode 100644<br/>index 000000000000..b4b4bbcd7f16<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/srpt/ib_srpt.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/infiniband/ulp/srpt/ib_srpt.h</a></div><div class='hunk'>@@ -0,0 +1,444 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2006 - 2009 Mellanox Technology Inc.  All rights reserved.</div><div class='add'>+ * Copyright (C) 2009 - 2010 Bart Van Assche &lt;bvanassche@acm.org&gt;.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the</div><div class='add'>+ * OpenIB.org BSD license below:</div><div class='add'>+ *</div><div class='add'>+ *     Redistribution and use in source and binary forms, with or</div><div class='add'>+ *     without modification, are permitted provided that the following</div><div class='add'>+ *     conditions are met:</div><div class='add'>+ *</div><div class='add'>+ *      - Redistributions of source code must retain the above</div><div class='add'>+ *        copyright notice, this list of conditions and the following</div><div class='add'>+ *        disclaimer.</div><div class='add'>+ *</div><div class='add'>+ *      - Redistributions in binary form must reproduce the above</div><div class='add'>+ *        copyright notice, this list of conditions and the following</div><div class='add'>+ *        disclaimer in the documentation and/or other materials</div><div class='add'>+ *        provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef IB_SRPT_H</div><div class='add'>+#define IB_SRPT_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;rdma/ib_verbs.h&gt;</div><div class='add'>+#include &lt;rdma/ib_sa.h&gt;</div><div class='add'>+#include &lt;rdma/ib_cm.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;scsi/srp.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ib_dm_mad.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The prefix the ServiceName field must start with in the device management</div><div class='add'>+ * ServiceEntries attribute pair. See also the SRP specification.</div><div class='add'>+ */</div><div class='add'>+#define SRP_SERVICE_NAME_PREFIX		"SRP.T10:"</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	/*</div><div class='add'>+	 * SRP IOControllerProfile attributes for SRP target ports that have</div><div class='add'>+	 * not been defined in &lt;scsi/srp.h&gt;. Source: section B.7, table B.7</div><div class='add'>+	 * in the SRP specification.</div><div class='add'>+	 */</div><div class='add'>+	SRP_PROTOCOL = 0x0108,</div><div class='add'>+	SRP_PROTOCOL_VERSION = 0x0001,</div><div class='add'>+	SRP_IO_SUBCLASS = 0x609e,</div><div class='add'>+	SRP_SEND_TO_IOC = 0x01,</div><div class='add'>+	SRP_SEND_FROM_IOC = 0x02,</div><div class='add'>+	SRP_RDMA_READ_FROM_IOC = 0x08,</div><div class='add'>+	SRP_RDMA_WRITE_FROM_IOC = 0x20,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * srp_login_cmd.req_flags bitmasks. See also table 9 in the SRP</div><div class='add'>+	 * specification.</div><div class='add'>+	 */</div><div class='add'>+	SRP_MTCH_ACTION = 0x03, /* MULTI-CHANNEL ACTION */</div><div class='add'>+	SRP_LOSOLNT = 0x10, /* logout solicited notification */</div><div class='add'>+	SRP_CRSOLNT = 0x20, /* credit request solicited notification */</div><div class='add'>+	SRP_AESOLNT = 0x40, /* asynchronous event solicited notification */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * srp_cmd.sol_nt / srp_tsk_mgmt.sol_not bitmasks. See also tables</div><div class='add'>+	 * 18 and 20 in the SRP specification.</div><div class='add'>+	 */</div><div class='add'>+	SRP_SCSOLNT = 0x02, /* SCSOLNT = successful solicited notification */</div><div class='add'>+	SRP_UCSOLNT = 0x04, /* UCSOLNT = unsuccessful solicited notification */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * srp_rsp.sol_not / srp_t_logout.sol_not bitmasks. See also tables</div><div class='add'>+	 * 16 and 22 in the SRP specification.</div><div class='add'>+	 */</div><div class='add'>+	SRP_SOLNT = 0x01, /* SOLNT = solicited notification */</div><div class='add'>+</div><div class='add'>+	/* See also table 24 in the SRP specification. */</div><div class='add'>+	SRP_TSK_MGMT_SUCCESS = 0x00,</div><div class='add'>+	SRP_TSK_MGMT_FUNC_NOT_SUPP = 0x04,</div><div class='add'>+	SRP_TSK_MGMT_FAILED = 0x05,</div><div class='add'>+</div><div class='add'>+	/* See also table 21 in the SRP specification. */</div><div class='add'>+	SRP_CMD_SIMPLE_Q = 0x0,</div><div class='add'>+	SRP_CMD_HEAD_OF_Q = 0x1,</div><div class='add'>+	SRP_CMD_ORDERED_Q = 0x2,</div><div class='add'>+	SRP_CMD_ACA = 0x4,</div><div class='add'>+</div><div class='add'>+	SRP_LOGIN_RSP_MULTICHAN_NO_CHAN = 0x0,</div><div class='add'>+	SRP_LOGIN_RSP_MULTICHAN_TERMINATED = 0x1,</div><div class='add'>+	SRP_LOGIN_RSP_MULTICHAN_MAINTAINED = 0x2,</div><div class='add'>+</div><div class='add'>+	SRPT_DEF_SG_TABLESIZE = 128,</div><div class='add'>+	SRPT_DEF_SG_PER_WQE = 16,</div><div class='add'>+</div><div class='add'>+	MIN_SRPT_SQ_SIZE = 16,</div><div class='add'>+	DEF_SRPT_SQ_SIZE = 4096,</div><div class='add'>+	SRPT_RQ_SIZE = 128,</div><div class='add'>+	MIN_SRPT_SRQ_SIZE = 4,</div><div class='add'>+	DEFAULT_SRPT_SRQ_SIZE = 4095,</div><div class='add'>+	MAX_SRPT_SRQ_SIZE = 65535,</div><div class='add'>+	MAX_SRPT_RDMA_SIZE = 1U &lt;&lt; 24,</div><div class='add'>+	MAX_SRPT_RSP_SIZE = 1024,</div><div class='add'>+</div><div class='add'>+	MIN_MAX_REQ_SIZE = 996,</div><div class='add'>+	DEFAULT_MAX_REQ_SIZE</div><div class='add'>+		= sizeof(struct srp_cmd)/*48*/</div><div class='add'>+		+ sizeof(struct srp_indirect_buf)/*20*/</div><div class='add'>+		+ 128 * sizeof(struct srp_direct_buf)/*16*/,</div><div class='add'>+</div><div class='add'>+	MIN_MAX_RSP_SIZE = sizeof(struct srp_rsp)/*36*/ + 4,</div><div class='add'>+	DEFAULT_MAX_RSP_SIZE = 256, /* leaves 220 bytes for sense data */</div><div class='add'>+</div><div class='add'>+	DEFAULT_MAX_RDMA_SIZE = 65536,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum srpt_opcode {</div><div class='add'>+	SRPT_RECV,</div><div class='add'>+	SRPT_SEND,</div><div class='add'>+	SRPT_RDMA_MID,</div><div class='add'>+	SRPT_RDMA_ABORT,</div><div class='add'>+	SRPT_RDMA_READ_LAST,</div><div class='add'>+	SRPT_RDMA_WRITE_LAST,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u64 encode_wr_id(u8 opcode, u32 idx)</div><div class='add'>+{</div><div class='add'>+	return ((u64)opcode &lt;&lt; 32) | idx;</div><div class='add'>+}</div><div class='add'>+static inline enum srpt_opcode opcode_from_wr_id(u64 wr_id)</div><div class='add'>+{</div><div class='add'>+	return wr_id &gt;&gt; 32;</div><div class='add'>+}</div><div class='add'>+static inline u32 idx_from_wr_id(u64 wr_id)</div><div class='add'>+{</div><div class='add'>+	return (u32)wr_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct rdma_iu {</div><div class='add'>+	u64		raddr;</div><div class='add'>+	u32		rkey;</div><div class='add'>+	struct ib_sge	*sge;</div><div class='add'>+	u32		sge_cnt;</div><div class='add'>+	int		mem_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum srpt_command_state - SCSI command state managed by SRPT.</div><div class='add'>+ * @SRPT_STATE_NEW:           New command arrived and is being processed.</div><div class='add'>+ * @SRPT_STATE_NEED_DATA:     Processing a write or bidir command and waiting</div><div class='add'>+ *                            for data arrival.</div><div class='add'>+ * @SRPT_STATE_DATA_IN:       Data for the write or bidir command arrived and is</div><div class='add'>+ *                            being processed.</div><div class='add'>+ * @SRPT_STATE_CMD_RSP_SENT:  SRP_RSP for SRP_CMD has been sent.</div><div class='add'>+ * @SRPT_STATE_MGMT:          Processing a SCSI task management command.</div><div class='add'>+ * @SRPT_STATE_MGMT_RSP_SENT: SRP_RSP for SRP_TSK_MGMT has been sent.</div><div class='add'>+ * @SRPT_STATE_DONE:          Command processing finished successfully, command</div><div class='add'>+ *                            processing has been aborted or command processing</div><div class='add'>+ *                            failed.</div><div class='add'>+ */</div><div class='add'>+enum srpt_command_state {</div><div class='add'>+	SRPT_STATE_NEW		 = 0,</div><div class='add'>+	SRPT_STATE_NEED_DATA	 = 1,</div><div class='add'>+	SRPT_STATE_DATA_IN	 = 2,</div><div class='add'>+	SRPT_STATE_CMD_RSP_SENT	 = 3,</div><div class='add'>+	SRPT_STATE_MGMT		 = 4,</div><div class='add'>+	SRPT_STATE_MGMT_RSP_SENT = 5,</div><div class='add'>+	SRPT_STATE_DONE		 = 6,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct srpt_ioctx - Shared SRPT I/O context information.</div><div class='add'>+ * @buf:   Pointer to the buffer.</div><div class='add'>+ * @dma:   DMA address of the buffer.</div><div class='add'>+ * @index: Index of the I/O context in its ioctx_ring array.</div><div class='add'>+ */</div><div class='add'>+struct srpt_ioctx {</div><div class='add'>+	void			*buf;</div><div class='add'>+	dma_addr_t		dma;</div><div class='add'>+	uint32_t		index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct srpt_recv_ioctx - SRPT receive I/O context.</div><div class='add'>+ * @ioctx:     See above.</div><div class='add'>+ * @wait_list: Node for insertion in srpt_rdma_ch.cmd_wait_list.</div><div class='add'>+ */</div><div class='add'>+struct srpt_recv_ioctx {</div><div class='add'>+	struct srpt_ioctx	ioctx;</div><div class='add'>+	struct list_head	wait_list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct srpt_send_ioctx - SRPT send I/O context.</div><div class='add'>+ * @ioctx:       See above.</div><div class='add'>+ * @ch:          Channel pointer.</div><div class='add'>+ * @free_list:   Node in srpt_rdma_ch.free_list.</div><div class='add'>+ * @n_rbuf:      Number of data buffers in the received SRP command.</div><div class='add'>+ * @rbufs:       Pointer to SRP data buffer array.</div><div class='add'>+ * @single_rbuf: SRP data buffer if the command has only a single buffer.</div><div class='add'>+ * @sg:          Pointer to sg-list associated with this I/O context.</div><div class='add'>+ * @sg_cnt:      SG-list size.</div><div class='add'>+ * @mapped_sg_count: ib_dma_map_sg() return value.</div><div class='add'>+ * @n_rdma_ius:  Number of elements in the rdma_ius array.</div><div class='add'>+ * @rdma_ius:    Array with information about the RDMA mapping.</div><div class='add'>+ * @tag:         Tag of the received SRP information unit.</div><div class='add'>+ * @spinlock:    Protects 'state'.</div><div class='add'>+ * @state:       I/O context state.</div><div class='add'>+ * @rdma_aborted: If initiating a multipart RDMA transfer failed, whether</div><div class='add'>+ * 		 the already initiated transfers have finished.</div><div class='add'>+ * @cmd:         Target core command data structure.</div><div class='add'>+ * @sense_data:  SCSI sense data.</div><div class='add'>+ */</div><div class='add'>+struct srpt_send_ioctx {</div><div class='add'>+	struct srpt_ioctx	ioctx;</div><div class='add'>+	struct srpt_rdma_ch	*ch;</div><div class='add'>+	struct kref		 kref;</div><div class='add'>+	struct rdma_iu		*rdma_ius;</div><div class='add'>+	struct srp_direct_buf	*rbufs;</div><div class='add'>+	struct srp_direct_buf	single_rbuf;</div><div class='add'>+	struct scatterlist	*sg;</div><div class='add'>+	struct list_head	free_list;</div><div class='add'>+	spinlock_t		spinlock;</div><div class='add'>+	enum srpt_command_state	state;</div><div class='add'>+	bool			rdma_aborted;</div><div class='add'>+	struct se_cmd		cmd;</div><div class='add'>+	struct completion	tx_done;</div><div class='add'>+	u64			tag;</div><div class='add'>+	int			sg_cnt;</div><div class='add'>+	int			mapped_sg_count;</div><div class='add'>+	u16			n_rdma_ius;</div><div class='add'>+	u8			n_rdma;</div><div class='add'>+	u8			n_rbuf;</div><div class='add'>+	bool			queue_status_only;</div><div class='add'>+	u8			sense_data[SCSI_SENSE_BUFFERSIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum rdma_ch_state - SRP channel state.</div><div class='add'>+ * @CH_CONNECTING:	 QP is in RTR state; waiting for RTU.</div><div class='add'>+ * @CH_LIVE:		 QP is in RTS state.</div><div class='add'>+ * @CH_DISCONNECTING:    DREQ has been received; waiting for DREP</div><div class='add'>+ *                       or DREQ has been send and waiting for DREP</div><div class='add'>+ *                       or .</div><div class='add'>+ * @CH_DRAINING:	 QP is in ERR state; waiting for last WQE event.</div><div class='add'>+ * @CH_RELEASING:	 Last WQE event has been received; releasing resources.</div><div class='add'>+ */</div><div class='add'>+enum rdma_ch_state {</div><div class='add'>+	CH_CONNECTING,</div><div class='add'>+	CH_LIVE,</div><div class='add'>+	CH_DISCONNECTING,</div><div class='add'>+	CH_DRAINING,</div><div class='add'>+	CH_RELEASING</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct srpt_rdma_ch - RDMA channel.</div><div class='add'>+ * @wait_queue:    Allows the kernel thread to wait for more work.</div><div class='add'>+ * @thread:        Kernel thread that processes the IB queues associated with</div><div class='add'>+ *                 the channel.</div><div class='add'>+ * @cm_id:         IB CM ID associated with the channel.</div><div class='add'>+ * @qp:            IB queue pair used for communicating over this channel.</div><div class='add'>+ * @cq:            IB completion queue for this channel.</div><div class='add'>+ * @rq_size:       IB receive queue size.</div><div class='add'>+ * @rsp_size	   IB response message size in bytes.</div><div class='add'>+ * @sq_wr_avail:   number of work requests available in the send queue.</div><div class='add'>+ * @sport:         pointer to the information of the HCA port used by this</div><div class='add'>+ *                 channel.</div><div class='add'>+ * @i_port_id:     128-bit initiator port identifier copied from SRP_LOGIN_REQ.</div><div class='add'>+ * @t_port_id:     128-bit target port identifier copied from SRP_LOGIN_REQ.</div><div class='add'>+ * @max_ti_iu_len: maximum target-to-initiator information unit length.</div><div class='add'>+ * @req_lim:       request limit: maximum number of requests that may be sent</div><div class='add'>+ *                 by the initiator without having received a response.</div><div class='add'>+ * @req_lim_delta: Number of credits not yet sent back to the initiator.</div><div class='add'>+ * @spinlock:      Protects free_list and state.</div><div class='add'>+ * @free_list:     Head of list with free send I/O contexts.</div><div class='add'>+ * @state:         channel state. See also enum rdma_ch_state.</div><div class='add'>+ * @ioctx_ring:    Send ring.</div><div class='add'>+ * @wc:            IB work completion array for srpt_process_completion().</div><div class='add'>+ * @list:          Node for insertion in the srpt_device.rch_list list.</div><div class='add'>+ * @cmd_wait_list: List of SCSI commands that arrived before the RTU event. This</div><div class='add'>+ *                 list contains struct srpt_ioctx elements and is protected</div><div class='add'>+ *                 against concurrent modification by the cm_id spinlock.</div><div class='add'>+ * @sess:          Session information associated with this SRP channel.</div><div class='add'>+ * @sess_name:     Session name.</div><div class='add'>+ * @release_work:  Allows scheduling of srpt_release_channel().</div><div class='add'>+ * @release_done:  Enables waiting for srpt_release_channel() completion.</div><div class='add'>+ */</div><div class='add'>+struct srpt_rdma_ch {</div><div class='add'>+	wait_queue_head_t	wait_queue;</div><div class='add'>+	struct task_struct	*thread;</div><div class='add'>+	struct ib_cm_id		*cm_id;</div><div class='add'>+	struct ib_qp		*qp;</div><div class='add'>+	struct ib_cq		*cq;</div><div class='add'>+	int			rq_size;</div><div class='add'>+	u32			rsp_size;</div><div class='add'>+	atomic_t		sq_wr_avail;</div><div class='add'>+	struct srpt_port	*sport;</div><div class='add'>+	u8			i_port_id[16];</div><div class='add'>+	u8			t_port_id[16];</div><div class='add'>+	int			max_ti_iu_len;</div><div class='add'>+	atomic_t		req_lim;</div><div class='add'>+	atomic_t		req_lim_delta;</div><div class='add'>+	spinlock_t		spinlock;</div><div class='add'>+	struct list_head	free_list;</div><div class='add'>+	enum rdma_ch_state	state;</div><div class='add'>+	struct srpt_send_ioctx	**ioctx_ring;</div><div class='add'>+	struct ib_wc		wc[16];</div><div class='add'>+	struct list_head	list;</div><div class='add'>+	struct list_head	cmd_wait_list;</div><div class='add'>+	struct se_session	*sess;</div><div class='add'>+	u8			sess_name[36];</div><div class='add'>+	struct work_struct	release_work;</div><div class='add'>+	struct completion	*release_done;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct srpt_port_attib - Attributes for SRPT port</div><div class='add'>+ * @srp_max_rdma_size: Maximum size of SRP RDMA transfers for new connections.</div><div class='add'>+ * @srp_max_rsp_size: Maximum size of SRP response messages in bytes.</div><div class='add'>+ * @srp_sq_size: Shared receive queue (SRQ) size.</div><div class='add'>+ */</div><div class='add'>+struct srpt_port_attrib {</div><div class='add'>+	u32			srp_max_rdma_size;</div><div class='add'>+	u32			srp_max_rsp_size;</div><div class='add'>+	u32			srp_sq_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct srpt_port - Information associated by SRPT with a single IB port.</div><div class='add'>+ * @sdev:      backpointer to the HCA information.</div><div class='add'>+ * @mad_agent: per-port management datagram processing information.</div><div class='add'>+ * @enabled:   Whether or not this target port is enabled.</div><div class='add'>+ * @port_guid: ASCII representation of Port GUID</div><div class='add'>+ * @port:      one-based port number.</div><div class='add'>+ * @sm_lid:    cached value of the port's sm_lid.</div><div class='add'>+ * @lid:       cached value of the port's lid.</div><div class='add'>+ * @gid:       cached value of the port's gid.</div><div class='add'>+ * @port_acl_lock spinlock for port_acl_list:</div><div class='add'>+ * @work:      work structure for refreshing the aforementioned cached values.</div><div class='add'>+ * @port_tpg_1 Target portal group = 1 data.</div><div class='add'>+ * @port_wwn:  Target core WWN data.</div><div class='add'>+ * @port_acl_list: Head of the list with all node ACLs for this port.</div><div class='add'>+ */</div><div class='add'>+struct srpt_port {</div><div class='add'>+	struct srpt_device	*sdev;</div><div class='add'>+	struct ib_mad_agent	*mad_agent;</div><div class='add'>+	bool			enabled;</div><div class='add'>+	u8			port_guid[64];</div><div class='add'>+	u8			port;</div><div class='add'>+	u16			sm_lid;</div><div class='add'>+	u16			lid;</div><div class='add'>+	union ib_gid		gid;</div><div class='add'>+	spinlock_t		port_acl_lock;</div><div class='add'>+	struct work_struct	work;</div><div class='add'>+	struct se_portal_group	port_tpg_1;</div><div class='add'>+	struct se_wwn		port_wwn;</div><div class='add'>+	struct list_head	port_acl_list;</div><div class='add'>+	struct srpt_port_attrib port_attrib;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct srpt_device - Information associated by SRPT with a single HCA.</div><div class='add'>+ * @device:        Backpointer to the struct ib_device managed by the IB core.</div><div class='add'>+ * @pd:            IB protection domain.</div><div class='add'>+ * @mr:            L_Key (local key) with write access to all local memory.</div><div class='add'>+ * @srq:           Per-HCA SRQ (shared receive queue).</div><div class='add'>+ * @cm_id:         Connection identifier.</div><div class='add'>+ * @dev_attr:      Attributes of the InfiniBand device as obtained during the</div><div class='add'>+ *                 ib_client.add() callback.</div><div class='add'>+ * @srq_size:      SRQ size.</div><div class='add'>+ * @ioctx_ring:    Per-HCA SRQ.</div><div class='add'>+ * @rch_list:      Per-device channel list -- see also srpt_rdma_ch.list.</div><div class='add'>+ * @ch_releaseQ:   Enables waiting for removal from rch_list.</div><div class='add'>+ * @spinlock:      Protects rch_list and tpg.</div><div class='add'>+ * @port:          Information about the ports owned by this HCA.</div><div class='add'>+ * @event_handler: Per-HCA asynchronous IB event handler.</div><div class='add'>+ * @list:          Node in srpt_dev_list.</div><div class='add'>+ */</div><div class='add'>+struct srpt_device {</div><div class='add'>+	struct ib_device	*device;</div><div class='add'>+	struct ib_pd		*pd;</div><div class='add'>+	struct ib_mr		*mr;</div><div class='add'>+	struct ib_srq		*srq;</div><div class='add'>+	struct ib_cm_id		*cm_id;</div><div class='add'>+	struct ib_device_attr	dev_attr;</div><div class='add'>+	int			srq_size;</div><div class='add'>+	struct srpt_recv_ioctx	**ioctx_ring;</div><div class='add'>+	struct list_head	rch_list;</div><div class='add'>+	wait_queue_head_t	ch_releaseQ;</div><div class='add'>+	spinlock_t		spinlock;</div><div class='add'>+	struct srpt_port	port[2];</div><div class='add'>+	struct ib_event_handler	event_handler;</div><div class='add'>+	struct list_head	list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct srpt_node_acl - Per-initiator ACL data (managed via configfs).</div><div class='add'>+ * @i_port_id: 128-bit SRP initiator port ID.</div><div class='add'>+ * @sport:     port information.</div><div class='add'>+ * @nacl:      Target core node ACL information.</div><div class='add'>+ * @list:      Element of the per-HCA ACL list.</div><div class='add'>+ */</div><div class='add'>+struct srpt_node_acl {</div><div class='add'>+	u8			i_port_id[16];</div><div class='add'>+	struct srpt_port	*sport;</div><div class='add'>+	struct se_node_acl	nacl;</div><div class='add'>+	struct list_head	list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SRP-releated SCSI persistent reservation definitions.</div><div class='add'>+ *</div><div class='add'>+ * See also SPC4r28, section 7.6.1 (Protocol specific parameters introduction).</div><div class='add'>+ * See also SPC4r28, section 7.6.4.5 (TransportID for initiator ports using</div><div class='add'>+ * SCSI over an RDMA interface).</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	SCSI_TRANSPORTID_PROTOCOLID_SRP	= 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct spc_rdma_transport_id {</div><div class='add'>+	uint8_t protocol_identifier;</div><div class='add'>+	uint8_t reserved[7];</div><div class='add'>+	uint8_t i_port_id[16];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif				/* IB_SRPT_H */</div><div class='head'>diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c<br/>index 4cf25347b015..76457d50bc34 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/evdev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/evdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/evdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/evdev.c</a></div><div class='hunk'>@@ -369,7 +369,7 @@ static int evdev_fetch_next_event(struct evdev_client *client,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;client-&gt;buffer_lock);</div><div class='ctx'> </div><div class='del'>-	have_event = client-&gt;head != client-&gt;tail;</div><div class='add'>+	have_event = client-&gt;packet_head != client-&gt;tail;</div><div class='ctx'> 	if (have_event) {</div><div class='ctx'> 		*event = client-&gt;buffer[client-&gt;tail++];</div><div class='ctx'> 		client-&gt;tail &amp;= client-&gt;bufsize - 1;</div><div class='hunk'>@@ -391,14 +391,13 @@ static ssize_t evdev_read(struct file *file, char __user *buffer,</div><div class='ctx'> 	if (count &lt; input_event_size())</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (client-&gt;packet_head == client-&gt;tail &amp;&amp; evdev-&gt;exist &amp;&amp;</div><div class='del'>-	    (file-&gt;f_flags &amp; O_NONBLOCK))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	retval = wait_event_interruptible(evdev-&gt;wait,</div><div class='del'>-		client-&gt;packet_head != client-&gt;tail || !evdev-&gt;exist);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='add'>+	if (!(file-&gt;f_flags &amp; O_NONBLOCK)) {</div><div class='add'>+		retval = wait_event_interruptible(evdev-&gt;wait,</div><div class='add'>+				client-&gt;packet_head != client-&gt;tail ||</div><div class='add'>+				!evdev-&gt;exist);</div><div class='add'>+		if (retval)</div><div class='add'>+			return retval;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!evdev-&gt;exist)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -412,6 +411,9 @@ static ssize_t evdev_read(struct file *file, char __user *buffer,</div><div class='ctx'> 		retval += input_event_size();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (retval == 0 &amp;&amp; (file-&gt;f_flags &amp; O_NONBLOCK))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/input-polldev.c b/drivers/input/input-polldev.c<br/>index 7dfe1009fae0..7f161d93203c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/input-polldev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/input-polldev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/input-polldev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/input-polldev.c</a></div><div class='hunk'>@@ -84,10 +84,12 @@ static ssize_t input_polldev_set_poll(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct input_polled_dev *polldev = dev_get_drvdata(dev);</div><div class='ctx'> 	struct input_dev *input = polldev-&gt;input;</div><div class='del'>-	unsigned long interval;</div><div class='add'>+	unsigned int interval;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 0, &amp;interval))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	err = kstrtouint(buf, 0, &amp;interval);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (interval &lt; polldev-&gt;poll_interval_min)</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/input/input.c b/drivers/input/input.c<br/>index da38d97a51b1..1f78c957a75a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/input.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/input.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/input.c</a></div><div class='hunk'>@@ -1624,7 +1624,7 @@ static struct device_type input_dev_type = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *input_devnode(struct device *dev, mode_t *mode)</div><div class='add'>+static char *input_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	return kasprintf(GFP_KERNEL, "input/%s", dev_name(dev));</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c<br/>index d72887585a14..fd7a0d5bc94d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/xpad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/joystick/xpad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/xpad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/joystick/xpad.c</a></div><div class='hunk'>@@ -98,15 +98,15 @@</div><div class='ctx'> #define XTYPE_XBOX360W    2</div><div class='ctx'> #define XTYPE_UNKNOWN     3</div><div class='ctx'> </div><div class='del'>-static int dpad_to_buttons;</div><div class='add'>+static bool dpad_to_buttons;</div><div class='ctx'> module_param(dpad_to_buttons, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(dpad_to_buttons, "Map D-PAD to buttons rather than axes for unknown pads");</div><div class='ctx'> </div><div class='del'>-static int triggers_to_buttons;</div><div class='add'>+static bool triggers_to_buttons;</div><div class='ctx'> module_param(triggers_to_buttons, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(triggers_to_buttons, "Map triggers to buttons rather than axes for unknown pads");</div><div class='ctx'> </div><div class='del'>-static int sticks_to_null;</div><div class='add'>+static bool sticks_to_null;</div><div class='ctx'> module_param(sticks_to_null, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(sticks_to_null, "Do not map sticks at all for unknown pads");</div><div class='ctx'> </div><div class='hunk'>@@ -1041,18 +1041,7 @@ static struct usb_driver xpad_driver = {</div><div class='ctx'> 	.id_table	= xpad_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init usb_xpad_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;xpad_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit usb_xpad_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;xpad_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(usb_xpad_init);</div><div class='del'>-module_exit(usb_xpad_exit);</div><div class='add'>+module_usb_driver(xpad_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='head'>diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig<br/>index 615c21f2a553..cdc385b2cf7d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/Kconfig</a></div><div class='hunk'>@@ -221,6 +221,22 @@ config KEYBOARD_TCA6416</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called tca6416_keypad.</div><div class='ctx'> </div><div class='add'>+config KEYBOARD_TCA8418</div><div class='add'>+	tristate "TCA8418 Keypad Support"</div><div class='add'>+	depends on I2C</div><div class='add'>+	help</div><div class='add'>+	  This driver implements basic keypad functionality</div><div class='add'>+	  for keys connected through TCA8418 keypad decoder.</div><div class='add'>+</div><div class='add'>+	  Say Y here if your device has keys connected to</div><div class='add'>+	  TCA8418 keypad decoder.</div><div class='add'>+</div><div class='add'>+	  If enabled the complete TCA8418 device will be managed through</div><div class='add'>+	  this 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 tca8418_keypad.</div><div class='add'>+</div><div class='ctx'> config KEYBOARD_MATRIX</div><div class='ctx'> 	tristate "GPIO driven matrix keypad support"</div><div class='ctx'> 	depends on GENERIC_GPIO</div><div class='hunk'>@@ -425,9 +441,10 @@ config KEYBOARD_PMIC8XXX</div><div class='ctx'> </div><div class='ctx'> config KEYBOARD_SAMSUNG</div><div class='ctx'> 	tristate "Samsung keypad support"</div><div class='del'>-	depends on SAMSUNG_DEV_KEYPAD</div><div class='add'>+	depends on HAVE_CLK</div><div class='ctx'> 	help</div><div class='del'>-	  Say Y here if you want to use the Samsung keypad.</div><div class='add'>+	  Say Y here if you want to use the keypad on your Samsung mobile</div><div class='add'>+	  device.</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 samsung-keypad.</div><div class='head'>diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile<br/>index ddde0fd476f7..df7061f12918 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/Makefile</a></div><div class='hunk'>@@ -16,6 +16,7 @@ obj-$(CONFIG_KEYBOARD_EP93XX)		+= ep93xx_keypad.o</div><div class='ctx'> obj-$(CONFIG_KEYBOARD_GPIO)		+= gpio_keys.o</div><div class='ctx'> obj-$(CONFIG_KEYBOARD_GPIO_POLLED)	+= gpio_keys_polled.o</div><div class='ctx'> obj-$(CONFIG_KEYBOARD_TCA6416)		+= tca6416-keypad.o</div><div class='add'>+obj-$(CONFIG_KEYBOARD_TCA8418)		+= tca8418_keypad.o</div><div class='ctx'> obj-$(CONFIG_KEYBOARD_HIL)		+= hil_kbd.o</div><div class='ctx'> obj-$(CONFIG_KEYBOARD_HIL_OLD)		+= hilkbd.o</div><div class='ctx'> obj-$(CONFIG_KEYBOARD_IMX)		+= imx_keypad.o</div><div class='head'>diff --git a/drivers/input/keyboard/adp5520-keys.c b/drivers/input/keyboard/adp5520-keys.c<br/>index 3db8006dac3a..e9e8674dfda1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/adp5520-keys.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/adp5520-keys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/adp5520-keys.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/adp5520-keys.c</a></div><div class='hunk'>@@ -202,18 +202,7 @@ static struct platform_driver adp5520_keys_driver = {</div><div class='ctx'> 	.probe		= adp5520_keys_probe,</div><div class='ctx'> 	.remove		= __devexit_p(adp5520_keys_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init adp5520_keys_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;adp5520_keys_driver);</div><div class='del'>-}</div><div class='del'>-module_init(adp5520_keys_init);</div><div class='del'>-</div><div class='del'>-static void __exit adp5520_keys_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;adp5520_keys_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(adp5520_keys_exit);</div><div class='add'>+module_platform_driver(adp5520_keys_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Michael Hennerich &lt;hennerich@blackfin.uclinux.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Keys ADP5520 Driver");</div><div class='head'>diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c<br/>index 19cfc0cf558c..e05a2e7073c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/atkbd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/atkbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/atkbd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/atkbd.c</a></div><div class='hunk'>@@ -1305,7 +1305,7 @@ static ssize_t atkbd_show_extra(struct atkbd *atkbd, char *buf)</div><div class='ctx'> static ssize_t atkbd_set_extra(struct atkbd *atkbd, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *old_dev, *new_dev;</div><div class='del'>-	unsigned long value;</div><div class='add'>+	unsigned int value;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	bool old_extra;</div><div class='ctx'> 	unsigned char old_set;</div><div class='hunk'>@@ -1313,7 +1313,11 @@ static ssize_t atkbd_set_extra(struct atkbd *atkbd, const char *buf, size_t coun</div><div class='ctx'> 	if (!atkbd-&gt;write)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;value) || value &gt; 1)</div><div class='add'>+	err = kstrtouint(buf, 10, &amp;value);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (value &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (atkbd-&gt;extra != value) {</div><div class='hunk'>@@ -1389,11 +1393,15 @@ static ssize_t atkbd_show_scroll(struct atkbd *atkbd, char *buf)</div><div class='ctx'> static ssize_t atkbd_set_scroll(struct atkbd *atkbd, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *old_dev, *new_dev;</div><div class='del'>-	unsigned long value;</div><div class='add'>+	unsigned int value;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	bool old_scroll;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;value) || value &gt; 1)</div><div class='add'>+	err = kstrtouint(buf, 10, &amp;value);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (value &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (atkbd-&gt;scroll != value) {</div><div class='hunk'>@@ -1433,7 +1441,7 @@ static ssize_t atkbd_show_set(struct atkbd *atkbd, char *buf)</div><div class='ctx'> static ssize_t atkbd_set_set(struct atkbd *atkbd, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *old_dev, *new_dev;</div><div class='del'>-	unsigned long value;</div><div class='add'>+	unsigned int value;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned char old_set;</div><div class='ctx'> 	bool old_extra;</div><div class='hunk'>@@ -1441,7 +1449,11 @@ static ssize_t atkbd_set_set(struct atkbd *atkbd, const char *buf, size_t count)</div><div class='ctx'> 	if (!atkbd-&gt;write)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;value) || (value != 2 &amp;&amp; value != 3))</div><div class='add'>+	err = kstrtouint(buf, 10, &amp;value);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (value != 2 &amp;&amp; value != 3)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (atkbd-&gt;set != value) {</div><div class='hunk'>@@ -1484,14 +1496,18 @@ static ssize_t atkbd_show_softrepeat(struct atkbd *atkbd, char *buf)</div><div class='ctx'> static ssize_t atkbd_set_softrepeat(struct atkbd *atkbd, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *old_dev, *new_dev;</div><div class='del'>-	unsigned long value;</div><div class='add'>+	unsigned int value;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	bool old_softrepeat, old_softraw;</div><div class='ctx'> </div><div class='ctx'> 	if (!atkbd-&gt;write)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;value) || value &gt; 1)</div><div class='add'>+	err = kstrtouint(buf, 10, &amp;value);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (value &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (atkbd-&gt;softrepeat != value) {</div><div class='hunk'>@@ -1534,11 +1550,15 @@ static ssize_t atkbd_show_softraw(struct atkbd *atkbd, char *buf)</div><div class='ctx'> static ssize_t atkbd_set_softraw(struct atkbd *atkbd, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *old_dev, *new_dev;</div><div class='del'>-	unsigned long value;</div><div class='add'>+	unsigned int value;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	bool old_softraw;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;value) || value &gt; 1)</div><div class='add'>+	err = kstrtouint(buf, 10, &amp;value);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (value &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (atkbd-&gt;softraw != value) {</div><div class='head'>diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c<br/>index 7d989603f875..8eb9116e0a5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/bf54x-keys.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/bf54x-keys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/bf54x-keys.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/bf54x-keys.c</a></div><div class='hunk'>@@ -384,7 +384,7 @@ static int bfin_kpad_resume(struct platform_device *pdev)</div><div class='ctx'> # define bfin_kpad_resume  NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-struct platform_driver bfin_kpad_device_driver = {</div><div class='add'>+static struct platform_driver bfin_kpad_device_driver = {</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= DRV_NAME,</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='hunk'>@@ -394,19 +394,7 @@ struct platform_driver bfin_kpad_device_driver = {</div><div class='ctx'> 	.suspend	= bfin_kpad_suspend,</div><div class='ctx'> 	.resume		= bfin_kpad_resume,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init bfin_kpad_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;bfin_kpad_device_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit bfin_kpad_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;bfin_kpad_device_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(bfin_kpad_init);</div><div class='del'>-module_exit(bfin_kpad_exit);</div><div class='add'>+module_platform_driver(bfin_kpad_device_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Michael Hennerich &lt;hennerich@blackfin.uclinux.org&gt;");</div><div class='head'>diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c<br/>index 4662c5da8018..0ba69f3fcb52 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/ep93xx_keypad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/ep93xx_keypad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/ep93xx_keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/ep93xx_keypad.c</a></div><div class='hunk'>@@ -390,19 +390,7 @@ static struct platform_driver ep93xx_keypad_driver = {</div><div class='ctx'> 	.suspend	= ep93xx_keypad_suspend,</div><div class='ctx'> 	.resume		= ep93xx_keypad_resume,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init ep93xx_keypad_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ep93xx_keypad_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ep93xx_keypad_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ep93xx_keypad_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ep93xx_keypad_init);</div><div class='del'>-module_exit(ep93xx_keypad_exit);</div><div class='add'>+module_platform_driver(ep93xx_keypad_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("H Hartley Sweeten &lt;hsweeten@visionengravers.com&gt;");</div><div class='head'>diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c<br/>index 4c17aff20657..20c8ab172214 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/gpio_keys_polled.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/gpio_keys_polled.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/gpio_keys_polled.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/gpio_keys_polled.c</a></div><div class='hunk'>@@ -241,19 +241,7 @@ static struct platform_driver gpio_keys_polled_driver = {</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init gpio_keys_polled_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;gpio_keys_polled_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit gpio_keys_polled_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;gpio_keys_polled_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(gpio_keys_polled_init);</div><div class='del'>-module_exit(gpio_keys_polled_exit);</div><div class='add'>+module_platform_driver(gpio_keys_polled_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> MODULE_AUTHOR("Gabor Juhos &lt;juhosg@openwrt.org&gt;");</div><div class='head'>diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c<br/>index ccebd2d09151..fb87b3bcadb9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/imx_keypad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/imx_keypad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/imx_keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/imx_keypad.c</a></div><div class='hunk'>@@ -619,19 +619,7 @@ static struct platform_driver imx_keypad_driver = {</div><div class='ctx'> 	.probe		= imx_keypad_probe,</div><div class='ctx'> 	.remove		= __devexit_p(imx_keypad_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init imx_keypad_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;imx_keypad_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit imx_keypad_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;imx_keypad_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(imx_keypad_init);</div><div class='del'>-module_exit(imx_keypad_exit);</div><div class='add'>+module_platform_driver(imx_keypad_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Alberto Panizzo &lt;maramaopercheseimorto@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("IMX Keypad Port Driver");</div><div class='head'>diff --git a/drivers/input/keyboard/jornada680_kbd.c b/drivers/input/keyboard/jornada680_kbd.c<br/>index 7197c5698747..24f3ea01c4d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/jornada680_kbd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/jornada680_kbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/jornada680_kbd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/jornada680_kbd.c</a></div><div class='hunk'>@@ -260,19 +260,7 @@ static struct platform_driver jornada680kbd_driver = {</div><div class='ctx'> 	.probe	= jornada680kbd_probe,</div><div class='ctx'> 	.remove	= __devexit_p(jornada680kbd_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init jornada680kbd_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;jornada680kbd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit jornada680kbd_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;jornada680kbd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(jornada680kbd_init);</div><div class='del'>-module_exit(jornada680kbd_exit);</div><div class='add'>+module_platform_driver(jornada680kbd_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Kristoffer Ericson &lt;kristoffer.ericson@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("HP Jornada 620/660/680/690 Keyboard Driver");</div><div class='head'>diff --git a/drivers/input/keyboard/jornada720_kbd.c b/drivers/input/keyboard/jornada720_kbd.c<br/>index 0aa6740e60d0..eeafc30b207b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/jornada720_kbd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/jornada720_kbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/jornada720_kbd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/jornada720_kbd.c</a></div><div class='hunk'>@@ -174,16 +174,4 @@ static struct platform_driver jornada720_kbd_driver = {</div><div class='ctx'> 	.probe   = jornada720_kbd_probe,</div><div class='ctx'> 	.remove  = __devexit_p(jornada720_kbd_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init jornada720_kbd_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;jornada720_kbd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit jornada720_kbd_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;jornada720_kbd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(jornada720_kbd_init);</div><div class='del'>-module_exit(jornada720_kbd_exit);</div><div class='add'>+module_platform_driver(jornada720_kbd_driver);</div><div class='head'>diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c<br/>index 82d1dc8badd5..21823bfc7911 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/lm8323.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/lm8323.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/lm8323.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/lm8323.c</a></div><div class='hunk'>@@ -545,13 +545,12 @@ static ssize_t lm8323_pwm_store_time(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct led_classdev *led_cdev = dev_get_drvdata(dev);</div><div class='ctx'> 	struct lm8323_pwm *pwm = cdev_to_pwm(led_cdev);</div><div class='del'>-	int ret;</div><div class='del'>-	unsigned long time;</div><div class='add'>+	int ret, time;</div><div class='ctx'> </div><div class='del'>-	ret = strict_strtoul(buf, 10, &amp;time);</div><div class='add'>+	ret = kstrtoint(buf, 10, &amp;time);</div><div class='ctx'> 	/* Numbers only, please. */</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	pwm-&gt;fade_time = time;</div><div class='ctx'> </div><div class='hunk'>@@ -613,9 +612,9 @@ static ssize_t lm8323_set_disable(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct lm8323_chip *lm = dev_get_drvdata(dev);</div><div class='ctx'> 	int ret;</div><div class='del'>-	unsigned long i;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	ret = strict_strtoul(buf, 10, &amp;i);</div><div class='add'>+	ret = kstrtouint(buf, 10, &amp;i);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;lm-&gt;lock);</div><div class='ctx'> 	lm-&gt;kp_enabled = !i;</div><div class='head'>diff --git a/drivers/input/keyboard/matrix_keypad.c b/drivers/input/keyboard/matrix_keypad.c<br/>index e2ae657717ea..9b223d73de32 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/matrix_keypad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/matrix_keypad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/matrix_keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/matrix_keypad.c</a></div><div class='hunk'>@@ -496,19 +496,7 @@ static struct platform_driver matrix_keypad_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init matrix_keypad_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;matrix_keypad_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit matrix_keypad_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;matrix_keypad_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(matrix_keypad_init);</div><div class='del'>-module_exit(matrix_keypad_exit);</div><div class='add'>+module_platform_driver(matrix_keypad_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Marek Vasut &lt;marek.vasut@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("GPIO Driven Matrix Keypad Driver");</div><div class='head'>diff --git a/drivers/input/keyboard/nomadik-ske-keypad.c b/drivers/input/keyboard/nomadik-ske-keypad.c<br/>index fcdec5e2b297..e35566aa102f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/nomadik-ske-keypad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/nomadik-ske-keypad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/nomadik-ske-keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/nomadik-ske-keypad.c</a></div><div class='hunk'>@@ -379,7 +379,7 @@ static const struct dev_pm_ops ske_keypad_dev_pm_ops = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-struct platform_driver ske_keypad_driver = {</div><div class='add'>+static struct platform_driver ske_keypad_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "nmk-ske-keypad",</div><div class='ctx'> 		.owner  = THIS_MODULE,</div><div class='head'>diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c<br/>index 323bcdfff248..6b630d9d3dff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/omap-keypad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/omap-keypad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/omap-keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/omap-keypad.c</a></div><div class='hunk'>@@ -473,20 +473,7 @@ static struct platform_driver omap_kp_driver = {</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init omap_kp_init(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "OMAP Keypad Driver\n");</div><div class='del'>-	return platform_driver_register(&amp;omap_kp_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit omap_kp_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;omap_kp_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(omap_kp_init);</div><div class='del'>-module_exit(omap_kp_exit);</div><div class='add'>+module_platform_driver(omap_kp_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Timo Teräs");</div><div class='ctx'> MODULE_DESCRIPTION("OMAP Keypad Driver");</div><div class='head'>diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c<br/>index c51a3c4a7feb..d5c5d77f4b82 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/omap4-keypad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/omap4-keypad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/omap4-keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/omap4-keypad.c</a></div><div class='hunk'>@@ -335,18 +335,7 @@ static struct platform_driver omap4_keypad_driver = {</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init omap4_keypad_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;omap4_keypad_driver);</div><div class='del'>-}</div><div class='del'>-module_init(omap4_keypad_init);</div><div class='del'>-</div><div class='del'>-static void __exit omap4_keypad_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;omap4_keypad_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(omap4_keypad_exit);</div><div class='add'>+module_platform_driver(omap4_keypad_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Texas Instruments");</div><div class='ctx'> MODULE_DESCRIPTION("OMAP4 Keypad Driver");</div><div class='head'>diff --git a/drivers/input/keyboard/opencores-kbd.c b/drivers/input/keyboard/opencores-kbd.c<br/>index 1f1a5563f60a..abe728c7b88e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/opencores-kbd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/opencores-kbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/opencores-kbd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/opencores-kbd.c</a></div><div class='hunk'>@@ -163,18 +163,7 @@ static struct platform_driver opencores_kbd_device_driver = {</div><div class='ctx'> 		.name = "opencores-kbd",</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init opencores_kbd_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;opencores_kbd_device_driver);</div><div class='del'>-}</div><div class='del'>-module_init(opencores_kbd_init);</div><div class='del'>-</div><div class='del'>-static void __exit opencores_kbd_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;opencores_kbd_device_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(opencores_kbd_exit);</div><div class='add'>+module_platform_driver(opencores_kbd_device_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Javier Herrero &lt;jherrero@hvsistemas.es&gt;");</div><div class='head'>diff --git a/drivers/input/keyboard/pmic8xxx-keypad.c b/drivers/input/keyboard/pmic8xxx-keypad.c<br/>index e7cc51d0fb34..01a1c9f8a383 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/pmic8xxx-keypad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/pmic8xxx-keypad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/pmic8xxx-keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/pmic8xxx-keypad.c</a></div><div class='hunk'>@@ -780,18 +780,7 @@ static struct platform_driver pmic8xxx_kp_driver = {</div><div class='ctx'> 		.pm = &amp;pm8xxx_kp_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init pmic8xxx_kp_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pmic8xxx_kp_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pmic8xxx_kp_init);</div><div class='del'>-</div><div class='del'>-static void __exit pmic8xxx_kp_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pmic8xxx_kp_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(pmic8xxx_kp_exit);</div><div class='add'>+module_platform_driver(pmic8xxx_kp_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> MODULE_DESCRIPTION("PMIC8XXX keypad driver");</div><div class='head'>diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c<br/>index eca6ae63de14..29fe1b2be1c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/pxa27x_keypad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/pxa27x_keypad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/pxa27x_keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/pxa27x_keypad.c</a></div><div class='hunk'>@@ -602,19 +602,7 @@ static struct platform_driver pxa27x_keypad_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init pxa27x_keypad_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pxa27x_keypad_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit pxa27x_keypad_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pxa27x_keypad_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(pxa27x_keypad_init);</div><div class='del'>-module_exit(pxa27x_keypad_exit);</div><div class='add'>+module_platform_driver(pxa27x_keypad_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("PXA27x Keypad Controller Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/input/keyboard/pxa930_rotary.c b/drivers/input/keyboard/pxa930_rotary.c<br/>index 35451bf780c7..d7f1134b789e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/pxa930_rotary.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/pxa930_rotary.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/pxa930_rotary.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/pxa930_rotary.c</a></div><div class='hunk'>@@ -195,18 +195,7 @@ static struct platform_driver pxa930_rotary_driver = {</div><div class='ctx'> 	.probe		= pxa930_rotary_probe,</div><div class='ctx'> 	.remove		= __devexit_p(pxa930_rotary_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init pxa930_rotary_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pxa930_rotary_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pxa930_rotary_init);</div><div class='del'>-</div><div class='del'>-static void __exit pxa930_rotary_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pxa930_rotary_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(pxa930_rotary_exit);</div><div class='add'>+module_platform_driver(pxa930_rotary_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for PXA93x Enhanced Rotary Controller");</div><div class='head'>diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c<br/>index f689f49e3109..17ba7f9f80f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/samsung-keypad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/samsung-keypad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/samsung-keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/samsung-keypad.c</a></div><div class='hunk'>@@ -20,9 +20,13 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.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='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_gpio.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;plat/keypad.h&gt;</div><div class='add'>+#include &lt;linux/input/samsung-keypad.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SAMSUNG_KEYIFCON			0x00</div><div class='ctx'> #define SAMSUNG_KEYIFSTSCLR			0x04</div><div class='hunk'>@@ -63,36 +67,33 @@ enum samsung_keypad_type {</div><div class='ctx'> </div><div class='ctx'> struct samsung_keypad {</div><div class='ctx'> 	struct input_dev *input_dev;</div><div class='add'>+	struct platform_device *pdev;</div><div class='ctx'> 	struct clk *clk;</div><div class='ctx'> 	void __iomem *base;</div><div class='ctx'> 	wait_queue_head_t wait;</div><div class='ctx'> 	bool stopped;</div><div class='add'>+	bool wake_enabled;</div><div class='ctx'> 	int irq;</div><div class='add'>+	enum samsung_keypad_type type;</div><div class='ctx'> 	unsigned int row_shift;</div><div class='ctx'> 	unsigned int rows;</div><div class='ctx'> 	unsigned int cols;</div><div class='ctx'> 	unsigned int row_state[SAMSUNG_MAX_COLS];</div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+	int row_gpios[SAMSUNG_MAX_ROWS];</div><div class='add'>+	int col_gpios[SAMSUNG_MAX_COLS];</div><div class='add'>+#endif</div><div class='ctx'> 	unsigned short keycodes[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int samsung_keypad_is_s5pv210(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	enum samsung_keypad_type type =</div><div class='del'>-		platform_get_device_id(pdev)-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	return type == KEYPAD_TYPE_S5PV210;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void samsung_keypad_scan(struct samsung_keypad *keypad,</div><div class='ctx'> 				unsigned int *row_state)</div><div class='ctx'> {</div><div class='del'>-	struct device *dev = keypad-&gt;input_dev-&gt;dev.parent;</div><div class='ctx'> 	unsigned int col;</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='ctx'> 	for (col = 0; col &lt; keypad-&gt;cols; col++) {</div><div class='del'>-		if (samsung_keypad_is_s5pv210(dev)) {</div><div class='add'>+		if (keypad-&gt;type == KEYPAD_TYPE_S5PV210) {</div><div class='ctx'> 			val = S5PV210_KEYIFCOLEN_MASK;</div><div class='ctx'> 			val &amp;= ~(1 &lt;&lt; col) &lt;&lt; 8;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -158,6 +159,8 @@ static irqreturn_t samsung_keypad_irq(int irq, void *dev_id)</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> 	bool key_down;</div><div class='ctx'> </div><div class='add'>+	pm_runtime_get_sync(&amp;keypad-&gt;pdev-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='ctx'> 		val = readl(keypad-&gt;base + SAMSUNG_KEYIFSTSCLR);</div><div class='ctx'> 		/* Clear interrupt. */</div><div class='hunk'>@@ -172,6 +175,8 @@ static irqreturn_t samsung_keypad_irq(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	} while (key_down &amp;&amp; !keypad-&gt;stopped);</div><div class='ctx'> </div><div class='add'>+	pm_runtime_put_sync(&amp;keypad-&gt;pdev-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -179,6 +184,8 @@ static void samsung_keypad_start(struct samsung_keypad *keypad)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='add'>+	pm_runtime_get_sync(&amp;keypad-&gt;pdev-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	/* Tell IRQ thread that it may poll the device. */</div><div class='ctx'> 	keypad-&gt;stopped = false;</div><div class='ctx'> </div><div class='hunk'>@@ -191,12 +198,16 @@ static void samsung_keypad_start(struct samsung_keypad *keypad)</div><div class='ctx'> </div><div class='ctx'> 	/* KEYIFCOL reg clear. */</div><div class='ctx'> 	writel(0, keypad-&gt;base + SAMSUNG_KEYIFCOL);</div><div class='add'>+</div><div class='add'>+	pm_runtime_put_sync(&amp;keypad-&gt;pdev-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void samsung_keypad_stop(struct samsung_keypad *keypad)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='add'>+	pm_runtime_get_sync(&amp;keypad-&gt;pdev-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	/* Signal IRQ thread to stop polling and disable the handler. */</div><div class='ctx'> 	keypad-&gt;stopped = true;</div><div class='ctx'> 	wake_up(&amp;keypad-&gt;wait);</div><div class='hunk'>@@ -217,6 +228,8 @@ static void samsung_keypad_stop(struct samsung_keypad *keypad)</div><div class='ctx'> 	 * re-enable the handler.</div><div class='ctx'> 	 */</div><div class='ctx'> 	enable_irq(keypad-&gt;irq);</div><div class='add'>+</div><div class='add'>+	pm_runtime_put_sync(&amp;keypad-&gt;pdev-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int samsung_keypad_open(struct input_dev *input_dev)</div><div class='hunk'>@@ -235,6 +248,126 @@ static void samsung_keypad_close(struct input_dev *input_dev)</div><div class='ctx'> 	samsung_keypad_stop(keypad);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+static struct samsung_keypad_platdata *samsung_keypad_parse_dt(</div><div class='add'>+				struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct samsung_keypad_platdata *pdata;</div><div class='add'>+	struct matrix_keymap_data *keymap_data;</div><div class='add'>+	uint32_t *keymap, num_rows = 0, num_cols = 0;</div><div class='add'>+	struct device_node *np = dev-&gt;of_node, *key_np;</div><div class='add'>+	unsigned int key_count = 0;</div><div class='add'>+</div><div class='add'>+	pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);</div><div class='add'>+	if (!pdata) {</div><div class='add'>+		dev_err(dev, "could not allocate memory for platform data\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	of_property_read_u32(np, "samsung,keypad-num-rows", &amp;num_rows);</div><div class='add'>+	of_property_read_u32(np, "samsung,keypad-num-columns", &amp;num_cols);</div><div class='add'>+	if (!num_rows || !num_cols) {</div><div class='add'>+		dev_err(dev, "number of keypad rows/columns not specified\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	pdata-&gt;rows = num_rows;</div><div class='add'>+	pdata-&gt;cols = num_cols;</div><div class='add'>+</div><div class='add'>+	keymap_data = devm_kzalloc(dev, sizeof(*keymap_data), GFP_KERNEL);</div><div class='add'>+	if (!keymap_data) {</div><div class='add'>+		dev_err(dev, "could not allocate memory for keymap data\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	pdata-&gt;keymap_data = keymap_data;</div><div class='add'>+</div><div class='add'>+	for_each_child_of_node(np, key_np)</div><div class='add'>+		key_count++;</div><div class='add'>+</div><div class='add'>+	keymap_data-&gt;keymap_size = key_count;</div><div class='add'>+	keymap = devm_kzalloc(dev, sizeof(uint32_t) * key_count, GFP_KERNEL);</div><div class='add'>+	if (!keymap) {</div><div class='add'>+		dev_err(dev, "could not allocate memory for keymap\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	keymap_data-&gt;keymap = keymap;</div><div class='add'>+</div><div class='add'>+	for_each_child_of_node(np, key_np) {</div><div class='add'>+		u32 row, col, key_code;</div><div class='add'>+		of_property_read_u32(key_np, "keypad,row", &amp;row);</div><div class='add'>+		of_property_read_u32(key_np, "keypad,column", &amp;col);</div><div class='add'>+		of_property_read_u32(key_np, "linux,code", &amp;key_code);</div><div class='add'>+		*keymap++ = KEY(row, col, key_code);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (of_get_property(np, "linux,input-no-autorepeat", NULL))</div><div class='add'>+		pdata-&gt;no_autorepeat = true;</div><div class='add'>+	if (of_get_property(np, "linux,input-wakeup", NULL))</div><div class='add'>+		pdata-&gt;wakeup = true;</div><div class='add'>+</div><div class='add'>+	return pdata;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void samsung_keypad_parse_dt_gpio(struct device *dev,</div><div class='add'>+				struct samsung_keypad *keypad)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = dev-&gt;of_node;</div><div class='add'>+	int gpio, ret, row, col;</div><div class='add'>+</div><div class='add'>+	for (row = 0; row &lt; keypad-&gt;rows; row++) {</div><div class='add'>+		gpio = of_get_named_gpio(np, "row-gpios", row);</div><div class='add'>+		keypad-&gt;row_gpios[row] = gpio;</div><div class='add'>+		if (!gpio_is_valid(gpio)) {</div><div class='add'>+			dev_err(dev, "keypad row[%d]: invalid gpio %d\n",</div><div class='add'>+					row, gpio);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = gpio_request(gpio, "keypad-row");</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_err(dev, "keypad row[%d] gpio request failed\n",</div><div class='add'>+					row);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (col = 0; col &lt; keypad-&gt;cols; col++) {</div><div class='add'>+		gpio = of_get_named_gpio(np, "col-gpios", col);</div><div class='add'>+		keypad-&gt;col_gpios[col] = gpio;</div><div class='add'>+		if (!gpio_is_valid(gpio)) {</div><div class='add'>+			dev_err(dev, "keypad column[%d]: invalid gpio %d\n",</div><div class='add'>+					col, gpio);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = gpio_request(gpio, "keypad-col");</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_err(dev, "keypad column[%d] gpio request failed\n",</div><div class='add'>+					col);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void samsung_keypad_dt_gpio_free(struct samsung_keypad *keypad)</div><div class='add'>+{</div><div class='add'>+	int cnt;</div><div class='add'>+</div><div class='add'>+	for (cnt = 0; cnt &lt; keypad-&gt;rows; cnt++)</div><div class='add'>+		if (gpio_is_valid(keypad-&gt;row_gpios[cnt]))</div><div class='add'>+			gpio_free(keypad-&gt;row_gpios[cnt]);</div><div class='add'>+</div><div class='add'>+	for (cnt = 0; cnt &lt; keypad-&gt;cols; cnt++)</div><div class='add'>+		if (gpio_is_valid(keypad-&gt;col_gpios[cnt]))</div><div class='add'>+			gpio_free(keypad-&gt;col_gpios[cnt]);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static</div><div class='add'>+struct samsung_keypad_platdata *samsung_keypad_parse_dt(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void samsung_keypad_dt_gpio_free(struct samsung_keypad *keypad)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int __devinit samsung_keypad_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	const struct samsung_keypad_platdata *pdata;</div><div class='hunk'>@@ -246,7 +379,10 @@ static int __devinit samsung_keypad_probe(struct platform_device *pdev)</div><div class='ctx'> 	unsigned int keymap_size;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	if (pdev-&gt;dev.of_node)</div><div class='add'>+		pdata = samsung_keypad_parse_dt(&amp;pdev-&gt;dev);</div><div class='add'>+	else</div><div class='add'>+		pdata = pdev-&gt;dev.platform_data;</div><div class='ctx'> 	if (!pdata) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "no platform data defined\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -298,11 +434,23 @@ static int __devinit samsung_keypad_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	keypad-&gt;input_dev = input_dev;</div><div class='add'>+	keypad-&gt;pdev = pdev;</div><div class='ctx'> 	keypad-&gt;row_shift = row_shift;</div><div class='ctx'> 	keypad-&gt;rows = pdata-&gt;rows;</div><div class='ctx'> 	keypad-&gt;cols = pdata-&gt;cols;</div><div class='add'>+	keypad-&gt;stopped = true;</div><div class='ctx'> 	init_waitqueue_head(&amp;keypad-&gt;wait);</div><div class='ctx'> </div><div class='add'>+	if (pdev-&gt;dev.of_node) {</div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+		samsung_keypad_parse_dt_gpio(&amp;pdev-&gt;dev, keypad);</div><div class='add'>+		keypad-&gt;type = of_device_is_compatible(pdev-&gt;dev.of_node,</div><div class='add'>+					"samsung,s5pv210-keypad");</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+		keypad-&gt;type = platform_get_device_id(pdev)-&gt;driver_data;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	input_dev-&gt;name = pdev-&gt;name;</div><div class='ctx'> 	input_dev-&gt;id.bustype = BUS_HOST;</div><div class='ctx'> 	input_dev-&gt;dev.parent = &amp;pdev-&gt;dev;</div><div class='hunk'>@@ -337,18 +485,29 @@ static int __devinit samsung_keypad_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err_put_clk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	device_init_wakeup(&amp;pdev-&gt;dev, pdata-&gt;wakeup);</div><div class='add'>+	platform_set_drvdata(pdev, keypad);</div><div class='add'>+	pm_runtime_enable(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	error = input_register_device(keypad-&gt;input_dev);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto err_free_irq;</div><div class='ctx'> </div><div class='del'>-	device_init_wakeup(&amp;pdev-&gt;dev, pdata-&gt;wakeup);</div><div class='del'>-	platform_set_drvdata(pdev, keypad);</div><div class='add'>+	if (pdev-&gt;dev.of_node) {</div><div class='add'>+		devm_kfree(&amp;pdev-&gt;dev, (void *)pdata-&gt;keymap_data-&gt;keymap);</div><div class='add'>+		devm_kfree(&amp;pdev-&gt;dev, (void *)pdata-&gt;keymap_data);</div><div class='add'>+		devm_kfree(&amp;pdev-&gt;dev, (void *)pdata);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_free_irq:</div><div class='ctx'> 	free_irq(keypad-&gt;irq, keypad);</div><div class='add'>+	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='add'>+	device_init_wakeup(&amp;pdev-&gt;dev, 0);</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> err_put_clk:</div><div class='ctx'> 	clk_put(keypad-&gt;clk);</div><div class='add'>+	samsung_keypad_dt_gpio_free(keypad);</div><div class='ctx'> err_unmap_base:</div><div class='ctx'> 	iounmap(keypad-&gt;base);</div><div class='ctx'> err_free_mem:</div><div class='hunk'>@@ -362,6 +521,7 @@ static int __devexit samsung_keypad_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct samsung_keypad *keypad = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='add'>+	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='ctx'> 	device_init_wakeup(&amp;pdev-&gt;dev, 0);</div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -374,6 +534,7 @@ static int __devexit samsung_keypad_remove(struct platform_device *pdev)</div><div class='ctx'> 	free_irq(keypad-&gt;irq, keypad);</div><div class='ctx'> </div><div class='ctx'> 	clk_put(keypad-&gt;clk);</div><div class='add'>+	samsung_keypad_dt_gpio_free(keypad);</div><div class='ctx'> </div><div class='ctx'> 	iounmap(keypad-&gt;base);</div><div class='ctx'> 	kfree(keypad);</div><div class='hunk'>@@ -381,11 +542,57 @@ static int __devexit samsung_keypad_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_RUNTIME</div><div class='add'>+static int samsung_keypad_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct samsung_keypad *keypad = platform_get_drvdata(pdev);</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	if (keypad-&gt;stopped)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* This may fail on some SoCs due to lack of controller support */</div><div class='add'>+	error = enable_irq_wake(keypad-&gt;irq);</div><div class='add'>+	if (!error)</div><div class='add'>+		keypad-&gt;wake_enabled = true;</div><div class='add'>+</div><div class='add'>+	val = readl(keypad-&gt;base + SAMSUNG_KEYIFCON);</div><div class='add'>+	val |= SAMSUNG_KEYIFCON_WAKEUPEN;</div><div class='add'>+	writel(val, keypad-&gt;base + SAMSUNG_KEYIFCON);</div><div class='add'>+</div><div class='add'>+	clk_disable(keypad-&gt;clk);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int samsung_keypad_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct samsung_keypad *keypad = platform_get_drvdata(pdev);</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	if (keypad-&gt;stopped)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	clk_enable(keypad-&gt;clk);</div><div class='add'>+</div><div class='add'>+	val = readl(keypad-&gt;base + SAMSUNG_KEYIFCON);</div><div class='add'>+	val &amp;= ~SAMSUNG_KEYIFCON_WAKEUPEN;</div><div class='add'>+	writel(val, keypad-&gt;base + SAMSUNG_KEYIFCON);</div><div class='add'>+</div><div class='add'>+	if (keypad-&gt;wake_enabled)</div><div class='add'>+		disable_irq_wake(keypad-&gt;irq);</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'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> static void samsung_keypad_toggle_wakeup(struct samsung_keypad *keypad,</div><div class='ctx'> 					 bool enable)</div><div class='ctx'> {</div><div class='del'>-	struct device *dev = keypad-&gt;input_dev-&gt;dev.parent;</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='ctx'> 	clk_enable(keypad-&gt;clk);</div><div class='hunk'>@@ -393,11 +600,11 @@ static void samsung_keypad_toggle_wakeup(struct samsung_keypad *keypad,</div><div class='ctx'> 	val = readl(keypad-&gt;base + SAMSUNG_KEYIFCON);</div><div class='ctx'> 	if (enable) {</div><div class='ctx'> 		val |= SAMSUNG_KEYIFCON_WAKEUPEN;</div><div class='del'>-		if (device_may_wakeup(dev))</div><div class='add'>+		if (device_may_wakeup(&amp;keypad-&gt;pdev-&gt;dev))</div><div class='ctx'> 			enable_irq_wake(keypad-&gt;irq);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		val &amp;= ~SAMSUNG_KEYIFCON_WAKEUPEN;</div><div class='del'>-		if (device_may_wakeup(dev))</div><div class='add'>+		if (device_may_wakeup(&amp;keypad-&gt;pdev-&gt;dev))</div><div class='ctx'> 			disable_irq_wake(keypad-&gt;irq);</div><div class='ctx'> 	}</div><div class='ctx'> 	writel(val, keypad-&gt;base + SAMSUNG_KEYIFCON);</div><div class='hunk'>@@ -440,11 +647,23 @@ static int samsung_keypad_resume(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static const struct dev_pm_ops samsung_keypad_pm_ops = {</div><div class='del'>-	.suspend	= samsung_keypad_suspend,</div><div class='del'>-	.resume		= samsung_keypad_resume,</div><div class='add'>+	SET_SYSTEM_SLEEP_PM_OPS(samsung_keypad_suspend, samsung_keypad_resume)</div><div class='add'>+	SET_RUNTIME_PM_OPS(samsung_keypad_runtime_suspend,</div><div class='add'>+			   samsung_keypad_runtime_resume, NULL)</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+static const struct of_device_id samsung_keypad_dt_match[] = {</div><div class='add'>+	{ .compatible = "samsung,s3c6410-keypad" },</div><div class='add'>+	{ .compatible = "samsung,s5pv210-keypad" },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, samsung_keypad_dt_match);</div><div class='add'>+#else</div><div class='add'>+#define samsung_keypad_dt_match NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct platform_device_id samsung_keypad_driver_ids[] = {</div><div class='hunk'>@@ -465,27 +684,14 @@ static struct platform_driver samsung_keypad_driver = {</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "samsung-keypad",</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+		.of_match_table = samsung_keypad_dt_match,</div><div class='ctx'> 		.pm	= &amp;samsung_keypad_pm_ops,</div><div class='del'>-#endif</div><div class='ctx'> 	},</div><div class='ctx'> 	.id_table	= samsung_keypad_driver_ids,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init samsung_keypad_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;samsung_keypad_driver);</div><div class='del'>-}</div><div class='del'>-module_init(samsung_keypad_init);</div><div class='del'>-</div><div class='del'>-static void __exit samsung_keypad_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;samsung_keypad_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(samsung_keypad_exit);</div><div class='add'>+module_platform_driver(samsung_keypad_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Samsung keypad driver");</div><div class='ctx'> MODULE_AUTHOR("Joonyoung Shim &lt;jy0922.shim@samsung.com&gt;");</div><div class='ctx'> MODULE_AUTHOR("Donghwa Lee &lt;dh09.lee@samsung.com&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS("platform:samsung-keypad");</div><div class='head'>diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c<br/>index 934aeb583b30..da54ad5db154 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/sh_keysc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/sh_keysc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/sh_keysc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/sh_keysc.c</a></div><div class='hunk'>@@ -337,19 +337,7 @@ static struct platform_driver sh_keysc_device_driver = {</div><div class='ctx'> 		.pm	= &amp;sh_keysc_dev_pm_ops,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init sh_keysc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sh_keysc_device_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sh_keysc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sh_keysc_device_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sh_keysc_init);</div><div class='del'>-module_exit(sh_keysc_exit);</div><div class='add'>+module_platform_driver(sh_keysc_device_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Magnus Damm");</div><div class='ctx'> MODULE_DESCRIPTION("SuperH KEYSC Keypad Driver");</div><div class='head'>diff --git a/drivers/input/keyboard/spear-keyboard.c b/drivers/input/keyboard/spear-keyboard.c<br/>index d712dffd2157..c88bd63dc9cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/spear-keyboard.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/spear-keyboard.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/spear-keyboard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/spear-keyboard.c</a></div><div class='hunk'>@@ -326,18 +326,7 @@ static struct platform_driver spear_kbd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init spear_kbd_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;spear_kbd_driver);</div><div class='del'>-}</div><div class='del'>-module_init(spear_kbd_init);</div><div class='del'>-</div><div class='del'>-static void __exit spear_kbd_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;spear_kbd_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(spear_kbd_exit);</div><div class='add'>+module_platform_driver(spear_kbd_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Rajeev Kumar");</div><div class='ctx'> MODULE_DESCRIPTION("SPEAr Keyboard Driver");</div><div class='head'>diff --git a/drivers/input/keyboard/stmpe-keypad.c b/drivers/input/keyboard/stmpe-keypad.c<br/>index ab7610ca10eb..9397cf9c625c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/stmpe-keypad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/stmpe-keypad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/stmpe-keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/stmpe-keypad.c</a></div><div class='hunk'>@@ -368,18 +368,7 @@ static struct platform_driver stmpe_keypad_driver = {</div><div class='ctx'> 	.probe		= stmpe_keypad_probe,</div><div class='ctx'> 	.remove		= __devexit_p(stmpe_keypad_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init stmpe_keypad_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;stmpe_keypad_driver);</div><div class='del'>-}</div><div class='del'>-module_init(stmpe_keypad_init);</div><div class='del'>-</div><div class='del'>-static void __exit stmpe_keypad_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;stmpe_keypad_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(stmpe_keypad_exit);</div><div class='add'>+module_platform_driver(stmpe_keypad_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> MODULE_DESCRIPTION("STMPExxxx keypad driver");</div><div class='head'>diff --git a/drivers/input/keyboard/tc3589x-keypad.c b/drivers/input/keyboard/tc3589x-keypad.c<br/>index f60c9e82f204..2dee3e4e7c6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/tc3589x-keypad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/tc3589x-keypad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/tc3589x-keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/tc3589x-keypad.c</a></div><div class='hunk'>@@ -74,11 +74,13 @@</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct tc_keypad - data structure used by keypad driver</div><div class='add'>+ * @tc3589x:    pointer to tc35893</div><div class='ctx'>  * @input:      pointer to input device object</div><div class='ctx'>  * @board:      keypad platform device</div><div class='ctx'>  * @krow:	number of rows</div><div class='ctx'>  * @kcol:	number of coloumns</div><div class='ctx'>  * @keymap:     matrix scan code table for keycodes</div><div class='add'>+ * @keypad_stopped: holds keypad status</div><div class='ctx'>  */</div><div class='ctx'> struct tc_keypad {</div><div class='ctx'> 	struct tc3589x *tc3589x;</div><div class='hunk'>@@ -453,18 +455,7 @@ static struct platform_driver tc3589x_keypad_driver = {</div><div class='ctx'> 	.probe	= tc3589x_keypad_probe,</div><div class='ctx'> 	.remove	= __devexit_p(tc3589x_keypad_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init tc3589x_keypad_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;tc3589x_keypad_driver);</div><div class='del'>-}</div><div class='del'>-module_init(tc3589x_keypad_init);</div><div class='del'>-</div><div class='del'>-static void __exit tc3589x_keypad_exit(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_unregister(&amp;tc3589x_keypad_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(tc3589x_keypad_exit);</div><div class='add'>+module_platform_driver(tc3589x_keypad_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> MODULE_AUTHOR("Jayeeta Banerjee/Sundar Iyer");</div><div class='head'>diff --git a/drivers/input/keyboard/tca8418_keypad.c b/drivers/input/keyboard/tca8418_keypad.c<br/>new file mode 100644<br/>index 000000000000..958ec107bfbc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/tca8418_keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/tca8418_keypad.c</a></div><div class='hunk'>@@ -0,0 +1,430 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for TCA8418 I2C keyboard</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Fuel7, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Author: Kyle Manna &lt;kyle.manna@fuel7.com&gt;</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</div><div class='add'>+ * License v2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public</div><div class='add'>+ * License along with this program; if not, write to the</div><div class='add'>+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='add'>+ * Boston, MA 021110-1307, USA.</div><div class='add'>+ *</div><div class='add'>+ * If you can't comply with GPLv2, alternative licensing terms may be</div><div class='add'>+ * arranged. Please contact Fuel7, Inc. (http://fuel7.com/) for proprietary</div><div class='add'>+ * alternative licensing inquiries.</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/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/input/tca8418_keypad.h&gt;</div><div class='add'>+</div><div class='add'>+/* TCA8418 hardware limits */</div><div class='add'>+#define TCA8418_MAX_ROWS	8</div><div class='add'>+#define TCA8418_MAX_COLS	10</div><div class='add'>+</div><div class='add'>+/* TCA8418 register offsets */</div><div class='add'>+#define REG_CFG			0x01</div><div class='add'>+#define REG_INT_STAT		0x02</div><div class='add'>+#define REG_KEY_LCK_EC		0x03</div><div class='add'>+#define REG_KEY_EVENT_A		0x04</div><div class='add'>+#define REG_KEY_EVENT_B		0x05</div><div class='add'>+#define REG_KEY_EVENT_C		0x06</div><div class='add'>+#define REG_KEY_EVENT_D		0x07</div><div class='add'>+#define REG_KEY_EVENT_E		0x08</div><div class='add'>+#define REG_KEY_EVENT_F		0x09</div><div class='add'>+#define REG_KEY_EVENT_G		0x0A</div><div class='add'>+#define REG_KEY_EVENT_H		0x0B</div><div class='add'>+#define REG_KEY_EVENT_I		0x0C</div><div class='add'>+#define REG_KEY_EVENT_J		0x0D</div><div class='add'>+#define REG_KP_LCK_TIMER	0x0E</div><div class='add'>+#define REG_UNLOCK1		0x0F</div><div class='add'>+#define REG_UNLOCK2		0x10</div><div class='add'>+#define REG_GPIO_INT_STAT1	0x11</div><div class='add'>+#define REG_GPIO_INT_STAT2	0x12</div><div class='add'>+#define REG_GPIO_INT_STAT3	0x13</div><div class='add'>+#define REG_GPIO_DAT_STAT1	0x14</div><div class='add'>+#define REG_GPIO_DAT_STAT2	0x15</div><div class='add'>+#define REG_GPIO_DAT_STAT3	0x16</div><div class='add'>+#define REG_GPIO_DAT_OUT1	0x17</div><div class='add'>+#define REG_GPIO_DAT_OUT2	0x18</div><div class='add'>+#define REG_GPIO_DAT_OUT3	0x19</div><div class='add'>+#define REG_GPIO_INT_EN1	0x1A</div><div class='add'>+#define REG_GPIO_INT_EN2	0x1B</div><div class='add'>+#define REG_GPIO_INT_EN3	0x1C</div><div class='add'>+#define REG_KP_GPIO1		0x1D</div><div class='add'>+#define REG_KP_GPIO2		0x1E</div><div class='add'>+#define REG_KP_GPIO3		0x1F</div><div class='add'>+#define REG_GPI_EM1		0x20</div><div class='add'>+#define REG_GPI_EM2		0x21</div><div class='add'>+#define REG_GPI_EM3		0x22</div><div class='add'>+#define REG_GPIO_DIR1		0x23</div><div class='add'>+#define REG_GPIO_DIR2		0x24</div><div class='add'>+#define REG_GPIO_DIR3		0x25</div><div class='add'>+#define REG_GPIO_INT_LVL1	0x26</div><div class='add'>+#define REG_GPIO_INT_LVL2	0x27</div><div class='add'>+#define REG_GPIO_INT_LVL3	0x28</div><div class='add'>+#define REG_DEBOUNCE_DIS1	0x29</div><div class='add'>+#define REG_DEBOUNCE_DIS2	0x2A</div><div class='add'>+#define REG_DEBOUNCE_DIS3	0x2B</div><div class='add'>+#define REG_GPIO_PULL1		0x2C</div><div class='add'>+#define REG_GPIO_PULL2		0x2D</div><div class='add'>+#define REG_GPIO_PULL3		0x2E</div><div class='add'>+</div><div class='add'>+/* TCA8418 bit definitions */</div><div class='add'>+#define CFG_AI			BIT(7)</div><div class='add'>+#define CFG_GPI_E_CFG		BIT(6)</div><div class='add'>+#define CFG_OVR_FLOW_M		BIT(5)</div><div class='add'>+#define CFG_INT_CFG		BIT(4)</div><div class='add'>+#define CFG_OVR_FLOW_IEN	BIT(3)</div><div class='add'>+#define CFG_K_LCK_IEN		BIT(2)</div><div class='add'>+#define CFG_GPI_IEN		BIT(1)</div><div class='add'>+#define CFG_KE_IEN		BIT(0)</div><div class='add'>+</div><div class='add'>+#define INT_STAT_CAD_INT	BIT(4)</div><div class='add'>+#define INT_STAT_OVR_FLOW_INT	BIT(3)</div><div class='add'>+#define INT_STAT_K_LCK_INT	BIT(2)</div><div class='add'>+#define INT_STAT_GPI_INT	BIT(1)</div><div class='add'>+#define INT_STAT_K_INT		BIT(0)</div><div class='add'>+</div><div class='add'>+/* TCA8418 register masks */</div><div class='add'>+#define KEY_LCK_EC_KEC		0x7</div><div class='add'>+#define KEY_EVENT_CODE		0x7f</div><div class='add'>+#define KEY_EVENT_VALUE		0x80</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id tca8418_id[] = {</div><div class='add'>+	{ TCA8418_NAME, 8418, },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, tca8418_id);</div><div class='add'>+</div><div class='add'>+struct tca8418_keypad {</div><div class='add'>+	unsigned int rows;</div><div class='add'>+	unsigned int cols;</div><div class='add'>+	unsigned int keypad_mask; /* Mask for keypad col/rol regs */</div><div class='add'>+	unsigned int irq;</div><div class='add'>+	unsigned int row_shift;</div><div class='add'>+</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct input_dev *input;</div><div class='add'>+</div><div class='add'>+	/* Flexible array member, must be at end of struct */</div><div class='add'>+	unsigned short keymap[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write a byte to the TCA8418</div><div class='add'>+ */</div><div class='add'>+static int tca8418_write_byte(struct tca8418_keypad *keypad_data,</div><div class='add'>+			      int reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = i2c_smbus_write_byte_data(keypad_data-&gt;client, reg, val);</div><div class='add'>+	if (error &lt; 0) {</div><div class='add'>+		dev_err(&amp;keypad_data-&gt;client-&gt;dev,</div><div class='add'>+			"%s failed, reg: %d, val: %d, error: %d\n",</div><div class='add'>+			__func__, reg, val, error);</div><div class='add'>+		return error;</div><div 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'>+ * Read a byte from the TCA8418</div><div class='add'>+ */</div><div class='add'>+static int tca8418_read_byte(struct tca8418_keypad *keypad_data,</div><div class='add'>+			     int reg, u8 *val)</div><div class='add'>+{</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = i2c_smbus_read_byte_data(keypad_data-&gt;client, reg);</div><div class='add'>+	if (error &lt; 0) {</div><div class='add'>+		dev_err(&amp;keypad_data-&gt;client-&gt;dev,</div><div class='add'>+				"%s failed, reg: %d, error: %d\n",</div><div class='add'>+				__func__, reg, error);</div><div class='add'>+		return error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*val = (u8)error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tca8418_read_keypad(struct tca8418_keypad *keypad_data)</div><div class='add'>+{</div><div class='add'>+	int error, col, row;</div><div class='add'>+	u8 reg, state, code;</div><div class='add'>+</div><div class='add'>+	/* Initial read of the key event FIFO */</div><div class='add'>+	error = tca8418_read_byte(keypad_data, REG_KEY_EVENT_A, &amp;reg);</div><div class='add'>+</div><div class='add'>+	/* Assume that key code 0 signifies empty FIFO */</div><div class='add'>+	while (error &gt;= 0 &amp;&amp; reg &gt; 0) {</div><div class='add'>+		state = reg &amp; KEY_EVENT_VALUE;</div><div class='add'>+		code  = reg &amp; KEY_EVENT_CODE;</div><div class='add'>+</div><div class='add'>+		row = code / TCA8418_MAX_COLS;</div><div class='add'>+		col = code % TCA8418_MAX_COLS;</div><div class='add'>+</div><div class='add'>+		row = (col) ? row : row - 1;</div><div class='add'>+		col = (col) ? col - 1 : TCA8418_MAX_COLS - 1;</div><div class='add'>+</div><div class='add'>+		code = MATRIX_SCAN_CODE(row, col, keypad_data-&gt;row_shift);</div><div class='add'>+		input_event(keypad_data-&gt;input, EV_MSC, MSC_SCAN, code);</div><div class='add'>+		input_report_key(keypad_data-&gt;input,</div><div class='add'>+				keypad_data-&gt;keymap[code], state);</div><div class='add'>+</div><div class='add'>+		/* Read for next loop */</div><div class='add'>+		error = tca8418_read_byte(keypad_data, REG_KEY_EVENT_A, &amp;reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		dev_err(&amp;keypad_data-&gt;client-&gt;dev,</div><div class='add'>+			"unable to read REG_KEY_EVENT_A\n");</div><div class='add'>+</div><div class='add'>+	input_sync(keypad_data-&gt;input);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Threaded IRQ handler and this can (and will) sleep.</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t tca8418_irq_handler(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct tca8418_keypad *keypad_data = dev_id;</div><div class='add'>+	u8 reg;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = tca8418_read_byte(keypad_data, REG_INT_STAT, &amp;reg);</div><div class='add'>+	if (error) {</div><div class='add'>+		dev_err(&amp;keypad_data-&gt;client-&gt;dev,</div><div class='add'>+			"unable to read REG_INT_STAT\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (reg &amp; INT_STAT_OVR_FLOW_INT)</div><div class='add'>+		dev_warn(&amp;keypad_data-&gt;client-&gt;dev, "overflow occurred\n");</div><div class='add'>+</div><div class='add'>+	if (reg &amp; INT_STAT_K_INT)</div><div class='add'>+		tca8418_read_keypad(keypad_data);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	/* Clear all interrupts, even IRQs we didn't check (GPI, CAD, LCK) */</div><div class='add'>+	reg = 0xff;</div><div class='add'>+	error = tca8418_write_byte(keypad_data, REG_INT_STAT, reg);</div><div class='add'>+	if (error)</div><div class='add'>+		dev_err(&amp;keypad_data-&gt;client-&gt;dev,</div><div class='add'>+			"unable to clear REG_INT_STAT\n");</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Configure the TCA8418 for keypad operation</div><div class='add'>+ */</div><div class='add'>+static int __devinit tca8418_configure(struct tca8418_keypad *keypad_data)</div><div class='add'>+{</div><div class='add'>+	int reg, error;</div><div class='add'>+</div><div class='add'>+	/* Write config register, if this fails assume device not present */</div><div class='add'>+	error = tca8418_write_byte(keypad_data, REG_CFG,</div><div class='add'>+				CFG_INT_CFG | CFG_OVR_FLOW_IEN | CFG_KE_IEN);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* Assemble a mask for row and column registers */</div><div class='add'>+	reg  =  ~(~0 &lt;&lt; keypad_data-&gt;rows);</div><div class='add'>+	reg += (~(~0 &lt;&lt; keypad_data-&gt;cols)) &lt;&lt; 8;</div><div class='add'>+	keypad_data-&gt;keypad_mask = reg;</div><div class='add'>+</div><div class='add'>+	/* Set registers to keypad mode */</div><div class='add'>+	error |= tca8418_write_byte(keypad_data, REG_KP_GPIO1, reg);</div><div class='add'>+	error |= tca8418_write_byte(keypad_data, REG_KP_GPIO2, reg &gt;&gt; 8);</div><div class='add'>+	error |= tca8418_write_byte(keypad_data, REG_KP_GPIO3, reg &gt;&gt; 16);</div><div class='add'>+</div><div class='add'>+	/* Enable column debouncing */</div><div class='add'>+	error |= tca8418_write_byte(keypad_data, REG_DEBOUNCE_DIS1, reg);</div><div class='add'>+	error |= tca8418_write_byte(keypad_data, REG_DEBOUNCE_DIS2, reg &gt;&gt; 8);</div><div class='add'>+	error |= tca8418_write_byte(keypad_data, REG_DEBOUNCE_DIS3, reg &gt;&gt; 16);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit tca8418_keypad_probe(struct i2c_client *client,</div><div class='add'>+					  const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	const struct tca8418_keypad_platform_data *pdata =</div><div class='add'>+						client-&gt;dev.platform_data;</div><div class='add'>+	struct tca8418_keypad *keypad_data;</div><div class='add'>+	struct input_dev *input;</div><div class='add'>+	int error, row_shift, max_keys;</div><div class='add'>+</div><div class='add'>+	/* Copy the platform data */</div><div class='add'>+	if (!pdata) {</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "no platform data\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!pdata-&gt;keymap_data) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "no keymap data defined\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!pdata-&gt;rows || pdata-&gt;rows &gt; TCA8418_MAX_ROWS) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "invalid rows\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!pdata-&gt;cols || pdata-&gt;cols &gt; TCA8418_MAX_COLS) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "invalid columns\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check i2c driver capabilities */</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter, I2C_FUNC_SMBUS_BYTE)) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "%s adapter not supported\n",</div><div class='add'>+			dev_driver_string(&amp;client-&gt;adapter-&gt;dev));</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	row_shift = get_count_order(pdata-&gt;cols);</div><div class='add'>+	max_keys = pdata-&gt;rows &lt;&lt; row_shift;</div><div class='add'>+</div><div class='add'>+	/* Allocate memory for keypad_data, keymap and input device */</div><div class='add'>+	keypad_data = kzalloc(sizeof(*keypad_data) +</div><div class='add'>+			max_keys * sizeof(keypad_data-&gt;keymap[0]), GFP_KERNEL);</div><div class='add'>+	if (!keypad_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	keypad_data-&gt;rows = pdata-&gt;rows;</div><div class='add'>+	keypad_data-&gt;cols = pdata-&gt;cols;</div><div class='add'>+	keypad_data-&gt;client = client;</div><div class='add'>+	keypad_data-&gt;row_shift = row_shift;</div><div class='add'>+</div><div class='add'>+	/* Initialize the chip or fail if chip isn't present */</div><div class='add'>+	error = tca8418_configure(keypad_data);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		goto fail1;</div><div class='add'>+</div><div class='add'>+	/* Configure input device */</div><div class='add'>+	input = input_allocate_device();</div><div class='add'>+	if (!input) {</div><div class='add'>+		error = -ENOMEM;</div><div class='add'>+		goto fail1;</div><div class='add'>+	}</div><div class='add'>+	keypad_data-&gt;input = input;</div><div class='add'>+</div><div class='add'>+	input-&gt;name = client-&gt;name;</div><div class='add'>+	input-&gt;dev.parent = &amp;client-&gt;dev;</div><div class='add'>+</div><div class='add'>+	input-&gt;id.bustype = BUS_I2C;</div><div class='add'>+	input-&gt;id.vendor  = 0x0001;</div><div class='add'>+	input-&gt;id.product = 0x001;</div><div class='add'>+	input-&gt;id.version = 0x0001;</div><div class='add'>+</div><div class='add'>+	input-&gt;keycode     = keypad_data-&gt;keymap;</div><div class='add'>+	input-&gt;keycodesize = sizeof(keypad_data-&gt;keymap[0]);</div><div class='add'>+	input-&gt;keycodemax  = max_keys;</div><div class='add'>+</div><div class='add'>+	__set_bit(EV_KEY, input-&gt;evbit);</div><div class='add'>+	if (pdata-&gt;rep)</div><div class='add'>+		__set_bit(EV_REP, input-&gt;evbit);</div><div class='add'>+</div><div class='add'>+	input_set_capability(input, EV_MSC, MSC_SCAN);</div><div class='add'>+</div><div class='add'>+	input_set_drvdata(input, keypad_data);</div><div class='add'>+</div><div class='add'>+	matrix_keypad_build_keymap(pdata-&gt;keymap_data, row_shift,</div><div class='add'>+			input-&gt;keycode, input-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;irq_is_gpio)</div><div class='add'>+		client-&gt;irq = gpio_to_irq(client-&gt;irq);</div><div class='add'>+</div><div class='add'>+	error = request_threaded_irq(client-&gt;irq, NULL, tca8418_irq_handler,</div><div class='add'>+				     IRQF_TRIGGER_FALLING,</div><div class='add'>+				     client-&gt;name, keypad_data);</div><div class='add'>+	if (error) {</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev,</div><div class='add'>+			"Unable to claim irq %d; error %d\n",</div><div class='add'>+			client-&gt;irq, error);</div><div class='add'>+		goto fail2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	error = input_register_device(input);</div><div class='add'>+	if (error) {</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev,</div><div class='add'>+			"Unable to register input device, error: %d\n", error);</div><div class='add'>+		goto fail3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(client, keypad_data);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail3:</div><div class='add'>+	free_irq(client-&gt;irq, keypad_data);</div><div class='add'>+fail2:</div><div class='add'>+	input_free_device(input);</div><div class='add'>+fail1:</div><div class='add'>+	kfree(keypad_data);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit tca8418_keypad_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct tca8418_keypad *keypad_data = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	free_irq(keypad_data-&gt;client-&gt;irq, keypad_data);</div><div class='add'>+</div><div class='add'>+	input_unregister_device(keypad_data-&gt;input);</div><div class='add'>+</div><div class='add'>+	kfree(keypad_data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct i2c_driver tca8418_keypad_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= TCA8418_NAME,</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe		= tca8418_keypad_probe,</div><div class='add'>+	.remove		= __devexit_p(tca8418_keypad_remove),</div><div class='add'>+	.id_table	= tca8418_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init tca8418_keypad_init(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;tca8418_keypad_driver);</div><div class='add'>+}</div><div class='add'>+subsys_initcall(tca8418_keypad_init);</div><div class='add'>+</div><div class='add'>+static void __exit tca8418_keypad_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;tca8418_keypad_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(tca8418_keypad_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Kyle Manna &lt;kyle.manna@fuel7.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Keypad driver for TCA8418");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c<br/>index cf3228b0ab90..a136e2e832be 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/tegra-kbc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/tegra-kbc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/tegra-kbc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/tegra-kbc.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;mach/clk.h&gt;</div><div class='hunk'>@@ -52,6 +53,7 @@</div><div class='ctx'> /* KBC Interrupt Register */</div><div class='ctx'> #define KBC_INT_0	0x4</div><div class='ctx'> #define KBC_INT_FIFO_CNT_INT_STATUS	(1 &lt;&lt; 2)</div><div class='add'>+#define KBC_INT_KEYPRESS_INT_STATUS	(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> #define KBC_ROW_CFG0_0	0x8</div><div class='ctx'> #define KBC_COL_CFG0_0	0x18</div><div class='hunk'>@@ -74,15 +76,17 @@ struct tegra_kbc {</div><div class='ctx'> 	unsigned int cp_to_wkup_dly;</div><div class='ctx'> 	bool use_fn_map;</div><div class='ctx'> 	bool use_ghost_filter;</div><div class='add'>+	bool keypress_caused_wake;</div><div class='ctx'> 	const struct tegra_kbc_platform_data *pdata;</div><div class='ctx'> 	unsigned short keycode[KBC_MAX_KEY * 2];</div><div class='ctx'> 	unsigned short current_keys[KBC_MAX_KPENT];</div><div class='ctx'> 	unsigned int num_pressed_keys;</div><div class='add'>+	u32 wakeup_key;</div><div class='ctx'> 	struct timer_list timer;</div><div class='ctx'> 	struct clk *clk;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u32 tegra_kbc_default_keymap[] = {</div><div class='add'>+static const u32 tegra_kbc_default_keymap[] __devinitdata = {</div><div class='ctx'> 	KEY(0, 2, KEY_W),</div><div class='ctx'> 	KEY(0, 3, KEY_S),</div><div class='ctx'> 	KEY(0, 4, KEY_A),</div><div class='hunk'>@@ -217,7 +221,8 @@ static const u32 tegra_kbc_default_keymap[] = {</div><div class='ctx'> 	KEY(31, 4, KEY_HELP),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct matrix_keymap_data tegra_kbc_default_keymap_data = {</div><div class='add'>+static const</div><div class='add'>+struct matrix_keymap_data tegra_kbc_default_keymap_data __devinitdata = {</div><div class='ctx'> 	.keymap		= tegra_kbc_default_keymap,</div><div class='ctx'> 	.keymap_size	= ARRAY_SIZE(tegra_kbc_default_keymap),</div><div class='ctx'> };</div><div class='hunk'>@@ -409,6 +414,9 @@ static irqreturn_t tegra_kbc_isr(int irq, void *args)</div><div class='ctx'> 		 */</div><div class='ctx'> 		tegra_kbc_set_fifo_interrupt(kbc, false);</div><div class='ctx'> 		mod_timer(&amp;kbc-&gt;timer, jiffies + kbc-&gt;cp_dly_jiffies);</div><div class='add'>+	} else if (val &amp; KBC_INT_KEYPRESS_INT_STATUS) {</div><div class='add'>+		/* We can be here only through system resume path */</div><div class='add'>+		kbc-&gt;keypress_caused_wake = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;kbc-&gt;lock, flags);</div><div class='hunk'>@@ -576,6 +584,56 @@ tegra_kbc_check_pin_cfg(const struct tegra_kbc_platform_data *pdata,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+static struct tegra_kbc_platform_data * __devinit</div><div class='add'>+tegra_kbc_dt_parse_pdata(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct tegra_kbc_platform_data *pdata;</div><div class='add'>+	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='add'>+</div><div class='add'>+	if (!np)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);</div><div class='add'>+	if (!pdata)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (!of_property_read_u32(np, "debounce-delay", &amp;prop))</div><div class='add'>+		pdata-&gt;debounce_cnt = prop;</div><div class='add'>+</div><div class='add'>+	if (!of_property_read_u32(np, "repeat-delay", &amp;prop))</div><div class='add'>+		pdata-&gt;repeat_cnt = prop;</div><div class='add'>+</div><div class='add'>+	if (of_find_property(np, "needs-ghost-filter", NULL))</div><div class='add'>+		pdata-&gt;use_ghost_filter = true;</div><div class='add'>+</div><div class='add'>+	if (of_find_property(np, "wakeup-source", NULL))</div><div class='add'>+		pdata-&gt;wakeup = true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * All currently known keymaps with device tree support use the same</div><div class='add'>+	 * pin_cfg, so set it up here.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; KBC_MAX_ROW; i++) {</div><div class='add'>+		pdata-&gt;pin_cfg[i].num = i;</div><div class='add'>+		pdata-&gt;pin_cfg[i].is_row = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; KBC_MAX_COL; i++) {</div><div class='add'>+		pdata-&gt;pin_cfg[KBC_MAX_ROW + i].num = i;</div><div class='add'>+		pdata-&gt;pin_cfg[KBC_MAX_ROW + i].is_row = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return pdata;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline struct tegra_kbc_platform_data *tegra_kbc_dt_parse_pdata(</div><div class='add'>+	struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int __devinit tegra_kbc_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	const struct tegra_kbc_platform_data *pdata = pdev-&gt;dev.platform_data;</div><div class='hunk'>@@ -590,21 +648,28 @@ static int __devinit tegra_kbc_probe(struct platform_device *pdev)</div><div class='ctx'> 	unsigned int scan_time_rows;</div><div class='ctx'> </div><div class='ctx'> 	if (!pdata)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		pdata = tegra_kbc_dt_parse_pdata(pdev);</div><div class='ctx'> </div><div class='del'>-	if (!tegra_kbc_check_pin_cfg(pdata, &amp;pdev-&gt;dev, &amp;num_rows))</div><div class='add'>+	if (!pdata)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (!tegra_kbc_check_pin_cfg(pdata, &amp;pdev-&gt;dev, &amp;num_rows)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto err_free_pdata;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	if (!res) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to get I/O memory\n");</div><div class='del'>-		return -ENXIO;</div><div class='add'>+		err = -ENXIO;</div><div class='add'>+		goto err_free_pdata;</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='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to get keyboard IRQ\n");</div><div class='del'>-		return -ENXIO;</div><div class='add'>+		err = -ENXIO;</div><div class='add'>+		goto err_free_pdata;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kbc = kzalloc(sizeof(*kbc), GFP_KERNEL);</div><div class='hunk'>@@ -674,9 +739,10 @@ static int __devinit tegra_kbc_probe(struct platform_device *pdev)</div><div class='ctx'> 	keymap_data = pdata-&gt;keymap_data ?: &amp;tegra_kbc_default_keymap_data;</div><div class='ctx'> 	matrix_keypad_build_keymap(keymap_data, KBC_ROW_SHIFT,</div><div class='ctx'> 				   input_dev-&gt;keycode, input_dev-&gt;keybit);</div><div class='add'>+	kbc-&gt;wakeup_key = pdata-&gt;wakeup_key;</div><div class='ctx'> </div><div class='del'>-	err = request_irq(kbc-&gt;irq, tegra_kbc_isr, IRQF_TRIGGER_HIGH,</div><div class='del'>-			  pdev-&gt;name, kbc);</div><div class='add'>+	err = request_irq(kbc-&gt;irq, tegra_kbc_isr,</div><div class='add'>+			  IRQF_NO_SUSPEND | IRQF_TRIGGER_HIGH, pdev-&gt;name, kbc);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to request keyboard IRQ\n");</div><div class='ctx'> 		goto err_put_clk;</div><div class='hunk'>@@ -706,6 +772,9 @@ err_free_mem_region:</div><div class='ctx'> err_free_mem:</div><div class='ctx'> 	input_free_device(input_dev);</div><div class='ctx'> 	kfree(kbc);</div><div class='add'>+err_free_pdata:</div><div class='add'>+	if (!pdev-&gt;dev.platform_data)</div><div class='add'>+		kfree(pdata);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -715,6 +784,8 @@ static int __devexit tegra_kbc_remove(struct platform_device *pdev)</div><div class='ctx'> 	struct tegra_kbc *kbc = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> </div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='ctx'> 	free_irq(kbc-&gt;irq, pdev);</div><div class='ctx'> 	clk_put(kbc-&gt;clk);</div><div class='ctx'> </div><div class='hunk'>@@ -723,9 +794,14 @@ static int __devexit tegra_kbc_remove(struct platform_device *pdev)</div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	release_mem_region(res-&gt;start, resource_size(res));</div><div class='ctx'> </div><div class='del'>-	kfree(kbc);</div><div class='add'>+	/*</div><div class='add'>+	 * If we do not have platform data attached to the device we</div><div class='add'>+	 * allocated it ourselves and thus need to free it.</div><div class='add'>+	 */</div><div class='add'>+	if (!pdev-&gt;dev.platform_data)</div><div class='add'>+		kfree(kbc-&gt;pdata);</div><div class='ctx'> </div><div class='del'>-	platform_set_drvdata(pdev, NULL);</div><div class='add'>+	kfree(kbc);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -754,6 +830,8 @@ static int tegra_kbc_suspend(struct device *dev)</div><div class='ctx'> 		tegra_kbc_setup_wakekeys(kbc, true);</div><div class='ctx'> 		msleep(30);</div><div class='ctx'> </div><div class='add'>+		kbc-&gt;keypress_caused_wake = false;</div><div class='add'>+		enable_irq(kbc-&gt;irq);</div><div class='ctx'> 		enable_irq_wake(kbc-&gt;irq);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (kbc-&gt;idev-&gt;users)</div><div class='hunk'>@@ -780,7 +858,19 @@ static int tegra_kbc_resume(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 		tegra_kbc_set_fifo_interrupt(kbc, true);</div><div class='ctx'> </div><div class='del'>-		enable_irq(kbc-&gt;irq);</div><div class='add'>+		if (kbc-&gt;keypress_caused_wake &amp;&amp; kbc-&gt;wakeup_key) {</div><div class='add'>+			/*</div><div class='add'>+			 * We can't report events directly from the ISR</div><div class='add'>+			 * because timekeeping is stopped when processing</div><div class='add'>+			 * wakeup request and we get a nasty warning when</div><div class='add'>+			 * we try to call do_gettimeofday() in evdev</div><div class='add'>+			 * handler.</div><div class='add'>+			 */</div><div class='add'>+			input_report_key(kbc-&gt;idev, kbc-&gt;wakeup_key, 1);</div><div class='add'>+			input_sync(kbc-&gt;idev);</div><div class='add'>+			input_report_key(kbc-&gt;idev, kbc-&gt;wakeup_key, 0);</div><div class='add'>+			input_sync(kbc-&gt;idev);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (kbc-&gt;idev-&gt;users)</div><div class='ctx'> 			err = tegra_kbc_start(kbc);</div><div class='hunk'>@@ -793,6 +883,12 @@ static int tegra_kbc_resume(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static SIMPLE_DEV_PM_OPS(tegra_kbc_pm_ops, tegra_kbc_suspend, tegra_kbc_resume);</div><div class='ctx'> </div><div class='add'>+static const struct of_device_id tegra_kbc_of_match[] = {</div><div class='add'>+	{ .compatible = "nvidia,tegra20-kbc", },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, tegra_kbc_of_match);</div><div class='add'>+</div><div class='ctx'> static struct platform_driver tegra_kbc_driver = {</div><div class='ctx'> 	.probe		= tegra_kbc_probe,</div><div class='ctx'> 	.remove		= __devexit_p(tegra_kbc_remove),</div><div class='hunk'>@@ -800,20 +896,10 @@ static struct platform_driver tegra_kbc_driver = {</div><div class='ctx'> 		.name	= "tegra-kbc",</div><div class='ctx'> 		.owner  = THIS_MODULE,</div><div class='ctx'> 		.pm	= &amp;tegra_kbc_pm_ops,</div><div class='add'>+		.of_match_table = tegra_kbc_of_match,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static void __exit tegra_kbc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;tegra_kbc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(tegra_kbc_exit);</div><div class='del'>-</div><div class='del'>-static int __init tegra_kbc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;tegra_kbc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(tegra_kbc_init);</div><div class='add'>+module_platform_driver(tegra_kbc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Rakesh Iyer &lt;riyer@nvidia.com&gt;");</div><div class='head'>diff --git a/drivers/input/keyboard/tnetv107x-keypad.c b/drivers/input/keyboard/tnetv107x-keypad.c<br/>index 66e55e5cfdd6..fb39c94b6fdd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/tnetv107x-keypad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/tnetv107x-keypad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/tnetv107x-keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/tnetv107x-keypad.c</a></div><div class='hunk'>@@ -322,19 +322,7 @@ static struct platform_driver keypad_driver = {</div><div class='ctx'> 	.driver.name	= "tnetv107x-keypad",</div><div class='ctx'> 	.driver.owner	= THIS_MODULE,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init keypad_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;keypad_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit keypad_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;keypad_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(keypad_init);</div><div class='del'>-module_exit(keypad_exit);</div><div class='add'>+module_platform_driver(keypad_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Cyril Chemparathy");</div><div class='ctx'> MODULE_DESCRIPTION("TNETV107X Keypad Driver");</div><div class='head'>diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c<br/>index a26922cf0e84..a588578037eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/twl4030_keypad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/twl4030_keypad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/twl4030_keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/twl4030_keypad.c</a></div><div class='hunk'>@@ -460,18 +460,7 @@ static struct platform_driver twl4030_kp_driver = {</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init twl4030_kp_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;twl4030_kp_driver);</div><div class='del'>-}</div><div class='del'>-module_init(twl4030_kp_init);</div><div class='del'>-</div><div class='del'>-static void __exit twl4030_kp_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;twl4030_kp_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(twl4030_kp_exit);</div><div class='add'>+module_platform_driver(twl4030_kp_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Texas Instruments");</div><div class='ctx'> MODULE_DESCRIPTION("TWL4030 Keypad Driver");</div><div class='head'>diff --git a/drivers/input/keyboard/w90p910_keypad.c b/drivers/input/keyboard/w90p910_keypad.c<br/>index 318586dadacf..99bbb7e775ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/w90p910_keypad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/keyboard/w90p910_keypad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/w90p910_keypad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/keyboard/w90p910_keypad.c</a></div><div class='hunk'>@@ -262,19 +262,7 @@ static struct platform_driver w90p910_keypad_driver = {</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init w90p910_keypad_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;w90p910_keypad_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit w90p910_keypad_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;w90p910_keypad_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(w90p910_keypad_init);</div><div class='del'>-module_exit(w90p910_keypad_exit);</div><div class='add'>+module_platform_driver(w90p910_keypad_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Wan ZongShun &lt;mcuos.com@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("w90p910 keypad driver");</div><div class='head'>diff --git a/drivers/input/misc/88pm860x_onkey.c b/drivers/input/misc/88pm860x_onkey.c<br/>index 3dca3c14510e..f2e0cbc5ab64 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/88pm860x_onkey.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/88pm860x_onkey.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/88pm860x_onkey.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/88pm860x_onkey.c</a></div><div class='hunk'>@@ -137,18 +137,7 @@ static struct platform_driver pm860x_onkey_driver = {</div><div class='ctx'> 	.probe		= pm860x_onkey_probe,</div><div class='ctx'> 	.remove		= __devexit_p(pm860x_onkey_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init pm860x_onkey_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pm860x_onkey_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pm860x_onkey_init);</div><div class='del'>-</div><div class='del'>-static void __exit pm860x_onkey_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pm860x_onkey_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(pm860x_onkey_exit);</div><div class='add'>+module_platform_driver(pm860x_onkey_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Marvell 88PM860x ONKEY driver");</div><div class='ctx'> MODULE_AUTHOR("Haojian Zhuang &lt;haojian.zhuang@marvell.com&gt;");</div><div class='head'>diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig<br/>index 22d875fde53a..7b46781c30c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/Kconfig</a></div><div class='hunk'>@@ -179,6 +179,31 @@ config INPUT_APANEL</div><div class='ctx'> 	 To compile this driver as a module, choose M here: the module will</div><div class='ctx'> 	 be called apanel.</div><div class='ctx'> </div><div class='add'>+config INPUT_GP2A</div><div class='add'>+	tristate "Sharp GP2AP002A00F I2C Proximity/Opto sensor driver"</div><div class='add'>+	depends on I2C</div><div class='add'>+	depends on GENERIC_GPIO</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you have a Sharp GP2AP002A00F proximity/als combo-chip</div><div class='add'>+	  hooked to an I2C bus.</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 gp2ap002a00f.</div><div class='add'>+</div><div class='add'>+config INPUT_GPIO_TILT_POLLED</div><div class='add'>+	tristate "Polled GPIO tilt switch"</div><div class='add'>+	depends on GENERIC_GPIO</div><div class='add'>+	select INPUT_POLLDEV</div><div class='add'>+	help</div><div class='add'>+	  This driver implements support for tilt switches connected</div><div class='add'>+	  to GPIO pins that are not capable of generating interrupts.</div><div class='add'>+</div><div class='add'>+	  The list of gpios to use and the mapping of their states</div><div class='add'>+	  to specific angles is done via platform data.</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 gpio_tilt_polled.</div><div class='add'>+</div><div class='ctx'> config INPUT_IXP4XX_BEEPER</div><div class='ctx'> 	tristate "IXP4XX Beeper support"</div><div class='ctx'> 	depends on ARCH_IXP4XX</div><div class='head'>diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile<br/>index a244fc6a781c..46671a875b91 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/Makefile</a></div><div class='hunk'>@@ -22,6 +22,8 @@ obj-$(CONFIG_INPUT_CMA3000)		+= cma3000_d0x.o</div><div class='ctx'> obj-$(CONFIG_INPUT_CMA3000_I2C)		+= cma3000_d0x_i2c.o</div><div class='ctx'> obj-$(CONFIG_INPUT_COBALT_BTNS)		+= cobalt_btns.o</div><div class='ctx'> obj-$(CONFIG_INPUT_DM355EVM)		+= dm355evm_keys.o</div><div class='add'>+obj-$(CONFIG_INPUT_GP2A)		+= gp2ap002a00f.o</div><div class='add'>+obj-$(CONFIG_INPUT_GPIO_TILT_POLLED)	+= gpio_tilt_polled.o</div><div class='ctx'> obj-$(CONFIG_HP_SDC_RTC)		+= hp_sdc_rtc.o</div><div class='ctx'> obj-$(CONFIG_INPUT_IXP4XX_BEEPER)	+= ixp4xx-beeper.o</div><div class='ctx'> obj-$(CONFIG_INPUT_KEYSPAN_REMOTE)	+= keyspan_remote.o</div><div class='head'>diff --git a/drivers/input/misc/ab8500-ponkey.c b/drivers/input/misc/ab8500-ponkey.c<br/>index 3d3288a78fdc..350fd0c385d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/ab8500-ponkey.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/ab8500-ponkey.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/ab8500-ponkey.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/ab8500-ponkey.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/mfd/ab8500.h&gt;</div><div class='add'>+#include &lt;linux/mfd/abx500/ab8500.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -139,18 +139,7 @@ static struct platform_driver ab8500_ponkey_driver = {</div><div class='ctx'> 	.probe		= ab8500_ponkey_probe,</div><div class='ctx'> 	.remove		= __devexit_p(ab8500_ponkey_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init ab8500_ponkey_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ab8500_ponkey_driver);</div><div class='del'>-}</div><div class='del'>-module_init(ab8500_ponkey_init);</div><div class='del'>-</div><div class='del'>-static void __exit ab8500_ponkey_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ab8500_ponkey_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(ab8500_ponkey_exit);</div><div class='add'>+module_platform_driver(ab8500_ponkey_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> MODULE_AUTHOR("Sundar Iyer &lt;sundar.iyer@stericsson.com&gt;");</div><div class='head'>diff --git a/drivers/input/misc/adxl34x-spi.c b/drivers/input/misc/adxl34x-spi.c<br/>index f29de22fdda0..34d401efd4a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/adxl34x-spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/adxl34x-spi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/adxl34x-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/adxl34x-spi.c</a></div><div class='hunk'>@@ -122,7 +122,6 @@ static SIMPLE_DEV_PM_OPS(adxl34x_spi_pm, adxl34x_spi_suspend,</div><div class='ctx'> static struct spi_driver adxl34x_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "adxl34x",</div><div class='del'>-		.bus = &amp;spi_bus_type,</div><div class='ctx'> 		.owner = THIS_MODULE,</div><div class='ctx'> 		.pm = &amp;adxl34x_spi_pm,</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/input/misc/adxl34x.c b/drivers/input/misc/adxl34x.c<br/>index 09244804fb97..1cf72fe513e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/adxl34x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/adxl34x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/adxl34x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/adxl34x.c</a></div><div class='hunk'>@@ -452,10 +452,10 @@ static ssize_t adxl34x_disable_store(struct device *dev,</div><div class='ctx'> 				     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct adxl34x *ac = dev_get_drvdata(dev);</div><div class='del'>-	unsigned long val;</div><div class='add'>+	unsigned int val;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	error = kstrtouint(buf, 10, &amp;val);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -541,10 +541,10 @@ static ssize_t adxl34x_rate_store(struct device *dev,</div><div class='ctx'> 				  const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct adxl34x *ac = dev_get_drvdata(dev);</div><div class='del'>-	unsigned long val;</div><div class='add'>+	unsigned char val;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	error = kstrtou8(buf, 10, &amp;val);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -576,10 +576,10 @@ static ssize_t adxl34x_autosleep_store(struct device *dev,</div><div class='ctx'> 				  const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct adxl34x *ac = dev_get_drvdata(dev);</div><div class='del'>-	unsigned long val;</div><div class='add'>+	unsigned int val;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	error = kstrtouint(buf, 10, &amp;val);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -623,13 +623,13 @@ static ssize_t adxl34x_write_store(struct device *dev,</div><div class='ctx'> 				   const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct adxl34x *ac = dev_get_drvdata(dev);</div><div class='del'>-	unsigned long val;</div><div class='add'>+	unsigned int val;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This allows basic ADXL register write access for debug purposes.</div><div class='ctx'> 	 */</div><div class='del'>-	error = strict_strtoul(buf, 16, &amp;val);</div><div class='add'>+	error = kstrtouint(buf, 16, &amp;val);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/misc/ati_remote2.c b/drivers/input/misc/ati_remote2.c<br/>index 8d345e87075e..f63341f20b91 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/ati_remote2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/ati_remote2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/ati_remote2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/ati_remote2.c</a></div><div class='hunk'>@@ -42,13 +42,13 @@ static int ati_remote2_set_mask(const char *val,</div><div class='ctx'> 				const struct kernel_param *kp,</div><div class='ctx'> 				unsigned int max)</div><div class='ctx'> {</div><div class='del'>-	unsigned long mask;</div><div class='add'>+	unsigned int mask;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!val)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = strict_strtoul(val, 0, &amp;mask);</div><div class='add'>+	ret = kstrtouint(val, 0, &amp;mask);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -720,11 +720,12 @@ static ssize_t ati_remote2_store_channel_mask(struct device *dev,</div><div class='ctx'> 	struct usb_device *udev = to_usb_device(dev);</div><div class='ctx'> 	struct usb_interface *intf = usb_ifnum_to_if(udev, 0);</div><div class='ctx'> 	struct ati_remote2 *ar2 = usb_get_intfdata(intf);</div><div class='del'>-	unsigned long mask;</div><div class='add'>+	unsigned int mask;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 0, &amp;mask))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	r = kstrtouint(buf, 0, &amp;mask);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='ctx'> </div><div class='ctx'> 	if (mask &amp; ~ATI_REMOTE2_MAX_CHANNEL_MASK)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -769,10 +770,12 @@ static ssize_t ati_remote2_store_mode_mask(struct device *dev,</div><div class='ctx'> 	struct usb_device *udev = to_usb_device(dev);</div><div class='ctx'> 	struct usb_interface *intf = usb_ifnum_to_if(udev, 0);</div><div class='ctx'> 	struct ati_remote2 *ar2 = usb_get_intfdata(intf);</div><div class='del'>-	unsigned long mask;</div><div class='add'>+	unsigned int mask;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 0, &amp;mask))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	err = kstrtouint(buf, 0, &amp;mask);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (mask &amp; ~ATI_REMOTE2_MAX_MODE_MASK)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1010,23 +1013,4 @@ static int ati_remote2_post_reset(struct usb_interface *interface)</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init ati_remote2_init(void)</div><div class='del'>-{</div><div class='del'>-	int r;</div><div class='del'>-</div><div class='del'>-	r = usb_register(&amp;ati_remote2_driver);</div><div class='del'>-	if (r)</div><div class='del'>-		printk(KERN_ERR "ati_remote2: usb_register() = %d\n", r);</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_INFO "ati_remote2: " DRIVER_DESC " " DRIVER_VERSION "\n");</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ati_remote2_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;ati_remote2_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ati_remote2_init);</div><div class='del'>-module_exit(ati_remote2_exit);</div><div class='add'>+module_usb_driver(ati_remote2_driver);</div><div class='head'>diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c<br/>index d00edc9f39d1..1c4146fccfdf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/bfin_rotary.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/bfin_rotary.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/bfin_rotary.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/bfin_rotary.c</a></div><div class='hunk'>@@ -264,18 +264,7 @@ static struct platform_driver bfin_rotary_device_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init bfin_rotary_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;bfin_rotary_device_driver);</div><div class='del'>-}</div><div class='del'>-module_init(bfin_rotary_init);</div><div class='del'>-</div><div class='del'>-static void __exit bfin_rotary_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;bfin_rotary_device_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(bfin_rotary_exit);</div><div class='add'>+module_platform_driver(bfin_rotary_device_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Michael Hennerich &lt;hennerich@blackfin.uclinux.org&gt;");</div><div class='head'>diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c<br/>index fd8407a29631..53e43d295148 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/cobalt_btns.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/cobalt_btns.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/cobalt_btns.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/cobalt_btns.c</a></div><div class='hunk'>@@ -163,16 +163,4 @@ static struct platform_driver cobalt_buttons_driver = {</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init cobalt_buttons_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;cobalt_buttons_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cobalt_buttons_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;cobalt_buttons_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(cobalt_buttons_init);</div><div class='del'>-module_exit(cobalt_buttons_exit);</div><div class='add'>+module_platform_driver(cobalt_buttons_driver);</div><div class='head'>diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c<br/>index 7283dd2a1ad3..35083c6836c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/dm355evm_keys.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/dm355evm_keys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/dm355evm_keys.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/dm355evm_keys.c</a></div><div class='hunk'>@@ -267,17 +267,6 @@ static struct platform_driver dm355evm_keys_driver = {</div><div class='ctx'> 		.name	= "dm355evm_keys",</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init dm355evm_keys_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;dm355evm_keys_driver);</div><div class='del'>-}</div><div class='del'>-module_init(dm355evm_keys_init);</div><div class='del'>-</div><div class='del'>-static void __exit dm355evm_keys_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;dm355evm_keys_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(dm355evm_keys_exit);</div><div class='add'>+module_platform_driver(dm355evm_keys_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/input/misc/gp2ap002a00f.c b/drivers/input/misc/gp2ap002a00f.c<br/>new file mode 100644<br/>index 000000000000..71fba8c2fc66<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/gp2ap002a00f.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/gp2ap002a00f.c</a></div><div class='hunk'>@@ -0,0 +1,299 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2011 Sony Ericsson Mobile Communications Inc.</div><div class='add'>+ *</div><div class='add'>+ * Author: Courtney Cavin &lt;courtney.cavin@sonyericsson.com&gt;</div><div class='add'>+ * Prepared for up-stream by: Oskar Andero &lt;oskar.andero@sonyericsson.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 version 2, as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/input/gp2ap002a00f.h&gt;</div><div class='add'>+</div><div class='add'>+struct gp2a_data {</div><div class='add'>+	struct input_dev *input;</div><div class='add'>+	const struct gp2a_platform_data *pdata;</div><div class='add'>+	struct i2c_client *i2c_client;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum gp2a_addr {</div><div class='add'>+	GP2A_ADDR_PROX	= 0x0,</div><div class='add'>+	GP2A_ADDR_GAIN	= 0x1,</div><div class='add'>+	GP2A_ADDR_HYS	= 0x2,</div><div class='add'>+	GP2A_ADDR_CYCLE	= 0x3,</div><div class='add'>+	GP2A_ADDR_OPMOD	= 0x4,</div><div class='add'>+	GP2A_ADDR_CON	= 0x6</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum gp2a_controls {</div><div class='add'>+	/* Software Shutdown control: 0 = shutdown, 1 = normal operation */</div><div class='add'>+	GP2A_CTRL_SSD	= 0x01</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int gp2a_report(struct gp2a_data *dt)</div><div class='add'>+{</div><div class='add'>+	int vo = gpio_get_value(dt-&gt;pdata-&gt;vout_gpio);</div><div class='add'>+</div><div class='add'>+	input_report_switch(dt-&gt;input, SW_FRONT_PROXIMITY, !vo);</div><div class='add'>+	input_sync(dt-&gt;input);</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 gp2a_irq(int irq, void *handle)</div><div class='add'>+{</div><div class='add'>+	struct gp2a_data *dt = handle;</div><div class='add'>+</div><div class='add'>+	gp2a_report(dt);</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 gp2a_enable(struct gp2a_data *dt)</div><div class='add'>+{</div><div class='add'>+	return i2c_smbus_write_byte_data(dt-&gt;i2c_client, GP2A_ADDR_OPMOD,</div><div class='add'>+					 GP2A_CTRL_SSD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gp2a_disable(struct gp2a_data *dt)</div><div class='add'>+{</div><div class='add'>+	return i2c_smbus_write_byte_data(dt-&gt;i2c_client, GP2A_ADDR_OPMOD,</div><div class='add'>+					 0x00);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gp2a_device_open(struct input_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct gp2a_data *dt = input_get_drvdata(dev);</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = gp2a_enable(dt);</div><div class='add'>+	if (error &lt; 0) {</div><div class='add'>+		dev_err(&amp;dt-&gt;i2c_client-&gt;dev,</div><div class='add'>+			"unable to activate, err %d\n", error);</div><div class='add'>+		return error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gp2a_report(dt);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gp2a_device_close(struct input_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct gp2a_data *dt = input_get_drvdata(dev);</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = gp2a_disable(dt);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		dev_err(&amp;dt-&gt;i2c_client-&gt;dev,</div><div class='add'>+			"unable to deactivate, err %d\n", error);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit gp2a_initialize(struct gp2a_data *dt)</div><div class='add'>+{</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = i2c_smbus_write_byte_data(dt-&gt;i2c_client, GP2A_ADDR_GAIN,</div><div class='add'>+					  0x08);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	error = i2c_smbus_write_byte_data(dt-&gt;i2c_client, GP2A_ADDR_HYS,</div><div class='add'>+					  0xc2);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	error = i2c_smbus_write_byte_data(dt-&gt;i2c_client, GP2A_ADDR_CYCLE,</div><div class='add'>+					  0x04);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	error = gp2a_disable(dt);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit gp2a_probe(struct i2c_client *client,</div><div class='add'>+				const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	const struct gp2a_platform_data *pdata = client-&gt;dev.platform_data;</div><div class='add'>+	struct gp2a_data *dt;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	if (!pdata)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;hw_setup) {</div><div class='add'>+		error = pdata-&gt;hw_setup(client);</div><div class='add'>+		if (error &lt; 0)</div><div class='add'>+			return error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	error = gpio_request_one(pdata-&gt;vout_gpio, GPIOF_IN, GP2A_I2C_NAME);</div><div class='add'>+	if (error)</div><div class='add'>+		goto err_hw_shutdown;</div><div class='add'>+</div><div class='add'>+	dt = kzalloc(sizeof(struct gp2a_data), GFP_KERNEL);</div><div class='add'>+	if (!dt) {</div><div class='add'>+		error = -ENOMEM;</div><div class='add'>+		goto err_free_gpio;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dt-&gt;pdata = pdata;</div><div class='add'>+	dt-&gt;i2c_client = client;</div><div class='add'>+</div><div class='add'>+	error = gp2a_initialize(dt);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		goto err_free_mem;</div><div class='add'>+</div><div class='add'>+	dt-&gt;input = input_allocate_device();</div><div class='add'>+	if (!dt-&gt;input) {</div><div class='add'>+		error = -ENOMEM;</div><div class='add'>+		goto err_free_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_set_drvdata(dt-&gt;input, dt);</div><div class='add'>+</div><div class='add'>+	dt-&gt;input-&gt;open = gp2a_device_open;</div><div class='add'>+	dt-&gt;input-&gt;close = gp2a_device_close;</div><div class='add'>+	dt-&gt;input-&gt;name = GP2A_I2C_NAME;</div><div class='add'>+	dt-&gt;input-&gt;id.bustype = BUS_I2C;</div><div class='add'>+	dt-&gt;input-&gt;dev.parent = &amp;client-&gt;dev;</div><div class='add'>+</div><div class='add'>+	input_set_capability(dt-&gt;input, EV_SW, SW_FRONT_PROXIMITY);</div><div class='add'>+</div><div class='add'>+	error = request_threaded_irq(client-&gt;irq, NULL, gp2a_irq,</div><div class='add'>+			IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |</div><div class='add'>+				IRQF_ONESHOT,</div><div class='add'>+			GP2A_I2C_NAME, dt);</div><div class='add'>+	if (error) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "irq request failed\n");</div><div class='add'>+		goto err_free_input_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	error = input_register_device(dt-&gt;input);</div><div class='add'>+	if (error) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "device registration failed\n");</div><div class='add'>+		goto err_free_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device_init_wakeup(&amp;client-&gt;dev, pdata-&gt;wakeup);</div><div class='add'>+	i2c_set_clientdata(client, dt);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_irq:</div><div class='add'>+	free_irq(client-&gt;irq, dt);</div><div class='add'>+err_free_input_dev:</div><div class='add'>+	input_free_device(dt-&gt;input);</div><div class='add'>+err_free_mem:</div><div class='add'>+	kfree(dt);</div><div class='add'>+err_free_gpio:</div><div class='add'>+	gpio_free(pdata-&gt;vout_gpio);</div><div class='add'>+err_hw_shutdown:</div><div class='add'>+	if (pdata-&gt;hw_shutdown)</div><div class='add'>+		pdata-&gt;hw_shutdown(client);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit gp2a_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct gp2a_data *dt = i2c_get_clientdata(client);</div><div class='add'>+	const struct gp2a_platform_data *pdata = dt-&gt;pdata;</div><div class='add'>+</div><div class='add'>+	device_init_wakeup(&amp;client-&gt;dev, false);</div><div class='add'>+</div><div class='add'>+	free_irq(client-&gt;irq, dt);</div><div class='add'>+</div><div class='add'>+	input_unregister_device(dt-&gt;input);</div><div class='add'>+	kfree(dt);</div><div class='add'>+</div><div class='add'>+	gpio_free(pdata-&gt;vout_gpio);</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;hw_shutdown)</div><div class='add'>+		pdata-&gt;hw_shutdown(client);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int gp2a_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct gp2a_data *dt = i2c_get_clientdata(client);</div><div class='add'>+	int retval = 0;</div><div class='add'>+</div><div class='add'>+	if (device_may_wakeup(&amp;client-&gt;dev)) {</div><div class='add'>+		enable_irq_wake(client-&gt;irq);</div><div class='add'>+	} else {</div><div class='add'>+		mutex_lock(&amp;dt-&gt;input-&gt;mutex);</div><div class='add'>+		if (dt-&gt;input-&gt;users)</div><div class='add'>+			retval = gp2a_disable(dt);</div><div class='add'>+		mutex_unlock(&amp;dt-&gt;input-&gt;mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gp2a_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct gp2a_data *dt = i2c_get_clientdata(client);</div><div class='add'>+	int retval = 0;</div><div class='add'>+</div><div class='add'>+	if (device_may_wakeup(&amp;client-&gt;dev)) {</div><div class='add'>+		disable_irq_wake(client-&gt;irq);</div><div class='add'>+	} else {</div><div class='add'>+		mutex_lock(&amp;dt-&gt;input-&gt;mutex);</div><div class='add'>+		if (dt-&gt;input-&gt;users)</div><div class='add'>+			retval = gp2a_enable(dt);</div><div class='add'>+		mutex_unlock(&amp;dt-&gt;input-&gt;mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(gp2a_pm, gp2a_suspend, gp2a_resume);</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id gp2a_i2c_id[] = {</div><div class='add'>+	{ GP2A_I2C_NAME, 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_driver gp2a_i2c_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= GP2A_I2C_NAME,</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+		.pm	= &amp;gp2a_pm,</div><div class='add'>+	},</div><div class='add'>+	.probe		= gp2a_probe,</div><div class='add'>+	.remove		= __devexit_p(gp2a_remove),</div><div class='add'>+	.id_table	= gp2a_i2c_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init gp2a_init(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;gp2a_i2c_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit gp2a_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;gp2a_i2c_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(gp2a_init);</div><div class='add'>+module_exit(gp2a_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Courtney Cavin &lt;courtney.cavin@sonyericsson.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Sharp GP2AP002A00F I2C Proximity/Opto sensor driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/input/misc/gpio_tilt_polled.c b/drivers/input/misc/gpio_tilt_polled.c<br/>new file mode 100644<br/>index 000000000000..277a0574c199<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/gpio_tilt_polled.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/gpio_tilt_polled.c</a></div><div class='hunk'>@@ -0,0 +1,213 @@</div><div class='add'>+/*</div><div class='add'>+ *  Driver for tilt switches connected via GPIO lines</div><div class='add'>+ *  not capable of generating interrupts</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2011 Heiko Stuebner &lt;heiko@sntech.de&gt;</div><div class='add'>+ *</div><div class='add'>+ *  based on: drivers/input/keyboard/gpio_keys_polled.c</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2007-2010 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='add'>+ *  Copyright (C) 2010 Nuno Goncalves &lt;nunojpg@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 version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/input-polldev.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/input/gpio_tilt.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRV_NAME	"gpio-tilt-polled"</div><div class='add'>+</div><div class='add'>+struct gpio_tilt_polled_dev {</div><div class='add'>+	struct input_polled_dev *poll_dev;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	const struct gpio_tilt_platform_data *pdata;</div><div class='add'>+</div><div class='add'>+	int last_state;</div><div class='add'>+</div><div class='add'>+	int threshold;</div><div class='add'>+	int count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void gpio_tilt_polled_poll(struct input_polled_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct gpio_tilt_polled_dev *tdev = dev-&gt;private;</div><div class='add'>+	const struct gpio_tilt_platform_data *pdata = tdev-&gt;pdata;</div><div class='add'>+	struct input_dev *input = dev-&gt;input;</div><div class='add'>+	struct gpio_tilt_state *tilt_state = NULL;</div><div class='add'>+	int state, i;</div><div class='add'>+</div><div class='add'>+	if (tdev-&gt;count &lt; tdev-&gt;threshold) {</div><div class='add'>+		tdev-&gt;count++;</div><div class='add'>+	} else {</div><div class='add'>+		state = 0;</div><div class='add'>+		for (i = 0; i &lt; pdata-&gt;nr_gpios; i++)</div><div class='add'>+			state |= (!!gpio_get_value(pdata-&gt;gpios[i].gpio) &lt;&lt; i);</div><div class='add'>+</div><div class='add'>+		if (state != tdev-&gt;last_state) {</div><div class='add'>+			for (i = 0; i &lt; pdata-&gt;nr_states; i++)</div><div class='add'>+				if (pdata-&gt;states[i].gpios == state)</div><div class='add'>+					tilt_state = &amp;pdata-&gt;states[i];</div><div class='add'>+</div><div class='add'>+			if (tilt_state) {</div><div class='add'>+				for (i = 0; i &lt; pdata-&gt;nr_axes; i++)</div><div class='add'>+					input_report_abs(input,</div><div class='add'>+							 pdata-&gt;axes[i].axis,</div><div class='add'>+							 tilt_state-&gt;axes[i]);</div><div class='add'>+</div><div class='add'>+				input_sync(input);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			tdev-&gt;count = 0;</div><div class='add'>+			tdev-&gt;last_state = state;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gpio_tilt_polled_open(struct input_polled_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct gpio_tilt_polled_dev *tdev = dev-&gt;private;</div><div class='add'>+	const struct gpio_tilt_platform_data *pdata = tdev-&gt;pdata;</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;enable)</div><div class='add'>+		pdata-&gt;enable(tdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/* report initial state of the axes */</div><div class='add'>+	tdev-&gt;last_state = -1;</div><div class='add'>+	tdev-&gt;count = tdev-&gt;threshold;</div><div class='add'>+	gpio_tilt_polled_poll(tdev-&gt;poll_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gpio_tilt_polled_close(struct input_polled_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct gpio_tilt_polled_dev *tdev = dev-&gt;private;</div><div class='add'>+	const struct gpio_tilt_platform_data *pdata = tdev-&gt;pdata;</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;disable)</div><div class='add'>+		pdata-&gt;disable(tdev-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit gpio_tilt_polled_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	const struct gpio_tilt_platform_data *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct gpio_tilt_polled_dev *tdev;</div><div class='add'>+	struct input_polled_dev *poll_dev;</div><div class='add'>+	struct input_dev *input;</div><div class='add'>+	int error, i;</div><div class='add'>+</div><div class='add'>+	if (!pdata || !pdata-&gt;poll_interval)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	tdev = kzalloc(sizeof(struct gpio_tilt_polled_dev), GFP_KERNEL);</div><div class='add'>+	if (!tdev) {</div><div class='add'>+		dev_err(dev, "no memory for private data\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	error = gpio_request_array(pdata-&gt;gpios, pdata-&gt;nr_gpios);</div><div class='add'>+	if (error) {</div><div class='add'>+		dev_err(dev,</div><div class='add'>+			"Could not request tilt GPIOs: %d\n", error);</div><div class='add'>+		goto err_free_tdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	poll_dev = input_allocate_polled_device();</div><div class='add'>+	if (!poll_dev) {</div><div class='add'>+		dev_err(dev, "no memory for polled device\n");</div><div class='add'>+		error = -ENOMEM;</div><div class='add'>+		goto err_free_gpios;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	poll_dev-&gt;private = tdev;</div><div class='add'>+	poll_dev-&gt;poll = gpio_tilt_polled_poll;</div><div class='add'>+	poll_dev-&gt;poll_interval = pdata-&gt;poll_interval;</div><div class='add'>+	poll_dev-&gt;open = gpio_tilt_polled_open;</div><div class='add'>+	poll_dev-&gt;close = gpio_tilt_polled_close;</div><div class='add'>+</div><div class='add'>+	input = poll_dev-&gt;input;</div><div class='add'>+</div><div class='add'>+	input-&gt;name = pdev-&gt;name;</div><div class='add'>+	input-&gt;phys = DRV_NAME"/input0";</div><div class='add'>+	input-&gt;dev.parent = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	input-&gt;id.bustype = BUS_HOST;</div><div class='add'>+	input-&gt;id.vendor = 0x0001;</div><div class='add'>+	input-&gt;id.product = 0x0001;</div><div class='add'>+	input-&gt;id.version = 0x0100;</div><div class='add'>+</div><div class='add'>+	__set_bit(EV_ABS, input-&gt;evbit);</div><div class='add'>+	for (i = 0; i &lt; pdata-&gt;nr_axes; i++)</div><div class='add'>+		input_set_abs_params(input, pdata-&gt;axes[i].axis,</div><div class='add'>+				     pdata-&gt;axes[i].min, pdata-&gt;axes[i].max,</div><div class='add'>+				     pdata-&gt;axes[i].fuzz, pdata-&gt;axes[i].flat);</div><div class='add'>+</div><div class='add'>+	tdev-&gt;threshold = DIV_ROUND_UP(pdata-&gt;debounce_interval,</div><div class='add'>+				       pdata-&gt;poll_interval);</div><div class='add'>+</div><div class='add'>+	tdev-&gt;poll_dev = poll_dev;</div><div class='add'>+	tdev-&gt;dev = dev;</div><div class='add'>+	tdev-&gt;pdata = pdata;</div><div class='add'>+</div><div class='add'>+	error = input_register_polled_device(poll_dev);</div><div class='add'>+	if (error) {</div><div class='add'>+		dev_err(dev, "unable to register polled device, err=%d\n",</div><div class='add'>+			error);</div><div class='add'>+		goto err_free_polldev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, tdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_polldev:</div><div class='add'>+	input_free_polled_device(poll_dev);</div><div class='add'>+err_free_gpios:</div><div class='add'>+	gpio_free_array(pdata-&gt;gpios, pdata-&gt;nr_gpios);</div><div class='add'>+err_free_tdev:</div><div class='add'>+	kfree(tdev);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit gpio_tilt_polled_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct gpio_tilt_polled_dev *tdev = platform_get_drvdata(pdev);</div><div class='add'>+	const struct gpio_tilt_platform_data *pdata = tdev-&gt;pdata;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	input_unregister_polled_device(tdev-&gt;poll_dev);</div><div class='add'>+	input_free_polled_device(tdev-&gt;poll_dev);</div><div class='add'>+</div><div class='add'>+	gpio_free_array(pdata-&gt;gpios, pdata-&gt;nr_gpios);</div><div class='add'>+</div><div class='add'>+	kfree(tdev);</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 gpio_tilt_polled_driver = {</div><div class='add'>+	.probe	= gpio_tilt_polled_probe,</div><div class='add'>+	.remove	= __devexit_p(gpio_tilt_polled_remove),</div><div class='add'>+	.driver	= {</div><div class='add'>+		.name	= DRV_NAME,</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(gpio_tilt_polled_driver);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_AUTHOR("Heiko Stuebner &lt;heiko@sntech.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Polled GPIO tilt driver");</div><div class='add'>+MODULE_ALIAS("platform:" DRV_NAME);</div><div class='head'>diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c<br/>index 302ab46ce752..50e283068301 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/ixp4xx-beeper.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/ixp4xx-beeper.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/ixp4xx-beeper.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/ixp4xx-beeper.c</a></div><div class='hunk'>@@ -168,16 +168,5 @@ static struct platform_driver ixp4xx_spkr_platform_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(ixp4xx_spkr_remove),</div><div class='ctx'> 	.shutdown	= ixp4xx_spkr_shutdown,</div><div class='ctx'> };</div><div class='add'>+module_platform_driver(ixp4xx_spkr_platform_driver);</div><div class='ctx'> </div><div class='del'>-static int __init ixp4xx_spkr_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ixp4xx_spkr_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ixp4xx_spkr_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ixp4xx_spkr_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ixp4xx_spkr_init);</div><div class='del'>-module_exit(ixp4xx_spkr_exit);</div><div class='head'>diff --git a/drivers/input/misc/keyspan_remote.c b/drivers/input/misc/keyspan_remote.c<br/>index fc62256c963f..d99151a8bf10 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/keyspan_remote.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/keyspan_remote.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/keyspan_remote.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/keyspan_remote.c</a></div><div class='hunk'>@@ -580,26 +580,7 @@ static struct usb_driver keyspan_driver =</div><div class='ctx'> 	.id_table =	keyspan_table</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init usb_keyspan_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	/* register this driver with the USB subsystem */</div><div class='del'>-	result = usb_register(&amp;keyspan_driver);</div><div class='del'>-	if (result)</div><div class='del'>-		err("usb_register failed. Error number %d\n", result);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit usb_keyspan_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver with the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;keyspan_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(usb_keyspan_init);</div><div class='del'>-module_exit(usb_keyspan_exit);</div><div class='add'>+module_usb_driver(keyspan_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(usb, keyspan_table);</div><div class='ctx'> MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='head'>diff --git a/drivers/input/misc/max8925_onkey.c b/drivers/input/misc/max8925_onkey.c<br/>index 7de0ded4ccc3..23cf08271049 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/max8925_onkey.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/max8925_onkey.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/max8925_onkey.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/max8925_onkey.c</a></div><div class='hunk'>@@ -166,18 +166,7 @@ static struct platform_driver max8925_onkey_driver = {</div><div class='ctx'> 	.probe		= max8925_onkey_probe,</div><div class='ctx'> 	.remove		= __devexit_p(max8925_onkey_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init max8925_onkey_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;max8925_onkey_driver);</div><div class='del'>-}</div><div class='del'>-module_init(max8925_onkey_init);</div><div class='del'>-</div><div class='del'>-static void __exit max8925_onkey_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;max8925_onkey_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(max8925_onkey_exit);</div><div class='add'>+module_platform_driver(max8925_onkey_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Maxim MAX8925 ONKEY driver");</div><div class='ctx'> MODULE_AUTHOR("Haojian Zhuang &lt;haojian.zhuang@marvell.com&gt;");</div><div class='head'>diff --git a/drivers/input/misc/mc13783-pwrbutton.c b/drivers/input/misc/mc13783-pwrbutton.c<br/>index 09b052288657..8428f1e8e83e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/mc13783-pwrbutton.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/mc13783-pwrbutton.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/mc13783-pwrbutton.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/mc13783-pwrbutton.c</a></div><div class='hunk'>@@ -255,7 +255,7 @@ static int __devexit mc13783_pwrbutton_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct platform_driver mc13783_pwrbutton_driver = {</div><div class='add'>+static struct platform_driver mc13783_pwrbutton_driver = {</div><div class='ctx'> 	.probe		= mc13783_pwrbutton_probe,</div><div class='ctx'> 	.remove		= __devexit_p(mc13783_pwrbutton_remove),</div><div class='ctx'> 	.driver		= {</div><div class='hunk'>@@ -264,17 +264,7 @@ struct platform_driver mc13783_pwrbutton_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init mc13783_pwrbutton_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;mc13783_pwrbutton_driver);</div><div class='del'>-}</div><div class='del'>-module_init(mc13783_pwrbutton_init);</div><div class='del'>-</div><div class='del'>-static void __exit mc13783_pwrbutton_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;mc13783_pwrbutton_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(mc13783_pwrbutton_exit);</div><div class='add'>+module_platform_driver(mc13783_pwrbutton_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_ALIAS("platform:mc13783-pwrbutton");</div><div class='ctx'> MODULE_DESCRIPTION("MC13783 Power Button");</div><div class='head'>diff --git a/drivers/input/misc/mpu3050.c b/drivers/input/misc/mpu3050.c<br/>index f71dc728da58..208d1a1cc7f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/mpu3050.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/mpu3050.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/mpu3050.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/mpu3050.c</a></div><div class='hunk'>@@ -41,18 +41,67 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> </div><div class='del'>-#define MPU3050_CHIP_ID_REG	0x00</div><div class='ctx'> #define MPU3050_CHIP_ID		0x69</div><div class='del'>-#define MPU3050_XOUT_H		0x1D</div><div class='del'>-#define MPU3050_PWR_MGM		0x3E</div><div class='del'>-#define MPU3050_PWR_MGM_POS	6</div><div class='del'>-#define MPU3050_PWR_MGM_MASK	0x40</div><div class='ctx'> </div><div class='ctx'> #define MPU3050_AUTO_DELAY	1000</div><div class='ctx'> </div><div class='ctx'> #define MPU3050_MIN_VALUE	-32768</div><div class='ctx'> #define MPU3050_MAX_VALUE	32767</div><div class='ctx'> </div><div class='add'>+#define MPU3050_DEFAULT_POLL_INTERVAL	200</div><div class='add'>+#define MPU3050_DEFAULT_FS_RANGE	3</div><div class='add'>+</div><div class='add'>+/* Register map */</div><div class='add'>+#define MPU3050_CHIP_ID_REG	0x00</div><div class='add'>+#define MPU3050_SMPLRT_DIV	0x15</div><div class='add'>+#define MPU3050_DLPF_FS_SYNC	0x16</div><div class='add'>+#define MPU3050_INT_CFG		0x17</div><div class='add'>+#define MPU3050_XOUT_H		0x1D</div><div class='add'>+#define MPU3050_PWR_MGM		0x3E</div><div class='add'>+#define MPU3050_PWR_MGM_POS	6</div><div class='add'>+</div><div class='add'>+/* Register bits */</div><div class='add'>+</div><div class='add'>+/* DLPF_FS_SYNC */</div><div class='add'>+#define MPU3050_EXT_SYNC_NONE		0x00</div><div class='add'>+#define MPU3050_EXT_SYNC_TEMP		0x20</div><div class='add'>+#define MPU3050_EXT_SYNC_GYROX		0x40</div><div class='add'>+#define MPU3050_EXT_SYNC_GYROY		0x60</div><div class='add'>+#define MPU3050_EXT_SYNC_GYROZ		0x80</div><div class='add'>+#define MPU3050_EXT_SYNC_ACCELX	0xA0</div><div class='add'>+#define MPU3050_EXT_SYNC_ACCELY	0xC0</div><div class='add'>+#define MPU3050_EXT_SYNC_ACCELZ	0xE0</div><div class='add'>+#define MPU3050_EXT_SYNC_MASK		0xE0</div><div class='add'>+#define MPU3050_FS_250DPS		0x00</div><div class='add'>+#define MPU3050_FS_500DPS		0x08</div><div class='add'>+#define MPU3050_FS_1000DPS		0x10</div><div class='add'>+#define MPU3050_FS_2000DPS		0x18</div><div class='add'>+#define MPU3050_FS_MASK		0x18</div><div class='add'>+#define MPU3050_DLPF_CFG_256HZ_NOLPF2	0x00</div><div class='add'>+#define MPU3050_DLPF_CFG_188HZ		0x01</div><div class='add'>+#define MPU3050_DLPF_CFG_98HZ		0x02</div><div class='add'>+#define MPU3050_DLPF_CFG_42HZ		0x03</div><div class='add'>+#define MPU3050_DLPF_CFG_20HZ		0x04</div><div class='add'>+#define MPU3050_DLPF_CFG_10HZ		0x05</div><div class='add'>+#define MPU3050_DLPF_CFG_5HZ		0x06</div><div class='add'>+#define MPU3050_DLPF_CFG_2100HZ_NOLPF	0x07</div><div class='add'>+#define MPU3050_DLPF_CFG_MASK		0x07</div><div class='add'>+/* INT_CFG */</div><div class='add'>+#define MPU3050_RAW_RDY_EN		0x01</div><div class='add'>+#define MPU3050_MPU_RDY_EN		0x02</div><div class='add'>+#define MPU3050_LATCH_INT_EN		0x04</div><div class='add'>+/* PWR_MGM */</div><div class='add'>+#define MPU3050_PWR_MGM_PLL_X		0x01</div><div class='add'>+#define MPU3050_PWR_MGM_PLL_Y		0x02</div><div class='add'>+#define MPU3050_PWR_MGM_PLL_Z		0x03</div><div class='add'>+#define MPU3050_PWR_MGM_CLKSEL		0x07</div><div class='add'>+#define MPU3050_PWR_MGM_STBY_ZG	0x08</div><div class='add'>+#define MPU3050_PWR_MGM_STBY_YG	0x10</div><div class='add'>+#define MPU3050_PWR_MGM_STBY_XG	0x20</div><div class='add'>+#define MPU3050_PWR_MGM_SLEEP		0x40</div><div class='add'>+#define MPU3050_PWR_MGM_RESET		0x80</div><div class='add'>+#define MPU3050_PWR_MGM_MASK		0x40</div><div class='add'>+</div><div class='ctx'> struct axis_data {</div><div class='ctx'> 	s16 x;</div><div class='ctx'> 	s16 y;</div><div class='hunk'>@@ -148,9 +197,20 @@ static void mpu3050_set_power_mode(struct i2c_client *client, u8 val)</div><div class='ctx'> static int mpu3050_input_open(struct input_dev *input)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpu3050_sensor *sensor = input_get_drvdata(input);</div><div class='add'>+	int error;</div><div class='ctx'> </div><div class='ctx'> 	pm_runtime_get(sensor-&gt;dev);</div><div class='ctx'> </div><div class='add'>+	/* Enable interrupts */</div><div class='add'>+	error = i2c_smbus_write_byte_data(sensor-&gt;client, MPU3050_INT_CFG,</div><div class='add'>+					  MPU3050_LATCH_INT_EN |</div><div class='add'>+					  MPU3050_RAW_RDY_EN |</div><div class='add'>+					  MPU3050_MPU_RDY_EN);</div><div class='add'>+	if (error &lt; 0) {</div><div class='add'>+		pm_runtime_put(sensor-&gt;dev);</div><div class='add'>+		return error;</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'>@@ -192,6 +252,51 @@ static irqreturn_t mpu3050_interrupt_thread(int irq, void *data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *	mpu3050_hw_init	-	initialize hardware</div><div class='add'>+ *	@sensor: the sensor</div><div class='add'>+ *</div><div class='add'>+ *	Called during device probe; configures the sampling method.</div><div class='add'>+ */</div><div class='add'>+static int __devinit mpu3050_hw_init(struct mpu3050_sensor *sensor)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = sensor-&gt;client;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 reg;</div><div class='add'>+</div><div class='add'>+	/* Reset */</div><div class='add'>+	ret = i2c_smbus_write_byte_data(client, MPU3050_PWR_MGM,</div><div class='add'>+					MPU3050_PWR_MGM_RESET);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = i2c_smbus_read_byte_data(client, MPU3050_PWR_MGM);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret &amp;= ~MPU3050_PWR_MGM_CLKSEL;</div><div class='add'>+	ret |= MPU3050_PWR_MGM_PLL_Z;</div><div class='add'>+	ret = i2c_smbus_write_byte_data(client, MPU3050_PWR_MGM, ret);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Output frequency divider. The poll interval */</div><div class='add'>+	ret = i2c_smbus_write_byte_data(client, MPU3050_SMPLRT_DIV,</div><div class='add'>+					MPU3050_DEFAULT_POLL_INTERVAL - 1);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Set low pass filter and full scale */</div><div class='add'>+	reg = MPU3050_DEFAULT_FS_RANGE;</div><div class='add'>+	reg |= MPU3050_DLPF_CFG_42HZ &lt;&lt; 3;</div><div class='add'>+	reg |= MPU3050_EXT_SYNC_NONE &lt;&lt; 5;</div><div class='add'>+	ret = i2c_smbus_write_byte_data(client, MPU3050_DLPF_FS_SYNC, reg);</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'>+/**</div><div class='ctx'>  *	mpu3050_probe	-	device detection callback</div><div class='ctx'>  *	@client: i2c client of found device</div><div class='ctx'>  *	@id: id match information</div><div class='hunk'>@@ -256,10 +361,14 @@ static int __devinit mpu3050_probe(struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 	pm_runtime_set_active(&amp;client-&gt;dev);</div><div class='ctx'> </div><div class='add'>+	error = mpu3050_hw_init(sensor);</div><div class='add'>+	if (error)</div><div class='add'>+		goto err_pm_set_suspended;</div><div class='add'>+</div><div class='ctx'> 	error = request_threaded_irq(client-&gt;irq,</div><div class='ctx'> 				     NULL, mpu3050_interrupt_thread,</div><div class='ctx'> 				     IRQF_TRIGGER_RISING,</div><div class='del'>-				     "mpu_int", sensor);</div><div class='add'>+				     "mpu3050", sensor);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		dev_err(&amp;client-&gt;dev,</div><div class='ctx'> 			"can't get IRQ %d, error %d\n", client-&gt;irq, error);</div><div class='hunk'>@@ -348,11 +457,18 @@ static const struct i2c_device_id mpu3050_ids[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, mpu3050_ids);</div><div class='ctx'> </div><div class='add'>+static const struct of_device_id mpu3050_of_match[] = {</div><div class='add'>+	{ .compatible = "invn,mpu3050", },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, mpu3050_of_match);</div><div class='add'>+</div><div class='ctx'> static struct i2c_driver mpu3050_i2c_driver = {</div><div class='ctx'> 	.driver	= {</div><div class='ctx'> 		.name	= "mpu3050",</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 		.pm	= &amp;mpu3050_pm,</div><div class='add'>+		.of_match_table = mpu3050_of_match,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= mpu3050_probe,</div><div class='ctx'> 	.remove		= __devexit_p(mpu3050_remove),</div><div class='head'>diff --git a/drivers/input/misc/pcap_keys.c b/drivers/input/misc/pcap_keys.c<br/>index 99335c286250..e09b4fe81913 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/pcap_keys.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/pcap_keys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/pcap_keys.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/pcap_keys.c</a></div><div class='hunk'>@@ -125,19 +125,7 @@ static struct platform_driver pcap_keys_device_driver = {</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init pcap_keys_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pcap_keys_device_driver);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __exit pcap_keys_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pcap_keys_device_driver);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-module_init(pcap_keys_init);</div><div class='del'>-module_exit(pcap_keys_exit);</div><div class='add'>+module_platform_driver(pcap_keys_device_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Motorola PCAP2 input events driver");</div><div class='ctx'> MODULE_AUTHOR("Ilya Petrov &lt;ilya.muromec@gmail.com&gt;");</div><div class='head'>diff --git a/drivers/input/misc/pcf50633-input.c b/drivers/input/misc/pcf50633-input.c<br/>index 95562735728d..53891de80b0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/pcf50633-input.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/pcf50633-input.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/pcf50633-input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/pcf50633-input.c</a></div><div class='hunk'>@@ -113,18 +113,7 @@ static struct platform_driver pcf50633_input_driver = {</div><div class='ctx'> 	.probe = pcf50633_input_probe,</div><div class='ctx'> 	.remove = __devexit_p(pcf50633_input_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init pcf50633_input_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pcf50633_input_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pcf50633_input_init);</div><div class='del'>-</div><div class='del'>-static void __exit pcf50633_input_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pcf50633_input_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(pcf50633_input_exit);</div><div class='add'>+module_platform_driver(pcf50633_input_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Balaji Rao &lt;balajirrao@openmoko.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("PCF50633 input driver");</div><div class='head'>diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c<br/>index 34f4d2e0f50f..b2484aa07f32 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/pcspkr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/pcspkr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/pcspkr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/pcspkr.c</a></div><div class='hunk'>@@ -134,17 +134,5 @@ static struct platform_driver pcspkr_platform_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(pcspkr_remove),</div><div class='ctx'> 	.shutdown	= pcspkr_shutdown,</div><div class='ctx'> };</div><div class='add'>+module_platform_driver(pcspkr_platform_driver);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init pcspkr_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pcspkr_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit pcspkr_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pcspkr_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(pcspkr_init);</div><div class='del'>-module_exit(pcspkr_exit);</div><div class='head'>diff --git a/drivers/input/misc/pm8xxx-vibrator.c b/drivers/input/misc/pm8xxx-vibrator.c<br/>index 43192930824b..dfbfb463ea5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/pm8xxx-vibrator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/pm8xxx-vibrator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/pm8xxx-vibrator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/pm8xxx-vibrator.c</a></div><div class='hunk'>@@ -277,18 +277,7 @@ static struct platform_driver pm8xxx_vib_driver = {</div><div class='ctx'> 		.pm	= &amp;pm8xxx_vib_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init pm8xxx_vib_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pm8xxx_vib_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pm8xxx_vib_init);</div><div class='del'>-</div><div class='del'>-static void __exit pm8xxx_vib_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pm8xxx_vib_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(pm8xxx_vib_exit);</div><div class='add'>+module_platform_driver(pm8xxx_vib_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_ALIAS("platform:pm8xxx_vib");</div><div class='ctx'> MODULE_DESCRIPTION("PMIC8xxx vibrator driver based on ff-memless framework");</div><div class='head'>diff --git a/drivers/input/misc/pmic8xxx-pwrkey.c b/drivers/input/misc/pmic8xxx-pwrkey.c<br/>index b3cfb9c71e66..0f83d0f1d015 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/pmic8xxx-pwrkey.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/pmic8xxx-pwrkey.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/pmic8xxx-pwrkey.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/pmic8xxx-pwrkey.c</a></div><div class='hunk'>@@ -213,18 +213,7 @@ static struct platform_driver pmic8xxx_pwrkey_driver = {</div><div class='ctx'> 		.pm	= &amp;pm8xxx_pwr_key_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init pmic8xxx_pwrkey_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pmic8xxx_pwrkey_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pmic8xxx_pwrkey_init);</div><div class='del'>-</div><div class='del'>-static void __exit pmic8xxx_pwrkey_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pmic8xxx_pwrkey_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(pmic8xxx_pwrkey_exit);</div><div class='add'>+module_platform_driver(pmic8xxx_pwrkey_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_ALIAS("platform:pmic8xxx_pwrkey");</div><div class='ctx'> MODULE_DESCRIPTION("PMIC8XXX Power Key driver");</div><div class='head'>diff --git a/drivers/input/misc/powermate.c b/drivers/input/misc/powermate.c<br/>index f45947190e4f..538f7049ec64 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/powermate.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/powermate.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/powermate.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/powermate.c</a></div><div class='hunk'>@@ -441,18 +441,7 @@ static struct usb_driver powermate_driver = {</div><div class='ctx'>         .id_table =     powermate_devices,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init powermate_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;powermate_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit powermate_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;powermate_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(powermate_init);</div><div class='del'>-module_exit(powermate_cleanup);</div><div class='add'>+module_usb_driver(powermate_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR( "William R Sowerbutts" );</div><div class='ctx'> MODULE_DESCRIPTION( "Griffin Technology, Inc PowerMate driver" );</div><div class='head'>diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c<br/>index 57c294f07198..fc84c8a51147 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/pwm-beeper.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/pwm-beeper.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/pwm-beeper.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/pwm-beeper.c</a></div><div class='hunk'>@@ -180,18 +180,7 @@ static struct platform_driver pwm_beeper_driver = {</div><div class='ctx'> 		.pm	= PWM_BEEPER_PM_OPS,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init pwm_beeper_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pwm_beeper_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pwm_beeper_init);</div><div class='del'>-</div><div class='del'>-static void __exit pwm_beeper_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pwm_beeper_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(pwm_beeper_exit);</div><div class='add'>+module_platform_driver(pwm_beeper_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Lars-Peter Clausen &lt;lars@metafoo.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("PWM beeper driver");</div><div class='head'>diff --git a/drivers/input/misc/rb532_button.c b/drivers/input/misc/rb532_button.c<br/>index e2c7f622a0b5..aeb02bcf7233 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/rb532_button.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/rb532_button.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/rb532_button.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/rb532_button.c</a></div><div class='hunk'>@@ -100,19 +100,7 @@ static struct platform_driver rb532_button_driver = {</div><div class='ctx'> 		.owner = THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init rb532_button_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;rb532_button_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit rb532_button_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;rb532_button_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(rb532_button_init);</div><div class='del'>-module_exit(rb532_button_exit);</div><div class='add'>+module_platform_driver(rb532_button_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Phil Sutter &lt;n0-1@freewrt.org&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c<br/>index 2be21694fac1..f07f784198b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/rotary_encoder.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/rotary_encoder.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/rotary_encoder.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/rotary_encoder.c</a></div><div class='hunk'>@@ -284,19 +284,7 @@ static struct platform_driver rotary_encoder_driver = {</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init rotary_encoder_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;rotary_encoder_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit rotary_encoder_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;rotary_encoder_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(rotary_encoder_init);</div><div class='del'>-module_exit(rotary_encoder_exit);</div><div class='add'>+module_platform_driver(rotary_encoder_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_ALIAS("platform:" DRV_NAME);</div><div class='ctx'> MODULE_DESCRIPTION("GPIO rotary encoder driver");</div><div class='head'>diff --git a/drivers/input/misc/sgi_btns.c b/drivers/input/misc/sgi_btns.c<br/>index 1a80c0dab83b..5d9fd5571199 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/sgi_btns.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/sgi_btns.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/sgi_btns.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/sgi_btns.c</a></div><div class='hunk'>@@ -164,17 +164,6 @@ static struct platform_driver sgi_buttons_driver = {</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init sgi_buttons_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sgi_buttons_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sgi_buttons_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sgi_buttons_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(sgi_buttons_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-module_init(sgi_buttons_init);</div><div class='del'>-module_exit(sgi_buttons_exit);</div><div class='head'>diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c<br/>index 3c1a432c14dc..37651373a95b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/twl4030-vibra.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/twl4030-vibra.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/twl4030-vibra.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/twl4030-vibra.c</a></div><div class='hunk'>@@ -278,21 +278,9 @@ static struct platform_driver twl4030_vibra_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init twl4030_vibra_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;twl4030_vibra_driver);</div><div class='del'>-}</div><div class='del'>-module_init(twl4030_vibra_init);</div><div class='del'>-</div><div class='del'>-static void __exit twl4030_vibra_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;twl4030_vibra_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(twl4030_vibra_exit);</div><div class='add'>+module_platform_driver(twl4030_vibra_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_ALIAS("platform:twl4030-vibra");</div><div class='del'>-</div><div class='ctx'> MODULE_DESCRIPTION("TWL4030 Vibra driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Nokia Corporation");</div><div class='head'>diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c<br/>index ad153a417eed..45874fed523a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/twl6040-vibra.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/twl6040-vibra.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/twl6040-vibra.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/twl6040-vibra.c</a></div><div class='hunk'>@@ -410,18 +410,7 @@ static struct platform_driver twl6040_vibra_driver = {</div><div class='ctx'> 		.pm	= &amp;twl6040_vibra_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init twl6040_vibra_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;twl6040_vibra_driver);</div><div class='del'>-}</div><div class='del'>-module_init(twl6040_vibra_init);</div><div class='del'>-</div><div class='del'>-static void __exit twl6040_vibra_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;twl6040_vibra_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(twl6040_vibra_exit);</div><div class='add'>+module_platform_driver(twl6040_vibra_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_ALIAS("platform:twl6040-vibra");</div><div class='ctx'> MODULE_DESCRIPTION("TWL6040 Vibra driver");</div><div class='head'>diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c<br/>index 52b419348983..e2bdfd4bea70 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/wistron_btns.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/wistron_btns.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/wistron_btns.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/wistron_btns.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@ MODULE_DESCRIPTION("Wistron laptop button driver");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> MODULE_VERSION("0.3");</div><div class='ctx'> </div><div class='del'>-static int force; /* = 0; */</div><div class='add'>+static bool force; /* = 0; */</div><div class='ctx'> module_param(force, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(force, "Load even if computer is not in database");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/misc/wm831x-on.c b/drivers/input/misc/wm831x-on.c<br/>index c3d7ba5f5b47..47f18d6bce46 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/wm831x-on.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/wm831x-on.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/wm831x-on.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/wm831x-on.c</a></div><div class='hunk'>@@ -145,18 +145,7 @@ static struct platform_driver wm831x_on_driver = {</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init wm831x_on_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;wm831x_on_driver);</div><div class='del'>-}</div><div class='del'>-module_init(wm831x_on_init);</div><div class='del'>-</div><div class='del'>-static void __exit wm831x_on_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;wm831x_on_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(wm831x_on_exit);</div><div class='add'>+module_platform_driver(wm831x_on_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_ALIAS("platform:wm831x-on");</div><div class='ctx'> MODULE_DESCRIPTION("WM831x ON pin");</div><div class='head'>diff --git a/drivers/input/misc/xen-kbdfront.c b/drivers/input/misc/xen-kbdfront.c<br/>index ad2e51c04db8..02ca8680ea5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/xen-kbdfront.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/xen-kbdfront.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/xen-kbdfront.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/xen-kbdfront.c</a></div><div class='hunk'>@@ -361,15 +361,12 @@ static const struct xenbus_device_id xenkbd_ids[] = {</div><div class='ctx'> 	{ "" }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct xenbus_driver xenkbd_driver = {</div><div class='del'>-	.name = "vkbd",</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.ids = xenkbd_ids,</div><div class='add'>+static DEFINE_XENBUS_DRIVER(xenkbd, ,</div><div class='ctx'> 	.probe = xenkbd_probe,</div><div class='ctx'> 	.remove = xenkbd_remove,</div><div class='ctx'> 	.resume = xenkbd_resume,</div><div class='ctx'> 	.otherend_changed = xenkbd_backend_changed,</div><div class='del'>-};</div><div class='add'>+);</div><div class='ctx'> </div><div class='ctx'> static int __init xenkbd_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c<br/>index 41201c6b5e68..f4776e7f8c15 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/yealink.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/misc/yealink.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/yealink.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/misc/yealink.c</a></div><div class='hunk'>@@ -988,22 +988,7 @@ static struct usb_driver yealink_driver = {</div><div class='ctx'> 	.id_table	= usb_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init yealink_dev_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret = usb_register(&amp;yealink_driver);</div><div class='del'>-	if (ret == 0)</div><div class='del'>-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='del'>-		       DRIVER_DESC "\n");</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit yealink_dev_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;yealink_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(yealink_dev_init);</div><div class='del'>-module_exit(yealink_dev_exit);</div><div class='add'>+module_usb_driver(yealink_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE (usb, usb_table);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c<br/>index 003587c71f43..bd87380bd879 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/alps.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/alps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/alps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/mouse/alps.c</a></div><div class='hunk'>@@ -17,13 +17,63 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/input/mt.h&gt;</div><div class='ctx'> #include &lt;linux/serio.h&gt;</div><div class='ctx'> #include &lt;linux/libps2.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "psmouse.h"</div><div class='ctx'> #include "alps.h"</div><div class='ctx'> </div><div class='del'>-#define ALPS_OLDPROTO		0x01	/* old style input */</div><div class='add'>+/*</div><div class='add'>+ * Definitions for ALPS version 3 and 4 command mode protocol</div><div class='add'>+ */</div><div class='add'>+#define ALPS_V3_X_MAX	2000</div><div class='add'>+#define ALPS_V3_Y_MAX	1400</div><div class='add'>+</div><div class='add'>+#define ALPS_BITMAP_X_BITS	15</div><div class='add'>+#define ALPS_BITMAP_Y_BITS	11</div><div class='add'>+</div><div class='add'>+#define ALPS_CMD_NIBBLE_10	0x01f2</div><div class='add'>+</div><div class='add'>+static const struct alps_nibble_commands alps_v3_nibble_commands[] = {</div><div class='add'>+	{ PSMOUSE_CMD_SETPOLL,		0x00 }, /* 0 */</div><div class='add'>+	{ PSMOUSE_CMD_RESET_DIS,	0x00 }, /* 1 */</div><div class='add'>+	{ PSMOUSE_CMD_SETSCALE21,	0x00 }, /* 2 */</div><div class='add'>+	{ PSMOUSE_CMD_SETRATE,		0x0a }, /* 3 */</div><div class='add'>+	{ PSMOUSE_CMD_SETRATE,		0x14 }, /* 4 */</div><div class='add'>+	{ PSMOUSE_CMD_SETRATE,		0x28 }, /* 5 */</div><div class='add'>+	{ PSMOUSE_CMD_SETRATE,		0x3c }, /* 6 */</div><div class='add'>+	{ PSMOUSE_CMD_SETRATE,		0x50 }, /* 7 */</div><div class='add'>+	{ PSMOUSE_CMD_SETRATE,		0x64 }, /* 8 */</div><div class='add'>+	{ PSMOUSE_CMD_SETRATE,		0xc8 }, /* 9 */</div><div class='add'>+	{ ALPS_CMD_NIBBLE_10,		0x00 }, /* a */</div><div class='add'>+	{ PSMOUSE_CMD_SETRES,		0x00 }, /* b */</div><div class='add'>+	{ PSMOUSE_CMD_SETRES,		0x01 }, /* c */</div><div class='add'>+	{ PSMOUSE_CMD_SETRES,		0x02 }, /* d */</div><div class='add'>+	{ PSMOUSE_CMD_SETRES,		0x03 }, /* e */</div><div class='add'>+	{ PSMOUSE_CMD_SETSCALE11,	0x00 }, /* f */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct alps_nibble_commands alps_v4_nibble_commands[] = {</div><div class='add'>+	{ PSMOUSE_CMD_ENABLE,		0x00 }, /* 0 */</div><div class='add'>+	{ PSMOUSE_CMD_RESET_DIS,	0x00 }, /* 1 */</div><div class='add'>+	{ PSMOUSE_CMD_SETSCALE21,	0x00 }, /* 2 */</div><div class='add'>+	{ PSMOUSE_CMD_SETRATE,		0x0a }, /* 3 */</div><div class='add'>+	{ PSMOUSE_CMD_SETRATE,		0x14 }, /* 4 */</div><div class='add'>+	{ PSMOUSE_CMD_SETRATE,		0x28 }, /* 5 */</div><div class='add'>+	{ PSMOUSE_CMD_SETRATE,		0x3c }, /* 6 */</div><div class='add'>+	{ PSMOUSE_CMD_SETRATE,		0x50 }, /* 7 */</div><div class='add'>+	{ PSMOUSE_CMD_SETRATE,		0x64 }, /* 8 */</div><div class='add'>+	{ PSMOUSE_CMD_SETRATE,		0xc8 }, /* 9 */</div><div class='add'>+	{ ALPS_CMD_NIBBLE_10,		0x00 }, /* a */</div><div class='add'>+	{ PSMOUSE_CMD_SETRES,		0x00 }, /* b */</div><div class='add'>+	{ PSMOUSE_CMD_SETRES,		0x01 }, /* c */</div><div class='add'>+	{ PSMOUSE_CMD_SETRES,		0x02 }, /* d */</div><div class='add'>+	{ PSMOUSE_CMD_SETRES,		0x03 }, /* e */</div><div class='add'>+	{ PSMOUSE_CMD_SETSCALE11,	0x00 }, /* f */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #define ALPS_DUALPOINT		0x02	/* touchpad has trackstick */</div><div class='ctx'> #define ALPS_PASS		0x04	/* device has a pass-through port */</div><div class='ctx'> </div><div class='hunk'>@@ -35,30 +85,33 @@</div><div class='ctx'> 					   6-byte ALPS packet */</div><div class='ctx'> </div><div class='ctx'> static const struct alps_model_info alps_model_data[] = {</div><div class='del'>-	{ { 0x32, 0x02, 0x14 },	0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* Toshiba Salellite Pro M10 */</div><div class='del'>-	{ { 0x33, 0x02, 0x0a },	0x88, 0xf8, ALPS_OLDPROTO },		  /* UMAX-530T */</div><div class='del'>-	{ { 0x53, 0x02, 0x0a },	0xf8, 0xf8, 0 },</div><div class='del'>-	{ { 0x53, 0x02, 0x14 },	0xf8, 0xf8, 0 },</div><div class='del'>-	{ { 0x60, 0x03, 0xc8 }, 0xf8, 0xf8, 0 },			  /* HP ze1115 */</div><div class='del'>-	{ { 0x63, 0x02, 0x0a },	0xf8, 0xf8, 0 },</div><div class='del'>-	{ { 0x63, 0x02, 0x14 },	0xf8, 0xf8, 0 },</div><div class='del'>-	{ { 0x63, 0x02, 0x28 },	0xf8, 0xf8, ALPS_FW_BK_2 },		  /* Fujitsu Siemens S6010 */</div><div class='del'>-	{ { 0x63, 0x02, 0x3c },	0x8f, 0x8f, ALPS_WHEEL },		  /* Toshiba Satellite S2400-103 */</div><div class='del'>-	{ { 0x63, 0x02, 0x50 },	0xef, 0xef, ALPS_FW_BK_1 },		  /* NEC Versa L320 */</div><div class='del'>-	{ { 0x63, 0x02, 0x64 },	0xf8, 0xf8, 0 },</div><div class='del'>-	{ { 0x63, 0x03, 0xc8 }, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* Dell Latitude D800 */</div><div class='del'>-	{ { 0x73, 0x00, 0x0a },	0xf8, 0xf8, ALPS_DUALPOINT },		  /* ThinkPad R61 8918-5QG */</div><div class='del'>-	{ { 0x73, 0x02, 0x0a },	0xf8, 0xf8, 0 },</div><div class='del'>-	{ { 0x73, 0x02, 0x14 },	0xf8, 0xf8, ALPS_FW_BK_2 },		  /* Ahtec Laptop */</div><div class='del'>-	{ { 0x20, 0x02, 0x0e },	0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* XXX */</div><div class='del'>-	{ { 0x22, 0x02, 0x0a },	0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT },</div><div class='del'>-	{ { 0x22, 0x02, 0x14 }, 0xff, 0xff, ALPS_PASS | ALPS_DUALPOINT }, /* Dell Latitude D600 */</div><div class='add'>+	{ { 0x32, 0x02, 0x14 },	0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT },	/* Toshiba Salellite Pro M10 */</div><div class='add'>+	{ { 0x33, 0x02, 0x0a },	0x00, ALPS_PROTO_V1, 0x88, 0xf8, 0 },				/* UMAX-530T */</div><div class='add'>+	{ { 0x53, 0x02, 0x0a },	0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 },</div><div class='add'>+	{ { 0x53, 0x02, 0x14 },	0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 },</div><div class='add'>+	{ { 0x60, 0x03, 0xc8 }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 },				/* HP ze1115 */</div><div class='add'>+	{ { 0x63, 0x02, 0x0a },	0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 },</div><div class='add'>+	{ { 0x63, 0x02, 0x14 },	0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 },</div><div class='add'>+	{ { 0x63, 0x02, 0x28 },	0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_FW_BK_2 },		/* Fujitsu Siemens S6010 */</div><div class='add'>+	{ { 0x63, 0x02, 0x3c },	0x00, ALPS_PROTO_V2, 0x8f, 0x8f, ALPS_WHEEL },			/* Toshiba Satellite S2400-103 */</div><div class='add'>+	{ { 0x63, 0x02, 0x50 },	0x00, ALPS_PROTO_V2, 0xef, 0xef, ALPS_FW_BK_1 },		/* NEC Versa L320 */</div><div class='add'>+	{ { 0x63, 0x02, 0x64 },	0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 },</div><div class='add'>+	{ { 0x63, 0x03, 0xc8 }, 0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT },	/* Dell Latitude D800 */</div><div class='add'>+	{ { 0x73, 0x00, 0x0a },	0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_DUALPOINT },		/* ThinkPad R61 8918-5QG */</div><div class='add'>+	{ { 0x73, 0x02, 0x0a },	0x00, ALPS_PROTO_V2, 0xf8, 0xf8, 0 },</div><div class='add'>+	{ { 0x73, 0x02, 0x14 },	0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_FW_BK_2 },		/* Ahtec Laptop */</div><div class='add'>+	{ { 0x20, 0x02, 0x0e },	0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT },	/* XXX */</div><div class='add'>+	{ { 0x22, 0x02, 0x0a },	0x00, ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT },</div><div class='add'>+	{ { 0x22, 0x02, 0x14 }, 0x00, ALPS_PROTO_V2, 0xff, 0xff, ALPS_PASS | ALPS_DUALPOINT },	/* Dell Latitude D600 */</div><div class='ctx'> 	/* Dell Latitude E5500, E6400, E6500, Precision M4400 */</div><div class='del'>-	{ { 0x62, 0x02, 0x14 }, 0xcf, 0xcf,</div><div class='add'>+	{ { 0x62, 0x02, 0x14 }, 0x00, ALPS_PROTO_V2, 0xcf, 0xcf,</div><div class='ctx'> 		ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED },</div><div class='del'>-	{ { 0x73, 0x02, 0x50 }, 0xcf, 0xcf, ALPS_FOUR_BUTTONS },	  /* Dell Vostro 1400 */</div><div class='del'>-	{ { 0x52, 0x01, 0x14 }, 0xff, 0xff,</div><div class='del'>-		ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED },	  /* Toshiba Tecra A11-11L */</div><div class='add'>+	{ { 0x73, 0x02, 0x50 }, 0x00, ALPS_PROTO_V2, 0xcf, 0xcf, ALPS_FOUR_BUTTONS },		/* Dell Vostro 1400 */</div><div class='add'>+	{ { 0x52, 0x01, 0x14 }, 0x00, ALPS_PROTO_V2, 0xff, 0xff,</div><div class='add'>+		ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED },				/* Toshiba Tecra A11-11L */</div><div class='add'>+	{ { 0x73, 0x02, 0x64 },	0x9b, ALPS_PROTO_V3, 0x8f, 0x8f, ALPS_DUALPOINT },</div><div class='add'>+	{ { 0x73, 0x02, 0x64 },	0x9d, ALPS_PROTO_V3, 0x8f, 0x8f, ALPS_DUALPOINT },</div><div class='add'>+	{ { 0x73, 0x02, 0x64 },	0x8a, ALPS_PROTO_V4, 0x8f, 0x8f, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -67,42 +120,7 @@ static const struct alps_model_info alps_model_data[] = {</div><div class='ctx'>  * isn't valid per PS/2 spec.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * PS/2 packet format</div><div class='del'>- *</div><div class='del'>- * byte 0:  0    0 YSGN XSGN    1    M    R    L</div><div class='del'>- * byte 1: X7   X6   X5   X4   X3   X2   X1   X0</div><div class='del'>- * byte 2: Y7   Y6   Y5   Y4   Y3   Y2   Y1   Y0</div><div class='del'>- *</div><div class='del'>- * Note that the device never signals overflow condition.</div><div class='del'>- *</div><div class='del'>- * ALPS absolute Mode - new format</div><div class='del'>- *</div><div class='del'>- * byte 0:  1    ?    ?    ?    1    ?    ?    ?</div><div class='del'>- * byte 1:  0   x6   x5   x4   x3   x2   x1   x0</div><div class='del'>- * byte 2:  0  x10   x9   x8   x7    ?  fin  ges</div><div class='del'>- * byte 3:  0   y9   y8   y7    1    M    R    L</div><div class='del'>- * byte 4:  0   y6   y5   y4   y3   y2   y1   y0</div><div class='del'>- * byte 5:  0   z6   z5   z4   z3   z2   z1   z0</div><div class='del'>- *</div><div class='del'>- * Dualpoint device -- interleaved packet format</div><div class='del'>- *</div><div class='del'>- * byte 0:    1    1    0    0    1    1    1    1</div><div class='del'>- * byte 1:    0   x6   x5   x4   x3   x2   x1   x0</div><div class='del'>- * byte 2:    0  x10   x9   x8   x7    0  fin  ges</div><div class='del'>- * byte 3:    0    0 YSGN XSGN    1    1    1    1</div><div class='del'>- * byte 4:   X7   X6   X5   X4   X3   X2   X1   X0</div><div class='del'>- * byte 5:   Y7   Y6   Y5   Y4   Y3   Y2   Y1   Y0</div><div class='del'>- * byte 6:    0   y9   y8   y7    1    m    r    l</div><div class='del'>- * byte 7:    0   y6   y5   y4   y3   y2   y1   y0</div><div class='del'>- * byte 8:    0   z6   z5   z4   z3   z2   z1   z0</div><div class='del'>- *</div><div class='del'>- * CAPITALS = stick, miniscules = touchpad</div><div class='del'>- *</div><div class='del'>- * ?'s can have different meanings on different models,</div><div class='del'>- * such as wheel rotation, extra buttons, stick buttons</div><div class='del'>- * on a dualpoint, etc.</div><div class='del'>- */</div><div class='add'>+/* Packet formats are described in Documentation/input/alps.txt */</div><div class='ctx'> </div><div class='ctx'> static bool alps_is_valid_first_byte(const struct alps_model_info *model,</div><div class='ctx'> 				     unsigned char data)</div><div class='hunk'>@@ -137,7 +155,7 @@ static void alps_report_buttons(struct psmouse *psmouse,</div><div class='ctx'> 	input_sync(dev2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void alps_process_packet(struct psmouse *psmouse)</div><div class='add'>+static void alps_process_packet_v1_v2(struct psmouse *psmouse)</div><div class='ctx'> {</div><div class='ctx'> 	struct alps_data *priv = psmouse-&gt;private;</div><div class='ctx'> 	const struct alps_model_info *model = priv-&gt;i;</div><div class='hunk'>@@ -147,7 +165,7 @@ static void alps_process_packet(struct psmouse *psmouse)</div><div class='ctx'> 	int x, y, z, ges, fin, left, right, middle;</div><div class='ctx'> 	int back = 0, forward = 0;</div><div class='ctx'> </div><div class='del'>-	if (model-&gt;flags &amp; ALPS_OLDPROTO) {</div><div class='add'>+	if (model-&gt;proto_version == ALPS_PROTO_V1) {</div><div class='ctx'> 		left = packet[2] &amp; 0x10;</div><div class='ctx'> 		right = packet[2] &amp; 0x08;</div><div class='ctx'> 		middle = 0;</div><div class='hunk'>@@ -239,6 +257,403 @@ static void alps_process_packet(struct psmouse *psmouse)</div><div class='ctx'> 	input_sync(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Process bitmap data from v3 and v4 protocols. Returns the number of</div><div class='add'>+ * fingers detected. A return value of 0 means at least one of the</div><div class='add'>+ * bitmaps was empty.</div><div class='add'>+ *</div><div class='add'>+ * The bitmaps don't have enough data to track fingers, so this function</div><div class='add'>+ * only generates points representing a bounding box of all contacts.</div><div class='add'>+ * These points are returned in x1, y1, x2, and y2 when the return value</div><div class='add'>+ * is greater than 0.</div><div class='add'>+ */</div><div class='add'>+static int alps_process_bitmap(unsigned int x_map, unsigned int y_map,</div><div class='add'>+			       int *x1, int *y1, int *x2, int *y2)</div><div class='add'>+{</div><div class='add'>+	struct alps_bitmap_point {</div><div class='add'>+		int start_bit;</div><div class='add'>+		int num_bits;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	int fingers_x = 0, fingers_y = 0, fingers;</div><div class='add'>+	int i, bit, prev_bit;</div><div class='add'>+	struct alps_bitmap_point x_low = {0,}, x_high = {0,};</div><div class='add'>+	struct alps_bitmap_point y_low = {0,}, y_high = {0,};</div><div class='add'>+	struct alps_bitmap_point *point;</div><div class='add'>+</div><div class='add'>+	if (!x_map || !y_map)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	*x1 = *y1 = *x2 = *y2 = 0;</div><div class='add'>+</div><div class='add'>+	prev_bit = 0;</div><div class='add'>+	point = &amp;x_low;</div><div class='add'>+	for (i = 0; x_map != 0; i++, x_map &gt;&gt;= 1) {</div><div class='add'>+		bit = x_map &amp; 1;</div><div class='add'>+		if (bit) {</div><div class='add'>+			if (!prev_bit) {</div><div class='add'>+				point-&gt;start_bit = i;</div><div class='add'>+				fingers_x++;</div><div class='add'>+			}</div><div class='add'>+			point-&gt;num_bits++;</div><div class='add'>+		} else {</div><div class='add'>+			if (prev_bit)</div><div class='add'>+				point = &amp;x_high;</div><div class='add'>+			else</div><div class='add'>+				point-&gt;num_bits = 0;</div><div class='add'>+		}</div><div class='add'>+		prev_bit = bit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * y bitmap is reversed for what we need (lower positions are in</div><div class='add'>+	 * higher bits), so we process from the top end.</div><div class='add'>+	 */</div><div class='add'>+	y_map = y_map &lt;&lt; (sizeof(y_map) * BITS_PER_BYTE - ALPS_BITMAP_Y_BITS);</div><div class='add'>+	prev_bit = 0;</div><div class='add'>+	point = &amp;y_low;</div><div class='add'>+	for (i = 0; y_map != 0; i++, y_map &lt;&lt;= 1) {</div><div class='add'>+		bit = y_map &amp; (1 &lt;&lt; (sizeof(y_map) * BITS_PER_BYTE - 1));</div><div class='add'>+		if (bit) {</div><div class='add'>+			if (!prev_bit) {</div><div class='add'>+				point-&gt;start_bit = i;</div><div class='add'>+				fingers_y++;</div><div class='add'>+			}</div><div class='add'>+			point-&gt;num_bits++;</div><div class='add'>+		} else {</div><div class='add'>+			if (prev_bit)</div><div class='add'>+				point = &amp;y_high;</div><div class='add'>+			else</div><div class='add'>+				point-&gt;num_bits = 0;</div><div class='add'>+		}</div><div class='add'>+		prev_bit = bit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Fingers can overlap, so we use the maximum count of fingers</div><div class='add'>+	 * on either axis as the finger count.</div><div class='add'>+	 */</div><div class='add'>+	fingers = max(fingers_x, fingers_y);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If total fingers is &gt; 1 but either axis reports only a single</div><div class='add'>+	 * contact, we have overlapping or adjacent fingers. For the</div><div class='add'>+	 * purposes of creating a bounding box, divide the single contact</div><div class='add'>+	 * (roughly) equally between the two points.</div><div class='add'>+	 */</div><div class='add'>+	if (fingers &gt; 1) {</div><div class='add'>+		if (fingers_x == 1) {</div><div class='add'>+			i = x_low.num_bits / 2;</div><div class='add'>+			x_low.num_bits = x_low.num_bits - i;</div><div class='add'>+			x_high.start_bit = x_low.start_bit + i;</div><div class='add'>+			x_high.num_bits = max(i, 1);</div><div class='add'>+		} else if (fingers_y == 1) {</div><div class='add'>+			i = y_low.num_bits / 2;</div><div class='add'>+			y_low.num_bits = y_low.num_bits - i;</div><div class='add'>+			y_high.start_bit = y_low.start_bit + i;</div><div class='add'>+			y_high.num_bits = max(i, 1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*x1 = (ALPS_V3_X_MAX * (2 * x_low.start_bit + x_low.num_bits - 1)) /</div><div class='add'>+	      (2 * (ALPS_BITMAP_X_BITS - 1));</div><div class='add'>+	*y1 = (ALPS_V3_Y_MAX * (2 * y_low.start_bit + y_low.num_bits - 1)) /</div><div class='add'>+	      (2 * (ALPS_BITMAP_Y_BITS - 1));</div><div class='add'>+</div><div class='add'>+	if (fingers &gt; 1) {</div><div class='add'>+		*x2 = (ALPS_V3_X_MAX * (2 * x_high.start_bit + x_high.num_bits - 1)) /</div><div class='add'>+		      (2 * (ALPS_BITMAP_X_BITS - 1));</div><div class='add'>+		*y2 = (ALPS_V3_Y_MAX * (2 * y_high.start_bit + y_high.num_bits - 1)) /</div><div class='add'>+		      (2 * (ALPS_BITMAP_Y_BITS - 1));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return fingers;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alps_set_slot(struct input_dev *dev, int slot, bool active,</div><div class='add'>+			  int x, int y)</div><div class='add'>+{</div><div class='add'>+	input_mt_slot(dev, slot);</div><div class='add'>+	input_mt_report_slot_state(dev, MT_TOOL_FINGER, active);</div><div class='add'>+	if (active) {</div><div class='add'>+		input_report_abs(dev, ABS_MT_POSITION_X, x);</div><div class='add'>+		input_report_abs(dev, ABS_MT_POSITION_Y, y);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alps_report_semi_mt_data(struct input_dev *dev, int num_fingers,</div><div class='add'>+				     int x1, int y1, int x2, int y2)</div><div class='add'>+{</div><div class='add'>+	alps_set_slot(dev, 0, num_fingers != 0, x1, y1);</div><div class='add'>+	alps_set_slot(dev, 1, num_fingers == 2, x2, y2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alps_process_trackstick_packet_v3(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	struct alps_data *priv = psmouse-&gt;private;</div><div class='add'>+	unsigned char *packet = psmouse-&gt;packet;</div><div class='add'>+	struct input_dev *dev = priv-&gt;dev2;</div><div class='add'>+	int x, y, z, left, right, middle;</div><div class='add'>+</div><div class='add'>+	/* Sanity check packet */</div><div class='add'>+	if (!(packet[0] &amp; 0x40)) {</div><div class='add'>+		psmouse_dbg(psmouse, "Bad trackstick packet, discarding\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * There's a special packet that seems to indicate the end</div><div class='add'>+	 * of a stream of trackstick data. Filter these out.</div><div class='add'>+	 */</div><div class='add'>+	if (packet[1] == 0x7f &amp;&amp; packet[2] == 0x7f &amp;&amp; packet[4] == 0x7f)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	x = (s8)(((packet[0] &amp; 0x20) &lt;&lt; 2) | (packet[1] &amp; 0x7f));</div><div class='add'>+	y = (s8)(((packet[0] &amp; 0x10) &lt;&lt; 3) | (packet[2] &amp; 0x7f));</div><div class='add'>+	z = (packet[4] &amp; 0x7c) &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The x and y values tend to be quite large, and when used</div><div class='add'>+	 * alone the trackstick is difficult to use. Scale them down</div><div class='add'>+	 * to compensate.</div><div class='add'>+	 */</div><div class='add'>+	x /= 8;</div><div class='add'>+	y /= 8;</div><div class='add'>+</div><div class='add'>+	input_report_rel(dev, REL_X, x);</div><div class='add'>+	input_report_rel(dev, REL_Y, -y);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Most ALPS models report the trackstick buttons in the touchpad</div><div class='add'>+	 * packets, but a few report them here. No reliable way has been</div><div class='add'>+	 * found to differentiate between the models upfront, so we enable</div><div class='add'>+	 * the quirk in response to seeing a button press in the trackstick</div><div class='add'>+	 * packet.</div><div class='add'>+	 */</div><div class='add'>+	left = packet[3] &amp; 0x01;</div><div class='add'>+	right = packet[3] &amp; 0x02;</div><div class='add'>+	middle = packet[3] &amp; 0x04;</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;quirks &amp; ALPS_QUIRK_TRACKSTICK_BUTTONS) &amp;&amp;</div><div class='add'>+	    (left || right || middle))</div><div class='add'>+		priv-&gt;quirks |= ALPS_QUIRK_TRACKSTICK_BUTTONS;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;quirks &amp; ALPS_QUIRK_TRACKSTICK_BUTTONS) {</div><div class='add'>+		input_report_key(dev, BTN_LEFT, left);</div><div class='add'>+		input_report_key(dev, BTN_RIGHT, right);</div><div class='add'>+		input_report_key(dev, BTN_MIDDLE, middle);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_sync(dev);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alps_process_touchpad_packet_v3(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	struct alps_data *priv = psmouse-&gt;private;</div><div class='add'>+	unsigned char *packet = psmouse-&gt;packet;</div><div class='add'>+	struct input_dev *dev = psmouse-&gt;dev;</div><div class='add'>+	struct input_dev *dev2 = priv-&gt;dev2;</div><div class='add'>+	int x, y, z;</div><div class='add'>+	int left, right, middle;</div><div class='add'>+	int x1 = 0, y1 = 0, x2 = 0, y2 = 0;</div><div class='add'>+	int fingers = 0, bmap_fingers;</div><div class='add'>+	unsigned int x_bitmap, y_bitmap;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * There's no single feature of touchpad position and bitmap packets</div><div class='add'>+	 * that can be used to distinguish between them. We rely on the fact</div><div class='add'>+	 * that a bitmap packet should always follow a position packet with</div><div class='add'>+	 * bit 6 of packet[4] set.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;multi_packet) {</div><div class='add'>+		/*</div><div class='add'>+		 * Sometimes a position packet will indicate a multi-packet</div><div class='add'>+		 * sequence, but then what follows is another position</div><div class='add'>+		 * packet. Check for this, and when it happens process the</div><div class='add'>+		 * position packet as usual.</div><div class='add'>+		 */</div><div class='add'>+		if (packet[0] &amp; 0x40) {</div><div class='add'>+			fingers = (packet[5] &amp; 0x3) + 1;</div><div class='add'>+			x_bitmap = ((packet[4] &amp; 0x7e) &lt;&lt; 8) |</div><div class='add'>+				   ((packet[1] &amp; 0x7f) &lt;&lt; 2) |</div><div class='add'>+				   ((packet[0] &amp; 0x30) &gt;&gt; 4);</div><div class='add'>+			y_bitmap = ((packet[3] &amp; 0x70) &lt;&lt; 4) |</div><div class='add'>+				   ((packet[2] &amp; 0x7f) &lt;&lt; 1) |</div><div class='add'>+				   (packet[4] &amp; 0x01);</div><div class='add'>+</div><div class='add'>+			bmap_fingers = alps_process_bitmap(x_bitmap, y_bitmap,</div><div class='add'>+							   &amp;x1, &amp;y1, &amp;x2, &amp;y2);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * We shouldn't report more than one finger if</div><div class='add'>+			 * we don't have two coordinates.</div><div class='add'>+			 */</div><div class='add'>+			if (fingers &gt; 1 &amp;&amp; bmap_fingers &lt; 2)</div><div class='add'>+				fingers = bmap_fingers;</div><div class='add'>+</div><div class='add'>+			/* Now process position packet */</div><div class='add'>+			packet = priv-&gt;multi_data;</div><div class='add'>+		} else {</div><div class='add'>+			priv-&gt;multi_packet = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Bit 6 of byte 0 is not usually set in position packets. The only</div><div class='add'>+	 * times it seems to be set is in situations where the data is</div><div class='add'>+	 * suspect anyway, e.g. a palm resting flat on the touchpad. Given</div><div class='add'>+	 * this combined with the fact that this bit is useful for filtering</div><div class='add'>+	 * out misidentified bitmap packets, we reject anything with this</div><div class='add'>+	 * bit set.</div><div class='add'>+	 */</div><div class='add'>+	if (packet[0] &amp; 0x40)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;multi_packet &amp;&amp; (packet[4] &amp; 0x40)) {</div><div class='add'>+		priv-&gt;multi_packet = 1;</div><div class='add'>+		memcpy(priv-&gt;multi_data, packet, sizeof(priv-&gt;multi_data));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;multi_packet = 0;</div><div class='add'>+</div><div class='add'>+	left = packet[3] &amp; 0x01;</div><div class='add'>+	right = packet[3] &amp; 0x02;</div><div class='add'>+	middle = packet[3] &amp; 0x04;</div><div class='add'>+</div><div class='add'>+	x = ((packet[1] &amp; 0x7f) &lt;&lt; 4) | ((packet[4] &amp; 0x30) &gt;&gt; 2) |</div><div class='add'>+	    ((packet[0] &amp; 0x30) &gt;&gt; 4);</div><div class='add'>+	y = ((packet[2] &amp; 0x7f) &lt;&lt; 4) | (packet[4] &amp; 0x0f);</div><div class='add'>+	z = packet[5] &amp; 0x7f;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Sometimes the hardware sends a single packet with z = 0</div><div class='add'>+	 * in the middle of a stream. Real releases generate packets</div><div class='add'>+	 * with x, y, and z all zero, so these seem to be flukes.</div><div class='add'>+	 * Ignore them.</div><div class='add'>+	 */</div><div class='add'>+	if (x &amp;&amp; y &amp;&amp; !z)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we don't have MT data or the bitmaps were empty, we have</div><div class='add'>+	 * to rely on ST data.</div><div class='add'>+	 */</div><div class='add'>+	if (!fingers) {</div><div class='add'>+		x1 = x;</div><div class='add'>+		y1 = y;</div><div class='add'>+		fingers = z &gt; 0 ? 1 : 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (z &gt;= 64)</div><div class='add'>+		input_report_key(dev, BTN_TOUCH, 1);</div><div class='add'>+	else</div><div class='add'>+		input_report_key(dev, BTN_TOUCH, 0);</div><div class='add'>+</div><div class='add'>+	alps_report_semi_mt_data(dev, fingers, x1, y1, x2, y2);</div><div class='add'>+</div><div class='add'>+	input_report_key(dev, BTN_TOOL_FINGER, fingers == 1);</div><div class='add'>+	input_report_key(dev, BTN_TOOL_DOUBLETAP, fingers == 2);</div><div class='add'>+	input_report_key(dev, BTN_TOOL_TRIPLETAP, fingers == 3);</div><div class='add'>+	input_report_key(dev, BTN_TOOL_QUADTAP, fingers == 4);</div><div class='add'>+</div><div class='add'>+	input_report_key(dev, BTN_LEFT, left);</div><div class='add'>+	input_report_key(dev, BTN_RIGHT, right);</div><div class='add'>+	input_report_key(dev, BTN_MIDDLE, middle);</div><div class='add'>+</div><div class='add'>+	if (z &gt; 0) {</div><div class='add'>+		input_report_abs(dev, ABS_X, x);</div><div class='add'>+		input_report_abs(dev, ABS_Y, y);</div><div class='add'>+	}</div><div class='add'>+	input_report_abs(dev, ABS_PRESSURE, z);</div><div class='add'>+</div><div class='add'>+	input_sync(dev);</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;quirks &amp; ALPS_QUIRK_TRACKSTICK_BUTTONS)) {</div><div class='add'>+		left = packet[3] &amp; 0x10;</div><div class='add'>+		right = packet[3] &amp; 0x20;</div><div class='add'>+		middle = packet[3] &amp; 0x40;</div><div class='add'>+</div><div class='add'>+		input_report_key(dev2, BTN_LEFT, left);</div><div class='add'>+		input_report_key(dev2, BTN_RIGHT, right);</div><div class='add'>+		input_report_key(dev2, BTN_MIDDLE, middle);</div><div class='add'>+		input_sync(dev2);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alps_process_packet_v3(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	unsigned char *packet = psmouse-&gt;packet;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * v3 protocol packets come in three types, two representing</div><div class='add'>+	 * touchpad data and one representing trackstick data.</div><div class='add'>+	 * Trackstick packets seem to be distinguished by always</div><div class='add'>+	 * having 0x3f in the last byte. This value has never been</div><div class='add'>+	 * observed in the last byte of either of the other types</div><div class='add'>+	 * of packets.</div><div class='add'>+	 */</div><div class='add'>+	if (packet[5] == 0x3f) {</div><div class='add'>+		alps_process_trackstick_packet_v3(psmouse);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	alps_process_touchpad_packet_v3(psmouse);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alps_process_packet_v4(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	unsigned char *packet = psmouse-&gt;packet;</div><div class='add'>+	struct input_dev *dev = psmouse-&gt;dev;</div><div class='add'>+	int x, y, z;</div><div class='add'>+	int left, right;</div><div class='add'>+</div><div class='add'>+	left = packet[4] &amp; 0x01;</div><div class='add'>+	right = packet[4] &amp; 0x02;</div><div class='add'>+</div><div class='add'>+	x = ((packet[1] &amp; 0x7f) &lt;&lt; 4) | ((packet[3] &amp; 0x30) &gt;&gt; 2) |</div><div class='add'>+	    ((packet[0] &amp; 0x30) &gt;&gt; 4);</div><div class='add'>+	y = ((packet[2] &amp; 0x7f) &lt;&lt; 4) | (packet[3] &amp; 0x0f);</div><div class='add'>+	z = packet[5] &amp; 0x7f;</div><div class='add'>+</div><div class='add'>+	if (z &gt;= 64)</div><div class='add'>+		input_report_key(dev, BTN_TOUCH, 1);</div><div class='add'>+	else</div><div class='add'>+		input_report_key(dev, BTN_TOUCH, 0);</div><div class='add'>+</div><div class='add'>+	if (z &gt; 0) {</div><div class='add'>+		input_report_abs(dev, ABS_X, x);</div><div class='add'>+		input_report_abs(dev, ABS_Y, y);</div><div class='add'>+	}</div><div class='add'>+	input_report_abs(dev, ABS_PRESSURE, z);</div><div class='add'>+</div><div class='add'>+	input_report_key(dev, BTN_TOOL_FINGER, z &gt; 0);</div><div class='add'>+	input_report_key(dev, BTN_LEFT, left);</div><div class='add'>+	input_report_key(dev, BTN_RIGHT, right);</div><div class='add'>+</div><div class='add'>+	input_sync(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alps_process_packet(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	struct alps_data *priv = psmouse-&gt;private;</div><div class='add'>+	const struct alps_model_info *model = priv-&gt;i;</div><div class='add'>+</div><div class='add'>+	switch (model-&gt;proto_version) {</div><div class='add'>+	case ALPS_PROTO_V1:</div><div class='add'>+	case ALPS_PROTO_V2:</div><div class='add'>+		alps_process_packet_v1_v2(psmouse);</div><div class='add'>+		break;</div><div class='add'>+	case ALPS_PROTO_V3:</div><div class='add'>+		alps_process_packet_v3(psmouse);</div><div class='add'>+		break;</div><div class='add'>+	case ALPS_PROTO_V4:</div><div class='add'>+		alps_process_packet_v4(psmouse);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void alps_report_bare_ps2_packet(struct psmouse *psmouse,</div><div class='ctx'> 					unsigned char packet[],</div><div class='ctx'> 					bool report_buttons)</div><div class='hunk'>@@ -344,7 +759,7 @@ static void alps_flush_packet(unsigned long data)</div><div class='ctx'> </div><div class='ctx'> 	serio_pause_rx(psmouse-&gt;ps2dev.serio);</div><div class='ctx'> </div><div class='del'>-	if (psmouse-&gt;pktcnt == 6) {</div><div class='add'>+	if (psmouse-&gt;pktcnt == psmouse-&gt;pktsize) {</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We did not any more data in reasonable amount of time.</div><div class='hunk'>@@ -395,8 +810,8 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)</div><div class='ctx'> 		return PSMOUSE_BAD_DATA;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Bytes 2 - 6 should have 0 in the highest bit */</div><div class='del'>-	if (psmouse-&gt;pktcnt &gt;= 2 &amp;&amp; psmouse-&gt;pktcnt &lt;= 6 &amp;&amp;</div><div class='add'>+	/* Bytes 2 - pktsize should have 0 in the highest bit */</div><div class='add'>+	if (psmouse-&gt;pktcnt &gt;= 2 &amp;&amp; psmouse-&gt;pktcnt &lt;= psmouse-&gt;pktsize &amp;&amp;</div><div class='ctx'> 	    (psmouse-&gt;packet[psmouse-&gt;pktcnt - 1] &amp; 0x80)) {</div><div class='ctx'> 		psmouse_dbg(psmouse, "refusing packet[%i] = %x\n",</div><div class='ctx'> 			    psmouse-&gt;pktcnt - 1,</div><div class='hunk'>@@ -404,7 +819,7 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)</div><div class='ctx'> 		return PSMOUSE_BAD_DATA;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (psmouse-&gt;pktcnt == 6) {</div><div class='add'>+	if (psmouse-&gt;pktcnt == psmouse-&gt;pktsize) {</div><div class='ctx'> 		alps_process_packet(psmouse);</div><div class='ctx'> 		return PSMOUSE_FULL_PACKET;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -412,11 +827,127 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)</div><div class='ctx'> 	return PSMOUSE_GOOD_DATA;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int alps_command_mode_send_nibble(struct psmouse *psmouse, int nibble)</div><div class='add'>+{</div><div class='add'>+	struct ps2dev *ps2dev = &amp;psmouse-&gt;ps2dev;</div><div class='add'>+	struct alps_data *priv = psmouse-&gt;private;</div><div class='add'>+	int command;</div><div class='add'>+	unsigned char *param;</div><div class='add'>+	unsigned char dummy[4];</div><div class='add'>+</div><div class='add'>+	BUG_ON(nibble &gt; 0xf);</div><div class='add'>+</div><div class='add'>+	command = priv-&gt;nibble_commands[nibble].command;</div><div class='add'>+	param = (command &amp; 0x0f00) ?</div><div class='add'>+		dummy : (unsigned char *)&amp;priv-&gt;nibble_commands[nibble].data;</div><div class='add'>+</div><div class='add'>+	if (ps2_command(ps2dev, param, command))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alps_command_mode_set_addr(struct psmouse *psmouse, int addr)</div><div class='add'>+{</div><div class='add'>+	struct ps2dev *ps2dev = &amp;psmouse-&gt;ps2dev;</div><div class='add'>+	struct alps_data *priv = psmouse-&gt;private;</div><div class='add'>+	int i, nibble;</div><div class='add'>+</div><div class='add'>+	if (ps2_command(ps2dev, NULL, priv-&gt;addr_command))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	for (i = 12; i &gt;= 0; i -= 4) {</div><div class='add'>+		nibble = (addr &gt;&gt; i) &amp; 0xf;</div><div class='add'>+		if (alps_command_mode_send_nibble(psmouse, nibble))</div><div class='add'>+			return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __alps_command_mode_read_reg(struct psmouse *psmouse, int addr)</div><div class='add'>+{</div><div class='add'>+	struct ps2dev *ps2dev = &amp;psmouse-&gt;ps2dev;</div><div class='add'>+	unsigned char param[4];</div><div class='add'>+</div><div class='add'>+	if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The address being read is returned in the first two bytes</div><div class='add'>+	 * of the result. Check that this address matches the expected</div><div class='add'>+	 * address.</div><div class='add'>+	 */</div><div class='add'>+	if (addr != ((param[0] &lt;&lt; 8) | param[1]))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return param[2];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alps_command_mode_read_reg(struct psmouse *psmouse, int addr)</div><div class='add'>+{</div><div class='add'>+	if (alps_command_mode_set_addr(psmouse, addr))</div><div class='add'>+		return -1;</div><div class='add'>+	return __alps_command_mode_read_reg(psmouse, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __alps_command_mode_write_reg(struct psmouse *psmouse, u8 value)</div><div class='add'>+{</div><div class='add'>+	if (alps_command_mode_send_nibble(psmouse, (value &gt;&gt; 4) &amp; 0xf))</div><div class='add'>+		return -1;</div><div class='add'>+	if (alps_command_mode_send_nibble(psmouse, value &amp; 0xf))</div><div class='add'>+		return -1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alps_command_mode_write_reg(struct psmouse *psmouse, int addr,</div><div class='add'>+				       u8 value)</div><div class='add'>+{</div><div class='add'>+	if (alps_command_mode_set_addr(psmouse, addr))</div><div class='add'>+		return -1;</div><div class='add'>+	return __alps_command_mode_write_reg(psmouse, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alps_enter_command_mode(struct psmouse *psmouse,</div><div class='add'>+				   unsigned char *resp)</div><div class='add'>+{</div><div class='add'>+	unsigned char param[4];</div><div class='add'>+	struct ps2dev *ps2dev = &amp;psmouse-&gt;ps2dev;</div><div class='add'>+</div><div class='add'>+	if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_WRAP) ||</div><div class='add'>+	    ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_WRAP) ||</div><div class='add'>+	    ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_WRAP) ||</div><div class='add'>+	    ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO)) {</div><div class='add'>+		psmouse_err(psmouse, "failed to enter command mode\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (param[0] != 0x88 &amp;&amp; param[1] != 0x07) {</div><div class='add'>+		psmouse_dbg(psmouse,</div><div class='add'>+			    "unknown response while entering command mode: %2.2x %2.2x %2.2x\n",</div><div class='add'>+			    param[0], param[1], param[2]);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp)</div><div class='add'>+		*resp = param[2];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int alps_exit_command_mode(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	struct ps2dev *ps2dev = &amp;psmouse-&gt;ps2dev;</div><div class='add'>+	if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSTREAM))</div><div class='add'>+		return -1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int *version)</div><div class='ctx'> {</div><div class='ctx'> 	struct ps2dev *ps2dev = &amp;psmouse-&gt;ps2dev;</div><div class='ctx'> 	static const unsigned char rates[] = { 0, 10, 20, 40, 60, 80, 100, 200 };</div><div class='ctx'> 	unsigned char param[4];</div><div class='add'>+	const struct alps_model_info *model = NULL;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -464,12 +995,41 @@ static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int</div><div class='ctx'> 		*version = (param[0] &lt;&lt; 8) | (param[1] &lt;&lt; 4) | i;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(alps_model_data); i++)</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(alps_model_data); i++) {</div><div class='ctx'> 		if (!memcmp(param, alps_model_data[i].signature,</div><div class='del'>-			    sizeof(alps_model_data[i].signature)))</div><div class='del'>-			return alps_model_data + i;</div><div class='add'>+			    sizeof(alps_model_data[i].signature))) {</div><div class='add'>+			model = alps_model_data + i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='add'>+	if (model &amp;&amp; model-&gt;proto_version &gt; ALPS_PROTO_V2) {</div><div class='add'>+		/*</div><div class='add'>+		 * Need to check command mode response to identify</div><div class='add'>+		 * model</div><div class='add'>+		 */</div><div class='add'>+		model = NULL;</div><div class='add'>+		if (alps_enter_command_mode(psmouse, param)) {</div><div class='add'>+			psmouse_warn(psmouse,</div><div class='add'>+				     "touchpad failed to enter command mode\n");</div><div class='add'>+		} else {</div><div class='add'>+			for (i = 0; i &lt; ARRAY_SIZE(alps_model_data); i++) {</div><div class='add'>+				if (alps_model_data[i].proto_version &gt; ALPS_PROTO_V2 &amp;&amp;</div><div class='add'>+				    alps_model_data[i].command_mode_resp == param[0]) {</div><div class='add'>+					model = alps_model_data + i;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			alps_exit_command_mode(psmouse);</div><div class='add'>+</div><div class='add'>+			if (!model)</div><div class='add'>+				psmouse_dbg(psmouse,</div><div class='add'>+					    "Unknown command mode response %2.2x\n",</div><div class='add'>+					    param[0]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return model;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -477,7 +1037,7 @@ static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int</div><div class='ctx'>  * subsequent commands. It looks like glidepad is behind stickpointer,</div><div class='ctx'>  * I'd thought it would be other way around...</div><div class='ctx'>  */</div><div class='del'>-static int alps_passthrough_mode(struct psmouse *psmouse, bool enable)</div><div class='add'>+static int alps_passthrough_mode_v2(struct psmouse *psmouse, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct ps2dev *ps2dev = &amp;psmouse-&gt;ps2dev;</div><div class='ctx'> 	int cmd = enable ? PSMOUSE_CMD_SETSCALE21 : PSMOUSE_CMD_SETSCALE11;</div><div class='hunk'>@@ -494,7 +1054,7 @@ static int alps_passthrough_mode(struct psmouse *psmouse, bool enable)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int alps_absolute_mode(struct psmouse *psmouse)</div><div class='add'>+static int alps_absolute_mode_v1_v2(struct psmouse *psmouse)</div><div class='ctx'> {</div><div class='ctx'> 	struct ps2dev *ps2dev = &amp;psmouse-&gt;ps2dev;</div><div class='ctx'> </div><div class='hunk'>@@ -565,17 +1125,17 @@ static int alps_tap_mode(struct psmouse *psmouse, int enable)</div><div class='ctx'> static int alps_poll(struct psmouse *psmouse)</div><div class='ctx'> {</div><div class='ctx'> 	struct alps_data *priv = psmouse-&gt;private;</div><div class='del'>-	unsigned char buf[6];</div><div class='add'>+	unsigned char buf[sizeof(psmouse-&gt;packet)];</div><div class='ctx'> 	bool poll_failed;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;i-&gt;flags &amp; ALPS_PASS)</div><div class='del'>-		alps_passthrough_mode(psmouse, true);</div><div class='add'>+		alps_passthrough_mode_v2(psmouse, true);</div><div class='ctx'> </div><div class='ctx'> 	poll_failed = ps2_command(&amp;psmouse-&gt;ps2dev, buf,</div><div class='ctx'> 				  PSMOUSE_CMD_POLL | (psmouse-&gt;pktsize &lt;&lt; 8)) &lt; 0;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;i-&gt;flags &amp; ALPS_PASS)</div><div class='del'>-		alps_passthrough_mode(psmouse, false);</div><div class='add'>+		alps_passthrough_mode_v2(psmouse, false);</div><div class='ctx'> </div><div class='ctx'> 	if (poll_failed || (buf[0] &amp; priv-&gt;i-&gt;mask0) != priv-&gt;i-&gt;byte0)</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -592,13 +1152,13 @@ static int alps_poll(struct psmouse *psmouse)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int alps_hw_init(struct psmouse *psmouse)</div><div class='add'>+static int alps_hw_init_v1_v2(struct psmouse *psmouse)</div><div class='ctx'> {</div><div class='ctx'> 	struct alps_data *priv = psmouse-&gt;private;</div><div class='ctx'> 	const struct alps_model_info *model = priv-&gt;i;</div><div class='ctx'> </div><div class='ctx'> 	if ((model-&gt;flags &amp; ALPS_PASS) &amp;&amp;</div><div class='del'>-	    alps_passthrough_mode(psmouse, true)) {</div><div class='add'>+	    alps_passthrough_mode_v2(psmouse, true)) {</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -607,13 +1167,13 @@ static int alps_hw_init(struct psmouse *psmouse)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (alps_absolute_mode(psmouse)) {</div><div class='add'>+	if (alps_absolute_mode_v1_v2(psmouse)) {</div><div class='ctx'> 		psmouse_err(psmouse, "Failed to enable absolute mode\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((model-&gt;flags &amp; ALPS_PASS) &amp;&amp;</div><div class='del'>-	    alps_passthrough_mode(psmouse, false)) {</div><div class='add'>+	    alps_passthrough_mode_v2(psmouse, false)) {</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -626,6 +1186,297 @@ static int alps_hw_init(struct psmouse *psmouse)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Enable or disable passthrough mode to the trackstick. Must be in</div><div class='add'>+ * command mode when calling this function.</div><div class='add'>+ */</div><div class='add'>+static int alps_passthrough_mode_v3(struct psmouse *psmouse, bool enable)</div><div class='add'>+{</div><div class='add'>+	int reg_val;</div><div class='add'>+</div><div class='add'>+	reg_val = alps_command_mode_read_reg(psmouse, 0x0008);</div><div class='add'>+	if (reg_val == -1)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		reg_val |= 0x01;</div><div class='add'>+	else</div><div class='add'>+		reg_val &amp;= ~0x01;</div><div class='add'>+</div><div class='add'>+	if (__alps_command_mode_write_reg(psmouse, reg_val))</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'>+/* Must be in command mode when calling this function */</div><div class='add'>+static int alps_absolute_mode_v3(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	int reg_val;</div><div class='add'>+</div><div class='add'>+	reg_val = alps_command_mode_read_reg(psmouse, 0x0004);</div><div class='add'>+	if (reg_val == -1)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	reg_val |= 0x06;</div><div class='add'>+	if (__alps_command_mode_write_reg(psmouse, reg_val))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alps_hw_init_v3(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	struct alps_data *priv = psmouse-&gt;private;</div><div class='add'>+	struct ps2dev *ps2dev = &amp;psmouse-&gt;ps2dev;</div><div class='add'>+	int reg_val;</div><div class='add'>+	unsigned char param[4];</div><div class='add'>+</div><div class='add'>+	priv-&gt;nibble_commands = alps_v3_nibble_commands;</div><div class='add'>+	priv-&gt;addr_command = PSMOUSE_CMD_RESET_WRAP;</div><div class='add'>+</div><div class='add'>+	if (alps_enter_command_mode(psmouse, NULL))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* Check for trackstick */</div><div class='add'>+	reg_val = alps_command_mode_read_reg(psmouse, 0x0008);</div><div class='add'>+	if (reg_val == -1)</div><div class='add'>+		goto error;</div><div class='add'>+	if (reg_val &amp; 0x80) {</div><div class='add'>+		if (alps_passthrough_mode_v3(psmouse, true))</div><div class='add'>+			goto error;</div><div class='add'>+		if (alps_exit_command_mode(psmouse))</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * E7 report for the trackstick</div><div class='add'>+		 *</div><div class='add'>+		 * There have been reports of failures to seem to trace back</div><div class='add'>+		 * to the above trackstick check failing. When these occur</div><div class='add'>+		 * this E7 report fails, so when that happens we continue</div><div class='add'>+		 * with the assumption that there isn't a trackstick after</div><div class='add'>+		 * all.</div><div class='add'>+		 */</div><div class='add'>+		param[0] = 0x64;</div><div class='add'>+		if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE21) ||</div><div class='add'>+		    ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE21) ||</div><div class='add'>+		    ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE21) ||</div><div class='add'>+		    ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO)) {</div><div class='add'>+			psmouse_warn(psmouse, "trackstick E7 report failed\n");</div><div class='add'>+		} else {</div><div class='add'>+			psmouse_dbg(psmouse,</div><div class='add'>+				    "trackstick E7 report: %2.2x %2.2x %2.2x\n",</div><div class='add'>+				    param[0], param[1], param[2]);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Not sure what this does, but it is absolutely</div><div class='add'>+			 * essential. Without it, the touchpad does not</div><div class='add'>+			 * work at all and the trackstick just emits normal</div><div class='add'>+			 * PS/2 packets.</div><div class='add'>+			 */</div><div class='add'>+			if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE11) ||</div><div class='add'>+			    ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE11) ||</div><div class='add'>+			    ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE11) ||</div><div class='add'>+			    alps_command_mode_send_nibble(psmouse, 0x9) ||</div><div class='add'>+			    alps_command_mode_send_nibble(psmouse, 0x4)) {</div><div class='add'>+				psmouse_err(psmouse,</div><div class='add'>+					    "Error sending magic E6 sequence\n");</div><div class='add'>+				goto error_passthrough;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (alps_enter_command_mode(psmouse, NULL))</div><div class='add'>+			goto error_passthrough;</div><div class='add'>+		if (alps_passthrough_mode_v3(psmouse, false))</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (alps_absolute_mode_v3(psmouse)) {</div><div class='add'>+		psmouse_err(psmouse, "Failed to enter absolute mode\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg_val = alps_command_mode_read_reg(psmouse, 0x0006);</div><div class='add'>+	if (reg_val == -1)</div><div class='add'>+		goto error;</div><div class='add'>+	if (__alps_command_mode_write_reg(psmouse, reg_val | 0x01))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	reg_val = alps_command_mode_read_reg(psmouse, 0x0007);</div><div class='add'>+	if (reg_val == -1)</div><div class='add'>+		goto error;</div><div class='add'>+	if (__alps_command_mode_write_reg(psmouse, reg_val | 0x01))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (alps_command_mode_read_reg(psmouse, 0x0144) == -1)</div><div class='add'>+		goto error;</div><div class='add'>+	if (__alps_command_mode_write_reg(psmouse, 0x04))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (alps_command_mode_read_reg(psmouse, 0x0159) == -1)</div><div class='add'>+		goto error;</div><div class='add'>+	if (__alps_command_mode_write_reg(psmouse, 0x03))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (alps_command_mode_read_reg(psmouse, 0x0163) == -1)</div><div class='add'>+		goto error;</div><div class='add'>+	if (alps_command_mode_write_reg(psmouse, 0x0163, 0x03))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (alps_command_mode_read_reg(psmouse, 0x0162) == -1)</div><div class='add'>+		goto error;</div><div class='add'>+	if (alps_command_mode_write_reg(psmouse, 0x0162, 0x04))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This ensures the trackstick packets are in the format</div><div class='add'>+	 * supported by this driver. If bit 1 isn't set the packet</div><div class='add'>+	 * format is different.</div><div class='add'>+	 */</div><div class='add'>+	if (alps_command_mode_write_reg(psmouse, 0x0008, 0x82))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	alps_exit_command_mode(psmouse);</div><div class='add'>+</div><div class='add'>+	/* Set rate and enable data reporting */</div><div class='add'>+	param[0] = 0x64;</div><div class='add'>+	if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE) ||</div><div class='add'>+	    ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE)) {</div><div class='add'>+		psmouse_err(psmouse, "Failed to enable data reporting\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'>+error_passthrough:</div><div class='add'>+	/* Something failed while in passthrough mode, so try to get out */</div><div class='add'>+	if (!alps_enter_command_mode(psmouse, NULL))</div><div class='add'>+		alps_passthrough_mode_v3(psmouse, false);</div><div class='add'>+error:</div><div class='add'>+	/*</div><div class='add'>+	 * Leaving the touchpad in command mode will essentially render</div><div class='add'>+	 * it unusable until the machine reboots, so exit it here just</div><div class='add'>+	 * to be safe</div><div class='add'>+	 */</div><div class='add'>+	alps_exit_command_mode(psmouse);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Must be in command mode when calling this function */</div><div class='add'>+static int alps_absolute_mode_v4(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	int reg_val;</div><div class='add'>+</div><div class='add'>+	reg_val = alps_command_mode_read_reg(psmouse, 0x0004);</div><div class='add'>+	if (reg_val == -1)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	reg_val |= 0x02;</div><div class='add'>+	if (__alps_command_mode_write_reg(psmouse, reg_val))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alps_hw_init_v4(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	struct alps_data *priv = psmouse-&gt;private;</div><div class='add'>+	struct ps2dev *ps2dev = &amp;psmouse-&gt;ps2dev;</div><div class='add'>+	unsigned char param[4];</div><div class='add'>+</div><div class='add'>+	priv-&gt;nibble_commands = alps_v4_nibble_commands;</div><div class='add'>+	priv-&gt;addr_command = PSMOUSE_CMD_DISABLE;</div><div class='add'>+</div><div class='add'>+	if (alps_enter_command_mode(psmouse, NULL))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (alps_absolute_mode_v4(psmouse)) {</div><div class='add'>+		psmouse_err(psmouse, "Failed to enter absolute mode\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (alps_command_mode_write_reg(psmouse, 0x0007, 0x8c))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (alps_command_mode_write_reg(psmouse, 0x0149, 0x03))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (alps_command_mode_write_reg(psmouse, 0x0160, 0x03))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (alps_command_mode_write_reg(psmouse, 0x017f, 0x15))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (alps_command_mode_write_reg(psmouse, 0x0151, 0x01))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (alps_command_mode_write_reg(psmouse, 0x0168, 0x03))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (alps_command_mode_write_reg(psmouse, 0x014a, 0x03))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (alps_command_mode_write_reg(psmouse, 0x0161, 0x03))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	alps_exit_command_mode(psmouse);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This sequence changes the output from a 9-byte to an</div><div class='add'>+	 * 8-byte format. All the same data seems to be present,</div><div class='add'>+	 * just in a more compact format.</div><div class='add'>+	 */</div><div class='add'>+	param[0] = 0xc8;</div><div class='add'>+	param[1] = 0x64;</div><div class='add'>+	param[2] = 0x50;</div><div class='add'>+	if (ps2_command(ps2dev, &amp;param[0], PSMOUSE_CMD_SETRATE) ||</div><div class='add'>+	    ps2_command(ps2dev, &amp;param[1], PSMOUSE_CMD_SETRATE) ||</div><div class='add'>+	    ps2_command(ps2dev, &amp;param[2], PSMOUSE_CMD_SETRATE) ||</div><div class='add'>+	    ps2_command(ps2dev, param, PSMOUSE_CMD_GETID))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* Set rate and enable data reporting */</div><div class='add'>+	param[0] = 0x64;</div><div class='add'>+	if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE) ||</div><div class='add'>+	    ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE)) {</div><div class='add'>+		psmouse_err(psmouse, "Failed to enable data reporting\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'>+error:</div><div class='add'>+	/*</div><div class='add'>+	 * Leaving the touchpad in command mode will essentially render</div><div class='add'>+	 * it unusable until the machine reboots, so exit it here just</div><div class='add'>+	 * to be safe</div><div class='add'>+	 */</div><div class='add'>+	alps_exit_command_mode(psmouse);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alps_hw_init(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	struct alps_data *priv = psmouse-&gt;private;</div><div class='add'>+	const struct alps_model_info *model = priv-&gt;i;</div><div class='add'>+	int ret = -1;</div><div class='add'>+</div><div class='add'>+	switch (model-&gt;proto_version) {</div><div class='add'>+	case ALPS_PROTO_V1:</div><div class='add'>+	case ALPS_PROTO_V2:</div><div class='add'>+		ret = alps_hw_init_v1_v2(psmouse);</div><div class='add'>+		break;</div><div class='add'>+	case ALPS_PROTO_V3:</div><div class='add'>+		ret = alps_hw_init_v3(psmouse);</div><div class='add'>+		break;</div><div class='add'>+	case ALPS_PROTO_V4:</div><div class='add'>+		ret = alps_hw_init_v4(psmouse);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int alps_reconnect(struct psmouse *psmouse)</div><div class='ctx'> {</div><div class='ctx'> 	const struct alps_model_info *model;</div><div class='hunk'>@@ -666,6 +1517,8 @@ int alps_init(struct psmouse *psmouse)</div><div class='ctx'> </div><div class='ctx'> 	psmouse-&gt;private = priv;</div><div class='ctx'> </div><div class='add'>+	psmouse_reset(psmouse);</div><div class='add'>+</div><div class='ctx'> 	model = alps_get_model(psmouse, &amp;version);</div><div class='ctx'> 	if (!model)</div><div class='ctx'> 		goto init_fail;</div><div class='hunk'>@@ -693,8 +1546,29 @@ int alps_init(struct psmouse *psmouse)</div><div class='ctx'> 		BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_RIGHT);</div><div class='ctx'> </div><div class='ctx'> 	dev1-&gt;evbit[BIT_WORD(EV_ABS)] |= BIT_MASK(EV_ABS);</div><div class='del'>-	input_set_abs_params(dev1, ABS_X, 0, 1023, 0, 0);</div><div class='del'>-	input_set_abs_params(dev1, ABS_Y, 0, 767, 0, 0);</div><div class='add'>+</div><div class='add'>+	switch (model-&gt;proto_version) {</div><div class='add'>+	case ALPS_PROTO_V1:</div><div class='add'>+	case ALPS_PROTO_V2:</div><div class='add'>+		input_set_abs_params(dev1, ABS_X, 0, 1023, 0, 0);</div><div class='add'>+		input_set_abs_params(dev1, ABS_Y, 0, 767, 0, 0);</div><div class='add'>+		break;</div><div class='add'>+	case ALPS_PROTO_V3:</div><div class='add'>+		set_bit(INPUT_PROP_SEMI_MT, dev1-&gt;propbit);</div><div class='add'>+		input_mt_init_slots(dev1, 2);</div><div class='add'>+		input_set_abs_params(dev1, ABS_MT_POSITION_X, 0, ALPS_V3_X_MAX, 0, 0);</div><div class='add'>+		input_set_abs_params(dev1, ABS_MT_POSITION_Y, 0, ALPS_V3_Y_MAX, 0, 0);</div><div class='add'>+</div><div class='add'>+		set_bit(BTN_TOOL_DOUBLETAP, dev1-&gt;keybit);</div><div class='add'>+		set_bit(BTN_TOOL_TRIPLETAP, dev1-&gt;keybit);</div><div class='add'>+		set_bit(BTN_TOOL_QUADTAP, dev1-&gt;keybit);</div><div class='add'>+		/* fall through */</div><div class='add'>+	case ALPS_PROTO_V4:</div><div class='add'>+		input_set_abs_params(dev1, ABS_X, 0, ALPS_V3_X_MAX, 0, 0);</div><div class='add'>+		input_set_abs_params(dev1, ABS_Y, 0, ALPS_V3_Y_MAX, 0, 0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	input_set_abs_params(dev1, ABS_PRESSURE, 0, 127, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (model-&gt;flags &amp; ALPS_WHEEL) {</div><div class='hunk'>@@ -737,7 +1611,7 @@ int alps_init(struct psmouse *psmouse)</div><div class='ctx'> 	psmouse-&gt;poll = alps_poll;</div><div class='ctx'> 	psmouse-&gt;disconnect = alps_disconnect;</div><div class='ctx'> 	psmouse-&gt;reconnect = alps_reconnect;</div><div class='del'>-	psmouse-&gt;pktsize = 6;</div><div class='add'>+	psmouse-&gt;pktsize = model-&gt;proto_version == ALPS_PROTO_V4 ? 8 : 6;</div><div class='ctx'> </div><div class='ctx'> 	/* We are having trouble resyncing ALPS touchpads so disable it for now */</div><div class='ctx'> 	psmouse-&gt;resync_time = 0;</div><div class='head'>diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h<br/>index 904ed8b3c8be..a00a4ab92a0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/alps.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/alps.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/alps.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/mouse/alps.h</a></div><div class='hunk'>@@ -12,20 +12,39 @@</div><div class='ctx'> #ifndef _ALPS_H</div><div class='ctx'> #define _ALPS_H</div><div class='ctx'> </div><div class='add'>+#define ALPS_PROTO_V1	0</div><div class='add'>+#define ALPS_PROTO_V2	1</div><div class='add'>+#define ALPS_PROTO_V3	2</div><div class='add'>+#define ALPS_PROTO_V4	3</div><div class='add'>+</div><div class='ctx'> struct alps_model_info {</div><div class='ctx'>         unsigned char signature[3];</div><div class='add'>+	unsigned char command_mode_resp; /* v3/v4 only */</div><div class='add'>+	unsigned char proto_version;</div><div class='ctx'>         unsigned char byte0, mask0;</div><div class='ctx'>         unsigned char flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct alps_nibble_commands {</div><div class='add'>+	int command;</div><div class='add'>+	unsigned char data;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct alps_data {</div><div class='ctx'> 	struct input_dev *dev2;		/* Relative device */</div><div class='ctx'> 	char phys[32];			/* Phys */</div><div class='ctx'> 	const struct alps_model_info *i;/* Info */</div><div class='add'>+	const struct alps_nibble_commands *nibble_commands;</div><div class='add'>+	int addr_command;		/* Command to set register address */</div><div class='ctx'> 	int prev_fin;			/* Finger bit from previous packet */</div><div class='add'>+	int multi_packet;		/* Multi-packet data in progress */</div><div class='add'>+	unsigned char multi_data[6];	/* Saved multi-packet data */</div><div class='add'>+	u8 quirks;</div><div class='ctx'> 	struct timer_list timer;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define ALPS_QUIRK_TRACKSTICK_BUTTONS	1 /* trakcstick buttons in trackstick packet */</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_MOUSE_PS2_ALPS</div><div class='ctx'> int alps_detect(struct psmouse *psmouse, bool set_properties);</div><div class='ctx'> int alps_init(struct psmouse *psmouse);</div><div class='head'>diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c<br/>index b77f9991278e..0acbc7d50d05 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/appletouch.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/appletouch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/appletouch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/mouse/appletouch.c</a></div><div class='hunk'>@@ -938,15 +938,4 @@ static struct usb_driver atp_driver = {</div><div class='ctx'> 	.id_table	= atp_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init atp_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;atp_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit atp_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;atp_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(atp_init);</div><div class='del'>-module_exit(atp_exit);</div><div class='add'>+module_usb_driver(atp_driver);</div><div class='head'>diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c<br/>index 5ec617e28f7e..927e479c2649 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/bcm5974.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/bcm5974.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/bcm5974.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/mouse/bcm5974.c</a></div><div class='hunk'>@@ -433,6 +433,9 @@ static void setup_events_to_report(struct input_dev *input_dev,</div><div class='ctx'> 	__set_bit(BTN_TOOL_QUADTAP, input_dev-&gt;keybit);</div><div class='ctx'> 	__set_bit(BTN_LEFT, input_dev-&gt;keybit);</div><div class='ctx'> </div><div class='add'>+	if (cfg-&gt;caps &amp; HAS_INTEGRATED_BUTTON)</div><div class='add'>+		__set_bit(INPUT_PROP_BUTTONPAD, input_dev-&gt;propbit);</div><div class='add'>+</div><div class='ctx'> 	input_set_events_per_packet(input_dev, 60);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -940,16 +943,4 @@ static struct usb_driver bcm5974_driver = {</div><div class='ctx'> 	.supports_autosuspend	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init bcm5974_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;bcm5974_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit bcm5974_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;bcm5974_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(bcm5974_init);</div><div class='del'>-module_exit(bcm5974_exit);</div><div class='del'>-</div><div class='add'>+module_usb_driver(bcm5974_driver);</div><div class='head'>diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c<br/>index e2a9867c19d5..d2c0db159b18 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/elantech.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/elantech.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/elantech.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/mouse/elantech.c</a></div><div class='hunk'>@@ -43,6 +43,24 @@ static int synaptics_send_cmd(struct psmouse *psmouse, unsigned char c,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * V3 and later support this fast command</div><div class='add'>+ */</div><div class='add'>+static int elantech_send_cmd(struct psmouse *psmouse, unsigned char c,</div><div class='add'>+				unsigned char *param)</div><div class='add'>+{</div><div class='add'>+	struct ps2dev *ps2dev = &amp;psmouse-&gt;ps2dev;</div><div class='add'>+</div><div class='add'>+	if (ps2_command(ps2dev, NULL, ETP_PS2_CUSTOM_COMMAND) ||</div><div class='add'>+	    ps2_command(ps2dev, NULL, c) ||</div><div class='add'>+	    ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO)) {</div><div class='add'>+		psmouse_err(psmouse, "%s query 0x%02x failed.\n", __func__, c);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * A retrying version of ps2_command</div><div class='ctx'>  */</div><div class='ctx'> static int elantech_ps2_command(struct psmouse *psmouse,</div><div class='hunk'>@@ -863,13 +881,13 @@ static int elantech_set_range(struct psmouse *psmouse,</div><div class='ctx'> 			i = (etd-&gt;fw_version &gt; 0x020800 &amp;&amp;</div><div class='ctx'> 			     etd-&gt;fw_version &lt; 0x020900) ? 1 : 2;</div><div class='ctx'> </div><div class='del'>-			if (synaptics_send_cmd(psmouse, ETP_FW_ID_QUERY, param))</div><div class='add'>+			if (etd-&gt;send_cmd(psmouse, ETP_FW_ID_QUERY, param))</div><div class='ctx'> 				return -1;</div><div class='ctx'> </div><div class='ctx'> 			fixed_dpi = param[1] &amp; 0x10;</div><div class='ctx'> </div><div class='ctx'> 			if (((etd-&gt;fw_version &gt;&gt; 16) == 0x14) &amp;&amp; fixed_dpi) {</div><div class='del'>-				if (synaptics_send_cmd(psmouse, ETP_SAMPLE_QUERY, param))</div><div class='add'>+				if (etd-&gt;send_cmd(psmouse, ETP_SAMPLE_QUERY, param))</div><div class='ctx'> 					return -1;</div><div class='ctx'> </div><div class='ctx'> 				*x_max = (etd-&gt;capabilities[1] - i) * param[1] / 2;</div><div class='hunk'>@@ -888,7 +906,7 @@ static int elantech_set_range(struct psmouse *psmouse,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 3:</div><div class='del'>-		if (synaptics_send_cmd(psmouse, ETP_FW_ID_QUERY, param))</div><div class='add'>+		if (etd-&gt;send_cmd(psmouse, ETP_FW_ID_QUERY, param))</div><div class='ctx'> 			return -1;</div><div class='ctx'> </div><div class='ctx'> 		*x_max = (0x0f &amp; param[0]) &lt;&lt; 8 | param[1];</div><div class='hunk'>@@ -896,7 +914,7 @@ static int elantech_set_range(struct psmouse *psmouse,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 4:</div><div class='del'>-		if (synaptics_send_cmd(psmouse, ETP_FW_ID_QUERY, param))</div><div class='add'>+		if (etd-&gt;send_cmd(psmouse, ETP_FW_ID_QUERY, param))</div><div class='ctx'> 			return -1;</div><div class='ctx'> </div><div class='ctx'> 		*x_max = (0x0f &amp; param[0]) &lt;&lt; 8 | param[1];</div><div class='hunk'>@@ -913,6 +931,30 @@ static int elantech_set_range(struct psmouse *psmouse,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * (value from firmware) * 10 + 790 = dpi</div><div class='add'>+ * we also have to convert dpi to dots/mm (*10/254 to avoid floating point)</div><div class='add'>+ */</div><div class='add'>+static unsigned int elantech_convert_res(unsigned int val)</div><div class='add'>+{</div><div class='add'>+	return (val * 10 + 790) * 10 / 254;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int elantech_get_resolution_v4(struct psmouse *psmouse,</div><div class='add'>+				      unsigned int *x_res,</div><div class='add'>+				      unsigned int *y_res)</div><div class='add'>+{</div><div class='add'>+	unsigned char param[3];</div><div class='add'>+</div><div class='add'>+	if (elantech_send_cmd(psmouse, ETP_RESOLUTION_QUERY, param))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	*x_res = elantech_convert_res(param[1] &amp; 0x0f);</div><div class='add'>+	*y_res = elantech_convert_res((param[1] &amp; 0xf0) &gt;&gt; 4);</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 appropriate event bits for the input subsystem</div><div class='ctx'>  */</div><div class='ctx'> static int elantech_set_input_params(struct psmouse *psmouse)</div><div class='hunk'>@@ -920,6 +962,7 @@ static int elantech_set_input_params(struct psmouse *psmouse)</div><div class='ctx'> 	struct input_dev *dev = psmouse-&gt;dev;</div><div class='ctx'> 	struct elantech_data *etd = psmouse-&gt;private;</div><div class='ctx'> 	unsigned int x_min = 0, y_min = 0, x_max = 0, y_max = 0, width = 0;</div><div class='add'>+	unsigned int x_res = 0, y_res = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (elantech_set_range(psmouse, &amp;x_min, &amp;y_min, &amp;x_max, &amp;y_max, &amp;width))</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -967,10 +1010,20 @@ static int elantech_set_input_params(struct psmouse *psmouse)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 4:</div><div class='add'>+		if (elantech_get_resolution_v4(psmouse, &amp;x_res, &amp;y_res)) {</div><div class='add'>+			/*</div><div class='add'>+			 * if query failed, print a warning and leave the values</div><div class='add'>+			 * zero to resemble synaptics.c behavior.</div><div class='add'>+			 */</div><div class='add'>+			psmouse_warn(psmouse, "couldn't query resolution data.\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		__set_bit(BTN_TOOL_QUADTAP, dev-&gt;keybit);</div><div class='ctx'> 		/* For X to recognize me as touchpad. */</div><div class='ctx'> 		input_set_abs_params(dev, ABS_X, x_min, x_max, 0, 0);</div><div class='ctx'> 		input_set_abs_params(dev, ABS_Y, y_min, y_max, 0, 0);</div><div class='add'>+		input_abs_set_res(dev, ABS_X, x_res);</div><div class='add'>+		input_abs_set_res(dev, ABS_Y, y_res);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * range of pressure and width is the same as v2,</div><div class='ctx'> 		 * report ABS_PRESSURE, ABS_TOOL_WIDTH for compatibility.</div><div class='hunk'>@@ -983,6 +1036,8 @@ static int elantech_set_input_params(struct psmouse *psmouse)</div><div class='ctx'> 		input_mt_init_slots(dev, ETP_MAX_FINGERS);</div><div class='ctx'> 		input_set_abs_params(dev, ABS_MT_POSITION_X, x_min, x_max, 0, 0);</div><div class='ctx'> 		input_set_abs_params(dev, ABS_MT_POSITION_Y, y_min, y_max, 0, 0);</div><div class='add'>+		input_abs_set_res(dev, ABS_MT_POSITION_X, x_res);</div><div class='add'>+		input_abs_set_res(dev, ABS_MT_POSITION_Y, y_res);</div><div class='ctx'> 		input_set_abs_params(dev, ABS_MT_PRESSURE, ETP_PMIN_V2,</div><div class='ctx'> 				     ETP_PMAX_V2, 0, 0);</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1031,16 +1086,13 @@ static ssize_t elantech_set_int_attr(struct psmouse *psmouse,</div><div class='ctx'> 	struct elantech_data *etd = psmouse-&gt;private;</div><div class='ctx'> 	struct elantech_attr_data *attr = data;</div><div class='ctx'> 	unsigned char *reg = (unsigned char *) etd + attr-&gt;field_offset;</div><div class='del'>-	unsigned long value;</div><div class='add'>+	unsigned char value;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtoul(buf, 16, &amp;value);</div><div class='add'>+	err = kstrtou8(buf, 16, &amp;value);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (value &gt; 0xff)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	/* Do we need to preserve some bits for version 2 hardware too? */</div><div class='ctx'> 	if (etd-&gt;hw_version == 1) {</div><div class='ctx'> 		if (attr-&gt;reg == 0x10)</div><div class='hunk'>@@ -1233,9 +1285,11 @@ static int elantech_set_properties(struct elantech_data *etd)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Turn on packet checking by default.</div><div class='del'>-	 */</div><div class='add'>+	/* decide which send_cmd we're gonna use early */</div><div class='add'>+	etd-&gt;send_cmd = etd-&gt;hw_version &gt;= 3 ? elantech_send_cmd :</div><div class='add'>+					       synaptics_send_cmd;</div><div class='add'>+</div><div class='add'>+	/* Turn on packet checking by default */</div><div class='ctx'> 	etd-&gt;paritycheck = 1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1291,7 +1345,7 @@ int elantech_init(struct psmouse *psmouse)</div><div class='ctx'> 		     "assuming hardware version %d (with firmware version 0x%02x%02x%02x)\n",</div><div class='ctx'> 		     etd-&gt;hw_version, param[0], param[1], param[2]);</div><div class='ctx'> </div><div class='del'>-	if (synaptics_send_cmd(psmouse, ETP_CAPABILITIES_QUERY,</div><div class='add'>+	if (etd-&gt;send_cmd(psmouse, ETP_CAPABILITIES_QUERY,</div><div class='ctx'> 	    etd-&gt;capabilities)) {</div><div class='ctx'> 		psmouse_err(psmouse, "failed to query capabilities.\n");</div><div class='ctx'> 		goto init_fail;</div><div class='head'>diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h<br/>index 9e5f1aabea7e..46db3be45ac9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/elantech.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/elantech.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/elantech.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/mouse/elantech.h</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #define ETP_FW_VERSION_QUERY		0x01</div><div class='ctx'> #define ETP_CAPABILITIES_QUERY		0x02</div><div class='ctx'> #define ETP_SAMPLE_QUERY		0x03</div><div class='add'>+#define ETP_RESOLUTION_QUERY		0x04</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Command values for register reading or writing</div><div class='hunk'>@@ -135,6 +136,7 @@ struct elantech_data {</div><div class='ctx'> 	unsigned int width;</div><div class='ctx'> 	struct finger_pos mt[ETP_MAX_FINGERS];</div><div class='ctx'> 	unsigned char parity[256];</div><div class='add'>+	int (*send_cmd)(struct psmouse *psmouse, unsigned char c, unsigned char *param);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MOUSE_PS2_ELANTECH</div><div class='head'>diff --git a/drivers/input/mouse/gpio_mouse.c b/drivers/input/mouse/gpio_mouse.c<br/>index 58902fbb9896..a9ad8e1402be 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/gpio_mouse.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/gpio_mouse.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/gpio_mouse.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/mouse/gpio_mouse.c</a></div><div class='hunk'>@@ -178,18 +178,7 @@ static struct platform_driver gpio_mouse_device_driver = {</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init gpio_mouse_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;gpio_mouse_device_driver);</div><div class='del'>-}</div><div class='del'>-module_init(gpio_mouse_init);</div><div class='del'>-</div><div class='del'>-static void __exit gpio_mouse_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;gpio_mouse_device_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(gpio_mouse_exit);</div><div class='add'>+module_platform_driver(gpio_mouse_device_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Hans-Christian Egtvedt &lt;egtvedt@samfundet.no&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("GPIO mouse driver");</div><div class='head'>diff --git a/drivers/input/mouse/hgpk.c b/drivers/input/mouse/hgpk.c<br/>index 0470dd46b566..1c5d521de600 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/hgpk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/hgpk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/hgpk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/mouse/hgpk.c</a></div><div class='hunk'>@@ -789,11 +789,14 @@ static ssize_t hgpk_set_powered(struct psmouse *psmouse, void *data,</div><div class='ctx'> 				const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct hgpk_data *priv = psmouse-&gt;private;</div><div class='del'>-	unsigned long value;</div><div class='add'>+	unsigned int value;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtoul(buf, 10, &amp;value);</div><div class='del'>-	if (err || value &gt; 1)</div><div class='add'>+	err = kstrtouint(buf, 10, &amp;value);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (value &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (value != priv-&gt;powered) {</div><div class='hunk'>@@ -881,11 +884,14 @@ static ssize_t hgpk_trigger_recal(struct psmouse *psmouse, void *data,</div><div class='ctx'> 				const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct hgpk_data *priv = psmouse-&gt;private;</div><div class='del'>-	unsigned long value;</div><div class='add'>+	unsigned int value;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = strict_strtoul(buf, 10, &amp;value);</div><div class='del'>-	if (err || value != 1)</div><div class='add'>+	err = kstrtouint(buf, 10, &amp;value);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (value != 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c<br/>index faac2c3bef74..84de2fc6acc1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/logips2pp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/logips2pp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/logips2pp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/mouse/logips2pp.c</a></div><div class='hunk'>@@ -155,9 +155,14 @@ static ssize_t ps2pp_attr_show_smartscroll(struct psmouse *psmouse,</div><div class='ctx'> static ssize_t ps2pp_attr_set_smartscroll(struct psmouse *psmouse, void *data,</div><div class='ctx'> 					  const char *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	unsigned long value;</div><div class='add'>+	unsigned int value;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;value) || value &gt; 1)</div><div class='add'>+	err = kstrtouint(buf, 10, &amp;value);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (value &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ps2pp_set_smartscroll(psmouse, value);</div><div class='head'>diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c<br/>index 9f352fbd7b4f..e6c9931f02c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/psmouse-base.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/psmouse-base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/psmouse-base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/mouse/psmouse-base.c</a></div><div class='hunk'>@@ -60,7 +60,7 @@ static unsigned int psmouse_rate = 100;</div><div class='ctx'> module_param_named(rate, psmouse_rate, uint, 0644);</div><div class='ctx'> MODULE_PARM_DESC(rate, "Report rate, in reports per second.");</div><div class='ctx'> </div><div class='del'>-static unsigned int psmouse_smartscroll = 1;</div><div class='add'>+static bool psmouse_smartscroll = 1;</div><div class='ctx'> module_param_named(smartscroll, psmouse_smartscroll, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(smartscroll, "Logitech Smartscroll autorepeat, 1 = enabled (default), 0 = disabled.");</div><div class='ctx'> </div><div class='hunk'>@@ -127,7 +127,7 @@ struct psmouse_protocol {</div><div class='ctx'>  * relevant events to the input module once full packet has arrived.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse)</div><div class='add'>+psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse)</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *dev = psmouse-&gt;dev;</div><div class='ctx'> 	unsigned char *packet = psmouse-&gt;packet;</div><div class='hunk'>@@ -418,6 +418,49 @@ int psmouse_reset(struct psmouse *psmouse)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Here we set the mouse resolution.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void psmouse_set_resolution(struct psmouse *psmouse, unsigned int resolution)</div><div class='add'>+{</div><div class='add'>+	static const unsigned char params[] = { 0, 1, 2, 2, 3 };</div><div class='add'>+	unsigned char p;</div><div class='add'>+</div><div class='add'>+	if (resolution == 0 || resolution &gt; 200)</div><div class='add'>+		resolution = 200;</div><div class='add'>+</div><div class='add'>+	p = params[resolution / 50];</div><div class='add'>+	ps2_command(&amp;psmouse-&gt;ps2dev, &amp;p, PSMOUSE_CMD_SETRES);</div><div class='add'>+	psmouse-&gt;resolution = 25 &lt;&lt; p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Here we set the mouse report rate.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void psmouse_set_rate(struct psmouse *psmouse, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	static const unsigned char rates[] = { 200, 100, 80, 60, 40, 20, 10, 0 };</div><div class='add'>+	unsigned char r;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	while (rates[i] &gt; rate) i++;</div><div class='add'>+	r = rates[i];</div><div class='add'>+	ps2_command(&amp;psmouse-&gt;ps2dev, &amp;r, PSMOUSE_CMD_SETRATE);</div><div class='add'>+	psmouse-&gt;rate = r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * psmouse_poll() - default poll handler. Everyone except for ALPS uses it.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int psmouse_poll(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	return ps2_command(&amp;psmouse-&gt;ps2dev, psmouse-&gt;packet,</div><div class='add'>+			   PSMOUSE_CMD_POLL | (psmouse-&gt;pktsize &lt;&lt; 8));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Genius NetMouse magic init.</div><div class='hunk'>@@ -603,6 +646,56 @@ static int cortron_detect(struct psmouse *psmouse, bool set_properties)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Apply default settings to the psmouse structure. Most of them will</div><div class='add'>+ * be overridden by individual protocol initialization routines.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void psmouse_apply_defaults(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	struct input_dev *input_dev = psmouse-&gt;dev;</div><div class='add'>+</div><div class='add'>+	memset(input_dev-&gt;evbit, 0, sizeof(input_dev-&gt;evbit));</div><div class='add'>+	memset(input_dev-&gt;keybit, 0, sizeof(input_dev-&gt;keybit));</div><div class='add'>+	memset(input_dev-&gt;relbit, 0, sizeof(input_dev-&gt;relbit));</div><div class='add'>+	memset(input_dev-&gt;absbit, 0, sizeof(input_dev-&gt;absbit));</div><div class='add'>+	memset(input_dev-&gt;mscbit, 0, sizeof(input_dev-&gt;mscbit));</div><div class='add'>+</div><div class='add'>+	__set_bit(EV_KEY, input_dev-&gt;evbit);</div><div class='add'>+	__set_bit(EV_REL, input_dev-&gt;evbit);</div><div class='add'>+</div><div class='add'>+	__set_bit(BTN_LEFT, input_dev-&gt;keybit);</div><div class='add'>+	__set_bit(BTN_RIGHT, input_dev-&gt;keybit);</div><div class='add'>+</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'>+</div><div class='add'>+	psmouse-&gt;set_rate = psmouse_set_rate;</div><div class='add'>+	psmouse-&gt;set_resolution = psmouse_set_resolution;</div><div class='add'>+	psmouse-&gt;poll = psmouse_poll;</div><div class='add'>+	psmouse-&gt;protocol_handler = psmouse_process_byte;</div><div class='add'>+	psmouse-&gt;pktsize = 3;</div><div class='add'>+	psmouse-&gt;reconnect = NULL;</div><div class='add'>+	psmouse-&gt;disconnect = NULL;</div><div class='add'>+	psmouse-&gt;cleanup = NULL;</div><div class='add'>+	psmouse-&gt;pt_activate = NULL;</div><div class='add'>+	psmouse-&gt;pt_deactivate = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Apply default settings to the psmouse structure and call specified</div><div class='add'>+ * protocol detection or initialization routine.</div><div class='add'>+ */</div><div class='add'>+static int psmouse_do_detect(int (*detect)(struct psmouse *psmouse,</div><div class='add'>+					   bool set_properties),</div><div class='add'>+			     struct psmouse *psmouse, bool set_properties)</div><div class='add'>+{</div><div class='add'>+	if (set_properties)</div><div class='add'>+		psmouse_apply_defaults(psmouse);</div><div class='add'>+</div><div class='add'>+	return detect(psmouse, set_properties);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * psmouse_extensions() probes for any extensions to the basic PS/2 protocol</div><div class='ctx'>  * the mouse may have.</div><div class='ctx'>  */</div><div class='hunk'>@@ -616,7 +709,7 @@ static int psmouse_extensions(struct psmouse *psmouse,</div><div class='ctx'>  * We always check for lifebook because it does not disturb mouse</div><div class='ctx'>  * (it only checks DMI information).</div><div class='ctx'>  */</div><div class='del'>-	if (lifebook_detect(psmouse, set_properties) == 0) {</div><div class='add'>+	if (psmouse_do_detect(lifebook_detect, psmouse, set_properties) == 0) {</div><div class='ctx'> 		if (max_proto &gt; PSMOUSE_IMEX) {</div><div class='ctx'> 			if (!set_properties || lifebook_init(psmouse) == 0)</div><div class='ctx'> 				return PSMOUSE_LIFEBOOK;</div><div class='hunk'>@@ -628,15 +721,18 @@ static int psmouse_extensions(struct psmouse *psmouse,</div><div class='ctx'>  * upsets the thinkingmouse).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-	if (max_proto &gt; PSMOUSE_IMEX &amp;&amp; thinking_detect(psmouse, set_properties) == 0)</div><div class='add'>+	if (max_proto &gt; PSMOUSE_IMEX &amp;&amp;</div><div class='add'>+	    psmouse_do_detect(thinking_detect, psmouse, set_properties) == 0) {</div><div class='ctx'> 		return PSMOUSE_THINKPS;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Try Synaptics TouchPad. Note that probing is done even if Synaptics protocol</div><div class='ctx'>  * support is disabled in config - we need to know if it is synaptics so we</div><div class='ctx'>  * can reset it properly after probing for intellimouse.</div><div class='ctx'>  */</div><div class='del'>-	if (max_proto &gt; PSMOUSE_PS2 &amp;&amp; synaptics_detect(psmouse, set_properties) == 0) {</div><div class='add'>+	if (max_proto &gt; PSMOUSE_PS2 &amp;&amp;</div><div class='add'>+	    psmouse_do_detect(synaptics_detect, psmouse, set_properties) == 0) {</div><div class='ctx'> 		synaptics_hardware = true;</div><div class='ctx'> </div><div class='ctx'> 		if (max_proto &gt; PSMOUSE_IMEX) {</div><div class='hunk'>@@ -667,7 +763,8 @@ static int psmouse_extensions(struct psmouse *psmouse,</div><div class='ctx'>  */</div><div class='ctx'> 	if (max_proto &gt; PSMOUSE_IMEX) {</div><div class='ctx'> 		ps2_command(&amp;psmouse-&gt;ps2dev, NULL, PSMOUSE_CMD_RESET_DIS);</div><div class='del'>-		if (alps_detect(psmouse, set_properties) == 0) {</div><div class='add'>+		if (psmouse_do_detect(alps_detect,</div><div class='add'>+				      psmouse, set_properties) == 0) {</div><div class='ctx'> 			if (!set_properties || alps_init(psmouse) == 0)</div><div class='ctx'> 				return PSMOUSE_ALPS;</div><div class='ctx'> /*</div><div class='hunk'>@@ -681,7 +778,7 @@ static int psmouse_extensions(struct psmouse *psmouse,</div><div class='ctx'>  * Try OLPC HGPK touchpad.</div><div class='ctx'>  */</div><div class='ctx'> 	if (max_proto &gt; PSMOUSE_IMEX &amp;&amp;</div><div class='del'>-			hgpk_detect(psmouse, set_properties) == 0) {</div><div class='add'>+	    psmouse_do_detect(hgpk_detect, psmouse, set_properties) == 0) {</div><div class='ctx'> 		if (!set_properties || hgpk_init(psmouse) == 0)</div><div class='ctx'> 			return PSMOUSE_HGPK;</div><div class='ctx'> /*</div><div class='hunk'>@@ -694,7 +791,7 @@ static int psmouse_extensions(struct psmouse *psmouse,</div><div class='ctx'>  * Try Elantech touchpad.</div><div class='ctx'>  */</div><div class='ctx'> 	if (max_proto &gt; PSMOUSE_IMEX &amp;&amp;</div><div class='del'>-			elantech_detect(psmouse, set_properties) == 0) {</div><div class='add'>+	    psmouse_do_detect(elantech_detect, psmouse, set_properties) == 0) {</div><div class='ctx'> 		if (!set_properties || elantech_init(psmouse) == 0)</div><div class='ctx'> 			return PSMOUSE_ELANTECH;</div><div class='ctx'> /*</div><div class='hunk'>@@ -703,18 +800,21 @@ static int psmouse_extensions(struct psmouse *psmouse,</div><div class='ctx'> 		max_proto = PSMOUSE_IMEX;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	if (max_proto &gt; PSMOUSE_IMEX) {</div><div class='del'>-		if (genius_detect(psmouse, set_properties) == 0)</div><div class='add'>+		if (psmouse_do_detect(genius_detect,</div><div class='add'>+				      psmouse, set_properties) == 0)</div><div class='ctx'> 			return PSMOUSE_GENPS;</div><div class='ctx'> </div><div class='del'>-		if (ps2pp_init(psmouse, set_properties) == 0)</div><div class='add'>+		if (psmouse_do_detect(ps2pp_init,</div><div class='add'>+				      psmouse, set_properties) == 0)</div><div class='ctx'> 			return PSMOUSE_PS2PP;</div><div class='ctx'> </div><div class='del'>-		if (trackpoint_detect(psmouse, set_properties) == 0)</div><div class='add'>+		if (psmouse_do_detect(trackpoint_detect,</div><div class='add'>+				      psmouse, set_properties) == 0)</div><div class='ctx'> 			return PSMOUSE_TRACKPOINT;</div><div class='ctx'> </div><div class='del'>-		if (touchkit_ps2_detect(psmouse, set_properties) == 0)</div><div class='add'>+		if (psmouse_do_detect(touchkit_ps2_detect,</div><div class='add'>+				      psmouse, set_properties) == 0)</div><div class='ctx'> 			return PSMOUSE_TOUCHKIT_PS2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -723,7 +823,8 @@ static int psmouse_extensions(struct psmouse *psmouse,</div><div class='ctx'>  * Trackpoint devices (causing TP_READ_ID command to time out).</div><div class='ctx'>  */</div><div class='ctx'> 	if (max_proto &gt; PSMOUSE_IMEX) {</div><div class='del'>-		if (fsp_detect(psmouse, set_properties) == 0) {</div><div class='add'>+		if (psmouse_do_detect(fsp_detect,</div><div class='add'>+				      psmouse, set_properties) == 0) {</div><div class='ctx'> 			if (!set_properties || fsp_init(psmouse) == 0)</div><div class='ctx'> 				return PSMOUSE_FSP;</div><div class='ctx'> /*</div><div class='hunk'>@@ -741,17 +842,23 @@ static int psmouse_extensions(struct psmouse *psmouse,</div><div class='ctx'> 	ps2_command(&amp;psmouse-&gt;ps2dev, NULL, PSMOUSE_CMD_RESET_DIS);</div><div class='ctx'> 	psmouse_reset(psmouse);</div><div class='ctx'> </div><div class='del'>-	if (max_proto &gt;= PSMOUSE_IMEX &amp;&amp; im_explorer_detect(psmouse, set_properties) == 0)</div><div class='add'>+	if (max_proto &gt;= PSMOUSE_IMEX &amp;&amp;</div><div class='add'>+	    psmouse_do_detect(im_explorer_detect,</div><div class='add'>+			      psmouse, set_properties) == 0) {</div><div class='ctx'> 		return PSMOUSE_IMEX;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (max_proto &gt;= PSMOUSE_IMPS &amp;&amp; intellimouse_detect(psmouse, set_properties) == 0)</div><div class='add'>+	if (max_proto &gt;= PSMOUSE_IMPS &amp;&amp;</div><div class='add'>+	    psmouse_do_detect(intellimouse_detect,</div><div class='add'>+			      psmouse, set_properties) == 0) {</div><div class='ctx'> 		return PSMOUSE_IMPS;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Okay, all failed, we have a standard mouse here. The number of the buttons</div><div class='ctx'>  * is still a question, though. We assume 3.</div><div class='ctx'>  */</div><div class='del'>-	ps2bare_detect(psmouse, set_properties);</div><div class='add'>+	psmouse_do_detect(ps2bare_detect, psmouse, set_properties);</div><div class='ctx'> </div><div class='ctx'> 	if (synaptics_hardware) {</div><div class='ctx'> /*</div><div class='hunk'>@@ -819,6 +926,13 @@ static const struct psmouse_protocol psmouse_protocols[] = {</div><div class='ctx'> 		.detect		= synaptics_detect,</div><div class='ctx'> 		.init		= synaptics_init,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.type		= PSMOUSE_SYNAPTICS_RELATIVE,</div><div class='add'>+		.name		= "SynRelPS/2",</div><div class='add'>+		.alias		= "synaptics-relative",</div><div class='add'>+		.detect		= synaptics_detect,</div><div class='add'>+		.init		= synaptics_init_relative,</div><div class='add'>+	},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_MOUSE_PS2_ALPS</div><div class='ctx'> 	{</div><div class='hunk'>@@ -958,39 +1072,6 @@ static int psmouse_probe(struct psmouse *psmouse)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Here we set the mouse resolution.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void psmouse_set_resolution(struct psmouse *psmouse, unsigned int resolution)</div><div class='del'>-{</div><div class='del'>-	static const unsigned char params[] = { 0, 1, 2, 2, 3 };</div><div class='del'>-	unsigned char p;</div><div class='del'>-</div><div class='del'>-	if (resolution == 0 || resolution &gt; 200)</div><div class='del'>-		resolution = 200;</div><div class='del'>-</div><div class='del'>-	p = params[resolution / 50];</div><div class='del'>-	ps2_command(&amp;psmouse-&gt;ps2dev, &amp;p, PSMOUSE_CMD_SETRES);</div><div class='del'>-	psmouse-&gt;resolution = 25 &lt;&lt; p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Here we set the mouse report rate.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void psmouse_set_rate(struct psmouse *psmouse, unsigned int rate)</div><div class='del'>-{</div><div class='del'>-	static const unsigned char rates[] = { 200, 100, 80, 60, 40, 20, 10, 0 };</div><div class='del'>-	unsigned char r;</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='del'>-	while (rates[i] &gt; rate) i++;</div><div class='del'>-	r = rates[i];</div><div class='del'>-	ps2_command(&amp;psmouse-&gt;ps2dev, &amp;r, PSMOUSE_CMD_SETRATE);</div><div class='del'>-	psmouse-&gt;rate = r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * psmouse_initialize() initializes the mouse to a sane state.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -1035,16 +1116,6 @@ static void psmouse_deactivate(struct psmouse *psmouse)</div><div class='ctx'> 	psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * psmouse_poll() - default poll handler. Everyone except for ALPS uses it.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int psmouse_poll(struct psmouse *psmouse)</div><div class='del'>-{</div><div class='del'>-	return ps2_command(&amp;psmouse-&gt;ps2dev, psmouse-&gt;packet,</div><div class='del'>-			   PSMOUSE_CMD_POLL | (psmouse-&gt;pktsize &lt;&lt; 8));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * psmouse_resync() attempts to re-validate current protocol.</div><div class='hunk'>@@ -1245,18 +1316,9 @@ static int psmouse_switch_protocol(struct psmouse *psmouse,</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;dev.parent = &amp;psmouse-&gt;ps2dev.serio-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	input_dev-&gt;evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);</div><div class='del'>-	input_dev-&gt;keybit[BIT_WORD(BTN_MOUSE)] =</div><div class='del'>-				BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_RIGHT);</div><div class='del'>-	input_dev-&gt;relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);</div><div class='del'>-</div><div class='del'>-	psmouse-&gt;set_rate = psmouse_set_rate;</div><div class='del'>-	psmouse-&gt;set_resolution = psmouse_set_resolution;</div><div class='del'>-	psmouse-&gt;poll = psmouse_poll;</div><div class='del'>-	psmouse-&gt;protocol_handler = psmouse_process_byte;</div><div class='del'>-	psmouse-&gt;pktsize = 3;</div><div class='del'>-</div><div class='ctx'> 	if (proto &amp;&amp; (proto-&gt;detect || proto-&gt;init)) {</div><div class='add'>+		psmouse_apply_defaults(psmouse);</div><div class='add'>+</div><div class='ctx'> 		if (proto-&gt;detect &amp;&amp; proto-&gt;detect(psmouse, true) &lt; 0)</div><div class='ctx'> 			return -1;</div><div class='ctx'> </div><div class='hunk'>@@ -1558,13 +1620,12 @@ static ssize_t psmouse_show_int_attr(struct psmouse *psmouse, void *offset, char</div><div class='ctx'> static ssize_t psmouse_set_int_attr(struct psmouse *psmouse, void *offset, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int *field = (unsigned int *)((char *)psmouse + (size_t)offset);</div><div class='del'>-	unsigned long value;</div><div class='del'>-</div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;value))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	unsigned int value;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if ((unsigned int)value != value)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	err = kstrtouint(buf, 10, &amp;value);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	*field = value;</div><div class='ctx'> </div><div class='hunk'>@@ -1671,10 +1732,12 @@ static ssize_t psmouse_attr_set_protocol(struct psmouse *psmouse, void *data, co</div><div class='ctx'> </div><div class='ctx'> static ssize_t psmouse_attr_set_rate(struct psmouse *psmouse, void *data, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	unsigned long value;</div><div class='add'>+	unsigned int value;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;value))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	err = kstrtouint(buf, 10, &amp;value);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	psmouse-&gt;set_rate(psmouse, value);</div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -1682,10 +1745,12 @@ static ssize_t psmouse_attr_set_rate(struct psmouse *psmouse, void *data, const</div><div class='ctx'> </div><div class='ctx'> static ssize_t psmouse_attr_set_resolution(struct psmouse *psmouse, void *data, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	unsigned long value;</div><div class='add'>+	unsigned int value;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;value))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	err = kstrtouint(buf, 10, &amp;value);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	psmouse-&gt;set_resolution(psmouse, value);</div><div class='ctx'> 	return count;</div><div class='head'>diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h<br/>index 9b84b0c4e371..6a417092d010 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/psmouse.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/psmouse.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/psmouse.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/mouse/psmouse.h</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #define PSMOUSE_CMD_SETSTREAM	0x00ea</div><div class='ctx'> #define PSMOUSE_CMD_SETPOLL	0x00f0</div><div class='ctx'> #define PSMOUSE_CMD_POLL	0x00eb	/* caller sets number of bytes to receive */</div><div class='add'>+#define PSMOUSE_CMD_RESET_WRAP	0x00ec</div><div class='ctx'> #define PSMOUSE_CMD_GETID	0x02f2</div><div class='ctx'> #define PSMOUSE_CMD_SETRATE	0x10f3</div><div class='ctx'> #define PSMOUSE_CMD_ENABLE	0x00f4</div><div class='hunk'>@@ -93,6 +94,7 @@ enum psmouse_type {</div><div class='ctx'> 	PSMOUSE_HGPK,</div><div class='ctx'> 	PSMOUSE_ELANTECH,</div><div class='ctx'> 	PSMOUSE_FSP,</div><div class='add'>+	PSMOUSE_SYNAPTICS_RELATIVE,</div><div class='ctx'> 	PSMOUSE_AUTO		/* This one should always be last */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -102,6 +104,7 @@ int psmouse_sliced_command(struct psmouse *psmouse, unsigned char command);</div><div class='ctx'> int psmouse_reset(struct psmouse *psmouse);</div><div class='ctx'> void psmouse_set_state(struct psmouse *psmouse, enum psmouse_state new_state);</div><div class='ctx'> void psmouse_set_resolution(struct psmouse *psmouse, unsigned int resolution);</div><div class='add'>+psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse);</div><div class='ctx'> </div><div class='ctx'> struct psmouse_attribute {</div><div class='ctx'> 	struct device_attribute dattr;</div><div class='head'>diff --git a/drivers/input/mouse/pxa930_trkball.c b/drivers/input/mouse/pxa930_trkball.c<br/>index ee3b0ca9d592..a9e4bfdf31f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/pxa930_trkball.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/pxa930_trkball.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/pxa930_trkball.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/mouse/pxa930_trkball.c</a></div><div class='hunk'>@@ -250,19 +250,7 @@ static struct platform_driver pxa930_trkball_driver = {</div><div class='ctx'> 	.probe		= pxa930_trkball_probe,</div><div class='ctx'> 	.remove		= __devexit_p(pxa930_trkball_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init pxa930_trkball_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pxa930_trkball_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit pxa930_trkball_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pxa930_trkball_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(pxa930_trkball_init);</div><div class='del'>-module_exit(pxa930_trkball_exit);</div><div class='add'>+module_platform_driver(pxa930_trkball_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Yong Yao &lt;yaoyong@marvell.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("PXA930 Trackball Mouse Driver");</div><div class='head'>diff --git a/drivers/input/mouse/sentelic.c b/drivers/input/mouse/sentelic.c<br/>index 86d6f39178b0..e36847de7617 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/sentelic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/sentelic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/sentelic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/mouse/sentelic.c</a></div><div class='hunk'>@@ -408,7 +408,7 @@ static int fsp_onpad_hscr(struct psmouse *psmouse, bool enable)</div><div class='ctx'> static ssize_t fsp_attr_set_setreg(struct psmouse *psmouse, void *data,</div><div class='ctx'> 				   const char *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	unsigned long reg, val;</div><div class='add'>+	int reg, val;</div><div class='ctx'> 	char *rest;</div><div class='ctx'> 	ssize_t retval;</div><div class='ctx'> </div><div class='hunk'>@@ -416,7 +416,11 @@ static ssize_t fsp_attr_set_setreg(struct psmouse *psmouse, void *data,</div><div class='ctx'> 	if (rest == buf || *rest != ' ' || reg &gt; 0xff)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(rest + 1, 16, &amp;val) || val &gt; 0xff)</div><div class='add'>+	retval = kstrtoint(rest + 1, 16, &amp;val);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	if (val &gt; 0xff)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (fsp_reg_write_enable(psmouse, true))</div><div class='hunk'>@@ -448,10 +452,13 @@ static ssize_t fsp_attr_set_getreg(struct psmouse *psmouse, void *data,</div><div class='ctx'> 					const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsp_data *pad = psmouse-&gt;private;</div><div class='del'>-	unsigned long reg;</div><div class='del'>-	int val;</div><div class='add'>+	int reg, val, err;</div><div class='add'>+</div><div class='add'>+	err = kstrtoint(buf, 16, &amp;reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 16, &amp;reg) || reg &gt; 0xff)</div><div class='add'>+	if (reg &gt; 0xff)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (fsp_reg_read(psmouse, reg, &amp;val))</div><div class='hunk'>@@ -480,9 +487,13 @@ static ssize_t fsp_attr_show_pagereg(struct psmouse *psmouse,</div><div class='ctx'> static ssize_t fsp_attr_set_pagereg(struct psmouse *psmouse, void *data,</div><div class='ctx'> 					const char *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	unsigned long val;</div><div class='add'>+	int val, err;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 16, &amp;val) || val &gt; 0xff)</div><div class='add'>+	err = kstrtoint(buf, 16, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (val &gt; 0xff)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (fsp_page_reg_write(psmouse, val))</div><div class='hunk'>@@ -505,9 +516,14 @@ static ssize_t fsp_attr_show_vscroll(struct psmouse *psmouse,</div><div class='ctx'> static ssize_t fsp_attr_set_vscroll(struct psmouse *psmouse, void *data,</div><div class='ctx'> 					const char *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	unsigned long val;</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kstrtouint(buf, 10, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) || val &gt; 1)</div><div class='add'>+	if (val &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	fsp_onpad_vscr(psmouse, val);</div><div class='hunk'>@@ -529,9 +545,14 @@ static ssize_t fsp_attr_show_hscroll(struct psmouse *psmouse,</div><div class='ctx'> static ssize_t fsp_attr_set_hscroll(struct psmouse *psmouse, void *data,</div><div class='ctx'> 					const char *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	unsigned long val;</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kstrtouint(buf, 10, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;val) || val &gt; 1)</div><div class='add'>+	if (val &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	fsp_onpad_hscr(psmouse, val);</div><div class='head'>diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c<br/>index a6dcd18e9adf..8081a0a5d602 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/synaptics.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/synaptics.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/synaptics.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/mouse/synaptics.c</a></div><div class='hunk'>@@ -269,19 +269,49 @@ static int synaptics_query_hardware(struct psmouse *psmouse)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int synaptics_set_absolute_mode(struct psmouse *psmouse)</div><div class='add'>+static int synaptics_set_advanced_gesture_mode(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	static unsigned char param = 0xc8;</div><div class='add'>+	struct synaptics_data *priv = psmouse-&gt;private;</div><div class='add'>+</div><div class='add'>+	if (!SYN_CAP_ADV_GESTURE(priv-&gt;ext_cap_0c))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (psmouse_sliced_command(psmouse, SYN_QUE_MODEL))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (ps2_command(&amp;psmouse-&gt;ps2dev, &amp;param, PSMOUSE_CMD_SETRATE))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* Advanced gesture mode also sends multi finger data */</div><div class='add'>+	priv-&gt;capabilities |= BIT(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 synaptics_set_mode(struct psmouse *psmouse)</div><div class='ctx'> {</div><div class='ctx'> 	struct synaptics_data *priv = psmouse-&gt;private;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;mode = SYN_BIT_ABSOLUTE_MODE;</div><div class='del'>-	if (SYN_ID_MAJOR(priv-&gt;identity) &gt;= 4)</div><div class='add'>+	priv-&gt;mode = 0;</div><div class='add'>+	if (priv-&gt;absolute_mode)</div><div class='add'>+		priv-&gt;mode |= SYN_BIT_ABSOLUTE_MODE;</div><div class='add'>+	if (priv-&gt;disable_gesture)</div><div class='ctx'> 		priv-&gt;mode |= SYN_BIT_DISABLE_GESTURE;</div><div class='add'>+	if (psmouse-&gt;rate &gt;= 80)</div><div class='add'>+		priv-&gt;mode |= SYN_BIT_HIGH_RATE;</div><div class='ctx'> 	if (SYN_CAP_EXTENDED(priv-&gt;capabilities))</div><div class='ctx'> 		priv-&gt;mode |= SYN_BIT_W_MODE;</div><div class='ctx'> </div><div class='ctx'> 	if (synaptics_mode_cmd(psmouse, priv-&gt;mode))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;absolute_mode &amp;&amp;</div><div class='add'>+	    synaptics_set_advanced_gesture_mode(psmouse)) {</div><div class='add'>+		psmouse_err(psmouse, "Advanced gesture mode init failed.\n");</div><div class='add'>+		return -1;</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'>@@ -300,26 +330,6 @@ static void synaptics_set_rate(struct psmouse *psmouse, unsigned int rate)</div><div class='ctx'> 	synaptics_mode_cmd(psmouse, priv-&gt;mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int synaptics_set_advanced_gesture_mode(struct psmouse *psmouse)</div><div class='del'>-{</div><div class='del'>-	static unsigned char param = 0xc8;</div><div class='del'>-	struct synaptics_data *priv = psmouse-&gt;private;</div><div class='del'>-</div><div class='del'>-	if (!(SYN_CAP_ADV_GESTURE(priv-&gt;ext_cap_0c) ||</div><div class='del'>-			SYN_CAP_IMAGE_SENSOR(priv-&gt;ext_cap_0c)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (psmouse_sliced_command(psmouse, SYN_QUE_MODEL))</div><div class='del'>-		return -1;</div><div class='del'>-	if (ps2_command(&amp;psmouse-&gt;ps2dev, &amp;param, PSMOUSE_CMD_SETRATE))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	/* Advanced gesture mode also sends multi finger data */</div><div class='del'>-	priv-&gt;capabilities |= BIT(1);</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'>  *	Synaptics pass-through PS/2 port support</div><div class='ctx'>  ****************************************************************************/</div><div class='hunk'>@@ -1143,8 +1153,24 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	/* Things that apply to both modes */</div><div class='ctx'> 	__set_bit(INPUT_PROP_POINTER, dev-&gt;propbit);</div><div class='add'>+	__set_bit(EV_KEY, dev-&gt;evbit);</div><div class='add'>+	__set_bit(BTN_LEFT, dev-&gt;keybit);</div><div class='add'>+	__set_bit(BTN_RIGHT, dev-&gt;keybit);</div><div class='ctx'> </div><div class='add'>+	if (SYN_CAP_MIDDLE_BUTTON(priv-&gt;capabilities))</div><div class='add'>+		__set_bit(BTN_MIDDLE, dev-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;absolute_mode) {</div><div class='add'>+		/* Relative mode */</div><div class='add'>+		__set_bit(EV_REL, dev-&gt;evbit);</div><div class='add'>+		__set_bit(REL_X, dev-&gt;relbit);</div><div class='add'>+		__set_bit(REL_Y, dev-&gt;relbit);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Absolute mode */</div><div class='ctx'> 	__set_bit(EV_ABS, dev-&gt;evbit);</div><div class='ctx'> 	set_abs_position_params(dev, priv, ABS_X, ABS_Y);</div><div class='ctx'> 	input_set_abs_params(dev, ABS_PRESSURE, 0, 255, 0, 0);</div><div class='hunk'>@@ -1170,20 +1196,14 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)</div><div class='ctx'> 	if (SYN_CAP_PALMDETECT(priv-&gt;capabilities))</div><div class='ctx'> 		input_set_abs_params(dev, ABS_TOOL_WIDTH, 0, 15, 0, 0);</div><div class='ctx'> </div><div class='del'>-	__set_bit(EV_KEY, dev-&gt;evbit);</div><div class='ctx'> 	__set_bit(BTN_TOUCH, dev-&gt;keybit);</div><div class='ctx'> 	__set_bit(BTN_TOOL_FINGER, dev-&gt;keybit);</div><div class='del'>-	__set_bit(BTN_LEFT, dev-&gt;keybit);</div><div class='del'>-	__set_bit(BTN_RIGHT, dev-&gt;keybit);</div><div class='ctx'> </div><div class='ctx'> 	if (SYN_CAP_MULTIFINGER(priv-&gt;capabilities)) {</div><div class='ctx'> 		__set_bit(BTN_TOOL_DOUBLETAP, dev-&gt;keybit);</div><div class='ctx'> 		__set_bit(BTN_TOOL_TRIPLETAP, dev-&gt;keybit);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (SYN_CAP_MIDDLE_BUTTON(priv-&gt;capabilities))</div><div class='del'>-		__set_bit(BTN_MIDDLE, dev-&gt;keybit);</div><div class='del'>-</div><div class='ctx'> 	if (SYN_CAP_FOUR_BUTTON(priv-&gt;capabilities) ||</div><div class='ctx'> 	    SYN_CAP_MIDDLE_BUTTON(priv-&gt;capabilities)) {</div><div class='ctx'> 		__set_bit(BTN_FORWARD, dev-&gt;keybit);</div><div class='hunk'>@@ -1205,10 +1225,58 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t synaptics_show_disable_gesture(struct psmouse *psmouse,</div><div class='add'>+					      void *data, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct synaptics_data *priv = psmouse-&gt;private;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%c\n", priv-&gt;disable_gesture ? '1' : '0');</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t synaptics_set_disable_gesture(struct psmouse *psmouse,</div><div class='add'>+					     void *data, const char *buf,</div><div class='add'>+					     size_t len)</div><div class='add'>+{</div><div class='add'>+	struct synaptics_data *priv = psmouse-&gt;private;</div><div class='add'>+	unsigned int value;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kstrtouint(buf, 10, &amp;value);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (value &gt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (value == priv-&gt;disable_gesture)</div><div class='add'>+		return len;</div><div class='add'>+</div><div class='add'>+	priv-&gt;disable_gesture = value;</div><div class='add'>+	if (value)</div><div class='add'>+		priv-&gt;mode |= SYN_BIT_DISABLE_GESTURE;</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;mode &amp;= ~SYN_BIT_DISABLE_GESTURE;</div><div class='add'>+</div><div class='add'>+	if (synaptics_mode_cmd(psmouse, priv-&gt;mode))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+PSMOUSE_DEFINE_ATTR(disable_gesture, S_IWUSR | S_IRUGO, NULL,</div><div class='add'>+		    synaptics_show_disable_gesture,</div><div class='add'>+		    synaptics_set_disable_gesture);</div><div class='add'>+</div><div class='ctx'> static void synaptics_disconnect(struct psmouse *psmouse)</div><div class='ctx'> {</div><div class='add'>+	struct synaptics_data *priv = psmouse-&gt;private;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;absolute_mode &amp;&amp; SYN_ID_DISGEST_SUPPORTED(priv-&gt;identity))</div><div class='add'>+		device_remove_file(&amp;psmouse-&gt;ps2dev.serio-&gt;dev,</div><div class='add'>+				   &amp;psmouse_attr_disable_gesture.dattr);</div><div class='add'>+</div><div class='ctx'> 	synaptics_reset(psmouse);</div><div class='del'>-	kfree(psmouse-&gt;private);</div><div class='add'>+	kfree(priv);</div><div class='ctx'> 	psmouse-&gt;private = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1245,17 +1313,11 @@ static int synaptics_reconnect(struct psmouse *psmouse)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (synaptics_set_absolute_mode(psmouse)) {</div><div class='add'>+	if (synaptics_set_mode(psmouse)) {</div><div class='ctx'> 		psmouse_err(psmouse, "Unable to initialize device.\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (synaptics_set_advanced_gesture_mode(psmouse)) {</div><div class='del'>-		psmouse_err(psmouse,</div><div class='del'>-			    "Advanced gesture mode reconnect failed.\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (old_priv.identity != priv-&gt;identity ||</div><div class='ctx'> 	    old_priv.model_id != priv-&gt;model_id ||</div><div class='ctx'> 	    old_priv.capabilities != priv-&gt;capabilities ||</div><div class='hunk'>@@ -1332,20 +1394,18 @@ void __init synaptics_module_init(void)</div><div class='ctx'> 	broken_olpc_ec = dmi_check_system(olpc_dmi_table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int synaptics_init(struct psmouse *psmouse)</div><div class='add'>+static int __synaptics_init(struct psmouse *psmouse, bool absolute_mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct synaptics_data *priv;</div><div class='add'>+	int err = -1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * The OLPC XO has issues with Synaptics' absolute mode; similarly to</div><div class='del'>-	 * the HGPK, it quickly degrades and the hardware becomes jumpy and</div><div class='del'>-	 * overly sensitive.  Not only that, but the constant packet spew</div><div class='del'>-	 * (even at a lowered 40pps rate) overloads the EC such that key</div><div class='del'>-	 * presses on the keyboard are missed.  Given all of that, don't</div><div class='del'>-	 * even attempt to use Synaptics mode.  Relative mode seems to work</div><div class='del'>-	 * just fine.</div><div class='add'>+	 * The OLPC XO has issues with Synaptics' absolute mode; the constant</div><div class='add'>+	 * packet spew overloads the EC such that key presses on the keyboard</div><div class='add'>+	 * are missed.  Given that, don't even attempt to use Absolute mode.</div><div class='add'>+	 * Relative mode seems to work just fine.</div><div class='ctx'> 	 */</div><div class='del'>-	if (broken_olpc_ec) {</div><div class='add'>+	if (absolute_mode &amp;&amp; broken_olpc_ec) {</div><div class='ctx'> 		psmouse_info(psmouse,</div><div class='ctx'> 			     "OLPC XO detected, not enabling Synaptics protocol.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -1362,13 +1422,12 @@ int synaptics_init(struct psmouse *psmouse)</div><div class='ctx'> 		goto init_fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (synaptics_set_absolute_mode(psmouse)) {</div><div class='del'>-		psmouse_err(psmouse, "Unable to initialize device.\n");</div><div class='del'>-		goto init_fail;</div><div class='del'>-	}</div><div class='add'>+	priv-&gt;absolute_mode = absolute_mode;</div><div class='add'>+	if (SYN_ID_DISGEST_SUPPORTED(priv-&gt;identity))</div><div class='add'>+		priv-&gt;disable_gesture = true;</div><div class='ctx'> </div><div class='del'>-	if (synaptics_set_advanced_gesture_mode(psmouse)) {</div><div class='del'>-		psmouse_err(psmouse, "Advanced gesture mode init failed.\n");</div><div class='add'>+	if (synaptics_set_mode(psmouse)) {</div><div class='add'>+		psmouse_err(psmouse, "Unable to initialize device.\n");</div><div class='ctx'> 		goto init_fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1393,12 +1452,19 @@ int synaptics_init(struct psmouse *psmouse)</div><div class='ctx'> 	psmouse-&gt;model = ((priv-&gt;model_id &amp; 0x00ff0000) &gt;&gt; 8) |</div><div class='ctx'> 			  (priv-&gt;model_id &amp; 0x000000ff);</div><div class='ctx'> </div><div class='del'>-	psmouse-&gt;protocol_handler = synaptics_process_byte;</div><div class='add'>+	if (absolute_mode) {</div><div class='add'>+		psmouse-&gt;protocol_handler = synaptics_process_byte;</div><div class='add'>+		psmouse-&gt;pktsize = 6;</div><div class='add'>+	} else {</div><div class='add'>+		/* Relative mode follows standard PS/2 mouse protocol */</div><div class='add'>+		psmouse-&gt;protocol_handler = psmouse_process_byte;</div><div class='add'>+		psmouse-&gt;pktsize = 3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	psmouse-&gt;set_rate = synaptics_set_rate;</div><div class='ctx'> 	psmouse-&gt;disconnect = synaptics_disconnect;</div><div class='ctx'> 	psmouse-&gt;reconnect = synaptics_reconnect;</div><div class='ctx'> 	psmouse-&gt;cleanup = synaptics_reset;</div><div class='del'>-	psmouse-&gt;pktsize = 6;</div><div class='ctx'> 	/* Synaptics can usually stay in sync without extra help */</div><div class='ctx'> 	psmouse-&gt;resync_time = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1417,11 +1483,32 @@ int synaptics_init(struct psmouse *psmouse)</div><div class='ctx'> 		psmouse-&gt;rate = 40;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!priv-&gt;absolute_mode &amp;&amp; SYN_ID_DISGEST_SUPPORTED(priv-&gt;identity)) {</div><div class='add'>+		err = device_create_file(&amp;psmouse-&gt;ps2dev.serio-&gt;dev,</div><div class='add'>+					 &amp;psmouse_attr_disable_gesture.dattr);</div><div class='add'>+		if (err) {</div><div class='add'>+			psmouse_err(psmouse,</div><div class='add'>+				    "Failed to create disable_gesture attribute (%d)",</div><div class='add'>+				    err);</div><div class='add'>+			goto init_fail;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  init_fail:</div><div class='ctx'> 	kfree(priv);</div><div class='del'>-	return -1;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int synaptics_init(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	return __synaptics_init(psmouse, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int synaptics_init_relative(struct psmouse *psmouse)</div><div class='add'>+{</div><div class='add'>+	return __synaptics_init(psmouse, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool synaptics_supported(void)</div><div class='head'>diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h<br/>index 622aea8dd7e0..fd26ccca13d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/synaptics.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/synaptics.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/synaptics.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/mouse/synaptics.h</a></div><div class='hunk'>@@ -100,6 +100,7 @@</div><div class='ctx'> #define SYN_ID_MINOR(i)			(((i) &gt;&gt; 16) &amp; 0xff)</div><div class='ctx'> #define SYN_ID_FULL(i)			((SYN_ID_MAJOR(i) &lt;&lt; 8) | SYN_ID_MINOR(i))</div><div class='ctx'> #define SYN_ID_IS_SYNAPTICS(i)		((((i) &gt;&gt; 8) &amp; 0xff) == 0x47)</div><div class='add'>+#define SYN_ID_DISGEST_SUPPORTED(i)	(SYN_ID_MAJOR(i) &gt;= 4)</div><div class='ctx'> </div><div class='ctx'> /* synaptics special commands */</div><div class='ctx'> #define SYN_PS_SET_MODE2		0x14</div><div class='hunk'>@@ -159,6 +160,9 @@ struct synaptics_data {</div><div class='ctx'> 	unsigned char mode;			/* current mode byte */</div><div class='ctx'> 	int scroll;</div><div class='ctx'> </div><div class='add'>+	bool absolute_mode;			/* run in Absolute mode */</div><div class='add'>+	bool disable_gesture;			/* disable gestures */</div><div class='add'>+</div><div class='ctx'> 	struct serio *pt_port;			/* Pass-through serio port */</div><div class='ctx'> </div><div class='ctx'> 	struct synaptics_mt_state mt_state;	/* Current mt finger state */</div><div class='hunk'>@@ -175,6 +179,7 @@ struct synaptics_data {</div><div class='ctx'> void synaptics_module_init(void);</div><div class='ctx'> int synaptics_detect(struct psmouse *psmouse, bool set_properties);</div><div class='ctx'> int synaptics_init(struct psmouse *psmouse);</div><div class='add'>+int synaptics_init_relative(struct psmouse *psmouse);</div><div class='ctx'> void synaptics_reset(struct psmouse *psmouse);</div><div class='ctx'> bool synaptics_supported(void);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/mouse/synaptics_i2c.c b/drivers/input/mouse/synaptics_i2c.c<br/>index 4b755cb5b38c..1c58aafa523f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/synaptics_i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/synaptics_i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/synaptics_i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/mouse/synaptics_i2c.c</a></div><div class='hunk'>@@ -185,17 +185,17 @@</div><div class='ctx'> #define NO_DATA_SLEEP_MSECS	(MSEC_PER_SEC / 4)</div><div class='ctx'> </div><div class='ctx'> /* Control touchpad's No Deceleration option */</div><div class='del'>-static int no_decel = 1;</div><div class='add'>+static bool no_decel = 1;</div><div class='ctx'> module_param(no_decel, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(no_decel, "No Deceleration. Default = 1 (on)");</div><div class='ctx'> </div><div class='ctx'> /* Control touchpad's Reduced Reporting option */</div><div class='del'>-static int reduce_report;</div><div class='add'>+static bool reduce_report;</div><div class='ctx'> module_param(reduce_report, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(reduce_report, "Reduced Reporting. Default = 0 (off)");</div><div class='ctx'> </div><div class='ctx'> /* Control touchpad's No Filter option */</div><div class='del'>-static int no_filter;</div><div class='add'>+static bool no_filter;</div><div class='ctx'> module_param(no_filter, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(no_filter, "No Filter. Default = 0 (off)");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c<br/>index 54b2fa892e19..22b218018137 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/trackpoint.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/mouse/trackpoint.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/trackpoint.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/mouse/trackpoint.c</a></div><div class='hunk'>@@ -89,10 +89,12 @@ static ssize_t trackpoint_set_int_attr(struct psmouse *psmouse, void *data,</div><div class='ctx'> 	struct trackpoint_data *tp = psmouse-&gt;private;</div><div class='ctx'> 	struct trackpoint_attr_data *attr = data;</div><div class='ctx'> 	unsigned char *field = (unsigned char *)((char *)tp + attr-&gt;field_offset);</div><div class='del'>-	unsigned long value;</div><div class='add'>+	unsigned char value;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;value) || value &gt; 255)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	err = kstrtou8(buf, 10, &amp;value);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	*field = value;</div><div class='ctx'> 	trackpoint_write(&amp;psmouse-&gt;ps2dev, attr-&gt;command, value);</div><div class='hunk'>@@ -115,9 +117,14 @@ static ssize_t trackpoint_set_bit_attr(struct psmouse *psmouse, void *data,</div><div class='ctx'> 	struct trackpoint_data *tp = psmouse-&gt;private;</div><div class='ctx'> 	struct trackpoint_attr_data *attr = data;</div><div class='ctx'> 	unsigned char *field = (unsigned char *)((char *)tp + attr-&gt;field_offset);</div><div class='del'>-	unsigned long value;</div><div class='add'>+	unsigned int value;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kstrtouint(buf, 10, &amp;value);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;value) || value &gt; 1)</div><div class='add'>+	if (value &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (attr-&gt;inverted)</div><div class='head'>diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c<br/>index d363dc4571a3..35864c6130bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/altera_ps2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/serio/altera_ps2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/altera_ps2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/serio/altera_ps2.c</a></div><div class='hunk'>@@ -196,18 +196,7 @@ static struct platform_driver altera_ps2_driver = {</div><div class='ctx'> 		.of_match_table = altera_ps2_match,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init altera_ps2_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;altera_ps2_driver);</div><div class='del'>-}</div><div class='del'>-module_init(altera_ps2_init);</div><div class='del'>-</div><div class='del'>-static void __exit altera_ps2_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;altera_ps2_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(altera_ps2_exit);</div><div class='add'>+module_platform_driver(altera_ps2_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Altera University Program PS2 controller driver");</div><div class='ctx'> MODULE_AUTHOR("Thomas Chou &lt;thomas@wytron.com.tw&gt;");</div><div class='head'>diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c<br/>index 12abc50508e5..8407d5b0ced8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/ambakmi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/serio/ambakmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/ambakmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/serio/ambakmi.c</a></div><div class='hunk'>@@ -195,6 +195,8 @@ static struct amba_id amba_kmi_idtable[] = {</div><div class='ctx'> 	{ 0, 0 }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+MODULE_DEVICE_TABLE(amba, amba_kmi_idtable);</div><div class='add'>+</div><div class='ctx'> static struct amba_driver ambakmi_driver = {</div><div class='ctx'> 	.drv		= {</div><div class='ctx'> 		.name	= "kmi-pl050",</div><div class='head'>diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c<br/>index 979c443bf1ef..be3316073ae7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/hp_sdc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/serio/hp_sdc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/hp_sdc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/serio/hp_sdc.c</a></div><div class='hunk'>@@ -105,7 +105,7 @@ EXPORT_SYMBOL(__hp_sdc_enqueue_transaction);</div><div class='ctx'> EXPORT_SYMBOL(hp_sdc_enqueue_transaction);</div><div class='ctx'> EXPORT_SYMBOL(hp_sdc_dequeue_transaction);</div><div class='ctx'> </div><div class='del'>-static unsigned int hp_sdc_disabled;</div><div class='add'>+static bool hp_sdc_disabled;</div><div class='ctx'> module_param_named(no_hpsdc, hp_sdc_disabled, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(no_hpsdc, "Do not enable HP SDC driver.");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c<br/>index d37a48e099d0..86564414b75a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/i8042.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/serio/i8042.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/i8042.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/serio/i8042.c</a></div><div class='hunk'>@@ -991,7 +991,7 @@ static int i8042_controller_init(void)</div><div class='ctx'>  * Reset the controller and reset CRT to the original value set by BIOS.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void i8042_controller_reset(void)</div><div class='add'>+static void i8042_controller_reset(bool force_reset)</div><div class='ctx'> {</div><div class='ctx'> 	i8042_flush();</div><div class='ctx'> </div><div class='hunk'>@@ -1016,7 +1016,7 @@ static void i8042_controller_reset(void)</div><div class='ctx'>  * Reset the controller if requested.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-	if (i8042_reset)</div><div class='add'>+	if (i8042_reset || force_reset)</div><div class='ctx'> 		i8042_controller_selftest();</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1139,9 +1139,9 @@ static int i8042_controller_resume(bool force_reset)</div><div class='ctx'>  * upsetting it.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int i8042_pm_reset(struct device *dev)</div><div class='add'>+static int i8042_pm_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	i8042_controller_reset();</div><div class='add'>+	i8042_controller_reset(true);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1163,13 +1163,20 @@ static int i8042_pm_thaw(struct device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int i8042_pm_reset(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	i8042_controller_reset(false);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int i8042_pm_restore(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return i8042_controller_resume(false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct dev_pm_ops i8042_pm_ops = {</div><div class='del'>-	.suspend	= i8042_pm_reset,</div><div class='add'>+	.suspend	= i8042_pm_suspend,</div><div class='ctx'> 	.resume		= i8042_pm_resume,</div><div class='ctx'> 	.thaw		= i8042_pm_thaw,</div><div class='ctx'> 	.poweroff	= i8042_pm_reset,</div><div class='hunk'>@@ -1185,7 +1192,7 @@ static const struct dev_pm_ops i8042_pm_ops = {</div><div class='ctx'> </div><div class='ctx'> static void i8042_shutdown(struct platform_device *dev)</div><div class='ctx'> {</div><div class='del'>-	i8042_controller_reset();</div><div class='add'>+	i8042_controller_reset(false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init i8042_create_kbd_port(void)</div><div class='hunk'>@@ -1424,7 +1431,7 @@ static int __init i8042_probe(struct platform_device *dev)</div><div class='ctx'>  out_fail:</div><div class='ctx'> 	i8042_free_aux_ports();	/* in case KBD failed but AUX not */</div><div class='ctx'> 	i8042_free_irqs();</div><div class='del'>-	i8042_controller_reset();</div><div class='add'>+	i8042_controller_reset(false);</div><div class='ctx'> 	i8042_platform_device = NULL;</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -1434,7 +1441,7 @@ static int __devexit i8042_remove(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	i8042_unregister_ports();</div><div class='ctx'> 	i8042_free_irqs();</div><div class='del'>-	i8042_controller_reset();</div><div class='add'>+	i8042_controller_reset(false);</div><div class='ctx'> 	i8042_platform_device = NULL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c<br/>index 7ec3c97dc1b9..8b44ddc8041c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/rpckbd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/serio/rpckbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/rpckbd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/serio/rpckbd.c</a></div><div class='hunk'>@@ -143,16 +143,4 @@ static struct platform_driver rpckbd_driver = {</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init rpckbd_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;rpckbd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit rpckbd_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;rpckbd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(rpckbd_init);</div><div class='del'>-module_exit(rpckbd_exit);</div><div class='add'>+module_platform_driver(rpckbd_driver);</div><div class='head'>diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c<br/>index 4d4cd142bbbb..8250299fd64f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/serio_raw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/serio/serio_raw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/serio_raw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/serio/serio_raw.c</a></div><div class='hunk'>@@ -220,11 +220,11 @@ static ssize_t serio_raw_write(struct file *file, const char __user *buffer,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		written++;</div><div class='del'>-	};</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;serio_raw_mutex);</div><div class='del'>-	return written;</div><div class='add'>+	return written ?: retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int serio_raw_poll(struct file *file, poll_table *wait)</div><div class='hunk'>@@ -237,9 +237,9 @@ static unsigned int serio_raw_poll(struct file *file, poll_table *wait)</div><div class='ctx'> </div><div class='ctx'> 	mask = serio_raw-&gt;dead ? POLLHUP | POLLERR : POLLOUT | POLLWRNORM;</div><div class='ctx'> 	if (serio_raw-&gt;head != serio_raw-&gt;tail)</div><div class='del'>-		return POLLIN | POLLRDNORM;</div><div class='add'>+		mask |= POLLIN | POLLRDNORM;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct file_operations serio_raw_fops = {</div><div class='head'>diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c<br/>index d64c5a43aaad..d96d4c2a76a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/xilinx_ps2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/serio/xilinx_ps2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/xilinx_ps2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/serio/xilinx_ps2.c</a></div><div class='hunk'>@@ -253,7 +253,7 @@ static int __devinit xps2_of_probe(struct platform_device *ofdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get IRQ for the device */</div><div class='del'>-	if (of_irq_to_resource(ofdev-&gt;dev.of_node, 0, &amp;r_irq) == NO_IRQ) {</div><div class='add'>+	if (!of_irq_to_resource(ofdev-&gt;dev.of_node, 0, &amp;r_irq)) {</div><div class='ctx'> 		dev_err(dev, "no IRQ found\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -369,19 +369,7 @@ static struct platform_driver xps2_of_driver = {</div><div class='ctx'> 	.probe		= xps2_of_probe,</div><div class='ctx'> 	.remove		= __devexit_p(xps2_of_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init xps2_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;xps2_of_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit xps2_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;xps2_of_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(xps2_init);</div><div class='del'>-module_exit(xps2_cleanup);</div><div class='add'>+module_platform_driver(xps2_of_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Xilinx, Inc.");</div><div class='ctx'> MODULE_DESCRIPTION("Xilinx XPS PS/2 driver");</div><div class='head'>diff --git a/drivers/input/tablet/acecad.c b/drivers/input/tablet/acecad.c<br/>index d94f7e9aa997..f8b0b1df9138 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/tablet/acecad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/tablet/acecad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/tablet/acecad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/tablet/acecad.c</a></div><div class='hunk'>@@ -269,19 +269,4 @@ static struct usb_driver usb_acecad_driver = {</div><div class='ctx'> 	.id_table =	usb_acecad_id_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init usb_acecad_init(void)</div><div class='del'>-{</div><div class='del'>-	int result = usb_register(&amp;usb_acecad_driver);</div><div class='del'>-	if (result == 0)</div><div class='del'>-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='del'>-		       DRIVER_DESC "\n");</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit usb_acecad_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;usb_acecad_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(usb_acecad_init);</div><div class='del'>-module_exit(usb_acecad_exit);</div><div class='add'>+module_usb_driver(usb_acecad_driver);</div><div class='head'>diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c<br/>index 6d89fd1842c3..205d16aab441 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/tablet/aiptek.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/tablet/aiptek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/tablet/aiptek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/tablet/aiptek.c</a></div><div class='hunk'>@@ -1198,9 +1198,9 @@ static ssize_t</div><div class='ctx'> store_tabletXtilt(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct aiptek *aiptek = dev_get_drvdata(dev);</div><div class='del'>-	long x;</div><div class='add'>+	int x;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;x)) {</div><div class='add'>+	if (kstrtoint(buf, 10, &amp;x)) {</div><div class='ctx'> 		size_t len = buf[count - 1] == '\n' ? count - 1 : count;</div><div class='ctx'> </div><div class='ctx'> 		if (strncmp(buf, "disable", len))</div><div class='hunk'>@@ -1240,9 +1240,9 @@ static ssize_t</div><div class='ctx'> store_tabletYtilt(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct aiptek *aiptek = dev_get_drvdata(dev);</div><div class='del'>-	long y;</div><div class='add'>+	int y;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;y)) {</div><div class='add'>+	if (kstrtoint(buf, 10, &amp;y)) {</div><div class='ctx'> 		size_t len = buf[count - 1] == '\n' ? count - 1 : count;</div><div class='ctx'> </div><div class='ctx'> 		if (strncmp(buf, "disable", len))</div><div class='hunk'>@@ -1277,12 +1277,13 @@ static ssize_t</div><div class='ctx'> store_tabletJitterDelay(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct aiptek *aiptek = dev_get_drvdata(dev);</div><div class='del'>-	long j;</div><div class='add'>+	int err, j;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;j))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	err = kstrtoint(buf, 10, &amp;j);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	aiptek-&gt;newSetting.jitterDelay = (int)j;</div><div class='add'>+	aiptek-&gt;newSetting.jitterDelay = j;</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1306,12 +1307,13 @@ static ssize_t</div><div class='ctx'> store_tabletProgrammableDelay(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct aiptek *aiptek = dev_get_drvdata(dev);</div><div class='del'>-	long d;</div><div class='add'>+	int err, d;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;d))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	err = kstrtoint(buf, 10, &amp;d);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	aiptek-&gt;newSetting.programmableDelay = (int)d;</div><div class='add'>+	aiptek-&gt;newSetting.programmableDelay = d;</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1557,11 +1559,13 @@ static ssize_t</div><div class='ctx'> store_tabletWheel(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct aiptek *aiptek = dev_get_drvdata(dev);</div><div class='del'>-	long w;</div><div class='add'>+	int err, w;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtol(buf, 10, &amp;w)) return -EINVAL;</div><div class='add'>+	err = kstrtoint(buf, 10, &amp;w);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	aiptek-&gt;newSetting.wheel = (int)w;</div><div class='add'>+	aiptek-&gt;newSetting.wheel = w;</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1919,21 +1923,7 @@ static struct usb_driver aiptek_driver = {</div><div class='ctx'> 	.id_table = aiptek_ids,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init aiptek_init(void)</div><div class='del'>-{</div><div class='del'>-	int result = usb_register(&amp;aiptek_driver);</div><div class='del'>-	if (result == 0) {</div><div class='del'>-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='del'>-		       DRIVER_DESC "\n");</div><div class='del'>-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_AUTHOR "\n");</div><div class='del'>-	}</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit aiptek_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;aiptek_driver);</div><div class='del'>-}</div><div class='add'>+module_usb_driver(aiptek_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='hunk'>@@ -1943,6 +1933,3 @@ module_param(programmableDelay, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(programmableDelay, "delay used during tablet programming");</div><div class='ctx'> module_param(jitterDelay, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(jitterDelay, "stylus/mouse settlement delay");</div><div class='del'>-</div><div class='del'>-module_init(aiptek_init);</div><div class='del'>-module_exit(aiptek_exit);</div><div class='head'>diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c<br/>index 8ea6afe2e992..89a297801dce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/tablet/gtco.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/tablet/gtco.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/tablet/gtco.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/tablet/gtco.c</a></div><div class='hunk'>@@ -1022,33 +1022,7 @@ static struct usb_driver gtco_driverinfo_table = {</div><div class='ctx'> 	.disconnect	= gtco_disconnect,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *  Register this module with the USB subsystem</div><div class='del'>- */</div><div class='del'>-static int __init gtco_init(void)</div><div class='del'>-{</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	error = usb_register(&amp;gtco_driverinfo_table);</div><div class='del'>-	if (error) {</div><div class='del'>-		err("usb_register() failed rc=0x%x", error);</div><div class='del'>-		return error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk("GTCO usb driver version: %s", GTCO_VERSION);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *   Deregister this module with the USB subsystem</div><div class='del'>- */</div><div class='del'>-static void __exit gtco_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;gtco_driverinfo_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(gtco_init);</div><div class='del'>-module_exit(gtco_exit);</div><div class='add'>+module_usb_driver(gtco_driverinfo_table);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("GTCO digitizer USB driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/input/tablet/hanwang.c b/drivers/input/tablet/hanwang.c<br/>index 6504b627b234..b2db3cfe3084 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/tablet/hanwang.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/tablet/hanwang.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/tablet/hanwang.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/tablet/hanwang.c</a></div><div class='hunk'>@@ -432,15 +432,4 @@ static struct usb_driver hanwang_driver = {</div><div class='ctx'> 	.id_table	= hanwang_ids,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init hanwang_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;hanwang_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit hanwang_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;hanwang_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(hanwang_init);</div><div class='del'>-module_exit(hanwang_exit);</div><div class='add'>+module_usb_driver(hanwang_driver);</div><div class='head'>diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c<br/>index 290f4e57b589..85a5b40333ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/tablet/kbtab.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/tablet/kbtab.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/tablet/kbtab.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/tablet/kbtab.c</a></div><div class='hunk'>@@ -198,22 +198,4 @@ static struct usb_driver kbtab_driver = {</div><div class='ctx'> 	.id_table =	kbtab_ids,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init kbtab_init(void)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	retval = usb_register(&amp;kbtab_driver);</div><div class='del'>-	if (retval)</div><div class='del'>-		goto out;</div><div class='del'>-	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='del'>-	       DRIVER_DESC "\n");</div><div class='del'>-out:</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit kbtab_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;kbtab_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(kbtab_init);</div><div class='del'>-module_exit(kbtab_exit);</div><div class='add'>+module_usb_driver(kbtab_driver);</div><div class='head'>diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c<br/>index 1c1b7b43cf92..2a97b7e76db1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/tablet/wacom_sys.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/tablet/wacom_sys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/tablet/wacom_sys.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/tablet/wacom_sys.c</a></div><div class='hunk'>@@ -28,7 +28,9 @@</div><div class='ctx'> #define HID_USAGE_Y_TILT		0x3e</div><div class='ctx'> #define HID_USAGE_FINGER		0x22</div><div class='ctx'> #define HID_USAGE_STYLUS		0x20</div><div class='del'>-#define HID_COLLECTION			0xc0</div><div class='add'>+#define HID_COLLECTION			0xa1</div><div class='add'>+#define HID_COLLECTION_LOGICAL		0x02</div><div class='add'>+#define HID_COLLECTION_END		0xc0</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	WCM_UNDEFINED = 0,</div><div class='hunk'>@@ -66,7 +68,8 @@ static int wacom_get_report(struct usb_interface *intf, u8 type, u8 id,</div><div class='ctx'> 	do {</div><div class='ctx'> 		retval = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),</div><div class='ctx'> 				USB_REQ_GET_REPORT,</div><div class='del'>-				USB_TYPE_CLASS | USB_RECIP_INTERFACE,</div><div class='add'>+				USB_DIR_IN | USB_TYPE_CLASS |</div><div class='add'>+				USB_RECIP_INTERFACE,</div><div class='ctx'> 				(type &lt;&lt; 8) + id,</div><div class='ctx'> 				intf-&gt;altsetting[0].desc.bInterfaceNumber,</div><div class='ctx'> 				buf, size, 100);</div><div class='hunk'>@@ -164,7 +167,70 @@ static void wacom_close(struct input_dev *dev)</div><div class='ctx'> 		usb_autopm_put_interface(wacom-&gt;intf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hid_desc,</div><div class='add'>+static int wacom_parse_logical_collection(unsigned char *report,</div><div class='add'>+					  struct wacom_features *features)</div><div class='add'>+{</div><div class='add'>+	int length = 0;</div><div class='add'>+</div><div class='add'>+	if (features-&gt;type == BAMBOO_PT) {</div><div class='add'>+</div><div class='add'>+		/* Logical collection is only used by 3rd gen Bamboo Touch */</div><div class='add'>+		features-&gt;pktlen = WACOM_PKGLEN_BBTOUCH3;</div><div class='add'>+		features-&gt;device_type = BTN_TOOL_DOUBLETAP;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Stylus and Touch have same active area</div><div class='add'>+		 * so compute physical size based on stylus</div><div class='add'>+		 * data before its overwritten.</div><div class='add'>+		 */</div><div class='add'>+		features-&gt;x_phy =</div><div class='add'>+			(features-&gt;x_max * features-&gt;x_resolution) / 100;</div><div class='add'>+		features-&gt;y_phy =</div><div class='add'>+			(features-&gt;y_max * features-&gt;y_resolution) / 100;</div><div class='add'>+</div><div class='add'>+		features-&gt;x_max = features-&gt;y_max =</div><div class='add'>+			get_unaligned_le16(&amp;report[10]);</div><div class='add'>+</div><div class='add'>+		length = 11;</div><div class='add'>+	}</div><div class='add'>+	return length;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Interface Descriptor of wacom devices can be incomplete and</div><div class='add'>+ * inconsistent so wacom_features table is used to store stylus</div><div class='add'>+ * device's packet lengths, various maximum values, and tablet</div><div class='add'>+ * resolution based on product ID's.</div><div class='add'>+ *</div><div class='add'>+ * For devices that contain 2 interfaces, wacom_features table is</div><div class='add'>+ * inaccurate for the touch interface.  Since the Interface Descriptor</div><div class='add'>+ * for touch interfaces has pretty complete data, this function exists</div><div class='add'>+ * to query tablet for this missing information instead of hard coding in</div><div class='add'>+ * an additional table.</div><div class='add'>+ *</div><div class='add'>+ * A typical Interface Descriptor for a stylus will contain a</div><div class='add'>+ * boot mouse application collection that is not of interest and this</div><div class='add'>+ * function will ignore it.</div><div class='add'>+ *</div><div class='add'>+ * It also contains a digitizer application collection that also is not</div><div class='add'>+ * of interest since any information it contains would be duplicate</div><div class='add'>+ * of what is in wacom_features. Usually it defines a report of an array</div><div class='add'>+ * of bytes that could be used as max length of the stylus packet returned.</div><div class='add'>+ * If it happens to define a Digitizer-Stylus Physical Collection then</div><div class='add'>+ * the X and Y logical values contain valid data but it is ignored.</div><div class='add'>+ *</div><div class='add'>+ * A typical Interface Descriptor for a touch interface will contain a</div><div class='add'>+ * Digitizer-Finger Physical Collection which will define both logical</div><div class='add'>+ * X/Y maximum as well as the physical size of tablet. Since touch</div><div class='add'>+ * interfaces haven't supported pressure or distance, this is enough</div><div class='add'>+ * information to override invalid values in the wacom_features table.</div><div class='add'>+ *</div><div class='add'>+ * 3rd gen Bamboo Touch no longer define a Digitizer-Finger Pysical</div><div class='add'>+ * Collection. Instead they define a Logical Collection with a single</div><div class='add'>+ * Logical Maximum for both X and Y.</div><div class='add'>+ */</div><div class='add'>+static int wacom_parse_hid(struct usb_interface *intf,</div><div class='add'>+			   struct hid_descriptor *hid_desc,</div><div class='ctx'> 			   struct wacom_features *features)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *dev = interface_to_usbdev(intf);</div><div class='hunk'>@@ -244,8 +310,6 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi</div><div class='ctx'> 						/* penabled only accepts exact bytes of data */</div><div class='ctx'> 						if (features-&gt;type == TABLETPC2FG)</div><div class='ctx'> 							features-&gt;pktlen = WACOM_PKGLEN_GRAPHIRE;</div><div class='del'>-						if (features-&gt;type == BAMBOO_PT)</div><div class='del'>-							features-&gt;pktlen = WACOM_PKGLEN_BBFUN;</div><div class='ctx'> 						features-&gt;device_type = BTN_TOOL_PEN;</div><div class='ctx'> 						features-&gt;x_max =</div><div class='ctx'> 							get_unaligned_le16(&amp;report[i + 3]);</div><div class='hunk'>@@ -287,8 +351,6 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi</div><div class='ctx'> 						/* penabled only accepts exact bytes of data */</div><div class='ctx'> 						if (features-&gt;type == TABLETPC2FG)</div><div class='ctx'> 							features-&gt;pktlen = WACOM_PKGLEN_GRAPHIRE;</div><div class='del'>-						if (features-&gt;type == BAMBOO_PT)</div><div class='del'>-							features-&gt;pktlen = WACOM_PKGLEN_BBFUN;</div><div class='ctx'> 						features-&gt;device_type = BTN_TOOL_PEN;</div><div class='ctx'> 						features-&gt;y_max =</div><div class='ctx'> 							get_unaligned_le16(&amp;report[i + 3]);</div><div class='hunk'>@@ -302,6 +364,11 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi</div><div class='ctx'> 				i++;</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='add'>+			/*</div><div class='add'>+			 * Requiring Stylus Usage will ignore boot mouse</div><div class='add'>+			 * X/Y values and some cases of invalid Digitizer X/Y</div><div class='add'>+			 * values commonly reported.</div><div class='add'>+			 */</div><div class='ctx'> 			case HID_USAGE_STYLUS:</div><div class='ctx'> 				pen = 1;</div><div class='ctx'> 				i++;</div><div class='hunk'>@@ -309,10 +376,20 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		case HID_COLLECTION:</div><div class='add'>+		case HID_COLLECTION_END:</div><div class='ctx'> 			/* reset UsagePage and Finger */</div><div class='ctx'> 			finger = usage = 0;</div><div class='ctx'> 			break;</div><div class='add'>+</div><div class='add'>+		case HID_COLLECTION:</div><div class='add'>+			i++;</div><div class='add'>+			switch (report[i]) {</div><div class='add'>+			case HID_COLLECTION_LOGICAL:</div><div class='add'>+				i += wacom_parse_logical_collection(&amp;report[i],</div><div class='add'>+								    features);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -348,7 +425,8 @@ static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_feat</div><div class='ctx'> 						WAC_HID_FEATURE_REPORT,</div><div class='ctx'> 						report_id, rep_data, 4, 1);</div><div class='ctx'> 		} while ((error &lt; 0 || rep_data[1] != 4) &amp;&amp; limit++ &lt; WAC_MSG_RETRIES);</div><div class='del'>-	} else if (features-&gt;type != TABLETPC) {</div><div class='add'>+	} else if (features-&gt;type != TABLETPC &amp;&amp;</div><div class='add'>+		   features-&gt;device_type == BTN_TOOL_PEN) {</div><div class='ctx'> 		do {</div><div class='ctx'> 			rep_data[0] = 2;</div><div class='ctx'> 			rep_data[1] = 2;</div><div class='hunk'>@@ -485,7 +563,8 @@ static int wacom_led_control(struct wacom *wacom)</div><div class='ctx'> 	if (!buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (wacom-&gt;wacom_wac.features.type == WACOM_21UX2)</div><div class='add'>+	if (wacom-&gt;wacom_wac.features.type == WACOM_21UX2 ||</div><div class='add'>+	    wacom-&gt;wacom_wac.features.type == WACOM_24HD)</div><div class='ctx'> 		led = (wacom-&gt;led.select[1] &lt;&lt; 4) | 0x40;</div><div class='ctx'> </div><div class='ctx'> 	led |=  wacom-&gt;led.select[0] | 0x4;</div><div class='hunk'>@@ -704,6 +783,7 @@ static int wacom_initialize_leds(struct wacom *wacom)</div><div class='ctx'> 					   &amp;intuos4_led_attr_group);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case WACOM_24HD:</div><div class='ctx'> 	case WACOM_21UX2:</div><div class='ctx'> 		wacom-&gt;led.select[0] = 0;</div><div class='ctx'> 		wacom-&gt;led.select[1] = 0;</div><div class='hunk'>@@ -738,6 +818,7 @@ static void wacom_destroy_leds(struct wacom *wacom)</div><div class='ctx'> 				   &amp;intuos4_led_attr_group);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case WACOM_24HD:</div><div class='ctx'> 	case WACOM_21UX2:</div><div class='ctx'> 		sysfs_remove_group(&amp;wacom-&gt;intf-&gt;dev.kobj,</div><div class='ctx'> 				   &amp;cintiq_led_attr_group);</div><div class='hunk'>@@ -919,21 +1000,4 @@ static struct usb_driver wacom_driver = {</div><div class='ctx'> 	.supports_autosuspend = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init wacom_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	result = usb_register(&amp;wacom_driver);</div><div class='del'>-	if (result == 0)</div><div class='del'>-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='del'>-		       DRIVER_DESC "\n");</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit wacom_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;wacom_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(wacom_init);</div><div class='del'>-module_exit(wacom_exit);</div><div class='add'>+module_usb_driver(wacom_driver);</div><div class='head'>diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c<br/>index 2ee47d01a3b4..88672ec296c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/tablet/wacom_wac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/tablet/wacom_wac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/tablet/wacom_wac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/tablet/wacom_wac.c</a></div><div class='hunk'>@@ -452,7 +452,7 @@ static void wacom_intuos_general(struct wacom_wac *wacom)</div><div class='ctx'> 	if ((data[1] &amp; 0xb8) == 0xa0) {</div><div class='ctx'> 		t = (data[6] &lt;&lt; 2) | ((data[7] &gt;&gt; 6) &amp; 3);</div><div class='ctx'> 		if ((features-&gt;type &gt;= INTUOS4S &amp;&amp; features-&gt;type &lt;= INTUOS4L) ||</div><div class='del'>-		    features-&gt;type == WACOM_21UX2) {</div><div class='add'>+		    features-&gt;type == WACOM_21UX2 || features-&gt;type == WACOM_24HD) {</div><div class='ctx'> 			t = (t &lt;&lt; 1) | (data[1] &amp; 1);</div><div class='ctx'> 		}</div><div class='ctx'> 		input_report_abs(input, ABS_PRESSURE, t);</div><div class='hunk'>@@ -519,6 +519,56 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)</div><div class='ctx'> 				input_report_key(input, wacom-&gt;tool[1], 0);</div><div class='ctx'> 				input_report_abs(input, ABS_MISC, 0);</div><div class='ctx'> 			}</div><div class='add'>+		} else if (features-&gt;type == WACOM_24HD) {</div><div class='add'>+			input_report_key(input, BTN_0, (data[6] &amp; 0x01));</div><div class='add'>+			input_report_key(input, BTN_1, (data[6] &amp; 0x02));</div><div class='add'>+			input_report_key(input, BTN_2, (data[6] &amp; 0x04));</div><div class='add'>+			input_report_key(input, BTN_3, (data[6] &amp; 0x08));</div><div class='add'>+			input_report_key(input, BTN_4, (data[6] &amp; 0x10));</div><div class='add'>+			input_report_key(input, BTN_5, (data[6] &amp; 0x20));</div><div class='add'>+			input_report_key(input, BTN_6, (data[6] &amp; 0x40));</div><div class='add'>+			input_report_key(input, BTN_7, (data[6] &amp; 0x80));</div><div class='add'>+			input_report_key(input, BTN_8, (data[8] &amp; 0x01));</div><div class='add'>+			input_report_key(input, BTN_9, (data[8] &amp; 0x02));</div><div class='add'>+			input_report_key(input, BTN_A, (data[8] &amp; 0x04));</div><div class='add'>+			input_report_key(input, BTN_B, (data[8] &amp; 0x08));</div><div class='add'>+			input_report_key(input, BTN_C, (data[8] &amp; 0x10));</div><div class='add'>+			input_report_key(input, BTN_X, (data[8] &amp; 0x20));</div><div class='add'>+			input_report_key(input, BTN_Y, (data[8] &amp; 0x40));</div><div class='add'>+			input_report_key(input, BTN_Z, (data[8] &amp; 0x80));</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Three "buttons" are available on the 24HD which are</div><div class='add'>+			 * physically implemented as a touchstrip. Each button</div><div class='add'>+			 * is approximately 3 bits wide with a 2 bit spacing.</div><div class='add'>+			 * The raw touchstrip bits are stored at:</div><div class='add'>+			 *    ((data[3] &amp; 0x1f) &lt;&lt; 8) | data[4])</div><div class='add'>+			 */</div><div class='add'>+			input_report_key(input, KEY_PROG1, data[4] &amp; 0x07);</div><div class='add'>+			input_report_key(input, KEY_PROG2, data[4] &amp; 0xE0);</div><div class='add'>+			input_report_key(input, KEY_PROG3, data[3] &amp; 0x1C);</div><div class='add'>+</div><div class='add'>+			if (data[1] &amp; 0x80) {</div><div class='add'>+				input_report_abs(input, ABS_WHEEL, (data[1] &amp; 0x7f));</div><div class='add'>+			} else {</div><div class='add'>+				/* Out of proximity, clear wheel value. */</div><div class='add'>+				input_report_abs(input, ABS_WHEEL, 0);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (data[2] &amp; 0x80) {</div><div class='add'>+				input_report_abs(input, ABS_THROTTLE, (data[2] &amp; 0x7f));</div><div class='add'>+			} else {</div><div class='add'>+				/* Out of proximity, clear second wheel value. */</div><div class='add'>+				input_report_abs(input, ABS_THROTTLE, 0);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (data[1] | data[2] | (data[3] &amp; 0x1f) | data[4] | data[6] | data[8]) {</div><div class='add'>+				input_report_key(input, wacom-&gt;tool[1], 1);</div><div class='add'>+				input_report_abs(input, ABS_MISC, PAD_DEVICE_ID);</div><div class='add'>+			} else {</div><div class='add'>+				input_report_key(input, wacom-&gt;tool[1], 0);</div><div class='add'>+				input_report_abs(input, ABS_MISC, 0);</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (features-&gt;type == WACOM_21UX2) {</div><div class='ctx'> 				input_report_key(input, BTN_0, (data[5] &amp; 0x01));</div><div class='hunk'>@@ -799,6 +849,9 @@ static int wacom_bpt_touch(struct wacom_wac *wacom)</div><div class='ctx'> 	unsigned char *data = wacom-&gt;data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (data[0] != 0x02)</div><div class='add'>+	    return 0;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		int offset = (data[1] &amp; 0x80) ? (8 * i) : (9 * i);</div><div class='ctx'> 		bool touch = data[offset + 3] &amp; 0x80;</div><div class='hunk'>@@ -837,18 +890,77 @@ static int wacom_bpt_touch(struct wacom_wac *wacom)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void wacom_bpt3_touch_msg(struct wacom_wac *wacom, unsigned char *data)</div><div class='add'>+{</div><div class='add'>+	struct input_dev *input = wacom-&gt;input;</div><div class='add'>+	int slot_id = data[0] - 2;  /* data[0] is between 2 and 17 */</div><div class='add'>+	bool touch = data[1] &amp; 0x80;</div><div class='add'>+</div><div class='add'>+	touch = touch &amp;&amp; !wacom-&gt;shared-&gt;stylus_in_proximity;</div><div class='add'>+</div><div class='add'>+	input_mt_slot(input, slot_id);</div><div class='add'>+	input_mt_report_slot_state(input, MT_TOOL_FINGER, touch);</div><div class='add'>+</div><div class='add'>+	if (touch) {</div><div class='add'>+		int x = (data[2] &lt;&lt; 4) | (data[4] &gt;&gt; 4);</div><div class='add'>+		int y = (data[3] &lt;&lt; 4) | (data[4] &amp; 0x0f);</div><div class='add'>+		int w = data[6];</div><div class='add'>+</div><div class='add'>+		input_report_abs(input, ABS_MT_POSITION_X, x);</div><div class='add'>+		input_report_abs(input, ABS_MT_POSITION_Y, y);</div><div class='add'>+		input_report_abs(input, ABS_MT_TOUCH_MAJOR, w);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wacom_bpt3_button_msg(struct wacom_wac *wacom, unsigned char *data)</div><div class='add'>+{</div><div class='add'>+	struct input_dev *input = wacom-&gt;input;</div><div class='add'>+</div><div class='add'>+	input_report_key(input, BTN_LEFT, (data[1] &amp; 0x08) != 0);</div><div class='add'>+	input_report_key(input, BTN_FORWARD, (data[1] &amp; 0x04) != 0);</div><div class='add'>+	input_report_key(input, BTN_BACK, (data[1] &amp; 0x02) != 0);</div><div class='add'>+	input_report_key(input, BTN_RIGHT, (data[1] &amp; 0x01) != 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wacom_bpt3_touch(struct wacom_wac *wacom)</div><div class='add'>+{</div><div class='add'>+	struct input_dev *input = wacom-&gt;input;</div><div class='add'>+	unsigned char *data = wacom-&gt;data;</div><div class='add'>+	int count = data[1] &amp; 0x03;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (data[0] != 0x02)</div><div class='add'>+	    return 0;</div><div class='add'>+</div><div class='add'>+	/* data has up to 7 fixed sized 8-byte messages starting at data[2] */</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		int offset = (8 * i) + 2;</div><div class='add'>+		int msg_id = data[offset];</div><div class='add'>+</div><div class='add'>+		if (msg_id &gt;= 2 &amp;&amp; msg_id &lt;= 17)</div><div class='add'>+			wacom_bpt3_touch_msg(wacom, data + offset);</div><div class='add'>+		else if (msg_id == 128)</div><div class='add'>+			wacom_bpt3_button_msg(wacom, data + offset);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_mt_report_pointer_emulation(input, true);</div><div class='add'>+</div><div class='add'>+	input_sync(input);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int wacom_bpt_pen(struct wacom_wac *wacom)</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *input = wacom-&gt;input;</div><div class='ctx'> 	unsigned char *data = wacom-&gt;data;</div><div class='ctx'> 	int prox = 0, x = 0, y = 0, p = 0, d = 0, pen = 0, btn1 = 0, btn2 = 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Similar to Graphire protocol, data[1] &amp; 0x20 is proximity and</div><div class='del'>-	 * data[1] &amp; 0x18 is tool ID.  0x30 is safety check to ignore</div><div class='del'>-	 * 2 unused tool ID's.</div><div class='del'>-	 */</div><div class='del'>-	prox = (data[1] &amp; 0x30) == 0x30;</div><div class='add'>+	if (data[0] != 0x02)</div><div class='add'>+	    return 0;</div><div class='add'>+</div><div class='add'>+	prox = (data[1] &amp; 0x20) == 0x20;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * All reports shared between PEN and RUBBER tool must be</div><div class='hunk'>@@ -912,7 +1024,9 @@ static int wacom_bpt_irq(struct wacom_wac *wacom, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	if (len == WACOM_PKGLEN_BBTOUCH)</div><div class='ctx'> 		return wacom_bpt_touch(wacom);</div><div class='del'>-	else if (len == WACOM_PKGLEN_BBFUN)</div><div class='add'>+	else if (len == WACOM_PKGLEN_BBTOUCH3)</div><div class='add'>+		return wacom_bpt3_touch(wacom);</div><div class='add'>+	else if (len == WACOM_PKGLEN_BBFUN || len == WACOM_PKGLEN_BBPEN)</div><div class='ctx'> 		return wacom_bpt_pen(wacom);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -955,6 +1069,7 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len)</div><div class='ctx'> 	case CINTIQ:</div><div class='ctx'> 	case WACOM_BEE:</div><div class='ctx'> 	case WACOM_21UX2:</div><div class='add'>+	case WACOM_24HD:</div><div class='ctx'> 		sync = wacom_intuos_irq(wacom_wac);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1031,9 +1146,9 @@ void wacom_setup_device_quirks(struct wacom_features *features)</div><div class='ctx'> 	    features-&gt;type == BAMBOO_PT)</div><div class='ctx'> 		features-&gt;quirks |= WACOM_QUIRK_MULTI_INPUT;</div><div class='ctx'> </div><div class='del'>-	/* quirks for bamboo touch */</div><div class='add'>+	/* quirk for bamboo touch with 2 low res touches */</div><div class='ctx'> 	if (features-&gt;type == BAMBOO_PT &amp;&amp;</div><div class='del'>-	    features-&gt;device_type == BTN_TOOL_DOUBLETAP) {</div><div class='add'>+	    features-&gt;pktlen == WACOM_PKGLEN_BBTOUCH) {</div><div class='ctx'> 		features-&gt;x_max &lt;&lt;= 5;</div><div class='ctx'> 		features-&gt;y_max &lt;&lt;= 5;</div><div class='ctx'> 		features-&gt;x_fuzz &lt;&lt;= 5;</div><div class='hunk'>@@ -1110,6 +1225,26 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,</div><div class='ctx'> 		__set_bit(INPUT_PROP_POINTER, input_dev-&gt;propbit);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case WACOM_24HD:</div><div class='add'>+		__set_bit(BTN_A, input_dev-&gt;keybit);</div><div class='add'>+		__set_bit(BTN_B, input_dev-&gt;keybit);</div><div class='add'>+		__set_bit(BTN_C, input_dev-&gt;keybit);</div><div class='add'>+		__set_bit(BTN_X, input_dev-&gt;keybit);</div><div class='add'>+		__set_bit(BTN_Y, input_dev-&gt;keybit);</div><div class='add'>+		__set_bit(BTN_Z, input_dev-&gt;keybit);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 10; i++)</div><div class='add'>+			__set_bit(BTN_0 + i, input_dev-&gt;keybit);</div><div class='add'>+</div><div class='add'>+		__set_bit(KEY_PROG1, input_dev-&gt;keybit);</div><div class='add'>+		__set_bit(KEY_PROG2, input_dev-&gt;keybit);</div><div class='add'>+		__set_bit(KEY_PROG3, input_dev-&gt;keybit);</div><div class='add'>+</div><div class='add'>+		input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);</div><div class='add'>+		input_set_abs_params(input_dev, ABS_THROTTLE, 0, 71, 0, 0);</div><div class='add'>+		wacom_setup_cintiq(wacom_wac);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case WACOM_21UX2:</div><div class='ctx'> 		__set_bit(BTN_A, input_dev-&gt;keybit);</div><div class='ctx'> 		__set_bit(BTN_B, input_dev-&gt;keybit);</div><div class='hunk'>@@ -1240,7 +1375,21 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,</div><div class='ctx'> 			__set_bit(BTN_TOOL_FINGER, input_dev-&gt;keybit);</div><div class='ctx'> 			__set_bit(BTN_TOOL_DOUBLETAP, input_dev-&gt;keybit);</div><div class='ctx'> </div><div class='del'>-			input_mt_init_slots(input_dev, 2);</div><div class='add'>+			if (features-&gt;pktlen == WACOM_PKGLEN_BBTOUCH3) {</div><div class='add'>+				__set_bit(BTN_TOOL_TRIPLETAP,</div><div class='add'>+					  input_dev-&gt;keybit);</div><div class='add'>+				__set_bit(BTN_TOOL_QUADTAP,</div><div class='add'>+					  input_dev-&gt;keybit);</div><div class='add'>+</div><div class='add'>+				input_mt_init_slots(input_dev, 16);</div><div class='add'>+</div><div class='add'>+				input_set_abs_params(input_dev,</div><div class='add'>+						     ABS_MT_TOUCH_MAJOR,</div><div class='add'>+						     0, 255, 0, 0);</div><div class='add'>+			} else {</div><div class='add'>+				input_mt_init_slots(input_dev, 2);</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			input_set_abs_params(input_dev, ABS_MT_POSITION_X,</div><div class='ctx'> 					     0, features-&gt;x_max,</div><div class='ctx'> 					     features-&gt;x_fuzz, 0);</div><div class='hunk'>@@ -1425,6 +1574,9 @@ static const struct wacom_features wacom_features_0xBB =</div><div class='ctx'> static const struct wacom_features wacom_features_0xBC =</div><div class='ctx'> 	{ "Wacom Intuos4 WL",     WACOM_PKGLEN_INTUOS,    40840, 25400, 2047,</div><div class='ctx'> 	  63, INTUOS4, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };</div><div class='add'>+static const struct wacom_features wacom_features_0xF4 =</div><div class='add'>+	{ "Wacom Cintiq 24HD",    WACOM_PKGLEN_INTUOS,   104480, 65600, 2047,</div><div class='add'>+	  63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };</div><div class='ctx'> static const struct wacom_features wacom_features_0x3F =</div><div class='ctx'> 	{ "Wacom Cintiq 21UX",    WACOM_PKGLEN_INTUOS,    87200, 65600, 1023,</div><div class='ctx'> 	  63, CINTIQ, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };</div><div class='hunk'>@@ -1509,6 +1661,15 @@ static const struct wacom_features wacom_features_0xDA =</div><div class='ctx'> static struct wacom_features wacom_features_0xDB =</div><div class='ctx'> 	{ "Wacom Bamboo 2FG 6x8 SE", WACOM_PKGLEN_BBFUN,  21648, 13700, 1023,</div><div class='ctx'> 	  31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };</div><div class='add'>+static const struct wacom_features wacom_features_0xDD =</div><div class='add'>+        { "Wacom Bamboo Connect", WACOM_PKGLEN_BBPEN,     14720,  9200, 1023,</div><div class='add'>+          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };</div><div class='add'>+static const struct wacom_features wacom_features_0xDE =</div><div class='add'>+        { "Wacom Bamboo 16FG 4x5", WACOM_PKGLEN_BBPEN,    14720,  9200, 1023,</div><div class='add'>+          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };</div><div class='add'>+static const struct wacom_features wacom_features_0xDF =</div><div class='add'>+        { "Wacom Bamboo 16FG 6x8", WACOM_PKGLEN_BBPEN,    21648, 13700, 1023,</div><div class='add'>+          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };</div><div class='ctx'> static const struct wacom_features wacom_features_0x6004 =</div><div class='ctx'> 	{ "ISD-V4",               WACOM_PKGLEN_GRAPHIRE,  12800,  8000,  255,</div><div class='ctx'> 	  0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };</div><div class='hunk'>@@ -1604,6 +1765,9 @@ const struct usb_device_id wacom_ids[] = {</div><div class='ctx'> 	{ USB_DEVICE_WACOM(0xD8) },</div><div class='ctx'> 	{ USB_DEVICE_WACOM(0xDA) },</div><div class='ctx'> 	{ USB_DEVICE_WACOM(0xDB) },</div><div class='add'>+	{ USB_DEVICE_WACOM(0xDD) },</div><div class='add'>+	{ USB_DEVICE_WACOM(0xDE) },</div><div class='add'>+	{ USB_DEVICE_WACOM(0xDF) },</div><div class='ctx'> 	{ USB_DEVICE_WACOM(0xF0) },</div><div class='ctx'> 	{ USB_DEVICE_WACOM(0xCC) },</div><div class='ctx'> 	{ USB_DEVICE_WACOM(0x90) },</div><div class='hunk'>@@ -1616,6 +1780,7 @@ const struct usb_device_id wacom_ids[] = {</div><div class='ctx'> 	{ USB_DEVICE_WACOM(0xE6) },</div><div class='ctx'> 	{ USB_DEVICE_WACOM(0xEC) },</div><div class='ctx'> 	{ USB_DEVICE_WACOM(0x47) },</div><div class='add'>+	{ USB_DEVICE_WACOM(0xF4) },</div><div class='ctx'> 	{ USB_DEVICE_LENOVO(0x6004) },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h<br/>index 53eb71b68330..050acaefee7d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/tablet/wacom_wac.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/tablet/wacom_wac.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/tablet/wacom_wac.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/tablet/wacom_wac.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* maximum packet length for USB devices */</div><div class='del'>-#define WACOM_PKGLEN_MAX	32</div><div class='add'>+#define WACOM_PKGLEN_MAX	64</div><div class='ctx'> </div><div class='ctx'> /* packet length for individual models */</div><div class='ctx'> #define WACOM_PKGLEN_PENPRTN	 7</div><div class='hunk'>@@ -22,6 +22,8 @@</div><div class='ctx'> #define WACOM_PKGLEN_TPC1FG	 5</div><div class='ctx'> #define WACOM_PKGLEN_TPC2FG	14</div><div class='ctx'> #define WACOM_PKGLEN_BBTOUCH	20</div><div class='add'>+#define WACOM_PKGLEN_BBTOUCH3	64</div><div class='add'>+#define WACOM_PKGLEN_BBPEN	10</div><div class='ctx'> </div><div class='ctx'> /* device IDs */</div><div class='ctx'> #define STYLUS_DEVICE_ID	0x02</div><div class='hunk'>@@ -57,6 +59,7 @@ enum {</div><div class='ctx'> 	INTUOS4S,</div><div class='ctx'> 	INTUOS4,</div><div class='ctx'> 	INTUOS4L,</div><div class='add'>+	WACOM_24HD,</div><div class='ctx'> 	WACOM_21UX2,</div><div class='ctx'> 	CINTIQ,</div><div class='ctx'> 	WACOM_BEE,</div><div class='head'>diff --git a/drivers/input/touchscreen/88pm860x-ts.c b/drivers/input/touchscreen/88pm860x-ts.c<br/>index b3aebc2166ba..05f30b73c3c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/88pm860x-ts.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/88pm860x-ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/88pm860x-ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/88pm860x-ts.c</a></div><div class='hunk'>@@ -217,18 +217,7 @@ static struct platform_driver pm860x_touch_driver = {</div><div class='ctx'> 	.probe	= pm860x_touch_probe,</div><div class='ctx'> 	.remove	= __devexit_p(pm860x_touch_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init pm860x_touch_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pm860x_touch_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pm860x_touch_init);</div><div class='del'>-</div><div class='del'>-static void __exit pm860x_touch_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pm860x_touch_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(pm860x_touch_exit);</div><div class='add'>+module_platform_driver(pm860x_touch_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Touchscreen driver for Marvell Semiconductor 88PM860x");</div><div class='ctx'> MODULE_AUTHOR("Haojian Zhuang &lt;haojian.zhuang@marvell.com&gt;");</div><div class='head'>diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig<br/>index 3488ffe1fa0a..4af2a18eb3ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/Kconfig</a></div><div class='hunk'>@@ -98,6 +98,19 @@ config TOUCHSCREEN_ATMEL_MXT</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called atmel_mxt_ts.</div><div class='ctx'> </div><div class='add'>+config TOUCHSCREEN_AUO_PIXCIR</div><div class='add'>+	tristate "AUO in-cell touchscreen using Pixcir ICs"</div><div class='add'>+	depends on I2C</div><div class='add'>+	depends on GPIOLIB</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you have a AUO display with in-cell touchscreen</div><div class='add'>+	  using Pixcir ICs.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</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 auo-pixcir-ts.</div><div class='add'>+</div><div class='ctx'> config TOUCHSCREEN_BITSY</div><div class='ctx'> 	tristate "Compaq iPAQ H3600 (Bitsy) touchscreen"</div><div class='ctx'> 	depends on SA1100_BITSY</div><div class='hunk'>@@ -177,6 +190,16 @@ config TOUCHSCREEN_EETI</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called eeti_ts.</div><div class='ctx'> </div><div class='add'>+config TOUCHSCREEN_EGALAX</div><div class='add'>+	tristate "EETI eGalax multi-touch panel support"</div><div class='add'>+	depends on I2C</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to enable support for I2C connected EETI</div><div class='add'>+	  eGalax multi-touch panels.</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 egalax_ts.</div><div class='add'>+</div><div class='ctx'> config TOUCHSCREEN_FUJITSU</div><div class='ctx'> 	tristate "Fujitsu serial touchscreen"</div><div class='ctx'> 	select SERIO</div><div class='hunk'>@@ -435,6 +458,18 @@ config TOUCHSCREEN_UCB1400</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called ucb1400_ts.</div><div class='ctx'> </div><div class='add'>+config TOUCHSCREEN_PIXCIR</div><div class='add'>+	tristate "PIXCIR I2C touchscreens"</div><div class='add'>+	depends on I2C</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you have a pixcir i2c touchscreen</div><div class='add'>+	  controller.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</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 pixcir_i2c_ts.</div><div class='add'>+</div><div class='ctx'> config TOUCHSCREEN_WM831X</div><div class='ctx'> 	tristate "Support for WM831x touchscreen controllers"</div><div class='ctx'> 	depends on MFD_WM831X</div><div class='hunk'>@@ -541,6 +576,7 @@ config TOUCHSCREEN_USB_COMPOSITE</div><div class='ctx'> 	  - GoTop Super_Q2/GogoPen/PenPower tablets</div><div class='ctx'> 	  - JASTEC USB Touch Controller/DigiTech DTR-02U</div><div class='ctx'> 	  - Zytronic controllers</div><div class='add'>+	  - Elo TouchSystems 2700 IntelliTouch</div><div class='ctx'> </div><div class='ctx'> 	  Have a look at &lt;http://linux.chapter7.ch/touchkit/&gt; for</div><div class='ctx'> 	  a usage description and the required user-space stuff.</div><div class='hunk'>@@ -620,6 +656,11 @@ config TOUCHSCREEN_USB_JASTEC</div><div class='ctx'> 	bool "JASTEC/DigiTech DTR-02U USB touch controller device support" if EXPERT</div><div class='ctx'> 	depends on TOUCHSCREEN_USB_COMPOSITE</div><div class='ctx'> </div><div class='add'>+config TOUCHSCREEN_USB_ELO</div><div class='add'>+	default y</div><div class='add'>+	bool "Elo TouchSystems 2700 IntelliTouch controller device support" if EXPERT</div><div class='add'>+	depends on TOUCHSCREEN_USB_COMPOSITE</div><div class='add'>+</div><div class='ctx'> config TOUCHSCREEN_USB_E2I</div><div class='ctx'> 	default y</div><div class='ctx'> 	bool "e2i Touchscreen controller (e.g. from Mimo 740)"</div><div class='head'>diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile<br/>index f957676035a4..496091e88460 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/Makefile</a></div><div class='hunk'>@@ -14,6 +14,7 @@ obj-$(CONFIG_TOUCHSCREEN_AD7879_SPI)	+= ad7879-spi.o</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_ADS7846)	+= ads7846.o</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_ATMEL_MXT)	+= atmel_mxt_ts.o</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_ATMEL_TSADCC)	+= atmel_tsadcc.o</div><div class='add'>+obj-$(CONFIG_TOUCHSCREEN_AUO_PIXCIR)	+= auo-pixcir-ts.o</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_BITSY)		+= h3600_ts_input.o</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_BU21013)       += bu21013_ts.o</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_CY8CTMG110)	+= cy8ctmg110_ts.o</div><div class='hunk'>@@ -23,6 +24,7 @@ obj-$(CONFIG_TOUCHSCREEN_HAMPSHIRE)	+= hampshire.o</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_GUNZE)		+= gunze.o</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_EETI)		+= eeti_ts.o</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_ELO)		+= elo.o</div><div class='add'>+obj-$(CONFIG_TOUCHSCREEN_EGALAX)	+= egalax_ts.o</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_FUJITSU)	+= fujitsu_ts.o</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_INEXIO)	+= inexio.o</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_INTEL_MID)	+= intel-mid-touch.o</div><div class='hunk'>@@ -39,6 +41,7 @@ obj-$(CONFIG_TOUCHSCREEN_HTCPEN)	+= htcpen.o</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_USB_COMPOSITE)	+= usbtouchscreen.o</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_PCAP)		+= pcap_ts.o</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_PENMOUNT)	+= penmount.o</div><div class='add'>+obj-$(CONFIG_TOUCHSCREEN_PIXCIR)	+= pixcir_i2c_ts.o</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_S3C2410)	+= s3c2410_ts.o</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_ST1232)	+= st1232.o</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_STMPE)		+= stmpe-ts.o</div><div class='head'>diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c<br/>index 400131df677b..49a36df0b752 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/ad7877.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/ad7877.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/ad7877.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/ad7877.c</a></div><div class='hunk'>@@ -488,10 +488,10 @@ static ssize_t ad7877_disable_store(struct device *dev,</div><div class='ctx'> 				     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ad7877 *ts = dev_get_drvdata(dev);</div><div class='del'>-	unsigned long val;</div><div class='add'>+	unsigned int val;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	error = kstrtouint(buf, 10, &amp;val);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -518,10 +518,10 @@ static ssize_t ad7877_dac_store(struct device *dev,</div><div class='ctx'> 				     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ad7877 *ts = dev_get_drvdata(dev);</div><div class='del'>-	unsigned long val;</div><div class='add'>+	unsigned int val;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	error = kstrtouint(buf, 10, &amp;val);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -548,10 +548,10 @@ static ssize_t ad7877_gpio3_store(struct device *dev,</div><div class='ctx'> 				     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ad7877 *ts = dev_get_drvdata(dev);</div><div class='del'>-	unsigned long val;</div><div class='add'>+	unsigned int val;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	error = kstrtouint(buf, 10, &amp;val);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -579,10 +579,10 @@ static ssize_t ad7877_gpio4_store(struct device *dev,</div><div class='ctx'> 				     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ad7877 *ts = dev_get_drvdata(dev);</div><div class='del'>-	unsigned long val;</div><div class='add'>+	unsigned int val;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	error = kstrtouint(buf, 10, &amp;val);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -612,10 +612,10 @@ static struct attribute *ad7877_attributes[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static mode_t ad7877_attr_is_visible(struct kobject *kobj,</div><div class='add'>+static umode_t ad7877_attr_is_visible(struct kobject *kobj,</div><div class='ctx'> 				     struct attribute *attr, int n)</div><div class='ctx'> {</div><div class='del'>-	mode_t mode = attr-&gt;mode;</div><div class='add'>+	umode_t mode = attr-&gt;mode;</div><div class='ctx'> </div><div class='ctx'> 	if (attr == &amp;dev_attr_aux3.attr) {</div><div class='ctx'> 		if (gpio3)</div><div class='hunk'>@@ -853,7 +853,6 @@ static SIMPLE_DEV_PM_OPS(ad7877_pm, ad7877_suspend, ad7877_resume);</div><div class='ctx'> static struct spi_driver ad7877_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "ad7877",</div><div class='del'>-		.bus	= &amp;spi_bus_type,</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 		.pm	= &amp;ad7877_pm,</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/input/touchscreen/ad7879-i2c.c b/drivers/input/touchscreen/ad7879-i2c.c<br/>index c789b974c795..0dac6712f42b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/ad7879-i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/ad7879-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/ad7879-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/ad7879-i2c.c</a></div><div class='hunk'>@@ -16,30 +16,6 @@</div><div class='ctx'> </div><div class='ctx'> #define AD7879_DEVID		0x79	/* AD7879-1/AD7889-1 */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM_SLEEP</div><div class='del'>-static int ad7879_i2c_suspend(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct i2c_client *client = to_i2c_client(dev);</div><div class='del'>-	struct ad7879 *ts = i2c_get_clientdata(client);</div><div class='del'>-</div><div class='del'>-	ad7879_suspend(ts);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad7879_i2c_resume(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct i2c_client *client = to_i2c_client(dev);</div><div class='del'>-	struct ad7879 *ts = i2c_get_clientdata(client);</div><div class='del'>-</div><div class='del'>-	ad7879_resume(ts);</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 SIMPLE_DEV_PM_OPS(ad7879_i2c_pm, ad7879_i2c_suspend, ad7879_i2c_resume);</div><div class='del'>-</div><div class='ctx'> /* All registers are word-sized.</div><div class='ctx'>  * AD7879 uses a high-byte first convention.</div><div class='ctx'>  */</div><div class='hunk'>@@ -47,7 +23,7 @@ static int ad7879_i2c_read(struct device *dev, u8 reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> </div><div class='del'>-	return swab16(i2c_smbus_read_word_data(client, reg));</div><div class='add'>+	return i2c_smbus_read_word_swapped(client, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ad7879_i2c_multi_read(struct device *dev,</div><div class='hunk'>@@ -68,7 +44,7 @@ static int ad7879_i2c_write(struct device *dev, u8 reg, u16 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> </div><div class='del'>-	return i2c_smbus_write_word_data(client, reg, swab16(val));</div><div class='add'>+	return i2c_smbus_write_word_swapped(client, reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ad7879_bus_ops ad7879_i2c_bus_ops = {</div><div class='hunk'>@@ -119,7 +95,7 @@ static struct i2c_driver ad7879_i2c_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "ad7879",</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='del'>-		.pm	= &amp;ad7879_i2c_pm,</div><div class='add'>+		.pm	= &amp;ad7879_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= ad7879_i2c_probe,</div><div class='ctx'> 	.remove		= __devexit_p(ad7879_i2c_remove),</div><div class='hunk'>@@ -141,4 +117,3 @@ module_exit(ad7879_i2c_exit);</div><div class='ctx'> MODULE_AUTHOR("Michael Hennerich &lt;hennerich@blackfin.uclinux.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("AD7879(-1) touchscreen I2C bus driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS("i2c:ad7879");</div><div class='head'>diff --git a/drivers/input/touchscreen/ad7879-spi.c b/drivers/input/touchscreen/ad7879-spi.c<br/>index b1643c8fa7c9..9b2e1c2b1971 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/ad7879-spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/ad7879-spi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/ad7879-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/ad7879-spi.c</a></div><div class='hunk'>@@ -22,30 +22,6 @@</div><div class='ctx'> #define AD7879_WRITECMD(reg) (AD7879_CMD(reg))</div><div class='ctx'> #define AD7879_READCMD(reg)  (AD7879_CMD(reg) | AD7879_CMD_READ)</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM_SLEEP</div><div class='del'>-static int ad7879_spi_suspend(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct spi_device *spi = to_spi_device(dev);</div><div class='del'>-	struct ad7879 *ts = spi_get_drvdata(spi);</div><div class='del'>-</div><div class='del'>-	ad7879_suspend(ts);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad7879_spi_resume(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct spi_device *spi = to_spi_device(dev);</div><div class='del'>-	struct ad7879 *ts = spi_get_drvdata(spi);</div><div class='del'>-</div><div class='del'>-	ad7879_resume(ts);</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 SIMPLE_DEV_PM_OPS(ad7879_spi_pm, ad7879_spi_suspend, ad7879_spi_resume);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * ad7879_read/write are only used for initial setup and for sysfs controls.</div><div class='ctx'>  * The main traffic is done in ad7879_collect().</div><div class='hunk'>@@ -174,9 +150,8 @@ static int __devexit ad7879_spi_remove(struct spi_device *spi)</div><div class='ctx'> static struct spi_driver ad7879_spi_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "ad7879",</div><div class='del'>-		.bus	= &amp;spi_bus_type,</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='del'>-		.pm	= &amp;ad7879_spi_pm,</div><div class='add'>+		.pm	= &amp;ad7879_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= ad7879_spi_probe,</div><div class='ctx'> 	.remove		= __devexit_p(ad7879_spi_remove),</div><div class='head'>diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c<br/>index 3b2e9ed2aeec..e2482b40da51 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/ad7879.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/ad7879.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/ad7879.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/ad7879.c</a></div><div class='hunk'>@@ -281,8 +281,11 @@ static void ad7879_close(struct input_dev* input)</div><div class='ctx'> 		__ad7879_disable(ts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ad7879_suspend(struct ad7879 *ts)</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int ad7879_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct ad7879 *ts = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;ts-&gt;input-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (!ts-&gt;suspended &amp;&amp; !ts-&gt;disabled &amp;&amp; ts-&gt;input-&gt;users)</div><div class='hunk'>@@ -291,11 +294,14 @@ void ad7879_suspend(struct ad7879 *ts)</div><div class='ctx'> 	ts-&gt;suspended = true;</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;ts-&gt;input-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(ad7879_suspend);</div><div class='ctx'> </div><div class='del'>-void ad7879_resume(struct ad7879 *ts)</div><div class='add'>+static int ad7879_resume(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct ad7879 *ts = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;ts-&gt;input-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (ts-&gt;suspended &amp;&amp; !ts-&gt;disabled &amp;&amp; ts-&gt;input-&gt;users)</div><div class='hunk'>@@ -304,8 +310,13 @@ void ad7879_resume(struct ad7879 *ts)</div><div class='ctx'> 	ts-&gt;suspended = false;</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;ts-&gt;input-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(ad7879_resume);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+SIMPLE_DEV_PM_OPS(ad7879_pm_ops, ad7879_suspend, ad7879_resume);</div><div class='add'>+EXPORT_SYMBOL(ad7879_pm_ops);</div><div class='ctx'> </div><div class='ctx'> static void ad7879_toggle(struct ad7879 *ts, bool disable)</div><div class='ctx'> {</div><div class='hunk'>@@ -340,10 +351,10 @@ static ssize_t ad7879_disable_store(struct device *dev,</div><div class='ctx'> 				     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ad7879 *ts = dev_get_drvdata(dev);</div><div class='del'>-	unsigned long val;</div><div class='add'>+	unsigned int val;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	error = kstrtouint(buf, 10, &amp;val);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/touchscreen/ad7879.h b/drivers/input/touchscreen/ad7879.h<br/>index 6b45a27236c7..6fd13c48d373 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/ad7879.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/ad7879.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/ad7879.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/ad7879.h</a></div><div class='hunk'>@@ -21,8 +21,8 @@ struct ad7879_bus_ops {</div><div class='ctx'> 	int (*write)(struct device *dev, u8 reg, u16 val);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void ad7879_suspend(struct ad7879 *);</div><div class='del'>-void ad7879_resume(struct ad7879 *);</div><div class='add'>+extern const struct dev_pm_ops ad7879_pm_ops;</div><div class='add'>+</div><div class='ctx'> struct ad7879 *ad7879_probe(struct device *dev, u8 devid, unsigned irq,</div><div class='ctx'> 			    const struct ad7879_bus_ops *bops);</div><div class='ctx'> void ad7879_remove(struct ad7879 *);</div><div class='head'>diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c<br/>index de31ec6fe9e4..23fd90185659 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/ads7846.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/ads7846.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/ads7846.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/ads7846.c</a></div><div class='hunk'>@@ -602,10 +602,12 @@ static ssize_t ads7846_disable_store(struct device *dev,</div><div class='ctx'> 				     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ads7846 *ts = dev_get_drvdata(dev);</div><div class='del'>-	unsigned long i;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;i))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	err = kstrtouint(buf, 10, &amp;i);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (i)</div><div class='ctx'> 		ads7846_disable(ts);</div><div class='hunk'>@@ -1424,7 +1426,6 @@ static int __devexit ads7846_remove(struct spi_device *spi)</div><div class='ctx'> static struct spi_driver ads7846_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "ads7846",</div><div class='del'>-		.bus	= &amp;spi_bus_type,</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 		.pm	= &amp;ads7846_pm,</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/input/touchscreen/atmel_tsadcc.c b/drivers/input/touchscreen/atmel_tsadcc.c<br/>index 122a87883659..201b2d2ec1b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/atmel_tsadcc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/atmel_tsadcc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/atmel_tsadcc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/atmel_tsadcc.c</a></div><div class='hunk'>@@ -351,20 +351,7 @@ static struct platform_driver atmel_tsadcc_driver = {</div><div class='ctx'> 		.name	= "atmel_tsadcc",</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init atmel_tsadcc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;atmel_tsadcc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit atmel_tsadcc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;atmel_tsadcc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(atmel_tsadcc_init);</div><div class='del'>-module_exit(atmel_tsadcc_exit);</div><div class='del'>-</div><div class='add'>+module_platform_driver(atmel_tsadcc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("Atmel TouchScreen Driver");</div><div class='head'>diff --git a/drivers/input/touchscreen/auo-pixcir-ts.c b/drivers/input/touchscreen/auo-pixcir-ts.c<br/>new file mode 100644<br/>index 000000000000..94fb9fbb08a9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/auo-pixcir-ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/auo-pixcir-ts.c</a></div><div class='hunk'>@@ -0,0 +1,652 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for AUO in-cell touchscreens</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Heiko Stuebner &lt;heiko@sntech.de&gt;</div><div class='add'>+ *</div><div class='add'>+ * loosely based on auo_touch.c from Dell Streak vendor-kernel</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 QUALCOMM Incorporated.</div><div class='add'>+ * Copyright (c) 2008 QUALCOMM USA, INC.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/input/auo-pixcir-ts.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Coordinate calculation:</div><div class='add'>+ * X1 = X1_LSB + X1_MSB*256</div><div class='add'>+ * Y1 = Y1_LSB + Y1_MSB*256</div><div class='add'>+ * X2 = X2_LSB + X2_MSB*256</div><div class='add'>+ * Y2 = Y2_LSB + Y2_MSB*256</div><div class='add'>+ */</div><div class='add'>+#define AUO_PIXCIR_REG_X1_LSB		0x00</div><div class='add'>+#define AUO_PIXCIR_REG_X1_MSB		0x01</div><div class='add'>+#define AUO_PIXCIR_REG_Y1_LSB		0x02</div><div class='add'>+#define AUO_PIXCIR_REG_Y1_MSB		0x03</div><div class='add'>+#define AUO_PIXCIR_REG_X2_LSB		0x04</div><div class='add'>+#define AUO_PIXCIR_REG_X2_MSB		0x05</div><div class='add'>+#define AUO_PIXCIR_REG_Y2_LSB		0x06</div><div class='add'>+#define AUO_PIXCIR_REG_Y2_MSB		0x07</div><div class='add'>+</div><div class='add'>+#define AUO_PIXCIR_REG_STRENGTH		0x0d</div><div class='add'>+#define AUO_PIXCIR_REG_STRENGTH_X1_LSB	0x0e</div><div class='add'>+#define AUO_PIXCIR_REG_STRENGTH_X1_MSB	0x0f</div><div class='add'>+</div><div class='add'>+#define AUO_PIXCIR_REG_RAW_DATA_X	0x2b</div><div class='add'>+#define AUO_PIXCIR_REG_RAW_DATA_Y	0x4f</div><div class='add'>+</div><div class='add'>+#define AUO_PIXCIR_REG_X_SENSITIVITY	0x6f</div><div class='add'>+#define AUO_PIXCIR_REG_Y_SENSITIVITY	0x70</div><div class='add'>+#define AUO_PIXCIR_REG_INT_SETTING	0x71</div><div class='add'>+#define AUO_PIXCIR_REG_INT_WIDTH	0x72</div><div class='add'>+#define AUO_PIXCIR_REG_POWER_MODE	0x73</div><div class='add'>+</div><div class='add'>+#define AUO_PIXCIR_REG_VERSION		0x77</div><div class='add'>+#define AUO_PIXCIR_REG_CALIBRATE	0x78</div><div class='add'>+</div><div class='add'>+#define AUO_PIXCIR_REG_TOUCHAREA_X1	0x1e</div><div class='add'>+#define AUO_PIXCIR_REG_TOUCHAREA_Y1	0x1f</div><div class='add'>+#define AUO_PIXCIR_REG_TOUCHAREA_X2	0x20</div><div class='add'>+#define AUO_PIXCIR_REG_TOUCHAREA_Y2	0x21</div><div class='add'>+</div><div class='add'>+#define AUO_PIXCIR_REG_EEPROM_CALIB_X	0x42</div><div class='add'>+#define AUO_PIXCIR_REG_EEPROM_CALIB_Y	0xad</div><div class='add'>+</div><div class='add'>+#define AUO_PIXCIR_INT_TPNUM_MASK	0xe0</div><div class='add'>+#define AUO_PIXCIR_INT_TPNUM_SHIFT	5</div><div class='add'>+#define AUO_PIXCIR_INT_RELEASE		(1 &lt;&lt; 4)</div><div class='add'>+#define AUO_PIXCIR_INT_ENABLE		(1 &lt;&lt; 3)</div><div class='add'>+#define AUO_PIXCIR_INT_POL_HIGH		(1 &lt;&lt; 2)</div><div class='add'>+#define AUO_PIXCIR_INT_MODE_MASK	0x03</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Power modes:</div><div class='add'>+ * active:	scan speed 60Hz</div><div class='add'>+ * sleep:	scan speed 10Hz can be auto-activated, wakeup on 1st touch</div><div class='add'>+ * deep sleep:	scan speed 1Hz can only be entered or left manually.</div><div class='add'>+ */</div><div class='add'>+#define AUO_PIXCIR_POWER_ACTIVE		0x00</div><div class='add'>+#define AUO_PIXCIR_POWER_SLEEP		0x01</div><div class='add'>+#define AUO_PIXCIR_POWER_DEEP_SLEEP	0x02</div><div class='add'>+#define AUO_PIXCIR_POWER_MASK		0x03</div><div class='add'>+</div><div class='add'>+#define AUO_PIXCIR_POWER_ALLOW_SLEEP	(1 &lt;&lt; 2)</div><div class='add'>+#define AUO_PIXCIR_POWER_IDLE_TIME(ms)	((ms &amp; 0xf) &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+#define AUO_PIXCIR_CALIBRATE		0x03</div><div class='add'>+</div><div class='add'>+#define AUO_PIXCIR_EEPROM_CALIB_X_LEN	62</div><div class='add'>+#define AUO_PIXCIR_EEPROM_CALIB_Y_LEN	36</div><div class='add'>+</div><div class='add'>+#define AUO_PIXCIR_RAW_DATA_X_LEN	18</div><div class='add'>+#define AUO_PIXCIR_RAW_DATA_Y_LEN	11</div><div class='add'>+</div><div class='add'>+#define AUO_PIXCIR_STRENGTH_ENABLE	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* Touchscreen absolute values */</div><div class='add'>+#define AUO_PIXCIR_REPORT_POINTS	2</div><div class='add'>+#define AUO_PIXCIR_MAX_AREA		0xff</div><div class='add'>+#define AUO_PIXCIR_PENUP_TIMEOUT_MS	10</div><div class='add'>+</div><div class='add'>+struct auo_pixcir_ts {</div><div class='add'>+	struct i2c_client	*client;</div><div class='add'>+	struct input_dev	*input;</div><div class='add'>+	char			phys[32];</div><div class='add'>+</div><div class='add'>+	/* special handling for touch_indicate interupt mode */</div><div class='add'>+	bool			touch_ind_mode;</div><div class='add'>+</div><div class='add'>+	wait_queue_head_t	wait;</div><div class='add'>+	bool			stopped;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct auo_point_t {</div><div class='add'>+	int	coord_x;</div><div class='add'>+	int	coord_y;</div><div class='add'>+	int	area_major;</div><div class='add'>+	int	area_minor;</div><div class='add'>+	int	orientation;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int auo_pixcir_collect_data(struct auo_pixcir_ts *ts,</div><div class='add'>+				   struct auo_point_t *point)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = ts-&gt;client;</div><div class='add'>+	const struct auo_pixcir_ts_platdata *pdata = client-&gt;dev.platform_data;</div><div class='add'>+	uint8_t raw_coord[8];</div><div class='add'>+	uint8_t raw_area[4];</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	/* touch coordinates */</div><div class='add'>+	ret = i2c_smbus_read_i2c_block_data(client, AUO_PIXCIR_REG_X1_LSB,</div><div class='add'>+					    8, raw_coord);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "failed to read coordinate, %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* touch area */</div><div class='add'>+	ret = i2c_smbus_read_i2c_block_data(client, AUO_PIXCIR_REG_TOUCHAREA_X1,</div><div class='add'>+					    4, raw_area);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "could not read touch area, %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AUO_PIXCIR_REPORT_POINTS; i++) {</div><div class='add'>+		point[i].coord_x =</div><div class='add'>+			raw_coord[4 * i + 1] &lt;&lt; 8 | raw_coord[4 * i];</div><div class='add'>+		point[i].coord_y =</div><div class='add'>+			raw_coord[4 * i + 3] &lt;&lt; 8 | raw_coord[4 * i + 2];</div><div class='add'>+</div><div class='add'>+		if (point[i].coord_x &gt; pdata-&gt;x_max ||</div><div class='add'>+		    point[i].coord_y &gt; pdata-&gt;y_max) {</div><div class='add'>+			dev_warn(&amp;client-&gt;dev, "coordinates (%d,%d) invalid\n",</div><div class='add'>+				point[i].coord_x, point[i].coord_y);</div><div class='add'>+			point[i].coord_x = point[i].coord_y = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* determine touch major, minor and orientation */</div><div class='add'>+		point[i].area_major = max(raw_area[2 * i], raw_area[2 * i + 1]);</div><div class='add'>+		point[i].area_minor = min(raw_area[2 * i], raw_area[2 * i + 1]);</div><div class='add'>+		point[i].orientation = raw_area[2 * i] &gt; raw_area[2 * i + 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 irqreturn_t auo_pixcir_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct auo_pixcir_ts *ts = dev_id;</div><div class='add'>+	struct i2c_client *client = ts-&gt;client;</div><div class='add'>+	const struct auo_pixcir_ts_platdata *pdata = client-&gt;dev.platform_data;</div><div class='add'>+	struct auo_point_t point[AUO_PIXCIR_REPORT_POINTS];</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+	int fingers = 0;</div><div class='add'>+	int abs = -1;</div><div class='add'>+</div><div class='add'>+	while (!ts-&gt;stopped) {</div><div class='add'>+</div><div class='add'>+		/* check for up event in touch touch_ind_mode */</div><div class='add'>+		if (ts-&gt;touch_ind_mode) {</div><div class='add'>+			if (gpio_get_value(pdata-&gt;gpio_int) == 0) {</div><div class='add'>+				input_mt_sync(ts-&gt;input);</div><div class='add'>+				input_report_key(ts-&gt;input, BTN_TOUCH, 0);</div><div class='add'>+				input_sync(ts-&gt;input);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = auo_pixcir_collect_data(ts, point);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			/* we want to loop only in touch_ind_mode */</div><div class='add'>+			if (!ts-&gt;touch_ind_mode)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			wait_event_timeout(ts-&gt;wait, ts-&gt;stopped,</div><div class='add'>+				msecs_to_jiffies(AUO_PIXCIR_PENUP_TIMEOUT_MS));</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; AUO_PIXCIR_REPORT_POINTS; i++) {</div><div class='add'>+			if (point[i].coord_x &gt; 0 || point[i].coord_y &gt; 0) {</div><div class='add'>+				input_report_abs(ts-&gt;input, ABS_MT_POSITION_X,</div><div class='add'>+						 point[i].coord_x);</div><div class='add'>+				input_report_abs(ts-&gt;input, ABS_MT_POSITION_Y,</div><div class='add'>+						 point[i].coord_y);</div><div class='add'>+				input_report_abs(ts-&gt;input, ABS_MT_TOUCH_MAJOR,</div><div class='add'>+						 point[i].area_major);</div><div class='add'>+				input_report_abs(ts-&gt;input, ABS_MT_TOUCH_MINOR,</div><div class='add'>+						 point[i].area_minor);</div><div class='add'>+				input_report_abs(ts-&gt;input, ABS_MT_ORIENTATION,</div><div class='add'>+						 point[i].orientation);</div><div class='add'>+				input_mt_sync(ts-&gt;input);</div><div class='add'>+</div><div class='add'>+				/* use first finger as source for singletouch */</div><div class='add'>+				if (fingers == 0)</div><div class='add'>+					abs = i;</div><div class='add'>+</div><div class='add'>+				/* number of touch points could also be queried</div><div class='add'>+				 * via i2c but would require an additional call</div><div class='add'>+				 */</div><div class='add'>+				fingers++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		input_report_key(ts-&gt;input, BTN_TOUCH, fingers &gt; 0);</div><div class='add'>+</div><div class='add'>+		if (abs &gt; -1) {</div><div class='add'>+			input_report_abs(ts-&gt;input, ABS_X, point[abs].coord_x);</div><div class='add'>+			input_report_abs(ts-&gt;input, ABS_Y, point[abs].coord_y);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		input_sync(ts-&gt;input);</div><div class='add'>+</div><div class='add'>+		/* we want to loop only in touch_ind_mode */</div><div class='add'>+		if (!ts-&gt;touch_ind_mode)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		wait_event_timeout(ts-&gt;wait, ts-&gt;stopped,</div><div class='add'>+				 msecs_to_jiffies(AUO_PIXCIR_PENUP_TIMEOUT_MS));</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'>+/*</div><div class='add'>+ * Set the power mode of the device.</div><div class='add'>+ * Valid modes are</div><div class='add'>+ * - AUO_PIXCIR_POWER_ACTIVE</div><div class='add'>+ * - AUO_PIXCIR_POWER_SLEEP - automatically left on first touch</div><div class='add'>+ * - AUO_PIXCIR_POWER_DEEP_SLEEP</div><div class='add'>+ */</div><div class='add'>+static int auo_pixcir_power_mode(struct auo_pixcir_ts *ts, int mode)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = ts-&gt;client;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = i2c_smbus_read_byte_data(client, AUO_PIXCIR_REG_POWER_MODE);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "unable to read reg %Xh, %d\n",</div><div class='add'>+			AUO_PIXCIR_REG_POWER_MODE, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret &amp;= ~AUO_PIXCIR_POWER_MASK;</div><div class='add'>+	ret |= mode;</div><div class='add'>+</div><div class='add'>+	ret = i2c_smbus_write_byte_data(client, AUO_PIXCIR_REG_POWER_MODE, ret);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "unable to write reg %Xh, %d\n",</div><div class='add'>+			AUO_PIXCIR_REG_POWER_MODE, 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 __devinit int auo_pixcir_int_config(struct auo_pixcir_ts *ts,</div><div class='add'>+					   int int_setting)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = ts-&gt;client;</div><div class='add'>+	struct auo_pixcir_ts_platdata *pdata = client-&gt;dev.platform_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = i2c_smbus_read_byte_data(client, AUO_PIXCIR_REG_INT_SETTING);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "unable to read reg %Xh, %d\n",</div><div class='add'>+			AUO_PIXCIR_REG_INT_SETTING, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret &amp;= ~AUO_PIXCIR_INT_MODE_MASK;</div><div class='add'>+	ret |= int_setting;</div><div class='add'>+	ret |= AUO_PIXCIR_INT_POL_HIGH; /* always use high for interrupts */</div><div class='add'>+</div><div class='add'>+	ret = i2c_smbus_write_byte_data(client, AUO_PIXCIR_REG_INT_SETTING,</div><div class='add'>+					ret);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "unable to write reg %Xh, %d\n",</div><div class='add'>+			AUO_PIXCIR_REG_INT_SETTING, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ts-&gt;touch_ind_mode = pdata-&gt;int_setting == AUO_PIXCIR_INT_TOUCH_IND;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* control the generation of interrupts on the device side */</div><div class='add'>+static int auo_pixcir_int_toggle(struct auo_pixcir_ts *ts, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = ts-&gt;client;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = i2c_smbus_read_byte_data(client, AUO_PIXCIR_REG_INT_SETTING);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "unable to read reg %Xh, %d\n",</div><div class='add'>+			AUO_PIXCIR_REG_INT_SETTING, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		ret |= AUO_PIXCIR_INT_ENABLE;</div><div class='add'>+	else</div><div class='add'>+		ret &amp;= ~AUO_PIXCIR_INT_ENABLE;</div><div class='add'>+</div><div class='add'>+	ret = i2c_smbus_write_byte_data(client, AUO_PIXCIR_REG_INT_SETTING,</div><div class='add'>+					ret);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "unable to write reg %Xh, %d\n",</div><div class='add'>+			AUO_PIXCIR_REG_INT_SETTING, 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 auo_pixcir_start(struct auo_pixcir_ts *ts)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = ts-&gt;client;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = auo_pixcir_power_mode(ts, AUO_PIXCIR_POWER_ACTIVE);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "could not set power mode, %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'>+	ts-&gt;stopped = false;</div><div class='add'>+	mb();</div><div class='add'>+	enable_irq(client-&gt;irq);</div><div class='add'>+</div><div class='add'>+	ret = auo_pixcir_int_toggle(ts, 1);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "could not enable interrupt, %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		disable_irq(client-&gt;irq);</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 auo_pixcir_stop(struct auo_pixcir_ts *ts)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = ts-&gt;client;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = auo_pixcir_int_toggle(ts, 0);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "could not disable interrupt, %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'>+	/* disable receiving of interrupts */</div><div class='add'>+	disable_irq(client-&gt;irq);</div><div class='add'>+	ts-&gt;stopped = true;</div><div class='add'>+	mb();</div><div class='add'>+	wake_up(&amp;ts-&gt;wait);</div><div class='add'>+</div><div class='add'>+	return auo_pixcir_power_mode(ts, AUO_PIXCIR_POWER_DEEP_SLEEP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int auo_pixcir_input_open(struct input_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct auo_pixcir_ts *ts = input_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = auo_pixcir_start(ts);</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 auo_pixcir_input_close(struct input_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct auo_pixcir_ts *ts = input_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	auo_pixcir_stop(ts);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int auo_pixcir_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct auo_pixcir_ts *ts = i2c_get_clientdata(client);</div><div class='add'>+	struct input_dev *input = ts-&gt;input;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;input-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* when configured as wakeup source, device should always wake system</div><div class='add'>+	 * therefore start device if necessary</div><div class='add'>+	 */</div><div class='add'>+	if (device_may_wakeup(&amp;client-&gt;dev)) {</div><div class='add'>+		/* need to start device if not open, to be wakeup source */</div><div class='add'>+		if (!input-&gt;users) {</div><div class='add'>+			ret = auo_pixcir_start(ts);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		enable_irq_wake(client-&gt;irq);</div><div class='add'>+		ret = auo_pixcir_power_mode(ts, AUO_PIXCIR_POWER_SLEEP);</div><div class='add'>+	} else if (input-&gt;users) {</div><div class='add'>+		ret = auo_pixcir_stop(ts);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;input-&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 auo_pixcir_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct auo_pixcir_ts *ts = i2c_get_clientdata(client);</div><div class='add'>+	struct input_dev *input = ts-&gt;input;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;input-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (device_may_wakeup(&amp;client-&gt;dev)) {</div><div class='add'>+		disable_irq_wake(client-&gt;irq);</div><div class='add'>+</div><div class='add'>+		/* need to stop device if it was not open on suspend */</div><div class='add'>+		if (!input-&gt;users) {</div><div class='add'>+			ret = auo_pixcir_stop(ts);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* device wakes automatically from SLEEP */</div><div class='add'>+	} else if (input-&gt;users) {</div><div class='add'>+		ret = auo_pixcir_start(ts);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;input-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(auo_pixcir_pm_ops, auo_pixcir_suspend,</div><div class='add'>+			 auo_pixcir_resume);</div><div class='add'>+</div><div class='add'>+static int __devinit auo_pixcir_probe(struct i2c_client *client,</div><div class='add'>+				      const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	const struct auo_pixcir_ts_platdata *pdata = client-&gt;dev.platform_data;</div><div class='add'>+	struct auo_pixcir_ts *ts;</div><div class='add'>+	struct input_dev *input_dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!pdata)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ts = kzalloc(sizeof(struct auo_pixcir_ts), GFP_KERNEL);</div><div class='add'>+	if (!ts)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = gpio_request(pdata-&gt;gpio_int, "auo_pixcir_ts_int");</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "request of gpio %d failed, %d\n",</div><div class='add'>+			pdata-&gt;gpio_int, ret);</div><div class='add'>+		goto err_gpio_int;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;init_hw)</div><div class='add'>+		pdata-&gt;init_hw(client);</div><div class='add'>+</div><div class='add'>+	ts-&gt;client = client;</div><div class='add'>+	ts-&gt;touch_ind_mode = 0;</div><div class='add'>+	init_waitqueue_head(&amp;ts-&gt;wait);</div><div class='add'>+</div><div class='add'>+	snprintf(ts-&gt;phys, sizeof(ts-&gt;phys),</div><div class='add'>+		 "%s/input0", dev_name(&amp;client-&gt;dev));</div><div class='add'>+</div><div class='add'>+	input_dev = input_allocate_device();</div><div class='add'>+	if (!input_dev) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "could not allocate input device\n");</div><div class='add'>+		goto err_input_alloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ts-&gt;input = input_dev;</div><div class='add'>+</div><div class='add'>+	input_dev-&gt;name = "AUO-Pixcir touchscreen";</div><div class='add'>+	input_dev-&gt;phys = ts-&gt;phys;</div><div class='add'>+	input_dev-&gt;id.bustype = BUS_I2C;</div><div class='add'>+	input_dev-&gt;dev.parent = &amp;client-&gt;dev;</div><div class='add'>+</div><div class='add'>+	input_dev-&gt;open = auo_pixcir_input_open;</div><div class='add'>+	input_dev-&gt;close = auo_pixcir_input_close;</div><div class='add'>+</div><div class='add'>+	__set_bit(EV_ABS, input_dev-&gt;evbit);</div><div class='add'>+	__set_bit(EV_KEY, input_dev-&gt;evbit);</div><div class='add'>+</div><div class='add'>+	__set_bit(BTN_TOUCH, input_dev-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	/* For single touch */</div><div class='add'>+	input_set_abs_params(input_dev, ABS_X, 0, pdata-&gt;x_max, 0, 0);</div><div class='add'>+	input_set_abs_params(input_dev, ABS_Y, 0, pdata-&gt;y_max, 0, 0);</div><div class='add'>+</div><div class='add'>+	/* For multi touch */</div><div class='add'>+	input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0,</div><div class='add'>+			     pdata-&gt;x_max, 0, 0);</div><div class='add'>+	input_set_abs_params(input_dev, ABS_MT_POSITION_Y, 0,</div><div class='add'>+			     pdata-&gt;y_max, 0, 0);</div><div class='add'>+	input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, 0,</div><div class='add'>+			     AUO_PIXCIR_MAX_AREA, 0, 0);</div><div class='add'>+	input_set_abs_params(input_dev, ABS_MT_TOUCH_MINOR, 0,</div><div class='add'>+			     AUO_PIXCIR_MAX_AREA, 0, 0);</div><div class='add'>+	input_set_abs_params(input_dev, ABS_MT_ORIENTATION, 0, 1, 0, 0);</div><div class='add'>+</div><div class='add'>+	ret = i2c_smbus_read_byte_data(client, AUO_PIXCIR_REG_VERSION);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_fw_vers;</div><div class='add'>+	dev_info(&amp;client-&gt;dev, "firmware version 0x%X\n", ret);</div><div class='add'>+</div><div class='add'>+	ret = auo_pixcir_int_config(ts, pdata-&gt;int_setting);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_fw_vers;</div><div class='add'>+</div><div class='add'>+	input_set_drvdata(ts-&gt;input, ts);</div><div class='add'>+	ts-&gt;stopped = true;</div><div class='add'>+</div><div class='add'>+	ret = request_threaded_irq(client-&gt;irq, NULL, auo_pixcir_interrupt,</div><div class='add'>+				   IRQF_TRIGGER_RISING | IRQF_ONESHOT,</div><div class='add'>+				   input_dev-&gt;name, ts);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "irq %d requested failed\n", client-&gt;irq);</div><div class='add'>+		goto err_fw_vers;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* stop device and put it into deep sleep until it is opened */</div><div class='add'>+	ret = auo_pixcir_stop(ts);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_input_register;</div><div class='add'>+</div><div class='add'>+	ret = input_register_device(input_dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "could not register input device\n");</div><div class='add'>+		goto err_input_register;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(client, ts);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_input_register:</div><div class='add'>+	free_irq(client-&gt;irq, ts);</div><div class='add'>+err_fw_vers:</div><div class='add'>+	input_free_device(input_dev);</div><div class='add'>+err_input_alloc:</div><div class='add'>+	if (pdata-&gt;exit_hw)</div><div class='add'>+		pdata-&gt;exit_hw(client);</div><div class='add'>+	gpio_free(pdata-&gt;gpio_int);</div><div class='add'>+err_gpio_int:</div><div class='add'>+	kfree(ts);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit auo_pixcir_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct auo_pixcir_ts *ts = i2c_get_clientdata(client);</div><div class='add'>+	const struct auo_pixcir_ts_platdata *pdata = client-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	free_irq(client-&gt;irq, ts);</div><div class='add'>+</div><div class='add'>+	input_unregister_device(ts-&gt;input);</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;exit_hw)</div><div class='add'>+		pdata-&gt;exit_hw(client);</div><div class='add'>+</div><div class='add'>+	gpio_free(pdata-&gt;gpio_int);</div><div class='add'>+</div><div class='add'>+	kfree(ts);</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 auo_pixcir_idtable[] = {</div><div class='add'>+	{ "auo_pixcir_ts", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, auo_pixcir_idtable);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver auo_pixcir_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+		.name	= "auo_pixcir_ts",</div><div class='add'>+		.pm	= &amp;auo_pixcir_pm_ops,</div><div class='add'>+	},</div><div class='add'>+	.probe		= auo_pixcir_probe,</div><div class='add'>+	.remove		= __devexit_p(auo_pixcir_remove),</div><div class='add'>+	.id_table	= auo_pixcir_idtable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init auo_pixcir_init(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;auo_pixcir_driver);</div><div class='add'>+}</div><div class='add'>+module_init(auo_pixcir_init);</div><div class='add'>+</div><div class='add'>+static void __exit auo_pixcir_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;auo_pixcir_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(auo_pixcir_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("AUO-PIXCIR touchscreen driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_AUTHOR("Heiko Stuebner &lt;heiko@sntech.de&gt;");</div><div class='head'>diff --git a/drivers/input/touchscreen/da9034-ts.c b/drivers/input/touchscreen/da9034-ts.c<br/>index 2b72a5923c16..36b65cf10d7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/da9034-ts.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/da9034-ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/da9034-ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/da9034-ts.c</a></div><div class='hunk'>@@ -379,18 +379,7 @@ static struct platform_driver da9034_touch_driver = {</div><div class='ctx'> 	.probe		= da9034_touch_probe,</div><div class='ctx'> 	.remove		= __devexit_p(da9034_touch_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init da9034_touch_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;da9034_touch_driver);</div><div class='del'>-}</div><div class='del'>-module_init(da9034_touch_init);</div><div class='del'>-</div><div class='del'>-static void __exit da9034_touch_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;da9034_touch_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(da9034_touch_exit);</div><div class='add'>+module_platform_driver(da9034_touch_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Touchscreen driver for Dialog Semiconductor DA9034");</div><div class='ctx'> MODULE_AUTHOR("Eric Miao &lt;eric.miao@marvell.com&gt;, Bin Yang &lt;bin.yang@marvell.com&gt;");</div><div class='head'>diff --git a/drivers/input/touchscreen/eeti_ts.c b/drivers/input/touchscreen/eeti_ts.c<br/>index 7f8f538a9806..1df19bb8534a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/eeti_ts.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/eeti_ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/eeti_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/eeti_ts.c</a></div><div class='hunk'>@@ -35,11 +35,11 @@</div><div class='ctx'> #include &lt;linux/input/eeti_ts.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-static int flip_x;</div><div class='add'>+static bool flip_x;</div><div class='ctx'> module_param(flip_x, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(flip_x, "flip x coordinate");</div><div class='ctx'> </div><div class='del'>-static int flip_y;</div><div class='add'>+static bool flip_y;</div><div class='ctx'> module_param(flip_y, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(flip_y, "flip y coordinate");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/touchscreen/egalax_ts.c b/drivers/input/touchscreen/egalax_ts.c<br/>new file mode 100644<br/>index 000000000000..eadcc2e83c77<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/egalax_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/egalax_ts.c</a></div><div class='hunk'>@@ -0,0 +1,303 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for EETI eGalax Multiple Touch Controller</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Freescale Semiconductor, Inc.</div><div class='add'>+ *</div><div class='add'>+ * based on max11801_ts.c</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* EETI eGalax serial touch screen controller is a I2C based multiple</div><div class='add'>+ * touch screen controller, it supports 5 point multiple touch. */</div><div class='add'>+</div><div class='add'>+/* TODO:</div><div class='add'>+  - auto idle mode support</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/i2c.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/input/mt.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mouse Mode: some panel may configure the controller to mouse mode,</div><div class='add'>+ * which can only report one point at a given time.</div><div class='add'>+ * This driver will ignore events in this mode.</div><div class='add'>+ */</div><div class='add'>+#define REPORT_MODE_MOUSE		0x1</div><div class='add'>+/*</div><div class='add'>+ * Vendor Mode: this mode is used to transfer some vendor specific</div><div class='add'>+ * messages.</div><div class='add'>+ * This driver will ignore events in this mode.</div><div class='add'>+ */</div><div class='add'>+#define REPORT_MODE_VENDOR		0x3</div><div class='add'>+/* Multiple Touch Mode */</div><div class='add'>+#define REPORT_MODE_MTTOUCH		0x4</div><div class='add'>+</div><div class='add'>+#define MAX_SUPPORT_POINTS		5</div><div class='add'>+</div><div class='add'>+#define EVENT_VALID_OFFSET	7</div><div class='add'>+#define EVENT_VALID_MASK	(0x1 &lt;&lt; EVENT_VALID_OFFSET)</div><div class='add'>+#define EVENT_ID_OFFSET		2</div><div class='add'>+#define EVENT_ID_MASK		(0xf &lt;&lt; EVENT_ID_OFFSET)</div><div class='add'>+#define EVENT_IN_RANGE		(0x1 &lt;&lt; 1)</div><div class='add'>+#define EVENT_DOWN_UP		(0X1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define MAX_I2C_DATA_LEN	10</div><div class='add'>+</div><div class='add'>+#define EGALAX_MAX_X	32760</div><div class='add'>+#define EGALAX_MAX_Y	32760</div><div class='add'>+#define EGALAX_MAX_TRIES 100</div><div class='add'>+</div><div class='add'>+struct egalax_ts {</div><div class='add'>+	struct i2c_client		*client;</div><div class='add'>+	struct input_dev		*input_dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static irqreturn_t egalax_ts_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct egalax_ts *ts = dev_id;</div><div class='add'>+	struct input_dev *input_dev = ts-&gt;input_dev;</div><div class='add'>+	struct i2c_client *client = ts-&gt;client;</div><div class='add'>+	u8 buf[MAX_I2C_DATA_LEN];</div><div class='add'>+	int id, ret, x, y, z;</div><div class='add'>+	int tries = 0;</div><div class='add'>+	bool down, valid;</div><div class='add'>+	u8 state;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		ret = i2c_master_recv(client, buf, MAX_I2C_DATA_LEN);</div><div class='add'>+	} while (ret == -EAGAIN &amp;&amp; tries++ &lt; EGALAX_MAX_TRIES);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+</div><div class='add'>+	if (buf[0] != REPORT_MODE_MTTOUCH) {</div><div class='add'>+		/* ignore mouse events and vendor events */</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	state = buf[1];</div><div class='add'>+	x = (buf[3] &lt;&lt; 8) | buf[2];</div><div class='add'>+	y = (buf[5] &lt;&lt; 8) | buf[4];</div><div class='add'>+	z = (buf[7] &lt;&lt; 8) | buf[6];</div><div class='add'>+</div><div class='add'>+	valid = state &amp; EVENT_VALID_MASK;</div><div class='add'>+	id = (state &amp; EVENT_ID_MASK) &gt;&gt; EVENT_ID_OFFSET;</div><div class='add'>+	down = state &amp; EVENT_DOWN_UP;</div><div class='add'>+</div><div class='add'>+	if (!valid || id &gt; MAX_SUPPORT_POINTS) {</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "point invalid\n");</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_mt_slot(input_dev, id);</div><div class='add'>+	input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, down);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "%s id:%d x:%d y:%d z:%d",</div><div class='add'>+		down ? "down" : "up", id, x, y, z);</div><div class='add'>+</div><div class='add'>+	if (down) {</div><div class='add'>+		input_report_abs(input_dev, ABS_MT_POSITION_X, x);</div><div class='add'>+		input_report_abs(input_dev, ABS_MT_POSITION_Y, y);</div><div class='add'>+		input_report_abs(input_dev, ABS_MT_PRESSURE, z);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_mt_report_pointer_emulation(input_dev, true);</div><div class='add'>+	input_sync(input_dev);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* wake up controller by an falling edge of interrupt gpio.  */</div><div class='add'>+static int egalax_wake_up_device(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	int gpio = irq_to_gpio(client-&gt;irq);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = gpio_request(gpio, "egalax_irq");</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev,</div><div class='add'>+			"request gpio failed, cannot wake up controller: %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'>+	/* wake up controller via an falling edge on IRQ gpio. */</div><div class='add'>+	gpio_direction_output(gpio, 0);</div><div class='add'>+	gpio_set_value(gpio, 1);</div><div class='add'>+</div><div class='add'>+	/* controller should be waken up, return irq.  */</div><div class='add'>+	gpio_direction_input(gpio);</div><div class='add'>+	gpio_free(gpio);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit egalax_firmware_version(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	static const u8 cmd[MAX_I2C_DATA_LEN] = { 0x03, 0x03, 0xa, 0x01, 0x41 };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = i2c_master_send(client, cmd, MAX_I2C_DATA_LEN);</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 __devinit egalax_ts_probe(struct i2c_client *client,</div><div class='add'>+				       const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct egalax_ts *ts;</div><div class='add'>+	struct input_dev *input_dev;</div><div class='add'>+	int ret;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	ts = kzalloc(sizeof(struct egalax_ts), GFP_KERNEL);</div><div class='add'>+	if (!ts) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Failed to allocate memory\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_dev = input_allocate_device();</div><div class='add'>+	if (!input_dev) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Failed to allocate memory\n");</div><div class='add'>+		error = -ENOMEM;</div><div class='add'>+		goto err_free_ts;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ts-&gt;client = client;</div><div class='add'>+	ts-&gt;input_dev = input_dev;</div><div class='add'>+</div><div class='add'>+	/* controller may be in sleep, wake it up. */</div><div class='add'>+	egalax_wake_up_device(client);</div><div class='add'>+</div><div class='add'>+	ret = egalax_firmware_version(client);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Failed to read firmware version\n");</div><div class='add'>+		error = -EIO;</div><div class='add'>+		goto err_free_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_dev-&gt;name = "EETI eGalax Touch Screen";</div><div class='add'>+	input_dev-&gt;id.bustype = BUS_I2C;</div><div class='add'>+	input_dev-&gt;dev.parent = &amp;client-&gt;dev;</div><div class='add'>+</div><div class='add'>+	__set_bit(EV_ABS, input_dev-&gt;evbit);</div><div class='add'>+	__set_bit(EV_KEY, input_dev-&gt;evbit);</div><div class='add'>+	__set_bit(BTN_TOUCH, input_dev-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	input_set_abs_params(input_dev, ABS_X, 0, EGALAX_MAX_X, 0, 0);</div><div class='add'>+	input_set_abs_params(input_dev, ABS_Y, 0, EGALAX_MAX_Y, 0, 0);</div><div class='add'>+	input_set_abs_params(input_dev,</div><div class='add'>+			     ABS_MT_POSITION_X, 0, EGALAX_MAX_X, 0, 0);</div><div class='add'>+	input_set_abs_params(input_dev,</div><div class='add'>+			     ABS_MT_POSITION_X, 0, EGALAX_MAX_Y, 0, 0);</div><div class='add'>+	input_mt_init_slots(input_dev, MAX_SUPPORT_POINTS);</div><div class='add'>+</div><div class='add'>+	input_set_drvdata(input_dev, ts);</div><div class='add'>+</div><div class='add'>+	error = request_threaded_irq(client-&gt;irq, NULL, egalax_ts_interrupt,</div><div class='add'>+				     IRQF_TRIGGER_LOW | IRQF_ONESHOT,</div><div class='add'>+				     "egalax_ts", ts);</div><div class='add'>+	if (error &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Failed to register interrupt\n");</div><div class='add'>+		goto err_free_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	error = input_register_device(ts-&gt;input_dev);</div><div class='add'>+	if (error)</div><div class='add'>+		goto err_free_irq;</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(client, ts);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_irq:</div><div class='add'>+	free_irq(client-&gt;irq, ts);</div><div class='add'>+err_free_dev:</div><div class='add'>+	input_free_device(input_dev);</div><div class='add'>+err_free_ts:</div><div class='add'>+	kfree(ts);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __devexit int egalax_ts_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct egalax_ts *ts = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	free_irq(client-&gt;irq, ts);</div><div class='add'>+</div><div class='add'>+	input_unregister_device(ts-&gt;input_dev);</div><div class='add'>+	kfree(ts);</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 egalax_ts_id[] = {</div><div class='add'>+	{ "egalax_ts", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, egalax_ts_id);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int egalax_ts_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	static const u8 suspend_cmd[MAX_I2C_DATA_LEN] = {</div><div class='add'>+		0x3, 0x6, 0xa, 0x3, 0x36, 0x3f, 0x2, 0, 0, 0</div><div class='add'>+	};</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = i2c_master_send(client, suspend_cmd, MAX_I2C_DATA_LEN);</div><div class='add'>+	return ret &gt; 0 ? 0 : ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int egalax_ts_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'>+	return egalax_wake_up_device(client);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(egalax_ts_pm_ops, egalax_ts_suspend, egalax_ts_resume);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver egalax_ts_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "egalax_ts",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+		.pm	= &amp;egalax_ts_pm_ops,</div><div class='add'>+	},</div><div class='add'>+	.id_table	= egalax_ts_id,</div><div class='add'>+	.probe		= egalax_ts_probe,</div><div class='add'>+	.remove		= __devexit_p(egalax_ts_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init egalax_ts_init(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;egalax_ts_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit egalax_ts_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;egalax_ts_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(egalax_ts_init);</div><div class='add'>+module_exit(egalax_ts_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Freescale Semiconductor, Inc.");</div><div class='add'>+MODULE_DESCRIPTION("Touchscreen driver for EETI eGalax touch controller");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c<br/>index 62811de6f18f..d13143b68b3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/htcpen.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/htcpen.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/htcpen.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/htcpen.c</a></div><div class='hunk'>@@ -40,19 +40,13 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> #define X_AXIS_MAX		2040</div><div class='ctx'> #define Y_AXIS_MAX		2040</div><div class='ctx'> </div><div class='del'>-static int invert_x;</div><div class='add'>+static bool invert_x;</div><div class='ctx'> module_param(invert_x, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(invert_x, "If set, X axis is inverted");</div><div class='del'>-static int invert_y;</div><div class='add'>+static bool invert_y;</div><div class='ctx'> module_param(invert_y, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(invert_y, "If set, Y axis is inverted");</div><div class='ctx'> </div><div class='del'>-static struct pnp_device_id pnp_ids[] = {</div><div class='del'>-	{ .id = "PNP0cc0" },</div><div class='del'>-	{ .id = "" }</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(pnp, pnp_ids);</div><div class='del'>-</div><div class='ctx'> static irqreturn_t htcpen_interrupt(int irq, void *handle)</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *htcpen_dev = handle;</div><div class='hunk'>@@ -237,6 +231,7 @@ static struct dmi_system_id __initdata htcshift_dmi_table[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='add'>+MODULE_DEVICE_TABLE(dmi, htcshift_dmi_table);</div><div class='ctx'> </div><div class='ctx'> static int __init htcpen_isa_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/input/touchscreen/intel-mid-touch.c b/drivers/input/touchscreen/intel-mid-touch.c<br/>index 327695268e06..3cd7a837f82b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/intel-mid-touch.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/intel-mid-touch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/intel-mid-touch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/intel-mid-touch.c</a></div><div class='hunk'>@@ -664,18 +664,7 @@ static struct platform_driver mrstouch_driver = {</div><div class='ctx'> 	.probe		= mrstouch_probe,</div><div class='ctx'> 	.remove		= __devexit_p(mrstouch_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init mrstouch_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;mrstouch_driver);</div><div class='del'>-}</div><div class='del'>-module_init(mrstouch_init);</div><div class='del'>-</div><div class='del'>-static void __exit mrstouch_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;mrstouch_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(mrstouch_exit);</div><div class='add'>+module_platform_driver(mrstouch_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Sreedhara Murthy. D.S, sreedhara.ds@intel.com");</div><div class='ctx'> MODULE_DESCRIPTION("Intel Moorestown Resistive Touch Screen Driver");</div><div class='head'>diff --git a/drivers/input/touchscreen/jornada720_ts.c b/drivers/input/touchscreen/jornada720_ts.c<br/>index 50076c2d59e2..c3848ad2325b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/jornada720_ts.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/jornada720_ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/jornada720_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/jornada720_ts.c</a></div><div class='hunk'>@@ -172,16 +172,4 @@ static struct platform_driver jornada720_ts_driver = {</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init jornada720_ts_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;jornada720_ts_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit jornada720_ts_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;jornada720_ts_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(jornada720_ts_init);</div><div class='del'>-module_exit(jornada720_ts_exit);</div><div class='add'>+module_platform_driver(jornada720_ts_driver);</div><div class='head'>diff --git a/drivers/input/touchscreen/lpc32xx_ts.c b/drivers/input/touchscreen/lpc32xx_ts.c<br/>index 0a484ed5295c..afcd0691ec67 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/lpc32xx_ts.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/lpc32xx_ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/lpc32xx_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/lpc32xx_ts.c</a></div><div class='hunk'>@@ -392,18 +392,7 @@ static struct platform_driver lpc32xx_ts_driver = {</div><div class='ctx'> 		.pm	= LPC32XX_TS_PM_OPS,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init lpc32xx_ts_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;lpc32xx_ts_driver);</div><div class='del'>-}</div><div class='del'>-module_init(lpc32xx_ts_init);</div><div class='del'>-</div><div class='del'>-static void __exit lpc32xx_ts_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;lpc32xx_ts_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(lpc32xx_ts_exit);</div><div class='add'>+module_platform_driver(lpc32xx_ts_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Kevin Wells &lt;kevin.wells@nxp.com");</div><div class='ctx'> MODULE_DESCRIPTION("LPC32XX TSC Driver");</div><div class='head'>diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c<br/>index e966c29ff1bb..7d2b2136e5ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/mainstone-wm97xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/mainstone-wm97xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/mainstone-wm97xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/mainstone-wm97xx.c</a></div><div class='hunk'>@@ -302,19 +302,7 @@ static struct platform_driver mainstone_wm97xx_driver = {</div><div class='ctx'> 		.name = "wm97xx-touch",</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init mainstone_wm97xx_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;mainstone_wm97xx_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit mainstone_wm97xx_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;mainstone_wm97xx_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(mainstone_wm97xx_init);</div><div class='del'>-module_exit(mainstone_wm97xx_exit);</div><div class='add'>+module_platform_driver(mainstone_wm97xx_driver);</div><div class='ctx'> </div><div class='ctx'> /* Module information */</div><div class='ctx'> MODULE_AUTHOR("Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;");</div><div class='head'>diff --git a/drivers/input/touchscreen/migor_ts.c b/drivers/input/touchscreen/migor_ts.c<br/>index 5803bd0c1cca..5226194aa78e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/migor_ts.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/migor_ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/migor_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/migor_ts.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'> struct migor_ts_priv {</div><div class='ctx'> 	struct i2c_client *client;</div><div class='ctx'> 	struct input_dev *input;</div><div class='del'>-	struct delayed_work work;</div><div class='ctx'> 	int irq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -44,15 +43,24 @@ static const u_int8_t migor_ts_ena_seq[17] = { 0x33, 0x22, 0x11,</div><div class='ctx'> 					       0x01, 0x06, 0x07, };</div><div class='ctx'> static const u_int8_t migor_ts_dis_seq[17] = { };</div><div class='ctx'> </div><div class='del'>-static void migor_ts_poscheck(struct work_struct *work)</div><div class='add'>+static irqreturn_t migor_ts_isr(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	struct migor_ts_priv *priv = container_of(work,</div><div class='del'>-						  struct migor_ts_priv,</div><div class='del'>-						  work.work);</div><div class='add'>+	struct migor_ts_priv *priv = dev_id;</div><div class='ctx'> 	unsigned short xpos, ypos;</div><div class='ctx'> 	unsigned char event;</div><div class='ctx'> 	u_int8_t buf[16];</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * The touch screen controller chip is hooked up to the CPU</div><div class='add'>+	 * using I2C and a single interrupt line. The interrupt line</div><div class='add'>+	 * is pulled low whenever someone taps the screen. To deassert</div><div class='add'>+	 * the interrupt line we need to acknowledge the interrupt by</div><div class='add'>+	 * communicating with the controller over the slow i2c bus.</div><div class='add'>+	 *</div><div class='add'>+	 * Since I2C bus controller may sleep we are using threaded</div><div class='add'>+	 * IRQ here.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='ctx'> 	memset(buf, 0, sizeof(buf));</div><div class='ctx'> </div><div class='ctx'> 	/* Set Index 0 */</div><div class='hunk'>@@ -72,41 +80,25 @@ static void migor_ts_poscheck(struct work_struct *work)</div><div class='ctx'> 	xpos = ((buf[11] &amp; 0x03) &lt;&lt; 8 | buf[10]);</div><div class='ctx'> 	event = buf[12];</div><div class='ctx'> </div><div class='del'>-	if (event == EVENT_PENDOWN || event == EVENT_REPEAT) {</div><div class='add'>+	switch (event) {</div><div class='add'>+	case EVENT_PENDOWN:</div><div class='add'>+	case EVENT_REPEAT:</div><div class='ctx'> 		input_report_key(priv-&gt;input, BTN_TOUCH, 1);</div><div class='ctx'> 		input_report_abs(priv-&gt;input, ABS_X, ypos); /*X-Y swap*/</div><div class='ctx'> 		input_report_abs(priv-&gt;input, ABS_Y, xpos);</div><div class='ctx'> 		input_sync(priv-&gt;input);</div><div class='del'>-	} else if (event == EVENT_PENUP) {</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case EVENT_PENUP:</div><div class='ctx'> 		input_report_key(priv-&gt;input, BTN_TOUCH, 0);</div><div class='ctx'> 		input_sync(priv-&gt;input);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>- out:</div><div class='del'>-	enable_irq(priv-&gt;irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t migor_ts_isr(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct migor_ts_priv *priv = dev_id;</div><div class='del'>-</div><div class='del'>-	/* the touch screen controller chip is hooked up to the cpu</div><div class='del'>-	 * using i2c and a single interrupt line. the interrupt line</div><div class='del'>-	 * is pulled low whenever someone taps the screen. to deassert</div><div class='del'>-	 * the interrupt line we need to acknowledge the interrupt by</div><div class='del'>-	 * communicating with the controller over the slow i2c bus.</div><div class='del'>-	 *</div><div class='del'>-	 * we can't acknowledge from interrupt context since the i2c</div><div class='del'>-	 * bus controller may sleep, so we just disable the interrupt</div><div class='del'>-	 * here and handle the acknowledge using delayed work.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	disable_irq_nosync(irq);</div><div class='del'>-	schedule_delayed_work(&amp;priv-&gt;work, HZ / 20);</div><div class='ctx'> </div><div class='add'>+ out:</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int migor_ts_open(struct input_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct migor_ts_priv *priv = input_get_drvdata(dev);</div><div class='hunk'>@@ -131,15 +123,6 @@ static void migor_ts_close(struct input_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	disable_irq(priv-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	/* cancel pending work and wait for migor_ts_poscheck() to finish */</div><div class='del'>-	if (cancel_delayed_work_sync(&amp;priv-&gt;work)) {</div><div class='del'>-		/*</div><div class='del'>-		 * if migor_ts_poscheck was canceled we need to enable IRQ</div><div class='del'>-		 * here to balance disable done in migor_ts_isr.</div><div class='del'>-		 */</div><div class='del'>-		enable_irq(priv-&gt;irq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* disable controller */</div><div class='ctx'> 	i2c_master_send(client, migor_ts_dis_seq, sizeof(migor_ts_dis_seq));</div><div class='ctx'> </div><div class='hunk'>@@ -154,23 +137,20 @@ static int migor_ts_probe(struct i2c_client *client,</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	priv = kzalloc(sizeof(*priv), GFP_KERNEL);</div><div class='del'>-	if (!priv) {</div><div class='del'>-		dev_err(&amp;client-&gt;dev, "failed to allocate driver data\n");</div><div class='del'>-		error = -ENOMEM;</div><div class='del'>-		goto err0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_set_drvdata(&amp;client-&gt;dev, priv);</div><div class='del'>-</div><div class='ctx'> 	input = input_allocate_device();</div><div class='del'>-	if (!input) {</div><div class='del'>-		dev_err(&amp;client-&gt;dev, "Failed to allocate input device.\n");</div><div class='add'>+	if (!priv || !input) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "failed to allocate memory\n");</div><div class='ctx'> 		error = -ENOMEM;</div><div class='del'>-		goto err1;</div><div class='add'>+		goto err_free_mem;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	priv-&gt;client = client;</div><div class='add'>+	priv-&gt;input = input;</div><div class='add'>+	priv-&gt;irq = client-&gt;irq;</div><div class='add'>+</div><div class='ctx'> 	input-&gt;evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);</div><div class='del'>-	input-&gt;keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);</div><div class='add'>+</div><div class='add'>+	__set_bit(BTN_TOUCH, input-&gt;keybit);</div><div class='ctx'> </div><div class='ctx'> 	input_set_abs_params(input, ABS_X, 95, 955, 0, 0);</div><div class='ctx'> 	input_set_abs_params(input, ABS_Y, 85, 935, 0, 0);</div><div class='hunk'>@@ -184,39 +164,34 @@ static int migor_ts_probe(struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 	input_set_drvdata(input, priv);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;client = client;</div><div class='del'>-	priv-&gt;input = input;</div><div class='del'>-	INIT_DELAYED_WORK(&amp;priv-&gt;work, migor_ts_poscheck);</div><div class='del'>-	priv-&gt;irq = client-&gt;irq;</div><div class='del'>-</div><div class='del'>-	error = input_register_device(input);</div><div class='del'>-	if (error)</div><div class='del'>-		goto err1;</div><div class='del'>-</div><div class='del'>-	error = request_irq(priv-&gt;irq, migor_ts_isr, IRQF_TRIGGER_LOW,</div><div class='del'>-			    client-&gt;name, priv);</div><div class='add'>+	error = request_threaded_irq(priv-&gt;irq, NULL, migor_ts_isr,</div><div class='add'>+                                     IRQF_TRIGGER_LOW | IRQF_ONESHOT,</div><div class='add'>+                                     client-&gt;name, priv);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		dev_err(&amp;client-&gt;dev, "Unable to request touchscreen IRQ.\n");</div><div class='del'>-		goto err2;</div><div class='add'>+		goto err_free_mem;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	error = input_register_device(input);</div><div class='add'>+	if (error)</div><div class='add'>+		goto err_free_irq;</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(client, priv);</div><div class='ctx'> 	device_init_wakeup(&amp;client-&gt;dev, 1);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- err2:</div><div class='del'>-	input_unregister_device(input);</div><div class='del'>-	input = NULL; /* so we dont try to free it below */</div><div class='del'>- err1:</div><div class='add'>+ err_free_irq:</div><div class='add'>+	free_irq(priv-&gt;irq, priv);</div><div class='add'>+ err_free_mem:</div><div class='ctx'> 	input_free_device(input);</div><div class='ctx'> 	kfree(priv);</div><div class='del'>- err0:</div><div class='del'>-	dev_set_drvdata(&amp;client-&gt;dev, NULL);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int migor_ts_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	struct migor_ts_priv *priv = dev_get_drvdata(&amp;client-&gt;dev);</div><div class='add'>+	struct migor_ts_priv *priv = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	free_irq(priv-&gt;irq, priv);</div><div class='ctx'> 	input_unregister_device(priv-&gt;input);</div><div class='hunk'>@@ -230,7 +205,7 @@ static int migor_ts_remove(struct i2c_client *client)</div><div class='ctx'> static int migor_ts_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='del'>-	struct migor_ts_priv *priv = dev_get_drvdata(&amp;client-&gt;dev);</div><div class='add'>+	struct migor_ts_priv *priv = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	if (device_may_wakeup(&amp;client-&gt;dev))</div><div class='ctx'> 		enable_irq_wake(priv-&gt;irq);</div><div class='hunk'>@@ -241,7 +216,7 @@ static int migor_ts_suspend(struct device *dev)</div><div class='ctx'> static int migor_ts_resume(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='del'>-	struct migor_ts_priv *priv = dev_get_drvdata(&amp;client-&gt;dev);</div><div class='add'>+	struct migor_ts_priv *priv = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	if (device_may_wakeup(&amp;client-&gt;dev))</div><div class='ctx'> 		disable_irq_wake(priv-&gt;irq);</div><div class='head'>diff --git a/drivers/input/touchscreen/pcap_ts.c b/drivers/input/touchscreen/pcap_ts.c<br/>index ea6ef16e59b4..f57aeb80f7e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/pcap_ts.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/pcap_ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/pcap_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/pcap_ts.c</a></div><div class='hunk'>@@ -252,19 +252,7 @@ static struct platform_driver pcap_ts_driver = {</div><div class='ctx'> 		.pm	= PCAP_TS_PM_OPS,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init pcap_ts_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pcap_ts_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit pcap_ts_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pcap_ts_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(pcap_ts_init);</div><div class='del'>-module_exit(pcap_ts_exit);</div><div class='add'>+module_platform_driver(pcap_ts_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Motorola PCAP2 touchscreen driver");</div><div class='ctx'> MODULE_AUTHOR("Daniel Ribeiro / Harald Welte");</div><div class='head'>diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c<br/>new file mode 100644<br/>index 000000000000..d5ac09a1ee56<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/pixcir_i2c_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/pixcir_i2c_ts.c</a></div><div class='hunk'>@@ -0,0 +1,239 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for Pixcir I2C touchscreen controllers.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2010-2011 Pixcir, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public</div><div class='add'>+ * License along with this library; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</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/module.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/input/pixcir_ts.h&gt;</div><div class='add'>+</div><div class='add'>+struct pixcir_i2c_ts_data {</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct input_dev *input;</div><div class='add'>+	const struct pixcir_ts_platform_data *chip;</div><div class='add'>+	bool exiting;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void pixcir_ts_poscheck(struct pixcir_i2c_ts_data *data)</div><div class='add'>+{</div><div class='add'>+	struct pixcir_i2c_ts_data *tsdata = data;</div><div class='add'>+	u8 rdbuf[10], wrbuf[1] = { 0 };</div><div class='add'>+	u8 touch;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = i2c_master_send(tsdata-&gt;client, wrbuf, sizeof(wrbuf));</div><div class='add'>+	if (ret != sizeof(wrbuf)) {</div><div class='add'>+		dev_err(&amp;tsdata-&gt;client-&gt;dev,</div><div class='add'>+			"%s: i2c_master_send failed(), ret=%d\n",</div><div class='add'>+			__func__, ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = i2c_master_recv(tsdata-&gt;client, rdbuf, sizeof(rdbuf));</div><div class='add'>+	if (ret != sizeof(rdbuf)) {</div><div class='add'>+		dev_err(&amp;tsdata-&gt;client-&gt;dev,</div><div class='add'>+			"%s: i2c_master_recv failed(), ret=%d\n",</div><div class='add'>+			__func__, ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	touch = rdbuf[0];</div><div class='add'>+	if (touch) {</div><div class='add'>+		u16 posx1 = (rdbuf[3] &lt;&lt; 8) | rdbuf[2];</div><div class='add'>+		u16 posy1 = (rdbuf[5] &lt;&lt; 8) | rdbuf[4];</div><div class='add'>+		u16 posx2 = (rdbuf[7] &lt;&lt; 8) | rdbuf[6];</div><div class='add'>+		u16 posy2 = (rdbuf[9] &lt;&lt; 8) | rdbuf[8];</div><div class='add'>+</div><div class='add'>+		input_report_key(tsdata-&gt;input, BTN_TOUCH, 1);</div><div class='add'>+		input_report_abs(tsdata-&gt;input, ABS_X, posx1);</div><div class='add'>+		input_report_abs(tsdata-&gt;input, ABS_Y, posy1);</div><div class='add'>+</div><div class='add'>+		input_report_abs(tsdata-&gt;input, ABS_MT_POSITION_X, posx1);</div><div class='add'>+		input_report_abs(tsdata-&gt;input, ABS_MT_POSITION_Y, posy1);</div><div class='add'>+		input_mt_sync(tsdata-&gt;input);</div><div class='add'>+</div><div class='add'>+		if (touch == 2) {</div><div class='add'>+			input_report_abs(tsdata-&gt;input,</div><div class='add'>+					 ABS_MT_POSITION_X, posx2);</div><div class='add'>+			input_report_abs(tsdata-&gt;input,</div><div class='add'>+					 ABS_MT_POSITION_Y, posy2);</div><div class='add'>+			input_mt_sync(tsdata-&gt;input);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		input_report_key(tsdata-&gt;input, BTN_TOUCH, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_sync(tsdata-&gt;input);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t pixcir_ts_isr(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct pixcir_i2c_ts_data *tsdata = dev_id;</div><div class='add'>+</div><div class='add'>+	while (!tsdata-&gt;exiting) {</div><div class='add'>+		pixcir_ts_poscheck(tsdata);</div><div class='add'>+</div><div class='add'>+		if (tsdata-&gt;chip-&gt;attb_read_val())</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		msleep(20);</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'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int pixcir_i2c_ts_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 (device_may_wakeup(&amp;client-&gt;dev))</div><div class='add'>+		enable_irq_wake(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 pixcir_i2c_ts_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 (device_may_wakeup(&amp;client-&gt;dev))</div><div class='add'>+		disable_irq_wake(client-&gt;irq);</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(pixcir_dev_pm_ops,</div><div class='add'>+			 pixcir_i2c_ts_suspend, pixcir_i2c_ts_resume);</div><div class='add'>+</div><div class='add'>+static int __devinit pixcir_i2c_ts_probe(struct i2c_client *client,</div><div class='add'>+					 const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	const struct pixcir_ts_platform_data *pdata = client-&gt;dev.platform_data;</div><div class='add'>+	struct pixcir_i2c_ts_data *tsdata;</div><div class='add'>+	struct input_dev *input;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	if (!pdata) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "platform data not defined\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tsdata = kzalloc(sizeof(*tsdata), GFP_KERNEL);</div><div class='add'>+	input = input_allocate_device();</div><div class='add'>+	if (!tsdata || !input) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Failed to allocate driver data!\n");</div><div class='add'>+		error = -ENOMEM;</div><div class='add'>+		goto err_free_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tsdata-&gt;client = client;</div><div class='add'>+	tsdata-&gt;input = input;</div><div class='add'>+	tsdata-&gt;chip = pdata;</div><div class='add'>+</div><div class='add'>+	input-&gt;name = client-&gt;name;</div><div class='add'>+	input-&gt;id.bustype = BUS_I2C;</div><div class='add'>+	input-&gt;dev.parent = &amp;client-&gt;dev;</div><div class='add'>+</div><div class='add'>+	__set_bit(EV_KEY, input-&gt;evbit);</div><div class='add'>+	__set_bit(EV_ABS, input-&gt;evbit);</div><div class='add'>+	__set_bit(BTN_TOUCH, input-&gt;keybit);</div><div class='add'>+	input_set_abs_params(input, ABS_X, 0, pdata-&gt;x_max, 0, 0);</div><div class='add'>+	input_set_abs_params(input, ABS_Y, 0, pdata-&gt;y_max, 0, 0);</div><div class='add'>+	input_set_abs_params(input, ABS_MT_POSITION_X, 0, pdata-&gt;x_max, 0, 0);</div><div class='add'>+	input_set_abs_params(input, ABS_MT_POSITION_Y, 0, pdata-&gt;y_max, 0, 0);</div><div class='add'>+</div><div class='add'>+	input_set_drvdata(input, tsdata);</div><div class='add'>+</div><div class='add'>+	error = request_threaded_irq(client-&gt;irq, NULL, pixcir_ts_isr,</div><div class='add'>+				     IRQF_TRIGGER_FALLING,</div><div class='add'>+				     client-&gt;name, tsdata);</div><div class='add'>+	if (error) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Unable to request touchscreen IRQ.\n");</div><div class='add'>+		goto err_free_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	error = input_register_device(input);</div><div class='add'>+	if (error)</div><div class='add'>+		goto err_free_irq;</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(client, tsdata);</div><div class='add'>+	device_init_wakeup(&amp;client-&gt;dev, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_irq:</div><div class='add'>+	free_irq(client-&gt;irq, tsdata);</div><div class='add'>+err_free_mem:</div><div class='add'>+	input_free_device(input);</div><div class='add'>+	kfree(tsdata);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit pixcir_i2c_ts_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct pixcir_i2c_ts_data *tsdata = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	device_init_wakeup(&amp;client-&gt;dev, 0);</div><div class='add'>+</div><div class='add'>+	tsdata-&gt;exiting = true;</div><div class='add'>+	mb();</div><div class='add'>+	free_irq(client-&gt;irq, tsdata);</div><div class='add'>+</div><div class='add'>+	input_unregister_device(tsdata-&gt;input);</div><div class='add'>+	kfree(tsdata);</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 pixcir_i2c_ts_id[] = {</div><div class='add'>+	{ "pixcir_ts", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, pixcir_i2c_ts_id);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver pixcir_i2c_ts_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+		.name	= "pixcir_ts",</div><div class='add'>+		.pm	= &amp;pixcir_dev_pm_ops,</div><div class='add'>+	},</div><div class='add'>+	.probe		= pixcir_i2c_ts_probe,</div><div class='add'>+	.remove		= __devexit_p(pixcir_i2c_ts_remove),</div><div class='add'>+	.id_table	= pixcir_i2c_ts_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init pixcir_i2c_ts_init(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;pixcir_i2c_ts_driver);</div><div class='add'>+}</div><div class='add'>+module_init(pixcir_i2c_ts_init);</div><div class='add'>+</div><div class='add'>+static void __exit pixcir_i2c_ts_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;pixcir_i2c_ts_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(pixcir_i2c_ts_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Jianchun Bian &lt;jcbian@pixcir.com.cn&gt;, Dequan Meng &lt;dqmeng@pixcir.com.cn&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Pixcir I2C Touchscreen Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c<br/>index 64ce697a3456..bf1a06400067 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/s3c2410_ts.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/s3c2410_ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/s3c2410_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/s3c2410_ts.c</a></div><div class='hunk'>@@ -432,19 +432,7 @@ static struct platform_driver s3c_ts_driver = {</div><div class='ctx'> 	.probe		= s3c2410ts_probe,</div><div class='ctx'> 	.remove		= __devexit_p(s3c2410ts_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init s3c2410ts_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;s3c_ts_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit s3c2410ts_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;s3c_ts_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(s3c2410ts_init);</div><div class='del'>-module_exit(s3c2410ts_exit);</div><div class='add'>+module_platform_driver(s3c_ts_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Arnaud Patard &lt;arnaud.patard@rtp-net.org&gt;, "</div><div class='ctx'> 	      "Ben Dooks &lt;ben@simtec.co.uk&gt;, "</div><div class='head'>diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c<br/>index 4ab371358b33..8825fe37d433 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/st1232.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/st1232.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/st1232.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/st1232.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include &lt;linux/input.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='add'>+#include &lt;linux/pm_qos.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'> </div><div class='hunk'>@@ -46,6 +47,7 @@ struct st1232_ts_data {</div><div class='ctx'> 	struct i2c_client *client;</div><div class='ctx'> 	struct input_dev *input_dev;</div><div class='ctx'> 	struct st1232_ts_finger finger[MAX_FINGERS];</div><div class='add'>+	struct dev_pm_qos_request low_latency_req;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int st1232_ts_read_data(struct st1232_ts_data *ts)</div><div class='hunk'>@@ -118,8 +120,17 @@ static irqreturn_t st1232_ts_irq_handler(int irq, void *dev_id)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* SYN_MT_REPORT only if no contact */</div><div class='del'>-	if (!count)</div><div class='add'>+	if (!count) {</div><div class='ctx'> 		input_mt_sync(input_dev);</div><div class='add'>+		if (ts-&gt;low_latency_req.dev) {</div><div class='add'>+			dev_pm_qos_remove_request(&amp;ts-&gt;low_latency_req);</div><div class='add'>+			ts-&gt;low_latency_req.dev = NULL;</div><div class='add'>+		}</div><div class='add'>+	} else if (!ts-&gt;low_latency_req.dev) {</div><div class='add'>+		/* First contact, request 100 us latency. */</div><div class='add'>+		dev_pm_qos_add_ancestor_request(&amp;ts-&gt;client-&gt;dev,</div><div class='add'>+						&amp;ts-&gt;low_latency_req, 100);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* SYN_REPORT */</div><div class='ctx'> 	input_sync(input_dev);</div><div class='head'>diff --git a/drivers/input/touchscreen/stmpe-ts.c b/drivers/input/touchscreen/stmpe-ts.c<br/>index ae88e13c99ff..692b685720ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/stmpe-ts.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/stmpe-ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/stmpe-ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/stmpe-ts.c</a></div><div class='hunk'>@@ -379,20 +379,7 @@ static struct platform_driver stmpe_ts_driver = {</div><div class='ctx'> 	.probe = stmpe_input_probe,</div><div class='ctx'> 	.remove = __devexit_p(stmpe_ts_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init stmpe_ts_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;stmpe_ts_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(stmpe_ts_init);</div><div class='del'>-</div><div class='del'>-static void __exit stmpe_ts_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;stmpe_ts_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_exit(stmpe_ts_exit);</div><div class='add'>+module_platform_driver(stmpe_ts_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Luotao Fu &lt;l.fu@pengutronix.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("STMPEXXX touchscreen driver");</div><div class='head'>diff --git a/drivers/input/touchscreen/tnetv107x-ts.c b/drivers/input/touchscreen/tnetv107x-ts.c<br/>index 0e8f63e5b36f..7e7488097359 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/tnetv107x-ts.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/tnetv107x-ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/tnetv107x-ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/tnetv107x-ts.c</a></div><div class='hunk'>@@ -378,19 +378,7 @@ static struct platform_driver tsc_driver = {</div><div class='ctx'> 	.driver.name	= "tnetv107x-ts",</div><div class='ctx'> 	.driver.owner	= THIS_MODULE,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init tsc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;tsc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit tsc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;tsc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(tsc_init);</div><div class='del'>-module_exit(tsc_exit);</div><div class='add'>+module_platform_driver(tsc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Cyril Chemparathy");</div><div class='ctx'> MODULE_DESCRIPTION("TNETV107X Touchscreen Driver");</div><div class='head'>diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c<br/>index 43031492d733..6c6f6d8ea9b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/tps6507x-ts.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/tps6507x-ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/tps6507x-ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/tps6507x-ts.c</a></div><div class='hunk'>@@ -371,18 +371,7 @@ static struct platform_driver tps6507x_ts_driver = {</div><div class='ctx'> 	.probe = tps6507x_ts_probe,</div><div class='ctx'> 	.remove = __devexit_p(tps6507x_ts_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init tps6507x_ts_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;tps6507x_ts_driver);</div><div class='del'>-}</div><div class='del'>-module_init(tps6507x_ts_init);</div><div class='del'>-</div><div class='del'>-static void __exit tps6507x_ts_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;tps6507x_ts_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(tps6507x_ts_exit);</div><div class='add'>+module_platform_driver(tps6507x_ts_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Todd Fischer &lt;todd.fischer@ridgerun.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("TPS6507x - TouchScreen driver");</div><div class='head'>diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c<br/>index cbf0ff322676..067d95662997 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/tsc2005.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/tsc2005.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/tsc2005.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/tsc2005.c</a></div><div class='hunk'>@@ -450,13 +450,13 @@ static struct attribute *tsc2005_attrs[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static mode_t tsc2005_attr_is_visible(struct kobject *kobj,</div><div class='add'>+static umode_t tsc2005_attr_is_visible(struct kobject *kobj,</div><div class='ctx'> 				      struct attribute *attr, int n)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = container_of(kobj, struct device, kobj);</div><div class='ctx'> 	struct spi_device *spi = to_spi_device(dev);</div><div class='ctx'> 	struct tsc2005 *ts = spi_get_drvdata(spi);</div><div class='del'>-	mode_t mode = attr-&gt;mode;</div><div class='add'>+	umode_t mode = attr-&gt;mode;</div><div class='ctx'> </div><div class='ctx'> 	if (attr == &amp;dev_attr_selftest.attr) {</div><div class='ctx'> 		if (!ts-&gt;set_reset)</div><div class='head'>diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c<br/>index 3b5b5df04dd6..46e83ad53f43 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/ucb1400_ts.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/ucb1400_ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/ucb1400_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/ucb1400_ts.c</a></div><div class='hunk'>@@ -20,24 +20,24 @@</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='del'>-#include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/suspend.h&gt;</div><div class='del'>-#include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;linux/freezer.h&gt;</div><div class='ctx'> #include &lt;linux/ucb1400.h&gt;</div><div class='ctx'> </div><div class='del'>-static int adcsync;</div><div class='add'>+#define UCB1400_TS_POLL_PERIOD	10 /* ms */</div><div class='add'>+</div><div class='add'>+static bool adcsync;</div><div class='ctx'> static int ts_delay = 55; /* us */</div><div class='ctx'> static int ts_delay_pressure;	/* us */</div><div class='ctx'> </div><div class='ctx'> /* Switch to interrupt mode. */</div><div class='del'>-static inline void ucb1400_ts_mode_int(struct snd_ac97 *ac97)</div><div class='add'>+static void ucb1400_ts_mode_int(struct ucb1400_ts *ucb)</div><div class='ctx'> {</div><div class='del'>-	ucb1400_reg_write(ac97, UCB_TS_CR,</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_TS_CR,</div><div class='ctx'> 			UCB_TS_CR_TSMX_POW | UCB_TS_CR_TSPX_POW |</div><div class='ctx'> 			UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_GND |</div><div class='ctx'> 			UCB_TS_CR_MODE_INT);</div><div class='hunk'>@@ -47,13 +47,15 @@ static inline void ucb1400_ts_mode_int(struct snd_ac97 *ac97)</div><div class='ctx'>  * Switch to pressure mode, and read pressure.  We don't need to wait</div><div class='ctx'>  * here, since both plates are being driven.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int ucb1400_ts_read_pressure(struct ucb1400_ts *ucb)</div><div class='add'>+static unsigned int ucb1400_ts_read_pressure(struct ucb1400_ts *ucb)</div><div class='ctx'> {</div><div class='ctx'> 	ucb1400_reg_write(ucb-&gt;ac97, UCB_TS_CR,</div><div class='ctx'> 			UCB_TS_CR_TSMX_POW | UCB_TS_CR_TSPX_POW |</div><div class='ctx'> 			UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_GND |</div><div class='ctx'> 			UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);</div><div class='add'>+</div><div class='ctx'> 	udelay(ts_delay_pressure);</div><div class='add'>+</div><div class='ctx'> 	return ucb1400_adc_read(ucb-&gt;ac97, UCB_ADC_INP_TSPY, adcsync);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -63,7 +65,7 @@ static inline unsigned int ucb1400_ts_read_pressure(struct ucb1400_ts *ucb)</div><div class='ctx'>  * gives a faster response time.  Even so, we need to wait about 55us</div><div class='ctx'>  * for things to stabilise.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int ucb1400_ts_read_xpos(struct ucb1400_ts *ucb)</div><div class='add'>+static unsigned int ucb1400_ts_read_xpos(struct ucb1400_ts *ucb)</div><div class='ctx'> {</div><div class='ctx'> 	ucb1400_reg_write(ucb-&gt;ac97, UCB_TS_CR,</div><div class='ctx'> 			UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW |</div><div class='hunk'>@@ -86,7 +88,7 @@ static inline unsigned int ucb1400_ts_read_xpos(struct ucb1400_ts *ucb)</div><div class='ctx'>  * gives a faster response time.  Even so, we need to wait about 55us</div><div class='ctx'>  * for things to stabilise.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int ucb1400_ts_read_ypos(struct ucb1400_ts *ucb)</div><div class='add'>+static int ucb1400_ts_read_ypos(struct ucb1400_ts *ucb)</div><div class='ctx'> {</div><div class='ctx'> 	ucb1400_reg_write(ucb-&gt;ac97, UCB_TS_CR,</div><div class='ctx'> 			UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW |</div><div class='hunk'>@@ -107,7 +109,7 @@ static inline unsigned int ucb1400_ts_read_ypos(struct ucb1400_ts *ucb)</div><div class='ctx'>  * Switch to X plate resistance mode.  Set MX to ground, PX to</div><div class='ctx'>  * supply.  Measure current.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int ucb1400_ts_read_xres(struct ucb1400_ts *ucb)</div><div class='add'>+static unsigned int ucb1400_ts_read_xres(struct ucb1400_ts *ucb)</div><div class='ctx'> {</div><div class='ctx'> 	ucb1400_reg_write(ucb-&gt;ac97, UCB_TS_CR,</div><div class='ctx'> 			UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW |</div><div class='hunk'>@@ -119,7 +121,7 @@ static inline unsigned int ucb1400_ts_read_xres(struct ucb1400_ts *ucb)</div><div class='ctx'>  * Switch to Y plate resistance mode.  Set MY to ground, PY to</div><div class='ctx'>  * supply.  Measure current.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int ucb1400_ts_read_yres(struct ucb1400_ts *ucb)</div><div class='add'>+static unsigned int ucb1400_ts_read_yres(struct ucb1400_ts *ucb)</div><div class='ctx'> {</div><div class='ctx'> 	ucb1400_reg_write(ucb-&gt;ac97, UCB_TS_CR,</div><div class='ctx'> 			UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW |</div><div class='hunk'>@@ -127,26 +129,26 @@ static inline unsigned int ucb1400_ts_read_yres(struct ucb1400_ts *ucb)</div><div class='ctx'> 	return ucb1400_adc_read(ucb-&gt;ac97, 0, adcsync);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ucb1400_ts_pen_up(struct snd_ac97 *ac97)</div><div class='add'>+static int ucb1400_ts_pen_up(struct ucb1400_ts *ucb)</div><div class='ctx'> {</div><div class='del'>-	unsigned short val = ucb1400_reg_read(ac97, UCB_TS_CR);</div><div class='add'>+	unsigned short val = ucb1400_reg_read(ucb-&gt;ac97, UCB_TS_CR);</div><div class='ctx'> </div><div class='ctx'> 	return val &amp; (UCB_TS_CR_TSPX_LOW | UCB_TS_CR_TSMX_LOW);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ucb1400_ts_irq_enable(struct snd_ac97 *ac97)</div><div class='add'>+static void ucb1400_ts_irq_enable(struct ucb1400_ts *ucb)</div><div class='ctx'> {</div><div class='del'>-	ucb1400_reg_write(ac97, UCB_IE_CLEAR, UCB_IE_TSPX);</div><div class='del'>-	ucb1400_reg_write(ac97, UCB_IE_CLEAR, 0);</div><div class='del'>-	ucb1400_reg_write(ac97, UCB_IE_FAL, UCB_IE_TSPX);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_IE_CLEAR, UCB_IE_TSPX);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_IE_CLEAR, 0);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_IE_FAL, UCB_IE_TSPX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ucb1400_ts_irq_disable(struct snd_ac97 *ac97)</div><div class='add'>+static void ucb1400_ts_irq_disable(struct ucb1400_ts *ucb)</div><div class='ctx'> {</div><div class='del'>-	ucb1400_reg_write(ac97, UCB_IE_FAL, 0);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_IE_FAL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ucb1400_ts_evt_add(struct input_dev *idev, u16 pressure, u16 x, u16 y)</div><div class='add'>+static void ucb1400_ts_report_event(struct input_dev *idev, u16 pressure, u16 x, u16 y)</div><div class='ctx'> {</div><div class='ctx'> 	input_report_abs(idev, ABS_X, x);</div><div class='ctx'> 	input_report_abs(idev, ABS_Y, y);</div><div class='hunk'>@@ -162,7 +164,7 @@ static void ucb1400_ts_event_release(struct input_dev *idev)</div><div class='ctx'> 	input_sync(idev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ucb1400_handle_pending_irq(struct ucb1400_ts *ucb)</div><div class='add'>+static void ucb1400_clear_pending_irq(struct ucb1400_ts *ucb)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int isr;</div><div class='ctx'> </div><div class='hunk'>@@ -171,32 +173,34 @@ static void ucb1400_handle_pending_irq(struct ucb1400_ts *ucb)</div><div class='ctx'> 	ucb1400_reg_write(ucb-&gt;ac97, UCB_IE_CLEAR, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (isr &amp; UCB_IE_TSPX)</div><div class='del'>-		ucb1400_ts_irq_disable(ucb-&gt;ac97);</div><div class='add'>+		ucb1400_ts_irq_disable(ucb);</div><div class='ctx'> 	else</div><div class='del'>-		dev_dbg(&amp;ucb-&gt;ts_idev-&gt;dev, "ucb1400: unexpected IE_STATUS = %#x\n", isr);</div><div class='del'>-	enable_irq(ucb-&gt;irq);</div><div class='add'>+		dev_dbg(&amp;ucb-&gt;ts_idev-&gt;dev,</div><div class='add'>+			"ucb1400: unexpected IE_STATUS = %#x\n", isr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ucb1400_ts_thread(void *_ucb)</div><div class='add'>+/*</div><div class='add'>+ * A restriction with interrupts exists when using the ucb1400, as</div><div class='add'>+ * the codec read/write routines may sleep while waiting for codec</div><div class='add'>+ * access completion and uses semaphores for access control to the</div><div class='add'>+ * AC97 bus. Therefore the driver is forced to use threaded interrupt</div><div class='add'>+ * handler.</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t ucb1400_irq(int irqnr, void *devid)</div><div class='ctx'> {</div><div class='del'>-	struct ucb1400_ts *ucb = _ucb;</div><div class='del'>-	struct task_struct *tsk = current;</div><div class='del'>-	int valid = 0;</div><div class='del'>-	struct sched_param param = { .sched_priority = 1 };</div><div class='add'>+	struct ucb1400_ts *ucb = devid;</div><div class='add'>+	unsigned int x, y, p;</div><div class='add'>+	bool penup;</div><div class='ctx'> </div><div class='del'>-	sched_setscheduler(tsk, SCHED_FIFO, &amp;param);</div><div class='add'>+	if (unlikely(irqnr != ucb-&gt;irq))</div><div class='add'>+		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	set_freezable();</div><div class='del'>-	while (!kthread_should_stop()) {</div><div class='del'>-		unsigned int x, y, p;</div><div class='del'>-		long timeout;</div><div class='add'>+	ucb1400_clear_pending_irq(ucb);</div><div class='ctx'> </div><div class='del'>-		ucb-&gt;ts_restart = 0;</div><div class='add'>+	/* Start with a small delay before checking pendown state */</div><div class='add'>+	msleep(UCB1400_TS_POLL_PERIOD);</div><div class='ctx'> </div><div class='del'>-		if (ucb-&gt;irq_pending) {</div><div class='del'>-			ucb-&gt;irq_pending = 0;</div><div class='del'>-			ucb1400_handle_pending_irq(ucb);</div><div class='del'>-		}</div><div class='add'>+	while (!ucb-&gt;stopped &amp;&amp; !(penup = ucb1400_ts_pen_up(ucb))) {</div><div class='ctx'> </div><div class='ctx'> 		ucb1400_adc_enable(ucb-&gt;ac97);</div><div class='ctx'> 		x = ucb1400_ts_read_xpos(ucb);</div><div class='hunk'>@@ -204,91 +208,62 @@ static int ucb1400_ts_thread(void *_ucb)</div><div class='ctx'> 		p = ucb1400_ts_read_pressure(ucb);</div><div class='ctx'> 		ucb1400_adc_disable(ucb-&gt;ac97);</div><div class='ctx'> </div><div class='del'>-		/* Switch back to interrupt mode. */</div><div class='del'>-		ucb1400_ts_mode_int(ucb-&gt;ac97);</div><div class='del'>-</div><div class='del'>-		msleep(10);</div><div class='del'>-</div><div class='del'>-		if (ucb1400_ts_pen_up(ucb-&gt;ac97)) {</div><div class='del'>-			ucb1400_ts_irq_enable(ucb-&gt;ac97);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * If we spat out a valid sample set last time,</div><div class='del'>-			 * spit out a "pen off" sample here.</div><div class='del'>-			 */</div><div class='del'>-			if (valid) {</div><div class='del'>-				ucb1400_ts_event_release(ucb-&gt;ts_idev);</div><div class='del'>-				valid = 0;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			timeout = MAX_SCHEDULE_TIMEOUT;</div><div class='del'>-		} else {</div><div class='del'>-			valid = 1;</div><div class='del'>-			ucb1400_ts_evt_add(ucb-&gt;ts_idev, p, x, y);</div><div class='del'>-			timeout = msecs_to_jiffies(10);</div><div class='del'>-		}</div><div class='add'>+		ucb1400_ts_report_event(ucb-&gt;ts_idev, p, x, y);</div><div class='ctx'> </div><div class='del'>-		wait_event_freezable_timeout(ucb-&gt;ts_wait,</div><div class='del'>-			ucb-&gt;irq_pending || ucb-&gt;ts_restart ||</div><div class='del'>-			kthread_should_stop(), timeout);</div><div class='add'>+		wait_event_timeout(ucb-&gt;ts_wait, ucb-&gt;stopped,</div><div class='add'>+				   msecs_to_jiffies(UCB1400_TS_POLL_PERIOD));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Send the "pen off" if we are stopping with the pen still active */</div><div class='del'>-	if (valid)</div><div class='del'>-		ucb1400_ts_event_release(ucb-&gt;ts_idev);</div><div class='add'>+	ucb1400_ts_event_release(ucb-&gt;ts_idev);</div><div class='ctx'> </div><div class='del'>-	ucb-&gt;ts_task = NULL;</div><div class='del'>-	return 0;</div><div class='add'>+	if (!ucb-&gt;stopped) {</div><div class='add'>+		/* Switch back to interrupt mode. */</div><div class='add'>+		ucb1400_ts_mode_int(ucb);</div><div class='add'>+		ucb1400_ts_irq_enable(ucb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * A restriction with interrupts exists when using the ucb1400, as</div><div class='del'>- * the codec read/write routines may sleep while waiting for codec</div><div class='del'>- * access completion and uses semaphores for access control to the</div><div class='del'>- * AC97 bus.  A complete codec read cycle could take  anywhere from</div><div class='del'>- * 60 to 100uSec so we *definitely* don't want to spin inside the</div><div class='del'>- * interrupt handler waiting for codec access.  So, we handle the</div><div class='del'>- * interrupt by scheduling a RT kernel thread to run in process</div><div class='del'>- * context instead of interrupt context.</div><div class='del'>- */</div><div class='del'>-static irqreturn_t ucb1400_hard_irq(int irqnr, void *devid)</div><div class='add'>+static void ucb1400_ts_stop(struct ucb1400_ts *ucb)</div><div class='ctx'> {</div><div class='del'>-	struct ucb1400_ts *ucb = devid;</div><div class='add'>+	/* Signal IRQ thread to stop polling and disable the handler. */</div><div class='add'>+	ucb-&gt;stopped = true;</div><div class='add'>+	mb();</div><div class='add'>+	wake_up(&amp;ucb-&gt;ts_wait);</div><div class='add'>+	disable_irq(ucb-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	if (irqnr == ucb-&gt;irq) {</div><div class='del'>-		disable_irq_nosync(ucb-&gt;irq);</div><div class='del'>-		ucb-&gt;irq_pending = 1;</div><div class='del'>-		wake_up(&amp;ucb-&gt;ts_wait);</div><div class='del'>-		return IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-	return IRQ_NONE;</div><div class='add'>+	ucb1400_ts_irq_disable(ucb);</div><div class='add'>+	ucb1400_reg_write(ucb-&gt;ac97, UCB_TS_CR, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Must be called with ts-&gt;lock held */</div><div class='add'>+static void ucb1400_ts_start(struct ucb1400_ts *ucb)</div><div class='add'>+{</div><div class='add'>+	/* Tell IRQ thread that it may poll the device. */</div><div class='add'>+	ucb-&gt;stopped = false;</div><div class='add'>+	mb();</div><div class='add'>+</div><div class='add'>+	ucb1400_ts_mode_int(ucb);</div><div class='add'>+	ucb1400_ts_irq_enable(ucb);</div><div class='add'>+</div><div class='add'>+	enable_irq(ucb-&gt;irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ucb1400_ts_open(struct input_dev *idev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ucb1400_ts *ucb = input_get_drvdata(idev);</div><div class='del'>-	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(ucb-&gt;ts_task);</div><div class='add'>+	ucb1400_ts_start(ucb);</div><div class='ctx'> </div><div class='del'>-	ucb-&gt;ts_task = kthread_run(ucb1400_ts_thread, ucb, "UCB1400_ts");</div><div class='del'>-	if (IS_ERR(ucb-&gt;ts_task)) {</div><div class='del'>-		ret = PTR_ERR(ucb-&gt;ts_task);</div><div class='del'>-		ucb-&gt;ts_task = NULL;</div><div class='del'>-	}</div><div class='del'>-</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 ucb1400_ts_close(struct input_dev *idev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ucb1400_ts *ucb = input_get_drvdata(idev);</div><div class='ctx'> </div><div class='del'>-	if (ucb-&gt;ts_task)</div><div class='del'>-		kthread_stop(ucb-&gt;ts_task);</div><div class='del'>-</div><div class='del'>-	ucb1400_ts_irq_disable(ucb-&gt;ac97);</div><div class='del'>-	ucb1400_reg_write(ucb-&gt;ac97, UCB_TS_CR, 0);</div><div class='add'>+	ucb1400_ts_stop(ucb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifndef NO_IRQ</div><div class='hunk'>@@ -299,7 +274,8 @@ static void ucb1400_ts_close(struct input_dev *idev)</div><div class='ctx'>  * Try to probe our interrupt, rather than relying on lots of</div><div class='ctx'>  * hard-coded machine dependencies.</div><div class='ctx'>  */</div><div class='del'>-static int ucb1400_ts_detect_irq(struct ucb1400_ts *ucb)</div><div class='add'>+static int __devinit ucb1400_ts_detect_irq(struct ucb1400_ts *ucb,</div><div class='add'>+					   struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long mask, timeout;</div><div class='ctx'> </div><div class='hunk'>@@ -321,7 +297,7 @@ static int ucb1400_ts_detect_irq(struct ucb1400_ts *ucb)</div><div class='ctx'> 						UCB_ADC_DAT_VALID)) {</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> 		if (time_after(jiffies, timeout)) {</div><div class='del'>-			printk(KERN_ERR "ucb1400: timed out in IRQ probe\n");</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "timed out in IRQ probe\n");</div><div class='ctx'> 			probe_irq_off(mask);</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -342,11 +318,11 @@ static int ucb1400_ts_detect_irq(struct ucb1400_ts *ucb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ucb1400_ts_probe(struct platform_device *dev)</div><div class='add'>+static int __devinit ucb1400_ts_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='add'>+	struct ucb1400_ts *ucb = pdev-&gt;dev.platform_data;</div><div class='ctx'> 	int error, x_res, y_res;</div><div class='ctx'> 	u16 fcsr;</div><div class='del'>-	struct ucb1400_ts *ucb = dev-&gt;dev.platform_data;</div><div class='ctx'> </div><div class='ctx'> 	ucb-&gt;ts_idev = input_allocate_device();</div><div class='ctx'> 	if (!ucb-&gt;ts_idev) {</div><div class='hunk'>@@ -356,27 +332,19 @@ static int ucb1400_ts_probe(struct platform_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Only in case the IRQ line wasn't supplied, try detecting it */</div><div class='ctx'> 	if (ucb-&gt;irq &lt; 0) {</div><div class='del'>-		error = ucb1400_ts_detect_irq(ucb);</div><div class='add'>+		error = ucb1400_ts_detect_irq(ucb, pdev);</div><div class='ctx'> 		if (error) {</div><div class='del'>-			printk(KERN_ERR "UCB1400: IRQ probe failed\n");</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "IRQ probe failed\n");</div><div class='ctx'> 			goto err_free_devs;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "found IRQ %d\n", ucb-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;ucb-&gt;ts_wait);</div><div class='ctx'> </div><div class='del'>-	error = request_irq(ucb-&gt;irq, ucb1400_hard_irq, IRQF_TRIGGER_RISING,</div><div class='del'>-				"UCB1400", ucb);</div><div class='del'>-	if (error) {</div><div class='del'>-		printk(KERN_ERR "ucb1400: unable to grab irq%d: %d\n",</div><div class='del'>-				ucb-&gt;irq, error);</div><div class='del'>-		goto err_free_devs;</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_DEBUG "UCB1400: found IRQ %d\n", ucb-&gt;irq);</div><div class='del'>-</div><div class='ctx'> 	input_set_drvdata(ucb-&gt;ts_idev, ucb);</div><div class='ctx'> </div><div class='del'>-	ucb-&gt;ts_idev-&gt;dev.parent	= &amp;dev-&gt;dev;</div><div class='add'>+	ucb-&gt;ts_idev-&gt;dev.parent	= &amp;pdev-&gt;dev;</div><div class='ctx'> 	ucb-&gt;ts_idev-&gt;name		= "UCB1400 touchscreen interface";</div><div class='ctx'> 	ucb-&gt;ts_idev-&gt;id.vendor		= ucb1400_reg_read(ucb-&gt;ac97,</div><div class='ctx'> 						AC97_VENDOR_ID1);</div><div class='hunk'>@@ -398,12 +366,23 @@ static int ucb1400_ts_probe(struct platform_device *dev)</div><div class='ctx'> 	x_res = ucb1400_ts_read_xres(ucb);</div><div class='ctx'> 	y_res = ucb1400_ts_read_yres(ucb);</div><div class='ctx'> 	ucb1400_adc_disable(ucb-&gt;ac97);</div><div class='del'>-	printk(KERN_DEBUG "UCB1400: x/y = %d/%d\n", x_res, y_res);</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "x/y = %d/%d\n", x_res, y_res);</div><div class='ctx'> </div><div class='ctx'> 	input_set_abs_params(ucb-&gt;ts_idev, ABS_X, 0, x_res, 0, 0);</div><div class='ctx'> 	input_set_abs_params(ucb-&gt;ts_idev, ABS_Y, 0, y_res, 0, 0);</div><div class='ctx'> 	input_set_abs_params(ucb-&gt;ts_idev, ABS_PRESSURE, 0, 0, 0, 0);</div><div class='ctx'> </div><div class='add'>+	ucb1400_ts_stop(ucb);</div><div class='add'>+</div><div class='add'>+	error = request_threaded_irq(ucb-&gt;irq, NULL, ucb1400_irq,</div><div class='add'>+				     IRQF_TRIGGER_RISING | IRQF_ONESHOT,</div><div class='add'>+				     "UCB1400", ucb);</div><div class='add'>+	if (error) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"unable to grab irq%d: %d\n", ucb-&gt;irq, error);</div><div class='add'>+		goto err_free_devs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	error = input_register_device(ucb-&gt;ts_idev);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto err_free_irq;</div><div class='hunk'>@@ -416,56 +395,61 @@ err_free_devs:</div><div class='ctx'> 	input_free_device(ucb-&gt;ts_idev);</div><div class='ctx'> err:</div><div class='ctx'> 	return error;</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ucb1400_ts_remove(struct platform_device *dev)</div><div class='add'>+static int __devexit ucb1400_ts_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct ucb1400_ts *ucb = dev-&gt;dev.platform_data;</div><div class='add'>+	struct ucb1400_ts *ucb = pdev-&gt;dev.platform_data;</div><div class='ctx'> </div><div class='ctx'> 	free_irq(ucb-&gt;irq, ucb);</div><div class='ctx'> 	input_unregister_device(ucb-&gt;ts_idev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int ucb1400_ts_resume(struct platform_device *dev)</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int ucb1400_ts_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct ucb1400_ts *ucb = dev-&gt;dev.platform_data;</div><div class='del'>-</div><div class='del'>-	if (ucb-&gt;ts_task) {</div><div class='del'>-		/*</div><div class='del'>-		 * Restart the TS thread to ensure the</div><div class='del'>-		 * TS interrupt mode is set up again</div><div class='del'>-		 * after sleep.</div><div class='del'>-		 */</div><div class='del'>-		ucb-&gt;ts_restart = 1;</div><div class='del'>-		wake_up(&amp;ucb-&gt;ts_wait);</div><div class='del'>-	}</div><div class='add'>+	struct ucb1400_ts *ucb = dev-&gt;platform_data;</div><div class='add'>+	struct input_dev *idev = ucb-&gt;ts_idev;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;idev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (idev-&gt;users)</div><div class='add'>+		ucb1400_ts_start(ucb);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ucb1400_ts_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ucb1400_ts *ucb = dev-&gt;platform_data;</div><div class='add'>+	struct input_dev *idev = ucb-&gt;ts_idev;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;idev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (idev-&gt;users)</div><div class='add'>+		ucb1400_ts_stop(ucb);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;idev-&gt;mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-#define ucb1400_ts_resume NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static SIMPLE_DEV_PM_OPS(ucb1400_ts_pm_ops,</div><div class='add'>+			 ucb1400_ts_suspend, ucb1400_ts_resume);</div><div class='add'>+</div><div class='ctx'> static struct platform_driver ucb1400_ts_driver = {</div><div class='ctx'> 	.probe	= ucb1400_ts_probe,</div><div class='del'>-	.remove	= ucb1400_ts_remove,</div><div class='del'>-	.resume	= ucb1400_ts_resume,</div><div class='add'>+	.remove	= __devexit_p(ucb1400_ts_remove),</div><div class='ctx'> 	.driver	= {</div><div class='ctx'> 		.name	= "ucb1400_ts",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+		.pm	= &amp;ucb1400_ts_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init ucb1400_ts_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ucb1400_ts_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ucb1400_ts_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ucb1400_ts_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(ucb1400_ts_driver);</div><div class='ctx'> </div><div class='ctx'> module_param(adcsync, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(adcsync, "Synchronize touch readings with ADCSYNC pin.");</div><div class='hunk'>@@ -479,8 +463,5 @@ MODULE_PARM_DESC(ts_delay_pressure,</div><div class='ctx'> 		"delay between panel setup and pressure read."</div><div class='ctx'> 		"  Default = 0us.");</div><div class='ctx'> </div><div class='del'>-module_init(ucb1400_ts_init);</div><div class='del'>-module_exit(ucb1400_ts_exit);</div><div class='del'>-</div><div class='ctx'> MODULE_DESCRIPTION("Philips UCB1400 touchscreen driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c<br/>index 73fd6642b681..3a5ebf452e81 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/usbtouchscreen.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/usbtouchscreen.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/usbtouchscreen.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/usbtouchscreen.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'>  *  - JASTEC USB touch controller/DigiTech DTR-02U</div><div class='ctx'>  *  - Zytronic capacitive touchscreen</div><div class='ctx'>  *  - NEXIO/iNexio</div><div class='add'>+ *  - Elo TouchSystems 2700 IntelliTouch</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2004-2007 by Daniel Ritz &lt;daniel.ritz@gmx.ch&gt;</div><div class='ctx'>  * Copyright (C) by Todd E. Johnson (mtouchusb.c)</div><div class='hunk'>@@ -59,11 +60,11 @@</div><div class='ctx'> #define DRIVER_AUTHOR		"Daniel Ritz &lt;daniel.ritz@gmx.ch&gt;"</div><div class='ctx'> #define DRIVER_DESC		"USB Touchscreen Driver"</div><div class='ctx'> </div><div class='del'>-static int swap_xy;</div><div class='add'>+static bool swap_xy;</div><div class='ctx'> module_param(swap_xy, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(swap_xy, "If set X and Y axes are swapped.");</div><div class='ctx'> </div><div class='del'>-static int hwcalib_xy;</div><div class='add'>+static bool hwcalib_xy;</div><div class='ctx'> module_param(hwcalib_xy, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(hwcalib_xy, "If set hw-calibrated X/Y are used if available");</div><div class='ctx'> </div><div class='hunk'>@@ -138,6 +139,7 @@ enum {</div><div class='ctx'> 	DEVTYPE_ZYTRONIC,</div><div class='ctx'> 	DEVTYPE_TC45USB,</div><div class='ctx'> 	DEVTYPE_NEXIO,</div><div class='add'>+	DEVTYPE_ELO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define USB_DEVICE_HID_CLASS(vend, prod) \</div><div class='hunk'>@@ -239,6 +241,10 @@ static const struct usb_device_id usbtouch_devices[] = {</div><div class='ctx'> 		.driver_info = DEVTYPE_NEXIO},</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_TOUCHSCREEN_USB_ELO</div><div class='add'>+	{USB_DEVICE(0x04e7, 0x0020), .driver_info = DEVTYPE_ELO},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -945,6 +951,24 @@ static int nexio_read_data(struct usbtouch_usb *usbtouch, unsigned char *pkt)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='add'>+ * ELO part</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_TOUCHSCREEN_USB_ELO</div><div class='add'>+</div><div class='add'>+static int elo_read_data(struct usbtouch_usb *dev, unsigned char *pkt)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;x = (pkt[3] &lt;&lt; 8) | pkt[2];</div><div class='add'>+	dev-&gt;y = (pkt[5] &lt;&lt; 8) | pkt[4];</div><div class='add'>+	dev-&gt;touch = pkt[6] &gt; 0;</div><div class='add'>+	dev-&gt;press = pkt[6];</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='ctx'>  * the different device descriptors</div><div class='ctx'>  */</div><div class='ctx'> #ifdef MULTI_PACKET</div><div class='hunk'>@@ -953,6 +977,18 @@ static void usbtouch_process_multi(struct usbtouch_usb *usbtouch,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct usbtouch_device_info usbtouch_dev_info[] = {</div><div class='add'>+#ifdef CONFIG_TOUCHSCREEN_USB_ELO</div><div class='add'>+	[DEVTYPE_ELO] = {</div><div class='add'>+		.min_xc		= 0x0,</div><div class='add'>+		.max_xc		= 0x0fff,</div><div class='add'>+		.min_yc		= 0x0,</div><div class='add'>+		.max_yc		= 0x0fff,</div><div class='add'>+		.max_press	= 0xff,</div><div class='add'>+		.rept_size	= 8,</div><div class='add'>+		.read_data	= elo_read_data,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_TOUCHSCREEN_USB_EGALAX</div><div class='ctx'> 	[DEVTYPE_EGALAX] = {</div><div class='ctx'> 		.min_xc		= 0x0,</div><div class='hunk'>@@ -1580,18 +1616,7 @@ static struct usb_driver usbtouch_driver = {</div><div class='ctx'> 	.supports_autosuspend = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init usbtouch_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;usbtouch_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit usbtouch_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;usbtouch_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(usbtouch_init);</div><div class='del'>-module_exit(usbtouch_cleanup);</div><div class='add'>+module_usb_driver(usbtouch_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='head'>diff --git a/drivers/input/touchscreen/w90p910_ts.c b/drivers/input/touchscreen/w90p910_ts.c<br/>index 217aa51135c5..9396b21d0e8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/w90p910_ts.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/w90p910_ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/w90p910_ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/w90p910_ts.c</a></div><div class='hunk'>@@ -331,19 +331,7 @@ static struct platform_driver w90x900ts_driver = {</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init w90x900ts_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;w90x900ts_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit w90x900ts_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;w90x900ts_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(w90x900ts_init);</div><div class='del'>-module_exit(w90x900ts_exit);</div><div class='add'>+module_platform_driver(w90x900ts_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Wan ZongShun &lt;mcuos.com@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("w90p910 touch screen driver!");</div><div class='head'>diff --git a/drivers/input/touchscreen/wm831x-ts.c b/drivers/input/touchscreen/wm831x-ts.c<br/>index 9175d49d2546..4bc851a9dc3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/wm831x-ts.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/wm831x-ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/wm831x-ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/wm831x-ts.c</a></div><div class='hunk'>@@ -401,18 +401,7 @@ static struct platform_driver wm831x_ts_driver = {</div><div class='ctx'> 	.probe = wm831x_ts_probe,</div><div class='ctx'> 	.remove = __devexit_p(wm831x_ts_remove),</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init wm831x_ts_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;wm831x_ts_driver);</div><div class='del'>-}</div><div class='del'>-module_init(wm831x_ts_init);</div><div class='del'>-</div><div class='del'>-static void __exit wm831x_ts_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;wm831x_ts_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(wm831x_ts_exit);</div><div class='add'>+module_platform_driver(wm831x_ts_driver);</div><div class='ctx'> </div><div class='ctx'> /* Module information */</div><div class='ctx'> MODULE_AUTHOR("Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;");</div><div class='head'>diff --git a/drivers/input/touchscreen/zylonite-wm97xx.c b/drivers/input/touchscreen/zylonite-wm97xx.c<br/>index f6328c0cded6..bf0869a7a78e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/zylonite-wm97xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/input/touchscreen/zylonite-wm97xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/zylonite-wm97xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/input/touchscreen/zylonite-wm97xx.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</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/delay.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='hunk'>@@ -192,8 +193,8 @@ static int zylonite_wm97xx_probe(struct platform_device *pdev)</div><div class='ctx'> 	else</div><div class='ctx'> 		gpio_touch_irq = mfp_to_gpio(MFP_PIN_GPIO26);</div><div class='ctx'> </div><div class='del'>-	wm-&gt;pen_irq = IRQ_GPIO(gpio_touch_irq);</div><div class='del'>-	irq_set_irq_type(IRQ_GPIO(gpio_touch_irq), IRQ_TYPE_EDGE_BOTH);</div><div class='add'>+	wm-&gt;pen_irq = gpio_to_irq(gpio_touch_irq);</div><div class='add'>+	irq_set_irq_type(wm-&gt;pen_irq, IRQ_TYPE_EDGE_BOTH);</div><div class='ctx'> </div><div class='ctx'> 	wm97xx_config_gpio(wm, WM97XX_GPIO_13, WM97XX_GPIO_IN,</div><div class='ctx'> 			   WM97XX_GPIO_POL_HIGH,</div><div class='hunk'>@@ -223,19 +224,7 @@ static struct platform_driver zylonite_wm97xx_driver = {</div><div class='ctx'> 		.name	= "wm97xx-touch",</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init zylonite_wm97xx_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;zylonite_wm97xx_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit zylonite_wm97xx_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;zylonite_wm97xx_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(zylonite_wm97xx_init);</div><div class='del'>-module_exit(zylonite_wm97xx_exit);</div><div class='add'>+module_platform_driver(zylonite_wm97xx_driver);</div><div class='ctx'> </div><div class='ctx'> /* Module information */</div><div class='ctx'> MODULE_AUTHOR("Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;");</div><div class='head'>diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig<br/>index 5414253b185a..6bea6962f8ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/iommu/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/iommu/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/iommu/Kconfig</a></div><div class='hunk'>@@ -34,7 +34,9 @@ config AMD_IOMMU</div><div class='ctx'> 	bool "AMD IOMMU support"</div><div class='ctx'> 	select SWIOTLB</div><div class='ctx'> 	select PCI_MSI</div><div class='del'>-	select PCI_IOV</div><div class='add'>+	select PCI_ATS</div><div class='add'>+	select PCI_PRI</div><div class='add'>+	select PCI_PASID</div><div class='ctx'> 	select IOMMU_API</div><div class='ctx'> 	depends on X86_64 &amp;&amp; PCI &amp;&amp; ACPI</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -58,6 +60,15 @@ config AMD_IOMMU_STATS</div><div class='ctx'> 	  information to userspace via debugfs.</div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='add'>+config AMD_IOMMU_V2</div><div class='add'>+	tristate "AMD IOMMU Version 2 driver (EXPERIMENTAL)"</div><div class='add'>+	depends on AMD_IOMMU &amp;&amp; PROFILING &amp;&amp; EXPERIMENTAL</div><div class='add'>+	select MMU_NOTIFIER</div><div class='add'>+	---help---</div><div class='add'>+	  This option enables support for the AMD IOMMUv2 features of the IOMMU</div><div class='add'>+	  hardware. Select this option if you want to use devices that support</div><div class='add'>+	  the the PCI PRI and PASID interface.</div><div class='add'>+</div><div class='ctx'> # Intel IOMMU support</div><div class='ctx'> config DMAR_TABLE</div><div class='ctx'> 	bool</div><div class='head'>diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile<br/>index 2f4448794bc7..0e36b4934aff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/iommu/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/iommu/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/iommu/Makefile</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> obj-$(CONFIG_IOMMU_API) += iommu.o</div><div class='ctx'> obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o msm_iommu_dev.o</div><div class='ctx'> obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o</div><div class='add'>+obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o</div><div class='ctx'> obj-$(CONFIG_DMAR_TABLE) += dmar.o</div><div class='ctx'> obj-$(CONFIG_INTEL_IOMMU) += iova.o intel-iommu.o</div><div class='ctx'> obj-$(CONFIG_IRQ_REMAP) += intr_remapping.o</div><div class='head'>diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c<br/>index 4ee277a8521a..cce1f03b8895 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/iommu/amd_iommu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/amd_iommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/iommu/amd_iommu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/iommu/amd_iommu.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/ratelimit.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/pci-ats.h&gt;</div><div class='ctx'> #include &lt;linux/bitmap.h&gt;</div><div class='hunk'>@@ -28,6 +29,8 @@</div><div class='ctx'> #include &lt;linux/iommu.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/amd-iommu.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;asm/msidef.h&gt;</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='hunk'>@@ -41,6 +44,24 @@</div><div class='ctx'> </div><div class='ctx'> #define LOOP_TIMEOUT	100000</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This bitmap is used to advertise the page sizes our hardware support</div><div class='add'>+ * to the IOMMU core, which will then use this information to split</div><div class='add'>+ * physically contiguous memory regions it is mapping into page sizes</div><div class='add'>+ * that we support.</div><div class='add'>+ *</div><div class='add'>+ * Traditionally the IOMMU core just handed us the mappings directly,</div><div class='add'>+ * after making sure the size is an order of a 4KiB page and that the</div><div class='add'>+ * mapping has natural alignment.</div><div class='add'>+ *</div><div class='add'>+ * To retain this behavior, we currently advertise that we support</div><div class='add'>+ * all page sizes that are an order of 4KiB.</div><div class='add'>+ *</div><div class='add'>+ * If at some point we'd like to utilize the IOMMU core's new behavior,</div><div class='add'>+ * we could change this to advertise the real page sizes we support.</div><div class='add'>+ */</div><div class='add'>+#define AMD_IOMMU_PGSIZES	(~0xFFFUL)</div><div class='add'>+</div><div class='ctx'> static DEFINE_RWLOCK(amd_iommu_devtable_lock);</div><div class='ctx'> </div><div class='ctx'> /* A list of preallocated protection domains */</div><div class='hunk'>@@ -59,6 +80,9 @@ static struct protection_domain *pt_domain;</div><div class='ctx'> </div><div class='ctx'> static struct iommu_ops amd_iommu_ops;</div><div class='ctx'> </div><div class='add'>+static ATOMIC_NOTIFIER_HEAD(ppr_notifier);</div><div class='add'>+int amd_iommu_max_glx_val = -1;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * general struct to manage commands send to an IOMMU</div><div class='ctx'>  */</div><div class='hunk'>@@ -67,6 +91,7 @@ struct iommu_cmd {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void update_domain(struct protection_domain *domain);</div><div class='add'>+static int __init alloc_passthrough_domain(void);</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -147,6 +172,33 @@ static struct iommu_dev_data *get_dev_data(struct device *dev)</div><div class='ctx'> 	return dev-&gt;archdata.iommu;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool pci_iommuv2_capable(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	static const int caps[] = {</div><div class='add'>+		PCI_EXT_CAP_ID_ATS,</div><div class='add'>+		PCI_EXT_CAP_ID_PRI,</div><div class='add'>+		PCI_EXT_CAP_ID_PASID,</div><div class='add'>+	};</div><div class='add'>+	int i, pos;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3; ++i) {</div><div class='add'>+		pos = pci_find_ext_capability(pdev, caps[i]);</div><div class='add'>+		if (pos == 0)</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 pdev_pri_erratum(struct pci_dev *pdev, u32 erratum)</div><div class='add'>+{</div><div class='add'>+	struct iommu_dev_data *dev_data;</div><div class='add'>+</div><div class='add'>+	dev_data = get_dev_data(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return dev_data-&gt;errata &amp; (1 &lt;&lt; erratum) ? true : false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * In this function the list of preallocated protection domains is traversed to</div><div class='ctx'>  * find the domain for a specific device</div><div class='hunk'>@@ -204,6 +256,7 @@ static bool check_device(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static int iommu_init_device(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='ctx'> 	struct iommu_dev_data *dev_data;</div><div class='ctx'> 	u16 alias;</div><div class='ctx'> </div><div class='hunk'>@@ -228,6 +281,13 @@ static int iommu_init_device(struct device *dev)</div><div class='ctx'> 		dev_data-&gt;alias_data = alias_data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (pci_iommuv2_capable(pdev)) {</div><div class='add'>+		struct amd_iommu *iommu;</div><div class='add'>+</div><div class='add'>+		iommu              = amd_iommu_rlookup_table[dev_data-&gt;devid];</div><div class='add'>+		dev_data-&gt;iommu_v2 = iommu-&gt;is_iommu_v2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;archdata.iommu = dev_data;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -317,6 +377,11 @@ DECLARE_STATS_COUNTER(domain_flush_single);</div><div class='ctx'> DECLARE_STATS_COUNTER(domain_flush_all);</div><div class='ctx'> DECLARE_STATS_COUNTER(alloced_io_mem);</div><div class='ctx'> DECLARE_STATS_COUNTER(total_map_requests);</div><div class='add'>+DECLARE_STATS_COUNTER(complete_ppr);</div><div class='add'>+DECLARE_STATS_COUNTER(invalidate_iotlb);</div><div class='add'>+DECLARE_STATS_COUNTER(invalidate_iotlb_all);</div><div class='add'>+DECLARE_STATS_COUNTER(pri_requests);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static struct dentry *stats_dir;</div><div class='ctx'> static struct dentry *de_fflush;</div><div class='hunk'>@@ -351,6 +416,10 @@ static void amd_iommu_stats_init(void)</div><div class='ctx'> 	amd_iommu_stats_add(&amp;domain_flush_all);</div><div class='ctx'> 	amd_iommu_stats_add(&amp;alloced_io_mem);</div><div class='ctx'> 	amd_iommu_stats_add(&amp;total_map_requests);</div><div class='add'>+	amd_iommu_stats_add(&amp;complete_ppr);</div><div class='add'>+	amd_iommu_stats_add(&amp;invalidate_iotlb);</div><div class='add'>+	amd_iommu_stats_add(&amp;invalidate_iotlb_all);</div><div class='add'>+	amd_iommu_stats_add(&amp;pri_requests);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='hunk'>@@ -365,8 +434,8 @@ static void dump_dte_entry(u16 devid)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 8; ++i)</div><div class='del'>-		pr_err("AMD-Vi: DTE[%d]: %08x\n", i,</div><div class='add'>+	for (i = 0; i &lt; 4; ++i)</div><div class='add'>+		pr_err("AMD-Vi: DTE[%d]: %016llx\n", i,</div><div class='ctx'> 			amd_iommu_dev_table[devid].data[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -461,12 +530,84 @@ static void iommu_poll_events(struct amd_iommu *iommu)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;iommu-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iommu_handle_ppr_entry(struct amd_iommu *iommu, u32 head)</div><div class='add'>+{</div><div class='add'>+	struct amd_iommu_fault fault;</div><div class='add'>+	volatile u64 *raw;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	INC_STATS_COUNTER(pri_requests);</div><div class='add'>+</div><div class='add'>+	raw = (u64 *)(iommu-&gt;ppr_log + head);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Hardware bug: Interrupt may arrive before the entry is written to</div><div class='add'>+	 * memory. If this happens we need to wait for the entry to arrive.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; LOOP_TIMEOUT; ++i) {</div><div class='add'>+		if (PPR_REQ_TYPE(raw[0]) != 0)</div><div class='add'>+			break;</div><div class='add'>+		udelay(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (PPR_REQ_TYPE(raw[0]) != PPR_REQ_FAULT) {</div><div class='add'>+		pr_err_ratelimited("AMD-Vi: Unknown PPR request received\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fault.address   = raw[1];</div><div class='add'>+	fault.pasid     = PPR_PASID(raw[0]);</div><div class='add'>+	fault.device_id = PPR_DEVID(raw[0]);</div><div class='add'>+	fault.tag       = PPR_TAG(raw[0]);</div><div class='add'>+	fault.flags     = PPR_FLAGS(raw[0]);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * To detect the hardware bug we need to clear the entry</div><div class='add'>+	 * to back to zero.</div><div class='add'>+	 */</div><div class='add'>+	raw[0] = raw[1] = 0;</div><div class='add'>+</div><div class='add'>+	atomic_notifier_call_chain(&amp;ppr_notifier, 0, &amp;fault);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iommu_poll_ppr_log(struct amd_iommu *iommu)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 head, tail;</div><div class='add'>+</div><div class='add'>+	if (iommu-&gt;ppr_log == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;iommu-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	head = readl(iommu-&gt;mmio_base + MMIO_PPR_HEAD_OFFSET);</div><div class='add'>+	tail = readl(iommu-&gt;mmio_base + MMIO_PPR_TAIL_OFFSET);</div><div class='add'>+</div><div class='add'>+	while (head != tail) {</div><div class='add'>+</div><div class='add'>+		/* Handle PPR entry */</div><div class='add'>+		iommu_handle_ppr_entry(iommu, head);</div><div class='add'>+</div><div class='add'>+		/* Update and refresh ring-buffer state*/</div><div class='add'>+		head = (head + PPR_ENTRY_SIZE) % PPR_LOG_SIZE;</div><div class='add'>+		writel(head, iommu-&gt;mmio_base + MMIO_PPR_HEAD_OFFSET);</div><div class='add'>+		tail = readl(iommu-&gt;mmio_base + MMIO_PPR_TAIL_OFFSET);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enable ppr interrupts again */</div><div class='add'>+	writel(MMIO_STATUS_PPR_INT_MASK, iommu-&gt;mmio_base + MMIO_STATUS_OFFSET);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;iommu-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> irqreturn_t amd_iommu_int_thread(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct amd_iommu *iommu;</div><div class='ctx'> </div><div class='del'>-	for_each_iommu(iommu)</div><div class='add'>+	for_each_iommu(iommu) {</div><div class='ctx'> 		iommu_poll_events(iommu);</div><div class='add'>+		iommu_poll_ppr_log(iommu);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -595,6 +736,60 @@ static void build_inv_iotlb_pages(struct iommu_cmd *cmd, u16 devid, int qdep,</div><div class='ctx'> 		cmd-&gt;data[2] |= CMD_INV_IOMMU_PAGES_SIZE_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void build_inv_iommu_pasid(struct iommu_cmd *cmd, u16 domid, int pasid,</div><div class='add'>+				  u64 address, bool size)</div><div class='add'>+{</div><div class='add'>+	memset(cmd, 0, sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	address &amp;= ~(0xfffULL);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;data[0]  = pasid &amp; PASID_MASK;</div><div class='add'>+	cmd-&gt;data[1]  = domid;</div><div class='add'>+	cmd-&gt;data[2]  = lower_32_bits(address);</div><div class='add'>+	cmd-&gt;data[3]  = upper_32_bits(address);</div><div class='add'>+	cmd-&gt;data[2] |= CMD_INV_IOMMU_PAGES_PDE_MASK;</div><div class='add'>+	cmd-&gt;data[2] |= CMD_INV_IOMMU_PAGES_GN_MASK;</div><div class='add'>+	if (size)</div><div class='add'>+		cmd-&gt;data[2] |= CMD_INV_IOMMU_PAGES_SIZE_MASK;</div><div class='add'>+	CMD_SET_TYPE(cmd, CMD_INV_IOMMU_PAGES);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void build_inv_iotlb_pasid(struct iommu_cmd *cmd, u16 devid, int pasid,</div><div class='add'>+				  int qdep, u64 address, bool size)</div><div class='add'>+{</div><div class='add'>+	memset(cmd, 0, sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	address &amp;= ~(0xfffULL);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;data[0]  = devid;</div><div class='add'>+	cmd-&gt;data[0] |= (pasid &amp; 0xff) &lt;&lt; 16;</div><div class='add'>+	cmd-&gt;data[0] |= (qdep  &amp; 0xff) &lt;&lt; 24;</div><div class='add'>+	cmd-&gt;data[1]  = devid;</div><div class='add'>+	cmd-&gt;data[1] |= ((pasid &gt;&gt; 8) &amp; 0xfff) &lt;&lt; 16;</div><div class='add'>+	cmd-&gt;data[2]  = lower_32_bits(address);</div><div class='add'>+	cmd-&gt;data[2] |= CMD_INV_IOMMU_PAGES_GN_MASK;</div><div class='add'>+	cmd-&gt;data[3]  = upper_32_bits(address);</div><div class='add'>+	if (size)</div><div class='add'>+		cmd-&gt;data[2] |= CMD_INV_IOMMU_PAGES_SIZE_MASK;</div><div class='add'>+	CMD_SET_TYPE(cmd, CMD_INV_IOTLB_PAGES);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void build_complete_ppr(struct iommu_cmd *cmd, u16 devid, int pasid,</div><div class='add'>+			       int status, int tag, bool gn)</div><div class='add'>+{</div><div class='add'>+	memset(cmd, 0, sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;data[0]  = devid;</div><div class='add'>+	if (gn) {</div><div class='add'>+		cmd-&gt;data[1]  = pasid &amp; PASID_MASK;</div><div class='add'>+		cmd-&gt;data[2]  = CMD_INV_IOMMU_PAGES_GN_MASK;</div><div class='add'>+	}</div><div class='add'>+	cmd-&gt;data[3]  = tag &amp; 0x1ff;</div><div class='add'>+	cmd-&gt;data[3] |= (status &amp; PPR_STATUS_MASK) &lt;&lt; PPR_STATUS_SHIFT;</div><div class='add'>+</div><div class='add'>+	CMD_SET_TYPE(cmd, CMD_COMPLETE_PPR);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void build_inv_all(struct iommu_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	memset(cmd, 0, sizeof(*cmd));</div><div class='hunk'>@@ -1496,6 +1691,48 @@ static void free_pagetable(struct protection_domain *domain)</div><div class='ctx'> 	domain-&gt;pt_root = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void free_gcr3_tbl_level1(u64 *tbl)</div><div class='add'>+{</div><div class='add'>+	u64 *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 512; ++i) {</div><div class='add'>+		if (!(tbl[i] &amp; GCR3_VALID))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ptr = __va(tbl[i] &amp; PAGE_MASK);</div><div class='add'>+</div><div class='add'>+		free_page((unsigned long)ptr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_gcr3_tbl_level2(u64 *tbl)</div><div class='add'>+{</div><div class='add'>+	u64 *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 512; ++i) {</div><div class='add'>+		if (!(tbl[i] &amp; GCR3_VALID))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ptr = __va(tbl[i] &amp; PAGE_MASK);</div><div class='add'>+</div><div class='add'>+		free_gcr3_tbl_level1(ptr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_gcr3_table(struct protection_domain *domain)</div><div class='add'>+{</div><div class='add'>+	if (domain-&gt;glx == 2)</div><div class='add'>+		free_gcr3_tbl_level2(domain-&gt;gcr3_tbl);</div><div class='add'>+	else if (domain-&gt;glx == 1)</div><div class='add'>+		free_gcr3_tbl_level1(domain-&gt;gcr3_tbl);</div><div class='add'>+	else if (domain-&gt;glx != 0)</div><div class='add'>+		BUG();</div><div class='add'>+</div><div class='add'>+	free_page((unsigned long)domain-&gt;gcr3_tbl);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Free a domain, only used if something went wrong in the</div><div class='ctx'>  * allocation path and we need to free an already allocated page table</div><div class='hunk'>@@ -1582,20 +1819,52 @@ static bool dma_ops_domain(struct protection_domain *domain)</div><div class='ctx'> </div><div class='ctx'> static void set_dte_entry(u16 devid, struct protection_domain *domain, bool ats)</div><div class='ctx'> {</div><div class='del'>-	u64 pte_root = virt_to_phys(domain-&gt;pt_root);</div><div class='del'>-	u32 flags = 0;</div><div class='add'>+	u64 pte_root = 0;</div><div class='add'>+	u64 flags = 0;</div><div class='add'>+</div><div class='add'>+	if (domain-&gt;mode != PAGE_MODE_NONE)</div><div class='add'>+		pte_root = virt_to_phys(domain-&gt;pt_root);</div><div class='ctx'> </div><div class='ctx'> 	pte_root |= (domain-&gt;mode &amp; DEV_ENTRY_MODE_MASK)</div><div class='ctx'> 		    &lt;&lt; DEV_ENTRY_MODE_SHIFT;</div><div class='ctx'> 	pte_root |= IOMMU_PTE_IR | IOMMU_PTE_IW | IOMMU_PTE_P | IOMMU_PTE_TV;</div><div class='ctx'> </div><div class='add'>+	flags = amd_iommu_dev_table[devid].data[1];</div><div class='add'>+</div><div class='ctx'> 	if (ats)</div><div class='ctx'> 		flags |= DTE_FLAG_IOTLB;</div><div class='ctx'> </div><div class='del'>-	amd_iommu_dev_table[devid].data[3] |= flags;</div><div class='del'>-	amd_iommu_dev_table[devid].data[2]  = domain-&gt;id;</div><div class='del'>-	amd_iommu_dev_table[devid].data[1]  = upper_32_bits(pte_root);</div><div class='del'>-	amd_iommu_dev_table[devid].data[0]  = lower_32_bits(pte_root);</div><div class='add'>+	if (domain-&gt;flags &amp; PD_IOMMUV2_MASK) {</div><div class='add'>+		u64 gcr3 = __pa(domain-&gt;gcr3_tbl);</div><div class='add'>+		u64 glx  = domain-&gt;glx;</div><div class='add'>+		u64 tmp;</div><div class='add'>+</div><div class='add'>+		pte_root |= DTE_FLAG_GV;</div><div class='add'>+		pte_root |= (glx &amp; DTE_GLX_MASK) &lt;&lt; DTE_GLX_SHIFT;</div><div class='add'>+</div><div class='add'>+		/* First mask out possible old values for GCR3 table */</div><div class='add'>+		tmp = DTE_GCR3_VAL_B(~0ULL) &lt;&lt; DTE_GCR3_SHIFT_B;</div><div class='add'>+		flags    &amp;= ~tmp;</div><div class='add'>+</div><div class='add'>+		tmp = DTE_GCR3_VAL_C(~0ULL) &lt;&lt; DTE_GCR3_SHIFT_C;</div><div class='add'>+		flags    &amp;= ~tmp;</div><div class='add'>+</div><div class='add'>+		/* Encode GCR3 table into DTE */</div><div class='add'>+		tmp = DTE_GCR3_VAL_A(gcr3) &lt;&lt; DTE_GCR3_SHIFT_A;</div><div class='add'>+		pte_root |= tmp;</div><div class='add'>+</div><div class='add'>+		tmp = DTE_GCR3_VAL_B(gcr3) &lt;&lt; DTE_GCR3_SHIFT_B;</div><div class='add'>+		flags    |= tmp;</div><div class='add'>+</div><div class='add'>+		tmp = DTE_GCR3_VAL_C(gcr3) &lt;&lt; DTE_GCR3_SHIFT_C;</div><div class='add'>+		flags    |= tmp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flags &amp;= ~(0xffffUL);</div><div class='add'>+	flags |= domain-&gt;id;</div><div class='add'>+</div><div class='add'>+	amd_iommu_dev_table[devid].data[1]  = flags;</div><div class='add'>+	amd_iommu_dev_table[devid].data[0]  = pte_root;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void clear_dte_entry(u16 devid)</div><div class='hunk'>@@ -1603,7 +1872,6 @@ static void clear_dte_entry(u16 devid)</div><div class='ctx'> 	/* remove entry from the device table seen by the hardware */</div><div class='ctx'> 	amd_iommu_dev_table[devid].data[0] = IOMMU_PTE_P | IOMMU_PTE_TV;</div><div class='ctx'> 	amd_iommu_dev_table[devid].data[1] = 0;</div><div class='del'>-	amd_iommu_dev_table[devid].data[2] = 0;</div><div class='ctx'> </div><div class='ctx'> 	amd_iommu_apply_erratum_63(devid);</div><div class='ctx'> }</div><div class='hunk'>@@ -1696,6 +1964,93 @@ out_unlock:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static void pdev_iommuv2_disable(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	pci_disable_ats(pdev);</div><div class='add'>+	pci_disable_pri(pdev);</div><div class='add'>+	pci_disable_pasid(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* FIXME: Change generic reset-function to do the same */</div><div class='add'>+static int pri_reset_while_enabled(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	u16 control;</div><div class='add'>+	int pos;</div><div class='add'>+</div><div class='add'>+	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI);</div><div class='add'>+	if (!pos)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pci_read_config_word(pdev, pos + PCI_PRI_CTRL, &amp;control);</div><div class='add'>+	control |= PCI_PRI_CTRL_RESET;</div><div class='add'>+	pci_write_config_word(pdev, pos + PCI_PRI_CTRL, control);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pdev_iommuv2_enable(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	bool reset_enable;</div><div class='add'>+	int reqs, ret;</div><div class='add'>+</div><div class='add'>+	/* FIXME: Hardcode number of outstanding requests for now */</div><div class='add'>+	reqs = 32;</div><div class='add'>+	if (pdev_pri_erratum(pdev, AMD_PRI_DEV_ERRATUM_LIMIT_REQ_ONE))</div><div class='add'>+		reqs = 1;</div><div class='add'>+	reset_enable = pdev_pri_erratum(pdev, AMD_PRI_DEV_ERRATUM_ENABLE_RESET);</div><div class='add'>+</div><div class='add'>+	/* Only allow access to user-accessible pages */</div><div class='add'>+	ret = pci_enable_pasid(pdev, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	/* First reset the PRI state of the device */</div><div class='add'>+	ret = pci_reset_pri(pdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	/* Enable PRI */</div><div class='add'>+	ret = pci_enable_pri(pdev, reqs);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	if (reset_enable) {</div><div class='add'>+		ret = pri_reset_while_enabled(pdev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = pci_enable_ats(pdev, PAGE_SHIFT);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	pci_disable_pri(pdev);</div><div class='add'>+	pci_disable_pasid(pdev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* FIXME: Move this to PCI code */</div><div class='add'>+#define PCI_PRI_TLP_OFF		(1 &lt;&lt; 2)</div><div class='add'>+</div><div class='add'>+bool pci_pri_tlp_required(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	u16 control;</div><div class='add'>+	int pos;</div><div class='add'>+</div><div class='add'>+	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI);</div><div class='add'>+	if (!pos)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	pci_read_config_word(pdev, pos + PCI_PRI_CTRL, &amp;control);</div><div class='add'>+</div><div class='add'>+	return (control &amp; PCI_PRI_TLP_OFF) ? true : false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * If a device is not yet associated with a domain, this function does</div><div class='ctx'>  * assigns it visible for the hardware</div><div class='hunk'>@@ -1710,7 +2065,18 @@ static int attach_device(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	dev_data = get_dev_data(dev);</div><div class='ctx'> </div><div class='del'>-	if (amd_iommu_iotlb_sup &amp;&amp; pci_enable_ats(pdev, PAGE_SHIFT) == 0) {</div><div class='add'>+	if (domain-&gt;flags &amp; PD_IOMMUV2_MASK) {</div><div class='add'>+		if (!dev_data-&gt;iommu_v2 || !dev_data-&gt;passthrough)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (pdev_iommuv2_enable(pdev) != 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		dev_data-&gt;ats.enabled = true;</div><div class='add'>+		dev_data-&gt;ats.qdep    = pci_ats_queue_depth(pdev);</div><div class='add'>+		dev_data-&gt;pri_tlp     = pci_pri_tlp_required(pdev);</div><div class='add'>+	} else if (amd_iommu_iotlb_sup &amp;&amp;</div><div class='add'>+		   pci_enable_ats(pdev, PAGE_SHIFT) == 0) {</div><div class='ctx'> 		dev_data-&gt;ats.enabled = true;</div><div class='ctx'> 		dev_data-&gt;ats.qdep    = pci_ats_queue_depth(pdev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1760,7 +2126,7 @@ static void __detach_device(struct iommu_dev_data *dev_data)</div><div class='ctx'> 	 * passthrough domain if it is detached from any other domain.</div><div class='ctx'> 	 * Make sure we can deassign from the pt_domain itself.</div><div class='ctx'> 	 */</div><div class='del'>-	if (iommu_pass_through &amp;&amp;</div><div class='add'>+	if (dev_data-&gt;passthrough &amp;&amp;</div><div class='ctx'> 	    (dev_data-&gt;domain == NULL &amp;&amp; domain != pt_domain))</div><div class='ctx'> 		__attach_device(dev_data, pt_domain);</div><div class='ctx'> }</div><div class='hunk'>@@ -1770,20 +2136,24 @@ static void __detach_device(struct iommu_dev_data *dev_data)</div><div class='ctx'>  */</div><div class='ctx'> static void detach_device(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct protection_domain *domain;</div><div class='ctx'> 	struct iommu_dev_data *dev_data;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	dev_data = get_dev_data(dev);</div><div class='add'>+	domain   = dev_data-&gt;domain;</div><div class='ctx'> </div><div class='ctx'> 	/* lock device table */</div><div class='ctx'> 	write_lock_irqsave(&amp;amd_iommu_devtable_lock, flags);</div><div class='ctx'> 	__detach_device(dev_data);</div><div class='ctx'> 	write_unlock_irqrestore(&amp;amd_iommu_devtable_lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (dev_data-&gt;ats.enabled) {</div><div class='add'>+	if (domain-&gt;flags &amp; PD_IOMMUV2_MASK)</div><div class='add'>+		pdev_iommuv2_disable(to_pci_dev(dev));</div><div class='add'>+	else if (dev_data-&gt;ats.enabled)</div><div class='ctx'> 		pci_disable_ats(to_pci_dev(dev));</div><div class='del'>-		dev_data-&gt;ats.enabled = false;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	dev_data-&gt;ats.enabled = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1818,18 +2188,20 @@ static struct protection_domain *domain_for_device(struct device *dev)</div><div class='ctx'> static int device_change_notifier(struct notifier_block *nb,</div><div class='ctx'> 				  unsigned long action, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct device *dev = data;</div><div class='del'>-	u16 devid;</div><div class='del'>-	struct protection_domain *domain;</div><div class='ctx'> 	struct dma_ops_domain *dma_domain;</div><div class='add'>+	struct protection_domain *domain;</div><div class='add'>+	struct iommu_dev_data *dev_data;</div><div class='add'>+	struct device *dev = data;</div><div class='ctx'> 	struct amd_iommu *iommu;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	u16 devid;</div><div class='ctx'> </div><div class='ctx'> 	if (!check_device(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	devid  = get_device_id(dev);</div><div class='del'>-	iommu  = amd_iommu_rlookup_table[devid];</div><div class='add'>+	devid    = get_device_id(dev);</div><div class='add'>+	iommu    = amd_iommu_rlookup_table[devid];</div><div class='add'>+	dev_data = get_dev_data(dev);</div><div class='ctx'> </div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case BUS_NOTIFY_UNBOUND_DRIVER:</div><div class='hunk'>@@ -1838,7 +2210,7 @@ static int device_change_notifier(struct notifier_block *nb,</div><div class='ctx'> </div><div class='ctx'> 		if (!domain)</div><div class='ctx'> 			goto out;</div><div class='del'>-		if (iommu_pass_through)</div><div class='add'>+		if (dev_data-&gt;passthrough)</div><div class='ctx'> 			break;</div><div class='ctx'> 		detach_device(dev);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2434,8 +2806,9 @@ static int amd_iommu_dma_supported(struct device *dev, u64 mask)</div><div class='ctx'>  */</div><div class='ctx'> static void prealloc_protection_domains(void)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *dev = NULL;</div><div class='add'>+	struct iommu_dev_data *dev_data;</div><div class='ctx'> 	struct dma_ops_domain *dma_dom;</div><div class='add'>+	struct pci_dev *dev = NULL;</div><div class='ctx'> 	u16 devid;</div><div class='ctx'> </div><div class='ctx'> 	for_each_pci_dev(dev) {</div><div class='hunk'>@@ -2444,6 +2817,16 @@ static void prealloc_protection_domains(void)</div><div class='ctx'> 		if (!check_device(&amp;dev-&gt;dev))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		dev_data = get_dev_data(&amp;dev-&gt;dev);</div><div class='add'>+		if (!amd_iommu_force_isolation &amp;&amp; dev_data-&gt;iommu_v2) {</div><div class='add'>+			/* Make sure passthrough domain is allocated */</div><div class='add'>+			alloc_passthrough_domain();</div><div class='add'>+			dev_data-&gt;passthrough = true;</div><div class='add'>+			attach_device(&amp;dev-&gt;dev, pt_domain);</div><div class='add'>+			pr_info("AMD-Vi: Using passthough domain for device %s\n",</div><div class='add'>+				dev_name(&amp;dev-&gt;dev));</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* Is there already any domain for it? */</div><div class='ctx'> 		if (domain_for_device(&amp;dev-&gt;dev))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -2474,6 +2857,7 @@ static struct dma_map_ops amd_iommu_dma_ops = {</div><div class='ctx'> </div><div class='ctx'> static unsigned device_dma_ops_init(void)</div><div class='ctx'> {</div><div class='add'>+	struct iommu_dev_data *dev_data;</div><div class='ctx'> 	struct pci_dev *pdev = NULL;</div><div class='ctx'> 	unsigned unhandled = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2483,7 +2867,12 @@ static unsigned device_dma_ops_init(void)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pdev-&gt;dev.archdata.dma_ops = &amp;amd_iommu_dma_ops;</div><div class='add'>+		dev_data = get_dev_data(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+		if (!dev_data-&gt;passthrough)</div><div class='add'>+			pdev-&gt;dev.archdata.dma_ops = &amp;amd_iommu_dma_ops;</div><div class='add'>+		else</div><div class='add'>+			pdev-&gt;dev.archdata.dma_ops = &amp;nommu_dma_ops;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return unhandled;</div><div class='hunk'>@@ -2610,6 +2999,20 @@ out_err:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __init alloc_passthrough_domain(void)</div><div class='add'>+{</div><div class='add'>+	if (pt_domain != NULL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* allocate passthrough domain */</div><div class='add'>+	pt_domain = protection_domain_alloc();</div><div class='add'>+	if (!pt_domain)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pt_domain-&gt;mode = PAGE_MODE_NONE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> static int amd_iommu_domain_init(struct iommu_domain *dom)</div><div class='ctx'> {</div><div class='ctx'> 	struct protection_domain *domain;</div><div class='hunk'>@@ -2623,6 +3026,8 @@ static int amd_iommu_domain_init(struct iommu_domain *dom)</div><div class='ctx'> 	if (!domain-&gt;pt_root)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='add'>+	domain-&gt;iommu_domain = dom;</div><div class='add'>+</div><div class='ctx'> 	dom-&gt;priv = domain;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2645,7 +3050,11 @@ static void amd_iommu_domain_destroy(struct iommu_domain *dom)</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(domain-&gt;dev_cnt != 0);</div><div class='ctx'> </div><div class='del'>-	free_pagetable(domain);</div><div class='add'>+	if (domain-&gt;mode != PAGE_MODE_NONE)</div><div class='add'>+		free_pagetable(domain);</div><div class='add'>+</div><div class='add'>+	if (domain-&gt;flags &amp; PD_IOMMUV2_MASK)</div><div class='add'>+		free_gcr3_table(domain);</div><div class='ctx'> </div><div class='ctx'> 	protection_domain_free(domain);</div><div class='ctx'> </div><div class='hunk'>@@ -2702,13 +3111,15 @@ static int amd_iommu_attach_device(struct iommu_domain *dom,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int amd_iommu_map(struct iommu_domain *dom, unsigned long iova,</div><div class='del'>-			 phys_addr_t paddr, int gfp_order, int iommu_prot)</div><div class='add'>+			 phys_addr_t paddr, size_t page_size, int iommu_prot)</div><div class='ctx'> {</div><div class='del'>-	unsigned long page_size = 0x1000UL &lt;&lt; gfp_order;</div><div class='ctx'> 	struct protection_domain *domain = dom-&gt;priv;</div><div class='ctx'> 	int prot = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (domain-&gt;mode == PAGE_MODE_NONE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (iommu_prot &amp; IOMMU_READ)</div><div class='ctx'> 		prot |= IOMMU_PROT_IR;</div><div class='ctx'> 	if (iommu_prot &amp; IOMMU_WRITE)</div><div class='hunk'>@@ -2721,13 +3132,14 @@ static int amd_iommu_map(struct iommu_domain *dom, unsigned long iova,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int amd_iommu_unmap(struct iommu_domain *dom, unsigned long iova,</div><div class='del'>-			   int gfp_order)</div><div class='add'>+static size_t amd_iommu_unmap(struct iommu_domain *dom, unsigned long iova,</div><div class='add'>+			   size_t page_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct protection_domain *domain = dom-&gt;priv;</div><div class='del'>-	unsigned long page_size, unmap_size;</div><div class='add'>+	size_t unmap_size;</div><div class='ctx'> </div><div class='del'>-	page_size  = 0x1000UL &lt;&lt; gfp_order;</div><div class='add'>+	if (domain-&gt;mode == PAGE_MODE_NONE)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;domain-&gt;api_lock);</div><div class='ctx'> 	unmap_size = iommu_unmap_page(domain, iova, page_size);</div><div class='hunk'>@@ -2735,7 +3147,7 @@ static int amd_iommu_unmap(struct iommu_domain *dom, unsigned long iova,</div><div class='ctx'> </div><div class='ctx'> 	domain_flush_tlb_pde(domain);</div><div class='ctx'> </div><div class='del'>-	return get_order(unmap_size);</div><div class='add'>+	return unmap_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static phys_addr_t amd_iommu_iova_to_phys(struct iommu_domain *dom,</div><div class='hunk'>@@ -2746,6 +3158,9 @@ static phys_addr_t amd_iommu_iova_to_phys(struct iommu_domain *dom,</div><div class='ctx'> 	phys_addr_t paddr;</div><div class='ctx'> 	u64 *pte, __pte;</div><div class='ctx'> </div><div class='add'>+	if (domain-&gt;mode == PAGE_MODE_NONE)</div><div class='add'>+		return iova;</div><div class='add'>+</div><div class='ctx'> 	pte = fetch_pte(domain, iova);</div><div class='ctx'> </div><div class='ctx'> 	if (!pte || !IOMMU_PTE_PRESENT(*pte))</div><div class='hunk'>@@ -2773,6 +3188,26 @@ static int amd_iommu_domain_has_cap(struct iommu_domain *domain,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int amd_iommu_device_group(struct device *dev, unsigned int *groupid)</div><div class='add'>+{</div><div class='add'>+	struct iommu_dev_data *dev_data = dev-&gt;archdata.iommu;</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='add'>+	u16 devid;</div><div class='add'>+</div><div class='add'>+	if (!dev_data)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;is_virtfn || !iommu_group_mf)</div><div class='add'>+		devid = dev_data-&gt;devid;</div><div class='add'>+	else</div><div class='add'>+		devid = calc_devid(pdev-&gt;bus-&gt;number,</div><div class='add'>+				   PCI_DEVFN(PCI_SLOT(pdev-&gt;devfn), 0));</div><div class='add'>+</div><div class='add'>+	*groupid = amd_iommu_alias_table[devid];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct iommu_ops amd_iommu_ops = {</div><div class='ctx'> 	.domain_init = amd_iommu_domain_init,</div><div class='ctx'> 	.domain_destroy = amd_iommu_domain_destroy,</div><div class='hunk'>@@ -2782,6 +3217,8 @@ static struct iommu_ops amd_iommu_ops = {</div><div class='ctx'> 	.unmap = amd_iommu_unmap,</div><div class='ctx'> 	.iova_to_phys = amd_iommu_iova_to_phys,</div><div class='ctx'> 	.domain_has_cap = amd_iommu_domain_has_cap,</div><div class='add'>+	.device_group = amd_iommu_device_group,</div><div class='add'>+	.pgsize_bitmap	= AMD_IOMMU_PGSIZES,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='hunk'>@@ -2796,21 +3233,23 @@ static struct iommu_ops amd_iommu_ops = {</div><div class='ctx'> </div><div class='ctx'> int __init amd_iommu_init_passthrough(void)</div><div class='ctx'> {</div><div class='del'>-	struct amd_iommu *iommu;</div><div class='add'>+	struct iommu_dev_data *dev_data;</div><div class='ctx'> 	struct pci_dev *dev = NULL;</div><div class='add'>+	struct amd_iommu *iommu;</div><div class='ctx'> 	u16 devid;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	/* allocate passthrough domain */</div><div class='del'>-	pt_domain = protection_domain_alloc();</div><div class='del'>-	if (!pt_domain)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	pt_domain-&gt;mode |= PAGE_MODE_NONE;</div><div class='add'>+	ret = alloc_passthrough_domain();</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	for_each_pci_dev(dev) {</div><div class='ctx'> 		if (!check_device(&amp;dev-&gt;dev))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		dev_data = get_dev_data(&amp;dev-&gt;dev);</div><div class='add'>+		dev_data-&gt;passthrough = true;</div><div class='add'>+</div><div class='ctx'> 		devid = get_device_id(&amp;dev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 		iommu = amd_iommu_rlookup_table[devid];</div><div class='hunk'>@@ -2820,7 +3259,375 @@ int __init amd_iommu_init_passthrough(void)</div><div class='ctx'> 		attach_device(&amp;dev-&gt;dev, pt_domain);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	amd_iommu_stats_init();</div><div class='add'>+</div><div class='ctx'> 	pr_info("AMD-Vi: Initialized for Passthrough Mode\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* IOMMUv2 specific functions */</div><div class='add'>+int amd_iommu_register_ppr_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	return atomic_notifier_chain_register(&amp;ppr_notifier, nb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_register_ppr_notifier);</div><div class='add'>+</div><div class='add'>+int amd_iommu_unregister_ppr_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	return atomic_notifier_chain_unregister(&amp;ppr_notifier, nb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_unregister_ppr_notifier);</div><div class='add'>+</div><div class='add'>+void amd_iommu_domain_direct_map(struct iommu_domain *dom)</div><div class='add'>+{</div><div class='add'>+	struct protection_domain *domain = dom-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;domain-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Update data structure */</div><div class='add'>+	domain-&gt;mode    = PAGE_MODE_NONE;</div><div class='add'>+	domain-&gt;updated = true;</div><div class='add'>+</div><div class='add'>+	/* Make changes visible to IOMMUs */</div><div class='add'>+	update_domain(domain);</div><div class='add'>+</div><div class='add'>+	/* Page-table is not visible to IOMMU anymore, so free it */</div><div class='add'>+	free_pagetable(domain);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;domain-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_domain_direct_map);</div><div class='add'>+</div><div class='add'>+int amd_iommu_domain_enable_v2(struct iommu_domain *dom, int pasids)</div><div class='add'>+{</div><div class='add'>+	struct protection_domain *domain = dom-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int levels, ret;</div><div class='add'>+</div><div class='add'>+	if (pasids &lt;= 0 || pasids &gt; (PASID_MASK + 1))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Number of GCR3 table levels required */</div><div class='add'>+	for (levels = 0; (pasids - 1) &amp; ~0x1ff; pasids &gt;&gt;= 9)</div><div class='add'>+		levels += 1;</div><div class='add'>+</div><div class='add'>+	if (levels &gt; amd_iommu_max_glx_val)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;domain-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Save us all sanity checks whether devices already in the</div><div class='add'>+	 * domain support IOMMUv2. Just force that the domain has no</div><div class='add'>+	 * devices attached when it is switched into IOMMUv2 mode.</div><div class='add'>+	 */</div><div class='add'>+	ret = -EBUSY;</div><div class='add'>+	if (domain-&gt;dev_cnt &gt; 0 || domain-&gt;flags &amp; PD_IOMMUV2_MASK)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	domain-&gt;gcr3_tbl = (void *)get_zeroed_page(GFP_ATOMIC);</div><div class='add'>+	if (domain-&gt;gcr3_tbl == NULL)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	domain-&gt;glx      = levels;</div><div class='add'>+	domain-&gt;flags   |= PD_IOMMUV2_MASK;</div><div class='add'>+	domain-&gt;updated  = true;</div><div class='add'>+</div><div class='add'>+	update_domain(domain);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_irqrestore(&amp;domain-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_domain_enable_v2);</div><div class='add'>+</div><div class='add'>+static int __flush_pasid(struct protection_domain *domain, int pasid,</div><div class='add'>+			 u64 address, bool size)</div><div class='add'>+{</div><div class='add'>+	struct iommu_dev_data *dev_data;</div><div class='add'>+	struct iommu_cmd cmd;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	if (!(domain-&gt;flags &amp; PD_IOMMUV2_MASK))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	build_inv_iommu_pasid(&amp;cmd, domain-&gt;id, pasid, address, size);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IOMMU TLB needs to be flushed before Device TLB to</div><div class='add'>+	 * prevent device TLB refill from IOMMU TLB</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; amd_iommus_present; ++i) {</div><div class='add'>+		if (domain-&gt;dev_iommu[i] == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = iommu_queue_command(amd_iommus[i], &amp;cmd);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait until IOMMU TLB flushes are complete */</div><div class='add'>+	domain_flush_complete(domain);</div><div class='add'>+</div><div class='add'>+	/* Now flush device TLBs */</div><div class='add'>+	list_for_each_entry(dev_data, &amp;domain-&gt;dev_list, list) {</div><div class='add'>+		struct amd_iommu *iommu;</div><div class='add'>+		int qdep;</div><div class='add'>+</div><div class='add'>+		BUG_ON(!dev_data-&gt;ats.enabled);</div><div class='add'>+</div><div class='add'>+		qdep  = dev_data-&gt;ats.qdep;</div><div class='add'>+		iommu = amd_iommu_rlookup_table[dev_data-&gt;devid];</div><div class='add'>+</div><div class='add'>+		build_inv_iotlb_pasid(&amp;cmd, dev_data-&gt;devid, pasid,</div><div class='add'>+				      qdep, address, size);</div><div class='add'>+</div><div class='add'>+		ret = iommu_queue_command(iommu, &amp;cmd);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait until all device TLBs are flushed */</div><div class='add'>+	domain_flush_complete(domain);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __amd_iommu_flush_page(struct protection_domain *domain, int pasid,</div><div class='add'>+				  u64 address)</div><div class='add'>+{</div><div class='add'>+	INC_STATS_COUNTER(invalidate_iotlb);</div><div class='add'>+</div><div class='add'>+	return __flush_pasid(domain, pasid, address, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int amd_iommu_flush_page(struct iommu_domain *dom, int pasid,</div><div class='add'>+			 u64 address)</div><div class='add'>+{</div><div class='add'>+	struct protection_domain *domain = dom-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;domain-&gt;lock, flags);</div><div class='add'>+	ret = __amd_iommu_flush_page(domain, pasid, address);</div><div class='add'>+	spin_unlock_irqrestore(&amp;domain-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_flush_page);</div><div class='add'>+</div><div class='add'>+static int __amd_iommu_flush_tlb(struct protection_domain *domain, int pasid)</div><div class='add'>+{</div><div class='add'>+	INC_STATS_COUNTER(invalidate_iotlb_all);</div><div class='add'>+</div><div class='add'>+	return __flush_pasid(domain, pasid, CMD_INV_IOMMU_ALL_PAGES_ADDRESS,</div><div class='add'>+			     true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int amd_iommu_flush_tlb(struct iommu_domain *dom, int pasid)</div><div class='add'>+{</div><div class='add'>+	struct protection_domain *domain = dom-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;domain-&gt;lock, flags);</div><div class='add'>+	ret = __amd_iommu_flush_tlb(domain, pasid);</div><div class='add'>+	spin_unlock_irqrestore(&amp;domain-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_flush_tlb);</div><div class='add'>+</div><div class='add'>+static u64 *__get_gcr3_pte(u64 *root, int level, int pasid, bool alloc)</div><div class='add'>+{</div><div class='add'>+	int index;</div><div class='add'>+	u64 *pte;</div><div class='add'>+</div><div class='add'>+	while (true) {</div><div class='add'>+</div><div class='add'>+		index = (pasid &gt;&gt; (9 * level)) &amp; 0x1ff;</div><div class='add'>+		pte   = &amp;root[index];</div><div class='add'>+</div><div class='add'>+		if (level == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!(*pte &amp; GCR3_VALID)) {</div><div class='add'>+			if (!alloc)</div><div class='add'>+				return NULL;</div><div class='add'>+</div><div class='add'>+			root = (void *)get_zeroed_page(GFP_ATOMIC);</div><div class='add'>+			if (root == NULL)</div><div class='add'>+				return NULL;</div><div class='add'>+</div><div class='add'>+			*pte = __pa(root) | GCR3_VALID;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		root = __va(*pte &amp; PAGE_MASK);</div><div class='add'>+</div><div class='add'>+		level -= 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __set_gcr3(struct protection_domain *domain, int pasid,</div><div class='add'>+		      unsigned long cr3)</div><div class='add'>+{</div><div class='add'>+	u64 *pte;</div><div class='add'>+</div><div class='add'>+	if (domain-&gt;mode != PAGE_MODE_NONE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pte = __get_gcr3_pte(domain-&gt;gcr3_tbl, domain-&gt;glx, pasid, true);</div><div class='add'>+	if (pte == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	*pte = (cr3 &amp; PAGE_MASK) | GCR3_VALID;</div><div class='add'>+</div><div class='add'>+	return __amd_iommu_flush_tlb(domain, pasid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __clear_gcr3(struct protection_domain *domain, int pasid)</div><div class='add'>+{</div><div class='add'>+	u64 *pte;</div><div class='add'>+</div><div class='add'>+	if (domain-&gt;mode != PAGE_MODE_NONE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pte = __get_gcr3_pte(domain-&gt;gcr3_tbl, domain-&gt;glx, pasid, false);</div><div class='add'>+	if (pte == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	*pte = 0;</div><div class='add'>+</div><div class='add'>+	return __amd_iommu_flush_tlb(domain, pasid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int amd_iommu_domain_set_gcr3(struct iommu_domain *dom, int pasid,</div><div class='add'>+			      unsigned long cr3)</div><div class='add'>+{</div><div class='add'>+	struct protection_domain *domain = dom-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;domain-&gt;lock, flags);</div><div class='add'>+	ret = __set_gcr3(domain, pasid, cr3);</div><div class='add'>+	spin_unlock_irqrestore(&amp;domain-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_domain_set_gcr3);</div><div class='add'>+</div><div class='add'>+int amd_iommu_domain_clear_gcr3(struct iommu_domain *dom, int pasid)</div><div class='add'>+{</div><div class='add'>+	struct protection_domain *domain = dom-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;domain-&gt;lock, flags);</div><div class='add'>+	ret = __clear_gcr3(domain, pasid);</div><div class='add'>+	spin_unlock_irqrestore(&amp;domain-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_domain_clear_gcr3);</div><div class='add'>+</div><div class='add'>+int amd_iommu_complete_ppr(struct pci_dev *pdev, int pasid,</div><div class='add'>+			   int status, int tag)</div><div class='add'>+{</div><div class='add'>+	struct iommu_dev_data *dev_data;</div><div class='add'>+	struct amd_iommu *iommu;</div><div class='add'>+	struct iommu_cmd cmd;</div><div class='add'>+</div><div class='add'>+	INC_STATS_COUNTER(complete_ppr);</div><div class='add'>+</div><div class='add'>+	dev_data = get_dev_data(&amp;pdev-&gt;dev);</div><div class='add'>+	iommu    = amd_iommu_rlookup_table[dev_data-&gt;devid];</div><div class='add'>+</div><div class='add'>+	build_complete_ppr(&amp;cmd, dev_data-&gt;devid, pasid, status,</div><div class='add'>+			   tag, dev_data-&gt;pri_tlp);</div><div class='add'>+</div><div class='add'>+	return iommu_queue_command(iommu, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_complete_ppr);</div><div class='add'>+</div><div class='add'>+struct iommu_domain *amd_iommu_get_v2_domain(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct protection_domain *domain;</div><div class='add'>+</div><div class='add'>+	domain = get_domain(&amp;pdev-&gt;dev);</div><div class='add'>+	if (IS_ERR(domain))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Only return IOMMUv2 domains */</div><div class='add'>+	if (!(domain-&gt;flags &amp; PD_IOMMUV2_MASK))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return domain-&gt;iommu_domain;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_get_v2_domain);</div><div class='add'>+</div><div class='add'>+void amd_iommu_enable_device_erratum(struct pci_dev *pdev, u32 erratum)</div><div class='add'>+{</div><div class='add'>+	struct iommu_dev_data *dev_data;</div><div class='add'>+</div><div class='add'>+	if (!amd_iommu_v2_supported())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev_data = get_dev_data(&amp;pdev-&gt;dev);</div><div class='add'>+	dev_data-&gt;errata |= (1 &lt;&lt; erratum);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_enable_device_erratum);</div><div class='add'>+</div><div class='add'>+int amd_iommu_device_info(struct pci_dev *pdev,</div><div class='add'>+                          struct amd_iommu_device_info *info)</div><div class='add'>+{</div><div class='add'>+	int max_pasids;</div><div class='add'>+	int pos;</div><div class='add'>+</div><div class='add'>+	if (pdev == NULL || info == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!amd_iommu_v2_supported())</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(info, 0, sizeof(*info));</div><div class='add'>+</div><div class='add'>+	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ATS);</div><div class='add'>+	if (pos)</div><div class='add'>+		info-&gt;flags |= AMD_IOMMU_DEVICE_FLAG_ATS_SUP;</div><div class='add'>+</div><div class='add'>+	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI);</div><div class='add'>+	if (pos)</div><div class='add'>+		info-&gt;flags |= AMD_IOMMU_DEVICE_FLAG_PRI_SUP;</div><div class='add'>+</div><div class='add'>+	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PASID);</div><div class='add'>+	if (pos) {</div><div class='add'>+		int features;</div><div class='add'>+</div><div class='add'>+		max_pasids = 1 &lt;&lt; (9 * (amd_iommu_max_glx_val + 1));</div><div class='add'>+		max_pasids = min(max_pasids, (1 &lt;&lt; 20));</div><div class='add'>+</div><div class='add'>+		info-&gt;flags |= AMD_IOMMU_DEVICE_FLAG_PASID_SUP;</div><div class='add'>+		info-&gt;max_pasids = min(pci_max_pasids(pdev), max_pasids);</div><div class='add'>+</div><div class='add'>+		features = pci_pasid_features(pdev);</div><div class='add'>+		if (features &amp; PCI_PASID_CAP_EXEC)</div><div class='add'>+			info-&gt;flags |= AMD_IOMMU_DEVICE_FLAG_EXEC_SUP;</div><div class='add'>+		if (features &amp; PCI_PASID_CAP_PRIV)</div><div class='add'>+			info-&gt;flags |= AMD_IOMMU_DEVICE_FLAG_PRIV_SUP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_device_info);</div><div class='head'>diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c<br/>index 82d2410f4205..bdea288dc185 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/iommu/amd_iommu_init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/amd_iommu_init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/iommu/amd_iommu_init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/iommu/amd_iommu_init.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/msi.h&gt;</div><div class='ctx'> #include &lt;linux/amd-iommu.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;asm/pci-direct.h&gt;</div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='ctx'> #include &lt;asm/gart.h&gt;</div><div class='hunk'>@@ -141,6 +142,12 @@ int amd_iommus_present;</div><div class='ctx'> bool amd_iommu_np_cache __read_mostly;</div><div class='ctx'> bool amd_iommu_iotlb_sup __read_mostly = true;</div><div class='ctx'> </div><div class='add'>+u32 amd_iommu_max_pasids __read_mostly = ~0;</div><div class='add'>+</div><div class='add'>+bool amd_iommu_v2_present __read_mostly;</div><div class='add'>+</div><div class='add'>+bool amd_iommu_force_isolation __read_mostly;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The ACPI table parsing functions set this variable on an error</div><div class='ctx'>  */</div><div class='hunk'>@@ -299,6 +306,16 @@ static void iommu_feature_disable(struct amd_iommu *iommu, u8 bit)</div><div class='ctx'> 	writel(ctrl, iommu-&gt;mmio_base + MMIO_CONTROL_OFFSET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iommu_set_inv_tlb_timeout(struct amd_iommu *iommu, int timeout)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl;</div><div class='add'>+</div><div class='add'>+	ctrl = readl(iommu-&gt;mmio_base + MMIO_CONTROL_OFFSET);</div><div class='add'>+	ctrl &amp;= ~CTRL_INV_TO_MASK;</div><div class='add'>+	ctrl |= (timeout &lt;&lt; CONTROL_INV_TIMEOUT) &amp; CTRL_INV_TO_MASK;</div><div class='add'>+	writel(ctrl, iommu-&gt;mmio_base + MMIO_CONTROL_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Function to enable the hardware */</div><div class='ctx'> static void iommu_enable(struct amd_iommu *iommu)</div><div class='ctx'> {</div><div class='hunk'>@@ -581,21 +598,69 @@ static void __init free_event_buffer(struct amd_iommu *iommu)</div><div class='ctx'> 	free_pages((unsigned long)iommu-&gt;evt_buf, get_order(EVT_BUFFER_SIZE));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* allocates the memory where the IOMMU will log its events to */</div><div class='add'>+static u8 * __init alloc_ppr_log(struct amd_iommu *iommu)</div><div class='add'>+{</div><div class='add'>+	iommu-&gt;ppr_log = (u8 *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,</div><div class='add'>+						get_order(PPR_LOG_SIZE));</div><div class='add'>+</div><div class='add'>+	if (iommu-&gt;ppr_log == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return iommu-&gt;ppr_log;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iommu_enable_ppr_log(struct amd_iommu *iommu)</div><div class='add'>+{</div><div class='add'>+	u64 entry;</div><div class='add'>+</div><div class='add'>+	if (iommu-&gt;ppr_log == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	entry = (u64)virt_to_phys(iommu-&gt;ppr_log) | PPR_LOG_SIZE_512;</div><div class='add'>+</div><div class='add'>+	memcpy_toio(iommu-&gt;mmio_base + MMIO_PPR_LOG_OFFSET,</div><div class='add'>+		    &amp;entry, sizeof(entry));</div><div class='add'>+</div><div class='add'>+	/* set head and tail to zero manually */</div><div class='add'>+	writel(0x00, iommu-&gt;mmio_base + MMIO_PPR_HEAD_OFFSET);</div><div class='add'>+	writel(0x00, iommu-&gt;mmio_base + MMIO_PPR_TAIL_OFFSET);</div><div class='add'>+</div><div class='add'>+	iommu_feature_enable(iommu, CONTROL_PPFLOG_EN);</div><div class='add'>+	iommu_feature_enable(iommu, CONTROL_PPR_EN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init free_ppr_log(struct amd_iommu *iommu)</div><div class='add'>+{</div><div class='add'>+	if (iommu-&gt;ppr_log == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	free_pages((unsigned long)iommu-&gt;ppr_log, get_order(PPR_LOG_SIZE));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iommu_enable_gt(struct amd_iommu *iommu)</div><div class='add'>+{</div><div class='add'>+	if (!iommu_feature(iommu, FEATURE_GT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iommu_feature_enable(iommu, CONTROL_GT_EN);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* sets a specific bit in the device table entry. */</div><div class='ctx'> static void set_dev_entry_bit(u16 devid, u8 bit)</div><div class='ctx'> {</div><div class='del'>-	int i = (bit &gt;&gt; 5) &amp; 0x07;</div><div class='del'>-	int _bit = bit &amp; 0x1f;</div><div class='add'>+	int i = (bit &gt;&gt; 6) &amp; 0x03;</div><div class='add'>+	int _bit = bit &amp; 0x3f;</div><div class='ctx'> </div><div class='del'>-	amd_iommu_dev_table[devid].data[i] |= (1 &lt;&lt; _bit);</div><div class='add'>+	amd_iommu_dev_table[devid].data[i] |= (1UL &lt;&lt; _bit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_dev_entry_bit(u16 devid, u8 bit)</div><div class='ctx'> {</div><div class='del'>-	int i = (bit &gt;&gt; 5) &amp; 0x07;</div><div class='del'>-	int _bit = bit &amp; 0x1f;</div><div class='add'>+	int i = (bit &gt;&gt; 6) &amp; 0x03;</div><div class='add'>+	int _bit = bit &amp; 0x3f;</div><div class='ctx'> </div><div class='del'>-	return (amd_iommu_dev_table[devid].data[i] &amp; (1 &lt;&lt; _bit)) &gt;&gt; _bit;</div><div class='add'>+	return (amd_iommu_dev_table[devid].data[i] &amp; (1UL &lt;&lt; _bit)) &gt;&gt; _bit;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -699,6 +764,32 @@ static void __init init_iommu_from_pci(struct amd_iommu *iommu)</div><div class='ctx'> </div><div class='ctx'> 	iommu-&gt;features = ((u64)high &lt;&lt; 32) | low;</div><div class='ctx'> </div><div class='add'>+	if (iommu_feature(iommu, FEATURE_GT)) {</div><div class='add'>+		int glxval;</div><div class='add'>+		u32 pasids;</div><div class='add'>+		u64 shift;</div><div class='add'>+</div><div class='add'>+		shift   = iommu-&gt;features &amp; FEATURE_PASID_MASK;</div><div class='add'>+		shift &gt;&gt;= FEATURE_PASID_SHIFT;</div><div class='add'>+		pasids  = (1 &lt;&lt; shift);</div><div class='add'>+</div><div class='add'>+		amd_iommu_max_pasids = min(amd_iommu_max_pasids, pasids);</div><div class='add'>+</div><div class='add'>+		glxval   = iommu-&gt;features &amp; FEATURE_GLXVAL_MASK;</div><div class='add'>+		glxval &gt;&gt;= FEATURE_GLXVAL_SHIFT;</div><div class='add'>+</div><div class='add'>+		if (amd_iommu_max_glx_val == -1)</div><div class='add'>+			amd_iommu_max_glx_val = glxval;</div><div class='add'>+		else</div><div class='add'>+			amd_iommu_max_glx_val = min(amd_iommu_max_glx_val, glxval);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iommu_feature(iommu, FEATURE_GT) &amp;&amp;</div><div class='add'>+	    iommu_feature(iommu, FEATURE_PPR)) {</div><div class='add'>+		iommu-&gt;is_iommu_v2   = true;</div><div class='add'>+		amd_iommu_v2_present = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!is_rd890_iommu(iommu-&gt;dev))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -901,6 +992,7 @@ static void __init free_iommu_one(struct amd_iommu *iommu)</div><div class='ctx'> {</div><div class='ctx'> 	free_command_buffer(iommu);</div><div class='ctx'> 	free_event_buffer(iommu);</div><div class='add'>+	free_ppr_log(iommu);</div><div class='ctx'> 	iommu_unmap_mmio_space(iommu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -964,6 +1056,12 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h)</div><div class='ctx'> 	init_iommu_from_acpi(iommu, h);</div><div class='ctx'> 	init_iommu_devices(iommu);</div><div class='ctx'> </div><div class='add'>+	if (iommu_feature(iommu, FEATURE_PPR)) {</div><div class='add'>+		iommu-&gt;ppr_log = alloc_ppr_log(iommu);</div><div class='add'>+		if (!iommu-&gt;ppr_log)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (iommu-&gt;cap &amp; (1UL &lt;&lt; IOMMU_CAP_NPCACHE))</div><div class='ctx'> 		amd_iommu_np_cache = true;</div><div class='ctx'> </div><div class='hunk'>@@ -1050,6 +1148,9 @@ static int iommu_setup_msi(struct amd_iommu *iommu)</div><div class='ctx'> 	iommu-&gt;int_enabled = true;</div><div class='ctx'> 	iommu_feature_enable(iommu, CONTROL_EVT_INT_EN);</div><div class='ctx'> </div><div class='add'>+	if (iommu-&gt;ppr_log != NULL)</div><div class='add'>+		iommu_feature_enable(iommu, CONTROL_PPFINT_EN);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1209,6 +1310,9 @@ static void iommu_init_flags(struct amd_iommu *iommu)</div><div class='ctx'> 	 * make IOMMU memory accesses cache coherent</div><div class='ctx'> 	 */</div><div class='ctx'> 	iommu_feature_enable(iommu, CONTROL_COHERENT_EN);</div><div class='add'>+</div><div class='add'>+	/* Set IOTLB invalidation timeout to 1s */</div><div class='add'>+	iommu_set_inv_tlb_timeout(iommu, CTRL_INV_TO_1S);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iommu_apply_resume_quirks(struct amd_iommu *iommu)</div><div class='hunk'>@@ -1274,6 +1378,8 @@ static void enable_iommus(void)</div><div class='ctx'> 		iommu_set_device_table(iommu);</div><div class='ctx'> 		iommu_enable_command_buffer(iommu);</div><div class='ctx'> 		iommu_enable_event_buffer(iommu);</div><div class='add'>+		iommu_enable_ppr_log(iommu);</div><div class='add'>+		iommu_enable_gt(iommu);</div><div class='ctx'> 		iommu_set_exclusion_range(iommu);</div><div class='ctx'> 		iommu_init_msi(iommu);</div><div class='ctx'> 		iommu_enable(iommu);</div><div class='hunk'>@@ -1303,13 +1409,6 @@ static void amd_iommu_resume(void)</div><div class='ctx'> </div><div class='ctx'> 	/* re-load the hardware */</div><div class='ctx'> 	enable_iommus();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we have to flush after the IOMMUs are enabled because a</div><div class='del'>-	 * disabled IOMMU will never execute the commands we send</div><div class='del'>-	 */</div><div class='del'>-	for_each_iommu(iommu)</div><div class='del'>-		iommu_flush_all_caches(iommu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int amd_iommu_suspend(void)</div><div class='hunk'>@@ -1560,6 +1659,8 @@ static int __init parse_amd_iommu_options(char *str)</div><div class='ctx'> 			amd_iommu_unmap_flush = true;</div><div class='ctx'> 		if (strncmp(str, "off", 3) == 0)</div><div class='ctx'> 			amd_iommu_disabled = true;</div><div class='add'>+		if (strncmp(str, "force_isolation", 15) == 0)</div><div class='add'>+			amd_iommu_force_isolation = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -1572,3 +1673,9 @@ IOMMU_INIT_FINISH(amd_iommu_detect,</div><div class='ctx'> 		  gart_iommu_hole_init,</div><div class='ctx'> 		  0,</div><div class='ctx'> 		  0);</div><div class='add'>+</div><div class='add'>+bool amd_iommu_v2_supported(void)</div><div class='add'>+{</div><div class='add'>+	return amd_iommu_v2_present;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_v2_supported);</div><div class='head'>diff --git a/drivers/iommu/amd_iommu_proto.h b/drivers/iommu/amd_iommu_proto.h<br/>index 7ffaa64410b0..1a7f41c6cc66 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/iommu/amd_iommu_proto.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/amd_iommu_proto.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/iommu/amd_iommu_proto.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/iommu/amd_iommu_proto.h</a></div><div class='hunk'>@@ -31,6 +31,30 @@ extern int amd_iommu_init_devices(void);</div><div class='ctx'> extern void amd_iommu_uninit_devices(void);</div><div class='ctx'> extern void amd_iommu_init_notifier(void);</div><div class='ctx'> extern void amd_iommu_init_api(void);</div><div class='add'>+</div><div class='add'>+/* IOMMUv2 specific functions */</div><div class='add'>+struct iommu_domain;</div><div class='add'>+</div><div class='add'>+extern bool amd_iommu_v2_supported(void);</div><div class='add'>+extern int amd_iommu_register_ppr_notifier(struct notifier_block *nb);</div><div class='add'>+extern int amd_iommu_unregister_ppr_notifier(struct notifier_block *nb);</div><div class='add'>+extern void amd_iommu_domain_direct_map(struct iommu_domain *dom);</div><div class='add'>+extern int amd_iommu_domain_enable_v2(struct iommu_domain *dom, int pasids);</div><div class='add'>+extern int amd_iommu_flush_page(struct iommu_domain *dom, int pasid,</div><div class='add'>+				u64 address);</div><div class='add'>+extern int amd_iommu_flush_tlb(struct iommu_domain *dom, int pasid);</div><div class='add'>+extern int amd_iommu_domain_set_gcr3(struct iommu_domain *dom, int pasid,</div><div class='add'>+				     unsigned long cr3);</div><div class='add'>+extern int amd_iommu_domain_clear_gcr3(struct iommu_domain *dom, int pasid);</div><div class='add'>+extern struct iommu_domain *amd_iommu_get_v2_domain(struct pci_dev *pdev);</div><div class='add'>+</div><div class='add'>+#define PPR_SUCCESS			0x0</div><div class='add'>+#define PPR_INVALID			0x1</div><div class='add'>+#define PPR_FAILURE			0xf</div><div class='add'>+</div><div class='add'>+extern int amd_iommu_complete_ppr(struct pci_dev *pdev, int pasid,</div><div class='add'>+				  int status, int tag);</div><div class='add'>+</div><div class='ctx'> #ifndef CONFIG_AMD_IOMMU_STATS</div><div class='ctx'> </div><div class='ctx'> static inline void amd_iommu_stats_init(void) { }</div><div class='head'>diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h<br/>index 5b9c5075e81a..2452f3b71736 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/iommu/amd_iommu_types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/amd_iommu_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/iommu/amd_iommu_types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/iommu/amd_iommu_types.h</a></div><div class='hunk'>@@ -69,11 +69,14 @@</div><div class='ctx'> #define MMIO_EXCL_BASE_OFFSET   0x0020</div><div class='ctx'> #define MMIO_EXCL_LIMIT_OFFSET  0x0028</div><div class='ctx'> #define MMIO_EXT_FEATURES	0x0030</div><div class='add'>+#define MMIO_PPR_LOG_OFFSET	0x0038</div><div class='ctx'> #define MMIO_CMD_HEAD_OFFSET	0x2000</div><div class='ctx'> #define MMIO_CMD_TAIL_OFFSET	0x2008</div><div class='ctx'> #define MMIO_EVT_HEAD_OFFSET	0x2010</div><div class='ctx'> #define MMIO_EVT_TAIL_OFFSET	0x2018</div><div class='ctx'> #define MMIO_STATUS_OFFSET	0x2020</div><div class='add'>+#define MMIO_PPR_HEAD_OFFSET	0x2030</div><div class='add'>+#define MMIO_PPR_TAIL_OFFSET	0x2038</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Extended Feature Bits */</div><div class='hunk'>@@ -87,8 +90,17 @@</div><div class='ctx'> #define FEATURE_HE		(1ULL&lt;&lt;8)</div><div class='ctx'> #define FEATURE_PC		(1ULL&lt;&lt;9)</div><div class='ctx'> </div><div class='add'>+#define FEATURE_PASID_SHIFT	32</div><div class='add'>+#define FEATURE_PASID_MASK	(0x1fULL &lt;&lt; FEATURE_PASID_SHIFT)</div><div class='add'>+</div><div class='add'>+#define FEATURE_GLXVAL_SHIFT	14</div><div class='add'>+#define FEATURE_GLXVAL_MASK	(0x03ULL &lt;&lt; FEATURE_GLXVAL_SHIFT)</div><div class='add'>+</div><div class='add'>+#define PASID_MASK		0x000fffff</div><div class='add'>+</div><div class='ctx'> /* MMIO status bits */</div><div class='del'>-#define MMIO_STATUS_COM_WAIT_INT_MASK	0x04</div><div class='add'>+#define MMIO_STATUS_COM_WAIT_INT_MASK	(1 &lt;&lt; 2)</div><div class='add'>+#define MMIO_STATUS_PPR_INT_MASK	(1 &lt;&lt; 6)</div><div class='ctx'> </div><div class='ctx'> /* event logging constants */</div><div class='ctx'> #define EVENT_ENTRY_SIZE	0x10</div><div class='hunk'>@@ -115,6 +127,7 @@</div><div class='ctx'> #define CONTROL_EVT_LOG_EN      0x02ULL</div><div class='ctx'> #define CONTROL_EVT_INT_EN      0x03ULL</div><div class='ctx'> #define CONTROL_COMWAIT_EN      0x04ULL</div><div class='add'>+#define CONTROL_INV_TIMEOUT	0x05ULL</div><div class='ctx'> #define CONTROL_PASSPW_EN       0x08ULL</div><div class='ctx'> #define CONTROL_RESPASSPW_EN    0x09ULL</div><div class='ctx'> #define CONTROL_COHERENT_EN     0x0aULL</div><div class='hunk'>@@ -122,18 +135,34 @@</div><div class='ctx'> #define CONTROL_CMDBUF_EN       0x0cULL</div><div class='ctx'> #define CONTROL_PPFLOG_EN       0x0dULL</div><div class='ctx'> #define CONTROL_PPFINT_EN       0x0eULL</div><div class='add'>+#define CONTROL_PPR_EN          0x0fULL</div><div class='add'>+#define CONTROL_GT_EN           0x10ULL</div><div class='add'>+</div><div class='add'>+#define CTRL_INV_TO_MASK	(7 &lt;&lt; CONTROL_INV_TIMEOUT)</div><div class='add'>+#define CTRL_INV_TO_NONE	0</div><div class='add'>+#define CTRL_INV_TO_1MS		1</div><div class='add'>+#define CTRL_INV_TO_10MS	2</div><div class='add'>+#define CTRL_INV_TO_100MS	3</div><div class='add'>+#define CTRL_INV_TO_1S		4</div><div class='add'>+#define CTRL_INV_TO_10S		5</div><div class='add'>+#define CTRL_INV_TO_100S	6</div><div class='ctx'> </div><div class='ctx'> /* command specific defines */</div><div class='ctx'> #define CMD_COMPL_WAIT          0x01</div><div class='ctx'> #define CMD_INV_DEV_ENTRY       0x02</div><div class='ctx'> #define CMD_INV_IOMMU_PAGES	0x03</div><div class='ctx'> #define CMD_INV_IOTLB_PAGES	0x04</div><div class='add'>+#define CMD_COMPLETE_PPR	0x07</div><div class='ctx'> #define CMD_INV_ALL		0x08</div><div class='ctx'> </div><div class='ctx'> #define CMD_COMPL_WAIT_STORE_MASK	0x01</div><div class='ctx'> #define CMD_COMPL_WAIT_INT_MASK		0x02</div><div class='ctx'> #define CMD_INV_IOMMU_PAGES_SIZE_MASK	0x01</div><div class='ctx'> #define CMD_INV_IOMMU_PAGES_PDE_MASK	0x02</div><div class='add'>+#define CMD_INV_IOMMU_PAGES_GN_MASK	0x04</div><div class='add'>+</div><div class='add'>+#define PPR_STATUS_MASK			0xf</div><div class='add'>+#define PPR_STATUS_SHIFT		12</div><div class='ctx'> </div><div class='ctx'> #define CMD_INV_IOMMU_ALL_PAGES_ADDRESS	0x7fffffffffffffffULL</div><div class='ctx'> </div><div class='hunk'>@@ -165,6 +194,23 @@</div><div class='ctx'> #define EVT_BUFFER_SIZE		8192 /* 512 entries */</div><div class='ctx'> #define EVT_LEN_MASK		(0x9ULL &lt;&lt; 56)</div><div class='ctx'> </div><div class='add'>+/* Constants for PPR Log handling */</div><div class='add'>+#define PPR_LOG_ENTRIES		512</div><div class='add'>+#define PPR_LOG_SIZE_SHIFT	56</div><div class='add'>+#define PPR_LOG_SIZE_512	(0x9ULL &lt;&lt; PPR_LOG_SIZE_SHIFT)</div><div class='add'>+#define PPR_ENTRY_SIZE		16</div><div class='add'>+#define PPR_LOG_SIZE		(PPR_ENTRY_SIZE * PPR_LOG_ENTRIES)</div><div class='add'>+</div><div class='add'>+#define PPR_REQ_TYPE(x)		(((x) &gt;&gt; 60) &amp; 0xfULL)</div><div class='add'>+#define PPR_FLAGS(x)		(((x) &gt;&gt; 48) &amp; 0xfffULL)</div><div class='add'>+#define PPR_DEVID(x)		((x) &amp; 0xffffULL)</div><div class='add'>+#define PPR_TAG(x)		(((x) &gt;&gt; 32) &amp; 0x3ffULL)</div><div class='add'>+#define PPR_PASID1(x)		(((x) &gt;&gt; 16) &amp; 0xffffULL)</div><div class='add'>+#define PPR_PASID2(x)		(((x) &gt;&gt; 42) &amp; 0xfULL)</div><div class='add'>+#define PPR_PASID(x)		((PPR_PASID2(x) &lt;&lt; 16) | PPR_PASID1(x))</div><div class='add'>+</div><div class='add'>+#define PPR_REQ_FAULT		0x01</div><div class='add'>+</div><div class='ctx'> #define PAGE_MODE_NONE    0x00</div><div class='ctx'> #define PAGE_MODE_1_LEVEL 0x01</div><div class='ctx'> #define PAGE_MODE_2_LEVEL 0x02</div><div class='hunk'>@@ -230,7 +276,24 @@</div><div class='ctx'> #define IOMMU_PTE_IR (1ULL &lt;&lt; 61)</div><div class='ctx'> #define IOMMU_PTE_IW (1ULL &lt;&lt; 62)</div><div class='ctx'> </div><div class='del'>-#define DTE_FLAG_IOTLB	0x01</div><div class='add'>+#define DTE_FLAG_IOTLB	(0x01UL &lt;&lt; 32)</div><div class='add'>+#define DTE_FLAG_GV	(0x01ULL &lt;&lt; 55)</div><div class='add'>+#define DTE_GLX_SHIFT	(56)</div><div class='add'>+#define DTE_GLX_MASK	(3)</div><div class='add'>+</div><div class='add'>+#define DTE_GCR3_VAL_A(x)	(((x) &gt;&gt; 12) &amp; 0x00007ULL)</div><div class='add'>+#define DTE_GCR3_VAL_B(x)	(((x) &gt;&gt; 15) &amp; 0x0ffffULL)</div><div class='add'>+#define DTE_GCR3_VAL_C(x)	(((x) &gt;&gt; 31) &amp; 0xfffffULL)</div><div class='add'>+</div><div class='add'>+#define DTE_GCR3_INDEX_A	0</div><div class='add'>+#define DTE_GCR3_INDEX_B	1</div><div class='add'>+#define DTE_GCR3_INDEX_C	1</div><div class='add'>+</div><div class='add'>+#define DTE_GCR3_SHIFT_A	58</div><div class='add'>+#define DTE_GCR3_SHIFT_B	16</div><div class='add'>+#define DTE_GCR3_SHIFT_C	43</div><div class='add'>+</div><div class='add'>+#define GCR3_VALID		0x01ULL</div><div class='ctx'> </div><div class='ctx'> #define IOMMU_PAGE_MASK (((1ULL &lt;&lt; 52) - 1) &amp; ~0xfffULL)</div><div class='ctx'> #define IOMMU_PTE_PRESENT(pte) ((pte) &amp; IOMMU_PTE_P)</div><div class='hunk'>@@ -257,6 +320,7 @@</div><div class='ctx'> 					      domain for an IOMMU */</div><div class='ctx'> #define PD_PASSTHROUGH_MASK	(1UL &lt;&lt; 2) /* domain has no page</div><div class='ctx'> 					      translation */</div><div class='add'>+#define PD_IOMMUV2_MASK		(1UL &lt;&lt; 3) /* domain has gcr3 table */</div><div class='ctx'> </div><div class='ctx'> extern bool amd_iommu_dump;</div><div class='ctx'> #define DUMP_printk(format, arg...)					\</div><div class='hunk'>@@ -285,6 +349,29 @@ extern bool amd_iommu_iotlb_sup;</div><div class='ctx'> #define APERTURE_RANGE_INDEX(a)	((a) &gt;&gt; APERTURE_RANGE_SHIFT)</div><div class='ctx'> #define APERTURE_PAGE_INDEX(a)	(((a) &gt;&gt; 21) &amp; 0x3fULL)</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This struct is used to pass information about</div><div class='add'>+ * incoming PPR faults around.</div><div class='add'>+ */</div><div class='add'>+struct amd_iommu_fault {</div><div class='add'>+	u64 address;    /* IO virtual address of the fault*/</div><div class='add'>+	u32 pasid;      /* Address space identifier */</div><div class='add'>+	u16 device_id;  /* Originating PCI device id */</div><div class='add'>+	u16 tag;        /* PPR tag */</div><div class='add'>+	u16 flags;      /* Fault flags */</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PPR_FAULT_EXEC	(1 &lt;&lt; 1)</div><div class='add'>+#define PPR_FAULT_READ  (1 &lt;&lt; 2)</div><div class='add'>+#define PPR_FAULT_WRITE (1 &lt;&lt; 5)</div><div class='add'>+#define PPR_FAULT_USER  (1 &lt;&lt; 6)</div><div class='add'>+#define PPR_FAULT_RSVD  (1 &lt;&lt; 7)</div><div class='add'>+#define PPR_FAULT_GN    (1 &lt;&lt; 8)</div><div class='add'>+</div><div class='add'>+struct iommu_domain;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This structure contains generic data for  IOMMU protection domains</div><div class='ctx'>  * independent of their use.</div><div class='hunk'>@@ -297,11 +384,15 @@ struct protection_domain {</div><div class='ctx'> 	u16 id;			/* the domain id written to the device table */</div><div class='ctx'> 	int mode;		/* paging mode (0-6 levels) */</div><div class='ctx'> 	u64 *pt_root;		/* page table root pointer */</div><div class='add'>+	int glx;		/* Number of levels for GCR3 table */</div><div class='add'>+	u64 *gcr3_tbl;		/* Guest CR3 table */</div><div class='ctx'> 	unsigned long flags;	/* flags to find out type of domain */</div><div class='ctx'> 	bool updated;		/* complete domain flush required */</div><div class='ctx'> 	unsigned dev_cnt;	/* devices assigned to this domain */</div><div class='ctx'> 	unsigned dev_iommu[MAX_IOMMUS]; /* per-IOMMU reference count */</div><div class='ctx'> 	void *priv;		/* private data */</div><div class='add'>+	struct iommu_domain *iommu_domain; /* Pointer to generic</div><div class='add'>+					      domain structure */</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -315,10 +406,15 @@ struct iommu_dev_data {</div><div class='ctx'> 	struct protection_domain *domain; /* Domain the device is bound to */</div><div class='ctx'> 	atomic_t bind;			  /* Domain attach reverent count */</div><div class='ctx'> 	u16 devid;			  /* PCI Device ID */</div><div class='add'>+	bool iommu_v2;			  /* Device can make use of IOMMUv2 */</div><div class='add'>+	bool passthrough;		  /* Default for device is pt_domain */</div><div class='ctx'> 	struct {</div><div class='ctx'> 		bool enabled;</div><div class='ctx'> 		int qdep;</div><div class='ctx'> 	} ats;				  /* ATS state */</div><div class='add'>+	bool pri_tlp;			  /* PASID TLB required for</div><div class='add'>+					     PPR completions */</div><div class='add'>+	u32 errata;			  /* Bitmap for errata to apply */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -399,6 +495,9 @@ struct amd_iommu {</div><div class='ctx'> 	/* Extended features */</div><div class='ctx'> 	u64 features;</div><div class='ctx'> </div><div class='add'>+	/* IOMMUv2 */</div><div class='add'>+	bool is_iommu_v2;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Capability pointer. There could be more than one IOMMU per PCI</div><div class='ctx'> 	 * device function if there are more than one AMD IOMMU capability</div><div class='hunk'>@@ -431,6 +530,9 @@ struct amd_iommu {</div><div class='ctx'> 	/* MSI number for event interrupt */</div><div class='ctx'> 	u16 evt_msi_num;</div><div class='ctx'> </div><div class='add'>+	/* Base of the PPR log, if present */</div><div class='add'>+	u8 *ppr_log;</div><div class='add'>+</div><div class='ctx'> 	/* true if interrupts for this IOMMU are already enabled */</div><div class='ctx'> 	bool int_enabled;</div><div class='ctx'> </div><div class='hunk'>@@ -484,7 +586,7 @@ extern struct list_head amd_iommu_pd_list;</div><div class='ctx'>  * Structure defining one entry in the device table</div><div class='ctx'>  */</div><div class='ctx'> struct dev_table_entry {</div><div class='del'>-	u32 data[8];</div><div class='add'>+	u64 data[4];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -549,6 +651,16 @@ extern unsigned long *amd_iommu_pd_alloc_bitmap;</div><div class='ctx'>  */</div><div class='ctx'> extern bool amd_iommu_unmap_flush;</div><div class='ctx'> </div><div class='add'>+/* Smallest number of PASIDs supported by any IOMMU in the system */</div><div class='add'>+extern u32 amd_iommu_max_pasids;</div><div class='add'>+</div><div class='add'>+extern bool amd_iommu_v2_present;</div><div class='add'>+</div><div class='add'>+extern bool amd_iommu_force_isolation;</div><div class='add'>+</div><div class='add'>+/* Max levels of glxval supported */</div><div class='add'>+extern int amd_iommu_max_glx_val;</div><div class='add'>+</div><div class='ctx'> /* takes bus and device/function and returns the device id</div><div class='ctx'>  * FIXME: should that be in generic PCI code? */</div><div class='ctx'> static inline u16 calc_devid(u8 bus, u8 devfn)</div><div class='head'>diff --git a/drivers/iommu/amd_iommu_v2.c b/drivers/iommu/amd_iommu_v2.c<br/>new file mode 100644<br/>index 000000000000..8add9f125d3e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/iommu/amd_iommu_v2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/iommu/amd_iommu_v2.c</a></div><div class='hunk'>@@ -0,0 +1,994 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2010-2012 Advanced Micro Devices, Inc.</div><div class='add'>+ * Author: Joerg Roedel &lt;joerg.roedel@amd.com&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 version 2 as published</div><div class='add'>+ * by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mmu_notifier.h&gt;</div><div class='add'>+#include &lt;linux/amd-iommu.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+#include &lt;linux/profile.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/iommu.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/gfp.h&gt;</div><div class='add'>+</div><div class='add'>+#include "amd_iommu_types.h"</div><div class='add'>+#include "amd_iommu_proto.h"</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_AUTHOR("Joerg Roedel &lt;joerg.roedel@amd.com&gt;");</div><div class='add'>+</div><div class='add'>+#define MAX_DEVICES		0x10000</div><div class='add'>+#define PRI_QUEUE_SIZE		512</div><div class='add'>+</div><div class='add'>+struct pri_queue {</div><div class='add'>+	atomic_t inflight;</div><div class='add'>+	bool finish;</div><div class='add'>+	int status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pasid_state {</div><div class='add'>+	struct list_head list;			/* For global state-list */</div><div class='add'>+	atomic_t count;				/* Reference count */</div><div class='add'>+	struct task_struct *task;		/* Task bound to this PASID */</div><div class='add'>+	struct mm_struct *mm;			/* mm_struct for the faults */</div><div class='add'>+	struct mmu_notifier mn;                 /* mmu_otifier handle */</div><div class='add'>+	struct pri_queue pri[PRI_QUEUE_SIZE];	/* PRI tag states */</div><div class='add'>+	struct device_state *device_state;	/* Link to our device_state */</div><div class='add'>+	int pasid;				/* PASID index */</div><div class='add'>+	spinlock_t lock;			/* Protect pri_queues */</div><div class='add'>+	wait_queue_head_t wq;			/* To wait for count == 0 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct device_state {</div><div class='add'>+	atomic_t count;</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	struct pasid_state **states;</div><div class='add'>+	struct iommu_domain *domain;</div><div class='add'>+	int pasid_levels;</div><div class='add'>+	int max_pasids;</div><div class='add'>+	amd_iommu_invalid_ppr_cb inv_ppr_cb;</div><div class='add'>+	amd_iommu_invalidate_ctx inv_ctx_cb;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	wait_queue_head_t wq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fault {</div><div class='add'>+	struct work_struct work;</div><div class='add'>+	struct device_state *dev_state;</div><div class='add'>+	struct pasid_state *state;</div><div class='add'>+	struct mm_struct *mm;</div><div class='add'>+	u64 address;</div><div class='add'>+	u16 devid;</div><div class='add'>+	u16 pasid;</div><div class='add'>+	u16 tag;</div><div class='add'>+	u16 finish;</div><div class='add'>+	u16 flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct device_state **state_table;</div><div class='add'>+static spinlock_t state_lock;</div><div class='add'>+</div><div class='add'>+/* List and lock for all pasid_states */</div><div class='add'>+static LIST_HEAD(pasid_state_list);</div><div class='add'>+static DEFINE_SPINLOCK(ps_lock);</div><div class='add'>+</div><div class='add'>+static struct workqueue_struct *iommu_wq;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Empty page table - Used between</div><div class='add'>+ * mmu_notifier_invalidate_range_start and</div><div class='add'>+ * mmu_notifier_invalidate_range_end</div><div class='add'>+ */</div><div class='add'>+static u64 *empty_page_table;</div><div class='add'>+</div><div class='add'>+static void free_pasid_states(struct device_state *dev_state);</div><div class='add'>+static void unbind_pasid(struct device_state *dev_state, int pasid);</div><div class='add'>+static int task_exit(struct notifier_block *nb, unsigned long e, void *data);</div><div class='add'>+</div><div class='add'>+static u16 device_id(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	u16 devid;</div><div class='add'>+</div><div class='add'>+	devid = pdev-&gt;bus-&gt;number;</div><div class='add'>+	devid = (devid &lt;&lt; 8) | pdev-&gt;devfn;</div><div class='add'>+</div><div class='add'>+	return devid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_state *get_device_state(u16 devid)</div><div class='add'>+{</div><div class='add'>+	struct device_state *dev_state;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;state_lock, flags);</div><div class='add'>+	dev_state = state_table[devid];</div><div class='add'>+	if (dev_state != NULL)</div><div class='add'>+		atomic_inc(&amp;dev_state-&gt;count);</div><div class='add'>+	spin_unlock_irqrestore(&amp;state_lock, flags);</div><div class='add'>+</div><div class='add'>+	return dev_state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_device_state(struct device_state *dev_state)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * First detach device from domain - No more PRI requests will arrive</div><div class='add'>+	 * from that device after it is unbound from the IOMMUv2 domain.</div><div class='add'>+	 */</div><div class='add'>+	iommu_detach_device(dev_state-&gt;domain, &amp;dev_state-&gt;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/* Everything is down now, free the IOMMUv2 domain */</div><div class='add'>+	iommu_domain_free(dev_state-&gt;domain);</div><div class='add'>+</div><div class='add'>+	/* Finally get rid of the device-state */</div><div class='add'>+	kfree(dev_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void put_device_state(struct device_state *dev_state)</div><div class='add'>+{</div><div class='add'>+	if (atomic_dec_and_test(&amp;dev_state-&gt;count))</div><div class='add'>+		wake_up(&amp;dev_state-&gt;wq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void put_device_state_wait(struct device_state *dev_state)</div><div class='add'>+{</div><div class='add'>+	DEFINE_WAIT(wait);</div><div class='add'>+</div><div class='add'>+	prepare_to_wait(&amp;dev_state-&gt;wq, &amp;wait, TASK_UNINTERRUPTIBLE);</div><div class='add'>+	if (!atomic_dec_and_test(&amp;dev_state-&gt;count))</div><div class='add'>+		schedule();</div><div class='add'>+	finish_wait(&amp;dev_state-&gt;wq, &amp;wait);</div><div class='add'>+</div><div class='add'>+	free_device_state(dev_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block profile_nb = {</div><div class='add'>+	.notifier_call = task_exit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void link_pasid_state(struct pasid_state *pasid_state)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;ps_lock);</div><div class='add'>+	list_add_tail(&amp;pasid_state-&gt;list, &amp;pasid_state_list);</div><div class='add'>+	spin_unlock(&amp;ps_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __unlink_pasid_state(struct pasid_state *pasid_state)</div><div class='add'>+{</div><div class='add'>+	list_del(&amp;pasid_state-&gt;list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void unlink_pasid_state(struct pasid_state *pasid_state)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;ps_lock);</div><div class='add'>+	__unlink_pasid_state(pasid_state);</div><div class='add'>+	spin_unlock(&amp;ps_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Must be called under dev_state-&gt;lock */</div><div class='add'>+static struct pasid_state **__get_pasid_state_ptr(struct device_state *dev_state,</div><div class='add'>+						  int pasid, bool alloc)</div><div class='add'>+{</div><div class='add'>+	struct pasid_state **root, **ptr;</div><div class='add'>+	int level, index;</div><div class='add'>+</div><div class='add'>+	level = dev_state-&gt;pasid_levels;</div><div class='add'>+	root  = dev_state-&gt;states;</div><div class='add'>+</div><div class='add'>+	while (true) {</div><div class='add'>+</div><div class='add'>+		index = (pasid &gt;&gt; (9 * level)) &amp; 0x1ff;</div><div class='add'>+		ptr   = &amp;root[index];</div><div class='add'>+</div><div class='add'>+		if (level == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (*ptr == NULL) {</div><div class='add'>+			if (!alloc)</div><div class='add'>+				return NULL;</div><div class='add'>+</div><div class='add'>+			*ptr = (void *)get_zeroed_page(GFP_ATOMIC);</div><div class='add'>+			if (*ptr == NULL)</div><div class='add'>+				return NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		root   = (struct pasid_state **)*ptr;</div><div class='add'>+		level -= 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_pasid_state(struct device_state *dev_state,</div><div class='add'>+			   struct pasid_state *pasid_state,</div><div class='add'>+			   int pasid)</div><div class='add'>+{</div><div class='add'>+	struct pasid_state **ptr;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dev_state-&gt;lock, flags);</div><div class='add'>+	ptr = __get_pasid_state_ptr(dev_state, pasid, true);</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	if (ptr == NULL)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	if (*ptr != NULL)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	*ptr = pasid_state;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev_state-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clear_pasid_state(struct device_state *dev_state, int pasid)</div><div class='add'>+{</div><div class='add'>+	struct pasid_state **ptr;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dev_state-&gt;lock, flags);</div><div class='add'>+	ptr = __get_pasid_state_ptr(dev_state, pasid, true);</div><div class='add'>+</div><div class='add'>+	if (ptr == NULL)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	*ptr = NULL;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev_state-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pasid_state *get_pasid_state(struct device_state *dev_state,</div><div class='add'>+					   int pasid)</div><div class='add'>+{</div><div class='add'>+	struct pasid_state **ptr, *ret = NULL;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dev_state-&gt;lock, flags);</div><div class='add'>+	ptr = __get_pasid_state_ptr(dev_state, pasid, false);</div><div class='add'>+</div><div class='add'>+	if (ptr == NULL)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = *ptr;</div><div class='add'>+	if (ret)</div><div class='add'>+		atomic_inc(&amp;ret-&gt;count);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev_state-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_pasid_state(struct pasid_state *pasid_state)</div><div class='add'>+{</div><div class='add'>+	kfree(pasid_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void put_pasid_state(struct pasid_state *pasid_state)</div><div class='add'>+{</div><div class='add'>+	if (atomic_dec_and_test(&amp;pasid_state-&gt;count)) {</div><div class='add'>+		put_device_state(pasid_state-&gt;device_state);</div><div class='add'>+		wake_up(&amp;pasid_state-&gt;wq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void put_pasid_state_wait(struct pasid_state *pasid_state)</div><div class='add'>+{</div><div class='add'>+	DEFINE_WAIT(wait);</div><div class='add'>+</div><div class='add'>+	prepare_to_wait(&amp;pasid_state-&gt;wq, &amp;wait, TASK_UNINTERRUPTIBLE);</div><div class='add'>+</div><div class='add'>+	if (atomic_dec_and_test(&amp;pasid_state-&gt;count))</div><div class='add'>+		put_device_state(pasid_state-&gt;device_state);</div><div class='add'>+	else</div><div class='add'>+		schedule();</div><div class='add'>+</div><div class='add'>+	finish_wait(&amp;pasid_state-&gt;wq, &amp;wait);</div><div class='add'>+	mmput(pasid_state-&gt;mm);</div><div class='add'>+	free_pasid_state(pasid_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __unbind_pasid(struct pasid_state *pasid_state)</div><div class='add'>+{</div><div class='add'>+	struct iommu_domain *domain;</div><div class='add'>+</div><div class='add'>+	domain = pasid_state-&gt;device_state-&gt;domain;</div><div class='add'>+</div><div class='add'>+	amd_iommu_domain_clear_gcr3(domain, pasid_state-&gt;pasid);</div><div class='add'>+	clear_pasid_state(pasid_state-&gt;device_state, pasid_state-&gt;pasid);</div><div class='add'>+</div><div class='add'>+	/* Make sure no more pending faults are in the queue */</div><div class='add'>+	flush_workqueue(iommu_wq);</div><div class='add'>+</div><div class='add'>+	mmu_notifier_unregister(&amp;pasid_state-&gt;mn, pasid_state-&gt;mm);</div><div class='add'>+</div><div class='add'>+	put_pasid_state(pasid_state); /* Reference taken in bind() function */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void unbind_pasid(struct device_state *dev_state, int pasid)</div><div class='add'>+{</div><div class='add'>+	struct pasid_state *pasid_state;</div><div class='add'>+</div><div class='add'>+	pasid_state = get_pasid_state(dev_state, pasid);</div><div class='add'>+	if (pasid_state == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	unlink_pasid_state(pasid_state);</div><div class='add'>+	__unbind_pasid(pasid_state);</div><div class='add'>+	put_pasid_state_wait(pasid_state); /* Reference taken in this function */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_pasid_states_level1(struct pasid_state **tbl)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 512; ++i) {</div><div class='add'>+		if (tbl[i] == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		free_page((unsigned long)tbl[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_pasid_states_level2(struct pasid_state **tbl)</div><div class='add'>+{</div><div class='add'>+	struct pasid_state **ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 512; ++i) {</div><div class='add'>+		if (tbl[i] == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ptr = (struct pasid_state **)tbl[i];</div><div class='add'>+		free_pasid_states_level1(ptr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_pasid_states(struct device_state *dev_state)</div><div class='add'>+{</div><div class='add'>+	struct pasid_state *pasid_state;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dev_state-&gt;max_pasids; ++i) {</div><div class='add'>+		pasid_state = get_pasid_state(dev_state, i);</div><div class='add'>+		if (pasid_state == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		put_pasid_state(pasid_state);</div><div class='add'>+		unbind_pasid(dev_state, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev_state-&gt;pasid_levels == 2)</div><div class='add'>+		free_pasid_states_level2(dev_state-&gt;states);</div><div class='add'>+	else if (dev_state-&gt;pasid_levels == 1)</div><div class='add'>+		free_pasid_states_level1(dev_state-&gt;states);</div><div class='add'>+	else if (dev_state-&gt;pasid_levels != 0)</div><div class='add'>+		BUG();</div><div class='add'>+</div><div class='add'>+	free_page((unsigned long)dev_state-&gt;states);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pasid_state *mn_to_state(struct mmu_notifier *mn)</div><div class='add'>+{</div><div class='add'>+	return container_of(mn, struct pasid_state, mn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __mn_flush_page(struct mmu_notifier *mn,</div><div class='add'>+			    unsigned long address)</div><div class='add'>+{</div><div class='add'>+	struct pasid_state *pasid_state;</div><div class='add'>+	struct device_state *dev_state;</div><div class='add'>+</div><div class='add'>+	pasid_state = mn_to_state(mn);</div><div class='add'>+	dev_state   = pasid_state-&gt;device_state;</div><div class='add'>+</div><div class='add'>+	amd_iommu_flush_page(dev_state-&gt;domain, pasid_state-&gt;pasid, address);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mn_clear_flush_young(struct mmu_notifier *mn,</div><div class='add'>+				struct mm_struct *mm,</div><div class='add'>+				unsigned long address)</div><div class='add'>+{</div><div class='add'>+	__mn_flush_page(mn, address);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mn_change_pte(struct mmu_notifier *mn,</div><div class='add'>+			  struct mm_struct *mm,</div><div class='add'>+			  unsigned long address,</div><div class='add'>+			  pte_t pte)</div><div class='add'>+{</div><div class='add'>+	__mn_flush_page(mn, address);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mn_invalidate_page(struct mmu_notifier *mn,</div><div class='add'>+			       struct mm_struct *mm,</div><div class='add'>+			       unsigned long address)</div><div class='add'>+{</div><div class='add'>+	__mn_flush_page(mn, address);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mn_invalidate_range_start(struct mmu_notifier *mn,</div><div class='add'>+				      struct mm_struct *mm,</div><div class='add'>+				      unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	struct pasid_state *pasid_state;</div><div class='add'>+	struct device_state *dev_state;</div><div class='add'>+</div><div class='add'>+	pasid_state = mn_to_state(mn);</div><div class='add'>+	dev_state   = pasid_state-&gt;device_state;</div><div class='add'>+</div><div class='add'>+	amd_iommu_domain_set_gcr3(dev_state-&gt;domain, pasid_state-&gt;pasid,</div><div class='add'>+				  __pa(empty_page_table));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mn_invalidate_range_end(struct mmu_notifier *mn,</div><div class='add'>+				    struct mm_struct *mm,</div><div class='add'>+				    unsigned long start, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	struct pasid_state *pasid_state;</div><div class='add'>+	struct device_state *dev_state;</div><div class='add'>+</div><div class='add'>+	pasid_state = mn_to_state(mn);</div><div class='add'>+	dev_state   = pasid_state-&gt;device_state;</div><div class='add'>+</div><div class='add'>+	amd_iommu_domain_set_gcr3(dev_state-&gt;domain, pasid_state-&gt;pasid,</div><div class='add'>+				  __pa(pasid_state-&gt;mm-&gt;pgd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mmu_notifier_ops iommu_mn = {</div><div class='add'>+	.clear_flush_young      = mn_clear_flush_young,</div><div class='add'>+	.change_pte             = mn_change_pte,</div><div class='add'>+	.invalidate_page        = mn_invalidate_page,</div><div class='add'>+	.invalidate_range_start = mn_invalidate_range_start,</div><div class='add'>+	.invalidate_range_end   = mn_invalidate_range_end,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void set_pri_tag_status(struct pasid_state *pasid_state,</div><div class='add'>+			       u16 tag, int status)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pasid_state-&gt;lock, flags);</div><div class='add'>+	pasid_state-&gt;pri[tag].status = status;</div><div class='add'>+	spin_unlock_irqrestore(&amp;pasid_state-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void finish_pri_tag(struct device_state *dev_state,</div><div class='add'>+			   struct pasid_state *pasid_state,</div><div class='add'>+			   u16 tag)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pasid_state-&gt;lock, flags);</div><div class='add'>+	if (atomic_dec_and_test(&amp;pasid_state-&gt;pri[tag].inflight) &amp;&amp;</div><div class='add'>+	    pasid_state-&gt;pri[tag].finish) {</div><div class='add'>+		amd_iommu_complete_ppr(dev_state-&gt;pdev, pasid_state-&gt;pasid,</div><div class='add'>+				       pasid_state-&gt;pri[tag].status, tag);</div><div class='add'>+		pasid_state-&gt;pri[tag].finish = false;</div><div class='add'>+		pasid_state-&gt;pri[tag].status = PPR_SUCCESS;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;pasid_state-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void do_fault(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct fault *fault = container_of(work, struct fault, work);</div><div class='add'>+	int npages, write;</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	write = !!(fault-&gt;flags &amp; PPR_FAULT_WRITE);</div><div class='add'>+</div><div class='add'>+	npages = get_user_pages(fault-&gt;state-&gt;task, fault-&gt;state-&gt;mm,</div><div class='add'>+				fault-&gt;address, 1, write, 0, &amp;page, NULL);</div><div class='add'>+</div><div class='add'>+	if (npages == 1) {</div><div class='add'>+		put_page(page);</div><div class='add'>+	} else if (fault-&gt;dev_state-&gt;inv_ppr_cb) {</div><div class='add'>+		int status;</div><div class='add'>+</div><div class='add'>+		status = fault-&gt;dev_state-&gt;inv_ppr_cb(fault-&gt;dev_state-&gt;pdev,</div><div class='add'>+						      fault-&gt;pasid,</div><div class='add'>+						      fault-&gt;address,</div><div class='add'>+						      fault-&gt;flags);</div><div class='add'>+		switch (status) {</div><div class='add'>+		case AMD_IOMMU_INV_PRI_RSP_SUCCESS:</div><div class='add'>+			set_pri_tag_status(fault-&gt;state, fault-&gt;tag, PPR_SUCCESS);</div><div class='add'>+			break;</div><div class='add'>+		case AMD_IOMMU_INV_PRI_RSP_INVALID:</div><div class='add'>+			set_pri_tag_status(fault-&gt;state, fault-&gt;tag, PPR_INVALID);</div><div class='add'>+			break;</div><div class='add'>+		case AMD_IOMMU_INV_PRI_RSP_FAIL:</div><div class='add'>+			set_pri_tag_status(fault-&gt;state, fault-&gt;tag, PPR_FAILURE);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			BUG();</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		set_pri_tag_status(fault-&gt;state, fault-&gt;tag, PPR_INVALID);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	finish_pri_tag(fault-&gt;dev_state, fault-&gt;state, fault-&gt;tag);</div><div class='add'>+</div><div class='add'>+	put_pasid_state(fault-&gt;state);</div><div class='add'>+</div><div class='add'>+	kfree(fault);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ppr_notifier(struct notifier_block *nb, unsigned long e, void *data)</div><div class='add'>+{</div><div class='add'>+	struct amd_iommu_fault *iommu_fault;</div><div class='add'>+	struct pasid_state *pasid_state;</div><div class='add'>+	struct device_state *dev_state;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct fault *fault;</div><div class='add'>+	bool finish;</div><div class='add'>+	u16 tag;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	iommu_fault = data;</div><div class='add'>+	tag         = iommu_fault-&gt;tag &amp; 0x1ff;</div><div class='add'>+	finish      = (iommu_fault-&gt;tag &gt;&gt; 9) &amp; 1;</div><div class='add'>+</div><div class='add'>+	ret = NOTIFY_DONE;</div><div class='add'>+	dev_state = get_device_state(iommu_fault-&gt;device_id);</div><div class='add'>+	if (dev_state == NULL)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	pasid_state = get_pasid_state(dev_state, iommu_fault-&gt;pasid);</div><div class='add'>+	if (pasid_state == NULL) {</div><div class='add'>+		/* We know the device but not the PASID -&gt; send INVALID */</div><div class='add'>+		amd_iommu_complete_ppr(dev_state-&gt;pdev, iommu_fault-&gt;pasid,</div><div class='add'>+				       PPR_INVALID, tag);</div><div class='add'>+		goto out_drop_state;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pasid_state-&gt;lock, flags);</div><div class='add'>+	atomic_inc(&amp;pasid_state-&gt;pri[tag].inflight);</div><div class='add'>+	if (finish)</div><div class='add'>+		pasid_state-&gt;pri[tag].finish = true;</div><div class='add'>+	spin_unlock_irqrestore(&amp;pasid_state-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	fault = kzalloc(sizeof(*fault), GFP_ATOMIC);</div><div class='add'>+	if (fault == NULL) {</div><div class='add'>+		/* We are OOM - send success and let the device re-fault */</div><div class='add'>+		finish_pri_tag(dev_state, pasid_state, tag);</div><div class='add'>+		goto out_drop_state;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fault-&gt;dev_state = dev_state;</div><div class='add'>+	fault-&gt;address   = iommu_fault-&gt;address;</div><div class='add'>+	fault-&gt;state     = pasid_state;</div><div class='add'>+	fault-&gt;tag       = tag;</div><div class='add'>+	fault-&gt;finish    = finish;</div><div class='add'>+	fault-&gt;flags     = iommu_fault-&gt;flags;</div><div class='add'>+	INIT_WORK(&amp;fault-&gt;work, do_fault);</div><div class='add'>+</div><div class='add'>+	queue_work(iommu_wq, &amp;fault-&gt;work);</div><div class='add'>+</div><div class='add'>+	ret = NOTIFY_OK;</div><div class='add'>+</div><div class='add'>+out_drop_state:</div><div class='add'>+	put_device_state(dev_state);</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 struct notifier_block ppr_nb = {</div><div class='add'>+	.notifier_call = ppr_notifier,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int task_exit(struct notifier_block *nb, unsigned long e, void *data)</div><div class='add'>+{</div><div class='add'>+	struct pasid_state *pasid_state;</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+</div><div class='add'>+	task = data;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Using this notifier is a hack - but there is no other choice</div><div class='add'>+	 * at the moment. What I really want is a sleeping notifier that</div><div class='add'>+	 * is called when an MM goes down. But such a notifier doesn't</div><div class='add'>+	 * exist yet. The notifier needs to sleep because it has to make</div><div class='add'>+	 * sure that the device does not use the PASID and the address</div><div class='add'>+	 * space anymore before it is destroyed. This includes waiting</div><div class='add'>+	 * for pending PRI requests to pass the workqueue. The</div><div class='add'>+	 * MMU-Notifiers would be a good fit, but they use RCU and so</div><div class='add'>+	 * they are not allowed to sleep. Lets see how we can solve this</div><div class='add'>+	 * in a more intelligent way in the future.</div><div class='add'>+	 */</div><div class='add'>+again:</div><div class='add'>+	spin_lock(&amp;ps_lock);</div><div class='add'>+	list_for_each_entry(pasid_state, &amp;pasid_state_list, list) {</div><div class='add'>+		struct device_state *dev_state;</div><div class='add'>+		int pasid;</div><div class='add'>+</div><div class='add'>+		if (pasid_state-&gt;task != task)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Drop Lock and unbind */</div><div class='add'>+		spin_unlock(&amp;ps_lock);</div><div class='add'>+</div><div class='add'>+		dev_state = pasid_state-&gt;device_state;</div><div class='add'>+		pasid     = pasid_state-&gt;pasid;</div><div class='add'>+</div><div class='add'>+		if (pasid_state-&gt;device_state-&gt;inv_ctx_cb)</div><div class='add'>+			dev_state-&gt;inv_ctx_cb(dev_state-&gt;pdev, pasid);</div><div class='add'>+</div><div class='add'>+		unbind_pasid(dev_state, pasid);</div><div class='add'>+</div><div class='add'>+		/* Task may be in the list multiple times */</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;ps_lock);</div><div class='add'>+</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int amd_iommu_bind_pasid(struct pci_dev *pdev, int pasid,</div><div class='add'>+			 struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	struct pasid_state *pasid_state;</div><div class='add'>+	struct device_state *dev_state;</div><div class='add'>+	u16 devid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	if (!amd_iommu_v2_supported())</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	devid     = device_id(pdev);</div><div class='add'>+	dev_state = get_device_state(devid);</div><div class='add'>+</div><div class='add'>+	if (dev_state == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (pasid &lt; 0 || pasid &gt;= dev_state-&gt;max_pasids)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	pasid_state = kzalloc(sizeof(*pasid_state), GFP_KERNEL);</div><div class='add'>+	if (pasid_state == NULL)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;pasid_state-&gt;count, 1);</div><div class='add'>+	init_waitqueue_head(&amp;pasid_state-&gt;wq);</div><div class='add'>+	pasid_state-&gt;task         = task;</div><div class='add'>+	pasid_state-&gt;mm           = get_task_mm(task);</div><div class='add'>+	pasid_state-&gt;device_state = dev_state;</div><div class='add'>+	pasid_state-&gt;pasid        = pasid;</div><div class='add'>+	pasid_state-&gt;mn.ops       = &amp;iommu_mn;</div><div class='add'>+</div><div class='add'>+	if (pasid_state-&gt;mm == NULL)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	mmu_notifier_register(&amp;pasid_state-&gt;mn, pasid_state-&gt;mm);</div><div class='add'>+</div><div class='add'>+	ret = set_pasid_state(dev_state, pasid_state, pasid);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unregister;</div><div class='add'>+</div><div class='add'>+	ret = amd_iommu_domain_set_gcr3(dev_state-&gt;domain, pasid,</div><div class='add'>+					__pa(pasid_state-&gt;mm-&gt;pgd));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_clear_state;</div><div class='add'>+</div><div class='add'>+	link_pasid_state(pasid_state);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_clear_state:</div><div class='add'>+	clear_pasid_state(dev_state, pasid);</div><div class='add'>+</div><div class='add'>+out_unregister:</div><div class='add'>+	mmu_notifier_unregister(&amp;pasid_state-&gt;mn, pasid_state-&gt;mm);</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	free_pasid_state(pasid_state);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	put_device_state(dev_state);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_bind_pasid);</div><div class='add'>+</div><div class='add'>+void amd_iommu_unbind_pasid(struct pci_dev *pdev, int pasid)</div><div class='add'>+{</div><div class='add'>+	struct device_state *dev_state;</div><div class='add'>+	u16 devid;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	if (!amd_iommu_v2_supported())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	devid = device_id(pdev);</div><div class='add'>+	dev_state = get_device_state(devid);</div><div class='add'>+	if (dev_state == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pasid &lt; 0 || pasid &gt;= dev_state-&gt;max_pasids)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	unbind_pasid(dev_state, pasid);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	put_device_state(dev_state);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_unbind_pasid);</div><div class='add'>+</div><div class='add'>+int amd_iommu_init_device(struct pci_dev *pdev, int pasids)</div><div class='add'>+{</div><div class='add'>+	struct device_state *dev_state;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret, tmp;</div><div class='add'>+	u16 devid;</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	if (!amd_iommu_v2_supported())</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (pasids &lt;= 0 || pasids &gt; (PASID_MASK + 1))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	devid = device_id(pdev);</div><div class='add'>+</div><div class='add'>+	dev_state = kzalloc(sizeof(*dev_state), GFP_KERNEL);</div><div class='add'>+	if (dev_state == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;dev_state-&gt;lock);</div><div class='add'>+	init_waitqueue_head(&amp;dev_state-&gt;wq);</div><div class='add'>+	dev_state-&gt;pdev = pdev;</div><div class='add'>+</div><div class='add'>+	tmp = pasids;</div><div class='add'>+	for (dev_state-&gt;pasid_levels = 0; (tmp - 1) &amp; ~0x1ff; tmp &gt;&gt;= 9)</div><div class='add'>+		dev_state-&gt;pasid_levels += 1;</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;dev_state-&gt;count, 1);</div><div class='add'>+	dev_state-&gt;max_pasids = pasids;</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	dev_state-&gt;states = (void *)get_zeroed_page(GFP_KERNEL);</div><div class='add'>+	if (dev_state-&gt;states == NULL)</div><div class='add'>+		goto out_free_dev_state;</div><div class='add'>+</div><div class='add'>+	dev_state-&gt;domain = iommu_domain_alloc(&amp;pci_bus_type);</div><div class='add'>+	if (dev_state-&gt;domain == NULL)</div><div class='add'>+		goto out_free_states;</div><div class='add'>+</div><div class='add'>+	amd_iommu_domain_direct_map(dev_state-&gt;domain);</div><div class='add'>+</div><div class='add'>+	ret = amd_iommu_domain_enable_v2(dev_state-&gt;domain, pasids);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_free_domain;</div><div class='add'>+</div><div class='add'>+	ret = iommu_attach_device(dev_state-&gt;domain, &amp;pdev-&gt;dev);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		goto out_free_domain;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;state_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (state_table[devid] != NULL) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;state_lock, flags);</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out_free_domain;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	state_table[devid] = dev_state;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;state_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free_domain:</div><div class='add'>+	iommu_domain_free(dev_state-&gt;domain);</div><div class='add'>+</div><div class='add'>+out_free_states:</div><div class='add'>+	free_page((unsigned long)dev_state-&gt;states);</div><div class='add'>+</div><div class='add'>+out_free_dev_state:</div><div class='add'>+	kfree(dev_state);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_init_device);</div><div class='add'>+</div><div class='add'>+void amd_iommu_free_device(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device_state *dev_state;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 devid;</div><div class='add'>+</div><div class='add'>+	if (!amd_iommu_v2_supported())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	devid = device_id(pdev);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;state_lock, flags);</div><div class='add'>+</div><div class='add'>+	dev_state = state_table[devid];</div><div class='add'>+	if (dev_state == NULL) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;state_lock, flags);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	state_table[devid] = NULL;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;state_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Get rid of any remaining pasid states */</div><div class='add'>+	free_pasid_states(dev_state);</div><div class='add'>+</div><div class='add'>+	put_device_state_wait(dev_state);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_free_device);</div><div class='add'>+</div><div class='add'>+int amd_iommu_set_invalid_ppr_cb(struct pci_dev *pdev,</div><div class='add'>+				 amd_iommu_invalid_ppr_cb cb)</div><div class='add'>+{</div><div class='add'>+	struct device_state *dev_state;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 devid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!amd_iommu_v2_supported())</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	devid = device_id(pdev);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;state_lock, flags);</div><div class='add'>+</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	dev_state = state_table[devid];</div><div class='add'>+	if (dev_state == NULL)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	dev_state-&gt;inv_ppr_cb = cb;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	spin_unlock_irqrestore(&amp;state_lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_set_invalid_ppr_cb);</div><div class='add'>+</div><div class='add'>+int amd_iommu_set_invalidate_ctx_cb(struct pci_dev *pdev,</div><div class='add'>+				    amd_iommu_invalidate_ctx cb)</div><div class='add'>+{</div><div class='add'>+	struct device_state *dev_state;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 devid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!amd_iommu_v2_supported())</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	devid = device_id(pdev);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;state_lock, flags);</div><div class='add'>+</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	dev_state = state_table[devid];</div><div class='add'>+	if (dev_state == NULL)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	dev_state-&gt;inv_ctx_cb = cb;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	spin_unlock_irqrestore(&amp;state_lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amd_iommu_set_invalidate_ctx_cb);</div><div class='add'>+</div><div class='add'>+static int __init amd_iommu_v2_init(void)</div><div class='add'>+{</div><div class='add'>+	size_t state_table_size;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	pr_info("AMD IOMMUv2 driver by Joerg Roedel &lt;joerg.roedel@amd.com&gt;");</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;state_lock);</div><div class='add'>+</div><div class='add'>+	state_table_size = MAX_DEVICES * sizeof(struct device_state *);</div><div class='add'>+	state_table = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,</div><div class='add'>+					       get_order(state_table_size));</div><div class='add'>+	if (state_table == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	iommu_wq = create_workqueue("amd_iommu_v2");</div><div class='add'>+	if (iommu_wq == NULL)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	empty_page_table = (u64 *)get_zeroed_page(GFP_KERNEL);</div><div class='add'>+	if (empty_page_table == NULL)</div><div class='add'>+		goto out_destroy_wq;</div><div class='add'>+</div><div class='add'>+	amd_iommu_register_ppr_notifier(&amp;ppr_nb);</div><div class='add'>+	profile_event_register(PROFILE_TASK_EXIT, &amp;profile_nb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_destroy_wq:</div><div class='add'>+	destroy_workqueue(iommu_wq);</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	free_pages((unsigned long)state_table, get_order(state_table_size));</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit amd_iommu_v2_exit(void)</div><div class='add'>+{</div><div class='add'>+	struct device_state *dev_state;</div><div class='add'>+	size_t state_table_size;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	profile_event_unregister(PROFILE_TASK_EXIT, &amp;profile_nb);</div><div class='add'>+	amd_iommu_unregister_ppr_notifier(&amp;ppr_nb);</div><div class='add'>+</div><div class='add'>+	flush_workqueue(iommu_wq);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The loop below might call flush_workqueue(), so call</div><div class='add'>+	 * destroy_workqueue() after it</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; MAX_DEVICES; ++i) {</div><div class='add'>+		dev_state = get_device_state(i);</div><div class='add'>+</div><div class='add'>+		if (dev_state == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+</div><div class='add'>+		put_device_state(dev_state);</div><div class='add'>+		amd_iommu_free_device(dev_state-&gt;pdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	destroy_workqueue(iommu_wq);</div><div class='add'>+</div><div class='add'>+	state_table_size = MAX_DEVICES * sizeof(struct device_state *);</div><div class='add'>+	free_pages((unsigned long)state_table, get_order(state_table_size));</div><div class='add'>+</div><div class='add'>+	free_page((unsigned long)empty_page_table);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(amd_iommu_v2_init);</div><div class='add'>+module_exit(amd_iommu_v2_exit);</div><div class='head'>diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c<br/>index 31053a951c34..c9c6053198d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/iommu/intel-iommu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/intel-iommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/iommu/intel-iommu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/iommu/intel-iommu.c</a></div><div class='hunk'>@@ -79,6 +79,24 @@</div><div class='ctx'> #define LEVEL_STRIDE		(9)</div><div class='ctx'> #define LEVEL_MASK		(((u64)1 &lt;&lt; LEVEL_STRIDE) - 1)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This bitmap is used to advertise the page sizes our hardware support</div><div class='add'>+ * to the IOMMU core, which will then use this information to split</div><div class='add'>+ * physically contiguous memory regions it is mapping into page sizes</div><div class='add'>+ * that we support.</div><div class='add'>+ *</div><div class='add'>+ * Traditionally the IOMMU core just handed us the mappings directly,</div><div class='add'>+ * after making sure the size is an order of a 4KiB page and that the</div><div class='add'>+ * mapping has natural alignment.</div><div class='add'>+ *</div><div class='add'>+ * To retain this behavior, we currently advertise that we support</div><div class='add'>+ * all page sizes that are an order of 4KiB.</div><div class='add'>+ *</div><div class='add'>+ * If at some point we'd like to utilize the IOMMU core's new behavior,</div><div class='add'>+ * we could change this to advertise the real page sizes we support.</div><div class='add'>+ */</div><div class='add'>+#define INTEL_IOMMU_PGSIZES	(~0xFFFUL)</div><div class='add'>+</div><div class='ctx'> static inline int agaw_to_level(int agaw)</div><div class='ctx'> {</div><div class='ctx'> 	return agaw + 2;</div><div class='hunk'>@@ -3979,12 +3997,11 @@ static void intel_iommu_detach_device(struct iommu_domain *domain,</div><div class='ctx'> </div><div class='ctx'> static int intel_iommu_map(struct iommu_domain *domain,</div><div class='ctx'> 			   unsigned long iova, phys_addr_t hpa,</div><div class='del'>-			   int gfp_order, int iommu_prot)</div><div class='add'>+			   size_t size, int iommu_prot)</div><div class='ctx'> {</div><div class='ctx'> 	struct dmar_domain *dmar_domain = domain-&gt;priv;</div><div class='ctx'> 	u64 max_addr;</div><div class='ctx'> 	int prot = 0;</div><div class='del'>-	size_t size;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (iommu_prot &amp; IOMMU_READ)</div><div class='hunk'>@@ -3994,7 +4011,6 @@ static int intel_iommu_map(struct iommu_domain *domain,</div><div class='ctx'> 	if ((iommu_prot &amp; IOMMU_CACHE) &amp;&amp; dmar_domain-&gt;iommu_snooping)</div><div class='ctx'> 		prot |= DMA_PTE_SNP;</div><div class='ctx'> </div><div class='del'>-	size     = PAGE_SIZE &lt;&lt; gfp_order;</div><div class='ctx'> 	max_addr = iova + size;</div><div class='ctx'> 	if (dmar_domain-&gt;max_addr &lt; max_addr) {</div><div class='ctx'> 		u64 end;</div><div class='hunk'>@@ -4017,11 +4033,10 @@ static int intel_iommu_map(struct iommu_domain *domain,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int intel_iommu_unmap(struct iommu_domain *domain,</div><div class='del'>-			     unsigned long iova, int gfp_order)</div><div class='add'>+static size_t intel_iommu_unmap(struct iommu_domain *domain,</div><div class='add'>+			     unsigned long iova, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	struct dmar_domain *dmar_domain = domain-&gt;priv;</div><div class='del'>-	size_t size = PAGE_SIZE &lt;&lt; gfp_order;</div><div class='ctx'> 	int order;</div><div class='ctx'> </div><div class='ctx'> 	order = dma_pte_clear_range(dmar_domain, iova &gt;&gt; VTD_PAGE_SHIFT,</div><div class='hunk'>@@ -4030,7 +4045,7 @@ static int intel_iommu_unmap(struct iommu_domain *domain,</div><div class='ctx'> 	if (dmar_domain-&gt;max_addr == iova + size)</div><div class='ctx'> 		dmar_domain-&gt;max_addr = iova;</div><div class='ctx'> </div><div class='del'>-	return order;</div><div class='add'>+	return PAGE_SIZE &lt;&lt; order;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static phys_addr_t intel_iommu_iova_to_phys(struct iommu_domain *domain,</div><div class='hunk'>@@ -4060,6 +4075,54 @@ static int intel_iommu_domain_has_cap(struct iommu_domain *domain,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Group numbers are arbitrary.  Device with the same group number</div><div class='add'>+ * indicate the iommu cannot differentiate between them.  To avoid</div><div class='add'>+ * tracking used groups we just use the seg|bus|devfn of the lowest</div><div class='add'>+ * level we're able to differentiate devices</div><div class='add'>+ */</div><div class='add'>+static int intel_iommu_device_group(struct device *dev, unsigned int *groupid)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='add'>+	struct pci_dev *bridge;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u8 devfn;</div><div class='add'>+			u8 bus;</div><div class='add'>+			u16 segment;</div><div class='add'>+		} pci;</div><div class='add'>+		u32 group;</div><div class='add'>+	} id;</div><div class='add'>+</div><div class='add'>+	if (iommu_no_mapping(dev))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	id.pci.segment = pci_domain_nr(pdev-&gt;bus);</div><div class='add'>+	id.pci.bus = pdev-&gt;bus-&gt;number;</div><div class='add'>+	id.pci.devfn = pdev-&gt;devfn;</div><div class='add'>+</div><div class='add'>+	if (!device_to_iommu(id.pci.segment, id.pci.bus, id.pci.devfn))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	bridge = pci_find_upstream_pcie_bridge(pdev);</div><div class='add'>+	if (bridge) {</div><div class='add'>+		if (pci_is_pcie(bridge)) {</div><div class='add'>+			id.pci.bus = bridge-&gt;subordinate-&gt;number;</div><div class='add'>+			id.pci.devfn = 0;</div><div class='add'>+		} else {</div><div class='add'>+			id.pci.bus = bridge-&gt;bus-&gt;number;</div><div class='add'>+			id.pci.devfn = bridge-&gt;devfn;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!pdev-&gt;is_virtfn &amp;&amp; iommu_group_mf)</div><div class='add'>+		id.pci.devfn = PCI_DEVFN(PCI_SLOT(id.pci.devfn), 0);</div><div class='add'>+</div><div class='add'>+	*groupid = id.group;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct iommu_ops intel_iommu_ops = {</div><div class='ctx'> 	.domain_init	= intel_iommu_domain_init,</div><div class='ctx'> 	.domain_destroy = intel_iommu_domain_destroy,</div><div class='hunk'>@@ -4069,6 +4132,8 @@ static struct iommu_ops intel_iommu_ops = {</div><div class='ctx'> 	.unmap		= intel_iommu_unmap,</div><div class='ctx'> 	.iova_to_phys	= intel_iommu_iova_to_phys,</div><div class='ctx'> 	.domain_has_cap = intel_iommu_domain_has_cap,</div><div class='add'>+	.device_group	= intel_iommu_device_group,</div><div class='add'>+	.pgsize_bitmap	= INTEL_IOMMU_PGSIZES,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __devinit quirk_iommu_rwbf(struct pci_dev *dev)</div><div class='head'>diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c<br/>index 5b5fa5cdaa31..2198b2dbbcd3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/iommu/iommu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/iommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/iommu/iommu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/iommu/iommu.c</a></div><div class='hunk'>@@ -16,6 +16,8 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define pr_fmt(fmt)    "%s: " fmt, __func__</div><div class='add'>+</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/bug.h&gt;</div><div class='hunk'>@@ -25,8 +27,59 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/iommu.h&gt;</div><div class='ctx'> </div><div class='add'>+static ssize_t show_iommu_group(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	unsigned int groupid;</div><div class='add'>+</div><div class='add'>+	if (iommu_device_group(dev, &amp;groupid))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%u", groupid);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(iommu_group, S_IRUGO, show_iommu_group, NULL);</div><div class='add'>+</div><div class='add'>+static int add_iommu_group(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int groupid;</div><div class='add'>+</div><div class='add'>+	if (iommu_device_group(dev, &amp;groupid) == 0)</div><div class='add'>+		return device_create_file(dev, &amp;dev_attr_iommu_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 remove_iommu_group(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned int groupid;</div><div class='add'>+</div><div class='add'>+	if (iommu_device_group(dev, &amp;groupid) == 0)</div><div class='add'>+		device_remove_file(dev, &amp;dev_attr_iommu_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 iommu_device_notifier(struct notifier_block *nb,</div><div class='add'>+				 unsigned long action, void *data)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = data;</div><div class='add'>+</div><div class='add'>+	if (action == BUS_NOTIFY_ADD_DEVICE)</div><div class='add'>+		return add_iommu_group(dev, NULL);</div><div class='add'>+	else if (action == BUS_NOTIFY_DEL_DEVICE)</div><div class='add'>+		return remove_iommu_group(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block iommu_device_nb = {</div><div class='add'>+	.notifier_call = iommu_device_notifier,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void iommu_bus_init(struct bus_type *bus, struct iommu_ops *ops)</div><div class='ctx'> {</div><div class='add'>+	bus_register_notifier(bus, &amp;iommu_device_nb);</div><div class='add'>+	bus_for_each_dev(bus, NULL, NULL, add_iommu_group);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -157,32 +210,134 @@ int iommu_domain_has_cap(struct iommu_domain *domain,</div><div class='ctx'> EXPORT_SYMBOL_GPL(iommu_domain_has_cap);</div><div class='ctx'> </div><div class='ctx'> int iommu_map(struct iommu_domain *domain, unsigned long iova,</div><div class='del'>-	      phys_addr_t paddr, int gfp_order, int prot)</div><div class='add'>+	      phys_addr_t paddr, size_t size, int prot)</div><div class='ctx'> {</div><div class='del'>-	size_t size;</div><div class='add'>+	unsigned long orig_iova = iova;</div><div class='add'>+	unsigned int min_pagesz;</div><div class='add'>+	size_t orig_size = size;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(domain-&gt;ops-&gt;map == NULL))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	size         = PAGE_SIZE &lt;&lt; gfp_order;</div><div class='add'>+	/* find out the minimum page size supported */</div><div class='add'>+	min_pagesz = 1 &lt;&lt; __ffs(domain-&gt;ops-&gt;pgsize_bitmap);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * both the virtual address and the physical one, as well as</div><div class='add'>+	 * the size of the mapping, must be aligned (at least) to the</div><div class='add'>+	 * size of the smallest page supported by the hardware</div><div class='add'>+	 */</div><div class='add'>+	if (!IS_ALIGNED(iova | paddr | size, min_pagesz)) {</div><div class='add'>+		pr_err("unaligned: iova 0x%lx pa 0x%lx size 0x%lx min_pagesz "</div><div class='add'>+			"0x%x\n", iova, (unsigned long)paddr,</div><div class='add'>+			(unsigned long)size, min_pagesz);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("map: iova 0x%lx pa 0x%lx size 0x%lx\n", iova,</div><div class='add'>+				(unsigned long)paddr, (unsigned long)size);</div><div class='add'>+</div><div class='add'>+	while (size) {</div><div class='add'>+		unsigned long pgsize, addr_merge = iova | paddr;</div><div class='add'>+		unsigned int pgsize_idx;</div><div class='add'>+</div><div class='add'>+		/* Max page size that still fits into 'size' */</div><div class='add'>+		pgsize_idx = __fls(size);</div><div class='add'>+</div><div class='add'>+		/* need to consider alignment requirements ? */</div><div class='add'>+		if (likely(addr_merge)) {</div><div class='add'>+			/* Max page size allowed by both iova and paddr */</div><div class='add'>+			unsigned int align_pgsize_idx = __ffs(addr_merge);</div><div class='add'>+</div><div class='add'>+			pgsize_idx = min(pgsize_idx, align_pgsize_idx);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* build a mask of acceptable page sizes */</div><div class='add'>+		pgsize = (1UL &lt;&lt; (pgsize_idx + 1)) - 1;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!IS_ALIGNED(iova | paddr, size));</div><div class='add'>+		/* throw away page sizes not supported by the hardware */</div><div class='add'>+		pgsize &amp;= domain-&gt;ops-&gt;pgsize_bitmap;</div><div class='ctx'> </div><div class='del'>-	return domain-&gt;ops-&gt;map(domain, iova, paddr, gfp_order, prot);</div><div class='add'>+		/* make sure we're still sane */</div><div class='add'>+		BUG_ON(!pgsize);</div><div class='add'>+</div><div class='add'>+		/* pick the biggest page */</div><div class='add'>+		pgsize_idx = __fls(pgsize);</div><div class='add'>+		pgsize = 1UL &lt;&lt; pgsize_idx;</div><div class='add'>+</div><div class='add'>+		pr_debug("mapping: iova 0x%lx pa 0x%lx pgsize %lu\n", iova,</div><div class='add'>+					(unsigned long)paddr, pgsize);</div><div class='add'>+</div><div class='add'>+		ret = domain-&gt;ops-&gt;map(domain, iova, paddr, pgsize, prot);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		iova += pgsize;</div><div class='add'>+		paddr += pgsize;</div><div class='add'>+		size -= pgsize;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* unroll mapping in case something went wrong */</div><div class='add'>+	if (ret)</div><div class='add'>+		iommu_unmap(domain, orig_iova, orig_size - size);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iommu_map);</div><div class='ctx'> </div><div class='del'>-int iommu_unmap(struct iommu_domain *domain, unsigned long iova, int gfp_order)</div><div class='add'>+size_t iommu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size)</div><div class='ctx'> {</div><div class='del'>-	size_t size;</div><div class='add'>+	size_t unmapped_page, unmapped = 0;</div><div class='add'>+	unsigned int min_pagesz;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(domain-&gt;ops-&gt;unmap == NULL))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	size         = PAGE_SIZE &lt;&lt; gfp_order;</div><div class='add'>+	/* find out the minimum page size supported */</div><div class='add'>+	min_pagesz = 1 &lt;&lt; __ffs(domain-&gt;ops-&gt;pgsize_bitmap);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The virtual address, as well as the size of the mapping, must be</div><div class='add'>+	 * aligned (at least) to the size of the smallest page supported</div><div class='add'>+	 * by the hardware</div><div class='add'>+	 */</div><div class='add'>+	if (!IS_ALIGNED(iova | size, min_pagesz)) {</div><div class='add'>+		pr_err("unaligned: iova 0x%lx size 0x%lx min_pagesz 0x%x\n",</div><div class='add'>+					iova, (unsigned long)size, min_pagesz);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("unmap this: iova 0x%lx size 0x%lx\n", iova,</div><div class='add'>+							(unsigned long)size);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Keep iterating until we either unmap 'size' bytes (or more)</div><div class='add'>+	 * or we hit an area that isn't mapped.</div><div class='add'>+	 */</div><div class='add'>+	while (unmapped &lt; size) {</div><div class='add'>+		size_t left = size - unmapped;</div><div class='add'>+</div><div class='add'>+		unmapped_page = domain-&gt;ops-&gt;unmap(domain, iova, left);</div><div class='add'>+		if (!unmapped_page)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		pr_debug("unmapped: iova 0x%lx size %lx\n", iova,</div><div class='add'>+					(unsigned long)unmapped_page);</div><div class='add'>+</div><div class='add'>+		iova += unmapped_page;</div><div class='add'>+		unmapped += unmapped_page;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return unmapped;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iommu_unmap);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!IS_ALIGNED(iova, size));</div><div class='add'>+int iommu_device_group(struct device *dev, unsigned int *groupid)</div><div class='add'>+{</div><div class='add'>+	if (iommu_present(dev-&gt;bus) &amp;&amp; dev-&gt;bus-&gt;iommu_ops-&gt;device_group)</div><div class='add'>+		return dev-&gt;bus-&gt;iommu_ops-&gt;device_group(dev, groupid);</div><div class='ctx'> </div><div class='del'>-	return domain-&gt;ops-&gt;unmap(domain, iova, gfp_order);</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(iommu_unmap);</div><div class='add'>+EXPORT_SYMBOL_GPL(iommu_device_group);</div><div class='head'>diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c<br/>index 5865dd2e28f9..08a90b88e40d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/iommu/msm_iommu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/msm_iommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/iommu/msm_iommu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/iommu/msm_iommu.c</a></div><div class='hunk'>@@ -42,6 +42,9 @@ __asm__ __volatile__ (							\</div><div class='ctx'> #define RCP15_PRRR(reg)		MRC(reg, p15, 0, c10, c2, 0)</div><div class='ctx'> #define RCP15_NMRR(reg)		MRC(reg, p15, 0, c10, c2, 1)</div><div class='ctx'> </div><div class='add'>+/* bitmap of the page sizes currently supported */</div><div class='add'>+#define MSM_IOMMU_PGSIZES	(SZ_4K | SZ_64K | SZ_1M | SZ_16M)</div><div class='add'>+</div><div class='ctx'> static int msm_iommu_tex_class[4];</div><div class='ctx'> </div><div class='ctx'> DEFINE_SPINLOCK(msm_iommu_lock);</div><div class='hunk'>@@ -352,7 +355,7 @@ fail:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int msm_iommu_map(struct iommu_domain *domain, unsigned long va,</div><div class='del'>-			 phys_addr_t pa, int order, int prot)</div><div class='add'>+			 phys_addr_t pa, size_t len, int prot)</div><div class='ctx'> {</div><div class='ctx'> 	struct msm_priv *priv;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -363,7 +366,6 @@ static int msm_iommu_map(struct iommu_domain *domain, unsigned long va,</div><div class='ctx'> 	unsigned long *sl_pte;</div><div class='ctx'> 	unsigned long sl_offset;</div><div class='ctx'> 	unsigned int pgprot;</div><div class='del'>-	size_t len = 0x1000UL &lt;&lt; order;</div><div class='ctx'> 	int ret = 0, tex, sh;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;msm_iommu_lock, flags);</div><div class='hunk'>@@ -463,8 +465,8 @@ fail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,</div><div class='del'>-			    int order)</div><div class='add'>+static size_t msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,</div><div class='add'>+			    size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct msm_priv *priv;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -474,7 +476,6 @@ static int msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,</div><div class='ctx'> 	unsigned long *sl_table;</div><div class='ctx'> 	unsigned long *sl_pte;</div><div class='ctx'> 	unsigned long sl_offset;</div><div class='del'>-	size_t len = 0x1000UL &lt;&lt; order;</div><div class='ctx'> 	int i, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;msm_iommu_lock, flags);</div><div class='hunk'>@@ -544,15 +545,12 @@ static int msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,</div><div class='ctx'> </div><div class='ctx'> 	ret = __flush_iotlb(domain);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * the IOMMU API requires us to return the order of the unmapped</div><div class='del'>-	 * page (on success).</div><div class='del'>-	 */</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = order;</div><div class='ctx'> fail:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;msm_iommu_lock, flags);</div><div class='del'>-	return ret;</div><div class='add'>+</div><div class='add'>+	/* the IOMMU API requires us to return how many bytes were unmapped */</div><div class='add'>+	len = ret ? 0 : len;</div><div class='add'>+	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static phys_addr_t msm_iommu_iova_to_phys(struct iommu_domain *domain,</div><div class='hunk'>@@ -684,7 +682,8 @@ static struct iommu_ops msm_iommu_ops = {</div><div class='ctx'> 	.map = msm_iommu_map,</div><div class='ctx'> 	.unmap = msm_iommu_unmap,</div><div class='ctx'> 	.iova_to_phys = msm_iommu_iova_to_phys,</div><div class='del'>-	.domain_has_cap = msm_iommu_domain_has_cap</div><div class='add'>+	.domain_has_cap = msm_iommu_domain_has_cap,</div><div class='add'>+	.pgsize_bitmap = MSM_IOMMU_PGSIZES,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init get_tex_class(int icp, int ocp, int mt, int nos)</div><div class='head'>diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c<br/>index 8f32b2bf7587..d8edd979d01b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/iommu/omap-iommu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/omap-iommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/iommu/omap-iommu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/iommu/omap-iommu.c</a></div><div class='hunk'>@@ -33,6 +33,9 @@</div><div class='ctx'> 	     (__i &lt; (n)) &amp;&amp; (cr = __iotlb_read_cr((obj), __i), true);	\</div><div class='ctx'> 	     __i++)</div><div class='ctx'> </div><div class='add'>+/* bitmap of the page sizes currently supported */</div><div class='add'>+#define OMAP_IOMMU_PGSIZES	(SZ_4K | SZ_64K | SZ_1M | SZ_16M)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct omap_iommu_domain - omap iommu domain</div><div class='ctx'>  * @pgtable:	the page table</div><div class='hunk'>@@ -86,20 +89,24 @@ EXPORT_SYMBOL_GPL(omap_uninstall_iommu_arch);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * omap_iommu_save_ctx - Save registers for pm off-mode support</div><div class='del'>- * @obj:	target iommu</div><div class='add'>+ * @dev:	client device</div><div class='ctx'>  **/</div><div class='del'>-void omap_iommu_save_ctx(struct omap_iommu *obj)</div><div class='add'>+void omap_iommu_save_ctx(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct omap_iommu *obj = dev_to_omap_iommu(dev);</div><div class='add'>+</div><div class='ctx'> 	arch_iommu-&gt;save_ctx(obj);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(omap_iommu_save_ctx);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * omap_iommu_restore_ctx - Restore registers for pm off-mode support</div><div class='del'>- * @obj:	target iommu</div><div class='add'>+ * @dev:	client device</div><div class='ctx'>  **/</div><div class='del'>-void omap_iommu_restore_ctx(struct omap_iommu *obj)</div><div class='add'>+void omap_iommu_restore_ctx(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct omap_iommu *obj = dev_to_omap_iommu(dev);</div><div class='add'>+</div><div class='ctx'> 	arch_iommu-&gt;restore_ctx(obj);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(omap_iommu_restore_ctx);</div><div class='hunk'>@@ -820,35 +827,23 @@ static int device_match_by_alias(struct device *dev, void *data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * omap_find_iommu_device() - find an omap iommu device by name</div><div class='del'>- * @name:	name of the iommu device</div><div class='del'>- *</div><div class='del'>- * The generic iommu API requires the caller to provide the device</div><div class='del'>- * he wishes to attach to a certain iommu domain.</div><div class='del'>- *</div><div class='del'>- * Drivers generally should not bother with this as it should just</div><div class='del'>- * be taken care of by the DMA-API using dev_archdata.</div><div class='del'>- *</div><div class='del'>- * This function is provided as an interim solution until the latter</div><div class='del'>- * materializes, and omap3isp is fully migrated to the DMA-API.</div><div class='del'>- */</div><div class='del'>-struct device *omap_find_iommu_device(const char *name)</div><div class='del'>-{</div><div class='del'>-	return driver_find_device(&amp;omap_iommu_driver.driver, NULL,</div><div class='del'>-				(void *)name,</div><div class='del'>-				device_match_by_alias);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(omap_find_iommu_device);</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * omap_iommu_attach() - attach iommu device to an iommu domain</div><div class='del'>- * @dev:	target omap iommu device</div><div class='add'>+ * @name:	name of target omap iommu device</div><div class='ctx'>  * @iopgd:	page table</div><div class='ctx'>  **/</div><div class='del'>-static struct omap_iommu *omap_iommu_attach(struct device *dev, u32 *iopgd)</div><div class='add'>+static struct omap_iommu *omap_iommu_attach(const char *name, u32 *iopgd)</div><div class='ctx'> {</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='del'>-	struct omap_iommu *obj = to_iommu(dev);</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct omap_iommu *obj;</div><div class='add'>+</div><div class='add'>+	dev = driver_find_device(&amp;omap_iommu_driver.driver, NULL,</div><div class='add'>+				(void *)name,</div><div class='add'>+				device_match_by_alias);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	obj = to_iommu(dev);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;obj-&gt;iommu_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1019,12 +1014,11 @@ static void iopte_cachep_ctor(void *iopte)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int omap_iommu_map(struct iommu_domain *domain, unsigned long da,</div><div class='del'>-			 phys_addr_t pa, int order, int prot)</div><div class='add'>+			 phys_addr_t pa, size_t bytes, int prot)</div><div class='ctx'> {</div><div class='ctx'> 	struct omap_iommu_domain *omap_domain = domain-&gt;priv;</div><div class='ctx'> 	struct omap_iommu *oiommu = omap_domain-&gt;iommu_dev;</div><div class='ctx'> 	struct device *dev = oiommu-&gt;dev;</div><div class='del'>-	size_t bytes = PAGE_SIZE &lt;&lt; order;</div><div class='ctx'> 	struct iotlb_entry e;</div><div class='ctx'> 	int omap_pgsz;</div><div class='ctx'> 	u32 ret, flags;</div><div class='hunk'>@@ -1049,19 +1043,16 @@ static int omap_iommu_map(struct iommu_domain *domain, unsigned long da,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int omap_iommu_unmap(struct iommu_domain *domain, unsigned long da,</div><div class='del'>-			    int order)</div><div class='add'>+static size_t omap_iommu_unmap(struct iommu_domain *domain, unsigned long da,</div><div class='add'>+			    size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	struct omap_iommu_domain *omap_domain = domain-&gt;priv;</div><div class='ctx'> 	struct omap_iommu *oiommu = omap_domain-&gt;iommu_dev;</div><div class='ctx'> 	struct device *dev = oiommu-&gt;dev;</div><div class='del'>-	size_t unmap_size;</div><div class='del'>-</div><div class='del'>-	dev_dbg(dev, "unmapping da 0x%lx order %d\n", da, order);</div><div class='ctx'> </div><div class='del'>-	unmap_size = iopgtable_clear_entry(oiommu, da);</div><div class='add'>+	dev_dbg(dev, "unmapping da 0x%lx size %u\n", da, size);</div><div class='ctx'> </div><div class='del'>-	return unmap_size ? get_order(unmap_size) : -EINVAL;</div><div class='add'>+	return iopgtable_clear_entry(oiommu, da);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1069,6 +1060,7 @@ omap_iommu_attach_dev(struct iommu_domain *domain, struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct omap_iommu_domain *omap_domain = domain-&gt;priv;</div><div class='ctx'> 	struct omap_iommu *oiommu;</div><div class='add'>+	struct omap_iommu_arch_data *arch_data = dev-&gt;archdata.iommu;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;omap_domain-&gt;lock);</div><div class='hunk'>@@ -1081,14 +1073,14 @@ omap_iommu_attach_dev(struct iommu_domain *domain, struct device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* get a handle to and enable the omap iommu */</div><div class='del'>-	oiommu = omap_iommu_attach(dev, omap_domain-&gt;pgtable);</div><div class='add'>+	oiommu = omap_iommu_attach(arch_data-&gt;name, omap_domain-&gt;pgtable);</div><div class='ctx'> 	if (IS_ERR(oiommu)) {</div><div class='ctx'> 		ret = PTR_ERR(oiommu);</div><div class='ctx'> 		dev_err(dev, "can't get omap iommu: %d\n", ret);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	omap_domain-&gt;iommu_dev = oiommu;</div><div class='add'>+	omap_domain-&gt;iommu_dev = arch_data-&gt;iommu_dev = oiommu;</div><div class='ctx'> 	oiommu-&gt;domain = domain;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -1100,7 +1092,8 @@ static void omap_iommu_detach_dev(struct iommu_domain *domain,</div><div class='ctx'> 				 struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct omap_iommu_domain *omap_domain = domain-&gt;priv;</div><div class='del'>-	struct omap_iommu *oiommu = to_iommu(dev);</div><div class='add'>+	struct omap_iommu_arch_data *arch_data = dev-&gt;archdata.iommu;</div><div class='add'>+	struct omap_iommu *oiommu = dev_to_omap_iommu(dev);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;omap_domain-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1114,7 +1107,7 @@ static void omap_iommu_detach_dev(struct iommu_domain *domain,</div><div class='ctx'> </div><div class='ctx'> 	omap_iommu_detach(oiommu);</div><div class='ctx'> </div><div class='del'>-	omap_domain-&gt;iommu_dev = NULL;</div><div class='add'>+	omap_domain-&gt;iommu_dev = arch_data-&gt;iommu_dev = NULL;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock(&amp;omap_domain-&gt;lock);</div><div class='hunk'>@@ -1183,14 +1176,14 @@ static phys_addr_t omap_iommu_iova_to_phys(struct iommu_domain *domain,</div><div class='ctx'> 		else if (iopte_is_large(*pte))</div><div class='ctx'> 			ret = omap_iommu_translate(*pte, da, IOLARGE_MASK);</div><div class='ctx'> 		else</div><div class='del'>-			dev_err(dev, "bogus pte 0x%x", *pte);</div><div class='add'>+			dev_err(dev, "bogus pte 0x%x, da 0x%lx", *pte, da);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (iopgd_is_section(*pgd))</div><div class='ctx'> 			ret = omap_iommu_translate(*pgd, da, IOSECTION_MASK);</div><div class='ctx'> 		else if (iopgd_is_super(*pgd))</div><div class='ctx'> 			ret = omap_iommu_translate(*pgd, da, IOSUPER_MASK);</div><div class='ctx'> 		else</div><div class='del'>-			dev_err(dev, "bogus pgd 0x%x", *pgd);</div><div class='add'>+			dev_err(dev, "bogus pgd 0x%x, da 0x%lx", *pgd, da);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1211,6 +1204,7 @@ static struct iommu_ops omap_iommu_ops = {</div><div class='ctx'> 	.unmap		= omap_iommu_unmap,</div><div class='ctx'> 	.iova_to_phys	= omap_iommu_iova_to_phys,</div><div class='ctx'> 	.domain_has_cap	= omap_iommu_domain_has_cap,</div><div class='add'>+	.pgsize_bitmap	= OMAP_IOMMU_PGSIZES,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init omap_iommu_init(void)</div><div class='head'>diff --git a/drivers/iommu/omap-iovmm.c b/drivers/iommu/omap-iovmm.c<br/>index 46be456fcc00..2e10c3e0a7ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/iommu/omap-iovmm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/iommu/omap-iovmm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/iommu/omap-iovmm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/iommu/omap-iovmm.c</a></div><div class='hunk'>@@ -231,12 +231,14 @@ static struct iovm_struct *__find_iovm_area(struct omap_iommu *obj,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * omap_find_iovm_area  -  find iovma which includes @da</div><div class='add'>+ * @dev:	client device</div><div class='ctx'>  * @da:		iommu device virtual address</div><div class='ctx'>  *</div><div class='ctx'>  * Find the existing iovma starting at @da</div><div class='ctx'>  */</div><div class='del'>-struct iovm_struct *omap_find_iovm_area(struct omap_iommu *obj, u32 da)</div><div class='add'>+struct iovm_struct *omap_find_iovm_area(struct device *dev, u32 da)</div><div class='ctx'> {</div><div class='add'>+	struct omap_iommu *obj = dev_to_omap_iommu(dev);</div><div class='ctx'> 	struct iovm_struct *area;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;obj-&gt;mmap_lock);</div><div class='hunk'>@@ -343,14 +345,15 @@ static void free_iovm_area(struct omap_iommu *obj, struct iovm_struct *area)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * omap_da_to_va - convert (d) to (v)</div><div class='del'>- * @obj:	objective iommu</div><div class='add'>+ * @dev:	client device</div><div class='ctx'>  * @da:		iommu device virtual address</div><div class='ctx'>  * @va:		mpu virtual address</div><div class='ctx'>  *</div><div class='ctx'>  * Returns mpu virtual addr which corresponds to a given device virtual addr</div><div class='ctx'>  */</div><div class='del'>-void *omap_da_to_va(struct omap_iommu *obj, u32 da)</div><div class='add'>+void *omap_da_to_va(struct device *dev, u32 da)</div><div class='ctx'> {</div><div class='add'>+	struct omap_iommu *obj = dev_to_omap_iommu(dev);</div><div class='ctx'> 	void *va = NULL;</div><div class='ctx'> 	struct iovm_struct *area;</div><div class='ctx'> </div><div class='hunk'>@@ -410,7 +413,6 @@ static int map_iovm_area(struct iommu_domain *domain, struct iovm_struct *new,</div><div class='ctx'> 	unsigned int i, j;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	u32 da = new-&gt;da_start;</div><div class='del'>-	int order;</div><div class='ctx'> </div><div class='ctx'> 	if (!domain || !sgt)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -429,12 +431,10 @@ static int map_iovm_area(struct iommu_domain *domain, struct iovm_struct *new,</div><div class='ctx'> 		if (bytes_to_iopgsz(bytes) &lt; 0)</div><div class='ctx'> 			goto err_out;</div><div class='ctx'> </div><div class='del'>-		order = get_order(bytes);</div><div class='del'>-</div><div class='ctx'> 		pr_debug("%s: [%d] %08x %08x(%x)\n", __func__,</div><div class='ctx'> 			 i, da, pa, bytes);</div><div class='ctx'> </div><div class='del'>-		err = iommu_map(domain, da, pa, order, flags);</div><div class='add'>+		err = iommu_map(domain, da, pa, bytes, flags);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto err_out;</div><div class='ctx'> </div><div class='hunk'>@@ -449,10 +449,9 @@ err_out:</div><div class='ctx'> 		size_t bytes;</div><div class='ctx'> </div><div class='ctx'> 		bytes = sg-&gt;length + sg-&gt;offset;</div><div class='del'>-		order = get_order(bytes);</div><div class='ctx'> </div><div class='ctx'> 		/* ignore failures.. we're already handling one */</div><div class='del'>-		iommu_unmap(domain, da, order);</div><div class='add'>+		iommu_unmap(domain, da, bytes);</div><div class='ctx'> </div><div class='ctx'> 		da += bytes;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -467,7 +466,8 @@ static void unmap_iovm_area(struct iommu_domain *domain, struct omap_iommu *obj,</div><div class='ctx'> 	size_t total = area-&gt;da_end - area-&gt;da_start;</div><div class='ctx'> 	const struct sg_table *sgt = area-&gt;sgt;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='del'>-	int i, err;</div><div class='add'>+	int i;</div><div class='add'>+	size_t unmapped;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!sgtable_ok(sgt));</div><div class='ctx'> 	BUG_ON((!total) || !IS_ALIGNED(total, PAGE_SIZE));</div><div class='hunk'>@@ -475,13 +475,11 @@ static void unmap_iovm_area(struct iommu_domain *domain, struct omap_iommu *obj,</div><div class='ctx'> 	start = area-&gt;da_start;</div><div class='ctx'> 	for_each_sg(sgt-&gt;sgl, sg, sgt-&gt;nents, i) {</div><div class='ctx'> 		size_t bytes;</div><div class='del'>-		int order;</div><div class='ctx'> </div><div class='ctx'> 		bytes = sg-&gt;length + sg-&gt;offset;</div><div class='del'>-		order = get_order(bytes);</div><div class='ctx'> </div><div class='del'>-		err = iommu_unmap(domain, start, order);</div><div class='del'>-		if (err &lt; 0)</div><div class='add'>+		unmapped = iommu_unmap(domain, start, bytes);</div><div class='add'>+		if (unmapped &lt; bytes)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		dev_dbg(obj-&gt;dev, "%s: unmap %08x(%x) %08x\n",</div><div class='hunk'>@@ -582,16 +580,18 @@ __iommu_vmap(struct iommu_domain *domain, struct omap_iommu *obj,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * omap_iommu_vmap  -  (d)-(p)-(v) address mapper</div><div class='del'>- * @obj:	objective iommu</div><div class='add'>+ * @domain:	iommu domain</div><div class='add'>+ * @dev:	client device</div><div class='ctx'>  * @sgt:	address of scatter gather table</div><div class='ctx'>  * @flags:	iovma and page property</div><div class='ctx'>  *</div><div class='ctx'>  * Creates 1-n-1 mapping with given @sgt and returns @da.</div><div class='ctx'>  * All @sgt element must be io page size aligned.</div><div class='ctx'>  */</div><div class='del'>-u32 omap_iommu_vmap(struct iommu_domain *domain, struct omap_iommu *obj, u32 da,</div><div class='add'>+u32 omap_iommu_vmap(struct iommu_domain *domain, struct device *dev, u32 da,</div><div class='ctx'> 		const struct sg_table *sgt, u32 flags)</div><div class='ctx'> {</div><div class='add'>+	struct omap_iommu *obj = dev_to_omap_iommu(dev);</div><div class='ctx'> 	size_t bytes;</div><div class='ctx'> 	void *va = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -622,15 +622,17 @@ EXPORT_SYMBOL_GPL(omap_iommu_vmap);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * omap_iommu_vunmap  -  release virtual mapping obtained by 'omap_iommu_vmap()'</div><div class='del'>- * @obj:	objective iommu</div><div class='add'>+ * @domain:	iommu domain</div><div class='add'>+ * @dev:	client device</div><div class='ctx'>  * @da:		iommu device virtual address</div><div class='ctx'>  *</div><div class='ctx'>  * Free the iommu virtually contiguous memory area starting at</div><div class='ctx'>  * @da, which was returned by 'omap_iommu_vmap()'.</div><div class='ctx'>  */</div><div class='ctx'> struct sg_table *</div><div class='del'>-omap_iommu_vunmap(struct iommu_domain *domain, struct omap_iommu *obj, u32 da)</div><div class='add'>+omap_iommu_vunmap(struct iommu_domain *domain, struct device *dev, u32 da)</div><div class='ctx'> {</div><div class='add'>+	struct omap_iommu *obj = dev_to_omap_iommu(dev);</div><div class='ctx'> 	struct sg_table *sgt;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * 'sgt' is allocated before 'omap_iommu_vmalloc()' is called.</div><div class='hunk'>@@ -647,7 +649,7 @@ EXPORT_SYMBOL_GPL(omap_iommu_vunmap);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * omap_iommu_vmalloc  -  (d)-(p)-(v) address allocator and mapper</div><div class='del'>- * @obj:	objective iommu</div><div class='add'>+ * @dev:	client device</div><div class='ctx'>  * @da:		contiguous iommu virtual memory</div><div class='ctx'>  * @bytes:	allocation size</div><div class='ctx'>  * @flags:	iovma and page property</div><div class='hunk'>@@ -656,9 +658,10 @@ EXPORT_SYMBOL_GPL(omap_iommu_vunmap);</div><div class='ctx'>  * @da again, which might be adjusted if 'IOVMF_DA_FIXED' is not set.</div><div class='ctx'>  */</div><div class='ctx'> u32</div><div class='del'>-omap_iommu_vmalloc(struct iommu_domain *domain, struct omap_iommu *obj, u32 da,</div><div class='add'>+omap_iommu_vmalloc(struct iommu_domain *domain, struct device *dev, u32 da,</div><div class='ctx'> 						size_t bytes, u32 flags)</div><div class='ctx'> {</div><div class='add'>+	struct omap_iommu *obj = dev_to_omap_iommu(dev);</div><div class='ctx'> 	void *va;</div><div class='ctx'> 	struct sg_table *sgt;</div><div class='ctx'> </div><div class='hunk'>@@ -698,15 +701,16 @@ EXPORT_SYMBOL_GPL(omap_iommu_vmalloc);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * omap_iommu_vfree  -  release memory allocated by 'omap_iommu_vmalloc()'</div><div class='del'>- * @obj:	objective iommu</div><div class='add'>+ * @dev:	client device</div><div class='ctx'>  * @da:		iommu device virtual address</div><div class='ctx'>  *</div><div class='ctx'>  * Frees the iommu virtually continuous memory area starting at</div><div class='ctx'>  * @da, as obtained from 'omap_iommu_vmalloc()'.</div><div class='ctx'>  */</div><div class='del'>-void omap_iommu_vfree(struct iommu_domain *domain, struct omap_iommu *obj,</div><div class='add'>+void omap_iommu_vfree(struct iommu_domain *domain, struct device *dev,</div><div class='ctx'> 								const u32 da)</div><div class='ctx'> {</div><div class='add'>+	struct omap_iommu *obj = dev_to_omap_iommu(dev);</div><div class='ctx'> 	struct sg_table *sgt;</div><div class='ctx'> </div><div class='ctx'> 	sgt = unmap_vm_area(domain, obj, da, vfree,</div><div class='head'>diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c<br/>index 04231cb2f031..1793ba1b6a89 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/gigaset/i4l.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/isdn/gigaset/i4l.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/gigaset/i4l.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/isdn/gigaset/i4l.c</a></div><div class='hunk'>@@ -624,8 +624,6 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)</div><div class='ctx'> {</div><div class='ctx'> 	isdn_if *iif;</div><div class='ctx'> </div><div class='del'>-	pr_info("ISDN4Linux interface\n");</div><div class='del'>-</div><div class='ctx'> 	iif = kmalloc(sizeof *iif, GFP_KERNEL);</div><div class='ctx'> 	if (!iif) {</div><div class='ctx'> 		pr_err("out of memory\n");</div><div class='hunk'>@@ -684,6 +682,7 @@ void gigaset_isdn_unregdev(struct cardstate *cs)</div><div class='ctx'>  */</div><div class='ctx'> void gigaset_isdn_regdrv(void)</div><div class='ctx'> {</div><div class='add'>+	pr_info("ISDN4Linux interface\n");</div><div class='ctx'> 	/* nothing to do */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/isdn/hardware/avm/b1dma.c b/drivers/isdn/hardware/avm/b1dma.c<br/>index 9c8d7aa053c5..a0ed668d4d2a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/avm/b1dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/isdn/hardware/avm/b1dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/avm/b1dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/isdn/hardware/avm/b1dma.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@ MODULE_DESCRIPTION("CAPI4Linux: DMA support for active AVM cards");</div><div class='ctx'> MODULE_AUTHOR("Carsten Paeth");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static int suppress_pollack = 0;</div><div class='add'>+static bool suppress_pollack = 0;</div><div class='ctx'> module_param(suppress_pollack, bool, 0);</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------- */</div><div class='head'>diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c<br/>index d3530f6e8115..9743b24ef9d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/avm/c4.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/isdn/hardware/avm/c4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/avm/c4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/isdn/hardware/avm/c4.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@ static char *revision = "$Revision: 1.1.2.2 $";</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static int suppress_pollack;</div><div class='add'>+static bool suppress_pollack;</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id c4_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21285, PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_C4, 0, 0, (unsigned long)4 },</div><div class='head'>diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c<br/>index 71a8eb6ef71e..0e1f4d5b9774 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/mISDN/hfcsusb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/isdn/hardware/mISDN/hfcsusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/mISDN/hfcsusb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/isdn/hardware/mISDN/hfcsusb.c</a></div><div class='hunk'>@@ -2154,30 +2154,4 @@ static struct usb_driver hfcsusb_drv = {</div><div class='ctx'> 	.disconnect = hfcsusb_disconnect,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init</div><div class='del'>-hfcsusb_init(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO DRIVER_NAME " driver Rev. %s debug(0x%x) poll(%i)\n",</div><div class='del'>-	    hfcsusb_rev, debug, poll);</div><div class='del'>-</div><div class='del'>-	if (usb_register(&amp;hfcsusb_drv)) {</div><div class='del'>-		printk(KERN_INFO DRIVER_NAME</div><div class='del'>-		    ": Unable to register hfcsusb module at usb stack\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-hfcsusb_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	if (debug &amp; DBG_HFC_CALL_TRACE)</div><div class='del'>-		printk(KERN_INFO DRIVER_NAME ": %s\n", __func__);</div><div class='del'>-</div><div class='del'>-	/* unregister Hardware */</div><div class='del'>-	usb_deregister(&amp;hfcsusb_drv);	/* release our driver */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(hfcsusb_init);</div><div class='del'>-module_exit(hfcsusb_cleanup);</div><div class='add'>+module_usb_driver(hfcsusb_drv);</div><div class='head'>diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c<br/>index 26264abf1f58..f55d29d60826 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/enternow_pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/isdn/hisax/enternow_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/enternow_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/isdn/hisax/enternow_pci.c</a></div><div class='hunk'>@@ -333,7 +333,7 @@ static void __devinit en_cs_init(struct IsdnCard *card,</div><div class='ctx'> 	cs-&gt;hw.njet.isac = cs-&gt;hw.njet.base + 0xC0; // Fenster zum AMD</div><div class='ctx'> </div><div class='ctx'> 	/* Reset an */</div><div class='del'>-	cs-&gt;hw.njet.ctrl_reg = 0x07;  // geändert von 0xff</div><div class='add'>+	cs-&gt;hw.njet.ctrl_reg = 0x07;  // geändert von 0xff</div><div class='ctx'> 	outb(cs-&gt;hw.njet.ctrl_reg, cs-&gt;hw.njet.base + NETJET_CTRL);</div><div class='ctx'> 	/* 20 ms Pause */</div><div class='ctx'> 	mdelay(20);</div><div class='head'>diff --git a/drivers/isdn/i4l/Kconfig b/drivers/isdn/i4l/Kconfig<br/>index 9c6650ea848e..2302fbe70ac6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/i4l/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/isdn/i4l/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/i4l/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/isdn/i4l/Kconfig</a></div><div class='hunk'>@@ -6,7 +6,7 @@ if ISDN_I4L</div><div class='ctx'> </div><div class='ctx'> config ISDN_PPP</div><div class='ctx'> 	bool "Support synchronous PPP"</div><div class='del'>-	depends on INET</div><div class='add'>+	depends on INET &amp;&amp; NETDEVICES</div><div class='ctx'> 	select SLHC</div><div class='ctx'> 	help</div><div class='ctx'> 	  Over digital connections such as ISDN, there is no need to</div><div class='head'>diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c<br/>index ca710ab278ec..023de789f250 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/sc/init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/isdn/sc/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/sc/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/isdn/sc/init.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@ static const char *boardname[] = { "DataCommute/BRI", "DataCommute/PRI", "TeleCo</div><div class='ctx'> static unsigned int io[] = {0,0,0,0};</div><div class='ctx'> static unsigned char irq[] = {0,0,0,0};</div><div class='ctx'> static unsigned long ram[] = {0,0,0,0};</div><div class='del'>-static int do_reset = 0;</div><div class='add'>+static bool do_reset = 0;</div><div class='ctx'> </div><div class='ctx'> module_param_array(io, int, NULL, 0);</div><div class='ctx'> module_param_array(irq, int, NULL, 0);</div><div class='head'>diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig<br/>index ff203a421863..c957c344233f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/Kconfig</a></div><div class='hunk'>@@ -347,7 +347,8 @@ config LEDS_MC13783</div><div class='ctx'> config LEDS_NS2</div><div class='ctx'> 	tristate "LED support for Network Space v2 GPIO LEDs"</div><div class='ctx'> 	depends on LEDS_CLASS</div><div class='del'>-	depends on MACH_NETSPACE_V2 || MACH_INETSPACE_V2 || MACH_NETSPACE_MAX_V2 || D2NET_V2</div><div class='add'>+	depends on MACH_NETSPACE_V2 || MACH_INETSPACE_V2 || \</div><div class='add'>+		   MACH_NETSPACE_MAX_V2 || MACH_D2NET_V2</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enable support for the dual-GPIO LED found on the</div><div class='hunk'>@@ -387,6 +388,21 @@ config LEDS_RENESAS_TPU</div><div class='ctx'> 	  pin function. The latter to support brightness control.</div><div class='ctx'> 	  Brightness control is supported but hardware blinking is not.</div><div class='ctx'> </div><div class='add'>+config LEDS_TCA6507</div><div class='add'>+	tristate "LED Support for TCA6507 I2C chip"</div><div class='add'>+	depends on LEDS_CLASS &amp;&amp; I2C</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for LEDs connected to TC6507</div><div class='add'>+	  LED driver chips accessed via the I2C bus.</div><div class='add'>+	  Driver support brightness control and hardware-assisted blinking.</div><div class='add'>+</div><div class='add'>+config LEDS_MAX8997</div><div class='add'>+	tristate "LED support for MAX8997 PMIC"</div><div class='add'>+	depends on LEDS_CLASS &amp;&amp; MFD_MAX8997</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for on-chip LED drivers on</div><div class='add'>+	  MAXIM MAX8997 PMIC.</div><div class='add'>+</div><div class='ctx'> config LEDS_TRIGGERS</div><div class='ctx'> 	bool "LED Trigger support"</div><div class='ctx'> 	depends on LEDS_CLASS</div><div class='head'>diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile<br/>index e4f6bf568880..b8a9723477f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/Makefile</a></div><div class='hunk'>@@ -25,6 +25,7 @@ obj-$(CONFIG_LEDS_GPIO)			+= leds-gpio.o</div><div class='ctx'> obj-$(CONFIG_LEDS_LP3944)		+= leds-lp3944.o</div><div class='ctx'> obj-$(CONFIG_LEDS_LP5521)		+= leds-lp5521.o</div><div class='ctx'> obj-$(CONFIG_LEDS_LP5523)		+= leds-lp5523.o</div><div class='add'>+obj-$(CONFIG_LEDS_TCA6507)		+= leds-tca6507.o</div><div class='ctx'> obj-$(CONFIG_LEDS_CLEVO_MAIL)		+= leds-clevo-mail.o</div><div class='ctx'> obj-$(CONFIG_LEDS_HP6XX)		+= leds-hp6xx.o</div><div class='ctx'> obj-$(CONFIG_LEDS_FSG)			+= leds-fsg.o</div><div class='hunk'>@@ -43,6 +44,7 @@ obj-$(CONFIG_LEDS_NS2)			+= leds-ns2.o</div><div class='ctx'> obj-$(CONFIG_LEDS_NETXBIG)		+= leds-netxbig.o</div><div class='ctx'> obj-$(CONFIG_LEDS_ASIC3)		+= leds-asic3.o</div><div class='ctx'> obj-$(CONFIG_LEDS_RENESAS_TPU)		+= leds-renesas-tpu.o</div><div class='add'>+obj-$(CONFIG_LEDS_MAX8997)		+= leds-max8997.o</div><div class='ctx'> </div><div class='ctx'> # LED SPI Drivers</div><div class='ctx'> obj-$(CONFIG_LEDS_DAC124S085)		+= leds-dac124s085.o</div><div class='head'>diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c<br/>index 6d5628bb0601..0c8739c448b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/led-class.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/led-class.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/led-class.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/led-class.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='head'>diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c<br/>index 6f1ff93d7cec..46b4c766335d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/led-triggers.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/led-triggers.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/led-triggers.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/led-triggers.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='head'>diff --git a/drivers/leds/leds-88pm860x.c b/drivers/leds/leds-88pm860x.c<br/>index 0810604dc701..4ca00624bd18 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-88pm860x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-88pm860x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-88pm860x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-88pm860x.c</a></div><div class='hunk'>@@ -238,17 +238,7 @@ static struct platform_driver pm860x_led_driver = {</div><div class='ctx'> 	.remove	= pm860x_led_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit pm860x_led_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pm860x_led_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pm860x_led_init);</div><div class='del'>-</div><div class='del'>-static void __devexit pm860x_led_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pm860x_led_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(pm860x_led_exit);</div><div class='add'>+module_platform_driver(pm860x_led_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("LED driver for Marvell PM860x");</div><div class='ctx'> MODULE_AUTHOR("Haojian Zhuang &lt;haojian.zhuang@marvell.com&gt;");</div><div class='head'>diff --git a/drivers/leds/leds-adp5520.c b/drivers/leds/leds-adp5520.c<br/>index 7ba4c7b5b97e..b1400db3f839 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-adp5520.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-adp5520.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-adp5520.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-adp5520.c</a></div><div class='hunk'>@@ -213,17 +213,7 @@ static struct platform_driver adp5520_led_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(adp5520_led_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init adp5520_led_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;adp5520_led_driver);</div><div class='del'>-}</div><div class='del'>-module_init(adp5520_led_init);</div><div class='del'>-</div><div class='del'>-static void __exit adp5520_led_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;adp5520_led_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(adp5520_led_exit);</div><div class='add'>+module_platform_driver(adp5520_led_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Michael Hennerich &lt;hennerich@blackfin.uclinux.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("LEDS ADP5520(01) Driver");</div><div class='head'>diff --git a/drivers/leds/leds-ams-delta.c b/drivers/leds/leds-ams-delta.c<br/>index 8c00937bf7e7..07428357c83f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-ams-delta.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-ams-delta.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-ams-delta.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-ams-delta.c</a></div><div class='hunk'>@@ -118,18 +118,7 @@ static struct platform_driver ams_delta_led_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ams_delta_led_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ams_delta_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ams_delta_led_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ams_delta_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ams_delta_led_init);</div><div class='del'>-module_exit(ams_delta_led_exit);</div><div class='add'>+module_platform_driver(ams_delta_led_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jonathan McDowell &lt;noodles@earth.li&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Amstrad Delta LED driver");</div><div class='head'>diff --git a/drivers/leds/leds-asic3.c b/drivers/leds/leds-asic3.c<br/>index 48d9fe61bdfc..525a92492837 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-asic3.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-asic3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-asic3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-asic3.c</a></div><div class='hunk'>@@ -179,21 +179,9 @@ static struct platform_driver asic3_led_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-MODULE_ALIAS("platform:leds-asic3");</div><div class='del'>-</div><div class='del'>-static int __init asic3_led_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;asic3_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit asic3_led_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;asic3_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(asic3_led_init);</div><div class='del'>-module_exit(asic3_led_exit);</div><div class='add'>+module_platform_driver(asic3_led_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Paul Parsons &lt;lost.distance@yahoo.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("HTC ASIC3 LED driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("platform:leds-asic3");</div><div class='head'>diff --git a/drivers/leds/leds-atmel-pwm.c b/drivers/leds/leds-atmel-pwm.c<br/>index 109c875ea233..800243b6037e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-atmel-pwm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-atmel-pwm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-atmel-pwm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-atmel-pwm.c</a></div><div class='hunk'>@@ -134,29 +134,18 @@ static int __exit pwmled_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* work with hotplug and coldplug */</div><div class='del'>-MODULE_ALIAS("platform:leds-atmel-pwm");</div><div class='del'>-</div><div class='ctx'> static struct platform_driver pwmled_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name =		"leds-atmel-pwm",</div><div class='ctx'> 		.owner =	THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> 	/* REVISIT add suspend() and resume() methods */</div><div class='add'>+	.probe =	pwmled_probe,</div><div class='ctx'> 	.remove =	__exit_p(pwmled_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init modinit(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_probe(&amp;pwmled_driver, pwmled_probe);</div><div class='del'>-}</div><div class='del'>-module_init(modinit);</div><div class='del'>-</div><div class='del'>-static void __exit modexit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pwmled_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(modexit);</div><div class='add'>+module_platform_driver(pwmled_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Driver for LEDs with PWM-controlled brightness");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("platform:leds-atmel-pwm");</div><div class='head'>diff --git a/drivers/leds/leds-bd2802.c b/drivers/leds/leds-bd2802.c<br/>index ea2185531f82..591cbdf5a046 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-bd2802.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-bd2802.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-bd2802.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-bd2802.c</a></div><div class='hunk'>@@ -688,8 +688,7 @@ static int __devinit bd2802_probe(struct i2c_client *client,</div><div class='ctx'> 	i2c_set_clientdata(client, led);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure RESET GPIO (L: RESET, H: RESET cancel) */</div><div class='del'>-	gpio_request(pdata-&gt;reset_gpio, "RGB_RESETB");</div><div class='del'>-	gpio_direction_output(pdata-&gt;reset_gpio, 1);</div><div class='add'>+	gpio_request_one(pdata-&gt;reset_gpio, GPIOF_OUT_INIT_HIGH, "RGB_RESETB");</div><div class='ctx'> </div><div class='ctx'> 	/* Tacss = min 0.1ms */</div><div class='ctx'> 	udelay(100);</div><div class='hunk'>@@ -813,17 +812,7 @@ static struct i2c_driver bd2802_i2c_driver = {</div><div class='ctx'> 	.id_table	= bd2802_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init bd2802_init(void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;bd2802_i2c_driver);</div><div class='del'>-}</div><div class='del'>-module_init(bd2802_init);</div><div class='del'>-</div><div class='del'>-static void __exit bd2802_exit(void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;bd2802_i2c_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(bd2802_exit);</div><div class='add'>+module_i2c_driver(bd2802_i2c_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Kim Kyuwon &lt;q1.kim@samsung.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("BD2802 LED driver");</div><div class='head'>diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c<br/>index a498135a4e80..1ed1677c916f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-clevo-mail.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-clevo-mail.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-clevo-mail.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-clevo-mail.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@ MODULE_AUTHOR("Márton Németh &lt;nm127@freemail.hu&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Clevo mail LED driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static unsigned int __initdata nodetect;</div><div class='add'>+static bool __initdata nodetect;</div><div class='ctx'> module_param_named(nodetect, nodetect, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(nodetect, "Skip DMI hardware detection");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/leds/leds-cobalt-qube.c b/drivers/leds/leds-cobalt-qube.c<br/>index da5fb016b1a5..6a8725cc7b4d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-cobalt-qube.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-cobalt-qube.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-cobalt-qube.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-cobalt-qube.c</a></div><div class='hunk'>@@ -75,9 +75,6 @@ static int __devexit cobalt_qube_led_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* work with hotplug and coldplug */</div><div class='del'>-MODULE_ALIAS("platform:cobalt-qube-leds");</div><div class='del'>-</div><div class='ctx'> static struct platform_driver cobalt_qube_led_driver = {</div><div class='ctx'> 	.probe	= cobalt_qube_led_probe,</div><div class='ctx'> 	.remove	= __devexit_p(cobalt_qube_led_remove),</div><div class='hunk'>@@ -87,19 +84,9 @@ static struct platform_driver cobalt_qube_led_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init cobalt_qube_led_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;cobalt_qube_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cobalt_qube_led_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;cobalt_qube_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(cobalt_qube_led_init);</div><div class='del'>-module_exit(cobalt_qube_led_exit);</div><div class='add'>+module_platform_driver(cobalt_qube_led_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("Front LED support for Cobalt Server");</div><div class='ctx'> MODULE_AUTHOR("Florian Fainelli &lt;florian@openwrt.org&gt;");</div><div class='add'>+MODULE_ALIAS("platform:cobalt-qube-leds");</div><div class='head'>diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c<br/>index f28931cf6781..d9cd73ebd6c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-da903x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-da903x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-da903x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-da903x.c</a></div><div class='hunk'>@@ -158,17 +158,7 @@ static struct platform_driver da903x_led_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(da903x_led_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init da903x_led_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;da903x_led_driver);</div><div class='del'>-}</div><div class='del'>-module_init(da903x_led_init);</div><div class='del'>-</div><div class='del'>-static void __exit da903x_led_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;da903x_led_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(da903x_led_exit);</div><div class='add'>+module_platform_driver(da903x_led_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("LEDs driver for Dialog Semiconductor DA9030/DA9034");</div><div class='ctx'> MODULE_AUTHOR("Eric Miao &lt;eric.miao@marvell.com&gt;"</div><div class='head'>diff --git a/drivers/leds/leds-dac124s085.c b/drivers/leds/leds-dac124s085.c<br/>index 31cf0d60a9a5..d56c14269ff0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-dac124s085.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-dac124s085.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-dac124s085.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-dac124s085.c</a></div><div class='hunk'>@@ -131,18 +131,7 @@ static struct spi_driver dac124s085_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init dac124s085_leds_init(void)</div><div class='del'>-{</div><div class='del'>-	return spi_register_driver(&amp;dac124s085_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit dac124s085_leds_exit(void)</div><div class='del'>-{</div><div class='del'>-	spi_unregister_driver(&amp;dac124s085_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(dac124s085_leds_init);</div><div class='del'>-module_exit(dac124s085_leds_exit);</div><div class='add'>+module_spi_driver(dac124s085_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Guennadi Liakhovetski &lt;lg@denx.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("DAC124S085 LED driver");</div><div class='head'>diff --git a/drivers/leds/leds-fsg.c b/drivers/leds/leds-fsg.c<br/>index 49aceffaa5b6..b9053fa6e253 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-fsg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-fsg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-fsg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-fsg.c</a></div><div class='hunk'>@@ -224,20 +224,7 @@ static struct platform_driver fsg_led_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init fsg_led_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;fsg_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit fsg_led_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;fsg_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-module_init(fsg_led_init);</div><div class='del'>-module_exit(fsg_led_exit);</div><div class='add'>+module_platform_driver(fsg_led_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Rod Whitby &lt;rod@whitby.id.au&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Freecom FSG-3 LED driver");</div><div class='head'>diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c<br/>index 399a86f2013a..7df74cb97e70 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-gpio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-gpio.c</a></div><div class='hunk'>@@ -293,21 +293,9 @@ static struct platform_driver gpio_led_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-MODULE_ALIAS("platform:leds-gpio");</div><div class='del'>-</div><div class='del'>-static int __init gpio_led_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;gpio_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit gpio_led_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;gpio_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(gpio_led_init);</div><div class='del'>-module_exit(gpio_led_exit);</div><div class='add'>+module_platform_driver(gpio_led_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Raphael Assenat &lt;raph@8d.com&gt;, Trent Piepho &lt;tpiepho@freescale.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("GPIO LED driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("platform:leds-gpio");</div><div class='head'>diff --git a/drivers/leds/leds-hp6xx.c b/drivers/leds/leds-hp6xx.c<br/>index bcfbd3a60eab..366b6055e330 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-hp6xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-hp6xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-hp6xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-hp6xx.c</a></div><div class='hunk'>@@ -79,9 +79,6 @@ static int hp6xxled_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* work with hotplug and coldplug */</div><div class='del'>-MODULE_ALIAS("platform:hp6xx-led");</div><div class='del'>-</div><div class='ctx'> static struct platform_driver hp6xxled_driver = {</div><div class='ctx'> 	.probe		= hp6xxled_probe,</div><div class='ctx'> 	.remove		= hp6xxled_remove,</div><div class='hunk'>@@ -91,19 +88,9 @@ static struct platform_driver hp6xxled_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init hp6xxled_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;hp6xxled_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit hp6xxled_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;hp6xxled_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(hp6xxled_init);</div><div class='del'>-module_exit(hp6xxled_exit);</div><div class='add'>+module_platform_driver(hp6xxled_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Kristoffer Ericson &lt;kristoffer.ericson@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("HP Jornada 6xx LED driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("platform:hp6xx-led");</div><div class='head'>diff --git a/drivers/leds/leds-lm3530.c b/drivers/leds/leds-lm3530.c<br/>index 0630e4f4b286..45e6878d7374 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-lm3530.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-lm3530.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-lm3530.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-lm3530.c</a></div><div class='hunk'>@@ -457,18 +457,7 @@ static struct i2c_driver lm3530_i2c_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init lm3530_init(void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;lm3530_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit lm3530_exit(void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;lm3530_i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(lm3530_init);</div><div class='del'>-module_exit(lm3530_exit);</div><div class='add'>+module_i2c_driver(lm3530_i2c_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Back Light driver for LM3530");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/leds/leds-lp3944.c b/drivers/leds/leds-lp3944.c<br/>index 9010c054615e..b8f9f0a5d431 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-lp3944.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-lp3944.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-lp3944.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-lp3944.c</a></div><div class='hunk'>@@ -453,18 +453,7 @@ static struct i2c_driver lp3944_driver = {</div><div class='ctx'> 	.id_table = lp3944_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init lp3944_module_init(void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;lp3944_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit lp3944_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;lp3944_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(lp3944_module_init);</div><div class='del'>-module_exit(lp3944_module_exit);</div><div class='add'>+module_i2c_driver(lp3944_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Antonio Ospite &lt;ospite@studenti.unina.it&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("LP3944 Fun Light Chip");</div><div class='head'>diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c<br/>index cb641f1b3342..d62a7982a5e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-lp5521.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-lp5521.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-lp5521.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-lp5521.c</a></div><div class='hunk'>@@ -797,25 +797,7 @@ static struct i2c_driver lp5521_driver = {</div><div class='ctx'> 	.id_table	= lp5521_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init lp5521_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = i2c_add_driver(&amp;lp5521_driver);</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		printk(KERN_ALERT "Adding lp5521 driver failed\n");</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit lp5521_exit(void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;lp5521_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(lp5521_init);</div><div class='del'>-module_exit(lp5521_exit);</div><div class='add'>+module_i2c_driver(lp5521_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Mathias Nyman, Yuri Zaporozhets, Samu Onkalo");</div><div class='ctx'> MODULE_DESCRIPTION("LP5521 LED engine");</div><div class='head'>diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c<br/>index 5971e309b234..73e791ae7259 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-lp5523.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-lp5523.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-lp5523.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-lp5523.c</a></div><div class='hunk'>@@ -870,8 +870,6 @@ static int __devinit lp5523_init_led(struct lp5523_led *led, struct device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver lp5523_driver;</div><div class='del'>-</div><div class='ctx'> static int __devinit lp5523_probe(struct i2c_client *client,</div><div class='ctx'> 			const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='hunk'>@@ -1021,25 +1019,7 @@ static struct i2c_driver lp5523_driver = {</div><div class='ctx'> 	.id_table	= lp5523_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init lp5523_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = i2c_add_driver(&amp;lp5523_driver);</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		printk(KERN_ALERT "Adding lp5523 driver failed\n");</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit lp5523_exit(void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;lp5523_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(lp5523_init);</div><div class='del'>-module_exit(lp5523_exit);</div><div class='add'>+module_i2c_driver(lp5523_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Mathias Nyman &lt;mathias.nyman@nokia.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("LP5523 LED engine");</div><div class='head'>diff --git a/drivers/leds/leds-lt3593.c b/drivers/leds/leds-lt3593.c<br/>index 53f67b8ce55d..e311a96c4469 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-lt3593.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-lt3593.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-lt3593.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-lt3593.c</a></div><div class='hunk'>@@ -199,21 +199,9 @@ static struct platform_driver lt3593_led_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-MODULE_ALIAS("platform:leds-lt3593");</div><div class='del'>-</div><div class='del'>-static int __init lt3593_led_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;lt3593_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit lt3593_led_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;lt3593_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(lt3593_led_init);</div><div class='del'>-module_exit(lt3593_led_exit);</div><div class='add'>+module_platform_driver(lt3593_led_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Daniel Mack &lt;daniel@caiaq.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("LED driver for LT3593 controllers");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("platform:leds-lt3593");</div><div class='head'>diff --git a/drivers/leds/leds-max8997.c b/drivers/leds/leds-max8997.c<br/>new file mode 100644<br/>index 000000000000..f4c0e37fad1e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-max8997.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-max8997.c</a></div><div class='hunk'>@@ -0,0 +1,372 @@</div><div class='add'>+/*</div><div class='add'>+ * leds-max8997.c - LED class driver for MAX8997 LEDs.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Samsung Electronics</div><div class='add'>+ * Donggeun Kim &lt;dg77.kim@samsung.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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/mfd/max8997.h&gt;</div><div class='add'>+#include &lt;linux/mfd/max8997-private.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#define MAX8997_LED_FLASH_SHIFT			3</div><div class='add'>+#define MAX8997_LED_FLASH_CUR_MASK		0xf8</div><div class='add'>+#define MAX8997_LED_MOVIE_SHIFT			4</div><div class='add'>+#define MAX8997_LED_MOVIE_CUR_MASK		0xf0</div><div class='add'>+</div><div class='add'>+#define MAX8997_LED_FLASH_MAX_BRIGHTNESS	0x1f</div><div class='add'>+#define MAX8997_LED_MOVIE_MAX_BRIGHTNESS	0xf</div><div class='add'>+#define MAX8997_LED_NONE_MAX_BRIGHTNESS		0</div><div class='add'>+</div><div class='add'>+#define MAX8997_LED0_FLASH_MASK			0x1</div><div class='add'>+#define MAX8997_LED0_FLASH_PIN_MASK		0x5</div><div class='add'>+#define MAX8997_LED0_MOVIE_MASK			0x8</div><div class='add'>+#define MAX8997_LED0_MOVIE_PIN_MASK		0x28</div><div class='add'>+</div><div class='add'>+#define MAX8997_LED1_FLASH_MASK			0x2</div><div class='add'>+#define MAX8997_LED1_FLASH_PIN_MASK		0x6</div><div class='add'>+#define MAX8997_LED1_MOVIE_MASK			0x10</div><div class='add'>+#define MAX8997_LED1_MOVIE_PIN_MASK		0x30</div><div class='add'>+</div><div class='add'>+#define MAX8997_LED_BOOST_ENABLE_MASK		(1 &lt;&lt; 6)</div><div class='add'>+</div><div class='add'>+struct max8997_led {</div><div class='add'>+	struct max8997_dev *iodev;</div><div class='add'>+	struct led_classdev cdev;</div><div class='add'>+	bool enabled;</div><div class='add'>+	int id;</div><div class='add'>+	enum max8997_led_mode led_mode;</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void max8997_led_clear_mode(struct max8997_led *led,</div><div class='add'>+			enum max8997_led_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = led-&gt;iodev-&gt;i2c;</div><div class='add'>+	u8 val = 0, mask = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case MAX8997_FLASH_MODE:</div><div class='add'>+		mask = led-&gt;id ?</div><div class='add'>+		      MAX8997_LED1_FLASH_MASK : MAX8997_LED0_FLASH_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_MOVIE_MODE:</div><div class='add'>+		mask = led-&gt;id ?</div><div class='add'>+		      MAX8997_LED1_MOVIE_MASK : MAX8997_LED0_MOVIE_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_FLASH_PIN_CONTROL_MODE:</div><div class='add'>+		mask = led-&gt;id ?</div><div class='add'>+		      MAX8997_LED1_FLASH_PIN_MASK : MAX8997_LED0_FLASH_PIN_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_MOVIE_PIN_CONTROL_MODE:</div><div class='add'>+		mask = led-&gt;id ?</div><div class='add'>+		      MAX8997_LED1_MOVIE_PIN_MASK : MAX8997_LED0_MOVIE_PIN_MASK;</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 (mask) {</div><div class='add'>+		ret = max8997_update_reg(client,</div><div class='add'>+				MAX8997_REG_LEN_CNTL, val, mask);</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_err(led-&gt;iodev-&gt;dev,</div><div class='add'>+				"failed to update register(%d)\n", ret);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void max8997_led_set_mode(struct max8997_led *led,</div><div class='add'>+			enum max8997_led_mode mode)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct i2c_client *client = led-&gt;iodev-&gt;i2c;</div><div class='add'>+	u8 mask = 0;</div><div class='add'>+</div><div class='add'>+	/* First, clear the previous mode */</div><div class='add'>+	max8997_led_clear_mode(led, led-&gt;led_mode);</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case MAX8997_FLASH_MODE:</div><div class='add'>+		mask = led-&gt;id ?</div><div class='add'>+		      MAX8997_LED1_FLASH_MASK : MAX8997_LED0_FLASH_MASK;</div><div class='add'>+		led-&gt;cdev.max_brightness = MAX8997_LED_FLASH_MAX_BRIGHTNESS;</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_MOVIE_MODE:</div><div class='add'>+		mask = led-&gt;id ?</div><div class='add'>+		      MAX8997_LED1_MOVIE_MASK : MAX8997_LED0_MOVIE_MASK;</div><div class='add'>+		led-&gt;cdev.max_brightness = MAX8997_LED_MOVIE_MAX_BRIGHTNESS;</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_FLASH_PIN_CONTROL_MODE:</div><div class='add'>+		mask = led-&gt;id ?</div><div class='add'>+		      MAX8997_LED1_FLASH_PIN_MASK : MAX8997_LED0_FLASH_PIN_MASK;</div><div class='add'>+		led-&gt;cdev.max_brightness = MAX8997_LED_FLASH_MAX_BRIGHTNESS;</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_MOVIE_PIN_CONTROL_MODE:</div><div class='add'>+		mask = led-&gt;id ?</div><div class='add'>+		      MAX8997_LED1_MOVIE_PIN_MASK : MAX8997_LED0_MOVIE_PIN_MASK;</div><div class='add'>+		led-&gt;cdev.max_brightness = MAX8997_LED_MOVIE_MAX_BRIGHTNESS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		led-&gt;cdev.max_brightness = MAX8997_LED_NONE_MAX_BRIGHTNESS;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mask) {</div><div class='add'>+		ret = max8997_update_reg(client,</div><div class='add'>+				MAX8997_REG_LEN_CNTL, mask, mask);</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_err(led-&gt;iodev-&gt;dev,</div><div class='add'>+				"failed to update register(%d)\n", ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	led-&gt;led_mode = mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void max8997_led_enable(struct max8997_led *led, bool enable)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct i2c_client *client = led-&gt;iodev-&gt;i2c;</div><div class='add'>+	u8 val = 0, mask = MAX8997_LED_BOOST_ENABLE_MASK;</div><div class='add'>+</div><div class='add'>+	if (led-&gt;enabled == enable)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	val = enable ? MAX8997_LED_BOOST_ENABLE_MASK : 0;</div><div class='add'>+</div><div class='add'>+	ret = max8997_update_reg(client, MAX8997_REG_BOOST_CNTL, val, mask);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(led-&gt;iodev-&gt;dev,</div><div class='add'>+			"failed to update register(%d)\n", ret);</div><div class='add'>+</div><div class='add'>+	led-&gt;enabled = enable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void max8997_led_set_current(struct max8997_led *led,</div><div class='add'>+				enum led_brightness value)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct i2c_client *client = led-&gt;iodev-&gt;i2c;</div><div class='add'>+	u8 val = 0, mask = 0, reg = 0;</div><div class='add'>+</div><div class='add'>+	switch (led-&gt;led_mode) {</div><div class='add'>+	case MAX8997_FLASH_MODE:</div><div class='add'>+	case MAX8997_FLASH_PIN_CONTROL_MODE:</div><div class='add'>+		val = value &lt;&lt; MAX8997_LED_FLASH_SHIFT;</div><div class='add'>+		mask = MAX8997_LED_FLASH_CUR_MASK;</div><div class='add'>+		reg = led-&gt;id ? MAX8997_REG_FLASH2_CUR : MAX8997_REG_FLASH1_CUR;</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_MOVIE_MODE:</div><div class='add'>+	case MAX8997_MOVIE_PIN_CONTROL_MODE:</div><div class='add'>+		val = value &lt;&lt; MAX8997_LED_MOVIE_SHIFT;</div><div class='add'>+		mask = MAX8997_LED_MOVIE_CUR_MASK;</div><div class='add'>+		reg = MAX8997_REG_MOVIE_CUR;</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 (mask) {</div><div class='add'>+		ret = max8997_update_reg(client, reg, val, mask);</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_err(led-&gt;iodev-&gt;dev,</div><div class='add'>+				"failed to update register(%d)\n", ret);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void max8997_led_brightness_set(struct led_classdev *led_cdev,</div><div class='add'>+				enum led_brightness value)</div><div class='add'>+{</div><div class='add'>+	struct max8997_led *led =</div><div class='add'>+			container_of(led_cdev, struct max8997_led, cdev);</div><div class='add'>+</div><div class='add'>+	if (value) {</div><div class='add'>+		max8997_led_set_current(led, value);</div><div class='add'>+		max8997_led_enable(led, true);</div><div class='add'>+	} else {</div><div class='add'>+		max8997_led_set_current(led, value);</div><div class='add'>+		max8997_led_enable(led, false);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t max8997_led_show_mode(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct led_classdev *led_cdev = dev_get_drvdata(dev);</div><div class='add'>+	struct max8997_led *led =</div><div class='add'>+			container_of(led_cdev, struct max8997_led, cdev);</div><div class='add'>+	ssize_t ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;led-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	switch (led-&gt;led_mode) {</div><div class='add'>+	case MAX8997_FLASH_MODE:</div><div class='add'>+		ret += sprintf(buf, "FLASH\n");</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_MOVIE_MODE:</div><div class='add'>+		ret += sprintf(buf, "MOVIE\n");</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_FLASH_PIN_CONTROL_MODE:</div><div class='add'>+		ret += sprintf(buf, "FLASH_PIN_CONTROL\n");</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_MOVIE_PIN_CONTROL_MODE:</div><div class='add'>+		ret += sprintf(buf, "MOVIE_PIN_CONTROL\n");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret += sprintf(buf, "NONE\n");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;led-&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 ssize_t max8997_led_store_mode(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='add'>+				const char *buf, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct led_classdev *led_cdev = dev_get_drvdata(dev);</div><div class='add'>+	struct max8997_led *led =</div><div class='add'>+			container_of(led_cdev, struct max8997_led, cdev);</div><div class='add'>+	enum max8997_led_mode mode;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;led-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!strncmp(buf, "FLASH_PIN_CONTROL", 17))</div><div class='add'>+		mode = MAX8997_FLASH_PIN_CONTROL_MODE;</div><div class='add'>+	else if (!strncmp(buf, "MOVIE_PIN_CONTROL", 17))</div><div class='add'>+		mode = MAX8997_MOVIE_PIN_CONTROL_MODE;</div><div class='add'>+	else if (!strncmp(buf, "FLASH", 5))</div><div class='add'>+		mode = MAX8997_FLASH_MODE;</div><div class='add'>+	else if (!strncmp(buf, "MOVIE", 5))</div><div class='add'>+		mode = MAX8997_MOVIE_MODE;</div><div class='add'>+	else</div><div class='add'>+		mode = MAX8997_NONE;</div><div class='add'>+</div><div class='add'>+	max8997_led_set_mode(led, mode);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;led-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(mode, 0644, max8997_led_show_mode, max8997_led_store_mode);</div><div class='add'>+</div><div class='add'>+static int __devinit max8997_led_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct max8997_dev *iodev = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='add'>+	struct max8997_platform_data *pdata = dev_get_platdata(iodev-&gt;dev);</div><div class='add'>+	struct max8997_led *led;</div><div class='add'>+	char name[20];</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (pdata == NULL) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "no platform data\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	led = kzalloc(sizeof(*led), GFP_KERNEL);</div><div class='add'>+	if (led == NULL) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	led-&gt;id = pdev-&gt;id;</div><div class='add'>+	snprintf(name, sizeof(name), "max8997-led%d", pdev-&gt;id);</div><div class='add'>+</div><div class='add'>+	led-&gt;cdev.name = name;</div><div class='add'>+	led-&gt;cdev.brightness_set = max8997_led_brightness_set;</div><div class='add'>+	led-&gt;cdev.flags |= LED_CORE_SUSPENDRESUME;</div><div class='add'>+	led-&gt;cdev.brightness = 0;</div><div class='add'>+	led-&gt;iodev = iodev;</div><div class='add'>+</div><div class='add'>+	/* initialize mode and brightness according to platform_data */</div><div class='add'>+	if (pdata-&gt;led_pdata) {</div><div class='add'>+		u8 mode = 0, brightness = 0;</div><div class='add'>+</div><div class='add'>+		mode = pdata-&gt;led_pdata-&gt;mode[led-&gt;id];</div><div class='add'>+		brightness = pdata-&gt;led_pdata-&gt;brightness[led-&gt;id];</div><div class='add'>+</div><div class='add'>+		max8997_led_set_mode(led, pdata-&gt;led_pdata-&gt;mode[led-&gt;id]);</div><div class='add'>+</div><div class='add'>+		if (brightness &gt; led-&gt;cdev.max_brightness)</div><div class='add'>+			brightness = led-&gt;cdev.max_brightness;</div><div class='add'>+		max8997_led_set_current(led, brightness);</div><div class='add'>+		led-&gt;cdev.brightness = brightness;</div><div class='add'>+	} else {</div><div class='add'>+		max8997_led_set_mode(led, MAX8997_NONE);</div><div class='add'>+		max8997_led_set_current(led, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;led-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, led);</div><div class='add'>+</div><div class='add'>+	ret = led_classdev_register(&amp;pdev-&gt;dev, &amp;led-&gt;cdev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_led;</div><div class='add'>+</div><div class='add'>+	ret = device_create_file(led-&gt;cdev.dev, &amp;dev_attr_mode);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"failed to create file: %d\n", ret);</div><div class='add'>+		goto err_file;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_file:</div><div class='add'>+	led_classdev_unregister(&amp;led-&gt;cdev);</div><div class='add'>+err_led:</div><div class='add'>+	kfree(led);</div><div class='add'>+err_mem:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit max8997_led_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct max8997_led *led = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	device_remove_file(led-&gt;cdev.dev, &amp;dev_attr_mode);</div><div class='add'>+	led_classdev_unregister(&amp;led-&gt;cdev);</div><div class='add'>+	kfree(led);</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 max8997_led_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name  = "max8997-led",</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe  = max8997_led_probe,</div><div class='add'>+	.remove = __devexit_p(max8997_led_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init max8997_led_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;max8997_led_driver);</div><div class='add'>+}</div><div class='add'>+module_init(max8997_led_init);</div><div class='add'>+</div><div class='add'>+static void __exit max8997_led_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;max8997_led_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(max8997_led_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Donggeun Kim &lt;dg77.kim@samsung.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("MAX8997 LED driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("platform:max8997-led");</div><div class='head'>diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c<br/>index b3393a9f2139..8bc491541550 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-mc13783.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-mc13783.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-mc13783.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-mc13783.c</a></div><div class='hunk'>@@ -275,7 +275,7 @@ static int __devinit mc13783_led_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;num_leds &lt; 1 || pdata-&gt;num_leds &gt; MC13783_LED_MAX) {</div><div class='add'>+	if (pdata-&gt;num_leds &lt; 1 || pdata-&gt;num_leds &gt; (MC13783_LED_MAX + 1)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Invalid led count %d\n", pdata-&gt;num_leds);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -385,17 +385,7 @@ static struct platform_driver mc13783_led_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(mc13783_led_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init mc13783_led_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;mc13783_led_driver);</div><div class='del'>-}</div><div class='del'>-module_init(mc13783_led_init);</div><div class='del'>-</div><div class='del'>-static void __exit mc13783_led_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;mc13783_led_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(mc13783_led_exit);</div><div class='add'>+module_platform_driver(mc13783_led_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("LEDs driver for Freescale MC13783 PMIC");</div><div class='ctx'> MODULE_AUTHOR("Philippe Retornaz &lt;philippe.retornaz@epfl.ch&gt;");</div><div class='head'>diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c<br/>index f2e51c134399..d8433f2d53bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-netxbig.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-netxbig.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-netxbig.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-netxbig.c</a></div><div class='hunk'>@@ -81,35 +81,23 @@ static int __devinit gpio_ext_init(struct netxbig_gpio_ext *gpio_ext)</div><div class='ctx'> </div><div class='ctx'> 	/* Configure address GPIOs. */</div><div class='ctx'> 	for (i = 0; i &lt; gpio_ext-&gt;num_addr; i++) {</div><div class='del'>-		err = gpio_request(gpio_ext-&gt;addr[i], "GPIO extension addr");</div><div class='add'>+		err = gpio_request_one(gpio_ext-&gt;addr[i], GPIOF_OUT_INIT_LOW,</div><div class='add'>+				       "GPIO extension addr");</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto err_free_addr;</div><div class='del'>-		err = gpio_direction_output(gpio_ext-&gt;addr[i], 0);</div><div class='del'>-		if (err) {</div><div class='del'>-			gpio_free(gpio_ext-&gt;addr[i]);</div><div class='del'>-			goto err_free_addr;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Configure data GPIOs. */</div><div class='ctx'> 	for (i = 0; i &lt; gpio_ext-&gt;num_data; i++) {</div><div class='del'>-		err = gpio_request(gpio_ext-&gt;data[i], "GPIO extension data");</div><div class='add'>+		err = gpio_request_one(gpio_ext-&gt;data[i], GPIOF_OUT_INIT_LOW,</div><div class='add'>+				   "GPIO extension data");</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto err_free_data;</div><div class='del'>-		err = gpio_direction_output(gpio_ext-&gt;data[i], 0);</div><div class='del'>-		if (err) {</div><div class='del'>-			gpio_free(gpio_ext-&gt;data[i]);</div><div class='del'>-			goto err_free_data;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Configure "enable select" GPIO. */</div><div class='del'>-	err = gpio_request(gpio_ext-&gt;enable, "GPIO extension enable");</div><div class='add'>+	err = gpio_request_one(gpio_ext-&gt;enable, GPIOF_OUT_INIT_LOW,</div><div class='add'>+			       "GPIO extension enable");</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_free_data;</div><div class='del'>-	err = gpio_direction_output(gpio_ext-&gt;enable, 0);</div><div class='del'>-	if (err) {</div><div class='del'>-		gpio_free(gpio_ext-&gt;enable);</div><div class='del'>-		goto err_free_data;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -429,21 +417,10 @@ static struct platform_driver netxbig_led_driver = {</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-MODULE_ALIAS("platform:leds-netxbig");</div><div class='ctx'> </div><div class='del'>-static int __init netxbig_led_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;netxbig_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit netxbig_led_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;netxbig_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(netxbig_led_init);</div><div class='del'>-module_exit(netxbig_led_exit);</div><div class='add'>+module_platform_driver(netxbig_led_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Simon Guinot &lt;sguinot@lacie.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("LED driver for LaCie xBig Network boards");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("platform:leds-netxbig");</div><div class='head'>diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c<br/>index 37b7d0cfe586..2f0a14421a73 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-ns2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-ns2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-ns2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-ns2.c</a></div><div class='hunk'>@@ -323,21 +323,10 @@ static struct platform_driver ns2_led_driver = {</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-MODULE_ALIAS("platform:leds-ns2");</div><div class='del'>-</div><div class='del'>-static int __init ns2_led_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ns2_led_driver);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void __exit ns2_led_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ns2_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ns2_led_init);</div><div class='del'>-module_exit(ns2_led_exit);</div><div class='add'>+module_platform_driver(ns2_led_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Simon Guinot &lt;sguinot@lacie.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Network Space v2 LED driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("platform:leds-ns2");</div><div class='head'>diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c<br/>index a2c874623e35..ceccab44b5b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-pca9532.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-pca9532.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-pca9532.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-pca9532.c</a></div><div class='hunk'>@@ -489,20 +489,8 @@ static int pca9532_remove(struct i2c_client *client)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init pca9532_init(void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;pca9532_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit pca9532_exit(void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;pca9532_driver);</div><div class='del'>-}</div><div class='add'>+module_i2c_driver(pca9532_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Riku Voipio");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("PCA 9532 LED dimmer");</div><div class='del'>-</div><div class='del'>-module_init(pca9532_init);</div><div class='del'>-module_exit(pca9532_exit);</div><div class='del'>-</div><div class='head'>diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c<br/>index 66aa3e8e786f..dcc3bc3d38db 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-pca955x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-pca955x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-pca955x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-pca955x.c</a></div><div class='hunk'>@@ -371,18 +371,7 @@ static struct i2c_driver pca955x_driver = {</div><div class='ctx'> 	.id_table = pca955x_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pca955x_leds_init(void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;pca955x_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit pca955x_leds_exit(void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;pca955x_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(pca955x_leds_init);</div><div class='del'>-module_exit(pca955x_leds_exit);</div><div class='add'>+module_i2c_driver(pca955x_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Nate Case &lt;ncase@xes-inc.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("PCA955x LED driver");</div><div class='head'>diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c<br/>index 666daf77872e..3ed92f34bd44 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-pwm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-pwm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-pwm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-pwm.c</a></div><div class='hunk'>@@ -135,18 +135,7 @@ static struct platform_driver led_pwm_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init led_pwm_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;led_pwm_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit led_pwm_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;led_pwm_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(led_pwm_init);</div><div class='del'>-module_exit(led_pwm_exit);</div><div class='add'>+module_platform_driver(led_pwm_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Luotao Fu &lt;l.fu@pengutronix.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("PWM LED driver for PXA");</div><div class='head'>diff --git a/drivers/leds/leds-rb532.c b/drivers/leds/leds-rb532.c<br/>index c3525f37f73d..a7815b6cd856 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-rb532.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-rb532.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-rb532.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-rb532.c</a></div><div class='hunk'>@@ -57,21 +57,9 @@ static struct platform_driver rb532_led_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init rb532_led_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;rb532_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit rb532_led_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;rb532_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(rb532_led_init);</div><div class='del'>-module_exit(rb532_led_exit);</div><div class='del'>-</div><div class='del'>-MODULE_ALIAS("platform:rb532-led");</div><div class='add'>+module_platform_driver(rb532_led_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("User LED support for Routerboard532");</div><div class='ctx'> MODULE_AUTHOR("Phil Sutter &lt;n0-1@freewrt.org&gt;");</div><div class='add'>+MODULE_ALIAS("platform:rb532-led");</div><div class='head'>diff --git a/drivers/leds/leds-regulator.c b/drivers/leds/leds-regulator.c<br/>index 8497f56f8e46..df7e963bddd3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-regulator.c</a></div><div class='hunk'>@@ -229,17 +229,7 @@ static struct platform_driver regulator_led_driver = {</div><div class='ctx'> 	.remove = __devexit_p(regulator_led_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init regulator_led_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;regulator_led_driver);</div><div class='del'>-}</div><div class='del'>-module_init(regulator_led_init);</div><div class='del'>-</div><div class='del'>-static void __exit regulator_led_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;regulator_led_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(regulator_led_exit);</div><div class='add'>+module_platform_driver(regulator_led_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Antonio Ospite &lt;ospite@studenti.unina.it&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Regulator driven LED driver");</div><div class='head'>diff --git a/drivers/leds/leds-renesas-tpu.c b/drivers/leds/leds-renesas-tpu.c<br/>index 3ee540eb127e..32fe337d5c68 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-renesas-tpu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-renesas-tpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-renesas-tpu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-renesas-tpu.c</a></div><div class='hunk'>@@ -339,18 +339,7 @@ static struct platform_driver r_tpu_device_driver = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init r_tpu_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;r_tpu_device_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit r_tpu_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;r_tpu_device_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(r_tpu_init);</div><div class='del'>-module_exit(r_tpu_exit);</div><div class='add'>+module_platform_driver(r_tpu_device_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Magnus Damm");</div><div class='ctx'> MODULE_DESCRIPTION("Renesas TPU LED Driver");</div><div class='head'>diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c<br/>index 29f8b0f0e2c6..bd0a5ed49c42 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-s3c24xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-s3c24xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-s3c24xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-s3c24xx.c</a></div><div class='hunk'>@@ -121,18 +121,7 @@ static struct platform_driver s3c24xx_led_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init s3c24xx_led_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;s3c24xx_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit s3c24xx_led_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;s3c24xx_led_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(s3c24xx_led_init);</div><div class='del'>-module_exit(s3c24xx_led_exit);</div><div class='add'>+module_platform_driver(s3c24xx_led_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Ben Dooks &lt;ben@simtec.co.uk&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("S3C24XX LED driver");</div><div class='head'>diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c<br/>index 614ebebaaa28..57371e1485ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-ss4200.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-ss4200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-ss4200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-ss4200.c</a></div><div class='hunk'>@@ -79,7 +79,7 @@ static int __init ss4200_led_dmi_callback(const struct dmi_system_id *id)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int __initdata nodetect;</div><div class='add'>+static bool __initdata nodetect;</div><div class='ctx'> module_param_named(nodetect, nodetect, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/leds/leds-tca6507.c b/drivers/leds/leds-tca6507.c<br/>new file mode 100644<br/>index 000000000000..133f89fb7071<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-tca6507.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-tca6507.c</a></div><div class='hunk'>@@ -0,0 +1,779 @@</div><div class='add'>+/*</div><div class='add'>+ * leds-tca6507</div><div class='add'>+ *</div><div class='add'>+ * The TCA6507 is a programmable LED controller that can drive 7</div><div class='add'>+ * separate lines either by holding them low, or by pulsing them</div><div class='add'>+ * with modulated width.</div><div class='add'>+ * The modulation can be varied in a simple pattern to produce a blink or</div><div class='add'>+ * double-blink.</div><div class='add'>+ *</div><div class='add'>+ * This driver can configure each line either as a 'GPIO' which is out-only</div><div class='add'>+ * (no pull-up) or as an LED with variable brightness and hardware-assisted</div><div class='add'>+ * blinking.</div><div class='add'>+ *</div><div class='add'>+ * Apart from OFF and ON there are three programmable brightness levels which</div><div class='add'>+ * can be programmed from 0 to 15 and indicate how many 500usec intervals in</div><div class='add'>+ * each 8msec that the led is 'on'.  The levels are named MASTER, BANK0 and</div><div class='add'>+ * BANK1.</div><div class='add'>+ *</div><div class='add'>+ * There are two different blink rates that can be programmed, each with</div><div class='add'>+ * separate time for rise, on, fall, off and second-off.  Thus if 3 or more</div><div class='add'>+ * different non-trivial rates are required, software must be used for the extra</div><div class='add'>+ * rates. The two different blink rates must align with the two levels BANK0 and</div><div class='add'>+ * BANK1.</div><div class='add'>+ * This driver does not support double-blink so 'second-off' always matches</div><div class='add'>+ * 'off'.</div><div class='add'>+ *</div><div class='add'>+ * Only 16 different times can be programmed in a roughly logarithmic scale from</div><div class='add'>+ * 64ms to 16320ms.  To be precise the possible times are:</div><div class='add'>+ *    0, 64, 128, 192, 256, 384, 512, 768,</div><div class='add'>+ *    1024, 1536, 2048, 3072, 4096, 5760, 8128, 16320</div><div class='add'>+ *</div><div class='add'>+ * Times that cannot be closely matched with these must be</div><div class='add'>+ * handled in software.  This driver allows 12.5% error in matching.</div><div class='add'>+ *</div><div class='add'>+ * This driver does not allow rise/fall rates to be set explicitly.  When trying</div><div class='add'>+ * to match a given 'on' or 'off' period, an appropriate pair of 'change' and</div><div class='add'>+ * 'hold' times are chosen to get a close match.  If the target delay is even,</div><div class='add'>+ * the 'change' number will be the smaller; if odd, the 'hold' number will be</div><div class='add'>+ * the smaller.</div><div class='add'>+</div><div class='add'>+ * Choosing pairs of delays with 12.5% errors allows us to match delays in the</div><div class='add'>+ * ranges: 56-72, 112-144, 168-216, 224-27504, 28560-36720.</div><div class='add'>+ * 26% of the achievable sums can be matched by multiple pairings. For example</div><div class='add'>+ * 1536 == 1536+0, 1024+512, or 768+768.  This driver will always choose the</div><div class='add'>+ * pairing with the least maximum - 768+768 in this case.  Other pairings are</div><div class='add'>+ * not available.</div><div class='add'>+ *</div><div class='add'>+ * Access to the 3 levels and 2 blinks are on a first-come, first-served basis.</div><div class='add'>+ * Access can be shared by multiple leds if they have the same level and</div><div class='add'>+ * either same blink rates, or some don't blink.</div><div class='add'>+ * When a led changes, it relinquishes access and tries again, so it might</div><div class='add'>+ * lose access to hardware blink.</div><div class='add'>+ * If a blink engine cannot be allocated, software blink is used.</div><div class='add'>+ * If the desired brightness cannot be allocated, the closest available non-zero</div><div class='add'>+ * brightness is used.  As 'full' is always available, the worst case would be</div><div class='add'>+ * to have two different blink rates at '1', with Max at '2', then other leds</div><div class='add'>+ * will have to choose between '2' and '16'.  Hopefully this is not likely.</div><div class='add'>+ *</div><div class='add'>+ * Each bank (BANK0 and BANK1) has two usage counts - LEDs using the brightness</div><div class='add'>+ * and LEDs using the blink.  It can only be reprogrammed when the appropriate</div><div class='add'>+ * counter is zero.  The MASTER level has a single usage count.</div><div class='add'>+ *</div><div class='add'>+ * Each Led has programmable 'on' and 'off' time as milliseconds.  With each</div><div class='add'>+ * there is a flag saying if it was explicitly requested or defaulted.</div><div class='add'>+ * Similarly the banks know if each time was explicit or a default.  Defaults</div><div class='add'>+ * are permitted to be changed freely - they are not recognised when matching.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * An led-tca6507 device must be provided with platform data.  This data</div><div class='add'>+ * lists for each output: the name, default trigger, and whether the signal</div><div class='add'>+ * is being used as a GPiO rather than an led.  'struct led_plaform_data'</div><div class='add'>+ * is used for this.  If 'name' is NULL, the output isn't used.  If 'flags'</div><div class='add'>+ * is TCA6507_MAKE_CPIO, the output is a GPO.</div><div class='add'>+ * The "struct led_platform_data" can be embedded in a</div><div class='add'>+ * "struct tca6507_platform_data" which adds a 'gpio_base' for the GPiOs,</div><div class='add'>+ * and a 'setup' callback which is called once the GPiOs are available.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</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/gpio.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/leds-tca6507.h&gt;</div><div class='add'>+</div><div class='add'>+/* LED select registers determine the source that drives LED outputs */</div><div class='add'>+#define TCA6507_LS_LED_OFF	0x0	/* Output HI-Z (off) */</div><div class='add'>+#define TCA6507_LS_LED_OFF1	0x1	/* Output HI-Z (off) - not used */</div><div class='add'>+#define TCA6507_LS_LED_PWM0	0x2	/* Output LOW with Bank0 rate */</div><div class='add'>+#define TCA6507_LS_LED_PWM1	0x3	/* Output LOW with Bank1 rate */</div><div class='add'>+#define TCA6507_LS_LED_ON	0x4	/* Output LOW (on) */</div><div class='add'>+#define TCA6507_LS_LED_MIR	0x5	/* Output LOW with Master Intensity */</div><div class='add'>+#define TCA6507_LS_BLINK0	0x6	/* Blink at Bank0 rate */</div><div class='add'>+#define TCA6507_LS_BLINK1	0x7	/* Blink at Bank1 rate */</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	BANK0,</div><div class='add'>+	BANK1,</div><div class='add'>+	MASTER,</div><div class='add'>+};</div><div class='add'>+static int bank_source[3] = {</div><div class='add'>+	TCA6507_LS_LED_PWM0,</div><div class='add'>+	TCA6507_LS_LED_PWM1,</div><div class='add'>+	TCA6507_LS_LED_MIR,</div><div class='add'>+};</div><div class='add'>+static int blink_source[2] = {</div><div class='add'>+	TCA6507_LS_BLINK0,</div><div class='add'>+	TCA6507_LS_BLINK1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* PWM registers */</div><div class='add'>+#define	TCA6507_REG_CNT			11</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 0x00, 0x01, 0x02 encode the TCA6507_LS_* values, each output</div><div class='add'>+ * owns one bit in each register</div><div class='add'>+ */</div><div class='add'>+#define	TCA6507_FADE_ON			0x03</div><div class='add'>+#define	TCA6507_FULL_ON			0x04</div><div class='add'>+#define	TCA6507_FADE_OFF		0x05</div><div class='add'>+#define	TCA6507_FIRST_OFF		0x06</div><div class='add'>+#define	TCA6507_SECOND_OFF		0x07</div><div class='add'>+#define	TCA6507_MAX_INTENSITY		0x08</div><div class='add'>+#define	TCA6507_MASTER_INTENSITY	0x09</div><div class='add'>+#define	TCA6507_INITIALIZE		0x0A</div><div class='add'>+</div><div class='add'>+#define	INIT_CODE			0x8</div><div class='add'>+</div><div class='add'>+#define TIMECODES 16</div><div class='add'>+static int time_codes[TIMECODES] = {</div><div class='add'>+	0, 64, 128, 192, 256, 384, 512, 768,</div><div class='add'>+	1024, 1536, 2048, 3072, 4096, 5760, 8128, 16320</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Convert an led.brightness level (0..255) to a TCA6507 level (0..15) */</div><div class='add'>+static inline int TO_LEVEL(int brightness)</div><div class='add'>+{</div><div class='add'>+	return brightness &gt;&gt; 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ...and convert back */</div><div class='add'>+static inline int TO_BRIGHT(int level)</div><div class='add'>+{</div><div class='add'>+	if (level)</div><div class='add'>+		return (level &lt;&lt; 4) | 0xf;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define NUM_LEDS 7</div><div class='add'>+struct tca6507_chip {</div><div class='add'>+	int			reg_set;	/* One bit per register where</div><div class='add'>+						 * a '1' means the register</div><div class='add'>+						 * should be written */</div><div class='add'>+	u8			reg_file[TCA6507_REG_CNT];</div><div class='add'>+	/* Bank 2 is Master Intensity and doesn't use times */</div><div class='add'>+	struct bank {</div><div class='add'>+		int level;</div><div class='add'>+		int ontime, offtime;</div><div class='add'>+		int on_dflt, off_dflt;</div><div class='add'>+		int time_use, level_use;</div><div class='add'>+	} bank[3];</div><div class='add'>+	struct i2c_client	*client;</div><div class='add'>+	struct work_struct	work;</div><div class='add'>+	spinlock_t		lock;</div><div class='add'>+</div><div class='add'>+	struct tca6507_led {</div><div class='add'>+		struct tca6507_chip	*chip;</div><div class='add'>+		struct led_classdev	led_cdev;</div><div class='add'>+		int			num;</div><div class='add'>+		int			ontime, offtime;</div><div class='add'>+		int			on_dflt, off_dflt;</div><div class='add'>+		int			bank;	/* Bank used, or -1 */</div><div class='add'>+		int			blink;	/* Set if hardware-blinking */</div><div class='add'>+	} leds[NUM_LEDS];</div><div class='add'>+#ifdef CONFIG_GPIOLIB</div><div class='add'>+	struct gpio_chip		gpio;</div><div class='add'>+	const char			*gpio_name[NUM_LEDS];</div><div class='add'>+	int				gpio_map[NUM_LEDS];</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id tca6507_id[] = {</div><div class='add'>+	{ "tca6507" },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, tca6507_id);</div><div class='add'>+</div><div class='add'>+static int choose_times(int msec, int *c1p, int *c2p)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Choose two timecodes which add to 'msec' as near as possible.</div><div class='add'>+	 * The first returned is the 'on' or 'off' time.  The second is to be</div><div class='add'>+	 * used as a 'fade-on' or 'fade-off' time.  If 'msec' is even,</div><div class='add'>+	 * the first will not be smaller than the second.  If 'msec' is odd,</div><div class='add'>+	 * the first will not be larger than the second.</div><div class='add'>+	 * If we cannot get a sum within 1/8 of 'msec' fail with -EINVAL,</div><div class='add'>+	 * otherwise return the sum that was achieved, plus 1 if the first is</div><div class='add'>+	 * smaller.</div><div class='add'>+	 * If two possibilities are equally good (e.g. 512+0, 256+256), choose</div><div class='add'>+	 * the first pair so there is more change-time visible (i.e. it is</div><div class='add'>+	 * softer).</div><div class='add'>+	 */</div><div class='add'>+	int c1, c2;</div><div class='add'>+	int tmax = msec * 9 / 8;</div><div class='add'>+	int tmin = msec * 7 / 8;</div><div class='add'>+	int diff = 65536;</div><div class='add'>+</div><div class='add'>+	/* We start at '1' to ensure we never even think of choosing a</div><div class='add'>+	 * total time of '0'.</div><div class='add'>+	 */</div><div class='add'>+	for (c1 = 1; c1 &lt; TIMECODES; c1++) {</div><div class='add'>+		int t = time_codes[c1];</div><div class='add'>+		if (t*2 &lt; tmin)</div><div class='add'>+			continue;</div><div class='add'>+		if (t &gt; tmax)</div><div class='add'>+			break;</div><div class='add'>+		for (c2 = 0; c2 &lt;= c1; c2++) {</div><div class='add'>+			int tt = t + time_codes[c2];</div><div class='add'>+			int d;</div><div class='add'>+			if (tt &lt; tmin)</div><div class='add'>+				continue;</div><div class='add'>+			if (tt &gt; tmax)</div><div class='add'>+				break;</div><div class='add'>+			/* This works! */</div><div class='add'>+			d = abs(msec - tt);</div><div class='add'>+			if (d &gt;= diff)</div><div class='add'>+				continue;</div><div class='add'>+			/* Best yet */</div><div class='add'>+			*c1p = c1;</div><div class='add'>+			*c2p = c2;</div><div class='add'>+			diff = d;</div><div class='add'>+			if (d == 0)</div><div class='add'>+				return msec;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (diff &lt; 65536) {</div><div class='add'>+		int actual;</div><div class='add'>+		if (msec &amp; 1) {</div><div class='add'>+			c1 = *c2p;</div><div class='add'>+			*c2p = *c1p;</div><div class='add'>+			*c1p = c1;</div><div class='add'>+		}</div><div class='add'>+		actual = time_codes[*c1p] + time_codes[*c2p];</div><div class='add'>+		if (*c1p &lt; *c2p)</div><div class='add'>+			return actual + 1;</div><div class='add'>+		else</div><div class='add'>+			return actual;</div><div class='add'>+	}</div><div class='add'>+	/* No close match */</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Update the register file with the appropriate 3-bit state for</div><div class='add'>+ * the given led.</div><div class='add'>+ */</div><div class='add'>+static void set_select(struct tca6507_chip *tca, int led, int val)</div><div class='add'>+{</div><div class='add'>+	int mask = (1 &lt;&lt; led);</div><div class='add'>+	int bit;</div><div class='add'>+</div><div class='add'>+	for (bit = 0; bit &lt; 3; bit++) {</div><div class='add'>+		int n = tca-&gt;reg_file[bit] &amp; ~mask;</div><div class='add'>+		if (val &amp; (1 &lt;&lt; bit))</div><div class='add'>+			n |= mask;</div><div class='add'>+		if (tca-&gt;reg_file[bit] != n) {</div><div class='add'>+			tca-&gt;reg_file[bit] = n;</div><div class='add'>+			tca-&gt;reg_set |= (1 &lt;&lt; bit);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Update the register file with the appropriate 4-bit code for</div><div class='add'>+ * one bank or other.  This can be used for timers, for levels, or</div><div class='add'>+ * for initialisation.</div><div class='add'>+ */</div><div class='add'>+static void set_code(struct tca6507_chip *tca, int reg, int bank, int new)</div><div class='add'>+{</div><div class='add'>+	int mask = 0xF;</div><div class='add'>+	int n;</div><div class='add'>+	if (bank) {</div><div class='add'>+		mask &lt;&lt;= 4;</div><div class='add'>+		new &lt;&lt;= 4;</div><div class='add'>+	}</div><div class='add'>+	n = tca-&gt;reg_file[reg] &amp; ~mask;</div><div class='add'>+	n |= new;</div><div class='add'>+	if (tca-&gt;reg_file[reg] != n) {</div><div class='add'>+		tca-&gt;reg_file[reg] = n;</div><div class='add'>+		tca-&gt;reg_set |= 1 &lt;&lt; reg;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Update brightness level. */</div><div class='add'>+static void set_level(struct tca6507_chip *tca, int bank, int level)</div><div class='add'>+{</div><div class='add'>+	switch (bank) {</div><div class='add'>+	case BANK0:</div><div class='add'>+	case BANK1:</div><div class='add'>+		set_code(tca, TCA6507_MAX_INTENSITY, bank, level);</div><div class='add'>+		break;</div><div class='add'>+	case MASTER:</div><div class='add'>+		set_code(tca, TCA6507_MASTER_INTENSITY, 0, level);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	tca-&gt;bank[bank].level = level;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Record all relevant time code for a given bank */</div><div class='add'>+static void set_times(struct tca6507_chip *tca, int bank)</div><div class='add'>+{</div><div class='add'>+	int c1, c2;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	result = choose_times(tca-&gt;bank[bank].ontime, &amp;c1, &amp;c2);</div><div class='add'>+	dev_dbg(&amp;tca-&gt;client-&gt;dev,</div><div class='add'>+		"Chose on  times %d(%d) %d(%d) for %dms\n", c1, time_codes[c1],</div><div class='add'>+		c2, time_codes[c2], tca-&gt;bank[bank].ontime);</div><div class='add'>+	set_code(tca, TCA6507_FADE_ON, bank, c2);</div><div class='add'>+	set_code(tca, TCA6507_FULL_ON, bank, c1);</div><div class='add'>+	tca-&gt;bank[bank].ontime = result;</div><div class='add'>+</div><div class='add'>+	result = choose_times(tca-&gt;bank[bank].offtime, &amp;c1, &amp;c2);</div><div class='add'>+	dev_dbg(&amp;tca-&gt;client-&gt;dev,</div><div class='add'>+		"Chose off times %d(%d) %d(%d) for %dms\n", c1, time_codes[c1],</div><div class='add'>+		c2, time_codes[c2], tca-&gt;bank[bank].offtime);</div><div class='add'>+	set_code(tca, TCA6507_FADE_OFF, bank, c2);</div><div class='add'>+	set_code(tca, TCA6507_FIRST_OFF, bank, c1);</div><div class='add'>+	set_code(tca, TCA6507_SECOND_OFF, bank, c1);</div><div class='add'>+	tca-&gt;bank[bank].offtime = result;</div><div class='add'>+</div><div class='add'>+	set_code(tca, TCA6507_INITIALIZE, bank, INIT_CODE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Write all needed register of tca6507 */</div><div class='add'>+</div><div class='add'>+static void tca6507_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct tca6507_chip *tca = container_of(work, struct tca6507_chip,</div><div class='add'>+						work);</div><div class='add'>+	struct i2c_client *cl = tca-&gt;client;</div><div class='add'>+	int set;</div><div class='add'>+	u8 file[TCA6507_REG_CNT];</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;tca-&gt;lock);</div><div class='add'>+	set = tca-&gt;reg_set;</div><div class='add'>+	memcpy(file, tca-&gt;reg_file, TCA6507_REG_CNT);</div><div class='add'>+	tca-&gt;reg_set = 0;</div><div class='add'>+	spin_unlock_irq(&amp;tca-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (r = 0; r &lt; TCA6507_REG_CNT; r++)</div><div class='add'>+		if (set &amp; (1&lt;&lt;r))</div><div class='add'>+			i2c_smbus_write_byte_data(cl, r, file[r]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void led_release(struct tca6507_led *led)</div><div class='add'>+{</div><div class='add'>+	/* If led owns any resource, release it. */</div><div class='add'>+	struct tca6507_chip *tca = led-&gt;chip;</div><div class='add'>+	if (led-&gt;bank &gt;= 0) {</div><div class='add'>+		struct bank *b = tca-&gt;bank + led-&gt;bank;</div><div class='add'>+		if (led-&gt;blink)</div><div class='add'>+			b-&gt;time_use--;</div><div class='add'>+		b-&gt;level_use--;</div><div class='add'>+	}</div><div class='add'>+	led-&gt;blink = 0;</div><div class='add'>+	led-&gt;bank = -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int led_prepare(struct tca6507_led *led)</div><div class='add'>+{</div><div class='add'>+	/* Assign this led to a bank, configuring that bank if necessary. */</div><div class='add'>+	int level = TO_LEVEL(led-&gt;led_cdev.brightness);</div><div class='add'>+	struct tca6507_chip *tca = led-&gt;chip;</div><div class='add'>+	int c1, c2;</div><div class='add'>+	int i;</div><div class='add'>+	struct bank *b;</div><div class='add'>+	int need_init = 0;</div><div class='add'>+</div><div class='add'>+	led-&gt;led_cdev.brightness = TO_BRIGHT(level);</div><div class='add'>+	if (level == 0) {</div><div class='add'>+		set_select(tca, led-&gt;num, TCA6507_LS_LED_OFF);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (led-&gt;ontime == 0 || led-&gt;offtime == 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * Just set the brightness, choosing first usable bank.</div><div class='add'>+		 * If none perfect, choose best.</div><div class='add'>+		 * Count backwards so we check MASTER bank first</div><div class='add'>+		 * to avoid wasting a timer.</div><div class='add'>+		 */</div><div class='add'>+		int best = -1;/* full-on */</div><div class='add'>+		int diff = 15-level;</div><div class='add'>+</div><div class='add'>+		if (level == 15) {</div><div class='add'>+			set_select(tca, led-&gt;num, TCA6507_LS_LED_ON);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = MASTER; i &gt;= BANK0; i--) {</div><div class='add'>+			int d;</div><div class='add'>+			if (tca-&gt;bank[i].level == level ||</div><div class='add'>+			    tca-&gt;bank[i].level_use == 0) {</div><div class='add'>+				best = i;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			d = abs(level - tca-&gt;bank[i].level);</div><div class='add'>+			if (d &lt; diff) {</div><div class='add'>+				diff = d;</div><div class='add'>+				best = i;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (best == -1) {</div><div class='add'>+			/* Best brightness is full-on */</div><div class='add'>+			set_select(tca, led-&gt;num, TCA6507_LS_LED_ON);</div><div class='add'>+			led-&gt;led_cdev.brightness = LED_FULL;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!tca-&gt;bank[best].level_use)</div><div class='add'>+			set_level(tca, best, level);</div><div class='add'>+</div><div class='add'>+		tca-&gt;bank[best].level_use++;</div><div class='add'>+		led-&gt;bank = best;</div><div class='add'>+		set_select(tca, led-&gt;num, bank_source[best]);</div><div class='add'>+		led-&gt;led_cdev.brightness = TO_BRIGHT(tca-&gt;bank[best].level);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We have on/off time so we need to try to allocate a timing bank.</div><div class='add'>+	 * First check if times are compatible with hardware and give up if</div><div class='add'>+	 * not.</div><div class='add'>+	 */</div><div class='add'>+	if (choose_times(led-&gt;ontime, &amp;c1, &amp;c2) &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (choose_times(led-&gt;offtime, &amp;c1, &amp;c2) &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = BANK0; i &lt;= BANK1; i++) {</div><div class='add'>+		if (tca-&gt;bank[i].level_use == 0)</div><div class='add'>+			/* not in use - it is ours! */</div><div class='add'>+			break;</div><div class='add'>+		if (tca-&gt;bank[i].level != level)</div><div class='add'>+			/* Incompatible level - skip */</div><div class='add'>+			/* FIX: if timer matches we maybe should consider</div><div class='add'>+			 * this anyway...</div><div class='add'>+			 */</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (tca-&gt;bank[i].time_use == 0)</div><div class='add'>+			/* Timer not in use, and level matches - use it */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!(tca-&gt;bank[i].on_dflt ||</div><div class='add'>+		      led-&gt;on_dflt ||</div><div class='add'>+		      tca-&gt;bank[i].ontime == led-&gt;ontime))</div><div class='add'>+			/* on time is incompatible */</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!(tca-&gt;bank[i].off_dflt ||</div><div class='add'>+		      led-&gt;off_dflt ||</div><div class='add'>+		      tca-&gt;bank[i].offtime == led-&gt;offtime))</div><div class='add'>+			/* off time is incompatible */</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* looks like a suitable match */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i &gt; BANK1)</div><div class='add'>+		/* Nothing matches - how sad */</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	b = &amp;tca-&gt;bank[i];</div><div class='add'>+	if (b-&gt;level_use == 0)</div><div class='add'>+		set_level(tca, i, level);</div><div class='add'>+	b-&gt;level_use++;</div><div class='add'>+	led-&gt;bank = i;</div><div class='add'>+</div><div class='add'>+	if (b-&gt;on_dflt ||</div><div class='add'>+	    !led-&gt;on_dflt ||</div><div class='add'>+	    b-&gt;time_use == 0) {</div><div class='add'>+		b-&gt;ontime = led-&gt;ontime;</div><div class='add'>+		b-&gt;on_dflt = led-&gt;on_dflt;</div><div class='add'>+		need_init = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (b-&gt;off_dflt ||</div><div class='add'>+	    !led-&gt;off_dflt ||</div><div class='add'>+	    b-&gt;time_use == 0) {</div><div class='add'>+		b-&gt;offtime = led-&gt;offtime;</div><div class='add'>+		b-&gt;off_dflt = led-&gt;off_dflt;</div><div class='add'>+		need_init = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (need_init)</div><div class='add'>+		set_times(tca, i);</div><div class='add'>+</div><div class='add'>+	led-&gt;ontime = b-&gt;ontime;</div><div class='add'>+	led-&gt;offtime = b-&gt;offtime;</div><div class='add'>+</div><div class='add'>+	b-&gt;time_use++;</div><div class='add'>+	led-&gt;blink = 1;</div><div class='add'>+	led-&gt;led_cdev.brightness = TO_BRIGHT(b-&gt;level);</div><div class='add'>+	set_select(tca, led-&gt;num, blink_source[i]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int led_assign(struct tca6507_led *led)</div><div class='add'>+{</div><div class='add'>+	struct tca6507_chip *tca = led-&gt;chip;</div><div class='add'>+	int err;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;tca-&gt;lock, flags);</div><div class='add'>+	led_release(led);</div><div class='add'>+	err = led_prepare(led);</div><div class='add'>+	if (err) {</div><div class='add'>+		/*</div><div class='add'>+		 * Can only fail on timer setup.  In that case we need to</div><div class='add'>+		 * re-establish as steady level.</div><div class='add'>+		 */</div><div class='add'>+		led-&gt;ontime = 0;</div><div class='add'>+		led-&gt;offtime = 0;</div><div class='add'>+		led_prepare(led);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;tca-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (tca-&gt;reg_set)</div><div class='add'>+		schedule_work(&amp;tca-&gt;work);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tca6507_brightness_set(struct led_classdev *led_cdev,</div><div class='add'>+				   enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct tca6507_led *led = container_of(led_cdev, struct tca6507_led,</div><div class='add'>+					       led_cdev);</div><div class='add'>+	led-&gt;led_cdev.brightness = brightness;</div><div class='add'>+	led-&gt;ontime = 0;</div><div class='add'>+	led-&gt;offtime = 0;</div><div class='add'>+	led_assign(led);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tca6507_blink_set(struct led_classdev *led_cdev,</div><div class='add'>+			     unsigned long *delay_on,</div><div class='add'>+			     unsigned long *delay_off)</div><div class='add'>+{</div><div class='add'>+	struct tca6507_led *led = container_of(led_cdev, struct tca6507_led,</div><div class='add'>+					       led_cdev);</div><div class='add'>+</div><div class='add'>+	if (*delay_on == 0)</div><div class='add'>+		led-&gt;on_dflt = 1;</div><div class='add'>+	else if (delay_on != &amp;led_cdev-&gt;blink_delay_on)</div><div class='add'>+		led-&gt;on_dflt = 0;</div><div class='add'>+	led-&gt;ontime = *delay_on;</div><div class='add'>+</div><div class='add'>+	if (*delay_off == 0)</div><div class='add'>+		led-&gt;off_dflt = 1;</div><div class='add'>+	else if (delay_off != &amp;led_cdev-&gt;blink_delay_off)</div><div class='add'>+		led-&gt;off_dflt = 0;</div><div class='add'>+	led-&gt;offtime = *delay_off;</div><div class='add'>+</div><div class='add'>+	if (led-&gt;ontime == 0)</div><div class='add'>+		led-&gt;ontime = 512;</div><div class='add'>+	if (led-&gt;offtime == 0)</div><div class='add'>+		led-&gt;offtime = 512;</div><div class='add'>+</div><div class='add'>+	if (led-&gt;led_cdev.brightness == LED_OFF)</div><div class='add'>+		led-&gt;led_cdev.brightness = LED_FULL;</div><div class='add'>+	if (led_assign(led) &lt; 0) {</div><div class='add'>+		led-&gt;ontime = 0;</div><div class='add'>+		led-&gt;offtime = 0;</div><div class='add'>+		led-&gt;led_cdev.brightness = LED_OFF;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	*delay_on = led-&gt;ontime;</div><div class='add'>+	*delay_off = led-&gt;offtime;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_GPIOLIB</div><div class='add'>+static void tca6507_gpio_set_value(struct gpio_chip *gc,</div><div class='add'>+				   unsigned offset, int val)</div><div class='add'>+{</div><div class='add'>+	struct tca6507_chip *tca = container_of(gc, struct tca6507_chip, gpio);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;tca-&gt;lock, flags);</div><div class='add'>+	/*</div><div class='add'>+	 * 'OFF' is floating high, and 'ON' is pulled down, so it has the</div><div class='add'>+	 * inverse sense of 'val'.</div><div class='add'>+	 */</div><div class='add'>+	set_select(tca, tca-&gt;gpio_map[offset],</div><div class='add'>+		   val ? TCA6507_LS_LED_OFF : TCA6507_LS_LED_ON);</div><div class='add'>+	spin_unlock_irqrestore(&amp;tca-&gt;lock, flags);</div><div class='add'>+	if (tca-&gt;reg_set)</div><div class='add'>+		schedule_work(&amp;tca-&gt;work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tca6507_gpio_direction_output(struct gpio_chip *gc,</div><div class='add'>+					  unsigned offset, int val)</div><div class='add'>+{</div><div class='add'>+	tca6507_gpio_set_value(gc, offset, val);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tca6507_probe_gpios(struct i2c_client *client,</div><div class='add'>+			       struct tca6507_chip *tca,</div><div class='add'>+			       struct tca6507_platform_data *pdata)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int i = 0;</div><div class='add'>+	int gpios = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_LEDS; i++)</div><div class='add'>+		if (pdata-&gt;leds.leds[i].name &amp;&amp; pdata-&gt;leds.leds[i].flags) {</div><div class='add'>+			/* Configure as a gpio */</div><div class='add'>+			tca-&gt;gpio_name[gpios] = pdata-&gt;leds.leds[i].name;</div><div class='add'>+			tca-&gt;gpio_map[gpios] = i;</div><div class='add'>+			gpios++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	if (!gpios)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	tca-&gt;gpio.label = "gpio-tca6507";</div><div class='add'>+	tca-&gt;gpio.names = tca-&gt;gpio_name;</div><div class='add'>+	tca-&gt;gpio.ngpio = gpios;</div><div class='add'>+	tca-&gt;gpio.base = pdata-&gt;gpio_base;</div><div class='add'>+	tca-&gt;gpio.owner = THIS_MODULE;</div><div class='add'>+	tca-&gt;gpio.direction_output = tca6507_gpio_direction_output;</div><div class='add'>+	tca-&gt;gpio.set = tca6507_gpio_set_value;</div><div class='add'>+	tca-&gt;gpio.dev = &amp;client-&gt;dev;</div><div class='add'>+	err = gpiochip_add(&amp;tca-&gt;gpio);</div><div class='add'>+	if (err) {</div><div class='add'>+		tca-&gt;gpio.ngpio = 0;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	if (pdata-&gt;setup)</div><div class='add'>+		pdata-&gt;setup(tca-&gt;gpio.base, tca-&gt;gpio.ngpio);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tca6507_remove_gpio(struct tca6507_chip *tca)</div><div class='add'>+{</div><div class='add'>+	if (tca-&gt;gpio.ngpio) {</div><div class='add'>+		int err = gpiochip_remove(&amp;tca-&gt;gpio);</div><div class='add'>+		dev_err(&amp;tca-&gt;client-&gt;dev, "%s failed, %d\n",</div><div class='add'>+			"gpiochip_remove()", err);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#else /* CONFIG_GPIOLIB */</div><div class='add'>+static int tca6507_probe_gpios(struct i2c_client *client,</div><div class='add'>+			       struct tca6507_chip *tca,</div><div class='add'>+			       struct tca6507_platform_data *pdata)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static void tca6507_remove_gpio(struct tca6507_chip *tca)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_GPIOLIB */</div><div class='add'>+</div><div class='add'>+static int __devinit tca6507_probe(struct i2c_client *client,</div><div class='add'>+				   const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct tca6507_chip *tca;</div><div class='add'>+	struct i2c_adapter *adapter;</div><div class='add'>+	struct tca6507_platform_data *pdata;</div><div class='add'>+	int err;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	adapter = to_i2c_adapter(client-&gt;dev.parent);</div><div class='add'>+	pdata = client-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	if (!i2c_check_functionality(adapter, I2C_FUNC_I2C))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (!pdata || pdata-&gt;leds.num_leds != NUM_LEDS) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Need %d entries in platform-data list\n",</div><div class='add'>+			NUM_LEDS);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	tca = kzalloc(sizeof(*tca), GFP_KERNEL);</div><div class='add'>+	if (!tca)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	tca-&gt;client = client;</div><div class='add'>+	INIT_WORK(&amp;tca-&gt;work, tca6507_work);</div><div class='add'>+	spin_lock_init(&amp;tca-&gt;lock);</div><div class='add'>+	i2c_set_clientdata(client, tca);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_LEDS; i++) {</div><div class='add'>+		struct tca6507_led *l = tca-&gt;leds + i;</div><div class='add'>+</div><div class='add'>+		l-&gt;chip = tca;</div><div class='add'>+		l-&gt;num = i;</div><div class='add'>+		if (pdata-&gt;leds.leds[i].name &amp;&amp; !pdata-&gt;leds.leds[i].flags) {</div><div class='add'>+			l-&gt;led_cdev.name = pdata-&gt;leds.leds[i].name;</div><div class='add'>+			l-&gt;led_cdev.default_trigger</div><div class='add'>+				= pdata-&gt;leds.leds[i].default_trigger;</div><div class='add'>+			l-&gt;led_cdev.brightness_set = tca6507_brightness_set;</div><div class='add'>+			l-&gt;led_cdev.blink_set = tca6507_blink_set;</div><div class='add'>+			l-&gt;bank = -1;</div><div class='add'>+			err = led_classdev_register(&amp;client-&gt;dev,</div><div class='add'>+						    &amp;l-&gt;led_cdev);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	err = tca6507_probe_gpios(client, tca, pdata);</div><div class='add'>+	if (err)</div><div class='add'>+		goto exit;</div><div class='add'>+	/* set all registers to known state - zero */</div><div class='add'>+	tca-&gt;reg_set = 0x7f;</div><div class='add'>+	schedule_work(&amp;tca-&gt;work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+exit:</div><div class='add'>+	while (i--)</div><div class='add'>+		if (tca-&gt;leds[i].led_cdev.name)</div><div class='add'>+			led_classdev_unregister(&amp;tca-&gt;leds[i].led_cdev);</div><div class='add'>+	cancel_work_sync(&amp;tca-&gt;work);</div><div class='add'>+	i2c_set_clientdata(client, NULL);</div><div class='add'>+	kfree(tca);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit tca6507_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct tca6507_chip *tca = i2c_get_clientdata(client);</div><div class='add'>+	struct tca6507_led *tca_leds = tca-&gt;leds;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_LEDS; i++) {</div><div class='add'>+		if (tca_leds[i].led_cdev.name)</div><div class='add'>+			led_classdev_unregister(&amp;tca_leds[i].led_cdev);</div><div class='add'>+	}</div><div class='add'>+	tca6507_remove_gpio(tca);</div><div class='add'>+	cancel_work_sync(&amp;tca-&gt;work);</div><div class='add'>+	i2c_set_clientdata(client, NULL);</div><div class='add'>+	kfree(tca);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_driver tca6507_driver = {</div><div class='add'>+	.driver   = {</div><div class='add'>+		.name    = "leds-tca6507",</div><div class='add'>+		.owner   = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe    = tca6507_probe,</div><div class='add'>+	.remove   = __devexit_p(tca6507_remove),</div><div class='add'>+	.id_table = tca6507_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init tca6507_leds_init(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;tca6507_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit tca6507_leds_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;tca6507_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(tca6507_leds_init);</div><div class='add'>+module_exit(tca6507_leds_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("NeilBrown &lt;neilb@suse.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("TCA6507 LED/GPO driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/leds/leds-wm831x-status.c b/drivers/leds/leds-wm831x-status.c<br/>index b1eb34c3e81f..74a24cf897c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-wm831x-status.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-wm831x-status.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-wm831x-status.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-wm831x-status.c</a></div><div class='hunk'>@@ -237,7 +237,8 @@ static int wm831x_status_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	drvdata = kzalloc(sizeof(struct wm831x_status), GFP_KERNEL);</div><div class='add'>+	drvdata = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(struct wm831x_status),</div><div class='add'>+			       GFP_KERNEL);</div><div class='ctx'> 	if (!drvdata)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	dev_set_drvdata(&amp;pdev-&gt;dev, drvdata);</div><div class='hunk'>@@ -300,7 +301,6 @@ static int wm831x_status_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> err_led:</div><div class='ctx'> 	led_classdev_unregister(&amp;drvdata-&gt;cdev);</div><div class='del'>-	kfree(drvdata);</div><div class='ctx'> err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -311,7 +311,6 @@ static int wm831x_status_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	device_remove_file(drvdata-&gt;cdev.dev, &amp;dev_attr_src);</div><div class='ctx'> 	led_classdev_unregister(&amp;drvdata-&gt;cdev);</div><div class='del'>-	kfree(drvdata);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -325,17 +324,7 @@ static struct platform_driver wm831x_status_driver = {</div><div class='ctx'> 	.remove = wm831x_status_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit wm831x_status_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;wm831x_status_driver);</div><div class='del'>-}</div><div class='del'>-module_init(wm831x_status_init);</div><div class='del'>-</div><div class='del'>-static void wm831x_status_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;wm831x_status_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(wm831x_status_exit);</div><div class='add'>+module_platform_driver(wm831x_status_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("WM831x status LED driver");</div><div class='head'>diff --git a/drivers/leds/leds-wm8350.c b/drivers/leds/leds-wm8350.c<br/>index 4a1276578352..918d4baff1c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-wm8350.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/leds/leds-wm8350.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-wm8350.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/leds/leds-wm8350.c</a></div><div class='hunk'>@@ -227,7 +227,7 @@ static int wm8350_led_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err_isink;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	led = kzalloc(sizeof(*led), GFP_KERNEL);</div><div class='add'>+	led = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*led), GFP_KERNEL);</div><div class='ctx'> 	if (led == NULL) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto err_dcdc;</div><div class='hunk'>@@ -259,12 +259,10 @@ static int wm8350_led_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	ret = led_classdev_register(&amp;pdev-&gt;dev, &amp;led-&gt;cdev);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto err_led;</div><div class='add'>+		goto err_dcdc;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- err_led:</div><div class='del'>-	kfree(led);</div><div class='ctx'>  err_dcdc:</div><div class='ctx'> 	regulator_put(dcdc);</div><div class='ctx'>  err_isink:</div><div class='hunk'>@@ -281,7 +279,6 @@ static int wm8350_led_remove(struct platform_device *pdev)</div><div class='ctx'> 	wm8350_led_disable(led);</div><div class='ctx'> 	regulator_put(led-&gt;dcdc);</div><div class='ctx'> 	regulator_put(led-&gt;isink);</div><div class='del'>-	kfree(led);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -295,17 +292,7 @@ static struct platform_driver wm8350_led_driver = {</div><div class='ctx'> 	.shutdown = wm8350_led_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit wm8350_led_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;wm8350_led_driver);</div><div class='del'>-}</div><div class='del'>-module_init(wm8350_led_init);</div><div class='del'>-</div><div class='del'>-static void wm8350_led_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;wm8350_led_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(wm8350_led_exit);</div><div class='add'>+module_platform_driver(wm8350_led_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Mark Brown");</div><div class='ctx'> MODULE_DESCRIPTION("WM8350 LED driver");</div><div class='head'>diff --git a/drivers/lguest/Makefile b/drivers/lguest/Makefile<br/>index 8ac947c7e7c7..c4197503900e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/lguest/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/lguest/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/lguest/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/lguest/Makefile</a></div><div class='hunk'>@@ -18,7 +18,7 @@ Mastery: PREFIX=M</div><div class='ctx'> Beer:</div><div class='ctx'> 	@for f in Preparation Guest Drivers Launcher Host Switcher Mastery; do echo "{==- $$f -==}"; make -s $$f; done; echo "{==-==}"</div><div class='ctx'> Preparation Preparation! Guest Drivers Launcher Host Switcher Mastery:</div><div class='del'>-	@sh ../../Documentation/virtual/lguest/extract $(PREFIX) `find ../../* -name '*.[chS]' -wholename '*lguest*'`</div><div class='add'>+	@sh ../../tools/lguest/extract $(PREFIX) `find ../../* -name '*.[chS]' -wholename '*lguest*'`</div><div class='ctx'> Puppy:</div><div class='ctx'> 	@clear</div><div class='ctx'> 	@printf "      __  \n (___()'\`;\n /,    /\`\n \\\\\\\"--\\\\\\   \n"</div><div class='head'>diff --git a/drivers/lguest/lguest_device.c b/drivers/lguest/lguest_device.c<br/>index 0dc30ffde5ad..9e8388efd88e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/lguest/lguest_device.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/lguest/lguest_device.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/lguest/lguest_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/lguest/lguest_device.c</a></div><div class='hunk'>@@ -241,7 +241,7 @@ static void lg_notify(struct virtqueue *vq)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* An extern declaration inside a C file is bad form.  Don't do it. */</div><div class='del'>-extern void lguest_setup_irq(unsigned int irq);</div><div class='add'>+extern int lguest_setup_irq(unsigned int irq);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This routine finds the Nth virtqueue described in the configuration of</div><div class='hunk'>@@ -292,17 +292,21 @@ static struct virtqueue *lg_find_vq(struct virtio_device *vdev,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * OK, tell virtio_ring.c to set up a virtqueue now we know its size</div><div class='del'>-	 * and we've got a pointer to its pages.</div><div class='add'>+	 * and we've got a pointer to its pages.  Note that we set weak_barriers</div><div class='add'>+	 * to 'true': the host just a(nother) SMP CPU, so we only need inter-cpu</div><div class='add'>+	 * barriers.</div><div class='ctx'> 	 */</div><div class='del'>-	vq = vring_new_virtqueue(lvq-&gt;config.num, LGUEST_VRING_ALIGN,</div><div class='del'>-				 vdev, lvq-&gt;pages, lg_notify, callback, name);</div><div class='add'>+	vq = vring_new_virtqueue(lvq-&gt;config.num, LGUEST_VRING_ALIGN, vdev,</div><div class='add'>+				 true, lvq-&gt;pages, lg_notify, callback, name);</div><div class='ctx'> 	if (!vq) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure the interrupt is allocated. */</div><div class='del'>-	lguest_setup_irq(lvq-&gt;config.irq);</div><div class='add'>+	err = lguest_setup_irq(lvq-&gt;config.irq);</div><div class='add'>+	if (err)</div><div class='add'>+		goto destroy_vring;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Tell the interrupt for this virtqueue to go to the virtio_ring</div><div class='hunk'>@@ -315,7 +319,7 @@ static struct virtqueue *lg_find_vq(struct virtio_device *vdev,</div><div class='ctx'> 	err = request_irq(lvq-&gt;config.irq, vring_interrupt, IRQF_SHARED,</div><div class='ctx'> 			  dev_name(&amp;vdev-&gt;dev), vq);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto destroy_vring;</div><div class='add'>+		goto free_desc;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Last of all we hook up our 'struct lguest_vq_info" to the</div><div class='hunk'>@@ -324,6 +328,8 @@ static struct virtqueue *lg_find_vq(struct virtio_device *vdev,</div><div class='ctx'> 	vq-&gt;priv = lvq;</div><div class='ctx'> 	return vq;</div><div class='ctx'> </div><div class='add'>+free_desc:</div><div class='add'>+	irq_free_desc(lvq-&gt;config.irq);</div><div class='ctx'> destroy_vring:</div><div class='ctx'> 	vring_del_virtqueue(vq);</div><div class='ctx'> unmap:</div><div class='hunk'>@@ -381,6 +387,11 @@ error:</div><div class='ctx'> 	return PTR_ERR(vqs[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const char *lg_bus_name(struct virtio_device *vdev)</div><div class='add'>+{</div><div class='add'>+	return "";</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* The ops structure which hooks everything together. */</div><div class='ctx'> static struct virtio_config_ops lguest_config_ops = {</div><div class='ctx'> 	.get_features = lg_get_features,</div><div class='hunk'>@@ -392,6 +403,7 @@ static struct virtio_config_ops lguest_config_ops = {</div><div class='ctx'> 	.reset = lg_reset,</div><div class='ctx'> 	.find_vqs = lg_find_vqs,</div><div class='ctx'> 	.del_vqs = lg_del_vqs,</div><div class='add'>+	.bus_name = lg_bus_name,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/lguest/segments.c b/drivers/lguest/segments.c<br/>index ede46581351a..c4fb424dfddb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/lguest/segments.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/lguest/segments.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/lguest/segments.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/lguest/segments.c</a></div><div class='hunk'>@@ -81,8 +81,8 @@ static void fixup_gdt_table(struct lg_cpu *cpu, unsigned start, unsigned end)</div><div class='ctx'> 		 * sometimes careless and leaves this as 0, even though it's</div><div class='ctx'> 		 * running at privilege level 1.  If so, we fix it here.</div><div class='ctx'> 		 */</div><div class='del'>-		if ((cpu-&gt;arch.gdt[i].b &amp; 0x00006000) == 0)</div><div class='del'>-			cpu-&gt;arch.gdt[i].b |= (GUEST_PL &lt;&lt; 13);</div><div class='add'>+		if (cpu-&gt;arch.gdt[i].dpl == 0)</div><div class='add'>+			cpu-&gt;arch.gdt[i].dpl |= GUEST_PL;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Each descriptor has an "accessed" bit.  If we don't set it</div><div class='hunk'>@@ -90,7 +90,7 @@ static void fixup_gdt_table(struct lg_cpu *cpu, unsigned start, unsigned end)</div><div class='ctx'> 		 * that entry into a segment register.  But the GDT isn't</div><div class='ctx'> 		 * writable by the Guest, so bad things can happen.</div><div class='ctx'> 		 */</div><div class='del'>-		cpu-&gt;arch.gdt[i].b |= 0x00000100;</div><div class='add'>+		cpu-&gt;arch.gdt[i].type |= 0x1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -114,13 +114,19 @@ void setup_default_gdt_entries(struct lguest_ro_state *state)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The TSS segment refers to the TSS entry for this particular CPU.</div><div class='del'>-	 * Forgive the magic flags: the 0x8900 means the entry is Present, it's</div><div class='del'>-	 * privilege level 0 Available 386 TSS system segment, and the 0x67</div><div class='del'>-	 * means Saturn is eclipsed by Mercury in the twelfth house.</div><div class='ctx'> 	 */</div><div class='del'>-	gdt[GDT_ENTRY_TSS].a = 0x00000067 | (tss &lt;&lt; 16);</div><div class='del'>-	gdt[GDT_ENTRY_TSS].b = 0x00008900 | (tss &amp; 0xFF000000)</div><div class='del'>-		| ((tss &gt;&gt; 16) &amp; 0x000000FF);</div><div class='add'>+	gdt[GDT_ENTRY_TSS].a = 0;</div><div class='add'>+	gdt[GDT_ENTRY_TSS].b = 0;</div><div class='add'>+</div><div class='add'>+	gdt[GDT_ENTRY_TSS].limit0 = 0x67;</div><div class='add'>+	gdt[GDT_ENTRY_TSS].base0  = tss &amp; 0xFFFF;</div><div class='add'>+	gdt[GDT_ENTRY_TSS].base1  = (tss &gt;&gt; 16) &amp; 0xFF;</div><div class='add'>+	gdt[GDT_ENTRY_TSS].base2  = tss &gt;&gt; 24;</div><div class='add'>+	gdt[GDT_ENTRY_TSS].type   = 0x9; /* 32-bit TSS (available) */</div><div class='add'>+	gdt[GDT_ENTRY_TSS].p      = 0x1; /* Entry is present */</div><div class='add'>+	gdt[GDT_ENTRY_TSS].dpl    = 0x0; /* Privilege level 0 */</div><div class='add'>+	gdt[GDT_ENTRY_TSS].s      = 0x0; /* system segment */</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -135,8 +141,8 @@ void setup_guest_gdt(struct lg_cpu *cpu)</div><div class='ctx'> 	 */</div><div class='ctx'> 	cpu-&gt;arch.gdt[GDT_ENTRY_KERNEL_CS] = FULL_EXEC_SEGMENT;</div><div class='ctx'> 	cpu-&gt;arch.gdt[GDT_ENTRY_KERNEL_DS] = FULL_SEGMENT;</div><div class='del'>-	cpu-&gt;arch.gdt[GDT_ENTRY_KERNEL_CS].b |= (GUEST_PL &lt;&lt; 13);</div><div class='del'>-	cpu-&gt;arch.gdt[GDT_ENTRY_KERNEL_DS].b |= (GUEST_PL &lt;&lt; 13);</div><div class='add'>+	cpu-&gt;arch.gdt[GDT_ENTRY_KERNEL_CS].dpl |= GUEST_PL;</div><div class='add'>+	cpu-&gt;arch.gdt[GDT_ENTRY_KERNEL_DS].dpl |= GUEST_PL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*H:650</div><div class='head'>diff --git a/drivers/macintosh/ams/ams-core.c b/drivers/macintosh/ams/ams-core.c<br/>index 399beb1638d1..5c6a2d876562 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/ams/ams-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/macintosh/ams/ams-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/ams/ams-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/macintosh/ams/ams-core.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> /* There is only one motion sensor per machine */</div><div class='ctx'> struct ams ams_info;</div><div class='ctx'> </div><div class='del'>-static unsigned int verbose;</div><div class='add'>+static bool verbose;</div><div class='ctx'> module_param(verbose, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(verbose, "Show free falls and shocks in kernel output");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/macintosh/ams/ams-input.c b/drivers/macintosh/ams/ams-input.c<br/>index 8a712392cd38..b27e530a87a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/ams/ams-input.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/macintosh/ams/ams-input.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/ams/ams-input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/macintosh/ams/ams-input.c</a></div><div class='hunk'>@@ -19,11 +19,11 @@</div><div class='ctx'> </div><div class='ctx'> #include "ams.h"</div><div class='ctx'> </div><div class='del'>-static unsigned int joystick;</div><div class='add'>+static bool joystick;</div><div class='ctx'> module_param(joystick, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(joystick, "Enable the input class device on module load");</div><div class='ctx'> </div><div class='del'>-static unsigned int invert;</div><div class='add'>+static bool invert;</div><div class='ctx'> module_param(invert, bool, S_IWUSR | S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(invert, "Invert input data on X and Y axis");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c<br/>index 116a49ce74b2..54ac7ffacb40 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/smu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/macintosh/smu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/smu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/macintosh/smu.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/of_device.h&gt;</div><div class='hunk'>@@ -681,9 +680,6 @@ static struct platform_driver smu_of_platform_driver =</div><div class='ctx'> static int __init smu_init_sysfs(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='del'>-	 * Due to sysfs bogosity, a sysdev is not a real device, so</div><div class='del'>-	 * we should in fact create both if we want sysdev semantics</div><div class='del'>-	 * for power management.</div><div class='ctx'> 	 * For now, we don't power manage machines with an SMU chip,</div><div class='ctx'> 	 * I'm a bit too far from figuring out how that works with those</div><div class='ctx'> 	 * new chipsets, but that will come back and bite us</div><div class='head'>diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c<br/>index 02367308ff2e..c60d025044ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/therm_adt746x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/macintosh/therm_adt746x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/therm_adt746x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/macintosh/therm_adt746x.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@ static const char *sensor_location[3];</div><div class='ctx'> </div><div class='ctx'> static int limit_adjust;</div><div class='ctx'> static int fan_speed = -1;</div><div class='del'>-static int verbose;</div><div class='add'>+static bool verbose;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Colin Leroy &lt;colin@colino.net&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for ADT746x thermostat in iBook G4 and "</div><div class='head'>diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c<br/>index 6d03774b176e..cdf36b1e9aa6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/bitmap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/bitmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/bitmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/md/bitmap.c</a></div><div class='hunk'>@@ -1149,12 +1149,12 @@ void bitmap_daemon_work(struct mddev *mddev)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (time_before(jiffies, bitmap-&gt;daemon_lastrun</div><div class='del'>-			+ bitmap-&gt;mddev-&gt;bitmap_info.daemon_sleep))</div><div class='add'>+			+ mddev-&gt;bitmap_info.daemon_sleep))</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	bitmap-&gt;daemon_lastrun = jiffies;</div><div class='ctx'> 	if (bitmap-&gt;allclean) {</div><div class='del'>-		bitmap-&gt;mddev-&gt;thread-&gt;timeout = MAX_SCHEDULE_TIMEOUT;</div><div class='add'>+		mddev-&gt;thread-&gt;timeout = MAX_SCHEDULE_TIMEOUT;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> 	bitmap-&gt;allclean = 1;</div><div class='hunk'>@@ -1206,7 +1206,7 @@ void bitmap_daemon_work(struct mddev *mddev)</div><div class='ctx'> 			 * sure that events_cleared is up-to-date.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (bitmap-&gt;need_sync &amp;&amp;</div><div class='del'>-			    bitmap-&gt;mddev-&gt;bitmap_info.external == 0) {</div><div class='add'>+			    mddev-&gt;bitmap_info.external == 0) {</div><div class='ctx'> 				bitmap_super_t *sb;</div><div class='ctx'> 				bitmap-&gt;need_sync = 0;</div><div class='ctx'> 				sb = kmap_atomic(bitmap-&gt;sb_page, KM_USER0);</div><div class='hunk'>@@ -1270,8 +1270,8 @@ void bitmap_daemon_work(struct mddev *mddev)</div><div class='ctx'> </div><div class='ctx'>  done:</div><div class='ctx'> 	if (bitmap-&gt;allclean == 0)</div><div class='del'>-		bitmap-&gt;mddev-&gt;thread-&gt;timeout =</div><div class='del'>-			bitmap-&gt;mddev-&gt;bitmap_info.daemon_sleep;</div><div class='add'>+		mddev-&gt;thread-&gt;timeout =</div><div class='add'>+			mddev-&gt;bitmap_info.daemon_sleep;</div><div class='ctx'> 	mutex_unlock(&amp;mddev-&gt;bitmap_info.mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1587,7 +1587,7 @@ static void bitmap_set_memory_bits(struct bitmap *bitmap, sector_t offset, int n</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!*bmc) {</div><div class='ctx'> 		struct page *page;</div><div class='del'>-		*bmc = 1 | (needed ? NEEDED_MASK : 0);</div><div class='add'>+		*bmc = 2 | (needed ? NEEDED_MASK : 0);</div><div class='ctx'> 		bitmap_count_page(bitmap, offset, 1);</div><div class='ctx'> 		page = filemap_get_page(bitmap, offset &gt;&gt; CHUNK_BLOCK_SHIFT(bitmap));</div><div class='ctx'> 		set_page_attr(bitmap, page, BITMAP_PAGE_PENDING);</div><div class='head'>diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c<br/>index f84c08029b21..9fb18c147825 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-flakey.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/dm-flakey.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-flakey.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/md/dm-flakey.c</a></div><div class='hunk'>@@ -368,8 +368,17 @@ static int flakey_status(struct dm_target *ti, status_type_t type,</div><div class='ctx'> static int flakey_ioctl(struct dm_target *ti, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct flakey_c *fc = ti-&gt;private;</div><div class='add'>+	struct dm_dev *dev = fc-&gt;dev;</div><div class='add'>+	int r = 0;</div><div class='ctx'> </div><div class='del'>-	return __blkdev_driver_ioctl(fc-&gt;dev-&gt;bdev, fc-&gt;dev-&gt;mode, cmd, arg);</div><div class='add'>+	/*</div><div class='add'>+	 * Only pass ioctls through if the device sizes match exactly.</div><div class='add'>+	 */</div><div class='add'>+	if (fc-&gt;start ||</div><div class='add'>+	    ti-&gt;len != i_size_read(dev-&gt;bdev-&gt;bd_inode) &gt;&gt; SECTOR_SHIFT)</div><div class='add'>+		r = scsi_verify_blk_ioctl(NULL, cmd);</div><div class='add'>+</div><div class='add'>+	return r ? : __blkdev_driver_ioctl(dev-&gt;bdev, dev-&gt;mode, cmd, arg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int flakey_merge(struct dm_target *ti, struct bvec_merge_data *bvm,</div><div class='head'>diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c<br/>index 3921e3bb43c1..9728839f844a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-linear.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/dm-linear.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-linear.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/md/dm-linear.c</a></div><div class='hunk'>@@ -116,7 +116,17 @@ static int linear_ioctl(struct dm_target *ti, unsigned int cmd,</div><div class='ctx'> 			unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct linear_c *lc = (struct linear_c *) ti-&gt;private;</div><div class='del'>-	return __blkdev_driver_ioctl(lc-&gt;dev-&gt;bdev, lc-&gt;dev-&gt;mode, cmd, arg);</div><div class='add'>+	struct dm_dev *dev = lc-&gt;dev;</div><div class='add'>+	int r = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only pass ioctls through if the device sizes match exactly.</div><div class='add'>+	 */</div><div class='add'>+	if (lc-&gt;start ||</div><div class='add'>+	    ti-&gt;len != i_size_read(dev-&gt;bdev-&gt;bd_inode) &gt;&gt; SECTOR_SHIFT)</div><div class='add'>+		r = scsi_verify_blk_ioctl(NULL, cmd);</div><div class='add'>+</div><div class='add'>+	return r ? : __blkdev_driver_ioctl(dev-&gt;bdev, dev-&gt;mode, cmd, arg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int linear_merge(struct dm_target *ti, struct bvec_merge_data *bvm,</div><div class='head'>diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c<br/>index 5e0090ef4182..801d92d237cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-mpath.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/dm-mpath.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-mpath.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/md/dm-mpath.c</a></div><div class='hunk'>@@ -1520,6 +1520,12 @@ static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;m-&gt;lock, flags);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Only pass ioctls through if the device sizes match exactly.</div><div class='add'>+	 */</div><div class='add'>+	if (!r &amp;&amp; ti-&gt;len != i_size_read(bdev-&gt;bd_inode) &gt;&gt; SECTOR_SHIFT)</div><div class='add'>+		r = scsi_verify_blk_ioctl(NULL, cmd);</div><div class='add'>+</div><div class='ctx'> 	return r ? : __blkdev_driver_ioctl(bdev, mode, cmd, arg);</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 8e9132130142..63cc54289aff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-table.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/dm-table.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-table.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/md/dm-table.c</a></div><div class='hunk'>@@ -699,7 +699,7 @@ static int validate_hardware_logical_block_alignment(struct dm_table *table,</div><div class='ctx'> 	while (i &lt; dm_table_get_num_targets(table)) {</div><div class='ctx'> 		ti = dm_table_get_target(table, i++);</div><div class='ctx'> </div><div class='del'>-		blk_set_default_limits(&amp;ti_limits);</div><div class='add'>+		blk_set_stacking_limits(&amp;ti_limits);</div><div class='ctx'> </div><div class='ctx'> 		/* combine all target devices' limits */</div><div class='ctx'> 		if (ti-&gt;type-&gt;iterate_devices)</div><div class='hunk'>@@ -1221,10 +1221,10 @@ int dm_calculate_queue_limits(struct dm_table *table,</div><div class='ctx'> 	struct queue_limits ti_limits;</div><div class='ctx'> 	unsigned i = 0;</div><div class='ctx'> </div><div class='del'>-	blk_set_default_limits(limits);</div><div class='add'>+	blk_set_stacking_limits(limits);</div><div class='ctx'> </div><div class='ctx'> 	while (i &lt; dm_table_get_num_targets(table)) {</div><div class='del'>-		blk_set_default_limits(&amp;ti_limits);</div><div class='add'>+		blk_set_stacking_limits(&amp;ti_limits);</div><div class='ctx'> </div><div class='ctx'> 		ti = dm_table_get_target(table, i++);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/md/dm.c b/drivers/md/dm.c<br/>index 4720f68f817e..b89c548ec3f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/dm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/md/dm.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/blkpg.h&gt;</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/mempool.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/idr.h&gt;</div><div class='head'>diff --git a/drivers/md/md.c b/drivers/md/md.c<br/>index f47f1f8ac44b..9417ae2fa0bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/md.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/md.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/md.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/md/md.c</a></div><div class='hunk'>@@ -36,8 +36,7 @@</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt; /* for invalidate_bdev */</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -1714,6 +1713,8 @@ static int super_1_validate(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (sb-&gt;devflags &amp; WriteMostly1)</div><div class='ctx'> 			set_bit(WriteMostly, &amp;rdev-&gt;flags);</div><div class='add'>+		if (le32_to_cpu(sb-&gt;feature_map) &amp; MD_FEATURE_REPLACEMENT)</div><div class='add'>+			set_bit(Replacement, &amp;rdev-&gt;flags);</div><div class='ctx'> 	} else /* MULTIPATH are always insync */</div><div class='ctx'> 		set_bit(In_sync, &amp;rdev-&gt;flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1767,6 +1768,9 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> 		sb-&gt;recovery_offset =</div><div class='ctx'> 			cpu_to_le64(rdev-&gt;recovery_offset);</div><div class='ctx'> 	}</div><div class='add'>+	if (test_bit(Replacement, &amp;rdev-&gt;flags))</div><div class='add'>+		sb-&gt;feature_map |=</div><div class='add'>+			cpu_to_le32(MD_FEATURE_REPLACEMENT);</div><div class='ctx'> </div><div class='ctx'> 	if (mddev-&gt;reshape_position != MaxSector) {</div><div class='ctx'> 		sb-&gt;feature_map |= cpu_to_le32(MD_FEATURE_RESHAPE_ACTIVE);</div><div class='hunk'>@@ -2560,6 +2564,15 @@ state_show(struct md_rdev *rdev, char *page)</div><div class='ctx'> 		len += sprintf(page+len, "%swrite_error", sep);</div><div class='ctx'> 		sep = ",";</div><div class='ctx'> 	}</div><div class='add'>+	if (test_bit(WantReplacement, &amp;rdev-&gt;flags)) {</div><div class='add'>+		len += sprintf(page+len, "%swant_replacement", sep);</div><div class='add'>+		sep = ",";</div><div class='add'>+	}</div><div class='add'>+	if (test_bit(Replacement, &amp;rdev-&gt;flags)) {</div><div class='add'>+		len += sprintf(page+len, "%sreplacement", sep);</div><div class='add'>+		sep = ",";</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return len+sprintf(page+len, "\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2628,6 +2641,42 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)</div><div class='ctx'> 	} else if (cmd_match(buf, "-write_error")) {</div><div class='ctx'> 		clear_bit(WriteErrorSeen, &amp;rdev-&gt;flags);</div><div class='ctx'> 		err = 0;</div><div class='add'>+	} else if (cmd_match(buf, "want_replacement")) {</div><div class='add'>+		/* Any non-spare device that is not a replacement can</div><div class='add'>+		 * become want_replacement at any time, but we then need to</div><div class='add'>+		 * check if recovery is needed.</div><div class='add'>+		 */</div><div class='add'>+		if (rdev-&gt;raid_disk &gt;= 0 &amp;&amp;</div><div class='add'>+		    !test_bit(Replacement, &amp;rdev-&gt;flags))</div><div class='add'>+			set_bit(WantReplacement, &amp;rdev-&gt;flags);</div><div class='add'>+		set_bit(MD_RECOVERY_NEEDED, &amp;rdev-&gt;mddev-&gt;recovery);</div><div class='add'>+		md_wakeup_thread(rdev-&gt;mddev-&gt;thread);</div><div class='add'>+		err = 0;</div><div class='add'>+	} else if (cmd_match(buf, "-want_replacement")) {</div><div class='add'>+		/* Clearing 'want_replacement' is always allowed.</div><div class='add'>+		 * Once replacements starts it is too late though.</div><div class='add'>+		 */</div><div class='add'>+		err = 0;</div><div class='add'>+		clear_bit(WantReplacement, &amp;rdev-&gt;flags);</div><div class='add'>+	} else if (cmd_match(buf, "replacement")) {</div><div class='add'>+		/* Can only set a device as a replacement when array has not</div><div class='add'>+		 * yet been started.  Once running, replacement is automatic</div><div class='add'>+		 * from spares, or by assigning 'slot'.</div><div class='add'>+		 */</div><div class='add'>+		if (rdev-&gt;mddev-&gt;pers)</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+		else {</div><div class='add'>+			set_bit(Replacement, &amp;rdev-&gt;flags);</div><div class='add'>+			err = 0;</div><div class='add'>+		}</div><div class='add'>+	} else if (cmd_match(buf, "-replacement")) {</div><div class='add'>+		/* Similarly, can only clear Replacement before start */</div><div class='add'>+		if (rdev-&gt;mddev-&gt;pers)</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+		else {</div><div class='add'>+			clear_bit(Replacement, &amp;rdev-&gt;flags);</div><div class='add'>+			err = 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		sysfs_notify_dirent_safe(rdev-&gt;sysfs_state);</div><div class='hunk'>@@ -2689,7 +2738,7 @@ slot_store(struct md_rdev *rdev, const char *buf, size_t len)</div><div class='ctx'> 		if (rdev-&gt;mddev-&gt;pers-&gt;hot_remove_disk == NULL)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		err = rdev-&gt;mddev-&gt;pers-&gt;</div><div class='del'>-			hot_remove_disk(rdev-&gt;mddev, rdev-&gt;raid_disk);</div><div class='add'>+			hot_remove_disk(rdev-&gt;mddev, rdev);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		sysfs_unlink_rdev(rdev-&gt;mddev, rdev);</div><div class='hunk'>@@ -2697,7 +2746,6 @@ slot_store(struct md_rdev *rdev, const char *buf, size_t len)</div><div class='ctx'> 		set_bit(MD_RECOVERY_NEEDED, &amp;rdev-&gt;mddev-&gt;recovery);</div><div class='ctx'> 		md_wakeup_thread(rdev-&gt;mddev-&gt;thread);</div><div class='ctx'> 	} else if (rdev-&gt;mddev-&gt;pers) {</div><div class='del'>-		struct md_rdev *rdev2;</div><div class='ctx'> 		/* Activating a spare .. or possibly reactivating</div><div class='ctx'> 		 * if we ever get bitmaps working here.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -2711,10 +2759,6 @@ slot_store(struct md_rdev *rdev, const char *buf, size_t len)</div><div class='ctx'> 		if (rdev-&gt;mddev-&gt;pers-&gt;hot_add_disk == NULL)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		list_for_each_entry(rdev2, &amp;rdev-&gt;mddev-&gt;disks, same_set)</div><div class='del'>-			if (rdev2-&gt;raid_disk == slot)</div><div class='del'>-				return -EEXIST;</div><div class='del'>-</div><div class='ctx'> 		if (slot &gt;= rdev-&gt;mddev-&gt;raid_disks &amp;&amp;</div><div class='ctx'> 		    slot &gt;= rdev-&gt;mddev-&gt;raid_disks + rdev-&gt;mddev-&gt;delta_disks)</div><div class='ctx'> 			return -ENOSPC;</div><div class='hunk'>@@ -4622,6 +4666,7 @@ static int md_alloc(dev_t dev, char *name)</div><div class='ctx'> 	mddev-&gt;queue-&gt;queuedata = mddev;</div><div class='ctx'> </div><div class='ctx'> 	blk_queue_make_request(mddev-&gt;queue, md_make_request);</div><div class='add'>+	blk_set_stacking_limits(&amp;mddev-&gt;queue-&gt;limits);</div><div class='ctx'> </div><div class='ctx'> 	disk = alloc_disk(1 &lt;&lt; shift);</div><div class='ctx'> 	if (!disk) {</div><div class='hunk'>@@ -6054,8 +6099,15 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode,</div><div class='ctx'> 	struct mddev *mddev = NULL;</div><div class='ctx'> 	int ro;</div><div class='ctx'> </div><div class='del'>-	if (!capable(CAP_SYS_ADMIN))</div><div class='del'>-		return -EACCES;</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case RAID_VERSION:</div><div class='add'>+	case GET_ARRAY_INFO:</div><div class='add'>+	case GET_DISK_INFO:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+			return -EACCES;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Commands dealing with the RAID driver but not any</div><div class='hunk'>@@ -6715,8 +6767,11 @@ static int md_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 			if (test_bit(Faulty, &amp;rdev-&gt;flags)) {</div><div class='ctx'> 				seq_printf(seq, "(F)");</div><div class='ctx'> 				continue;</div><div class='del'>-			} else if (rdev-&gt;raid_disk &lt; 0)</div><div class='add'>+			}</div><div class='add'>+			if (rdev-&gt;raid_disk &lt; 0)</div><div class='ctx'> 				seq_printf(seq, "(S)"); /* spare */</div><div class='add'>+			if (test_bit(Replacement, &amp;rdev-&gt;flags))</div><div class='add'>+				seq_printf(seq, "(R)");</div><div class='ctx'> 			sectors += rdev-&gt;sectors;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -7328,6 +7383,7 @@ static int remove_and_add_spares(struct mddev *mddev)</div><div class='ctx'> {</div><div class='ctx'> 	struct md_rdev *rdev;</div><div class='ctx'> 	int spares = 0;</div><div class='add'>+	int removed = 0;</div><div class='ctx'> </div><div class='ctx'> 	mddev-&gt;curr_resync_completed = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -7338,29 +7394,32 @@ static int remove_and_add_spares(struct mddev *mddev)</div><div class='ctx'> 		     ! test_bit(In_sync, &amp;rdev-&gt;flags)) &amp;&amp;</div><div class='ctx'> 		    atomic_read(&amp;rdev-&gt;nr_pending)==0) {</div><div class='ctx'> 			if (mddev-&gt;pers-&gt;hot_remove_disk(</div><div class='del'>-				    mddev, rdev-&gt;raid_disk)==0) {</div><div class='add'>+				    mddev, rdev) == 0) {</div><div class='ctx'> 				sysfs_unlink_rdev(mddev, rdev);</div><div class='ctx'> 				rdev-&gt;raid_disk = -1;</div><div class='add'>+				removed++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+	if (removed)</div><div class='add'>+		sysfs_notify(&amp;mddev-&gt;kobj, NULL,</div><div class='add'>+			     "degraded");</div><div class='ctx'> </div><div class='del'>-	if (mddev-&gt;degraded) {</div><div class='del'>-		list_for_each_entry(rdev, &amp;mddev-&gt;disks, same_set) {</div><div class='del'>-			if (rdev-&gt;raid_disk &gt;= 0 &amp;&amp;</div><div class='del'>-			    !test_bit(In_sync, &amp;rdev-&gt;flags) &amp;&amp;</div><div class='del'>-			    !test_bit(Faulty, &amp;rdev-&gt;flags))</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(rdev, &amp;mddev-&gt;disks, same_set) {</div><div class='add'>+		if (rdev-&gt;raid_disk &gt;= 0 &amp;&amp;</div><div class='add'>+		    !test_bit(In_sync, &amp;rdev-&gt;flags) &amp;&amp;</div><div class='add'>+		    !test_bit(Faulty, &amp;rdev-&gt;flags))</div><div class='add'>+			spares++;</div><div class='add'>+		if (rdev-&gt;raid_disk &lt; 0</div><div class='add'>+		    &amp;&amp; !test_bit(Faulty, &amp;rdev-&gt;flags)) {</div><div class='add'>+			rdev-&gt;recovery_offset = 0;</div><div class='add'>+			if (mddev-&gt;pers-&gt;</div><div class='add'>+			    hot_add_disk(mddev, rdev) == 0) {</div><div class='add'>+				if (sysfs_link_rdev(mddev, rdev))</div><div class='add'>+					/* failure here is OK */;</div><div class='ctx'> 				spares++;</div><div class='del'>-			if (rdev-&gt;raid_disk &lt; 0</div><div class='del'>-			    &amp;&amp; !test_bit(Faulty, &amp;rdev-&gt;flags)) {</div><div class='del'>-				rdev-&gt;recovery_offset = 0;</div><div class='del'>-				if (mddev-&gt;pers-&gt;</div><div class='del'>-				    hot_add_disk(mddev, rdev) == 0) {</div><div class='del'>-					if (sysfs_link_rdev(mddev, rdev))</div><div class='del'>-						/* failure here is OK */;</div><div class='del'>-					spares++;</div><div class='del'>-					md_new_event(mddev);</div><div class='del'>-					set_bit(MD_CHANGE_DEVS, &amp;mddev-&gt;flags);</div><div class='del'>-				}</div><div class='add'>+				md_new_event(mddev);</div><div class='add'>+				set_bit(MD_CHANGE_DEVS, &amp;mddev-&gt;flags);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -7475,7 +7534,7 @@ void md_check_recovery(struct mddev *mddev)</div><div class='ctx'> 				    test_bit(Faulty, &amp;rdev-&gt;flags) &amp;&amp;</div><div class='ctx'> 				    atomic_read(&amp;rdev-&gt;nr_pending)==0) {</div><div class='ctx'> 					if (mddev-&gt;pers-&gt;hot_remove_disk(</div><div class='del'>-						    mddev, rdev-&gt;raid_disk)==0) {</div><div class='add'>+						    mddev, rdev) == 0) {</div><div class='ctx'> 						sysfs_unlink_rdev(mddev, rdev);</div><div class='ctx'> 						rdev-&gt;raid_disk = -1;</div><div class='ctx'> 					}</div><div class='head'>diff --git a/drivers/md/md.h b/drivers/md/md.h<br/>index cf742d9306ec..44c63dfeeb2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/md.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/md.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/md.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/md/md.h</a></div><div class='hunk'>@@ -72,34 +72,7 @@ struct md_rdev {</div><div class='ctx'> 	 * This reduces the burden of testing multiple flags in many cases</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	unsigned long	flags;</div><div class='del'>-#define	Faulty		1		/* device is known to have a fault */</div><div class='del'>-#define	In_sync		2		/* device is in_sync with rest of array */</div><div class='del'>-#define	WriteMostly	4		/* Avoid reading if at all possible */</div><div class='del'>-#define	AutoDetected	7		/* added by auto-detect */</div><div class='del'>-#define Blocked		8		/* An error occurred but has not yet</div><div class='del'>-					 * been acknowledged by the metadata</div><div class='del'>-					 * handler, so don't allow writes</div><div class='del'>-					 * until it is cleared */</div><div class='del'>-#define WriteErrorSeen	9		/* A write error has been seen on this</div><div class='del'>-					 * device</div><div class='del'>-					 */</div><div class='del'>-#define FaultRecorded	10		/* Intermediate state for clearing</div><div class='del'>-					 * Blocked.  The Fault is/will-be</div><div class='del'>-					 * recorded in the metadata, but that</div><div class='del'>-					 * metadata hasn't been stored safely</div><div class='del'>-					 * on disk yet.</div><div class='del'>-					 */</div><div class='del'>-#define BlockedBadBlocks 11		/* A writer is blocked because they</div><div class='del'>-					 * found an unacknowledged bad-block.</div><div class='del'>-					 * This can safely be cleared at any</div><div class='del'>-					 * time, and the writer will re-check.</div><div class='del'>-					 * It may be set at any time, and at</div><div class='del'>-					 * worst the writer will timeout and</div><div class='del'>-					 * re-check.  So setting it as</div><div class='del'>-					 * accurately as possible is good, but</div><div class='del'>-					 * not absolutely critical.</div><div class='del'>-					 */</div><div class='add'>+	unsigned long	flags;	/* bit set of 'enum flag_bits' bits. */</div><div class='ctx'> 	wait_queue_head_t blocked_wait;</div><div class='ctx'> </div><div class='ctx'> 	int desc_nr;			/* descriptor index in the superblock */</div><div class='hunk'>@@ -152,6 +125,44 @@ struct md_rdev {</div><div class='ctx'> 		sector_t size;		/* in sectors */</div><div class='ctx'> 	} badblocks;</div><div class='ctx'> };</div><div class='add'>+enum flag_bits {</div><div class='add'>+	Faulty,			/* device is known to have a fault */</div><div class='add'>+	In_sync,		/* device is in_sync with rest of array */</div><div class='add'>+	WriteMostly,		/* Avoid reading if at all possible */</div><div class='add'>+	AutoDetected,		/* added by auto-detect */</div><div class='add'>+	Blocked,		/* An error occurred but has not yet</div><div class='add'>+				 * been acknowledged by the metadata</div><div class='add'>+				 * handler, so don't allow writes</div><div class='add'>+				 * until it is cleared */</div><div class='add'>+	WriteErrorSeen,		/* A write error has been seen on this</div><div class='add'>+				 * device</div><div class='add'>+				 */</div><div class='add'>+	FaultRecorded,		/* Intermediate state for clearing</div><div class='add'>+				 * Blocked.  The Fault is/will-be</div><div class='add'>+				 * recorded in the metadata, but that</div><div class='add'>+				 * metadata hasn't been stored safely</div><div class='add'>+				 * on disk yet.</div><div class='add'>+				 */</div><div class='add'>+	BlockedBadBlocks,	/* A writer is blocked because they</div><div class='add'>+				 * found an unacknowledged bad-block.</div><div class='add'>+				 * This can safely be cleared at any</div><div class='add'>+				 * time, and the writer will re-check.</div><div class='add'>+				 * It may be set at any time, and at</div><div class='add'>+				 * worst the writer will timeout and</div><div class='add'>+				 * re-check.  So setting it as</div><div class='add'>+				 * accurately as possible is good, but</div><div class='add'>+				 * not absolutely critical.</div><div class='add'>+				 */</div><div class='add'>+	WantReplacement,	/* This device is a candidate to be</div><div class='add'>+				 * hot-replaced, either because it has</div><div class='add'>+				 * reported some faults, or because</div><div class='add'>+				 * of explicit request.</div><div class='add'>+				 */</div><div class='add'>+	Replacement,		/* This device is a replacement for</div><div class='add'>+				 * a want_replacement device with same</div><div class='add'>+				 * raid_disk number.</div><div class='add'>+				 */</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #define BB_LEN_MASK	(0x00000000000001FFULL)</div><div class='ctx'> #define BB_OFFSET_MASK	(0x7FFFFFFFFFFFFE00ULL)</div><div class='hunk'>@@ -428,7 +439,7 @@ struct md_personality</div><div class='ctx'> 	 */</div><div class='ctx'> 	void (*error_handler)(struct mddev *mddev, struct md_rdev *rdev);</div><div class='ctx'> 	int (*hot_add_disk) (struct mddev *mddev, struct md_rdev *rdev);</div><div class='del'>-	int (*hot_remove_disk) (struct mddev *mddev, int number);</div><div class='add'>+	int (*hot_remove_disk) (struct mddev *mddev, struct md_rdev *rdev);</div><div class='ctx'> 	int (*spare_active) (struct mddev *mddev);</div><div class='ctx'> 	sector_t (*sync_request)(struct mddev *mddev, sector_t sector_nr, int *skipped, int go_faster);</div><div class='ctx'> 	int (*resize) (struct mddev *mddev, sector_t sectors);</div><div class='hunk'>@@ -482,15 +493,20 @@ static inline char * mdname (struct mddev * mddev)</div><div class='ctx'> static inline int sysfs_link_rdev(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	char nm[20];</div><div class='del'>-	sprintf(nm, "rd%d", rdev-&gt;raid_disk);</div><div class='del'>-	return sysfs_create_link(&amp;mddev-&gt;kobj, &amp;rdev-&gt;kobj, nm);</div><div class='add'>+	if (!test_bit(Replacement, &amp;rdev-&gt;flags)) {</div><div class='add'>+		sprintf(nm, "rd%d", rdev-&gt;raid_disk);</div><div class='add'>+		return sysfs_create_link(&amp;mddev-&gt;kobj, &amp;rdev-&gt;kobj, nm);</div><div class='add'>+	} else</div><div class='add'>+		return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void sysfs_unlink_rdev(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	char nm[20];</div><div class='del'>-	sprintf(nm, "rd%d", rdev-&gt;raid_disk);</div><div class='del'>-	sysfs_remove_link(&amp;mddev-&gt;kobj, nm);</div><div class='add'>+	if (!test_bit(Replacement, &amp;rdev-&gt;flags)) {</div><div class='add'>+		sprintf(nm, "rd%d", rdev-&gt;raid_disk);</div><div class='add'>+		sysfs_remove_link(&amp;mddev-&gt;kobj, nm);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c<br/>index 5899246fa37e..a222f516660e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/multipath.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/multipath.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/multipath.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/md/multipath.c</a></div><div class='hunk'>@@ -292,17 +292,16 @@ static int multipath_add_disk(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int multipath_remove_disk(struct mddev *mddev, int number)</div><div class='add'>+static int multipath_remove_disk(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpconf *conf = mddev-&gt;private;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	struct md_rdev *rdev;</div><div class='add'>+	int number = rdev-&gt;raid_disk;</div><div class='ctx'> 	struct multipath_info *p = conf-&gt;multipaths + number;</div><div class='ctx'> </div><div class='ctx'> 	print_multipath_conf(conf);</div><div class='ctx'> </div><div class='del'>-	rdev = p-&gt;rdev;</div><div class='del'>-	if (rdev) {</div><div class='add'>+	if (rdev == p-&gt;rdev) {</div><div class='ctx'> 		if (test_bit(In_sync, &amp;rdev-&gt;flags) ||</div><div class='ctx'> 		    atomic_read(&amp;rdev-&gt;nr_pending)) {</div><div class='ctx'> 			printk(KERN_ERR "hot-remove-disk, slot %d is identified"</div><div class='head'>diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c<br/>index ede2461e79c5..a368db2431a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/raid1.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/raid1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/raid1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/md/raid1.c</a></div><div class='hunk'>@@ -135,7 +135,7 @@ out_free_pages:</div><div class='ctx'> 			put_page(r1_bio-&gt;bios[j]-&gt;bi_io_vec[i].bv_page);</div><div class='ctx'> 	j = -1;</div><div class='ctx'> out_free_bio:</div><div class='del'>-	while ( ++j &lt; pi-&gt;raid_disks )</div><div class='add'>+	while (++j &lt; pi-&gt;raid_disks)</div><div class='ctx'> 		bio_put(r1_bio-&gt;bios[j]);</div><div class='ctx'> 	r1bio_pool_free(r1_bio, data);</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -164,7 +164,7 @@ static void put_all_bios(struct r1conf *conf, struct r1bio *r1_bio)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; conf-&gt;raid_disks; i++) {</div><div class='add'>+	for (i = 0; i &lt; conf-&gt;raid_disks * 2; i++) {</div><div class='ctx'> 		struct bio **bio = r1_bio-&gt;bios + i;</div><div class='ctx'> 		if (!BIO_SPECIAL(*bio))</div><div class='ctx'> 			bio_put(*bio);</div><div class='hunk'>@@ -185,7 +185,7 @@ static void put_buf(struct r1bio *r1_bio)</div><div class='ctx'> 	struct r1conf *conf = r1_bio-&gt;mddev-&gt;private;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;conf-&gt;raid_disks; i++) {</div><div class='add'>+	for (i = 0; i &lt; conf-&gt;raid_disks * 2; i++) {</div><div class='ctx'> 		struct bio *bio = r1_bio-&gt;bios[i];</div><div class='ctx'> 		if (bio-&gt;bi_end_io)</div><div class='ctx'> 			rdev_dec_pending(conf-&gt;mirrors[i].rdev, r1_bio-&gt;mddev);</div><div class='hunk'>@@ -277,13 +277,14 @@ static inline void update_head_pos(int disk, struct r1bio *r1_bio)</div><div class='ctx'> static int find_bio_disk(struct r1bio *r1_bio, struct bio *bio)</div><div class='ctx'> {</div><div class='ctx'> 	int mirror;</div><div class='del'>-	int raid_disks = r1_bio-&gt;mddev-&gt;raid_disks;</div><div class='add'>+	struct r1conf *conf = r1_bio-&gt;mddev-&gt;private;</div><div class='add'>+	int raid_disks = conf-&gt;raid_disks;</div><div class='ctx'> </div><div class='del'>-	for (mirror = 0; mirror &lt; raid_disks; mirror++)</div><div class='add'>+	for (mirror = 0; mirror &lt; raid_disks * 2; mirror++)</div><div class='ctx'> 		if (r1_bio-&gt;bios[mirror] == bio)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(mirror == raid_disks);</div><div class='add'>+	BUG_ON(mirror == raid_disks * 2);</div><div class='ctx'> 	update_head_pos(mirror, r1_bio);</div><div class='ctx'> </div><div class='ctx'> 	return mirror;</div><div class='hunk'>@@ -390,6 +391,11 @@ static void raid1_end_write_request(struct bio *bio, int error)</div><div class='ctx'> 	if (!uptodate) {</div><div class='ctx'> 		set_bit(WriteErrorSeen,</div><div class='ctx'> 			&amp;conf-&gt;mirrors[mirror].rdev-&gt;flags);</div><div class='add'>+		if (!test_and_set_bit(WantReplacement,</div><div class='add'>+				      &amp;conf-&gt;mirrors[mirror].rdev-&gt;flags))</div><div class='add'>+			set_bit(MD_RECOVERY_NEEDED, &amp;</div><div class='add'>+				conf-&gt;mddev-&gt;recovery);</div><div class='add'>+</div><div class='ctx'> 		set_bit(R1BIO_WriteError, &amp;r1_bio-&gt;state);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -505,7 +511,7 @@ static int read_balance(struct r1conf *conf, struct r1bio *r1_bio, int *max_sect</div><div class='ctx'> 		start_disk = conf-&gt;last_used;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0 ; i &lt; conf-&gt;raid_disks ; i++) {</div><div class='add'>+	for (i = 0 ; i &lt; conf-&gt;raid_disks * 2 ; i++) {</div><div class='ctx'> 		sector_t dist;</div><div class='ctx'> 		sector_t first_bad;</div><div class='ctx'> 		int bad_sectors;</div><div class='hunk'>@@ -525,8 +531,17 @@ static int read_balance(struct r1conf *conf, struct r1bio *r1_bio, int *max_sect</div><div class='ctx'> 		if (test_bit(WriteMostly, &amp;rdev-&gt;flags)) {</div><div class='ctx'> 			/* Don't balance among write-mostly, just</div><div class='ctx'> 			 * use the first as a last resort */</div><div class='del'>-			if (best_disk &lt; 0)</div><div class='add'>+			if (best_disk &lt; 0) {</div><div class='add'>+				if (is_badblock(rdev, this_sector, sectors,</div><div class='add'>+						&amp;first_bad, &amp;bad_sectors)) {</div><div class='add'>+					if (first_bad &lt; this_sector)</div><div class='add'>+						/* Cannot use this */</div><div class='add'>+						continue;</div><div class='add'>+					best_good_sectors = first_bad - this_sector;</div><div class='add'>+				} else</div><div class='add'>+					best_good_sectors = sectors;</div><div class='ctx'> 				best_disk = disk;</div><div class='add'>+			}</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* This is a reasonable device to use.  It might</div><div class='hunk'>@@ -609,7 +624,7 @@ int md_raid1_congested(struct mddev *mddev, int bits)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	for (i = 0; i &lt; mddev-&gt;raid_disks; i++) {</div><div class='add'>+	for (i = 0; i &lt; conf-&gt;raid_disks; i++) {</div><div class='ctx'> 		struct md_rdev *rdev = rcu_dereference(conf-&gt;mirrors[i].rdev);</div><div class='ctx'> 		if (rdev &amp;&amp; !test_bit(Faulty, &amp;rdev-&gt;flags)) {</div><div class='ctx'> 			struct request_queue *q = bdev_get_queue(rdev-&gt;bdev);</div><div class='hunk'>@@ -974,7 +989,7 @@ read_again:</div><div class='ctx'> 	 */</div><div class='ctx'> 	plugged = mddev_check_plugged(mddev);</div><div class='ctx'> </div><div class='del'>-	disks = conf-&gt;raid_disks;</div><div class='add'>+	disks = conf-&gt;raid_disks * 2;</div><div class='ctx'>  retry_write:</div><div class='ctx'> 	blocked_rdev = NULL;</div><div class='ctx'> 	rcu_read_lock();</div><div class='hunk'>@@ -988,7 +1003,8 @@ read_again:</div><div class='ctx'> 		}</div><div class='ctx'> 		r1_bio-&gt;bios[i] = NULL;</div><div class='ctx'> 		if (!rdev || test_bit(Faulty, &amp;rdev-&gt;flags)) {</div><div class='del'>-			set_bit(R1BIO_Degraded, &amp;r1_bio-&gt;state);</div><div class='add'>+			if (i &lt; conf-&gt;raid_disks)</div><div class='add'>+				set_bit(R1BIO_Degraded, &amp;r1_bio-&gt;state);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1263,6 +1279,25 @@ static int raid1_spare_active(struct mddev *mddev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; conf-&gt;raid_disks; i++) {</div><div class='ctx'> 		struct md_rdev *rdev = conf-&gt;mirrors[i].rdev;</div><div class='add'>+		struct md_rdev *repl = conf-&gt;mirrors[conf-&gt;raid_disks + i].rdev;</div><div class='add'>+		if (repl</div><div class='add'>+		    &amp;&amp; repl-&gt;recovery_offset == MaxSector</div><div class='add'>+		    &amp;&amp; !test_bit(Faulty, &amp;repl-&gt;flags)</div><div class='add'>+		    &amp;&amp; !test_and_set_bit(In_sync, &amp;repl-&gt;flags)) {</div><div class='add'>+			/* replacement has just become active */</div><div class='add'>+			if (!rdev ||</div><div class='add'>+			    !test_and_clear_bit(In_sync, &amp;rdev-&gt;flags))</div><div class='add'>+				count++;</div><div class='add'>+			if (rdev) {</div><div class='add'>+				/* Replaced device not technically</div><div class='add'>+				 * faulty, but we need to be sure</div><div class='add'>+				 * it gets removed and never re-added</div><div class='add'>+				 */</div><div class='add'>+				set_bit(Faulty, &amp;rdev-&gt;flags);</div><div class='add'>+				sysfs_notify_dirent_safe(</div><div class='add'>+					rdev-&gt;sysfs_state);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		if (rdev</div><div class='ctx'> 		    &amp;&amp; !test_bit(Faulty, &amp;rdev-&gt;flags)</div><div class='ctx'> 		    &amp;&amp; !test_and_set_bit(In_sync, &amp;rdev-&gt;flags)) {</div><div class='hunk'>@@ -1286,7 +1321,7 @@ static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> 	int mirror = 0;</div><div class='ctx'> 	struct mirror_info *p;</div><div class='ctx'> 	int first = 0;</div><div class='del'>-	int last = mddev-&gt;raid_disks - 1;</div><div class='add'>+	int last = conf-&gt;raid_disks - 1;</div><div class='ctx'> </div><div class='ctx'> 	if (mddev-&gt;recovery_disabled == conf-&gt;recovery_disabled)</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -1294,8 +1329,9 @@ static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> 	if (rdev-&gt;raid_disk &gt;= 0)</div><div class='ctx'> 		first = last = rdev-&gt;raid_disk;</div><div class='ctx'> </div><div class='del'>-	for (mirror = first; mirror &lt;= last; mirror++)</div><div class='del'>-		if ( !(p=conf-&gt;mirrors+mirror)-&gt;rdev) {</div><div class='add'>+	for (mirror = first; mirror &lt;= last; mirror++) {</div><div class='add'>+		p = conf-&gt;mirrors+mirror;</div><div class='add'>+		if (!p-&gt;rdev) {</div><div class='ctx'> </div><div class='ctx'> 			disk_stack_limits(mddev-&gt;gendisk, rdev-&gt;bdev,</div><div class='ctx'> 					  rdev-&gt;data_offset &lt;&lt; 9);</div><div class='hunk'>@@ -1322,21 +1358,35 @@ static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> 			rcu_assign_pointer(p-&gt;rdev, rdev);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		if (test_bit(WantReplacement, &amp;p-&gt;rdev-&gt;flags) &amp;&amp;</div><div class='add'>+		    p[conf-&gt;raid_disks].rdev == NULL) {</div><div class='add'>+			/* Add this device as a replacement */</div><div class='add'>+			clear_bit(In_sync, &amp;rdev-&gt;flags);</div><div class='add'>+			set_bit(Replacement, &amp;rdev-&gt;flags);</div><div class='add'>+			rdev-&gt;raid_disk = mirror;</div><div class='add'>+			err = 0;</div><div class='add'>+			conf-&gt;fullsync = 1;</div><div class='add'>+			rcu_assign_pointer(p[conf-&gt;raid_disks].rdev, rdev);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	md_integrity_add_rdev(rdev, mddev);</div><div class='ctx'> 	print_conf(conf);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int raid1_remove_disk(struct mddev *mddev, int number)</div><div class='add'>+static int raid1_remove_disk(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct r1conf *conf = mddev-&gt;private;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	struct md_rdev *rdev;</div><div class='add'>+	int number = rdev-&gt;raid_disk;</div><div class='ctx'> 	struct mirror_info *p = conf-&gt;mirrors+ number;</div><div class='ctx'> </div><div class='add'>+	if (rdev != p-&gt;rdev)</div><div class='add'>+		p = conf-&gt;mirrors + conf-&gt;raid_disks + number;</div><div class='add'>+</div><div class='ctx'> 	print_conf(conf);</div><div class='del'>-	rdev = p-&gt;rdev;</div><div class='del'>-	if (rdev) {</div><div class='add'>+	if (rdev == p-&gt;rdev) {</div><div class='ctx'> 		if (test_bit(In_sync, &amp;rdev-&gt;flags) ||</div><div class='ctx'> 		    atomic_read(&amp;rdev-&gt;nr_pending)) {</div><div class='ctx'> 			err = -EBUSY;</div><div class='hunk'>@@ -1358,7 +1408,21 @@ static int raid1_remove_disk(struct mddev *mddev, int number)</div><div class='ctx'> 			err = -EBUSY;</div><div class='ctx'> 			p-&gt;rdev = rdev;</div><div class='ctx'> 			goto abort;</div><div class='del'>-		}</div><div class='add'>+		} else if (conf-&gt;mirrors[conf-&gt;raid_disks + number].rdev) {</div><div class='add'>+			/* We just removed a device that is being replaced.</div><div class='add'>+			 * Move down the replacement.  We drain all IO before</div><div class='add'>+			 * doing this to avoid confusion.</div><div class='add'>+			 */</div><div class='add'>+			struct md_rdev *repl =</div><div class='add'>+				conf-&gt;mirrors[conf-&gt;raid_disks + number].rdev;</div><div class='add'>+			raise_barrier(conf);</div><div class='add'>+			clear_bit(Replacement, &amp;repl-&gt;flags);</div><div class='add'>+			p-&gt;rdev = repl;</div><div class='add'>+			conf-&gt;mirrors[conf-&gt;raid_disks + number].rdev = NULL;</div><div class='add'>+			lower_barrier(conf);</div><div class='add'>+			clear_bit(WantReplacement, &amp;rdev-&gt;flags);</div><div class='add'>+		} else</div><div class='add'>+			clear_bit(WantReplacement, &amp;rdev-&gt;flags);</div><div class='ctx'> 		err = md_integrity_register(mddev);</div><div class='ctx'> 	}</div><div class='ctx'> abort:</div><div class='hunk'>@@ -1411,6 +1475,10 @@ static void end_sync_write(struct bio *bio, int error)</div><div class='ctx'> 		} while (sectors_to_go &gt; 0);</div><div class='ctx'> 		set_bit(WriteErrorSeen,</div><div class='ctx'> 			&amp;conf-&gt;mirrors[mirror].rdev-&gt;flags);</div><div class='add'>+		if (!test_and_set_bit(WantReplacement,</div><div class='add'>+				      &amp;conf-&gt;mirrors[mirror].rdev-&gt;flags))</div><div class='add'>+			set_bit(MD_RECOVERY_NEEDED, &amp;</div><div class='add'>+				mddev-&gt;recovery);</div><div class='ctx'> 		set_bit(R1BIO_WriteError, &amp;r1_bio-&gt;state);</div><div class='ctx'> 	} else if (is_badblock(conf-&gt;mirrors[mirror].rdev,</div><div class='ctx'> 			       r1_bio-&gt;sector,</div><div class='hunk'>@@ -1441,8 +1509,13 @@ static int r1_sync_page_io(struct md_rdev *rdev, sector_t sector,</div><div class='ctx'> 	if (sync_page_io(rdev, sector, sectors &lt;&lt; 9, page, rw, false))</div><div class='ctx'> 		/* success */</div><div class='ctx'> 		return 1;</div><div class='del'>-	if (rw == WRITE)</div><div class='add'>+	if (rw == WRITE) {</div><div class='ctx'> 		set_bit(WriteErrorSeen, &amp;rdev-&gt;flags);</div><div class='add'>+		if (!test_and_set_bit(WantReplacement,</div><div class='add'>+				      &amp;rdev-&gt;flags))</div><div class='add'>+			set_bit(MD_RECOVERY_NEEDED, &amp;</div><div class='add'>+				rdev-&gt;mddev-&gt;recovery);</div><div class='add'>+	}</div><div class='ctx'> 	/* need to record an error - either for the block or the device */</div><div class='ctx'> 	if (!rdev_set_badblocks(rdev, sector, sectors, 0))</div><div class='ctx'> 		md_error(rdev-&gt;mddev, rdev);</div><div class='hunk'>@@ -1493,7 +1566,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 			d++;</div><div class='del'>-			if (d == conf-&gt;raid_disks)</div><div class='add'>+			if (d == conf-&gt;raid_disks * 2)</div><div class='ctx'> 				d = 0;</div><div class='ctx'> 		} while (!success &amp;&amp; d != r1_bio-&gt;read_disk);</div><div class='ctx'> </div><div class='hunk'>@@ -1510,7 +1583,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)</div><div class='ctx'> 			       mdname(mddev),</div><div class='ctx'> 			       bdevname(bio-&gt;bi_bdev, b),</div><div class='ctx'> 			       (unsigned long long)r1_bio-&gt;sector);</div><div class='del'>-			for (d = 0; d &lt; conf-&gt;raid_disks; d++) {</div><div class='add'>+			for (d = 0; d &lt; conf-&gt;raid_disks * 2; d++) {</div><div class='ctx'> 				rdev = conf-&gt;mirrors[d].rdev;</div><div class='ctx'> 				if (!rdev || test_bit(Faulty, &amp;rdev-&gt;flags))</div><div class='ctx'> 					continue;</div><div class='hunk'>@@ -1536,7 +1609,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)</div><div class='ctx'> 		/* write it back and re-read */</div><div class='ctx'> 		while (d != r1_bio-&gt;read_disk) {</div><div class='ctx'> 			if (d == 0)</div><div class='del'>-				d = conf-&gt;raid_disks;</div><div class='add'>+				d = conf-&gt;raid_disks * 2;</div><div class='ctx'> 			d--;</div><div class='ctx'> 			if (r1_bio-&gt;bios[d]-&gt;bi_end_io != end_sync_read)</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -1551,7 +1624,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)</div><div class='ctx'> 		d = start;</div><div class='ctx'> 		while (d != r1_bio-&gt;read_disk) {</div><div class='ctx'> 			if (d == 0)</div><div class='del'>-				d = conf-&gt;raid_disks;</div><div class='add'>+				d = conf-&gt;raid_disks * 2;</div><div class='ctx'> 			d--;</div><div class='ctx'> 			if (r1_bio-&gt;bios[d]-&gt;bi_end_io != end_sync_read)</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -1584,7 +1657,7 @@ static int process_checks(struct r1bio *r1_bio)</div><div class='ctx'> 	int primary;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (primary = 0; primary &lt; conf-&gt;raid_disks; primary++)</div><div class='add'>+	for (primary = 0; primary &lt; conf-&gt;raid_disks * 2; primary++)</div><div class='ctx'> 		if (r1_bio-&gt;bios[primary]-&gt;bi_end_io == end_sync_read &amp;&amp;</div><div class='ctx'> 		    test_bit(BIO_UPTODATE, &amp;r1_bio-&gt;bios[primary]-&gt;bi_flags)) {</div><div class='ctx'> 			r1_bio-&gt;bios[primary]-&gt;bi_end_io = NULL;</div><div class='hunk'>@@ -1592,7 +1665,7 @@ static int process_checks(struct r1bio *r1_bio)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	r1_bio-&gt;read_disk = primary;</div><div class='del'>-	for (i = 0; i &lt; conf-&gt;raid_disks; i++) {</div><div class='add'>+	for (i = 0; i &lt; conf-&gt;raid_disks * 2; i++) {</div><div class='ctx'> 		int j;</div><div class='ctx'> 		int vcnt = r1_bio-&gt;sectors &gt;&gt; (PAGE_SHIFT- 9);</div><div class='ctx'> 		struct bio *pbio = r1_bio-&gt;bios[primary];</div><div class='hunk'>@@ -1656,7 +1729,7 @@ static void sync_request_write(struct mddev *mddev, struct r1bio *r1_bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct r1conf *conf = mddev-&gt;private;</div><div class='ctx'> 	int i;</div><div class='del'>-	int disks = conf-&gt;raid_disks;</div><div class='add'>+	int disks = conf-&gt;raid_disks * 2;</div><div class='ctx'> 	struct bio *bio, *wbio;</div><div class='ctx'> </div><div class='ctx'> 	bio = r1_bio-&gt;bios[r1_bio-&gt;read_disk];</div><div class='hunk'>@@ -1737,7 +1810,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,</div><div class='ctx'> 				success = 1;</div><div class='ctx'> 			else {</div><div class='ctx'> 				d++;</div><div class='del'>-				if (d == conf-&gt;raid_disks)</div><div class='add'>+				if (d == conf-&gt;raid_disks * 2)</div><div class='ctx'> 					d = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		} while (!success &amp;&amp; d != read_disk);</div><div class='hunk'>@@ -1753,7 +1826,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,</div><div class='ctx'> 		start = d;</div><div class='ctx'> 		while (d != read_disk) {</div><div class='ctx'> 			if (d==0)</div><div class='del'>-				d = conf-&gt;raid_disks;</div><div class='add'>+				d = conf-&gt;raid_disks * 2;</div><div class='ctx'> 			d--;</div><div class='ctx'> 			rdev = conf-&gt;mirrors[d].rdev;</div><div class='ctx'> 			if (rdev &amp;&amp;</div><div class='hunk'>@@ -1765,7 +1838,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,</div><div class='ctx'> 		while (d != read_disk) {</div><div class='ctx'> 			char b[BDEVNAME_SIZE];</div><div class='ctx'> 			if (d==0)</div><div class='del'>-				d = conf-&gt;raid_disks;</div><div class='add'>+				d = conf-&gt;raid_disks * 2;</div><div class='ctx'> 			d--;</div><div class='ctx'> 			rdev = conf-&gt;mirrors[d].rdev;</div><div class='ctx'> 			if (rdev &amp;&amp;</div><div class='hunk'>@@ -1887,7 +1960,7 @@ static void handle_sync_write_finished(struct r1conf *conf, struct r1bio *r1_bio</div><div class='ctx'> {</div><div class='ctx'> 	int m;</div><div class='ctx'> 	int s = r1_bio-&gt;sectors;</div><div class='del'>-	for (m = 0; m &lt; conf-&gt;raid_disks ; m++) {</div><div class='add'>+	for (m = 0; m &lt; conf-&gt;raid_disks * 2 ; m++) {</div><div class='ctx'> 		struct md_rdev *rdev = conf-&gt;mirrors[m].rdev;</div><div class='ctx'> 		struct bio *bio = r1_bio-&gt;bios[m];</div><div class='ctx'> 		if (bio-&gt;bi_end_io == NULL)</div><div class='hunk'>@@ -1909,7 +1982,7 @@ static void handle_sync_write_finished(struct r1conf *conf, struct r1bio *r1_bio</div><div class='ctx'> static void handle_write_finished(struct r1conf *conf, struct r1bio *r1_bio)</div><div class='ctx'> {</div><div class='ctx'> 	int m;</div><div class='del'>-	for (m = 0; m &lt; conf-&gt;raid_disks ; m++)</div><div class='add'>+	for (m = 0; m &lt; conf-&gt;raid_disks * 2 ; m++)</div><div class='ctx'> 		if (r1_bio-&gt;bios[m] == IO_MADE_GOOD) {</div><div class='ctx'> 			struct md_rdev *rdev = conf-&gt;mirrors[m].rdev;</div><div class='ctx'> 			rdev_clear_badblocks(rdev,</div><div class='hunk'>@@ -2184,7 +2257,7 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipp</div><div class='ctx'> 	r1_bio-&gt;state = 0;</div><div class='ctx'> 	set_bit(R1BIO_IsSync, &amp;r1_bio-&gt;state);</div><div class='ctx'> </div><div class='del'>-	for (i=0; i &lt; conf-&gt;raid_disks; i++) {</div><div class='add'>+	for (i = 0; i &lt; conf-&gt;raid_disks * 2; i++) {</div><div class='ctx'> 		struct md_rdev *rdev;</div><div class='ctx'> 		bio = r1_bio-&gt;bios[i];</div><div class='ctx'> </div><div class='hunk'>@@ -2203,7 +2276,8 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipp</div><div class='ctx'> 		rdev = rcu_dereference(conf-&gt;mirrors[i].rdev);</div><div class='ctx'> 		if (rdev == NULL ||</div><div class='ctx'> 		    test_bit(Faulty, &amp;rdev-&gt;flags)) {</div><div class='del'>-			still_degraded = 1;</div><div class='add'>+			if (i &lt; conf-&gt;raid_disks)</div><div class='add'>+				still_degraded = 1;</div><div class='ctx'> 		} else if (!test_bit(In_sync, &amp;rdev-&gt;flags)) {</div><div class='ctx'> 			bio-&gt;bi_rw = WRITE;</div><div class='ctx'> 			bio-&gt;bi_end_io = end_sync_write;</div><div class='hunk'>@@ -2254,7 +2328,7 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipp</div><div class='ctx'> 		 * need to mark them bad on all write targets</div><div class='ctx'> 		 */</div><div class='ctx'> 		int ok = 1;</div><div class='del'>-		for (i = 0 ; i &lt; conf-&gt;raid_disks ; i++)</div><div class='add'>+		for (i = 0 ; i &lt; conf-&gt;raid_disks * 2 ; i++)</div><div class='ctx'> 			if (r1_bio-&gt;bios[i]-&gt;bi_end_io == end_sync_write) {</div><div class='ctx'> 				struct md_rdev *rdev =</div><div class='ctx'> 					rcu_dereference(conf-&gt;mirrors[i].rdev);</div><div class='hunk'>@@ -2323,7 +2397,7 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipp</div><div class='ctx'> 				len = sync_blocks&lt;&lt;9;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		for (i=0 ; i &lt; conf-&gt;raid_disks; i++) {</div><div class='add'>+		for (i = 0 ; i &lt; conf-&gt;raid_disks * 2; i++) {</div><div class='ctx'> 			bio = r1_bio-&gt;bios[i];</div><div class='ctx'> 			if (bio-&gt;bi_end_io) {</div><div class='ctx'> 				page = bio-&gt;bi_io_vec[bio-&gt;bi_vcnt].bv_page;</div><div class='hunk'>@@ -2356,7 +2430,7 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipp</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (test_bit(MD_RECOVERY_REQUESTED, &amp;mddev-&gt;recovery)) {</div><div class='ctx'> 		atomic_set(&amp;r1_bio-&gt;remaining, read_targets);</div><div class='del'>-		for (i=0; i&lt;conf-&gt;raid_disks; i++) {</div><div class='add'>+		for (i = 0; i &lt; conf-&gt;raid_disks * 2; i++) {</div><div class='ctx'> 			bio = r1_bio-&gt;bios[i];</div><div class='ctx'> 			if (bio-&gt;bi_end_io == end_sync_read) {</div><div class='ctx'> 				md_sync_acct(bio-&gt;bi_bdev, nr_sectors);</div><div class='hunk'>@@ -2393,7 +2467,8 @@ static struct r1conf *setup_conf(struct mddev *mddev)</div><div class='ctx'> 	if (!conf)</div><div class='ctx'> 		goto abort;</div><div class='ctx'> </div><div class='del'>-	conf-&gt;mirrors = kzalloc(sizeof(struct mirror_info)*mddev-&gt;raid_disks,</div><div class='add'>+	conf-&gt;mirrors = kzalloc(sizeof(struct mirror_info)</div><div class='add'>+				* mddev-&gt;raid_disks * 2,</div><div class='ctx'> 				 GFP_KERNEL);</div><div class='ctx'> 	if (!conf-&gt;mirrors)</div><div class='ctx'> 		goto abort;</div><div class='hunk'>@@ -2405,7 +2480,7 @@ static struct r1conf *setup_conf(struct mddev *mddev)</div><div class='ctx'> 	conf-&gt;poolinfo = kzalloc(sizeof(*conf-&gt;poolinfo), GFP_KERNEL);</div><div class='ctx'> 	if (!conf-&gt;poolinfo)</div><div class='ctx'> 		goto abort;</div><div class='del'>-	conf-&gt;poolinfo-&gt;raid_disks = mddev-&gt;raid_disks;</div><div class='add'>+	conf-&gt;poolinfo-&gt;raid_disks = mddev-&gt;raid_disks * 2;</div><div class='ctx'> 	conf-&gt;r1bio_pool = mempool_create(NR_RAID1_BIOS, r1bio_pool_alloc,</div><div class='ctx'> 					  r1bio_pool_free,</div><div class='ctx'> 					  conf-&gt;poolinfo);</div><div class='hunk'>@@ -2414,14 +2489,20 @@ static struct r1conf *setup_conf(struct mddev *mddev)</div><div class='ctx'> </div><div class='ctx'> 	conf-&gt;poolinfo-&gt;mddev = mddev;</div><div class='ctx'> </div><div class='add'>+	err = -EINVAL;</div><div class='ctx'> 	spin_lock_init(&amp;conf-&gt;device_lock);</div><div class='ctx'> 	list_for_each_entry(rdev, &amp;mddev-&gt;disks, same_set) {</div><div class='ctx'> 		int disk_idx = rdev-&gt;raid_disk;</div><div class='ctx'> 		if (disk_idx &gt;= mddev-&gt;raid_disks</div><div class='ctx'> 		    || disk_idx &lt; 0)</div><div class='ctx'> 			continue;</div><div class='del'>-		disk = conf-&gt;mirrors + disk_idx;</div><div class='add'>+		if (test_bit(Replacement, &amp;rdev-&gt;flags))</div><div class='add'>+			disk = conf-&gt;mirrors + conf-&gt;raid_disks + disk_idx;</div><div class='add'>+		else</div><div class='add'>+			disk = conf-&gt;mirrors + disk_idx;</div><div class='ctx'> </div><div class='add'>+		if (disk-&gt;rdev)</div><div class='add'>+			goto abort;</div><div class='ctx'> 		disk-&gt;rdev = rdev;</div><div class='ctx'> </div><div class='ctx'> 		disk-&gt;head_position = 0;</div><div class='hunk'>@@ -2437,11 +2518,27 @@ static struct r1conf *setup_conf(struct mddev *mddev)</div><div class='ctx'> 	conf-&gt;pending_count = 0;</div><div class='ctx'> 	conf-&gt;recovery_disabled = mddev-&gt;recovery_disabled - 1;</div><div class='ctx'> </div><div class='add'>+	err = -EIO;</div><div class='ctx'> 	conf-&gt;last_used = -1;</div><div class='del'>-	for (i = 0; i &lt; conf-&gt;raid_disks; i++) {</div><div class='add'>+	for (i = 0; i &lt; conf-&gt;raid_disks * 2; i++) {</div><div class='ctx'> </div><div class='ctx'> 		disk = conf-&gt;mirrors + i;</div><div class='ctx'> </div><div class='add'>+		if (i &lt; conf-&gt;raid_disks &amp;&amp;</div><div class='add'>+		    disk[conf-&gt;raid_disks].rdev) {</div><div class='add'>+			/* This slot has a replacement. */</div><div class='add'>+			if (!disk-&gt;rdev) {</div><div class='add'>+				/* No original, just make the replacement</div><div class='add'>+				 * a recovering spare</div><div class='add'>+				 */</div><div class='add'>+				disk-&gt;rdev =</div><div class='add'>+					disk[conf-&gt;raid_disks].rdev;</div><div class='add'>+				disk[conf-&gt;raid_disks].rdev = NULL;</div><div class='add'>+			} else if (!test_bit(In_sync, &amp;disk-&gt;rdev-&gt;flags))</div><div class='add'>+				/* Original is not in_sync - bad */</div><div class='add'>+				goto abort;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (!disk-&gt;rdev ||</div><div class='ctx'> 		    !test_bit(In_sync, &amp;disk-&gt;rdev-&gt;flags)) {</div><div class='ctx'> 			disk-&gt;head_position = 0;</div><div class='hunk'>@@ -2455,7 +2552,6 @@ static struct r1conf *setup_conf(struct mddev *mddev)</div><div class='ctx'> 			conf-&gt;last_used = i;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = -EIO;</div><div class='ctx'> 	if (conf-&gt;last_used &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "md/raid1:%s: no operational mirrors\n",</div><div class='ctx'> 		       mdname(mddev));</div><div class='hunk'>@@ -2665,7 +2761,7 @@ static int raid1_reshape(struct mddev *mddev)</div><div class='ctx'> 	if (!newpoolinfo)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	newpoolinfo-&gt;mddev = mddev;</div><div class='del'>-	newpoolinfo-&gt;raid_disks = raid_disks;</div><div class='add'>+	newpoolinfo-&gt;raid_disks = raid_disks * 2;</div><div class='ctx'> </div><div class='ctx'> 	newpool = mempool_create(NR_RAID1_BIOS, r1bio_pool_alloc,</div><div class='ctx'> 				 r1bio_pool_free, newpoolinfo);</div><div class='hunk'>@@ -2673,7 +2769,8 @@ static int raid1_reshape(struct mddev *mddev)</div><div class='ctx'> 		kfree(newpoolinfo);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	newmirrors = kzalloc(sizeof(struct mirror_info) * raid_disks, GFP_KERNEL);</div><div class='add'>+	newmirrors = kzalloc(sizeof(struct mirror_info) * raid_disks * 2,</div><div class='add'>+			     GFP_KERNEL);</div><div class='ctx'> 	if (!newmirrors) {</div><div class='ctx'> 		kfree(newpoolinfo);</div><div class='ctx'> 		mempool_destroy(newpool);</div><div class='head'>diff --git a/drivers/md/raid1.h b/drivers/md/raid1.h<br/>index c732b6cce935..80ded139314c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/raid1.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/raid1.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/raid1.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/md/raid1.h</a></div><div class='hunk'>@@ -12,6 +12,9 @@ struct mirror_info {</div><div class='ctx'>  * pool was allocated for, so they know how much to allocate and free.</div><div class='ctx'>  * mddev-&gt;raid_disks cannot be used, as it can change while a pool is active</div><div class='ctx'>  * These two datums are stored in a kmalloced struct.</div><div class='add'>+ * The 'raid_disks' here is twice the raid_disks in r1conf.</div><div class='add'>+ * This allows space for each 'real' device can have a replacement in the</div><div class='add'>+ * second half of the array.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct pool_info {</div><div class='hunk'>@@ -21,7 +24,9 @@ struct pool_info {</div><div class='ctx'> </div><div class='ctx'> struct r1conf {</div><div class='ctx'> 	struct mddev		*mddev;</div><div class='del'>-	struct mirror_info		*mirrors;</div><div class='add'>+	struct mirror_info	*mirrors;	/* twice 'raid_disks' to</div><div class='add'>+						 * allow for replacements.</div><div class='add'>+						 */</div><div class='ctx'> 	int			raid_disks;</div><div class='ctx'> </div><div class='ctx'> 	/* When choose the best device for a read (read_balance())</div><div class='head'>diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c<br/>index 685ddf325ee4..6e8aa213f0d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/raid10.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/raid10.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/raid10.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/md/raid10.c</a></div><div class='hunk'>@@ -73,7 +73,8 @@ static void * r10bio_pool_alloc(gfp_t gfp_flags, void *data)</div><div class='ctx'> 	struct r10conf *conf = data;</div><div class='ctx'> 	int size = offsetof(struct r10bio, devs[conf-&gt;copies]);</div><div class='ctx'> </div><div class='del'>-	/* allocate a r10bio with room for raid_disks entries in the bios array */</div><div class='add'>+	/* allocate a r10bio with room for raid_disks entries in the</div><div class='add'>+	 * bios array */</div><div class='ctx'> 	return kzalloc(size, gfp_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -123,12 +124,19 @@ static void * r10buf_pool_alloc(gfp_t gfp_flags, void *data)</div><div class='ctx'> 		if (!bio)</div><div class='ctx'> 			goto out_free_bio;</div><div class='ctx'> 		r10_bio-&gt;devs[j].bio = bio;</div><div class='add'>+		if (!conf-&gt;have_replacement)</div><div class='add'>+			continue;</div><div class='add'>+		bio = bio_kmalloc(gfp_flags, RESYNC_PAGES);</div><div class='add'>+		if (!bio)</div><div class='add'>+			goto out_free_bio;</div><div class='add'>+		r10_bio-&gt;devs[j].repl_bio = bio;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Allocate RESYNC_PAGES data pages and attach them</div><div class='ctx'> 	 * where needed.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (j = 0 ; j &lt; nalloc; j++) {</div><div class='add'>+		struct bio *rbio = r10_bio-&gt;devs[j].repl_bio;</div><div class='ctx'> 		bio = r10_bio-&gt;devs[j].bio;</div><div class='ctx'> 		for (i = 0; i &lt; RESYNC_PAGES; i++) {</div><div class='ctx'> 			if (j == 1 &amp;&amp; !test_bit(MD_RECOVERY_SYNC,</div><div class='hunk'>@@ -143,6 +151,8 @@ static void * r10buf_pool_alloc(gfp_t gfp_flags, void *data)</div><div class='ctx'> 				goto out_free_pages;</div><div class='ctx'> </div><div class='ctx'> 			bio-&gt;bi_io_vec[i].bv_page = page;</div><div class='add'>+			if (rbio)</div><div class='add'>+				rbio-&gt;bi_io_vec[i].bv_page = page;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -156,8 +166,11 @@ out_free_pages:</div><div class='ctx'> 			safe_put_page(r10_bio-&gt;devs[j].bio-&gt;bi_io_vec[i].bv_page);</div><div class='ctx'> 	j = -1;</div><div class='ctx'> out_free_bio:</div><div class='del'>-	while ( ++j &lt; nalloc )</div><div class='add'>+	while (++j &lt; nalloc) {</div><div class='ctx'> 		bio_put(r10_bio-&gt;devs[j].bio);</div><div class='add'>+		if (r10_bio-&gt;devs[j].repl_bio)</div><div class='add'>+			bio_put(r10_bio-&gt;devs[j].repl_bio);</div><div class='add'>+	}</div><div class='ctx'> 	r10bio_pool_free(r10_bio, conf);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -178,6 +191,9 @@ static void r10buf_pool_free(void *__r10_bio, void *data)</div><div class='ctx'> 			}</div><div class='ctx'> 			bio_put(bio);</div><div class='ctx'> 		}</div><div class='add'>+		bio = r10bio-&gt;devs[j].repl_bio;</div><div class='add'>+		if (bio)</div><div class='add'>+			bio_put(bio);</div><div class='ctx'> 	}</div><div class='ctx'> 	r10bio_pool_free(r10bio, conf);</div><div class='ctx'> }</div><div class='hunk'>@@ -191,6 +207,10 @@ static void put_all_bios(struct r10conf *conf, struct r10bio *r10_bio)</div><div class='ctx'> 		if (!BIO_SPECIAL(*bio))</div><div class='ctx'> 			bio_put(*bio);</div><div class='ctx'> 		*bio = NULL;</div><div class='add'>+		bio = &amp;r10_bio-&gt;devs[i].repl_bio;</div><div class='add'>+		if (r10_bio-&gt;read_slot &lt; 0 &amp;&amp; !BIO_SPECIAL(*bio))</div><div class='add'>+			bio_put(*bio);</div><div class='add'>+		*bio = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -275,19 +295,27 @@ static inline void update_head_pos(int slot, struct r10bio *r10_bio)</div><div class='ctx'>  * Find the disk number which triggered given bio</div><div class='ctx'>  */</div><div class='ctx'> static int find_bio_disk(struct r10conf *conf, struct r10bio *r10_bio,</div><div class='del'>-			 struct bio *bio, int *slotp)</div><div class='add'>+			 struct bio *bio, int *slotp, int *replp)</div><div class='ctx'> {</div><div class='ctx'> 	int slot;</div><div class='add'>+	int repl = 0;</div><div class='ctx'> </div><div class='del'>-	for (slot = 0; slot &lt; conf-&gt;copies; slot++)</div><div class='add'>+	for (slot = 0; slot &lt; conf-&gt;copies; slot++) {</div><div class='ctx'> 		if (r10_bio-&gt;devs[slot].bio == bio)</div><div class='ctx'> 			break;</div><div class='add'>+		if (r10_bio-&gt;devs[slot].repl_bio == bio) {</div><div class='add'>+			repl = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(slot == conf-&gt;copies);</div><div class='ctx'> 	update_head_pos(slot, r10_bio);</div><div class='ctx'> </div><div class='ctx'> 	if (slotp)</div><div class='ctx'> 		*slotp = slot;</div><div class='add'>+	if (replp)</div><div class='add'>+		*replp = repl;</div><div class='ctx'> 	return r10_bio-&gt;devs[slot].devnum;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -296,11 +324,13 @@ static void raid10_end_read_request(struct bio *bio, int error)</div><div class='ctx'> 	int uptodate = test_bit(BIO_UPTODATE, &amp;bio-&gt;bi_flags);</div><div class='ctx'> 	struct r10bio *r10_bio = bio-&gt;bi_private;</div><div class='ctx'> 	int slot, dev;</div><div class='add'>+	struct md_rdev *rdev;</div><div class='ctx'> 	struct r10conf *conf = r10_bio-&gt;mddev-&gt;private;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	slot = r10_bio-&gt;read_slot;</div><div class='ctx'> 	dev = r10_bio-&gt;devs[slot].devnum;</div><div class='add'>+	rdev = r10_bio-&gt;devs[slot].rdev;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * this branch is our 'one mirror IO has finished' event handler:</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -318,7 +348,7 @@ static void raid10_end_read_request(struct bio *bio, int error)</div><div class='ctx'> 		 */</div><div class='ctx'> 		set_bit(R10BIO_Uptodate, &amp;r10_bio-&gt;state);</div><div class='ctx'> 		raid_end_bio_io(r10_bio);</div><div class='del'>-		rdev_dec_pending(conf-&gt;mirrors[dev].rdev, conf-&gt;mddev);</div><div class='add'>+		rdev_dec_pending(rdev, conf-&gt;mddev);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * oops, read error - keep the refcount on the rdev</div><div class='hunk'>@@ -327,7 +357,7 @@ static void raid10_end_read_request(struct bio *bio, int error)</div><div class='ctx'> 		printk_ratelimited(KERN_ERR</div><div class='ctx'> 				   "md/raid10:%s: %s: rescheduling sector %llu\n",</div><div class='ctx'> 				   mdname(conf-&gt;mddev),</div><div class='del'>-				   bdevname(conf-&gt;mirrors[dev].rdev-&gt;bdev, b),</div><div class='add'>+				   bdevname(rdev-&gt;bdev, b),</div><div class='ctx'> 				   (unsigned long long)r10_bio-&gt;sector);</div><div class='ctx'> 		set_bit(R10BIO_ReadError, &amp;r10_bio-&gt;state);</div><div class='ctx'> 		reschedule_retry(r10_bio);</div><div class='hunk'>@@ -366,17 +396,35 @@ static void raid10_end_write_request(struct bio *bio, int error)</div><div class='ctx'> 	int dev;</div><div class='ctx'> 	int dec_rdev = 1;</div><div class='ctx'> 	struct r10conf *conf = r10_bio-&gt;mddev-&gt;private;</div><div class='del'>-	int slot;</div><div class='add'>+	int slot, repl;</div><div class='add'>+	struct md_rdev *rdev = NULL;</div><div class='ctx'> </div><div class='del'>-	dev = find_bio_disk(conf, r10_bio, bio, &amp;slot);</div><div class='add'>+	dev = find_bio_disk(conf, r10_bio, bio, &amp;slot, &amp;repl);</div><div class='ctx'> </div><div class='add'>+	if (repl)</div><div class='add'>+		rdev = conf-&gt;mirrors[dev].replacement;</div><div class='add'>+	if (!rdev) {</div><div class='add'>+		smp_rmb();</div><div class='add'>+		repl = 0;</div><div class='add'>+		rdev = conf-&gt;mirrors[dev].rdev;</div><div class='add'>+	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * this branch is our 'one mirror IO has finished' event handler:</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!uptodate) {</div><div class='del'>-		set_bit(WriteErrorSeen,	&amp;conf-&gt;mirrors[dev].rdev-&gt;flags);</div><div class='del'>-		set_bit(R10BIO_WriteError, &amp;r10_bio-&gt;state);</div><div class='del'>-		dec_rdev = 0;</div><div class='add'>+		if (repl)</div><div class='add'>+			/* Never record new bad blocks to replacement,</div><div class='add'>+			 * just fail it.</div><div class='add'>+			 */</div><div class='add'>+			md_error(rdev-&gt;mddev, rdev);</div><div class='add'>+		else {</div><div class='add'>+			set_bit(WriteErrorSeen,	&amp;rdev-&gt;flags);</div><div class='add'>+			if (!test_and_set_bit(WantReplacement, &amp;rdev-&gt;flags))</div><div class='add'>+				set_bit(MD_RECOVERY_NEEDED,</div><div class='add'>+					&amp;rdev-&gt;mddev-&gt;recovery);</div><div class='add'>+			set_bit(R10BIO_WriteError, &amp;r10_bio-&gt;state);</div><div class='add'>+			dec_rdev = 0;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Set R10BIO_Uptodate in our master bio, so that</div><div class='hunk'>@@ -393,12 +441,15 @@ static void raid10_end_write_request(struct bio *bio, int error)</div><div class='ctx'> 		set_bit(R10BIO_Uptodate, &amp;r10_bio-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 		/* Maybe we can clear some bad blocks. */</div><div class='del'>-		if (is_badblock(conf-&gt;mirrors[dev].rdev,</div><div class='add'>+		if (is_badblock(rdev,</div><div class='ctx'> 				r10_bio-&gt;devs[slot].addr,</div><div class='ctx'> 				r10_bio-&gt;sectors,</div><div class='ctx'> 				&amp;first_bad, &amp;bad_sectors)) {</div><div class='ctx'> 			bio_put(bio);</div><div class='del'>-			r10_bio-&gt;devs[slot].bio = IO_MADE_GOOD;</div><div class='add'>+			if (repl)</div><div class='add'>+				r10_bio-&gt;devs[slot].repl_bio = IO_MADE_GOOD;</div><div class='add'>+			else</div><div class='add'>+				r10_bio-&gt;devs[slot].bio = IO_MADE_GOOD;</div><div class='ctx'> 			dec_rdev = 0;</div><div class='ctx'> 			set_bit(R10BIO_MadeGood, &amp;r10_bio-&gt;state);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -414,7 +465,6 @@ static void raid10_end_write_request(struct bio *bio, int error)</div><div class='ctx'> 		rdev_dec_pending(conf-&gt;mirrors[dev].rdev, conf-&gt;mddev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * RAID10 layout manager</div><div class='ctx'>  * As well as the chunksize and raid_disks count, there are two</div><div class='hunk'>@@ -562,14 +612,16 @@ static int raid10_mergeable_bvec(struct request_queue *q,</div><div class='ctx'>  * FIXME: possibly should rethink readbalancing and do it differently</div><div class='ctx'>  * depending on near_copies / far_copies geometry.</div><div class='ctx'>  */</div><div class='del'>-static int read_balance(struct r10conf *conf, struct r10bio *r10_bio, int *max_sectors)</div><div class='add'>+static struct md_rdev *read_balance(struct r10conf *conf,</div><div class='add'>+				    struct r10bio *r10_bio,</div><div class='add'>+				    int *max_sectors)</div><div class='ctx'> {</div><div class='ctx'> 	const sector_t this_sector = r10_bio-&gt;sector;</div><div class='ctx'> 	int disk, slot;</div><div class='ctx'> 	int sectors = r10_bio-&gt;sectors;</div><div class='ctx'> 	int best_good_sectors;</div><div class='ctx'> 	sector_t new_distance, best_dist;</div><div class='del'>-	struct md_rdev *rdev;</div><div class='add'>+	struct md_rdev *rdev, *best_rdev;</div><div class='ctx'> 	int do_balance;</div><div class='ctx'> 	int best_slot;</div><div class='ctx'> </div><div class='hunk'>@@ -578,6 +630,7 @@ static int read_balance(struct r10conf *conf, struct r10bio *r10_bio, int *max_s</div><div class='ctx'> retry:</div><div class='ctx'> 	sectors = r10_bio-&gt;sectors;</div><div class='ctx'> 	best_slot = -1;</div><div class='add'>+	best_rdev = NULL;</div><div class='ctx'> 	best_dist = MaxSector;</div><div class='ctx'> 	best_good_sectors = 0;</div><div class='ctx'> 	do_balance = 1;</div><div class='hunk'>@@ -599,10 +652,16 @@ retry:</div><div class='ctx'> 		if (r10_bio-&gt;devs[slot].bio == IO_BLOCKED)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		disk = r10_bio-&gt;devs[slot].devnum;</div><div class='del'>-		rdev = rcu_dereference(conf-&gt;mirrors[disk].rdev);</div><div class='add'>+		rdev = rcu_dereference(conf-&gt;mirrors[disk].replacement);</div><div class='add'>+		if (rdev == NULL || test_bit(Faulty, &amp;rdev-&gt;flags) ||</div><div class='add'>+		    r10_bio-&gt;devs[slot].addr + sectors &gt; rdev-&gt;recovery_offset)</div><div class='add'>+			rdev = rcu_dereference(conf-&gt;mirrors[disk].rdev);</div><div class='ctx'> 		if (rdev == NULL)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (!test_bit(In_sync, &amp;rdev-&gt;flags))</div><div class='add'>+		if (test_bit(Faulty, &amp;rdev-&gt;flags))</div><div class='add'>+			continue;</div><div class='add'>+		if (!test_bit(In_sync, &amp;rdev-&gt;flags) &amp;&amp;</div><div class='add'>+		    r10_bio-&gt;devs[slot].addr + sectors &gt; rdev-&gt;recovery_offset)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		dev_sector = r10_bio-&gt;devs[slot].addr;</div><div class='hunk'>@@ -627,6 +686,7 @@ retry:</div><div class='ctx'> 				if (good_sectors &gt; best_good_sectors) {</div><div class='ctx'> 					best_good_sectors = good_sectors;</div><div class='ctx'> 					best_slot = slot;</div><div class='add'>+					best_rdev = rdev;</div><div class='ctx'> 				}</div><div class='ctx'> 				if (!do_balance)</div><div class='ctx'> 					/* Must read from here */</div><div class='hunk'>@@ -655,16 +715,15 @@ retry:</div><div class='ctx'> 		if (new_distance &lt; best_dist) {</div><div class='ctx'> 			best_dist = new_distance;</div><div class='ctx'> 			best_slot = slot;</div><div class='add'>+			best_rdev = rdev;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (slot == conf-&gt;copies)</div><div class='add'>+	if (slot &gt;= conf-&gt;copies) {</div><div class='ctx'> 		slot = best_slot;</div><div class='add'>+		rdev = best_rdev;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (slot &gt;= 0) {</div><div class='del'>-		disk = r10_bio-&gt;devs[slot].devnum;</div><div class='del'>-		rdev = rcu_dereference(conf-&gt;mirrors[disk].rdev);</div><div class='del'>-		if (!rdev)</div><div class='del'>-			goto retry;</div><div class='ctx'> 		atomic_inc(&amp;rdev-&gt;nr_pending);</div><div class='ctx'> 		if (test_bit(Faulty, &amp;rdev-&gt;flags)) {</div><div class='ctx'> 			/* Cannot risk returning a device that failed</div><div class='hunk'>@@ -675,11 +734,11 @@ retry:</div><div class='ctx'> 		}</div><div class='ctx'> 		r10_bio-&gt;read_slot = slot;</div><div class='ctx'> 	} else</div><div class='del'>-		disk = -1;</div><div class='add'>+		rdev = NULL;</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> 	*max_sectors = best_good_sectors;</div><div class='ctx'> </div><div class='del'>-	return disk;</div><div class='add'>+	return rdev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int raid10_congested(void *data, int bits)</div><div class='hunk'>@@ -846,7 +905,6 @@ static void unfreeze_array(struct r10conf *conf)</div><div class='ctx'> static void make_request(struct mddev *mddev, struct bio * bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct r10conf *conf = mddev-&gt;private;</div><div class='del'>-	struct mirror_info *mirror;</div><div class='ctx'> 	struct r10bio *r10_bio;</div><div class='ctx'> 	struct bio *read_bio;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -945,27 +1003,27 @@ static void make_request(struct mddev *mddev, struct bio * bio)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * read balancing logic:</div><div class='ctx'> 		 */</div><div class='del'>-		int disk;</div><div class='add'>+		struct md_rdev *rdev;</div><div class='ctx'> 		int slot;</div><div class='ctx'> </div><div class='ctx'> read_again:</div><div class='del'>-		disk = read_balance(conf, r10_bio, &amp;max_sectors);</div><div class='del'>-		slot = r10_bio-&gt;read_slot;</div><div class='del'>-		if (disk &lt; 0) {</div><div class='add'>+		rdev = read_balance(conf, r10_bio, &amp;max_sectors);</div><div class='add'>+		if (!rdev) {</div><div class='ctx'> 			raid_end_bio_io(r10_bio);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-		mirror = conf-&gt;mirrors + disk;</div><div class='add'>+		slot = r10_bio-&gt;read_slot;</div><div class='ctx'> </div><div class='ctx'> 		read_bio = bio_clone_mddev(bio, GFP_NOIO, mddev);</div><div class='ctx'> 		md_trim_bio(read_bio, r10_bio-&gt;sector - bio-&gt;bi_sector,</div><div class='ctx'> 			    max_sectors);</div><div class='ctx'> </div><div class='ctx'> 		r10_bio-&gt;devs[slot].bio = read_bio;</div><div class='add'>+		r10_bio-&gt;devs[slot].rdev = rdev;</div><div class='ctx'> </div><div class='ctx'> 		read_bio-&gt;bi_sector = r10_bio-&gt;devs[slot].addr +</div><div class='del'>-			mirror-&gt;rdev-&gt;data_offset;</div><div class='del'>-		read_bio-&gt;bi_bdev = mirror-&gt;rdev-&gt;bdev;</div><div class='add'>+			rdev-&gt;data_offset;</div><div class='add'>+		read_bio-&gt;bi_bdev = rdev-&gt;bdev;</div><div class='ctx'> 		read_bio-&gt;bi_end_io = raid10_end_read_request;</div><div class='ctx'> 		read_bio-&gt;bi_rw = READ | do_sync;</div><div class='ctx'> 		read_bio-&gt;bi_private = r10_bio;</div><div class='hunk'>@@ -1025,6 +1083,7 @@ read_again:</div><div class='ctx'> 	 */</div><div class='ctx'> 	plugged = mddev_check_plugged(mddev);</div><div class='ctx'> </div><div class='add'>+	r10_bio-&gt;read_slot = -1; /* make sure repl_bio gets freed */</div><div class='ctx'> 	raid10_find_phys(conf, r10_bio);</div><div class='ctx'> retry_write:</div><div class='ctx'> 	blocked_rdev = NULL;</div><div class='hunk'>@@ -1034,12 +1093,25 @@ retry_write:</div><div class='ctx'> 	for (i = 0;  i &lt; conf-&gt;copies; i++) {</div><div class='ctx'> 		int d = r10_bio-&gt;devs[i].devnum;</div><div class='ctx'> 		struct md_rdev *rdev = rcu_dereference(conf-&gt;mirrors[d].rdev);</div><div class='add'>+		struct md_rdev *rrdev = rcu_dereference(</div><div class='add'>+			conf-&gt;mirrors[d].replacement);</div><div class='add'>+		if (rdev == rrdev)</div><div class='add'>+			rrdev = NULL;</div><div class='ctx'> 		if (rdev &amp;&amp; unlikely(test_bit(Blocked, &amp;rdev-&gt;flags))) {</div><div class='ctx'> 			atomic_inc(&amp;rdev-&gt;nr_pending);</div><div class='ctx'> 			blocked_rdev = rdev;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		if (rrdev &amp;&amp; unlikely(test_bit(Blocked, &amp;rrdev-&gt;flags))) {</div><div class='add'>+			atomic_inc(&amp;rrdev-&gt;nr_pending);</div><div class='add'>+			blocked_rdev = rrdev;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (rrdev &amp;&amp; test_bit(Faulty, &amp;rrdev-&gt;flags))</div><div class='add'>+			rrdev = NULL;</div><div class='add'>+</div><div class='ctx'> 		r10_bio-&gt;devs[i].bio = NULL;</div><div class='add'>+		r10_bio-&gt;devs[i].repl_bio = NULL;</div><div class='ctx'> 		if (!rdev || test_bit(Faulty, &amp;rdev-&gt;flags)) {</div><div class='ctx'> 			set_bit(R10BIO_Degraded, &amp;r10_bio-&gt;state);</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -1088,6 +1160,10 @@ retry_write:</div><div class='ctx'> 		}</div><div class='ctx'> 		r10_bio-&gt;devs[i].bio = bio;</div><div class='ctx'> 		atomic_inc(&amp;rdev-&gt;nr_pending);</div><div class='add'>+		if (rrdev) {</div><div class='add'>+			r10_bio-&gt;devs[i].repl_bio = bio;</div><div class='add'>+			atomic_inc(&amp;rrdev-&gt;nr_pending);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='hunk'>@@ -1096,11 +1172,23 @@ retry_write:</div><div class='ctx'> 		int j;</div><div class='ctx'> 		int d;</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; i; j++)</div><div class='add'>+		for (j = 0; j &lt; i; j++) {</div><div class='ctx'> 			if (r10_bio-&gt;devs[j].bio) {</div><div class='ctx'> 				d = r10_bio-&gt;devs[j].devnum;</div><div class='ctx'> 				rdev_dec_pending(conf-&gt;mirrors[d].rdev, mddev);</div><div class='ctx'> 			}</div><div class='add'>+			if (r10_bio-&gt;devs[j].repl_bio) {</div><div class='add'>+				struct md_rdev *rdev;</div><div class='add'>+				d = r10_bio-&gt;devs[j].devnum;</div><div class='add'>+				rdev = conf-&gt;mirrors[d].replacement;</div><div class='add'>+				if (!rdev) {</div><div class='add'>+					/* Race with remove_disk */</div><div class='add'>+					smp_mb();</div><div class='add'>+					rdev = conf-&gt;mirrors[d].rdev;</div><div class='add'>+				}</div><div class='add'>+				rdev_dec_pending(rdev, mddev);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		allow_barrier(conf);</div><div class='ctx'> 		md_wait_for_blocked_rdev(blocked_rdev, mddev);</div><div class='ctx'> 		wait_barrier(conf);</div><div class='hunk'>@@ -1147,6 +1235,31 @@ retry_write:</div><div class='ctx'> 		bio_list_add(&amp;conf-&gt;pending_bio_list, mbio);</div><div class='ctx'> 		conf-&gt;pending_count++;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;conf-&gt;device_lock, flags);</div><div class='add'>+</div><div class='add'>+		if (!r10_bio-&gt;devs[i].repl_bio)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mbio = bio_clone_mddev(bio, GFP_NOIO, mddev);</div><div class='add'>+		md_trim_bio(mbio, r10_bio-&gt;sector - bio-&gt;bi_sector,</div><div class='add'>+			    max_sectors);</div><div class='add'>+		r10_bio-&gt;devs[i].repl_bio = mbio;</div><div class='add'>+</div><div class='add'>+		/* We are actively writing to the original device</div><div class='add'>+		 * so it cannot disappear, so the replacement cannot</div><div class='add'>+		 * become NULL here</div><div class='add'>+		 */</div><div class='add'>+		mbio-&gt;bi_sector	= (r10_bio-&gt;devs[i].addr+</div><div class='add'>+				   conf-&gt;mirrors[d].replacement-&gt;data_offset);</div><div class='add'>+		mbio-&gt;bi_bdev = conf-&gt;mirrors[d].replacement-&gt;bdev;</div><div class='add'>+		mbio-&gt;bi_end_io	= raid10_end_write_request;</div><div class='add'>+		mbio-&gt;bi_rw = WRITE | do_sync | do_fua;</div><div class='add'>+		mbio-&gt;bi_private = r10_bio;</div><div class='add'>+</div><div class='add'>+		atomic_inc(&amp;r10_bio-&gt;remaining);</div><div class='add'>+		spin_lock_irqsave(&amp;conf-&gt;device_lock, flags);</div><div class='add'>+		bio_list_add(&amp;conf-&gt;pending_bio_list, mbio);</div><div class='add'>+		conf-&gt;pending_count++;</div><div class='add'>+		spin_unlock_irqrestore(&amp;conf-&gt;device_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Don't remove the bias on 'remaining' (one_write_done) until</div><div class='hunk'>@@ -1309,9 +1422,27 @@ static int raid10_spare_active(struct mddev *mddev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; conf-&gt;raid_disks; i++) {</div><div class='ctx'> 		tmp = conf-&gt;mirrors + i;</div><div class='del'>-		if (tmp-&gt;rdev</div><div class='del'>-		    &amp;&amp; !test_bit(Faulty, &amp;tmp-&gt;rdev-&gt;flags)</div><div class='del'>-		    &amp;&amp; !test_and_set_bit(In_sync, &amp;tmp-&gt;rdev-&gt;flags)) {</div><div class='add'>+		if (tmp-&gt;replacement</div><div class='add'>+		    &amp;&amp; tmp-&gt;replacement-&gt;recovery_offset == MaxSector</div><div class='add'>+		    &amp;&amp; !test_bit(Faulty, &amp;tmp-&gt;replacement-&gt;flags)</div><div class='add'>+		    &amp;&amp; !test_and_set_bit(In_sync, &amp;tmp-&gt;replacement-&gt;flags)) {</div><div class='add'>+			/* Replacement has just become active */</div><div class='add'>+			if (!tmp-&gt;rdev</div><div class='add'>+			    || !test_and_clear_bit(In_sync, &amp;tmp-&gt;rdev-&gt;flags))</div><div class='add'>+				count++;</div><div class='add'>+			if (tmp-&gt;rdev) {</div><div class='add'>+				/* Replaced device not technically faulty,</div><div class='add'>+				 * but we need to be sure it gets removed</div><div class='add'>+				 * and never re-added.</div><div class='add'>+				 */</div><div class='add'>+				set_bit(Faulty, &amp;tmp-&gt;rdev-&gt;flags);</div><div class='add'>+				sysfs_notify_dirent_safe(</div><div class='add'>+					tmp-&gt;rdev-&gt;sysfs_state);</div><div class='add'>+			}</div><div class='add'>+			sysfs_notify_dirent_safe(tmp-&gt;replacement-&gt;sysfs_state);</div><div class='add'>+		} else if (tmp-&gt;rdev</div><div class='add'>+			   &amp;&amp; !test_bit(Faulty, &amp;tmp-&gt;rdev-&gt;flags)</div><div class='add'>+			   &amp;&amp; !test_and_set_bit(In_sync, &amp;tmp-&gt;rdev-&gt;flags)) {</div><div class='ctx'> 			count++;</div><div class='ctx'> 			sysfs_notify_dirent(tmp-&gt;rdev-&gt;sysfs_state);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1353,8 +1484,25 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> 		struct mirror_info *p = &amp;conf-&gt;mirrors[mirror];</div><div class='ctx'> 		if (p-&gt;recovery_disabled == mddev-&gt;recovery_disabled)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (p-&gt;rdev)</div><div class='del'>-			continue;</div><div class='add'>+		if (p-&gt;rdev) {</div><div class='add'>+			if (!test_bit(WantReplacement, &amp;p-&gt;rdev-&gt;flags) ||</div><div class='add'>+			    p-&gt;replacement != NULL)</div><div class='add'>+				continue;</div><div class='add'>+			clear_bit(In_sync, &amp;rdev-&gt;flags);</div><div class='add'>+			set_bit(Replacement, &amp;rdev-&gt;flags);</div><div class='add'>+			rdev-&gt;raid_disk = mirror;</div><div class='add'>+			err = 0;</div><div class='add'>+			disk_stack_limits(mddev-&gt;gendisk, rdev-&gt;bdev,</div><div class='add'>+					  rdev-&gt;data_offset &lt;&lt; 9);</div><div class='add'>+			if (rdev-&gt;bdev-&gt;bd_disk-&gt;queue-&gt;merge_bvec_fn) {</div><div class='add'>+				blk_queue_max_segments(mddev-&gt;queue, 1);</div><div class='add'>+				blk_queue_segment_boundary(mddev-&gt;queue,</div><div class='add'>+							   PAGE_CACHE_SIZE - 1);</div><div class='add'>+			}</div><div class='add'>+			conf-&gt;fullsync = 1;</div><div class='add'>+			rcu_assign_pointer(p-&gt;replacement, rdev);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		disk_stack_limits(mddev-&gt;gendisk, rdev-&gt;bdev,</div><div class='ctx'> 				  rdev-&gt;data_offset &lt;&lt; 9);</div><div class='hunk'>@@ -1385,40 +1533,61 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int raid10_remove_disk(struct mddev *mddev, int number)</div><div class='add'>+static int raid10_remove_disk(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct r10conf *conf = mddev-&gt;private;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	struct md_rdev *rdev;</div><div class='del'>-	struct mirror_info *p = conf-&gt;mirrors+ number;</div><div class='add'>+	int number = rdev-&gt;raid_disk;</div><div class='add'>+	struct md_rdev **rdevp;</div><div class='add'>+	struct mirror_info *p = conf-&gt;mirrors + number;</div><div class='ctx'> </div><div class='ctx'> 	print_conf(conf);</div><div class='del'>-	rdev = p-&gt;rdev;</div><div class='del'>-	if (rdev) {</div><div class='del'>-		if (test_bit(In_sync, &amp;rdev-&gt;flags) ||</div><div class='del'>-		    atomic_read(&amp;rdev-&gt;nr_pending)) {</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			goto abort;</div><div class='del'>-		}</div><div class='del'>-		/* Only remove faulty devices in recovery</div><div class='del'>-		 * is not possible.</div><div class='del'>-		 */</div><div class='del'>-		if (!test_bit(Faulty, &amp;rdev-&gt;flags) &amp;&amp;</div><div class='del'>-		    mddev-&gt;recovery_disabled != p-&gt;recovery_disabled &amp;&amp;</div><div class='del'>-		    enough(conf, -1)) {</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			goto abort;</div><div class='del'>-		}</div><div class='del'>-		p-&gt;rdev = NULL;</div><div class='del'>-		synchronize_rcu();</div><div class='del'>-		if (atomic_read(&amp;rdev-&gt;nr_pending)) {</div><div class='del'>-			/* lost the race, try later */</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			p-&gt;rdev = rdev;</div><div class='del'>-			goto abort;</div><div class='del'>-		}</div><div class='del'>-		err = md_integrity_register(mddev);</div><div class='add'>+	if (rdev == p-&gt;rdev)</div><div class='add'>+		rdevp = &amp;p-&gt;rdev;</div><div class='add'>+	else if (rdev == p-&gt;replacement)</div><div class='add'>+		rdevp = &amp;p-&gt;replacement;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (test_bit(In_sync, &amp;rdev-&gt;flags) ||</div><div class='add'>+	    atomic_read(&amp;rdev-&gt;nr_pending)) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto abort;</div><div class='ctx'> 	}</div><div class='add'>+	/* Only remove faulty devices if recovery</div><div class='add'>+	 * is not possible.</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(Faulty, &amp;rdev-&gt;flags) &amp;&amp;</div><div class='add'>+	    mddev-&gt;recovery_disabled != p-&gt;recovery_disabled &amp;&amp;</div><div class='add'>+	    (!p-&gt;replacement || p-&gt;replacement == rdev) &amp;&amp;</div><div class='add'>+	    enough(conf, -1)) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto abort;</div><div class='add'>+	}</div><div class='add'>+	*rdevp = NULL;</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+	if (atomic_read(&amp;rdev-&gt;nr_pending)) {</div><div class='add'>+		/* lost the race, try later */</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		*rdevp = rdev;</div><div class='add'>+		goto abort;</div><div class='add'>+	} else if (p-&gt;replacement) {</div><div class='add'>+		/* We must have just cleared 'rdev' */</div><div class='add'>+		p-&gt;rdev = p-&gt;replacement;</div><div class='add'>+		clear_bit(Replacement, &amp;p-&gt;replacement-&gt;flags);</div><div class='add'>+		smp_mb(); /* Make sure other CPUs may see both as identical</div><div class='add'>+			   * but will never see neither -- if they are careful.</div><div class='add'>+			   */</div><div class='add'>+		p-&gt;replacement = NULL;</div><div class='add'>+		clear_bit(WantReplacement, &amp;rdev-&gt;flags);</div><div class='add'>+	} else</div><div class='add'>+		/* We might have just remove the Replacement as faulty</div><div class='add'>+		 * Clear the flag just in case</div><div class='add'>+		 */</div><div class='add'>+		clear_bit(WantReplacement, &amp;rdev-&gt;flags);</div><div class='add'>+</div><div class='add'>+	err = md_integrity_register(mddev);</div><div class='add'>+</div><div class='ctx'> abort:</div><div class='ctx'> </div><div class='ctx'> 	print_conf(conf);</div><div class='hunk'>@@ -1432,7 +1601,7 @@ static void end_sync_read(struct bio *bio, int error)</div><div class='ctx'> 	struct r10conf *conf = r10_bio-&gt;mddev-&gt;private;</div><div class='ctx'> 	int d;</div><div class='ctx'> </div><div class='del'>-	d = find_bio_disk(conf, r10_bio, bio, NULL);</div><div class='add'>+	d = find_bio_disk(conf, r10_bio, bio, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(BIO_UPTODATE, &amp;bio-&gt;bi_flags))</div><div class='ctx'> 		set_bit(R10BIO_Uptodate, &amp;r10_bio-&gt;state);</div><div class='hunk'>@@ -1493,19 +1662,34 @@ static void end_sync_write(struct bio *bio, int error)</div><div class='ctx'> 	sector_t first_bad;</div><div class='ctx'> 	int bad_sectors;</div><div class='ctx'> 	int slot;</div><div class='del'>-</div><div class='del'>-	d = find_bio_disk(conf, r10_bio, bio, &amp;slot);</div><div class='add'>+	int repl;</div><div class='add'>+	struct md_rdev *rdev = NULL;</div><div class='add'>+</div><div class='add'>+	d = find_bio_disk(conf, r10_bio, bio, &amp;slot, &amp;repl);</div><div class='add'>+	if (repl)</div><div class='add'>+		rdev = conf-&gt;mirrors[d].replacement;</div><div class='add'>+	if (!rdev) {</div><div class='add'>+		smp_mb();</div><div class='add'>+		rdev = conf-&gt;mirrors[d].rdev;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!uptodate) {</div><div class='del'>-		set_bit(WriteErrorSeen, &amp;conf-&gt;mirrors[d].rdev-&gt;flags);</div><div class='del'>-		set_bit(R10BIO_WriteError, &amp;r10_bio-&gt;state);</div><div class='del'>-	} else if (is_badblock(conf-&gt;mirrors[d].rdev,</div><div class='add'>+		if (repl)</div><div class='add'>+			md_error(mddev, rdev);</div><div class='add'>+		else {</div><div class='add'>+			set_bit(WriteErrorSeen, &amp;rdev-&gt;flags);</div><div class='add'>+			if (!test_and_set_bit(WantReplacement, &amp;rdev-&gt;flags))</div><div class='add'>+				set_bit(MD_RECOVERY_NEEDED,</div><div class='add'>+					&amp;rdev-&gt;mddev-&gt;recovery);</div><div class='add'>+			set_bit(R10BIO_WriteError, &amp;r10_bio-&gt;state);</div><div class='add'>+		}</div><div class='add'>+	} else if (is_badblock(rdev,</div><div class='ctx'> 			     r10_bio-&gt;devs[slot].addr,</div><div class='ctx'> 			     r10_bio-&gt;sectors,</div><div class='ctx'> 			     &amp;first_bad, &amp;bad_sectors))</div><div class='ctx'> 		set_bit(R10BIO_MadeGood, &amp;r10_bio-&gt;state);</div><div class='ctx'> </div><div class='del'>-	rdev_dec_pending(conf-&gt;mirrors[d].rdev, mddev);</div><div class='add'>+	rdev_dec_pending(rdev, mddev);</div><div class='ctx'> </div><div class='ctx'> 	end_sync_request(r10_bio);</div><div class='ctx'> }</div><div class='hunk'>@@ -1609,6 +1793,29 @@ static void sync_request_write(struct mddev *mddev, struct r10bio *r10_bio)</div><div class='ctx'> 		generic_make_request(tbio);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Now write out to any replacement devices</div><div class='add'>+	 * that are active</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; conf-&gt;copies; i++) {</div><div class='add'>+		int j, d;</div><div class='add'>+		int vcnt = r10_bio-&gt;sectors &gt;&gt; (PAGE_SHIFT-9);</div><div class='add'>+</div><div class='add'>+		tbio = r10_bio-&gt;devs[i].repl_bio;</div><div class='add'>+		if (!tbio || !tbio-&gt;bi_end_io)</div><div class='add'>+			continue;</div><div class='add'>+		if (r10_bio-&gt;devs[i].bio-&gt;bi_end_io != end_sync_write</div><div class='add'>+		    &amp;&amp; r10_bio-&gt;devs[i].bio != fbio)</div><div class='add'>+			for (j = 0; j &lt; vcnt; j++)</div><div class='add'>+				memcpy(page_address(tbio-&gt;bi_io_vec[j].bv_page),</div><div class='add'>+				       page_address(fbio-&gt;bi_io_vec[j].bv_page),</div><div class='add'>+				       PAGE_SIZE);</div><div class='add'>+		d = r10_bio-&gt;devs[i].devnum;</div><div class='add'>+		atomic_inc(&amp;r10_bio-&gt;remaining);</div><div class='add'>+		md_sync_acct(conf-&gt;mirrors[d].replacement-&gt;bdev,</div><div class='add'>+			     tbio-&gt;bi_size &gt;&gt; 9);</div><div class='add'>+		generic_make_request(tbio);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> done:</div><div class='ctx'> 	if (atomic_dec_and_test(&amp;r10_bio-&gt;remaining)) {</div><div class='ctx'> 		md_done_sync(mddev, r10_bio-&gt;sectors, 1);</div><div class='hunk'>@@ -1668,8 +1875,13 @@ static void fix_recovery_read_error(struct r10bio *r10_bio)</div><div class='ctx'> 					  s &lt;&lt; 9,</div><div class='ctx'> 					  bio-&gt;bi_io_vec[idx].bv_page,</div><div class='ctx'> 					  WRITE, false);</div><div class='del'>-			if (!ok)</div><div class='add'>+			if (!ok) {</div><div class='ctx'> 				set_bit(WriteErrorSeen, &amp;rdev-&gt;flags);</div><div class='add'>+				if (!test_and_set_bit(WantReplacement,</div><div class='add'>+						      &amp;rdev-&gt;flags))</div><div class='add'>+					set_bit(MD_RECOVERY_NEEDED,</div><div class='add'>+						&amp;rdev-&gt;mddev-&gt;recovery);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!ok) {</div><div class='ctx'> 			/* We don't worry if we cannot set a bad block -</div><div class='hunk'>@@ -1709,7 +1921,7 @@ static void recovery_request_write(struct mddev *mddev, struct r10bio *r10_bio)</div><div class='ctx'> {</div><div class='ctx'> 	struct r10conf *conf = mddev-&gt;private;</div><div class='ctx'> 	int d;</div><div class='del'>-	struct bio *wbio;</div><div class='add'>+	struct bio *wbio, *wbio2;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(R10BIO_Uptodate, &amp;r10_bio-&gt;state)) {</div><div class='ctx'> 		fix_recovery_read_error(r10_bio);</div><div class='hunk'>@@ -1721,12 +1933,20 @@ static void recovery_request_write(struct mddev *mddev, struct r10bio *r10_bio)</div><div class='ctx'> 	 * share the pages with the first bio</div><div class='ctx'> 	 * and submit the write request</div><div class='ctx'> 	 */</div><div class='del'>-	wbio = r10_bio-&gt;devs[1].bio;</div><div class='ctx'> 	d = r10_bio-&gt;devs[1].devnum;</div><div class='del'>-</div><div class='del'>-	atomic_inc(&amp;conf-&gt;mirrors[d].rdev-&gt;nr_pending);</div><div class='del'>-	md_sync_acct(conf-&gt;mirrors[d].rdev-&gt;bdev, wbio-&gt;bi_size &gt;&gt; 9);</div><div class='del'>-	generic_make_request(wbio);</div><div class='add'>+	wbio = r10_bio-&gt;devs[1].bio;</div><div class='add'>+	wbio2 = r10_bio-&gt;devs[1].repl_bio;</div><div class='add'>+	if (wbio-&gt;bi_end_io) {</div><div class='add'>+		atomic_inc(&amp;conf-&gt;mirrors[d].rdev-&gt;nr_pending);</div><div class='add'>+		md_sync_acct(conf-&gt;mirrors[d].rdev-&gt;bdev, wbio-&gt;bi_size &gt;&gt; 9);</div><div class='add'>+		generic_make_request(wbio);</div><div class='add'>+	}</div><div class='add'>+	if (wbio2 &amp;&amp; wbio2-&gt;bi_end_io) {</div><div class='add'>+		atomic_inc(&amp;conf-&gt;mirrors[d].replacement-&gt;nr_pending);</div><div class='add'>+		md_sync_acct(conf-&gt;mirrors[d].replacement-&gt;bdev,</div><div class='add'>+			     wbio2-&gt;bi_size &gt;&gt; 9);</div><div class='add'>+		generic_make_request(wbio2);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1779,8 +1999,12 @@ static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,</div><div class='ctx'> 	if (sync_page_io(rdev, sector, sectors &lt;&lt; 9, page, rw, false))</div><div class='ctx'> 		/* success */</div><div class='ctx'> 		return 1;</div><div class='del'>-	if (rw == WRITE)</div><div class='add'>+	if (rw == WRITE) {</div><div class='ctx'> 		set_bit(WriteErrorSeen, &amp;rdev-&gt;flags);</div><div class='add'>+		if (!test_and_set_bit(WantReplacement, &amp;rdev-&gt;flags))</div><div class='add'>+			set_bit(MD_RECOVERY_NEEDED,</div><div class='add'>+				&amp;rdev-&gt;mddev-&gt;recovery);</div><div class='add'>+	}</div><div class='ctx'> 	/* need to record an error - either for the block or the device */</div><div class='ctx'> 	if (!rdev_set_badblocks(rdev, sector, sectors, 0))</div><div class='ctx'> 		md_error(rdev-&gt;mddev, rdev);</div><div class='hunk'>@@ -2060,10 +2284,9 @@ static int narrow_write_error(struct r10bio *r10_bio, int i)</div><div class='ctx'> static void handle_read_error(struct mddev *mddev, struct r10bio *r10_bio)</div><div class='ctx'> {</div><div class='ctx'> 	int slot = r10_bio-&gt;read_slot;</div><div class='del'>-	int mirror = r10_bio-&gt;devs[slot].devnum;</div><div class='ctx'> 	struct bio *bio;</div><div class='ctx'> 	struct r10conf *conf = mddev-&gt;private;</div><div class='del'>-	struct md_rdev *rdev;</div><div class='add'>+	struct md_rdev *rdev = r10_bio-&gt;devs[slot].rdev;</div><div class='ctx'> 	char b[BDEVNAME_SIZE];</div><div class='ctx'> 	unsigned long do_sync;</div><div class='ctx'> 	int max_sectors;</div><div class='hunk'>@@ -2081,15 +2304,15 @@ static void handle_read_error(struct mddev *mddev, struct r10bio *r10_bio)</div><div class='ctx'> 		fix_read_error(conf, mddev, r10_bio);</div><div class='ctx'> 		unfreeze_array(conf);</div><div class='ctx'> 	}</div><div class='del'>-	rdev_dec_pending(conf-&gt;mirrors[mirror].rdev, mddev);</div><div class='add'>+	rdev_dec_pending(rdev, mddev);</div><div class='ctx'> </div><div class='ctx'> 	bio = r10_bio-&gt;devs[slot].bio;</div><div class='ctx'> 	bdevname(bio-&gt;bi_bdev, b);</div><div class='ctx'> 	r10_bio-&gt;devs[slot].bio =</div><div class='ctx'> 		mddev-&gt;ro ? IO_BLOCKED : NULL;</div><div class='ctx'> read_more:</div><div class='del'>-	mirror = read_balance(conf, r10_bio, &amp;max_sectors);</div><div class='del'>-	if (mirror == -1) {</div><div class='add'>+	rdev = read_balance(conf, r10_bio, &amp;max_sectors);</div><div class='add'>+	if (rdev == NULL) {</div><div class='ctx'> 		printk(KERN_ALERT "md/raid10:%s: %s: unrecoverable I/O"</div><div class='ctx'> 		       " read error for block %llu\n",</div><div class='ctx'> 		       mdname(mddev), b,</div><div class='hunk'>@@ -2103,7 +2326,6 @@ read_more:</div><div class='ctx'> 	if (bio)</div><div class='ctx'> 		bio_put(bio);</div><div class='ctx'> 	slot = r10_bio-&gt;read_slot;</div><div class='del'>-	rdev = conf-&gt;mirrors[mirror].rdev;</div><div class='ctx'> 	printk_ratelimited(</div><div class='ctx'> 		KERN_ERR</div><div class='ctx'> 		"md/raid10:%s: %s: redirecting"</div><div class='hunk'>@@ -2117,6 +2339,7 @@ read_more:</div><div class='ctx'> 		    r10_bio-&gt;sector - bio-&gt;bi_sector,</div><div class='ctx'> 		    max_sectors);</div><div class='ctx'> 	r10_bio-&gt;devs[slot].bio = bio;</div><div class='add'>+	r10_bio-&gt;devs[slot].rdev = rdev;</div><div class='ctx'> 	bio-&gt;bi_sector = r10_bio-&gt;devs[slot].addr</div><div class='ctx'> 		+ rdev-&gt;data_offset;</div><div class='ctx'> 	bio-&gt;bi_bdev = rdev-&gt;bdev;</div><div class='hunk'>@@ -2187,6 +2410,22 @@ static void handle_write_completed(struct r10conf *conf, struct r10bio *r10_bio)</div><div class='ctx'> 					    r10_bio-&gt;sectors, 0))</div><div class='ctx'> 					md_error(conf-&gt;mddev, rdev);</div><div class='ctx'> 			}</div><div class='add'>+			rdev = conf-&gt;mirrors[dev].replacement;</div><div class='add'>+			if (r10_bio-&gt;devs[m].repl_bio == NULL)</div><div class='add'>+				continue;</div><div class='add'>+			if (test_bit(BIO_UPTODATE,</div><div class='add'>+				     &amp;r10_bio-&gt;devs[m].repl_bio-&gt;bi_flags)) {</div><div class='add'>+				rdev_clear_badblocks(</div><div class='add'>+					rdev,</div><div class='add'>+					r10_bio-&gt;devs[m].addr,</div><div class='add'>+					r10_bio-&gt;sectors);</div><div class='add'>+			} else {</div><div class='add'>+				if (!rdev_set_badblocks(</div><div class='add'>+					    rdev,</div><div class='add'>+					    r10_bio-&gt;devs[m].addr,</div><div class='add'>+					    r10_bio-&gt;sectors, 0))</div><div class='add'>+					md_error(conf-&gt;mddev, rdev);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		put_buf(r10_bio);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -2209,6 +2448,15 @@ static void handle_write_completed(struct r10conf *conf, struct r10bio *r10_bio)</div><div class='ctx'> 				}</div><div class='ctx'> 				rdev_dec_pending(rdev, conf-&gt;mddev);</div><div class='ctx'> 			}</div><div class='add'>+			bio = r10_bio-&gt;devs[m].repl_bio;</div><div class='add'>+			rdev = conf-&gt;mirrors[dev].replacement;</div><div class='add'>+			if (rdev &amp;&amp; bio == IO_MADE_GOOD) {</div><div class='add'>+				rdev_clear_badblocks(</div><div class='add'>+					rdev,</div><div class='add'>+					r10_bio-&gt;devs[m].addr,</div><div class='add'>+					r10_bio-&gt;sectors);</div><div class='add'>+				rdev_dec_pending(rdev, conf-&gt;mddev);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		if (test_bit(R10BIO_WriteError,</div><div class='ctx'> 			     &amp;r10_bio-&gt;state))</div><div class='hunk'>@@ -2272,9 +2520,14 @@ static void raid10d(struct mddev *mddev)</div><div class='ctx'> static int init_resync(struct r10conf *conf)</div><div class='ctx'> {</div><div class='ctx'> 	int buffs;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	buffs = RESYNC_WINDOW / RESYNC_BLOCK_SIZE;</div><div class='ctx'> 	BUG_ON(conf-&gt;r10buf_pool);</div><div class='add'>+	conf-&gt;have_replacement = 0;</div><div class='add'>+	for (i = 0; i &lt; conf-&gt;raid_disks; i++)</div><div class='add'>+		if (conf-&gt;mirrors[i].replacement)</div><div class='add'>+			conf-&gt;have_replacement = 1;</div><div class='ctx'> 	conf-&gt;r10buf_pool = mempool_create(buffs, r10buf_pool_alloc, r10buf_pool_free, conf);</div><div class='ctx'> 	if (!conf-&gt;r10buf_pool)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -2355,9 +2608,22 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr,</div><div class='ctx'> 				bitmap_end_sync(mddev-&gt;bitmap, sect,</div><div class='ctx'> 						&amp;sync_blocks, 1);</div><div class='ctx'> 			}</div><div class='del'>-		} else /* completed sync */</div><div class='add'>+		} else {</div><div class='add'>+			/* completed sync */</div><div class='add'>+			if ((!mddev-&gt;bitmap || conf-&gt;fullsync)</div><div class='add'>+			    &amp;&amp; conf-&gt;have_replacement</div><div class='add'>+			    &amp;&amp; test_bit(MD_RECOVERY_SYNC, &amp;mddev-&gt;recovery)) {</div><div class='add'>+				/* Completed a full sync so the replacements</div><div class='add'>+				 * are now fully recovered.</div><div class='add'>+				 */</div><div class='add'>+				for (i = 0; i &lt; conf-&gt;raid_disks; i++)</div><div class='add'>+					if (conf-&gt;mirrors[i].replacement)</div><div class='add'>+						conf-&gt;mirrors[i].replacement</div><div class='add'>+							-&gt;recovery_offset</div><div class='add'>+							= MaxSector;</div><div class='add'>+			}</div><div class='ctx'> 			conf-&gt;fullsync = 0;</div><div class='del'>-</div><div class='add'>+		}</div><div class='ctx'> 		bitmap_close_sync(mddev-&gt;bitmap);</div><div class='ctx'> 		close_sync(conf);</div><div class='ctx'> 		*skipped = 1;</div><div class='hunk'>@@ -2414,23 +2680,30 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr,</div><div class='ctx'> 			sector_t sect;</div><div class='ctx'> 			int must_sync;</div><div class='ctx'> 			int any_working;</div><div class='del'>-</div><div class='del'>-			if (conf-&gt;mirrors[i].rdev == NULL ||</div><div class='del'>-			    test_bit(In_sync, &amp;conf-&gt;mirrors[i].rdev-&gt;flags)) </div><div class='add'>+			struct mirror_info *mirror = &amp;conf-&gt;mirrors[i];</div><div class='add'>+</div><div class='add'>+			if ((mirror-&gt;rdev == NULL ||</div><div class='add'>+			     test_bit(In_sync, &amp;mirror-&gt;rdev-&gt;flags))</div><div class='add'>+			    &amp;&amp;</div><div class='add'>+			    (mirror-&gt;replacement == NULL ||</div><div class='add'>+			     test_bit(Faulty,</div><div class='add'>+				      &amp;mirror-&gt;replacement-&gt;flags)))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			still_degraded = 0;</div><div class='ctx'> 			/* want to reconstruct this device */</div><div class='ctx'> 			rb2 = r10_bio;</div><div class='ctx'> 			sect = raid10_find_virt(conf, sector_nr, i);</div><div class='del'>-			/* Unless we are doing a full sync, we only need</div><div class='del'>-			 * to recover the block if it is set in the bitmap</div><div class='add'>+			/* Unless we are doing a full sync, or a replacement</div><div class='add'>+			 * we only need to recover the block if it is set in</div><div class='add'>+			 * the bitmap</div><div class='ctx'> 			 */</div><div class='ctx'> 			must_sync = bitmap_start_sync(mddev-&gt;bitmap, sect,</div><div class='ctx'> 						      &amp;sync_blocks, 1);</div><div class='ctx'> 			if (sync_blocks &lt; max_sync)</div><div class='ctx'> 				max_sync = sync_blocks;</div><div class='ctx'> 			if (!must_sync &amp;&amp;</div><div class='add'>+			    mirror-&gt;replacement == NULL &amp;&amp;</div><div class='ctx'> 			    !conf-&gt;fullsync) {</div><div class='ctx'> 				/* yep, skip the sync_blocks here, but don't assume</div><div class='ctx'> 				 * that there will never be anything to do here</div><div class='hunk'>@@ -2500,33 +2773,60 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr,</div><div class='ctx'> 				bio-&gt;bi_end_io = end_sync_read;</div><div class='ctx'> 				bio-&gt;bi_rw = READ;</div><div class='ctx'> 				from_addr = r10_bio-&gt;devs[j].addr;</div><div class='del'>-				bio-&gt;bi_sector = from_addr +</div><div class='del'>-					conf-&gt;mirrors[d].rdev-&gt;data_offset;</div><div class='del'>-				bio-&gt;bi_bdev = conf-&gt;mirrors[d].rdev-&gt;bdev;</div><div class='del'>-				atomic_inc(&amp;conf-&gt;mirrors[d].rdev-&gt;nr_pending);</div><div class='del'>-				atomic_inc(&amp;r10_bio-&gt;remaining);</div><div class='del'>-				/* and we write to 'i' */</div><div class='add'>+				bio-&gt;bi_sector = from_addr + rdev-&gt;data_offset;</div><div class='add'>+				bio-&gt;bi_bdev = rdev-&gt;bdev;</div><div class='add'>+				atomic_inc(&amp;rdev-&gt;nr_pending);</div><div class='add'>+				/* and we write to 'i' (if not in_sync) */</div><div class='ctx'> </div><div class='ctx'> 				for (k=0; k&lt;conf-&gt;copies; k++)</div><div class='ctx'> 					if (r10_bio-&gt;devs[k].devnum == i)</div><div class='ctx'> 						break;</div><div class='ctx'> 				BUG_ON(k == conf-&gt;copies);</div><div class='del'>-				bio = r10_bio-&gt;devs[1].bio;</div><div class='del'>-				bio-&gt;bi_next = biolist;</div><div class='del'>-				biolist = bio;</div><div class='del'>-				bio-&gt;bi_private = r10_bio;</div><div class='del'>-				bio-&gt;bi_end_io = end_sync_write;</div><div class='del'>-				bio-&gt;bi_rw = WRITE;</div><div class='ctx'> 				to_addr = r10_bio-&gt;devs[k].addr;</div><div class='del'>-				bio-&gt;bi_sector = to_addr +</div><div class='del'>-					conf-&gt;mirrors[i].rdev-&gt;data_offset;</div><div class='del'>-				bio-&gt;bi_bdev = conf-&gt;mirrors[i].rdev-&gt;bdev;</div><div class='del'>-</div><div class='ctx'> 				r10_bio-&gt;devs[0].devnum = d;</div><div class='ctx'> 				r10_bio-&gt;devs[0].addr = from_addr;</div><div class='ctx'> 				r10_bio-&gt;devs[1].devnum = i;</div><div class='ctx'> 				r10_bio-&gt;devs[1].addr = to_addr;</div><div class='ctx'> </div><div class='add'>+				rdev = mirror-&gt;rdev;</div><div class='add'>+				if (!test_bit(In_sync, &amp;rdev-&gt;flags)) {</div><div class='add'>+					bio = r10_bio-&gt;devs[1].bio;</div><div class='add'>+					bio-&gt;bi_next = biolist;</div><div class='add'>+					biolist = bio;</div><div class='add'>+					bio-&gt;bi_private = r10_bio;</div><div class='add'>+					bio-&gt;bi_end_io = end_sync_write;</div><div class='add'>+					bio-&gt;bi_rw = WRITE;</div><div class='add'>+					bio-&gt;bi_sector = to_addr</div><div class='add'>+						+ rdev-&gt;data_offset;</div><div class='add'>+					bio-&gt;bi_bdev = rdev-&gt;bdev;</div><div class='add'>+					atomic_inc(&amp;r10_bio-&gt;remaining);</div><div class='add'>+				} else</div><div class='add'>+					r10_bio-&gt;devs[1].bio-&gt;bi_end_io = NULL;</div><div class='add'>+</div><div class='add'>+				/* and maybe write to replacement */</div><div class='add'>+				bio = r10_bio-&gt;devs[1].repl_bio;</div><div class='add'>+				if (bio)</div><div class='add'>+					bio-&gt;bi_end_io = NULL;</div><div class='add'>+				rdev = mirror-&gt;replacement;</div><div class='add'>+				/* Note: if rdev != NULL, then bio</div><div class='add'>+				 * cannot be NULL as r10buf_pool_alloc will</div><div class='add'>+				 * have allocated it.</div><div class='add'>+				 * So the second test here is pointless.</div><div class='add'>+				 * But it keeps semantic-checkers happy, and</div><div class='add'>+				 * this comment keeps human reviewers</div><div class='add'>+				 * happy.</div><div class='add'>+				 */</div><div class='add'>+				if (rdev == NULL || bio == NULL ||</div><div class='add'>+				    test_bit(Faulty, &amp;rdev-&gt;flags))</div><div class='add'>+					break;</div><div class='add'>+				bio-&gt;bi_next = biolist;</div><div class='add'>+				biolist = bio;</div><div class='add'>+				bio-&gt;bi_private = r10_bio;</div><div class='add'>+				bio-&gt;bi_end_io = end_sync_write;</div><div class='add'>+				bio-&gt;bi_rw = WRITE;</div><div class='add'>+				bio-&gt;bi_sector = to_addr + rdev-&gt;data_offset;</div><div class='add'>+				bio-&gt;bi_bdev = rdev-&gt;bdev;</div><div class='add'>+				atomic_inc(&amp;r10_bio-&gt;remaining);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (j == conf-&gt;copies) {</div><div class='hunk'>@@ -2544,8 +2844,16 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr,</div><div class='ctx'> 					for (k = 0; k &lt; conf-&gt;copies; k++)</div><div class='ctx'> 						if (r10_bio-&gt;devs[k].devnum == i)</div><div class='ctx'> 							break;</div><div class='del'>-					if (!rdev_set_badblocks(</div><div class='del'>-						    conf-&gt;mirrors[i].rdev,</div><div class='add'>+					if (!test_bit(In_sync,</div><div class='add'>+						      &amp;mirror-&gt;rdev-&gt;flags)</div><div class='add'>+					    &amp;&amp; !rdev_set_badblocks(</div><div class='add'>+						    mirror-&gt;rdev,</div><div class='add'>+						    r10_bio-&gt;devs[k].addr,</div><div class='add'>+						    max_sync, 0))</div><div class='add'>+						any_working = 0;</div><div class='add'>+					if (mirror-&gt;replacement &amp;&amp;</div><div class='add'>+					    !rdev_set_badblocks(</div><div class='add'>+						    mirror-&gt;replacement,</div><div class='ctx'> 						    r10_bio-&gt;devs[k].addr,</div><div class='ctx'> 						    max_sync, 0))</div><div class='ctx'> 						any_working = 0;</div><div class='hunk'>@@ -2556,7 +2864,7 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr,</div><div class='ctx'> 						printk(KERN_INFO "md/raid10:%s: insufficient "</div><div class='ctx'> 						       "working devices for recovery.\n",</div><div class='ctx'> 						       mdname(mddev));</div><div class='del'>-					conf-&gt;mirrors[i].recovery_disabled</div><div class='add'>+					mirror-&gt;recovery_disabled</div><div class='ctx'> 						= mddev-&gt;recovery_disabled;</div><div class='ctx'> 				}</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -2605,6 +2913,9 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr,</div><div class='ctx'> 			sector_t first_bad, sector;</div><div class='ctx'> 			int bad_sectors;</div><div class='ctx'> </div><div class='add'>+			if (r10_bio-&gt;devs[i].repl_bio)</div><div class='add'>+				r10_bio-&gt;devs[i].repl_bio-&gt;bi_end_io = NULL;</div><div class='add'>+</div><div class='ctx'> 			bio = r10_bio-&gt;devs[i].bio;</div><div class='ctx'> 			bio-&gt;bi_end_io = NULL;</div><div class='ctx'> 			clear_bit(BIO_UPTODATE, &amp;bio-&gt;bi_flags);</div><div class='hunk'>@@ -2635,6 +2946,27 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr,</div><div class='ctx'> 				conf-&gt;mirrors[d].rdev-&gt;data_offset;</div><div class='ctx'> 			bio-&gt;bi_bdev = conf-&gt;mirrors[d].rdev-&gt;bdev;</div><div class='ctx'> 			count++;</div><div class='add'>+</div><div class='add'>+			if (conf-&gt;mirrors[d].replacement == NULL ||</div><div class='add'>+			    test_bit(Faulty,</div><div class='add'>+				     &amp;conf-&gt;mirrors[d].replacement-&gt;flags))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/* Need to set up for writing to the replacement */</div><div class='add'>+			bio = r10_bio-&gt;devs[i].repl_bio;</div><div class='add'>+			clear_bit(BIO_UPTODATE, &amp;bio-&gt;bi_flags);</div><div class='add'>+</div><div class='add'>+			sector = r10_bio-&gt;devs[i].addr;</div><div class='add'>+			atomic_inc(&amp;conf-&gt;mirrors[d].rdev-&gt;nr_pending);</div><div class='add'>+			bio-&gt;bi_next = biolist;</div><div class='add'>+			biolist = bio;</div><div class='add'>+			bio-&gt;bi_private = r10_bio;</div><div class='add'>+			bio-&gt;bi_end_io = end_sync_write;</div><div class='add'>+			bio-&gt;bi_rw = WRITE;</div><div class='add'>+			bio-&gt;bi_sector = sector +</div><div class='add'>+				conf-&gt;mirrors[d].replacement-&gt;data_offset;</div><div class='add'>+			bio-&gt;bi_bdev = conf-&gt;mirrors[d].replacement-&gt;bdev;</div><div class='add'>+			count++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (count &lt; 2) {</div><div class='hunk'>@@ -2643,6 +2975,11 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr,</div><div class='ctx'> 				if (r10_bio-&gt;devs[i].bio-&gt;bi_end_io)</div><div class='ctx'> 					rdev_dec_pending(conf-&gt;mirrors[d].rdev,</div><div class='ctx'> 							 mddev);</div><div class='add'>+				if (r10_bio-&gt;devs[i].repl_bio &amp;&amp;</div><div class='add'>+				    r10_bio-&gt;devs[i].repl_bio-&gt;bi_end_io)</div><div class='add'>+					rdev_dec_pending(</div><div class='add'>+						conf-&gt;mirrors[d].replacement,</div><div class='add'>+						mddev);</div><div class='ctx'> 			}</div><div class='ctx'> 			put_buf(r10_bio);</div><div class='ctx'> 			biolist = NULL;</div><div class='hunk'>@@ -2896,6 +3233,16 @@ static int run(struct mddev *mddev)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		disk = conf-&gt;mirrors + disk_idx;</div><div class='ctx'> </div><div class='add'>+		if (test_bit(Replacement, &amp;rdev-&gt;flags)) {</div><div class='add'>+			if (disk-&gt;replacement)</div><div class='add'>+				goto out_free_conf;</div><div class='add'>+			disk-&gt;replacement = rdev;</div><div class='add'>+		} else {</div><div class='add'>+			if (disk-&gt;rdev)</div><div class='add'>+				goto out_free_conf;</div><div class='add'>+			disk-&gt;rdev = rdev;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		disk-&gt;rdev = rdev;</div><div class='ctx'> 		disk_stack_limits(mddev-&gt;gendisk, rdev-&gt;bdev,</div><div class='ctx'> 				  rdev-&gt;data_offset &lt;&lt; 9);</div><div class='hunk'>@@ -2923,6 +3270,13 @@ static int run(struct mddev *mddev)</div><div class='ctx'> </div><div class='ctx'> 		disk = conf-&gt;mirrors + i;</div><div class='ctx'> </div><div class='add'>+		if (!disk-&gt;rdev &amp;&amp; disk-&gt;replacement) {</div><div class='add'>+			/* The replacement is all we have - use it */</div><div class='add'>+			disk-&gt;rdev = disk-&gt;replacement;</div><div class='add'>+			disk-&gt;replacement = NULL;</div><div class='add'>+			clear_bit(Replacement, &amp;disk-&gt;rdev-&gt;flags);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (!disk-&gt;rdev ||</div><div class='ctx'> 		    !test_bit(In_sync, &amp;disk-&gt;rdev-&gt;flags)) {</div><div class='ctx'> 			disk-&gt;head_position = 0;</div><div class='head'>diff --git a/drivers/md/raid10.h b/drivers/md/raid10.h<br/>index 7facfdf841f4..7c615613c381 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/raid10.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/raid10.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/raid10.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/md/raid10.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> #define _RAID10_H</div><div class='ctx'> </div><div class='ctx'> struct mirror_info {</div><div class='del'>-	struct md_rdev	*rdev;</div><div class='add'>+	struct md_rdev	*rdev, *replacement;</div><div class='ctx'> 	sector_t	head_position;</div><div class='ctx'> 	int		recovery_disabled;	/* matches</div><div class='ctx'> 						 * mddev-&gt;recovery_disabled</div><div class='hunk'>@@ -18,12 +18,13 @@ struct r10conf {</div><div class='ctx'> 	spinlock_t		device_lock;</div><div class='ctx'> </div><div class='ctx'> 	/* geometry */</div><div class='del'>-	int			near_copies;  /* number of copies laid out raid0 style */</div><div class='add'>+	int			near_copies;  /* number of copies laid out</div><div class='add'>+					       * raid0 style */</div><div class='ctx'> 	int 			far_copies;   /* number of copies laid out</div><div class='ctx'> 					       * at large strides across drives</div><div class='ctx'> 					       */</div><div class='del'>-	int			far_offset;   /* far_copies are offset by 1 stripe</div><div class='del'>-					       * instead of many</div><div class='add'>+	int			far_offset;   /* far_copies are offset by 1</div><div class='add'>+					       * stripe instead of many</div><div class='ctx'> 					       */</div><div class='ctx'> 	int			copies;	      /* near_copies * far_copies.</div><div class='ctx'> 					       * must be &lt;= raid_disks</div><div class='hunk'>@@ -34,10 +35,11 @@ struct r10conf {</div><div class='ctx'> 					       * 1 stripe.</div><div class='ctx'> 					       */</div><div class='ctx'> </div><div class='del'>-	sector_t		dev_sectors;  /* temp copy of mddev-&gt;dev_sectors */</div><div class='add'>+	sector_t		dev_sectors;  /* temp copy of</div><div class='add'>+					       * mddev-&gt;dev_sectors */</div><div class='ctx'> </div><div class='del'>-	int chunk_shift; /* shift from chunks to sectors */</div><div class='del'>-	sector_t chunk_mask;</div><div class='add'>+	int			chunk_shift; /* shift from chunks to sectors */</div><div class='add'>+	sector_t		chunk_mask;</div><div class='ctx'> </div><div class='ctx'> 	struct list_head	retry_list;</div><div class='ctx'> 	/* queue pending writes and submit them on unplug */</div><div class='hunk'>@@ -45,20 +47,22 @@ struct r10conf {</div><div class='ctx'> 	int			pending_count;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t		resync_lock;</div><div class='del'>-	int nr_pending;</div><div class='del'>-	int nr_waiting;</div><div class='del'>-	int nr_queued;</div><div class='del'>-	int barrier;</div><div class='add'>+	int			nr_pending;</div><div class='add'>+	int			nr_waiting;</div><div class='add'>+	int			nr_queued;</div><div class='add'>+	int			barrier;</div><div class='ctx'> 	sector_t		next_resync;</div><div class='ctx'> 	int			fullsync;  /* set to 1 if a full sync is needed,</div><div class='ctx'> 					    * (fresh device added).</div><div class='ctx'> 					    * Cleared when a sync completes.</div><div class='ctx'> 					    */</div><div class='del'>-</div><div class='add'>+	int			have_replacement; /* There is at least one</div><div class='add'>+						   * replacement device.</div><div class='add'>+						   */</div><div class='ctx'> 	wait_queue_head_t	wait_barrier;</div><div class='ctx'> </div><div class='del'>-	mempool_t *r10bio_pool;</div><div class='del'>-	mempool_t *r10buf_pool;</div><div class='add'>+	mempool_t		*r10bio_pool;</div><div class='add'>+	mempool_t		*r10buf_pool;</div><div class='ctx'> 	struct page		*tmppage;</div><div class='ctx'> </div><div class='ctx'> 	/* When taking over an array from a different personality, we store</div><div class='hunk'>@@ -98,11 +102,18 @@ struct r10bio {</div><div class='ctx'> 	 * When resyncing we also use one for each copy.</div><div class='ctx'> 	 * When reconstructing, we use 2 bios, one for read, one for write.</div><div class='ctx'> 	 * We choose the number when they are allocated.</div><div class='add'>+	 * We sometimes need an extra bio to write to the replacement.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct {</div><div class='del'>-		struct bio		*bio;</div><div class='del'>-		sector_t addr;</div><div class='del'>-		int devnum;</div><div class='add'>+		struct bio	*bio;</div><div class='add'>+		union {</div><div class='add'>+			struct bio	*repl_bio; /* used for resync and</div><div class='add'>+						    * writes */</div><div class='add'>+			struct md_rdev	*rdev;	   /* used for reads</div><div class='add'>+						    * (read_slot &gt;= 0) */</div><div class='add'>+		};</div><div class='add'>+		sector_t	addr;</div><div class='add'>+		int		devnum;</div><div class='ctx'> 	} devs[0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -121,17 +132,19 @@ struct r10bio {</div><div class='ctx'> #define BIO_SPECIAL(bio) ((unsigned long)bio &lt;= 2)</div><div class='ctx'> </div><div class='ctx'> /* bits for r10bio.state */</div><div class='del'>-#define	R10BIO_Uptodate	0</div><div class='del'>-#define	R10BIO_IsSync	1</div><div class='del'>-#define	R10BIO_IsRecover 2</div><div class='del'>-#define	R10BIO_Degraded 3</div><div class='add'>+enum r10bio_state {</div><div class='add'>+	R10BIO_Uptodate,</div><div class='add'>+	R10BIO_IsSync,</div><div class='add'>+	R10BIO_IsRecover,</div><div class='add'>+	R10BIO_Degraded,</div><div class='ctx'> /* Set ReadError on bios that experience a read error</div><div class='ctx'>  * so that raid10d knows what to do with them.</div><div class='ctx'>  */</div><div class='del'>-#define	R10BIO_ReadError 4</div><div class='add'>+	R10BIO_ReadError,</div><div class='ctx'> /* If a write for this request means we can clear some</div><div class='ctx'>  * known-bad-block records, we set this flag.</div><div class='ctx'>  */</div><div class='del'>-#define	R10BIO_MadeGood 5</div><div class='del'>-#define	R10BIO_WriteError 6</div><div class='add'>+	R10BIO_MadeGood,</div><div class='add'>+	R10BIO_WriteError,</div><div class='add'>+};</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c<br/>index 858fdbb7eb07..360f2b98f62b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/raid5.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/raid5.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/raid5.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/md/raid5.c</a></div><div class='hunk'>@@ -370,12 +370,10 @@ static struct stripe_head *__find_stripe(struct r5conf *conf, sector_t sector,</div><div class='ctx'>  * of the two sections, and some non-in_sync devices may</div><div class='ctx'>  * be insync in the section most affected by failed devices.</div><div class='ctx'>  */</div><div class='del'>-static int has_failed(struct r5conf *conf)</div><div class='add'>+static int calc_degraded(struct r5conf *conf)</div><div class='ctx'> {</div><div class='del'>-	int degraded;</div><div class='add'>+	int degraded, degraded2;</div><div class='ctx'> 	int i;</div><div class='del'>-	if (conf-&gt;mddev-&gt;reshape_position == MaxSector)</div><div class='del'>-		return conf-&gt;mddev-&gt;degraded &gt; conf-&gt;max_degraded;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	degraded = 0;</div><div class='hunk'>@@ -399,14 +397,14 @@ static int has_failed(struct r5conf *conf)</div><div class='ctx'> 				degraded++;</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	if (degraded &gt; conf-&gt;max_degraded)</div><div class='del'>-		return 1;</div><div class='add'>+	if (conf-&gt;raid_disks == conf-&gt;previous_raid_disks)</div><div class='add'>+		return degraded;</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	degraded = 0;</div><div class='add'>+	degraded2 = 0;</div><div class='ctx'> 	for (i = 0; i &lt; conf-&gt;raid_disks; i++) {</div><div class='ctx'> 		struct md_rdev *rdev = rcu_dereference(conf-&gt;disks[i].rdev);</div><div class='ctx'> 		if (!rdev || test_bit(Faulty, &amp;rdev-&gt;flags))</div><div class='del'>-			degraded++;</div><div class='add'>+			degraded2++;</div><div class='ctx'> 		else if (test_bit(In_sync, &amp;rdev-&gt;flags))</div><div class='ctx'> 			;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -416,9 +414,22 @@ static int has_failed(struct r5conf *conf)</div><div class='ctx'> 			 * almost certainly hasn't.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (conf-&gt;raid_disks &lt;= conf-&gt;previous_raid_disks)</div><div class='del'>-				degraded++;</div><div class='add'>+				degraded2++;</div><div class='ctx'> 	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='add'>+	if (degraded2 &gt; degraded)</div><div class='add'>+		return degraded2;</div><div class='add'>+	return degraded;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int has_failed(struct r5conf *conf)</div><div class='add'>+{</div><div class='add'>+	int degraded;</div><div class='add'>+</div><div class='add'>+	if (conf-&gt;mddev-&gt;reshape_position == MaxSector)</div><div class='add'>+		return conf-&gt;mddev-&gt;degraded &gt; conf-&gt;max_degraded;</div><div class='add'>+</div><div class='add'>+	degraded = calc_degraded(conf);</div><div class='ctx'> 	if (degraded &gt; conf-&gt;max_degraded)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -492,8 +503,9 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)</div><div class='ctx'> </div><div class='ctx'> 	for (i = disks; i--; ) {</div><div class='ctx'> 		int rw;</div><div class='del'>-		struct bio *bi;</div><div class='del'>-		struct md_rdev *rdev;</div><div class='add'>+		int replace_only = 0;</div><div class='add'>+		struct bio *bi, *rbi;</div><div class='add'>+		struct md_rdev *rdev, *rrdev = NULL;</div><div class='ctx'> 		if (test_and_clear_bit(R5_Wantwrite, &amp;sh-&gt;dev[i].flags)) {</div><div class='ctx'> 			if (test_and_clear_bit(R5_WantFUA, &amp;sh-&gt;dev[i].flags))</div><div class='ctx'> 				rw = WRITE_FUA;</div><div class='hunk'>@@ -501,27 +513,57 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)</div><div class='ctx'> 				rw = WRITE;</div><div class='ctx'> 		} else if (test_and_clear_bit(R5_Wantread, &amp;sh-&gt;dev[i].flags))</div><div class='ctx'> 			rw = READ;</div><div class='del'>-		else</div><div class='add'>+		else if (test_and_clear_bit(R5_WantReplace,</div><div class='add'>+					    &amp;sh-&gt;dev[i].flags)) {</div><div class='add'>+			rw = WRITE;</div><div class='add'>+			replace_only = 1;</div><div class='add'>+		} else</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		bi = &amp;sh-&gt;dev[i].req;</div><div class='add'>+		rbi = &amp;sh-&gt;dev[i].rreq; /* For writing to replacement */</div><div class='ctx'> </div><div class='ctx'> 		bi-&gt;bi_rw = rw;</div><div class='del'>-		if (rw &amp; WRITE)</div><div class='add'>+		rbi-&gt;bi_rw = rw;</div><div class='add'>+		if (rw &amp; WRITE) {</div><div class='ctx'> 			bi-&gt;bi_end_io = raid5_end_write_request;</div><div class='del'>-		else</div><div class='add'>+			rbi-&gt;bi_end_io = raid5_end_write_request;</div><div class='add'>+		} else</div><div class='ctx'> 			bi-&gt;bi_end_io = raid5_end_read_request;</div><div class='ctx'> </div><div class='ctx'> 		rcu_read_lock();</div><div class='add'>+		rrdev = rcu_dereference(conf-&gt;disks[i].replacement);</div><div class='add'>+		smp_mb(); /* Ensure that if rrdev is NULL, rdev won't be */</div><div class='ctx'> 		rdev = rcu_dereference(conf-&gt;disks[i].rdev);</div><div class='add'>+		if (!rdev) {</div><div class='add'>+			rdev = rrdev;</div><div class='add'>+			rrdev = NULL;</div><div class='add'>+		}</div><div class='add'>+		if (rw &amp; WRITE) {</div><div class='add'>+			if (replace_only)</div><div class='add'>+				rdev = NULL;</div><div class='add'>+			if (rdev == rrdev)</div><div class='add'>+				/* We raced and saw duplicates */</div><div class='add'>+				rrdev = NULL;</div><div class='add'>+		} else {</div><div class='add'>+			if (test_bit(R5_ReadRepl, &amp;sh-&gt;dev[i].flags) &amp;&amp; rrdev)</div><div class='add'>+				rdev = rrdev;</div><div class='add'>+			rrdev = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (rdev &amp;&amp; test_bit(Faulty, &amp;rdev-&gt;flags))</div><div class='ctx'> 			rdev = NULL;</div><div class='ctx'> 		if (rdev)</div><div class='ctx'> 			atomic_inc(&amp;rdev-&gt;nr_pending);</div><div class='add'>+		if (rrdev &amp;&amp; test_bit(Faulty, &amp;rrdev-&gt;flags))</div><div class='add'>+			rrdev = NULL;</div><div class='add'>+		if (rrdev)</div><div class='add'>+			atomic_inc(&amp;rrdev-&gt;nr_pending);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 		/* We have already checked bad blocks for reads.  Now</div><div class='del'>-		 * need to check for writes.</div><div class='add'>+		 * need to check for writes.  We never accept write errors</div><div class='add'>+		 * on the replacement, so we don't to check rrdev.</div><div class='ctx'> 		 */</div><div class='ctx'> 		while ((rw &amp; WRITE) &amp;&amp; rdev &amp;&amp;</div><div class='ctx'> 		       test_bit(WriteErrorSeen, &amp;rdev-&gt;flags)) {</div><div class='hunk'>@@ -551,7 +593,8 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (rdev) {</div><div class='del'>-			if (s-&gt;syncing || s-&gt;expanding || s-&gt;expanded)</div><div class='add'>+			if (s-&gt;syncing || s-&gt;expanding || s-&gt;expanded</div><div class='add'>+			    || s-&gt;replacing)</div><div class='ctx'> 				md_sync_acct(rdev-&gt;bdev, STRIPE_SECTORS);</div><div class='ctx'> </div><div class='ctx'> 			set_bit(STRIPE_IO_STARTED, &amp;sh-&gt;state);</div><div class='hunk'>@@ -563,16 +606,38 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)</div><div class='ctx'> 			atomic_inc(&amp;sh-&gt;count);</div><div class='ctx'> 			bi-&gt;bi_sector = sh-&gt;sector + rdev-&gt;data_offset;</div><div class='ctx'> 			bi-&gt;bi_flags = 1 &lt;&lt; BIO_UPTODATE;</div><div class='del'>-			bi-&gt;bi_vcnt = 1;</div><div class='del'>-			bi-&gt;bi_max_vecs = 1;</div><div class='ctx'> 			bi-&gt;bi_idx = 0;</div><div class='del'>-			bi-&gt;bi_io_vec = &amp;sh-&gt;dev[i].vec;</div><div class='ctx'> 			bi-&gt;bi_io_vec[0].bv_len = STRIPE_SIZE;</div><div class='ctx'> 			bi-&gt;bi_io_vec[0].bv_offset = 0;</div><div class='ctx'> 			bi-&gt;bi_size = STRIPE_SIZE;</div><div class='ctx'> 			bi-&gt;bi_next = NULL;</div><div class='add'>+			if (rrdev)</div><div class='add'>+				set_bit(R5_DOUBLE_LOCKED, &amp;sh-&gt;dev[i].flags);</div><div class='ctx'> 			generic_make_request(bi);</div><div class='del'>-		} else {</div><div class='add'>+		}</div><div class='add'>+		if (rrdev) {</div><div class='add'>+			if (s-&gt;syncing || s-&gt;expanding || s-&gt;expanded</div><div class='add'>+			    || s-&gt;replacing)</div><div class='add'>+				md_sync_acct(rrdev-&gt;bdev, STRIPE_SECTORS);</div><div class='add'>+</div><div class='add'>+			set_bit(STRIPE_IO_STARTED, &amp;sh-&gt;state);</div><div class='add'>+</div><div class='add'>+			rbi-&gt;bi_bdev = rrdev-&gt;bdev;</div><div class='add'>+			pr_debug("%s: for %llu schedule op %ld on "</div><div class='add'>+				 "replacement disc %d\n",</div><div class='add'>+				__func__, (unsigned long long)sh-&gt;sector,</div><div class='add'>+				rbi-&gt;bi_rw, i);</div><div class='add'>+			atomic_inc(&amp;sh-&gt;count);</div><div class='add'>+			rbi-&gt;bi_sector = sh-&gt;sector + rrdev-&gt;data_offset;</div><div class='add'>+			rbi-&gt;bi_flags = 1 &lt;&lt; BIO_UPTODATE;</div><div class='add'>+			rbi-&gt;bi_idx = 0;</div><div class='add'>+			rbi-&gt;bi_io_vec[0].bv_len = STRIPE_SIZE;</div><div class='add'>+			rbi-&gt;bi_io_vec[0].bv_offset = 0;</div><div class='add'>+			rbi-&gt;bi_size = STRIPE_SIZE;</div><div class='add'>+			rbi-&gt;bi_next = NULL;</div><div class='add'>+			generic_make_request(rbi);</div><div class='add'>+		}</div><div class='add'>+		if (!rdev &amp;&amp; !rrdev) {</div><div class='ctx'> 			if (rw &amp; WRITE)</div><div class='ctx'> 				set_bit(STRIPE_DEGRADED, &amp;sh-&gt;state);</div><div class='ctx'> 			pr_debug("skip op %ld on disc %d for sector %llu\n",</div><div class='hunk'>@@ -1583,7 +1648,7 @@ static void raid5_end_read_request(struct bio * bi, int error)</div><div class='ctx'> 	int disks = sh-&gt;disks, i;</div><div class='ctx'> 	int uptodate = test_bit(BIO_UPTODATE, &amp;bi-&gt;bi_flags);</div><div class='ctx'> 	char b[BDEVNAME_SIZE];</div><div class='del'>-	struct md_rdev *rdev;</div><div class='add'>+	struct md_rdev *rdev = NULL;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	for (i=0 ; i&lt;disks; i++)</div><div class='hunk'>@@ -1597,11 +1662,23 @@ static void raid5_end_read_request(struct bio * bi, int error)</div><div class='ctx'> 		BUG();</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+	if (test_bit(R5_ReadRepl, &amp;sh-&gt;dev[i].flags))</div><div class='add'>+		/* If replacement finished while this request was outstanding,</div><div class='add'>+		 * 'replacement' might be NULL already.</div><div class='add'>+		 * In that case it moved down to 'rdev'.</div><div class='add'>+		 * rdev is not removed until all requests are finished.</div><div class='add'>+		 */</div><div class='add'>+		rdev = conf-&gt;disks[i].replacement;</div><div class='add'>+	if (!rdev)</div><div class='add'>+		rdev = conf-&gt;disks[i].rdev;</div><div class='ctx'> </div><div class='ctx'> 	if (uptodate) {</div><div class='ctx'> 		set_bit(R5_UPTODATE, &amp;sh-&gt;dev[i].flags);</div><div class='ctx'> 		if (test_bit(R5_ReadError, &amp;sh-&gt;dev[i].flags)) {</div><div class='del'>-			rdev = conf-&gt;disks[i].rdev;</div><div class='add'>+			/* Note that this cannot happen on a</div><div class='add'>+			 * replacement device.  We just fail those on</div><div class='add'>+			 * any error</div><div class='add'>+			 */</div><div class='ctx'> 			printk_ratelimited(</div><div class='ctx'> 				KERN_INFO</div><div class='ctx'> 				"md/raid:%s: read error corrected"</div><div class='hunk'>@@ -1614,16 +1691,24 @@ static void raid5_end_read_request(struct bio * bi, int error)</div><div class='ctx'> 			clear_bit(R5_ReadError, &amp;sh-&gt;dev[i].flags);</div><div class='ctx'> 			clear_bit(R5_ReWrite, &amp;sh-&gt;dev[i].flags);</div><div class='ctx'> 		}</div><div class='del'>-		if (atomic_read(&amp;conf-&gt;disks[i].rdev-&gt;read_errors))</div><div class='del'>-			atomic_set(&amp;conf-&gt;disks[i].rdev-&gt;read_errors, 0);</div><div class='add'>+		if (atomic_read(&amp;rdev-&gt;read_errors))</div><div class='add'>+			atomic_set(&amp;rdev-&gt;read_errors, 0);</div><div class='ctx'> 	} else {</div><div class='del'>-		const char *bdn = bdevname(conf-&gt;disks[i].rdev-&gt;bdev, b);</div><div class='add'>+		const char *bdn = bdevname(rdev-&gt;bdev, b);</div><div class='ctx'> 		int retry = 0;</div><div class='del'>-		rdev = conf-&gt;disks[i].rdev;</div><div class='ctx'> </div><div class='ctx'> 		clear_bit(R5_UPTODATE, &amp;sh-&gt;dev[i].flags);</div><div class='ctx'> 		atomic_inc(&amp;rdev-&gt;read_errors);</div><div class='del'>-		if (conf-&gt;mddev-&gt;degraded &gt;= conf-&gt;max_degraded)</div><div class='add'>+		if (test_bit(R5_ReadRepl, &amp;sh-&gt;dev[i].flags))</div><div class='add'>+			printk_ratelimited(</div><div class='add'>+				KERN_WARNING</div><div class='add'>+				"md/raid:%s: read error on replacement device "</div><div class='add'>+				"(sector %llu on %s).\n",</div><div class='add'>+				mdname(conf-&gt;mddev),</div><div class='add'>+				(unsigned long long)(sh-&gt;sector</div><div class='add'>+						     + rdev-&gt;data_offset),</div><div class='add'>+				bdn);</div><div class='add'>+		else if (conf-&gt;mddev-&gt;degraded &gt;= conf-&gt;max_degraded)</div><div class='ctx'> 			printk_ratelimited(</div><div class='ctx'> 				KERN_WARNING</div><div class='ctx'> 				"md/raid:%s: read error not correctable "</div><div class='hunk'>@@ -1657,7 +1742,7 @@ static void raid5_end_read_request(struct bio * bi, int error)</div><div class='ctx'> 			md_error(conf-&gt;mddev, rdev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	rdev_dec_pending(conf-&gt;disks[i].rdev, conf-&gt;mddev);</div><div class='add'>+	rdev_dec_pending(rdev, conf-&gt;mddev);</div><div class='ctx'> 	clear_bit(R5_LOCKED, &amp;sh-&gt;dev[i].flags);</div><div class='ctx'> 	set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='ctx'> 	release_stripe(sh);</div><div class='hunk'>@@ -1668,14 +1753,30 @@ static void raid5_end_write_request(struct bio *bi, int error)</div><div class='ctx'> 	struct stripe_head *sh = bi-&gt;bi_private;</div><div class='ctx'> 	struct r5conf *conf = sh-&gt;raid_conf;</div><div class='ctx'> 	int disks = sh-&gt;disks, i;</div><div class='add'>+	struct md_rdev *uninitialized_var(rdev);</div><div class='ctx'> 	int uptodate = test_bit(BIO_UPTODATE, &amp;bi-&gt;bi_flags);</div><div class='ctx'> 	sector_t first_bad;</div><div class='ctx'> 	int bad_sectors;</div><div class='add'>+	int replacement = 0;</div><div class='ctx'> </div><div class='del'>-	for (i=0 ; i&lt;disks; i++)</div><div class='del'>-		if (bi == &amp;sh-&gt;dev[i].req)</div><div class='add'>+	for (i = 0 ; i &lt; disks; i++) {</div><div class='add'>+		if (bi == &amp;sh-&gt;dev[i].req) {</div><div class='add'>+			rdev = conf-&gt;disks[i].rdev;</div><div class='ctx'> 			break;</div><div class='del'>-</div><div class='add'>+		}</div><div class='add'>+		if (bi == &amp;sh-&gt;dev[i].rreq) {</div><div class='add'>+			rdev = conf-&gt;disks[i].replacement;</div><div class='add'>+			if (rdev)</div><div class='add'>+				replacement = 1;</div><div class='add'>+			else</div><div class='add'>+				/* rdev was removed and 'replacement'</div><div class='add'>+				 * replaced it.  rdev is not removed</div><div class='add'>+				 * until all requests are finished.</div><div class='add'>+				 */</div><div class='add'>+				rdev = conf-&gt;disks[i].rdev;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	pr_debug("end_write_request %llu/%d, count %d, uptodate: %d.\n",</div><div class='ctx'> 		(unsigned long long)sh-&gt;sector, i, atomic_read(&amp;sh-&gt;count),</div><div class='ctx'> 		uptodate);</div><div class='hunk'>@@ -1684,21 +1785,33 @@ static void raid5_end_write_request(struct bio *bi, int error)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!uptodate) {</div><div class='del'>-		set_bit(WriteErrorSeen, &amp;conf-&gt;disks[i].rdev-&gt;flags);</div><div class='del'>-		set_bit(R5_WriteError, &amp;sh-&gt;dev[i].flags);</div><div class='del'>-	} else if (is_badblock(conf-&gt;disks[i].rdev, sh-&gt;sector, STRIPE_SECTORS,</div><div class='del'>-			       &amp;first_bad, &amp;bad_sectors))</div><div class='del'>-		set_bit(R5_MadeGood, &amp;sh-&gt;dev[i].flags);</div><div class='add'>+	if (replacement) {</div><div class='add'>+		if (!uptodate)</div><div class='add'>+			md_error(conf-&gt;mddev, rdev);</div><div class='add'>+		else if (is_badblock(rdev, sh-&gt;sector,</div><div class='add'>+				     STRIPE_SECTORS,</div><div class='add'>+				     &amp;first_bad, &amp;bad_sectors))</div><div class='add'>+			set_bit(R5_MadeGoodRepl, &amp;sh-&gt;dev[i].flags);</div><div class='add'>+	} else {</div><div class='add'>+		if (!uptodate) {</div><div class='add'>+			set_bit(WriteErrorSeen, &amp;rdev-&gt;flags);</div><div class='add'>+			set_bit(R5_WriteError, &amp;sh-&gt;dev[i].flags);</div><div class='add'>+			if (!test_and_set_bit(WantReplacement, &amp;rdev-&gt;flags))</div><div class='add'>+				set_bit(MD_RECOVERY_NEEDED,</div><div class='add'>+					&amp;rdev-&gt;mddev-&gt;recovery);</div><div class='add'>+		} else if (is_badblock(rdev, sh-&gt;sector,</div><div class='add'>+				       STRIPE_SECTORS,</div><div class='add'>+				       &amp;first_bad, &amp;bad_sectors))</div><div class='add'>+			set_bit(R5_MadeGood, &amp;sh-&gt;dev[i].flags);</div><div class='add'>+	}</div><div class='add'>+	rdev_dec_pending(rdev, conf-&gt;mddev);</div><div class='ctx'> </div><div class='del'>-	rdev_dec_pending(conf-&gt;disks[i].rdev, conf-&gt;mddev);</div><div class='del'>-	</div><div class='del'>-	clear_bit(R5_LOCKED, &amp;sh-&gt;dev[i].flags);</div><div class='add'>+	if (!test_and_clear_bit(R5_DOUBLE_LOCKED, &amp;sh-&gt;dev[i].flags))</div><div class='add'>+		clear_bit(R5_LOCKED, &amp;sh-&gt;dev[i].flags);</div><div class='ctx'> 	set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='ctx'> 	release_stripe(sh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static sector_t compute_blocknr(struct stripe_head *sh, int i, int previous);</div><div class='ctx'> 	</div><div class='ctx'> static void raid5_build_block(struct stripe_head *sh, int i, int previous)</div><div class='hunk'>@@ -1709,12 +1822,15 @@ static void raid5_build_block(struct stripe_head *sh, int i, int previous)</div><div class='ctx'> 	dev-&gt;req.bi_io_vec = &amp;dev-&gt;vec;</div><div class='ctx'> 	dev-&gt;req.bi_vcnt++;</div><div class='ctx'> 	dev-&gt;req.bi_max_vecs++;</div><div class='add'>+	dev-&gt;req.bi_private = sh;</div><div class='ctx'> 	dev-&gt;vec.bv_page = dev-&gt;page;</div><div class='del'>-	dev-&gt;vec.bv_len = STRIPE_SIZE;</div><div class='del'>-	dev-&gt;vec.bv_offset = 0;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;req.bi_sector = sh-&gt;sector;</div><div class='del'>-	dev-&gt;req.bi_private = sh;</div><div class='add'>+	bio_init(&amp;dev-&gt;rreq);</div><div class='add'>+	dev-&gt;rreq.bi_io_vec = &amp;dev-&gt;rvec;</div><div class='add'>+	dev-&gt;rreq.bi_vcnt++;</div><div class='add'>+	dev-&gt;rreq.bi_max_vecs++;</div><div class='add'>+	dev-&gt;rreq.bi_private = sh;</div><div class='add'>+	dev-&gt;rvec.bv_page = dev-&gt;page;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;flags = 0;</div><div class='ctx'> 	dev-&gt;sector = compute_blocknr(sh, i, previous);</div><div class='hunk'>@@ -1724,18 +1840,15 @@ static void error(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	char b[BDEVNAME_SIZE];</div><div class='ctx'> 	struct r5conf *conf = mddev-&gt;private;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	pr_debug("raid456: error called\n");</div><div class='ctx'> </div><div class='del'>-	if (test_and_clear_bit(In_sync, &amp;rdev-&gt;flags)) {</div><div class='del'>-		unsigned long flags;</div><div class='del'>-		spin_lock_irqsave(&amp;conf-&gt;device_lock, flags);</div><div class='del'>-		mddev-&gt;degraded++;</div><div class='del'>-		spin_unlock_irqrestore(&amp;conf-&gt;device_lock, flags);</div><div class='del'>-		/*</div><div class='del'>-		 * if recovery was running, make sure it aborts.</div><div class='del'>-		 */</div><div class='del'>-		set_bit(MD_RECOVERY_INTR, &amp;mddev-&gt;recovery);</div><div class='del'>-	}</div><div class='add'>+	spin_lock_irqsave(&amp;conf-&gt;device_lock, flags);</div><div class='add'>+	clear_bit(In_sync, &amp;rdev-&gt;flags);</div><div class='add'>+	mddev-&gt;degraded = calc_degraded(conf);</div><div class='add'>+	spin_unlock_irqrestore(&amp;conf-&gt;device_lock, flags);</div><div class='add'>+	set_bit(MD_RECOVERY_INTR, &amp;mddev-&gt;recovery);</div><div class='add'>+</div><div class='ctx'> 	set_bit(Blocked, &amp;rdev-&gt;flags);</div><div class='ctx'> 	set_bit(Faulty, &amp;rdev-&gt;flags);</div><div class='ctx'> 	set_bit(MD_CHANGE_DEVS, &amp;mddev-&gt;flags);</div><div class='hunk'>@@ -2362,8 +2475,9 @@ handle_failed_sync(struct r5conf *conf, struct stripe_head *sh,</div><div class='ctx'> 	md_done_sync(conf-&gt;mddev, STRIPE_SECTORS, 0);</div><div class='ctx'> 	clear_bit(STRIPE_SYNCING, &amp;sh-&gt;state);</div><div class='ctx'> 	s-&gt;syncing = 0;</div><div class='add'>+	s-&gt;replacing = 0;</div><div class='ctx'> 	/* There is nothing more to do for sync/check/repair.</div><div class='del'>-	 * For recover we need to record a bad block on all</div><div class='add'>+	 * For recover/replace we need to record a bad block on all</div><div class='ctx'> 	 * non-sync devices, or abort the recovery</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!test_bit(MD_RECOVERY_RECOVER, &amp;conf-&gt;mddev-&gt;recovery))</div><div class='hunk'>@@ -2373,12 +2487,18 @@ handle_failed_sync(struct r5conf *conf, struct stripe_head *sh,</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; conf-&gt;raid_disks; i++) {</div><div class='ctx'> 		struct md_rdev *rdev = conf-&gt;disks[i].rdev;</div><div class='del'>-		if (!rdev</div><div class='del'>-		    || test_bit(Faulty, &amp;rdev-&gt;flags)</div><div class='del'>-		    || test_bit(In_sync, &amp;rdev-&gt;flags))</div><div class='del'>-			continue;</div><div class='del'>-		if (!rdev_set_badblocks(rdev, sh-&gt;sector,</div><div class='del'>-					STRIPE_SECTORS, 0))</div><div class='add'>+		if (rdev</div><div class='add'>+		    &amp;&amp; !test_bit(Faulty, &amp;rdev-&gt;flags)</div><div class='add'>+		    &amp;&amp; !test_bit(In_sync, &amp;rdev-&gt;flags)</div><div class='add'>+		    &amp;&amp; !rdev_set_badblocks(rdev, sh-&gt;sector,</div><div class='add'>+					   STRIPE_SECTORS, 0))</div><div class='add'>+			abort = 1;</div><div class='add'>+		rdev = conf-&gt;disks[i].replacement;</div><div class='add'>+		if (rdev</div><div class='add'>+		    &amp;&amp; !test_bit(Faulty, &amp;rdev-&gt;flags)</div><div class='add'>+		    &amp;&amp; !test_bit(In_sync, &amp;rdev-&gt;flags)</div><div class='add'>+		    &amp;&amp; !rdev_set_badblocks(rdev, sh-&gt;sector,</div><div class='add'>+					   STRIPE_SECTORS, 0))</div><div class='ctx'> 			abort = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (abort) {</div><div class='hunk'>@@ -2387,6 +2507,22 @@ handle_failed_sync(struct r5conf *conf, struct stripe_head *sh,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int want_replace(struct stripe_head *sh, int disk_idx)</div><div class='add'>+{</div><div class='add'>+	struct md_rdev *rdev;</div><div class='add'>+	int rv = 0;</div><div class='add'>+	/* Doing recovery so rcu locking not required */</div><div class='add'>+	rdev = sh-&gt;raid_conf-&gt;disks[disk_idx].replacement;</div><div class='add'>+	if (rdev</div><div class='add'>+	    &amp;&amp; !test_bit(Faulty, &amp;rdev-&gt;flags)</div><div class='add'>+	    &amp;&amp; !test_bit(In_sync, &amp;rdev-&gt;flags)</div><div class='add'>+	    &amp;&amp; (rdev-&gt;recovery_offset &lt;= sh-&gt;sector</div><div class='add'>+		|| rdev-&gt;mddev-&gt;recovery_cp &lt;= sh-&gt;sector))</div><div class='add'>+		rv = 1;</div><div class='add'>+</div><div class='add'>+	return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* fetch_block - checks the given member device to see if its data needs</div><div class='ctx'>  * to be read or computed to satisfy a request.</div><div class='ctx'>  *</div><div class='hunk'>@@ -2406,6 +2542,7 @@ static int fetch_block(struct stripe_head *sh, struct stripe_head_state *s,</div><div class='ctx'> 	    (dev-&gt;toread ||</div><div class='ctx'> 	     (dev-&gt;towrite &amp;&amp; !test_bit(R5_OVERWRITE, &amp;dev-&gt;flags)) ||</div><div class='ctx'> 	     s-&gt;syncing || s-&gt;expanding ||</div><div class='add'>+	     (s-&gt;replacing &amp;&amp; want_replace(sh, disk_idx)) ||</div><div class='ctx'> 	     (s-&gt;failed &gt;= 1 &amp;&amp; fdev[0]-&gt;toread) ||</div><div class='ctx'> 	     (s-&gt;failed &gt;= 2 &amp;&amp; fdev[1]-&gt;toread) ||</div><div class='ctx'> 	     (sh-&gt;raid_conf-&gt;level &lt;= 5 &amp;&amp; s-&gt;failed &amp;&amp; fdev[0]-&gt;towrite &amp;&amp;</div><div class='hunk'>@@ -2959,22 +3096,18 @@ static void handle_stripe_expansion(struct r5conf *conf, struct stripe_head *sh)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * handle_stripe - do things to a stripe.</div><div class='ctx'>  *</div><div class='del'>- * We lock the stripe and then examine the state of various bits</div><div class='del'>- * to see what needs to be done.</div><div class='add'>+ * We lock the stripe by setting STRIPE_ACTIVE and then examine the</div><div class='add'>+ * state of various bits to see what needs to be done.</div><div class='ctx'>  * Possible results:</div><div class='del'>- *    return some read request which now have data</div><div class='del'>- *    return some write requests which are safely on disc</div><div class='add'>+ *    return some read requests which now have data</div><div class='add'>+ *    return some write requests which are safely on storage</div><div class='ctx'>  *    schedule a read on some buffers</div><div class='ctx'>  *    schedule a write of some buffers</div><div class='ctx'>  *    return confirmation of parity correctness</div><div class='ctx'>  *</div><div class='del'>- * buffers are taken off read_list or write_list, and bh_cache buffers</div><div class='del'>- * get BH_Lock set before the stripe lock is released.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s)</div><div class='hunk'>@@ -2983,10 +3116,10 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s)</div><div class='ctx'> 	int disks = sh-&gt;disks;</div><div class='ctx'> 	struct r5dev *dev;</div><div class='ctx'> 	int i;</div><div class='add'>+	int do_recovery = 0;</div><div class='ctx'> </div><div class='ctx'> 	memset(s, 0, sizeof(*s));</div><div class='ctx'> </div><div class='del'>-	s-&gt;syncing = test_bit(STRIPE_SYNCING, &amp;sh-&gt;state);</div><div class='ctx'> 	s-&gt;expanding = test_bit(STRIPE_EXPAND_SOURCE, &amp;sh-&gt;state);</div><div class='ctx'> 	s-&gt;expanded = test_bit(STRIPE_EXPAND_READY, &amp;sh-&gt;state);</div><div class='ctx'> 	s-&gt;failed_num[0] = -1;</div><div class='hunk'>@@ -3004,7 +3137,8 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s)</div><div class='ctx'> 		dev = &amp;sh-&gt;dev[i];</div><div class='ctx'> </div><div class='ctx'> 		pr_debug("check %d: state 0x%lx read %p write %p written %p\n",</div><div class='del'>-			i, dev-&gt;flags, dev-&gt;toread, dev-&gt;towrite, dev-&gt;written);</div><div class='add'>+			 i, dev-&gt;flags,</div><div class='add'>+			 dev-&gt;toread, dev-&gt;towrite, dev-&gt;written);</div><div class='ctx'> 		/* maybe we can reply to a read</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * new wantfill requests are only permitted while</div><div class='hunk'>@@ -3035,7 +3169,21 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (dev-&gt;written)</div><div class='ctx'> 			s-&gt;written++;</div><div class='del'>-		rdev = rcu_dereference(conf-&gt;disks[i].rdev);</div><div class='add'>+		/* Prefer to use the replacement for reads, but only</div><div class='add'>+		 * if it is recovered enough and has no bad blocks.</div><div class='add'>+		 */</div><div class='add'>+		rdev = rcu_dereference(conf-&gt;disks[i].replacement);</div><div class='add'>+		if (rdev &amp;&amp; !test_bit(Faulty, &amp;rdev-&gt;flags) &amp;&amp;</div><div class='add'>+		    rdev-&gt;recovery_offset &gt;= sh-&gt;sector + STRIPE_SECTORS &amp;&amp;</div><div class='add'>+		    !is_badblock(rdev, sh-&gt;sector, STRIPE_SECTORS,</div><div class='add'>+				 &amp;first_bad, &amp;bad_sectors))</div><div class='add'>+			set_bit(R5_ReadRepl, &amp;dev-&gt;flags);</div><div class='add'>+		else {</div><div class='add'>+			if (rdev)</div><div class='add'>+				set_bit(R5_NeedReplace, &amp;dev-&gt;flags);</div><div class='add'>+			rdev = rcu_dereference(conf-&gt;disks[i].rdev);</div><div class='add'>+			clear_bit(R5_ReadRepl, &amp;dev-&gt;flags);</div><div class='add'>+		}</div><div class='ctx'> 		if (rdev &amp;&amp; test_bit(Faulty, &amp;rdev-&gt;flags))</div><div class='ctx'> 			rdev = NULL;</div><div class='ctx'> 		if (rdev) {</div><div class='hunk'>@@ -3077,20 +3225,38 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s)</div><div class='ctx'> 			set_bit(R5_Insync, &amp;dev-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 		if (rdev &amp;&amp; test_bit(R5_WriteError, &amp;dev-&gt;flags)) {</div><div class='del'>-			clear_bit(R5_Insync, &amp;dev-&gt;flags);</div><div class='del'>-			if (!test_bit(Faulty, &amp;rdev-&gt;flags)) {</div><div class='add'>+			/* This flag does not apply to '.replacement'</div><div class='add'>+			 * only to .rdev, so make sure to check that*/</div><div class='add'>+			struct md_rdev *rdev2 = rcu_dereference(</div><div class='add'>+				conf-&gt;disks[i].rdev);</div><div class='add'>+			if (rdev2 == rdev)</div><div class='add'>+				clear_bit(R5_Insync, &amp;dev-&gt;flags);</div><div class='add'>+			if (rdev2 &amp;&amp; !test_bit(Faulty, &amp;rdev2-&gt;flags)) {</div><div class='ctx'> 				s-&gt;handle_bad_blocks = 1;</div><div class='del'>-				atomic_inc(&amp;rdev-&gt;nr_pending);</div><div class='add'>+				atomic_inc(&amp;rdev2-&gt;nr_pending);</div><div class='ctx'> 			} else</div><div class='ctx'> 				clear_bit(R5_WriteError, &amp;dev-&gt;flags);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (rdev &amp;&amp; test_bit(R5_MadeGood, &amp;dev-&gt;flags)) {</div><div class='del'>-			if (!test_bit(Faulty, &amp;rdev-&gt;flags)) {</div><div class='add'>+			/* This flag does not apply to '.replacement'</div><div class='add'>+			 * only to .rdev, so make sure to check that*/</div><div class='add'>+			struct md_rdev *rdev2 = rcu_dereference(</div><div class='add'>+				conf-&gt;disks[i].rdev);</div><div class='add'>+			if (rdev2 &amp;&amp; !test_bit(Faulty, &amp;rdev2-&gt;flags)) {</div><div class='ctx'> 				s-&gt;handle_bad_blocks = 1;</div><div class='del'>-				atomic_inc(&amp;rdev-&gt;nr_pending);</div><div class='add'>+				atomic_inc(&amp;rdev2-&gt;nr_pending);</div><div class='ctx'> 			} else</div><div class='ctx'> 				clear_bit(R5_MadeGood, &amp;dev-&gt;flags);</div><div class='ctx'> 		}</div><div class='add'>+		if (test_bit(R5_MadeGoodRepl, &amp;dev-&gt;flags)) {</div><div class='add'>+			struct md_rdev *rdev2 = rcu_dereference(</div><div class='add'>+				conf-&gt;disks[i].replacement);</div><div class='add'>+			if (rdev2 &amp;&amp; !test_bit(Faulty, &amp;rdev2-&gt;flags)) {</div><div class='add'>+				s-&gt;handle_bad_blocks = 1;</div><div class='add'>+				atomic_inc(&amp;rdev2-&gt;nr_pending);</div><div class='add'>+			} else</div><div class='add'>+				clear_bit(R5_MadeGoodRepl, &amp;dev-&gt;flags);</div><div class='add'>+		}</div><div class='ctx'> 		if (!test_bit(R5_Insync, &amp;dev-&gt;flags)) {</div><div class='ctx'> 			/* The ReadError flag will just be confusing now */</div><div class='ctx'> 			clear_bit(R5_ReadError, &amp;dev-&gt;flags);</div><div class='hunk'>@@ -3102,9 +3268,25 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s)</div><div class='ctx'> 			if (s-&gt;failed &lt; 2)</div><div class='ctx'> 				s-&gt;failed_num[s-&gt;failed] = i;</div><div class='ctx'> 			s-&gt;failed++;</div><div class='add'>+			if (rdev &amp;&amp; !test_bit(Faulty, &amp;rdev-&gt;flags))</div><div class='add'>+				do_recovery = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='add'>+	if (test_bit(STRIPE_SYNCING, &amp;sh-&gt;state)) {</div><div class='add'>+		/* If there is a failed device being replaced,</div><div class='add'>+		 *     we must be recovering.</div><div class='add'>+		 * else if we are after recovery_cp, we must be syncing</div><div class='add'>+		 * else we can only be replacing</div><div class='add'>+		 * sync and recovery both need to read all devices, and so</div><div class='add'>+		 * use the same flag.</div><div class='add'>+		 */</div><div class='add'>+		if (do_recovery ||</div><div class='add'>+		    sh-&gt;sector &gt;= conf-&gt;mddev-&gt;recovery_cp)</div><div class='add'>+			s-&gt;syncing = 1;</div><div class='add'>+		else</div><div class='add'>+			s-&gt;replacing = 1;</div><div class='add'>+	}</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3146,7 +3328,7 @@ static void handle_stripe(struct stripe_head *sh)</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(s.blocked_rdev)) {</div><div class='ctx'> 		if (s.syncing || s.expanding || s.expanded ||</div><div class='del'>-		    s.to_write || s.written) {</div><div class='add'>+		    s.replacing || s.to_write || s.written) {</div><div class='ctx'> 			set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='ctx'> 			goto finish;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3172,7 +3354,7 @@ static void handle_stripe(struct stripe_head *sh)</div><div class='ctx'> 		sh-&gt;reconstruct_state = 0;</div><div class='ctx'> 		if (s.to_read+s.to_write+s.written)</div><div class='ctx'> 			handle_failed_stripe(conf, sh, &amp;s, disks, &amp;s.return_bi);</div><div class='del'>-		if (s.syncing)</div><div class='add'>+		if (s.syncing + s.replacing)</div><div class='ctx'> 			handle_failed_sync(conf, sh, &amp;s);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3203,7 +3385,9 @@ static void handle_stripe(struct stripe_head *sh)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (s.to_read || s.non_overwrite</div><div class='ctx'> 	    || (conf-&gt;level == 6 &amp;&amp; s.to_write &amp;&amp; s.failed)</div><div class='del'>-	    || (s.syncing &amp;&amp; (s.uptodate + s.compute &lt; disks)) || s.expanding)</div><div class='add'>+	    || (s.syncing &amp;&amp; (s.uptodate + s.compute &lt; disks))</div><div class='add'>+	    || s.replacing</div><div class='add'>+	    || s.expanding)</div><div class='ctx'> 		handle_stripe_fill(sh, &amp;s, disks);</div><div class='ctx'> </div><div class='ctx'> 	/* Now we check to see if any write operations have recently</div><div class='hunk'>@@ -3265,7 +3449,20 @@ static void handle_stripe(struct stripe_head *sh)</div><div class='ctx'> 			handle_parity_checks5(conf, sh, &amp;s, disks);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (s.syncing &amp;&amp; s.locked == 0 &amp;&amp; test_bit(STRIPE_INSYNC, &amp;sh-&gt;state)) {</div><div class='add'>+	if (s.replacing &amp;&amp; s.locked == 0</div><div class='add'>+	    &amp;&amp; !test_bit(STRIPE_INSYNC, &amp;sh-&gt;state)) {</div><div class='add'>+		/* Write out to replacement devices where possible */</div><div class='add'>+		for (i = 0; i &lt; conf-&gt;raid_disks; i++)</div><div class='add'>+			if (test_bit(R5_UPTODATE, &amp;sh-&gt;dev[i].flags) &amp;&amp;</div><div class='add'>+			    test_bit(R5_NeedReplace, &amp;sh-&gt;dev[i].flags)) {</div><div class='add'>+				set_bit(R5_WantReplace, &amp;sh-&gt;dev[i].flags);</div><div class='add'>+				set_bit(R5_LOCKED, &amp;sh-&gt;dev[i].flags);</div><div class='add'>+				s.locked++;</div><div class='add'>+			}</div><div class='add'>+		set_bit(STRIPE_INSYNC, &amp;sh-&gt;state);</div><div class='add'>+	}</div><div class='add'>+	if ((s.syncing || s.replacing) &amp;&amp; s.locked == 0 &amp;&amp;</div><div class='add'>+	    test_bit(STRIPE_INSYNC, &amp;sh-&gt;state)) {</div><div class='ctx'> 		md_done_sync(conf-&gt;mddev, STRIPE_SECTORS, 1);</div><div class='ctx'> 		clear_bit(STRIPE_SYNCING, &amp;sh-&gt;state);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3363,6 +3560,15 @@ finish:</div><div class='ctx'> 						     STRIPE_SECTORS);</div><div class='ctx'> 				rdev_dec_pending(rdev, conf-&gt;mddev);</div><div class='ctx'> 			}</div><div class='add'>+			if (test_and_clear_bit(R5_MadeGoodRepl, &amp;dev-&gt;flags)) {</div><div class='add'>+				rdev = conf-&gt;disks[i].replacement;</div><div class='add'>+				if (!rdev)</div><div class='add'>+					/* rdev have been moved down */</div><div class='add'>+					rdev = conf-&gt;disks[i].rdev;</div><div class='add'>+				rdev_clear_badblocks(rdev, sh-&gt;sector,</div><div class='add'>+						     STRIPE_SECTORS);</div><div class='add'>+				rdev_dec_pending(rdev, conf-&gt;mddev);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	if (s.ops_request)</div><div class='hunk'>@@ -3586,6 +3792,7 @@ static int chunk_aligned_read(struct mddev *mddev, struct bio * raid_bio)</div><div class='ctx'> 	int dd_idx;</div><div class='ctx'> 	struct bio* align_bi;</div><div class='ctx'> 	struct md_rdev *rdev;</div><div class='add'>+	sector_t end_sector;</div><div class='ctx'> </div><div class='ctx'> 	if (!in_chunk_boundary(mddev, raid_bio)) {</div><div class='ctx'> 		pr_debug("chunk_aligned_read : non aligned\n");</div><div class='hunk'>@@ -3610,9 +3817,19 @@ static int chunk_aligned_read(struct mddev *mddev, struct bio * raid_bio)</div><div class='ctx'> 						    0,</div><div class='ctx'> 						    &amp;dd_idx, NULL);</div><div class='ctx'> </div><div class='add'>+	end_sector = align_bi-&gt;bi_sector + (align_bi-&gt;bi_size &gt;&gt; 9);</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	rdev = rcu_dereference(conf-&gt;disks[dd_idx].rdev);</div><div class='del'>-	if (rdev &amp;&amp; test_bit(In_sync, &amp;rdev-&gt;flags)) {</div><div class='add'>+	rdev = rcu_dereference(conf-&gt;disks[dd_idx].replacement);</div><div class='add'>+	if (!rdev || test_bit(Faulty, &amp;rdev-&gt;flags) ||</div><div class='add'>+	    rdev-&gt;recovery_offset &lt; end_sector) {</div><div class='add'>+		rdev = rcu_dereference(conf-&gt;disks[dd_idx].rdev);</div><div class='add'>+		if (rdev &amp;&amp;</div><div class='add'>+		    (test_bit(Faulty, &amp;rdev-&gt;flags) ||</div><div class='add'>+		    !(test_bit(In_sync, &amp;rdev-&gt;flags) ||</div><div class='add'>+		      rdev-&gt;recovery_offset &gt;= end_sector)))</div><div class='add'>+			rdev = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (rdev) {</div><div class='ctx'> 		sector_t first_bad;</div><div class='ctx'> 		int bad_sectors;</div><div class='ctx'> </div><div class='hunk'>@@ -4137,7 +4354,6 @@ static inline sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int</div><div class='ctx'> 		return sync_blocks * STRIPE_SECTORS; /* keep things rounded to whole stripes */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	bitmap_cond_end_sync(mddev-&gt;bitmap, sector_nr);</div><div class='ctx'> </div><div class='ctx'> 	sh = get_active_stripe(conf, sector_nr, 0, 1, 0);</div><div class='hunk'>@@ -4208,7 +4424,6 @@ static int  retry_aligned_read(struct r5conf *conf, struct bio *raid_bio)</div><div class='ctx'> 			return handled;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		set_bit(R5_ReadError, &amp;sh-&gt;dev[dd_idx].flags);</div><div class='ctx'> 		if (!add_stripe_bio(sh, raid_bio, dd_idx, 0)) {</div><div class='ctx'> 			release_stripe(sh);</div><div class='ctx'> 			raid5_set_bi_hw_segments(raid_bio, scnt);</div><div class='hunk'>@@ -4635,7 +4850,15 @@ static struct r5conf *setup_conf(struct mddev *mddev)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		disk = conf-&gt;disks + raid_disk;</div><div class='ctx'> </div><div class='del'>-		disk-&gt;rdev = rdev;</div><div class='add'>+		if (test_bit(Replacement, &amp;rdev-&gt;flags)) {</div><div class='add'>+			if (disk-&gt;replacement)</div><div class='add'>+				goto abort;</div><div class='add'>+			disk-&gt;replacement = rdev;</div><div class='add'>+		} else {</div><div class='add'>+			if (disk-&gt;rdev)</div><div class='add'>+				goto abort;</div><div class='add'>+			disk-&gt;rdev = rdev;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (test_bit(In_sync, &amp;rdev-&gt;flags)) {</div><div class='ctx'> 			char b[BDEVNAME_SIZE];</div><div class='hunk'>@@ -4724,6 +4947,7 @@ static int run(struct mddev *mddev)</div><div class='ctx'> 	int dirty_parity_disks = 0;</div><div class='ctx'> 	struct md_rdev *rdev;</div><div class='ctx'> 	sector_t reshape_offset = 0;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (mddev-&gt;recovery_cp != MaxSector)</div><div class='ctx'> 		printk(KERN_NOTICE "md/raid:%s: not clean"</div><div class='hunk'>@@ -4813,12 +5037,25 @@ static int run(struct mddev *mddev)</div><div class='ctx'> 	conf-&gt;thread = NULL;</div><div class='ctx'> 	mddev-&gt;private = conf;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * 0 for a fully functional array, 1 or 2 for a degraded array.</div><div class='del'>-	 */</div><div class='del'>-	list_for_each_entry(rdev, &amp;mddev-&gt;disks, same_set) {</div><div class='del'>-		if (rdev-&gt;raid_disk &lt; 0)</div><div class='add'>+	for (i = 0; i &lt; conf-&gt;raid_disks &amp;&amp; conf-&gt;previous_raid_disks;</div><div class='add'>+	     i++) {</div><div class='add'>+		rdev = conf-&gt;disks[i].rdev;</div><div class='add'>+		if (!rdev &amp;&amp; conf-&gt;disks[i].replacement) {</div><div class='add'>+			/* The replacement is all we have yet */</div><div class='add'>+			rdev = conf-&gt;disks[i].replacement;</div><div class='add'>+			conf-&gt;disks[i].replacement = NULL;</div><div class='add'>+			clear_bit(Replacement, &amp;rdev-&gt;flags);</div><div class='add'>+			conf-&gt;disks[i].rdev = rdev;</div><div class='add'>+		}</div><div class='add'>+		if (!rdev)</div><div class='ctx'> 			continue;</div><div class='add'>+		if (conf-&gt;disks[i].replacement &amp;&amp;</div><div class='add'>+		    conf-&gt;reshape_progress != MaxSector) {</div><div class='add'>+			/* replacements and reshape simply do not mix. */</div><div class='add'>+			printk(KERN_ERR "md: cannot handle concurrent "</div><div class='add'>+			       "replacement and reshape.\n");</div><div class='add'>+			goto abort;</div><div class='add'>+		}</div><div class='ctx'> 		if (test_bit(In_sync, &amp;rdev-&gt;flags)) {</div><div class='ctx'> 			working_disks++;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -4852,8 +5089,10 @@ static int run(struct mddev *mddev)</div><div class='ctx'> 		dirty_parity_disks++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mddev-&gt;degraded = (max(conf-&gt;raid_disks, conf-&gt;previous_raid_disks)</div><div class='del'>-			   - working_disks);</div><div class='add'>+	/*</div><div class='add'>+	 * 0 for a fully functional array, 1 or 2 for a degraded array.</div><div class='add'>+	 */</div><div class='add'>+	mddev-&gt;degraded = calc_degraded(conf);</div><div class='ctx'> </div><div class='ctx'> 	if (has_failed(conf)) {</div><div class='ctx'> 		printk(KERN_ERR "md/raid:%s: not enough operational devices"</div><div class='hunk'>@@ -5016,7 +5255,25 @@ static int raid5_spare_active(struct mddev *mddev)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; conf-&gt;raid_disks; i++) {</div><div class='ctx'> 		tmp = conf-&gt;disks + i;</div><div class='del'>-		if (tmp-&gt;rdev</div><div class='add'>+		if (tmp-&gt;replacement</div><div class='add'>+		    &amp;&amp; tmp-&gt;replacement-&gt;recovery_offset == MaxSector</div><div class='add'>+		    &amp;&amp; !test_bit(Faulty, &amp;tmp-&gt;replacement-&gt;flags)</div><div class='add'>+		    &amp;&amp; !test_and_set_bit(In_sync, &amp;tmp-&gt;replacement-&gt;flags)) {</div><div class='add'>+			/* Replacement has just become active. */</div><div class='add'>+			if (!tmp-&gt;rdev</div><div class='add'>+			    || !test_and_clear_bit(In_sync, &amp;tmp-&gt;rdev-&gt;flags))</div><div class='add'>+				count++;</div><div class='add'>+			if (tmp-&gt;rdev) {</div><div class='add'>+				/* Replaced device not technically faulty,</div><div class='add'>+				 * but we need to be sure it gets removed</div><div class='add'>+				 * and never re-added.</div><div class='add'>+				 */</div><div class='add'>+				set_bit(Faulty, &amp;tmp-&gt;rdev-&gt;flags);</div><div class='add'>+				sysfs_notify_dirent_safe(</div><div class='add'>+					tmp-&gt;rdev-&gt;sysfs_state);</div><div class='add'>+			}</div><div class='add'>+			sysfs_notify_dirent_safe(tmp-&gt;replacement-&gt;sysfs_state);</div><div class='add'>+		} else if (tmp-&gt;rdev</div><div class='ctx'> 		    &amp;&amp; tmp-&gt;rdev-&gt;recovery_offset == MaxSector</div><div class='ctx'> 		    &amp;&amp; !test_bit(Faulty, &amp;tmp-&gt;rdev-&gt;flags)</div><div class='ctx'> 		    &amp;&amp; !test_and_set_bit(In_sync, &amp;tmp-&gt;rdev-&gt;flags)) {</div><div class='hunk'>@@ -5025,49 +5282,68 @@ static int raid5_spare_active(struct mddev *mddev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_lock_irqsave(&amp;conf-&gt;device_lock, flags);</div><div class='del'>-	mddev-&gt;degraded -= count;</div><div class='add'>+	mddev-&gt;degraded = calc_degraded(conf);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;conf-&gt;device_lock, flags);</div><div class='ctx'> 	print_raid5_conf(conf);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int raid5_remove_disk(struct mddev *mddev, int number)</div><div class='add'>+static int raid5_remove_disk(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct r5conf *conf = mddev-&gt;private;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	struct md_rdev *rdev;</div><div class='add'>+	int number = rdev-&gt;raid_disk;</div><div class='add'>+	struct md_rdev **rdevp;</div><div class='ctx'> 	struct disk_info *p = conf-&gt;disks + number;</div><div class='ctx'> </div><div class='ctx'> 	print_raid5_conf(conf);</div><div class='del'>-	rdev = p-&gt;rdev;</div><div class='del'>-	if (rdev) {</div><div class='del'>-		if (number &gt;= conf-&gt;raid_disks &amp;&amp;</div><div class='del'>-		    conf-&gt;reshape_progress == MaxSector)</div><div class='del'>-			clear_bit(In_sync, &amp;rdev-&gt;flags);</div><div class='add'>+	if (rdev == p-&gt;rdev)</div><div class='add'>+		rdevp = &amp;p-&gt;rdev;</div><div class='add'>+	else if (rdev == p-&gt;replacement)</div><div class='add'>+		rdevp = &amp;p-&gt;replacement;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		if (test_bit(In_sync, &amp;rdev-&gt;flags) ||</div><div class='del'>-		    atomic_read(&amp;rdev-&gt;nr_pending)) {</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			goto abort;</div><div class='del'>-		}</div><div class='del'>-		/* Only remove non-faulty devices if recovery</div><div class='del'>-		 * isn't possible.</div><div class='del'>-		 */</div><div class='del'>-		if (!test_bit(Faulty, &amp;rdev-&gt;flags) &amp;&amp;</div><div class='del'>-		    mddev-&gt;recovery_disabled != conf-&gt;recovery_disabled &amp;&amp;</div><div class='del'>-		    !has_failed(conf) &amp;&amp;</div><div class='del'>-		    number &lt; conf-&gt;raid_disks) {</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			goto abort;</div><div class='del'>-		}</div><div class='del'>-		p-&gt;rdev = NULL;</div><div class='del'>-		synchronize_rcu();</div><div class='del'>-		if (atomic_read(&amp;rdev-&gt;nr_pending)) {</div><div class='del'>-			/* lost the race, try later */</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			p-&gt;rdev = rdev;</div><div class='del'>-		}</div><div class='add'>+	if (number &gt;= conf-&gt;raid_disks &amp;&amp;</div><div class='add'>+	    conf-&gt;reshape_progress == MaxSector)</div><div class='add'>+		clear_bit(In_sync, &amp;rdev-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if (test_bit(In_sync, &amp;rdev-&gt;flags) ||</div><div class='add'>+	    atomic_read(&amp;rdev-&gt;nr_pending)) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto abort;</div><div class='ctx'> 	}</div><div class='add'>+	/* Only remove non-faulty devices if recovery</div><div class='add'>+	 * isn't possible.</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(Faulty, &amp;rdev-&gt;flags) &amp;&amp;</div><div class='add'>+	    mddev-&gt;recovery_disabled != conf-&gt;recovery_disabled &amp;&amp;</div><div class='add'>+	    !has_failed(conf) &amp;&amp;</div><div class='add'>+	    (!p-&gt;replacement || p-&gt;replacement == rdev) &amp;&amp;</div><div class='add'>+	    number &lt; conf-&gt;raid_disks) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto abort;</div><div class='add'>+	}</div><div class='add'>+	*rdevp = NULL;</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+	if (atomic_read(&amp;rdev-&gt;nr_pending)) {</div><div class='add'>+		/* lost the race, try later */</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		*rdevp = rdev;</div><div class='add'>+	} else if (p-&gt;replacement) {</div><div class='add'>+		/* We must have just cleared 'rdev' */</div><div class='add'>+		p-&gt;rdev = p-&gt;replacement;</div><div class='add'>+		clear_bit(Replacement, &amp;p-&gt;replacement-&gt;flags);</div><div class='add'>+		smp_mb(); /* Make sure other CPUs may see both as identical</div><div class='add'>+			   * but will never see neither - if they are careful</div><div class='add'>+			   */</div><div class='add'>+		p-&gt;replacement = NULL;</div><div class='add'>+		clear_bit(WantReplacement, &amp;rdev-&gt;flags);</div><div class='add'>+	} else</div><div class='add'>+		/* We might have just removed the Replacement as faulty-</div><div class='add'>+		 * clear the bit just in case</div><div class='add'>+		 */</div><div class='add'>+		clear_bit(WantReplacement, &amp;rdev-&gt;flags);</div><div class='ctx'> abort:</div><div class='ctx'> </div><div class='ctx'> 	print_raid5_conf(conf);</div><div class='hunk'>@@ -5103,8 +5379,9 @@ static int raid5_add_disk(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> 		disk = rdev-&gt;saved_raid_disk;</div><div class='ctx'> 	else</div><div class='ctx'> 		disk = first;</div><div class='del'>-	for ( ; disk &lt;= last ; disk++)</div><div class='del'>-		if ((p=conf-&gt;disks + disk)-&gt;rdev == NULL) {</div><div class='add'>+	for ( ; disk &lt;= last ; disk++) {</div><div class='add'>+		p = conf-&gt;disks + disk;</div><div class='add'>+		if (p-&gt;rdev == NULL) {</div><div class='ctx'> 			clear_bit(In_sync, &amp;rdev-&gt;flags);</div><div class='ctx'> 			rdev-&gt;raid_disk = disk;</div><div class='ctx'> 			err = 0;</div><div class='hunk'>@@ -5113,6 +5390,17 @@ static int raid5_add_disk(struct mddev *mddev, struct md_rdev *rdev)</div><div class='ctx'> 			rcu_assign_pointer(p-&gt;rdev, rdev);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		if (test_bit(WantReplacement, &amp;p-&gt;rdev-&gt;flags) &amp;&amp;</div><div class='add'>+		    p-&gt;replacement == NULL) {</div><div class='add'>+			clear_bit(In_sync, &amp;rdev-&gt;flags);</div><div class='add'>+			set_bit(Replacement, &amp;rdev-&gt;flags);</div><div class='add'>+			rdev-&gt;raid_disk = disk;</div><div class='add'>+			err = 0;</div><div class='add'>+			conf-&gt;fullsync = 1;</div><div class='add'>+			rcu_assign_pointer(p-&gt;replacement, rdev);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	print_raid5_conf(conf);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -5286,8 +5574,7 @@ static int raid5_start_reshape(struct mddev *mddev)</div><div class='ctx'> 		 * pre and post number of devices.</div><div class='ctx'> 		 */</div><div class='ctx'> 		spin_lock_irqsave(&amp;conf-&gt;device_lock, flags);</div><div class='del'>-		mddev-&gt;degraded += (conf-&gt;raid_disks - conf-&gt;previous_raid_disks)</div><div class='del'>-			- added_devices;</div><div class='add'>+		mddev-&gt;degraded = calc_degraded(conf);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;conf-&gt;device_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> 	mddev-&gt;raid_disks = conf-&gt;raid_disks;</div><div class='hunk'>@@ -5356,17 +5643,15 @@ static void raid5_finish_reshape(struct mddev *mddev)</div><div class='ctx'> 			revalidate_disk(mddev-&gt;gendisk);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			int d;</div><div class='del'>-			mddev-&gt;degraded = conf-&gt;raid_disks;</div><div class='del'>-			for (d = 0; d &lt; conf-&gt;raid_disks ; d++)</div><div class='del'>-				if (conf-&gt;disks[d].rdev &amp;&amp;</div><div class='del'>-				    test_bit(In_sync,</div><div class='del'>-					     &amp;conf-&gt;disks[d].rdev-&gt;flags))</div><div class='del'>-					mddev-&gt;degraded--;</div><div class='add'>+			spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='add'>+			mddev-&gt;degraded = calc_degraded(conf);</div><div class='add'>+			spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='ctx'> 			for (d = conf-&gt;raid_disks ;</div><div class='ctx'> 			     d &lt; conf-&gt;raid_disks - mddev-&gt;delta_disks;</div><div class='ctx'> 			     d++) {</div><div class='ctx'> 				struct md_rdev *rdev = conf-&gt;disks[d].rdev;</div><div class='del'>-				if (rdev &amp;&amp; raid5_remove_disk(mddev, d) == 0) {</div><div class='add'>+				if (rdev &amp;&amp;</div><div class='add'>+				    raid5_remove_disk(mddev, rdev) == 0) {</div><div class='ctx'> 					sysfs_unlink_rdev(mddev, rdev);</div><div class='ctx'> 					rdev-&gt;raid_disk = -1;</div><div class='ctx'> 				}</div><div class='head'>diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h<br/>index e10c5531f9c5..8d8e13934a48 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/raid5.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/md/raid5.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/raid5.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/md/raid5.h</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'>  * The possible state transitions are:</div><div class='ctx'>  *</div><div class='ctx'>  *  Empty -&gt; Want   - on read or write to get old data for  parity calc</div><div class='del'>- *  Empty -&gt; Dirty  - on compute_parity to satisfy write/sync request.(RECONSTRUCT_WRITE)</div><div class='add'>+ *  Empty -&gt; Dirty  - on compute_parity to satisfy write/sync request.</div><div class='ctx'>  *  Empty -&gt; Clean  - on compute_block when computing a block for failed drive</div><div class='ctx'>  *  Want  -&gt; Empty  - on failed read</div><div class='ctx'>  *  Want  -&gt; Clean  - on successful completion of read request</div><div class='hunk'>@@ -226,8 +226,11 @@ struct stripe_head {</div><div class='ctx'> 		#endif</div><div class='ctx'> 	} ops;</div><div class='ctx'> 	struct r5dev {</div><div class='del'>-		struct bio	req;</div><div class='del'>-		struct bio_vec	vec;</div><div class='add'>+		/* rreq and rvec are used for the replacement device when</div><div class='add'>+		 * writing data to both devices.</div><div class='add'>+		 */</div><div class='add'>+		struct bio	req, rreq;</div><div class='add'>+		struct bio_vec	vec, rvec;</div><div class='ctx'> 		struct page	*page;</div><div class='ctx'> 		struct bio	*toread, *read, *towrite, *written;</div><div class='ctx'> 		sector_t	sector;			/* sector of this page */</div><div class='hunk'>@@ -239,7 +242,13 @@ struct stripe_head {</div><div class='ctx'>  *     for handle_stripe.</div><div class='ctx'>  */</div><div class='ctx'> struct stripe_head_state {</div><div class='del'>-	int syncing, expanding, expanded;</div><div class='add'>+	/* 'syncing' means that we need to read all devices, either</div><div class='add'>+	 * to check/correct parity, or to reconstruct a missing device.</div><div class='add'>+	 * 'replacing' means we are replacing one or more drives and</div><div class='add'>+	 * the source is valid at this point so we don't need to</div><div class='add'>+	 * read all devices, just the replacement targets.</div><div class='add'>+	 */</div><div class='add'>+	int syncing, expanding, expanded, replacing;</div><div class='ctx'> 	int locked, uptodate, to_read, to_write, failed, written;</div><div class='ctx'> 	int to_fill, compute, req_compute, non_overwrite;</div><div class='ctx'> 	int failed_num[2];</div><div class='hunk'>@@ -252,38 +261,41 @@ struct stripe_head_state {</div><div class='ctx'> 	int handle_bad_blocks;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Flags */</div><div class='del'>-#define	R5_UPTODATE	0	/* page contains current data */</div><div class='del'>-#define	R5_LOCKED	1	/* IO has been submitted on "req" */</div><div class='del'>-#define	R5_OVERWRITE	2	/* towrite covers whole page */</div><div class='add'>+/* Flags for struct r5dev.flags */</div><div class='add'>+enum r5dev_flags {</div><div class='add'>+	R5_UPTODATE,	/* page contains current data */</div><div class='add'>+	R5_LOCKED,	/* IO has been submitted on "req" */</div><div class='add'>+	R5_DOUBLE_LOCKED,/* Cannot clear R5_LOCKED until 2 writes complete */</div><div class='add'>+	R5_OVERWRITE,	/* towrite covers whole page */</div><div class='ctx'> /* and some that are internal to handle_stripe */</div><div class='del'>-#define	R5_Insync	3	/* rdev &amp;&amp; rdev-&gt;in_sync at start */</div><div class='del'>-#define	R5_Wantread	4	/* want to schedule a read */</div><div class='del'>-#define	R5_Wantwrite	5</div><div class='del'>-#define	R5_Overlap	7	/* There is a pending overlapping request on this block */</div><div class='del'>-#define	R5_ReadError	8	/* seen a read error here recently */</div><div class='del'>-#define	R5_ReWrite	9	/* have tried to over-write the readerror */</div><div class='add'>+	R5_Insync,	/* rdev &amp;&amp; rdev-&gt;in_sync at start */</div><div class='add'>+	R5_Wantread,	/* want to schedule a read */</div><div class='add'>+	R5_Wantwrite,</div><div class='add'>+	R5_Overlap,	/* There is a pending overlapping request</div><div class='add'>+			 * on this block */</div><div class='add'>+	R5_ReadError,	/* seen a read error here recently */</div><div class='add'>+	R5_ReWrite,	/* have tried to over-write the readerror */</div><div class='ctx'> </div><div class='del'>-#define	R5_Expanded	10	/* This block now has post-expand data */</div><div class='del'>-#define	R5_Wantcompute	11	/* compute_block in progress treat as</div><div class='del'>-				 * uptodate</div><div class='del'>-				 */</div><div class='del'>-#define	R5_Wantfill	12	/* dev-&gt;toread contains a bio that needs</div><div class='del'>-				 * filling</div><div class='del'>-				 */</div><div class='del'>-#define	R5_Wantdrain	13	/* dev-&gt;towrite needs to be drained */</div><div class='del'>-#define	R5_WantFUA	14	/* Write should be FUA */</div><div class='del'>-#define	R5_WriteError	15	/* got a write error - need to record it */</div><div class='del'>-#define	R5_MadeGood	16	/* A bad block has been fixed by writing to it*/</div><div class='del'>-/*</div><div class='del'>- * Write method</div><div class='del'>- */</div><div class='del'>-#define RECONSTRUCT_WRITE	1</div><div class='del'>-#define READ_MODIFY_WRITE	2</div><div class='del'>-/* not a write method, but a compute_parity mode */</div><div class='del'>-#define	CHECK_PARITY		3</div><div class='del'>-/* Additional compute_parity mode -- updates the parity w/o LOCKING */</div><div class='del'>-#define UPDATE_PARITY		4</div><div class='add'>+	R5_Expanded,	/* This block now has post-expand data */</div><div class='add'>+	R5_Wantcompute,	/* compute_block in progress treat as</div><div class='add'>+			 * uptodate</div><div class='add'>+			 */</div><div class='add'>+	R5_Wantfill,	/* dev-&gt;toread contains a bio that needs</div><div class='add'>+			 * filling</div><div class='add'>+			 */</div><div class='add'>+	R5_Wantdrain,	/* dev-&gt;towrite needs to be drained */</div><div class='add'>+	R5_WantFUA,	/* Write should be FUA */</div><div class='add'>+	R5_WriteError,	/* got a write error - need to record it */</div><div class='add'>+	R5_MadeGood,	/* A bad block has been fixed by writing to it */</div><div class='add'>+	R5_ReadRepl,	/* Will/did read from replacement rather than orig */</div><div class='add'>+	R5_MadeGoodRepl,/* A bad block on the replacement device has been</div><div class='add'>+			 * fixed by writing to it */</div><div class='add'>+	R5_NeedReplace,	/* This device has a replacement which is not</div><div class='add'>+			 * up-to-date at this stripe. */</div><div class='add'>+	R5_WantReplace, /* We need to update the replacement, we have read</div><div class='add'>+			 * data in, and now is a good time to write it out.</div><div class='add'>+			 */</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Stripe state</div><div class='hunk'>@@ -311,13 +323,14 @@ enum {</div><div class='ctx'> /*</div><div class='ctx'>  * Operation request flags</div><div class='ctx'>  */</div><div class='del'>-#define STRIPE_OP_BIOFILL	0</div><div class='del'>-#define STRIPE_OP_COMPUTE_BLK	1</div><div class='del'>-#define STRIPE_OP_PREXOR	2</div><div class='del'>-#define STRIPE_OP_BIODRAIN	3</div><div class='del'>-#define STRIPE_OP_RECONSTRUCT	4</div><div class='del'>-#define STRIPE_OP_CHECK	5</div><div class='del'>-</div><div class='add'>+enum {</div><div class='add'>+	STRIPE_OP_BIOFILL,</div><div class='add'>+	STRIPE_OP_COMPUTE_BLK,</div><div class='add'>+	STRIPE_OP_PREXOR,</div><div class='add'>+	STRIPE_OP_BIODRAIN,</div><div class='add'>+	STRIPE_OP_RECONSTRUCT,</div><div class='add'>+	STRIPE_OP_CHECK,</div><div class='add'>+};</div><div class='ctx'> /*</div><div class='ctx'>  * Plugging:</div><div class='ctx'>  *</div><div class='hunk'>@@ -344,13 +357,12 @@ enum {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct disk_info {</div><div class='del'>-	struct md_rdev	*rdev;</div><div class='add'>+	struct md_rdev	*rdev, *replacement;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct r5conf {</div><div class='ctx'> 	struct hlist_head	*stripe_hashtbl;</div><div class='ctx'> 	struct mddev		*mddev;</div><div class='del'>-	struct disk_info	*spare;</div><div class='ctx'> 	int			chunk_sectors;</div><div class='ctx'> 	int			level, algorithm;</div><div class='ctx'> 	int			max_degraded;</div><div class='head'>diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig<br/>index 996302ae210e..4a6d5cef3964 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/Kconfig</a></div><div class='hunk'>@@ -26,7 +26,7 @@ config MEDIA_TUNER</div><div class='ctx'> 	select MEDIA_TUNER_XC4000 if !MEDIA_TUNER_CUSTOMISE</div><div class='ctx'> 	select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMISE</div><div class='ctx'> 	select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMISE</div><div class='del'>-	select MEDIA_TUNER_TEA5761 if !MEDIA_TUNER_CUSTOMISE</div><div class='add'>+	select MEDIA_TUNER_TEA5761 if !MEDIA_TUNER_CUSTOMISE &amp;&amp; EXPERIMENTAL</div><div class='ctx'> 	select MEDIA_TUNER_TEA5767 if !MEDIA_TUNER_CUSTOMISE</div><div class='ctx'> 	select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE</div><div class='ctx'> 	select MEDIA_TUNER_TDA9887 if !MEDIA_TUNER_CUSTOMISE</div><div class='hunk'>@@ -116,6 +116,13 @@ config MEDIA_TUNER_MT2060</div><div class='ctx'> 	help</div><div class='ctx'> 	  A driver for the silicon IF tuner MT2060 from Microtune.</div><div class='ctx'> </div><div class='add'>+config MEDIA_TUNER_MT2063</div><div class='add'>+	tristate "Microtune MT2063 silicon IF tuner"</div><div class='add'>+	depends on VIDEO_MEDIA &amp;&amp; I2C</div><div class='add'>+	default m if MEDIA_TUNER_CUSTOMISE</div><div class='add'>+	help</div><div class='add'>+	  A driver for the silicon IF tuner MT2063 from Microtune.</div><div class='add'>+</div><div class='ctx'> config MEDIA_TUNER_MT2266</div><div class='ctx'> 	tristate "Microtune MT2266 silicon tuner"</div><div class='ctx'> 	depends on VIDEO_MEDIA &amp;&amp; I2C</div><div class='head'>diff --git a/drivers/media/common/tuners/Makefile b/drivers/media/common/tuners/Makefile<br/>index 196c12a55f9a..8295854ab94b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/Makefile</a></div><div class='hunk'>@@ -18,6 +18,7 @@ obj-$(CONFIG_MEDIA_TUNER_TDA18271) += tda18271.o</div><div class='ctx'> obj-$(CONFIG_MEDIA_TUNER_XC5000) += xc5000.o</div><div class='ctx'> obj-$(CONFIG_MEDIA_TUNER_XC4000) += xc4000.o</div><div class='ctx'> obj-$(CONFIG_MEDIA_TUNER_MT2060) += mt2060.o</div><div class='add'>+obj-$(CONFIG_MEDIA_TUNER_MT2063) += mt2063.o</div><div class='ctx'> obj-$(CONFIG_MEDIA_TUNER_MT2266) += mt2266.o</div><div class='ctx'> obj-$(CONFIG_MEDIA_TUNER_QT1010) += qt1010.o</div><div class='ctx'> obj-$(CONFIG_MEDIA_TUNER_MT2131) += mt2131.o</div><div class='head'>diff --git a/drivers/media/common/tuners/max2165.c b/drivers/media/common/tuners/max2165.c<br/>index 9883617b7862..cb2c98fbad1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/max2165.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/max2165.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/max2165.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/max2165.c</a></div><div class='hunk'>@@ -151,7 +151,7 @@ static int max2165_set_bandwidth(struct max2165_priv *priv, u32 bw)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val;</div><div class='ctx'> </div><div class='del'>-	if (bw == BANDWIDTH_8_MHZ)</div><div class='add'>+	if (bw == 8000000)</div><div class='ctx'> 		val = priv-&gt;bb_filter_8mhz_cfg;</div><div class='ctx'> 	else</div><div class='ctx'> 		val = priv-&gt;bb_filter_7mhz_cfg;</div><div class='hunk'>@@ -257,39 +257,28 @@ static void max2165_debug_status(struct max2165_priv *priv)</div><div class='ctx'> 	dprintk("VCO: %d, VCO Sub-band: %d, ADC: %d\n", vco, vco_sub_band, adc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int max2165_set_params(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *params)</div><div class='add'>+static int max2165_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct max2165_priv *priv = fe-&gt;tuner_priv;</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	dprintk("%s() frequency=%d (Hz)\n", __func__, params-&gt;frequency);</div><div class='del'>-	if (fe-&gt;ops.info.type == FE_ATSC) {</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	} else if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='del'>-		dprintk("%s() OFDM\n", __func__);</div><div class='del'>-		switch (params-&gt;u.ofdm.bandwidth) {</div><div class='del'>-		case BANDWIDTH_6_MHZ:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		case BANDWIDTH_7_MHZ:</div><div class='del'>-		case BANDWIDTH_8_MHZ:</div><div class='del'>-			priv-&gt;frequency = params-&gt;frequency;</div><div class='del'>-			priv-&gt;bandwidth = params-&gt;u.ofdm.bandwidth;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			printk(KERN_ERR "MAX2165 bandwidth not set!\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_ERR "MAX2165 modulation type not supported!\n");</div><div class='add'>+	switch (c-&gt;bandwidth_hz) {</div><div class='add'>+	case 7000000:</div><div class='add'>+	case 8000000:</div><div class='add'>+		priv-&gt;frequency = c-&gt;frequency;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_INFO "MAX2165: bandwidth %d Hz not supported.\n",</div><div class='add'>+		       c-&gt;bandwidth_hz);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dprintk("%s() frequency=%d\n", __func__, priv-&gt;frequency);</div><div class='add'>+	dprintk("%s() frequency=%d\n", __func__, c-&gt;frequency);</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='del'>-	max2165_set_bandwidth(priv, priv-&gt;bandwidth);</div><div class='add'>+	max2165_set_bandwidth(priv, c-&gt;bandwidth_hz);</div><div class='ctx'> 	ret = max2165_set_rf(priv, priv-&gt;frequency);</div><div class='ctx'> 	mdelay(50);</div><div class='ctx'> 	max2165_debug_status(priv);</div><div class='hunk'>@@ -370,7 +359,7 @@ static int max2165_init(struct dvb_frontend *fe)</div><div class='ctx'> </div><div class='ctx'> 	max2165_read_rom_table(priv);</div><div class='ctx'> </div><div class='del'>-	max2165_set_bandwidth(priv, BANDWIDTH_8_MHZ);</div><div class='add'>+	max2165_set_bandwidth(priv, 8000000);</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='head'>diff --git a/drivers/media/common/tuners/mc44s803.c b/drivers/media/common/tuners/mc44s803.c<br/>index fe5c4b8d83ee..5ddce7e326f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mc44s803.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/mc44s803.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mc44s803.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/mc44s803.c</a></div><div class='hunk'>@@ -214,22 +214,22 @@ exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mc44s803_set_params(struct dvb_frontend *fe,</div><div class='del'>-			       struct dvb_frontend_parameters *params)</div><div class='add'>+static int mc44s803_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct mc44s803_priv *priv = fe-&gt;tuner_priv;</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	u32 r1, r2, n1, n2, lo1, lo2, freq, val;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;frequency = params-&gt;frequency;</div><div class='add'>+	priv-&gt;frequency = c-&gt;frequency;</div><div class='ctx'> </div><div class='ctx'> 	r1 = MC44S803_OSC / 1000000;</div><div class='ctx'> 	r2 = MC44S803_OSC /  100000;</div><div class='ctx'> </div><div class='del'>-	n1 = (params-&gt;frequency + MC44S803_IF1 + 500000) / 1000000;</div><div class='add'>+	n1 = (c-&gt;frequency + MC44S803_IF1 + 500000) / 1000000;</div><div class='ctx'> 	freq = MC44S803_OSC / r1 * n1;</div><div class='ctx'> 	lo1 = ((60 * n1) + (r1 / 2)) / r1;</div><div class='del'>-	freq = freq - params-&gt;frequency;</div><div class='add'>+	freq = freq - c-&gt;frequency;</div><div class='ctx'> </div><div class='ctx'> 	n2 = (freq - MC44S803_IF2 + 50000) / 100000;</div><div class='ctx'> 	lo2 = ((60 * n2) + (r2 / 2)) / r2;</div><div class='head'>diff --git a/drivers/media/common/tuners/mt2060.c b/drivers/media/common/tuners/mt2060.c<br/>index 2d0e7689c6a2..13381de58a84 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mt2060.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/mt2060.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mt2060.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/mt2060.c</a></div><div class='hunk'>@@ -153,8 +153,9 @@ static int mt2060_spurcheck(u32 lo1,u32 lo2,u32 if2)</div><div class='ctx'> #define IF2  36150       // IF2 frequency = 36.150 MHz</div><div class='ctx'> #define FREF 16000       // Quartz oscillator 16 MHz</div><div class='ctx'> </div><div class='del'>-static int mt2060_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int mt2060_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct mt2060_priv *priv;</div><div class='ctx'> 	int ret=0;</div><div class='ctx'> 	int i=0;</div><div class='hunk'>@@ -176,8 +177,7 @@ static int mt2060_set_params(struct dvb_frontend *fe, struct dvb_frontend_parame</div><div class='ctx'> </div><div class='ctx'> 	mt2060_writeregs(priv,b,2);</div><div class='ctx'> </div><div class='del'>-	freq = params-&gt;frequency / 1000; // Hz -&gt; kHz</div><div class='del'>-	priv-&gt;bandwidth = (fe-&gt;ops.info.type == FE_OFDM) ? params-&gt;u.ofdm.bandwidth : 0;</div><div class='add'>+	freq = c-&gt;frequency / 1000; /* Hz -&gt; kHz */</div><div class='ctx'> </div><div class='ctx'> 	f_lo1 = freq + if1 * 1000;</div><div class='ctx'> 	f_lo1 = (f_lo1 / 250) * 250;</div><div class='hunk'>@@ -293,10 +293,9 @@ static int mt2060_get_frequency(struct dvb_frontend *fe, u32 *frequency)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt2060_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)</div><div class='add'>+static int mt2060_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)</div><div class='ctx'> {</div><div class='del'>-	struct mt2060_priv *priv = fe-&gt;tuner_priv;</div><div class='del'>-	*bandwidth = priv-&gt;bandwidth;</div><div class='add'>+	*frequency = IF2 * 1000;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -356,7 +355,7 @@ static const struct dvb_tuner_ops mt2060_tuner_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.set_params    = mt2060_set_params,</div><div class='ctx'> 	.get_frequency = mt2060_get_frequency,</div><div class='del'>-	.get_bandwidth = mt2060_get_bandwidth</div><div class='add'>+	.get_if_frequency = mt2060_get_if_frequency,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* This functions tries to identify a MT2060 tuner by reading the PART/REV register. This is hasty. */</div><div class='head'>diff --git a/drivers/media/common/tuners/mt2060_priv.h b/drivers/media/common/tuners/mt2060_priv.h<br/>index 5eaccdefd0b0..2b60de6c707d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mt2060_priv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/mt2060_priv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mt2060_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/mt2060_priv.h</a></div><div class='hunk'>@@ -97,7 +97,6 @@ struct mt2060_priv {</div><div class='ctx'> 	struct i2c_adapter   *i2c;</div><div class='ctx'> </div><div class='ctx'> 	u32 frequency;</div><div class='del'>-	u32 bandwidth;</div><div class='ctx'> 	u16 if1_freq;</div><div class='ctx'> 	u8  fmfreq;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/media/common/tuners/mt2063.c b/drivers/media/common/tuners/mt2063.c<br/>new file mode 100644<br/>index 000000000000..c89af3cd5eba<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mt2063.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/mt2063.c</a></div><div class='hunk'>@@ -0,0 +1,2307 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for mt2063 Micronas tuner</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Mauro Carvalho Chehab &lt;mchehab@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This driver came from a driver originally written by:</div><div class='add'>+ *		Henry Wang &lt;Henry.wang@AzureWave.com&gt;</div><div class='add'>+ * Made publicly available by Terratec, at:</div><div class='add'>+ *	http://linux.terratec.de/files/TERRATEC_H7/20110323_TERRATEC_H7_Linux.tar.gz</div><div class='add'>+ * The original driver's license is GPL, as declared with MODULE_LICENSE()</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 under version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</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/videodev2.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mt2063.h"</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, "Set Verbosity level");</div><div class='add'>+</div><div class='add'>+#define dprintk(level, fmt, arg...) do {				\</div><div class='add'>+if (debug &gt;= level)							\</div><div class='add'>+	printk(KERN_DEBUG "mt2063 %s: " fmt, __func__, ## arg);	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* positive error codes used internally */</div><div class='add'>+</div><div class='add'>+/*  Info: Unavoidable LO-related spur may be present in the output  */</div><div class='add'>+#define MT2063_SPUR_PRESENT_ERR             (0x00800000)</div><div class='add'>+</div><div class='add'>+/*  Info: Mask of bits used for # of LO-related spurs that were avoided during tuning  */</div><div class='add'>+#define MT2063_SPUR_CNT_MASK                (0x001f0000)</div><div class='add'>+#define MT2063_SPUR_SHIFT                   (16)</div><div class='add'>+</div><div class='add'>+/*  Info: Upconverter frequency is out of range (may be reason for MT_UPC_UNLOCK) */</div><div class='add'>+#define MT2063_UPC_RANGE                    (0x04000000)</div><div class='add'>+</div><div class='add'>+/*  Info: Downconverter frequency is out of range (may be reason for MT_DPC_UNLOCK) */</div><div class='add'>+#define MT2063_DNC_RANGE                    (0x08000000)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Constant defining the version of the following structure</div><div class='add'>+ *  and therefore the API for this code.</div><div class='add'>+ *</div><div class='add'>+ *  When compiling the tuner driver, the preprocessor will</div><div class='add'>+ *  check against this version number to make sure that</div><div class='add'>+ *  it matches the version that the tuner driver knows about.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* DECT Frequency Avoidance */</div><div class='add'>+#define MT2063_DECT_AVOID_US_FREQS      0x00000001</div><div class='add'>+</div><div class='add'>+#define MT2063_DECT_AVOID_EURO_FREQS    0x00000002</div><div class='add'>+</div><div class='add'>+#define MT2063_EXCLUDE_US_DECT_FREQUENCIES(s) (((s) &amp; MT2063_DECT_AVOID_US_FREQS) != 0)</div><div class='add'>+</div><div class='add'>+#define MT2063_EXCLUDE_EURO_DECT_FREQUENCIES(s) (((s) &amp; MT2063_DECT_AVOID_EURO_FREQS) != 0)</div><div class='add'>+</div><div class='add'>+enum MT2063_DECT_Avoid_Type {</div><div class='add'>+	MT2063_NO_DECT_AVOIDANCE = 0,				/* Do not create DECT exclusion zones.     */</div><div class='add'>+	MT2063_AVOID_US_DECT = MT2063_DECT_AVOID_US_FREQS,	/* Avoid US DECT frequencies.              */</div><div class='add'>+	MT2063_AVOID_EURO_DECT = MT2063_DECT_AVOID_EURO_FREQS,	/* Avoid European DECT frequencies.        */</div><div class='add'>+	MT2063_AVOID_BOTH					/* Avoid both regions. Not typically used. */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MT2063_MAX_ZONES 48</div><div class='add'>+</div><div class='add'>+struct MT2063_ExclZone_t {</div><div class='add'>+	u32 min_;</div><div class='add'>+	u32 max_;</div><div class='add'>+	struct MT2063_ExclZone_t *next_;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Structure of data needed for Spur Avoidance</div><div class='add'>+ */</div><div class='add'>+struct MT2063_AvoidSpursData_t {</div><div class='add'>+	u32 f_ref;</div><div class='add'>+	u32 f_in;</div><div class='add'>+	u32 f_LO1;</div><div class='add'>+	u32 f_if1_Center;</div><div class='add'>+	u32 f_if1_Request;</div><div class='add'>+	u32 f_if1_bw;</div><div class='add'>+	u32 f_LO2;</div><div class='add'>+	u32 f_out;</div><div class='add'>+	u32 f_out_bw;</div><div class='add'>+	u32 f_LO1_Step;</div><div class='add'>+	u32 f_LO2_Step;</div><div class='add'>+	u32 f_LO1_FracN_Avoid;</div><div class='add'>+	u32 f_LO2_FracN_Avoid;</div><div class='add'>+	u32 f_zif_bw;</div><div class='add'>+	u32 f_min_LO_Separation;</div><div class='add'>+	u32 maxH1;</div><div class='add'>+	u32 maxH2;</div><div class='add'>+	enum MT2063_DECT_Avoid_Type avoidDECT;</div><div class='add'>+	u32 bSpurPresent;</div><div class='add'>+	u32 bSpurAvoided;</div><div class='add'>+	u32 nSpursFound;</div><div class='add'>+	u32 nZones;</div><div class='add'>+	struct MT2063_ExclZone_t *freeZones;</div><div class='add'>+	struct MT2063_ExclZone_t *usedZones;</div><div class='add'>+	struct MT2063_ExclZone_t MT2063_ExclZones[MT2063_MAX_ZONES];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Parameter for function MT2063_SetPowerMask that specifies the power down</div><div class='add'>+ * of various sections of the MT2063.</div><div class='add'>+ */</div><div class='add'>+enum MT2063_Mask_Bits {</div><div class='add'>+	MT2063_REG_SD = 0x0040,		/* Shutdown regulator                 */</div><div class='add'>+	MT2063_SRO_SD = 0x0020,		/* Shutdown SRO                       */</div><div class='add'>+	MT2063_AFC_SD = 0x0010,		/* Shutdown AFC A/D                   */</div><div class='add'>+	MT2063_PD_SD = 0x0002,		/* Enable power detector shutdown     */</div><div class='add'>+	MT2063_PDADC_SD = 0x0001,	/* Enable power detector A/D shutdown */</div><div class='add'>+	MT2063_VCO_SD = 0x8000,		/* Enable VCO shutdown                */</div><div class='add'>+	MT2063_LTX_SD = 0x4000,		/* Enable LTX shutdown                */</div><div class='add'>+	MT2063_LT1_SD = 0x2000,		/* Enable LT1 shutdown                */</div><div class='add'>+	MT2063_LNA_SD = 0x1000,		/* Enable LNA shutdown                */</div><div class='add'>+	MT2063_UPC_SD = 0x0800,		/* Enable upconverter shutdown        */</div><div class='add'>+	MT2063_DNC_SD = 0x0400,		/* Enable downconverter shutdown      */</div><div class='add'>+	MT2063_VGA_SD = 0x0200,		/* Enable VGA shutdown                */</div><div class='add'>+	MT2063_AMP_SD = 0x0100,		/* Enable AMP shutdown                */</div><div class='add'>+	MT2063_ALL_SD = 0xFF73,		/* All shutdown bits for this tuner   */</div><div class='add'>+	MT2063_NONE_SD = 0x0000		/* No shutdown bits                   */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Possible values for MT2063_DNC_OUTPUT</div><div class='add'>+ */</div><div class='add'>+enum MT2063_DNC_Output_Enable {</div><div class='add'>+	MT2063_DNC_NONE = 0,</div><div class='add'>+	MT2063_DNC_1,</div><div class='add'>+	MT2063_DNC_2,</div><div class='add'>+	MT2063_DNC_BOTH</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Two-wire serial bus subaddresses of the tuner registers.</div><div class='add'>+ *  Also known as the tuner's register addresses.</div><div class='add'>+ */</div><div class='add'>+enum MT2063_Register_Offsets {</div><div class='add'>+	MT2063_REG_PART_REV = 0,	/*  0x00: Part/Rev Code         */</div><div class='add'>+	MT2063_REG_LO1CQ_1,		/*  0x01: LO1C Queued Byte 1    */</div><div class='add'>+	MT2063_REG_LO1CQ_2,		/*  0x02: LO1C Queued Byte 2    */</div><div class='add'>+	MT2063_REG_LO2CQ_1,		/*  0x03: LO2C Queued Byte 1    */</div><div class='add'>+	MT2063_REG_LO2CQ_2,		/*  0x04: LO2C Queued Byte 2    */</div><div class='add'>+	MT2063_REG_LO2CQ_3,		/*  0x05: LO2C Queued Byte 3    */</div><div class='add'>+	MT2063_REG_RSVD_06,		/*  0x06: Reserved              */</div><div class='add'>+	MT2063_REG_LO_STATUS,		/*  0x07: LO Status             */</div><div class='add'>+	MT2063_REG_FIFFC,		/*  0x08: FIFF Center           */</div><div class='add'>+	MT2063_REG_CLEARTUNE,		/*  0x09: ClearTune Filter      */</div><div class='add'>+	MT2063_REG_ADC_OUT,		/*  0x0A: ADC_OUT               */</div><div class='add'>+	MT2063_REG_LO1C_1,		/*  0x0B: LO1C Byte 1           */</div><div class='add'>+	MT2063_REG_LO1C_2,		/*  0x0C: LO1C Byte 2           */</div><div class='add'>+	MT2063_REG_LO2C_1,		/*  0x0D: LO2C Byte 1           */</div><div class='add'>+	MT2063_REG_LO2C_2,		/*  0x0E: LO2C Byte 2           */</div><div class='add'>+	MT2063_REG_LO2C_3,		/*  0x0F: LO2C Byte 3           */</div><div class='add'>+	MT2063_REG_RSVD_10,		/*  0x10: Reserved              */</div><div class='add'>+	MT2063_REG_PWR_1,		/*  0x11: PWR Byte 1            */</div><div class='add'>+	MT2063_REG_PWR_2,		/*  0x12: PWR Byte 2            */</div><div class='add'>+	MT2063_REG_TEMP_STATUS,		/*  0x13: Temp Status           */</div><div class='add'>+	MT2063_REG_XO_STATUS,		/*  0x14: Crystal Status        */</div><div class='add'>+	MT2063_REG_RF_STATUS,		/*  0x15: RF Attn Status        */</div><div class='add'>+	MT2063_REG_FIF_STATUS,		/*  0x16: FIF Attn Status       */</div><div class='add'>+	MT2063_REG_LNA_OV,		/*  0x17: LNA Attn Override     */</div><div class='add'>+	MT2063_REG_RF_OV,		/*  0x18: RF Attn Override      */</div><div class='add'>+	MT2063_REG_FIF_OV,		/*  0x19: FIF Attn Override     */</div><div class='add'>+	MT2063_REG_LNA_TGT,		/*  0x1A: Reserved              */</div><div class='add'>+	MT2063_REG_PD1_TGT,		/*  0x1B: Pwr Det 1 Target      */</div><div class='add'>+	MT2063_REG_PD2_TGT,		/*  0x1C: Pwr Det 2 Target      */</div><div class='add'>+	MT2063_REG_RSVD_1D,		/*  0x1D: Reserved              */</div><div class='add'>+	MT2063_REG_RSVD_1E,		/*  0x1E: Reserved              */</div><div class='add'>+	MT2063_REG_RSVD_1F,		/*  0x1F: Reserved              */</div><div class='add'>+	MT2063_REG_RSVD_20,		/*  0x20: Reserved              */</div><div class='add'>+	MT2063_REG_BYP_CTRL,		/*  0x21: Bypass Control        */</div><div class='add'>+	MT2063_REG_RSVD_22,		/*  0x22: Reserved              */</div><div class='add'>+	MT2063_REG_RSVD_23,		/*  0x23: Reserved              */</div><div class='add'>+	MT2063_REG_RSVD_24,		/*  0x24: Reserved              */</div><div class='add'>+	MT2063_REG_RSVD_25,		/*  0x25: Reserved              */</div><div class='add'>+	MT2063_REG_RSVD_26,		/*  0x26: Reserved              */</div><div class='add'>+	MT2063_REG_RSVD_27,		/*  0x27: Reserved              */</div><div class='add'>+	MT2063_REG_FIFF_CTRL,		/*  0x28: FIFF Control          */</div><div class='add'>+	MT2063_REG_FIFF_OFFSET,		/*  0x29: FIFF Offset           */</div><div class='add'>+	MT2063_REG_CTUNE_CTRL,		/*  0x2A: Reserved              */</div><div class='add'>+	MT2063_REG_CTUNE_OV,		/*  0x2B: Reserved              */</div><div class='add'>+	MT2063_REG_CTRL_2C,		/*  0x2C: Reserved              */</div><div class='add'>+	MT2063_REG_FIFF_CTRL2,		/*  0x2D: Fiff Control          */</div><div class='add'>+	MT2063_REG_RSVD_2E,		/*  0x2E: Reserved              */</div><div class='add'>+	MT2063_REG_DNC_GAIN,		/*  0x2F: DNC Control           */</div><div class='add'>+	MT2063_REG_VGA_GAIN,		/*  0x30: VGA Gain Ctrl         */</div><div class='add'>+	MT2063_REG_RSVD_31,		/*  0x31: Reserved              */</div><div class='add'>+	MT2063_REG_TEMP_SEL,		/*  0x32: Temperature Selection */</div><div class='add'>+	MT2063_REG_RSVD_33,		/*  0x33: Reserved              */</div><div class='add'>+	MT2063_REG_RSVD_34,		/*  0x34: Reserved              */</div><div class='add'>+	MT2063_REG_RSVD_35,		/*  0x35: Reserved              */</div><div class='add'>+	MT2063_REG_RSVD_36,		/*  0x36: Reserved              */</div><div class='add'>+	MT2063_REG_RSVD_37,		/*  0x37: Reserved              */</div><div class='add'>+	MT2063_REG_RSVD_38,		/*  0x38: Reserved              */</div><div class='add'>+	MT2063_REG_RSVD_39,		/*  0x39: Reserved              */</div><div class='add'>+	MT2063_REG_RSVD_3A,		/*  0x3A: Reserved              */</div><div class='add'>+	MT2063_REG_RSVD_3B,		/*  0x3B: Reserved              */</div><div class='add'>+	MT2063_REG_RSVD_3C,		/*  0x3C: Reserved              */</div><div class='add'>+	MT2063_REG_END_REGS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt2063_state {</div><div class='add'>+	struct i2c_adapter *i2c;</div><div class='add'>+</div><div class='add'>+	bool init;</div><div class='add'>+</div><div class='add'>+	const struct mt2063_config *config;</div><div class='add'>+	struct dvb_tuner_ops ops;</div><div class='add'>+	struct dvb_frontend *frontend;</div><div class='add'>+	struct tuner_state status;</div><div class='add'>+</div><div class='add'>+	u32 frequency;</div><div class='add'>+	u32 srate;</div><div class='add'>+	u32 bandwidth;</div><div class='add'>+	u32 reference;</div><div class='add'>+</div><div class='add'>+	u32 tuner_id;</div><div class='add'>+	struct MT2063_AvoidSpursData_t AS_Data;</div><div class='add'>+	u32 f_IF1_actual;</div><div class='add'>+	u32 rcvr_mode;</div><div class='add'>+	u32 ctfilt_sw;</div><div class='add'>+	u32 CTFiltMax[31];</div><div class='add'>+	u32 num_regs;</div><div class='add'>+	u8 reg[MT2063_REG_END_REGS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mt2063_write - Write data into the I2C bus</div><div class='add'>+ */</div><div class='add'>+static u32 mt2063_write(struct mt2063_state *state, u8 reg, u8 *data, u32 len)</div><div class='add'>+{</div><div class='add'>+	struct dvb_frontend *fe = state-&gt;frontend;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 buf[60];</div><div class='add'>+	struct i2c_msg msg = {</div><div class='add'>+		.addr = state-&gt;config-&gt;tuner_address,</div><div class='add'>+		.flags = 0,</div><div class='add'>+		.buf = buf,</div><div class='add'>+		.len = len + 1</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	msg.buf[0] = reg;</div><div class='add'>+	memcpy(msg.buf + 1, data, len);</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+	ret = i2c_transfer(state-&gt;i2c, &amp;msg, 1);</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		printk(KERN_ERR "%s error ret=%d\n", __func__, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mt2063_write - Write register data into the I2C bus, caching the value</div><div class='add'>+ */</div><div class='add'>+static u32 mt2063_setreg(struct mt2063_state *state, u8 reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	u32 status;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	if (reg &gt;= MT2063_REG_END_REGS)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	status = mt2063_write(state, reg, &amp;val, 1);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	state-&gt;reg[reg] = val;</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'>+ * mt2063_read - Read data from the I2C bus</div><div class='add'>+ */</div><div class='add'>+static u32 mt2063_read(struct mt2063_state *state,</div><div class='add'>+			   u8 subAddress, u8 *pData, u32 cnt)</div><div class='add'>+{</div><div class='add'>+	u32 status = 0;	/* Status to be returned        */</div><div class='add'>+	struct dvb_frontend *fe = state-&gt;frontend;</div><div class='add'>+	u32 i = 0;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "addr 0x%02x, cnt %d\n", subAddress, cnt);</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cnt; i++) {</div><div class='add'>+		u8 b0[] = { subAddress + i };</div><div class='add'>+		struct i2c_msg msg[] = {</div><div class='add'>+			{</div><div class='add'>+				.addr = state-&gt;config-&gt;tuner_address,</div><div class='add'>+				.flags = 0,</div><div class='add'>+				.buf = b0,</div><div class='add'>+				.len = 1</div><div class='add'>+			}, {</div><div class='add'>+				.addr = state-&gt;config-&gt;tuner_address,</div><div class='add'>+				.flags = I2C_M_RD,</div><div class='add'>+				.buf = pData + i,</div><div class='add'>+				.len = 1</div><div class='add'>+			}</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		status = i2c_transfer(state-&gt;i2c, msg, 2);</div><div class='add'>+		dprintk(2, "addr 0x%02x, ret = %d, val = 0x%02x\n",</div><div class='add'>+			   subAddress + i, status, *(pData + i));</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		printk(KERN_ERR "Can't read from address 0x%02x,\n",</div><div class='add'>+		       subAddress + i);</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'>+ * FIXME: Is this really needed?</div><div class='add'>+ */</div><div class='add'>+static int MT2063_Sleep(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 *  ToDo:  Add code here to implement a OS blocking</div><div class='add'>+	 */</div><div class='add'>+	msleep(10);</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'>+ * Microtune spur avoidance</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*  Implement ceiling, floor functions.  */</div><div class='add'>+#define ceil(n, d) (((n) &lt; 0) ? (-((-(n))/(d))) : (n)/(d) + ((n)%(d) != 0))</div><div class='add'>+#define floor(n, d) (((n) &lt; 0) ? (-((-(n))/(d))) - ((n)%(d) != 0) : (n)/(d))</div><div class='add'>+</div><div class='add'>+struct MT2063_FIFZone_t {</div><div class='add'>+	s32 min_;</div><div class='add'>+	s32 max_;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct MT2063_ExclZone_t *InsertNode(struct MT2063_AvoidSpursData_t</div><div class='add'>+					    *pAS_Info,</div><div class='add'>+					    struct MT2063_ExclZone_t *pPrevNode)</div><div class='add'>+{</div><div class='add'>+	struct MT2063_ExclZone_t *pNode;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	/*  Check for a node in the free list  */</div><div class='add'>+	if (pAS_Info-&gt;freeZones != NULL) {</div><div class='add'>+		/*  Use one from the free list  */</div><div class='add'>+		pNode = pAS_Info-&gt;freeZones;</div><div class='add'>+		pAS_Info-&gt;freeZones = pNode-&gt;next_;</div><div class='add'>+	} else {</div><div class='add'>+		/*  Grab a node from the array  */</div><div class='add'>+		pNode = &amp;pAS_Info-&gt;MT2063_ExclZones[pAS_Info-&gt;nZones];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pPrevNode != NULL) {</div><div class='add'>+		pNode-&gt;next_ = pPrevNode-&gt;next_;</div><div class='add'>+		pPrevNode-&gt;next_ = pNode;</div><div class='add'>+	} else {		/*  insert at the beginning of the list  */</div><div class='add'>+</div><div class='add'>+		pNode-&gt;next_ = pAS_Info-&gt;usedZones;</div><div class='add'>+		pAS_Info-&gt;usedZones = pNode;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pAS_Info-&gt;nZones++;</div><div class='add'>+	return pNode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct MT2063_ExclZone_t *RemoveNode(struct MT2063_AvoidSpursData_t</div><div class='add'>+					    *pAS_Info,</div><div class='add'>+					    struct MT2063_ExclZone_t *pPrevNode,</div><div class='add'>+					    struct MT2063_ExclZone_t</div><div class='add'>+					    *pNodeToRemove)</div><div class='add'>+{</div><div class='add'>+	struct MT2063_ExclZone_t *pNext = pNodeToRemove-&gt;next_;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	/*  Make previous node point to the subsequent node  */</div><div class='add'>+	if (pPrevNode != NULL)</div><div class='add'>+		pPrevNode-&gt;next_ = pNext;</div><div class='add'>+</div><div class='add'>+	/*  Add pNodeToRemove to the beginning of the freeZones  */</div><div class='add'>+	pNodeToRemove-&gt;next_ = pAS_Info-&gt;freeZones;</div><div class='add'>+	pAS_Info-&gt;freeZones = pNodeToRemove;</div><div class='add'>+</div><div class='add'>+	/*  Decrement node count  */</div><div class='add'>+	pAS_Info-&gt;nZones--;</div><div class='add'>+</div><div class='add'>+	return pNext;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MT_AddExclZone()</div><div class='add'>+ *</div><div class='add'>+ * Add (and merge) an exclusion zone into the list.</div><div class='add'>+ * If the range (f_min, f_max) is totally outside the</div><div class='add'>+ * 1st IF BW, ignore the entry.</div><div class='add'>+ * If the range (f_min, f_max) is negative, ignore the entry.</div><div class='add'>+ */</div><div class='add'>+static void MT2063_AddExclZone(struct MT2063_AvoidSpursData_t *pAS_Info,</div><div class='add'>+			       u32 f_min, u32 f_max)</div><div class='add'>+{</div><div class='add'>+	struct MT2063_ExclZone_t *pNode = pAS_Info-&gt;usedZones;</div><div class='add'>+	struct MT2063_ExclZone_t *pPrev = NULL;</div><div class='add'>+	struct MT2063_ExclZone_t *pNext = NULL;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	/*  Check to see if this overlaps the 1st IF filter  */</div><div class='add'>+	if ((f_max &gt; (pAS_Info-&gt;f_if1_Center - (pAS_Info-&gt;f_if1_bw / 2)))</div><div class='add'>+	    &amp;&amp; (f_min &lt; (pAS_Info-&gt;f_if1_Center + (pAS_Info-&gt;f_if1_bw / 2)))</div><div class='add'>+	    &amp;&amp; (f_min &lt; f_max)) {</div><div class='add'>+		/*</div><div class='add'>+		 *                1        2         3      4       5        6</div><div class='add'>+		 *</div><div class='add'>+		 *   New entry:  |---|    |--|      |--|    |-|    |---|    |--|</div><div class='add'>+		 *                or       or        or     or      or</div><div class='add'>+		 *   Existing:  |--|      |--|      |--|    |---|  |-|      |--|</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		/*  Check for our place in the list  */</div><div class='add'>+		while ((pNode != NULL) &amp;&amp; (pNode-&gt;max_ &lt; f_min)) {</div><div class='add'>+			pPrev = pNode;</div><div class='add'>+			pNode = pNode-&gt;next_;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((pNode != NULL) &amp;&amp; (pNode-&gt;min_ &lt; f_max)) {</div><div class='add'>+			/*  Combine me with pNode  */</div><div class='add'>+			if (f_min &lt; pNode-&gt;min_)</div><div class='add'>+				pNode-&gt;min_ = f_min;</div><div class='add'>+			if (f_max &gt; pNode-&gt;max_)</div><div class='add'>+				pNode-&gt;max_ = f_max;</div><div class='add'>+		} else {</div><div class='add'>+			pNode = InsertNode(pAS_Info, pPrev);</div><div class='add'>+			pNode-&gt;min_ = f_min;</div><div class='add'>+			pNode-&gt;max_ = f_max;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*  Look for merging possibilities  */</div><div class='add'>+		pNext = pNode-&gt;next_;</div><div class='add'>+		while ((pNext != NULL) &amp;&amp; (pNext-&gt;min_ &lt; pNode-&gt;max_)) {</div><div class='add'>+			if (pNext-&gt;max_ &gt; pNode-&gt;max_)</div><div class='add'>+				pNode-&gt;max_ = pNext-&gt;max_;</div><div class='add'>+			/*  Remove pNext, return ptr to pNext-&gt;next  */</div><div class='add'>+			pNext = RemoveNode(pAS_Info, pNode, pNext);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Reset all exclusion zones.</div><div class='add'>+ *  Add zones to protect the PLL FracN regions near zero</div><div class='add'>+ */</div><div class='add'>+static void MT2063_ResetExclZones(struct MT2063_AvoidSpursData_t *pAS_Info)</div><div class='add'>+{</div><div class='add'>+	u32 center;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	pAS_Info-&gt;nZones = 0;	/*  this clears the used list  */</div><div class='add'>+	pAS_Info-&gt;usedZones = NULL;	/*  reset ptr                  */</div><div class='add'>+	pAS_Info-&gt;freeZones = NULL;	/*  reset ptr                  */</div><div class='add'>+</div><div class='add'>+	center =</div><div class='add'>+	    pAS_Info-&gt;f_ref *</div><div class='add'>+	    ((pAS_Info-&gt;f_if1_Center - pAS_Info-&gt;f_if1_bw / 2 +</div><div class='add'>+	      pAS_Info-&gt;f_in) / pAS_Info-&gt;f_ref) - pAS_Info-&gt;f_in;</div><div class='add'>+	while (center &lt;</div><div class='add'>+	       pAS_Info-&gt;f_if1_Center + pAS_Info-&gt;f_if1_bw / 2 +</div><div class='add'>+	       pAS_Info-&gt;f_LO1_FracN_Avoid) {</div><div class='add'>+		/*  Exclude LO1 FracN  */</div><div class='add'>+		MT2063_AddExclZone(pAS_Info,</div><div class='add'>+				   center - pAS_Info-&gt;f_LO1_FracN_Avoid,</div><div class='add'>+				   center - 1);</div><div class='add'>+		MT2063_AddExclZone(pAS_Info, center + 1,</div><div class='add'>+				   center + pAS_Info-&gt;f_LO1_FracN_Avoid);</div><div class='add'>+		center += pAS_Info-&gt;f_ref;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	center =</div><div class='add'>+	    pAS_Info-&gt;f_ref *</div><div class='add'>+	    ((pAS_Info-&gt;f_if1_Center - pAS_Info-&gt;f_if1_bw / 2 -</div><div class='add'>+	      pAS_Info-&gt;f_out) / pAS_Info-&gt;f_ref) + pAS_Info-&gt;f_out;</div><div class='add'>+	while (center &lt;</div><div class='add'>+	       pAS_Info-&gt;f_if1_Center + pAS_Info-&gt;f_if1_bw / 2 +</div><div class='add'>+	       pAS_Info-&gt;f_LO2_FracN_Avoid) {</div><div class='add'>+		/*  Exclude LO2 FracN  */</div><div class='add'>+		MT2063_AddExclZone(pAS_Info,</div><div class='add'>+				   center - pAS_Info-&gt;f_LO2_FracN_Avoid,</div><div class='add'>+				   center - 1);</div><div class='add'>+		MT2063_AddExclZone(pAS_Info, center + 1,</div><div class='add'>+				   center + pAS_Info-&gt;f_LO2_FracN_Avoid);</div><div class='add'>+		center += pAS_Info-&gt;f_ref;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (MT2063_EXCLUDE_US_DECT_FREQUENCIES(pAS_Info-&gt;avoidDECT)) {</div><div class='add'>+		/*  Exclude LO1 values that conflict with DECT channels */</div><div class='add'>+		MT2063_AddExclZone(pAS_Info, 1920836000 - pAS_Info-&gt;f_in, 1922236000 - pAS_Info-&gt;f_in);	/* Ctr = 1921.536 */</div><div class='add'>+		MT2063_AddExclZone(pAS_Info, 1922564000 - pAS_Info-&gt;f_in, 1923964000 - pAS_Info-&gt;f_in);	/* Ctr = 1923.264 */</div><div class='add'>+		MT2063_AddExclZone(pAS_Info, 1924292000 - pAS_Info-&gt;f_in, 1925692000 - pAS_Info-&gt;f_in);	/* Ctr = 1924.992 */</div><div class='add'>+		MT2063_AddExclZone(pAS_Info, 1926020000 - pAS_Info-&gt;f_in, 1927420000 - pAS_Info-&gt;f_in);	/* Ctr = 1926.720 */</div><div class='add'>+		MT2063_AddExclZone(pAS_Info, 1927748000 - pAS_Info-&gt;f_in, 1929148000 - pAS_Info-&gt;f_in);	/* Ctr = 1928.448 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (MT2063_EXCLUDE_EURO_DECT_FREQUENCIES(pAS_Info-&gt;avoidDECT)) {</div><div class='add'>+		MT2063_AddExclZone(pAS_Info, 1896644000 - pAS_Info-&gt;f_in, 1898044000 - pAS_Info-&gt;f_in);	/* Ctr = 1897.344 */</div><div class='add'>+		MT2063_AddExclZone(pAS_Info, 1894916000 - pAS_Info-&gt;f_in, 1896316000 - pAS_Info-&gt;f_in);	/* Ctr = 1895.616 */</div><div class='add'>+		MT2063_AddExclZone(pAS_Info, 1893188000 - pAS_Info-&gt;f_in, 1894588000 - pAS_Info-&gt;f_in);	/* Ctr = 1893.888 */</div><div class='add'>+		MT2063_AddExclZone(pAS_Info, 1891460000 - pAS_Info-&gt;f_in, 1892860000 - pAS_Info-&gt;f_in);	/* Ctr = 1892.16  */</div><div class='add'>+		MT2063_AddExclZone(pAS_Info, 1889732000 - pAS_Info-&gt;f_in, 1891132000 - pAS_Info-&gt;f_in);	/* Ctr = 1890.432 */</div><div class='add'>+		MT2063_AddExclZone(pAS_Info, 1888004000 - pAS_Info-&gt;f_in, 1889404000 - pAS_Info-&gt;f_in);	/* Ctr = 1888.704 */</div><div class='add'>+		MT2063_AddExclZone(pAS_Info, 1886276000 - pAS_Info-&gt;f_in, 1887676000 - pAS_Info-&gt;f_in);	/* Ctr = 1886.976 */</div><div class='add'>+		MT2063_AddExclZone(pAS_Info, 1884548000 - pAS_Info-&gt;f_in, 1885948000 - pAS_Info-&gt;f_in);	/* Ctr = 1885.248 */</div><div class='add'>+		MT2063_AddExclZone(pAS_Info, 1882820000 - pAS_Info-&gt;f_in, 1884220000 - pAS_Info-&gt;f_in);	/* Ctr = 1883.52  */</div><div class='add'>+		MT2063_AddExclZone(pAS_Info, 1881092000 - pAS_Info-&gt;f_in, 1882492000 - pAS_Info-&gt;f_in);	/* Ctr = 1881.792 */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MT_ChooseFirstIF - Choose the best available 1st IF</div><div class='add'>+ *                    If f_Desired is not excluded, choose that first.</div><div class='add'>+ *                    Otherwise, return the value closest to f_Center that is</div><div class='add'>+ *                    not excluded</div><div class='add'>+ */</div><div class='add'>+static u32 MT2063_ChooseFirstIF(struct MT2063_AvoidSpursData_t *pAS_Info)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Update "f_Desired" to be the nearest "combinational-multiple" of</div><div class='add'>+	 * "f_LO1_Step".</div><div class='add'>+	 * The resulting number, F_LO1 must be a multiple of f_LO1_Step.</div><div class='add'>+	 * And F_LO1 is the arithmetic sum of f_in + f_Center.</div><div class='add'>+	 * Neither f_in, nor f_Center must be a multiple of f_LO1_Step.</div><div class='add'>+	 * However, the sum must be.</div><div class='add'>+	 */</div><div class='add'>+	const u32 f_Desired =</div><div class='add'>+	    pAS_Info-&gt;f_LO1_Step *</div><div class='add'>+	    ((pAS_Info-&gt;f_if1_Request + pAS_Info-&gt;f_in +</div><div class='add'>+	      pAS_Info-&gt;f_LO1_Step / 2) / pAS_Info-&gt;f_LO1_Step) -</div><div class='add'>+	    pAS_Info-&gt;f_in;</div><div class='add'>+	const u32 f_Step =</div><div class='add'>+	    (pAS_Info-&gt;f_LO1_Step &gt;</div><div class='add'>+	     pAS_Info-&gt;f_LO2_Step) ? pAS_Info-&gt;f_LO1_Step : pAS_Info-&gt;</div><div class='add'>+	    f_LO2_Step;</div><div class='add'>+	u32 f_Center;</div><div class='add'>+	s32 i;</div><div class='add'>+	s32 j = 0;</div><div class='add'>+	u32 bDesiredExcluded = 0;</div><div class='add'>+	u32 bZeroExcluded = 0;</div><div class='add'>+	s32 tmpMin, tmpMax;</div><div class='add'>+	s32 bestDiff;</div><div class='add'>+	struct MT2063_ExclZone_t *pNode = pAS_Info-&gt;usedZones;</div><div class='add'>+	struct MT2063_FIFZone_t zones[MT2063_MAX_ZONES];</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	if (pAS_Info-&gt;nZones == 0)</div><div class='add'>+		return f_Desired;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *  f_Center needs to be an integer multiple of f_Step away</div><div class='add'>+	 *  from f_Desired</div><div class='add'>+	 */</div><div class='add'>+	if (pAS_Info-&gt;f_if1_Center &gt; f_Desired)</div><div class='add'>+		f_Center =</div><div class='add'>+		    f_Desired +</div><div class='add'>+		    f_Step *</div><div class='add'>+		    ((pAS_Info-&gt;f_if1_Center - f_Desired +</div><div class='add'>+		      f_Step / 2) / f_Step);</div><div class='add'>+	else</div><div class='add'>+		f_Center =</div><div class='add'>+		    f_Desired -</div><div class='add'>+		    f_Step *</div><div class='add'>+		    ((f_Desired - pAS_Info-&gt;f_if1_Center +</div><div class='add'>+		      f_Step / 2) / f_Step);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Take MT_ExclZones, center around f_Center and change the</div><div class='add'>+	 * resolution to f_Step</div><div class='add'>+	 */</div><div class='add'>+	while (pNode != NULL) {</div><div class='add'>+		/*  floor function  */</div><div class='add'>+		tmpMin =</div><div class='add'>+		    floor((s32) (pNode-&gt;min_ - f_Center), (s32) f_Step);</div><div class='add'>+</div><div class='add'>+		/*  ceil function  */</div><div class='add'>+		tmpMax =</div><div class='add'>+		    ceil((s32) (pNode-&gt;max_ - f_Center), (s32) f_Step);</div><div class='add'>+</div><div class='add'>+		if ((pNode-&gt;min_ &lt; f_Desired) &amp;&amp; (pNode-&gt;max_ &gt; f_Desired))</div><div class='add'>+			bDesiredExcluded = 1;</div><div class='add'>+</div><div class='add'>+		if ((tmpMin &lt; 0) &amp;&amp; (tmpMax &gt; 0))</div><div class='add'>+			bZeroExcluded = 1;</div><div class='add'>+</div><div class='add'>+		/*  See if this zone overlaps the previous  */</div><div class='add'>+		if ((j &gt; 0) &amp;&amp; (tmpMin &lt; zones[j - 1].max_))</div><div class='add'>+			zones[j - 1].max_ = tmpMax;</div><div class='add'>+		else {</div><div class='add'>+			/*  Add new zone  */</div><div class='add'>+			zones[j].min_ = tmpMin;</div><div class='add'>+			zones[j].max_ = tmpMax;</div><div class='add'>+			j++;</div><div class='add'>+		}</div><div class='add'>+		pNode = pNode-&gt;next_;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *  If the desired is okay, return with it</div><div class='add'>+	 */</div><div class='add'>+	if (bDesiredExcluded == 0)</div><div class='add'>+		return f_Desired;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *  If the desired is excluded and the center is okay, return with it</div><div class='add'>+	 */</div><div class='add'>+	if (bZeroExcluded == 0)</div><div class='add'>+		return f_Center;</div><div class='add'>+</div><div class='add'>+	/*  Find the value closest to 0 (f_Center)  */</div><div class='add'>+	bestDiff = zones[0].min_;</div><div class='add'>+	for (i = 0; i &lt; j; i++) {</div><div class='add'>+		if (abs(zones[i].min_) &lt; abs(bestDiff))</div><div class='add'>+			bestDiff = zones[i].min_;</div><div class='add'>+		if (abs(zones[i].max_) &lt; abs(bestDiff))</div><div class='add'>+			bestDiff = zones[i].max_;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bestDiff &lt; 0)</div><div class='add'>+		return f_Center - ((u32) (-bestDiff) * f_Step);</div><div class='add'>+</div><div class='add'>+	return f_Center + (bestDiff * f_Step);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * gcd() - Uses Euclid's algorithm</div><div class='add'>+ *</div><div class='add'>+ * @u, @v:	Unsigned values whose GCD is desired.</div><div class='add'>+ *</div><div class='add'>+ * Returns THE greatest common divisor of u and v, if either value is 0,</div><div class='add'>+ * the other value is returned as the result.</div><div class='add'>+ */</div><div class='add'>+static u32 MT2063_gcd(u32 u, u32 v)</div><div class='add'>+{</div><div class='add'>+	u32 r;</div><div class='add'>+</div><div class='add'>+	while (v != 0) {</div><div class='add'>+		r = u % v;</div><div class='add'>+		u = v;</div><div class='add'>+		v = r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return u;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * IsSpurInBand() - Checks to see if a spur will be present within the IF's</div><div class='add'>+ *                  bandwidth. (fIFOut +/- fIFBW, -fIFOut +/- fIFBW)</div><div class='add'>+ *</div><div class='add'>+ *                    ma   mb                                     mc   md</div><div class='add'>+ *                  &lt;--+-+-+-------------------+-------------------+-+-+--&gt;</div><div class='add'>+ *                     |   ^                   0                   ^   |</div><div class='add'>+ *                     ^   b=-fIFOut+fIFBW/2      -b=+fIFOut-fIFBW/2   ^</div><div class='add'>+ *                     a=-fIFOut-fIFBW/2              -a=+fIFOut+fIFBW/2</div><div class='add'>+ *</div><div class='add'>+ *                  Note that some equations are doubled to prevent round-off</div><div class='add'>+ *                  problems when calculating fIFBW/2</div><div class='add'>+ *</div><div class='add'>+ * @pAS_Info:	Avoid Spurs information block</div><div class='add'>+ * @fm:		If spur, amount f_IF1 has to move negative</div><div class='add'>+ * @fp:		If spur, amount f_IF1 has to move positive</div><div class='add'>+ *</div><div class='add'>+ *  Returns 1 if an LO spur would be present, otherwise 0.</div><div class='add'>+ */</div><div class='add'>+static u32 IsSpurInBand(struct MT2063_AvoidSpursData_t *pAS_Info,</div><div class='add'>+			u32 *fm, u32 * fp)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 **  Calculate LO frequency settings.</div><div class='add'>+	 */</div><div class='add'>+	u32 n, n0;</div><div class='add'>+	const u32 f_LO1 = pAS_Info-&gt;f_LO1;</div><div class='add'>+	const u32 f_LO2 = pAS_Info-&gt;f_LO2;</div><div class='add'>+	const u32 d = pAS_Info-&gt;f_out + pAS_Info-&gt;f_out_bw / 2;</div><div class='add'>+	const u32 c = d - pAS_Info-&gt;f_out_bw;</div><div class='add'>+	const u32 f = pAS_Info-&gt;f_zif_bw / 2;</div><div class='add'>+	const u32 f_Scale = (f_LO1 / (UINT_MAX / 2 / pAS_Info-&gt;maxH1)) + 1;</div><div class='add'>+	s32 f_nsLO1, f_nsLO2;</div><div class='add'>+	s32 f_Spur;</div><div class='add'>+	u32 ma, mb, mc, md, me, mf;</div><div class='add'>+	u32 lo_gcd, gd_Scale, gc_Scale, gf_Scale, hgds, hgfs, hgcs;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	*fm = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 ** For each edge (d, c &amp; f), calculate a scale, based on the gcd</div><div class='add'>+	 ** of f_LO1, f_LO2 and the edge value.  Use the larger of this</div><div class='add'>+	 ** gcd-based scale factor or f_Scale.</div><div class='add'>+	 */</div><div class='add'>+	lo_gcd = MT2063_gcd(f_LO1, f_LO2);</div><div class='add'>+	gd_Scale = max((u32) MT2063_gcd(lo_gcd, d), f_Scale);</div><div class='add'>+	hgds = gd_Scale / 2;</div><div class='add'>+	gc_Scale = max((u32) MT2063_gcd(lo_gcd, c), f_Scale);</div><div class='add'>+	hgcs = gc_Scale / 2;</div><div class='add'>+	gf_Scale = max((u32) MT2063_gcd(lo_gcd, f), f_Scale);</div><div class='add'>+	hgfs = gf_Scale / 2;</div><div class='add'>+</div><div class='add'>+	n0 = DIV_ROUND_UP(f_LO2 - d, f_LO1 - f_LO2);</div><div class='add'>+</div><div class='add'>+	/*  Check out all multiples of LO1 from n0 to m_maxLOSpurHarmonic  */</div><div class='add'>+	for (n = n0; n &lt;= pAS_Info-&gt;maxH1; ++n) {</div><div class='add'>+		md = (n * ((f_LO1 + hgds) / gd_Scale) -</div><div class='add'>+		      ((d + hgds) / gd_Scale)) / ((f_LO2 + hgds) / gd_Scale);</div><div class='add'>+</div><div class='add'>+		/*  If # fLO2 harmonics &gt; m_maxLOSpurHarmonic, then no spurs present  */</div><div class='add'>+		if (md &gt;= pAS_Info-&gt;maxH1)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ma = (n * ((f_LO1 + hgds) / gd_Scale) +</div><div class='add'>+		      ((d + hgds) / gd_Scale)) / ((f_LO2 + hgds) / gd_Scale);</div><div class='add'>+</div><div class='add'>+		/*  If no spurs between +/- (f_out + f_IFBW/2), then try next harmonic  */</div><div class='add'>+		if (md == ma)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mc = (n * ((f_LO1 + hgcs) / gc_Scale) -</div><div class='add'>+		      ((c + hgcs) / gc_Scale)) / ((f_LO2 + hgcs) / gc_Scale);</div><div class='add'>+		if (mc != md) {</div><div class='add'>+			f_nsLO1 = (s32) (n * (f_LO1 / gc_Scale));</div><div class='add'>+			f_nsLO2 = (s32) (mc * (f_LO2 / gc_Scale));</div><div class='add'>+			f_Spur =</div><div class='add'>+			    (gc_Scale * (f_nsLO1 - f_nsLO2)) +</div><div class='add'>+			    n * (f_LO1 % gc_Scale) - mc * (f_LO2 % gc_Scale);</div><div class='add'>+</div><div class='add'>+			*fp = ((f_Spur - (s32) c) / (mc - n)) + 1;</div><div class='add'>+			*fm = (((s32) d - f_Spur) / (mc - n)) + 1;</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*  Location of Zero-IF-spur to be checked  */</div><div class='add'>+		me = (n * ((f_LO1 + hgfs) / gf_Scale) +</div><div class='add'>+		      ((f + hgfs) / gf_Scale)) / ((f_LO2 + hgfs) / gf_Scale);</div><div class='add'>+		mf = (n * ((f_LO1 + hgfs) / gf_Scale) -</div><div class='add'>+		      ((f + hgfs) / gf_Scale)) / ((f_LO2 + hgfs) / gf_Scale);</div><div class='add'>+		if (me != mf) {</div><div class='add'>+			f_nsLO1 = n * (f_LO1 / gf_Scale);</div><div class='add'>+			f_nsLO2 = me * (f_LO2 / gf_Scale);</div><div class='add'>+			f_Spur =</div><div class='add'>+			    (gf_Scale * (f_nsLO1 - f_nsLO2)) +</div><div class='add'>+			    n * (f_LO1 % gf_Scale) - me * (f_LO2 % gf_Scale);</div><div class='add'>+</div><div class='add'>+			*fp = ((f_Spur + (s32) f) / (me - n)) + 1;</div><div class='add'>+			*fm = (((s32) f - f_Spur) / (me - n)) + 1;</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mb = (n * ((f_LO1 + hgcs) / gc_Scale) +</div><div class='add'>+		      ((c + hgcs) / gc_Scale)) / ((f_LO2 + hgcs) / gc_Scale);</div><div class='add'>+		if (ma != mb) {</div><div class='add'>+			f_nsLO1 = n * (f_LO1 / gc_Scale);</div><div class='add'>+			f_nsLO2 = ma * (f_LO2 / gc_Scale);</div><div class='add'>+			f_Spur =</div><div class='add'>+			    (gc_Scale * (f_nsLO1 - f_nsLO2)) +</div><div class='add'>+			    n * (f_LO1 % gc_Scale) - ma * (f_LO2 % gc_Scale);</div><div class='add'>+</div><div class='add'>+			*fp = (((s32) d + f_Spur) / (ma - n)) + 1;</div><div class='add'>+			*fm = (-(f_Spur + (s32) c) / (ma - n)) + 1;</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*  No spurs found  */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MT_AvoidSpurs() - Main entry point to avoid spurs.</div><div class='add'>+ *                   Checks for existing spurs in present LO1, LO2 freqs</div><div class='add'>+ *                   and if present, chooses spur-free LO1, LO2 combination</div><div class='add'>+ *                   that tunes the same input/output frequencies.</div><div class='add'>+ */</div><div class='add'>+static u32 MT2063_AvoidSpurs(struct MT2063_AvoidSpursData_t *pAS_Info)</div><div class='add'>+{</div><div class='add'>+	u32 status = 0;</div><div class='add'>+	u32 fm, fp;		/*  restricted range on LO's        */</div><div class='add'>+	pAS_Info-&gt;bSpurAvoided = 0;</div><div class='add'>+	pAS_Info-&gt;nSpursFound = 0;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	if (pAS_Info-&gt;maxH1 == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Avoid LO Generated Spurs</div><div class='add'>+	 *</div><div class='add'>+	 * Make sure that have no LO-related spurs within the IF output</div><div class='add'>+	 * bandwidth.</div><div class='add'>+	 *</div><div class='add'>+	 * If there is an LO spur in this band, start at the current IF1 frequency</div><div class='add'>+	 * and work out until we find a spur-free frequency or run up against the</div><div class='add'>+	 * 1st IF SAW band edge.  Use temporary copies of fLO1 and fLO2 so that they</div><div class='add'>+	 * will be unchanged if a spur-free setting is not found.</div><div class='add'>+	 */</div><div class='add'>+	pAS_Info-&gt;bSpurPresent = IsSpurInBand(pAS_Info, &amp;fm, &amp;fp);</div><div class='add'>+	if (pAS_Info-&gt;bSpurPresent) {</div><div class='add'>+		u32 zfIF1 = pAS_Info-&gt;f_LO1 - pAS_Info-&gt;f_in;	/*  current attempt at a 1st IF  */</div><div class='add'>+		u32 zfLO1 = pAS_Info-&gt;f_LO1;	/*  current attempt at an LO1 freq  */</div><div class='add'>+		u32 zfLO2 = pAS_Info-&gt;f_LO2;	/*  current attempt at an LO2 freq  */</div><div class='add'>+		u32 delta_IF1;</div><div class='add'>+		u32 new_IF1;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 **  Spur was found, attempt to find a spur-free 1st IF</div><div class='add'>+		 */</div><div class='add'>+		do {</div><div class='add'>+			pAS_Info-&gt;nSpursFound++;</div><div class='add'>+</div><div class='add'>+			/*  Raise f_IF1_upper, if needed  */</div><div class='add'>+			MT2063_AddExclZone(pAS_Info, zfIF1 - fm, zfIF1 + fp);</div><div class='add'>+</div><div class='add'>+			/*  Choose next IF1 that is closest to f_IF1_CENTER              */</div><div class='add'>+			new_IF1 = MT2063_ChooseFirstIF(pAS_Info);</div><div class='add'>+</div><div class='add'>+			if (new_IF1 &gt; zfIF1) {</div><div class='add'>+				pAS_Info-&gt;f_LO1 += (new_IF1 - zfIF1);</div><div class='add'>+				pAS_Info-&gt;f_LO2 += (new_IF1 - zfIF1);</div><div class='add'>+			} else {</div><div class='add'>+				pAS_Info-&gt;f_LO1 -= (zfIF1 - new_IF1);</div><div class='add'>+				pAS_Info-&gt;f_LO2 -= (zfIF1 - new_IF1);</div><div class='add'>+			}</div><div class='add'>+			zfIF1 = new_IF1;</div><div class='add'>+</div><div class='add'>+			if (zfIF1 &gt; pAS_Info-&gt;f_if1_Center)</div><div class='add'>+				delta_IF1 = zfIF1 - pAS_Info-&gt;f_if1_Center;</div><div class='add'>+			else</div><div class='add'>+				delta_IF1 = pAS_Info-&gt;f_if1_Center - zfIF1;</div><div class='add'>+</div><div class='add'>+			pAS_Info-&gt;bSpurPresent = IsSpurInBand(pAS_Info, &amp;fm, &amp;fp);</div><div class='add'>+		/*</div><div class='add'>+		 *  Continue while the new 1st IF is still within the 1st IF bandwidth</div><div class='add'>+		 *  and there is a spur in the band (again)</div><div class='add'>+		 */</div><div class='add'>+		} while ((2 * delta_IF1 + pAS_Info-&gt;f_out_bw &lt;= pAS_Info-&gt;f_if1_bw) &amp;&amp; pAS_Info-&gt;bSpurPresent);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Use the LO-spur free values found.  If the search went all</div><div class='add'>+		 * the way to the 1st IF band edge and always found spurs, just</div><div class='add'>+		 * leave the original choice.  It's as "good" as any other.</div><div class='add'>+		 */</div><div class='add'>+		if (pAS_Info-&gt;bSpurPresent == 1) {</div><div class='add'>+			status |= MT2063_SPUR_PRESENT_ERR;</div><div class='add'>+			pAS_Info-&gt;f_LO1 = zfLO1;</div><div class='add'>+			pAS_Info-&gt;f_LO2 = zfLO2;</div><div class='add'>+		} else</div><div class='add'>+			pAS_Info-&gt;bSpurAvoided = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status |=</div><div class='add'>+	    ((pAS_Info-&gt;</div><div class='add'>+	      nSpursFound &lt;&lt; MT2063_SPUR_SHIFT) &amp; MT2063_SPUR_CNT_MASK);</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'>+ * Constants used by the tuning algorithm</div><div class='add'>+ */</div><div class='add'>+#define MT2063_REF_FREQ          (16000000UL)	/* Reference oscillator Frequency (in Hz) */</div><div class='add'>+#define MT2063_IF1_BW            (22000000UL)	/* The IF1 filter bandwidth (in Hz) */</div><div class='add'>+#define MT2063_TUNE_STEP_SIZE       (50000UL)	/* Tune in steps of 50 kHz */</div><div class='add'>+#define MT2063_SPUR_STEP_HZ        (250000UL)	/* Step size (in Hz) to move IF1 when avoiding spurs */</div><div class='add'>+#define MT2063_ZIF_BW             (2000000UL)	/* Zero-IF spur-free bandwidth (in Hz) */</div><div class='add'>+#define MT2063_MAX_HARMONICS_1         (15UL)	/* Highest intra-tuner LO Spur Harmonic to be avoided */</div><div class='add'>+#define MT2063_MAX_HARMONICS_2          (5UL)	/* Highest inter-tuner LO Spur Harmonic to be avoided */</div><div class='add'>+#define MT2063_MIN_LO_SEP         (1000000UL)	/* Minimum inter-tuner LO frequency separation */</div><div class='add'>+#define MT2063_LO1_FRACN_AVOID          (0UL)	/* LO1 FracN numerator avoid region (in Hz) */</div><div class='add'>+#define MT2063_LO2_FRACN_AVOID     (199999UL)	/* LO2 FracN numerator avoid region (in Hz) */</div><div class='add'>+#define MT2063_MIN_FIN_FREQ      (44000000UL)	/* Minimum input frequency (in Hz) */</div><div class='add'>+#define MT2063_MAX_FIN_FREQ    (1100000000UL)	/* Maximum input frequency (in Hz) */</div><div class='add'>+#define MT2063_MIN_FOUT_FREQ     (36000000UL)	/* Minimum output frequency (in Hz) */</div><div class='add'>+#define MT2063_MAX_FOUT_FREQ     (57000000UL)	/* Maximum output frequency (in Hz) */</div><div class='add'>+#define MT2063_MIN_DNC_FREQ    (1293000000UL)	/* Minimum LO2 frequency (in Hz) */</div><div class='add'>+#define MT2063_MAX_DNC_FREQ    (1614000000UL)	/* Maximum LO2 frequency (in Hz) */</div><div class='add'>+#define MT2063_MIN_UPC_FREQ    (1396000000UL)	/* Minimum LO1 frequency (in Hz) */</div><div class='add'>+#define MT2063_MAX_UPC_FREQ    (2750000000UL)	/* Maximum LO1 frequency (in Hz) */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Define the supported Part/Rev codes for the MT2063</div><div class='add'>+ */</div><div class='add'>+#define MT2063_B0       (0x9B)</div><div class='add'>+#define MT2063_B1       (0x9C)</div><div class='add'>+#define MT2063_B2       (0x9D)</div><div class='add'>+#define MT2063_B3       (0x9E)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mt2063_lockStatus - Checks to see if LO1 and LO2 are locked</div><div class='add'>+ *</div><div class='add'>+ * @state:	struct mt2063_state pointer</div><div class='add'>+ *</div><div class='add'>+ * This function returns 0, if no lock, 1 if locked and a value &lt; 1 if error</div><div class='add'>+ */</div><div class='add'>+static unsigned int mt2063_lockStatus(struct mt2063_state *state)</div><div class='add'>+{</div><div class='add'>+	const u32 nMaxWait = 100;	/*  wait a maximum of 100 msec   */</div><div class='add'>+	const u32 nPollRate = 2;	/*  poll status bits every 2 ms */</div><div class='add'>+	const u32 nMaxLoops = nMaxWait / nPollRate;</div><div class='add'>+	const u8 LO1LK = 0x80;</div><div class='add'>+	u8 LO2LK = 0x08;</div><div class='add'>+	u32 status;</div><div class='add'>+	u32 nDelays = 0;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	/*  LO2 Lock bit was in a different place for B0 version  */</div><div class='add'>+	if (state-&gt;tuner_id == MT2063_B0)</div><div class='add'>+		LO2LK = 0x40;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		status = mt2063_read(state, MT2063_REG_LO_STATUS,</div><div class='add'>+				     &amp;state-&gt;reg[MT2063_REG_LO_STATUS], 1);</div><div class='add'>+</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			return status;</div><div class='add'>+</div><div class='add'>+		if ((state-&gt;reg[MT2063_REG_LO_STATUS] &amp; (LO1LK | LO2LK)) ==</div><div class='add'>+		    (LO1LK | LO2LK)) {</div><div class='add'>+			return TUNER_STATUS_LOCKED | TUNER_STATUS_STEREO;</div><div class='add'>+		}</div><div class='add'>+		msleep(nPollRate);	/*  Wait between retries  */</div><div class='add'>+	} while (++nDelays &lt; nMaxLoops);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Got no lock or partial lock</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'>+ *  Constants for setting receiver modes.</div><div class='add'>+ *  (6 modes defined at this time, enumerated by mt2063_delivery_sys)</div><div class='add'>+ *  (DNC1GC &amp; DNC2GC are the values, which are used, when the specific</div><div class='add'>+ *   DNC Output is selected, the other is always off)</div><div class='add'>+ *</div><div class='add'>+ *                enum mt2063_delivery_sys</div><div class='add'>+ * -------------+----------------------------------------------</div><div class='add'>+ * Mode 0 :     | MT2063_CABLE_QAM</div><div class='add'>+ * Mode 1 :     | MT2063_CABLE_ANALOG</div><div class='add'>+ * Mode 2 :     | MT2063_OFFAIR_COFDM</div><div class='add'>+ * Mode 3 :     | MT2063_OFFAIR_COFDM_SAWLESS</div><div class='add'>+ * Mode 4 :     | MT2063_OFFAIR_ANALOG</div><div class='add'>+ * Mode 5 :     | MT2063_OFFAIR_8VSB</div><div class='add'>+ * --------------+----------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ *                |&lt;----------   Mode  --------------&gt;|</div><div class='add'>+ *    Reg Field   |  0  |  1  |  2  |  3  |  4  |  5  |</div><div class='add'>+ *    ------------+-----+-----+-----+-----+-----+-----+</div><div class='add'>+ *    RFAGCen     | OFF | OFF | OFF | OFF | OFF | OFF</div><div class='add'>+ *    LNARin      |   0 |   0 |   3 |   3 |  3  |  3</div><div class='add'>+ *    FIFFQen     |   1 |   1 |   1 |   1 |  1  |  1</div><div class='add'>+ *    FIFFq       |   0 |   0 |   0 |   0 |  0  |  0</div><div class='add'>+ *    DNC1gc      |   0 |   0 |   0 |   0 |  0  |  0</div><div class='add'>+ *    DNC2gc      |   0 |   0 |   0 |   0 |  0  |  0</div><div class='add'>+ *    GCU Auto    |   1 |   1 |   1 |   1 |  1  |  1</div><div class='add'>+ *    LNA max Atn |  31 |  31 |  31 |  31 | 31  | 31</div><div class='add'>+ *    LNA Target  |  44 |  43 |  43 |  43 | 43  | 43</div><div class='add'>+ *    ign  RF Ovl |   0 |   0 |   0 |   0 |  0  |  0</div><div class='add'>+ *    RF  max Atn |  31 |  31 |  31 |  31 | 31  | 31</div><div class='add'>+ *    PD1 Target  |  36 |  36 |  38 |  38 | 36  | 38</div><div class='add'>+ *    ign FIF Ovl |   0 |   0 |   0 |   0 |  0  |  0</div><div class='add'>+ *    FIF max Atn |   5 |   5 |   5 |   5 |  5  |  5</div><div class='add'>+ *    PD2 Target  |  40 |  33 |  42 |  42 | 33  | 42</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum mt2063_delivery_sys {</div><div class='add'>+	MT2063_CABLE_QAM = 0,</div><div class='add'>+	MT2063_CABLE_ANALOG,</div><div class='add'>+	MT2063_OFFAIR_COFDM,</div><div class='add'>+	MT2063_OFFAIR_COFDM_SAWLESS,</div><div class='add'>+	MT2063_OFFAIR_ANALOG,</div><div class='add'>+	MT2063_OFFAIR_8VSB,</div><div class='add'>+	MT2063_NUM_RCVR_MODES</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *mt2063_mode_name[] = {</div><div class='add'>+	[MT2063_CABLE_QAM]		= "digital cable",</div><div class='add'>+	[MT2063_CABLE_ANALOG]		= "analog cable",</div><div class='add'>+	[MT2063_OFFAIR_COFDM]		= "digital offair",</div><div class='add'>+	[MT2063_OFFAIR_COFDM_SAWLESS]	= "digital offair without SAW",</div><div class='add'>+	[MT2063_OFFAIR_ANALOG]		= "analog offair",</div><div class='add'>+	[MT2063_OFFAIR_8VSB]		= "analog offair 8vsb",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 RFAGCEN[]	= {  0,  0,  0,  0,  0,  0 };</div><div class='add'>+static const u8 LNARIN[]	= {  0,  0,  3,  3,  3,  3 };</div><div class='add'>+static const u8 FIFFQEN[]	= {  1,  1,  1,  1,  1,  1 };</div><div class='add'>+static const u8 FIFFQ[]		= {  0,  0,  0,  0,  0,  0 };</div><div class='add'>+static const u8 DNC1GC[]	= {  0,  0,  0,  0,  0,  0 };</div><div class='add'>+static const u8 DNC2GC[]	= {  0,  0,  0,  0,  0,  0 };</div><div class='add'>+static const u8 ACLNAMAX[]	= { 31, 31, 31, 31, 31, 31 };</div><div class='add'>+static const u8 LNATGT[]	= { 44, 43, 43, 43, 43, 43 };</div><div class='add'>+static const u8 RFOVDIS[]	= {  0,  0,  0,  0,  0,  0 };</div><div class='add'>+static const u8 ACRFMAX[]	= { 31, 31, 31, 31, 31, 31 };</div><div class='add'>+static const u8 PD1TGT[]	= { 36, 36, 38, 38, 36, 38 };</div><div class='add'>+static const u8 FIFOVDIS[]	= {  0,  0,  0,  0,  0,  0 };</div><div class='add'>+static const u8 ACFIFMAX[]	= { 29, 29, 29, 29, 29, 29 };</div><div class='add'>+static const u8 PD2TGT[]	= { 40, 33, 38, 42, 30, 38 };</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mt2063_set_dnc_output_enable()</div><div class='add'>+ */</div><div class='add'>+static u32 mt2063_get_dnc_output_enable(struct mt2063_state *state,</div><div class='add'>+					enum MT2063_DNC_Output_Enable *pValue)</div><div class='add'>+{</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	if ((state-&gt;reg[MT2063_REG_DNC_GAIN] &amp; 0x03) == 0x03) {	/* if DNC1 is off */</div><div class='add'>+		if ((state-&gt;reg[MT2063_REG_VGA_GAIN] &amp; 0x03) == 0x03)	/* if DNC2 is off */</div><div class='add'>+			*pValue = MT2063_DNC_NONE;</div><div class='add'>+		else</div><div class='add'>+			*pValue = MT2063_DNC_2;</div><div class='add'>+	} else {	/* DNC1 is on */</div><div class='add'>+		if ((state-&gt;reg[MT2063_REG_VGA_GAIN] &amp; 0x03) == 0x03)	/* if DNC2 is off */</div><div class='add'>+			*pValue = MT2063_DNC_1;</div><div class='add'>+		else</div><div class='add'>+			*pValue = MT2063_DNC_BOTH;</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'>+ * mt2063_set_dnc_output_enable()</div><div class='add'>+ */</div><div class='add'>+static u32 mt2063_set_dnc_output_enable(struct mt2063_state *state,</div><div class='add'>+					enum MT2063_DNC_Output_Enable nValue)</div><div class='add'>+{</div><div class='add'>+	u32 status = 0;	/* Status to be returned        */</div><div class='add'>+	u8 val = 0;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	/* selects, which DNC output is used */</div><div class='add'>+	switch (nValue) {</div><div class='add'>+	case MT2063_DNC_NONE:</div><div class='add'>+		val = (state-&gt;reg[MT2063_REG_DNC_GAIN] &amp; 0xFC) | 0x03;	/* Set DNC1GC=3 */</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_DNC_GAIN] !=</div><div class='add'>+		    val)</div><div class='add'>+			status |=</div><div class='add'>+			    mt2063_setreg(state,</div><div class='add'>+					  MT2063_REG_DNC_GAIN,</div><div class='add'>+					  val);</div><div class='add'>+</div><div class='add'>+		val = (state-&gt;reg[MT2063_REG_VGA_GAIN] &amp; 0xFC) | 0x03;	/* Set DNC2GC=3 */</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_VGA_GAIN] !=</div><div class='add'>+		    val)</div><div class='add'>+			status |=</div><div class='add'>+			    mt2063_setreg(state,</div><div class='add'>+					  MT2063_REG_VGA_GAIN,</div><div class='add'>+					  val);</div><div class='add'>+</div><div class='add'>+		val = (state-&gt;reg[MT2063_REG_RSVD_20] &amp; ~0x40);	/* Set PD2MUX=0 */</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_RSVD_20] !=</div><div class='add'>+		    val)</div><div class='add'>+			status |=</div><div class='add'>+			    mt2063_setreg(state,</div><div class='add'>+					  MT2063_REG_RSVD_20,</div><div class='add'>+					  val);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case MT2063_DNC_1:</div><div class='add'>+		val = (state-&gt;reg[MT2063_REG_DNC_GAIN] &amp; 0xFC) | (DNC1GC[state-&gt;rcvr_mode] &amp; 0x03);	/* Set DNC1GC=x */</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_DNC_GAIN] !=</div><div class='add'>+		    val)</div><div class='add'>+			status |=</div><div class='add'>+			    mt2063_setreg(state,</div><div class='add'>+					  MT2063_REG_DNC_GAIN,</div><div class='add'>+					  val);</div><div class='add'>+</div><div class='add'>+		val = (state-&gt;reg[MT2063_REG_VGA_GAIN] &amp; 0xFC) | 0x03;	/* Set DNC2GC=3 */</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_VGA_GAIN] !=</div><div class='add'>+		    val)</div><div class='add'>+			status |=</div><div class='add'>+			    mt2063_setreg(state,</div><div class='add'>+					  MT2063_REG_VGA_GAIN,</div><div class='add'>+					  val);</div><div class='add'>+</div><div class='add'>+		val = (state-&gt;reg[MT2063_REG_RSVD_20] &amp; ~0x40);	/* Set PD2MUX=0 */</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_RSVD_20] !=</div><div class='add'>+		    val)</div><div class='add'>+			status |=</div><div class='add'>+			    mt2063_setreg(state,</div><div class='add'>+					  MT2063_REG_RSVD_20,</div><div class='add'>+					  val);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case MT2063_DNC_2:</div><div class='add'>+		val = (state-&gt;reg[MT2063_REG_DNC_GAIN] &amp; 0xFC) | 0x03;	/* Set DNC1GC=3 */</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_DNC_GAIN] !=</div><div class='add'>+		    val)</div><div class='add'>+			status |=</div><div class='add'>+			    mt2063_setreg(state,</div><div class='add'>+					  MT2063_REG_DNC_GAIN,</div><div class='add'>+					  val);</div><div class='add'>+</div><div class='add'>+		val = (state-&gt;reg[MT2063_REG_VGA_GAIN] &amp; 0xFC) | (DNC2GC[state-&gt;rcvr_mode] &amp; 0x03);	/* Set DNC2GC=x */</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_VGA_GAIN] !=</div><div class='add'>+		    val)</div><div class='add'>+			status |=</div><div class='add'>+			    mt2063_setreg(state,</div><div class='add'>+					  MT2063_REG_VGA_GAIN,</div><div class='add'>+					  val);</div><div class='add'>+</div><div class='add'>+		val = (state-&gt;reg[MT2063_REG_RSVD_20] | 0x40);	/* Set PD2MUX=1 */</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_RSVD_20] !=</div><div class='add'>+		    val)</div><div class='add'>+			status |=</div><div class='add'>+			    mt2063_setreg(state,</div><div class='add'>+					  MT2063_REG_RSVD_20,</div><div class='add'>+					  val);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case MT2063_DNC_BOTH:</div><div class='add'>+		val = (state-&gt;reg[MT2063_REG_DNC_GAIN] &amp; 0xFC) | (DNC1GC[state-&gt;rcvr_mode] &amp; 0x03);	/* Set DNC1GC=x */</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_DNC_GAIN] !=</div><div class='add'>+		    val)</div><div class='add'>+			status |=</div><div class='add'>+			    mt2063_setreg(state,</div><div class='add'>+					  MT2063_REG_DNC_GAIN,</div><div class='add'>+					  val);</div><div class='add'>+</div><div class='add'>+		val = (state-&gt;reg[MT2063_REG_VGA_GAIN] &amp; 0xFC) | (DNC2GC[state-&gt;rcvr_mode] &amp; 0x03);	/* Set DNC2GC=x */</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_VGA_GAIN] !=</div><div class='add'>+		    val)</div><div class='add'>+			status |=</div><div class='add'>+			    mt2063_setreg(state,</div><div class='add'>+					  MT2063_REG_VGA_GAIN,</div><div class='add'>+					  val);</div><div class='add'>+</div><div class='add'>+		val = (state-&gt;reg[MT2063_REG_RSVD_20] | 0x40);	/* Set PD2MUX=1 */</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_RSVD_20] !=</div><div class='add'>+		    val)</div><div class='add'>+			status |=</div><div class='add'>+			    mt2063_setreg(state,</div><div class='add'>+					  MT2063_REG_RSVD_20,</div><div class='add'>+					  val);</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 status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MT2063_SetReceiverMode() - Set the MT2063 receiver mode, according with</div><div class='add'>+ * 			      the selected enum mt2063_delivery_sys type.</div><div class='add'>+ *</div><div class='add'>+ *  (DNC1GC &amp; DNC2GC are the values, which are used, when the specific</div><div class='add'>+ *   DNC Output is selected, the other is always off)</div><div class='add'>+ *</div><div class='add'>+ * @state:	ptr to mt2063_state structure</div><div class='add'>+ * @Mode:	desired reciever delivery system</div><div class='add'>+ *</div><div class='add'>+ * Note: Register cache must be valid for it to work</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static u32 MT2063_SetReceiverMode(struct mt2063_state *state,</div><div class='add'>+				  enum mt2063_delivery_sys Mode)</div><div class='add'>+{</div><div class='add'>+	u32 status = 0;	/* Status to be returned        */</div><div class='add'>+	u8 val;</div><div class='add'>+	u32 longval;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	if (Mode &gt;= MT2063_NUM_RCVR_MODES)</div><div class='add'>+		status = -ERANGE;</div><div class='add'>+</div><div class='add'>+	/* RFAGCen */</div><div class='add'>+	if (status &gt;= 0) {</div><div class='add'>+		val =</div><div class='add'>+		    (state-&gt;</div><div class='add'>+		     reg[MT2063_REG_PD1_TGT] &amp; (u8) ~0x40) | (RFAGCEN[Mode]</div><div class='add'>+								   ? 0x40 :</div><div class='add'>+								   0x00);</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_PD1_TGT] != val)</div><div class='add'>+			status |= mt2063_setreg(state, MT2063_REG_PD1_TGT, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* LNARin */</div><div class='add'>+	if (status &gt;= 0) {</div><div class='add'>+		u8 val = (state-&gt;reg[MT2063_REG_CTRL_2C] &amp; (u8) ~0x03) |</div><div class='add'>+			 (LNARIN[Mode] &amp; 0x03);</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_CTRL_2C] != val)</div><div class='add'>+			status |= mt2063_setreg(state, MT2063_REG_CTRL_2C, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FIFFQEN and FIFFQ */</div><div class='add'>+	if (status &gt;= 0) {</div><div class='add'>+		val =</div><div class='add'>+		    (state-&gt;</div><div class='add'>+		     reg[MT2063_REG_FIFF_CTRL2] &amp; (u8) ~0xF0) |</div><div class='add'>+		    (FIFFQEN[Mode] &lt;&lt; 7) | (FIFFQ[Mode] &lt;&lt; 4);</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_FIFF_CTRL2] != val) {</div><div class='add'>+			status |=</div><div class='add'>+			    mt2063_setreg(state, MT2063_REG_FIFF_CTRL2, val);</div><div class='add'>+			/* trigger FIFF calibration, needed after changing FIFFQ */</div><div class='add'>+			val =</div><div class='add'>+			    (state-&gt;reg[MT2063_REG_FIFF_CTRL] | (u8) 0x01);</div><div class='add'>+			status |=</div><div class='add'>+			    mt2063_setreg(state, MT2063_REG_FIFF_CTRL, val);</div><div class='add'>+			val =</div><div class='add'>+			    (state-&gt;</div><div class='add'>+			     reg[MT2063_REG_FIFF_CTRL] &amp; (u8) ~0x01);</div><div class='add'>+			status |=</div><div class='add'>+			    mt2063_setreg(state, MT2063_REG_FIFF_CTRL, val);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* DNC1GC &amp; DNC2GC */</div><div class='add'>+	status |= mt2063_get_dnc_output_enable(state, &amp;longval);</div><div class='add'>+	status |= mt2063_set_dnc_output_enable(state, longval);</div><div class='add'>+</div><div class='add'>+	/* acLNAmax */</div><div class='add'>+	if (status &gt;= 0) {</div><div class='add'>+		u8 val = (state-&gt;reg[MT2063_REG_LNA_OV] &amp; (u8) ~0x1F) |</div><div class='add'>+			 (ACLNAMAX[Mode] &amp; 0x1F);</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_LNA_OV] != val)</div><div class='add'>+			status |= mt2063_setreg(state, MT2063_REG_LNA_OV, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* LNATGT */</div><div class='add'>+	if (status &gt;= 0) {</div><div class='add'>+		u8 val = (state-&gt;reg[MT2063_REG_LNA_TGT] &amp; (u8) ~0x3F) |</div><div class='add'>+			 (LNATGT[Mode] &amp; 0x3F);</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_LNA_TGT] != val)</div><div class='add'>+			status |= mt2063_setreg(state, MT2063_REG_LNA_TGT, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ACRF */</div><div class='add'>+	if (status &gt;= 0) {</div><div class='add'>+		u8 val = (state-&gt;reg[MT2063_REG_RF_OV] &amp; (u8) ~0x1F) |</div><div class='add'>+			 (ACRFMAX[Mode] &amp; 0x1F);</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_RF_OV] != val)</div><div class='add'>+			status |= mt2063_setreg(state, MT2063_REG_RF_OV, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* PD1TGT */</div><div class='add'>+	if (status &gt;= 0) {</div><div class='add'>+		u8 val = (state-&gt;reg[MT2063_REG_PD1_TGT] &amp; (u8) ~0x3F) |</div><div class='add'>+			 (PD1TGT[Mode] &amp; 0x3F);</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_PD1_TGT] != val)</div><div class='add'>+			status |= mt2063_setreg(state, MT2063_REG_PD1_TGT, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FIFATN */</div><div class='add'>+	if (status &gt;= 0) {</div><div class='add'>+		u8 val = ACFIFMAX[Mode];</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_PART_REV] != MT2063_B3 &amp;&amp; val &gt; 5)</div><div class='add'>+			val = 5;</div><div class='add'>+		val = (state-&gt;reg[MT2063_REG_FIF_OV] &amp; (u8) ~0x1F) |</div><div class='add'>+		      (val &amp; 0x1F);</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_FIF_OV] != val)</div><div class='add'>+			status |= mt2063_setreg(state, MT2063_REG_FIF_OV, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* PD2TGT */</div><div class='add'>+	if (status &gt;= 0) {</div><div class='add'>+		u8 val = (state-&gt;reg[MT2063_REG_PD2_TGT] &amp; (u8) ~0x3F) |</div><div class='add'>+		    (PD2TGT[Mode] &amp; 0x3F);</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_PD2_TGT] != val)</div><div class='add'>+			status |= mt2063_setreg(state, MT2063_REG_PD2_TGT, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ignore ATN Overload */</div><div class='add'>+	if (status &gt;= 0) {</div><div class='add'>+		val = (state-&gt;reg[MT2063_REG_LNA_TGT] &amp; (u8) ~0x80) |</div><div class='add'>+		      (RFOVDIS[Mode] ? 0x80 : 0x00);</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_LNA_TGT] != val)</div><div class='add'>+			status |= mt2063_setreg(state, MT2063_REG_LNA_TGT, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ignore FIF Overload */</div><div class='add'>+	if (status &gt;= 0) {</div><div class='add'>+		val = (state-&gt;reg[MT2063_REG_PD1_TGT] &amp; (u8) ~0x80) |</div><div class='add'>+		      (FIFOVDIS[Mode] ? 0x80 : 0x00);</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_PD1_TGT] != val)</div><div class='add'>+			status |= mt2063_setreg(state, MT2063_REG_PD1_TGT, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status &gt;= 0) {</div><div class='add'>+		state-&gt;rcvr_mode = Mode;</div><div class='add'>+		dprintk(1, "mt2063 mode changed to %s\n",</div><div class='add'>+			mt2063_mode_name[state-&gt;rcvr_mode]);</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'>+ * MT2063_ClearPowerMaskBits () - Clears the power-down mask bits for various</div><div class='add'>+ *				  sections of the MT2063</div><div class='add'>+ *</div><div class='add'>+ * @Bits:		Mask bits to be cleared.</div><div class='add'>+ *</div><div class='add'>+ * See definition of MT2063_Mask_Bits type for description</div><div class='add'>+ * of each of the power bits.</div><div class='add'>+ */</div><div class='add'>+static u32 MT2063_ClearPowerMaskBits(struct mt2063_state *state,</div><div class='add'>+				     enum MT2063_Mask_Bits Bits)</div><div class='add'>+{</div><div class='add'>+	u32 status = 0;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+	Bits = (enum MT2063_Mask_Bits)(Bits &amp; MT2063_ALL_SD);	/* Only valid bits for this tuner */</div><div class='add'>+	if ((Bits &amp; 0xFF00) != 0) {</div><div class='add'>+		state-&gt;reg[MT2063_REG_PWR_2] &amp;= ~(u8) (Bits &gt;&gt; 8);</div><div class='add'>+		status |=</div><div class='add'>+		    mt2063_write(state,</div><div class='add'>+				    MT2063_REG_PWR_2,</div><div class='add'>+				    &amp;state-&gt;reg[MT2063_REG_PWR_2], 1);</div><div class='add'>+	}</div><div class='add'>+	if ((Bits &amp; 0xFF) != 0) {</div><div class='add'>+		state-&gt;reg[MT2063_REG_PWR_1] &amp;= ~(u8) (Bits &amp; 0xFF);</div><div class='add'>+		status |=</div><div class='add'>+		    mt2063_write(state,</div><div class='add'>+				    MT2063_REG_PWR_1,</div><div class='add'>+				    &amp;state-&gt;reg[MT2063_REG_PWR_1], 1);</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'>+ * MT2063_SoftwareShutdown() - Enables or disables software shutdown function.</div><div class='add'>+ *			       When Shutdown is 1, any section whose power</div><div class='add'>+ *			       mask is set will be shutdown.</div><div class='add'>+ */</div><div class='add'>+static u32 MT2063_SoftwareShutdown(struct mt2063_state *state, u8 Shutdown)</div><div class='add'>+{</div><div class='add'>+	u32 status;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+	if (Shutdown == 1)</div><div class='add'>+		state-&gt;reg[MT2063_REG_PWR_1] |= 0x04;</div><div class='add'>+	else</div><div class='add'>+		state-&gt;reg[MT2063_REG_PWR_1] &amp;= ~0x04;</div><div class='add'>+</div><div class='add'>+	status = mt2063_write(state,</div><div class='add'>+			    MT2063_REG_PWR_1,</div><div class='add'>+			    &amp;state-&gt;reg[MT2063_REG_PWR_1], 1);</div><div class='add'>+</div><div class='add'>+	if (Shutdown != 1) {</div><div class='add'>+		state-&gt;reg[MT2063_REG_BYP_CTRL] =</div><div class='add'>+		    (state-&gt;reg[MT2063_REG_BYP_CTRL] &amp; 0x9F) | 0x40;</div><div class='add'>+		status |=</div><div class='add'>+		    mt2063_write(state,</div><div class='add'>+				    MT2063_REG_BYP_CTRL,</div><div class='add'>+				    &amp;state-&gt;reg[MT2063_REG_BYP_CTRL],</div><div class='add'>+				    1);</div><div class='add'>+		state-&gt;reg[MT2063_REG_BYP_CTRL] =</div><div class='add'>+		    (state-&gt;reg[MT2063_REG_BYP_CTRL] &amp; 0x9F);</div><div class='add'>+		status |=</div><div class='add'>+		    mt2063_write(state,</div><div class='add'>+				    MT2063_REG_BYP_CTRL,</div><div class='add'>+				    &amp;state-&gt;reg[MT2063_REG_BYP_CTRL],</div><div class='add'>+				    1);</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 u32 MT2063_Round_fLO(u32 f_LO, u32 f_LO_Step, u32 f_ref)</div><div class='add'>+{</div><div class='add'>+	return f_ref * (f_LO / f_ref)</div><div class='add'>+	    + f_LO_Step * (((f_LO % f_ref) + (f_LO_Step / 2)) / f_LO_Step);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fLO_FractionalTerm() - Calculates the portion contributed by FracN / denom.</div><div class='add'>+ *                        This function preserves maximum precision without</div><div class='add'>+ *                        risk of overflow.  It accurately calculates</div><div class='add'>+ *                        f_ref * num / denom to within 1 HZ with fixed math.</div><div class='add'>+ *</div><div class='add'>+ * @num :	Fractional portion of the multiplier</div><div class='add'>+ * @denom:	denominator portion of the ratio</div><div class='add'>+ * @f_Ref:	SRO frequency.</div><div class='add'>+ *</div><div class='add'>+ * This calculation handles f_ref as two separate 14-bit fields.</div><div class='add'>+ * Therefore, a maximum value of 2^28-1 may safely be used for f_ref.</div><div class='add'>+ * This is the genesis of the magic number "14" and the magic mask value of</div><div class='add'>+ * 0x03FFF.</div><div class='add'>+ *</div><div class='add'>+ * This routine successfully handles denom values up to and including 2^18.</div><div class='add'>+ *  Returns:        f_ref * num / denom</div><div class='add'>+ */</div><div class='add'>+static u32 MT2063_fLO_FractionalTerm(u32 f_ref, u32 num, u32 denom)</div><div class='add'>+{</div><div class='add'>+	u32 t1 = (f_ref &gt;&gt; 14) * num;</div><div class='add'>+	u32 term1 = t1 / denom;</div><div class='add'>+	u32 loss = t1 % denom;</div><div class='add'>+	u32 term2 =</div><div class='add'>+	    (((f_ref &amp; 0x00003FFF) * num + (loss &lt;&lt; 14)) + (denom / 2)) / denom;</div><div class='add'>+	return (term1 &lt;&lt; 14) + term2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CalcLO1Mult()- Calculates Integer divider value and the numerator</div><div class='add'>+ *                value for a FracN PLL.</div><div class='add'>+ *</div><div class='add'>+ *                This function assumes that the f_LO and f_Ref are</div><div class='add'>+ *                evenly divisible by f_LO_Step.</div><div class='add'>+ *</div><div class='add'>+ * @Div:	OUTPUT: Whole number portion of the multiplier</div><div class='add'>+ * @FracN:	OUTPUT: Fractional portion of the multiplier</div><div class='add'>+ * @f_LO:	desired LO frequency.</div><div class='add'>+ * @f_LO_Step:	Minimum step size for the LO (in Hz).</div><div class='add'>+ * @f_Ref:	SRO frequency.</div><div class='add'>+ * @f_Avoid:	Range of PLL frequencies to avoid near integer multiples</div><div class='add'>+ *		of f_Ref (in Hz).</div><div class='add'>+ *</div><div class='add'>+ * Returns:        Recalculated LO frequency.</div><div class='add'>+ */</div><div class='add'>+static u32 MT2063_CalcLO1Mult(u32 *Div,</div><div class='add'>+			      u32 *FracN,</div><div class='add'>+			      u32 f_LO,</div><div class='add'>+			      u32 f_LO_Step, u32 f_Ref)</div><div class='add'>+{</div><div class='add'>+	/*  Calculate the whole number portion of the divider */</div><div class='add'>+	*Div = f_LO / f_Ref;</div><div class='add'>+</div><div class='add'>+	/*  Calculate the numerator value (round to nearest f_LO_Step) */</div><div class='add'>+	*FracN =</div><div class='add'>+	    (64 * (((f_LO % f_Ref) + (f_LO_Step / 2)) / f_LO_Step) +</div><div class='add'>+	     (f_Ref / f_LO_Step / 2)) / (f_Ref / f_LO_Step);</div><div class='add'>+</div><div class='add'>+	return (f_Ref * (*Div)) + MT2063_fLO_FractionalTerm(f_Ref, *FracN, 64);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * CalcLO2Mult() - Calculates Integer divider value and the numerator</div><div class='add'>+ *                 value for a FracN PLL.</div><div class='add'>+ *</div><div class='add'>+ *                  This function assumes that the f_LO and f_Ref are</div><div class='add'>+ *                  evenly divisible by f_LO_Step.</div><div class='add'>+ *</div><div class='add'>+ * @Div:	OUTPUT: Whole number portion of the multiplier</div><div class='add'>+ * @FracN:	OUTPUT: Fractional portion of the multiplier</div><div class='add'>+ * @f_LO:	desired LO frequency.</div><div class='add'>+ * @f_LO_Step:	Minimum step size for the LO (in Hz).</div><div class='add'>+ * @f_Ref:	SRO frequency.</div><div class='add'>+ * @f_Avoid:	Range of PLL frequencies to avoid near</div><div class='add'>+ *		integer multiples of f_Ref (in Hz).</div><div class='add'>+ *</div><div class='add'>+ * Returns: Recalculated LO frequency.</div><div class='add'>+ */</div><div class='add'>+static u32 MT2063_CalcLO2Mult(u32 *Div,</div><div class='add'>+			      u32 *FracN,</div><div class='add'>+			      u32 f_LO,</div><div class='add'>+			      u32 f_LO_Step, u32 f_Ref)</div><div class='add'>+{</div><div class='add'>+	/*  Calculate the whole number portion of the divider */</div><div class='add'>+	*Div = f_LO / f_Ref;</div><div class='add'>+</div><div class='add'>+	/*  Calculate the numerator value (round to nearest f_LO_Step) */</div><div class='add'>+	*FracN =</div><div class='add'>+	    (8191 * (((f_LO % f_Ref) + (f_LO_Step / 2)) / f_LO_Step) +</div><div class='add'>+	     (f_Ref / f_LO_Step / 2)) / (f_Ref / f_LO_Step);</div><div class='add'>+</div><div class='add'>+	return (f_Ref * (*Div)) + MT2063_fLO_FractionalTerm(f_Ref, *FracN,</div><div class='add'>+							    8191);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FindClearTuneFilter() - Calculate the corrrect ClearTune filter to be</div><div class='add'>+ *			   used for a given input frequency.</div><div class='add'>+ *</div><div class='add'>+ * @state:	ptr to tuner data structure</div><div class='add'>+ * @f_in:	RF input center frequency (in Hz).</div><div class='add'>+ *</div><div class='add'>+ * Returns: ClearTune filter number (0-31)</div><div class='add'>+ */</div><div class='add'>+static u32 FindClearTuneFilter(struct mt2063_state *state, u32 f_in)</div><div class='add'>+{</div><div class='add'>+	u32 RFBand;</div><div class='add'>+	u32 idx;		/*  index loop                      */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 **  Find RF Band setting</div><div class='add'>+	 */</div><div class='add'>+	RFBand = 31;		/*  def when f_in &gt; all    */</div><div class='add'>+	for (idx = 0; idx &lt; 31; ++idx) {</div><div class='add'>+		if (state-&gt;CTFiltMax[idx] &gt;= f_in) {</div><div class='add'>+			RFBand = idx;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return RFBand;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MT2063_Tune() - Change the tuner's tuned frequency to RFin.</div><div class='add'>+ */</div><div class='add'>+static u32 MT2063_Tune(struct mt2063_state *state, u32 f_in)</div><div class='add'>+{				/* RF input center frequency   */</div><div class='add'>+</div><div class='add'>+	u32 status = 0;</div><div class='add'>+	u32 LO1;		/*  1st LO register value           */</div><div class='add'>+	u32 Num1;		/*  Numerator for LO1 reg. value    */</div><div class='add'>+	u32 f_IF1;		/*  1st IF requested                */</div><div class='add'>+	u32 LO2;		/*  2nd LO register value           */</div><div class='add'>+	u32 Num2;		/*  Numerator for LO2 reg. value    */</div><div class='add'>+	u32 ofLO1, ofLO2;	/*  last time's LO frequencies      */</div><div class='add'>+	u8 fiffc = 0x80;	/*  FIFF center freq from tuner     */</div><div class='add'>+	u32 fiffof;		/*  Offset from FIFF center freq    */</div><div class='add'>+	const u8 LO1LK = 0x80;	/*  Mask for LO1 Lock bit           */</div><div class='add'>+	u8 LO2LK = 0x08;	/*  Mask for LO2 Lock bit           */</div><div class='add'>+	u8 val;</div><div class='add'>+	u32 RFBand;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+	/*  Check the input and output frequency ranges                   */</div><div class='add'>+	if ((f_in &lt; MT2063_MIN_FIN_FREQ) || (f_in &gt; MT2063_MAX_FIN_FREQ))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((state-&gt;AS_Data.f_out &lt; MT2063_MIN_FOUT_FREQ)</div><div class='add'>+	    || (state-&gt;AS_Data.f_out &gt; MT2063_MAX_FOUT_FREQ))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Save original LO1 and LO2 register values</div><div class='add'>+	 */</div><div class='add'>+	ofLO1 = state-&gt;AS_Data.f_LO1;</div><div class='add'>+	ofLO2 = state-&gt;AS_Data.f_LO2; </div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Find and set RF Band setting</div><div class='add'>+	 */</div><div class='add'>+	if (state-&gt;ctfilt_sw == 1) {</div><div class='add'>+		val = (state-&gt;reg[MT2063_REG_CTUNE_CTRL] | 0x08);</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_CTUNE_CTRL] != val) {</div><div class='add'>+			status |=</div><div class='add'>+			    mt2063_setreg(state, MT2063_REG_CTUNE_CTRL, val);</div><div class='add'>+		}</div><div class='add'>+		val = state-&gt;reg[MT2063_REG_CTUNE_OV];</div><div class='add'>+		RFBand = FindClearTuneFilter(state, f_in);</div><div class='add'>+		state-&gt;reg[MT2063_REG_CTUNE_OV] =</div><div class='add'>+		    (u8) ((state-&gt;reg[MT2063_REG_CTUNE_OV] &amp; ~0x1F)</div><div class='add'>+			      | RFBand);</div><div class='add'>+		if (state-&gt;reg[MT2063_REG_CTUNE_OV] != val) {</div><div class='add'>+			status |=</div><div class='add'>+			    mt2063_setreg(state, MT2063_REG_CTUNE_OV, val);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Read the FIFF Center Frequency from the tuner</div><div class='add'>+	 */</div><div class='add'>+	if (status &gt;= 0) {</div><div class='add'>+		status |=</div><div class='add'>+		    mt2063_read(state,</div><div class='add'>+				   MT2063_REG_FIFFC,</div><div class='add'>+				   &amp;state-&gt;reg[MT2063_REG_FIFFC], 1);</div><div class='add'>+		fiffc = state-&gt;reg[MT2063_REG_FIFFC];</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Assign in the requested values</div><div class='add'>+	 */</div><div class='add'>+	state-&gt;AS_Data.f_in = f_in;</div><div class='add'>+	/*  Request a 1st IF such that LO1 is on a step size */</div><div class='add'>+	state-&gt;AS_Data.f_if1_Request =</div><div class='add'>+	    MT2063_Round_fLO(state-&gt;AS_Data.f_if1_Request + f_in,</div><div class='add'>+			     state-&gt;AS_Data.f_LO1_Step,</div><div class='add'>+			     state-&gt;AS_Data.f_ref) - f_in;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Calculate frequency settings.  f_IF1_FREQ + f_in is the</div><div class='add'>+	 * desired LO1 frequency</div><div class='add'>+	 */</div><div class='add'>+	MT2063_ResetExclZones(&amp;state-&gt;AS_Data);</div><div class='add'>+</div><div class='add'>+	f_IF1 = MT2063_ChooseFirstIF(&amp;state-&gt;AS_Data);</div><div class='add'>+</div><div class='add'>+	state-&gt;AS_Data.f_LO1 =</div><div class='add'>+	    MT2063_Round_fLO(f_IF1 + f_in, state-&gt;AS_Data.f_LO1_Step,</div><div class='add'>+			     state-&gt;AS_Data.f_ref);</div><div class='add'>+</div><div class='add'>+	state-&gt;AS_Data.f_LO2 =</div><div class='add'>+	    MT2063_Round_fLO(state-&gt;AS_Data.f_LO1 - state-&gt;AS_Data.f_out - f_in,</div><div class='add'>+			     state-&gt;AS_Data.f_LO2_Step, state-&gt;AS_Data.f_ref);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check for any LO spurs in the output bandwidth and adjust</div><div class='add'>+	 * the LO settings to avoid them if needed</div><div class='add'>+	 */</div><div class='add'>+	status |= MT2063_AvoidSpurs(&amp;state-&gt;AS_Data);</div><div class='add'>+	/*</div><div class='add'>+	 * MT_AvoidSpurs spurs may have changed the LO1 &amp; LO2 values.</div><div class='add'>+	 * Recalculate the LO frequencies and the values to be placed</div><div class='add'>+	 * in the tuning registers.</div><div class='add'>+	 */</div><div class='add'>+	state-&gt;AS_Data.f_LO1 =</div><div class='add'>+	    MT2063_CalcLO1Mult(&amp;LO1, &amp;Num1, state-&gt;AS_Data.f_LO1,</div><div class='add'>+			       state-&gt;AS_Data.f_LO1_Step, state-&gt;AS_Data.f_ref);</div><div class='add'>+	state-&gt;AS_Data.f_LO2 =</div><div class='add'>+	    MT2063_Round_fLO(state-&gt;AS_Data.f_LO1 - state-&gt;AS_Data.f_out - f_in,</div><div class='add'>+			     state-&gt;AS_Data.f_LO2_Step, state-&gt;AS_Data.f_ref);</div><div class='add'>+	state-&gt;AS_Data.f_LO2 =</div><div class='add'>+	    MT2063_CalcLO2Mult(&amp;LO2, &amp;Num2, state-&gt;AS_Data.f_LO2,</div><div class='add'>+			       state-&gt;AS_Data.f_LO2_Step, state-&gt;AS_Data.f_ref);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *  Check the upconverter and downconverter frequency ranges</div><div class='add'>+	 */</div><div class='add'>+	if ((state-&gt;AS_Data.f_LO1 &lt; MT2063_MIN_UPC_FREQ)</div><div class='add'>+	    || (state-&gt;AS_Data.f_LO1 &gt; MT2063_MAX_UPC_FREQ))</div><div class='add'>+		status |= MT2063_UPC_RANGE;</div><div class='add'>+	if ((state-&gt;AS_Data.f_LO2 &lt; MT2063_MIN_DNC_FREQ)</div><div class='add'>+	    || (state-&gt;AS_Data.f_LO2 &gt; MT2063_MAX_DNC_FREQ))</div><div class='add'>+		status |= MT2063_DNC_RANGE;</div><div class='add'>+	/*  LO2 Lock bit was in a different place for B0 version  */</div><div class='add'>+	if (state-&gt;tuner_id == MT2063_B0)</div><div class='add'>+		LO2LK = 0x40;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *  If we have the same LO frequencies and we're already locked,</div><div class='add'>+	 *  then skip re-programming the LO registers.</div><div class='add'>+	 */</div><div class='add'>+	if ((ofLO1 != state-&gt;AS_Data.f_LO1)</div><div class='add'>+	    || (ofLO2 != state-&gt;AS_Data.f_LO2)</div><div class='add'>+	    || ((state-&gt;reg[MT2063_REG_LO_STATUS] &amp; (LO1LK | LO2LK)) !=</div><div class='add'>+		(LO1LK | LO2LK))) {</div><div class='add'>+		/*</div><div class='add'>+		 * Calculate the FIFFOF register value</div><div class='add'>+		 *</div><div class='add'>+		 *           IF1_Actual</div><div class='add'>+		 * FIFFOF = ------------ - 8 * FIFFC - 4992</div><div class='add'>+		 *            f_ref/64</div><div class='add'>+		 */</div><div class='add'>+		fiffof =</div><div class='add'>+		    (state-&gt;AS_Data.f_LO1 -</div><div class='add'>+		     f_in) / (state-&gt;AS_Data.f_ref / 64) - 8 * (u32) fiffc -</div><div class='add'>+		    4992;</div><div class='add'>+		if (fiffof &gt; 0xFF)</div><div class='add'>+			fiffof = 0xFF;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Place all of the calculated values into the local tuner</div><div class='add'>+		 * register fields.</div><div class='add'>+		 */</div><div class='add'>+		if (status &gt;= 0) {</div><div class='add'>+			state-&gt;reg[MT2063_REG_LO1CQ_1] = (u8) (LO1 &amp; 0xFF);	/* DIV1q */</div><div class='add'>+			state-&gt;reg[MT2063_REG_LO1CQ_2] = (u8) (Num1 &amp; 0x3F);	/* NUM1q */</div><div class='add'>+			state-&gt;reg[MT2063_REG_LO2CQ_1] = (u8) (((LO2 &amp; 0x7F) &lt;&lt; 1)	/* DIV2q */</div><div class='add'>+								   |(Num2 &gt;&gt; 12));	/* NUM2q (hi) */</div><div class='add'>+			state-&gt;reg[MT2063_REG_LO2CQ_2] = (u8) ((Num2 &amp; 0x0FF0) &gt;&gt; 4);	/* NUM2q (mid) */</div><div class='add'>+			state-&gt;reg[MT2063_REG_LO2CQ_3] = (u8) (0xE0 | (Num2 &amp; 0x000F));	/* NUM2q (lo) */</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Now write out the computed register values</div><div class='add'>+			 * IMPORTANT: There is a required order for writing</div><div class='add'>+			 *            (0x05 must follow all the others).</div><div class='add'>+			 */</div><div class='add'>+			status |= mt2063_write(state, MT2063_REG_LO1CQ_1, &amp;state-&gt;reg[MT2063_REG_LO1CQ_1], 5);	/* 0x01 - 0x05 */</div><div class='add'>+			if (state-&gt;tuner_id == MT2063_B0) {</div><div class='add'>+				/* Re-write the one-shot bits to trigger the tune operation */</div><div class='add'>+				status |= mt2063_write(state, MT2063_REG_LO2CQ_3, &amp;state-&gt;reg[MT2063_REG_LO2CQ_3], 1);	/* 0x05 */</div><div class='add'>+			}</div><div class='add'>+			/* Write out the FIFF offset only if it's changing */</div><div class='add'>+			if (state-&gt;reg[MT2063_REG_FIFF_OFFSET] !=</div><div class='add'>+			    (u8) fiffof) {</div><div class='add'>+				state-&gt;reg[MT2063_REG_FIFF_OFFSET] =</div><div class='add'>+				    (u8) fiffof;</div><div class='add'>+				status |=</div><div class='add'>+				    mt2063_write(state,</div><div class='add'>+						    MT2063_REG_FIFF_OFFSET,</div><div class='add'>+						    &amp;state-&gt;</div><div class='add'>+						    reg[MT2063_REG_FIFF_OFFSET],</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'>+		 * Check for LO's locking</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			return status;</div><div class='add'>+</div><div class='add'>+		status = mt2063_lockStatus(state);</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			return status;</div><div class='add'>+		if (!status)</div><div class='add'>+			return -EINVAL;		/* Couldn't lock */</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If we locked OK, assign calculated data to mt2063_state structure</div><div class='add'>+		 */</div><div class='add'>+		state-&gt;f_IF1_actual = state-&gt;AS_Data.f_LO1 - f_in;</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 const u8 MT2063B0_defaults[] = {</div><div class='add'>+	/* Reg,  Value */</div><div class='add'>+	0x19, 0x05,</div><div class='add'>+	0x1B, 0x1D,</div><div class='add'>+	0x1C, 0x1F,</div><div class='add'>+	0x1D, 0x0F,</div><div class='add'>+	0x1E, 0x3F,</div><div class='add'>+	0x1F, 0x0F,</div><div class='add'>+	0x20, 0x3F,</div><div class='add'>+	0x22, 0x21,</div><div class='add'>+	0x23, 0x3F,</div><div class='add'>+	0x24, 0x20,</div><div class='add'>+	0x25, 0x3F,</div><div class='add'>+	0x27, 0xEE,</div><div class='add'>+	0x2C, 0x27,	/*  bit at 0x20 is cleared below  */</div><div class='add'>+	0x30, 0x03,</div><div class='add'>+	0x2C, 0x07,	/*  bit at 0x20 is cleared here   */</div><div class='add'>+	0x2D, 0x87,</div><div class='add'>+	0x2E, 0xAA,</div><div class='add'>+	0x28, 0xE1,	/*  Set the FIFCrst bit here      */</div><div class='add'>+	0x28, 0xE0,	/*  Clear the FIFCrst bit here    */</div><div class='add'>+	0x00</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* writing 0x05 0xf0 sw-resets all registers, so we write only needed changes */</div><div class='add'>+static const u8 MT2063B1_defaults[] = {</div><div class='add'>+	/* Reg,  Value */</div><div class='add'>+	0x05, 0xF0,</div><div class='add'>+	0x11, 0x10,	/* New Enable AFCsd */</div><div class='add'>+	0x19, 0x05,</div><div class='add'>+	0x1A, 0x6C,</div><div class='add'>+	0x1B, 0x24,</div><div class='add'>+	0x1C, 0x28,</div><div class='add'>+	0x1D, 0x8F,</div><div class='add'>+	0x1E, 0x14,</div><div class='add'>+	0x1F, 0x8F,</div><div class='add'>+	0x20, 0x57,</div><div class='add'>+	0x22, 0x21,	/* New - ver 1.03 */</div><div class='add'>+	0x23, 0x3C,	/* New - ver 1.10 */</div><div class='add'>+	0x24, 0x20,	/* New - ver 1.03 */</div><div class='add'>+	0x2C, 0x24,	/*  bit at 0x20 is cleared below  */</div><div class='add'>+	0x2D, 0x87,	/*  FIFFQ=0  */</div><div class='add'>+	0x2F, 0xF3,</div><div class='add'>+	0x30, 0x0C,	/* New - ver 1.11 */</div><div class='add'>+	0x31, 0x1B,	/* New - ver 1.11 */</div><div class='add'>+	0x2C, 0x04,	/*  bit at 0x20 is cleared here  */</div><div class='add'>+	0x28, 0xE1,	/*  Set the FIFCrst bit here      */</div><div class='add'>+	0x28, 0xE0,	/*  Clear the FIFCrst bit here    */</div><div class='add'>+	0x00</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* writing 0x05 0xf0 sw-resets all registers, so we write only needed changes */</div><div class='add'>+static const u8 MT2063B3_defaults[] = {</div><div class='add'>+	/* Reg,  Value */</div><div class='add'>+	0x05, 0xF0,</div><div class='add'>+	0x19, 0x3D,</div><div class='add'>+	0x2C, 0x24,	/*  bit at 0x20 is cleared below  */</div><div class='add'>+	0x2C, 0x04,	/*  bit at 0x20 is cleared here  */</div><div class='add'>+	0x28, 0xE1,	/*  Set the FIFCrst bit here      */</div><div class='add'>+	0x28, 0xE0,	/*  Clear the FIFCrst bit here    */</div><div class='add'>+	0x00</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mt2063_init(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	u32 status;</div><div class='add'>+	struct mt2063_state *state = fe-&gt;tuner_priv;</div><div class='add'>+	u8 all_resets = 0xF0;	/* reset/load bits */</div><div class='add'>+	const u8 *def = NULL;</div><div class='add'>+	char *step;</div><div class='add'>+	u32 FCRUN;</div><div class='add'>+	s32 maxReads;</div><div class='add'>+	u32 fcu_osc;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	state-&gt;rcvr_mode = MT2063_CABLE_QAM;</div><div class='add'>+</div><div class='add'>+	/*  Read the Part/Rev code from the tuner */</div><div class='add'>+	status = mt2063_read(state, MT2063_REG_PART_REV,</div><div class='add'>+			     &amp;state-&gt;reg[MT2063_REG_PART_REV], 1);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		printk(KERN_ERR "Can't read mt2063 part ID\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check the part/rev code */</div><div class='add'>+	switch (state-&gt;reg[MT2063_REG_PART_REV]) {</div><div class='add'>+	case MT2063_B0:</div><div class='add'>+		step = "B0";</div><div class='add'>+		break;</div><div class='add'>+	case MT2063_B1:</div><div class='add'>+		step = "B1";</div><div class='add'>+		break;</div><div class='add'>+	case MT2063_B2:</div><div class='add'>+		step = "B2";</div><div class='add'>+		break;</div><div class='add'>+	case MT2063_B3:</div><div class='add'>+		step = "B3";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "mt2063: Unknown mt2063 device ID (0x%02x)\n",</div><div class='add'>+		       state-&gt;reg[MT2063_REG_PART_REV]);</div><div class='add'>+		return -ENODEV;	/*  Wrong tuner Part/Rev code */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*  Check the 2nd byte of the Part/Rev code from the tuner */</div><div class='add'>+	status = mt2063_read(state, MT2063_REG_RSVD_3B,</div><div class='add'>+			     &amp;state-&gt;reg[MT2063_REG_RSVD_3B], 1);</div><div class='add'>+</div><div class='add'>+	/* b7 != 0 ==&gt; NOT MT2063 */</div><div class='add'>+	if (status &lt; 0 || ((state-&gt;reg[MT2063_REG_RSVD_3B] &amp; 0x80) != 0x00)) {</div><div class='add'>+		printk(KERN_ERR "mt2063: Unknown part ID (0x%02x%02x)\n",</div><div class='add'>+		       state-&gt;reg[MT2063_REG_PART_REV],</div><div class='add'>+		       state-&gt;reg[MT2063_REG_RSVD_3B]);</div><div class='add'>+		return -ENODEV;	/*  Wrong tuner Part/Rev code */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "mt2063: detected a mt2063 %s\n", step);</div><div class='add'>+</div><div class='add'>+	/*  Reset the tuner  */</div><div class='add'>+	status = mt2063_write(state, MT2063_REG_LO2CQ_3, &amp;all_resets, 1);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	/* change all of the default values that vary from the HW reset values */</div><div class='add'>+	/*  def = (state-&gt;reg[PART_REV] == MT2063_B0) ? MT2063B0_defaults : MT2063B1_defaults; */</div><div class='add'>+	switch (state-&gt;reg[MT2063_REG_PART_REV]) {</div><div class='add'>+	case MT2063_B3:</div><div class='add'>+		def = MT2063B3_defaults;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MT2063_B1:</div><div class='add'>+		def = MT2063B1_defaults;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MT2063_B0:</div><div class='add'>+		def = MT2063B0_defaults;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -ENODEV;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (status &gt;= 0 &amp;&amp; *def) {</div><div class='add'>+		u8 reg = *def++;</div><div class='add'>+		u8 val = *def++;</div><div class='add'>+		status = mt2063_write(state, reg, &amp;val, 1);</div><div class='add'>+	}</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	/*  Wait for FIFF location to complete.  */</div><div class='add'>+	FCRUN = 1;</div><div class='add'>+	maxReads = 10;</div><div class='add'>+	while (status &gt;= 0 &amp;&amp; (FCRUN != 0) &amp;&amp; (maxReads-- &gt; 0)) {</div><div class='add'>+		msleep(2);</div><div class='add'>+		status = mt2063_read(state,</div><div class='add'>+					 MT2063_REG_XO_STATUS,</div><div class='add'>+					 &amp;state-&gt;</div><div class='add'>+					 reg[MT2063_REG_XO_STATUS], 1);</div><div class='add'>+		FCRUN = (state-&gt;reg[MT2063_REG_XO_STATUS] &amp; 0x40) &gt;&gt; 6;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (FCRUN != 0 || status &lt; 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	status = mt2063_read(state,</div><div class='add'>+			   MT2063_REG_FIFFC,</div><div class='add'>+			   &amp;state-&gt;reg[MT2063_REG_FIFFC], 1);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	/* Read back all the registers from the tuner */</div><div class='add'>+	status = mt2063_read(state,</div><div class='add'>+				MT2063_REG_PART_REV,</div><div class='add'>+				state-&gt;reg, MT2063_REG_END_REGS);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	/*  Initialize the tuner state.  */</div><div class='add'>+	state-&gt;tuner_id = state-&gt;reg[MT2063_REG_PART_REV];</div><div class='add'>+	state-&gt;AS_Data.f_ref = MT2063_REF_FREQ;</div><div class='add'>+	state-&gt;AS_Data.f_if1_Center = (state-&gt;AS_Data.f_ref / 8) *</div><div class='add'>+				      ((u32) state-&gt;reg[MT2063_REG_FIFFC] + 640);</div><div class='add'>+	state-&gt;AS_Data.f_if1_bw = MT2063_IF1_BW;</div><div class='add'>+	state-&gt;AS_Data.f_out = 43750000UL;</div><div class='add'>+	state-&gt;AS_Data.f_out_bw = 6750000UL;</div><div class='add'>+	state-&gt;AS_Data.f_zif_bw = MT2063_ZIF_BW;</div><div class='add'>+	state-&gt;AS_Data.f_LO1_Step = state-&gt;AS_Data.f_ref / 64;</div><div class='add'>+	state-&gt;AS_Data.f_LO2_Step = MT2063_TUNE_STEP_SIZE;</div><div class='add'>+	state-&gt;AS_Data.maxH1 = MT2063_MAX_HARMONICS_1;</div><div class='add'>+	state-&gt;AS_Data.maxH2 = MT2063_MAX_HARMONICS_2;</div><div class='add'>+	state-&gt;AS_Data.f_min_LO_Separation = MT2063_MIN_LO_SEP;</div><div class='add'>+	state-&gt;AS_Data.f_if1_Request = state-&gt;AS_Data.f_if1_Center;</div><div class='add'>+	state-&gt;AS_Data.f_LO1 = 2181000000UL;</div><div class='add'>+	state-&gt;AS_Data.f_LO2 = 1486249786UL;</div><div class='add'>+	state-&gt;f_IF1_actual = state-&gt;AS_Data.f_if1_Center;</div><div class='add'>+	state-&gt;AS_Data.f_in = state-&gt;AS_Data.f_LO1 - state-&gt;f_IF1_actual;</div><div class='add'>+	state-&gt;AS_Data.f_LO1_FracN_Avoid = MT2063_LO1_FRACN_AVOID;</div><div class='add'>+	state-&gt;AS_Data.f_LO2_FracN_Avoid = MT2063_LO2_FRACN_AVOID;</div><div class='add'>+	state-&gt;num_regs = MT2063_REG_END_REGS;</div><div class='add'>+	state-&gt;AS_Data.avoidDECT = MT2063_AVOID_BOTH;</div><div class='add'>+	state-&gt;ctfilt_sw = 0;</div><div class='add'>+</div><div class='add'>+	state-&gt;CTFiltMax[0] = 69230000;</div><div class='add'>+	state-&gt;CTFiltMax[1] = 105770000;</div><div class='add'>+	state-&gt;CTFiltMax[2] = 140350000;</div><div class='add'>+	state-&gt;CTFiltMax[3] = 177110000;</div><div class='add'>+	state-&gt;CTFiltMax[4] = 212860000;</div><div class='add'>+	state-&gt;CTFiltMax[5] = 241130000;</div><div class='add'>+	state-&gt;CTFiltMax[6] = 274370000;</div><div class='add'>+	state-&gt;CTFiltMax[7] = 309820000;</div><div class='add'>+	state-&gt;CTFiltMax[8] = 342450000;</div><div class='add'>+	state-&gt;CTFiltMax[9] = 378870000;</div><div class='add'>+	state-&gt;CTFiltMax[10] = 416210000;</div><div class='add'>+	state-&gt;CTFiltMax[11] = 456500000;</div><div class='add'>+	state-&gt;CTFiltMax[12] = 495790000;</div><div class='add'>+	state-&gt;CTFiltMax[13] = 534530000;</div><div class='add'>+	state-&gt;CTFiltMax[14] = 572610000;</div><div class='add'>+	state-&gt;CTFiltMax[15] = 598970000;</div><div class='add'>+	state-&gt;CTFiltMax[16] = 635910000;</div><div class='add'>+	state-&gt;CTFiltMax[17] = 672130000;</div><div class='add'>+	state-&gt;CTFiltMax[18] = 714840000;</div><div class='add'>+	state-&gt;CTFiltMax[19] = 739660000;</div><div class='add'>+	state-&gt;CTFiltMax[20] = 770410000;</div><div class='add'>+	state-&gt;CTFiltMax[21] = 814660000;</div><div class='add'>+	state-&gt;CTFiltMax[22] = 846950000;</div><div class='add'>+	state-&gt;CTFiltMax[23] = 867820000;</div><div class='add'>+	state-&gt;CTFiltMax[24] = 915980000;</div><div class='add'>+	state-&gt;CTFiltMax[25] = 947450000;</div><div class='add'>+	state-&gt;CTFiltMax[26] = 983110000;</div><div class='add'>+	state-&gt;CTFiltMax[27] = 1021630000;</div><div class='add'>+	state-&gt;CTFiltMax[28] = 1061870000;</div><div class='add'>+	state-&gt;CTFiltMax[29] = 1098330000;</div><div class='add'>+	state-&gt;CTFiltMax[30] = 1138990000;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 **   Fetch the FCU osc value and use it and the fRef value to</div><div class='add'>+	 **   scale all of the Band Max values</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	state-&gt;reg[MT2063_REG_CTUNE_CTRL] = 0x0A;</div><div class='add'>+	status = mt2063_write(state, MT2063_REG_CTUNE_CTRL,</div><div class='add'>+			      &amp;state-&gt;reg[MT2063_REG_CTUNE_CTRL], 1);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	/*  Read the ClearTune filter calibration value  */</div><div class='add'>+	status = mt2063_read(state, MT2063_REG_FIFFC,</div><div class='add'>+			     &amp;state-&gt;reg[MT2063_REG_FIFFC], 1);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	fcu_osc = state-&gt;reg[MT2063_REG_FIFFC];</div><div class='add'>+</div><div class='add'>+	state-&gt;reg[MT2063_REG_CTUNE_CTRL] = 0x00;</div><div class='add'>+	status = mt2063_write(state, MT2063_REG_CTUNE_CTRL,</div><div class='add'>+			      &amp;state-&gt;reg[MT2063_REG_CTUNE_CTRL], 1);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	/*  Adjust each of the values in the ClearTune filter cross-over table  */</div><div class='add'>+	for (i = 0; i &lt; 31; i++)</div><div class='add'>+		state-&gt;CTFiltMax[i] = (state-&gt;CTFiltMax[i] / 768) * (fcu_osc + 640);</div><div class='add'>+</div><div class='add'>+	status = MT2063_SoftwareShutdown(state, 1);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+	status = MT2063_ClearPowerMaskBits(state, MT2063_ALL_SD);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	state-&gt;init = 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 mt2063_get_status(struct dvb_frontend *fe, u32 *tuner_status)</div><div class='add'>+{</div><div class='add'>+	struct mt2063_state *state = fe-&gt;tuner_priv;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	if (!state-&gt;init)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	*tuner_status = 0;</div><div class='add'>+	status = mt2063_lockStatus(state);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+	if (status)</div><div class='add'>+		*tuner_status = TUNER_STATUS_LOCKED;</div><div class='add'>+</div><div class='add'>+	dprintk(1, "Tuner status: %d", *tuner_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 mt2063_release(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct mt2063_state *state = fe-&gt;tuner_priv;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	fe-&gt;tuner_priv = NULL;</div><div class='add'>+	kfree(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 mt2063_set_analog_params(struct dvb_frontend *fe,</div><div class='add'>+				    struct analog_parameters *params)</div><div class='add'>+{</div><div class='add'>+	struct mt2063_state *state = fe-&gt;tuner_priv;</div><div class='add'>+	s32 pict_car;</div><div class='add'>+	s32 pict2chanb_vsb;</div><div class='add'>+	s32 ch_bw;</div><div class='add'>+	s32 if_mid;</div><div class='add'>+	s32 rcvr_mode;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	if (!state-&gt;init) {</div><div class='add'>+		status = mt2063_init(fe);</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'>+	switch (params-&gt;mode) {</div><div class='add'>+	case V4L2_TUNER_RADIO:</div><div class='add'>+		pict_car = 38900000;</div><div class='add'>+		ch_bw = 8000000;</div><div class='add'>+		pict2chanb_vsb = -(ch_bw / 2);</div><div class='add'>+		rcvr_mode = MT2063_OFFAIR_ANALOG;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_TUNER_ANALOG_TV:</div><div class='add'>+		rcvr_mode = MT2063_CABLE_ANALOG;</div><div class='add'>+		if (params-&gt;std &amp; ~V4L2_STD_MN) {</div><div class='add'>+			pict_car = 38900000;</div><div class='add'>+			ch_bw = 6000000;</div><div class='add'>+			pict2chanb_vsb = -1250000;</div><div class='add'>+		} else if (params-&gt;std &amp; V4L2_STD_PAL_G) {</div><div class='add'>+			pict_car = 38900000;</div><div class='add'>+			ch_bw = 7000000;</div><div class='add'>+			pict2chanb_vsb = -1250000;</div><div class='add'>+		} else {		/* PAL/SECAM standards */</div><div class='add'>+			pict_car = 38900000;</div><div class='add'>+			ch_bw = 8000000;</div><div class='add'>+			pict2chanb_vsb = -1250000;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if_mid = pict_car - (pict2chanb_vsb + (ch_bw / 2));</div><div class='add'>+</div><div class='add'>+	state-&gt;AS_Data.f_LO2_Step = 125000;	/* FIXME: probably 5000 for FM */</div><div class='add'>+	state-&gt;AS_Data.f_out = if_mid;</div><div class='add'>+	state-&gt;AS_Data.f_out_bw = ch_bw + 750000;</div><div class='add'>+	status = MT2063_SetReceiverMode(state, rcvr_mode);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	dprintk(1, "Tuning to frequency: %d, bandwidth %d, foffset %d\n",</div><div class='add'>+		params-&gt;frequency, ch_bw, pict2chanb_vsb);</div><div class='add'>+</div><div class='add'>+	status = MT2063_Tune(state, (params-&gt;frequency + (pict2chanb_vsb + (ch_bw / 2))));</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	state-&gt;frequency = params-&gt;frequency;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * As defined on EN 300 429, the DVB-C roll-off factor is 0.15.</div><div class='add'>+ * So, the amount of the needed bandwith is given by:</div><div class='add'>+ *	Bw = Symbol_rate * (1 + 0.15)</div><div class='add'>+ * As such, the maximum symbol rate supported by 6 MHz is given by:</div><div class='add'>+ *	max_symbol_rate = 6 MHz / 1.15 = 5217391 Bauds</div><div class='add'>+ */</div><div class='add'>+#define MAX_SYMBOL_RATE_6MHz	5217391</div><div class='add'>+</div><div class='add'>+static int mt2063_set_params(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	struct mt2063_state *state = fe-&gt;tuner_priv;</div><div class='add'>+	int status;</div><div class='add'>+	s32 pict_car;</div><div class='add'>+	s32 pict2chanb_vsb;</div><div class='add'>+	s32 ch_bw;</div><div class='add'>+	s32 if_mid;</div><div class='add'>+	s32 rcvr_mode;</div><div class='add'>+</div><div class='add'>+	if (!state-&gt;init) {</div><div class='add'>+		status = mt2063_init(fe);</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'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	if (c-&gt;bandwidth_hz == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (c-&gt;bandwidth_hz &lt;= 6000000)</div><div class='add'>+		ch_bw = 6000000;</div><div class='add'>+	else if (c-&gt;bandwidth_hz &lt;= 7000000)</div><div class='add'>+		ch_bw = 7000000;</div><div class='add'>+	else</div><div class='add'>+		ch_bw = 8000000;</div><div class='add'>+</div><div class='add'>+	switch (c-&gt;delivery_system) {</div><div class='add'>+	case SYS_DVBT:</div><div class='add'>+		rcvr_mode = MT2063_OFFAIR_COFDM;</div><div class='add'>+		pict_car = 36125000;</div><div class='add'>+		pict2chanb_vsb = -(ch_bw / 2);</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='add'>+	case SYS_DVBC_ANNEX_C:</div><div class='add'>+		rcvr_mode = MT2063_CABLE_QAM;</div><div class='add'>+		pict_car = 36125000;</div><div class='add'>+		pict2chanb_vsb = -(ch_bw / 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'>+	if_mid = pict_car - (pict2chanb_vsb + (ch_bw / 2));</div><div class='add'>+</div><div class='add'>+	state-&gt;AS_Data.f_LO2_Step = 125000;	/* FIXME: probably 5000 for FM */</div><div class='add'>+	state-&gt;AS_Data.f_out = if_mid;</div><div class='add'>+	state-&gt;AS_Data.f_out_bw = ch_bw + 750000;</div><div class='add'>+	status = MT2063_SetReceiverMode(state, rcvr_mode);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	dprintk(1, "Tuning to frequency: %d, bandwidth %d, foffset %d\n",</div><div class='add'>+		c-&gt;frequency, ch_bw, pict2chanb_vsb);</div><div class='add'>+</div><div class='add'>+	status = MT2063_Tune(state, (c-&gt;frequency + (pict2chanb_vsb + (ch_bw / 2))));</div><div class='add'>+</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	state-&gt;frequency = c-&gt;frequency;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt2063_get_if_frequency(struct dvb_frontend *fe, u32 *freq)</div><div class='add'>+{</div><div class='add'>+	struct mt2063_state *state = fe-&gt;tuner_priv;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	if (!state-&gt;init)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	*freq = state-&gt;AS_Data.f_out;</div><div class='add'>+</div><div class='add'>+	dprintk(1, "IF frequency: %d\n", *freq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt2063_get_bandwidth(struct dvb_frontend *fe, u32 *bw)</div><div class='add'>+{</div><div class='add'>+	struct mt2063_state *state = fe-&gt;tuner_priv;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	if (!state-&gt;init)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	*bw = state-&gt;AS_Data.f_out_bw - 750000;</div><div class='add'>+</div><div class='add'>+	dprintk(1, "bandwidth: %d\n", *bw);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dvb_tuner_ops mt2063_ops = {</div><div class='add'>+	.info = {</div><div class='add'>+		 .name = "MT2063 Silicon Tuner",</div><div class='add'>+		 .frequency_min = 45000000,</div><div class='add'>+		 .frequency_max = 850000000,</div><div class='add'>+		 .frequency_step = 0,</div><div class='add'>+		 },</div><div class='add'>+</div><div class='add'>+	.init = mt2063_init,</div><div class='add'>+	.sleep = MT2063_Sleep,</div><div class='add'>+	.get_status = mt2063_get_status,</div><div class='add'>+	.set_analog_params = mt2063_set_analog_params,</div><div class='add'>+	.set_params    = mt2063_set_params,</div><div class='add'>+	.get_if_frequency = mt2063_get_if_frequency,</div><div class='add'>+	.get_bandwidth = mt2063_get_bandwidth,</div><div class='add'>+	.release = mt2063_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dvb_frontend *mt2063_attach(struct dvb_frontend *fe,</div><div class='add'>+				   struct mt2063_config *config,</div><div class='add'>+				   struct i2c_adapter *i2c)</div><div class='add'>+{</div><div class='add'>+	struct mt2063_state *state = NULL;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	state = kzalloc(sizeof(struct mt2063_state), GFP_KERNEL);</div><div class='add'>+	if (state == NULL)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	state-&gt;config = config;</div><div class='add'>+	state-&gt;i2c = i2c;</div><div class='add'>+	state-&gt;frontend = fe;</div><div class='add'>+	state-&gt;reference = config-&gt;refclock / 1000;	/* kHz */</div><div class='add'>+	fe-&gt;tuner_priv = state;</div><div class='add'>+	fe-&gt;ops.tuner_ops = mt2063_ops;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s: Attaching MT2063\n", __func__);</div><div class='add'>+	return fe;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	kfree(state);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mt2063_attach);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Ancillary routines visible outside mt2063</div><div class='add'>+ * FIXME: Remove them in favor of using standard tuner callbacks</div><div class='add'>+ */</div><div class='add'>+unsigned int tuner_MT2063_SoftwareShutdown(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct mt2063_state *state = fe-&gt;tuner_priv;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	err = MT2063_SoftwareShutdown(state, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		printk(KERN_ERR "%s: Couldn't shutdown\n", __func__);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(tuner_MT2063_SoftwareShutdown);</div><div class='add'>+</div><div class='add'>+unsigned int tuner_MT2063_ClearPowerMaskBits(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct mt2063_state *state = fe-&gt;tuner_priv;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "\n");</div><div class='add'>+</div><div class='add'>+	err = MT2063_ClearPowerMaskBits(state, MT2063_ALL_SD);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		printk(KERN_ERR "%s: Invalid parameter\n", __func__);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(tuner_MT2063_ClearPowerMaskBits);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Mauro Carvalho Chehab &lt;mchehab@redhat.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("MT2063 Silicon tuner");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/common/tuners/mt2063.h b/drivers/media/common/tuners/mt2063.h<br/>new file mode 100644<br/>index 000000000000..62d0e8ec4e99<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mt2063.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/mt2063.h</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+#ifndef __MT2063_H__</div><div class='add'>+#define __MT2063_H__</div><div class='add'>+</div><div class='add'>+#include "dvb_frontend.h"</div><div class='add'>+</div><div class='add'>+struct mt2063_config {</div><div class='add'>+	u8 tuner_address;</div><div class='add'>+	u32 refclock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MEDIA_TUNER_MT2063) || (defined(CONFIG_MEDIA_TUNER_MT2063_MODULE) &amp;&amp; defined(MODULE))</div><div class='add'>+struct dvb_frontend *mt2063_attach(struct dvb_frontend *fe,</div><div class='add'>+				   struct mt2063_config *config,</div><div class='add'>+				   struct i2c_adapter *i2c);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline struct dvb_frontend *mt2063_attach(struct dvb_frontend *fe,</div><div class='add'>+				   struct mt2063_config *config,</div><div class='add'>+				   struct i2c_adapter *i2c)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: Driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mt2063_setTune(struct dvb_frontend *fe, u32 f_in,</div><div class='add'>+				   u32 bw_in,</div><div class='add'>+				   enum MTTune_atv_standard tv_type);</div><div class='add'>+</div><div class='add'>+/* FIXME: Should use the standard DVB attachment interfaces */</div><div class='add'>+unsigned int tuner_MT2063_SoftwareShutdown(struct dvb_frontend *fe);</div><div class='add'>+unsigned int tuner_MT2063_ClearPowerMaskBits(struct dvb_frontend *fe);</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_DVB_MT2063 */</div><div class='add'>+</div><div class='add'>+#endif /* __MT2063_H__ */</div><div class='head'>diff --git a/drivers/media/common/tuners/mt2131.c b/drivers/media/common/tuners/mt2131.c<br/>index a4f830bb25d1..f83b0c1ea6c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mt2131.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/mt2131.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mt2131.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/mt2131.c</a></div><div class='hunk'>@@ -92,9 +92,9 @@ static int mt2131_writeregs(struct mt2131_priv *priv,u8 *buf, u8 len)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt2131_set_params(struct dvb_frontend *fe,</div><div class='del'>-			     struct dvb_frontend_parameters *params)</div><div class='add'>+static int mt2131_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct mt2131_priv *priv;</div><div class='ctx'> 	int ret=0, i;</div><div class='ctx'> 	u32 freq;</div><div class='hunk'>@@ -105,12 +105,8 @@ static int mt2131_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 	u8 lockval = 0;</div><div class='ctx'> </div><div class='ctx'> 	priv = fe-&gt;tuner_priv;</div><div class='del'>-	if (fe-&gt;ops.info.type == FE_OFDM)</div><div class='del'>-		priv-&gt;bandwidth = params-&gt;u.ofdm.bandwidth;</div><div class='del'>-	else</div><div class='del'>-		priv-&gt;bandwidth = 0;</div><div class='ctx'> </div><div class='del'>-	freq = params-&gt;frequency / 1000;  // Hz -&gt; kHz</div><div class='add'>+	freq = c-&gt;frequency / 1000;  /* Hz -&gt; kHz */</div><div class='ctx'> 	dprintk(1, "%s() freq=%d\n", __func__, freq);</div><div class='ctx'> </div><div class='ctx'> 	f_lo1 = freq + MT2131_IF1 * 1000;</div><div class='hunk'>@@ -193,14 +189,6 @@ static int mt2131_get_frequency(struct dvb_frontend *fe, u32 *frequency)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt2131_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)</div><div class='del'>-{</div><div class='del'>-	struct mt2131_priv *priv = fe-&gt;tuner_priv;</div><div class='del'>-	dprintk(1, "%s()\n", __func__);</div><div class='del'>-	*bandwidth = priv-&gt;bandwidth;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int mt2131_get_status(struct dvb_frontend *fe, u32 *status)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt2131_priv *priv = fe-&gt;tuner_priv;</div><div class='hunk'>@@ -263,7 +251,6 @@ static const struct dvb_tuner_ops mt2131_tuner_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.set_params    = mt2131_set_params,</div><div class='ctx'> 	.get_frequency = mt2131_get_frequency,</div><div class='del'>-	.get_bandwidth = mt2131_get_bandwidth,</div><div class='ctx'> 	.get_status    = mt2131_get_status</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -281,7 +268,6 @@ struct dvb_frontend * mt2131_attach(struct dvb_frontend *fe,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;cfg = cfg;</div><div class='del'>-	priv-&gt;bandwidth = 6000000; /* 6MHz */</div><div class='ctx'> 	priv-&gt;i2c = i2c;</div><div class='ctx'> </div><div class='ctx'> 	if (mt2131_readreg(priv, 0, &amp;id) != 0) {</div><div class='head'>diff --git a/drivers/media/common/tuners/mt2131_priv.h b/drivers/media/common/tuners/mt2131_priv.h<br/>index 4e05a67e88c1..62aeedf5c550 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mt2131_priv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/mt2131_priv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mt2131_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/mt2131_priv.h</a></div><div class='hunk'>@@ -38,7 +38,6 @@ struct mt2131_priv {</div><div class='ctx'> 	struct i2c_adapter   *i2c;</div><div class='ctx'> </div><div class='ctx'> 	u32 frequency;</div><div class='del'>-	u32 bandwidth;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* __MT2131_PRIV_H__ */</div><div class='head'>diff --git a/drivers/media/common/tuners/mt2266.c b/drivers/media/common/tuners/mt2266.c<br/>index 25a8ea342c46..bca4d75e42d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mt2266.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/mt2266.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mt2266.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/mt2266.c</a></div><div class='hunk'>@@ -122,8 +122,9 @@ static u8 mt2266_vhf[] = { 0x1d, 0xfe, 0x00, 0x00, 0xb4, 0x03, 0xa5, 0xa5,</div><div class='ctx'> </div><div class='ctx'> #define FREF 30000       // Quartz oscillator 30 MHz</div><div class='ctx'> </div><div class='del'>-static int mt2266_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int mt2266_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct mt2266_priv *priv;</div><div class='ctx'> 	int ret=0;</div><div class='ctx'> 	u32 freq;</div><div class='hunk'>@@ -135,32 +136,32 @@ static int mt2266_set_params(struct dvb_frontend *fe, struct dvb_frontend_parame</div><div class='ctx'> </div><div class='ctx'> 	priv = fe-&gt;tuner_priv;</div><div class='ctx'> </div><div class='del'>-	freq = params-&gt;frequency / 1000; // Hz -&gt; kHz</div><div class='add'>+	freq = priv-&gt;frequency / 1000; /* Hz -&gt; kHz */</div><div class='ctx'> 	if (freq &lt; 470000 &amp;&amp; freq &gt; 230000)</div><div class='ctx'> 		return -EINVAL; /* Gap between VHF and UHF bands */</div><div class='del'>-	priv-&gt;bandwidth = (fe-&gt;ops.info.type == FE_OFDM) ? params-&gt;u.ofdm.bandwidth : 0;</div><div class='del'>-	priv-&gt;frequency = freq * 1000;</div><div class='ctx'> </div><div class='add'>+	priv-&gt;frequency = c-&gt;frequency;</div><div class='ctx'> 	tune = 2 * freq * (8192/16) / (FREF/16);</div><div class='ctx'> 	band = (freq &lt; 300000) ? MT2266_VHF : MT2266_UHF;</div><div class='ctx'> 	if (band == MT2266_VHF)</div><div class='ctx'> 		tune *= 2;</div><div class='ctx'> </div><div class='del'>-	switch (params-&gt;u.ofdm.bandwidth) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	switch (c-&gt;bandwidth_hz) {</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		mt2266_writeregs(priv, mt2266_init_6mhz,</div><div class='ctx'> 				 sizeof(mt2266_init_6mhz));</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='del'>-		mt2266_writeregs(priv, mt2266_init_7mhz,</div><div class='del'>-				 sizeof(mt2266_init_7mhz));</div><div class='del'>-		break;</div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='del'>-	default:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		mt2266_writeregs(priv, mt2266_init_8mhz,</div><div class='ctx'> 				 sizeof(mt2266_init_8mhz));</div><div class='ctx'> 		break;</div><div class='add'>+	case 7000000:</div><div class='add'>+	default:</div><div class='add'>+		mt2266_writeregs(priv, mt2266_init_7mhz,</div><div class='add'>+				 sizeof(mt2266_init_7mhz));</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='add'>+	priv-&gt;bandwidth = c-&gt;bandwidth_hz;</div><div class='ctx'> </div><div class='ctx'> 	if (band == MT2266_VHF &amp;&amp; priv-&gt;band == MT2266_UHF) {</div><div class='ctx'> 		dprintk("Switch from UHF to VHF");</div><div class='head'>diff --git a/drivers/media/common/tuners/mxl5005s.c b/drivers/media/common/tuners/mxl5005s.c<br/>index 54be9e6faaaf..6133315fb0e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mxl5005s.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/mxl5005s.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mxl5005s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/mxl5005s.c</a></div><div class='hunk'>@@ -3979,54 +3979,47 @@ static int mxl5005s_AssignTunerMode(struct dvb_frontend *fe, u32 mod_type,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mxl5005s_set_params(struct dvb_frontend *fe,</div><div class='del'>-			       struct dvb_frontend_parameters *params)</div><div class='add'>+static int mxl5005s_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct mxl5005s_state *state = fe-&gt;tuner_priv;</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	u32 delsys = c-&gt;delivery_system;</div><div class='add'>+	u32 bw = c-&gt;bandwidth_hz;</div><div class='ctx'> 	u32 req_mode, req_bw = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, "%s()\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if (fe-&gt;ops.info.type == FE_ATSC) {</div><div class='del'>-		switch (params-&gt;u.vsb.modulation) {</div><div class='del'>-		case VSB_8:</div><div class='del'>-			req_mode = MXL_ATSC; break;</div><div class='del'>-		default:</div><div class='del'>-		case QAM_64:</div><div class='del'>-		case QAM_256:</div><div class='del'>-		case QAM_AUTO:</div><div class='del'>-			req_mode = MXL_QAM; break;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='add'>+	switch (delsys) {</div><div class='add'>+	case SYS_ATSC:</div><div class='add'>+		req_mode = MXL_ATSC;</div><div class='add'>+		req_bw  = MXL5005S_BANDWIDTH_6MHZ;</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_B:</div><div class='add'>+		req_mode = MXL_QAM;</div><div class='add'>+		req_bw  = MXL5005S_BANDWIDTH_6MHZ;</div><div class='add'>+		break;</div><div class='add'>+	default:	/* Assume DVB-T */</div><div class='ctx'> 		req_mode = MXL_DVBT;</div><div class='del'>-</div><div class='del'>-	/* Change tuner for new modulation type if reqd */</div><div class='del'>-	if (req_mode != state-&gt;current_mode) {</div><div class='del'>-		switch (req_mode) {</div><div class='del'>-		case MXL_ATSC:</div><div class='del'>-		case MXL_QAM:</div><div class='del'>-			req_bw  = MXL5005S_BANDWIDTH_6MHZ;</div><div class='add'>+		switch (bw) {</div><div class='add'>+		case 6000000:</div><div class='add'>+			req_bw = MXL5005S_BANDWIDTH_6MHZ;</div><div class='add'>+			break;</div><div class='add'>+		case 7000000:</div><div class='add'>+			req_bw = MXL5005S_BANDWIDTH_7MHZ;</div><div class='add'>+			break;</div><div class='add'>+		case 8000000:</div><div class='add'>+		case 0:</div><div class='add'>+			req_bw = MXL5005S_BANDWIDTH_8MHZ;</div><div class='ctx'> 			break;</div><div class='del'>-		case MXL_DVBT:</div><div class='ctx'> 		default:</div><div class='del'>-			/* Assume DVB-T */</div><div class='del'>-			switch (params-&gt;u.ofdm.bandwidth) {</div><div class='del'>-			case BANDWIDTH_6_MHZ:</div><div class='del'>-				req_bw  = MXL5005S_BANDWIDTH_6MHZ;</div><div class='del'>-				break;</div><div class='del'>-			case BANDWIDTH_7_MHZ:</div><div class='del'>-				req_bw  = MXL5005S_BANDWIDTH_7MHZ;</div><div class='del'>-				break;</div><div class='del'>-			case BANDWIDTH_AUTO:</div><div class='del'>-			case BANDWIDTH_8_MHZ:</div><div class='del'>-				req_bw  = MXL5005S_BANDWIDTH_8MHZ;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	/* Change tuner for new modulation type if reqd */</div><div class='add'>+	if (req_mode != state-&gt;current_mode ||</div><div class='add'>+	    req_bw != state-&gt;Chan_Bandwidth) {</div><div class='ctx'> 		state-&gt;current_mode = req_mode;</div><div class='ctx'> 		ret = mxl5005s_reconfigure(fe, req_mode, req_bw);</div><div class='ctx'> </div><div class='hunk'>@@ -4034,8 +4027,8 @@ static int mxl5005s_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ret == 0) {</div><div class='del'>-		dprintk(1, "%s() freq=%d\n", __func__, params-&gt;frequency);</div><div class='del'>-		ret = mxl5005s_SetRfFreqHz(fe, params-&gt;frequency);</div><div class='add'>+		dprintk(1, "%s() freq=%d\n", __func__, c-&gt;frequency);</div><div class='add'>+		ret = mxl5005s_SetRfFreqHz(fe, c-&gt;frequency);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/media/common/tuners/mxl5007t.c b/drivers/media/common/tuners/mxl5007t.c<br/>index 5d02221e99dd..69e453ef0a1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mxl5007t.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/mxl5007t.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/mxl5007t.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/mxl5007t.c</a></div><div class='hunk'>@@ -165,6 +165,8 @@ struct mxl5007t_state {</div><div class='ctx'> 	struct reg_pair_t tab_init_cable[ARRAY_SIZE(init_tab_cable)];</div><div class='ctx'> 	struct reg_pair_t tab_rftune[ARRAY_SIZE(reg_pair_rftune)];</div><div class='ctx'> </div><div class='add'>+	enum mxl5007t_if_freq if_freq;</div><div class='add'>+</div><div class='ctx'> 	u32 frequency;</div><div class='ctx'> 	u32 bandwidth;</div><div class='ctx'> };</div><div class='hunk'>@@ -286,6 +288,8 @@ static void mxl5007t_set_if_freq_bits(struct mxl5007t_state *state,</div><div class='ctx'> 	/* set inverted IF or normal IF */</div><div class='ctx'> 	set_reg_bits(state-&gt;tab_init, 0x02, 0x10, invert_if ? 0x10 : 0x00);</div><div class='ctx'> </div><div class='add'>+	state-&gt;if_freq = if_freq;</div><div class='add'>+</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -612,47 +616,43 @@ fail:</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static int mxl5007t_set_params(struct dvb_frontend *fe,</div><div class='del'>-			       struct dvb_frontend_parameters *params)</div><div class='add'>+static int mxl5007t_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	u32 delsys = c-&gt;delivery_system;</div><div class='ctx'> 	struct mxl5007t_state *state = fe-&gt;tuner_priv;</div><div class='ctx'> 	enum mxl5007t_bw_mhz bw;</div><div class='ctx'> 	enum mxl5007t_mode mode;</div><div class='ctx'> 	int ret;</div><div class='del'>-	u32 freq = params-&gt;frequency;</div><div class='add'>+	u32 freq = c-&gt;frequency;</div><div class='ctx'> </div><div class='del'>-	if (fe-&gt;ops.info.type == FE_ATSC) {</div><div class='del'>-		switch (params-&gt;u.vsb.modulation) {</div><div class='del'>-		case VSB_8:</div><div class='del'>-		case VSB_16:</div><div class='del'>-			mode = MxL_MODE_ATSC;</div><div class='del'>-			break;</div><div class='del'>-		case QAM_64:</div><div class='del'>-		case QAM_256:</div><div class='del'>-			mode = MxL_MODE_CABLE;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			mxl_err("modulation not set!");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='add'>+	switch (delsys) {</div><div class='add'>+	case SYS_ATSC:</div><div class='add'>+		mode = MxL_MODE_ATSC;</div><div class='add'>+		bw = MxL_BW_6MHz;</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_B:</div><div class='add'>+		mode = MxL_MODE_CABLE;</div><div class='ctx'> 		bw = MxL_BW_6MHz;</div><div class='del'>-	} else if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='del'>-		switch (params-&gt;u.ofdm.bandwidth) {</div><div class='del'>-		case BANDWIDTH_6_MHZ:</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBT:</div><div class='add'>+	case SYS_DVBT2:</div><div class='add'>+		mode = MxL_MODE_DVBT;</div><div class='add'>+		switch (c-&gt;bandwidth_hz) {</div><div class='add'>+		case 6000000:</div><div class='ctx'> 			bw = MxL_BW_6MHz;</div><div class='ctx'> 			break;</div><div class='del'>-		case BANDWIDTH_7_MHZ:</div><div class='add'>+		case 7000000:</div><div class='ctx'> 			bw = MxL_BW_7MHz;</div><div class='ctx'> 			break;</div><div class='del'>-		case BANDWIDTH_8_MHZ:</div><div class='add'>+		case 8000000:</div><div class='ctx'> 			bw = MxL_BW_8MHz;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			mxl_err("bandwidth not set!");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		mode = MxL_MODE_DVBT;</div><div class='del'>-	} else {</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		mxl_err("modulation type not supported!");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -671,8 +671,7 @@ static int mxl5007t_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;frequency = freq;</div><div class='del'>-	state-&gt;bandwidth = (fe-&gt;ops.info.type == FE_OFDM) ?</div><div class='del'>-		params-&gt;u.ofdm.bandwidth : 0;</div><div class='add'>+	state-&gt;bandwidth = c-&gt;bandwidth_hz;</div><div class='ctx'> fail:</div><div class='ctx'> 	mutex_unlock(&amp;state-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -738,6 +737,50 @@ static int mxl5007t_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mxl5007t_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)</div><div class='add'>+{</div><div class='add'>+	struct mxl5007t_state *state = fe-&gt;tuner_priv;</div><div class='add'>+</div><div class='add'>+	*frequency = 0;</div><div class='add'>+</div><div class='add'>+	switch (state-&gt;if_freq) {</div><div class='add'>+	case MxL_IF_4_MHZ:</div><div class='add'>+		*frequency = 4000000;</div><div class='add'>+		break;</div><div class='add'>+	case MxL_IF_4_5_MHZ:</div><div class='add'>+		*frequency = 4500000;</div><div class='add'>+		break;</div><div class='add'>+	case MxL_IF_4_57_MHZ:</div><div class='add'>+		*frequency = 4570000;</div><div class='add'>+		break;</div><div class='add'>+	case MxL_IF_5_MHZ:</div><div class='add'>+		*frequency = 5000000;</div><div class='add'>+		break;</div><div class='add'>+	case MxL_IF_5_38_MHZ:</div><div class='add'>+		*frequency = 5380000;</div><div class='add'>+		break;</div><div class='add'>+	case MxL_IF_6_MHZ:</div><div class='add'>+		*frequency = 6000000;</div><div class='add'>+		break;</div><div class='add'>+	case MxL_IF_6_28_MHZ:</div><div class='add'>+		*frequency = 6280000;</div><div class='add'>+		break;</div><div class='add'>+	case MxL_IF_9_1915_MHZ:</div><div class='add'>+		*frequency = 9191500;</div><div class='add'>+		break;</div><div class='add'>+	case MxL_IF_35_25_MHZ:</div><div class='add'>+		*frequency = 35250000;</div><div class='add'>+		break;</div><div class='add'>+	case MxL_IF_36_15_MHZ:</div><div class='add'>+		*frequency = 36150000;</div><div class='add'>+		break;</div><div class='add'>+	case MxL_IF_44_MHZ:</div><div class='add'>+		*frequency = 44000000;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mxl5007t_release(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct mxl5007t_state *state = fe-&gt;tuner_priv;</div><div class='hunk'>@@ -767,6 +810,7 @@ static struct dvb_tuner_ops mxl5007t_tuner_ops = {</div><div class='ctx'> 	.get_frequency     = mxl5007t_get_frequency,</div><div class='ctx'> 	.get_bandwidth     = mxl5007t_get_bandwidth,</div><div class='ctx'> 	.release           = mxl5007t_release,</div><div class='add'>+	.get_if_frequency  = mxl5007t_get_if_frequency,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int mxl5007t_get_chip_id(struct mxl5007t_state *state)</div><div class='head'>diff --git a/drivers/media/common/tuners/qt1010.c b/drivers/media/common/tuners/qt1010.c<br/>index 9f5dba244cb8..2d79b1f5d5eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/qt1010.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/qt1010.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/qt1010.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/qt1010.c</a></div><div class='hunk'>@@ -82,9 +82,9 @@ static void qt1010_dump_regs(struct qt1010_priv *priv)</div><div class='ctx'> 	printk(KERN_CONT "\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int qt1010_set_params(struct dvb_frontend *fe,</div><div class='del'>-			     struct dvb_frontend_parameters *params)</div><div class='add'>+static int qt1010_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct qt1010_priv *priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u32 freq, div, mod1, mod2;</div><div class='hunk'>@@ -144,13 +144,11 @@ static int qt1010_set_params(struct dvb_frontend *fe,</div><div class='ctx'> #define FREQ2  4000000 /* 4 MHz Quartz oscillator in the stick? */</div><div class='ctx'> </div><div class='ctx'> 	priv = fe-&gt;tuner_priv;</div><div class='del'>-	freq = params-&gt;frequency;</div><div class='add'>+	freq = c-&gt;frequency;</div><div class='ctx'> 	div = (freq + QT1010_OFFSET) / QT1010_STEP;</div><div class='ctx'> 	freq = (div * QT1010_STEP) - QT1010_OFFSET;</div><div class='ctx'> 	mod1 = (freq + QT1010_OFFSET) % FREQ1;</div><div class='ctx'> 	mod2 = (freq + QT1010_OFFSET) % FREQ2;</div><div class='del'>-	priv-&gt;bandwidth =</div><div class='del'>-		(fe-&gt;ops.info.type == FE_OFDM) ? params-&gt;u.ofdm.bandwidth : 0;</div><div class='ctx'> 	priv-&gt;frequency = freq;</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='hunk'>@@ -320,7 +318,7 @@ static u8 qt1010_init_meas2(struct qt1010_priv *priv,</div><div class='ctx'> static int qt1010_init(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct qt1010_priv *priv = fe-&gt;tuner_priv;</div><div class='del'>-	struct dvb_frontend_parameters params;</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	u8 i, tmpval, *valptr = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -397,9 +395,9 @@ static int qt1010_init(struct dvb_frontend *fe)</div><div class='ctx'> 		if ((err = qt1010_init_meas2(priv, i, &amp;tmpval)))</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-	params.frequency = 545000000; /* Sigmatek DVB-110 545000000 */</div><div class='add'>+	c-&gt;frequency = 545000000; /* Sigmatek DVB-110 545000000 */</div><div class='ctx'> 				      /* MSI Megasky 580 GL861 533000000 */</div><div class='del'>-	return qt1010_set_params(fe, &amp;params);</div><div class='add'>+	return qt1010_set_params(fe);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int qt1010_release(struct dvb_frontend *fe)</div><div class='hunk'>@@ -416,10 +414,9 @@ static int qt1010_get_frequency(struct dvb_frontend *fe, u32 *frequency)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int qt1010_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)</div><div class='add'>+static int qt1010_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)</div><div class='ctx'> {</div><div class='del'>-	struct qt1010_priv *priv = fe-&gt;tuner_priv;</div><div class='del'>-	*bandwidth = priv-&gt;bandwidth;</div><div class='add'>+	*frequency = 36125000;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -437,7 +434,7 @@ static const struct dvb_tuner_ops qt1010_tuner_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.set_params    = qt1010_set_params,</div><div class='ctx'> 	.get_frequency = qt1010_get_frequency,</div><div class='del'>-	.get_bandwidth = qt1010_get_bandwidth</div><div class='add'>+	.get_if_frequency = qt1010_get_if_frequency,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dvb_frontend * qt1010_attach(struct dvb_frontend *fe,</div><div class='head'>diff --git a/drivers/media/common/tuners/qt1010_priv.h b/drivers/media/common/tuners/qt1010_priv.h<br/>index 090cf475f099..2c42d3f01636 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/qt1010_priv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/qt1010_priv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/qt1010_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/qt1010_priv.h</a></div><div class='hunk'>@@ -99,7 +99,6 @@ struct qt1010_priv {</div><div class='ctx'> 	u8 reg25_init_val;</div><div class='ctx'> </div><div class='ctx'> 	u32 frequency;</div><div class='del'>-	u32 bandwidth;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/common/tuners/tda18212.c b/drivers/media/common/tuners/tda18212.c<br/>index e29cc2bc113a..602c2e392b17 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tda18212.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tda18212.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tda18212.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/tda18212.c</a></div><div class='hunk'>@@ -25,6 +25,8 @@</div><div class='ctx'> struct tda18212_priv {</div><div class='ctx'> 	struct tda18212_config *cfg;</div><div class='ctx'> 	struct i2c_adapter *i2c;</div><div class='add'>+</div><div class='add'>+	u32 if_frequency;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define dbg(fmt, arg...)					\</div><div class='hunk'>@@ -128,20 +130,31 @@ static void tda18212_dump_regs(struct tda18212_priv *priv)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int tda18212_set_params(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int tda18212_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct tda18212_priv *priv = fe-&gt;tuner_priv;</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> 	u32 if_khz;</div><div class='ctx'> 	u8 buf[9];</div><div class='add'>+	#define DVBT_6   0</div><div class='add'>+	#define DVBT_7   1</div><div class='add'>+	#define DVBT_8   2</div><div class='add'>+	#define DVBT2_6  3</div><div class='add'>+	#define DVBT2_7  4</div><div class='add'>+	#define DVBT2_8  5</div><div class='add'>+	#define DVBC_6   6</div><div class='add'>+	#define DVBC_8   7</div><div class='ctx'> 	static const u8 bw_params[][3] = {</div><div class='del'>-		/*  0f    13    23 */</div><div class='del'>-		{ 0xb3, 0x20, 0x03 }, /* DVB-T 6 MHz */</div><div class='del'>-		{ 0xb3, 0x31, 0x01 }, /* DVB-T 7 MHz */</div><div class='del'>-		{ 0xb3, 0x22, 0x01 }, /* DVB-T 8 MHz */</div><div class='del'>-		{ 0x92, 0x53, 0x03 }, /* DVB-C */</div><div class='add'>+		     /* reg:   0f    13    23 */</div><div class='add'>+		[DVBT_6]  = { 0xb3, 0x20, 0x03 },</div><div class='add'>+		[DVBT_7]  = { 0xb3, 0x31, 0x01 },</div><div class='add'>+		[DVBT_8]  = { 0xb3, 0x22, 0x01 },</div><div class='add'>+		[DVBT2_6] = { 0xbc, 0x20, 0x03 },</div><div class='add'>+		[DVBT2_7] = { 0xbc, 0x72, 0x03 },</div><div class='add'>+		[DVBT2_8] = { 0xbc, 0x22, 0x01 },</div><div class='add'>+		[DVBC_6]  = { 0x92, 0x50, 0x03 },</div><div class='add'>+		[DVBC_8]  = { 0x92, 0x53, 0x03 },</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	dbg("delsys=%d RF=%d BW=%d\n",</div><div class='hunk'>@@ -155,24 +168,44 @@ static int tda18212_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 		switch (c-&gt;bandwidth_hz) {</div><div class='ctx'> 		case 6000000:</div><div class='ctx'> 			if_khz = priv-&gt;cfg-&gt;if_dvbt_6;</div><div class='del'>-			i = 0;</div><div class='add'>+			i = DVBT_6;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 7000000:</div><div class='ctx'> 			if_khz = priv-&gt;cfg-&gt;if_dvbt_7;</div><div class='del'>-			i = 1;</div><div class='add'>+			i = DVBT_7;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 8000000:</div><div class='ctx'> 			if_khz = priv-&gt;cfg-&gt;if_dvbt_8;</div><div class='del'>-			i = 2;</div><div class='add'>+			i = DVBT_8;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-	case SYS_DVBC_ANNEX_AC:</div><div class='add'>+	case SYS_DVBT2:</div><div class='add'>+		switch (c-&gt;bandwidth_hz) {</div><div class='add'>+		case 6000000:</div><div class='add'>+			if_khz = priv-&gt;cfg-&gt;if_dvbt2_6;</div><div class='add'>+			i = DVBT2_6;</div><div class='add'>+			break;</div><div class='add'>+		case 7000000:</div><div class='add'>+			if_khz = priv-&gt;cfg-&gt;if_dvbt2_7;</div><div class='add'>+			i = DVBT2_7;</div><div class='add'>+			break;</div><div class='add'>+		case 8000000:</div><div class='add'>+			if_khz = priv-&gt;cfg-&gt;if_dvbt2_8;</div><div class='add'>+			i = DVBT2_8;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='add'>+	case SYS_DVBC_ANNEX_C:</div><div class='ctx'> 		if_khz = priv-&gt;cfg-&gt;if_dvbc;</div><div class='del'>-		i = 3;</div><div class='add'>+		i = DVBC_8;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -EINVAL;</div><div class='hunk'>@@ -194,7 +227,7 @@ static int tda18212_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 	buf[0] = 0x02;</div><div class='ctx'> 	buf[1] = bw_params[i][1];</div><div class='ctx'> 	buf[2] = 0x03; /* default value */</div><div class='del'>-	buf[3] = if_khz / 50;</div><div class='add'>+	buf[3] = DIV_ROUND_CLOSEST(if_khz, 50);</div><div class='ctx'> 	buf[4] = ((c-&gt;frequency / 1000) &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 	buf[5] = ((c-&gt;frequency / 1000) &gt;&gt;  8) &amp; 0xff;</div><div class='ctx'> 	buf[6] = ((c-&gt;frequency / 1000) &gt;&gt;  0) &amp; 0xff;</div><div class='hunk'>@@ -204,6 +237,9 @@ static int tda18212_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='add'>+	/* actual IF rounded as it is on register */</div><div class='add'>+	priv-&gt;if_frequency = buf[3] * 50 * 1000;</div><div class='add'>+</div><div class='ctx'> exit:</div><div class='ctx'> 	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 		fe-&gt;ops.i2c_gate_ctrl(fe, 0); /* close I2C-gate */</div><div class='hunk'>@@ -215,6 +251,15 @@ error:</div><div class='ctx'> 	goto exit;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int tda18212_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)</div><div class='add'>+{</div><div class='add'>+	struct tda18212_priv *priv = fe-&gt;tuner_priv;</div><div class='add'>+</div><div class='add'>+	*frequency = priv-&gt;if_frequency;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int tda18212_release(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	kfree(fe-&gt;tuner_priv);</div><div class='hunk'>@@ -234,6 +279,7 @@ static const struct dvb_tuner_ops tda18212_tuner_ops = {</div><div class='ctx'> 	.release       = tda18212_release,</div><div class='ctx'> </div><div class='ctx'> 	.set_params    = tda18212_set_params,</div><div class='add'>+	.get_if_frequency = tda18212_get_if_frequency,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dvb_frontend *tda18212_attach(struct dvb_frontend *fe,</div><div class='head'>diff --git a/drivers/media/common/tuners/tda18212.h b/drivers/media/common/tuners/tda18212.h<br/>index 83b497f59e1b..9bd5da4aabb7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tda18212.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tda18212.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tda18212.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/tda18212.h</a></div><div class='hunk'>@@ -29,6 +29,10 @@ struct tda18212_config {</div><div class='ctx'> 	u16 if_dvbt_6;</div><div class='ctx'> 	u16 if_dvbt_7;</div><div class='ctx'> 	u16 if_dvbt_8;</div><div class='add'>+	u16 if_dvbt2_5;</div><div class='add'>+	u16 if_dvbt2_6;</div><div class='add'>+	u16 if_dvbt2_7;</div><div class='add'>+	u16 if_dvbt2_8;</div><div class='ctx'> 	u16 if_dvbc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/common/tuners/tda18218.c b/drivers/media/common/tuners/tda18218.c<br/>index 4fc29730a12c..dfb3a831df45 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tda18218.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tda18218.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tda18218.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/tda18218.c</a></div><div class='hunk'>@@ -109,10 +109,11 @@ static int tda18218_rd_reg(struct tda18218_priv *priv, u8 reg, u8 *val)</div><div class='ctx'> 	return tda18218_rd_regs(priv, reg, val, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda18218_set_params(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *params)</div><div class='add'>+static int tda18218_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct tda18218_priv *priv = fe-&gt;tuner_priv;</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	u32 bw = c-&gt;bandwidth_hz;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 buf[3], i, BP_Filter, LP_Fc;</div><div class='ctx'> 	u32 LO_Frac;</div><div class='hunk'>@@ -138,22 +139,19 @@ static int tda18218_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 		fe-&gt;ops.i2c_gate_ctrl(fe, 1); /* open I2C-gate */</div><div class='ctx'> </div><div class='ctx'> 	/* low-pass filter cut-off frequency */</div><div class='del'>-	switch (params-&gt;u.ofdm.bandwidth) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	if (bw &lt;= 6000000) {</div><div class='ctx'> 		LP_Fc = 0;</div><div class='del'>-		LO_Frac = params-&gt;frequency + 3000000;</div><div class='del'>-		break;</div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+		priv-&gt;if_frequency = 3000000;</div><div class='add'>+	} else if (bw &lt;= 7000000) {</div><div class='ctx'> 		LP_Fc = 1;</div><div class='del'>-		LO_Frac = params-&gt;frequency + 3500000;</div><div class='del'>-		break;</div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='del'>-	default:</div><div class='add'>+		priv-&gt;if_frequency = 3500000;</div><div class='add'>+	} else {</div><div class='ctx'> 		LP_Fc = 2;</div><div class='del'>-		LO_Frac = params-&gt;frequency + 4000000;</div><div class='del'>-		break;</div><div class='add'>+		priv-&gt;if_frequency = 4000000;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	LO_Frac = c-&gt;frequency + priv-&gt;if_frequency;</div><div class='add'>+</div><div class='ctx'> 	/* band-pass filter */</div><div class='ctx'> 	if (LO_Frac &lt; 188000000)</div><div class='ctx'> 		BP_Filter = 3;</div><div class='hunk'>@@ -206,6 +204,14 @@ error:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int tda18218_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)</div><div class='add'>+{</div><div class='add'>+	struct tda18218_priv *priv = fe-&gt;tuner_priv;</div><div class='add'>+	*frequency = priv-&gt;if_frequency;</div><div class='add'>+	dbg("%s: if=%d", __func__, *frequency);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int tda18218_sleep(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct tda18218_priv *priv = fe-&gt;tuner_priv;</div><div class='hunk'>@@ -268,6 +274,8 @@ static const struct dvb_tuner_ops tda18218_tuner_ops = {</div><div class='ctx'> 	.sleep         = tda18218_sleep,</div><div class='ctx'> </div><div class='ctx'> 	.set_params    = tda18218_set_params,</div><div class='add'>+</div><div class='add'>+	.get_if_frequency = tda18218_get_if_frequency,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dvb_frontend *tda18218_attach(struct dvb_frontend *fe,</div><div class='head'>diff --git a/drivers/media/common/tuners/tda18218_priv.h b/drivers/media/common/tuners/tda18218_priv.h<br/>index 904e5365c78c..dc52b72e1407 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tda18218_priv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tda18218_priv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tda18218_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/tda18218_priv.h</a></div><div class='hunk'>@@ -100,6 +100,8 @@ struct tda18218_priv {</div><div class='ctx'> 	struct tda18218_config *cfg;</div><div class='ctx'> 	struct i2c_adapter *i2c;</div><div class='ctx'> </div><div class='add'>+	u32 if_frequency;</div><div class='add'>+</div><div class='ctx'> 	u8 regs[TDA18218_NUM_REGS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/common/tuners/tda18271-fe.c b/drivers/media/common/tuners/tda18271-fe.c<br/>index 63cc4004e211..2e67f4459904 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tda18271-fe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tda18271-fe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tda18271-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/tda18271-fe.c</a></div><div class='hunk'>@@ -928,59 +928,49 @@ fail:</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='del'>-static int tda18271_set_params(struct dvb_frontend *fe,</div><div class='del'>-			       struct dvb_frontend_parameters *params)</div><div class='add'>+static int tda18271_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	u32 delsys = c-&gt;delivery_system;</div><div class='add'>+	u32 bw = c-&gt;bandwidth_hz;</div><div class='add'>+	u32 freq = c-&gt;frequency;</div><div class='ctx'> 	struct tda18271_priv *priv = fe-&gt;tuner_priv;</div><div class='ctx'> 	struct tda18271_std_map *std_map = &amp;priv-&gt;std;</div><div class='ctx'> 	struct tda18271_std_map_item *map;</div><div class='ctx'> 	int ret;</div><div class='del'>-	u32 bw, freq = params-&gt;frequency;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;mode = TDA18271_DIGITAL;</div><div class='ctx'> </div><div class='del'>-	if (fe-&gt;ops.info.type == FE_ATSC) {</div><div class='del'>-		switch (params-&gt;u.vsb.modulation) {</div><div class='del'>-		case VSB_8:</div><div class='del'>-		case VSB_16:</div><div class='del'>-			map = &amp;std_map-&gt;atsc_6;</div><div class='del'>-			break;</div><div class='del'>-		case QAM_64:</div><div class='del'>-		case QAM_256:</div><div class='del'>-			map = &amp;std_map-&gt;qam_6;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			tda_warn("modulation not set!\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-#if 0</div><div class='del'>-		/* userspace request is already center adjusted */</div><div class='del'>-		freq += 1750000; /* Adjust to center (+1.75MHZ) */</div><div class='del'>-#endif</div><div class='add'>+	switch (delsys) {</div><div class='add'>+	case SYS_ATSC:</div><div class='add'>+		map = &amp;std_map-&gt;atsc_6;</div><div class='ctx'> 		bw = 6000000;</div><div class='del'>-	} else if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='del'>-		switch (params-&gt;u.ofdm.bandwidth) {</div><div class='del'>-		case BANDWIDTH_6_MHZ:</div><div class='del'>-			bw = 6000000;</div><div class='add'>+		break;</div><div class='add'>+	case SYS_ISDBT:</div><div class='add'>+	case SYS_DVBT:</div><div class='add'>+	case SYS_DVBT2:</div><div class='add'>+		if (bw &lt;= 6000000) {</div><div class='ctx'> 			map = &amp;std_map-&gt;dvbt_6;</div><div class='del'>-			break;</div><div class='del'>-		case BANDWIDTH_7_MHZ:</div><div class='del'>-			bw = 7000000;</div><div class='add'>+		} else if (bw &lt;= 7000000) {</div><div class='ctx'> 			map = &amp;std_map-&gt;dvbt_7;</div><div class='del'>-			break;</div><div class='del'>-		case BANDWIDTH_8_MHZ:</div><div class='del'>-			bw = 8000000;</div><div class='add'>+		} else {</div><div class='ctx'> 			map = &amp;std_map-&gt;dvbt_8;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			tda_warn("bandwidth not set!\n");</div><div class='del'>-			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (fe-&gt;ops.info.type == FE_QAM) {</div><div class='del'>-		/* DVB-C */</div><div class='del'>-		map = &amp;std_map-&gt;qam_8;</div><div class='del'>-		bw = 8000000;</div><div class='del'>-	} else {</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_B:</div><div class='add'>+		bw = 6000000;</div><div class='add'>+		/* falltrough */</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='add'>+	case SYS_DVBC_ANNEX_C:</div><div class='add'>+		if (bw &lt;= 6000000) {</div><div class='add'>+			map = &amp;std_map-&gt;qam_6;</div><div class='add'>+		} else if (bw &lt;= 7000000) {</div><div class='add'>+			map = &amp;std_map-&gt;qam_7;</div><div class='add'>+		} else {</div><div class='add'>+			map = &amp;std_map-&gt;qam_8;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		tda_warn("modulation type not supported!\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -994,9 +984,9 @@ static int tda18271_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 	if (tda_fail(ret))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='add'>+	priv-&gt;if_freq   = map-&gt;if_freq;</div><div class='ctx'> 	priv-&gt;frequency = freq;</div><div class='del'>-	priv-&gt;bandwidth = (fe-&gt;ops.info.type == FE_OFDM) ?</div><div class='del'>-		params-&gt;u.ofdm.bandwidth : 0;</div><div class='add'>+	priv-&gt;bandwidth = bw;</div><div class='ctx'> fail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1050,6 +1040,7 @@ static int tda18271_set_analog_params(struct dvb_frontend *fe,</div><div class='ctx'> 	if (tda_fail(ret))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='add'>+	priv-&gt;if_freq   = map-&gt;if_freq;</div><div class='ctx'> 	priv-&gt;frequency = freq;</div><div class='ctx'> 	priv-&gt;bandwidth = 0;</div><div class='ctx'> fail:</div><div class='hunk'>@@ -1086,6 +1077,13 @@ static int tda18271_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int tda18271_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)</div><div class='add'>+{</div><div class='add'>+	struct tda18271_priv *priv = fe-&gt;tuner_priv;</div><div class='add'>+	*frequency = (u32)priv-&gt;if_freq * 1000;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='ctx'> #define tda18271_update_std(std_cfg, name) do {				\</div><div class='hunk'>@@ -1245,6 +1243,7 @@ static const struct dvb_tuner_ops tda18271_tuner_ops = {</div><div class='ctx'> 	.set_config        = tda18271_set_config,</div><div class='ctx'> 	.get_frequency     = tda18271_get_frequency,</div><div class='ctx'> 	.get_bandwidth     = tda18271_get_bandwidth,</div><div class='add'>+	.get_if_frequency  = tda18271_get_if_frequency,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,</div><div class='head'>diff --git a/drivers/media/common/tuners/tda18271-maps.c b/drivers/media/common/tuners/tda18271-maps.c<br/>index 3d5b6ab7e332..fb881c667c94 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tda18271-maps.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tda18271-maps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tda18271-maps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/tda18271-maps.c</a></div><div class='hunk'>@@ -1213,6 +1213,8 @@ static struct tda18271_std_map tda18271c1_std_map = {</div><div class='ctx'> 		      .if_lvl = 1, .rfagc_top = 0x37, }, /* EP3[4:0] 0x1e */</div><div class='ctx'> 	.qam_6    = { .if_freq = 4000, .fm_rfn = 0, .agc_mode = 3, .std = 5,</div><div class='ctx'> 		      .if_lvl = 1, .rfagc_top = 0x37, }, /* EP3[4:0] 0x1d */</div><div class='add'>+	.qam_7    = { .if_freq = 4500, .fm_rfn = 0, .agc_mode = 3, .std = 6,</div><div class='add'>+		      .if_lvl = 1, .rfagc_top = 0x37, }, /* EP3[4:0] 0x1e */</div><div class='ctx'> 	.qam_8    = { .if_freq = 5000, .fm_rfn = 0, .agc_mode = 3, .std = 7,</div><div class='ctx'> 		      .if_lvl = 1, .rfagc_top = 0x37, }, /* EP3[4:0] 0x1f */</div><div class='ctx'> };</div><div class='hunk'>@@ -1244,6 +1246,8 @@ static struct tda18271_std_map tda18271c2_std_map = {</div><div class='ctx'> 		      .if_lvl = 1, .rfagc_top = 0x37, }, /* EP3[4:0] 0x1d */</div><div class='ctx'> 	.qam_6    = { .if_freq = 4000, .fm_rfn = 0, .agc_mode = 3, .std = 5,</div><div class='ctx'> 		      .if_lvl = 1, .rfagc_top = 0x37, }, /* EP3[4:0] 0x1d */</div><div class='add'>+	.qam_7    = { .if_freq = 4500, .fm_rfn = 0, .agc_mode = 3, .std = 6,</div><div class='add'>+		      .if_lvl = 1, .rfagc_top = 0x37, }, /* EP3[4:0] 0x1e */</div><div class='ctx'> 	.qam_8    = { .if_freq = 5000, .fm_rfn = 0, .agc_mode = 3, .std = 7,</div><div class='ctx'> 		      .if_lvl = 1, .rfagc_top = 0x37, }, /* EP3[4:0] 0x1f */</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/media/common/tuners/tda18271-priv.h b/drivers/media/common/tuners/tda18271-priv.h<br/>index 94340f47562b..454c152ccaa0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tda18271-priv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tda18271-priv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tda18271-priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/tda18271-priv.h</a></div><div class='hunk'>@@ -122,6 +122,8 @@ struct tda18271_priv {</div><div class='ctx'> </div><div class='ctx'> 	struct mutex lock;</div><div class='ctx'> </div><div class='add'>+	u16 if_freq;</div><div class='add'>+</div><div class='ctx'> 	u32 frequency;</div><div class='ctx'> 	u32 bandwidth;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/media/common/tuners/tda18271.h b/drivers/media/common/tuners/tda18271.h<br/>index 50cfa8cebb93..640bae4e6a5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tda18271.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tda18271.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tda18271.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/tda18271.h</a></div><div class='hunk'>@@ -53,6 +53,7 @@ struct tda18271_std_map {</div><div class='ctx'> 	struct tda18271_std_map_item dvbt_7;</div><div class='ctx'> 	struct tda18271_std_map_item dvbt_8;</div><div class='ctx'> 	struct tda18271_std_map_item qam_6;</div><div class='add'>+	struct tda18271_std_map_item qam_7;</div><div class='ctx'> 	struct tda18271_std_map_item qam_8;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/common/tuners/tda827x.c b/drivers/media/common/tuners/tda827x.c<br/>index e0d5b43772b8..a0d176267470 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tda827x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tda827x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tda827x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/tda827x.c</a></div><div class='hunk'>@@ -152,9 +152,9 @@ static int tuner_transfer(struct dvb_frontend *fe,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda827xo_set_params(struct dvb_frontend *fe,</div><div class='del'>-			       struct dvb_frontend_parameters *params)</div><div class='add'>+static int tda827xo_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct tda827x_priv *priv = fe-&gt;tuner_priv;</div><div class='ctx'> 	u8 buf[14];</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -165,18 +165,16 @@ static int tda827xo_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 	u32 N;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s:\n", __func__);</div><div class='del'>-	switch (params-&gt;u.ofdm.bandwidth) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	if (c-&gt;bandwidth_hz == 0) {</div><div class='add'>+		if_freq = 5000000;</div><div class='add'>+	} else if (c-&gt;bandwidth_hz &lt;= 6000000) {</div><div class='ctx'> 		if_freq = 4000000;</div><div class='del'>-		break;</div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	} else if (c-&gt;bandwidth_hz &lt;= 7000000) {</div><div class='ctx'> 		if_freq = 4500000;</div><div class='del'>-		break;</div><div class='del'>-	default:		   /* 8 MHz or Auto */</div><div class='add'>+	} else {	/* 8 MHz */</div><div class='ctx'> 		if_freq = 5000000;</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='del'>-	tuner_freq = params-&gt;frequency;</div><div class='add'>+	tuner_freq = c-&gt;frequency;</div><div class='ctx'> </div><div class='ctx'> 	i = 0;</div><div class='ctx'> 	while (tda827x_table[i].lomax &lt; tuner_freq) {</div><div class='hunk'>@@ -220,8 +218,8 @@ static int tda827xo_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;frequency = params-&gt;frequency;</div><div class='del'>-	priv-&gt;bandwidth = (fe-&gt;ops.info.type == FE_OFDM) ? params-&gt;u.ofdm.bandwidth : 0;</div><div class='add'>+	priv-&gt;frequency = c-&gt;frequency;</div><div class='add'>+	priv-&gt;bandwidth = c-&gt;bandwidth_hz;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -513,9 +511,9 @@ static void tda827xa_lna_gain(struct dvb_frontend *fe, int high,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda827xa_set_params(struct dvb_frontend *fe,</div><div class='del'>-			       struct dvb_frontend_parameters *params)</div><div class='add'>+static int tda827xa_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct tda827x_priv *priv = fe-&gt;tuner_priv;</div><div class='ctx'> 	struct tda827xa_data *frequency_map = tda827xa_dvbt;</div><div class='ctx'> 	u8 buf[11];</div><div class='hunk'>@@ -531,22 +529,25 @@ static int tda827xa_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 	tda827xa_lna_gain(fe, 1, NULL);</div><div class='ctx'> 	msleep(20);</div><div class='ctx'> </div><div class='del'>-	switch (params-&gt;u.ofdm.bandwidth) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	if (c-&gt;bandwidth_hz == 0) {</div><div class='add'>+		if_freq = 5000000;</div><div class='add'>+	} else if (c-&gt;bandwidth_hz &lt;= 6000000) {</div><div class='ctx'> 		if_freq = 4000000;</div><div class='del'>-		break;</div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	} else if (c-&gt;bandwidth_hz &lt;= 7000000) {</div><div class='ctx'> 		if_freq = 4500000;</div><div class='del'>-		break;</div><div class='del'>-	default:		   /* 8 MHz or Auto */</div><div class='add'>+	} else {	/* 8 MHz */</div><div class='ctx'> 		if_freq = 5000000;</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='del'>-	tuner_freq = params-&gt;frequency;</div><div class='add'>+	tuner_freq = c-&gt;frequency;</div><div class='ctx'> </div><div class='del'>-	if (fe-&gt;ops.info.type == FE_QAM) {</div><div class='add'>+	switch (c-&gt;delivery_system) {</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='add'>+	case SYS_DVBC_ANNEX_C:</div><div class='ctx'> 		dprintk("%s select tda827xa_dvbc\n", __func__);</div><div class='ctx'> 		frequency_map = tda827xa_dvbc;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	i = 0;</div><div class='hunk'>@@ -645,9 +646,8 @@ static int tda827xa_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;frequency = params-&gt;frequency;</div><div class='del'>-	priv-&gt;bandwidth = (fe-&gt;ops.info.type == FE_OFDM) ? params-&gt;u.ofdm.bandwidth : 0;</div><div class='del'>-</div><div class='add'>+	priv-&gt;frequency = c-&gt;frequency;</div><div class='add'>+	priv-&gt;bandwidth = c-&gt;bandwidth_hz;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/common/tuners/tuner-simple.c b/drivers/media/common/tuners/tuner-simple.c<br/>index f8ee29e6059c..39e7e583c8c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tuner-simple.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tuner-simple.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tuner-simple.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/tuner-simple.c</a></div><div class='hunk'>@@ -751,6 +751,17 @@ static int simple_set_radio_freq(struct dvb_frontend *fe,</div><div class='ctx'> 	if (4 != rc)</div><div class='ctx'> 		tuner_warn("i2c i/o error: rc == %d (should be 4)\n", rc);</div><div class='ctx'> </div><div class='add'>+	/* Write AUX byte */</div><div class='add'>+	switch (priv-&gt;type) {</div><div class='add'>+	case TUNER_PHILIPS_FM1216ME_MK3:</div><div class='add'>+		buffer[2] = 0x98;</div><div class='add'>+		buffer[3] = 0x20; /* set TOP AGC */</div><div class='add'>+		rc = tuner_i2c_xfer_send(&amp;priv-&gt;i2c_props, buffer, 4);</div><div class='add'>+		if (4 != rc)</div><div class='add'>+			tuner_warn("i2c i/o error: rc == %d (should be 4)\n", rc);</div><div class='add'>+		break;</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'>@@ -780,24 +791,26 @@ static int simple_set_params(struct dvb_frontend *fe,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void simple_set_dvb(struct dvb_frontend *fe, u8 *buf,</div><div class='del'>-			   const struct dvb_frontend_parameters *params)</div><div class='add'>+			   const u32 delsys,</div><div class='add'>+			   const u32 frequency,</div><div class='add'>+			   const u32 bandwidth)</div><div class='ctx'> {</div><div class='ctx'> 	struct tuner_simple_priv *priv = fe-&gt;tuner_priv;</div><div class='ctx'> </div><div class='ctx'> 	switch (priv-&gt;type) {</div><div class='ctx'> 	case TUNER_PHILIPS_FMD1216ME_MK3:</div><div class='ctx'> 	case TUNER_PHILIPS_FMD1216MEX_MK3:</div><div class='del'>-		if (params-&gt;u.ofdm.bandwidth == BANDWIDTH_8_MHZ &amp;&amp;</div><div class='del'>-		    params-&gt;frequency &gt;= 158870000)</div><div class='add'>+		if (bandwidth == 8000000 &amp;&amp;</div><div class='add'>+		    frequency &gt;= 158870000)</div><div class='ctx'> 			buf[3] |= 0x08;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TUNER_PHILIPS_TD1316:</div><div class='ctx'> 		/* determine band */</div><div class='del'>-		buf[3] |= (params-&gt;frequency &lt; 161000000) ? 1 :</div><div class='del'>-			  (params-&gt;frequency &lt; 444000000) ? 2 : 4;</div><div class='add'>+		buf[3] |= (frequency &lt; 161000000) ? 1 :</div><div class='add'>+			  (frequency &lt; 444000000) ? 2 : 4;</div><div class='ctx'> </div><div class='ctx'> 		/* setup PLL filter */</div><div class='del'>-		if (params-&gt;u.ofdm.bandwidth == BANDWIDTH_8_MHZ)</div><div class='add'>+		if (bandwidth == 8000000)</div><div class='ctx'> 			buf[3] |= 1 &lt;&lt; 3;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TUNER_PHILIPS_TUV1236D:</div><div class='hunk'>@@ -808,12 +821,11 @@ static void simple_set_dvb(struct dvb_frontend *fe, u8 *buf,</div><div class='ctx'> 		if (dtv_input[priv-&gt;nr])</div><div class='ctx'> 			new_rf = dtv_input[priv-&gt;nr];</div><div class='ctx'> 		else</div><div class='del'>-			switch (params-&gt;u.vsb.modulation) {</div><div class='del'>-			case QAM_64:</div><div class='del'>-			case QAM_256:</div><div class='add'>+			switch (delsys) {</div><div class='add'>+			case SYS_DVBC_ANNEX_B:</div><div class='ctx'> 				new_rf = 1;</div><div class='ctx'> 				break;</div><div class='del'>-			case VSB_8:</div><div class='add'>+			case SYS_ATSC:</div><div class='ctx'> 			default:</div><div class='ctx'> 				new_rf = 0;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -827,7 +839,9 @@ static void simple_set_dvb(struct dvb_frontend *fe, u8 *buf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 simple_dvb_configure(struct dvb_frontend *fe, u8 *buf,</div><div class='del'>-				const struct dvb_frontend_parameters *params)</div><div class='add'>+				const u32 delsys,</div><div class='add'>+				const u32 freq,</div><div class='add'>+				const u32 bw)</div><div class='ctx'> {</div><div class='ctx'> 	/* This function returns the tuned frequency on success, 0 on error */</div><div class='ctx'> 	struct tuner_simple_priv *priv = fe-&gt;tuner_priv;</div><div class='hunk'>@@ -836,7 +850,7 @@ static u32 simple_dvb_configure(struct dvb_frontend *fe, u8 *buf,</div><div class='ctx'> 	u8 config, cb;</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	int ret;</div><div class='del'>-	unsigned frequency = params-&gt;frequency / 62500;</div><div class='add'>+	u32 frequency = freq / 62500;</div><div class='ctx'> </div><div class='ctx'> 	if (!tun-&gt;stepsize) {</div><div class='ctx'> 		/* tuner-core was loaded before the digital tuner was</div><div class='hunk'>@@ -860,7 +874,7 @@ static u32 simple_dvb_configure(struct dvb_frontend *fe, u8 *buf,</div><div class='ctx'> 	buf[2] = config;</div><div class='ctx'> 	buf[3] = cb;</div><div class='ctx'> </div><div class='del'>-	simple_set_dvb(fe, buf, params);</div><div class='add'>+	simple_set_dvb(fe, buf, delsys, freq, bw);</div><div class='ctx'> </div><div class='ctx'> 	tuner_dbg("%s: div=%d | buf=0x%02x,0x%02x,0x%02x,0x%02x\n",</div><div class='ctx'> 		  tun-&gt;name, div, buf[0], buf[1], buf[2], buf[3]);</div><div class='hunk'>@@ -870,32 +884,37 @@ static u32 simple_dvb_configure(struct dvb_frontend *fe, u8 *buf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int simple_dvb_calc_regs(struct dvb_frontend *fe,</div><div class='del'>-				struct dvb_frontend_parameters *params,</div><div class='ctx'> 				u8 *buf, int buf_len)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	u32 delsys = c-&gt;delivery_system;</div><div class='add'>+	u32 bw = c-&gt;bandwidth_hz;</div><div class='ctx'> 	struct tuner_simple_priv *priv = fe-&gt;tuner_priv;</div><div class='ctx'> 	u32 frequency;</div><div class='ctx'> </div><div class='ctx'> 	if (buf_len &lt; 5)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	frequency = simple_dvb_configure(fe, buf+1, params);</div><div class='add'>+	frequency = simple_dvb_configure(fe, buf+1, delsys, c-&gt;frequency, bw);</div><div class='ctx'> 	if (frequency == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	buf[0] = priv-&gt;i2c_props.addr;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;frequency = frequency;</div><div class='del'>-	priv-&gt;bandwidth = (fe-&gt;ops.info.type == FE_OFDM) ?</div><div class='del'>-		params-&gt;u.ofdm.bandwidth : 0;</div><div class='add'>+	priv-&gt;bandwidth = c-&gt;bandwidth_hz;</div><div class='ctx'> </div><div class='ctx'> 	return 5;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int simple_dvb_set_params(struct dvb_frontend *fe,</div><div class='del'>-				 struct dvb_frontend_parameters *params)</div><div class='add'>+static int simple_dvb_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	u32 delsys = c-&gt;delivery_system;</div><div class='add'>+	u32 bw = c-&gt;bandwidth_hz;</div><div class='add'>+	u32 freq = c-&gt;frequency;</div><div class='ctx'> 	struct tuner_simple_priv *priv = fe-&gt;tuner_priv;</div><div class='add'>+	u32 frequency;</div><div class='ctx'> 	u32 prev_freq, prev_bw;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 buf[5];</div><div class='hunk'>@@ -906,9 +925,14 @@ static int simple_dvb_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 	prev_freq = priv-&gt;frequency;</div><div class='ctx'> 	prev_bw   = priv-&gt;bandwidth;</div><div class='ctx'> </div><div class='del'>-	ret = simple_dvb_calc_regs(fe, params, buf, 5);</div><div class='del'>-	if (ret != 5)</div><div class='del'>-		goto fail;</div><div class='add'>+	frequency = simple_dvb_configure(fe, buf+1, delsys, freq, bw);</div><div class='add'>+	if (frequency == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	buf[0] = priv-&gt;i2c_props.addr;</div><div class='add'>+</div><div class='add'>+	priv-&gt;frequency = frequency;</div><div class='add'>+	priv-&gt;bandwidth = bw;</div><div class='ctx'> </div><div class='ctx'> 	/* put analog demod in standby when tuning digital */</div><div class='ctx'> 	if (fe-&gt;ops.analog_ops.standby)</div><div class='head'>diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/common/tuners/tuner-xc2028.c<br/>index 3acbaa04e1b3..b5ee3ebfcfca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tuner-xc2028.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/tuner-xc2028.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/tuner-xc2028.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/tuner-xc2028.c</a></div><div class='hunk'>@@ -24,6 +24,21 @@</div><div class='ctx'> #include &lt;linux/dvb/frontend.h&gt;</div><div class='ctx'> #include "dvb_frontend.h"</div><div class='ctx'> </div><div class='add'>+/* Registers (Write-only) */</div><div class='add'>+#define XREG_INIT         0x00</div><div class='add'>+#define XREG_RF_FREQ      0x02</div><div class='add'>+#define XREG_POWER_DOWN   0x08</div><div class='add'>+</div><div class='add'>+/* Registers (Read-only) */</div><div class='add'>+#define XREG_FREQ_ERROR   0x01</div><div class='add'>+#define XREG_LOCK         0x02</div><div class='add'>+#define XREG_VERSION      0x04</div><div class='add'>+#define XREG_PRODUCT_ID   0x08</div><div class='add'>+#define XREG_HSYNC_FREQ   0x10</div><div class='add'>+#define XREG_FRAME_LINES  0x20</div><div class='add'>+#define XREG_SNR          0x40</div><div class='add'>+</div><div class='add'>+#define XREG_ADC_ENV      0x0100</div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='ctx'> module_param(debug, int, 0644);</div><div class='hunk'>@@ -311,7 +326,7 @@ static int load_all_firmwares(struct dvb_frontend *fe)</div><div class='ctx'> 		   n_array, fname, name,</div><div class='ctx'> 		   priv-&gt;firm_version &gt;&gt; 8, priv-&gt;firm_version &amp; 0xff);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;firm = kzalloc(sizeof(*priv-&gt;firm) * n_array, GFP_KERNEL);</div><div class='add'>+	priv-&gt;firm = kcalloc(n_array, sizeof(*priv-&gt;firm), GFP_KERNEL);</div><div class='ctx'> 	if (priv-&gt;firm == NULL) {</div><div class='ctx'> 		tuner_err("Not enough memory to load firmware file.\n");</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='hunk'>@@ -885,16 +900,16 @@ static int xc2028_signal(struct dvb_frontend *fe, u16 *strength)</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Sync Lock Indicator */</div><div class='del'>-	rc = xc2028_get_reg(priv, 0x0002, &amp;frq_lock);</div><div class='add'>+	rc = xc2028_get_reg(priv, XREG_LOCK, &amp;frq_lock);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		goto ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Frequency is locked */</div><div class='ctx'> 	if (frq_lock == 1)</div><div class='del'>-		signal = 32768;</div><div class='add'>+		signal = 1 &lt;&lt; 11;</div><div class='ctx'> </div><div class='ctx'> 	/* Get SNR of the video signal */</div><div class='del'>-	rc = xc2028_get_reg(priv, 0x0040, &amp;signal);</div><div class='add'>+	rc = xc2028_get_reg(priv, XREG_SNR, &amp;signal);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		goto ret;</div><div class='ctx'> </div><div class='hunk'>@@ -962,14 +977,24 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,</div><div class='ctx'> 		 * For DTV 7/8, the firmware uses BW = 8000, so it needs a</div><div class='ctx'> 		 * further adjustment to get the frequency center on VHF</div><div class='ctx'> 		 */</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The firmware DTV78 used to work fine in UHF band (8 MHz</div><div class='add'>+		 * bandwidth) but not at all in VHF band (7 MHz bandwidth).</div><div class='add'>+		 * The real problem was connected to the formula used to</div><div class='add'>+		 * calculate the center frequency offset in VHF band.</div><div class='add'>+		 * In fact, removing the 500KHz adjustment fixed the problem.</div><div class='add'>+		 * This is coherent to what was implemented for the DTV7</div><div class='add'>+		 * firmware.</div><div class='add'>+		 * In the end, now the center frequency is the same for all 3</div><div class='add'>+		 * firmwares (DTV7, DTV8, DTV78) and doesn't depend on channel</div><div class='add'>+		 * bandwidth.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='ctx'> 		if (priv-&gt;cur_fw.type &amp; DTV6)</div><div class='ctx'> 			offset = 1750000;</div><div class='del'>-		else if (priv-&gt;cur_fw.type &amp; DTV7)</div><div class='del'>-			offset = 2250000;</div><div class='del'>-		else	/* DTV8 or DTV78 */</div><div class='add'>+		else	/* DTV7 or DTV8 or DTV78 */</div><div class='ctx'> 			offset = 2750000;</div><div class='del'>-		if ((priv-&gt;cur_fw.type &amp; DTV78) &amp;&amp; freq &lt; 470000000)</div><div class='del'>-			offset -= 500000;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * xc3028 additional "magic"</div><div class='hunk'>@@ -979,17 +1004,13 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,</div><div class='ctx'> 		 * newer firmwares</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-#if 1</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The proper adjustment would be to do it at s-code table.</div><div class='ctx'> 		 * However, this didn't work, as reported by</div><div class='ctx'> 		 * Robert Lowery &lt;rglowery@exemail.com.au&gt;</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		if (priv-&gt;cur_fw.type &amp; DTV7)</div><div class='del'>-			offset += 500000;</div><div class='del'>-</div><div class='del'>-#else</div><div class='add'>+#if 0</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Still need tests for XC3028L (firmware 3.2 or upper)</div><div class='ctx'> 		 * So, for now, let's just comment the per-firmware</div><div class='hunk'>@@ -1013,9 +1034,9 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,</div><div class='ctx'> </div><div class='ctx'> 	/* CMD= Set frequency */</div><div class='ctx'> 	if (priv-&gt;firm_version &lt; 0x0202)</div><div class='del'>-		rc = send_seq(priv, {0x00, 0x02, 0x00, 0x00});</div><div class='add'>+		rc = send_seq(priv, {0x00, XREG_RF_FREQ, 0x00, 0x00});</div><div class='ctx'> 	else</div><div class='del'>-		rc = send_seq(priv, {0x80, 0x02, 0x00, 0x00});</div><div class='add'>+		rc = send_seq(priv, {0x80, XREG_RF_FREQ, 0x00, 0x00});</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		goto ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1084,68 +1105,28 @@ static int xc2028_set_analog_freq(struct dvb_frontend *fe,</div><div class='ctx'> 				V4L2_TUNER_ANALOG_TV, type, p-&gt;std, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xc2028_set_params(struct dvb_frontend *fe,</div><div class='del'>-			     struct dvb_frontend_parameters *p)</div><div class='add'>+static int xc2028_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	u32 delsys = c-&gt;delivery_system;</div><div class='add'>+	u32 bw = c-&gt;bandwidth_hz;</div><div class='ctx'> 	struct xc2028_data *priv = fe-&gt;tuner_priv;</div><div class='ctx'> 	unsigned int       type=0;</div><div class='del'>-	fe_bandwidth_t     bw = BANDWIDTH_8_MHZ;</div><div class='ctx'> 	u16                demod = 0;</div><div class='ctx'> </div><div class='ctx'> 	tuner_dbg("%s called\n", __func__);</div><div class='ctx'> </div><div class='del'>-	switch(fe-&gt;ops.info.type) {</div><div class='del'>-	case FE_OFDM:</div><div class='del'>-		bw = p-&gt;u.ofdm.bandwidth;</div><div class='add'>+	switch (delsys) {</div><div class='add'>+	case SYS_DVBT:</div><div class='add'>+	case SYS_DVBT2:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The only countries with 6MHz seem to be Taiwan/Uruguay.</div><div class='ctx'> 		 * Both seem to require QAM firmware for OFDM decoding</div><div class='ctx'> 		 * Tested in Taiwan by Terry Wu &lt;terrywu2009@gmail.com&gt;</div><div class='ctx'> 		 */</div><div class='del'>-		if (bw == BANDWIDTH_6_MHZ)</div><div class='add'>+		if (bw &lt;= 6000000)</div><div class='ctx'> 			type |= QAM;</div><div class='del'>-		break;</div><div class='del'>-	case FE_ATSC:</div><div class='del'>-		bw = BANDWIDTH_6_MHZ;</div><div class='del'>-		/* The only ATSC firmware (at least on v2.7) is D2633 */</div><div class='del'>-		type |= ATSC | D2633;</div><div class='del'>-		break;</div><div class='del'>-	/* DVB-S and pure QAM (FE_QAM) are not supported */</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (bw) {</div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='del'>-		if (p-&gt;frequency &lt; 470000000)</div><div class='del'>-			priv-&gt;ctrl.vhfbw7 = 0;</div><div class='del'>-		else</div><div class='del'>-			priv-&gt;ctrl.uhfbw8 = 1;</div><div class='del'>-		type |= (priv-&gt;ctrl.vhfbw7 &amp;&amp; priv-&gt;ctrl.uhfbw8) ? DTV78 : DTV8;</div><div class='del'>-		type |= F8MHZ;</div><div class='del'>-		break;</div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='del'>-		if (p-&gt;frequency &lt; 470000000)</div><div class='del'>-			priv-&gt;ctrl.vhfbw7 = 1;</div><div class='del'>-		else</div><div class='del'>-			priv-&gt;ctrl.uhfbw8 = 0;</div><div class='del'>-		type |= (priv-&gt;ctrl.vhfbw7 &amp;&amp; priv-&gt;ctrl.uhfbw8) ? DTV78 : DTV7;</div><div class='del'>-		type |= F8MHZ;</div><div class='del'>-		break;</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='del'>-		type |= DTV6;</div><div class='del'>-		priv-&gt;ctrl.vhfbw7 = 0;</div><div class='del'>-		priv-&gt;ctrl.uhfbw8 = 0;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		tuner_err("error: bandwidth not supported.\n");</div><div class='del'>-	};</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	  Selects between D2633 or D2620 firmware.</div><div class='del'>-	  It doesn't make sense for ATSC, since it should be D2633 on all cases</div><div class='del'>-	 */</div><div class='del'>-	if (fe-&gt;ops.info.type != FE_ATSC) {</div><div class='ctx'> 		switch (priv-&gt;ctrl.type) {</div><div class='ctx'> 		case XC2028_D2633:</div><div class='ctx'> 			type |= D2633;</div><div class='hunk'>@@ -1161,6 +1142,34 @@ static int xc2028_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 			else</div><div class='ctx'> 				type |= D2620;</div><div class='ctx'> 		}</div><div class='add'>+		break;</div><div class='add'>+	case SYS_ATSC:</div><div class='add'>+		/* The only ATSC firmware (at least on v2.7) is D2633 */</div><div class='add'>+		type |= ATSC | D2633;</div><div class='add'>+		break;</div><div class='add'>+	/* DVB-S and pure QAM (FE_QAM) are not supported */</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bw &lt;= 6000000) {</div><div class='add'>+		type |= DTV6;</div><div class='add'>+		priv-&gt;ctrl.vhfbw7 = 0;</div><div class='add'>+		priv-&gt;ctrl.uhfbw8 = 0;</div><div class='add'>+	} else if (bw &lt;= 7000000) {</div><div class='add'>+		if (c-&gt;frequency &lt; 470000000)</div><div class='add'>+			priv-&gt;ctrl.vhfbw7 = 1;</div><div class='add'>+		else</div><div class='add'>+			priv-&gt;ctrl.uhfbw8 = 0;</div><div class='add'>+		type |= (priv-&gt;ctrl.vhfbw7 &amp;&amp; priv-&gt;ctrl.uhfbw8) ? DTV78 : DTV7;</div><div class='add'>+		type |= F8MHZ;</div><div class='add'>+	} else {</div><div class='add'>+		if (c-&gt;frequency &lt; 470000000)</div><div class='add'>+			priv-&gt;ctrl.vhfbw7 = 0;</div><div class='add'>+		else</div><div class='add'>+			priv-&gt;ctrl.uhfbw8 = 1;</div><div class='add'>+		type |= (priv-&gt;ctrl.vhfbw7 &amp;&amp; priv-&gt;ctrl.uhfbw8) ? DTV78 : DTV8;</div><div class='add'>+		type |= F8MHZ;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* All S-code tables need a 200kHz shift */</div><div class='hunk'>@@ -1185,7 +1194,7 @@ static int xc2028_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 		 */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return generic_set_freq(fe, p-&gt;frequency,</div><div class='add'>+	return generic_set_freq(fe, c-&gt;frequency,</div><div class='ctx'> 				V4L2_TUNER_DIGITAL_TV, type, 0, demod);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1207,9 +1216,9 @@ static int xc2028_sleep(struct dvb_frontend *fe)</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;firm_version &lt; 0x0202)</div><div class='del'>-		rc = send_seq(priv, {0x00, 0x08, 0x00, 0x00});</div><div class='add'>+		rc = send_seq(priv, {0x00, XREG_POWER_DOWN, 0x00, 0x00});</div><div class='ctx'> 	else</div><div class='del'>-		rc = send_seq(priv, {0x80, 0x08, 0x00, 0x00});</div><div class='add'>+		rc = send_seq(priv, {0x80, XREG_POWER_DOWN, 0x00, 0x00});</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;cur_fw.type = 0;	/* need firmware reload */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/common/tuners/xc4000.c b/drivers/media/common/tuners/xc4000.c<br/>index 634f4d9b6c63..68397110b7d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/xc4000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/xc4000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/xc4000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/xc4000.c</a></div><div class='hunk'>@@ -154,6 +154,8 @@ struct xc4000_priv {</div><div class='ctx'> #define XREG_SNR          0x06</div><div class='ctx'> #define XREG_VERSION      0x07</div><div class='ctx'> #define XREG_PRODUCT_ID   0x08</div><div class='add'>+#define XREG_SIGNAL_LEVEL 0x0A</div><div class='add'>+#define XREG_NOISE_LEVEL  0x0B</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>    Basic firmware description. This will remain with</div><div class='hunk'>@@ -486,6 +488,16 @@ static int xc_get_quality(struct xc4000_priv *priv, u16 *quality)</div><div class='ctx'> 	return xc4000_readreg(priv, XREG_QUALITY, quality);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int xc_get_signal_level(struct xc4000_priv *priv, u16 *signal)</div><div class='add'>+{</div><div class='add'>+	return xc4000_readreg(priv, XREG_SIGNAL_LEVEL, signal);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xc_get_noise_level(struct xc4000_priv *priv, u16 *noise)</div><div class='add'>+{</div><div class='add'>+	return xc4000_readreg(priv, XREG_NOISE_LEVEL, noise);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u16 xc_wait_for_lock(struct xc4000_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	u16	lock_state = 0;</div><div class='hunk'>@@ -758,7 +770,7 @@ static int xc4000_fwupload(struct dvb_frontend *fe)</div><div class='ctx'> 		n_array, fname, name,</div><div class='ctx'> 		priv-&gt;firm_version &gt;&gt; 8, priv-&gt;firm_version &amp; 0xff);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;firm = kzalloc(sizeof(*priv-&gt;firm) * n_array, GFP_KERNEL);</div><div class='add'>+	priv-&gt;firm = kcalloc(n_array, sizeof(*priv-&gt;firm), GFP_KERNEL);</div><div class='ctx'> 	if (priv-&gt;firm == NULL) {</div><div class='ctx'> 		printk(KERN_ERR "Not enough memory to load firmware file.\n");</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='hunk'>@@ -1089,6 +1101,8 @@ static void xc_debug_dump(struct xc4000_priv *priv)</div><div class='ctx'> 	u32	hsync_freq_hz = 0;</div><div class='ctx'> 	u16	frame_lines;</div><div class='ctx'> 	u16	quality;</div><div class='add'>+	u16	signal = 0;</div><div class='add'>+	u16	noise = 0;</div><div class='ctx'> 	u8	hw_majorversion = 0, hw_minorversion = 0;</div><div class='ctx'> 	u8	fw_majorversion = 0, fw_minorversion = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1119,85 +1133,70 @@ static void xc_debug_dump(struct xc4000_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	xc_get_quality(priv, &amp;quality);</div><div class='ctx'> 	dprintk(1, "*** Quality (0:&lt;8dB, 7:&gt;56dB) = %d\n", quality);</div><div class='add'>+</div><div class='add'>+	xc_get_signal_level(priv, &amp;signal);</div><div class='add'>+	dprintk(1, "*** Signal level = -%ddB (%d)\n", signal &gt;&gt; 8, signal);</div><div class='add'>+</div><div class='add'>+	xc_get_noise_level(priv, &amp;noise);</div><div class='add'>+	dprintk(1, "*** Noise level = %ddB (%d)\n", noise &gt;&gt; 8, noise);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xc4000_set_params(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *params)</div><div class='add'>+static int xc4000_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	u32 delsys = c-&gt;delivery_system;</div><div class='add'>+	u32 bw = c-&gt;bandwidth_hz;</div><div class='ctx'> 	struct xc4000_priv *priv = fe-&gt;tuner_priv;</div><div class='ctx'> 	unsigned int type;</div><div class='ctx'> 	int	ret = -EREMOTEIO;</div><div class='ctx'> </div><div class='del'>-	dprintk(1, "%s() frequency=%d (Hz)\n", __func__, params-&gt;frequency);</div><div class='add'>+	dprintk(1, "%s() frequency=%d (Hz)\n", __func__, c-&gt;frequency);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (fe-&gt;ops.info.type == FE_ATSC) {</div><div class='del'>-		dprintk(1, "%s() ATSC\n", __func__);</div><div class='del'>-		switch (params-&gt;u.vsb.modulation) {</div><div class='del'>-		case VSB_8:</div><div class='del'>-		case VSB_16:</div><div class='del'>-			dprintk(1, "%s() VSB modulation\n", __func__);</div><div class='del'>-			priv-&gt;rf_mode = XC_RF_MODE_AIR;</div><div class='del'>-			priv-&gt;freq_hz = params-&gt;frequency - 1750000;</div><div class='del'>-			priv-&gt;bandwidth = BANDWIDTH_6_MHZ;</div><div class='del'>-			priv-&gt;video_standard = XC4000_DTV6;</div><div class='del'>-			type = DTV6;</div><div class='del'>-			break;</div><div class='del'>-		case QAM_64:</div><div class='del'>-		case QAM_256:</div><div class='del'>-		case QAM_AUTO:</div><div class='del'>-			dprintk(1, "%s() QAM modulation\n", __func__);</div><div class='del'>-			priv-&gt;rf_mode = XC_RF_MODE_CABLE;</div><div class='del'>-			priv-&gt;freq_hz = params-&gt;frequency - 1750000;</div><div class='del'>-			priv-&gt;bandwidth = BANDWIDTH_6_MHZ;</div><div class='del'>-			priv-&gt;video_standard = XC4000_DTV6;</div><div class='del'>-			type = DTV6;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-	} else if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='add'>+	switch (delsys) {</div><div class='add'>+	case SYS_ATSC:</div><div class='add'>+		dprintk(1, "%s() VSB modulation\n", __func__);</div><div class='add'>+		priv-&gt;rf_mode = XC_RF_MODE_AIR;</div><div class='add'>+		priv-&gt;freq_hz = c-&gt;frequency - 1750000;</div><div class='add'>+		priv-&gt;video_standard = XC4000_DTV6;</div><div class='add'>+		type = DTV6;</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_B:</div><div class='add'>+		dprintk(1, "%s() QAM modulation\n", __func__);</div><div class='add'>+		priv-&gt;rf_mode = XC_RF_MODE_CABLE;</div><div class='add'>+		priv-&gt;freq_hz = c-&gt;frequency - 1750000;</div><div class='add'>+		priv-&gt;video_standard = XC4000_DTV6;</div><div class='add'>+		type = DTV6;</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBT:</div><div class='add'>+	case SYS_DVBT2:</div><div class='ctx'> 		dprintk(1, "%s() OFDM\n", __func__);</div><div class='del'>-		switch (params-&gt;u.ofdm.bandwidth) {</div><div class='del'>-		case BANDWIDTH_6_MHZ:</div><div class='del'>-			priv-&gt;bandwidth = BANDWIDTH_6_MHZ;</div><div class='add'>+		if (bw == 0) {</div><div class='add'>+			if (c-&gt;frequency &lt; 400000000) {</div><div class='add'>+				priv-&gt;freq_hz = c-&gt;frequency - 2250000;</div><div class='add'>+			} else {</div><div class='add'>+				priv-&gt;freq_hz = c-&gt;frequency - 2750000;</div><div class='add'>+			}</div><div class='add'>+			priv-&gt;video_standard = XC4000_DTV7_8;</div><div class='add'>+			type = DTV78;</div><div class='add'>+		} else if (bw &lt;= 6000000) {</div><div class='ctx'> 			priv-&gt;video_standard = XC4000_DTV6;</div><div class='del'>-			priv-&gt;freq_hz = params-&gt;frequency - 1750000;</div><div class='add'>+			priv-&gt;freq_hz = c-&gt;frequency - 1750000;</div><div class='ctx'> 			type = DTV6;</div><div class='del'>-			break;</div><div class='del'>-		case BANDWIDTH_7_MHZ:</div><div class='del'>-			priv-&gt;bandwidth = BANDWIDTH_7_MHZ;</div><div class='add'>+		} else if (bw &lt;= 7000000) {</div><div class='ctx'> 			priv-&gt;video_standard = XC4000_DTV7;</div><div class='del'>-			priv-&gt;freq_hz = params-&gt;frequency - 2250000;</div><div class='add'>+			priv-&gt;freq_hz = c-&gt;frequency - 2250000;</div><div class='ctx'> 			type = DTV7;</div><div class='del'>-			break;</div><div class='del'>-		case BANDWIDTH_8_MHZ:</div><div class='del'>-			priv-&gt;bandwidth = BANDWIDTH_8_MHZ;</div><div class='add'>+		} else {</div><div class='ctx'> 			priv-&gt;video_standard = XC4000_DTV8;</div><div class='del'>-			priv-&gt;freq_hz = params-&gt;frequency - 2750000;</div><div class='add'>+			priv-&gt;freq_hz = c-&gt;frequency - 2750000;</div><div class='ctx'> 			type = DTV8;</div><div class='del'>-			break;</div><div class='del'>-		case BANDWIDTH_AUTO:</div><div class='del'>-			if (params-&gt;frequency &lt; 400000000) {</div><div class='del'>-				priv-&gt;bandwidth = BANDWIDTH_7_MHZ;</div><div class='del'>-				priv-&gt;freq_hz = params-&gt;frequency - 2250000;</div><div class='del'>-			} else {</div><div class='del'>-				priv-&gt;bandwidth = BANDWIDTH_8_MHZ;</div><div class='del'>-				priv-&gt;freq_hz = params-&gt;frequency - 2750000;</div><div class='del'>-			}</div><div class='del'>-			priv-&gt;video_standard = XC4000_DTV7_8;</div><div class='del'>-			type = DTV78;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			printk(KERN_ERR "xc4000 bandwidth not set!\n");</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto fail;</div><div class='ctx'> 		}</div><div class='ctx'> 		priv-&gt;rf_mode = XC_RF_MODE_AIR;</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_ERR "xc4000 modulation type not supported!\n");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "xc4000 delivery system not supported!\n");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1209,6 +1208,8 @@ static int xc4000_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 	if (check_firmware(fe, type, 0, priv-&gt;if_khz) != 0)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='add'>+	priv-&gt;bandwidth = c-&gt;bandwidth_hz;</div><div class='add'>+</div><div class='ctx'> 	ret = xc_set_signal_source(priv, priv-&gt;rf_mode);</div><div class='ctx'> 	if (ret != 0) {</div><div class='ctx'> 		printk(KERN_ERR "xc4000: xc_set_signal_source(%d) failed\n",</div><div class='hunk'>@@ -1451,6 +1452,71 @@ fail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int xc4000_get_signal(struct dvb_frontend *fe, u16 *strength)</div><div class='add'>+{</div><div class='add'>+	struct xc4000_priv *priv = fe-&gt;tuner_priv;</div><div class='add'>+	u16 value = 0;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;lock);</div><div class='add'>+	rc = xc4000_readreg(priv, XREG_SIGNAL_LEVEL, &amp;value);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		goto ret;</div><div class='add'>+</div><div class='add'>+	/* Informations from real testing of DVB-T and radio part,</div><div class='add'>+	   coeficient for one dB is 0xff.</div><div class='add'>+	 */</div><div class='add'>+	tuner_dbg("Signal strength: -%ddB (%05d)\n", value &gt;&gt; 8, value);</div><div class='add'>+</div><div class='add'>+	/* all known digital modes */</div><div class='add'>+	if ((priv-&gt;video_standard == XC4000_DTV6) ||</div><div class='add'>+	    (priv-&gt;video_standard == XC4000_DTV7) ||</div><div class='add'>+	    (priv-&gt;video_standard == XC4000_DTV7_8) ||</div><div class='add'>+	    (priv-&gt;video_standard == XC4000_DTV8))</div><div class='add'>+		goto digital;</div><div class='add'>+</div><div class='add'>+	/* Analog mode has NOISE LEVEL important, signal</div><div class='add'>+	   depends only on gain of antenna and amplifiers,</div><div class='add'>+	   but it doesn't tell anything about real quality</div><div class='add'>+	   of reception.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;priv-&gt;lock);</div><div class='add'>+	rc = xc4000_readreg(priv, XREG_NOISE_LEVEL, &amp;value);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	tuner_dbg("Noise level: %ddB (%05d)\n", value &gt;&gt; 8, value);</div><div class='add'>+</div><div class='add'>+	/* highest noise level: 32dB */</div><div class='add'>+	if (value &gt;= 0x2000) {</div><div class='add'>+		value = 0;</div><div class='add'>+	} else {</div><div class='add'>+		value = ~value &lt;&lt; 3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	goto ret;</div><div class='add'>+</div><div class='add'>+	/* Digital mode has SIGNAL LEVEL important and real</div><div class='add'>+	   noise level is stored in demodulator registers.</div><div class='add'>+	 */</div><div class='add'>+digital:</div><div class='add'>+	/* best signal: -50dB */</div><div class='add'>+	if (value &lt;= 0x3200) {</div><div class='add'>+		value = 0xffff;</div><div class='add'>+	/* minimum: -114dB - should be 0x7200 but real zero is 0x713A */</div><div class='add'>+	} else if (value &gt;= 0x713A) {</div><div class='add'>+		value = 0;</div><div class='add'>+	} else {</div><div class='add'>+		value = ~(value - 0x3200) &lt;&lt; 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ret:</div><div class='add'>+	*strength = value;</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int xc4000_get_frequency(struct dvb_frontend *fe, u32 *freq)</div><div class='ctx'> {</div><div class='ctx'> 	struct xc4000_priv *priv = fe-&gt;tuner_priv;</div><div class='hunk'>@@ -1578,6 +1644,7 @@ static const struct dvb_tuner_ops xc4000_tuner_ops = {</div><div class='ctx'> 	.set_params	   = xc4000_set_params,</div><div class='ctx'> 	.set_analog_params = xc4000_set_analog_params,</div><div class='ctx'> 	.get_frequency	   = xc4000_get_frequency,</div><div class='add'>+	.get_rf_strength   = xc4000_get_signal,</div><div class='ctx'> 	.get_bandwidth	   = xc4000_get_bandwidth,</div><div class='ctx'> 	.get_status	   = xc4000_get_status</div><div class='ctx'> };</div><div class='hunk'>@@ -1605,7 +1672,7 @@ struct dvb_frontend *xc4000_attach(struct dvb_frontend *fe,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		/* new tuner instance */</div><div class='del'>-		priv-&gt;bandwidth = BANDWIDTH_6_MHZ;</div><div class='add'>+		priv-&gt;bandwidth = 6000000;</div><div class='ctx'> 		/* set default configuration */</div><div class='ctx'> 		priv-&gt;if_khz = 4560;</div><div class='ctx'> 		priv-&gt;default_pm = 0;</div><div class='head'>diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c<br/>index aa1b2e844d32..296df05b8cda 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/xc5000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/common/tuners/xc5000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/tuners/xc5000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/common/tuners/xc5000.c</a></div><div class='hunk'>@@ -628,20 +628,13 @@ static void xc_debug_dump(struct xc5000_priv *priv)</div><div class='ctx'> 	dprintk(1, "*** Quality (0:&lt;8dB, 7:&gt;56dB) = %d\n", quality);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * As defined on EN 300 429, the DVB-C roll-off factor is 0.15.</div><div class='del'>- * So, the amount of the needed bandwith is given by:</div><div class='del'>- * 	Bw = Symbol_rate * (1 + 0.15)</div><div class='del'>- * As such, the maximum symbol rate supported by 6 MHz is given by:</div><div class='del'>- *	max_symbol_rate = 6 MHz / 1.15 = 5217391 Bauds</div><div class='del'>- */</div><div class='del'>-#define MAX_SYMBOL_RATE_6MHz	5217391</div><div class='del'>-</div><div class='del'>-static int xc5000_set_params(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *params)</div><div class='add'>+static int xc5000_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	int ret, b;</div><div class='ctx'> 	struct xc5000_priv *priv = fe-&gt;tuner_priv;</div><div class='del'>-	int ret;</div><div class='add'>+	u32 bw = fe-&gt;dtv_property_cache.bandwidth_hz;</div><div class='add'>+	u32 freq = fe-&gt;dtv_property_cache.frequency;</div><div class='add'>+	u32 delsys  = fe-&gt;dtv_property_cache.delivery_system;</div><div class='ctx'> </div><div class='ctx'> 	if (xc5000_is_firmware_loaded(fe) != XC_RESULT_SUCCESS) {</div><div class='ctx'> 		if (xc_load_fw_and_init_tuner(fe) != XC_RESULT_SUCCESS) {</div><div class='hunk'>@@ -650,88 +643,69 @@ static int xc5000_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dprintk(1, "%s() frequency=%d (Hz)\n", __func__, params-&gt;frequency);</div><div class='del'>-</div><div class='del'>-	if (fe-&gt;ops.info.type == FE_ATSC) {</div><div class='del'>-		dprintk(1, "%s() ATSC\n", __func__);</div><div class='del'>-		switch (params-&gt;u.vsb.modulation) {</div><div class='del'>-		case VSB_8:</div><div class='del'>-		case VSB_16:</div><div class='del'>-			dprintk(1, "%s() VSB modulation\n", __func__);</div><div class='del'>-			priv-&gt;rf_mode = XC_RF_MODE_AIR;</div><div class='del'>-			priv-&gt;freq_hz = params-&gt;frequency - 1750000;</div><div class='del'>-			priv-&gt;bandwidth = BANDWIDTH_6_MHZ;</div><div class='del'>-			priv-&gt;video_standard = DTV6;</div><div class='del'>-			break;</div><div class='del'>-		case QAM_64:</div><div class='del'>-		case QAM_256:</div><div class='del'>-		case QAM_AUTO:</div><div class='del'>-			dprintk(1, "%s() QAM modulation\n", __func__);</div><div class='del'>-			priv-&gt;rf_mode = XC_RF_MODE_CABLE;</div><div class='del'>-			priv-&gt;freq_hz = params-&gt;frequency - 1750000;</div><div class='del'>-			priv-&gt;bandwidth = BANDWIDTH_6_MHZ;</div><div class='del'>-			priv-&gt;video_standard = DTV6;</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 if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='add'>+	dprintk(1, "%s() frequency=%d (Hz)\n", __func__, freq);</div><div class='add'>+</div><div class='add'>+	switch (delsys) {</div><div class='add'>+	case SYS_ATSC:</div><div class='add'>+		dprintk(1, "%s() VSB modulation\n", __func__);</div><div class='add'>+		priv-&gt;rf_mode = XC_RF_MODE_AIR;</div><div class='add'>+		priv-&gt;freq_hz = freq - 1750000;</div><div class='add'>+		priv-&gt;video_standard = DTV6;</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_B:</div><div class='add'>+		dprintk(1, "%s() QAM modulation\n", __func__);</div><div class='add'>+		priv-&gt;rf_mode = XC_RF_MODE_CABLE;</div><div class='add'>+		priv-&gt;freq_hz = freq - 1750000;</div><div class='add'>+		priv-&gt;video_standard = DTV6;</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBT:</div><div class='add'>+	case SYS_DVBT2:</div><div class='ctx'> 		dprintk(1, "%s() OFDM\n", __func__);</div><div class='del'>-		switch (params-&gt;u.ofdm.bandwidth) {</div><div class='del'>-		case BANDWIDTH_6_MHZ:</div><div class='del'>-			priv-&gt;bandwidth = BANDWIDTH_6_MHZ;</div><div class='add'>+		switch (bw) {</div><div class='add'>+		case 6000000:</div><div class='ctx'> 			priv-&gt;video_standard = DTV6;</div><div class='del'>-			priv-&gt;freq_hz = params-&gt;frequency - 1750000;</div><div class='add'>+			priv-&gt;freq_hz = freq - 1750000;</div><div class='ctx'> 			break;</div><div class='del'>-		case BANDWIDTH_7_MHZ:</div><div class='del'>-			printk(KERN_ERR "xc5000 bandwidth 7MHz not supported\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		case BANDWIDTH_8_MHZ:</div><div class='del'>-			priv-&gt;bandwidth = BANDWIDTH_8_MHZ;</div><div class='add'>+		case 7000000:</div><div class='add'>+			priv-&gt;video_standard = DTV7;</div><div class='add'>+			priv-&gt;freq_hz = freq - 2250000;</div><div class='add'>+			break;</div><div class='add'>+		case 8000000:</div><div class='ctx'> 			priv-&gt;video_standard = DTV8;</div><div class='del'>-			priv-&gt;freq_hz = params-&gt;frequency - 2750000;</div><div class='add'>+			priv-&gt;freq_hz = freq - 2750000;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			printk(KERN_ERR "xc5000 bandwidth not set!\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		priv-&gt;rf_mode = XC_RF_MODE_AIR;</div><div class='del'>-	} else if (fe-&gt;ops.info.type == FE_QAM) {</div><div class='del'>-		switch (params-&gt;u.qam.modulation) {</div><div class='del'>-		case QAM_256:</div><div class='del'>-		case QAM_AUTO:</div><div class='del'>-		case QAM_16:</div><div class='del'>-		case QAM_32:</div><div class='del'>-		case QAM_64:</div><div class='del'>-		case QAM_128:</div><div class='del'>-			dprintk(1, "%s() QAM modulation\n", __func__);</div><div class='del'>-			priv-&gt;rf_mode = XC_RF_MODE_CABLE;</div><div class='del'>-			/*</div><div class='del'>-			 * Using a 8MHz bandwidth sometimes fail</div><div class='del'>-			 * with 6MHz-spaced channels, due to inter-carrier</div><div class='del'>-			 * interference. So, use DTV6 firmware</div><div class='del'>-			 */</div><div class='del'>-			if (params-&gt;u.qam.symbol_rate &lt;= MAX_SYMBOL_RATE_6MHz) {</div><div class='del'>-				priv-&gt;bandwidth = BANDWIDTH_6_MHZ;</div><div class='del'>-				priv-&gt;video_standard = DTV6;</div><div class='del'>-				priv-&gt;freq_hz = params-&gt;frequency - 1750000;</div><div class='del'>-			} else {</div><div class='del'>-				priv-&gt;bandwidth = BANDWIDTH_8_MHZ;</div><div class='del'>-				priv-&gt;video_standard = DTV7_8;</div><div class='del'>-				priv-&gt;freq_hz = params-&gt;frequency - 2750000;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			dprintk(1, "%s() Unsupported QAM type\n", __func__);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='add'>+	case SYS_DVBC_ANNEX_C:</div><div class='add'>+		dprintk(1, "%s() QAM modulation\n", __func__);</div><div class='add'>+		priv-&gt;rf_mode = XC_RF_MODE_CABLE;</div><div class='add'>+		if (bw &lt;= 6000000) {</div><div class='add'>+			priv-&gt;video_standard = DTV6;</div><div class='add'>+			priv-&gt;freq_hz = freq - 1750000;</div><div class='add'>+			b = 6;</div><div class='add'>+		} else if (bw &lt;= 7000000) {</div><div class='add'>+			priv-&gt;video_standard = DTV7;</div><div class='add'>+			priv-&gt;freq_hz = freq - 2250000;</div><div class='add'>+			b = 7;</div><div class='add'>+		} else {</div><div class='add'>+			priv-&gt;video_standard = DTV7_8;</div><div class='add'>+			priv-&gt;freq_hz = freq - 2750000;</div><div class='add'>+			b = 8;</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_ERR "xc5000 modulation type not supported!\n");</div><div class='add'>+		dprintk(1, "%s() Bandwidth %dMHz (%d)\n", __func__,</div><div class='add'>+			b, bw);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "xc5000: delivery system is not supported!\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dprintk(1, "%s() frequency=%d (compensated)\n",</div><div class='del'>-		__func__, priv-&gt;freq_hz);</div><div class='add'>+	dprintk(1, "%s() frequency=%d (compensated to %d)\n",</div><div class='add'>+		__func__, freq, priv-&gt;freq_hz);</div><div class='ctx'> </div><div class='ctx'> 	ret = xc_SetSignalSource(priv, priv-&gt;rf_mode);</div><div class='ctx'> 	if (ret != XC_RESULT_SUCCESS) {</div><div class='hunk'>@@ -763,6 +737,8 @@ static int xc5000_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 	if (debug)</div><div class='ctx'> 		xc_debug_dump(priv);</div><div class='ctx'> </div><div class='add'>+	priv-&gt;bandwidth = bw;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -968,6 +944,14 @@ static int xc5000_get_frequency(struct dvb_frontend *fe, u32 *freq)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int xc5000_get_if_frequency(struct dvb_frontend *fe, u32 *freq)</div><div class='add'>+{</div><div class='add'>+	struct xc5000_priv *priv = fe-&gt;tuner_priv;</div><div class='add'>+	dprintk(1, "%s()\n", __func__);</div><div class='add'>+	*freq = priv-&gt;if_khz * 1000;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int xc5000_get_bandwidth(struct dvb_frontend *fe, u32 *bw)</div><div class='ctx'> {</div><div class='ctx'> 	struct xc5000_priv *priv = fe-&gt;tuner_priv;</div><div class='hunk'>@@ -1108,6 +1092,7 @@ static const struct dvb_tuner_ops xc5000_tuner_ops = {</div><div class='ctx'> 	.set_params	   = xc5000_set_params,</div><div class='ctx'> 	.set_analog_params = xc5000_set_analog_params,</div><div class='ctx'> 	.get_frequency	   = xc5000_get_frequency,</div><div class='add'>+	.get_if_frequency  = xc5000_get_if_frequency,</div><div class='ctx'> 	.get_bandwidth	   = xc5000_get_bandwidth,</div><div class='ctx'> 	.get_status	   = xc5000_get_status</div><div class='ctx'> };</div><div class='hunk'>@@ -1135,7 +1120,7 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		/* new tuner instance */</div><div class='del'>-		priv-&gt;bandwidth = BANDWIDTH_6_MHZ;</div><div class='add'>+		priv-&gt;bandwidth = 6000000;</div><div class='ctx'> 		fe-&gt;tuner_priv = priv;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='head'>diff --git a/drivers/media/dvb/b2c2/flexcop-usb.c b/drivers/media/dvb/b2c2/flexcop-usb.c<br/>index bedcfb671624..26c666dd3514 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/b2c2/flexcop-usb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/b2c2/flexcop-usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/b2c2/flexcop-usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/b2c2/flexcop-usb.c</a></div><div class='hunk'>@@ -583,25 +583,7 @@ static struct usb_driver flexcop_usb_driver = {</div><div class='ctx'> 	.id_table	= flexcop_usb_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init flexcop_usb_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	if ((result = usb_register(&amp;flexcop_usb_driver))) {</div><div class='del'>-		err("usb_register failed. (%d)", result);</div><div class='del'>-		return result;</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 flexcop_usb_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;flexcop_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(flexcop_usb_module_init);</div><div class='del'>-module_exit(flexcop_usb_module_exit);</div><div class='add'>+module_usb_driver(flexcop_usb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_NAME);</div><div class='head'>diff --git a/drivers/media/dvb/b2c2/flexcop.c b/drivers/media/dvb/b2c2/flexcop.c<br/>index 2df1b0214dcd..b1e8c99f469b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/b2c2/flexcop.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/b2c2/flexcop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/b2c2/flexcop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/b2c2/flexcop.c</a></div><div class='hunk'>@@ -86,7 +86,8 @@ static int flexcop_dvb_init(struct flexcop_device *fc)</div><div class='ctx'> 	fc-&gt;demux.stop_feed = flexcop_dvb_stop_feed;</div><div class='ctx'> 	fc-&gt;demux.write_to_decoder = NULL;</div><div class='ctx'> </div><div class='del'>-	if ((ret = dvb_dmx_init(&amp;fc-&gt;demux)) &lt; 0) {</div><div class='add'>+	ret = dvb_dmx_init(&amp;fc-&gt;demux);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='ctx'> 		err("dvb_dmx failed: error %d", ret);</div><div class='ctx'> 		goto err_dmx;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -96,32 +97,42 @@ static int flexcop_dvb_init(struct flexcop_device *fc)</div><div class='ctx'> 	fc-&gt;dmxdev.filternum = fc-&gt;demux.feednum;</div><div class='ctx'> 	fc-&gt;dmxdev.demux = &amp;fc-&gt;demux.dmx;</div><div class='ctx'> 	fc-&gt;dmxdev.capabilities = 0;</div><div class='del'>-	if ((ret = dvb_dmxdev_init(&amp;fc-&gt;dmxdev, &amp;fc-&gt;dvb_adapter)) &lt; 0) {</div><div class='add'>+	ret = dvb_dmxdev_init(&amp;fc-&gt;dmxdev, &amp;fc-&gt;dvb_adapter);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='ctx'> 		err("dvb_dmxdev_init failed: error %d", ret);</div><div class='ctx'> 		goto err_dmx_dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((ret = fc-&gt;demux.dmx.add_frontend(&amp;fc-&gt;demux.dmx, &amp;fc-&gt;hw_frontend)) &lt; 0) {</div><div class='add'>+	ret = fc-&gt;demux.dmx.add_frontend(&amp;fc-&gt;demux.dmx, &amp;fc-&gt;hw_frontend);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='ctx'> 		err("adding hw_frontend to dmx failed: error %d", ret);</div><div class='ctx'> 		goto err_dmx_add_hw_frontend;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fc-&gt;mem_frontend.source = DMX_MEMORY_FE;</div><div class='del'>-	if ((ret = fc-&gt;demux.dmx.add_frontend(&amp;fc-&gt;demux.dmx, &amp;fc-&gt;mem_frontend)) &lt; 0) {</div><div class='add'>+	ret = fc-&gt;demux.dmx.add_frontend(&amp;fc-&gt;demux.dmx, &amp;fc-&gt;mem_frontend);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='ctx'> 		err("adding mem_frontend to dmx failed: error %d", ret);</div><div class='ctx'> 		goto err_dmx_add_mem_frontend;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((ret = fc-&gt;demux.dmx.connect_frontend(&amp;fc-&gt;demux.dmx, &amp;fc-&gt;hw_frontend)) &lt; 0) {</div><div class='add'>+	ret = fc-&gt;demux.dmx.connect_frontend(&amp;fc-&gt;demux.dmx, &amp;fc-&gt;hw_frontend);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='ctx'> 		err("connect frontend failed: error %d", ret);</div><div class='ctx'> 		goto err_connect_frontend;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dvb_net_init(&amp;fc-&gt;dvb_adapter, &amp;fc-&gt;dvbnet, &amp;fc-&gt;demux.dmx);</div><div class='add'>+	ret = dvb_net_init(&amp;fc-&gt;dvb_adapter, &amp;fc-&gt;dvbnet, &amp;fc-&gt;demux.dmx);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		err("dvb_net_init failed: error %d", ret);</div><div class='add'>+		goto err_net;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	fc-&gt;init_state |= FC_STATE_DVB_INIT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+err_net:</div><div class='add'>+	fc-&gt;demux.dmx.disconnect_frontend(&amp;fc-&gt;demux.dmx);</div><div class='ctx'> err_connect_frontend:</div><div class='ctx'> 	fc-&gt;demux.dmx.remove_frontend(&amp;fc-&gt;demux.dmx, &amp;fc-&gt;mem_frontend);</div><div class='ctx'> err_dmx_add_mem_frontend:</div><div class='hunk'>@@ -254,7 +265,8 @@ int flexcop_device_initialize(struct flexcop_device *fc)</div><div class='ctx'> 	flexcop_hw_filter_init(fc);</div><div class='ctx'> 	flexcop_smc_ctrl(fc, 0);</div><div class='ctx'> </div><div class='del'>-	if ((ret = flexcop_dvb_init(fc)))</div><div class='add'>+	ret = flexcop_dvb_init(fc);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* i2c has to be done before doing EEProm stuff -</div><div class='hunk'>@@ -272,7 +284,8 @@ int flexcop_device_initialize(struct flexcop_device *fc)</div><div class='ctx'> 	} else</div><div class='ctx'> 		warn("reading of MAC address failed.\n");</div><div class='ctx'> </div><div class='del'>-	if ((ret = flexcop_frontend_init(fc)))</div><div class='add'>+	ret = flexcop_frontend_init(fc);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	flexcop_device_name(fc,"initialization of","complete");</div><div class='head'>diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c<br/>index caa4e18ed1c1..430b3eb11815 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/dst.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/bt8xx/dst.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/dst.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/bt8xx/dst.c</a></div><div class='hunk'>@@ -386,7 +386,7 @@ static int dst_set_freq(struct dst_state *state, u32 freq)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dst_set_bandwidth(struct dst_state *state, fe_bandwidth_t bandwidth)</div><div class='add'>+static int dst_set_bandwidth(struct dst_state *state, u32 bandwidth)</div><div class='ctx'> {</div><div class='ctx'> 	state-&gt;bandwidth = bandwidth;</div><div class='ctx'> </div><div class='hunk'>@@ -394,7 +394,7 @@ static int dst_set_bandwidth(struct dst_state *state, fe_bandwidth_t bandwidth)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	switch (bandwidth) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		if (state-&gt;dst_hw_cap &amp; DST_TYPE_HAS_CA)</div><div class='ctx'> 			state-&gt;tx_tuna[7] = 0x06;</div><div class='ctx'> 		else {</div><div class='hunk'>@@ -402,7 +402,7 @@ static int dst_set_bandwidth(struct dst_state *state, fe_bandwidth_t bandwidth)</div><div class='ctx'> 			state-&gt;tx_tuna[7] = 0x00;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		if (state-&gt;dst_hw_cap &amp; DST_TYPE_HAS_CA)</div><div class='ctx'> 			state-&gt;tx_tuna[7] = 0x07;</div><div class='ctx'> 		else {</div><div class='hunk'>@@ -410,7 +410,7 @@ static int dst_set_bandwidth(struct dst_state *state, fe_bandwidth_t bandwidth)</div><div class='ctx'> 			state-&gt;tx_tuna[7] = 0x00;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		if (state-&gt;dst_hw_cap &amp; DST_TYPE_HAS_CA)</div><div class='ctx'> 			state-&gt;tx_tuna[7] = 0x08;</div><div class='ctx'> 		else {</div><div class='hunk'>@@ -1561,7 +1561,7 @@ static int dst_init(struct dvb_frontend *fe)</div><div class='ctx'> 	state-&gt;tone = SEC_TONE_OFF;</div><div class='ctx'> 	state-&gt;diseq_flags = 0;</div><div class='ctx'> 	state-&gt;k22 = 0x02;</div><div class='del'>-	state-&gt;bandwidth = BANDWIDTH_7_MHZ;</div><div class='add'>+	state-&gt;bandwidth = 7000000;</div><div class='ctx'> 	state-&gt;cur_jiff = jiffies;</div><div class='ctx'> 	if (state-&gt;dst_type == DST_TYPE_IS_SAT)</div><div class='ctx'> 		memcpy(state-&gt;tx_tuna, ((state-&gt;type_flags &amp; DST_TYPE_HAS_VLF) ? sat_tuna_188 : sat_tuna_204), sizeof (sat_tuna_204));</div><div class='hunk'>@@ -1609,8 +1609,9 @@ static int dst_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dst_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int dst_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	int retval = -EINVAL;</div><div class='ctx'> 	struct dst_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='hunk'>@@ -1623,17 +1624,17 @@ static int dst_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_paramet</div><div class='ctx'> 		if (state-&gt;dst_type == DST_TYPE_IS_SAT) {</div><div class='ctx'> 			if (state-&gt;type_flags &amp; DST_TYPE_HAS_OBS_REGS)</div><div class='ctx'> 				dst_set_inversion(state, p-&gt;inversion);</div><div class='del'>-			dst_set_fec(state, p-&gt;u.qpsk.fec_inner);</div><div class='del'>-			dst_set_symbolrate(state, p-&gt;u.qpsk.symbol_rate);</div><div class='add'>+			dst_set_fec(state, p-&gt;fec_inner);</div><div class='add'>+			dst_set_symbolrate(state, p-&gt;symbol_rate);</div><div class='ctx'> 			dst_set_polarization(state);</div><div class='del'>-			dprintk(verbose, DST_DEBUG, 1, "Set Symbolrate=[%d]", p-&gt;u.qpsk.symbol_rate);</div><div class='add'>+			dprintk(verbose, DST_DEBUG, 1, "Set Symbolrate=[%d]", p-&gt;symbol_rate);</div><div class='ctx'> </div><div class='ctx'> 		} else if (state-&gt;dst_type == DST_TYPE_IS_TERR)</div><div class='del'>-			dst_set_bandwidth(state, p-&gt;u.ofdm.bandwidth);</div><div class='add'>+			dst_set_bandwidth(state, p-&gt;bandwidth_hz);</div><div class='ctx'> 		else if (state-&gt;dst_type == DST_TYPE_IS_CABLE) {</div><div class='del'>-			dst_set_fec(state, p-&gt;u.qam.fec_inner);</div><div class='del'>-			dst_set_symbolrate(state, p-&gt;u.qam.symbol_rate);</div><div class='del'>-			dst_set_modulation(state, p-&gt;u.qam.modulation);</div><div class='add'>+			dst_set_fec(state, p-&gt;fec_inner);</div><div class='add'>+			dst_set_symbolrate(state, p-&gt;symbol_rate);</div><div class='add'>+			dst_set_modulation(state, p-&gt;modulation);</div><div class='ctx'> 		}</div><div class='ctx'> 		retval = dst_write_tuna(fe);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1642,31 +1643,32 @@ static int dst_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_paramet</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dst_tune_frontend(struct dvb_frontend* fe,</div><div class='del'>-			    struct dvb_frontend_parameters* p,</div><div class='add'>+			    bool re_tune,</div><div class='ctx'> 			    unsigned int mode_flags,</div><div class='ctx'> 			    unsigned int *delay,</div><div class='ctx'> 			    fe_status_t *status)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> </div><div class='del'>-	if (p != NULL) {</div><div class='add'>+	if (re_tune) {</div><div class='ctx'> 		dst_set_freq(state, p-&gt;frequency);</div><div class='ctx'> 		dprintk(verbose, DST_DEBUG, 1, "Set Frequency=[%d]", p-&gt;frequency);</div><div class='ctx'> </div><div class='ctx'> 		if (state-&gt;dst_type == DST_TYPE_IS_SAT) {</div><div class='ctx'> 			if (state-&gt;type_flags &amp; DST_TYPE_HAS_OBS_REGS)</div><div class='ctx'> 				dst_set_inversion(state, p-&gt;inversion);</div><div class='del'>-			dst_set_fec(state, p-&gt;u.qpsk.fec_inner);</div><div class='del'>-			dst_set_symbolrate(state, p-&gt;u.qpsk.symbol_rate);</div><div class='add'>+			dst_set_fec(state, p-&gt;fec_inner);</div><div class='add'>+			dst_set_symbolrate(state, p-&gt;symbol_rate);</div><div class='ctx'> 			dst_set_polarization(state);</div><div class='del'>-			dprintk(verbose, DST_DEBUG, 1, "Set Symbolrate=[%d]", p-&gt;u.qpsk.symbol_rate);</div><div class='add'>+			dprintk(verbose, DST_DEBUG, 1, "Set Symbolrate=[%d]", p-&gt;symbol_rate);</div><div class='ctx'> </div><div class='ctx'> 		} else if (state-&gt;dst_type == DST_TYPE_IS_TERR)</div><div class='del'>-			dst_set_bandwidth(state, p-&gt;u.ofdm.bandwidth);</div><div class='add'>+			dst_set_bandwidth(state, p-&gt;bandwidth_hz);</div><div class='ctx'> 		else if (state-&gt;dst_type == DST_TYPE_IS_CABLE) {</div><div class='del'>-			dst_set_fec(state, p-&gt;u.qam.fec_inner);</div><div class='del'>-			dst_set_symbolrate(state, p-&gt;u.qam.symbol_rate);</div><div class='del'>-			dst_set_modulation(state, p-&gt;u.qam.modulation);</div><div class='add'>+			dst_set_fec(state, p-&gt;fec_inner);</div><div class='add'>+			dst_set_symbolrate(state, p-&gt;symbol_rate);</div><div class='add'>+			dst_set_modulation(state, p-&gt;modulation);</div><div class='ctx'> 		}</div><div class='ctx'> 		dst_write_tuna(fe);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1683,22 +1685,23 @@ static int dst_get_tuning_algo(struct dvb_frontend *fe)</div><div class='ctx'> 	return dst_algo ? DVBFE_ALGO_HW : DVBFE_ALGO_SW;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dst_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int dst_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dst_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;frequency = state-&gt;decode_freq;</div><div class='ctx'> 	if (state-&gt;dst_type == DST_TYPE_IS_SAT) {</div><div class='ctx'> 		if (state-&gt;type_flags &amp; DST_TYPE_HAS_OBS_REGS)</div><div class='ctx'> 			p-&gt;inversion = state-&gt;inversion;</div><div class='del'>-		p-&gt;u.qpsk.symbol_rate = state-&gt;symbol_rate;</div><div class='del'>-		p-&gt;u.qpsk.fec_inner = dst_get_fec(state);</div><div class='add'>+		p-&gt;symbol_rate = state-&gt;symbol_rate;</div><div class='add'>+		p-&gt;fec_inner = dst_get_fec(state);</div><div class='ctx'> 	} else if (state-&gt;dst_type == DST_TYPE_IS_TERR) {</div><div class='del'>-		p-&gt;u.ofdm.bandwidth = state-&gt;bandwidth;</div><div class='add'>+		p-&gt;bandwidth_hz = state-&gt;bandwidth;</div><div class='ctx'> 	} else if (state-&gt;dst_type == DST_TYPE_IS_CABLE) {</div><div class='del'>-		p-&gt;u.qam.symbol_rate = state-&gt;symbol_rate;</div><div class='del'>-		p-&gt;u.qam.fec_inner = dst_get_fec(state);</div><div class='del'>-		p-&gt;u.qam.modulation = dst_get_modulation(state);</div><div class='add'>+		p-&gt;symbol_rate = state-&gt;symbol_rate;</div><div class='add'>+		p-&gt;fec_inner = dst_get_fec(state);</div><div class='add'>+		p-&gt;modulation = dst_get_modulation(state);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1756,10 +1759,9 @@ struct dst_state *dst_attach(struct dst_state *state, struct dvb_adapter *dvb_ad</div><div class='ctx'> EXPORT_SYMBOL(dst_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops dst_dvbt_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "DST DVB-T",</div><div class='del'>-		.type = FE_OFDM,</div><div class='ctx'> 		.frequency_min = 137000000,</div><div class='ctx'> 		.frequency_max = 858000000,</div><div class='ctx'> 		.frequency_stepsize = 166667,</div><div class='hunk'>@@ -1786,10 +1788,9 @@ static struct dvb_frontend_ops dst_dvbt_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops dst_dvbs_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "DST DVB-S",</div><div class='del'>-		.type = FE_QPSK,</div><div class='ctx'> 		.frequency_min = 950000,</div><div class='ctx'> 		.frequency_max = 2150000,</div><div class='ctx'> 		.frequency_stepsize = 1000,	/* kHz for QPSK frontends */</div><div class='hunk'>@@ -1816,10 +1817,9 @@ static struct dvb_frontend_ops dst_dvbs_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops dst_dvbc_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBC_ANNEX_A },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "DST DVB-C",</div><div class='del'>-		.type = FE_QAM,</div><div class='ctx'> 		.frequency_stepsize = 62500,</div><div class='ctx'> 		.frequency_min = 51000000,</div><div class='ctx'> 		.frequency_max = 858000000,</div><div class='hunk'>@@ -1846,9 +1846,9 @@ static struct dvb_frontend_ops dst_dvbc_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops dst_atsc_ops = {</div><div class='add'>+	.delsys = { SYS_ATSC },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "DST ATSC",</div><div class='del'>-		.type = FE_ATSC,</div><div class='ctx'> 		.frequency_stepsize = 62500,</div><div class='ctx'> 		.frequency_min = 510000000,</div><div class='ctx'> 		.frequency_max = 858000000,</div><div class='head'>diff --git a/drivers/media/dvb/bt8xx/dst_common.h b/drivers/media/dvb/bt8xx/dst_common.h<br/>index d88cf2add82b..d70d98f1a571 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/dst_common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/bt8xx/dst_common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/dst_common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/bt8xx/dst_common.h</a></div><div class='hunk'>@@ -124,7 +124,7 @@ struct dst_state {</div><div class='ctx'> 	u16 decode_snr;</div><div class='ctx'> 	unsigned long cur_jiff;</div><div class='ctx'> 	u8 k22;</div><div class='del'>-	fe_bandwidth_t bandwidth;</div><div class='add'>+	u32 bandwidth;</div><div class='ctx'> 	u32 dst_hw_cap;</div><div class='ctx'> 	u8 dst_fw_version;</div><div class='ctx'> 	fe_sec_mini_cmd_t minicmd;</div><div class='head'>diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c<br/>index 521d69104982..81fab9adc1ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/dvb-bt8xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/bt8xx/dvb-bt8xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/dvb-bt8xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/bt8xx/dvb-bt8xx.c</a></div><div class='hunk'>@@ -19,6 +19,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define pr_fmt(fmt) "dvb_bt8xx: " fmt</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/bitops.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'>@@ -148,8 +150,9 @@ static int thomson_dtt7579_demod_init(struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int thomson_dtt7579_tuner_calc_regs(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf, int buf_len)</div><div class='add'>+static int thomson_dtt7579_tuner_calc_regs(struct dvb_frontend *fe, u8* pllbuf, int buf_len)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	unsigned char bs = 0;</div><div class='ctx'> 	unsigned char cp = 0;</div><div class='hunk'>@@ -157,18 +160,18 @@ static int thomson_dtt7579_tuner_calc_regs(struct dvb_frontend* fe, struct dvb_f</div><div class='ctx'> 	if (buf_len &lt; 5)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	div = (((params-&gt;frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;</div><div class='add'>+	div = (((c-&gt;frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &lt; 542000000)</div><div class='add'>+	if (c-&gt;frequency &lt; 542000000)</div><div class='ctx'> 		cp = 0xb4;</div><div class='del'>-	else if (params-&gt;frequency &lt; 771000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 771000000)</div><div class='ctx'> 		cp = 0xbc;</div><div class='ctx'> 	else</div><div class='ctx'> 		cp = 0xf4;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency == 0)</div><div class='add'>+	if (c-&gt;frequency == 0)</div><div class='ctx'> 		bs = 0x03;</div><div class='del'>-	else if (params-&gt;frequency &lt; 443250000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 443250000)</div><div class='ctx'> 		bs = 0x02;</div><div class='ctx'> 	else</div><div class='ctx'> 		bs = 0x08;</div><div class='hunk'>@@ -191,13 +194,12 @@ static struct zl10353_config thomson_dtt7579_zl10353_config = {</div><div class='ctx'> 	.demod_address = 0x0f,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int cx24108_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int cx24108_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='del'>-	u32 freq = params-&gt;frequency;</div><div class='del'>-</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	u32 freq = c-&gt;frequency;</div><div class='ctx'> 	int i, a, n, pump;</div><div class='ctx'> 	u32 band, pll;</div><div class='del'>-</div><div class='ctx'> 	u32 osci[]={950000,1019000,1075000,1178000,1296000,1432000,</div><div class='ctx'> 		1576000,1718000,1856000,2036000,2150000};</div><div class='ctx'> 	u32 bandsel[]={0,0x00020000,0x00040000,0x00100800,0x00101000,</div><div class='hunk'>@@ -205,7 +207,7 @@ static int cx24108_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend</div><div class='ctx'> 		0x00120000,0x00140000};</div><div class='ctx'> </div><div class='ctx'> 	#define XTAL 1011100 /* Hz, really 1.0111 MHz and a /10 prescaler */</div><div class='del'>-	printk("cx24108 debug: entering SetTunerFreq, freq=%d\n",freq);</div><div class='add'>+	dprintk("cx24108 debug: entering SetTunerFreq, freq=%d\n", freq);</div><div class='ctx'> </div><div class='ctx'> 	/* This is really the bit driving the tuner chip cx24108 */</div><div class='ctx'> </div><div class='hunk'>@@ -216,7 +218,7 @@ static int cx24108_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend</div><div class='ctx'> </div><div class='ctx'> 	/* decide which VCO to use for the input frequency */</div><div class='ctx'> 	for(i = 1; (i &lt; ARRAY_SIZE(osci) - 1) &amp;&amp; (osci[i] &lt; freq); i++);</div><div class='del'>-	printk("cx24108 debug: select vco #%d (f=%d)\n",i,freq);</div><div class='add'>+	dprintk("cx24108 debug: select vco #%d (f=%d)\n", i, freq);</div><div class='ctx'> 	band=bandsel[i];</div><div class='ctx'> 	/* the gain values must be set by SetSymbolrate */</div><div class='ctx'> 	/* compute the pll divider needed, from Conexant data sheet,</div><div class='hunk'>@@ -232,7 +234,7 @@ static int cx24108_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend</div><div class='ctx'> 	    ((a&amp;0x1f)&lt;&lt;11);</div><div class='ctx'> 	/* everything is shifted left 11 bits to left-align the bits in the</div><div class='ctx'> 	   32bit word. Output to the tuner goes MSB-aligned, after all */</div><div class='del'>-	printk("cx24108 debug: pump=%d, n=%d, a=%d\n",pump,n,a);</div><div class='add'>+	dprintk("cx24108 debug: pump=%d, n=%d, a=%d\n", pump, n, a);</div><div class='ctx'> 	cx24110_pll_write(fe,band);</div><div class='ctx'> 	/* set vga and vca to their widest-band settings, as a precaution.</div><div class='ctx'> 	   SetSymbolrate might not be called to set this up */</div><div class='hunk'>@@ -267,31 +269,32 @@ static struct cx24110_config pctvsat_config = {</div><div class='ctx'> 	.demod_address = 0x55,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int microtune_mt7202dtf_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int microtune_mt7202dtf_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 cfg, cpump, band_select;</div><div class='ctx'> 	u8 data[4];</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x60, .flags = 0, .buf = data, .len = sizeof(data) };</div><div class='ctx'> </div><div class='del'>-	div = (36000000 + params-&gt;frequency + 83333) / 166666;</div><div class='add'>+	div = (36000000 + c-&gt;frequency + 83333) / 166666;</div><div class='ctx'> 	cfg = 0x88;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &lt; 175000000)</div><div class='add'>+	if (c-&gt;frequency &lt; 175000000)</div><div class='ctx'> 		cpump = 2;</div><div class='del'>-	else if (params-&gt;frequency &lt; 390000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 390000000)</div><div class='ctx'> 		cpump = 1;</div><div class='del'>-	else if (params-&gt;frequency &lt; 470000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 470000000)</div><div class='ctx'> 		cpump = 2;</div><div class='del'>-	else if (params-&gt;frequency &lt; 750000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 750000000)</div><div class='ctx'> 		cpump = 2;</div><div class='ctx'> 	else</div><div class='ctx'> 		cpump = 3;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &lt; 175000000)</div><div class='add'>+	if (c-&gt;frequency &lt; 175000000)</div><div class='ctx'> 		band_select = 0x0e;</div><div class='del'>-	else if (params-&gt;frequency &lt; 470000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 470000000)</div><div class='ctx'> 		band_select = 0x05;</div><div class='ctx'> 	else</div><div class='ctx'> 		band_select = 0x03;</div><div class='hunk'>@@ -342,50 +345,51 @@ static int advbt771_samsung_tdtc9251dh0_demod_init(struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int advbt771_samsung_tdtc9251dh0_tuner_calc_regs(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf, int buf_len)</div><div class='add'>+static int advbt771_samsung_tdtc9251dh0_tuner_calc_regs(struct dvb_frontend *fe, u8 *pllbuf, int buf_len)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	unsigned char bs = 0;</div><div class='ctx'> 	unsigned char cp = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (buf_len &lt; 5) return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	div = (((params-&gt;frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;</div><div class='add'>+	div = (((c-&gt;frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &lt; 150000000)</div><div class='add'>+	if (c-&gt;frequency &lt; 150000000)</div><div class='ctx'> 		cp = 0xB4;</div><div class='del'>-	else if (params-&gt;frequency &lt; 173000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 173000000)</div><div class='ctx'> 		cp = 0xBC;</div><div class='del'>-	else if (params-&gt;frequency &lt; 250000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 250000000)</div><div class='ctx'> 		cp = 0xB4;</div><div class='del'>-	else if (params-&gt;frequency &lt; 400000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 400000000)</div><div class='ctx'> 		cp = 0xBC;</div><div class='del'>-	else if (params-&gt;frequency &lt; 420000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 420000000)</div><div class='ctx'> 		cp = 0xF4;</div><div class='del'>-	else if (params-&gt;frequency &lt; 470000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 470000000)</div><div class='ctx'> 		cp = 0xFC;</div><div class='del'>-	else if (params-&gt;frequency &lt; 600000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 600000000)</div><div class='ctx'> 		cp = 0xBC;</div><div class='del'>-	else if (params-&gt;frequency &lt; 730000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 730000000)</div><div class='ctx'> 		cp = 0xF4;</div><div class='ctx'> 	else</div><div class='ctx'> 		cp = 0xFC;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &lt; 150000000)</div><div class='add'>+	if (c-&gt;frequency &lt; 150000000)</div><div class='ctx'> 		bs = 0x01;</div><div class='del'>-	else if (params-&gt;frequency &lt; 173000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 173000000)</div><div class='ctx'> 		bs = 0x01;</div><div class='del'>-	else if (params-&gt;frequency &lt; 250000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 250000000)</div><div class='ctx'> 		bs = 0x02;</div><div class='del'>-	else if (params-&gt;frequency &lt; 400000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 400000000)</div><div class='ctx'> 		bs = 0x02;</div><div class='del'>-	else if (params-&gt;frequency &lt; 420000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 420000000)</div><div class='ctx'> 		bs = 0x02;</div><div class='del'>-	else if (params-&gt;frequency &lt; 470000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 470000000)</div><div class='ctx'> 		bs = 0x02;</div><div class='del'>-	else if (params-&gt;frequency &lt; 600000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 600000000)</div><div class='ctx'> 		bs = 0x08;</div><div class='del'>-	else if (params-&gt;frequency &lt; 730000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 730000000)</div><div class='ctx'> 		bs = 0x08;</div><div class='ctx'> 	else</div><div class='ctx'> 		bs = 0x08;</div><div class='hunk'>@@ -461,25 +465,26 @@ static struct or51211_config or51211_config = {</div><div class='ctx'> 	.sleep = or51211_sleep,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int vp3021_alps_tded4_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int vp3021_alps_tded4_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 buf[4];</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x60, .flags = 0, .buf = buf, .len = sizeof(buf) };</div><div class='ctx'> </div><div class='del'>-	div = (params-&gt;frequency + 36166667) / 166667;</div><div class='add'>+	div = (c-&gt;frequency + 36166667) / 166667;</div><div class='ctx'> </div><div class='ctx'> 	buf[0] = (div &gt;&gt; 8) &amp; 0x7F;</div><div class='ctx'> 	buf[1] = div &amp; 0xFF;</div><div class='ctx'> 	buf[2] = 0x85;</div><div class='del'>-	if ((params-&gt;frequency &gt;= 47000000) &amp;&amp; (params-&gt;frequency &lt; 153000000))</div><div class='add'>+	if ((c-&gt;frequency &gt;= 47000000) &amp;&amp; (c-&gt;frequency &lt; 153000000))</div><div class='ctx'> 		buf[3] = 0x01;</div><div class='del'>-	else if ((params-&gt;frequency &gt;= 153000000) &amp;&amp; (params-&gt;frequency &lt; 430000000))</div><div class='add'>+	else if ((c-&gt;frequency &gt;= 153000000) &amp;&amp; (c-&gt;frequency &lt; 430000000))</div><div class='ctx'> 		buf[3] = 0x02;</div><div class='del'>-	else if ((params-&gt;frequency &gt;= 430000000) &amp;&amp; (params-&gt;frequency &lt; 824000000))</div><div class='add'>+	else if ((c-&gt;frequency &gt;= 430000000) &amp;&amp; (c-&gt;frequency &lt; 824000000))</div><div class='ctx'> 		buf[3] = 0x0C;</div><div class='del'>-	else if ((params-&gt;frequency &gt;= 824000000) &amp;&amp; (params-&gt;frequency &lt; 863000000))</div><div class='add'>+	else if ((c-&gt;frequency &gt;= 824000000) &amp;&amp; (c-&gt;frequency &lt; 863000000))</div><div class='ctx'> 		buf[3] = 0x8C;</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -513,31 +518,31 @@ static int digitv_alps_tded4_demod_init(struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int digitv_alps_tded4_tuner_calc_regs(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf, int buf_len)</div><div class='add'>+static int digitv_alps_tded4_tuner_calc_regs(struct dvb_frontend *fe,  u8 *pllbuf, int buf_len)</div><div class='ctx'> {</div><div class='ctx'> 	u32 div;</div><div class='del'>-	struct dvb_ofdm_parameters *op = &amp;params-&gt;u.ofdm;</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> </div><div class='ctx'> 	if (buf_len &lt; 5)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	div = (((params-&gt;frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;</div><div class='add'>+	div = (((c-&gt;frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;</div><div class='ctx'> </div><div class='ctx'> 	pllbuf[0] = 0x61;</div><div class='ctx'> 	pllbuf[1] = (div &gt;&gt; 8) &amp; 0x7F;</div><div class='ctx'> 	pllbuf[2] = div &amp; 0xFF;</div><div class='ctx'> 	pllbuf[3] = 0x85;</div><div class='ctx'> </div><div class='del'>-	dprintk("frequency %u, div %u\n", params-&gt;frequency, div);</div><div class='add'>+	dprintk("frequency %u, div %u\n", c-&gt;frequency, div);</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &lt; 470000000)</div><div class='add'>+	if (c-&gt;frequency &lt; 470000000)</div><div class='ctx'> 		pllbuf[4] = 0x02;</div><div class='del'>-	else if (params-&gt;frequency &gt; 823000000)</div><div class='add'>+	else if (c-&gt;frequency &gt; 823000000)</div><div class='ctx'> 		pllbuf[4] = 0x88;</div><div class='ctx'> 	else</div><div class='ctx'> 		pllbuf[4] = 0x08;</div><div class='ctx'> </div><div class='del'>-	if (op-&gt;bandwidth == 8)</div><div class='add'>+	if (c-&gt;bandwidth_hz == 8000000)</div><div class='ctx'> 		pllbuf[4] |= 0x04;</div><div class='ctx'> </div><div class='ctx'> 	return 5;</div><div class='hunk'>@@ -663,7 +668,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)</div><div class='ctx'> 		/*	DST is not a frontend driver !!!		*/</div><div class='ctx'> 		state = kmalloc(sizeof (struct dst_state), GFP_KERNEL);</div><div class='ctx'> 		if (!state) {</div><div class='del'>-			printk("dvb_bt8xx: No memory\n");</div><div class='add'>+			pr_err("No memory\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		/*	Setup the Card					*/</div><div class='hunk'>@@ -673,7 +678,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)</div><div class='ctx'> 		state-&gt;dst_ca = NULL;</div><div class='ctx'> 		/*	DST is not a frontend, attaching the ASIC	*/</div><div class='ctx'> 		if (dvb_attach(dst_attach, state, &amp;card-&gt;dvb_adapter) == NULL) {</div><div class='del'>-			printk("%s: Could not find a Twinhan DST.\n", __func__);</div><div class='add'>+			pr_err("%s: Could not find a Twinhan DST\n", __func__);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		/*	Attach other DST peripherals if any		*/</div><div class='hunk'>@@ -702,14 +707,14 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (card-&gt;fe == NULL)</div><div class='del'>-		printk("dvb-bt8xx: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",</div><div class='add'>+		pr_err("A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",</div><div class='ctx'> 		       card-&gt;bt-&gt;dev-&gt;vendor,</div><div class='ctx'> 		       card-&gt;bt-&gt;dev-&gt;device,</div><div class='ctx'> 		       card-&gt;bt-&gt;dev-&gt;subsystem_vendor,</div><div class='ctx'> 		       card-&gt;bt-&gt;dev-&gt;subsystem_device);</div><div class='ctx'> 	else</div><div class='ctx'> 		if (dvb_register_frontend(&amp;card-&gt;dvb_adapter, card-&gt;fe)) {</div><div class='del'>-			printk("dvb-bt8xx: Frontend registration failed!\n");</div><div class='add'>+			pr_err("Frontend registration failed!\n");</div><div class='ctx'> 			dvb_frontend_detach(card-&gt;fe);</div><div class='ctx'> 			card-&gt;fe = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -723,7 +728,7 @@ static int __devinit dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)</div><div class='ctx'> 				      THIS_MODULE, &amp;card-&gt;bt-&gt;dev-&gt;dev,</div><div class='ctx'> 				      adapter_nr);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='del'>-		printk("dvb_bt8xx: dvb_register_adapter failed (errno = %d)\n", result);</div><div class='add'>+		pr_err("dvb_register_adapter failed (errno = %d)\n", result);</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='ctx'> 	card-&gt;dvb_adapter.priv = card;</div><div class='hunk'>@@ -741,66 +746,69 @@ static int __devinit dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)</div><div class='ctx'> 	card-&gt;demux.stop_feed = dvb_bt8xx_stop_feed;</div><div class='ctx'> 	card-&gt;demux.write_to_decoder = NULL;</div><div class='ctx'> </div><div class='del'>-	if ((result = dvb_dmx_init(&amp;card-&gt;demux)) &lt; 0) {</div><div class='del'>-		printk("dvb_bt8xx: dvb_dmx_init failed (errno = %d)\n", result);</div><div class='del'>-</div><div class='del'>-		dvb_unregister_adapter(&amp;card-&gt;dvb_adapter);</div><div class='del'>-		return result;</div><div class='add'>+	result = dvb_dmx_init(&amp;card-&gt;demux);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		pr_err("dvb_dmx_init failed (errno = %d)\n", result);</div><div class='add'>+		goto err_unregister_adaptor;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	card-&gt;dmxdev.filternum = 256;</div><div class='ctx'> 	card-&gt;dmxdev.demux = &amp;card-&gt;demux.dmx;</div><div class='ctx'> 	card-&gt;dmxdev.capabilities = 0;</div><div class='ctx'> </div><div class='del'>-	if ((result = dvb_dmxdev_init(&amp;card-&gt;dmxdev, &amp;card-&gt;dvb_adapter)) &lt; 0) {</div><div class='del'>-		printk("dvb_bt8xx: dvb_dmxdev_init failed (errno = %d)\n", result);</div><div class='del'>-</div><div class='del'>-		dvb_dmx_release(&amp;card-&gt;demux);</div><div class='del'>-		dvb_unregister_adapter(&amp;card-&gt;dvb_adapter);</div><div class='del'>-		return result;</div><div class='add'>+	result = dvb_dmxdev_init(&amp;card-&gt;dmxdev, &amp;card-&gt;dvb_adapter);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		pr_err("dvb_dmxdev_init failed (errno = %d)\n", result);</div><div class='add'>+		goto err_dmx_release;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	card-&gt;fe_hw.source = DMX_FRONTEND_0;</div><div class='ctx'> </div><div class='del'>-	if ((result = card-&gt;demux.dmx.add_frontend(&amp;card-&gt;demux.dmx, &amp;card-&gt;fe_hw)) &lt; 0) {</div><div class='del'>-		printk("dvb_bt8xx: dvb_dmx_init failed (errno = %d)\n", result);</div><div class='del'>-</div><div class='del'>-		dvb_dmxdev_release(&amp;card-&gt;dmxdev);</div><div class='del'>-		dvb_dmx_release(&amp;card-&gt;demux);</div><div class='del'>-		dvb_unregister_adapter(&amp;card-&gt;dvb_adapter);</div><div class='del'>-		return result;</div><div class='add'>+	result = card-&gt;demux.dmx.add_frontend(&amp;card-&gt;demux.dmx, &amp;card-&gt;fe_hw);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		pr_err("dvb_dmx_init failed (errno = %d)\n", result);</div><div class='add'>+		goto err_dmxdev_release;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	card-&gt;fe_mem.source = DMX_MEMORY_FE;</div><div class='ctx'> </div><div class='del'>-	if ((result = card-&gt;demux.dmx.add_frontend(&amp;card-&gt;demux.dmx, &amp;card-&gt;fe_mem)) &lt; 0) {</div><div class='del'>-		printk("dvb_bt8xx: dvb_dmx_init failed (errno = %d)\n", result);</div><div class='del'>-</div><div class='del'>-		card-&gt;demux.dmx.remove_frontend(&amp;card-&gt;demux.dmx, &amp;card-&gt;fe_hw);</div><div class='del'>-		dvb_dmxdev_release(&amp;card-&gt;dmxdev);</div><div class='del'>-		dvb_dmx_release(&amp;card-&gt;demux);</div><div class='del'>-		dvb_unregister_adapter(&amp;card-&gt;dvb_adapter);</div><div class='del'>-		return result;</div><div class='add'>+	result = card-&gt;demux.dmx.add_frontend(&amp;card-&gt;demux.dmx, &amp;card-&gt;fe_mem);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		pr_err("dvb_dmx_init failed (errno = %d)\n", result);</div><div class='add'>+		goto err_remove_hw_frontend;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((result = card-&gt;demux.dmx.connect_frontend(&amp;card-&gt;demux.dmx, &amp;card-&gt;fe_hw)) &lt; 0) {</div><div class='del'>-		printk("dvb_bt8xx: dvb_dmx_init failed (errno = %d)\n", result);</div><div class='del'>-</div><div class='del'>-		card-&gt;demux.dmx.remove_frontend(&amp;card-&gt;demux.dmx, &amp;card-&gt;fe_mem);</div><div class='del'>-		card-&gt;demux.dmx.remove_frontend(&amp;card-&gt;demux.dmx, &amp;card-&gt;fe_hw);</div><div class='del'>-		dvb_dmxdev_release(&amp;card-&gt;dmxdev);</div><div class='del'>-		dvb_dmx_release(&amp;card-&gt;demux);</div><div class='del'>-		dvb_unregister_adapter(&amp;card-&gt;dvb_adapter);</div><div class='del'>-		return result;</div><div class='add'>+	result = card-&gt;demux.dmx.connect_frontend(&amp;card-&gt;demux.dmx, &amp;card-&gt;fe_hw);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		pr_err("dvb_dmx_init failed (errno = %d)\n", result);</div><div class='add'>+		goto err_remove_mem_frontend;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dvb_net_init(&amp;card-&gt;dvb_adapter, &amp;card-&gt;dvbnet, &amp;card-&gt;demux.dmx);</div><div class='add'>+	result = dvb_net_init(&amp;card-&gt;dvb_adapter, &amp;card-&gt;dvbnet, &amp;card-&gt;demux.dmx);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		pr_err("dvb_net_init failed (errno = %d)\n", result);</div><div class='add'>+		goto err_disconnect_frontend;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	tasklet_init(&amp;card-&gt;bt-&gt;tasklet, dvb_bt8xx_task, (unsigned long) card);</div><div class='ctx'> </div><div class='ctx'> 	frontend_init(card, type);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_disconnect_frontend:</div><div class='add'>+	card-&gt;demux.dmx.disconnect_frontend(&amp;card-&gt;demux.dmx);</div><div class='add'>+err_remove_mem_frontend:</div><div class='add'>+	card-&gt;demux.dmx.remove_frontend(&amp;card-&gt;demux.dmx, &amp;card-&gt;fe_mem);</div><div class='add'>+err_remove_hw_frontend:</div><div class='add'>+	card-&gt;demux.dmx.remove_frontend(&amp;card-&gt;demux.dmx, &amp;card-&gt;fe_hw);</div><div class='add'>+err_dmxdev_release:</div><div class='add'>+	dvb_dmxdev_release(&amp;card-&gt;dmxdev);</div><div class='add'>+err_dmx_release:</div><div class='add'>+	dvb_dmx_release(&amp;card-&gt;demux);</div><div class='add'>+err_unregister_adaptor:</div><div class='add'>+	dvb_unregister_adapter(&amp;card-&gt;dvb_adapter);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __devinit dvb_bt8xx_probe(struct bttv_sub_device *sub)</div><div class='hunk'>@@ -881,8 +889,7 @@ static int __devinit dvb_bt8xx_probe(struct bttv_sub_device *sub)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		printk(KERN_WARNING "dvb_bt8xx: Unknown bttv card type: %d.\n",</div><div class='del'>-				sub-&gt;core-&gt;type);</div><div class='add'>+		pr_err("Unknown bttv card type: %d\n", sub-&gt;core-&gt;type);</div><div class='ctx'> 		kfree(card);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -890,16 +897,14 @@ static int __devinit dvb_bt8xx_probe(struct bttv_sub_device *sub)</div><div class='ctx'> 	dprintk("dvb_bt8xx: identified card%d as %s\n", card-&gt;bttv_nr, card-&gt;card_name);</div><div class='ctx'> </div><div class='ctx'> 	if (!(bttv_pci_dev = bttv_get_pcidev(card-&gt;bttv_nr))) {</div><div class='del'>-		printk("dvb_bt8xx: no pci device for card %d\n", card-&gt;bttv_nr);</div><div class='add'>+		pr_err("no pci device for card %d\n", card-&gt;bttv_nr);</div><div class='ctx'> 		kfree(card);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(card-&gt;bt = dvb_bt8xx_878_match(card-&gt;bttv_nr, bttv_pci_dev))) {</div><div class='del'>-		printk("dvb_bt8xx: unable to determine DMA core of card %d,\n",</div><div class='del'>-		       card-&gt;bttv_nr);</div><div class='del'>-		printk("dvb_bt8xx: if you have the ALSA bt87x audio driver "</div><div class='del'>-		       "installed, try removing it.\n");</div><div class='add'>+		pr_err("unable to determine DMA core of card %d,\n", card-&gt;bttv_nr);</div><div class='add'>+		pr_err("if you have the ALSA bt87x audio driver installed, try removing it.\n");</div><div class='ctx'> </div><div class='ctx'> 		kfree(card);</div><div class='ctx'> 		return -ENODEV;</div><div class='head'>diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/dvb/ddbridge/ddbridge-core.c<br/>index ba9a643b9c6a..ce4f85849e7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ddbridge/ddbridge-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ddbridge/ddbridge-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ddbridge/ddbridge-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/ddbridge/ddbridge-core.c</a></div><div class='hunk'>@@ -580,7 +580,7 @@ static int demod_attach_drxk(struct ddb_input *input)</div><div class='ctx'> 	memset(&amp;config, 0, sizeof(config));</div><div class='ctx'> 	config.adr = 0x29 + (input-&gt;nr &amp; 1);</div><div class='ctx'> </div><div class='del'>-	fe = input-&gt;fe = dvb_attach(drxk_attach, &amp;config, i2c, &amp;input-&gt;fe2);</div><div class='add'>+	fe = input-&gt;fe = dvb_attach(drxk_attach, &amp;config, i2c);</div><div class='ctx'> 	if (!input-&gt;fe) {</div><div class='ctx'> 		printk(KERN_ERR "No DRXK found!\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -1480,7 +1480,7 @@ static const struct file_operations ddb_fops = {</div><div class='ctx'> 	.open           = ddb_open,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *ddb_devnode(struct device *device, mode_t *mode)</div><div class='add'>+static char *ddb_devnode(struct device *device, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct ddb *dev = dev_get_drvdata(device);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c<br/>index 55e6533f15e9..a609b3a9b146 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dm1105/dm1105.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dm1105/dm1105.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dm1105/dm1105.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dm1105/dm1105.c</a></div><div class='hunk'>@@ -1115,11 +1115,14 @@ static int __devinit dm1105_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err_remove_mem_frontend;</div><div class='ctx'> </div><div class='del'>-	ret = frontend_init(dev);</div><div class='add'>+	ret = dvb_net_init(dvb_adapter, &amp;dev-&gt;dvbnet, dmx);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err_disconnect_frontend;</div><div class='ctx'> </div><div class='del'>-	dvb_net_init(dvb_adapter, &amp;dev-&gt;dvbnet, dmx);</div><div class='add'>+	ret = frontend_init(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_dvb_net;</div><div class='add'>+</div><div class='ctx'> 	dm1105_ir_init(dev);</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;dev-&gt;work, dm1105_dmx_buffer);</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c<br/>index 7ea517b7e186..9be65a3b931f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_ca_en50221.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-core/dvb_ca_en50221.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_ca_en50221.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-core/dvb_ca_en50221.c</a></div><div class='hunk'>@@ -1306,6 +1306,10 @@ static ssize_t dvb_ca_en50221_io_write(struct file *file,</div><div class='ctx'> 	/* fragment the packets &amp; store in the buffer */</div><div class='ctx'> 	while (fragpos &lt; count) {</div><div class='ctx'> 		fraglen = ca-&gt;slot_info[slot].link_buf_size - 2;</div><div class='add'>+		if (fraglen &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		if (fraglen &gt; HOST_LINK_BUF_SIZE - 2)</div><div class='add'>+			fraglen = HOST_LINK_BUF_SIZE - 2;</div><div class='ctx'> 		if ((count - fragpos) &lt; fraglen)</div><div class='ctx'> 			fraglen = count - fragpos;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c<br/>index 2c0acdb4d811..fbbe545a74cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_frontend.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-core/dvb_frontend.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_frontend.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-core/dvb_frontend.c</a></div><div class='hunk'>@@ -25,6 +25,9 @@</div><div class='ctx'>  * Or, point your browser to http://www.gnu.org/copyleft/gpl.html</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/* Enables DVBv3 compatibility bits at the headers */</div><div class='add'>+#define __DVB_CORE__</div><div class='add'>+</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/sched.h&gt;</div><div class='hunk'>@@ -105,7 +108,6 @@ struct dvb_frontend_private {</div><div class='ctx'> </div><div class='ctx'> 	/* thread/frontend values */</div><div class='ctx'> 	struct dvb_device *dvbdev;</div><div class='del'>-	struct dvb_frontend_parameters parameters_in;</div><div class='ctx'> 	struct dvb_frontend_parameters parameters_out;</div><div class='ctx'> 	struct dvb_fe_events events;</div><div class='ctx'> 	struct semaphore sem;</div><div class='hunk'>@@ -139,6 +141,62 @@ struct dvb_frontend_private {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void dvb_frontend_wakeup(struct dvb_frontend *fe);</div><div class='add'>+static int dtv_get_frontend(struct dvb_frontend *fe,</div><div class='add'>+			    struct dvb_frontend_parameters *p_out);</div><div class='add'>+</div><div class='add'>+static bool has_get_frontend(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	return fe-&gt;ops.get_frontend;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Due to DVBv3 API calls, a delivery system should be mapped into one of</div><div class='add'>+ * the 4 DVBv3 delivery systems (FE_QPSK, FE_QAM, FE_OFDM or FE_ATSC),</div><div class='add'>+ * otherwise, a DVBv3 call will fail.</div><div class='add'>+ */</div><div class='add'>+enum dvbv3_emulation_type {</div><div class='add'>+	DVBV3_UNKNOWN,</div><div class='add'>+	DVBV3_QPSK,</div><div class='add'>+	DVBV3_QAM,</div><div class='add'>+	DVBV3_OFDM,</div><div class='add'>+	DVBV3_ATSC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum dvbv3_emulation_type dvbv3_type(u32 delivery_system)</div><div class='add'>+{</div><div class='add'>+	switch (delivery_system) {</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='add'>+	case SYS_DVBC_ANNEX_C:</div><div class='add'>+		return DVBV3_QAM;</div><div class='add'>+	case SYS_DVBS:</div><div class='add'>+	case SYS_DVBS2:</div><div class='add'>+	case SYS_TURBO:</div><div class='add'>+	case SYS_ISDBS:</div><div class='add'>+	case SYS_DSS:</div><div class='add'>+		return DVBV3_QPSK;</div><div class='add'>+	case SYS_DVBT:</div><div class='add'>+	case SYS_DVBT2:</div><div class='add'>+	case SYS_ISDBT:</div><div class='add'>+	case SYS_DMBTH:</div><div class='add'>+		return DVBV3_OFDM;</div><div class='add'>+	case SYS_ATSC:</div><div class='add'>+	case SYS_DVBC_ANNEX_B:</div><div class='add'>+		return DVBV3_ATSC;</div><div class='add'>+	case SYS_UNDEFINED:</div><div class='add'>+	case SYS_ISDBC:</div><div class='add'>+	case SYS_DVBH:</div><div class='add'>+	case SYS_DAB:</div><div class='add'>+	case SYS_ATSCMH:</div><div class='add'>+	default:</div><div class='add'>+		/*</div><div class='add'>+		 * Doesn't know how to emulate those types and/or</div><div class='add'>+		 * there's no frontend driver from this type yet</div><div class='add'>+		 * with some emulation code, so, we're not sure yet how</div><div class='add'>+		 * to handle them, or they're not compatible with a DVBv3 call.</div><div class='add'>+		 */</div><div class='add'>+		return DVBV3_UNKNOWN;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void dvb_frontend_add_event(struct dvb_frontend *fe, fe_status_t status)</div><div class='ctx'> {</div><div class='hunk'>@@ -149,8 +207,8 @@ static void dvb_frontend_add_event(struct dvb_frontend *fe, fe_status_t status)</div><div class='ctx'> </div><div class='ctx'> 	dprintk ("%s\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if ((status &amp; FE_HAS_LOCK) &amp;&amp; fe-&gt;ops.get_frontend)</div><div class='del'>-		fe-&gt;ops.get_frontend(fe, &amp;fepriv-&gt;parameters_out);</div><div class='add'>+	if ((status &amp; FE_HAS_LOCK) &amp;&amp; has_get_frontend(fe))</div><div class='add'>+		dtv_get_frontend(fe, &amp;fepriv-&gt;parameters_out);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;events-&gt;mtx);</div><div class='ctx'> </div><div class='hunk'>@@ -277,12 +335,13 @@ static int dvb_frontend_swzigzag_autotune(struct dvb_frontend *fe, int check_wra</div><div class='ctx'> 	int ready = 0;</div><div class='ctx'> 	int fe_set_err = 0;</div><div class='ctx'> 	struct dvb_frontend_private *fepriv = fe-&gt;frontend_priv;</div><div class='del'>-	int original_inversion = fepriv-&gt;parameters_in.inversion;</div><div class='del'>-	u32 original_frequency = fepriv-&gt;parameters_in.frequency;</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache, tmp;</div><div class='add'>+	int original_inversion = c-&gt;inversion;</div><div class='add'>+	u32 original_frequency = c-&gt;frequency;</div><div class='ctx'> </div><div class='ctx'> 	/* are we using autoinversion? */</div><div class='ctx'> 	autoinversion = ((!(fe-&gt;ops.info.caps &amp; FE_CAN_INVERSION_AUTO)) &amp;&amp;</div><div class='del'>-			 (fepriv-&gt;parameters_in.inversion == INVERSION_AUTO));</div><div class='add'>+			 (c-&gt;inversion == INVERSION_AUTO));</div><div class='ctx'> </div><div class='ctx'> 	/* setup parameters correctly */</div><div class='ctx'> 	while(!ready) {</div><div class='hunk'>@@ -348,19 +407,20 @@ static int dvb_frontend_swzigzag_autotune(struct dvb_frontend *fe, int check_wra</div><div class='ctx'> 		fepriv-&gt;auto_step, fepriv-&gt;auto_sub_step, fepriv-&gt;started_auto_step);</div><div class='ctx'> </div><div class='ctx'> 	/* set the frontend itself */</div><div class='del'>-	fepriv-&gt;parameters_in.frequency += fepriv-&gt;lnb_drift;</div><div class='add'>+	c-&gt;frequency += fepriv-&gt;lnb_drift;</div><div class='ctx'> 	if (autoinversion)</div><div class='del'>-		fepriv-&gt;parameters_in.inversion = fepriv-&gt;inversion;</div><div class='add'>+		c-&gt;inversion = fepriv-&gt;inversion;</div><div class='add'>+	tmp = *c;</div><div class='ctx'> 	if (fe-&gt;ops.set_frontend)</div><div class='del'>-		fe_set_err = fe-&gt;ops.set_frontend(fe, &amp;fepriv-&gt;parameters_in);</div><div class='del'>-	fepriv-&gt;parameters_out = fepriv-&gt;parameters_in;</div><div class='add'>+		fe_set_err = fe-&gt;ops.set_frontend(fe);</div><div class='add'>+	*c = tmp;</div><div class='ctx'> 	if (fe_set_err &lt; 0) {</div><div class='ctx'> 		fepriv-&gt;state = FESTATE_ERROR;</div><div class='ctx'> 		return fe_set_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fepriv-&gt;parameters_in.frequency = original_frequency;</div><div class='del'>-	fepriv-&gt;parameters_in.inversion = original_inversion;</div><div class='add'>+	c-&gt;frequency = original_frequency;</div><div class='add'>+	c-&gt;inversion = original_inversion;</div><div class='ctx'> </div><div class='ctx'> 	fepriv-&gt;auto_sub_step++;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -371,6 +431,7 @@ static void dvb_frontend_swzigzag(struct dvb_frontend *fe)</div><div class='ctx'> 	fe_status_t s = 0;</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> 	struct dvb_frontend_private *fepriv = fe-&gt;frontend_priv;</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache, tmp;</div><div class='ctx'> </div><div class='ctx'> 	/* if we've got no parameters, just keep idling */</div><div class='ctx'> 	if (fepriv-&gt;state &amp; FESTATE_IDLE) {</div><div class='hunk'>@@ -382,10 +443,10 @@ static void dvb_frontend_swzigzag(struct dvb_frontend *fe)</div><div class='ctx'> 	/* in SCAN mode, we just set the frontend when asked and leave it alone */</div><div class='ctx'> 	if (fepriv-&gt;tune_mode_flags &amp; FE_TUNE_MODE_ONESHOT) {</div><div class='ctx'> 		if (fepriv-&gt;state &amp; FESTATE_RETUNE) {</div><div class='add'>+			tmp = *c;</div><div class='ctx'> 			if (fe-&gt;ops.set_frontend)</div><div class='del'>-				retval = fe-&gt;ops.set_frontend(fe,</div><div class='del'>-							&amp;fepriv-&gt;parameters_in);</div><div class='del'>-			fepriv-&gt;parameters_out = fepriv-&gt;parameters_in;</div><div class='add'>+				retval = fe-&gt;ops.set_frontend(fe);</div><div class='add'>+			*c = tmp;</div><div class='ctx'> 			if (retval &lt; 0)</div><div class='ctx'> 				fepriv-&gt;state = FESTATE_ERROR;</div><div class='ctx'> 			else</div><div class='hunk'>@@ -415,8 +476,8 @@ static void dvb_frontend_swzigzag(struct dvb_frontend *fe)</div><div class='ctx'> </div><div class='ctx'> 		/* if we're tuned, then we have determined the correct inversion */</div><div class='ctx'> 		if ((!(fe-&gt;ops.info.caps &amp; FE_CAN_INVERSION_AUTO)) &amp;&amp;</div><div class='del'>-		    (fepriv-&gt;parameters_in.inversion == INVERSION_AUTO)) {</div><div class='del'>-			fepriv-&gt;parameters_in.inversion = fepriv-&gt;inversion;</div><div class='add'>+		    (c-&gt;inversion == INVERSION_AUTO)) {</div><div class='add'>+			c-&gt;inversion = fepriv-&gt;inversion;</div><div class='ctx'> 		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -507,7 +568,7 @@ static int dvb_frontend_is_exiting(struct dvb_frontend *fe)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	if (fepriv-&gt;dvbdev-&gt;writers == 1)</div><div class='del'>-		if (time_after(jiffies, fepriv-&gt;release_jiffies +</div><div class='add'>+		if (time_after_eq(jiffies, fepriv-&gt;release_jiffies +</div><div class='ctx'> 				  dvb_shutdown_timeout * HZ))</div><div class='ctx'> 			return 1;</div><div class='ctx'> </div><div class='hunk'>@@ -540,7 +601,7 @@ static int dvb_frontend_thread(void *data)</div><div class='ctx'> 	fe_status_t s;</div><div class='ctx'> 	enum dvbfe_algo algo;</div><div class='ctx'> </div><div class='del'>-	struct dvb_frontend_parameters *params;</div><div class='add'>+	bool re_tune = false;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s\n", __func__);</div><div class='ctx'> </div><div class='hunk'>@@ -589,18 +650,15 @@ restart:</div><div class='ctx'> 			switch (algo) {</div><div class='ctx'> 			case DVBFE_ALGO_HW:</div><div class='ctx'> 				dprintk("%s: Frontend ALGO = DVBFE_ALGO_HW\n", __func__);</div><div class='del'>-				params = NULL; /* have we been asked to RETUNE ? */</div><div class='ctx'> </div><div class='ctx'> 				if (fepriv-&gt;state &amp; FESTATE_RETUNE) {</div><div class='ctx'> 					dprintk("%s: Retune requested, FESTATE_RETUNE\n", __func__);</div><div class='del'>-					params = &amp;fepriv-&gt;parameters_in;</div><div class='add'>+					re_tune = true;</div><div class='ctx'> 					fepriv-&gt;state = FESTATE_TUNED;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				if (fe-&gt;ops.tune)</div><div class='del'>-					fe-&gt;ops.tune(fe, params, fepriv-&gt;tune_mode_flags, &amp;fepriv-&gt;delay, &amp;s);</div><div class='del'>-				if (params)</div><div class='del'>-					fepriv-&gt;parameters_out = *params;</div><div class='add'>+					fe-&gt;ops.tune(fe, re_tune, fepriv-&gt;tune_mode_flags, &amp;fepriv-&gt;delay, &amp;s);</div><div class='ctx'> </div><div class='ctx'> 				if (s != fepriv-&gt;status &amp;&amp; !(fepriv-&gt;tune_mode_flags &amp; FE_TUNE_MODE_ONESHOT)) {</div><div class='ctx'> 					dprintk("%s: state changed, adding current state\n", __func__);</div><div class='hunk'>@@ -624,7 +682,7 @@ restart:</div><div class='ctx'> 				 */</div><div class='ctx'> 				if (fepriv-&gt;algo_status &amp; DVBFE_ALGO_SEARCH_AGAIN) {</div><div class='ctx'> 					if (fe-&gt;ops.search) {</div><div class='del'>-						fepriv-&gt;algo_status = fe-&gt;ops.search(fe, &amp;fepriv-&gt;parameters_in);</div><div class='add'>+						fepriv-&gt;algo_status = fe-&gt;ops.search(fe);</div><div class='ctx'> 						/* We did do a search as was requested, the flags are</div><div class='ctx'> 						 * now unset as well and has the flags wrt to search.</div><div class='ctx'> 						 */</div><div class='hunk'>@@ -633,14 +691,10 @@ restart:</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='ctx'> 				/* Track the carrier if the search was successful */</div><div class='del'>-				if (fepriv-&gt;algo_status == DVBFE_ALGO_SEARCH_SUCCESS) {</div><div class='del'>-					if (fe-&gt;ops.track)</div><div class='del'>-						fe-&gt;ops.track(fe, &amp;fepriv-&gt;parameters_in);</div><div class='del'>-				} else {</div><div class='add'>+				if (fepriv-&gt;algo_status != DVBFE_ALGO_SEARCH_SUCCESS) {</div><div class='ctx'> 					fepriv-&gt;algo_status |= DVBFE_ALGO_SEARCH_AGAIN;</div><div class='ctx'> 					fepriv-&gt;delay = HZ / 2;</div><div class='ctx'> 				}</div><div class='del'>-				fepriv-&gt;parameters_out = fepriv-&gt;parameters_in;</div><div class='ctx'> 				fe-&gt;ops.read_status(fe, &amp;s);</div><div class='ctx'> 				if (s != fepriv-&gt;status) {</div><div class='ctx'> 					dvb_frontend_add_event(fe, s); /* update event list */</div><div class='hunk'>@@ -807,52 +861,40 @@ static void dvb_frontend_get_frequency_limits(struct dvb_frontend *fe,</div><div class='ctx'> 		       fe-&gt;dvb-&gt;num,fe-&gt;id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dvb_frontend_check_parameters(struct dvb_frontend *fe,</div><div class='del'>-				struct dvb_frontend_parameters *parms)</div><div class='add'>+static int dvb_frontend_check_parameters(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	u32 freq_min;</div><div class='ctx'> 	u32 freq_max;</div><div class='ctx'> </div><div class='ctx'> 	/* range check: frequency */</div><div class='ctx'> 	dvb_frontend_get_frequency_limits(fe, &amp;freq_min, &amp;freq_max);</div><div class='del'>-	if ((freq_min &amp;&amp; parms-&gt;frequency &lt; freq_min) ||</div><div class='del'>-	    (freq_max &amp;&amp; parms-&gt;frequency &gt; freq_max)) {</div><div class='add'>+	if ((freq_min &amp;&amp; c-&gt;frequency &lt; freq_min) ||</div><div class='add'>+	    (freq_max &amp;&amp; c-&gt;frequency &gt; freq_max)) {</div><div class='ctx'> 		printk(KERN_WARNING "DVB: adapter %i frontend %i frequency %u out of range (%u..%u)\n",</div><div class='del'>-		       fe-&gt;dvb-&gt;num, fe-&gt;id, parms-&gt;frequency, freq_min, freq_max);</div><div class='add'>+		       fe-&gt;dvb-&gt;num, fe-&gt;id, c-&gt;frequency, freq_min, freq_max);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* range check: symbol rate */</div><div class='del'>-	if (fe-&gt;ops.info.type == FE_QPSK) {</div><div class='add'>+	switch (c-&gt;delivery_system) {</div><div class='add'>+	case SYS_DVBS:</div><div class='add'>+	case SYS_DVBS2:</div><div class='add'>+	case SYS_TURBO:</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='add'>+	case SYS_DVBC_ANNEX_C:</div><div class='ctx'> 		if ((fe-&gt;ops.info.symbol_rate_min &amp;&amp;</div><div class='del'>-		     parms-&gt;u.qpsk.symbol_rate &lt; fe-&gt;ops.info.symbol_rate_min) ||</div><div class='add'>+		     c-&gt;symbol_rate &lt; fe-&gt;ops.info.symbol_rate_min) ||</div><div class='ctx'> 		    (fe-&gt;ops.info.symbol_rate_max &amp;&amp;</div><div class='del'>-		     parms-&gt;u.qpsk.symbol_rate &gt; fe-&gt;ops.info.symbol_rate_max)) {</div><div class='add'>+		     c-&gt;symbol_rate &gt; fe-&gt;ops.info.symbol_rate_max)) {</div><div class='ctx'> 			printk(KERN_WARNING "DVB: adapter %i frontend %i symbol rate %u out of range (%u..%u)\n",</div><div class='del'>-			       fe-&gt;dvb-&gt;num, fe-&gt;id, parms-&gt;u.qpsk.symbol_rate,</div><div class='del'>-			       fe-&gt;ops.info.symbol_rate_min, fe-&gt;ops.info.symbol_rate_max);</div><div class='add'>+			       fe-&gt;dvb-&gt;num, fe-&gt;id, c-&gt;symbol_rate,</div><div class='add'>+			       fe-&gt;ops.info.symbol_rate_min,</div><div class='add'>+			       fe-&gt;ops.info.symbol_rate_max);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-	} else if (fe-&gt;ops.info.type == FE_QAM) {</div><div class='del'>-		if ((fe-&gt;ops.info.symbol_rate_min &amp;&amp;</div><div class='del'>-		     parms-&gt;u.qam.symbol_rate &lt; fe-&gt;ops.info.symbol_rate_min) ||</div><div class='del'>-		    (fe-&gt;ops.info.symbol_rate_max &amp;&amp;</div><div class='del'>-		     parms-&gt;u.qam.symbol_rate &gt; fe-&gt;ops.info.symbol_rate_max)) {</div><div class='del'>-			printk(KERN_WARNING "DVB: adapter %i frontend %i symbol rate %u out of range (%u..%u)\n",</div><div class='del'>-			       fe-&gt;dvb-&gt;num, fe-&gt;id, parms-&gt;u.qam.symbol_rate,</div><div class='del'>-			       fe-&gt;ops.info.symbol_rate_min, fe-&gt;ops.info.symbol_rate_max);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check for supported modulation */</div><div class='del'>-	if (fe-&gt;ops.info.type == FE_QAM &amp;&amp;</div><div class='del'>-	    (parms-&gt;u.qam.modulation &gt; QAM_AUTO ||</div><div class='del'>-	     !((1 &lt;&lt; (parms-&gt;u.qam.modulation + 10)) &amp; fe-&gt;ops.info.caps))) {</div><div class='del'>-		printk(KERN_WARNING "DVB: adapter %i frontend %i modulation %u not supported\n",</div><div class='del'>-		       fe-&gt;dvb-&gt;num, fe-&gt;id, parms-&gt;u.qam.modulation);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -862,32 +904,59 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	int i;</div><div class='add'>+	u32 delsys;</div><div class='ctx'> </div><div class='add'>+	delsys = c-&gt;delivery_system;</div><div class='ctx'> 	memset(c, 0, sizeof(struct dtv_frontend_properties));</div><div class='add'>+	c-&gt;delivery_system = delsys;</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;state = DTV_CLEAR;</div><div class='del'>-	c-&gt;delivery_system = SYS_UNDEFINED;</div><div class='del'>-	c-&gt;inversion = INVERSION_AUTO;</div><div class='del'>-	c-&gt;fec_inner = FEC_AUTO;</div><div class='add'>+</div><div class='add'>+	dprintk("%s() Clearing cache for delivery system %d\n", __func__,</div><div class='add'>+		c-&gt;delivery_system);</div><div class='add'>+</div><div class='ctx'> 	c-&gt;transmission_mode = TRANSMISSION_MODE_AUTO;</div><div class='del'>-	c-&gt;bandwidth_hz = BANDWIDTH_AUTO;</div><div class='add'>+	c-&gt;bandwidth_hz = 0;	/* AUTO */</div><div class='ctx'> 	c-&gt;guard_interval = GUARD_INTERVAL_AUTO;</div><div class='ctx'> 	c-&gt;hierarchy = HIERARCHY_AUTO;</div><div class='del'>-	c-&gt;symbol_rate = QAM_AUTO;</div><div class='add'>+	c-&gt;symbol_rate = 0;</div><div class='ctx'> 	c-&gt;code_rate_HP = FEC_AUTO;</div><div class='ctx'> 	c-&gt;code_rate_LP = FEC_AUTO;</div><div class='del'>-</div><div class='del'>-	c-&gt;isdbt_partial_reception = -1;</div><div class='del'>-	c-&gt;isdbt_sb_mode = -1;</div><div class='del'>-	c-&gt;isdbt_sb_subchannel = -1;</div><div class='del'>-	c-&gt;isdbt_sb_segment_idx = -1;</div><div class='del'>-	c-&gt;isdbt_sb_segment_count = -1;</div><div class='del'>-	c-&gt;isdbt_layer_enabled = 0x7;</div><div class='add'>+	c-&gt;fec_inner = FEC_AUTO;</div><div class='add'>+	c-&gt;rolloff = ROLLOFF_AUTO;</div><div class='add'>+	c-&gt;voltage = SEC_VOLTAGE_OFF;</div><div class='add'>+	c-&gt;sectone = SEC_TONE_OFF;</div><div class='add'>+	c-&gt;pilot = PILOT_AUTO;</div><div class='add'>+</div><div class='add'>+	c-&gt;isdbt_partial_reception = 0;</div><div class='add'>+	c-&gt;isdbt_sb_mode = 0;</div><div class='add'>+	c-&gt;isdbt_sb_subchannel = 0;</div><div class='add'>+	c-&gt;isdbt_sb_segment_idx = 0;</div><div class='add'>+	c-&gt;isdbt_sb_segment_count = 0;</div><div class='add'>+	c-&gt;isdbt_layer_enabled = 0;</div><div class='ctx'> 	for (i = 0; i &lt; 3; i++) {</div><div class='ctx'> 		c-&gt;layer[i].fec = FEC_AUTO;</div><div class='ctx'> 		c-&gt;layer[i].modulation = QAM_AUTO;</div><div class='del'>-		c-&gt;layer[i].interleaving = -1;</div><div class='del'>-		c-&gt;layer[i].segment_count = -1;</div><div class='add'>+		c-&gt;layer[i].interleaving = 0;</div><div class='add'>+		c-&gt;layer[i].segment_count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	c-&gt;isdbs_ts_id = 0;</div><div class='add'>+	c-&gt;dvbt2_plp_id = 0;</div><div class='add'>+</div><div class='add'>+	switch (c-&gt;delivery_system) {</div><div class='add'>+	case SYS_DVBS:</div><div class='add'>+	case SYS_DVBS2:</div><div class='add'>+	case SYS_TURBO:</div><div class='add'>+		c-&gt;modulation = QPSK;   /* implied for DVB-S in legacy API */</div><div class='add'>+		c-&gt;rolloff = ROLLOFF_35;/* implied for DVB-S */</div><div class='add'>+		break;</div><div class='add'>+	case SYS_ATSC:</div><div class='add'>+		c-&gt;modulation = VSB_8;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		c-&gt;modulation = QAM_AUTO;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -943,25 +1012,6 @@ static struct dtv_cmds_h dtv_cmds[DTV_MAX_COMMAND + 1] = {</div><div class='ctx'> 	_DTV_CMD(DTV_ISDBT_LAYERC_SEGMENT_COUNT, 1, 0),</div><div class='ctx'> 	_DTV_CMD(DTV_ISDBT_LAYERC_TIME_INTERLEAVING, 1, 0),</div><div class='ctx'> </div><div class='del'>-	_DTV_CMD(DTV_ISDBT_PARTIAL_RECEPTION, 0, 0),</div><div class='del'>-	_DTV_CMD(DTV_ISDBT_SOUND_BROADCASTING, 0, 0),</div><div class='del'>-	_DTV_CMD(DTV_ISDBT_SB_SUBCHANNEL_ID, 0, 0),</div><div class='del'>-	_DTV_CMD(DTV_ISDBT_SB_SEGMENT_IDX, 0, 0),</div><div class='del'>-	_DTV_CMD(DTV_ISDBT_SB_SEGMENT_COUNT, 0, 0),</div><div class='del'>-	_DTV_CMD(DTV_ISDBT_LAYER_ENABLED, 0, 0),</div><div class='del'>-	_DTV_CMD(DTV_ISDBT_LAYERA_FEC, 0, 0),</div><div class='del'>-	_DTV_CMD(DTV_ISDBT_LAYERA_MODULATION, 0, 0),</div><div class='del'>-	_DTV_CMD(DTV_ISDBT_LAYERA_SEGMENT_COUNT, 0, 0),</div><div class='del'>-	_DTV_CMD(DTV_ISDBT_LAYERA_TIME_INTERLEAVING, 0, 0),</div><div class='del'>-	_DTV_CMD(DTV_ISDBT_LAYERB_FEC, 0, 0),</div><div class='del'>-	_DTV_CMD(DTV_ISDBT_LAYERB_MODULATION, 0, 0),</div><div class='del'>-	_DTV_CMD(DTV_ISDBT_LAYERB_SEGMENT_COUNT, 0, 0),</div><div class='del'>-	_DTV_CMD(DTV_ISDBT_LAYERB_TIME_INTERLEAVING, 0, 0),</div><div class='del'>-	_DTV_CMD(DTV_ISDBT_LAYERC_FEC, 0, 0),</div><div class='del'>-	_DTV_CMD(DTV_ISDBT_LAYERC_MODULATION, 0, 0),</div><div class='del'>-	_DTV_CMD(DTV_ISDBT_LAYERC_SEGMENT_COUNT, 0, 0),</div><div class='del'>-	_DTV_CMD(DTV_ISDBT_LAYERC_TIME_INTERLEAVING, 0, 0),</div><div class='del'>-</div><div class='ctx'> 	_DTV_CMD(DTV_ISDBS_TS_ID, 1, 0),</div><div class='ctx'> 	_DTV_CMD(DTV_DVBT2_PLP_ID, 1, 0),</div><div class='ctx'> </div><div class='hunk'>@@ -973,6 +1023,8 @@ static struct dtv_cmds_h dtv_cmds[DTV_MAX_COMMAND + 1] = {</div><div class='ctx'> 	_DTV_CMD(DTV_GUARD_INTERVAL, 0, 0),</div><div class='ctx'> 	_DTV_CMD(DTV_TRANSMISSION_MODE, 0, 0),</div><div class='ctx'> 	_DTV_CMD(DTV_HIERARCHY, 0, 0),</div><div class='add'>+</div><div class='add'>+	_DTV_CMD(DTV_ENUM_DELSYS, 0, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void dtv_property_dump(struct dtv_property *tvp)</div><div class='hunk'>@@ -1006,70 +1058,54 @@ static void dtv_property_dump(struct dtv_property *tvp)</div><div class='ctx'> 		dprintk("%s() tvp.u.data = 0x%08x\n", __func__, tvp-&gt;u.data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int is_legacy_delivery_system(fe_delivery_system_t s)</div><div class='del'>-{</div><div class='del'>-	if((s == SYS_UNDEFINED) || (s == SYS_DVBC_ANNEX_AC) ||</div><div class='del'>-	   (s == SYS_DVBC_ANNEX_B) || (s == SYS_DVBT) || (s == SYS_DVBS) ||</div><div class='del'>-	   (s == SYS_ATSC))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Initialize the cache with some default values derived from the</div><div class='del'>- * legacy frontend_info structure.</div><div class='del'>- */</div><div class='del'>-static void dtv_property_cache_init(struct dvb_frontend *fe,</div><div class='del'>-				    struct dtv_frontend_properties *c)</div><div class='del'>-{</div><div class='del'>-	switch (fe-&gt;ops.info.type) {</div><div class='del'>-	case FE_QPSK:</div><div class='del'>-		c-&gt;modulation = QPSK;   /* implied for DVB-S in legacy API */</div><div class='del'>-		c-&gt;rolloff = ROLLOFF_35;/* implied for DVB-S */</div><div class='del'>-		c-&gt;delivery_system = SYS_DVBS;</div><div class='del'>-		break;</div><div class='del'>-	case FE_QAM:</div><div class='del'>-		c-&gt;delivery_system = SYS_DVBC_ANNEX_AC;</div><div class='del'>-		break;</div><div class='del'>-	case FE_OFDM:</div><div class='del'>-		c-&gt;delivery_system = SYS_DVBT;</div><div class='del'>-		break;</div><div class='del'>-	case FE_ATSC:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Synchronise the legacy tuning parameters into the cache, so that demodulator</div><div class='ctx'>  * drivers can use a single set_frontend tuning function, regardless of whether</div><div class='ctx'>  * it's being used for the legacy or new API, reducing code and complexity.</div><div class='ctx'>  */</div><div class='del'>-static void dtv_property_cache_sync(struct dvb_frontend *fe,</div><div class='del'>-				    struct dtv_frontend_properties *c,</div><div class='del'>-				    const struct dvb_frontend_parameters *p)</div><div class='add'>+static int dtv_property_cache_sync(struct dvb_frontend *fe,</div><div class='add'>+				   struct dtv_frontend_properties *c,</div><div class='add'>+				   const struct dvb_frontend_parameters *p)</div><div class='ctx'> {</div><div class='ctx'> 	c-&gt;frequency = p-&gt;frequency;</div><div class='ctx'> 	c-&gt;inversion = p-&gt;inversion;</div><div class='ctx'> </div><div class='del'>-	switch (fe-&gt;ops.info.type) {</div><div class='del'>-	case FE_QPSK:</div><div class='add'>+	switch (dvbv3_type(c-&gt;delivery_system)) {</div><div class='add'>+	case DVBV3_QPSK:</div><div class='add'>+		dprintk("%s() Preparing QPSK req\n", __func__);</div><div class='ctx'> 		c-&gt;symbol_rate = p-&gt;u.qpsk.symbol_rate;</div><div class='ctx'> 		c-&gt;fec_inner = p-&gt;u.qpsk.fec_inner;</div><div class='ctx'> 		break;</div><div class='del'>-	case FE_QAM:</div><div class='add'>+	case DVBV3_QAM:</div><div class='add'>+		dprintk("%s() Preparing QAM req\n", __func__);</div><div class='ctx'> 		c-&gt;symbol_rate = p-&gt;u.qam.symbol_rate;</div><div class='ctx'> 		c-&gt;fec_inner = p-&gt;u.qam.fec_inner;</div><div class='ctx'> 		c-&gt;modulation = p-&gt;u.qam.modulation;</div><div class='ctx'> 		break;</div><div class='del'>-	case FE_OFDM:</div><div class='del'>-		if (p-&gt;u.ofdm.bandwidth == BANDWIDTH_6_MHZ)</div><div class='del'>-			c-&gt;bandwidth_hz = 6000000;</div><div class='del'>-		else if (p-&gt;u.ofdm.bandwidth == BANDWIDTH_7_MHZ)</div><div class='del'>-			c-&gt;bandwidth_hz = 7000000;</div><div class='del'>-		else if (p-&gt;u.ofdm.bandwidth == BANDWIDTH_8_MHZ)</div><div class='add'>+	case DVBV3_OFDM:</div><div class='add'>+		dprintk("%s() Preparing OFDM req\n", __func__);</div><div class='add'>+		switch (p-&gt;u.ofdm.bandwidth) {</div><div class='add'>+		case BANDWIDTH_10_MHZ:</div><div class='add'>+			c-&gt;bandwidth_hz = 10000000;</div><div class='add'>+			break;</div><div class='add'>+		case BANDWIDTH_8_MHZ:</div><div class='ctx'> 			c-&gt;bandwidth_hz = 8000000;</div><div class='del'>-		else</div><div class='del'>-			/* Including BANDWIDTH_AUTO */</div><div class='add'>+			break;</div><div class='add'>+		case BANDWIDTH_7_MHZ:</div><div class='add'>+			c-&gt;bandwidth_hz = 7000000;</div><div class='add'>+			break;</div><div class='add'>+		case BANDWIDTH_6_MHZ:</div><div class='add'>+			c-&gt;bandwidth_hz = 6000000;</div><div class='add'>+			break;</div><div class='add'>+		case BANDWIDTH_5_MHZ:</div><div class='add'>+			c-&gt;bandwidth_hz = 5000000;</div><div class='add'>+			break;</div><div class='add'>+		case BANDWIDTH_1_712_MHZ:</div><div class='add'>+			c-&gt;bandwidth_hz = 1712000;</div><div class='add'>+			break;</div><div class='add'>+		case BANDWIDTH_AUTO:</div><div class='ctx'> 			c-&gt;bandwidth_hz = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		c-&gt;code_rate_HP = p-&gt;u.ofdm.code_rate_HP;</div><div class='ctx'> 		c-&gt;code_rate_LP = p-&gt;u.ofdm.code_rate_LP;</div><div class='ctx'> 		c-&gt;modulation = p-&gt;u.ofdm.constellation;</div><div class='hunk'>@@ -1077,50 +1113,78 @@ static void dtv_property_cache_sync(struct dvb_frontend *fe,</div><div class='ctx'> 		c-&gt;guard_interval = p-&gt;u.ofdm.guard_interval;</div><div class='ctx'> 		c-&gt;hierarchy = p-&gt;u.ofdm.hierarchy_information;</div><div class='ctx'> 		break;</div><div class='del'>-	case FE_ATSC:</div><div class='add'>+	case DVBV3_ATSC:</div><div class='add'>+		dprintk("%s() Preparing ATSC req\n", __func__);</div><div class='ctx'> 		c-&gt;modulation = p-&gt;u.vsb.modulation;</div><div class='ctx'> 		if ((c-&gt;modulation == VSB_8) || (c-&gt;modulation == VSB_16))</div><div class='ctx'> 			c-&gt;delivery_system = SYS_ATSC;</div><div class='ctx'> 		else</div><div class='ctx'> 			c-&gt;delivery_system = SYS_DVBC_ANNEX_B;</div><div class='ctx'> 		break;</div><div class='add'>+	case DVBV3_UNKNOWN:</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "%s: doesn't know how to handle a DVBv3 call to delivery system %i\n",</div><div class='add'>+		       __func__, c-&gt;delivery_system);</div><div class='add'>+		return -EINVAL;</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'> /* Ensure the cached values are set correctly in the frontend</div><div class='ctx'>  * legacy tuning structures, for the advanced tuning API.</div><div class='ctx'>  */</div><div class='del'>-static void dtv_property_legacy_params_sync(struct dvb_frontend *fe)</div><div class='add'>+static int dtv_property_legacy_params_sync(struct dvb_frontend *fe,</div><div class='add'>+					    struct dvb_frontend_parameters *p)</div><div class='ctx'> {</div><div class='ctx'> 	const struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='del'>-	struct dvb_frontend_private *fepriv = fe-&gt;frontend_priv;</div><div class='del'>-	struct dvb_frontend_parameters *p = &amp;fepriv-&gt;parameters_in;</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;frequency = c-&gt;frequency;</div><div class='ctx'> 	p-&gt;inversion = c-&gt;inversion;</div><div class='ctx'> </div><div class='del'>-	switch (fe-&gt;ops.info.type) {</div><div class='del'>-	case FE_QPSK:</div><div class='add'>+	switch (dvbv3_type(c-&gt;delivery_system)) {</div><div class='add'>+	case DVBV3_UNKNOWN:</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "%s: doesn't know how to handle a DVBv3 call to delivery system %i\n",</div><div class='add'>+		       __func__, c-&gt;delivery_system);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	case DVBV3_QPSK:</div><div class='ctx'> 		dprintk("%s() Preparing QPSK req\n", __func__);</div><div class='ctx'> 		p-&gt;u.qpsk.symbol_rate = c-&gt;symbol_rate;</div><div class='ctx'> 		p-&gt;u.qpsk.fec_inner = c-&gt;fec_inner;</div><div class='ctx'> 		break;</div><div class='del'>-	case FE_QAM:</div><div class='add'>+	case DVBV3_QAM:</div><div class='ctx'> 		dprintk("%s() Preparing QAM req\n", __func__);</div><div class='ctx'> 		p-&gt;u.qam.symbol_rate = c-&gt;symbol_rate;</div><div class='ctx'> 		p-&gt;u.qam.fec_inner = c-&gt;fec_inner;</div><div class='ctx'> 		p-&gt;u.qam.modulation = c-&gt;modulation;</div><div class='ctx'> 		break;</div><div class='del'>-	case FE_OFDM:</div><div class='add'>+	case DVBV3_OFDM:</div><div class='ctx'> 		dprintk("%s() Preparing OFDM req\n", __func__);</div><div class='del'>-		if (c-&gt;bandwidth_hz == 6000000)</div><div class='del'>-			p-&gt;u.ofdm.bandwidth = BANDWIDTH_6_MHZ;</div><div class='del'>-		else if (c-&gt;bandwidth_hz == 7000000)</div><div class='del'>-			p-&gt;u.ofdm.bandwidth = BANDWIDTH_7_MHZ;</div><div class='del'>-		else if (c-&gt;bandwidth_hz == 8000000)</div><div class='add'>+</div><div class='add'>+		switch (c-&gt;bandwidth_hz) {</div><div class='add'>+		case 10000000:</div><div class='add'>+			p-&gt;u.ofdm.bandwidth = BANDWIDTH_10_MHZ;</div><div class='add'>+			break;</div><div class='add'>+		case 8000000:</div><div class='ctx'> 			p-&gt;u.ofdm.bandwidth = BANDWIDTH_8_MHZ;</div><div class='del'>-		else</div><div class='add'>+			break;</div><div class='add'>+		case 7000000:</div><div class='add'>+			p-&gt;u.ofdm.bandwidth = BANDWIDTH_7_MHZ;</div><div class='add'>+			break;</div><div class='add'>+		case 6000000:</div><div class='add'>+			p-&gt;u.ofdm.bandwidth = BANDWIDTH_6_MHZ;</div><div class='add'>+			break;</div><div class='add'>+		case 5000000:</div><div class='add'>+			p-&gt;u.ofdm.bandwidth = BANDWIDTH_5_MHZ;</div><div class='add'>+			break;</div><div class='add'>+		case 1712000:</div><div class='add'>+			p-&gt;u.ofdm.bandwidth = BANDWIDTH_1_712_MHZ;</div><div class='add'>+			break;</div><div class='add'>+		case 0:</div><div class='add'>+		default:</div><div class='ctx'> 			p-&gt;u.ofdm.bandwidth = BANDWIDTH_AUTO;</div><div class='add'>+		}</div><div class='ctx'> 		p-&gt;u.ofdm.code_rate_HP = c-&gt;code_rate_HP;</div><div class='ctx'> 		p-&gt;u.ofdm.code_rate_LP = c-&gt;code_rate_LP;</div><div class='ctx'> 		p-&gt;u.ofdm.constellation = c-&gt;modulation;</div><div class='hunk'>@@ -1128,78 +1192,40 @@ static void dtv_property_legacy_params_sync(struct dvb_frontend *fe)</div><div class='ctx'> 		p-&gt;u.ofdm.guard_interval = c-&gt;guard_interval;</div><div class='ctx'> 		p-&gt;u.ofdm.hierarchy_information = c-&gt;hierarchy;</div><div class='ctx'> 		break;</div><div class='del'>-	case FE_ATSC:</div><div class='add'>+	case DVBV3_ATSC:</div><div class='ctx'> 		dprintk("%s() Preparing VSB req\n", __func__);</div><div class='ctx'> 		p-&gt;u.vsb.modulation = c-&gt;modulation;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Ensure the cached values are set correctly in the frontend</div><div class='del'>- * legacy tuning structures, for the legacy tuning API.</div><div class='add'>+/**</div><div class='add'>+ * dtv_get_frontend - calls a callback for retrieving DTV parameters</div><div class='add'>+ * @fe:		struct dvb_frontend pointer</div><div class='add'>+ * @c:		struct dtv_frontend_properties pointer (DVBv5 cache)</div><div class='add'>+ * @p_out	struct dvb_frontend_parameters pointer (DVBv3 FE struct)</div><div class='add'>+ *</div><div class='add'>+ * This routine calls either the DVBv3 or DVBv5 get_frontend call.</div><div class='add'>+ * If c is not null, it will update the DVBv5 cache struct pointed by it.</div><div class='add'>+ * If p_out is not null, it will update the DVBv3 params pointed by it.</div><div class='ctx'>  */</div><div class='del'>-static void dtv_property_adv_params_sync(struct dvb_frontend *fe)</div><div class='add'>+static int dtv_get_frontend(struct dvb_frontend *fe,</div><div class='add'>+			    struct dvb_frontend_parameters *p_out)</div><div class='ctx'> {</div><div class='del'>-	const struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='del'>-	struct dvb_frontend_private *fepriv = fe-&gt;frontend_priv;</div><div class='del'>-	struct dvb_frontend_parameters *p = &amp;fepriv-&gt;parameters_in;</div><div class='del'>-</div><div class='del'>-	p-&gt;frequency = c-&gt;frequency;</div><div class='del'>-	p-&gt;inversion = c-&gt;inversion;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;delivery_system == SYS_DSS ||</div><div class='del'>-	    c-&gt;delivery_system == SYS_DVBS ||</div><div class='del'>-	    c-&gt;delivery_system == SYS_DVBS2 ||</div><div class='del'>-	    c-&gt;delivery_system == SYS_ISDBS ||</div><div class='del'>-	    c-&gt;delivery_system == SYS_TURBO) {</div><div class='del'>-		p-&gt;u.qpsk.symbol_rate = c-&gt;symbol_rate;</div><div class='del'>-		p-&gt;u.qpsk.fec_inner = c-&gt;fec_inner;</div><div class='del'>-	}</div><div class='add'>+	int r;</div><div class='ctx'> </div><div class='del'>-	/* Fake out a generic DVB-T request so we pass validation in the ioctl */</div><div class='del'>-	if ((c-&gt;delivery_system == SYS_ISDBT) ||</div><div class='del'>-	    (c-&gt;delivery_system == SYS_DVBT2)) {</div><div class='del'>-		p-&gt;u.ofdm.constellation = QAM_AUTO;</div><div class='del'>-		p-&gt;u.ofdm.code_rate_HP = FEC_AUTO;</div><div class='del'>-		p-&gt;u.ofdm.code_rate_LP = FEC_AUTO;</div><div class='del'>-		p-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_AUTO;</div><div class='del'>-		p-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_AUTO;</div><div class='del'>-		p-&gt;u.ofdm.hierarchy_information = HIERARCHY_AUTO;</div><div class='del'>-		if (c-&gt;bandwidth_hz == 8000000)</div><div class='del'>-			p-&gt;u.ofdm.bandwidth = BANDWIDTH_8_MHZ;</div><div class='del'>-		else if (c-&gt;bandwidth_hz == 7000000)</div><div class='del'>-			p-&gt;u.ofdm.bandwidth = BANDWIDTH_7_MHZ;</div><div class='del'>-		else if (c-&gt;bandwidth_hz == 6000000)</div><div class='del'>-			p-&gt;u.ofdm.bandwidth = BANDWIDTH_6_MHZ;</div><div class='del'>-		else</div><div class='del'>-			p-&gt;u.ofdm.bandwidth = BANDWIDTH_AUTO;</div><div class='add'>+	if (fe-&gt;ops.get_frontend) {</div><div class='add'>+		r = fe-&gt;ops.get_frontend(fe);</div><div class='add'>+		if (unlikely(r &lt; 0))</div><div class='add'>+			return r;</div><div class='add'>+		if (p_out)</div><div class='add'>+			dtv_property_legacy_params_sync(fe, p_out);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void dtv_property_cache_submit(struct dvb_frontend *fe)</div><div class='del'>-{</div><div class='del'>-	const struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='del'>-</div><div class='del'>-	/* For legacy delivery systems we don't need the delivery_system to</div><div class='del'>-	 * be specified, but we populate the older structures from the cache</div><div class='del'>-	 * so we can call set_frontend on older drivers.</div><div class='del'>-	 */</div><div class='del'>-	if(is_legacy_delivery_system(c-&gt;delivery_system)) {</div><div class='del'>-</div><div class='del'>-		dprintk("%s() legacy, modulation = %d\n", __func__, c-&gt;modulation);</div><div class='del'>-		dtv_property_legacy_params_sync(fe);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		dprintk("%s() adv, modulation = %d\n", __func__, c-&gt;modulation);</div><div class='del'>-</div><div class='del'>-		/* For advanced delivery systems / modulation types ...</div><div class='del'>-		 * we seed the lecacy dvb_frontend_parameters structure</div><div class='del'>-		 * so that the sanity checking code later in the IOCTL processing</div><div class='del'>-		 * can validate our basic frequency ranges, symbolrates, modulation</div><div class='del'>-		 * etc.</div><div class='del'>-		 */</div><div class='del'>-		dtv_property_adv_params_sync(fe);</div><div class='del'>-	}</div><div class='add'>+	/* As everything is in cache, get_frontend fops are always supported */</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dvb_frontend_ioctl_legacy(struct file *file,</div><div class='hunk'>@@ -1208,25 +1234,21 @@ static int dvb_frontend_ioctl_properties(struct file *file,</div><div class='ctx'> 			unsigned int cmd, void *parg);</div><div class='ctx'> </div><div class='ctx'> static int dtv_property_process_get(struct dvb_frontend *fe,</div><div class='add'>+				    const struct dtv_frontend_properties *c,</div><div class='ctx'> 				    struct dtv_property *tvp,</div><div class='ctx'> 				    struct file *file)</div><div class='ctx'> {</div><div class='del'>-	const struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='del'>-	struct dvb_frontend_private *fepriv = fe-&gt;frontend_priv;</div><div class='del'>-	struct dtv_frontend_properties cdetected;</div><div class='del'>-	int r;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the driver implements a get_frontend function, then convert</div><div class='del'>-	 * detected parameters to S2API properties.</div><div class='del'>-	 */</div><div class='del'>-	if (fe-&gt;ops.get_frontend) {</div><div class='del'>-		cdetected = *c;</div><div class='del'>-		dtv_property_cache_sync(fe, &amp;cdetected, &amp;fepriv-&gt;parameters_out);</div><div class='del'>-		c = &amp;cdetected;</div><div class='del'>-	}</div><div class='add'>+	int r, ncaps;</div><div class='ctx'> </div><div class='ctx'> 	switch(tvp-&gt;cmd) {</div><div class='add'>+	case DTV_ENUM_DELSYS:</div><div class='add'>+		ncaps = 0;</div><div class='add'>+		while (fe-&gt;ops.delsys[ncaps] &amp;&amp; ncaps &lt; MAX_DELSYS) {</div><div class='add'>+			tvp-&gt;u.buffer.data[ncaps] = fe-&gt;ops.delsys[ncaps];</div><div class='add'>+			ncaps++;</div><div class='add'>+		}</div><div class='add'>+		tvp-&gt;u.buffer.len = ncaps;</div><div class='add'>+		break;</div><div class='ctx'> 	case DTV_FREQUENCY:</div><div class='ctx'> 		tvp-&gt;u.data = c-&gt;frequency;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1356,14 +1378,168 @@ static int dtv_property_process_get(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dtv_set_frontend(struct dvb_frontend *fe);</div><div class='add'>+</div><div class='add'>+static bool is_dvbv3_delsys(u32 delsys)</div><div class='add'>+{</div><div class='add'>+	bool status;</div><div class='add'>+</div><div class='add'>+	status = (delsys == SYS_DVBT) || (delsys == SYS_DVBC_ANNEX_A) ||</div><div class='add'>+		 (delsys == SYS_DVBS) || (delsys == SYS_ATSC);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_delivery_system(struct dvb_frontend *fe, u32 desired_system)</div><div class='add'>+{</div><div class='add'>+	int ncaps, i;</div><div class='add'>+	u32 delsys = SYS_UNDEFINED;</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	enum dvbv3_emulation_type type;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * It was reported that some old DVBv5 applications were</div><div class='add'>+	 * filling delivery_system with SYS_UNDEFINED. If this happens,</div><div class='add'>+	 * assume that the application wants to use the first supported</div><div class='add'>+	 * delivery system.</div><div class='add'>+	 */</div><div class='add'>+	if (c-&gt;delivery_system == SYS_UNDEFINED)</div><div class='add'>+	        c-&gt;delivery_system = fe-&gt;ops.delsys[0];</div><div class='add'>+</div><div class='add'>+	if (desired_system == SYS_UNDEFINED) {</div><div class='add'>+		/*</div><div class='add'>+		 * A DVBv3 call doesn't know what's the desired system.</div><div class='add'>+		 * Also, DVBv3 applications don't know that ops.info-&gt;type</div><div class='add'>+		 * could be changed, and they simply dies when it doesn't</div><div class='add'>+		 * match.</div><div class='add'>+		 * So, don't change the current delivery system, as it</div><div class='add'>+		 * may be trying to do the wrong thing, like setting an</div><div class='add'>+		 * ISDB-T frontend as DVB-T. Instead, find the closest</div><div class='add'>+		 * DVBv3 system that matches the delivery system.</div><div class='add'>+		 */</div><div class='add'>+		if (is_dvbv3_delsys(c-&gt;delivery_system)) {</div><div class='add'>+			dprintk("%s() Using delivery system to %d\n",</div><div class='add'>+				__func__, c-&gt;delivery_system);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		type = dvbv3_type(c-&gt;delivery_system);</div><div class='add'>+		switch (type) {</div><div class='add'>+		case DVBV3_QPSK:</div><div class='add'>+			desired_system = SYS_DVBS;</div><div class='add'>+			break;</div><div class='add'>+		case DVBV3_QAM:</div><div class='add'>+			desired_system = SYS_DVBC_ANNEX_A;</div><div class='add'>+			break;</div><div class='add'>+		case DVBV3_ATSC:</div><div class='add'>+			desired_system = SYS_ATSC;</div><div class='add'>+			break;</div><div class='add'>+		case DVBV3_OFDM:</div><div class='add'>+			desired_system = SYS_DVBT;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			dprintk("%s(): This frontend doesn't support DVBv3 calls\n",</div><div class='add'>+				__func__);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * This is a DVBv5 call. So, it likely knows the supported</div><div class='add'>+		 * delivery systems.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		/* Check if the desired delivery system is supported */</div><div class='add'>+		ncaps = 0;</div><div class='add'>+		while (fe-&gt;ops.delsys[ncaps] &amp;&amp; ncaps &lt; MAX_DELSYS) {</div><div class='add'>+			if (fe-&gt;ops.delsys[ncaps] == desired_system) {</div><div class='add'>+				c-&gt;delivery_system = desired_system;</div><div class='add'>+				dprintk("%s() Changing delivery system to %d\n",</div><div class='add'>+					__func__, desired_system);</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+			ncaps++;</div><div class='add'>+		}</div><div class='add'>+		type = dvbv3_type(desired_system);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The delivery system is not supported. See if it can be</div><div class='add'>+		 * emulated.</div><div class='add'>+		 * The emulation only works if the desired system is one of the</div><div class='add'>+		 * DVBv3 delivery systems</div><div class='add'>+		 */</div><div class='add'>+		if (!is_dvbv3_delsys(desired_system)) {</div><div class='add'>+			dprintk("%s() can't use a DVBv3 FE_SET_FRONTEND call on this frontend\n",</div><div class='add'>+				__func__);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Get the last non-DVBv3 delivery system that has the same type</div><div class='add'>+		 * of the desired system</div><div class='add'>+		 */</div><div class='add'>+		ncaps = 0;</div><div class='add'>+		while (fe-&gt;ops.delsys[ncaps] &amp;&amp; ncaps &lt; MAX_DELSYS) {</div><div class='add'>+			if ((dvbv3_type(fe-&gt;ops.delsys[ncaps]) == type) &amp;&amp;</div><div class='add'>+			    !is_dvbv3_delsys(fe-&gt;ops.delsys[ncaps]))</div><div class='add'>+				delsys = fe-&gt;ops.delsys[ncaps];</div><div class='add'>+			ncaps++;</div><div class='add'>+		}</div><div class='add'>+		/* There's nothing compatible with the desired delivery system */</div><div class='add'>+		if (delsys == SYS_UNDEFINED) {</div><div class='add'>+			dprintk("%s() Incompatible DVBv3 FE_SET_FRONTEND call for this frontend\n",</div><div class='add'>+				__func__);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		c-&gt;delivery_system = delsys;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The DVBv3 or DVBv5 call is requesting a different system. So,</div><div class='add'>+	 * emulation is needed.</div><div class='add'>+	 *</div><div class='add'>+	 * Emulate newer delivery systems like ISDBT, DVBT and DMBTH</div><div class='add'>+	 * for older DVBv5 applications. The emulation will try to use</div><div class='add'>+	 * the auto mode for most things, and will assume that the desired</div><div class='add'>+	 * delivery system is the last one at the ops.delsys[] array</div><div class='add'>+	 */</div><div class='add'>+	dprintk("%s() Using delivery system %d emulated as if it were a %d\n",</div><div class='add'>+		__func__, delsys, desired_system);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For now, handles ISDB-T calls. More code may be needed here for the</div><div class='add'>+	 * other emulated stuff</div><div class='add'>+	 */</div><div class='add'>+	if (type == DVBV3_OFDM) {</div><div class='add'>+		if (c-&gt;delivery_system == SYS_ISDBT) {</div><div class='add'>+			dprintk("%s() Using defaults for SYS_ISDBT\n",</div><div class='add'>+				__func__);</div><div class='add'>+			if (!c-&gt;bandwidth_hz)</div><div class='add'>+				c-&gt;bandwidth_hz = 6000000;</div><div class='add'>+</div><div class='add'>+			c-&gt;isdbt_partial_reception = 0;</div><div class='add'>+			c-&gt;isdbt_sb_mode = 0;</div><div class='add'>+			c-&gt;isdbt_sb_subchannel = 0;</div><div class='add'>+			c-&gt;isdbt_sb_segment_idx = 0;</div><div class='add'>+			c-&gt;isdbt_sb_segment_count = 0;</div><div class='add'>+			c-&gt;isdbt_layer_enabled = 0;</div><div class='add'>+			for (i = 0; i &lt; 3; i++) {</div><div class='add'>+				c-&gt;layer[i].fec = FEC_AUTO;</div><div class='add'>+				c-&gt;layer[i].modulation = QAM_AUTO;</div><div class='add'>+				c-&gt;layer[i].interleaving = 0;</div><div class='add'>+				c-&gt;layer[i].segment_count = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	dprintk("change delivery system on cache to %d\n", c-&gt;delivery_system);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int dtv_property_process_set(struct dvb_frontend *fe,</div><div class='ctx'> 				    struct dtv_property *tvp,</div><div class='ctx'> 				    struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	int r = 0;</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='del'>-	struct dvb_frontend_private *fepriv = fe-&gt;frontend_priv;</div><div class='del'>-	dtv_property_dump(tvp);</div><div class='ctx'> </div><div class='ctx'> 	/* Allow the frontend to validate incoming properties */</div><div class='ctx'> 	if (fe-&gt;ops.set_property) {</div><div class='hunk'>@@ -1374,11 +1550,11 @@ static int dtv_property_process_set(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	switch(tvp-&gt;cmd) {</div><div class='ctx'> 	case DTV_CLEAR:</div><div class='del'>-		/* Reset a cache of data specific to the frontend here. This does</div><div class='add'>+		/*</div><div class='add'>+		 * Reset a cache of data specific to the frontend here. This does</div><div class='ctx'> 		 * not effect hardware.</div><div class='ctx'> 		 */</div><div class='ctx'> 		dvb_frontend_clear_cache(fe);</div><div class='del'>-		dprintk("%s() Flushing property cache\n", __func__);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DTV_TUNE:</div><div class='ctx'> 		/* interpret the cache of data, build either a traditional frontend</div><div class='hunk'>@@ -1387,10 +1563,8 @@ static int dtv_property_process_set(struct dvb_frontend *fe,</div><div class='ctx'> 		 */</div><div class='ctx'> 		c-&gt;state = tvp-&gt;cmd;</div><div class='ctx'> 		dprintk("%s() Finalised property cache\n", __func__);</div><div class='del'>-		dtv_property_cache_submit(fe);</div><div class='ctx'> </div><div class='del'>-		r = dvb_frontend_ioctl_legacy(file, FE_SET_FRONTEND,</div><div class='del'>-			&amp;fepriv-&gt;parameters_in);</div><div class='add'>+		r = dtv_set_frontend(fe);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DTV_FREQUENCY:</div><div class='ctx'> 		c-&gt;frequency = tvp-&gt;u.data;</div><div class='hunk'>@@ -1417,7 +1591,7 @@ static int dtv_property_process_set(struct dvb_frontend *fe,</div><div class='ctx'> 		c-&gt;rolloff = tvp-&gt;u.data;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DTV_DELIVERY_SYSTEM:</div><div class='del'>-		c-&gt;delivery_system = tvp-&gt;u.data;</div><div class='add'>+		r = set_delivery_system(fe, tvp-&gt;u.data);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DTV_VOLTAGE:</div><div class='ctx'> 		c-&gt;voltage = tvp-&gt;u.data;</div><div class='hunk'>@@ -1551,6 +1725,7 @@ static int dvb_frontend_ioctl_properties(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_device *dvbdev = file-&gt;private_data;</div><div class='ctx'> 	struct dvb_frontend *fe = dvbdev-&gt;priv;</div><div class='add'>+	struct dvb_frontend_private *fepriv = fe-&gt;frontend_priv;</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1594,7 +1769,6 @@ static int dvb_frontend_ioctl_properties(struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	} else</div><div class='ctx'> 	if(cmd == FE_GET_PROPERTY) {</div><div class='del'>-</div><div class='ctx'> 		tvps = (struct dtv_properties __user *)parg;</div><div class='ctx'> </div><div class='ctx'> 		dprintk("%s() properties.num = %d\n", __func__, tvps-&gt;num);</div><div class='hunk'>@@ -1616,8 +1790,18 @@ static int dvb_frontend_ioctl_properties(struct file *file,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * Fills the cache out struct with the cache contents, plus</div><div class='add'>+		 * the data retrieved from get_frontend, if the frontend</div><div class='add'>+		 * is not idle. Otherwise, returns the cached content</div><div class='add'>+		 */</div><div class='add'>+		if (fepriv-&gt;state != FESTATE_IDLE) {</div><div class='add'>+			err = dtv_get_frontend(fe, NULL);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='ctx'> 		for (i = 0; i &lt; tvps-&gt;num; i++) {</div><div class='del'>-			err = dtv_property_process_get(fe, tvp + i, file);</div><div class='add'>+			err = dtv_property_process_get(fe, c, tvp + i, file);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			(tvp + i)-&gt;result = err;</div><div class='hunk'>@@ -1636,12 +1820,121 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dtv_set_frontend(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct dvb_frontend_private *fepriv = fe-&gt;frontend_priv;</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	struct dvb_frontend_tune_settings fetunesettings;</div><div class='add'>+	u32 rolloff = 0;</div><div class='add'>+</div><div class='add'>+	if (dvb_frontend_check_parameters(fe) &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Be sure that the bandwidth will be filled for all</div><div class='add'>+	 * non-satellite systems, as tuners need to know what</div><div class='add'>+	 * low pass/Nyquist half filter should be applied, in</div><div class='add'>+	 * order to avoid inter-channel noise.</div><div class='add'>+	 *</div><div class='add'>+	 * ISDB-T and DVB-T/T2 already sets bandwidth.</div><div class='add'>+	 * ATSC and DVB-C don't set, so, the core should fill it.</div><div class='add'>+	 *</div><div class='add'>+	 * On DVB-C Annex A and C, the bandwidth is a function of</div><div class='add'>+	 * the roll-off and symbol rate. Annex B defines different</div><div class='add'>+	 * roll-off factors depending on the modulation. Fortunately,</div><div class='add'>+	 * Annex B is only used with 6MHz, so there's no need to</div><div class='add'>+	 * calculate it.</div><div class='add'>+	 *</div><div class='add'>+	 * While not officially supported, a side effect of handling it at</div><div class='add'>+	 * the cache level is that a program could retrieve the bandwidth</div><div class='add'>+	 * via DTV_BANDWIDTH_HZ, which may be useful for test programs.</div><div class='add'>+	 */</div><div class='add'>+	switch (c-&gt;delivery_system) {</div><div class='add'>+	case SYS_ATSC:</div><div class='add'>+	case SYS_DVBC_ANNEX_B:</div><div class='add'>+		c-&gt;bandwidth_hz = 6000000;</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='add'>+		rolloff = 115;</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_C:</div><div class='add'>+		rolloff = 113;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (rolloff)</div><div class='add'>+		c-&gt;bandwidth_hz = (c-&gt;symbol_rate * rolloff) / 100;</div><div class='add'>+</div><div class='add'>+	/* force auto frequency inversion if requested */</div><div class='add'>+	if (dvb_force_auto_inversion)</div><div class='add'>+		c-&gt;inversion = INVERSION_AUTO;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * without hierarchical coding code_rate_LP is irrelevant,</div><div class='add'>+	 * so we tolerate the otherwise invalid FEC_NONE setting</div><div class='add'>+	 */</div><div class='add'>+	if (c-&gt;hierarchy == HIERARCHY_NONE &amp;&amp; c-&gt;code_rate_LP == FEC_NONE)</div><div class='add'>+		c-&gt;code_rate_LP = FEC_AUTO;</div><div class='add'>+</div><div class='add'>+	/* get frontend-specific tuning settings */</div><div class='add'>+	memset(&amp;fetunesettings, 0, sizeof(struct dvb_frontend_tune_settings));</div><div class='add'>+	if (fe-&gt;ops.get_tune_settings &amp;&amp; (fe-&gt;ops.get_tune_settings(fe, &amp;fetunesettings) == 0)) {</div><div class='add'>+		fepriv-&gt;min_delay = (fetunesettings.min_delay_ms * HZ) / 1000;</div><div class='add'>+		fepriv-&gt;max_drift = fetunesettings.max_drift;</div><div class='add'>+		fepriv-&gt;step_size = fetunesettings.step_size;</div><div class='add'>+	} else {</div><div class='add'>+		/* default values */</div><div class='add'>+		switch (c-&gt;delivery_system) {</div><div class='add'>+		case SYS_DVBC_ANNEX_A:</div><div class='add'>+		case SYS_DVBC_ANNEX_C:</div><div class='add'>+			fepriv-&gt;min_delay = HZ / 20;</div><div class='add'>+			fepriv-&gt;step_size = c-&gt;symbol_rate / 16000;</div><div class='add'>+			fepriv-&gt;max_drift = c-&gt;symbol_rate / 2000;</div><div class='add'>+			break;</div><div class='add'>+		case SYS_DVBT:</div><div class='add'>+		case SYS_DVBT2:</div><div class='add'>+		case SYS_ISDBT:</div><div class='add'>+		case SYS_DMBTH:</div><div class='add'>+			fepriv-&gt;min_delay = HZ / 20;</div><div class='add'>+			fepriv-&gt;step_size = fe-&gt;ops.info.frequency_stepsize * 2;</div><div class='add'>+			fepriv-&gt;max_drift = (fe-&gt;ops.info.frequency_stepsize * 2) + 1;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			/*</div><div class='add'>+			 * FIXME: This sounds wrong! if freqency_stepsize is</div><div class='add'>+			 * defined by the frontend, why not use it???</div><div class='add'>+			 */</div><div class='add'>+			fepriv-&gt;min_delay = HZ / 20;</div><div class='add'>+			fepriv-&gt;step_size = 0; /* no zigzag */</div><div class='add'>+			fepriv-&gt;max_drift = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (dvb_override_tune_delay &gt; 0)</div><div class='add'>+		fepriv-&gt;min_delay = (dvb_override_tune_delay * HZ) / 1000;</div><div class='add'>+</div><div class='add'>+	fepriv-&gt;state = FESTATE_RETUNE;</div><div class='add'>+</div><div class='add'>+	/* Request the search algorithm to search */</div><div class='add'>+	fepriv-&gt;algo_status |= DVBFE_ALGO_SEARCH_AGAIN;</div><div class='add'>+</div><div class='add'>+	dvb_frontend_clear_events(fe);</div><div class='add'>+	dvb_frontend_add_event(fe, 0);</div><div class='add'>+	dvb_frontend_wakeup(fe);</div><div class='add'>+	fepriv-&gt;status = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static int dvb_frontend_ioctl_legacy(struct file *file,</div><div class='ctx'> 			unsigned int cmd, void *parg)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_device *dvbdev = file-&gt;private_data;</div><div class='ctx'> 	struct dvb_frontend *fe = dvbdev-&gt;priv;</div><div class='ctx'> 	struct dvb_frontend_private *fepriv = fe-&gt;frontend_priv;</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	int cb_err, err = -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;dvb-&gt;fe_ioctl_override) {</div><div class='hunk'>@@ -1658,9 +1951,43 @@ static int dvb_frontend_ioctl_legacy(struct file *file,</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case FE_GET_INFO: {</div><div class='ctx'> 		struct dvb_frontend_info* info = parg;</div><div class='add'>+</div><div class='ctx'> 		memcpy(info, &amp;fe-&gt;ops.info, sizeof(struct dvb_frontend_info));</div><div class='ctx'> 		dvb_frontend_get_frequency_limits(fe, &amp;info-&gt;frequency_min, &amp;info-&gt;frequency_max);</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * Associate the 4 delivery systems supported by DVBv3</div><div class='add'>+		 * API with their DVBv5 counterpart. For the other standards,</div><div class='add'>+		 * use the closest type, assuming that it would hopefully</div><div class='add'>+		 * work with a DVBv3 application.</div><div class='add'>+		 * It should be noticed that, on multi-frontend devices with</div><div class='add'>+		 * different types (terrestrial and cable, for example),</div><div class='add'>+		 * a pure DVBv3 application won't be able to use all delivery</div><div class='add'>+		 * systems. Yet, changing the DVBv5 cache to the other delivery</div><div class='add'>+		 * system should be enough for making it work.</div><div class='add'>+		 */</div><div class='add'>+		switch (dvbv3_type(c-&gt;delivery_system)) {</div><div class='add'>+		case DVBV3_QPSK:</div><div class='add'>+			info-&gt;type = FE_QPSK;</div><div class='add'>+			break;</div><div class='add'>+		case DVBV3_ATSC:</div><div class='add'>+			info-&gt;type = FE_ATSC;</div><div class='add'>+			break;</div><div class='add'>+		case DVBV3_QAM:</div><div class='add'>+			info-&gt;type = FE_QAM;</div><div class='add'>+			break;</div><div class='add'>+		case DVBV3_OFDM:</div><div class='add'>+			info-&gt;type = FE_OFDM;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "%s: doesn't know how to handle a DVBv3 call to delivery system %i\n",</div><div class='add'>+			       __func__, c-&gt;delivery_system);</div><div class='add'>+			fe-&gt;ops.info.type = FE_OFDM;</div><div class='add'>+		}</div><div class='add'>+		dprintk("current delivery system on cache: %d, V3 type: %d\n",</div><div class='add'>+			c-&gt;delivery_system, fe-&gt;ops.info.type);</div><div class='add'>+</div><div class='ctx'> 		/* Force the CAN_INVERSION_AUTO bit on. If the frontend doesn't</div><div class='ctx'> 		 * do it, it is done for it. */</div><div class='ctx'> 		info-&gt;caps |= FE_CAN_INVERSION_AUTO;</div><div class='hunk'>@@ -1819,108 +2146,22 @@ static int dvb_frontend_ioctl_legacy(struct file *file,</div><div class='ctx'> 			err = fe-&gt;ops.enable_high_lnb_voltage(fe, (long) parg);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case FE_SET_FRONTEND: {</div><div class='del'>-		struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='del'>-		struct dvb_frontend_tune_settings fetunesettings;</div><div class='del'>-</div><div class='del'>-		if (c-&gt;state == DTV_TUNE) {</div><div class='del'>-			if (dvb_frontend_check_parameters(fe, &amp;fepriv-&gt;parameters_in) &lt; 0) {</div><div class='del'>-				err = -EINVAL;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (dvb_frontend_check_parameters(fe, parg) &lt; 0) {</div><div class='del'>-				err = -EINVAL;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			memcpy (&amp;fepriv-&gt;parameters_in, parg,</div><div class='del'>-				sizeof (struct dvb_frontend_parameters));</div><div class='del'>-			dtv_property_cache_init(fe, c);</div><div class='del'>-			dtv_property_cache_sync(fe, c, &amp;fepriv-&gt;parameters_in);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Initialize output parameters to match the values given by</div><div class='del'>-		 * the user. FE_SET_FRONTEND triggers an initial frontend event</div><div class='del'>-		 * with status = 0, which copies output parameters to userspace.</div><div class='del'>-		 */</div><div class='del'>-		fepriv-&gt;parameters_out = fepriv-&gt;parameters_in;</div><div class='del'>-</div><div class='del'>-		memset(&amp;fetunesettings, 0, sizeof(struct dvb_frontend_tune_settings));</div><div class='del'>-		memcpy(&amp;fetunesettings.parameters, parg,</div><div class='del'>-		       sizeof (struct dvb_frontend_parameters));</div><div class='del'>-</div><div class='del'>-		/* force auto frequency inversion if requested */</div><div class='del'>-		if (dvb_force_auto_inversion) {</div><div class='del'>-			fepriv-&gt;parameters_in.inversion = INVERSION_AUTO;</div><div class='del'>-			fetunesettings.parameters.inversion = INVERSION_AUTO;</div><div class='del'>-		}</div><div class='del'>-		if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='del'>-			/* without hierarchical coding code_rate_LP is irrelevant,</div><div class='del'>-			 * so we tolerate the otherwise invalid FEC_NONE setting */</div><div class='del'>-			if (fepriv-&gt;parameters_in.u.ofdm.hierarchy_information == HIERARCHY_NONE &amp;&amp;</div><div class='del'>-			    fepriv-&gt;parameters_in.u.ofdm.code_rate_LP == FEC_NONE)</div><div class='del'>-				fepriv-&gt;parameters_in.u.ofdm.code_rate_LP = FEC_AUTO;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* get frontend-specific tuning settings */</div><div class='del'>-		if (fe-&gt;ops.get_tune_settings &amp;&amp; (fe-&gt;ops.get_tune_settings(fe, &amp;fetunesettings) == 0)) {</div><div class='del'>-			fepriv-&gt;min_delay = (fetunesettings.min_delay_ms * HZ) / 1000;</div><div class='del'>-			fepriv-&gt;max_drift = fetunesettings.max_drift;</div><div class='del'>-			fepriv-&gt;step_size = fetunesettings.step_size;</div><div class='del'>-		} else {</div><div class='del'>-			/* default values */</div><div class='del'>-			switch(fe-&gt;ops.info.type) {</div><div class='del'>-			case FE_QPSK:</div><div class='del'>-				fepriv-&gt;min_delay = HZ/20;</div><div class='del'>-				fepriv-&gt;step_size = fepriv-&gt;parameters_in.u.qpsk.symbol_rate / 16000;</div><div class='del'>-				fepriv-&gt;max_drift = fepriv-&gt;parameters_in.u.qpsk.symbol_rate / 2000;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case FE_QAM:</div><div class='del'>-				fepriv-&gt;min_delay = HZ/20;</div><div class='del'>-				fepriv-&gt;step_size = 0; /* no zigzag */</div><div class='del'>-				fepriv-&gt;max_drift = 0;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case FE_OFDM:</div><div class='del'>-				fepriv-&gt;min_delay = HZ/20;</div><div class='del'>-				fepriv-&gt;step_size = fe-&gt;ops.info.frequency_stepsize * 2;</div><div class='del'>-				fepriv-&gt;max_drift = (fe-&gt;ops.info.frequency_stepsize * 2) + 1;</div><div class='del'>-				break;</div><div class='del'>-			case FE_ATSC:</div><div class='del'>-				fepriv-&gt;min_delay = HZ/20;</div><div class='del'>-				fepriv-&gt;step_size = 0;</div><div class='del'>-				fepriv-&gt;max_drift = 0;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (dvb_override_tune_delay &gt; 0)</div><div class='del'>-			fepriv-&gt;min_delay = (dvb_override_tune_delay * HZ) / 1000;</div><div class='del'>-</div><div class='del'>-		fepriv-&gt;state = FESTATE_RETUNE;</div><div class='del'>-</div><div class='del'>-		/* Request the search algorithm to search */</div><div class='del'>-		fepriv-&gt;algo_status |= DVBFE_ALGO_SEARCH_AGAIN;</div><div class='add'>+	case FE_SET_FRONTEND:</div><div class='add'>+		err = set_delivery_system(fe, SYS_UNDEFINED);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-		dvb_frontend_clear_events(fe);</div><div class='del'>-		dvb_frontend_add_event(fe, 0);</div><div class='del'>-		dvb_frontend_wakeup(fe);</div><div class='del'>-		fepriv-&gt;status = 0;</div><div class='del'>-		err = 0;</div><div class='add'>+		err = dtv_property_cache_sync(fe, c, parg);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+		err = dtv_set_frontend(fe);</div><div class='ctx'> 		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	case FE_GET_EVENT:</div><div class='ctx'> 		err = dvb_frontend_get_event (fe, parg, file-&gt;f_flags);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FE_GET_FRONTEND:</div><div class='del'>-		if (fe-&gt;ops.get_frontend) {</div><div class='del'>-			err = fe-&gt;ops.get_frontend(fe, &amp;fepriv-&gt;parameters_out);</div><div class='del'>-			memcpy(parg, &amp;fepriv-&gt;parameters_out, sizeof(struct dvb_frontend_parameters));</div><div class='del'>-		}</div><div class='add'>+		err = dtv_get_frontend(fe, parg);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FE_SET_FRONTEND_TUNE_MODE:</div><div class='hunk'>@@ -2061,12 +2302,15 @@ static int dvb_frontend_release(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	dprintk ("%s\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if ((file-&gt;f_flags &amp; O_ACCMODE) != O_RDONLY)</div><div class='add'>+	if ((file-&gt;f_flags &amp; O_ACCMODE) != O_RDONLY) {</div><div class='ctx'> 		fepriv-&gt;release_jiffies = jiffies;</div><div class='add'>+		mb();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = dvb_generic_release (inode, file);</div><div class='ctx'> </div><div class='ctx'> 	if (dvbdev-&gt;users == -1) {</div><div class='add'>+		wake_up(&amp;fepriv-&gt;wait_queue);</div><div class='ctx'> 		if (fepriv-&gt;exit != DVB_FE_NO_EXIT) {</div><div class='ctx'> 			fops_put(file-&gt;f_op);</div><div class='ctx'> 			file-&gt;f_op = NULL;</div><div class='hunk'>@@ -2127,6 +2371,14 @@ int dvb_register_frontend(struct dvb_adapter* dvb,</div><div class='ctx'> 	dvb_register_device (fe-&gt;dvb, &amp;fepriv-&gt;dvbdev, &amp;dvbdev_template,</div><div class='ctx'> 			     fe, DVB_DEVICE_FRONTEND);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Initialize the cache to the proper values according with the</div><div class='add'>+	 * first supported delivery system (ops-&gt;delsys[0])</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+        fe-&gt;dtv_property_cache.delivery_system = fe-&gt;ops.delsys[0];</div><div class='add'>+	dvb_frontend_clear_cache(fe);</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;frontend_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h<br/>index 67bbfa728016..d63a8215fe03 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_frontend.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-core/dvb_frontend.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_frontend.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-core/dvb_frontend.h</a></div><div class='hunk'>@@ -42,11 +42,16 @@</div><div class='ctx'> </div><div class='ctx'> #include "dvbdev.h"</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Maximum number of Delivery systems per frontend. It</div><div class='add'>+ * should be smaller or equal to 32</div><div class='add'>+ */</div><div class='add'>+#define MAX_DELSYS	8</div><div class='add'>+</div><div class='ctx'> struct dvb_frontend_tune_settings {</div><div class='ctx'> 	int min_delay_ms;</div><div class='ctx'> 	int step_size;</div><div class='ctx'> 	int max_drift;</div><div class='del'>-	struct dvb_frontend_parameters parameters;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dvb_frontend;</div><div class='hunk'>@@ -198,11 +203,11 @@ struct dvb_tuner_ops {</div><div class='ctx'> 	int (*sleep)(struct dvb_frontend *fe);</div><div class='ctx'> </div><div class='ctx'> 	/** This is for simple PLLs - set all parameters in one go. */</div><div class='del'>-	int (*set_params)(struct dvb_frontend *fe, struct dvb_frontend_parameters *p);</div><div class='add'>+	int (*set_params)(struct dvb_frontend *fe);</div><div class='ctx'> 	int (*set_analog_params)(struct dvb_frontend *fe, struct analog_parameters *p);</div><div class='ctx'> </div><div class='ctx'> 	/** This is support for demods like the mt352 - fills out the supplied buffer with what to write. */</div><div class='del'>-	int (*calc_regs)(struct dvb_frontend *fe, struct dvb_frontend_parameters *p, u8 *buf, int buf_len);</div><div class='add'>+	int (*calc_regs)(struct dvb_frontend *fe, u8 *buf, int buf_len);</div><div class='ctx'> </div><div class='ctx'> 	/** This is to allow setting tuner-specific configs */</div><div class='ctx'> 	int (*set_config)(struct dvb_frontend *fe, void *priv_cfg);</div><div class='hunk'>@@ -250,10 +255,14 @@ struct analog_demod_ops {</div><div class='ctx'> 	int (*set_config)(struct dvb_frontend *fe, void *priv_cfg);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct dtv_frontend_properties;</div><div class='add'>+</div><div class='ctx'> struct dvb_frontend_ops {</div><div class='ctx'> </div><div class='ctx'> 	struct dvb_frontend_info info;</div><div class='ctx'> </div><div class='add'>+	u8 delsys[MAX_DELSYS];</div><div class='add'>+</div><div class='ctx'> 	void (*release)(struct dvb_frontend* fe);</div><div class='ctx'> 	void (*release_sec)(struct dvb_frontend* fe);</div><div class='ctx'> </div><div class='hunk'>@@ -264,7 +273,7 @@ struct dvb_frontend_ops {</div><div class='ctx'> </div><div class='ctx'> 	/* if this is set, it overrides the default swzigzag */</div><div class='ctx'> 	int (*tune)(struct dvb_frontend* fe,</div><div class='del'>-		    struct dvb_frontend_parameters* params,</div><div class='add'>+		    bool re_tune,</div><div class='ctx'> 		    unsigned int mode_flags,</div><div class='ctx'> 		    unsigned int *delay,</div><div class='ctx'> 		    fe_status_t *status);</div><div class='hunk'>@@ -272,10 +281,10 @@ struct dvb_frontend_ops {</div><div class='ctx'> 	enum dvbfe_algo (*get_frontend_algo)(struct dvb_frontend *fe);</div><div class='ctx'> </div><div class='ctx'> 	/* these two are only used for the swzigzag code */</div><div class='del'>-	int (*set_frontend)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='add'>+	int (*set_frontend)(struct dvb_frontend *fe);</div><div class='ctx'> 	int (*get_tune_settings)(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* settings);</div><div class='ctx'> </div><div class='del'>-	int (*get_frontend)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='add'>+	int (*get_frontend)(struct dvb_frontend *fe);</div><div class='ctx'> </div><div class='ctx'> 	int (*read_status)(struct dvb_frontend* fe, fe_status_t* status);</div><div class='ctx'> 	int (*read_ber)(struct dvb_frontend* fe, u32* ber);</div><div class='hunk'>@@ -297,8 +306,7 @@ struct dvb_frontend_ops {</div><div class='ctx'> 	/* These callbacks are for devices that implement their own</div><div class='ctx'> 	 * tuning algorithms, rather than a simple swzigzag</div><div class='ctx'> 	 */</div><div class='del'>-	enum dvbfe_search (*search)(struct dvb_frontend *fe, struct dvb_frontend_parameters *p);</div><div class='del'>-	int (*track)(struct dvb_frontend *fe, struct dvb_frontend_parameters *p);</div><div class='add'>+	enum dvbfe_search (*search)(struct dvb_frontend *fe);</div><div class='ctx'> </div><div class='ctx'> 	struct dvb_tuner_ops tuner_ops;</div><div class='ctx'> 	struct analog_demod_ops analog_ops;</div><div class='hunk'>@@ -307,6 +315,7 @@ struct dvb_frontend_ops {</div><div class='ctx'> 	int (*get_property)(struct dvb_frontend* fe, struct dtv_property* tvp);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef __DVB_CORE__</div><div class='ctx'> #define MAX_EVENT 8</div><div class='ctx'> </div><div class='ctx'> struct dvb_fe_events {</div><div class='hunk'>@@ -317,6 +326,7 @@ struct dvb_fe_events {</div><div class='ctx'> 	wait_queue_head_t	  wait_queue;</div><div class='ctx'> 	struct mutex		  mtx;</div><div class='ctx'> };</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> struct dtv_frontend_properties {</div><div class='ctx'> </div><div class='hunk'>@@ -374,6 +384,7 @@ struct dvb_frontend {</div><div class='ctx'> 	void *analog_demod_priv;</div><div class='ctx'> 	struct dtv_frontend_properties dtv_property_cache;</div><div class='ctx'> #define DVB_FRONTEND_COMPONENT_TUNER 0</div><div class='add'>+#define DVB_FRONTEND_COMPONENT_DEMOD 1</div><div class='ctx'> 	int (*callback)(void *adapter_priv, int component, int cmd, int arg);</div><div class='ctx'> 	int id;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c<br/>index 93d9869e0f15..8766ce8c354d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_net.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-core/dvb_net.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_net.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-core/dvb_net.c</a></div><div class='hunk'>@@ -1510,9 +1510,7 @@ int dvb_net_init (struct dvb_adapter *adap, struct dvb_net *dvbnet,</div><div class='ctx'> 	for (i=0; i&lt;DVB_NET_DEVICES_MAX; i++)</div><div class='ctx'> 		dvbnet-&gt;state[i] = 0;</div><div class='ctx'> </div><div class='del'>-	dvb_register_device (adap, &amp;dvbnet-&gt;dvbdev, &amp;dvbdev_net,</div><div class='add'>+	return dvb_register_device(adap, &amp;dvbnet-&gt;dvbdev, &amp;dvbdev_net,</div><div class='ctx'> 			     dvbnet, DVB_DEVICE_NET);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dvb_net_init);</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c<br/>index f73287775953..00a67326c193 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvbdev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-core/dvbdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvbdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-core/dvbdev.c</a></div><div class='hunk'>@@ -450,7 +450,7 @@ static int dvb_uevent(struct device *dev, struct kobj_uevent_env *env)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char *dvb_devnode(struct device *dev, mode_t *mode)</div><div class='add'>+static char *dvb_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_device *dvbdev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig<br/>index 58257165761e..9f203c6767a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/Kconfig</a></div><div class='hunk'>@@ -311,6 +311,7 @@ config DVB_USB_ANYSEE</div><div class='ctx'> 	select DVB_STV0900 if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	select DVB_STV6110 if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	select DVB_ISL6423 if !DVB_FE_CUSTOMISE</div><div class='add'>+	select DVB_CXD2820R if !DVB_FE_CUSTOMISE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to support the Anysee E30, Anysee E30 Plus or</div><div class='ctx'> 	  Anysee E30 C Plus DVB USB2.0 receiver.</div><div class='hunk'>@@ -340,7 +341,7 @@ config DVB_USB_AF9015</div><div class='ctx'> </div><div class='ctx'> config DVB_USB_CE6230</div><div class='ctx'> 	tristate "Intel CE6230 DVB-T USB2.0 support"</div><div class='del'>-	depends on DVB_USB &amp;&amp; EXPERIMENTAL</div><div class='add'>+	depends on DVB_USB</div><div class='ctx'> 	select DVB_ZL10353</div><div class='ctx'> 	select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMISE</div><div class='ctx'> 	help</div><div class='hunk'>@@ -354,7 +355,7 @@ config DVB_USB_FRIIO</div><div class='ctx'> </div><div class='ctx'> config DVB_USB_EC168</div><div class='ctx'> 	tristate "E3C EC168 DVB-T USB2.0 support"</div><div class='del'>-	depends on DVB_USB &amp;&amp; EXPERIMENTAL</div><div class='add'>+	depends on DVB_USB</div><div class='ctx'> 	select DVB_EC100</div><div class='ctx'> 	select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMISE</div><div class='ctx'> 	help</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/a800.c b/drivers/media/dvb/dvb-usb/a800.c<br/>index 2aef3c89e9fa..8d7fef84afd8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/a800.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/a800.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/a800.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/a800.c</a></div><div class='hunk'>@@ -183,26 +183,7 @@ static struct usb_driver a800_driver = {</div><div class='ctx'> 	.id_table	= a800_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init a800_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	if ((result = usb_register(&amp;a800_driver))) {</div><div class='del'>-		err("usb_register failed. Error number %d",result);</div><div class='del'>-		return result;</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 a800_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;a800_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init (a800_module_init);</div><div class='del'>-module_exit (a800_module_exit);</div><div class='add'>+module_usb_driver(a800_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Patrick Boettcher &lt;patrick.boettcher@desy.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("AVerMedia AverTV DVB-T USB 2.0 (A800)");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/af9005-fe.c b/drivers/media/dvb/dvb-usb/af9005-fe.c<br/>index 3263e9749d09..740f3f496f12 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/af9005-fe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/af9005-fe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/af9005-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/af9005-fe.c</a></div><div class='hunk'>@@ -303,7 +303,7 @@ static int af9005_get_pre_vit_err_bit_count(struct dvb_frontend *fe,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* read constellation mode */</div><div class='add'>+	/* read modulation mode */</div><div class='ctx'> 	ret =</div><div class='ctx'> 	    af9005_read_register_bits(state-&gt;d, xd_g_reg_tpsd_const,</div><div class='ctx'> 				      reg_tpsd_const_pos, reg_tpsd_const_len,</div><div class='hunk'>@@ -321,7 +321,7 @@ static int af9005_get_pre_vit_err_bit_count(struct dvb_frontend *fe,</div><div class='ctx'> 		bits = 6;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		err("invalid constellation mode");</div><div class='add'>+		err("invalid modulation mode");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	*pre_bit_count = super_frame_count * 68 * 4 * x * bits;</div><div class='hunk'>@@ -533,13 +533,13 @@ static int af9005_fe_read_signal_strength(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> static int af9005_fe_read_snr(struct dvb_frontend *fe, u16 * snr)</div><div class='ctx'> {</div><div class='del'>-	/* the snr can be derived from the ber and the constellation</div><div class='add'>+	/* the snr can be derived from the ber and the modulation</div><div class='ctx'> 	   but I don't think this kind of complex calculations belong</div><div class='ctx'> 	   in the driver. I may be wrong.... */</div><div class='ctx'> 	return -ENOSYS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int af9005_fe_program_cfoe(struct dvb_usb_device *d, fe_bandwidth_t bw)</div><div class='add'>+static int af9005_fe_program_cfoe(struct dvb_usb_device *d, u32 bw)</div><div class='ctx'> {</div><div class='ctx'> 	u8 temp0, temp1, temp2, temp3, buf[4];</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -551,7 +551,7 @@ static int af9005_fe_program_cfoe(struct dvb_usb_device *d, fe_bandwidth_t bw)</div><div class='ctx'> 	u32 NS_coeff2_8k;</div><div class='ctx'> </div><div class='ctx'> 	switch (bw) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		NS_coeff1_2048Nu = 0x2ADB6DC;</div><div class='ctx'> 		NS_coeff1_8191Nu = 0xAB7313;</div><div class='ctx'> 		NS_coeff1_8192Nu = 0xAB6DB7;</div><div class='hunk'>@@ -560,7 +560,7 @@ static int af9005_fe_program_cfoe(struct dvb_usb_device *d, fe_bandwidth_t bw)</div><div class='ctx'> 		NS_coeff2_8k = 0x55B6DC;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		NS_coeff1_2048Nu = 0x3200001;</div><div class='ctx'> 		NS_coeff1_8191Nu = 0xC80640;</div><div class='ctx'> 		NS_coeff1_8192Nu = 0xC80000;</div><div class='hunk'>@@ -569,7 +569,7 @@ static int af9005_fe_program_cfoe(struct dvb_usb_device *d, fe_bandwidth_t bw)</div><div class='ctx'> 		NS_coeff2_8k = 0x640000;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		NS_coeff1_2048Nu = 0x3924926;</div><div class='ctx'> 		NS_coeff1_8191Nu = 0xE4996E;</div><div class='ctx'> 		NS_coeff1_8192Nu = 0xE49249;</div><div class='hunk'>@@ -773,17 +773,17 @@ static int af9005_fe_program_cfoe(struct dvb_usb_device *d, fe_bandwidth_t bw)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int af9005_fe_select_bw(struct dvb_usb_device *d, fe_bandwidth_t bw)</div><div class='add'>+static int af9005_fe_select_bw(struct dvb_usb_device *d, u32 bw)</div><div class='ctx'> {</div><div class='ctx'> 	u8 temp;</div><div class='ctx'> 	switch (bw) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		temp = 0;</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		temp = 1;</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		temp = 2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -930,10 +930,11 @@ static int af9005_fe_init(struct dvb_frontend *fe)</div><div class='ctx'> </div><div class='ctx'> 	/* init other parameters: program cfoe and select bandwidth */</div><div class='ctx'> 	deb_info("program cfoe\n");</div><div class='del'>-	if ((ret = af9005_fe_program_cfoe(state-&gt;d, BANDWIDTH_6_MHZ)))</div><div class='add'>+	ret = af9005_fe_program_cfoe(state-&gt;d, 6000000);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	/* set read-update bit for constellation */</div><div class='del'>-	deb_info("set read-update bit for constellation\n");</div><div class='add'>+	/* set read-update bit for modulation */</div><div class='add'>+	deb_info("set read-update bit for modulation\n");</div><div class='ctx'> 	if ((ret =</div><div class='ctx'> 	     af9005_write_register_bits(state-&gt;d, xd_p_reg_feq_read_update,</div><div class='ctx'> 					reg_feq_read_update_pos,</div><div class='hunk'>@@ -943,8 +944,8 @@ static int af9005_fe_init(struct dvb_frontend *fe)</div><div class='ctx'> 	/* sample code has a set MPEG TS code here</div><div class='ctx'> 	   but sniffing reveals that it doesn't do it */</div><div class='ctx'> </div><div class='del'>-	/* set read-update bit to 1 for DCA constellation */</div><div class='del'>-	deb_info("set read-update bit 1 for DCA constellation\n");</div><div class='add'>+	/* set read-update bit to 1 for DCA modulation */</div><div class='add'>+	deb_info("set read-update bit 1 for DCA modulation\n");</div><div class='ctx'> 	if ((ret =</div><div class='ctx'> 	     af9005_write_register_bits(state-&gt;d, xd_p_reg_dca_read_update,</div><div class='ctx'> 					reg_dca_read_update_pos,</div><div class='hunk'>@@ -1099,15 +1100,15 @@ static int af9005_ts_bus_ctrl(struct dvb_frontend *fe, int acquire)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int af9005_fe_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-				  struct dvb_frontend_parameters *fep)</div><div class='add'>+static int af9005_fe_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fep = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct af9005_fe_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 temp, temp0, temp1, temp2;</div><div class='ctx'> </div><div class='ctx'> 	deb_info("af9005_fe_set_frontend freq %d bw %d\n", fep-&gt;frequency,</div><div class='del'>-		 fep-&gt;u.ofdm.bandwidth);</div><div class='add'>+		 fep-&gt;bandwidth_hz);</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.release == NULL) {</div><div class='ctx'> 		err("Tuner not attached");</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -1167,10 +1168,10 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	/* select bandwidth */</div><div class='ctx'> 	deb_info("select bandwidth");</div><div class='del'>-	ret = af9005_fe_select_bw(state-&gt;d, fep-&gt;u.ofdm.bandwidth);</div><div class='add'>+	ret = af9005_fe_select_bw(state-&gt;d, fep-&gt;bandwidth_hz);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	ret = af9005_fe_program_cfoe(state-&gt;d, fep-&gt;u.ofdm.bandwidth);</div><div class='add'>+	ret = af9005_fe_program_cfoe(state-&gt;d, fep-&gt;bandwidth_hz);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1189,7 +1190,7 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	/* set tuner */</div><div class='ctx'> 	deb_info("set tuner\n");</div><div class='del'>-	ret = fe-&gt;ops.tuner_ops.set_params(fe, fep);</div><div class='add'>+	ret = fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1225,9 +1226,9 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int af9005_fe_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-				  struct dvb_frontend_parameters *fep)</div><div class='add'>+static int af9005_fe_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fep = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct af9005_fe_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 temp;</div><div class='hunk'>@@ -1239,19 +1240,19 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 				      &amp;temp);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	deb_info("===== fe_get_frontend ==============\n");</div><div class='add'>+	deb_info("===== fe_get_frontend_legacy = =============\n");</div><div class='ctx'> 	deb_info("CONSTELLATION ");</div><div class='ctx'> 	switch (temp) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		fep-&gt;u.ofdm.constellation = QPSK;</div><div class='add'>+		fep-&gt;modulation = QPSK;</div><div class='ctx'> 		deb_info("QPSK\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		fep-&gt;u.ofdm.constellation = QAM_16;</div><div class='add'>+		fep-&gt;modulation = QAM_16;</div><div class='ctx'> 		deb_info("QAM_16\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		fep-&gt;u.ofdm.constellation = QAM_64;</div><div class='add'>+		fep-&gt;modulation = QAM_64;</div><div class='ctx'> 		deb_info("QAM_64\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1266,19 +1267,19 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	deb_info("HIERARCHY ");</div><div class='ctx'> 	switch (temp) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		fep-&gt;u.ofdm.hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+		fep-&gt;hierarchy = HIERARCHY_NONE;</div><div class='ctx'> 		deb_info("NONE\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		fep-&gt;u.ofdm.hierarchy_information = HIERARCHY_1;</div><div class='add'>+		fep-&gt;hierarchy = HIERARCHY_1;</div><div class='ctx'> 		deb_info("1\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		fep-&gt;u.ofdm.hierarchy_information = HIERARCHY_2;</div><div class='add'>+		fep-&gt;hierarchy = HIERARCHY_2;</div><div class='ctx'> 		deb_info("2\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		fep-&gt;u.ofdm.hierarchy_information = HIERARCHY_4;</div><div class='add'>+		fep-&gt;hierarchy = HIERARCHY_4;</div><div class='ctx'> 		deb_info("4\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1302,23 +1303,23 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	deb_info("CODERATE HP ");</div><div class='ctx'> 	switch (temp) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_HP = FEC_1_2;</div><div class='add'>+		fep-&gt;code_rate_HP = FEC_1_2;</div><div class='ctx'> 		deb_info("FEC_1_2\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_HP = FEC_2_3;</div><div class='add'>+		fep-&gt;code_rate_HP = FEC_2_3;</div><div class='ctx'> 		deb_info("FEC_2_3\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_HP = FEC_3_4;</div><div class='add'>+		fep-&gt;code_rate_HP = FEC_3_4;</div><div class='ctx'> 		deb_info("FEC_3_4\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_HP = FEC_5_6;</div><div class='add'>+		fep-&gt;code_rate_HP = FEC_5_6;</div><div class='ctx'> 		deb_info("FEC_5_6\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_HP = FEC_7_8;</div><div class='add'>+		fep-&gt;code_rate_HP = FEC_7_8;</div><div class='ctx'> 		deb_info("FEC_7_8\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1333,23 +1334,23 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	deb_info("CODERATE LP ");</div><div class='ctx'> 	switch (temp) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_LP = FEC_1_2;</div><div class='add'>+		fep-&gt;code_rate_LP = FEC_1_2;</div><div class='ctx'> 		deb_info("FEC_1_2\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_LP = FEC_2_3;</div><div class='add'>+		fep-&gt;code_rate_LP = FEC_2_3;</div><div class='ctx'> 		deb_info("FEC_2_3\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_LP = FEC_3_4;</div><div class='add'>+		fep-&gt;code_rate_LP = FEC_3_4;</div><div class='ctx'> 		deb_info("FEC_3_4\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_LP = FEC_5_6;</div><div class='add'>+		fep-&gt;code_rate_LP = FEC_5_6;</div><div class='ctx'> 		deb_info("FEC_5_6\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_LP = FEC_7_8;</div><div class='add'>+		fep-&gt;code_rate_LP = FEC_7_8;</div><div class='ctx'> 		deb_info("FEC_7_8\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1363,19 +1364,19 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	deb_info("GUARD INTERVAL ");</div><div class='ctx'> 	switch (temp) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		fep-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_32;</div><div class='add'>+		fep-&gt;guard_interval = GUARD_INTERVAL_1_32;</div><div class='ctx'> 		deb_info("1_32\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		fep-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_16;</div><div class='add'>+		fep-&gt;guard_interval = GUARD_INTERVAL_1_16;</div><div class='ctx'> 		deb_info("1_16\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		fep-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_8;</div><div class='add'>+		fep-&gt;guard_interval = GUARD_INTERVAL_1_8;</div><div class='ctx'> 		deb_info("1_8\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		fep-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_4;</div><div class='add'>+		fep-&gt;guard_interval = GUARD_INTERVAL_1_4;</div><div class='ctx'> 		deb_info("1_4\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1390,11 +1391,11 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	deb_info("TRANSMISSION MODE ");</div><div class='ctx'> 	switch (temp) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		fep-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_2K;</div><div class='add'>+		fep-&gt;transmission_mode = TRANSMISSION_MODE_2K;</div><div class='ctx'> 		deb_info("2K\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		fep-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_8K;</div><div class='add'>+		fep-&gt;transmission_mode = TRANSMISSION_MODE_8K;</div><div class='ctx'> 		deb_info("8K\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1406,15 +1407,15 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	deb_info("BANDWIDTH ");</div><div class='ctx'> 	switch (temp) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		fep-&gt;u.ofdm.bandwidth = BANDWIDTH_6_MHZ;</div><div class='add'>+		fep-&gt;bandwidth_hz = 6000000;</div><div class='ctx'> 		deb_info("6\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		fep-&gt;u.ofdm.bandwidth = BANDWIDTH_7_MHZ;</div><div class='add'>+		fep-&gt;bandwidth_hz = 7000000;</div><div class='ctx'> 		deb_info("7\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		fep-&gt;u.ofdm.bandwidth = BANDWIDTH_8_MHZ;</div><div class='add'>+		fep-&gt;bandwidth_hz = 8000000;</div><div class='ctx'> 		deb_info("8\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1454,9 +1455,9 @@ struct dvb_frontend *af9005_fe_attach(struct dvb_usb_device *d)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops af9005_fe_ops = {</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		 .name = "AF9005 USB DVB-T",</div><div class='del'>-		 .type = FE_OFDM,</div><div class='ctx'> 		 .frequency_min = 44250000,</div><div class='ctx'> 		 .frequency_max = 867250000,</div><div class='ctx'> 		 .frequency_stepsize = 250000,</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/af9005.c b/drivers/media/dvb/dvb-usb/af9005.c<br/>index bd51a764351b..af176b6ce738 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/af9005.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/af9005.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/af9005.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/af9005.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@ MODULE_PARM_DESC(debug,</div><div class='ctx'> 		 "set debugging level (1=info,xfer=2,rc=4,reg=8,i2c=16,fw=32 (or-able))."</div><div class='ctx'> 		 DVB_USB_DEBUG_STATUS);</div><div class='ctx'> /* enable obnoxious led */</div><div class='del'>-int dvb_usb_af9005_led = 1;</div><div class='add'>+bool dvb_usb_af9005_led = 1;</div><div class='ctx'> module_param_named(led, dvb_usb_af9005_led, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(led, "enable led (default: 1).");</div><div class='ctx'> </div><div class='hunk'>@@ -977,11 +977,20 @@ static int af9005_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 				   THIS_MODULE, NULL, adapter_nr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+enum af9005_usb_table_entry {</div><div class='add'>+	AFATECH_AF9005,</div><div class='add'>+	TERRATEC_AF9005,</div><div class='add'>+	ANSONIC_AF9005,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct usb_device_id af9005_usb_table[] = {</div><div class='del'>-	{USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9005)},</div><div class='del'>-	{USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_USB_XE)},</div><div class='del'>-	{USB_DEVICE(USB_VID_ANSONIC, USB_PID_ANSONIC_DVBT_USB)},</div><div class='del'>-	{0},</div><div class='add'>+	[AFATECH_AF9005] = {USB_DEVICE(USB_VID_AFATECH,</div><div class='add'>+				USB_PID_AFATECH_AF9005)},</div><div class='add'>+	[TERRATEC_AF9005] = {USB_DEVICE(USB_VID_TERRATEC,</div><div class='add'>+				USB_PID_TERRATEC_CINERGY_T_USB_XE)},</div><div class='add'>+	[ANSONIC_AF9005] = {USB_DEVICE(USB_VID_ANSONIC,</div><div class='add'>+				USB_PID_ANSONIC_DVBT_USB)},</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(usb, af9005_usb_table);</div><div class='hunk'>@@ -1041,15 +1050,15 @@ static struct dvb_usb_device_properties af9005_properties = {</div><div class='ctx'> 	.num_device_descs = 3,</div><div class='ctx'> 	.devices = {</div><div class='ctx'> 		    {.name = "Afatech DVB-T USB1.1 stick",</div><div class='del'>-		     .cold_ids = {&amp;af9005_usb_table[0], NULL},</div><div class='add'>+		     .cold_ids = {&amp;af9005_usb_table[AFATECH_AF9005], NULL},</div><div class='ctx'> 		     .warm_ids = {NULL},</div><div class='ctx'> 		     },</div><div class='ctx'> 		    {.name = "TerraTec Cinergy T USB XE",</div><div class='del'>-		     .cold_ids = {&amp;af9005_usb_table[1], NULL},</div><div class='add'>+		     .cold_ids = {&amp;af9005_usb_table[TERRATEC_AF9005], NULL},</div><div class='ctx'> 		     .warm_ids = {NULL},</div><div class='ctx'> 		     },</div><div class='ctx'> 		    {.name = "Ansonic DVB-T USB1.1 stick",</div><div class='del'>-		     .cold_ids = {&amp;af9005_usb_table[2], NULL},</div><div class='add'>+		     .cold_ids = {&amp;af9005_usb_table[ANSONIC_AF9005], NULL},</div><div class='ctx'> 		     .warm_ids = {NULL},</div><div class='ctx'> 		     },</div><div class='ctx'> 		    {NULL},</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/af9005.h b/drivers/media/dvb/dvb-usb/af9005.h<br/>index c71c77bd7f4b..6a2bf3de8456 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/af9005.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/af9005.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/af9005.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/af9005.h</a></div><div class='hunk'>@@ -35,7 +35,7 @@ extern int dvb_usb_af9005_debug;</div><div class='ctx'> #define deb_i2c(args...)  dprintk(dvb_usb_af9005_debug,0x10,args)</div><div class='ctx'> #define deb_fw(args...)   dprintk(dvb_usb_af9005_debug,0x20,args)</div><div class='ctx'> </div><div class='del'>-extern int dvb_usb_af9005_led;</div><div class='add'>+extern bool dvb_usb_af9005_led;</div><div class='ctx'> </div><div class='ctx'> /* firmware */</div><div class='ctx'> #define FW_BULKOUT_SIZE 250</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c<br/>index c6c275bac08e..282a43d648df 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/af9015.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/af9015.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/af9015.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/af9015.c</a></div><div class='hunk'>@@ -50,14 +50,14 @@ static int af9015_properties_count = ARRAY_SIZE(af9015_properties);</div><div class='ctx'> </div><div class='ctx'> static struct af9013_config af9015_af9013_config[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.demod_address = AF9015_I2C_DEMOD,</div><div class='del'>-		.output_mode = AF9013_OUTPUT_MODE_USB,</div><div class='add'>+		.i2c_addr = AF9015_I2C_DEMOD,</div><div class='add'>+		.ts_mode = AF9013_TS_USB,</div><div class='ctx'> 		.api_version = { 0, 1, 9, 0 },</div><div class='ctx'> 		.gpio[0] = AF9013_GPIO_HI,</div><div class='ctx'> 		.gpio[3] = AF9013_GPIO_TUNER_ON,</div><div class='ctx'> </div><div class='ctx'> 	}, {</div><div class='del'>-		.output_mode = AF9013_OUTPUT_MODE_SERIAL,</div><div class='add'>+		.ts_mode = AF9013_TS_SERIAL,</div><div class='ctx'> 		.api_version = { 0, 1, 9, 0 },</div><div class='ctx'> 		.gpio[0] = AF9013_GPIO_TUNER_ON,</div><div class='ctx'> 		.gpio[1] = AF9013_GPIO_LO,</div><div class='hunk'>@@ -216,8 +216,8 @@ static int af9015_write_reg_i2c(struct dvb_usb_device *d, u8 addr, u16 reg,</div><div class='ctx'> {</div><div class='ctx'> 	struct req_t req = {WRITE_I2C, addr, reg, 1, 1, 1, &amp;val};</div><div class='ctx'> </div><div class='del'>-	if (addr == af9015_af9013_config[0].demod_address ||</div><div class='del'>-	    addr == af9015_af9013_config[1].demod_address)</div><div class='add'>+	if (addr == af9015_af9013_config[0].i2c_addr ||</div><div class='add'>+	    addr == af9015_af9013_config[1].i2c_addr)</div><div class='ctx'> 		req.addr_len = 3;</div><div class='ctx'> </div><div class='ctx'> 	return af9015_ctrl_msg(d, &amp;req);</div><div class='hunk'>@@ -228,8 +228,8 @@ static int af9015_read_reg_i2c(struct dvb_usb_device *d, u8 addr, u16 reg,</div><div class='ctx'> {</div><div class='ctx'> 	struct req_t req = {READ_I2C, addr, reg, 0, 1, 1, val};</div><div class='ctx'> </div><div class='del'>-	if (addr == af9015_af9013_config[0].demod_address ||</div><div class='del'>-	    addr == af9015_af9013_config[1].demod_address)</div><div class='add'>+	if (addr == af9015_af9013_config[0].i2c_addr ||</div><div class='add'>+	    addr == af9015_af9013_config[1].i2c_addr)</div><div class='ctx'> 		req.addr_len = 3;</div><div class='ctx'> </div><div class='ctx'> 	return af9015_ctrl_msg(d, &amp;req);</div><div class='hunk'>@@ -271,8 +271,8 @@ Due to that the only way to select correct tuner is use demodulator I2C-gate.</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	while (i &lt; num) {</div><div class='del'>-		if (msg[i].addr == af9015_af9013_config[0].demod_address ||</div><div class='del'>-		    msg[i].addr == af9015_af9013_config[1].demod_address) {</div><div class='add'>+		if (msg[i].addr == af9015_af9013_config[0].i2c_addr ||</div><div class='add'>+		    msg[i].addr == af9015_af9013_config[1].i2c_addr) {</div><div class='ctx'> 			addr = msg[i].buf[0] &lt;&lt; 8;</div><div class='ctx'> 			addr += msg[i].buf[1];</div><div class='ctx'> 			mbox = msg[i].buf[2];</div><div class='hunk'>@@ -288,8 +288,7 @@ Due to that the only way to select correct tuner is use demodulator I2C-gate.</div><div class='ctx'> 				ret = -EOPNOTSUPP;</div><div class='ctx'> 				goto error;</div><div class='ctx'> 			}</div><div class='del'>-			if (msg[i].addr ==</div><div class='del'>-				af9015_af9013_config[0].demod_address)</div><div class='add'>+			if (msg[i].addr == af9015_af9013_config[0].i2c_addr)</div><div class='ctx'> 				req.cmd = READ_MEMORY;</div><div class='ctx'> 			else</div><div class='ctx'> 				req.cmd = READ_I2C;</div><div class='hunk'>@@ -307,7 +306,7 @@ Due to that the only way to select correct tuner is use demodulator I2C-gate.</div><div class='ctx'> 				goto error;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (msg[i].addr ==</div><div class='del'>-				af9015_af9013_config[0].demod_address) {</div><div class='add'>+				af9015_af9013_config[0].i2c_addr) {</div><div class='ctx'> 				ret = -EINVAL;</div><div class='ctx'> 				goto error;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -325,8 +324,7 @@ Due to that the only way to select correct tuner is use demodulator I2C-gate.</div><div class='ctx'> 				ret = -EOPNOTSUPP;</div><div class='ctx'> 				goto error;</div><div class='ctx'> 			}</div><div class='del'>-			if (msg[i].addr ==</div><div class='del'>-				af9015_af9013_config[0].demod_address)</div><div class='add'>+			if (msg[i].addr == af9015_af9013_config[0].i2c_addr)</div><div class='ctx'> 				req.cmd = WRITE_MEMORY;</div><div class='ctx'> 			else</div><div class='ctx'> 				req.cmd = WRITE_I2C;</div><div class='hunk'>@@ -508,7 +506,7 @@ static int af9015_copy_firmware(struct dvb_usb_device *d)</div><div class='ctx'> 	msleep(100);</div><div class='ctx'> </div><div class='ctx'> 	ret = af9015_read_reg_i2c(d,</div><div class='del'>-		af9015_af9013_config[1].demod_address, 0x98be, &amp;val);</div><div class='add'>+		af9015_af9013_config[1].i2c_addr, 0x98be, &amp;val);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -536,7 +534,7 @@ static int af9015_copy_firmware(struct dvb_usb_device *d)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* request boot firmware */</div><div class='del'>-	ret = af9015_write_reg_i2c(d, af9015_af9013_config[1].demod_address,</div><div class='add'>+	ret = af9015_write_reg_i2c(d, af9015_af9013_config[1].i2c_addr,</div><div class='ctx'> 		0xe205, 1);</div><div class='ctx'> 	deb_info("%s: firmware boot cmd status:%d\n", __func__, ret);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -547,7 +545,7 @@ static int af9015_copy_firmware(struct dvb_usb_device *d)</div><div class='ctx'> </div><div class='ctx'> 		/* check firmware status */</div><div class='ctx'> 		ret = af9015_read_reg_i2c(d,</div><div class='del'>-			af9015_af9013_config[1].demod_address, 0x98be, &amp;val);</div><div class='add'>+			af9015_af9013_config[1].i2c_addr, 0x98be, &amp;val);</div><div class='ctx'> 		deb_info("%s: firmware status cmd status:%d fw status:%02x\n",</div><div class='ctx'> 			__func__, ret, val);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -840,7 +838,7 @@ static int af9015_read_config(struct usb_device *udev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	deb_info("%s: IR mode:%d\n", __func__, val);</div><div class='add'>+	deb_info("%s: IR mode=%d\n", __func__, val);</div><div class='ctx'> 	for (i = 0; i &lt; af9015_properties_count; i++) {</div><div class='ctx'> 		if (val == AF9015_IR_MODE_DISABLED)</div><div class='ctx'> 			af9015_properties[i].rc.core.rc_codes = NULL;</div><div class='hunk'>@@ -854,7 +852,7 @@ static int af9015_read_config(struct usb_device *udev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	af9015_config.dual_mode = val;</div><div class='del'>-	deb_info("%s: TS mode:%d\n", __func__, af9015_config.dual_mode);</div><div class='add'>+	deb_info("%s: TS mode=%d\n", __func__, af9015_config.dual_mode);</div><div class='ctx'> </div><div class='ctx'> 	/* Set adapter0 buffer size according to USB port speed, adapter1 buffer</div><div class='ctx'> 	   size can be static because it is enabled only USB2.0 */</div><div class='hunk'>@@ -878,7 +876,7 @@ static int af9015_read_config(struct usb_device *udev)</div><div class='ctx'> 		ret = af9015_rw_udev(udev, &amp;req);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto error;</div><div class='del'>-		af9015_af9013_config[1].demod_address = val;</div><div class='add'>+		af9015_af9013_config[1].i2c_addr = val;</div><div class='ctx'> </div><div class='ctx'> 		/* enable 2nd adapter */</div><div class='ctx'> 		for (i = 0; i &lt; af9015_properties_count; i++)</div><div class='hunk'>@@ -900,34 +898,38 @@ static int af9015_read_config(struct usb_device *udev)</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		switch (val) {</div><div class='ctx'> 		case 0:</div><div class='del'>-			af9015_af9013_config[i].adc_clock = 28800;</div><div class='add'>+			af9015_af9013_config[i].clock = 28800000;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 1:</div><div class='del'>-			af9015_af9013_config[i].adc_clock = 20480;</div><div class='add'>+			af9015_af9013_config[i].clock = 20480000;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 2:</div><div class='del'>-			af9015_af9013_config[i].adc_clock = 28000;</div><div class='add'>+			af9015_af9013_config[i].clock = 28000000;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 3:</div><div class='del'>-			af9015_af9013_config[i].adc_clock = 25000;</div><div class='add'>+			af9015_af9013_config[i].clock = 25000000;</div><div class='ctx'> 			break;</div><div class='ctx'> 		};</div><div class='del'>-		deb_info("%s: [%d] xtal:%d set adc_clock:%d\n", __func__, i,</div><div class='del'>-			val, af9015_af9013_config[i].adc_clock);</div><div class='add'>+		deb_info("%s: [%d] xtal=%d set clock=%d\n", __func__, i,</div><div class='add'>+			val, af9015_af9013_config[i].clock);</div><div class='ctx'> </div><div class='del'>-		/* tuner IF */</div><div class='add'>+		/* IF frequency */</div><div class='ctx'> 		req.addr = AF9015_EEPROM_IF1H + offset;</div><div class='ctx'> 		ret = af9015_rw_udev(udev, &amp;req);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto error;</div><div class='del'>-		af9015_af9013_config[i].tuner_if = val &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+		af9015_af9013_config[i].if_frequency = val &lt;&lt; 8;</div><div class='add'>+</div><div class='ctx'> 		req.addr = AF9015_EEPROM_IF1L + offset;</div><div class='ctx'> 		ret = af9015_rw_udev(udev, &amp;req);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto error;</div><div class='del'>-		af9015_af9013_config[i].tuner_if += val;</div><div class='del'>-		deb_info("%s: [%d] IF1:%d\n", __func__, i,</div><div class='del'>-			af9015_af9013_config[0].tuner_if);</div><div class='add'>+</div><div class='add'>+		af9015_af9013_config[i].if_frequency += val;</div><div class='add'>+		af9015_af9013_config[i].if_frequency *= 1000;</div><div class='add'>+		deb_info("%s: [%d] IF frequency=%d\n", __func__, i,</div><div class='add'>+			af9015_af9013_config[0].if_frequency);</div><div class='ctx'> </div><div class='ctx'> 		/* MT2060 IF1 */</div><div class='ctx'> 		req.addr = AF9015_EEPROM_MT2060_IF1H  + offset;</div><div class='hunk'>@@ -940,7 +942,7 @@ static int af9015_read_config(struct usb_device *udev)</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		af9015_config.mt2060_if1[i] += val;</div><div class='del'>-		deb_info("%s: [%d] MT2060 IF1:%d\n", __func__, i,</div><div class='add'>+		deb_info("%s: [%d] MT2060 IF1=%d\n", __func__, i,</div><div class='ctx'> 			af9015_config.mt2060_if1[i]);</div><div class='ctx'> </div><div class='ctx'> 		/* tuner */</div><div class='hunk'>@@ -957,30 +959,30 @@ static int af9015_read_config(struct usb_device *udev)</div><div class='ctx'> 		case AF9013_TUNER_TDA18271:</div><div class='ctx'> 		case AF9013_TUNER_QT1010A:</div><div class='ctx'> 		case AF9013_TUNER_TDA18218:</div><div class='del'>-			af9015_af9013_config[i].rf_spec_inv = 1;</div><div class='add'>+			af9015_af9013_config[i].spec_inv = 1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case AF9013_TUNER_MXL5003D:</div><div class='ctx'> 		case AF9013_TUNER_MXL5005D:</div><div class='ctx'> 		case AF9013_TUNER_MXL5005R:</div><div class='ctx'> 		case AF9013_TUNER_MXL5007T:</div><div class='del'>-			af9015_af9013_config[i].rf_spec_inv = 0;</div><div class='add'>+			af9015_af9013_config[i].spec_inv = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case AF9013_TUNER_MC44S803:</div><div class='ctx'> 			af9015_af9013_config[i].gpio[1] = AF9013_GPIO_LO;</div><div class='del'>-			af9015_af9013_config[i].rf_spec_inv = 1;</div><div class='add'>+			af9015_af9013_config[i].spec_inv = 1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			warn("tuner id:%d not supported, please report!", val);</div><div class='add'>+			warn("tuner id=%d not supported, please report!", val);</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		af9015_af9013_config[i].tuner = val;</div><div class='del'>-		deb_info("%s: [%d] tuner id:%d\n", __func__, i, val);</div><div class='add'>+		deb_info("%s: [%d] tuner id=%d\n", __func__, i, val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='ctx'> 	if (ret)</div><div class='del'>-		err("eeprom read failed:%d", ret);</div><div class='add'>+		err("eeprom read failed=%d", ret);</div><div class='ctx'> </div><div class='ctx'> 	/* AverMedia AVerTV Volar Black HD (A850) device have bad EEPROM</div><div class='ctx'> 	   content :-( Override some wrong values here. Ditto for the</div><div class='hunk'>@@ -998,7 +1000,7 @@ error:</div><div class='ctx'> 			af9015_properties[i].num_adapters = 1;</div><div class='ctx'> </div><div class='ctx'> 		/* set correct IF */</div><div class='del'>-		af9015_af9013_config[0].tuner_if = 4570;</div><div class='add'>+		af9015_af9013_config[0].if_frequency = 4570000;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1093,9 +1095,79 @@ error:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* override demod callbacks for resource locking */</div><div class='add'>+static int af9015_af9013_set_frontend(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct dvb_usb_adapter *adap = fe-&gt;dvb-&gt;priv;</div><div class='add'>+	struct af9015_state *priv = adap-&gt;dev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (mutex_lock_interruptible(&amp;adap-&gt;dev-&gt;usb_mutex))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	ret = priv-&gt;set_frontend[adap-&gt;id](fe);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;adap-&gt;dev-&gt;usb_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* override demod callbacks for resource locking */</div><div class='add'>+static int af9015_af9013_read_status(struct dvb_frontend *fe,</div><div class='add'>+	fe_status_t *status)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct dvb_usb_adapter *adap = fe-&gt;dvb-&gt;priv;</div><div class='add'>+	struct af9015_state *priv = adap-&gt;dev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (mutex_lock_interruptible(&amp;adap-&gt;dev-&gt;usb_mutex))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	ret = priv-&gt;read_status[adap-&gt;id](fe, status);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;adap-&gt;dev-&gt;usb_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* override demod callbacks for resource locking */</div><div class='add'>+static int af9015_af9013_init(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct dvb_usb_adapter *adap = fe-&gt;dvb-&gt;priv;</div><div class='add'>+	struct af9015_state *priv = adap-&gt;dev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (mutex_lock_interruptible(&amp;adap-&gt;dev-&gt;usb_mutex))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	ret = priv-&gt;init[adap-&gt;id](fe);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;adap-&gt;dev-&gt;usb_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* override demod callbacks for resource locking */</div><div class='add'>+static int af9015_af9013_sleep(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct dvb_usb_adapter *adap = fe-&gt;dvb-&gt;priv;</div><div class='add'>+	struct af9015_state *priv = adap-&gt;dev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (mutex_lock_interruptible(&amp;adap-&gt;dev-&gt;usb_mutex))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	ret = priv-&gt;sleep[adap-&gt;id](fe);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;adap-&gt;dev-&gt;usb_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int af9015_af9013_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	struct af9015_state *state = adap-&gt;dev-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	if (adap-&gt;id == 1) {</div><div class='ctx'> 		/* copy firmware to 2nd demodulator */</div><div class='hunk'>@@ -1116,6 +1188,32 @@ static int af9015_af9013_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	adap-&gt;fe_adap[0].fe = dvb_attach(af9013_attach, &amp;af9015_af9013_config[adap-&gt;id],</div><div class='ctx'> 		&amp;adap-&gt;dev-&gt;i2c_adap);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * AF9015 firmware does not like if it gets interrupted by I2C adapter</div><div class='add'>+	 * request on some critical phases. During normal operation I2C adapter</div><div class='add'>+	 * is used only 2nd demodulator and tuner on dual tuner devices.</div><div class='add'>+	 * Override demodulator callbacks and use mutex for limit access to</div><div class='add'>+	 * those "critical" paths to keep AF9015 happy.</div><div class='add'>+	 * Note: we abuse unused usb_mutex here.</div><div class='add'>+	 */</div><div class='add'>+	if (adap-&gt;fe_adap[0].fe) {</div><div class='add'>+		state-&gt;set_frontend[adap-&gt;id] =</div><div class='add'>+			adap-&gt;fe_adap[0].fe-&gt;ops.set_frontend;</div><div class='add'>+		adap-&gt;fe_adap[0].fe-&gt;ops.set_frontend =</div><div class='add'>+			af9015_af9013_set_frontend;</div><div class='add'>+</div><div class='add'>+		state-&gt;read_status[adap-&gt;id] =</div><div class='add'>+			adap-&gt;fe_adap[0].fe-&gt;ops.read_status;</div><div class='add'>+		adap-&gt;fe_adap[0].fe-&gt;ops.read_status =</div><div class='add'>+			af9015_af9013_read_status;</div><div class='add'>+</div><div class='add'>+		state-&gt;init[adap-&gt;id] = adap-&gt;fe_adap[0].fe-&gt;ops.init;</div><div class='add'>+		adap-&gt;fe_adap[0].fe-&gt;ops.init = af9015_af9013_init;</div><div class='add'>+</div><div class='add'>+		state-&gt;sleep[adap-&gt;id] = adap-&gt;fe_adap[0].fe-&gt;ops.sleep;</div><div class='add'>+		adap-&gt;fe_adap[0].fe-&gt;ops.sleep = af9015_af9013_sleep;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return adap-&gt;fe_adap[0].fe == NULL ? -ENODEV : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1245,49 +1343,112 @@ static int af9015_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+enum af9015_usb_table_entry {</div><div class='add'>+	AFATECH_9015,</div><div class='add'>+	AFATECH_9016,</div><div class='add'>+	WINFAST_DTV_GOLD,</div><div class='add'>+	PINNACLE_PCTV_71E,</div><div class='add'>+	KWORLD_PLUSTV_399U,</div><div class='add'>+	TINYTWIN,</div><div class='add'>+	AZUREWAVE_TU700,</div><div class='add'>+	TERRATEC_AF9015,</div><div class='add'>+	KWORLD_PLUSTV_PC160,</div><div class='add'>+	AVERTV_VOLAR_X,</div><div class='add'>+	XTENSIONS_380U,</div><div class='add'>+	MSI_DIGIVOX_DUO,</div><div class='add'>+	AVERTV_VOLAR_X_REV2,</div><div class='add'>+	TELESTAR_STARSTICK_2,</div><div class='add'>+	AVERMEDIA_A309_USB,</div><div class='add'>+	MSI_DIGIVOX_MINI_III,</div><div class='add'>+	KWORLD_E396,</div><div class='add'>+	KWORLD_E39B,</div><div class='add'>+	KWORLD_E395,</div><div class='add'>+	TREKSTOR_DVBT,</div><div class='add'>+	AVERTV_A850,</div><div class='add'>+	AVERTV_A805,</div><div class='add'>+	CONCEPTRONIC_CTVDIGRCU,</div><div class='add'>+	KWORLD_MC810,</div><div class='add'>+	GENIUS_TVGO_DVB_T03,</div><div class='add'>+	KWORLD_399U_2,</div><div class='add'>+	KWORLD_PC160_T,</div><div class='add'>+	SVEON_STV20,</div><div class='add'>+	TINYTWIN_2,</div><div class='add'>+	WINFAST_DTV2000DS,</div><div class='add'>+	KWORLD_UB383_T,</div><div class='add'>+	KWORLD_E39A,</div><div class='add'>+	AVERMEDIA_A815M,</div><div class='add'>+	CINERGY_T_STICK_RC,</div><div class='add'>+	CINERGY_T_DUAL_RC,</div><div class='add'>+	AVERTV_A850T,</div><div class='add'>+	TINYTWIN_3,</div><div class='add'>+	SVEON_STV22,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct usb_device_id af9015_usb_table[] = {</div><div class='del'>-/*  0 */{USB_DEVICE(USB_VID_AFATECH,   USB_PID_AFATECH_AF9015_9015)},</div><div class='del'>-	{USB_DEVICE(USB_VID_AFATECH,   USB_PID_AFATECH_AF9015_9016)},</div><div class='del'>-	{USB_DEVICE(USB_VID_LEADTEK,   USB_PID_WINFAST_DTV_DONGLE_GOLD)},</div><div class='del'>-	{USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV71E)},</div><div class='del'>-	{USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_399U)},</div><div class='del'>-/*  5 */{USB_DEVICE(USB_VID_VISIONPLUS,</div><div class='del'>-		USB_PID_TINYTWIN)},</div><div class='del'>-	{USB_DEVICE(USB_VID_VISIONPLUS,</div><div class='del'>-		USB_PID_AZUREWAVE_AD_TU700)},</div><div class='del'>-	{USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_CINERGY_T_USB_XE_REV2)},</div><div class='del'>-	{USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_PC160_2T)},</div><div class='del'>-	{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X)},</div><div class='del'>-/* 10 */{USB_DEVICE(USB_VID_XTENSIONS, USB_PID_XTENSIONS_XD_380)},</div><div class='del'>-	{USB_DEVICE(USB_VID_MSI_2,     USB_PID_MSI_DIGIVOX_DUO)},</div><div class='del'>-	{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X_2)},</div><div class='del'>-	{USB_DEVICE(USB_VID_TELESTAR,  USB_PID_TELESTAR_STARSTICK_2)},</div><div class='del'>-	{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A309)},</div><div class='del'>-/* 15 */{USB_DEVICE(USB_VID_MSI_2,     USB_PID_MSI_DIGI_VOX_MINI_III)},</div><div class='del'>-	{USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_395U)},</div><div class='del'>-	{USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_395U_2)},</div><div class='del'>-	{USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_395U_3)},</div><div class='del'>-	{USB_DEVICE(USB_VID_AFATECH,   USB_PID_TREKSTOR_DVBT)},</div><div class='del'>-/* 20 */{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A850)},</div><div class='del'>-	{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A805)},</div><div class='del'>-	{USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_CONCEPTRONIC_CTVDIGRCU)},</div><div class='del'>-	{USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_MC810)},</div><div class='del'>-	{USB_DEVICE(USB_VID_KYE,       USB_PID_GENIUS_TVGO_DVB_T03)},</div><div class='del'>-/* 25 */{USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_399U_2)},</div><div class='del'>-	{USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_PC160_T)},</div><div class='del'>-	{USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_SVEON_STV20)},</div><div class='del'>-	{USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_TINYTWIN_2)},</div><div class='del'>-	{USB_DEVICE(USB_VID_LEADTEK,   USB_PID_WINFAST_DTV2000DS)},</div><div class='del'>-/* 30 */{USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_UB383_T)},</div><div class='del'>-	{USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_395U_4)},</div><div class='del'>-	{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A815M)},</div><div class='del'>-	{USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_CINERGY_T_STICK_RC)},</div><div class='del'>-	{USB_DEVICE(USB_VID_TERRATEC,</div><div class='del'>-		USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC)},</div><div class='del'>-/* 35 */{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A850T)},</div><div class='del'>-	{USB_DEVICE(USB_VID_GTEK,      USB_PID_TINYTWIN_3)},</div><div class='del'>-	{USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_SVEON_STV22)},</div><div class='del'>-	{0},</div><div class='add'>+	[AFATECH_9015] =</div><div class='add'>+		{USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9015_9015)},</div><div class='add'>+	[AFATECH_9016] =</div><div class='add'>+		{USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9015_9016)},</div><div class='add'>+	[WINFAST_DTV_GOLD] =</div><div class='add'>+		{USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV_DONGLE_GOLD)},</div><div class='add'>+	[PINNACLE_PCTV_71E] =</div><div class='add'>+		{USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV71E)},</div><div class='add'>+	[KWORLD_PLUSTV_399U] =</div><div class='add'>+		{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_399U)},</div><div class='add'>+	[TINYTWIN] = {USB_DEVICE(USB_VID_VISIONPLUS, USB_PID_TINYTWIN)},</div><div class='add'>+	[AZUREWAVE_TU700] =</div><div class='add'>+		{USB_DEVICE(USB_VID_VISIONPLUS, USB_PID_AZUREWAVE_AD_TU700)},</div><div class='add'>+	[TERRATEC_AF9015] = {USB_DEVICE(USB_VID_TERRATEC,</div><div class='add'>+				USB_PID_TERRATEC_CINERGY_T_USB_XE_REV2)},</div><div class='add'>+	[KWORLD_PLUSTV_PC160] =</div><div class='add'>+		{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_PC160_2T)},</div><div class='add'>+	[AVERTV_VOLAR_X] =</div><div class='add'>+		{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X)},</div><div class='add'>+	[XTENSIONS_380U] =</div><div class='add'>+		{USB_DEVICE(USB_VID_XTENSIONS, USB_PID_XTENSIONS_XD_380)},</div><div class='add'>+	[MSI_DIGIVOX_DUO] =</div><div class='add'>+		{USB_DEVICE(USB_VID_MSI_2, USB_PID_MSI_DIGIVOX_DUO)},</div><div class='add'>+	[AVERTV_VOLAR_X_REV2] =</div><div class='add'>+		{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X_2)},</div><div class='add'>+	[TELESTAR_STARSTICK_2] =</div><div class='add'>+		{USB_DEVICE(USB_VID_TELESTAR,  USB_PID_TELESTAR_STARSTICK_2)},</div><div class='add'>+	[AVERMEDIA_A309_USB] =</div><div class='add'>+		{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A309)},</div><div class='add'>+	[MSI_DIGIVOX_MINI_III] =</div><div class='add'>+		{USB_DEVICE(USB_VID_MSI_2, USB_PID_MSI_DIGI_VOX_MINI_III)},</div><div class='add'>+	[KWORLD_E396] = {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U)},</div><div class='add'>+	[KWORLD_E39B] = {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U_2)},</div><div class='add'>+	[KWORLD_E395] = {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U_3)},</div><div class='add'>+	[TREKSTOR_DVBT] = {USB_DEVICE(USB_VID_AFATECH, USB_PID_TREKSTOR_DVBT)},</div><div class='add'>+	[AVERTV_A850] = {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A850)},</div><div class='add'>+	[AVERTV_A805] = {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A805)},</div><div class='add'>+	[CONCEPTRONIC_CTVDIGRCU] =</div><div class='add'>+		{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_CONCEPTRONIC_CTVDIGRCU)},</div><div class='add'>+	[KWORLD_MC810] = {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_MC810)},</div><div class='add'>+	[GENIUS_TVGO_DVB_T03] =</div><div class='add'>+		{USB_DEVICE(USB_VID_KYE, USB_PID_GENIUS_TVGO_DVB_T03)},</div><div class='add'>+	[KWORLD_399U_2] = {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_399U_2)},</div><div class='add'>+	[KWORLD_PC160_T] =</div><div class='add'>+		{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_PC160_T)},</div><div class='add'>+	[SVEON_STV20] = {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_SVEON_STV20)},</div><div class='add'>+	[TINYTWIN_2] = {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_TINYTWIN_2)},</div><div class='add'>+	[WINFAST_DTV2000DS] =</div><div class='add'>+		{USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV2000DS)},</div><div class='add'>+	[KWORLD_UB383_T] =</div><div class='add'>+		{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_UB383_T)},</div><div class='add'>+	[KWORLD_E39A] =</div><div class='add'>+		{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U_4)},</div><div class='add'>+	[AVERMEDIA_A815M] =</div><div class='add'>+		{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A815M)},</div><div class='add'>+	[CINERGY_T_STICK_RC] = {USB_DEVICE(USB_VID_TERRATEC,</div><div class='add'>+				USB_PID_TERRATEC_CINERGY_T_STICK_RC)},</div><div class='add'>+	[CINERGY_T_DUAL_RC] = {USB_DEVICE(USB_VID_TERRATEC,</div><div class='add'>+				USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC)},</div><div class='add'>+	[AVERTV_A850T] =</div><div class='add'>+		{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A850T)},</div><div class='add'>+	[TINYTWIN_3] = {USB_DEVICE(USB_VID_GTEK, USB_PID_TINYTWIN_3)},</div><div class='add'>+	[SVEON_STV22] = {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_SVEON_STV22)},</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, af9015_usb_table);</div><div class='ctx'> </div><div class='hunk'>@@ -1362,68 +1523,104 @@ static struct dvb_usb_device_properties af9015_properties[] = {</div><div class='ctx'> 		.devices = {</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "Afatech AF9015 DVB-T USB2.0 stick",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[0],</div><div class='del'>-					     &amp;af9015_usb_table[1], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[AFATECH_9015],</div><div class='add'>+					&amp;af9015_usb_table[AFATECH_9016],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "Leadtek WinFast DTV Dongle Gold",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[2], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[WINFAST_DTV_GOLD],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "Pinnacle PCTV 71e",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[3], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[PINNACLE_PCTV_71E],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "KWorld PlusTV Dual DVB-T Stick " \</div><div class='ctx'> 					"(DVB-T 399U)",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[4],</div><div class='del'>-					     &amp;af9015_usb_table[25], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[KWORLD_PLUSTV_399U],</div><div class='add'>+					&amp;af9015_usb_table[KWORLD_399U_2],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "DigitalNow TinyTwin DVB-T Receiver",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[5],</div><div class='del'>-					     &amp;af9015_usb_table[28],</div><div class='del'>-					     &amp;af9015_usb_table[36], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[TINYTWIN],</div><div class='add'>+					&amp;af9015_usb_table[TINYTWIN_2],</div><div class='add'>+					&amp;af9015_usb_table[TINYTWIN_3],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "TwinHan AzureWave AD-TU700(704J)",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[6], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[AZUREWAVE_TU700],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "TerraTec Cinergy T USB XE",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[7], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[TERRATEC_AF9015],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "KWorld PlusTV Dual DVB-T PCI " \</div><div class='ctx'> 					"(DVB-T PC160-2T)",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[8], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[KWORLD_PLUSTV_PC160],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "AVerMedia AVerTV DVB-T Volar X",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[9], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[AVERTV_VOLAR_X],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "TerraTec Cinergy T Stick RC",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[33], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[CINERGY_T_STICK_RC],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "TerraTec Cinergy T Stick Dual RC",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[34], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[CINERGY_T_DUAL_RC],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "AverMedia AVerTV Red HD+ (A850T)",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[35], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[AVERTV_A850T],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1496,57 +1693,87 @@ static struct dvb_usb_device_properties af9015_properties[] = {</div><div class='ctx'> 		.devices = {</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "Xtensions XD-380",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[10], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[XTENSIONS_380U],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "MSI DIGIVOX Duo",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[11], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[MSI_DIGIVOX_DUO],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "Fujitsu-Siemens Slim Mobile USB DVB-T",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[12], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[AVERTV_VOLAR_X_REV2],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "Telestar Starstick 2",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[13], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[TELESTAR_STARSTICK_2],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "AVerMedia A309",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[14], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[AVERMEDIA_A309_USB],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "MSI Digi VOX mini III",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[15], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[MSI_DIGIVOX_MINI_III],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "KWorld USB DVB-T TV Stick II " \</div><div class='ctx'> 					"(VS-DVB-T 395U)",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[16],</div><div class='del'>-					     &amp;af9015_usb_table[17],</div><div class='del'>-					     &amp;af9015_usb_table[18],</div><div class='del'>-					     &amp;af9015_usb_table[31], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[KWORLD_E396],</div><div class='add'>+					&amp;af9015_usb_table[KWORLD_E39B],</div><div class='add'>+					&amp;af9015_usb_table[KWORLD_E395],</div><div class='add'>+					&amp;af9015_usb_table[KWORLD_E39A],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "TrekStor DVB-T USB Stick",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[19], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[TREKSTOR_DVBT],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "AverMedia AVerTV Volar Black HD " \</div><div class='ctx'> 					"(A850)",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[20], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[AVERTV_A850],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "Sveon STV22 Dual USB DVB-T Tuner HDTV",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[37], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[SVEON_STV22],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1619,50 +1846,77 @@ static struct dvb_usb_device_properties af9015_properties[] = {</div><div class='ctx'> 		.devices = {</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "AverMedia AVerTV Volar GPS 805 (A805)",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[21], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[AVERTV_A805],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "Conceptronic USB2.0 DVB-T CTVDIGRCU " \</div><div class='ctx'> 					"V3.0",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[22], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[CONCEPTRONIC_CTVDIGRCU],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "KWorld Digial MC-810",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[23], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[KWORLD_MC810],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "Genius TVGo DVB-T03",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[24], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[GENIUS_TVGO_DVB_T03],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "KWorld PlusTV DVB-T PCI Pro Card " \</div><div class='ctx'> 					"(DVB-T PC160-T)",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[26], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[KWORLD_PC160_T],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "Sveon STV20 Tuner USB DVB-T HDTV",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[27], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[SVEON_STV20],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "Leadtek WinFast DTV2000DS",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[29], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[WINFAST_DTV2000DS],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "KWorld USB DVB-T Stick Mobile " \</div><div class='ctx'> 					"(UB383-T)",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[30], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[KWORLD_UB383_T],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 			{</div><div class='ctx'> 				.name = "AverMedia AVerTV Volar M (A815Mac)",</div><div class='del'>-				.cold_ids = {&amp;af9015_usb_table[32], NULL},</div><div class='add'>+				.cold_ids = {</div><div class='add'>+					&amp;af9015_usb_table[AVERMEDIA_A815M],</div><div class='add'>+					NULL</div><div class='add'>+				},</div><div class='ctx'> 				.warm_ids = {NULL},</div><div class='ctx'> 			},</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1713,25 +1967,7 @@ static struct usb_driver af9015_usb_driver = {</div><div class='ctx'> 	.id_table = af9015_usb_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init af9015_usb_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	ret = usb_register(&amp;af9015_usb_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		err("module init failed:%d", ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit af9015_usb_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;af9015_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(af9015_usb_module_init);</div><div class='del'>-module_exit(af9015_usb_module_exit);</div><div class='add'>+module_usb_driver(af9015_usb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Antti Palosaari &lt;crope@iki.fi&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for Afatech AF9015 DVB-T");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/af9015.h b/drivers/media/dvb/dvb-usb/af9015.h<br/>index 6252ea6c1904..f619063fa72f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/af9015.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/af9015.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/af9015.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/af9015.h</a></div><div class='hunk'>@@ -102,6 +102,12 @@ struct af9015_state {</div><div class='ctx'> 	u8 rc_repeat;</div><div class='ctx'> 	u32 rc_keycode;</div><div class='ctx'> 	u8 rc_last[4];</div><div class='add'>+</div><div class='add'>+	/* for demod callback override */</div><div class='add'>+	int (*set_frontend[2]) (struct dvb_frontend *fe);</div><div class='add'>+	int (*read_status[2]) (struct dvb_frontend *fe, fe_status_t *status);</div><div class='add'>+	int (*init[2]) (struct dvb_frontend *fe);</div><div class='add'>+	int (*sleep[2]) (struct dvb_frontend *fe);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct af9015_config {</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c<br/>index 5f2278b73ee9..1455e2644ab5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/anysee.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/anysee.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/anysee.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/anysee.c</a></div><div class='hunk'>@@ -41,6 +41,7 @@</div><div class='ctx'> #include "stv0900.h"</div><div class='ctx'> #include "stv6110.h"</div><div class='ctx'> #include "isl6423.h"</div><div class='add'>+#include "cxd2820r.h"</div><div class='ctx'> </div><div class='ctx'> /* debug */</div><div class='ctx'> static int dvb_usb_anysee_debug;</div><div class='hunk'>@@ -66,10 +67,12 @@ static int anysee_ctrl_msg(struct dvb_usb_device *d, u8 *sbuf, u8 slen,</div><div class='ctx'> 	if (mutex_lock_interruptible(&amp;anysee_usb_mutex) &lt; 0)</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='add'>+	deb_xfer("&gt;&gt;&gt; ");</div><div class='add'>+	debug_dump(buf, slen, deb_xfer);</div><div class='add'>+</div><div class='ctx'> 	/* We need receive one message more after dvb_usb_generic_rw due</div><div class='ctx'> 	   to weird transaction flow, which is 1 x send + 2 x receive. */</div><div class='ctx'> 	ret = dvb_usb_generic_rw(d, buf, sizeof(buf), buf, sizeof(buf), 0);</div><div class='del'>-</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		/* receive 2nd answer */</div><div class='ctx'> 		ret = usb_bulk_msg(d-&gt;udev, usb_rcvbulkpipe(d-&gt;udev,</div><div class='hunk'>@@ -79,7 +82,10 @@ static int anysee_ctrl_msg(struct dvb_usb_device *d, u8 *sbuf, u8 slen,</div><div class='ctx'> 			err("%s: recv bulk message failed: %d", __func__, ret);</div><div class='ctx'> 		else {</div><div class='ctx'> 			deb_xfer("&lt;&lt;&lt; ");</div><div class='del'>-			debug_dump(buf, act_len, deb_xfer);</div><div class='add'>+			debug_dump(buf, rlen, deb_xfer);</div><div class='add'>+</div><div class='add'>+			if (buf[63] != 0x4f)</div><div class='add'>+				deb_info("%s: cmd failed\n", __func__);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -129,6 +135,29 @@ static int anysee_wr_reg_mask(struct dvb_usb_device *d, u16 reg, u8 val,</div><div class='ctx'> 	return anysee_write_reg(d, reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* read single register with mask */</div><div class='add'>+static int anysee_rd_reg_mask(struct dvb_usb_device *d, u16 reg, u8 *val,</div><div class='add'>+	u8 mask)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+	u8 tmp;</div><div class='add'>+</div><div class='add'>+	ret = anysee_read_reg(d, reg, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	tmp &amp;= mask;</div><div class='add'>+</div><div class='add'>+	/* find position of the first bit */</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		if ((mask &gt;&gt; i) &amp; 0x01)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	*val = tmp &gt;&gt; i;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int anysee_get_hw_info(struct dvb_usb_device *d, u8 *id)</div><div class='ctx'> {</div><div class='ctx'> 	u8 buf[] = {CMD_GET_HW_INFO};</div><div class='hunk'>@@ -156,22 +185,6 @@ static int anysee_ir_ctrl(struct dvb_usb_device *d, u8 onoff)</div><div class='ctx'> 	return anysee_ctrl_msg(d, buf, sizeof(buf), NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int anysee_init(struct dvb_usb_device *d)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	/* LED light */</div><div class='del'>-	ret = anysee_led_ctrl(d, 0x01, 0x03);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* enable IR */</div><div class='del'>-	ret = anysee_ir_ctrl(d, 1);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* I2C */</div><div class='ctx'> static int anysee_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,</div><div class='ctx'> 	int num)</div><div class='hunk'>@@ -297,7 +310,7 @@ static struct tda10023_config anysee_tda10023_tda18212_config = {</div><div class='ctx'> 	.pll_m  = 12,</div><div class='ctx'> 	.pll_p  = 3,</div><div class='ctx'> 	.pll_n  = 1,</div><div class='del'>-	.output_mode = TDA10023_OUTPUT_MODE_PARALLEL_C,</div><div class='add'>+	.output_mode = TDA10023_OUTPUT_MODE_PARALLEL_B,</div><div class='ctx'> 	.deltaf = 0xba02,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -309,6 +322,17 @@ static struct tda18212_config anysee_tda18212_config = {</div><div class='ctx'> 	.if_dvbc = 5000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct tda18212_config anysee_tda18212_config2 = {</div><div class='add'>+	.i2c_address = 0x60 /* (0xc0 &gt;&gt; 1) */,</div><div class='add'>+	.if_dvbt_6 = 3550,</div><div class='add'>+	.if_dvbt_7 = 3700,</div><div class='add'>+	.if_dvbt_8 = 4150,</div><div class='add'>+	.if_dvbt2_6 = 3250,</div><div class='add'>+	.if_dvbt2_7 = 4000,</div><div class='add'>+	.if_dvbt2_8 = 4000,</div><div class='add'>+	.if_dvbc = 5000,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct cx24116_config anysee_cx24116_config = {</div><div class='ctx'> 	.demod_address = (0xaa &gt;&gt; 1),</div><div class='ctx'> 	.mpg_clk_pos_pol = 0x00,</div><div class='hunk'>@@ -339,6 +363,11 @@ static struct isl6423_config anysee_isl6423_config = {</div><div class='ctx'> 	.addr = (0x10 &gt;&gt; 1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct cxd2820r_config anysee_cxd2820r_config = {</div><div class='add'>+	.i2c_address = 0x6d, /* (0xda &gt;&gt; 1) */</div><div class='add'>+	.ts_mode = 0x38,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * New USB device strings: Mfr=1, Product=2, SerialNumber=0</div><div class='ctx'>  * Manufacturer: AMT.CO.KR</div><div class='hunk'>@@ -421,6 +450,14 @@ static struct isl6423_config anysee_isl6423_config = {</div><div class='ctx'>  * IOA[7] TS 1=enabled</div><div class='ctx'>  * IOE[5] STV0903 1=enabled</div><div class='ctx'>  *</div><div class='add'>+ * E7 T2C VID=1c73 PID=861f HW=20 FW=0.1 AMTCI=0.5 "anysee-E7T2C(LP)"</div><div class='add'>+ * PCB: 508T2C (rev0.3)</div><div class='add'>+ * parts: DNOQ44QCH106A(CXD2820R, TDA18212), TDA8024</div><div class='add'>+ * OEA=80 OEB=00 OEC=03 OED=f7 OEE=ff</div><div class='add'>+ * IOA=4d IOB=00 IOC=cc IOD=48 IOE=e4</div><div class='add'>+ * IOA[7] TS 1=enabled</div><div class='add'>+ * IOE[5] CXD2820R 1=enabled</div><div class='add'>+ *</div><div class='ctx'>  * E7 PTC VID=1c73 PID=861f HW=21 FW=0.1 AMTCI=?? "anysee-E7PTC(LP)"</div><div class='ctx'>  * PCB: 508PTC (rev0.5)</div><div class='ctx'>  * parts: ZL10353, TDA10023, DNOD44CDH086A(TDA18212)</div><div class='hunk'>@@ -437,7 +474,7 @@ static struct isl6423_config anysee_isl6423_config = {</div><div class='ctx'>  * IOD[6] ZL10353 1=enabled</div><div class='ctx'>  * IOE[0] IF 0=enabled</div><div class='ctx'>  *</div><div class='del'>- * E7 S2 VID=1c73 PID=861f HW=22 FW=0.1 AMTCI=?? "anysee-E7PS2(LP)"</div><div class='add'>+ * E7 PS2 VID=1c73 PID=861f HW=22 FW=0.1 AMTCI=?? "anysee-E7PS2(LP)"</div><div class='ctx'>  * PCB: 508PS2 (rev0.4)</div><div class='ctx'>  * parts: DNBU10512IST(STV0903, STV6110), ISL6423</div><div class='ctx'>  * OEA=80 OEB=00 OEC=03 OED=f7 OEE=ff</div><div class='hunk'>@@ -446,6 +483,16 @@ static struct isl6423_config anysee_isl6423_config = {</div><div class='ctx'>  * IOE[5] STV0903 1=enabled</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/* external I2C gate used for DNOD44CDH086A(TDA18212) tuner module */</div><div class='add'>+static int anysee_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_adapter *adap = fe-&gt;dvb-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* enable / disable tuner access on IOE[4] */</div><div class='add'>+	return anysee_wr_reg_mask(adap-&gt;dev, REG_IOE, (enable &lt;&lt; 4), 0x10);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int anysee_frontend_ctrl(struct dvb_frontend *fe, int onoff)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_usb_adapter *adap = fe-&gt;dvb-&gt;priv;</div><div class='hunk'>@@ -577,7 +624,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	/* detect hardware only once */</div><div class='ctx'> 	if (adap-&gt;fe_adap[0].fe == NULL) {</div><div class='ctx'> 		/* Check which hardware we have.</div><div class='del'>-		 * We must do this call two times to get reliable values (hw bug).</div><div class='add'>+		 * We must do this call two times to get reliable values</div><div class='add'>+		 * (hw/fw bug).</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = anysee_get_hw_info(adap-&gt;dev, hw_info);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -606,14 +654,14 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		/* attach demod */</div><div class='del'>-		adap-&gt;fe_adap[0].fe = dvb_attach(mt352_attach, &amp;anysee_mt352_config,</div><div class='del'>-			&amp;adap-&gt;dev-&gt;i2c_adap);</div><div class='add'>+		adap-&gt;fe_adap[0].fe = dvb_attach(mt352_attach,</div><div class='add'>+			&amp;anysee_mt352_config, &amp;adap-&gt;dev-&gt;i2c_adap);</div><div class='ctx'> 		if (adap-&gt;fe_adap[0].fe)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		/* attach demod */</div><div class='del'>-		adap-&gt;fe_adap[0].fe = dvb_attach(zl10353_attach, &amp;anysee_zl10353_config,</div><div class='del'>-			&amp;adap-&gt;dev-&gt;i2c_adap);</div><div class='add'>+		adap-&gt;fe_adap[0].fe = dvb_attach(zl10353_attach,</div><div class='add'>+			&amp;anysee_zl10353_config, &amp;adap-&gt;dev-&gt;i2c_adap);</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> 	case ANYSEE_HW_507CD: /* 6 */</div><div class='hunk'>@@ -665,8 +713,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 			goto error;</div><div class='ctx'> </div><div class='ctx'> 		/* attach demod */</div><div class='del'>-		adap-&gt;fe_adap[0].fe = dvb_attach(cx24116_attach, &amp;anysee_cx24116_config,</div><div class='del'>-			&amp;adap-&gt;dev-&gt;i2c_adap);</div><div class='add'>+		adap-&gt;fe_adap[0].fe = dvb_attach(cx24116_attach,</div><div class='add'>+			&amp;anysee_cx24116_config, &amp;adap-&gt;dev-&gt;i2c_adap);</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> 	case ANYSEE_HW_507FA: /* 15 */</div><div class='hunk'>@@ -747,17 +795,19 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* I2C gate for DNOD44CDH086A(TDA18212) tuner module */</div><div class='add'>+		if (tmp == 0xc7) {</div><div class='add'>+			if (adap-&gt;fe_adap[state-&gt;fe_id].fe)</div><div class='add'>+				adap-&gt;fe_adap[state-&gt;fe_id].fe-&gt;ops.i2c_gate_ctrl =</div><div class='add'>+					anysee_i2c_gate_ctrl;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ANYSEE_HW_508TC: /* 18 */</div><div class='ctx'> 	case ANYSEE_HW_508PTC: /* 21 */</div><div class='ctx'> 		/* E7 TC */</div><div class='ctx'> 		/* E7 PTC */</div><div class='ctx'> </div><div class='del'>-		/* enable transport stream on IOA[7] */</div><div class='del'>-		ret = anysee_wr_reg_mask(adap-&gt;dev, REG_IOA, (1 &lt;&lt; 7), 0x80);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-</div><div class='ctx'> 		if ((state-&gt;fe_id ^ dvb_usb_anysee_delsys) == 0)  {</div><div class='ctx'> 			/* disable DVB-T demod on IOD[6] */</div><div class='ctx'> 			ret = anysee_wr_reg_mask(adap-&gt;dev, REG_IOD, (0 &lt;&lt; 6),</div><div class='hunk'>@@ -772,7 +822,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 				goto error;</div><div class='ctx'> </div><div class='ctx'> 			/* attach demod */</div><div class='del'>-			adap-&gt;fe_adap[state-&gt;fe_id].fe = dvb_attach(tda10023_attach,</div><div class='add'>+			adap-&gt;fe_adap[state-&gt;fe_id].fe =</div><div class='add'>+				dvb_attach(tda10023_attach,</div><div class='ctx'> 				&amp;anysee_tda10023_tda18212_config,</div><div class='ctx'> 				&amp;adap-&gt;dev-&gt;i2c_adap, 0x48);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -789,11 +840,19 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 				goto error;</div><div class='ctx'> </div><div class='ctx'> 			/* attach demod */</div><div class='del'>-			adap-&gt;fe_adap[state-&gt;fe_id].fe = dvb_attach(zl10353_attach,</div><div class='add'>+			adap-&gt;fe_adap[state-&gt;fe_id].fe =</div><div class='add'>+				dvb_attach(zl10353_attach,</div><div class='ctx'> 				&amp;anysee_zl10353_tda18212_config,</div><div class='ctx'> 				&amp;adap-&gt;dev-&gt;i2c_adap);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* I2C gate for DNOD44CDH086A(TDA18212) tuner module */</div><div class='add'>+		if (adap-&gt;fe_adap[state-&gt;fe_id].fe)</div><div class='add'>+			adap-&gt;fe_adap[state-&gt;fe_id].fe-&gt;ops.i2c_gate_ctrl =</div><div class='add'>+				anysee_i2c_gate_ctrl;</div><div class='add'>+</div><div class='add'>+		state-&gt;has_ci = true;</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ANYSEE_HW_508S2: /* 19 */</div><div class='ctx'> 	case ANYSEE_HW_508PS2: /* 22 */</div><div class='hunk'>@@ -803,19 +862,35 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 		if (state-&gt;fe_id)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		/* enable transport stream on IOA[7] */</div><div class='del'>-		ret = anysee_wr_reg_mask(adap-&gt;dev, REG_IOA, (1 &lt;&lt; 7), 0x80);</div><div class='add'>+		/* enable DVB-S/S2 demod on IOE[5] */</div><div class='add'>+		ret = anysee_wr_reg_mask(adap-&gt;dev, REG_IOE, (1 &lt;&lt; 5), 0x20);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto error;</div><div class='ctx'> </div><div class='del'>-		/* enable DVB-S/S2 demod on IOE[5] */</div><div class='add'>+		/* attach demod */</div><div class='add'>+		adap-&gt;fe_adap[0].fe = dvb_attach(stv0900_attach,</div><div class='add'>+			&amp;anysee_stv0900_config, &amp;adap-&gt;dev-&gt;i2c_adap, 0);</div><div class='add'>+</div><div class='add'>+		state-&gt;has_ci = true;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case ANYSEE_HW_508T2C: /* 20 */</div><div class='add'>+		/* E7 T2C */</div><div class='add'>+</div><div class='add'>+		if (state-&gt;fe_id)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* enable DVB-T/T2/C demod on IOE[5] */</div><div class='ctx'> 		ret = anysee_wr_reg_mask(adap-&gt;dev, REG_IOE, (1 &lt;&lt; 5), 0x20);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto error;</div><div class='ctx'> </div><div class='ctx'> 		/* attach demod */</div><div class='del'>-		adap-&gt;fe_adap[0].fe = dvb_attach(stv0900_attach, &amp;anysee_stv0900_config,</div><div class='del'>-			&amp;adap-&gt;dev-&gt;i2c_adap, 0);</div><div class='add'>+		adap-&gt;fe_adap[state-&gt;fe_id].fe = dvb_attach(cxd2820r_attach,</div><div class='add'>+				&amp;anysee_cxd2820r_config, &amp;adap-&gt;dev-&gt;i2c_adap,</div><div class='add'>+				NULL);</div><div class='add'>+</div><div class='add'>+		state-&gt;has_ci = true;</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -842,24 +917,26 @@ static int anysee_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 		/* E30 */</div><div class='ctx'> </div><div class='ctx'> 		/* attach tuner */</div><div class='del'>-		fe = dvb_attach(dvb_pll_attach, adap-&gt;fe_adap[0].fe, (0xc2 &gt;&gt; 1),</div><div class='del'>-			NULL, DVB_PLL_THOMSON_DTT7579);</div><div class='add'>+		fe = dvb_attach(dvb_pll_attach, adap-&gt;fe_adap[0].fe,</div><div class='add'>+			(0xc2 &gt;&gt; 1), NULL, DVB_PLL_THOMSON_DTT7579);</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> 	case ANYSEE_HW_507CD: /* 6 */</div><div class='ctx'> 		/* E30 Plus */</div><div class='ctx'> </div><div class='ctx'> 		/* attach tuner */</div><div class='del'>-		fe = dvb_attach(dvb_pll_attach, adap-&gt;fe_adap[0].fe, (0xc2 &gt;&gt; 1),</div><div class='del'>-			&amp;adap-&gt;dev-&gt;i2c_adap, DVB_PLL_THOMSON_DTT7579);</div><div class='add'>+		fe = dvb_attach(dvb_pll_attach, adap-&gt;fe_adap[0].fe,</div><div class='add'>+			(0xc2 &gt;&gt; 1), &amp;adap-&gt;dev-&gt;i2c_adap,</div><div class='add'>+			DVB_PLL_THOMSON_DTT7579);</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> 	case ANYSEE_HW_507DC: /* 10 */</div><div class='ctx'> 		/* E30 C Plus */</div><div class='ctx'> </div><div class='ctx'> 		/* attach tuner */</div><div class='del'>-		fe = dvb_attach(dvb_pll_attach, adap-&gt;fe_adap[0].fe, (0xc0 &gt;&gt; 1),</div><div class='del'>-			&amp;adap-&gt;dev-&gt;i2c_adap, DVB_PLL_SAMSUNG_DTOS403IH102A);</div><div class='add'>+		fe = dvb_attach(dvb_pll_attach, adap-&gt;fe_adap[0].fe,</div><div class='add'>+			(0xc0 &gt;&gt; 1), &amp;adap-&gt;dev-&gt;i2c_adap,</div><div class='add'>+			DVB_PLL_SAMSUNG_DTOS403IH102A);</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> 	case ANYSEE_HW_507SI: /* 11 */</div><div class='hunk'>@@ -877,22 +954,12 @@ static int anysee_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 		/* Try first attach TDA18212 silicon tuner on IOE[4], if that</div><div class='ctx'> 		 * fails attach old simple PLL. */</div><div class='ctx'> </div><div class='del'>-		/* enable tuner on IOE[4] */</div><div class='del'>-		ret = anysee_wr_reg_mask(adap-&gt;dev, REG_IOE, (1 &lt;&lt; 4), 0x10);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-</div><div class='ctx'> 		/* attach tuner */</div><div class='ctx'> 		fe = dvb_attach(tda18212_attach, adap-&gt;fe_adap[state-&gt;fe_id].fe,</div><div class='ctx'> 			&amp;adap-&gt;dev-&gt;i2c_adap, &amp;anysee_tda18212_config);</div><div class='ctx'> 		if (fe)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		/* disable tuner on IOE[4] */</div><div class='del'>-		ret = anysee_wr_reg_mask(adap-&gt;dev, REG_IOE, (0 &lt;&lt; 4), 0x10);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-</div><div class='ctx'> 		/* attach tuner */</div><div class='ctx'> 		fe = dvb_attach(dvb_pll_attach, adap-&gt;fe_adap[state-&gt;fe_id].fe,</div><div class='ctx'> 			(0xc0 &gt;&gt; 1), &amp;adap-&gt;dev-&gt;i2c_adap,</div><div class='hunk'>@@ -904,11 +971,6 @@ static int anysee_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 		/* E7 TC */</div><div class='ctx'> 		/* E7 PTC */</div><div class='ctx'> </div><div class='del'>-		/* enable tuner on IOE[4] */</div><div class='del'>-		ret = anysee_wr_reg_mask(adap-&gt;dev, REG_IOE, (1 &lt;&lt; 4), 0x10);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-</div><div class='ctx'> 		/* attach tuner */</div><div class='ctx'> 		fe = dvb_attach(tda18212_attach, adap-&gt;fe_adap[state-&gt;fe_id].fe,</div><div class='ctx'> 			&amp;adap-&gt;dev-&gt;i2c_adap, &amp;anysee_tda18212_config);</div><div class='hunk'>@@ -930,6 +992,15 @@ static int anysee_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='add'>+	case ANYSEE_HW_508T2C: /* 20 */</div><div class='add'>+		/* E7 T2C */</div><div class='add'>+</div><div class='add'>+		/* attach tuner */</div><div class='add'>+		fe = dvb_attach(tda18212_attach, adap-&gt;fe_adap[state-&gt;fe_id].fe,</div><div class='add'>+			&amp;adap-&gt;dev-&gt;i2c_adap, &amp;anysee_tda18212_config2);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		fe = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -939,7 +1010,6 @@ static int anysee_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> </div><div class='del'>-error:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -969,6 +1039,201 @@ static int anysee_rc_query(struct dvb_usb_device *d)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int anysee_ci_read_attribute_mem(struct dvb_ca_en50221 *ci, int slot,</div><div class='add'>+	int addr)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *d = ci-&gt;data;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 buf[] = {CMD_CI, 0x02, 0x40 | addr &gt;&gt; 8, addr &amp; 0xff, 0x00, 1};</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	ret = anysee_ctrl_msg(d, buf, sizeof(buf), &amp;val, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int anysee_ci_write_attribute_mem(struct dvb_ca_en50221 *ci, int slot,</div><div class='add'>+	int addr, u8 val)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *d = ci-&gt;data;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 buf[] = {CMD_CI, 0x03, 0x40 | addr &gt;&gt; 8, addr &amp; 0xff, 0x00, 1, val};</div><div class='add'>+</div><div class='add'>+	ret = anysee_ctrl_msg(d, buf, sizeof(buf), NULL, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int anysee_ci_read_cam_control(struct dvb_ca_en50221 *ci, int slot,</div><div class='add'>+	u8 addr)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *d = ci-&gt;data;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 buf[] = {CMD_CI, 0x04, 0x40, addr, 0x00, 1};</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	ret = anysee_ctrl_msg(d, buf, sizeof(buf), &amp;val, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int anysee_ci_write_cam_control(struct dvb_ca_en50221 *ci, int slot,</div><div class='add'>+	u8 addr, u8 val)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *d = ci-&gt;data;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 buf[] = {CMD_CI, 0x05, 0x40, addr, 0x00, 1, val};</div><div class='add'>+</div><div class='add'>+	ret = anysee_ctrl_msg(d, buf, sizeof(buf), NULL, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int anysee_ci_slot_reset(struct dvb_ca_en50221 *ci, int slot)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *d = ci-&gt;data;</div><div class='add'>+	int ret;</div><div class='add'>+	struct anysee_state *state = d-&gt;priv;</div><div class='add'>+</div><div class='add'>+	state-&gt;ci_cam_ready = jiffies + msecs_to_jiffies(1000);</div><div class='add'>+</div><div class='add'>+	ret = anysee_wr_reg_mask(d, REG_IOA, (0 &lt;&lt; 7), 0x80);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	msleep(300);</div><div class='add'>+</div><div class='add'>+	ret = anysee_wr_reg_mask(d, REG_IOA, (1 &lt;&lt; 7), 0x80);</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 anysee_ci_slot_shutdown(struct dvb_ca_en50221 *ci, int slot)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *d = ci-&gt;data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = anysee_wr_reg_mask(d, REG_IOA, (0 &lt;&lt; 7), 0x80);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	msleep(30);</div><div class='add'>+</div><div class='add'>+	ret = anysee_wr_reg_mask(d, REG_IOA, (1 &lt;&lt; 7), 0x80);</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 anysee_ci_slot_ts_enable(struct dvb_ca_en50221 *ci, int slot)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *d = ci-&gt;data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = anysee_wr_reg_mask(d, REG_IOD, (0 &lt;&lt; 1), 0x02);</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 anysee_ci_poll_slot_status(struct dvb_ca_en50221 *ci, int slot,</div><div class='add'>+	int open)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *d = ci-&gt;data;</div><div class='add'>+	struct anysee_state *state = d-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 tmp;</div><div class='add'>+</div><div class='add'>+	ret = anysee_rd_reg_mask(d, REG_IOC, &amp;tmp, 0x40);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (tmp == 0) {</div><div class='add'>+		ret = DVB_CA_EN50221_POLL_CAM_PRESENT;</div><div class='add'>+		if (time_after(jiffies, state-&gt;ci_cam_ready))</div><div class='add'>+			ret |= DVB_CA_EN50221_POLL_CAM_READY;</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 anysee_ci_init(struct dvb_usb_device *d)</div><div class='add'>+{</div><div class='add'>+	struct anysee_state *state = d-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	state-&gt;ci.owner               = THIS_MODULE;</div><div class='add'>+	state-&gt;ci.read_attribute_mem  = anysee_ci_read_attribute_mem;</div><div class='add'>+	state-&gt;ci.write_attribute_mem = anysee_ci_write_attribute_mem;</div><div class='add'>+	state-&gt;ci.read_cam_control    = anysee_ci_read_cam_control;</div><div class='add'>+	state-&gt;ci.write_cam_control   = anysee_ci_write_cam_control;</div><div class='add'>+	state-&gt;ci.slot_reset          = anysee_ci_slot_reset;</div><div class='add'>+	state-&gt;ci.slot_shutdown       = anysee_ci_slot_shutdown;</div><div class='add'>+	state-&gt;ci.slot_ts_enable      = anysee_ci_slot_ts_enable;</div><div class='add'>+	state-&gt;ci.poll_slot_status    = anysee_ci_poll_slot_status;</div><div class='add'>+	state-&gt;ci.data                = d;</div><div class='add'>+</div><div class='add'>+	ret = anysee_wr_reg_mask(d, REG_IOA, (1 &lt;&lt; 7), 0x80);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = dvb_ca_en50221_init(&amp;d-&gt;adapter[0].dvb_adap, &amp;state-&gt;ci, 0, 1);</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 anysee_ci_release(struct dvb_usb_device *d)</div><div class='add'>+{</div><div class='add'>+	struct anysee_state *state = d-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* detach CI */</div><div class='add'>+	if (state-&gt;has_ci)</div><div class='add'>+		dvb_ca_en50221_release(&amp;state-&gt;ci);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int anysee_init(struct dvb_usb_device *d)</div><div class='add'>+{</div><div class='add'>+	struct anysee_state *state = d-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* LED light */</div><div class='add'>+	ret = anysee_led_ctrl(d, 0x01, 0x03);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* enable IR */</div><div class='add'>+	ret = anysee_ir_ctrl(d, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* attach CI */</div><div class='add'>+	if (state-&gt;has_ci) {</div><div class='add'>+		ret = anysee_ci_init(d);</div><div class='add'>+		if (ret) {</div><div class='add'>+			state-&gt;has_ci = false;</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'> /* DVB USB Driver stuff */</div><div class='ctx'> static struct dvb_usb_device_properties anysee_properties;</div><div class='ctx'> </div><div class='hunk'>@@ -1010,6 +1275,16 @@ static int anysee_probe(struct usb_interface *intf,</div><div class='ctx'> 	return anysee_init(d);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void anysee_disconnect(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *d = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	anysee_ci_release(d);</div><div class='add'>+	dvb_usb_device_exit(intf);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct usb_device_id anysee_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(USB_VID_CYPRESS, USB_PID_ANYSEE) },</div><div class='ctx'> 	{ USB_DEVICE(USB_VID_AMT,     USB_PID_ANYSEE) },</div><div class='hunk'>@@ -1029,7 +1304,7 @@ static struct dvb_usb_device_properties anysee_properties = {</div><div class='ctx'> 		{</div><div class='ctx'> 		.num_frontends    = 2,</div><div class='ctx'> 		.frontend_ctrl    = anysee_frontend_ctrl,</div><div class='del'>-		.fe = {{</div><div class='add'>+		.fe = { {</div><div class='ctx'> 			.streaming_ctrl   = anysee_streaming_ctrl,</div><div class='ctx'> 			.frontend_attach  = anysee_frontend_attach,</div><div class='ctx'> 			.tuner_attach     = anysee_tuner_attach,</div><div class='hunk'>@@ -1057,7 +1332,7 @@ static struct dvb_usb_device_properties anysee_properties = {</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'> 	},</div><div class='ctx'> </div><div class='hunk'>@@ -1087,30 +1362,11 @@ static struct dvb_usb_device_properties anysee_properties = {</div><div class='ctx'> static struct usb_driver anysee_driver = {</div><div class='ctx'> 	.name       = "dvb_usb_anysee",</div><div class='ctx'> 	.probe      = anysee_probe,</div><div class='del'>-	.disconnect = dvb_usb_device_exit,</div><div class='add'>+	.disconnect = anysee_disconnect,</div><div class='ctx'> 	.id_table   = anysee_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init anysee_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = usb_register(&amp;anysee_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		err("%s: usb_register failed. Error number %d", __func__, ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit anysee_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;anysee_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(anysee_module_init);</div><div class='del'>-module_exit(anysee_module_exit);</div><div class='add'>+module_usb_driver(anysee_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Antti Palosaari &lt;crope@iki.fi&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver Anysee E30 DVB-C &amp; DVB-T USB2.0");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/anysee.h b/drivers/media/dvb/dvb-usb/anysee.h<br/>index 57ee500b8c0e..8ac879431540 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/anysee.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/anysee.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/anysee.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/anysee.h</a></div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'> </div><div class='ctx'> #define DVB_USB_LOG_PREFIX "anysee"</div><div class='ctx'> #include "dvb-usb.h"</div><div class='add'>+#include "dvb_ca_en50221.h"</div><div class='ctx'> </div><div class='ctx'> #define deb_info(args...) dprintk(dvb_usb_anysee_debug, 0x01, args)</div><div class='ctx'> #define deb_xfer(args...) dprintk(dvb_usb_anysee_debug, 0x02, args)</div><div class='hunk'>@@ -54,12 +55,16 @@ enum cmd {</div><div class='ctx'> 	CMD_GET_IR_CODE         = 0x41,</div><div class='ctx'> 	CMD_GET_HW_INFO         = 0x19,</div><div class='ctx'> 	CMD_SMARTCARD           = 0x34,</div><div class='add'>+	CMD_CI                  = 0x37,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct anysee_state {</div><div class='ctx'> 	u8 hw; /* PCB ID */</div><div class='ctx'> 	u8 seq;</div><div class='ctx'> 	u8 fe_id:1; /* frondend ID */</div><div class='add'>+	u8 has_ci:1;</div><div class='add'>+	struct dvb_ca_en50221 ci;</div><div class='add'>+	unsigned long ci_cam_ready; /* jiffies */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define ANYSEE_HW_507T    2 /* E30 */</div><div class='hunk'>@@ -69,6 +74,7 @@ struct anysee_state {</div><div class='ctx'> #define ANYSEE_HW_507FA  15 /* E30 Combo Plus / E30 C Plus */</div><div class='ctx'> #define ANYSEE_HW_508TC  18 /* E7 TC */</div><div class='ctx'> #define ANYSEE_HW_508S2  19 /* E7 S2 */</div><div class='add'>+#define ANYSEE_HW_508T2C 20 /* E7 T2C */</div><div class='ctx'> #define ANYSEE_HW_508PTC 21 /* E7 PTC Plus */</div><div class='ctx'> #define ANYSEE_HW_508PS2 22 /* E7 PS2 Plus */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/au6610.c b/drivers/media/dvb/dvb-usb/au6610.c<br/>index b77994967b9b..16210c060302 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/au6610.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/au6610.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/au6610.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/au6610.c</a></div><div class='hunk'>@@ -244,26 +244,7 @@ static struct usb_driver au6610_driver = {</div><div class='ctx'> 	.id_table   = au6610_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init au6610_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = usb_register(&amp;au6610_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		err("usb_register failed. Error number %d", ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit au6610_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;au6610_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(au6610_module_init);</div><div class='del'>-module_exit(au6610_module_exit);</div><div class='add'>+module_usb_driver(au6610_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Antti Palosaari &lt;crope@iki.fi&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for Alcor Micro AU6610 DVB-T USB2.0");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/az6027.c b/drivers/media/dvb/dvb-usb/az6027.c<br/>index bf67b4dfd82b..5e45ae605427 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/az6027.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/az6027.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/az6027.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/az6027.c</a></div><div class='hunk'>@@ -1174,28 +1174,7 @@ static struct usb_driver az6027_usb_driver = {</div><div class='ctx'> 	.id_table 	= az6027_usb_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init az6027_usb_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	result = usb_register(&amp;az6027_usb_driver);</div><div class='del'>-	if (result) {</div><div class='del'>-		err("usb_register failed. (%d)", result);</div><div class='del'>-		return result;</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 az6027_usb_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;az6027_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(az6027_usb_module_init);</div><div class='del'>-module_exit(az6027_usb_module_exit);</div><div class='add'>+module_usb_driver(az6027_usb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Adams Xu &lt;Adams.xu@azwave.com.cn&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for AZUREWAVE DVB-S/S2 USB2.0 (AZ6027)");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/ce6230.c b/drivers/media/dvb/dvb-usb/ce6230.c<br/>index 57afb5a9157e..fa637255729c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/ce6230.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/ce6230.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/ce6230.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/ce6230.c</a></div><div class='hunk'>@@ -317,27 +317,7 @@ static struct usb_driver ce6230_driver = {</div><div class='ctx'> 	.id_table   = ce6230_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init ce6230_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	deb_info("%s:\n", __func__);</div><div class='del'>-	ret = usb_register(&amp;ce6230_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		err("usb_register failed with error:%d", ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ce6230_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	deb_info("%s:\n", __func__);</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;ce6230_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ce6230_module_init);</div><div class='del'>-module_exit(ce6230_module_exit);</div><div class='add'>+module_usb_driver(ce6230_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Antti Palosaari &lt;crope@iki.fi&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for Intel CE6230 DVB-T USB2.0");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/cinergyT2-core.c b/drivers/media/dvb/dvb-usb/cinergyT2-core.c<br/>index f9d905002ec9..0a98548ecd17 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/cinergyT2-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/cinergyT2-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/cinergyT2-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/cinergyT2-core.c</a></div><div class='hunk'>@@ -247,25 +247,7 @@ static struct usb_driver cinergyt2_driver = {</div><div class='ctx'> 	.id_table	= cinergyt2_usb_table</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init cinergyt2_usb_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = usb_register(&amp;cinergyt2_driver);</div><div class='del'>-	if (err) {</div><div class='del'>-		err("usb_register() failed! (err %i)\n", err);</div><div class='del'>-		return err;</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 cinergyt2_usb_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;cinergyt2_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(cinergyt2_usb_init);</div><div class='del'>-module_exit(cinergyt2_usb_exit);</div><div class='add'>+module_usb_driver(cinergyt2_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Terratec Cinergy T2 DVB-T driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/cinergyT2-fe.c b/drivers/media/dvb/dvb-usb/cinergyT2-fe.c<br/>index 9cd51ac12076..8a57ed8272de 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/cinergyT2-fe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/cinergyT2-fe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/cinergyT2-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/cinergyT2-fe.c</a></div><div class='hunk'>@@ -40,9 +40,8 @@</div><div class='ctx'>  *  We replace errornous fields by default TPS fields (the ones with value 0).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static uint16_t compute_tps(struct dvb_frontend_parameters *p)</div><div class='add'>+static uint16_t compute_tps(struct dtv_frontend_properties *op)</div><div class='ctx'> {</div><div class='del'>-	struct dvb_ofdm_parameters *op = &amp;p-&gt;u.ofdm;</div><div class='ctx'> 	uint16_t tps = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (op-&gt;code_rate_HP) {</div><div class='hunk'>@@ -83,7 +82,7 @@ static uint16_t compute_tps(struct dvb_frontend_parameters *p)</div><div class='ctx'> 		/* tps |= (0 &lt;&lt; 4) */;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (op-&gt;constellation) {</div><div class='add'>+	switch (op-&gt;modulation) {</div><div class='ctx'> 	case QAM_16:</div><div class='ctx'> 		tps |= (1 &lt;&lt; 13);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -119,7 +118,7 @@ static uint16_t compute_tps(struct dvb_frontend_parameters *p)</div><div class='ctx'> 		/* tps |= (0 &lt;&lt; 2) */;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (op-&gt;hierarchy_information) {</div><div class='add'>+	switch (op-&gt;hierarchy) {</div><div class='ctx'> 	case HIERARCHY_1:</div><div class='ctx'> 		tps |= (1 &lt;&lt; 10);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -263,9 +262,9 @@ static int cinergyt2_fe_get_tune_settings(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-				  struct dvb_frontend_parameters *fep)</div><div class='add'>+static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fep = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct cinergyt2_fe_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct dvbt_set_parameters_msg param;</div><div class='ctx'> 	char result[2];</div><div class='hunk'>@@ -274,9 +273,20 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;</div><div class='ctx'> 	param.tps = cpu_to_le16(compute_tps(fep));</div><div class='ctx'> 	param.freq = cpu_to_le32(fep-&gt;frequency / 1000);</div><div class='del'>-	param.bandwidth = 8 - fep-&gt;u.ofdm.bandwidth - BANDWIDTH_8_MHZ;</div><div class='ctx'> 	param.flags = 0;</div><div class='ctx'> </div><div class='add'>+	switch (fep-&gt;bandwidth_hz) {</div><div class='add'>+	case 8000000:</div><div class='add'>+		param.bandwidth = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 7000000:</div><div class='add'>+		param.bandwidth = 1;</div><div class='add'>+		break;</div><div class='add'>+	case 6000000:</div><div class='add'>+		param.bandwidth = 2;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = dvb_usb_generic_rw(state-&gt;d,</div><div class='ctx'> 			(char *)&amp;param, sizeof(param),</div><div class='ctx'> 			result, sizeof(result), 0);</div><div class='hunk'>@@ -286,12 +296,6 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	return (err &lt; 0) ? err : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cinergyt2_fe_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-				  struct dvb_frontend_parameters *fep)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void cinergyt2_fe_release(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct cinergyt2_fe_state *state = fe-&gt;demodulator_priv;</div><div class='hunk'>@@ -316,9 +320,9 @@ struct dvb_frontend *cinergyt2_fe_attach(struct dvb_usb_device *d)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops cinergyt2_fe_ops = {</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= DRIVER_NAME,</div><div class='del'>-		.type			= FE_OFDM,</div><div class='ctx'> 		.frequency_min		= 174000000,</div><div class='ctx'> 		.frequency_max		= 862000000,</div><div class='ctx'> 		.frequency_stepsize	= 166667,</div><div class='hunk'>@@ -341,7 +345,6 @@ static struct dvb_frontend_ops cinergyt2_fe_ops = {</div><div class='ctx'> 	.sleep			= cinergyt2_fe_sleep,</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend		= cinergyt2_fe_set_frontend,</div><div class='del'>-	.get_frontend		= cinergyt2_fe_get_frontend,</div><div class='ctx'> 	.get_tune_settings	= cinergyt2_fe_get_tune_settings,</div><div class='ctx'> </div><div class='ctx'> 	.read_status		= cinergyt2_fe_read_status,</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c<br/>index 9f2a02c48377..3940bb0f9ef6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/cxusb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/cxusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/cxusb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/cxusb.c</a></div><div class='hunk'>@@ -1067,18 +1067,17 @@ static struct dib0070_config dib7070p_dib0070_config = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dib0700_adapter_state {</div><div class='del'>-	int (*set_param_save) (struct dvb_frontend *,</div><div class='del'>-			       struct dvb_frontend_parameters *);</div><div class='add'>+	int (*set_param_save) (struct dvb_frontend *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int dib7070_set_param_override(struct dvb_frontend *fe,</div><div class='del'>-				      struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dib7070_set_param_override(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dvb_usb_adapter *adap = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	struct dib0700_adapter_state *state = adap-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	u16 offset;</div><div class='del'>-	u8 band = BAND_OF_FREQUENCY(fep-&gt;frequency/1000);</div><div class='add'>+	u8 band = BAND_OF_FREQUENCY(p-&gt;frequency/1000);</div><div class='ctx'> 	switch (band) {</div><div class='ctx'> 	case BAND_VHF: offset = 950; break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1087,7 +1086,7 @@ static int dib7070_set_param_override(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe));</div><div class='ctx'> </div><div class='del'>-	return state-&gt;set_param_save(fe, fep);</div><div class='add'>+	return state-&gt;set_param_save(fe);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cxusb_dualdig4_rev2_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='hunk'>@@ -2034,26 +2033,7 @@ static struct usb_driver cxusb_driver = {</div><div class='ctx'> 	.id_table	= cxusb_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init cxusb_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	if ((result = usb_register(&amp;cxusb_driver))) {</div><div class='del'>-		err("usb_register failed. Error number %d",result);</div><div class='del'>-		return result;</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 cxusb_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;cxusb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init (cxusb_module_init);</div><div class='del'>-module_exit (cxusb_module_exit);</div><div class='add'>+module_usb_driver(cxusb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Patrick Boettcher &lt;patrick.boettcher@desy.de&gt;");</div><div class='ctx'> MODULE_AUTHOR("Michael Krufky &lt;mkrufky@linuxtv.org&gt;");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dib0700.h b/drivers/media/dvb/dvb-usb/dib0700.h<br/>index 9bd6d51b3b93..7de125c0b36f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dib0700.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dib0700.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dib0700.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/dib0700.h</a></div><div class='hunk'>@@ -48,6 +48,8 @@ struct dib0700_state {</div><div class='ctx'> 	u8 disable_streaming_master_mode;</div><div class='ctx'> 	u32 fw_version;</div><div class='ctx'> 	u32 nb_packet_buffer_size;</div><div class='add'>+	int (*read_status)(struct dvb_frontend *, fe_status_t *);</div><div class='add'>+	int (*sleep)(struct dvb_frontend* fe);</div><div class='ctx'> 	u8 buf[255];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c<br/>index 156cbfc9c79d..070e82aa53f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dib0700_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dib0700_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dib0700_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/dib0700_core.c</a></div><div class='hunk'>@@ -832,28 +832,9 @@ static struct usb_driver dib0700_driver = {</div><div class='ctx'> 	.id_table   = dib0700_usb_id_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init dib0700_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	info("loaded with support for %d different device-types", dib0700_device_count);</div><div class='del'>-	if ((result = usb_register(&amp;dib0700_driver))) {</div><div class='del'>-		err("usb_register failed. Error number %d",result);</div><div class='del'>-		return result;</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 dib0700_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;dib0700_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init (dib0700_module_init);</div><div class='del'>-module_exit (dib0700_module_exit);</div><div class='add'>+module_usb_driver(dib0700_driver);</div><div class='ctx'> </div><div class='add'>+MODULE_FIRMWARE("dvb-usb-dib0700-1.20.fw");</div><div class='ctx'> MODULE_AUTHOR("Patrick Boettcher &lt;pboettcher@dibcom.fr&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for devices based on DiBcom DiB0700 - USB bridge");</div><div class='ctx'> MODULE_VERSION("1.0");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c<br/>index f313182eb9d5..f9e966aa26e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dib0700_devices.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dib0700_devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dib0700_devices.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/dib0700_devices.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@ MODULE_PARM_DESC(force_lna_activation, "force the activation of Low-Noise-Amplif</div><div class='ctx'> 		"if applicable for the device (default: 0=automatic/off).");</div><div class='ctx'> </div><div class='ctx'> struct dib0700_adapter_state {</div><div class='del'>-	int (*set_param_save) (struct dvb_frontend *, struct dvb_frontend_parameters *);</div><div class='add'>+	int (*set_param_save) (struct dvb_frontend *);</div><div class='ctx'> 	const struct firmware *frontend_firmware;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -804,13 +804,14 @@ static struct dib0070_config dib7770p_dib0070_config = {</div><div class='ctx'> 	 .charge_pump = 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int dib7070_set_param_override(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dib7070_set_param_override(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dvb_usb_adapter *adap = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	struct dib0700_adapter_state *state = adap-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	u16 offset;</div><div class='del'>-	u8 band = BAND_OF_FREQUENCY(fep-&gt;frequency/1000);</div><div class='add'>+	u8 band = BAND_OF_FREQUENCY(p-&gt;frequency/1000);</div><div class='ctx'> 	switch (band) {</div><div class='ctx'> 		case BAND_VHF: offset = 950; break;</div><div class='ctx'> 		case BAND_UHF:</div><div class='hunk'>@@ -818,17 +819,17 @@ static int dib7070_set_param_override(struct dvb_frontend *fe, struct dvb_fronte</div><div class='ctx'> 	}</div><div class='ctx'> 	deb_info("WBD for DiB7000P: %d\n", offset + dib0070_wbd_offset(fe));</div><div class='ctx'> 	dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe));</div><div class='del'>-	return state-&gt;set_param_save(fe, fep);</div><div class='add'>+	return state-&gt;set_param_save(fe);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib7770_set_param_override(struct dvb_frontend *fe,</div><div class='del'>-		struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dib7770_set_param_override(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='del'>-	 struct dvb_usb_adapter *adap = fe-&gt;dvb-&gt;priv;</div><div class='del'>-	 struct dib0700_adapter_state *state = adap-&gt;priv;</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	struct dvb_usb_adapter *adap = fe-&gt;dvb-&gt;priv;</div><div class='add'>+	struct dib0700_adapter_state *state = adap-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	 u16 offset;</div><div class='del'>-	 u8 band = BAND_OF_FREQUENCY(fep-&gt;frequency/1000);</div><div class='add'>+	 u8 band = BAND_OF_FREQUENCY(p-&gt;frequency/1000);</div><div class='ctx'> 	 switch (band) {</div><div class='ctx'> 	 case BAND_VHF:</div><div class='ctx'> 		  dib7000p_set_gpio(fe, 0, 0, 1);</div><div class='hunk'>@@ -842,7 +843,7 @@ static int dib7770_set_param_override(struct dvb_frontend *fe,</div><div class='ctx'> 	 }</div><div class='ctx'> 	 deb_info("WBD for DiB7000P: %d\n", offset + dib0070_wbd_offset(fe));</div><div class='ctx'> 	 dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe));</div><div class='del'>-	 return state-&gt;set_param_save(fe, fep);</div><div class='add'>+	 return state-&gt;set_param_save(fe);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dib7770p_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='hunk'>@@ -1205,14 +1206,14 @@ static struct dib0070_config dib807x_dib0070_config[2] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int dib807x_set_param_override(struct dvb_frontend *fe,</div><div class='del'>-		struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dib807x_set_param_override(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dvb_usb_adapter *adap = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	struct dib0700_adapter_state *state = adap-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	u16 offset = dib0070_wbd_offset(fe);</div><div class='del'>-	u8 band = BAND_OF_FREQUENCY(fep-&gt;frequency/1000);</div><div class='add'>+	u8 band = BAND_OF_FREQUENCY(p-&gt;frequency/1000);</div><div class='ctx'> 	switch (band) {</div><div class='ctx'> 	case BAND_VHF:</div><div class='ctx'> 		offset += 750;</div><div class='hunk'>@@ -1224,7 +1225,7 @@ static int dib807x_set_param_override(struct dvb_frontend *fe,</div><div class='ctx'> 	deb_info("WBD for DiB8000: %d\n", offset);</div><div class='ctx'> 	dib8000_set_wbd_ref(fe, offset);</div><div class='ctx'> </div><div class='del'>-	return state-&gt;set_param_save(fe, fep);</div><div class='add'>+	return state-&gt;set_param_save(fe);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dib807x_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='hunk'>@@ -1279,7 +1280,7 @@ static int stk807x_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	dib0700_set_gpio(adap-&gt;dev, GPIO0, GPIO_OUT, 1);</div><div class='ctx'> </div><div class='ctx'> 	dib8000_i2c_enumeration(&amp;adap-&gt;dev-&gt;i2c_adap, 1, 18,</div><div class='del'>-				0x80);</div><div class='add'>+				0x80, 0);</div><div class='ctx'> </div><div class='ctx'> 	adap-&gt;fe_adap[0].fe = dvb_attach(dib8000_attach, &amp;adap-&gt;dev-&gt;i2c_adap, 0x80,</div><div class='ctx'> 			      &amp;dib807x_dib8000_config[0]);</div><div class='hunk'>@@ -1308,7 +1309,7 @@ static int stk807xpvr_frontend_attach0(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	dib0700_set_gpio(adap-&gt;dev, GPIO0, GPIO_OUT, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* initialize IC 0 */</div><div class='del'>-	dib8000_i2c_enumeration(&amp;adap-&gt;dev-&gt;i2c_adap, 1, 0x22, 0x80);</div><div class='add'>+	dib8000_i2c_enumeration(&amp;adap-&gt;dev-&gt;i2c_adap, 1, 0x22, 0x80, 0);</div><div class='ctx'> </div><div class='ctx'> 	adap-&gt;fe_adap[0].fe = dvb_attach(dib8000_attach, &amp;adap-&gt;dev-&gt;i2c_adap, 0x80,</div><div class='ctx'> 			      &amp;dib807x_dib8000_config[0]);</div><div class='hunk'>@@ -1319,7 +1320,7 @@ static int stk807xpvr_frontend_attach0(struct dvb_usb_adapter *adap)</div><div class='ctx'> static int stk807xpvr_frontend_attach1(struct dvb_usb_adapter *adap)</div><div class='ctx'> {</div><div class='ctx'> 	/* initialize IC 1 */</div><div class='del'>-	dib8000_i2c_enumeration(&amp;adap-&gt;dev-&gt;i2c_adap, 1, 0x12, 0x82);</div><div class='add'>+	dib8000_i2c_enumeration(&amp;adap-&gt;dev-&gt;i2c_adap, 1, 0x12, 0x82, 0);</div><div class='ctx'> </div><div class='ctx'> 	adap-&gt;fe_adap[0].fe = dvb_attach(dib8000_attach, &amp;adap-&gt;dev-&gt;i2c_adap, 0x82,</div><div class='ctx'> 			      &amp;dib807x_dib8000_config[1]);</div><div class='hunk'>@@ -1328,7 +1329,7 @@ static int stk807xpvr_frontend_attach1(struct dvb_usb_adapter *adap)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* STK8096GP */</div><div class='del'>-struct dibx000_agc_config dib8090_agc_config[2] = {</div><div class='add'>+static struct dibx000_agc_config dib8090_agc_config[2] = {</div><div class='ctx'> 	{</div><div class='ctx'> 	BAND_UHF | BAND_VHF | BAND_LBAND | BAND_SBAND,</div><div class='ctx'> 	/* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=1,</div><div class='hunk'>@@ -1503,22 +1504,22 @@ static struct dib0090_config dib809x_dib0090_config = {</div><div class='ctx'> 	.fref_clock_ratio = 6,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int dib8096_set_param_override(struct dvb_frontend *fe,</div><div class='del'>-		struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dib8096_set_param_override(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dvb_usb_adapter *adap = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	struct dib0700_adapter_state *state = adap-&gt;priv;</div><div class='del'>-	u8 band = BAND_OF_FREQUENCY(fep-&gt;frequency/1000);</div><div class='add'>+	u8 band = BAND_OF_FREQUENCY(p-&gt;frequency/1000);</div><div class='ctx'> 	u16 target;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	enum frontend_tune_state tune_state = CT_SHUTDOWN;</div><div class='ctx'> 	u16 ltgain, rf_gain_limit;</div><div class='ctx'> </div><div class='del'>-	ret = state-&gt;set_param_save(fe, fep);</div><div class='add'>+	ret = state-&gt;set_param_save(fe);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	target = (dib0090_get_wbd_offset(fe) * 8 * 18 / 33 + 1) / 2;</div><div class='add'>+	target = (dib0090_get_wbd_target(fe) * 8 * 18 / 33 + 1) / 2;</div><div class='ctx'> 	dib8000_set_wbd_ref(fe, target);</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1578,7 +1579,7 @@ static int stk809x_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	msleep(10);</div><div class='ctx'> 	dib0700_set_gpio(adap-&gt;dev, GPIO0, GPIO_OUT, 1);</div><div class='ctx'> </div><div class='del'>-	dib8000_i2c_enumeration(&amp;adap-&gt;dev-&gt;i2c_adap, 1, 18, 0x80);</div><div class='add'>+	dib8000_i2c_enumeration(&amp;adap-&gt;dev-&gt;i2c_adap, 1, 18, 0x80, 0);</div><div class='ctx'> </div><div class='ctx'> 	adap-&gt;fe_adap[0].fe = dvb_attach(dib8000_attach, &amp;adap-&gt;dev-&gt;i2c_adap, 0x80, &amp;dib809x_dib8000_config[0]);</div><div class='ctx'> </div><div class='hunk'>@@ -1629,7 +1630,7 @@ static int nim8096md_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	msleep(20);</div><div class='ctx'> 	dib0700_set_gpio(adap-&gt;dev, GPIO0, GPIO_OUT, 1);</div><div class='ctx'> </div><div class='del'>-	dib8000_i2c_enumeration(&amp;adap-&gt;dev-&gt;i2c_adap, 2, 18, 0x80);</div><div class='add'>+	dib8000_i2c_enumeration(&amp;adap-&gt;dev-&gt;i2c_adap, 2, 18, 0x80, 0);</div><div class='ctx'> </div><div class='ctx'> 	adap-&gt;fe_adap[0].fe = dvb_attach(dib8000_attach, &amp;adap-&gt;dev-&gt;i2c_adap, 0x80, &amp;dib809x_dib8000_config[0]);</div><div class='ctx'> 	if (adap-&gt;fe_adap[0].fe == NULL)</div><div class='hunk'>@@ -1641,6 +1642,261 @@ static int nim8096md_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	return fe_slave == NULL ?  -ENODEV : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* TFE8096P */</div><div class='add'>+static struct dibx000_agc_config dib8096p_agc_config[2] = {</div><div class='add'>+	{</div><div class='add'>+		.band_caps		= BAND_UHF,</div><div class='add'>+		/* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0,</div><div class='add'>+		   P_agc_freq_pwm_div=1, P_agc_inv_pwm1=0,</div><div class='add'>+		   P_agc_inv_pwm2=0, P_agc_inh_dc_rv_est=0,</div><div class='add'>+		   P_agc_time_est=3, P_agc_freeze=0, P_agc_nb_est=5,</div><div class='add'>+		   P_agc_write=0 */</div><div class='add'>+		.setup			= (0 &lt;&lt; 15) | (0 &lt;&lt; 14) | (5 &lt;&lt; 11)</div><div class='add'>+			| (0 &lt;&lt; 10) | (0 &lt;&lt; 9) | (0 &lt;&lt; 8) | (3 &lt;&lt; 5)</div><div class='add'>+			| (0 &lt;&lt; 4) | (5 &lt;&lt; 1) | (0 &lt;&lt; 0),</div><div class='add'>+</div><div class='add'>+		.inv_gain		= 684,</div><div class='add'>+		.time_stabiliz	= 10,</div><div class='add'>+</div><div class='add'>+		.alpha_level	= 0,</div><div class='add'>+		.thlock			= 118,</div><div class='add'>+</div><div class='add'>+		.wbd_inv		= 0,</div><div class='add'>+		.wbd_ref		= 1200,</div><div class='add'>+		.wbd_sel		= 3,</div><div class='add'>+		.wbd_alpha		= 5,</div><div class='add'>+</div><div class='add'>+		.agc1_max		= 65535,</div><div class='add'>+		.agc1_min		= 0,</div><div class='add'>+</div><div class='add'>+		.agc2_max		= 32767,</div><div class='add'>+		.agc2_min		= 0,</div><div class='add'>+</div><div class='add'>+		.agc1_pt1		= 0,</div><div class='add'>+		.agc1_pt2		= 0,</div><div class='add'>+		.agc1_pt3		= 105,</div><div class='add'>+		.agc1_slope1	= 0,</div><div class='add'>+		.agc1_slope2	= 156,</div><div class='add'>+		.agc2_pt1		= 105,</div><div class='add'>+		.agc2_pt2		= 255,</div><div class='add'>+		.agc2_slope1	= 54,</div><div class='add'>+		.agc2_slope2	= 0,</div><div class='add'>+</div><div class='add'>+		.alpha_mant		= 28,</div><div class='add'>+		.alpha_exp		= 26,</div><div class='add'>+		.beta_mant		= 31,</div><div class='add'>+		.beta_exp		= 51,</div><div class='add'>+</div><div class='add'>+		.perform_agc_softsplit = 0,</div><div class='add'>+	} , {</div><div class='add'>+		.band_caps		= BAND_FM | BAND_VHF | BAND_CBAND,</div><div class='add'>+		/* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0,</div><div class='add'>+		   P_agc_freq_pwm_div=1, P_agc_inv_pwm1=0,</div><div class='add'>+		   P_agc_inv_pwm2=0, P_agc_inh_dc_rv_est=0,</div><div class='add'>+		   P_agc_time_est=3, P_agc_freeze=0, P_agc_nb_est=5,</div><div class='add'>+		   P_agc_write=0 */</div><div class='add'>+		.setup			= (0 &lt;&lt; 15) | (0 &lt;&lt; 14) | (5 &lt;&lt; 11)</div><div class='add'>+			| (0 &lt;&lt; 10) | (0 &lt;&lt; 9) | (0 &lt;&lt; 8) | (3 &lt;&lt; 5)</div><div class='add'>+			| (0 &lt;&lt; 4) | (5 &lt;&lt; 1) | (0 &lt;&lt; 0),</div><div class='add'>+</div><div class='add'>+		.inv_gain		= 732,</div><div class='add'>+		.time_stabiliz  = 10,</div><div class='add'>+</div><div class='add'>+		.alpha_level	= 0,</div><div class='add'>+		.thlock			= 118,</div><div class='add'>+</div><div class='add'>+		.wbd_inv		= 0,</div><div class='add'>+		.wbd_ref		= 1200,</div><div class='add'>+		.wbd_sel		= 3,</div><div class='add'>+		.wbd_alpha		= 5,</div><div class='add'>+</div><div class='add'>+		.agc1_max		= 65535,</div><div class='add'>+		.agc1_min		= 0,</div><div class='add'>+</div><div class='add'>+		.agc2_max		= 32767,</div><div class='add'>+		.agc2_min		= 0,</div><div class='add'>+</div><div class='add'>+		.agc1_pt1		= 0,</div><div class='add'>+		.agc1_pt2		= 0,</div><div class='add'>+		.agc1_pt3		= 98,</div><div class='add'>+		.agc1_slope1	= 0,</div><div class='add'>+		.agc1_slope2	= 167,</div><div class='add'>+		.agc2_pt1		= 98,</div><div class='add'>+		.agc2_pt2		= 255,</div><div class='add'>+		.agc2_slope1	= 52,</div><div class='add'>+		.agc2_slope2	= 0,</div><div class='add'>+</div><div class='add'>+		.alpha_mant		= 28,</div><div class='add'>+		.alpha_exp		= 26,</div><div class='add'>+		.beta_mant		= 31,</div><div class='add'>+		.beta_exp		= 51,</div><div class='add'>+</div><div class='add'>+		.perform_agc_softsplit = 0,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct dibx000_bandwidth_config dib8096p_clock_config_12_mhz = {</div><div class='add'>+	108000, 13500,</div><div class='add'>+	1, 9, 1, 0, 0,</div><div class='add'>+	0, 0, 0, 0, 2,</div><div class='add'>+	(3 &lt;&lt; 14) | (1 &lt;&lt; 12) | (524 &lt;&lt; 0),</div><div class='add'>+	(0 &lt;&lt; 25) | 0,</div><div class='add'>+	20199729,</div><div class='add'>+	12000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct dib8000_config tfe8096p_dib8000_config = {</div><div class='add'>+	.output_mpeg2_in_188_bytes	= 1,</div><div class='add'>+	.hostbus_diversity			= 1,</div><div class='add'>+	.update_lna					= NULL,</div><div class='add'>+</div><div class='add'>+	.agc_config_count			= 2,</div><div class='add'>+	.agc						= dib8096p_agc_config,</div><div class='add'>+	.pll						= &amp;dib8096p_clock_config_12_mhz,</div><div class='add'>+</div><div class='add'>+	.gpio_dir					= DIB8000_GPIO_DEFAULT_DIRECTIONS,</div><div class='add'>+	.gpio_val					= DIB8000_GPIO_DEFAULT_VALUES,</div><div class='add'>+	.gpio_pwm_pos				= DIB8000_GPIO_DEFAULT_PWM_POS,</div><div class='add'>+</div><div class='add'>+	.agc_control				= NULL,</div><div class='add'>+	.diversity_delay			= 48,</div><div class='add'>+	.output_mode				= OUTMODE_MPEG2_FIFO,</div><div class='add'>+	.enMpegOutput				= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct dib0090_wbd_slope dib8096p_wbd_table[] = {</div><div class='add'>+	{ 380, 81, 850, 64, 540, 4},</div><div class='add'>+	{ 860, 51, 866, 21, 375, 4},</div><div class='add'>+	{1700, 0, 250, 0, 100, 6},</div><div class='add'>+	{2600, 0, 250, 0, 100, 6},</div><div class='add'>+	{ 0xFFFF, 0, 0, 0, 0, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dib0090_config tfe8096p_dib0090_config = {</div><div class='add'>+	.io.clock_khz			= 12000,</div><div class='add'>+	.io.pll_bypass			= 0,</div><div class='add'>+	.io.pll_range			= 0,</div><div class='add'>+	.io.pll_prediv			= 3,</div><div class='add'>+	.io.pll_loopdiv			= 6,</div><div class='add'>+	.io.adc_clock_ratio		= 0,</div><div class='add'>+	.io.pll_int_loop_filt	= 0,</div><div class='add'>+	.reset					= dib8096p_tuner_sleep,</div><div class='add'>+	.sleep					= dib8096p_tuner_sleep,</div><div class='add'>+</div><div class='add'>+	.freq_offset_khz_uhf	= -143,</div><div class='add'>+	.freq_offset_khz_vhf	= -143,</div><div class='add'>+</div><div class='add'>+	.get_adc_power			= dib8090_get_adc_power,</div><div class='add'>+</div><div class='add'>+	.clkouttobamse			= 1,</div><div class='add'>+	.analog_output			= 0,</div><div class='add'>+</div><div class='add'>+	.wbd_vhf_offset			= 0,</div><div class='add'>+	.wbd_cband_offset		= 0,</div><div class='add'>+	.use_pwm_agc			= 1,</div><div class='add'>+	.clkoutdrive			= 0,</div><div class='add'>+</div><div class='add'>+	.fref_clock_ratio		= 1,</div><div class='add'>+</div><div class='add'>+	.wbd					= dib8096p_wbd_table,</div><div class='add'>+</div><div class='add'>+	.ls_cfg_pad_drv			= 0,</div><div class='add'>+	.data_tx_drv			= 0,</div><div class='add'>+	.low_if					= NULL,</div><div class='add'>+	.in_soc					= 1,</div><div class='add'>+	.force_cband_input		= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dibx090p_adc {</div><div class='add'>+	u32 freq;			/* RF freq MHz */</div><div class='add'>+	u32 timf;			/* New Timf */</div><div class='add'>+	u32 pll_loopdiv;	/* New prediv */</div><div class='add'>+	u32 pll_prediv;		/* New loopdiv */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dibx090p_adc dib8090p_adc_tab[] = {</div><div class='add'>+	{ 50000, 17043521, 16, 3}, /* 64 MHz */</div><div class='add'>+	{878000, 20199729, 9, 1}, /* 60 MHz */</div><div class='add'>+	{0xffffffff, 0, 0, 0}, /* 60 MHz */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dib8096p_agc_startup(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	struct dvb_usb_adapter *adap = fe-&gt;dvb-&gt;priv;</div><div class='add'>+	struct dib0700_adapter_state *state = adap-&gt;priv;</div><div class='add'>+	struct dibx000_bandwidth_config pll;</div><div class='add'>+	u16 target;</div><div class='add'>+	int better_sampling_freq = 0, ret;</div><div class='add'>+	struct dibx090p_adc *adc_table = &amp;dib8090p_adc_tab[0];</div><div class='add'>+</div><div class='add'>+	ret = state-&gt;set_param_save(fe);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	memset(&amp;pll, 0, sizeof(struct dibx000_bandwidth_config));</div><div class='add'>+</div><div class='add'>+	dib0090_pwm_gain_reset(fe);</div><div class='add'>+	/* dib0090_get_wbd_target is returning any possible</div><div class='add'>+	   temperature compensated wbd-target */</div><div class='add'>+	target = (dib0090_get_wbd_target(fe) * 8  + 1) / 2;</div><div class='add'>+	dib8000_set_wbd_ref(fe, target);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	while (p-&gt;frequency / 1000 &gt; adc_table-&gt;freq) {</div><div class='add'>+		better_sampling_freq = 1;</div><div class='add'>+		adc_table++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((adc_table-&gt;freq != 0xffffffff) &amp;&amp; better_sampling_freq) {</div><div class='add'>+		pll.pll_ratio  = adc_table-&gt;pll_loopdiv;</div><div class='add'>+		pll.pll_prediv = adc_table-&gt;pll_prediv;</div><div class='add'>+		dib8000_update_pll(fe, &amp;pll);</div><div class='add'>+		dib8000_ctrl_timf(fe, DEMOD_TIMF_SET, adc_table-&gt;timf);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tfe8096p_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO6, GPIO_OUT, 1);</div><div class='add'>+	msleep(20);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO9, GPIO_OUT, 1);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO4, GPIO_OUT, 1);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO7, GPIO_OUT, 1);</div><div class='add'>+</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO10, GPIO_OUT, 0);</div><div class='add'>+</div><div class='add'>+	dib0700_ctrl_clock(adap-&gt;dev, 72, 1);</div><div class='add'>+</div><div class='add'>+	msleep(20);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO10, GPIO_OUT, 1);</div><div class='add'>+	msleep(20);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO0, GPIO_OUT, 1);</div><div class='add'>+</div><div class='add'>+	dib8000_i2c_enumeration(&amp;adap-&gt;dev-&gt;i2c_adap, 1, 0x10, 0x80, 1);</div><div class='add'>+</div><div class='add'>+	adap-&gt;fe_adap[0].fe = dvb_attach(dib8000_attach,</div><div class='add'>+			&amp;adap-&gt;dev-&gt;i2c_adap, 0x80, &amp;tfe8096p_dib8000_config);</div><div class='add'>+</div><div class='add'>+	return adap-&gt;fe_adap[0].fe == NULL ?  -ENODEV : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tfe8096p_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct dib0700_adapter_state *st = adap-&gt;priv;</div><div class='add'>+	struct i2c_adapter *tun_i2c = dib8096p_get_i2c_tuner(adap-&gt;fe_adap[0].fe);</div><div class='add'>+</div><div class='add'>+	if (dvb_attach(dib0090_register, adap-&gt;fe_adap[0].fe, tun_i2c,</div><div class='add'>+				&amp;tfe8096p_dib0090_config) == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	dib8000_set_gpio(adap-&gt;fe_adap[0].fe, 8, 0, 1);</div><div class='add'>+</div><div class='add'>+	st-&gt;set_param_save = adap-&gt;fe_adap[0].fe-&gt;ops.tuner_ops.set_params;</div><div class='add'>+	adap-&gt;fe_adap[0].fe-&gt;ops.tuner_ops.set_params = dib8096p_agc_startup;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* STK9090M */</div><div class='ctx'> static int dib90x0_pid_filter(struct dvb_usb_adapter *adapter, int index, u16 pid, int onoff)</div><div class='ctx'> {</div><div class='hunk'>@@ -1883,7 +2139,7 @@ static int dib9090_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	i2c = dib9000_get_i2c_master(adap-&gt;fe_adap[0].fe, DIBX000_I2C_INTERFACE_GPIO_1_2, 0);</div><div class='ctx'> 	if (dib01x0_pmu_update(i2c, data_dib190, 10) != 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	dib0700_set_i2c_speed(adap-&gt;dev, 2000);</div><div class='add'>+	dib0700_set_i2c_speed(adap-&gt;dev, 1500);</div><div class='ctx'> 	if (dib9000_firmware_post_pll_init(adap-&gt;fe_adap[0].fe) &lt; 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	release_firmware(state-&gt;frontend_firmware);</div><div class='hunk'>@@ -1962,7 +2218,8 @@ static int nim9090md_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	i2c = dib9000_get_i2c_master(adap-&gt;fe_adap[0].fe, DIBX000_I2C_INTERFACE_GPIO_1_2, 0);</div><div class='ctx'> 	if (dib01x0_pmu_update(i2c, data_dib190, 10) &lt; 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	dib0700_set_i2c_speed(adap-&gt;dev, 2000);</div><div class='add'>+</div><div class='add'>+	dib0700_set_i2c_speed(adap-&gt;dev, 1500);</div><div class='ctx'> 	if (dib9000_firmware_post_pll_init(adap-&gt;fe_adap[0].fe) &lt; 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='hunk'>@@ -1975,7 +2232,7 @@ static int nim9090md_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 		if (dvb_attach(dib0090_fw_register, fe_slave, i2c, &amp;nim9090md_dib0090_config[1]) == NULL)</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		fe_slave-&gt;dvb = adap-&gt;fe_adap[0].fe-&gt;dvb;</div><div class='del'>-		dib9000_fw_set_component_bus_speed(adap-&gt;fe_adap[0].fe, 2000);</div><div class='add'>+		dib9000_fw_set_component_bus_speed(adap-&gt;fe_adap[0].fe, 1500);</div><div class='ctx'> 		if (dib9000_firmware_post_pll_init(fe_slave) &lt; 0)</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2064,7 +2321,7 @@ static int dib7090p_get_best_sampling(struct dvb_frontend *fe , struct dib7090p_</div><div class='ctx'> 		return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib7090_agc_startup(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dib7090_agc_startup(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_usb_adapter *adap = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	struct dib0700_adapter_state *state = adap-&gt;priv;</div><div class='hunk'>@@ -2073,13 +2330,13 @@ static int dib7090_agc_startup(struct dvb_frontend *fe, struct dvb_frontend_para</div><div class='ctx'> 	struct dib7090p_best_adc adc;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = state-&gt;set_param_save(fe, fep);</div><div class='add'>+	ret = state-&gt;set_param_save(fe);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;pll, 0, sizeof(struct dibx000_bandwidth_config));</div><div class='ctx'> 	dib0090_pwm_gain_reset(fe);</div><div class='del'>-	target = (dib0090_get_wbd_offset(fe) * 8 + 1) / 2;</div><div class='add'>+	target = (dib0090_get_wbd_target(fe) * 8 + 1) / 2;</div><div class='ctx'> 	dib7000p_set_wbd_ref(fe, target);</div><div class='ctx'> </div><div class='ctx'> 	if (dib7090p_get_best_sampling(fe, &amp;adc) == 0) {</div><div class='hunk'>@@ -2092,6 +2349,49 @@ static int dib7090_agc_startup(struct dvb_frontend *fe, struct dvb_frontend_para</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dib7090_agc_restart(struct dvb_frontend *fe, u8 restart)</div><div class='add'>+{</div><div class='add'>+	deb_info("AGC restart callback: %d", restart);</div><div class='add'>+	if (restart == 0) /* before AGC startup */</div><div class='add'>+		dib0090_set_dc_servo(fe, 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dib7090e_update_lna(struct dvb_frontend *fe, u16 agc_global)</div><div class='add'>+{</div><div class='add'>+	u16 agc1 = 0, agc2, wbd = 0, wbd_target, wbd_offset, threshold_agc1;</div><div class='add'>+	s16 wbd_delta;</div><div class='add'>+</div><div class='add'>+	if ((fe-&gt;dtv_property_cache.frequency) &lt; 400000000)</div><div class='add'>+		threshold_agc1 = 25000;</div><div class='add'>+	else</div><div class='add'>+		threshold_agc1 = 30000;</div><div class='add'>+</div><div class='add'>+	wbd_target = (dib0090_get_wbd_target(fe)*8+1)/2;</div><div class='add'>+	wbd_offset = dib0090_get_wbd_offset(fe);</div><div class='add'>+	dib7000p_get_agc_values(fe, NULL, &amp;agc1, &amp;agc2, &amp;wbd);</div><div class='add'>+	wbd_delta = (s16)wbd - (((s16)wbd_offset+10)*4) ;</div><div class='add'>+</div><div class='add'>+	deb_info("update lna, agc_global=%d agc1=%d agc2=%d",</div><div class='add'>+			agc_global, agc1, agc2);</div><div class='add'>+	deb_info("update lna, wbd=%d wbd target=%d wbd offset=%d wbd delta=%d",</div><div class='add'>+			wbd, wbd_target, wbd_offset, wbd_delta);</div><div class='add'>+</div><div class='add'>+	if ((agc1 &lt; threshold_agc1) &amp;&amp; (wbd_delta &gt; 0)) {</div><div class='add'>+		dib0090_set_switch(fe, 1, 1, 1);</div><div class='add'>+		dib0090_set_vga(fe, 0);</div><div class='add'>+		dib0090_update_rframp_7090(fe, 0);</div><div class='add'>+		dib0090_update_tuning_table_7090(fe, 0);</div><div class='add'>+	} else {</div><div class='add'>+		dib0090_set_vga(fe, 1);</div><div class='add'>+		dib0090_update_rframp_7090(fe, 1);</div><div class='add'>+		dib0090_update_tuning_table_7090(fe, 1);</div><div class='add'>+		dib0090_set_switch(fe, 0, 0, 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='ctx'> static struct dib0090_wbd_slope dib7090_wbd_table[] = {</div><div class='ctx'> 	{ 380,   81, 850, 64, 540,  4},</div><div class='ctx'> 	{ 860,   51, 866, 21,  375, 4},</div><div class='hunk'>@@ -2100,7 +2400,16 @@ static struct dib0090_wbd_slope dib7090_wbd_table[] = {</div><div class='ctx'> 	{ 0xFFFF, 0,   0, 0,   0,   0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dibx000_agc_config dib7090_agc_config[2] = {</div><div class='add'>+static struct dib0090_wbd_slope dib7090e_wbd_table[] = {</div><div class='add'>+	{ 380,   81, 850, 64, 540,	4},</div><div class='add'>+	{ 700,   51, 866, 21,  320,	4},</div><div class='add'>+	{ 860,   48, 666, 18,  330,	6},</div><div class='add'>+	{1700,    0, 250, 0,   100, 6},</div><div class='add'>+	{2600,    0, 250, 0,   100, 6},</div><div class='add'>+	{ 0xFFFF, 0,   0, 0,   0,	0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct dibx000_agc_config dib7090_agc_config[2] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.band_caps      = BAND_UHF,</div><div class='ctx'> 		/* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=1, P_agc_inv_pwm1=0, P_agc_inv_pwm2=0,</div><div class='hunk'>@@ -2278,6 +2587,34 @@ static struct dib7000p_config tfe7090pvr_dib7000p_config[2] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct dib7000p_config tfe7090e_dib7000p_config = {</div><div class='add'>+	.output_mpeg2_in_188_bytes  = 1,</div><div class='add'>+	.hostbus_diversity			= 1,</div><div class='add'>+	.tuner_is_baseband			= 1,</div><div class='add'>+	.update_lna					= dib7090e_update_lna,</div><div class='add'>+</div><div class='add'>+	.agc_config_count			= 2,</div><div class='add'>+	.agc						= dib7090_agc_config,</div><div class='add'>+</div><div class='add'>+	.bw							= &amp;dib7090_clock_config_12_mhz,</div><div class='add'>+</div><div class='add'>+	.gpio_dir					= DIB7000P_GPIO_DEFAULT_DIRECTIONS,</div><div class='add'>+	.gpio_val					= DIB7000P_GPIO_DEFAULT_VALUES,</div><div class='add'>+	.gpio_pwm_pos				= DIB7000P_GPIO_DEFAULT_PWM_POS,</div><div class='add'>+</div><div class='add'>+	.pwm_freq_div				= 0,</div><div class='add'>+</div><div class='add'>+	.agc_control				= dib7090_agc_restart,</div><div class='add'>+</div><div class='add'>+	.spur_protect				= 0,</div><div class='add'>+	.disable_sample_and_hold	= 0,</div><div class='add'>+	.enable_current_mirror		= 0,</div><div class='add'>+	.diversity_delay			= 0,</div><div class='add'>+</div><div class='add'>+	.output_mode				= OUTMODE_MPEG2_FIFO,</div><div class='add'>+	.enMpegOutput				= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct dib0090_config nim7090_dib0090_config = {</div><div class='ctx'> 	.io.clock_khz = 12000,</div><div class='ctx'> 	.io.pll_bypass = 0,</div><div class='hunk'>@@ -2312,6 +2649,107 @@ static const struct dib0090_config nim7090_dib0090_config = {</div><div class='ctx'> 	.in_soc = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct dib0090_config tfe7090e_dib0090_config = {</div><div class='add'>+	.io.clock_khz = 12000,</div><div class='add'>+	.io.pll_bypass = 0,</div><div class='add'>+	.io.pll_range = 0,</div><div class='add'>+	.io.pll_prediv = 3,</div><div class='add'>+	.io.pll_loopdiv = 6,</div><div class='add'>+	.io.adc_clock_ratio = 0,</div><div class='add'>+	.io.pll_int_loop_filt = 0,</div><div class='add'>+	.reset = dib7090_tuner_sleep,</div><div class='add'>+	.sleep = dib7090_tuner_sleep,</div><div class='add'>+</div><div class='add'>+	.freq_offset_khz_uhf = 0,</div><div class='add'>+	.freq_offset_khz_vhf = 0,</div><div class='add'>+</div><div class='add'>+	.get_adc_power = dib7090_get_adc_power,</div><div class='add'>+</div><div class='add'>+	.clkouttobamse = 1,</div><div class='add'>+	.analog_output = 0,</div><div class='add'>+</div><div class='add'>+	.wbd_vhf_offset = 0,</div><div class='add'>+	.wbd_cband_offset = 0,</div><div class='add'>+	.use_pwm_agc = 1,</div><div class='add'>+	.clkoutdrive = 0,</div><div class='add'>+</div><div class='add'>+	.fref_clock_ratio = 0,</div><div class='add'>+</div><div class='add'>+	.wbd = dib7090e_wbd_table,</div><div class='add'>+</div><div class='add'>+	.ls_cfg_pad_drv = 0,</div><div class='add'>+	.data_tx_drv = 0,</div><div class='add'>+	.low_if = NULL,</div><div class='add'>+	.in_soc = 1,</div><div class='add'>+	.force_cband_input = 1,</div><div class='add'>+	.is_dib7090e = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct dib7000p_config tfe7790e_dib7000p_config = {</div><div class='add'>+	.output_mpeg2_in_188_bytes  = 1,</div><div class='add'>+	.hostbus_diversity			= 1,</div><div class='add'>+	.tuner_is_baseband			= 1,</div><div class='add'>+	.update_lna					= dib7090e_update_lna,</div><div class='add'>+</div><div class='add'>+	.agc_config_count			= 2,</div><div class='add'>+	.agc						= dib7090_agc_config,</div><div class='add'>+</div><div class='add'>+	.bw							= &amp;dib7090_clock_config_12_mhz,</div><div class='add'>+</div><div class='add'>+	.gpio_dir					= DIB7000P_GPIO_DEFAULT_DIRECTIONS,</div><div class='add'>+	.gpio_val					= DIB7000P_GPIO_DEFAULT_VALUES,</div><div class='add'>+	.gpio_pwm_pos				= DIB7000P_GPIO_DEFAULT_PWM_POS,</div><div class='add'>+</div><div class='add'>+	.pwm_freq_div				= 0,</div><div class='add'>+</div><div class='add'>+	.agc_control				= dib7090_agc_restart,</div><div class='add'>+</div><div class='add'>+	.spur_protect				= 0,</div><div class='add'>+	.disable_sample_and_hold	= 0,</div><div class='add'>+	.enable_current_mirror		= 0,</div><div class='add'>+	.diversity_delay			= 0,</div><div class='add'>+</div><div class='add'>+	.output_mode				= OUTMODE_MPEG2_PAR_GATED_CLK,</div><div class='add'>+	.enMpegOutput				= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dib0090_config tfe7790e_dib0090_config = {</div><div class='add'>+	.io.clock_khz = 12000,</div><div class='add'>+	.io.pll_bypass = 0,</div><div class='add'>+	.io.pll_range = 0,</div><div class='add'>+	.io.pll_prediv = 3,</div><div class='add'>+	.io.pll_loopdiv = 6,</div><div class='add'>+	.io.adc_clock_ratio = 0,</div><div class='add'>+	.io.pll_int_loop_filt = 0,</div><div class='add'>+	.reset = dib7090_tuner_sleep,</div><div class='add'>+	.sleep = dib7090_tuner_sleep,</div><div class='add'>+</div><div class='add'>+	.freq_offset_khz_uhf = 0,</div><div class='add'>+	.freq_offset_khz_vhf = 0,</div><div class='add'>+</div><div class='add'>+	.get_adc_power = dib7090_get_adc_power,</div><div class='add'>+</div><div class='add'>+	.clkouttobamse = 1,</div><div class='add'>+	.analog_output = 0,</div><div class='add'>+</div><div class='add'>+	.wbd_vhf_offset = 0,</div><div class='add'>+	.wbd_cband_offset = 0,</div><div class='add'>+	.use_pwm_agc = 1,</div><div class='add'>+	.clkoutdrive = 0,</div><div class='add'>+</div><div class='add'>+	.fref_clock_ratio = 0,</div><div class='add'>+</div><div class='add'>+	.wbd = dib7090e_wbd_table,</div><div class='add'>+</div><div class='add'>+	.ls_cfg_pad_drv = 0,</div><div class='add'>+	.data_tx_drv = 0,</div><div class='add'>+	.low_if = NULL,</div><div class='add'>+	.in_soc = 1,</div><div class='add'>+	.force_cband_input = 1,</div><div class='add'>+	.is_dib7090e = 1,</div><div class='add'>+	.force_crystal_mode = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct dib0090_config tfe7090pvr_dib0090_config[2] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.io.clock_khz = 12000,</div><div class='hunk'>@@ -2504,6 +2942,97 @@ static int tfe7090pvr_tuner1_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int tfe7090e_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO6, GPIO_OUT, 1);</div><div class='add'>+	msleep(20);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO9, GPIO_OUT, 1);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO4, GPIO_OUT, 1);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO7, GPIO_OUT, 1);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO10, GPIO_OUT, 0);</div><div class='add'>+</div><div class='add'>+	msleep(20);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO10, GPIO_OUT, 1);</div><div class='add'>+	msleep(20);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO0, GPIO_OUT, 1);</div><div class='add'>+</div><div class='add'>+	if (dib7000p_i2c_enumeration(&amp;adap-&gt;dev-&gt;i2c_adap,</div><div class='add'>+				1, 0x10, &amp;tfe7090e_dib7000p_config) != 0) {</div><div class='add'>+		err("%s: dib7000p_i2c_enumeration failed.  Cannot continue\n",</div><div class='add'>+				__func__);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	adap-&gt;fe_adap[0].fe = dvb_attach(dib7000p_attach, &amp;adap-&gt;dev-&gt;i2c_adap,</div><div class='add'>+			0x80, &amp;tfe7090e_dib7000p_config);</div><div class='add'>+</div><div class='add'>+	return adap-&gt;fe_adap[0].fe == NULL ?  -ENODEV : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tfe7790e_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct dib0700_state *st = adap-&gt;dev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* The TFE7790E requires the dib0700 to not be in master mode */</div><div class='add'>+	st-&gt;disable_streaming_master_mode = 1;</div><div class='add'>+</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO6, GPIO_OUT, 1);</div><div class='add'>+	msleep(20);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO9, GPIO_OUT, 1);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO4, GPIO_OUT, 1);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO7, GPIO_OUT, 1);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO10, GPIO_OUT, 0);</div><div class='add'>+	msleep(20);</div><div class='add'>+	dib0700_ctrl_clock(adap-&gt;dev, 72, 1);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO10, GPIO_OUT, 1);</div><div class='add'>+	msleep(20);</div><div class='add'>+	dib0700_set_gpio(adap-&gt;dev, GPIO0, GPIO_OUT, 1);</div><div class='add'>+</div><div class='add'>+	if (dib7000p_i2c_enumeration(&amp;adap-&gt;dev-&gt;i2c_adap,</div><div class='add'>+				1, 0x10, &amp;tfe7790e_dib7000p_config) != 0) {</div><div class='add'>+		err("%s: dib7000p_i2c_enumeration failed.  Cannot continue\n",</div><div class='add'>+				__func__);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	adap-&gt;fe_adap[0].fe = dvb_attach(dib7000p_attach, &amp;adap-&gt;dev-&gt;i2c_adap,</div><div class='add'>+			0x80, &amp;tfe7790e_dib7000p_config);</div><div class='add'>+</div><div class='add'>+	return adap-&gt;fe_adap[0].fe == NULL ?  -ENODEV : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tfe7790e_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct dib0700_adapter_state *st = adap-&gt;priv;</div><div class='add'>+	struct i2c_adapter *tun_i2c =</div><div class='add'>+		dib7090_get_i2c_tuner(adap-&gt;fe_adap[0].fe);</div><div class='add'>+</div><div class='add'>+	if (dvb_attach(dib0090_register, adap-&gt;fe_adap[0].fe, tun_i2c,</div><div class='add'>+				&amp;tfe7790e_dib0090_config) == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	dib7000p_set_gpio(adap-&gt;fe_adap[0].fe, 8, 0, 1);</div><div class='add'>+</div><div class='add'>+	st-&gt;set_param_save = adap-&gt;fe_adap[0].fe-&gt;ops.tuner_ops.set_params;</div><div class='add'>+	adap-&gt;fe_adap[0].fe-&gt;ops.tuner_ops.set_params = dib7090_agc_startup;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tfe7090e_tuner_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct dib0700_adapter_state *st = adap-&gt;priv;</div><div class='add'>+	struct i2c_adapter *tun_i2c =</div><div class='add'>+		dib7090_get_i2c_tuner(adap-&gt;fe_adap[0].fe);</div><div class='add'>+</div><div class='add'>+	if (dvb_attach(dib0090_register, adap-&gt;fe_adap[0].fe, tun_i2c,</div><div class='add'>+				&amp;tfe7090e_dib0090_config) == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	dib7000p_set_gpio(adap-&gt;fe_adap[0].fe, 8, 0, 1);</div><div class='add'>+</div><div class='add'>+	st-&gt;set_param_save = adap-&gt;fe_adap[0].fe-&gt;ops.tuner_ops.set_params;</div><div class='add'>+	adap-&gt;fe_adap[0].fe-&gt;ops.tuner_ops.set_params = dib7090_agc_startup;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* STK7070PD */</div><div class='ctx'> static struct dib7000p_config stk7070pd_dib7000p_config[2] = {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -2537,19 +3066,25 @@ static struct dib7000p_config stk7070pd_dib7000p_config[2] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int stk7070pd_frontend_attach0(struct dvb_usb_adapter *adap)</div><div class='add'>+static void stk7070pd_init(struct dvb_usb_device *dev)</div><div class='ctx'> {</div><div class='del'>-	dib0700_set_gpio(adap-&gt;dev, GPIO6, GPIO_OUT, 1);</div><div class='add'>+	dib0700_set_gpio(dev, GPIO6, GPIO_OUT, 1);</div><div class='ctx'> 	msleep(10);</div><div class='del'>-	dib0700_set_gpio(adap-&gt;dev, GPIO9, GPIO_OUT, 1);</div><div class='del'>-	dib0700_set_gpio(adap-&gt;dev, GPIO4, GPIO_OUT, 1);</div><div class='del'>-	dib0700_set_gpio(adap-&gt;dev, GPIO7, GPIO_OUT, 1);</div><div class='del'>-	dib0700_set_gpio(adap-&gt;dev, GPIO10, GPIO_OUT, 0);</div><div class='add'>+	dib0700_set_gpio(dev, GPIO9, GPIO_OUT, 1);</div><div class='add'>+	dib0700_set_gpio(dev, GPIO4, GPIO_OUT, 1);</div><div class='add'>+	dib0700_set_gpio(dev, GPIO7, GPIO_OUT, 1);</div><div class='add'>+	dib0700_set_gpio(dev, GPIO10, GPIO_OUT, 0);</div><div class='ctx'> </div><div class='del'>-	dib0700_ctrl_clock(adap-&gt;dev, 72, 1);</div><div class='add'>+	dib0700_ctrl_clock(dev, 72, 1);</div><div class='ctx'> </div><div class='ctx'> 	msleep(10);</div><div class='del'>-	dib0700_set_gpio(adap-&gt;dev, GPIO10, GPIO_OUT, 1);</div><div class='add'>+	dib0700_set_gpio(dev, GPIO10, GPIO_OUT, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stk7070pd_frontend_attach0(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	stk7070pd_init(adap-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	msleep(10);</div><div class='ctx'> 	dib0700_set_gpio(adap-&gt;dev, GPIO0, GPIO_OUT, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -2570,6 +3105,77 @@ static int stk7070pd_frontend_attach1(struct dvb_usb_adapter *adap)</div><div class='ctx'> 	return adap-&gt;fe_adap[0].fe == NULL ? -ENODEV : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int novatd_read_status_override(struct dvb_frontend *fe,</div><div class='add'>+		fe_status_t *stat)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_adapter *adap = fe-&gt;dvb-&gt;priv;</div><div class='add'>+	struct dvb_usb_device *dev = adap-&gt;dev;</div><div class='add'>+	struct dib0700_state *state = dev-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = state-&gt;read_status(fe, stat);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		dib0700_set_gpio(dev, adap-&gt;id == 0 ? GPIO1 : GPIO0, GPIO_OUT,</div><div class='add'>+				!!(*stat &amp; FE_HAS_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 novatd_sleep_override(struct dvb_frontend* fe)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_adapter *adap = fe-&gt;dvb-&gt;priv;</div><div class='add'>+	struct dvb_usb_device *dev = adap-&gt;dev;</div><div class='add'>+	struct dib0700_state *state = dev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* turn off LED */</div><div class='add'>+	dib0700_set_gpio(dev, adap-&gt;id == 0 ? GPIO1 : GPIO0, GPIO_OUT, 0);</div><div class='add'>+</div><div class='add'>+	return state-&gt;sleep(fe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * novatd_frontend_attach - Nova-TD specific attach</div><div class='add'>+ *</div><div class='add'>+ * Nova-TD has GPIO0, 1 and 2 for LEDs. So do not fiddle with them except for</div><div class='add'>+ * information purposes.</div><div class='add'>+ */</div><div class='add'>+static int novatd_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *dev = adap-&gt;dev;</div><div class='add'>+	struct dib0700_state *st = dev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (adap-&gt;id == 0) {</div><div class='add'>+		stk7070pd_init(dev);</div><div class='add'>+</div><div class='add'>+		/* turn the power LED on, the other two off (just in case) */</div><div class='add'>+		dib0700_set_gpio(dev, GPIO0, GPIO_OUT, 0);</div><div class='add'>+		dib0700_set_gpio(dev, GPIO1, GPIO_OUT, 0);</div><div class='add'>+		dib0700_set_gpio(dev, GPIO2, GPIO_OUT, 1);</div><div class='add'>+</div><div class='add'>+		if (dib7000p_i2c_enumeration(&amp;dev-&gt;i2c_adap, 2, 18,</div><div class='add'>+					     stk7070pd_dib7000p_config) != 0) {</div><div class='add'>+			err("%s: dib7000p_i2c_enumeration failed.  Cannot continue\n",</div><div class='add'>+			    __func__);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adap-&gt;fe_adap[0].fe = dvb_attach(dib7000p_attach, &amp;dev-&gt;i2c_adap,</div><div class='add'>+			adap-&gt;id == 0 ? 0x80 : 0x82,</div><div class='add'>+			&amp;stk7070pd_dib7000p_config[adap-&gt;id]);</div><div class='add'>+</div><div class='add'>+	if (adap-&gt;fe_adap[0].fe == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	st-&gt;read_status = adap-&gt;fe_adap[0].fe-&gt;ops.read_status;</div><div class='add'>+	adap-&gt;fe_adap[0].fe-&gt;ops.read_status = novatd_read_status_override;</div><div class='add'>+	st-&gt;sleep = adap-&gt;fe_adap[0].fe-&gt;ops.sleep;</div><div class='add'>+	adap-&gt;fe_adap[0].fe-&gt;ops.sleep = novatd_sleep_override;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* S5H1411 */</div><div class='ctx'> static struct s5h1411_config pinnacle_801e_config = {</div><div class='ctx'> 	.output_mode   = S5H1411_PARALLEL_OUTPUT,</div><div class='hunk'>@@ -2960,6 +3566,9 @@ struct usb_device_id dib0700_usb_id_table[] = {</div><div class='ctx'> /* 75 */{ USB_DEVICE(USB_VID_MEDION,    USB_PID_CREATIX_CTX1921) },</div><div class='ctx'> 	{ USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV340E) },</div><div class='ctx'> 	{ USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV340E_SE) },</div><div class='add'>+	{ USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_TFE7090E) },</div><div class='add'>+	{ USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_TFE7790E) },</div><div class='add'>+/* 80 */{ USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_TFE8096P) },</div><div class='ctx'> 	{ 0 }		/* Terminating entry */</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);</div><div class='hunk'>@@ -3338,6 +3947,57 @@ struct dvb_usb_device_properties dib0700_devices[] = {</div><div class='ctx'> 				.pid_filter_count = 32,</div><div class='ctx'> 				.pid_filter       = stk70x0p_pid_filter,</div><div class='ctx'> 				.pid_filter_ctrl  = stk70x0p_pid_filter_ctrl,</div><div class='add'>+				.frontend_attach  = novatd_frontend_attach,</div><div class='add'>+				.tuner_attach     = dib7070p_tuner_attach,</div><div class='add'>+</div><div class='add'>+				DIB0700_DEFAULT_STREAMING_CONFIG(0x02),</div><div class='add'>+			}},</div><div class='add'>+				.size_of_priv     = sizeof(struct dib0700_adapter_state),</div><div class='add'>+			}, {</div><div class='add'>+			.num_frontends = 1,</div><div class='add'>+			.fe = {{</div><div class='add'>+				.caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,</div><div class='add'>+				.pid_filter_count = 32,</div><div class='add'>+				.pid_filter       = stk70x0p_pid_filter,</div><div class='add'>+				.pid_filter_ctrl  = stk70x0p_pid_filter_ctrl,</div><div class='add'>+				.frontend_attach  = novatd_frontend_attach,</div><div class='add'>+				.tuner_attach     = dib7070p_tuner_attach,</div><div class='add'>+</div><div class='add'>+				DIB0700_DEFAULT_STREAMING_CONFIG(0x03),</div><div class='add'>+			}},</div><div class='add'>+				.size_of_priv     = sizeof(struct dib0700_adapter_state),</div><div class='add'>+			}</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.num_device_descs = 1,</div><div class='add'>+		.devices = {</div><div class='add'>+			{   "Hauppauge Nova-TD Stick (52009)",</div><div class='add'>+				{ &amp;dib0700_usb_id_table[35], NULL },</div><div class='add'>+				{ NULL },</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.rc.core = {</div><div class='add'>+			.rc_interval      = DEFAULT_RC_INTERVAL,</div><div class='add'>+			.rc_codes         = RC_MAP_DIB0700_RC5_TABLE,</div><div class='add'>+			.module_name	  = "dib0700",</div><div class='add'>+			.rc_query         = dib0700_rc_query_old_firmware,</div><div class='add'>+			.allowed_protos   = RC_TYPE_RC5 |</div><div class='add'>+					    RC_TYPE_RC6 |</div><div class='add'>+					    RC_TYPE_NEC,</div><div class='add'>+			.change_protocol = dib0700_change_protocol,</div><div class='add'>+		},</div><div class='add'>+	}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,</div><div class='add'>+</div><div class='add'>+		.num_adapters = 2,</div><div class='add'>+		.adapter = {</div><div class='add'>+			{</div><div class='add'>+			.num_frontends = 1,</div><div class='add'>+			.fe = {{</div><div class='add'>+				.caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,</div><div class='add'>+				.pid_filter_count = 32,</div><div class='add'>+				.pid_filter       = stk70x0p_pid_filter,</div><div class='add'>+				.pid_filter_ctrl  = stk70x0p_pid_filter_ctrl,</div><div class='ctx'> 				.frontend_attach  = stk7070pd_frontend_attach0,</div><div class='ctx'> 				.tuner_attach     = dib7070p_tuner_attach,</div><div class='ctx'> </div><div class='hunk'>@@ -3360,7 +4020,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {</div><div class='ctx'> 			}</div><div class='ctx'> 		},</div><div class='ctx'> </div><div class='del'>-		.num_device_descs = 6,</div><div class='add'>+		.num_device_descs = 5,</div><div class='ctx'> 		.devices = {</div><div class='ctx'> 			{   "DiBcom STK7070PD reference design",</div><div class='ctx'> 				{ &amp;dib0700_usb_id_table[17], NULL },</div><div class='hunk'>@@ -3370,10 +4030,6 @@ struct dvb_usb_device_properties dib0700_devices[] = {</div><div class='ctx'> 				{ &amp;dib0700_usb_id_table[18], NULL },</div><div class='ctx'> 				{ NULL },</div><div class='ctx'> 			},</div><div class='del'>-			{   "Hauppauge Nova-TD Stick (52009)",</div><div class='del'>-				{ &amp;dib0700_usb_id_table[35], NULL },</div><div class='del'>-				{ NULL },</div><div class='del'>-			},</div><div class='ctx'> 			{   "Hauppauge Nova-TD-500 (84xxx)",</div><div class='ctx'> 				{ &amp;dib0700_usb_id_table[36], NULL },</div><div class='ctx'> 				{ NULL },</div><div class='hunk'>@@ -4025,6 +4681,127 @@ struct dvb_usb_device_properties dib0700_devices[] = {</div><div class='ctx'> 					    RC_TYPE_NEC,</div><div class='ctx'> 			.change_protocol  = dib0700_change_protocol,</div><div class='ctx'> 		},</div><div class='add'>+	}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,</div><div class='add'>+		.num_adapters = 1,</div><div class='add'>+		.adapter = {</div><div class='add'>+			{</div><div class='add'>+				.num_frontends = 1,</div><div class='add'>+				.fe = {{</div><div class='add'>+					.caps  = DVB_USB_ADAP_HAS_PID_FILTER |</div><div class='add'>+						DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,</div><div class='add'>+					.pid_filter_count = 32,</div><div class='add'>+					.pid_filter = stk70x0p_pid_filter,</div><div class='add'>+					.pid_filter_ctrl = stk70x0p_pid_filter_ctrl,</div><div class='add'>+					.frontend_attach  = tfe7090e_frontend_attach,</div><div class='add'>+					.tuner_attach     = tfe7090e_tuner_attach,</div><div class='add'>+</div><div class='add'>+					DIB0700_DEFAULT_STREAMING_CONFIG(0x02),</div><div class='add'>+				} },</div><div class='add'>+</div><div class='add'>+				.size_of_priv =</div><div class='add'>+					sizeof(struct dib0700_adapter_state),</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.num_device_descs = 1,</div><div class='add'>+		.devices = {</div><div class='add'>+			{   "DiBcom TFE7090E reference design",</div><div class='add'>+				{ &amp;dib0700_usb_id_table[78], NULL },</div><div class='add'>+				{ NULL },</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.rc.core = {</div><div class='add'>+			.rc_interval      = DEFAULT_RC_INTERVAL,</div><div class='add'>+			.rc_codes         = RC_MAP_DIB0700_RC5_TABLE,</div><div class='add'>+			.module_name	  = "dib0700",</div><div class='add'>+			.rc_query         = dib0700_rc_query_old_firmware,</div><div class='add'>+			.allowed_protos   = RC_TYPE_RC5 |</div><div class='add'>+					    RC_TYPE_RC6 |</div><div class='add'>+					    RC_TYPE_NEC,</div><div class='add'>+			.change_protocol  = dib0700_change_protocol,</div><div class='add'>+		},</div><div class='add'>+	}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,</div><div class='add'>+		.num_adapters = 1,</div><div class='add'>+		.adapter = {</div><div class='add'>+			{</div><div class='add'>+				.num_frontends = 1,</div><div class='add'>+				.fe = {{</div><div class='add'>+					.caps  = DVB_USB_ADAP_HAS_PID_FILTER |</div><div class='add'>+						DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,</div><div class='add'>+					.pid_filter_count = 32,</div><div class='add'>+					.pid_filter = stk70x0p_pid_filter,</div><div class='add'>+					.pid_filter_ctrl = stk70x0p_pid_filter_ctrl,</div><div class='add'>+					.frontend_attach  = tfe7790e_frontend_attach,</div><div class='add'>+					.tuner_attach     = tfe7790e_tuner_attach,</div><div class='add'>+</div><div class='add'>+					DIB0700_DEFAULT_STREAMING_CONFIG(0x03),</div><div class='add'>+				} },</div><div class='add'>+</div><div class='add'>+				.size_of_priv =</div><div class='add'>+					sizeof(struct dib0700_adapter_state),</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.num_device_descs = 1,</div><div class='add'>+		.devices = {</div><div class='add'>+			{   "DiBcom TFE7790E reference design",</div><div class='add'>+				{ &amp;dib0700_usb_id_table[79], NULL },</div><div class='add'>+				{ NULL },</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.rc.core = {</div><div class='add'>+			.rc_interval      = DEFAULT_RC_INTERVAL,</div><div class='add'>+			.rc_codes         = RC_MAP_DIB0700_RC5_TABLE,</div><div class='add'>+			.module_name	  = "dib0700",</div><div class='add'>+			.rc_query         = dib0700_rc_query_old_firmware,</div><div class='add'>+			.allowed_protos   = RC_TYPE_RC5 |</div><div class='add'>+					    RC_TYPE_RC6 |</div><div class='add'>+					    RC_TYPE_NEC,</div><div class='add'>+			.change_protocol  = dib0700_change_protocol,</div><div class='add'>+		},</div><div class='add'>+	}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,</div><div class='add'>+		.num_adapters = 1,</div><div class='add'>+		.adapter = {</div><div class='add'>+			{</div><div class='add'>+				.num_frontends = 1,</div><div class='add'>+				.fe = {{</div><div class='add'>+					.caps  = DVB_USB_ADAP_HAS_PID_FILTER |</div><div class='add'>+						DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,</div><div class='add'>+					.pid_filter_count = 32,</div><div class='add'>+					.pid_filter = stk80xx_pid_filter,</div><div class='add'>+					.pid_filter_ctrl = stk80xx_pid_filter_ctrl,</div><div class='add'>+					.frontend_attach  = tfe8096p_frontend_attach,</div><div class='add'>+					.tuner_attach     = tfe8096p_tuner_attach,</div><div class='add'>+</div><div class='add'>+					DIB0700_DEFAULT_STREAMING_CONFIG(0x02),</div><div class='add'>+</div><div class='add'>+				} },</div><div class='add'>+</div><div class='add'>+				.size_of_priv =</div><div class='add'>+					sizeof(struct dib0700_adapter_state),</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.num_device_descs = 1,</div><div class='add'>+		.devices = {</div><div class='add'>+			{   "DiBcom TFE8096P reference design",</div><div class='add'>+				{ &amp;dib0700_usb_id_table[80], NULL },</div><div class='add'>+				{ NULL },</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+</div><div class='add'>+		.rc.core = {</div><div class='add'>+			.rc_interval      = DEFAULT_RC_INTERVAL,</div><div class='add'>+			.rc_codes         = RC_MAP_DIB0700_RC5_TABLE,</div><div class='add'>+			.module_name	  = "dib0700",</div><div class='add'>+			.rc_query         = dib0700_rc_query_old_firmware,</div><div class='add'>+			.allowed_protos   = RC_TYPE_RC5 |</div><div class='add'>+					    RC_TYPE_RC6 |</div><div class='add'>+					    RC_TYPE_NEC,</div><div class='add'>+			.change_protocol  = dib0700_change_protocol,</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c<br/>index 7270791f8340..a4ac37e0e98b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dibusb-mb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dibusb-mb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dibusb-mb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/dibusb-mb.c</a></div><div class='hunk'>@@ -463,26 +463,7 @@ static struct usb_driver dibusb_driver = {</div><div class='ctx'> 	.id_table	= dibusb_dib3000mb_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init dibusb_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	if ((result = usb_register(&amp;dibusb_driver))) {</div><div class='del'>-		err("usb_register failed. Error number %d",result);</div><div class='del'>-		return result;</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 dibusb_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;dibusb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init (dibusb_module_init);</div><div class='del'>-module_exit (dibusb_module_exit);</div><div class='add'>+module_usb_driver(dibusb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Patrick Boettcher &lt;patrick.boettcher@desy.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for DiBcom USB DVB-T devices (DiB3000M-B based)");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dibusb-mc.c b/drivers/media/dvb/dvb-usb/dibusb-mc.c<br/>index 9c165e2569d4..9d1a59d09c52 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dibusb-mc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dibusb-mc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dibusb-mc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/dibusb-mc.c</a></div><div class='hunk'>@@ -141,26 +141,7 @@ static struct usb_driver dibusb_mc_driver = {</div><div class='ctx'> 	.id_table	= dibusb_dib3000mc_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init dibusb_mc_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	if ((result = usb_register(&amp;dibusb_mc_driver))) {</div><div class='del'>-		err("usb_register failed. Error number %d",result);</div><div class='del'>-		return result;</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 dibusb_mc_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;dibusb_mc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init (dibusb_mc_module_init);</div><div class='del'>-module_exit (dibusb_mc_module_exit);</div><div class='add'>+module_usb_driver(dibusb_mc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Patrick Boettcher &lt;patrick.boettcher@desy.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for DiBcom USB2.0 DVB-T (DiB3000M-C/P based) devices");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c<br/>index f7184111aa64..ff34419a4c88 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/digitv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/digitv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/digitv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/digitv.c</a></div><div class='hunk'>@@ -118,12 +118,12 @@ static struct mt352_config digitv_mt352_config = {</div><div class='ctx'> 	.demod_init = digitv_mt352_demod_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int digitv_nxt6000_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)</div><div class='add'>+static int digitv_nxt6000_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_usb_adapter *adap = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 b[5];</div><div class='ctx'> </div><div class='del'>-	fe-&gt;ops.tuner_ops.calc_regs(fe, fep, b, sizeof(b));</div><div class='add'>+	fe-&gt;ops.tuner_ops.calc_regs(fe, b, sizeof(b));</div><div class='ctx'> 	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	return digitv_ctrl_msg(adap-&gt;dev, USB_WRITE_TUNER, 0, &amp;b[1], 4, NULL, 0);</div><div class='hunk'>@@ -346,26 +346,7 @@ static struct usb_driver digitv_driver = {</div><div class='ctx'> 	.id_table	= digitv_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init digitv_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	if ((result = usb_register(&amp;digitv_driver))) {</div><div class='del'>-		err("usb_register failed. Error number %d",result);</div><div class='del'>-		return result;</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 digitv_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;digitv_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init (digitv_module_init);</div><div class='del'>-module_exit (digitv_module_exit);</div><div class='add'>+module_usb_driver(digitv_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Patrick Boettcher &lt;patrick.boettcher@desy.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for Nebula Electronics uDigiTV DVB-T USB2.0");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dtt200u-fe.c b/drivers/media/dvb/dvb-usb/dtt200u-fe.c<br/>index 17413adec7a1..3d81daa49172 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dtt200u-fe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dtt200u-fe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dtt200u-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/dtt200u-fe.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@ struct dtt200u_fe_state {</div><div class='ctx'> </div><div class='ctx'> 	fe_status_t stat;</div><div class='ctx'> </div><div class='del'>-	struct dvb_frontend_parameters fep;</div><div class='add'>+	struct dtv_frontend_properties fep;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -100,22 +100,27 @@ static int dtt200u_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_fron</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dtt200u_fe_set_frontend(struct dvb_frontend* fe,</div><div class='del'>-				  struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dtt200u_fe_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fep = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dtt200u_fe_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	fe_status_t st;</div><div class='ctx'> 	u16 freq = fep-&gt;frequency / 250000;</div><div class='ctx'> 	u8 bwbuf[2] = { SET_BANDWIDTH, 0 },freqbuf[3] = { SET_RF_FREQ, 0, 0 };</div><div class='ctx'> </div><div class='del'>-	switch (fep-&gt;u.ofdm.bandwidth) {</div><div class='del'>-		case BANDWIDTH_8_MHZ: bwbuf[1] = 8; break;</div><div class='del'>-		case BANDWIDTH_7_MHZ: bwbuf[1] = 7; break;</div><div class='del'>-		case BANDWIDTH_6_MHZ: bwbuf[1] = 6; break;</div><div class='del'>-		case BANDWIDTH_AUTO: return -EOPNOTSUPP;</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	switch (fep-&gt;bandwidth_hz) {</div><div class='add'>+	case 8000000:</div><div class='add'>+		bwbuf[1] = 8;</div><div class='add'>+		break;</div><div class='add'>+	case 7000000:</div><div class='add'>+		bwbuf[1] = 7;</div><div class='add'>+		break;</div><div class='add'>+	case 6000000:</div><div class='add'>+		bwbuf[1] = 6;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dvb_usb_generic_write(state-&gt;d,bwbuf,2);</div><div class='hunk'>@@ -134,11 +139,11 @@ static int dtt200u_fe_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dtt200u_fe_get_frontend(struct dvb_frontend* fe,</div><div class='del'>-				  struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dtt200u_fe_get_frontend(struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fep = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dtt200u_fe_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	memcpy(fep,&amp;state-&gt;fep,sizeof(struct dvb_frontend_parameters));</div><div class='add'>+	memcpy(fep, &amp;state-&gt;fep, sizeof(struct dtv_frontend_properties));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -172,9 +177,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops dtt200u_fe_ops = {</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "WideView USB DVB-T",</div><div class='del'>-		.type			= FE_OFDM,</div><div class='ctx'> 		.frequency_min		= 44250000,</div><div class='ctx'> 		.frequency_max		= 867250000,</div><div class='ctx'> 		.frequency_stepsize	= 250000,</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dtt200u.c b/drivers/media/dvb/dvb-usb/dtt200u.c<br/>index 106dfd55ff9c..66f205c112b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dtt200u.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dtt200u.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dtt200u.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/dtt200u.c</a></div><div class='hunk'>@@ -360,26 +360,7 @@ static struct usb_driver dtt200u_usb_driver = {</div><div class='ctx'> 	.id_table	= dtt200u_usb_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init dtt200u_usb_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	if ((result = usb_register(&amp;dtt200u_usb_driver))) {</div><div class='del'>-		err("usb_register failed. (%d)",result);</div><div class='del'>-		return result;</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 dtt200u_usb_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;dtt200u_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(dtt200u_usb_module_init);</div><div class='del'>-module_exit(dtt200u_usb_module_exit);</div><div class='add'>+module_usb_driver(dtt200u_usb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Patrick Boettcher &lt;patrick.boettcher@desy.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for the WideView/Yakumo/Hama/Typhoon/Club3D/Miglia DVB-T USB2.0 devices");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dtv5100.c b/drivers/media/dvb/dvb-usb/dtv5100.c<br/>index 7373132163d2..3d11df41cac0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dtv5100.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dtv5100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dtv5100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/dtv5100.c</a></div><div class='hunk'>@@ -217,26 +217,7 @@ static struct usb_driver dtv5100_driver = {</div><div class='ctx'> 	.id_table	= dtv5100_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init dtv5100_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = usb_register(&amp;dtv5100_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		err("usb_register failed. Error number %d", ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit dtv5100_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;dtv5100_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(dtv5100_module_init);</div><div class='del'>-module_exit(dtv5100_module_exit);</div><div class='add'>+module_usb_driver(dtv5100_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c<br/>index ba4a7517354f..ddf282f355b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dvb-usb-dvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/dvb-usb-dvb.c</a></div><div class='hunk'>@@ -141,11 +141,17 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums)</div><div class='ctx'> 		goto err_dmx_dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dvb_net_init(&amp;adap-&gt;dvb_adap, &amp;adap-&gt;dvb_net, &amp;adap-&gt;demux.dmx);</div><div class='add'>+	if ((ret = dvb_net_init(&amp;adap-&gt;dvb_adap, &amp;adap-&gt;dvb_net,</div><div class='add'>+						&amp;adap-&gt;demux.dmx)) &lt; 0) {</div><div class='add'>+		err("dvb_net_init failed: error %d",ret);</div><div class='add'>+		goto err_net_init;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	adap-&gt;state |= DVB_USB_ADAP_STATE_DVB;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+err_net_init:</div><div class='add'>+	dvb_dmxdev_release(&amp;adap-&gt;dmxdev);</div><div class='ctx'> err_dmx_dev:</div><div class='ctx'> 	dvb_dmx_release(&amp;adap-&gt;demux);</div><div class='ctx'> err_dmx:</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h<br/>index 2d08c9b5128a..d390ddaa5a53 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dvb-usb-ids.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dvb-usb-ids.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dvb-usb-ids.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/dvb-usb-ids.h</a></div><div class='hunk'>@@ -109,10 +109,13 @@</div><div class='ctx'> #define USB_PID_DIBCOM_STK807XPVR			0x1f98</div><div class='ctx'> #define USB_PID_DIBCOM_STK8096GP                        0x1fa0</div><div class='ctx'> #define USB_PID_DIBCOM_NIM8096MD                        0x1fa8</div><div class='add'>+#define USB_PID_DIBCOM_TFE8096P				0x1f9C</div><div class='ctx'> #define USB_PID_DIBCOM_ANCHOR_2135_COLD			0x2131</div><div class='ctx'> #define USB_PID_DIBCOM_STK7770P				0x1e80</div><div class='ctx'> #define USB_PID_DIBCOM_NIM7090				0x1bb2</div><div class='ctx'> #define USB_PID_DIBCOM_TFE7090PVR			0x1bb4</div><div class='add'>+#define USB_PID_DIBCOM_TFE7090E				0x1bb7</div><div class='add'>+#define USB_PID_DIBCOM_TFE7790E				0x1e6e</div><div class='ctx'> #define USB_PID_DIBCOM_NIM9090M				0x2383</div><div class='ctx'> #define USB_PID_DIBCOM_NIM9090MD			0x2384</div><div class='ctx'> #define USB_PID_DPOSH_M9206_COLD			0x9206</div><div class='hunk'>@@ -128,6 +131,8 @@</div><div class='ctx'> #define USB_PID_GRANDTEC_DVBT_USB_WARM			0x0fa1</div><div class='ctx'> #define USB_PID_INTEL_CE9500				0x9500</div><div class='ctx'> #define USB_PID_ITETECH_IT9135				0x9135</div><div class='add'>+#define USB_PID_ITETECH_IT9135_9005			0x9005</div><div class='add'>+#define USB_PID_ITETECH_IT9135_9006			0x9006</div><div class='ctx'> #define USB_PID_KWORLD_399U				0xe399</div><div class='ctx'> #define USB_PID_KWORLD_399U_2				0xe400</div><div class='ctx'> #define USB_PID_KWORLD_395U				0xe396</div><div class='hunk'>@@ -322,6 +327,7 @@</div><div class='ctx'> #define USB_PID_TVWAY_PLUS				0x0002</div><div class='ctx'> #define USB_PID_SVEON_STV20				0xe39d</div><div class='ctx'> #define USB_PID_SVEON_STV22				0xe401</div><div class='add'>+#define USB_PID_SVEON_STV22_IT9137			0xe411</div><div class='ctx'> #define USB_PID_AZUREWAVE_AZ6027			0x3275</div><div class='ctx'> #define USB_PID_TERRATEC_DVBS2CI_V1			0x10a4</div><div class='ctx'> #define USB_PID_TERRATEC_DVBS2CI_V2			0x10ac</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c<br/>index f103ec1fe82e..451c5a7adfb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dw2102.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/dw2102.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dw2102.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/dw2102.c</a></div><div class='hunk'>@@ -1435,22 +1435,40 @@ static int dw2102_rc_query(struct dvb_usb_device *d, u32 *event, int *state)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+enum dw2102_table_entry {</div><div class='add'>+	CYPRESS_DW2102,</div><div class='add'>+	CYPRESS_DW2101,</div><div class='add'>+	CYPRESS_DW2104,</div><div class='add'>+	TEVII_S650,</div><div class='add'>+	TERRATEC_CINERGY_S,</div><div class='add'>+	CYPRESS_DW3101,</div><div class='add'>+	TEVII_S630,</div><div class='add'>+	PROF_1100,</div><div class='add'>+	TEVII_S660,</div><div class='add'>+	PROF_7500,</div><div class='add'>+	GENIATECH_SU3000,</div><div class='add'>+	TERRATEC_CINERGY_S2,</div><div class='add'>+	TEVII_S480_1,</div><div class='add'>+	TEVII_S480_2,</div><div class='add'>+	X3M_SPC1400HD,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct usb_device_id dw2102_table[] = {</div><div class='del'>-	{USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW2102)},</div><div class='del'>-	{USB_DEVICE(USB_VID_CYPRESS, 0x2101)},</div><div class='del'>-	{USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW2104)},</div><div class='del'>-	{USB_DEVICE(0x9022, USB_PID_TEVII_S650)},</div><div class='del'>-	{USB_DEVICE(USB_VID_TERRATEC, USB_PID_CINERGY_S)},</div><div class='del'>-	{USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW3101)},</div><div class='del'>-	{USB_DEVICE(0x9022, USB_PID_TEVII_S630)},</div><div class='del'>-	{USB_DEVICE(0x3011, USB_PID_PROF_1100)},</div><div class='del'>-	{USB_DEVICE(0x9022, USB_PID_TEVII_S660)},</div><div class='del'>-	{USB_DEVICE(0x3034, 0x7500)},</div><div class='del'>-	{USB_DEVICE(0x1f4d, 0x3000)},</div><div class='del'>-	{USB_DEVICE(USB_VID_TERRATEC, 0x00a8)},</div><div class='del'>-	{USB_DEVICE(0x9022, USB_PID_TEVII_S480_1)},</div><div class='del'>-	{USB_DEVICE(0x9022, USB_PID_TEVII_S480_2)},</div><div class='del'>-	{USB_DEVICE(0x1f4d, 0x3100)},</div><div class='add'>+	[CYPRESS_DW2102] = {USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW2102)},</div><div class='add'>+	[CYPRESS_DW2101] = {USB_DEVICE(USB_VID_CYPRESS, 0x2101)},</div><div class='add'>+	[CYPRESS_DW2104] = {USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW2104)},</div><div class='add'>+	[TEVII_S650] = {USB_DEVICE(0x9022, USB_PID_TEVII_S650)},</div><div class='add'>+	[TERRATEC_CINERGY_S] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_CINERGY_S)},</div><div class='add'>+	[CYPRESS_DW3101] = {USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW3101)},</div><div class='add'>+	[TEVII_S630] = {USB_DEVICE(0x9022, USB_PID_TEVII_S630)},</div><div class='add'>+	[PROF_1100] = {USB_DEVICE(0x3011, USB_PID_PROF_1100)},</div><div class='add'>+	[TEVII_S660] = {USB_DEVICE(0x9022, USB_PID_TEVII_S660)},</div><div class='add'>+	[PROF_7500] = {USB_DEVICE(0x3034, 0x7500)},</div><div class='add'>+	[GENIATECH_SU3000] = {USB_DEVICE(0x1f4d, 0x3000)},</div><div class='add'>+	[TERRATEC_CINERGY_S2] = {USB_DEVICE(USB_VID_TERRATEC, 0x00a8)},</div><div class='add'>+	[TEVII_S480_1] = {USB_DEVICE(0x9022, USB_PID_TEVII_S480_1)},</div><div class='add'>+	[TEVII_S480_2] = {USB_DEVICE(0x9022, USB_PID_TEVII_S480_2)},</div><div class='add'>+	[X3M_SPC1400HD] = {USB_DEVICE(0x1f4d, 0x3100)},</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1610,15 +1628,15 @@ static struct dvb_usb_device_properties dw2102_properties = {</div><div class='ctx'> 	.num_device_descs = 3,</div><div class='ctx'> 	.devices = {</div><div class='ctx'> 		{"DVBWorld DVB-S 2102 USB2.0",</div><div class='del'>-			{&amp;dw2102_table[0], NULL},</div><div class='add'>+			{&amp;dw2102_table[CYPRESS_DW2102], NULL},</div><div class='ctx'> 			{NULL},</div><div class='ctx'> 		},</div><div class='ctx'> 		{"DVBWorld DVB-S 2101 USB2.0",</div><div class='del'>-			{&amp;dw2102_table[1], NULL},</div><div class='add'>+			{&amp;dw2102_table[CYPRESS_DW2101], NULL},</div><div class='ctx'> 			{NULL},</div><div class='ctx'> 		},</div><div class='ctx'> 		{"TerraTec Cinergy S USB",</div><div class='del'>-			{&amp;dw2102_table[4], NULL},</div><div class='add'>+			{&amp;dw2102_table[TERRATEC_CINERGY_S], NULL},</div><div class='ctx'> 			{NULL},</div><div class='ctx'> 		},</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1664,11 +1682,11 @@ static struct dvb_usb_device_properties dw2104_properties = {</div><div class='ctx'> 	.num_device_descs = 2,</div><div class='ctx'> 	.devices = {</div><div class='ctx'> 		{ "DVBWorld DW2104 USB2.0",</div><div class='del'>-			{&amp;dw2102_table[2], NULL},</div><div class='add'>+			{&amp;dw2102_table[CYPRESS_DW2104], NULL},</div><div class='ctx'> 			{NULL},</div><div class='ctx'> 		},</div><div class='ctx'> 		{ "TeVii S650 USB2.0",</div><div class='del'>-			{&amp;dw2102_table[3], NULL},</div><div class='add'>+			{&amp;dw2102_table[TEVII_S650], NULL},</div><div class='ctx'> 			{NULL},</div><div class='ctx'> 		},</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1715,7 +1733,7 @@ static struct dvb_usb_device_properties dw3101_properties = {</div><div class='ctx'> 	.num_device_descs = 1,</div><div class='ctx'> 	.devices = {</div><div class='ctx'> 		{ "DVBWorld DVB-C 3101 USB2.0",</div><div class='del'>-			{&amp;dw2102_table[5], NULL},</div><div class='add'>+			{&amp;dw2102_table[CYPRESS_DW3101], NULL},</div><div class='ctx'> 			{NULL},</div><div class='ctx'> 		},</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1761,7 +1779,7 @@ static struct dvb_usb_device_properties s6x0_properties = {</div><div class='ctx'> 	.num_device_descs = 1,</div><div class='ctx'> 	.devices = {</div><div class='ctx'> 		{"TeVii S630 USB",</div><div class='del'>-			{&amp;dw2102_table[6], NULL},</div><div class='add'>+			{&amp;dw2102_table[TEVII_S630], NULL},</div><div class='ctx'> 			{NULL},</div><div class='ctx'> 		},</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1770,33 +1788,33 @@ static struct dvb_usb_device_properties s6x0_properties = {</div><div class='ctx'> struct dvb_usb_device_properties *p1100;</div><div class='ctx'> static struct dvb_usb_device_description d1100 = {</div><div class='ctx'> 	"Prof 1100 USB ",</div><div class='del'>-	{&amp;dw2102_table[7], NULL},</div><div class='add'>+	{&amp;dw2102_table[PROF_1100], NULL},</div><div class='ctx'> 	{NULL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dvb_usb_device_properties *s660;</div><div class='ctx'> static struct dvb_usb_device_description d660 = {</div><div class='ctx'> 	"TeVii S660 USB",</div><div class='del'>-	{&amp;dw2102_table[8], NULL},</div><div class='add'>+	{&amp;dw2102_table[TEVII_S660], NULL},</div><div class='ctx'> 	{NULL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dvb_usb_device_description d480_1 = {</div><div class='ctx'> 	"TeVii S480.1 USB",</div><div class='del'>-	{&amp;dw2102_table[12], NULL},</div><div class='add'>+	{&amp;dw2102_table[TEVII_S480_1], NULL},</div><div class='ctx'> 	{NULL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dvb_usb_device_description d480_2 = {</div><div class='ctx'> 	"TeVii S480.2 USB",</div><div class='del'>-	{&amp;dw2102_table[13], NULL},</div><div class='add'>+	{&amp;dw2102_table[TEVII_S480_2], NULL},</div><div class='ctx'> 	{NULL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dvb_usb_device_properties *p7500;</div><div class='ctx'> static struct dvb_usb_device_description d7500 = {</div><div class='ctx'> 	"Prof 7500 USB DVB-S2",</div><div class='del'>-	{&amp;dw2102_table[9], NULL},</div><div class='add'>+	{&amp;dw2102_table[PROF_7500], NULL},</div><div class='ctx'> 	{NULL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1842,15 +1860,15 @@ static struct dvb_usb_device_properties su3000_properties = {</div><div class='ctx'> 	.num_device_descs = 3,</div><div class='ctx'> 	.devices = {</div><div class='ctx'> 		{ "SU3000HD DVB-S USB2.0",</div><div class='del'>-			{ &amp;dw2102_table[10], NULL },</div><div class='add'>+			{ &amp;dw2102_table[GENIATECH_SU3000], NULL },</div><div class='ctx'> 			{ NULL },</div><div class='ctx'> 		},</div><div class='ctx'> 		{ "Terratec Cinergy S2 USB HD",</div><div class='del'>-			{ &amp;dw2102_table[11], NULL },</div><div class='add'>+			{ &amp;dw2102_table[TERRATEC_CINERGY_S2], NULL },</div><div class='ctx'> 			{ NULL },</div><div class='ctx'> 		},</div><div class='ctx'> 		{ "X3M TV SPC1400HD PCI",</div><div class='del'>-			{ &amp;dw2102_table[14], NULL },</div><div class='add'>+			{ &amp;dw2102_table[X3M_SPC1400HD], NULL },</div><div class='ctx'> 			{ NULL },</div><div class='ctx'> 		},</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1859,12 +1877,11 @@ static struct dvb_usb_device_properties su3000_properties = {</div><div class='ctx'> static int dw2102_probe(struct usb_interface *intf,</div><div class='ctx'> 		const struct usb_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	p1100 = kzalloc(sizeof(struct dvb_usb_device_properties), GFP_KERNEL);</div><div class='add'>+	p1100 = kmemdup(&amp;s6x0_properties,</div><div class='add'>+			sizeof(struct dvb_usb_device_properties), GFP_KERNEL);</div><div class='ctx'> 	if (!p1100)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	/* copy default structure */</div><div class='del'>-	memcpy(p1100, &amp;s6x0_properties,</div><div class='del'>-			sizeof(struct dvb_usb_device_properties));</div><div class='ctx'> 	/* fill only different fields */</div><div class='ctx'> 	p1100-&gt;firmware = "dvb-usb-p1100.fw";</div><div class='ctx'> 	p1100-&gt;devices[0] = d1100;</div><div class='hunk'>@@ -1872,13 +1889,12 @@ static int dw2102_probe(struct usb_interface *intf,</div><div class='ctx'> 	p1100-&gt;rc.legacy.rc_map_size = ARRAY_SIZE(rc_map_tbs_table);</div><div class='ctx'> 	p1100-&gt;adapter-&gt;fe[0].frontend_attach = stv0288_frontend_attach;</div><div class='ctx'> </div><div class='del'>-	s660 = kzalloc(sizeof(struct dvb_usb_device_properties), GFP_KERNEL);</div><div class='add'>+	s660 = kmemdup(&amp;s6x0_properties,</div><div class='add'>+		       sizeof(struct dvb_usb_device_properties), GFP_KERNEL);</div><div class='ctx'> 	if (!s660) {</div><div class='ctx'> 		kfree(p1100);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	memcpy(s660, &amp;s6x0_properties,</div><div class='del'>-			sizeof(struct dvb_usb_device_properties));</div><div class='ctx'> 	s660-&gt;firmware = "dvb-usb-s660.fw";</div><div class='ctx'> 	s660-&gt;num_device_descs = 3;</div><div class='ctx'> 	s660-&gt;devices[0] = d660;</div><div class='hunk'>@@ -1886,14 +1902,13 @@ static int dw2102_probe(struct usb_interface *intf,</div><div class='ctx'> 	s660-&gt;devices[2] = d480_2;</div><div class='ctx'> 	s660-&gt;adapter-&gt;fe[0].frontend_attach = ds3000_frontend_attach;</div><div class='ctx'> </div><div class='del'>-	p7500 = kzalloc(sizeof(struct dvb_usb_device_properties), GFP_KERNEL);</div><div class='add'>+	p7500 = kmemdup(&amp;s6x0_properties,</div><div class='add'>+			sizeof(struct dvb_usb_device_properties), GFP_KERNEL);</div><div class='ctx'> 	if (!p7500) {</div><div class='ctx'> 		kfree(p1100);</div><div class='ctx'> 		kfree(s660);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	memcpy(p7500, &amp;s6x0_properties,</div><div class='del'>-			sizeof(struct dvb_usb_device_properties));</div><div class='ctx'> 	p7500-&gt;firmware = "dvb-usb-p7500.fw";</div><div class='ctx'> 	p7500-&gt;devices[0] = d7500;</div><div class='ctx'> 	p7500-&gt;rc.legacy.rc_map_table = rc_map_tbs_table;</div><div class='hunk'>@@ -1928,22 +1943,7 @@ static struct usb_driver dw2102_driver = {</div><div class='ctx'> 	.id_table = dw2102_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init dw2102_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret =  usb_register(&amp;dw2102_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		err("usb_register failed. Error number %d", ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit dw2102_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;dw2102_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(dw2102_module_init);</div><div class='del'>-module_exit(dw2102_module_exit);</div><div class='add'>+module_usb_driver(dw2102_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Igor M. Liplianin (c) liplianin@me.by");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101, 2102, DVB-S2 2104,"</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/ec168.c b/drivers/media/dvb/dvb-usb/ec168.c<br/>index 78442fe4aa5e..b4989ba8897d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/ec168.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/ec168.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/ec168.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/ec168.c</a></div><div class='hunk'>@@ -428,27 +428,7 @@ static struct usb_driver ec168_driver = {</div><div class='ctx'> 	.id_table   = ec168_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init ec168_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	deb_info("%s:\n", __func__);</div><div class='del'>-	ret = usb_register(&amp;ec168_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		err("module init failed:%d", ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ec168_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	deb_info("%s:\n", __func__);</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;ec168_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ec168_module_init);</div><div class='del'>-module_exit(ec168_module_exit);</div><div class='add'>+module_usb_driver(ec168_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Antti Palosaari &lt;crope@iki.fi&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("E3C EC168 DVB-T USB2.0 driver");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/friio-fe.c b/drivers/media/dvb/dvb-usb/friio-fe.c<br/>index 015b4e8af1a5..90a70c66a96e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/friio-fe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/friio-fe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/friio-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/friio-fe.c</a></div><div class='hunk'>@@ -282,23 +282,24 @@ static int jdvbt90502_set_property(struct dvb_frontend *fe,</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int jdvbt90502_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-				   struct dvb_frontend_parameters *p)</div><div class='add'>+static int jdvbt90502_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	p-&gt;inversion = INVERSION_AUTO;</div><div class='del'>-	p-&gt;u.ofdm.bandwidth = BANDWIDTH_6_MHZ;</div><div class='del'>-	p-&gt;u.ofdm.code_rate_HP = FEC_AUTO;</div><div class='del'>-	p-&gt;u.ofdm.code_rate_LP = FEC_AUTO;</div><div class='del'>-	p-&gt;u.ofdm.constellation = QAM_64;</div><div class='del'>-	p-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_AUTO;</div><div class='del'>-	p-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_AUTO;</div><div class='del'>-	p-&gt;u.ofdm.hierarchy_information = HIERARCHY_AUTO;</div><div class='add'>+	p-&gt;bandwidth_hz = 6000000;</div><div class='add'>+	p-&gt;code_rate_HP = FEC_AUTO;</div><div class='add'>+	p-&gt;code_rate_LP = FEC_AUTO;</div><div class='add'>+	p-&gt;modulation = QAM_64;</div><div class='add'>+	p-&gt;transmission_mode = TRANSMISSION_MODE_AUTO;</div><div class='add'>+	p-&gt;guard_interval = GUARD_INTERVAL_AUTO;</div><div class='add'>+	p-&gt;hierarchy = HIERARCHY_AUTO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int jdvbt90502_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-				   struct dvb_frontend_parameters *p)</div><div class='add'>+static int jdvbt90502_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * NOTE: ignore all the parameters except frequency.</div><div class='ctx'> 	 *       others should be fixed to the proper value for ISDB-T,</div><div class='hunk'>@@ -438,14 +439,12 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops jdvbt90502_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_ISDBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Comtech JDVBT90502 ISDB-T",</div><div class='del'>-		.type			= FE_OFDM,</div><div class='ctx'> 		.frequency_min		= 473000000, /* UHF 13ch, center */</div><div class='ctx'> 		.frequency_max		= 767142857, /* UHF 62ch, center */</div><div class='del'>-		.frequency_stepsize	= JDVBT90502_PLL_CLK /</div><div class='del'>-							JDVBT90502_PLL_DIVIDER,</div><div class='add'>+		.frequency_stepsize	= JDVBT90502_PLL_CLK / JDVBT90502_PLL_DIVIDER,</div><div class='ctx'> 		.frequency_tolerance	= 0,</div><div class='ctx'> </div><div class='ctx'> 		/* NOTE: this driver ignores all parameters but frequency. */</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/friio.c b/drivers/media/dvb/dvb-usb/friio.c<br/>index b092dc2137cd..474a17e4db0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/friio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/friio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/friio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/friio.c</a></div><div class='hunk'>@@ -514,28 +514,7 @@ static struct usb_driver friio_driver = {</div><div class='ctx'> 	.id_table	= friio_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init friio_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = usb_register(&amp;friio_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		err("usb_register failed. Error number %d", ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void __exit friio_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;friio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(friio_module_init);</div><div class='del'>-module_exit(friio_module_exit);</div><div class='add'>+module_usb_driver(friio_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Akihiro Tsukada &lt;tskd2@yahoo.co.jp&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for Friio ISDB-T USB2.0 Receiver");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/gl861.c b/drivers/media/dvb/dvb-usb/gl861.c<br/>index 63681df244c4..c1f5582e1cdf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/gl861.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/gl861.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/gl861.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/gl861.c</a></div><div class='hunk'>@@ -209,26 +209,7 @@ static struct usb_driver gl861_driver = {</div><div class='ctx'> 	.id_table	= gl861_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init gl861_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = usb_register(&amp;gl861_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		err("usb_register failed. Error number %d", ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit gl861_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;gl861_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(gl861_module_init);</div><div class='del'>-module_exit(gl861_module_exit);</div><div class='add'>+module_usb_driver(gl861_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Carl Lundqvist &lt;comabug@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver MSI Mega Sky 580 DVB-T USB2.0 / GL861");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/gp8psk-fe.c b/drivers/media/dvb/dvb-usb/gp8psk-fe.c<br/>index 5426267980c7..67957dd99ede 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/gp8psk-fe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/gp8psk-fe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/gp8psk-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/gp8psk-fe.c</a></div><div class='hunk'>@@ -113,28 +113,12 @@ static int gp8psk_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_front</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int gp8psk_fe_set_property(struct dvb_frontend *fe,</div><div class='del'>-	struct dtv_property *tvp)</div><div class='del'>-{</div><div class='del'>-	deb_fe("%s(..)\n", __func__);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gp8psk_fe_get_property(struct dvb_frontend *fe,</div><div class='del'>-	struct dtv_property *tvp)</div><div class='del'>-{</div><div class='del'>-	deb_fe("%s(..)\n", __func__);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int gp8psk_fe_set_frontend(struct dvb_frontend* fe,</div><div class='del'>-				  struct dvb_frontend_parameters *fep)</div><div class='add'>+static int gp8psk_fe_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct gp8psk_fe_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	u8 cmd[10];</div><div class='del'>-	u32 freq = fep-&gt;frequency * 1000;</div><div class='add'>+	u32 freq = c-&gt;frequency * 1000;</div><div class='ctx'> 	int gp_product_id = le16_to_cpu(state-&gt;d-&gt;udev-&gt;descriptor.idProduct);</div><div class='ctx'> </div><div class='ctx'> 	deb_fe("%s()\n", __func__);</div><div class='hunk'>@@ -342,9 +326,9 @@ success:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops gp8psk_fe_ops = {</div><div class='add'>+	.delsys = { SYS_DVBS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Genpix DVB-S",</div><div class='del'>-		.type			= FE_QPSK,</div><div class='ctx'> 		.frequency_min		= 800000,</div><div class='ctx'> 		.frequency_max		= 2250000,</div><div class='ctx'> 		.frequency_stepsize	= 100,</div><div class='hunk'>@@ -366,8 +350,6 @@ static struct dvb_frontend_ops gp8psk_fe_ops = {</div><div class='ctx'> 	.init = NULL,</div><div class='ctx'> 	.sleep = NULL,</div><div class='ctx'> </div><div class='del'>-	.set_property = gp8psk_fe_set_property,</div><div class='del'>-	.get_property = gp8psk_fe_get_property,</div><div class='ctx'> 	.set_frontend = gp8psk_fe_set_frontend,</div><div class='ctx'> </div><div class='ctx'> 	.get_tune_settings = gp8psk_fe_get_tune_settings,</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/gp8psk.c b/drivers/media/dvb/dvb-usb/gp8psk.c<br/>index 5f71284703d0..5d0384dd45b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/gp8psk.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/gp8psk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/gp8psk.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/gp8psk.c</a></div><div class='hunk'>@@ -320,26 +320,7 @@ static struct usb_driver gp8psk_usb_driver = {</div><div class='ctx'> 	.id_table	= gp8psk_usb_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init gp8psk_usb_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	if ((result = usb_register(&amp;gp8psk_usb_driver))) {</div><div class='del'>-		err("usb_register failed. (%d)",result);</div><div class='del'>-		return result;</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 gp8psk_usb_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;gp8psk_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(gp8psk_usb_module_init);</div><div class='del'>-module_exit(gp8psk_usb_module_exit);</div><div class='add'>+module_usb_driver(gp8psk_usb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Alan Nisota &lt;alannisota@gamil.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for Genpix DVB-S");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/it913x.c b/drivers/media/dvb/dvb-usb/it913x.c<br/>index c46226187143..9f01cd7a6e3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/it913x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/it913x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/it913x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/it913x.c</a></div><div class='hunk'>@@ -52,42 +52,59 @@ static int pid_filter;</div><div class='ctx'> module_param_named(pid, pid_filter, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(pid, "set default 0=on 1=off");</div><div class='ctx'> </div><div class='add'>+static int dvb_usb_it913x_firmware;</div><div class='add'>+module_param_named(firmware, dvb_usb_it913x_firmware, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(firmware, "set firmware 0=auto 1=IT9137 2=IT9135V1");</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> int cmd_counter;</div><div class='ctx'> </div><div class='ctx'> DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);</div><div class='ctx'> </div><div class='ctx'> struct it913x_state {</div><div class='ctx'> 	u8 id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ite_config {</div><div class='del'>-	u8 chip_ver;</div><div class='del'>-	u16 chip_type;</div><div class='del'>-	u32 firmware;</div><div class='del'>-	u8 tuner_id_0;</div><div class='del'>-	u8 tuner_id_1;</div><div class='del'>-	u8 dual_mode;</div><div class='add'>+	struct ite_config it913x_config;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ite_config it913x_config;</div><div class='ctx'> </div><div class='add'>+#define IT913X_RETRY	10</div><div class='add'>+#define IT913X_SND_TIMEOUT	100</div><div class='add'>+#define IT913X_RCV_TIMEOUT	200</div><div class='add'>+</div><div class='ctx'> static int it913x_bulk_write(struct usb_device *dev,</div><div class='ctx'> 				u8 *snd, int len, u8 pipe)</div><div class='ctx'> {</div><div class='del'>-	int ret, actual_l;</div><div class='add'>+	int ret, actual_l, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IT913X_RETRY; i++) {</div><div class='add'>+		ret = usb_bulk_msg(dev, usb_sndbulkpipe(dev, pipe),</div><div class='add'>+				snd, len , &amp;actual_l, IT913X_SND_TIMEOUT);</div><div class='add'>+		if (ret == 0 || ret != -EBUSY || ret != -ETIMEDOUT)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len != actual_l &amp;&amp; ret == 0)</div><div class='add'>+		ret = -EAGAIN;</div><div class='ctx'> </div><div class='del'>-	ret = usb_bulk_msg(dev, usb_sndbulkpipe(dev, pipe),</div><div class='del'>-				snd, len , &amp;actual_l, 100);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int it913x_bulk_read(struct usb_device *dev,</div><div class='ctx'> 				u8 *rev, int len, u8 pipe)</div><div class='ctx'> {</div><div class='del'>-	int ret, actual_l;</div><div class='add'>+	int ret, actual_l, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IT913X_RETRY; i++) {</div><div class='add'>+		ret = usb_bulk_msg(dev, usb_rcvbulkpipe(dev, pipe),</div><div class='add'>+				 rev, len , &amp;actual_l, IT913X_RCV_TIMEOUT);</div><div class='add'>+		if (ret == 0 || ret != -EBUSY || ret != -ETIMEDOUT)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len != actual_l &amp;&amp; ret == 0)</div><div class='add'>+		ret = -EAGAIN;</div><div class='ctx'> </div><div class='del'>-	ret = usb_bulk_msg(dev, usb_rcvbulkpipe(dev, pipe),</div><div class='del'>-				 rev, len , &amp;actual_l, 200);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -100,7 +117,7 @@ static u16 check_sum(u8 *p, u8 len)</div><div class='ctx'> 	return ~sum;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int it913x_io(struct usb_device *udev, u8 mode, u8 pro,</div><div class='add'>+static int it913x_usb_talk(struct usb_device *udev, u8 mode, u8 pro,</div><div class='ctx'> 			u8 cmd, u32 reg, u8 addr, u8 *data, u8 len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0, i, buf_size = 1;</div><div class='hunk'>@@ -159,22 +176,41 @@ static int it913x_io(struct usb_device *udev, u8 mode, u8 pro,</div><div class='ctx'> 	buff[buf_size++] = (chk_sum &amp; 0xff);</div><div class='ctx'> </div><div class='ctx'> 	ret = it913x_bulk_write(udev, buff, buf_size , 0x02);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='del'>-	ret |= it913x_bulk_read(udev, buff, (mode &amp; 1) ?</div><div class='add'>+	ret = it913x_bulk_read(udev, buff, (mode &amp; 1) ?</div><div class='ctx'> 			5 : len + 5 , 0x01);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='ctx'> 	rlen = (mode &amp; 0x1) ? 0x1 : len;</div><div class='ctx'> </div><div class='ctx'> 	if (mode &amp; 1)</div><div class='del'>-		ret |= buff[2];</div><div class='add'>+		ret = buff[2];</div><div class='ctx'> 	else</div><div class='ctx'> 		memcpy(data, &amp;buff[3], rlen);</div><div class='ctx'> </div><div class='ctx'> 	cmd_counter++;</div><div class='ctx'> </div><div class='del'>-	kfree(buff);</div><div class='add'>+error:	kfree(buff);</div><div class='ctx'> </div><div class='del'>-	return (ret &lt; 0) ? -ENODEV : 0;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int it913x_io(struct usb_device *udev, u8 mode, u8 pro,</div><div class='add'>+			u8 cmd, u32 reg, u8 addr, u8 *data, u8 len)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IT913X_RETRY; i++) {</div><div class='add'>+		ret = it913x_usb_talk(udev, mode, pro,</div><div class='add'>+			cmd, reg, addr, data, len);</div><div class='add'>+		if (ret != -EAGAIN)</div><div class='add'>+			break;</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 it913x_wr_reg(struct usb_device *udev, u8 pro, u32 reg , u8 data)</div><div class='hunk'>@@ -223,15 +259,15 @@ static u32 it913x_query(struct usb_device *udev, u8 pro)</div><div class='ctx'> </div><div class='ctx'> static int it913x_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	struct usb_device *udev = adap-&gt;dev-&gt;udev;</div><div class='add'>+	int ret;</div><div class='ctx'> 	u8 pro = (adap-&gt;id == 0) ? DEV_0_DMOD : DEV_1_DMOD;</div><div class='ctx'> </div><div class='ctx'> 	if (mutex_lock_interruptible(&amp;adap-&gt;dev-&gt;i2c_mutex) &lt; 0)</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 	deb_info(1, "PID_C  (%02x)", onoff);</div><div class='ctx'> </div><div class='del'>-	if (!onoff)</div><div class='del'>-		ret = it913x_wr_reg(adap-&gt;dev-&gt;udev, pro, PID_RST, 0x1);</div><div class='add'>+	ret = it913x_wr_reg(udev, pro, PID_EN, onoff);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;adap-&gt;dev-&gt;i2c_mutex);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -241,27 +277,20 @@ static int it913x_pid_filter(struct dvb_usb_adapter *adap,</div><div class='ctx'> 		int index, u16 pid, int onoff)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *udev = adap-&gt;dev-&gt;udev;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> 	u8 pro = (adap-&gt;id == 0) ? DEV_0_DMOD : DEV_1_DMOD;</div><div class='ctx'> </div><div class='del'>-	if (pid_filter &gt; 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	if (mutex_lock_interruptible(&amp;adap-&gt;dev-&gt;i2c_mutex) &lt; 0)</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 	deb_info(1, "PID_F  (%02x)", onoff);</div><div class='del'>-	if (onoff) {</div><div class='del'>-		ret = it913x_wr_reg(udev, pro, PID_EN, 0x1);</div><div class='del'>-</div><div class='del'>-		ret |= it913x_wr_reg(udev, pro, PID_LSB, (u8)(pid &amp; 0xff));</div><div class='ctx'> </div><div class='del'>-		ret |= it913x_wr_reg(udev, pro, PID_MSB, (u8)(pid &gt;&gt; 8));</div><div class='add'>+	ret = it913x_wr_reg(udev, pro, PID_LSB, (u8)(pid &amp; 0xff));</div><div class='ctx'> </div><div class='del'>-		ret |= it913x_wr_reg(udev, pro, PID_INX_EN, (u8)onoff);</div><div class='add'>+	ret |= it913x_wr_reg(udev, pro, PID_MSB, (u8)(pid &gt;&gt; 8));</div><div class='ctx'> </div><div class='del'>-		ret |= it913x_wr_reg(udev, pro, PID_INX, (u8)(index &amp; 0x1f));</div><div class='add'>+	ret |= it913x_wr_reg(udev, pro, PID_INX_EN, (u8)onoff);</div><div class='ctx'> </div><div class='del'>-	}</div><div class='add'>+	ret |= it913x_wr_reg(udev, pro, PID_INX, (u8)(index &amp; 0x1f));</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;adap-&gt;dev-&gt;i2c_mutex);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -337,15 +366,73 @@ static int it913x_rc_query(struct dvb_usb_device *d)</div><div class='ctx'> </div><div class='ctx'> 	if ((ibuf[2] + ibuf[3]) == 0xff) {</div><div class='ctx'> 		key = ibuf[2];</div><div class='del'>-		key += ibuf[0] &lt;&lt; 8;</div><div class='del'>-		deb_info(1, "INT Key =%08x", key);</div><div class='add'>+		key += ibuf[0] &lt;&lt; 16;</div><div class='add'>+		key += ibuf[1] &lt;&lt; 8;</div><div class='add'>+		deb_info(1, "NEC Extended Key =%08x", key);</div><div class='ctx'> 		if (d-&gt;rc_dev != NULL)</div><div class='ctx'> 			rc_keydown(d-&gt;rc_dev, key, 0);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;d-&gt;i2c_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* Firmware sets raw */</div><div class='add'>+const char fw_it9135_v1[] = "dvb-usb-it9135-01.fw";</div><div class='add'>+const char fw_it9135_v2[] = "dvb-usb-it9135-02.fw";</div><div class='add'>+const char fw_it9137[] = "dvb-usb-it9137-01.fw";</div><div class='add'>+</div><div class='add'>+static int ite_firmware_select(struct usb_device *udev,</div><div class='add'>+	struct dvb_usb_device_properties *props)</div><div class='add'>+{</div><div class='add'>+	int sw;</div><div class='add'>+	/* auto switch */</div><div class='add'>+	if (le16_to_cpu(udev-&gt;descriptor.idProduct) ==</div><div class='add'>+			USB_PID_ITETECH_IT9135)</div><div class='add'>+		sw = IT9135_V1_FW;</div><div class='add'>+	else if (le16_to_cpu(udev-&gt;descriptor.idProduct) ==</div><div class='add'>+			USB_PID_ITETECH_IT9135_9005)</div><div class='add'>+		sw = IT9135_V1_FW;</div><div class='add'>+	else if (le16_to_cpu(udev-&gt;descriptor.idProduct) ==</div><div class='add'>+			USB_PID_ITETECH_IT9135_9006) {</div><div class='add'>+		sw = IT9135_V2_FW;</div><div class='add'>+		if (it913x_config.tuner_id_0 == 0)</div><div class='add'>+			it913x_config.tuner_id_0 = IT9135_60;</div><div class='add'>+	} else</div><div class='add'>+		sw = IT9137_FW;</div><div class='add'>+</div><div class='add'>+	/* force switch */</div><div class='add'>+	if (dvb_usb_it913x_firmware != IT9135_AUTO)</div><div class='add'>+		sw = dvb_usb_it913x_firmware;</div><div class='add'>+</div><div class='add'>+	switch (sw) {</div><div class='add'>+	case IT9135_V1_FW:</div><div class='add'>+		it913x_config.firmware_ver = 1;</div><div class='add'>+		it913x_config.adc_x2 = 1;</div><div class='add'>+		props-&gt;firmware = fw_it9135_v1;</div><div class='add'>+		break;</div><div class='add'>+	case IT9135_V2_FW:</div><div class='add'>+		it913x_config.firmware_ver = 1;</div><div class='add'>+		it913x_config.adc_x2 = 1;</div><div class='add'>+		props-&gt;firmware = fw_it9135_v2;</div><div class='add'>+		break;</div><div class='add'>+	case IT9137_FW:</div><div class='add'>+	default:</div><div class='add'>+		it913x_config.firmware_ver = 0;</div><div class='add'>+		it913x_config.adc_x2 = 0;</div><div class='add'>+		props-&gt;firmware = fw_it9137;</div><div 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 TS_MPEG_PKT_SIZE	188</div><div class='add'>+#define EP_LOW			21</div><div class='add'>+#define TS_BUFFER_SIZE_PID	(EP_LOW*TS_MPEG_PKT_SIZE)</div><div class='add'>+#define EP_HIGH			348</div><div class='add'>+#define TS_BUFFER_SIZE_MAX	(EP_HIGH*TS_MPEG_PKT_SIZE)</div><div class='add'>+</div><div class='ctx'> static int it913x_identify_state(struct usb_device *udev,</div><div class='ctx'> 		struct dvb_usb_device_properties *props,</div><div class='ctx'> 		struct dvb_usb_device_description **desc,</div><div class='hunk'>@@ -359,6 +446,19 @@ static int it913x_identify_state(struct usb_device *udev,</div><div class='ctx'> 	/* checnk for dual mode */</div><div class='ctx'> 	it913x_config.dual_mode =  it913x_read_reg(udev, 0x49c5);</div><div class='ctx'> </div><div class='add'>+	if (udev-&gt;speed != USB_SPEED_HIGH) {</div><div class='add'>+		props-&gt;adapter[0].fe[0].pid_filter_count = 5;</div><div class='add'>+		info("USB 1 low speed mode - connect to USB 2 port");</div><div class='add'>+		if (pid_filter &gt; 0)</div><div class='add'>+			pid_filter = 0;</div><div class='add'>+		if (it913x_config.dual_mode) {</div><div class='add'>+			it913x_config.dual_mode = 0;</div><div class='add'>+			info("Dual mode not supported in USB 1");</div><div class='add'>+		}</div><div class='add'>+	} else /* For replugging */</div><div class='add'>+		if(props-&gt;adapter[0].fe[0].pid_filter_count == 5)</div><div class='add'>+			props-&gt;adapter[0].fe[0].pid_filter_count = 31;</div><div class='add'>+</div><div class='ctx'> 	/* TODO different remotes */</div><div class='ctx'> 	remote = it913x_read_reg(udev, 0x49ac); /* Remote */</div><div class='ctx'> 	if (remote == 0)</div><div class='hunk'>@@ -370,6 +470,28 @@ static int it913x_identify_state(struct usb_device *udev,</div><div class='ctx'> 	info("Dual mode=%x Remote=%x Tuner Type=%x", it913x_config.dual_mode</div><div class='ctx'> 		, remote, it913x_config.tuner_id_0);</div><div class='ctx'> </div><div class='add'>+	/* Select Stream Buffer Size and pid filter option*/</div><div class='add'>+	if (pid_filter) {</div><div class='add'>+		props-&gt;adapter[0].fe[0].stream.u.bulk.buffersize =</div><div class='add'>+			TS_BUFFER_SIZE_MAX;</div><div class='add'>+		props-&gt;adapter[0].fe[0].caps &amp;=</div><div class='add'>+			~DVB_USB_ADAP_NEED_PID_FILTERING;</div><div class='add'>+	} else</div><div class='add'>+		props-&gt;adapter[0].fe[0].stream.u.bulk.buffersize =</div><div class='add'>+			TS_BUFFER_SIZE_PID;</div><div class='add'>+</div><div class='add'>+	if (it913x_config.dual_mode) {</div><div class='add'>+		props-&gt;adapter[1].fe[0].stream.u.bulk.buffersize =</div><div class='add'>+			props-&gt;adapter[0].fe[0].stream.u.bulk.buffersize;</div><div class='add'>+		props-&gt;num_adapters = 2;</div><div class='add'>+		if (pid_filter)</div><div class='add'>+			props-&gt;adapter[1].fe[0].caps =</div><div class='add'>+				props-&gt;adapter[0].fe[0].caps;</div><div class='add'>+	} else</div><div class='add'>+		props-&gt;num_adapters = 1;</div><div class='add'>+</div><div class='add'>+	ret = ite_firmware_select(udev, props);</div><div class='add'>+</div><div class='ctx'> 	if (firm_no &gt; 0) {</div><div class='ctx'> 		*cold = 0;</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -391,18 +513,22 @@ static int it913x_identify_state(struct usb_device *udev,</div><div class='ctx'> 				ret = it913x_wr_reg(udev, DEV_0,</div><div class='ctx'> 					GPIOH1_O, 0x0);</div><div class='ctx'> 		}</div><div class='del'>-		props-&gt;num_adapters = 2;</div><div class='del'>-	} else</div><div class='del'>-		props-&gt;num_adapters = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	reg = it913x_read_reg(udev, IO_MUX_POWER_CLK);</div><div class='ctx'> </div><div class='ctx'> 	if (it913x_config.dual_mode) {</div><div class='ctx'> 		ret |= it913x_wr_reg(udev, DEV_0, 0x4bfb, CHIP2_I2C_ADDR);</div><div class='del'>-		ret |= it913x_wr_reg(udev, DEV_0,  CLK_O_EN, 0x1);</div><div class='add'>+		if (it913x_config.firmware_ver == 1)</div><div class='add'>+			ret |= it913x_wr_reg(udev, DEV_0,  0xcfff, 0x1);</div><div class='add'>+		else</div><div class='add'>+			ret |= it913x_wr_reg(udev, DEV_0,  CLK_O_EN, 0x1);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret |= it913x_wr_reg(udev, DEV_0, 0x4bfb, 0x0);</div><div class='del'>-		ret |= it913x_wr_reg(udev, DEV_0,  CLK_O_EN, 0x0);</div><div class='add'>+		if (it913x_config.firmware_ver == 1)</div><div class='add'>+			ret |= it913x_wr_reg(udev, DEV_0,  0xcfff, 0x0);</div><div class='add'>+		else</div><div class='add'>+			ret |= it913x_wr_reg(udev, DEV_0,  CLK_O_EN, 0x0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*cold = 1;</div><div class='hunk'>@@ -428,35 +554,45 @@ static int it913x_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int it913x_download_firmware(struct usb_device *udev,</div><div class='ctx'> 					const struct firmware *fw)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0, i;</div><div class='del'>-	u8 packet_size, dlen;</div><div class='add'>+	int ret = 0, i = 0, pos = 0;</div><div class='add'>+	u8 packet_size, min_pkt;</div><div class='ctx'> 	u8 *fw_data;</div><div class='ctx'> </div><div class='del'>-	packet_size = 0x29;</div><div class='del'>-</div><div class='ctx'> 	ret = it913x_wr_reg(udev, DEV_0,  I2C_CLK, I2C_CLK_100);</div><div class='ctx'> </div><div class='ctx'> 	info("FRM Starting Firmware Download");</div><div class='del'>-	/* This uses scatter write firmware headers follow */</div><div class='del'>-	/* 03 XX 00     XX = chip number? */ </div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; fw-&gt;size; i += packet_size) {</div><div class='del'>-			if (i &gt; 0)</div><div class='del'>-				packet_size = 0x39;</div><div class='del'>-			fw_data = (u8 *)(fw-&gt;data + i);</div><div class='del'>-			dlen = ((i + packet_size) &gt; fw-&gt;size)</div><div class='del'>-				? (fw-&gt;size - i) : packet_size;</div><div class='del'>-			ret |= it913x_io(udev, WRITE_DATA, DEV_0,</div><div class='del'>-				CMD_SCATTER_WRITE, 0, 0, fw_data, dlen);</div><div class='del'>-			udelay(1000);</div><div class='add'>+</div><div class='add'>+	/* Multi firmware loader */</div><div class='add'>+	/* This uses scatter write firmware headers */</div><div class='add'>+	/* The firmware must start with 03 XX 00 */</div><div class='add'>+	/* and be the extact firmware length */</div><div class='add'>+</div><div class='add'>+	if (it913x_config.chip_ver == 2)</div><div class='add'>+		min_pkt = 0x11;</div><div class='add'>+	else</div><div class='add'>+		min_pkt = 0x19;</div><div class='add'>+</div><div class='add'>+	while (i &lt;= fw-&gt;size) {</div><div class='add'>+		if (((fw-&gt;data[i] == 0x3) &amp;&amp; (fw-&gt;data[i + 2] == 0x0))</div><div class='add'>+			|| (i == fw-&gt;size)) {</div><div class='add'>+			packet_size = i - pos;</div><div class='add'>+			if ((packet_size &gt; min_pkt) || (i == fw-&gt;size)) {</div><div class='add'>+				fw_data = (u8 *)(fw-&gt;data + pos);</div><div class='add'>+				pos += packet_size;</div><div class='add'>+				if (packet_size &gt; 0)</div><div class='add'>+					ret |= it913x_io(udev, WRITE_DATA,</div><div class='add'>+						DEV_0, CMD_SCATTER_WRITE, 0,</div><div class='add'>+						0, fw_data, packet_size);</div><div class='add'>+				udelay(1000);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		i++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret |= it913x_io(udev, WRITE_CMD, DEV_0,</div><div class='del'>-			CMD_BOOT, 0, 0, NULL, 0);</div><div class='add'>+	ret |= it913x_io(udev, WRITE_CMD, DEV_0, CMD_BOOT, 0, 0, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> 	msleep(100);</div><div class='ctx'> </div><div class='hunk'>@@ -474,12 +610,17 @@ static int it913x_download_firmware(struct usb_device *udev,</div><div class='ctx'> 	/* Tuner function */</div><div class='ctx'> 	if (it913x_config.dual_mode)</div><div class='ctx'> 		ret |= it913x_wr_reg(udev, DEV_0_DMOD , 0xec4c, 0xa0);</div><div class='del'>-</div><div class='del'>-	ret |= it913x_wr_reg(udev, DEV_0,  PADODPU, 0x0);</div><div class='del'>-	ret |= it913x_wr_reg(udev, DEV_0,  AGC_O_D, 0x0);</div><div class='del'>-	if (it913x_config.dual_mode) {</div><div class='del'>-		ret |= it913x_wr_reg(udev, DEV_1,  PADODPU, 0x0);</div><div class='del'>-		ret |= it913x_wr_reg(udev, DEV_1,  AGC_O_D, 0x0);</div><div class='add'>+	else</div><div class='add'>+		ret |= it913x_wr_reg(udev, DEV_0_DMOD , 0xec4c, 0x68);</div><div class='add'>+</div><div class='add'>+	if ((it913x_config.chip_ver == 1) &amp;&amp;</div><div class='add'>+		(it913x_config.chip_type == 0x9135)) {</div><div class='add'>+		ret |= it913x_wr_reg(udev, DEV_0,  PADODPU, 0x0);</div><div class='add'>+		ret |= it913x_wr_reg(udev, DEV_0,  AGC_O_D, 0x0);</div><div class='add'>+		if (it913x_config.dual_mode) {</div><div class='add'>+			ret |= it913x_wr_reg(udev, DEV_1,  PADODPU, 0x0);</div><div class='add'>+			ret |= it913x_wr_reg(udev, DEV_1,  AGC_O_D, 0x0);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return (ret &lt; 0) ? -ENODEV : 0;</div><div class='hunk'>@@ -500,32 +641,23 @@ static int it913x_name(struct dvb_usb_adapter *adap)</div><div class='ctx'> static int it913x_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *udev = adap-&gt;dev-&gt;udev;</div><div class='add'>+	struct it913x_state *st = adap-&gt;dev-&gt;priv;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	u8 adf = it913x_read_reg(udev, IO_MUX_POWER_CLK);</div><div class='ctx'> 	u8 adap_addr = I2C_BASE_ADDR + (adap-&gt;id &lt;&lt; 5);</div><div class='del'>-	u16 ep_size = adap-&gt;props.fe[0].stream.u.bulk.buffersize;</div><div class='del'>-	u8 tuner_id, tuner_type;</div><div class='add'>+	u16 ep_size = adap-&gt;props.fe[0].stream.u.bulk.buffersize / 4;</div><div class='add'>+	u8 pkt_size = 0x80;</div><div class='add'>+</div><div class='add'>+	if (adap-&gt;dev-&gt;udev-&gt;speed != USB_SPEED_HIGH)</div><div class='add'>+		pkt_size = 0x10;</div><div class='add'>+</div><div class='add'>+	it913x_config.adf = it913x_read_reg(udev, IO_MUX_POWER_CLK);</div><div class='ctx'> </div><div class='ctx'> 	if (adap-&gt;id == 0)</div><div class='del'>-		tuner_id = it913x_config.tuner_id_0;</div><div class='del'>-	else</div><div class='del'>-		tuner_id = it913x_config.tuner_id_1;</div><div class='del'>-</div><div class='del'>-	/* TODO we always use IT9137 possible references here*/</div><div class='del'>-	/* Documentation suggests don't care */</div><div class='del'>-	switch (tuner_id) {</div><div class='del'>-	case 0x51:</div><div class='del'>-	case 0x52:</div><div class='del'>-	case 0x60:</div><div class='del'>-	case 0x61:</div><div class='del'>-	case 0x62:</div><div class='del'>-	default:</div><div class='del'>-	case 0x38:</div><div class='del'>-		tuner_type = IT9137;</div><div class='del'>-	}</div><div class='add'>+		memcpy(&amp;st-&gt;it913x_config, &amp;it913x_config,</div><div class='add'>+			sizeof(struct ite_config));</div><div class='ctx'> </div><div class='ctx'> 	adap-&gt;fe_adap[0].fe = dvb_attach(it913x_fe_attach,</div><div class='del'>-		&amp;adap-&gt;dev-&gt;i2c_adap, adap_addr, adf, tuner_type);</div><div class='add'>+		&amp;adap-&gt;dev-&gt;i2c_adap, adap_addr, &amp;st-&gt;it913x_config);</div><div class='ctx'> </div><div class='ctx'> 	if (adap-&gt;id == 0 &amp;&amp; adap-&gt;fe_adap[0].fe) {</div><div class='ctx'> 		ret = it913x_wr_reg(udev, DEV_0_DMOD, MP2_SW_RST, 0x1);</div><div class='hunk'>@@ -536,13 +668,13 @@ static int it913x_frontend_attach(struct dvb_usb_adapter *adap)</div><div class='ctx'> 		ret = it913x_wr_reg(udev, DEV_0, EP4_TX_LEN_LSB,</div><div class='ctx'> 					ep_size &amp; 0xff);</div><div class='ctx'> 		ret = it913x_wr_reg(udev, DEV_0, EP4_TX_LEN_MSB, ep_size &gt;&gt; 8);</div><div class='del'>-		ret = it913x_wr_reg(udev, DEV_0, EP4_MAX_PKT, 0x80);</div><div class='add'>+		ret = it913x_wr_reg(udev, DEV_0, EP4_MAX_PKT, pkt_size);</div><div class='ctx'> 	} else if (adap-&gt;id == 1 &amp;&amp; adap-&gt;fe_adap[0].fe) {</div><div class='ctx'> 		ret = it913x_wr_reg(udev, DEV_0, EP0_TX_EN, 0x6f);</div><div class='ctx'> 		ret = it913x_wr_reg(udev, DEV_0, EP5_TX_LEN_LSB,</div><div class='ctx'> 					ep_size &amp; 0xff);</div><div class='ctx'> 		ret = it913x_wr_reg(udev, DEV_0, EP5_TX_LEN_MSB, ep_size &gt;&gt; 8);</div><div class='del'>-		ret = it913x_wr_reg(udev, DEV_0, EP5_MAX_PKT, 0x80);</div><div class='add'>+		ret = it913x_wr_reg(udev, DEV_0, EP5_MAX_PKT, pkt_size);</div><div class='ctx'> 		ret = it913x_wr_reg(udev, DEV_0_DMOD, MP2IF2_EN, 0x1);</div><div class='ctx'> 		ret = it913x_wr_reg(udev, DEV_1_DMOD, MP2IF_SERIAL, 0x1);</div><div class='ctx'> 		ret = it913x_wr_reg(udev, DEV_1, TOP_HOSTB_SER_MODE, 0x1);</div><div class='hunk'>@@ -582,6 +714,9 @@ static int it913x_probe(struct usb_interface *intf,</div><div class='ctx'> static struct usb_device_id it913x_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_UB499_2T_T09) },</div><div class='ctx'> 	{ USB_DEVICE(USB_VID_ITETECH, USB_PID_ITETECH_IT9135) },</div><div class='add'>+	{ USB_DEVICE(USB_VID_KWORLD_2, USB_PID_SVEON_STV22_IT9137) },</div><div class='add'>+	{ USB_DEVICE(USB_VID_ITETECH, USB_PID_ITETECH_IT9135_9005) },</div><div class='add'>+	{ USB_DEVICE(USB_VID_ITETECH, USB_PID_ITETECH_IT9135_9006) },</div><div class='ctx'> 	{}		/* Terminating entry */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -614,8 +749,8 @@ static struct dvb_usb_device_properties it913x_properties = {</div><div class='ctx'> 				.endpoint = 0x04,</div><div class='ctx'> 				.u = {/* Keep Low if PID filter on */</div><div class='ctx'> 					.bulk = {</div><div class='del'>-						.buffersize = 3584,</div><div class='del'>-</div><div class='add'>+					.buffersize =</div><div class='add'>+						TS_BUFFER_SIZE_PID,</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='hunk'>@@ -639,8 +774,8 @@ static struct dvb_usb_device_properties it913x_properties = {</div><div class='ctx'> 				.endpoint = 0x05,</div><div class='ctx'> 				.u = {</div><div class='ctx'> 					.bulk = {</div><div class='del'>-						.buffersize = 3584,</div><div class='del'>-</div><div class='add'>+						.buffersize =</div><div class='add'>+							TS_BUFFER_SIZE_PID,</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='hunk'>@@ -654,10 +789,10 @@ static struct dvb_usb_device_properties it913x_properties = {</div><div class='ctx'> 		.rc_query	= it913x_rc_query,</div><div class='ctx'> 		.rc_interval	= IT913X_POLL,</div><div class='ctx'> 		.allowed_protos	= RC_TYPE_NEC,</div><div class='del'>-		.rc_codes	= RC_MAP_KWORLD_315U,</div><div class='add'>+		.rc_codes	= RC_MAP_MSI_DIGIVOX_III,</div><div class='ctx'> 	},</div><div class='ctx'> 	.i2c_algo         = &amp;it913x_i2c_algo,</div><div class='del'>-	.num_device_descs = 2,</div><div class='add'>+	.num_device_descs = 5,</div><div class='ctx'> 	.devices = {</div><div class='ctx'> 		{   "Kworld UB499-2T T09(IT9137)",</div><div class='ctx'> 			{ &amp;it913x_table[0], NULL },</div><div class='hunk'>@@ -665,6 +800,15 @@ static struct dvb_usb_device_properties it913x_properties = {</div><div class='ctx'> 		{   "ITE 9135 Generic",</div><div class='ctx'> 			{ &amp;it913x_table[1], NULL },</div><div class='ctx'> 			},</div><div class='add'>+		{   "Sveon STV22 Dual DVB-T HDTV(IT9137)",</div><div class='add'>+			{ &amp;it913x_table[2], NULL },</div><div class='add'>+			},</div><div class='add'>+		{   "ITE 9135(9005) Generic",</div><div class='add'>+			{ &amp;it913x_table[3], NULL },</div><div class='add'>+			},</div><div class='add'>+		{   "ITE 9135(9006) Generic",</div><div class='add'>+			{ &amp;it913x_table[4], NULL },</div><div class='add'>+			},</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -675,28 +819,9 @@ static struct usb_driver it913x_driver = {</div><div class='ctx'> 	.id_table	= it913x_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init it913x_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result = usb_register(&amp;it913x_driver);</div><div class='del'>-	if (result) {</div><div class='del'>-		err("usb_register failed. Error number %d", result);</div><div class='del'>-		return result;</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 it913x_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;it913x_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(it913x_module_init);</div><div class='del'>-module_exit(it913x_module_exit);</div><div class='add'>+module_usb_driver(it913x_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Malcolm Priestley &lt;tvboxspy@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("it913x USB 2 Driver");</div><div class='del'>-MODULE_VERSION("1.07");</div><div class='add'>+MODULE_VERSION("1.22");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/lmedm04.c b/drivers/media/dvb/dvb-usb/lmedm04.c<br/>index b9228240f5ce..b3fe05bbffc9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/lmedm04.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/lmedm04.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/lmedm04.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/lmedm04.c</a></div><div class='hunk'>@@ -388,8 +388,7 @@ static int lme2510_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid,</div><div class='ctx'> 	deb_info(3, "%s PID=%04x Index=%04x onoff=%02x", __func__,</div><div class='ctx'> 		pid, index, onoff);</div><div class='ctx'> </div><div class='del'>-	if (onoff)</div><div class='del'>-		if (!pid_filter) {</div><div class='add'>+	if (onoff) {</div><div class='ctx'> 			ret = mutex_lock_interruptible(&amp;adap-&gt;dev-&gt;i2c_mutex);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				return -EAGAIN;</div><div class='hunk'>@@ -654,6 +653,9 @@ static int lme2510_identify_state(struct usb_device *udev,</div><div class='ctx'> 		struct dvb_usb_device_description **desc,</div><div class='ctx'> 		int *cold)</div><div class='ctx'> {</div><div class='add'>+	if (pid_filter &gt; 0)</div><div class='add'>+		props-&gt;adapter[0].fe[0].caps &amp;=</div><div class='add'>+			~DVB_USB_ADAP_NEED_PID_FILTERING;</div><div class='ctx'> 	*cold = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1289,28 +1291,9 @@ static struct usb_driver lme2510_driver = {</div><div class='ctx'> 	.id_table	= lme2510_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init lme2510_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result = usb_register(&amp;lme2510_driver);</div><div class='del'>-	if (result) {</div><div class='del'>-		err("usb_register failed. Error number %d", result);</div><div class='del'>-		return result;</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 lme2510_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;lme2510_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(lme2510_module_init);</div><div class='del'>-module_exit(lme2510_module_exit);</div><div class='add'>+module_usb_driver(lme2510_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Malcolm Priestley &lt;tvboxspy@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("LME2510(C) DVB-S USB2.0");</div><div class='del'>-MODULE_VERSION("1.90");</div><div class='add'>+MODULE_VERSION("1.91");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c<br/>index a1e1287c949e..288af29a8bb7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/m920x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/m920x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/m920x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/m920x.c</a></div><div class='hunk'>@@ -1086,27 +1086,7 @@ static struct usb_driver m920x_driver = {</div><div class='ctx'> 	.id_table	= m920x_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init m920x_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if ((ret = usb_register(&amp;m920x_driver))) {</div><div class='del'>-		err("usb_register failed. Error number %d", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit m920x_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;m920x_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init (m920x_module_init);</div><div class='del'>-module_exit (m920x_module_exit);</div><div class='add'>+module_usb_driver(m920x_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Aapo Tahkola &lt;aet@rasterburn.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("DVB Driver for ULI M920x");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-demod.c b/drivers/media/dvb/dvb-usb/mxl111sf-demod.c<br/>index d1f58371c711..d83df4bb72d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/mxl111sf-demod.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/mxl111sf-demod.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/mxl111sf-demod.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/mxl111sf-demod.c</a></div><div class='hunk'>@@ -102,8 +102,8 @@ fail:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static</div><div class='del'>-int mxl1x1sf_demod_get_tps_constellation(struct mxl111sf_demod_state *state,</div><div class='del'>-					 fe_modulation_t *constellation)</div><div class='add'>+int mxl1x1sf_demod_get_tps_modulation(struct mxl111sf_demod_state *state,</div><div class='add'>+					 fe_modulation_t *modulation)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val;</div><div class='ctx'> 	int ret = mxl111sf_demod_read_reg(state, V6_MODORDER_TPS_REG, &amp;val);</div><div class='hunk'>@@ -113,13 +113,13 @@ int mxl1x1sf_demod_get_tps_constellation(struct mxl111sf_demod_state *state,</div><div class='ctx'> </div><div class='ctx'> 	switch ((val &amp; V6_PARAM_CONSTELLATION_MASK) &gt;&gt; 4) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		*constellation = QPSK;</div><div class='add'>+		*modulation = QPSK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		*constellation = QAM_16;</div><div class='add'>+		*modulation = QAM_16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		*constellation = QAM_64;</div><div class='add'>+		*modulation = QAM_64;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> fail:</div><div class='hunk'>@@ -284,8 +284,7 @@ static int mxl1x1sf_demod_reset_irq_status(struct mxl111sf_demod_state *state)</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='del'>-static int mxl111sf_demod_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-				       struct dvb_frontend_parameters *param)</div><div class='add'>+static int mxl111sf_demod_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct mxl111sf_demod_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -303,7 +302,7 @@ static int mxl111sf_demod_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	mxl_dbg("()");</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		ret = fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+		ret = fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (mxl_fail(ret))</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		msleep(50);</div><div class='hunk'>@@ -481,13 +480,13 @@ static int mxl111sf_demod_read_signal_strength(struct dvb_frontend *fe,</div><div class='ctx'> 					       u16 *signal_strength)</div><div class='ctx'> {</div><div class='ctx'> 	struct mxl111sf_demod_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	fe_modulation_t constellation;</div><div class='add'>+	fe_modulation_t modulation;</div><div class='ctx'> 	u16 snr;</div><div class='ctx'> </div><div class='ctx'> 	mxl111sf_demod_calc_snr(state, &amp;snr);</div><div class='del'>-	mxl1x1sf_demod_get_tps_constellation(state, &amp;constellation);</div><div class='add'>+	mxl1x1sf_demod_get_tps_modulation(state, &amp;modulation);</div><div class='ctx'> </div><div class='del'>-	switch (constellation) {</div><div class='add'>+	switch (modulation) {</div><div class='ctx'> 	case QPSK:</div><div class='ctx'> 		*signal_strength = (snr &gt;= 1300) ?</div><div class='ctx'> 			min(65535, snr * 44) : snr * 38;</div><div class='hunk'>@@ -508,9 +507,9 @@ static int mxl111sf_demod_read_signal_strength(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mxl111sf_demod_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-				       struct dvb_frontend_parameters *p)</div><div class='add'>+static int mxl111sf_demod_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct mxl111sf_demod_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	mxl_dbg("()");</div><div class='hunk'>@@ -518,18 +517,18 @@ static int mxl111sf_demod_get_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	p-&gt;inversion = /* FIXME */ ? INVERSION_ON : INVERSION_OFF;</div><div class='ctx'> #endif</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.get_bandwidth)</div><div class='del'>-		fe-&gt;ops.tuner_ops.get_bandwidth(fe, &amp;p-&gt;u.ofdm.bandwidth);</div><div class='add'>+		fe-&gt;ops.tuner_ops.get_bandwidth(fe, &amp;p-&gt;bandwidth_hz);</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.get_frequency)</div><div class='ctx'> 		fe-&gt;ops.tuner_ops.get_frequency(fe, &amp;p-&gt;frequency);</div><div class='del'>-	mxl1x1sf_demod_get_tps_code_rate(state, &amp;p-&gt;u.ofdm.code_rate_HP);</div><div class='del'>-	mxl1x1sf_demod_get_tps_code_rate(state, &amp;p-&gt;u.ofdm.code_rate_LP);</div><div class='del'>-	mxl1x1sf_demod_get_tps_constellation(state, &amp;p-&gt;u.ofdm.constellation);</div><div class='add'>+	mxl1x1sf_demod_get_tps_code_rate(state, &amp;p-&gt;code_rate_HP);</div><div class='add'>+	mxl1x1sf_demod_get_tps_code_rate(state, &amp;p-&gt;code_rate_LP);</div><div class='add'>+	mxl1x1sf_demod_get_tps_modulation(state, &amp;p-&gt;modulation);</div><div class='ctx'> 	mxl1x1sf_demod_get_tps_guard_fft_mode(state,</div><div class='del'>-					      &amp;p-&gt;u.ofdm.transmission_mode);</div><div class='add'>+					      &amp;p-&gt;transmission_mode);</div><div class='ctx'> 	mxl1x1sf_demod_get_tps_guard_interval(state,</div><div class='del'>-					      &amp;p-&gt;u.ofdm.guard_interval);</div><div class='add'>+					      &amp;p-&gt;guard_interval);</div><div class='ctx'> 	mxl1x1sf_demod_get_tps_hierarchy(state,</div><div class='del'>-					 &amp;p-&gt;u.ofdm.hierarchy_information);</div><div class='add'>+					 &amp;p-&gt;hierarchy);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -551,10 +550,9 @@ static void mxl111sf_demod_release(struct dvb_frontend *fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops mxl111sf_demod_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name               = "MaxLinear MxL111SF DVB-T demodulator",</div><div class='del'>-		.type               = FE_OFDM,</div><div class='ctx'> 		.frequency_min      = 177000000,</div><div class='ctx'> 		.frequency_max      = 858000000,</div><div class='ctx'> 		.frequency_stepsize = 166666,</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-tuner.c b/drivers/media/dvb/dvb-usb/mxl111sf-tuner.c<br/>index a6341058c4e7..72db6eef4b9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/mxl111sf-tuner.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/mxl111sf-tuner.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/mxl111sf-tuner.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/mxl111sf-tuner.c</a></div><div class='hunk'>@@ -38,6 +38,8 @@ struct mxl111sf_tuner_state {</div><div class='ctx'> </div><div class='ctx'> 	struct mxl111sf_tuner_config *cfg;</div><div class='ctx'> </div><div class='add'>+	enum mxl_if_freq if_freq;</div><div class='add'>+</div><div class='ctx'> 	u32 frequency;</div><div class='ctx'> 	u32 bandwidth;</div><div class='ctx'> };</div><div class='hunk'>@@ -186,7 +188,10 @@ static int mxl1x1sf_tuner_set_if_output_freq(struct mxl111sf_tuner_state *state)</div><div class='ctx'> 	ctrl = iffcw &amp; 0x00ff;</div><div class='ctx'> #endif</div><div class='ctx'> 	ret = mxl111sf_tuner_write_reg(state, V6_TUNER_IF_FCW_REG, ctrl);</div><div class='del'>-	mxl_fail(ret);</div><div class='add'>+	if (mxl_fail(ret))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	state-&gt;if_freq = state-&gt;cfg-&gt;if_freq;</div><div class='ctx'> fail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -267,55 +272,49 @@ static int mxl1x1sf_tuner_loop_thru_ctrl(struct mxl111sf_tuner_state *state,</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='del'>-static int mxl111sf_tuner_set_params(struct dvb_frontend *fe,</div><div class='del'>-				     struct dvb_frontend_parameters *params)</div><div class='add'>+static int mxl111sf_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	u32 delsys  = c-&gt;delivery_system;</div><div class='ctx'> 	struct mxl111sf_tuner_state *state = fe-&gt;tuner_priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 bw;</div><div class='ctx'> </div><div class='ctx'> 	mxl_dbg("()");</div><div class='ctx'> </div><div class='del'>-	if (fe-&gt;ops.info.type == FE_ATSC) {</div><div class='del'>-		switch (params-&gt;u.vsb.modulation) {</div><div class='del'>-		case VSB_8:</div><div class='del'>-		case VSB_16:</div><div class='del'>-			bw = 0; /* ATSC */</div><div class='del'>-			break;</div><div class='del'>-		case QAM_64:</div><div class='del'>-		case QAM_256:</div><div class='del'>-			bw = 1; /* US CABLE */</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			err("%s: modulation not set!", __func__);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	} else if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='del'>-		switch (params-&gt;u.ofdm.bandwidth) {</div><div class='del'>-		case BANDWIDTH_6_MHZ:</div><div class='add'>+	switch (delsys) {</div><div class='add'>+	case SYS_ATSC:</div><div class='add'>+		bw = 0; /* ATSC */</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_B:</div><div class='add'>+		bw = 1; /* US CABLE */</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBT:</div><div class='add'>+		switch (c-&gt;bandwidth_hz) {</div><div class='add'>+		case 6000000:</div><div class='ctx'> 			bw = 6;</div><div class='ctx'> 			break;</div><div class='del'>-		case BANDWIDTH_7_MHZ:</div><div class='add'>+		case 7000000:</div><div class='ctx'> 			bw = 7;</div><div class='ctx'> 			break;</div><div class='del'>-		case BANDWIDTH_8_MHZ:</div><div class='add'>+		case 8000000:</div><div class='ctx'> 			bw = 8;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			err("%s: bandwidth not set!", __func__);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		err("%s: modulation type not supported!", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	ret = mxl1x1sf_tune_rf(fe, params-&gt;frequency, bw);</div><div class='add'>+	ret = mxl1x1sf_tune_rf(fe, c-&gt;frequency, bw);</div><div class='ctx'> 	if (mxl_fail(ret))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	state-&gt;frequency = params-&gt;frequency;</div><div class='del'>-	state-&gt;bandwidth = (fe-&gt;ops.info.type == FE_OFDM) ?</div><div class='del'>-		params-&gt;u.ofdm.bandwidth : 0;</div><div class='add'>+	state-&gt;frequency = c-&gt;frequency;</div><div class='add'>+	state-&gt;bandwidth = c-&gt;bandwidth_hz;</div><div class='ctx'> fail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -407,6 +406,54 @@ static int mxl111sf_tuner_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mxl111sf_tuner_get_if_frequency(struct dvb_frontend *fe,</div><div class='add'>+					   u32 *frequency)</div><div class='add'>+{</div><div class='add'>+	struct mxl111sf_tuner_state *state = fe-&gt;tuner_priv;</div><div class='add'>+</div><div class='add'>+	*frequency = 0;</div><div class='add'>+</div><div class='add'>+	switch (state-&gt;if_freq) {</div><div class='add'>+	case MXL_IF_4_0:   /* 4.0   MHz */</div><div class='add'>+		*frequency = 4000000;</div><div class='add'>+		break;</div><div class='add'>+	case MXL_IF_4_5:   /* 4.5   MHz */</div><div class='add'>+		*frequency = 4500000;</div><div class='add'>+		break;</div><div class='add'>+	case MXL_IF_4_57:  /* 4.57  MHz */</div><div class='add'>+		*frequency = 4570000;</div><div class='add'>+		break;</div><div class='add'>+	case MXL_IF_5_0:   /* 5.0   MHz */</div><div class='add'>+		*frequency = 5000000;</div><div class='add'>+		break;</div><div class='add'>+	case MXL_IF_5_38:  /* 5.38  MHz */</div><div class='add'>+		*frequency = 5380000;</div><div class='add'>+		break;</div><div class='add'>+	case MXL_IF_6_0:   /* 6.0   MHz */</div><div class='add'>+		*frequency = 6000000;</div><div class='add'>+		break;</div><div class='add'>+	case MXL_IF_6_28:  /* 6.28  MHz */</div><div class='add'>+		*frequency = 6280000;</div><div class='add'>+		break;</div><div class='add'>+	case MXL_IF_7_2:   /* 7.2   MHz */</div><div class='add'>+		*frequency = 7200000;</div><div class='add'>+		break;</div><div class='add'>+	case MXL_IF_35_25: /* 35.25 MHz */</div><div class='add'>+		*frequency = 35250000;</div><div class='add'>+		break;</div><div class='add'>+	case MXL_IF_36:    /* 36    MHz */</div><div class='add'>+		*frequency = 36000000;</div><div class='add'>+		break;</div><div class='add'>+	case MXL_IF_36_15: /* 36.15 MHz */</div><div class='add'>+		*frequency = 36150000;</div><div class='add'>+		break;</div><div class='add'>+	case MXL_IF_44:    /* 44    MHz */</div><div class='add'>+		*frequency = 44000000;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mxl111sf_tuner_release(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct mxl111sf_tuner_state *state = fe-&gt;tuner_priv;</div><div class='hunk'>@@ -436,6 +483,7 @@ static struct dvb_tuner_ops mxl111sf_tuner_tuner_ops = {</div><div class='ctx'> 	.get_rf_strength   = mxl111sf_get_rf_strength,</div><div class='ctx'> 	.get_frequency     = mxl111sf_tuner_get_frequency,</div><div class='ctx'> 	.get_bandwidth     = mxl111sf_tuner_get_bandwidth,</div><div class='add'>+	.get_if_frequency  = mxl111sf_tuner_get_if_frequency,</div><div class='ctx'> 	.release           = mxl111sf_tuner_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/mxl111sf.c b/drivers/media/dvb/dvb-usb/mxl111sf.c<br/>index b5c98da5d9e2..38ef0253d3b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/mxl111sf.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/mxl111sf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/mxl111sf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/mxl111sf.c</a></div><div class='hunk'>@@ -758,6 +758,7 @@ MODULE_DEVICE_TABLE(usb, mxl111sf_table);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define MXL111SF_EP4_BULK_STREAMING_CONFIG		\</div><div class='add'>+	.size_of_priv = sizeof(struct mxl111sf_adap_state), \</div><div class='ctx'> 	.streaming_ctrl = mxl111sf_ep4_streaming_ctrl,	\</div><div class='ctx'> 	.stream = {					\</div><div class='ctx'> 		.type = USB_BULK,			\</div><div class='hunk'>@@ -772,6 +773,7 @@ MODULE_DEVICE_TABLE(usb, mxl111sf_table);</div><div class='ctx'> </div><div class='ctx'> /* FIXME: works for v6 but not v8 silicon */</div><div class='ctx'> #define MXL111SF_EP4_ISOC_STREAMING_CONFIG		\</div><div class='add'>+	.size_of_priv = sizeof(struct mxl111sf_adap_state), \</div><div class='ctx'> 	.streaming_ctrl = mxl111sf_ep4_streaming_ctrl,	\</div><div class='ctx'> 	.stream = {					\</div><div class='ctx'> 		.type = USB_ISOC,			\</div><div class='hunk'>@@ -788,6 +790,7 @@ MODULE_DEVICE_TABLE(usb, mxl111sf_table);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #define MXL111SF_EP6_BULK_STREAMING_CONFIG		\</div><div class='add'>+	.size_of_priv = sizeof(struct mxl111sf_adap_state), \</div><div class='ctx'> 	.streaming_ctrl = mxl111sf_ep6_streaming_ctrl,	\</div><div class='ctx'> 	.stream = {					\</div><div class='ctx'> 		.type = USB_BULK,			\</div><div class='hunk'>@@ -802,6 +805,7 @@ MODULE_DEVICE_TABLE(usb, mxl111sf_table);</div><div class='ctx'> </div><div class='ctx'> /* FIXME */</div><div class='ctx'> #define MXL111SF_EP6_ISOC_STREAMING_CONFIG		\</div><div class='add'>+	.size_of_priv = sizeof(struct mxl111sf_adap_state), \</div><div class='ctx'> 	.streaming_ctrl = mxl111sf_ep6_streaming_ctrl,	\</div><div class='ctx'> 	.stream = {					\</div><div class='ctx'> 		.type = USB_ISOC,			\</div><div class='hunk'>@@ -839,8 +843,6 @@ static struct dvb_usb_device_properties mxl111sf_dvbt_bulk_properties = {</div><div class='ctx'> 		.fe_ioctl_override = mxl111sf_fe_ioctl_override,</div><div class='ctx'> 		.num_frontends = 1,</div><div class='ctx'> 		.fe = {{</div><div class='del'>-			.size_of_priv     = sizeof(struct mxl111sf_adap_state),</div><div class='del'>-</div><div class='ctx'> 			.frontend_attach  = mxl111sf_attach_demod,</div><div class='ctx'> 			.tuner_attach     = mxl111sf_attach_tuner,</div><div class='ctx'> </div><div class='hunk'>@@ -883,8 +885,6 @@ static struct dvb_usb_device_properties mxl111sf_dvbt_isoc_properties = {</div><div class='ctx'> 		.fe_ioctl_override = mxl111sf_fe_ioctl_override,</div><div class='ctx'> 		.num_frontends = 1,</div><div class='ctx'> 		.fe = {{</div><div class='del'>-			.size_of_priv     = sizeof(struct mxl111sf_adap_state),</div><div class='del'>-</div><div class='ctx'> 			.frontend_attach  = mxl111sf_attach_demod,</div><div class='ctx'> 			.tuner_attach     = mxl111sf_attach_tuner,</div><div class='ctx'> </div><div class='hunk'>@@ -927,16 +927,12 @@ static struct dvb_usb_device_properties mxl111sf_atsc_bulk_properties = {</div><div class='ctx'> 		.fe_ioctl_override = mxl111sf_fe_ioctl_override,</div><div class='ctx'> 		.num_frontends = 2,</div><div class='ctx'> 		.fe = {{</div><div class='del'>-			.size_of_priv     = sizeof(struct mxl111sf_adap_state),</div><div class='del'>-</div><div class='ctx'> 			.frontend_attach  = mxl111sf_lgdt3305_frontend_attach,</div><div class='ctx'> 			.tuner_attach     = mxl111sf_attach_tuner,</div><div class='ctx'> </div><div class='ctx'> 			MXL111SF_EP6_BULK_STREAMING_CONFIG,</div><div class='ctx'> 		},</div><div class='ctx'> 		{</div><div class='del'>-			.size_of_priv     = sizeof(struct mxl111sf_adap_state),</div><div class='del'>-</div><div class='ctx'> 			.frontend_attach  = mxl111sf_attach_demod,</div><div class='ctx'> 			.tuner_attach     = mxl111sf_attach_tuner,</div><div class='ctx'> </div><div class='hunk'>@@ -992,16 +988,12 @@ static struct dvb_usb_device_properties mxl111sf_atsc_isoc_properties = {</div><div class='ctx'> 		.fe_ioctl_override = mxl111sf_fe_ioctl_override,</div><div class='ctx'> 		.num_frontends = 2,</div><div class='ctx'> 		.fe = {{</div><div class='del'>-			.size_of_priv     = sizeof(struct mxl111sf_adap_state),</div><div class='del'>-</div><div class='ctx'> 			.frontend_attach  = mxl111sf_lgdt3305_frontend_attach,</div><div class='ctx'> 			.tuner_attach     = mxl111sf_attach_tuner,</div><div class='ctx'> </div><div class='ctx'> 			MXL111SF_EP6_ISOC_STREAMING_CONFIG,</div><div class='ctx'> 		},</div><div class='ctx'> 		{</div><div class='del'>-			.size_of_priv     = sizeof(struct mxl111sf_adap_state),</div><div class='del'>-</div><div class='ctx'> 			.frontend_attach  = mxl111sf_attach_demod,</div><div class='ctx'> 			.tuner_attach     = mxl111sf_attach_tuner,</div><div class='ctx'> </div><div class='hunk'>@@ -1055,24 +1047,7 @@ static struct usb_driver mxl111sf_driver = {</div><div class='ctx'> 	.id_table	= mxl111sf_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init mxl111sf_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result = usb_register(&amp;mxl111sf_driver);</div><div class='del'>-	if (result) {</div><div class='del'>-		err("usb_register failed. Error number %d", result);</div><div class='del'>-		return result;</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 mxl111sf_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;mxl111sf_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(mxl111sf_module_init);</div><div class='del'>-module_exit(mxl111sf_module_exit);</div><div class='add'>+module_usb_driver(mxl111sf_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Michael Krufky &lt;mkrufky@kernellabs.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for MaxLinear MxL111SF");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/drivers/media/dvb/dvb-usb/nova-t-usb2.c<br/>index 21384da6570e..6c55384e2fca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/nova-t-usb2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/nova-t-usb2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/nova-t-usb2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/nova-t-usb2.c</a></div><div class='hunk'>@@ -225,26 +225,7 @@ static struct usb_driver nova_t_driver = {</div><div class='ctx'> 	.id_table	= nova_t_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init nova_t_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	if ((result = usb_register(&amp;nova_t_driver))) {</div><div class='del'>-		err("usb_register failed. Error number %d",result);</div><div class='del'>-		return result;</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 nova_t_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;nova_t_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init (nova_t_module_init);</div><div class='del'>-module_exit (nova_t_module_exit);</div><div class='add'>+module_usb_driver(nova_t_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Patrick Boettcher &lt;patrick.boettcher@desy.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Hauppauge WinTV-NOVA-T usb2");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/opera1.c b/drivers/media/dvb/dvb-usb/opera1.c<br/>index 98fd9a6092b7..c8a95042dfbc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/opera1.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/opera1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/opera1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/opera1.c</a></div><div class='hunk'>@@ -574,22 +574,7 @@ static struct usb_driver opera1_driver = {</div><div class='ctx'> 	.id_table = opera1_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init opera1_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result = 0;</div><div class='del'>-	if ((result = usb_register(&amp;opera1_driver))) {</div><div class='del'>-		err("usb_register failed. Error number %d", result);</div><div class='del'>-	}</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit opera1_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;opera1_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(opera1_module_init);</div><div class='del'>-module_exit(opera1_module_exit);</div><div class='add'>+module_usb_driver(opera1_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Mario Hlawitschka (c) dh1pa@amsat.org");</div><div class='ctx'> MODULE_AUTHOR("Marco Gittler (c) g.marco@freenet.de");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/pctv452e.c b/drivers/media/dvb/dvb-usb/pctv452e.c<br/>index f9aec5cb6e77..f526eb05cc7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/pctv452e.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/pctv452e.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/pctv452e.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/pctv452e.c</a></div><div class='hunk'>@@ -1055,22 +1055,7 @@ static struct usb_driver pctv452e_usb_driver = {</div><div class='ctx'> 	.id_table   = pctv452e_usb_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pctv452e_usb_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret = usb_register(&amp;pctv452e_usb_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		err("%s: usb_register failed! Error %d", __FILE__, ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit pctv452e_usb_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;pctv452e_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(pctv452e_usb_init);</div><div class='del'>-module_exit(pctv452e_usb_exit);</div><div class='add'>+module_usb_driver(pctv452e_usb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Dominik Kuhlen &lt;dkuhlen@gmx.net&gt;");</div><div class='ctx'> MODULE_AUTHOR("Andre Weidemann &lt;Andre.Weidemann@web.de&gt;");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/technisat-usb2.c b/drivers/media/dvb/dvb-usb/technisat-usb2.c<br/>index 0998fe961950..acefaa89cc53 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/technisat-usb2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/technisat-usb2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/technisat-usb2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/technisat-usb2.c</a></div><div class='hunk'>@@ -781,25 +781,7 @@ static struct usb_driver technisat_usb2_driver = {</div><div class='ctx'> 	.id_table   = technisat_usb2_id_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init technisat_usb2_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result = usb_register(&amp;technisat_usb2_driver);</div><div class='del'>-	if (result) {</div><div class='del'>-		err("usb_register failed. Code %d", result);</div><div class='del'>-		return result;</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 technisat_usb2_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;technisat_usb2_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(technisat_usb2_module_init);</div><div class='del'>-module_exit(technisat_usb2_module_exit);</div><div class='add'>+module_usb_driver(technisat_usb2_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Patrick Boettcher &lt;pboettcher@kernellabs.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for Technisat DVB-S/S2 USB 2.0 device");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/ttusb2.c b/drivers/media/dvb/dvb-usb/ttusb2.c<br/>index ea4eab8b3965..e53a1061cb8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/ttusb2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/ttusb2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/ttusb2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/ttusb2.c</a></div><div class='hunk'>@@ -75,10 +75,18 @@ static int ttusb2_msg(struct dvb_usb_device *d, u8 cmd,</div><div class='ctx'> 		u8 *wbuf, int wlen, u8 *rbuf, int rlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct ttusb2_state *st = d-&gt;priv;</div><div class='del'>-	u8 s[wlen+4],r[64] = { 0 };</div><div class='add'>+	u8 *s, *r = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	memset(s,0,wlen+4);</div><div class='add'>+	s = kzalloc(wlen+4, GFP_KERNEL);</div><div class='add'>+	if (!s)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	r = kzalloc(64, GFP_KERNEL);</div><div class='add'>+	if (!r) {</div><div class='add'>+		kfree(s);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	s[0] = 0xaa;</div><div class='ctx'> 	s[1] = ++st-&gt;id;</div><div class='hunk'>@@ -94,12 +102,17 @@ static int ttusb2_msg(struct dvb_usb_device *d, u8 cmd,</div><div class='ctx'> 		r[2] != cmd ||</div><div class='ctx'> 		(rlen &gt; 0 &amp;&amp; r[3] != rlen)) {</div><div class='ctx'> 		warn("there might have been an error during control message transfer. (rlen = %d, was %d)",rlen,r[3]);</div><div class='add'>+		kfree(s);</div><div class='add'>+		kfree(r);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rlen &gt; 0)</div><div class='ctx'> 		memcpy(rbuf, &amp;r[4], rlen);</div><div class='ctx'> </div><div class='add'>+	kfree(s);</div><div class='add'>+	kfree(r);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -384,7 +397,7 @@ static int ttusb2_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num</div><div class='ctx'> </div><div class='ctx'> 		memcpy(&amp;obuf[3], msg[i].buf, msg[i].len);</div><div class='ctx'> </div><div class='del'>-		if (ttusb2_msg(d, CMD_I2C_XFER, obuf, msg[i].len+3, ibuf, obuf[2] + 3) &lt; 0) {</div><div class='add'>+		if (ttusb2_msg(d, CMD_I2C_XFER, obuf, obuf[1]+3, ibuf, obuf[2] + 3) &lt; 0) {</div><div class='ctx'> 			err("i2c transfer failed.");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -799,26 +812,7 @@ static struct usb_driver ttusb2_driver = {</div><div class='ctx'> 	.id_table	= ttusb2_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init ttusb2_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	if ((result = usb_register(&amp;ttusb2_driver))) {</div><div class='del'>-		err("usb_register failed. Error number %d",result);</div><div class='del'>-		return result;</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 ttusb2_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;ttusb2_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init (ttusb2_module_init);</div><div class='del'>-module_exit (ttusb2_module_exit);</div><div class='add'>+module_usb_driver(ttusb2_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Patrick Boettcher &lt;patrick.boettcher@desy.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for Pinnacle PCTV 400e DVB-S USB2.0");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/umt-010.c b/drivers/media/dvb/dvb-usb/umt-010.c<br/>index 463673a5c2b2..9b042292e788 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/umt-010.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/umt-010.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/umt-010.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/umt-010.c</a></div><div class='hunk'>@@ -143,26 +143,7 @@ static struct usb_driver umt_driver = {</div><div class='ctx'> 	.id_table	= umt_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init umt_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	if ((result = usb_register(&amp;umt_driver))) {</div><div class='del'>-		err("usb_register failed. Error number %d",result);</div><div class='del'>-		return result;</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 umt_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;umt_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init (umt_module_init);</div><div class='del'>-module_exit (umt_module_exit);</div><div class='add'>+module_usb_driver(umt_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Patrick Boettcher &lt;patrick.boettcher@desy.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for HanfTek UMT 010 USB2.0 DVB-T device");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/vp702x-fe.c b/drivers/media/dvb/dvb-usb/vp702x-fe.c<br/>index 2bb8d4cc8d88..5eab468dd904 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/vp702x-fe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/vp702x-fe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/vp702x-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/vp702x-fe.c</a></div><div class='hunk'>@@ -135,9 +135,9 @@ static int vp702x_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_front</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vp702x_fe_set_frontend(struct dvb_frontend* fe,</div><div class='del'>-				  struct dvb_frontend_parameters *fep)</div><div class='add'>+static int vp702x_fe_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fep = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct vp702x_fe_state *st = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct vp702x_device_state *dst = st-&gt;d-&gt;priv;</div><div class='ctx'> 	u32 freq = fep-&gt;frequency/1000;</div><div class='hunk'>@@ -155,14 +155,14 @@ static int vp702x_fe_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	cmd[1] =  freq       &amp; 0xff;</div><div class='ctx'> 	cmd[2] = 1; /* divrate == 4 -&gt; frequencyRef[1] -&gt; 1 here */</div><div class='ctx'> </div><div class='del'>-	sr = (u64) (fep-&gt;u.qpsk.symbol_rate/1000) &lt;&lt; 20;</div><div class='add'>+	sr = (u64) (fep-&gt;symbol_rate/1000) &lt;&lt; 20;</div><div class='ctx'> 	do_div(sr,88000);</div><div class='ctx'> 	cmd[3] = (sr &gt;&gt; 12) &amp; 0xff;</div><div class='ctx'> 	cmd[4] = (sr &gt;&gt; 4)  &amp; 0xff;</div><div class='ctx'> 	cmd[5] = (sr &lt;&lt; 4)  &amp; 0xf0;</div><div class='ctx'> </div><div class='ctx'> 	deb_fe("setting frontend to: %u -&gt; %u (%x) LNB-based GHz, symbolrate: %d -&gt; %lu (%lx)\n",</div><div class='del'>-			fep-&gt;frequency,freq,freq, fep-&gt;u.qpsk.symbol_rate,</div><div class='add'>+			fep-&gt;frequency, freq, freq, fep-&gt;symbol_rate,</div><div class='ctx'> 			(unsigned long) sr, (unsigned long) sr);</div><div class='ctx'> </div><div class='ctx'> /*	if (fep-&gt;inversion == INVERSION_ON)</div><div class='hunk'>@@ -171,7 +171,7 @@ static int vp702x_fe_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	if (st-&gt;voltage == SEC_VOLTAGE_18)</div><div class='ctx'> 		cmd[6] |= 0x40;</div><div class='ctx'> </div><div class='del'>-/*	if (fep-&gt;u.qpsk.symbol_rate &gt; 8000000)</div><div class='add'>+/*	if (fep-&gt;symbol_rate &gt; 8000000)</div><div class='ctx'> 		cmd[6] |= 0x20;</div><div class='ctx'> </div><div class='ctx'> 	if (fep-&gt;frequency &lt; 1531000)</div><div class='hunk'>@@ -211,13 +211,6 @@ static int vp702x_fe_sleep(struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vp702x_fe_get_frontend(struct dvb_frontend* fe,</div><div class='del'>-				  struct dvb_frontend_parameters *fep)</div><div class='del'>-{</div><div class='del'>-	deb_fe("%s\n",__func__);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe,</div><div class='ctx'> 				    struct dvb_diseqc_master_cmd *m)</div><div class='ctx'> {</div><div class='hunk'>@@ -350,9 +343,9 @@ error:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops vp702x_fe_ops = {</div><div class='add'>+	.delsys = { SYS_DVBS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name           = "Twinhan DST-like frontend (VP7021/VP7020) DVB-S",</div><div class='del'>-		.type           = FE_QPSK,</div><div class='ctx'> 		.frequency_min       = 950000,</div><div class='ctx'> 		.frequency_max       = 2150000,</div><div class='ctx'> 		.frequency_stepsize  = 1000,   /* kHz for QPSK frontends */</div><div class='hunk'>@@ -371,7 +364,6 @@ static struct dvb_frontend_ops vp702x_fe_ops = {</div><div class='ctx'> 	.sleep = vp702x_fe_sleep,</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = vp702x_fe_set_frontend,</div><div class='del'>-	.get_frontend = vp702x_fe_get_frontend,</div><div class='ctx'> 	.get_tune_settings = vp702x_fe_get_tune_settings,</div><div class='ctx'> </div><div class='ctx'> 	.read_status = vp702x_fe_read_status,</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/vp702x.c b/drivers/media/dvb/dvb-usb/vp702x.c<br/>index 45e31f224814..07c673a6e764 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/vp702x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/vp702x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/vp702x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/vp702x.c</a></div><div class='hunk'>@@ -436,26 +436,7 @@ static struct usb_driver vp702x_usb_driver = {</div><div class='ctx'> 	.id_table	= vp702x_usb_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init vp702x_usb_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	if ((result = usb_register(&amp;vp702x_usb_driver))) {</div><div class='del'>-		err("usb_register failed. (%d)",result);</div><div class='del'>-		return result;</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 vp702x_usb_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;vp702x_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(vp702x_usb_module_init);</div><div class='del'>-module_exit(vp702x_usb_module_exit);</div><div class='add'>+module_usb_driver(vp702x_usb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Patrick Boettcher &lt;patrick.boettcher@desy.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for Twinhan StarBox DVB-S USB2.0 and clones");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/vp7045-fe.c b/drivers/media/dvb/dvb-usb/vp7045-fe.c<br/>index 8452eef90322..b8825b18c003 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/vp7045-fe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/vp7045-fe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/vp7045-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/vp7045-fe.c</a></div><div class='hunk'>@@ -103,9 +103,9 @@ static int vp7045_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_front</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vp7045_fe_set_frontend(struct dvb_frontend* fe,</div><div class='del'>-				  struct dvb_frontend_parameters *fep)</div><div class='add'>+static int vp7045_fe_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fep = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct vp7045_fe_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u8 buf[5];</div><div class='ctx'> 	u32 freq = fep-&gt;frequency / 1000;</div><div class='hunk'>@@ -115,25 +115,24 @@ static int vp7045_fe_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	buf[2] =  freq        &amp; 0xff;</div><div class='ctx'> 	buf[3] = 0;</div><div class='ctx'> </div><div class='del'>-	switch (fep-&gt;u.ofdm.bandwidth) {</div><div class='del'>-		case BANDWIDTH_8_MHZ: buf[4] = 8; break;</div><div class='del'>-		case BANDWIDTH_7_MHZ: buf[4] = 7; break;</div><div class='del'>-		case BANDWIDTH_6_MHZ: buf[4] = 6; break;</div><div class='del'>-		case BANDWIDTH_AUTO: return -EOPNOTSUPP;</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	switch (fep-&gt;bandwidth_hz) {</div><div class='add'>+	case 8000000:</div><div class='add'>+		buf[4] = 8;</div><div class='add'>+		break;</div><div class='add'>+	case 7000000:</div><div class='add'>+		buf[4] = 7;</div><div class='add'>+		break;</div><div class='add'>+	case 6000000:</div><div class='add'>+		buf[4] = 6;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	vp7045_usb_op(state-&gt;d,LOCK_TUNER_COMMAND,buf,5,NULL,0,200);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vp7045_fe_get_frontend(struct dvb_frontend* fe,</div><div class='del'>-				  struct dvb_frontend_parameters *fep)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void vp7045_fe_release(struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct vp7045_fe_state *state = fe-&gt;demodulator_priv;</div><div class='hunk'>@@ -159,9 +158,9 @@ error:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops vp7045_fe_ops = {</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Twinhan VP7045/46 USB DVB-T",</div><div class='del'>-		.type			= FE_OFDM,</div><div class='ctx'> 		.frequency_min		= 44250000,</div><div class='ctx'> 		.frequency_max		= 867250000,</div><div class='ctx'> 		.frequency_stepsize	= 1000,</div><div class='hunk'>@@ -181,7 +180,6 @@ static struct dvb_frontend_ops vp7045_fe_ops = {</div><div class='ctx'> 	.sleep = vp7045_fe_sleep,</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = vp7045_fe_set_frontend,</div><div class='del'>-	.get_frontend = vp7045_fe_get_frontend,</div><div class='ctx'> 	.get_tune_settings = vp7045_fe_get_tune_settings,</div><div class='ctx'> </div><div class='ctx'> 	.read_status = vp7045_fe_read_status,</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/vp7045.c b/drivers/media/dvb/dvb-usb/vp7045.c<br/>index 90873af5682e..d750724132ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/vp7045.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/dvb-usb/vp7045.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/vp7045.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/dvb-usb/vp7045.c</a></div><div class='hunk'>@@ -294,26 +294,7 @@ static struct usb_driver vp7045_usb_driver = {</div><div class='ctx'> 	.id_table	= vp7045_usb_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module stuff */</div><div class='del'>-static int __init vp7045_usb_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	if ((result = usb_register(&amp;vp7045_usb_driver))) {</div><div class='del'>-		err("usb_register failed. (%d)",result);</div><div class='del'>-		return result;</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 vp7045_usb_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver from the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;vp7045_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(vp7045_usb_module_init);</div><div class='del'>-module_exit(vp7045_usb_module_exit);</div><div class='add'>+module_usb_driver(vp7045_usb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Patrick Boettcher &lt;patrick.boettcher@desy.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for Twinhan MagicBox/Alpha and DNTV tinyUSB2 DVB-T USB2.0");</div><div class='head'>diff --git a/drivers/media/dvb/firewire/firedtv-avc.c b/drivers/media/dvb/firewire/firedtv-avc.c<br/>index 489ae8245867..d1a1a1324ef8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/firewire/firedtv-avc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/firewire/firedtv-avc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/firewire/firedtv-avc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/firewire/firedtv-avc.c</a></div><div class='hunk'>@@ -335,7 +335,7 @@ static int add_pid_filter(struct firedtv *fdtv, u8 *operand)</div><div class='ctx'>  * (not supported by the AVC standard)</div><div class='ctx'>  */</div><div class='ctx'> static int avc_tuner_tuneqpsk(struct firedtv *fdtv,</div><div class='del'>-			      struct dvb_frontend_parameters *params)</div><div class='add'>+			      struct dtv_frontend_properties *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct avc_command_frame *c = (void *)fdtv-&gt;avc_data;</div><div class='ctx'> </div><div class='hunk'>@@ -349,15 +349,15 @@ static int avc_tuner_tuneqpsk(struct firedtv *fdtv,</div><div class='ctx'> 	else</div><div class='ctx'> 		c-&gt;operand[3] = SFE_VENDOR_OPCODE_TUNE_QPSK;</div><div class='ctx'> </div><div class='del'>-	c-&gt;operand[4] = (params-&gt;frequency &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-	c-&gt;operand[5] = (params-&gt;frequency &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	c-&gt;operand[6] = (params-&gt;frequency &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	c-&gt;operand[7] = params-&gt;frequency &amp; 0xff;</div><div class='add'>+	c-&gt;operand[4] = (p-&gt;frequency &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+	c-&gt;operand[5] = (p-&gt;frequency &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	c-&gt;operand[6] = (p-&gt;frequency &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	c-&gt;operand[7] = p-&gt;frequency &amp; 0xff;</div><div class='ctx'> </div><div class='del'>-	c-&gt;operand[8] = ((params-&gt;u.qpsk.symbol_rate / 1000) &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	c-&gt;operand[9] = (params-&gt;u.qpsk.symbol_rate / 1000) &amp; 0xff;</div><div class='add'>+	c-&gt;operand[8] = ((p-&gt;symbol_rate / 1000) &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	c-&gt;operand[9] = (p-&gt;symbol_rate / 1000) &amp; 0xff;</div><div class='ctx'> </div><div class='del'>-	switch (params-&gt;u.qpsk.fec_inner) {</div><div class='add'>+	switch (p-&gt;fec_inner) {</div><div class='ctx'> 	case FEC_1_2:	c-&gt;operand[10] = 0x1; break;</div><div class='ctx'> 	case FEC_2_3:	c-&gt;operand[10] = 0x2; break;</div><div class='ctx'> 	case FEC_3_4:	c-&gt;operand[10] = 0x3; break;</div><div class='hunk'>@@ -392,10 +392,11 @@ static int avc_tuner_tuneqpsk(struct firedtv *fdtv,</div><div class='ctx'> 			default:		c-&gt;operand[13] = 0x2; break;</div><div class='ctx'> 			}</div><div class='ctx'> 			switch (fdtv-&gt;fe.dtv_property_cache.rolloff) {</div><div class='del'>-			case ROLLOFF_AUTO:	c-&gt;operand[14] = 0x2; break;</div><div class='ctx'> 			case ROLLOFF_35:	c-&gt;operand[14] = 0x2; break;</div><div class='ctx'> 			case ROLLOFF_20:	c-&gt;operand[14] = 0x0; break;</div><div class='ctx'> 			case ROLLOFF_25:	c-&gt;operand[14] = 0x1; break;</div><div class='add'>+			case ROLLOFF_AUTO:</div><div class='add'>+			default:		c-&gt;operand[14] = 0x2; break;</div><div class='ctx'> 			/* case ROLLOFF_NONE:	c-&gt;operand[14] = 0xff; break; */</div><div class='ctx'> 			}</div><div class='ctx'> 			switch (fdtv-&gt;fe.dtv_property_cache.pilot) {</div><div class='hunk'>@@ -415,7 +416,7 @@ static int avc_tuner_tuneqpsk(struct firedtv *fdtv,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int avc_tuner_dsd_dvb_c(struct firedtv *fdtv,</div><div class='del'>-			       struct dvb_frontend_parameters *params)</div><div class='add'>+			       struct dtv_frontend_properties *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct avc_command_frame *c = (void *)fdtv-&gt;avc_data;</div><div class='ctx'> </div><div class='hunk'>@@ -434,8 +435,8 @@ static int avc_tuner_dsd_dvb_c(struct firedtv *fdtv,</div><div class='ctx'> 			| 1 &lt;&lt; 4 /* Frequency */</div><div class='ctx'> 			| 1 &lt;&lt; 3 /* Symbol_Rate */</div><div class='ctx'> 			| 0 &lt;&lt; 2 /* FEC_outer */</div><div class='del'>-			| (params-&gt;u.qam.fec_inner  != FEC_AUTO ? 1 &lt;&lt; 1 : 0)</div><div class='del'>-			| (params-&gt;u.qam.modulation != QAM_AUTO ? 1 &lt;&lt; 0 : 0);</div><div class='add'>+			| (p-&gt;fec_inner  != FEC_AUTO ? 1 &lt;&lt; 1 : 0)</div><div class='add'>+			| (p-&gt;modulation != QAM_AUTO ? 1 &lt;&lt; 0 : 0);</div><div class='ctx'> </div><div class='ctx'> 	/* multiplex_valid_flags, low byte */</div><div class='ctx'> 	c-&gt;operand[6] =   0 &lt;&lt; 7 /* NetworkID */</div><div class='hunk'>@@ -446,15 +447,15 @@ static int avc_tuner_dsd_dvb_c(struct firedtv *fdtv,</div><div class='ctx'> 	c-&gt;operand[9]  = 0x00;</div><div class='ctx'> 	c-&gt;operand[10] = 0x00;</div><div class='ctx'> </div><div class='del'>-	c-&gt;operand[11] = (((params-&gt;frequency / 4000) &gt;&gt; 16) &amp; 0xff) | (2 &lt;&lt; 6);</div><div class='del'>-	c-&gt;operand[12] = ((params-&gt;frequency / 4000) &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	c-&gt;operand[13] = (params-&gt;frequency / 4000) &amp; 0xff;</div><div class='del'>-	c-&gt;operand[14] = ((params-&gt;u.qpsk.symbol_rate / 1000) &gt;&gt; 12) &amp; 0xff;</div><div class='del'>-	c-&gt;operand[15] = ((params-&gt;u.qpsk.symbol_rate / 1000) &gt;&gt; 4) &amp; 0xff;</div><div class='del'>-	c-&gt;operand[16] = ((params-&gt;u.qpsk.symbol_rate / 1000) &lt;&lt; 4) &amp; 0xf0;</div><div class='add'>+	c-&gt;operand[11] = (((p-&gt;frequency / 4000) &gt;&gt; 16) &amp; 0xff) | (2 &lt;&lt; 6);</div><div class='add'>+	c-&gt;operand[12] = ((p-&gt;frequency / 4000) &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	c-&gt;operand[13] = (p-&gt;frequency / 4000) &amp; 0xff;</div><div class='add'>+	c-&gt;operand[14] = ((p-&gt;symbol_rate / 1000) &gt;&gt; 12) &amp; 0xff;</div><div class='add'>+	c-&gt;operand[15] = ((p-&gt;symbol_rate / 1000) &gt;&gt; 4) &amp; 0xff;</div><div class='add'>+	c-&gt;operand[16] = ((p-&gt;symbol_rate / 1000) &lt;&lt; 4) &amp; 0xf0;</div><div class='ctx'> 	c-&gt;operand[17] = 0x00;</div><div class='ctx'> </div><div class='del'>-	switch (params-&gt;u.qpsk.fec_inner) {</div><div class='add'>+	switch (p-&gt;fec_inner) {</div><div class='ctx'> 	case FEC_1_2:	c-&gt;operand[18] = 0x1; break;</div><div class='ctx'> 	case FEC_2_3:	c-&gt;operand[18] = 0x2; break;</div><div class='ctx'> 	case FEC_3_4:	c-&gt;operand[18] = 0x3; break;</div><div class='hunk'>@@ -466,7 +467,7 @@ static int avc_tuner_dsd_dvb_c(struct firedtv *fdtv,</div><div class='ctx'> 	default:	c-&gt;operand[18] = 0x0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (params-&gt;u.qam.modulation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 	case QAM_16:	c-&gt;operand[19] = 0x08; break;</div><div class='ctx'> 	case QAM_32:	c-&gt;operand[19] = 0x10; break;</div><div class='ctx'> 	case QAM_64:	c-&gt;operand[19] = 0x18; break;</div><div class='hunk'>@@ -483,9 +484,8 @@ static int avc_tuner_dsd_dvb_c(struct firedtv *fdtv,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int avc_tuner_dsd_dvb_t(struct firedtv *fdtv,</div><div class='del'>-			       struct dvb_frontend_parameters *params)</div><div class='add'>+			       struct dtv_frontend_properties *p)</div><div class='ctx'> {</div><div class='del'>-	struct dvb_ofdm_parameters *ofdm = &amp;params-&gt;u.ofdm;</div><div class='ctx'> 	struct avc_command_frame *c = (void *)fdtv-&gt;avc_data;</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;opcode = AVC_OPCODE_DSD;</div><div class='hunk'>@@ -500,42 +500,42 @@ static int avc_tuner_dsd_dvb_t(struct firedtv *fdtv,</div><div class='ctx'> 	c-&gt;operand[5] =</div><div class='ctx'> 	      0 &lt;&lt; 7 /* reserved */</div><div class='ctx'> 	    | 1 &lt;&lt; 6 /* CenterFrequency */</div><div class='del'>-	    | (ofdm-&gt;bandwidth      != BANDWIDTH_AUTO        ? 1 &lt;&lt; 5 : 0)</div><div class='del'>-	    | (ofdm-&gt;constellation  != QAM_AUTO              ? 1 &lt;&lt; 4 : 0)</div><div class='del'>-	    | (ofdm-&gt;hierarchy_information != HIERARCHY_AUTO ? 1 &lt;&lt; 3 : 0)</div><div class='del'>-	    | (ofdm-&gt;code_rate_HP   != FEC_AUTO              ? 1 &lt;&lt; 2 : 0)</div><div class='del'>-	    | (ofdm-&gt;code_rate_LP   != FEC_AUTO              ? 1 &lt;&lt; 1 : 0)</div><div class='del'>-	    | (ofdm-&gt;guard_interval != GUARD_INTERVAL_AUTO   ? 1 &lt;&lt; 0 : 0);</div><div class='add'>+	    | (p-&gt;bandwidth_hz != 0        ? 1 &lt;&lt; 5 : 0)</div><div class='add'>+	    | (p-&gt;modulation  != QAM_AUTO              ? 1 &lt;&lt; 4 : 0)</div><div class='add'>+	    | (p-&gt;hierarchy != HIERARCHY_AUTO ? 1 &lt;&lt; 3 : 0)</div><div class='add'>+	    | (p-&gt;code_rate_HP   != FEC_AUTO              ? 1 &lt;&lt; 2 : 0)</div><div class='add'>+	    | (p-&gt;code_rate_LP   != FEC_AUTO              ? 1 &lt;&lt; 1 : 0)</div><div class='add'>+	    | (p-&gt;guard_interval != GUARD_INTERVAL_AUTO   ? 1 &lt;&lt; 0 : 0);</div><div class='ctx'> </div><div class='ctx'> 	/* multiplex_valid_flags, low byte */</div><div class='ctx'> 	c-&gt;operand[6] =</div><div class='ctx'> 	      0 &lt;&lt; 7 /* NetworkID */</div><div class='del'>-	    | (ofdm-&gt;transmission_mode != TRANSMISSION_MODE_AUTO ? 1 &lt;&lt; 6 : 0)</div><div class='add'>+	    | (p-&gt;transmission_mode != TRANSMISSION_MODE_AUTO ? 1 &lt;&lt; 6 : 0)</div><div class='ctx'> 	    | 0 &lt;&lt; 5 /* OtherFrequencyFlag */</div><div class='ctx'> 	    | 0 &lt;&lt; 0 /* reserved */ ;</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;operand[7]  = 0x0;</div><div class='del'>-	c-&gt;operand[8]  = (params-&gt;frequency / 10) &gt;&gt; 24;</div><div class='del'>-	c-&gt;operand[9]  = ((params-&gt;frequency / 10) &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	c-&gt;operand[10] = ((params-&gt;frequency / 10) &gt;&gt;  8) &amp; 0xff;</div><div class='del'>-	c-&gt;operand[11] = (params-&gt;frequency / 10) &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	switch (ofdm-&gt;bandwidth) {</div><div class='del'>-	case BANDWIDTH_7_MHZ:	c-&gt;operand[12] = 0x20; break;</div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='del'>-	case BANDWIDTH_6_MHZ:	/* not defined by AVC spec */</div><div class='del'>-	case BANDWIDTH_AUTO:</div><div class='add'>+	c-&gt;operand[8]  = (p-&gt;frequency / 10) &gt;&gt; 24;</div><div class='add'>+	c-&gt;operand[9]  = ((p-&gt;frequency / 10) &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	c-&gt;operand[10] = ((p-&gt;frequency / 10) &gt;&gt;  8) &amp; 0xff;</div><div class='add'>+	c-&gt;operand[11] = (p-&gt;frequency / 10) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	switch (p-&gt;bandwidth_hz) {</div><div class='add'>+	case 7000000:	c-&gt;operand[12] = 0x20; break;</div><div class='add'>+	case 8000000:</div><div class='add'>+	case 6000000:	/* not defined by AVC spec */</div><div class='add'>+	case 0:</div><div class='ctx'> 	default:		c-&gt;operand[12] = 0x00;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (ofdm-&gt;constellation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 	case QAM_16:	c-&gt;operand[13] = 1 &lt;&lt; 6; break;</div><div class='ctx'> 	case QAM_64:	c-&gt;operand[13] = 2 &lt;&lt; 6; break;</div><div class='ctx'> 	case QPSK:</div><div class='ctx'> 	default:	c-&gt;operand[13] = 0x00;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (ofdm-&gt;hierarchy_information) {</div><div class='add'>+	switch (p-&gt;hierarchy) {</div><div class='ctx'> 	case HIERARCHY_1:	c-&gt;operand[13] |= 1 &lt;&lt; 3; break;</div><div class='ctx'> 	case HIERARCHY_2:	c-&gt;operand[13] |= 2 &lt;&lt; 3; break;</div><div class='ctx'> 	case HIERARCHY_4:	c-&gt;operand[13] |= 3 &lt;&lt; 3; break;</div><div class='hunk'>@@ -544,7 +544,7 @@ static int avc_tuner_dsd_dvb_t(struct firedtv *fdtv,</div><div class='ctx'> 	default:		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (ofdm-&gt;code_rate_HP) {</div><div class='add'>+	switch (p-&gt;code_rate_HP) {</div><div class='ctx'> 	case FEC_2_3:	c-&gt;operand[13] |= 1; break;</div><div class='ctx'> 	case FEC_3_4:	c-&gt;operand[13] |= 2; break;</div><div class='ctx'> 	case FEC_5_6:	c-&gt;operand[13] |= 3; break;</div><div class='hunk'>@@ -553,7 +553,7 @@ static int avc_tuner_dsd_dvb_t(struct firedtv *fdtv,</div><div class='ctx'> 	default:	break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (ofdm-&gt;code_rate_LP) {</div><div class='add'>+	switch (p-&gt;code_rate_LP) {</div><div class='ctx'> 	case FEC_2_3:	c-&gt;operand[14] = 1 &lt;&lt; 5; break;</div><div class='ctx'> 	case FEC_3_4:	c-&gt;operand[14] = 2 &lt;&lt; 5; break;</div><div class='ctx'> 	case FEC_5_6:	c-&gt;operand[14] = 3 &lt;&lt; 5; break;</div><div class='hunk'>@@ -562,7 +562,7 @@ static int avc_tuner_dsd_dvb_t(struct firedtv *fdtv,</div><div class='ctx'> 	default:	c-&gt;operand[14] = 0x00; break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (ofdm-&gt;guard_interval) {</div><div class='add'>+	switch (p-&gt;guard_interval) {</div><div class='ctx'> 	case GUARD_INTERVAL_1_16:	c-&gt;operand[14] |= 1 &lt;&lt; 3; break;</div><div class='ctx'> 	case GUARD_INTERVAL_1_8:	c-&gt;operand[14] |= 2 &lt;&lt; 3; break;</div><div class='ctx'> 	case GUARD_INTERVAL_1_4:	c-&gt;operand[14] |= 3 &lt;&lt; 3; break;</div><div class='hunk'>@@ -571,7 +571,7 @@ static int avc_tuner_dsd_dvb_t(struct firedtv *fdtv,</div><div class='ctx'> 	default:			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (ofdm-&gt;transmission_mode) {</div><div class='add'>+	switch (p-&gt;transmission_mode) {</div><div class='ctx'> 	case TRANSMISSION_MODE_8K:	c-&gt;operand[14] |= 1 &lt;&lt; 1; break;</div><div class='ctx'> 	case TRANSMISSION_MODE_2K:</div><div class='ctx'> 	case TRANSMISSION_MODE_AUTO:</div><div class='hunk'>@@ -585,7 +585,7 @@ static int avc_tuner_dsd_dvb_t(struct firedtv *fdtv,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int avc_tuner_dsd(struct firedtv *fdtv,</div><div class='del'>-		  struct dvb_frontend_parameters *params)</div><div class='add'>+		  struct dtv_frontend_properties *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct avc_command_frame *c = (void *)fdtv-&gt;avc_data;</div><div class='ctx'> 	int pos, ret;</div><div class='hunk'>@@ -597,9 +597,9 @@ int avc_tuner_dsd(struct firedtv *fdtv,</div><div class='ctx'> </div><div class='ctx'> 	switch (fdtv-&gt;type) {</div><div class='ctx'> 	case FIREDTV_DVB_S:</div><div class='del'>-	case FIREDTV_DVB_S2: pos = avc_tuner_tuneqpsk(fdtv, params); break;</div><div class='del'>-	case FIREDTV_DVB_C: pos = avc_tuner_dsd_dvb_c(fdtv, params); break;</div><div class='del'>-	case FIREDTV_DVB_T: pos = avc_tuner_dsd_dvb_t(fdtv, params); break;</div><div class='add'>+	case FIREDTV_DVB_S2: pos = avc_tuner_tuneqpsk(fdtv, p); break;</div><div class='add'>+	case FIREDTV_DVB_C: pos = avc_tuner_dsd_dvb_c(fdtv, p); break;</div><div class='add'>+	case FIREDTV_DVB_T: pos = avc_tuner_dsd_dvb_t(fdtv, p); break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/dvb/firewire/firedtv-dvb.c b/drivers/media/dvb/firewire/firedtv-dvb.c<br/>index fd8bbbfa5c59..eb7496eab130 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/firewire/firedtv-dvb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/firewire/firedtv-dvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/firewire/firedtv-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/firewire/firedtv-dvb.c</a></div><div class='hunk'>@@ -203,7 +203,9 @@ int fdtv_dvb_register(struct firedtv *fdtv, const char *name)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto fail_rem_frontend;</div><div class='ctx'> </div><div class='del'>-	dvb_net_init(&amp;fdtv-&gt;adapter, &amp;fdtv-&gt;dvbnet, &amp;fdtv-&gt;demux.dmx);</div><div class='add'>+	err = dvb_net_init(&amp;fdtv-&gt;adapter, &amp;fdtv-&gt;dvbnet, &amp;fdtv-&gt;demux.dmx);</div><div class='add'>+	if (err)</div><div class='add'>+		goto fail_disconnect_frontend;</div><div class='ctx'> </div><div class='ctx'> 	fdtv_frontend_init(fdtv, name);</div><div class='ctx'> 	err = dvb_register_frontend(&amp;fdtv-&gt;adapter, &amp;fdtv-&gt;fe);</div><div class='hunk'>@@ -218,6 +220,7 @@ int fdtv_dvb_register(struct firedtv *fdtv, const char *name)</div><div class='ctx'> </div><div class='ctx'> fail_net_release:</div><div class='ctx'> 	dvb_net_release(&amp;fdtv-&gt;dvbnet);</div><div class='add'>+fail_disconnect_frontend:</div><div class='ctx'> 	fdtv-&gt;demux.dmx.close(&amp;fdtv-&gt;demux.dmx);</div><div class='ctx'> fail_rem_frontend:</div><div class='ctx'> 	fdtv-&gt;demux.dmx.remove_frontend(&amp;fdtv-&gt;demux.dmx, &amp;fdtv-&gt;frontend);</div><div class='head'>diff --git a/drivers/media/dvb/firewire/firedtv-fe.c b/drivers/media/dvb/firewire/firedtv-fe.c<br/>index 8748a61be73d..6fe9793b98b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/firewire/firedtv-fe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/firewire/firedtv-fe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/firewire/firedtv-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/firewire/firedtv-fe.c</a></div><div class='hunk'>@@ -141,28 +141,12 @@ static int fdtv_read_uncorrected_blocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fdtv_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-			     struct dvb_frontend_parameters *params)</div><div class='add'>+static int fdtv_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct firedtv *fdtv = fe-&gt;sec_priv;</div><div class='ctx'> </div><div class='del'>-	return avc_tuner_dsd(fdtv, params);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int fdtv_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-			     struct dvb_frontend_parameters *params)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int fdtv_get_property(struct dvb_frontend *fe, struct dtv_property *tvp)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int fdtv_set_property(struct dvb_frontend *fe, struct dtv_property *tvp)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='add'>+	return avc_tuner_dsd(fdtv, p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void fdtv_frontend_init(struct firedtv *fdtv, const char *name)</div><div class='hunk'>@@ -174,10 +158,6 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)</div><div class='ctx'> 	ops-&gt;sleep			= fdtv_sleep;</div><div class='ctx'> </div><div class='ctx'> 	ops-&gt;set_frontend		= fdtv_set_frontend;</div><div class='del'>-	ops-&gt;get_frontend		= fdtv_get_frontend;</div><div class='del'>-</div><div class='del'>-	ops-&gt;get_property		= fdtv_get_property;</div><div class='del'>-	ops-&gt;set_property		= fdtv_set_property;</div><div class='ctx'> </div><div class='ctx'> 	ops-&gt;read_status		= fdtv_read_status;</div><div class='ctx'> 	ops-&gt;read_ber			= fdtv_read_ber;</div><div class='hunk'>@@ -192,7 +172,7 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)</div><div class='ctx'> </div><div class='ctx'> 	switch (fdtv-&gt;type) {</div><div class='ctx'> 	case FIREDTV_DVB_S:</div><div class='del'>-		fi-&gt;type		= FE_QPSK;</div><div class='add'>+		ops-&gt;delsys[0]		= SYS_DVBS;</div><div class='ctx'> </div><div class='ctx'> 		fi-&gt;frequency_min	= 950000;</div><div class='ctx'> 		fi-&gt;frequency_max	= 2150000;</div><div class='hunk'>@@ -211,7 +191,8 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FIREDTV_DVB_S2:</div><div class='del'>-		fi-&gt;type		= FE_QPSK;</div><div class='add'>+		ops-&gt;delsys[0]		= SYS_DVBS;</div><div class='add'>+		ops-&gt;delsys[1]		= SYS_DVBS2;</div><div class='ctx'> </div><div class='ctx'> 		fi-&gt;frequency_min	= 950000;</div><div class='ctx'> 		fi-&gt;frequency_max	= 2150000;</div><div class='hunk'>@@ -231,7 +212,7 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FIREDTV_DVB_C:</div><div class='del'>-		fi-&gt;type		= FE_QAM;</div><div class='add'>+		ops-&gt;delsys[0]		= SYS_DVBC_ANNEX_A;</div><div class='ctx'> </div><div class='ctx'> 		fi-&gt;frequency_min	= 47000000;</div><div class='ctx'> 		fi-&gt;frequency_max	= 866000000;</div><div class='hunk'>@@ -249,7 +230,7 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FIREDTV_DVB_T:</div><div class='del'>-		fi-&gt;type		= FE_OFDM;</div><div class='add'>+		ops-&gt;delsys[0]		= SYS_DVBT;</div><div class='ctx'> </div><div class='ctx'> 		fi-&gt;frequency_min	= 49000000;</div><div class='ctx'> 		fi-&gt;frequency_max	= 861000000;</div><div class='head'>diff --git a/drivers/media/dvb/firewire/firedtv.h b/drivers/media/dvb/firewire/firedtv.h<br/>index bd00b04e079d..4fdcd8cb7530 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/firewire/firedtv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/firewire/firedtv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/firewire/firedtv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/firewire/firedtv.h</a></div><div class='hunk'>@@ -112,8 +112,8 @@ struct firedtv {</div><div class='ctx'> /* firedtv-avc.c */</div><div class='ctx'> int avc_recv(struct firedtv *fdtv, void *data, size_t length);</div><div class='ctx'> int avc_tuner_status(struct firedtv *fdtv, struct firedtv_tuner_status *stat);</div><div class='del'>-struct dvb_frontend_parameters;</div><div class='del'>-int avc_tuner_dsd(struct firedtv *fdtv, struct dvb_frontend_parameters *params);</div><div class='add'>+struct dtv_frontend_properties;</div><div class='add'>+int avc_tuner_dsd(struct firedtv *fdtv, struct dtv_frontend_properties *params);</div><div class='ctx'> int avc_tuner_set_pids(struct firedtv *fdtv, unsigned char pidc, u16 pid[]);</div><div class='ctx'> int avc_tuner_get_ts(struct firedtv *fdtv);</div><div class='ctx'> int avc_identify_subunit(struct firedtv *fdtv);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig<br/>index 4a2d2e6c91ab..ebb5ed7a7783 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/Kconfig</a></div><div class='hunk'>@@ -404,6 +404,13 @@ config DVB_EC100</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y when you want to support this frontend.</div><div class='ctx'> </div><div class='add'>+config DVB_HD29L2</div><div class='add'>+	tristate "HDIC HD29L2"</div><div class='add'>+	depends on DVB_CORE &amp;&amp; I2C</div><div class='add'>+	default m if DVB_FE_CUSTOMISE</div><div class='add'>+	help</div><div class='add'>+	  Say Y when you want to support this frontend.</div><div class='add'>+</div><div class='ctx'> config DVB_STV0367</div><div class='ctx'> 	tristate "ST STV0367 based"</div><div class='ctx'> 	depends on DVB_CORE &amp;&amp; I2C</div><div class='head'>diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile<br/>index f639f6781551..00a20636df62 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/Makefile</a></div><div class='hunk'>@@ -84,6 +84,7 @@ obj-$(CONFIG_DVB_STV090x) += stv090x.o</div><div class='ctx'> obj-$(CONFIG_DVB_STV6110x) += stv6110x.o</div><div class='ctx'> obj-$(CONFIG_DVB_ISL6423) += isl6423.o</div><div class='ctx'> obj-$(CONFIG_DVB_EC100) += ec100.o</div><div class='add'>+obj-$(CONFIG_DVB_HD29L2) += hd29l2.o</div><div class='ctx'> obj-$(CONFIG_DVB_DS3000) += ds3000.o</div><div class='ctx'> obj-$(CONFIG_DVB_MB86A16) += mb86a16.o</div><div class='ctx'> obj-$(CONFIG_DVB_MB86A20S) += mb86a20s.o</div><div class='head'>diff --git a/drivers/media/dvb/frontends/af9013.c b/drivers/media/dvb/frontends/af9013.c<br/>index 345311c33383..6bcbcf543b38 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/af9013.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/af9013.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/af9013.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/af9013.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>  * Afatech AF9013 demodulator driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Antti Palosaari &lt;crope@iki.fi&gt;</div><div class='add'>+ * Copyright (C) 2011 Antti Palosaari &lt;crope@iki.fi&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Thanks to Afatech who kindly provided information.</div><div class='ctx'>  *</div><div class='hunk'>@@ -21,25 +22,15 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </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/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='del'>-</div><div class='del'>-#include "dvb_frontend.h"</div><div class='ctx'> #include "af9013_priv.h"</div><div class='del'>-#include "af9013.h"</div><div class='ctx'> </div><div class='ctx'> int af9013_debug;</div><div class='add'>+module_param_named(debug, af9013_debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");</div><div class='ctx'> </div><div class='ctx'> struct af9013_state {</div><div class='ctx'> 	struct i2c_adapter *i2c;</div><div class='del'>-	struct dvb_frontend frontend;</div><div class='del'>-</div><div class='add'>+	struct dvb_frontend fe;</div><div class='ctx'> 	struct af9013_config config;</div><div class='ctx'> </div><div class='ctx'> 	/* tuner/demod RF and IF AGC limits used for signal strength calc */</div><div class='hunk'>@@ -48,107 +39,178 @@ struct af9013_state {</div><div class='ctx'> 	u32 ber;</div><div class='ctx'> 	u32 ucblocks;</div><div class='ctx'> 	u16 snr;</div><div class='del'>-	u32 frequency;</div><div class='del'>-	unsigned long next_statistics_check;</div><div class='add'>+	u32 bandwidth_hz;</div><div class='add'>+	fe_status_t fe_status;</div><div class='add'>+	unsigned long set_frontend_jiffies;</div><div class='add'>+	unsigned long read_status_jiffies;</div><div class='add'>+	bool first_tune;</div><div class='add'>+	bool i2c_gate_state;</div><div class='add'>+	unsigned int statistics_step:3;</div><div class='add'>+	struct delayed_work statistics_work;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u8 regmask[8] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };</div><div class='del'>-</div><div class='del'>-static int af9013_write_regs(struct af9013_state *state, u8 mbox, u16 reg,</div><div class='del'>-	u8 *val, u8 len)</div><div class='add'>+/* write multiple registers */</div><div class='add'>+static int af9013_wr_regs_i2c(struct af9013_state *priv, u8 mbox, u16 reg,</div><div class='add'>+	const u8 *val, int len)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='ctx'> 	u8 buf[3+len];</div><div class='del'>-	struct i2c_msg msg = {</div><div class='del'>-		.addr = state-&gt;config.demod_address,</div><div class='del'>-		.flags = 0,</div><div class='del'>-		.len = sizeof(buf),</div><div class='del'>-		.buf = buf };</div><div class='del'>-</div><div class='del'>-	buf[0] = reg &gt;&gt; 8;</div><div class='del'>-	buf[1] = reg &amp; 0xff;</div><div class='add'>+	struct i2c_msg msg[1] = {</div><div class='add'>+		{</div><div class='add'>+			.addr = priv-&gt;config.i2c_addr,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.len = sizeof(buf),</div><div class='add'>+			.buf = buf,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	buf[0] = (reg &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	buf[1] = (reg &gt;&gt; 0) &amp; 0xff;</div><div class='ctx'> 	buf[2] = mbox;</div><div class='ctx'> 	memcpy(&amp;buf[3], val, len);</div><div class='ctx'> </div><div class='del'>-	if (i2c_transfer(state-&gt;i2c, &amp;msg, 1) != 1) {</div><div class='del'>-		warn("I2C write failed reg:%04x len:%d", reg, len);</div><div class='del'>-		return -EREMOTEIO;</div><div class='add'>+	ret = i2c_transfer(priv-&gt;i2c, msg, 1);</div><div class='add'>+	if (ret == 1) {</div><div class='add'>+		ret = 0;</div><div class='add'>+	} else {</div><div class='add'>+		warn("i2c wr failed=%d reg=%04x len=%d", ret, reg, len);</div><div class='add'>+		ret = -EREMOTEIO;</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='del'>-static int af9013_write_ofdm_regs(struct af9013_state *state, u16 reg, u8 *val,</div><div class='del'>-	u8 len)</div><div class='add'>+/* read multiple registers */</div><div class='add'>+static int af9013_rd_regs_i2c(struct af9013_state *priv, u8 mbox, u16 reg,</div><div class='add'>+	u8 *val, int len)</div><div class='ctx'> {</div><div class='del'>-	u8 mbox = (1 &lt;&lt; 0)|(1 &lt;&lt; 1)|((len - 1) &lt;&lt; 2)|(0 &lt;&lt; 6)|(0 &lt;&lt; 7);</div><div class='del'>-	return af9013_write_regs(state, mbox, reg, val, len);</div><div class='add'>+	int ret;</div><div class='add'>+	u8 buf[3];</div><div class='add'>+	struct i2c_msg msg[2] = {</div><div class='add'>+		{</div><div class='add'>+			.addr = priv-&gt;config.i2c_addr,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.len = 3,</div><div class='add'>+			.buf = buf,</div><div class='add'>+		}, {</div><div class='add'>+			.addr = priv-&gt;config.i2c_addr,</div><div class='add'>+			.flags = I2C_M_RD,</div><div class='add'>+			.len = len,</div><div class='add'>+			.buf = val,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	buf[0] = (reg &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	buf[1] = (reg &gt;&gt; 0) &amp; 0xff;</div><div class='add'>+	buf[2] = mbox;</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(priv-&gt;i2c, msg, 2);</div><div class='add'>+	if (ret == 2) {</div><div class='add'>+		ret = 0;</div><div class='add'>+	} else {</div><div class='add'>+		warn("i2c rd failed=%d reg=%04x len=%d", ret, reg, len);</div><div class='add'>+		ret = -EREMOTEIO;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int af9013_write_ofsm_regs(struct af9013_state *state, u16 reg, u8 *val,</div><div class='del'>-	u8 len)</div><div class='add'>+/* write multiple registers */</div><div class='add'>+static int af9013_wr_regs(struct af9013_state *priv, u16 reg, const u8 *val,</div><div class='add'>+	int len)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+	u8 mbox = (0 &lt;&lt; 7)|(0 &lt;&lt; 6)|(1 &lt;&lt; 1)|(1 &lt;&lt; 0);</div><div class='add'>+</div><div class='add'>+	if ((priv-&gt;config.ts_mode == AF9013_TS_USB) &amp;&amp;</div><div class='add'>+		((reg &amp; 0xff00) != 0xff00) &amp;&amp; ((reg &amp; 0xff00) != 0xae00)) {</div><div class='add'>+		mbox |= ((len - 1) &lt;&lt; 2);</div><div class='add'>+		ret = af9013_wr_regs_i2c(priv, mbox, reg, val, len);</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; len; i++) {</div><div class='add'>+			ret = af9013_wr_regs_i2c(priv, mbox, reg+i, val+i, 1);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* read multiple registers */</div><div class='add'>+static int af9013_rd_regs(struct af9013_state *priv, u16 reg, u8 *val, int len)</div><div class='ctx'> {</div><div class='del'>-	u8 mbox = (1 &lt;&lt; 0)|(1 &lt;&lt; 1)|((len - 1) &lt;&lt; 2)|(1 &lt;&lt; 6)|(1 &lt;&lt; 7);</div><div class='del'>-	return af9013_write_regs(state, mbox, reg, val, len);</div><div class='add'>+	int ret, i;</div><div class='add'>+	u8 mbox = (0 &lt;&lt; 7)|(0 &lt;&lt; 6)|(1 &lt;&lt; 1)|(0 &lt;&lt; 0);</div><div class='add'>+</div><div class='add'>+	if ((priv-&gt;config.ts_mode == AF9013_TS_USB) &amp;&amp;</div><div class='add'>+		((reg &amp; 0xff00) != 0xff00) &amp;&amp; ((reg &amp; 0xff00) != 0xae00)) {</div><div class='add'>+		mbox |= ((len - 1) &lt;&lt; 2);</div><div class='add'>+		ret = af9013_rd_regs_i2c(priv, mbox, reg, val, len);</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; len; i++) {</div><div class='add'>+			ret = af9013_rd_regs_i2c(priv, mbox, reg+i, val+i, 1);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* write single register */</div><div class='del'>-static int af9013_write_reg(struct af9013_state *state, u16 reg, u8 val)</div><div class='add'>+static int af9013_wr_reg(struct af9013_state *priv, u16 reg, u8 val)</div><div class='ctx'> {</div><div class='del'>-	return af9013_write_ofdm_regs(state, reg, &amp;val, 1);</div><div class='add'>+	return af9013_wr_regs(priv, reg, &amp;val, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* read single register */</div><div class='del'>-static int af9013_read_reg(struct af9013_state *state, u16 reg, u8 *val)</div><div class='add'>+static int af9013_rd_reg(struct af9013_state *priv, u16 reg, u8 *val)</div><div class='ctx'> {</div><div class='del'>-	u8 obuf[3] = { reg &gt;&gt; 8, reg &amp; 0xff, 0 };</div><div class='del'>-	u8 ibuf[1];</div><div class='del'>-	struct i2c_msg msg[2] = {</div><div class='del'>-		{</div><div class='del'>-			.addr = state-&gt;config.demod_address,</div><div class='del'>-			.flags = 0,</div><div class='del'>-			.len = sizeof(obuf),</div><div class='del'>-			.buf = obuf</div><div class='del'>-		}, {</div><div class='del'>-			.addr = state-&gt;config.demod_address,</div><div class='del'>-			.flags = I2C_M_RD,</div><div class='del'>-			.len = sizeof(ibuf),</div><div class='del'>-			.buf = ibuf</div><div class='del'>-		}</div><div class='del'>-	};</div><div class='add'>+	return af9013_rd_regs(priv, reg, val, 1);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (i2c_transfer(state-&gt;i2c, msg, 2) != 2) {</div><div class='del'>-		warn("I2C read failed reg:%04x", reg);</div><div class='del'>-		return -EREMOTEIO;</div><div class='del'>-	}</div><div class='del'>-	*val = ibuf[0];</div><div class='del'>-	return 0;</div><div class='add'>+static int af9013_write_ofsm_regs(struct af9013_state *state, u16 reg, u8 *val,</div><div class='add'>+	u8 len)</div><div class='add'>+{</div><div class='add'>+	u8 mbox = (1 &lt;&lt; 7)|(1 &lt;&lt; 6)|((len - 1) &lt;&lt; 2)|(1 &lt;&lt; 1)|(1 &lt;&lt; 0);</div><div class='add'>+	return af9013_wr_regs_i2c(state, mbox, reg, val, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int af9013_write_reg_bits(struct af9013_state *state, u16 reg, u8 pos,</div><div class='del'>-	u8 len, u8 val)</div><div class='add'>+static int af9013_wr_reg_bits(struct af9013_state *state, u16 reg, int pos,</div><div class='add'>+	int len, u8 val)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 tmp, mask;</div><div class='ctx'> </div><div class='del'>-	ret = af9013_read_reg(state, reg, &amp;tmp);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	/* no need for read if whole reg is written */</div><div class='add'>+	if (len != 8) {</div><div class='add'>+		ret = af9013_rd_reg(state, reg, &amp;tmp);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='del'>-	mask = regmask[len - 1] &lt;&lt; pos;</div><div class='del'>-	tmp = (tmp &amp; ~mask) | ((val &lt;&lt; pos) &amp; mask);</div><div class='add'>+		mask = (0xff &gt;&gt; (8 - len)) &lt;&lt; pos;</div><div class='add'>+		val &lt;&lt;= pos;</div><div class='add'>+		tmp &amp;= ~mask;</div><div class='add'>+		val |= tmp;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return af9013_write_reg(state, reg, tmp);</div><div class='add'>+	return af9013_wr_reg(state, reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int af9013_read_reg_bits(struct af9013_state *state, u16 reg, u8 pos,</div><div class='del'>-	u8 len, u8 *val)</div><div class='add'>+static int af9013_rd_reg_bits(struct af9013_state *state, u16 reg, int pos,</div><div class='add'>+	int len, u8 *val)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 tmp;</div><div class='ctx'> </div><div class='del'>-	ret = af9013_read_reg(state, reg, &amp;tmp);</div><div class='add'>+	ret = af9013_rd_reg(state, reg, &amp;tmp);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='del'>-	*val = (tmp &gt;&gt; pos) &amp; regmask[len - 1];</div><div class='add'>+</div><div class='add'>+	*val = (tmp &gt;&gt; pos);</div><div class='add'>+	*val &amp;= (0xff &gt;&gt; (8 - len));</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -157,10 +219,13 @@ static int af9013_set_gpio(struct af9013_state *state, u8 gpio, u8 gpioval)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 pos;</div><div class='ctx'> 	u16 addr;</div><div class='del'>-	deb_info("%s: gpio:%d gpioval:%02x\n", __func__, gpio, gpioval);</div><div class='ctx'> </div><div class='del'>-/* GPIO0 &amp; GPIO1 0xd735</div><div class='del'>-   GPIO2 &amp; GPIO3 0xd736 */</div><div class='add'>+	dbg("%s: gpio=%d gpioval=%02x", __func__, gpio, gpioval);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * GPIO0 &amp; GPIO1 0xd735</div><div class='add'>+	 * GPIO2 &amp; GPIO3 0xd736</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	switch (gpio) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -175,7 +240,7 @@ static int af9013_set_gpio(struct af9013_state *state, u8 gpio, u8 gpioval)</div><div class='ctx'> 	default:</div><div class='ctx'> 		err("invalid gpio:%d\n", gpio);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='del'>-		goto error;</div><div class='add'>+		goto err;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	switch (gpio) {</div><div class='hunk'>@@ -190,16 +255,21 @@ static int af9013_set_gpio(struct af9013_state *state, u8 gpio, u8 gpioval)</div><div class='ctx'> 		break;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	ret = af9013_write_reg_bits(state, addr, pos, 4, gpioval);</div><div class='add'>+	ret = af9013_wr_reg_bits(state, addr, pos, 4, gpioval);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='del'>-error:</div><div class='add'>+	return ret;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 af913_div(u32 a, u32 b, u32 x)</div><div class='ctx'> {</div><div class='ctx'> 	u32 r = 0, c = 0, i;</div><div class='del'>-	deb_info("%s: a:%d b:%d x:%d\n", __func__, a, b, x);</div><div class='add'>+</div><div class='add'>+	dbg("%s: a=%d b=%d x=%d", __func__, a, b, x);</div><div class='ctx'> </div><div class='ctx'> 	if (a &gt; b) {</div><div class='ctx'> 		c = a / b;</div><div class='hunk'>@@ -216,205 +286,407 @@ static u32 af913_div(u32 a, u32 b, u32 x)</div><div class='ctx'> 	}</div><div class='ctx'> 	r = (c &lt;&lt; (u32)x) + r;</div><div class='ctx'> </div><div class='del'>-	deb_info("%s: a:%d b:%d x:%d r:%d r:%x\n", __func__, a, b, x, r, r);</div><div class='add'>+	dbg("%s: a=%d b=%d x=%d r=%x", __func__, a, b, x, r);</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int af9013_set_coeff(struct af9013_state *state, fe_bandwidth_t bw)</div><div class='add'>+static int af9013_power_ctrl(struct af9013_state *state, u8 onoff)</div><div class='ctx'> {</div><div class='del'>-	int ret, i, j, found;</div><div class='del'>-	deb_info("%s: adc_clock:%d bw:%d\n", __func__,</div><div class='del'>-		state-&gt;config.adc_clock, bw);</div><div class='del'>-</div><div class='del'>-	/* lookup coeff from table */</div><div class='del'>-	for (i = 0, found = 0; i &lt; ARRAY_SIZE(coeff_table); i++) {</div><div class='del'>-		if (coeff_table[i].adc_clock == state-&gt;config.adc_clock &amp;&amp;</div><div class='del'>-			coeff_table[i].bw == bw) {</div><div class='del'>-			found = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	int ret, i;</div><div class='add'>+	u8 tmp;</div><div class='ctx'> </div><div class='del'>-	if (!found) {</div><div class='del'>-		err("invalid bw or clock");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto error;</div><div class='add'>+	dbg("%s: onoff=%d", __func__, onoff);</div><div class='add'>+</div><div class='add'>+	/* enable reset */</div><div class='add'>+	ret = af9013_wr_reg_bits(state, 0xd417, 4, 1, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* start reset mechanism */</div><div class='add'>+	ret = af9013_wr_reg(state, 0xaeff, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* wait reset performs */</div><div class='add'>+	for (i = 0; i &lt; 150; i++) {</div><div class='add'>+		ret = af9013_rd_reg_bits(state, 0xd417, 1, 1, &amp;tmp);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		if (tmp)</div><div class='add'>+			break; /* reset done */</div><div class='add'>+</div><div class='add'>+		usleep_range(5000, 25000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	deb_info("%s: coeff: ", __func__);</div><div class='del'>-	debug_dump(coeff_table[i].val, sizeof(coeff_table[i].val), deb_info);</div><div class='add'>+	if (!tmp)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='ctx'> </div><div class='del'>-	/* program */</div><div class='del'>-	for (j = 0; j &lt; sizeof(coeff_table[i].val); j++) {</div><div class='del'>-		ret = af9013_write_reg(state, 0xae00 + j,</div><div class='del'>-			coeff_table[i].val[j]);</div><div class='add'>+	if (onoff) {</div><div class='add'>+		/* clear reset */</div><div class='add'>+		ret = af9013_wr_reg_bits(state, 0xd417, 1, 1, 0);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			break;</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		/* disable reset */</div><div class='add'>+		ret = af9013_wr_reg_bits(state, 0xd417, 4, 1, 0);</div><div class='add'>+</div><div class='add'>+		/* power on */</div><div class='add'>+		ret = af9013_wr_reg_bits(state, 0xd73a, 3, 1, 0);</div><div class='add'>+	} else {</div><div class='add'>+		/* power off */</div><div class='add'>+		ret = af9013_wr_reg_bits(state, 0xd73a, 3, 1, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-error:</div><div class='add'>+	return ret;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_statistics_ber_unc_start(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dbg("%s", __func__);</div><div class='add'>+</div><div class='add'>+	/* reset and start BER counter */</div><div class='add'>+	ret = af9013_wr_reg_bits(state, 0xd391, 4, 1, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int af9013_set_adc_ctrl(struct af9013_state *state)</div><div class='add'>+static int af9013_statistics_ber_unc_result(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 buf[3], tmp, i;</div><div class='del'>-	u32 adc_cw;</div><div class='add'>+	u8 buf[5];</div><div class='ctx'> </div><div class='del'>-	deb_info("%s: adc_clock:%d\n", __func__, state-&gt;config.adc_clock);</div><div class='add'>+	dbg("%s", __func__);</div><div class='ctx'> </div><div class='del'>-	/* adc frequency type */</div><div class='del'>-	switch (state-&gt;config.adc_clock) {</div><div class='del'>-	case 28800: /* 28.800 MHz */</div><div class='del'>-		tmp = 0;</div><div class='del'>-		break;</div><div class='del'>-	case 20480: /* 20.480 MHz */</div><div class='del'>-		tmp = 1;</div><div class='add'>+	/* check if error bit count is ready */</div><div class='add'>+	ret = af9013_rd_reg_bits(state, 0xd391, 4, 1, &amp;buf[0]);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (!buf[0]) {</div><div class='add'>+		dbg("%s: not ready", __func__);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = af9013_rd_regs(state, 0xd387, buf, 5);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	state-&gt;ber = (buf[2] &lt;&lt; 16) | (buf[1] &lt;&lt; 8) | buf[0];</div><div class='add'>+	state-&gt;ucblocks += (buf[4] &lt;&lt; 8) | buf[3];</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_statistics_snr_start(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dbg("%s", __func__);</div><div class='add'>+</div><div class='add'>+	/* start SNR meas */</div><div class='add'>+	ret = af9013_wr_reg_bits(state, 0xd2e1, 3, 1, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_statistics_snr_result(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret, i, len;</div><div class='add'>+	u8 buf[3], tmp;</div><div class='add'>+	u32 snr_val;</div><div class='add'>+	const struct af9013_snr *uninitialized_var(snr_lut);</div><div class='add'>+</div><div class='add'>+	dbg("%s", __func__);</div><div class='add'>+</div><div class='add'>+	/* check if SNR ready */</div><div class='add'>+	ret = af9013_rd_reg_bits(state, 0xd2e1, 3, 1, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (!tmp) {</div><div class='add'>+		dbg("%s: not ready", __func__);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* read value */</div><div class='add'>+	ret = af9013_rd_regs(state, 0xd2e3, buf, 3);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	snr_val = (buf[2] &lt;&lt; 16) | (buf[1] &lt;&lt; 8) | buf[0];</div><div class='add'>+</div><div class='add'>+	/* read current modulation */</div><div class='add'>+	ret = af9013_rd_reg(state, 0xd3c1, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	switch ((tmp &gt;&gt; 6) &amp; 3) {</div><div class='add'>+	case 0:</div><div class='add'>+		len = ARRAY_SIZE(qpsk_snr_lut);</div><div class='add'>+		snr_lut = qpsk_snr_lut;</div><div class='ctx'> 		break;</div><div class='del'>-	case 28000: /* 28.000 MHz */</div><div class='del'>-		tmp = 2;</div><div class='add'>+	case 1:</div><div class='add'>+		len = ARRAY_SIZE(qam16_snr_lut);</div><div class='add'>+		snr_lut = qam16_snr_lut;</div><div class='ctx'> 		break;</div><div class='del'>-	case 25000: /* 25.000 MHz */</div><div class='del'>-		tmp = 3;</div><div class='add'>+	case 2:</div><div class='add'>+		len = ARRAY_SIZE(qam64_snr_lut);</div><div class='add'>+		snr_lut = qam64_snr_lut;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		err("invalid xtal");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	adc_cw = af913_div(state-&gt;config.adc_clock*1000, 1000000ul, 19ul);</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		tmp = snr_lut[i].snr;</div><div class='ctx'> </div><div class='del'>-	buf[0] = (u8) ((adc_cw &amp; 0x000000ff));</div><div class='del'>-	buf[1] = (u8) ((adc_cw &amp; 0x0000ff00) &gt;&gt; 8);</div><div class='del'>-	buf[2] = (u8) ((adc_cw &amp; 0x00ff0000) &gt;&gt; 16);</div><div class='add'>+		if (snr_val &lt; snr_lut[i].val)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	state-&gt;snr = tmp * 10; /* dB/10 */</div><div class='ctx'> </div><div class='del'>-	deb_info("%s: adc_cw:", __func__);</div><div class='del'>-	debug_dump(buf, sizeof(buf), deb_info);</div><div class='add'>+	return ret;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_statistics_signal_strength(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u8 buf[2], rf_gain, if_gain;</div><div class='add'>+	int signal_strength;</div><div class='add'>+</div><div class='add'>+	dbg("%s", __func__);</div><div class='add'>+</div><div class='add'>+	if (!state-&gt;signal_strength_en)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = af9013_rd_regs(state, 0xd07c, buf, 2);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	rf_gain = buf[0];</div><div class='add'>+	if_gain = buf[1];</div><div class='add'>+</div><div class='add'>+	signal_strength = (0xffff / \</div><div class='add'>+		(9 * (state-&gt;rf_50 + state-&gt;if_50) - \</div><div class='add'>+		11 * (state-&gt;rf_80 + state-&gt;if_80))) * \</div><div class='add'>+		(10 * (rf_gain + if_gain) - \</div><div class='add'>+		11 * (state-&gt;rf_80 + state-&gt;if_80));</div><div class='add'>+	if (signal_strength &lt; 0)</div><div class='add'>+		signal_strength = 0;</div><div class='add'>+	else if (signal_strength &gt; 0xffff)</div><div class='add'>+		signal_strength = 0xffff;</div><div class='add'>+</div><div class='add'>+	state-&gt;signal_strength = signal_strength;</div><div class='ctx'> </div><div class='del'>-	/* program */</div><div class='del'>-	for (i = 0; i &lt; sizeof(buf); i++) {</div><div class='del'>-		ret = af9013_write_reg(state, 0xd180 + i, buf[i]);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-	}</div><div class='del'>-	ret = af9013_write_reg_bits(state, 0x9bd2, 0, 4, tmp);</div><div class='del'>-error:</div><div class='add'>+	return ret;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int af9013_set_freq_ctrl(struct af9013_state *state, fe_bandwidth_t bw)</div><div class='add'>+static void af9013_statistics_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u16 addr;</div><div class='del'>-	u8 buf[3], i, j;</div><div class='del'>-	u32 adc_freq, freq_cw;</div><div class='del'>-	s8 bfs_spec_inv;</div><div class='del'>-	int if_sample_freq;</div><div class='del'>-</div><div class='del'>-	for (j = 0; j &lt; 3; j++) {</div><div class='del'>-		if (j == 0) {</div><div class='del'>-			addr = 0xd140; /* fcw normal */</div><div class='del'>-			bfs_spec_inv = state-&gt;config.rf_spec_inv ? -1 : 1;</div><div class='del'>-		} else if (j == 1) {</div><div class='del'>-			addr = 0x9be7; /* fcw dummy ram */</div><div class='del'>-			bfs_spec_inv = state-&gt;config.rf_spec_inv ? -1 : 1;</div><div class='del'>-		} else {</div><div class='del'>-			addr = 0x9bea; /* fcw inverted */</div><div class='del'>-			bfs_spec_inv = state-&gt;config.rf_spec_inv ? 1 : -1;</div><div class='del'>-		}</div><div class='add'>+	struct af9013_state *state = container_of(work,</div><div class='add'>+		struct af9013_state, statistics_work.work);</div><div class='add'>+	unsigned int next_msec;</div><div class='add'>+</div><div class='add'>+	/* update only signal strength when demod is not locked */</div><div class='add'>+	if (!(state-&gt;fe_status &amp; FE_HAS_LOCK)) {</div><div class='add'>+		state-&gt;statistics_step = 0;</div><div class='add'>+		state-&gt;ber = 0;</div><div class='add'>+		state-&gt;snr = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (state-&gt;statistics_step) {</div><div class='add'>+	default:</div><div class='add'>+		state-&gt;statistics_step = 0;</div><div class='add'>+	case 0:</div><div class='add'>+		ret = af9013_statistics_signal_strength(&amp;state-&gt;fe);</div><div class='add'>+		state-&gt;statistics_step++;</div><div class='add'>+		next_msec = 300;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		ret = af9013_statistics_snr_start(&amp;state-&gt;fe);</div><div class='add'>+		state-&gt;statistics_step++;</div><div class='add'>+		next_msec = 200;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		ret = af9013_statistics_ber_unc_start(&amp;state-&gt;fe);</div><div class='add'>+		state-&gt;statistics_step++;</div><div class='add'>+		next_msec = 1000;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		ret = af9013_statistics_snr_result(&amp;state-&gt;fe);</div><div class='add'>+		state-&gt;statistics_step++;</div><div class='add'>+		next_msec = 400;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		ret = af9013_statistics_ber_unc_result(&amp;state-&gt;fe);</div><div class='add'>+		state-&gt;statistics_step++;</div><div class='add'>+		next_msec = 100;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		adc_freq       = state-&gt;config.adc_clock * 1000;</div><div class='del'>-		if_sample_freq = state-&gt;config.tuner_if * 1000;</div><div class='add'>+	schedule_delayed_work(&amp;state-&gt;statistics_work,</div><div class='add'>+		msecs_to_jiffies(next_msec));</div><div class='ctx'> </div><div class='del'>-		/* TDA18271 uses different sampling freq for every bw */</div><div class='del'>-		if (state-&gt;config.tuner == AF9013_TUNER_TDA18271) {</div><div class='del'>-			switch (bw) {</div><div class='del'>-			case BANDWIDTH_6_MHZ:</div><div class='del'>-				if_sample_freq = 3300000; /* 3.3 MHz */</div><div class='del'>-				break;</div><div class='del'>-			case BANDWIDTH_7_MHZ:</div><div class='del'>-				if_sample_freq = 3500000; /* 3.5 MHz */</div><div class='del'>-				break;</div><div class='del'>-			case BANDWIDTH_8_MHZ:</div><div class='del'>-			default:</div><div class='del'>-				if_sample_freq = 4000000; /* 4.0 MHz */</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else if (state-&gt;config.tuner == AF9013_TUNER_TDA18218) {</div><div class='del'>-			switch (bw) {</div><div class='del'>-			case BANDWIDTH_6_MHZ:</div><div class='del'>-				if_sample_freq = 3000000; /* 3 MHz */</div><div class='del'>-				break;</div><div class='del'>-			case BANDWIDTH_7_MHZ:</div><div class='del'>-				if_sample_freq = 3500000; /* 3.5 MHz */</div><div class='del'>-				break;</div><div class='del'>-			case BANDWIDTH_8_MHZ:</div><div class='del'>-			default:</div><div class='del'>-				if_sample_freq = 4000000; /* 4 MHz */</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_get_tune_settings(struct dvb_frontend *fe,</div><div class='add'>+	struct dvb_frontend_tune_settings *fesettings)</div><div class='add'>+{</div><div class='add'>+	fesettings-&gt;min_delay_ms = 800;</div><div class='add'>+	fesettings-&gt;step_size = 0;</div><div class='add'>+	fesettings-&gt;max_drift = 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 af9013_set_frontend(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	int ret, i, sampling_freq;</div><div class='add'>+	bool auto_mode, spec_inv;</div><div class='add'>+	u8 buf[6];</div><div class='add'>+	u32 if_frequency, freq_cw;</div><div class='add'>+</div><div class='add'>+	dbg("%s: frequency=%d bandwidth_hz=%d", __func__,</div><div class='add'>+		c-&gt;frequency, c-&gt;bandwidth_hz);</div><div class='add'>+</div><div class='add'>+	/* program tuner */</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params)</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='add'>+</div><div class='add'>+	/* program CFOE coefficients */</div><div class='add'>+	if (c-&gt;bandwidth_hz != state-&gt;bandwidth_hz) {</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(coeff_lut); i++) {</div><div class='add'>+			if (coeff_lut[i].clock == state-&gt;config.clock &amp;&amp;</div><div class='add'>+				coeff_lut[i].bandwidth_hz == c-&gt;bandwidth_hz) {</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		while (if_sample_freq &gt; (adc_freq / 2))</div><div class='del'>-			if_sample_freq = if_sample_freq - adc_freq;</div><div class='add'>+		ret = af9013_wr_regs(state, 0xae00, coeff_lut[i].val,</div><div class='add'>+			sizeof(coeff_lut[i].val));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (if_sample_freq &gt;= 0)</div><div class='del'>-			bfs_spec_inv = bfs_spec_inv * (-1);</div><div class='add'>+	/* program frequency control */</div><div class='add'>+	if (c-&gt;bandwidth_hz != state-&gt;bandwidth_hz || state-&gt;first_tune) {</div><div class='add'>+		/* get used IF frequency */</div><div class='add'>+		if (fe-&gt;ops.tuner_ops.get_if_frequency)</div><div class='add'>+			fe-&gt;ops.tuner_ops.get_if_frequency(fe, &amp;if_frequency);</div><div class='ctx'> 		else</div><div class='del'>-			if_sample_freq = if_sample_freq * (-1);</div><div class='add'>+			if_frequency = state-&gt;config.if_frequency;</div><div class='add'>+</div><div class='add'>+		sampling_freq = if_frequency;</div><div class='ctx'> </div><div class='del'>-		freq_cw = af913_div(if_sample_freq, adc_freq, 23ul);</div><div class='add'>+		while (sampling_freq &gt; (state-&gt;config.clock / 2))</div><div class='add'>+			sampling_freq -= state-&gt;config.clock;</div><div class='ctx'> </div><div class='del'>-		if (bfs_spec_inv == -1)</div><div class='del'>-			freq_cw = 0x00800000 - freq_cw;</div><div class='add'>+		if (sampling_freq &lt; 0) {</div><div class='add'>+			sampling_freq *= -1;</div><div class='add'>+			spec_inv = state-&gt;config.spec_inv;</div><div class='add'>+		} else {</div><div class='add'>+			spec_inv = !state-&gt;config.spec_inv;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		buf[0] = (u8) ((freq_cw &amp; 0x000000ff));</div><div class='del'>-		buf[1] = (u8) ((freq_cw &amp; 0x0000ff00) &gt;&gt; 8);</div><div class='del'>-		buf[2] = (u8) ((freq_cw &amp; 0x007f0000) &gt;&gt; 16);</div><div class='add'>+		freq_cw = af913_div(sampling_freq, state-&gt;config.clock, 23);</div><div class='ctx'> </div><div class='add'>+		if (spec_inv)</div><div class='add'>+			freq_cw = 0x800000 - freq_cw;</div><div class='ctx'> </div><div class='del'>-		deb_info("%s: freq_cw:", __func__);</div><div class='del'>-		debug_dump(buf, sizeof(buf), deb_info);</div><div class='add'>+		buf[0] = (freq_cw &gt;&gt;  0) &amp; 0xff;</div><div class='add'>+		buf[1] = (freq_cw &gt;&gt;  8) &amp; 0xff;</div><div class='add'>+		buf[2] = (freq_cw &gt;&gt; 16) &amp; 0x7f;</div><div class='ctx'> </div><div class='del'>-		/* program */</div><div class='del'>-		for (i = 0; i &lt; sizeof(buf); i++) {</div><div class='del'>-			ret = af9013_write_reg(state, addr++, buf[i]);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto error;</div><div class='del'>-		}</div><div class='add'>+		freq_cw = 0x800000 - freq_cw;</div><div class='add'>+</div><div class='add'>+		buf[3] = (freq_cw &gt;&gt;  0) &amp; 0xff;</div><div class='add'>+		buf[4] = (freq_cw &gt;&gt;  8) &amp; 0xff;</div><div class='add'>+		buf[5] = (freq_cw &gt;&gt; 16) &amp; 0x7f;</div><div class='add'>+</div><div class='add'>+		ret = af9013_wr_regs(state, 0xd140, buf, 3);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		ret = af9013_wr_regs(state, 0x9be7, buf, 6);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='ctx'> 	}</div><div class='del'>-error:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int af9013_set_ofdm_params(struct af9013_state *state,</div><div class='del'>-	struct dvb_ofdm_parameters *params, u8 *auto_mode)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	u8 i, buf[3] = {0, 0, 0};</div><div class='del'>-	*auto_mode = 0; /* set if parameters are requested to auto set */</div><div class='add'>+	/* clear TPS lock flag */</div><div class='add'>+	ret = af9013_wr_reg_bits(state, 0xd330, 3, 1, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* clear MPEG2 lock flag */</div><div class='add'>+	ret = af9013_wr_reg_bits(state, 0xd507, 6, 1, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* empty channel function */</div><div class='add'>+	ret = af9013_wr_reg_bits(state, 0x9bfe, 0, 1, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='del'>-	/* Try auto-detect transmission parameters in case of AUTO requested or</div><div class='del'>-	   garbage parameters given by application for compatibility.</div><div class='del'>-	   MPlayer seems to provide garbage parameters currently. */</div><div class='add'>+	/* empty DVB-T channel function */</div><div class='add'>+	ret = af9013_wr_reg_bits(state, 0x9bc2, 0, 1, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* transmission parameters */</div><div class='add'>+	auto_mode = false;</div><div class='add'>+	memset(buf, 0, 3);</div><div class='ctx'> </div><div class='del'>-	switch (params-&gt;transmission_mode) {</div><div class='add'>+	switch (c-&gt;transmission_mode) {</div><div class='ctx'> 	case TRANSMISSION_MODE_AUTO:</div><div class='del'>-		*auto_mode = 1;</div><div class='add'>+		auto_mode = 1;</div><div class='add'>+		break;</div><div class='ctx'> 	case TRANSMISSION_MODE_2K:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TRANSMISSION_MODE_8K:</div><div class='ctx'> 		buf[0] |= (1 &lt;&lt; 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		deb_info("%s: invalid transmission_mode\n", __func__);</div><div class='del'>-		*auto_mode = 1;</div><div class='add'>+		dbg("%s: invalid transmission_mode", __func__);</div><div class='add'>+		auto_mode = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (params-&gt;guard_interval) {</div><div class='add'>+	switch (c-&gt;guard_interval) {</div><div class='ctx'> 	case GUARD_INTERVAL_AUTO:</div><div class='del'>-		*auto_mode = 1;</div><div class='add'>+		auto_mode = 1;</div><div class='add'>+		break;</div><div class='ctx'> 	case GUARD_INTERVAL_1_32:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case GUARD_INTERVAL_1_16:</div><div class='hunk'>@@ -427,13 +699,14 @@ static int af9013_set_ofdm_params(struct af9013_state *state,</div><div class='ctx'> 		buf[0] |= (3 &lt;&lt; 2);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		deb_info("%s: invalid guard_interval\n", __func__);</div><div class='del'>-		*auto_mode = 1;</div><div class='add'>+		dbg("%s: invalid guard_interval", __func__);</div><div class='add'>+		auto_mode = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (params-&gt;hierarchy_information) {</div><div class='add'>+	switch (c-&gt;hierarchy) {</div><div class='ctx'> 	case HIERARCHY_AUTO:</div><div class='del'>-		*auto_mode = 1;</div><div class='add'>+		auto_mode = 1;</div><div class='add'>+		break;</div><div class='ctx'> 	case HIERARCHY_NONE:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HIERARCHY_1:</div><div class='hunk'>@@ -446,13 +719,14 @@ static int af9013_set_ofdm_params(struct af9013_state *state,</div><div class='ctx'> 		buf[0] |= (3 &lt;&lt; 4);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		deb_info("%s: invalid hierarchy_information\n", __func__);</div><div class='del'>-		*auto_mode = 1;</div><div class='add'>+		dbg("%s: invalid hierarchy", __func__);</div><div class='add'>+		auto_mode = 1;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	switch (params-&gt;constellation) {</div><div class='add'>+	switch (c-&gt;modulation) {</div><div class='ctx'> 	case QAM_AUTO:</div><div class='del'>-		*auto_mode = 1;</div><div class='add'>+		auto_mode = 1;</div><div class='add'>+		break;</div><div class='ctx'> 	case QPSK:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case QAM_16:</div><div class='hunk'>@@ -462,16 +736,17 @@ static int af9013_set_ofdm_params(struct af9013_state *state,</div><div class='ctx'> 		buf[1] |= (2 &lt;&lt; 6);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		deb_info("%s: invalid constellation\n", __func__);</div><div class='del'>-		*auto_mode = 1;</div><div class='add'>+		dbg("%s: invalid modulation", __func__);</div><div class='add'>+		auto_mode = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Use HP. How and which case we can switch to LP? */</div><div class='ctx'> 	buf[1] |= (1 &lt;&lt; 4);</div><div class='ctx'> </div><div class='del'>-	switch (params-&gt;code_rate_HP) {</div><div class='add'>+	switch (c-&gt;code_rate_HP) {</div><div class='ctx'> 	case FEC_AUTO:</div><div class='del'>-		*auto_mode = 1;</div><div class='add'>+		auto_mode = 1;</div><div class='add'>+		break;</div><div class='ctx'> 	case FEC_1_2:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FEC_2_3:</div><div class='hunk'>@@ -487,16 +762,14 @@ static int af9013_set_ofdm_params(struct af9013_state *state,</div><div class='ctx'> 		buf[2] |= (4 &lt;&lt; 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		deb_info("%s: invalid code_rate_HP\n", __func__);</div><div class='del'>-		*auto_mode = 1;</div><div class='add'>+		dbg("%s: invalid code_rate_HP", __func__);</div><div class='add'>+		auto_mode = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (params-&gt;code_rate_LP) {</div><div class='add'>+	switch (c-&gt;code_rate_LP) {</div><div class='ctx'> 	case FEC_AUTO:</div><div class='del'>-	/* if HIERARCHY_NONE and FEC_NONE then LP FEC is set to FEC_AUTO</div><div class='del'>-	   by dvb_frontend.c for compatibility */</div><div class='del'>-		if (params-&gt;hierarchy_information != HIERARCHY_NONE)</div><div class='del'>-			*auto_mode = 1;</div><div class='add'>+		auto_mode = 1;</div><div class='add'>+		break;</div><div class='ctx'> 	case FEC_1_2:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FEC_2_3:</div><div class='hunk'>@@ -512,709 +785,373 @@ static int af9013_set_ofdm_params(struct af9013_state *state,</div><div class='ctx'> 		buf[2] |= (4 &lt;&lt; 3);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FEC_NONE:</div><div class='del'>-		if (params-&gt;hierarchy_information == HIERARCHY_AUTO)</div><div class='del'>-			break;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='del'>-		deb_info("%s: invalid code_rate_LP\n", __func__);</div><div class='del'>-		*auto_mode = 1;</div><div class='add'>+		dbg("%s: invalid code_rate_LP", __func__);</div><div class='add'>+		auto_mode = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (params-&gt;bandwidth) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	switch (c-&gt;bandwidth_hz) {</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		buf[1] |= (1 &lt;&lt; 2);</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		buf[1] |= (2 &lt;&lt; 2);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		deb_info("%s: invalid bandwidth\n", __func__);</div><div class='del'>-		buf[1] |= (2 &lt;&lt; 2); /* cannot auto-detect BW, try 8 MHz */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* program */</div><div class='del'>-	for (i = 0; i &lt; sizeof(buf); i++) {</div><div class='del'>-		ret = af9013_write_reg(state, 0xd3c0 + i, buf[i]);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='add'>+		dbg("%s: invalid bandwidth_hz", __func__);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int af9013_reset(struct af9013_state *state, u8 sleep)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	u8 tmp, i;</div><div class='del'>-	deb_info("%s\n", __func__);</div><div class='del'>-</div><div class='del'>-	/* enable OFDM reset */</div><div class='del'>-	ret = af9013_write_reg_bits(state, 0xd417, 4, 1, 1);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	/* start reset mechanism */</div><div class='del'>-	ret = af9013_write_reg(state, 0xaeff, 1);</div><div class='add'>+	ret = af9013_wr_regs(state, 0xd3c0, buf, 3);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='del'>-	/* reset is done when bit 1 is set */</div><div class='del'>-	for (i = 0; i &lt; 150; i++) {</div><div class='del'>-		ret = af9013_read_reg_bits(state, 0xd417, 1, 1, &amp;tmp);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-		if (tmp)</div><div class='del'>-			break; /* reset done */</div><div class='del'>-		msleep(10);</div><div class='del'>-	}</div><div class='del'>-	if (!tmp)</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-	/* don't clear reset when going to sleep */</div><div class='del'>-	if (!sleep) {</div><div class='del'>-		/* clear OFDM reset */</div><div class='del'>-		ret = af9013_write_reg_bits(state, 0xd417, 1, 1, 0);</div><div class='add'>+	if (auto_mode) {</div><div class='add'>+		/* clear easy mode flag */</div><div class='add'>+		ret = af9013_wr_reg(state, 0xaefd, 0);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-</div><div class='del'>-		/* disable OFDM reset */</div><div class='del'>-		ret = af9013_write_reg_bits(state, 0xd417, 4, 1, 0);</div><div class='del'>-	}</div><div class='del'>-error:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int af9013_power_ctrl(struct af9013_state *state, u8 onoff)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	deb_info("%s: onoff:%d\n", __func__, onoff);</div><div class='add'>+			goto err;</div><div class='ctx'> </div><div class='del'>-	if (onoff) {</div><div class='del'>-		/* power on */</div><div class='del'>-		ret = af9013_write_reg_bits(state, 0xd73a, 3, 1, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-		ret = af9013_write_reg_bits(state, 0xd417, 1, 1, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-		ret = af9013_write_reg_bits(state, 0xd417, 4, 1, 0);</div><div class='add'>+		dbg("%s: auto params", __func__);</div><div class='ctx'> 	} else {</div><div class='del'>-		/* power off */</div><div class='del'>-		ret = af9013_reset(state, 1);</div><div class='add'>+		/* set easy mode flag */</div><div class='add'>+		ret = af9013_wr_reg(state, 0xaefd, 1);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-		ret = af9013_write_reg_bits(state, 0xd73a, 3, 1, 1);</div><div class='del'>-	}</div><div class='del'>-error:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int af9013_lock_led(struct af9013_state *state, u8 onoff)</div><div class='del'>-{</div><div class='del'>-	deb_info("%s: onoff:%d\n", __func__, onoff);</div><div class='del'>-</div><div class='del'>-	return af9013_write_reg_bits(state, 0xd730, 0, 1, onoff);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int af9013_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *params)</div><div class='del'>-{</div><div class='del'>-	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	int ret;</div><div class='del'>-	u8 auto_mode; /* auto set TPS */</div><div class='add'>+			goto err;</div><div class='ctx'> </div><div class='del'>-	deb_info("%s: freq:%d bw:%d\n", __func__, params-&gt;frequency,</div><div class='del'>-		params-&gt;u.ofdm.bandwidth);</div><div class='del'>-</div><div class='del'>-	state-&gt;frequency = params-&gt;frequency;</div><div class='del'>-</div><div class='del'>-	/* program tuner */</div><div class='del'>-	if (fe-&gt;ops.tuner_ops.set_params)</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, params);</div><div class='del'>-</div><div class='del'>-	/* program CFOE coefficients */</div><div class='del'>-	ret = af9013_set_coeff(state, params-&gt;u.ofdm.bandwidth);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	/* program frequency control */</div><div class='del'>-	ret = af9013_set_freq_ctrl(state, params-&gt;u.ofdm.bandwidth);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	/* clear TPS lock flag (inverted flag) */</div><div class='del'>-	ret = af9013_write_reg_bits(state, 0xd330, 3, 1, 1);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	/* clear MPEG2 lock flag */</div><div class='del'>-	ret = af9013_write_reg_bits(state, 0xd507, 6, 1, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	/* empty channel function */</div><div class='del'>-	ret = af9013_write_reg_bits(state, 0x9bfe, 0, 1, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	/* empty DVB-T channel function */</div><div class='del'>-	ret = af9013_write_reg_bits(state, 0x9bc2, 0, 1, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	/* program TPS and bandwidth, check if auto mode needed */</div><div class='del'>-	ret = af9013_set_ofdm_params(state, &amp;params-&gt;u.ofdm, &amp;auto_mode);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	if (auto_mode) {</div><div class='del'>-		/* clear easy mode flag */</div><div class='del'>-		ret = af9013_write_reg(state, 0xaefd, 0);</div><div class='del'>-		deb_info("%s: auto TPS\n", __func__);</div><div class='del'>-	} else {</div><div class='del'>-		/* set easy mode flag */</div><div class='del'>-		ret = af9013_write_reg(state, 0xaefd, 1);</div><div class='add'>+		ret = af9013_wr_reg(state, 0xaefe, 0);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-		ret = af9013_write_reg(state, 0xaefe, 0);</div><div class='del'>-		deb_info("%s: manual TPS\n", __func__);</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		dbg("%s: manual params", __func__);</div><div class='ctx'> 	}</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='ctx'> </div><div class='del'>-	/* everything is set, lets try to receive channel - OFSM GO! */</div><div class='del'>-	ret = af9013_write_reg(state, 0xffff, 0);</div><div class='add'>+	/* tune */</div><div class='add'>+	ret = af9013_wr_reg(state, 0xffff, 0);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	state-&gt;bandwidth_hz = c-&gt;bandwidth_hz;</div><div class='add'>+	state-&gt;set_frontend_jiffies = jiffies;</div><div class='add'>+	state-&gt;first_tune = false;</div><div class='ctx'> </div><div class='del'>-error:</div><div class='add'>+	return ret;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int af9013_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int af9013_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 i, buf[3];</div><div class='del'>-	deb_info("%s\n", __func__);</div><div class='add'>+	u8 buf[3];</div><div class='ctx'> </div><div class='del'>-	/* read TPS registers */</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		ret = af9013_read_reg(state, 0xd3c0 + i, &amp;buf[i]);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-	}</div><div class='add'>+	dbg("%s", __func__);</div><div class='add'>+</div><div class='add'>+	ret = af9013_rd_regs(state, 0xd3c0, buf, 3);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	switch ((buf[1] &gt;&gt; 6) &amp; 3) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		p-&gt;u.ofdm.constellation = QPSK;</div><div class='add'>+		c-&gt;modulation = QPSK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		p-&gt;u.ofdm.constellation = QAM_16;</div><div class='add'>+		c-&gt;modulation = QAM_16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		p-&gt;u.ofdm.constellation = QAM_64;</div><div class='add'>+		c-&gt;modulation = QAM_64;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch ((buf[0] &gt;&gt; 0) &amp; 3) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		p-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_2K;</div><div class='add'>+		c-&gt;transmission_mode = TRANSMISSION_MODE_2K;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		p-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_8K;</div><div class='add'>+		c-&gt;transmission_mode = TRANSMISSION_MODE_8K;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch ((buf[0] &gt;&gt; 2) &amp; 3) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		p-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_32;</div><div class='add'>+		c-&gt;guard_interval = GUARD_INTERVAL_1_32;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		p-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_16;</div><div class='add'>+		c-&gt;guard_interval = GUARD_INTERVAL_1_16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		p-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_8;</div><div class='add'>+		c-&gt;guard_interval = GUARD_INTERVAL_1_8;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		p-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_4;</div><div class='add'>+		c-&gt;guard_interval = GUARD_INTERVAL_1_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch ((buf[0] &gt;&gt; 4) &amp; 7) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		p-&gt;u.ofdm.hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+		c-&gt;hierarchy = HIERARCHY_NONE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		p-&gt;u.ofdm.hierarchy_information = HIERARCHY_1;</div><div class='add'>+		c-&gt;hierarchy = HIERARCHY_1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		p-&gt;u.ofdm.hierarchy_information = HIERARCHY_2;</div><div class='add'>+		c-&gt;hierarchy = HIERARCHY_2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		p-&gt;u.ofdm.hierarchy_information = HIERARCHY_4;</div><div class='add'>+		c-&gt;hierarchy = HIERARCHY_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch ((buf[2] &gt;&gt; 0) &amp; 7) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		p-&gt;u.ofdm.code_rate_HP = FEC_1_2;</div><div class='add'>+		c-&gt;code_rate_HP = FEC_1_2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		p-&gt;u.ofdm.code_rate_HP = FEC_2_3;</div><div class='add'>+		c-&gt;code_rate_HP = FEC_2_3;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		p-&gt;u.ofdm.code_rate_HP = FEC_3_4;</div><div class='add'>+		c-&gt;code_rate_HP = FEC_3_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		p-&gt;u.ofdm.code_rate_HP = FEC_5_6;</div><div class='add'>+		c-&gt;code_rate_HP = FEC_5_6;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4:</div><div class='del'>-		p-&gt;u.ofdm.code_rate_HP = FEC_7_8;</div><div class='add'>+		c-&gt;code_rate_HP = FEC_7_8;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch ((buf[2] &gt;&gt; 3) &amp; 7) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		p-&gt;u.ofdm.code_rate_LP = FEC_1_2;</div><div class='add'>+		c-&gt;code_rate_LP = FEC_1_2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		p-&gt;u.ofdm.code_rate_LP = FEC_2_3;</div><div class='add'>+		c-&gt;code_rate_LP = FEC_2_3;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		p-&gt;u.ofdm.code_rate_LP = FEC_3_4;</div><div class='add'>+		c-&gt;code_rate_LP = FEC_3_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		p-&gt;u.ofdm.code_rate_LP = FEC_5_6;</div><div class='add'>+		c-&gt;code_rate_LP = FEC_5_6;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4:</div><div class='del'>-		p-&gt;u.ofdm.code_rate_LP = FEC_7_8;</div><div class='add'>+		c-&gt;code_rate_LP = FEC_7_8;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch ((buf[1] &gt;&gt; 2) &amp; 3) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		p-&gt;u.ofdm.bandwidth = BANDWIDTH_6_MHZ;</div><div class='add'>+		c-&gt;bandwidth_hz = 6000000;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		p-&gt;u.ofdm.bandwidth = BANDWIDTH_7_MHZ;</div><div class='add'>+		c-&gt;bandwidth_hz = 7000000;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		p-&gt;u.ofdm.bandwidth = BANDWIDTH_8_MHZ;</div><div class='add'>+		c-&gt;bandwidth_hz = 8000000;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p-&gt;inversion = INVERSION_AUTO;</div><div class='del'>-	p-&gt;frequency = state-&gt;frequency;</div><div class='del'>-</div><div class='del'>-error:</div><div class='ctx'> 	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int af9013_update_ber_unc(struct dvb_frontend *fe)</div><div class='del'>-{</div><div class='del'>-	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	int ret;</div><div class='del'>-	u8 buf[3], i;</div><div class='del'>-	u32 error_bit_count = 0;</div><div class='del'>-	u32 total_bit_count = 0;</div><div class='del'>-	u32 abort_packet_count = 0;</div><div class='del'>-</div><div class='del'>-	state-&gt;ber = 0;</div><div class='del'>-</div><div class='del'>-	/* check if error bit count is ready */</div><div class='del'>-	ret = af9013_read_reg_bits(state, 0xd391, 4, 1, &amp;buf[0]);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-	if (!buf[0])</div><div class='del'>-		goto exit;</div><div class='del'>-</div><div class='del'>-	/* get RSD packet abort count */</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		ret = af9013_read_reg(state, 0xd38a + i, &amp;buf[i]);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-	}</div><div class='del'>-	abort_packet_count = (buf[1] &lt;&lt; 8) + buf[0];</div><div class='del'>-</div><div class='del'>-	/* get error bit count */</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		ret = af9013_read_reg(state, 0xd387 + i, &amp;buf[i]);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-	}</div><div class='del'>-	error_bit_count = (buf[2] &lt;&lt; 16) + (buf[1] &lt;&lt; 8) + buf[0];</div><div class='del'>-	error_bit_count = error_bit_count - abort_packet_count * 8 * 8;</div><div class='del'>-</div><div class='del'>-	/* get used RSD counting period (10000 RSD packets used) */</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		ret = af9013_read_reg(state, 0xd385 + i, &amp;buf[i]);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-	}</div><div class='del'>-	total_bit_count = (buf[1] &lt;&lt; 8) + buf[0];</div><div class='del'>-	total_bit_count = total_bit_count - abort_packet_count;</div><div class='del'>-	total_bit_count = total_bit_count * 204 * 8;</div><div class='del'>-</div><div class='del'>-	if (total_bit_count)</div><div class='del'>-		state-&gt;ber = error_bit_count * 1000000000 / total_bit_count;</div><div class='del'>-</div><div class='del'>-	state-&gt;ucblocks += abort_packet_count;</div><div class='del'>-</div><div class='del'>-	deb_info("%s: err bits:%d total bits:%d abort count:%d\n", __func__,</div><div class='del'>-		error_bit_count, total_bit_count, abort_packet_count);</div><div class='del'>-</div><div class='del'>-	/* set BER counting range */</div><div class='del'>-	ret = af9013_write_reg(state, 0xd385, 10000 &amp; 0xff);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-	ret = af9013_write_reg(state, 0xd386, 10000 &gt;&gt; 8);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-	/* reset and start BER counter */</div><div class='del'>-	ret = af9013_write_reg_bits(state, 0xd391, 4, 1, 1);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-exit:</div><div class='del'>-error:</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int af9013_update_snr(struct dvb_frontend *fe)</div><div class='add'>+static int af9013_read_status(struct dvb_frontend *fe, fe_status_t *status)</div><div class='ctx'> {</div><div class='ctx'> 	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 buf[3], i, len;</div><div class='del'>-	u32 quant = 0;</div><div class='del'>-	struct snr_table *uninitialized_var(snr_table);</div><div class='del'>-</div><div class='del'>-	/* check if quantizer ready (for snr) */</div><div class='del'>-	ret = af9013_read_reg_bits(state, 0xd2e1, 3, 1, &amp;buf[0]);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-	if (buf[0]) {</div><div class='del'>-		/* quantizer ready - read it */</div><div class='del'>-		for (i = 0; i &lt; 3; i++) {</div><div class='del'>-			ret = af9013_read_reg(state, 0xd2e3 + i, &amp;buf[i]);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto error;</div><div class='del'>-		}</div><div class='del'>-		quant = (buf[2] &lt;&lt; 16) + (buf[1] &lt;&lt; 8) + buf[0];</div><div class='del'>-</div><div class='del'>-		/* read current constellation */</div><div class='del'>-		ret = af9013_read_reg(state, 0xd3c1, &amp;buf[0]);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-</div><div class='del'>-		switch ((buf[0] &gt;&gt; 6) &amp; 3) {</div><div class='del'>-		case 0:</div><div class='del'>-			len = ARRAY_SIZE(qpsk_snr_table);</div><div class='del'>-			snr_table = qpsk_snr_table;</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			len = ARRAY_SIZE(qam16_snr_table);</div><div class='del'>-			snr_table = qam16_snr_table;</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			len = ARRAY_SIZE(qam64_snr_table);</div><div class='del'>-			snr_table = qam64_snr_table;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			len = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (len) {</div><div class='del'>-			for (i = 0; i &lt; len; i++) {</div><div class='del'>-				if (quant &lt; snr_table[i].val) {</div><div class='del'>-					state-&gt;snr = snr_table[i].snr * 10;</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 quantizer super frame count */</div><div class='del'>-		ret = af9013_write_reg(state, 0xd2e2, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-</div><div class='del'>-		/* check quantizer availability */</div><div class='del'>-		for (i = 0; i &lt; 10; i++) {</div><div class='del'>-			msleep(10);</div><div class='del'>-			ret = af9013_read_reg_bits(state, 0xd2e6, 0, 1,</div><div class='del'>-				&amp;buf[0]);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto error;</div><div class='del'>-			if (!buf[0])</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* reset quantizer */</div><div class='del'>-		ret = af9013_write_reg_bits(state, 0xd2e1, 3, 1, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int af9013_update_signal_strength(struct dvb_frontend *fe)</div><div class='del'>-{</div><div class='del'>-	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u8 rf_gain, if_gain;</div><div class='del'>-	int signal_strength;</div><div class='del'>-</div><div class='del'>-	deb_info("%s\n", __func__);</div><div class='add'>+	u8 tmp;</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;signal_strength_en) {</div><div class='del'>-		ret = af9013_read_reg(state, 0xd07c, &amp;rf_gain);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-		ret = af9013_read_reg(state, 0xd07d, &amp;if_gain);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-		signal_strength = (0xffff / \</div><div class='del'>-			(9 * (state-&gt;rf_50 + state-&gt;if_50) - \</div><div class='del'>-			11 * (state-&gt;rf_80 + state-&gt;if_80))) * \</div><div class='del'>-			(10 * (rf_gain + if_gain) - \</div><div class='del'>-			11 * (state-&gt;rf_80 + state-&gt;if_80));</div><div class='del'>-		if (signal_strength &lt; 0)</div><div class='del'>-			signal_strength = 0;</div><div class='del'>-		else if (signal_strength &gt; 0xffff)</div><div class='del'>-			signal_strength = 0xffff;</div><div class='del'>-</div><div class='del'>-		state-&gt;signal_strength = signal_strength;</div><div class='add'>+	/*</div><div class='add'>+	 * Return status from the cache if it is younger than 2000ms with the</div><div class='add'>+	 * exception of last tune is done during 4000ms.</div><div class='add'>+	 */</div><div class='add'>+	if (time_is_after_jiffies(</div><div class='add'>+		state-&gt;read_status_jiffies + msecs_to_jiffies(2000)) &amp;&amp;</div><div class='add'>+		time_is_before_jiffies(</div><div class='add'>+		state-&gt;set_frontend_jiffies + msecs_to_jiffies(4000))</div><div class='add'>+	) {</div><div class='add'>+			*status = state-&gt;fe_status;</div><div class='add'>+			return 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		state-&gt;signal_strength = 0;</div><div class='add'>+		*status = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-error:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int af9013_update_statistics(struct dvb_frontend *fe)</div><div class='del'>-{</div><div class='del'>-	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (time_before(jiffies, state-&gt;next_statistics_check))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* set minimum statistic update interval */</div><div class='del'>-	state-&gt;next_statistics_check = jiffies + msecs_to_jiffies(1200);</div><div class='del'>-</div><div class='del'>-	ret = af9013_update_signal_strength(fe);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-	ret = af9013_update_snr(fe);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-	ret = af9013_update_ber_unc(fe);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int af9013_get_tune_settings(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_tune_settings *fesettings)</div><div class='del'>-{</div><div class='del'>-	fesettings-&gt;min_delay_ms = 800;</div><div class='del'>-	fesettings-&gt;step_size = 0;</div><div class='del'>-	fesettings-&gt;max_drift = 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 af9013_read_status(struct dvb_frontend *fe, fe_status_t *status)</div><div class='del'>-{</div><div class='del'>-	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u8 tmp;</div><div class='del'>-	*status = 0;</div><div class='del'>-</div><div class='ctx'> 	/* MPEG2 lock */</div><div class='del'>-	ret = af9013_read_reg_bits(state, 0xd507, 6, 1, &amp;tmp);</div><div class='add'>+	ret = af9013_rd_reg_bits(state, 0xd507, 6, 1, &amp;tmp);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='ctx'> 	if (tmp)</div><div class='ctx'> 		*status |= FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI |</div><div class='ctx'> 			FE_HAS_SYNC | FE_HAS_LOCK;</div><div class='ctx'> </div><div class='ctx'> 	if (!*status) {</div><div class='ctx'> 		/* TPS lock */</div><div class='del'>-		ret = af9013_read_reg_bits(state, 0xd330, 3, 1, &amp;tmp);</div><div class='add'>+		ret = af9013_rd_reg_bits(state, 0xd330, 3, 1, &amp;tmp);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto error;</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='ctx'> 		if (tmp)</div><div class='ctx'> 			*status |= FE_HAS_SIGNAL | FE_HAS_CARRIER |</div><div class='ctx'> 				FE_HAS_VITERBI;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!*status) {</div><div class='del'>-		/* CFO lock */</div><div class='del'>-		ret = af9013_read_reg_bits(state, 0xd333, 7, 1, &amp;tmp);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-		if (tmp)</div><div class='del'>-			*status |= FE_HAS_SIGNAL | FE_HAS_CARRIER;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!*status) {</div><div class='del'>-		/* SFOE lock */</div><div class='del'>-		ret = af9013_read_reg_bits(state, 0xd334, 6, 1, &amp;tmp);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-		if (tmp)</div><div class='del'>-			*status |= FE_HAS_SIGNAL | FE_HAS_CARRIER;</div><div class='del'>-	}</div><div class='add'>+	state-&gt;fe_status = *status;</div><div class='add'>+	state-&gt;read_status_jiffies = jiffies;</div><div class='ctx'> </div><div class='del'>-	if (!*status) {</div><div class='del'>-		/* AGC lock */</div><div class='del'>-		ret = af9013_read_reg_bits(state, 0xd1a0, 6, 1, &amp;tmp);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-		if (tmp)</div><div class='del'>-			*status |= FE_HAS_SIGNAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = af9013_update_statistics(fe);</div><div class='del'>-</div><div class='del'>-error:</div><div class='add'>+	return ret;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int af9013_read_ber(struct dvb_frontend *fe, u32 *ber)</div><div class='add'>+static int af9013_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='ctx'> {</div><div class='ctx'> 	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	int ret;</div><div class='del'>-	ret = af9013_update_statistics(fe);</div><div class='del'>-	*ber = state-&gt;ber;</div><div class='del'>-	return ret;</div><div class='add'>+	*snr = state-&gt;snr;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int af9013_read_signal_strength(struct dvb_frontend *fe, u16 *strength)</div><div class='ctx'> {</div><div class='ctx'> 	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	int ret;</div><div class='del'>-	ret = af9013_update_statistics(fe);</div><div class='ctx'> 	*strength = state-&gt;signal_strength;</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int af9013_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='add'>+static int af9013_read_ber(struct dvb_frontend *fe, u32 *ber)</div><div class='ctx'> {</div><div class='ctx'> 	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	int ret;</div><div class='del'>-	ret = af9013_update_statistics(fe);</div><div class='del'>-	*snr = state-&gt;snr;</div><div class='del'>-	return ret;</div><div class='add'>+	*ber = state-&gt;ber;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int af9013_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='ctx'> {</div><div class='ctx'> 	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	int ret;</div><div class='del'>-	ret = af9013_update_statistics(fe);</div><div class='ctx'> 	*ucblocks = state-&gt;ucblocks;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int af9013_sleep(struct dvb_frontend *fe)</div><div class='del'>-{</div><div class='del'>-	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	int ret;</div><div class='del'>-	deb_info("%s\n", __func__);</div><div class='del'>-</div><div class='del'>-	ret = af9013_lock_led(state, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	ret = af9013_power_ctrl(state, 0);</div><div class='del'>-error:</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 af9013_init(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret, i, len;</div><div class='del'>-	u8 tmp0, tmp1;</div><div class='del'>-	struct regdesc *init;</div><div class='del'>-	deb_info("%s\n", __func__);</div><div class='add'>+	u8 buf[3], tmp;</div><div class='add'>+	u32 adc_cw;</div><div class='add'>+	const struct af9013_reg_bit *init;</div><div class='ctx'> </div><div class='del'>-	/* reset OFDM */</div><div class='del'>-	ret = af9013_reset(state, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+	dbg("%s", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* power on */</div><div class='ctx'> 	ret = af9013_power_ctrl(state, 1);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	/* enable ADC */</div><div class='del'>-	ret = af9013_write_reg(state, 0xd73a, 0xa4);</div><div class='add'>+	ret = af9013_wr_reg(state, 0xd73a, 0xa4);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	/* write API version to firmware */</div><div class='del'>-	for (i = 0; i &lt; sizeof(state-&gt;config.api_version); i++) {</div><div class='del'>-		ret = af9013_write_reg(state, 0x9bf2 + i,</div><div class='del'>-			state-&gt;config.api_version[i]);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-	}</div><div class='add'>+	ret = af9013_wr_regs(state, 0x9bf2, state-&gt;config.api_version, 4);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	/* program ADC control */</div><div class='del'>-	ret = af9013_set_adc_ctrl(state);</div><div class='add'>+	switch (state-&gt;config.clock) {</div><div class='add'>+	case 28800000: /* 28.800 MHz */</div><div class='add'>+		tmp = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 20480000: /* 20.480 MHz */</div><div class='add'>+		tmp = 1;</div><div class='add'>+		break;</div><div class='add'>+	case 28000000: /* 28.000 MHz */</div><div class='add'>+		tmp = 2;</div><div class='add'>+		break;</div><div class='add'>+	case 25000000: /* 25.000 MHz */</div><div class='add'>+		tmp = 3;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err("invalid clock");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adc_cw = af913_div(state-&gt;config.clock, 1000000ul, 19);</div><div class='add'>+	buf[0] = (adc_cw &gt;&gt;  0) &amp; 0xff;</div><div class='add'>+	buf[1] = (adc_cw &gt;&gt;  8) &amp; 0xff;</div><div class='add'>+	buf[2] = (adc_cw &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	ret = af9013_wr_regs(state, 0xd180, buf, 3);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = af9013_wr_reg_bits(state, 0x9bd2, 0, 4, tmp);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	/* set I2C master clock */</div><div class='del'>-	ret = af9013_write_reg(state, 0xd416, 0x14);</div><div class='add'>+	ret = af9013_wr_reg(state, 0xd416, 0x14);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	/* set 16 embx */</div><div class='del'>-	ret = af9013_write_reg_bits(state, 0xd700, 1, 1, 1);</div><div class='add'>+	ret = af9013_wr_reg_bits(state, 0xd700, 1, 1, 1);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	/* set no trigger */</div><div class='del'>-	ret = af9013_write_reg_bits(state, 0xd700, 2, 1, 0);</div><div class='add'>+	ret = af9013_wr_reg_bits(state, 0xd700, 2, 1, 0);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	/* set read-update bit for constellation */</div><div class='del'>-	ret = af9013_write_reg_bits(state, 0xd371, 1, 1, 1);</div><div class='add'>+	ret = af9013_wr_reg_bits(state, 0xd371, 1, 1, 1);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='del'>-	/* enable FEC monitor */</div><div class='del'>-	ret = af9013_write_reg_bits(state, 0xd392, 1, 1, 1);</div><div class='add'>+	/* settings for mp2if */</div><div class='add'>+	if (state-&gt;config.ts_mode == AF9013_TS_USB) {</div><div class='add'>+		/* AF9015 split PSB to 1.5k + 0.5k */</div><div class='add'>+		ret = af9013_wr_reg_bits(state, 0xd50b, 2, 1, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	} else {</div><div class='add'>+		/* AF9013 change the output bit to data7 */</div><div class='add'>+		ret = af9013_wr_reg_bits(state, 0xd500, 3, 1, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		/* AF9013 set mpeg to full speed */</div><div class='add'>+		ret = af9013_wr_reg_bits(state, 0xd502, 4, 1, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = af9013_wr_reg_bits(state, 0xd520, 4, 1, 1);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	/* load OFSM settings */</div><div class='del'>-	deb_info("%s: load ofsm settings\n", __func__);</div><div class='add'>+	dbg("%s: load ofsm settings", __func__);</div><div class='ctx'> 	len = ARRAY_SIZE(ofsm_init);</div><div class='ctx'> 	init = ofsm_init;</div><div class='ctx'> 	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		ret = af9013_write_reg_bits(state, init[i].addr, init[i].pos,</div><div class='add'>+		ret = af9013_wr_reg_bits(state, init[i].addr, init[i].pos,</div><div class='ctx'> 			init[i].len, init[i].val);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto error;</div><div class='add'>+			goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* load tuner specific settings */</div><div class='del'>-	deb_info("%s: load tuner specific settings\n", __func__);</div><div class='add'>+	dbg("%s: load tuner specific settings", __func__);</div><div class='ctx'> 	switch (state-&gt;config.tuner) {</div><div class='ctx'> 	case AF9013_TUNER_MXL5003D:</div><div class='ctx'> 		len = ARRAY_SIZE(tuner_init_mxl5003d);</div><div class='hunk'>@@ -1260,65 +1197,133 @@ static int af9013_init(struct dvb_frontend *fe)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		ret = af9013_write_reg_bits(state, init[i].addr, init[i].pos,</div><div class='add'>+		ret = af9013_wr_reg_bits(state, init[i].addr, init[i].pos,</div><div class='ctx'> 			init[i].len, init[i].val);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto error;</div><div class='add'>+			goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* set TS mode */</div><div class='del'>-	deb_info("%s: setting ts mode\n", __func__);</div><div class='del'>-	tmp0 = 0; /* parallel mode */</div><div class='del'>-	tmp1 = 0; /* serial mode */</div><div class='del'>-	switch (state-&gt;config.output_mode) {</div><div class='del'>-	case AF9013_OUTPUT_MODE_PARALLEL:</div><div class='del'>-		tmp0 = 1;</div><div class='del'>-		break;</div><div class='del'>-	case AF9013_OUTPUT_MODE_SERIAL:</div><div class='del'>-		tmp1 = 1;</div><div class='del'>-		break;</div><div class='del'>-	case AF9013_OUTPUT_MODE_USB:</div><div class='del'>-		/* usb mode for AF9015 */</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	ret = af9013_write_reg_bits(state, 0xd500, 1, 1, tmp0); /* parallel */</div><div class='add'>+	/* TS mode */</div><div class='add'>+	ret = af9013_wr_reg_bits(state, 0xd500, 1, 2, state-&gt;config.ts_mode);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-	ret = af9013_write_reg_bits(state, 0xd500, 2, 1, tmp1); /* serial */</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	/* enable lock led */</div><div class='del'>-	ret = af9013_lock_led(state, 1);</div><div class='add'>+	ret = af9013_wr_reg_bits(state, 0xd730, 0, 1, 1);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='del'>-	/* read values needed for signal strength calculation */</div><div class='del'>-	ret = af9013_read_reg_bits(state, 0x9bee, 0, 1,</div><div class='del'>-		&amp;state-&gt;signal_strength_en);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+	/* check if we support signal strength */</div><div class='add'>+	if (!state-&gt;signal_strength_en) {</div><div class='add'>+		ret = af9013_rd_reg_bits(state, 0x9bee, 0, 1,</div><div class='add'>+			&amp;state-&gt;signal_strength_en);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;signal_strength_en) {</div><div class='del'>-		ret = af9013_read_reg(state, 0x9bbd, &amp;state-&gt;rf_50);</div><div class='add'>+	/* read values needed for signal strength calculation */</div><div class='add'>+	if (state-&gt;signal_strength_en &amp;&amp; !state-&gt;rf_50) {</div><div class='add'>+		ret = af9013_rd_reg(state, 0x9bbd, &amp;state-&gt;rf_50);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-		ret = af9013_read_reg(state, 0x9bd0, &amp;state-&gt;rf_80);</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		ret = af9013_rd_reg(state, 0x9bd0, &amp;state-&gt;rf_80);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-		ret = af9013_read_reg(state, 0x9be2, &amp;state-&gt;if_50);</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		ret = af9013_rd_reg(state, 0x9be2, &amp;state-&gt;if_50);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-		ret = af9013_read_reg(state, 0x9be4, &amp;state-&gt;if_80);</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		ret = af9013_rd_reg(state, 0x9be4, &amp;state-&gt;if_80);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto error;</div><div class='add'>+			goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-error:</div><div class='add'>+	/* SNR */</div><div class='add'>+	ret = af9013_wr_reg(state, 0xd2e2, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* BER / UCB */</div><div class='add'>+	buf[0] = (10000 &gt;&gt; 0) &amp; 0xff;</div><div class='add'>+	buf[1] = (10000 &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	ret = af9013_wr_regs(state, 0xd385, buf, 2);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* enable FEC monitor */</div><div class='add'>+	ret = af9013_wr_reg_bits(state, 0xd392, 1, 1, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	state-&gt;first_tune = true;</div><div class='add'>+	schedule_delayed_work(&amp;state-&gt;statistics_work, msecs_to_jiffies(400));</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int af9013_sleep(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dbg("%s", __func__);</div><div class='add'>+</div><div class='add'>+	/* stop statistics polling */</div><div class='add'>+	cancel_delayed_work_sync(&amp;state-&gt;statistics_work);</div><div class='add'>+</div><div class='add'>+	/* disable lock led */</div><div class='add'>+	ret = af9013_wr_reg_bits(state, 0xd730, 0, 1, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* power off */</div><div class='add'>+	ret = af9013_power_ctrl(state, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int af9013_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	dbg("%s: enable=%d", __func__, enable);</div><div class='add'>+</div><div class='add'>+	/* gate already open or close */</div><div class='add'>+	if (state-&gt;i2c_gate_state == enable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (state-&gt;config.ts_mode == AF9013_TS_USB)</div><div class='add'>+		ret = af9013_wr_reg_bits(state, 0xd417, 3, 1, enable);</div><div class='add'>+	else</div><div class='add'>+		ret = af9013_wr_reg_bits(state, 0xd607, 2, 1, enable);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	state-&gt;i2c_gate_state = enable;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void af9013_release(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	kfree(state);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct dvb_frontend_ops af9013_ops;</div><div class='ctx'> </div><div class='ctx'> static int af9013_download_firmware(struct af9013_state *state)</div><div class='hunk'>@@ -1332,11 +1337,11 @@ static int af9013_download_firmware(struct af9013_state *state)</div><div class='ctx'> </div><div class='ctx'> 	msleep(100);</div><div class='ctx'> 	/* check whether firmware is already running */</div><div class='del'>-	ret = af9013_read_reg(state, 0x98be, &amp;val);</div><div class='add'>+	ret = af9013_rd_reg(state, 0x98be, &amp;val);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto err;</div><div class='ctx'> 	else</div><div class='del'>-		deb_info("%s: firmware status:%02x\n", __func__, val);</div><div class='add'>+		dbg("%s: firmware status=%02x", __func__, val);</div><div class='ctx'> </div><div class='ctx'> 	if (val == 0x0c) /* fw is running, no need for download */</div><div class='ctx'> 		goto exit;</div><div class='hunk'>@@ -1351,7 +1356,7 @@ static int af9013_download_firmware(struct af9013_state *state)</div><div class='ctx'> 			"Please see linux/Documentation/dvb/ for more details" \</div><div class='ctx'> 			" on firmware-problems. (%d)",</div><div class='ctx'> 			fw_file, ret);</div><div class='del'>-		goto error;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	info("downloading firmware from file '%s'", fw_file);</div><div class='hunk'>@@ -1369,7 +1374,7 @@ static int af9013_download_firmware(struct af9013_state *state)</div><div class='ctx'> 	ret = af9013_write_ofsm_regs(state, 0x50fc,</div><div class='ctx'> 		fw_params, sizeof(fw_params));</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error_release;</div><div class='add'>+		goto err_release;</div><div class='ctx'> </div><div class='ctx'> 	#define FW_ADDR 0x5100 /* firmware start address */</div><div class='ctx'> 	#define LEN_MAX 16 /* max packet size */</div><div class='hunk'>@@ -1383,24 +1388,24 @@ static int af9013_download_firmware(struct af9013_state *state)</div><div class='ctx'> 			(u8 *) &amp;fw-&gt;data[fw-&gt;size - remaining], len);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			err("firmware download failed:%d", ret);</div><div class='del'>-			goto error_release;</div><div class='add'>+			goto err_release;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* request boot firmware */</div><div class='del'>-	ret = af9013_write_reg(state, 0xe205, 1);</div><div class='add'>+	ret = af9013_wr_reg(state, 0xe205, 1);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error_release;</div><div class='add'>+		goto err_release;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 15; i++) {</div><div class='ctx'> 		msleep(100);</div><div class='ctx'> </div><div class='ctx'> 		/* check firmware status */</div><div class='del'>-		ret = af9013_read_reg(state, 0x98be, &amp;val);</div><div class='add'>+		ret = af9013_rd_reg(state, 0x98be, &amp;val);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto error_release;</div><div class='add'>+			goto err_release;</div><div class='ctx'> </div><div class='del'>-		deb_info("%s: firmware status:%02x\n", __func__, val);</div><div class='add'>+		dbg("%s: firmware status=%02x", __func__, val);</div><div class='ctx'> </div><div class='ctx'> 		if (val == 0x0c || val == 0x04) /* success or fail */</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1408,43 +1413,21 @@ static int af9013_download_firmware(struct af9013_state *state)</div><div class='ctx'> </div><div class='ctx'> 	if (val == 0x04) {</div><div class='ctx'> 		err("firmware did not run");</div><div class='del'>-		ret = -1;</div><div class='add'>+		ret = -ENODEV;</div><div class='ctx'> 	} else if (val != 0x0c) {</div><div class='ctx'> 		err("firmware boot timeout");</div><div class='del'>-		ret = -1;</div><div class='add'>+		ret = -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-error_release:</div><div class='add'>+err_release:</div><div class='ctx'> 	release_firmware(fw);</div><div class='del'>-error:</div><div class='add'>+err:</div><div class='ctx'> exit:</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		info("found a '%s' in warm state.", af9013_ops.info.name);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int af9013_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	deb_info("%s: enable:%d\n", __func__, enable);</div><div class='del'>-</div><div class='del'>-	if (state-&gt;config.output_mode == AF9013_OUTPUT_MODE_USB)</div><div class='del'>-		ret = af9013_write_reg_bits(state, 0xd417, 3, 1, enable);</div><div class='del'>-	else</div><div class='del'>-		ret = af9013_write_reg_bits(state, 0xd607, 2, 1, enable);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void af9013_release(struct dvb_frontend *fe)</div><div class='del'>-{</div><div class='del'>-	struct af9013_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	kfree(state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct dvb_frontend_ops af9013_ops;</div><div class='del'>-</div><div class='ctx'> struct dvb_frontend *af9013_attach(const struct af9013_config *config,</div><div class='ctx'> 	struct i2c_adapter *i2c)</div><div class='ctx'> {</div><div class='hunk'>@@ -1455,91 +1438,65 @@ struct dvb_frontend *af9013_attach(const struct af9013_config *config,</div><div class='ctx'> 	/* allocate memory for the internal state */</div><div class='ctx'> 	state = kzalloc(sizeof(struct af9013_state), GFP_KERNEL);</div><div class='ctx'> 	if (state == NULL)</div><div class='del'>-		goto error;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='ctx'> 	memcpy(&amp;state-&gt;config, config, sizeof(struct af9013_config));</div><div class='ctx'> </div><div class='ctx'> 	/* download firmware */</div><div class='del'>-	if (state-&gt;config.output_mode != AF9013_OUTPUT_MODE_USB) {</div><div class='add'>+	if (state-&gt;config.ts_mode != AF9013_TS_USB) {</div><div class='ctx'> 		ret = af9013_download_firmware(state);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto error;</div><div class='add'>+			goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* firmware version */</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		ret = af9013_read_reg(state, 0x5103 + i, &amp;buf[i]);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-	}</div><div class='del'>-	info("firmware version:%d.%d.%d.%d", buf[0], buf[1], buf[2], buf[3]);</div><div class='del'>-</div><div class='del'>-	/* chip version */</div><div class='del'>-	ret = af9013_read_reg_bits(state, 0xd733, 4, 4, &amp;buf[2]);</div><div class='add'>+	ret = af9013_rd_regs(state, 0x5103, buf, 4);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='del'>-	/* ROM version */</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		ret = af9013_read_reg(state, 0x116b + i, &amp;buf[i]);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-	}</div><div class='del'>-	deb_info("%s: chip version:%d ROM version:%d.%d\n", __func__,</div><div class='del'>-		buf[2], buf[0], buf[1]);</div><div class='del'>-</div><div class='del'>-	/* settings for mp2if */</div><div class='del'>-	if (state-&gt;config.output_mode == AF9013_OUTPUT_MODE_USB) {</div><div class='del'>-		/* AF9015 split PSB to 1.5k + 0.5k */</div><div class='del'>-		ret = af9013_write_reg_bits(state, 0xd50b, 2, 1, 1);</div><div class='del'>-	} else {</div><div class='del'>-		/* AF9013 change the output bit to data7 */</div><div class='del'>-		ret = af9013_write_reg_bits(state, 0xd500, 3, 1, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto error;</div><div class='del'>-		/* AF9013 set mpeg to full speed */</div><div class='del'>-		ret = af9013_write_reg_bits(state, 0xd502, 4, 1, 1);</div><div class='del'>-	}</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-	ret = af9013_write_reg_bits(state, 0xd520, 4, 1, 1);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='add'>+	info("firmware version %d.%d.%d.%d", buf[0], buf[1], buf[2], buf[3]);</div><div class='ctx'> </div><div class='ctx'> 	/* set GPIOs */</div><div class='ctx'> 	for (i = 0; i &lt; sizeof(state-&gt;config.gpio); i++) {</div><div class='ctx'> 		ret = af9013_set_gpio(state, i, state-&gt;config.gpio[i]);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto error;</div><div class='add'>+			goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	memcpy(&amp;state-&gt;frontend.ops, &amp;af9013_ops,</div><div class='add'>+	memcpy(&amp;state-&gt;fe.ops, &amp;af9013_ops,</div><div class='ctx'> 		sizeof(struct dvb_frontend_ops));</div><div class='del'>-	state-&gt;frontend.demodulator_priv = state;</div><div class='add'>+	state-&gt;fe.demodulator_priv = state;</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;state-&gt;statistics_work, af9013_statistics_work);</div><div class='ctx'> </div><div class='del'>-	return &amp;state-&gt;frontend;</div><div class='del'>-error:</div><div class='add'>+	return &amp;state-&gt;fe;</div><div class='add'>+err:</div><div class='ctx'> 	kfree(state);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(af9013_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops af9013_ops = {</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='del'>-		.name = "Afatech AF9013 DVB-T",</div><div class='del'>-		.type = FE_OFDM,</div><div class='add'>+		.name = "Afatech AF9013",</div><div class='ctx'> 		.frequency_min = 174000000,</div><div class='ctx'> 		.frequency_max = 862000000,</div><div class='ctx'> 		.frequency_stepsize = 250000,</div><div class='ctx'> 		.frequency_tolerance = 0,</div><div class='del'>-		.caps =</div><div class='del'>-			FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |</div><div class='del'>-			FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |</div><div class='del'>-			FE_CAN_QPSK | FE_CAN_QAM_16 |</div><div class='del'>-			FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |</div><div class='add'>+		.caps =	FE_CAN_FEC_1_2 |</div><div class='add'>+			FE_CAN_FEC_2_3 |</div><div class='add'>+			FE_CAN_FEC_3_4 |</div><div class='add'>+			FE_CAN_FEC_5_6 |</div><div class='add'>+			FE_CAN_FEC_7_8 |</div><div class='add'>+			FE_CAN_FEC_AUTO |</div><div class='add'>+			FE_CAN_QPSK |</div><div class='add'>+			FE_CAN_QAM_16 |</div><div class='add'>+			FE_CAN_QAM_64 |</div><div class='add'>+			FE_CAN_QAM_AUTO |</div><div class='ctx'> 			FE_CAN_TRANSMISSION_MODE_AUTO |</div><div class='ctx'> 			FE_CAN_GUARD_INTERVAL_AUTO |</div><div class='ctx'> 			FE_CAN_HIERARCHY_AUTO |</div><div class='hunk'>@@ -1548,24 +1505,22 @@ static struct dvb_frontend_ops af9013_ops = {</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	.release = af9013_release,</div><div class='add'>+</div><div class='ctx'> 	.init = af9013_init,</div><div class='ctx'> 	.sleep = af9013_sleep,</div><div class='del'>-	.i2c_gate_ctrl = af9013_i2c_gate_ctrl,</div><div class='ctx'> </div><div class='add'>+	.get_tune_settings = af9013_get_tune_settings,</div><div class='ctx'> 	.set_frontend = af9013_set_frontend,</div><div class='ctx'> 	.get_frontend = af9013_get_frontend,</div><div class='ctx'> </div><div class='del'>-	.get_tune_settings = af9013_get_tune_settings,</div><div class='del'>-</div><div class='ctx'> 	.read_status = af9013_read_status,</div><div class='del'>-	.read_ber = af9013_read_ber,</div><div class='del'>-	.read_signal_strength = af9013_read_signal_strength,</div><div class='ctx'> 	.read_snr = af9013_read_snr,</div><div class='add'>+	.read_signal_strength = af9013_read_signal_strength,</div><div class='add'>+	.read_ber = af9013_read_ber,</div><div class='ctx'> 	.read_ucblocks = af9013_read_ucblocks,</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-module_param_named(debug, af9013_debug, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");</div><div class='add'>+	.i2c_gate_ctrl = af9013_i2c_gate_ctrl,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Antti Palosaari &lt;crope@iki.fi&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Afatech AF9013 DVB-T demodulator driver");</div><div class='head'>diff --git a/drivers/media/dvb/frontends/af9013.h b/drivers/media/dvb/frontends/af9013.h<br/>index e53d873f7555..b973fc5a0384 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/af9013.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/af9013.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/af9013.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/af9013.h</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>  * Afatech AF9013 demodulator driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Antti Palosaari &lt;crope@iki.fi&gt;</div><div class='add'>+ * Copyright (C) 2011 Antti Palosaari &lt;crope@iki.fi&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Thanks to Afatech who kindly provided information.</div><div class='ctx'>  *</div><div class='hunk'>@@ -21,33 +22,11 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifndef _AF9013_H_</div><div class='del'>-#define _AF9013_H_</div><div class='add'>+#ifndef AF9013_H</div><div class='add'>+#define AF9013_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dvb/frontend.h&gt;</div><div class='ctx'> </div><div class='del'>-enum af9013_ts_mode {</div><div class='del'>-	AF9013_OUTPUT_MODE_PARALLEL,</div><div class='del'>-	AF9013_OUTPUT_MODE_SERIAL,</div><div class='del'>-	AF9013_OUTPUT_MODE_USB, /* only for AF9015 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum af9013_tuner {</div><div class='del'>-	AF9013_TUNER_MXL5003D   =   3, /* MaxLinear */</div><div class='del'>-	AF9013_TUNER_MXL5005D   =  13, /* MaxLinear */</div><div class='del'>-	AF9013_TUNER_MXL5005R   =  30, /* MaxLinear */</div><div class='del'>-	AF9013_TUNER_ENV77H11D5 = 129, /* Panasonic */</div><div class='del'>-	AF9013_TUNER_MT2060     = 130, /* Microtune */</div><div class='del'>-	AF9013_TUNER_MC44S803   = 133, /* Freescale */</div><div class='del'>-	AF9013_TUNER_QT1010     = 134, /* Quantek */</div><div class='del'>-	AF9013_TUNER_UNKNOWN    = 140, /* for can tuners ? */</div><div class='del'>-	AF9013_TUNER_MT2060_2   = 147, /* Microtune */</div><div class='del'>-	AF9013_TUNER_TDA18271   = 156, /* NXP */</div><div class='del'>-	AF9013_TUNER_QT1010A    = 162, /* Quantek */</div><div class='del'>-	AF9013_TUNER_MXL5007T   = 177, /* MaxLinear */</div><div class='del'>-	AF9013_TUNER_TDA18218   = 179, /* NXP */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* AF9013/5 GPIOs (mostly guessed)</div><div class='ctx'>    demod#1-gpio#0 - set demod#2 i2c-addr for dual devices</div><div class='ctx'>    demod#1-gpio#1 - xtal setting (?)</div><div class='hunk'>@@ -55,44 +34,74 @@ enum af9013_tuner {</div><div class='ctx'>    demod#2-gpio#0 - tuner#2</div><div class='ctx'>    demod#2-gpio#1 - xtal setting (?)</div><div class='ctx'> */</div><div class='add'>+</div><div class='add'>+struct af9013_config {</div><div class='add'>+	/*</div><div class='add'>+	 * I2C address</div><div class='add'>+	 */</div><div class='add'>+	u8 i2c_addr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * clock</div><div class='add'>+	 * 20480000, 25000000, 28000000, 28800000</div><div class='add'>+	 */</div><div class='add'>+	u32 clock;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * tuner</div><div class='add'>+	 */</div><div class='add'>+#define AF9013_TUNER_MXL5003D      3 /* MaxLinear */</div><div class='add'>+#define AF9013_TUNER_MXL5005D     13 /* MaxLinear */</div><div class='add'>+#define AF9013_TUNER_MXL5005R     30 /* MaxLinear */</div><div class='add'>+#define AF9013_TUNER_ENV77H11D5  129 /* Panasonic */</div><div class='add'>+#define AF9013_TUNER_MT2060      130 /* Microtune */</div><div class='add'>+#define AF9013_TUNER_MC44S803    133 /* Freescale */</div><div class='add'>+#define AF9013_TUNER_QT1010      134 /* Quantek */</div><div class='add'>+#define AF9013_TUNER_UNKNOWN     140 /* for can tuners ? */</div><div class='add'>+#define AF9013_TUNER_MT2060_2    147 /* Microtune */</div><div class='add'>+#define AF9013_TUNER_TDA18271    156 /* NXP */</div><div class='add'>+#define AF9013_TUNER_QT1010A     162 /* Quantek */</div><div class='add'>+#define AF9013_TUNER_MXL5007T    177 /* MaxLinear */</div><div class='add'>+#define AF9013_TUNER_TDA18218    179 /* NXP */</div><div class='add'>+	u8 tuner;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IF frequency</div><div class='add'>+	 */</div><div class='add'>+	u32 if_frequency;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * TS settings</div><div class='add'>+	 */</div><div class='add'>+#define AF9013_TS_USB       0</div><div class='add'>+#define AF9013_TS_PARALLEL  1</div><div class='add'>+#define AF9013_TS_SERIAL    2</div><div class='add'>+	u8 ts_mode:2;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * input spectrum inversion</div><div class='add'>+	 */</div><div class='add'>+	bool spec_inv;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * firmware API version</div><div class='add'>+	 */</div><div class='add'>+	u8 api_version[4];</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * GPIOs</div><div class='add'>+	 */</div><div class='ctx'> #define AF9013_GPIO_ON (1 &lt;&lt; 0)</div><div class='ctx'> #define AF9013_GPIO_EN (1 &lt;&lt; 1)</div><div class='ctx'> #define AF9013_GPIO_O  (1 &lt;&lt; 2)</div><div class='ctx'> #define AF9013_GPIO_I  (1 &lt;&lt; 3)</div><div class='del'>-</div><div class='ctx'> #define AF9013_GPIO_LO (AF9013_GPIO_ON|AF9013_GPIO_EN)</div><div class='ctx'> #define AF9013_GPIO_HI (AF9013_GPIO_ON|AF9013_GPIO_EN|AF9013_GPIO_O)</div><div class='del'>-</div><div class='ctx'> #define AF9013_GPIO_TUNER_ON  (AF9013_GPIO_ON|AF9013_GPIO_EN)</div><div class='ctx'> #define AF9013_GPIO_TUNER_OFF (AF9013_GPIO_ON|AF9013_GPIO_EN|AF9013_GPIO_O)</div><div class='del'>-</div><div class='del'>-struct af9013_config {</div><div class='del'>-	/* demodulator's I2C address */</div><div class='del'>-	u8 demod_address;</div><div class='del'>-</div><div class='del'>-	/* frequencies in kHz */</div><div class='del'>-	u32 adc_clock;</div><div class='del'>-</div><div class='del'>-	/* tuner ID */</div><div class='del'>-	u8 tuner;</div><div class='del'>-</div><div class='del'>-	/* tuner IF */</div><div class='del'>-	u16 tuner_if;</div><div class='del'>-</div><div class='del'>-	/* TS data output mode */</div><div class='del'>-	u8 output_mode:2;</div><div class='del'>-</div><div class='del'>-	/* RF spectrum inversion */</div><div class='del'>-	u8 rf_spec_inv:1;</div><div class='del'>-</div><div class='del'>-	/* API version */</div><div class='del'>-	u8 api_version[4];</div><div class='del'>-</div><div class='del'>-	/* GPIOs */</div><div class='ctx'> 	u8 gpio[4];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_DVB_AF9013) || \</div><div class='ctx'> 	(defined(CONFIG_DVB_AF9013_MODULE) &amp;&amp; defined(MODULE))</div><div class='ctx'> extern struct dvb_frontend *af9013_attach(const struct af9013_config *config,</div><div class='hunk'>@@ -106,4 +115,4 @@ const struct af9013_config *config, struct i2c_adapter *i2c)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_DVB_AF9013 */</div><div class='ctx'> </div><div class='del'>-#endif /* _AF9013_H_ */</div><div class='add'>+#endif /* AF9013_H */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/af9013_priv.h b/drivers/media/dvb/frontends/af9013_priv.h<br/>index e00b2a4a2db6..fa848af6e9b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/af9013_priv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/af9013_priv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/af9013_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/af9013_priv.h</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>  * Afatech AF9013 demodulator driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007 Antti Palosaari &lt;crope@iki.fi&gt;</div><div class='add'>+ * Copyright (C) 2011 Antti Palosaari &lt;crope@iki.fi&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Thanks to Afatech who kindly provided information.</div><div class='ctx'>  *</div><div class='hunk'>@@ -21,24 +22,19 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifndef _AF9013_PRIV_</div><div class='del'>-#define _AF9013_PRIV_</div><div class='add'>+#ifndef AF9013_PRIV_H</div><div class='add'>+#define AF9013_PRIV_H</div><div class='ctx'> </div><div class='del'>-#define LOG_PREFIX "af9013"</div><div class='del'>-extern int af9013_debug;</div><div class='del'>-</div><div class='del'>-#define dprintk(var, level, args...) \</div><div class='del'>-	    do { if ((var &amp; level)) printk(args); } while (0)</div><div class='add'>+#include "dvb_frontend.h"</div><div class='add'>+#include "af9013.h"</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='ctx'> </div><div class='del'>-#define debug_dump(b, l, func) {\</div><div class='del'>-	int loop_; \</div><div class='del'>-	for (loop_ = 0; loop_ &lt; l; loop_++) \</div><div class='del'>-		func("%02x ", b[loop_]); \</div><div class='del'>-	func("\n");\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define deb_info(args...) dprintk(af9013_debug, 0x01, args)</div><div class='add'>+#define LOG_PREFIX "af9013"</div><div class='ctx'> </div><div class='add'>+#undef dbg</div><div class='add'>+#define dbg(f, arg...) \</div><div class='add'>+	if (af9013_debug) \</div><div class='add'>+		printk(KERN_INFO   LOG_PREFIX": " f "\n" , ## arg)</div><div class='ctx'> #undef err</div><div class='ctx'> #define err(f, arg...)  printk(KERN_ERR     LOG_PREFIX": " f "\n" , ## arg)</div><div class='ctx'> #undef info</div><div class='hunk'>@@ -48,70 +44,71 @@ extern int af9013_debug;</div><div class='ctx'> </div><div class='ctx'> #define AF9013_DEFAULT_FIRMWARE     "dvb-fe-af9013.fw"</div><div class='ctx'> </div><div class='del'>-struct regdesc {</div><div class='add'>+struct af9013_reg_bit {</div><div class='ctx'> 	u16 addr;</div><div class='ctx'> 	u8  pos:4;</div><div class='ctx'> 	u8  len:4;</div><div class='ctx'> 	u8  val;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct snr_table {</div><div class='add'>+struct af9013_snr {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	u8 snr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct coeff {</div><div class='del'>-	u32 adc_clock;</div><div class='del'>-	fe_bandwidth_t bw;</div><div class='add'>+struct af9013_coeff {</div><div class='add'>+	u32 clock;</div><div class='add'>+	u32 bandwidth_hz;</div><div class='ctx'> 	u8 val[24];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* pre-calculated coeff lookup table */</div><div class='del'>-static struct coeff coeff_table[] = {</div><div class='add'>+static const struct af9013_coeff coeff_lut[] = {</div><div class='ctx'> 	/* 28.800 MHz */</div><div class='del'>-	{ 28800, BANDWIDTH_8_MHZ, { 0x02, 0x8a, 0x28, 0xa3, 0x05, 0x14,</div><div class='add'>+	{ 28800000, 8000000, { 0x02, 0x8a, 0x28, 0xa3, 0x05, 0x14,</div><div class='ctx'> 		0x51, 0x11, 0x00, 0xa2, 0x8f, 0x3d, 0x00, 0xa2, 0x8a,</div><div class='ctx'> 		0x29, 0x00, 0xa2, 0x85, 0x14, 0x01, 0x45, 0x14, 0x14 } },</div><div class='del'>-	{ 28800, BANDWIDTH_7_MHZ, { 0x02, 0x38, 0xe3, 0x8e, 0x04, 0x71,</div><div class='add'>+	{ 28800000, 7000000, { 0x02, 0x38, 0xe3, 0x8e, 0x04, 0x71,</div><div class='ctx'> 		0xc7, 0x07, 0x00, 0x8e, 0x3d, 0x55, 0x00, 0x8e, 0x38,</div><div class='ctx'> 		0xe4, 0x00, 0x8e, 0x34, 0x72, 0x01, 0x1c, 0x71, 0x32 } },</div><div class='del'>-	{ 28800, BANDWIDTH_6_MHZ, { 0x01, 0xe7, 0x9e, 0x7a, 0x03, 0xcf,</div><div class='add'>+	{ 28800000, 6000000, { 0x01, 0xe7, 0x9e, 0x7a, 0x03, 0xcf,</div><div class='ctx'> 		0x3c, 0x3d, 0x00, 0x79, 0xeb, 0x6e, 0x00, 0x79, 0xe7,</div><div class='ctx'> 		0x9e, 0x00, 0x79, 0xe3, 0xcf, 0x00, 0xf3, 0xcf, 0x0f } },</div><div class='ctx'> 	/* 20.480 MHz */</div><div class='del'>-	{ 20480, BANDWIDTH_8_MHZ, { 0x03, 0x92, 0x49, 0x26, 0x07, 0x24,</div><div class='add'>+	{ 20480000, 8000000, { 0x03, 0x92, 0x49, 0x26, 0x07, 0x24,</div><div class='ctx'> 		0x92, 0x13, 0x00, 0xe4, 0x99, 0x6e, 0x00, 0xe4, 0x92,</div><div class='ctx'> 		0x49, 0x00, 0xe4, 0x8b, 0x25, 0x01, 0xc9, 0x24, 0x25 } },</div><div class='del'>-	{ 20480, BANDWIDTH_7_MHZ, { 0x03, 0x20, 0x00, 0x01, 0x06, 0x40,</div><div class='add'>+	{ 20480000, 7000000, { 0x03, 0x20, 0x00, 0x01, 0x06, 0x40,</div><div class='ctx'> 		0x00, 0x00, 0x00, 0xc8, 0x06, 0x40, 0x00, 0xc8, 0x00,</div><div class='ctx'> 		0x00, 0x00, 0xc7, 0xf9, 0xc0, 0x01, 0x90, 0x00, 0x00 } },</div><div class='del'>-	{ 20480, BANDWIDTH_6_MHZ, { 0x02, 0xad, 0xb6, 0xdc, 0x05, 0x5b,</div><div class='add'>+	{ 20480000, 6000000, { 0x02, 0xad, 0xb6, 0xdc, 0x05, 0x5b,</div><div class='ctx'> 		0x6d, 0x2e, 0x00, 0xab, 0x73, 0x13, 0x00, 0xab, 0x6d,</div><div class='ctx'> 		0xb7, 0x00, 0xab, 0x68, 0x5c, 0x01, 0x56, 0xdb, 0x1c } },</div><div class='ctx'> 	/* 28.000 MHz */</div><div class='del'>-	{ 28000, BANDWIDTH_8_MHZ, { 0x02, 0x9c, 0xbc, 0x15, 0x05, 0x39,</div><div class='add'>+	{ 28000000, 8000000, { 0x02, 0x9c, 0xbc, 0x15, 0x05, 0x39,</div><div class='ctx'> 		0x78, 0x0a, 0x00, 0xa7, 0x34, 0x3f, 0x00, 0xa7, 0x2f,</div><div class='ctx'> 		0x05, 0x00, 0xa7, 0x29, 0xcc, 0x01, 0x4e, 0x5e, 0x03 } },</div><div class='del'>-	{ 28000, BANDWIDTH_7_MHZ, { 0x02, 0x49, 0x24, 0x92, 0x04, 0x92,</div><div class='add'>+	{ 28000000, 7000000, { 0x02, 0x49, 0x24, 0x92, 0x04, 0x92,</div><div class='ctx'> 		0x49, 0x09, 0x00, 0x92, 0x4d, 0xb7, 0x00, 0x92, 0x49,</div><div class='ctx'> 		0x25, 0x00, 0x92, 0x44, 0x92, 0x01, 0x24, 0x92, 0x12 } },</div><div class='del'>-	{ 28000, BANDWIDTH_6_MHZ, { 0x01, 0xf5, 0x8d, 0x10, 0x03, 0xeb,</div><div class='add'>+	{ 28000000, 6000000, { 0x01, 0xf5, 0x8d, 0x10, 0x03, 0xeb,</div><div class='ctx'> 		0x1a, 0x08, 0x00, 0x7d, 0x67, 0x2f, 0x00, 0x7d, 0x63,</div><div class='ctx'> 		0x44, 0x00, 0x7d, 0x5f, 0x59, 0x00, 0xfa, 0xc6, 0x22 } },</div><div class='ctx'> 	/* 25.000 MHz */</div><div class='del'>-	{ 25000, BANDWIDTH_8_MHZ, { 0x02, 0xec, 0xfb, 0x9d, 0x05, 0xd9,</div><div class='add'>+	{ 25000000, 8000000, { 0x02, 0xec, 0xfb, 0x9d, 0x05, 0xd9,</div><div class='ctx'> 		0xf7, 0x0e, 0x00, 0xbb, 0x44, 0xc1, 0x00, 0xbb, 0x3e,</div><div class='ctx'> 		0xe7, 0x00, 0xbb, 0x39, 0x0d, 0x01, 0x76, 0x7d, 0x34 } },</div><div class='del'>-	{ 25000, BANDWIDTH_7_MHZ, { 0x02, 0x8f, 0x5c, 0x29, 0x05, 0x1e,</div><div class='add'>+	{ 25000000, 7000000, { 0x02, 0x8f, 0x5c, 0x29, 0x05, 0x1e,</div><div class='ctx'> 		0xb8, 0x14, 0x00, 0xa3, 0xdc, 0x29, 0x00, 0xa3, 0xd7,</div><div class='ctx'> 		0x0a, 0x00, 0xa3, 0xd1, 0xec, 0x01, 0x47, 0xae, 0x05 } },</div><div class='del'>-	{ 25000, BANDWIDTH_6_MHZ, { 0x02, 0x31, 0xbc, 0xb5, 0x04, 0x63,</div><div class='add'>+	{ 25000000, 6000000, { 0x02, 0x31, 0xbc, 0xb5, 0x04, 0x63,</div><div class='ctx'> 		0x79, 0x1b, 0x00, 0x8c, 0x73, 0x91, 0x00, 0x8c, 0x6f,</div><div class='ctx'> 		0x2d, 0x00, 0x8c, 0x6a, 0xca, 0x01, 0x18, 0xde, 0x17 } },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* QPSK SNR lookup table */</div><div class='del'>-static struct snr_table qpsk_snr_table[] = {</div><div class='add'>+static const struct af9013_snr qpsk_snr_lut[] = {</div><div class='add'>+	{ 0x000000,  0 },</div><div class='ctx'> 	{ 0x0b4771,  0 },</div><div class='ctx'> 	{ 0x0c1aed,  1 },</div><div class='ctx'> 	{ 0x0d0d27,  2 },</div><div class='hunk'>@@ -131,7 +128,8 @@ static struct snr_table qpsk_snr_table[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* QAM16 SNR lookup table */</div><div class='del'>-static struct snr_table qam16_snr_table[] = {</div><div class='add'>+static const struct af9013_snr qam16_snr_lut[] = {</div><div class='add'>+	{ 0x000000,  0 },</div><div class='ctx'> 	{ 0x05eb62,  5 },</div><div class='ctx'> 	{ 0x05fecf,  6 },</div><div class='ctx'> 	{ 0x060b80,  7 },</div><div class='hunk'>@@ -151,7 +149,8 @@ static struct snr_table qam16_snr_table[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* QAM64 SNR lookup table */</div><div class='del'>-static struct snr_table qam64_snr_table[] = {</div><div class='add'>+static const struct af9013_snr qam64_snr_lut[] = {</div><div class='add'>+	{ 0x000000,  0 },</div><div class='ctx'> 	{ 0x03109b, 12 },</div><div class='ctx'> 	{ 0x0310d4, 13 },</div><div class='ctx'> 	{ 0x031920, 14 },</div><div class='hunk'>@@ -170,7 +169,7 @@ static struct snr_table qam64_snr_table[] = {</div><div class='ctx'> 	{ 0xffffff, 27 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct regdesc ofsm_init[] = {</div><div class='add'>+static const struct af9013_reg_bit ofsm_init[] = {</div><div class='ctx'> 	{ 0xd73a, 0, 8, 0xa1 },</div><div class='ctx'> 	{ 0xd73b, 0, 8, 0x1f },</div><div class='ctx'> 	{ 0xd73c, 4, 4, 0x0a },</div><div class='hunk'>@@ -252,7 +251,7 @@ static struct regdesc ofsm_init[] = {</div><div class='ctx'> </div><div class='ctx'> /* Panasonic ENV77H11D5 tuner init</div><div class='ctx'>    AF9013_TUNER_ENV77H11D5 = 129 */</div><div class='del'>-static struct regdesc tuner_init_env77h11d5[] = {</div><div class='add'>+static const struct af9013_reg_bit tuner_init_env77h11d5[] = {</div><div class='ctx'> 	{ 0x9bd5, 0, 8, 0x01 },</div><div class='ctx'> 	{ 0x9bd6, 0, 8, 0x03 },</div><div class='ctx'> 	{ 0x9bbe, 0, 8, 0x01 },</div><div class='hunk'>@@ -318,7 +317,7 @@ static struct regdesc tuner_init_env77h11d5[] = {</div><div class='ctx'> </div><div class='ctx'> /* Microtune MT2060 tuner init</div><div class='ctx'>    AF9013_TUNER_MT2060     = 130 */</div><div class='del'>-static struct regdesc tuner_init_mt2060[] = {</div><div class='add'>+static const struct af9013_reg_bit tuner_init_mt2060[] = {</div><div class='ctx'> 	{ 0x9bd5, 0, 8, 0x01 },</div><div class='ctx'> 	{ 0x9bd6, 0, 8, 0x07 },</div><div class='ctx'> 	{ 0xd1a0, 1, 1, 0x01 },</div><div class='hunk'>@@ -395,7 +394,7 @@ static struct regdesc tuner_init_mt2060[] = {</div><div class='ctx'> </div><div class='ctx'> /* Microtune MT2060 tuner init</div><div class='ctx'>    AF9013_TUNER_MT2060_2   = 147 */</div><div class='del'>-static struct regdesc tuner_init_mt2060_2[] = {</div><div class='add'>+static const struct af9013_reg_bit tuner_init_mt2060_2[] = {</div><div class='ctx'> 	{ 0x9bd5, 0, 8, 0x01 },</div><div class='ctx'> 	{ 0x9bd6, 0, 8, 0x06 },</div><div class='ctx'> 	{ 0x9bbe, 0, 8, 0x01 },</div><div class='hunk'>@@ -462,7 +461,7 @@ static struct regdesc tuner_init_mt2060_2[] = {</div><div class='ctx'> </div><div class='ctx'> /* MaxLinear MXL5003 tuner init</div><div class='ctx'>    AF9013_TUNER_MXL5003D   =   3 */</div><div class='del'>-static struct regdesc tuner_init_mxl5003d[] = {</div><div class='add'>+static const struct af9013_reg_bit tuner_init_mxl5003d[] = {</div><div class='ctx'> 	{ 0x9bd5, 0, 8, 0x01 },</div><div class='ctx'> 	{ 0x9bd6, 0, 8, 0x09 },</div><div class='ctx'> 	{ 0xd1a0, 1, 1, 0x01 },</div><div class='hunk'>@@ -534,7 +533,7 @@ static struct regdesc tuner_init_mxl5003d[] = {</div><div class='ctx'>    AF9013_TUNER_MXL5005D   =  13</div><div class='ctx'>    AF9013_TUNER_MXL5005R   =  30</div><div class='ctx'>    AF9013_TUNER_MXL5007T   = 177 */</div><div class='del'>-static struct regdesc tuner_init_mxl5005[] = {</div><div class='add'>+static const struct af9013_reg_bit tuner_init_mxl5005[] = {</div><div class='ctx'> 	{ 0x9bd5, 0, 8, 0x01 },</div><div class='ctx'> 	{ 0x9bd6, 0, 8, 0x07 },</div><div class='ctx'> 	{ 0xd1a0, 1, 1, 0x01 },</div><div class='hunk'>@@ -613,7 +612,7 @@ static struct regdesc tuner_init_mxl5005[] = {</div><div class='ctx'> /* Quantek QT1010 tuner init</div><div class='ctx'>    AF9013_TUNER_QT1010     = 134</div><div class='ctx'>    AF9013_TUNER_QT1010A    = 162 */</div><div class='del'>-static struct regdesc tuner_init_qt1010[] = {</div><div class='add'>+static const struct af9013_reg_bit tuner_init_qt1010[] = {</div><div class='ctx'> 	{ 0x9bd5, 0, 8, 0x01 },</div><div class='ctx'> 	{ 0x9bd6, 0, 8, 0x09 },</div><div class='ctx'> 	{ 0xd1a0, 1, 1, 0x01 },</div><div class='hunk'>@@ -690,7 +689,7 @@ static struct regdesc tuner_init_qt1010[] = {</div><div class='ctx'> </div><div class='ctx'> /* Freescale MC44S803 tuner init</div><div class='ctx'>    AF9013_TUNER_MC44S803   = 133 */</div><div class='del'>-static struct regdesc tuner_init_mc44s803[] = {</div><div class='add'>+static const struct af9013_reg_bit tuner_init_mc44s803[] = {</div><div class='ctx'> 	{ 0x9bd5, 0, 8, 0x01 },</div><div class='ctx'> 	{ 0x9bd6, 0, 8, 0x06 },</div><div class='ctx'> 	{ 0xd1a0, 1, 1, 0x01 },</div><div class='hunk'>@@ -772,7 +771,7 @@ static struct regdesc tuner_init_mc44s803[] = {</div><div class='ctx'> </div><div class='ctx'> /* unknown, probably for tin can tuner, tuner init</div><div class='ctx'>    AF9013_TUNER_UNKNOWN   = 140 */</div><div class='del'>-static struct regdesc tuner_init_unknown[] = {</div><div class='add'>+static const struct af9013_reg_bit tuner_init_unknown[] = {</div><div class='ctx'> 	{ 0x9bd5, 0, 8, 0x01 },</div><div class='ctx'> 	{ 0x9bd6, 0, 8, 0x02 },</div><div class='ctx'> 	{ 0xd1a0, 1, 1, 0x01 },</div><div class='hunk'>@@ -845,7 +844,7 @@ static struct regdesc tuner_init_unknown[] = {</div><div class='ctx'> /* NXP TDA18271 &amp; TDA18218 tuner init</div><div class='ctx'>    AF9013_TUNER_TDA18271   = 156</div><div class='ctx'>    AF9013_TUNER_TDA18218   = 179 */</div><div class='del'>-static struct regdesc tuner_init_tda18271[] = {</div><div class='add'>+static const struct af9013_reg_bit tuner_init_tda18271[] = {</div><div class='ctx'> 	{ 0x9bd5, 0, 8, 0x01 },</div><div class='ctx'> 	{ 0x9bd6, 0, 8, 0x04 },</div><div class='ctx'> 	{ 0xd1a0, 1, 1, 0x01 },</div><div class='hunk'>@@ -920,4 +919,4 @@ static struct regdesc tuner_init_tda18271[] = {</div><div class='ctx'> 	{ 0x9bee, 0, 1, 0x01 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#endif /* _AF9013_PRIV_ */</div><div class='add'>+#endif /* AF9013_PRIV_H */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/atbm8830.c b/drivers/media/dvb/frontends/atbm8830.c<br/>index 1539ea1f81ac..a2261ea2cf82 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/atbm8830.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/atbm8830.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/atbm8830.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/atbm8830.c</a></div><div class='hunk'>@@ -267,8 +267,7 @@ static void atbm8830_release(struct dvb_frontend *fe)</div><div class='ctx'> 	kfree(state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int atbm8830_set_fe(struct dvb_frontend *fe,</div><div class='del'>-			  struct dvb_frontend_parameters *fe_params)</div><div class='add'>+static int atbm8830_set_fe(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct atbm_state *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -279,7 +278,7 @@ static int atbm8830_set_fe(struct dvb_frontend *fe,</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, fe_params);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -298,31 +297,31 @@ static int atbm8830_set_fe(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int atbm8830_get_fe(struct dvb_frontend *fe,</div><div class='del'>-			  struct dvb_frontend_parameters *fe_params)</div><div class='add'>+static int atbm8830_get_fe(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	dprintk("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: get real readings from device */</div><div class='ctx'> 	/* inversion status */</div><div class='del'>-	fe_params-&gt;inversion = INVERSION_OFF;</div><div class='add'>+	c-&gt;inversion = INVERSION_OFF;</div><div class='ctx'> </div><div class='ctx'> 	/* bandwidth */</div><div class='del'>-	fe_params-&gt;u.ofdm.bandwidth = BANDWIDTH_8_MHZ;</div><div class='add'>+	c-&gt;bandwidth_hz = 8000000;</div><div class='ctx'> </div><div class='del'>-	fe_params-&gt;u.ofdm.code_rate_HP = FEC_AUTO;</div><div class='del'>-	fe_params-&gt;u.ofdm.code_rate_LP = FEC_AUTO;</div><div class='add'>+	c-&gt;code_rate_HP = FEC_AUTO;</div><div class='add'>+	c-&gt;code_rate_LP = FEC_AUTO;</div><div class='ctx'> </div><div class='del'>-	fe_params-&gt;u.ofdm.constellation = QAM_AUTO;</div><div class='add'>+	c-&gt;modulation = QAM_AUTO;</div><div class='ctx'> </div><div class='ctx'> 	/* transmission mode */</div><div class='del'>-	fe_params-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_AUTO;</div><div class='add'>+	c-&gt;transmission_mode = TRANSMISSION_MODE_AUTO;</div><div class='ctx'> </div><div class='ctx'> 	/* guard interval */</div><div class='del'>-	fe_params-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_AUTO;</div><div class='add'>+	c-&gt;guard_interval = GUARD_INTERVAL_AUTO;</div><div class='ctx'> </div><div class='ctx'> 	/* hierarchy */</div><div class='del'>-	fe_params-&gt;u.ofdm.hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+	c-&gt;hierarchy = HIERARCHY_NONE;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -429,9 +428,9 @@ static int atbm8830_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops atbm8830_ops = {</div><div class='add'>+	.delsys = { SYS_DMBTH },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "AltoBeam ATBM8830/8831 DMB-TH",</div><div class='del'>-		.type = FE_OFDM,</div><div class='ctx'> 		.frequency_min = 474000000,</div><div class='ctx'> 		.frequency_max = 858000000,</div><div class='ctx'> 		.frequency_stepsize = 10000,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/au8522_dig.c b/drivers/media/dvb/frontends/au8522_dig.c<br/>index 1d572940e243..c688b95df486 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/au8522_dig.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/au8522_dig.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/au8522_dig.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/au8522_dig.c</a></div><div class='hunk'>@@ -576,19 +576,19 @@ static int au8522_enable_modulation(struct dvb_frontend *fe,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Talk to the demod, set the FEC, GUARD, QAM settings etc */</div><div class='del'>-static int au8522_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-			       struct dvb_frontend_parameters *p)</div><div class='add'>+static int au8522_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct au8522_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	dprintk("%s(frequency=%d)\n", __func__, p-&gt;frequency);</div><div class='add'>+	dprintk("%s(frequency=%d)\n", __func__, c-&gt;frequency);</div><div class='ctx'> </div><div class='del'>-	if ((state-&gt;current_frequency == p-&gt;frequency) &amp;&amp;</div><div class='del'>-	    (state-&gt;current_modulation == p-&gt;u.vsb.modulation))</div><div class='add'>+	if ((state-&gt;current_frequency == c-&gt;frequency) &amp;&amp;</div><div class='add'>+	    (state-&gt;current_modulation == c-&gt;modulation))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	au8522_enable_modulation(fe, p-&gt;u.vsb.modulation);</div><div class='add'>+	au8522_enable_modulation(fe, c-&gt;modulation);</div><div class='ctx'> </div><div class='ctx'> 	/* Allow the demod to settle */</div><div class='ctx'> 	msleep(100);</div><div class='hunk'>@@ -596,7 +596,7 @@ static int au8522_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='del'>-		ret = fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		ret = fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -604,7 +604,7 @@ static int au8522_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	state-&gt;current_frequency = p-&gt;frequency;</div><div class='add'>+	state-&gt;current_frequency = c-&gt;frequency;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -862,7 +862,36 @@ static int au8522_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='ctx'> static int au8522_read_signal_strength(struct dvb_frontend *fe,</div><div class='ctx'> 				       u16 *signal_strength)</div><div class='ctx'> {</div><div class='del'>-	return au8522_read_snr(fe, signal_strength);</div><div class='add'>+	/* borrowed from lgdt330x.c</div><div class='add'>+	 *</div><div class='add'>+	 * Calculate strength from SNR up to 35dB</div><div class='add'>+	 * Even though the SNR can go higher than 35dB,</div><div class='add'>+	 * there is some comfort factor in having a range of</div><div class='add'>+	 * strong signals that can show at 100%</div><div class='add'>+	 */</div><div class='add'>+	u16 snr;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int ret = au8522_read_snr(fe, &amp;snr);</div><div class='add'>+</div><div class='add'>+	*signal_strength = 0;</div><div class='add'>+</div><div class='add'>+	if (0 == ret) {</div><div class='add'>+		/* The following calculation method was chosen</div><div class='add'>+		 * purely for the sake of code re-use from the</div><div class='add'>+		 * other demod drivers that use this method */</div><div class='add'>+</div><div class='add'>+		/* Convert from SNR in dB * 10 to 8.24 fixed-point */</div><div class='add'>+		tmp = (snr * ((1 &lt;&lt; 24) / 10));</div><div class='add'>+</div><div class='add'>+		/* Convert from 8.24 fixed-point to</div><div class='add'>+		 * scale the range 0 - 35*2^24 into 0 - 65535*/</div><div class='add'>+		if (tmp &gt;= 8960 * 0x10000)</div><div class='add'>+			*signal_strength = 0xffff;</div><div class='add'>+		else</div><div class='add'>+			*signal_strength = tmp / 8960;</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 au8522_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='hunk'>@@ -882,13 +911,13 @@ static int au8522_read_ber(struct dvb_frontend *fe, u32 *ber)</div><div class='ctx'> 	return au8522_read_ucblocks(fe, ber);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int au8522_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-				struct dvb_frontend_parameters *p)</div><div class='add'>+static int au8522_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct au8522_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='del'>-	p-&gt;frequency = state-&gt;current_frequency;</div><div class='del'>-	p-&gt;u.vsb.modulation = state-&gt;current_modulation;</div><div class='add'>+	c-&gt;frequency = state-&gt;current_frequency;</div><div class='add'>+	c-&gt;modulation = state-&gt;current_modulation;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -981,10 +1010,9 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(au8522_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops au8522_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Auvitek AU8522 QAM/8VSB Frontend",</div><div class='del'>-		.type			= FE_ATSC,</div><div class='ctx'> 		.frequency_min		= 54000000,</div><div class='ctx'> 		.frequency_max		= 858000000,</div><div class='ctx'> 		.frequency_stepsize	= 62500,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/bcm3510.c b/drivers/media/dvb/frontends/bcm3510.c<br/>index 8aff5868a5e1..033cd7ad3ca2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/bcm3510.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/bcm3510.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/bcm3510.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/bcm3510.c</a></div><div class='hunk'>@@ -479,16 +479,16 @@ static int bcm3510_set_freq(struct bcm3510_state* st,u32 freq)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bcm3510_set_frontend(struct dvb_frontend* fe,</div><div class='del'>-					     struct dvb_frontend_parameters *p)</div><div class='add'>+static int bcm3510_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct bcm3510_state* st = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct bcm3510_hab_cmd_ext_acquire cmd;</div><div class='ctx'> 	struct bcm3510_hab_cmd_bert_control bert;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;cmd,0,sizeof(cmd));</div><div class='del'>-	switch (p-&gt;u.vsb.modulation) {</div><div class='add'>+	switch (c-&gt;modulation) {</div><div class='ctx'> 		case QAM_256:</div><div class='ctx'> 			cmd.ACQUIRE0.MODE = 0x1;</div><div class='ctx'> 			cmd.ACQUIRE1.SYM_RATE = 0x1;</div><div class='hunk'>@@ -499,7 +499,8 @@ static int bcm3510_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 			cmd.ACQUIRE1.SYM_RATE = 0x2;</div><div class='ctx'> 			cmd.ACQUIRE1.IF_FREQ = 0x1;</div><div class='ctx'> 			break;</div><div class='del'>-/*		case QAM_256:</div><div class='add'>+#if 0</div><div class='add'>+		case QAM_256:</div><div class='ctx'> 			cmd.ACQUIRE0.MODE = 0x3;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case QAM_128:</div><div class='hunk'>@@ -513,7 +514,8 @@ static int bcm3510_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 			break;</div><div class='ctx'> 		case QAM_16:</div><div class='ctx'> 			cmd.ACQUIRE0.MODE = 0x7;</div><div class='del'>-			break;*/</div><div class='add'>+			break;</div><div class='add'>+#endif</div><div class='ctx'> 		case VSB_8:</div><div class='ctx'> 			cmd.ACQUIRE0.MODE = 0x8;</div><div class='ctx'> 			cmd.ACQUIRE1.SYM_RATE = 0x0;</div><div class='hunk'>@@ -552,7 +554,8 @@ static int bcm3510_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> </div><div class='ctx'> 	bcm3510_bert_reset(st);</div><div class='ctx'> </div><div class='del'>-	if ((ret = bcm3510_set_freq(st,p-&gt;frequency)) &lt; 0)</div><div class='add'>+	ret = bcm3510_set_freq(st, c-&gt;frequency);</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;st-&gt;status1,0,sizeof(st-&gt;status1));</div><div class='hunk'>@@ -819,10 +822,9 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(bcm3510_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops bcm3510_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "Broadcom BCM3510 VSB/QAM frontend",</div><div class='del'>-		.type = FE_ATSC,</div><div class='ctx'> 		.frequency_min =  54000000,</div><div class='ctx'> 		.frequency_max = 803000000,</div><div class='ctx'> 		/* stepsize is just a guess */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/bsbe1.h b/drivers/media/dvb/frontends/bsbe1.h<br/>index 5e431ebd089b..53e4d0dbb745 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/bsbe1.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/bsbe1.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/bsbe1.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/bsbe1.h</a></div><div class='hunk'>@@ -69,18 +69,19 @@ static int alps_bsbe1_set_symbol_rate(struct dvb_frontend* fe, u32 srate, u32 ra</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int alps_bsbe1_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int alps_bsbe1_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 data[4];</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };</div><div class='ctx'> 	struct i2c_adapter *i2c = fe-&gt;tuner_priv;</div><div class='ctx'> </div><div class='del'>-	if ((params-&gt;frequency &lt; 950000) || (params-&gt;frequency &gt; 2150000))</div><div class='add'>+	if ((p-&gt;frequency &lt; 950000) || (p-&gt;frequency &gt; 2150000))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	div = params-&gt;frequency / 1000;</div><div class='add'>+	div = p-&gt;frequency / 1000;</div><div class='ctx'> 	data[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	data[1] = div &amp; 0xff;</div><div class='ctx'> 	data[2] = 0x80 | ((div &amp; 0x18000) &gt;&gt; 10) | 0x1;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/bsru6.h b/drivers/media/dvb/frontends/bsru6.h<br/>index c480c839b302..c2a578e1314d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/bsru6.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/bsru6.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/bsru6.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/bsru6.h</a></div><div class='hunk'>@@ -101,23 +101,24 @@ static int alps_bsru6_set_symbol_rate(struct dvb_frontend *fe, u32 srate, u32 ra</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int alps_bsru6_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int alps_bsru6_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	u8 buf[4];</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };</div><div class='ctx'> 	struct i2c_adapter *i2c = fe-&gt;tuner_priv;</div><div class='ctx'> </div><div class='del'>-	if ((params-&gt;frequency &lt; 950000) || (params-&gt;frequency &gt; 2150000))</div><div class='add'>+	if ((p-&gt;frequency &lt; 950000) || (p-&gt;frequency &gt; 2150000))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	div = (params-&gt;frequency + (125 - 1)) / 125;	// round correctly</div><div class='add'>+	div = (p-&gt;frequency + (125 - 1)) / 125;	/* round correctly */</div><div class='ctx'> 	buf[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	buf[1] = div &amp; 0xff;</div><div class='ctx'> 	buf[2] = 0x80 | ((div &amp; 0x18000) &gt;&gt; 10) | 4;</div><div class='ctx'> 	buf[3] = 0xC4;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &gt; 1530000)</div><div class='add'>+	if (p-&gt;frequency &gt; 1530000)</div><div class='ctx'> 		buf[3] = 0xc0;</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c<br/>index 0142214b0133..f2a90f990ce3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx22700.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cx22700.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx22700.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/cx22700.c</a></div><div class='hunk'>@@ -121,7 +121,8 @@ static int cx22700_set_inversion (struct cx22700_state* state, int inversion)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx22700_set_tps (struct cx22700_state *state, struct dvb_ofdm_parameters *p)</div><div class='add'>+static int cx22700_set_tps(struct cx22700_state *state,</div><div class='add'>+			   struct dtv_frontend_properties *p)</div><div class='ctx'> {</div><div class='ctx'> 	static const u8 qam_tab [4] = { 0, 1, 0, 2 };</div><div class='ctx'> 	static const u8 fec_tab [6] = { 0, 1, 2, 0, 3, 4 };</div><div class='hunk'>@@ -146,25 +147,25 @@ static int cx22700_set_tps (struct cx22700_state *state, struct dvb_ofdm_paramet</div><div class='ctx'> 	    p-&gt;transmission_mode != TRANSMISSION_MODE_8K)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;constellation != QPSK &amp;&amp;</div><div class='del'>-	    p-&gt;constellation != QAM_16 &amp;&amp;</div><div class='del'>-	    p-&gt;constellation != QAM_64)</div><div class='add'>+	if (p-&gt;modulation != QPSK &amp;&amp;</div><div class='add'>+	    p-&gt;modulation != QAM_16 &amp;&amp;</div><div class='add'>+	    p-&gt;modulation != QAM_64)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;hierarchy_information &lt; HIERARCHY_NONE ||</div><div class='del'>-	    p-&gt;hierarchy_information &gt; HIERARCHY_4)</div><div class='add'>+	if (p-&gt;hierarchy &lt; HIERARCHY_NONE ||</div><div class='add'>+	    p-&gt;hierarchy &gt; HIERARCHY_4)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;bandwidth &lt; BANDWIDTH_8_MHZ || p-&gt;bandwidth &gt; BANDWIDTH_6_MHZ)</div><div class='add'>+	if (p-&gt;bandwidth_hz &gt; 8000000 || p-&gt;bandwidth_hz &lt; 6000000)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;bandwidth == BANDWIDTH_7_MHZ)</div><div class='add'>+	if (p-&gt;bandwidth_hz == 7000000)</div><div class='ctx'> 		cx22700_writereg (state, 0x09, cx22700_readreg (state, 0x09 | 0x10));</div><div class='ctx'> 	else</div><div class='ctx'> 		cx22700_writereg (state, 0x09, cx22700_readreg (state, 0x09 &amp; ~0x10));</div><div class='ctx'> </div><div class='del'>-	val = qam_tab[p-&gt;constellation - QPSK];</div><div class='del'>-	val |= p-&gt;hierarchy_information - HIERARCHY_NONE;</div><div class='add'>+	val = qam_tab[p-&gt;modulation - QPSK];</div><div class='add'>+	val |= p-&gt;hierarchy - HIERARCHY_NONE;</div><div class='ctx'> </div><div class='ctx'> 	cx22700_writereg (state, 0x04, val);</div><div class='ctx'> </div><div class='hunk'>@@ -184,7 +185,8 @@ static int cx22700_set_tps (struct cx22700_state *state, struct dvb_ofdm_paramet</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx22700_get_tps (struct cx22700_state* state, struct dvb_ofdm_parameters *p)</div><div class='add'>+static int cx22700_get_tps(struct cx22700_state *state,</div><div class='add'>+			   struct dtv_frontend_properties *p)</div><div class='ctx'> {</div><div class='ctx'> 	static const fe_modulation_t qam_tab [3] = { QPSK, QAM_16, QAM_64 };</div><div class='ctx'> 	static const fe_code_rate_t fec_tab [5] = { FEC_1_2, FEC_2_3, FEC_3_4,</div><div class='hunk'>@@ -199,14 +201,14 @@ static int cx22700_get_tps (struct cx22700_state* state, struct dvb_ofdm_paramet</div><div class='ctx'> 	val = cx22700_readreg (state, 0x01);</div><div class='ctx'> </div><div class='ctx'> 	if ((val &amp; 0x7) &gt; 4)</div><div class='del'>-		p-&gt;hierarchy_information = HIERARCHY_AUTO;</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_AUTO;</div><div class='ctx'> 	else</div><div class='del'>-		p-&gt;hierarchy_information = HIERARCHY_NONE + (val &amp; 0x7);</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_NONE + (val &amp; 0x7);</div><div class='ctx'> </div><div class='ctx'> 	if (((val &gt;&gt; 3) &amp; 0x3) &gt; 2)</div><div class='del'>-		p-&gt;constellation = QAM_AUTO;</div><div class='add'>+		p-&gt;modulation = QAM_AUTO;</div><div class='ctx'> 	else</div><div class='del'>-		p-&gt;constellation = qam_tab[(val &gt;&gt; 3) &amp; 0x3];</div><div class='add'>+		p-&gt;modulation = qam_tab[(val &gt;&gt; 3) &amp; 0x3];</div><div class='ctx'> </div><div class='ctx'> 	val = cx22700_readreg (state, 0x02);</div><div class='ctx'> </div><div class='hunk'>@@ -318,33 +320,35 @@ static int cx22700_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx22700_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int cx22700_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct cx22700_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	cx22700_writereg (state, 0x00, 0x02); /* XXX CHECKME: soft reset*/</div><div class='ctx'> 	cx22700_writereg (state, 0x00, 0x00);</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cx22700_set_inversion (state, p-&gt;inversion);</div><div class='del'>-	cx22700_set_tps (state, &amp;p-&gt;u.ofdm);</div><div class='add'>+	cx22700_set_inversion(state, c-&gt;inversion);</div><div class='add'>+	cx22700_set_tps(state, c);</div><div class='ctx'> 	cx22700_writereg (state, 0x37, 0x01);  /* PAL loop filter off */</div><div class='ctx'> 	cx22700_writereg (state, 0x00, 0x01);  /* restart acquire */</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx22700_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int cx22700_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct cx22700_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u8 reg09 = cx22700_readreg (state, 0x09);</div><div class='ctx'> </div><div class='del'>-	p-&gt;inversion = reg09 &amp; 0x1 ? INVERSION_ON : INVERSION_OFF;</div><div class='del'>-	return cx22700_get_tps (state, &amp;p-&gt;u.ofdm);</div><div class='add'>+	c-&gt;inversion = reg09 &amp; 0x1 ? INVERSION_ON : INVERSION_OFF;</div><div class='add'>+	return cx22700_get_tps(state, c);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cx22700_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)</div><div class='hunk'>@@ -401,10 +405,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops cx22700_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Conexant CX22700 DVB-T",</div><div class='del'>-		.type			= FE_OFDM,</div><div class='ctx'> 		.frequency_min		= 470000000,</div><div class='ctx'> 		.frequency_max		= 860000000,</div><div class='ctx'> 		.frequency_stepsize	= 166667,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c<br/>index 3139558148ba..faba82485086 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx22702.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cx22702.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx22702.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/cx22702.c</a></div><div class='hunk'>@@ -146,7 +146,7 @@ static int cx22702_set_inversion(struct cx22702_state *state, int inversion)</div><div class='ctx'> </div><div class='ctx'> /* Retrieve the demod settings */</div><div class='ctx'> static int cx22702_get_tps(struct cx22702_state *state,</div><div class='del'>-	struct dvb_ofdm_parameters *p)</div><div class='add'>+			   struct dtv_frontend_properties *p)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val;</div><div class='ctx'> </div><div class='hunk'>@@ -157,27 +157,27 @@ static int cx22702_get_tps(struct cx22702_state *state,</div><div class='ctx'> 	val = cx22702_readreg(state, 0x01);</div><div class='ctx'> 	switch ((val &amp; 0x18) &gt;&gt; 3) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		p-&gt;constellation = QPSK;</div><div class='add'>+		p-&gt;modulation = QPSK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		p-&gt;constellation = QAM_16;</div><div class='add'>+		p-&gt;modulation = QAM_16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		p-&gt;constellation = QAM_64;</div><div class='add'>+		p-&gt;modulation = QAM_64;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	switch (val &amp; 0x07) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		p-&gt;hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_NONE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		p-&gt;hierarchy_information = HIERARCHY_1;</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		p-&gt;hierarchy_information = HIERARCHY_2;</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		p-&gt;hierarchy_information = HIERARCHY_4;</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -260,14 +260,14 @@ static int cx22702_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Talk to the demod, set the FEC, GUARD, QAM settings etc */</div><div class='del'>-static int cx22702_set_tps(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int cx22702_set_tps(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	u8 val;</div><div class='ctx'> 	struct cx22702_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -277,14 +277,14 @@ static int cx22702_set_tps(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	/* set bandwidth */</div><div class='ctx'> 	val = cx22702_readreg(state, 0x0C) &amp; 0xcf;</div><div class='del'>-	switch (p-&gt;u.ofdm.bandwidth) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	switch (p-&gt;bandwidth_hz) {</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		val |= 0x20;</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		val |= 0x10;</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dprintk("%s: invalid bandwidth\n", __func__);</div><div class='hunk'>@@ -292,15 +292,15 @@ static int cx22702_set_tps(struct dvb_frontend *fe,</div><div class='ctx'> 	}</div><div class='ctx'> 	cx22702_writereg(state, 0x0C, val);</div><div class='ctx'> </div><div class='del'>-	p-&gt;u.ofdm.code_rate_LP = FEC_AUTO; /* temp hack as manual not working */</div><div class='add'>+	p-&gt;code_rate_LP = FEC_AUTO; /* temp hack as manual not working */</div><div class='ctx'> </div><div class='ctx'> 	/* use auto configuration? */</div><div class='del'>-	if ((p-&gt;u.ofdm.hierarchy_information == HIERARCHY_AUTO) ||</div><div class='del'>-	   (p-&gt;u.ofdm.constellation == QAM_AUTO) ||</div><div class='del'>-	   (p-&gt;u.ofdm.code_rate_HP == FEC_AUTO) ||</div><div class='del'>-	   (p-&gt;u.ofdm.code_rate_LP == FEC_AUTO) ||</div><div class='del'>-	   (p-&gt;u.ofdm.guard_interval == GUARD_INTERVAL_AUTO) ||</div><div class='del'>-	   (p-&gt;u.ofdm.transmission_mode == TRANSMISSION_MODE_AUTO)) {</div><div class='add'>+	if ((p-&gt;hierarchy == HIERARCHY_AUTO) ||</div><div class='add'>+	   (p-&gt;modulation == QAM_AUTO) ||</div><div class='add'>+	   (p-&gt;code_rate_HP == FEC_AUTO) ||</div><div class='add'>+	   (p-&gt;code_rate_LP == FEC_AUTO) ||</div><div class='add'>+	   (p-&gt;guard_interval == GUARD_INTERVAL_AUTO) ||</div><div class='add'>+	   (p-&gt;transmission_mode == TRANSMISSION_MODE_AUTO)) {</div><div class='ctx'> </div><div class='ctx'> 		/* TPS Source - use hardware driven values */</div><div class='ctx'> 		cx22702_writereg(state, 0x06, 0x10);</div><div class='hunk'>@@ -316,7 +316,7 @@ static int cx22702_set_tps(struct dvb_frontend *fe,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* manually programmed values */</div><div class='del'>-	switch (p-&gt;u.ofdm.constellation) {		/* mask 0x18 */</div><div class='add'>+	switch (p-&gt;modulation) {		/* mask 0x18 */</div><div class='ctx'> 	case QPSK:</div><div class='ctx'> 		val = 0x00;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -327,10 +327,10 @@ static int cx22702_set_tps(struct dvb_frontend *fe,</div><div class='ctx'> 		val = 0x10;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		dprintk("%s: invalid constellation\n", __func__);</div><div class='add'>+		dprintk("%s: invalid modulation\n", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	switch (p-&gt;u.ofdm.hierarchy_information) {	/* mask 0x07 */</div><div class='add'>+	switch (p-&gt;hierarchy) {	/* mask 0x07 */</div><div class='ctx'> 	case HIERARCHY_NONE:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HIERARCHY_1:</div><div class='hunk'>@@ -348,7 +348,7 @@ static int cx22702_set_tps(struct dvb_frontend *fe,</div><div class='ctx'> 	}</div><div class='ctx'> 	cx22702_writereg(state, 0x06, val);</div><div class='ctx'> </div><div class='del'>-	switch (p-&gt;u.ofdm.code_rate_HP) {		/* mask 0x38 */</div><div class='add'>+	switch (p-&gt;code_rate_HP) {		/* mask 0x38 */</div><div class='ctx'> 	case FEC_NONE:</div><div class='ctx'> 	case FEC_1_2:</div><div class='ctx'> 		val = 0x00;</div><div class='hunk'>@@ -369,7 +369,7 @@ static int cx22702_set_tps(struct dvb_frontend *fe,</div><div class='ctx'> 		dprintk("%s: invalid code_rate_HP\n", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	switch (p-&gt;u.ofdm.code_rate_LP) {		/* mask 0x07 */</div><div class='add'>+	switch (p-&gt;code_rate_LP) {		/* mask 0x07 */</div><div class='ctx'> 	case FEC_NONE:</div><div class='ctx'> 	case FEC_1_2:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -391,7 +391,7 @@ static int cx22702_set_tps(struct dvb_frontend *fe,</div><div class='ctx'> 	}</div><div class='ctx'> 	cx22702_writereg(state, 0x07, val);</div><div class='ctx'> </div><div class='del'>-	switch (p-&gt;u.ofdm.guard_interval) {		/* mask 0x0c */</div><div class='add'>+	switch (p-&gt;guard_interval) {		/* mask 0x0c */</div><div class='ctx'> 	case GUARD_INTERVAL_1_32:</div><div class='ctx'> 		val = 0x00;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -408,7 +408,7 @@ static int cx22702_set_tps(struct dvb_frontend *fe,</div><div class='ctx'> 		dprintk("%s: invalid guard_interval\n", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	switch (p-&gt;u.ofdm.transmission_mode) {		/* mask 0x03 */</div><div class='add'>+	switch (p-&gt;transmission_mode) {		/* mask 0x03 */</div><div class='ctx'> 	case TRANSMISSION_MODE_2K:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TRANSMISSION_MODE_8K:</div><div class='hunk'>@@ -546,15 +546,15 @@ static int cx22702_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx22702_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int cx22702_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct cx22702_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	u8 reg0C = cx22702_readreg(state, 0x0C);</div><div class='ctx'> </div><div class='del'>-	p-&gt;inversion = reg0C &amp; 0x1 ? INVERSION_ON : INVERSION_OFF;</div><div class='del'>-	return cx22702_get_tps(state, &amp;p-&gt;u.ofdm);</div><div class='add'>+	c-&gt;inversion = reg0C &amp; 0x1 ? INVERSION_ON : INVERSION_OFF;</div><div class='add'>+	return cx22702_get_tps(state, c);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cx22702_get_tune_settings(struct dvb_frontend *fe,</div><div class='hunk'>@@ -603,10 +603,9 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(cx22702_attach);</div><div class='ctx'> </div><div class='ctx'> static const struct dvb_frontend_ops cx22702_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Conexant CX22702 DVB-T",</div><div class='del'>-		.type			= FE_OFDM,</div><div class='ctx'> 		.frequency_min		= 177000000,</div><div class='ctx'> 		.frequency_max		= 858000000,</div><div class='ctx'> 		.frequency_stepsize	= 166666,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c<br/>index bf9c999aa470..5101f10f2d7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24110.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cx24110.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24110.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/cx24110.c</a></div><div class='hunk'>@@ -531,26 +531,27 @@ static int cx24110_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24110_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int cx24110_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24110_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cx24110_set_inversion (state, p-&gt;inversion);</div><div class='del'>-	cx24110_set_fec (state, p-&gt;u.qpsk.fec_inner);</div><div class='del'>-	cx24110_set_symbolrate (state, p-&gt;u.qpsk.symbol_rate);</div><div class='add'>+	cx24110_set_inversion(state, p-&gt;inversion);</div><div class='add'>+	cx24110_set_fec(state, p-&gt;fec_inner);</div><div class='add'>+	cx24110_set_symbolrate(state, p-&gt;symbol_rate);</div><div class='ctx'> 	cx24110_writereg(state,0x04,0x05); /* start acquisition */</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24110_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int cx24110_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct cx24110_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	s32 afc; unsigned sclk;</div><div class='ctx'> </div><div class='hunk'>@@ -571,7 +572,7 @@ static int cx24110_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> 	p-&gt;frequency += afc;</div><div class='ctx'> 	p-&gt;inversion = (cx24110_readreg (state, 0x22) &amp; 0x10) ?</div><div class='ctx'> 				INVERSION_ON : INVERSION_OFF;</div><div class='del'>-	p-&gt;u.qpsk.fec_inner = cx24110_get_fec (state);</div><div class='add'>+	p-&gt;fec_inner = cx24110_get_fec(state);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -623,10 +624,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops cx24110_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "Conexant CX24110 DVB-S",</div><div class='del'>-		.type = FE_QPSK,</div><div class='ctx'> 		.frequency_min = 950000,</div><div class='ctx'> 		.frequency_max = 2150000,</div><div class='ctx'> 		.frequency_stepsize = 1011,  /* kHz for QPSK frontends */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx24113.c b/drivers/media/dvb/frontends/cx24113.c<br/>index c341d57d5e81..3883c3b31aef 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24113.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cx24113.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24113.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/cx24113.c</a></div><div class='hunk'>@@ -476,21 +476,21 @@ static int cx24113_init(struct dvb_frontend *fe)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24113_set_params(struct dvb_frontend *fe,</div><div class='del'>-		struct dvb_frontend_parameters *p)</div><div class='add'>+static int cx24113_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct cx24113_state *state = fe-&gt;tuner_priv;</div><div class='ctx'> 	/* for a ROLL-OFF factor of 0.35, 0.2: 600, 0.25: 625 */</div><div class='ctx'> 	u32 roll_off = 675;</div><div class='ctx'> 	u32 bw;</div><div class='ctx'> </div><div class='del'>-	bw  = ((p-&gt;u.qpsk.symbol_rate/100) * roll_off) / 1000;</div><div class='add'>+	bw  = ((c-&gt;symbol_rate/100) * roll_off) / 1000;</div><div class='ctx'> 	bw += (10000000/100) + 5;</div><div class='ctx'> 	bw /= 10;</div><div class='ctx'> 	bw += 1000;</div><div class='ctx'> 	cx24113_set_bandwidth(state, bw);</div><div class='ctx'> </div><div class='del'>-	cx24113_set_frequency(state, p-&gt;frequency);</div><div class='add'>+	cx24113_set_frequency(state, c-&gt;frequency);</div><div class='ctx'> 	msleep(5);</div><div class='ctx'> 	return cx24113_get_status(fe, &amp;bw);</div><div class='ctx'> }</div><div class='hunk'>@@ -547,11 +547,9 @@ static const struct dvb_tuner_ops cx24113_tuner_ops = {</div><div class='ctx'> 	.release       = cx24113_release,</div><div class='ctx'> </div><div class='ctx'> 	.init          = cx24113_init,</div><div class='del'>-	.sleep         = NULL,</div><div class='ctx'> </div><div class='ctx'> 	.set_params    = cx24113_set_params,</div><div class='ctx'> 	.get_frequency = cx24113_get_frequency,</div><div class='del'>-	.get_bandwidth = NULL,</div><div class='ctx'> 	.get_status    = cx24113_get_status,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx24116.c b/drivers/media/dvb/frontends/cx24116.c<br/>index ccd05255d527..b48879186537 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24116.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cx24116.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24116.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/cx24116.c</a></div><div class='hunk'>@@ -1212,25 +1212,10 @@ static int cx24116_sleep(struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24116_set_property(struct dvb_frontend *fe,</div><div class='del'>-	struct dtv_property *tvp)</div><div class='del'>-{</div><div class='del'>-	dprintk("%s(..)\n", __func__);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cx24116_get_property(struct dvb_frontend *fe,</div><div class='del'>-	struct dtv_property *tvp)</div><div class='del'>-{</div><div class='del'>-	dprintk("%s(..)\n", __func__);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* dvb-core told us to tune, the tv property cache will be complete,</div><div class='ctx'>  * it's safe for is to pull values and use them for tuning purposes.</div><div class='ctx'>  */</div><div class='del'>-static int cx24116_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int cx24116_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24116_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='hunk'>@@ -1455,12 +1440,20 @@ tuned:  /* Set/Reset B/W */</div><div class='ctx'> 	return cx24116_cmd_execute(fe, &amp;cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24116_tune(struct dvb_frontend *fe, struct dvb_frontend_parameters *params,</div><div class='add'>+static int cx24116_tune(struct dvb_frontend *fe, bool re_tune,</div><div class='ctx'> 	unsigned int mode_flags, unsigned int *delay, fe_status_t *status)</div><div class='ctx'> {</div><div class='add'>+	/*</div><div class='add'>+	 * It is safe to discard "params" here, as the DVB core will sync</div><div class='add'>+	 * fe-&gt;dtv_property_cache with fepriv-&gt;parameters_in, where the</div><div class='add'>+	 * DVBv3 params are stored. The only practical usage for it indicate</div><div class='add'>+	 * that re-tuning is needed, e. g. (fepriv-&gt;state &amp; FESTATE_RETUNE) is</div><div class='add'>+	 * true.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='ctx'> 	*delay = HZ / 5;</div><div class='del'>-	if (params) {</div><div class='del'>-		int ret = cx24116_set_frontend(fe, params);</div><div class='add'>+	if (re_tune) {</div><div class='add'>+		int ret = cx24116_set_frontend(fe);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1473,10 +1466,9 @@ static int cx24116_get_algo(struct dvb_frontend *fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops cx24116_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBS, SYS_DVBS2 },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "Conexant CX24116/CX24118",</div><div class='del'>-		.type = FE_QPSK,</div><div class='ctx'> 		.frequency_min = 950000,</div><div class='ctx'> 		.frequency_max = 2150000,</div><div class='ctx'> 		.frequency_stepsize = 1011, /* kHz for QPSK frontends */</div><div class='hunk'>@@ -1507,8 +1499,6 @@ static struct dvb_frontend_ops cx24116_ops = {</div><div class='ctx'> 	.get_frontend_algo = cx24116_get_algo,</div><div class='ctx'> 	.tune = cx24116_tune,</div><div class='ctx'> </div><div class='del'>-	.set_property = cx24116_set_property,</div><div class='del'>-	.get_property = cx24116_get_property,</div><div class='ctx'> 	.set_frontend = cx24116_set_frontend,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c<br/>index b1dd8acc607a..7e28b4ee7d4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24123.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cx24123.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24123.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/cx24123.c</a></div><div class='hunk'>@@ -526,9 +526,9 @@ static int cx24123_set_symbolrate(struct cx24123_state *state, u32 srate)</div><div class='ctx'>  * to be configured and the correct band selected.</div><div class='ctx'>  * Calculate those values.</div><div class='ctx'>  */</div><div class='del'>-static int cx24123_pll_calculate(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int cx24123_pll_calculate(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u32 ndiv = 0, adiv = 0, vco_div = 0;</div><div class='ctx'> 	int i = 0;</div><div class='hunk'>@@ -548,8 +548,8 @@ static int cx24123_pll_calculate(struct dvb_frontend *fe,</div><div class='ctx'> 	 * FILTUNE programming bits */</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(cx24123_AGC_vals); i++) {</div><div class='ctx'> 		agcv = &amp;cx24123_AGC_vals[i];</div><div class='del'>-		if ((agcv-&gt;symbolrate_low &lt;= p-&gt;u.qpsk.symbol_rate) &amp;&amp;</div><div class='del'>-		    (agcv-&gt;symbolrate_high &gt;= p-&gt;u.qpsk.symbol_rate)) {</div><div class='add'>+		if ((agcv-&gt;symbolrate_low &lt;= p-&gt;symbol_rate) &amp;&amp;</div><div class='add'>+		    (agcv-&gt;symbolrate_high &gt;= p-&gt;symbol_rate)) {</div><div class='ctx'> 			state-&gt;VCAarg = agcv-&gt;VCAprogdata;</div><div class='ctx'> 			state-&gt;VGAarg = agcv-&gt;VGAprogdata;</div><div class='ctx'> 			state-&gt;FILTune = agcv-&gt;FILTune;</div><div class='hunk'>@@ -601,8 +601,7 @@ static int cx24123_pll_calculate(struct dvb_frontend *fe,</div><div class='ctx'>  * Tuner cx24109 is written through a dedicated 3wire interface</div><div class='ctx'>  * on the demod chip.</div><div class='ctx'>  */</div><div class='del'>-static int cx24123_pll_writereg(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p, u32 data)</div><div class='add'>+static int cx24123_pll_writereg(struct dvb_frontend *fe, u32 data)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	unsigned long timeout;</div><div class='hunk'>@@ -659,26 +658,26 @@ static int cx24123_pll_writereg(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24123_pll_tune(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int cx24123_pll_tune(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u8 val;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("frequency=%i\n", p-&gt;frequency);</div><div class='ctx'> </div><div class='del'>-	if (cx24123_pll_calculate(fe, p) != 0) {</div><div class='add'>+	if (cx24123_pll_calculate(fe) != 0) {</div><div class='ctx'> 		err("%s: cx24123_pll_calcutate failed\n", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Write the new VCO/VGA */</div><div class='del'>-	cx24123_pll_writereg(fe, p, state-&gt;VCAarg);</div><div class='del'>-	cx24123_pll_writereg(fe, p, state-&gt;VGAarg);</div><div class='add'>+	cx24123_pll_writereg(fe, state-&gt;VCAarg);</div><div class='add'>+	cx24123_pll_writereg(fe, state-&gt;VGAarg);</div><div class='ctx'> </div><div class='ctx'> 	/* Write the new bandselect and pll args */</div><div class='del'>-	cx24123_pll_writereg(fe, p, state-&gt;bandselectarg);</div><div class='del'>-	cx24123_pll_writereg(fe, p, state-&gt;pllarg);</div><div class='add'>+	cx24123_pll_writereg(fe, state-&gt;bandselectarg);</div><div class='add'>+	cx24123_pll_writereg(fe, state-&gt;pllarg);</div><div class='ctx'> </div><div class='ctx'> 	/* set the FILTUNE voltage */</div><div class='ctx'> 	val = cx24123_readreg(state, 0x28) &amp; ~0x3;</div><div class='hunk'>@@ -925,10 +924,10 @@ static int cx24123_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24123_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int cx24123_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("\n");</div><div class='ctx'> </div><div class='hunk'>@@ -936,16 +935,16 @@ static int cx24123_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 		state-&gt;config-&gt;set_ts_params(fe, 0);</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;currentfreq = p-&gt;frequency;</div><div class='del'>-	state-&gt;currentsymbolrate = p-&gt;u.qpsk.symbol_rate;</div><div class='add'>+	state-&gt;currentsymbolrate = p-&gt;symbol_rate;</div><div class='ctx'> </div><div class='ctx'> 	cx24123_set_inversion(state, p-&gt;inversion);</div><div class='del'>-	cx24123_set_fec(state, p-&gt;u.qpsk.fec_inner);</div><div class='del'>-	cx24123_set_symbolrate(state, p-&gt;u.qpsk.symbol_rate);</div><div class='add'>+	cx24123_set_fec(state, p-&gt;fec_inner);</div><div class='add'>+	cx24123_set_symbolrate(state, p-&gt;symbol_rate);</div><div class='ctx'> </div><div class='ctx'> 	if (!state-&gt;config-&gt;dont_use_pll)</div><div class='del'>-		cx24123_pll_tune(fe, p);</div><div class='add'>+		cx24123_pll_tune(fe);</div><div class='ctx'> 	else if (fe-&gt;ops.tuner_ops.set_params)</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 	else</div><div class='ctx'> 		err("it seems I don't have a tuner...");</div><div class='ctx'> </div><div class='hunk'>@@ -960,9 +959,9 @@ static int cx24123_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24123_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int cx24123_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("\n");</div><div class='hunk'>@@ -971,12 +970,12 @@ static int cx24123_get_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 		err("%s: Failed to get inversion status\n", __func__);</div><div class='ctx'> 		return -EREMOTEIO;</div><div class='ctx'> 	}</div><div class='del'>-	if (cx24123_get_fec(state, &amp;p-&gt;u.qpsk.fec_inner) != 0) {</div><div class='add'>+	if (cx24123_get_fec(state, &amp;p-&gt;fec_inner) != 0) {</div><div class='ctx'> 		err("%s: Failed to get fec status\n", __func__);</div><div class='ctx'> 		return -EREMOTEIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	p-&gt;frequency = state-&gt;currentfreq;</div><div class='del'>-	p-&gt;u.qpsk.symbol_rate = state-&gt;currentsymbolrate;</div><div class='add'>+	p-&gt;symbol_rate = state-&gt;currentsymbolrate;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1007,15 +1006,15 @@ static int cx24123_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cx24123_tune(struct dvb_frontend *fe,</div><div class='del'>-			struct dvb_frontend_parameters *params,</div><div class='add'>+			bool re_tune,</div><div class='ctx'> 			unsigned int mode_flags,</div><div class='ctx'> 			unsigned int *delay,</div><div class='ctx'> 			fe_status_t *status)</div><div class='ctx'> {</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='del'>-	if (params != NULL)</div><div class='del'>-		retval = cx24123_set_frontend(fe, params);</div><div class='add'>+	if (re_tune)</div><div class='add'>+		retval = cx24123_set_frontend(fe);</div><div class='ctx'> </div><div class='ctx'> 	if (!(mode_flags &amp; FE_TUNE_MODE_ONESHOT))</div><div class='ctx'> 		cx24123_read_status(fe, status);</div><div class='hunk'>@@ -1126,10 +1125,9 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(cx24123_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops cx24123_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "Conexant CX24123/CX24109",</div><div class='del'>-		.type = FE_QPSK,</div><div class='ctx'> 		.frequency_min = 950000,</div><div class='ctx'> 		.frequency_max = 2150000,</div><div class='ctx'> 		.frequency_stepsize = 1011, /* kHz for QPSK frontends */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cxd2820r.h b/drivers/media/dvb/frontends/cxd2820r.h<br/>index 03cab7b547fb..cf0f546aa1d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cxd2820r.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cxd2820r.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cxd2820r.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/cxd2820r.h</a></div><div class='hunk'>@@ -63,19 +63,6 @@ struct cxd2820r_config {</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool spec_inv;</div><div class='ctx'> </div><div class='del'>-	/* IFs for all used modes.</div><div class='del'>-	 * Default: none, must set</div><div class='del'>-	 * Values: &lt;kHz&gt;</div><div class='del'>-	 */</div><div class='del'>-	u16 if_dvbt_6;</div><div class='del'>-	u16 if_dvbt_7;</div><div class='del'>-	u16 if_dvbt_8;</div><div class='del'>-	u16 if_dvbt2_5;</div><div class='del'>-	u16 if_dvbt2_6;</div><div class='del'>-	u16 if_dvbt2_7;</div><div class='del'>-	u16 if_dvbt2_8;</div><div class='del'>-	u16 if_dvbc;</div><div class='del'>-</div><div class='ctx'> 	/* GPIOs for all used modes.</div><div class='ctx'> 	 * Default: none, disabled</div><div class='ctx'> 	 * Values: &lt;see above&gt;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cxd2820r_c.c b/drivers/media/dvb/frontends/cxd2820r_c.c<br/>index b85f5011e344..945404991529 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cxd2820r_c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cxd2820r_c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cxd2820r_c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/cxd2820r_c.c</a></div><div class='hunk'>@@ -21,13 +21,13 @@</div><div class='ctx'> </div><div class='ctx'> #include "cxd2820r_priv.h"</div><div class='ctx'> </div><div class='del'>-int cxd2820r_set_frontend_c(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *params)</div><div class='add'>+int cxd2820r_set_frontend_c(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct cxd2820r_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> 	u8 buf[2];</div><div class='add'>+	u32 if_freq;</div><div class='ctx'> 	u16 if_ctl;</div><div class='ctx'> 	u64 num;</div><div class='ctx'> 	struct reg_val_mask tab[] = {</div><div class='hunk'>@@ -56,9 +56,9 @@ int cxd2820r_set_frontend_c(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	/* program tuner */</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params)</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, params);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;delivery_system !=  SYS_DVBC_ANNEX_AC) {</div><div class='add'>+	if (priv-&gt;delivery_system !=  SYS_DVBC_ANNEX_A) {</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(tab); i++) {</div><div class='ctx'> 			ret = cxd2820r_wr_reg_mask(priv, tab[i].reg,</div><div class='ctx'> 				tab[i].val, tab[i].mask);</div><div class='hunk'>@@ -67,10 +67,20 @@ int cxd2820r_set_frontend_c(struct dvb_frontend *fe,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;delivery_system = SYS_DVBC_ANNEX_AC;</div><div class='add'>+	priv-&gt;delivery_system = SYS_DVBC_ANNEX_A;</div><div class='ctx'> 	priv-&gt;ber_running = 0; /* tune stops BER counter */</div><div class='ctx'> </div><div class='del'>-	num = priv-&gt;cfg.if_dvbc;</div><div class='add'>+	/* program IF frequency */</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.get_if_frequency) {</div><div class='add'>+		ret = fe-&gt;ops.tuner_ops.get_if_frequency(fe, &amp;if_freq);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	} else</div><div class='add'>+		if_freq = 0;</div><div class='add'>+</div><div class='add'>+	dbg("%s: if_freq=%d", __func__, if_freq);</div><div class='add'>+</div><div class='add'>+	num = if_freq / 1000; /* Hz =&gt; kHz */</div><div class='ctx'> 	num *= 0x4000;</div><div class='ctx'> 	if_ctl = cxd2820r_div_u64_round_closest(num, 41000);</div><div class='ctx'> 	buf[0] = (if_ctl &gt;&gt; 8) &amp; 0x3f;</div><div class='hunk'>@@ -94,8 +104,7 @@ error:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cxd2820r_get_frontend_c(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+int cxd2820r_get_frontend_c(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct cxd2820r_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cxd2820r_core.c b/drivers/media/dvb/frontends/cxd2820r_core.c<br/>index 036480f967b7..caae7f79c837 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cxd2820r_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cxd2820r_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cxd2820r_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/cxd2820r_core.c</a></div><div class='hunk'>@@ -240,422 +240,239 @@ error:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* lock FE */</div><div class='del'>-static int cxd2820r_lock(struct cxd2820r_priv *priv, int active_fe)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	dbg("%s: active_fe=%d", __func__, active_fe);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;fe_lock);</div><div class='del'>-</div><div class='del'>-	/* -1=NONE, 0=DVB-T/T2, 1=DVB-C */</div><div class='del'>-	if (priv-&gt;active_fe == active_fe)</div><div class='del'>-		;</div><div class='del'>-	else if (priv-&gt;active_fe == -1)</div><div class='del'>-		priv-&gt;active_fe = active_fe;</div><div class='del'>-	else</div><div class='del'>-		ret = -EBUSY;</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;fe_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unlock FE */</div><div class='del'>-static void cxd2820r_unlock(struct cxd2820r_priv *priv, int active_fe)</div><div class='del'>-{</div><div class='del'>-	dbg("%s: active_fe=%d", __func__, active_fe);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;fe_lock);</div><div class='del'>-</div><div class='del'>-	/* -1=NONE, 0=DVB-T/T2, 1=DVB-C */</div><div class='del'>-	if (priv-&gt;active_fe == active_fe)</div><div class='del'>-		priv-&gt;active_fe = -1;</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;fe_lock);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* 64 bit div with round closest, like DIV_ROUND_CLOSEST but 64 bit */</div><div class='ctx'> u32 cxd2820r_div_u64_round_closest(u64 dividend, u32 divisor)</div><div class='ctx'> {</div><div class='ctx'> 	return div_u64(dividend + (divisor / 2), divisor);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cxd2820r_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int cxd2820r_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='del'>-	struct cxd2820r_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	int ret;</div><div class='del'>-	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='ctx'> </div><div class='del'>-	if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='del'>-		/* DVB-T/T2 */</div><div class='del'>-		ret = cxd2820r_lock(priv, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		switch (priv-&gt;delivery_system) {</div><div class='del'>-		case SYS_UNDEFINED:</div><div class='del'>-			if (c-&gt;delivery_system == SYS_DVBT) {</div><div class='del'>-				/* SLEEP =&gt; DVB-T */</div><div class='del'>-				ret = cxd2820r_set_frontend_t(fe, p);</div><div class='del'>-			} else {</div><div class='del'>-				/* SLEEP =&gt; DVB-T2 */</div><div class='del'>-				ret = cxd2820r_set_frontend_t2(fe, p);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case SYS_DVBT:</div><div class='del'>-			if (c-&gt;delivery_system == SYS_DVBT) {</div><div class='del'>-				/* DVB-T =&gt; DVB-T */</div><div class='del'>-				ret = cxd2820r_set_frontend_t(fe, p);</div><div class='del'>-			} else if (c-&gt;delivery_system == SYS_DVBT2) {</div><div class='del'>-				/* DVB-T =&gt; DVB-T2 */</div><div class='del'>-				ret = cxd2820r_sleep_t(fe);</div><div class='del'>-				if (ret)</div><div class='del'>-					break;</div><div class='del'>-				ret = cxd2820r_set_frontend_t2(fe, p);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case SYS_DVBT2:</div><div class='del'>-			if (c-&gt;delivery_system == SYS_DVBT2) {</div><div class='del'>-				/* DVB-T2 =&gt; DVB-T2 */</div><div class='del'>-				ret = cxd2820r_set_frontend_t2(fe, p);</div><div class='del'>-			} else if (c-&gt;delivery_system == SYS_DVBT) {</div><div class='del'>-				/* DVB-T2 =&gt; DVB-T */</div><div class='del'>-				ret = cxd2820r_sleep_t2(fe);</div><div class='del'>-				if (ret)</div><div class='del'>-					break;</div><div class='del'>-				ret = cxd2820r_set_frontend_t(fe, p);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			dbg("%s: error state=%d", __func__,</div><div class='del'>-				priv-&gt;delivery_system);</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* DVB-C */</div><div class='del'>-		ret = cxd2820r_lock(priv, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		ret = cxd2820r_set_frontend_c(fe, p);</div><div class='add'>+	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='add'>+	switch (c-&gt;delivery_system) {</div><div class='add'>+	case SYS_DVBT:</div><div class='add'>+		ret = cxd2820r_init_t(fe);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err;</div><div class='add'>+		ret = cxd2820r_set_frontend_t(fe);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err;</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBT2:</div><div class='add'>+		ret = cxd2820r_init_t(fe);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err;</div><div class='add'>+		ret = cxd2820r_set_frontend_t2(fe);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err;</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='add'>+		ret = cxd2820r_init_c(fe);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err;</div><div class='add'>+		ret = cxd2820r_set_frontend_c(fe);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto err;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dbg("%s: error state=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> static int cxd2820r_read_status(struct dvb_frontend *fe, fe_status_t *status)</div><div class='ctx'> {</div><div class='del'>-	struct cxd2820r_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='del'>-	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='del'>-</div><div class='del'>-	if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='del'>-		/* DVB-T/T2 */</div><div class='del'>-		ret = cxd2820r_lock(priv, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		switch (fe-&gt;dtv_property_cache.delivery_system) {</div><div class='del'>-		case SYS_DVBT:</div><div class='del'>-			ret = cxd2820r_read_status_t(fe, status);</div><div class='del'>-			break;</div><div class='del'>-		case SYS_DVBT2:</div><div class='del'>-			ret = cxd2820r_read_status_t2(fe, status);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* DVB-C */</div><div class='del'>-		ret = cxd2820r_lock(priv, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='ctx'> </div><div class='add'>+	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='add'>+	switch (fe-&gt;dtv_property_cache.delivery_system) {</div><div class='add'>+	case SYS_DVBT:</div><div class='add'>+		ret = cxd2820r_read_status_t(fe, status);</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBT2:</div><div class='add'>+		ret = cxd2820r_read_status_t2(fe, status);</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='ctx'> 		ret = cxd2820r_read_status_c(fe, status);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cxd2820r_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int cxd2820r_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct cxd2820r_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='del'>-	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='ctx'> </div><div class='del'>-	if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='del'>-		/* DVB-T/T2 */</div><div class='del'>-		ret = cxd2820r_lock(priv, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='ctx'> </div><div class='del'>-		switch (fe-&gt;dtv_property_cache.delivery_system) {</div><div class='del'>-		case SYS_DVBT:</div><div class='del'>-			ret = cxd2820r_get_frontend_t(fe, p);</div><div class='del'>-			break;</div><div class='del'>-		case SYS_DVBT2:</div><div class='del'>-			ret = cxd2820r_get_frontend_t2(fe, p);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* DVB-C */</div><div class='del'>-		ret = cxd2820r_lock(priv, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+	if (priv-&gt;delivery_system == SYS_UNDEFINED)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		ret = cxd2820r_get_frontend_c(fe, p);</div><div class='add'>+	switch (fe-&gt;dtv_property_cache.delivery_system) {</div><div class='add'>+	case SYS_DVBT:</div><div class='add'>+		ret = cxd2820r_get_frontend_t(fe);</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBT2:</div><div class='add'>+		ret = cxd2820r_get_frontend_t2(fe);</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='add'>+		ret = cxd2820r_get_frontend_c(fe);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cxd2820r_read_ber(struct dvb_frontend *fe, u32 *ber)</div><div class='ctx'> {</div><div class='del'>-	struct cxd2820r_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='del'>-	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='del'>-</div><div class='del'>-	if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='del'>-		/* DVB-T/T2 */</div><div class='del'>-		ret = cxd2820r_lock(priv, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		switch (fe-&gt;dtv_property_cache.delivery_system) {</div><div class='del'>-		case SYS_DVBT:</div><div class='del'>-			ret = cxd2820r_read_ber_t(fe, ber);</div><div class='del'>-			break;</div><div class='del'>-		case SYS_DVBT2:</div><div class='del'>-			ret = cxd2820r_read_ber_t2(fe, ber);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* DVB-C */</div><div class='del'>-		ret = cxd2820r_lock(priv, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='ctx'> </div><div class='add'>+	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='add'>+	switch (fe-&gt;dtv_property_cache.delivery_system) {</div><div class='add'>+	case SYS_DVBT:</div><div class='add'>+		ret = cxd2820r_read_ber_t(fe, ber);</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBT2:</div><div class='add'>+		ret = cxd2820r_read_ber_t2(fe, ber);</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='ctx'> 		ret = cxd2820r_read_ber_c(fe, ber);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cxd2820r_read_signal_strength(struct dvb_frontend *fe, u16 *strength)</div><div class='ctx'> {</div><div class='del'>-	struct cxd2820r_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='del'>-	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='del'>-</div><div class='del'>-	if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='del'>-		/* DVB-T/T2 */</div><div class='del'>-		ret = cxd2820r_lock(priv, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		switch (fe-&gt;dtv_property_cache.delivery_system) {</div><div class='del'>-		case SYS_DVBT:</div><div class='del'>-			ret = cxd2820r_read_signal_strength_t(fe, strength);</div><div class='del'>-			break;</div><div class='del'>-		case SYS_DVBT2:</div><div class='del'>-			ret = cxd2820r_read_signal_strength_t2(fe, strength);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* DVB-C */</div><div class='del'>-		ret = cxd2820r_lock(priv, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='ctx'> </div><div class='add'>+	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='add'>+	switch (fe-&gt;dtv_property_cache.delivery_system) {</div><div class='add'>+	case SYS_DVBT:</div><div class='add'>+		ret = cxd2820r_read_signal_strength_t(fe, strength);</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBT2:</div><div class='add'>+		ret = cxd2820r_read_signal_strength_t2(fe, strength);</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='ctx'> 		ret = cxd2820r_read_signal_strength_c(fe, strength);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cxd2820r_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='ctx'> {</div><div class='del'>-	struct cxd2820r_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='del'>-	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='del'>-</div><div class='del'>-	if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='del'>-		/* DVB-T/T2 */</div><div class='del'>-		ret = cxd2820r_lock(priv, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		switch (fe-&gt;dtv_property_cache.delivery_system) {</div><div class='del'>-		case SYS_DVBT:</div><div class='del'>-			ret = cxd2820r_read_snr_t(fe, snr);</div><div class='del'>-			break;</div><div class='del'>-		case SYS_DVBT2:</div><div class='del'>-			ret = cxd2820r_read_snr_t2(fe, snr);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* DVB-C */</div><div class='del'>-		ret = cxd2820r_lock(priv, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='ctx'> </div><div class='add'>+	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='add'>+	switch (fe-&gt;dtv_property_cache.delivery_system) {</div><div class='add'>+	case SYS_DVBT:</div><div class='add'>+		ret = cxd2820r_read_snr_t(fe, snr);</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBT2:</div><div class='add'>+		ret = cxd2820r_read_snr_t2(fe, snr);</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='ctx'> 		ret = cxd2820r_read_snr_c(fe, snr);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cxd2820r_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='ctx'> {</div><div class='del'>-	struct cxd2820r_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='del'>-	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='del'>-</div><div class='del'>-	if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='del'>-		/* DVB-T/T2 */</div><div class='del'>-		ret = cxd2820r_lock(priv, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		switch (fe-&gt;dtv_property_cache.delivery_system) {</div><div class='del'>-		case SYS_DVBT:</div><div class='del'>-			ret = cxd2820r_read_ucblocks_t(fe, ucblocks);</div><div class='del'>-			break;</div><div class='del'>-		case SYS_DVBT2:</div><div class='del'>-			ret = cxd2820r_read_ucblocks_t2(fe, ucblocks);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* DVB-C */</div><div class='del'>-		ret = cxd2820r_lock(priv, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='ctx'> </div><div class='add'>+	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='add'>+	switch (fe-&gt;dtv_property_cache.delivery_system) {</div><div class='add'>+	case SYS_DVBT:</div><div class='add'>+		ret = cxd2820r_read_ucblocks_t(fe, ucblocks);</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBT2:</div><div class='add'>+		ret = cxd2820r_read_ucblocks_t2(fe, ucblocks);</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='ctx'> 		ret = cxd2820r_read_ucblocks_c(fe, ucblocks);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cxd2820r_init(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='del'>-	struct cxd2820r_priv *priv = fe-&gt;demodulator_priv;</div><div class='del'>-	int ret;</div><div class='del'>-	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='del'>-</div><div class='del'>-	priv-&gt;delivery_system = SYS_UNDEFINED;</div><div class='del'>-	/* delivery system is unknown at that (init) phase */</div><div class='del'>-</div><div class='del'>-	if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='del'>-		/* DVB-T/T2 */</div><div class='del'>-		ret = cxd2820r_lock(priv, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		ret = cxd2820r_init_t(fe);</div><div class='del'>-	} else {</div><div class='del'>-		/* DVB-C */</div><div class='del'>-		ret = cxd2820r_lock(priv, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		ret = cxd2820r_init_c(fe);</div><div class='del'>-	}</div><div class='del'>-</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 cxd2820r_sleep(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='del'>-	struct cxd2820r_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='del'>-	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='del'>-</div><div class='del'>-	if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='del'>-		/* DVB-T/T2 */</div><div class='del'>-		ret = cxd2820r_lock(priv, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		switch (fe-&gt;dtv_property_cache.delivery_system) {</div><div class='del'>-		case SYS_DVBT:</div><div class='del'>-			ret = cxd2820r_sleep_t(fe);</div><div class='del'>-			break;</div><div class='del'>-		case SYS_DVBT2:</div><div class='del'>-			ret = cxd2820r_sleep_t2(fe);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cxd2820r_unlock(priv, 0);</div><div class='del'>-	} else {</div><div class='del'>-		/* DVB-C */</div><div class='del'>-		ret = cxd2820r_lock(priv, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='ctx'> </div><div class='add'>+	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='add'>+	switch (fe-&gt;dtv_property_cache.delivery_system) {</div><div class='add'>+	case SYS_DVBT:</div><div class='add'>+		ret = cxd2820r_sleep_t(fe);</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBT2:</div><div class='add'>+		ret = cxd2820r_sleep_t2(fe);</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='ctx'> 		ret = cxd2820r_sleep_c(fe);</div><div class='del'>-</div><div class='del'>-		cxd2820r_unlock(priv, 1);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cxd2820r_get_tune_settings(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_tune_settings *s)</div><div class='add'>+				      struct dvb_frontend_tune_settings *s)</div><div class='ctx'> {</div><div class='del'>-	struct cxd2820r_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='del'>-	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='del'>-</div><div class='del'>-	if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='del'>-		/* DVB-T/T2 */</div><div class='del'>-		ret = cxd2820r_lock(priv, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		switch (fe-&gt;dtv_property_cache.delivery_system) {</div><div class='del'>-		case SYS_DVBT:</div><div class='del'>-			ret = cxd2820r_get_tune_settings_t(fe, s);</div><div class='del'>-			break;</div><div class='del'>-		case SYS_DVBT2:</div><div class='del'>-			ret = cxd2820r_get_tune_settings_t2(fe, s);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* DVB-C */</div><div class='del'>-		ret = cxd2820r_lock(priv, 1);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='ctx'> </div><div class='add'>+	dbg("%s: delsys=%d", __func__, fe-&gt;dtv_property_cache.delivery_system);</div><div class='add'>+	switch (fe-&gt;dtv_property_cache.delivery_system) {</div><div class='add'>+	case SYS_DVBT:</div><div class='add'>+		ret = cxd2820r_get_tune_settings_t(fe, s);</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBT2:</div><div class='add'>+		ret = cxd2820r_get_tune_settings_t2(fe, s);</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='ctx'> 		ret = cxd2820r_get_tune_settings_c(fe, s);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static enum dvbfe_search cxd2820r_search(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static enum dvbfe_search cxd2820r_search(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct cxd2820r_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='hunk'>@@ -667,12 +484,12 @@ static enum dvbfe_search cxd2820r_search(struct dvb_frontend *fe,</div><div class='ctx'> 	if (priv-&gt;last_tune_failed) {</div><div class='ctx'> 		if (priv-&gt;delivery_system == SYS_DVBT)</div><div class='ctx'> 			c-&gt;delivery_system = SYS_DVBT2;</div><div class='del'>-		else</div><div class='add'>+		else if (priv-&gt;delivery_system == SYS_DVBT2)</div><div class='ctx'> 			c-&gt;delivery_system = SYS_DVBT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set frontend */</div><div class='del'>-	ret = cxd2820r_set_frontend(fe, p);</div><div class='add'>+	ret = cxd2820r_set_frontend(fe);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -680,6 +497,7 @@ static enum dvbfe_search cxd2820r_search(struct dvb_frontend *fe,</div><div class='ctx'> 	/* frontend lock wait loop count */</div><div class='ctx'> 	switch (priv-&gt;delivery_system) {</div><div class='ctx'> 	case SYS_DVBT:</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='ctx'> 		i = 20;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SYS_DVBT2:</div><div class='hunk'>@@ -727,9 +545,7 @@ static void cxd2820r_release(struct dvb_frontend *fe)</div><div class='ctx'> 	struct cxd2820r_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	dbg("%s", __func__);</div><div class='ctx'> </div><div class='del'>-	if (fe-&gt;ops.info.type == FE_OFDM)</div><div class='del'>-		kfree(priv);</div><div class='del'>-</div><div class='add'>+	kfree(priv);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -742,128 +558,79 @@ static int cxd2820r_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)</div><div class='ctx'> 	return cxd2820r_wr_reg_mask(priv, 0xdb, enable ? 1 : 0, 0x1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct dvb_frontend_ops cxd2820r_ops[2];</div><div class='add'>+static const struct dvb_frontend_ops cxd2820r_ops = {</div><div class='add'>+	.delsys = { SYS_DVBT, SYS_DVBT2, SYS_DVBC_ANNEX_A },</div><div class='add'>+	/* default: DVB-T/T2 */</div><div class='add'>+	.info = {</div><div class='add'>+		.name = "Sony CXD2820R (DVB-T/T2)",</div><div class='add'>+</div><div class='add'>+		.caps =	FE_CAN_FEC_1_2			|</div><div class='add'>+			FE_CAN_FEC_2_3			|</div><div class='add'>+			FE_CAN_FEC_3_4			|</div><div class='add'>+			FE_CAN_FEC_5_6			|</div><div class='add'>+			FE_CAN_FEC_7_8			|</div><div class='add'>+			FE_CAN_FEC_AUTO			|</div><div class='add'>+			FE_CAN_QPSK			|</div><div class='add'>+			FE_CAN_QAM_16			|</div><div class='add'>+			FE_CAN_QAM_64			|</div><div class='add'>+			FE_CAN_QAM_256			|</div><div class='add'>+			FE_CAN_QAM_AUTO			|</div><div class='add'>+			FE_CAN_TRANSMISSION_MODE_AUTO	|</div><div class='add'>+			FE_CAN_GUARD_INTERVAL_AUTO	|</div><div class='add'>+			FE_CAN_HIERARCHY_AUTO		|</div><div class='add'>+			FE_CAN_MUTE_TS			|</div><div class='add'>+			FE_CAN_2G_MODULATION</div><div class='add'>+		},</div><div class='ctx'> </div><div class='del'>-struct dvb_frontend *cxd2820r_attach(const struct cxd2820r_config *cfg,</div><div class='del'>-	struct i2c_adapter *i2c, struct dvb_frontend *fe)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct cxd2820r_priv *priv = NULL;</div><div class='del'>-	u8 tmp;</div><div class='add'>+	.release		= cxd2820r_release,</div><div class='add'>+	.init			= cxd2820r_init,</div><div class='add'>+	.sleep			= cxd2820r_sleep,</div><div class='ctx'> </div><div class='del'>-	if (fe == NULL) {</div><div class='del'>-		/* FE0 */</div><div class='del'>-		/* allocate memory for the internal priv */</div><div class='del'>-		priv = kzalloc(sizeof(struct cxd2820r_priv), GFP_KERNEL);</div><div class='del'>-		if (priv == NULL)</div><div class='del'>-			goto error;</div><div class='add'>+	.get_tune_settings	= cxd2820r_get_tune_settings,</div><div class='add'>+	.i2c_gate_ctrl		= cxd2820r_i2c_gate_ctrl,</div><div class='ctx'> </div><div class='del'>-		/* setup the priv */</div><div class='del'>-		priv-&gt;i2c = i2c;</div><div class='del'>-		memcpy(&amp;priv-&gt;cfg, cfg, sizeof(struct cxd2820r_config));</div><div class='del'>-		mutex_init(&amp;priv-&gt;fe_lock);</div><div class='add'>+	.get_frontend		= cxd2820r_get_frontend,</div><div class='ctx'> </div><div class='del'>-		priv-&gt;active_fe = -1; /* NONE */</div><div class='add'>+	.get_frontend_algo	= cxd2820r_get_frontend_algo,</div><div class='add'>+	.search			= cxd2820r_search,</div><div class='ctx'> </div><div class='del'>-		/* check if the demod is there */</div><div class='del'>-		priv-&gt;bank[0] = priv-&gt;bank[1] = 0xff;</div><div class='del'>-		ret = cxd2820r_rd_reg(priv, 0x000fd, &amp;tmp);</div><div class='del'>-		dbg("%s: chip id=%02x", __func__, tmp);</div><div class='del'>-		if (ret || tmp != 0xe1)</div><div class='del'>-			goto error;</div><div class='add'>+	.read_status		= cxd2820r_read_status,</div><div class='add'>+	.read_snr		= cxd2820r_read_snr,</div><div class='add'>+	.read_ber		= cxd2820r_read_ber,</div><div class='add'>+	.read_ucblocks		= cxd2820r_read_ucblocks,</div><div class='add'>+	.read_signal_strength	= cxd2820r_read_signal_strength,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		/* create frontends */</div><div class='del'>-		memcpy(&amp;priv-&gt;fe[0].ops, &amp;cxd2820r_ops[0],</div><div class='del'>-			sizeof(struct dvb_frontend_ops));</div><div class='del'>-		memcpy(&amp;priv-&gt;fe[1].ops, &amp;cxd2820r_ops[1],</div><div class='del'>-			sizeof(struct dvb_frontend_ops));</div><div class='add'>+struct dvb_frontend *cxd2820r_attach(const struct cxd2820r_config *cfg,</div><div class='add'>+				     struct i2c_adapter *i2c,</div><div class='add'>+				     struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct cxd2820r_priv *priv = NULL;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 tmp;</div><div class='ctx'> </div><div class='del'>-		priv-&gt;fe[0].demodulator_priv = priv;</div><div class='del'>-		priv-&gt;fe[1].demodulator_priv = priv;</div><div class='add'>+	priv = kzalloc(sizeof (struct cxd2820r_priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='del'>-		return &amp;priv-&gt;fe[0];</div><div class='add'>+	priv-&gt;i2c = i2c;</div><div class='add'>+	memcpy(&amp;priv-&gt;cfg, cfg, sizeof (struct cxd2820r_config));</div><div class='ctx'> </div><div class='del'>-	} else {</div><div class='del'>-		/* FE1: FE0 given as pointer, just return FE1 we have</div><div class='del'>-		 * already created */</div><div class='del'>-		priv = fe-&gt;demodulator_priv;</div><div class='del'>-		return &amp;priv-&gt;fe[1];</div><div class='del'>-	}</div><div class='add'>+	priv-&gt;bank[0] = priv-&gt;bank[1] = 0xff;</div><div class='add'>+	ret = cxd2820r_rd_reg(priv, 0x000fd, &amp;tmp);</div><div class='add'>+	dbg("%s: chip id=%02x", __func__, tmp);</div><div class='add'>+	if (ret || tmp != 0xe1)</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='add'>+	memcpy(&amp;priv-&gt;fe.ops, &amp;cxd2820r_ops, sizeof (struct dvb_frontend_ops));</div><div class='add'>+	priv-&gt;fe.demodulator_priv = priv;</div><div class='add'>+	return &amp;priv-&gt;fe;</div><div class='ctx'> error:</div><div class='ctx'> 	kfree(priv);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(cxd2820r_attach);</div><div class='ctx'> </div><div class='del'>-static const struct dvb_frontend_ops cxd2820r_ops[2] = {</div><div class='del'>-	{</div><div class='del'>-		/* DVB-T/T2 */</div><div class='del'>-		.info = {</div><div class='del'>-			.name = "Sony CXD2820R (DVB-T/T2)",</div><div class='del'>-			.type = FE_OFDM,</div><div class='del'>-			.caps =</div><div class='del'>-				FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 |</div><div class='del'>-				FE_CAN_FEC_3_4 | FE_CAN_FEC_5_6 |</div><div class='del'>-				FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |</div><div class='del'>-				FE_CAN_QPSK | FE_CAN_QAM_16 |</div><div class='del'>-				FE_CAN_QAM_64 | FE_CAN_QAM_256 |</div><div class='del'>-				FE_CAN_QAM_AUTO |</div><div class='del'>-				FE_CAN_TRANSMISSION_MODE_AUTO |</div><div class='del'>-				FE_CAN_GUARD_INTERVAL_AUTO |</div><div class='del'>-				FE_CAN_HIERARCHY_AUTO |</div><div class='del'>-				FE_CAN_MUTE_TS |</div><div class='del'>-				FE_CAN_2G_MODULATION</div><div class='del'>-		},</div><div class='del'>-</div><div class='del'>-		.release = cxd2820r_release,</div><div class='del'>-		.init = cxd2820r_init,</div><div class='del'>-		.sleep = cxd2820r_sleep,</div><div class='del'>-</div><div class='del'>-		.get_tune_settings = cxd2820r_get_tune_settings,</div><div class='del'>-		.i2c_gate_ctrl = cxd2820r_i2c_gate_ctrl,</div><div class='del'>-</div><div class='del'>-		.get_frontend = cxd2820r_get_frontend,</div><div class='del'>-</div><div class='del'>-		.get_frontend_algo = cxd2820r_get_frontend_algo,</div><div class='del'>-		.search = cxd2820r_search,</div><div class='del'>-</div><div class='del'>-		.read_status = cxd2820r_read_status,</div><div class='del'>-		.read_snr = cxd2820r_read_snr,</div><div class='del'>-		.read_ber = cxd2820r_read_ber,</div><div class='del'>-		.read_ucblocks = cxd2820r_read_ucblocks,</div><div class='del'>-		.read_signal_strength = cxd2820r_read_signal_strength,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		/* DVB-C */</div><div class='del'>-		.info = {</div><div class='del'>-			.name = "Sony CXD2820R (DVB-C)",</div><div class='del'>-			.type = FE_QAM,</div><div class='del'>-			.caps =</div><div class='del'>-				FE_CAN_QAM_16 | FE_CAN_QAM_32 | FE_CAN_QAM_64 |</div><div class='del'>-				FE_CAN_QAM_128 | FE_CAN_QAM_256 |</div><div class='del'>-				FE_CAN_FEC_AUTO</div><div class='del'>-		},</div><div class='del'>-</div><div class='del'>-		.release = cxd2820r_release,</div><div class='del'>-		.init = cxd2820r_init,</div><div class='del'>-		.sleep = cxd2820r_sleep,</div><div class='del'>-</div><div class='del'>-		.get_tune_settings = cxd2820r_get_tune_settings,</div><div class='del'>-		.i2c_gate_ctrl = cxd2820r_i2c_gate_ctrl,</div><div class='del'>-</div><div class='del'>-		.set_frontend = cxd2820r_set_frontend,</div><div class='del'>-		.get_frontend = cxd2820r_get_frontend,</div><div class='del'>-</div><div class='del'>-		.read_status = cxd2820r_read_status,</div><div class='del'>-		.read_snr = cxd2820r_read_snr,</div><div class='del'>-		.read_ber = cxd2820r_read_ber,</div><div class='del'>-		.read_ucblocks = cxd2820r_read_ucblocks,</div><div class='del'>-		.read_signal_strength = cxd2820r_read_signal_strength,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Antti Palosaari &lt;crope@iki.fi&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Sony CXD2820R demodulator driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cxd2820r_priv.h b/drivers/media/dvb/frontends/cxd2820r_priv.h<br/>index 95539134efdb..9a9822cad9cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cxd2820r_priv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cxd2820r_priv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cxd2820r_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/cxd2820r_priv.h</a></div><div class='hunk'>@@ -48,12 +48,9 @@ struct reg_val_mask {</div><div class='ctx'> </div><div class='ctx'> struct cxd2820r_priv {</div><div class='ctx'> 	struct i2c_adapter *i2c;</div><div class='del'>-	struct dvb_frontend fe[2];</div><div class='add'>+	struct dvb_frontend fe;</div><div class='ctx'> 	struct cxd2820r_config cfg;</div><div class='ctx'> </div><div class='del'>-	struct mutex fe_lock; /* FE lock */</div><div class='del'>-	int active_fe:2; /* FE lock, -1=NONE, 0=DVB-T/T2, 1=DVB-C */</div><div class='del'>-</div><div class='ctx'> 	bool ber_running;</div><div class='ctx'> </div><div class='ctx'> 	u8 bank[2];</div><div class='hunk'>@@ -89,11 +86,9 @@ int cxd2820r_rd_reg(struct cxd2820r_priv *priv, u32 reg, u8 *val);</div><div class='ctx'> </div><div class='ctx'> /* cxd2820r_c.c */</div><div class='ctx'> </div><div class='del'>-int cxd2820r_get_frontend_c(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p);</div><div class='add'>+int cxd2820r_get_frontend_c(struct dvb_frontend *fe);</div><div class='ctx'> </div><div class='del'>-int cxd2820r_set_frontend_c(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *params);</div><div class='add'>+int cxd2820r_set_frontend_c(struct dvb_frontend *fe);</div><div class='ctx'> </div><div class='ctx'> int cxd2820r_read_status_c(struct dvb_frontend *fe, fe_status_t *status);</div><div class='ctx'> </div><div class='hunk'>@@ -114,11 +109,9 @@ int cxd2820r_get_tune_settings_c(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> /* cxd2820r_t.c */</div><div class='ctx'> </div><div class='del'>-int cxd2820r_get_frontend_t(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p);</div><div class='add'>+int cxd2820r_get_frontend_t(struct dvb_frontend *fe);</div><div class='ctx'> </div><div class='del'>-int cxd2820r_set_frontend_t(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *params);</div><div class='add'>+int cxd2820r_set_frontend_t(struct dvb_frontend *fe);</div><div class='ctx'> </div><div class='ctx'> int cxd2820r_read_status_t(struct dvb_frontend *fe, fe_status_t *status);</div><div class='ctx'> </div><div class='hunk'>@@ -139,11 +132,9 @@ int cxd2820r_get_tune_settings_t(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> /* cxd2820r_t2.c */</div><div class='ctx'> </div><div class='del'>-int cxd2820r_get_frontend_t2(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p);</div><div class='add'>+int cxd2820r_get_frontend_t2(struct dvb_frontend *fe);</div><div class='ctx'> </div><div class='del'>-int cxd2820r_set_frontend_t2(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *params);</div><div class='add'>+int cxd2820r_set_frontend_t2(struct dvb_frontend *fe);</div><div class='ctx'> </div><div class='ctx'> int cxd2820r_read_status_t2(struct dvb_frontend *fe, fe_status_t *status);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/cxd2820r_t.c b/drivers/media/dvb/frontends/cxd2820r_t.c<br/>index a04f9c810101..1a026239cdcc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cxd2820r_t.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cxd2820r_t.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cxd2820r_t.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/cxd2820r_t.c</a></div><div class='hunk'>@@ -21,13 +21,12 @@</div><div class='ctx'> </div><div class='ctx'> #include "cxd2820r_priv.h"</div><div class='ctx'> </div><div class='del'>-int cxd2820r_set_frontend_t(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+int cxd2820r_set_frontend_t(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct cxd2820r_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='del'>-	int ret, i;</div><div class='del'>-	u32 if_khz, if_ctl;</div><div class='add'>+	int ret, i, bw_i;</div><div class='add'>+	u32 if_freq, if_ctl;</div><div class='ctx'> 	u64 num;</div><div class='ctx'> 	u8 buf[3], bw_param;</div><div class='ctx'> 	u8 bw_params1[][5] = {</div><div class='hunk'>@@ -57,6 +56,23 @@ int cxd2820r_set_frontend_t(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s: RF=%d BW=%d", __func__, c-&gt;frequency, c-&gt;bandwidth_hz);</div><div class='ctx'> </div><div class='add'>+	switch (c-&gt;bandwidth_hz) {</div><div class='add'>+	case 6000000:</div><div class='add'>+		bw_i = 0;</div><div class='add'>+		bw_param = 2;</div><div class='add'>+		break;</div><div class='add'>+	case 7000000:</div><div class='add'>+		bw_i = 1;</div><div class='add'>+		bw_param = 1;</div><div class='add'>+		break;</div><div class='add'>+	case 8000000:</div><div class='add'>+		bw_i = 2;</div><div class='add'>+		bw_param = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* update GPIOs */</div><div class='ctx'> 	ret = cxd2820r_gpio(fe);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -64,7 +80,7 @@ int cxd2820r_set_frontend_t(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	/* program tuner */</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params)</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;delivery_system != SYS_DVBT) {</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(tab); i++) {</div><div class='hunk'>@@ -78,27 +94,17 @@ int cxd2820r_set_frontend_t(struct dvb_frontend *fe,</div><div class='ctx'> 	priv-&gt;delivery_system = SYS_DVBT;</div><div class='ctx'> 	priv-&gt;ber_running = 0; /* tune stops BER counter */</div><div class='ctx'> </div><div class='del'>-	switch (c-&gt;bandwidth_hz) {</div><div class='del'>-	case 6000000:</div><div class='del'>-		if_khz = priv-&gt;cfg.if_dvbt_6;</div><div class='del'>-		i = 0;</div><div class='del'>-		bw_param = 2;</div><div class='del'>-		break;</div><div class='del'>-	case 7000000:</div><div class='del'>-		if_khz = priv-&gt;cfg.if_dvbt_7;</div><div class='del'>-		i = 1;</div><div class='del'>-		bw_param = 1;</div><div class='del'>-		break;</div><div class='del'>-	case 8000000:</div><div class='del'>-		if_khz = priv-&gt;cfg.if_dvbt_8;</div><div class='del'>-		i = 2;</div><div class='del'>-		bw_param = 0;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	/* program IF frequency */</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.get_if_frequency) {</div><div class='add'>+		ret = fe-&gt;ops.tuner_ops.get_if_frequency(fe, &amp;if_freq);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	} else</div><div class='add'>+		if_freq = 0;</div><div class='add'>+</div><div class='add'>+	dbg("%s: if_freq=%d", __func__, if_freq);</div><div class='ctx'> </div><div class='del'>-	num = if_khz;</div><div class='add'>+	num = if_freq / 1000; /* Hz =&gt; kHz */</div><div class='ctx'> 	num *= 0x1000000;</div><div class='ctx'> 	if_ctl = cxd2820r_div_u64_round_closest(num, 41000);</div><div class='ctx'> 	buf[0] = ((if_ctl &gt;&gt; 16) &amp; 0xff);</div><div class='hunk'>@@ -109,7 +115,7 @@ int cxd2820r_set_frontend_t(struct dvb_frontend *fe,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	ret = cxd2820r_wr_regs(priv, 0x0009f, bw_params1[i], 5);</div><div class='add'>+	ret = cxd2820r_wr_regs(priv, 0x0009f, bw_params1[bw_i], 5);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -117,7 +123,7 @@ int cxd2820r_set_frontend_t(struct dvb_frontend *fe,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	ret = cxd2820r_wr_regs(priv, 0x000d9, bw_params2[i], 2);</div><div class='add'>+	ret = cxd2820r_wr_regs(priv, 0x000d9, bw_params2[bw_i], 2);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -135,8 +141,7 @@ error:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cxd2820r_get_frontend_t(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+int cxd2820r_get_frontend_t(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct cxd2820r_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cxd2820r_t2.c b/drivers/media/dvb/frontends/cxd2820r_t2.c<br/>index 6548588309f7..3a5759e0d235 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cxd2820r_t2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/cxd2820r_t2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cxd2820r_t2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/cxd2820r_t2.c</a></div><div class='hunk'>@@ -21,13 +21,12 @@</div><div class='ctx'> </div><div class='ctx'> #include "cxd2820r_priv.h"</div><div class='ctx'> </div><div class='del'>-int cxd2820r_set_frontend_t2(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *params)</div><div class='add'>+int cxd2820r_set_frontend_t2(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct cxd2820r_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='del'>-	int ret, i;</div><div class='del'>-	u32 if_khz, if_ctl;</div><div class='add'>+	int ret, i, bw_i;</div><div class='add'>+	u32 if_freq, if_ctl;</div><div class='ctx'> 	u64 num;</div><div class='ctx'> 	u8 buf[3], bw_param;</div><div class='ctx'> 	u8 bw_params1[][5] = {</div><div class='hunk'>@@ -71,6 +70,27 @@ int cxd2820r_set_frontend_t2(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s: RF=%d BW=%d", __func__, c-&gt;frequency, c-&gt;bandwidth_hz);</div><div class='ctx'> </div><div class='add'>+	switch (c-&gt;bandwidth_hz) {</div><div class='add'>+	case 5000000:</div><div class='add'>+		bw_i = 0;</div><div class='add'>+		bw_param = 3;</div><div class='add'>+		break;</div><div class='add'>+	case 6000000:</div><div class='add'>+		bw_i = 1;</div><div class='add'>+		bw_param = 2;</div><div class='add'>+		break;</div><div class='add'>+	case 7000000:</div><div class='add'>+		bw_i = 2;</div><div class='add'>+		bw_param = 1;</div><div class='add'>+		break;</div><div class='add'>+	case 8000000:</div><div class='add'>+		bw_i = 3;</div><div class='add'>+		bw_param = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* update GPIOs */</div><div class='ctx'> 	ret = cxd2820r_gpio(fe);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -78,7 +98,7 @@ int cxd2820r_set_frontend_t2(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	/* program tuner */</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params)</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, params);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;delivery_system != SYS_DVBT2) {</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(tab); i++) {</div><div class='hunk'>@@ -91,32 +111,17 @@ int cxd2820r_set_frontend_t2(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;delivery_system = SYS_DVBT2;</div><div class='ctx'> </div><div class='del'>-	switch (c-&gt;bandwidth_hz) {</div><div class='del'>-	case 5000000:</div><div class='del'>-		if_khz = priv-&gt;cfg.if_dvbt2_5;</div><div class='del'>-		i = 0;</div><div class='del'>-		bw_param = 3;</div><div class='del'>-		break;</div><div class='del'>-	case 6000000:</div><div class='del'>-		if_khz = priv-&gt;cfg.if_dvbt2_6;</div><div class='del'>-		i = 1;</div><div class='del'>-		bw_param = 2;</div><div class='del'>-		break;</div><div class='del'>-	case 7000000:</div><div class='del'>-		if_khz = priv-&gt;cfg.if_dvbt2_7;</div><div class='del'>-		i = 2;</div><div class='del'>-		bw_param = 1;</div><div class='del'>-		break;</div><div class='del'>-	case 8000000:</div><div class='del'>-		if_khz = priv-&gt;cfg.if_dvbt2_8;</div><div class='del'>-		i = 3;</div><div class='del'>-		bw_param = 0;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	/* program IF frequency */</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.get_if_frequency) {</div><div class='add'>+		ret = fe-&gt;ops.tuner_ops.get_if_frequency(fe, &amp;if_freq);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	} else</div><div class='add'>+		if_freq = 0;</div><div class='add'>+</div><div class='add'>+	dbg("%s: if_freq=%d", __func__, if_freq);</div><div class='ctx'> </div><div class='del'>-	num = if_khz;</div><div class='add'>+	num = if_freq / 1000; /* Hz =&gt; kHz */</div><div class='ctx'> 	num *= 0x1000000;</div><div class='ctx'> 	if_ctl = cxd2820r_div_u64_round_closest(num, 41000);</div><div class='ctx'> 	buf[0] = ((if_ctl &gt;&gt; 16) &amp; 0xff);</div><div class='hunk'>@@ -127,7 +132,7 @@ int cxd2820r_set_frontend_t2(struct dvb_frontend *fe,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	ret = cxd2820r_wr_regs(priv, 0x0209f, bw_params1[i], 5);</div><div class='add'>+	ret = cxd2820r_wr_regs(priv, 0x0209f, bw_params1[bw_i], 5);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -150,8 +155,7 @@ error:</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cxd2820r_get_frontend_t2(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+int cxd2820r_get_frontend_t2(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct cxd2820r_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib0070.c b/drivers/media/dvb/frontends/dib0070.c<br/>index dc1cb17a6ea7..3b024bfe980a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib0070.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib0070.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib0070.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/dib0070.c</a></div><div class='hunk'>@@ -150,7 +150,7 @@ static int dib0070_write_reg(struct dib0070_state *state, u8 reg, u16 val)</div><div class='ctx'>     } \</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-static int dib0070_set_bandwidth(struct dvb_frontend *fe, struct dvb_frontend_parameters *ch)</div><div class='add'>+static int dib0070_set_bandwidth(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'>     struct dib0070_state *state = fe-&gt;tuner_priv;</div><div class='ctx'>     u16 tmp = dib0070_read_reg(state, 0x02) &amp; 0x3fff;</div><div class='hunk'>@@ -335,7 +335,7 @@ static const struct dib0070_lna_match dib0070_lna[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define LPF	100</div><div class='del'>-static int dib0070_tune_digital(struct dvb_frontend *fe, struct dvb_frontend_parameters *ch)</div><div class='add'>+static int dib0070_tune_digital(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'>     struct dib0070_state *state = fe-&gt;tuner_priv;</div><div class='ctx'> </div><div class='hunk'>@@ -507,7 +507,7 @@ static int dib0070_tune_digital(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> </div><div class='ctx'> 	*tune_state = CT_TUNER_STEP_5;</div><div class='ctx'>     } else if (*tune_state == CT_TUNER_STEP_5) {</div><div class='del'>-	dib0070_set_bandwidth(fe, ch);</div><div class='add'>+	dib0070_set_bandwidth(fe);</div><div class='ctx'> 	*tune_state = CT_TUNER_STOP;</div><div class='ctx'>     } else {</div><div class='ctx'> 	ret = FE_CALLBACK_TIME_NEVER; /* tuner finished, time to call again infinite */</div><div class='hunk'>@@ -516,7 +516,7 @@ static int dib0070_tune_digital(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int dib0070_tune(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int dib0070_tune(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'>     struct dib0070_state *state = fe-&gt;tuner_priv;</div><div class='ctx'>     uint32_t ret;</div><div class='hunk'>@@ -524,7 +524,7 @@ static int dib0070_tune(struct dvb_frontend *fe, struct dvb_frontend_parameters</div><div class='ctx'>     state-&gt;tune_state = CT_TUNER_START;</div><div class='ctx'> </div><div class='ctx'>     do {</div><div class='del'>-	ret = dib0070_tune_digital(fe, p);</div><div class='add'>+	ret = dib0070_tune_digital(fe);</div><div class='ctx'> 	if (ret != FE_CALLBACK_TIME_NEVER)</div><div class='ctx'> 		msleep(ret/10);</div><div class='ctx'> 	else</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib0090.c b/drivers/media/dvb/frontends/dib0090.c<br/>index b174d1c78583..224d81e85091 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib0090.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib0090.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib0090.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/dib0090.c</a></div><div class='hunk'>@@ -717,6 +717,34 @@ static const u16 rf_ramp_pwm_cband_7090[] = {</div><div class='ctx'> 	(0 &lt;&lt; 10) | 109,	/* RF_RAMP4, LNA 4 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const uint16_t rf_ramp_pwm_cband_7090e_sensitivity[] = {</div><div class='add'>+	186,</div><div class='add'>+	40,</div><div class='add'>+	746,</div><div class='add'>+	(10 &lt;&lt; 10) | 345,</div><div class='add'>+	(0  &lt;&lt; 10) | 746,</div><div class='add'>+	(0 &lt;&lt; 10) | 0,</div><div class='add'>+	(0  &lt;&lt; 10) | 0,</div><div class='add'>+	(28 &lt;&lt; 10) | 200,</div><div class='add'>+	(0  &lt;&lt; 10) | 345,</div><div class='add'>+	(20 &lt;&lt; 10) | 0,</div><div class='add'>+	(0  &lt;&lt; 10) | 200,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const uint16_t rf_ramp_pwm_cband_7090e_aci[] = {</div><div class='add'>+	86,</div><div class='add'>+	40,</div><div class='add'>+	345,</div><div class='add'>+	(0 &lt;&lt; 10) | 0,</div><div class='add'>+	(0 &lt;&lt; 10) | 0,</div><div class='add'>+	(0 &lt;&lt; 10) | 0,</div><div class='add'>+	(0 &lt;&lt; 10) | 0,</div><div class='add'>+	(28 &lt;&lt; 10) | 200,</div><div class='add'>+	(0  &lt;&lt; 10) | 345,</div><div class='add'>+	(20 &lt;&lt; 10) | 0,</div><div class='add'>+	(0  &lt;&lt; 10) | 200,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const u16 rf_ramp_pwm_cband_8090[] = {</div><div class='ctx'> 	345,			/* max RF gain in 10th of dB */</div><div class='ctx'> 	29,			/* ramp_slope = 1dB of gain -&gt; clock_ticks_per_db = clk_khz / ramp_slope -&gt; RF_RAMP2 */</div><div class='hunk'>@@ -1076,8 +1104,16 @@ void dib0090_pwm_gain_reset(struct dvb_frontend *fe)</div><div class='ctx'> 				dib0090_set_bbramp_pwm(state, bb_ramp_pwm_normal_socs);</div><div class='ctx'> 				if (state-&gt;identity.version == SOC_8090_P1G_11R1 || state-&gt;identity.version == SOC_8090_P1G_21R1)</div><div class='ctx'> 					dib0090_set_rframp_pwm(state, rf_ramp_pwm_cband_8090);</div><div class='del'>-				else if (state-&gt;identity.version == SOC_7090_P1G_11R1 || state-&gt;identity.version == SOC_7090_P1G_21R1)</div><div class='del'>-					dib0090_set_rframp_pwm(state, rf_ramp_pwm_cband_7090);</div><div class='add'>+				else if (state-&gt;identity.version == SOC_7090_P1G_11R1</div><div class='add'>+						|| state-&gt;identity.version == SOC_7090_P1G_21R1) {</div><div class='add'>+					if (state-&gt;config-&gt;is_dib7090e) {</div><div class='add'>+						if (state-&gt;rf_ramp == NULL)</div><div class='add'>+							dib0090_set_rframp_pwm(state, rf_ramp_pwm_cband_7090e_sensitivity);</div><div class='add'>+						else</div><div class='add'>+							dib0090_set_rframp_pwm(state, state-&gt;rf_ramp);</div><div class='add'>+					} else</div><div class='add'>+						dib0090_set_rframp_pwm(state, rf_ramp_pwm_cband_7090);</div><div class='add'>+				}</div><div class='ctx'> 			} else {</div><div class='ctx'> 				dib0090_set_rframp_pwm(state, rf_ramp_pwm_cband);</div><div class='ctx'> 				dib0090_set_bbramp_pwm(state, bb_ramp_pwm_normal);</div><div class='hunk'>@@ -1112,13 +1148,21 @@ void dib0090_pwm_gain_reset(struct dvb_frontend *fe)</div><div class='ctx'> 		else</div><div class='ctx'> 			dib0090_write_reg(state, 0x32, (0 &lt;&lt; 11));</div><div class='ctx'> </div><div class='del'>-		dib0090_write_reg(state, 0x04, 0x01);</div><div class='add'>+		dib0090_write_reg(state, 0x04, 0x03);</div><div class='ctx'> 		dib0090_write_reg(state, 0x39, (1 &lt;&lt; 10));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(dib0090_pwm_gain_reset);</div><div class='ctx'> </div><div class='add'>+void dib0090_set_dc_servo(struct dvb_frontend *fe, u8 DC_servo_cutoff)</div><div class='add'>+{</div><div class='add'>+	struct dib0090_state *state = fe-&gt;tuner_priv;</div><div class='add'>+	if (DC_servo_cutoff &lt; 4)</div><div class='add'>+		dib0090_write_reg(state, 0x04, DC_servo_cutoff);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dib0090_set_dc_servo);</div><div class='add'>+</div><div class='ctx'> static u32 dib0090_get_slow_adc_val(struct dib0090_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	u16 adc_val = dib0090_read_reg(state, 0x1d);</div><div class='hunk'>@@ -1305,7 +1349,7 @@ void dib0090_get_current_gain(struct dvb_frontend *fe, u16 * rf, u16 * bb, u16 *</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(dib0090_get_current_gain);</div><div class='ctx'> </div><div class='del'>-u16 dib0090_get_wbd_offset(struct dvb_frontend *fe)</div><div class='add'>+u16 dib0090_get_wbd_target(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib0090_state *state = fe-&gt;tuner_priv;</div><div class='ctx'> 	u32 f_MHz = state-&gt;fe-&gt;dtv_property_cache.frequency / 1000000;</div><div class='hunk'>@@ -1342,9 +1386,57 @@ u16 dib0090_get_wbd_offset(struct dvb_frontend *fe)</div><div class='ctx'> </div><div class='ctx'> 	return state-&gt;wbd_offset + wbd_tcold;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(dib0090_get_wbd_target);</div><div class='ctx'> </div><div class='add'>+u16 dib0090_get_wbd_offset(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct dib0090_state *state = fe-&gt;tuner_priv;</div><div class='add'>+	return state-&gt;wbd_offset;</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(dib0090_get_wbd_offset);</div><div class='ctx'> </div><div class='add'>+int dib0090_set_switch(struct dvb_frontend *fe, u8 sw1, u8 sw2, u8 sw3)</div><div class='add'>+{</div><div class='add'>+	struct dib0090_state *state = fe-&gt;tuner_priv;</div><div class='add'>+</div><div class='add'>+	dib0090_write_reg(state, 0x0b, (dib0090_read_reg(state, 0x0b) &amp; 0xfff8)</div><div class='add'>+			| ((sw3 &amp; 1) &lt;&lt; 2) | ((sw2 &amp; 1) &lt;&lt; 1) | (sw1 &amp; 1));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dib0090_set_switch);</div><div class='add'>+</div><div class='add'>+int dib0090_set_vga(struct dvb_frontend *fe, u8 onoff)</div><div class='add'>+{</div><div class='add'>+	struct dib0090_state *state = fe-&gt;tuner_priv;</div><div class='add'>+</div><div class='add'>+	dib0090_write_reg(state, 0x09, (dib0090_read_reg(state, 0x09) &amp; 0x7fff)</div><div class='add'>+			| ((onoff &amp; 1) &lt;&lt; 15));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dib0090_set_vga);</div><div class='add'>+</div><div class='add'>+int dib0090_update_rframp_7090(struct dvb_frontend *fe, u8 cfg_sensitivity)</div><div class='add'>+{</div><div class='add'>+	struct dib0090_state *state = fe-&gt;tuner_priv;</div><div class='add'>+</div><div class='add'>+	if ((!state-&gt;identity.p1g) || (!state-&gt;identity.in_soc)</div><div class='add'>+			|| ((state-&gt;identity.version != SOC_7090_P1G_21R1)</div><div class='add'>+				&amp;&amp; (state-&gt;identity.version != SOC_7090_P1G_11R1))) {</div><div class='add'>+		dprintk("%s() function can only be used for dib7090P", __func__);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg_sensitivity)</div><div class='add'>+		state-&gt;rf_ramp = (const u16 *)&amp;rf_ramp_pwm_cband_7090e_sensitivity;</div><div class='add'>+	else</div><div class='add'>+		state-&gt;rf_ramp = (const u16 *)&amp;rf_ramp_pwm_cband_7090e_aci;</div><div class='add'>+	dib0090_pwm_gain_reset(fe);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dib0090_update_rframp_7090);</div><div class='add'>+</div><div class='ctx'> static const u16 dib0090_defaults[] = {</div><div class='ctx'> </div><div class='ctx'> 	25, 0x01,</div><div class='hunk'>@@ -1430,7 +1522,7 @@ static void dib0090_set_default_config(struct dib0090_state *state, const u16 *</div><div class='ctx'> #define POLY_MIN      (u8)  0</div><div class='ctx'> #define POLY_MAX      (u8)  8</div><div class='ctx'> </div><div class='del'>-void dib0090_set_EFUSE(struct dib0090_state *state)</div><div class='add'>+static void dib0090_set_EFUSE(struct dib0090_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	u8 c, h, n;</div><div class='ctx'> 	u16 e2, e4;</div><div class='hunk'>@@ -1505,7 +1597,10 @@ static int dib0090_reset(struct dvb_frontend *fe)</div><div class='ctx'> 		dib0090_set_EFUSE(state);</div><div class='ctx'> </div><div class='ctx'> 	/* Congigure in function of the crystal */</div><div class='del'>-	if (state-&gt;config-&gt;io.clock_khz &gt;= 24000)</div><div class='add'>+	if (state-&gt;config-&gt;force_crystal_mode != 0)</div><div class='add'>+		dib0090_write_reg(state, 0x14,</div><div class='add'>+				state-&gt;config-&gt;force_crystal_mode &amp; 3);</div><div class='add'>+	else if (state-&gt;config-&gt;io.clock_khz &gt;= 24000)</div><div class='ctx'> 		dib0090_write_reg(state, 0x14, 1);</div><div class='ctx'> 	else</div><div class='ctx'> 		dib0090_write_reg(state, 0x14, 2);</div><div class='hunk'>@@ -1951,6 +2046,52 @@ static const struct dib0090_tuning dib0090_tuning_table_cband_7090[] = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct dib0090_tuning dib0090_tuning_table_cband_7090e_sensitivity[] = {</div><div class='add'>+#ifdef CONFIG_BAND_CBAND</div><div class='add'>+	{ 300000,  0 ,  3,  0x8105, 0x2c0, 0x2d12, 0xb84e, EN_CAB },</div><div class='add'>+	{ 380000,  0 ,  10, 0x810F, 0x2c0, 0x2d12, 0xb84e, EN_CAB },</div><div class='add'>+	{ 600000,  0 ,  10, 0x815E, 0x280, 0x2d12, 0xb84e, EN_CAB },</div><div class='add'>+	{ 660000,  0 ,  5,  0x85E3, 0x280, 0x2d12, 0xb84e, EN_CAB },</div><div class='add'>+	{ 720000,  0 ,  5,  0x852E, 0x280, 0x2d12, 0xb84e, EN_CAB },</div><div class='add'>+	{ 860000,  0 ,  4,  0x85E5, 0x280, 0x2d12, 0xb84e, EN_CAB },</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int dib0090_update_tuning_table_7090(struct dvb_frontend *fe,</div><div class='add'>+		u8 cfg_sensitivity)</div><div class='add'>+{</div><div class='add'>+	struct dib0090_state *state = fe-&gt;tuner_priv;</div><div class='add'>+	const struct dib0090_tuning *tune =</div><div class='add'>+		dib0090_tuning_table_cband_7090e_sensitivity;</div><div class='add'>+	const struct dib0090_tuning dib0090_tuning_table_cband_7090e_aci[] = {</div><div class='add'>+		{ 300000,  0 ,  3,  0x8165, 0x2c0, 0x2d12, 0xb84e, EN_CAB },</div><div class='add'>+		{ 650000,  0 ,  4,  0x815B, 0x280, 0x2d12, 0xb84e, EN_CAB },</div><div class='add'>+		{ 860000,  0 ,  5,  0x84EF, 0x280, 0x2d12, 0xb84e, EN_CAB },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if ((!state-&gt;identity.p1g) || (!state-&gt;identity.in_soc)</div><div class='add'>+			|| ((state-&gt;identity.version != SOC_7090_P1G_21R1)</div><div class='add'>+				&amp;&amp; (state-&gt;identity.version != SOC_7090_P1G_11R1))) {</div><div class='add'>+		dprintk("%s() function can only be used for dib7090", __func__);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg_sensitivity)</div><div class='add'>+		tune = dib0090_tuning_table_cband_7090e_sensitivity;</div><div class='add'>+	else</div><div class='add'>+		tune = dib0090_tuning_table_cband_7090e_aci;</div><div class='add'>+</div><div class='add'>+	while (state-&gt;rf_request &gt; tune-&gt;max_freq)</div><div class='add'>+		tune++;</div><div class='add'>+</div><div class='add'>+	dib0090_write_reg(state, 0x09, (dib0090_read_reg(state, 0x09) &amp; 0x8000)</div><div class='add'>+			| (tune-&gt;lna_bias &amp; 0x7fff));</div><div class='add'>+	dib0090_write_reg(state, 0x0b, (dib0090_read_reg(state, 0x0b) &amp; 0xf83f)</div><div class='add'>+			| ((tune-&gt;lna_tune &lt;&lt; 6) &amp; 0x07c0));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dib0090_update_tuning_table_7090);</div><div class='add'>+</div><div class='ctx'> static int dib0090_captrim_search(struct dib0090_state *state, enum frontend_tune_state *tune_state)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -2199,12 +2340,18 @@ static int dib0090_tune(struct dvb_frontend *fe)</div><div class='ctx'> 					if (state-&gt;current_band &amp; BAND_CBAND || state-&gt;current_band &amp; BAND_FM || state-&gt;current_band &amp; BAND_VHF</div><div class='ctx'> 							|| state-&gt;current_band &amp; BAND_UHF) {</div><div class='ctx'> 						state-&gt;current_band = BAND_CBAND;</div><div class='del'>-						tune = dib0090_tuning_table_cband_7090;</div><div class='add'>+						if (state-&gt;config-&gt;is_dib7090e)</div><div class='add'>+							tune = dib0090_tuning_table_cband_7090e_sensitivity;</div><div class='add'>+						else</div><div class='add'>+							tune = dib0090_tuning_table_cband_7090;</div><div class='ctx'> 					}</div><div class='ctx'> 				} else {	/* Use the CBAND input for all band under UHF */</div><div class='ctx'> 					if (state-&gt;current_band &amp; BAND_CBAND || state-&gt;current_band &amp; BAND_FM || state-&gt;current_band &amp; BAND_VHF) {</div><div class='ctx'> 						state-&gt;current_band = BAND_CBAND;</div><div class='del'>-						tune = dib0090_tuning_table_cband_7090;</div><div class='add'>+						if (state-&gt;config-&gt;is_dib7090e)</div><div class='add'>+							tune = dib0090_tuning_table_cband_7090e_sensitivity;</div><div class='add'>+						else</div><div class='add'>+							tune = dib0090_tuning_table_cband_7090;</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='ctx'> 			} else</div><div class='hunk'>@@ -2419,7 +2566,7 @@ static int dib0090_get_frequency(struct dvb_frontend *fe, u32 * frequency)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib0090_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int dib0090_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib0090_state *state = fe-&gt;tuner_priv;</div><div class='ctx'> 	u32 ret;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib0090.h b/drivers/media/dvb/frontends/dib0090.h<br/>index 13d85244ec16..781dc49de45b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib0090.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib0090.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib0090.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/dib0090.h</a></div><div class='hunk'>@@ -71,6 +71,8 @@ struct dib0090_config {</div><div class='ctx'> 	u8 fref_clock_ratio;</div><div class='ctx'> 	u16 force_cband_input;</div><div class='ctx'> 	struct dib0090_wbd_slope *wbd;</div><div class='add'>+	u8 is_dib7090e;</div><div class='add'>+	u8 force_crystal_mode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_DVB_TUNER_DIB0090) || (defined(CONFIG_DVB_TUNER_DIB0090_MODULE) &amp;&amp; defined(MODULE))</div><div class='hunk'>@@ -78,13 +80,21 @@ extern struct dvb_frontend *dib0090_register(struct dvb_frontend *fe, struct i2c</div><div class='ctx'> extern struct dvb_frontend *dib0090_fw_register(struct dvb_frontend *fe, struct i2c_adapter *i2c, const struct dib0090_config *config);</div><div class='ctx'> extern void dib0090_dcc_freq(struct dvb_frontend *fe, u8 fast);</div><div class='ctx'> extern void dib0090_pwm_gain_reset(struct dvb_frontend *fe);</div><div class='del'>-extern u16 dib0090_get_wbd_offset(struct dvb_frontend *tuner);</div><div class='add'>+extern u16 dib0090_get_wbd_target(struct dvb_frontend *tuner);</div><div class='add'>+extern u16 dib0090_get_wbd_offset(struct dvb_frontend *fe);</div><div class='ctx'> extern int dib0090_gain_control(struct dvb_frontend *fe);</div><div class='ctx'> extern enum frontend_tune_state dib0090_get_tune_state(struct dvb_frontend *fe);</div><div class='ctx'> extern int dib0090_set_tune_state(struct dvb_frontend *fe, enum frontend_tune_state tune_state);</div><div class='ctx'> extern void dib0090_get_current_gain(struct dvb_frontend *fe, u16 * rf, u16 * bb, u16 * rf_gain_limit, u16 * rflt);</div><div class='add'>+extern void dib0090_set_dc_servo(struct dvb_frontend *fe, u8 DC_servo_cutoff);</div><div class='add'>+extern int dib0090_set_switch(struct dvb_frontend *fe, u8 sw1, u8 sw2, u8 sw3);</div><div class='add'>+extern int dib0090_set_vga(struct dvb_frontend *fe, u8 onoff);</div><div class='add'>+extern int dib0090_update_rframp_7090(struct dvb_frontend *fe,</div><div class='add'>+		u8 cfg_sensitivity);</div><div class='add'>+extern int dib0090_update_tuning_table_7090(struct dvb_frontend *fe,</div><div class='add'>+		u8 cfg_sensitivity);</div><div class='ctx'> #else</div><div class='del'>-static inline struct dvb_frontend *dib0090_register(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dib0090_config *config)</div><div class='add'>+static inline struct dvb_frontend *dib0090_register(struct dvb_frontend *fe, struct i2c_adapter *i2c, const struct dib0090_config *config)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -106,7 +116,13 @@ static inline void dib0090_pwm_gain_reset(struct dvb_frontend *fe)</div><div class='ctx'> 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u16 dib0090_get_wbd_offset(struct dvb_frontend *tuner)</div><div class='add'>+static inline u16 dib0090_get_wbd_target(struct dvb_frontend *tuner)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 dib0090_get_wbd_offset(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -134,6 +150,38 @@ static inline void dib0090_get_current_gain(struct dvb_frontend *fe, u16 * rf, u</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline void dib0090_set_dc_servo(struct dvb_frontend *fe, u8 DC_servo_cutoff)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int dib0090_set_switch(struct dvb_frontend *fe,</div><div class='add'>+		u8 sw1, u8 sw2, u8 sw3)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int dib0090_set_vga(struct dvb_frontend *fe, u8 onoff)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int dib0090_update_rframp_7090(struct dvb_frontend *fe,</div><div class='add'>+		u8 cfg_sensitivity)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int dib0090_update_tuning_table_7090(struct dvb_frontend *fe,</div><div class='add'>+		u8 cfg_sensitivity)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb/frontends/dib3000mb.c<br/>index 437904cbf3e6..af91e0c92339 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib3000mb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib3000mb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib3000mb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/dib3000mb.c</a></div><div class='hunk'>@@ -112,39 +112,37 @@ static u16 dib3000_seq[2][2][2] =     /* fft,gua,   inv   */</div><div class='ctx'> 		}</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-static int dib3000mb_get_frontend(struct dvb_frontend* fe,</div><div class='del'>-				  struct dvb_frontend_parameters *fep);</div><div class='add'>+static int dib3000mb_get_frontend(struct dvb_frontend* fe);</div><div class='ctx'> </div><div class='del'>-static int dib3000mb_set_frontend(struct dvb_frontend* fe,</div><div class='del'>-				  struct dvb_frontend_parameters *fep, int tuner)</div><div class='add'>+static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib3000_state* state = fe-&gt;demodulator_priv;</div><div class='del'>-	struct dvb_ofdm_parameters *ofdm = &amp;fep-&gt;u.ofdm;</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	fe_code_rate_t fe_cr = FEC_NONE;</div><div class='ctx'> 	int search_state, seq;</div><div class='ctx'> </div><div class='ctx'> 	if (tuner &amp;&amp; fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, fep);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> </div><div class='ctx'> 		deb_setf("bandwidth: ");</div><div class='del'>-		switch (ofdm-&gt;bandwidth) {</div><div class='del'>-			case BANDWIDTH_8_MHZ:</div><div class='add'>+		switch (c-&gt;bandwidth_hz) {</div><div class='add'>+			case 8000000:</div><div class='ctx'> 				deb_setf("8 MHz\n");</div><div class='ctx'> 				wr_foreach(dib3000mb_reg_timing_freq, dib3000mb_timing_freq[2]);</div><div class='ctx'> 				wr_foreach(dib3000mb_reg_bandwidth, dib3000mb_bandwidth_8mhz);</div><div class='ctx'> 				break;</div><div class='del'>-			case BANDWIDTH_7_MHZ:</div><div class='add'>+			case 7000000:</div><div class='ctx'> 				deb_setf("7 MHz\n");</div><div class='ctx'> 				wr_foreach(dib3000mb_reg_timing_freq, dib3000mb_timing_freq[1]);</div><div class='ctx'> 				wr_foreach(dib3000mb_reg_bandwidth, dib3000mb_bandwidth_7mhz);</div><div class='ctx'> 				break;</div><div class='del'>-			case BANDWIDTH_6_MHZ:</div><div class='add'>+			case 6000000:</div><div class='ctx'> 				deb_setf("6 MHz\n");</div><div class='ctx'> 				wr_foreach(dib3000mb_reg_timing_freq, dib3000mb_timing_freq[0]);</div><div class='ctx'> 				wr_foreach(dib3000mb_reg_bandwidth, dib3000mb_bandwidth_6mhz);</div><div class='ctx'> 				break;</div><div class='del'>-			case BANDWIDTH_AUTO:</div><div class='add'>+			case 0:</div><div class='ctx'> 				return -EOPNOTSUPP;</div><div class='ctx'> 			default:</div><div class='ctx'> 				err("unknown bandwidth value.");</div><div class='hunk'>@@ -154,7 +152,7 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	wr(DIB3000MB_REG_LOCK1_MASK, DIB3000MB_LOCK1_SEARCH_4);</div><div class='ctx'> </div><div class='ctx'> 	deb_setf("transmission mode: ");</div><div class='del'>-	switch (ofdm-&gt;transmission_mode) {</div><div class='add'>+	switch (c-&gt;transmission_mode) {</div><div class='ctx'> 		case TRANSMISSION_MODE_2K:</div><div class='ctx'> 			deb_setf("2k\n");</div><div class='ctx'> 			wr(DIB3000MB_REG_FFT, DIB3000_TRANSMISSION_MODE_2K);</div><div class='hunk'>@@ -171,7 +169,7 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	deb_setf("guard: ");</div><div class='del'>-	switch (ofdm-&gt;guard_interval) {</div><div class='add'>+	switch (c-&gt;guard_interval) {</div><div class='ctx'> 		case GUARD_INTERVAL_1_32:</div><div class='ctx'> 			deb_setf("1_32\n");</div><div class='ctx'> 			wr(DIB3000MB_REG_GUARD_TIME, DIB3000_GUARD_TIME_1_32);</div><div class='hunk'>@@ -196,7 +194,7 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	deb_setf("inversion: ");</div><div class='del'>-	switch (fep-&gt;inversion) {</div><div class='add'>+	switch (c-&gt;inversion) {</div><div class='ctx'> 		case INVERSION_OFF:</div><div class='ctx'> 			deb_setf("off\n");</div><div class='ctx'> 			wr(DIB3000MB_REG_DDS_INV, DIB3000_DDS_INVERSION_OFF);</div><div class='hunk'>@@ -212,8 +210,8 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	deb_setf("constellation: ");</div><div class='del'>-	switch (ofdm-&gt;constellation) {</div><div class='add'>+	deb_setf("modulation: ");</div><div class='add'>+	switch (c-&gt;modulation) {</div><div class='ctx'> 		case QPSK:</div><div class='ctx'> 			deb_setf("qpsk\n");</div><div class='ctx'> 			wr(DIB3000MB_REG_QAM, DIB3000_CONSTELLATION_QPSK);</div><div class='hunk'>@@ -232,7 +230,7 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	deb_setf("hierarchy: ");</div><div class='del'>-	switch (ofdm-&gt;hierarchy_information) {</div><div class='add'>+	switch (c-&gt;hierarchy) {</div><div class='ctx'> 		case HIERARCHY_NONE:</div><div class='ctx'> 			deb_setf("none ");</div><div class='ctx'> 			/* fall through */</div><div class='hunk'>@@ -256,16 +254,16 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	deb_setf("hierarchy: ");</div><div class='del'>-	if (ofdm-&gt;hierarchy_information == HIERARCHY_NONE) {</div><div class='add'>+	if (c-&gt;hierarchy == HIERARCHY_NONE) {</div><div class='ctx'> 		deb_setf("none\n");</div><div class='ctx'> 		wr(DIB3000MB_REG_VIT_HRCH, DIB3000_HRCH_OFF);</div><div class='ctx'> 		wr(DIB3000MB_REG_VIT_HP, DIB3000_SELECT_HP);</div><div class='del'>-		fe_cr = ofdm-&gt;code_rate_HP;</div><div class='del'>-	} else if (ofdm-&gt;hierarchy_information != HIERARCHY_AUTO) {</div><div class='add'>+		fe_cr = c-&gt;code_rate_HP;</div><div class='add'>+	} else if (c-&gt;hierarchy != HIERARCHY_AUTO) {</div><div class='ctx'> 		deb_setf("on\n");</div><div class='ctx'> 		wr(DIB3000MB_REG_VIT_HRCH, DIB3000_HRCH_ON);</div><div class='ctx'> 		wr(DIB3000MB_REG_VIT_HP, DIB3000_SELECT_LP);</div><div class='del'>-		fe_cr = ofdm-&gt;code_rate_LP;</div><div class='add'>+		fe_cr = c-&gt;code_rate_LP;</div><div class='ctx'> 	}</div><div class='ctx'> 	deb_setf("fec: ");</div><div class='ctx'> 	switch (fe_cr) {</div><div class='hunk'>@@ -300,9 +298,9 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	seq = dib3000_seq</div><div class='del'>-		[ofdm-&gt;transmission_mode == TRANSMISSION_MODE_AUTO]</div><div class='del'>-		[ofdm-&gt;guard_interval == GUARD_INTERVAL_AUTO]</div><div class='del'>-		[fep-&gt;inversion == INVERSION_AUTO];</div><div class='add'>+		[c-&gt;transmission_mode == TRANSMISSION_MODE_AUTO]</div><div class='add'>+		[c-&gt;guard_interval == GUARD_INTERVAL_AUTO]</div><div class='add'>+		[c-&gt;inversion == INVERSION_AUTO];</div><div class='ctx'> </div><div class='ctx'> 	deb_setf("seq? %d\n", seq);</div><div class='ctx'> </div><div class='hunk'>@@ -310,8 +308,8 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> </div><div class='ctx'> 	wr(DIB3000MB_REG_ISI, seq ? DIB3000MB_ISI_INHIBIT : DIB3000MB_ISI_ACTIVATE);</div><div class='ctx'> </div><div class='del'>-	if (ofdm-&gt;transmission_mode == TRANSMISSION_MODE_2K) {</div><div class='del'>-		if (ofdm-&gt;guard_interval == GUARD_INTERVAL_1_8) {</div><div class='add'>+	if (c-&gt;transmission_mode == TRANSMISSION_MODE_2K) {</div><div class='add'>+		if (c-&gt;guard_interval == GUARD_INTERVAL_1_8) {</div><div class='ctx'> 			wr(DIB3000MB_REG_SYNC_IMPROVEMENT, DIB3000MB_SYNC_IMPROVE_2K_1_8);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			wr(DIB3000MB_REG_SYNC_IMPROVEMENT, DIB3000MB_SYNC_IMPROVE_DEFAULT);</div><div class='hunk'>@@ -339,10 +337,10 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	wr_foreach(dib3000mb_reg_agc_bandwidth, dib3000mb_agc_bandwidth_low);</div><div class='ctx'> </div><div class='ctx'> 	/* something has to be auto searched */</div><div class='del'>-	if (ofdm-&gt;constellation == QAM_AUTO ||</div><div class='del'>-		ofdm-&gt;hierarchy_information == HIERARCHY_AUTO ||</div><div class='add'>+	if (c-&gt;modulation == QAM_AUTO ||</div><div class='add'>+		c-&gt;hierarchy == HIERARCHY_AUTO ||</div><div class='ctx'> 		fe_cr == FEC_AUTO ||</div><div class='del'>-		fep-&gt;inversion == INVERSION_AUTO) {</div><div class='add'>+		c-&gt;inversion == INVERSION_AUTO) {</div><div class='ctx'> 		int as_count=0;</div><div class='ctx'> </div><div class='ctx'> 		deb_setf("autosearch enabled.\n");</div><div class='hunk'>@@ -361,10 +359,9 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 		deb_setf("search_state after autosearch %d after %d checks\n",search_state,as_count);</div><div class='ctx'> </div><div class='ctx'> 		if (search_state == 1) {</div><div class='del'>-			struct dvb_frontend_parameters feps;</div><div class='del'>-			if (dib3000mb_get_frontend(fe, &amp;feps) == 0) {</div><div class='add'>+			if (dib3000mb_get_frontend(fe) == 0) {</div><div class='ctx'> 				deb_setf("reading tuning data from frontend succeeded.\n");</div><div class='del'>-				return dib3000mb_set_frontend(fe, &amp;feps, 0);</div><div class='add'>+				return dib3000mb_set_frontend(fe, 0);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -453,11 +450,10 @@ static int dib3000mb_fe_init(struct dvb_frontend* fe, int mobile_mode)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib3000mb_get_frontend(struct dvb_frontend* fe,</div><div class='del'>-				  struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dib3000mb_get_frontend(struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dib3000_state* state = fe-&gt;demodulator_priv;</div><div class='del'>-	struct dvb_ofdm_parameters *ofdm = &amp;fep-&gt;u.ofdm;</div><div class='ctx'> 	fe_code_rate_t *cr;</div><div class='ctx'> 	u16 tps_val;</div><div class='ctx'> 	int inv_test1,inv_test2;</div><div class='hunk'>@@ -484,25 +480,25 @@ static int dib3000mb_get_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	else</div><div class='ctx'> 		inv_test2 = 2;</div><div class='ctx'> </div><div class='del'>-	fep-&gt;inversion =</div><div class='add'>+	c-&gt;inversion =</div><div class='ctx'> 		((inv_test2 == 2) &amp;&amp; (inv_test1==1 || inv_test1==0)) ||</div><div class='ctx'> 		((inv_test2 == 0) &amp;&amp; (inv_test1==1 || inv_test1==2)) ?</div><div class='ctx'> 		INVERSION_ON : INVERSION_OFF;</div><div class='ctx'> </div><div class='del'>-	deb_getf("inversion %d %d, %d\n", inv_test2, inv_test1, fep-&gt;inversion);</div><div class='add'>+	deb_getf("inversion %d %d, %d\n", inv_test2, inv_test1, c-&gt;inversion);</div><div class='ctx'> </div><div class='ctx'> 	switch ((tps_val = rd(DIB3000MB_REG_TPS_QAM))) {</div><div class='ctx'> 		case DIB3000_CONSTELLATION_QPSK:</div><div class='ctx'> 			deb_getf("QPSK ");</div><div class='del'>-			ofdm-&gt;constellation = QPSK;</div><div class='add'>+			c-&gt;modulation = QPSK;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case DIB3000_CONSTELLATION_16QAM:</div><div class='ctx'> 			deb_getf("QAM16 ");</div><div class='del'>-			ofdm-&gt;constellation = QAM_16;</div><div class='add'>+			c-&gt;modulation = QAM_16;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case DIB3000_CONSTELLATION_64QAM:</div><div class='ctx'> 			deb_getf("QAM64 ");</div><div class='del'>-			ofdm-&gt;constellation = QAM_64;</div><div class='add'>+			c-&gt;modulation = QAM_64;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			err("Unexpected constellation returned by TPS (%d)", tps_val);</div><div class='hunk'>@@ -512,24 +508,24 @@ static int dib3000mb_get_frontend(struct dvb_frontend* fe,</div><div class='ctx'> </div><div class='ctx'> 	if (rd(DIB3000MB_REG_TPS_HRCH)) {</div><div class='ctx'> 		deb_getf("HRCH ON\n");</div><div class='del'>-		cr = &amp;ofdm-&gt;code_rate_LP;</div><div class='del'>-		ofdm-&gt;code_rate_HP = FEC_NONE;</div><div class='add'>+		cr = &amp;c-&gt;code_rate_LP;</div><div class='add'>+		c-&gt;code_rate_HP = FEC_NONE;</div><div class='ctx'> 		switch ((tps_val = rd(DIB3000MB_REG_TPS_VIT_ALPHA))) {</div><div class='ctx'> 			case DIB3000_ALPHA_0:</div><div class='ctx'> 				deb_getf("HIERARCHY_NONE ");</div><div class='del'>-				ofdm-&gt;hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+				c-&gt;hierarchy = HIERARCHY_NONE;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case DIB3000_ALPHA_1:</div><div class='ctx'> 				deb_getf("HIERARCHY_1 ");</div><div class='del'>-				ofdm-&gt;hierarchy_information = HIERARCHY_1;</div><div class='add'>+				c-&gt;hierarchy = HIERARCHY_1;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case DIB3000_ALPHA_2:</div><div class='ctx'> 				deb_getf("HIERARCHY_2 ");</div><div class='del'>-				ofdm-&gt;hierarchy_information = HIERARCHY_2;</div><div class='add'>+				c-&gt;hierarchy = HIERARCHY_2;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case DIB3000_ALPHA_4:</div><div class='ctx'> 				deb_getf("HIERARCHY_4 ");</div><div class='del'>-				ofdm-&gt;hierarchy_information = HIERARCHY_4;</div><div class='add'>+				c-&gt;hierarchy = HIERARCHY_4;</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='ctx'> 				err("Unexpected ALPHA value returned by TPS (%d)", tps_val);</div><div class='hunk'>@@ -540,9 +536,9 @@ static int dib3000mb_get_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 		tps_val = rd(DIB3000MB_REG_TPS_CODE_RATE_LP);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		deb_getf("HRCH OFF\n");</div><div class='del'>-		cr = &amp;ofdm-&gt;code_rate_HP;</div><div class='del'>-		ofdm-&gt;code_rate_LP = FEC_NONE;</div><div class='del'>-		ofdm-&gt;hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+		cr = &amp;c-&gt;code_rate_HP;</div><div class='add'>+		c-&gt;code_rate_LP = FEC_NONE;</div><div class='add'>+		c-&gt;hierarchy = HIERARCHY_NONE;</div><div class='ctx'> </div><div class='ctx'> 		tps_val = rd(DIB3000MB_REG_TPS_CODE_RATE_HP);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -577,19 +573,19 @@ static int dib3000mb_get_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	switch ((tps_val = rd(DIB3000MB_REG_TPS_GUARD_TIME))) {</div><div class='ctx'> 		case DIB3000_GUARD_TIME_1_32:</div><div class='ctx'> 			deb_getf("GUARD_INTERVAL_1_32 ");</div><div class='del'>-			ofdm-&gt;guard_interval = GUARD_INTERVAL_1_32;</div><div class='add'>+			c-&gt;guard_interval = GUARD_INTERVAL_1_32;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case DIB3000_GUARD_TIME_1_16:</div><div class='ctx'> 			deb_getf("GUARD_INTERVAL_1_16 ");</div><div class='del'>-			ofdm-&gt;guard_interval = GUARD_INTERVAL_1_16;</div><div class='add'>+			c-&gt;guard_interval = GUARD_INTERVAL_1_16;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case DIB3000_GUARD_TIME_1_8:</div><div class='ctx'> 			deb_getf("GUARD_INTERVAL_1_8 ");</div><div class='del'>-			ofdm-&gt;guard_interval = GUARD_INTERVAL_1_8;</div><div class='add'>+			c-&gt;guard_interval = GUARD_INTERVAL_1_8;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case DIB3000_GUARD_TIME_1_4:</div><div class='ctx'> 			deb_getf("GUARD_INTERVAL_1_4 ");</div><div class='del'>-			ofdm-&gt;guard_interval = GUARD_INTERVAL_1_4;</div><div class='add'>+			c-&gt;guard_interval = GUARD_INTERVAL_1_4;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			err("Unexpected Guard Time returned by TPS (%d)", tps_val);</div><div class='hunk'>@@ -600,11 +596,11 @@ static int dib3000mb_get_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	switch ((tps_val = rd(DIB3000MB_REG_TPS_FFT))) {</div><div class='ctx'> 		case DIB3000_TRANSMISSION_MODE_2K:</div><div class='ctx'> 			deb_getf("TRANSMISSION_MODE_2K ");</div><div class='del'>-			ofdm-&gt;transmission_mode = TRANSMISSION_MODE_2K;</div><div class='add'>+			c-&gt;transmission_mode = TRANSMISSION_MODE_2K;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case DIB3000_TRANSMISSION_MODE_8K:</div><div class='ctx'> 			deb_getf("TRANSMISSION_MODE_8K ");</div><div class='del'>-			ofdm-&gt;transmission_mode = TRANSMISSION_MODE_8K;</div><div class='add'>+			c-&gt;transmission_mode = TRANSMISSION_MODE_8K;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			err("unexpected transmission mode return by TPS (%d)", tps_val);</div><div class='hunk'>@@ -701,9 +697,9 @@ static int dib3000mb_fe_init_nonmobile(struct dvb_frontend* fe)</div><div class='ctx'> 	return dib3000mb_fe_init(fe, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib3000mb_set_frontend_and_tuner(struct dvb_frontend* fe, struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dib3000mb_set_frontend_and_tuner(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='del'>-	return dib3000mb_set_frontend(fe, fep, 1);</div><div class='add'>+	return dib3000mb_set_frontend(fe, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dib3000mb_release(struct dvb_frontend* fe)</div><div class='hunk'>@@ -794,10 +790,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops dib3000mb_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "DiBcom 3000M-B DVB-T",</div><div class='del'>-		.type			= FE_OFDM,</div><div class='ctx'> 		.frequency_min		= 44250000,</div><div class='ctx'> 		.frequency_max		= 867250000,</div><div class='ctx'> 		.frequency_stepsize	= 62500,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib3000mb_priv.h b/drivers/media/dvb/frontends/dib3000mb_priv.h<br/>index 16c526591f36..9dc235aa44b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib3000mb_priv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib3000mb_priv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib3000mb_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/dib3000mb_priv.h</a></div><div class='hunk'>@@ -98,7 +98,7 @@ struct dib3000_state {</div><div class='ctx'> 	int timing_offset;</div><div class='ctx'> 	int timing_offset_comp_done;</div><div class='ctx'> </div><div class='del'>-	fe_bandwidth_t last_tuned_bw;</div><div class='add'>+	u32 last_tuned_bw;</div><div class='ctx'> 	u32 last_tuned_freq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c<br/>index 088e7fadbe3d..ffad181a9692 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib3000mc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib3000mc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib3000mc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/dib3000mc.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@ struct dib3000mc_state {</div><div class='ctx'> </div><div class='ctx'> 	u32 timf;</div><div class='ctx'> </div><div class='del'>-	fe_bandwidth_t current_bandwidth;</div><div class='add'>+	u32 current_bandwidth;</div><div class='ctx'> </div><div class='ctx'> 	u16 dev_id;</div><div class='ctx'> </div><div class='hunk'>@@ -438,11 +438,14 @@ static void dib3000mc_set_adp_cfg(struct dib3000mc_state *state, s16 qam)</div><div class='ctx'> 		dib3000mc_write_word(state, reg, cfg[reg - 129]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dib3000mc_set_channel_cfg(struct dib3000mc_state *state, struct dvb_frontend_parameters *ch, u16 seq)</div><div class='add'>+static void dib3000mc_set_channel_cfg(struct dib3000mc_state *state,</div><div class='add'>+				      struct dtv_frontend_properties *ch, u16 seq)</div><div class='ctx'> {</div><div class='ctx'> 	u16 value;</div><div class='del'>-    dib3000mc_set_bandwidth(state, BANDWIDTH_TO_KHZ(ch-&gt;u.ofdm.bandwidth));</div><div class='del'>-	dib3000mc_set_timing(state, ch-&gt;u.ofdm.transmission_mode, BANDWIDTH_TO_KHZ(ch-&gt;u.ofdm.bandwidth), 0);</div><div class='add'>+	u32 bw = BANDWIDTH_TO_KHZ(ch-&gt;bandwidth_hz);</div><div class='add'>+</div><div class='add'>+	dib3000mc_set_bandwidth(state, bw);</div><div class='add'>+	dib3000mc_set_timing(state, ch-&gt;transmission_mode, bw, 0);</div><div class='ctx'> </div><div class='ctx'> //	if (boost)</div><div class='ctx'> //		dib3000mc_write_word(state, 100, (11 &lt;&lt; 6) + 6);</div><div class='hunk'>@@ -471,22 +474,22 @@ static void dib3000mc_set_channel_cfg(struct dib3000mc_state *state, struct dvb_</div><div class='ctx'> 	dib3000mc_write_word(state, 97,0);</div><div class='ctx'> 	dib3000mc_write_word(state, 98,0);</div><div class='ctx'> </div><div class='del'>-	dib3000mc_set_impulse_noise(state, 0, ch-&gt;u.ofdm.transmission_mode);</div><div class='add'>+	dib3000mc_set_impulse_noise(state, 0, ch-&gt;transmission_mode);</div><div class='ctx'> </div><div class='ctx'> 	value = 0;</div><div class='del'>-	switch (ch-&gt;u.ofdm.transmission_mode) {</div><div class='add'>+	switch (ch-&gt;transmission_mode) {</div><div class='ctx'> 		case TRANSMISSION_MODE_2K: value |= (0 &lt;&lt; 7); break;</div><div class='ctx'> 		default:</div><div class='ctx'> 		case TRANSMISSION_MODE_8K: value |= (1 &lt;&lt; 7); break;</div><div class='ctx'> 	}</div><div class='del'>-	switch (ch-&gt;u.ofdm.guard_interval) {</div><div class='add'>+	switch (ch-&gt;guard_interval) {</div><div class='ctx'> 		case GUARD_INTERVAL_1_32: value |= (0 &lt;&lt; 5); break;</div><div class='ctx'> 		case GUARD_INTERVAL_1_16: value |= (1 &lt;&lt; 5); break;</div><div class='ctx'> 		case GUARD_INTERVAL_1_4:  value |= (3 &lt;&lt; 5); break;</div><div class='ctx'> 		default:</div><div class='ctx'> 		case GUARD_INTERVAL_1_8:  value |= (2 &lt;&lt; 5); break;</div><div class='ctx'> 	}</div><div class='del'>-	switch (ch-&gt;u.ofdm.constellation) {</div><div class='add'>+	switch (ch-&gt;modulation) {</div><div class='ctx'> 		case QPSK:  value |= (0 &lt;&lt; 3); break;</div><div class='ctx'> 		case QAM_16: value |= (1 &lt;&lt; 3); break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -502,11 +505,11 @@ static void dib3000mc_set_channel_cfg(struct dib3000mc_state *state, struct dvb_</div><div class='ctx'> 	dib3000mc_write_word(state, 5, (1 &lt;&lt; 8) | ((seq &amp; 0xf) &lt;&lt; 4));</div><div class='ctx'> </div><div class='ctx'> 	value = 0;</div><div class='del'>-	if (ch-&gt;u.ofdm.hierarchy_information == 1)</div><div class='add'>+	if (ch-&gt;hierarchy == 1)</div><div class='ctx'> 		value |= (1 &lt;&lt; 4);</div><div class='ctx'> 	if (1 == 1)</div><div class='ctx'> 		value |= 1;</div><div class='del'>-	switch ((ch-&gt;u.ofdm.hierarchy_information == 0 || 1 == 1) ? ch-&gt;u.ofdm.code_rate_HP : ch-&gt;u.ofdm.code_rate_LP) {</div><div class='add'>+	switch ((ch-&gt;hierarchy == 0 || 1 == 1) ? ch-&gt;code_rate_HP : ch-&gt;code_rate_LP) {</div><div class='ctx'> 		case FEC_2_3: value |= (2 &lt;&lt; 1); break;</div><div class='ctx'> 		case FEC_3_4: value |= (3 &lt;&lt; 1); break;</div><div class='ctx'> 		case FEC_5_6: value |= (5 &lt;&lt; 1); break;</div><div class='hunk'>@@ -517,12 +520,12 @@ static void dib3000mc_set_channel_cfg(struct dib3000mc_state *state, struct dvb_</div><div class='ctx'> 	dib3000mc_write_word(state, 181, value);</div><div class='ctx'> </div><div class='ctx'> 	// diversity synchro delay add 50% SFN margin</div><div class='del'>-	switch (ch-&gt;u.ofdm.transmission_mode) {</div><div class='add'>+	switch (ch-&gt;transmission_mode) {</div><div class='ctx'> 		case TRANSMISSION_MODE_8K: value = 256; break;</div><div class='ctx'> 		case TRANSMISSION_MODE_2K:</div><div class='ctx'> 		default: value = 64; break;</div><div class='ctx'> 	}</div><div class='del'>-	switch (ch-&gt;u.ofdm.guard_interval) {</div><div class='add'>+	switch (ch-&gt;guard_interval) {</div><div class='ctx'> 		case GUARD_INTERVAL_1_16: value *= 2; break;</div><div class='ctx'> 		case GUARD_INTERVAL_1_8:  value *= 4; break;</div><div class='ctx'> 		case GUARD_INTERVAL_1_4:  value *= 8; break;</div><div class='hunk'>@@ -540,27 +543,28 @@ static void dib3000mc_set_channel_cfg(struct dib3000mc_state *state, struct dvb_</div><div class='ctx'> </div><div class='ctx'> 	msleep(30);</div><div class='ctx'> </div><div class='del'>-	dib3000mc_set_impulse_noise(state, state-&gt;cfg-&gt;impulse_noise_mode, ch-&gt;u.ofdm.transmission_mode);</div><div class='add'>+	dib3000mc_set_impulse_noise(state, state-&gt;cfg-&gt;impulse_noise_mode, ch-&gt;transmission_mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib3000mc_autosearch_start(struct dvb_frontend *demod, struct dvb_frontend_parameters *chan)</div><div class='add'>+static int dib3000mc_autosearch_start(struct dvb_frontend *demod)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *chan = &amp;demod-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dib3000mc_state *state = demod-&gt;demodulator_priv;</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> //	u32 val;</div><div class='del'>-	struct dvb_frontend_parameters schan;</div><div class='add'>+	struct dtv_frontend_properties schan;</div><div class='ctx'> </div><div class='ctx'> 	schan = *chan;</div><div class='ctx'> </div><div class='ctx'> 	/* TODO what is that ? */</div><div class='ctx'> </div><div class='ctx'> 	/* a channel for autosearch */</div><div class='del'>-	schan.u.ofdm.transmission_mode = TRANSMISSION_MODE_8K;</div><div class='del'>-	schan.u.ofdm.guard_interval = GUARD_INTERVAL_1_32;</div><div class='del'>-	schan.u.ofdm.constellation = QAM_64;</div><div class='del'>-	schan.u.ofdm.code_rate_HP = FEC_2_3;</div><div class='del'>-	schan.u.ofdm.code_rate_LP = FEC_2_3;</div><div class='del'>-	schan.u.ofdm.hierarchy_information = 0;</div><div class='add'>+	schan.transmission_mode = TRANSMISSION_MODE_8K;</div><div class='add'>+	schan.guard_interval = GUARD_INTERVAL_1_32;</div><div class='add'>+	schan.modulation = QAM_64;</div><div class='add'>+	schan.code_rate_HP = FEC_2_3;</div><div class='add'>+	schan.code_rate_LP = FEC_2_3;</div><div class='add'>+	schan.hierarchy = 0;</div><div class='ctx'> </div><div class='ctx'> 	dib3000mc_set_channel_cfg(state, &amp;schan, 11);</div><div class='ctx'> </div><div class='hunk'>@@ -586,8 +590,9 @@ static int dib3000mc_autosearch_is_irq(struct dvb_frontend *demod)</div><div class='ctx'> 	return 0; // still pending</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib3000mc_tune(struct dvb_frontend *demod, struct dvb_frontend_parameters *ch)</div><div class='add'>+static int dib3000mc_tune(struct dvb_frontend *demod)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *ch = &amp;demod-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dib3000mc_state *state = demod-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	// ** configure demod **</div><div class='hunk'>@@ -603,8 +608,8 @@ static int dib3000mc_tune(struct dvb_frontend *demod, struct dvb_frontend_parame</div><div class='ctx'> 		dib3000mc_write_word(state, 108, 0x0000); // P_pha3_force_pha_shift</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dib3000mc_set_adp_cfg(state, (u8)ch-&gt;u.ofdm.constellation);</div><div class='del'>-	if (ch-&gt;u.ofdm.transmission_mode == TRANSMISSION_MODE_8K) {</div><div class='add'>+	dib3000mc_set_adp_cfg(state, (u8)ch-&gt;modulation);</div><div class='add'>+	if (ch-&gt;transmission_mode == TRANSMISSION_MODE_8K) {</div><div class='ctx'> 		dib3000mc_write_word(state, 26, 38528);</div><div class='ctx'> 		dib3000mc_write_word(state, 33, 8);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -613,7 +618,8 @@ static int dib3000mc_tune(struct dvb_frontend *demod, struct dvb_frontend_parame</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dib3000mc_read_word(state, 509) &amp; 0x80)</div><div class='del'>-		dib3000mc_set_timing(state, ch-&gt;u.ofdm.transmission_mode, BANDWIDTH_TO_KHZ(ch-&gt;u.ofdm.bandwidth), 1);</div><div class='add'>+		dib3000mc_set_timing(state, ch-&gt;transmission_mode,</div><div class='add'>+				     BANDWIDTH_TO_KHZ(ch-&gt;bandwidth_hz), 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -626,87 +632,87 @@ struct i2c_adapter * dib3000mc_get_tuner_i2c_master(struct dvb_frontend *demod,</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(dib3000mc_get_tuner_i2c_master);</div><div class='ctx'> </div><div class='del'>-static int dib3000mc_get_frontend(struct dvb_frontend* fe,</div><div class='del'>-				struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dib3000mc_get_frontend(struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fep = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dib3000mc_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u16 tps = dib3000mc_read_word(state,458);</div><div class='ctx'> </div><div class='ctx'> 	fep-&gt;inversion = INVERSION_AUTO;</div><div class='ctx'> </div><div class='del'>-	fep-&gt;u.ofdm.bandwidth = state-&gt;current_bandwidth;</div><div class='add'>+	fep-&gt;bandwidth_hz = state-&gt;current_bandwidth;</div><div class='ctx'> </div><div class='ctx'> 	switch ((tps &gt;&gt; 8) &amp; 0x1) {</div><div class='del'>-		case 0: fep-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_2K; break;</div><div class='del'>-		case 1: fep-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_8K; break;</div><div class='add'>+		case 0: fep-&gt;transmission_mode = TRANSMISSION_MODE_2K; break;</div><div class='add'>+		case 1: fep-&gt;transmission_mode = TRANSMISSION_MODE_8K; break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (tps &amp; 0x3) {</div><div class='del'>-		case 0: fep-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_32; break;</div><div class='del'>-		case 1: fep-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_16; break;</div><div class='del'>-		case 2: fep-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_8; break;</div><div class='del'>-		case 3: fep-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_4; break;</div><div class='add'>+		case 0: fep-&gt;guard_interval = GUARD_INTERVAL_1_32; break;</div><div class='add'>+		case 1: fep-&gt;guard_interval = GUARD_INTERVAL_1_16; break;</div><div class='add'>+		case 2: fep-&gt;guard_interval = GUARD_INTERVAL_1_8; break;</div><div class='add'>+		case 3: fep-&gt;guard_interval = GUARD_INTERVAL_1_4; break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch ((tps &gt;&gt; 13) &amp; 0x3) {</div><div class='del'>-		case 0: fep-&gt;u.ofdm.constellation = QPSK; break;</div><div class='del'>-		case 1: fep-&gt;u.ofdm.constellation = QAM_16; break;</div><div class='add'>+		case 0: fep-&gt;modulation = QPSK; break;</div><div class='add'>+		case 1: fep-&gt;modulation = QAM_16; break;</div><div class='ctx'> 		case 2:</div><div class='del'>-		default: fep-&gt;u.ofdm.constellation = QAM_64; break;</div><div class='add'>+		default: fep-&gt;modulation = QAM_64; break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* as long as the frontend_param structure is fixed for hierarchical transmission I refuse to use it */</div><div class='ctx'> 	/* (tps &gt;&gt; 12) &amp; 0x1 == hrch is used, (tps &gt;&gt; 9) &amp; 0x7 == alpha */</div><div class='ctx'> </div><div class='del'>-	fep-&gt;u.ofdm.hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+	fep-&gt;hierarchy = HIERARCHY_NONE;</div><div class='ctx'> 	switch ((tps &gt;&gt; 5) &amp; 0x7) {</div><div class='del'>-		case 1: fep-&gt;u.ofdm.code_rate_HP = FEC_1_2; break;</div><div class='del'>-		case 2: fep-&gt;u.ofdm.code_rate_HP = FEC_2_3; break;</div><div class='del'>-		case 3: fep-&gt;u.ofdm.code_rate_HP = FEC_3_4; break;</div><div class='del'>-		case 5: fep-&gt;u.ofdm.code_rate_HP = FEC_5_6; break;</div><div class='add'>+		case 1: fep-&gt;code_rate_HP = FEC_1_2; break;</div><div class='add'>+		case 2: fep-&gt;code_rate_HP = FEC_2_3; break;</div><div class='add'>+		case 3: fep-&gt;code_rate_HP = FEC_3_4; break;</div><div class='add'>+		case 5: fep-&gt;code_rate_HP = FEC_5_6; break;</div><div class='ctx'> 		case 7:</div><div class='del'>-		default: fep-&gt;u.ofdm.code_rate_HP = FEC_7_8; break;</div><div class='add'>+		default: fep-&gt;code_rate_HP = FEC_7_8; break;</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch ((tps &gt;&gt; 2) &amp; 0x7) {</div><div class='del'>-		case 1: fep-&gt;u.ofdm.code_rate_LP = FEC_1_2; break;</div><div class='del'>-		case 2: fep-&gt;u.ofdm.code_rate_LP = FEC_2_3; break;</div><div class='del'>-		case 3: fep-&gt;u.ofdm.code_rate_LP = FEC_3_4; break;</div><div class='del'>-		case 5: fep-&gt;u.ofdm.code_rate_LP = FEC_5_6; break;</div><div class='add'>+		case 1: fep-&gt;code_rate_LP = FEC_1_2; break;</div><div class='add'>+		case 2: fep-&gt;code_rate_LP = FEC_2_3; break;</div><div class='add'>+		case 3: fep-&gt;code_rate_LP = FEC_3_4; break;</div><div class='add'>+		case 5: fep-&gt;code_rate_LP = FEC_5_6; break;</div><div class='ctx'> 		case 7:</div><div class='del'>-		default: fep-&gt;u.ofdm.code_rate_LP = FEC_7_8; break;</div><div class='add'>+		default: fep-&gt;code_rate_LP = FEC_7_8; break;</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 dib3000mc_set_frontend(struct dvb_frontend* fe,</div><div class='del'>-				struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dib3000mc_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fep = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dib3000mc_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-    int ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dib3000mc_set_output_mode(state, OUTMODE_HIGH_Z);</div><div class='ctx'> </div><div class='del'>-	state-&gt;current_bandwidth = fep-&gt;u.ofdm.bandwidth;</div><div class='del'>-	dib3000mc_set_bandwidth(state, BANDWIDTH_TO_KHZ(fep-&gt;u.ofdm.bandwidth));</div><div class='add'>+	state-&gt;current_bandwidth = fep-&gt;bandwidth_hz;</div><div class='add'>+	dib3000mc_set_bandwidth(state, BANDWIDTH_TO_KHZ(fep-&gt;bandwidth_hz));</div><div class='ctx'> </div><div class='ctx'> 	/* maybe the parameter has been changed */</div><div class='ctx'> 	state-&gt;sfn_workaround_active = buggy_sfn_workaround;</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, fep);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		msleep(100);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (fep-&gt;u.ofdm.transmission_mode == TRANSMISSION_MODE_AUTO ||</div><div class='del'>-		fep-&gt;u.ofdm.guard_interval    == GUARD_INTERVAL_AUTO ||</div><div class='del'>-		fep-&gt;u.ofdm.constellation     == QAM_AUTO ||</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_HP      == FEC_AUTO) {</div><div class='add'>+	if (fep-&gt;transmission_mode  == TRANSMISSION_MODE_AUTO ||</div><div class='add'>+	    fep-&gt;guard_interval == GUARD_INTERVAL_AUTO ||</div><div class='add'>+	    fep-&gt;modulation     == QAM_AUTO ||</div><div class='add'>+	    fep-&gt;code_rate_HP   == FEC_AUTO) {</div><div class='ctx'> 		int i = 1000, found;</div><div class='ctx'> </div><div class='del'>-		dib3000mc_autosearch_start(fe, fep);</div><div class='add'>+		dib3000mc_autosearch_start(fe);</div><div class='ctx'> 		do {</div><div class='ctx'> 			msleep(1);</div><div class='ctx'> 			found = dib3000mc_autosearch_is_irq(fe);</div><div class='hunk'>@@ -716,14 +722,14 @@ static int dib3000mc_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 		if (found == 0 || found == 1)</div><div class='ctx'> 			return 0; // no channel found</div><div class='ctx'> </div><div class='del'>-		dib3000mc_get_frontend(fe, fep);</div><div class='add'>+		dib3000mc_get_frontend(fe);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-    ret = dib3000mc_tune(fe, fep);</div><div class='add'>+	ret = dib3000mc_tune(fe);</div><div class='ctx'> </div><div class='ctx'> 	/* make this a config parameter */</div><div class='ctx'> 	dib3000mc_set_output_mode(state, OUTMODE_MPEG2_FIFO);</div><div class='del'>-    return ret;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dib3000mc_read_status(struct dvb_frontend *fe, fe_status_t *stat)</div><div class='hunk'>@@ -897,9 +903,9 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(dib3000mc_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops dib3000mc_ops = {</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "DiBcom 3000MC/P",</div><div class='del'>-		.type = FE_OFDM,</div><div class='ctx'> 		.frequency_min      = 44250000,</div><div class='ctx'> 		.frequency_max      = 867250000,</div><div class='ctx'> 		.frequency_stepsize = 62500,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/frontends/dib7000m.c<br/>index dbb76d75c932..148bf79236fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib7000m.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib7000m.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib7000m.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/dib7000m.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@ struct dib7000m_state {</div><div class='ctx'> 	u16 wbd_ref;</div><div class='ctx'> </div><div class='ctx'> 	u8 current_band;</div><div class='del'>-	fe_bandwidth_t current_bandwidth;</div><div class='add'>+	u32 current_bandwidth;</div><div class='ctx'> 	struct dibx000_agc_config *current_agc;</div><div class='ctx'> 	u32 timf;</div><div class='ctx'> 	u32 timf_default;</div><div class='hunk'>@@ -313,6 +313,9 @@ static int dib7000m_set_bandwidth(struct dib7000m_state *state, u32 bw)</div><div class='ctx'> {</div><div class='ctx'> 	u32 timf;</div><div class='ctx'> </div><div class='add'>+	if (!bw)</div><div class='add'>+		bw = 8000;</div><div class='add'>+</div><div class='ctx'> 	// store the current bandwidth for later use</div><div class='ctx'> 	state-&gt;current_bandwidth = bw;</div><div class='ctx'> </div><div class='hunk'>@@ -742,8 +745,9 @@ static void dib7000m_update_timf(struct dib7000m_state *state)</div><div class='ctx'> 	dprintk( "updated timf_frequency: %d (default: %d)",state-&gt;timf, state-&gt;timf_default);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib7000m_agc_startup(struct dvb_frontend *demod, struct dvb_frontend_parameters *ch)</div><div class='add'>+static int dib7000m_agc_startup(struct dvb_frontend *demod)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *ch = &amp;demod-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dib7000m_state *state = demod-&gt;demodulator_priv;</div><div class='ctx'> 	u16 cfg_72 = dib7000m_read_word(state, 72);</div><div class='ctx'> 	int ret = -1;</div><div class='hunk'>@@ -832,28 +836,29 @@ static int dib7000m_agc_startup(struct dvb_frontend *demod, struct dvb_frontend_</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dib7000m_set_channel(struct dib7000m_state *state, struct dvb_frontend_parameters *ch, u8 seq)</div><div class='add'>+static void dib7000m_set_channel(struct dib7000m_state *state, struct dtv_frontend_properties *ch,</div><div class='add'>+				 u8 seq)</div><div class='ctx'> {</div><div class='ctx'> 	u16 value, est[4];</div><div class='ctx'> </div><div class='del'>-	dib7000m_set_bandwidth(state, BANDWIDTH_TO_KHZ(ch-&gt;u.ofdm.bandwidth));</div><div class='add'>+	dib7000m_set_bandwidth(state, BANDWIDTH_TO_KHZ(ch-&gt;bandwidth_hz));</div><div class='ctx'> </div><div class='ctx'> 	/* nfft, guard, qam, alpha */</div><div class='ctx'> 	value = 0;</div><div class='del'>-	switch (ch-&gt;u.ofdm.transmission_mode) {</div><div class='add'>+	switch (ch-&gt;transmission_mode) {</div><div class='ctx'> 		case TRANSMISSION_MODE_2K: value |= (0 &lt;&lt; 7); break;</div><div class='ctx'> 		case TRANSMISSION_MODE_4K: value |= (2 &lt;&lt; 7); break;</div><div class='ctx'> 		default:</div><div class='ctx'> 		case TRANSMISSION_MODE_8K: value |= (1 &lt;&lt; 7); break;</div><div class='ctx'> 	}</div><div class='del'>-	switch (ch-&gt;u.ofdm.guard_interval) {</div><div class='add'>+	switch (ch-&gt;guard_interval) {</div><div class='ctx'> 		case GUARD_INTERVAL_1_32: value |= (0 &lt;&lt; 5); break;</div><div class='ctx'> 		case GUARD_INTERVAL_1_16: value |= (1 &lt;&lt; 5); break;</div><div class='ctx'> 		case GUARD_INTERVAL_1_4:  value |= (3 &lt;&lt; 5); break;</div><div class='ctx'> 		default:</div><div class='ctx'> 		case GUARD_INTERVAL_1_8:  value |= (2 &lt;&lt; 5); break;</div><div class='ctx'> 	}</div><div class='del'>-	switch (ch-&gt;u.ofdm.constellation) {</div><div class='add'>+	switch (ch-&gt;modulation) {</div><div class='ctx'> 		case QPSK:  value |= (0 &lt;&lt; 3); break;</div><div class='ctx'> 		case QAM_16: value |= (1 &lt;&lt; 3); break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -872,11 +877,11 @@ static void dib7000m_set_channel(struct dib7000m_state *state, struct dvb_fronte</div><div class='ctx'> 	value = 0;</div><div class='ctx'> 	if (1 != 0)</div><div class='ctx'> 		value |= (1 &lt;&lt; 6);</div><div class='del'>-	if (ch-&gt;u.ofdm.hierarchy_information == 1)</div><div class='add'>+	if (ch-&gt;hierarchy == 1)</div><div class='ctx'> 		value |= (1 &lt;&lt; 4);</div><div class='ctx'> 	if (1 == 1)</div><div class='ctx'> 		value |= 1;</div><div class='del'>-	switch ((ch-&gt;u.ofdm.hierarchy_information == 0 || 1 == 1) ? ch-&gt;u.ofdm.code_rate_HP : ch-&gt;u.ofdm.code_rate_LP) {</div><div class='add'>+	switch ((ch-&gt;hierarchy == 0 || 1 == 1) ? ch-&gt;code_rate_HP : ch-&gt;code_rate_LP) {</div><div class='ctx'> 		case FEC_2_3: value |= (2 &lt;&lt; 1); break;</div><div class='ctx'> 		case FEC_3_4: value |= (3 &lt;&lt; 1); break;</div><div class='ctx'> 		case FEC_5_6: value |= (5 &lt;&lt; 1); break;</div><div class='hunk'>@@ -901,13 +906,13 @@ static void dib7000m_set_channel(struct dib7000m_state *state, struct dvb_fronte</div><div class='ctx'> 	dib7000m_write_word(state, 33, (0 &lt;&lt; 4) | 0x5);</div><div class='ctx'> </div><div class='ctx'> 	/* P_dvsy_sync_wait */</div><div class='del'>-	switch (ch-&gt;u.ofdm.transmission_mode) {</div><div class='add'>+	switch (ch-&gt;transmission_mode) {</div><div class='ctx'> 		case TRANSMISSION_MODE_8K: value = 256; break;</div><div class='ctx'> 		case TRANSMISSION_MODE_4K: value = 128; break;</div><div class='ctx'> 		case TRANSMISSION_MODE_2K:</div><div class='ctx'> 		default: value = 64; break;</div><div class='ctx'> 	}</div><div class='del'>-	switch (ch-&gt;u.ofdm.guard_interval) {</div><div class='add'>+	switch (ch-&gt;guard_interval) {</div><div class='ctx'> 		case GUARD_INTERVAL_1_16: value *= 2; break;</div><div class='ctx'> 		case GUARD_INTERVAL_1_8:  value *= 4; break;</div><div class='ctx'> 		case GUARD_INTERVAL_1_4:  value *= 8; break;</div><div class='hunk'>@@ -925,7 +930,7 @@ static void dib7000m_set_channel(struct dib7000m_state *state, struct dvb_fronte</div><div class='ctx'> 	dib7000m_set_diversity_in(&amp;state-&gt;demod, state-&gt;div_state);</div><div class='ctx'> </div><div class='ctx'> 	/* channel estimation fine configuration */</div><div class='del'>-	switch (ch-&gt;u.ofdm.constellation) {</div><div class='add'>+	switch (ch-&gt;modulation) {</div><div class='ctx'> 		case QAM_64:</div><div class='ctx'> 			est[0] = 0x0148;       /* P_adp_regul_cnt 0.04 */</div><div class='ctx'> 			est[1] = 0xfff0;       /* P_adp_noise_cnt -0.002 */</div><div class='hunk'>@@ -952,25 +957,26 @@ static void dib7000m_set_channel(struct dib7000m_state *state, struct dvb_fronte</div><div class='ctx'> 	dib7000m_set_power_mode(state, DIB7000M_POWER_COR4_DINTLV_ICIRM_EQUAL_CFROD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib7000m_autosearch_start(struct dvb_frontend *demod, struct dvb_frontend_parameters *ch)</div><div class='add'>+static int dib7000m_autosearch_start(struct dvb_frontend *demod)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *ch = &amp;demod-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dib7000m_state *state = demod-&gt;demodulator_priv;</div><div class='del'>-	struct dvb_frontend_parameters schan;</div><div class='add'>+	struct dtv_frontend_properties schan;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u32 value, factor;</div><div class='ctx'> </div><div class='ctx'> 	schan = *ch;</div><div class='ctx'> </div><div class='del'>-	schan.u.ofdm.constellation = QAM_64;</div><div class='del'>-	schan.u.ofdm.guard_interval        = GUARD_INTERVAL_1_32;</div><div class='del'>-	schan.u.ofdm.transmission_mode         = TRANSMISSION_MODE_8K;</div><div class='del'>-	schan.u.ofdm.code_rate_HP = FEC_2_3;</div><div class='del'>-	schan.u.ofdm.code_rate_LP = FEC_3_4;</div><div class='del'>-	schan.u.ofdm.hierarchy_information         = 0;</div><div class='add'>+	schan.modulation = QAM_64;</div><div class='add'>+	schan.guard_interval        = GUARD_INTERVAL_1_32;</div><div class='add'>+	schan.transmission_mode         = TRANSMISSION_MODE_8K;</div><div class='add'>+	schan.code_rate_HP = FEC_2_3;</div><div class='add'>+	schan.code_rate_LP = FEC_3_4;</div><div class='add'>+	schan.hierarchy    = 0;</div><div class='ctx'> </div><div class='ctx'> 	dib7000m_set_channel(state, &amp;schan, 7);</div><div class='ctx'> </div><div class='del'>-	factor = BANDWIDTH_TO_KHZ(ch-&gt;u.ofdm.bandwidth);</div><div class='add'>+	factor = BANDWIDTH_TO_KHZ(schan.bandwidth_hz);</div><div class='ctx'> 	if (factor &gt;= 5000)</div><div class='ctx'> 		factor = 1;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1027,8 +1033,9 @@ static int dib7000m_autosearch_is_irq(struct dvb_frontend *demod)</div><div class='ctx'> 		return dib7000m_autosearch_irq(state, 537);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib7000m_tune(struct dvb_frontend *demod, struct dvb_frontend_parameters *ch)</div><div class='add'>+static int dib7000m_tune(struct dvb_frontend *demod)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *ch = &amp;demod-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dib7000m_state *state = demod-&gt;demodulator_priv;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u16 value;</div><div class='hunk'>@@ -1055,7 +1062,7 @@ static int dib7000m_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet</div><div class='ctx'> 	//dump_reg(state);</div><div class='ctx'> 	/* P_timf_alpha, P_corm_alpha=6, P_corm_thres=0x80 */</div><div class='ctx'> 	value = (6 &lt;&lt; 8) | 0x80;</div><div class='del'>-	switch (ch-&gt;u.ofdm.transmission_mode) {</div><div class='add'>+	switch (ch-&gt;transmission_mode) {</div><div class='ctx'> 		case TRANSMISSION_MODE_2K: value |= (7 &lt;&lt; 12); break;</div><div class='ctx'> 		case TRANSMISSION_MODE_4K: value |= (8 &lt;&lt; 12); break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -1065,7 +1072,7 @@ static int dib7000m_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet</div><div class='ctx'> </div><div class='ctx'> 	/* P_ctrl_freeze_pha_shift=0, P_ctrl_pha_off_max */</div><div class='ctx'> 	value = (0 &lt;&lt; 4);</div><div class='del'>-	switch (ch-&gt;u.ofdm.transmission_mode) {</div><div class='add'>+	switch (ch-&gt;transmission_mode) {</div><div class='ctx'> 		case TRANSMISSION_MODE_2K: value |= 0x6; break;</div><div class='ctx'> 		case TRANSMISSION_MODE_4K: value |= 0x7; break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -1075,7 +1082,7 @@ static int dib7000m_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet</div><div class='ctx'> </div><div class='ctx'> 	/* P_ctrl_sfreq_inh=0, P_ctrl_sfreq_step */</div><div class='ctx'> 	value = (0 &lt;&lt; 4);</div><div class='del'>-	switch (ch-&gt;u.ofdm.transmission_mode) {</div><div class='add'>+	switch (ch-&gt;transmission_mode) {</div><div class='ctx'> 		case TRANSMISSION_MODE_2K: value |= 0x6; break;</div><div class='ctx'> 		case TRANSMISSION_MODE_4K: value |= 0x7; break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -1087,7 +1094,7 @@ static int dib7000m_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet</div><div class='ctx'> 	if ((dib7000m_read_word(state, 535) &gt;&gt; 6)  &amp; 0x1)</div><div class='ctx'> 		dib7000m_update_timf(state);</div><div class='ctx'> </div><div class='del'>-    dib7000m_set_bandwidth(state, BANDWIDTH_TO_KHZ(ch-&gt;u.ofdm.bandwidth));</div><div class='add'>+	dib7000m_set_bandwidth(state, BANDWIDTH_TO_KHZ(ch-&gt;bandwidth_hz));</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1147,57 +1154,57 @@ static int dib7000m_identify(struct dib7000m_state *state)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int dib7000m_get_frontend(struct dvb_frontend* fe,</div><div class='del'>-				struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dib7000m_get_frontend(struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fep = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dib7000m_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u16 tps = dib7000m_read_word(state,480);</div><div class='ctx'> </div><div class='ctx'> 	fep-&gt;inversion = INVERSION_AUTO;</div><div class='ctx'> </div><div class='del'>-	fep-&gt;u.ofdm.bandwidth = state-&gt;current_bandwidth;</div><div class='add'>+	fep-&gt;bandwidth_hz = BANDWIDTH_TO_HZ(state-&gt;current_bandwidth);</div><div class='ctx'> </div><div class='ctx'> 	switch ((tps &gt;&gt; 8) &amp; 0x3) {</div><div class='del'>-		case 0: fep-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_2K; break;</div><div class='del'>-		case 1: fep-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_8K; break;</div><div class='del'>-		/* case 2: fep-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_4K; break; */</div><div class='add'>+		case 0: fep-&gt;transmission_mode = TRANSMISSION_MODE_2K; break;</div><div class='add'>+		case 1: fep-&gt;transmission_mode = TRANSMISSION_MODE_8K; break;</div><div class='add'>+		/* case 2: fep-&gt;transmission_mode = TRANSMISSION_MODE_4K; break; */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (tps &amp; 0x3) {</div><div class='del'>-		case 0: fep-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_32; break;</div><div class='del'>-		case 1: fep-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_16; break;</div><div class='del'>-		case 2: fep-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_8; break;</div><div class='del'>-		case 3: fep-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_4; break;</div><div class='add'>+		case 0: fep-&gt;guard_interval = GUARD_INTERVAL_1_32; break;</div><div class='add'>+		case 1: fep-&gt;guard_interval = GUARD_INTERVAL_1_16; break;</div><div class='add'>+		case 2: fep-&gt;guard_interval = GUARD_INTERVAL_1_8; break;</div><div class='add'>+		case 3: fep-&gt;guard_interval = GUARD_INTERVAL_1_4; break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch ((tps &gt;&gt; 14) &amp; 0x3) {</div><div class='del'>-		case 0: fep-&gt;u.ofdm.constellation = QPSK; break;</div><div class='del'>-		case 1: fep-&gt;u.ofdm.constellation = QAM_16; break;</div><div class='add'>+		case 0: fep-&gt;modulation = QPSK; break;</div><div class='add'>+		case 1: fep-&gt;modulation = QAM_16; break;</div><div class='ctx'> 		case 2:</div><div class='del'>-		default: fep-&gt;u.ofdm.constellation = QAM_64; break;</div><div class='add'>+		default: fep-&gt;modulation = QAM_64; break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* as long as the frontend_param structure is fixed for hierarchical transmission I refuse to use it */</div><div class='ctx'> 	/* (tps &gt;&gt; 13) &amp; 0x1 == hrch is used, (tps &gt;&gt; 10) &amp; 0x7 == alpha */</div><div class='ctx'> </div><div class='del'>-	fep-&gt;u.ofdm.hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+	fep-&gt;hierarchy = HIERARCHY_NONE;</div><div class='ctx'> 	switch ((tps &gt;&gt; 5) &amp; 0x7) {</div><div class='del'>-		case 1: fep-&gt;u.ofdm.code_rate_HP = FEC_1_2; break;</div><div class='del'>-		case 2: fep-&gt;u.ofdm.code_rate_HP = FEC_2_3; break;</div><div class='del'>-		case 3: fep-&gt;u.ofdm.code_rate_HP = FEC_3_4; break;</div><div class='del'>-		case 5: fep-&gt;u.ofdm.code_rate_HP = FEC_5_6; break;</div><div class='add'>+		case 1: fep-&gt;code_rate_HP = FEC_1_2; break;</div><div class='add'>+		case 2: fep-&gt;code_rate_HP = FEC_2_3; break;</div><div class='add'>+		case 3: fep-&gt;code_rate_HP = FEC_3_4; break;</div><div class='add'>+		case 5: fep-&gt;code_rate_HP = FEC_5_6; break;</div><div class='ctx'> 		case 7:</div><div class='del'>-		default: fep-&gt;u.ofdm.code_rate_HP = FEC_7_8; break;</div><div class='add'>+		default: fep-&gt;code_rate_HP = FEC_7_8; break;</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch ((tps &gt;&gt; 2) &amp; 0x7) {</div><div class='del'>-		case 1: fep-&gt;u.ofdm.code_rate_LP = FEC_1_2; break;</div><div class='del'>-		case 2: fep-&gt;u.ofdm.code_rate_LP = FEC_2_3; break;</div><div class='del'>-		case 3: fep-&gt;u.ofdm.code_rate_LP = FEC_3_4; break;</div><div class='del'>-		case 5: fep-&gt;u.ofdm.code_rate_LP = FEC_5_6; break;</div><div class='add'>+		case 1: fep-&gt;code_rate_LP = FEC_1_2; break;</div><div class='add'>+		case 2: fep-&gt;code_rate_LP = FEC_2_3; break;</div><div class='add'>+		case 3: fep-&gt;code_rate_LP = FEC_3_4; break;</div><div class='add'>+		case 5: fep-&gt;code_rate_LP = FEC_5_6; break;</div><div class='ctx'> 		case 7:</div><div class='del'>-		default: fep-&gt;u.ofdm.code_rate_LP = FEC_7_8; break;</div><div class='add'>+		default: fep-&gt;code_rate_LP = FEC_7_8; break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* native interleaver: (dib7000m_read_word(state, 481) &gt;&gt;  5) &amp; 0x1 */</div><div class='hunk'>@@ -1205,35 +1212,34 @@ static int dib7000m_get_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib7000m_set_frontend(struct dvb_frontend* fe,</div><div class='del'>-				struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dib7000m_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fep = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dib7000m_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int time, ret;</div><div class='ctx'> </div><div class='del'>-    dib7000m_set_output_mode(state, OUTMODE_HIGH_Z);</div><div class='add'>+	dib7000m_set_output_mode(state, OUTMODE_HIGH_Z);</div><div class='ctx'> </div><div class='del'>-	state-&gt;current_bandwidth = fep-&gt;u.ofdm.bandwidth;</div><div class='del'>-	dib7000m_set_bandwidth(state, BANDWIDTH_TO_KHZ(fep-&gt;u.ofdm.bandwidth));</div><div class='add'>+	dib7000m_set_bandwidth(state, BANDWIDTH_TO_KHZ(fep-&gt;bandwidth_hz));</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params)</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, fep);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> </div><div class='ctx'> 	/* start up the AGC */</div><div class='ctx'> 	state-&gt;agc_state = 0;</div><div class='ctx'> 	do {</div><div class='del'>-		time = dib7000m_agc_startup(fe, fep);</div><div class='add'>+		time = dib7000m_agc_startup(fe);</div><div class='ctx'> 		if (time != -1)</div><div class='ctx'> 			msleep(time);</div><div class='ctx'> 	} while (time != -1);</div><div class='ctx'> </div><div class='del'>-	if (fep-&gt;u.ofdm.transmission_mode == TRANSMISSION_MODE_AUTO ||</div><div class='del'>-		fep-&gt;u.ofdm.guard_interval    == GUARD_INTERVAL_AUTO ||</div><div class='del'>-		fep-&gt;u.ofdm.constellation     == QAM_AUTO ||</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_HP      == FEC_AUTO) {</div><div class='add'>+	if (fep-&gt;transmission_mode == TRANSMISSION_MODE_AUTO ||</div><div class='add'>+		fep-&gt;guard_interval    == GUARD_INTERVAL_AUTO ||</div><div class='add'>+		fep-&gt;modulation        == QAM_AUTO ||</div><div class='add'>+		fep-&gt;code_rate_HP      == FEC_AUTO) {</div><div class='ctx'> 		int i = 800, found;</div><div class='ctx'> </div><div class='del'>-		dib7000m_autosearch_start(fe, fep);</div><div class='add'>+		dib7000m_autosearch_start(fe);</div><div class='ctx'> 		do {</div><div class='ctx'> 			msleep(1);</div><div class='ctx'> 			found = dib7000m_autosearch_is_irq(fe);</div><div class='hunk'>@@ -1243,10 +1249,10 @@ static int dib7000m_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 		if (found == 0 || found == 1)</div><div class='ctx'> 			return 0; // no channel found</div><div class='ctx'> </div><div class='del'>-		dib7000m_get_frontend(fe, fep);</div><div class='add'>+		dib7000m_get_frontend(fe);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = dib7000m_tune(fe, fep);</div><div class='add'>+	ret = dib7000m_tune(fe);</div><div class='ctx'> </div><div class='ctx'> 	/* make this a config parameter */</div><div class='ctx'> 	dib7000m_set_output_mode(state, OUTMODE_MPEG2_FIFO);</div><div class='hunk'>@@ -1430,9 +1436,9 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(dib7000m_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops dib7000m_ops = {</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "DiBcom 7000MA/MB/PA/PB/MC",</div><div class='del'>-		.type = FE_OFDM,</div><div class='ctx'> 		.frequency_min      = 44250000,</div><div class='ctx'> 		.frequency_max      = 867250000,</div><div class='ctx'> 		.frequency_stepsize = 62500,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c<br/>index ce8534ff142e..5ceadc285b3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib7000p.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib7000p.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib7000p.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/dib7000p.c</a></div><div class='hunk'>@@ -70,6 +70,8 @@ struct dib7000p_state {</div><div class='ctx'> 	u8 i2c_write_buffer[4];</div><div class='ctx'> 	u8 i2c_read_buffer[2];</div><div class='ctx'> 	struct mutex i2c_buffer_lock;</div><div class='add'>+</div><div class='add'>+	u8 input_mode_mpeg;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum dib7000p_power_mode {</div><div class='hunk'>@@ -78,8 +80,11 @@ enum dib7000p_power_mode {</div><div class='ctx'> 	DIB7000P_POWER_INTERFACE_ONLY,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* dib7090 specific fonctions */</div><div class='ctx'> static int dib7090_set_output_mode(struct dvb_frontend *fe, int mode);</div><div class='ctx'> static int dib7090_set_diversity_in(struct dvb_frontend *fe, int onoff);</div><div class='add'>+static void dib7090_setDibTxMux(struct dib7000p_state *state, int mode);</div><div class='add'>+static void dib7090_setHostBusMux(struct dib7000p_state *state, int mode);</div><div class='ctx'> </div><div class='ctx'> static u16 dib7000p_read_word(struct dib7000p_state *state, u16 reg)</div><div class='ctx'> {</div><div class='hunk'>@@ -276,17 +281,23 @@ static int dib7000p_set_power_mode(struct dib7000p_state *state, enum dib7000p_p</div><div class='ctx'> 	dib7000p_write_word(state, 774, reg_774);</div><div class='ctx'> 	dib7000p_write_word(state, 775, reg_775);</div><div class='ctx'> 	dib7000p_write_word(state, 776, reg_776);</div><div class='del'>-	dib7000p_write_word(state, 899, reg_899);</div><div class='ctx'> 	dib7000p_write_word(state, 1280, reg_1280);</div><div class='add'>+	if (state-&gt;version != SOC7090)</div><div class='add'>+		dib7000p_write_word(state, 899, reg_899);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dib7000p_set_adc_state(struct dib7000p_state *state, enum dibx000_adc_states no)</div><div class='ctx'> {</div><div class='del'>-	u16 reg_908 = dib7000p_read_word(state, 908), reg_909 = dib7000p_read_word(state, 909);</div><div class='add'>+	u16 reg_908 = 0, reg_909 = 0;</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> </div><div class='add'>+	if (state-&gt;version != SOC7090) {</div><div class='add'>+		reg_908 = dib7000p_read_word(state, 908);</div><div class='add'>+		reg_909 = dib7000p_read_word(state, 909);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	switch (no) {</div><div class='ctx'> 	case DIBX000_SLOW_ADC_ON:</div><div class='ctx'> 		if (state-&gt;version == SOC7090) {</div><div class='hunk'>@@ -342,8 +353,10 @@ static void dib7000p_set_adc_state(struct dib7000p_state *state, enum dibx000_ad</div><div class='ctx'> 	reg_909 |= (state-&gt;cfg.disable_sample_and_hold &amp; 1) &lt;&lt; 4;</div><div class='ctx'> 	reg_908 |= (state-&gt;cfg.enable_current_mirror &amp; 1) &lt;&lt; 7;</div><div class='ctx'> </div><div class='del'>-	dib7000p_write_word(state, 908, reg_908);</div><div class='del'>-	dib7000p_write_word(state, 909, reg_909);</div><div class='add'>+	if (state-&gt;version != SOC7090) {</div><div class='add'>+		dib7000p_write_word(state, 908, reg_908);</div><div class='add'>+		dib7000p_write_word(state, 909, reg_909);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dib7000p_set_bandwidth(struct dib7000p_state *state, u32 bw)</div><div class='hunk'>@@ -398,6 +411,24 @@ int dib7000p_set_wbd_ref(struct dvb_frontend *demod, u16 value)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dib7000p_set_wbd_ref);</div><div class='ctx'> </div><div class='add'>+int dib7000p_get_agc_values(struct dvb_frontend *fe,</div><div class='add'>+		u16 *agc_global, u16 *agc1, u16 *agc2, u16 *wbd)</div><div class='add'>+{</div><div class='add'>+	struct dib7000p_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (agc_global != NULL)</div><div class='add'>+		*agc_global = dib7000p_read_word(state, 394);</div><div class='add'>+	if (agc1 != NULL)</div><div class='add'>+		*agc1 = dib7000p_read_word(state, 392);</div><div class='add'>+	if (agc2 != NULL)</div><div class='add'>+		*agc2 = dib7000p_read_word(state, 393);</div><div class='add'>+	if (wbd != NULL)</div><div class='add'>+		*wbd = dib7000p_read_word(state, 397);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dib7000p_get_agc_values);</div><div class='add'>+</div><div class='ctx'> static void dib7000p_reset_pll(struct dib7000p_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	struct dibx000_bandwidth_config *bw = &amp;state-&gt;cfg.bw[0];</div><div class='hunk'>@@ -519,7 +550,7 @@ static u16 dib7000p_defaults[] = {</div><div class='ctx'> 	// auto search configuration</div><div class='ctx'> 	3, 2,</div><div class='ctx'> 	0x0004,</div><div class='del'>-	0x1000,</div><div class='add'>+	(1&lt;&lt;3)|(1&lt;&lt;11)|(1&lt;&lt;12)|(1&lt;&lt;13),</div><div class='ctx'> 	0x0814,			/* Equal Lock */</div><div class='ctx'> </div><div class='ctx'> 	12, 6,</div><div class='hunk'>@@ -595,13 +626,6 @@ static u16 dib7000p_defaults[] = {</div><div class='ctx'> 	1, 235,</div><div class='ctx'> 	0x0062,</div><div class='ctx'> </div><div class='del'>-	2, 901,</div><div class='del'>-	0x0006,</div><div class='del'>-	(3 &lt;&lt; 10) | (1 &lt;&lt; 6),</div><div class='del'>-</div><div class='del'>-	1, 905,</div><div class='del'>-	0x2c8e,</div><div class='del'>-</div><div class='ctx'> 	0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -618,15 +642,18 @@ static int dib7000p_demod_reset(struct dib7000p_state *state)</div><div class='ctx'> 	dib7000p_write_word(state, 770, 0xffff);</div><div class='ctx'> 	dib7000p_write_word(state, 771, 0xffff);</div><div class='ctx'> 	dib7000p_write_word(state, 772, 0x001f);</div><div class='del'>-	dib7000p_write_word(state, 898, 0x0003);</div><div class='ctx'> 	dib7000p_write_word(state, 1280, 0x001f - ((1 &lt;&lt; 4) | (1 &lt;&lt; 3)));</div><div class='ctx'> </div><div class='ctx'> 	dib7000p_write_word(state, 770, 0);</div><div class='ctx'> 	dib7000p_write_word(state, 771, 0);</div><div class='ctx'> 	dib7000p_write_word(state, 772, 0);</div><div class='del'>-	dib7000p_write_word(state, 898, 0);</div><div class='ctx'> 	dib7000p_write_word(state, 1280, 0);</div><div class='ctx'> </div><div class='add'>+	if (state-&gt;version != SOC7090) {</div><div class='add'>+		dib7000p_write_word(state,  898, 0x0003);</div><div class='add'>+		dib7000p_write_word(state,  898, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* default */</div><div class='ctx'> 	dib7000p_reset_pll(state);</div><div class='ctx'> </div><div class='hunk'>@@ -640,7 +667,7 @@ static int dib7000p_demod_reset(struct dib7000p_state *state)</div><div class='ctx'> 		dib7000p_write_word(state, 42, (1&lt;&lt;5) | 3); /* P_iqc_thsat_ipc = 1 ; P_iqc_win2 = 3 */</div><div class='ctx'> 		dib7000p_write_word(state, 43, 0x2d4); /*-300 fag P_iqc_dect_min = -280 */</div><div class='ctx'> 		dib7000p_write_word(state, 44, 300); /* 300 fag P_iqc_dect_min = +280 */</div><div class='del'>-		dib7000p_write_word(state, 273, (1&lt;&lt;6) | 30);</div><div class='add'>+		dib7000p_write_word(state, 273, (0&lt;&lt;6) | 30);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dib7000p_set_output_mode(state, OUTMODE_HIGH_Z) != 0)</div><div class='ctx'> 		dprintk("OUTPUT_MODE could not be reset.");</div><div class='hunk'>@@ -655,7 +682,7 @@ static int dib7000p_demod_reset(struct dib7000p_state *state)</div><div class='ctx'> 	dib7000p_set_bandwidth(state, 8000);</div><div class='ctx'> </div><div class='ctx'> 	if (state-&gt;version == SOC7090) {</div><div class='del'>-		dib7000p_write_word(state, 36, 0x5755);/* P_iqc_impnc_on =1 &amp; P_iqc_corr_inh = 1 for impulsive noise */</div><div class='add'>+		dib7000p_write_word(state, 36, 0x0755);/* P_iqc_impnc_on =1 &amp; P_iqc_corr_inh = 1 for impulsive noise */</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (state-&gt;cfg.tuner_is_baseband)</div><div class='ctx'> 			dib7000p_write_word(state, 36, 0x0755);</div><div class='hunk'>@@ -664,6 +691,11 @@ static int dib7000p_demod_reset(struct dib7000p_state *state)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dib7000p_write_tab(state, dib7000p_defaults);</div><div class='add'>+	if (state-&gt;version != SOC7090) {</div><div class='add'>+		dib7000p_write_word(state, 901, 0x0006);</div><div class='add'>+		dib7000p_write_word(state, 902, (3 &lt;&lt; 10) | (1 &lt;&lt; 6));</div><div class='add'>+		dib7000p_write_word(state, 905, 0x2c8e);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dib7000p_set_power_mode(state, DIB7000P_POWER_INTERFACE_ONLY);</div><div class='ctx'> </div><div class='hunk'>@@ -780,8 +812,9 @@ static void dib7000p_set_dds(struct dib7000p_state *state, s32 offset_khz)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib7000p_agc_startup(struct dvb_frontend *demod, struct dvb_frontend_parameters *ch)</div><div class='add'>+static int dib7000p_agc_startup(struct dvb_frontend *demod)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *ch = &amp;demod-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dib7000p_state *state = demod-&gt;demodulator_priv;</div><div class='ctx'> 	int ret = -1;</div><div class='ctx'> 	u8 *agc_state = &amp;state-&gt;agc_state;</div><div class='hunk'>@@ -904,15 +937,16 @@ u32 dib7000p_ctrl_timf(struct dvb_frontend *fe, u8 op, u32 timf)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dib7000p_ctrl_timf);</div><div class='ctx'> </div><div class='del'>-static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_frontend_parameters *ch, u8 seq)</div><div class='add'>+static void dib7000p_set_channel(struct dib7000p_state *state,</div><div class='add'>+				 struct dtv_frontend_properties *ch, u8 seq)</div><div class='ctx'> {</div><div class='ctx'> 	u16 value, est[4];</div><div class='ctx'> </div><div class='del'>-	dib7000p_set_bandwidth(state, BANDWIDTH_TO_KHZ(ch-&gt;u.ofdm.bandwidth));</div><div class='add'>+	dib7000p_set_bandwidth(state, BANDWIDTH_TO_KHZ(ch-&gt;bandwidth_hz));</div><div class='ctx'> </div><div class='ctx'> 	/* nfft, guard, qam, alpha */</div><div class='ctx'> 	value = 0;</div><div class='del'>-	switch (ch-&gt;u.ofdm.transmission_mode) {</div><div class='add'>+	switch (ch-&gt;transmission_mode) {</div><div class='ctx'> 	case TRANSMISSION_MODE_2K:</div><div class='ctx'> 		value |= (0 &lt;&lt; 7);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -924,7 +958,7 @@ static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_fronte</div><div class='ctx'> 		value |= (1 &lt;&lt; 7);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	switch (ch-&gt;u.ofdm.guard_interval) {</div><div class='add'>+	switch (ch-&gt;guard_interval) {</div><div class='ctx'> 	case GUARD_INTERVAL_1_32:</div><div class='ctx'> 		value |= (0 &lt;&lt; 5);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -939,7 +973,7 @@ static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_fronte</div><div class='ctx'> 		value |= (2 &lt;&lt; 5);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	switch (ch-&gt;u.ofdm.constellation) {</div><div class='add'>+	switch (ch-&gt;modulation) {</div><div class='ctx'> 	case QPSK:</div><div class='ctx'> 		value |= (0 &lt;&lt; 3);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -970,11 +1004,11 @@ static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_fronte</div><div class='ctx'> 	value = 0;</div><div class='ctx'> 	if (1 != 0)</div><div class='ctx'> 		value |= (1 &lt;&lt; 6);</div><div class='del'>-	if (ch-&gt;u.ofdm.hierarchy_information == 1)</div><div class='add'>+	if (ch-&gt;hierarchy == 1)</div><div class='ctx'> 		value |= (1 &lt;&lt; 4);</div><div class='ctx'> 	if (1 == 1)</div><div class='ctx'> 		value |= 1;</div><div class='del'>-	switch ((ch-&gt;u.ofdm.hierarchy_information == 0 || 1 == 1) ? ch-&gt;u.ofdm.code_rate_HP : ch-&gt;u.ofdm.code_rate_LP) {</div><div class='add'>+	switch ((ch-&gt;hierarchy == 0 || 1 == 1) ? ch-&gt;code_rate_HP : ch-&gt;code_rate_LP) {</div><div class='ctx'> 	case FEC_2_3:</div><div class='ctx'> 		value |= (2 &lt;&lt; 1);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1001,7 +1035,7 @@ static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_fronte</div><div class='ctx'> 	dib7000p_write_word(state, 33, 0x0005);</div><div class='ctx'> </div><div class='ctx'> 	/* P_dvsy_sync_wait */</div><div class='del'>-	switch (ch-&gt;u.ofdm.transmission_mode) {</div><div class='add'>+	switch (ch-&gt;transmission_mode) {</div><div class='ctx'> 	case TRANSMISSION_MODE_8K:</div><div class='ctx'> 		value = 256;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1013,7 +1047,7 @@ static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_fronte</div><div class='ctx'> 		value = 64;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	switch (ch-&gt;u.ofdm.guard_interval) {</div><div class='add'>+	switch (ch-&gt;guard_interval) {</div><div class='ctx'> 	case GUARD_INTERVAL_1_16:</div><div class='ctx'> 		value *= 2;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1034,11 +1068,11 @@ static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_fronte</div><div class='ctx'> 		state-&gt;div_sync_wait = (value * 3) / 2 + state-&gt;cfg.diversity_delay;</div><div class='ctx'> </div><div class='ctx'> 	/* deactive the possibility of diversity reception if extended interleaver */</div><div class='del'>-	state-&gt;div_force_off = !1 &amp;&amp; ch-&gt;u.ofdm.transmission_mode != TRANSMISSION_MODE_8K;</div><div class='add'>+	state-&gt;div_force_off = !1 &amp;&amp; ch-&gt;transmission_mode != TRANSMISSION_MODE_8K;</div><div class='ctx'> 	dib7000p_set_diversity_in(&amp;state-&gt;demod, state-&gt;div_state);</div><div class='ctx'> </div><div class='ctx'> 	/* channel estimation fine configuration */</div><div class='del'>-	switch (ch-&gt;u.ofdm.constellation) {</div><div class='add'>+	switch (ch-&gt;modulation) {</div><div class='ctx'> 	case QAM_64:</div><div class='ctx'> 		est[0] = 0x0148;	/* P_adp_regul_cnt 0.04 */</div><div class='ctx'> 		est[1] = 0xfff0;	/* P_adp_noise_cnt -0.002 */</div><div class='hunk'>@@ -1062,27 +1096,31 @@ static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_fronte</div><div class='ctx'> 		dib7000p_write_word(state, 187 + value, est[value]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib7000p_autosearch_start(struct dvb_frontend *demod, struct dvb_frontend_parameters *ch)</div><div class='add'>+static int dib7000p_autosearch_start(struct dvb_frontend *demod)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *ch = &amp;demod-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dib7000p_state *state = demod-&gt;demodulator_priv;</div><div class='del'>-	struct dvb_frontend_parameters schan;</div><div class='add'>+	struct dtv_frontend_properties schan;</div><div class='ctx'> 	u32 value, factor;</div><div class='ctx'> 	u32 internal = dib7000p_get_internal_freq(state);</div><div class='ctx'> </div><div class='ctx'> 	schan = *ch;</div><div class='del'>-	schan.u.ofdm.constellation = QAM_64;</div><div class='del'>-	schan.u.ofdm.guard_interval = GUARD_INTERVAL_1_32;</div><div class='del'>-	schan.u.ofdm.transmission_mode = TRANSMISSION_MODE_8K;</div><div class='del'>-	schan.u.ofdm.code_rate_HP = FEC_2_3;</div><div class='del'>-	schan.u.ofdm.code_rate_LP = FEC_3_4;</div><div class='del'>-	schan.u.ofdm.hierarchy_information = 0;</div><div class='add'>+	schan.modulation = QAM_64;</div><div class='add'>+	schan.guard_interval = GUARD_INTERVAL_1_32;</div><div class='add'>+	schan.transmission_mode = TRANSMISSION_MODE_8K;</div><div class='add'>+	schan.code_rate_HP = FEC_2_3;</div><div class='add'>+	schan.code_rate_LP = FEC_3_4;</div><div class='add'>+	schan.hierarchy = 0;</div><div class='ctx'> </div><div class='ctx'> 	dib7000p_set_channel(state, &amp;schan, 7);</div><div class='ctx'> </div><div class='del'>-	factor = BANDWIDTH_TO_KHZ(ch-&gt;u.ofdm.bandwidth);</div><div class='del'>-	if (factor &gt;= 5000)</div><div class='del'>-		factor = 1;</div><div class='del'>-	else</div><div class='add'>+	factor = BANDWIDTH_TO_KHZ(ch-&gt;bandwidth_hz);</div><div class='add'>+	if (factor &gt;= 5000) {</div><div class='add'>+		if (state-&gt;version == SOC7090)</div><div class='add'>+			factor = 2;</div><div class='add'>+		else</div><div class='add'>+			factor = 1;</div><div class='add'>+	} else</div><div class='ctx'> 		factor = 6;</div><div class='ctx'> </div><div class='ctx'> 	value = 30 * internal * factor;</div><div class='hunk'>@@ -1205,8 +1243,9 @@ static void dib7000p_spur_protect(struct dib7000p_state *state, u32 rf_khz, u32</div><div class='ctx'> 	dib7000p_write_word(state, 143, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_parameters *ch)</div><div class='add'>+static int dib7000p_tune(struct dvb_frontend *demod)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *ch = &amp;demod-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dib7000p_state *state = demod-&gt;demodulator_priv;</div><div class='ctx'> 	u16 tmp = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1239,7 +1278,7 @@ static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet</div><div class='ctx'> </div><div class='ctx'> 	/* P_timf_alpha, P_corm_alpha=6, P_corm_thres=0x80 */</div><div class='ctx'> 	tmp = (6 &lt;&lt; 8) | 0x80;</div><div class='del'>-	switch (ch-&gt;u.ofdm.transmission_mode) {</div><div class='add'>+	switch (ch-&gt;transmission_mode) {</div><div class='ctx'> 	case TRANSMISSION_MODE_2K:</div><div class='ctx'> 		tmp |= (2 &lt;&lt; 12);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1255,7 +1294,7 @@ static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet</div><div class='ctx'> </div><div class='ctx'> 	/* P_ctrl_freeze_pha_shift=0, P_ctrl_pha_off_max */</div><div class='ctx'> 	tmp = (0 &lt;&lt; 4);</div><div class='del'>-	switch (ch-&gt;u.ofdm.transmission_mode) {</div><div class='add'>+	switch (ch-&gt;transmission_mode) {</div><div class='ctx'> 	case TRANSMISSION_MODE_2K:</div><div class='ctx'> 		tmp |= 0x6;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1271,7 +1310,7 @@ static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet</div><div class='ctx'> </div><div class='ctx'> 	/* P_ctrl_sfreq_inh=0, P_ctrl_sfreq_step */</div><div class='ctx'> 	tmp = (0 &lt;&lt; 4);</div><div class='del'>-	switch (ch-&gt;u.ofdm.transmission_mode) {</div><div class='add'>+	switch (ch-&gt;transmission_mode) {</div><div class='ctx'> 	case TRANSMISSION_MODE_2K:</div><div class='ctx'> 		tmp |= 0x6;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1303,9 +1342,9 @@ static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (state-&gt;cfg.spur_protect)</div><div class='del'>-		dib7000p_spur_protect(state, ch-&gt;frequency / 1000, BANDWIDTH_TO_KHZ(ch-&gt;u.ofdm.bandwidth));</div><div class='add'>+		dib7000p_spur_protect(state, ch-&gt;frequency / 1000, BANDWIDTH_TO_KHZ(ch-&gt;bandwidth_hz));</div><div class='ctx'> </div><div class='del'>-	dib7000p_set_bandwidth(state, BANDWIDTH_TO_KHZ(ch-&gt;u.ofdm.bandwidth));</div><div class='add'>+	dib7000p_set_bandwidth(state, BANDWIDTH_TO_KHZ(ch-&gt;bandwidth_hz));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1323,7 +1362,7 @@ static int dib7000p_sleep(struct dvb_frontend *demod)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib7000p_state *state = demod-&gt;demodulator_priv;</div><div class='ctx'> 	if (state-&gt;version == SOC7090)</div><div class='del'>-		return dib7090_set_output_mode(demod, OUTMODE_HIGH_Z) | dib7000p_set_power_mode(state, DIB7000P_POWER_INTERFACE_ONLY);</div><div class='add'>+		return dib7000p_set_power_mode(state, DIB7000P_POWER_INTERFACE_ONLY);</div><div class='ctx'> 	return dib7000p_set_output_mode(state, OUTMODE_HIGH_Z) | dib7000p_set_power_mode(state, DIB7000P_POWER_INTERFACE_ONLY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1345,93 +1384,94 @@ static int dib7000p_identify(struct dib7000p_state *st)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib7000p_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dib7000p_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fep = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dib7000p_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u16 tps = dib7000p_read_word(state, 463);</div><div class='ctx'> </div><div class='ctx'> 	fep-&gt;inversion = INVERSION_AUTO;</div><div class='ctx'> </div><div class='del'>-	fep-&gt;u.ofdm.bandwidth = BANDWIDTH_TO_INDEX(state-&gt;current_bandwidth);</div><div class='add'>+	fep-&gt;bandwidth_hz = BANDWIDTH_TO_HZ(state-&gt;current_bandwidth);</div><div class='ctx'> </div><div class='ctx'> 	switch ((tps &gt;&gt; 8) &amp; 0x3) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		fep-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_2K;</div><div class='add'>+		fep-&gt;transmission_mode = TRANSMISSION_MODE_2K;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		fep-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_8K;</div><div class='add'>+		fep-&gt;transmission_mode = TRANSMISSION_MODE_8K;</div><div class='ctx'> 		break;</div><div class='del'>-	/* case 2: fep-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_4K; break; */</div><div class='add'>+	/* case 2: fep-&gt;transmission_mode = TRANSMISSION_MODE_4K; break; */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (tps &amp; 0x3) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		fep-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_32;</div><div class='add'>+		fep-&gt;guard_interval = GUARD_INTERVAL_1_32;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		fep-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_16;</div><div class='add'>+		fep-&gt;guard_interval = GUARD_INTERVAL_1_16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		fep-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_8;</div><div class='add'>+		fep-&gt;guard_interval = GUARD_INTERVAL_1_8;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		fep-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_4;</div><div class='add'>+		fep-&gt;guard_interval = GUARD_INTERVAL_1_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch ((tps &gt;&gt; 14) &amp; 0x3) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		fep-&gt;u.ofdm.constellation = QPSK;</div><div class='add'>+		fep-&gt;modulation = QPSK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		fep-&gt;u.ofdm.constellation = QAM_16;</div><div class='add'>+		fep-&gt;modulation = QAM_16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='ctx'> 	default:</div><div class='del'>-		fep-&gt;u.ofdm.constellation = QAM_64;</div><div class='add'>+		fep-&gt;modulation = QAM_64;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* as long as the frontend_param structure is fixed for hierarchical transmission I refuse to use it */</div><div class='ctx'> 	/* (tps &gt;&gt; 13) &amp; 0x1 == hrch is used, (tps &gt;&gt; 10) &amp; 0x7 == alpha */</div><div class='ctx'> </div><div class='del'>-	fep-&gt;u.ofdm.hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+	fep-&gt;hierarchy = HIERARCHY_NONE;</div><div class='ctx'> 	switch ((tps &gt;&gt; 5) &amp; 0x7) {</div><div class='ctx'> 	case 1:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_HP = FEC_1_2;</div><div class='add'>+		fep-&gt;code_rate_HP = FEC_1_2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_HP = FEC_2_3;</div><div class='add'>+		fep-&gt;code_rate_HP = FEC_2_3;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_HP = FEC_3_4;</div><div class='add'>+		fep-&gt;code_rate_HP = FEC_3_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 5:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_HP = FEC_5_6;</div><div class='add'>+		fep-&gt;code_rate_HP = FEC_5_6;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 7:</div><div class='ctx'> 	default:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_HP = FEC_7_8;</div><div class='add'>+		fep-&gt;code_rate_HP = FEC_7_8;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch ((tps &gt;&gt; 2) &amp; 0x7) {</div><div class='ctx'> 	case 1:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_LP = FEC_1_2;</div><div class='add'>+		fep-&gt;code_rate_LP = FEC_1_2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_LP = FEC_2_3;</div><div class='add'>+		fep-&gt;code_rate_LP = FEC_2_3;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_LP = FEC_3_4;</div><div class='add'>+		fep-&gt;code_rate_LP = FEC_3_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 5:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_LP = FEC_5_6;</div><div class='add'>+		fep-&gt;code_rate_LP = FEC_5_6;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 7:</div><div class='ctx'> 	default:</div><div class='del'>-		fep-&gt;u.ofdm.code_rate_LP = FEC_7_8;</div><div class='add'>+		fep-&gt;code_rate_LP = FEC_7_8;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1440,36 +1480,36 @@ static int dib7000p_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_pa</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib7000p_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dib7000p_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fep = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dib7000p_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int time, ret;</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;version == SOC7090) {</div><div class='add'>+	if (state-&gt;version == SOC7090)</div><div class='ctx'> 		dib7090_set_diversity_in(fe, 0);</div><div class='del'>-		dib7090_set_output_mode(fe, OUTMODE_HIGH_Z);</div><div class='del'>-	} else</div><div class='add'>+	else</div><div class='ctx'> 		dib7000p_set_output_mode(state, OUTMODE_HIGH_Z);</div><div class='ctx'> </div><div class='ctx'> 	/* maybe the parameter has been changed */</div><div class='ctx'> 	state-&gt;sfn_workaround_active = buggy_sfn_workaround;</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params)</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, fep);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> </div><div class='ctx'> 	/* start up the AGC */</div><div class='ctx'> 	state-&gt;agc_state = 0;</div><div class='ctx'> 	do {</div><div class='del'>-		time = dib7000p_agc_startup(fe, fep);</div><div class='add'>+		time = dib7000p_agc_startup(fe);</div><div class='ctx'> 		if (time != -1)</div><div class='ctx'> 			msleep(time);</div><div class='ctx'> 	} while (time != -1);</div><div class='ctx'> </div><div class='del'>-	if (fep-&gt;u.ofdm.transmission_mode == TRANSMISSION_MODE_AUTO ||</div><div class='del'>-		fep-&gt;u.ofdm.guard_interval == GUARD_INTERVAL_AUTO || fep-&gt;u.ofdm.constellation == QAM_AUTO || fep-&gt;u.ofdm.code_rate_HP == FEC_AUTO) {</div><div class='add'>+	if (fep-&gt;transmission_mode == TRANSMISSION_MODE_AUTO ||</div><div class='add'>+		fep-&gt;guard_interval == GUARD_INTERVAL_AUTO || fep-&gt;modulation == QAM_AUTO || fep-&gt;code_rate_HP == FEC_AUTO) {</div><div class='ctx'> 		int i = 800, found;</div><div class='ctx'> </div><div class='del'>-		dib7000p_autosearch_start(fe, fep);</div><div class='add'>+		dib7000p_autosearch_start(fe);</div><div class='ctx'> 		do {</div><div class='ctx'> 			msleep(1);</div><div class='ctx'> 			found = dib7000p_autosearch_is_irq(fe);</div><div class='hunk'>@@ -1479,15 +1519,19 @@ static int dib7000p_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_pa</div><div class='ctx'> 		if (found == 0 || found == 1)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		dib7000p_get_frontend(fe, fep);</div><div class='add'>+		dib7000p_get_frontend(fe);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = dib7000p_tune(fe, fep);</div><div class='add'>+	ret = dib7000p_tune(fe);</div><div class='ctx'> </div><div class='ctx'> 	/* make this a config parameter */</div><div class='del'>-	if (state-&gt;version == SOC7090)</div><div class='add'>+	if (state-&gt;version == SOC7090) {</div><div class='ctx'> 		dib7090_set_output_mode(fe, state-&gt;cfg.output_mode);</div><div class='del'>-	else</div><div class='add'>+		if (state-&gt;cfg.enMpegOutput == 0) {</div><div class='add'>+			dib7090_setDibTxMux(state, MPEG_ON_DIBTX);</div><div class='add'>+			dib7090_setHostBusMux(state, DIBTX_ON_HOSTBUS);</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='ctx'> 		dib7000p_set_output_mode(state, state-&gt;cfg.output_mode);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1831,7 +1875,8 @@ static int w7090p_tuner_rw_serpar(struct i2c_adapter *i2c_adap, struct i2c_msg m</div><div class='ctx'> 	return num;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dib7090p_rw_on_apb(struct i2c_adapter *i2c_adap, struct i2c_msg msg[], int num, u16 apb_address)</div><div class='add'>+static int dib7090p_rw_on_apb(struct i2c_adapter *i2c_adap,</div><div class='add'>+		struct i2c_msg msg[], int num, u16 apb_address)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib7000p_state *state = i2c_get_adapdata(i2c_adap);</div><div class='ctx'> 	u16 word;</div><div class='hunk'>@@ -1933,10 +1978,10 @@ static int dib7090_tuner_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msg[]</div><div class='ctx'> 		apb_address = 915;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x27:</div><div class='del'>-		apb_address = 916;</div><div class='add'>+		apb_address = 917;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x28:</div><div class='del'>-		apb_address = 917;</div><div class='add'>+		apb_address = 916;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x1d:</div><div class='ctx'> 		i = ((dib7000p_read_word(state, 72) &gt;&gt; 12) &amp; 0x3);</div><div class='hunk'>@@ -2031,12 +2076,7 @@ static u32 dib7090_calcSyncFreq(u32 P_Kin, u32 P_Kout, u32 insertExtSynchro, u32</div><div class='ctx'> </div><div class='ctx'> static int dib7090_cfg_DibTx(struct dib7000p_state *state, u32 P_Kin, u32 P_Kout, u32 insertExtSynchro, u32 synchroMode, u32 syncWord, u32 syncSize)</div><div class='ctx'> {</div><div class='del'>-	u8 index_buf;</div><div class='del'>-	u16 rx_copy_buf[22];</div><div class='del'>-</div><div class='ctx'> 	dprintk("Configure DibStream Tx");</div><div class='del'>-	for (index_buf = 0; index_buf &lt; 22; index_buf++)</div><div class='del'>-		rx_copy_buf[index_buf] = dib7000p_read_word(state, 1536+index_buf);</div><div class='ctx'> </div><div class='ctx'> 	dib7000p_write_word(state, 1615, 1);</div><div class='ctx'> 	dib7000p_write_word(state, 1603, P_Kin);</div><div class='hunk'>@@ -2048,9 +2088,6 @@ static int dib7090_cfg_DibTx(struct dib7000p_state *state, u32 P_Kin, u32 P_Kout</div><div class='ctx'> 	dib7000p_write_word(state, 1612, syncSize);</div><div class='ctx'> 	dib7000p_write_word(state, 1615, 0);</div><div class='ctx'> </div><div class='del'>-	for (index_buf = 0; index_buf &lt; 22; index_buf++)</div><div class='del'>-		dib7000p_write_word(state, 1536+index_buf, rx_copy_buf[index_buf]);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2077,109 +2114,121 @@ static int dib7090_cfg_DibRx(struct dib7000p_state *state, u32 P_Kin, u32 P_Kout</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib7090_enDivOnHostBus(struct dib7000p_state *state)</div><div class='del'>-{</div><div class='del'>-	u16 reg;</div><div class='del'>-</div><div class='del'>-	dprintk("Enable Diversity on host bus");</div><div class='del'>-	reg = (1 &lt;&lt; 8) | (1 &lt;&lt; 5);</div><div class='del'>-	dib7000p_write_word(state, 1288, reg);</div><div class='del'>-</div><div class='del'>-	return dib7090_cfg_DibTx(state, 5, 5, 0, 0, 0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dib7090_enAdcOnHostBus(struct dib7000p_state *state)</div><div class='del'>-{</div><div class='del'>-	u16 reg;</div><div class='del'>-</div><div class='del'>-	dprintk("Enable ADC on host bus");</div><div class='del'>-	reg = (1 &lt;&lt; 7) | (1 &lt;&lt; 5);</div><div class='del'>-	dib7000p_write_word(state, 1288, reg);</div><div class='del'>-</div><div class='del'>-	return dib7090_cfg_DibTx(state, 20, 5, 10, 0, 0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dib7090_enMpegOnHostBus(struct dib7000p_state *state)</div><div class='add'>+static void dib7090_enMpegMux(struct dib7000p_state *state, int onoff)</div><div class='ctx'> {</div><div class='del'>-	u16 reg;</div><div class='del'>-</div><div class='del'>-	dprintk("Enable Mpeg on host bus");</div><div class='del'>-	reg = (1 &lt;&lt; 9) | (1 &lt;&lt; 5);</div><div class='del'>-	dib7000p_write_word(state, 1288, reg);</div><div class='add'>+	u16 reg_1287 = dib7000p_read_word(state, 1287);</div><div class='ctx'> </div><div class='del'>-	return dib7090_cfg_DibTx(state, 8, 5, 0, 0, 0, 0);</div><div class='del'>-}</div><div class='add'>+	switch (onoff) {</div><div class='add'>+	case 1:</div><div class='add'>+			reg_1287 &amp;= ~(1&lt;&lt;7);</div><div class='add'>+			break;</div><div class='add'>+	case 0:</div><div class='add'>+			reg_1287 |= (1&lt;&lt;7);</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static int dib7090_enMpegInput(struct dib7000p_state *state)</div><div class='del'>-{</div><div class='del'>-	dprintk("Enable Mpeg input");</div><div class='del'>-	return dib7090_cfg_DibRx(state, 8, 5, 0, 0, 0, 8, 0);	/*outputRate = 8 */</div><div class='add'>+	dib7000p_write_word(state, 1287, reg_1287);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib7090_enMpegMux(struct dib7000p_state *state, u16 pulseWidth, u16 enSerialMode, u16 enSerialClkDiv2)</div><div class='add'>+static void dib7090_configMpegMux(struct dib7000p_state *state,</div><div class='add'>+		u16 pulseWidth, u16 enSerialMode, u16 enSerialClkDiv2)</div><div class='ctx'> {</div><div class='del'>-	u16 reg = (1 &lt;&lt; 7) | ((pulseWidth &amp; 0x1f) &lt;&lt; 2) | ((enSerialMode &amp; 0x1) &lt;&lt; 1) | (enSerialClkDiv2 &amp; 0x1);</div><div class='del'>-</div><div class='ctx'> 	dprintk("Enable Mpeg mux");</div><div class='del'>-	dib7000p_write_word(state, 1287, reg);</div><div class='ctx'> </div><div class='del'>-	reg &amp;= ~(1 &lt;&lt; 7);</div><div class='del'>-	dib7000p_write_word(state, 1287, reg);</div><div class='add'>+	dib7090_enMpegMux(state, 0);</div><div class='ctx'> </div><div class='del'>-	reg = (1 &lt;&lt; 4);</div><div class='del'>-	dib7000p_write_word(state, 1288, reg);</div><div class='add'>+	/* If the input mode is MPEG do not divide the serial clock */</div><div class='add'>+	if ((enSerialMode == 1) &amp;&amp; (state-&gt;input_mode_mpeg == 1))</div><div class='add'>+		enSerialClkDiv2 = 0;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	dib7000p_write_word(state, 1287, ((pulseWidth &amp; 0x1f) &lt;&lt; 2)</div><div class='add'>+			| ((enSerialMode &amp; 0x1) &lt;&lt; 1)</div><div class='add'>+			| (enSerialClkDiv2 &amp; 0x1));</div><div class='add'>+</div><div class='add'>+	dib7090_enMpegMux(state, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib7090_disableMpegMux(struct dib7000p_state *state)</div><div class='add'>+static void dib7090_setDibTxMux(struct dib7000p_state *state, int mode)</div><div class='ctx'> {</div><div class='del'>-	u16 reg;</div><div class='del'>-</div><div class='del'>-	dprintk("Disable Mpeg mux");</div><div class='del'>-	dib7000p_write_word(state, 1288, 0);</div><div class='del'>-</div><div class='del'>-	reg = dib7000p_read_word(state, 1287);</div><div class='del'>-	reg &amp;= ~(1 &lt;&lt; 7);</div><div class='del'>-	dib7000p_write_word(state, 1287, reg);</div><div class='add'>+	u16 reg_1288 = dib7000p_read_word(state, 1288) &amp; ~(0x7 &lt;&lt; 7);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case MPEG_ON_DIBTX:</div><div class='add'>+			dprintk("SET MPEG ON DIBSTREAM TX");</div><div class='add'>+			dib7090_cfg_DibTx(state, 8, 5, 0, 0, 0, 0);</div><div class='add'>+			reg_1288 |= (1&lt;&lt;9);</div><div class='add'>+			break;</div><div class='add'>+	case DIV_ON_DIBTX:</div><div class='add'>+			dprintk("SET DIV_OUT ON DIBSTREAM TX");</div><div class='add'>+			dib7090_cfg_DibTx(state, 5, 5, 0, 0, 0, 0);</div><div class='add'>+			reg_1288 |= (1&lt;&lt;8);</div><div class='add'>+			break;</div><div class='add'>+	case ADC_ON_DIBTX:</div><div class='add'>+			dprintk("SET ADC_OUT ON DIBSTREAM TX");</div><div class='add'>+			dib7090_cfg_DibTx(state, 20, 5, 10, 0, 0, 0);</div><div class='add'>+			reg_1288 |= (1&lt;&lt;7);</div><div class='add'>+			break;</div><div class='add'>+	default:</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	dib7000p_write_word(state, 1288, reg_1288);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib7090_set_input_mode(struct dvb_frontend *fe, int mode)</div><div class='add'>+static void dib7090_setHostBusMux(struct dib7000p_state *state, int mode)</div><div class='ctx'> {</div><div class='del'>-	struct dib7000p_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u16 reg_1288 = dib7000p_read_word(state, 1288) &amp; ~(0x7 &lt;&lt; 4);</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='del'>-	case INPUT_MODE_DIVERSITY:</div><div class='del'>-			dprintk("Enable diversity INPUT");</div><div class='del'>-			dib7090_cfg_DibRx(state, 5, 5, 0, 0, 0, 0, 0);</div><div class='add'>+	case DEMOUT_ON_HOSTBUS:</div><div class='add'>+			dprintk("SET DEM OUT OLD INTERF ON HOST BUS");</div><div class='add'>+			dib7090_enMpegMux(state, 0);</div><div class='add'>+			reg_1288 |= (1&lt;&lt;6);</div><div class='add'>+			break;</div><div class='add'>+	case DIBTX_ON_HOSTBUS:</div><div class='add'>+			dprintk("SET DIBSTREAM TX ON HOST BUS");</div><div class='add'>+			dib7090_enMpegMux(state, 0);</div><div class='add'>+			reg_1288 |= (1&lt;&lt;5);</div><div class='ctx'> 			break;</div><div class='del'>-	case INPUT_MODE_MPEG:</div><div class='del'>-			dprintk("Enable Mpeg INPUT");</div><div class='del'>-			dib7090_cfg_DibRx(state, 8, 5, 0, 0, 0, 8, 0); /*outputRate = 8 */</div><div class='add'>+	case MPEG_ON_HOSTBUS:</div><div class='add'>+			dprintk("SET MPEG MUX ON HOST BUS");</div><div class='add'>+			reg_1288 |= (1&lt;&lt;4);</div><div class='ctx'> 			break;</div><div class='del'>-	case INPUT_MODE_OFF:</div><div class='ctx'> 	default:</div><div class='del'>-			dprintk("Disable INPUT");</div><div class='del'>-			dib7090_cfg_DibRx(state, 0, 0, 0, 0, 0, 0, 0);</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	dib7000p_write_word(state, 1288, reg_1288);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib7090_set_diversity_in(struct dvb_frontend *fe, int onoff)</div><div class='add'>+int dib7090_set_diversity_in(struct dvb_frontend *fe, int onoff)</div><div class='ctx'> {</div><div class='add'>+	struct dib7000p_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u16 reg_1287;</div><div class='add'>+</div><div class='ctx'> 	switch (onoff) {</div><div class='del'>-	case 0:		/* only use the internal way - not the diversity input */</div><div class='del'>-		dib7090_set_input_mode(fe, INPUT_MODE_MPEG);</div><div class='del'>-		break;</div><div class='del'>-	case 1:		/* both ways */</div><div class='del'>-	case 2:		/* only the diversity input */</div><div class='del'>-		dib7090_set_input_mode(fe, INPUT_MODE_DIVERSITY);</div><div class='del'>-		break;</div><div class='add'>+	case 0: /* only use the internal way - not the diversity input */</div><div class='add'>+			dprintk("%s mode OFF : by default Enable Mpeg INPUT", __func__);</div><div class='add'>+			dib7090_cfg_DibRx(state, 8, 5, 0, 0, 0, 8, 0);</div><div class='add'>+</div><div class='add'>+			/* Do not divide the serial clock of MPEG MUX */</div><div class='add'>+			/* in SERIAL MODE in case input mode MPEG is used */</div><div class='add'>+			reg_1287 = dib7000p_read_word(state, 1287);</div><div class='add'>+			/* enSerialClkDiv2 == 1 ? */</div><div class='add'>+			if ((reg_1287 &amp; 0x1) == 1) {</div><div class='add'>+				/* force enSerialClkDiv2 = 0 */</div><div class='add'>+				reg_1287 &amp;= ~0x1;</div><div class='add'>+				dib7000p_write_word(state, 1287, reg_1287);</div><div class='add'>+			}</div><div class='add'>+			state-&gt;input_mode_mpeg = 1;</div><div class='add'>+			break;</div><div class='add'>+	case 1: /* both ways */</div><div class='add'>+	case 2: /* only the diversity input */</div><div class='add'>+			dprintk("%s ON : Enable diversity INPUT", __func__);</div><div class='add'>+			dib7090_cfg_DibRx(state, 5, 5, 0, 0, 0, 0, 0);</div><div class='add'>+			state-&gt;input_mode_mpeg = 0;</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dib7000p_set_diversity_in(&amp;state-&gt;demod, onoff);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2204,69 +2253,63 @@ static int dib7090_set_output_mode(struct dvb_frontend *fe, int mode)</div><div class='ctx'> </div><div class='ctx'> 	case OUTMODE_MPEG2_SERIAL:</div><div class='ctx'> 		if (prefer_mpeg_mux_use) {</div><div class='del'>-			dprintk("Sip 7090P setting output mode TS_SERIAL using Mpeg Mux");</div><div class='del'>-			dib7090_enMpegOnHostBus(state);</div><div class='del'>-			dib7090_enMpegInput(state);</div><div class='del'>-			if (state-&gt;cfg.enMpegOutput == 1)</div><div class='del'>-				dib7090_enMpegMux(state, 3, 1, 1);</div><div class='del'>-</div><div class='del'>-		} else {	/* Use Smooth block */</div><div class='del'>-			dprintk("Sip 7090P setting output mode TS_SERIAL using Smooth bloc");</div><div class='del'>-			dib7090_disableMpegMux(state);</div><div class='del'>-			dib7000p_write_word(state, 1288, (1 &lt;&lt; 6));</div><div class='del'>-			outreg |= (2 &lt;&lt; 6) | (0 &lt;&lt; 1);</div><div class='add'>+			dprintk("setting output mode TS_SERIAL using Mpeg Mux");</div><div class='add'>+			dib7090_configMpegMux(state, 3, 1, 1);</div><div class='add'>+			dib7090_setHostBusMux(state, MPEG_ON_HOSTBUS);</div><div class='add'>+		} else {/* Use Smooth block */</div><div class='add'>+			dprintk("setting output mode TS_SERIAL using Smooth bloc");</div><div class='add'>+			dib7090_setHostBusMux(state, DEMOUT_ON_HOSTBUS);</div><div class='add'>+			outreg |= (2&lt;&lt;6) | (0 &lt;&lt; 1);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OUTMODE_MPEG2_PAR_GATED_CLK:</div><div class='ctx'> 		if (prefer_mpeg_mux_use) {</div><div class='del'>-			dprintk("Sip 7090P setting output mode TS_PARALLEL_GATED using Mpeg Mux");</div><div class='del'>-			dib7090_enMpegOnHostBus(state);</div><div class='del'>-			dib7090_enMpegInput(state);</div><div class='del'>-			if (state-&gt;cfg.enMpegOutput == 1)</div><div class='del'>-				dib7090_enMpegMux(state, 2, 0, 0);</div><div class='del'>-		} else {	/* Use Smooth block */</div><div class='del'>-			dprintk("Sip 7090P setting output mode TS_PARALLEL_GATED using Smooth block");</div><div class='del'>-			dib7090_disableMpegMux(state);</div><div class='del'>-			dib7000p_write_word(state, 1288, (1 &lt;&lt; 6));</div><div class='del'>-			outreg |= (0 &lt;&lt; 6);</div><div class='add'>+			dprintk("setting output mode TS_PARALLEL_GATED using Mpeg Mux");</div><div class='add'>+			dib7090_configMpegMux(state, 2, 0, 0);</div><div class='add'>+			dib7090_setHostBusMux(state, MPEG_ON_HOSTBUS);</div><div class='add'>+		} else { /* Use Smooth block */</div><div class='add'>+			dprintk("setting output mode TS_PARALLEL_GATED using Smooth block");</div><div class='add'>+			dib7090_setHostBusMux(state, DEMOUT_ON_HOSTBUS);</div><div class='add'>+			outreg |= (0&lt;&lt;6);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OUTMODE_MPEG2_PAR_CONT_CLK:	/* Using Smooth block only */</div><div class='del'>-		dprintk("Sip 7090P setting output mode TS_PARALLEL_CONT using Smooth block");</div><div class='del'>-		dib7090_disableMpegMux(state);</div><div class='del'>-		dib7000p_write_word(state, 1288, (1 &lt;&lt; 6));</div><div class='del'>-		outreg |= (1 &lt;&lt; 6);</div><div class='add'>+		dprintk("setting output mode TS_PARALLEL_CONT using Smooth block");</div><div class='add'>+		dib7090_setHostBusMux(state, DEMOUT_ON_HOSTBUS);</div><div class='add'>+		outreg |= (1&lt;&lt;6);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OUTMODE_MPEG2_FIFO:	/* Using Smooth block because not supported by new Mpeg Mux bloc */</div><div class='del'>-		dprintk("Sip 7090P setting output mode TS_FIFO using Smooth block");</div><div class='del'>-		dib7090_disableMpegMux(state);</div><div class='del'>-		dib7000p_write_word(state, 1288, (1 &lt;&lt; 6));</div><div class='del'>-		outreg |= (5 &lt;&lt; 6);</div><div class='add'>+		dprintk("setting output mode TS_FIFO using Smooth block");</div><div class='add'>+		dib7090_setHostBusMux(state, DEMOUT_ON_HOSTBUS);</div><div class='add'>+		outreg |= (5&lt;&lt;6);</div><div class='ctx'> 		smo_mode |= (3 &lt;&lt; 1);</div><div class='ctx'> 		fifo_threshold = 512;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OUTMODE_DIVERSITY:</div><div class='del'>-		dprintk("Sip 7090P setting output mode MODE_DIVERSITY");</div><div class='del'>-		dib7090_disableMpegMux(state);</div><div class='del'>-		dib7090_enDivOnHostBus(state);</div><div class='add'>+		dprintk("setting output mode MODE_DIVERSITY");</div><div class='add'>+		dib7090_setDibTxMux(state, DIV_ON_DIBTX);</div><div class='add'>+		dib7090_setHostBusMux(state, DIBTX_ON_HOSTBUS);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OUTMODE_ANALOG_ADC:</div><div class='del'>-		dprintk("Sip 7090P setting output mode MODE_ANALOG_ADC");</div><div class='del'>-		dib7090_enAdcOnHostBus(state);</div><div class='add'>+		dprintk("setting output mode MODE_ANALOG_ADC");</div><div class='add'>+		dib7090_setDibTxMux(state, ADC_ON_DIBTX);</div><div class='add'>+		dib7090_setHostBusMux(state, DIBTX_ON_HOSTBUS);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	if (mode != OUTMODE_HIGH_Z)</div><div class='add'>+		outreg |= (1 &lt;&lt; 10);</div><div class='ctx'> </div><div class='ctx'> 	if (state-&gt;cfg.output_mpeg2_in_188_bytes)</div><div class='ctx'> 		smo_mode |= (1 &lt;&lt; 5);</div><div class='ctx'> </div><div class='ctx'> 	ret |= dib7000p_write_word(state, 235, smo_mode);</div><div class='ctx'> 	ret |= dib7000p_write_word(state, 236, fifo_threshold);	/* synchronous fread */</div><div class='del'>-	ret |= dib7000p_write_word(state, 1286, outreg | (1 &lt;&lt; 10));	/* allways set Dout active = 1 !!! */</div><div class='add'>+	ret |= dib7000p_write_word(state, 1286, outreg);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2296,13 +2339,6 @@ int dib7090_tuner_sleep(struct dvb_frontend *fe, int onoff)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dib7090_tuner_sleep);</div><div class='ctx'> </div><div class='del'>-int dib7090_agc_restart(struct dvb_frontend *fe, u8 restart)</div><div class='del'>-{</div><div class='del'>-	dprintk("AGC restart callback: %d", restart);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(dib7090_agc_restart);</div><div class='del'>-</div><div class='ctx'> int dib7090_get_adc_power(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	return dib7000p_get_adc_power(fe);</div><div class='hunk'>@@ -2391,9 +2427,9 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(dib7000p_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops dib7000p_ops = {</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		 .name = "DiBcom 7000PC",</div><div class='del'>-		 .type = FE_OFDM,</div><div class='ctx'> 		 .frequency_min = 44250000,</div><div class='ctx'> 		 .frequency_max = 867250000,</div><div class='ctx'> 		 .frequency_stepsize = 62500,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib7000p.h b/drivers/media/dvb/frontends/dib7000p.h<br/>index 0179f9474bac..b61b03a6e1ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib7000p.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib7000p.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib7000p.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/dib7000p.h</a></div><div class='hunk'>@@ -56,11 +56,12 @@ extern int dib7000p_pid_filter(struct dvb_frontend *, u8 id, u16 pid, u8 onoff);</div><div class='ctx'> extern int dib7000p_pid_filter_ctrl(struct dvb_frontend *fe, u8 onoff);</div><div class='ctx'> extern int dib7000p_update_pll(struct dvb_frontend *fe, struct dibx000_bandwidth_config *bw);</div><div class='ctx'> extern u32 dib7000p_ctrl_timf(struct dvb_frontend *fe, u8 op, u32 timf);</div><div class='del'>-extern int dib7090_agc_restart(struct dvb_frontend *fe, u8 restart);</div><div class='ctx'> extern int dib7090_tuner_sleep(struct dvb_frontend *fe, int onoff);</div><div class='ctx'> extern int dib7090_get_adc_power(struct dvb_frontend *fe);</div><div class='ctx'> extern struct i2c_adapter *dib7090_get_i2c_tuner(struct dvb_frontend *fe);</div><div class='ctx'> extern int dib7090_slave_reset(struct dvb_frontend *fe);</div><div class='add'>+extern int dib7000p_get_agc_values(struct dvb_frontend *fe,</div><div class='add'>+		u16 *agc_global, u16 *agc1, u16 *agc2, u16 *wbd);</div><div class='ctx'> #else</div><div class='ctx'> static inline struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg)</div><div class='ctx'> {</div><div class='hunk'>@@ -122,12 +123,6 @@ static inline u32 dib7000p_ctrl_timf(struct dvb_frontend *fe, u8 op, u32 timf)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int dib7090_agc_restart(struct dvb_frontend *fe, u8 restart)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int dib7090_tuner_sleep(struct dvb_frontend *fe, int onoff)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='hunk'>@@ -151,6 +146,13 @@ static inline int dib7090_slave_reset(struct dvb_frontend *fe)</div><div class='ctx'> 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline int dib7000p_get_agc_values(struct dvb_frontend *fe,</div><div class='add'>+		u16 *agc_global, u16 *agc1, u16 *agc2, u16 *wbd)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib8000.c b/drivers/media/dvb/frontends/dib8000.c<br/>index fe284d5292f5..9ca34f495009 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib8000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib8000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib8000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/dib8000.c</a></div><div class='hunk'>@@ -81,11 +81,15 @@ struct dib8000_state {</div><div class='ctx'> 	u8 i2c_write_buffer[4];</div><div class='ctx'> 	u8 i2c_read_buffer[2];</div><div class='ctx'> 	struct mutex i2c_buffer_lock;</div><div class='add'>+	u8 input_mode_mpeg;</div><div class='add'>+</div><div class='add'>+	u16 tuner_enable;</div><div class='add'>+	struct i2c_adapter dib8096p_tuner_adap;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum dib8000_power_mode {</div><div class='del'>-	DIB8000M_POWER_ALL = 0,</div><div class='del'>-	DIB8000M_POWER_INTERFACE_ONLY,</div><div class='add'>+	DIB8000_POWER_ALL = 0,</div><div class='add'>+	DIB8000_POWER_INTERFACE_ONLY,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u16 dib8000_i2c_read16(struct i2c_device *i2c, u16 reg)</div><div class='hunk'>@@ -428,20 +432,31 @@ static void dib8000_set_power_mode(struct dib8000_state *state, enum dib8000_pow</div><div class='ctx'> 	/* by default everything is going to be powered off */</div><div class='ctx'> 	u16 reg_774 = 0x3fff, reg_775 = 0xffff, reg_776 = 0xffff,</div><div class='ctx'> 		reg_900 = (dib8000_read_word(state, 900) &amp; 0xfffc) | 0x3,</div><div class='add'>+		reg_1280;</div><div class='add'>+</div><div class='add'>+	if (state-&gt;revision != 0x8090)</div><div class='ctx'> 		reg_1280 = (dib8000_read_word(state, 1280) &amp; 0x00ff) | 0xff00;</div><div class='add'>+	else</div><div class='add'>+		reg_1280 = (dib8000_read_word(state, 1280) &amp; 0x707f) | 0x8f80;</div><div class='ctx'> </div><div class='ctx'> 	/* now, depending on the requested mode, we power on */</div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 		/* power up everything in the demod */</div><div class='del'>-	case DIB8000M_POWER_ALL:</div><div class='add'>+	case DIB8000_POWER_ALL:</div><div class='ctx'> 		reg_774 = 0x0000;</div><div class='ctx'> 		reg_775 = 0x0000;</div><div class='ctx'> 		reg_776 = 0x0000;</div><div class='ctx'> 		reg_900 &amp;= 0xfffc;</div><div class='del'>-		reg_1280 &amp;= 0x00ff;</div><div class='add'>+		if (state-&gt;revision != 0x8090)</div><div class='add'>+			reg_1280 &amp;= 0x00ff;</div><div class='add'>+		else</div><div class='add'>+			reg_1280 &amp;= 0x707f;</div><div class='ctx'> 		break;</div><div class='del'>-	case DIB8000M_POWER_INTERFACE_ONLY:</div><div class='del'>-		reg_1280 &amp;= 0x00ff;</div><div class='add'>+	case DIB8000_POWER_INTERFACE_ONLY:</div><div class='add'>+		if (state-&gt;revision != 0x8090)</div><div class='add'>+			reg_1280 &amp;= 0x00ff;</div><div class='add'>+		else</div><div class='add'>+			reg_1280 &amp;= 0xfa7b;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -453,19 +468,67 @@ static void dib8000_set_power_mode(struct dib8000_state *state, enum dib8000_pow</div><div class='ctx'> 	dib8000_write_word(state, 1280, reg_1280);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dib8000_init_sdram(struct dib8000_state *state)</div><div class='add'>+{</div><div class='add'>+	u16 reg = 0;</div><div class='add'>+	dprintk("Init sdram");</div><div class='add'>+</div><div class='add'>+	reg = dib8000_read_word(state, 274)&amp;0xfff0;</div><div class='add'>+	/* P_dintlv_delay_ram = 7 because of MobileSdram */</div><div class='add'>+	dib8000_write_word(state, 274, reg | 0x7);</div><div class='add'>+</div><div class='add'>+	dib8000_write_word(state, 1803, (7&lt;&lt;2));</div><div class='add'>+</div><div class='add'>+	reg = dib8000_read_word(state, 1280);</div><div class='add'>+	/* force restart P_restart_sdram */</div><div class='add'>+	dib8000_write_word(state, 1280,  reg | (1&lt;&lt;2));</div><div class='add'>+</div><div class='add'>+	/* release restart P_restart_sdram */</div><div class='add'>+	dib8000_write_word(state, 1280,  reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int dib8000_set_adc_state(struct dib8000_state *state, enum dibx000_adc_states no)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	u16 reg_907 = dib8000_read_word(state, 907), reg_908 = dib8000_read_word(state, 908);</div><div class='add'>+	u16 reg, reg_907 = dib8000_read_word(state, 907);</div><div class='add'>+	u16 reg_908 = dib8000_read_word(state, 908);</div><div class='ctx'> </div><div class='ctx'> 	switch (no) {</div><div class='ctx'> 	case DIBX000_SLOW_ADC_ON:</div><div class='del'>-		reg_908 |= (1 &lt;&lt; 1) | (1 &lt;&lt; 0);</div><div class='del'>-		ret |= dib8000_write_word(state, 908, reg_908);</div><div class='del'>-		reg_908 &amp;= ~(1 &lt;&lt; 1);</div><div class='add'>+		if (state-&gt;revision != 0x8090) {</div><div class='add'>+			reg_908 |= (1 &lt;&lt; 1) | (1 &lt;&lt; 0);</div><div class='add'>+			ret |= dib8000_write_word(state, 908, reg_908);</div><div class='add'>+			reg_908 &amp;= ~(1 &lt;&lt; 1);</div><div class='add'>+		} else {</div><div class='add'>+			reg = dib8000_read_word(state, 1925);</div><div class='add'>+			/* en_slowAdc = 1 &amp; reset_sladc = 1 */</div><div class='add'>+			dib8000_write_word(state, 1925, reg |</div><div class='add'>+					(1&lt;&lt;4) | (1&lt;&lt;2));</div><div class='add'>+</div><div class='add'>+			/* read acces to make it works... strange ... */</div><div class='add'>+			reg = dib8000_read_word(state, 1925);</div><div class='add'>+			msleep(20);</div><div class='add'>+			/* en_slowAdc = 1 &amp; reset_sladc = 0 */</div><div class='add'>+			dib8000_write_word(state, 1925, reg &amp; ~(1&lt;&lt;4));</div><div class='add'>+</div><div class='add'>+			reg = dib8000_read_word(state, 921) &amp; ~((0x3 &lt;&lt; 14)</div><div class='add'>+					| (0x3 &lt;&lt; 12));</div><div class='add'>+			/* ref = Vin1 =&gt; Vbg ; sel = Vin0 or Vin3 ;</div><div class='add'>+			   (Vin2 = Vcm) */</div><div class='add'>+			dib8000_write_word(state, 921, reg | (1 &lt;&lt; 14)</div><div class='add'>+					| (3 &lt;&lt; 12));</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case DIBX000_SLOW_ADC_OFF:</div><div class='add'>+		if (state-&gt;revision == 0x8090) {</div><div class='add'>+			reg = dib8000_read_word(state, 1925);</div><div class='add'>+			/* reset_sladc = 1 en_slowAdc = 0 */</div><div class='add'>+			dib8000_write_word(state, 1925,</div><div class='add'>+					(reg &amp; ~(1&lt;&lt;2)) | (1&lt;&lt;4));</div><div class='add'>+		}</div><div class='ctx'> 		reg_908 |= (1 &lt;&lt; 1) | (1 &lt;&lt; 0);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -521,7 +584,12 @@ static int dib8000_set_bandwidth(struct dvb_frontend *fe, u32 bw)</div><div class='ctx'> </div><div class='ctx'> static int dib8000_sad_calib(struct dib8000_state *state)</div><div class='ctx'> {</div><div class='del'>-/* internal */</div><div class='add'>+	if (state-&gt;revision == 0x8090) {</div><div class='add'>+		dprintk("%s: the sad calibration is not needed for the dib8096P",</div><div class='add'>+				__func__);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	/* internal */</div><div class='ctx'> 	dib8000_write_word(state, 923, (0 &lt;&lt; 1) | (0 &lt;&lt; 0));</div><div class='ctx'> 	dib8000_write_word(state, 924, 776);	// 0.625*3.3 / 4096</div><div class='ctx'> </div><div class='hunk'>@@ -546,48 +614,129 @@ EXPORT_SYMBOL(dib8000_set_wbd_ref);</div><div class='ctx'> static void dib8000_reset_pll_common(struct dib8000_state *state, const struct dibx000_bandwidth_config *bw)</div><div class='ctx'> {</div><div class='ctx'> 	dprintk("ifreq: %d %x, inversion: %d", bw-&gt;ifreq, bw-&gt;ifreq, bw-&gt;ifreq &gt;&gt; 25);</div><div class='del'>-	dib8000_write_word(state, 23, (u16) (((bw-&gt;internal * 1000) &gt;&gt; 16) &amp; 0xffff));	/* P_sec_len */</div><div class='del'>-	dib8000_write_word(state, 24, (u16) ((bw-&gt;internal * 1000) &amp; 0xffff));</div><div class='add'>+	if (state-&gt;revision != 0x8090) {</div><div class='add'>+		dib8000_write_word(state, 23,</div><div class='add'>+				(u16) (((bw-&gt;internal * 1000) &gt;&gt; 16) &amp; 0xffff));</div><div class='add'>+		dib8000_write_word(state, 24,</div><div class='add'>+				(u16) ((bw-&gt;internal * 1000) &amp; 0xffff));</div><div class='add'>+	} else {</div><div class='add'>+		dib8000_write_word(state, 23, (u16) (((bw-&gt;internal / 2 * 1000) &gt;&gt; 16) &amp; 0xffff));</div><div class='add'>+		dib8000_write_word(state, 24,</div><div class='add'>+				(u16) ((bw-&gt;internal  / 2 * 1000) &amp; 0xffff));</div><div class='add'>+	}</div><div class='ctx'> 	dib8000_write_word(state, 27, (u16) ((bw-&gt;ifreq &gt;&gt; 16) &amp; 0x01ff));</div><div class='ctx'> 	dib8000_write_word(state, 28, (u16) (bw-&gt;ifreq &amp; 0xffff));</div><div class='ctx'> 	dib8000_write_word(state, 26, (u16) ((bw-&gt;ifreq &gt;&gt; 25) &amp; 0x0003));</div><div class='ctx'> </div><div class='del'>-	dib8000_write_word(state, 922, bw-&gt;sad_cfg);</div><div class='add'>+	if (state-&gt;revision != 0x8090)</div><div class='add'>+		dib8000_write_word(state, 922, bw-&gt;sad_cfg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dib8000_reset_pll(struct dib8000_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	const struct dibx000_bandwidth_config *pll = state-&gt;cfg.pll;</div><div class='del'>-	u16 clk_cfg1;</div><div class='del'>-</div><div class='del'>-	// clk_cfg0</div><div class='del'>-	dib8000_write_word(state, 901, (pll-&gt;pll_prediv &lt;&lt; 8) | (pll-&gt;pll_ratio &lt;&lt; 0));</div><div class='del'>-</div><div class='del'>-	// clk_cfg1</div><div class='del'>-	clk_cfg1 = (1 &lt;&lt; 10) | (0 &lt;&lt; 9) | (pll-&gt;IO_CLK_en_core &lt;&lt; 8) |</div><div class='del'>-		(pll-&gt;bypclk_div &lt;&lt; 5) | (pll-&gt;enable_refdiv &lt;&lt; 4) | (1 &lt;&lt; 3) |</div><div class='del'>-		(pll-&gt;pll_range &lt;&lt; 1) | (pll-&gt;pll_reset &lt;&lt; 0);</div><div class='del'>-</div><div class='del'>-	dib8000_write_word(state, 902, clk_cfg1);</div><div class='del'>-	clk_cfg1 = (clk_cfg1 &amp; 0xfff7) | (pll-&gt;pll_bypass &lt;&lt; 3);</div><div class='del'>-	dib8000_write_word(state, 902, clk_cfg1);</div><div class='del'>-</div><div class='del'>-	dprintk("clk_cfg1: 0x%04x", clk_cfg1);	/* 0x507 1 0 1 000 0 0 11 1 */</div><div class='del'>-</div><div class='del'>-	/* smpl_cfg: P_refclksel=2, P_ensmplsel=1 nodivsmpl=1 */</div><div class='del'>-	if (state-&gt;cfg.pll-&gt;ADClkSrc == 0)</div><div class='del'>-		dib8000_write_word(state, 904, (0 &lt;&lt; 15) | (0 &lt;&lt; 12) | (0 &lt;&lt; 10) |</div><div class='del'>-				(pll-&gt;modulo &lt;&lt; 8) | (pll-&gt;ADClkSrc &lt;&lt; 7) | (0 &lt;&lt; 1));</div><div class='del'>-	else if (state-&gt;cfg.refclksel != 0)</div><div class='del'>-		dib8000_write_word(state, 904, (0 &lt;&lt; 15) | (1 &lt;&lt; 12) |</div><div class='del'>-				((state-&gt;cfg.refclksel &amp; 0x3) &lt;&lt; 10) | (pll-&gt;modulo &lt;&lt; 8) |</div><div class='del'>-				(pll-&gt;ADClkSrc &lt;&lt; 7) | (0 &lt;&lt; 1));</div><div class='del'>-	else</div><div class='del'>-		dib8000_write_word(state, 904, (0 &lt;&lt; 15) | (1 &lt;&lt; 12) | (3 &lt;&lt; 10) | (pll-&gt;modulo &lt;&lt; 8) | (pll-&gt;ADClkSrc &lt;&lt; 7) | (0 &lt;&lt; 1));</div><div class='add'>+	u16 clk_cfg1, reg;</div><div class='add'>+</div><div class='add'>+	if (state-&gt;revision != 0x8090) {</div><div class='add'>+		dib8000_write_word(state, 901,</div><div class='add'>+				(pll-&gt;pll_prediv &lt;&lt; 8) | (pll-&gt;pll_ratio &lt;&lt; 0));</div><div class='add'>+</div><div class='add'>+		clk_cfg1 = (1 &lt;&lt; 10) | (0 &lt;&lt; 9) | (pll-&gt;IO_CLK_en_core &lt;&lt; 8) |</div><div class='add'>+			(pll-&gt;bypclk_div &lt;&lt; 5) | (pll-&gt;enable_refdiv &lt;&lt; 4) |</div><div class='add'>+			(1 &lt;&lt; 3) | (pll-&gt;pll_range &lt;&lt; 1) |</div><div class='add'>+			(pll-&gt;pll_reset &lt;&lt; 0);</div><div class='add'>+</div><div class='add'>+		dib8000_write_word(state, 902, clk_cfg1);</div><div class='add'>+		clk_cfg1 = (clk_cfg1 &amp; 0xfff7) | (pll-&gt;pll_bypass &lt;&lt; 3);</div><div class='add'>+		dib8000_write_word(state, 902, clk_cfg1);</div><div class='add'>+</div><div class='add'>+		dprintk("clk_cfg1: 0x%04x", clk_cfg1);</div><div class='add'>+</div><div class='add'>+		/* smpl_cfg: P_refclksel=2, P_ensmplsel=1 nodivsmpl=1 */</div><div class='add'>+		if (state-&gt;cfg.pll-&gt;ADClkSrc == 0)</div><div class='add'>+			dib8000_write_word(state, 904,</div><div class='add'>+					(0 &lt;&lt; 15) | (0 &lt;&lt; 12) | (0 &lt;&lt; 10) |</div><div class='add'>+					(pll-&gt;modulo &lt;&lt; 8) |</div><div class='add'>+					(pll-&gt;ADClkSrc &lt;&lt; 7) | (0 &lt;&lt; 1));</div><div class='add'>+		else if (state-&gt;cfg.refclksel != 0)</div><div class='add'>+			dib8000_write_word(state, 904, (0 &lt;&lt; 15) | (1 &lt;&lt; 12) |</div><div class='add'>+					((state-&gt;cfg.refclksel &amp; 0x3) &lt;&lt; 10) |</div><div class='add'>+					(pll-&gt;modulo &lt;&lt; 8) |</div><div class='add'>+					(pll-&gt;ADClkSrc &lt;&lt; 7) | (0 &lt;&lt; 1));</div><div class='add'>+		else</div><div class='add'>+			dib8000_write_word(state, 904, (0 &lt;&lt; 15) | (1 &lt;&lt; 12) |</div><div class='add'>+					(3 &lt;&lt; 10) | (pll-&gt;modulo &lt;&lt; 8) |</div><div class='add'>+					(pll-&gt;ADClkSrc &lt;&lt; 7) | (0 &lt;&lt; 1));</div><div class='add'>+	} else {</div><div class='add'>+		dib8000_write_word(state, 1856, (!pll-&gt;pll_reset&lt;&lt;13) |</div><div class='add'>+				(pll-&gt;pll_range&lt;&lt;12) | (pll-&gt;pll_ratio&lt;&lt;6) |</div><div class='add'>+				(pll-&gt;pll_prediv));</div><div class='add'>+</div><div class='add'>+		reg = dib8000_read_word(state, 1857);</div><div class='add'>+		dib8000_write_word(state, 1857, reg|(!pll-&gt;pll_bypass&lt;&lt;15));</div><div class='add'>+</div><div class='add'>+		reg = dib8000_read_word(state, 1858); /* Force clk out pll /2 */</div><div class='add'>+		dib8000_write_word(state, 1858, reg | 1);</div><div class='add'>+</div><div class='add'>+		dib8000_write_word(state, 904, (pll-&gt;modulo &lt;&lt; 8));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dib8000_reset_pll_common(state, pll);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int dib8000_update_pll(struct dvb_frontend *fe,</div><div class='add'>+		struct dibx000_bandwidth_config *pll)</div><div class='add'>+{</div><div class='add'>+	struct dib8000_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u16 reg_1857, reg_1856 = dib8000_read_word(state, 1856);</div><div class='add'>+	u8 loopdiv, prediv;</div><div class='add'>+	u32 internal, xtal;</div><div class='add'>+</div><div class='add'>+	/* get back old values */</div><div class='add'>+	prediv = reg_1856 &amp; 0x3f;</div><div class='add'>+	loopdiv = (reg_1856 &gt;&gt; 6) &amp; 0x3f;</div><div class='add'>+</div><div class='add'>+	if ((pll != NULL) &amp;&amp; (pll-&gt;pll_prediv != prediv ||</div><div class='add'>+				pll-&gt;pll_ratio != loopdiv)) {</div><div class='add'>+		dprintk("Updating pll (prediv: old =  %d new = %d ; loopdiv : old = %d new = %d)", prediv, pll-&gt;pll_prediv, loopdiv, pll-&gt;pll_ratio);</div><div class='add'>+		reg_1856 &amp;= 0xf000;</div><div class='add'>+		reg_1857 = dib8000_read_word(state, 1857);</div><div class='add'>+		/* disable PLL */</div><div class='add'>+		dib8000_write_word(state, 1857, reg_1857 &amp; ~(1 &lt;&lt; 15));</div><div class='add'>+</div><div class='add'>+		dib8000_write_word(state, 1856, reg_1856 |</div><div class='add'>+				((pll-&gt;pll_ratio &amp; 0x3f) &lt;&lt; 6) |</div><div class='add'>+				(pll-&gt;pll_prediv &amp; 0x3f));</div><div class='add'>+</div><div class='add'>+		/* write new system clk into P_sec_len */</div><div class='add'>+		internal = dib8000_read32(state, 23) / 1000;</div><div class='add'>+		dprintk("Old Internal = %d", internal);</div><div class='add'>+		xtal = 2 * (internal / loopdiv) * prediv;</div><div class='add'>+		internal = 1000 * (xtal/pll-&gt;pll_prediv) * pll-&gt;pll_ratio;</div><div class='add'>+		dprintk("Xtal = %d , New Fmem = %d New Fdemod = %d, New Fsampling = %d", xtal, internal/1000, internal/2000, internal/8000);</div><div class='add'>+		dprintk("New Internal = %d", internal);</div><div class='add'>+</div><div class='add'>+		dib8000_write_word(state, 23,</div><div class='add'>+				(u16) (((internal / 2) &gt;&gt; 16) &amp; 0xffff));</div><div class='add'>+		dib8000_write_word(state, 24, (u16) ((internal / 2) &amp; 0xffff));</div><div class='add'>+		/* enable PLL */</div><div class='add'>+		dib8000_write_word(state, 1857, reg_1857 | (1 &lt;&lt; 15));</div><div class='add'>+</div><div class='add'>+		while (((dib8000_read_word(state, 1856)&gt;&gt;15)&amp;0x1) != 1)</div><div class='add'>+			dprintk("Waiting for PLL to lock");</div><div class='add'>+</div><div class='add'>+		/* verify */</div><div class='add'>+		reg_1856 = dib8000_read_word(state, 1856);</div><div class='add'>+		dprintk("PLL Updated with prediv = %d and loopdiv = %d",</div><div class='add'>+				reg_1856&amp;0x3f, (reg_1856&gt;&gt;6)&amp;0x3f);</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'>+EXPORT_SYMBOL(dib8000_update_pll);</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static int dib8000_reset_gpio(struct dib8000_state *st)</div><div class='ctx'> {</div><div class='ctx'> 	/* reset the GPIOs */</div><div class='hunk'>@@ -721,9 +870,6 @@ static const u16 dib8000_defaults[] = {</div><div class='ctx'> 		(3 &lt;&lt; 5) |		/* P_ctrl_pre_freq_step=3 */</div><div class='ctx'> 		(1 &lt;&lt; 0),		/* P_pre_freq_win_len=1 */</div><div class='ctx'> </div><div class='del'>-	1, 903,</div><div class='del'>-	(0 &lt;&lt; 4) | 2,		// P_divclksel=0 P_divbitsel=2 (was clk=3,bit=1 for MPW)</div><div class='del'>-</div><div class='ctx'> 	0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -740,7 +886,8 @@ static u16 dib8000_identify(struct i2c_device *client)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	value = dib8000_i2c_read16(client, 897);</div><div class='del'>-	if (value != 0x8000 &amp;&amp; value != 0x8001 &amp;&amp; value != 0x8002) {</div><div class='add'>+	if (value != 0x8000 &amp;&amp; value != 0x8001 &amp;&amp;</div><div class='add'>+			value != 0x8002 &amp;&amp; value != 0x8090) {</div><div class='ctx'> 		dprintk("wrong Device ID (%x)", value);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -755,6 +902,9 @@ static u16 dib8000_identify(struct i2c_device *client)</div><div class='ctx'> 	case 0x8002:</div><div class='ctx'> 		dprintk("found DiB8000C");</div><div class='ctx'> 		break;</div><div class='add'>+	case 0x8090:</div><div class='add'>+		dprintk("found DiB8096P");</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return value;</div><div class='ctx'> }</div><div class='hunk'>@@ -763,17 +913,19 @@ static int dib8000_reset(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib8000_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='del'>-	dib8000_write_word(state, 1287, 0x0003);	/* sram lead in, rdy */</div><div class='del'>-</div><div class='ctx'> 	if ((state-&gt;revision = dib8000_identify(&amp;state-&gt;i2c)) == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* sram lead in, rdy */</div><div class='add'>+	if (state-&gt;revision != 0x8090)</div><div class='add'>+		dib8000_write_word(state, 1287, 0x0003);</div><div class='add'>+</div><div class='ctx'> 	if (state-&gt;revision == 0x8000)</div><div class='ctx'> 		dprintk("error : dib8000 MA not supported");</div><div class='ctx'> </div><div class='ctx'> 	dibx000_reset_i2c_master(&amp;state-&gt;i2c_master);</div><div class='ctx'> </div><div class='del'>-	dib8000_set_power_mode(state, DIB8000M_POWER_ALL);</div><div class='add'>+	dib8000_set_power_mode(state, DIB8000_POWER_ALL);</div><div class='ctx'> </div><div class='ctx'> 	/* always leave the VBG voltage on - it consumes almost nothing but takes a long time to start */</div><div class='ctx'> 	dib8000_set_adc_state(state, DIBX000_VBG_ENABLE);</div><div class='hunk'>@@ -782,8 +934,10 @@ static int dib8000_reset(struct dvb_frontend *fe)</div><div class='ctx'> 	dib8000_write_word(state, 770, 0xffff);</div><div class='ctx'> 	dib8000_write_word(state, 771, 0xffff);</div><div class='ctx'> 	dib8000_write_word(state, 772, 0xfffc);</div><div class='del'>-	dib8000_write_word(state, 898, 0x000c);	// sad</div><div class='del'>-	dib8000_write_word(state, 1280, 0x004d);</div><div class='add'>+	if (state-&gt;revision == 0x8090)</div><div class='add'>+		dib8000_write_word(state, 1280, 0x0045);</div><div class='add'>+	else</div><div class='add'>+		dib8000_write_word(state, 1280, 0x004d);</div><div class='ctx'> 	dib8000_write_word(state, 1281, 0x000c);</div><div class='ctx'> </div><div class='ctx'> 	dib8000_write_word(state, 770, 0x0000);</div><div class='hunk'>@@ -794,19 +948,25 @@ static int dib8000_reset(struct dvb_frontend *fe)</div><div class='ctx'> 	dib8000_write_word(state, 1281, 0x0000);</div><div class='ctx'> </div><div class='ctx'> 	/* drives */</div><div class='del'>-	if (state-&gt;cfg.drives)</div><div class='del'>-		dib8000_write_word(state, 906, state-&gt;cfg.drives);</div><div class='del'>-	else {</div><div class='del'>-		dprintk("using standard PAD-drive-settings, please adjust settings in config-struct to be optimal.");</div><div class='del'>-		dib8000_write_word(state, 906, 0x2d98);	// min drive SDRAM - not optimal - adjust</div><div class='add'>+	if (state-&gt;revision != 0x8090) {</div><div class='add'>+		if (state-&gt;cfg.drives)</div><div class='add'>+			dib8000_write_word(state, 906, state-&gt;cfg.drives);</div><div class='add'>+		else {</div><div class='add'>+			dprintk("using standard PAD-drive-settings, please adjust settings in config-struct to be optimal.");</div><div class='add'>+			/* min drive SDRAM - not optimal - adjust */</div><div class='add'>+			dib8000_write_word(state, 906, 0x2d98);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dib8000_reset_pll(state);</div><div class='add'>+	if (state-&gt;revision != 0x8090)</div><div class='add'>+		dib8000_write_word(state, 898, 0x0004);</div><div class='ctx'> </div><div class='ctx'> 	if (dib8000_reset_gpio(state) != 0)</div><div class='ctx'> 		dprintk("GPIO reset was not successful.");</div><div class='ctx'> </div><div class='del'>-	if (dib8000_set_output_mode(fe, OUTMODE_HIGH_Z) != 0)</div><div class='add'>+	if ((state-&gt;revision != 0x8090) &amp;&amp;</div><div class='add'>+			(dib8000_set_output_mode(fe, OUTMODE_HIGH_Z) != 0))</div><div class='ctx'> 		dprintk("OUTPUT_MODE could not be resetted.");</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;current_agc = NULL;</div><div class='hunk'>@@ -832,6 +992,8 @@ static int dib8000_reset(struct dvb_frontend *fe)</div><div class='ctx'> 			l = *n++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	if (state-&gt;revision != 0x8090)</div><div class='add'>+		dib8000_write_word(state, 903, (0 &lt;&lt; 4) | 2);</div><div class='ctx'> 	state-&gt;isdbt_cfg_loaded = 0;</div><div class='ctx'> </div><div class='ctx'> 	//div_cfg override for special configs</div><div class='hunk'>@@ -844,10 +1006,12 @@ static int dib8000_reset(struct dvb_frontend *fe)</div><div class='ctx'> 	dib8000_set_bandwidth(fe, 6000);</div><div class='ctx'> </div><div class='ctx'> 	dib8000_set_adc_state(state, DIBX000_SLOW_ADC_ON);</div><div class='del'>-	dib8000_sad_calib(state);</div><div class='del'>-	dib8000_set_adc_state(state, DIBX000_SLOW_ADC_OFF);</div><div class='add'>+	if (state-&gt;revision != 0x8090) {</div><div class='add'>+		dib8000_sad_calib(state);</div><div class='add'>+		dib8000_set_adc_state(state, DIBX000_SLOW_ADC_OFF);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	dib8000_set_power_mode(state, DIB8000M_POWER_INTERFACE_ONLY);</div><div class='add'>+	dib8000_set_power_mode(state, DIB8000_POWER_INTERFACE_ONLY);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -879,6 +1043,8 @@ static int dib8000_set_agc_config(struct dib8000_state *state, u8 band)</div><div class='ctx'> {</div><div class='ctx'> 	struct dibx000_agc_config *agc = NULL;</div><div class='ctx'> 	int i;</div><div class='add'>+	u16 reg;</div><div class='add'>+</div><div class='ctx'> 	if (state-&gt;current_band == band &amp;&amp; state-&gt;current_agc != NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	state-&gt;current_band = band;</div><div class='hunk'>@@ -914,6 +1080,12 @@ static int dib8000_set_agc_config(struct dib8000_state *state, u8 band)</div><div class='ctx'> 		dib8000_write_word(state, 106, state-&gt;wbd_ref);</div><div class='ctx'> 	else			// use default</div><div class='ctx'> 		dib8000_write_word(state, 106, agc-&gt;wbd_ref);</div><div class='add'>+</div><div class='add'>+	if (state-&gt;revision == 0x8090) {</div><div class='add'>+		reg = dib8000_read_word(state, 922) &amp; (0x3 &lt;&lt; 2);</div><div class='add'>+		dib8000_write_word(state, 922, reg | (agc-&gt;wbd_sel &lt;&lt; 2));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dib8000_write_word(state, 107, (agc-&gt;wbd_alpha &lt;&lt; 9) | (agc-&gt;perform_agc_softsplit &lt;&lt; 8));</div><div class='ctx'> 	dib8000_write_word(state, 108, agc-&gt;agc1_max);</div><div class='ctx'> 	dib8000_write_word(state, 109, agc-&gt;agc1_min);</div><div class='hunk'>@@ -925,7 +1097,10 @@ static int dib8000_set_agc_config(struct dib8000_state *state, u8 band)</div><div class='ctx'> 	dib8000_write_word(state, 115, (agc-&gt;agc2_slope1 &lt;&lt; 8) | agc-&gt;agc2_slope2);</div><div class='ctx'> </div><div class='ctx'> 	dib8000_write_word(state, 75, agc-&gt;agc1_pt3);</div><div class='del'>-	dib8000_write_word(state, 923, (dib8000_read_word(state, 923) &amp; 0xffe3) | (agc-&gt;wbd_inv &lt;&lt; 4) | (agc-&gt;wbd_sel &lt;&lt; 2));	/*LB : 929 -&gt; 923 */</div><div class='add'>+	if (state-&gt;revision != 0x8090)</div><div class='add'>+		dib8000_write_word(state, 923,</div><div class='add'>+				(dib8000_read_word(state, 923) &amp; 0xffe3) |</div><div class='add'>+				(agc-&gt;wbd_inv &lt;&lt; 4) | (agc-&gt;wbd_sel &lt;&lt; 2));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -968,14 +1143,30 @@ static int dib8000_agc_startup(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib8000_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	enum frontend_tune_state *tune_state = &amp;state-&gt;tune_state;</div><div class='del'>-</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	u16 reg, upd_demod_gain_period = 0x8000;</div><div class='ctx'> </div><div class='ctx'> 	switch (*tune_state) {</div><div class='ctx'> 	case CT_AGC_START:</div><div class='ctx'> 		// set power-up level: interf+analog+AGC</div><div class='ctx'> </div><div class='del'>-		dib8000_set_adc_state(state, DIBX000_ADC_ON);</div><div class='add'>+		if (state-&gt;revision != 0x8090)</div><div class='add'>+			dib8000_set_adc_state(state, DIBX000_ADC_ON);</div><div class='add'>+		else {</div><div class='add'>+			dib8000_set_power_mode(state, DIB8000_POWER_ALL);</div><div class='add'>+</div><div class='add'>+			reg = dib8000_read_word(state, 1947)&amp;0xff00;</div><div class='add'>+			dib8000_write_word(state, 1946,</div><div class='add'>+					upd_demod_gain_period &amp; 0xFFFF);</div><div class='add'>+			/* bit 14 = enDemodGain */</div><div class='add'>+			dib8000_write_word(state, 1947, reg | (1&lt;&lt;14) |</div><div class='add'>+					((upd_demod_gain_period &gt;&gt; 16) &amp; 0xFF));</div><div class='add'>+</div><div class='add'>+			/* enable adc i &amp; q */</div><div class='add'>+			reg = dib8000_read_word(state, 1920);</div><div class='add'>+			dib8000_write_word(state, 1920, (reg | 0x3) &amp;</div><div class='add'>+					(~(1 &lt;&lt; 7)));</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (dib8000_set_agc_config(state, (unsigned char)(BAND_OF_FREQUENCY(fe-&gt;dtv_property_cache.frequency / 1000))) != 0) {</div><div class='ctx'> 			*tune_state = CT_AGC_STOP;</div><div class='hunk'>@@ -1026,6 +1217,579 @@ static int dib8000_agc_startup(struct dvb_frontend *fe)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void dib8096p_host_bus_drive(struct dib8000_state *state, u8 drive)</div><div class='add'>+{</div><div class='add'>+	u16 reg;</div><div class='add'>+</div><div class='add'>+	drive &amp;= 0x7;</div><div class='add'>+</div><div class='add'>+	/* drive host bus 2, 3, 4 */</div><div class='add'>+	reg = dib8000_read_word(state, 1798) &amp;</div><div class='add'>+		~(0x7 | (0x7 &lt;&lt; 6) | (0x7 &lt;&lt; 12));</div><div class='add'>+	reg |= (drive&lt;&lt;12) | (drive&lt;&lt;6) | drive;</div><div class='add'>+	dib8000_write_word(state, 1798, reg);</div><div class='add'>+</div><div class='add'>+	/* drive host bus 5,6 */</div><div class='add'>+	reg = dib8000_read_word(state, 1799) &amp; ~((0x7 &lt;&lt; 2) | (0x7 &lt;&lt; 8));</div><div class='add'>+	reg |= (drive&lt;&lt;8) | (drive&lt;&lt;2);</div><div class='add'>+	dib8000_write_word(state, 1799, reg);</div><div class='add'>+</div><div class='add'>+	/* drive host bus 7, 8, 9 */</div><div class='add'>+	reg = dib8000_read_word(state, 1800) &amp;</div><div class='add'>+		~(0x7 | (0x7 &lt;&lt; 6) | (0x7 &lt;&lt; 12));</div><div class='add'>+	reg |= (drive&lt;&lt;12) | (drive&lt;&lt;6) | drive;</div><div class='add'>+	dib8000_write_word(state, 1800, reg);</div><div class='add'>+</div><div class='add'>+	/* drive host bus 10, 11 */</div><div class='add'>+	reg = dib8000_read_word(state, 1801) &amp; ~((0x7 &lt;&lt; 2) | (0x7 &lt;&lt; 8));</div><div class='add'>+	reg |= (drive&lt;&lt;8) | (drive&lt;&lt;2);</div><div class='add'>+	dib8000_write_word(state, 1801, reg);</div><div class='add'>+</div><div class='add'>+	/* drive host bus 12, 13, 14 */</div><div class='add'>+	reg = dib8000_read_word(state, 1802) &amp;</div><div class='add'>+		~(0x7 | (0x7 &lt;&lt; 6) | (0x7 &lt;&lt; 12));</div><div class='add'>+	reg |= (drive&lt;&lt;12) | (drive&lt;&lt;6) | drive;</div><div class='add'>+	dib8000_write_word(state, 1802, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 dib8096p_calcSyncFreq(u32 P_Kin, u32 P_Kout,</div><div class='add'>+		u32 insertExtSynchro, u32 syncSize)</div><div class='add'>+{</div><div class='add'>+	u32 quantif = 3;</div><div class='add'>+	u32 nom = (insertExtSynchro * P_Kin+syncSize);</div><div class='add'>+	u32 denom = P_Kout;</div><div class='add'>+	u32 syncFreq = ((nom &lt;&lt; quantif) / denom);</div><div class='add'>+</div><div class='add'>+	if ((syncFreq &amp; ((1 &lt;&lt; quantif) - 1)) != 0)</div><div class='add'>+		syncFreq = (syncFreq &gt;&gt; quantif) + 1;</div><div class='add'>+	else</div><div class='add'>+		syncFreq = (syncFreq &gt;&gt; quantif);</div><div class='add'>+</div><div class='add'>+	if (syncFreq != 0)</div><div class='add'>+		syncFreq = syncFreq - 1;</div><div class='add'>+</div><div class='add'>+	return syncFreq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dib8096p_cfg_DibTx(struct dib8000_state *state, u32 P_Kin,</div><div class='add'>+		u32 P_Kout, u32 insertExtSynchro, u32 synchroMode,</div><div class='add'>+		u32 syncWord, u32 syncSize)</div><div class='add'>+{</div><div class='add'>+	dprintk("Configure DibStream Tx");</div><div class='add'>+</div><div class='add'>+	dib8000_write_word(state, 1615, 1);</div><div class='add'>+	dib8000_write_word(state, 1603, P_Kin);</div><div class='add'>+	dib8000_write_word(state, 1605, P_Kout);</div><div class='add'>+	dib8000_write_word(state, 1606, insertExtSynchro);</div><div class='add'>+	dib8000_write_word(state, 1608, synchroMode);</div><div class='add'>+	dib8000_write_word(state, 1609, (syncWord &gt;&gt; 16) &amp; 0xffff);</div><div class='add'>+	dib8000_write_word(state, 1610, syncWord &amp; 0xffff);</div><div class='add'>+	dib8000_write_word(state, 1612, syncSize);</div><div class='add'>+	dib8000_write_word(state, 1615, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dib8096p_cfg_DibRx(struct dib8000_state *state, u32 P_Kin,</div><div class='add'>+		u32 P_Kout, u32 synchroMode, u32 insertExtSynchro,</div><div class='add'>+		u32 syncWord, u32 syncSize, u32 dataOutRate)</div><div class='add'>+{</div><div class='add'>+	u32 syncFreq;</div><div class='add'>+</div><div class='add'>+	dprintk("Configure DibStream Rx synchroMode = %d", synchroMode);</div><div class='add'>+</div><div class='add'>+	if ((P_Kin != 0) &amp;&amp; (P_Kout != 0)) {</div><div class='add'>+		syncFreq = dib8096p_calcSyncFreq(P_Kin, P_Kout,</div><div class='add'>+				insertExtSynchro, syncSize);</div><div class='add'>+		dib8000_write_word(state, 1542, syncFreq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dib8000_write_word(state, 1554, 1);</div><div class='add'>+	dib8000_write_word(state, 1536, P_Kin);</div><div class='add'>+	dib8000_write_word(state, 1537, P_Kout);</div><div class='add'>+	dib8000_write_word(state, 1539, synchroMode);</div><div class='add'>+	dib8000_write_word(state, 1540, (syncWord &gt;&gt; 16) &amp; 0xffff);</div><div class='add'>+	dib8000_write_word(state, 1541, syncWord &amp; 0xffff);</div><div class='add'>+	dib8000_write_word(state, 1543, syncSize);</div><div class='add'>+	dib8000_write_word(state, 1544, dataOutRate);</div><div class='add'>+	dib8000_write_word(state, 1554, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dib8096p_enMpegMux(struct dib8000_state *state, int onoff)</div><div class='add'>+{</div><div class='add'>+	u16 reg_1287;</div><div class='add'>+</div><div class='add'>+	reg_1287 = dib8000_read_word(state, 1287);</div><div class='add'>+</div><div class='add'>+	switch (onoff) {</div><div class='add'>+	case 1:</div><div class='add'>+			reg_1287 &amp;= ~(1 &lt;&lt; 8);</div><div class='add'>+			break;</div><div class='add'>+	case 0:</div><div class='add'>+			reg_1287 |= (1 &lt;&lt; 8);</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dib8000_write_word(state, 1287, reg_1287);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dib8096p_configMpegMux(struct dib8000_state *state,</div><div class='add'>+		u16 pulseWidth, u16 enSerialMode, u16 enSerialClkDiv2)</div><div class='add'>+{</div><div class='add'>+	u16 reg_1287;</div><div class='add'>+</div><div class='add'>+	dprintk("Enable Mpeg mux");</div><div class='add'>+</div><div class='add'>+	dib8096p_enMpegMux(state, 0);</div><div class='add'>+</div><div class='add'>+	/* If the input mode is MPEG do not divide the serial clock */</div><div class='add'>+	if ((enSerialMode == 1) &amp;&amp; (state-&gt;input_mode_mpeg == 1))</div><div class='add'>+		enSerialClkDiv2 = 0;</div><div class='add'>+</div><div class='add'>+	reg_1287 = ((pulseWidth &amp; 0x1f) &lt;&lt; 3) |</div><div class='add'>+		((enSerialMode &amp; 0x1) &lt;&lt; 2) | (enSerialClkDiv2 &amp; 0x1);</div><div class='add'>+	dib8000_write_word(state, 1287, reg_1287);</div><div class='add'>+</div><div class='add'>+	dib8096p_enMpegMux(state, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dib8096p_setDibTxMux(struct dib8000_state *state, int mode)</div><div class='add'>+{</div><div class='add'>+	u16 reg_1288 = dib8000_read_word(state, 1288) &amp; ~(0x7 &lt;&lt; 7);</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case MPEG_ON_DIBTX:</div><div class='add'>+			dprintk("SET MPEG ON DIBSTREAM TX");</div><div class='add'>+			dib8096p_cfg_DibTx(state, 8, 5, 0, 0, 0, 0);</div><div class='add'>+			reg_1288 |= (1 &lt;&lt; 9); break;</div><div class='add'>+	case DIV_ON_DIBTX:</div><div class='add'>+			dprintk("SET DIV_OUT ON DIBSTREAM TX");</div><div class='add'>+			dib8096p_cfg_DibTx(state, 5, 5, 0, 0, 0, 0);</div><div class='add'>+			reg_1288 |= (1 &lt;&lt; 8); break;</div><div class='add'>+	case ADC_ON_DIBTX:</div><div class='add'>+			dprintk("SET ADC_OUT ON DIBSTREAM TX");</div><div class='add'>+			dib8096p_cfg_DibTx(state, 20, 5, 10, 0, 0, 0);</div><div class='add'>+			reg_1288 |= (1 &lt;&lt; 7); break;</div><div class='add'>+	default:</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	dib8000_write_word(state, 1288, reg_1288);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dib8096p_setHostBusMux(struct dib8000_state *state, int mode)</div><div class='add'>+{</div><div class='add'>+	u16 reg_1288 = dib8000_read_word(state, 1288) &amp; ~(0x7 &lt;&lt; 4);</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case DEMOUT_ON_HOSTBUS:</div><div class='add'>+			dprintk("SET DEM OUT OLD INTERF ON HOST BUS");</div><div class='add'>+			dib8096p_enMpegMux(state, 0);</div><div class='add'>+			reg_1288 |= (1 &lt;&lt; 6);</div><div class='add'>+			break;</div><div class='add'>+	case DIBTX_ON_HOSTBUS:</div><div class='add'>+			dprintk("SET DIBSTREAM TX ON HOST BUS");</div><div class='add'>+			dib8096p_enMpegMux(state, 0);</div><div class='add'>+			reg_1288 |= (1 &lt;&lt; 5);</div><div class='add'>+			break;</div><div class='add'>+	case MPEG_ON_HOSTBUS:</div><div class='add'>+			dprintk("SET MPEG MUX ON HOST BUS");</div><div class='add'>+			reg_1288 |= (1 &lt;&lt; 4);</div><div class='add'>+			break;</div><div class='add'>+	default:</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	dib8000_write_word(state, 1288, reg_1288);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dib8096p_set_diversity_in(struct dvb_frontend *fe, int onoff)</div><div class='add'>+{</div><div class='add'>+	struct dib8000_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u16 reg_1287;</div><div class='add'>+</div><div class='add'>+	switch (onoff) {</div><div class='add'>+	case 0: /* only use the internal way - not the diversity input */</div><div class='add'>+			dprintk("%s mode OFF : by default Enable Mpeg INPUT",</div><div class='add'>+					__func__);</div><div class='add'>+			/* outputRate = 8 */</div><div class='add'>+			dib8096p_cfg_DibRx(state, 8, 5, 0, 0, 0, 8, 0);</div><div class='add'>+</div><div class='add'>+			/* Do not divide the serial clock of MPEG MUX in</div><div class='add'>+			   SERIAL MODE in case input mode MPEG is used */</div><div class='add'>+			reg_1287 = dib8000_read_word(state, 1287);</div><div class='add'>+			/* enSerialClkDiv2 == 1 ? */</div><div class='add'>+			if ((reg_1287 &amp; 0x1) == 1) {</div><div class='add'>+				/* force enSerialClkDiv2 = 0 */</div><div class='add'>+				reg_1287 &amp;= ~0x1;</div><div class='add'>+				dib8000_write_word(state, 1287, reg_1287);</div><div class='add'>+			}</div><div class='add'>+			state-&gt;input_mode_mpeg = 1;</div><div class='add'>+			break;</div><div class='add'>+	case 1: /* both ways */</div><div class='add'>+	case 2: /* only the diversity input */</div><div class='add'>+			dprintk("%s ON : Enable diversity INPUT", __func__);</div><div class='add'>+			dib8096p_cfg_DibRx(state, 5, 5, 0, 0, 0, 0, 0);</div><div class='add'>+			state-&gt;input_mode_mpeg = 0;</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dib8000_set_diversity_in(state-&gt;fe[0], onoff);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dib8096p_set_output_mode(struct dvb_frontend *fe, int mode)</div><div class='add'>+{</div><div class='add'>+	struct dib8000_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u16 outreg, smo_mode, fifo_threshold;</div><div class='add'>+	u8 prefer_mpeg_mux_use = 1;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	dib8096p_host_bus_drive(state, 1);</div><div class='add'>+</div><div class='add'>+	fifo_threshold = 1792;</div><div class='add'>+	smo_mode = (dib8000_read_word(state, 299) &amp; 0x0050) | (1 &lt;&lt; 1);</div><div class='add'>+	outreg   = dib8000_read_word(state, 1286) &amp;</div><div class='add'>+		~((1 &lt;&lt; 10) | (0x7 &lt;&lt; 6) | (1 &lt;&lt; 1));</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case OUTMODE_HIGH_Z:</div><div class='add'>+			outreg = 0;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	case OUTMODE_MPEG2_SERIAL:</div><div class='add'>+			if (prefer_mpeg_mux_use) {</div><div class='add'>+				dprintk("dib8096P setting output mode TS_SERIAL using Mpeg Mux");</div><div class='add'>+				dib8096p_configMpegMux(state, 3, 1, 1);</div><div class='add'>+				dib8096p_setHostBusMux(state, MPEG_ON_HOSTBUS);</div><div class='add'>+			} else {/* Use Smooth block */</div><div class='add'>+				dprintk("dib8096P setting output mode TS_SERIAL using Smooth bloc");</div><div class='add'>+				dib8096p_setHostBusMux(state,</div><div class='add'>+						DEMOUT_ON_HOSTBUS);</div><div class='add'>+				outreg |= (2 &lt;&lt; 6) | (0 &lt;&lt; 1);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	case OUTMODE_MPEG2_PAR_GATED_CLK:</div><div class='add'>+			if (prefer_mpeg_mux_use) {</div><div class='add'>+				dprintk("dib8096P setting output mode TS_PARALLEL_GATED using Mpeg Mux");</div><div class='add'>+				dib8096p_configMpegMux(state, 2, 0, 0);</div><div class='add'>+				dib8096p_setHostBusMux(state, MPEG_ON_HOSTBUS);</div><div class='add'>+			} else { /* Use Smooth block */</div><div class='add'>+				dprintk("dib8096P setting output mode TS_PARALLEL_GATED using Smooth block");</div><div class='add'>+				dib8096p_setHostBusMux(state,</div><div class='add'>+						DEMOUT_ON_HOSTBUS);</div><div class='add'>+				outreg |= (0 &lt;&lt; 6);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	case OUTMODE_MPEG2_PAR_CONT_CLK: /* Using Smooth block only */</div><div class='add'>+			dprintk("dib8096P setting output mode TS_PARALLEL_CONT using Smooth block");</div><div class='add'>+			dib8096p_setHostBusMux(state, DEMOUT_ON_HOSTBUS);</div><div class='add'>+			outreg |= (1 &lt;&lt; 6);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	case OUTMODE_MPEG2_FIFO:</div><div class='add'>+			/* Using Smooth block because not supported</div><div class='add'>+			   by new Mpeg Mux bloc */</div><div class='add'>+			dprintk("dib8096P setting output mode TS_FIFO using Smooth block");</div><div class='add'>+			dib8096p_setHostBusMux(state, DEMOUT_ON_HOSTBUS);</div><div class='add'>+			outreg |= (5 &lt;&lt; 6);</div><div class='add'>+			smo_mode |= (3 &lt;&lt; 1);</div><div class='add'>+			fifo_threshold = 512;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	case OUTMODE_DIVERSITY:</div><div class='add'>+			dprintk("dib8096P setting output mode MODE_DIVERSITY");</div><div class='add'>+			dib8096p_setDibTxMux(state, DIV_ON_DIBTX);</div><div class='add'>+			dib8096p_setHostBusMux(state, DIBTX_ON_HOSTBUS);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	case OUTMODE_ANALOG_ADC:</div><div class='add'>+			dprintk("dib8096P setting output mode MODE_ANALOG_ADC");</div><div class='add'>+			dib8096p_setDibTxMux(state, ADC_ON_DIBTX);</div><div class='add'>+			dib8096p_setHostBusMux(state, DIBTX_ON_HOSTBUS);</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mode != OUTMODE_HIGH_Z)</div><div class='add'>+		outreg |= (1&lt;&lt;10);</div><div class='add'>+</div><div class='add'>+	dprintk("output_mpeg2_in_188_bytes = %d",</div><div class='add'>+			state-&gt;cfg.output_mpeg2_in_188_bytes);</div><div class='add'>+	if (state-&gt;cfg.output_mpeg2_in_188_bytes)</div><div class='add'>+		smo_mode |= (1 &lt;&lt; 5);</div><div class='add'>+</div><div class='add'>+	ret |= dib8000_write_word(state, 299, smo_mode);</div><div class='add'>+	/* synchronous fread */</div><div class='add'>+	ret |= dib8000_write_word(state, 299 + 1, fifo_threshold);</div><div class='add'>+	ret |= dib8000_write_word(state, 1286, outreg);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int map_addr_to_serpar_number(struct i2c_msg *msg)</div><div class='add'>+{</div><div class='add'>+	if (msg-&gt;buf[0] &lt;= 15)</div><div class='add'>+		msg-&gt;buf[0] -= 1;</div><div class='add'>+	else if (msg-&gt;buf[0] == 17)</div><div class='add'>+		msg-&gt;buf[0] = 15;</div><div class='add'>+	else if (msg-&gt;buf[0] == 16)</div><div class='add'>+		msg-&gt;buf[0] = 17;</div><div class='add'>+	else if (msg-&gt;buf[0] == 19)</div><div class='add'>+		msg-&gt;buf[0] = 16;</div><div class='add'>+	else if (msg-&gt;buf[0] &gt;= 21 &amp;&amp; msg-&gt;buf[0] &lt;= 25)</div><div class='add'>+		msg-&gt;buf[0] -= 3;</div><div class='add'>+	else if (msg-&gt;buf[0] == 28)</div><div class='add'>+		msg-&gt;buf[0] = 23;</div><div class='add'>+	else if (msg-&gt;buf[0] == 99)</div><div class='add'>+		msg-&gt;buf[0] = 99;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dib8096p_tuner_write_serpar(struct i2c_adapter *i2c_adap,</div><div class='add'>+		struct i2c_msg msg[], int num)</div><div class='add'>+{</div><div class='add'>+	struct dib8000_state *state = i2c_get_adapdata(i2c_adap);</div><div class='add'>+	u8 n_overflow = 1;</div><div class='add'>+	u16 i = 1000;</div><div class='add'>+	u16 serpar_num = msg[0].buf[0];</div><div class='add'>+</div><div class='add'>+	while (n_overflow == 1 &amp;&amp; i) {</div><div class='add'>+		n_overflow = (dib8000_read_word(state, 1984) &gt;&gt; 1) &amp; 0x1;</div><div class='add'>+		i--;</div><div class='add'>+		if (i == 0)</div><div class='add'>+			dprintk("Tuner ITF: write busy (overflow)");</div><div class='add'>+	}</div><div class='add'>+	dib8000_write_word(state, 1985, (1 &lt;&lt; 6) | (serpar_num &amp; 0x3f));</div><div class='add'>+	dib8000_write_word(state, 1986, (msg[0].buf[1] &lt;&lt; 8) | msg[0].buf[2]);</div><div class='add'>+</div><div class='add'>+	return num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dib8096p_tuner_read_serpar(struct i2c_adapter *i2c_adap,</div><div class='add'>+		struct i2c_msg msg[], int num)</div><div class='add'>+{</div><div class='add'>+	struct dib8000_state *state = i2c_get_adapdata(i2c_adap);</div><div class='add'>+	u8 n_overflow = 1, n_empty = 1;</div><div class='add'>+	u16 i = 1000;</div><div class='add'>+	u16 serpar_num = msg[0].buf[0];</div><div class='add'>+	u16 read_word;</div><div class='add'>+</div><div class='add'>+	while (n_overflow == 1 &amp;&amp; i) {</div><div class='add'>+		n_overflow = (dib8000_read_word(state, 1984) &gt;&gt; 1) &amp; 0x1;</div><div class='add'>+		i--;</div><div class='add'>+		if (i == 0)</div><div class='add'>+			dprintk("TunerITF: read busy (overflow)");</div><div class='add'>+	}</div><div class='add'>+	dib8000_write_word(state, 1985, (0&lt;&lt;6) | (serpar_num&amp;0x3f));</div><div class='add'>+</div><div class='add'>+	i = 1000;</div><div class='add'>+	while (n_empty == 1 &amp;&amp; i) {</div><div class='add'>+		n_empty = dib8000_read_word(state, 1984)&amp;0x1;</div><div class='add'>+		i--;</div><div class='add'>+		if (i == 0)</div><div class='add'>+			dprintk("TunerITF: read busy (empty)");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	read_word = dib8000_read_word(state, 1987);</div><div class='add'>+	msg[1].buf[0] = (read_word &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	msg[1].buf[1] = (read_word) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	return num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dib8096p_tuner_rw_serpar(struct i2c_adapter *i2c_adap,</div><div class='add'>+		struct i2c_msg msg[], int num)</div><div class='add'>+{</div><div class='add'>+	if (map_addr_to_serpar_number(&amp;msg[0]) == 0) {</div><div class='add'>+		if (num == 1) /* write */</div><div class='add'>+			return dib8096p_tuner_write_serpar(i2c_adap, msg, 1);</div><div class='add'>+		else /* read */</div><div class='add'>+			return dib8096p_tuner_read_serpar(i2c_adap, msg, 2);</div><div class='add'>+	}</div><div class='add'>+	return num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dib8096p_rw_on_apb(struct i2c_adapter *i2c_adap,</div><div class='add'>+		struct i2c_msg msg[], int num, u16 apb_address)</div><div class='add'>+{</div><div class='add'>+	struct dib8000_state *state = i2c_get_adapdata(i2c_adap);</div><div class='add'>+	u16 word;</div><div class='add'>+</div><div class='add'>+	if (num == 1) {		/* write */</div><div class='add'>+		dib8000_write_word(state, apb_address,</div><div class='add'>+				((msg[0].buf[1] &lt;&lt; 8) | (msg[0].buf[2])));</div><div class='add'>+	} else {</div><div class='add'>+		word = dib8000_read_word(state, apb_address);</div><div class='add'>+		msg[1].buf[0] = (word &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+		msg[1].buf[1] = (word) &amp; 0xff;</div><div class='add'>+	}</div><div class='add'>+	return num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dib8096p_tuner_xfer(struct i2c_adapter *i2c_adap,</div><div class='add'>+		struct i2c_msg msg[], int num)</div><div class='add'>+{</div><div class='add'>+	struct dib8000_state *state = i2c_get_adapdata(i2c_adap);</div><div class='add'>+	u16 apb_address = 0, word;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	switch (msg[0].buf[0]) {</div><div class='add'>+	case 0x12:</div><div class='add'>+			apb_address = 1920;</div><div class='add'>+			break;</div><div class='add'>+	case 0x14:</div><div class='add'>+			apb_address = 1921;</div><div class='add'>+			break;</div><div class='add'>+	case 0x24:</div><div class='add'>+			apb_address = 1922;</div><div class='add'>+			break;</div><div class='add'>+	case 0x1a:</div><div class='add'>+			apb_address = 1923;</div><div class='add'>+			break;</div><div class='add'>+	case 0x22:</div><div class='add'>+			apb_address = 1924;</div><div class='add'>+			break;</div><div class='add'>+	case 0x33:</div><div class='add'>+			apb_address = 1926;</div><div class='add'>+			break;</div><div class='add'>+	case 0x34:</div><div class='add'>+			apb_address = 1927;</div><div class='add'>+			break;</div><div class='add'>+	case 0x35:</div><div class='add'>+			apb_address = 1928;</div><div class='add'>+			break;</div><div class='add'>+	case 0x36:</div><div class='add'>+			apb_address = 1929;</div><div class='add'>+			break;</div><div class='add'>+	case 0x37:</div><div class='add'>+			apb_address = 1930;</div><div class='add'>+			break;</div><div class='add'>+	case 0x38:</div><div class='add'>+			apb_address = 1931;</div><div class='add'>+			break;</div><div class='add'>+	case 0x39:</div><div class='add'>+			apb_address = 1932;</div><div class='add'>+			break;</div><div class='add'>+	case 0x2a:</div><div class='add'>+			apb_address = 1935;</div><div class='add'>+			break;</div><div class='add'>+	case 0x2b:</div><div class='add'>+			apb_address = 1936;</div><div class='add'>+			break;</div><div class='add'>+	case 0x2c:</div><div class='add'>+			apb_address = 1937;</div><div class='add'>+			break;</div><div class='add'>+	case 0x2d:</div><div class='add'>+			apb_address = 1938;</div><div class='add'>+			break;</div><div class='add'>+	case 0x2e:</div><div class='add'>+			apb_address = 1939;</div><div class='add'>+			break;</div><div class='add'>+	case 0x2f:</div><div class='add'>+			apb_address = 1940;</div><div class='add'>+			break;</div><div class='add'>+	case 0x30:</div><div class='add'>+			apb_address = 1941;</div><div class='add'>+			break;</div><div class='add'>+	case 0x31:</div><div class='add'>+			apb_address = 1942;</div><div class='add'>+			break;</div><div class='add'>+	case 0x32:</div><div class='add'>+			apb_address = 1943;</div><div class='add'>+			break;</div><div class='add'>+	case 0x3e:</div><div class='add'>+			apb_address = 1944;</div><div class='add'>+			break;</div><div class='add'>+	case 0x3f:</div><div class='add'>+			apb_address = 1945;</div><div class='add'>+			break;</div><div class='add'>+	case 0x40:</div><div class='add'>+			apb_address = 1948;</div><div class='add'>+			break;</div><div class='add'>+	case 0x25:</div><div class='add'>+			apb_address = 936;</div><div class='add'>+			break;</div><div class='add'>+	case 0x26:</div><div class='add'>+			apb_address = 937;</div><div class='add'>+			break;</div><div class='add'>+	case 0x27:</div><div class='add'>+			apb_address = 938;</div><div class='add'>+			break;</div><div class='add'>+	case 0x28:</div><div class='add'>+			apb_address = 939;</div><div class='add'>+			break;</div><div class='add'>+	case 0x1d:</div><div class='add'>+			/* get sad sel request */</div><div class='add'>+			i = ((dib8000_read_word(state, 921) &gt;&gt; 12)&amp;0x3);</div><div class='add'>+			word = dib8000_read_word(state, 924+i);</div><div class='add'>+			msg[1].buf[0] = (word &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+			msg[1].buf[1] = (word) &amp; 0xff;</div><div class='add'>+			return num;</div><div class='add'>+	case 0x1f:</div><div class='add'>+			if (num == 1) {	/* write */</div><div class='add'>+				word = (u16) ((msg[0].buf[1] &lt;&lt; 8) |</div><div class='add'>+						msg[0].buf[2]);</div><div class='add'>+				/* in the VGAMODE Sel are located on bit 0/1 */</div><div class='add'>+				word &amp;= 0x3;</div><div class='add'>+				word = (dib8000_read_word(state, 921) &amp;</div><div class='add'>+						~(3&lt;&lt;12)) | (word&lt;&lt;12);</div><div class='add'>+				/* Set the proper input */</div><div class='add'>+				dib8000_write_word(state, 921, word);</div><div class='add'>+				return num;</div><div class='add'>+			}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (apb_address != 0) /* R/W acces via APB */</div><div class='add'>+		return dib8096p_rw_on_apb(i2c_adap, msg, num, apb_address);</div><div class='add'>+	else  /* R/W access via SERPAR  */</div><div class='add'>+		return dib8096p_tuner_rw_serpar(i2c_adap, msg, num);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 dib8096p_i2c_func(struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	return I2C_FUNC_I2C;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_algorithm dib8096p_tuner_xfer_algo = {</div><div class='add'>+	.master_xfer = dib8096p_tuner_xfer,</div><div class='add'>+	.functionality = dib8096p_i2c_func,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct i2c_adapter *dib8096p_get_i2c_tuner(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct dib8000_state *st = fe-&gt;demodulator_priv;</div><div class='add'>+	return &amp;st-&gt;dib8096p_tuner_adap;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dib8096p_get_i2c_tuner);</div><div class='add'>+</div><div class='add'>+int dib8096p_tuner_sleep(struct dvb_frontend *fe, int onoff)</div><div class='add'>+{</div><div class='add'>+	struct dib8000_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u16 en_cur_state;</div><div class='add'>+</div><div class='add'>+	dprintk("sleep dib8096p: %d", onoff);</div><div class='add'>+</div><div class='add'>+	en_cur_state = dib8000_read_word(state, 1922);</div><div class='add'>+</div><div class='add'>+	/* LNAs and MIX are ON and therefore it is a valid configuration */</div><div class='add'>+	if (en_cur_state &gt; 0xff)</div><div class='add'>+		state-&gt;tuner_enable = en_cur_state ;</div><div class='add'>+</div><div class='add'>+	if (onoff)</div><div class='add'>+		en_cur_state &amp;= 0x00ff;</div><div class='add'>+	else {</div><div class='add'>+		if (state-&gt;tuner_enable != 0)</div><div class='add'>+			en_cur_state = state-&gt;tuner_enable;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dib8000_write_word(state, 1922, en_cur_state);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dib8096p_tuner_sleep);</div><div class='add'>+</div><div class='ctx'> static const s32 lut_1000ln_mant[] =</div><div class='ctx'> {</div><div class='ctx'> 	908, 7003, 7090, 7170, 7244, 7313, 7377, 7438, 7495, 7549, 7600</div><div class='hunk'>@@ -1051,6 +1815,26 @@ s32 dib8000_get_adc_power(struct dvb_frontend *fe, u8 mode)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dib8000_get_adc_power);</div><div class='ctx'> </div><div class='add'>+int dib8090p_get_dc_power(struct dvb_frontend *fe, u8 IQ)</div><div class='add'>+{</div><div class='add'>+	struct dib8000_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int val = 0;</div><div class='add'>+</div><div class='add'>+	switch (IQ) {</div><div class='add'>+	case 1:</div><div class='add'>+			val = dib8000_read_word(state, 403);</div><div class='add'>+			break;</div><div class='add'>+	case 0:</div><div class='add'>+			val = dib8000_read_word(state, 404);</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (val  &amp; 0x200)</div><div class='add'>+		val -= 1024;</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dib8090p_get_dc_power);</div><div class='add'>+</div><div class='ctx'> static void dib8000_update_timf(struct dib8000_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	u32 timf = state-&gt;timf = dib8000_read32(state, 435);</div><div class='hunk'>@@ -1060,6 +1844,26 @@ static void dib8000_update_timf(struct dib8000_state *state)</div><div class='ctx'> 	dprintk("Updated timing frequency: %d (default: %d)", state-&gt;timf, state-&gt;timf_default);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u32 dib8000_ctrl_timf(struct dvb_frontend *fe, uint8_t op, uint32_t timf)</div><div class='add'>+{</div><div class='add'>+	struct dib8000_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	switch (op) {</div><div class='add'>+	case DEMOD_TIMF_SET:</div><div class='add'>+			state-&gt;timf = timf;</div><div class='add'>+			break;</div><div class='add'>+	case DEMOD_TIMF_UPDATE:</div><div class='add'>+			dib8000_update_timf(state);</div><div class='add'>+			break;</div><div class='add'>+	case DEMOD_TIMF_GET:</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	dib8000_set_bandwidth(state-&gt;fe[0], 6000);</div><div class='add'>+</div><div class='add'>+	return state-&gt;timf;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dib8000_ctrl_timf);</div><div class='add'>+</div><div class='ctx'> static const u16 adc_target_16dB[11] = {</div><div class='ctx'> 	(1 &lt;&lt; 13) - 825 - 117,</div><div class='ctx'> 	(1 &lt;&lt; 13) - 837 - 117,</div><div class='hunk'>@@ -1086,6 +1890,9 @@ static void dib8000_set_channel(struct dib8000_state *state, u8 seq, u8 autosear</div><div class='ctx'> 	u16 init_prbs = 0xfff;</div><div class='ctx'> 	u16 ana_gain = 0;</div><div class='ctx'> </div><div class='add'>+	if (state-&gt;revision == 0x8090)</div><div class='add'>+		dib8000_init_sdram(state);</div><div class='add'>+</div><div class='ctx'> 	if (state-&gt;ber_monitored_layer != LAYER_ALL)</div><div class='ctx'> 		dib8000_write_word(state, 285, (dib8000_read_word(state, 285) &amp; 0x60) | state-&gt;ber_monitored_layer);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1418,7 +2225,10 @@ static void dib8000_set_channel(struct dib8000_state *state, u8 seq, u8 autosear</div><div class='ctx'> 	dprintk("nbseg_diff = %X (%d)", seg_diff_mask, seg_diff_mask);</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;differential_constellation = (seg_diff_mask != 0);</div><div class='del'>-	dib8000_set_diversity_in(state-&gt;fe[0], state-&gt;diversity_onoff);</div><div class='add'>+	if (state-&gt;revision != 0x8090)</div><div class='add'>+		dib8000_set_diversity_in(state-&gt;fe[0], state-&gt;diversity_onoff);</div><div class='add'>+	else</div><div class='add'>+		dib8096p_set_diversity_in(state-&gt;fe[0], state-&gt;diversity_onoff);</div><div class='ctx'> </div><div class='ctx'> 	if (state-&gt;fe[0]-&gt;dtv_property_cache.isdbt_sb_mode == 1) {</div><div class='ctx'> 		if (state-&gt;fe[0]-&gt;dtv_property_cache.isdbt_partial_reception == 1)</div><div class='hunk'>@@ -1870,7 +2680,7 @@ static int dib8000_tune(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib8000_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	u16 value, mode = fft_to_mode(state);</div><div class='add'>+	u16 lock, value, mode = fft_to_mode(state);</div><div class='ctx'> </div><div class='ctx'> 	// we are already tuned - just resuming from suspend</div><div class='ctx'> 	if (state == NULL)</div><div class='hunk'>@@ -1924,7 +2734,11 @@ static int dib8000_tune(struct dvb_frontend *fe)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	// we achieved a coff_cpil_lock - it's time to update the timf</div><div class='del'>-	if ((dib8000_read_word(state, 568) &gt;&gt; 11) &amp; 0x1)</div><div class='add'>+	if (state-&gt;revision != 0x8090)</div><div class='add'>+		lock = dib8000_read_word(state, 568);</div><div class='add'>+	else</div><div class='add'>+		lock = dib8000_read_word(state, 570);</div><div class='add'>+	if ((lock &gt;&gt; 11) &amp; 0x1)</div><div class='ctx'> 		dib8000_update_timf(state);</div><div class='ctx'> </div><div class='ctx'> 	//now that tune is finished, lock0 should lock on fec_mpeg to output this lock on MP_LOCK. It's changed in autosearch start</div><div class='hunk'>@@ -1946,11 +2760,14 @@ static int dib8000_wakeup(struct dvb_frontend *fe)</div><div class='ctx'> 	u8 index_frontend;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	dib8000_set_power_mode(state, DIB8000M_POWER_ALL);</div><div class='add'>+	dib8000_set_power_mode(state, DIB8000_POWER_ALL);</div><div class='ctx'> 	dib8000_set_adc_state(state, DIBX000_ADC_ON);</div><div class='ctx'> 	if (dib8000_set_adc_state(state, DIBX000_SLOW_ADC_ON) != 0)</div><div class='ctx'> 		dprintk("could not start Slow ADC");</div><div class='ctx'> </div><div class='add'>+	if (state-&gt;revision != 0x8090)</div><div class='add'>+		dib8000_sad_calib(state);</div><div class='add'>+</div><div class='ctx'> 	for (index_frontend = 1; (index_frontend &lt; MAX_NUMBER_OF_FRONTENDS) &amp;&amp; (state-&gt;fe[index_frontend] != NULL); index_frontend++) {</div><div class='ctx'> 		ret = state-&gt;fe[index_frontend]-&gt;ops.init(state-&gt;fe[index_frontend]);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='hunk'>@@ -1972,8 +2789,9 @@ static int dib8000_sleep(struct dvb_frontend *fe)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dib8000_set_output_mode(fe, OUTMODE_HIGH_Z);</div><div class='del'>-	dib8000_set_power_mode(state, DIB8000M_POWER_INTERFACE_ONLY);</div><div class='add'>+	if (state-&gt;revision != 0x8090)</div><div class='add'>+		dib8000_set_output_mode(fe, OUTMODE_HIGH_Z);</div><div class='add'>+	dib8000_set_power_mode(state, DIB8000_POWER_INTERFACE_ONLY);</div><div class='ctx'> 	return dib8000_set_adc_state(state, DIBX000_SLOW_ADC_OFF) | dib8000_set_adc_state(state, DIBX000_ADC_OFF);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1992,7 +2810,7 @@ int dib8000_set_tune_state(struct dvb_frontend *fe, enum frontend_tune_state tun</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dib8000_set_tune_state);</div><div class='ctx'> </div><div class='del'>-static int dib8000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dib8000_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib8000_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u16 i, val = 0;</div><div class='hunk'>@@ -2006,7 +2824,7 @@ static int dib8000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> 		if (stat&amp;FE_HAS_SYNC) {</div><div class='ctx'> 			dprintk("TMCC lock on the slave%i", index_frontend);</div><div class='ctx'> 			/* synchronize the cache with the other frontends */</div><div class='del'>-			state-&gt;fe[index_frontend]-&gt;ops.get_frontend(state-&gt;fe[index_frontend], fep);</div><div class='add'>+			state-&gt;fe[index_frontend]-&gt;ops.get_frontend(state-&gt;fe[index_frontend]);</div><div class='ctx'> 			for (sub_index_frontend = 0; (sub_index_frontend &lt; MAX_NUMBER_OF_FRONTENDS) &amp;&amp; (state-&gt;fe[sub_index_frontend] != NULL); sub_index_frontend++) {</div><div class='ctx'> 				if (sub_index_frontend != index_frontend) {</div><div class='ctx'> 					state-&gt;fe[sub_index_frontend]-&gt;dtv_property_cache.isdbt_sb_mode = state-&gt;fe[index_frontend]-&gt;dtv_property_cache.isdbt_sb_mode;</div><div class='hunk'>@@ -2028,7 +2846,10 @@ static int dib8000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> </div><div class='ctx'> 	fe-&gt;dtv_property_cache.isdbt_sb_mode = dib8000_read_word(state, 508) &amp; 0x1;</div><div class='ctx'> </div><div class='del'>-	val = dib8000_read_word(state, 570);</div><div class='add'>+	if (state-&gt;revision == 0x8090)</div><div class='add'>+		val = dib8000_read_word(state, 572);</div><div class='add'>+	else</div><div class='add'>+		val = dib8000_read_word(state, 570);</div><div class='ctx'> 	fe-&gt;dtv_property_cache.inversion = (val &amp; 0x40) &gt;&gt; 6;</div><div class='ctx'> 	switch ((val &amp; 0x30) &gt;&gt; 4) {</div><div class='ctx'> 	case 1:</div><div class='hunk'>@@ -2135,7 +2956,7 @@ static int dib8000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib8000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dib8000_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib8000_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u8 nbr_pending, exit_condition, index_frontend;</div><div class='hunk'>@@ -2158,9 +2979,14 @@ static int dib8000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> 		state-&gt;fe[index_frontend]-&gt;dtv_property_cache.delivery_system = SYS_ISDBT;</div><div class='ctx'> 		memcpy(&amp;state-&gt;fe[index_frontend]-&gt;dtv_property_cache, &amp;fe-&gt;dtv_property_cache, sizeof(struct dtv_frontend_properties));</div><div class='ctx'> </div><div class='del'>-		dib8000_set_output_mode(state-&gt;fe[index_frontend], OUTMODE_HIGH_Z);</div><div class='add'>+		if (state-&gt;revision != 0x8090)</div><div class='add'>+			dib8000_set_output_mode(state-&gt;fe[index_frontend],</div><div class='add'>+					OUTMODE_HIGH_Z);</div><div class='add'>+		else</div><div class='add'>+			dib8096p_set_output_mode(state-&gt;fe[index_frontend],</div><div class='add'>+					OUTMODE_HIGH_Z);</div><div class='ctx'> 		if (state-&gt;fe[index_frontend]-&gt;ops.tuner_ops.set_params)</div><div class='del'>-			state-&gt;fe[index_frontend]-&gt;ops.tuner_ops.set_params(state-&gt;fe[index_frontend], fep);</div><div class='add'>+			state-&gt;fe[index_frontend]-&gt;ops.tuner_ops.set_params(state-&gt;fe[index_frontend]);</div><div class='ctx'> </div><div class='ctx'> 		dib8000_set_tune_state(state-&gt;fe[index_frontend], CT_AGC_START);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2215,7 +3041,7 @@ static int dib8000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> 			 ((state-&gt;fe[0]-&gt;dtv_property_cache.layer[1].segment_count == 0) ||</div><div class='ctx'> 			  ((state-&gt;fe[0]-&gt;dtv_property_cache.isdbt_layer_enabled &amp; (2 &lt;&lt; 0)) == 0)) &amp;&amp;</div><div class='ctx'> 			 ((state-&gt;fe[0]-&gt;dtv_property_cache.layer[2].segment_count == 0) || ((state-&gt;fe[0]-&gt;dtv_property_cache.isdbt_layer_enabled &amp; (3 &lt;&lt; 0)) == 0)))) {</div><div class='del'>-		int i = 80000;</div><div class='add'>+		int i = 100;</div><div class='ctx'> 		u8 found = 0;</div><div class='ctx'> 		u8 tune_failed = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2243,6 +3069,7 @@ static int dib8000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> 					default:</div><div class='ctx'> 						 dprintk("unhandled autosearch result");</div><div class='ctx'> 					case 1:</div><div class='add'>+						 tune_failed |= (1 &lt;&lt; index_frontend);</div><div class='ctx'> 						 dprintk("autosearch failed for the frontend%i", index_frontend);</div><div class='ctx'> 						 break;</div><div class='ctx'> 					}</div><div class='hunk'>@@ -2261,21 +3088,44 @@ static int dib8000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> </div><div class='ctx'> 		dprintk("tune success on frontend%i", index_frontend_success);</div><div class='ctx'> </div><div class='del'>-		dib8000_get_frontend(fe, fep);</div><div class='add'>+		dib8000_get_frontend(fe);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (index_frontend = 0, ret = 0; (ret &gt;= 0) &amp;&amp; (index_frontend &lt; MAX_NUMBER_OF_FRONTENDS) &amp;&amp; (state-&gt;fe[index_frontend] != NULL); index_frontend++)</div><div class='ctx'> 		ret = dib8000_tune(state-&gt;fe[index_frontend]);</div><div class='ctx'> </div><div class='ctx'> 	/* set output mode and diversity input */</div><div class='del'>-	dib8000_set_output_mode(state-&gt;fe[0], state-&gt;cfg.output_mode);</div><div class='del'>-	for (index_frontend = 1; (index_frontend &lt; MAX_NUMBER_OF_FRONTENDS) &amp;&amp; (state-&gt;fe[index_frontend] != NULL); index_frontend++) {</div><div class='del'>-		dib8000_set_output_mode(state-&gt;fe[index_frontend], OUTMODE_DIVERSITY);</div><div class='del'>-		dib8000_set_diversity_in(state-&gt;fe[index_frontend-1], 1);</div><div class='del'>-	}</div><div class='add'>+	if (state-&gt;revision != 0x8090) {</div><div class='add'>+		dib8000_set_output_mode(state-&gt;fe[0], state-&gt;cfg.output_mode);</div><div class='add'>+		for (index_frontend = 1;</div><div class='add'>+				(index_frontend &lt; MAX_NUMBER_OF_FRONTENDS) &amp;&amp;</div><div class='add'>+				(state-&gt;fe[index_frontend] != NULL);</div><div class='add'>+				index_frontend++) {</div><div class='add'>+			dib8000_set_output_mode(state-&gt;fe[index_frontend],</div><div class='add'>+					OUTMODE_DIVERSITY);</div><div class='add'>+			dib8000_set_diversity_in(state-&gt;fe[index_frontend-1], 1);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* turn off the diversity of the last chip */</div><div class='del'>-	dib8000_set_diversity_in(state-&gt;fe[index_frontend-1], 0);</div><div class='add'>+		/* turn off the diversity of the last chip */</div><div class='add'>+		dib8000_set_diversity_in(state-&gt;fe[index_frontend-1], 0);</div><div class='add'>+	} else {</div><div class='add'>+		dib8096p_set_output_mode(state-&gt;fe[0], state-&gt;cfg.output_mode);</div><div class='add'>+		if (state-&gt;cfg.enMpegOutput == 0) {</div><div class='add'>+			dib8096p_setDibTxMux(state, MPEG_ON_DIBTX);</div><div class='add'>+			dib8096p_setHostBusMux(state, DIBTX_ON_HOSTBUS);</div><div class='add'>+		}</div><div class='add'>+		for (index_frontend = 1;</div><div class='add'>+				(index_frontend &lt; MAX_NUMBER_OF_FRONTENDS) &amp;&amp;</div><div class='add'>+				(state-&gt;fe[index_frontend] != NULL);</div><div class='add'>+				index_frontend++) {</div><div class='add'>+			dib8096p_set_output_mode(state-&gt;fe[index_frontend],</div><div class='add'>+					OUTMODE_DIVERSITY);</div><div class='add'>+			dib8096p_set_diversity_in(state-&gt;fe[index_frontend-1], 1);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* turn off the diversity of the last chip */</div><div class='add'>+		dib8096p_set_diversity_in(state-&gt;fe[index_frontend-1], 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2284,15 +3134,22 @@ static u16 dib8000_read_lock(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib8000_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='add'>+	if (state-&gt;revision == 0x8090)</div><div class='add'>+		return dib8000_read_word(state, 570);</div><div class='ctx'> 	return dib8000_read_word(state, 568);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dib8000_read_status(struct dvb_frontend *fe, fe_status_t * stat)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib8000_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	u16 lock_slave = 0, lock = dib8000_read_word(state, 568);</div><div class='add'>+	u16 lock_slave = 0, lock;</div><div class='ctx'> 	u8 index_frontend;</div><div class='ctx'> </div><div class='add'>+	if (state-&gt;revision == 0x8090)</div><div class='add'>+		lock = dib8000_read_word(state, 570);</div><div class='add'>+	else</div><div class='add'>+		lock = dib8000_read_word(state, 568);</div><div class='add'>+</div><div class='ctx'> 	for (index_frontend = 1; (index_frontend &lt; MAX_NUMBER_OF_FRONTENDS) &amp;&amp; (state-&gt;fe[index_frontend] != NULL); index_frontend++)</div><div class='ctx'> 		lock_slave |= dib8000_read_lock(state-&gt;fe[index_frontend]);</div><div class='ctx'> </div><div class='hunk'>@@ -2330,14 +3187,26 @@ static int dib8000_read_status(struct dvb_frontend *fe, fe_status_t * stat)</div><div class='ctx'> static int dib8000_read_ber(struct dvb_frontend *fe, u32 * ber)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib8000_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	*ber = (dib8000_read_word(state, 560) &lt;&lt; 16) | dib8000_read_word(state, 561);	// 13 segments</div><div class='add'>+</div><div class='add'>+	/* 13 segments */</div><div class='add'>+	if (state-&gt;revision == 0x8090)</div><div class='add'>+		*ber = (dib8000_read_word(state, 562) &lt;&lt; 16) |</div><div class='add'>+			dib8000_read_word(state, 563);</div><div class='add'>+	else</div><div class='add'>+		*ber = (dib8000_read_word(state, 560) &lt;&lt; 16) |</div><div class='add'>+			dib8000_read_word(state, 561);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dib8000_read_unc_blocks(struct dvb_frontend *fe, u32 * unc)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib8000_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	*unc = dib8000_read_word(state, 565);	// packet error on 13 seg</div><div class='add'>+</div><div class='add'>+	/* packet error on 13 seg */</div><div class='add'>+	if (state-&gt;revision == 0x8090)</div><div class='add'>+		*unc = dib8000_read_word(state, 567);</div><div class='add'>+	else</div><div class='add'>+		*unc = dib8000_read_word(state, 565);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2370,14 +3239,20 @@ static u32 dib8000_get_snr(struct dvb_frontend *fe)</div><div class='ctx'> 	u32 n, s, exp;</div><div class='ctx'> 	u16 val;</div><div class='ctx'> </div><div class='del'>-	val = dib8000_read_word(state, 542);</div><div class='add'>+	if (state-&gt;revision != 0x8090)</div><div class='add'>+		val = dib8000_read_word(state, 542);</div><div class='add'>+	else</div><div class='add'>+		val = dib8000_read_word(state, 544);</div><div class='ctx'> 	n = (val &gt;&gt; 6) &amp; 0xff;</div><div class='ctx'> 	exp = (val &amp; 0x3f);</div><div class='ctx'> 	if ((exp &amp; 0x20) != 0)</div><div class='ctx'> 		exp -= 0x40;</div><div class='ctx'> 	n &lt;&lt;= exp+16;</div><div class='ctx'> </div><div class='del'>-	val = dib8000_read_word(state, 543);</div><div class='add'>+	if (state-&gt;revision != 0x8090)</div><div class='add'>+		val = dib8000_read_word(state, 543);</div><div class='add'>+	else</div><div class='add'>+		val = dib8000_read_word(state, 545);</div><div class='ctx'> 	s = (val &gt;&gt; 6) &amp; 0xff;</div><div class='ctx'> 	exp = (val &amp; 0x3f);</div><div class='ctx'> 	if ((exp &amp; 0x20) != 0)</div><div class='hunk'>@@ -2401,7 +3276,7 @@ static int dib8000_read_snr(struct dvb_frontend *fe, u16 * snr)</div><div class='ctx'> 	for (index_frontend = 1; (index_frontend &lt; MAX_NUMBER_OF_FRONTENDS) &amp;&amp; (state-&gt;fe[index_frontend] != NULL); index_frontend++)</div><div class='ctx'> 		snr_master += dib8000_get_snr(state-&gt;fe[index_frontend]);</div><div class='ctx'> </div><div class='del'>-	if (snr_master != 0) {</div><div class='add'>+	if ((snr_master &gt;&gt; 16) != 0) {</div><div class='ctx'> 		snr_master = 10*intlog10(snr_master&gt;&gt;16);</div><div class='ctx'> 		*snr = snr_master / ((1 &lt;&lt; 24) / 10);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2458,7 +3333,8 @@ struct dvb_frontend *dib8000_get_slave_frontend(struct dvb_frontend *fe, int sla</div><div class='ctx'> EXPORT_SYMBOL(dib8000_get_slave_frontend);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods, u8 default_addr, u8 first_addr)</div><div class='add'>+int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods,</div><div class='add'>+		u8 default_addr, u8 first_addr, u8 is_dib8096p)</div><div class='ctx'> {</div><div class='ctx'> 	int k = 0, ret = 0;</div><div class='ctx'> 	u8 new_addr = 0;</div><div class='hunk'>@@ -2488,9 +3364,12 @@ int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods, u8 defau</div><div class='ctx'> 		new_addr = first_addr + (k &lt;&lt; 1);</div><div class='ctx'> </div><div class='ctx'> 		client.addr = new_addr;</div><div class='del'>-		dib8000_i2c_write16(&amp;client, 1287, 0x0003);	/* sram lead in, rdy */</div><div class='del'>-		if (dib8000_identify(&amp;client) == 0) {</div><div class='add'>+		if (!is_dib8096p)</div><div class='ctx'> 			dib8000_i2c_write16(&amp;client, 1287, 0x0003);	/* sram lead in, rdy */</div><div class='add'>+		if (dib8000_identify(&amp;client) == 0) {</div><div class='add'>+			/* sram lead in, rdy */</div><div class='add'>+			if (!is_dib8096p)</div><div class='add'>+				dib8000_i2c_write16(&amp;client, 1287, 0x0003);</div><div class='ctx'> 			client.addr = default_addr;</div><div class='ctx'> 			if (dib8000_identify(&amp;client) == 0) {</div><div class='ctx'> 				dprintk("#%d: not identified", k);</div><div class='hunk'>@@ -2549,6 +3428,7 @@ static void dib8000_release(struct dvb_frontend *fe)</div><div class='ctx'> 		dvb_frontend_detach(st-&gt;fe[index_frontend]);</div><div class='ctx'> </div><div class='ctx'> 	dibx000_exit_i2c_master(&amp;st-&gt;i2c_master);</div><div class='add'>+	i2c_del_adapter(&amp;st-&gt;dib8096p_tuner_adap);</div><div class='ctx'> 	kfree(st-&gt;fe[0]);</div><div class='ctx'> 	kfree(st);</div><div class='ctx'> }</div><div class='hunk'>@@ -2581,9 +3461,9 @@ int dib8000_pid_filter(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff)</div><div class='ctx'> EXPORT_SYMBOL(dib8000_pid_filter);</div><div class='ctx'> </div><div class='ctx'> static const struct dvb_frontend_ops dib8000_ops = {</div><div class='add'>+	.delsys = { SYS_ISDBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		 .name = "DiBcom 8000 ISDB-T",</div><div class='del'>-		 .type = FE_OFDM,</div><div class='ctx'> 		 .frequency_min = 44250000,</div><div class='ctx'> 		 .frequency_max = 867250000,</div><div class='ctx'> 		 .frequency_stepsize = 62500,</div><div class='hunk'>@@ -2651,6 +3531,15 @@ struct dvb_frontend *dib8000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, s</div><div class='ctx'> </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='add'>+	/* init 8096p tuner adapter */</div><div class='add'>+	strncpy(state-&gt;dib8096p_tuner_adap.name, "DiB8096P tuner interface",</div><div class='add'>+			sizeof(state-&gt;dib8096p_tuner_adap.name));</div><div class='add'>+	state-&gt;dib8096p_tuner_adap.algo = &amp;dib8096p_tuner_xfer_algo;</div><div class='add'>+	state-&gt;dib8096p_tuner_adap.algo_data = NULL;</div><div class='add'>+	state-&gt;dib8096p_tuner_adap.dev.parent = state-&gt;i2c.adap-&gt;dev.parent;</div><div class='add'>+	i2c_set_adapdata(&amp;state-&gt;dib8096p_tuner_adap, state);</div><div class='add'>+	i2c_add_adapter(&amp;state-&gt;dib8096p_tuner_adap);</div><div class='add'>+</div><div class='ctx'> 	dib8000_reset(fe);</div><div class='ctx'> </div><div class='ctx'> 	dib8000_write_word(state, 285, (dib8000_read_word(state, 285) &amp; ~0x60) | (3 &lt;&lt; 5));	/* ber_rs_len = 3 */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib8000.h b/drivers/media/dvb/frontends/dib8000.h<br/>index 617f9eba3a09..39591bb172c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib8000.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib8000.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib8000.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/dib8000.h</a></div><div class='hunk'>@@ -32,6 +32,7 @@ struct dib8000_config {</div><div class='ctx'> 	u8 div_cfg;</div><div class='ctx'> 	u8 output_mode;</div><div class='ctx'> 	u8 refclksel;</div><div class='add'>+	u8 enMpegOutput:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define DEFAULT_DIB8000_I2C_ADDRESS 18</div><div class='hunk'>@@ -40,7 +41,8 @@ struct dib8000_config {</div><div class='ctx'> extern struct dvb_frontend *dib8000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);</div><div class='ctx'> extern struct i2c_adapter *dib8000_get_i2c_master(struct dvb_frontend *, enum dibx000_i2c_interface, int);</div><div class='ctx'> </div><div class='del'>-extern int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods, u8 default_addr, u8 first_addr);</div><div class='add'>+extern int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods,</div><div class='add'>+		u8 default_addr, u8 first_addr, u8 is_dib8096p);</div><div class='ctx'> </div><div class='ctx'> extern int dib8000_set_gpio(struct dvb_frontend *, u8 num, u8 dir, u8 val);</div><div class='ctx'> extern int dib8000_set_wbd_ref(struct dvb_frontend *, u16 value);</div><div class='hunk'>@@ -50,6 +52,13 @@ extern int dib8000_set_tune_state(struct dvb_frontend *fe, enum frontend_tune_st</div><div class='ctx'> extern enum frontend_tune_state dib8000_get_tune_state(struct dvb_frontend *fe);</div><div class='ctx'> extern void dib8000_pwm_agc_reset(struct dvb_frontend *fe);</div><div class='ctx'> extern s32 dib8000_get_adc_power(struct dvb_frontend *fe, u8 mode);</div><div class='add'>+extern struct i2c_adapter *dib8096p_get_i2c_tuner(struct dvb_frontend *fe);</div><div class='add'>+extern int dib8096p_tuner_sleep(struct dvb_frontend *fe, int onoff);</div><div class='add'>+extern int dib8090p_get_dc_power(struct dvb_frontend *fe, u8 IQ);</div><div class='add'>+extern u32 dib8000_ctrl_timf(struct dvb_frontend *fe,</div><div class='add'>+		uint8_t op, uint32_t timf);</div><div class='add'>+extern int dib8000_update_pll(struct dvb_frontend *fe,</div><div class='add'>+		struct dibx000_bandwidth_config *pll);</div><div class='ctx'> extern int dib8000_set_slave_frontend(struct dvb_frontend *fe, struct dvb_frontend *fe_slave);</div><div class='ctx'> extern int dib8000_remove_slave_frontend(struct dvb_frontend *fe);</div><div class='ctx'> extern struct dvb_frontend *dib8000_get_slave_frontend(struct dvb_frontend *fe, int slave_index);</div><div class='hunk'>@@ -66,7 +75,9 @@ static inline struct i2c_adapter *dib8000_get_i2c_master(struct dvb_frontend *fe</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods, u8 default_addr, u8 first_addr)</div><div class='add'>+static inline int dib8000_i2c_enumeration(struct i2c_adapter *host,</div><div class='add'>+		int no_of_demods, u8 default_addr, u8 first_addr,</div><div class='add'>+		u8 is_dib8096p)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='ctx'> 	return -ENODEV;</div><div class='hunk'>@@ -109,11 +120,38 @@ static inline void dib8000_pwm_agc_reset(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='ctx'> }</div><div class='add'>+static inline struct i2c_adapter *dib8096p_get_i2c_tuner(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+static inline int dib8096p_tuner_sleep(struct dvb_frontend *fe, int onoff)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> static inline s32 dib8000_get_adc_power(struct dvb_frontend *fe, u8 mode)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+static inline int dib8090p_get_dc_power(struct dvb_frontend *fe, u8 IQ)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline u32 dib8000_ctrl_timf(struct dvb_frontend *fe,</div><div class='add'>+		uint8_t op, uint32_t timf)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline int dib8000_update_pll(struct dvb_frontend *fe,</div><div class='add'>+		struct dibx000_bandwidth_config *pll)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='ctx'> static inline int dib8000_set_slave_frontend(struct dvb_frontend *fe, struct dvb_frontend *fe_slave)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib9000.c b/drivers/media/dvb/frontends/dib9000.c<br/>index 660f80661ed4..863ef3cfab9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib9000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dib9000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib9000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/dib9000.c</a></div><div class='hunk'>@@ -1136,7 +1136,7 @@ static int dib9000_fw_init(struct dib9000_state *state)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dib9000_fw_set_channel_head(struct dib9000_state *state, struct dvb_frontend_parameters *ch)</div><div class='add'>+static void dib9000_fw_set_channel_head(struct dib9000_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	u8 b[9];</div><div class='ctx'> 	u32 freq = state-&gt;fe[0]-&gt;dtv_property_cache.frequency / 1000;</div><div class='hunk'>@@ -1157,7 +1157,7 @@ static void dib9000_fw_set_channel_head(struct dib9000_state *state, struct dvb_</div><div class='ctx'> 	dib9000_risc_mem_write(state, FE_MM_W_CHANNEL_HEAD, b);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib9000_fw_get_channel(struct dvb_frontend *fe, struct dvb_frontend_parameters *channel)</div><div class='add'>+static int dib9000_fw_get_channel(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib9000_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct dibDVBTChannel {</div><div class='hunk'>@@ -1309,7 +1309,7 @@ error:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib9000_fw_set_channel_union(struct dvb_frontend *fe, struct dvb_frontend_parameters *channel)</div><div class='add'>+static int dib9000_fw_set_channel_union(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib9000_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct dibDVBTChannel {</div><div class='hunk'>@@ -1454,7 +1454,7 @@ static int dib9000_fw_set_channel_union(struct dvb_frontend *fe, struct dvb_fron</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib9000_fw_tune(struct dvb_frontend *fe, struct dvb_frontend_parameters *ch)</div><div class='add'>+static int dib9000_fw_tune(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib9000_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret = 10, search = state-&gt;channel_status.status == CHANNEL_STATUS_PARAMETERS_UNKNOWN;</div><div class='hunk'>@@ -1462,7 +1462,7 @@ static int dib9000_fw_tune(struct dvb_frontend *fe, struct dvb_frontend_paramete</div><div class='ctx'> </div><div class='ctx'> 	switch (state-&gt;tune_state) {</div><div class='ctx'> 	case CT_DEMOD_START:</div><div class='del'>-		dib9000_fw_set_channel_head(state, ch);</div><div class='add'>+		dib9000_fw_set_channel_head(state);</div><div class='ctx'> </div><div class='ctx'> 		/* write the channel context - a channel is initialized to 0, so it is OK */</div><div class='ctx'> 		dib9000_risc_mem_write(state, FE_MM_W_CHANNEL_CONTEXT, (u8 *) fe_info);</div><div class='hunk'>@@ -1471,7 +1471,7 @@ static int dib9000_fw_tune(struct dvb_frontend *fe, struct dvb_frontend_paramete</div><div class='ctx'> 		if (search)</div><div class='ctx'> 			dib9000_mbx_send(state, OUT_MSG_FE_CHANNEL_SEARCH, NULL, 0);</div><div class='ctx'> 		else {</div><div class='del'>-			dib9000_fw_set_channel_union(fe, ch);</div><div class='add'>+			dib9000_fw_set_channel_union(fe);</div><div class='ctx'> 			dib9000_mbx_send(state, OUT_MSG_FE_CHANNEL_TUNE, NULL, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 		state-&gt;tune_state = CT_DEMOD_STEP_1;</div><div class='hunk'>@@ -1867,7 +1867,7 @@ static int dib9000_fe_get_tune_settings(struct dvb_frontend *fe, struct dvb_fron</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib9000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dib9000_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib9000_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u8 index_frontend, sub_index_frontend;</div><div class='hunk'>@@ -1883,7 +1883,7 @@ static int dib9000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> 			dprintk("TPS lock on the slave%i", index_frontend);</div><div class='ctx'> </div><div class='ctx'> 			/* synchronize the cache with the other frontends */</div><div class='del'>-			state-&gt;fe[index_frontend]-&gt;ops.get_frontend(state-&gt;fe[index_frontend], fep);</div><div class='add'>+			state-&gt;fe[index_frontend]-&gt;ops.get_frontend(state-&gt;fe[index_frontend]);</div><div class='ctx'> 			for (sub_index_frontend = 0; (sub_index_frontend &lt; MAX_NUMBER_OF_FRONTENDS) &amp;&amp; (state-&gt;fe[sub_index_frontend] != NULL);</div><div class='ctx'> 			     sub_index_frontend++) {</div><div class='ctx'> 				if (sub_index_frontend != index_frontend) {</div><div class='hunk'>@@ -1911,7 +1911,7 @@ static int dib9000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* get the channel from master chip */</div><div class='del'>-	ret = dib9000_fw_get_channel(fe, fep);</div><div class='add'>+	ret = dib9000_fw_get_channel(fe);</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		goto return_value;</div><div class='ctx'> </div><div class='hunk'>@@ -1958,7 +1958,7 @@ static int dib9000_set_channel_status(struct dvb_frontend *fe, struct dvb_fronte</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)</div><div class='add'>+static int dib9000_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dib9000_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int sleep_time, sleep_time_slave;</div><div class='hunk'>@@ -1983,8 +1983,10 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> 	fe-&gt;dtv_property_cache.delivery_system = SYS_DVBT;</div><div class='ctx'> </div><div class='ctx'> 	/* set the master status */</div><div class='del'>-	if (fep-&gt;u.ofdm.transmission_mode == TRANSMISSION_MODE_AUTO ||</div><div class='del'>-	    fep-&gt;u.ofdm.guard_interval == GUARD_INTERVAL_AUTO || fep-&gt;u.ofdm.constellation == QAM_AUTO || fep-&gt;u.ofdm.code_rate_HP == FEC_AUTO) {</div><div class='add'>+	if (state-&gt;fe[0]-&gt;dtv_property_cache.transmission_mode == TRANSMISSION_MODE_AUTO ||</div><div class='add'>+	    state-&gt;fe[0]-&gt;dtv_property_cache.guard_interval == GUARD_INTERVAL_AUTO ||</div><div class='add'>+	    state-&gt;fe[0]-&gt;dtv_property_cache.modulation == QAM_AUTO ||</div><div class='add'>+	    state-&gt;fe[0]-&gt;dtv_property_cache.code_rate_HP == FEC_AUTO) {</div><div class='ctx'> 		/* no channel specified, autosearch the channel */</div><div class='ctx'> 		state-&gt;channel_status.status = CHANNEL_STATUS_PARAMETERS_UNKNOWN;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -2008,9 +2010,9 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> 	exit_condition = 0;	/* 0: tune pending; 1: tune failed; 2:tune success */</div><div class='ctx'> 	index_frontend_success = 0;</div><div class='ctx'> 	do {</div><div class='del'>-		sleep_time = dib9000_fw_tune(state-&gt;fe[0], NULL);</div><div class='add'>+		sleep_time = dib9000_fw_tune(state-&gt;fe[0]);</div><div class='ctx'> 		for (index_frontend = 1; (index_frontend &lt; MAX_NUMBER_OF_FRONTENDS) &amp;&amp; (state-&gt;fe[index_frontend] != NULL); index_frontend++) {</div><div class='del'>-			sleep_time_slave = dib9000_fw_tune(state-&gt;fe[index_frontend], NULL);</div><div class='add'>+			sleep_time_slave = dib9000_fw_tune(state-&gt;fe[index_frontend]);</div><div class='ctx'> 			if (sleep_time == FE_CALLBACK_TIME_NEVER)</div><div class='ctx'> 				sleep_time = sleep_time_slave;</div><div class='ctx'> 			else if ((sleep_time_slave != FE_CALLBACK_TIME_NEVER) &amp;&amp; (sleep_time_slave &gt; sleep_time))</div><div class='hunk'>@@ -2052,7 +2054,7 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> </div><div class='ctx'> 	/* synchronize all the channel cache */</div><div class='ctx'> 	state-&gt;get_frontend_internal = 1;</div><div class='del'>-	dib9000_get_frontend(state-&gt;fe[0], fep);</div><div class='add'>+	dib9000_get_frontend(state-&gt;fe[0]);</div><div class='ctx'> 	state-&gt;get_frontend_internal = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* retune the other frontends with the found channel */</div><div class='hunk'>@@ -2068,7 +2070,7 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> 		sleep_time = FE_CALLBACK_TIME_NEVER;</div><div class='ctx'> 		for (index_frontend = 0; (index_frontend &lt; MAX_NUMBER_OF_FRONTENDS) &amp;&amp; (state-&gt;fe[index_frontend] != NULL); index_frontend++) {</div><div class='ctx'> 			if (index_frontend != index_frontend_success) {</div><div class='del'>-				sleep_time_slave = dib9000_fw_tune(state-&gt;fe[index_frontend], NULL);</div><div class='add'>+				sleep_time_slave = dib9000_fw_tune(state-&gt;fe[index_frontend]);</div><div class='ctx'> 				if (sleep_time == FE_CALLBACK_TIME_NEVER)</div><div class='ctx'> 					sleep_time = sleep_time_slave;</div><div class='ctx'> 				else if ((sleep_time_slave != FE_CALLBACK_TIME_NEVER) &amp;&amp; (sleep_time_slave &gt; sleep_time))</div><div class='hunk'>@@ -2495,9 +2497,9 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(dib9000_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops dib9000_ops = {</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		 .name = "DiBcom 9000",</div><div class='del'>-		 .type = FE_OFDM,</div><div class='ctx'> 		 .frequency_min = 44250000,</div><div class='ctx'> 		 .frequency_max = 867250000,</div><div class='ctx'> 		 .frequency_stepsize = 62500,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dibx000_common.h b/drivers/media/dvb/frontends/dibx000_common.h<br/>index 5e011474be43..5f484881d7b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dibx000_common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dibx000_common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dibx000_common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/dibx000_common.h</a></div><div class='hunk'>@@ -146,14 +146,8 @@ enum dibx000_adc_states {</div><div class='ctx'> 	DIBX000_VBG_DISABLE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define BANDWIDTH_TO_KHZ(v) ((v) == BANDWIDTH_8_MHZ  ? 8000 : \</div><div class='del'>-				(v) == BANDWIDTH_7_MHZ  ? 7000 : \</div><div class='del'>-				(v) == BANDWIDTH_6_MHZ  ? 6000 : 8000)</div><div class='del'>-</div><div class='del'>-#define BANDWIDTH_TO_INDEX(v) ( \</div><div class='del'>-	(v) == 8000 ? BANDWIDTH_8_MHZ : \</div><div class='del'>-		(v) == 7000 ? BANDWIDTH_7_MHZ : \</div><div class='del'>-		(v) == 6000 ? BANDWIDTH_6_MHZ : BANDWIDTH_8_MHZ )</div><div class='add'>+#define BANDWIDTH_TO_KHZ(v)	((v) / 1000)</div><div class='add'>+#define BANDWIDTH_TO_HZ(v)	((v) * 1000)</div><div class='ctx'> </div><div class='ctx'> /* Chip output mode. */</div><div class='ctx'> #define OUTMODE_HIGH_Z              0</div><div class='hunk'>@@ -276,4 +270,11 @@ struct dibSubbandSelection {</div><div class='ctx'> #define DEMOD_TIMF_GET    0x01</div><div class='ctx'> #define DEMOD_TIMF_UPDATE 0x02</div><div class='ctx'> </div><div class='add'>+#define MPEG_ON_DIBTX		1</div><div class='add'>+#define DIV_ON_DIBTX		2</div><div class='add'>+#define ADC_ON_DIBTX		3</div><div class='add'>+#define DEMOUT_ON_HOSTBUS	4</div><div class='add'>+#define DIBTX_ON_HOSTBUS	5</div><div class='add'>+#define MPEG_ON_HOSTBUS		6</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/dvb/frontends/drxd.h b/drivers/media/dvb/frontends/drxd.h<br/>index 7113535844f2..34398738f9bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/drxd.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/drxd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/drxd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/drxd.h</a></div><div class='hunk'>@@ -48,8 +48,6 @@ struct drxd_config {</div><div class='ctx'> 	u8 disable_i2c_gate_ctrl;</div><div class='ctx'> </div><div class='ctx'> 	u32 IF;</div><div class='del'>-	int (*pll_set) (void *priv, void *priv_params,</div><div class='del'>-			u8 pll_addr, u8 demoda_addr, s32 *off);</div><div class='ctx'> 	 s16(*osc_deviation) (void *priv, s16 dev, int flag);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/drxd_hard.c b/drivers/media/dvb/frontends/drxd_hard.c<br/>index 88e46f4cdbb2..7bf39cda83c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/drxd_hard.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/drxd_hard.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/drxd_hard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/drxd_hard.c</a></div><div class='hunk'>@@ -120,7 +120,7 @@ enum EIFFilter {</div><div class='ctx'> struct drxd_state {</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='ctx'> 	struct dvb_frontend_ops ops;</div><div class='del'>-	struct dvb_frontend_parameters param;</div><div class='add'>+	struct dtv_frontend_properties props;</div><div class='ctx'> </div><div class='ctx'> 	const struct firmware *fw;</div><div class='ctx'> 	struct device *dev;</div><div class='hunk'>@@ -914,14 +914,13 @@ static int load_firmware(struct drxd_state *state, const char *fw_name)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	state-&gt;microcode = kmalloc(fw-&gt;size, GFP_KERNEL);</div><div class='add'>+	state-&gt;microcode = kmemdup(fw-&gt;data, fw-&gt;size, GFP_KERNEL);</div><div class='ctx'> 	if (state-&gt;microcode == NULL) {</div><div class='ctx'> 		release_firmware(fw);</div><div class='ctx'> 		printk(KERN_ERR "drxd: firmware load failure: no memory\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(state-&gt;microcode, fw-&gt;data, fw-&gt;size);</div><div class='ctx'> 	state-&gt;microcode_length = fw-&gt;size;</div><div class='ctx'> 	release_firmware(fw);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1622,14 +1621,14 @@ static int CorrectSysClockDeviation(struct drxd_state *state)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		switch (state-&gt;param.u.ofdm.bandwidth) {</div><div class='del'>-		case BANDWIDTH_8_MHZ:</div><div class='add'>+		switch (state-&gt;props.bandwidth_hz) {</div><div class='add'>+		case 8000000:</div><div class='ctx'> 			bandwidth = DRXD_BANDWIDTH_8MHZ_IN_HZ;</div><div class='ctx'> 			break;</div><div class='del'>-		case BANDWIDTH_7_MHZ:</div><div class='add'>+		case 7000000:</div><div class='ctx'> 			bandwidth = DRXD_BANDWIDTH_7MHZ_IN_HZ;</div><div class='ctx'> 			break;</div><div class='del'>-		case BANDWIDTH_6_MHZ:</div><div class='add'>+		case 6000000:</div><div class='ctx'> 			bandwidth = DRXD_BANDWIDTH_6MHZ_IN_HZ;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -1804,7 +1803,7 @@ static int StartDiversity(struct drxd_state *state)</div><div class='ctx'> 			status = WriteTable(state, state-&gt;m_StartDiversityEnd);</div><div class='ctx'> 			if (status &lt; 0)</div><div class='ctx'> 				break;</div><div class='del'>-			if (state-&gt;param.u.ofdm.bandwidth == BANDWIDTH_8_MHZ) {</div><div class='add'>+			if (state-&gt;props.bandwidth_hz == 8000000) {</div><div class='ctx'> 				status = WriteTable(state, state-&gt;m_DiversityDelay8MHZ);</div><div class='ctx'> 				if (status &lt; 0)</div><div class='ctx'> 					break;</div><div class='hunk'>@@ -1906,7 +1905,7 @@ static int SetCfgNoiseCalibration(struct drxd_state *state,</div><div class='ctx'> </div><div class='ctx'> static int DRX_Start(struct drxd_state *state, s32 off)</div><div class='ctx'> {</div><div class='del'>-	struct dvb_ofdm_parameters *p = &amp;state-&gt;param.u.ofdm;</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;state-&gt;props;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	u16 transmissionParams = 0;</div><div class='hunk'>@@ -1971,7 +1970,7 @@ static int DRX_Start(struct drxd_state *state, s32 off)</div><div class='ctx'> 		if (status &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		mirrorFreqSpect = (state-&gt;param.inversion == INVERSION_ON);</div><div class='add'>+		mirrorFreqSpect = (state-&gt;props.inversion == INVERSION_ON);</div><div class='ctx'> </div><div class='ctx'> 		switch (p-&gt;transmission_mode) {</div><div class='ctx'> 		default:	/* Not set, detect it automatically */</div><div class='hunk'>@@ -2021,7 +2020,7 @@ static int DRX_Start(struct drxd_state *state, s32 off)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		switch (p-&gt;hierarchy_information) {</div><div class='add'>+		switch (p-&gt;hierarchy) {</div><div class='ctx'> 		case HIERARCHY_1:</div><div class='ctx'> 			transmissionParams |= SC_RA_RAM_OP_PARAM_HIER_A1;</div><div class='ctx'> 			if (state-&gt;type_A) {</div><div class='hunk'>@@ -2147,7 +2146,7 @@ static int DRX_Start(struct drxd_state *state, s32 off)</div><div class='ctx'> 		if (status &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		switch (p-&gt;constellation) {</div><div class='add'>+		switch (p-&gt;modulation) {</div><div class='ctx'> 		default:</div><div class='ctx'> 			operationMode |= SC_RA_RAM_OP_AUTO_CONST__M;</div><div class='ctx'> 			/* fall through , try first guess</div><div class='hunk'>@@ -2331,9 +2330,11 @@ static int DRX_Start(struct drxd_state *state, s32 off)</div><div class='ctx'> 		   by SC for fix for some 8K,1/8 guard but is restored by</div><div class='ctx'> 		   InitEC and ResetEC</div><div class='ctx'> 		   functions */</div><div class='del'>-		switch (p-&gt;bandwidth) {</div><div class='del'>-		case BANDWIDTH_AUTO:</div><div class='del'>-		case BANDWIDTH_8_MHZ:</div><div class='add'>+		switch (p-&gt;bandwidth_hz) {</div><div class='add'>+		case 0:</div><div class='add'>+			p-&gt;bandwidth_hz = 8000000;</div><div class='add'>+			/* fall through */</div><div class='add'>+		case 8000000:</div><div class='ctx'> 			/* (64/7)*(8/8)*1000000 */</div><div class='ctx'> 			bandwidth = DRXD_BANDWIDTH_8MHZ_IN_HZ;</div><div class='ctx'> </div><div class='hunk'>@@ -2341,14 +2342,14 @@ static int DRX_Start(struct drxd_state *state, s32 off)</div><div class='ctx'> 			status = Write16(state,</div><div class='ctx'> 					 FE_AG_REG_IND_DEL__A, 50, 0x0000);</div><div class='ctx'> 			break;</div><div class='del'>-		case BANDWIDTH_7_MHZ:</div><div class='add'>+		case 7000000:</div><div class='ctx'> 			/* (64/7)*(7/8)*1000000 */</div><div class='ctx'> 			bandwidth = DRXD_BANDWIDTH_7MHZ_IN_HZ;</div><div class='ctx'> 			bandwidthParam = 0x4807;	/*binary:0100 1000 0000 0111 */</div><div class='ctx'> 			status = Write16(state,</div><div class='ctx'> 					 FE_AG_REG_IND_DEL__A, 59, 0x0000);</div><div class='ctx'> 			break;</div><div class='del'>-		case BANDWIDTH_6_MHZ:</div><div class='add'>+		case 6000000:</div><div class='ctx'> 			/* (64/7)*(6/8)*1000000 */</div><div class='ctx'> 			bandwidth = DRXD_BANDWIDTH_6MHZ_IN_HZ;</div><div class='ctx'> 			bandwidthParam = 0x0F07;	/*binary: 0000 1111 0000 0111 */</div><div class='hunk'>@@ -2887,41 +2888,26 @@ static int drxd_sleep(struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int drxd_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-			     struct dvb_frontend_parameters *param)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int drxd_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)</div><div class='ctx'> {</div><div class='ctx'> 	return drxd_config_i2c(fe, enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int drxd_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-			     struct dvb_frontend_parameters *param)</div><div class='add'>+static int drxd_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct drxd_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	s32 off = 0;</div><div class='ctx'> </div><div class='del'>-	state-&gt;param = *param;</div><div class='add'>+	state-&gt;props = *p;</div><div class='ctx'> 	DRX_Stop(state);</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* FIXME: move PLL drivers */</div><div class='del'>-	if (state-&gt;config.pll_set &amp;&amp;</div><div class='del'>-	    state-&gt;config.pll_set(state-&gt;priv, param,</div><div class='del'>-				  state-&gt;config.pll_address,</div><div class='del'>-				  state-&gt;config.demoda_address, &amp;off) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "Error in pll_set\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	msleep(200);</div><div class='ctx'> </div><div class='ctx'> 	return DRX_Start(state, off);</div><div class='hunk'>@@ -2935,10 +2921,9 @@ static void drxd_release(struct dvb_frontend *fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops drxd_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBT},</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		 .name = "Micronas DRXD DVB-T",</div><div class='del'>-		 .type = FE_OFDM,</div><div class='ctx'> 		 .frequency_min = 47125000,</div><div class='ctx'> 		 .frequency_max = 855250000,</div><div class='ctx'> 		 .frequency_stepsize = 166667,</div><div class='hunk'>@@ -2958,7 +2943,6 @@ static struct dvb_frontend_ops drxd_ops = {</div><div class='ctx'> 	.i2c_gate_ctrl = drxd_i2c_gate_ctrl,</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = drxd_set_frontend,</div><div class='del'>-	.get_frontend = drxd_get_frontend,</div><div class='ctx'> 	.get_tune_settings = drxd_get_tune_settings,</div><div class='ctx'> </div><div class='ctx'> 	.read_status = drxd_read_status,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/drxk.h b/drivers/media/dvb/frontends/drxk.h<br/>index 58baf419560c..020981844a86 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/drxk.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/drxk.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/drxk.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/drxk.h</a></div><div class='hunk'>@@ -8,6 +8,8 @@</div><div class='ctx'>  * struct drxk_config - Configure the initial parameters for DRX-K</div><div class='ctx'>  *</div><div class='ctx'>  * adr:			I2C Address of the DRX-K</div><div class='add'>+ * parallel_ts:		true means that the device uses parallel TS,</div><div class='add'>+ * 			Serial otherwise.</div><div class='ctx'>  * single_master:	Device is on the single master mode</div><div class='ctx'>  * no_i2c_bridge:	Don't switch the I2C bridge to talk with tuner</div><div class='ctx'>  * antenna_gpio:	GPIO bit used to control the antenna</div><div class='hunk'>@@ -22,22 +24,23 @@ struct drxk_config {</div><div class='ctx'> 	u8	adr;</div><div class='ctx'> 	bool	single_master;</div><div class='ctx'> 	bool	no_i2c_bridge;</div><div class='add'>+	bool	parallel_ts;</div><div class='ctx'> </div><div class='ctx'> 	bool	antenna_dvbt;</div><div class='ctx'> 	u16	antenna_gpio;</div><div class='ctx'> </div><div class='add'>+	int    chunk_size;</div><div class='add'>+</div><div class='ctx'> 	const char *microcode_name;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_DVB_DRXK) || (defined(CONFIG_DVB_DRXK_MODULE) \</div><div class='ctx'>         &amp;&amp; defined(MODULE))</div><div class='ctx'> extern struct dvb_frontend *drxk_attach(const struct drxk_config *config,</div><div class='del'>-					struct i2c_adapter *i2c,</div><div class='del'>-					struct dvb_frontend **fe_t);</div><div class='add'>+					struct i2c_adapter *i2c);</div><div class='ctx'> #else</div><div class='ctx'> static inline struct dvb_frontend *drxk_attach(const struct drxk_config *config,</div><div class='del'>-					struct i2c_adapter *i2c,</div><div class='del'>-					struct dvb_frontend **fe_t)</div><div class='add'>+					struct i2c_adapter *i2c)</div><div class='ctx'> {</div><div class='ctx'>         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='ctx'>         return NULL;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c<br/>index f6431ef827dc..6980ed7b8786 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/drxk_hard.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/drxk_hard.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/drxk_hard.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/drxk_hard.c</a></div><div class='hunk'>@@ -368,10 +368,10 @@ static int i2c_read(struct i2c_adapter *adap,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (debug &gt; 2) {</div><div class='ctx'> 		int i;</div><div class='del'>-		dprintk(2, ": read from ");</div><div class='add'>+		dprintk(2, ": read from");</div><div class='ctx'> 		for (i = 0; i &lt; len; i++)</div><div class='ctx'> 			printk(KERN_CONT " %02x", msg[i]);</div><div class='del'>-		printk(KERN_CONT "Value = ");</div><div class='add'>+		printk(KERN_CONT ", value = ");</div><div class='ctx'> 		for (i = 0; i &lt; alen; i++)</div><div class='ctx'> 			printk(KERN_CONT " %02x", answ[i]);</div><div class='ctx'> 		printk(KERN_CONT "\n");</div><div class='hunk'>@@ -660,7 +660,6 @@ static int init_state(struct drxk_state *state)</div><div class='ctx'> 	/* io_pad_cfg_mode output mode is drive always */</div><div class='ctx'> 	/* io_pad_cfg_drive is set to power 2 (23 mA) */</div><div class='ctx'> 	u32 ulGPIOCfg = 0x0113;</div><div class='del'>-	u32 ulSerialMode = 1;</div><div class='ctx'> 	u32 ulInvertTSClock = 0;</div><div class='ctx'> 	u32 ulTSDataStrength = DRXK_MPEG_SERIAL_OUTPUT_PIN_DRIVE_STRENGTH;</div><div class='ctx'> 	u32 ulTSClockkStrength = DRXK_MPEG_OUTPUT_CLK_DRIVE_STRENGTH;</div><div class='hunk'>@@ -681,7 +680,8 @@ static int init_state(struct drxk_state *state)</div><div class='ctx'> 	state-&gt;m_hasOOB = false;</div><div class='ctx'> 	state-&gt;m_hasAudio = false;</div><div class='ctx'> </div><div class='del'>-	state-&gt;m_ChunkSize = 124;</div><div class='add'>+	if (!state-&gt;m_ChunkSize)</div><div class='add'>+		state-&gt;m_ChunkSize = 124;</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;m_oscClockFreq = 0;</div><div class='ctx'> 	state-&gt;m_smartAntInverted = false;</div><div class='hunk'>@@ -810,8 +810,6 @@ static int init_state(struct drxk_state *state)</div><div class='ctx'> 	/* MPEG output configuration */</div><div class='ctx'> 	state-&gt;m_enableMPEGOutput = true;	/* If TRUE; enable MPEG ouput */</div><div class='ctx'> 	state-&gt;m_insertRSByte = false;	/* If TRUE; insert RS byte */</div><div class='del'>-	state-&gt;m_enableParallel = true;	/* If TRUE;</div><div class='del'>-					   parallel out otherwise serial */</div><div class='ctx'> 	state-&gt;m_invertDATA = false;	/* If TRUE; invert DATA signals */</div><div class='ctx'> 	state-&gt;m_invertERR = false;	/* If TRUE; invert ERR signal */</div><div class='ctx'> 	state-&gt;m_invertSTR = false;	/* If TRUE; invert STR signals */</div><div class='hunk'>@@ -856,8 +854,6 @@ static int init_state(struct drxk_state *state)</div><div class='ctx'> 	state-&gt;m_bPowerDown = false;</div><div class='ctx'> 	state-&gt;m_currentPowerMode = DRX_POWER_DOWN;</div><div class='ctx'> </div><div class='del'>-	state-&gt;m_enableParallel = (ulSerialMode == 0);</div><div class='del'>-</div><div class='ctx'> 	state-&gt;m_rfmirror = (ulRfMirror == 0);</div><div class='ctx'> 	state-&gt;m_IfAgcPol = false;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -946,6 +942,9 @@ static int GetDeviceCapabilities(struct drxk_state *state)</div><div class='ctx'> 	status = read32(state, SIO_TOP_JTAGID_LO__A, &amp;sioTopJtagidLo);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='add'>+</div><div class='add'>+printk(KERN_ERR "drxk: status = 0x%08x\n", sioTopJtagidLo);</div><div class='add'>+</div><div class='ctx'> 	/* driver 0.9.0 */</div><div class='ctx'> 	switch ((sioTopJtagidLo &gt;&gt; 29) &amp; 0xF) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -963,7 +962,8 @@ static int GetDeviceCapabilities(struct drxk_state *state)</div><div class='ctx'> 	default:</div><div class='ctx'> 		state-&gt;m_deviceSpin = DRXK_SPIN_UNKNOWN;</div><div class='ctx'> 		status = -EINVAL;</div><div class='del'>-		printk(KERN_ERR "drxk: Spin unknown\n");</div><div class='add'>+		printk(KERN_ERR "drxk: Spin %d unknown\n",</div><div class='add'>+		       (sioTopJtagidLo &gt;&gt; 29) &amp; 0xF);</div><div class='ctx'> 		goto error2;</div><div class='ctx'> 	}</div><div class='ctx'> 	switch ((sioTopJtagidLo &gt;&gt; 12) &amp; 0xFF) {</div><div class='hunk'>@@ -1190,7 +1190,9 @@ static int MPEGTSConfigurePins(struct drxk_state *state, bool mpegEnable)</div><div class='ctx'> 	u16 sioPdrMclkCfg = 0;</div><div class='ctx'> 	u16 sioPdrMdxCfg = 0;</div><div class='ctx'> </div><div class='del'>-	dprintk(1, "\n");</div><div class='add'>+	dprintk(1, ": mpeg %s, %s mode\n",</div><div class='add'>+		mpegEnable ? "enable" : "disable",</div><div class='add'>+		state-&gt;m_enableParallel ? "parallel" : "serial");</div><div class='ctx'> </div><div class='ctx'> 	/* stop lock indicator process */</div><div class='ctx'> 	status = write16(state, SCU_RAM_GPIO__A, SCU_RAM_GPIO_HW_LOCK_IND_DISABLE);</div><div class='hunk'>@@ -1846,6 +1848,7 @@ static int SetOperationMode(struct drxk_state *state,</div><div class='ctx'> 		*/</div><div class='ctx'> 	switch (oMode) {</div><div class='ctx'> 	case OM_DVBT:</div><div class='add'>+		dprintk(1, ": DVB-T\n");</div><div class='ctx'> 		state-&gt;m_OperationMode = oMode;</div><div class='ctx'> 		status = SetDVBTStandard(state, oMode);</div><div class='ctx'> 		if (status &lt; 0)</div><div class='hunk'>@@ -1853,6 +1856,8 @@ static int SetOperationMode(struct drxk_state *state,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case OM_QAM_ITU_A:	/* fallthrough */</div><div class='ctx'> 	case OM_QAM_ITU_C:</div><div class='add'>+		dprintk(1, ": DVB-C Annex %c\n",</div><div class='add'>+			(state-&gt;m_OperationMode == OM_QAM_ITU_A) ? 'A' : 'C');</div><div class='ctx'> 		state-&gt;m_OperationMode = oMode;</div><div class='ctx'> 		status = SetQAMStandard(state, oMode);</div><div class='ctx'> 		if (status &lt; 0)</div><div class='hunk'>@@ -1881,7 +1886,7 @@ static int Start(struct drxk_state *state, s32 offsetFreq,</div><div class='ctx'> 		state-&gt;m_DrxkState != DRXK_DTV_STARTED)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	state-&gt;m_bMirrorFreqSpect = (state-&gt;param.inversion == INVERSION_ON);</div><div class='add'>+	state-&gt;m_bMirrorFreqSpect = (state-&gt;props.inversion == INVERSION_ON);</div><div class='ctx'> </div><div class='ctx'> 	if (IntermediateFrequency &lt; 0) {</div><div class='ctx'> 		state-&gt;m_bMirrorFreqSpect = !state-&gt;m_bMirrorFreqSpect;</div><div class='hunk'>@@ -2503,7 +2508,7 @@ static int GetQAMSignalToNoise(struct drxk_state *state,</div><div class='ctx'> 	u16 qamSlErrPower = 0;	/* accum. error between</div><div class='ctx'> 					raw and sliced symbols */</div><div class='ctx'> 	u32 qamSlSigPower = 0;	/* used for MER, depends of</div><div class='del'>-					QAM constellation */</div><div class='add'>+					QAM modulation */</div><div class='ctx'> 	u32 qamSlMer = 0;	/* QAM MER */</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, "\n");</div><div class='hunk'>@@ -2517,7 +2522,7 @@ static int GetQAMSignalToNoise(struct drxk_state *state,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (state-&gt;param.u.qam.modulation) {</div><div class='add'>+	switch (state-&gt;props.modulation) {</div><div class='ctx'> 	case QAM_16:</div><div class='ctx'> 		qamSlSigPower = DRXK_QAM_SL_SIG_POWER_QAM16 &lt;&lt; 2;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2748,7 +2753,7 @@ static int GetDVBCQuality(struct drxk_state *state, s32 *pQuality)</div><div class='ctx'> 		if (status &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		switch (state-&gt;param.u.qam.modulation) {</div><div class='add'>+		switch (state-&gt;props.modulation) {</div><div class='ctx'> 		case QAM_16:</div><div class='ctx'> 			SignalToNoiseRel = SignalToNoise - 200;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -3813,7 +3818,7 @@ static int SetDVBT(struct drxk_state *state, u16 IntermediateFreqkHz,</div><div class='ctx'> 	/*== Write channel settings to device =====================================*/</div><div class='ctx'> </div><div class='ctx'> 	/* mode */</div><div class='del'>-	switch (state-&gt;param.u.ofdm.transmission_mode) {</div><div class='add'>+	switch (state-&gt;props.transmission_mode) {</div><div class='ctx'> 	case TRANSMISSION_MODE_AUTO:</div><div class='ctx'> 	default:</div><div class='ctx'> 		operationMode |= OFDM_SC_RA_RAM_OP_AUTO_MODE__M;</div><div class='hunk'>@@ -3827,7 +3832,7 @@ static int SetDVBT(struct drxk_state *state, u16 IntermediateFreqkHz,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* guard */</div><div class='del'>-	switch (state-&gt;param.u.ofdm.guard_interval) {</div><div class='add'>+	switch (state-&gt;props.guard_interval) {</div><div class='ctx'> 	default:</div><div class='ctx'> 	case GUARD_INTERVAL_AUTO:</div><div class='ctx'> 		operationMode |= OFDM_SC_RA_RAM_OP_AUTO_GUARD__M;</div><div class='hunk'>@@ -3847,7 +3852,7 @@ static int SetDVBT(struct drxk_state *state, u16 IntermediateFreqkHz,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* hierarchy */</div><div class='del'>-	switch (state-&gt;param.u.ofdm.hierarchy_information) {</div><div class='add'>+	switch (state-&gt;props.hierarchy) {</div><div class='ctx'> 	case HIERARCHY_AUTO:</div><div class='ctx'> 	case HIERARCHY_NONE:</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -3867,8 +3872,8 @@ static int SetDVBT(struct drxk_state *state, u16 IntermediateFreqkHz,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	/* constellation */</div><div class='del'>-	switch (state-&gt;param.u.ofdm.constellation) {</div><div class='add'>+	/* modulation */</div><div class='add'>+	switch (state-&gt;props.modulation) {</div><div class='ctx'> 	case QAM_AUTO:</div><div class='ctx'> 	default:</div><div class='ctx'> 		operationMode |= OFDM_SC_RA_RAM_OP_AUTO_CONST__M;</div><div class='hunk'>@@ -3911,7 +3916,7 @@ static int SetDVBT(struct drxk_state *state, u16 IntermediateFreqkHz,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* coderate */</div><div class='del'>-	switch (state-&gt;param.u.ofdm.code_rate_HP) {</div><div class='add'>+	switch (state-&gt;props.code_rate_HP) {</div><div class='ctx'> 	case FEC_AUTO:</div><div class='ctx'> 	default:</div><div class='ctx'> 		operationMode |= OFDM_SC_RA_RAM_OP_AUTO_RATE__M;</div><div class='hunk'>@@ -3940,9 +3945,11 @@ static int SetDVBT(struct drxk_state *state, u16 IntermediateFreqkHz,</div><div class='ctx'> 	/* Also set parameters for EC_OC fix, note EC_OC_REG_TMD_HIL_MAR is changed</div><div class='ctx'> 		by SC for fix for some 8K,1/8 guard but is restored by InitEC and ResetEC</div><div class='ctx'> 		functions */</div><div class='del'>-	switch (state-&gt;param.u.ofdm.bandwidth) {</div><div class='del'>-	case BANDWIDTH_AUTO:</div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='add'>+	switch (state-&gt;props.bandwidth_hz) {</div><div class='add'>+	case 0:</div><div class='add'>+		state-&gt;props.bandwidth_hz = 8000000;</div><div class='add'>+		/* fall though */</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		bandwidth = DRXK_BANDWIDTH_8MHZ_IN_HZ;</div><div class='ctx'> 		status = write16(state, OFDM_SC_RA_RAM_SRMM_FIX_FACT_8K__A, 3052);</div><div class='ctx'> 		if (status &lt; 0)</div><div class='hunk'>@@ -3961,7 +3968,7 @@ static int SetDVBT(struct drxk_state *state, u16 IntermediateFreqkHz,</div><div class='ctx'> 		if (status &lt; 0)</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		bandwidth = DRXK_BANDWIDTH_7MHZ_IN_HZ;</div><div class='ctx'> 		status = write16(state, OFDM_SC_RA_RAM_SRMM_FIX_FACT_8K__A, 3491);</div><div class='ctx'> 		if (status &lt; 0)</div><div class='hunk'>@@ -3980,7 +3987,7 @@ static int SetDVBT(struct drxk_state *state, u16 IntermediateFreqkHz,</div><div class='ctx'> 		if (status &lt; 0)</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		bandwidth = DRXK_BANDWIDTH_6MHZ_IN_HZ;</div><div class='ctx'> 		status = write16(state, OFDM_SC_RA_RAM_SRMM_FIX_FACT_8K__A, 4073);</div><div class='ctx'> 		if (status &lt; 0)</div><div class='hunk'>@@ -4187,7 +4194,7 @@ error:</div><div class='ctx'> /**</div><div class='ctx'> * \brief Setup of the QAM Measurement intervals for signal quality</div><div class='ctx'> * \param demod instance of demod.</div><div class='del'>-* \param constellation current constellation.</div><div class='add'>+* \param modulation current modulation.</div><div class='ctx'> * \return DRXStatus_t.</div><div class='ctx'> *</div><div class='ctx'> *  NOTE:</div><div class='hunk'>@@ -4196,7 +4203,7 @@ error:</div><div class='ctx'> *</div><div class='ctx'> */</div><div class='ctx'> static int SetQAMMeasurement(struct drxk_state *state,</div><div class='del'>-			     enum EDrxkConstellation constellation,</div><div class='add'>+			     enum EDrxkConstellation modulation,</div><div class='ctx'> 			     u32 symbolRate)</div><div class='ctx'> {</div><div class='ctx'> 	u32 fecBitsDesired = 0;	/* BER accounting period */</div><div class='hunk'>@@ -4210,11 +4217,11 @@ static int SetQAMMeasurement(struct drxk_state *state,</div><div class='ctx'> 	fecRsPrescale = 1;</div><div class='ctx'> 	/* fecBitsDesired = symbolRate [kHz] *</div><div class='ctx'> 		FrameLenght [ms] *</div><div class='del'>-		(constellation + 1) *</div><div class='add'>+		(modulation + 1) *</div><div class='ctx'> 		SyncLoss (== 1) *</div><div class='ctx'> 		ViterbiLoss (==1)</div><div class='ctx'> 		*/</div><div class='del'>-	switch (constellation) {</div><div class='add'>+	switch (modulation) {</div><div class='ctx'> 	case DRX_CONSTELLATION_QAM16:</div><div class='ctx'> 		fecBitsDesired = 4 * symbolRate;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -5281,12 +5288,12 @@ static int QAMSetSymbolrate(struct drxk_state *state)</div><div class='ctx'> 	/* Select &amp; calculate correct IQM rate */</div><div class='ctx'> 	adcFrequency = (state-&gt;m_sysClockFreq * 1000) / 3;</div><div class='ctx'> 	ratesel = 0;</div><div class='del'>-	/* printk(KERN_DEBUG "drxk: SR %d\n", state-&gt;param.u.qam.symbol_rate); */</div><div class='del'>-	if (state-&gt;param.u.qam.symbol_rate &lt;= 1188750)</div><div class='add'>+	/* printk(KERN_DEBUG "drxk: SR %d\n", state-&gt;props.symbol_rate); */</div><div class='add'>+	if (state-&gt;props.symbol_rate &lt;= 1188750)</div><div class='ctx'> 		ratesel = 3;</div><div class='del'>-	else if (state-&gt;param.u.qam.symbol_rate &lt;= 2377500)</div><div class='add'>+	else if (state-&gt;props.symbol_rate &lt;= 2377500)</div><div class='ctx'> 		ratesel = 2;</div><div class='del'>-	else if (state-&gt;param.u.qam.symbol_rate &lt;= 4755000)</div><div class='add'>+	else if (state-&gt;props.symbol_rate &lt;= 4755000)</div><div class='ctx'> 		ratesel = 1;</div><div class='ctx'> 	status = write16(state, IQM_FD_RATESEL__A, ratesel);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='hunk'>@@ -5295,7 +5302,7 @@ static int QAMSetSymbolrate(struct drxk_state *state)</div><div class='ctx'> 	/*</div><div class='ctx'> 		IqmRcRate = ((Fadc / (symbolrate * (4&lt;&lt;ratesel))) - 1) * (1&lt;&lt;23)</div><div class='ctx'> 		*/</div><div class='del'>-	symbFreq = state-&gt;param.u.qam.symbol_rate * (1 &lt;&lt; ratesel);</div><div class='add'>+	symbFreq = state-&gt;props.symbol_rate * (1 &lt;&lt; ratesel);</div><div class='ctx'> 	if (symbFreq == 0) {</div><div class='ctx'> 		/* Divide by zero */</div><div class='ctx'> 		status = -EINVAL;</div><div class='hunk'>@@ -5311,7 +5318,7 @@ static int QAMSetSymbolrate(struct drxk_state *state)</div><div class='ctx'> 	/*</div><div class='ctx'> 		LcSymbFreq = round (.125 *  symbolrate / adcFreq * (1&lt;&lt;15))</div><div class='ctx'> 		*/</div><div class='del'>-	symbFreq = state-&gt;param.u.qam.symbol_rate;</div><div class='add'>+	symbFreq = state-&gt;props.symbol_rate;</div><div class='ctx'> 	if (adcFrequency == 0) {</div><div class='ctx'> 		/* Divide by zero */</div><div class='ctx'> 		status = -EINVAL;</div><div class='hunk'>@@ -5412,7 +5419,7 @@ static int SetQAM(struct drxk_state *state, u16 IntermediateFreqkHz,</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* Set params */</div><div class='del'>-	switch (state-&gt;param.u.qam.modulation) {</div><div class='add'>+	switch (state-&gt;props.modulation) {</div><div class='ctx'> 	case QAM_256:</div><div class='ctx'> 		state-&gt;m_Constellation = DRX_CONSTELLATION_QAM256;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -5435,7 +5442,7 @@ static int SetQAM(struct drxk_state *state, u16 IntermediateFreqkHz,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='del'>-	setParamParameters[0] = state-&gt;m_Constellation;	/* constellation     */</div><div class='add'>+	setParamParameters[0] = state-&gt;m_Constellation;	/* modulation     */</div><div class='ctx'> 	setParamParameters[1] = DRXK_QAM_I12_J17;	/* interleave mode   */</div><div class='ctx'> 	if (state-&gt;m_OperationMode == OM_QAM_ITU_C)</div><div class='ctx'> 		setParamParameters[2] = QAM_TOP_ANNEX_C;</div><div class='hunk'>@@ -5457,7 +5464,7 @@ static int SetQAM(struct drxk_state *state, u16 IntermediateFreqkHz,</div><div class='ctx'> 		if (status &lt; 0)</div><div class='ctx'> 			goto error;</div><div class='ctx'> </div><div class='del'>-		setParamParameters[0] = state-&gt;m_Constellation; /* constellation     */</div><div class='add'>+		setParamParameters[0] = state-&gt;m_Constellation; /* modulation     */</div><div class='ctx'> 		setParamParameters[1] = DRXK_QAM_I12_J17;       /* interleave mode   */</div><div class='ctx'> 		status = scu_command(state, SCU_RAM_COMMAND_STANDARD_QAM | SCU_RAM_COMMAND_CMD_DEMOD_SET_PARAM, 2, setParamParameters, 1, &amp;cmdResult);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5466,7 +5473,7 @@ static int SetQAM(struct drxk_state *state, u16 IntermediateFreqkHz,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * STEP 3: enable the system in a mode where the ADC provides valid</div><div class='del'>-	 * signal setup constellation independent registers</div><div class='add'>+	 * signal setup modulation independent registers</div><div class='ctx'> 	 */</div><div class='ctx'> #if 0</div><div class='ctx'> 	status = SetFrequency(channel, tunerFreqOffset));</div><div class='hunk'>@@ -5478,7 +5485,7 @@ static int SetQAM(struct drxk_state *state, u16 IntermediateFreqkHz,</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* Setup BER measurement */</div><div class='del'>-	status = SetQAMMeasurement(state, state-&gt;m_Constellation, state-&gt;param.u. qam.symbol_rate);</div><div class='add'>+	status = SetQAMMeasurement(state, state-&gt;m_Constellation, state-&gt;props.symbol_rate);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -5560,8 +5567,8 @@ static int SetQAM(struct drxk_state *state, u16 IntermediateFreqkHz,</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	/* STEP 4: constellation specific setup */</div><div class='del'>-	switch (state-&gt;param.u.qam.modulation) {</div><div class='add'>+	/* STEP 4: modulation specific setup */</div><div class='add'>+	switch (state-&gt;props.modulation) {</div><div class='ctx'> 	case QAM_16:</div><div class='ctx'> 		status = SetQAM16(state);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -5591,7 +5598,7 @@ static int SetQAM(struct drxk_state *state, u16 IntermediateFreqkHz,</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* Re-configure MPEG output, requires knowledge of channel bitrate */</div><div class='del'>-	/* extAttr-&gt;currentChannel.constellation = channel-&gt;constellation; */</div><div class='add'>+	/* extAttr-&gt;currentChannel.modulation = channel-&gt;modulation; */</div><div class='ctx'> 	/* extAttr-&gt;currentChannel.symbolrate    = channel-&gt;symbolrate; */</div><div class='ctx'> 	status = MPEGTSDtoSetup(state, state-&gt;m_OperationMode);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='hunk'>@@ -6167,7 +6174,7 @@ error:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void drxk_c_release(struct dvb_frontend *fe)</div><div class='add'>+static void drxk_release(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct drxk_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='hunk'>@@ -6175,24 +6182,12 @@ static void drxk_c_release(struct dvb_frontend *fe)</div><div class='ctx'> 	kfree(state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int drxk_c_init(struct dvb_frontend *fe)</div><div class='del'>-{</div><div class='del'>-	struct drxk_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-</div><div class='del'>-	dprintk(1, "\n");</div><div class='del'>-	if (mutex_trylock(&amp;state-&gt;ctlock) == 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	SetOperationMode(state, OM_QAM_ITU_A);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int drxk_c_sleep(struct dvb_frontend *fe)</div><div class='add'>+static int drxk_sleep(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct drxk_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, "\n");</div><div class='ctx'> 	ShutDown(state);</div><div class='del'>-	mutex_unlock(&amp;state-&gt;ctlock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6204,9 +6199,10 @@ static int drxk_gate_ctrl(struct dvb_frontend *fe, int enable)</div><div class='ctx'> 	return ConfigureI2CBridge(state, enable ? true : false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int drxk_set_parameters(struct dvb_frontend *fe,</div><div class='del'>-			       struct dvb_frontend_parameters *p)</div><div class='add'>+static int drxk_set_parameters(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	u32 delsys  = p-&gt;delivery_system, old_delsys;</div><div class='ctx'> 	struct drxk_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u32 IF;</div><div class='ctx'> </div><div class='hunk'>@@ -6218,14 +6214,39 @@ static int drxk_set_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params)</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 		fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='del'>-	state-&gt;param = *p;</div><div class='add'>+</div><div class='add'>+	old_delsys = state-&gt;props.delivery_system;</div><div class='add'>+	state-&gt;props = *p;</div><div class='add'>+</div><div class='add'>+	if (old_delsys != delsys) {</div><div class='add'>+		ShutDown(state);</div><div class='add'>+		switch (delsys) {</div><div class='add'>+		case SYS_DVBC_ANNEX_A:</div><div class='add'>+		case SYS_DVBC_ANNEX_C:</div><div class='add'>+			if (!state-&gt;m_hasDVBC)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			state-&gt;m_itut_annex_c = (delsys == SYS_DVBC_ANNEX_C) ? true : false;</div><div class='add'>+			if (state-&gt;m_itut_annex_c)</div><div class='add'>+				SetOperationMode(state, OM_QAM_ITU_C);</div><div class='add'>+			else</div><div class='add'>+				SetOperationMode(state, OM_QAM_ITU_A);</div><div class='add'>+			break;</div><div class='add'>+		case SYS_DVBT:</div><div class='add'>+			if (!state-&gt;m_hasDVBT)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			SetOperationMode(state, OM_DVBT);</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='ctx'> 	fe-&gt;ops.tuner_ops.get_if_frequency(fe, &amp;IF);</div><div class='ctx'> 	Start(state, 0, IF);</div><div class='ctx'> </div><div class='hunk'>@@ -6234,13 +6255,6 @@ static int drxk_set_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int drxk_c_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-			       struct dvb_frontend_parameters *p)</div><div class='del'>-{</div><div class='del'>-	dprintk(1, "\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int drxk_read_status(struct dvb_frontend *fe, fe_status_t *status)</div><div class='ctx'> {</div><div class='ctx'> 	struct drxk_state *state = fe-&gt;demodulator_priv;</div><div class='hunk'>@@ -6300,102 +6314,54 @@ static int drxk_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int drxk_c_get_tune_settings(struct dvb_frontend *fe, struct dvb_frontend_tune_settings</div><div class='add'>+static int drxk_get_tune_settings(struct dvb_frontend *fe, struct dvb_frontend_tune_settings</div><div class='ctx'> 				    *sets)</div><div class='ctx'> {</div><div class='del'>-	dprintk(1, "\n");</div><div class='del'>-	sets-&gt;min_delay_ms = 3000;</div><div class='del'>-	sets-&gt;max_drift = 0;</div><div class='del'>-	sets-&gt;step_size = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void drxk_t_release(struct dvb_frontend *fe)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * There's nothing to release here, as the state struct</div><div class='del'>-	 * is already freed by drxk_c_release.</div><div class='del'>-	 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int drxk_t_init(struct dvb_frontend *fe)</div><div class='del'>-{</div><div class='del'>-	struct drxk_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, "\n");</div><div class='del'>-	if (mutex_trylock(&amp;state-&gt;ctlock) == 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	SetOperationMode(state, OM_DVBT);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int drxk_t_sleep(struct dvb_frontend *fe)</div><div class='del'>-{</div><div class='del'>-	struct drxk_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-</div><div class='del'>-	dprintk(1, "\n");</div><div class='del'>-	mutex_unlock(&amp;state-&gt;ctlock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int drxk_t_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-			       struct dvb_frontend_parameters *p)</div><div class='del'>-{</div><div class='del'>-	dprintk(1, "\n");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	switch (p-&gt;delivery_system) {</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='add'>+	case SYS_DVBC_ANNEX_C:</div><div class='add'>+		sets-&gt;min_delay_ms = 3000;</div><div class='add'>+		sets-&gt;max_drift = 0;</div><div class='add'>+		sets-&gt;step_size = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		/*</div><div class='add'>+		 * For DVB-T, let it use the default DVB core way, that is:</div><div class='add'>+		 *	fepriv-&gt;step_size = fe-&gt;ops.info.frequency_stepsize * 2</div><div class='add'>+		 */</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dvb_frontend_ops drxk_c_ops = {</div><div class='add'>+static struct dvb_frontend_ops drxk_ops = {</div><div class='add'>+	/* .delsys will be filled dynamically */</div><div class='ctx'> 	.info = {</div><div class='del'>-		 .name = "DRXK DVB-C",</div><div class='del'>-		 .type = FE_QAM,</div><div class='del'>-		 .frequency_stepsize = 62500,</div><div class='del'>-		 .frequency_min = 47000000,</div><div class='del'>-		 .frequency_max = 862000000,</div><div class='del'>-		 .symbol_rate_min = 870000,</div><div class='del'>-		 .symbol_rate_max = 11700000,</div><div class='del'>-		 .caps = FE_CAN_QAM_16 | FE_CAN_QAM_32 | FE_CAN_QAM_64 |</div><div class='del'>-		 FE_CAN_QAM_128 | FE_CAN_QAM_256 | FE_CAN_FEC_AUTO},</div><div class='del'>-	.release = drxk_c_release,</div><div class='del'>-	.init = drxk_c_init,</div><div class='del'>-	.sleep = drxk_c_sleep,</div><div class='add'>+		.name = "DRXK",</div><div class='add'>+		.frequency_min = 47000000,</div><div class='add'>+		.frequency_max = 865000000,</div><div class='add'>+		 /* For DVB-C */</div><div class='add'>+		.symbol_rate_min = 870000,</div><div class='add'>+		.symbol_rate_max = 11700000,</div><div class='add'>+		/* For DVB-T */</div><div class='add'>+		.frequency_stepsize = 166667,</div><div class='add'>+</div><div class='add'>+		.caps = FE_CAN_QAM_16 | FE_CAN_QAM_32 | FE_CAN_QAM_64 |</div><div class='add'>+			FE_CAN_QAM_128 | FE_CAN_QAM_256 | FE_CAN_FEC_AUTO |</div><div class='add'>+			FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |</div><div class='add'>+			FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_MUTE_TS |</div><div class='add'>+			FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_RECOVER |</div><div class='add'>+			FE_CAN_GUARD_INTERVAL_AUTO | FE_CAN_HIERARCHY_AUTO</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.release = drxk_release,</div><div class='add'>+	.sleep = drxk_sleep,</div><div class='ctx'> 	.i2c_gate_ctrl = drxk_gate_ctrl,</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = drxk_set_parameters,</div><div class='del'>-	.get_frontend = drxk_c_get_frontend,</div><div class='del'>-	.get_tune_settings = drxk_c_get_tune_settings,</div><div class='del'>-</div><div class='del'>-	.read_status = drxk_read_status,</div><div class='del'>-	.read_ber = drxk_read_ber,</div><div class='del'>-	.read_signal_strength = drxk_read_signal_strength,</div><div class='del'>-	.read_snr = drxk_read_snr,</div><div class='del'>-	.read_ucblocks = drxk_read_ucblocks,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct dvb_frontend_ops drxk_t_ops = {</div><div class='del'>-	.info = {</div><div class='del'>-		 .name = "DRXK DVB-T",</div><div class='del'>-		 .type = FE_OFDM,</div><div class='del'>-		 .frequency_min = 47125000,</div><div class='del'>-		 .frequency_max = 865000000,</div><div class='del'>-		 .frequency_stepsize = 166667,</div><div class='del'>-		 .frequency_tolerance = 0,</div><div class='del'>-		 .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 |</div><div class='del'>-		 FE_CAN_FEC_3_4 | FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 |</div><div class='del'>-		 FE_CAN_FEC_AUTO |</div><div class='del'>-		 FE_CAN_QAM_16 | FE_CAN_QAM_64 |</div><div class='del'>-		 FE_CAN_QAM_AUTO |</div><div class='del'>-		 FE_CAN_TRANSMISSION_MODE_AUTO |</div><div class='del'>-		 FE_CAN_GUARD_INTERVAL_AUTO |</div><div class='del'>-		 FE_CAN_HIERARCHY_AUTO | FE_CAN_RECOVER | FE_CAN_MUTE_TS},</div><div class='del'>-	.release = drxk_t_release,</div><div class='del'>-	.init = drxk_t_init,</div><div class='del'>-	.sleep = drxk_t_sleep,</div><div class='del'>-	.i2c_gate_ctrl = drxk_gate_ctrl,</div><div class='del'>-</div><div class='del'>-	.set_frontend = drxk_set_parameters,</div><div class='del'>-	.get_frontend = drxk_t_get_frontend,</div><div class='add'>+	.get_tune_settings = drxk_get_tune_settings,</div><div class='ctx'> </div><div class='ctx'> 	.read_status = drxk_read_status,</div><div class='ctx'> 	.read_ber = drxk_read_ber,</div><div class='hunk'>@@ -6405,9 +6371,10 @@ static struct dvb_frontend_ops drxk_t_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dvb_frontend *drxk_attach(const struct drxk_config *config,</div><div class='del'>-				 struct i2c_adapter *i2c,</div><div class='del'>-				 struct dvb_frontend **fe_t)</div><div class='add'>+				 struct i2c_adapter *i2c)</div><div class='ctx'> {</div><div class='add'>+	int n;</div><div class='add'>+</div><div class='ctx'> 	struct drxk_state *state = NULL;</div><div class='ctx'> 	u8 adr = config-&gt;adr;</div><div class='ctx'> </div><div class='hunk'>@@ -6423,6 +6390,12 @@ struct dvb_frontend *drxk_attach(const struct drxk_config *config,</div><div class='ctx'> 	state-&gt;no_i2c_bridge = config-&gt;no_i2c_bridge;</div><div class='ctx'> 	state-&gt;antenna_gpio = config-&gt;antenna_gpio;</div><div class='ctx'> 	state-&gt;antenna_dvbt = config-&gt;antenna_dvbt;</div><div class='add'>+	state-&gt;m_ChunkSize = config-&gt;chunk_size;</div><div class='add'>+</div><div class='add'>+	if (config-&gt;parallel_ts)</div><div class='add'>+		state-&gt;m_enableParallel = true;</div><div class='add'>+	else</div><div class='add'>+		state-&gt;m_enableParallel = false;</div><div class='ctx'> </div><div class='ctx'> 	/* NOTE: as more UIO bits will be used, add them to the mask */</div><div class='ctx'> 	state-&gt;UIO_mask = config-&gt;antenna_gpio;</div><div class='hunk'>@@ -6434,21 +6407,30 @@ struct dvb_frontend *drxk_attach(const struct drxk_config *config,</div><div class='ctx'> 		state-&gt;m_GPIO &amp;= ~state-&gt;antenna_gpio;</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;state-&gt;mutex);</div><div class='del'>-	mutex_init(&amp;state-&gt;ctlock);</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;state-&gt;c_frontend.ops, &amp;drxk_c_ops,</div><div class='del'>-	       sizeof(struct dvb_frontend_ops));</div><div class='del'>-	memcpy(&amp;state-&gt;t_frontend.ops, &amp;drxk_t_ops,</div><div class='del'>-	       sizeof(struct dvb_frontend_ops));</div><div class='del'>-	state-&gt;c_frontend.demodulator_priv = state;</div><div class='del'>-	state-&gt;t_frontend.demodulator_priv = state;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;drxk_ops, sizeof(drxk_ops));</div><div class='add'>+	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> </div><div class='ctx'> 	init_state(state);</div><div class='ctx'> 	if (init_drxk(state) &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='del'>-	*fe_t = &amp;state-&gt;t_frontend;</div><div class='ctx'> </div><div class='del'>-	return &amp;state-&gt;c_frontend;</div><div class='add'>+	/* Initialize the supported delivery systems */</div><div class='add'>+	n = 0;</div><div class='add'>+	if (state-&gt;m_hasDVBC) {</div><div class='add'>+		state-&gt;frontend.ops.delsys[n++] = SYS_DVBC_ANNEX_A;</div><div class='add'>+		state-&gt;frontend.ops.delsys[n++] = SYS_DVBC_ANNEX_C;</div><div class='add'>+		strlcat(state-&gt;frontend.ops.info.name, " DVB-C",</div><div class='add'>+			sizeof(state-&gt;frontend.ops.info.name));</div><div class='add'>+	}</div><div class='add'>+	if (state-&gt;m_hasDVBT) {</div><div class='add'>+		state-&gt;frontend.ops.delsys[n++] = SYS_DVBT;</div><div class='add'>+		strlcat(state-&gt;frontend.ops.info.name, " DVB-T",</div><div class='add'>+			sizeof(state-&gt;frontend.ops.info.name));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "drxk: frontend initialized.\n");</div><div class='add'>+	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='ctx'> 	printk(KERN_ERR "drxk: not found\n");</div><div class='head'>diff --git a/drivers/media/dvb/frontends/drxk_hard.h b/drivers/media/dvb/frontends/drxk_hard.h<br/>index a05c32eecdcc..3a58b73eb9b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/drxk_hard.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/drxk_hard.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/drxk_hard.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/drxk_hard.h</a></div><div class='hunk'>@@ -195,9 +195,8 @@ struct DRXKOfdmScCmd_t {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct drxk_state {</div><div class='del'>-	struct dvb_frontend c_frontend;</div><div class='del'>-	struct dvb_frontend t_frontend;</div><div class='del'>-	struct dvb_frontend_parameters param;</div><div class='add'>+	struct dvb_frontend frontend;</div><div class='add'>+	struct dtv_frontend_properties props;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> </div><div class='ctx'> 	struct i2c_adapter *i2c;</div><div class='hunk'>@@ -205,7 +204,6 @@ struct drxk_state {</div><div class='ctx'> 	void  *priv;</div><div class='ctx'> </div><div class='ctx'> 	struct mutex mutex;</div><div class='del'>-	struct mutex ctlock;</div><div class='ctx'> </div><div class='ctx'> 	u32    m_Instance;           /**&lt; Channel 1,2,3 or 4 */</div><div class='ctx'> </div><div class='hunk'>@@ -263,6 +261,8 @@ struct drxk_state {</div><div class='ctx'> 	u8     m_TSDataStrength;</div><div class='ctx'> 	u8     m_TSClockkStrength;</div><div class='ctx'> </div><div class='add'>+	bool   m_itut_annex_c;      /* If true, uses ITU-T DVB-C Annex C, instead of Annex A */</div><div class='add'>+</div><div class='ctx'> 	enum DRXMPEGStrWidth_t  m_widthSTR;    /**&lt; MPEG start width */</div><div class='ctx'> 	u32    m_mpegTsStaticBitrate;          /**&lt; Maximum bitrate in b/s in case</div><div class='ctx'> 						    static clockrate is selected */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/ds3000.c b/drivers/media/dvb/frontends/ds3000.c<br/>index 90bf573308b0..af65d013db11 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/ds3000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/ds3000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/ds3000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/ds3000.c</a></div><div class='hunk'>@@ -934,20 +934,6 @@ error2:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ds3000_attach);</div><div class='ctx'> </div><div class='del'>-static int ds3000_set_property(struct dvb_frontend *fe,</div><div class='del'>-	struct dtv_property *tvp)</div><div class='del'>-{</div><div class='del'>-	dprintk("%s(..)\n", __func__);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ds3000_get_property(struct dvb_frontend *fe,</div><div class='del'>-	struct dtv_property *tvp)</div><div class='del'>-{</div><div class='del'>-	dprintk("%s(..)\n", __func__);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ds3000_set_carrier_offset(struct dvb_frontend *fe,</div><div class='ctx'> 					s32 carrier_offset_khz)</div><div class='ctx'> {</div><div class='hunk'>@@ -967,8 +953,7 @@ static int ds3000_set_carrier_offset(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ds3000_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-				struct dvb_frontend_parameters *p)</div><div class='add'>+static int ds3000_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct ds3000_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='hunk'>@@ -994,15 +979,15 @@ static int ds3000_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	div4 = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* calculate and set freq divider */</div><div class='del'>-	if (p-&gt;frequency &lt; 1146000) {</div><div class='add'>+	if (c-&gt;frequency &lt; 1146000) {</div><div class='ctx'> 		ds3000_tuner_writereg(state, 0x10, 0x11);</div><div class='ctx'> 		div4 = 1;</div><div class='del'>-		ndiv = ((p-&gt;frequency * (6 + 8) * 4) +</div><div class='add'>+		ndiv = ((c-&gt;frequency * (6 + 8) * 4) +</div><div class='ctx'> 				(DS3000_XTAL_FREQ / 2)) /</div><div class='ctx'> 				DS3000_XTAL_FREQ - 1024;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ds3000_tuner_writereg(state, 0x10, 0x01);</div><div class='del'>-		ndiv = ((p-&gt;frequency * (6 + 8) * 2) +</div><div class='add'>+		ndiv = ((c-&gt;frequency * (6 + 8) * 2) +</div><div class='ctx'> 				(DS3000_XTAL_FREQ / 2)) /</div><div class='ctx'> 				DS3000_XTAL_FREQ - 1024;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1101,7 +1086,7 @@ static int ds3000_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	msleep(60);</div><div class='ctx'> </div><div class='ctx'> 	offset_khz = (ndiv - ndiv % 2 + 1024) * DS3000_XTAL_FREQ</div><div class='del'>-		/ (6 + 8) / (div4 + 1) / 2 - p-&gt;frequency;</div><div class='add'>+		/ (6 + 8) / (div4 + 1) / 2 - c-&gt;frequency;</div><div class='ctx'> </div><div class='ctx'> 	/* ds3000 global reset */</div><div class='ctx'> 	ds3000_writereg(state, 0x07, 0x80);</div><div class='hunk'>@@ -1210,7 +1195,7 @@ static int ds3000_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 30 ; i++) {</div><div class='ctx'> 		ds3000_read_status(fe, &amp;status);</div><div class='del'>-		if (status &amp;&amp; FE_HAS_LOCK)</div><div class='add'>+		if (status &amp; FE_HAS_LOCK)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		msleep(10);</div><div class='hunk'>@@ -1220,13 +1205,13 @@ static int ds3000_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ds3000_tune(struct dvb_frontend *fe,</div><div class='del'>-			struct dvb_frontend_parameters *p,</div><div class='add'>+			bool re_tune,</div><div class='ctx'> 			unsigned int mode_flags,</div><div class='ctx'> 			unsigned int *delay,</div><div class='ctx'> 			fe_status_t *status)</div><div class='ctx'> {</div><div class='del'>-	if (p) {</div><div class='del'>-		int ret = ds3000_set_frontend(fe, p);</div><div class='add'>+	if (re_tune) {</div><div class='add'>+		int ret = ds3000_set_frontend(fe);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1279,10 +1264,9 @@ static int ds3000_sleep(struct dvb_frontend *fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops ds3000_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBS, SYS_DVBS2},</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "Montage Technology DS3000/TS2020",</div><div class='del'>-		.type = FE_QPSK,</div><div class='ctx'> 		.frequency_min = 950000,</div><div class='ctx'> 		.frequency_max = 2150000,</div><div class='ctx'> 		.frequency_stepsize = 1011, /* kHz for QPSK frontends */</div><div class='hunk'>@@ -1312,8 +1296,6 @@ static struct dvb_frontend_ops ds3000_ops = {</div><div class='ctx'> 	.diseqc_send_burst = ds3000_diseqc_send_burst,</div><div class='ctx'> 	.get_frontend_algo = ds3000_get_algo,</div><div class='ctx'> </div><div class='del'>-	.set_property = ds3000_set_property,</div><div class='del'>-	.get_property = ds3000_get_property,</div><div class='ctx'> 	.set_frontend = ds3000_set_frontend,</div><div class='ctx'> 	.tune = ds3000_tune,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c<br/>index 62a65efdf8d6..1ab34838221c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dvb-pll.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dvb-pll.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dvb-pll.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/dvb-pll.c</a></div><div class='hunk'>@@ -61,8 +61,7 @@ struct dvb_pll_desc {</div><div class='ctx'> 	u32  min;</div><div class='ctx'> 	u32  max;</div><div class='ctx'> 	u32  iffreq;</div><div class='del'>-	void (*set)(struct dvb_frontend *fe, u8 *buf,</div><div class='del'>-		    const struct dvb_frontend_parameters *params);</div><div class='add'>+	void (*set)(struct dvb_frontend *fe, u8 *buf);</div><div class='ctx'> 	u8   *initdata;</div><div class='ctx'> 	u8   *initdata2;</div><div class='ctx'> 	u8   *sleepdata;</div><div class='hunk'>@@ -93,10 +92,10 @@ static struct dvb_pll_desc dvb_pll_thomson_dtt7579 = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void thomson_dtt759x_bw(struct dvb_frontend *fe, u8 *buf,</div><div class='del'>-			       const struct dvb_frontend_parameters *params)</div><div class='add'>+static void thomson_dtt759x_bw(struct dvb_frontend *fe, u8 *buf)</div><div class='ctx'> {</div><div class='del'>-	if (BANDWIDTH_7_MHZ == params-&gt;u.ofdm.bandwidth)</div><div class='add'>+	u32 bw = fe-&gt;dtv_property_cache.bandwidth_hz;</div><div class='add'>+	if (bw == 7000000)</div><div class='ctx'> 		buf[3] |= 0x10;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -186,10 +185,10 @@ static struct dvb_pll_desc dvb_pll_env57h1xd5 = {</div><div class='ctx'> /* Philips TDA6650/TDA6651</div><div class='ctx'>  * used in Panasonic ENV77H11D5</div><div class='ctx'>  */</div><div class='del'>-static void tda665x_bw(struct dvb_frontend *fe, u8 *buf,</div><div class='del'>-		       const struct dvb_frontend_parameters *params)</div><div class='add'>+static void tda665x_bw(struct dvb_frontend *fe, u8 *buf)</div><div class='ctx'> {</div><div class='del'>-	if (params-&gt;u.ofdm.bandwidth == BANDWIDTH_8_MHZ)</div><div class='add'>+	u32 bw = fe-&gt;dtv_property_cache.bandwidth_hz;</div><div class='add'>+	if (bw == 8000000)</div><div class='ctx'> 		buf[3] |= 0x08;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -220,10 +219,10 @@ static struct dvb_pll_desc dvb_pll_tda665x = {</div><div class='ctx'> /* Infineon TUA6034</div><div class='ctx'>  * used in LG TDTP E102P</div><div class='ctx'>  */</div><div class='del'>-static void tua6034_bw(struct dvb_frontend *fe, u8 *buf,</div><div class='del'>-		       const struct dvb_frontend_parameters *params)</div><div class='add'>+static void tua6034_bw(struct dvb_frontend *fe, u8 *buf)</div><div class='ctx'> {</div><div class='del'>-	if (BANDWIDTH_7_MHZ != params-&gt;u.ofdm.bandwidth)</div><div class='add'>+	u32 bw = fe-&gt;dtv_property_cache.bandwidth_hz;</div><div class='add'>+	if (bw == 7000000)</div><div class='ctx'> 		buf[3] |= 0x08;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -244,10 +243,10 @@ static struct dvb_pll_desc dvb_pll_tua6034 = {</div><div class='ctx'> /* ALPS TDED4</div><div class='ctx'>  * used in Nebula-Cards and USB boxes</div><div class='ctx'>  */</div><div class='del'>-static void tded4_bw(struct dvb_frontend *fe, u8 *buf,</div><div class='del'>-		     const struct dvb_frontend_parameters *params)</div><div class='add'>+static void tded4_bw(struct dvb_frontend *fe, u8 *buf)</div><div class='ctx'> {</div><div class='del'>-	if (params-&gt;u.ofdm.bandwidth == BANDWIDTH_8_MHZ)</div><div class='add'>+	u32 bw = fe-&gt;dtv_property_cache.bandwidth_hz;</div><div class='add'>+	if (bw == 8000000)</div><div class='ctx'> 		buf[3] |= 0x04;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -319,11 +318,11 @@ static struct dvb_pll_desc dvb_pll_philips_sd1878_tda8261 = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void opera1_bw(struct dvb_frontend *fe, u8 *buf,</div><div class='del'>-		      const struct dvb_frontend_parameters *params)</div><div class='add'>+static void opera1_bw(struct dvb_frontend *fe, u8 *buf)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dvb_pll_priv *priv = fe-&gt;tuner_priv;</div><div class='del'>-	u32 b_w  = (params-&gt;u.qpsk.symbol_rate * 27) / 32000;</div><div class='add'>+	u32 b_w  = (c-&gt;symbol_rate * 27) / 32000;</div><div class='ctx'> 	struct i2c_msg msg = {</div><div class='ctx'> 		.addr = priv-&gt;pll_i2c_address,</div><div class='ctx'> 		.flags = 0,</div><div class='hunk'>@@ -392,8 +391,7 @@ static struct dvb_pll_desc dvb_pll_opera1 = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void samsung_dtos403ih102a_set(struct dvb_frontend *fe, u8 *buf,</div><div class='del'>-		       const struct dvb_frontend_parameters *params)</div><div class='add'>+static void samsung_dtos403ih102a_set(struct dvb_frontend *fe, u8 *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_pll_priv *priv = fe-&gt;tuner_priv;</div><div class='ctx'> 	struct i2c_msg msg = {</div><div class='hunk'>@@ -537,30 +535,29 @@ static struct dvb_pll_desc *pll_list[] = {</div><div class='ctx'> /* code                                                        */</div><div class='ctx'> </div><div class='ctx'> static int dvb_pll_configure(struct dvb_frontend *fe, u8 *buf,</div><div class='del'>-			     const struct dvb_frontend_parameters *params)</div><div class='add'>+			     const u32 frequency)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_pll_priv *priv = fe-&gt;tuner_priv;</div><div class='ctx'> 	struct dvb_pll_desc *desc = priv-&gt;pll_desc;</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency != 0 &amp;&amp; (params-&gt;frequency &lt; desc-&gt;min ||</div><div class='del'>-				       params-&gt;frequency &gt; desc-&gt;max))</div><div class='add'>+	if (frequency &amp;&amp; (frequency &lt; desc-&gt;min || frequency &gt; desc-&gt;max))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; desc-&gt;count; i++) {</div><div class='del'>-		if (params-&gt;frequency &gt; desc-&gt;entries[i].limit)</div><div class='add'>+		if (frequency &gt; desc-&gt;entries[i].limit)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (debug)</div><div class='ctx'> 		printk("pll: %s: freq=%d | i=%d/%d\n", desc-&gt;name,</div><div class='del'>-		       params-&gt;frequency, i, desc-&gt;count);</div><div class='add'>+		       frequency, i, desc-&gt;count);</div><div class='ctx'> 	if (i == desc-&gt;count)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	div = (params-&gt;frequency + desc-&gt;iffreq +</div><div class='add'>+	div = (frequency + desc-&gt;iffreq +</div><div class='ctx'> 	       desc-&gt;entries[i].stepsize/2) / desc-&gt;entries[i].stepsize;</div><div class='ctx'> 	buf[0] = div &gt;&gt; 8;</div><div class='ctx'> 	buf[1] = div &amp; 0xff;</div><div class='hunk'>@@ -568,7 +565,7 @@ static int dvb_pll_configure(struct dvb_frontend *fe, u8 *buf,</div><div class='ctx'> 	buf[3] = desc-&gt;entries[i].cb;</div><div class='ctx'> </div><div class='ctx'> 	if (desc-&gt;set)</div><div class='del'>-		desc-&gt;set(fe, buf, params);</div><div class='add'>+		desc-&gt;set(fe, buf);</div><div class='ctx'> </div><div class='ctx'> 	if (debug)</div><div class='ctx'> 		printk("pll: %s: div=%d | buf=0x%02x,0x%02x,0x%02x,0x%02x\n",</div><div class='hunk'>@@ -611,9 +608,9 @@ static int dvb_pll_sleep(struct dvb_frontend *fe)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dvb_pll_set_params(struct dvb_frontend *fe,</div><div class='del'>-			      struct dvb_frontend_parameters *params)</div><div class='add'>+static int dvb_pll_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dvb_pll_priv *priv = fe-&gt;tuner_priv;</div><div class='ctx'> 	u8 buf[4];</div><div class='ctx'> 	struct i2c_msg msg =</div><div class='hunk'>@@ -625,7 +622,8 @@ static int dvb_pll_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 	if (priv-&gt;i2c == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if ((result = dvb_pll_configure(fe, buf, params)) &lt; 0)</div><div class='add'>+	result = dvb_pll_configure(fe, buf, c-&gt;frequency);</div><div class='add'>+	if (result &lt; 0)</div><div class='ctx'> 		return result;</div><div class='ctx'> 	else</div><div class='ctx'> 		frequency = result;</div><div class='hunk'>@@ -637,15 +635,15 @@ static int dvb_pll_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;frequency = frequency;</div><div class='del'>-	priv-&gt;bandwidth = (fe-&gt;ops.info.type == FE_OFDM) ? params-&gt;u.ofdm.bandwidth : 0;</div><div class='add'>+	priv-&gt;bandwidth = c-&gt;bandwidth_hz;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dvb_pll_calc_regs(struct dvb_frontend *fe,</div><div class='del'>-			     struct dvb_frontend_parameters *params,</div><div class='ctx'> 			     u8 *buf, int buf_len)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct dvb_pll_priv *priv = fe-&gt;tuner_priv;</div><div class='ctx'> 	int result;</div><div class='ctx'> 	u32 frequency = 0;</div><div class='hunk'>@@ -653,7 +651,8 @@ static int dvb_pll_calc_regs(struct dvb_frontend *fe,</div><div class='ctx'> 	if (buf_len &lt; 5)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if ((result = dvb_pll_configure(fe, buf+1, params)) &lt; 0)</div><div class='add'>+	result = dvb_pll_configure(fe, buf + 1, c-&gt;frequency);</div><div class='add'>+	if (result &lt; 0)</div><div class='ctx'> 		return result;</div><div class='ctx'> 	else</div><div class='ctx'> 		frequency = result;</div><div class='hunk'>@@ -661,7 +660,7 @@ static int dvb_pll_calc_regs(struct dvb_frontend *fe,</div><div class='ctx'> 	buf[0] = priv-&gt;pll_i2c_address;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;frequency = frequency;</div><div class='del'>-	priv-&gt;bandwidth = (fe-&gt;ops.info.type == FE_OFDM) ? params-&gt;u.ofdm.bandwidth : 0;</div><div class='add'>+	priv-&gt;bandwidth = c-&gt;bandwidth_hz;</div><div class='ctx'> </div><div class='ctx'> 	return 5;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dvb_dummy_fe.c b/drivers/media/dvb/frontends/dvb_dummy_fe.c<br/>index a7fc7e53a551..dcfc902c8678 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dvb_dummy_fe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/dvb_dummy_fe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dvb_dummy_fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/dvb_dummy_fe.c</a></div><div class='hunk'>@@ -68,15 +68,18 @@ static int dvb_dummy_fe_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dvb_dummy_fe_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+/*</div><div class='add'>+ * Only needed if it actually reads something from the hardware</div><div class='add'>+ */</div><div class='add'>+static int dvb_dummy_fe_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dvb_dummy_fe_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int dvb_dummy_fe_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -171,10 +174,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops dvb_dummy_fe_ofdm_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Dummy DVB-T",</div><div class='del'>-		.type			= FE_OFDM,</div><div class='ctx'> 		.frequency_min		= 0,</div><div class='ctx'> 		.frequency_max		= 863250000,</div><div class='ctx'> 		.frequency_stepsize	= 62500,</div><div class='hunk'>@@ -203,10 +205,9 @@ static struct dvb_frontend_ops dvb_dummy_fe_ofdm_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops dvb_dummy_fe_qam_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBC_ANNEX_A },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Dummy DVB-C",</div><div class='del'>-		.type			= FE_QAM,</div><div class='ctx'> 		.frequency_stepsize	= 62500,</div><div class='ctx'> 		.frequency_min		= 51000000,</div><div class='ctx'> 		.frequency_max		= 858000000,</div><div class='hunk'>@@ -233,10 +234,9 @@ static struct dvb_frontend_ops dvb_dummy_fe_qam_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops dvb_dummy_fe_qpsk_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Dummy DVB-S",</div><div class='del'>-		.type			= FE_QPSK,</div><div class='ctx'> 		.frequency_min		= 950000,</div><div class='ctx'> 		.frequency_max		= 2150000,</div><div class='ctx'> 		.frequency_stepsize	= 250,           /* kHz for QPSK frontends */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/ec100.c b/drivers/media/dvb/frontends/ec100.c<br/>index 2414dc6ee5d9..c56fddbf53b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/ec100.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/ec100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/ec100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/ec100.c</a></div><div class='hunk'>@@ -76,19 +76,19 @@ static int ec100_read_reg(struct ec100_state *state, u8 reg, u8 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ec100_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *params)</div><div class='add'>+static int ec100_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct ec100_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 tmp, tmp2;</div><div class='ctx'> </div><div class='del'>-	deb_info("%s: freq:%d bw:%d\n", __func__, params-&gt;frequency,</div><div class='del'>-		params-&gt;u.ofdm.bandwidth);</div><div class='add'>+	deb_info("%s: freq:%d bw:%d\n", __func__, c-&gt;frequency,</div><div class='add'>+		c-&gt;bandwidth_hz);</div><div class='ctx'> </div><div class='ctx'> 	/* program tuner */</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params)</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, params);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> </div><div class='ctx'> 	ret = ec100_write_reg(state, 0x04, 0x06);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -108,16 +108,16 @@ static int ec100_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	   B 0x1b | 0xb7 | 0x00 | 0x49</div><div class='ctx'> 	   B 0x1c | 0x55 | 0x64 | 0x72 */</div><div class='ctx'> </div><div class='del'>-	switch (params-&gt;u.ofdm.bandwidth) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	switch (c-&gt;bandwidth_hz) {</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		tmp = 0xb7;</div><div class='ctx'> 		tmp2 = 0x55;</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		tmp = 0x00;</div><div class='ctx'> 		tmp2 = 0x64;</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 	default:</div><div class='ctx'> 		tmp = 0x49;</div><div class='ctx'> 		tmp2 = 0x72;</div><div class='hunk'>@@ -306,9 +306,9 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(ec100_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops ec100_ops = {</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "E3C EC100 DVB-T",</div><div class='del'>-		.type = FE_OFDM,</div><div class='ctx'> 		.caps =</div><div class='ctx'> 			FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |</div><div class='ctx'> 			FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |</div><div class='head'>diff --git a/drivers/media/dvb/frontends/hd29l2.c b/drivers/media/dvb/frontends/hd29l2.c<br/>new file mode 100644<br/>index 000000000000..a00318190837<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/hd29l2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/hd29l2.c</a></div><div class='hunk'>@@ -0,0 +1,861 @@</div><div class='add'>+/*</div><div class='add'>+ * HDIC HD29L2 DMB-TH demodulator driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Metropolia University of Applied Sciences, Electria R&amp;D</div><div class='add'>+ *</div><div class='add'>+ * Author: Antti Palosaari &lt;crope@iki.fi&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'>+ *    This program is distributed in the hope that it will be useful,</div><div class='add'>+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *    GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *    You should have received a copy of the GNU General Public License</div><div class='add'>+ *    along with this program; if not, write to the Free Software</div><div class='add'>+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "hd29l2_priv.h"</div><div class='add'>+</div><div class='add'>+int hd29l2_debug;</div><div class='add'>+module_param_named(debug, hd29l2_debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");</div><div class='add'>+</div><div class='add'>+/* write multiple registers */</div><div class='add'>+static int hd29l2_wr_regs(struct hd29l2_priv *priv, u8 reg, u8 *val, int len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 buf[2 + len];</div><div class='add'>+	struct i2c_msg msg[1] = {</div><div class='add'>+		{</div><div class='add'>+			.addr = priv-&gt;cfg.i2c_addr,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.len = sizeof(buf),</div><div class='add'>+			.buf = buf,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	buf[0] = 0x00;</div><div class='add'>+	buf[1] = reg;</div><div class='add'>+	memcpy(&amp;buf[2], val, len);</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(priv-&gt;i2c, msg, 1);</div><div class='add'>+	if (ret == 1) {</div><div class='add'>+		ret = 0;</div><div class='add'>+	} else {</div><div class='add'>+		warn("i2c wr failed=%d reg=%02x len=%d", ret, reg, len);</div><div class='add'>+		ret = -EREMOTEIO;</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'>+/* read multiple registers */</div><div class='add'>+static int hd29l2_rd_regs(struct hd29l2_priv *priv, u8 reg, u8 *val, int len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 buf[2] = { 0x00, reg };</div><div class='add'>+	struct i2c_msg msg[2] = {</div><div class='add'>+		{</div><div class='add'>+			.addr = priv-&gt;cfg.i2c_addr,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.len = 2,</div><div class='add'>+			.buf = buf,</div><div class='add'>+		}, {</div><div class='add'>+			.addr = priv-&gt;cfg.i2c_addr,</div><div class='add'>+			.flags = I2C_M_RD,</div><div class='add'>+			.len = len,</div><div class='add'>+			.buf = val,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(priv-&gt;i2c, msg, 2);</div><div class='add'>+	if (ret == 2) {</div><div class='add'>+		ret = 0;</div><div class='add'>+	} else {</div><div class='add'>+		warn("i2c rd failed=%d reg=%02x len=%d", ret, reg, len);</div><div class='add'>+		ret = -EREMOTEIO;</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'>+/* write single register */</div><div class='add'>+static int hd29l2_wr_reg(struct hd29l2_priv *priv, u8 reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	return hd29l2_wr_regs(priv, reg, &amp;val, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* read single register */</div><div class='add'>+static int hd29l2_rd_reg(struct hd29l2_priv *priv, u8 reg, u8 *val)</div><div class='add'>+{</div><div class='add'>+	return hd29l2_rd_regs(priv, reg, val, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* write single register with mask */</div><div class='add'>+static int hd29l2_wr_reg_mask(struct hd29l2_priv *priv, u8 reg, u8 val, u8 mask)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 tmp;</div><div class='add'>+</div><div class='add'>+	/* no need for read if whole reg is written */</div><div class='add'>+	if (mask != 0xff) {</div><div class='add'>+		ret = hd29l2_rd_regs(priv, reg, &amp;tmp, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		val &amp;= mask;</div><div class='add'>+		tmp &amp;= ~mask;</div><div class='add'>+		val |= tmp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return hd29l2_wr_regs(priv, reg, &amp;val, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* read single register with mask */</div><div class='add'>+int hd29l2_rd_reg_mask(struct hd29l2_priv *priv, u8 reg, u8 *val, u8 mask)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+	u8 tmp;</div><div class='add'>+</div><div class='add'>+	ret = hd29l2_rd_regs(priv, reg, &amp;tmp, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	tmp &amp;= mask;</div><div class='add'>+</div><div class='add'>+	/* find position of the first bit */</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		if ((mask &gt;&gt; i) &amp; 0x01)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	*val = tmp &gt;&gt; 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 hd29l2_soft_reset(struct hd29l2_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 tmp;</div><div class='add'>+</div><div class='add'>+	ret = hd29l2_rd_reg(priv, 0x26, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = hd29l2_wr_reg(priv, 0x26, 0x0d);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	usleep_range(10000, 20000);</div><div class='add'>+</div><div class='add'>+	ret = hd29l2_wr_reg(priv, 0x26, tmp);</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'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hd29l2_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+	struct hd29l2_priv *priv = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 tmp;</div><div class='add'>+</div><div class='add'>+	dbg("%s: enable=%d", __func__, enable);</div><div class='add'>+</div><div class='add'>+	/* set tuner address for demod */</div><div class='add'>+	if (!priv-&gt;tuner_i2c_addr_programmed &amp;&amp; enable) {</div><div class='add'>+		/* no need to set tuner address every time, once is enough */</div><div class='add'>+		ret = hd29l2_wr_reg(priv, 0x9d, priv-&gt;cfg.tuner_i2c_addr &lt;&lt; 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		priv-&gt;tuner_i2c_addr_programmed = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* open / close gate */</div><div class='add'>+	ret = hd29l2_wr_reg(priv, 0x9f, enable);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* wait demod ready */</div><div class='add'>+	for (i = 10; i; i--) {</div><div class='add'>+		ret = hd29l2_rd_reg(priv, 0x9e, &amp;tmp);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		if (tmp == enable)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		usleep_range(5000, 10000);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dbg("%s: loop=%d", __func__, i);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hd29l2_read_status(struct dvb_frontend *fe, fe_status_t *status)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct hd29l2_priv *priv = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 buf[2];</div><div class='add'>+</div><div class='add'>+	*status = 0;</div><div class='add'>+</div><div class='add'>+	ret = hd29l2_rd_reg(priv, 0x05, &amp;buf[0]);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (buf[0] &amp; 0x01) {</div><div class='add'>+		/* full lock */</div><div class='add'>+		*status |= FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI |</div><div class='add'>+			FE_HAS_SYNC | FE_HAS_LOCK;</div><div class='add'>+	} else {</div><div class='add'>+		ret = hd29l2_rd_reg(priv, 0x0d, &amp;buf[1]);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		if ((buf[1] &amp; 0xfe) == 0x78)</div><div class='add'>+			/* partial lock */</div><div class='add'>+			*status |= FE_HAS_SIGNAL | FE_HAS_CARRIER |</div><div class='add'>+				FE_HAS_VITERBI | FE_HAS_SYNC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;fe_status = *status;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hd29l2_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct hd29l2_priv *priv = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 buf[2];</div><div class='add'>+	u16 tmp;</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;fe_status &amp; FE_HAS_LOCK)) {</div><div class='add'>+		*snr = 0;</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hd29l2_rd_regs(priv, 0x0b, buf, 2);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	tmp = (buf[0] &lt;&lt; 8) | buf[1];</div><div class='add'>+</div><div class='add'>+	/* report SNR in dB * 10 */</div><div class='add'>+	#define LOG10_20736_24 72422627 /* log10(20736) &lt;&lt; 24 */</div><div class='add'>+	if (tmp)</div><div class='add'>+		*snr = (LOG10_20736_24 - intlog10(tmp)) / ((1 &lt;&lt; 24) / 100);</div><div class='add'>+	else</div><div class='add'>+		*snr = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hd29l2_read_signal_strength(struct dvb_frontend *fe, u16 *strength)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct hd29l2_priv *priv = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 buf[2];</div><div class='add'>+	u16 tmp;</div><div class='add'>+</div><div class='add'>+	*strength = 0;</div><div class='add'>+</div><div class='add'>+	ret = hd29l2_rd_regs(priv, 0xd5, buf, 2);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	tmp = buf[0] &lt;&lt; 8 | buf[1];</div><div class='add'>+	tmp = ~tmp &amp; 0x0fff;</div><div class='add'>+</div><div class='add'>+	/* scale value to 0x0000-0xffff from 0x0000-0x0fff */</div><div class='add'>+	*strength = tmp * 0xffff / 0x0fff;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hd29l2_read_ber(struct dvb_frontend *fe, u32 *ber)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct hd29l2_priv *priv = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 buf[2];</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;fe_status &amp; FE_HAS_SYNC)) {</div><div class='add'>+		*ber = 0;</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hd29l2_rd_regs(priv, 0xd9, buf, 2);</div><div class='add'>+	if (ret) {</div><div class='add'>+		*ber = 0;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* LDPC BER */</div><div class='add'>+	*ber = ((buf[0] &amp; 0x0f) &lt;&lt; 8) | buf[1];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hd29l2_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='add'>+{</div><div class='add'>+	/* no way to read? */</div><div class='add'>+	*ucblocks = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dvbfe_search hd29l2_search(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+	struct hd29l2_priv *priv = fe-&gt;demodulator_priv;</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	u8 tmp, buf[3];</div><div class='add'>+	u8 modulation, carrier, guard_interval, interleave, code_rate;</div><div class='add'>+	u64 num64;</div><div class='add'>+	u32 if_freq, if_ctl;</div><div class='add'>+	bool auto_mode;</div><div class='add'>+</div><div class='add'>+	dbg("%s: delivery_system=%d frequency=%d bandwidth_hz=%d " \</div><div class='add'>+		"modulation=%d inversion=%d fec_inner=%d guard_interval=%d",</div><div class='add'>+		 __func__,</div><div class='add'>+		c-&gt;delivery_system, c-&gt;frequency, c-&gt;bandwidth_hz,</div><div class='add'>+		c-&gt;modulation, c-&gt;inversion, c-&gt;fec_inner, c-&gt;guard_interval);</div><div class='add'>+</div><div class='add'>+	/* as for now we detect always params automatically */</div><div class='add'>+	auto_mode = true;</div><div class='add'>+</div><div class='add'>+	/* program tuner */</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params)</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='add'>+</div><div class='add'>+	/* get and program IF */</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.get_if_frequency)</div><div class='add'>+		fe-&gt;ops.tuner_ops.get_if_frequency(fe, &amp;if_freq);</div><div class='add'>+	else</div><div class='add'>+		if_freq = 0;</div><div class='add'>+</div><div class='add'>+	if (if_freq) {</div><div class='add'>+		/* normal IF */</div><div class='add'>+</div><div class='add'>+		/* calc IF control value */</div><div class='add'>+		num64 = if_freq;</div><div class='add'>+		num64 *= 0x800000;</div><div class='add'>+		num64 = div_u64(num64, HD29L2_XTAL);</div><div class='add'>+		num64 -= 0x800000;</div><div class='add'>+		if_ctl = num64;</div><div class='add'>+</div><div class='add'>+		tmp = 0xfc; /* tuner type normal */</div><div class='add'>+	} else {</div><div class='add'>+		/* zero IF */</div><div class='add'>+		if_ctl = 0;</div><div class='add'>+		tmp = 0xfe; /* tuner type Zero-IF */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf[0] = ((if_ctl &gt;&gt;  0) &amp; 0xff);</div><div class='add'>+	buf[1] = ((if_ctl &gt;&gt;  8) &amp; 0xff);</div><div class='add'>+	buf[2] = ((if_ctl &gt;&gt; 16) &amp; 0xff);</div><div class='add'>+</div><div class='add'>+	/* program IF control */</div><div class='add'>+	ret = hd29l2_wr_regs(priv, 0x14, buf, 3);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* program tuner type */</div><div class='add'>+	ret = hd29l2_wr_reg(priv, 0xab, tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	dbg("%s: if_freq=%d if_ctl=%x", __func__, if_freq, if_ctl);</div><div class='add'>+</div><div class='add'>+	if (auto_mode) {</div><div class='add'>+		/*</div><div class='add'>+		 * use auto mode</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		/* disable quick mode */</div><div class='add'>+		ret = hd29l2_wr_reg_mask(priv, 0xac, 0 &lt;&lt; 7, 0x80);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		ret = hd29l2_wr_reg_mask(priv, 0x82, 1 &lt;&lt; 1, 0x02);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		/* enable auto mode */</div><div class='add'>+		ret = hd29l2_wr_reg_mask(priv, 0x7d, 1 &lt;&lt; 6, 0x40);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		ret = hd29l2_wr_reg_mask(priv, 0x81, 1 &lt;&lt; 3, 0x08);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		/* soft reset */</div><div class='add'>+		ret = hd29l2_soft_reset(priv);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		/* detect modulation */</div><div class='add'>+		for (i = 30; i; i--) {</div><div class='add'>+			msleep(100);</div><div class='add'>+</div><div class='add'>+			ret = hd29l2_rd_reg(priv, 0x0d, &amp;tmp);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto err;</div><div class='add'>+</div><div class='add'>+			if ((((tmp &amp; 0xf0) &gt;= 0x10) &amp;&amp;</div><div class='add'>+				((tmp &amp; 0x0f) == 0x08)) || (tmp &gt;= 0x2c))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dbg("%s: loop=%d", __func__, i);</div><div class='add'>+</div><div class='add'>+		if (i == 0)</div><div class='add'>+			/* detection failed */</div><div class='add'>+			return DVBFE_ALGO_SEARCH_FAILED;</div><div class='add'>+</div><div class='add'>+		/* read modulation */</div><div class='add'>+		ret = hd29l2_rd_reg_mask(priv, 0x7d, &amp;modulation, 0x07);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * use manual mode</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		modulation = HD29L2_QAM64;</div><div class='add'>+		carrier = HD29L2_CARRIER_MULTI;</div><div class='add'>+		guard_interval = HD29L2_PN945;</div><div class='add'>+		interleave = HD29L2_INTERLEAVER_420;</div><div class='add'>+		code_rate = HD29L2_CODE_RATE_08;</div><div class='add'>+</div><div class='add'>+		tmp = (code_rate &lt;&lt; 3) | modulation;</div><div class='add'>+		ret = hd29l2_wr_reg_mask(priv, 0x7d, tmp, 0x5f);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		tmp = (carrier &lt;&lt; 2) | guard_interval;</div><div class='add'>+		ret = hd29l2_wr_reg_mask(priv, 0x81, tmp, 0x0f);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		tmp = interleave;</div><div class='add'>+		ret = hd29l2_wr_reg_mask(priv, 0x82, tmp, 0x03);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ensure modulation validy */</div><div class='add'>+	/* 0=QAM4_NR, 1=QAM4, 2=QAM16, 3=QAM32, 4=QAM64 */</div><div class='add'>+	if (modulation &gt; (ARRAY_SIZE(reg_mod_vals_tab[0].val) - 1)) {</div><div class='add'>+		dbg("%s: modulation=%d not valid", __func__, modulation);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* program registers according to modulation */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(reg_mod_vals_tab); i++) {</div><div class='add'>+		ret = hd29l2_wr_reg(priv, reg_mod_vals_tab[i].reg,</div><div class='add'>+			reg_mod_vals_tab[i].val[modulation]);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* read guard interval */</div><div class='add'>+	ret = hd29l2_rd_reg_mask(priv, 0x81, &amp;guard_interval, 0x03);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* read carrier mode */</div><div class='add'>+	ret = hd29l2_rd_reg_mask(priv, 0x81, &amp;carrier, 0x04);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	dbg("%s: modulation=%d guard_interval=%d carrier=%d",</div><div class='add'>+		__func__, modulation, guard_interval, carrier);</div><div class='add'>+</div><div class='add'>+	if ((carrier == HD29L2_CARRIER_MULTI) &amp;&amp; (modulation == HD29L2_QAM64) &amp;&amp;</div><div class='add'>+		(guard_interval == HD29L2_PN945)) {</div><div class='add'>+		dbg("%s: C=3780 &amp;&amp; QAM64 &amp;&amp; PN945", __func__);</div><div class='add'>+</div><div class='add'>+		ret = hd29l2_wr_reg(priv, 0x42, 0x33);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		ret = hd29l2_wr_reg(priv, 0xdd, 0x01);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usleep_range(10000, 20000);</div><div class='add'>+</div><div class='add'>+	/* soft reset */</div><div class='add'>+	ret = hd29l2_soft_reset(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* wait demod lock */</div><div class='add'>+	for (i = 30; i; i--) {</div><div class='add'>+		msleep(100);</div><div class='add'>+</div><div class='add'>+		/* read lock bit */</div><div class='add'>+		ret = hd29l2_rd_reg_mask(priv, 0x05, &amp;tmp, 0x01);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		if (tmp)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dbg("%s: loop=%d", __func__, i);</div><div class='add'>+</div><div class='add'>+	if (i == 0)</div><div class='add'>+		return DVBFE_ALGO_SEARCH_AGAIN;</div><div class='add'>+</div><div class='add'>+	return DVBFE_ALGO_SEARCH_SUCCESS;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='add'>+	return DVBFE_ALGO_SEARCH_ERROR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hd29l2_get_frontend_algo(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	return DVBFE_ALGO_CUSTOM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hd29l2_get_frontend(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct hd29l2_priv *priv = fe-&gt;demodulator_priv;</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	u8 buf[3];</div><div class='add'>+	u32 if_ctl;</div><div class='add'>+	char *str_constellation, *str_code_rate, *str_constellation_code_rate,</div><div class='add'>+		*str_guard_interval, *str_carrier, *str_guard_interval_carrier,</div><div class='add'>+		*str_interleave, *str_interleave_;</div><div class='add'>+</div><div class='add'>+	ret = hd29l2_rd_reg(priv, 0x7d, &amp;buf[0]);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = hd29l2_rd_regs(priv, 0x81, &amp;buf[1], 2);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* constellation, 0x7d[2:0] */</div><div class='add'>+	switch ((buf[0] &gt;&gt; 0) &amp; 0x07) {</div><div class='add'>+	case 0: /* QAM4NR */</div><div class='add'>+		str_constellation = "QAM4NR";</div><div class='add'>+		c-&gt;modulation = QAM_AUTO; /* FIXME */</div><div class='add'>+		break;</div><div class='add'>+	case 1: /* QAM4 */</div><div class='add'>+		str_constellation = "QAM4";</div><div class='add'>+		c-&gt;modulation = QPSK; /* FIXME */</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		str_constellation = "QAM16";</div><div class='add'>+		c-&gt;modulation = QAM_16;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		str_constellation = "QAM32";</div><div class='add'>+		c-&gt;modulation = QAM_32;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		str_constellation = "QAM64";</div><div class='add'>+		c-&gt;modulation = QAM_64;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		str_constellation = "?";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* LDPC code rate, 0x7d[4:3] */</div><div class='add'>+	switch ((buf[0] &gt;&gt; 3) &amp; 0x03) {</div><div class='add'>+	case 0: /* 0.4 */</div><div class='add'>+		str_code_rate = "0.4";</div><div class='add'>+		c-&gt;fec_inner = FEC_AUTO; /* FIXME */</div><div class='add'>+		break;</div><div class='add'>+	case 1: /* 0.6 */</div><div class='add'>+		str_code_rate = "0.6";</div><div class='add'>+		c-&gt;fec_inner = FEC_3_5;</div><div class='add'>+		break;</div><div class='add'>+	case 2: /* 0.8 */</div><div class='add'>+		str_code_rate = "0.8";</div><div class='add'>+		c-&gt;fec_inner = FEC_4_5;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		str_code_rate = "?";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* constellation &amp; code rate set, 0x7d[6] */</div><div class='add'>+	switch ((buf[0] &gt;&gt; 6) &amp; 0x01) {</div><div class='add'>+	case 0:</div><div class='add'>+		str_constellation_code_rate = "manual";</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		str_constellation_code_rate = "auto";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		str_constellation_code_rate = "?";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* frame header, 0x81[1:0] */</div><div class='add'>+	switch ((buf[1] &gt;&gt; 0) &amp; 0x03) {</div><div class='add'>+	case 0: /* PN945 */</div><div class='add'>+		str_guard_interval = "PN945";</div><div class='add'>+		c-&gt;guard_interval = GUARD_INTERVAL_AUTO; /* FIXME */</div><div class='add'>+		break;</div><div class='add'>+	case 1: /* PN595 */</div><div class='add'>+		str_guard_interval = "PN595";</div><div class='add'>+		c-&gt;guard_interval = GUARD_INTERVAL_AUTO; /* FIXME */</div><div class='add'>+		break;</div><div class='add'>+	case 2: /* PN420 */</div><div class='add'>+		str_guard_interval = "PN420";</div><div class='add'>+		c-&gt;guard_interval = GUARD_INTERVAL_AUTO; /* FIXME */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		str_guard_interval = "?";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* carrier, 0x81[2] */</div><div class='add'>+	switch ((buf[1] &gt;&gt; 2) &amp; 0x01) {</div><div class='add'>+	case 0:</div><div class='add'>+		str_carrier = "C=1";</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		str_carrier = "C=3780";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		str_carrier = "?";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* frame header &amp; carrier set, 0x81[3] */</div><div class='add'>+	switch ((buf[1] &gt;&gt; 3) &amp; 0x01) {</div><div class='add'>+	case 0:</div><div class='add'>+		str_guard_interval_carrier = "manual";</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		str_guard_interval_carrier = "auto";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		str_guard_interval_carrier = "?";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* interleave, 0x82[0] */</div><div class='add'>+	switch ((buf[2] &gt;&gt; 0) &amp; 0x01) {</div><div class='add'>+	case 0:</div><div class='add'>+		str_interleave = "M=720";</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		str_interleave = "M=240";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		str_interleave = "?";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* interleave set, 0x82[1] */</div><div class='add'>+	switch ((buf[2] &gt;&gt; 1) &amp; 0x01) {</div><div class='add'>+	case 0:</div><div class='add'>+		str_interleave_ = "manual";</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		str_interleave_ = "auto";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		str_interleave_ = "?";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We can read out current detected NCO and use that value next</div><div class='add'>+	 * time instead of calculating new value from targed IF.</div><div class='add'>+	 * I think it will not effect receiver sensitivity but gaining lock</div><div class='add'>+	 * after tune could be easier...</div><div class='add'>+	 */</div><div class='add'>+	ret = hd29l2_rd_regs(priv, 0xb1, &amp;buf[0], 3);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if_ctl = (buf[0] &lt;&lt; 16) | ((buf[1] - 7) &lt;&lt; 8) | buf[2];</div><div class='add'>+</div><div class='add'>+	dbg("%s: %s %s %s | %s %s %s | %s %s | NCO=%06x", __func__,</div><div class='add'>+		str_constellation, str_code_rate, str_constellation_code_rate,</div><div class='add'>+		str_guard_interval, str_carrier, str_guard_interval_carrier,</div><div class='add'>+		str_interleave, str_interleave_, if_ctl);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hd29l2_init(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+	struct hd29l2_priv *priv = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 tmp;</div><div class='add'>+	static const struct reg_val tab[] = {</div><div class='add'>+		{ 0x3a, 0x06 },</div><div class='add'>+		{ 0x3b, 0x03 },</div><div class='add'>+		{ 0x3c, 0x04 },</div><div class='add'>+		{ 0xaf, 0x06 },</div><div class='add'>+		{ 0xb0, 0x1b },</div><div class='add'>+		{ 0x80, 0x64 },</div><div class='add'>+		{ 0x10, 0x38 },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dbg("%s:", __func__);</div><div class='add'>+</div><div class='add'>+	/* reset demod */</div><div class='add'>+	/* it is recommended to HW reset chip using RST_N pin */</div><div class='add'>+	if (fe-&gt;callback) {</div><div class='add'>+		ret = fe-&gt;callback(fe, DVB_FRONTEND_COMPONENT_DEMOD, 0, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		/* reprogramming needed because HW reset clears registers */</div><div class='add'>+		priv-&gt;tuner_i2c_addr_programmed = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* init */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(tab); i++) {</div><div class='add'>+		ret = hd29l2_wr_reg(priv, tab[i].reg, tab[i].val);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TS params */</div><div class='add'>+	ret = hd29l2_rd_reg(priv, 0x36, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	tmp &amp;= 0x1b;</div><div class='add'>+	tmp |= priv-&gt;cfg.ts_mode;</div><div class='add'>+	ret = hd29l2_wr_reg(priv, 0x36, tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = hd29l2_rd_reg(priv, 0x31, &amp;tmp);</div><div class='add'>+	tmp &amp;= 0xef;</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;cfg.ts_mode &gt;&gt; 7))</div><div class='add'>+		/* set b4 for serial TS */</div><div class='add'>+		tmp |= 0x10;</div><div class='add'>+</div><div class='add'>+	ret = hd29l2_wr_reg(priv, 0x31, tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+err:</div><div class='add'>+	dbg("%s: failed=%d", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hd29l2_release(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct hd29l2_priv *priv = fe-&gt;demodulator_priv;</div><div class='add'>+	kfree(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dvb_frontend_ops hd29l2_ops;</div><div class='add'>+</div><div class='add'>+struct dvb_frontend *hd29l2_attach(const struct hd29l2_config *config,</div><div class='add'>+	struct i2c_adapter *i2c)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct hd29l2_priv *priv = NULL;</div><div class='add'>+	u8 tmp;</div><div class='add'>+</div><div class='add'>+	/* allocate memory for the internal state */</div><div class='add'>+	priv = kzalloc(sizeof(struct hd29l2_priv), GFP_KERNEL);</div><div class='add'>+	if (priv == NULL)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* setup the state */</div><div class='add'>+	priv-&gt;i2c = i2c;</div><div class='add'>+	memcpy(&amp;priv-&gt;cfg, config, sizeof(struct hd29l2_config));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* check if the demod is there */</div><div class='add'>+	ret = hd29l2_rd_reg(priv, 0x00, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* create dvb_frontend */</div><div class='add'>+	memcpy(&amp;priv-&gt;fe.ops, &amp;hd29l2_ops, sizeof(struct dvb_frontend_ops));</div><div class='add'>+	priv-&gt;fe.demodulator_priv = priv;</div><div class='add'>+</div><div class='add'>+	return &amp;priv-&gt;fe;</div><div class='add'>+err:</div><div class='add'>+	kfree(priv);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(hd29l2_attach);</div><div class='add'>+</div><div class='add'>+static struct dvb_frontend_ops hd29l2_ops = {</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='add'>+	.info = {</div><div class='add'>+		.name = "HDIC HD29L2 DMB-TH",</div><div class='add'>+		.frequency_min = 474000000,</div><div class='add'>+		.frequency_max = 858000000,</div><div class='add'>+		.frequency_stepsize = 10000,</div><div class='add'>+		.caps = FE_CAN_FEC_AUTO |</div><div class='add'>+			FE_CAN_QPSK |</div><div class='add'>+			FE_CAN_QAM_16 |</div><div class='add'>+			FE_CAN_QAM_32 |</div><div class='add'>+			FE_CAN_QAM_64 |</div><div class='add'>+			FE_CAN_QAM_AUTO |</div><div class='add'>+			FE_CAN_TRANSMISSION_MODE_AUTO |</div><div class='add'>+			FE_CAN_BANDWIDTH_AUTO |</div><div class='add'>+			FE_CAN_GUARD_INTERVAL_AUTO |</div><div class='add'>+			FE_CAN_HIERARCHY_AUTO |</div><div class='add'>+			FE_CAN_RECOVER</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.release = hd29l2_release,</div><div class='add'>+</div><div class='add'>+	.init = hd29l2_init,</div><div class='add'>+</div><div class='add'>+	.get_frontend_algo = hd29l2_get_frontend_algo,</div><div class='add'>+	.search = hd29l2_search,</div><div class='add'>+	.get_frontend = hd29l2_get_frontend,</div><div class='add'>+</div><div class='add'>+	.read_status = hd29l2_read_status,</div><div class='add'>+	.read_snr = hd29l2_read_snr,</div><div class='add'>+	.read_signal_strength = hd29l2_read_signal_strength,</div><div class='add'>+	.read_ber = hd29l2_read_ber,</div><div class='add'>+	.read_ucblocks = hd29l2_read_ucblocks,</div><div class='add'>+</div><div class='add'>+	.i2c_gate_ctrl = hd29l2_i2c_gate_ctrl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Antti Palosaari &lt;crope@iki.fi&gt;");</div><div class='add'>+MODULE_DESCRIPTION("HDIC HD29L2 DMB-TH demodulator driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/frontends/hd29l2.h b/drivers/media/dvb/frontends/hd29l2.h<br/>new file mode 100644<br/>index 000000000000..a7a64431364d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/hd29l2.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/hd29l2.h</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+/*</div><div class='add'>+ * HDIC HD29L2 DMB-TH demodulator driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Metropolia University of Applied Sciences, Electria R&amp;D</div><div class='add'>+ *</div><div class='add'>+ * Author: Antti Palosaari &lt;crope@iki.fi&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'>+ *    This program is distributed in the hope that it will be useful,</div><div class='add'>+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *    GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *    You should have received a copy of the GNU General Public License</div><div class='add'>+ *    along with this program; if not, write to the Free Software</div><div class='add'>+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef HD29L2_H</div><div class='add'>+#define HD29L2_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dvb/frontend.h&gt;</div><div class='add'>+</div><div class='add'>+struct hd29l2_config {</div><div class='add'>+	/*</div><div class='add'>+	 * demodulator I2C address</div><div class='add'>+	 */</div><div class='add'>+	u8 i2c_addr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * tuner I2C address</div><div class='add'>+	 * only needed when tuner is behind demod I2C-gate</div><div class='add'>+	 */</div><div class='add'>+	u8 tuner_i2c_addr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * TS settings</div><div class='add'>+	 */</div><div class='add'>+#define HD29L2_TS_SERIAL            0x00</div><div class='add'>+#define HD29L2_TS_PARALLEL          0x80</div><div class='add'>+#define HD29L2_TS_CLK_NORMAL        0x40</div><div class='add'>+#define HD29L2_TS_CLK_INVERTED      0x00</div><div class='add'>+#define HD29L2_TS_CLK_GATED         0x20</div><div class='add'>+#define HD29L2_TS_CLK_FREE          0x00</div><div class='add'>+	u8 ts_mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_DVB_HD29L2) || \</div><div class='add'>+	(defined(CONFIG_DVB_HD29L2_MODULE) &amp;&amp; defined(MODULE))</div><div class='add'>+extern struct dvb_frontend *hd29l2_attach(const struct hd29l2_config *config,</div><div class='add'>+	struct i2c_adapter *i2c);</div><div class='add'>+#else</div><div class='add'>+static inline struct dvb_frontend *hd29l2_attach(</div><div class='add'>+const struct hd29l2_config *config, struct i2c_adapter *i2c)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* HD29L2_H */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/hd29l2_priv.h b/drivers/media/dvb/frontends/hd29l2_priv.h<br/>new file mode 100644<br/>index 000000000000..ba16dc3ec2bd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/hd29l2_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/hd29l2_priv.h</a></div><div class='hunk'>@@ -0,0 +1,314 @@</div><div class='add'>+/*</div><div class='add'>+ * HDIC HD29L2 DMB-TH demodulator driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Metropolia University of Applied Sciences, Electria R&amp;D</div><div class='add'>+ *</div><div class='add'>+ * Author: Antti Palosaari &lt;crope@iki.fi&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'>+ *    This program is distributed in the hope that it will be useful,</div><div class='add'>+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *    GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *    You should have received a copy of the GNU General Public License</div><div class='add'>+ *    along with this program; if not, write to the Free Software</div><div class='add'>+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef HD29L2_PRIV</div><div class='add'>+#define HD29L2_PRIV</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dvb/version.h&gt;</div><div class='add'>+#include "dvb_frontend.h"</div><div class='add'>+#include "dvb_math.h"</div><div class='add'>+#include "hd29l2.h"</div><div class='add'>+</div><div class='add'>+#define LOG_PREFIX "hd29l2"</div><div class='add'>+</div><div class='add'>+#undef dbg</div><div class='add'>+#define dbg(f, arg...) \</div><div class='add'>+	if (hd29l2_debug) \</div><div class='add'>+		printk(KERN_INFO   LOG_PREFIX": " f "\n" , ## arg)</div><div class='add'>+#undef err</div><div class='add'>+#define err(f, arg...)  printk(KERN_ERR     LOG_PREFIX": " f "\n" , ## arg)</div><div class='add'>+#undef info</div><div class='add'>+#define info(f, arg...) printk(KERN_INFO    LOG_PREFIX": " f "\n" , ## arg)</div><div class='add'>+#undef warn</div><div class='add'>+#define warn(f, arg...) printk(KERN_WARNING LOG_PREFIX": " f "\n" , ## arg)</div><div class='add'>+</div><div class='add'>+#define HD29L2_XTAL 30400000 /* Hz */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define HD29L2_QAM4NR 0x00</div><div class='add'>+#define HD29L2_QAM4   0x01</div><div class='add'>+#define HD29L2_QAM16  0x02</div><div class='add'>+#define HD29L2_QAM32  0x03</div><div class='add'>+#define HD29L2_QAM64  0x04</div><div class='add'>+</div><div class='add'>+#define HD29L2_CODE_RATE_04 0x00</div><div class='add'>+#define HD29L2_CODE_RATE_06 0x08</div><div class='add'>+#define HD29L2_CODE_RATE_08 0x10</div><div class='add'>+</div><div class='add'>+#define HD29L2_PN945 0x00</div><div class='add'>+#define HD29L2_PN595 0x01</div><div class='add'>+#define HD29L2_PN420 0x02</div><div class='add'>+</div><div class='add'>+#define HD29L2_CARRIER_SINGLE 0x00</div><div class='add'>+#define HD29L2_CARRIER_MULTI  0x01</div><div class='add'>+</div><div class='add'>+#define HD29L2_INTERLEAVER_720 0x00</div><div class='add'>+#define HD29L2_INTERLEAVER_420 0x01</div><div class='add'>+</div><div class='add'>+struct reg_val {</div><div class='add'>+	u8 reg;</div><div class='add'>+	u8 val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct reg_mod_vals {</div><div class='add'>+	u8 reg;</div><div class='add'>+	u8 val[5];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hd29l2_priv {</div><div class='add'>+	struct i2c_adapter *i2c;</div><div class='add'>+	struct dvb_frontend fe;</div><div class='add'>+	struct hd29l2_config cfg;</div><div class='add'>+	u8 tuner_i2c_addr_programmed:1;</div><div class='add'>+</div><div class='add'>+	fe_status_t fe_status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct reg_mod_vals reg_mod_vals_tab[] = {</div><div class='add'>+	/* REG, QAM4NR, QAM4,QAM16,QAM32,QAM64 */</div><div class='add'>+	{ 0x01, { 0x10, 0x10, 0x10, 0x10, 0x10 } },</div><div class='add'>+	{ 0x02, { 0x07, 0x07, 0x07, 0x07, 0x07 } },</div><div class='add'>+	{ 0x03, { 0x10, 0x10, 0x10, 0x10, 0x10 } },</div><div class='add'>+	{ 0x04, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x05, { 0x61, 0x60, 0x60, 0x61, 0x60 } },</div><div class='add'>+	{ 0x06, { 0xff, 0xff, 0xff, 0xff, 0xff } },</div><div class='add'>+	{ 0x07, { 0xff, 0xff, 0xff, 0xff, 0xff } },</div><div class='add'>+	{ 0x08, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x09, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x0a, { 0x15, 0x15, 0x03, 0x03, 0x03 } },</div><div class='add'>+	{ 0x0d, { 0x78, 0x78, 0x88, 0x78, 0x78 } },</div><div class='add'>+	{ 0x0e, { 0xa0, 0x90, 0xa0, 0xa0, 0xa0 } },</div><div class='add'>+	{ 0x0f, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x10, { 0xa0, 0xa0, 0x58, 0x38, 0x38 } },</div><div class='add'>+	{ 0x11, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x12, { 0x5a, 0x5a, 0x5a, 0x5a, 0x5a } },</div><div class='add'>+	{ 0x13, { 0xa2, 0xa2, 0xa2, 0xa2, 0xa2 } },</div><div class='add'>+	{ 0x17, { 0x40, 0x40, 0x40, 0x40, 0x40 } },</div><div class='add'>+	{ 0x18, { 0x21, 0x21, 0x42, 0x52, 0x42 } },</div><div class='add'>+	{ 0x19, { 0x21, 0x21, 0x62, 0x72, 0x62 } },</div><div class='add'>+	{ 0x1a, { 0x32, 0x43, 0xa9, 0xb9, 0xa9 } },</div><div class='add'>+	{ 0x1b, { 0x32, 0x43, 0xb9, 0xd8, 0xb9 } },</div><div class='add'>+	{ 0x1c, { 0x02, 0x02, 0x03, 0x02, 0x03 } },</div><div class='add'>+	{ 0x1d, { 0x0c, 0x0c, 0x01, 0x02, 0x02 } },</div><div class='add'>+	{ 0x1e, { 0x02, 0x02, 0x02, 0x01, 0x02 } },</div><div class='add'>+	{ 0x1f, { 0x02, 0x02, 0x01, 0x02, 0x04 } },</div><div class='add'>+	{ 0x20, { 0x01, 0x02, 0x01, 0x01, 0x01 } },</div><div class='add'>+	{ 0x21, { 0x08, 0x08, 0x0a, 0x0a, 0x0a } },</div><div class='add'>+	{ 0x22, { 0x06, 0x06, 0x04, 0x05, 0x05 } },</div><div class='add'>+	{ 0x23, { 0x06, 0x06, 0x05, 0x03, 0x05 } },</div><div class='add'>+	{ 0x24, { 0x08, 0x08, 0x05, 0x07, 0x07 } },</div><div class='add'>+	{ 0x25, { 0x16, 0x10, 0x10, 0x0a, 0x10 } },</div><div class='add'>+	{ 0x26, { 0x14, 0x14, 0x04, 0x04, 0x04 } },</div><div class='add'>+	{ 0x27, { 0x58, 0x58, 0x58, 0x5c, 0x58 } },</div><div class='add'>+	{ 0x28, { 0x0a, 0x0a, 0x0a, 0x0a, 0x0a } },</div><div class='add'>+	{ 0x29, { 0x0a, 0x0a, 0x0a, 0x0a, 0x0a } },</div><div class='add'>+	{ 0x2a, { 0x08, 0x0a, 0x08, 0x08, 0x08 } },</div><div class='add'>+	{ 0x2b, { 0x08, 0x08, 0x08, 0x08, 0x08 } },</div><div class='add'>+	{ 0x2c, { 0x06, 0x06, 0x06, 0x06, 0x06 } },</div><div class='add'>+	{ 0x2d, { 0x05, 0x06, 0x06, 0x06, 0x06 } },</div><div class='add'>+	{ 0x2e, { 0x21, 0x21, 0x21, 0x21, 0x21 } },</div><div class='add'>+	{ 0x2f, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x30, { 0x14, 0x14, 0x14, 0x14, 0x14 } },</div><div class='add'>+	{ 0x33, { 0xb7, 0xb7, 0xb7, 0xb7, 0xb7 } },</div><div class='add'>+	{ 0x34, { 0x81, 0x81, 0x81, 0x81, 0x81 } },</div><div class='add'>+	{ 0x35, { 0x80, 0x80, 0x80, 0x80, 0x80 } },</div><div class='add'>+	{ 0x37, { 0x70, 0x70, 0x70, 0x70, 0x70 } },</div><div class='add'>+	{ 0x38, { 0x04, 0x04, 0x02, 0x02, 0x02 } },</div><div class='add'>+	{ 0x39, { 0x07, 0x07, 0x05, 0x05, 0x05 } },</div><div class='add'>+	{ 0x3a, { 0x06, 0x06, 0x06, 0x06, 0x06 } },</div><div class='add'>+	{ 0x3b, { 0x03, 0x03, 0x03, 0x03, 0x03 } },</div><div class='add'>+	{ 0x3c, { 0x07, 0x06, 0x04, 0x04, 0x04 } },</div><div class='add'>+	{ 0x3d, { 0xf0, 0xf0, 0xf0, 0xf0, 0x80 } },</div><div class='add'>+	{ 0x3e, { 0x60, 0x60, 0x60, 0x60, 0xff } },</div><div class='add'>+	{ 0x3f, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x40, { 0x5b, 0x5b, 0x5b, 0x57, 0x50 } },</div><div class='add'>+	{ 0x41, { 0x30, 0x30, 0x30, 0x30, 0x18 } },</div><div class='add'>+	{ 0x42, { 0x20, 0x20, 0x20, 0x00, 0x30 } },</div><div class='add'>+	{ 0x43, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x44, { 0x3f, 0x3f, 0x3f, 0x3f, 0x3f } },</div><div class='add'>+	{ 0x45, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x46, { 0x0a, 0x0a, 0x0a, 0x0a, 0x0a } },</div><div class='add'>+	{ 0x47, { 0x00, 0x00, 0x95, 0x00, 0x95 } },</div><div class='add'>+	{ 0x48, { 0xc0, 0xc0, 0xc0, 0xc0, 0xc0 } },</div><div class='add'>+	{ 0x49, { 0xc0, 0xc0, 0xc0, 0xc0, 0xc0 } },</div><div class='add'>+	{ 0x4a, { 0x40, 0x40, 0x33, 0x11, 0x11 } },</div><div class='add'>+	{ 0x4b, { 0x40, 0x40, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x4c, { 0x40, 0x40, 0x99, 0x11, 0x11 } },</div><div class='add'>+	{ 0x4d, { 0x40, 0x40, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x4e, { 0x40, 0x40, 0x66, 0x77, 0x77 } },</div><div class='add'>+	{ 0x4f, { 0x40, 0x40, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x50, { 0x40, 0x40, 0x88, 0x33, 0x11 } },</div><div class='add'>+	{ 0x51, { 0x40, 0x40, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x52, { 0x40, 0x40, 0x88, 0x02, 0x02 } },</div><div class='add'>+	{ 0x53, { 0x40, 0x40, 0x00, 0x02, 0x02 } },</div><div class='add'>+	{ 0x54, { 0x00, 0x00, 0x88, 0x33, 0x33 } },</div><div class='add'>+	{ 0x55, { 0x40, 0x40, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x56, { 0x00, 0x00, 0x00, 0x0b, 0x00 } },</div><div class='add'>+	{ 0x57, { 0x40, 0x40, 0x0a, 0x0b, 0x0a } },</div><div class='add'>+	{ 0x58, { 0xaa, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x59, { 0x7a, 0x40, 0x02, 0x02, 0x02 } },</div><div class='add'>+	{ 0x5a, { 0x18, 0x18, 0x01, 0x01, 0x01 } },</div><div class='add'>+	{ 0x5b, { 0x18, 0x18, 0x01, 0x01, 0x01 } },</div><div class='add'>+	{ 0x5c, { 0x18, 0x18, 0x01, 0x01, 0x01 } },</div><div class='add'>+	{ 0x5d, { 0x18, 0x18, 0x01, 0x01, 0x01 } },</div><div class='add'>+	{ 0x5e, { 0xc0, 0xc0, 0xc0, 0xff, 0xc0 } },</div><div class='add'>+	{ 0x5f, { 0xc0, 0xc0, 0xc0, 0xff, 0xc0 } },</div><div class='add'>+	{ 0x60, { 0x40, 0x40, 0x00, 0x30, 0x30 } },</div><div class='add'>+	{ 0x61, { 0x40, 0x40, 0x10, 0x30, 0x30 } },</div><div class='add'>+	{ 0x62, { 0x40, 0x40, 0x00, 0x30, 0x30 } },</div><div class='add'>+	{ 0x63, { 0x40, 0x40, 0x05, 0x30, 0x30 } },</div><div class='add'>+	{ 0x64, { 0x40, 0x40, 0x06, 0x00, 0x30 } },</div><div class='add'>+	{ 0x65, { 0x40, 0x40, 0x06, 0x08, 0x30 } },</div><div class='add'>+	{ 0x66, { 0x40, 0x40, 0x00, 0x00, 0x20 } },</div><div class='add'>+	{ 0x67, { 0x40, 0x40, 0x01, 0x04, 0x20 } },</div><div class='add'>+	{ 0x68, { 0x00, 0x00, 0x30, 0x00, 0x20 } },</div><div class='add'>+	{ 0x69, { 0xa0, 0xa0, 0x00, 0x08, 0x20 } },</div><div class='add'>+	{ 0x6a, { 0x00, 0x00, 0x30, 0x00, 0x25 } },</div><div class='add'>+	{ 0x6b, { 0xa0, 0xa0, 0x00, 0x06, 0x25 } },</div><div class='add'>+	{ 0x6c, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x6d, { 0xa0, 0x60, 0x0c, 0x03, 0x0c } },</div><div class='add'>+	{ 0x6e, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x6f, { 0xa0, 0x60, 0x04, 0x01, 0x04 } },</div><div class='add'>+	{ 0x70, { 0x58, 0x58, 0xaa, 0xaa, 0xaa } },</div><div class='add'>+	{ 0x71, { 0x58, 0x58, 0xaa, 0xaa, 0xaa } },</div><div class='add'>+	{ 0x72, { 0x58, 0x58, 0xff, 0xff, 0xff } },</div><div class='add'>+	{ 0x73, { 0x58, 0x58, 0xff, 0xff, 0xff } },</div><div class='add'>+	{ 0x74, { 0x06, 0x06, 0x09, 0x05, 0x05 } },</div><div class='add'>+	{ 0x75, { 0x06, 0x06, 0x0a, 0x10, 0x10 } },</div><div class='add'>+	{ 0x76, { 0x10, 0x10, 0x06, 0x0a, 0x0a } },</div><div class='add'>+	{ 0x77, { 0x12, 0x18, 0x28, 0x10, 0x28 } },</div><div class='add'>+	{ 0x78, { 0xf8, 0xf8, 0xf8, 0xf8, 0xf8 } },</div><div class='add'>+	{ 0x79, { 0x15, 0x15, 0x03, 0x03, 0x03 } },</div><div class='add'>+	{ 0x7a, { 0x02, 0x02, 0x01, 0x04, 0x03 } },</div><div class='add'>+	{ 0x7b, { 0x01, 0x02, 0x03, 0x03, 0x03 } },</div><div class='add'>+	{ 0x7c, { 0x28, 0x28, 0x28, 0x28, 0x28 } },</div><div class='add'>+	{ 0x7f, { 0x25, 0x92, 0x5f, 0x17, 0x2d } },</div><div class='add'>+	{ 0x80, { 0x64, 0x64, 0x64, 0x74, 0x64 } },</div><div class='add'>+	{ 0x83, { 0x06, 0x03, 0x04, 0x04, 0x04 } },</div><div class='add'>+	{ 0x84, { 0xff, 0xff, 0xff, 0xff, 0xff } },</div><div class='add'>+	{ 0x85, { 0x05, 0x05, 0x05, 0x05, 0x05 } },</div><div class='add'>+	{ 0x86, { 0x00, 0x00, 0x11, 0x11, 0x11 } },</div><div class='add'>+	{ 0x87, { 0x03, 0x03, 0x03, 0x03, 0x03 } },</div><div class='add'>+	{ 0x88, { 0x09, 0x09, 0x09, 0x09, 0x09 } },</div><div class='add'>+	{ 0x89, { 0x20, 0x20, 0x30, 0x20, 0x20 } },</div><div class='add'>+	{ 0x8a, { 0x03, 0x03, 0x02, 0x03, 0x02 } },</div><div class='add'>+	{ 0x8b, { 0x00, 0x07, 0x09, 0x00, 0x09 } },</div><div class='add'>+	{ 0x8c, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x8d, { 0x4f, 0x4f, 0x4f, 0x3f, 0x4f } },</div><div class='add'>+	{ 0x8e, { 0xf0, 0xf0, 0x60, 0xf0, 0xa0 } },</div><div class='add'>+	{ 0x8f, { 0xe8, 0xe8, 0xe8, 0xe8, 0xe8 } },</div><div class='add'>+	{ 0x90, { 0x10, 0x10, 0x10, 0x10, 0x10 } },</div><div class='add'>+	{ 0x91, { 0x40, 0x40, 0x70, 0x70, 0x10 } },</div><div class='add'>+	{ 0x92, { 0x00, 0x00, 0x00, 0x00, 0x04 } },</div><div class='add'>+	{ 0x93, { 0x60, 0x60, 0x60, 0x60, 0x60 } },</div><div class='add'>+	{ 0x94, { 0x00, 0x00, 0x00, 0x00, 0x03 } },</div><div class='add'>+	{ 0x95, { 0x09, 0x09, 0x47, 0x47, 0x47 } },</div><div class='add'>+	{ 0x96, { 0x80, 0xa0, 0xa0, 0x40, 0xa0 } },</div><div class='add'>+	{ 0x97, { 0x60, 0x60, 0x60, 0x60, 0x60 } },</div><div class='add'>+	{ 0x98, { 0x50, 0x50, 0x50, 0x30, 0x50 } },</div><div class='add'>+	{ 0x99, { 0x10, 0x10, 0x10, 0x10, 0x10 } },</div><div class='add'>+	{ 0x9a, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0x9b, { 0x40, 0x40, 0x40, 0x30, 0x40 } },</div><div class='add'>+	{ 0x9c, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xa0, { 0xf0, 0xf0, 0xf0, 0xf0, 0xf0 } },</div><div class='add'>+	{ 0xa1, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xa2, { 0x30, 0x30, 0x00, 0x30, 0x00 } },</div><div class='add'>+	{ 0xa3, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xa4, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xa5, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xa6, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xa7, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xa8, { 0x77, 0x77, 0x77, 0x77, 0x77 } },</div><div class='add'>+	{ 0xa9, { 0x02, 0x02, 0x02, 0x02, 0x02 } },</div><div class='add'>+	{ 0xaa, { 0x40, 0x40, 0x40, 0x40, 0x40 } },</div><div class='add'>+	{ 0xac, { 0x1f, 0x1f, 0x1f, 0x1f, 0x1f } },</div><div class='add'>+	{ 0xad, { 0x14, 0x14, 0x14, 0x14, 0x14 } },</div><div class='add'>+	{ 0xae, { 0x78, 0x78, 0x78, 0x78, 0x78 } },</div><div class='add'>+	{ 0xaf, { 0x06, 0x06, 0x06, 0x06, 0x07 } },</div><div class='add'>+	{ 0xb0, { 0x1b, 0x1b, 0x1b, 0x19, 0x1b } },</div><div class='add'>+	{ 0xb1, { 0x18, 0x17, 0x17, 0x18, 0x17 } },</div><div class='add'>+	{ 0xb2, { 0x35, 0x82, 0x82, 0x38, 0x82 } },</div><div class='add'>+	{ 0xb3, { 0xb6, 0xce, 0xc7, 0x5c, 0xb0 } },</div><div class='add'>+	{ 0xb4, { 0x3f, 0x3e, 0x3e, 0x3f, 0x3e } },</div><div class='add'>+	{ 0xb5, { 0x70, 0x58, 0x50, 0x68, 0x50 } },</div><div class='add'>+	{ 0xb6, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xb7, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xb8, { 0x03, 0x03, 0x01, 0x01, 0x01 } },</div><div class='add'>+	{ 0xb9, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xba, { 0x06, 0x06, 0x0a, 0x05, 0x0a } },</div><div class='add'>+	{ 0xbb, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xbc, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xbd, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xbe, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xbf, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xc0, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xc1, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xc2, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xc3, { 0x00, 0x00, 0x88, 0x66, 0x88 } },</div><div class='add'>+	{ 0xc4, { 0x10, 0x10, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xc5, { 0x00, 0x00, 0x44, 0x60, 0x44 } },</div><div class='add'>+	{ 0xc6, { 0x10, 0x0a, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xc7, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xc8, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xc9, { 0x90, 0x04, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xca, { 0x90, 0x08, 0x01, 0x01, 0x01 } },</div><div class='add'>+	{ 0xcb, { 0xa0, 0x04, 0x00, 0x44, 0x00 } },</div><div class='add'>+	{ 0xcc, { 0xa0, 0x10, 0x03, 0x00, 0x03 } },</div><div class='add'>+	{ 0xcd, { 0x06, 0x06, 0x06, 0x05, 0x06 } },</div><div class='add'>+	{ 0xce, { 0x05, 0x05, 0x01, 0x01, 0x01 } },</div><div class='add'>+	{ 0xcf, { 0x40, 0x20, 0x18, 0x18, 0x18 } },</div><div class='add'>+	{ 0xd0, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xd1, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xd2, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xd3, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xd4, { 0x05, 0x05, 0x05, 0x05, 0x05 } },</div><div class='add'>+	{ 0xd5, { 0x05, 0x05, 0x05, 0x03, 0x05 } },</div><div class='add'>+	{ 0xd6, { 0xac, 0x22, 0xca, 0x8f, 0xca } },</div><div class='add'>+	{ 0xd7, { 0x20, 0x20, 0x20, 0x20, 0x20 } },</div><div class='add'>+	{ 0xd8, { 0x01, 0x01, 0x01, 0x01, 0x01 } },</div><div class='add'>+	{ 0xd9, { 0x00, 0x00, 0x0f, 0x00, 0x0f } },</div><div class='add'>+	{ 0xda, { 0x00, 0xff, 0xff, 0x0e, 0xff } },</div><div class='add'>+	{ 0xdb, { 0x0a, 0x0a, 0x0a, 0x0a, 0x0a } },</div><div class='add'>+	{ 0xdc, { 0x0a, 0x0a, 0x0a, 0x0a, 0x0a } },</div><div class='add'>+	{ 0xdd, { 0x05, 0x05, 0x05, 0x05, 0x05 } },</div><div class='add'>+	{ 0xde, { 0x0a, 0x0a, 0x0a, 0x0a, 0x0a } },</div><div class='add'>+	{ 0xdf, { 0x42, 0x42, 0x44, 0x44, 0x04 } },</div><div class='add'>+	{ 0xe0, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xe1, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xe2, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xe3, { 0x00, 0x00, 0x26, 0x06, 0x26 } },</div><div class='add'>+	{ 0xe4, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xe5, { 0x01, 0x0a, 0x01, 0x01, 0x01 } },</div><div class='add'>+	{ 0xe6, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xe7, { 0x08, 0x08, 0x08, 0x08, 0x08 } },</div><div class='add'>+	{ 0xe8, { 0x63, 0x63, 0x63, 0x63, 0x63 } },</div><div class='add'>+	{ 0xe9, { 0x59, 0x59, 0x59, 0x59, 0x59 } },</div><div class='add'>+	{ 0xea, { 0x80, 0x80, 0x20, 0x80, 0x80 } },</div><div class='add'>+	{ 0xeb, { 0x37, 0x37, 0x78, 0x37, 0x77 } },</div><div class='add'>+	{ 0xec, { 0x1f, 0x1f, 0x25, 0x25, 0x25 } },</div><div class='add'>+	{ 0xed, { 0x0a, 0x0a, 0x0a, 0x0a, 0x0a } },</div><div class='add'>+	{ 0xee, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+	{ 0xef, { 0x70, 0x70, 0x58, 0x38, 0x58 } },</div><div class='add'>+	{ 0xf0, { 0x00, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* HD29L2_PRIV */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/it913x-fe-priv.h b/drivers/media/dvb/frontends/it913x-fe-priv.h<br/>index 1c6fb4b66255..93b086ea7e1c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/it913x-fe-priv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/it913x-fe-priv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/it913x-fe-priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/it913x-fe-priv.h</a></div><div class='hunk'>@@ -22,126 +22,126 @@ struct adctable {	u32 adcFrequency;</div><div class='ctx'> /* clock and coeff tables only table 3 is used with IT9137*/</div><div class='ctx'> /* TODO other tables relate AF9035 may be removed */</div><div class='ctx'> static struct adctable tab1[] = {</div><div class='del'>-	{	20156250, BANDWIDTH_6_MHZ,</div><div class='add'>+	{	20156250, 6000000,</div><div class='ctx'> 		0x02b8ba6e, 0x015c5d37, 0x00ae340d, 0x00ae2e9b, 0x00ae292a,</div><div class='ctx'> 		0x015c5d37, 0x00ae2e9b, 0x0057174e, 0x02f1, 0x015c	},</div><div class='del'>-	{	20156250, BANDWIDTH_7_MHZ,</div><div class='add'>+	{	20156250, 7000000,</div><div class='ctx'> 		0x032cd980, 0x01966cc0, 0x00cb3cba, 0x00cb3660, 0x00cb3007,</div><div class='ctx'> 		0x01966cc0, 0x00cb3660, 0x00659b30, 0x0285, 0x0196	},</div><div class='del'>-	{	20156250, BANDWIDTH_8_MHZ,</div><div class='add'>+	{	20156250, 8000000,</div><div class='ctx'> 		0x03a0f893, 0x01d07c49, 0x00e84567, 0x00e83e25, 0x00e836e3,</div><div class='ctx'> 		0x01d07c49, 0x00e83e25, 0x00741f12, 0x0234, 0x01d0	},</div><div class='del'>-	{	20156250, BANDWIDTH_5_MHZ,</div><div class='add'>+	{	20156250, 5000000,</div><div class='ctx'> 		0x02449b5c, 0x01224dae, 0x00912b60, 0x009126d7, 0x0091224e,</div><div class='ctx'> 		0x01224dae, 0x009126d7, 0x0048936b, 0x0387, 0x0122	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct adctable tab2[] = {</div><div class='del'>-	{	20187500, BANDWIDTH_6_MHZ,</div><div class='add'>+	{	20187500, 6000000,</div><div class='ctx'> 		0x02b7a654, 0x015bd32a, 0x00adef04, 0x00ade995, 0x00ade426,</div><div class='ctx'> 		0x015bd32a, 0x00ade995, 0x0056f4ca, 0x02f2, 0x015c	},</div><div class='del'>-	{	20187500, BANDWIDTH_7_MHZ,</div><div class='add'>+	{	20187500, 7000000,</div><div class='ctx'> 		0x032b9761, 0x0195cbb1, 0x00caec30, 0x00cae5d8, 0x00cadf81,</div><div class='ctx'> 		0x0195cbb1, 0x00cae5d8, 0x006572ec, 0x0286, 0x0196	},</div><div class='del'>-	{	20187500, BANDWIDTH_8_MHZ,</div><div class='add'>+	{	20187500, 8000000,</div><div class='ctx'> 		0x039f886f, 0x01cfc438, 0x00e7e95b, 0x00e7e21c, 0x00e7dadd,</div><div class='ctx'> 		0x01cfc438, 0x00e7e21c, 0x0073f10e, 0x0235, 0x01d0	},</div><div class='del'>-	{	20187500, BANDWIDTH_5_MHZ,</div><div class='add'>+	{	20187500, 5000000,</div><div class='ctx'> 		0x0243b546, 0x0121daa3, 0x0090f1d9, 0x0090ed51, 0x0090e8ca,</div><div class='ctx'> 		0x0121daa3, 0x0090ed51, 0x004876a9, 0x0388, 0x0122	}</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct adctable tab3[] = {</div><div class='del'>-	{	20250000, BANDWIDTH_6_MHZ,</div><div class='add'>+	{	20250000, 6000000,</div><div class='ctx'> 		0x02b580ad, 0x015ac057, 0x00ad6597, 0x00ad602b, 0x00ad5ac1,</div><div class='ctx'> 		0x015ac057, 0x00ad602b, 0x0056b016, 0x02f4, 0x015b	},</div><div class='del'>-	{	20250000, BANDWIDTH_7_MHZ,</div><div class='add'>+	{	20250000, 7000000,</div><div class='ctx'> 		0x03291620, 0x01948b10, 0x00ca4bda, 0x00ca4588, 0x00ca3f36,</div><div class='ctx'> 		0x01948b10, 0x00ca4588, 0x006522c4, 0x0288, 0x0195	},</div><div class='del'>-	{	20250000, BANDWIDTH_8_MHZ,</div><div class='add'>+	{	20250000, 8000000,</div><div class='ctx'> 		0x039cab92, 0x01ce55c9, 0x00e7321e, 0x00e72ae4, 0x00e723ab,</div><div class='ctx'> 		0x01ce55c9, 0x00e72ae4, 0x00739572, 0x0237, 0x01ce	},</div><div class='del'>-	{	20250000, BANDWIDTH_5_MHZ,</div><div class='add'>+	{	20250000, 5000000,</div><div class='ctx'> 		0x0241eb3b, 0x0120f59e, 0x00907f53, 0x00907acf, 0x0090764b,</div><div class='ctx'> 		0x0120f59e, 0x00907acf, 0x00483d67, 0x038b, 0x0121	}</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct adctable tab4[] = {</div><div class='del'>-	{	20583333, BANDWIDTH_6_MHZ,</div><div class='add'>+	{	20583333, 6000000,</div><div class='ctx'> 		0x02aa4598, 0x015522cc, 0x00aa96bb, 0x00aa9166, 0x00aa8c12,</div><div class='ctx'> 		0x015522cc, 0x00aa9166, 0x005548b3, 0x0300, 0x0155	},</div><div class='del'>-	{	20583333, BANDWIDTH_7_MHZ,</div><div class='add'>+	{	20583333, 7000000,</div><div class='ctx'> 		0x031bfbdc, 0x018dfdee, 0x00c7052f, 0x00c6fef7, 0x00c6f8bf,</div><div class='ctx'> 		0x018dfdee, 0x00c6fef7, 0x00637f7b, 0x0293, 0x018e	},</div><div class='del'>-	{	20583333, BANDWIDTH_8_MHZ,</div><div class='add'>+	{	20583333, 8000000,</div><div class='ctx'> 		0x038db21f, 0x01c6d910, 0x00e373a3, 0x00e36c88, 0x00e3656d,</div><div class='ctx'> 		0x01c6d910, 0x00e36c88, 0x0071b644, 0x0240, 0x01c7	},</div><div class='del'>-	{	20583333, BANDWIDTH_5_MHZ,</div><div class='add'>+	{	20583333, 5000000,</div><div class='ctx'> 		0x02388f54, 0x011c47aa, 0x008e2846, 0x008e23d5, 0x008e1f64,</div><div class='ctx'> 		0x011c47aa, 0x008e23d5, 0x004711ea, 0x039a, 0x011c	}</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct adctable tab5[] = {</div><div class='del'>-	{	20416667, BANDWIDTH_6_MHZ,</div><div class='add'>+	{	20416667, 6000000,</div><div class='ctx'> 		0x02afd765, 0x0157ebb3, 0x00abfb39, 0x00abf5d9, 0x00abf07a,</div><div class='ctx'> 		0x0157ebb3, 0x00abf5d9, 0x0055faed, 0x02fa, 0x0158	},</div><div class='del'>-	{	20416667, BANDWIDTH_7_MHZ,</div><div class='add'>+	{	20416667, 7000000,</div><div class='ctx'> 		0x03227b4b, 0x01913da6, 0x00c8a518, 0x00c89ed3, 0x00c8988e,</div><div class='ctx'> 		0x01913da6, 0x00c89ed3, 0x00644f69, 0x028d, 0x0191	},</div><div class='del'>-	{	20416667, BANDWIDTH_8_MHZ,</div><div class='add'>+	{	20416667, 8000000,</div><div class='ctx'> 		0x03951f32, 0x01ca8f99, 0x00e54ef7, 0x00e547cc, 0x00e540a2,</div><div class='ctx'> 		0x01ca8f99, 0x00e547cc, 0x0072a3e6, 0x023c, 0x01cb	},</div><div class='del'>-	{	20416667, BANDWIDTH_5_MHZ,</div><div class='add'>+	{	20416667, 5000000,</div><div class='ctx'> 		0x023d337f, 0x011e99c0, 0x008f515a, 0x008f4ce0, 0x008f4865,</div><div class='ctx'> 		0x011e99c0, 0x008f4ce0, 0x0047a670, 0x0393, 0x011f	}</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct adctable tab6[] = {</div><div class='del'>-	{	20480000, BANDWIDTH_6_MHZ,</div><div class='add'>+	{	20480000, 6000000,</div><div class='ctx'> 		0x02adb6db, 0x0156db6e, 0x00ab7312, 0x00ab6db7, 0x00ab685c,</div><div class='ctx'> 		0x0156db6e, 0x00ab6db7, 0x0055b6db, 0x02fd, 0x0157	},</div><div class='del'>-	{	20480000, BANDWIDTH_7_MHZ,</div><div class='add'>+	{	20480000, 7000000,</div><div class='ctx'> 		0x03200000, 0x01900000, 0x00c80640, 0x00c80000, 0x00c7f9c0,</div><div class='ctx'> 		0x01900000, 0x00c80000, 0x00640000, 0x028f, 0x0190	},</div><div class='del'>-	{	20480000, BANDWIDTH_8_MHZ,</div><div class='add'>+	{	20480000, 8000000,</div><div class='ctx'> 		0x03924925, 0x01c92492, 0x00e4996e, 0x00e49249, 0x00e48b25,</div><div class='ctx'> 		0x01c92492, 0x00e49249, 0x00724925, 0x023d, 0x01c9	},</div><div class='del'>-	{	20480000, BANDWIDTH_5_MHZ,</div><div class='add'>+	{	20480000, 5000000,</div><div class='ctx'> 		0x023b6db7, 0x011db6db, 0x008edfe5, 0x008edb6e, 0x008ed6f7,</div><div class='ctx'> 		0x011db6db, 0x008edb6e, 0x00476db7, 0x0396, 0x011e	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct adctable tab7[] = {</div><div class='del'>-	{	20500000, BANDWIDTH_6_MHZ,</div><div class='add'>+	{	20500000, 6000000,</div><div class='ctx'> 		0x02ad0b99, 0x015685cc, 0x00ab4840, 0x00ab42e6, 0x00ab3d8c,</div><div class='ctx'> 		0x015685cc, 0x00ab42e6, 0x0055a173, 0x02fd, 0x0157	},</div><div class='del'>-	{	20500000, BANDWIDTH_7_MHZ,</div><div class='add'>+	{	20500000, 7000000,</div><div class='ctx'> 		0x031f3832, 0x018f9c19, 0x00c7d44b, 0x00c7ce0c, 0x00c7c7ce,</div><div class='ctx'> 		0x018f9c19, 0x00c7ce0c, 0x0063e706, 0x0290, 0x0190	},</div><div class='del'>-	{	20500000, BANDWIDTH_8_MHZ,</div><div class='add'>+	{	20500000, 8000000,</div><div class='ctx'> 		0x039164cb, 0x01c8b266, 0x00e46056, 0x00e45933, 0x00e45210,</div><div class='ctx'> 		0x01c8b266, 0x00e45933, 0x00722c99, 0x023e, 0x01c9	},</div><div class='del'>-	{	20500000, BANDWIDTH_5_MHZ,</div><div class='add'>+	{	20500000, 5000000,</div><div class='ctx'> 		0x023adeff, 0x011d6f80, 0x008ebc36, 0x008eb7c0, 0x008eb34a,</div><div class='ctx'> 		0x011d6f80, 0x008eb7c0, 0x00475be0, 0x0396, 0x011d	}</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct adctable tab8[] = {</div><div class='del'>-	{	20625000, BANDWIDTH_6_MHZ,</div><div class='add'>+	{	20625000, 6000000,</div><div class='ctx'> 		0x02a8e4bd, 0x0154725e, 0x00aa3e81, 0x00aa392f, 0x00aa33de,</div><div class='ctx'> 		0x0154725e, 0x00aa392f, 0x00551c98, 0x0302, 0x0154	},</div><div class='del'>-	{	20625000, BANDWIDTH_7_MHZ,</div><div class='add'>+	{	20625000, 7000000,</div><div class='ctx'> 		0x031a6032, 0x018d3019, 0x00c69e41, 0x00c6980c, 0x00c691d8,</div><div class='ctx'> 		0x018d3019, 0x00c6980c, 0x00634c06, 0x0294, 0x018d	},</div><div class='del'>-	{	20625000, BANDWIDTH_8_MHZ,</div><div class='add'>+	{	20625000, 8000000,</div><div class='ctx'> 		0x038bdba6, 0x01c5edd3, 0x00e2fe02, 0x00e2f6ea, 0x00e2efd2,</div><div class='ctx'> 		0x01c5edd3, 0x00e2f6ea, 0x00717b75, 0x0242, 0x01c6	},</div><div class='del'>-	{	20625000, BANDWIDTH_5_MHZ,</div><div class='add'>+	{	20625000, 5000000,</div><div class='ctx'> 		0x02376948, 0x011bb4a4, 0x008ddec1, 0x008dda52, 0x008dd5e3,</div><div class='ctx'> 		0x011bb4a4, 0x008dda52, 0x0046ed29, 0x039c, 0x011c	}</div><div class='ctx'> </div><div class='hunk'>@@ -153,8 +153,7 @@ struct table {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct table fe_clockTable[] = {</div><div class='del'>-		{12000000, tab3},	/* FPGA     */</div><div class='del'>-		{16384000, tab6},	/* 16.38MHz */</div><div class='add'>+		{12000000, tab3},	/* 12.00MHz */</div><div class='ctx'> 		{20480000, tab6},	/* 20.48MHz */</div><div class='ctx'> 		{36000000, tab3},	/* 36.00MHz */</div><div class='ctx'> 		{30000000, tab1},	/* 30.00MHz */</div><div class='hunk'>@@ -164,7 +163,6 @@ static struct table fe_clockTable[] = {</div><div class='ctx'> 		{34000000, tab2},	/* 34.00MHz */</div><div class='ctx'> 		{24000000, tab1},	/* 24.00MHz */</div><div class='ctx'> 		{22000000, tab8},	/* 22.00MHz */</div><div class='del'>-		{12000000, tab3}	/* 12.00MHz */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* fe get */</div><div class='hunk'>@@ -205,6 +203,10 @@ fe_modulation_t fe_con[] = {</div><div class='ctx'> </div><div class='ctx'> /* Standard demodulator functions */</div><div class='ctx'> static struct it913xset set_solo_fe[] = {</div><div class='add'>+	{PRO_LINK, GPIOH5_EN, {0x01}, 0x01},</div><div class='add'>+	{PRO_LINK, GPIOH5_ON, {0x01}, 0x01},</div><div class='add'>+	{PRO_LINK, GPIOH5_O, {0x00}, 0x01},</div><div class='add'>+	{PRO_LINK, GPIOH5_O, {0x01}, 0x01},</div><div class='ctx'> 	{PRO_LINK, DVBT_INTEN, {0x04}, 0x01},</div><div class='ctx'> 	{PRO_LINK, DVBT_ENABLE, {0x05}, 0x01},</div><div class='ctx'> 	{PRO_DMOD, MP2IF_MPEG_PAR_MODE, {0x00}, 0x01},</div><div class='hunk'>@@ -228,13 +230,127 @@ static struct it913xset init_1[] = {</div><div class='ctx'> 	{PRO_LINK, LOCK3_OUT, {0x01}, 0x01},</div><div class='ctx'> 	{PRO_LINK, PADMISCDRSR, {0x01}, 0x01},</div><div class='ctx'> 	{PRO_LINK, PADMISCDR2, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xec57, {0x00, 0x00}, 0x02},</div><div class='ctx'> 	{PRO_LINK, PADMISCDR4, {0x00}, 0x01}, /* Power up */</div><div class='ctx'> 	{PRO_LINK, PADMISCDR8, {0x00}, 0x01},</div><div class='ctx'> 	{0xff, 0x0000, {0x00}, 0x00} /* Terminating Entry */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* ---------IT9137 0x38 tuner init---------- */</div><div class='del'>-static struct it913xset it9137_set[] = {</div><div class='add'>+</div><div class='add'>+/* Version 1 types */</div><div class='add'>+static struct it913xset it9135_v1[] = {</div><div class='add'>+	{PRO_DMOD, 0x0051, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0070, {0x0a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x007e, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0081, {0x0a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x008a, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x008e, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0092, {0x06}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0099, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x009f, {0xe1}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00a0, {0xcf}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00a3, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00a5, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00a6, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00a9, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00aa, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00b0, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00c2, {0x05}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00c6, {0x19}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf000, {0x0f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf016, {0x10}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf017, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf018, {0x05}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf019, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf01a, {0x05}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf021, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf022, {0x0a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf023, {0x0a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf02b, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf02c, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf064, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf065, {0xf9}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf066, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf067, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf06f, {0xe0}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf070, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf072, {0x0f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf073, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf078, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf087, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf09b, {0x3f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf09c, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf09d, {0x20}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf09e, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf09f, {0x0c}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf0a0, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf130, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf132, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf144, {0x1a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf146, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf14a, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf14c, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf14d, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf14f, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf158, {0x7f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf15a, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf15b, {0x08}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf15d, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf15e, {0x05}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf163, {0x05}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf166, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf167, {0x40}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf168, {0x0f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf17a, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf17b, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf183, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf19d, {0x40}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf1bc, {0x36}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf1bd, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf1cb, {0xa0}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf1cc, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf204, {0x10}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf214, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf40e, {0x0a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf40f, {0x40}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf410, {0x08}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf55f, {0x0a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf561, {0x15}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf562, {0x20}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf5df, {0xfb}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf5e0, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf5e3, {0x09}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf5e4, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf5e5, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf5f8, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf5fd, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf600, {0x05}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf601, {0x08}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf602, {0x0b}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf603, {0x0e}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf604, {0x11}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf605, {0x14}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf606, {0x17}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf607, {0x1f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf60e, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf60f, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf610, {0x32}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf611, {0x10}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf707, {0xfc}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf708, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf709, {0x37}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf70a, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf78b, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf80f, {0x40}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf810, {0x54}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf811, {0x5a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf905, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xfb06, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xfd8b, {0x00}, 0x01},</div><div class='add'>+	{0xff, 0x0000, {0x00}, 0x00} /* Terminating Entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct it913xset it9135_38[] = {</div><div class='ctx'> 	{PRO_DMOD, 0x0043, {0x00}, 0x01},</div><div class='ctx'> 	{PRO_DMOD, 0x0046, {0x38}, 0x01},</div><div class='ctx'> 	{PRO_DMOD, 0x0051, {0x01}, 0x01},</div><div class='hunk'>@@ -244,7 +360,7 @@ static struct it913xset it9137_set[] = {</div><div class='ctx'> 	{PRO_DMOD, 0x0075, {0x8c, 0x8c, 0x8c, 0xc8, 0x01}, 0x05},</div><div class='ctx'> 	{PRO_DMOD, 0x007e, {0x04, 0x00}, 0x02},</div><div class='ctx'> 	{PRO_DMOD, 0x0081, {	0x0a, 0x12, 0x02, 0x0a, 0x03, 0xc8, 0xb8,</div><div class='del'>-				0xd0, 0xc3, 0x01	}, 0x0a},</div><div class='add'>+				0xd0, 0xc3, 0x01}, 0x0a},</div><div class='ctx'> 	{PRO_DMOD, 0x008e, {0x01}, 0x01},</div><div class='ctx'> 	{PRO_DMOD, 0x0092, {0x06, 0x00, 0x00, 0x00, 0x00}, 0x05},</div><div class='ctx'> 	{PRO_DMOD, 0x0099, {0x01}, 0x01},</div><div class='hunk'>@@ -262,15 +378,25 @@ static struct it913xset it9137_set[] = {</div><div class='ctx'> 	{PRO_DMOD, 0x00f3, {0x05, 0x8c, 0x8c}, 0x03},</div><div class='ctx'> 	{PRO_DMOD, 0x00f8, {0x03, 0x06, 0x06}, 0x03},</div><div class='ctx'> 	{PRO_DMOD, 0x00fc, {	0x02, 0x02, 0x02, 0x09, 0x50, 0x7b, 0x77,</div><div class='del'>-				0x00, 0x02, 0xc8, 0x05, 0x7b	}, 0x0c},</div><div class='add'>+				0x00, 0x02, 0xc8, 0x05, 0x7b}, 0x0c},</div><div class='ctx'> 	{PRO_DMOD, 0x0109, {0x02}, 0x01},</div><div class='del'>-	{PRO_DMOD, 0x0115, {0x0a, 0x03}, 0x02},</div><div class='del'>-	{PRO_DMOD, 0x011a, {0xc8, 0x7b, 0xbc, 0xa0}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x0115, {0x0a, 0x03, 0x02, 0x80}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x011a, {0xc8, 0x7b, 0x8a, 0xa0}, 0x04},</div><div class='ctx'> 	{PRO_DMOD, 0x0122, {0x02, 0x18, 0xc3}, 0x03},</div><div class='ctx'> 	{PRO_DMOD, 0x0127, {0x00, 0x07}, 0x02},</div><div class='ctx'> 	{PRO_DMOD, 0x012a, {0x53, 0x51, 0x4e, 0x43}, 0x04},</div><div class='ctx'> 	{PRO_DMOD, 0x0137, {0x01, 0x00, 0x07, 0x00, 0x06}, 0x05},</div><div class='del'>-	{PRO_DMOD, 0x013d, {0x00, 0x01, 0x5b, 0xc8}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x013d, {0x00, 0x01, 0x5b, 0xc8, 0x59}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0xf000, {0x0f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf016, {0x10, 0x04, 0x05, 0x04, 0x05}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0xf01f, {0x8c, 0x00, 0x03, 0x0a, 0x0a}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0xf029, {0x8c, 0x00, 0x00, 0x01}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf064, {0x03, 0xf9, 0x03, 0x01}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf06f, {0xe0, 0x03}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf072, {0x0f, 0x03}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf077, {0x01, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf085, {0x00, 0x02, 0x00}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf09b, {0x3f, 0x00, 0x20, 0x00, 0x0c, 0x00}, 0x06},</div><div class='ctx'> 	{PRO_DMOD, 0xf130, {0x04}, 0x01},</div><div class='ctx'> 	{PRO_DMOD, 0xf132, {0x04}, 0x01},</div><div class='ctx'> 	{PRO_DMOD, 0xf144, {0x1a}, 0x01},</div><div class='hunk'>@@ -301,7 +427,7 @@ static struct it913xset it9137_set[] = {</div><div class='ctx'> 	{PRO_DMOD, 0xf5f8, {0x01}, 0x01},</div><div class='ctx'> 	{PRO_DMOD, 0xf5fd, {0x01}, 0x01},</div><div class='ctx'> 	{PRO_DMOD, 0xf600, {	0x05, 0x08, 0x0b, 0x0e, 0x11, 0x14, 0x17,</div><div class='del'>-				0x1f	}, 0x08},</div><div class='add'>+				0x1f}, 0x08},</div><div class='ctx'> 	{PRO_DMOD, 0xf60e, {0x00, 0x04, 0x32, 0x10}, 0x04},</div><div class='ctx'> 	{PRO_DMOD, 0xf707, {0xfc, 0x00, 0x37, 0x00}, 0x04},</div><div class='ctx'> 	{PRO_DMOD, 0xf78b, {0x01}, 0x01},</div><div class='hunk'>@@ -309,21 +435,605 @@ static struct it913xset it9137_set[] = {</div><div class='ctx'> 	{PRO_DMOD, 0xf905, {0x01}, 0x01},</div><div class='ctx'> 	{PRO_DMOD, 0xfb06, {0x03}, 0x01},</div><div class='ctx'> 	{PRO_DMOD, 0xfd8b, {0x00}, 0x01},</div><div class='del'>-	{PRO_LINK, GPIOH5_EN, {0x01}, 0x01},</div><div class='del'>-	{PRO_LINK, GPIOH5_ON, {0x01}, 0x01},</div><div class='del'>-	{PRO_LINK, GPIOH5_O, {0x00}, 0x01},</div><div class='del'>-	{PRO_LINK, GPIOH5_O, {0x01}, 0x01},</div><div class='del'>-	{0xff, 0x0000, {0x00}, 0x00}, /* Terminating Entry */</div><div class='add'>+	{0xff, 0x0000, {0x00}, 0x00} /* Terminating Entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct it913xset it9135_51[] = {</div><div class='add'>+	{PRO_DMOD, 0x0043, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0046, {0x51}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0051, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x005f, {0x00, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x0068, {0x0a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0070, {0x0a, 0x06, 0x02}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x0075, {0x8c, 0x8c, 0x8c, 0xc8, 0x01}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0x007e, {0x04, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x0081, {	0x0a, 0x12, 0x02, 0x0a, 0x03, 0xc0, 0x96,</div><div class='add'>+				0xcf, 0xc3, 0x01}, 0x0a},</div><div class='add'>+	{PRO_DMOD, 0x008e, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0092, {0x06, 0x00, 0x00, 0x00, 0x00}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0x0099, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x009b, {0x3c, 0x28}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x009f, {0xe1, 0xcf}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00a3, {0x01, 0x5a, 0x01, 0x01}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x00a9, {0x00, 0x01}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00b0, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00b3, {0x02, 0x3c}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00b6, {0x14}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00c0, {0x11, 0x00, 0x05}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x00c4, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00c6, {0x19, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00cc, {0x2e, 0x51, 0x33}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x00f3, {0x05, 0x8c, 0x8c}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x00f8, {0x03, 0x06, 0x06}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x00fc, {	0x03, 0x02, 0x02, 0x09, 0x50, 0x7a, 0x77,</div><div class='add'>+				0x01, 0x02, 0xb0, 0x02, 0x7a}, 0x0c},</div><div class='add'>+	{PRO_DMOD, 0x0109, {0x02}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0115, {0x0a, 0x03, 0x02, 0x80}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x011a, {0xc0, 0x7a, 0xac, 0x8c}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x0122, {0x02, 0x70, 0xa4}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x0127, {0x00, 0x07}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x012a, {0x53, 0x51, 0x4e, 0x43}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x0137, {0x01, 0x00, 0x07, 0x00, 0x06}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0x013d, {0x00, 0x01, 0x5b, 0xc0, 0x59}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0xf000, {0x0f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf016, {0x10, 0x04, 0x05, 0x04, 0x05}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0xf01f, {0x8c, 0x00, 0x03, 0x0a, 0x0a}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0xf029, {0x8c, 0x00, 0x00, 0x01}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf064, {0x03, 0xf9, 0x03, 0x01}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf06f, {0xe0, 0x03}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf072, {0x0f, 0x03}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf077, {0x01, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf085, {0xc0, 0x01, 0x00}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf09b, {0x3f, 0x00, 0x20, 0x00, 0x0c, 0x00}, 0x06},</div><div class='add'>+	{PRO_DMOD, 0xf130, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf132, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf144, {0x1a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf146, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf14a, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf14c, {0x00, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf14f, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf158, {0x7f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf15a, {0x00, 0x08}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf15d, {0x03, 0x05}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf163, {0x05}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf166, {0x01, 0x40, 0x0f}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf17a, {0x00, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf183, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf19d, {0x40}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf1bc, {0x36, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf1cb, {0xa0, 0x01}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf204, {0x10}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf214, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf24c, {0x88, 0x95, 0x9a, 0x90}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf25a, {0x07, 0xe8, 0x03, 0xb0, 0x04}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0xf270, {0x01, 0x02, 0x01, 0x02}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf40e, {0x0a, 0x40, 0x08}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf55f, {0x0a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf561, {0x15, 0x20}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf5df, {0xfb, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf5e3, {0x09, 0x01, 0x01}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf5f8, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf5fd, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf600, {	0x05, 0x08, 0x0b, 0x0e, 0x11, 0x14, 0x17,</div><div class='add'>+				0x1f}, 0x08},</div><div class='add'>+	{PRO_DMOD, 0xf60e, {0x00, 0x04, 0x32, 0x10}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf707, {0xfc, 0x00, 0x37, 0x00}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf78b, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf80f, {0x40, 0x54, 0x5a}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf905, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xfb06, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xfd8b, {0x00}, 0x01},</div><div class='add'>+	{0xff, 0x0000, {0x00}, 0x00} /* Terminating Entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct it913xset it9135_52[] = {</div><div class='add'>+	{PRO_DMOD, 0x0043, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0046, {0x52}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0051, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x005f, {0x00, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x0068, {0x10}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0070, {0x0a, 0x05, 0x02}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x0075, {0x8c, 0x8c, 0x8c, 0xa0, 0x01}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0x007e, {0x04, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x0081, {	0x0a, 0x12, 0x03, 0x0a, 0x03, 0xb3, 0x97,</div><div class='add'>+				0xc0, 0x9e, 0x01}, 0x0a},</div><div class='add'>+	{PRO_DMOD, 0x008e, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0092, {0x06, 0x00, 0x00, 0x00, 0x00}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0x0099, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x009b, {0x3c, 0x28}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x009f, {0xe1, 0xcf}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00a3, {0x01, 0x5c, 0x01, 0x01}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x00a9, {0x00, 0x01}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00b0, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00b3, {0x02, 0x3c}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00b6, {0x14}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00c0, {0x11, 0x00, 0x05}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x00c4, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00c6, {0x19, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00cc, {0x2e, 0x51, 0x33}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x00f3, {0x05, 0x91, 0x8c}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x00f8, {0x03, 0x06, 0x06}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x00fc, {	0x03, 0x02, 0x02, 0x09, 0x50, 0x74, 0x77,</div><div class='add'>+				0x02, 0x02, 0xae, 0x02, 0x6e}, 0x0c},</div><div class='add'>+	{PRO_DMOD, 0x0109, {0x02}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0115, {0x0a, 0x03, 0x02, 0x80}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x011a, {0xcd, 0x62, 0xa4, 0x8c}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x0122, {0x03, 0x18, 0x9e}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x0127, {0x00, 0x07}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x012a, {0x53, 0x51, 0x4e, 0x43}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x0137, {0x00, 0x00, 0x07, 0x00, 0x06}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0x013d, {0x00, 0x01, 0x5b, 0xb6, 0x59}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0xf000, {0x0f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf016, {0x10, 0x04, 0x05, 0x04, 0x05}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0xf01f, {0x8c, 0x00, 0x03, 0x0a, 0x0a}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0xf029, {0x8c, 0x00, 0x00, 0x01}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf064, {0x03, 0xf9, 0x03, 0x01}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf06f, {0xe0, 0x03}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf072, {0x0f, 0x03}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf077, {0x01, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf085, {0xc0, 0x01, 0x00}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf09b, {0x3f, 0x00, 0x20, 0x00, 0x0c, 0x00}, 0x06},</div><div class='add'>+	{PRO_DMOD, 0xf130, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf132, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf144, {0x1a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf146, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf14a, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf14c, {0x00, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf14f, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf158, {0x7f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf15a, {0x00, 0x08}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf15d, {0x03, 0x05}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf163, {0x05}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf166, {0x01, 0x40, 0x0f}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf17a, {0x00, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf183, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf19d, {0x40}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf1bc, {0x36, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf1cb, {0xa0, 0x01}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf204, {0x10}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf214, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf24c, {0x88, 0x95, 0x9a, 0x90}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf25a, {0x07, 0xe8, 0x03, 0xb0, 0x04}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0xf270, {0x01, 0x02, 0x01, 0x02}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf40e, {0x0a, 0x40, 0x08}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf55f, {0x0a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf561, {0x15, 0x20}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf5df, {0xfb, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf5e3, {0x09, 0x01, 0x01}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf5f8, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf5fd, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf600, {0x05, 0x08, 0x0b, 0x0e, 0x11, 0x14, 0x17,</div><div class='add'>+				0x1f}, 0x08},</div><div class='add'>+	{PRO_DMOD, 0xf60e, {0x00, 0x04, 0x32, 0x10}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf707, {0xfc, 0x00, 0x37, 0x00}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf78b, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf80f, {0x40, 0x54, 0x5a}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf905, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xfb06, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xfd8b, {0x00}, 0x01},</div><div class='add'>+	{0xff, 0x0000, {0x00}, 0x00} /* Terminating Entry */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Version 2 types */</div><div class='add'>+static struct it913xset it9135_v2[] = {</div><div class='add'>+	{PRO_DMOD, 0x0051, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0070, {0x0a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x007e, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0081, {0x0a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x008a, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x008e, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0092, {0x06}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0099, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x009f, {0xe1}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00a0, {0xcf}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00a3, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00a5, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00a6, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00a9, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00aa, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00b0, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00c2, {0x05}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00c6, {0x19}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf000, {0x0f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf02b, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf064, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf065, {0xf9}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf066, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf067, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf06f, {0xe0}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf070, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf072, {0x0f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf073, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf078, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf087, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf09b, {0x3f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf09c, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf09d, {0x20}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf09e, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf09f, {0x0c}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf0a0, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf130, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf132, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf144, {0x1a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf146, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf14a, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf14c, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf14d, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf14f, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf158, {0x7f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf15a, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf15b, {0x08}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf15d, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf15e, {0x05}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf163, {0x05}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf166, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf167, {0x40}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf168, {0x0f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf17a, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf17b, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf183, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf19d, {0x40}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf1bc, {0x36}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf1bd, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf1cb, {0xa0}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf1cc, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf204, {0x10}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf214, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf40e, {0x0a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf40f, {0x40}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf410, {0x08}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf55f, {0x0a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf561, {0x15}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf562, {0x20}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf5e3, {0x09}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf5e4, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf5e5, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf600, {0x05}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf601, {0x08}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf602, {0x0b}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf603, {0x0e}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf604, {0x11}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf605, {0x14}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf606, {0x17}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf607, {0x1f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf60e, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf60f, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf610, {0x32}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf611, {0x10}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf707, {0xfc}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf708, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf709, {0x37}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf70a, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf78b, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf80f, {0x40}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf810, {0x54}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf811, {0x5a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf905, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xfb06, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xfd8b, {0x00}, 0x01},</div><div class='add'>+	{0xff, 0x0000, {0x00}, 0x00} /* Terminating Entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct it913xset it9135_60[] = {</div><div class='add'>+	{PRO_DMOD, 0x0043, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0046, {0x60}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0051, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x005f, {0x00, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x0068, {0x0a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x006a, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0070, {0x0a, 0x05, 0x02}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x0075, {0x8c, 0x8c, 0x8c, 0x8c, 0x01}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0x007e, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0081, {0x0a, 0x12}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x0084, {0x0a, 0x33, 0xbe, 0xa0, 0xc6, 0xb6, 0x01}, 0x07},</div><div class='add'>+	{PRO_DMOD, 0x008e, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0092, {0x06, 0x00, 0x00, 0x00, 0x00}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0x0099, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x009b, {0x3c, 0x28}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x009f, {0xe1, 0xcf}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00a3, {0x01, 0x5a, 0x01, 0x01}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x00a9, {0x00, 0x01}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00b0, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00b3, {0x02, 0x3a}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00b6, {0x14}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00c0, {0x11, 0x00, 0x05, 0x01, 0x00}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0x00c6, {0x19, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00cb, {0x32, 0x2c, 0x4f, 0x30}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x00f3, {0x05, 0xa0, 0x8c}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x00f8, {0x03, 0x06, 0x06}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x00fc, {	0x03, 0x03, 0x02, 0x0a, 0x50, 0x7b, 0x8c,</div><div class='add'>+				0x00, 0x02, 0xbe, 0x00}, 0x0b},</div><div class='add'>+	{PRO_DMOD, 0x0109, {0x02}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0115, {0x0a, 0x03}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x011a, {0xbe}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0124, {0xae}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0127, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x012a, {0x56, 0x50, 0x47, 0x42}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x0137, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x013b, {0x08}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x013f, {0x5b}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0141, {	0x59, 0xf9, 0x19, 0x19, 0x8c, 0x8c, 0x8c,</div><div class='add'>+				0x6e, 0x8c, 0x50, 0x8c, 0x8c, 0xac, 0xc6,</div><div class='add'>+				0x33}, 0x0f},</div><div class='add'>+	{PRO_DMOD, 0x0151, {0x28}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0153, {0xbc}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0178, {0x09}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0181, {0x94, 0x6e}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x0185, {0x24}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0187, {0x00, 0x00, 0xbe, 0x02, 0x80}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0xed02, {0xff}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xee42, {0xff}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xee82, {0xff}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf000, {0x0f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf01f, {0x8c, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf029, {0x8c, 0x00, 0x00}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf064, {0x03, 0xf9, 0x03, 0x01}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf06f, {0xe0, 0x03}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf072, {0x0f, 0x03}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf077, {0x01, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf087, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf09b, {0x3f, 0x00, 0x20, 0x00, 0x0c, 0x00}, 0x06},</div><div class='add'>+	{PRO_DMOD, 0xf130, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf132, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf144, {0x1a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf146, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf14a, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf14c, {0x00, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf14f, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf158, {0x7f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf15a, {0x00, 0x08}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf15d, {0x03, 0x05}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf163, {0x05}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf166, {0x01, 0x40, 0x0f}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf17a, {0x00, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf183, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf19d, {0x40}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf1bc, {0x36, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf1cb, {0xa0, 0x01}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf204, {0x10}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf214, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf24c, {0x88, 0x95, 0x9a, 0x90}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf25a, {0x07, 0xe8, 0x03, 0xb0, 0x04}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0xf270, {0x01, 0x02, 0x01, 0x02}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf40e, {0x0a, 0x40, 0x08}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf55f, {0x0a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf561, {0x15, 0x20}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf5e3, {0x09, 0x01, 0x01}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf600, {0x05, 0x08, 0x0b, 0x0e, 0x11, 0x14, 0x17</div><div class='add'>+		, 0x1f}, 0x08},</div><div class='add'>+	{PRO_DMOD, 0xf60e, {0x00, 0x04, 0x32, 0x10}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf707, {0xfc, 0x00, 0x37, 0x00}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf78b, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf80f, {0x40, 0x54, 0x5a}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf905, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xfb06, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xfd8b, {0x00}, 0x01},</div><div class='add'>+	{0xff, 0x0000, {0x00}, 0x00} /* Terminating Entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct it913xset it9135_61[] = {</div><div class='add'>+	{PRO_DMOD, 0x0043, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0046, {0x61}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0051, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x005f, {0x00, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x0068, {0x06}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x006a, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0070, {0x0a, 0x05, 0x02}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x0075, {0x8c, 0x8c, 0x8c, 0x90, 0x01}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0x007e, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0081, {0x0a, 0x12}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x0084, {0x0a, 0x33, 0xbc, 0x9c, 0xcc, 0xa8, 0x01}, 0x07},</div><div class='add'>+	{PRO_DMOD, 0x008e, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0092, {0x06, 0x00, 0x00, 0x00, 0x00}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0x0099, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x009b, {0x3c, 0x28}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x009f, {0xe1, 0xcf}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00a3, {0x01, 0x5c, 0x01, 0x01}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x00a9, {0x00, 0x01}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00b0, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00b3, {0x02, 0x3a}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00b6, {0x14}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00c0, {0x11, 0x00, 0x05, 0x01, 0x00}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0x00c6, {0x19, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00cb, {0x32, 0x2c, 0x4f, 0x30}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x00f3, {0x05, 0xa0, 0x8c}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x00f8, {0x03, 0x06, 0x06}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x00fc, {	0x03, 0x03, 0x02, 0x08, 0x50, 0x7b, 0x8c,</div><div class='add'>+				0x01, 0x02, 0xc8, 0x00}, 0x0b},</div><div class='add'>+	{PRO_DMOD, 0x0109, {0x02}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0115, {0x0a, 0x03}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x011a, {0xc6}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0124, {0xa8}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0127, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x012a, {0x59, 0x50, 0x47, 0x42}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x0137, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x013b, {0x05}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x013f, {0x5b}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0141, {	0x59, 0xf9, 0x59, 0x59, 0x8c, 0x8c, 0x8c,</div><div class='add'>+				0x7b, 0x8c, 0x50, 0x8c, 0x8c, 0xa8, 0xc6,</div><div class='add'>+				0x33}, 0x0f},</div><div class='add'>+	{PRO_DMOD, 0x0151, {0x28}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0153, {0xcc}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0178, {0x09}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0181, {0x9c, 0x76}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x0185, {0x28}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0187, {0x01, 0x00, 0xaa, 0x02, 0x80}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0xed02, {0xff}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xee42, {0xff}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xee82, {0xff}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf000, {0x0f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf01f, {0x8c, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf029, {0x8c, 0x00, 0x00}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf064, {0x03, 0xf9, 0x03, 0x01}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf06f, {0xe0, 0x03}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf072, {0x0f, 0x03}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf077, {0x01, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf087, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf09b, {0x3f, 0x00, 0x20, 0x00, 0x0c, 0x00}, 0x06},</div><div class='add'>+	{PRO_DMOD, 0xf130, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf132, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf144, {0x1a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf146, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf14a, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf14c, {0x00, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf14f, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf158, {0x7f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf15a, {0x00, 0x08}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf15d, {0x03, 0x05}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf163, {0x05}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf166, {0x01, 0x40, 0x0f}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf17a, {0x00, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf183, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf19d, {0x40}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf1bc, {0x36, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf1cb, {0xa0, 0x01}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf204, {0x10}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf214, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf24c, {0x88, 0x95, 0x9a, 0x90}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf25a, {0x07, 0xe8, 0x03, 0xb0, 0x04}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0xf270, {0x01, 0x02, 0x01, 0x02}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf40e, {0x0a, 0x40, 0x08}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf55f, {0x0a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf561, {0x15, 0x20}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf5e3, {0x09, 0x01, 0x01}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf600, {	0x05, 0x08, 0x0b, 0x0e, 0x11, 0x14, 0x17,</div><div class='add'>+				0x1f}, 0x08},</div><div class='add'>+	{PRO_DMOD, 0xf60e, {0x00, 0x04, 0x32, 0x10}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf707, {0xfc, 0x00, 0x37, 0x00}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf78b, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf80f, {0x40, 0x54, 0x5a}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf905, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xfb06, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xfd8b, {0x00}, 0x01},</div><div class='add'>+	{0xff, 0x0000, {0x00}, 0x00} /* Terminating Entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct it913xset it9135_62[] = {</div><div class='add'>+	{PRO_DMOD, 0x0043, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0046, {0x62}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0051, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x005f, {0x00, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x0068, {0x0a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x006a, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0070, {0x0a, 0x05, 0x02}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x0075, {0x8c, 0x8c, 0x8c, 0x8c, 0x01}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0x007e, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0081, {0x0a, 0x12}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x0084, {	0x0a, 0x33, 0xb8, 0x9c, 0xb2, 0xa6, 0x01},</div><div class='add'>+				0x07},</div><div class='add'>+	{PRO_DMOD, 0x008e, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0092, {0x06, 0x00, 0x00, 0x00, 0x00}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0x0099, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x009b, {0x3c, 0x28}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x009f, {0xe1, 0xcf}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00a3, {0x01, 0x5a, 0x01, 0x01}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x00a9, {0x00, 0x01}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00b0, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00b3, {0x02, 0x3a}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00b6, {0x14}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x00c0, {0x11, 0x00, 0x05, 0x01, 0x00}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0x00c6, {0x19, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x00cb, {0x32, 0x2c, 0x4f, 0x30}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x00f3, {0x05, 0x8c, 0x8c}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x00f8, {0x03, 0x06, 0x06}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0x00fc, {	0x02, 0x03, 0x02, 0x09, 0x50, 0x6e, 0x8c,</div><div class='add'>+				0x02, 0x02, 0xc2, 0x00}, 0x0b},</div><div class='add'>+	{PRO_DMOD, 0x0109, {0x02}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0115, {0x0a, 0x03}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x011a, {0xb8}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0124, {0xa8}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0127, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x012a, {0x53, 0x51, 0x4e, 0x43}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0x0137, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x013b, {0x05}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x013f, {0x5b}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0141, {	0x59, 0xf9, 0x59, 0x19, 0x8c, 0x8c, 0x8c,</div><div class='add'>+				0x7b, 0x8c, 0x50, 0x70, 0x8c, 0x96, 0xd0,</div><div class='add'>+				0x33}, 0x0f},</div><div class='add'>+	{PRO_DMOD, 0x0151, {0x28}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0153, {0xb2}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0178, {0x09}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0181, {0x9c, 0x6e}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0x0185, {0x24}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x0187, {0x00, 0x00, 0xb8, 0x02, 0x80}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0xed02, {0xff}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xee42, {0xff}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xee82, {0xff}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf000, {0x0f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf01f, {0x8c, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf029, {0x8c, 0x00, 0x00}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf064, {0x03, 0xf9, 0x03, 0x01}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf06f, {0xe0, 0x03}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf072, {0x0f, 0x03}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf077, {0x01, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf087, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf09b, {0x3f, 0x00, 0x20, 0x00, 0x0c, 0x00}, 0x06},</div><div class='add'>+	{PRO_DMOD, 0xf130, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf132, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf144, {0x1a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf146, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf14a, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf14c, {0x00, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf14f, {0x04}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf158, {0x7f}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf15a, {0x00, 0x08}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf15d, {0x03, 0x05}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf163, {0x05}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf166, {0x01, 0x40, 0x0f}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf17a, {0x00, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf183, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf19d, {0x40}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf1bc, {0x36, 0x00}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf1cb, {0xa0, 0x01}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf204, {0x10}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf214, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf24c, {0x88, 0x95, 0x9a, 0x90}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf25a, {0x07, 0xe8, 0x03, 0xb0, 0x04}, 0x05},</div><div class='add'>+	{PRO_DMOD, 0xf270, {0x01, 0x02, 0x01, 0x02}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf40e, {0x0a, 0x40, 0x08}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf55f, {0x0a}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf561, {0x15, 0x20}, 0x02},</div><div class='add'>+	{PRO_DMOD, 0xf5e3, {0x09, 0x01, 0x01}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf600, {	0x05, 0x08, 0x0b, 0x0e, 0x11, 0x14, 0x17,</div><div class='add'>+				0x1f}, 0x08},</div><div class='add'>+	{PRO_DMOD, 0xf60e, {0x00, 0x04, 0x32, 0x10}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf707, {0xfc, 0x00, 0x37, 0x00}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xf78b, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xf80f, {0x40, 0x54, 0x5a}, 0x03},</div><div class='add'>+	{PRO_DMOD, 0xf905, {0x01}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xfb06, {0x03}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xfd8b, {0x00}, 0x01},</div><div class='add'>+	{0xff, 0x0000, {0x00}, 0x00} /* Terminating Entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Tuner setting scripts (still keeping it9137) */</div><div class='ctx'> static struct it913xset it9137_tuner_off[] = {</div><div class='ctx'> 	{PRO_DMOD, 0xfba8, {0x01}, 0x01}, /* Tuner Clock Off  */</div><div class='ctx'> 	{PRO_DMOD, 0xec40, {0x00}, 0x01}, /* Power Down Tuner */</div><div class='ctx'> 	{PRO_DMOD, 0xec02, {0x3f, 0x1f, 0x3f, 0x3f}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xec06, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+				0x00, 0x00, 0x00, 0x00}, 0x0c},</div><div class='add'>+	{PRO_DMOD, 0xec12, {0x00, 0x00, 0x00, 0x00}, 0x04},</div><div class='add'>+	{PRO_DMOD, 0xec17, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+				0x00}, 0x09},</div><div class='add'>+	{PRO_DMOD, 0xec22, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,</div><div class='add'>+				0x00, 0x00}, 0x0a},</div><div class='add'>+	{PRO_DMOD, 0xec20, {0x00}, 0x01},</div><div class='ctx'> 	{PRO_DMOD, 0xec3f, {0x01}, 0x01},</div><div class='ctx'> 	{0xff, 0x0000, {0x00}, 0x00}, /* Terminating Entry */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct it913xset set_it9135_template[] = {</div><div class='add'>+	{PRO_DMOD, 0xee06, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xec56, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xec4c, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xec4d, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0xec4e, {0x00}, 0x01},</div><div class='add'>+	{PRO_DMOD, 0x011e, {0x00}, 0x01}, /* Older Devices */</div><div class='add'>+	{PRO_DMOD, 0x011f, {0x00}, 0x01},</div><div class='add'>+	{0xff, 0x0000, {0x00}, 0x00}, /* Terminating Entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct it913xset set_it9137_template[] = {</div><div class='ctx'> 	{PRO_DMOD, 0xee06, {0x00}, 0x01},</div><div class='ctx'> 	{PRO_DMOD, 0xec56, {0x00}, 0x01},</div><div class='head'>diff --git a/drivers/media/dvb/frontends/it913x-fe.c b/drivers/media/dvb/frontends/it913x-fe.c<br/>index d4bd24eb4700..ccc36bf2deb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/it913x-fe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/it913x-fe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/it913x-fe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/it913x-fe.c</a></div><div class='hunk'>@@ -46,13 +46,17 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info (or-able)).");</div><div class='ctx'> 	  dprintk(level, name" (%02x%02x%02x%02x%02x%02x%02x%02x)", \</div><div class='ctx'> 		*p, *(p+1), *(p+2), *(p+3), *(p+4), \</div><div class='ctx'> 			*(p+5), *(p+6), *(p+7));</div><div class='add'>+#define info(format, arg...) \</div><div class='add'>+	printk(KERN_INFO "it913x-fe: " format "\n" , ## arg)</div><div class='ctx'> </div><div class='ctx'> struct it913x_fe_state {</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='ctx'> 	struct i2c_adapter *i2c_adap;</div><div class='add'>+	struct ite_config *config;</div><div class='ctx'> 	u8 i2c_addr;</div><div class='ctx'> 	u32 frequency;</div><div class='del'>-	u8 adf;</div><div class='add'>+	fe_modulation_t constellation;</div><div class='add'>+	fe_transmit_mode_t transmission_mode;</div><div class='ctx'> 	u32 crystalFrequency;</div><div class='ctx'> 	u32 adcFrequency;</div><div class='ctx'> 	u8 tuner_type;</div><div class='hunk'>@@ -62,6 +66,7 @@ struct it913x_fe_state {</div><div class='ctx'> 	u8 tun_fdiv;</div><div class='ctx'> 	u8 tun_clk_mode;</div><div class='ctx'> 	u32 tun_fn_min;</div><div class='add'>+	u32 ucblocks;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int it913x_read_reg(struct it913x_fe_state *state,</div><div class='hunk'>@@ -211,20 +216,24 @@ static int it913x_init_tuner(struct it913x_fe_state *state)</div><div class='ctx'> 	state-&gt;tun_fn_min /= (state-&gt;tun_fdiv * nv_val);</div><div class='ctx'> 	deb_info("Tuner fn_min %d", state-&gt;tun_fn_min);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 50; i++) {</div><div class='del'>-		reg = it913x_read_reg_u8(state, 0xec82);</div><div class='del'>-		if (reg &gt; 0)</div><div class='del'>-			break;</div><div class='del'>-		if (reg &lt; 0)</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		udelay(2000);</div><div class='add'>+	if (state-&gt;config-&gt;chip_ver &gt; 1)</div><div class='add'>+		msleep(50);</div><div class='add'>+	else {</div><div class='add'>+		for (i = 0; i &lt; 50; i++) {</div><div class='add'>+			reg = it913x_read_reg_u8(state, 0xec82);</div><div class='add'>+			if (reg &gt; 0)</div><div class='add'>+				break;</div><div class='add'>+			if (reg &lt; 0)</div><div class='add'>+				return -ENODEV;</div><div class='add'>+			udelay(2000);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return it913x_write_reg(state, PRO_DMOD, 0xed81, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int it9137_set_tuner(struct it913x_fe_state *state,</div><div class='del'>-		enum fe_bandwidth bandwidth, u32 frequency_m)</div><div class='add'>+		u32 bandwidth, u32 frequency_m)</div><div class='ctx'> {</div><div class='ctx'> 	struct it913xset *set_tuner = set_it9137_template;</div><div class='ctx'> 	int ret, reg;</div><div class='hunk'>@@ -237,6 +246,11 @@ static int it9137_set_tuner(struct it913x_fe_state *state,</div><div class='ctx'> 	u8 lna_band;</div><div class='ctx'> 	u8 bw;</div><div class='ctx'> </div><div class='add'>+	if (state-&gt;config-&gt;firmware_ver == 1)</div><div class='add'>+		set_tuner = set_it9135_template;</div><div class='add'>+	else</div><div class='add'>+		set_tuner = set_it9137_template;</div><div class='add'>+</div><div class='ctx'> 	deb_info("Tuner Frequency %d Bandwidth %d", frequency, bandwidth);</div><div class='ctx'> </div><div class='ctx'> 	if (frequency &gt;= 51000 &amp;&amp; frequency &lt;= 440000) {</div><div class='hunk'>@@ -273,16 +287,21 @@ static int it9137_set_tuner(struct it913x_fe_state *state,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	set_tuner[0].reg[0] = lna_band;</div><div class='ctx'> </div><div class='del'>-	if (bandwidth == BANDWIDTH_5_MHZ)</div><div class='add'>+	switch (bandwidth) {</div><div class='add'>+	case 5000000:</div><div class='ctx'> 		bw = 0;</div><div class='del'>-	else if (bandwidth == BANDWIDTH_6_MHZ)</div><div class='add'>+		break;</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		bw = 2;</div><div class='del'>-	else if (bandwidth == BANDWIDTH_7_MHZ)</div><div class='add'>+		break;</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		bw = 4;</div><div class='del'>-	else if (bandwidth == BANDWIDTH_8_MHZ)</div><div class='del'>-		bw = 6;</div><div class='del'>-	else</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		bw = 6;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	set_tuner[1].reg[0] = bw;</div><div class='ctx'> 	set_tuner[2].reg[0] = 0xa0 | (l_band &lt;&lt; 3);</div><div class='hunk'>@@ -361,7 +380,7 @@ static int it9137_set_tuner(struct it913x_fe_state *state,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int it913x_fe_select_bw(struct it913x_fe_state *state,</div><div class='del'>-			enum fe_bandwidth bandwidth, u32 adcFrequency)</div><div class='add'>+			u32 bandwidth, u32 adcFrequency)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> 	u8 buffer[256];</div><div class='hunk'>@@ -374,17 +393,21 @@ static int it913x_fe_select_bw(struct it913x_fe_state *state,</div><div class='ctx'> </div><div class='ctx'> 	deb_info("Bandwidth %d Adc %d", bandwidth, adcFrequency);</div><div class='ctx'> </div><div class='del'>-	if (bandwidth == BANDWIDTH_5_MHZ)</div><div class='add'>+	switch (bandwidth) {</div><div class='add'>+	case 5000000:</div><div class='ctx'> 		bw = 3;</div><div class='del'>-	else if (bandwidth == BANDWIDTH_6_MHZ)</div><div class='add'>+		break;</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		bw = 0;</div><div class='del'>-	else if (bandwidth == BANDWIDTH_7_MHZ)</div><div class='add'>+		break;</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		bw = 1;</div><div class='del'>-	else if (bandwidth == BANDWIDTH_8_MHZ)</div><div class='del'>-		bw = 2;</div><div class='del'>-	else</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		bw = 2;</div><div class='del'>-</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	ret = it913x_write_reg(state, PRO_DMOD, REG_BW, bw);</div><div class='ctx'> </div><div class='ctx'> 	if (state-&gt;table == NULL)</div><div class='hunk'>@@ -492,31 +515,79 @@ static int it913x_fe_read_signal_strength(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int it913x_fe_read_snr(struct dvb_frontend *fe, u16* snr)</div><div class='add'>+static int it913x_fe_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='ctx'> {</div><div class='ctx'> 	struct it913x_fe_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	int ret = it913x_read_reg_u8(state, SIGNAL_QUALITY);</div><div class='del'>-	ret = (ret * 0xff) / 0x64;</div><div class='del'>-	ret |= (ret &lt;&lt; 0x8);</div><div class='del'>-	*snr = ~ret;</div><div class='del'>-	return 0;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 reg[3];</div><div class='add'>+	u32 snr_val, snr_min, snr_max;</div><div class='add'>+	u32 temp;</div><div class='add'>+</div><div class='add'>+	ret = it913x_read_reg(state, 0x2c, reg, sizeof(reg));</div><div class='add'>+</div><div class='add'>+	snr_val = (u32)(reg[2] &lt;&lt; 16) | (reg[1] &lt;&lt; 8) | reg[0];</div><div class='add'>+</div><div class='add'>+	ret |= it913x_read_reg(state, 0xf78b, reg, 1);</div><div class='add'>+	if (reg[0])</div><div class='add'>+		snr_val /= reg[0];</div><div class='add'>+</div><div class='add'>+	if (state-&gt;transmission_mode == TRANSMISSION_MODE_2K)</div><div class='add'>+		snr_val *= 4;</div><div class='add'>+	else if (state-&gt;transmission_mode == TRANSMISSION_MODE_4K)</div><div class='add'>+		snr_val *= 2;</div><div class='add'>+</div><div class='add'>+	if (state-&gt;constellation == QPSK) {</div><div class='add'>+		snr_min = 0xb4711;</div><div class='add'>+		snr_max = 0x191451;</div><div class='add'>+	} else if (state-&gt;constellation == QAM_16) {</div><div class='add'>+		snr_min = 0x4f0d5;</div><div class='add'>+		snr_max = 0xc7925;</div><div class='add'>+	} else if (state-&gt;constellation == QAM_64) {</div><div class='add'>+		snr_min = 0x256d0;</div><div class='add'>+		snr_max = 0x626be;</div><div class='add'>+	} else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (snr_val &lt; snr_min)</div><div class='add'>+		*snr = 0;</div><div class='add'>+	else if (snr_val &lt; snr_max) {</div><div class='add'>+		temp = (snr_val - snr_min) &gt;&gt; 5;</div><div class='add'>+		temp *= 0xffff;</div><div class='add'>+		temp /= (snr_max - snr_min) &gt;&gt; 5;</div><div class='add'>+		*snr = (u16)temp;</div><div class='add'>+	} else</div><div class='add'>+		*snr = 0xffff;</div><div class='add'>+</div><div class='add'>+	return (ret &lt; 0) ? -ENODEV : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int it913x_fe_read_ber(struct dvb_frontend *fe, u32 *ber)</div><div class='ctx'> {</div><div class='del'>-	*ber = 0;</div><div class='add'>+	struct it913x_fe_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 reg[5];</div><div class='add'>+	/* Read Aborted Packets and Pre-Viterbi error rate 5 bytes */</div><div class='add'>+	ret = it913x_read_reg(state, RSD_ABORT_PKT_LSB, reg, sizeof(reg));</div><div class='add'>+	state-&gt;ucblocks += (u32)(reg[1] &lt;&lt; 8) | reg[0];</div><div class='add'>+	*ber = (u32)(reg[4] &lt;&lt; 16) | (reg[3] &lt;&lt; 8) | reg[2];</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int it913x_fe_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='ctx'> {</div><div class='del'>-	*ucblocks = 0;</div><div class='del'>-	return 0;</div><div class='add'>+	struct it913x_fe_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 reg[2];</div><div class='add'>+	/* Aborted Packets */</div><div class='add'>+	ret = it913x_read_reg(state, RSD_ABORT_PKT_LSB, reg, sizeof(reg));</div><div class='add'>+	state-&gt;ucblocks += (u32)(reg[1] &lt;&lt; 8) | reg[0];</div><div class='add'>+	*ucblocks = state-&gt;ucblocks;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int it913x_fe_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-			struct dvb_frontend_parameters *p)</div><div class='add'>+static int it913x_fe_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct it913x_fe_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 reg[8];</div><div class='hunk'>@@ -524,26 +595,30 @@ static int it913x_fe_get_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	ret = it913x_read_reg(state, REG_TPSD_TX_MODE, reg, sizeof(reg));</div><div class='ctx'> </div><div class='ctx'> 	if (reg[3] &lt; 3)</div><div class='del'>-		p-&gt;u.ofdm.constellation = fe_con[reg[3]];</div><div class='add'>+		p-&gt;modulation = fe_con[reg[3]];</div><div class='ctx'> </div><div class='ctx'> 	if (reg[0] &lt; 3)</div><div class='del'>-		p-&gt;u.ofdm.transmission_mode = fe_mode[reg[0]];</div><div class='add'>+		p-&gt;transmission_mode = fe_mode[reg[0]];</div><div class='ctx'> </div><div class='ctx'> 	if (reg[1] &lt; 4)</div><div class='del'>-		p-&gt;u.ofdm.guard_interval = fe_gi[reg[1]];</div><div class='add'>+		p-&gt;guard_interval = fe_gi[reg[1]];</div><div class='ctx'> </div><div class='ctx'> 	if (reg[2] &lt; 4)</div><div class='del'>-		p-&gt;u.ofdm.hierarchy_information = fe_hi[reg[2]];</div><div class='add'>+		p-&gt;hierarchy = fe_hi[reg[2]];</div><div class='add'>+</div><div class='add'>+	p-&gt;code_rate_HP = (reg[6] &lt; 6) ? fe_code[reg[6]] : FEC_NONE;</div><div class='add'>+	p-&gt;code_rate_LP = (reg[7] &lt; 6) ? fe_code[reg[7]] : FEC_NONE;</div><div class='ctx'> </div><div class='del'>-	p-&gt;u.ofdm.code_rate_HP = (reg[6] &lt; 6) ? fe_code[reg[6]] : FEC_NONE;</div><div class='del'>-	p-&gt;u.ofdm.code_rate_LP = (reg[7] &lt; 6) ? fe_code[reg[7]] : FEC_NONE;</div><div class='add'>+	/* Update internal state to reflect the autodetected props */</div><div class='add'>+	state-&gt;constellation = p-&gt;modulation;</div><div class='add'>+	state-&gt;transmission_mode = p-&gt;transmission_mode;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int it913x_fe_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-			struct dvb_frontend_parameters *p)</div><div class='add'>+static int it913x_fe_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct it913x_fe_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> 	u8 empty_ch, last_ch;</div><div class='hunk'>@@ -551,7 +626,7 @@ static int it913x_fe_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	state-&gt;it913x_status = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Set bw*/</div><div class='del'>-	ret = it913x_fe_select_bw(state, p-&gt;u.ofdm.bandwidth,</div><div class='add'>+	ret = it913x_fe_select_bw(state, p-&gt;bandwidth_hz,</div><div class='ctx'> 		state-&gt;adcFrequency);</div><div class='ctx'> </div><div class='ctx'> 	/* Training Mode Off */</div><div class='hunk'>@@ -571,20 +646,25 @@ static int it913x_fe_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 			i = 1;</div><div class='ctx'> 	else if ((p-&gt;frequency &gt;= 1450000000) &amp;&amp; (p-&gt;frequency &lt;= 1680000000))</div><div class='ctx'> 			i = 2;</div><div class='del'>-		else</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='add'>+	else</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	ret = it913x_write_reg(state, PRO_DMOD, FREE_BAND, i);</div><div class='ctx'> </div><div class='ctx'> 	deb_info("Frontend Set Tuner Type %02x", state-&gt;tuner_type);</div><div class='ctx'> 	switch (state-&gt;tuner_type) {</div><div class='del'>-	case IT9137: /* Tuner type 0x38 */</div><div class='add'>+	case IT9135_38:</div><div class='add'>+	case IT9135_51:</div><div class='add'>+	case IT9135_52:</div><div class='add'>+	case IT9135_60:</div><div class='add'>+	case IT9135_61:</div><div class='add'>+	case IT9135_62:</div><div class='ctx'> 		ret = it9137_set_tuner(state,</div><div class='del'>-			p-&gt;u.ofdm.bandwidth, p-&gt;frequency);</div><div class='add'>+			p-&gt;bandwidth_hz, p-&gt;frequency);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-			fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+			fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 			if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 				fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -678,16 +758,19 @@ static u32 compute_div(u32 a, u32 b, u32 x)</div><div class='ctx'> </div><div class='ctx'> static int it913x_fe_start(struct it913x_fe_state *state)</div><div class='ctx'> {</div><div class='del'>-	struct it913xset *set_fe;</div><div class='add'>+	struct it913xset *set_lna;</div><div class='ctx'> 	struct it913xset *set_mode;</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 adf = (state-&gt;adf &amp; 0xf);</div><div class='add'>+	u8 adf = (state-&gt;config-&gt;adf &amp; 0xf);</div><div class='ctx'> 	u32 adc, xtal;</div><div class='ctx'> 	u8 b[4];</div><div class='ctx'> </div><div class='del'>-	ret = it913x_init_tuner(state);</div><div class='add'>+	if (state-&gt;config-&gt;chip_ver == 1)</div><div class='add'>+		ret = it913x_init_tuner(state);</div><div class='add'>+</div><div class='add'>+	info("ADF table value	:%02x", adf);</div><div class='ctx'> </div><div class='del'>-	if (adf &lt; 12) {</div><div class='add'>+	if (adf &lt; 10) {</div><div class='ctx'> 		state-&gt;crystalFrequency = fe_clockTable[adf].xtal ;</div><div class='ctx'> 		state-&gt;table = fe_clockTable[adf].table;</div><div class='ctx'> 		state-&gt;adcFrequency = state-&gt;table-&gt;adcFrequency;</div><div class='hunk'>@@ -698,9 +781,6 @@ static int it913x_fe_start(struct it913x_fe_state *state)</div><div class='ctx'> 	} else</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	deb_info("Xtal Freq :%d Adc Freq :%d Adc %08x Xtal %08x",</div><div class='del'>-		state-&gt;crystalFrequency, state-&gt;adcFrequency, adc, xtal);</div><div class='del'>-</div><div class='ctx'> 	/* Set LED indicator on GPIOH3 */</div><div class='ctx'> 	ret = it913x_write_reg(state, PRO_LINK, GPIOH3_EN, 0x1);</div><div class='ctx'> 	ret |= it913x_write_reg(state, PRO_LINK, GPIOH3_ON, 0x1);</div><div class='hunk'>@@ -721,22 +801,71 @@ static int it913x_fe_start(struct it913x_fe_state *state)</div><div class='ctx'> 	b[2] = (adc &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 	ret |= it913x_write(state, PRO_DMOD, ADC_FREQ, b, 3);</div><div class='ctx'> </div><div class='add'>+	if (state-&gt;config-&gt;adc_x2)</div><div class='add'>+		ret |= it913x_write_reg(state, PRO_DMOD, ADC_X_2, 0x01);</div><div class='add'>+	b[0] = 0;</div><div class='add'>+	b[1] = 0;</div><div class='add'>+	b[2] = 0;</div><div class='add'>+	ret |= it913x_write(state, PRO_DMOD, 0x0029, b, 3);</div><div class='add'>+</div><div class='add'>+	info("Crystal Frequency :%d Adc Frequency :%d ADC X2: %02x",</div><div class='add'>+		state-&gt;crystalFrequency, state-&gt;adcFrequency,</div><div class='add'>+			state-&gt;config-&gt;adc_x2);</div><div class='add'>+	deb_info("Xtal value :%04x Adc value :%04x", xtal, adc);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* v1 or v2 tuner script */</div><div class='add'>+	if (state-&gt;config-&gt;chip_ver &gt; 1)</div><div class='add'>+		ret = it913x_fe_script_loader(state, it9135_v2);</div><div class='add'>+	else</div><div class='add'>+		ret = it913x_fe_script_loader(state, it9135_v1);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* LNA Scripts */</div><div class='ctx'> 	switch (state-&gt;tuner_type) {</div><div class='del'>-	case IT9137: /* Tuner type 0x38 */</div><div class='del'>-		set_fe = it9137_set;</div><div class='add'>+	case IT9135_51:</div><div class='add'>+		set_lna = it9135_51;</div><div class='add'>+		break;</div><div class='add'>+	case IT9135_52:</div><div class='add'>+		set_lna = it9135_52;</div><div class='add'>+		break;</div><div class='add'>+	case IT9135_60:</div><div class='add'>+		set_lna = it9135_60;</div><div class='add'>+		break;</div><div class='add'>+	case IT9135_61:</div><div class='add'>+		set_lna = it9135_61;</div><div class='ctx'> 		break;</div><div class='add'>+	case IT9135_62:</div><div class='add'>+		set_lna = it9135_62;</div><div class='add'>+		break;</div><div class='add'>+	case IT9135_38:</div><div class='ctx'> 	default:</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		set_lna = it9135_38;</div><div class='ctx'> 	}</div><div class='add'>+	info("Tuner LNA type :%02x", state-&gt;tuner_type);</div><div class='add'>+</div><div class='add'>+	ret = it913x_fe_script_loader(state, set_lna);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (state-&gt;config-&gt;chip_ver == 2) {</div><div class='add'>+		ret = it913x_write_reg(state, PRO_DMOD, TRIGGER_OFSM, 0x1);</div><div class='add'>+		ret |= it913x_write_reg(state, PRO_LINK, PADODPU, 0x0);</div><div class='add'>+		ret |= it913x_write_reg(state, PRO_LINK, AGC_O_D, 0x0);</div><div class='add'>+		ret |= it913x_init_tuner(state);</div><div class='add'>+	}</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	/* set the demod */</div><div class='del'>-	ret = it913x_fe_script_loader(state, set_fe);</div><div class='ctx'> 	/* Always solo frontend */</div><div class='ctx'> 	set_mode = set_solo_fe;</div><div class='ctx'> 	ret |= it913x_fe_script_loader(state, set_mode);</div><div class='ctx'> </div><div class='ctx'> 	ret |= it913x_fe_suspend(state);</div><div class='del'>-	return 0;</div><div class='add'>+	return (ret &lt; 0) ? -ENODEV : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int it913x_fe_init(struct dvb_frontend *fe)</div><div class='hunk'>@@ -746,17 +875,11 @@ static int it913x_fe_init(struct dvb_frontend *fe)</div><div class='ctx'> 	/* Power Up Tuner - common all versions */</div><div class='ctx'> 	ret = it913x_write_reg(state, PRO_DMOD, 0xec40, 0x1);</div><div class='ctx'> </div><div class='del'>-	ret |= it913x_write_reg(state, PRO_DMOD, AFE_MEM0, 0x0);</div><div class='del'>-</div><div class='ctx'> 	ret |= it913x_fe_script_loader(state, init_1);</div><div class='ctx'> </div><div class='del'>-	switch (state-&gt;tuner_type) {</div><div class='del'>-	case IT9137:</div><div class='del'>-		ret |= it913x_write_reg(state, PRO_DMOD, 0xfba8, 0x0);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	ret |= it913x_write_reg(state, PRO_DMOD, AFE_MEM0, 0x0);</div><div class='add'>+</div><div class='add'>+	ret |= it913x_write_reg(state, PRO_DMOD, 0xfba8, 0x0);</div><div class='ctx'> </div><div class='ctx'> 	return (ret &lt; 0) ? -ENODEV : 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -770,19 +893,34 @@ static void it913x_fe_release(struct dvb_frontend *fe)</div><div class='ctx'> static struct dvb_frontend_ops it913x_fe_ofdm_ops;</div><div class='ctx'> </div><div class='ctx'> struct dvb_frontend *it913x_fe_attach(struct i2c_adapter *i2c_adap,</div><div class='del'>-		u8 i2c_addr, u8 adf, u8 type)</div><div class='add'>+		u8 i2c_addr, struct ite_config *config)</div><div class='ctx'> {</div><div class='ctx'> 	struct it913x_fe_state *state = NULL;</div><div class='ctx'> 	int ret;</div><div class='add'>+</div><div class='ctx'> 	/* allocate memory for the internal state */</div><div class='ctx'> 	state = kzalloc(sizeof(struct it913x_fe_state), GFP_KERNEL);</div><div class='ctx'> 	if (state == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (config == NULL)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;i2c_adap = i2c_adap;</div><div class='ctx'> 	state-&gt;i2c_addr = i2c_addr;</div><div class='del'>-	state-&gt;adf = adf;</div><div class='del'>-	state-&gt;tuner_type = type;</div><div class='add'>+	state-&gt;config = config;</div><div class='add'>+</div><div class='add'>+	switch (state-&gt;config-&gt;tuner_id_0) {</div><div class='add'>+	case IT9135_51:</div><div class='add'>+	case IT9135_52:</div><div class='add'>+	case IT9135_60:</div><div class='add'>+	case IT9135_61:</div><div class='add'>+	case IT9135_62:</div><div class='add'>+		state-&gt;tuner_type = state-&gt;config-&gt;tuner_id_0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+	case IT9135_38:</div><div class='add'>+		state-&gt;tuner_type = IT9135_38;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = it913x_fe_start(state);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -802,10 +940,9 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(it913x_fe_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops it913x_fe_ofdm_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "it913x-fe DVB-T",</div><div class='del'>-		.type			= FE_OFDM,</div><div class='ctx'> 		.frequency_min		= 51000000,</div><div class='ctx'> 		.frequency_max		= 1680000000,</div><div class='ctx'> 		.frequency_stepsize	= 62500,</div><div class='hunk'>@@ -835,5 +972,5 @@ static struct dvb_frontend_ops it913x_fe_ofdm_ops = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("it913x Frontend and it9137 tuner");</div><div class='ctx'> MODULE_AUTHOR("Malcolm Priestley tvboxspy@gmail.com");</div><div class='del'>-MODULE_VERSION("1.07");</div><div class='add'>+MODULE_VERSION("1.13");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/frontends/it913x-fe.h b/drivers/media/dvb/frontends/it913x-fe.h<br/>index 9d97f32e690b..c4a908e354e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/it913x-fe.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/it913x-fe.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/it913x-fe.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/it913x-fe.h</a></div><div class='hunk'>@@ -23,13 +23,27 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dvb/frontend.h&gt;</div><div class='ctx'> #include "dvb_frontend.h"</div><div class='add'>+</div><div class='add'>+struct ite_config {</div><div class='add'>+	u8 chip_ver;</div><div class='add'>+	u16 chip_type;</div><div class='add'>+	u32 firmware;</div><div class='add'>+	u8 firmware_ver;</div><div class='add'>+	u8 adc_x2;</div><div class='add'>+	u8 tuner_id_0;</div><div class='add'>+	u8 tuner_id_1;</div><div class='add'>+	u8 dual_mode;</div><div class='add'>+	u8 adf;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_DVB_IT913X_FE) || (defined(CONFIG_DVB_IT913X_FE_MODULE) &amp;&amp; \</div><div class='ctx'> defined(MODULE))</div><div class='ctx'> extern struct dvb_frontend *it913x_fe_attach(struct i2c_adapter *i2c_adap,</div><div class='del'>-			u8 i2c_addr, u8 adf, u8 type);</div><div class='add'>+			u8 i2c_addr, struct ite_config *config);</div><div class='ctx'> #else</div><div class='ctx'> static inline struct dvb_frontend *it913x_fe_attach(</div><div class='del'>-		struct i2c_adapter *i2c_adap,	u8 i2c_addr, u8 adf, u8 type)</div><div class='add'>+		struct i2c_adapter *i2c_adap,</div><div class='add'>+			u8 i2c_addr, struct ite_config *config)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -134,6 +148,16 @@ static inline struct dvb_frontend *it913x_fe_attach(</div><div class='ctx'> #define COEFF_1_2048		0x0001</div><div class='ctx'> #define XTAL_CLK		0x0025</div><div class='ctx'> #define BFS_FCW			0x0029</div><div class='add'>+</div><div class='add'>+/* Error Regs */</div><div class='add'>+#define RSD_ABORT_PKT_LSB	0x0032</div><div class='add'>+#define RSD_ABORT_PKT_MSB	0x0033</div><div class='add'>+#define RSD_BIT_ERR_0_7		0x0034</div><div class='add'>+#define RSD_BIT_ERR_8_15	0x0035</div><div class='add'>+#define RSD_BIT_ERR_23_16	0x0036</div><div class='add'>+#define RSD_BIT_COUNT_LSB	0x0037</div><div class='add'>+#define RSD_BIT_COUNT_MSB	0x0038</div><div class='add'>+</div><div class='ctx'> #define TPSD_LOCK		0x003c</div><div class='ctx'> #define TRAINING_MODE		0x0040</div><div class='ctx'> #define ADC_X_2			0x0045</div><div class='hunk'>@@ -144,8 +168,14 @@ static inline struct dvb_frontend *it913x_fe_attach(</div><div class='ctx'> #define EST_SIGNAL_LEVEL	0x004a</div><div class='ctx'> #define FREE_BAND		0x004b</div><div class='ctx'> #define SUSPEND_FLAG		0x004c</div><div class='del'>-/* Build in tuners */</div><div class='add'>+/* Build in tuner types */</div><div class='ctx'> #define IT9137 0x38</div><div class='add'>+#define IT9135_38 0x38</div><div class='add'>+#define IT9135_51 0x51</div><div class='add'>+#define IT9135_52 0x52</div><div class='add'>+#define IT9135_60 0x60</div><div class='add'>+#define IT9135_61 0x61</div><div class='add'>+#define IT9135_62 0x62</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	CMD_DEMOD_READ = 0,</div><div class='hunk'>@@ -193,4 +223,11 @@ enum {</div><div class='ctx'> 	WRITE_CMD,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	IT9135_AUTO = 0,</div><div class='add'>+	IT9137_FW,</div><div class='add'>+	IT9135_V1_FW,</div><div class='add'>+	IT9135_V2_FW,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif /* IT913X_FE_H */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/itd1000.c b/drivers/media/dvb/frontends/itd1000.c<br/>index aa9ccb821fa5..316457584fe7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/itd1000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/itd1000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/itd1000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/itd1000.c</a></div><div class='hunk'>@@ -250,13 +250,14 @@ static void itd1000_set_lo(struct itd1000_state *state, u32 freq_khz)</div><div class='ctx'> 	itd1000_set_vco(state, freq_khz);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int itd1000_set_parameters(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int itd1000_set_parameters(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct itd1000_state *state = fe-&gt;tuner_priv;</div><div class='ctx'> 	u8 pllcon1;</div><div class='ctx'> </div><div class='del'>-	itd1000_set_lo(state, p-&gt;frequency);</div><div class='del'>-	itd1000_set_lpf_bw(state, p-&gt;u.qpsk.symbol_rate);</div><div class='add'>+	itd1000_set_lo(state, c-&gt;frequency);</div><div class='add'>+	itd1000_set_lpf_bw(state, c-&gt;symbol_rate);</div><div class='ctx'> </div><div class='ctx'> 	pllcon1 = itd1000_read_reg(state, PLLCON1) &amp; 0x7f;</div><div class='ctx'> 	itd1000_write_reg(state, PLLCON1, pllcon1 | (1 &lt;&lt; 7));</div><div class='head'>diff --git a/drivers/media/dvb/frontends/ix2505v.c b/drivers/media/dvb/frontends/ix2505v.c<br/>index 9a517a4bf96d..bc5a82082aaa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/ix2505v.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/ix2505v.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/ix2505v.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/ix2505v.c</a></div><div class='hunk'>@@ -129,12 +129,12 @@ static int ix2505v_release(struct dvb_frontend *fe)</div><div class='ctx'>  *  1 -&gt; 8 -&gt; 6</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int ix2505v_set_params(struct dvb_frontend *fe,</div><div class='del'>-		struct dvb_frontend_parameters *params)</div><div class='add'>+static int ix2505v_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct ix2505v_state *state = fe-&gt;tuner_priv;</div><div class='del'>-	u32 frequency = params-&gt;frequency;</div><div class='del'>-	u32 b_w  = (params-&gt;u.qpsk.symbol_rate * 27) / 32000;</div><div class='add'>+	u32 frequency = c-&gt;frequency;</div><div class='add'>+	u32 b_w  = (c-&gt;symbol_rate * 27) / 32000;</div><div class='ctx'> 	u32 div_factor, N , A, x;</div><div class='ctx'> 	int ret = 0, len;</div><div class='ctx'> 	u8 gain, cc, ref, psc, local_osc, lpf;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c<br/>index 445fa1068064..36fcf559e361 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/l64781.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/l64781.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/l64781.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/l64781.c</a></div><div class='hunk'>@@ -117,18 +117,17 @@ static int reset_and_configure (struct l64781_state* state)</div><div class='ctx'> 	return (i2c_transfer(state-&gt;i2c, &amp;msg, 1) == 1) ? 0 : -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int apply_frontend_param (struct dvb_frontend* fe, struct dvb_frontend_parameters *param)</div><div class='add'>+static int apply_frontend_param(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct l64781_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	/* The coderates for FEC_NONE, FEC_4_5 and FEC_FEC_6_7 are arbitrary */</div><div class='ctx'> 	static const u8 fec_tab[] = { 7, 0, 1, 2, 9, 3, 10, 4 };</div><div class='ctx'> 	/* QPSK, QAM_16, QAM_64 */</div><div class='ctx'> 	static const u8 qam_tab [] = { 2, 4, 0, 6 };</div><div class='del'>-	static const u8 bw_tab [] = { 8, 7, 6 };  /* 8Mhz, 7MHz, 6MHz */</div><div class='ctx'> 	static const u8 guard_tab [] = { 1, 2, 4, 8 };</div><div class='ctx'> 	/* The Grundig 29504-401.04 Tuner comes with 18.432MHz crystal. */</div><div class='ctx'> 	static const u32 ppm = 8000;</div><div class='del'>-	struct dvb_ofdm_parameters *p = &amp;param-&gt;u.ofdm;</div><div class='ctx'> 	u32 ddfs_offset_fixed;</div><div class='ctx'> /*	u32 ddfs_offset_variable = 0x6000-((1000000UL+ppm)/ */</div><div class='ctx'> /*			bw_tab[p-&gt;bandWidth]&lt;&lt;10)/15625; */</div><div class='hunk'>@@ -137,18 +136,29 @@ static int apply_frontend_param (struct dvb_frontend* fe, struct dvb_frontend_pa</div><div class='ctx'> 	u8 val0x04;</div><div class='ctx'> 	u8 val0x05;</div><div class='ctx'> 	u8 val0x06;</div><div class='del'>-	int bw = p-&gt;bandwidth - BANDWIDTH_8_MHZ;</div><div class='add'>+	int bw;</div><div class='add'>+</div><div class='add'>+	switch (p-&gt;bandwidth_hz) {</div><div class='add'>+	case 8000000:</div><div class='add'>+		bw = 8;</div><div class='add'>+		break;</div><div class='add'>+	case 7000000:</div><div class='add'>+		bw = 7;</div><div class='add'>+		break;</div><div class='add'>+	case 6000000:</div><div class='add'>+		bw = 6;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (param-&gt;inversion != INVERSION_ON &amp;&amp;</div><div class='del'>-	    param-&gt;inversion != INVERSION_OFF)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (bw &lt; 0 || bw &gt; 2)</div><div class='add'>+	if (p-&gt;inversion != INVERSION_ON &amp;&amp;</div><div class='add'>+	    p-&gt;inversion != INVERSION_OFF)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;code_rate_HP != FEC_1_2 &amp;&amp; p-&gt;code_rate_HP != FEC_2_3 &amp;&amp;</div><div class='hunk'>@@ -156,14 +166,14 @@ static int apply_frontend_param (struct dvb_frontend* fe, struct dvb_frontend_pa</div><div class='ctx'> 	    p-&gt;code_rate_HP != FEC_7_8)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;hierarchy_information != HIERARCHY_NONE &amp;&amp;</div><div class='add'>+	if (p-&gt;hierarchy != HIERARCHY_NONE &amp;&amp;</div><div class='ctx'> 	    (p-&gt;code_rate_LP != FEC_1_2 &amp;&amp; p-&gt;code_rate_LP != FEC_2_3 &amp;&amp;</div><div class='ctx'> 	     p-&gt;code_rate_LP != FEC_3_4 &amp;&amp; p-&gt;code_rate_LP != FEC_5_6 &amp;&amp;</div><div class='ctx'> 	     p-&gt;code_rate_LP != FEC_7_8))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;constellation != QPSK &amp;&amp; p-&gt;constellation != QAM_16 &amp;&amp;</div><div class='del'>-	    p-&gt;constellation != QAM_64)</div><div class='add'>+	if (p-&gt;modulation != QPSK &amp;&amp; p-&gt;modulation != QAM_16 &amp;&amp;</div><div class='add'>+	    p-&gt;modulation != QAM_64)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;transmission_mode != TRANSMISSION_MODE_2K &amp;&amp;</div><div class='hunk'>@@ -174,22 +184,22 @@ static int apply_frontend_param (struct dvb_frontend* fe, struct dvb_frontend_pa</div><div class='ctx'> 	    p-&gt;guard_interval &gt; GUARD_INTERVAL_1_4)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;hierarchy_information &lt; HIERARCHY_NONE ||</div><div class='del'>-	    p-&gt;hierarchy_information &gt; HIERARCHY_4)</div><div class='add'>+	if (p-&gt;hierarchy &lt; HIERARCHY_NONE ||</div><div class='add'>+	    p-&gt;hierarchy &gt; HIERARCHY_4)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ddfs_offset_fixed = 0x4000-(ppm&lt;&lt;16)/bw_tab[p-&gt;bandwidth]/1000000;</div><div class='add'>+	ddfs_offset_fixed = 0x4000-(ppm&lt;&lt;16)/bw/1000000;</div><div class='ctx'> </div><div class='ctx'> 	/* This works up to 20000 ppm, it overflows if too large ppm! */</div><div class='ctx'> 	init_freq = (((8UL&lt;&lt;25) + (8UL&lt;&lt;19) / 25*ppm / (15625/25)) /</div><div class='del'>-			bw_tab[p-&gt;bandwidth] &amp; 0xFFFFFF);</div><div class='add'>+			bw &amp; 0xFFFFFF);</div><div class='ctx'> </div><div class='ctx'> 	/* SPI bias calculation is slightly modified to fit in 32bit */</div><div class='ctx'> 	/* will work for high ppm only... */</div><div class='ctx'> 	spi_bias = 378 * (1 &lt;&lt; 10);</div><div class='ctx'> 	spi_bias *= 16;</div><div class='del'>-	spi_bias *= bw_tab[p-&gt;bandwidth];</div><div class='del'>-	spi_bias *= qam_tab[p-&gt;constellation];</div><div class='add'>+	spi_bias *= bw;</div><div class='add'>+	spi_bias *= qam_tab[p-&gt;modulation];</div><div class='ctx'> 	spi_bias /= p-&gt;code_rate_HP + 1;</div><div class='ctx'> 	spi_bias /= (guard_tab[p-&gt;guard_interval] + 32);</div><div class='ctx'> 	spi_bias *= 1000;</div><div class='hunk'>@@ -199,10 +209,10 @@ static int apply_frontend_param (struct dvb_frontend* fe, struct dvb_frontend_pa</div><div class='ctx'> 	val0x04 = (p-&gt;transmission_mode &lt;&lt; 2) | p-&gt;guard_interval;</div><div class='ctx'> 	val0x05 = fec_tab[p-&gt;code_rate_HP];</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;hierarchy_information != HIERARCHY_NONE)</div><div class='add'>+	if (p-&gt;hierarchy != HIERARCHY_NONE)</div><div class='ctx'> 		val0x05 |= (p-&gt;code_rate_LP - FEC_1_2) &lt;&lt; 3;</div><div class='ctx'> </div><div class='del'>-	val0x06 = (p-&gt;hierarchy_information &lt;&lt; 2) | p-&gt;constellation;</div><div class='add'>+	val0x06 = (p-&gt;hierarchy &lt;&lt; 2) | p-&gt;modulation;</div><div class='ctx'> </div><div class='ctx'> 	l64781_writereg (state, 0x04, val0x04);</div><div class='ctx'> 	l64781_writereg (state, 0x05, val0x05);</div><div class='hunk'>@@ -220,7 +230,7 @@ static int apply_frontend_param (struct dvb_frontend* fe, struct dvb_frontend_pa</div><div class='ctx'> 	l64781_writereg (state, 0x1b, spi_bias &amp; 0xff);</div><div class='ctx'> 	l64781_writereg (state, 0x1c, (spi_bias &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'> 	l64781_writereg (state, 0x1d, ((spi_bias &gt;&gt; 16) &amp; 0x7f) |</div><div class='del'>-		(param-&gt;inversion == INVERSION_ON ? 0x80 : 0x00));</div><div class='add'>+		(p-&gt;inversion == INVERSION_ON ? 0x80 : 0x00));</div><div class='ctx'> </div><div class='ctx'> 	l64781_writereg (state, 0x22, ddfs_offset_fixed &amp; 0xff);</div><div class='ctx'> 	l64781_writereg (state, 0x23, (ddfs_offset_fixed &gt;&gt; 8) &amp; 0x3f);</div><div class='hunk'>@@ -233,8 +243,9 @@ static int apply_frontend_param (struct dvb_frontend* fe, struct dvb_frontend_pa</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters* param)</div><div class='add'>+static int get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct l64781_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int tmp;</div><div class='ctx'> </div><div class='hunk'>@@ -242,98 +253,95 @@ static int get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters*</div><div class='ctx'> 	tmp = l64781_readreg(state, 0x04);</div><div class='ctx'> 	switch(tmp &amp; 3) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		param-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_32;</div><div class='add'>+		p-&gt;guard_interval = GUARD_INTERVAL_1_32;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		param-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_16;</div><div class='add'>+		p-&gt;guard_interval = GUARD_INTERVAL_1_16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		param-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_8;</div><div class='add'>+		p-&gt;guard_interval = GUARD_INTERVAL_1_8;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		param-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_4;</div><div class='add'>+		p-&gt;guard_interval = GUARD_INTERVAL_1_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	switch((tmp &gt;&gt; 2) &amp; 3) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		param-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_2K;</div><div class='add'>+		p-&gt;transmission_mode = TRANSMISSION_MODE_2K;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		param-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_8K;</div><div class='add'>+		p-&gt;transmission_mode = TRANSMISSION_MODE_8K;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk("Unexpected value for transmission_mode\n");</div><div class='add'>+		printk(KERN_WARNING "Unexpected value for transmission_mode\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> 	tmp = l64781_readreg(state, 0x05);</div><div class='ctx'> 	switch(tmp &amp; 7) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		param-&gt;u.ofdm.code_rate_HP = FEC_1_2;</div><div class='add'>+		p-&gt;code_rate_HP = FEC_1_2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		param-&gt;u.ofdm.code_rate_HP = FEC_2_3;</div><div class='add'>+		p-&gt;code_rate_HP = FEC_2_3;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		param-&gt;u.ofdm.code_rate_HP = FEC_3_4;</div><div class='add'>+		p-&gt;code_rate_HP = FEC_3_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		param-&gt;u.ofdm.code_rate_HP = FEC_5_6;</div><div class='add'>+		p-&gt;code_rate_HP = FEC_5_6;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4:</div><div class='del'>-		param-&gt;u.ofdm.code_rate_HP = FEC_7_8;</div><div class='add'>+		p-&gt;code_rate_HP = FEC_7_8;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk("Unexpected value for code_rate_HP\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	switch((tmp &gt;&gt; 3) &amp; 7) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		param-&gt;u.ofdm.code_rate_LP = FEC_1_2;</div><div class='add'>+		p-&gt;code_rate_LP = FEC_1_2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		param-&gt;u.ofdm.code_rate_LP = FEC_2_3;</div><div class='add'>+		p-&gt;code_rate_LP = FEC_2_3;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		param-&gt;u.ofdm.code_rate_LP = FEC_3_4;</div><div class='add'>+		p-&gt;code_rate_LP = FEC_3_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		param-&gt;u.ofdm.code_rate_LP = FEC_5_6;</div><div class='add'>+		p-&gt;code_rate_LP = FEC_5_6;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4:</div><div class='del'>-		param-&gt;u.ofdm.code_rate_LP = FEC_7_8;</div><div class='add'>+		p-&gt;code_rate_LP = FEC_7_8;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk("Unexpected value for code_rate_LP\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	tmp = l64781_readreg(state, 0x06);</div><div class='ctx'> 	switch(tmp &amp; 3) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		param-&gt;u.ofdm.constellation = QPSK;</div><div class='add'>+		p-&gt;modulation = QPSK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		param-&gt;u.ofdm.constellation = QAM_16;</div><div class='add'>+		p-&gt;modulation = QAM_16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		param-&gt;u.ofdm.constellation = QAM_64;</div><div class='add'>+		p-&gt;modulation = QAM_64;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk("Unexpected value for constellation\n");</div><div class='add'>+		printk(KERN_WARNING "Unexpected value for modulation\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	switch((tmp &gt;&gt; 2) &amp; 7) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		param-&gt;u.ofdm.hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_NONE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		param-&gt;u.ofdm.hierarchy_information = HIERARCHY_1;</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		param-&gt;u.ofdm.hierarchy_information = HIERARCHY_2;</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		param-&gt;u.ofdm.hierarchy_information = HIERARCHY_4;</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk("Unexpected value for hierarchy\n");</div><div class='hunk'>@@ -341,12 +349,12 @@ static int get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters*</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	tmp = l64781_readreg (state, 0x1d);</div><div class='del'>-	param-&gt;inversion = (tmp &amp; 0x80) ? INVERSION_ON : INVERSION_OFF;</div><div class='add'>+	p-&gt;inversion = (tmp &amp; 0x80) ? INVERSION_ON : INVERSION_OFF;</div><div class='ctx'> </div><div class='ctx'> 	tmp = (int) (l64781_readreg (state, 0x08) |</div><div class='ctx'> 		     (l64781_readreg (state, 0x09) &lt;&lt; 8) |</div><div class='ctx'> 		     (l64781_readreg (state, 0x0a) &lt;&lt; 16));</div><div class='del'>-	param-&gt;frequency += tmp;</div><div class='add'>+	p-&gt;frequency += tmp;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -564,10 +572,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops l64781_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "LSI L64781 DVB-T",</div><div class='del'>-		.type = FE_OFDM,</div><div class='ctx'> 	/*	.frequency_min = ???,*/</div><div class='ctx'> 	/*	.frequency_max = ???,*/</div><div class='ctx'> 		.frequency_stepsize = 166666,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/lgdt3305.c b/drivers/media/dvb/frontends/lgdt3305.c<br/>index 3272881cb112..1d2c47378cf8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/lgdt3305.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/lgdt3305.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/lgdt3305.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/lgdt3305.c</a></div><div class='hunk'>@@ -266,7 +266,7 @@ fail:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lgdt3305_set_modulation(struct lgdt3305_state *state,</div><div class='del'>-				   struct dvb_frontend_parameters *param)</div><div class='add'>+				   struct dtv_frontend_properties *p)</div><div class='ctx'> {</div><div class='ctx'> 	u8 opermode;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -279,7 +279,7 @@ static int lgdt3305_set_modulation(struct lgdt3305_state *state,</div><div class='ctx'> </div><div class='ctx'> 	opermode &amp;= ~0x03;</div><div class='ctx'> </div><div class='del'>-	switch (param-&gt;u.vsb.modulation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 	case VSB_8:</div><div class='ctx'> 		opermode |= 0x03;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -298,11 +298,11 @@ fail:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lgdt3305_set_filter_extension(struct lgdt3305_state *state,</div><div class='del'>-					 struct dvb_frontend_parameters *param)</div><div class='add'>+					 struct dtv_frontend_properties *p)</div><div class='ctx'> {</div><div class='ctx'> 	int val;</div><div class='ctx'> </div><div class='del'>-	switch (param-&gt;u.vsb.modulation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 	case VSB_8:</div><div class='ctx'> 		val = 0;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -321,11 +321,11 @@ static int lgdt3305_set_filter_extension(struct lgdt3305_state *state,</div><div class='ctx'> /* ------------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='ctx'> static int lgdt3305_passband_digital_agc(struct lgdt3305_state *state,</div><div class='del'>-					 struct dvb_frontend_parameters *param)</div><div class='add'>+					 struct dtv_frontend_properties *p)</div><div class='ctx'> {</div><div class='ctx'> 	u16 agc_ref;</div><div class='ctx'> </div><div class='del'>-	switch (param-&gt;u.vsb.modulation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 	case VSB_8:</div><div class='ctx'> 		agc_ref = 0x32c4;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -348,11 +348,11 @@ static int lgdt3305_passband_digital_agc(struct lgdt3305_state *state,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lgdt3305_rfagc_loop(struct lgdt3305_state *state,</div><div class='del'>-			       struct dvb_frontend_parameters *param)</div><div class='add'>+			       struct dtv_frontend_properties *p)</div><div class='ctx'> {</div><div class='ctx'> 	u16 ifbw, rfbw, agcdelay;</div><div class='ctx'> </div><div class='del'>-	switch (param-&gt;u.vsb.modulation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 	case VSB_8:</div><div class='ctx'> 		agcdelay = 0x04c0;</div><div class='ctx'> 		rfbw     = 0x8000;</div><div class='hunk'>@@ -398,11 +398,11 @@ static int lgdt3305_rfagc_loop(struct lgdt3305_state *state,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lgdt3305_agc_setup(struct lgdt3305_state *state,</div><div class='del'>-			      struct dvb_frontend_parameters *param)</div><div class='add'>+			      struct dtv_frontend_properties *p)</div><div class='ctx'> {</div><div class='ctx'> 	int lockdten, acqen;</div><div class='ctx'> </div><div class='del'>-	switch (param-&gt;u.vsb.modulation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 	case VSB_8:</div><div class='ctx'> 		lockdten = 0;</div><div class='ctx'> 		acqen = 0;</div><div class='hunk'>@@ -432,15 +432,15 @@ static int lgdt3305_agc_setup(struct lgdt3305_state *state,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return lgdt3305_rfagc_loop(state, param);</div><div class='add'>+	return lgdt3305_rfagc_loop(state, p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lgdt3305_set_agc_power_ref(struct lgdt3305_state *state,</div><div class='del'>-				      struct dvb_frontend_parameters *param)</div><div class='add'>+				      struct dtv_frontend_properties *p)</div><div class='ctx'> {</div><div class='ctx'> 	u16 usref = 0;</div><div class='ctx'> </div><div class='del'>-	switch (param-&gt;u.vsb.modulation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 	case VSB_8:</div><div class='ctx'> 		if (state-&gt;cfg-&gt;usref_8vsb)</div><div class='ctx'> 			usref = state-&gt;cfg-&gt;usref_8vsb;</div><div class='hunk'>@@ -473,14 +473,14 @@ static int lgdt3305_set_agc_power_ref(struct lgdt3305_state *state,</div><div class='ctx'> /* ------------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='ctx'> static int lgdt3305_spectral_inversion(struct lgdt3305_state *state,</div><div class='del'>-				       struct dvb_frontend_parameters *param,</div><div class='add'>+				       struct dtv_frontend_properties *p,</div><div class='ctx'> 				       int inversion)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	lg_dbg("(%d)\n", inversion);</div><div class='ctx'> </div><div class='del'>-	switch (param-&gt;u.vsb.modulation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 	case VSB_8:</div><div class='ctx'> 		ret = lgdt3305_write_reg(state, LGDT3305_CR_CTRL_7,</div><div class='ctx'> 					 inversion ? 0xf9 : 0x79);</div><div class='hunk'>@@ -497,13 +497,13 @@ static int lgdt3305_spectral_inversion(struct lgdt3305_state *state,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lgdt3305_set_if(struct lgdt3305_state *state,</div><div class='del'>-			   struct dvb_frontend_parameters *param)</div><div class='add'>+			   struct dtv_frontend_properties *p)</div><div class='ctx'> {</div><div class='ctx'> 	u16 if_freq_khz;</div><div class='ctx'> 	u8 nco1, nco2, nco3, nco4;</div><div class='ctx'> 	u64 nco;</div><div class='ctx'> </div><div class='del'>-	switch (param-&gt;u.vsb.modulation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 	case VSB_8:</div><div class='ctx'> 		if_freq_khz = state-&gt;cfg-&gt;vsb_if_khz;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -517,7 +517,7 @@ static int lgdt3305_set_if(struct lgdt3305_state *state,</div><div class='ctx'> </div><div class='ctx'> 	nco = if_freq_khz / 10;</div><div class='ctx'> </div><div class='del'>-	switch (param-&gt;u.vsb.modulation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 	case VSB_8:</div><div class='ctx'> 		nco &lt;&lt;= 24;</div><div class='ctx'> 		do_div(nco, 625);</div><div class='hunk'>@@ -677,37 +677,37 @@ fail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lgdt3304_set_parameters(struct dvb_frontend *fe,</div><div class='del'>-				   struct dvb_frontend_parameters *param)</div><div class='add'>+static int lgdt3304_set_parameters(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct lgdt3305_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	lg_dbg("(%d, %d)\n", param-&gt;frequency, param-&gt;u.vsb.modulation);</div><div class='add'>+	lg_dbg("(%d, %d)\n", p-&gt;frequency, p-&gt;modulation);</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		ret = fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+		ret = fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 		if (lg_fail(ret))</div><div class='ctx'> 			goto fail;</div><div class='del'>-		state-&gt;current_frequency = param-&gt;frequency;</div><div class='add'>+		state-&gt;current_frequency = p-&gt;frequency;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = lgdt3305_set_modulation(state, param);</div><div class='add'>+	ret = lgdt3305_set_modulation(state, p);</div><div class='ctx'> 	if (lg_fail(ret))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	ret = lgdt3305_passband_digital_agc(state, param);</div><div class='add'>+	ret = lgdt3305_passband_digital_agc(state, p);</div><div class='ctx'> 	if (lg_fail(ret))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	ret = lgdt3305_agc_setup(state, param);</div><div class='add'>+	ret = lgdt3305_agc_setup(state, p);</div><div class='ctx'> 	if (lg_fail(ret))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	/* reg 0x030d is 3304-only... seen in vsb and qam usbsnoops... */</div><div class='del'>-	switch (param-&gt;u.vsb.modulation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 	case VSB_8:</div><div class='ctx'> 		lgdt3305_write_reg(state, 0x030d, 0x00);</div><div class='ctx'> 		lgdt3305_write_reg(state, LGDT3305_CR_CTR_FREQ_1, 0x4f);</div><div class='hunk'>@@ -718,7 +718,7 @@ static int lgdt3304_set_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 	case QAM_64:</div><div class='ctx'> 	case QAM_256:</div><div class='ctx'> 		lgdt3305_write_reg(state, 0x030d, 0x14);</div><div class='del'>-		ret = lgdt3305_set_if(state, param);</div><div class='add'>+		ret = lgdt3305_set_if(state, p);</div><div class='ctx'> 		if (lg_fail(ret))</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -727,13 +727,13 @@ static int lgdt3304_set_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	ret = lgdt3305_spectral_inversion(state, param,</div><div class='add'>+	ret = lgdt3305_spectral_inversion(state, p,</div><div class='ctx'> 					  state-&gt;cfg-&gt;spectral_inversion</div><div class='ctx'> 					  ? 1 : 0);</div><div class='ctx'> 	if (lg_fail(ret))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	state-&gt;current_modulation = param-&gt;u.vsb.modulation;</div><div class='add'>+	state-&gt;current_modulation = p-&gt;modulation;</div><div class='ctx'> </div><div class='ctx'> 	ret = lgdt3305_mpeg_mode(state, state-&gt;cfg-&gt;mpeg_mode);</div><div class='ctx'> 	if (lg_fail(ret))</div><div class='hunk'>@@ -747,34 +747,34 @@ fail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lgdt3305_set_parameters(struct dvb_frontend *fe,</div><div class='del'>-				   struct dvb_frontend_parameters *param)</div><div class='add'>+static int lgdt3305_set_parameters(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct lgdt3305_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	lg_dbg("(%d, %d)\n", param-&gt;frequency, param-&gt;u.vsb.modulation);</div><div class='add'>+	lg_dbg("(%d, %d)\n", p-&gt;frequency, p-&gt;modulation);</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		ret = fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+		ret = fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 		if (lg_fail(ret))</div><div class='ctx'> 			goto fail;</div><div class='del'>-		state-&gt;current_frequency = param-&gt;frequency;</div><div class='add'>+		state-&gt;current_frequency = p-&gt;frequency;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = lgdt3305_set_modulation(state, param);</div><div class='add'>+	ret = lgdt3305_set_modulation(state, p);</div><div class='ctx'> 	if (lg_fail(ret))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	ret = lgdt3305_passband_digital_agc(state, param);</div><div class='add'>+	ret = lgdt3305_passband_digital_agc(state, p);</div><div class='ctx'> 	if (lg_fail(ret))</div><div class='ctx'> 		goto fail;</div><div class='del'>-	ret = lgdt3305_set_agc_power_ref(state, param);</div><div class='add'>+	ret = lgdt3305_set_agc_power_ref(state, p);</div><div class='ctx'> 	if (lg_fail(ret))</div><div class='ctx'> 		goto fail;</div><div class='del'>-	ret = lgdt3305_agc_setup(state, param);</div><div class='add'>+	ret = lgdt3305_agc_setup(state, p);</div><div class='ctx'> 	if (lg_fail(ret))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -786,20 +786,20 @@ static int lgdt3305_set_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 	if (lg_fail(ret))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	ret = lgdt3305_set_if(state, param);</div><div class='add'>+	ret = lgdt3305_set_if(state, p);</div><div class='ctx'> 	if (lg_fail(ret))</div><div class='ctx'> 		goto fail;</div><div class='del'>-	ret = lgdt3305_spectral_inversion(state, param,</div><div class='add'>+	ret = lgdt3305_spectral_inversion(state, p,</div><div class='ctx'> 					  state-&gt;cfg-&gt;spectral_inversion</div><div class='ctx'> 					  ? 1 : 0);</div><div class='ctx'> 	if (lg_fail(ret))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	ret = lgdt3305_set_filter_extension(state, param);</div><div class='add'>+	ret = lgdt3305_set_filter_extension(state, p);</div><div class='ctx'> 	if (lg_fail(ret))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	state-&gt;current_modulation = param-&gt;u.vsb.modulation;</div><div class='add'>+	state-&gt;current_modulation = p-&gt;modulation;</div><div class='ctx'> </div><div class='ctx'> 	ret = lgdt3305_mpeg_mode(state, state-&gt;cfg-&gt;mpeg_mode);</div><div class='ctx'> 	if (lg_fail(ret))</div><div class='hunk'>@@ -813,15 +813,15 @@ fail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lgdt3305_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-				 struct dvb_frontend_parameters *param)</div><div class='add'>+static int lgdt3305_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct lgdt3305_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	lg_dbg("\n");</div><div class='ctx'> </div><div class='del'>-	param-&gt;u.vsb.modulation = state-&gt;current_modulation;</div><div class='del'>-	param-&gt;frequency = state-&gt;current_frequency;</div><div class='add'>+	p-&gt;modulation = state-&gt;current_modulation;</div><div class='add'>+	p-&gt;frequency = state-&gt;current_frequency;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1166,9 +1166,9 @@ fail:</div><div class='ctx'> EXPORT_SYMBOL(lgdt3305_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops lgdt3304_ops = {</div><div class='add'>+	.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "LG Electronics LGDT3304 VSB/QAM Frontend",</div><div class='del'>-		.type               = FE_ATSC,</div><div class='ctx'> 		.frequency_min      = 54000000,</div><div class='ctx'> 		.frequency_max      = 858000000,</div><div class='ctx'> 		.frequency_stepsize = 62500,</div><div class='hunk'>@@ -1188,9 +1188,9 @@ static struct dvb_frontend_ops lgdt3304_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops lgdt3305_ops = {</div><div class='add'>+	.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "LG Electronics LGDT3305 VSB/QAM Frontend",</div><div class='del'>-		.type               = FE_ATSC,</div><div class='ctx'> 		.frequency_min      = 54000000,</div><div class='ctx'> 		.frequency_max      = 858000000,</div><div class='ctx'> 		.frequency_stepsize = 62500,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c<br/>index 43971e63baa7..c990d35a13dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/lgdt330x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/lgdt330x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/lgdt330x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/lgdt330x.c</a></div><div class='hunk'>@@ -288,6 +288,8 @@ static int lgdt330x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u8 buf[2];</div><div class='ctx'> </div><div class='add'>+	*ucblocks = 0;</div><div class='add'>+</div><div class='ctx'> 	switch (state-&gt;config-&gt;demod_chip) {</div><div class='ctx'> 	case LGDT3302:</div><div class='ctx'> 		err = i2c_read_demod_bytes(state, LGDT3302_PACKET_ERR_COUNTER1,</div><div class='hunk'>@@ -302,14 +304,16 @@ static int lgdt330x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)</div><div class='ctx'> 		       "Only LGDT3302 and LGDT3303 are supported chips.\n");</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	*ucblocks = (buf[0] &lt;&lt; 8) | buf[1];</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lgdt330x_set_parameters(struct dvb_frontend* fe,</div><div class='del'>-				   struct dvb_frontend_parameters *param)</div><div class='add'>+static int lgdt330x_set_parameters(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Array of byte pairs &lt;address, value&gt;</div><div class='ctx'> 	 * to initialize 8VSB for lgdt3303 chip 50 MHz IF</div><div class='hunk'>@@ -343,10 +347,10 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,</div><div class='ctx'> </div><div class='ctx'> 	static u8 top_ctrl_cfg[]   = { TOP_CONTROL, 0x03 };</div><div class='ctx'> </div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	/* Change only if we are actually changing the modulation */</div><div class='del'>-	if (state-&gt;current_modulation != param-&gt;u.vsb.modulation) {</div><div class='del'>-		switch(param-&gt;u.vsb.modulation) {</div><div class='add'>+	if (state-&gt;current_modulation != p-&gt;modulation) {</div><div class='add'>+		switch (p-&gt;modulation) {</div><div class='ctx'> 		case VSB_8:</div><div class='ctx'> 			dprintk("%s: VSB_8 MODE\n", __func__);</div><div class='ctx'> </div><div class='hunk'>@@ -395,9 +399,14 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			printk(KERN_WARNING "lgdt330x: %s: Modulation type(%d) UNSUPPORTED\n", __func__, param-&gt;u.vsb.modulation);</div><div class='add'>+			printk(KERN_WARNING "lgdt330x: %s: Modulation type(%d) UNSUPPORTED\n", __func__, p-&gt;modulation);</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			printk(KERN_WARNING "lgdt330x: %s: error blasting "</div><div class='add'>+			       "bytes to lgdt3303 for modulation type(%d)\n",</div><div class='add'>+			       __func__, p-&gt;modulation);</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * select serial or parallel MPEG harware interface</div><div class='ctx'> 		 * Serial:   0x04 for LGDT3302 or 0x40 for LGDT3303</div><div class='hunk'>@@ -410,29 +419,29 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,</div><div class='ctx'> 				      sizeof(top_ctrl_cfg));</div><div class='ctx'> 		if (state-&gt;config-&gt;set_ts_params)</div><div class='ctx'> 			state-&gt;config-&gt;set_ts_params(fe, 0);</div><div class='del'>-		state-&gt;current_modulation = param-&gt;u.vsb.modulation;</div><div class='add'>+		state-&gt;current_modulation = p-&gt;modulation;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Tune to the specified frequency */</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Keep track of the new frequency */</div><div class='ctx'> 	/* FIXME this is the wrong way to do this...           */</div><div class='ctx'> 	/* The tuner is shared with the video4linux analog API */</div><div class='del'>-	state-&gt;current_frequency = param-&gt;frequency;</div><div class='add'>+	state-&gt;current_frequency = p-&gt;frequency;</div><div class='ctx'> </div><div class='ctx'> 	lgdt330x_SwReset(state);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lgdt330x_get_frontend(struct dvb_frontend* fe,</div><div class='del'>-				 struct dvb_frontend_parameters* param)</div><div class='add'>+static int lgdt330x_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct lgdt330x_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	param-&gt;frequency = state-&gt;current_frequency;</div><div class='add'>+	p-&gt;frequency = state-&gt;current_frequency;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -762,9 +771,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops lgdt3302_ops = {</div><div class='add'>+	.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name= "LG Electronics LGDT3302 VSB/QAM Frontend",</div><div class='del'>-		.type = FE_ATSC,</div><div class='ctx'> 		.frequency_min= 54000000,</div><div class='ctx'> 		.frequency_max= 858000000,</div><div class='ctx'> 		.frequency_stepsize= 62500,</div><div class='hunk'>@@ -785,9 +794,9 @@ static struct dvb_frontend_ops lgdt3302_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops lgdt3303_ops = {</div><div class='add'>+	.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name= "LG Electronics LGDT3303 VSB/QAM Frontend",</div><div class='del'>-		.type = FE_ATSC,</div><div class='ctx'> 		.frequency_min= 54000000,</div><div class='ctx'> 		.frequency_max= 858000000,</div><div class='ctx'> 		.frequency_stepsize= 62500,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/lgs8gl5.c b/drivers/media/dvb/frontends/lgs8gl5.c<br/>index bb37ed289a05..2cec8041a106 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/lgs8gl5.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/lgs8gl5.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/lgs8gl5.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/lgs8gl5.c</a></div><div class='hunk'>@@ -311,18 +311,18 @@ lgs8gl5_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-lgs8gl5_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-		struct dvb_frontend_parameters *p)</div><div class='add'>+lgs8gl5_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct lgs8gl5_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;u.ofdm.bandwidth != BANDWIDTH_8_MHZ)</div><div class='add'>+	if (p-&gt;bandwidth_hz != 8000000)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -336,22 +336,21 @@ lgs8gl5_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-lgs8gl5_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-		struct dvb_frontend_parameters *p)</div><div class='add'>+lgs8gl5_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct lgs8gl5_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u8 inv = lgs8gl5_read_reg(state, REG_INVERSION);</div><div class='del'>-	struct dvb_ofdm_parameters *o = &amp;p-&gt;u.ofdm;</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;inversion = (inv &amp; REG_INVERSION_ON) ? INVERSION_ON : INVERSION_OFF;</div><div class='ctx'> </div><div class='del'>-	o-&gt;code_rate_HP = FEC_1_2;</div><div class='del'>-	o-&gt;code_rate_LP = FEC_7_8;</div><div class='del'>-	o-&gt;guard_interval = GUARD_INTERVAL_1_32;</div><div class='del'>-	o-&gt;transmission_mode = TRANSMISSION_MODE_2K;</div><div class='del'>-	o-&gt;constellation = QAM_64;</div><div class='del'>-	o-&gt;hierarchy_information = HIERARCHY_NONE;</div><div class='del'>-	o-&gt;bandwidth = BANDWIDTH_8_MHZ;</div><div class='add'>+	p-&gt;code_rate_HP = FEC_1_2;</div><div class='add'>+	p-&gt;code_rate_LP = FEC_7_8;</div><div class='add'>+	p-&gt;guard_interval = GUARD_INTERVAL_1_32;</div><div class='add'>+	p-&gt;transmission_mode = TRANSMISSION_MODE_2K;</div><div class='add'>+	p-&gt;modulation = QAM_64;</div><div class='add'>+	p-&gt;hierarchy = HIERARCHY_NONE;</div><div class='add'>+	p-&gt;bandwidth_hz = 8000000;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -413,9 +412,9 @@ EXPORT_SYMBOL(lgs8gl5_attach);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops lgs8gl5_ops = {</div><div class='add'>+	.delsys = { SYS_DMBTH },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Legend Silicon LGS-8GL5 DMB-TH",</div><div class='del'>-		.type			= FE_OFDM,</div><div class='ctx'> 		.frequency_min		= 474000000,</div><div class='ctx'> 		.frequency_max		= 858000000,</div><div class='ctx'> 		.frequency_stepsize	= 10000,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/lgs8gxx.c b/drivers/media/dvb/frontends/lgs8gxx.c<br/>index 1172b54689f8..4de1d3520cd2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/lgs8gxx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/lgs8gxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/lgs8gxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/lgs8gxx.c</a></div><div class='hunk'>@@ -669,16 +669,16 @@ static int lgs8gxx_write(struct dvb_frontend *fe, const u8 buf[], int len)</div><div class='ctx'> 	return lgs8gxx_write_reg(priv, buf[0], buf[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lgs8gxx_set_fe(struct dvb_frontend *fe,</div><div class='del'>-			  struct dvb_frontend_parameters *fe_params)</div><div class='add'>+static int lgs8gxx_set_fe(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+</div><div class='ctx'> 	struct lgs8gxx_state *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* set frequency */</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, fe_params);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -691,9 +691,9 @@ static int lgs8gxx_set_fe(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lgs8gxx_get_fe(struct dvb_frontend *fe,</div><div class='del'>-			  struct dvb_frontend_parameters *fe_params)</div><div class='add'>+static int lgs8gxx_get_fe(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fe_params = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	dprintk("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: get real readings from device */</div><div class='hunk'>@@ -701,21 +701,21 @@ static int lgs8gxx_get_fe(struct dvb_frontend *fe,</div><div class='ctx'> 	fe_params-&gt;inversion = INVERSION_OFF;</div><div class='ctx'> </div><div class='ctx'> 	/* bandwidth */</div><div class='del'>-	fe_params-&gt;u.ofdm.bandwidth = BANDWIDTH_8_MHZ;</div><div class='add'>+	fe_params-&gt;bandwidth_hz = 8000000;</div><div class='ctx'> </div><div class='del'>-	fe_params-&gt;u.ofdm.code_rate_HP = FEC_AUTO;</div><div class='del'>-	fe_params-&gt;u.ofdm.code_rate_LP = FEC_AUTO;</div><div class='add'>+	fe_params-&gt;code_rate_HP = FEC_AUTO;</div><div class='add'>+	fe_params-&gt;code_rate_LP = FEC_AUTO;</div><div class='ctx'> </div><div class='del'>-	fe_params-&gt;u.ofdm.constellation = QAM_AUTO;</div><div class='add'>+	fe_params-&gt;modulation = QAM_AUTO;</div><div class='ctx'> </div><div class='ctx'> 	/* transmission mode */</div><div class='del'>-	fe_params-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_AUTO;</div><div class='add'>+	fe_params-&gt;transmission_mode = TRANSMISSION_MODE_AUTO;</div><div class='ctx'> </div><div class='ctx'> 	/* guard interval */</div><div class='del'>-	fe_params-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_AUTO;</div><div class='add'>+	fe_params-&gt;guard_interval = GUARD_INTERVAL_AUTO;</div><div class='ctx'> </div><div class='ctx'> 	/* hierarchy */</div><div class='del'>-	fe_params-&gt;u.ofdm.hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+	fe_params-&gt;hierarchy = HIERARCHY_NONE;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -994,9 +994,9 @@ static int lgs8gxx_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops lgs8gxx_ops = {</div><div class='add'>+	.delsys = { SYS_DMBTH },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "Legend Silicon LGS8913/LGS8GXX DMB-TH",</div><div class='del'>-		.type = FE_OFDM,</div><div class='ctx'> 		.frequency_min = 474000000,</div><div class='ctx'> 		.frequency_max = 858000000,</div><div class='ctx'> 		.frequency_stepsize = 10000,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/mb86a16.c b/drivers/media/dvb/frontends/mb86a16.c<br/>index c283112051b1..9ae40abfd71a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/mb86a16.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/mb86a16.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/mb86a16.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/mb86a16.c</a></div><div class='hunk'>@@ -1621,13 +1621,13 @@ err:</div><div class='ctx'> 	return -EREMOTEIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static enum dvbfe_search mb86a16_search(struct dvb_frontend *fe,</div><div class='del'>-					struct dvb_frontend_parameters *p)</div><div class='add'>+static enum dvbfe_search mb86a16_search(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct mb86a16_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;frequency = p-&gt;frequency / 1000;</div><div class='del'>-	state-&gt;srate = p-&gt;u.qpsk.symbol_rate / 1000;</div><div class='add'>+	state-&gt;srate = p-&gt;symbol_rate / 1000;</div><div class='ctx'> </div><div class='ctx'> 	if (!mb86a16_set_fe(state)) {</div><div class='ctx'> 		dprintk(verbose, MB86A16_ERROR, 1, "Successfully acquired LOCK");</div><div class='hunk'>@@ -1814,9 +1814,9 @@ static enum dvbfe_algo mb86a16_frontend_algo(struct dvb_frontend *fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops mb86a16_ops = {</div><div class='add'>+	.delsys = { SYS_DVBS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Fujitsu MB86A16 DVB-S",</div><div class='del'>-		.type			= FE_QPSK,</div><div class='ctx'> 		.frequency_min		= 950000,</div><div class='ctx'> 		.frequency_max		= 2150000,</div><div class='ctx'> 		.frequency_stepsize	= 3000,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/mb86a20s.c b/drivers/media/dvb/frontends/mb86a20s.c<br/>index 0f867a5055fb..fade566927c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/mb86a20s.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/mb86a20s.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/mb86a20s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/mb86a20s.c</a></div><div class='hunk'>@@ -61,244 +61,111 @@ static struct regdata mb86a20s_init[] = {</div><div class='ctx'> 	{ 0x70, 0xff },</div><div class='ctx'> 	{ 0x08, 0x01 },</div><div class='ctx'> 	{ 0x09, 0x3e },</div><div class='del'>-	{ 0x50, 0xd1 },</div><div class='del'>-	{ 0x51, 0x22 },</div><div class='add'>+	{ 0x50, 0xd1 }, { 0x51, 0x22 },</div><div class='ctx'> 	{ 0x39, 0x01 },</div><div class='ctx'> 	{ 0x71, 0x00 },</div><div class='del'>-	{ 0x28, 0x2a },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0xff },</div><div class='del'>-	{ 0x2b, 0x80 },</div><div class='del'>-	{ 0x28, 0x20 },</div><div class='del'>-	{ 0x29, 0x33 },</div><div class='del'>-	{ 0x2a, 0xdf },</div><div class='del'>-	{ 0x2b, 0xa9 },</div><div class='add'>+	{ 0x28, 0x2a }, { 0x29, 0x00 }, { 0x2a, 0xff }, { 0x2b, 0x80 },</div><div class='add'>+	{ 0x28, 0x20 }, { 0x29, 0x33 }, { 0x2a, 0xdf }, { 0x2b, 0xa9 },</div><div class='add'>+	{ 0x28, 0x22 }, { 0x29, 0x00 }, { 0x2a, 0x1f }, { 0x2b, 0xf0 },</div><div class='ctx'> 	{ 0x3b, 0x21 },</div><div class='ctx'> 	{ 0x3c, 0x3a },</div><div class='ctx'> 	{ 0x01, 0x0d },</div><div class='del'>-	{ 0x04, 0x08 },</div><div class='del'>-	{ 0x05, 0x05 },</div><div class='del'>-	{ 0x04, 0x0e },</div><div class='del'>-	{ 0x05, 0x00 },</div><div class='del'>-	{ 0x04, 0x0f },</div><div class='del'>-	{ 0x05, 0x14 },</div><div class='del'>-	{ 0x04, 0x0b },</div><div class='del'>-	{ 0x05, 0x8c },</div><div class='del'>-	{ 0x04, 0x00 },</div><div class='del'>-	{ 0x05, 0x00 },</div><div class='del'>-	{ 0x04, 0x01 },</div><div class='del'>-	{ 0x05, 0x07 },</div><div class='del'>-	{ 0x04, 0x02 },</div><div class='del'>-	{ 0x05, 0x0f },</div><div class='del'>-	{ 0x04, 0x03 },</div><div class='del'>-	{ 0x05, 0xa0 },</div><div class='del'>-	{ 0x04, 0x09 },</div><div class='del'>-	{ 0x05, 0x00 },</div><div class='del'>-	{ 0x04, 0x0a },</div><div class='del'>-	{ 0x05, 0xff },</div><div class='del'>-	{ 0x04, 0x27 },</div><div class='del'>-	{ 0x05, 0x64 },</div><div class='del'>-	{ 0x04, 0x28 },</div><div class='del'>-	{ 0x05, 0x00 },</div><div class='del'>-	{ 0x04, 0x1e },</div><div class='del'>-	{ 0x05, 0xff },</div><div class='del'>-	{ 0x04, 0x29 },</div><div class='del'>-	{ 0x05, 0x0a },</div><div class='del'>-	{ 0x04, 0x32 },</div><div class='del'>-	{ 0x05, 0x0a },</div><div class='del'>-	{ 0x04, 0x14 },</div><div class='del'>-	{ 0x05, 0x02 },</div><div class='del'>-	{ 0x04, 0x04 },</div><div class='del'>-	{ 0x05, 0x00 },</div><div class='del'>-	{ 0x04, 0x05 },</div><div class='del'>-	{ 0x05, 0x22 },</div><div class='del'>-	{ 0x04, 0x06 },</div><div class='del'>-	{ 0x05, 0x0e },</div><div class='del'>-	{ 0x04, 0x07 },</div><div class='del'>-	{ 0x05, 0xd8 },</div><div class='del'>-	{ 0x04, 0x12 },</div><div class='del'>-	{ 0x05, 0x00 },</div><div class='del'>-	{ 0x04, 0x13 },</div><div class='del'>-	{ 0x05, 0xff },</div><div class='add'>+	{ 0x04, 0x08 }, { 0x05, 0x05 },</div><div class='add'>+	{ 0x04, 0x0e }, { 0x05, 0x00 },</div><div class='add'>+	{ 0x04, 0x0f }, { 0x05, 0x14 },</div><div class='add'>+	{ 0x04, 0x0b }, { 0x05, 0x8c },</div><div class='add'>+	{ 0x04, 0x00 }, { 0x05, 0x00 },</div><div class='add'>+	{ 0x04, 0x01 }, { 0x05, 0x07 },</div><div class='add'>+	{ 0x04, 0x02 }, { 0x05, 0x0f },</div><div class='add'>+	{ 0x04, 0x03 }, { 0x05, 0xa0 },</div><div class='add'>+	{ 0x04, 0x09 }, { 0x05, 0x00 },</div><div class='add'>+	{ 0x04, 0x0a }, { 0x05, 0xff },</div><div class='add'>+	{ 0x04, 0x27 }, { 0x05, 0x64 },</div><div class='add'>+	{ 0x04, 0x28 }, { 0x05, 0x00 },</div><div class='add'>+	{ 0x04, 0x1e }, { 0x05, 0xff },</div><div class='add'>+	{ 0x04, 0x29 }, { 0x05, 0x0a },</div><div class='add'>+	{ 0x04, 0x32 }, { 0x05, 0x0a },</div><div class='add'>+	{ 0x04, 0x14 }, { 0x05, 0x02 },</div><div class='add'>+	{ 0x04, 0x04 }, { 0x05, 0x00 },</div><div class='add'>+	{ 0x04, 0x05 }, { 0x05, 0x22 },</div><div class='add'>+	{ 0x04, 0x06 }, { 0x05, 0x0e },</div><div class='add'>+	{ 0x04, 0x07 }, { 0x05, 0xd8 },</div><div class='add'>+	{ 0x04, 0x12 }, { 0x05, 0x00 },</div><div class='add'>+	{ 0x04, 0x13 }, { 0x05, 0xff },</div><div class='add'>+	{ 0x04, 0x15 }, { 0x05, 0x4e },</div><div class='add'>+	{ 0x04, 0x16 }, { 0x05, 0x20 },</div><div class='ctx'> 	{ 0x52, 0x01 },</div><div class='del'>-	{ 0x50, 0xa7 },</div><div class='del'>-	{ 0x51, 0x00 },</div><div class='del'>-	{ 0x50, 0xa8 },</div><div class='del'>-	{ 0x51, 0xff },</div><div class='del'>-	{ 0x50, 0xa9 },</div><div class='del'>-	{ 0x51, 0xff },</div><div class='del'>-	{ 0x50, 0xaa },</div><div class='del'>-	{ 0x51, 0x00 },</div><div class='del'>-	{ 0x50, 0xab },</div><div class='del'>-	{ 0x51, 0xff },</div><div class='del'>-	{ 0x50, 0xac },</div><div class='del'>-	{ 0x51, 0xff },</div><div class='del'>-	{ 0x50, 0xad },</div><div class='del'>-	{ 0x51, 0x00 },</div><div class='del'>-	{ 0x50, 0xae },</div><div class='del'>-	{ 0x51, 0xff },</div><div class='del'>-	{ 0x50, 0xaf },</div><div class='del'>-	{ 0x51, 0xff },</div><div class='add'>+	{ 0x50, 0xa7 }, { 0x51, 0xff },</div><div class='add'>+	{ 0x50, 0xa8 }, { 0x51, 0xff },</div><div class='add'>+	{ 0x50, 0xa9 }, { 0x51, 0xff },</div><div class='add'>+	{ 0x50, 0xaa }, { 0x51, 0xff },</div><div class='add'>+	{ 0x50, 0xab }, { 0x51, 0xff },</div><div class='add'>+	{ 0x50, 0xac }, { 0x51, 0xff },</div><div class='add'>+	{ 0x50, 0xad }, { 0x51, 0xff },</div><div class='add'>+	{ 0x50, 0xae }, { 0x51, 0xff },</div><div class='add'>+	{ 0x50, 0xaf }, { 0x51, 0xff },</div><div class='ctx'> 	{ 0x5e, 0x07 },</div><div class='del'>-	{ 0x50, 0xdc },</div><div class='del'>-	{ 0x51, 0x01 },</div><div class='del'>-	{ 0x50, 0xdd },</div><div class='del'>-	{ 0x51, 0xf4 },</div><div class='del'>-	{ 0x50, 0xde },</div><div class='del'>-	{ 0x51, 0x01 },</div><div class='del'>-	{ 0x50, 0xdf },</div><div class='del'>-	{ 0x51, 0xf4 },</div><div class='del'>-	{ 0x50, 0xe0 },</div><div class='del'>-	{ 0x51, 0x01 },</div><div class='del'>-	{ 0x50, 0xe1 },</div><div class='del'>-	{ 0x51, 0xf4 },</div><div class='del'>-	{ 0x50, 0xb0 },</div><div class='del'>-	{ 0x51, 0x07 },</div><div class='del'>-	{ 0x50, 0xb2 },</div><div class='del'>-	{ 0x51, 0xff },</div><div class='del'>-	{ 0x50, 0xb3 },</div><div class='del'>-	{ 0x51, 0xff },</div><div class='del'>-	{ 0x50, 0xb4 },</div><div class='del'>-	{ 0x51, 0xff },</div><div class='del'>-	{ 0x50, 0xb5 },</div><div class='del'>-	{ 0x51, 0xff },</div><div class='del'>-	{ 0x50, 0xb6 },</div><div class='del'>-	{ 0x51, 0xff },</div><div class='del'>-	{ 0x50, 0xb7 },</div><div class='del'>-	{ 0x51, 0xff },</div><div class='del'>-	{ 0x50, 0x50 },</div><div class='del'>-	{ 0x51, 0x02 },</div><div class='del'>-	{ 0x50, 0x51 },</div><div class='del'>-	{ 0x51, 0x04 },</div><div class='add'>+	{ 0x50, 0xdc }, { 0x51, 0x01 },</div><div class='add'>+	{ 0x50, 0xdd }, { 0x51, 0xf4 },</div><div class='add'>+	{ 0x50, 0xde }, { 0x51, 0x01 },</div><div class='add'>+	{ 0x50, 0xdf }, { 0x51, 0xf4 },</div><div class='add'>+	{ 0x50, 0xe0 }, { 0x51, 0x01 },</div><div class='add'>+	{ 0x50, 0xe1 }, { 0x51, 0xf4 },</div><div class='add'>+	{ 0x50, 0xb0 }, { 0x51, 0x07 },</div><div class='add'>+	{ 0x50, 0xb2 }, { 0x51, 0xff },</div><div class='add'>+	{ 0x50, 0xb3 }, { 0x51, 0xff },</div><div class='add'>+	{ 0x50, 0xb4 }, { 0x51, 0xff },</div><div class='add'>+	{ 0x50, 0xb5 }, { 0x51, 0xff },</div><div class='add'>+	{ 0x50, 0xb6 }, { 0x51, 0xff },</div><div class='add'>+	{ 0x50, 0xb7 }, { 0x51, 0xff },</div><div class='add'>+	{ 0x50, 0x50 }, { 0x51, 0x02 },</div><div class='add'>+	{ 0x50, 0x51 }, { 0x51, 0x04 },</div><div class='ctx'> 	{ 0x45, 0x04 },</div><div class='ctx'> 	{ 0x48, 0x04 },</div><div class='del'>-	{ 0x50, 0xd5 },</div><div class='del'>-	{ 0x51, 0x01 },		/* Serial */</div><div class='del'>-	{ 0x50, 0xd6 },</div><div class='del'>-	{ 0x51, 0x1f },</div><div class='del'>-	{ 0x50, 0xd2 },</div><div class='del'>-	{ 0x51, 0x03 },</div><div class='del'>-	{ 0x50, 0xd7 },</div><div class='del'>-	{ 0x51, 0x3f },</div><div class='add'>+	{ 0x50, 0xd5 }, { 0x51, 0x01 },		/* Serial */</div><div class='add'>+	{ 0x50, 0xd6 }, { 0x51, 0x1f },</div><div class='add'>+	{ 0x50, 0xd2 }, { 0x51, 0x03 },</div><div class='add'>+	{ 0x50, 0xd7 }, { 0x51, 0x3f },</div><div class='add'>+	{ 0x28, 0x74 }, { 0x29, 0x00 }, { 0x28, 0x74 }, { 0x29, 0x40 },</div><div class='add'>+	{ 0x28, 0x46 }, { 0x29, 0x2c }, { 0x28, 0x46 }, { 0x29, 0x0c },</div><div class='add'>+	{ 0x04, 0x40 }, { 0x05, 0x01 },</div><div class='add'>+	{ 0x28, 0x00 }, { 0x29, 0x10 },</div><div class='add'>+	{ 0x28, 0x05 }, { 0x29, 0x02 },</div><div class='ctx'> 	{ 0x1c, 0x01 },</div><div class='del'>-	{ 0x28, 0x06 },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x00 },</div><div class='del'>-	{ 0x2b, 0x03 },</div><div class='del'>-	{ 0x28, 0x07 },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x00 },</div><div class='del'>-	{ 0x2b, 0x0d },</div><div class='del'>-	{ 0x28, 0x08 },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x00 },</div><div class='del'>-	{ 0x2b, 0x02 },</div><div class='del'>-	{ 0x28, 0x09 },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x00 },</div><div class='del'>-	{ 0x2b, 0x01 },</div><div class='del'>-	{ 0x28, 0x0a },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x00 },</div><div class='del'>-	{ 0x2b, 0x21 },</div><div class='del'>-	{ 0x28, 0x0b },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x00 },</div><div class='del'>-	{ 0x2b, 0x29 },</div><div class='del'>-	{ 0x28, 0x0c },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x00 },</div><div class='del'>-	{ 0x2b, 0x16 },</div><div class='del'>-	{ 0x28, 0x0d },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x00 },</div><div class='del'>-	{ 0x2b, 0x31 },</div><div class='del'>-	{ 0x28, 0x0e },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x00 },</div><div class='del'>-	{ 0x2b, 0x0e },</div><div class='del'>-	{ 0x28, 0x0f },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x00 },</div><div class='del'>-	{ 0x2b, 0x4e },</div><div class='del'>-	{ 0x28, 0x10 },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x00 },</div><div class='del'>-	{ 0x2b, 0x46 },</div><div class='del'>-	{ 0x28, 0x11 },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x00 },</div><div class='del'>-	{ 0x2b, 0x0f },</div><div class='del'>-	{ 0x28, 0x12 },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x00 },</div><div class='del'>-	{ 0x2b, 0x56 },</div><div class='del'>-	{ 0x28, 0x13 },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x00 },</div><div class='del'>-	{ 0x2b, 0x35 },</div><div class='del'>-	{ 0x28, 0x14 },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x01 },</div><div class='del'>-	{ 0x2b, 0xbe },</div><div class='del'>-	{ 0x28, 0x15 },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x01 },</div><div class='del'>-	{ 0x2b, 0x84 },</div><div class='del'>-	{ 0x28, 0x16 },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x03 },</div><div class='del'>-	{ 0x2b, 0xee },</div><div class='del'>-	{ 0x28, 0x17 },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x00 },</div><div class='del'>-	{ 0x2b, 0x98 },</div><div class='del'>-	{ 0x28, 0x18 },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x00 },</div><div class='del'>-	{ 0x2b, 0x9f },</div><div class='del'>-	{ 0x28, 0x19 },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x07 },</div><div class='del'>-	{ 0x2b, 0xb2 },</div><div class='del'>-	{ 0x28, 0x1a },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x06 },</div><div class='del'>-	{ 0x2b, 0xc2 },</div><div class='del'>-	{ 0x28, 0x1b },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x07 },</div><div class='del'>-	{ 0x2b, 0x4a },</div><div class='del'>-	{ 0x28, 0x1c },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x01 },</div><div class='del'>-	{ 0x2b, 0xbc },</div><div class='del'>-	{ 0x28, 0x1d },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x04 },</div><div class='del'>-	{ 0x2b, 0xba },</div><div class='del'>-	{ 0x28, 0x1e },</div><div class='del'>-	{ 0x29, 0x00 },</div><div class='del'>-	{ 0x2a, 0x06 },</div><div class='del'>-	{ 0x2b, 0x14 },</div><div class='del'>-	{ 0x50, 0x1e },</div><div class='del'>-	{ 0x51, 0x5d },</div><div class='del'>-	{ 0x50, 0x22 },</div><div class='del'>-	{ 0x51, 0x00 },</div><div class='del'>-	{ 0x50, 0x23 },</div><div class='del'>-	{ 0x51, 0xc8 },</div><div class='del'>-	{ 0x50, 0x24 },</div><div class='del'>-	{ 0x51, 0x00 },</div><div class='del'>-	{ 0x50, 0x25 },</div><div class='del'>-	{ 0x51, 0xf0 },</div><div class='del'>-	{ 0x50, 0x26 },</div><div class='del'>-	{ 0x51, 0x00 },</div><div class='del'>-	{ 0x50, 0x27 },</div><div class='del'>-	{ 0x51, 0xc3 },</div><div class='del'>-	{ 0x50, 0x39 },</div><div class='del'>-	{ 0x51, 0x02 },</div><div class='del'>-	{ 0x50, 0xd5 },</div><div class='del'>-	{ 0x51, 0x01 },</div><div class='add'>+	{ 0x28, 0x06 }, { 0x29, 0x00 }, { 0x2a, 0x00 }, { 0x2b, 0x03 },</div><div class='add'>+	{ 0x28, 0x07 }, { 0x29, 0x00 }, { 0x2a, 0x00 }, { 0x2b, 0x0d },</div><div class='add'>+	{ 0x28, 0x08 }, { 0x29, 0x00 }, { 0x2a, 0x00 }, { 0x2b, 0x02 },</div><div class='add'>+	{ 0x28, 0x09 }, { 0x29, 0x00 }, { 0x2a, 0x00 }, { 0x2b, 0x01 },</div><div class='add'>+	{ 0x28, 0x0a }, { 0x29, 0x00 }, { 0x2a, 0x00 }, { 0x2b, 0x21 },</div><div class='add'>+	{ 0x28, 0x0b }, { 0x29, 0x00 }, { 0x2a, 0x00 }, { 0x2b, 0x29 },</div><div class='add'>+	{ 0x28, 0x0c }, { 0x29, 0x00 }, { 0x2a, 0x00 }, { 0x2b, 0x16 },</div><div class='add'>+	{ 0x28, 0x0d }, { 0x29, 0x00 }, { 0x2a, 0x00 }, { 0x2b, 0x31 },</div><div class='add'>+	{ 0x28, 0x0e }, { 0x29, 0x00 }, { 0x2a, 0x00 }, { 0x2b, 0x0e },</div><div class='add'>+	{ 0x28, 0x0f }, { 0x29, 0x00 }, { 0x2a, 0x00 }, { 0x2b, 0x4e },</div><div class='add'>+	{ 0x28, 0x10 }, { 0x29, 0x00 }, { 0x2a, 0x00 }, { 0x2b, 0x46 },</div><div class='add'>+	{ 0x28, 0x11 }, { 0x29, 0x00 }, { 0x2a, 0x00 }, { 0x2b, 0x0f },</div><div class='add'>+	{ 0x28, 0x12 }, { 0x29, 0x00 }, { 0x2a, 0x00 }, { 0x2b, 0x56 },</div><div class='add'>+	{ 0x28, 0x13 }, { 0x29, 0x00 }, { 0x2a, 0x00 }, { 0x2b, 0x35 },</div><div class='add'>+	{ 0x28, 0x14 }, { 0x29, 0x00 }, { 0x2a, 0x01 }, { 0x2b, 0xbe },</div><div class='add'>+	{ 0x28, 0x15 }, { 0x29, 0x00 }, { 0x2a, 0x01 }, { 0x2b, 0x84 },</div><div class='add'>+	{ 0x28, 0x16 }, { 0x29, 0x00 }, { 0x2a, 0x03 }, { 0x2b, 0xee },</div><div class='add'>+	{ 0x28, 0x17 }, { 0x29, 0x00 }, { 0x2a, 0x00 }, { 0x2b, 0x98 },</div><div class='add'>+	{ 0x28, 0x18 }, { 0x29, 0x00 }, { 0x2a, 0x00 }, { 0x2b, 0x9f },</div><div class='add'>+	{ 0x28, 0x19 }, { 0x29, 0x00 }, { 0x2a, 0x07 }, { 0x2b, 0xb2 },</div><div class='add'>+	{ 0x28, 0x1a }, { 0x29, 0x00 }, { 0x2a, 0x06 }, { 0x2b, 0xc2 },</div><div class='add'>+	{ 0x28, 0x1b }, { 0x29, 0x00 }, { 0x2a, 0x07 }, { 0x2b, 0x4a },</div><div class='add'>+	{ 0x28, 0x1c }, { 0x29, 0x00 }, { 0x2a, 0x01 }, { 0x2b, 0xbc },</div><div class='add'>+	{ 0x28, 0x1d }, { 0x29, 0x00 }, { 0x2a, 0x04 }, { 0x2b, 0xba },</div><div class='add'>+	{ 0x28, 0x1e }, { 0x29, 0x00 }, { 0x2a, 0x06 }, { 0x2b, 0x14 },</div><div class='add'>+	{ 0x50, 0x1e }, { 0x51, 0x5d },</div><div class='add'>+	{ 0x50, 0x22 }, { 0x51, 0x00 },</div><div class='add'>+	{ 0x50, 0x23 }, { 0x51, 0xc8 },</div><div class='add'>+	{ 0x50, 0x24 }, { 0x51, 0x00 },</div><div class='add'>+	{ 0x50, 0x25 }, { 0x51, 0xf0 },</div><div class='add'>+	{ 0x50, 0x26 }, { 0x51, 0x00 },</div><div class='add'>+	{ 0x50, 0x27 }, { 0x51, 0xc3 },</div><div class='add'>+	{ 0x50, 0x39 }, { 0x51, 0x02 },</div><div class='add'>+	{ 0x28, 0x6a }, { 0x29, 0x00 }, { 0x2a, 0x00 }, { 0x2b, 0x00 },</div><div class='ctx'> 	{ 0xd0, 0x00 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -485,18 +352,23 @@ static int mb86a20s_read_status(struct dvb_frontend *fe, fe_status_t *status)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mb86a20s_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int mb86a20s_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct mb86a20s_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int rc;</div><div class='add'>+#if 0</div><div class='add'>+	/*</div><div class='add'>+	 * FIXME: Properly implement the set frontend properties</div><div class='add'>+	 */</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	dprintk("\n");</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	dprintk("Calling tuner set parameters\n");</div><div class='del'>-	fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+	fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make it more reliable: if, for some reason, the initial</div><div class='hunk'>@@ -520,22 +392,212 @@ static int mb86a20s_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mb86a20s_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int mb86a20s_get_modulation(struct mb86a20s_state *state,</div><div class='add'>+				   unsigned layer)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	static unsigned char reg[] = {</div><div class='add'>+		[0] = 0x86,	/* Layer A */</div><div class='add'>+		[1] = 0x8a,	/* Layer B */</div><div class='add'>+		[2] = 0x8e,	/* Layer C */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (layer &gt;= ARRAY_SIZE(reg))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	rc = mb86a20s_writereg(state, 0x6d, reg[layer]);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = mb86a20s_readreg(state, 0x6e);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	switch ((rc &amp; 0x70) &gt;&gt; 4) {</div><div class='add'>+	case 0:</div><div class='add'>+		return DQPSK;</div><div class='add'>+	case 1:</div><div class='add'>+		return QPSK;</div><div class='add'>+	case 2:</div><div class='add'>+		return QAM_16;</div><div class='add'>+	case 3:</div><div class='add'>+		return QAM_64;</div><div class='add'>+	default:</div><div class='add'>+		return QAM_AUTO;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mb86a20s_get_fec(struct mb86a20s_state *state,</div><div class='add'>+			    unsigned layer)</div><div class='ctx'> {</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	/* FIXME: For now, it does nothing */</div><div class='add'>+	static unsigned char reg[] = {</div><div class='add'>+		[0] = 0x87,	/* Layer A */</div><div class='add'>+		[1] = 0x8b,	/* Layer B */</div><div class='add'>+		[2] = 0x8f,	/* Layer C */</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	fe-&gt;dtv_property_cache.bandwidth_hz = 6000000;</div><div class='del'>-	fe-&gt;dtv_property_cache.transmission_mode = TRANSMISSION_MODE_AUTO;</div><div class='del'>-	fe-&gt;dtv_property_cache.guard_interval = GUARD_INTERVAL_AUTO;</div><div class='del'>-	fe-&gt;dtv_property_cache.isdbt_partial_reception = 0;</div><div class='add'>+	if (layer &gt;= ARRAY_SIZE(reg))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	rc = mb86a20s_writereg(state, 0x6d, reg[layer]);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = mb86a20s_readreg(state, 0x6e);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	switch (rc) {</div><div class='add'>+	case 0:</div><div class='add'>+		return FEC_1_2;</div><div class='add'>+	case 1:</div><div class='add'>+		return FEC_2_3;</div><div class='add'>+	case 2:</div><div class='add'>+		return FEC_3_4;</div><div class='add'>+	case 3:</div><div class='add'>+		return FEC_5_6;</div><div class='add'>+	case 4:</div><div class='add'>+		return FEC_7_8;</div><div class='add'>+	default:</div><div class='add'>+		return FEC_AUTO;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mb86a20s_get_interleaving(struct mb86a20s_state *state,</div><div class='add'>+				     unsigned layer)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	static unsigned char reg[] = {</div><div class='add'>+		[0] = 0x88,	/* Layer A */</div><div class='add'>+		[1] = 0x8c,	/* Layer B */</div><div class='add'>+		[2] = 0x90,	/* Layer C */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (layer &gt;= ARRAY_SIZE(reg))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	rc = mb86a20s_writereg(state, 0x6d, reg[layer]);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = mb86a20s_readreg(state, 0x6e);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	if (rc &gt; 3)</div><div class='add'>+		return -EINVAL;	/* Not used */</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mb86a20s_get_segment_count(struct mb86a20s_state *state,</div><div class='add'>+				      unsigned layer)</div><div class='add'>+{</div><div class='add'>+	int rc, count;</div><div class='add'>+</div><div class='add'>+	static unsigned char reg[] = {</div><div class='add'>+		[0] = 0x89,	/* Layer A */</div><div class='add'>+		[1] = 0x8d,	/* Layer B */</div><div class='add'>+		[2] = 0x91,	/* Layer C */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (layer &gt;= ARRAY_SIZE(reg))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	rc = mb86a20s_writereg(state, 0x6d, reg[layer]);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = mb86a20s_readreg(state, 0x6e);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	count = (rc &gt;&gt; 4) &amp; 0x0f;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mb86a20s_get_frontend(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct mb86a20s_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	int i, rc;</div><div class='add'>+</div><div class='add'>+	/* Fixed parameters */</div><div class='add'>+	p-&gt;delivery_system = SYS_ISDBT;</div><div class='add'>+	p-&gt;bandwidth_hz = 6000000;</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+</div><div class='add'>+	/* Check for partial reception */</div><div class='add'>+	rc = mb86a20s_writereg(state, 0x6d, 0x85);</div><div class='add'>+	if (rc &gt;= 0)</div><div class='add'>+		rc = mb86a20s_readreg(state, 0x6e);</div><div class='add'>+	if (rc &gt;= 0)</div><div class='add'>+		p-&gt;isdbt_partial_reception = (rc &amp; 0x10) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	/* Get per-layer data */</div><div class='add'>+	p-&gt;isdbt_layer_enabled = 0;</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		rc = mb86a20s_get_segment_count(state, i);</div><div class='add'>+			if (rc &gt;= 0 &amp;&amp; rc &lt; 14)</div><div class='add'>+				p-&gt;layer[i].segment_count = rc;</div><div class='add'>+		if (rc == 0x0f)</div><div class='add'>+			continue;</div><div class='add'>+		p-&gt;isdbt_layer_enabled |= 1 &lt;&lt; i;</div><div class='add'>+		rc = mb86a20s_get_modulation(state, i);</div><div class='add'>+			if (rc &gt;= 0)</div><div class='add'>+				p-&gt;layer[i].modulation = rc;</div><div class='add'>+		rc = mb86a20s_get_fec(state, i);</div><div class='add'>+			if (rc &gt;= 0)</div><div class='add'>+				p-&gt;layer[i].fec = rc;</div><div class='add'>+		rc = mb86a20s_get_interleaving(state, i);</div><div class='add'>+			if (rc &gt;= 0)</div><div class='add'>+				p-&gt;layer[i].interleaving = rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p-&gt;isdbt_sb_mode = 0;</div><div class='add'>+	rc = mb86a20s_writereg(state, 0x6d, 0x84);</div><div class='add'>+	if ((rc &gt;= 0) &amp;&amp; ((rc &amp; 0x60) == 0x20)) {</div><div class='add'>+		p-&gt;isdbt_sb_mode = 1;</div><div class='add'>+		/* At least, one segment should exist */</div><div class='add'>+		if (!p-&gt;isdbt_sb_segment_count)</div><div class='add'>+			p-&gt;isdbt_sb_segment_count = 1;</div><div class='add'>+	} else</div><div class='add'>+		p-&gt;isdbt_sb_segment_count = 0;</div><div class='add'>+</div><div class='add'>+	/* Get transmission mode and guard interval */</div><div class='add'>+	p-&gt;transmission_mode = TRANSMISSION_MODE_AUTO;</div><div class='add'>+	p-&gt;guard_interval = GUARD_INTERVAL_AUTO;</div><div class='add'>+	rc = mb86a20s_readreg(state, 0x07);</div><div class='add'>+	if (rc &gt;= 0) {</div><div class='add'>+		if ((rc &amp; 0x60) == 0x20) {</div><div class='add'>+			switch (rc &amp; 0x0c &gt;&gt; 2) {</div><div class='add'>+			case 0:</div><div class='add'>+				p-&gt;transmission_mode = TRANSMISSION_MODE_2K;</div><div class='add'>+				break;</div><div class='add'>+			case 1:</div><div class='add'>+				p-&gt;transmission_mode = TRANSMISSION_MODE_4K;</div><div class='add'>+				break;</div><div class='add'>+			case 2:</div><div class='add'>+				p-&gt;transmission_mode = TRANSMISSION_MODE_8K;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (!(rc &amp; 0x10)) {</div><div class='add'>+			switch (rc &amp; 0x3) {</div><div class='add'>+			case 0:</div><div class='add'>+				p-&gt;guard_interval = GUARD_INTERVAL_1_4;</div><div class='add'>+				break;</div><div class='add'>+			case 1:</div><div class='add'>+				p-&gt;guard_interval = GUARD_INTERVAL_1_8;</div><div class='add'>+				break;</div><div class='add'>+			case 2:</div><div class='add'>+				p-&gt;guard_interval = GUARD_INTERVAL_1_16;</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 (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mb86a20s_tune(struct dvb_frontend *fe,</div><div class='del'>-			struct dvb_frontend_parameters *params,</div><div class='add'>+			bool re_tune,</div><div class='ctx'> 			unsigned int mode_flags,</div><div class='ctx'> 			unsigned int *delay,</div><div class='ctx'> 			fe_status_t *status)</div><div class='hunk'>@@ -544,8 +606,8 @@ static int mb86a20s_tune(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	dprintk("\n");</div><div class='ctx'> </div><div class='del'>-	if (params != NULL)</div><div class='del'>-		rc = mb86a20s_set_frontend(fe, params);</div><div class='add'>+	if (re_tune)</div><div class='add'>+		rc = mb86a20s_set_frontend(fe);</div><div class='ctx'> </div><div class='ctx'> 	if (!(mode_flags &amp; FE_TUNE_MODE_ONESHOT))</div><div class='ctx'> 		mb86a20s_read_status(fe, status);</div><div class='hunk'>@@ -608,10 +670,10 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(mb86a20s_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops mb86a20s_ops = {</div><div class='add'>+	.delsys = { SYS_ISDBT },</div><div class='ctx'> 	/* Use dib8000 values per default */</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "Fujitsu mb86A20s",</div><div class='del'>-		.type = FE_OFDM,</div><div class='ctx'> 		.caps = FE_CAN_INVERSION_AUTO | FE_CAN_RECOVER |</div><div class='ctx'> 			FE_CAN_FEC_1_2  | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |</div><div class='ctx'> 			FE_CAN_FEC_5_6  | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |</div><div class='head'>diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c<br/>index 83e6f1a1b700..e20bf13aa860 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/mt312.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/mt312.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/mt312.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/mt312.c</a></div><div class='hunk'>@@ -531,9 +531,9 @@ static int mt312_read_ucblocks(struct dvb_frontend *fe, u32 *ubc)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt312_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-			      struct dvb_frontend_parameters *p)</div><div class='add'>+static int mt312_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct mt312_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 buf[5], config_val;</div><div class='hunk'>@@ -553,16 +553,16 @@ static int mt312_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	    || (p-&gt;inversion &gt; INVERSION_ON))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if ((p-&gt;u.qpsk.symbol_rate &lt; fe-&gt;ops.info.symbol_rate_min)</div><div class='del'>-	    || (p-&gt;u.qpsk.symbol_rate &gt; fe-&gt;ops.info.symbol_rate_max))</div><div class='add'>+	if ((p-&gt;symbol_rate &lt; fe-&gt;ops.info.symbol_rate_min)</div><div class='add'>+	    || (p-&gt;symbol_rate &gt; fe-&gt;ops.info.symbol_rate_max))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if ((p-&gt;u.qpsk.fec_inner &lt; FEC_NONE)</div><div class='del'>-	    || (p-&gt;u.qpsk.fec_inner &gt; FEC_AUTO))</div><div class='add'>+	if ((p-&gt;fec_inner &lt; FEC_NONE)</div><div class='add'>+	    || (p-&gt;fec_inner &gt; FEC_AUTO))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if ((p-&gt;u.qpsk.fec_inner == FEC_4_5)</div><div class='del'>-	    || (p-&gt;u.qpsk.fec_inner == FEC_8_9))</div><div class='add'>+	if ((p-&gt;fec_inner == FEC_4_5)</div><div class='add'>+	    || (p-&gt;fec_inner == FEC_8_9))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (state-&gt;id) {</div><div class='hunk'>@@ -574,7 +574,7 @@ static int mt312_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 		ret = mt312_readreg(state, CONFIG, &amp;config_val);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='del'>-		if (p-&gt;u.qpsk.symbol_rate &gt;= 30000000) {</div><div class='add'>+		if (p-&gt;symbol_rate &gt;= 30000000) {</div><div class='ctx'> 			/* Note that 30MS/s should use 90MHz */</div><div class='ctx'> 			if (state-&gt;freq_mult == 6) {</div><div class='ctx'> 				/* We are running 60MHz */</div><div class='hunk'>@@ -603,25 +603,25 @@ static int mt312_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* sr = (u16)(sr * 256.0 / 1000000.0) */</div><div class='del'>-	sr = mt312_div(p-&gt;u.qpsk.symbol_rate * 4, 15625);</div><div class='add'>+	sr = mt312_div(p-&gt;symbol_rate * 4, 15625);</div><div class='ctx'> </div><div class='ctx'> 	/* SYM_RATE */</div><div class='ctx'> 	buf[0] = (sr &gt;&gt; 8) &amp; 0x3f;</div><div class='ctx'> 	buf[1] = (sr &gt;&gt; 0) &amp; 0xff;</div><div class='ctx'> </div><div class='ctx'> 	/* VIT_MODE */</div><div class='del'>-	buf[2] = inv_tab[p-&gt;inversion] | fec_tab[p-&gt;u.qpsk.fec_inner];</div><div class='add'>+	buf[2] = inv_tab[p-&gt;inversion] | fec_tab[p-&gt;fec_inner];</div><div class='ctx'> </div><div class='ctx'> 	/* QPSK_CTRL */</div><div class='ctx'> 	buf[3] = 0x40;		/* swap I and Q before QPSK demodulation */</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;u.qpsk.symbol_rate &lt; 10000000)</div><div class='add'>+	if (p-&gt;symbol_rate &lt; 10000000)</div><div class='ctx'> 		buf[3] |= 0x04;	/* use afc mode */</div><div class='ctx'> </div><div class='ctx'> 	/* GO */</div><div class='hunk'>@@ -636,9 +636,9 @@ static int mt312_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt312_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-			      struct dvb_frontend_parameters *p)</div><div class='add'>+static int mt312_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct mt312_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -646,11 +646,11 @@ static int mt312_get_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = mt312_get_symbol_rate(state, &amp;p-&gt;u.qpsk.symbol_rate);</div><div class='add'>+	ret = mt312_get_symbol_rate(state, &amp;p-&gt;symbol_rate);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = mt312_get_code_rate(state, &amp;p-&gt;u.qpsk.fec_inner);</div><div class='add'>+	ret = mt312_get_code_rate(state, &amp;p-&gt;fec_inner);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -738,10 +738,9 @@ static void mt312_release(struct dvb_frontend *fe)</div><div class='ctx'> </div><div class='ctx'> #define MT312_SYS_CLK		90000000UL	/* 90 MHz */</div><div class='ctx'> static struct dvb_frontend_ops mt312_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "Zarlink ???? DVB-S",</div><div class='del'>-		.type = FE_QPSK,</div><div class='ctx'> 		.frequency_min = 950000,</div><div class='ctx'> 		.frequency_max = 2150000,</div><div class='ctx'> 		/* FIXME: adjust freq to real used xtal */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/mt352.c b/drivers/media/dvb/frontends/mt352.c<br/>index 319672f8e1a7..2c3b50e828d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/mt352.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/mt352.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/mt352.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/mt352.c</a></div><div class='hunk'>@@ -111,20 +111,20 @@ static int mt352_sleep(struct dvb_frontend* fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt352_calc_nominal_rate(struct mt352_state* state,</div><div class='del'>-				    enum fe_bandwidth bandwidth,</div><div class='add'>+				    u32 bandwidth,</div><div class='ctx'> 				    unsigned char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	u32 adc_clock = 20480; /* 20.340 MHz */</div><div class='ctx'> 	u32 bw,value;</div><div class='ctx'> </div><div class='ctx'> 	switch (bandwidth) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		bw = 6;</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		bw = 7;</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 	default:</div><div class='ctx'> 		bw = 8;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -166,15 +166,14 @@ static void mt352_calc_input_freq(struct mt352_state* state,</div><div class='ctx'> 	buf[1] = lsb(value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt352_set_parameters(struct dvb_frontend* fe,</div><div class='del'>-				struct dvb_frontend_parameters *param)</div><div class='add'>+static int mt352_set_parameters(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *op = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct mt352_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	unsigned char buf[13];</div><div class='ctx'> 	static unsigned char tuner_go[] = { 0x5d, 0x01 };</div><div class='ctx'> 	static unsigned char fsm_go[]   = { 0x5e, 0x01 };</div><div class='ctx'> 	unsigned int tps = 0;</div><div class='del'>-	struct dvb_ofdm_parameters *op = &amp;param-&gt;u.ofdm;</div><div class='ctx'> </div><div class='ctx'> 	switch (op-&gt;code_rate_HP) {</div><div class='ctx'> 		case FEC_2_3:</div><div class='hunk'>@@ -213,14 +212,14 @@ static int mt352_set_parameters(struct dvb_frontend* fe,</div><div class='ctx'> 		case FEC_AUTO:</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FEC_NONE:</div><div class='del'>-			if (op-&gt;hierarchy_information == HIERARCHY_AUTO ||</div><div class='del'>-			    op-&gt;hierarchy_information == HIERARCHY_NONE)</div><div class='add'>+			if (op-&gt;hierarchy == HIERARCHY_AUTO ||</div><div class='add'>+			    op-&gt;hierarchy == HIERARCHY_NONE)</div><div class='ctx'> 				break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (op-&gt;constellation) {</div><div class='add'>+	switch (op-&gt;modulation) {</div><div class='ctx'> 		case QPSK:</div><div class='ctx'> 			break;</div><div class='ctx'> 		case QAM_AUTO:</div><div class='hunk'>@@ -262,7 +261,7 @@ static int mt352_set_parameters(struct dvb_frontend* fe,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (op-&gt;hierarchy_information) {</div><div class='add'>+	switch (op-&gt;hierarchy) {</div><div class='ctx'> 		case HIERARCHY_AUTO:</div><div class='ctx'> 		case HIERARCHY_NONE:</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -288,12 +287,12 @@ static int mt352_set_parameters(struct dvb_frontend* fe,</div><div class='ctx'> 	buf[3] = 0x50;  // old</div><div class='ctx'> //	buf[3] = 0xf4;  // pinnacle</div><div class='ctx'> </div><div class='del'>-	mt352_calc_nominal_rate(state, op-&gt;bandwidth, buf+4);</div><div class='add'>+	mt352_calc_nominal_rate(state, op-&gt;bandwidth_hz, buf+4);</div><div class='ctx'> 	mt352_calc_input_freq(state, buf+6);</div><div class='ctx'> </div><div class='ctx'> 	if (state-&gt;config.no_tuner) {</div><div class='ctx'> 		if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-			fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+			fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 			if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 				fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -302,7 +301,7 @@ static int mt352_set_parameters(struct dvb_frontend* fe,</div><div class='ctx'> 		_mt352_write(fe, fsm_go, 2);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (fe-&gt;ops.tuner_ops.calc_regs) {</div><div class='del'>-			fe-&gt;ops.tuner_ops.calc_regs(fe, param, buf+8, 5);</div><div class='add'>+			fe-&gt;ops.tuner_ops.calc_regs(fe, buf+8, 5);</div><div class='ctx'> 			buf[8] &lt;&lt;= 1;</div><div class='ctx'> 			_mt352_write(fe, buf, sizeof(buf));</div><div class='ctx'> 			_mt352_write(fe, tuner_go, 2);</div><div class='hunk'>@@ -312,14 +311,13 @@ static int mt352_set_parameters(struct dvb_frontend* fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt352_get_parameters(struct dvb_frontend* fe,</div><div class='del'>-				struct dvb_frontend_parameters *param)</div><div class='add'>+static int mt352_get_parameters(struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *op = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct mt352_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u16 tps;</div><div class='ctx'> 	u16 div;</div><div class='ctx'> 	u8 trl;</div><div class='del'>-	struct dvb_ofdm_parameters *op = &amp;param-&gt;u.ofdm;</div><div class='ctx'> 	static const u8 tps_fec_to_api[8] =</div><div class='ctx'> 	{</div><div class='ctx'> 		FEC_1_2,</div><div class='hunk'>@@ -348,16 +346,16 @@ static int mt352_get_parameters(struct dvb_frontend* fe,</div><div class='ctx'> 	switch ( (tps &gt;&gt; 13) &amp; 3)</div><div class='ctx'> 	{</div><div class='ctx'> 		case 0:</div><div class='del'>-			op-&gt;constellation = QPSK;</div><div class='add'>+			op-&gt;modulation = QPSK;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 1:</div><div class='del'>-			op-&gt;constellation = QAM_16;</div><div class='add'>+			op-&gt;modulation = QAM_16;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 2:</div><div class='del'>-			op-&gt;constellation = QAM_64;</div><div class='add'>+			op-&gt;modulation = QAM_64;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			op-&gt;constellation = QAM_AUTO;</div><div class='add'>+			op-&gt;modulation = QAM_AUTO;</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -385,36 +383,36 @@ static int mt352_get_parameters(struct dvb_frontend* fe,</div><div class='ctx'> 	switch ( (tps &gt;&gt; 10) &amp; 7)</div><div class='ctx'> 	{</div><div class='ctx'> 		case 0:</div><div class='del'>-			op-&gt;hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+			op-&gt;hierarchy = HIERARCHY_NONE;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 1:</div><div class='del'>-			op-&gt;hierarchy_information = HIERARCHY_1;</div><div class='add'>+			op-&gt;hierarchy = HIERARCHY_1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 2:</div><div class='del'>-			op-&gt;hierarchy_information = HIERARCHY_2;</div><div class='add'>+			op-&gt;hierarchy = HIERARCHY_2;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 3:</div><div class='del'>-			op-&gt;hierarchy_information = HIERARCHY_4;</div><div class='add'>+			op-&gt;hierarchy = HIERARCHY_4;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			op-&gt;hierarchy_information = HIERARCHY_AUTO;</div><div class='add'>+			op-&gt;hierarchy = HIERARCHY_AUTO;</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	param-&gt;frequency = ( 500 * (div - IF_FREQUENCYx6) ) / 3 * 1000;</div><div class='add'>+	op-&gt;frequency = (500 * (div - IF_FREQUENCYx6)) / 3 * 1000;</div><div class='ctx'> </div><div class='ctx'> 	if (trl == 0x72)</div><div class='del'>-		op-&gt;bandwidth = BANDWIDTH_8_MHZ;</div><div class='add'>+		op-&gt;bandwidth_hz = 8000000;</div><div class='ctx'> 	else if (trl == 0x64)</div><div class='del'>-		op-&gt;bandwidth = BANDWIDTH_7_MHZ;</div><div class='add'>+		op-&gt;bandwidth_hz = 7000000;</div><div class='ctx'> 	else</div><div class='del'>-		op-&gt;bandwidth = BANDWIDTH_6_MHZ;</div><div class='add'>+		op-&gt;bandwidth_hz = 6000000;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	if (mt352_read_register(state, STATUS_2) &amp; 0x02)</div><div class='del'>-		param-&gt;inversion = INVERSION_OFF;</div><div class='add'>+		op-&gt;inversion = INVERSION_OFF;</div><div class='ctx'> 	else</div><div class='del'>-		param-&gt;inversion = INVERSION_ON;</div><div class='add'>+		op-&gt;inversion = INVERSION_ON;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -569,10 +567,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops mt352_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Zarlink MT352 DVB-T",</div><div class='del'>-		.type			= FE_OFDM,</div><div class='ctx'> 		.frequency_min		= 174000000,</div><div class='ctx'> 		.frequency_max		= 862000000,</div><div class='ctx'> 		.frequency_stepsize	= 166667,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c<br/>index eac20650499f..49ca78d883b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/nxt200x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/nxt200x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/nxt200x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/nxt200x.c</a></div><div class='hunk'>@@ -528,9 +528,9 @@ static int nxt2004_load_firmware (struct dvb_frontend* fe, const struct firmware</div><div class='ctx'> 	return 0;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,</div><div class='del'>-					     struct dvb_frontend_parameters *p)</div><div class='add'>+static int nxt200x_setup_frontend_parameters(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct nxt200x_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u8 buf[5];</div><div class='ctx'> </div><div class='hunk'>@@ -546,7 +546,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set additional params */</div><div class='del'>-	switch (p-&gt;u.vsb.modulation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 		case QAM_64:</div><div class='ctx'> 		case QAM_256:</div><div class='ctx'> 			/* Set punctured clock for QAM */</div><div class='hunk'>@@ -566,7 +566,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.calc_regs) {</div><div class='ctx'> 		/* get tuning information */</div><div class='del'>-		fe-&gt;ops.tuner_ops.calc_regs(fe, p, buf, 5);</div><div class='add'>+		fe-&gt;ops.tuner_ops.calc_regs(fe, buf, 5);</div><div class='ctx'> </div><div class='ctx'> 		/* write frequency information */</div><div class='ctx'> 		nxt200x_writetuner(state, buf);</div><div class='hunk'>@@ -576,7 +576,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,</div><div class='ctx'> 	nxt200x_agc_reset(state);</div><div class='ctx'> </div><div class='ctx'> 	/* set target power level */</div><div class='del'>-	switch (p-&gt;u.vsb.modulation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 		case QAM_64:</div><div class='ctx'> 		case QAM_256:</div><div class='ctx'> 			buf[0] = 0x74;</div><div class='hunk'>@@ -620,7 +620,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* write sdmx input */</div><div class='del'>-	switch (p-&gt;u.vsb.modulation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 		case QAM_64:</div><div class='ctx'> 				buf[0] = 0x68;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -714,7 +714,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* write agc ucgp0 */</div><div class='del'>-	switch (p-&gt;u.vsb.modulation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 		case QAM_64:</div><div class='ctx'> 				buf[0] = 0x02;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1203,10 +1203,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops nxt200x_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "Nextwave NXT200X VSB/QAM frontend",</div><div class='del'>-		.type = FE_ATSC,</div><div class='ctx'> 		.frequency_min =  54000000,</div><div class='ctx'> 		.frequency_max = 860000000,</div><div class='ctx'> 		.frequency_stepsize = 166666,	/* stepsize is just a guess */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/nxt6000.c b/drivers/media/dvb/frontends/nxt6000.c<br/>index 6599b8fea9e9..90ae6c72c0e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/nxt6000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/nxt6000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/nxt6000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/nxt6000.c</a></div><div class='hunk'>@@ -81,22 +81,21 @@ static void nxt6000_reset(struct nxt6000_state* state)</div><div class='ctx'> 	nxt6000_writereg(state, OFDM_COR_CTL, val | COREACT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nxt6000_set_bandwidth(struct nxt6000_state* state, fe_bandwidth_t bandwidth)</div><div class='add'>+static int nxt6000_set_bandwidth(struct nxt6000_state *state, u32 bandwidth)</div><div class='ctx'> {</div><div class='ctx'> 	u16 nominal_rate;</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='ctx'> 	switch (bandwidth) {</div><div class='del'>-</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		nominal_rate = 0x55B7;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		nominal_rate = 0x6400;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		nominal_rate = 0x7249;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -457,23 +456,31 @@ static int nxt6000_init(struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nxt6000_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *param)</div><div class='add'>+static int nxt6000_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct nxt6000_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((result = nxt6000_set_bandwidth(state, param-&gt;u.ofdm.bandwidth)) &lt; 0)</div><div class='add'>+	result = nxt6000_set_bandwidth(state, p-&gt;bandwidth_hz);</div><div class='add'>+	if (result &lt; 0)</div><div class='ctx'> 		return result;</div><div class='del'>-	if ((result = nxt6000_set_guard_interval(state, param-&gt;u.ofdm.guard_interval)) &lt; 0)</div><div class='add'>+</div><div class='add'>+	result = nxt6000_set_guard_interval(state, p-&gt;guard_interval);</div><div class='add'>+	if (result &lt; 0)</div><div class='ctx'> 		return result;</div><div class='del'>-	if ((result = nxt6000_set_transmission_mode(state, param-&gt;u.ofdm.transmission_mode)) &lt; 0)</div><div class='add'>+</div><div class='add'>+	result = nxt6000_set_transmission_mode(state, p-&gt;transmission_mode);</div><div class='add'>+	if (result &lt; 0)</div><div class='ctx'> 		return result;</div><div class='del'>-	if ((result = nxt6000_set_inversion(state, param-&gt;inversion)) &lt; 0)</div><div class='add'>+</div><div class='add'>+	result = nxt6000_set_inversion(state, p-&gt;inversion);</div><div class='add'>+	if (result &lt; 0)</div><div class='ctx'> 		return result;</div><div class='ctx'> </div><div class='ctx'> 	msleep(500);</div><div class='hunk'>@@ -566,10 +573,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops nxt6000_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "NxtWave NXT6000 DVB-T",</div><div class='del'>-		.type = FE_OFDM,</div><div class='ctx'> 		.frequency_min = 0,</div><div class='ctx'> 		.frequency_max = 863250000,</div><div class='ctx'> 		.frequency_stepsize = 62500,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c<br/>index 38e67accb8c3..5ef921823c15 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/or51132.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/or51132.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/or51132.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/or51132.c</a></div><div class='hunk'>@@ -306,9 +306,9 @@ static int modulation_fw_class(fe_modulation_t modulation)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int or51132_set_parameters(struct dvb_frontend* fe,</div><div class='del'>-				  struct dvb_frontend_parameters *param)</div><div class='add'>+static int or51132_set_parameters(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct or51132_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	const struct firmware *fw;</div><div class='hunk'>@@ -317,8 +317,8 @@ static int or51132_set_parameters(struct dvb_frontend* fe,</div><div class='ctx'> </div><div class='ctx'> 	/* Upload new firmware only if we need a different one */</div><div class='ctx'> 	if (modulation_fw_class(state-&gt;current_modulation) !=</div><div class='del'>-	    modulation_fw_class(param-&gt;u.vsb.modulation)) {</div><div class='del'>-		switch(modulation_fw_class(param-&gt;u.vsb.modulation)) {</div><div class='add'>+	    modulation_fw_class(p-&gt;modulation)) {</div><div class='add'>+		switch (modulation_fw_class(p-&gt;modulation)) {</div><div class='ctx'> 		case MOD_FWCLASS_VSB:</div><div class='ctx'> 			dprintk("set_parameters VSB MODE\n");</div><div class='ctx'> 			fwname = OR51132_VSB_FIRMWARE;</div><div class='hunk'>@@ -335,7 +335,7 @@ static int or51132_set_parameters(struct dvb_frontend* fe,</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			printk("or51132: Modulation type(%d) UNSUPPORTED\n",</div><div class='del'>-			       param-&gt;u.vsb.modulation);</div><div class='add'>+			       p-&gt;modulation);</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 		printk("or51132: Waiting for firmware upload(%s)...\n",</div><div class='hunk'>@@ -357,13 +357,13 @@ static int or51132_set_parameters(struct dvb_frontend* fe,</div><div class='ctx'> 		state-&gt;config-&gt;set_ts_params(fe, clock_mode);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Change only if we are actually changing the modulation */</div><div class='del'>-	if (state-&gt;current_modulation != param-&gt;u.vsb.modulation) {</div><div class='del'>-		state-&gt;current_modulation = param-&gt;u.vsb.modulation;</div><div class='add'>+	if (state-&gt;current_modulation != p-&gt;modulation) {</div><div class='add'>+		state-&gt;current_modulation = p-&gt;modulation;</div><div class='ctx'> 		or51132_setmode(fe);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -371,13 +371,13 @@ static int or51132_set_parameters(struct dvb_frontend* fe,</div><div class='ctx'> 	or51132_setmode(fe);</div><div class='ctx'> </div><div class='ctx'> 	/* Update current frequency */</div><div class='del'>-	state-&gt;current_frequency = param-&gt;frequency;</div><div class='add'>+	state-&gt;current_frequency = p-&gt;frequency;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int or51132_get_parameters(struct dvb_frontend* fe,</div><div class='del'>-				  struct dvb_frontend_parameters *param)</div><div class='add'>+static int or51132_get_parameters(struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct or51132_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int status;</div><div class='ctx'> 	int retry = 1;</div><div class='hunk'>@@ -389,21 +389,28 @@ start:</div><div class='ctx'> 		return -EREMOTEIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	switch(status&amp;0xff) {</div><div class='del'>-		case 0x06: param-&gt;u.vsb.modulation = VSB_8; break;</div><div class='del'>-		case 0x43: param-&gt;u.vsb.modulation = QAM_64; break;</div><div class='del'>-		case 0x45: param-&gt;u.vsb.modulation = QAM_256; break;</div><div class='del'>-		default:</div><div class='del'>-			if (retry--) goto start;</div><div class='del'>-			printk(KERN_WARNING "or51132: unknown status 0x%02x\n",</div><div class='del'>-			       status&amp;0xff);</div><div class='del'>-			return -EREMOTEIO;</div><div class='add'>+	case 0x06:</div><div class='add'>+		p-&gt;modulation = VSB_8;</div><div class='add'>+		break;</div><div class='add'>+	case 0x43:</div><div class='add'>+		p-&gt;modulation = QAM_64;</div><div class='add'>+		break;</div><div class='add'>+	case 0x45:</div><div class='add'>+		p-&gt;modulation = QAM_256;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		if (retry--)</div><div class='add'>+			goto start;</div><div class='add'>+		printk(KERN_WARNING "or51132: unknown status 0x%02x\n",</div><div class='add'>+		       status&amp;0xff);</div><div class='add'>+		return -EREMOTEIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: Read frequency from frontend, take AFC into account */</div><div class='del'>-	param-&gt;frequency = state-&gt;current_frequency;</div><div class='add'>+	p-&gt;frequency = state-&gt;current_frequency;</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: How to read inversion setting? Receiver 6 register? */</div><div class='del'>-	param-&gt;inversion = INVERSION_AUTO;</div><div class='add'>+	p-&gt;inversion = INVERSION_AUTO;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -579,10 +586,9 @@ struct dvb_frontend* or51132_attach(const struct or51132_config* config,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops or51132_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Oren OR51132 VSB/QAM Frontend",</div><div class='del'>-		.type			= FE_ATSC,</div><div class='ctx'> 		.frequency_min		= 44000000,</div><div class='ctx'> 		.frequency_max		= 958000000,</div><div class='ctx'> 		.frequency_stepsize	= 166666,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c<br/>index c709ce6771c8..c625b57b4333 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/or51211.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/or51211.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/or51211.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/or51211.c</a></div><div class='hunk'>@@ -218,15 +218,15 @@ static int or51211_setmode(struct dvb_frontend* fe, int mode)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int or51211_set_parameters(struct dvb_frontend* fe,</div><div class='del'>-				  struct dvb_frontend_parameters *param)</div><div class='add'>+static int or51211_set_parameters(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct or51211_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	/* Change only if we are actually changing the channel */</div><div class='del'>-	if (state-&gt;current_frequency != param-&gt;frequency) {</div><div class='add'>+	if (state-&gt;current_frequency != p-&gt;frequency) {</div><div class='ctx'> 		if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-			fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+			fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 			if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -234,7 +234,7 @@ static int or51211_set_parameters(struct dvb_frontend* fe,</div><div class='ctx'> 		or51211_setmode(fe,0);</div><div class='ctx'> </div><div class='ctx'> 		/* Update current frequency */</div><div class='del'>-		state-&gt;current_frequency = param-&gt;frequency;</div><div class='add'>+		state-&gt;current_frequency = p-&gt;frequency;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -544,10 +544,9 @@ struct dvb_frontend* or51211_attach(const struct or51211_config* config,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops or51211_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name               = "Oren OR51211 VSB Frontend",</div><div class='del'>-		.type               = FE_ATSC,</div><div class='ctx'> 		.frequency_min      = 44000000,</div><div class='ctx'> 		.frequency_max      = 958000000,</div><div class='ctx'> 		.frequency_stepsize = 166666,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c<br/>index 0e2f61a8978f..f71b06221e14 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1409.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/s5h1409.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1409.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/s5h1409.c</a></div><div class='hunk'>@@ -631,9 +631,9 @@ static void s5h1409_set_qam_interleave_mode_legacy(struct dvb_frontend *fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Talk to the demod, set the FEC, GUARD, QAM settings etc */</div><div class='del'>-static int s5h1409_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-				 struct dvb_frontend_parameters *p)</div><div class='add'>+static int s5h1409_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct s5h1409_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s(frequency=%d)\n", __func__, p-&gt;frequency);</div><div class='hunk'>@@ -642,12 +642,12 @@ static int s5h1409_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;current_frequency = p-&gt;frequency;</div><div class='ctx'> </div><div class='del'>-	s5h1409_enable_modulation(fe, p-&gt;u.vsb.modulation);</div><div class='add'>+	s5h1409_enable_modulation(fe, p-&gt;modulation);</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -879,7 +879,36 @@ static int s5h1409_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='ctx'> static int s5h1409_read_signal_strength(struct dvb_frontend *fe,</div><div class='ctx'> 					u16 *signal_strength)</div><div class='ctx'> {</div><div class='del'>-	return s5h1409_read_snr(fe, signal_strength);</div><div class='add'>+	/* borrowed from lgdt330x.c</div><div class='add'>+	 *</div><div class='add'>+	 * Calculate strength from SNR up to 35dB</div><div class='add'>+	 * Even though the SNR can go higher than 35dB,</div><div class='add'>+	 * there is some comfort factor in having a range of</div><div class='add'>+	 * strong signals that can show at 100%</div><div class='add'>+	 */</div><div class='add'>+	u16 snr;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int ret = s5h1409_read_snr(fe, &amp;snr);</div><div class='add'>+</div><div class='add'>+	*signal_strength = 0;</div><div class='add'>+</div><div class='add'>+	if (0 == ret) {</div><div class='add'>+		/* The following calculation method was chosen</div><div class='add'>+		 * purely for the sake of code re-use from the</div><div class='add'>+		 * other demod drivers that use this method */</div><div class='add'>+</div><div class='add'>+		/* Convert from SNR in dB * 10 to 8.24 fixed-point */</div><div class='add'>+		tmp = (snr * ((1 &lt;&lt; 24) / 10));</div><div class='add'>+</div><div class='add'>+		/* Convert from 8.24 fixed-point to</div><div class='add'>+		 * scale the range 0 - 35*2^24 into 0 - 65535*/</div><div class='add'>+		if (tmp &gt;= 8960 * 0x10000)</div><div class='add'>+			*signal_strength = 0xffff;</div><div class='add'>+		else</div><div class='add'>+			*signal_strength = tmp / 8960;</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 s5h1409_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='hunk'>@@ -896,13 +925,13 @@ static int s5h1409_read_ber(struct dvb_frontend *fe, u32 *ber)</div><div class='ctx'> 	return s5h1409_read_ucblocks(fe, ber);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1409_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-				struct dvb_frontend_parameters *p)</div><div class='add'>+static int s5h1409_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct s5h1409_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;frequency = state-&gt;current_frequency;</div><div class='del'>-	p-&gt;u.vsb.modulation = state-&gt;current_modulation;</div><div class='add'>+	p-&gt;modulation = state-&gt;current_modulation;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -967,10 +996,9 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(s5h1409_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops s5h1409_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Samsung S5H1409 QAM/8VSB Frontend",</div><div class='del'>-		.type			= FE_ATSC,</div><div class='ctx'> 		.frequency_min		= 54000000,</div><div class='ctx'> 		.frequency_max		= 858000000,</div><div class='ctx'> 		.frequency_stepsize	= 62500,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/s5h1411.c b/drivers/media/dvb/frontends/s5h1411.c<br/>index d8adf1e32019..6cc4b7a9dd60 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1411.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/s5h1411.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1411.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/s5h1411.c</a></div><div class='hunk'>@@ -585,9 +585,9 @@ static int s5h1411_register_reset(struct dvb_frontend *fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Talk to the demod, set the FEC, GUARD, QAM settings etc */</div><div class='del'>-static int s5h1411_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int s5h1411_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct s5h1411_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s(frequency=%d)\n", __func__, p-&gt;frequency);</div><div class='hunk'>@@ -596,13 +596,13 @@ static int s5h1411_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;current_frequency = p-&gt;frequency;</div><div class='ctx'> </div><div class='del'>-	s5h1411_enable_modulation(fe, p-&gt;u.vsb.modulation);</div><div class='add'>+	s5h1411_enable_modulation(fe, p-&gt;modulation);</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> </div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> </div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='hunk'>@@ -794,7 +794,36 @@ static int s5h1411_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='ctx'> static int s5h1411_read_signal_strength(struct dvb_frontend *fe,</div><div class='ctx'> 	u16 *signal_strength)</div><div class='ctx'> {</div><div class='del'>-	return s5h1411_read_snr(fe, signal_strength);</div><div class='add'>+	/* borrowed from lgdt330x.c</div><div class='add'>+	 *</div><div class='add'>+	 * Calculate strength from SNR up to 35dB</div><div class='add'>+	 * Even though the SNR can go higher than 35dB,</div><div class='add'>+	 * there is some comfort factor in having a range of</div><div class='add'>+	 * strong signals that can show at 100%</div><div class='add'>+	 */</div><div class='add'>+	u16 snr;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int ret = s5h1411_read_snr(fe, &amp;snr);</div><div class='add'>+</div><div class='add'>+	*signal_strength = 0;</div><div class='add'>+</div><div class='add'>+	if (0 == ret) {</div><div class='add'>+		/* The following calculation method was chosen</div><div class='add'>+		 * purely for the sake of code re-use from the</div><div class='add'>+		 * other demod drivers that use this method */</div><div class='add'>+</div><div class='add'>+		/* Convert from SNR in dB * 10 to 8.24 fixed-point */</div><div class='add'>+		tmp = (snr * ((1 &lt;&lt; 24) / 10));</div><div class='add'>+</div><div class='add'>+		/* Convert from 8.24 fixed-point to</div><div class='add'>+		 * scale the range 0 - 35*2^24 into 0 - 65535*/</div><div class='add'>+		if (tmp &gt;= 8960 * 0x10000)</div><div class='add'>+			*signal_strength = 0xffff;</div><div class='add'>+		else</div><div class='add'>+			*signal_strength = tmp / 8960;</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 s5h1411_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='hunk'>@@ -811,13 +840,13 @@ static int s5h1411_read_ber(struct dvb_frontend *fe, u32 *ber)</div><div class='ctx'> 	return s5h1411_read_ucblocks(fe, ber);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1411_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-				struct dvb_frontend_parameters *p)</div><div class='add'>+static int s5h1411_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct s5h1411_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;frequency = state-&gt;current_frequency;</div><div class='del'>-	p-&gt;u.vsb.modulation = state-&gt;current_modulation;</div><div class='add'>+	p-&gt;modulation = state-&gt;current_modulation;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -886,10 +915,9 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(s5h1411_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops s5h1411_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Samsung S5H1411 QAM/8VSB Frontend",</div><div class='del'>-		.type			= FE_ATSC,</div><div class='ctx'> 		.frequency_min		= 54000000,</div><div class='ctx'> 		.frequency_max		= 858000000,</div><div class='ctx'> 		.frequency_stepsize	= 62500,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c<br/>index 3879d2e378aa..2322257c69ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1420.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/s5h1420.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1420.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/s5h1420.c</a></div><div class='hunk'>@@ -472,15 +472,15 @@ static void s5h1420_reset(struct s5h1420_state* state)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void s5h1420_setsymbolrate(struct s5h1420_state* state,</div><div class='del'>-				  struct dvb_frontend_parameters *p)</div><div class='add'>+				  struct dtv_frontend_properties *p)</div><div class='ctx'> {</div><div class='ctx'> 	u8 v;</div><div class='ctx'> 	u64 val;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("enter %s\n", __func__);</div><div class='ctx'> </div><div class='del'>-	val = ((u64) p-&gt;u.qpsk.symbol_rate / 1000ULL) * (1ULL&lt;&lt;24);</div><div class='del'>-	if (p-&gt;u.qpsk.symbol_rate &lt; 29000000)</div><div class='add'>+	val = ((u64) p-&gt;symbol_rate / 1000ULL) * (1ULL&lt;&lt;24);</div><div class='add'>+	if (p-&gt;symbol_rate &lt; 29000000)</div><div class='ctx'> 		val *= 2;</div><div class='ctx'> 	do_div(val, (state-&gt;fclk / 1000));</div><div class='ctx'> </div><div class='hunk'>@@ -543,7 +543,7 @@ static int s5h1420_getfreqoffset(struct s5h1420_state* state)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void s5h1420_setfec_inversion(struct s5h1420_state* state,</div><div class='del'>-				     struct dvb_frontend_parameters *p)</div><div class='add'>+				     struct dtv_frontend_properties *p)</div><div class='ctx'> {</div><div class='ctx'> 	u8 inversion = 0;</div><div class='ctx'> 	u8 vit08, vit09;</div><div class='hunk'>@@ -555,11 +555,11 @@ static void s5h1420_setfec_inversion(struct s5h1420_state* state,</div><div class='ctx'> 	else if (p-&gt;inversion == INVERSION_ON)</div><div class='ctx'> 		inversion = state-&gt;config-&gt;invert ? 0 : 0x08;</div><div class='ctx'> </div><div class='del'>-	if ((p-&gt;u.qpsk.fec_inner == FEC_AUTO) || (p-&gt;inversion == INVERSION_AUTO)) {</div><div class='add'>+	if ((p-&gt;fec_inner == FEC_AUTO) || (p-&gt;inversion == INVERSION_AUTO)) {</div><div class='ctx'> 		vit08 = 0x3f;</div><div class='ctx'> 		vit09 = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		switch(p-&gt;u.qpsk.fec_inner) {</div><div class='add'>+		switch (p-&gt;fec_inner) {</div><div class='ctx'> 		case FEC_1_2:</div><div class='ctx'> 			vit08 = 0x01; vit09 = 0x10;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -628,9 +628,9 @@ static fe_spectral_inversion_t s5h1420_getinversion(struct s5h1420_state* state)</div><div class='ctx'> 	return INVERSION_OFF;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1420_set_frontend(struct dvb_frontend* fe,</div><div class='del'>-				struct dvb_frontend_parameters *p)</div><div class='add'>+static int s5h1420_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct s5h1420_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int frequency_delta;</div><div class='ctx'> 	struct dvb_frontend_tune_settings fesettings;</div><div class='hunk'>@@ -639,17 +639,16 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	dprintk("enter %s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* check if we should do a fast-tune */</div><div class='del'>-	memcpy(&amp;fesettings.parameters, p, sizeof(struct dvb_frontend_parameters));</div><div class='ctx'> 	s5h1420_get_tune_settings(fe, &amp;fesettings);</div><div class='ctx'> 	frequency_delta = p-&gt;frequency - state-&gt;tunedfreq;</div><div class='ctx'> 	if ((frequency_delta &gt; -fesettings.max_drift) &amp;&amp;</div><div class='ctx'> 			(frequency_delta &lt; fesettings.max_drift) &amp;&amp;</div><div class='ctx'> 			(frequency_delta != 0) &amp;&amp;</div><div class='del'>-			(state-&gt;fec_inner == p-&gt;u.qpsk.fec_inner) &amp;&amp;</div><div class='del'>-			(state-&gt;symbol_rate == p-&gt;u.qpsk.symbol_rate)) {</div><div class='add'>+			(state-&gt;fec_inner == p-&gt;fec_inner) &amp;&amp;</div><div class='add'>+			(state-&gt;symbol_rate == p-&gt;symbol_rate)) {</div><div class='ctx'> </div><div class='ctx'> 		if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-			fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+			fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 			if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (fe-&gt;ops.tuner_ops.get_frequency) {</div><div class='hunk'>@@ -669,13 +668,13 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	s5h1420_reset(state);</div><div class='ctx'> </div><div class='ctx'> 	/* set s5h1420 fclk PLL according to desired symbol rate */</div><div class='del'>-	if (p-&gt;u.qpsk.symbol_rate &gt; 33000000)</div><div class='add'>+	if (p-&gt;symbol_rate &gt; 33000000)</div><div class='ctx'> 		state-&gt;fclk = 80000000;</div><div class='del'>-	else if (p-&gt;u.qpsk.symbol_rate &gt; 28500000)</div><div class='add'>+	else if (p-&gt;symbol_rate &gt; 28500000)</div><div class='ctx'> 		state-&gt;fclk = 59000000;</div><div class='del'>-	else if (p-&gt;u.qpsk.symbol_rate &gt; 25000000)</div><div class='add'>+	else if (p-&gt;symbol_rate &gt; 25000000)</div><div class='ctx'> 		state-&gt;fclk = 86000000;</div><div class='del'>-	else if (p-&gt;u.qpsk.symbol_rate &gt; 1900000)</div><div class='add'>+	else if (p-&gt;symbol_rate &gt; 1900000)</div><div class='ctx'> 		state-&gt;fclk = 88000000;</div><div class='ctx'> 	else</div><div class='ctx'> 		state-&gt;fclk = 44000000;</div><div class='hunk'>@@ -705,7 +704,7 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	s5h1420_writereg(state, DiS01, (state-&gt;fclk + (TONE_FREQ * 32) - 1) / (TONE_FREQ * 32));</div><div class='ctx'> </div><div class='ctx'> 	/* TODO DC offset removal, config parameter ? */</div><div class='del'>-	if (p-&gt;u.qpsk.symbol_rate &gt; 29000000)</div><div class='add'>+	if (p-&gt;symbol_rate &gt; 29000000)</div><div class='ctx'> 		s5h1420_writereg(state, QPSK01, 0xae | 0x10);</div><div class='ctx'> 	else</div><div class='ctx'> 		s5h1420_writereg(state, QPSK01, 0xac | 0x10);</div><div class='hunk'>@@ -718,15 +717,15 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	s5h1420_writereg(state, Loop01, 0xF0);</div><div class='ctx'> 	s5h1420_writereg(state, Loop02, 0x2a); /* e7 for s5h1420 */</div><div class='ctx'> 	s5h1420_writereg(state, Loop03, 0x79); /* 78 for s5h1420 */</div><div class='del'>-	if (p-&gt;u.qpsk.symbol_rate &gt; 20000000)</div><div class='add'>+	if (p-&gt;symbol_rate &gt; 20000000)</div><div class='ctx'> 		s5h1420_writereg(state, Loop04, 0x79);</div><div class='ctx'> 	else</div><div class='ctx'> 		s5h1420_writereg(state, Loop04, 0x58);</div><div class='ctx'> 	s5h1420_writereg(state, Loop05, 0x6b);</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;u.qpsk.symbol_rate &gt;= 8000000)</div><div class='add'>+	if (p-&gt;symbol_rate &gt;= 8000000)</div><div class='ctx'> 		s5h1420_writereg(state, Post01, (0 &lt;&lt; 6) | 0x10);</div><div class='del'>-	else if (p-&gt;u.qpsk.symbol_rate &gt;= 4000000)</div><div class='add'>+	else if (p-&gt;symbol_rate &gt;= 4000000)</div><div class='ctx'> 		s5h1420_writereg(state, Post01, (1 &lt;&lt; 6) | 0x10);</div><div class='ctx'> 	else</div><div class='ctx'> 		s5h1420_writereg(state, Post01, (3 &lt;&lt; 6) | 0x10);</div><div class='hunk'>@@ -744,7 +743,7 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> </div><div class='ctx'> 	/* set tuner PLL */</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 		s5h1420_setfreqoffset(state, 0);</div><div class='hunk'>@@ -757,8 +756,8 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	/* start QPSK */</div><div class='ctx'> 	s5h1420_writereg(state, QPSK01, s5h1420_readreg(state, QPSK01) | 1);</div><div class='ctx'> </div><div class='del'>-	state-&gt;fec_inner = p-&gt;u.qpsk.fec_inner;</div><div class='del'>-	state-&gt;symbol_rate = p-&gt;u.qpsk.symbol_rate;</div><div class='add'>+	state-&gt;fec_inner = p-&gt;fec_inner;</div><div class='add'>+	state-&gt;symbol_rate = p-&gt;symbol_rate;</div><div class='ctx'> 	state-&gt;postlocked = 0;</div><div class='ctx'> 	state-&gt;tunedfreq = p-&gt;frequency;</div><div class='ctx'> </div><div class='hunk'>@@ -766,15 +765,15 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1420_get_frontend(struct dvb_frontend* fe,</div><div class='del'>-				struct dvb_frontend_parameters *p)</div><div class='add'>+static int s5h1420_get_frontend(struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct s5h1420_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;frequency = state-&gt;tunedfreq + s5h1420_getfreqoffset(state);</div><div class='ctx'> 	p-&gt;inversion = s5h1420_getinversion(state);</div><div class='del'>-	p-&gt;u.qpsk.symbol_rate = s5h1420_getsymbolrate(state);</div><div class='del'>-	p-&gt;u.qpsk.fec_inner = s5h1420_getfec(state);</div><div class='add'>+	p-&gt;symbol_rate = s5h1420_getsymbolrate(state);</div><div class='add'>+	p-&gt;fec_inner = s5h1420_getfec(state);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -782,29 +781,30 @@ static int s5h1420_get_frontend(struct dvb_frontend* fe,</div><div class='ctx'> static int s5h1420_get_tune_settings(struct dvb_frontend* fe,</div><div class='ctx'> 				     struct dvb_frontend_tune_settings* fesettings)</div><div class='ctx'> {</div><div class='del'>-	if (fesettings-&gt;parameters.u.qpsk.symbol_rate &gt; 20000000) {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	if (p-&gt;symbol_rate &gt; 20000000) {</div><div class='ctx'> 		fesettings-&gt;min_delay_ms = 50;</div><div class='ctx'> 		fesettings-&gt;step_size = 2000;</div><div class='ctx'> 		fesettings-&gt;max_drift = 8000;</div><div class='del'>-	} else if (fesettings-&gt;parameters.u.qpsk.symbol_rate &gt; 12000000) {</div><div class='add'>+	} else if (p-&gt;symbol_rate &gt; 12000000) {</div><div class='ctx'> 		fesettings-&gt;min_delay_ms = 100;</div><div class='ctx'> 		fesettings-&gt;step_size = 1500;</div><div class='ctx'> 		fesettings-&gt;max_drift = 9000;</div><div class='del'>-	} else if (fesettings-&gt;parameters.u.qpsk.symbol_rate &gt; 8000000) {</div><div class='add'>+	} else if (p-&gt;symbol_rate &gt; 8000000) {</div><div class='ctx'> 		fesettings-&gt;min_delay_ms = 100;</div><div class='ctx'> 		fesettings-&gt;step_size = 1000;</div><div class='ctx'> 		fesettings-&gt;max_drift = 8000;</div><div class='del'>-	} else if (fesettings-&gt;parameters.u.qpsk.symbol_rate &gt; 4000000) {</div><div class='add'>+	} else if (p-&gt;symbol_rate &gt; 4000000) {</div><div class='ctx'> 		fesettings-&gt;min_delay_ms = 100;</div><div class='ctx'> 		fesettings-&gt;step_size = 500;</div><div class='ctx'> 		fesettings-&gt;max_drift = 7000;</div><div class='del'>-	} else if (fesettings-&gt;parameters.u.qpsk.symbol_rate &gt; 2000000) {</div><div class='add'>+	} else if (p-&gt;symbol_rate &gt; 2000000) {</div><div class='ctx'> 		fesettings-&gt;min_delay_ms = 200;</div><div class='del'>-		fesettings-&gt;step_size = (fesettings-&gt;parameters.u.qpsk.symbol_rate / 8000);</div><div class='add'>+		fesettings-&gt;step_size = (p-&gt;symbol_rate / 8000);</div><div class='ctx'> 		fesettings-&gt;max_drift = 14 * fesettings-&gt;step_size;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		fesettings-&gt;min_delay_ms = 200;</div><div class='del'>-		fesettings-&gt;step_size = (fesettings-&gt;parameters.u.qpsk.symbol_rate / 8000);</div><div class='add'>+		fesettings-&gt;step_size = (p-&gt;symbol_rate / 8000);</div><div class='ctx'> 		fesettings-&gt;max_drift = 18 * fesettings-&gt;step_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -937,10 +937,9 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(s5h1420_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops s5h1420_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name     = "Samsung S5H1420/PnpNetwork PN1010 DVB-S",</div><div class='del'>-		.type     = FE_QPSK,</div><div class='ctx'> 		.frequency_min    = 950000,</div><div class='ctx'> 		.frequency_max    = 2150000,</div><div class='ctx'> 		.frequency_stepsize = 125,     /* kHz for QPSK frontends */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/s5h1432.c b/drivers/media/dvb/frontends/s5h1432.c<br/>index 0c6dcb90d168..8352ce1c9556 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1432.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/s5h1432.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1432.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/s5h1432.c</a></div><div class='hunk'>@@ -178,9 +178,9 @@ static int s5h1432_set_IF(struct dvb_frontend *fe, u32 ifFreqHz)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Talk to the demod, set the FEC, GUARD, QAM settings etc */</div><div class='del'>-static int s5h1432_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-				struct dvb_frontend_parameters *p)</div><div class='add'>+static int s5h1432_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	u32 dvb_bandwidth = 8;</div><div class='ctx'> 	struct s5h1432_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='hunk'>@@ -188,26 +188,26 @@ static int s5h1432_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 		/*current_frequency = p-&gt;frequency; */</div><div class='ctx'> 		/*state-&gt;current_frequency = p-&gt;frequency; */</div><div class='ctx'> 	} else {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		msleep(300);</div><div class='ctx'> 		s5h1432_set_channel_bandwidth(fe, dvb_bandwidth);</div><div class='del'>-		switch (p-&gt;u.ofdm.bandwidth) {</div><div class='del'>-		case BANDWIDTH_6_MHZ:</div><div class='add'>+		switch (p-&gt;bandwidth_hz) {</div><div class='add'>+		case 6000000:</div><div class='ctx'> 			dvb_bandwidth = 6;</div><div class='ctx'> 			s5h1432_set_IF(fe, IF_FREQ_4_MHZ);</div><div class='ctx'> 			break;</div><div class='del'>-		case BANDWIDTH_7_MHZ:</div><div class='add'>+		case 7000000:</div><div class='ctx'> 			dvb_bandwidth = 7;</div><div class='ctx'> 			s5h1432_set_IF(fe, IF_FREQ_4_MHZ);</div><div class='ctx'> 			break;</div><div class='del'>-		case BANDWIDTH_8_MHZ:</div><div class='add'>+		case 8000000:</div><div class='ctx'> 			dvb_bandwidth = 8;</div><div class='ctx'> 			s5h1432_set_IF(fe, IF_FREQ_4_MHZ);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		/*fe-&gt;ops.tuner_ops.set_params(fe, p); */</div><div class='add'>+		/*fe-&gt;ops.tuner_ops.set_params(fe); */</div><div class='ctx'> /*Soft Reset chip*/</div><div class='ctx'> 		msleep(30);</div><div class='ctx'> 		s5h1432_writereg(state, S5H1432_I2C_TOP_ADDR, 0x09, 0x1a);</div><div class='hunk'>@@ -215,23 +215,23 @@ static int s5h1432_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 		s5h1432_writereg(state, S5H1432_I2C_TOP_ADDR, 0x09, 0x1b);</div><div class='ctx'> </div><div class='ctx'> 		s5h1432_set_channel_bandwidth(fe, dvb_bandwidth);</div><div class='del'>-		switch (p-&gt;u.ofdm.bandwidth) {</div><div class='del'>-		case BANDWIDTH_6_MHZ:</div><div class='add'>+		switch (p-&gt;bandwidth_hz) {</div><div class='add'>+		case 6000000:</div><div class='ctx'> 			dvb_bandwidth = 6;</div><div class='ctx'> 			s5h1432_set_IF(fe, IF_FREQ_4_MHZ);</div><div class='ctx'> 			break;</div><div class='del'>-		case BANDWIDTH_7_MHZ:</div><div class='add'>+		case 7000000:</div><div class='ctx'> 			dvb_bandwidth = 7;</div><div class='ctx'> 			s5h1432_set_IF(fe, IF_FREQ_4_MHZ);</div><div class='ctx'> 			break;</div><div class='del'>-		case BANDWIDTH_8_MHZ:</div><div class='add'>+		case 8000000:</div><div class='ctx'> 			dvb_bandwidth = 8;</div><div class='ctx'> 			s5h1432_set_IF(fe, IF_FREQ_4_MHZ);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		/*fe-&gt;ops.tuner_ops.set_params(fe,p); */</div><div class='add'>+		/*fe-&gt;ops.tuner_ops.set_params(fe); */</div><div class='ctx'> 		/*Soft Reset chip*/</div><div class='ctx'> 		msleep(30);</div><div class='ctx'> 		s5h1432_writereg(state, S5H1432_I2C_TOP_ADDR, 0x09, 0x1a);</div><div class='hunk'>@@ -329,12 +329,6 @@ static int s5h1432_read_ber(struct dvb_frontend *fe, u32 *ber)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s5h1432_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-				struct dvb_frontend_parameters *p)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int s5h1432_get_tune_settings(struct dvb_frontend *fe,</div><div class='ctx'> 				     struct dvb_frontend_tune_settings *tune)</div><div class='ctx'> {</div><div class='hunk'>@@ -381,10 +375,9 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(s5h1432_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops s5h1432_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		 .name = "Samsung s5h1432 DVB-T Frontend",</div><div class='del'>-		 .type = FE_OFDM,</div><div class='ctx'> 		 .frequency_min = 177000000,</div><div class='ctx'> 		 .frequency_max = 858000000,</div><div class='ctx'> 		 .frequency_stepsize = 166666,</div><div class='hunk'>@@ -397,7 +390,6 @@ static struct dvb_frontend_ops s5h1432_ops = {</div><div class='ctx'> 	.init = s5h1432_init,</div><div class='ctx'> 	.sleep = s5h1432_sleep,</div><div class='ctx'> 	.set_frontend = s5h1432_set_frontend,</div><div class='del'>-	.get_frontend = s5h1432_get_frontend,</div><div class='ctx'> 	.get_tune_settings = s5h1432_get_tune_settings,</div><div class='ctx'> 	.read_status = s5h1432_read_status,</div><div class='ctx'> 	.read_ber = s5h1432_read_ber,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/s921.c b/drivers/media/dvb/frontends/s921.c<br/>index ca0103d5f148..cd2288c07147 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s921.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/s921.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s921.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/s921.c</a></div><div class='hunk'>@@ -262,9 +262,9 @@ static int s921_i2c_readreg(struct s921_state *state, u8 i2c_addr, u8 reg)</div><div class='ctx'> 	s921_i2c_writeregdata(state, state-&gt;config-&gt;demod_address, \</div><div class='ctx'> 	regdata, ARRAY_SIZE(regdata))</div><div class='ctx'> </div><div class='del'>-static int s921_pll_tune(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int s921_pll_tune(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct s921_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int band, rc, i;</div><div class='ctx'> 	unsigned long f_offset;</div><div class='hunk'>@@ -414,9 +414,9 @@ static int s921_read_signal_strength(struct dvb_frontend *fe, u16 *strength)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s921_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int s921_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct s921_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -424,7 +424,7 @@ static int s921_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: We don't know how to use non-auto mode */</div><div class='ctx'> </div><div class='del'>-	rc = s921_pll_tune(fe, p);</div><div class='add'>+	rc = s921_pll_tune(fe);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='hunk'>@@ -433,19 +433,20 @@ static int s921_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s921_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int s921_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct s921_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: Probably it is possible to get it from regs f1 and f2 */</div><div class='ctx'> 	p-&gt;frequency = state-&gt;currentfreq;</div><div class='add'>+	p-&gt;delivery_system = SYS_ISDBT;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int s921_tune(struct dvb_frontend *fe,</div><div class='del'>-			struct dvb_frontend_parameters *params,</div><div class='add'>+			bool re_tune,</div><div class='ctx'> 			unsigned int mode_flags,</div><div class='ctx'> 			unsigned int *delay,</div><div class='ctx'> 			fe_status_t *status)</div><div class='hunk'>@@ -454,8 +455,8 @@ static int s921_tune(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	dprintk("\n");</div><div class='ctx'> </div><div class='del'>-	if (params != NULL)</div><div class='del'>-		rc = s921_set_frontend(fe, params);</div><div class='add'>+	if (re_tune)</div><div class='add'>+		rc = s921_set_frontend(fe);</div><div class='ctx'> </div><div class='ctx'> 	if (!(mode_flags &amp; FE_TUNE_MODE_ONESHOT))</div><div class='ctx'> 		s921_read_status(fe, status);</div><div class='hunk'>@@ -510,10 +511,10 @@ rcor:</div><div class='ctx'> EXPORT_SYMBOL(s921_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops s921_ops = {</div><div class='add'>+	.delsys = { SYS_ISDBT },</div><div class='ctx'> 	/* Use dib8000 values per default */</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "Sharp S921",</div><div class='del'>-		.type = FE_OFDM,</div><div class='ctx'> 		.frequency_min = 470000000,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Max should be 770MHz instead, according with Sharp docs,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/si21xx.c b/drivers/media/dvb/frontends/si21xx.c<br/>index 4b0c99a08a85..a68a64800df7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/si21xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/si21xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/si21xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/si21xx.c</a></div><div class='hunk'>@@ -690,20 +690,7 @@ static int si21xx_setacquire(struct dvb_frontend *fe, int symbrate,</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int si21xx_set_property(struct dvb_frontend *fe, struct dtv_property *p)</div><div class='del'>-{</div><div class='del'>-	dprintk("%s(..)\n", __func__);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int si21xx_get_property(struct dvb_frontend *fe, struct dtv_property *p)</div><div class='del'>-{</div><div class='del'>-	dprintk("%s(..)\n", __func__);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int si21xx_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-					struct dvb_frontend_parameters *dfp)</div><div class='add'>+static int si21xx_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct si21xx_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='hunk'>@@ -877,10 +864,9 @@ static void si21xx_release(struct dvb_frontend *fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops si21xx_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "SL SI21XX DVB-S",</div><div class='del'>-		.type			= FE_QPSK,</div><div class='ctx'> 		.frequency_min		= 950000,</div><div class='ctx'> 		.frequency_max		= 2150000,</div><div class='ctx'> 		.frequency_stepsize	= 125,	 /* kHz for QPSK frontends */</div><div class='hunk'>@@ -908,8 +894,6 @@ static struct dvb_frontend_ops si21xx_ops = {</div><div class='ctx'> 	.set_tone = si21xx_set_tone,</div><div class='ctx'> 	.set_voltage = si21xx_set_voltage,</div><div class='ctx'> </div><div class='del'>-	.set_property = si21xx_set_property,</div><div class='del'>-	.get_property = si21xx_get_property,</div><div class='ctx'> 	.set_frontend = si21xx_set_frontend,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb/frontends/sp8870.c<br/>index b85eb60a893e..e37274c8f14e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/sp8870.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/sp8870.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/sp8870.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/sp8870.c</a></div><div class='hunk'>@@ -168,13 +168,13 @@ static int sp8870_read_data_valid_signal(struct sp8870_state* state)</div><div class='ctx'> 	return (sp8870_readreg(state, 0x0D02) &gt; 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int configure_reg0xc05 (struct dvb_frontend_parameters *p, u16 *reg0xc05)</div><div class='add'>+static int configure_reg0xc05 (struct dtv_frontend_properties *p, u16 *reg0xc05)</div><div class='ctx'> {</div><div class='ctx'> 	int known_parameters = 1;</div><div class='ctx'> </div><div class='ctx'> 	*reg0xc05 = 0x000;</div><div class='ctx'> </div><div class='del'>-	switch (p-&gt;u.ofdm.constellation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 	case QPSK:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case QAM_16:</div><div class='hunk'>@@ -190,7 +190,7 @@ static int configure_reg0xc05 (struct dvb_frontend_parameters *p, u16 *reg0xc05)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	switch (p-&gt;u.ofdm.hierarchy_information) {</div><div class='add'>+	switch (p-&gt;hierarchy) {</div><div class='ctx'> 	case HIERARCHY_NONE:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HIERARCHY_1:</div><div class='hunk'>@@ -209,7 +209,7 @@ static int configure_reg0xc05 (struct dvb_frontend_parameters *p, u16 *reg0xc05)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	switch (p-&gt;u.ofdm.code_rate_HP) {</div><div class='add'>+	switch (p-&gt;code_rate_HP) {</div><div class='ctx'> 	case FEC_1_2:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FEC_2_3:</div><div class='hunk'>@@ -245,9 +245,9 @@ static int sp8870_wake_up(struct sp8870_state* state)</div><div class='ctx'> 	return sp8870_writereg(state, 0xC18, 0x00D);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sp8870_set_frontend_parameters (struct dvb_frontend* fe,</div><div class='del'>-					   struct dvb_frontend_parameters *p)</div><div class='add'>+static int sp8870_set_frontend_parameters(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct sp8870_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int  err;</div><div class='ctx'> 	u16 reg0xc05;</div><div class='hunk'>@@ -260,7 +260,7 @@ static int sp8870_set_frontend_parameters (struct dvb_frontend* fe,</div><div class='ctx'> </div><div class='ctx'> 	// set tuner parameters</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -277,15 +277,15 @@ static int sp8870_set_frontend_parameters (struct dvb_frontend* fe,</div><div class='ctx'> 	sp8870_writereg(state, 0x030A, 0x0000);</div><div class='ctx'> </div><div class='ctx'> 	// filter for 6/7/8 Mhz channel</div><div class='del'>-	if (p-&gt;u.ofdm.bandwidth == BANDWIDTH_6_MHZ)</div><div class='add'>+	if (p-&gt;bandwidth_hz == 6000000)</div><div class='ctx'> 		sp8870_writereg(state, 0x0311, 0x0002);</div><div class='del'>-	else if (p-&gt;u.ofdm.bandwidth == BANDWIDTH_7_MHZ)</div><div class='add'>+	else if (p-&gt;bandwidth_hz == 7000000)</div><div class='ctx'> 		sp8870_writereg(state, 0x0311, 0x0001);</div><div class='ctx'> 	else</div><div class='ctx'> 		sp8870_writereg(state, 0x0311, 0x0000);</div><div class='ctx'> </div><div class='ctx'> 	// scan order: 2k first = 0x0000, 8k first = 0x0001</div><div class='del'>-	if (p-&gt;u.ofdm.transmission_mode == TRANSMISSION_MODE_2K)</div><div class='add'>+	if (p-&gt;transmission_mode == TRANSMISSION_MODE_2K)</div><div class='ctx'> 		sp8870_writereg(state, 0x0338, 0x0000);</div><div class='ctx'> 	else</div><div class='ctx'> 		sp8870_writereg(state, 0x0338, 0x0001);</div><div class='hunk'>@@ -459,8 +459,9 @@ static int lockups;</div><div class='ctx'> /* only for debugging: counter for channel switches */</div><div class='ctx'> static int switches;</div><div class='ctx'> </div><div class='del'>-static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int sp8870_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct sp8870_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -479,7 +480,8 @@ static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> </div><div class='ctx'> 	for (trials = 1; trials &lt;= MAXTRIALS; trials++) {</div><div class='ctx'> </div><div class='del'>-		if ((err = sp8870_set_frontend_parameters(fe, p)))</div><div class='add'>+		err = sp8870_set_frontend_parameters(fe);</div><div class='add'>+		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='ctx'> 		for (check_count = 0; check_count &lt; MAXCHECKS; check_count++) {</div><div class='hunk'>@@ -579,10 +581,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops sp8870_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Spase SP8870 DVB-T",</div><div class='del'>-		.type			= FE_OFDM,</div><div class='ctx'> 		.frequency_min		= 470000000,</div><div class='ctx'> 		.frequency_max		= 860000000,</div><div class='ctx'> 		.frequency_stepsize	= 166666,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c<br/>index 4a7c3d842608..f4096ccb226e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/sp887x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/sp887x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/sp887x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/sp887x.c</a></div><div class='hunk'>@@ -209,13 +209,13 @@ static int sp887x_initial_setup (struct dvb_frontend* fe, const struct firmware</div><div class='ctx'> 	return 0;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int configure_reg0xc05 (struct dvb_frontend_parameters *p, u16 *reg0xc05)</div><div class='add'>+static int configure_reg0xc05(struct dtv_frontend_properties *p, u16 *reg0xc05)</div><div class='ctx'> {</div><div class='ctx'> 	int known_parameters = 1;</div><div class='ctx'> </div><div class='ctx'> 	*reg0xc05 = 0x000;</div><div class='ctx'> </div><div class='del'>-	switch (p-&gt;u.ofdm.constellation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 	case QPSK:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case QAM_16:</div><div class='hunk'>@@ -231,7 +231,7 @@ static int configure_reg0xc05 (struct dvb_frontend_parameters *p, u16 *reg0xc05)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	switch (p-&gt;u.ofdm.hierarchy_information) {</div><div class='add'>+	switch (p-&gt;hierarchy) {</div><div class='ctx'> 	case HIERARCHY_NONE:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HIERARCHY_1:</div><div class='hunk'>@@ -250,7 +250,7 @@ static int configure_reg0xc05 (struct dvb_frontend_parameters *p, u16 *reg0xc05)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	switch (p-&gt;u.ofdm.code_rate_HP) {</div><div class='add'>+	switch (p-&gt;code_rate_HP) {</div><div class='ctx'> 	case FEC_1_2:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FEC_2_3:</div><div class='hunk'>@@ -303,17 +303,30 @@ static void divide (int n, int d, int *quotient_i, int *quotient_f)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sp887x_correct_offsets (struct sp887x_state* state,</div><div class='del'>-				    struct dvb_frontend_parameters *p,</div><div class='add'>+				    struct dtv_frontend_properties *p,</div><div class='ctx'> 				    int actual_freq)</div><div class='ctx'> {</div><div class='ctx'> 	static const u32 srate_correction [] = { 1879617, 4544878, 8098561 };</div><div class='del'>-	int bw_index = p-&gt;u.ofdm.bandwidth - BANDWIDTH_8_MHZ;</div><div class='add'>+	int bw_index;</div><div class='ctx'> 	int freq_offset = actual_freq - p-&gt;frequency;</div><div class='ctx'> 	int sysclock = 61003; //[kHz]</div><div class='ctx'> 	int ifreq = 36000000;</div><div class='ctx'> 	int freq;</div><div class='ctx'> 	int frequency_shift;</div><div class='ctx'> </div><div class='add'>+	switch (p-&gt;bandwidth_hz) {</div><div class='add'>+	default:</div><div class='add'>+	case 8000000:</div><div class='add'>+		bw_index = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 7000000:</div><div class='add'>+		bw_index = 1;</div><div class='add'>+		break;</div><div class='add'>+	case 6000000:</div><div class='add'>+		bw_index = 2;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (p-&gt;inversion == INVERSION_ON)</div><div class='ctx'> 		freq = ifreq - freq_offset;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -333,17 +346,17 @@ static void sp887x_correct_offsets (struct sp887x_state* state,</div><div class='ctx'> 	sp887x_writereg(state, 0x30a, frequency_shift &amp; 0xfff);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sp887x_setup_frontend_parameters (struct dvb_frontend* fe,</div><div class='del'>-					     struct dvb_frontend_parameters *p)</div><div class='add'>+static int sp887x_setup_frontend_parameters(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct sp887x_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	unsigned actual_freq;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u16 val, reg0xc05;</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;u.ofdm.bandwidth != BANDWIDTH_8_MHZ &amp;&amp;</div><div class='del'>-	    p-&gt;u.ofdm.bandwidth != BANDWIDTH_7_MHZ &amp;&amp;</div><div class='del'>-	    p-&gt;u.ofdm.bandwidth != BANDWIDTH_6_MHZ)</div><div class='add'>+	if (p-&gt;bandwidth_hz != 8000000 &amp;&amp;</div><div class='add'>+	    p-&gt;bandwidth_hz != 7000000 &amp;&amp;</div><div class='add'>+	    p-&gt;bandwidth_hz != 6000000)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if ((err = configure_reg0xc05(p, &amp;reg0xc05)))</div><div class='hunk'>@@ -353,7 +366,7 @@ static int sp887x_setup_frontend_parameters (struct dvb_frontend* fe,</div><div class='ctx'> </div><div class='ctx'> 	/* setup the PLL */</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.get_frequency) {</div><div class='hunk'>@@ -369,9 +382,9 @@ static int sp887x_setup_frontend_parameters (struct dvb_frontend* fe,</div><div class='ctx'> 	sp887x_correct_offsets(state, p, actual_freq);</div><div class='ctx'> </div><div class='ctx'> 	/* filter for 6/7/8 Mhz channel */</div><div class='del'>-	if (p-&gt;u.ofdm.bandwidth == BANDWIDTH_6_MHZ)</div><div class='add'>+	if (p-&gt;bandwidth_hz == 6000000)</div><div class='ctx'> 		val = 2;</div><div class='del'>-	else if (p-&gt;u.ofdm.bandwidth == BANDWIDTH_7_MHZ)</div><div class='add'>+	else if (p-&gt;bandwidth_hz == 7000000)</div><div class='ctx'> 		val = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		val = 0;</div><div class='hunk'>@@ -379,16 +392,16 @@ static int sp887x_setup_frontend_parameters (struct dvb_frontend* fe,</div><div class='ctx'> 	sp887x_writereg(state, 0x311, val);</div><div class='ctx'> </div><div class='ctx'> 	/* scan order: 2k first = 0, 8k first = 1 */</div><div class='del'>-	if (p-&gt;u.ofdm.transmission_mode == TRANSMISSION_MODE_2K)</div><div class='add'>+	if (p-&gt;transmission_mode == TRANSMISSION_MODE_2K)</div><div class='ctx'> 		sp887x_writereg(state, 0x338, 0x000);</div><div class='ctx'> 	else</div><div class='ctx'> 		sp887x_writereg(state, 0x338, 0x001);</div><div class='ctx'> </div><div class='ctx'> 	sp887x_writereg(state, 0xc05, reg0xc05);</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;u.ofdm.bandwidth == BANDWIDTH_6_MHZ)</div><div class='add'>+	if (p-&gt;bandwidth_hz == 6000000)</div><div class='ctx'> 		val = 2 &lt;&lt; 3;</div><div class='del'>-	else if (p-&gt;u.ofdm.bandwidth == BANDWIDTH_7_MHZ)</div><div class='add'>+	else if (p-&gt;bandwidth_hz == 7000000)</div><div class='ctx'> 		val = 3 &lt;&lt; 3;</div><div class='ctx'> 	else</div><div class='ctx'> 		val = 0 &lt;&lt; 3;</div><div class='hunk'>@@ -579,10 +592,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops sp887x_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "Spase SP887x DVB-T",</div><div class='del'>-		.type = FE_OFDM,</div><div class='ctx'> 		.frequency_min =  50500000,</div><div class='ctx'> 		.frequency_max = 858000000,</div><div class='ctx'> 		.frequency_stepsize = 166666,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/stb0899_drv.c b/drivers/media/dvb/frontends/stb0899_drv.c<br/>index 8408ef877b4b..38565beafe23 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stb0899_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stb0899_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stb0899_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/stb0899_drv.c</a></div><div class='hunk'>@@ -1431,7 +1431,7 @@ static void stb0899_set_iterations(struct stb0899_state *state)</div><div class='ctx'> 	stb0899_write_s2reg(state, STB0899_S2FEC, STB0899_BASE_MAX_ITER, STB0899_OFF0_MAX_ITER, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static enum dvbfe_search stb0899_search(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static enum dvbfe_search stb0899_search(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct stb0899_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct stb0899_params *i_params = &amp;state-&gt;params;</div><div class='hunk'>@@ -1441,8 +1441,8 @@ static enum dvbfe_search stb0899_search(struct dvb_frontend *fe, struct dvb_fron</div><div class='ctx'> </div><div class='ctx'> 	u32 SearchRange, gain;</div><div class='ctx'> </div><div class='del'>-	i_params-&gt;freq	= p-&gt;frequency;</div><div class='del'>-	i_params-&gt;srate = p-&gt;u.qpsk.symbol_rate;</div><div class='add'>+	i_params-&gt;freq	= props-&gt;frequency;</div><div class='add'>+	i_params-&gt;srate = props-&gt;symbol_rate;</div><div class='ctx'> 	state-&gt;delsys = props-&gt;delivery_system;</div><div class='ctx'> 	dprintk(state-&gt;verbose, FE_DEBUG, 1, "delivery system=%d", state-&gt;delsys);</div><div class='ctx'> </div><div class='hunk'>@@ -1568,34 +1568,15 @@ static enum dvbfe_search stb0899_search(struct dvb_frontend *fe, struct dvb_fron</div><div class='ctx'> </div><div class='ctx'> 	return DVBFE_ALGO_SEARCH_ERROR;</div><div class='ctx'> }</div><div class='del'>-/*</div><div class='del'>- * stb0899_track</div><div class='del'>- * periodically check the signal level against a specified</div><div class='del'>- * threshold level and perform derotator centering.</div><div class='del'>- * called once we have a lock from a successful search</div><div class='del'>- * event.</div><div class='del'>- *</div><div class='del'>- * Will be called periodically called to maintain the</div><div class='del'>- * lock.</div><div class='del'>- *</div><div class='del'>- * Will be used to get parameters as well as info from</div><div class='del'>- * the decoded baseband header</div><div class='del'>- *</div><div class='del'>- * Once a new lock has established, the internal state</div><div class='del'>- * frequency (internal-&gt;freq) is updated</div><div class='del'>- */</div><div class='del'>-static int stb0899_track(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int stb0899_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int stb0899_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct stb0899_state *state		= fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct stb0899_internal *internal	= &amp;state-&gt;internal;</div><div class='ctx'> </div><div class='ctx'> 	dprintk(state-&gt;verbose, FE_DEBUG, 1, "Get params");</div><div class='del'>-	p-&gt;u.qpsk.symbol_rate = internal-&gt;srate;</div><div class='add'>+	p-&gt;symbol_rate = internal-&gt;srate;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1606,10 +1587,9 @@ static enum dvbfe_algo stb0899_frontend_algo(struct dvb_frontend *fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops stb0899_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBS, SYS_DVBS2, SYS_DSS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name 			= "STB0899 Multistandard",</div><div class='del'>-		.type 			= FE_QPSK,</div><div class='ctx'> 		.frequency_min		= 950000,</div><div class='ctx'> 		.frequency_max 		= 2150000,</div><div class='ctx'> 		.frequency_stepsize	= 0,</div><div class='hunk'>@@ -1632,8 +1612,7 @@ static struct dvb_frontend_ops stb0899_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.get_frontend_algo		= stb0899_frontend_algo,</div><div class='ctx'> 	.search				= stb0899_search,</div><div class='del'>-	.track				= stb0899_track,</div><div class='del'>-	.get_frontend			= stb0899_get_frontend,</div><div class='add'>+	.get_frontend                   = stb0899_get_frontend,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	.read_status			= stb0899_read_status,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/stb6000.c b/drivers/media/dvb/frontends/stb6000.c<br/>index ed699647050e..a0c3c526b132 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stb6000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stb6000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stb6000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/stb6000.c</a></div><div class='hunk'>@@ -75,9 +75,9 @@ static int stb6000_sleep(struct dvb_frontend *fe)</div><div class='ctx'> 	return (ret == 1) ? 0 : ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stb6000_set_params(struct dvb_frontend *fe,</div><div class='del'>-				struct dvb_frontend_parameters *params)</div><div class='add'>+static int stb6000_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct stb6000_priv *priv = fe-&gt;tuner_priv;</div><div class='ctx'> 	unsigned int n, m;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -93,8 +93,8 @@ static int stb6000_set_params(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s:\n", __func__);</div><div class='ctx'> </div><div class='del'>-	freq_mhz = params-&gt;frequency / 1000;</div><div class='del'>-	bandwidth = params-&gt;u.qpsk.symbol_rate / 1000000;</div><div class='add'>+	freq_mhz = p-&gt;frequency / 1000;</div><div class='add'>+	bandwidth = p-&gt;symbol_rate / 1000000;</div><div class='ctx'> </div><div class='ctx'> 	if (bandwidth &gt; 31)</div><div class='ctx'> 		bandwidth = 31;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/stb6100.c b/drivers/media/dvb/frontends/stb6100.c<br/>index bc1a8af4f6e1..def88abb30bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stb6100.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stb6100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stb6100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/stb6100.c</a></div><div class='hunk'>@@ -327,7 +327,7 @@ static int stb6100_set_frequency(struct dvb_frontend *fe, u32 frequency)</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	const struct stb6100_lkup *ptr;</div><div class='ctx'> 	struct stb6100_state *state = fe-&gt;tuner_priv;</div><div class='del'>-	struct dvb_frontend_parameters p;</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> </div><div class='ctx'> 	u32 srate = 0, fvco, nint, nfrac;</div><div class='ctx'> 	u8 regs[STB6100_NUMREGS];</div><div class='hunk'>@@ -337,9 +337,9 @@ static int stb6100_set_frequency(struct dvb_frontend *fe, u32 frequency)</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.get_frontend) {</div><div class='ctx'> 		dprintk(verbose, FE_DEBUG, 1, "Get frontend parameters");</div><div class='del'>-		fe-&gt;ops.get_frontend(fe, &amp;p);</div><div class='add'>+		fe-&gt;ops.get_frontend(fe);</div><div class='ctx'> 	}</div><div class='del'>-	srate = p.u.qpsk.symbol_rate;</div><div class='add'>+	srate = p-&gt;symbol_rate;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up tuner cleanly, LPF calibration on */</div><div class='ctx'> 	rc = stb6100_write_reg(state, STB6100_FCCK, 0x4d | STB6100_FCCK_FCCK);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/stv0288.c b/drivers/media/dvb/frontends/stv0288.c<br/>index 0aa3962ff18b..fb5548a82208 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv0288.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stv0288.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv0288.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/stv0288.c</a></div><div class='hunk'>@@ -452,14 +452,7 @@ static int stv0288_set_property(struct dvb_frontend *fe, struct dtv_property *p)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stv0288_get_property(struct dvb_frontend *fe, struct dtv_property *p)</div><div class='del'>-{</div><div class='del'>-	dprintk("%s(..)\n", __func__);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stv0288_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-					struct dvb_frontend_parameters *dfp)</div><div class='add'>+static int stv0288_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct stv0288_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='hunk'>@@ -481,10 +474,8 @@ static int stv0288_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 		state-&gt;config-&gt;set_ts_params(fe, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* only frequency &amp; symbol_rate are used for tuner*/</div><div class='del'>-	dfp-&gt;frequency = c-&gt;frequency;</div><div class='del'>-	dfp-&gt;u.qpsk.symbol_rate = c-&gt;symbol_rate;</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, dfp);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -545,10 +536,9 @@ static void stv0288_release(struct dvb_frontend *fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops stv0288_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "ST STV0288 DVB-S",</div><div class='del'>-		.type			= FE_QPSK,</div><div class='ctx'> 		.frequency_min		= 950000,</div><div class='ctx'> 		.frequency_max		= 2150000,</div><div class='ctx'> 		.frequency_stepsize	= 1000,	 /* kHz for QPSK frontends */</div><div class='hunk'>@@ -578,7 +568,6 @@ static struct dvb_frontend_ops stv0288_ops = {</div><div class='ctx'> 	.set_voltage = stv0288_set_voltage,</div><div class='ctx'> </div><div class='ctx'> 	.set_property = stv0288_set_property,</div><div class='del'>-	.get_property = stv0288_get_property,</div><div class='ctx'> 	.set_frontend = stv0288_set_frontend,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c<br/>index 84d88f33275e..85c157a1fe5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv0297.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stv0297.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv0297.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/stv0297.c</a></div><div class='hunk'>@@ -404,8 +404,9 @@ static int stv0297_read_ucblocks(struct dvb_frontend *fe, u32 * ucblocks)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int stv0297_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct stv0297_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int u_threshold;</div><div class='ctx'> 	int initial_u;</div><div class='hunk'>@@ -417,7 +418,7 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> 	unsigned long timeout;</div><div class='ctx'> 	fe_spectral_inversion_t inversion;</div><div class='ctx'> </div><div class='del'>-	switch (p-&gt;u.qam.modulation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 	case QAM_16:</div><div class='ctx'> 	case QAM_32:</div><div class='ctx'> 	case QAM_64:</div><div class='hunk'>@@ -455,7 +456,7 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> </div><div class='ctx'> 	stv0297_init(fe);</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -519,16 +520,16 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> 	stv0297_writereg_mask(state, 0x69, 0x0f, 0x00);</div><div class='ctx'> </div><div class='ctx'> 	/* set parameters */</div><div class='del'>-	stv0297_set_qam(state, p-&gt;u.qam.modulation);</div><div class='del'>-	stv0297_set_symbolrate(state, p-&gt;u.qam.symbol_rate / 1000);</div><div class='del'>-	stv0297_set_sweeprate(state, sweeprate, p-&gt;u.qam.symbol_rate / 1000);</div><div class='add'>+	stv0297_set_qam(state, p-&gt;modulation);</div><div class='add'>+	stv0297_set_symbolrate(state, p-&gt;symbol_rate / 1000);</div><div class='add'>+	stv0297_set_sweeprate(state, sweeprate, p-&gt;symbol_rate / 1000);</div><div class='ctx'> 	stv0297_set_carrieroffset(state, carrieroffset);</div><div class='ctx'> 	stv0297_set_inversion(state, inversion);</div><div class='ctx'> </div><div class='ctx'> 	/* kick off lock */</div><div class='ctx'> 	/* Disable corner detection for higher QAMs */</div><div class='del'>-	if (p-&gt;u.qam.modulation == QAM_128 ||</div><div class='del'>-		p-&gt;u.qam.modulation == QAM_256)</div><div class='add'>+	if (p-&gt;modulation == QAM_128 ||</div><div class='add'>+		p-&gt;modulation == QAM_256)</div><div class='ctx'> 		stv0297_writereg_mask(state, 0x88, 0x08, 0x00);</div><div class='ctx'> 	else</div><div class='ctx'> 		stv0297_writereg_mask(state, 0x88, 0x08, 0x08);</div><div class='hunk'>@@ -613,8 +614,9 @@ timeout:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stv0297_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int stv0297_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct stv0297_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int reg_00, reg_83;</div><div class='ctx'> </div><div class='hunk'>@@ -625,24 +627,24 @@ static int stv0297_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> 	p-&gt;inversion = (reg_83 &amp; 0x08) ? INVERSION_ON : INVERSION_OFF;</div><div class='ctx'> 	if (state-&gt;config-&gt;invert)</div><div class='ctx'> 		p-&gt;inversion = (p-&gt;inversion == INVERSION_ON) ? INVERSION_OFF : INVERSION_ON;</div><div class='del'>-	p-&gt;u.qam.symbol_rate = stv0297_get_symbolrate(state) * 1000;</div><div class='del'>-	p-&gt;u.qam.fec_inner = FEC_NONE;</div><div class='add'>+	p-&gt;symbol_rate = stv0297_get_symbolrate(state) * 1000;</div><div class='add'>+	p-&gt;fec_inner = FEC_NONE;</div><div class='ctx'> </div><div class='ctx'> 	switch ((reg_00 &gt;&gt; 4) &amp; 0x7) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		p-&gt;u.qam.modulation = QAM_16;</div><div class='add'>+		p-&gt;modulation = QAM_16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		p-&gt;u.qam.modulation = QAM_32;</div><div class='add'>+		p-&gt;modulation = QAM_32;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		p-&gt;u.qam.modulation = QAM_128;</div><div class='add'>+		p-&gt;modulation = QAM_128;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		p-&gt;u.qam.modulation = QAM_256;</div><div class='add'>+		p-&gt;modulation = QAM_256;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4:</div><div class='del'>-		p-&gt;u.qam.modulation = QAM_64;</div><div class='add'>+		p-&gt;modulation = QAM_64;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -688,10 +690,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops stv0297_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBC_ANNEX_A },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		 .name = "ST STV0297 DVB-C",</div><div class='del'>-		 .type = FE_QAM,</div><div class='ctx'> 		 .frequency_min = 47000000,</div><div class='ctx'> 		 .frequency_max = 862000000,</div><div class='ctx'> 		 .frequency_stepsize = 62500,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c<br/>index 42684bec8883..057b5f8effc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv0299.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stv0299.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv0299.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/stv0299.c</a></div><div class='hunk'>@@ -559,8 +559,9 @@ static int stv0299_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters * p)</div><div class='add'>+static int stv0299_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct stv0299_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int invval = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -579,24 +580,25 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> 	stv0299_writeregI(state, 0x0c, (stv0299_readreg(state, 0x0c) &amp; 0xfe) | invval);</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	stv0299_set_FEC (state, p-&gt;u.qpsk.fec_inner);</div><div class='del'>-	stv0299_set_symbolrate (fe, p-&gt;u.qpsk.symbol_rate);</div><div class='add'>+	stv0299_set_FEC(state, p-&gt;fec_inner);</div><div class='add'>+	stv0299_set_symbolrate(fe, p-&gt;symbol_rate);</div><div class='ctx'> 	stv0299_writeregI(state, 0x22, 0x00);</div><div class='ctx'> 	stv0299_writeregI(state, 0x23, 0x00);</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;tuner_frequency = p-&gt;frequency;</div><div class='del'>-	state-&gt;fec_inner = p-&gt;u.qpsk.fec_inner;</div><div class='del'>-	state-&gt;symbol_rate = p-&gt;u.qpsk.symbol_rate;</div><div class='add'>+	state-&gt;fec_inner = p-&gt;fec_inner;</div><div class='add'>+	state-&gt;symbol_rate = p-&gt;symbol_rate;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stv0299_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters * p)</div><div class='add'>+static int stv0299_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct stv0299_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	s32 derot_freq;</div><div class='ctx'> 	int invval;</div><div class='hunk'>@@ -614,8 +616,8 @@ static int stv0299_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> 	if (state-&gt;config-&gt;invert) invval = (~invval) &amp; 1;</div><div class='ctx'> 	p-&gt;inversion = invval ? INVERSION_ON : INVERSION_OFF;</div><div class='ctx'> </div><div class='del'>-	p-&gt;u.qpsk.fec_inner = stv0299_get_fec (state);</div><div class='del'>-	p-&gt;u.qpsk.symbol_rate = stv0299_get_symbolrate (state);</div><div class='add'>+	p-&gt;fec_inner = stv0299_get_fec(state);</div><div class='add'>+	p-&gt;symbol_rate = stv0299_get_symbolrate(state);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -646,14 +648,15 @@ static int stv0299_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)</div><div class='ctx'> static int stv0299_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)</div><div class='ctx'> {</div><div class='ctx'> 	struct stv0299_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> </div><div class='ctx'> 	fesettings-&gt;min_delay_ms = state-&gt;config-&gt;min_delay_ms;</div><div class='del'>-	if (fesettings-&gt;parameters.u.qpsk.symbol_rate &lt; 10000000) {</div><div class='del'>-		fesettings-&gt;step_size = fesettings-&gt;parameters.u.qpsk.symbol_rate / 32000;</div><div class='add'>+	if (p-&gt;symbol_rate &lt; 10000000) {</div><div class='add'>+		fesettings-&gt;step_size = p-&gt;symbol_rate / 32000;</div><div class='ctx'> 		fesettings-&gt;max_drift = 5000;</div><div class='ctx'> 	} else {</div><div class='del'>-		fesettings-&gt;step_size = fesettings-&gt;parameters.u.qpsk.symbol_rate / 16000;</div><div class='del'>-		fesettings-&gt;max_drift = fesettings-&gt;parameters.u.qpsk.symbol_rate / 2000;</div><div class='add'>+		fesettings-&gt;step_size = p-&gt;symbol_rate / 16000;</div><div class='add'>+		fesettings-&gt;max_drift = p-&gt;symbol_rate / 2000;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -705,10 +708,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops stv0299_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "ST STV0299 DVB-S",</div><div class='del'>-		.type			= FE_QPSK,</div><div class='ctx'> 		.frequency_min		= 950000,</div><div class='ctx'> 		.frequency_max		= 2150000,</div><div class='ctx'> 		.frequency_stepsize	= 125,	 /* kHz for QPSK frontends */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/stv0367.c b/drivers/media/dvb/frontends/stv0367.c<br/>index e57ab53e2e27..fdd20c7737b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv0367.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stv0367.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv0367.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/stv0367.c</a></div><div class='hunk'>@@ -1577,9 +1577,9 @@ int stv0367ter_init(struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stv0367ter_algo(struct dvb_frontend *fe,</div><div class='del'>-				struct dvb_frontend_parameters *param)</div><div class='add'>+static int stv0367ter_algo(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct stv0367_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct stv0367ter_state *ter_state = state-&gt;ter_state;</div><div class='ctx'> 	int offset = 0, tempo = 0;</div><div class='hunk'>@@ -1591,7 +1591,7 @@ static int stv0367ter_algo(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s:\n", __func__);</div><div class='ctx'> </div><div class='del'>-	ter_state-&gt;frequency = param-&gt;frequency;</div><div class='add'>+	ter_state-&gt;frequency = p-&gt;frequency;</div><div class='ctx'> 	ter_state-&gt;force = FE_TER_FORCENONE</div><div class='ctx'> 			+ stv0367_readbits(state, F367TER_FORCE) * 2;</div><div class='ctx'> 	ter_state-&gt;if_iq_mode = state-&gt;config-&gt;if_iq_mode;</div><div class='hunk'>@@ -1620,7 +1620,7 @@ static int stv0367ter_algo(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	usleep_range(5000, 7000);</div><div class='ctx'> </div><div class='del'>-	switch (param-&gt;inversion) {</div><div class='add'>+	switch (p-&gt;inversion) {</div><div class='ctx'> 	case INVERSION_AUTO:</div><div class='ctx'> 	default:</div><div class='ctx'> 		dprintk("%s: inversion AUTO\n", __func__);</div><div class='hunk'>@@ -1636,10 +1636,10 @@ static int stv0367ter_algo(struct dvb_frontend *fe,</div><div class='ctx'> 	case INVERSION_OFF:</div><div class='ctx'> 		if (ter_state-&gt;if_iq_mode == FE_TER_IQ_TUNER)</div><div class='ctx'> 			stv0367_writebits(state, F367TER_IQ_INVERT,</div><div class='del'>-						param-&gt;inversion);</div><div class='add'>+						p-&gt;inversion);</div><div class='ctx'> 		else</div><div class='ctx'> 			stv0367_writebits(state, F367TER_INV_SPECTR,</div><div class='del'>-						param-&gt;inversion);</div><div class='add'>+						p-&gt;inversion);</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1806,10 +1806,9 @@ static int stv0367ter_algo(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stv0367ter_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-				struct dvb_frontend_parameters *param)</div><div class='add'>+static int stv0367ter_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='del'>-	struct dvb_ofdm_parameters *op = &amp;param-&gt;u.ofdm;</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct stv0367_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct stv0367ter_state *ter_state = state-&gt;ter_state;</div><div class='ctx'> </div><div class='hunk'>@@ -1822,12 +1821,12 @@ static int stv0367ter_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (op-&gt;transmission_mode) {</div><div class='add'>+	switch (p-&gt;transmission_mode) {</div><div class='ctx'> 	default:</div><div class='ctx'> 	case TRANSMISSION_MODE_AUTO:</div><div class='ctx'> 	case TRANSMISSION_MODE_2K:</div><div class='hunk'>@@ -1841,34 +1840,34 @@ static int stv0367ter_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (op-&gt;guard_interval) {</div><div class='add'>+	switch (p-&gt;guard_interval) {</div><div class='ctx'> 	default:</div><div class='ctx'> 	case GUARD_INTERVAL_1_32:</div><div class='ctx'> 	case GUARD_INTERVAL_1_16:</div><div class='ctx'> 	case GUARD_INTERVAL_1_8:</div><div class='ctx'> 	case GUARD_INTERVAL_1_4:</div><div class='del'>-		ter_state-&gt;guard = op-&gt;guard_interval;</div><div class='add'>+		ter_state-&gt;guard = p-&gt;guard_interval;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case GUARD_INTERVAL_AUTO:</div><div class='ctx'> 		ter_state-&gt;guard = GUARD_INTERVAL_1_32;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (op-&gt;bandwidth) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	switch (p-&gt;bandwidth_hz) {</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		ter_state-&gt;bw = FE_TER_CHAN_BW_6M;</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		ter_state-&gt;bw = FE_TER_CHAN_BW_7M;</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 	default:</div><div class='ctx'> 		ter_state-&gt;bw = FE_TER_CHAN_BW_8M;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ter_state-&gt;hierarchy = FE_TER_HIER_NONE;</div><div class='ctx'> </div><div class='del'>-	switch (param-&gt;inversion) {</div><div class='add'>+	switch (p-&gt;inversion) {</div><div class='ctx'> 	case INVERSION_OFF:</div><div class='ctx'> 	case INVERSION_ON:</div><div class='ctx'> 		num_trials = 1;</div><div class='hunk'>@@ -1885,14 +1884,14 @@ static int stv0367ter_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	while (((index) &lt; num_trials) &amp;&amp; (ter_state-&gt;state != FE_TER_LOCKOK)) {</div><div class='ctx'> 		if (!ter_state-&gt;first_lock) {</div><div class='del'>-			if (param-&gt;inversion == INVERSION_AUTO)</div><div class='add'>+			if (p-&gt;inversion == INVERSION_AUTO)</div><div class='ctx'> 				ter_state-&gt;sense = SenseTrials[index];</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='del'>-		stv0367ter_algo(fe,/* &amp;pLook, result,*/ param);</div><div class='add'>+		stv0367ter_algo(fe);</div><div class='ctx'> </div><div class='ctx'> 		if ((ter_state-&gt;state == FE_TER_LOCKOK) &amp;&amp;</div><div class='del'>-				(param-&gt;inversion == INVERSION_AUTO) &amp;&amp;</div><div class='add'>+				(p-&gt;inversion == INVERSION_AUTO) &amp;&amp;</div><div class='ctx'> 								(index == 1)) {</div><div class='ctx'> 			/* invert spectrum sense */</div><div class='ctx'> 			SenseTrials[index] = SenseTrials[0];</div><div class='hunk'>@@ -1927,50 +1926,48 @@ static int stv0367ter_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stv0367ter_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-				  struct dvb_frontend_parameters *param)</div><div class='add'>+static int stv0367ter_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct stv0367_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct stv0367ter_state *ter_state = state-&gt;ter_state;</div><div class='del'>-	struct dvb_ofdm_parameters *op = &amp;param-&gt;u.ofdm;</div><div class='del'>-	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> </div><div class='ctx'> 	int error = 0;</div><div class='ctx'> 	enum stv0367_ter_mode mode;</div><div class='ctx'> 	int constell = 0,/* snr = 0,*/ Data = 0;</div><div class='ctx'> </div><div class='del'>-	param-&gt;frequency = stv0367_get_tuner_freq(fe);</div><div class='del'>-	if ((int)param-&gt;frequency &lt; 0)</div><div class='del'>-		param-&gt;frequency = c-&gt;frequency;</div><div class='add'>+	p-&gt;frequency = stv0367_get_tuner_freq(fe);</div><div class='add'>+	if ((int)p-&gt;frequency &lt; 0)</div><div class='add'>+		p-&gt;frequency = -p-&gt;frequency;</div><div class='ctx'> </div><div class='ctx'> 	constell = stv0367_readbits(state, F367TER_TPS_CONST);</div><div class='ctx'> 	if (constell == 0)</div><div class='del'>-		op-&gt;constellation = QPSK;</div><div class='add'>+		p-&gt;modulation = QPSK;</div><div class='ctx'> 	else if (constell == 1)</div><div class='del'>-		op-&gt;constellation = QAM_16;</div><div class='add'>+		p-&gt;modulation = QAM_16;</div><div class='ctx'> 	else</div><div class='del'>-		op-&gt;constellation = QAM_64;</div><div class='add'>+		p-&gt;modulation = QAM_64;</div><div class='ctx'> </div><div class='del'>-	param-&gt;inversion = stv0367_readbits(state, F367TER_INV_SPECTR);</div><div class='add'>+	p-&gt;inversion = stv0367_readbits(state, F367TER_INV_SPECTR);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the Hierarchical mode */</div><div class='ctx'> 	Data = stv0367_readbits(state, F367TER_TPS_HIERMODE);</div><div class='ctx'> </div><div class='ctx'> 	switch (Data) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		op-&gt;hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_NONE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		op-&gt;hierarchy_information = HIERARCHY_1;</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		op-&gt;hierarchy_information = HIERARCHY_2;</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		op-&gt;hierarchy_information = HIERARCHY_4;</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		op-&gt;hierarchy_information = HIERARCHY_AUTO;</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_AUTO;</div><div class='ctx'> 		break; /* error */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1982,22 +1979,22 @@ static int stv0367ter_get_frontend(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	switch (Data) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		op-&gt;code_rate_HP = FEC_1_2;</div><div class='add'>+		p-&gt;code_rate_HP = FEC_1_2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		op-&gt;code_rate_HP = FEC_2_3;</div><div class='add'>+		p-&gt;code_rate_HP = FEC_2_3;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		op-&gt;code_rate_HP = FEC_3_4;</div><div class='add'>+		p-&gt;code_rate_HP = FEC_3_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		op-&gt;code_rate_HP = FEC_5_6;</div><div class='add'>+		p-&gt;code_rate_HP = FEC_5_6;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4:</div><div class='del'>-		op-&gt;code_rate_HP = FEC_7_8;</div><div class='add'>+		p-&gt;code_rate_HP = FEC_7_8;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		op-&gt;code_rate_HP = FEC_AUTO;</div><div class='add'>+		p-&gt;code_rate_HP = FEC_AUTO;</div><div class='ctx'> 		break; /* error */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2005,19 +2002,19 @@ static int stv0367ter_get_frontend(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case FE_TER_MODE_2K:</div><div class='del'>-		op-&gt;transmission_mode = TRANSMISSION_MODE_2K;</div><div class='add'>+		p-&gt;transmission_mode = TRANSMISSION_MODE_2K;</div><div class='ctx'> 		break;</div><div class='ctx'> /*	case FE_TER_MODE_4K:</div><div class='del'>-		op-&gt;transmission_mode = TRANSMISSION_MODE_4K;</div><div class='add'>+		p-&gt;transmission_mode = TRANSMISSION_MODE_4K;</div><div class='ctx'> 		break;*/</div><div class='ctx'> 	case FE_TER_MODE_8K:</div><div class='del'>-		op-&gt;transmission_mode = TRANSMISSION_MODE_8K;</div><div class='add'>+		p-&gt;transmission_mode = TRANSMISSION_MODE_8K;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		op-&gt;transmission_mode = TRANSMISSION_MODE_AUTO;</div><div class='add'>+		p-&gt;transmission_mode = TRANSMISSION_MODE_AUTO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	op-&gt;guard_interval = stv0367_readbits(state, F367TER_SYR_GUARD);</div><div class='add'>+	p-&gt;guard_interval = stv0367_readbits(state, F367TER_SYR_GUARD);</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -2265,9 +2262,9 @@ static void stv0367_release(struct dvb_frontend *fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops stv0367ter_ops = {</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "ST STV0367 DVB-T",</div><div class='del'>-		.type			= FE_OFDM,</div><div class='ctx'> 		.frequency_min		= 47000000,</div><div class='ctx'> 		.frequency_max		= 862000000,</div><div class='ctx'> 		.frequency_stepsize	= 15625,</div><div class='hunk'>@@ -2822,9 +2819,8 @@ int stv0367cab_init(struct dvb_frontend *fe)</div><div class='ctx'> }</div><div class='ctx'> static</div><div class='ctx'> enum stv0367_cab_signal_type stv0367cab_algo(struct stv0367_state *state,</div><div class='del'>-				struct dvb_frontend_parameters *param)</div><div class='add'>+					     struct dtv_frontend_properties *p)</div><div class='ctx'> {</div><div class='del'>-	struct dvb_qam_parameters *op = &amp;param-&gt;u.qam;</div><div class='ctx'> 	struct stv0367cab_state *cab_state = state-&gt;cab_state;</div><div class='ctx'> 	enum stv0367_cab_signal_type signalType = FE_CAB_NOAGC;</div><div class='ctx'> 	u32	QAMFEC_Lock, QAM_Lock, u32_tmp,</div><div class='hunk'>@@ -2839,7 +2835,7 @@ enum stv0367_cab_signal_type stv0367cab_algo(struct stv0367_state *state,</div><div class='ctx'> 	/* A max lock time of 25 ms is allowed for delayed AGC */</div><div class='ctx'> 	AGCTimeOut = 25;</div><div class='ctx'> 	/* 100000 symbols needed by the TRL as a maximum value */</div><div class='del'>-	TRLTimeOut = 100000000 / op-&gt;symbol_rate;</div><div class='add'>+	TRLTimeOut = 100000000 / p-&gt;symbol_rate;</div><div class='ctx'> 	/* CRLSymbols is the needed number of symbols to achieve a lock</div><div class='ctx'> 	   within [-4%, +4%] of the symbol rate.</div><div class='ctx'> 	   CRL timeout is calculated</div><div class='hunk'>@@ -2849,7 +2845,7 @@ enum stv0367_cab_signal_type stv0367cab_algo(struct stv0367_state *state,</div><div class='ctx'> 	   A characterization must be performed</div><div class='ctx'> 	   with these echoes to get new timeout values.</div><div class='ctx'> 	*/</div><div class='del'>-	switch (op-&gt;modulation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 	case QAM_16:</div><div class='ctx'> 		CRLSymbols = 150000;</div><div class='ctx'> 		EQLTimeOut = 100;</div><div class='hunk'>@@ -2883,9 +2879,9 @@ enum stv0367_cab_signal_type stv0367cab_algo(struct stv0367_state *state,</div><div class='ctx'> 	} else</div><div class='ctx'> #endif</div><div class='ctx'> 	CRLTimeOut = (25 * CRLSymbols * (cab_state-&gt;search_range / 1000)) /</div><div class='del'>-					(op-&gt;symbol_rate / 1000);</div><div class='add'>+					(p-&gt;symbol_rate / 1000);</div><div class='ctx'> </div><div class='del'>-	CRLTimeOut = (1000 * CRLTimeOut) / op-&gt;symbol_rate;</div><div class='add'>+	CRLTimeOut = (1000 * CRLTimeOut) / p-&gt;symbol_rate;</div><div class='ctx'> 	/* Timeouts below 50ms are coerced */</div><div class='ctx'> 	if (CRLTimeOut &lt; 50)</div><div class='ctx'> 		CRLTimeOut = 50;</div><div class='hunk'>@@ -2915,7 +2911,7 @@ enum stv0367_cab_signal_type stv0367cab_algo(struct stv0367_state *state,</div><div class='ctx'> 	stv0367cab_set_derot_freq(state, cab_state-&gt;adc_clk,</div><div class='ctx'> 		(1000 * (s32)state-&gt;config-&gt;if_khz + cab_state-&gt;derot_offset));</div><div class='ctx'> 	/* Disable the Allpass Filter when the symbol rate is out of range */</div><div class='del'>-	if ((op-&gt;symbol_rate &gt; 10800000) | (op-&gt;symbol_rate &lt; 1800000)) {</div><div class='add'>+	if ((p-&gt;symbol_rate &gt; 10800000) | (p-&gt;symbol_rate &lt; 1800000)) {</div><div class='ctx'> 		stv0367_writebits(state, F367CAB_ADJ_EN, 0);</div><div class='ctx'> 		stv0367_writebits(state, F367CAB_ALLPASSFILT_EN, 0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2999,7 +2995,7 @@ enum stv0367_cab_signal_type stv0367cab_algo(struct stv0367_state *state,</div><div class='ctx'> </div><div class='ctx'> 	if (QAMFEC_Lock) {</div><div class='ctx'> 		signalType = FE_CAB_DATAOK;</div><div class='del'>-		cab_state-&gt;modulation = op-&gt;modulation;</div><div class='add'>+		cab_state-&gt;modulation = p-&gt;modulation;</div><div class='ctx'> 		cab_state-&gt;spect_inv = stv0367_readbits(state,</div><div class='ctx'> 							F367CAB_QUAD_INV);</div><div class='ctx'> #if 0</div><div class='hunk'>@@ -3081,20 +3077,19 @@ enum stv0367_cab_signal_type stv0367cab_algo(struct stv0367_state *state,</div><div class='ctx'> 	return signalType;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stv0367cab_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-				struct dvb_frontend_parameters *param)</div><div class='add'>+static int stv0367cab_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct stv0367_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct stv0367cab_state *cab_state = state-&gt;cab_state;</div><div class='del'>-	struct dvb_qam_parameters *op = &amp;param-&gt;u.qam;</div><div class='ctx'> 	enum stv0367cab_mod QAMSize = 0;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s: freq = %d, srate = %d\n", __func__,</div><div class='del'>-					param-&gt;frequency, op-&gt;symbol_rate);</div><div class='add'>+					p-&gt;frequency, p-&gt;symbol_rate);</div><div class='ctx'> </div><div class='ctx'> 	cab_state-&gt;derot_offset = 0;</div><div class='ctx'> </div><div class='del'>-	switch (op-&gt;modulation) {</div><div class='add'>+	switch (p-&gt;modulation) {</div><div class='ctx'> 	case QAM_16:</div><div class='ctx'> 		QAMSize = FE_CAB_MOD_QAM16;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -3120,77 +3115,76 @@ static int stv0367cab_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	stv0367cab_SetQamSize(</div><div class='ctx'> 			state,</div><div class='del'>-			op-&gt;symbol_rate,</div><div class='add'>+			p-&gt;symbol_rate,</div><div class='ctx'> 			QAMSize);</div><div class='ctx'> </div><div class='ctx'> 	stv0367cab_set_srate(state,</div><div class='ctx'> 			cab_state-&gt;adc_clk,</div><div class='ctx'> 			cab_state-&gt;mclk,</div><div class='del'>-			op-&gt;symbol_rate,</div><div class='add'>+			p-&gt;symbol_rate,</div><div class='ctx'> 			QAMSize);</div><div class='ctx'> 	/* Search algorithm launch, [-1.1*RangeOffset, +1.1*RangeOffset] scan */</div><div class='del'>-	cab_state-&gt;state = stv0367cab_algo(state, param);</div><div class='add'>+	cab_state-&gt;state = stv0367cab_algo(state, p);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stv0367cab_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-				  struct dvb_frontend_parameters *param)</div><div class='add'>+static int stv0367cab_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct stv0367_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct stv0367cab_state *cab_state = state-&gt;cab_state;</div><div class='del'>-	struct dvb_qam_parameters *op = &amp;param-&gt;u.qam;</div><div class='ctx'> </div><div class='ctx'> 	enum stv0367cab_mod QAMSize;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s:\n", __func__);</div><div class='ctx'> </div><div class='del'>-	op-&gt;symbol_rate = stv0367cab_GetSymbolRate(state, cab_state-&gt;mclk);</div><div class='add'>+	p-&gt;symbol_rate = stv0367cab_GetSymbolRate(state, cab_state-&gt;mclk);</div><div class='ctx'> </div><div class='ctx'> 	QAMSize = stv0367_readbits(state, F367CAB_QAM_MODE);</div><div class='ctx'> 	switch (QAMSize) {</div><div class='ctx'> 	case FE_CAB_MOD_QAM16:</div><div class='del'>-		op-&gt;modulation = QAM_16;</div><div class='add'>+		p-&gt;modulation = QAM_16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FE_CAB_MOD_QAM32:</div><div class='del'>-		op-&gt;modulation = QAM_32;</div><div class='add'>+		p-&gt;modulation = QAM_32;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FE_CAB_MOD_QAM64:</div><div class='del'>-		op-&gt;modulation = QAM_64;</div><div class='add'>+		p-&gt;modulation = QAM_64;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FE_CAB_MOD_QAM128:</div><div class='del'>-		op-&gt;modulation = QAM_128;</div><div class='add'>+		p-&gt;modulation = QAM_128;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case QAM_256:</div><div class='del'>-		op-&gt;modulation = QAM_256;</div><div class='add'>+		p-&gt;modulation = QAM_256;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	param-&gt;frequency = stv0367_get_tuner_freq(fe);</div><div class='add'>+	p-&gt;frequency = stv0367_get_tuner_freq(fe);</div><div class='ctx'> </div><div class='del'>-	dprintk("%s: tuner frequency = %d\n", __func__, param-&gt;frequency);</div><div class='add'>+	dprintk("%s: tuner frequency = %d\n", __func__, p-&gt;frequency);</div><div class='ctx'> </div><div class='ctx'> 	if (state-&gt;config-&gt;if_khz == 0) {</div><div class='del'>-		param-&gt;frequency +=</div><div class='add'>+		p-&gt;frequency +=</div><div class='ctx'> 			(stv0367cab_get_derot_freq(state, cab_state-&gt;adc_clk) -</div><div class='ctx'> 			cab_state-&gt;adc_clk / 4000);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (state-&gt;config-&gt;if_khz &gt; cab_state-&gt;adc_clk / 1000)</div><div class='del'>-		param-&gt;frequency += (state-&gt;config-&gt;if_khz</div><div class='add'>+		p-&gt;frequency += (state-&gt;config-&gt;if_khz</div><div class='ctx'> 			- stv0367cab_get_derot_freq(state, cab_state-&gt;adc_clk)</div><div class='ctx'> 			- cab_state-&gt;adc_clk / 1000);</div><div class='ctx'> 	else</div><div class='del'>-		param-&gt;frequency += (state-&gt;config-&gt;if_khz</div><div class='add'>+		p-&gt;frequency += (state-&gt;config-&gt;if_khz</div><div class='ctx'> 			- stv0367cab_get_derot_freq(state, cab_state-&gt;adc_clk));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3386,9 +3380,9 @@ static int stv0367cab_read_ucblcks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops stv0367cab_ops = {</div><div class='add'>+	.delsys = { SYS_DVBC_ANNEX_A },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "ST STV0367 DVB-C",</div><div class='del'>-		.type = FE_QAM,</div><div class='ctx'> 		.frequency_min = 47000000,</div><div class='ctx'> 		.frequency_max = 862000000,</div><div class='ctx'> 		.frequency_stepsize = 62500,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/stv0900_core.c b/drivers/media/dvb/frontends/stv0900_core.c<br/>index 0ca316d6fffa..7f1badaf0d03 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv0900_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stv0900_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv0900_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/stv0900_core.c</a></div><div class='hunk'>@@ -973,22 +973,6 @@ static enum dvbfe_algo stv0900_frontend_algo(struct dvb_frontend *fe)</div><div class='ctx'> 	return DVBFE_ALGO_CUSTOM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stb0900_set_property(struct dvb_frontend *fe,</div><div class='del'>-				struct dtv_property *tvp)</div><div class='del'>-{</div><div class='del'>-	dprintk("%s(..)\n", __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 stb0900_get_property(struct dvb_frontend *fe,</div><div class='del'>-				struct dtv_property *tvp)</div><div class='del'>-{</div><div class='del'>-	dprintk("%s(..)\n", __func__);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void stv0900_start_search(struct stv0900_internal *intp,</div><div class='ctx'> 				enum fe_stv0900_demod_num demod)</div><div class='ctx'> {</div><div class='hunk'>@@ -1574,8 +1558,7 @@ static int stv0900_status(struct stv0900_internal *intp,</div><div class='ctx'> 	return locked;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static enum dvbfe_search stv0900_search(struct dvb_frontend *fe,</div><div class='del'>-					struct dvb_frontend_parameters *params)</div><div class='add'>+static enum dvbfe_search stv0900_search(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct stv0900_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct stv0900_internal *intp = state-&gt;internal;</div><div class='hunk'>@@ -1675,12 +1658,6 @@ static int stv0900_read_status(struct dvb_frontend *fe, enum fe_status *status)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stv0900_track(struct dvb_frontend *fe,</div><div class='del'>-			struct dvb_frontend_parameters *p)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int stv0900_stop_ts(struct dvb_frontend *fe, int stop_ts)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='hunk'>@@ -1866,24 +1843,23 @@ static int stv0900_sleep(struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stv0900_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-				struct dvb_frontend_parameters *p)</div><div class='add'>+static int stv0900_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct stv0900_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct stv0900_internal *intp = state-&gt;internal;</div><div class='ctx'> 	enum fe_stv0900_demod_num demod = state-&gt;demod;</div><div class='ctx'> 	struct stv0900_signal_info p_result = intp-&gt;result[demod];</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;frequency = p_result.locked ? p_result.frequency : 0;</div><div class='del'>-	p-&gt;u.qpsk.symbol_rate = p_result.locked ? p_result.symbol_rate : 0;</div><div class='add'>+	p-&gt;symbol_rate = p_result.locked ? p_result.symbol_rate : 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops stv0900_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBS, SYS_DVBS2, SYS_DSS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "STV0900 frontend",</div><div class='del'>-		.type			= FE_QPSK,</div><div class='ctx'> 		.frequency_min		= 950000,</div><div class='ctx'> 		.frequency_max		= 2150000,</div><div class='ctx'> 		.frequency_stepsize	= 125,</div><div class='hunk'>@@ -1907,10 +1883,7 @@ static struct dvb_frontend_ops stv0900_ops = {</div><div class='ctx'> 	.diseqc_send_burst		= stv0900_send_burst,</div><div class='ctx'> 	.diseqc_recv_slave_reply	= stv0900_recv_slave_reply,</div><div class='ctx'> 	.set_tone			= stv0900_set_tone,</div><div class='del'>-	.set_property			= stb0900_set_property,</div><div class='del'>-	.get_property			= stb0900_get_property,</div><div class='ctx'> 	.search				= stv0900_search,</div><div class='del'>-	.track				= stv0900_track,</div><div class='ctx'> 	.read_status			= stv0900_read_status,</div><div class='ctx'> 	.read_ber			= stv0900_read_ber,</div><div class='ctx'> 	.read_signal_strength		= stv0900_read_signal_strength,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb/frontends/stv090x.c<br/>index ebda41936b90..4aef1877ed42 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv090x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stv090x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv090x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/stv090x.c</a></div><div class='hunk'>@@ -3427,17 +3427,17 @@ err:</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static enum dvbfe_search stv090x_search(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static enum dvbfe_search stv090x_search(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct stv090x_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct dtv_frontend_properties *props = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;frequency == 0)</div><div class='add'>+	if (props-&gt;frequency == 0)</div><div class='ctx'> 		return DVBFE_ALGO_SEARCH_INVALID;</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;delsys = props-&gt;delivery_system;</div><div class='del'>-	state-&gt;frequency = p-&gt;frequency;</div><div class='del'>-	state-&gt;srate = p-&gt;u.qpsk.symbol_rate;</div><div class='add'>+	state-&gt;frequency = props-&gt;frequency;</div><div class='add'>+	state-&gt;srate = props-&gt;symbol_rate;</div><div class='ctx'> 	state-&gt;search_mode = STV090x_SEARCH_AUTO;</div><div class='ctx'> 	state-&gt;algo = STV090x_COLD_SEARCH;</div><div class='ctx'> 	state-&gt;fec = STV090x_PRERR;</div><div class='hunk'>@@ -4712,10 +4712,9 @@ int stv090x_set_gpio(struct dvb_frontend *fe, u8 gpio, u8 dir, u8 value,</div><div class='ctx'> EXPORT_SYMBOL(stv090x_set_gpio);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops stv090x_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBS, SYS_DVBS2, SYS_DSS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "STV090x Multistandard",</div><div class='del'>-		.type			= FE_QPSK,</div><div class='ctx'> 		.frequency_min		= 950000,</div><div class='ctx'> 		.frequency_max 		= 2150000,</div><div class='ctx'> 		.frequency_stepsize	= 0,</div><div class='hunk'>@@ -4743,7 +4742,7 @@ static struct dvb_frontend_ops stv090x_ops = {</div><div class='ctx'> 	.read_status			= stv090x_read_status,</div><div class='ctx'> 	.read_ber			= stv090x_read_per,</div><div class='ctx'> 	.read_signal_strength		= stv090x_read_signal_strength,</div><div class='del'>-	.read_snr			= stv090x_read_cnr</div><div class='add'>+	.read_snr			= stv090x_read_cnr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/stv6110.c b/drivers/media/dvb/frontends/stv6110.c<br/>index 2dca7c8e5148..20b5fa92c53e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv6110.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/stv6110.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv6110.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/stv6110.c</a></div><div class='hunk'>@@ -347,8 +347,7 @@ static int stv6110_set_frequency(struct dvb_frontend *fe, u32 frequency)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stv6110_set_params(struct dvb_frontend *fe,</div><div class='del'>-			      struct dvb_frontend_parameters *params)</div><div class='add'>+static int stv6110_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	u32 bandwidth = carrier_width(c-&gt;symbol_rate, c-&gt;rolloff);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c<br/>index 6ca533ea0f0e..1bff7f457e19 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda10021.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tda10021.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda10021.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/tda10021.c</a></div><div class='hunk'>@@ -224,47 +224,86 @@ static int tda10021_init (struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda10021_set_parameters (struct dvb_frontend *fe,</div><div class='del'>-			    struct dvb_frontend_parameters *p)</div><div class='add'>+struct qam_params {</div><div class='add'>+	u8 conf, agcref, lthr, mseth, aref;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tda10021_set_parameters(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	u32 delsys  = c-&gt;delivery_system;</div><div class='add'>+	unsigned qam = c-&gt;modulation;</div><div class='add'>+	bool is_annex_c;</div><div class='add'>+	u32 reg0x3d;</div><div class='ctx'> 	struct tda10021_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	static const struct qam_params qam_params[] = {</div><div class='add'>+		/* Modulation  Conf  AGCref  LTHR  MSETH  AREF */</div><div class='add'>+		[QPSK]	   = { 0x14, 0x78,   0x78, 0x8c,  0x96 },</div><div class='add'>+		[QAM_16]   = { 0x00, 0x8c,   0x87, 0xa2,  0x91 },</div><div class='add'>+		[QAM_32]   = { 0x04, 0x8c,   0x64, 0x74,  0x96 },</div><div class='add'>+		[QAM_64]   = { 0x08, 0x6a,   0x46, 0x43,  0x6a },</div><div class='add'>+		[QAM_128]  = { 0x0c, 0x78,   0x36, 0x34,  0x7e },</div><div class='add'>+		[QAM_256]  = { 0x10, 0x5c,   0x26, 0x23,  0x6b },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (delsys) {</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='add'>+		is_annex_c = false;</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_C:</div><div class='add'>+		is_annex_c = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	//table for QAM4-QAM256 ready  QAM4  QAM16 QAM32 QAM64 QAM128 QAM256</div><div class='del'>-	//CONF</div><div class='del'>-	static const u8 reg0x00 [] = { 0x14, 0x00, 0x04, 0x08, 0x0c,  0x10 };</div><div class='del'>-	//AGCREF value</div><div class='del'>-	static const u8 reg0x01 [] = { 0x78, 0x8c, 0x8c, 0x6a, 0x78,  0x5c };</div><div class='del'>-	//LTHR value</div><div class='del'>-	static const u8 reg0x05 [] = { 0x78, 0x87, 0x64, 0x46, 0x36,  0x26 };</div><div class='del'>-	//MSETH</div><div class='del'>-	static const u8 reg0x08 [] = { 0x8c, 0xa2, 0x74, 0x43, 0x34,  0x23 };</div><div class='del'>-	//AREF</div><div class='del'>-	static const u8 reg0x09 [] = { 0x96, 0x91, 0x96, 0x6a, 0x7e,  0x6b };</div><div class='del'>-</div><div class='del'>-	int qam = p-&gt;u.qam.modulation;</div><div class='del'>-</div><div class='del'>-	if (qam &lt; 0 || qam &gt; 5)</div><div class='add'>+	/*</div><div class='add'>+	 * gcc optimizes the code bellow the same way as it would code:</div><div class='add'>+	 *           "if (qam &gt; 5) return -EINVAL;"</div><div class='add'>+	 * Yet, the code is clearer, as it shows what QAM standards are</div><div class='add'>+	 * supported by the driver, and avoids the usage of magic numbers on</div><div class='add'>+	 * it.</div><div class='add'>+	 */</div><div class='add'>+	switch (qam) {</div><div class='add'>+	case QPSK:</div><div class='add'>+	case QAM_16:</div><div class='add'>+	case QAM_32:</div><div class='add'>+	case QAM_64:</div><div class='add'>+	case QAM_128:</div><div class='add'>+	case QAM_256:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;inversion != INVERSION_ON &amp;&amp; p-&gt;inversion != INVERSION_OFF)</div><div class='add'>+	if (c-&gt;inversion != INVERSION_ON &amp;&amp; c-&gt;inversion != INVERSION_OFF)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	//printk("tda10021: set frequency to %d qam=%d symrate=%d\n", p-&gt;frequency,qam,p-&gt;u.qam.symbol_rate);</div><div class='add'>+	/*printk("tda10021: set frequency to %d qam=%d symrate=%d\n", p-&gt;frequency,qam,p-&gt;symbol_rate);*/</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tda10021_set_symbolrate (state, p-&gt;u.qam.symbol_rate);</div><div class='del'>-	_tda10021_writereg (state, 0x34, state-&gt;pwm);</div><div class='del'>-</div><div class='del'>-	_tda10021_writereg (state, 0x01, reg0x01[qam]);</div><div class='del'>-	_tda10021_writereg (state, 0x05, reg0x05[qam]);</div><div class='del'>-	_tda10021_writereg (state, 0x08, reg0x08[qam]);</div><div class='del'>-	_tda10021_writereg (state, 0x09, reg0x09[qam]);</div><div class='del'>-</div><div class='del'>-	tda10021_setup_reg0 (state, reg0x00[qam], p-&gt;inversion);</div><div class='add'>+	tda10021_set_symbolrate(state, c-&gt;symbol_rate);</div><div class='add'>+	_tda10021_writereg(state, 0x34, state-&gt;pwm);</div><div class='add'>+</div><div class='add'>+	_tda10021_writereg(state, 0x01, qam_params[qam].agcref);</div><div class='add'>+	_tda10021_writereg(state, 0x05, qam_params[qam].lthr);</div><div class='add'>+	_tda10021_writereg(state, 0x08, qam_params[qam].mseth);</div><div class='add'>+	_tda10021_writereg(state, 0x09, qam_params[qam].aref);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Bit 0 == 0 means roll-off = 0.15 (Annex A)</div><div class='add'>+	 *	 == 1 means roll-off = 0.13 (Annex C)</div><div class='add'>+	 */</div><div class='add'>+	reg0x3d = tda10021_readreg (state, 0x3d);</div><div class='add'>+	if (is_annex_c)</div><div class='add'>+		_tda10021_writereg (state, 0x3d, 0x01 | reg0x3d);</div><div class='add'>+	else</div><div class='add'>+		_tda10021_writereg (state, 0x3d, 0xfe &amp; reg0x3d);</div><div class='add'>+	tda10021_setup_reg0(state, qam_params[qam].conf, c-&gt;inversion);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -347,8 +386,9 @@ static int tda10021_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda10021_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int tda10021_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct tda10021_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int sync;</div><div class='ctx'> 	s8 afc = 0;</div><div class='hunk'>@@ -360,17 +400,17 @@ static int tda10021_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_pa</div><div class='ctx'> 		printk(sync &amp; 2 ? "DVB: TDA10021(%d): AFC (%d) %dHz\n" :</div><div class='ctx'> 				  "DVB: TDA10021(%d): [AFC (%d) %dHz]\n",</div><div class='ctx'> 			state-&gt;frontend.dvb-&gt;num, afc,</div><div class='del'>-		       -((s32)p-&gt;u.qam.symbol_rate * afc) &gt;&gt; 10);</div><div class='add'>+		       -((s32)p-&gt;symbol_rate * afc) &gt;&gt; 10);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;inversion = ((state-&gt;reg0 &amp; 0x20) == 0x20) ^ (state-&gt;config-&gt;invert != 0) ? INVERSION_ON : INVERSION_OFF;</div><div class='del'>-	p-&gt;u.qam.modulation = ((state-&gt;reg0 &gt;&gt; 2) &amp; 7) + QAM_16;</div><div class='add'>+	p-&gt;modulation = ((state-&gt;reg0 &gt;&gt; 2) &amp; 7) + QAM_16;</div><div class='ctx'> </div><div class='del'>-	p-&gt;u.qam.fec_inner = FEC_NONE;</div><div class='add'>+	p-&gt;fec_inner = FEC_NONE;</div><div class='ctx'> 	p-&gt;frequency = ((p-&gt;frequency + 31250) / 62500) * 62500;</div><div class='ctx'> </div><div class='ctx'> 	if (sync &amp; 2)</div><div class='del'>-		p-&gt;frequency -= ((s32)p-&gt;u.qam.symbol_rate * afc) &gt;&gt; 10;</div><div class='add'>+		p-&gt;frequency -= ((s32)p-&gt;symbol_rate * afc) &gt;&gt; 10;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -444,10 +484,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops tda10021_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBC_ANNEX_A, SYS_DVBC_ANNEX_C },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "Philips TDA10021 DVB-C",</div><div class='del'>-		.type = FE_QAM,</div><div class='ctx'> 		.frequency_stepsize = 62500,</div><div class='ctx'> 		.frequency_min = 47000000,</div><div class='ctx'> 		.frequency_max = 862000000,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/tda10023.c b/drivers/media/dvb/frontends/tda10023.c<br/>index a3c34eecdee9..ca1e0d54b69a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda10023.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tda10023.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda10023.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/tda10023.c</a></div><div class='hunk'>@@ -298,42 +298,80 @@ static int tda10023_init (struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda10023_set_parameters (struct dvb_frontend *fe,</div><div class='del'>-			    struct dvb_frontend_parameters *p)</div><div class='add'>+struct qam_params {</div><div class='add'>+	u8 qam, lockthr, mseth, aref, agcrefnyq, eragnyq_thd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tda10023_set_parameters(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+	u32 delsys  = c-&gt;delivery_system;</div><div class='add'>+	unsigned qam = c-&gt;modulation;</div><div class='add'>+	bool is_annex_c;</div><div class='ctx'> 	struct tda10023_state* state = fe-&gt;demodulator_priv;</div><div class='del'>-</div><div class='del'>-	static int qamvals[6][6] = {</div><div class='del'>-		//  QAM   LOCKTHR  MSETH   AREF AGCREFNYQ  ERAGCNYQ_THD</div><div class='del'>-		{ (5&lt;&lt;2),  0x78,    0x8c,   0x96,   0x78,   0x4c  },  // 4 QAM</div><div class='del'>-		{ (0&lt;&lt;2),  0x87,    0xa2,   0x91,   0x8c,   0x57  },  // 16 QAM</div><div class='del'>-		{ (1&lt;&lt;2),  0x64,    0x74,   0x96,   0x8c,   0x57  },  // 32 QAM</div><div class='del'>-		{ (2&lt;&lt;2),  0x46,    0x43,   0x6a,   0x6a,   0x44  },  // 64 QAM</div><div class='del'>-		{ (3&lt;&lt;2),  0x36,    0x34,   0x7e,   0x78,   0x4c  },  // 128 QAM</div><div class='del'>-		{ (4&lt;&lt;2),  0x26,    0x23,   0x6c,   0x5c,   0x3c  },  // 256 QAM</div><div class='add'>+	static const struct qam_params qam_params[] = {</div><div class='add'>+		/* Modulation  QAM    LOCKTHR   MSETH   AREF AGCREFNYQ ERAGCNYQ_THD */</div><div class='add'>+		[QPSK]    = { (5&lt;&lt;2),  0x78,    0x8c,   0x96,   0x78,   0x4c  },</div><div class='add'>+		[QAM_16]  = { (0&lt;&lt;2),  0x87,    0xa2,   0x91,   0x8c,   0x57  },</div><div class='add'>+		[QAM_32]  = { (1&lt;&lt;2),  0x64,    0x74,   0x96,   0x8c,   0x57  },</div><div class='add'>+		[QAM_64]  = { (2&lt;&lt;2),  0x46,    0x43,   0x6a,   0x6a,   0x44  },</div><div class='add'>+		[QAM_128] = { (3&lt;&lt;2),  0x36,    0x34,   0x7e,   0x78,   0x4c  },</div><div class='add'>+		[QAM_256] = { (4&lt;&lt;2),  0x26,    0x23,   0x6c,   0x5c,   0x3c  },</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	int qam = p-&gt;u.qam.modulation;</div><div class='add'>+	switch (delsys) {</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='add'>+		is_annex_c = false;</div><div class='add'>+		break;</div><div class='add'>+	case SYS_DVBC_ANNEX_C:</div><div class='add'>+		is_annex_c = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (qam &lt; 0 || qam &gt; 5)</div><div class='add'>+	/*</div><div class='add'>+	 * gcc optimizes the code bellow the same way as it would code:</div><div class='add'>+	 *		 "if (qam &gt; 5) return -EINVAL;"</div><div class='add'>+	 * Yet, the code is clearer, as it shows what QAM standards are</div><div class='add'>+	 * supported by the driver, and avoids the usage of magic numbers on</div><div class='add'>+	 * it.</div><div class='add'>+	 */</div><div class='add'>+	switch (qam) {</div><div class='add'>+	case QPSK:</div><div class='add'>+	case QAM_16:</div><div class='add'>+	case QAM_32:</div><div class='add'>+	case QAM_64:</div><div class='add'>+	case QAM_128:</div><div class='add'>+	case QAM_256:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tda10023_set_symbolrate (state, p-&gt;u.qam.symbol_rate);</div><div class='del'>-	tda10023_writereg (state, 0x05, qamvals[qam][1]);</div><div class='del'>-	tda10023_writereg (state, 0x08, qamvals[qam][2]);</div><div class='del'>-	tda10023_writereg (state, 0x09, qamvals[qam][3]);</div><div class='del'>-	tda10023_writereg (state, 0xb4, qamvals[qam][4]);</div><div class='del'>-	tda10023_writereg (state, 0xb6, qamvals[qam][5]);</div><div class='del'>-</div><div class='del'>-//	tda10023_writereg (state, 0x04, (p-&gt;inversion?0x12:0x32));</div><div class='del'>-//	tda10023_writebit (state, 0x04, 0x60, (p-&gt;inversion?0:0x20));</div><div class='del'>-	tda10023_writebit (state, 0x04, 0x40, 0x40);</div><div class='del'>-	tda10023_setup_reg0 (state, qamvals[qam][0]);</div><div class='add'>+	tda10023_set_symbolrate(state, c-&gt;symbol_rate);</div><div class='add'>+	tda10023_writereg(state, 0x05, qam_params[qam].lockthr);</div><div class='add'>+	tda10023_writereg(state, 0x08, qam_params[qam].mseth);</div><div class='add'>+	tda10023_writereg(state, 0x09, qam_params[qam].aref);</div><div class='add'>+	tda10023_writereg(state, 0xb4, qam_params[qam].agcrefnyq);</div><div class='add'>+	tda10023_writereg(state, 0xb6, qam_params[qam].eragnyq_thd);</div><div class='add'>+#if 0</div><div class='add'>+	tda10023_writereg(state, 0x04, (c-&gt;inversion ? 0x12 : 0x32));</div><div class='add'>+	tda10023_writebit(state, 0x04, 0x60, (c-&gt;inversion ? 0 : 0x20));</div><div class='add'>+#endif</div><div class='add'>+	tda10023_writebit(state, 0x04, 0x40, 0x40);</div><div class='add'>+</div><div class='add'>+	if (is_annex_c)</div><div class='add'>+		tda10023_writebit(state, 0x3d, 0xfc, 0x03);</div><div class='add'>+	else</div><div class='add'>+		tda10023_writebit(state, 0x3d, 0xfc, 0x02);</div><div class='add'>+</div><div class='add'>+	tda10023_setup_reg0(state, qam_params[qam].qam);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -418,8 +456,9 @@ static int tda10023_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda10023_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int tda10023_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct tda10023_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int sync,inv;</div><div class='ctx'> 	s8 afc = 0;</div><div class='hunk'>@@ -433,17 +472,17 @@ static int tda10023_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_pa</div><div class='ctx'> 		printk(sync &amp; 2 ? "DVB: TDA10023(%d): AFC (%d) %dHz\n" :</div><div class='ctx'> 				  "DVB: TDA10023(%d): [AFC (%d) %dHz]\n",</div><div class='ctx'> 			state-&gt;frontend.dvb-&gt;num, afc,</div><div class='del'>-		       -((s32)p-&gt;u.qam.symbol_rate * afc) &gt;&gt; 10);</div><div class='add'>+		       -((s32)p-&gt;symbol_rate * afc) &gt;&gt; 10);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;inversion = (inv&amp;0x20?0:1);</div><div class='del'>-	p-&gt;u.qam.modulation = ((state-&gt;reg0 &gt;&gt; 2) &amp; 7) + QAM_16;</div><div class='add'>+	p-&gt;modulation = ((state-&gt;reg0 &gt;&gt; 2) &amp; 7) + QAM_16;</div><div class='ctx'> </div><div class='del'>-	p-&gt;u.qam.fec_inner = FEC_NONE;</div><div class='add'>+	p-&gt;fec_inner = FEC_NONE;</div><div class='ctx'> 	p-&gt;frequency = ((p-&gt;frequency + 31250) / 62500) * 62500;</div><div class='ctx'> </div><div class='ctx'> 	if (sync &amp; 2)</div><div class='del'>-		p-&gt;frequency -= ((s32)p-&gt;u.qam.symbol_rate * afc) &gt;&gt; 10;</div><div class='add'>+		p-&gt;frequency -= ((s32)p-&gt;symbol_rate * afc) &gt;&gt; 10;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -534,10 +573,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops tda10023_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBC_ANNEX_A, SYS_DVBC_ANNEX_C },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "Philips TDA10023 DVB-C",</div><div class='del'>-		.type = FE_QAM,</div><div class='ctx'> 		.frequency_stepsize = 62500,</div><div class='ctx'> 		.frequency_min =  47000000,</div><div class='ctx'> 		.frequency_max = 862000000,</div><div class='hunk'>@@ -557,7 +595,6 @@ static struct dvb_frontend_ops tda10023_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = tda10023_set_parameters,</div><div class='ctx'> 	.get_frontend = tda10023_get_frontend,</div><div class='del'>-</div><div class='ctx'> 	.read_status = tda10023_read_status,</div><div class='ctx'> 	.read_ber = tda10023_read_ber,</div><div class='ctx'> 	.read_signal_strength = tda10023_read_signal_strength,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/tda10048.c b/drivers/media/dvb/frontends/tda10048.c<br/>index 7f105946a434..71fb63299de7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda10048.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tda10048.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda10048.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/tda10048.c</a></div><div class='hunk'>@@ -153,7 +153,7 @@ struct tda10048_state {</div><div class='ctx'> 	u32 pll_pfactor;</div><div class='ctx'> 	u32 sample_freq;</div><div class='ctx'> </div><div class='del'>-	enum fe_bandwidth bandwidth;</div><div class='add'>+	u32 bandwidth;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct init_tab {</div><div class='hunk'>@@ -341,21 +341,14 @@ static int tda10048_set_wref(struct dvb_frontend *fe, u32 sample_freq_hz,</div><div class='ctx'> {</div><div class='ctx'> 	struct tda10048_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u64 t, z;</div><div class='del'>-	u32 b = 8000000;</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (sample_freq_hz == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (bw == BANDWIDTH_6_MHZ)</div><div class='del'>-		b = 6000000;</div><div class='del'>-	else</div><div class='del'>-	if (bw == BANDWIDTH_7_MHZ)</div><div class='del'>-		b = 7000000;</div><div class='del'>-</div><div class='ctx'> 	/* WREF = (B / (7 * fs)) * 2^31 */</div><div class='del'>-	t = b * 10;</div><div class='add'>+	t = bw * 10;</div><div class='ctx'> 	/* avoid warning: this decimal constant is unsigned only in ISO C90 */</div><div class='ctx'> 	/* t *= 2147483648 on 32bit platforms */</div><div class='ctx'> 	t *= (2048 * 1024);</div><div class='hunk'>@@ -378,25 +371,18 @@ static int tda10048_set_invwref(struct dvb_frontend *fe, u32 sample_freq_hz,</div><div class='ctx'> {</div><div class='ctx'> 	struct tda10048_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u64 t;</div><div class='del'>-	u32 b = 8000000;</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, "%s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	if (sample_freq_hz == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (bw == BANDWIDTH_6_MHZ)</div><div class='del'>-		b = 6000000;</div><div class='del'>-	else</div><div class='del'>-	if (bw == BANDWIDTH_7_MHZ)</div><div class='del'>-		b = 7000000;</div><div class='del'>-</div><div class='ctx'> 	/* INVWREF = ((7 * fs) / B) * 2^5 */</div><div class='ctx'> 	t = sample_freq_hz;</div><div class='ctx'> 	t *= 7;</div><div class='ctx'> 	t *= 32;</div><div class='ctx'> 	t *= 10;</div><div class='del'>-	do_div(t, b);</div><div class='add'>+	do_div(t, bw);</div><div class='ctx'> 	t += 5;</div><div class='ctx'> 	do_div(t, 10);</div><div class='ctx'> </div><div class='hunk'>@@ -407,16 +393,16 @@ static int tda10048_set_invwref(struct dvb_frontend *fe, u32 sample_freq_hz,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tda10048_set_bandwidth(struct dvb_frontend *fe,</div><div class='del'>-	enum fe_bandwidth bw)</div><div class='add'>+	u32 bw)</div><div class='ctx'> {</div><div class='ctx'> 	struct tda10048_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	dprintk(1, "%s(bw=%d)\n", __func__, bw);</div><div class='ctx'> </div><div class='ctx'> 	/* Bandwidth setting may need to be adjusted */</div><div class='ctx'> 	switch (bw) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='add'>+	case 6000000:</div><div class='add'>+	case 7000000:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		tda10048_set_wref(fe, state-&gt;sample_freq, bw);</div><div class='ctx'> 		tda10048_set_invwref(fe, state-&gt;sample_freq, bw);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -430,7 +416,7 @@ static int tda10048_set_bandwidth(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda10048_set_if(struct dvb_frontend *fe, enum fe_bandwidth bw)</div><div class='add'>+static int tda10048_set_if(struct dvb_frontend *fe, u32 bw)</div><div class='ctx'> {</div><div class='ctx'> 	struct tda10048_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct tda10048_config *config = &amp;state-&gt;config;</div><div class='hunk'>@@ -441,13 +427,13 @@ static int tda10048_set_if(struct dvb_frontend *fe, enum fe_bandwidth bw)</div><div class='ctx'> </div><div class='ctx'> 	/* based on target bandwidth and clk we calculate pll factors */</div><div class='ctx'> 	switch (bw) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		if_freq_khz = config-&gt;dtv6_if_freq_khz;</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		if_freq_khz = config-&gt;dtv7_if_freq_khz;</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		if_freq_khz = config-&gt;dtv8_if_freq_khz;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -601,7 +587,7 @@ static int tda10048_set_inversion(struct dvb_frontend *fe, int inversion)</div><div class='ctx'> </div><div class='ctx'> /* Retrieve the demod settings */</div><div class='ctx'> static int tda10048_get_tps(struct tda10048_state *state,</div><div class='del'>-	struct dvb_ofdm_parameters *p)</div><div class='add'>+	struct dtv_frontend_properties *p)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val;</div><div class='ctx'> </div><div class='hunk'>@@ -612,27 +598,27 @@ static int tda10048_get_tps(struct tda10048_state *state,</div><div class='ctx'> 	val = tda10048_readreg(state, TDA10048_OUT_CONF2);</div><div class='ctx'> 	switch ((val &amp; 0x60) &gt;&gt; 5) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		p-&gt;constellation = QPSK;</div><div class='add'>+		p-&gt;modulation = QPSK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		p-&gt;constellation = QAM_16;</div><div class='add'>+		p-&gt;modulation = QAM_16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		p-&gt;constellation = QAM_64;</div><div class='add'>+		p-&gt;modulation = QAM_64;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	switch ((val &amp; 0x18) &gt;&gt; 3) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		p-&gt;hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_NONE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		p-&gt;hierarchy_information = HIERARCHY_1;</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		p-&gt;hierarchy_information = HIERARCHY_2;</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		p-&gt;hierarchy_information = HIERARCHY_4;</div><div class='add'>+		p-&gt;hierarchy = HIERARCHY_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	switch (val &amp; 0x07) {</div><div class='hunk'>@@ -738,17 +724,17 @@ static int tda10048_output_mode(struct dvb_frontend *fe, int serial)</div><div class='ctx'> </div><div class='ctx'> /* Talk to the demod, set the FEC, GUARD, QAM settings etc */</div><div class='ctx'> /* TODO: Support manual tuning with specific params */</div><div class='del'>-static int tda10048_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int tda10048_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct tda10048_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, "%s(frequency=%d)\n", __func__, p-&gt;frequency);</div><div class='ctx'> </div><div class='ctx'> 	/* Update the I/F pll's if the bandwidth changes */</div><div class='del'>-	if (p-&gt;u.ofdm.bandwidth != state-&gt;bandwidth) {</div><div class='del'>-		tda10048_set_if(fe, p-&gt;u.ofdm.bandwidth);</div><div class='del'>-		tda10048_set_bandwidth(fe, p-&gt;u.ofdm.bandwidth);</div><div class='add'>+	if (p-&gt;bandwidth_hz != state-&gt;bandwidth) {</div><div class='add'>+		tda10048_set_if(fe, p-&gt;bandwidth_hz);</div><div class='add'>+		tda10048_set_bandwidth(fe, p-&gt;bandwidth_hz);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='hunk'>@@ -756,7 +742,7 @@ static int tda10048_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> </div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> </div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='hunk'>@@ -797,8 +783,8 @@ static int tda10048_init(struct dvb_frontend *fe)</div><div class='ctx'> 	tda10048_set_inversion(fe, config-&gt;inversion);</div><div class='ctx'> </div><div class='ctx'> 	/* Establish default RF values */</div><div class='del'>-	tda10048_set_if(fe, BANDWIDTH_8_MHZ);</div><div class='del'>-	tda10048_set_bandwidth(fe, BANDWIDTH_8_MHZ);</div><div class='add'>+	tda10048_set_if(fe, 8000000);</div><div class='add'>+	tda10048_set_bandwidth(fe, 8000000);</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure we leave the gate closed */</div><div class='ctx'> 	tda10048_i2c_gate_ctrl(fe, 0);</div><div class='hunk'>@@ -1042,9 +1028,9 @@ static int tda10048_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda10048_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int tda10048_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct tda10048_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, "%s()\n", __func__);</div><div class='hunk'>@@ -1052,7 +1038,7 @@ static int tda10048_get_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	p-&gt;inversion = tda10048_readreg(state, TDA10048_CONF_C1_1)</div><div class='ctx'> 		&amp; 0x20 ? INVERSION_ON : INVERSION_OFF;</div><div class='ctx'> </div><div class='del'>-	return tda10048_get_tps(state, &amp;p-&gt;u.ofdm);</div><div class='add'>+	return tda10048_get_tps(state, p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tda10048_get_tune_settings(struct dvb_frontend *fe,</div><div class='hunk'>@@ -1126,7 +1112,7 @@ struct dvb_frontend *tda10048_attach(const struct tda10048_config *config,</div><div class='ctx'> 	memcpy(&amp;state-&gt;config, config, sizeof(*config));</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='ctx'> 	state-&gt;fwloaded = config-&gt;no_firmware;</div><div class='del'>-	state-&gt;bandwidth = BANDWIDTH_8_MHZ;</div><div class='add'>+	state-&gt;bandwidth = 8000000;</div><div class='ctx'> </div><div class='ctx'> 	/* check if the demod is present */</div><div class='ctx'> 	if (tda10048_readreg(state, TDA10048_IDENTITY) != 0x048)</div><div class='hunk'>@@ -1152,11 +1138,11 @@ struct dvb_frontend *tda10048_attach(const struct tda10048_config *config,</div><div class='ctx'> 	tda10048_establish_defaults(&amp;state-&gt;frontend);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the xtal and freq defaults */</div><div class='del'>-	if (tda10048_set_if(&amp;state-&gt;frontend, BANDWIDTH_8_MHZ) != 0)</div><div class='add'>+	if (tda10048_set_if(&amp;state-&gt;frontend, 8000000) != 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* Default bandwidth */</div><div class='del'>-	if (tda10048_set_bandwidth(&amp;state-&gt;frontend, BANDWIDTH_8_MHZ) != 0)</div><div class='add'>+	if (tda10048_set_bandwidth(&amp;state-&gt;frontend, 8000000) != 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* Leave the gate closed */</div><div class='hunk'>@@ -1171,10 +1157,9 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(tda10048_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops tda10048_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "NXP TDA10048HN DVB-T",</div><div class='del'>-		.type			= FE_OFDM,</div><div class='ctx'> 		.frequency_min		= 177000000,</div><div class='ctx'> 		.frequency_max		= 858000000,</div><div class='ctx'> 		.frequency_stepsize	= 166666,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c<br/>index ea485d923550..ae6f22aae677 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda1004x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tda1004x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda1004x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/tda1004x.c</a></div><div class='hunk'>@@ -224,22 +224,22 @@ static int tda1004x_disable_tuner_i2c(struct tda1004x_state *state)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tda10045h_set_bandwidth(struct tda1004x_state *state,</div><div class='del'>-				   fe_bandwidth_t bandwidth)</div><div class='add'>+				   u32 bandwidth)</div><div class='ctx'> {</div><div class='ctx'> 	static u8 bandwidth_6mhz[] = { 0x02, 0x00, 0x3d, 0x00, 0x60, 0x1e, 0xa7, 0x45, 0x4f };</div><div class='ctx'> 	static u8 bandwidth_7mhz[] = { 0x02, 0x00, 0x37, 0x00, 0x4a, 0x2f, 0x6d, 0x76, 0xdb };</div><div class='ctx'> 	static u8 bandwidth_8mhz[] = { 0x02, 0x00, 0x3d, 0x00, 0x48, 0x17, 0x89, 0xc7, 0x14 };</div><div class='ctx'> </div><div class='ctx'> 	switch (bandwidth) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		tda1004x_write_buf(state, TDA10045H_CONFPLL_P, bandwidth_6mhz, sizeof(bandwidth_6mhz));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		tda1004x_write_buf(state, TDA10045H_CONFPLL_P, bandwidth_7mhz, sizeof(bandwidth_7mhz));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		tda1004x_write_buf(state, TDA10045H_CONFPLL_P, bandwidth_8mhz, sizeof(bandwidth_8mhz));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -253,7 +253,7 @@ static int tda10045h_set_bandwidth(struct tda1004x_state *state,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tda10046h_set_bandwidth(struct tda1004x_state *state,</div><div class='del'>-				   fe_bandwidth_t bandwidth)</div><div class='add'>+				   u32 bandwidth)</div><div class='ctx'> {</div><div class='ctx'> 	static u8 bandwidth_6mhz_53M[] = { 0x7b, 0x2e, 0x11, 0xf0, 0xd2 };</div><div class='ctx'> 	static u8 bandwidth_7mhz_53M[] = { 0x6a, 0x02, 0x6a, 0x43, 0x9f };</div><div class='hunk'>@@ -270,7 +270,7 @@ static int tda10046h_set_bandwidth(struct tda1004x_state *state,</div><div class='ctx'> 	else</div><div class='ctx'> 		tda10046_clk53m = 1;</div><div class='ctx'> 	switch (bandwidth) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		if (tda10046_clk53m)</div><div class='ctx'> 			tda1004x_write_buf(state, TDA10046H_TIME_WREF1, bandwidth_6mhz_53M,</div><div class='ctx'> 						  sizeof(bandwidth_6mhz_53M));</div><div class='hunk'>@@ -283,7 +283,7 @@ static int tda10046h_set_bandwidth(struct tda1004x_state *state,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		if (tda10046_clk53m)</div><div class='ctx'> 			tda1004x_write_buf(state, TDA10046H_TIME_WREF1, bandwidth_7mhz_53M,</div><div class='ctx'> 						  sizeof(bandwidth_7mhz_53M));</div><div class='hunk'>@@ -296,7 +296,7 @@ static int tda10046h_set_bandwidth(struct tda1004x_state *state,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		if (tda10046_clk53m)</div><div class='ctx'> 			tda1004x_write_buf(state, TDA10046H_TIME_WREF1, bandwidth_8mhz_53M,</div><div class='ctx'> 						  sizeof(bandwidth_8mhz_53M));</div><div class='hunk'>@@ -409,7 +409,7 @@ static int tda10045_fwupload(struct dvb_frontend* fe)</div><div class='ctx'> 	msleep(10);</div><div class='ctx'> </div><div class='ctx'> 	/* set parameters */</div><div class='del'>-	tda10045h_set_bandwidth(state, BANDWIDTH_8_MHZ);</div><div class='add'>+	tda10045h_set_bandwidth(state, 8000000);</div><div class='ctx'> </div><div class='ctx'> 	ret = tda1004x_do_upload(state, fw-&gt;data, fw-&gt;size, TDA10045H_FWPAGE, TDA10045H_CODE_IN);</div><div class='ctx'> 	release_firmware(fw);</div><div class='hunk'>@@ -473,7 +473,7 @@ static void tda10046_init_plls(struct dvb_frontend* fe)</div><div class='ctx'> 		tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_LSB, 0x3f);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	tda10046h_set_bandwidth(state, BANDWIDTH_8_MHZ); // default bandwidth 8 MHz</div><div class='add'>+	tda10046h_set_bandwidth(state, 8000000); /* default bandwidth 8 MHz */</div><div class='ctx'> 	/* let the PLLs settle */</div><div class='ctx'> 	msleep(120);</div><div class='ctx'> }</div><div class='hunk'>@@ -697,9 +697,9 @@ static int tda10046_init(struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda1004x_set_fe(struct dvb_frontend* fe,</div><div class='del'>-			   struct dvb_frontend_parameters *fe_params)</div><div class='add'>+static int tda1004x_set_fe(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fe_params = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct tda1004x_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int tmp;</div><div class='ctx'> 	int inversion;</div><div class='hunk'>@@ -718,7 +718,7 @@ static int tda1004x_set_fe(struct dvb_frontend* fe,</div><div class='ctx'> </div><div class='ctx'> 	// set frequency</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, fe_params);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -726,37 +726,37 @@ static int tda1004x_set_fe(struct dvb_frontend* fe,</div><div class='ctx'> 	// Hardcoded to use auto as much as possible on the TDA10045 as it</div><div class='ctx'> 	// is very unreliable if AUTO mode is _not_ used.</div><div class='ctx'> 	if (state-&gt;demod_type == TDA1004X_DEMOD_TDA10045) {</div><div class='del'>-		fe_params-&gt;u.ofdm.code_rate_HP = FEC_AUTO;</div><div class='del'>-		fe_params-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_AUTO;</div><div class='del'>-		fe_params-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_AUTO;</div><div class='add'>+		fe_params-&gt;code_rate_HP = FEC_AUTO;</div><div class='add'>+		fe_params-&gt;guard_interval = GUARD_INTERVAL_AUTO;</div><div class='add'>+		fe_params-&gt;transmission_mode = TRANSMISSION_MODE_AUTO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	// Set standard params.. or put them to auto</div><div class='del'>-	if ((fe_params-&gt;u.ofdm.code_rate_HP == FEC_AUTO) ||</div><div class='del'>-		(fe_params-&gt;u.ofdm.code_rate_LP == FEC_AUTO) ||</div><div class='del'>-		(fe_params-&gt;u.ofdm.constellation == QAM_AUTO) ||</div><div class='del'>-		(fe_params-&gt;u.ofdm.hierarchy_information == HIERARCHY_AUTO)) {</div><div class='add'>+	if ((fe_params-&gt;code_rate_HP == FEC_AUTO) ||</div><div class='add'>+		(fe_params-&gt;code_rate_LP == FEC_AUTO) ||</div><div class='add'>+		(fe_params-&gt;modulation == QAM_AUTO) ||</div><div class='add'>+		(fe_params-&gt;hierarchy == HIERARCHY_AUTO)) {</div><div class='ctx'> 		tda1004x_write_mask(state, TDA1004X_AUTO, 1, 1);	// enable auto</div><div class='del'>-		tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x03, 0);	// turn off constellation bits</div><div class='add'>+		tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x03, 0);	/* turn off modulation bits */</div><div class='ctx'> 		tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x60, 0);	// turn off hierarchy bits</div><div class='ctx'> 		tda1004x_write_mask(state, TDA1004X_IN_CONF2, 0x3f, 0);	// turn off FEC bits</div><div class='ctx'> 	} else {</div><div class='ctx'> 		tda1004x_write_mask(state, TDA1004X_AUTO, 1, 0);	// disable auto</div><div class='ctx'> </div><div class='ctx'> 		// set HP FEC</div><div class='del'>-		tmp = tda1004x_encode_fec(fe_params-&gt;u.ofdm.code_rate_HP);</div><div class='add'>+		tmp = tda1004x_encode_fec(fe_params-&gt;code_rate_HP);</div><div class='ctx'> 		if (tmp &lt; 0)</div><div class='ctx'> 			return tmp;</div><div class='ctx'> 		tda1004x_write_mask(state, TDA1004X_IN_CONF2, 7, tmp);</div><div class='ctx'> </div><div class='ctx'> 		// set LP FEC</div><div class='del'>-		tmp = tda1004x_encode_fec(fe_params-&gt;u.ofdm.code_rate_LP);</div><div class='add'>+		tmp = tda1004x_encode_fec(fe_params-&gt;code_rate_LP);</div><div class='ctx'> 		if (tmp &lt; 0)</div><div class='ctx'> 			return tmp;</div><div class='ctx'> 		tda1004x_write_mask(state, TDA1004X_IN_CONF2, 0x38, tmp &lt;&lt; 3);</div><div class='ctx'> </div><div class='del'>-		// set constellation</div><div class='del'>-		switch (fe_params-&gt;u.ofdm.constellation) {</div><div class='add'>+		/* set modulation */</div><div class='add'>+		switch (fe_params-&gt;modulation) {</div><div class='ctx'> 		case QPSK:</div><div class='ctx'> 			tda1004x_write_mask(state, TDA1004X_IN_CONF1, 3, 0);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -774,7 +774,7 @@ static int tda1004x_set_fe(struct dvb_frontend* fe,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		// set hierarchy</div><div class='del'>-		switch (fe_params-&gt;u.ofdm.hierarchy_information) {</div><div class='add'>+		switch (fe_params-&gt;hierarchy) {</div><div class='ctx'> 		case HIERARCHY_NONE:</div><div class='ctx'> 			tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x60, 0 &lt;&lt; 5);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -799,11 +799,11 @@ static int tda1004x_set_fe(struct dvb_frontend* fe,</div><div class='ctx'> 	// set bandwidth</div><div class='ctx'> 	switch (state-&gt;demod_type) {</div><div class='ctx'> 	case TDA1004X_DEMOD_TDA10045:</div><div class='del'>-		tda10045h_set_bandwidth(state, fe_params-&gt;u.ofdm.bandwidth);</div><div class='add'>+		tda10045h_set_bandwidth(state, fe_params-&gt;bandwidth_hz);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case TDA1004X_DEMOD_TDA10046:</div><div class='del'>-		tda10046h_set_bandwidth(state, fe_params-&gt;u.ofdm.bandwidth);</div><div class='add'>+		tda10046h_set_bandwidth(state, fe_params-&gt;bandwidth_hz);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -825,7 +825,7 @@ static int tda1004x_set_fe(struct dvb_frontend* fe,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	// set guard interval</div><div class='del'>-	switch (fe_params-&gt;u.ofdm.guard_interval) {</div><div class='add'>+	switch (fe_params-&gt;guard_interval) {</div><div class='ctx'> 	case GUARD_INTERVAL_1_32:</div><div class='ctx'> 		tda1004x_write_mask(state, TDA1004X_AUTO, 2, 0);</div><div class='ctx'> 		tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x0c, 0 &lt;&lt; 2);</div><div class='hunk'>@@ -856,7 +856,7 @@ static int tda1004x_set_fe(struct dvb_frontend* fe,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	// set transmission mode</div><div class='del'>-	switch (fe_params-&gt;u.ofdm.transmission_mode) {</div><div class='add'>+	switch (fe_params-&gt;transmission_mode) {</div><div class='ctx'> 	case TRANSMISSION_MODE_2K:</div><div class='ctx'> 		tda1004x_write_mask(state, TDA1004X_AUTO, 4, 0);</div><div class='ctx'> 		tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x10, 0 &lt;&lt; 4);</div><div class='hunk'>@@ -895,8 +895,9 @@ static int tda1004x_set_fe(struct dvb_frontend* fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda1004x_get_fe(struct dvb_frontend* fe, struct dvb_frontend_parameters *fe_params)</div><div class='add'>+static int tda1004x_get_fe(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fe_params = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct tda1004x_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s\n", __func__);</div><div class='hunk'>@@ -913,13 +914,13 @@ static int tda1004x_get_fe(struct dvb_frontend* fe, struct dvb_frontend_paramete</div><div class='ctx'> 	case TDA1004X_DEMOD_TDA10045:</div><div class='ctx'> 		switch (tda1004x_read_byte(state, TDA10045H_WREF_LSB)) {</div><div class='ctx'> 		case 0x14:</div><div class='del'>-			fe_params-&gt;u.ofdm.bandwidth = BANDWIDTH_8_MHZ;</div><div class='add'>+			fe_params-&gt;bandwidth_hz = 8000000;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0xdb:</div><div class='del'>-			fe_params-&gt;u.ofdm.bandwidth = BANDWIDTH_7_MHZ;</div><div class='add'>+			fe_params-&gt;bandwidth_hz = 7000000;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x4f:</div><div class='del'>-			fe_params-&gt;u.ofdm.bandwidth = BANDWIDTH_6_MHZ;</div><div class='add'>+			fe_params-&gt;bandwidth_hz = 6000000;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -927,73 +928,73 @@ static int tda1004x_get_fe(struct dvb_frontend* fe, struct dvb_frontend_paramete</div><div class='ctx'> 		switch (tda1004x_read_byte(state, TDA10046H_TIME_WREF1)) {</div><div class='ctx'> 		case 0x5c:</div><div class='ctx'> 		case 0x54:</div><div class='del'>-			fe_params-&gt;u.ofdm.bandwidth = BANDWIDTH_8_MHZ;</div><div class='add'>+			fe_params-&gt;bandwidth_hz = 8000000;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x6a:</div><div class='ctx'> 		case 0x60:</div><div class='del'>-			fe_params-&gt;u.ofdm.bandwidth = BANDWIDTH_7_MHZ;</div><div class='add'>+			fe_params-&gt;bandwidth_hz = 7000000;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x7b:</div><div class='ctx'> 		case 0x70:</div><div class='del'>-			fe_params-&gt;u.ofdm.bandwidth = BANDWIDTH_6_MHZ;</div><div class='add'>+			fe_params-&gt;bandwidth_hz = 6000000;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	// FEC</div><div class='del'>-	fe_params-&gt;u.ofdm.code_rate_HP =</div><div class='add'>+	fe_params-&gt;code_rate_HP =</div><div class='ctx'> 	    tda1004x_decode_fec(tda1004x_read_byte(state, TDA1004X_OUT_CONF2) &amp; 7);</div><div class='del'>-	fe_params-&gt;u.ofdm.code_rate_LP =</div><div class='add'>+	fe_params-&gt;code_rate_LP =</div><div class='ctx'> 	    tda1004x_decode_fec((tda1004x_read_byte(state, TDA1004X_OUT_CONF2) &gt;&gt; 3) &amp; 7);</div><div class='ctx'> </div><div class='del'>-	// constellation</div><div class='add'>+	/* modulation */</div><div class='ctx'> 	switch (tda1004x_read_byte(state, TDA1004X_OUT_CONF1) &amp; 3) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		fe_params-&gt;u.ofdm.constellation = QPSK;</div><div class='add'>+		fe_params-&gt;modulation = QPSK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		fe_params-&gt;u.ofdm.constellation = QAM_16;</div><div class='add'>+		fe_params-&gt;modulation = QAM_16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		fe_params-&gt;u.ofdm.constellation = QAM_64;</div><div class='add'>+		fe_params-&gt;modulation = QAM_64;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	// transmission mode</div><div class='del'>-	fe_params-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_2K;</div><div class='add'>+	fe_params-&gt;transmission_mode = TRANSMISSION_MODE_2K;</div><div class='ctx'> 	if (tda1004x_read_byte(state, TDA1004X_OUT_CONF1) &amp; 0x10)</div><div class='del'>-		fe_params-&gt;u.ofdm.transmission_mode = TRANSMISSION_MODE_8K;</div><div class='add'>+		fe_params-&gt;transmission_mode = TRANSMISSION_MODE_8K;</div><div class='ctx'> </div><div class='ctx'> 	// guard interval</div><div class='ctx'> 	switch ((tda1004x_read_byte(state, TDA1004X_OUT_CONF1) &amp; 0x0c) &gt;&gt; 2) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		fe_params-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_32;</div><div class='add'>+		fe_params-&gt;guard_interval = GUARD_INTERVAL_1_32;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		fe_params-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_16;</div><div class='add'>+		fe_params-&gt;guard_interval = GUARD_INTERVAL_1_16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		fe_params-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_8;</div><div class='add'>+		fe_params-&gt;guard_interval = GUARD_INTERVAL_1_8;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		fe_params-&gt;u.ofdm.guard_interval = GUARD_INTERVAL_1_4;</div><div class='add'>+		fe_params-&gt;guard_interval = GUARD_INTERVAL_1_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	// hierarchy</div><div class='ctx'> 	switch ((tda1004x_read_byte(state, TDA1004X_OUT_CONF1) &amp; 0x60) &gt;&gt; 5) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		fe_params-&gt;u.ofdm.hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+		fe_params-&gt;hierarchy = HIERARCHY_NONE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		fe_params-&gt;u.ofdm.hierarchy_information = HIERARCHY_1;</div><div class='add'>+		fe_params-&gt;hierarchy = HIERARCHY_1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		fe_params-&gt;u.ofdm.hierarchy_information = HIERARCHY_2;</div><div class='add'>+		fe_params-&gt;hierarchy = HIERARCHY_2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		fe_params-&gt;u.ofdm.hierarchy_information = HIERARCHY_4;</div><div class='add'>+		fe_params-&gt;hierarchy = HIERARCHY_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1231,9 +1232,9 @@ static void tda1004x_release(struct dvb_frontend* fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops tda10045_ops = {</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "Philips TDA10045H DVB-T",</div><div class='del'>-		.type = FE_OFDM,</div><div class='ctx'> 		.frequency_min = 51000000,</div><div class='ctx'> 		.frequency_max = 858000000,</div><div class='ctx'> 		.frequency_stepsize = 166667,</div><div class='hunk'>@@ -1301,9 +1302,9 @@ struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops tda10046_ops = {</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "Philips TDA10046H DVB-T",</div><div class='del'>-		.type = FE_OFDM,</div><div class='ctx'> 		.frequency_min = 51000000,</div><div class='ctx'> 		.frequency_max = 858000000,</div><div class='ctx'> 		.frequency_stepsize = 166667,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/tda10071.c b/drivers/media/dvb/frontends/tda10071.c<br/>index 0c37434d19e2..a99205026751 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda10071.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tda10071.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda10071.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/tda10071.c</a></div><div class='hunk'>@@ -636,8 +636,7 @@ error:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda10071_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *params)</div><div class='add'>+static int tda10071_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct tda10071_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct tda10071_cmd cmd;</div><div class='hunk'>@@ -777,8 +776,7 @@ error:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda10071_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *p)</div><div class='add'>+static int tda10071_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct tda10071_priv *priv = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='hunk'>@@ -1217,9 +1215,9 @@ error:</div><div class='ctx'> EXPORT_SYMBOL(tda10071_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops tda10071_ops = {</div><div class='add'>+	.delsys = { SYS_DVBT, SYS_DVBT2 },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "NXP TDA10071",</div><div class='del'>-		.type = FE_QPSK,</div><div class='ctx'> 		.frequency_min = 950000,</div><div class='ctx'> 		.frequency_max = 2150000,</div><div class='ctx'> 		.frequency_tolerance = 5000,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/tda10086.c b/drivers/media/dvb/frontends/tda10086.c<br/>index f2c8faac6f36..fcfe2e080cb0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda10086.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tda10086.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda10086.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/tda10086.c</a></div><div class='hunk'>@@ -267,7 +267,7 @@ static int tda10086_send_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t minic</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tda10086_set_inversion(struct tda10086_state *state,</div><div class='del'>-				  struct dvb_frontend_parameters *fe_params)</div><div class='add'>+				  struct dtv_frontend_properties *fe_params)</div><div class='ctx'> {</div><div class='ctx'> 	u8 invval = 0x80;</div><div class='ctx'> </div><div class='hunk'>@@ -292,7 +292,7 @@ static int tda10086_set_inversion(struct tda10086_state *state,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tda10086_set_symbol_rate(struct tda10086_state *state,</div><div class='del'>-				    struct dvb_frontend_parameters *fe_params)</div><div class='add'>+				    struct dtv_frontend_properties *fe_params)</div><div class='ctx'> {</div><div class='ctx'> 	u8 dfn = 0;</div><div class='ctx'> 	u8 afs = 0;</div><div class='hunk'>@@ -303,7 +303,7 @@ static int tda10086_set_symbol_rate(struct tda10086_state *state,</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> 	u32 bdr;</div><div class='ctx'> 	u32 bdri;</div><div class='del'>-	u32 symbol_rate = fe_params-&gt;u.qpsk.symbol_rate;</div><div class='add'>+	u32 symbol_rate = fe_params-&gt;symbol_rate;</div><div class='ctx'> </div><div class='ctx'> 	dprintk ("%s %i\n", __func__, symbol_rate);</div><div class='ctx'> </div><div class='hunk'>@@ -367,13 +367,13 @@ static int tda10086_set_symbol_rate(struct tda10086_state *state,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tda10086_set_fec(struct tda10086_state *state,</div><div class='del'>-			    struct dvb_frontend_parameters *fe_params)</div><div class='add'>+			    struct dtv_frontend_properties *fe_params)</div><div class='ctx'> {</div><div class='ctx'> 	u8 fecval;</div><div class='ctx'> </div><div class='del'>-	dprintk ("%s %i\n", __func__, fe_params-&gt;u.qpsk.fec_inner);</div><div class='add'>+	dprintk("%s %i\n", __func__, fe_params-&gt;fec_inner);</div><div class='ctx'> </div><div class='del'>-	switch(fe_params-&gt;u.qpsk.fec_inner) {</div><div class='add'>+	switch (fe_params-&gt;fec_inner) {</div><div class='ctx'> 	case FEC_1_2:</div><div class='ctx'> 		fecval = 0x00;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -409,9 +409,9 @@ static int tda10086_set_fec(struct tda10086_state *state,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda10086_set_frontend(struct dvb_frontend* fe,</div><div class='del'>-				 struct dvb_frontend_parameters *fe_params)</div><div class='add'>+static int tda10086_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fe_params = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct tda10086_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 freq = 0;</div><div class='hunk'>@@ -425,7 +425,7 @@ static int tda10086_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> </div><div class='ctx'> 	/* set params */</div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, fe_params);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -452,13 +452,14 @@ static int tda10086_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	tda10086_write_mask(state, 0x10, 0x40, 0x40);</div><div class='ctx'> 	tda10086_write_mask(state, 0x00, 0x01, 0x00);</div><div class='ctx'> </div><div class='del'>-	state-&gt;symbol_rate = fe_params-&gt;u.qpsk.symbol_rate;</div><div class='add'>+	state-&gt;symbol_rate = fe_params-&gt;symbol_rate;</div><div class='ctx'> 	state-&gt;frequency = fe_params-&gt;frequency;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda10086_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *fe_params)</div><div class='add'>+static int tda10086_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fe_params = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct tda10086_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u8 val;</div><div class='ctx'> 	int tmp;</div><div class='hunk'>@@ -467,7 +468,7 @@ static int tda10086_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_pa</div><div class='ctx'> 	dprintk ("%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* check for invalid symbol rate */</div><div class='del'>-	if (fe_params-&gt;u.qpsk.symbol_rate &lt; 500000)</div><div class='add'>+	if (fe_params-&gt;symbol_rate &lt; 500000)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* calculate the updated frequency (note: we convert from Hz-&gt;kHz) */</div><div class='hunk'>@@ -516,34 +517,34 @@ static int tda10086_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_pa</div><div class='ctx'> 		tmp |= 0xffffff00;</div><div class='ctx'> 	tmp = (tmp * 480 * (1&lt;&lt;1)) / 128;</div><div class='ctx'> 	tmp = ((state-&gt;symbol_rate/1000) * tmp) / (1000000/1000);</div><div class='del'>-	fe_params-&gt;u.qpsk.symbol_rate = state-&gt;symbol_rate + tmp;</div><div class='add'>+	fe_params-&gt;symbol_rate = state-&gt;symbol_rate + tmp;</div><div class='ctx'> </div><div class='ctx'> 	/* the FEC */</div><div class='ctx'> 	val = (tda10086_read_byte(state, 0x0d) &amp; 0x70) &gt;&gt; 4;</div><div class='ctx'> 	switch(val) {</div><div class='ctx'> 	case 0x00:</div><div class='del'>-		fe_params-&gt;u.qpsk.fec_inner = FEC_1_2;</div><div class='add'>+		fe_params-&gt;fec_inner = FEC_1_2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x01:</div><div class='del'>-		fe_params-&gt;u.qpsk.fec_inner = FEC_2_3;</div><div class='add'>+		fe_params-&gt;fec_inner = FEC_2_3;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x02:</div><div class='del'>-		fe_params-&gt;u.qpsk.fec_inner = FEC_3_4;</div><div class='add'>+		fe_params-&gt;fec_inner = FEC_3_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x03:</div><div class='del'>-		fe_params-&gt;u.qpsk.fec_inner = FEC_4_5;</div><div class='add'>+		fe_params-&gt;fec_inner = FEC_4_5;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x04:</div><div class='del'>-		fe_params-&gt;u.qpsk.fec_inner = FEC_5_6;</div><div class='add'>+		fe_params-&gt;fec_inner = FEC_5_6;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x05:</div><div class='del'>-		fe_params-&gt;u.qpsk.fec_inner = FEC_6_7;</div><div class='add'>+		fe_params-&gt;fec_inner = FEC_6_7;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x06:</div><div class='del'>-		fe_params-&gt;u.qpsk.fec_inner = FEC_7_8;</div><div class='add'>+		fe_params-&gt;fec_inner = FEC_7_8;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x07:</div><div class='del'>-		fe_params-&gt;u.qpsk.fec_inner = FEC_8_9;</div><div class='add'>+		fe_params-&gt;fec_inner = FEC_8_9;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -664,29 +665,31 @@ static int tda10086_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)</div><div class='ctx'> </div><div class='ctx'> static int tda10086_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)</div><div class='ctx'> {</div><div class='del'>-	if (fesettings-&gt;parameters.u.qpsk.symbol_rate &gt; 20000000) {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;symbol_rate &gt; 20000000) {</div><div class='ctx'> 		fesettings-&gt;min_delay_ms = 50;</div><div class='ctx'> 		fesettings-&gt;step_size = 2000;</div><div class='ctx'> 		fesettings-&gt;max_drift = 8000;</div><div class='del'>-	} else if (fesettings-&gt;parameters.u.qpsk.symbol_rate &gt; 12000000) {</div><div class='add'>+	} else if (p-&gt;symbol_rate &gt; 12000000) {</div><div class='ctx'> 		fesettings-&gt;min_delay_ms = 100;</div><div class='ctx'> 		fesettings-&gt;step_size = 1500;</div><div class='ctx'> 		fesettings-&gt;max_drift = 9000;</div><div class='del'>-	} else if (fesettings-&gt;parameters.u.qpsk.symbol_rate &gt; 8000000) {</div><div class='add'>+	} else if (p-&gt;symbol_rate &gt; 8000000) {</div><div class='ctx'> 		fesettings-&gt;min_delay_ms = 100;</div><div class='ctx'> 		fesettings-&gt;step_size = 1000;</div><div class='ctx'> 		fesettings-&gt;max_drift = 8000;</div><div class='del'>-	} else if (fesettings-&gt;parameters.u.qpsk.symbol_rate &gt; 4000000) {</div><div class='add'>+	} else if (p-&gt;symbol_rate &gt; 4000000) {</div><div class='ctx'> 		fesettings-&gt;min_delay_ms = 100;</div><div class='ctx'> 		fesettings-&gt;step_size = 500;</div><div class='ctx'> 		fesettings-&gt;max_drift = 7000;</div><div class='del'>-	} else if (fesettings-&gt;parameters.u.qpsk.symbol_rate &gt; 2000000) {</div><div class='add'>+	} else if (p-&gt;symbol_rate &gt; 2000000) {</div><div class='ctx'> 		fesettings-&gt;min_delay_ms = 200;</div><div class='del'>-		fesettings-&gt;step_size = (fesettings-&gt;parameters.u.qpsk.symbol_rate / 8000);</div><div class='add'>+		fesettings-&gt;step_size = p-&gt;symbol_rate / 8000;</div><div class='ctx'> 		fesettings-&gt;max_drift = 14 * fesettings-&gt;step_size;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		fesettings-&gt;min_delay_ms = 200;</div><div class='del'>-		fesettings-&gt;step_size = (fesettings-&gt;parameters.u.qpsk.symbol_rate / 8000);</div><div class='add'>+		fesettings-&gt;step_size =  p-&gt;symbol_rate / 8000;</div><div class='ctx'> 		fesettings-&gt;max_drift = 18 * fesettings-&gt;step_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -701,10 +704,9 @@ static void tda10086_release(struct dvb_frontend* fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops tda10086_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name     = "Philips TDA10086 DVB-S",</div><div class='del'>-		.type     = FE_QPSK,</div><div class='ctx'> 		.frequency_min    = 950000,</div><div class='ctx'> 		.frequency_max    = 2150000,</div><div class='ctx'> 		.frequency_stepsize = 125,     /* kHz for QPSK frontends */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/tda18271c2dd.c b/drivers/media/dvb/frontends/tda18271c2dd.c<br/>index 1b1bf200c55c..ad7c72e8f517 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda18271c2dd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tda18271c2dd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda18271c2dd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/tda18271c2dd.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "dvb_frontend.h"</div><div class='hunk'>@@ -1123,55 +1122,51 @@ static int release(struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * As defined on EN 300 429 Annex A and on ITU-T J.83 annex A, the DVB-C</div><div class='del'>- * roll-off factor is 0.15.</div><div class='del'>- * According with the specs, the amount of the needed bandwith is given by:</div><div class='del'>- *	Bw = Symbol_rate * (1 + 0.15)</div><div class='del'>- * As such, the maximum symbol rate supported by 6 MHz is</div><div class='del'>- *	max_symbol_rate = 6 MHz / 1.15 = 5217391 Bauds</div><div class='del'>- *NOTE: For ITU-T J.83 Annex C, the roll-off factor is 0.13. So:</div><div class='del'>- *	max_symbol_rate = 6 MHz / 1.13 = 5309735 Baud</div><div class='del'>- *	That means that an adjustment is needed for Japan,</div><div class='del'>- *	but, as currently DRX-K is hardcoded to Annex A, let's stick</div><div class='del'>- *	with 0.15 roll-off factor.</div><div class='del'>- */</div><div class='del'>-#define MAX_SYMBOL_RATE_6MHz	5217391</div><div class='ctx'> </div><div class='del'>-static int set_params(struct dvb_frontend *fe,</div><div class='del'>-		      struct dvb_frontend_parameters *params)</div><div class='add'>+static int set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct tda_state *state = fe-&gt;tuner_priv;</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> 	int Standard;</div><div class='add'>+	u32 bw = fe-&gt;dtv_property_cache.bandwidth_hz;</div><div class='add'>+	u32 delsys  = fe-&gt;dtv_property_cache.delivery_system;</div><div class='ctx'> </div><div class='del'>-	state-&gt;m_Frequency = params-&gt;frequency;</div><div class='add'>+	state-&gt;m_Frequency = fe-&gt;dtv_property_cache.frequency;</div><div class='ctx'> </div><div class='del'>-	if (fe-&gt;ops.info.type == FE_OFDM)</div><div class='del'>-		switch (params-&gt;u.ofdm.bandwidth) {</div><div class='del'>-		case BANDWIDTH_6_MHZ:</div><div class='add'>+	switch (delsys) {</div><div class='add'>+	case  SYS_DVBT:</div><div class='add'>+	case  SYS_DVBT2:</div><div class='add'>+		switch (bw) {</div><div class='add'>+		case 6000000:</div><div class='ctx'> 			Standard = HF_DVBT_6MHZ;</div><div class='ctx'> 			break;</div><div class='del'>-		case BANDWIDTH_7_MHZ:</div><div class='add'>+		case 7000000:</div><div class='ctx'> 			Standard = HF_DVBT_7MHZ;</div><div class='ctx'> 			break;</div><div class='del'>-		default:</div><div class='del'>-		case BANDWIDTH_8_MHZ:</div><div class='add'>+		case 8000000:</div><div class='ctx'> 			Standard = HF_DVBT_8MHZ;</div><div class='ctx'> 			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-	else if (fe-&gt;ops.info.type == FE_QAM) {</div><div class='del'>-		if (params-&gt;u.qam.symbol_rate &lt;= MAX_SYMBOL_RATE_6MHz)</div><div class='add'>+	case SYS_DVBC_ANNEX_A:</div><div class='add'>+	case SYS_DVBC_ANNEX_C:</div><div class='add'>+		if (bw &lt;= 6000000)</div><div class='ctx'> 			Standard = HF_DVBC_6MHZ;</div><div class='add'>+		else if (bw &lt;= 7000000)</div><div class='add'>+			Standard = HF_DVBC_7MHZ;</div><div class='ctx'> 		else</div><div class='ctx'> 			Standard = HF_DVBC_8MHZ;</div><div class='del'>-	} else</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	do {</div><div class='del'>-		status = RFTrackingFiltersCorrection(state, params-&gt;frequency);</div><div class='add'>+		status = RFTrackingFiltersCorrection(state, state-&gt;m_Frequency);</div><div class='ctx'> 		if (status &lt; 0)</div><div class='ctx'> 			break;</div><div class='del'>-		status = ChannelConfiguration(state, params-&gt;frequency, Standard);</div><div class='add'>+		status = ChannelConfiguration(state, state-&gt;m_Frequency,</div><div class='add'>+					      Standard);</div><div class='ctx'> 		if (status &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/tda8083.c b/drivers/media/dvb/frontends/tda8083.c<br/>index 9369f7442f27..15912c96926a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda8083.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tda8083.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda8083.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/tda8083.c</a></div><div class='hunk'>@@ -315,18 +315,19 @@ static int tda8083_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda8083_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int tda8083_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct tda8083_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tda8083_set_inversion (state, p-&gt;inversion);</div><div class='del'>-	tda8083_set_fec (state, p-&gt;u.qpsk.fec_inner);</div><div class='del'>-	tda8083_set_symbolrate (state, p-&gt;u.qpsk.symbol_rate);</div><div class='add'>+	tda8083_set_fec(state, p-&gt;fec_inner);</div><div class='add'>+	tda8083_set_symbolrate(state, p-&gt;symbol_rate);</div><div class='ctx'> </div><div class='ctx'> 	tda8083_writereg (state, 0x00, 0x3c);</div><div class='ctx'> 	tda8083_writereg (state, 0x00, 0x04);</div><div class='hunk'>@@ -334,16 +335,17 @@ static int tda8083_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda8083_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int tda8083_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct tda8083_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	/*  FIXME: get symbolrate &amp; frequency offset...*/</div><div class='ctx'> 	/*p-&gt;frequency = ???;*/</div><div class='ctx'> 	p-&gt;inversion = (tda8083_readreg (state, 0x0e) &amp; 0x80) ?</div><div class='ctx'> 			INVERSION_ON : INVERSION_OFF;</div><div class='del'>-	p-&gt;u.qpsk.fec_inner = tda8083_get_fec (state);</div><div class='del'>-	/*p-&gt;u.qpsk.symbol_rate = tda8083_get_symbolrate (state);*/</div><div class='add'>+	p-&gt;fec_inner = tda8083_get_fec(state);</div><div class='add'>+	/*p-&gt;symbol_rate = tda8083_get_symbolrate (state);*/</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -438,10 +440,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops tda8083_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Philips TDA8083 DVB-S",</div><div class='del'>-		.type			= FE_QPSK,</div><div class='ctx'> 		.frequency_min		= 920000,     /* TDA8060 */</div><div class='ctx'> 		.frequency_max		= 2200000,    /* TDA8060 */</div><div class='ctx'> 		.frequency_stepsize	= 125,   /* kHz for QPSK frontends */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/tda826x.c b/drivers/media/dvb/frontends/tda826x.c<br/>index 06c94800b940..04bbcc24de0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda826x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tda826x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda826x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/tda826x.c</a></div><div class='hunk'>@@ -71,8 +71,9 @@ static int tda826x_sleep(struct dvb_frontend *fe)</div><div class='ctx'> 	return (ret == 1) ? 0 : ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda826x_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int tda826x_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct tda826x_priv *priv = fe-&gt;tuner_priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 div;</div><div class='hunk'>@@ -83,11 +84,11 @@ static int tda826x_set_params(struct dvb_frontend *fe, struct dvb_frontend_param</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s:\n", __func__);</div><div class='ctx'> </div><div class='del'>-	div = (params-&gt;frequency + (1000-1)) / 1000;</div><div class='add'>+	div = (p-&gt;frequency + (1000-1)) / 1000;</div><div class='ctx'> </div><div class='ctx'> 	/* BW = ((1 + RO) * SR/2 + 5) * 1.3      [SR in MSPS, BW in MHz] */</div><div class='ctx'> 	/* with R0 = 0.35 and some transformations: */</div><div class='del'>-	ksyms = params-&gt;u.qpsk.symbol_rate / 1000;</div><div class='add'>+	ksyms = p-&gt;symbol_rate / 1000;</div><div class='ctx'> 	bandwidth = (878 * ksyms + 6500000) / 1000000 + 1;</div><div class='ctx'> 	if (bandwidth &lt; 5)</div><div class='ctx'> 		bandwidth = 5;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/tdhd1.h b/drivers/media/dvb/frontends/tdhd1.h<br/>index 51f170678650..17750985db0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tdhd1.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tdhd1.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tdhd1.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/tdhd1.h</a></div><div class='hunk'>@@ -40,24 +40,25 @@ static struct tda1004x_config alps_tdhd1_204a_config = {</div><div class='ctx'> 	.request_firmware = alps_tdhd1_204_request_firmware</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int alps_tdhd1_204a_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int alps_tdhd1_204a_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct i2c_adapter *i2c = fe-&gt;tuner_priv;</div><div class='ctx'> 	u8 data[4];</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };</div><div class='ctx'> 	u32 div;</div><div class='ctx'> </div><div class='del'>-	div = (params-&gt;frequency + 36166666) / 166666;</div><div class='add'>+	div = (p-&gt;frequency + 36166666) / 166666;</div><div class='ctx'> </div><div class='ctx'> 	data[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	data[1] = div &amp; 0xff;</div><div class='ctx'> 	data[2] = 0x85;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &gt;= 174000000 &amp;&amp; params-&gt;frequency &lt;= 230000000)</div><div class='add'>+	if (p-&gt;frequency &gt;= 174000000 &amp;&amp; p-&gt;frequency &lt;= 230000000)</div><div class='ctx'> 		data[3] = 0x02;</div><div class='del'>-	else if (params-&gt;frequency &gt;= 470000000 &amp;&amp; params-&gt;frequency &lt;= 823000000)</div><div class='add'>+	else if (p-&gt;frequency &gt;= 470000000 &amp;&amp; p-&gt;frequency &lt;= 823000000)</div><div class='ctx'> 		data[3] = 0x0C;</div><div class='del'>-	else if (params-&gt;frequency &gt; 823000000 &amp;&amp; params-&gt;frequency &lt;= 862000000)</div><div class='add'>+	else if (p-&gt;frequency &gt; 823000000 &amp;&amp; p-&gt;frequency &lt;= 862000000)</div><div class='ctx'> 		data[3] = 0x8C;</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/tua6100.c b/drivers/media/dvb/frontends/tua6100.c<br/>index bcb95c2ef296..029384d1fddd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tua6100.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/tua6100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tua6100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/tua6100.c</a></div><div class='hunk'>@@ -67,9 +67,9 @@ static int tua6100_sleep(struct dvb_frontend *fe)</div><div class='ctx'> 	return (ret == 1) ? 0 : ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tua6100_set_params(struct dvb_frontend *fe,</div><div class='del'>-			      struct dvb_frontend_parameters *params)</div><div class='add'>+static int tua6100_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct tua6100_priv *priv = fe-&gt;tuner_priv;</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	u32 prediv;</div><div class='hunk'>@@ -85,36 +85,37 @@ static int tua6100_set_params(struct dvb_frontend *fe,</div><div class='ctx'> #define _ri 4000000</div><div class='ctx'> </div><div class='ctx'> 	// setup register 0</div><div class='del'>-	if (params-&gt;frequency &lt; 2000000) {</div><div class='add'>+	if (c-&gt;frequency &lt; 2000000)</div><div class='ctx'> 		reg0[1] = 0x03;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		reg0[1] = 0x07;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	// setup register 1</div><div class='del'>-	if (params-&gt;frequency &lt; 1630000) {</div><div class='add'>+	if (c-&gt;frequency &lt; 1630000)</div><div class='ctx'> 		reg1[1] = 0x2c;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		reg1[1] = 0x0c;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	if (_P == 64)</div><div class='ctx'> 		reg1[1] |= 0x40;</div><div class='del'>-	if (params-&gt;frequency &gt;= 1525000)</div><div class='add'>+	if (c-&gt;frequency &gt;= 1525000)</div><div class='ctx'> 		reg1[1] |= 0x80;</div><div class='ctx'> </div><div class='ctx'> 	// register 2</div><div class='ctx'> 	reg2[1] = (_R &gt;&gt; 8) &amp; 0x03;</div><div class='ctx'> 	reg2[2] = _R;</div><div class='del'>-	if (params-&gt;frequency &lt; 1455000) {</div><div class='add'>+	if (c-&gt;frequency &lt; 1455000)</div><div class='ctx'> 		reg2[1] |= 0x1c;</div><div class='del'>-	} else if (params-&gt;frequency &lt; 1630000) {</div><div class='add'>+	else if (c-&gt;frequency &lt; 1630000)</div><div class='ctx'> 		reg2[1] |= 0x0c;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		reg2[1] |= 0x1c;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	// The N divisor ratio (note: params-&gt;frequency is in kHz, but we need it in Hz)</div><div class='del'>-	prediv = (params-&gt;frequency * _R) / (_ri / 1000);</div><div class='add'>+	/*</div><div class='add'>+	 * The N divisor ratio (note: c-&gt;frequency is in kHz, but we</div><div class='add'>+	 * need it in Hz)</div><div class='add'>+	 */</div><div class='add'>+	prediv = (c-&gt;frequency * _R) / (_ri / 1000);</div><div class='ctx'> 	div = prediv / _P;</div><div class='ctx'> 	reg1[1] |= (div &gt;&gt; 9) &amp; 0x03;</div><div class='ctx'> 	reg1[2] = div &gt;&gt; 1;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c<br/>index 550a07a8a997..bb42b563c42d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/ves1820.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/ves1820.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/ves1820.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/ves1820.c</a></div><div class='hunk'>@@ -205,25 +205,26 @@ static int ves1820_init(struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ves1820_set_parameters(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int ves1820_set_parameters(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct ves1820_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	static const u8 reg0x00[] = { 0x00, 0x04, 0x08, 0x0c, 0x10 };</div><div class='ctx'> 	static const u8 reg0x01[] = { 140, 140, 106, 100, 92 };</div><div class='ctx'> 	static const u8 reg0x05[] = { 135, 100, 70, 54, 38 };</div><div class='ctx'> 	static const u8 reg0x08[] = { 162, 116, 67, 52, 35 };</div><div class='ctx'> 	static const u8 reg0x09[] = { 145, 150, 106, 126, 107 };</div><div class='del'>-	int real_qam = p-&gt;u.qam.modulation - QAM_16;</div><div class='add'>+	int real_qam = p-&gt;modulation - QAM_16;</div><div class='ctx'> </div><div class='ctx'> 	if (real_qam &lt; 0 || real_qam &gt; 4)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ves1820_set_symbolrate(state, p-&gt;u.qam.symbol_rate);</div><div class='add'>+	ves1820_set_symbolrate(state, p-&gt;symbol_rate);</div><div class='ctx'> 	ves1820_writereg(state, 0x34, state-&gt;pwm);</div><div class='ctx'> </div><div class='ctx'> 	ves1820_writereg(state, 0x01, reg0x01[real_qam]);</div><div class='hunk'>@@ -309,8 +310,9 @@ static int ves1820_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ves1820_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int ves1820_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct ves1820_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int sync;</div><div class='ctx'> 	s8 afc = 0;</div><div class='hunk'>@@ -320,7 +322,7 @@ static int ves1820_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> 	if (verbose) {</div><div class='ctx'> 		/* AFC only valid when carrier has been recovered */</div><div class='ctx'> 		printk(sync &amp; 2 ? "ves1820: AFC (%d) %dHz\n" :</div><div class='del'>-			"ves1820: [AFC (%d) %dHz]\n", afc, -((s32) p-&gt;u.qam.symbol_rate * afc) &gt;&gt; 10);</div><div class='add'>+			"ves1820: [AFC (%d) %dHz]\n", afc, -((s32) p-&gt;symbol_rate * afc) &gt;&gt; 10);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!state-&gt;config-&gt;invert) {</div><div class='hunk'>@@ -329,13 +331,13 @@ static int ves1820_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> 		p-&gt;inversion = (!(state-&gt;reg0 &amp; 0x20)) ? INVERSION_ON : INVERSION_OFF;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p-&gt;u.qam.modulation = ((state-&gt;reg0 &gt;&gt; 2) &amp; 7) + QAM_16;</div><div class='add'>+	p-&gt;modulation = ((state-&gt;reg0 &gt;&gt; 2) &amp; 7) + QAM_16;</div><div class='ctx'> </div><div class='del'>-	p-&gt;u.qam.fec_inner = FEC_NONE;</div><div class='add'>+	p-&gt;fec_inner = FEC_NONE;</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;frequency = ((p-&gt;frequency + 31250) / 62500) * 62500;</div><div class='ctx'> 	if (sync &amp; 2)</div><div class='del'>-		p-&gt;frequency -= ((s32) p-&gt;u.qam.symbol_rate * afc) &gt;&gt; 10;</div><div class='add'>+		p-&gt;frequency -= ((s32) p-&gt;symbol_rate * afc) &gt;&gt; 10;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -405,10 +407,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops ves1820_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBC_ANNEX_A },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "VLSI VES1820 DVB-C",</div><div class='del'>-		.type = FE_QAM,</div><div class='ctx'> 		.frequency_stepsize = 62500,</div><div class='ctx'> 		.frequency_min = 47000000,</div><div class='ctx'> 		.frequency_max = 862000000,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/ves1x93.c b/drivers/media/dvb/frontends/ves1x93.c<br/>index 8d7854c2fb0c..9c17eacaec24 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/ves1x93.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/ves1x93.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/ves1x93.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/ves1x93.c</a></div><div class='hunk'>@@ -46,6 +46,7 @@ struct ves1x93_state {</div><div class='ctx'> 	u8 *init_1x93_wtab;</div><div class='ctx'> 	u8 tab_size;</div><div class='ctx'> 	u8 demod_type;</div><div class='add'>+	u32 frequency;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='hunk'>@@ -384,31 +385,34 @@ static int ves1x93_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ves1x93_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int ves1x93_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct ves1x93_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	ves1x93_set_inversion (state, p-&gt;inversion);</div><div class='del'>-	ves1x93_set_fec (state, p-&gt;u.qpsk.fec_inner);</div><div class='del'>-	ves1x93_set_symbolrate (state, p-&gt;u.qpsk.symbol_rate);</div><div class='add'>+	ves1x93_set_fec(state, p-&gt;fec_inner);</div><div class='add'>+	ves1x93_set_symbolrate(state, p-&gt;symbol_rate);</div><div class='ctx'> 	state-&gt;inversion = p-&gt;inversion;</div><div class='add'>+	state-&gt;frequency = p-&gt;frequency;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ves1x93_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int ves1x93_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct ves1x93_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int afc;</div><div class='ctx'> </div><div class='ctx'> 	afc = ((int)((char)(ves1x93_readreg (state, 0x0a) &lt;&lt; 1)))/2;</div><div class='del'>-	afc = (afc * (int)(p-&gt;u.qpsk.symbol_rate/1000/8))/16;</div><div class='add'>+	afc = (afc * (int)(p-&gt;symbol_rate/1000/8))/16;</div><div class='ctx'> </div><div class='del'>-	p-&gt;frequency -= afc;</div><div class='add'>+	p-&gt;frequency = state-&gt;frequency - afc;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * inversion indicator is only valid</div><div class='hunk'>@@ -417,7 +421,7 @@ static int ves1x93_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> 	if (state-&gt;inversion == INVERSION_AUTO)</div><div class='ctx'> 		p-&gt;inversion = (ves1x93_readreg (state, 0x0f) &amp; 2) ?</div><div class='ctx'> 				INVERSION_OFF : INVERSION_ON;</div><div class='del'>-	p-&gt;u.qpsk.fec_inner = ves1x93_get_fec (state);</div><div class='add'>+	p-&gt;fec_inner = ves1x93_get_fec(state);</div><div class='ctx'> 	/*  XXX FIXME: timing offset !! */</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -506,10 +510,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops ves1x93_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "VLSI VES1x93 DVB-S",</div><div class='del'>-		.type			= FE_QPSK,</div><div class='ctx'> 		.frequency_min		= 950000,</div><div class='ctx'> 		.frequency_max		= 2150000,</div><div class='ctx'> 		.frequency_stepsize	= 125,		 /* kHz for QPSK frontends */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/zl10036.c b/drivers/media/dvb/frontends/zl10036.c<br/>index 81aa984c551f..0903d461b8fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/zl10036.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/zl10036.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/zl10036.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/zl10036.c</a></div><div class='hunk'>@@ -305,12 +305,12 @@ static int zl10036_set_gain_params(struct zl10036_state *state,</div><div class='ctx'> 	return zl10036_write(state, buf, sizeof(buf));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int zl10036_set_params(struct dvb_frontend *fe,</div><div class='del'>-		struct dvb_frontend_parameters *params)</div><div class='add'>+static int zl10036_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct zl10036_state *state = fe-&gt;tuner_priv;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	u32 frequency = params-&gt;frequency;</div><div class='add'>+	u32 frequency = p-&gt;frequency;</div><div class='ctx'> 	u32 fbw;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u8 c;</div><div class='hunk'>@@ -326,7 +326,7 @@ static int zl10036_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 	 * fBW = (alpha*symbolrate)/(2*0.8)</div><div class='ctx'> 	 * 1.35 / (2*0.8) = 27 / 32</div><div class='ctx'> 	 */</div><div class='del'>-	fbw = (27 * params-&gt;u.qpsk.symbol_rate) / 32;</div><div class='add'>+	fbw = (27 * p-&gt;symbol_rate) / 32;</div><div class='ctx'> </div><div class='ctx'> 	/* scale to kHz */</div><div class='ctx'> 	fbw /= 1000;</div><div class='hunk'>@@ -353,7 +353,7 @@ static int zl10036_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	ret = zl10036_set_frequency(state, params-&gt;frequency);</div><div class='add'>+	ret = zl10036_set_frequency(state, p-&gt;frequency);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/zl10039.c b/drivers/media/dvb/frontends/zl10039.c<br/>index c085e58a94bf..eff9c5fde50a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/zl10039.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/zl10039.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/zl10039.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/zl10039.c</a></div><div class='hunk'>@@ -176,9 +176,9 @@ static int zl10039_sleep(struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int zl10039_set_params(struct dvb_frontend *fe,</div><div class='del'>-			struct dvb_frontend_parameters *params)</div><div class='add'>+static int zl10039_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct zl10039_state *state = fe-&gt;tuner_priv;</div><div class='ctx'> 	u8 buf[6];</div><div class='ctx'> 	u8 bf;</div><div class='hunk'>@@ -188,12 +188,12 @@ static int zl10039_set_params(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s\n", __func__);</div><div class='ctx'> 	dprintk("Set frequency = %d, symbol rate = %d\n",</div><div class='del'>-			params-&gt;frequency, params-&gt;u.qpsk.symbol_rate);</div><div class='add'>+			c-&gt;frequency, c-&gt;symbol_rate);</div><div class='ctx'> </div><div class='ctx'> 	/* Assumed 10.111 MHz crystal oscillator */</div><div class='ctx'> 	/* Cancelled num/den 80 to prevent overflow */</div><div class='del'>-	div = (params-&gt;frequency * 1000) / 126387;</div><div class='del'>-	fbw = (params-&gt;u.qpsk.symbol_rate * 27) / 32000;</div><div class='add'>+	div = (c-&gt;frequency * 1000) / 126387;</div><div class='add'>+	fbw = (c-&gt;symbol_rate * 27) / 32000;</div><div class='ctx'> 	/* Cancelled num/den 10 to prevent overflow */</div><div class='ctx'> 	bf = ((fbw * 5088) / 1011100) - 1;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c<br/>index adbbf6d3d044..ac7237891374 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/zl10353.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/frontends/zl10353.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/zl10353.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/frontends/zl10353.c</a></div><div class='hunk'>@@ -37,9 +37,9 @@ struct zl10353_state {</div><div class='ctx'> </div><div class='ctx'> 	struct zl10353_config config;</div><div class='ctx'> </div><div class='del'>-	enum fe_bandwidth bandwidth;</div><div class='del'>-       u32 ucblocks;</div><div class='del'>-       u32 frequency;</div><div class='add'>+	u32 bandwidth;</div><div class='add'>+	u32 ucblocks;</div><div class='add'>+	u32 frequency;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='hunk'>@@ -122,30 +122,17 @@ static void zl10353_dump_regs(struct dvb_frontend *fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void zl10353_calc_nominal_rate(struct dvb_frontend *fe,</div><div class='del'>-				      enum fe_bandwidth bandwidth,</div><div class='add'>+				      u32 bandwidth,</div><div class='ctx'> 				      u16 *nominal_rate)</div><div class='ctx'> {</div><div class='ctx'> 	struct zl10353_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u32 adc_clock = 450560; /* 45.056 MHz */</div><div class='ctx'> 	u64 value;</div><div class='del'>-	u8 bw;</div><div class='add'>+	u8 bw = bandwidth / 1000000;</div><div class='ctx'> </div><div class='ctx'> 	if (state-&gt;config.adc_clock)</div><div class='ctx'> 		adc_clock = state-&gt;config.adc_clock;</div><div class='ctx'> </div><div class='del'>-	switch (bandwidth) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='del'>-		bw = 6;</div><div class='del'>-		break;</div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='del'>-		bw = 7;</div><div class='del'>-		break;</div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='del'>-	default:</div><div class='del'>-		bw = 8;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	value = (u64)10 * (1 &lt;&lt; 23) / 7 * 125;</div><div class='ctx'> 	value = (bw * value) + adc_clock / 2;</div><div class='ctx'> 	do_div(value, adc_clock);</div><div class='hunk'>@@ -192,16 +179,15 @@ static int zl10353_sleep(struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int zl10353_set_parameters(struct dvb_frontend *fe,</div><div class='del'>-				  struct dvb_frontend_parameters *param)</div><div class='add'>+static int zl10353_set_parameters(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct zl10353_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u16 nominal_rate, input_freq;</div><div class='ctx'> 	u8 pllbuf[6] = { 0x67 }, acq_ctl = 0;</div><div class='ctx'> 	u16 tps = 0;</div><div class='del'>-	struct dvb_ofdm_parameters *op = &amp;param-&gt;u.ofdm;</div><div class='ctx'> </div><div class='del'>-       state-&gt;frequency = param-&gt;frequency;</div><div class='add'>+	state-&gt;frequency = c-&gt;frequency;</div><div class='ctx'> </div><div class='ctx'> 	zl10353_single_write(fe, RESET, 0x80);</div><div class='ctx'> 	udelay(200);</div><div class='hunk'>@@ -211,42 +197,44 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	zl10353_single_write(fe, AGC_TARGET, 0x28);</div><div class='ctx'> </div><div class='del'>-	if (op-&gt;transmission_mode != TRANSMISSION_MODE_AUTO)</div><div class='add'>+	if (c-&gt;transmission_mode != TRANSMISSION_MODE_AUTO)</div><div class='ctx'> 		acq_ctl |= (1 &lt;&lt; 0);</div><div class='del'>-	if (op-&gt;guard_interval != GUARD_INTERVAL_AUTO)</div><div class='add'>+	if (c-&gt;guard_interval != GUARD_INTERVAL_AUTO)</div><div class='ctx'> 		acq_ctl |= (1 &lt;&lt; 1);</div><div class='ctx'> 	zl10353_single_write(fe, ACQ_CTL, acq_ctl);</div><div class='ctx'> </div><div class='del'>-	switch (op-&gt;bandwidth) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	switch (c-&gt;bandwidth_hz) {</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		/* These are extrapolated from the 7 and 8MHz values */</div><div class='ctx'> 		zl10353_single_write(fe, MCLK_RATIO, 0x97);</div><div class='ctx'> 		zl10353_single_write(fe, 0x64, 0x34);</div><div class='ctx'> 		zl10353_single_write(fe, 0xcc, 0xdd);</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		zl10353_single_write(fe, MCLK_RATIO, 0x86);</div><div class='ctx'> 		zl10353_single_write(fe, 0x64, 0x35);</div><div class='ctx'> 		zl10353_single_write(fe, 0xcc, 0x73);</div><div class='ctx'> 		break;</div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='ctx'> 	default:</div><div class='add'>+		c-&gt;bandwidth_hz = 8000000;</div><div class='add'>+		/* fall though */</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		zl10353_single_write(fe, MCLK_RATIO, 0x75);</div><div class='ctx'> 		zl10353_single_write(fe, 0x64, 0x36);</div><div class='ctx'> 		zl10353_single_write(fe, 0xcc, 0x73);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	zl10353_calc_nominal_rate(fe, op-&gt;bandwidth, &amp;nominal_rate);</div><div class='add'>+	zl10353_calc_nominal_rate(fe, c-&gt;bandwidth_hz, &amp;nominal_rate);</div><div class='ctx'> 	zl10353_single_write(fe, TRL_NOMINAL_RATE_1, msb(nominal_rate));</div><div class='ctx'> 	zl10353_single_write(fe, TRL_NOMINAL_RATE_0, lsb(nominal_rate));</div><div class='del'>-	state-&gt;bandwidth = op-&gt;bandwidth;</div><div class='add'>+	state-&gt;bandwidth = c-&gt;bandwidth_hz;</div><div class='ctx'> </div><div class='ctx'> 	zl10353_calc_input_freq(fe, &amp;input_freq);</div><div class='ctx'> 	zl10353_single_write(fe, INPUT_FREQ_1, msb(input_freq));</div><div class='ctx'> 	zl10353_single_write(fe, INPUT_FREQ_0, lsb(input_freq));</div><div class='ctx'> </div><div class='ctx'> 	/* Hint at TPS settings */</div><div class='del'>-	switch (op-&gt;code_rate_HP) {</div><div class='add'>+	switch (c-&gt;code_rate_HP) {</div><div class='ctx'> 	case FEC_2_3:</div><div class='ctx'> 		tps |= (1 &lt;&lt; 7);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -266,7 +254,7 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (op-&gt;code_rate_LP) {</div><div class='add'>+	switch (c-&gt;code_rate_LP) {</div><div class='ctx'> 	case FEC_2_3:</div><div class='ctx'> 		tps |= (1 &lt;&lt; 4);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -283,14 +271,14 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 	case FEC_AUTO:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FEC_NONE:</div><div class='del'>-		if (op-&gt;hierarchy_information == HIERARCHY_AUTO ||</div><div class='del'>-		    op-&gt;hierarchy_information == HIERARCHY_NONE)</div><div class='add'>+		if (c-&gt;hierarchy == HIERARCHY_AUTO ||</div><div class='add'>+		    c-&gt;hierarchy == HIERARCHY_NONE)</div><div class='ctx'> 			break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (op-&gt;constellation) {</div><div class='add'>+	switch (c-&gt;modulation) {</div><div class='ctx'> 	case QPSK:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case QAM_AUTO:</div><div class='hunk'>@@ -304,7 +292,7 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (op-&gt;transmission_mode) {</div><div class='add'>+	switch (c-&gt;transmission_mode) {</div><div class='ctx'> 	case TRANSMISSION_MODE_2K:</div><div class='ctx'> 	case TRANSMISSION_MODE_AUTO:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -315,7 +303,7 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (op-&gt;guard_interval) {</div><div class='add'>+	switch (c-&gt;guard_interval) {</div><div class='ctx'> 	case GUARD_INTERVAL_1_32:</div><div class='ctx'> 	case GUARD_INTERVAL_AUTO:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -332,7 +320,7 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (op-&gt;hierarchy_information) {</div><div class='add'>+	switch (c-&gt;hierarchy) {</div><div class='ctx'> 	case HIERARCHY_AUTO:</div><div class='ctx'> 	case HIERARCHY_NONE:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -362,12 +350,12 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (state-&gt;config.no_tuner) {</div><div class='ctx'> 		if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='del'>-			fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+			fe-&gt;ops.tuner_ops.set_params(fe);</div><div class='ctx'> 			if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 				fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (fe-&gt;ops.tuner_ops.calc_regs) {</div><div class='del'>-		fe-&gt;ops.tuner_ops.calc_regs(fe, param, pllbuf + 1, 5);</div><div class='add'>+		fe-&gt;ops.tuner_ops.calc_regs(fe, pllbuf + 1, 5);</div><div class='ctx'> 		pllbuf[1] &lt;&lt;= 1;</div><div class='ctx'> 		zl10353_write(fe, pllbuf, sizeof(pllbuf));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -383,11 +371,10 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int zl10353_get_parameters(struct dvb_frontend *fe,</div><div class='del'>-				  struct dvb_frontend_parameters *param)</div><div class='add'>+static int zl10353_get_parameters(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct zl10353_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	struct dvb_ofdm_parameters *op = &amp;param-&gt;u.ofdm;</div><div class='ctx'> 	int s6, s9;</div><div class='ctx'> 	u16 tps;</div><div class='ctx'> 	static const u8 tps_fec_to_api[8] = {</div><div class='hunk'>@@ -411,66 +398,66 @@ static int zl10353_get_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 	tps = zl10353_read_register(state, TPS_RECEIVED_1) &lt;&lt; 8 |</div><div class='ctx'> 	      zl10353_read_register(state, TPS_RECEIVED_0);</div><div class='ctx'> </div><div class='del'>-	op-&gt;code_rate_HP = tps_fec_to_api[(tps &gt;&gt; 7) &amp; 7];</div><div class='del'>-	op-&gt;code_rate_LP = tps_fec_to_api[(tps &gt;&gt; 4) &amp; 7];</div><div class='add'>+	c-&gt;code_rate_HP = tps_fec_to_api[(tps &gt;&gt; 7) &amp; 7];</div><div class='add'>+	c-&gt;code_rate_LP = tps_fec_to_api[(tps &gt;&gt; 4) &amp; 7];</div><div class='ctx'> </div><div class='ctx'> 	switch ((tps &gt;&gt; 13) &amp; 3) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		op-&gt;constellation = QPSK;</div><div class='add'>+		c-&gt;modulation = QPSK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		op-&gt;constellation = QAM_16;</div><div class='add'>+		c-&gt;modulation = QAM_16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		op-&gt;constellation = QAM_64;</div><div class='add'>+		c-&gt;modulation = QAM_64;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		op-&gt;constellation = QAM_AUTO;</div><div class='add'>+		c-&gt;modulation = QAM_AUTO;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	op-&gt;transmission_mode = (tps &amp; 0x01) ? TRANSMISSION_MODE_8K :</div><div class='add'>+	c-&gt;transmission_mode = (tps &amp; 0x01) ? TRANSMISSION_MODE_8K :</div><div class='ctx'> 					       TRANSMISSION_MODE_2K;</div><div class='ctx'> </div><div class='ctx'> 	switch ((tps &gt;&gt; 2) &amp; 3) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		op-&gt;guard_interval = GUARD_INTERVAL_1_32;</div><div class='add'>+		c-&gt;guard_interval = GUARD_INTERVAL_1_32;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		op-&gt;guard_interval = GUARD_INTERVAL_1_16;</div><div class='add'>+		c-&gt;guard_interval = GUARD_INTERVAL_1_16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		op-&gt;guard_interval = GUARD_INTERVAL_1_8;</div><div class='add'>+		c-&gt;guard_interval = GUARD_INTERVAL_1_8;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		op-&gt;guard_interval = GUARD_INTERVAL_1_4;</div><div class='add'>+		c-&gt;guard_interval = GUARD_INTERVAL_1_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		op-&gt;guard_interval = GUARD_INTERVAL_AUTO;</div><div class='add'>+		c-&gt;guard_interval = GUARD_INTERVAL_AUTO;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch ((tps &gt;&gt; 10) &amp; 7) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		op-&gt;hierarchy_information = HIERARCHY_NONE;</div><div class='add'>+		c-&gt;hierarchy = HIERARCHY_NONE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		op-&gt;hierarchy_information = HIERARCHY_1;</div><div class='add'>+		c-&gt;hierarchy = HIERARCHY_1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		op-&gt;hierarchy_information = HIERARCHY_2;</div><div class='add'>+		c-&gt;hierarchy = HIERARCHY_2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		op-&gt;hierarchy_information = HIERARCHY_4;</div><div class='add'>+		c-&gt;hierarchy = HIERARCHY_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		op-&gt;hierarchy_information = HIERARCHY_AUTO;</div><div class='add'>+		c-&gt;hierarchy = HIERARCHY_AUTO;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-       param-&gt;frequency = state-&gt;frequency;</div><div class='del'>-	op-&gt;bandwidth = state-&gt;bandwidth;</div><div class='del'>-	param-&gt;inversion = INVERSION_AUTO;</div><div class='add'>+	c-&gt;frequency = state-&gt;frequency;</div><div class='add'>+	c-&gt;bandwidth_hz = state-&gt;bandwidth;</div><div class='add'>+	c-&gt;inversion = INVERSION_AUTO;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -651,10 +638,9 @@ error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops zl10353_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Zarlink ZL10353 DVB-T",</div><div class='del'>-		.type			= FE_OFDM,</div><div class='ctx'> 		.frequency_min		= 174000000,</div><div class='ctx'> 		.frequency_max		= 862000000,</div><div class='ctx'> 		.frequency_stepsize	= 166667,</div><div class='head'>diff --git a/drivers/media/dvb/mantis/mantis_vp1033.c b/drivers/media/dvb/mantis/mantis_vp1033.c<br/>index 2ae0afa7756b..ad013e93ed11 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/mantis/mantis_vp1033.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/mantis/mantis_vp1033.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/mantis/mantis_vp1033.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/mantis/mantis_vp1033.c</a></div><div class='hunk'>@@ -83,9 +83,9 @@ u8 lgtdqcs001f_inittab[] = {</div><div class='ctx'> #define MANTIS_MODEL_NAME	"VP-1033"</div><div class='ctx'> #define MANTIS_DEV_TYPE		"DVB-S/DSS"</div><div class='ctx'> </div><div class='del'>-int lgtdqcs001f_tuner_set(struct dvb_frontend *fe,</div><div class='del'>-			  struct dvb_frontend_parameters *params)</div><div class='add'>+int lgtdqcs001f_tuner_set(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct mantis_pci *mantis	= fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	struct i2c_adapter *adapter	= &amp;mantis-&gt;adapter;</div><div class='ctx'> </div><div class='hunk'>@@ -95,14 +95,14 @@ int lgtdqcs001f_tuner_set(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	struct i2c_msg msg = {.addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf)};</div><div class='ctx'> </div><div class='del'>-	div = params-&gt;frequency / 250;</div><div class='add'>+	div = p-&gt;frequency / 250;</div><div class='ctx'> </div><div class='ctx'> 	buf[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	buf[1] =  div &amp; 0xff;</div><div class='ctx'> 	buf[2] =  0x83;</div><div class='ctx'> 	buf[3] =  0xc0;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &lt; 1531000)</div><div class='add'>+	if (p-&gt;frequency &lt; 1531000)</div><div class='ctx'> 		buf[3] |= 0x04;</div><div class='ctx'> 	else</div><div class='ctx'> 		buf[3] &amp;= ~0x04;</div><div class='head'>diff --git a/drivers/media/dvb/mantis/mantis_vp2033.c b/drivers/media/dvb/mantis/mantis_vp2033.c<br/>index 06da0ddf05a7..1ca6837fbe46 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/mantis/mantis_vp2033.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/mantis/mantis_vp2033.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/mantis/mantis_vp2033.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/mantis/mantis_vp2033.c</a></div><div class='hunk'>@@ -65,8 +65,9 @@ static u8 read_pwm(struct mantis_pci *mantis)</div><div class='ctx'> 	return pwm;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda1002x_cu1216_tuner_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int tda1002x_cu1216_tuner_set(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct mantis_pci *mantis = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	struct i2c_adapter *adapter = &amp;mantis-&gt;adapter;</div><div class='ctx'> </div><div class='hunk'>@@ -77,13 +78,13 @@ static int tda1002x_cu1216_tuner_set(struct dvb_frontend *fe, struct dvb_fronten</div><div class='ctx'> #define CU1216_IF 36125000</div><div class='ctx'> #define TUNER_MUL 62500</div><div class='ctx'> </div><div class='del'>-	u32 div = (params-&gt;frequency + CU1216_IF + TUNER_MUL / 2) / TUNER_MUL;</div><div class='add'>+	u32 div = (p-&gt;frequency + CU1216_IF + TUNER_MUL / 2) / TUNER_MUL;</div><div class='ctx'> </div><div class='ctx'> 	buf[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	buf[1] = div &amp; 0xff;</div><div class='ctx'> 	buf[2] = 0xce;</div><div class='del'>-	buf[3] = (params-&gt;frequency &lt; 150000000 ? 0x01 :</div><div class='del'>-		  params-&gt;frequency &lt; 445000000 ? 0x02 : 0x04);</div><div class='add'>+	buf[3] = (p-&gt;frequency &lt; 150000000 ? 0x01 :</div><div class='add'>+		  p-&gt;frequency &lt; 445000000 ? 0x02 : 0x04);</div><div class='ctx'> 	buf[4] = 0xde;</div><div class='ctx'> 	buf[5] = 0x20;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/mantis/mantis_vp2040.c b/drivers/media/dvb/mantis/mantis_vp2040.c<br/>index f72b137b7652..d480741afd78 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/mantis/mantis_vp2040.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/mantis/mantis_vp2040.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/mantis/mantis_vp2040.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/mantis/mantis_vp2040.c</a></div><div class='hunk'>@@ -47,8 +47,9 @@ struct tda10023_config vp2040_tda10023_cu1216_config = {</div><div class='ctx'> 	.invert		= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int tda1002x_cu1216_tuner_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int tda1002x_cu1216_tuner_set(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct mantis_pci *mantis	= fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	struct i2c_adapter *adapter	= &amp;mantis-&gt;adapter;</div><div class='ctx'> </div><div class='hunk'>@@ -59,13 +60,13 @@ static int tda1002x_cu1216_tuner_set(struct dvb_frontend *fe, struct dvb_fronten</div><div class='ctx'> #define CU1216_IF 36125000</div><div class='ctx'> #define TUNER_MUL 62500</div><div class='ctx'> </div><div class='del'>-	u32 div = (params-&gt;frequency + CU1216_IF + TUNER_MUL / 2) / TUNER_MUL;</div><div class='add'>+	u32 div = (p-&gt;frequency + CU1216_IF + TUNER_MUL / 2) / TUNER_MUL;</div><div class='ctx'> </div><div class='ctx'> 	buf[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	buf[1] = div &amp; 0xff;</div><div class='ctx'> 	buf[2] = 0xce;</div><div class='del'>-	buf[3] = (params-&gt;frequency &lt; 150000000 ? 0x01 :</div><div class='del'>-		  params-&gt;frequency &lt; 445000000 ? 0x02 : 0x04);</div><div class='add'>+	buf[3] = (p-&gt;frequency &lt; 150000000 ? 0x01 :</div><div class='add'>+		  p-&gt;frequency &lt; 445000000 ? 0x02 : 0x04);</div><div class='ctx'> 	buf[4] = 0xde;</div><div class='ctx'> 	buf[5] = 0x20;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c<br/>index 056419228363..8418c02bcefe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ngene/ngene-cards.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ngene/ngene-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ngene/ngene-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/ngene/ngene-cards.c</a></div><div class='hunk'>@@ -218,7 +218,7 @@ static int demod_attach_drxk(struct ngene_channel *chan,</div><div class='ctx'> 	memset(&amp;config, 0, sizeof(config));</div><div class='ctx'> 	config.adr = 0x29 + (chan-&gt;number ^ 2);</div><div class='ctx'> </div><div class='del'>-	chan-&gt;fe = dvb_attach(drxk_attach, &amp;config, i2c, &amp;chan-&gt;fe2);</div><div class='add'>+	chan-&gt;fe = dvb_attach(drxk_attach, &amp;config, i2c);</div><div class='ctx'> 	if (!chan-&gt;fe) {</div><div class='ctx'> 		printk(KERN_ERR "No DRXK found!\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='head'>diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c<br/>index 80fb51004461..e1f20c236989 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/pluto2/pluto2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/pluto2/pluto2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/pluto2/pluto2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/pluto2/pluto2.c</a></div><div class='hunk'>@@ -445,9 +445,9 @@ static inline u32 divide(u32 numerator, u32 denominator)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* LG Innotek TDTE-E001P (Infineon TUA6034) */</div><div class='del'>-static int lg_tdtpe001p_tuner_set_params(struct dvb_frontend *fe,</div><div class='del'>-					 struct dvb_frontend_parameters *p)</div><div class='add'>+static int lg_tdtpe001p_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct pluto *pluto = frontend_to_pluto(fe);</div><div class='ctx'> 	struct i2c_msg msg;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -478,7 +478,7 @@ static int lg_tdtpe001p_tuner_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 	else</div><div class='ctx'> 		buf[3] = 0x04;</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;u.ofdm.bandwidth == BANDWIDTH_8_MHZ)</div><div class='add'>+	if (p-&gt;bandwidth_hz == 8000000)</div><div class='ctx'> 		buf[3] |= 0x08;</div><div class='ctx'> </div><div class='ctx'> 	if (sizeof(buf) == 6) {</div><div class='head'>diff --git a/drivers/media/dvb/pt1/va1j5jf8007s.c b/drivers/media/dvb/pt1/va1j5jf8007s.c<br/>index 451641c0c1d2..d980dfb21e5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/pt1/va1j5jf8007s.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/pt1/va1j5jf8007s.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/pt1/va1j5jf8007s.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/pt1/va1j5jf8007s.c</a></div><div class='hunk'>@@ -385,7 +385,7 @@ va1j5jf8007s_check_ts_id(struct va1j5jf8007s_state *state, int *lock)</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> va1j5jf8007s_tune(struct dvb_frontend *fe,</div><div class='del'>-		  struct dvb_frontend_parameters *params,</div><div class='add'>+		  bool re_tune,</div><div class='ctx'> 		  unsigned int mode_flags,  unsigned int *delay,</div><div class='ctx'> 		  fe_status_t *status)</div><div class='ctx'> {</div><div class='hunk'>@@ -395,7 +395,7 @@ va1j5jf8007s_tune(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='del'>-	if (params != NULL)</div><div class='add'>+	if (re_tune)</div><div class='ctx'> 		state-&gt;tune_state = VA1J5JF8007S_SET_FREQUENCY_1;</div><div class='ctx'> </div><div class='ctx'> 	switch (state-&gt;tune_state) {</div><div class='hunk'>@@ -579,9 +579,9 @@ static void va1j5jf8007s_release(struct dvb_frontend *fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops va1j5jf8007s_ops = {</div><div class='add'>+	.delsys = { SYS_ISDBS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "VA1J5JF8007/VA1J5JF8011 ISDB-S",</div><div class='del'>-		.type = FE_QPSK,</div><div class='ctx'> 		.frequency_min = 950000,</div><div class='ctx'> 		.frequency_max = 2150000,</div><div class='ctx'> 		.frequency_stepsize = 1000,</div><div class='head'>diff --git a/drivers/media/dvb/pt1/va1j5jf8007t.c b/drivers/media/dvb/pt1/va1j5jf8007t.c<br/>index 0f085c3e571b..2db15159d514 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/pt1/va1j5jf8007t.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/pt1/va1j5jf8007t.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/pt1/va1j5jf8007t.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/pt1/va1j5jf8007t.c</a></div><div class='hunk'>@@ -264,7 +264,7 @@ static int va1j5jf8007t_check_modulation(struct va1j5jf8007t_state *state,</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> va1j5jf8007t_tune(struct dvb_frontend *fe,</div><div class='del'>-		  struct dvb_frontend_parameters *params,</div><div class='add'>+		  bool re_tune,</div><div class='ctx'> 		  unsigned int mode_flags,  unsigned int *delay,</div><div class='ctx'> 		  fe_status_t *status)</div><div class='ctx'> {</div><div class='hunk'>@@ -274,7 +274,7 @@ va1j5jf8007t_tune(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='del'>-	if (params != NULL)</div><div class='add'>+	if (re_tune)</div><div class='ctx'> 		state-&gt;tune_state = VA1J5JF8007T_SET_FREQUENCY;</div><div class='ctx'> </div><div class='ctx'> 	switch (state-&gt;tune_state) {</div><div class='hunk'>@@ -428,9 +428,9 @@ static void va1j5jf8007t_release(struct dvb_frontend *fe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops va1j5jf8007t_ops = {</div><div class='add'>+	.delsys = { SYS_ISDBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name = "VA1J5JF8007/VA1J5JF8011 ISDB-T",</div><div class='del'>-		.type = FE_OFDM,</div><div class='ctx'> 		.frequency_min = 90000000,</div><div class='ctx'> 		.frequency_max = 770000000,</div><div class='ctx'> 		.frequency_stepsize = 142857,</div><div class='head'>diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c<br/>index 37c594f82782..654685c9303e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/siano/smsdvb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/siano/smsdvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/siano/smsdvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/siano/smsdvb.c</a></div><div class='hunk'>@@ -50,7 +50,7 @@ struct smsdvb_client_t {</div><div class='ctx'> 	struct completion       tune_done;</div><div class='ctx'> </div><div class='ctx'> 	/* todo: save freq/band instead whole struct */</div><div class='del'>-	struct dvb_frontend_parameters fe_params;</div><div class='add'>+	struct dtv_frontend_properties fe_params;</div><div class='ctx'> </div><div class='ctx'> 	struct SMSHOSTLIB_STATISTICS_DVB_S sms_stat_dvb;</div><div class='ctx'> 	int event_fe_state;</div><div class='hunk'>@@ -591,8 +591,7 @@ static int smsdvb_get_tune_settings(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-				    struct dvb_frontend_parameters *p)</div><div class='add'>+static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct smsdvb_client_t *client =</div><div class='hunk'>@@ -658,8 +657,7 @@ static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 					   &amp;client-&gt;tune_done);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int smsdvb_isdbt_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-				     struct dvb_frontend_parameters *p)</div><div class='add'>+static int smsdvb_isdbt_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct smsdvb_client_t *client =</div><div class='hunk'>@@ -723,8 +721,7 @@ static int smsdvb_isdbt_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 					   &amp;client-&gt;tune_done);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int smsdvb_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-			       struct dvb_frontend_parameters *fep)</div><div class='add'>+static int smsdvb_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct smsdvb_client_t *client =</div><div class='ctx'> 		container_of(fe, struct smsdvb_client_t, frontend);</div><div class='hunk'>@@ -733,18 +730,18 @@ static int smsdvb_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	switch (smscore_get_device_mode(coredev)) {</div><div class='ctx'> 	case DEVICE_MODE_DVBT:</div><div class='ctx'> 	case DEVICE_MODE_DVBT_BDA:</div><div class='del'>-		return smsdvb_dvbt_set_frontend(fe, fep);</div><div class='add'>+		return smsdvb_dvbt_set_frontend(fe);</div><div class='ctx'> 	case DEVICE_MODE_ISDBT:</div><div class='ctx'> 	case DEVICE_MODE_ISDBT_BDA:</div><div class='del'>-		return smsdvb_isdbt_set_frontend(fe, fep);</div><div class='add'>+		return smsdvb_isdbt_set_frontend(fe);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int smsdvb_get_frontend(struct dvb_frontend *fe,</div><div class='del'>-			       struct dvb_frontend_parameters *fep)</div><div class='add'>+static int smsdvb_get_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fep = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct smsdvb_client_t *client =</div><div class='ctx'> 		container_of(fe, struct smsdvb_client_t, frontend);</div><div class='ctx'> </div><div class='hunk'>@@ -752,7 +749,7 @@ static int smsdvb_get_frontend(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	/* todo: */</div><div class='ctx'> 	memcpy(fep, &amp;client-&gt;fe_params,</div><div class='del'>-	       sizeof(struct dvb_frontend_parameters));</div><div class='add'>+	       sizeof(struct dtv_frontend_properties));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -789,7 +786,6 @@ static void smsdvb_release(struct dvb_frontend *fe)</div><div class='ctx'> static struct dvb_frontend_ops smsdvb_fe_ops = {</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Siano Mobile Digital MDTV Receiver",</div><div class='del'>-		.type			= FE_OFDM,</div><div class='ctx'> 		.frequency_min		= 44250000,</div><div class='ctx'> 		.frequency_max		= 867250000,</div><div class='ctx'> 		.frequency_stepsize	= 250000,</div><div class='hunk'>@@ -873,6 +869,17 @@ static int smsdvb_hotplug(struct smscore_device_t *coredev,</div><div class='ctx'> 	memcpy(&amp;client-&gt;frontend.ops, &amp;smsdvb_fe_ops,</div><div class='ctx'> 	       sizeof(struct dvb_frontend_ops));</div><div class='ctx'> </div><div class='add'>+	switch (smscore_get_device_mode(coredev)) {</div><div class='add'>+	case DEVICE_MODE_DVBT:</div><div class='add'>+	case DEVICE_MODE_DVBT_BDA:</div><div class='add'>+		smsdvb_fe_ops.delsys[0] = SYS_DVBT;</div><div class='add'>+		break;</div><div class='add'>+	case DEVICE_MODE_ISDBT:</div><div class='add'>+	case DEVICE_MODE_ISDBT_BDA:</div><div class='add'>+		smsdvb_fe_ops.delsys[0] = SYS_ISDBT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rc = dvb_register_frontend(&amp;client-&gt;adapter, &amp;client-&gt;frontend);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		sms_err("frontend registration failed %d", rc);</div><div class='head'>diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c<br/>index 51c7121b321a..b1fe5137df09 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/siano/smsusb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/siano/smsusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/siano/smsusb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/siano/smsusb.c</a></div><div class='hunk'>@@ -557,26 +557,7 @@ static struct usb_driver smsusb_driver = {</div><div class='ctx'> 	.resume			= smsusb_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init smsusb_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int rc = usb_register(&amp;smsusb_driver);</div><div class='del'>-	if (rc)</div><div class='del'>-		sms_err("usb_register failed. Error number %d", rc);</div><div class='del'>-</div><div class='del'>-	sms_debug("");</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit smsusb_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* Regular USB Cleanup */</div><div class='del'>-	usb_deregister(&amp;smsusb_driver);</div><div class='del'>-	sms_info("end");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(smsusb_module_init);</div><div class='del'>-module_exit(smsusb_module_exit);</div><div class='add'>+module_usb_driver(smsusb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Driver for the Siano SMS1xxx USB dongle");</div><div class='ctx'> MODULE_AUTHOR("Siano Mobile Silicon, INC. (uris@siano-ms.com)");</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c<br/>index 3d20719fce1a..6ecbcf614878 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/av7110.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ttpci/av7110.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/av7110.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/ttpci/av7110.c</a></div><div class='hunk'>@@ -991,7 +991,7 @@ static int av7110_start_feed(struct dvb_demux_feed *feed)</div><div class='ctx'> </div><div class='ctx'> 	if (feed-&gt;type == DMX_TYPE_TS) {</div><div class='ctx'> 		if ((feed-&gt;ts_type &amp; TS_DECODER) &amp;&amp;</div><div class='del'>-		    (feed-&gt;pes_type &lt; DMX_TS_PES_OTHER)) {</div><div class='add'>+		    (feed-&gt;pes_type &lt;= DMX_TS_PES_PCR)) {</div><div class='ctx'> 			switch (demux-&gt;dmx.frontend-&gt;source) {</div><div class='ctx'> 			case DMX_MEMORY_FE:</div><div class='ctx'> 				if (feed-&gt;ts_type &amp; TS_DECODER)</div><div class='hunk'>@@ -1568,20 +1568,27 @@ static int get_firmware(struct av7110* av7110)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int alps_bsrv2_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct av7110* av7110 = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 pwr = 0;</div><div class='ctx'> 	u8 buf[4];</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };</div><div class='del'>-	u32 div = (params-&gt;frequency + 479500) / 125;</div><div class='add'>+	u32 div = (p-&gt;frequency + 479500) / 125;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &gt; 2000000) pwr = 3;</div><div class='del'>-	else if (params-&gt;frequency &gt; 1800000) pwr = 2;</div><div class='del'>-	else if (params-&gt;frequency &gt; 1600000) pwr = 1;</div><div class='del'>-	else if (params-&gt;frequency &gt; 1200000) pwr = 0;</div><div class='del'>-	else if (params-&gt;frequency &gt;= 1100000) pwr = 1;</div><div class='del'>-	else pwr = 2;</div><div class='add'>+	if (p-&gt;frequency &gt; 2000000)</div><div class='add'>+		pwr = 3;</div><div class='add'>+	else if (p-&gt;frequency &gt; 1800000)</div><div class='add'>+		pwr = 2;</div><div class='add'>+	else if (p-&gt;frequency &gt; 1600000)</div><div class='add'>+		pwr = 1;</div><div class='add'>+	else if (p-&gt;frequency &gt; 1200000)</div><div class='add'>+		pwr = 0;</div><div class='add'>+	else if (p-&gt;frequency &gt;= 1100000)</div><div class='add'>+		pwr = 1;</div><div class='add'>+	else</div><div class='add'>+		pwr = 2;</div><div class='ctx'> </div><div class='ctx'> 	buf[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	buf[1] = div &amp; 0xff;</div><div class='hunk'>@@ -1604,19 +1611,20 @@ static struct ves1x93_config alps_bsrv2_config = {</div><div class='ctx'> 	.invert_pwm = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int alps_tdbe2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int alps_tdbe2_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct av7110* av7110 = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	u8 data[4];</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x62, .flags = 0, .buf = data, .len = sizeof(data) };</div><div class='ctx'> </div><div class='del'>-	div = (params-&gt;frequency + 35937500 + 31250) / 62500;</div><div class='add'>+	div = (p-&gt;frequency + 35937500 + 31250) / 62500;</div><div class='ctx'> </div><div class='ctx'> 	data[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	data[1] = div &amp; 0xff;</div><div class='ctx'> 	data[2] = 0x85 | ((div &gt;&gt; 10) &amp; 0x60);</div><div class='del'>-	data[3] = (params-&gt;frequency &lt; 174000000 ? 0x88 : params-&gt;frequency &lt; 470000000 ? 0x84 : 0x81);</div><div class='add'>+	data[3] = (p-&gt;frequency &lt; 174000000 ? 0x88 : p-&gt;frequency &lt; 470000000 ? 0x84 : 0x81);</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='hunk'>@@ -1635,14 +1643,15 @@ static struct ves1820_config alps_tdbe2_config = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int grundig_29504_451_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct av7110* av7110 = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	u8 data[4];</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };</div><div class='ctx'> </div><div class='del'>-	div = params-&gt;frequency / 125;</div><div class='add'>+	div = p-&gt;frequency / 125;</div><div class='ctx'> 	data[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	data[1] = div &amp; 0xff;</div><div class='ctx'> 	data[2] = 0x8e;</div><div class='hunk'>@@ -1661,11 +1670,12 @@ static struct tda8083_config grundig_29504_451_config = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int philips_cd1516_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_cd1516_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct av7110* av7110 = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='del'>-	u32 f = params-&gt;frequency;</div><div class='add'>+	u32 f = p-&gt;frequency;</div><div class='ctx'> 	u8 data[4];</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };</div><div class='ctx'> </div><div class='hunk'>@@ -1692,16 +1702,17 @@ static struct ves1820_config philips_cd1516_config = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int alps_tdlb7_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int alps_tdlb7_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct av7110* av7110 = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div, pwr;</div><div class='ctx'> 	u8 data[4];</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x60, .flags = 0, .buf = data, .len = sizeof(data) };</div><div class='ctx'> </div><div class='del'>-	div = (params-&gt;frequency + 36200000) / 166666;</div><div class='add'>+	div = (p-&gt;frequency + 36200000) / 166666;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &lt;= 782000000)</div><div class='add'>+	if (p-&gt;frequency &lt;= 782000000)</div><div class='ctx'> 		pwr = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		pwr = 2;</div><div class='hunk'>@@ -1829,8 +1840,9 @@ static u8 nexusca_stv0297_inittab[] = {</div><div class='ctx'> 	0xff, 0xff,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int nexusca_stv0297_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int nexusca_stv0297_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct av7110* av7110 = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	u8 data[4];</div><div class='hunk'>@@ -1838,19 +1850,19 @@ static int nexusca_stv0297_tuner_set_params(struct dvb_frontend* fe, struct dvb_</div><div class='ctx'> 	struct i2c_msg readmsg = { .addr = 0x63, .flags = I2C_M_RD, .buf = data, .len = 1 };</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	div = (params-&gt;frequency + 36150000 + 31250) / 62500;</div><div class='add'>+	div = (p-&gt;frequency + 36150000 + 31250) / 62500;</div><div class='ctx'> </div><div class='ctx'> 	data[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	data[1] = div &amp; 0xff;</div><div class='ctx'> 	data[2] = 0xce;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &lt; 45000000)</div><div class='add'>+	if (p-&gt;frequency &lt; 45000000)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	else if (params-&gt;frequency &lt; 137000000)</div><div class='add'>+	else if (p-&gt;frequency &lt; 137000000)</div><div class='ctx'> 		data[3] = 0x01;</div><div class='del'>-	else if (params-&gt;frequency &lt; 403000000)</div><div class='add'>+	else if (p-&gt;frequency &lt; 403000000)</div><div class='ctx'> 		data[3] = 0x02;</div><div class='del'>-	else if (params-&gt;frequency &lt; 860000000)</div><div class='add'>+	else if (p-&gt;frequency &lt; 860000000)</div><div class='ctx'> 		data[3] = 0x04;</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1884,27 +1896,36 @@ static struct stv0297_config nexusca_stv0297_config = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int grundig_29504_401_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int grundig_29504_401_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct av7110* av7110 = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	u8 cfg, cpump, band_select;</div><div class='ctx'> 	u8 data[4];</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };</div><div class='ctx'> </div><div class='del'>-	div = (36125000 + params-&gt;frequency) / 166666;</div><div class='add'>+	div = (36125000 + p-&gt;frequency) / 166666;</div><div class='ctx'> </div><div class='ctx'> 	cfg = 0x88;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &lt; 175000000) cpump = 2;</div><div class='del'>-	else if (params-&gt;frequency &lt; 390000000) cpump = 1;</div><div class='del'>-	else if (params-&gt;frequency &lt; 470000000) cpump = 2;</div><div class='del'>-	else if (params-&gt;frequency &lt; 750000000) cpump = 1;</div><div class='del'>-	else cpump = 3;</div><div class='add'>+	if (p-&gt;frequency &lt; 175000000)</div><div class='add'>+		cpump = 2;</div><div class='add'>+	else if (p-&gt;frequency &lt; 390000000)</div><div class='add'>+		cpump = 1;</div><div class='add'>+	else if (p-&gt;frequency &lt; 470000000)</div><div class='add'>+		cpump = 2;</div><div class='add'>+	else if (p-&gt;frequency &lt; 750000000)</div><div class='add'>+		cpump = 1;</div><div class='add'>+	else</div><div class='add'>+		cpump = 3;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &lt; 175000000) band_select = 0x0e;</div><div class='del'>-	else if (params-&gt;frequency &lt; 470000000) band_select = 0x05;</div><div class='del'>-	else band_select = 0x03;</div><div class='add'>+	if (p-&gt;frequency &lt; 175000000)</div><div class='add'>+		band_select = 0x0e;</div><div class='add'>+	else if (p-&gt;frequency &lt; 470000000)</div><div class='add'>+		band_select = 0x05;</div><div class='add'>+	else</div><div class='add'>+		band_select = 0x03;</div><div class='ctx'> </div><div class='ctx'> 	data[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	data[1] = div &amp; 0xff;</div><div class='hunk'>@@ -1964,15 +1985,14 @@ static int av7110_fe_lock_fix(struct av7110* av7110, fe_status_t status)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int av7110_fe_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int av7110_fe_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct av7110* av7110 = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	int ret = av7110_fe_lock_fix(av7110, 0);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		av7110-&gt;saved_fe_params = *params;</div><div class='del'>-		ret = av7110-&gt;fe_set_frontend(fe, params);</div><div class='del'>-	}</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = av7110-&gt;fe_set_frontend(fe);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2081,7 +2101,7 @@ static void dvb_s_recover(struct av7110* av7110)</div><div class='ctx'> 	msleep(20);</div><div class='ctx'> 	av7110_fe_set_tone(av7110-&gt;fe, av7110-&gt;saved_tone);</div><div class='ctx'> </div><div class='del'>-	av7110_fe_set_frontend(av7110-&gt;fe, &amp;av7110-&gt;saved_fe_params);</div><div class='add'>+	av7110_fe_set_frontend(av7110-&gt;fe);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8 read_pwm(struct av7110* av7110)</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h<br/>index d85b8512ac30..88b3b2d6cc0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/av7110.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ttpci/av7110.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/av7110.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/ttpci/av7110.h</a></div><div class='hunk'>@@ -272,7 +272,6 @@ struct av7110 {</div><div class='ctx'> </div><div class='ctx'> 	/* crash recovery */</div><div class='ctx'> 	void				(*recover)(struct av7110* av7110);</div><div class='del'>-	struct dvb_frontend_parameters	saved_fe_params;</div><div class='ctx'> 	fe_sec_voltage_t		saved_voltage;</div><div class='ctx'> 	fe_sec_tone_mode_t		saved_tone;</div><div class='ctx'> 	struct dvb_diseqc_master_cmd	saved_master_cmd;</div><div class='hunk'>@@ -286,7 +285,7 @@ struct av7110 {</div><div class='ctx'> 	int (*fe_set_tone)(struct dvb_frontend* fe, fe_sec_tone_mode_t tone);</div><div class='ctx'> 	int (*fe_set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage);</div><div class='ctx'> 	int (*fe_dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned long cmd);</div><div class='del'>-	int (*fe_set_frontend)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='add'>+	int (*fe_set_frontend)(struct dvb_frontend *fe);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c<br/>index 78d32f7e49fc..8b32e282bf5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget-av.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ttpci/budget-av.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget-av.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/ttpci/budget-av.c</a></div><div class='hunk'>@@ -502,33 +502,33 @@ static int philips_su1278_ty_ci_set_symbol_rate(struct dvb_frontend *fe, u32 sra</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_su1278_ty_ci_tuner_set_params(struct dvb_frontend *fe,</div><div class='del'>-						 struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_su1278_ty_ci_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	u8 buf[4];</div><div class='ctx'> 	struct budget *budget = (struct budget *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	struct i2c_msg msg = {.addr = 0x61,.flags = 0,.buf = buf,.len = sizeof(buf) };</div><div class='ctx'> </div><div class='del'>-	if ((params-&gt;frequency &lt; 950000) || (params-&gt;frequency &gt; 2150000))</div><div class='add'>+	if ((c-&gt;frequency &lt; 950000) || (c-&gt;frequency &gt; 2150000))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	div = (params-&gt;frequency + (125 - 1)) / 125;	// round correctly</div><div class='add'>+	div = (c-&gt;frequency + (125 - 1)) / 125;	/* round correctly */</div><div class='ctx'> 	buf[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	buf[1] = div &amp; 0xff;</div><div class='ctx'> 	buf[2] = 0x80 | ((div &amp; 0x18000) &gt;&gt; 10) | 4;</div><div class='ctx'> 	buf[3] = 0x20;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;u.qpsk.symbol_rate &lt; 4000000)</div><div class='add'>+	if (c-&gt;symbol_rate &lt; 4000000)</div><div class='ctx'> 		buf[3] |= 1;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &lt; 1250000)</div><div class='add'>+	if (c-&gt;frequency &lt; 1250000)</div><div class='ctx'> 		buf[3] |= 0;</div><div class='del'>-	else if (params-&gt;frequency &lt; 1550000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 1550000)</div><div class='ctx'> 		buf[3] |= 0x40;</div><div class='del'>-	else if (params-&gt;frequency &lt; 2050000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 2050000)</div><div class='ctx'> 		buf[3] |= 0x80;</div><div class='del'>-	else if (params-&gt;frequency &lt; 2150000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 2150000)</div><div class='ctx'> 		buf[3] |= 0xC0;</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='hunk'>@@ -617,8 +617,9 @@ static struct stv0299_config cinergy_1200s_1894_0010_config = {</div><div class='ctx'> 	.set_symbol_rate = philips_su1278_ty_ci_set_symbol_rate,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int philips_cu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_cu1216_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct budget *budget = (struct budget *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 buf[6];</div><div class='ctx'> 	struct i2c_msg msg = {.addr = 0x60,.flags = 0,.buf = buf,.len = sizeof(buf) };</div><div class='hunk'>@@ -627,13 +628,13 @@ static int philips_cu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_f</div><div class='ctx'> #define CU1216_IF 36125000</div><div class='ctx'> #define TUNER_MUL 62500</div><div class='ctx'> </div><div class='del'>-	u32 div = (params-&gt;frequency + CU1216_IF + TUNER_MUL / 2) / TUNER_MUL;</div><div class='add'>+	u32 div = (c-&gt;frequency + CU1216_IF + TUNER_MUL / 2) / TUNER_MUL;</div><div class='ctx'> </div><div class='ctx'> 	buf[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	buf[1] = div &amp; 0xff;</div><div class='ctx'> 	buf[2] = 0xce;</div><div class='del'>-	buf[3] = (params-&gt;frequency &lt; 150000000 ? 0x01 :</div><div class='del'>-		  params-&gt;frequency &lt; 445000000 ? 0x02 : 0x04);</div><div class='add'>+	buf[3] = (c-&gt;frequency &lt; 150000000 ? 0x01 :</div><div class='add'>+		  c-&gt;frequency &lt; 445000000 ? 0x02 : 0x04);</div><div class='ctx'> 	buf[4] = 0xde;</div><div class='ctx'> 	buf[5] = 0x20;</div><div class='ctx'> </div><div class='hunk'>@@ -697,8 +698,9 @@ static int philips_tu1216_tuner_init(struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_tu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_tu1216_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct budget *budget = (struct budget *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 tuner_buf[4];</div><div class='ctx'> 	struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tuner_buf,.len =</div><div class='hunk'>@@ -707,7 +709,7 @@ static int philips_tu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_f</div><div class='ctx'> 	u8 band, cp, filter;</div><div class='ctx'> </div><div class='ctx'> 	// determine charge pump</div><div class='del'>-	tuner_frequency = params-&gt;frequency + 36166000;</div><div class='add'>+	tuner_frequency = c-&gt;frequency + 36166000;</div><div class='ctx'> 	if (tuner_frequency &lt; 87000000)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	else if (tuner_frequency &lt; 130000000)</div><div class='hunk'>@@ -732,28 +734,28 @@ static int philips_tu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_f</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	// determine band</div><div class='del'>-	if (params-&gt;frequency &lt; 49000000)</div><div class='add'>+	if (c-&gt;frequency &lt; 49000000)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	else if (params-&gt;frequency &lt; 161000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 161000000)</div><div class='ctx'> 		band = 1;</div><div class='del'>-	else if (params-&gt;frequency &lt; 444000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 444000000)</div><div class='ctx'> 		band = 2;</div><div class='del'>-	else if (params-&gt;frequency &lt; 861000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 861000000)</div><div class='ctx'> 		band = 4;</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	// setup PLL filter</div><div class='del'>-	switch (params-&gt;u.ofdm.bandwidth) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	switch (c-&gt;bandwidth_hz) {</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		filter = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		filter = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		filter = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -763,7 +765,7 @@ static int philips_tu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_f</div><div class='ctx'> </div><div class='ctx'> 	// calculate divisor</div><div class='ctx'> 	// ((36166000+((1000000/6)/2)) + Finput)/(1000000/6)</div><div class='del'>-	tuner_frequency = (((params-&gt;frequency / 1000) * 6) + 217496) / 1000;</div><div class='add'>+	tuner_frequency = (((c-&gt;frequency / 1000) * 6) + 217496) / 1000;</div><div class='ctx'> </div><div class='ctx'> 	// setup tuner buffer</div><div class='ctx'> 	tuner_buf[0] = (tuner_frequency &gt;&gt; 8) &amp; 0x7f;</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c<br/>index ca02e9722172..98e524178765 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget-ci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ttpci/budget-ci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget-ci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/ttpci/budget-ci.c</a></div><div class='hunk'>@@ -193,7 +193,6 @@ static int msp430_ir_init(struct budget_ci *budget_ci)</div><div class='ctx'> 	dev-&gt;input_phys = budget_ci-&gt;ir.phys;</div><div class='ctx'> 	dev-&gt;input_id.bustype = BUS_PCI;</div><div class='ctx'> 	dev-&gt;input_id.version = 1;</div><div class='del'>-	dev-&gt;scanmask = 0xff;</div><div class='ctx'> 	if (saa-&gt;pci-&gt;subsystem_vendor) {</div><div class='ctx'> 		dev-&gt;input_id.vendor = saa-&gt;pci-&gt;subsystem_vendor;</div><div class='ctx'> 		dev-&gt;input_id.product = saa-&gt;pci-&gt;subsystem_device;</div><div class='hunk'>@@ -234,6 +233,8 @@ static int msp430_ir_init(struct budget_ci *budget_ci)</div><div class='ctx'> 		dev-&gt;map_name = RC_MAP_BUDGET_CI_OLD;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	if (!budget_ci-&gt;ir.full_rc5)</div><div class='add'>+		dev-&gt;scanmask = 0xff;</div><div class='ctx'> </div><div class='ctx'> 	error = rc_register_device(dev);</div><div class='ctx'> 	if (error) {</div><div class='hunk'>@@ -659,33 +660,33 @@ static int philips_su1278_tt_set_symbol_rate(struct dvb_frontend *fe, u32 srate,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_su1278_tt_tuner_set_params(struct dvb_frontend *fe,</div><div class='del'>-					   struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_su1278_tt_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct budget_ci *budget_ci = (struct budget_ci *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	u8 buf[4];</div><div class='ctx'> 	struct i2c_msg msg = {.addr = 0x60,.flags = 0,.buf = buf,.len = sizeof(buf) };</div><div class='ctx'> </div><div class='del'>-	if ((params-&gt;frequency &lt; 950000) || (params-&gt;frequency &gt; 2150000))</div><div class='add'>+	if ((p-&gt;frequency &lt; 950000) || (p-&gt;frequency &gt; 2150000))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	div = (params-&gt;frequency + (500 - 1)) / 500;	// round correctly</div><div class='add'>+	div = (p-&gt;frequency + (500 - 1)) / 500;	/* round correctly */</div><div class='ctx'> 	buf[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	buf[1] = div &amp; 0xff;</div><div class='ctx'> 	buf[2] = 0x80 | ((div &amp; 0x18000) &gt;&gt; 10) | 2;</div><div class='ctx'> 	buf[3] = 0x20;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;u.qpsk.symbol_rate &lt; 4000000)</div><div class='add'>+	if (p-&gt;symbol_rate &lt; 4000000)</div><div class='ctx'> 		buf[3] |= 1;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &lt; 1250000)</div><div class='add'>+	if (p-&gt;frequency &lt; 1250000)</div><div class='ctx'> 		buf[3] |= 0;</div><div class='del'>-	else if (params-&gt;frequency &lt; 1550000)</div><div class='add'>+	else if (p-&gt;frequency &lt; 1550000)</div><div class='ctx'> 		buf[3] |= 0x40;</div><div class='del'>-	else if (params-&gt;frequency &lt; 2050000)</div><div class='add'>+	else if (p-&gt;frequency &lt; 2050000)</div><div class='ctx'> 		buf[3] |= 0x80;</div><div class='del'>-	else if (params-&gt;frequency &lt; 2150000)</div><div class='add'>+	else if (p-&gt;frequency &lt; 2150000)</div><div class='ctx'> 		buf[3] |= 0xC0;</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='hunk'>@@ -740,8 +741,9 @@ static int philips_tdm1316l_tuner_init(struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct budget_ci *budget_ci = (struct budget_ci *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 tuner_buf[4];</div><div class='ctx'> 	struct i2c_msg tuner_msg = {.addr = budget_ci-&gt;tuner_pll_address,.flags = 0,.buf = tuner_buf,.len = sizeof(tuner_buf) };</div><div class='hunk'>@@ -749,7 +751,7 @@ static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb</div><div class='ctx'> 	u8 band, cp, filter;</div><div class='ctx'> </div><div class='ctx'> 	// determine charge pump</div><div class='del'>-	tuner_frequency = params-&gt;frequency + 36130000;</div><div class='add'>+	tuner_frequency = p-&gt;frequency + 36130000;</div><div class='ctx'> 	if (tuner_frequency &lt; 87000000)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	else if (tuner_frequency &lt; 130000000)</div><div class='hunk'>@@ -774,30 +776,30 @@ static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	// determine band</div><div class='del'>-	if (params-&gt;frequency &lt; 49000000)</div><div class='add'>+	if (p-&gt;frequency &lt; 49000000)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	else if (params-&gt;frequency &lt; 159000000)</div><div class='add'>+	else if (p-&gt;frequency &lt; 159000000)</div><div class='ctx'> 		band = 1;</div><div class='del'>-	else if (params-&gt;frequency &lt; 444000000)</div><div class='add'>+	else if (p-&gt;frequency &lt; 444000000)</div><div class='ctx'> 		band = 2;</div><div class='del'>-	else if (params-&gt;frequency &lt; 861000000)</div><div class='add'>+	else if (p-&gt;frequency &lt; 861000000)</div><div class='ctx'> 		band = 4;</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	// setup PLL filter and TDA9889</div><div class='del'>-	switch (params-&gt;u.ofdm.bandwidth) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	switch (p-&gt;bandwidth_hz) {</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		tda1004x_writereg(fe, 0x0C, 0x14);</div><div class='ctx'> 		filter = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		tda1004x_writereg(fe, 0x0C, 0x80);</div><div class='ctx'> 		filter = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		tda1004x_writereg(fe, 0x0C, 0x14);</div><div class='ctx'> 		filter = 1;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -808,7 +810,7 @@ static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb</div><div class='ctx'> </div><div class='ctx'> 	// calculate divisor</div><div class='ctx'> 	// ((36130000+((1000000/6)/2)) + Finput)/(1000000/6)</div><div class='del'>-	tuner_frequency = (((params-&gt;frequency / 1000) * 6) + 217280) / 1000;</div><div class='add'>+	tuner_frequency = (((p-&gt;frequency / 1000) * 6) + 217280) / 1000;</div><div class='ctx'> </div><div class='ctx'> 	// setup tuner buffer</div><div class='ctx'> 	tuner_buf[0] = tuner_frequency &gt;&gt; 8;</div><div class='hunk'>@@ -855,8 +857,9 @@ static struct tda1004x_config philips_tdm1316l_config_invert = {</div><div class='ctx'> 	.request_firmware = philips_tdm1316l_request_firmware,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct budget_ci *budget_ci = (struct budget_ci *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 tuner_buf[5];</div><div class='ctx'> 	struct i2c_msg tuner_msg = {.addr = budget_ci-&gt;tuner_pll_address,</div><div class='hunk'>@@ -867,7 +870,7 @@ static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struc</div><div class='ctx'> 	u8 band, cp, filter;</div><div class='ctx'> </div><div class='ctx'> 	// determine charge pump</div><div class='del'>-	tuner_frequency = params-&gt;frequency + 36125000;</div><div class='add'>+	tuner_frequency = p-&gt;frequency + 36125000;</div><div class='ctx'> 	if (tuner_frequency &lt; 87000000)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	else if (tuner_frequency &lt; 130000000) {</div><div class='hunk'>@@ -904,7 +907,7 @@ static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struc</div><div class='ctx'> 	filter = 1;</div><div class='ctx'> </div><div class='ctx'> 	// calculate divisor</div><div class='del'>-	tuner_frequency = (params-&gt;frequency + 36125000 + (62500/2)) / 62500;</div><div class='add'>+	tuner_frequency = (p-&gt;frequency + 36125000 + (62500/2)) / 62500;</div><div class='ctx'> </div><div class='ctx'> 	// setup tuner buffer</div><div class='ctx'> 	tuner_buf[0] = tuner_frequency &gt;&gt; 8;</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c<br/>index 3395d1a90516..2cb35c23d2ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget-patch.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ttpci/budget-patch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget-patch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/ttpci/budget-patch.c</a></div><div class='hunk'>@@ -261,19 +261,25 @@ static int budget_patch_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_c</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int alps_bsrv2_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct budget_patch* budget = (struct budget_patch*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 pwr = 0;</div><div class='ctx'> 	u8 buf[4];</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };</div><div class='del'>-	u32 div = (params-&gt;frequency + 479500) / 125;</div><div class='del'>-</div><div class='del'>-	if (params-&gt;frequency &gt; 2000000) pwr = 3;</div><div class='del'>-	else if (params-&gt;frequency &gt; 1800000) pwr = 2;</div><div class='del'>-	else if (params-&gt;frequency &gt; 1600000) pwr = 1;</div><div class='del'>-	else if (params-&gt;frequency &gt; 1200000) pwr = 0;</div><div class='del'>-	else if (params-&gt;frequency &gt;= 1100000) pwr = 1;</div><div class='add'>+	u32 div = (p-&gt;frequency + 479500) / 125;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;frequency &gt; 2000000)</div><div class='add'>+		pwr = 3;</div><div class='add'>+	else if (p-&gt;frequency &gt; 1800000)</div><div class='add'>+		pwr = 2;</div><div class='add'>+	else if (p-&gt;frequency &gt; 1600000)</div><div class='add'>+		pwr = 1;</div><div class='add'>+	else if (p-&gt;frequency &gt; 1200000)</div><div class='add'>+		pwr = 0;</div><div class='add'>+	else if (p-&gt;frequency &gt;= 1100000)</div><div class='add'>+		pwr = 1;</div><div class='ctx'> 	else pwr = 2;</div><div class='ctx'> </div><div class='ctx'> 	buf[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='hunk'>@@ -297,14 +303,15 @@ static struct ves1x93_config alps_bsrv2_config = {</div><div class='ctx'> 	.invert_pwm = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int grundig_29504_451_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct budget_patch* budget = (struct budget_patch*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	u8 data[4];</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };</div><div class='ctx'> </div><div class='del'>-	div = params-&gt;frequency / 125;</div><div class='add'>+	div = p-&gt;frequency / 125;</div><div class='ctx'> 	data[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	data[1] = div &amp; 0xff;</div><div class='ctx'> 	data[2] = 0x8e;</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c<br/>index d238fb9371a7..b21bcce66708 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ttpci/budget.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/ttpci/budget.c</a></div><div class='hunk'>@@ -200,19 +200,25 @@ static int budget_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t m</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int alps_bsrv2_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct budget* budget = (struct budget*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 pwr = 0;</div><div class='ctx'> 	u8 buf[4];</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };</div><div class='del'>-	u32 div = (params-&gt;frequency + 479500) / 125;</div><div class='del'>-</div><div class='del'>-	if (params-&gt;frequency &gt; 2000000) pwr = 3;</div><div class='del'>-	else if (params-&gt;frequency &gt; 1800000) pwr = 2;</div><div class='del'>-	else if (params-&gt;frequency &gt; 1600000) pwr = 1;</div><div class='del'>-	else if (params-&gt;frequency &gt; 1200000) pwr = 0;</div><div class='del'>-	else if (params-&gt;frequency &gt;= 1100000) pwr = 1;</div><div class='add'>+	u32 div = (c-&gt;frequency + 479500) / 125;</div><div class='add'>+</div><div class='add'>+	if (c-&gt;frequency &gt; 2000000)</div><div class='add'>+		pwr = 3;</div><div class='add'>+	else if (c-&gt;frequency &gt; 1800000)</div><div class='add'>+		pwr = 2;</div><div class='add'>+	else if (c-&gt;frequency &gt; 1600000)</div><div class='add'>+		pwr = 1;</div><div class='add'>+	else if (c-&gt;frequency &gt; 1200000)</div><div class='add'>+		pwr = 0;</div><div class='add'>+	else if (c-&gt;frequency &gt;= 1100000)</div><div class='add'>+		pwr = 1;</div><div class='ctx'> 	else pwr = 2;</div><div class='ctx'> </div><div class='ctx'> 	buf[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='hunk'>@@ -236,19 +242,20 @@ static struct ves1x93_config alps_bsrv2_config =</div><div class='ctx'> 	.invert_pwm = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int alps_tdbe2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int alps_tdbe2_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct budget* budget = (struct budget*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	u8 data[4];</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x62, .flags = 0, .buf = data, .len = sizeof(data) };</div><div class='ctx'> </div><div class='del'>-	div = (params-&gt;frequency + 35937500 + 31250) / 62500;</div><div class='add'>+	div = (c-&gt;frequency + 35937500 + 31250) / 62500;</div><div class='ctx'> </div><div class='ctx'> 	data[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	data[1] = div &amp; 0xff;</div><div class='ctx'> 	data[2] = 0x85 | ((div &gt;&gt; 10) &amp; 0x60);</div><div class='del'>-	data[3] = (params-&gt;frequency &lt; 174000000 ? 0x88 : params-&gt;frequency &lt; 470000000 ? 0x84 : 0x81);</div><div class='add'>+	data[3] = (c-&gt;frequency &lt; 174000000 ? 0x88 : c-&gt;frequency &lt; 470000000 ? 0x84 : 0x81);</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='hunk'>@@ -263,8 +270,9 @@ static struct ves1820_config alps_tdbe2_config = {</div><div class='ctx'> 	.selagc = VES1820_SELAGC_SIGNAMPERR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int grundig_29504_401_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int grundig_29504_401_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct budget *budget = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 *tuner_addr = fe-&gt;tuner_priv;</div><div class='ctx'> 	u32 div;</div><div class='hunk'>@@ -277,19 +285,27 @@ static int grundig_29504_401_tuner_set_params(struct dvb_frontend* fe, struct dv</div><div class='ctx'> 	else</div><div class='ctx'> 		msg.addr = 0x61;</div><div class='ctx'> </div><div class='del'>-	div = (36125000 + params-&gt;frequency) / 166666;</div><div class='add'>+	div = (36125000 + c-&gt;frequency) / 166666;</div><div class='ctx'> </div><div class='ctx'> 	cfg = 0x88;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &lt; 175000000) cpump = 2;</div><div class='del'>-	else if (params-&gt;frequency &lt; 390000000) cpump = 1;</div><div class='del'>-	else if (params-&gt;frequency &lt; 470000000) cpump = 2;</div><div class='del'>-	else if (params-&gt;frequency &lt; 750000000) cpump = 1;</div><div class='del'>-	else cpump = 3;</div><div class='add'>+	if (c-&gt;frequency &lt; 175000000)</div><div class='add'>+		cpump = 2;</div><div class='add'>+	else if (c-&gt;frequency &lt; 390000000)</div><div class='add'>+		cpump = 1;</div><div class='add'>+	else if (c-&gt;frequency &lt; 470000000)</div><div class='add'>+		cpump = 2;</div><div class='add'>+	else if (c-&gt;frequency &lt; 750000000)</div><div class='add'>+		cpump = 1;</div><div class='add'>+	else</div><div class='add'>+		cpump = 3;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &lt; 175000000) band_select = 0x0e;</div><div class='del'>-	else if (params-&gt;frequency &lt; 470000000) band_select = 0x05;</div><div class='del'>-	else band_select = 0x03;</div><div class='add'>+	if (c-&gt;frequency &lt; 175000000)</div><div class='add'>+		band_select = 0x0e;</div><div class='add'>+	else if (c-&gt;frequency &lt; 470000000)</div><div class='add'>+		band_select = 0x05;</div><div class='add'>+	else</div><div class='add'>+		band_select = 0x03;</div><div class='ctx'> </div><div class='ctx'> 	data[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	data[1] = div &amp; 0xff;</div><div class='hunk'>@@ -312,14 +328,15 @@ static struct l64781_config grundig_29504_401_config_activy = {</div><div class='ctx'> </div><div class='ctx'> static u8 tuner_address_grundig_29504_401_activy = 0x60;</div><div class='ctx'> </div><div class='del'>-static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int grundig_29504_451_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct budget* budget = (struct budget*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	u8 data[4];</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };</div><div class='ctx'> </div><div class='del'>-	div = params-&gt;frequency / 125;</div><div class='add'>+	div = c-&gt;frequency / 125;</div><div class='ctx'> 	data[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	data[1] = div &amp; 0xff;</div><div class='ctx'> 	data[2] = 0x8e;</div><div class='hunk'>@@ -335,14 +352,15 @@ static struct tda8083_config grundig_29504_451_config = {</div><div class='ctx'> 	.demod_address = 0x68,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int s5h1420_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int s5h1420_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct budget* budget = (struct budget*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	u8 data[4];</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };</div><div class='ctx'> </div><div class='del'>-	div = params-&gt;frequency / 1000;</div><div class='add'>+	div = c-&gt;frequency / 1000;</div><div class='ctx'> 	data[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	data[1] = div &amp; 0xff;</div><div class='ctx'> 	data[2] = 0xc2;</div><div class='head'>diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c<br/>index 420bb42d5233..5b682cc4c814 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c</a></div><div class='hunk'>@@ -1017,19 +1017,20 @@ static u32 functionality(struct i2c_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int alps_tdmb7_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int alps_tdmb7_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct ttusb* ttusb = (struct ttusb*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 data[4];</div><div class='ctx'> 	struct i2c_msg msg = {.addr=0x61, .flags=0, .buf=data, .len=sizeof(data) };</div><div class='ctx'> 	u32 div;</div><div class='ctx'> </div><div class='del'>-	div = (params-&gt;frequency + 36166667) / 166667;</div><div class='add'>+	div = (p-&gt;frequency + 36166667) / 166667;</div><div class='ctx'> </div><div class='ctx'> 	data[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	data[1] = div &amp; 0xff;</div><div class='ctx'> 	data[2] = ((div &gt;&gt; 10) &amp; 0x60) | 0x85;</div><div class='del'>-	data[3] = params-&gt;frequency &lt; 592000000 ? 0x40 : 0x80;</div><div class='add'>+	data[3] = p-&gt;frequency &lt; 592000000 ? 0x40 : 0x80;</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='hunk'>@@ -1071,8 +1072,9 @@ static int philips_tdm1316l_tuner_init(struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_tdm1316l_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct ttusb* ttusb = (struct ttusb*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 tuner_buf[4];</div><div class='ctx'> 	struct i2c_msg tuner_msg = {.addr=0x60, .flags=0, .buf=tuner_buf, .len=sizeof(tuner_buf) };</div><div class='hunk'>@@ -1080,7 +1082,7 @@ static int philips_tdm1316l_tuner_set_params(struct dvb_frontend* fe, struct dvb</div><div class='ctx'> 	u8 band, cp, filter;</div><div class='ctx'> </div><div class='ctx'> 	// determine charge pump</div><div class='del'>-	tuner_frequency = params-&gt;frequency + 36130000;</div><div class='add'>+	tuner_frequency = p-&gt;frequency + 36130000;</div><div class='ctx'> 	if (tuner_frequency &lt; 87000000) return -EINVAL;</div><div class='ctx'> 	else if (tuner_frequency &lt; 130000000) cp = 3;</div><div class='ctx'> 	else if (tuner_frequency &lt; 160000000) cp = 5;</div><div class='hunk'>@@ -1094,25 +1096,29 @@ static int philips_tdm1316l_tuner_set_params(struct dvb_frontend* fe, struct dvb</div><div class='ctx'> 	else return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	// determine band</div><div class='del'>-	if (params-&gt;frequency &lt; 49000000) return -EINVAL;</div><div class='del'>-	else if (params-&gt;frequency &lt; 159000000) band = 1;</div><div class='del'>-	else if (params-&gt;frequency &lt; 444000000) band = 2;</div><div class='del'>-	else if (params-&gt;frequency &lt; 861000000) band = 4;</div><div class='add'>+	if (p-&gt;frequency &lt; 49000000)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	else if (p-&gt;frequency &lt; 159000000)</div><div class='add'>+		band = 1;</div><div class='add'>+	else if (p-&gt;frequency &lt; 444000000)</div><div class='add'>+		band = 2;</div><div class='add'>+	else if (p-&gt;frequency &lt; 861000000)</div><div class='add'>+		band = 4;</div><div class='ctx'> 	else return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	// setup PLL filter</div><div class='del'>-	switch (params-&gt;u.ofdm.bandwidth) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	switch (p-&gt;bandwidth_hz) {</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		tda1004x_writereg(fe, 0x0C, 0);</div><div class='ctx'> 		filter = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		tda1004x_writereg(fe, 0x0C, 0);</div><div class='ctx'> 		filter = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		tda1004x_writereg(fe, 0x0C, 0xFF);</div><div class='ctx'> 		filter = 1;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1123,7 +1129,7 @@ static int philips_tdm1316l_tuner_set_params(struct dvb_frontend* fe, struct dvb</div><div class='ctx'> </div><div class='ctx'> 	// calculate divisor</div><div class='ctx'> 	// ((36130000+((1000000/6)/2)) + Finput)/(1000000/6)</div><div class='del'>-	tuner_frequency = (((params-&gt;frequency / 1000) * 6) + 217280) / 1000;</div><div class='add'>+	tuner_frequency = (((p-&gt;frequency / 1000) * 6) + 217280) / 1000;</div><div class='ctx'> </div><div class='ctx'> 	// setup tuner buffer</div><div class='ctx'> 	tuner_buf[0] = tuner_frequency &gt;&gt; 8;</div><div class='hunk'>@@ -1273,23 +1279,24 @@ static int alps_stv0299_set_symbol_rate(struct dvb_frontend *fe, u32 srate, u32</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_tsa5059_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_tsa5059_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct ttusb* ttusb = (struct ttusb*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 buf[4];</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	struct i2c_msg msg = {.addr = 0x61,.flags = 0,.buf = buf,.len = sizeof(buf) };</div><div class='ctx'> </div><div class='del'>-	if ((params-&gt;frequency &lt; 950000) || (params-&gt;frequency &gt; 2150000))</div><div class='add'>+	if ((p-&gt;frequency &lt; 950000) || (p-&gt;frequency &gt; 2150000))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	div = (params-&gt;frequency + (125 - 1)) / 125;	// round correctly</div><div class='add'>+	div = (p-&gt;frequency + (125 - 1)) / 125;	/* round correctly */</div><div class='ctx'> 	buf[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	buf[1] = div &amp; 0xff;</div><div class='ctx'> 	buf[2] = 0x80 | ((div &amp; 0x18000) &gt;&gt; 10) | 4;</div><div class='ctx'> 	buf[3] = 0xC4;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &gt; 1530000)</div><div class='add'>+	if (p-&gt;frequency &gt; 1530000)</div><div class='ctx'> 		buf[3] = 0xC0;</div><div class='ctx'> </div><div class='ctx'> 	/* BSBE1 wants XCE bit set */</div><div class='hunk'>@@ -1316,14 +1323,15 @@ static struct stv0299_config alps_stv0299_config = {</div><div class='ctx'> 	.set_symbol_rate = alps_stv0299_set_symbol_rate,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ttusb_novas_grundig_29504_491_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int ttusb_novas_grundig_29504_491_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct ttusb* ttusb = (struct ttusb*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 buf[4];</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	struct i2c_msg msg = {.addr = 0x61,.flags = 0,.buf = buf,.len = sizeof(buf) };</div><div class='ctx'> </div><div class='del'>-	div = params-&gt;frequency / 125;</div><div class='add'>+	div = p-&gt;frequency / 125;</div><div class='ctx'> </div><div class='ctx'> 	buf[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	buf[1] = div &amp; 0xff;</div><div class='hunk'>@@ -1343,19 +1351,20 @@ static struct tda8083_config ttusb_novas_grundig_29504_491_config = {</div><div class='ctx'> 	.demod_address = 0x68,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int alps_tdbe2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int alps_tdbe2_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct ttusb* ttusb = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	u8 data[4];</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x62, .flags = 0, .buf = data, .len = sizeof(data) };</div><div class='ctx'> </div><div class='del'>-	div = (params-&gt;frequency + 35937500 + 31250) / 62500;</div><div class='add'>+	div = (p-&gt;frequency + 35937500 + 31250) / 62500;</div><div class='ctx'> </div><div class='ctx'> 	data[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	data[1] = div &amp; 0xff;</div><div class='ctx'> 	data[2] = 0x85 | ((div &gt;&gt; 10) &amp; 0x60);</div><div class='del'>-	data[3] = (params-&gt;frequency &lt; 174000000 ? 0x88 : params-&gt;frequency &lt; 470000000 ? 0x84 : 0x81);</div><div class='add'>+	data[3] = (p-&gt;frequency &lt; 174000000 ? 0x88 : p-&gt;frequency &lt; 470000000 ? 0x84 : 0x81);</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='hunk'>@@ -1387,8 +1396,9 @@ static u8 read_pwm(struct ttusb* ttusb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct ttusb *ttusb = (struct ttusb *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 tuner_buf[5];</div><div class='ctx'> 	struct i2c_msg tuner_msg = {.addr = 0x60,</div><div class='hunk'>@@ -1399,7 +1409,7 @@ static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struc</div><div class='ctx'> 	u8 band, cp, filter;</div><div class='ctx'> </div><div class='ctx'> 	// determine charge pump</div><div class='del'>-	tuner_frequency = params-&gt;frequency;</div><div class='add'>+	tuner_frequency = p-&gt;frequency;</div><div class='ctx'> 	if      (tuner_frequency &lt;  87000000) {return -EINVAL;}</div><div class='ctx'> 	else if (tuner_frequency &lt; 130000000) {cp = 3; band = 1;}</div><div class='ctx'> 	else if (tuner_frequency &lt; 160000000) {cp = 5; band = 1;}</div><div class='hunk'>@@ -1417,7 +1427,7 @@ static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struc</div><div class='ctx'> </div><div class='ctx'> 	// calculate divisor</div><div class='ctx'> 	// (Finput + Fif)/Fref; Fif = 36125000 Hz, Fref = 62500 Hz</div><div class='del'>-	tuner_frequency = ((params-&gt;frequency + 36125000) / 62500);</div><div class='add'>+	tuner_frequency = ((p-&gt;frequency + 36125000) / 62500);</div><div class='ctx'> </div><div class='ctx'> 	// setup tuner buffer</div><div class='ctx'> 	tuner_buf[0] = tuner_frequency &gt;&gt; 8;</div><div class='hunk'>@@ -1694,10 +1704,8 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i</div><div class='ctx'> 	ttusb-&gt;i2c_adap.dev.parent	  = &amp;udev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	result = i2c_add_adapter(&amp;ttusb-&gt;i2c_adap);</div><div class='del'>-	if (result) {</div><div class='del'>-		dvb_unregister_adapter (&amp;ttusb-&gt;adapter);</div><div class='del'>-		return result;</div><div class='del'>-	}</div><div class='add'>+	if (result)</div><div class='add'>+		goto err_unregister_adapter;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;ttusb-&gt;dvb_demux, 0, sizeof(ttusb-&gt;dvb_demux));</div><div class='ctx'> </div><div class='hunk'>@@ -1714,33 +1722,29 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i</div><div class='ctx'> 	ttusb-&gt;dvb_demux.stop_feed = ttusb_stop_feed;</div><div class='ctx'> 	ttusb-&gt;dvb_demux.write_to_decoder = NULL;</div><div class='ctx'> </div><div class='del'>-	if ((result = dvb_dmx_init(&amp;ttusb-&gt;dvb_demux)) &lt; 0) {</div><div class='add'>+	result = dvb_dmx_init(&amp;ttusb-&gt;dvb_demux);</div><div class='add'>+	if (result &lt; 0) {</div><div class='ctx'> 		printk("ttusb_dvb: dvb_dmx_init failed (errno = %d)\n", result);</div><div class='del'>-		i2c_del_adapter(&amp;ttusb-&gt;i2c_adap);</div><div class='del'>-		dvb_unregister_adapter (&amp;ttusb-&gt;adapter);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		result = -ENODEV;</div><div class='add'>+		goto err_i2c_del_adapter;</div><div class='ctx'> 	}</div><div class='ctx'> //FIXME dmxdev (nur WAS?)</div><div class='ctx'> 	ttusb-&gt;dmxdev.filternum = ttusb-&gt;dvb_demux.filternum;</div><div class='ctx'> 	ttusb-&gt;dmxdev.demux = &amp;ttusb-&gt;dvb_demux.dmx;</div><div class='ctx'> 	ttusb-&gt;dmxdev.capabilities = 0;</div><div class='ctx'> </div><div class='del'>-	if ((result = dvb_dmxdev_init(&amp;ttusb-&gt;dmxdev, &amp;ttusb-&gt;adapter)) &lt; 0) {</div><div class='add'>+	result = dvb_dmxdev_init(&amp;ttusb-&gt;dmxdev, &amp;ttusb-&gt;adapter);</div><div class='add'>+	if (result &lt; 0) {</div><div class='ctx'> 		printk("ttusb_dvb: dvb_dmxdev_init failed (errno = %d)\n",</div><div class='ctx'> 		       result);</div><div class='del'>-		dvb_dmx_release(&amp;ttusb-&gt;dvb_demux);</div><div class='del'>-		i2c_del_adapter(&amp;ttusb-&gt;i2c_adap);</div><div class='del'>-		dvb_unregister_adapter (&amp;ttusb-&gt;adapter);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		result = -ENODEV;</div><div class='add'>+		goto err_release_dmx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dvb_net_init(&amp;ttusb-&gt;adapter, &amp;ttusb-&gt;dvbnet, &amp;ttusb-&gt;dvb_demux.dmx)) {</div><div class='ctx'> 		printk("ttusb_dvb: dvb_net_init failed!\n");</div><div class='del'>-		dvb_dmxdev_release(&amp;ttusb-&gt;dmxdev);</div><div class='del'>-		dvb_dmx_release(&amp;ttusb-&gt;dvb_demux);</div><div class='del'>-		i2c_del_adapter(&amp;ttusb-&gt;i2c_adap);</div><div class='del'>-		dvb_unregister_adapter (&amp;ttusb-&gt;adapter);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		result = -ENODEV;</div><div class='add'>+		goto err_release_dmxdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(intf, (void *) ttusb);</div><div class='hunk'>@@ -1748,6 +1752,16 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i</div><div class='ctx'> 	frontend_init(ttusb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_release_dmxdev:</div><div class='add'>+	dvb_dmxdev_release(&amp;ttusb-&gt;dmxdev);</div><div class='add'>+err_release_dmx:</div><div class='add'>+	dvb_dmx_release(&amp;ttusb-&gt;dvb_demux);</div><div class='add'>+err_i2c_del_adapter:</div><div class='add'>+	i2c_del_adapter(&amp;ttusb-&gt;i2c_adap);</div><div class='add'>+err_unregister_adapter:</div><div class='add'>+	dvb_unregister_adapter (&amp;ttusb-&gt;adapter);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ttusb_disconnect(struct usb_interface *intf)</div><div class='hunk'>@@ -1794,26 +1808,7 @@ static struct usb_driver ttusb_driver = {</div><div class='ctx'>       .id_table		= ttusb_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ttusb_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if ((err = usb_register(&amp;ttusb_driver)) &lt; 0) {</div><div class='del'>-		printk("%s: usb_register failed! Error number %d",</div><div class='del'>-		       __FILE__, 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 __exit ttusb_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;ttusb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ttusb_init);</div><div class='del'>-module_exit(ttusb_exit);</div><div class='add'>+module_usb_driver(ttusb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Holger Waechtler &lt;holger@convergence.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("TTUSB DVB Driver");</div><div class='head'>diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c<br/>index f893bffa08a3..504c81230339 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttusb-dec/ttusb_dec.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ttusb-dec/ttusb_dec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttusb-dec/ttusb_dec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/ttusb-dec/ttusb_dec.c</a></div><div class='hunk'>@@ -1756,26 +1756,7 @@ static struct usb_driver ttusb_dec_driver = {</div><div class='ctx'> 	.id_table	= ttusb_dec_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ttusb_dec_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	if ((result = usb_register(&amp;ttusb_dec_driver)) &lt; 0) {</div><div class='del'>-		printk("%s: initialisation failed: error %d.\n", __func__,</div><div class='del'>-		       result);</div><div class='del'>-		return result;</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 ttusb_dec_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;ttusb_dec_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ttusb_dec_init);</div><div class='del'>-module_exit(ttusb_dec_exit);</div><div class='add'>+module_usb_driver(ttusb_dec_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Alex Woods &lt;linux-dvb@giblets.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_NAME);</div><div class='head'>diff --git a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c b/drivers/media/dvb/ttusb-dec/ttusbdecfe.c<br/>index 21260aad1e54..5c45c9d0712d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttusb-dec/ttusbdecfe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/dvb/ttusb-dec/ttusbdecfe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttusb-dec/ttusbdecfe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/dvb/ttusb-dec/ttusbdecfe.c</a></div><div class='hunk'>@@ -87,8 +87,9 @@ static int ttusbdecfe_dvbt_read_status(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ttusbdecfe_dvbt_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int ttusbdecfe_dvbt_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct ttusbdecfe_state* state = (struct ttusbdecfe_state*) fe-&gt;demodulator_priv;</div><div class='ctx'> 	u8 b[] = { 0x00, 0x00, 0x00, 0x03,</div><div class='ctx'> 		   0x00, 0x00, 0x00, 0x00,</div><div class='hunk'>@@ -113,8 +114,9 @@ static int ttusbdecfe_dvbt_get_tune_settings(struct dvb_frontend* fe,</div><div class='ctx'> 		return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ttusbdecfe_dvbs_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='add'>+static int ttusbdecfe_dvbs_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct ttusbdecfe_state* state = (struct ttusbdecfe_state*) fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='ctx'> 	u8 b[] = { 0x00, 0x00, 0x00, 0x01,</div><div class='hunk'>@@ -135,7 +137,7 @@ static int ttusbdecfe_dvbs_set_frontend(struct dvb_frontend* fe, struct dvb_fron</div><div class='ctx'> 	freq = htonl(p-&gt;frequency +</div><div class='ctx'> 	       (state-&gt;hi_band ? LOF_HI : LOF_LO));</div><div class='ctx'> 	memcpy(&amp;b[4], &amp;freq, sizeof(u32));</div><div class='del'>-	sym_rate = htonl(p-&gt;u.qam.symbol_rate);</div><div class='add'>+	sym_rate = htonl(p-&gt;symbol_rate);</div><div class='ctx'> 	memcpy(&amp;b[12], &amp;sym_rate, sizeof(u32));</div><div class='ctx'> 	band = htonl(state-&gt;hi_band ? LOF_HI : LOF_LO);</div><div class='ctx'> 	memcpy(&amp;b[24], &amp;band, sizeof(u32));</div><div class='hunk'>@@ -241,10 +243,9 @@ struct dvb_frontend* ttusbdecfe_dvbs_attach(const struct ttusbdecfe_config* conf</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops ttusbdecfe_dvbt_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "TechnoTrend/Hauppauge DEC2000-t Frontend",</div><div class='del'>-		.type			= FE_OFDM,</div><div class='ctx'> 		.frequency_min		= 51000000,</div><div class='ctx'> 		.frequency_max		= 858000000,</div><div class='ctx'> 		.frequency_stepsize	= 62500,</div><div class='hunk'>@@ -265,10 +266,9 @@ static struct dvb_frontend_ops ttusbdecfe_dvbt_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops ttusbdecfe_dvbs_ops = {</div><div class='del'>-</div><div class='add'>+	.delsys = { SYS_DVBS },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "TechnoTrend/Hauppauge DEC3000-s Frontend",</div><div class='del'>-		.type			= FE_QPSK,</div><div class='ctx'> 		.frequency_min		= 950000,</div><div class='ctx'> 		.frequency_max		= 2150000,</div><div class='ctx'> 		.frequency_stepsize	= 125,</div><div class='head'>diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c<br/>index 6edc9ba81203..6f9eb94e85b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/media-device.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/media-device.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/media-device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/media-device.c</a></div><div class='hunk'>@@ -108,8 +108,7 @@ static long media_device_enum_entities(struct media_device *mdev,</div><div class='ctx'> 	u_ent.group_id = ent-&gt;group_id;</div><div class='ctx'> 	u_ent.pads = ent-&gt;num_pads;</div><div class='ctx'> 	u_ent.links = ent-&gt;num_links - ent-&gt;num_backlinks;</div><div class='del'>-	u_ent.v4l.major = ent-&gt;v4l.major;</div><div class='del'>-	u_ent.v4l.minor = ent-&gt;v4l.minor;</div><div class='add'>+	memcpy(&amp;u_ent.raw, &amp;ent-&gt;info, sizeof(ent-&gt;info));</div><div class='ctx'> 	if (copy_to_user(uent, &amp;u_ent, sizeof(u_ent)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig<br/>index ccd5f0d8a012..e954781c90bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/radio/Kconfig</a></div><div class='hunk'>@@ -11,6 +11,162 @@ menuconfig RADIO_ADAPTERS</div><div class='ctx'> </div><div class='ctx'> if RADIO_ADAPTERS &amp;&amp; VIDEO_V4L2</div><div class='ctx'> </div><div class='add'>+config RADIO_SI470X</div><div class='add'>+	bool "Silicon Labs Si470x FM Radio Receiver support"</div><div class='add'>+	depends on VIDEO_V4L2</div><div class='add'>+</div><div class='add'>+source "drivers/media/radio/si470x/Kconfig"</div><div class='add'>+</div><div class='add'>+config USB_MR800</div><div class='add'>+	tristate "AverMedia MR 800 USB FM radio support"</div><div class='add'>+	depends on USB &amp;&amp; VIDEO_V4L2</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y here if you want to connect this type of radio to your</div><div class='add'>+	  computer's USB port. Note that the audio is not digital, and</div><div class='add'>+	  you must connect the line out connector to a sound card or a</div><div class='add'>+	  set of speakers.</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 radio-mr800.</div><div class='add'>+</div><div class='add'>+config USB_DSBR</div><div class='add'>+	tristate "D-Link/GemTek USB FM radio support"</div><div class='add'>+	depends on USB &amp;&amp; VIDEO_V4L2</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y here if you want to connect this type of radio to your</div><div class='add'>+	  computer's USB port. Note that the audio is not digital, and</div><div class='add'>+	  you must connect the line out connector to a sound card or a</div><div class='add'>+	  set of speakers.</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 dsbr100.</div><div class='add'>+</div><div class='add'>+config RADIO_MAXIRADIO</div><div class='add'>+	tristate "Guillemot MAXI Radio FM 2000 radio"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; PCI</div><div class='add'>+	---help---</div><div class='add'>+	  Choose Y here if you have this radio card.  This card may also be</div><div class='add'>+	  found as Gemtek PCI FM.</div><div class='add'>+</div><div class='add'>+	  In order to control your radio card, you will need to use programs</div><div class='add'>+	  that are compatible with the Video For Linux API.  Information on</div><div class='add'>+	  this API and pointers to "v4l" programs may be found at</div><div class='add'>+	  &lt;file:Documentation/video4linux/API.html&gt;.</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 radio-maxiradio.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+config I2C_SI4713</div><div class='add'>+	tristate "I2C driver for Silicon Labs Si4713 device"</div><div class='add'>+	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y here if you want support to Si4713 I2C device.</div><div class='add'>+	  This device driver supports only i2c bus.</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 si4713.</div><div class='add'>+</div><div class='add'>+config RADIO_SI4713</div><div class='add'>+	tristate "Silicon Labs Si4713 FM Radio Transmitter support"</div><div class='add'>+	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='add'>+	select I2C_SI4713</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y here if you want support to Si4713 FM Radio Transmitter.</div><div class='add'>+	  This device can transmit audio through FM. It can transmit</div><div class='add'>+	  RDS and RBDS signals as well. This module is the v4l2 radio</div><div class='add'>+	  interface for the i2c driver of this device.</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 radio-si4713.</div><div class='add'>+</div><div class='add'>+config RADIO_TEA5764</div><div class='add'>+	tristate "TEA5764 I2C FM radio support"</div><div class='add'>+	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y here if you want to use the TEA5764 FM chip found in</div><div class='add'>+	  EZX phones. This FM chip is present in EZX phones from Motorola,</div><div class='add'>+	  connected to internal pxa I2C bus.</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 radio-tea5764.</div><div class='add'>+</div><div class='add'>+config RADIO_TEA5764_XTAL</div><div class='add'>+	bool "TEA5764 crystal reference"</div><div class='add'>+	depends on RADIO_TEA5764=y</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if TEA5764 have a 32768 Hz crystal in circuit, say N</div><div class='add'>+	  here if TEA5764 reference frequency is connected in FREQIN.</div><div class='add'>+</div><div class='add'>+config RADIO_SAA7706H</div><div class='add'>+	tristate "SAA7706H Car Radio DSP"</div><div class='add'>+	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y here if you want to use the SAA7706H Car radio Digital</div><div class='add'>+	  Signal Processor, found for instance on the Russellville development</div><div class='add'>+	  board. On the russellville the device is connected to internal</div><div class='add'>+	  timberdale I2C bus.</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 SAA7706H.</div><div class='add'>+</div><div class='add'>+config RADIO_TEF6862</div><div class='add'>+	tristate "TEF6862 Car Radio Enhanced Selectivity Tuner"</div><div class='add'>+	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y here if you want to use the TEF6862 Car Radio Enhanced</div><div class='add'>+	  Selectivity Tuner, found for instance on the Russellville development</div><div class='add'>+	  board. On the russellville the device is connected to internal</div><div class='add'>+	  timberdale I2C bus.</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 TEF6862.</div><div class='add'>+</div><div class='add'>+config RADIO_TIMBERDALE</div><div class='add'>+	tristate "Enable the Timberdale radio driver"</div><div class='add'>+	depends on MFD_TIMBERDALE &amp;&amp; VIDEO_V4L2</div><div class='add'>+	depends on I2C	# for RADIO_SAA7706H</div><div class='add'>+	select RADIO_TEF6862</div><div class='add'>+	select RADIO_SAA7706H</div><div class='add'>+	---help---</div><div class='add'>+	  This is a kind of umbrella driver for the Radio Tuner and DSP</div><div class='add'>+	  found behind the Timberdale FPGA on the Russellville board.</div><div class='add'>+	  Enabling this driver will automatically select the DSP and tuner.</div><div class='add'>+</div><div class='add'>+config RADIO_WL1273</div><div class='add'>+	tristate "Texas Instruments WL1273 I2C FM Radio"</div><div class='add'>+	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='add'>+	select MFD_CORE</div><div class='add'>+	select MFD_WL1273_CORE</div><div class='add'>+	select FW_LOADER</div><div class='add'>+	---help---</div><div class='add'>+	  Choose Y here if you have this FM radio chip.</div><div class='add'>+</div><div class='add'>+	  In order to control your radio card, you will need to use programs</div><div class='add'>+	  that are compatible with the Video For Linux 2 API.  Information on</div><div class='add'>+	  this API and pointers to "v4l2" programs may be found at</div><div class='add'>+	  &lt;file:Documentation/video4linux/API.html&gt;.</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 radio-wl1273.</div><div class='add'>+</div><div class='add'>+# TI's ST based wl128x FM radio</div><div class='add'>+source "drivers/media/radio/wl128x/Kconfig"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISA drivers configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+menuconfig V4L_RADIO_ISA_DRIVERS</div><div class='add'>+	bool "ISA radio devices"</div><div class='add'>+	depends on ISA</div><div class='add'>+	default n</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y here to enable support for these ISA drivers.</div><div class='add'>+</div><div class='add'>+if V4L_RADIO_ISA_DRIVERS</div><div class='add'>+</div><div class='ctx'> config RADIO_CADET</div><div class='ctx'> 	tristate "ADS Cadet AM/FM Tuner"</div><div class='ctx'> 	depends on ISA &amp;&amp; VIDEO_V4L2</div><div class='hunk'>@@ -151,21 +307,6 @@ config RADIO_GEMTEK_PROBE</div><div class='ctx'> 	  following ports will be probed: 0x20c, 0x30c, 0x24c, 0x34c, 0x248 and</div><div class='ctx'> 	  0x28c.</div><div class='ctx'> </div><div class='del'>-config RADIO_MAXIRADIO</div><div class='del'>-	tristate "Guillemot MAXI Radio FM 2000 radio"</div><div class='del'>-	depends on VIDEO_V4L2 &amp;&amp; PCI</div><div class='del'>-	---help---</div><div class='del'>-	  Choose Y here if you have this radio card.  This card may also be</div><div class='del'>-	  found as Gemtek PCI FM.</div><div class='del'>-</div><div class='del'>-	  In order to control your radio card, you will need to use programs</div><div class='del'>-	  that are compatible with the Video For Linux API.  Information on</div><div class='del'>-	  this API and pointers to "v4l" programs may be found at</div><div class='del'>-	  &lt;file:Documentation/video4linux/API.html&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 radio-maxiradio.</div><div class='del'>-</div><div class='ctx'> config RADIO_MIROPCM20</div><div class='ctx'> 	tristate "miroSOUND PCM20 radio"</div><div class='ctx'> 	depends on ISA &amp;&amp; ISA_DMA_API &amp;&amp; VIDEO_V4L2 &amp;&amp; SND</div><div class='hunk'>@@ -316,130 +457,6 @@ config RADIO_ZOLTRIX_PORT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enter the I/O port of your Zoltrix radio card.</div><div class='ctx'> </div><div class='del'>-config I2C_SI4713</div><div class='del'>-	tristate "I2C driver for Silicon Labs Si4713 device"</div><div class='del'>-	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='del'>-	  Say Y here if you want support to Si4713 I2C device.</div><div class='del'>-	  This device driver supports only i2c bus.</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 si4713.</div><div class='del'>-</div><div class='del'>-config RADIO_SI4713</div><div class='del'>-	tristate "Silicon Labs Si4713 FM Radio Transmitter support"</div><div class='del'>-	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='del'>-	select I2C_SI4713</div><div class='del'>-	---help---</div><div class='del'>-	  Say Y here if you want support to Si4713 FM Radio Transmitter.</div><div class='del'>-	  This device can transmit audio through FM. It can transmit</div><div class='del'>-	  RDS and RBDS signals as well. This module is the v4l2 radio</div><div class='del'>-	  interface for the i2c driver of this device.</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 radio-si4713.</div><div class='del'>-</div><div class='del'>-config USB_DSBR</div><div class='del'>-	tristate "D-Link/GemTek USB FM radio support"</div><div class='del'>-	depends on USB &amp;&amp; VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='del'>-	  Say Y here if you want to connect this type of radio to your</div><div class='del'>-	  computer's USB port. Note that the audio is not digital, and</div><div class='del'>-	  you must connect the line out connector to a sound card or a</div><div class='del'>-	  set of speakers.</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 dsbr100.</div><div class='del'>-</div><div class='del'>-config RADIO_SI470X</div><div class='del'>-	bool "Silicon Labs Si470x FM Radio Receiver support"</div><div class='del'>-	depends on VIDEO_V4L2</div><div class='del'>-</div><div class='del'>-source "drivers/media/radio/si470x/Kconfig"</div><div class='del'>-</div><div class='del'>-config USB_MR800</div><div class='del'>-	tristate "AverMedia MR 800 USB FM radio support"</div><div class='del'>-	depends on USB &amp;&amp; VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='del'>-	  Say Y here if you want to connect this type of radio to your</div><div class='del'>-	  computer's USB port. Note that the audio is not digital, and</div><div class='del'>-	  you must connect the line out connector to a sound card or a</div><div class='del'>-	  set of speakers.</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 radio-mr800.</div><div class='del'>-</div><div class='del'>-config RADIO_TEA5764</div><div class='del'>-	tristate "TEA5764 I2C FM radio support"</div><div class='del'>-	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='del'>-	  Say Y here if you want to use the TEA5764 FM chip found in</div><div class='del'>-	  EZX phones. This FM chip is present in EZX phones from Motorola,</div><div class='del'>-	  connected to internal pxa I2C bus.</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 radio-tea5764.</div><div class='del'>-</div><div class='del'>-config RADIO_TEA5764_XTAL</div><div class='del'>-	bool "TEA5764 crystal reference"</div><div class='del'>-	depends on RADIO_TEA5764=y</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Say Y here if TEA5764 have a 32768 Hz crystal in circuit, say N</div><div class='del'>-	  here if TEA5764 reference frequency is connected in FREQIN.</div><div class='del'>-</div><div class='del'>-config RADIO_SAA7706H</div><div class='del'>-	tristate "SAA7706H Car Radio DSP"</div><div class='del'>-	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='del'>-	  Say Y here if you want to use the SAA7706H Car radio Digital</div><div class='del'>-	  Signal Processor, found for instance on the Russellville development</div><div class='del'>-	  board. On the russellville the device is connected to internal</div><div class='del'>-	  timberdale I2C bus.</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 SAA7706H.</div><div class='del'>-</div><div class='del'>-config RADIO_TEF6862</div><div class='del'>-	tristate "TEF6862 Car Radio Enhanced Selectivity Tuner"</div><div class='del'>-	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='del'>-	---help---</div><div class='del'>-	  Say Y here if you want to use the TEF6862 Car Radio Enhanced</div><div class='del'>-	  Selectivity Tuner, found for instance on the Russellville development</div><div class='del'>-	  board. On the russellville the device is connected to internal</div><div class='del'>-	  timberdale I2C bus.</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 TEF6862.</div><div class='del'>-</div><div class='del'>-config RADIO_TIMBERDALE</div><div class='del'>-	tristate "Enable the Timberdale radio driver"</div><div class='del'>-	depends on MFD_TIMBERDALE &amp;&amp; VIDEO_V4L2</div><div class='del'>-	depends on I2C	# for RADIO_SAA7706H</div><div class='del'>-	select RADIO_TEF6862</div><div class='del'>-	select RADIO_SAA7706H</div><div class='del'>-	---help---</div><div class='del'>-	  This is a kind of umbrella driver for the Radio Tuner and DSP</div><div class='del'>-	  found behind the Timberdale FPGA on the Russellville board.</div><div class='del'>-	  Enabling this driver will automatically select the DSP and tuner.</div><div class='del'>-</div><div class='del'>-config RADIO_WL1273</div><div class='del'>-	tristate "Texas Instruments WL1273 I2C FM Radio"</div><div class='del'>-	depends on I2C &amp;&amp; VIDEO_V4L2</div><div class='del'>-	select MFD_WL1273_CORE</div><div class='del'>-	select FW_LOADER</div><div class='del'>-	---help---</div><div class='del'>-	  Choose Y here if you have this FM radio chip.</div><div class='del'>-</div><div class='del'>-	  In order to control your radio card, you will need to use programs</div><div class='del'>-	  that are compatible with the Video For Linux 2 API.  Information on</div><div class='del'>-	  this API and pointers to "v4l2" programs may be found at</div><div class='del'>-	  &lt;file:Documentation/video4linux/API.html&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 radio-wl1273.</div><div class='del'>-</div><div class='del'>-# TI's ST based wl128x FM radio</div><div class='del'>-source "drivers/media/radio/wl128x/Kconfig"</div><div class='add'>+endif # V4L_RADIO_ISA_DRIVERS</div><div class='ctx'> </div><div class='ctx'> endif # RADIO_ADAPTERS</div><div class='head'>diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c<br/>index 25e58cbf35f0..f36905b63645 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/dsbr100.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/dsbr100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/dsbr100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/radio/dsbr100.c</a></div><div class='hunk'>@@ -624,21 +624,7 @@ static int usb_dsbr100_probe(struct usb_interface *intf,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init dsbr100_init(void)</div><div class='del'>-{</div><div class='del'>-	int retval = usb_register(&amp;usb_dsbr100_driver);</div><div class='del'>-	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='del'>-	       DRIVER_DESC "\n");</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit dsbr100_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;usb_dsbr100_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init (dsbr100_init);</div><div class='del'>-module_exit (dsbr100_exit);</div><div class='add'>+module_usb_driver(usb_dsbr100_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR( DRIVER_AUTHOR );</div><div class='ctx'> MODULE_DESCRIPTION( DRIVER_DESC );</div><div class='head'>diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c<br/>index edadc8449a3d..36ce0611c037 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-gemtek.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/radio-gemtek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-gemtek.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/radio/radio-gemtek.c</a></div><div class='hunk'>@@ -47,11 +47,11 @@ MODULE_VERSION("0.0.4");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int io		= CONFIG_RADIO_GEMTEK_PORT;</div><div class='del'>-static int probe	= CONFIG_RADIO_GEMTEK_PROBE;</div><div class='del'>-static int hardmute;</div><div class='del'>-static int shutdown	= 1;</div><div class='del'>-static int keepmuted	= 1;</div><div class='del'>-static int initmute	= 1;</div><div class='add'>+static bool probe	= CONFIG_RADIO_GEMTEK_PROBE;</div><div class='add'>+static bool hardmute;</div><div class='add'>+static bool shutdown	= 1;</div><div class='add'>+static bool keepmuted	= 1;</div><div class='add'>+static bool initmute	= 1;</div><div class='ctx'> static int radio_nr	= -1;</div><div class='ctx'> </div><div class='ctx'> module_param(io, int, 0444);</div><div class='head'>diff --git a/drivers/media/radio/radio-miropcm20.c b/drivers/media/radio/radio-miropcm20.c<br/>index 3fb76e3834c9..87c1ee13b058 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-miropcm20.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/radio-miropcm20.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-miropcm20.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/radio/radio-miropcm20.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@ static int radio_nr = -1;</div><div class='ctx'> module_param(radio_nr, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(radio_nr, "Set radio device number (/dev/radioX).  Default: -1 (autodetect)");</div><div class='ctx'> </div><div class='del'>-static int mono;</div><div class='add'>+static bool mono;</div><div class='ctx'> module_param(mono, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(mono, "Force tuner into mono mode.");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c<br/>index 1742bd8110bd..a860a72a58ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-mr800.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/radio-mr800.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-mr800.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/radio/radio-mr800.c</a></div><div class='hunk'>@@ -659,25 +659,4 @@ err:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init amradio_init(void)</div><div class='del'>-{</div><div class='del'>-	int retval = usb_register(&amp;usb_amradio_driver);</div><div class='del'>-</div><div class='del'>-	pr_info(KBUILD_MODNAME</div><div class='del'>-		": version " DRIVER_VERSION " " DRIVER_DESC "\n");</div><div class='del'>-</div><div class='del'>-	if (retval)</div><div class='del'>-		pr_err(KBUILD_MODNAME</div><div class='del'>-			": usb_register failed. Error number %d\n", retval);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit amradio_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;usb_amradio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(amradio_init);</div><div class='del'>-module_exit(amradio_exit);</div><div class='del'>-</div><div class='add'>+module_usb_driver(usb_amradio_driver);</div><div class='head'>diff --git a/drivers/media/radio/radio-si4713.c b/drivers/media/radio/radio-si4713.c<br/>index d1fab5885061..c54210c7fef9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-si4713.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/radio-si4713.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-si4713.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/radio/radio-si4713.c</a></div><div class='hunk'>@@ -355,17 +355,4 @@ static struct platform_driver radio_si4713_pdriver = {</div><div class='ctx'> 	.remove         = __exit_p(radio_si4713_pdriver_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Module Interface */</div><div class='del'>-static int __init radio_si4713_module_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;radio_si4713_pdriver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit radio_si4713_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;radio_si4713_pdriver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(radio_si4713_module_init);</div><div class='del'>-module_exit(radio_si4713_module_exit);</div><div class='del'>-</div><div class='add'>+module_platform_driver(radio_si4713_pdriver);</div><div class='head'>diff --git a/drivers/media/radio/radio-timb.c b/drivers/media/radio/radio-timb.c<br/>index 3e9209f84e09..5d9a90ac3a1c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-timb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/radio-timb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-timb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/radio/radio-timb.c</a></div><div class='hunk'>@@ -226,20 +226,7 @@ static struct platform_driver timbradio_platform_driver = {</div><div class='ctx'> 	.remove		= timbradio_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*--------------------------------------------------------------------------*/</div><div class='del'>-</div><div class='del'>-static int __init timbradio_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;timbradio_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit timbradio_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;timbradio_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(timbradio_init);</div><div class='del'>-module_exit(timbradio_exit);</div><div class='add'>+module_platform_driver(timbradio_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Timberdale Radio driver");</div><div class='ctx'> MODULE_AUTHOR("Mocean Laboratories &lt;info@mocean-labs.com&gt;");</div><div class='head'>diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c<br/>index 8aa4968d57bc..f1b607099b6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-wl1273.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/radio-wl1273.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-wl1273.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/radio/radio-wl1273.c</a></div><div class='hunk'>@@ -2148,8 +2148,6 @@ pdata_err:</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-MODULE_ALIAS("platform:wl1273_fm_radio");</div><div class='del'>-</div><div class='ctx'> static struct platform_driver wl1273_fm_radio_driver = {</div><div class='ctx'> 	.probe		= wl1273_fm_radio_probe,</div><div class='ctx'> 	.remove		= __devexit_p(wl1273_fm_radio_remove),</div><div class='hunk'>@@ -2159,20 +2157,9 @@ static struct platform_driver wl1273_fm_radio_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init wl1273_fm_module_init(void)</div><div class='del'>-{</div><div class='del'>-	pr_info("%s\n", __func__);</div><div class='del'>-	return platform_driver_register(&amp;wl1273_fm_radio_driver);</div><div class='del'>-}</div><div class='del'>-module_init(wl1273_fm_module_init);</div><div class='del'>-</div><div class='del'>-static void __exit wl1273_fm_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;wl1273_fm_radio_driver);</div><div class='del'>-	pr_info(DRIVER_DESC ", Exiting.\n");</div><div class='del'>-}</div><div class='del'>-module_exit(wl1273_fm_module_exit);</div><div class='add'>+module_platform_driver(wl1273_fm_radio_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Matti Aaltonen &lt;matti.j.aaltonen@nokia.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("platform:wl1273_fm_radio");</div><div class='head'>diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c<br/>index a6ad707fae96..b7debb67932a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/si470x/radio-si470x-usb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/si470x/radio-si470x-usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/si470x/radio-si470x-usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/radio/si470x/radio-si470x-usb.c</a></div><div class='hunk'>@@ -861,33 +861,7 @@ static struct usb_driver si470x_usb_driver = {</div><div class='ctx'> 	.supports_autosuspend	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**************************************************************************</div><div class='del'>- * Module Interface</div><div class='del'>- **************************************************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * si470x_module_init - module init</div><div class='del'>- */</div><div class='del'>-static int __init si470x_module_init(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO DRIVER_DESC ", Version " DRIVER_VERSION "\n");</div><div class='del'>-	return usb_register(&amp;si470x_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * si470x_module_exit - module exit</div><div class='del'>- */</div><div class='del'>-static void __exit si470x_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;si470x_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-module_init(si470x_module_init);</div><div class='del'>-module_exit(si470x_module_exit);</div><div class='add'>+module_usb_driver(si470x_usb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='head'>diff --git a/drivers/media/radio/tef6862.c b/drivers/media/radio/tef6862.c<br/>index 0991e1973678..3408685b690c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/tef6862.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/tef6862.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/tef6862.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/radio/tef6862.c</a></div><div class='hunk'>@@ -118,9 +118,11 @@ static int tef6862_s_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *f)</div><div class='ctx'> 	i2cmsg[2] = pll &amp; 0xff;</div><div class='ctx'> </div><div class='ctx'> 	err = i2c_master_send(client, i2cmsg, sizeof(i2cmsg));</div><div class='del'>-	if (!err)</div><div class='del'>-		state-&gt;freq = f-&gt;frequency;</div><div class='del'>-	return err;</div><div class='add'>+	if (err != sizeof(i2cmsg))</div><div class='add'>+		return err &lt; 0 ? err : -EIO;</div><div class='add'>+</div><div class='add'>+	state-&gt;freq = f-&gt;frequency;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tef6862_g_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *f)</div><div class='head'>diff --git a/drivers/media/radio/wl128x/Kconfig b/drivers/media/radio/wl128x/Kconfig<br/>index 749f67b192e7..86b28579f0c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/wl128x/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/wl128x/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/wl128x/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/radio/wl128x/Kconfig</a></div><div class='hunk'>@@ -5,7 +5,7 @@ menu "Texas Instruments WL128x FM driver (ST based)"</div><div class='ctx'> config RADIO_WL128X</div><div class='ctx'> 	tristate "Texas Instruments WL128x FM Radio"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; RFKILL</div><div class='del'>-	select TI_ST</div><div class='add'>+	select TI_ST if NET &amp;&amp; GPIOLIB</div><div class='ctx'> 	help</div><div class='ctx'> 	Choose Y here if you have this FM radio chip.</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 5991ab60303d..bf867a6b5ea0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/wl128x/fmdrv_common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/wl128x/fmdrv_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/wl128x/fmdrv_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/radio/wl128x/fmdrv_common.c</a></div><div class='hunk'>@@ -387,7 +387,7 @@ static void send_tasklet(unsigned long arg)</div><div class='ctx'>  * Queues FM Channel-8 packet to FM TX queue and schedules FM TX tasklet for</div><div class='ctx'>  * transmission</div><div class='ctx'>  */</div><div class='del'>-static u32 fm_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type,	void *payload,</div><div class='add'>+static int fm_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type,	void *payload,</div><div class='ctx'> 		int payload_len, struct completion *wait_completion)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -456,13 +456,13 @@ static u32 fm_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type,	void *payload,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Sends FM Channel-8 command to the chip and waits for the response */</div><div class='del'>-u32 fmc_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type, void *payload,</div><div class='add'>+int fmc_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type, void *payload,</div><div class='ctx'> 		unsigned int payload_len, void *response, int *response_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct fm_event_msg_hdr *evt_hdr;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;fmdev-&gt;maintask_comp);</div><div class='ctx'> 	ret = fm_send_cmd(fmdev, fm_op, type, payload, payload_len,</div><div class='hunk'>@@ -470,8 +470,8 @@ u32 fmc_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type, void *payload,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = wait_for_completion_timeout(&amp;fmdev-&gt;maintask_comp, FM_DRV_TX_TIMEOUT);</div><div class='del'>-	if (!ret) {</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;fmdev-&gt;maintask_comp,</div><div class='add'>+					 FM_DRV_TX_TIMEOUT)) {</div><div class='ctx'> 		fmerr("Timeout(%d sec),didn't get reg"</div><div class='ctx'> 			   "completion signal from RX tasklet\n",</div><div class='ctx'> 			   jiffies_to_msecs(FM_DRV_TX_TIMEOUT) / 1000);</div><div class='hunk'>@@ -508,7 +508,7 @@ u32 fmc_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type, void *payload,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --- Helper functions used in FM interrupt handlers ---*/</div><div class='del'>-static inline u32 check_cmdresp_status(struct fmdev *fmdev,</div><div class='add'>+static inline int check_cmdresp_status(struct fmdev *fmdev,</div><div class='ctx'> 		struct sk_buff **skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct fm_event_msg_hdr *fm_evt_hdr;</div><div class='hunk'>@@ -1058,7 +1058,7 @@ static void fm_irq_handle_intmsk_cmd_resp(struct fmdev *fmdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns availability of RDS data in internel buffer */</div><div class='del'>-u32 fmc_is_rds_data_available(struct fmdev *fmdev, struct file *file,</div><div class='add'>+int fmc_is_rds_data_available(struct fmdev *fmdev, struct file *file,</div><div class='ctx'> 				struct poll_table_struct *pts)</div><div class='ctx'> {</div><div class='ctx'> 	poll_wait(file, &amp;fmdev-&gt;rx.rds.read_queue, pts);</div><div class='hunk'>@@ -1069,7 +1069,7 @@ u32 fmc_is_rds_data_available(struct fmdev *fmdev, struct file *file,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Copies RDS data from internal buffer to user buffer */</div><div class='del'>-u32 fmc_transfer_rds_from_internal_buff(struct fmdev *fmdev, struct file *file,</div><div class='add'>+int fmc_transfer_rds_from_internal_buff(struct fmdev *fmdev, struct file *file,</div><div class='ctx'> 		u8 __user *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	u32 block_count;</div><div class='hunk'>@@ -1113,7 +1113,7 @@ u32 fmc_transfer_rds_from_internal_buff(struct fmdev *fmdev, struct file *file,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 fmc_set_freq(struct fmdev *fmdev, u32 freq_to_set)</div><div class='add'>+int fmc_set_freq(struct fmdev *fmdev, u32 freq_to_set)</div><div class='ctx'> {</div><div class='ctx'> 	switch (fmdev-&gt;curr_fmmode) {</div><div class='ctx'> 	case FM_MODE_RX:</div><div class='hunk'>@@ -1127,7 +1127,7 @@ u32 fmc_set_freq(struct fmdev *fmdev, u32 freq_to_set)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 fmc_get_freq(struct fmdev *fmdev, u32 *cur_tuned_frq)</div><div class='add'>+int fmc_get_freq(struct fmdev *fmdev, u32 *cur_tuned_frq)</div><div class='ctx'> {</div><div class='ctx'> 	if (fmdev-&gt;rx.freq == FM_UNDEFINED_FREQ) {</div><div class='ctx'> 		fmerr("RX frequency is not set\n");</div><div class='hunk'>@@ -1153,7 +1153,7 @@ u32 fmc_get_freq(struct fmdev *fmdev, u32 *cur_tuned_frq)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 fmc_set_region(struct fmdev *fmdev, u8 region_to_set)</div><div class='add'>+int fmc_set_region(struct fmdev *fmdev, u8 region_to_set)</div><div class='ctx'> {</div><div class='ctx'> 	switch (fmdev-&gt;curr_fmmode) {</div><div class='ctx'> 	case FM_MODE_RX:</div><div class='hunk'>@@ -1167,7 +1167,7 @@ u32 fmc_set_region(struct fmdev *fmdev, u8 region_to_set)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 fmc_set_mute_mode(struct fmdev *fmdev, u8 mute_mode_toset)</div><div class='add'>+int fmc_set_mute_mode(struct fmdev *fmdev, u8 mute_mode_toset)</div><div class='ctx'> {</div><div class='ctx'> 	switch (fmdev-&gt;curr_fmmode) {</div><div class='ctx'> 	case FM_MODE_RX:</div><div class='hunk'>@@ -1181,7 +1181,7 @@ u32 fmc_set_mute_mode(struct fmdev *fmdev, u8 mute_mode_toset)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 fmc_set_stereo_mono(struct fmdev *fmdev, u16 mode)</div><div class='add'>+int fmc_set_stereo_mono(struct fmdev *fmdev, u16 mode)</div><div class='ctx'> {</div><div class='ctx'> 	switch (fmdev-&gt;curr_fmmode) {</div><div class='ctx'> 	case FM_MODE_RX:</div><div class='hunk'>@@ -1195,7 +1195,7 @@ u32 fmc_set_stereo_mono(struct fmdev *fmdev, u16 mode)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 fmc_set_rds_mode(struct fmdev *fmdev, u8 rds_en_dis)</div><div class='add'>+int fmc_set_rds_mode(struct fmdev *fmdev, u8 rds_en_dis)</div><div class='ctx'> {</div><div class='ctx'> 	switch (fmdev-&gt;curr_fmmode) {</div><div class='ctx'> 	case FM_MODE_RX:</div><div class='hunk'>@@ -1210,10 +1210,10 @@ u32 fmc_set_rds_mode(struct fmdev *fmdev, u8 rds_en_dis)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Sends power off command to the chip */</div><div class='del'>-static u32 fm_power_down(struct fmdev *fmdev)</div><div class='add'>+static int fm_power_down(struct fmdev *fmdev)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(FM_CORE_READY, &amp;fmdev-&gt;flag)) {</div><div class='ctx'> 		fmerr("FM core is not ready\n");</div><div class='hunk'>@@ -1234,7 +1234,7 @@ static u32 fm_power_down(struct fmdev *fmdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Reads init command from FM firmware file and loads to the chip */</div><div class='del'>-static u32 fm_download_firmware(struct fmdev *fmdev, const u8 *fw_name)</div><div class='add'>+static int fm_download_firmware(struct fmdev *fmdev, const u8 *fw_name)</div><div class='ctx'> {</div><div class='ctx'> 	const struct firmware *fw_entry;</div><div class='ctx'> 	struct bts_header *fw_header;</div><div class='hunk'>@@ -1299,7 +1299,7 @@ rel_fw:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Loads default RX configuration to the chip */</div><div class='del'>-static u32 load_default_rx_configuration(struct fmdev *fmdev)</div><div class='add'>+static int load_default_rx_configuration(struct fmdev *fmdev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1311,7 +1311,7 @@ static u32 load_default_rx_configuration(struct fmdev *fmdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Does FM power on sequence */</div><div class='del'>-static u32 fm_power_up(struct fmdev *fmdev, u8 mode)</div><div class='add'>+static int fm_power_up(struct fmdev *fmdev, u8 mode)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload, asic_id, asic_ver;</div><div class='ctx'> 	int resp_len, ret;</div><div class='hunk'>@@ -1374,7 +1374,7 @@ rel:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set FM Modes(TX, RX, OFF) */</div><div class='del'>-u32 fmc_set_mode(struct fmdev *fmdev, u8 fm_mode)</div><div class='add'>+int fmc_set_mode(struct fmdev *fmdev, u8 fm_mode)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1427,7 +1427,7 @@ u32 fmc_set_mode(struct fmdev *fmdev, u8 fm_mode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns current FM mode (TX, RX, OFF) */</div><div class='del'>-u32 fmc_get_mode(struct fmdev *fmdev, u8 *fmmode)</div><div class='add'>+int fmc_get_mode(struct fmdev *fmdev, u8 *fmmode)</div><div class='ctx'> {</div><div class='ctx'> 	if (!test_bit(FM_CORE_READY, &amp;fmdev-&gt;flag)) {</div><div class='ctx'> 		fmerr("FM core is not ready\n");</div><div class='hunk'>@@ -1483,10 +1483,10 @@ static void fm_st_reg_comp_cb(void *arg, char data)</div><div class='ctx'>  * This function will be called from FM V4L2 open function.</div><div class='ctx'>  * Register with ST driver and initialize driver data.</div><div class='ctx'>  */</div><div class='del'>-u32 fmc_prepare(struct fmdev *fmdev)</div><div class='add'>+int fmc_prepare(struct fmdev *fmdev)</div><div class='ctx'> {</div><div class='ctx'> 	static struct st_proto_s fm_st_proto;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(FM_CORE_READY, &amp;fmdev-&gt;flag)) {</div><div class='ctx'> 		fmdbg("FM Core is already up\n");</div><div class='hunk'>@@ -1512,10 +1512,8 @@ u32 fmc_prepare(struct fmdev *fmdev)</div><div class='ctx'> 		fmdev-&gt;streg_cbdata = -EINPROGRESS;</div><div class='ctx'> 		fmdbg("%s waiting for ST reg completion signal\n", __func__);</div><div class='ctx'> </div><div class='del'>-		ret = wait_for_completion_timeout(&amp;wait_for_fmdrv_reg_comp,</div><div class='del'>-				FM_ST_REG_TIMEOUT);</div><div class='del'>-</div><div class='del'>-		if (!ret) {</div><div class='add'>+		if (!wait_for_completion_timeout(&amp;wait_for_fmdrv_reg_comp,</div><div class='add'>+						 FM_ST_REG_TIMEOUT)) {</div><div class='ctx'> 			fmerr("Timeout(%d sec), didn't get reg "</div><div class='ctx'> 					"completion signal from ST\n",</div><div class='ctx'> 					jiffies_to_msecs(FM_ST_REG_TIMEOUT) / 1000);</div><div class='hunk'>@@ -1589,10 +1587,10 @@ u32 fmc_prepare(struct fmdev *fmdev)</div><div class='ctx'>  * This function will be called from FM V4L2 release function.</div><div class='ctx'>  * Unregister from ST driver.</div><div class='ctx'>  */</div><div class='del'>-u32 fmc_release(struct fmdev *fmdev)</div><div class='add'>+int fmc_release(struct fmdev *fmdev)</div><div class='ctx'> {</div><div class='ctx'> 	static struct st_proto_s fm_st_proto;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(FM_CORE_READY, &amp;fmdev-&gt;flag)) {</div><div class='ctx'> 		fmdbg("FM Core is already down\n");</div><div class='hunk'>@@ -1631,7 +1629,7 @@ u32 fmc_release(struct fmdev *fmdev)</div><div class='ctx'> static int __init fm_drv_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct fmdev *fmdev = NULL;</div><div class='del'>-	u32 ret = -ENOMEM;</div><div class='add'>+	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	fmdbg("FM driver version %s\n", FM_DRV_VERSION);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/radio/wl128x/fmdrv_common.h b/drivers/media/radio/wl128x/fmdrv_common.h<br/>index aee243bb6630..d9b9c6cf83b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/wl128x/fmdrv_common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/wl128x/fmdrv_common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/wl128x/fmdrv_common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/radio/wl128x/fmdrv_common.h</a></div><div class='hunk'>@@ -368,27 +368,27 @@ struct fm_event_msg_hdr {</div><div class='ctx'> #define FM_TX_ANT_IMP_500		2</div><div class='ctx'> </div><div class='ctx'> /* Functions exported by FM common sub-module */</div><div class='del'>-u32 fmc_prepare(struct fmdev *);</div><div class='del'>-u32 fmc_release(struct fmdev *);</div><div class='add'>+int fmc_prepare(struct fmdev *);</div><div class='add'>+int fmc_release(struct fmdev *);</div><div class='ctx'> </div><div class='ctx'> void fmc_update_region_info(struct fmdev *, u8);</div><div class='del'>-u32 fmc_send_cmd(struct fmdev *, u8, u16,</div><div class='add'>+int fmc_send_cmd(struct fmdev *, u8, u16,</div><div class='ctx'> 				void *, unsigned int, void *, int *);</div><div class='del'>-u32 fmc_is_rds_data_available(struct fmdev *, struct file *,</div><div class='add'>+int fmc_is_rds_data_available(struct fmdev *, struct file *,</div><div class='ctx'> 				struct poll_table_struct *);</div><div class='del'>-u32 fmc_transfer_rds_from_internal_buff(struct fmdev *, struct file *,</div><div class='add'>+int fmc_transfer_rds_from_internal_buff(struct fmdev *, struct file *,</div><div class='ctx'> 					u8 __user *, size_t);</div><div class='ctx'> </div><div class='del'>-u32 fmc_set_freq(struct fmdev *, u32);</div><div class='del'>-u32 fmc_set_mode(struct fmdev *, u8);</div><div class='del'>-u32 fmc_set_region(struct fmdev *, u8);</div><div class='del'>-u32 fmc_set_mute_mode(struct fmdev *, u8);</div><div class='del'>-u32 fmc_set_stereo_mono(struct fmdev *, u16);</div><div class='del'>-u32 fmc_set_rds_mode(struct fmdev *, u8);</div><div class='add'>+int fmc_set_freq(struct fmdev *, u32);</div><div class='add'>+int fmc_set_mode(struct fmdev *, u8);</div><div class='add'>+int fmc_set_region(struct fmdev *, u8);</div><div class='add'>+int fmc_set_mute_mode(struct fmdev *, u8);</div><div class='add'>+int fmc_set_stereo_mono(struct fmdev *, u16);</div><div class='add'>+int fmc_set_rds_mode(struct fmdev *, u8);</div><div class='ctx'> </div><div class='del'>-u32 fmc_get_freq(struct fmdev *, u32 *);</div><div class='del'>-u32 fmc_get_region(struct fmdev *, u8 *);</div><div class='del'>-u32 fmc_get_mode(struct fmdev *, u8 *);</div><div class='add'>+int fmc_get_freq(struct fmdev *, u32 *);</div><div class='add'>+int fmc_get_region(struct fmdev *, u8 *);</div><div class='add'>+int fmc_get_mode(struct fmdev *, u8 *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * channel spacing</div><div class='head'>diff --git a/drivers/media/radio/wl128x/fmdrv_rx.c b/drivers/media/radio/wl128x/fmdrv_rx.c<br/>index ec529b55b040..43fb72291bea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/wl128x/fmdrv_rx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/wl128x/fmdrv_rx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/wl128x/fmdrv_rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/radio/wl128x/fmdrv_rx.c</a></div><div class='hunk'>@@ -43,12 +43,13 @@ void fm_rx_reset_station_info(struct fmdev *fmdev)</div><div class='ctx'> 	fmdev-&gt;rx.stat_info.af_list_max = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 fm_rx_set_freq(struct fmdev *fmdev, u32 freq)</div><div class='add'>+int fm_rx_set_freq(struct fmdev *fmdev, u32 freq)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long timeleft;</div><div class='ctx'> 	u16 payload, curr_frq, intr_flag;</div><div class='ctx'> 	u32 curr_frq_in_khz;</div><div class='del'>-	u32 ret, resp_len;</div><div class='add'>+	u32 resp_len;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (freq &lt; fmdev-&gt;rx.region.bot_freq || freq &gt; fmdev-&gt;rx.region.top_freq) {</div><div class='ctx'> 		fmerr("Invalid frequency %d\n", freq);</div><div class='hunk'>@@ -141,10 +142,10 @@ exit:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 fm_rx_set_channel_spacing(struct fmdev *fmdev, u32 spacing)</div><div class='add'>+static int fm_rx_set_channel_spacing(struct fmdev *fmdev, u32 spacing)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (spacing &gt; 0 &amp;&amp; spacing &lt;= 50000)</div><div class='ctx'> 		spacing = FM_CHANNEL_SPACING_50KHZ;</div><div class='hunk'>@@ -165,7 +166,7 @@ static u32 fm_rx_set_channel_spacing(struct fmdev *fmdev, u32 spacing)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 fm_rx_seek(struct fmdev *fmdev, u32 seek_upward,</div><div class='add'>+int fm_rx_seek(struct fmdev *fmdev, u32 seek_upward,</div><div class='ctx'> 		u32 wrap_around, u32 spacing)</div><div class='ctx'> {</div><div class='ctx'> 	u32 resp_len;</div><div class='hunk'>@@ -173,7 +174,7 @@ u32 fm_rx_seek(struct fmdev *fmdev, u32 seek_upward,</div><div class='ctx'> 	u16 payload, int_reason, intr_flag;</div><div class='ctx'> 	u16 offset, space_idx;</div><div class='ctx'> 	unsigned long timeleft;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Set channel spacing */</div><div class='ctx'> 	ret = fm_rx_set_channel_spacing(fmdev, spacing);</div><div class='hunk'>@@ -296,10 +297,10 @@ again:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 fm_rx_set_volume(struct fmdev *fmdev, u16 vol_to_set)</div><div class='add'>+int fm_rx_set_volume(struct fmdev *fmdev, u16 vol_to_set)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (fmdev-&gt;curr_fmmode != FM_MODE_RX)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -322,7 +323,7 @@ u32 fm_rx_set_volume(struct fmdev *fmdev, u16 vol_to_set)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Get volume */</div><div class='del'>-u32 fm_rx_get_volume(struct fmdev *fmdev, u16 *curr_vol)</div><div class='add'>+int fm_rx_get_volume(struct fmdev *fmdev, u16 *curr_vol)</div><div class='ctx'> {</div><div class='ctx'> 	if (fmdev-&gt;curr_fmmode != FM_MODE_RX)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -338,7 +339,7 @@ u32 fm_rx_get_volume(struct fmdev *fmdev, u16 *curr_vol)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* To get current band's bottom and top frequency */</div><div class='del'>-u32 fm_rx_get_band_freq_range(struct fmdev *fmdev, u32 *bot_freq, u32 *top_freq)</div><div class='add'>+int fm_rx_get_band_freq_range(struct fmdev *fmdev, u32 *bot_freq, u32 *top_freq)</div><div class='ctx'> {</div><div class='ctx'> 	if (bot_freq != NULL)</div><div class='ctx'> 		*bot_freq = fmdev-&gt;rx.region.bot_freq;</div><div class='hunk'>@@ -356,11 +357,11 @@ void fm_rx_get_region(struct fmdev *fmdev, u8 *region)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Sets band (0-Europe/US; 1-Japan) */</div><div class='del'>-u32 fm_rx_set_region(struct fmdev *fmdev, u8 region_to_set)</div><div class='add'>+int fm_rx_set_region(struct fmdev *fmdev, u8 region_to_set)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='ctx'> 	u32 new_frq = 0;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (region_to_set != FM_BAND_EUROPE_US &amp;&amp;</div><div class='ctx'> 	    region_to_set != FM_BAND_JAPAN) {</div><div class='hunk'>@@ -399,7 +400,7 @@ u32 fm_rx_set_region(struct fmdev *fmdev, u8 region_to_set)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Reads current mute mode (Mute Off/On/Attenuate)*/</div><div class='del'>-u32 fm_rx_get_mute_mode(struct fmdev *fmdev, u8 *curr_mute_mode)</div><div class='add'>+int fm_rx_get_mute_mode(struct fmdev *fmdev, u8 *curr_mute_mode)</div><div class='ctx'> {</div><div class='ctx'> 	if (fmdev-&gt;curr_fmmode != FM_MODE_RX)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -414,10 +415,10 @@ u32 fm_rx_get_mute_mode(struct fmdev *fmdev, u8 *curr_mute_mode)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 fm_config_rx_mute_reg(struct fmdev *fmdev)</div><div class='add'>+static int fm_config_rx_mute_reg(struct fmdev *fmdev)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload, muteval;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	muteval = 0;</div><div class='ctx'> 	switch (fmdev-&gt;rx.mute_mode) {</div><div class='hunk'>@@ -448,10 +449,10 @@ static u32 fm_config_rx_mute_reg(struct fmdev *fmdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Configures mute mode (Mute Off/On/Attenuate) */</div><div class='del'>-u32 fm_rx_set_mute_mode(struct fmdev *fmdev, u8 mute_mode_toset)</div><div class='add'>+int fm_rx_set_mute_mode(struct fmdev *fmdev, u8 mute_mode_toset)</div><div class='ctx'> {</div><div class='ctx'> 	u8 org_state;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (fmdev-&gt;rx.mute_mode == mute_mode_toset)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -469,7 +470,7 @@ u32 fm_rx_set_mute_mode(struct fmdev *fmdev, u8 mute_mode_toset)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Gets RF dependent soft mute mode enable/disable status */</div><div class='del'>-u32 fm_rx_get_rfdepend_softmute(struct fmdev *fmdev, u8 *curr_mute_mode)</div><div class='add'>+int fm_rx_get_rfdepend_softmute(struct fmdev *fmdev, u8 *curr_mute_mode)</div><div class='ctx'> {</div><div class='ctx'> 	if (fmdev-&gt;curr_fmmode != FM_MODE_RX)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -485,10 +486,10 @@ u32 fm_rx_get_rfdepend_softmute(struct fmdev *fmdev, u8 *curr_mute_mode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Sets RF dependent soft mute mode */</div><div class='del'>-u32 fm_rx_set_rfdepend_softmute(struct fmdev *fmdev, u8 rfdepend_mute)</div><div class='add'>+int fm_rx_set_rfdepend_softmute(struct fmdev *fmdev, u8 rfdepend_mute)</div><div class='ctx'> {</div><div class='ctx'> 	u8 org_state;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (fmdev-&gt;curr_fmmode != FM_MODE_RX)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -514,11 +515,11 @@ u32 fm_rx_set_rfdepend_softmute(struct fmdev *fmdev, u8 rfdepend_mute)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns the signal strength level of current channel */</div><div class='del'>-u32 fm_rx_get_rssi_level(struct fmdev *fmdev, u16 *rssilvl)</div><div class='add'>+int fm_rx_get_rssi_level(struct fmdev *fmdev, u16 *rssilvl)</div><div class='ctx'> {</div><div class='ctx'> 	u16 curr_rssi_lel;</div><div class='ctx'> 	u32 resp_len;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (rssilvl == NULL) {</div><div class='ctx'> 		fmerr("Invalid memory\n");</div><div class='hunk'>@@ -539,10 +540,10 @@ u32 fm_rx_get_rssi_level(struct fmdev *fmdev, u16 *rssilvl)</div><div class='ctx'>  * Sets the signal strength level that once reached</div><div class='ctx'>  * will stop the auto search process</div><div class='ctx'>  */</div><div class='del'>-u32 fm_rx_set_rssi_threshold(struct fmdev *fmdev, short rssi_lvl_toset)</div><div class='add'>+int fm_rx_set_rssi_threshold(struct fmdev *fmdev, short rssi_lvl_toset)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (rssi_lvl_toset &lt; FM_RX_RSSI_THRESHOLD_MIN ||</div><div class='ctx'> 			rssi_lvl_toset &gt; FM_RX_RSSI_THRESHOLD_MAX) {</div><div class='hunk'>@@ -561,7 +562,7 @@ u32 fm_rx_set_rssi_threshold(struct fmdev *fmdev, short rssi_lvl_toset)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns current RX RSSI threshold value */</div><div class='del'>-u32 fm_rx_get_rssi_threshold(struct fmdev *fmdev, short *curr_rssi_lvl)</div><div class='add'>+int fm_rx_get_rssi_threshold(struct fmdev *fmdev, short *curr_rssi_lvl)</div><div class='ctx'> {</div><div class='ctx'> 	if (fmdev-&gt;curr_fmmode != FM_MODE_RX)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -577,10 +578,10 @@ u32 fm_rx_get_rssi_threshold(struct fmdev *fmdev, short *curr_rssi_lvl)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Sets RX stereo/mono modes */</div><div class='del'>-u32 fm_rx_set_stereo_mono(struct fmdev *fmdev, u16 mode)</div><div class='add'>+int fm_rx_set_stereo_mono(struct fmdev *fmdev, u16 mode)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (mode != FM_STEREO_MODE &amp;&amp; mode != FM_MONO_MODE) {</div><div class='ctx'> 		fmerr("Invalid mode\n");</div><div class='hunk'>@@ -605,10 +606,11 @@ u32 fm_rx_set_stereo_mono(struct fmdev *fmdev, u16 mode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Gets current RX stereo/mono mode */</div><div class='del'>-u32 fm_rx_get_stereo_mono(struct fmdev *fmdev, u16 *mode)</div><div class='add'>+int fm_rx_get_stereo_mono(struct fmdev *fmdev, u16 *mode)</div><div class='ctx'> {</div><div class='ctx'> 	u16 curr_mode;</div><div class='del'>-	u32 ret, resp_len;</div><div class='add'>+	u32 resp_len;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (mode == NULL) {</div><div class='ctx'> 		fmerr("Invalid memory\n");</div><div class='hunk'>@@ -626,10 +628,10 @@ u32 fm_rx_get_stereo_mono(struct fmdev *fmdev, u16 *mode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Choose RX de-emphasis filter mode (50us/75us) */</div><div class='del'>-u32 fm_rx_set_deemphasis_mode(struct fmdev *fmdev, u16 mode)</div><div class='add'>+int fm_rx_set_deemphasis_mode(struct fmdev *fmdev, u16 mode)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (fmdev-&gt;curr_fmmode != FM_MODE_RX)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -652,7 +654,7 @@ u32 fm_rx_set_deemphasis_mode(struct fmdev *fmdev, u16 mode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Gets current RX de-emphasis filter mode */</div><div class='del'>-u32 fm_rx_get_deemph_mode(struct fmdev *fmdev, u16 *curr_deemphasis_mode)</div><div class='add'>+int fm_rx_get_deemph_mode(struct fmdev *fmdev, u16 *curr_deemphasis_mode)</div><div class='ctx'> {</div><div class='ctx'> 	if (fmdev-&gt;curr_fmmode != FM_MODE_RX)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -668,10 +670,10 @@ u32 fm_rx_get_deemph_mode(struct fmdev *fmdev, u16 *curr_deemphasis_mode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Enable/Disable RX RDS */</div><div class='del'>-u32 fm_rx_set_rds_mode(struct fmdev *fmdev, u8 rds_en_dis)</div><div class='add'>+int fm_rx_set_rds_mode(struct fmdev *fmdev, u8 rds_en_dis)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (rds_en_dis != FM_RDS_ENABLE &amp;&amp; rds_en_dis != FM_RDS_DISABLE) {</div><div class='ctx'> 		fmerr("Invalid rds option\n");</div><div class='hunk'>@@ -743,7 +745,7 @@ u32 fm_rx_set_rds_mode(struct fmdev *fmdev, u8 rds_en_dis)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns current RX RDS enable/disable status */</div><div class='del'>-u32 fm_rx_get_rds_mode(struct fmdev *fmdev, u8 *curr_rds_en_dis)</div><div class='add'>+int fm_rx_get_rds_mode(struct fmdev *fmdev, u8 *curr_rds_en_dis)</div><div class='ctx'> {</div><div class='ctx'> 	if (fmdev-&gt;curr_fmmode != FM_MODE_RX)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -759,10 +761,10 @@ u32 fm_rx_get_rds_mode(struct fmdev *fmdev, u8 *curr_rds_en_dis)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Sets RDS operation mode (RDS/RDBS) */</div><div class='del'>-u32 fm_rx_set_rds_system(struct fmdev *fmdev, u8 rds_mode)</div><div class='add'>+int fm_rx_set_rds_system(struct fmdev *fmdev, u8 rds_mode)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (fmdev-&gt;curr_fmmode != FM_MODE_RX)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -784,7 +786,7 @@ u32 fm_rx_set_rds_system(struct fmdev *fmdev, u8 rds_mode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns current RDS operation mode */</div><div class='del'>-u32 fm_rx_get_rds_system(struct fmdev *fmdev, u8 *rds_mode)</div><div class='add'>+int fm_rx_get_rds_system(struct fmdev *fmdev, u8 *rds_mode)</div><div class='ctx'> {</div><div class='ctx'> 	if (fmdev-&gt;curr_fmmode != FM_MODE_RX)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -800,10 +802,10 @@ u32 fm_rx_get_rds_system(struct fmdev *fmdev, u8 *rds_mode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Configures Alternate Frequency switch mode */</div><div class='del'>-u32 fm_rx_set_af_switch(struct fmdev *fmdev, u8 af_mode)</div><div class='add'>+int fm_rx_set_af_switch(struct fmdev *fmdev, u8 af_mode)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (fmdev-&gt;curr_fmmode != FM_MODE_RX)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -831,7 +833,7 @@ u32 fm_rx_set_af_switch(struct fmdev *fmdev, u8 af_mode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns Alternate Frequency switch status */</div><div class='del'>-u32 fm_rx_get_af_switch(struct fmdev *fmdev, u8 *af_mode)</div><div class='add'>+int fm_rx_get_af_switch(struct fmdev *fmdev, u8 *af_mode)</div><div class='ctx'> {</div><div class='ctx'> 	if (fmdev-&gt;curr_fmmode != FM_MODE_RX)</div><div class='ctx'> 		return -EPERM;</div><div class='head'>diff --git a/drivers/media/radio/wl128x/fmdrv_rx.h b/drivers/media/radio/wl128x/fmdrv_rx.h<br/>index 329e62f6be76..32add81f8d87 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/wl128x/fmdrv_rx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/wl128x/fmdrv_rx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/wl128x/fmdrv_rx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/radio/wl128x/fmdrv_rx.h</a></div><div class='hunk'>@@ -22,38 +22,38 @@</div><div class='ctx'> #ifndef _FMDRV_RX_H</div><div class='ctx'> #define _FMDRV_RX_H</div><div class='ctx'> </div><div class='del'>-u32 fm_rx_set_freq(struct fmdev *, u32);</div><div class='del'>-u32 fm_rx_set_mute_mode(struct fmdev *, u8);</div><div class='del'>-u32 fm_rx_set_stereo_mono(struct fmdev *, u16);</div><div class='del'>-u32 fm_rx_set_rds_mode(struct fmdev *, u8);</div><div class='del'>-u32 fm_rx_set_rds_system(struct fmdev *, u8);</div><div class='del'>-u32 fm_rx_set_volume(struct fmdev *, u16);</div><div class='del'>-u32 fm_rx_set_rssi_threshold(struct fmdev *, short);</div><div class='del'>-u32 fm_rx_set_region(struct fmdev *, u8);</div><div class='del'>-u32 fm_rx_set_rfdepend_softmute(struct fmdev *, u8);</div><div class='del'>-u32 fm_rx_set_deemphasis_mode(struct fmdev *, u16);</div><div class='del'>-u32 fm_rx_set_af_switch(struct fmdev *, u8);</div><div class='add'>+int fm_rx_set_freq(struct fmdev *, u32);</div><div class='add'>+int fm_rx_set_mute_mode(struct fmdev *, u8);</div><div class='add'>+int fm_rx_set_stereo_mono(struct fmdev *, u16);</div><div class='add'>+int fm_rx_set_rds_mode(struct fmdev *, u8);</div><div class='add'>+int fm_rx_set_rds_system(struct fmdev *, u8);</div><div class='add'>+int fm_rx_set_volume(struct fmdev *, u16);</div><div class='add'>+int fm_rx_set_rssi_threshold(struct fmdev *, short);</div><div class='add'>+int fm_rx_set_region(struct fmdev *, u8);</div><div class='add'>+int fm_rx_set_rfdepend_softmute(struct fmdev *, u8);</div><div class='add'>+int fm_rx_set_deemphasis_mode(struct fmdev *, u16);</div><div class='add'>+int fm_rx_set_af_switch(struct fmdev *, u8);</div><div class='ctx'> </div><div class='ctx'> void fm_rx_reset_rds_cache(struct fmdev *);</div><div class='ctx'> void fm_rx_reset_station_info(struct fmdev *);</div><div class='ctx'> </div><div class='del'>-u32 fm_rx_seek(struct fmdev *, u32, u32, u32);</div><div class='add'>+int fm_rx_seek(struct fmdev *, u32, u32, u32);</div><div class='ctx'> </div><div class='del'>-u32 fm_rx_get_rds_mode(struct fmdev *, u8 *);</div><div class='del'>-u32 fm_rx_get_rds_system(struct fmdev *, u8 *);</div><div class='del'>-u32 fm_rx_get_mute_mode(struct fmdev *, u8 *);</div><div class='del'>-u32 fm_rx_get_volume(struct fmdev *, u16 *);</div><div class='del'>-u32 fm_rx_get_band_freq_range(struct fmdev *,</div><div class='add'>+int fm_rx_get_rds_mode(struct fmdev *, u8 *);</div><div class='add'>+int fm_rx_get_rds_system(struct fmdev *, u8 *);</div><div class='add'>+int fm_rx_get_mute_mode(struct fmdev *, u8 *);</div><div class='add'>+int fm_rx_get_volume(struct fmdev *, u16 *);</div><div class='add'>+int fm_rx_get_band_freq_range(struct fmdev *,</div><div class='ctx'> 					u32 *, u32 *);</div><div class='del'>-u32 fm_rx_get_stereo_mono(struct fmdev *, u16 *);</div><div class='del'>-u32 fm_rx_get_rssi_level(struct fmdev *, u16 *);</div><div class='del'>-u32 fm_rx_get_rssi_threshold(struct fmdev *, short *);</div><div class='del'>-u32 fm_rx_get_rfdepend_softmute(struct fmdev *, u8 *);</div><div class='del'>-u32 fm_rx_get_deemph_mode(struct fmdev *, u16 *);</div><div class='del'>-u32 fm_rx_get_af_switch(struct fmdev *, u8 *);</div><div class='add'>+int fm_rx_get_stereo_mono(struct fmdev *, u16 *);</div><div class='add'>+int fm_rx_get_rssi_level(struct fmdev *, u16 *);</div><div class='add'>+int fm_rx_get_rssi_threshold(struct fmdev *, short *);</div><div class='add'>+int fm_rx_get_rfdepend_softmute(struct fmdev *, u8 *);</div><div class='add'>+int fm_rx_get_deemph_mode(struct fmdev *, u16 *);</div><div class='add'>+int fm_rx_get_af_switch(struct fmdev *, u8 *);</div><div class='ctx'> void fm_rx_get_region(struct fmdev *, u8 *);</div><div class='ctx'> </div><div class='del'>-u32 fm_rx_set_chanl_spacing(struct fmdev *, u8);</div><div class='del'>-u32 fm_rx_get_chanl_spacing(struct fmdev *, u8 *);</div><div class='add'>+int fm_rx_set_chanl_spacing(struct fmdev *, u8);</div><div class='add'>+int fm_rx_get_chanl_spacing(struct fmdev *, u8 *);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/radio/wl128x/fmdrv_tx.c b/drivers/media/radio/wl128x/fmdrv_tx.c<br/>index be54068b56a8..6ea33e09d63b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/wl128x/fmdrv_tx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/wl128x/fmdrv_tx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/wl128x/fmdrv_tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/radio/wl128x/fmdrv_tx.c</a></div><div class='hunk'>@@ -24,10 +24,10 @@</div><div class='ctx'> #include "fmdrv_common.h"</div><div class='ctx'> #include "fmdrv_tx.h"</div><div class='ctx'> </div><div class='del'>-u32 fm_tx_set_stereo_mono(struct fmdev *fmdev, u16 mode)</div><div class='add'>+int fm_tx_set_stereo_mono(struct fmdev *fmdev, u16 mode)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (fmdev-&gt;tx_data.aud_mode == mode)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -46,10 +46,10 @@ u32 fm_tx_set_stereo_mono(struct fmdev *fmdev, u16 mode)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 set_rds_text(struct fmdev *fmdev, u8 *rds_text)</div><div class='add'>+static int set_rds_text(struct fmdev *fmdev, u8 *rds_text)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = fmc_send_cmd(fmdev, RDS_DATA_SET, REG_WR, rds_text,</div><div class='ctx'> 			strlen(rds_text), NULL, NULL);</div><div class='hunk'>@@ -66,10 +66,10 @@ static u32 set_rds_text(struct fmdev *fmdev, u8 *rds_text)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 set_rds_data_mode(struct fmdev *fmdev, u8 mode)</div><div class='add'>+static int set_rds_data_mode(struct fmdev *fmdev, u8 mode)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Setting unique PI TODO: how unique? */</div><div class='ctx'> 	payload = (u16)0xcafe;</div><div class='hunk'>@@ -89,10 +89,10 @@ static u32 set_rds_data_mode(struct fmdev *fmdev, u8 mode)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 set_rds_len(struct fmdev *fmdev, u8 type, u16 len)</div><div class='add'>+static int set_rds_len(struct fmdev *fmdev, u8 type, u16 len)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	len |= type &lt;&lt; 8;</div><div class='ctx'> 	payload = len;</div><div class='hunk'>@@ -105,10 +105,10 @@ static u32 set_rds_len(struct fmdev *fmdev, u8 type, u16 len)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 fm_tx_set_rds_mode(struct fmdev *fmdev, u8 rds_en_dis)</div><div class='add'>+int fm_tx_set_rds_mode(struct fmdev *fmdev, u8 rds_en_dis)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> 	u8 rds_text[] = "Zoom2\n";</div><div class='ctx'> </div><div class='ctx'> 	fmdbg("rds_en_dis:%d(E:%d, D:%d)\n", rds_en_dis,</div><div class='hunk'>@@ -148,10 +148,10 @@ u32 fm_tx_set_rds_mode(struct fmdev *fmdev, u8 rds_en_dis)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 fm_tx_set_radio_text(struct fmdev *fmdev, u8 *rds_text, u8 rds_type)</div><div class='add'>+int fm_tx_set_radio_text(struct fmdev *fmdev, u8 *rds_text, u8 rds_type)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (fmdev-&gt;curr_fmmode != FM_MODE_TX)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -176,10 +176,10 @@ u32 fm_tx_set_radio_text(struct fmdev *fmdev, u8 *rds_text, u8 rds_type)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 fm_tx_set_af(struct fmdev *fmdev, u32 af)</div><div class='add'>+int fm_tx_set_af(struct fmdev *fmdev, u32 af)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (fmdev-&gt;curr_fmmode != FM_MODE_TX)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -196,10 +196,10 @@ u32 fm_tx_set_af(struct fmdev *fmdev, u32 af)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 fm_tx_set_region(struct fmdev *fmdev, u8 region)</div><div class='add'>+int fm_tx_set_region(struct fmdev *fmdev, u8 region)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (region != FM_BAND_EUROPE_US &amp;&amp; region != FM_BAND_JAPAN) {</div><div class='ctx'> 		fmerr("Invalid band\n");</div><div class='hunk'>@@ -216,10 +216,10 @@ u32 fm_tx_set_region(struct fmdev *fmdev, u8 region)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 fm_tx_set_mute_mode(struct fmdev *fmdev, u8 mute_mode_toset)</div><div class='add'>+int fm_tx_set_mute_mode(struct fmdev *fmdev, u8 mute_mode_toset)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	fmdbg("tx: mute mode %d\n", mute_mode_toset);</div><div class='ctx'> </div><div class='hunk'>@@ -233,11 +233,11 @@ u32 fm_tx_set_mute_mode(struct fmdev *fmdev, u8 mute_mode_toset)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set TX Audio I/O */</div><div class='del'>-static u32 set_audio_io(struct fmdev *fmdev)</div><div class='add'>+static int set_audio_io(struct fmdev *fmdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fmtx_data *tx = &amp;fmdev-&gt;tx_data;</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Set Audio I/O Enable */</div><div class='ctx'> 	payload = tx-&gt;audio_io;</div><div class='hunk'>@@ -251,12 +251,12 @@ static u32 set_audio_io(struct fmdev *fmdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Start TX Transmission */</div><div class='del'>-static u32 enable_xmit(struct fmdev *fmdev, u8 new_xmit_state)</div><div class='add'>+static int enable_xmit(struct fmdev *fmdev, u8 new_xmit_state)</div><div class='ctx'> {</div><div class='ctx'> 	struct fmtx_data *tx = &amp;fmdev-&gt;tx_data;</div><div class='ctx'> 	unsigned long timeleft;</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Enable POWER_ENB interrupts */</div><div class='ctx'> 	payload = FM_POW_ENB_EVENT;</div><div class='hunk'>@@ -289,11 +289,11 @@ static u32 enable_xmit(struct fmdev *fmdev, u8 new_xmit_state)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set TX power level */</div><div class='del'>-u32 fm_tx_set_pwr_lvl(struct fmdev *fmdev, u8 new_pwr_lvl)</div><div class='add'>+int fm_tx_set_pwr_lvl(struct fmdev *fmdev, u8 new_pwr_lvl)</div><div class='ctx'> {</div><div class='ctx'> 	u16 payload;</div><div class='ctx'> 	struct fmtx_data *tx = &amp;fmdev-&gt;tx_data;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (fmdev-&gt;curr_fmmode != FM_MODE_TX)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -328,11 +328,11 @@ u32 fm_tx_set_pwr_lvl(struct fmdev *fmdev, u8 new_pwr_lvl)</div><div class='ctx'>  * Sets FM TX pre-emphasis filter value (OFF, 50us, or 75us)</div><div class='ctx'>  * Convert V4L2 specified filter values to chip specific filter values.</div><div class='ctx'>  */</div><div class='del'>-u32 fm_tx_set_preemph_filter(struct fmdev *fmdev, u32 preemphasis)</div><div class='add'>+int fm_tx_set_preemph_filter(struct fmdev *fmdev, u32 preemphasis)</div><div class='ctx'> {</div><div class='ctx'> 	struct fmtx_data *tx = &amp;fmdev-&gt;tx_data;</div><div class='ctx'> 	u16 payload;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (fmdev-&gt;curr_fmmode != FM_MODE_TX)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -360,10 +360,11 @@ u32 fm_tx_set_preemph_filter(struct fmdev *fmdev, u32 preemphasis)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Get the TX tuning capacitor value.*/</div><div class='del'>-u32 fm_tx_get_tune_cap_val(struct fmdev *fmdev)</div><div class='add'>+int fm_tx_get_tune_cap_val(struct fmdev *fmdev)</div><div class='ctx'> {</div><div class='ctx'> 	u16 curr_val;</div><div class='del'>-	u32 ret, resp_len;</div><div class='add'>+	u32 resp_len;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (fmdev-&gt;curr_fmmode != FM_MODE_TX)</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -379,11 +380,11 @@ u32 fm_tx_get_tune_cap_val(struct fmdev *fmdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set TX Frequency */</div><div class='del'>-u32 fm_tx_set_freq(struct fmdev *fmdev, u32 freq_to_set)</div><div class='add'>+int fm_tx_set_freq(struct fmdev *fmdev, u32 freq_to_set)</div><div class='ctx'> {</div><div class='ctx'> 	struct fmtx_data *tx = &amp;fmdev-&gt;tx_data;</div><div class='ctx'> 	u16 payload, chanl_index;</div><div class='del'>-	u32 ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(FM_CORE_TX_XMITING, &amp;fmdev-&gt;flag)) {</div><div class='ctx'> 		enable_xmit(fmdev, 0);</div><div class='head'>diff --git a/drivers/media/radio/wl128x/fmdrv_tx.h b/drivers/media/radio/wl128x/fmdrv_tx.h<br/>index e393a2bdd49e..11ae2e4c2d03 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/wl128x/fmdrv_tx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/wl128x/fmdrv_tx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/wl128x/fmdrv_tx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/radio/wl128x/fmdrv_tx.h</a></div><div class='hunk'>@@ -22,16 +22,16 @@</div><div class='ctx'> #ifndef _FMDRV_TX_H</div><div class='ctx'> #define _FMDRV_TX_H</div><div class='ctx'> </div><div class='del'>-u32 fm_tx_set_freq(struct fmdev *, u32);</div><div class='del'>-u32 fm_tx_set_pwr_lvl(struct fmdev *, u8);</div><div class='del'>-u32 fm_tx_set_region(struct fmdev *, u8);</div><div class='del'>-u32 fm_tx_set_mute_mode(struct fmdev *, u8);</div><div class='del'>-u32 fm_tx_set_stereo_mono(struct fmdev *, u16);</div><div class='del'>-u32 fm_tx_set_rds_mode(struct fmdev *, u8);</div><div class='del'>-u32 fm_tx_set_radio_text(struct fmdev *, u8 *, u8);</div><div class='del'>-u32 fm_tx_set_af(struct fmdev *, u32);</div><div class='del'>-u32 fm_tx_set_preemph_filter(struct fmdev *, u32);</div><div class='del'>-u32 fm_tx_get_tune_cap_val(struct fmdev *);</div><div class='add'>+int fm_tx_set_freq(struct fmdev *, u32);</div><div class='add'>+int fm_tx_set_pwr_lvl(struct fmdev *, u8);</div><div class='add'>+int fm_tx_set_region(struct fmdev *, u8);</div><div class='add'>+int fm_tx_set_mute_mode(struct fmdev *, u8);</div><div class='add'>+int fm_tx_set_stereo_mono(struct fmdev *, u16);</div><div class='add'>+int fm_tx_set_rds_mode(struct fmdev *, u8);</div><div class='add'>+int fm_tx_set_radio_text(struct fmdev *, u8 *, u8);</div><div class='add'>+int fm_tx_set_af(struct fmdev *, u32);</div><div class='add'>+int fm_tx_set_preemph_filter(struct fmdev *, u32);</div><div class='add'>+int fm_tx_get_tune_cap_val(struct fmdev *);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.c b/drivers/media/radio/wl128x/fmdrv_v4l2.c<br/>index 4f5c43d2566c..077d369a0173 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/wl128x/fmdrv_v4l2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/radio/wl128x/fmdrv_v4l2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/wl128x/fmdrv_v4l2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/radio/wl128x/fmdrv_v4l2.c</a></div><div class='hunk'>@@ -84,6 +84,7 @@ static ssize_t fm_v4l2_fops_write(struct file *file, const char __user * buf,</div><div class='ctx'> 	struct fmdev *fmdev;</div><div class='ctx'> </div><div class='ctx'> 	ret = copy_from_user(&amp;rds, buf, sizeof(rds));</div><div class='add'>+	rds.text[sizeof(rds.text) - 1] = '\0';</div><div class='ctx'> 	fmdbg("(%d)type: %d, text %s, af %d\n",</div><div class='ctx'> 		   ret, rds.text_type, rds.text, rds.af_freq);</div><div class='ctx'> 	if (ret)</div><div class='head'>diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig<br/>index aeb7f43dfb65..4df4affeea5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/rc/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/Kconfig</a></div><div class='hunk'>@@ -87,6 +87,16 @@ config IR_RC5_SZ_DECODER</div><div class='ctx'> 	   uses an IR protocol that is almost standard RC-5, but not quite,</div><div class='ctx'> 	   as it uses an additional bit).</div><div class='ctx'> </div><div class='add'>+config IR_SANYO_DECODER</div><div class='add'>+	tristate "Enable IR raw decoder for the Sanyo protocol"</div><div class='add'>+	depends on RC_CORE</div><div class='add'>+	default y</div><div class='add'>+</div><div class='add'>+	---help---</div><div class='add'>+	   Enable this option if you have an infrared remote control which</div><div class='add'>+	   uses the Sanyo protocol (Sanyo, Aiwa, Chinon remotes),</div><div class='add'>+	   and you need software decoding support.</div><div class='add'>+</div><div class='ctx'> config IR_MCE_KBD_DECODER</div><div class='ctx'> 	tristate "Enable IR raw decoder for the MCE keyboard/mouse protocol"</div><div class='ctx'> 	depends on RC_CORE</div><div class='head'>diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile<br/>index 2156e786b557..fb3dee2dd845 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/rc/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/Makefile</a></div><div class='hunk'>@@ -10,6 +10,7 @@ obj-$(CONFIG_IR_RC6_DECODER) += ir-rc6-decoder.o</div><div class='ctx'> obj-$(CONFIG_IR_JVC_DECODER) += ir-jvc-decoder.o</div><div class='ctx'> obj-$(CONFIG_IR_SONY_DECODER) += ir-sony-decoder.o</div><div class='ctx'> obj-$(CONFIG_IR_RC5_SZ_DECODER) += ir-rc5-sz-decoder.o</div><div class='add'>+obj-$(CONFIG_IR_SANYO_DECODER) += ir-sanyo-decoder.o</div><div class='ctx'> obj-$(CONFIG_IR_MCE_KBD_DECODER) += ir-mce_kbd-decoder.o</div><div class='ctx'> obj-$(CONFIG_IR_LIRC_CODEC) += ir-lirc-codec.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/rc/ati_remote.c b/drivers/media/rc/ati_remote.c<br/>index 01bb8daf4b09..baf907b3ce76 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/rc/ati_remote.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/ati_remote.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/ati_remote.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/ati_remote.c</a></div><div class='hunk'>@@ -899,38 +899,7 @@ static void ati_remote_disconnect(struct usb_interface *interface)</div><div class='ctx'> 	kfree(ati_remote);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	ati_remote_init</div><div class='del'>- */</div><div class='del'>-static int __init ati_remote_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	result = usb_register(&amp;ati_remote_driver);</div><div class='del'>-	if (result)</div><div class='del'>-		printk(KERN_ERR KBUILD_MODNAME</div><div class='del'>-		       ": usb_register error #%d\n", result);</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='del'>-		       DRIVER_DESC "\n");</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	ati_remote_exit</div><div class='del'>- */</div><div class='del'>-static void __exit ati_remote_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;ati_remote_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	module specification</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-module_init(ati_remote_init);</div><div class='del'>-module_exit(ati_remote_exit);</div><div class='add'>+module_usb_driver(ati_remote_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='head'>diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c<br/>index cf10ecf5acec..860c112e0fd2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/rc/ene_ir.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/ene_ir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/ene_ir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/ene_ir.c</a></div><div class='hunk'>@@ -324,7 +324,7 @@ static int ene_rx_get_sample_reg(struct ene_device *dev)</div><div class='ctx'> 		return dev-&gt;extra_buf2_address + r_pointer;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dbg("attempt to read beyong ring bufer end");</div><div class='add'>+	dbg("attempt to read beyond ring buffer end");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/rc/ene_ir.h b/drivers/media/rc/ene_ir.h<br/>index fd108d90f750..6f978e85db8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/rc/ene_ir.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/ene_ir.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/ene_ir.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/ene_ir.h</a></div><div class='hunk'>@@ -227,7 +227,7 @@ struct ene_device {</div><div class='ctx'> </div><div class='ctx'> 	/* TX buffer */</div><div class='ctx'> 	unsigned *tx_buffer;			/* input samples buffer*/</div><div class='del'>-	int tx_pos;				/* position in that bufer */</div><div class='add'>+	int tx_pos;				/* position in that buffer */</div><div class='ctx'> 	int tx_len;				/* current len of tx buffer */</div><div class='ctx'> 	int tx_done;				/* done transmitting */</div><div class='ctx'> 						/* one more sample pending*/</div><div class='head'>diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c<br/>index 6ed96465137a..3aeb29a7ce11 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/rc/imon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/imon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/imon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/imon.c</a></div><div class='hunk'>@@ -2458,23 +2458,4 @@ static int imon_resume(struct usb_interface *intf)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init imon_init(void)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	rc = usb_register(&amp;imon_driver);</div><div class='del'>-	if (rc) {</div><div class='del'>-		pr_err("usb register failed(%d)\n", rc);</div><div class='del'>-		rc = -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit imon_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;imon_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(imon_init);</div><div class='del'>-module_exit(imon_exit);</div><div class='add'>+module_usb_driver(imon_driver);</div><div class='head'>diff --git a/drivers/media/rc/ir-nec-decoder.c b/drivers/media/rc/ir-nec-decoder.c<br/>index 17f8db00435a..3c9431a9f62d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/rc/ir-nec-decoder.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/ir-nec-decoder.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/ir-nec-decoder.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/ir-nec-decoder.c</a></div><div class='hunk'>@@ -194,8 +194,8 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	IR_dprintk(1, "NEC decode failed at state %d (%uus %s)\n",</div><div class='del'>-		   data-&gt;state, TO_US(ev.duration), TO_STR(ev.pulse));</div><div class='add'>+	IR_dprintk(1, "NEC decode failed at count %d state %d (%uus %s)\n",</div><div class='add'>+		   data-&gt;count, data-&gt;state, TO_US(ev.duration), TO_STR(ev.pulse));</div><div class='ctx'> 	data-&gt;state = STATE_INACTIVE;</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c<br/>index 2e5cd3100b64..95e630998aaf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/rc/ir-raw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/ir-raw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/ir-raw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/ir-raw.c</a></div><div class='hunk'>@@ -357,6 +357,7 @@ static void init_decoders(struct work_struct *work)</div><div class='ctx'> 	load_rc6_decode();</div><div class='ctx'> 	load_jvc_decode();</div><div class='ctx'> 	load_sony_decode();</div><div class='add'>+	load_sanyo_decode();</div><div class='ctx'> 	load_mce_kbd_decode();</div><div class='ctx'> 	load_lirc_codec();</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c<br/>index 140fb67e2f89..4cfdd7fa4bbd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/rc/ir-rc6-decoder.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/ir-rc6-decoder.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/ir-rc6-decoder.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/ir-rc6-decoder.c</a></div><div class='hunk'>@@ -18,24 +18,31 @@</div><div class='ctx'> /*</div><div class='ctx'>  * This decoder currently supports:</div><div class='ctx'>  * RC6-0-16	(standard toggle bit in header)</div><div class='add'>+ * RC6-6A-20	(no toggle bit)</div><div class='ctx'>  * RC6-6A-24	(no toggle bit)</div><div class='ctx'>  * RC6-6A-32	(MCE version with toggle bit in body)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define RC6_UNIT		444444	/* us */</div><div class='add'>+#define RC6_UNIT		444444	/* nanosecs */</div><div class='ctx'> #define RC6_HEADER_NBITS	4	/* not including toggle bit */</div><div class='ctx'> #define RC6_0_NBITS		16</div><div class='del'>-#define RC6_6A_SMALL_NBITS	24</div><div class='del'>-#define RC6_6A_LARGE_NBITS	32</div><div class='add'>+#define RC6_6A_32_NBITS		32</div><div class='add'>+#define RC6_6A_NBITS		128	/* Variable 8..128 */</div><div class='ctx'> #define RC6_PREFIX_PULSE	(6 * RC6_UNIT)</div><div class='ctx'> #define RC6_PREFIX_SPACE	(2 * RC6_UNIT)</div><div class='ctx'> #define RC6_BIT_START		(1 * RC6_UNIT)</div><div class='ctx'> #define RC6_BIT_END		(1 * RC6_UNIT)</div><div class='ctx'> #define RC6_TOGGLE_START	(2 * RC6_UNIT)</div><div class='ctx'> #define RC6_TOGGLE_END		(2 * RC6_UNIT)</div><div class='add'>+#define RC6_SUFFIX_SPACE	(6 * RC6_UNIT)</div><div class='ctx'> #define RC6_MODE_MASK		0x07	/* for the header bits */</div><div class='ctx'> #define RC6_STARTBIT_MASK	0x08	/* for the header bits */</div><div class='ctx'> #define RC6_6A_MCE_TOGGLE_MASK	0x8000	/* for the body bits */</div><div class='add'>+#define RC6_6A_LCC_MASK		0xffff0000 /* RC6-6A-32 long customer code mask */</div><div class='add'>+#define RC6_6A_MCE_CC		0x800f0000 /* MCE customer code */</div><div class='add'>+#ifndef CHAR_BIT</div><div class='add'>+#define CHAR_BIT 8	/* Normally in &lt;limits.h&gt; */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> enum rc6_mode {</div><div class='ctx'> 	RC6_MODE_0,</div><div class='hunk'>@@ -125,6 +132,7 @@ again:</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		data-&gt;state = STATE_HEADER_BIT_START;</div><div class='add'>+		data-&gt;header = 0;</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case STATE_HEADER_BIT_START:</div><div class='hunk'>@@ -171,20 +179,14 @@ again:</div><div class='ctx'> 		data-&gt;state = STATE_BODY_BIT_START;</div><div class='ctx'> 		decrease_duration(&amp;ev, RC6_TOGGLE_END);</div><div class='ctx'> 		data-&gt;count = 0;</div><div class='add'>+		data-&gt;body = 0;</div><div class='ctx'> </div><div class='ctx'> 		switch (rc6_mode(data)) {</div><div class='ctx'> 		case RC6_MODE_0:</div><div class='ctx'> 			data-&gt;wanted_bits = RC6_0_NBITS;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case RC6_MODE_6A:</div><div class='del'>-			/* This might look weird, but we basically</div><div class='del'>-			   check the value of the first body bit to</div><div class='del'>-			   determine the number of bits in mode 6A */</div><div class='del'>-			if ((!ev.pulse &amp;&amp; !geq_margin(ev.duration, RC6_UNIT, RC6_UNIT / 2)) ||</div><div class='del'>-			    geq_margin(ev.duration, RC6_UNIT, RC6_UNIT / 2))</div><div class='del'>-				data-&gt;wanted_bits = RC6_6A_LARGE_NBITS;</div><div class='del'>-			else</div><div class='del'>-				data-&gt;wanted_bits = RC6_6A_SMALL_NBITS;</div><div class='add'>+			data-&gt;wanted_bits = RC6_6A_NBITS;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			IR_dprintk(1, "RC6 unknown mode\n");</div><div class='hunk'>@@ -193,15 +195,21 @@ again:</div><div class='ctx'> 		goto again;</div><div class='ctx'> </div><div class='ctx'> 	case STATE_BODY_BIT_START:</div><div class='del'>-		if (!eq_margin(ev.duration, RC6_BIT_START, RC6_UNIT / 2))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		data-&gt;body &lt;&lt;= 1;</div><div class='del'>-		if (ev.pulse)</div><div class='del'>-			data-&gt;body |= 1;</div><div class='del'>-		data-&gt;count++;</div><div class='del'>-		data-&gt;state = STATE_BODY_BIT_END;</div><div class='del'>-		return 0;</div><div class='add'>+		if (eq_margin(ev.duration, RC6_BIT_START, RC6_UNIT / 2)) {</div><div class='add'>+			/* Discard LSB's that won't fit in data-&gt;body */</div><div class='add'>+			if (data-&gt;count++ &lt; CHAR_BIT * sizeof data-&gt;body) {</div><div class='add'>+				data-&gt;body &lt;&lt;= 1;</div><div class='add'>+				if (ev.pulse)</div><div class='add'>+					data-&gt;body |= 1;</div><div class='add'>+			}</div><div class='add'>+			data-&gt;state = STATE_BODY_BIT_END;</div><div class='add'>+			return 0;</div><div class='add'>+		} else if (RC6_MODE_6A == rc6_mode(data) &amp;&amp; !ev.pulse &amp;&amp;</div><div class='add'>+				geq_margin(ev.duration, RC6_SUFFIX_SPACE, RC6_UNIT / 2)) {</div><div class='add'>+			data-&gt;state = STATE_FINISHED;</div><div class='add'>+			goto again;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='ctx'> 	case STATE_BODY_BIT_END:</div><div class='ctx'> 		if (!is_transition(&amp;ev, &amp;dev-&gt;raw-&gt;prev_ev))</div><div class='hunk'>@@ -221,20 +229,27 @@ again:</div><div class='ctx'> </div><div class='ctx'> 		switch (rc6_mode(data)) {</div><div class='ctx'> 		case RC6_MODE_0:</div><div class='del'>-			scancode = data-&gt;body &amp; 0xffff;</div><div class='add'>+			scancode = data-&gt;body;</div><div class='ctx'> 			toggle = data-&gt;toggle;</div><div class='ctx'> 			IR_dprintk(1, "RC6(0) scancode 0x%04x (toggle: %u)\n",</div><div class='ctx'> 				   scancode, toggle);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case RC6_MODE_6A:</div><div class='del'>-			if (data-&gt;wanted_bits == RC6_6A_LARGE_NBITS) {</div><div class='del'>-				toggle = data-&gt;body &amp; RC6_6A_MCE_TOGGLE_MASK ? 1 : 0;</div><div class='del'>-				scancode = data-&gt;body &amp; ~RC6_6A_MCE_TOGGLE_MASK;</div><div class='add'>+			if (data-&gt;count &gt; CHAR_BIT * sizeof data-&gt;body) {</div><div class='add'>+				IR_dprintk(1, "RC6 too many (%u) data bits\n",</div><div class='add'>+					data-&gt;count);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			scancode = data-&gt;body;</div><div class='add'>+			if (data-&gt;count == RC6_6A_32_NBITS &amp;&amp;</div><div class='add'>+					(scancode &amp; RC6_6A_LCC_MASK) == RC6_6A_MCE_CC) {</div><div class='add'>+				/* MCE RC */</div><div class='add'>+				toggle = (scancode &amp; RC6_6A_MCE_TOGGLE_MASK) ? 1 : 0;</div><div class='add'>+				scancode &amp;= ~RC6_6A_MCE_TOGGLE_MASK;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				toggle = 0;</div><div class='del'>-				scancode = data-&gt;body &amp; 0xffffff;</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='ctx'> 			IR_dprintk(1, "RC6(6A) scancode 0x%08x (toggle: %u)\n",</div><div class='ctx'> 				   scancode, toggle);</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/drivers/media/rc/ir-sanyo-decoder.c b/drivers/media/rc/ir-sanyo-decoder.c<br/>new file mode 100644<br/>index 000000000000..d38fbdd0b25a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/ir-sanyo-decoder.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/ir-sanyo-decoder.c</a></div><div class='hunk'>@@ -0,0 +1,205 @@</div><div class='add'>+/* ir-sanyo-decoder.c - handle SANYO IR Pulse/Space protocol</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 by Mauro Carvalho Chehab &lt;mchehab@redhat.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 version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * This protocol uses the NEC protocol timings. However, data is formatted as:</div><div class='add'>+ *	13 bits Custom Code</div><div class='add'>+ *	13 bits NOT(Custom Code)</div><div class='add'>+ *	8 bits Key data</div><div class='add'>+ *	8 bits NOT(Key data)</div><div class='add'>+ *</div><div class='add'>+ * According with LIRC, this protocol is used on Sanyo, Aiwa and Chinon</div><div class='add'>+ * Information for this protocol is available at the Sanyo LC7461 datasheet.</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/bitrev.h&gt;</div><div class='add'>+#include "rc-core-priv.h"</div><div class='add'>+</div><div class='add'>+#define SANYO_NBITS		(13+13+8+8)</div><div class='add'>+#define SANYO_UNIT		562500  /* ns */</div><div class='add'>+#define SANYO_HEADER_PULSE	(16  * SANYO_UNIT)</div><div class='add'>+#define SANYO_HEADER_SPACE	(8   * SANYO_UNIT)</div><div class='add'>+#define SANYO_BIT_PULSE		(1   * SANYO_UNIT)</div><div class='add'>+#define SANYO_BIT_0_SPACE	(1   * SANYO_UNIT)</div><div class='add'>+#define SANYO_BIT_1_SPACE	(3   * SANYO_UNIT)</div><div class='add'>+#define SANYO_REPEAT_SPACE	(150 * SANYO_UNIT)</div><div class='add'>+#define	SANYO_TRAILER_PULSE	(1   * SANYO_UNIT)</div><div class='add'>+#define	SANYO_TRAILER_SPACE	(10  * SANYO_UNIT)	/* in fact, 42 */</div><div class='add'>+</div><div class='add'>+enum sanyo_state {</div><div class='add'>+	STATE_INACTIVE,</div><div class='add'>+	STATE_HEADER_SPACE,</div><div class='add'>+	STATE_BIT_PULSE,</div><div class='add'>+	STATE_BIT_SPACE,</div><div class='add'>+	STATE_TRAILER_PULSE,</div><div class='add'>+	STATE_TRAILER_SPACE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ir_sanyo_decode() - Decode one SANYO pulse or space</div><div class='add'>+ * @dev:	the struct rc_dev descriptor of the device</div><div class='add'>+ * @duration:	the struct ir_raw_event descriptor of the pulse/space</div><div class='add'>+ *</div><div class='add'>+ * This function returns -EINVAL if the pulse violates the state machine</div><div class='add'>+ */</div><div class='add'>+static int ir_sanyo_decode(struct rc_dev *dev, struct ir_raw_event ev)</div><div class='add'>+{</div><div class='add'>+	struct sanyo_dec *data = &amp;dev-&gt;raw-&gt;sanyo;</div><div class='add'>+	u32 scancode;</div><div class='add'>+	u8 address, not_address, command, not_command;</div><div class='add'>+</div><div class='add'>+	if (!(dev-&gt;raw-&gt;enabled_protocols &amp; RC_TYPE_SANYO))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!is_timing_event(ev)) {</div><div class='add'>+		if (ev.reset) {</div><div class='add'>+			IR_dprintk(1, "SANYO event reset received. reset to state 0\n");</div><div class='add'>+			data-&gt;state = STATE_INACTIVE;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IR_dprintk(2, "SANYO decode started at state %d (%uus %s)\n",</div><div class='add'>+		   data-&gt;state, TO_US(ev.duration), TO_STR(ev.pulse));</div><div class='add'>+</div><div class='add'>+	switch (data-&gt;state) {</div><div class='add'>+</div><div class='add'>+	case STATE_INACTIVE:</div><div class='add'>+		if (!ev.pulse)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (eq_margin(ev.duration, SANYO_HEADER_PULSE, SANYO_UNIT / 2)) {</div><div class='add'>+			data-&gt;count = 0;</div><div class='add'>+			data-&gt;state = STATE_HEADER_SPACE;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	case STATE_HEADER_SPACE:</div><div class='add'>+		if (ev.pulse)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (eq_margin(ev.duration, SANYO_HEADER_SPACE, SANYO_UNIT / 2)) {</div><div class='add'>+			data-&gt;state = STATE_BIT_PULSE;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case STATE_BIT_PULSE:</div><div class='add'>+		if (!ev.pulse)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!eq_margin(ev.duration, SANYO_BIT_PULSE, SANYO_UNIT / 2))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		data-&gt;state = STATE_BIT_SPACE;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case STATE_BIT_SPACE:</div><div class='add'>+		if (ev.pulse)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!data-&gt;count &amp;&amp; geq_margin(ev.duration, SANYO_REPEAT_SPACE, SANYO_UNIT / 2)) {</div><div class='add'>+			if (!dev-&gt;keypressed) {</div><div class='add'>+				IR_dprintk(1, "SANYO discarding last key repeat: event after key up\n");</div><div class='add'>+			} else {</div><div class='add'>+				rc_repeat(dev);</div><div class='add'>+				IR_dprintk(1, "SANYO repeat last key\n");</div><div class='add'>+				data-&gt;state = STATE_INACTIVE;</div><div class='add'>+			}</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		data-&gt;bits &lt;&lt;= 1;</div><div class='add'>+		if (eq_margin(ev.duration, SANYO_BIT_1_SPACE, SANYO_UNIT / 2))</div><div class='add'>+			data-&gt;bits |= 1;</div><div class='add'>+		else if (!eq_margin(ev.duration, SANYO_BIT_0_SPACE, SANYO_UNIT / 2))</div><div class='add'>+			break;</div><div class='add'>+		data-&gt;count++;</div><div class='add'>+</div><div class='add'>+		if (data-&gt;count == SANYO_NBITS)</div><div class='add'>+			data-&gt;state = STATE_TRAILER_PULSE;</div><div class='add'>+		else</div><div class='add'>+			data-&gt;state = STATE_BIT_PULSE;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case STATE_TRAILER_PULSE:</div><div class='add'>+		if (!ev.pulse)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!eq_margin(ev.duration, SANYO_TRAILER_PULSE, SANYO_UNIT / 2))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		data-&gt;state = STATE_TRAILER_SPACE;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case STATE_TRAILER_SPACE:</div><div class='add'>+		if (ev.pulse)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!geq_margin(ev.duration, SANYO_TRAILER_SPACE, SANYO_UNIT / 2))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		address     = bitrev16((data-&gt;bits &gt;&gt; 29) &amp; 0x1fff) &gt;&gt; 3;</div><div class='add'>+		not_address = bitrev16((data-&gt;bits &gt;&gt; 16) &amp; 0x1fff) &gt;&gt; 3;</div><div class='add'>+		command	    = bitrev8((data-&gt;bits &gt;&gt;  8) &amp; 0xff);</div><div class='add'>+		not_command = bitrev8((data-&gt;bits &gt;&gt;  0) &amp; 0xff);</div><div class='add'>+</div><div class='add'>+		if ((command ^ not_command) != 0xff) {</div><div class='add'>+			IR_dprintk(1, "SANYO checksum error: received 0x%08Lx\n",</div><div class='add'>+				   data-&gt;bits);</div><div class='add'>+			data-&gt;state = STATE_INACTIVE;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		scancode = address &lt;&lt; 8 | command;</div><div class='add'>+		IR_dprintk(1, "SANYO scancode: 0x%06x\n", scancode);</div><div class='add'>+		rc_keydown(dev, scancode, 0);</div><div class='add'>+		data-&gt;state = STATE_INACTIVE;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IR_dprintk(1, "SANYO decode failed at count %d state %d (%uus %s)\n",</div><div class='add'>+		   data-&gt;count, data-&gt;state, TO_US(ev.duration), TO_STR(ev.pulse));</div><div class='add'>+	data-&gt;state = STATE_INACTIVE;</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ir_raw_handler sanyo_handler = {</div><div class='add'>+	.protocols	= RC_TYPE_SANYO,</div><div class='add'>+	.decode		= ir_sanyo_decode,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ir_sanyo_decode_init(void)</div><div class='add'>+{</div><div class='add'>+	ir_raw_handler_register(&amp;sanyo_handler);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "IR SANYO protocol handler initialized\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit ir_sanyo_decode_exit(void)</div><div class='add'>+{</div><div class='add'>+	ir_raw_handler_unregister(&amp;sanyo_handler);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ir_sanyo_decode_init);</div><div class='add'>+module_exit(ir_sanyo_decode_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Mauro Carvalho Chehab &lt;mchehab@redhat.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)");</div><div class='add'>+MODULE_DESCRIPTION("SANYO IR protocol decoder");</div><div class='head'>diff --git a/drivers/media/rc/keymaps/rc-hauppauge.c b/drivers/media/rc/keymaps/rc-hauppauge.c<br/>index e51c6163378b..929bbbc16393 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/rc/keymaps/rc-hauppauge.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/keymaps/rc-hauppauge.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/keymaps/rc-hauppauge.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/keymaps/rc-hauppauge.c</a></div><div class='hunk'>@@ -183,6 +183,57 @@ static struct rc_map_table rc5_hauppauge_new[] = {</div><div class='ctx'> 	{ 0x1d3f, KEY_HOME },</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Keycodes for PT# R-005 remote bundled with Haupauge HVR-930C</div><div class='add'>+	 * Keycodes start with address = 0x1c</div><div class='add'>+	 */</div><div class='add'>+	{ 0x1c3b, KEY_GOTO },</div><div class='add'>+	{ 0x1c3d, KEY_POWER },</div><div class='add'>+</div><div class='add'>+	{ 0x1c14, KEY_UP },</div><div class='add'>+	{ 0x1c15, KEY_DOWN },</div><div class='add'>+	{ 0x1c16, KEY_LEFT },</div><div class='add'>+	{ 0x1c17, KEY_RIGHT },</div><div class='add'>+	{ 0x1c25, KEY_OK },</div><div class='add'>+</div><div class='add'>+	{ 0x1c00, KEY_0 },</div><div class='add'>+	{ 0x1c01, KEY_1 },</div><div class='add'>+	{ 0x1c02, KEY_2 },</div><div class='add'>+	{ 0x1c03, KEY_3 },</div><div class='add'>+	{ 0x1c04, KEY_4 },</div><div class='add'>+	{ 0x1c05, KEY_5 },</div><div class='add'>+	{ 0x1c06, KEY_6 },</div><div class='add'>+	{ 0x1c07, KEY_7 },</div><div class='add'>+	{ 0x1c08, KEY_8 },</div><div class='add'>+	{ 0x1c09, KEY_9 },</div><div class='add'>+</div><div class='add'>+	{ 0x1c1f, KEY_EXIT },	/* BACK */</div><div class='add'>+	{ 0x1c0d, KEY_MENU },</div><div class='add'>+	{ 0x1c1c, KEY_TV },</div><div class='add'>+</div><div class='add'>+	{ 0x1c10, KEY_VOLUMEUP },</div><div class='add'>+	{ 0x1c11, KEY_VOLUMEDOWN },</div><div class='add'>+</div><div class='add'>+	{ 0x1c20, KEY_CHANNELUP },</div><div class='add'>+	{ 0x1c21, KEY_CHANNELDOWN },</div><div class='add'>+</div><div class='add'>+	{ 0x1c0f, KEY_MUTE },</div><div class='add'>+	{ 0x1c12, KEY_PREVIOUS }, /* Prev */</div><div class='add'>+</div><div class='add'>+	{ 0x1c36, KEY_STOP },</div><div class='add'>+	{ 0x1c37, KEY_RECORD },</div><div class='add'>+</div><div class='add'>+	{ 0x1c24, KEY_LAST },           /* &lt;|             */</div><div class='add'>+	{ 0x1c1e, KEY_NEXT },           /* &gt;|             */</div><div class='add'>+</div><div class='add'>+	{ 0x1c0a, KEY_TEXT },</div><div class='add'>+	{ 0x1c0e, KEY_SUBTITLE },	/* CC */</div><div class='add'>+</div><div class='add'>+	{ 0x1c32, KEY_REWIND },</div><div class='add'>+	{ 0x1c30, KEY_PAUSE },</div><div class='add'>+	{ 0x1c35, KEY_PLAY },</div><div class='add'>+	{ 0x1c34, KEY_FASTFORWARD },</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Keycodes for the old Black Remote Controller</div><div class='ctx'> 	 * This one also uses RC-5 protocol</div><div class='ctx'> 	 * Keycodes start with address = 0x00</div><div class='head'>diff --git a/drivers/media/rc/keymaps/rc-videomate-m1f.c b/drivers/media/rc/keymaps/rc-videomate-m1f.c<br/>index 3bd1de1f585c..23ee05e53949 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/rc/keymaps/rc-videomate-m1f.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/keymaps/rc-videomate-m1f.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/keymaps/rc-videomate-m1f.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/keymaps/rc-videomate-m1f.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* videomate-m1f.h - Keytable for videomate_m1f Remote Controller</div><div class='add'>+/* videomate-k100.h - Keytable for videomate_k100 Remote Controller</div><div class='ctx'>  *</div><div class='ctx'>  * keymap imported from ir-keymaps.c</div><div class='ctx'>  *</div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;media/rc-map.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='del'>-static struct rc_map_table videomate_m1f[] = {</div><div class='add'>+static struct rc_map_table videomate_k100[] = {</div><div class='ctx'> 	{ 0x01, KEY_POWER },</div><div class='ctx'> 	{ 0x31, KEY_TUNER },</div><div class='ctx'> 	{ 0x33, KEY_VIDEO },</div><div class='hunk'>@@ -67,27 +67,27 @@ static struct rc_map_table videomate_m1f[] = {</div><div class='ctx'> 	{ 0x18, KEY_TEXT },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct rc_map_list videomate_m1f_map = {</div><div class='add'>+static struct rc_map_list videomate_k100_map = {</div><div class='ctx'> 	.map = {</div><div class='del'>-		.scan    = videomate_m1f,</div><div class='del'>-		.size    = ARRAY_SIZE(videomate_m1f),</div><div class='add'>+		.scan    = videomate_k100,</div><div class='add'>+		.size    = ARRAY_SIZE(videomate_k100),</div><div class='ctx'> 		.rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */</div><div class='del'>-		.name    = RC_MAP_VIDEOMATE_M1F,</div><div class='add'>+		.name    = RC_MAP_VIDEOMATE_K100,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init init_rc_map_videomate_m1f(void)</div><div class='add'>+static int __init init_rc_map_videomate_k100(void)</div><div class='ctx'> {</div><div class='del'>-	return rc_map_register(&amp;videomate_m1f_map);</div><div class='add'>+	return rc_map_register(&amp;videomate_k100_map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit exit_rc_map_videomate_m1f(void)</div><div class='add'>+static void __exit exit_rc_map_videomate_k100(void)</div><div class='ctx'> {</div><div class='del'>-	rc_map_unregister(&amp;videomate_m1f_map);</div><div class='add'>+	rc_map_unregister(&amp;videomate_k100_map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(init_rc_map_videomate_m1f)</div><div class='del'>-module_exit(exit_rc_map_videomate_m1f)</div><div class='add'>+module_init(init_rc_map_videomate_k100)</div><div class='add'>+module_exit(exit_rc_map_videomate_k100)</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Pavel Osnova &lt;pvosnova@gmail.com&gt;");</div><div class='head'>diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c<br/>index 27997a9ceb0d..ca12d3289bfe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/rc/lirc_dev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/lirc_dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/lirc_dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/lirc_dev.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> #include &lt;media/lirc.h&gt;</div><div class='ctx'> #include &lt;media/lirc_dev.h&gt;</div><div class='ctx'> </div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> </div><div class='ctx'> #define IRCTL_DEV_NAME	"BaseRemoteCtl"</div><div class='ctx'> #define NOPLUG		-1</div><div class='head'>diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c<br/>index 60d3c1e09712..21105bf9594d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/rc/mceusb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/mceusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/mceusb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/mceusb.c</a></div><div class='hunk'>@@ -156,9 +156,9 @@</div><div class='ctx'> </div><div class='ctx'> /* module parameters */</div><div class='ctx'> #ifdef CONFIG_USB_DEBUG</div><div class='del'>-static int debug = 1;</div><div class='add'>+static bool debug = 1;</div><div class='ctx'> #else</div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define mce_dbg(dev, fmt, ...)					\</div><div class='hunk'>@@ -1448,25 +1448,7 @@ static struct usb_driver mceusb_dev_driver = {</div><div class='ctx'> 	.id_table =	mceusb_dev_table</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init mceusb_dev_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = usb_register(&amp;mceusb_dev_driver);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		printk(KERN_ERR DRIVER_NAME</div><div class='del'>-		       ": usb register failed, result = %d\n", ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit mceusb_dev_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;mceusb_dev_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(mceusb_dev_init);</div><div class='del'>-module_exit(mceusb_dev_exit);</div><div class='add'>+module_usb_driver(mceusb_dev_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='ctx'> MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='head'>diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h<br/>index c6ca870e8b7e..b72f8580e317 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/rc/rc-core-priv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/rc-core-priv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/rc-core-priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/rc-core-priv.h</a></div><div class='hunk'>@@ -84,6 +84,11 @@ struct ir_raw_event_ctrl {</div><div class='ctx'> 		unsigned count;</div><div class='ctx'> 		unsigned wanted_bits;</div><div class='ctx'> 	} rc5_sz;</div><div class='add'>+	struct sanyo_dec {</div><div class='add'>+		int state;</div><div class='add'>+		unsigned count;</div><div class='add'>+		u64 bits;</div><div class='add'>+	} sanyo;</div><div class='ctx'> 	struct mce_kbd_dec {</div><div class='ctx'> 		struct input_dev *idev;</div><div class='ctx'> 		struct timer_list rx_timeout;</div><div class='hunk'>@@ -193,6 +198,13 @@ static inline void load_jvc_decode(void) { }</div><div class='ctx'> static inline void load_sony_decode(void) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* from ir-sanyo-decoder.c */</div><div class='add'>+#ifdef CONFIG_IR_SANYO_DECODER_MODULE</div><div class='add'>+#define load_sanyo_decode()	request_module("ir-sanyo-decoder")</div><div class='add'>+#else</div><div class='add'>+static inline void load_sanyo_decode(void) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* from ir-mce_kbd-decoder.c */</div><div class='ctx'> #ifdef CONFIG_IR_MCE_KBD_DECODER_MODULE</div><div class='ctx'> #define load_mce_kbd_decode()	request_module("ir-mce_kbd-decoder")</div><div class='head'>diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c<br/>index 29f900065d8a..f6a930b70c69 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/rc/rc-main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/rc-main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/rc-main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/rc-main.c</a></div><div class='hunk'>@@ -715,7 +715,7 @@ static void ir_close(struct input_dev *idev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* class for /sys/class/rc */</div><div class='del'>-static char *ir_devnode(struct device *dev, mode_t *mode)</div><div class='add'>+static char *ir_devnode(struct device *dev, umode_t *mode)</div><div class='ctx'> {</div><div class='ctx'> 	return kasprintf(GFP_KERNEL, "rc/%s", dev_name(dev));</div><div class='ctx'> }</div><div class='hunk'>@@ -736,6 +736,7 @@ static struct {</div><div class='ctx'> 	{ RC_TYPE_JVC,		"jvc"		},</div><div class='ctx'> 	{ RC_TYPE_SONY,		"sony"		},</div><div class='ctx'> 	{ RC_TYPE_RC5_SZ,	"rc-5-sz"	},</div><div class='add'>+	{ RC_TYPE_SANYO,	"sanyo"		},</div><div class='ctx'> 	{ RC_TYPE_MCE_KBD,	"mce_kbd"	},</div><div class='ctx'> 	{ RC_TYPE_LIRC,		"lirc"		},</div><div class='ctx'> 	{ RC_TYPE_OTHER,	"other"		},</div><div class='head'>diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c<br/>index 61287fcca61a..ad95c67a4dba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/rc/redrat3.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/redrat3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/redrat3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/redrat3.c</a></div><div class='hunk'>@@ -286,12 +286,6 @@ static void redrat3_issue_async(struct redrat3_dev *rr3)</div><div class='ctx'> </div><div class='ctx'> 	rr3_ftr(rr3-&gt;dev, "Entering %s\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if (!rr3-&gt;det_enabled) {</div><div class='del'>-		dev_warn(rr3-&gt;dev, "not issuing async read, "</div><div class='del'>-			 "detector not enabled\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	memset(rr3-&gt;bulk_in_buf, 0, rr3-&gt;ep_in-&gt;wMaxPacketSize);</div><div class='ctx'> 	res = usb_submit_urb(rr3-&gt;read_urb, GFP_ATOMIC);</div><div class='ctx'> 	if (res)</div><div class='hunk'>@@ -827,6 +821,7 @@ out:</div><div class='ctx'> static void redrat3_handle_async(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct redrat3_dev *rr3;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!urb)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -840,15 +835,13 @@ static void redrat3_handle_async(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	rr3_ftr(rr3-&gt;dev, "Entering %s\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if (!rr3-&gt;det_enabled) {</div><div class='del'>-		rr3_dbg(rr3-&gt;dev, "received a read callback but detector "</div><div class='del'>-			"disabled - ignoring\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	switch (urb-&gt;status) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		redrat3_get_ir_data(rr3, urb-&gt;actual_length);</div><div class='add'>+		ret = redrat3_get_ir_data(rr3, urb-&gt;actual_length);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			/* no error, prepare to read more */</div><div class='add'>+			redrat3_issue_async(rr3);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case -ECONNRESET:</div><div class='hunk'>@@ -865,11 +858,6 @@ static void redrat3_handle_async(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 		rr3-&gt;pkttype = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (!rr3-&gt;transmitting)</div><div class='del'>-		redrat3_issue_async(rr3);</div><div class='del'>-	else</div><div class='del'>-		rr3_dbg(rr3-&gt;dev, "IR transmit in progress\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void redrat3_write_bulk_callback(struct urb *urb, struct pt_regs *regs)</div><div class='hunk'>@@ -896,21 +884,24 @@ static u16 mod_freq_to_val(unsigned int mod_freq)</div><div class='ctx'> 	return (u16)(65536 - (mult / mod_freq));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int redrat3_set_tx_carrier(struct rc_dev *dev, u32 carrier)</div><div class='add'>+static int redrat3_set_tx_carrier(struct rc_dev *rcdev, u32 carrier)</div><div class='ctx'> {</div><div class='del'>-	struct redrat3_dev *rr3 = dev-&gt;priv;</div><div class='add'>+	struct redrat3_dev *rr3 = rcdev-&gt;priv;</div><div class='add'>+	struct device *dev = rr3-&gt;dev;</div><div class='ctx'> </div><div class='add'>+	rr3_dbg(dev, "Setting modulation frequency to %u", carrier);</div><div class='ctx'> 	rr3-&gt;carrier = carrier;</div><div class='ctx'> </div><div class='ctx'> 	return carrier;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int redrat3_transmit_ir(struct rc_dev *rcdev, int *txbuf, u32 n)</div><div class='add'>+static int redrat3_transmit_ir(struct rc_dev *rcdev, unsigned *txbuf,</div><div class='add'>+				unsigned count)</div><div class='ctx'> {</div><div class='ctx'> 	struct redrat3_dev *rr3 = rcdev-&gt;priv;</div><div class='ctx'> 	struct device *dev = rr3-&gt;dev;</div><div class='ctx'> 	struct redrat3_signal_header header;</div><div class='del'>-	int i, j, count, ret, ret_len, offset;</div><div class='add'>+	int i, j, ret, ret_len, offset;</div><div class='ctx'> 	int lencheck, cur_sample_len, pipe;</div><div class='ctx'> 	char *buffer = NULL, *sigdata = NULL;</div><div class='ctx'> 	int *sample_lens = NULL;</div><div class='hunk'>@@ -928,20 +919,13 @@ static int redrat3_transmit_ir(struct rc_dev *rcdev, int *txbuf, u32 n)</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	count = n / sizeof(int);</div><div class='ctx'> 	if (count &gt; (RR3_DRIVER_MAXLENS * 2))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* rr3 will disable rc detector on transmit */</div><div class='add'>+	rr3-&gt;det_enabled = false;</div><div class='ctx'> 	rr3-&gt;transmitting = true;</div><div class='ctx'> </div><div class='del'>-	redrat3_disable_detector(rr3);</div><div class='del'>-</div><div class='del'>-	if (rr3-&gt;det_enabled) {</div><div class='del'>-		dev_err(dev, "%s: cannot tx while rx is enabled\n", __func__);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	sample_lens = kzalloc(sizeof(int) * RR3_DRIVER_MAXLENS, GFP_KERNEL);</div><div class='ctx'> 	if (!sample_lens) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -1055,7 +1039,7 @@ static int redrat3_transmit_ir(struct rc_dev *rcdev, int *txbuf, u32 n)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		dev_err(dev, "Error: control msg send failed, rc %d\n", ret);</div><div class='ctx'> 	else</div><div class='del'>-		ret = n;</div><div class='add'>+		ret = count;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	kfree(sample_lens);</div><div class='hunk'>@@ -1063,8 +1047,8 @@ out:</div><div class='ctx'> 	kfree(sigdata);</div><div class='ctx'> </div><div class='ctx'> 	rr3-&gt;transmitting = false;</div><div class='del'>-</div><div class='del'>-	redrat3_enable_detector(rr3);</div><div class='add'>+	/* rr3 re-enables rc detector because it was enabled before */</div><div class='add'>+	rr3-&gt;det_enabled = true;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1300,25 +1284,7 @@ static struct usb_driver redrat3_dev_driver = {</div><div class='ctx'> 	.id_table	= redrat3_dev_table</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init redrat3_dev_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = usb_register(&amp;redrat3_dev_driver);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		pr_err(DRIVER_NAME</div><div class='del'>-		       ": usb register failed, result = %d\n", ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit redrat3_dev_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;redrat3_dev_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(redrat3_dev_init);</div><div class='del'>-module_exit(redrat3_dev_exit);</div><div class='add'>+module_usb_driver(redrat3_dev_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='ctx'> MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='head'>diff --git a/drivers/media/rc/streamzap.c b/drivers/media/rc/streamzap.c<br/>index e435d94c0776..d6f4bfe09391 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/rc/streamzap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/streamzap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/streamzap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/streamzap.c</a></div><div class='hunk'>@@ -43,9 +43,9 @@</div><div class='ctx'> #define DRIVER_DESC	"Streamzap Remote Control driver"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_USB_DEBUG</div><div class='del'>-static int debug = 1;</div><div class='add'>+static bool debug = 1;</div><div class='ctx'> #else</div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define USB_STREAMZAP_VENDOR_ID		0x0e9c</div><div class='hunk'>@@ -523,33 +523,7 @@ static int streamzap_resume(struct usb_interface *intf)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	streamzap_init</div><div class='del'>- */</div><div class='del'>-static int __init streamzap_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* register this driver with the USB subsystem */</div><div class='del'>-	ret = usb_register(&amp;streamzap_driver);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		printk(KERN_ERR DRIVER_NAME ": usb register failed, "</div><div class='del'>-		       "result = %d\n", ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	streamzap_exit</div><div class='del'>- */</div><div class='del'>-static void __exit streamzap_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;streamzap_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-module_init(streamzap_init);</div><div class='del'>-module_exit(streamzap_exit);</div><div class='add'>+module_usb_driver(streamzap_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jarod Wilson &lt;jarod@wilsonet.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='head'>diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c<br/>index 13f54b51194a..b09c5fae489b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/rc/winbond-cir.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/rc/winbond-cir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/rc/winbond-cir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/rc/winbond-cir.c</a></div><div class='hunk'>@@ -226,11 +226,11 @@ module_param(protocol, uint, 0444);</div><div class='ctx'> MODULE_PARM_DESC(protocol, "IR protocol to use for the power-on command "</div><div class='ctx'> 		 "(0 = RC5, 1 = NEC, 2 = RC6A, default)");</div><div class='ctx'> </div><div class='del'>-static int invert; /* default = 0 */</div><div class='add'>+static bool invert; /* default = 0 */</div><div class='ctx'> module_param(invert, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(invert, "Invert the signal from the IR receiver");</div><div class='ctx'> </div><div class='del'>-static int txandrx; /* default = 0 */</div><div class='add'>+static bool txandrx; /* default = 0 */</div><div class='ctx'> module_param(txandrx, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(invert, "Allow simultaneous TX and RX");</div><div class='ctx'> </div><div class='hunk'>@@ -1176,6 +1176,6 @@ wbcir_exit(void)</div><div class='ctx'> module_init(wbcir_init);</div><div class='ctx'> module_exit(wbcir_exit);</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("David Härdeman &lt;david@hardeman.nu&gt;");</div><div class='add'>+MODULE_AUTHOR("David Härdeman &lt;david@hardeman.nu&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Winbond SuperI/O Consumer IR Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig<br/>index b303a3f8a9f8..9adada0d7447 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/Kconfig</a></div><div class='hunk'>@@ -533,6 +533,13 @@ config VIDEO_ADP1653</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='add'>+config VIDEO_AS3645A</div><div class='add'>+	tristate "AS3645A flash driver 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 AS3645A and LM3555 flash controllers. It has</div><div class='add'>+	  build in control for flash, torch and indicator LEDs.</div><div class='add'>+</div><div class='ctx'> comment "Video improvement chips"</div><div class='ctx'> </div><div class='ctx'> config VIDEO_UPD64031A</div><div class='hunk'>@@ -580,25 +587,6 @@ config VIDEO_M52790</div><div class='ctx'> </div><div class='ctx'> endmenu # encoder / decoder chips</div><div class='ctx'> </div><div class='del'>-config VIDEO_SH_VOU</div><div class='del'>-	tristate "SuperH VOU video output driver"</div><div class='del'>-	depends on VIDEO_DEV &amp;&amp; ARCH_SHMOBILE</div><div class='del'>-	select VIDEOBUF_DMA_CONTIG</div><div class='del'>-	help</div><div class='del'>-	  Support for the Video Output Unit (VOU) on SuperH SoCs.</div><div class='del'>-</div><div class='del'>-config VIDEO_VIU</div><div class='del'>-	tristate "Freescale VIU Video Driver"</div><div class='del'>-	depends on VIDEO_V4L2 &amp;&amp; PPC_MPC512x</div><div class='del'>-	select VIDEOBUF_DMA_CONTIG</div><div class='del'>-	default y</div><div class='del'>-	---help---</div><div class='del'>-	  Support for Freescale VIU video driver. This device captures</div><div class='del'>-	  video data, or overlays video on DIU frame buffer.</div><div class='del'>-</div><div class='del'>-	  Say Y here if you want to enable VIU device on MPC5121e Rev2+.</div><div class='del'>-	  In doubt, say N.</div><div class='del'>-</div><div class='ctx'> config VIDEO_VIVI</div><div class='ctx'> 	tristate "Virtual Video Driver"</div><div class='ctx'> 	depends on VIDEO_DEV &amp;&amp; VIDEO_V4L2 &amp;&amp; !SPARC32 &amp;&amp; !SPARC64</div><div class='hunk'>@@ -613,66 +601,130 @@ config VIDEO_VIVI</div><div class='ctx'> 	  Say Y here if you want to test video apps or debug V4L devices.</div><div class='ctx'> 	  In doubt, say N.</div><div class='ctx'> </div><div class='del'>-source "drivers/media/video/davinci/Kconfig"</div><div class='add'>+#</div><div class='add'>+# USB Multimedia device configuration</div><div class='add'>+#</div><div class='ctx'> </div><div class='del'>-source "drivers/media/video/omap/Kconfig"</div><div class='add'>+menuconfig V4L_USB_DRIVERS</div><div class='add'>+	bool "V4L USB devices"</div><div class='add'>+	depends on USB</div><div class='add'>+	default y</div><div class='ctx'> </div><div class='del'>-source "drivers/media/video/bt8xx/Kconfig"</div><div class='add'>+if V4L_USB_DRIVERS</div><div class='ctx'> </div><div class='del'>-config VIDEO_PMS</div><div class='del'>-	tristate "Mediavision Pro Movie Studio Video For Linux"</div><div class='del'>-	depends on ISA &amp;&amp; VIDEO_V4L2</div><div class='del'>-	help</div><div class='del'>-	  Say Y if you have such a thing.</div><div class='add'>+source "drivers/media/video/uvc/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/gspca/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/pvrusb2/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/hdpvr/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/em28xx/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/tlg2300/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/cx231xx/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/tm6000/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/usbvision/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/et61x251/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/sn9c102/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/pwc/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/cpia2/Kconfig"</div><div class='add'>+</div><div class='add'>+config USB_ZR364XX</div><div class='add'>+	tristate "USB ZR364XX Camera support"</div><div class='add'>+	depends on VIDEO_V4L2</div><div class='add'>+	select VIDEOBUF_GEN</div><div class='add'>+	select VIDEOBUF_VMALLOC</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y here if you want to connect this type of camera to your</div><div class='add'>+	  computer's USB port.</div><div class='add'>+	  See &lt;file:Documentation/video4linux/zr364xx.txt&gt; for more info</div><div class='add'>+	  and list of supported cameras.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='del'>-	  module will be called pms.</div><div class='add'>+	  module will be called zr364xx.</div><div class='ctx'> </div><div class='del'>-config VIDEO_BWQCAM</div><div class='del'>-	tristate "Quickcam BW Video For Linux"</div><div class='del'>-	depends on PARPORT &amp;&amp; VIDEO_V4L2</div><div class='del'>-	help</div><div class='del'>-	  Say Y have if you the black and white version of the QuickCam</div><div class='del'>-	  camera. See the next option for the color version.</div><div class='add'>+config USB_STKWEBCAM</div><div class='add'>+	tristate "USB Syntek DC1125 Camera support"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; EXPERIMENTAL</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y here if you want to use this type of camera.</div><div class='add'>+	  Supported devices are typically found in some Asus laptops,</div><div class='add'>+	  with USB id 174f:a311 and 05e1:0501. Other Syntek cameras</div><div class='add'>+	  may be supported by the stk11xx driver, from which this is</div><div class='add'>+	  derived, see &lt;http://sourceforge.net/projects/syntekdriver/&gt;</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='del'>-	  module will be called bw-qcam.</div><div class='add'>+	  module will be called stkwebcam.</div><div class='ctx'> </div><div class='del'>-config VIDEO_CQCAM</div><div class='del'>-	tristate "QuickCam Colour Video For Linux (EXPERIMENTAL)"</div><div class='del'>-	depends on EXPERIMENTAL &amp;&amp; PARPORT &amp;&amp; VIDEO_V4L2</div><div class='add'>+config USB_S2255</div><div class='add'>+	tristate "USB Sensoray 2255 video capture device"</div><div class='add'>+	depends on VIDEO_V4L2</div><div class='add'>+	select VIDEOBUF_VMALLOC</div><div class='add'>+	default n</div><div class='ctx'> 	help</div><div class='del'>-	  This is the video4linux driver for the colour version of the</div><div class='del'>-	  Connectix QuickCam.  If you have one of these cameras, say Y here,</div><div class='del'>-	  otherwise say N.  This driver does not work with the original</div><div class='del'>-	  monochrome QuickCam, QuickCam VC or QuickClip.  It is also available</div><div class='del'>-	  as a module (c-qcam).</div><div class='del'>-	  Read &lt;file:Documentation/video4linux/CQcam.txt&gt; for more information.</div><div class='add'>+	  Say Y here if you want support for the Sensoray 2255 USB device.</div><div class='add'>+	  This driver can be compiled as a module, called s2255drv.</div><div class='ctx'> </div><div class='del'>-config VIDEO_W9966</div><div class='del'>-	tristate "W9966CF Webcam (FlyCam Supra and others) Video For Linux"</div><div class='del'>-	depends on PARPORT_1284 &amp;&amp; PARPORT &amp;&amp; VIDEO_V4L2</div><div class='del'>-	help</div><div class='del'>-	  Video4linux driver for Winbond's w9966 based Webcams.</div><div class='del'>-	  Currently tested with the LifeView FlyCam Supra.</div><div class='del'>-	  If you have one of these cameras, say Y here</div><div class='del'>-	  otherwise say N.</div><div class='del'>-	  This driver is also available as a module (w9966).</div><div class='add'>+endif # V4L_USB_DRIVERS</div><div class='ctx'> </div><div class='del'>-	  Check out &lt;file:Documentation/video4linux/w9966.txt&gt; for more</div><div class='del'>-	  information.</div><div class='add'>+#</div><div class='add'>+# PCI drivers configuration</div><div class='add'>+#</div><div class='ctx'> </div><div class='del'>-source "drivers/media/video/cpia2/Kconfig"</div><div class='add'>+menuconfig V4L_PCI_DRIVERS</div><div class='add'>+	bool "V4L PCI(e) devices"</div><div class='add'>+	depends on PCI</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y here to enable support for these PCI(e) drivers.</div><div class='ctx'> </div><div class='del'>-config VIDEO_VINO</div><div class='del'>-	tristate "SGI Vino Video For Linux (EXPERIMENTAL)"</div><div class='del'>-	depends on I2C &amp;&amp; SGI_IP22 &amp;&amp; EXPERIMENTAL &amp;&amp; VIDEO_V4L2</div><div class='del'>-	select VIDEO_SAA7191 if VIDEO_HELPER_CHIPS_AUTO</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to build in support for the Vino video input system found</div><div class='del'>-	  on SGI Indy machines.</div><div class='add'>+if V4L_PCI_DRIVERS</div><div class='ctx'> </div><div class='del'>-source "drivers/media/video/zoran/Kconfig"</div><div class='add'>+source "drivers/media/video/au0828/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/bt8xx/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/cx18/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/cx23885/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/cx25821/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/cx88/Kconfig"</div><div class='add'>+</div><div class='add'>+config VIDEO_HEXIUM_GEMINI</div><div class='add'>+	tristate "Hexium Gemini frame grabber"</div><div class='add'>+	depends on PCI &amp;&amp; VIDEO_V4L2 &amp;&amp; I2C</div><div class='add'>+	select VIDEO_SAA7146_VV</div><div class='add'>+	---help---</div><div class='add'>+	  This is a video4linux driver for the Hexium Gemini frame</div><div class='add'>+	  grabber card by Hexium. Please note that the Gemini Dual</div><div class='add'>+	  card is *not* fully supported.</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 hexium_gemini.</div><div class='add'>+</div><div class='add'>+config VIDEO_HEXIUM_ORION</div><div class='add'>+	tristate "Hexium HV-PCI6 and Orion frame grabber"</div><div class='add'>+	depends on PCI &amp;&amp; VIDEO_V4L2 &amp;&amp; I2C</div><div class='add'>+	select VIDEO_SAA7146_VV</div><div class='add'>+	---help---</div><div class='add'>+	  This is a video4linux driver for the Hexium HV-PCI6 and</div><div class='add'>+	  Orion frame grabber cards by Hexium.</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 hexium_orion.</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/ivtv/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config VIDEO_MEYE</div><div class='ctx'> 	tristate "Sony Vaio Picturebook Motion Eye Video For Linux"</div><div class='hunk'>@@ -688,8 +740,6 @@ config VIDEO_MEYE</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called meye.</div><div class='ctx'> </div><div class='del'>-source "drivers/media/video/saa7134/Kconfig"</div><div class='del'>-</div><div class='ctx'> config VIDEO_MXB</div><div class='ctx'> 	tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"</div><div class='ctx'> 	depends on PCI &amp;&amp; VIDEO_V4L2 &amp;&amp; I2C</div><div class='hunk'>@@ -706,28 +756,119 @@ config VIDEO_MXB</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called mxb.</div><div class='ctx'> </div><div class='del'>-config VIDEO_HEXIUM_ORION</div><div class='del'>-	tristate "Hexium HV-PCI6 and Orion frame grabber"</div><div class='del'>-	depends on PCI &amp;&amp; VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	select VIDEO_SAA7146_VV</div><div class='add'>+source "drivers/media/video/saa7134/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/saa7164/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/zoran/Kconfig"</div><div class='add'>+</div><div class='add'>+endif # V4L_PCI_DRIVERS</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISA &amp; parallel port drivers configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+menuconfig V4L_ISA_PARPORT_DRIVERS</div><div class='add'>+	bool "V4L ISA and parallel port devices"</div><div class='add'>+	depends on ISA || PARPORT</div><div class='add'>+	default n</div><div class='ctx'> 	---help---</div><div class='del'>-	  This is a video4linux driver for the Hexium HV-PCI6 and</div><div class='del'>-	  Orion frame grabber cards by Hexium.</div><div class='add'>+	  Say Y here to enable support for these ISA and parallel port drivers.</div><div class='add'>+</div><div class='add'>+if V4L_ISA_PARPORT_DRIVERS</div><div class='add'>+</div><div class='add'>+config VIDEO_BWQCAM</div><div class='add'>+	tristate "Quickcam BW Video For Linux"</div><div class='add'>+	depends on PARPORT &amp;&amp; VIDEO_V4L2</div><div class='add'>+	help</div><div class='add'>+	  Say Y have if you the black and white version of the QuickCam</div><div class='add'>+	  camera. See the next option for the color version.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='del'>-	  module will be called hexium_orion.</div><div class='add'>+	  module will be called bw-qcam.</div><div class='ctx'> </div><div class='del'>-config VIDEO_HEXIUM_GEMINI</div><div class='del'>-	tristate "Hexium Gemini frame grabber"</div><div class='del'>-	depends on PCI &amp;&amp; VIDEO_V4L2 &amp;&amp; I2C</div><div class='del'>-	select VIDEO_SAA7146_VV</div><div class='del'>-	---help---</div><div class='del'>-	  This is a video4linux driver for the Hexium Gemini frame</div><div class='del'>-	  grabber card by Hexium. Please note that the Gemini Dual</div><div class='del'>-	  card is *not* fully supported.</div><div class='add'>+config VIDEO_CQCAM</div><div class='add'>+	tristate "QuickCam Colour Video For Linux"</div><div class='add'>+	depends on PARPORT &amp;&amp; VIDEO_V4L2</div><div class='add'>+	help</div><div class='add'>+	  This is the video4linux driver for the colour version of the</div><div class='add'>+	  Connectix QuickCam.  If you have one of these cameras, say Y here,</div><div class='add'>+	  otherwise say N.  This driver does not work with the original</div><div class='add'>+	  monochrome QuickCam, QuickCam VC or QuickClip.  It is also available</div><div class='add'>+	  as a module (c-qcam).</div><div class='add'>+	  Read &lt;file:Documentation/video4linux/CQcam.txt&gt; for more information.</div><div class='add'>+</div><div class='add'>+config VIDEO_PMS</div><div class='add'>+	tristate "Mediavision Pro Movie Studio Video For Linux"</div><div class='add'>+	depends on ISA &amp;&amp; VIDEO_V4L2</div><div class='add'>+	help</div><div class='add'>+	  Say Y if you have the ISA Mediavision Pro Movie Studio</div><div class='add'>+	  capture card.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='del'>-	  module will be called hexium_gemini.</div><div class='add'>+	  module will be called pms.</div><div class='add'>+</div><div class='add'>+config VIDEO_W9966</div><div class='add'>+	tristate "W9966CF Webcam (FlyCam Supra and others) Video For Linux"</div><div class='add'>+	depends on PARPORT_1284 &amp;&amp; PARPORT &amp;&amp; VIDEO_V4L2</div><div class='add'>+	help</div><div class='add'>+	  Video4linux driver for Winbond's w9966 based Webcams.</div><div class='add'>+	  Currently tested with the LifeView FlyCam Supra.</div><div class='add'>+	  If you have one of these cameras, say Y here</div><div class='add'>+	  otherwise say N.</div><div class='add'>+	  This driver is also available as a module (w9966).</div><div class='add'>+</div><div class='add'>+	  Check out &lt;file:Documentation/video4linux/w9966.txt&gt; for more</div><div class='add'>+	  information.</div><div class='add'>+</div><div class='add'>+endif # V4L_ISA_PARPORT_DRIVERS</div><div class='add'>+</div><div class='add'>+menuconfig V4L_PLATFORM_DRIVERS</div><div class='add'>+	bool "V4L platform devices"</div><div class='add'>+	default n</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y here to enable support for platform-specific V4L drivers.</div><div class='add'>+</div><div class='add'>+if V4L_PLATFORM_DRIVERS</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/marvell-ccic/Kconfig"</div><div class='add'>+</div><div class='add'>+config VIDEO_VIA_CAMERA</div><div class='add'>+	tristate "VIAFB camera controller support"</div><div class='add'>+	depends on FB_VIA</div><div class='add'>+	select VIDEOBUF_DMA_SG</div><div class='add'>+	select VIDEO_OV7670</div><div class='add'>+	help</div><div class='add'>+	   Driver support for the integrated camera controller in VIA</div><div class='add'>+	   Chrome9 chipsets.  Currently only tested on OLPC xo-1.5 systems</div><div class='add'>+	   with ov7670 sensors.</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform multimedia device configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/davinci/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/media/video/omap/Kconfig"</div><div class='add'>+</div><div class='add'>+config VIDEO_SH_VOU</div><div class='add'>+	tristate "SuperH VOU video output driver"</div><div class='add'>+	depends on VIDEO_DEV &amp;&amp; ARCH_SHMOBILE</div><div class='add'>+	select VIDEOBUF_DMA_CONTIG</div><div class='add'>+	help</div><div class='add'>+	  Support for the Video Output Unit (VOU) on SuperH SoCs.</div><div class='add'>+</div><div class='add'>+config VIDEO_VIU</div><div class='add'>+	tristate "Freescale VIU Video Driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; PPC_MPC512x</div><div class='add'>+	select VIDEOBUF_DMA_CONTIG</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	  Support for Freescale VIU video driver. This device captures</div><div class='add'>+	  video data, or overlays video on DIU frame buffer.</div><div class='add'>+</div><div class='add'>+	  Say Y here if you want to enable VIU device on MPC5121e Rev2+.</div><div class='add'>+	  In doubt, say N.</div><div class='ctx'> </div><div class='ctx'> config VIDEO_TIMBERDALE</div><div class='ctx'> 	tristate "Support for timberdale Video In/LogiWIN"</div><div class='hunk'>@@ -739,21 +880,13 @@ config VIDEO_TIMBERDALE</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Add support for the Video In peripherial of the timberdale FPGA.</div><div class='ctx'> </div><div class='del'>-source "drivers/media/video/cx88/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/cx23885/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/cx25821/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/au0828/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/ivtv/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/cx18/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/saa7164/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/marvell-ccic/Kconfig"</div><div class='add'>+config VIDEO_VINO</div><div class='add'>+	tristate "SGI Vino Video For Linux"</div><div class='add'>+	depends on I2C &amp;&amp; SGI_IP22 &amp;&amp; VIDEO_V4L2</div><div class='add'>+	select VIDEO_SAA7191 if VIDEO_HELPER_CHIPS_AUTO</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to build in support for the Vino video input system found</div><div class='add'>+	  on SGI Indy machines.</div><div class='ctx'> </div><div class='ctx'> config VIDEO_M32R_AR</div><div class='ctx'> 	tristate "AR devices"</div><div class='hunk'>@@ -774,16 +907,6 @@ config VIDEO_M32R_AR_M64278</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called arv.</div><div class='ctx'> </div><div class='del'>-config VIDEO_VIA_CAMERA</div><div class='del'>-	tristate "VIAFB camera controller support"</div><div class='del'>-	depends on FB_VIA</div><div class='del'>-	select VIDEOBUF_DMA_SG</div><div class='del'>-	select VIDEO_OV7670</div><div class='del'>-	help</div><div class='del'>-	   Driver support for the integrated camera controller in VIA</div><div class='del'>-	   Chrome9 chipsets.  Currently only tested on OLPC xo-1.5 systems</div><div class='del'>-	   with ov7670 sensors.</div><div class='del'>-</div><div class='ctx'> config VIDEO_OMAP3</div><div class='ctx'> 	tristate "OMAP 3 Camera support (EXPERIMENTAL)"</div><div class='ctx'> 	depends on OMAP_IOVMM &amp;&amp; VIDEO_V4L2 &amp;&amp; I2C &amp;&amp; VIDEO_V4L2_SUBDEV_API &amp;&amp; ARCH_OMAP3 &amp;&amp; EXPERIMENTAL</div><div class='hunk'>@@ -1002,78 +1125,7 @@ config VIDEO_S5P_MIPI_CSIS</div><div class='ctx'> </div><div class='ctx'> source "drivers/media/video/s5p-tv/Kconfig"</div><div class='ctx'> </div><div class='del'>-#</div><div class='del'>-# USB Multimedia device configuration</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-menuconfig V4L_USB_DRIVERS</div><div class='del'>-	bool "V4L USB devices"</div><div class='del'>-	depends on USB</div><div class='del'>-	default y</div><div class='del'>-</div><div class='del'>-if V4L_USB_DRIVERS &amp;&amp; USB</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/uvc/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/gspca/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/pvrusb2/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/hdpvr/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/em28xx/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/tlg2300/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/cx231xx/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/tm6000/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/usbvision/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/et61x251/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/sn9c102/Kconfig"</div><div class='del'>-</div><div class='del'>-source "drivers/media/video/pwc/Kconfig"</div><div class='del'>-</div><div class='del'>-config USB_ZR364XX</div><div class='del'>-	tristate "USB ZR364XX Camera support"</div><div class='del'>-	depends on VIDEO_V4L2</div><div class='del'>-	select VIDEOBUF_GEN</div><div class='del'>-	select VIDEOBUF_VMALLOC</div><div class='del'>-	---help---</div><div class='del'>-	  Say Y here if you want to connect this type of camera to your</div><div class='del'>-	  computer's USB port.</div><div class='del'>-	  See &lt;file:Documentation/video4linux/zr364xx.txt&gt; for more info</div><div class='del'>-	  and list of supported cameras.</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 zr364xx.</div><div class='del'>-</div><div class='del'>-config USB_STKWEBCAM</div><div class='del'>-	tristate "USB Syntek DC1125 Camera support"</div><div class='del'>-	depends on VIDEO_V4L2 &amp;&amp; EXPERIMENTAL</div><div class='del'>-	---help---</div><div class='del'>-	  Say Y here if you want to use this type of camera.</div><div class='del'>-	  Supported devices are typically found in some Asus laptops,</div><div class='del'>-	  with USB id 174f:a311 and 05e1:0501. Other Syntek cameras</div><div class='del'>-	  may be supported by the stk11xx driver, from which this is</div><div class='del'>-	  derived, see &lt;http://sourceforge.net/projects/syntekdriver/&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 stkwebcam.</div><div class='del'>-</div><div class='del'>-config USB_S2255</div><div class='del'>-	tristate "USB Sensoray 2255 video capture device"</div><div class='del'>-	depends on VIDEO_V4L2</div><div class='del'>-	select VIDEOBUF_VMALLOC</div><div class='del'>-	default n</div><div class='del'>-	help</div><div class='del'>-	  Say Y here if you want support for the Sensoray 2255 USB device.</div><div class='del'>-	  This driver can be compiled as a module, called s2255drv.</div><div class='del'>-</div><div class='del'>-endif # V4L_USB_DRIVERS</div><div class='add'>+endif # V4L_PLATFORM_DRIVERS</div><div class='ctx'> endif # VIDEO_CAPTURE_DRIVERS</div><div class='ctx'> </div><div class='ctx'> menuconfig V4L_MEM2MEM_DRIVERS</div><div class='hunk'>@@ -1098,6 +1150,23 @@ config VIDEO_MEM2MEM_TESTDEV</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='add'>+config VIDEO_SAMSUNG_S5P_G2D</div><div class='add'>+	tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"</div><div class='add'>+	depends on VIDEO_DEV &amp;&amp; VIDEO_V4L2 &amp;&amp; PLAT_S5P</div><div class='add'>+	select VIDEOBUF2_DMA_CONTIG</div><div class='add'>+	select V4L2_MEM2MEM_DEV</div><div class='add'>+	default n</div><div class='add'>+	---help---</div><div class='add'>+	  This is a v4l2 driver for Samsung S5P and EXYNOS4 G2D</div><div class='add'>+	  2d graphics accelerator.</div><div class='add'>+</div><div class='add'>+config VIDEO_SAMSUNG_S5P_JPEG</div><div class='add'>+	tristate "Samsung S5P/Exynos4 JPEG codec driver (EXPERIMENTAL)"</div><div class='add'>+	depends on VIDEO_DEV &amp;&amp; VIDEO_V4L2 &amp;&amp; PLAT_S5P &amp;&amp; EXPERIMENTAL</div><div class='add'>+	select VIDEOBUF2_DMA_CONTIG</div><div class='add'>+	select V4L2_MEM2MEM_DEV</div><div class='add'>+	---help---</div><div class='add'>+	  This is a v4l2 driver for Samsung S5P and EXYNOS4 JPEG codec</div><div class='ctx'> </div><div class='ctx'> config VIDEO_SAMSUNG_S5P_MFC</div><div class='ctx'> 	tristate "Samsung S5P MFC 5.1 Video Codec"</div><div class='head'>diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile<br/>index 117f9c4b4cb9..354138804cda 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/Makefile</a></div><div class='hunk'>@@ -74,6 +74,7 @@ obj-$(CONFIG_VIDEO_NOON010PC30)	+= noon010pc30.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_M5MOLS)	+= m5mols/</div><div class='ctx'> obj-$(CONFIG_VIDEO_S5K6AA)	+= s5k6aa.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_ADP1653)	+= adp1653.o</div><div class='add'>+obj-$(CONFIG_VIDEO_AS3645A)	+= as3645a.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SOC_CAMERA_IMX074)		+= imx074.o</div><div class='ctx'> obj-$(CONFIG_SOC_CAMERA_MT9M001)	+= mt9m001.o</div><div class='hunk'>@@ -177,9 +178,12 @@ obj-$(CONFIG_VIDEO_OMAP1)		+= omap1_camera.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_ATMEL_ISI)		+= atmel-isi.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_VIDEO_SAMSUNG_S5P_FIMC) 	+= s5p-fimc/</div><div class='add'>+obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG)	+= s5p-jpeg/</div><div class='ctx'> obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC)	+= s5p-mfc/</div><div class='ctx'> obj-$(CONFIG_VIDEO_SAMSUNG_S5P_TV)	+= s5p-tv/</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D)	+= s5p-g2d/</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_ARCH_DAVINCI)		+= davinci/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_VIDEO_SH_VOU)		+= sh_vou.o</div><div class='head'>diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c<br/>index 23ba5c37c3e4..879f1d839760 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/adv7170.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/adv7170.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/adv7170.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/adv7170.c</a></div><div class='hunk'>@@ -64,6 +64,11 @@ static inline struct adv7170 *to_adv7170(struct v4l2_subdev *sd)</div><div class='ctx'> </div><div class='ctx'> static char *inputs[] = { "pass_through", "play_back" };</div><div class='ctx'> </div><div class='add'>+static enum v4l2_mbus_pixelcode adv7170_codes[] = {</div><div class='add'>+	V4L2_MBUS_FMT_UYVY8_2X8,</div><div class='add'>+	V4L2_MBUS_FMT_UYVY8_1X16,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> static inline int adv7170_write(struct v4l2_subdev *sd, u8 reg, u8 value)</div><div class='hunk'>@@ -258,6 +263,60 @@ static int adv7170_s_routing(struct v4l2_subdev *sd,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int adv7170_enum_fmt(struct v4l2_subdev *sd, unsigned int index,</div><div class='add'>+				enum v4l2_mbus_pixelcode *code)</div><div class='add'>+{</div><div class='add'>+	if (index &gt;= ARRAY_SIZE(adv7170_codes))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*code = adv7170_codes[index];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adv7170_g_fmt(struct v4l2_subdev *sd,</div><div class='add'>+				struct v4l2_mbus_framefmt *mf)</div><div class='add'>+{</div><div class='add'>+	u8 val = adv7170_read(sd, 0x7);</div><div class='add'>+</div><div class='add'>+	if ((val &amp; 0x40) == (1 &lt;&lt; 6))</div><div class='add'>+		mf-&gt;code = V4L2_MBUS_FMT_UYVY8_1X16;</div><div class='add'>+	else</div><div class='add'>+		mf-&gt;code = V4L2_MBUS_FMT_UYVY8_2X8;</div><div class='add'>+</div><div class='add'>+	mf-&gt;colorspace  = V4L2_COLORSPACE_SMPTE170M;</div><div class='add'>+	mf-&gt;width       = 0;</div><div class='add'>+	mf-&gt;height      = 0;</div><div class='add'>+	mf-&gt;field       = V4L2_FIELD_ANY;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adv7170_s_fmt(struct v4l2_subdev *sd,</div><div class='add'>+				struct v4l2_mbus_framefmt *mf)</div><div class='add'>+{</div><div class='add'>+	u8 val = adv7170_read(sd, 0x7);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (mf-&gt;code) {</div><div class='add'>+	case V4L2_MBUS_FMT_UYVY8_2X8:</div><div class='add'>+		val &amp;= ~0x40;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case V4L2_MBUS_FMT_UYVY8_1X16:</div><div class='add'>+		val |= 0x40;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		v4l2_dbg(1, debug, sd,</div><div class='add'>+			"illegal v4l2_mbus_framefmt code: %d\n", mf-&gt;code);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = adv7170_write(sd, 0x7, val);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int adv7170_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = v4l2_get_subdevdata(sd);</div><div class='hunk'>@@ -274,6 +333,9 @@ static const struct v4l2_subdev_core_ops adv7170_core_ops = {</div><div class='ctx'> static const struct v4l2_subdev_video_ops adv7170_video_ops = {</div><div class='ctx'> 	.s_std_output = adv7170_s_std_output,</div><div class='ctx'> 	.s_routing = adv7170_s_routing,</div><div class='add'>+	.s_mbus_fmt = adv7170_s_fmt,</div><div class='add'>+	.g_mbus_fmt = adv7170_g_fmt,</div><div class='add'>+	.enum_mbus_fmt  = adv7170_enum_fmt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct v4l2_subdev_ops adv7170_ops = {</div><div class='head'>diff --git a/drivers/media/video/as3645a.c b/drivers/media/video/as3645a.c<br/>new file mode 100644<br/>index 000000000000..f241702a0f36<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/as3645a.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/as3645a.c</a></div><div class='hunk'>@@ -0,0 +1,905 @@</div><div class='add'>+/*</div><div class='add'>+ * drivers/media/video/as3645a.c - AS3645A and LM3555 flash controllers driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008-2011 Nokia Corporation</div><div class='add'>+ * Copyright (c) 2011, Intel Corporation.</div><div class='add'>+ *</div><div class='add'>+ * Contact: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt;</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'>+ * version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA</div><div class='add'>+ * 02110-1301 USA</div><div class='add'>+ *</div><div class='add'>+ * TODO:</div><div class='add'>+ * - Check hardware FSTROBE control when sensor driver add support for this</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/i2c.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/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;media/as3645a.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'>+</div><div class='add'>+#define AS_TIMER_MS_TO_CODE(t)			(((t) - 100) / 50)</div><div class='add'>+#define AS_TIMER_CODE_TO_MS(c)			(50 * (c) + 100)</div><div class='add'>+</div><div class='add'>+/* Register definitions */</div><div class='add'>+</div><div class='add'>+/* Read-only Design info register: Reset state: xxxx 0001 */</div><div class='add'>+#define AS_DESIGN_INFO_REG			0x00</div><div class='add'>+#define AS_DESIGN_INFO_FACTORY(x)		(((x) &gt;&gt; 4))</div><div class='add'>+#define AS_DESIGN_INFO_MODEL(x)			((x) &amp; 0x0f)</div><div class='add'>+</div><div class='add'>+/* Read-only Version control register: Reset state: 0000 0000</div><div class='add'>+ * for first engineering samples</div><div class='add'>+ */</div><div class='add'>+#define AS_VERSION_CONTROL_REG			0x01</div><div class='add'>+#define AS_VERSION_CONTROL_RFU(x)		(((x) &gt;&gt; 4))</div><div class='add'>+#define AS_VERSION_CONTROL_VERSION(x)		((x) &amp; 0x0f)</div><div class='add'>+</div><div class='add'>+/* Read / Write	(Indicator and timer register): Reset state: 0000 1111 */</div><div class='add'>+#define AS_INDICATOR_AND_TIMER_REG		0x02</div><div class='add'>+#define AS_INDICATOR_AND_TIMER_TIMEOUT_SHIFT	0</div><div class='add'>+#define AS_INDICATOR_AND_TIMER_VREF_SHIFT	4</div><div class='add'>+#define AS_INDICATOR_AND_TIMER_INDICATOR_SHIFT	6</div><div class='add'>+</div><div class='add'>+/* Read / Write	(Current set register): Reset state: 0110 1001 */</div><div class='add'>+#define AS_CURRENT_SET_REG			0x03</div><div class='add'>+#define AS_CURRENT_ASSIST_LIGHT_SHIFT		0</div><div class='add'>+#define AS_CURRENT_LED_DET_ON			(1 &lt;&lt; 3)</div><div class='add'>+#define AS_CURRENT_FLASH_CURRENT_SHIFT		4</div><div class='add'>+</div><div class='add'>+/* Read / Write	(Control register): Reset state: 1011 0100 */</div><div class='add'>+#define AS_CONTROL_REG				0x04</div><div class='add'>+#define AS_CONTROL_MODE_SETTING_SHIFT		0</div><div class='add'>+#define AS_CONTROL_STROBE_ON			(1 &lt;&lt; 2)</div><div class='add'>+#define AS_CONTROL_OUT_ON			(1 &lt;&lt; 3)</div><div class='add'>+#define AS_CONTROL_EXT_TORCH_ON			(1 &lt;&lt; 4)</div><div class='add'>+#define AS_CONTROL_STROBE_TYPE_EDGE		(0 &lt;&lt; 5)</div><div class='add'>+#define AS_CONTROL_STROBE_TYPE_LEVEL		(1 &lt;&lt; 5)</div><div class='add'>+#define AS_CONTROL_COIL_PEAK_SHIFT		6</div><div class='add'>+</div><div class='add'>+/* Read only (D3 is read / write) (Fault and info): Reset state: 0000 x000 */</div><div class='add'>+#define AS_FAULT_INFO_REG			0x05</div><div class='add'>+#define AS_FAULT_INFO_INDUCTOR_PEAK_LIMIT	(1 &lt;&lt; 1)</div><div class='add'>+#define AS_FAULT_INFO_INDICATOR_LED		(1 &lt;&lt; 2)</div><div class='add'>+#define AS_FAULT_INFO_LED_AMOUNT		(1 &lt;&lt; 3)</div><div class='add'>+#define AS_FAULT_INFO_TIMEOUT			(1 &lt;&lt; 4)</div><div class='add'>+#define AS_FAULT_INFO_OVER_TEMPERATURE		(1 &lt;&lt; 5)</div><div class='add'>+#define AS_FAULT_INFO_SHORT_CIRCUIT		(1 &lt;&lt; 6)</div><div class='add'>+#define AS_FAULT_INFO_OVER_VOLTAGE		(1 &lt;&lt; 7)</div><div class='add'>+</div><div class='add'>+/* Boost register */</div><div class='add'>+#define AS_BOOST_REG				0x0d</div><div class='add'>+#define AS_BOOST_CURRENT_DISABLE		(0 &lt;&lt; 0)</div><div class='add'>+#define AS_BOOST_CURRENT_ENABLE			(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* Password register is used to unlock boost register writing */</div><div class='add'>+#define AS_PASSWORD_REG				0x0f</div><div class='add'>+#define AS_PASSWORD_UNLOCK_VALUE		0x55</div><div class='add'>+</div><div class='add'>+enum as_mode {</div><div class='add'>+	AS_MODE_EXT_TORCH = 0 &lt;&lt; AS_CONTROL_MODE_SETTING_SHIFT,</div><div class='add'>+	AS_MODE_INDICATOR = 1 &lt;&lt; AS_CONTROL_MODE_SETTING_SHIFT,</div><div class='add'>+	AS_MODE_ASSIST = 2 &lt;&lt; AS_CONTROL_MODE_SETTING_SHIFT,</div><div class='add'>+	AS_MODE_FLASH = 3 &lt;&lt; AS_CONTROL_MODE_SETTING_SHIFT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct as3645a</div><div class='add'>+ *</div><div class='add'>+ * @subdev:		V4L2 subdev</div><div class='add'>+ * @pdata:		Flash platform data</div><div class='add'>+ * @power_lock:		Protects power_count</div><div class='add'>+ * @power_count:	Power reference count</div><div class='add'>+ * @led_mode:		V4L2 flash LED mode</div><div class='add'>+ * @timeout:		Flash timeout in microseconds</div><div class='add'>+ * @flash_current:	Flash current (0=200mA ... 15=500mA). Maximum</div><div class='add'>+ *			values are 400mA for two LEDs and 500mA for one LED.</div><div class='add'>+ * @assist_current:	Torch/Assist light current (0=20mA, 1=40mA ... 7=160mA)</div><div class='add'>+ * @indicator_current:	Indicator LED current (0=0mA, 1=2.5mA ... 4=10mA)</div><div class='add'>+ * @strobe_source:	Flash strobe source (software or external)</div><div class='add'>+ */</div><div class='add'>+struct as3645a {</div><div class='add'>+	struct v4l2_subdev subdev;</div><div class='add'>+	const struct as3645a_platform_data *pdata;</div><div class='add'>+</div><div class='add'>+	struct mutex power_lock;</div><div class='add'>+	int power_count;</div><div class='add'>+</div><div class='add'>+	/* Controls */</div><div class='add'>+	struct v4l2_ctrl_handler ctrls;</div><div class='add'>+</div><div class='add'>+	enum v4l2_flash_led_mode led_mode;</div><div class='add'>+	unsigned int timeout;</div><div class='add'>+	u8 flash_current;</div><div class='add'>+	u8 assist_current;</div><div class='add'>+	u8 indicator_current;</div><div class='add'>+	enum v4l2_flash_strobe_source strobe_source;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_as3645a(sd) container_of(sd, struct as3645a, subdev)</div><div class='add'>+</div><div class='add'>+/* Return negative errno else zero on success */</div><div class='add'>+static int as3645a_write(struct as3645a *flash, u8 addr, u8 val)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = v4l2_get_subdevdata(&amp;flash-&gt;subdev);</div><div class='add'>+	int rval;</div><div class='add'>+</div><div class='add'>+	rval = i2c_smbus_write_byte_data(client, addr, val);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "Write Addr:%02X Val:%02X %s\n", addr, val,</div><div class='add'>+		rval &lt; 0 ? "fail" : "ok");</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return negative errno else a data byte received from the device. */</div><div class='add'>+static int as3645a_read(struct as3645a *flash, u8 addr)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = v4l2_get_subdevdata(&amp;flash-&gt;subdev);</div><div class='add'>+	int rval;</div><div class='add'>+</div><div class='add'>+	rval = i2c_smbus_read_byte_data(client, addr);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "Read Addr:%02X Val:%02X %s\n", addr, rval,</div><div class='add'>+		rval &lt; 0 ? "fail" : "ok");</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -----------------------------------------------------------------------------</div><div class='add'>+ * Hardware configuration and trigger</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * as3645a_set_config - Set flash configuration registers</div><div class='add'>+ * @flash: The flash</div><div class='add'>+ *</div><div class='add'>+ * Configure the hardware with flash, assist and indicator currents, as well as</div><div class='add'>+ * flash timeout.</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on success, or a negative error code if an I2C communication error</div><div class='add'>+ * occurred.</div><div class='add'>+ */</div><div class='add'>+static int as3645a_set_config(struct as3645a *flash)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	val = (flash-&gt;flash_current &lt;&lt; AS_CURRENT_FLASH_CURRENT_SHIFT)</div><div class='add'>+	    | (flash-&gt;assist_current &lt;&lt; AS_CURRENT_ASSIST_LIGHT_SHIFT)</div><div class='add'>+	    | AS_CURRENT_LED_DET_ON;</div><div class='add'>+</div><div class='add'>+	ret = as3645a_write(flash, AS_CURRENT_SET_REG, val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	val = AS_TIMER_MS_TO_CODE(flash-&gt;timeout / 1000)</div><div class='add'>+		    &lt;&lt; AS_INDICATOR_AND_TIMER_TIMEOUT_SHIFT;</div><div class='add'>+</div><div class='add'>+	val |= (flash-&gt;pdata-&gt;vref &lt;&lt; AS_INDICATOR_AND_TIMER_VREF_SHIFT)</div><div class='add'>+	    |  ((flash-&gt;indicator_current ? flash-&gt;indicator_current - 1 : 0)</div><div class='add'>+		 &lt;&lt; AS_INDICATOR_AND_TIMER_INDICATOR_SHIFT);</div><div class='add'>+</div><div class='add'>+	return as3645a_write(flash, AS_INDICATOR_AND_TIMER_REG, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * as3645a_set_control - Set flash control register</div><div class='add'>+ * @flash: The flash</div><div class='add'>+ * @mode: Desired output mode</div><div class='add'>+ * @on: Desired output state</div><div class='add'>+ *</div><div class='add'>+ * Configure the hardware with output mode and state.</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on success, or a negative error code if an I2C communication error</div><div class='add'>+ * occurred.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+as3645a_set_control(struct as3645a *flash, enum as_mode mode, bool on)</div><div class='add'>+{</div><div class='add'>+	u8 reg;</div><div class='add'>+</div><div class='add'>+	/* Configure output parameters and operation mode. */</div><div class='add'>+	reg = (flash-&gt;pdata-&gt;peak &lt;&lt; AS_CONTROL_COIL_PEAK_SHIFT)</div><div class='add'>+	    | (on ? AS_CONTROL_OUT_ON : 0)</div><div class='add'>+	    | mode;</div><div class='add'>+</div><div class='add'>+	if (flash-&gt;led_mode == V4L2_FLASH_LED_MODE_FLASH &amp;&amp;</div><div class='add'>+	    flash-&gt;strobe_source == V4L2_FLASH_STROBE_SOURCE_EXTERNAL) {</div><div class='add'>+		reg |= AS_CONTROL_STROBE_TYPE_LEVEL</div><div class='add'>+		    |  AS_CONTROL_STROBE_ON;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return as3645a_write(flash, AS_CONTROL_REG, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * as3645a_set_output - Configure output and operation mode</div><div class='add'>+ * @flash: Flash controller</div><div class='add'>+ * @strobe: Strobe the flash (only valid in flash mode)</div><div class='add'>+ *</div><div class='add'>+ * Turn the LEDs output on/off and set the operation mode based on the current</div><div class='add'>+ * parameters.</div><div class='add'>+ *</div><div class='add'>+ * The AS3645A can't control the indicator LED independently of the flash/torch</div><div class='add'>+ * LED. If the flash controller is in V4L2_FLASH_LED_MODE_NONE mode, set the</div><div class='add'>+ * chip to indicator mode. Otherwise set it to assist light (torch) or flash</div><div class='add'>+ * mode.</div><div class='add'>+ *</div><div class='add'>+ * In indicator and assist modes, turn the output on/off based on the indicator</div><div class='add'>+ * and torch currents. In software strobe flash mode, turn the output on/off</div><div class='add'>+ * based on the strobe parameter.</div><div class='add'>+ */</div><div class='add'>+static int as3645a_set_output(struct as3645a *flash, bool strobe)</div><div class='add'>+{</div><div class='add'>+	enum as_mode mode;</div><div class='add'>+	bool on;</div><div class='add'>+</div><div class='add'>+	switch (flash-&gt;led_mode) {</div><div class='add'>+	case V4L2_FLASH_LED_MODE_NONE:</div><div class='add'>+		on = flash-&gt;indicator_current != 0;</div><div class='add'>+		mode = AS_MODE_INDICATOR;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_FLASH_LED_MODE_TORCH:</div><div class='add'>+		on = true;</div><div class='add'>+		mode = AS_MODE_ASSIST;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_FLASH_LED_MODE_FLASH:</div><div class='add'>+		on = strobe;</div><div class='add'>+		mode = AS_MODE_FLASH;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure output parameters and operation mode. */</div><div class='add'>+	return as3645a_set_control(flash, mode, on);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -----------------------------------------------------------------------------</div><div class='add'>+ * V4L2 controls</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int as3645a_is_active(struct as3645a *flash)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = as3645a_read(flash, AS_CONTROL_REG);</div><div class='add'>+	return ret &lt; 0 ? ret : !!(ret &amp; AS_CONTROL_OUT_ON);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int as3645a_read_fault(struct as3645a *flash)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = v4l2_get_subdevdata(&amp;flash-&gt;subdev);</div><div class='add'>+	int rval;</div><div class='add'>+</div><div class='add'>+	/* NOTE: reading register clear fault status */</div><div class='add'>+	rval = as3645a_read(flash, AS_FAULT_INFO_REG);</div><div class='add'>+	if (rval &lt; 0)</div><div class='add'>+		return rval;</div><div class='add'>+</div><div class='add'>+	if (rval &amp; AS_FAULT_INFO_INDUCTOR_PEAK_LIMIT)</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "Inductor Peak limit fault\n");</div><div class='add'>+</div><div class='add'>+	if (rval &amp; AS_FAULT_INFO_INDICATOR_LED)</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "Indicator LED fault: "</div><div class='add'>+			"Short circuit or open loop\n");</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "%u connected LEDs\n",</div><div class='add'>+		rval &amp; AS_FAULT_INFO_LED_AMOUNT ? 2 : 1);</div><div class='add'>+</div><div class='add'>+	if (rval &amp; AS_FAULT_INFO_TIMEOUT)</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "Timeout fault\n");</div><div class='add'>+</div><div class='add'>+	if (rval &amp; AS_FAULT_INFO_OVER_TEMPERATURE)</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "Over temperature fault\n");</div><div class='add'>+</div><div class='add'>+	if (rval &amp; AS_FAULT_INFO_SHORT_CIRCUIT)</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "Short circuit fault\n");</div><div class='add'>+</div><div class='add'>+	if (rval &amp; AS_FAULT_INFO_OVER_VOLTAGE)</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "Over voltage fault: "</div><div class='add'>+			"Indicates missing capacitor or open connection\n");</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int as3645a_get_ctrl(struct v4l2_ctrl *ctrl)</div><div class='add'>+{</div><div class='add'>+	struct as3645a *flash =</div><div class='add'>+		container_of(ctrl-&gt;handler, struct as3645a, ctrls);</div><div class='add'>+	struct i2c_client *client = v4l2_get_subdevdata(&amp;flash-&gt;subdev);</div><div class='add'>+	int value;</div><div class='add'>+</div><div class='add'>+	switch (ctrl-&gt;id) {</div><div class='add'>+	case V4L2_CID_FLASH_FAULT:</div><div class='add'>+		value = as3645a_read_fault(flash);</div><div class='add'>+		if (value &lt; 0)</div><div class='add'>+			return value;</div><div class='add'>+</div><div class='add'>+		ctrl-&gt;cur.val = 0;</div><div class='add'>+		if (value &amp; AS_FAULT_INFO_SHORT_CIRCUIT)</div><div class='add'>+			ctrl-&gt;cur.val |= V4L2_FLASH_FAULT_SHORT_CIRCUIT;</div><div class='add'>+		if (value &amp; AS_FAULT_INFO_OVER_TEMPERATURE)</div><div class='add'>+			ctrl-&gt;cur.val |= V4L2_FLASH_FAULT_OVER_TEMPERATURE;</div><div class='add'>+		if (value &amp; AS_FAULT_INFO_TIMEOUT)</div><div class='add'>+			ctrl-&gt;cur.val |= V4L2_FLASH_FAULT_TIMEOUT;</div><div class='add'>+		if (value &amp; AS_FAULT_INFO_OVER_VOLTAGE)</div><div class='add'>+			ctrl-&gt;cur.val |= V4L2_FLASH_FAULT_OVER_VOLTAGE;</div><div class='add'>+		if (value &amp; AS_FAULT_INFO_INDUCTOR_PEAK_LIMIT)</div><div class='add'>+			ctrl-&gt;cur.val |= V4L2_FLASH_FAULT_OVER_CURRENT;</div><div class='add'>+		if (value &amp; AS_FAULT_INFO_INDICATOR_LED)</div><div class='add'>+			ctrl-&gt;cur.val |= V4L2_FLASH_FAULT_INDICATOR;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_FLASH_STROBE_STATUS:</div><div class='add'>+		if (flash-&gt;led_mode != V4L2_FLASH_LED_MODE_FLASH) {</div><div class='add'>+			ctrl-&gt;cur.val = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		value = as3645a_is_active(flash);</div><div class='add'>+		if (value &lt; 0)</div><div class='add'>+			return value;</div><div class='add'>+</div><div class='add'>+		ctrl-&gt;cur.val = value;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "G_CTRL %08x:%d\n", ctrl-&gt;id, ctrl-&gt;cur.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 as3645a_set_ctrl(struct v4l2_ctrl *ctrl)</div><div class='add'>+{</div><div class='add'>+	struct as3645a *flash =</div><div class='add'>+		container_of(ctrl-&gt;handler, struct as3645a, ctrls);</div><div class='add'>+	struct i2c_client *client = v4l2_get_subdevdata(&amp;flash-&gt;subdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "S_CTRL %08x:%d\n", ctrl-&gt;id, ctrl-&gt;val);</div><div class='add'>+</div><div class='add'>+	/* If a control that doesn't apply to the current mode is modified,</div><div class='add'>+	 * we store the value and return immediately. The setting will be</div><div class='add'>+	 * applied when the LED mode is changed. Otherwise we apply the setting</div><div class='add'>+	 * immediately.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	switch (ctrl-&gt;id) {</div><div class='add'>+	case V4L2_CID_FLASH_LED_MODE:</div><div class='add'>+		if (flash-&gt;indicator_current)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+</div><div class='add'>+		ret = as3645a_set_config(flash);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		flash-&gt;led_mode = ctrl-&gt;val;</div><div class='add'>+		return as3645a_set_output(flash, false);</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_FLASH_STROBE_SOURCE:</div><div class='add'>+		flash-&gt;strobe_source = ctrl-&gt;val;</div><div class='add'>+</div><div class='add'>+		/* Applies to flash mode only. */</div><div class='add'>+		if (flash-&gt;led_mode != V4L2_FLASH_LED_MODE_FLASH)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		return as3645a_set_output(flash, false);</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_FLASH_STROBE:</div><div class='add'>+		if (flash-&gt;led_mode != V4L2_FLASH_LED_MODE_FLASH)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+</div><div class='add'>+		return as3645a_set_output(flash, true);</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_FLASH_STROBE_STOP:</div><div class='add'>+		if (flash-&gt;led_mode != V4L2_FLASH_LED_MODE_FLASH)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+</div><div class='add'>+		return as3645a_set_output(flash, false);</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_FLASH_TIMEOUT:</div><div class='add'>+		flash-&gt;timeout = ctrl-&gt;val;</div><div class='add'>+</div><div class='add'>+		/* Applies to flash mode only. */</div><div class='add'>+		if (flash-&gt;led_mode != V4L2_FLASH_LED_MODE_FLASH)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		return as3645a_set_config(flash);</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_FLASH_INTENSITY:</div><div class='add'>+		flash-&gt;flash_current = (ctrl-&gt;val - AS3645A_FLASH_INTENSITY_MIN)</div><div class='add'>+				     / AS3645A_FLASH_INTENSITY_STEP;</div><div class='add'>+</div><div class='add'>+		/* Applies to flash mode only. */</div><div class='add'>+		if (flash-&gt;led_mode != V4L2_FLASH_LED_MODE_FLASH)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		return as3645a_set_config(flash);</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_FLASH_TORCH_INTENSITY:</div><div class='add'>+		flash-&gt;assist_current =</div><div class='add'>+			(ctrl-&gt;val - AS3645A_TORCH_INTENSITY_MIN)</div><div class='add'>+			/ AS3645A_TORCH_INTENSITY_STEP;</div><div class='add'>+</div><div class='add'>+		/* Applies to torch mode only. */</div><div class='add'>+		if (flash-&gt;led_mode != V4L2_FLASH_LED_MODE_TORCH)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		return as3645a_set_config(flash);</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_FLASH_INDICATOR_INTENSITY:</div><div class='add'>+		if (flash-&gt;led_mode != V4L2_FLASH_LED_MODE_NONE)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+</div><div class='add'>+		flash-&gt;indicator_current =</div><div class='add'>+			(ctrl-&gt;val - AS3645A_INDICATOR_INTENSITY_MIN)</div><div class='add'>+			/ AS3645A_INDICATOR_INTENSITY_STEP;</div><div class='add'>+</div><div class='add'>+		ret = as3645a_set_config(flash);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if ((ctrl-&gt;val == 0) == (ctrl-&gt;cur.val == 0))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		return as3645a_set_output(flash, 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 const struct v4l2_ctrl_ops as3645a_ctrl_ops = {</div><div class='add'>+	.g_volatile_ctrl = as3645a_get_ctrl,</div><div class='add'>+	.s_ctrl = as3645a_set_ctrl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* -----------------------------------------------------------------------------</div><div class='add'>+ * V4L2 subdev core operations</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Put device into know state. */</div><div class='add'>+static int as3645a_setup(struct as3645a *flash)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = v4l2_get_subdevdata(&amp;flash-&gt;subdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* clear errors */</div><div class='add'>+	ret = as3645a_read(flash, AS_FAULT_INFO_REG);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "Fault info: %02x\n", ret);</div><div class='add'>+</div><div class='add'>+	ret = as3645a_set_config(flash);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = as3645a_set_output(flash, false);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* read status */</div><div class='add'>+	ret = as3645a_read_fault(flash);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "AS_INDICATOR_AND_TIMER_REG: %02x\n",</div><div class='add'>+		as3645a_read(flash, AS_INDICATOR_AND_TIMER_REG));</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "AS_CURRENT_SET_REG: %02x\n",</div><div class='add'>+		as3645a_read(flash, AS_CURRENT_SET_REG));</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "AS_CONTROL_REG: %02x\n",</div><div class='add'>+		as3645a_read(flash, AS_CONTROL_REG));</div><div class='add'>+</div><div class='add'>+	return ret &amp; ~AS_FAULT_INFO_LED_AMOUNT ? -EIO : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __as3645a_set_power(struct as3645a *flash, int on)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!on)</div><div class='add'>+		as3645a_set_control(flash, AS_MODE_EXT_TORCH, false);</div><div class='add'>+</div><div class='add'>+	if (flash-&gt;pdata-&gt;set_power) {</div><div class='add'>+		ret = flash-&gt;pdata-&gt;set_power(&amp;flash-&gt;subdev, on);</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 (!on)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = as3645a_setup(flash);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		if (flash-&gt;pdata-&gt;set_power)</div><div class='add'>+			flash-&gt;pdata-&gt;set_power(&amp;flash-&gt;subdev, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int as3645a_set_power(struct v4l2_subdev *sd, int on)</div><div class='add'>+{</div><div class='add'>+	struct as3645a *flash = to_as3645a(sd);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;flash-&gt;power_lock);</div><div class='add'>+</div><div class='add'>+	if (flash-&gt;power_count == !on) {</div><div class='add'>+		ret = __as3645a_set_power(flash, !!on);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flash-&gt;power_count += on ? 1 : -1;</div><div class='add'>+	WARN_ON(flash-&gt;power_count &lt; 0);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	mutex_unlock(&amp;flash-&gt;power_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int as3645a_registered(struct v4l2_subdev *sd)</div><div class='add'>+{</div><div class='add'>+	struct as3645a *flash = to_as3645a(sd);</div><div class='add'>+	struct i2c_client *client = v4l2_get_subdevdata(sd);</div><div class='add'>+	int rval, man, model, rfu, version;</div><div class='add'>+	const char *vendor;</div><div class='add'>+</div><div class='add'>+	/* Power up the flash driver and read manufacturer ID, model ID, RFU</div><div class='add'>+	 * and version.</div><div class='add'>+	 */</div><div class='add'>+	rval = as3645a_set_power(&amp;flash-&gt;subdev, 1);</div><div class='add'>+	if (rval &lt; 0)</div><div class='add'>+		return rval;</div><div class='add'>+</div><div class='add'>+	rval = as3645a_read(flash, AS_DESIGN_INFO_REG);</div><div class='add'>+	if (rval &lt; 0)</div><div class='add'>+		goto power_off;</div><div class='add'>+</div><div class='add'>+	man = AS_DESIGN_INFO_FACTORY(rval);</div><div class='add'>+	model = AS_DESIGN_INFO_MODEL(rval);</div><div class='add'>+</div><div class='add'>+	rval = as3645a_read(flash, AS_VERSION_CONTROL_REG);</div><div class='add'>+	if (rval &lt; 0)</div><div class='add'>+		goto power_off;</div><div class='add'>+</div><div class='add'>+	rfu = AS_VERSION_CONTROL_RFU(rval);</div><div class='add'>+	version = AS_VERSION_CONTROL_VERSION(rval);</div><div class='add'>+</div><div class='add'>+	/* Verify the chip model and version. */</div><div class='add'>+	if (model != 0x01 || rfu != 0x00) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "AS3645A not detected "</div><div class='add'>+			"(model %d rfu %d)\n", model, rfu);</div><div class='add'>+		rval = -ENODEV;</div><div class='add'>+		goto power_off;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (man) {</div><div class='add'>+	case 1:</div><div class='add'>+		vendor = "AMS, Austria Micro Systems";</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		vendor = "ADI, Analog Devices Inc.";</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		vendor = "NSC, National Semiconductor";</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		vendor = "NXP";</div><div class='add'>+		break;</div><div class='add'>+	case 5:</div><div class='add'>+		vendor = "TI, Texas Instrument";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		vendor = "Unknown";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;client-&gt;dev, "Chip vendor: %s (%d) Version: %d\n", vendor,</div><div class='add'>+		 man, version);</div><div class='add'>+</div><div class='add'>+	rval = as3645a_write(flash, AS_PASSWORD_REG, AS_PASSWORD_UNLOCK_VALUE);</div><div class='add'>+	if (rval &lt; 0)</div><div class='add'>+		goto power_off;</div><div class='add'>+</div><div class='add'>+	rval = as3645a_write(flash, AS_BOOST_REG, AS_BOOST_CURRENT_DISABLE);</div><div class='add'>+	if (rval &lt; 0)</div><div class='add'>+		goto power_off;</div><div class='add'>+</div><div class='add'>+	/* Setup default values. This makes sure that the chip is in a known</div><div class='add'>+	 * state, in case the power rail can't be controlled.</div><div class='add'>+	 */</div><div class='add'>+	rval = as3645a_setup(flash);</div><div class='add'>+</div><div class='add'>+power_off:</div><div class='add'>+	as3645a_set_power(&amp;flash-&gt;subdev, 0);</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int as3645a_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)</div><div class='add'>+{</div><div class='add'>+	return as3645a_set_power(sd, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int as3645a_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)</div><div class='add'>+{</div><div class='add'>+	return as3645a_set_power(sd, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct v4l2_subdev_core_ops as3645a_core_ops = {</div><div class='add'>+	.s_power		= as3645a_set_power,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct v4l2_subdev_ops as3645a_ops = {</div><div class='add'>+	.core = &amp;as3645a_core_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct v4l2_subdev_internal_ops as3645a_internal_ops = {</div><div class='add'>+	.registered = as3645a_registered,</div><div class='add'>+	.open = as3645a_open,</div><div class='add'>+	.close = as3645a_close,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* -----------------------------------------------------------------------------</div><div class='add'>+ *  I2C driver</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+static int as3645a_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct v4l2_subdev *subdev = i2c_get_clientdata(client);</div><div class='add'>+	struct as3645a *flash = to_as3645a(subdev);</div><div class='add'>+	int rval;</div><div class='add'>+</div><div class='add'>+	if (flash-&gt;power_count == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rval = __as3645a_set_power(flash, 0);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "Suspend %s\n", rval &lt; 0 ? "failed" : "ok");</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int as3645a_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct v4l2_subdev *subdev = i2c_get_clientdata(client);</div><div class='add'>+	struct as3645a *flash = to_as3645a(subdev);</div><div class='add'>+	int rval;</div><div class='add'>+</div><div class='add'>+	if (flash-&gt;power_count == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rval = __as3645a_set_power(flash, 1);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "Resume %s\n", rval &lt; 0 ? "fail" : "ok");</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#define as3645a_suspend	NULL</div><div class='add'>+#define as3645a_resume	NULL</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * as3645a_init_controls - Create controls</div><div class='add'>+ * @flash: The flash</div><div class='add'>+ *</div><div class='add'>+ * The number of LEDs reported in platform data is used to compute default</div><div class='add'>+ * limits. Parameters passed through platform data can override those limits.</div><div class='add'>+ */</div><div class='add'>+static int as3645a_init_controls(struct as3645a *flash)</div><div class='add'>+{</div><div class='add'>+	const struct as3645a_platform_data *pdata = flash-&gt;pdata;</div><div class='add'>+	struct v4l2_ctrl *ctrl;</div><div class='add'>+	int maximum;</div><div class='add'>+</div><div class='add'>+	v4l2_ctrl_handler_init(&amp;flash-&gt;ctrls, 10);</div><div class='add'>+</div><div class='add'>+	/* V4L2_CID_FLASH_LED_MODE */</div><div class='add'>+	v4l2_ctrl_new_std_menu(&amp;flash-&gt;ctrls, &amp;as3645a_ctrl_ops,</div><div class='add'>+			       V4L2_CID_FLASH_LED_MODE, 2, ~7,</div><div class='add'>+			       V4L2_FLASH_LED_MODE_NONE);</div><div class='add'>+</div><div class='add'>+	/* V4L2_CID_FLASH_STROBE_SOURCE */</div><div class='add'>+	v4l2_ctrl_new_std_menu(&amp;flash-&gt;ctrls, &amp;as3645a_ctrl_ops,</div><div class='add'>+			       V4L2_CID_FLASH_STROBE_SOURCE,</div><div class='add'>+			       pdata-&gt;ext_strobe ? 1 : 0,</div><div class='add'>+			       pdata-&gt;ext_strobe ? ~3 : ~1,</div><div class='add'>+			       V4L2_FLASH_STROBE_SOURCE_SOFTWARE);</div><div class='add'>+</div><div class='add'>+	flash-&gt;strobe_source = V4L2_FLASH_STROBE_SOURCE_SOFTWARE;</div><div class='add'>+</div><div class='add'>+	/* V4L2_CID_FLASH_STROBE */</div><div class='add'>+	v4l2_ctrl_new_std(&amp;flash-&gt;ctrls, &amp;as3645a_ctrl_ops,</div><div class='add'>+			  V4L2_CID_FLASH_STROBE, 0, 0, 0, 0);</div><div class='add'>+</div><div class='add'>+	/* V4L2_CID_FLASH_STROBE_STOP */</div><div class='add'>+	v4l2_ctrl_new_std(&amp;flash-&gt;ctrls, &amp;as3645a_ctrl_ops,</div><div class='add'>+			  V4L2_CID_FLASH_STROBE_STOP, 0, 0, 0, 0);</div><div class='add'>+</div><div class='add'>+	/* V4L2_CID_FLASH_STROBE_STATUS */</div><div class='add'>+	ctrl = v4l2_ctrl_new_std(&amp;flash-&gt;ctrls, &amp;as3645a_ctrl_ops,</div><div class='add'>+				 V4L2_CID_FLASH_STROBE_STATUS, 0, 1, 1, 1);</div><div class='add'>+	if (ctrl != NULL)</div><div class='add'>+		ctrl-&gt;flags |= V4L2_CTRL_FLAG_VOLATILE;</div><div class='add'>+</div><div class='add'>+	/* V4L2_CID_FLASH_TIMEOUT */</div><div class='add'>+	maximum = pdata-&gt;timeout_max;</div><div class='add'>+</div><div class='add'>+	v4l2_ctrl_new_std(&amp;flash-&gt;ctrls, &amp;as3645a_ctrl_ops,</div><div class='add'>+			  V4L2_CID_FLASH_TIMEOUT, AS3645A_FLASH_TIMEOUT_MIN,</div><div class='add'>+			  maximum, AS3645A_FLASH_TIMEOUT_STEP, maximum);</div><div class='add'>+</div><div class='add'>+	flash-&gt;timeout = maximum;</div><div class='add'>+</div><div class='add'>+	/* V4L2_CID_FLASH_INTENSITY */</div><div class='add'>+	maximum = pdata-&gt;flash_max_current;</div><div class='add'>+</div><div class='add'>+	v4l2_ctrl_new_std(&amp;flash-&gt;ctrls, &amp;as3645a_ctrl_ops,</div><div class='add'>+			  V4L2_CID_FLASH_INTENSITY, AS3645A_FLASH_INTENSITY_MIN,</div><div class='add'>+			  maximum, AS3645A_FLASH_INTENSITY_STEP, maximum);</div><div class='add'>+</div><div class='add'>+	flash-&gt;flash_current = (maximum - AS3645A_FLASH_INTENSITY_MIN)</div><div class='add'>+			     / AS3645A_FLASH_INTENSITY_STEP;</div><div class='add'>+</div><div class='add'>+	/* V4L2_CID_FLASH_TORCH_INTENSITY */</div><div class='add'>+	maximum = pdata-&gt;torch_max_current;</div><div class='add'>+</div><div class='add'>+	v4l2_ctrl_new_std(&amp;flash-&gt;ctrls, &amp;as3645a_ctrl_ops,</div><div class='add'>+			  V4L2_CID_FLASH_TORCH_INTENSITY,</div><div class='add'>+			  AS3645A_TORCH_INTENSITY_MIN, maximum,</div><div class='add'>+			  AS3645A_TORCH_INTENSITY_STEP,</div><div class='add'>+			  AS3645A_TORCH_INTENSITY_MIN);</div><div class='add'>+</div><div class='add'>+	flash-&gt;assist_current = 0;</div><div class='add'>+</div><div class='add'>+	/* V4L2_CID_FLASH_INDICATOR_INTENSITY */</div><div class='add'>+	v4l2_ctrl_new_std(&amp;flash-&gt;ctrls, &amp;as3645a_ctrl_ops,</div><div class='add'>+			  V4L2_CID_FLASH_INDICATOR_INTENSITY,</div><div class='add'>+			  AS3645A_INDICATOR_INTENSITY_MIN,</div><div class='add'>+			  AS3645A_INDICATOR_INTENSITY_MAX,</div><div class='add'>+			  AS3645A_INDICATOR_INTENSITY_STEP,</div><div class='add'>+			  AS3645A_INDICATOR_INTENSITY_MIN);</div><div class='add'>+</div><div class='add'>+	flash-&gt;indicator_current = 0;</div><div class='add'>+</div><div class='add'>+	/* V4L2_CID_FLASH_FAULT */</div><div class='add'>+	ctrl = v4l2_ctrl_new_std(&amp;flash-&gt;ctrls, &amp;as3645a_ctrl_ops,</div><div class='add'>+				 V4L2_CID_FLASH_FAULT, 0,</div><div class='add'>+				 V4L2_FLASH_FAULT_OVER_VOLTAGE |</div><div class='add'>+				 V4L2_FLASH_FAULT_TIMEOUT |</div><div class='add'>+				 V4L2_FLASH_FAULT_OVER_TEMPERATURE |</div><div class='add'>+				 V4L2_FLASH_FAULT_SHORT_CIRCUIT, 0, 0);</div><div class='add'>+	if (ctrl != NULL)</div><div class='add'>+		ctrl-&gt;flags |= V4L2_CTRL_FLAG_VOLATILE;</div><div class='add'>+</div><div class='add'>+	flash-&gt;subdev.ctrl_handler = &amp;flash-&gt;ctrls;</div><div class='add'>+</div><div class='add'>+	return flash-&gt;ctrls.error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int as3645a_probe(struct i2c_client *client,</div><div class='add'>+			 const struct i2c_device_id *devid)</div><div class='add'>+{</div><div class='add'>+	struct as3645a *flash;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (client-&gt;dev.platform_data == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	flash = kzalloc(sizeof(*flash), GFP_KERNEL);</div><div class='add'>+	if (flash == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	flash-&gt;pdata = client-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	v4l2_i2c_subdev_init(&amp;flash-&gt;subdev, client, &amp;as3645a_ops);</div><div class='add'>+	flash-&gt;subdev.internal_ops = &amp;as3645a_internal_ops;</div><div class='add'>+	flash-&gt;subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;</div><div class='add'>+</div><div class='add'>+	ret = as3645a_init_controls(flash);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	ret = media_entity_init(&amp;flash-&gt;subdev.entity, 0, NULL, 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	flash-&gt;subdev.entity.type = MEDIA_ENT_T_V4L2_SUBDEV_FLASH;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;flash-&gt;power_lock);</div><div class='add'>+</div><div class='add'>+	flash-&gt;led_mode = V4L2_FLASH_LED_MODE_NONE;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		v4l2_ctrl_handler_free(&amp;flash-&gt;ctrls);</div><div class='add'>+		kfree(flash);</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 __exit as3645a_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_subdev *subdev = i2c_get_clientdata(client);</div><div class='add'>+	struct as3645a *flash = to_as3645a(subdev);</div><div class='add'>+</div><div class='add'>+	v4l2_device_unregister_subdev(subdev);</div><div class='add'>+	v4l2_ctrl_handler_free(&amp;flash-&gt;ctrls);</div><div class='add'>+	media_entity_cleanup(&amp;flash-&gt;subdev.entity);</div><div class='add'>+	mutex_destroy(&amp;flash-&gt;power_lock);</div><div class='add'>+	kfree(flash);</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 as3645a_id_table[] = {</div><div class='add'>+	{ AS3645A_NAME, 0 },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, as3645a_id_table);</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops as3645a_pm_ops = {</div><div class='add'>+	.suspend = as3645a_suspend,</div><div class='add'>+	.resume = as3645a_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_driver as3645a_i2c_driver = {</div><div class='add'>+	.driver	= {</div><div class='add'>+		.name = AS3645A_NAME,</div><div class='add'>+		.pm   = &amp;as3645a_pm_ops,</div><div class='add'>+	},</div><div class='add'>+	.probe	= as3645a_probe,</div><div class='add'>+	.remove	= __exit_p(as3645a_remove),</div><div class='add'>+	.id_table = as3645a_id_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init as3645a_init(void)</div><div class='add'>+{</div><div class='add'>+	int rval;</div><div class='add'>+</div><div class='add'>+	rval = i2c_add_driver(&amp;as3645a_i2c_driver);</div><div class='add'>+	if (rval)</div><div class='add'>+		pr_err("%s: Failed to register the driver\n", AS3645A_NAME);</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit as3645a_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;as3645a_i2c_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(as3645a_init);</div><div class='add'>+module_exit(as3645a_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("LED flash driver for AS3645A, LM3555 and their clones");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/video/atmel-isi.c b/drivers/media/video/atmel-isi.c<br/>index 8c775c59e120..9fe4519176a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/atmel-isi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/atmel-isi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/atmel-isi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/atmel-isi.c</a></div><div class='hunk'>@@ -90,7 +90,10 @@ struct atmel_isi {</div><div class='ctx'> 	struct isi_dma_desc		dma_desc[MAX_BUFFER_NUM];</div><div class='ctx'> </div><div class='ctx'> 	struct completion		complete;</div><div class='add'>+	/* ISI peripherial clock */</div><div class='ctx'> 	struct clk			*pclk;</div><div class='add'>+	/* ISI_MCK, feed to camera sensor to generate pixel clock */</div><div class='add'>+	struct clk			*mck;</div><div class='ctx'> 	unsigned int			irq;</div><div class='ctx'> </div><div class='ctx'> 	struct isi_platform_data	*pdata;</div><div class='hunk'>@@ -766,6 +769,12 @@ static int isi_camera_add_device(struct soc_camera_device *icd)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	ret = clk_enable(isi-&gt;mck);</div><div class='add'>+	if (ret) {</div><div class='add'>+		clk_disable(isi-&gt;pclk);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	isi-&gt;icd = icd;</div><div class='ctx'> 	dev_dbg(icd-&gt;parent, "Atmel ISI Camera driver attached to camera %d\n",</div><div class='ctx'> 		 icd-&gt;devnum);</div><div class='hunk'>@@ -779,6 +788,7 @@ static void isi_camera_remove_device(struct soc_camera_device *icd)</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(icd != isi-&gt;icd);</div><div class='ctx'> </div><div class='add'>+	clk_disable(isi-&gt;mck);</div><div class='ctx'> 	clk_disable(isi-&gt;pclk);</div><div class='ctx'> 	isi-&gt;icd = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -803,7 +813,7 @@ static int isi_camera_querycap(struct soc_camera_host *ici,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int isi_camera_set_bus_param(struct soc_camera_device *icd, u32 pixfmt)</div><div class='add'>+static int isi_camera_set_bus_param(struct soc_camera_device *icd)</div><div class='ctx'> {</div><div class='ctx'> 	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);</div><div class='ctx'> 	struct soc_camera_host *ici = to_soc_camera_host(icd-&gt;parent);</div><div class='hunk'>@@ -874,7 +884,7 @@ static int isi_camera_set_bus_param(struct soc_camera_device *icd, u32 pixfmt)</div><div class='ctx'> </div><div class='ctx'> 	if (isi-&gt;pdata-&gt;has_emb_sync)</div><div class='ctx'> 		cfg1 |= ISI_CFG1_EMB_SYNC;</div><div class='del'>-	if (isi-&gt;pdata-&gt;isi_full_mode)</div><div class='add'>+	if (isi-&gt;pdata-&gt;full_mode)</div><div class='ctx'> 		cfg1 |= ISI_CFG1_FULL_MODE;</div><div class='ctx'> </div><div class='ctx'> 	isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS);</div><div class='hunk'>@@ -912,6 +922,7 @@ static int __devexit atmel_isi_remove(struct platform_device *pdev)</div><div class='ctx'> 			isi-&gt;fb_descriptors_phys);</div><div class='ctx'> </div><div class='ctx'> 	iounmap(isi-&gt;regs);</div><div class='add'>+	clk_put(isi-&gt;mck);</div><div class='ctx'> 	clk_put(isi-&gt;pclk);</div><div class='ctx'> 	kfree(isi);</div><div class='ctx'> </div><div class='hunk'>@@ -930,7 +941,7 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct isi_platform_data *pdata;</div><div class='ctx'> </div><div class='ctx'> 	pdata = dev-&gt;platform_data;</div><div class='del'>-	if (!pdata || !pdata-&gt;data_width_flags) {</div><div class='add'>+	if (!pdata || !pdata-&gt;data_width_flags || !pdata-&gt;mck_hz) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 			"No config available for Atmel ISI\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -959,6 +970,19 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;isi-&gt;video_buffer_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;isi-&gt;dma_desc_head);</div><div class='ctx'> </div><div class='add'>+	/* Get ISI_MCK, provided by programmable clock or external clock */</div><div class='add'>+	isi-&gt;mck = clk_get(dev, "isi_mck");</div><div class='add'>+	if (IS_ERR(isi-&gt;mck)) {</div><div class='add'>+		dev_err(dev, "Failed to get isi_mck\n");</div><div class='add'>+		ret = PTR_ERR(isi-&gt;mck);</div><div class='add'>+		goto err_clk_get;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set ISI_MCK's frequency, it should be faster than pixel clock */</div><div class='add'>+	ret = clk_set_rate(isi-&gt;mck, pdata-&gt;mck_hz);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_set_mck_rate;</div><div class='add'>+</div><div class='ctx'> 	isi-&gt;p_fb_descriptors = dma_alloc_coherent(&amp;pdev-&gt;dev,</div><div class='ctx'> 				sizeof(struct fbd) * MAX_BUFFER_NUM,</div><div class='ctx'> 				&amp;isi-&gt;fb_descriptors_phys,</div><div class='hunk'>@@ -1034,9 +1058,12 @@ err_alloc_ctx:</div><div class='ctx'> 			isi-&gt;p_fb_descriptors,</div><div class='ctx'> 			isi-&gt;fb_descriptors_phys);</div><div class='ctx'> err_alloc_descriptors:</div><div class='add'>+err_set_mck_rate:</div><div class='add'>+	clk_put(isi-&gt;mck);</div><div class='add'>+err_clk_get:</div><div class='ctx'> 	kfree(isi);</div><div class='ctx'> err_alloc_isi:</div><div class='del'>-	clk_put(isi-&gt;pclk);</div><div class='add'>+	clk_put(pclk);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/au0828/Kconfig b/drivers/media/video/au0828/Kconfig<br/>index 0c3a5ba0e857..81ba9d9d1b52 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/au0828/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/au0828/Kconfig</a></div><div class='hunk'>@@ -2,6 +2,7 @@</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'>+	depends on DVB_CAPTURE_DRIVERS</div><div class='ctx'> 	select I2C_ALGOBIT</div><div class='ctx'> 	select VIDEO_TVEEPROM</div><div class='ctx'> 	select VIDEOBUF_VMALLOC</div><div class='head'>diff --git a/drivers/media/video/au0828/au0828-i2c.c b/drivers/media/video/au0828/au0828-i2c.c<br/>index cbdb65c34f21..05c299fa5d79 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/au0828-i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/au0828/au0828-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/au0828/au0828-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/au0828/au0828-i2c.c</a></div><div class='hunk'>@@ -348,7 +348,7 @@ static void do_i2c_scan(char *name, struct i2c_client *c)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* init + register i2c algo-bit adapter */</div><div class='add'>+/* init + register i2c adapter */</div><div class='ctx'> int au0828_i2c_register(struct au0828_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	dprintk(1, "%s()\n", __func__);</div><div class='head'>diff --git a/drivers/media/video/bt8xx/bt848.h b/drivers/media/video/bt8xx/bt848.h<br/>index 0bcd95303bb0..c37e6acffded 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bt848.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/bt8xx/bt848.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bt848.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/bt8xx/bt848.h</a></div><div class='hunk'>@@ -30,6 +30,10 @@</div><div class='ctx'> #ifndef PCI_DEVICE_ID_BT849</div><div class='ctx'> #define PCI_DEVICE_ID_BT849     0x351</div><div class='ctx'> #endif</div><div class='add'>+#ifndef PCI_DEVICE_ID_FUSION879</div><div class='add'>+#define PCI_DEVICE_ID_FUSION879	0x36c</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef PCI_DEVICE_ID_BT878</div><div class='ctx'> #define PCI_DEVICE_ID_BT878     0x36e</div><div class='ctx'> #endif</div><div class='hunk'>@@ -37,7 +41,6 @@</div><div class='ctx'> #define PCI_DEVICE_ID_BT879     0x36f</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* Brooktree 848 registers */</div><div class='ctx'> </div><div class='ctx'> #define BT848_DSTATUS          0x000</div><div class='head'>diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c<br/>index 5939021d8eba..ff2933ab705f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-cards.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/bt8xx/bttv-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/bt8xx/bttv-cards.c</a></div><div class='hunk'>@@ -80,6 +80,8 @@ static void phytec_muxsel(struct bttv *btv, unsigned int input);</div><div class='ctx'> static void gv800s_muxsel(struct bttv *btv, unsigned int input);</div><div class='ctx'> static void gv800s_init(struct bttv *btv);</div><div class='ctx'> </div><div class='add'>+static void td3116_muxsel(struct bttv *btv, unsigned int input);</div><div class='add'>+</div><div class='ctx'> static int terratec_active_radio_upgrade(struct bttv *btv);</div><div class='ctx'> static int tea5757_read(struct bttv *btv);</div><div class='ctx'> static int tea5757_write(struct bttv *btv, int value);</div><div class='hunk'>@@ -284,7 +286,8 @@ static struct CARD {</div><div class='ctx'> 	{ 0x10b42636, BTTV_BOARD_HAUPPAUGE878,  "STB ???" },</div><div class='ctx'> 	{ 0x217d6606, BTTV_BOARD_WINFAST2000,   "Leadtek WinFast TV 2000" },</div><div class='ctx'> 	{ 0xfff6f6ff, BTTV_BOARD_WINFAST2000,   "Leadtek WinFast TV 2000" },</div><div class='del'>-	{ 0x03116000, BTTV_BOARD_SENSORAY311,   "Sensoray 311" },</div><div class='add'>+	{ 0x03116000, BTTV_BOARD_SENSORAY311_611, "Sensoray 311" },</div><div class='add'>+	{ 0x06116000, BTTV_BOARD_SENSORAY311_611, "Sensoray 611" },</div><div class='ctx'> 	{ 0x00790e11, BTTV_BOARD_WINDVR,        "Canopus WinDVR PCI" },</div><div class='ctx'> 	{ 0xa0fca1a0, BTTV_BOARD_ZOLTRIX,       "Face to Face Tvmax" },</div><div class='ctx'> 	{ 0x82b2aa6a, BTTV_BOARD_SIMUS_GVC1100, "SIMUS GVC1100" },</div><div class='hunk'>@@ -341,6 +344,7 @@ static struct CARD {</div><div class='ctx'> 	{ 0x15401835, BTTV_BOARD_PV183,         "Provideo PV183-6" },</div><div class='ctx'> 	{ 0x15401836, BTTV_BOARD_PV183,         "Provideo PV183-7" },</div><div class='ctx'> 	{ 0x15401837, BTTV_BOARD_PV183,         "Provideo PV183-8" },</div><div class='add'>+	{ 0x3116f200, BTTV_BOARD_TVT_TD3116,	"Tongwei Video Technology TD-3116" },</div><div class='ctx'> </div><div class='ctx'> 	{ 0, -1, NULL }</div><div class='ctx'> };</div><div class='hunk'>@@ -1526,10 +1530,10 @@ struct tvcard bttv_tvcards[] = {</div><div class='ctx'> 			GPIO20,22,23: R30,R29,R28</div><div class='ctx'> 		*/</div><div class='ctx'> 	},</div><div class='del'>-	[BTTV_BOARD_SENSORAY311] = {</div><div class='add'>+	[BTTV_BOARD_SENSORAY311_611] = {</div><div class='ctx'> 		/* Clay Kunz &lt;ckunz@mail.arc.nasa.gov&gt; */</div><div class='del'>-		/* you must jumper JP5 for the card to work */</div><div class='del'>-		.name           = "Sensoray 311",</div><div class='add'>+		/* you must jumper JP5 for the 311 card (PC/104+) to work */</div><div class='add'>+		.name           = "Sensoray 311/611",</div><div class='ctx'> 		.video_inputs   = 5,</div><div class='ctx'> 		/* .audio_inputs= 0, */</div><div class='ctx'> 		.svhs           = 4,</div><div class='hunk'>@@ -2879,6 +2883,16 @@ struct tvcard bttv_tvcards[] = {</div><div class='ctx'> 		.tuner_type     = TUNER_ABSENT,</div><div class='ctx'> 		.tuner_addr	= ADDR_UNSET,</div><div class='ctx'> 	},</div><div class='add'>+	[BTTV_BOARD_TVT_TD3116] = {</div><div class='add'>+		.name           = "Tongwei Video Technology TD-3116",</div><div class='add'>+		.video_inputs   = 16,</div><div class='add'>+		.gpiomask       = 0xc00ff,</div><div class='add'>+		.muxsel         = MUXSEL(2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2),</div><div class='add'>+		.muxsel_hook    = td3116_muxsel,</div><div class='add'>+		.svhs           = NO_SVHS,</div><div class='add'>+		.pll		= PLL_28,</div><div class='add'>+		.tuner_type     = TUNER_ABSENT,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);</div><div class='hunk'>@@ -3228,6 +3242,42 @@ static void geovision_muxsel(struct bttv *btv, unsigned int input)</div><div class='ctx'> 	gpio_bits(0xf, inmux);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The TD3116 has 2 74HC4051 muxes wired to the MUX0 input of a bt878.</div><div class='add'>+ * The first 74HC4051 has the lower 8 inputs, the second one the higher 8.</div><div class='add'>+ * The muxes are controlled via a 74HC373 latch which is connected to</div><div class='add'>+ * GPIOs 0-7. GPIO 18 is connected to the LE signal of the latch.</div><div class='add'>+ * Q0 of the latch is connected to the Enable (~E) input of the first</div><div class='add'>+ * 74HC4051. Q1 - Q3 are connected to S0 - S2 of the same 74HC4051.</div><div class='add'>+ * Q4 - Q7 are connected to the second 74HC4051 in the same way.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void td3116_latch_value(struct bttv *btv, u32 value)</div><div class='add'>+{</div><div class='add'>+	gpio_bits((1&lt;&lt;18) | 0xff, value);</div><div class='add'>+	gpio_bits((1&lt;&lt;18) | 0xff, (1&lt;&lt;18) | value);</div><div class='add'>+	udelay(1);</div><div class='add'>+	gpio_bits((1&lt;&lt;18) | 0xff, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void td3116_muxsel(struct bttv *btv, unsigned int input)</div><div class='add'>+{</div><div class='add'>+	u32 value;</div><div class='add'>+	u32 highbit;</div><div class='add'>+</div><div class='add'>+	highbit = (input &amp; 0x8) &gt;&gt; 3 ;</div><div class='add'>+</div><div class='add'>+	/* Disable outputs and set value in the mux */</div><div class='add'>+	value = 0x11; /* Disable outputs */</div><div class='add'>+	value |= ((input &amp; 0x7) &lt;&lt; 1)  &lt;&lt; (4 * highbit);</div><div class='add'>+	td3116_latch_value(btv, value);</div><div class='add'>+</div><div class='add'>+	/* Enable the correct output */</div><div class='add'>+	value &amp;= ~0x11;</div><div class='add'>+	value |= ((highbit ^ 0x1) &lt;&lt; 4) | highbit;</div><div class='add'>+	td3116_latch_value(btv, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> static void bttv_reset_audio(struct bttv *btv)</div><div class='head'>diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c<br/>index 3dd06607aec2..76c301f05095 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-driver.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/bt8xx/bttv-driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/bt8xx/bttv-driver.c</a></div><div class='hunk'>@@ -4572,6 +4572,7 @@ static struct pci_device_id bttv_pci_tbl[] = {</div><div class='ctx'> 	{PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT849), 0},</div><div class='ctx'> 	{PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT878), 0},</div><div class='ctx'> 	{PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT879), 0},</div><div class='add'>+	{PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_FUSION879), 0},</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/bt8xx/bttv-i2c.c b/drivers/media/video/bt8xx/bttv-i2c.c<br/>index e3952af7e56e..580c8e682392 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/bt8xx/bttv-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/bt8xx/bttv-i2c.c</a></div><div class='hunk'>@@ -346,7 +346,7 @@ static void do_i2c_scan(char *name, struct i2c_client *c)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* init + register i2c algo-bit adapter */</div><div class='add'>+/* init + register i2c adapter */</div><div class='ctx'> int __devinit init_bttv_i2c(struct bttv *btv)</div><div class='ctx'> {</div><div class='ctx'> 	strlcpy(btv-&gt;i2c_client.name, "bttv internal", I2C_NAME_SIZE);</div><div class='head'>diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h<br/>index c6333595c6b9..c5171619ac79 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/bt8xx/bttv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/bt8xx/bttv.h</a></div><div class='hunk'>@@ -96,7 +96,7 @@</div><div class='ctx'> #define BTTV_BOARD_PV_BT878P_PLUS          0x46</div><div class='ctx'> #define BTTV_BOARD_FLYVIDEO98EZ            0x47</div><div class='ctx'> #define BTTV_BOARD_PV_BT878P_9B            0x48</div><div class='del'>-#define BTTV_BOARD_SENSORAY311             0x49</div><div class='add'>+#define BTTV_BOARD_SENSORAY311_611         0x49</div><div class='ctx'> #define BTTV_BOARD_RV605                   0x4a</div><div class='ctx'> #define BTTV_BOARD_POWERCLR_MTV878         0x4b</div><div class='ctx'> #define BTTV_BOARD_WINDVR                  0x4c</div><div class='hunk'>@@ -183,6 +183,7 @@</div><div class='ctx'> #define BTTV_BOARD_GEOVISION_GV800S	   0x9d</div><div class='ctx'> #define BTTV_BOARD_GEOVISION_GV800S_SL	   0x9e</div><div class='ctx'> #define BTTV_BOARD_PV183                   0x9f</div><div class='add'>+#define BTTV_BOARD_TVT_TD3116		   0xa0</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* more card-specific defines */</div><div class='head'>diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c<br/>index cd8ff0473184..fda32f52554a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/c-qcam.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/c-qcam.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/c-qcam.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/c-qcam.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@ struct qcam {</div><div class='ctx'> </div><div class='ctx'> static int parport[MAX_CAMS] = { [1 ... MAX_CAMS-1] = -1 };</div><div class='ctx'> static int probe = 2;</div><div class='del'>-static int force_rgb;</div><div class='add'>+static bool force_rgb;</div><div class='ctx'> static int video_nr = -1;</div><div class='ctx'> </div><div class='ctx'> /* FIXME: parport=auto would never have worked, surely? --RR */</div><div class='head'>diff --git a/drivers/media/video/cs5345.c b/drivers/media/video/cs5345.c<br/>index 5909f2557ab4..1d64af9adf71 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cs5345.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cs5345.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cs5345.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cs5345.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@ MODULE_DESCRIPTION("i2c device driver for cs5345 Audio ADC");</div><div class='ctx'> MODULE_AUTHOR("Hans Verkuil");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> </div><div class='ctx'> module_param(debug, bool, 0644);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c<br/>index d93e5ab45fd3..51c5b9ad67d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cs53l32a.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cs53l32a.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cs53l32a.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cs53l32a.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@ MODULE_DESCRIPTION("i2c device driver for cs53l32a Audio ADC");</div><div class='ctx'> MODULE_AUTHOR("Martin Vaughan");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> </div><div class='ctx'> module_param(debug, bool, 0644);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c<br/>index c6ff32a6137c..349bd9c2aff5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-driver.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx18/cx18-driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx18/cx18-driver.c</a></div><div class='hunk'>@@ -75,7 +75,7 @@ static int radio[CX18_MAX_CARDS] = { -1, -1, -1, -1, -1, -1, -1, -1,</div><div class='ctx'> 				     -1, -1, -1, -1, -1, -1, -1, -1 };</div><div class='ctx'> static unsigned cardtype_c = 1;</div><div class='ctx'> static unsigned tuner_c = 1;</div><div class='del'>-static unsigned radio_c = 1;</div><div class='add'>+static bool radio_c = 1;</div><div class='ctx'> static char pal[] = "--";</div><div class='ctx'> static char secam[] = "--";</div><div class='ctx'> static char ntsc[] = "-";</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c<br/>index 14cb961c22bd..4bfd865a4106 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-fileops.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx18/cx18-fileops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-fileops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx18/cx18-fileops.c</a></div><div class='hunk'>@@ -751,20 +751,10 @@ int cx18_v4l2_close(struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	CX18_DEBUG_IOCTL("close() of %s\n", s-&gt;name);</div><div class='ctx'> </div><div class='del'>-	v4l2_fh_del(fh);</div><div class='del'>-	v4l2_fh_exit(fh);</div><div class='del'>-</div><div class='del'>-	/* Easy case first: this stream was never claimed by us */</div><div class='del'>-	if (s-&gt;id != id-&gt;open_id) {</div><div class='del'>-		kfree(id);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 'Unclaim' this stream */</div><div class='del'>-</div><div class='del'>-	/* Stop radio */</div><div class='ctx'> 	mutex_lock(&amp;cx-&gt;serialize_lock);</div><div class='del'>-	if (id-&gt;type == CX18_ENC_STREAM_TYPE_RAD) {</div><div class='add'>+	/* Stop radio */</div><div class='add'>+	if (id-&gt;type == CX18_ENC_STREAM_TYPE_RAD &amp;&amp;</div><div class='add'>+			v4l2_fh_is_singular_file(filp)) {</div><div class='ctx'> 		/* Closing radio device, return to TV mode */</div><div class='ctx'> 		cx18_mute(cx);</div><div class='ctx'> 		/* Mark that the radio is no longer in use */</div><div class='hunk'>@@ -781,10 +771,14 @@ int cx18_v4l2_close(struct file *filp)</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Done! Unmute and continue. */</div><div class='ctx'> 		cx18_unmute(cx);</div><div class='del'>-		cx18_release_stream(s);</div><div class='del'>-	} else {</div><div class='del'>-		cx18_stop_capture(id, 0);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	v4l2_fh_del(fh);</div><div class='add'>+	v4l2_fh_exit(fh);</div><div class='add'>+</div><div class='add'>+	/* 'Unclaim' this stream */</div><div class='add'>+	if (s-&gt;id == id-&gt;open_id)</div><div class='add'>+		cx18_stop_capture(id, 0);</div><div class='ctx'> 	kfree(id);</div><div class='ctx'> 	mutex_unlock(&amp;cx-&gt;serialize_lock);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -810,21 +804,15 @@ static int cx18_serialized_open(struct cx18_stream *s, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	item-&gt;open_id = cx-&gt;open_id++;</div><div class='ctx'> 	filp-&gt;private_data = &amp;item-&gt;fh;</div><div class='add'>+	v4l2_fh_add(&amp;item-&gt;fh);</div><div class='ctx'> </div><div class='del'>-	if (item-&gt;type == CX18_ENC_STREAM_TYPE_RAD) {</div><div class='del'>-		/* Try to claim this stream */</div><div class='del'>-		if (cx18_claim_stream(item, item-&gt;type)) {</div><div class='del'>-			/* No, it's already in use */</div><div class='del'>-			v4l2_fh_exit(&amp;item-&gt;fh);</div><div class='del'>-			kfree(item);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-</div><div class='add'>+	if (item-&gt;type == CX18_ENC_STREAM_TYPE_RAD &amp;&amp;</div><div class='add'>+			v4l2_fh_is_singular_file(filp)) {</div><div class='ctx'> 		if (!test_bit(CX18_F_I_RADIO_USER, &amp;cx-&gt;i_flags)) {</div><div class='ctx'> 			if (atomic_read(&amp;cx-&gt;ana_capturing) &gt; 0) {</div><div class='ctx'> 				/* switching to radio while capture is</div><div class='ctx'> 				   in progress is not polite */</div><div class='del'>-				cx18_release_stream(s);</div><div class='add'>+				v4l2_fh_del(&amp;item-&gt;fh);</div><div class='ctx'> 				v4l2_fh_exit(&amp;item-&gt;fh);</div><div class='ctx'> 				kfree(item);</div><div class='ctx'> 				return -EBUSY;</div><div class='hunk'>@@ -842,7 +830,6 @@ static int cx18_serialized_open(struct cx18_stream *s, struct file *filp)</div><div class='ctx'> 		/* Done! Unmute and continue. */</div><div class='ctx'> 		cx18_unmute(cx);</div><div class='ctx'> 	}</div><div class='del'>-	v4l2_fh_add(&amp;item-&gt;fh);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c<br/>index 040aaa87579d..51609d5c88ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx18/cx18-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx18/cx18-i2c.c</a></div><div class='hunk'>@@ -232,7 +232,7 @@ static struct i2c_algo_bit_data cx18_i2c_algo_template = {</div><div class='ctx'> 	.timeout	= CX18_ALGO_BIT_TIMEOUT*HZ /* jiffies */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* init + register i2c algo-bit adapter */</div><div class='add'>+/* init + register i2c adapter */</div><div class='ctx'> int init_cx18_i2c(struct cx18 *cx)</div><div class='ctx'> {</div><div class='ctx'> 	int i, err;</div><div class='head'>diff --git a/drivers/media/video/cx18/cx18-i2c.h b/drivers/media/video/cx18/cx18-i2c.h<br/>index bdfd1921e300..1180fdc8d983 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-i2c.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx18/cx18-i2c.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx18/cx18-i2c.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx18/cx18-i2c.h</a></div><div class='hunk'>@@ -24,6 +24,6 @@</div><div class='ctx'> int cx18_i2c_register(struct cx18 *cx, unsigned idx);</div><div class='ctx'> struct v4l2_subdev *cx18_find_hw(struct cx18 *cx, u32 hw);</div><div class='ctx'> </div><div class='del'>-/* init + register i2c algo-bit adapter */</div><div class='add'>+/* init + register i2c adapter */</div><div class='ctx'> int init_cx18_i2c(struct cx18 *cx);</div><div class='ctx'> void exit_cx18_i2c(struct cx18 *cx);</div><div class='head'>diff --git a/drivers/media/video/cx231xx/Kconfig b/drivers/media/video/cx231xx/Kconfig<br/>index ae85a7a7bd73..446f692aabb7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx231xx/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx231xx/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx231xx/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx231xx/Kconfig</a></div><div class='hunk'>@@ -40,10 +40,10 @@ config VIDEO_CX231XX_ALSA</div><div class='ctx'> </div><div class='ctx'> config VIDEO_CX231XX_DVB</div><div class='ctx'> 	tristate "DVB/ATSC Support for Cx231xx based TV cards"</div><div class='del'>-	depends on VIDEO_CX231XX &amp;&amp; DVB_CORE</div><div class='add'>+	depends on VIDEO_CX231XX &amp;&amp; DVB_CORE &amp;&amp; DVB_CAPTURE_DRIVERS</div><div class='ctx'> 	select VIDEOBUF_DVB</div><div class='del'>-	select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE</div><div class='del'>-	select MEDIA_TUNER_NXP18271 if !DVB_FE_CUSTOMISE</div><div class='add'>+	select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMISE</div><div class='add'>+	select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMISE</div><div class='ctx'> 	select DVB_MB86A20S if !DVB_FE_CUSTOMISE</div><div class='ctx'> </div><div class='ctx'> 	---help---</div><div class='head'>diff --git a/drivers/media/video/cx231xx/cx231xx-audio.c b/drivers/media/video/cx231xx/cx231xx-audio.c<br/>index 30d13c15739a..a2c2b7d343ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx231xx/cx231xx-audio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx231xx/cx231xx-audio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx231xx/cx231xx-audio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx231xx/cx231xx-audio.c</a></div><div class='hunk'>@@ -111,6 +111,9 @@ static void cx231xx_audio_isocirq(struct urb *urb)</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;state &amp; DEV_DISCONNECTED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	switch (urb-&gt;status) {</div><div class='ctx'> 	case 0:		/* success */</div><div class='ctx'> 	case -ETIMEDOUT:	/* NAK */</div><div class='hunk'>@@ -196,6 +199,9 @@ static void cx231xx_audio_bulkirq(struct urb *urb)</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;state &amp; DEV_DISCONNECTED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	switch (urb-&gt;status) {</div><div class='ctx'> 	case 0:		/* success */</div><div class='ctx'> 	case -ETIMEDOUT:	/* NAK */</div><div class='hunk'>@@ -273,6 +279,9 @@ static int cx231xx_init_audio_isoc(struct cx231xx *dev)</div><div class='ctx'> </div><div class='ctx'> 	cx231xx_info("%s: Starting ISO AUDIO transfers\n", __func__);</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;state &amp; DEV_DISCONNECTED)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	sb_size = CX231XX_ISO_NUM_AUDIO_PACKETS * dev-&gt;adev.max_pkt_size;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; CX231XX_AUDIO_BUFS; i++) {</div><div class='hunk'>@@ -298,7 +307,7 @@ static int cx231xx_init_audio_isoc(struct cx231xx *dev)</div><div class='ctx'> 		urb-&gt;context = dev;</div><div class='ctx'> 		urb-&gt;pipe = usb_rcvisocpipe(dev-&gt;udev,</div><div class='ctx'> 						dev-&gt;adev.end_point_addr);</div><div class='del'>-		urb-&gt;transfer_flags = URB_ISO_ASAP;</div><div class='add'>+		urb-&gt;transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP;</div><div class='ctx'> 		urb-&gt;transfer_buffer = dev-&gt;adev.transfer_buffer[i];</div><div class='ctx'> 		urb-&gt;interval = 1;</div><div class='ctx'> 		urb-&gt;complete = cx231xx_audio_isocirq;</div><div class='hunk'>@@ -331,6 +340,9 @@ static int cx231xx_init_audio_bulk(struct cx231xx *dev)</div><div class='ctx'> </div><div class='ctx'> 	cx231xx_info("%s: Starting BULK AUDIO transfers\n", __func__);</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;state &amp; DEV_DISCONNECTED)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	sb_size = CX231XX_NUM_AUDIO_PACKETS * dev-&gt;adev.max_pkt_size;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; CX231XX_AUDIO_BUFS; i++) {</div><div class='hunk'>@@ -356,7 +368,7 @@ static int cx231xx_init_audio_bulk(struct cx231xx *dev)</div><div class='ctx'> 		urb-&gt;context = dev;</div><div class='ctx'> 		urb-&gt;pipe = usb_rcvbulkpipe(dev-&gt;udev,</div><div class='ctx'> 						dev-&gt;adev.end_point_addr);</div><div class='del'>-		urb-&gt;transfer_flags = 0;</div><div class='add'>+		urb-&gt;transfer_flags = URB_NO_TRANSFER_DMA_MAP;</div><div class='ctx'> 		urb-&gt;transfer_buffer = dev-&gt;adev.transfer_buffer[i];</div><div class='ctx'> 		urb-&gt;complete = cx231xx_audio_bulkirq;</div><div class='ctx'> 		urb-&gt;transfer_buffer_length = sb_size;</div><div class='hunk'>@@ -432,6 +444,11 @@ static int snd_cx231xx_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;state &amp; DEV_DISCONNECTED) {</div><div class='add'>+		cx231xx_errdev("Can't open. the device was removed.\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Sets volume, mute, etc */</div><div class='ctx'> 	dev-&gt;mute = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -571,6 +588,9 @@ static int snd_cx231xx_capture_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 	struct cx231xx *dev = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;state &amp; DEV_DISCONNECTED)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;dev-&gt;adev.slock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='head'>diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c<br/>index 53dae2a8272d..875a7ce94736 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx231xx/cx231xx-cards.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx231xx/cx231xx-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx231xx/cx231xx-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx231xx/cx231xx-cards.c</a></div><div class='hunk'>@@ -843,25 +843,34 @@ void cx231xx_release_resources(struct cx231xx *dev)</div><div class='ctx'> </div><div class='ctx'> 	cx231xx_remove_from_devlist(dev);</div><div class='ctx'> </div><div class='add'>+	cx231xx_ir_exit(dev);</div><div class='add'>+</div><div class='ctx'> 	/* Release I2C buses */</div><div class='ctx'> 	cx231xx_dev_uninit(dev);</div><div class='ctx'> </div><div class='del'>-	cx231xx_ir_exit(dev);</div><div class='add'>+	/* delete v4l2 device */</div><div class='add'>+	v4l2_device_unregister(&amp;dev-&gt;v4l2_dev);</div><div class='ctx'> </div><div class='ctx'> 	usb_put_dev(dev-&gt;udev);</div><div class='ctx'> </div><div class='ctx'> 	/* Mark device as unused */</div><div class='del'>-	cx231xx_devused &amp;= ~(1 &lt;&lt; dev-&gt;devno);</div><div class='add'>+	clear_bit(dev-&gt;devno, &amp;cx231xx_devused);</div><div class='add'>+</div><div class='add'>+	kfree(dev-&gt;video_mode.alt_max_pkt_size);</div><div class='add'>+	kfree(dev-&gt;vbi_mode.alt_max_pkt_size);</div><div class='add'>+	kfree(dev-&gt;sliced_cc_mode.alt_max_pkt_size);</div><div class='add'>+	kfree(dev-&gt;ts1_mode.alt_max_pkt_size);</div><div class='add'>+	kfree(dev);</div><div class='add'>+	dev = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cx231xx_init_dev()</div><div class='ctx'>  * allocates and inits the device structs, registers i2c bus and v4l device</div><div class='ctx'>  */</div><div class='del'>-static int cx231xx_init_dev(struct cx231xx **devhandle, struct usb_device *udev,</div><div class='add'>+static int cx231xx_init_dev(struct cx231xx *dev, struct usb_device *udev,</div><div class='ctx'> 			    int minor)</div><div class='ctx'> {</div><div class='del'>-	struct cx231xx *dev = *devhandle;</div><div class='ctx'> 	int retval = -ENOMEM;</div><div class='ctx'> 	int errCode;</div><div class='ctx'> 	unsigned int maxh, maxw;</div><div class='hunk'>@@ -1016,7 +1025,6 @@ static int cx231xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> 	int i, isoc_pipe = 0;</div><div class='ctx'> 	char *speed;</div><div class='ctx'> 	char descr[255] = "";</div><div class='del'>-	struct usb_interface *lif = NULL;</div><div class='ctx'> 	struct usb_interface_assoc_descriptor *assoc_desc;</div><div class='ctx'> </div><div class='ctx'> 	udev = usb_get_dev(interface_to_usbdev(interface));</div><div class='hunk'>@@ -1030,21 +1038,21 @@ static int cx231xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* Check to see next free device and mark as used */</div><div class='del'>-	nr = find_first_zero_bit(&amp;cx231xx_devused, CX231XX_MAXBOARDS);</div><div class='del'>-	cx231xx_devused |= 1 &lt;&lt; nr;</div><div class='del'>-</div><div class='del'>-	if (nr &gt;= CX231XX_MAXBOARDS) {</div><div class='del'>-		cx231xx_err(DRIVER_NAME</div><div class='del'>-		 ": Supports only %i cx231xx boards.\n", CX231XX_MAXBOARDS);</div><div class='del'>-		cx231xx_devused &amp;= ~(1 &lt;&lt; nr);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	do {</div><div class='add'>+		nr = find_first_zero_bit(&amp;cx231xx_devused, CX231XX_MAXBOARDS);</div><div class='add'>+		if (nr &gt;= CX231XX_MAXBOARDS) {</div><div class='add'>+			/* No free device slots */</div><div class='add'>+			cx231xx_err(DRIVER_NAME ": Supports only %i devices.\n",</div><div class='add'>+					CX231XX_MAXBOARDS);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	} while (test_and_set_bit(nr, &amp;cx231xx_devused));</div><div class='ctx'> </div><div class='ctx'> 	/* allocate memory for our device state and initialize it */</div><div class='ctx'> 	dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='ctx'> 	if (dev == NULL) {</div><div class='ctx'> 		cx231xx_err(DRIVER_NAME ": out of memory!\n");</div><div class='del'>-		cx231xx_devused &amp;= ~(1 &lt;&lt; nr);</div><div class='add'>+		clear_bit(nr, &amp;cx231xx_devused);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1071,9 +1079,6 @@ static int cx231xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> </div><div class='ctx'> 	/* init CIR module TBD */</div><div class='ctx'> </div><div class='del'>-	/* store the current interface */</div><div class='del'>-	lif = interface;</div><div class='del'>-</div><div class='ctx'> 	/*mode_tv: digital=1 or analog=0*/</div><div class='ctx'> 	dev-&gt;mode_tv = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1113,9 +1118,6 @@ static int cx231xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> 	     le16_to_cpu(udev-&gt;descriptor.idProduct),</div><div class='ctx'> 	     dev-&gt;max_iad_interface_count);</div><div class='ctx'> </div><div class='del'>-	/* store the interface 0 back */</div><div class='del'>-	lif = udev-&gt;actconfig-&gt;interface[0];</div><div class='del'>-</div><div class='ctx'> 	/* increment interface count */</div><div class='ctx'> 	dev-&gt;interface_count++;</div><div class='ctx'> </div><div class='hunk'>@@ -1126,7 +1128,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> 	if (assoc_desc-&gt;bFirstInterface != ifnum) {</div><div class='ctx'> 		cx231xx_err(DRIVER_NAME ": Not found "</div><div class='ctx'> 			    "matching IAD interface\n");</div><div class='del'>-		cx231xx_devused &amp;= ~(1 &lt;&lt; nr);</div><div class='add'>+		clear_bit(dev-&gt;devno, &amp;cx231xx_devused);</div><div class='ctx'> 		kfree(dev);</div><div class='ctx'> 		dev = NULL;</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -1135,7 +1137,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> 	cx231xx_info("registering interface %d\n", ifnum);</div><div class='ctx'> </div><div class='ctx'> 	/* save our data pointer in this interface device */</div><div class='del'>-	usb_set_intfdata(lif, dev);</div><div class='add'>+	usb_set_intfdata(interface, dev);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * AV device initialization - only done at the last interface</div><div class='hunk'>@@ -1145,19 +1147,19 @@ static int cx231xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> 	retval = v4l2_device_register(&amp;interface-&gt;dev, &amp;dev-&gt;v4l2_dev);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		cx231xx_errdev("v4l2_device_register failed\n");</div><div class='del'>-		cx231xx_devused &amp;= ~(1 &lt;&lt; nr);</div><div class='add'>+		clear_bit(dev-&gt;devno, &amp;cx231xx_devused);</div><div class='ctx'> 		kfree(dev);</div><div class='ctx'> 		dev = NULL;</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* allocate device struct */</div><div class='del'>-	retval = cx231xx_init_dev(&amp;dev, udev, nr);</div><div class='add'>+	retval = cx231xx_init_dev(dev, udev, nr);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		cx231xx_devused &amp;= ~(1 &lt;&lt; dev-&gt;devno);</div><div class='add'>+		clear_bit(dev-&gt;devno, &amp;cx231xx_devused);</div><div class='ctx'> 		v4l2_device_unregister(&amp;dev-&gt;v4l2_dev);</div><div class='ctx'> 		kfree(dev);</div><div class='ctx'> 		dev = NULL;</div><div class='del'>-		usb_set_intfdata(lif, NULL);</div><div class='add'>+		usb_set_intfdata(interface, NULL);</div><div class='ctx'> </div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1178,7 +1180,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;video_mode.alt_max_pkt_size == NULL) {</div><div class='ctx'> 		cx231xx_errdev("out of memory!\n");</div><div class='del'>-		cx231xx_devused &amp;= ~(1 &lt;&lt; nr);</div><div class='add'>+		clear_bit(dev-&gt;devno, &amp;cx231xx_devused);</div><div class='ctx'> 		v4l2_device_unregister(&amp;dev-&gt;v4l2_dev);</div><div class='ctx'> 		kfree(dev);</div><div class='ctx'> 		dev = NULL;</div><div class='hunk'>@@ -1212,7 +1214,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;vbi_mode.alt_max_pkt_size == NULL) {</div><div class='ctx'> 		cx231xx_errdev("out of memory!\n");</div><div class='del'>-		cx231xx_devused &amp;= ~(1 &lt;&lt; nr);</div><div class='add'>+		clear_bit(dev-&gt;devno, &amp;cx231xx_devused);</div><div class='ctx'> 		v4l2_device_unregister(&amp;dev-&gt;v4l2_dev);</div><div class='ctx'> 		kfree(dev);</div><div class='ctx'> 		dev = NULL;</div><div class='hunk'>@@ -1247,7 +1249,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;sliced_cc_mode.alt_max_pkt_size == NULL) {</div><div class='ctx'> 		cx231xx_errdev("out of memory!\n");</div><div class='del'>-		cx231xx_devused &amp;= ~(1 &lt;&lt; nr);</div><div class='add'>+		clear_bit(dev-&gt;devno, &amp;cx231xx_devused);</div><div class='ctx'> 		v4l2_device_unregister(&amp;dev-&gt;v4l2_dev);</div><div class='ctx'> 		kfree(dev);</div><div class='ctx'> 		dev = NULL;</div><div class='hunk'>@@ -1283,7 +1285,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> </div><div class='ctx'> 		if (dev-&gt;ts1_mode.alt_max_pkt_size == NULL) {</div><div class='ctx'> 			cx231xx_errdev("out of memory!\n");</div><div class='del'>-			cx231xx_devused &amp;= ~(1 &lt;&lt; nr);</div><div class='add'>+			clear_bit(dev-&gt;devno, &amp;cx231xx_devused);</div><div class='ctx'> 			v4l2_device_unregister(&amp;dev-&gt;v4l2_dev);</div><div class='ctx'> 			kfree(dev);</div><div class='ctx'> 			dev = NULL;</div><div class='hunk'>@@ -1334,10 +1336,9 @@ static void cx231xx_usb_disconnect(struct usb_interface *interface)</div><div class='ctx'> 	if (!dev-&gt;udev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	flush_request_modules(dev);</div><div class='add'>+	dev-&gt;state |= DEV_DISCONNECTED;</div><div class='ctx'> </div><div class='del'>-	/* delete v4l2 device */</div><div class='del'>-	v4l2_device_unregister(&amp;dev-&gt;v4l2_dev);</div><div class='add'>+	flush_request_modules(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* wait until all current v4l2 io is finished then deallocate</div><div class='ctx'> 	   resources */</div><div class='hunk'>@@ -1351,31 +1352,24 @@ static void cx231xx_usb_disconnect(struct usb_interface *interface)</div><div class='ctx'> 		     "deallocation are deferred on close.\n",</div><div class='ctx'> 		     video_device_node_name(dev-&gt;vdev));</div><div class='ctx'> </div><div class='del'>-		dev-&gt;state |= DEV_MISCONFIGURED;</div><div class='add'>+		/* Even having users, it is safe to remove the RC i2c driver */</div><div class='add'>+		cx231xx_ir_exit(dev);</div><div class='add'>+</div><div class='ctx'> 		if (dev-&gt;USE_ISO)</div><div class='ctx'> 			cx231xx_uninit_isoc(dev);</div><div class='ctx'> 		else</div><div class='ctx'> 			cx231xx_uninit_bulk(dev);</div><div class='del'>-		dev-&gt;state |= DEV_DISCONNECTED;</div><div class='ctx'> 		wake_up_interruptible(&amp;dev-&gt;wait_frame);</div><div class='ctx'> 		wake_up_interruptible(&amp;dev-&gt;wait_stream);</div><div class='ctx'> 	} else {</div><div class='del'>-		dev-&gt;state |= DEV_DISCONNECTED;</div><div class='del'>-		cx231xx_release_resources(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cx231xx_close_extension(dev);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;users) {</div><div class='del'>-		kfree(dev-&gt;video_mode.alt_max_pkt_size);</div><div class='del'>-		kfree(dev-&gt;vbi_mode.alt_max_pkt_size);</div><div class='del'>-		kfree(dev-&gt;sliced_cc_mode.alt_max_pkt_size);</div><div class='del'>-		kfree(dev-&gt;ts1_mode.alt_max_pkt_size);</div><div class='del'>-		kfree(dev);</div><div class='del'>-		dev = NULL;</div><div class='del'>-	}</div><div class='add'>+	if (!dev-&gt;users)</div><div class='add'>+		cx231xx_release_resources(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct usb_driver cx231xx_usb_driver = {</div><div class='hunk'>@@ -1385,26 +1379,4 @@ static struct usb_driver cx231xx_usb_driver = {</div><div class='ctx'> 	.id_table = cx231xx_id_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init cx231xx_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO DRIVER_NAME " v4l2 driver loaded.\n");</div><div class='del'>-</div><div class='del'>-	/* register this driver with the USB subsystem */</div><div class='del'>-	result = usb_register(&amp;cx231xx_usb_driver);</div><div class='del'>-	if (result)</div><div class='del'>-		cx231xx_err(DRIVER_NAME</div><div class='del'>-			    " usb_register failed. Error number %d.\n", result);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cx231xx_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver with the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;cx231xx_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(cx231xx_module_init);</div><div class='del'>-module_exit(cx231xx_module_exit);</div><div class='add'>+module_usb_driver(cx231xx_usb_driver);</div><div class='head'>diff --git a/drivers/media/video/cx231xx/cx231xx-core.c b/drivers/media/video/cx231xx/cx231xx-core.c<br/>index d4457f9488ee..08dd930f882a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx231xx/cx231xx-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx231xx/cx231xx-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx231xx/cx231xx-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx231xx/cx231xx-core.c</a></div><div class='hunk'>@@ -166,6 +166,9 @@ int cx231xx_send_usb_command(struct cx231xx_i2c *i2c_bus,</div><div class='ctx'> 	u8 _i2c_nostop = 0;</div><div class='ctx'> 	u8 _i2c_reserve = 0;</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;state &amp; DEV_DISCONNECTED)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	/* Get the I2C period, nostop and reserve parameters */</div><div class='ctx'> 	_i2c_period = i2c_bus-&gt;i2c_period;</div><div class='ctx'> 	_i2c_nostop = i2c_bus-&gt;i2c_nostop;</div><div class='hunk'>@@ -1071,7 +1074,7 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,</div><div class='ctx'> 				 sb_size, cx231xx_isoc_irq_callback, dma_q, 1);</div><div class='ctx'> </div><div class='ctx'> 		urb-&gt;number_of_packets = max_packets;</div><div class='del'>-		urb-&gt;transfer_flags = URB_ISO_ASAP;</div><div class='add'>+		urb-&gt;transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP;</div><div class='ctx'> </div><div class='ctx'> 		k = 0;</div><div class='ctx'> 		for (j = 0; j &lt; max_packets; j++) {</div><div class='hunk'>@@ -1182,7 +1185,7 @@ int cx231xx_init_bulk(struct cx231xx *dev, int max_packets,</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 		dev-&gt;video_mode.bulk_ctl.urb[i] = urb;</div><div class='del'>-		urb-&gt;transfer_flags = 0;</div><div class='add'>+		urb-&gt;transfer_flags = URB_NO_TRANSFER_DMA_MAP;</div><div class='ctx'> </div><div class='ctx'> 		dev-&gt;video_mode.bulk_ctl.transfer_buffer[i] =</div><div class='ctx'> 		    usb_alloc_coherent(dev-&gt;udev, sb_size, GFP_KERNEL,</div><div class='head'>diff --git a/drivers/media/video/cx231xx/cx231xx-dvb.c b/drivers/media/video/cx231xx/cx231xx-dvb.c<br/>index da9a4a0aab79..7c4e360ba9bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx231xx/cx231xx-dvb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx231xx/cx231xx-dvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx231xx/cx231xx-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx231xx/cx231xx-dvb.c</a></div><div class='hunk'>@@ -196,7 +196,7 @@ static inline int dvb_isoc_copy(struct cx231xx *dev, struct urb *urb)</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if ((dev-&gt;state &amp; DEV_DISCONNECTED) || (dev-&gt;state &amp; DEV_MISCONFIGURED))</div><div class='add'>+	if (dev-&gt;state &amp; DEV_DISCONNECTED)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;status &lt; 0) {</div><div class='hunk'>@@ -228,7 +228,7 @@ static inline int dvb_bulk_copy(struct cx231xx *dev, struct urb *urb)</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if ((dev-&gt;state &amp; DEV_DISCONNECTED) || (dev-&gt;state &amp; DEV_MISCONFIGURED))</div><div class='add'>+	if (dev-&gt;state &amp; DEV_DISCONNECTED)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;status &lt; 0) {</div><div class='head'>diff --git a/drivers/media/video/cx231xx/cx231xx-input.c b/drivers/media/video/cx231xx/cx231xx-input.c<br/>index 45e14cac4622..96176e9db5a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx231xx/cx231xx-input.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx231xx/cx231xx-input.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx231xx/cx231xx-input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx231xx/cx231xx-input.c</a></div><div class='hunk'>@@ -27,12 +27,16 @@</div><div class='ctx'> static int get_key_isdbt(struct IR_i2c *ir, u32 *ir_key,</div><div class='ctx'> 			 u32 *ir_raw)</div><div class='ctx'> {</div><div class='add'>+	int	rc;</div><div class='ctx'> 	u8	cmd, scancode;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;ir-&gt;rc-&gt;input_dev-&gt;dev, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 		/* poll IR chip */</div><div class='del'>-	if (1 != i2c_master_recv(ir-&gt;c, &amp;cmd, 1))</div><div class='add'>+	rc = i2c_master_recv(ir-&gt;c, &amp;cmd, 1);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	if (rc != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	/* it seems that 0xFE indicates that a button is still hold</div><div class='hunk'>@@ -102,11 +106,14 @@ int cx231xx_ir_init(struct cx231xx *dev)</div><div class='ctx'> 	ir_i2c_bus = cx231xx_boards[dev-&gt;model].ir_i2c_master;</div><div class='ctx'> 	dev_dbg(&amp;dev-&gt;udev-&gt;dev, "Trying to bind ir at bus %d, addr 0x%02x\n",</div><div class='ctx'> 		ir_i2c_bus, info.addr);</div><div class='del'>-	i2c_new_device(&amp;dev-&gt;i2c_bus[ir_i2c_bus].i2c_adap, &amp;info);</div><div class='add'>+	dev-&gt;ir_i2c_client = i2c_new_device(&amp;dev-&gt;i2c_bus[ir_i2c_bus].i2c_adap, &amp;info);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void cx231xx_ir_exit(struct cx231xx *dev)</div><div class='ctx'> {</div><div class='add'>+	if (dev-&gt;ir_i2c_client)</div><div class='add'>+		i2c_unregister_device(dev-&gt;ir_i2c_client);</div><div class='add'>+	dev-&gt;ir_i2c_client = NULL;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/cx231xx/cx231xx-vbi.c b/drivers/media/video/cx231xx/cx231xx-vbi.c<br/>index 1c7a4daafecf..8cdee5f78f13 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx231xx/cx231xx-vbi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx231xx/cx231xx-vbi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx231xx/cx231xx-vbi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx231xx/cx231xx-vbi.c</a></div><div class='hunk'>@@ -93,7 +93,7 @@ static inline int cx231xx_isoc_vbi_copy(struct cx231xx *dev, struct urb *urb)</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if ((dev-&gt;state &amp; DEV_DISCONNECTED) || (dev-&gt;state &amp; DEV_MISCONFIGURED))</div><div class='add'>+	if (dev-&gt;state &amp; DEV_DISCONNECTED)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;status &lt; 0) {</div><div class='hunk'>@@ -452,7 +452,7 @@ int cx231xx_init_vbi_isoc(struct cx231xx *dev, int max_packets,</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 		dev-&gt;vbi_mode.bulk_ctl.urb[i] = urb;</div><div class='del'>-		urb-&gt;transfer_flags = 0;</div><div class='add'>+		urb-&gt;transfer_flags = URB_NO_TRANSFER_DMA_MAP;</div><div class='ctx'> </div><div class='ctx'> 		dev-&gt;vbi_mode.bulk_ctl.transfer_buffer[i] =</div><div class='ctx'> 		    kzalloc(sb_size, GFP_KERNEL);</div><div class='head'>diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c<br/>index 6e81f970dc7d..829a41b0c9ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx231xx/cx231xx-video.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx231xx/cx231xx-video.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx231xx/cx231xx-video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx231xx/cx231xx-video.c</a></div><div class='hunk'>@@ -337,7 +337,7 @@ static inline int cx231xx_isoc_copy(struct cx231xx *dev, struct urb *urb)</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if ((dev-&gt;state &amp; DEV_DISCONNECTED) || (dev-&gt;state &amp; DEV_MISCONFIGURED))</div><div class='add'>+	if (dev-&gt;state &amp; DEV_DISCONNECTED)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;status &lt; 0) {</div><div class='hunk'>@@ -440,7 +440,7 @@ static inline int cx231xx_bulk_copy(struct cx231xx *dev, struct urb *urb)</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if ((dev-&gt;state &amp; DEV_DISCONNECTED) || (dev-&gt;state &amp; DEV_MISCONFIGURED))</div><div class='add'>+	if (dev-&gt;state &amp; DEV_DISCONNECTED)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;status &lt; 0) {</div><div class='hunk'>@@ -1000,12 +1000,6 @@ static int check_dev(struct cx231xx *dev)</div><div class='ctx'> 		cx231xx_errdev("v4l2 ioctl: device not present\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;state &amp; DEV_MISCONFIGURED) {</div><div class='del'>-		cx231xx_errdev("v4l2 ioctl: device is misconfigured; "</div><div class='del'>-			       "close and open it again\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2347,7 +2341,8 @@ static int cx231xx_v4l2_close(struct file *filp)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;users == 1) {</div><div class='add'>+	dev-&gt;users--;</div><div class='add'>+	if (!dev-&gt;users) {</div><div class='ctx'> 		videobuf_stop(&amp;fh-&gt;vb_vidq);</div><div class='ctx'> 		videobuf_mmap_free(&amp;fh-&gt;vb_vidq);</div><div class='ctx'> </div><div class='hunk'>@@ -2374,7 +2369,6 @@ static int cx231xx_v4l2_close(struct file *filp)</div><div class='ctx'> 		cx231xx_set_alt_setting(dev, INDEX_VIDEO, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(fh);</div><div class='del'>-	dev-&gt;users--;</div><div class='ctx'> 	wake_up_interruptible_nr(&amp;dev-&gt;open, 1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h<br/>index 2000bc64c497..e17447554a0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx231xx/cx231xx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx231xx/cx231xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx231xx/cx231xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx231xx/cx231xx.h</a></div><div class='hunk'>@@ -377,7 +377,6 @@ struct cx231xx_board {</div><div class='ctx'> enum cx231xx_dev_state {</div><div class='ctx'> 	DEV_INITIALIZED = 0x01,</div><div class='ctx'> 	DEV_DISCONNECTED = 0x02,</div><div class='del'>-	DEV_MISCONFIGURED = 0x04,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum AFE_MODE {</div><div class='hunk'>@@ -621,6 +620,7 @@ struct cx231xx {</div><div class='ctx'> </div><div class='ctx'> 	/* For I2C IR support */</div><div class='ctx'> 	struct IR_i2c_init_data    init_data;</div><div class='add'>+	struct i2c_client          *ir_i2c_client;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int stream_on:1;	/* Locks streams */</div><div class='ctx'> 	unsigned int vbi_stream_on:1;	/* Locks streams for VBI */</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c<br/>index 67c4a59bd882..f5c79e53e5a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-417.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx23885/cx23885-417.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-417.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx23885/cx23885-417.c</a></div><div class='hunk'>@@ -900,6 +900,7 @@ static int cx23885_load_firmware(struct cx23885_dev *dev)</div><div class='ctx'> 	int i, retval = 0;</div><div class='ctx'> 	u32 value = 0;</div><div class='ctx'> 	u32 gpio_output = 0;</div><div class='add'>+	u32 gpio_value;</div><div class='ctx'> 	u32 checksum = 0;</div><div class='ctx'> 	u32 *dataptr;</div><div class='ctx'> </div><div class='hunk'>@@ -907,7 +908,7 @@ static int cx23885_load_firmware(struct cx23885_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Save GPIO settings before reset of APU */</div><div class='ctx'> 	retval |= mc417_memory_read(dev, 0x9020, &amp;gpio_output);</div><div class='del'>-	retval |= mc417_memory_read(dev, 0x900C, &amp;value);</div><div class='add'>+	retval |= mc417_memory_read(dev, 0x900C, &amp;gpio_value);</div><div class='ctx'> </div><div class='ctx'> 	retval  = mc417_register_write(dev,</div><div class='ctx'> 		IVTV_REG_VPU, 0xFFFFFFED);</div><div class='hunk'>@@ -991,11 +992,18 @@ static int cx23885_load_firmware(struct cx23885_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* F/W power up disturbs the GPIOs, restore state */</div><div class='ctx'> 	retval |= mc417_register_write(dev, 0x9020, gpio_output);</div><div class='del'>-	retval |= mc417_register_write(dev, 0x900C, value);</div><div class='add'>+	retval |= mc417_register_write(dev, 0x900C, gpio_value);</div><div class='ctx'> </div><div class='ctx'> 	retval |= mc417_register_read(dev, IVTV_REG_VPU, &amp;value);</div><div class='ctx'> 	retval |= mc417_register_write(dev, IVTV_REG_VPU, value &amp; 0xFFFFFFE8);</div><div class='ctx'> </div><div class='add'>+	/* Hardcoded GPIO's here */</div><div class='add'>+	retval |= mc417_register_write(dev, 0x9020, 0x4000);</div><div class='add'>+	retval |= mc417_register_write(dev, 0x900C, 0x4000);</div><div class='add'>+</div><div class='add'>+	mc417_register_read(dev, 0x9020, &amp;gpio_output);</div><div class='add'>+	mc417_register_read(dev, 0x900C, &amp;gpio_value);</div><div class='add'>+</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='ctx'> 		printk(KERN_ERR "%s: Error with mc417_register_write\n",</div><div class='ctx'> 			__func__);</div><div class='hunk'>@@ -1015,6 +1023,12 @@ static void cx23885_codec_settings(struct cx23885_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	dprintk(1, "%s()\n", __func__);</div><div class='ctx'> </div><div class='add'>+	/* Dynamically change the height based on video standard */</div><div class='add'>+	if (dev-&gt;encodernorm.id &amp; V4L2_STD_525_60)</div><div class='add'>+		dev-&gt;ts1.height = 480;</div><div class='add'>+	else</div><div class='add'>+		dev-&gt;ts1.height = 576;</div><div class='add'>+</div><div class='ctx'> 	/* assign frame size */</div><div class='ctx'> 	cx23885_api_cmd(dev, CX2341X_ENC_SET_FRAME_SIZE, 2, 0,</div><div class='ctx'> 				dev-&gt;ts1.height, dev-&gt;ts1.width);</div><div class='hunk'>@@ -1030,7 +1044,7 @@ static void cx23885_codec_settings(struct cx23885_dev *dev)</div><div class='ctx'> 	cx23885_api_cmd(dev, CX2341X_ENC_MISC, 2, 0, 4, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx23885_initialize_codec(struct cx23885_dev *dev)</div><div class='add'>+static int cx23885_initialize_codec(struct cx23885_dev *dev, int startencoder)</div><div class='ctx'> {</div><div class='ctx'> 	int version;</div><div class='ctx'> 	int retval;</div><div class='hunk'>@@ -1112,9 +1126,11 @@ static int cx23885_initialize_codec(struct cx23885_dev *dev)</div><div class='ctx'> 	mc417_memory_write(dev, 2120, 0x00000080);</div><div class='ctx'> </div><div class='ctx'> 	/* start capturing to the host interface */</div><div class='del'>-	cx23885_api_cmd(dev, CX2341X_ENC_START_CAPTURE, 2, 0,</div><div class='del'>-		CX23885_MPEG_CAPTURE, CX23885_RAW_BITS_NONE);</div><div class='del'>-	msleep(10);</div><div class='add'>+	if (startencoder) {</div><div class='add'>+		cx23885_api_cmd(dev, CX2341X_ENC_START_CAPTURE, 2, 0,</div><div class='add'>+			CX23885_MPEG_CAPTURE, CX23885_RAW_BITS_NONE);</div><div class='add'>+		msleep(10);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1196,6 +1212,16 @@ static int cx23885_querymenu(struct cx23885_dev *dev,</div><div class='ctx'> 		cx2341x_ctrl_get_menu(&amp;dev-&gt;mpeg_params, qmenu-&gt;id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *id)</div><div class='add'>+{</div><div class='add'>+	struct cx23885_fh  *fh  = file-&gt;private_data;</div><div class='add'>+	struct cx23885_dev *dev = fh-&gt;dev;</div><div class='add'>+</div><div class='add'>+	call_all(dev, core, g_std, id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx23885_fh  *fh  = file-&gt;private_data;</div><div class='hunk'>@@ -1208,55 +1234,31 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *id)</div><div class='ctx'> 	if (i == ARRAY_SIZE(cx23885_tvnorms))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	dev-&gt;encodernorm = cx23885_tvnorms[i];</div><div class='add'>+</div><div class='add'>+	/* Have the drier core notify the subdevices */</div><div class='add'>+	mutex_lock(&amp;dev-&gt;lock);</div><div class='add'>+	cx23885_set_tvnorm(dev, *id);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vidioc_enum_input(struct file *file, void *priv,</div><div class='del'>-				struct v4l2_input *i)</div><div class='add'>+	struct v4l2_input *i)</div><div class='ctx'> {</div><div class='del'>-	struct cx23885_fh  *fh  = file-&gt;private_data;</div><div class='del'>-	struct cx23885_dev *dev = fh-&gt;dev;</div><div class='del'>-	struct cx23885_input *input;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	if (i-&gt;index &gt;= 4)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	input = &amp;cx23885_boards[dev-&gt;board].input[i-&gt;index];</div><div class='del'>-</div><div class='del'>-	if (input-&gt;type == 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* FIXME</div><div class='del'>-	 * strcpy(i-&gt;name, input-&gt;name); */</div><div class='del'>-	strcpy(i-&gt;name, "unset");</div><div class='del'>-</div><div class='del'>-	if (input-&gt;type == CX23885_VMUX_TELEVISION ||</div><div class='del'>-	    input-&gt;type == CX23885_VMUX_CABLE)</div><div class='del'>-		i-&gt;type = V4L2_INPUT_TYPE_TUNER;</div><div class='del'>-	else</div><div class='del'>-		i-&gt;type  = V4L2_INPUT_TYPE_CAMERA;</div><div class='del'>-</div><div class='del'>-	for (n = 0; n &lt; ARRAY_SIZE(cx23885_tvnorms); n++)</div><div class='del'>-		i-&gt;std |= cx23885_tvnorms[n].id;</div><div class='del'>-	return 0;</div><div class='add'>+	struct cx23885_dev *dev = ((struct cx23885_fh *)priv)-&gt;dev;</div><div class='add'>+	dprintk(1, "%s()\n", __func__);</div><div class='add'>+	return cx23885_enum_input(dev, i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)</div><div class='ctx'> {</div><div class='del'>-	struct cx23885_fh  *fh  = file-&gt;private_data;</div><div class='del'>-	struct cx23885_dev *dev = fh-&gt;dev;</div><div class='del'>-</div><div class='del'>-	*i = dev-&gt;input;</div><div class='del'>-	return 0;</div><div class='add'>+	return cx23885_get_input(file, priv, i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vidioc_s_input(struct file *file, void *priv, unsigned int i)</div><div class='ctx'> {</div><div class='del'>-	if (i &gt;= 4)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return cx23885_set_input(file, priv, i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vidioc_g_tuner(struct file *file, void *priv,</div><div class='hunk'>@@ -1309,43 +1311,25 @@ static int vidioc_g_frequency(struct file *file, void *priv,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='del'>-				struct v4l2_frequency *f)</div><div class='add'>+	struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='del'>-	struct cx23885_fh  *fh  = file-&gt;private_data;</div><div class='del'>-	struct cx23885_dev *dev = fh-&gt;dev;</div><div class='del'>-</div><div class='del'>-	cx23885_api_cmd(fh-&gt;dev, CX2341X_ENC_STOP_CAPTURE, 3, 0,</div><div class='del'>-		CX23885_END_NOW, CX23885_MPEG_CAPTURE,</div><div class='del'>-		CX23885_RAW_BITS_NONE);</div><div class='del'>-</div><div class='del'>-	dprintk(1, "VIDIOC_S_FREQUENCY: dev type %d, f\n",</div><div class='del'>-		dev-&gt;tuner_type);</div><div class='del'>-	dprintk(1, "VIDIOC_S_FREQUENCY: f tuner %d, f type %d\n",</div><div class='del'>-		f-&gt;tuner, f-&gt;type);</div><div class='del'>-	if (UNSET == dev-&gt;tuner_type)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (f-&gt;tuner != 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (f-&gt;type != V4L2_TUNER_ANALOG_TV)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	dev-&gt;freq = f-&gt;frequency;</div><div class='del'>-</div><div class='del'>-	call_all(dev, tuner, s_frequency, f);</div><div class='add'>+	return cx23885_set_frequency(file, priv, f);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	cx23885_initialize_codec(dev);</div><div class='add'>+static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='add'>+	struct v4l2_control *ctl)</div><div class='add'>+{</div><div class='add'>+	struct cx23885_dev *dev = ((struct cx23885_fh *)priv)-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return cx23885_get_control(dev, ctl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vidioc_s_ctrl(struct file *file, void *priv,</div><div class='del'>-				struct v4l2_control *ctl)</div><div class='add'>+	struct v4l2_control *ctl)</div><div class='ctx'> {</div><div class='del'>-	struct cx23885_fh  *fh  = file-&gt;private_data;</div><div class='del'>-	struct cx23885_dev *dev = fh-&gt;dev;</div><div class='add'>+	struct cx23885_dev *dev = ((struct cx23885_fh *)priv)-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	/* Update the A/V core */</div><div class='del'>-	call_all(dev, core, s_ctrl, ctl);</div><div class='del'>-	return 0;</div><div class='add'>+	return cx23885_set_control(dev, ctl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vidioc_querycap(struct file *file, void  *priv,</div><div class='hunk'>@@ -1636,7 +1620,7 @@ static ssize_t mpeg_read(struct file *file, char __user *data,</div><div class='ctx'> 	/* Start mpeg encoder on first read. */</div><div class='ctx'> 	if (atomic_cmpxchg(&amp;fh-&gt;v4l_reading, 0, 1) == 0) {</div><div class='ctx'> 		if (atomic_inc_return(&amp;dev-&gt;v4l_reader_count) == 1) {</div><div class='del'>-			if (cx23885_initialize_codec(dev) &lt; 0)</div><div class='add'>+			if (cx23885_initialize_codec(dev, 1) &lt; 0)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1677,6 +1661,8 @@ static struct v4l2_file_operations mpeg_fops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct v4l2_ioctl_ops mpeg_ioctl_ops = {</div><div class='add'>+	.vidioc_querystd	 = vidioc_g_std,</div><div class='add'>+	.vidioc_g_std		 = vidioc_g_std,</div><div class='ctx'> 	.vidioc_s_std		 = vidioc_s_std,</div><div class='ctx'> 	.vidioc_enum_input	 = vidioc_enum_input,</div><div class='ctx'> 	.vidioc_g_input		 = vidioc_g_input,</div><div class='hunk'>@@ -1686,6 +1672,7 @@ static const struct v4l2_ioctl_ops mpeg_ioctl_ops = {</div><div class='ctx'> 	.vidioc_g_frequency	 = vidioc_g_frequency,</div><div class='ctx'> 	.vidioc_s_frequency	 = vidioc_s_frequency,</div><div class='ctx'> 	.vidioc_s_ctrl		 = vidioc_s_ctrl,</div><div class='add'>+	.vidioc_g_ctrl		 = vidioc_g_ctrl,</div><div class='ctx'> 	.vidioc_querycap	 = vidioc_querycap,</div><div class='ctx'> 	.vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,</div><div class='ctx'> 	.vidioc_g_fmt_vid_cap	 = vidioc_g_fmt_vid_cap,</div><div class='hunk'>@@ -1746,8 +1733,8 @@ static struct video_device *cx23885_video_dev_alloc(</div><div class='ctx'> 	if (NULL == vfd)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	*vfd = *template;</div><div class='del'>-	snprintf(vfd-&gt;name, sizeof(vfd-&gt;name), "%s %s (%s)", dev-&gt;name,</div><div class='del'>-		type, cx23885_boards[tsport-&gt;dev-&gt;board].name);</div><div class='add'>+	snprintf(vfd-&gt;name, sizeof(vfd-&gt;name), "%s (%s)",</div><div class='add'>+		cx23885_boards[tsport-&gt;dev-&gt;board].name, type);</div><div class='ctx'> 	vfd-&gt;parent  = &amp;pci-&gt;dev;</div><div class='ctx'> 	vfd-&gt;release = video_device_release;</div><div class='ctx'> 	return vfd;</div><div class='hunk'>@@ -1791,5 +1778,11 @@ int cx23885_417_register(struct cx23885_dev *dev)</div><div class='ctx'> 	printk(KERN_INFO "%s: registered device %s [mpeg]\n",</div><div class='ctx'> 	       dev-&gt;name, video_device_node_name(dev-&gt;v4l_device));</div><div class='ctx'> </div><div class='add'>+	/* ST: Configure the encoder paramaters, but don't begin</div><div class='add'>+	 * encoding, this resolves an issue where the first time the</div><div class='add'>+	 * encoder is started video can be choppy.</div><div class='add'>+	 */</div><div class='add'>+	cx23885_initialize_codec(dev, 0);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c<br/>index c3cf08945e4c..19b5499d2624 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-cards.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx23885/cx23885-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx23885/cx23885-cards.c</a></div><div class='hunk'>@@ -213,8 +213,8 @@ struct cx23885_board cx23885_boards[] = {</div><div class='ctx'> 		.portc		= CX23885_MPEG_DVB,</div><div class='ctx'> 		.tuner_type	= TUNER_XC4000,</div><div class='ctx'> 		.tuner_addr	= 0x61,</div><div class='del'>-		.radio_type	= TUNER_XC4000,</div><div class='del'>-		.radio_addr	= 0x61,</div><div class='add'>+		.radio_type	= UNSET,</div><div class='add'>+		.radio_addr	= ADDR_UNSET,</div><div class='ctx'> 		.input		= {{</div><div class='ctx'> 			.type	= CX23885_VMUX_TELEVISION,</div><div class='ctx'> 			.vmux	= CX25840_VIN2_CH1 |</div><div class='hunk'>@@ -335,8 +335,33 @@ struct cx23885_board cx23885_boards[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	[CX23885_BOARD_HAUPPAUGE_HVR1850] = {</div><div class='ctx'> 		.name		= "Hauppauge WinTV-HVR1850",</div><div class='add'>+		.porta		= CX23885_ANALOG_VIDEO,</div><div class='ctx'> 		.portb		= CX23885_MPEG_ENCODER,</div><div class='ctx'> 		.portc		= CX23885_MPEG_DVB,</div><div class='add'>+		.tuner_type	= TUNER_ABSENT,</div><div class='add'>+		.tuner_addr	= 0x42, /* 0x84 &gt;&gt; 1 */</div><div class='add'>+		.force_bff	= 1,</div><div class='add'>+		.input          = {{</div><div class='add'>+			.type   = CX23885_VMUX_TELEVISION,</div><div class='add'>+			.vmux   =	CX25840_VIN7_CH3 |</div><div class='add'>+					CX25840_VIN5_CH2 |</div><div class='add'>+					CX25840_VIN2_CH1 |</div><div class='add'>+					CX25840_DIF_ON,</div><div class='add'>+			.amux   = CX25840_AUDIO8,</div><div class='add'>+		}, {</div><div class='add'>+			.type   = CX23885_VMUX_COMPOSITE1,</div><div class='add'>+			.vmux   =	CX25840_VIN7_CH3 |</div><div class='add'>+					CX25840_VIN4_CH2 |</div><div class='add'>+					CX25840_VIN6_CH1,</div><div class='add'>+			.amux   = CX25840_AUDIO7,</div><div class='add'>+		}, {</div><div class='add'>+			.type   = CX23885_VMUX_SVIDEO,</div><div class='add'>+			.vmux   =	CX25840_VIN7_CH3 |</div><div class='add'>+					CX25840_VIN4_CH2 |</div><div class='add'>+					CX25840_VIN8_CH1 |</div><div class='add'>+					CX25840_SVIDEO_ON,</div><div class='add'>+			.amux   = CX25840_AUDIO7,</div><div class='add'>+		} },</div><div class='ctx'> 	},</div><div class='ctx'> 	[CX23885_BOARD_COMPRO_VIDEOMATE_E800] = {</div><div class='ctx'> 		.name		= "Compro VideoMate E800",</div><div class='hunk'>@@ -438,6 +463,41 @@ struct cx23885_board cx23885_boards[] = {</div><div class='ctx'> 			.gpio0  = 0,</div><div class='ctx'> 		} },</div><div class='ctx'> 	},</div><div class='add'>+	[CX23885_BOARD_MYGICA_X8507] = {</div><div class='add'>+		.name		= "Mygica X8507",</div><div class='add'>+		.tuner_type = TUNER_XC5000,</div><div class='add'>+		.tuner_addr = 0x61,</div><div class='add'>+		.tuner_bus	= 1,</div><div class='add'>+		.porta		= CX23885_ANALOG_VIDEO,</div><div class='add'>+		.input		= {</div><div class='add'>+			{</div><div class='add'>+				.type   = CX23885_VMUX_TELEVISION,</div><div class='add'>+				.vmux   = CX25840_COMPOSITE2,</div><div class='add'>+				.amux   = CX25840_AUDIO8,</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.type   = CX23885_VMUX_COMPOSITE1,</div><div class='add'>+				.vmux   = CX25840_COMPOSITE8,</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.type   = CX23885_VMUX_SVIDEO,</div><div class='add'>+				.vmux   = CX25840_SVIDEO_LUMA3 |</div><div class='add'>+						CX25840_SVIDEO_CHROMA4,</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.type   = CX23885_VMUX_COMPONENT,</div><div class='add'>+				.vmux   = CX25840_COMPONENT_ON |</div><div class='add'>+					CX25840_VIN1_CH1 |</div><div class='add'>+					CX25840_VIN6_CH2 |</div><div class='add'>+					CX25840_VIN7_CH3,</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL] = {</div><div class='add'>+		.name		= "TerraTec Cinergy T PCIe Dual",</div><div class='add'>+		.portb		= CX23885_MPEG_DVB,</div><div class='add'>+		.portc		= CX23885_MPEG_DVB,</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);</div><div class='ctx'> </div><div class='hunk'>@@ -637,6 +697,14 @@ struct cx23885_subid cx23885_subids[] = {</div><div class='ctx'> 		.subvendor = 0x1b55,</div><div class='ctx'> 		.subdevice = 0xe2e4,</div><div class='ctx'> 		.card      = CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF,</div><div class='add'>+	}, {</div><div class='add'>+		.subvendor = 0x14f1,</div><div class='add'>+		.subdevice = 0x8502,</div><div class='add'>+		.card      = CX23885_BOARD_MYGICA_X8507,</div><div class='add'>+	}, {</div><div class='add'>+		.subvendor = 0x153b,</div><div class='add'>+		.subdevice = 0x117e,</div><div class='add'>+		.card      = CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);</div><div class='hunk'>@@ -1068,6 +1136,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX23885_BOARD_MYGICA_X8506:</div><div class='ctx'> 	case CX23885_BOARD_MAGICPRO_PROHDTVE2:</div><div class='add'>+	case CX23885_BOARD_MYGICA_X8507:</div><div class='ctx'> 		/* GPIO-0 (0)Analog / (1)Digital TV */</div><div class='ctx'> 		/* GPIO-1 reset XC5000 */</div><div class='ctx'> 		/* GPIO-2 reset LGS8GL5 / LGS8G75 */</div><div class='hunk'>@@ -1367,6 +1436,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)</div><div class='ctx'> 		ts1-&gt;ts_clk_en_val = 0x1; /* Enable TS_CLK */</div><div class='ctx'> 		ts1-&gt;src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;</div><div class='ctx'> 		break;</div><div class='add'>+	case CX23885_BOARD_HAUPPAUGE_HVR1850:</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1800:</div><div class='ctx'> 		/* Defaults for VID B - Analog encoder */</div><div class='ctx'> 		/* DREQ_POL, SMODE, PUNC_CLK, MCLK_POL Serial bus + punc clk */</div><div class='hunk'>@@ -1377,6 +1447,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)</div><div class='ctx'> 		/* APB_TSVALERR_POL (active low)*/</div><div class='ctx'> 		ts1-&gt;vld_misc_val    = 0x2000;</div><div class='ctx'> 		ts1-&gt;hw_sop_ctrl_val = (0x47 &lt;&lt; 16 | 188 &lt;&lt; 4 | 0xc);</div><div class='add'>+		cx_write(0x130184, 0xc);</div><div class='ctx'> </div><div class='ctx'> 		/* Defaults for VID C */</div><div class='ctx'> 		ts2-&gt;gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */</div><div class='hunk'>@@ -1396,6 +1467,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:</div><div class='ctx'> 	case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF:</div><div class='add'>+	case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:</div><div class='ctx'> 		ts1-&gt;gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */</div><div class='ctx'> 		ts1-&gt;ts_clk_en_val = 0x1; /* Enable TS_CLK */</div><div class='ctx'> 		ts1-&gt;src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;</div><div class='hunk'>@@ -1431,7 +1503,6 @@ void cx23885_card_setup(struct cx23885_dev *dev)</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1275:</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1255:</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1210:</div><div class='del'>-	case CX23885_BOARD_HAUPPAUGE_HVR1850:</div><div class='ctx'> 	case CX23885_BOARD_COMPRO_VIDEOMATE_E800:</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1290:</div><div class='ctx'> 	case CX23885_BOARD_GOTVIEW_X5_3D_HYBRID:</div><div class='hunk'>@@ -1468,6 +1539,8 @@ void cx23885_card_setup(struct cx23885_dev *dev)</div><div class='ctx'> 	case CX23885_BOARD_GOTVIEW_X5_3D_HYBRID:</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1500:</div><div class='ctx'> 	case CX23885_BOARD_MPX885:</div><div class='add'>+	case CX23885_BOARD_MYGICA_X8507:</div><div class='add'>+	case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:</div><div class='ctx'> 		dev-&gt;sd_cx25840 = v4l2_i2c_new_subdev(&amp;dev-&gt;v4l2_dev,</div><div class='ctx'> 				&amp;dev-&gt;i2c_bus[2].i2c_adap,</div><div class='ctx'> 				"cx25840", 0x88 &gt;&gt; 1, NULL);</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c<br/>index 40e68b22015e..6ad227029a0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx23885/cx23885-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx23885/cx23885-core.c</a></div><div class='hunk'>@@ -206,12 +206,12 @@ static struct sram_channel cx23887_sram_channels[] = {</div><div class='ctx'> 		.cnt2_reg	= DMA1_CNT2,</div><div class='ctx'> 	},</div><div class='ctx'> 	[SRAM_CH02] = {</div><div class='del'>-		.name		= "ch2",</div><div class='del'>-		.cmds_start	= 0x0,</div><div class='del'>-		.ctrl_start	= 0x0,</div><div class='del'>-		.cdt		= 0x0,</div><div class='del'>-		.fifo_start	= 0x0,</div><div class='del'>-		.fifo_size	= 0x0,</div><div class='add'>+		.name		= "VID A (VBI)",</div><div class='add'>+		.cmds_start	= 0x10050,</div><div class='add'>+		.ctrl_start	= 0x105F0,</div><div class='add'>+		.cdt		= 0x10810,</div><div class='add'>+		.fifo_start	= 0x3000,</div><div class='add'>+		.fifo_size	= 0x1000,</div><div class='ctx'> 		.ptr1_reg	= DMA2_PTR1,</div><div class='ctx'> 		.ptr2_reg	= DMA2_PTR2,</div><div class='ctx'> 		.cnt1_reg	= DMA2_CNT1,</div><div class='hunk'>@@ -266,12 +266,12 @@ static struct sram_channel cx23887_sram_channels[] = {</div><div class='ctx'> 		.cnt2_reg	= DMA5_CNT2,</div><div class='ctx'> 	},</div><div class='ctx'> 	[SRAM_CH07] = {</div><div class='del'>-		.name		= "ch7",</div><div class='del'>-		.cmds_start	= 0x0,</div><div class='del'>-		.ctrl_start	= 0x0,</div><div class='del'>-		.cdt		= 0x0,</div><div class='del'>-		.fifo_start	= 0x0,</div><div class='del'>-		.fifo_size	= 0x0,</div><div class='add'>+		.name		= "TV Audio",</div><div class='add'>+		.cmds_start	= 0x10190,</div><div class='add'>+		.ctrl_start	= 0x106B0,</div><div class='add'>+		.cdt		= 0x10930,</div><div class='add'>+		.fifo_start	= 0x7000,</div><div class='add'>+		.fifo_size	= 0x1000,</div><div class='ctx'> 		.ptr1_reg	= DMA6_PTR1,</div><div class='ctx'> 		.ptr2_reg	= DMA6_PTR2,</div><div class='ctx'> 		.cnt1_reg	= DMA6_CNT1,</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c<br/>index bcb45be44bb2..6835eb1fc093 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-dvb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx23885/cx23885-dvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx23885/cx23885-dvb.c</a></div><div class='hunk'>@@ -61,6 +61,8 @@</div><div class='ctx'> #include "cx23885-f300.h"</div><div class='ctx'> #include "altera-ci.h"</div><div class='ctx'> #include "stv0367.h"</div><div class='add'>+#include "drxk.h"</div><div class='add'>+#include "mt2063.h"</div><div class='ctx'> </div><div class='ctx'> static unsigned int debug;</div><div class='ctx'> </div><div class='hunk'>@@ -111,6 +113,8 @@ static void dvb_buf_release(struct videobuf_queue *q,</div><div class='ctx'> 	cx23885_free_buffer(q, (struct cx23885_buffer *)vb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cx23885_dvb_set_frontend(struct dvb_frontend *fe);</div><div class='add'>+</div><div class='ctx'> static void cx23885_dvb_gate_ctrl(struct cx23885_tsport  *port, int open)</div><div class='ctx'> {</div><div class='ctx'> 	struct videobuf_dvb_frontends *f;</div><div class='hunk'>@@ -125,6 +129,12 @@ static void cx23885_dvb_gate_ctrl(struct cx23885_tsport  *port, int open)</div><div class='ctx'> </div><div class='ctx'> 	if (fe &amp;&amp; fe-&gt;dvb.frontend &amp;&amp; fe-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 		fe-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl(fe-&gt;dvb.frontend, open);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * FIXME: Improve this path to avoid calling the</div><div class='add'>+	 * cx23885_dvb_set_frontend() every time it passes here.</div><div class='add'>+	 */</div><div class='add'>+	cx23885_dvb_set_frontend(fe-&gt;dvb.frontend);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct videobuf_queue_ops dvb_qops = {</div><div class='hunk'>@@ -479,15 +489,15 @@ static struct xc5000_config mygica_x8506_xc5000_config = {</div><div class='ctx'> 	.if_khz = 5380,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int cx23885_dvb_set_frontend(struct dvb_frontend *fe,</div><div class='del'>-				    struct dvb_frontend_parameters *param)</div><div class='add'>+static int cx23885_dvb_set_frontend(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *p = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct cx23885_tsport *port = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	struct cx23885_dev *dev = port-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	switch (dev-&gt;board) {</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1275:</div><div class='del'>-		switch (param-&gt;u.vsb.modulation) {</div><div class='add'>+		switch (p-&gt;modulation) {</div><div class='ctx'> 		case VSB_8:</div><div class='ctx'> 			cx23885_gpio_clear(dev, GPIO_5);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -507,31 +517,6 @@ static int cx23885_dvb_set_frontend(struct dvb_frontend *fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx23885_dvb_fe_ioctl_override(struct dvb_frontend *fe,</div><div class='del'>-					 unsigned int cmd, void *parg,</div><div class='del'>-					 unsigned int stage)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	switch (stage) {</div><div class='del'>-	case DVB_FE_IOCTL_PRE:</div><div class='del'>-</div><div class='del'>-		switch (cmd) {</div><div class='del'>-		case FE_SET_FRONTEND:</div><div class='del'>-			err = cx23885_dvb_set_frontend(fe,</div><div class='del'>-				(struct dvb_frontend_parameters *) parg);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DVB_FE_IOCTL_POST:</div><div class='del'>-		/* no post-ioctl handling required */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static struct lgs8gxx_config magicpro_prohdtve2_lgs8g75_config = {</div><div class='ctx'> 	.prod = LGS8GXX_PROD_LGS8G75,</div><div class='ctx'> 	.demod_address = 0x19,</div><div class='hunk'>@@ -617,6 +602,24 @@ static struct xc5000_config netup_xc5000_config[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct drxk_config terratec_drxk_config[] = {</div><div class='add'>+	{</div><div class='add'>+		.adr = 0x29,</div><div class='add'>+		.no_i2c_bridge = 1,</div><div class='add'>+	}, {</div><div class='add'>+		.adr = 0x2a,</div><div class='add'>+		.no_i2c_bridge = 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mt2063_config terratec_mt2063_config[] = {</div><div class='add'>+	{</div><div class='add'>+		.tuner_address = 0x60,</div><div class='add'>+	}, {</div><div class='add'>+		.tuner_address = 0x67,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int netup_altera_fpga_rw(void *device, int flag, int data, int read)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx23885_dev *dev = (struct cx23885_dev *)device;</div><div class='hunk'>@@ -940,6 +943,11 @@ static int dvb_register(struct cx23885_tsport *port)</div><div class='ctx'> </div><div class='ctx'> 			fe = dvb_attach(xc4000_attach, fe0-&gt;dvb.frontend,</div><div class='ctx'> 					&amp;dev-&gt;i2c_bus[1].i2c_adap, &amp;cfg);</div><div class='add'>+			if (!fe) {</div><div class='add'>+				printk(KERN_ERR "%s/2: xc4000 attach failed\n",</div><div class='add'>+				       dev-&gt;name);</div><div class='add'>+				goto frontend_detach;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX23885_BOARD_TBS_6920:</div><div class='hunk'>@@ -1043,6 +1051,20 @@ static int dvb_register(struct cx23885_tsport *port)</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1850:</div><div class='add'>+		i2c_bus = &amp;dev-&gt;i2c_bus[0];</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(s5h1411_attach,</div><div class='add'>+			&amp;hcw_s5h1411_config,</div><div class='add'>+			&amp;i2c_bus-&gt;i2c_adap);</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL)</div><div class='add'>+			dvb_attach(tda18271_attach, fe0-&gt;dvb.frontend,</div><div class='add'>+				0x60, &amp;dev-&gt;i2c_bus[0].i2c_adap,</div><div class='add'>+				&amp;hauppauge_tda18271_config);</div><div class='add'>+</div><div class='add'>+		tda18271_attach(&amp;dev-&gt;ts1.analog_fe,</div><div class='add'>+			0x60, &amp;dev-&gt;i2c_bus[1].i2c_adap,</div><div class='add'>+			&amp;hauppauge_tda18271_config);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='ctx'> 	case CX23885_BOARD_HAUPPAUGE_HVR1290:</div><div class='ctx'> 		i2c_bus = &amp;dev-&gt;i2c_bus[0];</div><div class='ctx'> 		fe0-&gt;dvb.frontend = dvb_attach(s5h1411_attach,</div><div class='hunk'>@@ -1118,6 +1140,39 @@ static int dvb_register(struct cx23885_tsport *port)</div><div class='ctx'> 				goto frontend_detach;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:</div><div class='add'>+		i2c_bus = &amp;dev-&gt;i2c_bus[0];</div><div class='add'>+		i2c_bus2 = &amp;dev-&gt;i2c_bus[1];</div><div class='add'>+</div><div class='add'>+		switch (port-&gt;nr) {</div><div class='add'>+		/* port b */</div><div class='add'>+		case 1:</div><div class='add'>+			fe0-&gt;dvb.frontend = dvb_attach(drxk_attach,</div><div class='add'>+					&amp;terratec_drxk_config[0],</div><div class='add'>+					&amp;i2c_bus-&gt;i2c_adap);</div><div class='add'>+			if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+				if (!dvb_attach(mt2063_attach,</div><div class='add'>+						fe0-&gt;dvb.frontend,</div><div class='add'>+						&amp;terratec_mt2063_config[0],</div><div class='add'>+						&amp;i2c_bus2-&gt;i2c_adap))</div><div class='add'>+					goto frontend_detach;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		/* port c */</div><div class='add'>+		case 2:</div><div class='add'>+			fe0-&gt;dvb.frontend = dvb_attach(drxk_attach,</div><div class='add'>+					&amp;terratec_drxk_config[1],</div><div class='add'>+					&amp;i2c_bus-&gt;i2c_adap);</div><div class='add'>+			if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+				if (!dvb_attach(mt2063_attach,</div><div class='add'>+						fe0-&gt;dvb.frontend,</div><div class='add'>+						&amp;terratec_mt2063_config[1],</div><div class='add'>+						&amp;i2c_bus2-&gt;i2c_adap))</div><div class='add'>+					goto frontend_detach;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_INFO "%s: The frontend of your DVB/ATSC card "</div><div class='ctx'> 			" isn't supported yet\n",</div><div class='hunk'>@@ -1151,7 +1206,7 @@ static int dvb_register(struct cx23885_tsport *port)</div><div class='ctx'> 	/* register everything */</div><div class='ctx'> 	ret = videobuf_dvb_register_bus(&amp;port-&gt;frontends, THIS_MODULE, port,</div><div class='ctx'> 					&amp;dev-&gt;pci-&gt;dev, adapter_nr, mfe_shared,</div><div class='del'>-					cx23885_dvb_fe_ioctl_override);</div><div class='add'>+					NULL);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto frontend_detach;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c<br/>index 0ff7a9e98f3e..be1e21d8295c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx23885/cx23885-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx23885/cx23885-i2c.c</a></div><div class='hunk'>@@ -309,7 +309,7 @@ static void do_i2c_scan(char *name, struct i2c_client *c)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* init + register i2c algo-bit adapter */</div><div class='add'>+/* init + register i2c adapter */</div><div class='ctx'> int cx23885_i2c_register(struct cx23885_i2c *bus)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx23885_dev *dev = bus-&gt;dev;</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c<br/>index e730b9263016..c654bdc7ccb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-video.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx23885/cx23885-video.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885-video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx23885/cx23885-video.c</a></div><div class='hunk'>@@ -253,9 +253,9 @@ static struct cx23885_ctrl cx23885_ctls[] = {</div><div class='ctx'> 			.id            = V4L2_CID_AUDIO_VOLUME,</div><div class='ctx'> 			.name          = "Volume",</div><div class='ctx'> 			.minimum       = 0,</div><div class='del'>-			.maximum       = 0x3f,</div><div class='del'>-			.step          = 1,</div><div class='del'>-			.default_value = 0x3f,</div><div class='add'>+			.maximum       = 65535,</div><div class='add'>+			.step          = 65535 / 100,</div><div class='add'>+			.default_value = 65535,</div><div class='ctx'> 			.type          = V4L2_CTRL_TYPE_INTEGER,</div><div class='ctx'> 		},</div><div class='ctx'> 		.reg                   = PATH1_VOL_CTL,</div><div class='hunk'>@@ -316,7 +316,7 @@ void cx23885_video_wakeup(struct cx23885_dev *dev,</div><div class='ctx'> 			__func__, bc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)</div><div class='add'>+int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)</div><div class='ctx'> {</div><div class='ctx'> 	dprintk(1, "%s(norm = 0x%08x) name: [%s]\n",</div><div class='ctx'> 		__func__,</div><div class='hunk'>@@ -344,8 +344,8 @@ static struct video_device *cx23885_vdev_init(struct cx23885_dev *dev,</div><div class='ctx'> 	*vfd = *template;</div><div class='ctx'> 	vfd-&gt;v4l2_dev = &amp;dev-&gt;v4l2_dev;</div><div class='ctx'> 	vfd-&gt;release = video_device_release;</div><div class='del'>-	snprintf(vfd-&gt;name, sizeof(vfd-&gt;name), "%s %s (%s)",</div><div class='del'>-		 dev-&gt;name, type, cx23885_boards[dev-&gt;board].name);</div><div class='add'>+	snprintf(vfd-&gt;name, sizeof(vfd-&gt;name), "%s (%s)",</div><div class='add'>+		 cx23885_boards[dev-&gt;board].name, type);</div><div class='ctx'> 	video_set_drvdata(vfd, dev);</div><div class='ctx'> 	return vfd;</div><div class='ctx'> }</div><div class='hunk'>@@ -492,7 +492,8 @@ static int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)</div><div class='ctx'> 	dev-&gt;input = input;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;board == CX23885_BOARD_MYGICA_X8506 ||</div><div class='del'>-		dev-&gt;board == CX23885_BOARD_MAGICPRO_PROHDTVE2) {</div><div class='add'>+		dev-&gt;board == CX23885_BOARD_MAGICPRO_PROHDTVE2 ||</div><div class='add'>+		dev-&gt;board == CX23885_BOARD_MYGICA_X8507) {</div><div class='ctx'> 		/* Select Analog TV */</div><div class='ctx'> 		if (INPUT(input)-&gt;type == CX23885_VMUX_TELEVISION)</div><div class='ctx'> 			cx23885_gpio_clear(dev, GPIO_0);</div><div class='hunk'>@@ -503,7 +504,8 @@ static int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)</div><div class='ctx'> 			INPUT(input)-&gt;vmux, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	if ((dev-&gt;board == CX23885_BOARD_HAUPPAUGE_HVR1800) ||</div><div class='del'>-		(dev-&gt;board == CX23885_BOARD_MPX885)) {</div><div class='add'>+		(dev-&gt;board == CX23885_BOARD_MPX885) ||</div><div class='add'>+		(dev-&gt;board == CX23885_BOARD_HAUPPAUGE_HVR1850)) {</div><div class='ctx'> 		/* Configure audio routing */</div><div class='ctx'> 		v4l2_subdev_call(dev-&gt;sd_cx25840, audio, s_routing,</div><div class='ctx'> 			INPUT(input)-&gt;amux, 0, 0);</div><div class='hunk'>@@ -649,6 +651,7 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,</div><div class='ctx'> 	int rc, init_buffer = 0;</div><div class='ctx'> 	u32 line0_offset, line1_offset;</div><div class='ctx'> 	struct videobuf_dmabuf *dma = videobuf_to_dma(&amp;buf-&gt;vb);</div><div class='add'>+	int field_tff;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(NULL == fh-&gt;fmt);</div><div class='ctx'> 	if (fh-&gt;width  &lt; 48 || fh-&gt;width  &gt; norm_maxw(dev-&gt;tvnorm) ||</div><div class='hunk'>@@ -690,15 +693,25 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,</div><div class='ctx'> 					 buf-&gt;bpl, 0, buf-&gt;vb.height);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case V4L2_FIELD_INTERLACED:</div><div class='del'>-			if (dev-&gt;tvnorm &amp; V4L2_STD_NTSC) {</div><div class='add'>+			if (dev-&gt;tvnorm &amp; V4L2_STD_NTSC)</div><div class='add'>+				/* NTSC or  */</div><div class='add'>+				field_tff = 1;</div><div class='add'>+			else</div><div class='add'>+				field_tff = 0;</div><div class='add'>+</div><div class='add'>+			if (cx23885_boards[dev-&gt;board].force_bff)</div><div class='add'>+				/* PAL / SECAM OR 888 in NTSC MODE */</div><div class='add'>+				field_tff = 0;</div><div class='add'>+</div><div class='add'>+			if (field_tff) {</div><div class='ctx'> 				/* cx25840 transmits NTSC bottom field first */</div><div class='del'>-				dprintk(1, "%s() Creating NTSC risc\n",</div><div class='add'>+				dprintk(1, "%s() Creating TFF/NTSC risc\n",</div><div class='ctx'> 					__func__);</div><div class='ctx'> 				line0_offset = buf-&gt;bpl;</div><div class='ctx'> 				line1_offset = 0;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* All other formats are top field first */</div><div class='del'>-				dprintk(1, "%s() Creating PAL/SECAM risc\n",</div><div class='add'>+				dprintk(1, "%s() Creating BFF/PAL/SECAM risc\n",</div><div class='ctx'> 					__func__);</div><div class='ctx'> 				line0_offset = 0;</div><div class='ctx'> 				line1_offset = buf-&gt;bpl;</div><div class='hunk'>@@ -981,6 +994,8 @@ static int video_release(struct file *file)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	videobuf_mmap_free(&amp;fh-&gt;vidq);</div><div class='add'>+	videobuf_mmap_free(&amp;fh-&gt;vbiq);</div><div class='add'>+</div><div class='ctx'> 	file-&gt;private_data = NULL;</div><div class='ctx'> 	kfree(fh);</div><div class='ctx'> </div><div class='hunk'>@@ -1002,7 +1017,7 @@ static int video_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> /* VIDEO CTRL IOCTLS                                                  */</div><div class='ctx'> </div><div class='del'>-static int cx23885_get_control(struct cx23885_dev *dev,</div><div class='add'>+int cx23885_get_control(struct cx23885_dev *dev,</div><div class='ctx'> 	struct v4l2_control *ctl)</div><div class='ctx'> {</div><div class='ctx'> 	dprintk(1, "%s() calling cx25840(VIDIOC_G_CTRL)\n", __func__);</div><div class='hunk'>@@ -1010,7 +1025,7 @@ static int cx23885_get_control(struct cx23885_dev *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx23885_set_control(struct cx23885_dev *dev,</div><div class='add'>+int cx23885_set_control(struct cx23885_dev *dev,</div><div class='ctx'> 	struct v4l2_control *ctl)</div><div class='ctx'> {</div><div class='ctx'> 	dprintk(1, "%s() calling cx25840(VIDIOC_S_CTRL)\n", __func__);</div><div class='hunk'>@@ -1229,6 +1244,16 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *id)</div><div class='add'>+{</div><div class='add'>+	struct cx23885_dev *dev = ((struct cx23885_fh *)priv)-&gt;dev;</div><div class='add'>+	dprintk(1, "%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	call_all(dev, core, g_std, id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *tvnorms)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx23885_dev *dev = ((struct cx23885_fh *)priv)-&gt;dev;</div><div class='hunk'>@@ -1241,7 +1266,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *tvnorms)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)</div><div class='add'>+int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)</div><div class='ctx'> {</div><div class='ctx'> 	static const char *iname[] = {</div><div class='ctx'> 		[CX23885_VMUX_COMPOSITE1] = "Composite1",</div><div class='hunk'>@@ -1278,6 +1303,15 @@ static int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)</div><div class='ctx'> 	if (INPUT(n)-&gt;type != CX23885_VMUX_TELEVISION)</div><div class='ctx'> 		i-&gt;audioset = 0x3;</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;input == n) {</div><div class='add'>+		/* enum'd input matches our configured input.</div><div class='add'>+		 * Ask the video decoder to process the call</div><div class='add'>+		 * and give it an oppertunity to update the</div><div class='add'>+		 * status field.</div><div class='add'>+		 */</div><div class='add'>+		call_all(dev, video, g_input_status, &amp;i-&gt;status);</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'>@@ -1289,7 +1323,7 @@ static int vidioc_enum_input(struct file *file, void *priv,</div><div class='ctx'> 	return cx23885_enum_input(dev, i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)</div><div class='add'>+int cx23885_get_input(struct file *file, void *priv, unsigned int *i)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx23885_dev *dev = ((struct cx23885_fh *)priv)-&gt;dev;</div><div class='ctx'> </div><div class='hunk'>@@ -1298,7 +1332,12 @@ static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vidioc_s_input(struct file *file, void *priv, unsigned int i)</div><div class='add'>+static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)</div><div class='add'>+{</div><div class='add'>+	return cx23885_get_input(file, priv, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cx23885_set_input(struct file *file, void *priv, unsigned int i)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx23885_dev *dev = ((struct cx23885_fh *)priv)-&gt;dev;</div><div class='ctx'> </div><div class='hunk'>@@ -1322,6 +1361,11 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int vidioc_s_input(struct file *file, void *priv, unsigned int i)</div><div class='add'>+{</div><div class='add'>+	return cx23885_set_input(file, priv, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int vidioc_log_status(struct file *file, void *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx23885_fh  *fh  = priv;</div><div class='hunk'>@@ -1329,11 +1373,11 @@ static int vidioc_log_status(struct file *file, void *priv)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO</div><div class='ctx'> 		"%s/0: ============  START LOG STATUS  ============\n",</div><div class='del'>-	       dev-&gt;name);</div><div class='add'>+		dev-&gt;name);</div><div class='ctx'> 	call_all(dev, core, log_status);</div><div class='ctx'> 	printk(KERN_INFO</div><div class='ctx'> 		"%s/0: =============  END LOG STATUS  =============\n",</div><div class='del'>-	       dev-&gt;name);</div><div class='add'>+		dev-&gt;name);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1471,6 +1515,8 @@ static int vidioc_g_frequency(struct file *file, void *priv,</div><div class='ctx'> </div><div class='ctx'> static int cx23885_set_freq(struct cx23885_dev *dev, struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='add'>+	struct v4l2_control ctrl;</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(UNSET == dev-&gt;tuner_type))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (unlikely(f-&gt;tuner != 0))</div><div class='hunk'>@@ -1479,29 +1525,103 @@ static int cx23885_set_freq(struct cx23885_dev *dev, struct v4l2_frequency *f)</div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;lock);</div><div class='ctx'> 	dev-&gt;freq = f-&gt;frequency;</div><div class='ctx'> </div><div class='add'>+	/* I need to mute audio here */</div><div class='add'>+	ctrl.id = V4L2_CID_AUDIO_MUTE;</div><div class='add'>+	ctrl.value = 1;</div><div class='add'>+	cx23885_set_control(dev, &amp;ctrl);</div><div class='add'>+</div><div class='ctx'> 	call_all(dev, tuner, s_frequency, f);</div><div class='ctx'> </div><div class='ctx'> 	/* When changing channels it is required to reset TVAUDIO */</div><div class='del'>-	msleep(10);</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	/* I need to unmute audio here */</div><div class='add'>+	ctrl.value = 0;</div><div class='add'>+	cx23885_set_control(dev, &amp;ctrl);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='del'>-				struct v4l2_frequency *f)</div><div class='add'>+static int cx23885_set_freq_via_ops(struct cx23885_dev *dev,</div><div class='add'>+	struct v4l2_frequency *f)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_control ctrl;</div><div class='add'>+	struct videobuf_dvb_frontend *vfe;</div><div class='add'>+	struct dvb_frontend *fe;</div><div class='add'>+</div><div class='add'>+	struct analog_parameters params = {</div><div class='add'>+		.mode      = V4L2_TUNER_ANALOG_TV,</div><div class='add'>+		.audmode   = V4L2_TUNER_MODE_STEREO,</div><div class='add'>+		.std       = dev-&gt;tvnorm,</div><div class='add'>+		.frequency = f-&gt;frequency</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;lock);</div><div class='add'>+	dev-&gt;freq = f-&gt;frequency;</div><div class='add'>+</div><div class='add'>+	/* I need to mute audio here */</div><div class='add'>+	ctrl.id = V4L2_CID_AUDIO_MUTE;</div><div class='add'>+	ctrl.value = 1;</div><div class='add'>+	cx23885_set_control(dev, &amp;ctrl);</div><div class='add'>+</div><div class='add'>+	/* If HVR1850 */</div><div class='add'>+	dprintk(1, "%s() frequency=%d tuner=%d std=0x%llx\n", __func__,</div><div class='add'>+		params.frequency, f-&gt;tuner, params.std);</div><div class='add'>+</div><div class='add'>+	vfe = videobuf_dvb_get_frontend(&amp;dev-&gt;ts2.frontends, 1);</div><div class='add'>+	if (!vfe) {</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;lock);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fe = vfe-&gt;dvb.frontend;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;board == CX23885_BOARD_HAUPPAUGE_HVR1850)</div><div class='add'>+		fe = &amp;dev-&gt;ts1.analog_fe;</div><div class='add'>+</div><div class='add'>+	if (fe &amp;&amp; fe-&gt;ops.tuner_ops.set_analog_params) {</div><div class='add'>+		call_all(dev, core, s_std, dev-&gt;tvnorm);</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_analog_params(fe, &amp;params);</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+		printk(KERN_ERR "%s() No analog tuner, aborting\n", __func__);</div><div class='add'>+</div><div class='add'>+	/* When changing channels it is required to reset TVAUDIO */</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	/* I need to unmute audio here */</div><div class='add'>+	ctrl.value = 0;</div><div class='add'>+	cx23885_set_control(dev, &amp;ctrl);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cx23885_set_frequency(struct file *file, void *priv,</div><div class='add'>+	struct v4l2_frequency *f)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx23885_fh *fh = priv;</div><div class='ctx'> 	struct cx23885_dev *dev = fh-&gt;dev;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(0 == fh-&gt;radio &amp;&amp; f-&gt;type != V4L2_TUNER_ANALOG_TV))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (unlikely(1 == fh-&gt;radio &amp;&amp; f-&gt;type != V4L2_TUNER_RADIO))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	switch (dev-&gt;board) {</div><div class='add'>+	case CX23885_BOARD_HAUPPAUGE_HVR1850:</div><div class='add'>+		ret = cx23885_set_freq_via_ops(dev, f);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = cx23885_set_freq(dev, f);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return</div><div class='del'>-		cx23885_set_freq(dev, f);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='add'>+	struct v4l2_frequency *f)</div><div class='add'>+{</div><div class='add'>+	return cx23885_set_frequency(file, priv, f);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------- */</div><div class='hunk'>@@ -1613,6 +1733,8 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {</div><div class='ctx'> 	.vidioc_qbuf          = vidioc_qbuf,</div><div class='ctx'> 	.vidioc_dqbuf         = vidioc_dqbuf,</div><div class='ctx'> 	.vidioc_s_std         = vidioc_s_std,</div><div class='add'>+	.vidioc_g_std         = vidioc_g_std,</div><div class='add'>+	.vidioc_querystd      = vidioc_g_std,</div><div class='ctx'> 	.vidioc_enum_input    = vidioc_enum_input,</div><div class='ctx'> 	.vidioc_g_input       = vidioc_g_input,</div><div class='ctx'> 	.vidioc_s_input       = vidioc_s_input,</div><div class='head'>diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h<br/>index b49036fe3ffd..f020f0568df4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx23885/cx23885.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx23885/cx23885.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx23885/cx23885.h</a></div><div class='hunk'>@@ -87,6 +87,8 @@</div><div class='ctx'> #define CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF 30</div><div class='ctx'> #define CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000 31</div><div class='ctx'> #define CX23885_BOARD_MPX885                   32</div><div class='add'>+#define CX23885_BOARD_MYGICA_X8507             33</div><div class='add'>+#define CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL 34</div><div class='ctx'> </div><div class='ctx'> #define GPIO_0 0x00000001</div><div class='ctx'> #define GPIO_1 0x00000002</div><div class='hunk'>@@ -226,6 +228,8 @@ struct cx23885_board {</div><div class='ctx'> 	u32			clk_freq;</div><div class='ctx'> 	struct cx23885_input    input[MAX_CX23885_INPUT];</div><div class='ctx'> 	int			ci_type; /* for NetUP */</div><div class='add'>+	/* Force bottom field first during DMA (888 workaround) */</div><div class='add'>+	u32                     force_bff;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cx23885_subid {</div><div class='hunk'>@@ -310,6 +314,9 @@ struct cx23885_tsport {</div><div class='ctx'> 	u32                        num_frontends;</div><div class='ctx'> 	void                (*gate_ctrl)(struct cx23885_tsport *port, int open);</div><div class='ctx'> 	void                       *port_priv;</div><div class='add'>+</div><div class='add'>+	/* Workaround for a temp dvb_frontend that the tuner can attached to */</div><div class='add'>+	struct dvb_frontend analog_fe;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cx23885_kernel_ir {</div><div class='hunk'>@@ -574,6 +581,13 @@ extern void cx23885_video_unregister(struct cx23885_dev *dev);</div><div class='ctx'> extern int cx23885_video_irq(struct cx23885_dev *dev, u32 status);</div><div class='ctx'> extern void cx23885_video_wakeup(struct cx23885_dev *dev,</div><div class='ctx'> 	struct cx23885_dmaqueue *q, u32 count);</div><div class='add'>+int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i);</div><div class='add'>+int cx23885_set_input(struct file *file, void *priv, unsigned int i);</div><div class='add'>+int cx23885_get_input(struct file *file, void *priv, unsigned int *i);</div><div class='add'>+int cx23885_set_frequency(struct file *file, void *priv, struct v4l2_frequency *f);</div><div class='add'>+int cx23885_set_control(struct cx23885_dev *dev, struct v4l2_control *ctl);</div><div class='add'>+int cx23885_get_control(struct cx23885_dev *dev, struct v4l2_control *ctl);</div><div class='add'>+int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm);</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------- */</div><div class='ctx'> /* cx23885-vbi.c                                               */</div><div class='head'>diff --git a/drivers/media/video/cx25821/cx25821-alsa.c b/drivers/media/video/cx25821/cx25821-alsa.c<br/>index 09e99de5fd21..03cfac476b03 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-alsa.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-alsa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-alsa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx25821/cx25821-alsa.c</a></div><div class='hunk'>@@ -102,7 +102,7 @@ struct cx25821_audio_dev {</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = { 1, [1 ... (SNDRV_CARDS - 1)] = 1 };</div><div class='add'>+static bool enable[SNDRV_CARDS] = { 1, [1 ... (SNDRV_CARDS - 1)] = 1 };</div><div class='ctx'> </div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable cx25821 soundcard. default enabled.");</div><div class='hunk'>@@ -176,8 +176,7 @@ static int _cx25821_start_audio_dma(struct cx25821_audio_dev *chip)</div><div class='ctx'> </div><div class='ctx'> 	/* Set the input mode to 16-bit */</div><div class='ctx'> 	tmp = cx_read(AUD_A_CFG);</div><div class='del'>-	cx_write(AUD_A_CFG,</div><div class='del'>-		 tmp | FLD_AUD_DST_PK_MODE | FLD_AUD_DST_ENABLE |</div><div class='add'>+	cx_write(AUD_A_CFG, tmp | FLD_AUD_DST_PK_MODE | FLD_AUD_DST_ENABLE |</div><div class='ctx'> 		 FLD_AUD_CLK_ENABLE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -188,9 +187,8 @@ static int _cx25821_start_audio_dma(struct cx25821_audio_dev *chip)</div><div class='ctx'> 	*/</div><div class='ctx'> </div><div class='ctx'> 	/* Enables corresponding bits at AUD_INT_STAT */</div><div class='del'>-	cx_write(AUD_A_INT_MSK,</div><div class='del'>-		 FLD_AUD_DST_RISCI1 | FLD_AUD_DST_OF | FLD_AUD_DST_SYNC |</div><div class='del'>-		 FLD_AUD_DST_OPC_ERR);</div><div class='add'>+	cx_write(AUD_A_INT_MSK, FLD_AUD_DST_RISCI1 | FLD_AUD_DST_OF |</div><div class='add'>+		 FLD_AUD_DST_SYNC | FLD_AUD_DST_OPC_ERR);</div><div class='ctx'> </div><div class='ctx'> 	/* Clean any pending interrupt bits already set */</div><div class='ctx'> 	cx_write(AUD_A_INT_STAT, ~0);</div><div class='hunk'>@@ -200,8 +198,8 @@ static int _cx25821_start_audio_dma(struct cx25821_audio_dev *chip)</div><div class='ctx'> </div><div class='ctx'> 	/* Turn on audio downstream fifo and risc enable 0x101 */</div><div class='ctx'> 	tmp = cx_read(AUD_INT_DMA_CTL);</div><div class='del'>-	cx_set(AUD_INT_DMA_CTL,</div><div class='del'>-	       tmp | (FLD_AUD_DST_A_RISC_EN | FLD_AUD_DST_A_FIFO_EN));</div><div class='add'>+	cx_set(AUD_INT_DMA_CTL, tmp |</div><div class='add'>+	       (FLD_AUD_DST_A_RISC_EN | FLD_AUD_DST_A_FIFO_EN));</div><div class='ctx'> </div><div class='ctx'> 	mdelay(100);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -220,9 +218,8 @@ static int _cx25821_stop_audio_dma(struct cx25821_audio_dev *chip)</div><div class='ctx'> </div><div class='ctx'> 	/* disable irqs */</div><div class='ctx'> 	cx_clear(PCI_INT_MSK, PCI_MSK_AUD_INT);</div><div class='del'>-	cx_clear(AUD_A_INT_MSK,</div><div class='del'>-		 AUD_INT_OPC_ERR | AUD_INT_DN_SYNC | AUD_INT_DN_RISCI2 |</div><div class='del'>-		 AUD_INT_DN_RISCI1);</div><div class='add'>+	cx_clear(AUD_A_INT_MSK, AUD_INT_OPC_ERR | AUD_INT_DN_SYNC |</div><div class='add'>+		 AUD_INT_DN_RISCI2 | AUD_INT_DN_RISCI1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -234,15 +231,15 @@ static int _cx25821_stop_audio_dma(struct cx25821_audio_dev *chip)</div><div class='ctx'>  */</div><div class='ctx'> static char *cx25821_aud_irqs[32] = {</div><div class='ctx'> 	"dn_risci1", "up_risci1", "rds_dn_risc1",	/* 0-2 */</div><div class='del'>-	NULL,			/* reserved */</div><div class='add'>+	NULL,						/* reserved */</div><div class='ctx'> 	"dn_risci2", "up_risci2", "rds_dn_risc2",	/* 4-6 */</div><div class='del'>-	NULL,			/* reserved */</div><div class='del'>-	"dnf_of", "upf_uf", "rds_dnf_uf",	/* 8-10 */</div><div class='del'>-	NULL,			/* reserved */</div><div class='del'>-	"dn_sync", "up_sync", "rds_dn_sync",	/* 12-14 */</div><div class='del'>-	NULL,			/* reserved */</div><div class='del'>-	"opc_err", "par_err", "rip_err",	/* 16-18 */</div><div class='del'>-	"pci_abort", "ber_irq", "mchg_irq"	/* 19-21 */</div><div class='add'>+	NULL,						/* reserved */</div><div class='add'>+	"dnf_of", "upf_uf", "rds_dnf_uf",		/* 8-10 */</div><div class='add'>+	NULL,						/* reserved */</div><div class='add'>+	"dn_sync", "up_sync", "rds_dn_sync",		/* 12-14 */</div><div class='add'>+	NULL,						/* reserved */</div><div class='add'>+	"opc_err", "par_err", "rip_err",		/* 16-18 */</div><div class='add'>+	"pci_abort", "ber_irq", "mchg_irq"		/* 19-21 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -258,10 +255,8 @@ static void cx25821_aud_irq(struct cx25821_audio_dev *chip, u32 status,</div><div class='ctx'> </div><div class='ctx'> 	cx_write(AUD_A_INT_STAT, status);</div><div class='ctx'> 	if (debug &gt; 1 || (status &amp; mask &amp; ~0xff))</div><div class='del'>-		cx25821_print_irqbits(dev-&gt;name, "irq aud",</div><div class='del'>-				      cx25821_aud_irqs,</div><div class='del'>-				      ARRAY_SIZE(cx25821_aud_irqs), status,</div><div class='del'>-				      mask);</div><div class='add'>+		cx25821_print_irqbits(dev-&gt;name, "irq aud", cx25821_aud_irqs,</div><div class='add'>+				ARRAY_SIZE(cx25821_aud_irqs), status, mask);</div><div class='ctx'> </div><div class='ctx'> 	/* risc op code error */</div><div class='ctx'> 	if (status &amp; AUD_INT_OPC_ERR) {</div><div class='hunk'>@@ -270,8 +265,7 @@ static void cx25821_aud_irq(struct cx25821_audio_dev *chip, u32 status,</div><div class='ctx'> 		cx_clear(AUD_INT_DMA_CTL,</div><div class='ctx'> 			 FLD_AUD_DST_A_RISC_EN | FLD_AUD_DST_A_FIFO_EN);</div><div class='ctx'> 		cx25821_sram_channel_dump_audio(dev,</div><div class='del'>-						&amp;cx25821_sram_channels</div><div class='del'>-						[AUDIO_SRAM_CHANNEL]);</div><div class='add'>+				&amp;cx25821_sram_channels[AUDIO_SRAM_CHANNEL]);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (status &amp; AUD_INT_DN_SYNC) {</div><div class='ctx'> 		pr_warn("WARNING %s: Downstream sync error!\n", dev-&gt;name);</div><div class='hunk'>@@ -317,8 +311,9 @@ static irqreturn_t cx25821_irq(int irq, void *dev_id)</div><div class='ctx'> 				cx25821_aud_irq(chip, audint_status,</div><div class='ctx'> 						audint_mask);</div><div class='ctx'> 				break;</div><div class='del'>-			} else</div><div class='add'>+			} else {</div><div class='ctx'> 				goto out;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		handled = 1;</div><div class='hunk'>@@ -361,9 +356,8 @@ static int dsp_buffer_free(struct cx25821_audio_dev *chip)</div><div class='ctx'>  */</div><div class='ctx'> #define DEFAULT_FIFO_SIZE	384</div><div class='ctx'> static struct snd_pcm_hardware snd_cx25821_digital_hw = {</div><div class='del'>-	.info = SNDRV_PCM_INFO_MMAP |</div><div class='del'>-	    SNDRV_PCM_INFO_INTERLEAVED |</div><div class='del'>-	    SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID,</div><div class='add'>+	.info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='add'>+		SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID,</div><div class='ctx'> 	.formats = SNDRV_PCM_FMTBIT_S16_LE,</div><div class='ctx'> </div><div class='ctx'> 	.rates = SNDRV_PCM_RATE_48000,</div><div class='hunk'>@@ -396,8 +390,8 @@ static int snd_cx25821_pcm_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err =</div><div class='del'>-	    snd_pcm_hw_constraint_pow2(runtime, 0, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	err = snd_pcm_hw_constraint_pow2(runtime, 0,</div><div class='add'>+					 SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto _error;</div><div class='ctx'> </div><div class='hunk'>@@ -468,8 +462,7 @@ static int snd_cx25821_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	dma = &amp;buf-&gt;dma;</div><div class='ctx'> 	videobuf_dma_init(dma);</div><div class='ctx'> 	ret = videobuf_dma_init_kernel(dma, PCI_DMA_FROMDEVICE,</div><div class='del'>-				       (PAGE_ALIGN(chip-&gt;dma_size) &gt;&gt;</div><div class='del'>-					PAGE_SHIFT));</div><div class='add'>+			(PAGE_ALIGN(chip-&gt;dma_size) &gt;&gt; PAGE_SHIFT));</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -477,10 +470,8 @@ static int snd_cx25821_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	ret =</div><div class='del'>-	    cx25821_risc_databuffer_audio(chip-&gt;pci, &amp;buf-&gt;risc, dma-&gt;sglist,</div><div class='del'>-					  chip-&gt;period_size, chip-&gt;num_periods,</div><div class='del'>-					  1);</div><div class='add'>+	ret = cx25821_risc_databuffer_audio(chip-&gt;pci, &amp;buf-&gt;risc, dma-&gt;sglist,</div><div class='add'>+			chip-&gt;period_size, chip-&gt;num_periods, 1);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		pr_info("DEBUG: ERROR after cx25821_risc_databuffer_audio()\n");</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -686,7 +677,7 @@ static int cx25821_audio_initdev(struct cx25821_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = snd_card_create(index[devno], id[devno], THIS_MODULE,</div><div class='del'>-			 sizeof(struct cx25821_audio_dev), &amp;card);</div><div class='add'>+			sizeof(struct cx25821_audio_dev), &amp;card);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		pr_info("DEBUG ERROR: cannot create snd_card_new in %s\n",</div><div class='ctx'> 			__func__);</div><div class='hunk'>@@ -711,8 +702,8 @@ static int cx25821_audio_initdev(struct cx25821_dev *dev)</div><div class='ctx'> 			  IRQF_SHARED, chip-&gt;dev-&gt;name, chip);</div><div class='ctx'> </div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		pr_err("ERROR %s: can't get IRQ %d for ALSA\n",</div><div class='del'>-		       chip-&gt;dev-&gt;name, dev-&gt;pci-&gt;irq);</div><div class='add'>+		pr_err("ERROR %s: can't get IRQ %d for ALSA\n", chip-&gt;dev-&gt;name,</div><div class='add'>+			dev-&gt;pci-&gt;irq);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -730,8 +721,8 @@ static int cx25821_audio_initdev(struct cx25821_dev *dev)</div><div class='ctx'> 		chip-&gt;iobase, chip-&gt;irq);</div><div class='ctx'> 	strcpy(card-&gt;mixername, "CX25821");</div><div class='ctx'> </div><div class='del'>-	pr_info("%s/%i: ALSA support for cx25821 boards\n",</div><div class='del'>-		card-&gt;driver, devno);</div><div class='add'>+	pr_info("%s/%i: ALSA support for cx25821 boards\n", card-&gt;driver,</div><div class='add'>+		devno);</div><div class='ctx'> </div><div class='ctx'> 	err = snd_card_register(card);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='head'>diff --git a/drivers/media/video/cx25821/cx25821-audio-upstream.c b/drivers/media/video/cx25821/cx25821-audio-upstream.c<br/>index c20d6dece154..20c7ca3351a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-audio-upstream.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-audio-upstream.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-audio-upstream.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx25821/cx25821-audio-upstream.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ static __le32 *cx25821_risc_field_upstream_audio(struct cx25821_dev *dev,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int line;</div><div class='ctx'> 	struct sram_channel *sram_ch =</div><div class='del'>-	   dev-&gt;channels[dev-&gt;_audio_upstream_channel].sram_channels;</div><div class='add'>+		dev-&gt;channels[dev-&gt;_audio_upstream_channel].sram_channels;</div><div class='ctx'> 	int offset = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* scan lines */</div><div class='hunk'>@@ -175,10 +175,8 @@ int cx25821_risc_buffer_upstream_audio(struct cx25821_dev *dev,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		rp = cx25821_risc_field_upstream_audio(dev, rp,</div><div class='del'>-						       dev-&gt;</div><div class='del'>-						       _audiodata_buf_phys_addr</div><div class='del'>-						       + databuf_offset, bpl,</div><div class='del'>-						       fifo_enable);</div><div class='add'>+				dev-&gt;_audiodata_buf_phys_addr + databuf_offset,</div><div class='add'>+				bpl, fifo_enable);</div><div class='ctx'> </div><div class='ctx'> 		if (USE_RISC_NOOP_AUDIO) {</div><div class='ctx'> 			for (i = 0; i &lt; NUM_NO_OPS; i++)</div><div class='hunk'>@@ -193,7 +191,7 @@ int cx25821_risc_buffer_upstream_audio(struct cx25821_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 		/* Recalculate virtual address based on frame index */</div><div class='ctx'> 		rp = dev-&gt;_risc_virt_addr + RISC_SYNC_INSTRUCTION_SIZE / 4 +</div><div class='del'>-		    (AUDIO_RISC_DMA_BUF_SIZE * (frame + 1) / 4);</div><div class='add'>+			(AUDIO_RISC_DMA_BUF_SIZE * (frame + 1) / 4);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -218,7 +216,7 @@ void cx25821_free_memory_audio(struct cx25821_dev *dev)</div><div class='ctx'> void cx25821_stop_upstream_audio(struct cx25821_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sram_channel *sram_ch =</div><div class='del'>-	   dev-&gt;channels[AUDIO_UPSTREAM_SRAM_CHANNEL_B].sram_channels;</div><div class='add'>+		dev-&gt;channels[AUDIO_UPSTREAM_SRAM_CHANNEL_B].sram_channels;</div><div class='ctx'> 	u32 tmp = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;_audio_is_running) {</div><div class='hunk'>@@ -286,14 +284,14 @@ int cx25821_get_audio_data(struct cx25821_dev *dev,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!(myfile-&gt;f_op)) {</div><div class='ctx'> 			pr_err("%s(): File has no file operations registered!\n",</div><div class='del'>-			       __func__);</div><div class='add'>+				__func__);</div><div class='ctx'> 			filp_close(myfile, NULL);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!myfile-&gt;f_op-&gt;read) {</div><div class='ctx'> 			pr_err("%s(): File has no READ operations registered!\n",</div><div class='del'>-			       __func__);</div><div class='add'>+				__func__);</div><div class='ctx'> 			filp_close(myfile, NULL);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -305,14 +303,14 @@ int cx25821_get_audio_data(struct cx25821_dev *dev,</div><div class='ctx'> 		for (i = 0; i &lt; dev-&gt;_audio_lines_count; i++) {</div><div class='ctx'> 			pos = file_offset;</div><div class='ctx'> </div><div class='del'>-			vfs_read_retval =</div><div class='del'>-			    vfs_read(myfile, mybuf, line_size, &amp;pos);</div><div class='add'>+			vfs_read_retval = vfs_read(myfile, mybuf, line_size,</div><div class='add'>+									&amp;pos);</div><div class='ctx'> </div><div class='ctx'> 			if (vfs_read_retval &gt; 0 &amp;&amp; vfs_read_retval == line_size</div><div class='ctx'> 			    &amp;&amp; dev-&gt;_audiodata_buf_virt_addr != NULL) {</div><div class='ctx'> 				memcpy((void *)(dev-&gt;_audiodata_buf_virt_addr +</div><div class='ctx'> 						frame_offset / 4), mybuf,</div><div class='del'>-				       vfs_read_retval);</div><div class='add'>+					vfs_read_retval);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			file_offset += vfs_read_retval;</div><div class='hunk'>@@ -328,8 +326,8 @@ int cx25821_get_audio_data(struct cx25821_dev *dev,</div><div class='ctx'> 		if (i &gt; 0)</div><div class='ctx'> 			dev-&gt;_audioframe_count++;</div><div class='ctx'> </div><div class='del'>-		dev-&gt;_audiofile_status =</div><div class='del'>-		    (vfs_read_retval == line_size) ? IN_PROGRESS : END_OF_FILE;</div><div class='add'>+		dev-&gt;_audiofile_status = (vfs_read_retval == line_size) ?</div><div class='add'>+						IN_PROGRESS : END_OF_FILE;</div><div class='ctx'> </div><div class='ctx'> 		set_fs(old_fs);</div><div class='ctx'> 		filp_close(myfile, NULL);</div><div class='hunk'>@@ -340,12 +338,12 @@ int cx25821_get_audio_data(struct cx25821_dev *dev,</div><div class='ctx'> </div><div class='ctx'> static void cx25821_audioups_handler(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct cx25821_dev *dev =</div><div class='del'>-	    container_of(work, struct cx25821_dev, _audio_work_entry);</div><div class='add'>+	struct cx25821_dev *dev = container_of(work, struct cx25821_dev,</div><div class='add'>+			_audio_work_entry);</div><div class='ctx'> </div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		pr_err("ERROR %s(): since container_of(work_struct) FAILED!\n",</div><div class='del'>-		       __func__);</div><div class='add'>+			__func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -370,19 +368,19 @@ int cx25821_openfile_audio(struct cx25821_dev *dev,</div><div class='ctx'> 	if (IS_ERR(myfile)) {</div><div class='ctx'> 		const int open_errno = -PTR_ERR(myfile);</div><div class='ctx'> 		pr_err("%s(): ERROR opening file(%s) with errno = %d!\n",</div><div class='del'>-		       __func__, dev-&gt;_audiofilename, open_errno);</div><div class='add'>+			__func__, dev-&gt;_audiofilename, open_errno);</div><div class='ctx'> 		return PTR_ERR(myfile);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!(myfile-&gt;f_op)) {</div><div class='ctx'> 			pr_err("%s(): File has no file operations registered!\n",</div><div class='del'>-			       __func__);</div><div class='add'>+				__func__);</div><div class='ctx'> 			filp_close(myfile, NULL);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!myfile-&gt;f_op-&gt;read) {</div><div class='ctx'> 			pr_err("%s(): File has no READ operations registered!\n",</div><div class='del'>-			       __func__);</div><div class='add'>+				__func__);</div><div class='ctx'> 			filp_close(myfile, NULL);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -395,12 +393,12 @@ int cx25821_openfile_audio(struct cx25821_dev *dev,</div><div class='ctx'> 			for (i = 0; i &lt; dev-&gt;_audio_lines_count; i++) {</div><div class='ctx'> 				pos = offset;</div><div class='ctx'> </div><div class='del'>-				vfs_read_retval =</div><div class='del'>-				    vfs_read(myfile, mybuf, line_size, &amp;pos);</div><div class='add'>+				vfs_read_retval = vfs_read(myfile, mybuf,</div><div class='add'>+						line_size, &amp;pos);</div><div class='ctx'> </div><div class='del'>-				if (vfs_read_retval &gt; 0</div><div class='del'>-				    &amp;&amp; vfs_read_retval == line_size</div><div class='del'>-				    &amp;&amp; dev-&gt;_audiodata_buf_virt_addr != NULL) {</div><div class='add'>+				if (vfs_read_retval &gt; 0 &amp;&amp;</div><div class='add'>+				    vfs_read_retval == line_size &amp;&amp;</div><div class='add'>+				    dev-&gt;_audiodata_buf_virt_addr != NULL) {</div><div class='ctx'> 					memcpy((void *)(dev-&gt;</div><div class='ctx'> 							_audiodata_buf_virt_addr</div><div class='ctx'> 							+ offset / 4), mybuf,</div><div class='hunk'>@@ -423,8 +421,8 @@ int cx25821_openfile_audio(struct cx25821_dev *dev,</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dev-&gt;_audiofile_status =</div><div class='del'>-		    (vfs_read_retval == line_size) ? IN_PROGRESS : END_OF_FILE;</div><div class='add'>+		dev-&gt;_audiofile_status = (vfs_read_retval == line_size) ?</div><div class='add'>+						IN_PROGRESS : END_OF_FILE;</div><div class='ctx'> </div><div class='ctx'> 		set_fs(old_fs);</div><div class='ctx'> 		myfile-&gt;f_pos = 0;</div><div class='hunk'>@@ -444,9 +442,8 @@ static int cx25821_audio_upstream_buffer_prepare(struct cx25821_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	cx25821_free_memory_audio(dev);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;_risc_virt_addr =</div><div class='del'>-	    pci_alloc_consistent(dev-&gt;pci, dev-&gt;audio_upstream_riscbuf_size,</div><div class='del'>-				 &amp;dma_addr);</div><div class='add'>+	dev-&gt;_risc_virt_addr = pci_alloc_consistent(dev-&gt;pci,</div><div class='add'>+			dev-&gt;audio_upstream_riscbuf_size, &amp;dma_addr);</div><div class='ctx'> 	dev-&gt;_risc_virt_start_addr = dev-&gt;_risc_virt_addr;</div><div class='ctx'> 	dev-&gt;_risc_phys_start_addr = dma_addr;</div><div class='ctx'> 	dev-&gt;_risc_phys_addr = dma_addr;</div><div class='hunk'>@@ -454,22 +451,21 @@ static int cx25821_audio_upstream_buffer_prepare(struct cx25821_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;_risc_virt_addr) {</div><div class='ctx'> 		printk(KERN_DEBUG</div><div class='del'>-		       pr_fmt("ERROR: pci_alloc_consistent() FAILED to allocate memory for RISC program! Returning\n"));</div><div class='add'>+			pr_fmt("ERROR: pci_alloc_consistent() FAILED to allocate memory for RISC program! Returning\n"));</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Clear out memory at address */</div><div class='ctx'> 	memset(dev-&gt;_risc_virt_addr, 0, dev-&gt;_audiorisc_size);</div><div class='ctx'> </div><div class='ctx'> 	/* For Audio Data buffer allocation */</div><div class='del'>-	dev-&gt;_audiodata_buf_virt_addr =</div><div class='del'>-	    pci_alloc_consistent(dev-&gt;pci, dev-&gt;audio_upstream_databuf_size,</div><div class='del'>-				 &amp;data_dma_addr);</div><div class='add'>+	dev-&gt;_audiodata_buf_virt_addr = pci_alloc_consistent(dev-&gt;pci,</div><div class='add'>+			dev-&gt;audio_upstream_databuf_size, &amp;data_dma_addr);</div><div class='ctx'> 	dev-&gt;_audiodata_buf_phys_addr = data_dma_addr;</div><div class='ctx'> 	dev-&gt;_audiodata_buf_size = dev-&gt;audio_upstream_databuf_size;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;_audiodata_buf_virt_addr) {</div><div class='ctx'> 		printk(KERN_DEBUG</div><div class='del'>-		       pr_fmt("ERROR: pci_alloc_consistent() FAILED to allocate memory for data buffer! Returning\n"));</div><div class='add'>+			pr_fmt("ERROR: pci_alloc_consistent() FAILED to allocate memory for data buffer! Returning\n"));</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Clear out memory at address */</div><div class='hunk'>@@ -480,12 +476,11 @@ static int cx25821_audio_upstream_buffer_prepare(struct cx25821_dev *dev,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Creating RISC programs */</div><div class='del'>-	ret =</div><div class='del'>-	    cx25821_risc_buffer_upstream_audio(dev, dev-&gt;pci, bpl,</div><div class='del'>-					       dev-&gt;_audio_lines_count);</div><div class='add'>+	ret = cx25821_risc_buffer_upstream_audio(dev, dev-&gt;pci, bpl,</div><div class='add'>+						dev-&gt;_audio_lines_count);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		printk(KERN_DEBUG</div><div class='del'>-		       pr_fmt("ERROR creating audio upstream RISC programs!\n"));</div><div class='add'>+			pr_fmt("ERROR creating audio upstream RISC programs!\n"));</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -533,9 +528,9 @@ int cx25821_audio_upstream_irq(struct cx25821_dev *dev, int chan_num,</div><div class='ctx'> </div><div class='ctx'> 			if (dev-&gt;_risc_virt_start_addr != NULL) {</div><div class='ctx'> 				risc_phys_jump_addr =</div><div class='del'>-				    dev-&gt;_risc_phys_start_addr +</div><div class='del'>-				    RISC_SYNC_INSTRUCTION_SIZE +</div><div class='del'>-				    AUDIO_RISC_DMA_BUF_SIZE;</div><div class='add'>+					dev-&gt;_risc_phys_start_addr +</div><div class='add'>+					RISC_SYNC_INSTRUCTION_SIZE +</div><div class='add'>+					AUDIO_RISC_DMA_BUF_SIZE;</div><div class='ctx'> </div><div class='ctx'> 				rp = cx25821_risc_field_upstream_audio(dev,</div><div class='ctx'> 						dev-&gt;_risc_virt_start_addr + 1,</div><div class='hunk'>@@ -632,7 +627,7 @@ static void cx25821_wait_fifo_enable(struct cx25821_dev *dev,</div><div class='ctx'> 		/* 10 millisecond timeout */</div><div class='ctx'> 		if (count++ &gt; 1000) {</div><div class='ctx'> 			pr_err("ERROR: %s() fifo is NOT turned on. Timeout!\n",</div><div class='del'>-			       __func__);</div><div class='add'>+				__func__);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -661,9 +656,9 @@ int cx25821_start_audio_dma_upstream(struct cx25821_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	/* Set the input mode to 16-bit */</div><div class='ctx'> 	tmp = cx_read(sram_ch-&gt;aud_cfg);</div><div class='del'>-	tmp |=</div><div class='del'>-	    FLD_AUD_SRC_ENABLE | FLD_AUD_DST_PK_MODE | FLD_AUD_CLK_ENABLE |</div><div class='del'>-	    FLD_AUD_MASTER_MODE | FLD_AUD_CLK_SELECT_PLL_D | FLD_AUD_SONY_MODE;</div><div class='add'>+	tmp |= FLD_AUD_SRC_ENABLE | FLD_AUD_DST_PK_MODE | FLD_AUD_CLK_ENABLE |</div><div class='add'>+		FLD_AUD_MASTER_MODE | FLD_AUD_CLK_SELECT_PLL_D |</div><div class='add'>+		FLD_AUD_SONY_MODE;</div><div class='ctx'> 	cx_write(sram_ch-&gt;aud_cfg, tmp);</div><div class='ctx'> </div><div class='ctx'> 	/* Read and write back the interrupt status register to clear it */</div><div class='hunk'>@@ -678,12 +673,11 @@ int cx25821_start_audio_dma_upstream(struct cx25821_dev *dev,</div><div class='ctx'> 	tmp = cx_read(sram_ch-&gt;int_msk);</div><div class='ctx'> 	cx_write(sram_ch-&gt;int_msk, tmp |= _intr_msk);</div><div class='ctx'> </div><div class='del'>-	err =</div><div class='del'>-	    request_irq(dev-&gt;pci-&gt;irq, cx25821_upstream_irq_audio,</div><div class='add'>+	err = request_irq(dev-&gt;pci-&gt;irq, cx25821_upstream_irq_audio,</div><div class='ctx'> 			IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		pr_err("%s: can't get upstream IRQ %d\n",</div><div class='del'>-		       dev-&gt;name, dev-&gt;pci-&gt;irq);</div><div class='add'>+		pr_err("%s: can't get upstream IRQ %d\n", dev-&gt;name,</div><div class='add'>+				dev-&gt;pci-&gt;irq);</div><div class='ctx'> 		goto fail_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -726,7 +720,7 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;_irq_audio_queues) {</div><div class='ctx'> 		printk(KERN_DEBUG</div><div class='del'>-		       pr_fmt("ERROR: create_singlethread_workqueue() for Audio FAILED!\n"));</div><div class='add'>+			pr_fmt("ERROR: create_singlethread_workqueue() for Audio FAILED!\n"));</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -739,33 +733,30 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;input_audiofilename) {</div><div class='ctx'> 		str_length = strlen(dev-&gt;input_audiofilename);</div><div class='del'>-		dev-&gt;_audiofilename = kmalloc(str_length + 1, GFP_KERNEL);</div><div class='add'>+		dev-&gt;_audiofilename = kmemdup(dev-&gt;input_audiofilename,</div><div class='add'>+					      str_length + 1, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 		if (!dev-&gt;_audiofilename)</div><div class='ctx'> 			goto error;</div><div class='ctx'> </div><div class='del'>-		memcpy(dev-&gt;_audiofilename, dev-&gt;input_audiofilename,</div><div class='del'>-		       str_length + 1);</div><div class='del'>-</div><div class='ctx'> 		/* Default if filename is empty string */</div><div class='ctx'> 		if (strcmp(dev-&gt;input_audiofilename, "") == 0)</div><div class='ctx'> 			dev-&gt;_audiofilename = "/root/audioGOOD.wav";</div><div class='ctx'> 	} else {</div><div class='ctx'> 		str_length = strlen(_defaultAudioName);</div><div class='del'>-		dev-&gt;_audiofilename = kmalloc(str_length + 1, GFP_KERNEL);</div><div class='add'>+		dev-&gt;_audiofilename = kmemdup(_defaultAudioName,</div><div class='add'>+					      str_length + 1, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 		if (!dev-&gt;_audiofilename)</div><div class='ctx'> 			goto error;</div><div class='del'>-</div><div class='del'>-		memcpy(dev-&gt;_audiofilename, _defaultAudioName, str_length + 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	retval = cx25821_sram_channel_setup_upstream_audio(dev, sram_ch,</div><div class='ctx'> 							_line_size, 0);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;audio_upstream_riscbuf_size =</div><div class='del'>-	    AUDIO_RISC_DMA_BUF_SIZE * NUM_AUDIO_PROGS +</div><div class='del'>-	    RISC_SYNC_INSTRUCTION_SIZE;</div><div class='add'>+		AUDIO_RISC_DMA_BUF_SIZE * NUM_AUDIO_PROGS +</div><div class='add'>+		RISC_SYNC_INSTRUCTION_SIZE;</div><div class='ctx'> 	dev-&gt;audio_upstream_databuf_size = AUDIO_DATA_BUF_SZ * NUM_AUDIO_PROGS;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocating buffers and prepare RISC program */</div><div class='hunk'>@@ -773,7 +764,7 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)</div><div class='ctx'> 							_line_size);</div><div class='ctx'> 	if (retval &lt; 0) {</div><div class='ctx'> 		pr_err("%s: Failed to set up Audio upstream buffers!\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='add'>+			dev-&gt;name);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Start RISC engine */</div><div class='head'>diff --git a/drivers/media/video/cx25821/cx25821-audio.h b/drivers/media/video/cx25821/cx25821-audio.h<br/>index 8eb55b7b88cb..1fc2d24f5110 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-audio.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-audio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-audio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx25821/cx25821-audio.h</a></div><div class='hunk'>@@ -23,39 +23,40 @@</div><div class='ctx'> #ifndef __CX25821_AUDIO_H__</div><div class='ctx'> #define __CX25821_AUDIO_H__</div><div class='ctx'> </div><div class='del'>-#define USE_RISC_NOOP               1</div><div class='del'>-#define LINES_PER_BUFFER            15</div><div class='del'>-#define AUDIO_LINE_SIZE             128</div><div class='add'>+#define USE_RISC_NOOP		1</div><div class='add'>+#define LINES_PER_BUFFER	15</div><div class='add'>+#define AUDIO_LINE_SIZE		128</div><div class='ctx'> </div><div class='ctx'> /* Number of buffer programs to use at once. */</div><div class='del'>-#define NUMBER_OF_PROGRAMS  8</div><div class='add'>+#define NUMBER_OF_PROGRAMS	8</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Max size of the RISC program for a buffer. - worst case is 2 writes per line</div><div class='ctx'>  * Space is also added for the 4 no-op instructions added on the end.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef USE_RISC_NOOP</div><div class='del'>-#define MAX_BUFFER_PROGRAM_SIZE     \</div><div class='del'>-	(2 * LINES_PER_BUFFER * RISC_WRITE_INSTRUCTION_SIZE + \</div><div class='del'>-	RISC_WRITECR_INSTRUCTION_SIZE * 4)</div><div class='add'>+#define MAX_BUFFER_PROGRAM_SIZE						\</div><div class='add'>+	(2 * LINES_PER_BUFFER * RISC_WRITE_INSTRUCTION_SIZE +		\</div><div class='add'>+	 RISC_WRITECR_INSTRUCTION_SIZE * 4)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* MAE 12 July 2005 Try to use NOOP RISC instruction instead */</div><div class='ctx'> #ifdef USE_RISC_NOOP</div><div class='del'>-#define MAX_BUFFER_PROGRAM_SIZE     \</div><div class='del'>-	(2 * LINES_PER_BUFFER * RISC_WRITE_INSTRUCTION_SIZE + \</div><div class='del'>-	RISC_NOOP_INSTRUCTION_SIZE * 4)</div><div class='add'>+#define MAX_BUFFER_PROGRAM_SIZE						\</div><div class='add'>+	(2 * LINES_PER_BUFFER * RISC_WRITE_INSTRUCTION_SIZE +		\</div><div class='add'>+	 RISC_NOOP_INSTRUCTION_SIZE * 4)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Sizes of various instructions in bytes.  Used when adding instructions. */</div><div class='del'>-#define RISC_WRITE_INSTRUCTION_SIZE 12</div><div class='del'>-#define RISC_JUMP_INSTRUCTION_SIZE  12</div><div class='del'>-#define RISC_SKIP_INSTRUCTION_SIZE  4</div><div class='del'>-#define RISC_SYNC_INSTRUCTION_SIZE  4</div><div class='del'>-#define RISC_WRITECR_INSTRUCTION_SIZE  16</div><div class='del'>-#define RISC_NOOP_INSTRUCTION_SIZE 4</div><div class='del'>-</div><div class='del'>-#define MAX_AUDIO_DMA_BUFFER_SIZE	\</div><div class='del'>-(MAX_BUFFER_PROGRAM_SIZE * NUMBER_OF_PROGRAMS + RISC_SYNC_INSTRUCTION_SIZE)</div><div class='add'>+#define RISC_WRITE_INSTRUCTION_SIZE	12</div><div class='add'>+#define RISC_JUMP_INSTRUCTION_SIZE	12</div><div class='add'>+#define RISC_SKIP_INSTRUCTION_SIZE	4</div><div class='add'>+#define RISC_SYNC_INSTRUCTION_SIZE	4</div><div class='add'>+#define RISC_WRITECR_INSTRUCTION_SIZE	16</div><div class='add'>+#define RISC_NOOP_INSTRUCTION_SIZE	4</div><div class='add'>+</div><div class='add'>+#define MAX_AUDIO_DMA_BUFFER_SIZE					\</div><div class='add'>+	(MAX_BUFFER_PROGRAM_SIZE * NUMBER_OF_PROGRAMS +			\</div><div class='add'>+	 RISC_SYNC_INSTRUCTION_SIZE)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/video/cx25821/cx25821-cards.c b/drivers/media/video/cx25821/cx25821-cards.c<br/>index 6ace60313b49..99988c988095 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-cards.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx25821/cx25821-cards.c</a></div><div class='hunk'>@@ -67,6 +67,6 @@ void cx25821_card_setup(struct cx25821_dev *dev)</div><div class='ctx'> 	if (dev-&gt;i2c_bus[0].i2c_rc == 0) {</div><div class='ctx'> 		dev-&gt;i2c_bus[0].i2c_client.addr = 0xa0 &gt;&gt; 1;</div><div class='ctx'> 		tveeprom_read(&amp;dev-&gt;i2c_bus[0].i2c_client, eeprom,</div><div class='del'>-			      sizeof(eeprom));</div><div class='add'>+				sizeof(eeprom));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/cx25821/cx25821-core.c b/drivers/media/video/cx25821/cx25821-core.c<br/>index a7fa38f9594e..f617474f9073 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx25821/cx25821-core.c</a></div><div class='hunk'>@@ -804,8 +804,8 @@ void cx25821_set_pixel_format(struct cx25821_dev *dev, int channel_select,</div><div class='ctx'> 			      u32 format)</div><div class='ctx'> {</div><div class='ctx'> 	if (channel_select &lt;= 7 &amp;&amp; channel_select &gt;= 0) {</div><div class='del'>-		cx_write(dev-&gt;channels[channel_select].</div><div class='del'>-			sram_channels-&gt;pix_frmt, format);</div><div class='add'>+		cx_write(dev-&gt;channels[channel_select].sram_channels-&gt;pix_frmt,</div><div class='add'>+				format);</div><div class='ctx'> 		dev-&gt;channels[channel_select].pixel_formats = format;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -855,21 +855,19 @@ static void cx25821_initialize(struct cx25821_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cx25821_sram_channel_setup_audio(dev,</div><div class='del'>-				dev-&gt;channels[SRAM_CH08].sram_channels,</div><div class='del'>-				128, 0);</div><div class='add'>+			dev-&gt;channels[SRAM_CH08].sram_channels, 128, 0);</div><div class='ctx'> </div><div class='ctx'> 	cx25821_gpio_init(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cx25821_get_resources(struct cx25821_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	if (request_mem_region</div><div class='del'>-	    (pci_resource_start(dev-&gt;pci, 0), pci_resource_len(dev-&gt;pci, 0),</div><div class='del'>-	     dev-&gt;name))</div><div class='add'>+	if (request_mem_region(pci_resource_start(dev-&gt;pci, 0),</div><div class='add'>+				pci_resource_len(dev-&gt;pci, 0), dev-&gt;name))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	pr_err("%s: can't get MMIO memory @ 0x%llx\n",</div><div class='del'>-	       dev-&gt;name, (unsigned long long)pci_resource_start(dev-&gt;pci, 0));</div><div class='add'>+		dev-&gt;name, (unsigned long long)pci_resource_start(dev-&gt;pci, 0));</div><div class='ctx'> </div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='hunk'>@@ -972,8 +970,7 @@ static int cx25821_dev_setup(struct cx25821_dev *dev)</div><div class='ctx'> 	dev-&gt;lmmio = ioremap(dev-&gt;base_io_addr, pci_resource_len(dev-&gt;pci, 0));</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;lmmio) {</div><div class='del'>-		CX25821_ERR</div><div class='del'>-		    ("ioremap failed, maybe increasing __VMALLOC_RESERVE in page.h\n");</div><div class='add'>+		CX25821_ERR("ioremap failed, maybe increasing __VMALLOC_RESERVE in page.h\n");</div><div class='ctx'> 		cx25821_iounmap(dev);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -994,7 +991,7 @@ static int cx25821_dev_setup(struct cx25821_dev *dev)</div><div class='ctx'>  *  cx25821_i2c_register(&amp;dev-&gt;i2c_bus[2]); */</div><div class='ctx'> </div><div class='ctx'> 	CX25821_INFO("i2c register! bus-&gt;i2c_rc = %d\n",</div><div class='del'>-		     dev-&gt;i2c_bus[0].i2c_rc);</div><div class='add'>+			dev-&gt;i2c_bus[0].i2c_rc);</div><div class='ctx'> </div><div class='ctx'> 	cx25821_card_setup(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1004,9 +1001,8 @@ static int cx25821_dev_setup(struct cx25821_dev *dev)</div><div class='ctx'> 	cx25821_video_register(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* register IOCTL device */</div><div class='del'>-	dev-&gt;ioctl_dev =</div><div class='del'>-	   cx25821_vdev_init(dev, dev-&gt;pci, &amp;cx25821_videoioctl_template,</div><div class='del'>-			      "video");</div><div class='add'>+	dev-&gt;ioctl_dev = cx25821_vdev_init(dev, dev-&gt;pci,</div><div class='add'>+			&amp;cx25821_videoioctl_template, "video");</div><div class='ctx'> </div><div class='ctx'> 	if (video_register_device</div><div class='ctx'> 	    (dev-&gt;ioctl_dev, VFL_TYPE_GRABBER, VIDEO_IOCTL_CH) &lt; 0) {</div><div class='hunk'>@@ -1103,16 +1099,15 @@ static __le32 *cx25821_risc_field(__le32 * rp, struct scatterlist *sglist,</div><div class='ctx'> 		}</div><div class='ctx'> 		if (bpl &lt;= sg_dma_len(sg) - offset) {</div><div class='ctx'> 			/* fits into current chunk */</div><div class='del'>-			*(rp++) =</div><div class='del'>-			    cpu_to_le32(RISC_WRITE | RISC_SOL | RISC_EOL | bpl);</div><div class='add'>+			*(rp++) = cpu_to_le32(RISC_WRITE | RISC_SOL | RISC_EOL |</div><div class='add'>+					bpl);</div><div class='ctx'> 			*(rp++) = cpu_to_le32(sg_dma_address(sg) + offset);</div><div class='ctx'> 			*(rp++) = cpu_to_le32(0);	/* bits 63-32 */</div><div class='ctx'> 			offset += bpl;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* scanline needs to be split */</div><div class='ctx'> 			todo = bpl;</div><div class='del'>-			*(rp++) =</div><div class='del'>-			    cpu_to_le32(RISC_WRITE | RISC_SOL |</div><div class='add'>+			*(rp++) = cpu_to_le32(RISC_WRITE | RISC_SOL |</div><div class='ctx'> 					(sg_dma_len(sg) - offset));</div><div class='ctx'> 			*(rp++) = cpu_to_le32(sg_dma_address(sg) + offset);</div><div class='ctx'> 			*(rp++) = cpu_to_le32(0);	/* bits 63-32 */</div><div class='hunk'>@@ -1120,8 +1115,8 @@ static __le32 *cx25821_risc_field(__le32 * rp, struct scatterlist *sglist,</div><div class='ctx'> 			offset = 0;</div><div class='ctx'> 			sg++;</div><div class='ctx'> 			while (todo &gt; sg_dma_len(sg)) {</div><div class='del'>-				*(rp++) =</div><div class='del'>-				    cpu_to_le32(RISC_WRITE | sg_dma_len(sg));</div><div class='add'>+				*(rp++) = cpu_to_le32(RISC_WRITE |</div><div class='add'>+						sg_dma_len(sg));</div><div class='ctx'> 				*(rp++) = cpu_to_le32(sg_dma_address(sg));</div><div class='ctx'> 				*(rp++) = cpu_to_le32(0);	/* bits 63-32 */</div><div class='ctx'> 				todo -= sg_dma_len(sg);</div><div class='hunk'>@@ -1160,8 +1155,8 @@ int cx25821_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,</div><div class='ctx'> 	   can cause next bpl to start close to a page border.  First DMA</div><div class='ctx'> 	   region may be smaller than PAGE_SIZE */</div><div class='ctx'> 	/* write and jump need and extra dword */</div><div class='del'>-	instructions =</div><div class='del'>-	    fields * (1 + ((bpl + padding) * lines) / PAGE_SIZE + lines);</div><div class='add'>+	instructions = fields * (1 + ((bpl + padding) * lines) / PAGE_SIZE +</div><div class='add'>+			lines);</div><div class='ctx'> 	instructions += 2;</div><div class='ctx'> 	rc = btcx_riscmem_alloc(pci, risc, instructions * 12);</div><div class='ctx'> </div><div class='hunk'>@@ -1215,8 +1210,8 @@ static __le32 *cx25821_risc_field_audio(__le32 * rp, struct scatterlist *sglist,</div><div class='ctx'> </div><div class='ctx'> 		if (bpl &lt;= sg_dma_len(sg) - offset) {</div><div class='ctx'> 			/* fits into current chunk */</div><div class='del'>-			*(rp++) =</div><div class='del'>-			    cpu_to_le32(RISC_WRITE | sol | RISC_EOL | bpl);</div><div class='add'>+			*(rp++) = cpu_to_le32(RISC_WRITE | sol | RISC_EOL |</div><div class='add'>+					bpl);</div><div class='ctx'> 			*(rp++) = cpu_to_le32(sg_dma_address(sg) + offset);</div><div class='ctx'> 			*(rp++) = cpu_to_le32(0);	/* bits 63-32 */</div><div class='ctx'> 			offset += bpl;</div><div class='hunk'>@@ -1224,7 +1219,7 @@ static __le32 *cx25821_risc_field_audio(__le32 * rp, struct scatterlist *sglist,</div><div class='ctx'> 			/* scanline needs to be split */</div><div class='ctx'> 			todo = bpl;</div><div class='ctx'> 			*(rp++) = cpu_to_le32(RISC_WRITE | sol |</div><div class='del'>-					      (sg_dma_len(sg) - offset));</div><div class='add'>+					(sg_dma_len(sg) - offset));</div><div class='ctx'> 			*(rp++) = cpu_to_le32(sg_dma_address(sg) + offset);</div><div class='ctx'> 			*(rp++) = cpu_to_le32(0);	/* bits 63-32 */</div><div class='ctx'> 			todo -= (sg_dma_len(sg) - offset);</div><div class='hunk'>@@ -1232,7 +1227,7 @@ static __le32 *cx25821_risc_field_audio(__le32 * rp, struct scatterlist *sglist,</div><div class='ctx'> 			sg++;</div><div class='ctx'> 			while (todo &gt; sg_dma_len(sg)) {</div><div class='ctx'> 				*(rp++) = cpu_to_le32(RISC_WRITE |</div><div class='del'>-						      sg_dma_len(sg));</div><div class='add'>+						sg_dma_len(sg));</div><div class='ctx'> 				*(rp++) = cpu_to_le32(sg_dma_address(sg));</div><div class='ctx'> 				*(rp++) = cpu_to_le32(0);	/* bits 63-32 */</div><div class='ctx'> 				todo -= sg_dma_len(sg);</div><div class='hunk'>@@ -1339,8 +1334,8 @@ static irqreturn_t cx25821_irq(int irq, void *dev_id)</div><div class='ctx'> 				sram_channels-&gt;int_stat);</div><div class='ctx'> </div><div class='ctx'> 			if (vid_status)</div><div class='del'>-				handled +=</div><div class='del'>-				cx25821_video_irq(dev, i, vid_status);</div><div class='add'>+				handled += cx25821_video_irq(dev, i,</div><div class='add'>+						vid_status);</div><div class='ctx'> </div><div class='ctx'> 			cx_write(PCI_INT_STAT, mask[i]);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1427,9 +1422,8 @@ static int __devinit cx25821_initdev(struct pci_dev *pci_dev,</div><div class='ctx'> 		goto fail_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err =</div><div class='del'>-	    request_irq(pci_dev-&gt;irq, cx25821_irq, IRQF_SHARED,</div><div class='del'>-			dev-&gt;name, dev);</div><div class='add'>+	err = request_irq(pci_dev-&gt;irq, cx25821_irq,</div><div class='add'>+			IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> </div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		pr_err("%s: can't get IRQ %d\n", dev-&gt;name, pci_dev-&gt;irq);</div><div class='hunk'>@@ -1512,6 +1506,5 @@ static void __exit cx25821_fini(void)</div><div class='ctx'> 	pci_unregister_driver(&amp;cx25821_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> module_init(cx25821_init);</div><div class='ctx'> module_exit(cx25821_fini);</div><div class='head'>diff --git a/drivers/media/video/cx25821/cx25821-i2c.c b/drivers/media/video/cx25821/cx25821-i2c.c<br/>index 4d3d0ce40785..12d7300fa1e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx25821/cx25821-i2c.c</a></div><div class='hunk'>@@ -252,8 +252,8 @@ static int i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num)</div><div class='ctx'> 		} else if (i + 1 &lt; num &amp;&amp; (msgs[i + 1].flags &amp; I2C_M_RD) &amp;&amp;</div><div class='ctx'> 			   msgs[i].addr == msgs[i + 1].addr) {</div><div class='ctx'> 			/* write then read from same address */</div><div class='del'>-			retval =</div><div class='del'>-			    i2c_sendbytes(i2c_adap, &amp;msgs[i], msgs[i + 1].len);</div><div class='add'>+			retval = i2c_sendbytes(i2c_adap, &amp;msgs[i],</div><div class='add'>+					msgs[i + 1].len);</div><div class='ctx'> </div><div class='ctx'> 			if (retval &lt; 0)</div><div class='ctx'> 				goto err;</div><div class='hunk'>@@ -276,10 +276,8 @@ err:</div><div class='ctx'> </div><div class='ctx'> static u32 cx25821_functionality(struct i2c_adapter *adap)</div><div class='ctx'> {</div><div class='del'>-	return I2C_FUNC_SMBUS_EMUL |</div><div class='del'>-	    I2C_FUNC_I2C |</div><div class='del'>-	    I2C_FUNC_SMBUS_WORD_DATA |</div><div class='del'>-	    I2C_FUNC_SMBUS_READ_WORD_DATA | I2C_FUNC_SMBUS_WRITE_WORD_DATA;</div><div class='add'>+	return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C | I2C_FUNC_SMBUS_WORD_DATA |</div><div class='add'>+		I2C_FUNC_SMBUS_READ_WORD_DATA | I2C_FUNC_SMBUS_WRITE_WORD_DATA;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct i2c_algorithm cx25821_i2c_algo_template = {</div><div class='hunk'>@@ -300,7 +298,7 @@ static struct i2c_client cx25821_i2c_client_template = {</div><div class='ctx'> 	.name = "cx25821 internal",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* init + register i2c algo-bit adapter */</div><div class='add'>+/* init + register i2c adapter */</div><div class='ctx'> int cx25821_i2c_register(struct cx25821_i2c *bus)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx25821_dev *dev = bus-&gt;dev;</div><div class='head'>diff --git a/drivers/media/video/cx25821/cx25821-medusa-defines.h b/drivers/media/video/cx25821/cx25821-medusa-defines.h<br/>index 60d197f57556..7a9e6470ba22 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-medusa-defines.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-medusa-defines.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-medusa-defines.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx25821/cx25821-medusa-defines.h</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #ifndef _MEDUSA_DEF_H_</div><div class='ctx'> #define _MEDUSA_DEF_H_</div><div class='ctx'> </div><div class='del'>-/* Video deocder that we supported */</div><div class='add'>+/* Video decoder that we supported */</div><div class='ctx'> #define VDEC_A		0</div><div class='ctx'> #define VDEC_B		1</div><div class='ctx'> #define VDEC_C		2</div><div class='hunk'>@@ -34,9 +34,9 @@</div><div class='ctx'> #define VDEC_H		7</div><div class='ctx'> </div><div class='ctx'> /* end of display sequence */</div><div class='del'>-#define END_OF_SEQ					0xF;</div><div class='add'>+#define END_OF_SEQ	0xF;</div><div class='ctx'> </div><div class='ctx'> /* registry string size */</div><div class='del'>-#define MAX_REGISTRY_SZ					40;</div><div class='add'>+#define MAX_REGISTRY_SZ	40;</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/video/cx25821/cx25821-medusa-reg.h b/drivers/media/video/cx25821/cx25821-medusa-reg.h<br/>index 1c1c228352d1..c98ac946b277 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-medusa-reg.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-medusa-reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-medusa-reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx25821/cx25821-medusa-reg.h</a></div><div class='hunk'>@@ -28,22 +28,22 @@</div><div class='ctx'> #define	HOST_REGISTER2				0x0001</div><div class='ctx'> </div><div class='ctx'> /* Chip Configuration Registers */</div><div class='del'>-#define	CHIP_CTRL					0x0100</div><div class='del'>-#define	AFE_AB_CTRL					0x0104</div><div class='del'>-#define	AFE_CD_CTRL					0x0108</div><div class='del'>-#define	AFE_EF_CTRL					0x010C</div><div class='del'>-#define	AFE_GH_CTRL					0x0110</div><div class='add'>+#define	CHIP_CTRL				0x0100</div><div class='add'>+#define	AFE_AB_CTRL				0x0104</div><div class='add'>+#define	AFE_CD_CTRL				0x0108</div><div class='add'>+#define	AFE_EF_CTRL				0x010C</div><div class='add'>+#define	AFE_GH_CTRL				0x0110</div><div class='ctx'> #define	DENC_AB_CTRL				0x0114</div><div class='del'>-#define	BYP_AB_CTRL					0x0118</div><div class='del'>-#define	MON_A_CTRL					0x011C</div><div class='del'>-#define	DISP_SEQ_A					0x0120</div><div class='del'>-#define	DISP_SEQ_B					0x0124</div><div class='del'>-#define	DISP_AB_CNT					0x0128</div><div class='del'>-#define	DISP_CD_CNT					0x012C</div><div class='del'>-#define	DISP_EF_CNT					0x0130</div><div class='del'>-#define	DISP_GH_CNT					0x0134</div><div class='del'>-#define	DISP_IJ_CNT					0x0138</div><div class='del'>-#define	PIN_OE_CTRL					0x013C</div><div class='add'>+#define	BYP_AB_CTRL				0x0118</div><div class='add'>+#define	MON_A_CTRL				0x011C</div><div class='add'>+#define	DISP_SEQ_A				0x0120</div><div class='add'>+#define	DISP_SEQ_B				0x0124</div><div class='add'>+#define	DISP_AB_CNT				0x0128</div><div class='add'>+#define	DISP_CD_CNT				0x012C</div><div class='add'>+#define	DISP_EF_CNT				0x0130</div><div class='add'>+#define	DISP_GH_CNT				0x0134</div><div class='add'>+#define	DISP_IJ_CNT				0x0138</div><div class='add'>+#define	PIN_OE_CTRL				0x013C</div><div class='ctx'> #define	PIN_SPD_CTRL				0x0140</div><div class='ctx'> #define	PIN_SPD_CTRL2				0x0144</div><div class='ctx'> #define	IRQ_STAT_CTRL				0x0148</div><div class='hunk'>@@ -51,8 +51,8 @@</div><div class='ctx'> #define	POWER_CTRL_CD				0x0150</div><div class='ctx'> #define	POWER_CTRL_EF				0x0154</div><div class='ctx'> #define	POWER_CTRL_GH				0x0158</div><div class='del'>-#define	TUNE_CTRL					0x015C</div><div class='del'>-#define	BIAS_CTRL					0x0160</div><div class='add'>+#define	TUNE_CTRL				0x015C</div><div class='add'>+#define	BIAS_CTRL				0x0160</div><div class='ctx'> #define	AFE_AB_DIAG_CTRL			0x0164</div><div class='ctx'> #define	AFE_CD_DIAG_CTRL			0x0168</div><div class='ctx'> #define	AFE_EF_DIAG_CTRL			0x016C</div><div class='hunk'>@@ -61,17 +61,17 @@</div><div class='ctx'> #define	PLL_CD_DIAG_CTRL			0x0178</div><div class='ctx'> #define	PLL_EF_DIAG_CTRL			0x017C</div><div class='ctx'> #define	PLL_GH_DIAG_CTRL			0x0180</div><div class='del'>-#define	TEST_CTRL					0x0184</div><div class='del'>-#define	BIST_STAT					0x0188</div><div class='del'>-#define	BIST_STAT2					0x018C</div><div class='del'>-#define	BIST_VID_PLL_AB_STAT		0x0190</div><div class='del'>-#define	BIST_VID_PLL_CD_STAT		0x0194</div><div class='del'>-#define	BIST_VID_PLL_EF_STAT		0x0198</div><div class='del'>-#define	BIST_VID_PLL_GH_STAT		0x019C</div><div class='add'>+#define	TEST_CTRL				0x0184</div><div class='add'>+#define	BIST_STAT				0x0188</div><div class='add'>+#define	BIST_STAT2				0x018C</div><div class='add'>+#define	BIST_VID_PLL_AB_STAT			0x0190</div><div class='add'>+#define	BIST_VID_PLL_CD_STAT			0x0194</div><div class='add'>+#define	BIST_VID_PLL_EF_STAT			0x0198</div><div class='add'>+#define	BIST_VID_PLL_GH_STAT			0x019C</div><div class='ctx'> #define	DLL_DIAG_CTRL				0x01A0</div><div class='ctx'> #define	DEV_CH_ID_CTRL				0x01A4</div><div class='ctx'> #define	ABIST_CTRL_STATUS			0x01A8</div><div class='del'>-#define	ABIST_FREQ					0x01AC</div><div class='add'>+#define	ABIST_FREQ				0x01AC</div><div class='ctx'> #define	ABIST_GOERT_SHIFT			0x01B0</div><div class='ctx'> #define	ABIST_COEF12				0x01B4</div><div class='ctx'> #define	ABIST_COEF34				0x01B8</div><div class='hunk'>@@ -92,357 +92,357 @@</div><div class='ctx'> #define	ABIST_CLAMP_E				0x01F4</div><div class='ctx'> #define	ABIST_CLAMP_F				0x01F8</div><div class='ctx'> </div><div class='del'>-/*              Digital Video Encoder A Registers */</div><div class='del'>-#define	DENC_A_REG_1					0x0200</div><div class='del'>-#define	DENC_A_REG_2					0x0204</div><div class='del'>-#define	DENC_A_REG_3					0x0208</div><div class='del'>-#define	DENC_A_REG_4					0x020C</div><div class='del'>-#define	DENC_A_REG_5					0x0210</div><div class='del'>-#define	DENC_A_REG_6					0x0214</div><div class='del'>-#define	DENC_A_REG_7					0x0218</div><div class='del'>-#define	DENC_A_REG_8					0x021C</div><div class='add'>+/* Digital Video Encoder A Registers */</div><div class='add'>+#define	DENC_A_REG_1				0x0200</div><div class='add'>+#define	DENC_A_REG_2				0x0204</div><div class='add'>+#define	DENC_A_REG_3				0x0208</div><div class='add'>+#define	DENC_A_REG_4				0x020C</div><div class='add'>+#define	DENC_A_REG_5				0x0210</div><div class='add'>+#define	DENC_A_REG_6				0x0214</div><div class='add'>+#define	DENC_A_REG_7				0x0218</div><div class='add'>+#define	DENC_A_REG_8				0x021C</div><div class='ctx'> </div><div class='del'>-/*      Digital Video Encoder B Registers */</div><div class='del'>-#define	DENC_B_REG_1					0x0300</div><div class='del'>-#define	DENC_B_REG_2					0x0304</div><div class='del'>-#define	DENC_B_REG_3					0x0308</div><div class='del'>-#define	DENC_B_REG_4					0x030C</div><div class='del'>-#define	DENC_B_REG_5					0x0310</div><div class='del'>-#define	DENC_B_REG_6					0x0314</div><div class='del'>-#define	DENC_B_REG_7					0x0318</div><div class='del'>-#define	DENC_B_REG_8					0x031C</div><div class='add'>+/* Digital Video Encoder B Registers */</div><div class='add'>+#define	DENC_B_REG_1				0x0300</div><div class='add'>+#define	DENC_B_REG_2				0x0304</div><div class='add'>+#define	DENC_B_REG_3				0x0308</div><div class='add'>+#define	DENC_B_REG_4				0x030C</div><div class='add'>+#define	DENC_B_REG_5				0x0310</div><div class='add'>+#define	DENC_B_REG_6				0x0314</div><div class='add'>+#define	DENC_B_REG_7				0x0318</div><div class='add'>+#define	DENC_B_REG_8				0x031C</div><div class='ctx'> </div><div class='del'>-/*              Video Decoder A Registers */</div><div class='del'>-#define	MODE_CTRL						0x1000</div><div class='del'>-#define	OUT_CTRL1						0x1004</div><div class='del'>-#define	OUT_CTRL_NS						0x1008</div><div class='del'>-#define	GEN_STAT						0x100C</div><div class='del'>-#define	INT_STAT_MASK					0x1010</div><div class='del'>-#define	LUMA_CTRL						0x1014</div><div class='del'>-#define	CHROMA_CTRL						0x1018</div><div class='del'>-#define	CRUSH_CTRL						0x101C</div><div class='del'>-#define	HORIZ_TIM_CTRL					0x1020</div><div class='del'>-#define	VERT_TIM_CTRL					0x1024</div><div class='del'>-#define	MISC_TIM_CTRL					0x1028</div><div class='del'>-#define	FIELD_COUNT						0x102C</div><div class='del'>-#define	HSCALE_CTRL						0x1030</div><div class='del'>-#define	VSCALE_CTRL						0x1034</div><div class='del'>-#define	MAN_VGA_CTRL					0x1038</div><div class='del'>-#define	MAN_AGC_CTRL					0x103C</div><div class='del'>-#define	DFE_CTRL1						0x1040</div><div class='del'>-#define	DFE_CTRL2						0x1044</div><div class='del'>-#define	DFE_CTRL3						0x1048</div><div class='del'>-#define	PLL_CTRL						0x104C</div><div class='del'>-#define	PLL_CTRL_FAST					0x1050</div><div class='del'>-#define	HTL_CTRL						0x1054</div><div class='del'>-#define	SRC_CFG							0x1058</div><div class='del'>-#define	SC_STEP_SIZE					0x105C</div><div class='del'>-#define	SC_CONVERGE_CTRL				0x1060</div><div class='del'>-#define	SC_LOOP_CTRL					0x1064</div><div class='del'>-#define	COMB_2D_HFS_CFG					0x1068</div><div class='del'>-#define	COMB_2D_HFD_CFG					0x106C</div><div class='del'>-#define	COMB_2D_LF_CFG					0x1070</div><div class='del'>-#define	COMB_2D_BLEND					0x1074</div><div class='del'>-#define	COMB_MISC_CTRL					0x1078</div><div class='add'>+/* Video Decoder A Registers */</div><div class='add'>+#define	MODE_CTRL				0x1000</div><div class='add'>+#define	OUT_CTRL1				0x1004</div><div class='add'>+#define	OUT_CTRL_NS				0x1008</div><div class='add'>+#define	GEN_STAT				0x100C</div><div class='add'>+#define	INT_STAT_MASK				0x1010</div><div class='add'>+#define	LUMA_CTRL				0x1014</div><div class='add'>+#define	CHROMA_CTRL				0x1018</div><div class='add'>+#define	CRUSH_CTRL				0x101C</div><div class='add'>+#define	HORIZ_TIM_CTRL				0x1020</div><div class='add'>+#define	VERT_TIM_CTRL				0x1024</div><div class='add'>+#define	MISC_TIM_CTRL				0x1028</div><div class='add'>+#define	FIELD_COUNT				0x102C</div><div class='add'>+#define	HSCALE_CTRL				0x1030</div><div class='add'>+#define	VSCALE_CTRL				0x1034</div><div class='add'>+#define	MAN_VGA_CTRL				0x1038</div><div class='add'>+#define	MAN_AGC_CTRL				0x103C</div><div class='add'>+#define	DFE_CTRL1				0x1040</div><div class='add'>+#define	DFE_CTRL2				0x1044</div><div class='add'>+#define	DFE_CTRL3				0x1048</div><div class='add'>+#define	PLL_CTRL				0x104C</div><div class='add'>+#define	PLL_CTRL_FAST				0x1050</div><div class='add'>+#define	HTL_CTRL				0x1054</div><div class='add'>+#define	SRC_CFG					0x1058</div><div class='add'>+#define	SC_STEP_SIZE				0x105C</div><div class='add'>+#define	SC_CONVERGE_CTRL			0x1060</div><div class='add'>+#define	SC_LOOP_CTRL				0x1064</div><div class='add'>+#define	COMB_2D_HFS_CFG				0x1068</div><div class='add'>+#define	COMB_2D_HFD_CFG				0x106C</div><div class='add'>+#define	COMB_2D_LF_CFG				0x1070</div><div class='add'>+#define	COMB_2D_BLEND				0x1074</div><div class='add'>+#define	COMB_MISC_CTRL				0x1078</div><div class='ctx'> #define	COMB_FLAT_THRESH_CTRL			0x107C</div><div class='del'>-#define	COMB_TEST						0x1080</div><div class='del'>-#define	BP_MISC_CTRL					0x1084</div><div class='del'>-#define	VCR_DET_CTRL					0x1088</div><div class='del'>-#define	NOISE_DET_CTRL					0x108C</div><div class='add'>+#define	COMB_TEST				0x1080</div><div class='add'>+#define	BP_MISC_CTRL				0x1084</div><div class='add'>+#define	VCR_DET_CTRL				0x1088</div><div class='add'>+#define	NOISE_DET_CTRL				0x108C</div><div class='ctx'> #define	COMB_FLAT_NOISE_CTRL			0x1090</div><div class='del'>-#define	VERSION							0x11F8</div><div class='del'>-#define	SOFT_RST_CTRL					0x11FC</div><div class='add'>+#define	VERSION					0x11F8</div><div class='add'>+#define	SOFT_RST_CTRL				0x11FC</div><div class='ctx'> </div><div class='del'>-/*      Video Decoder B Registers */</div><div class='del'>-#define	VDEC_B_MODE_CTRL				0x1200</div><div class='del'>-#define	VDEC_B_OUT_CTRL1				0x1204</div><div class='del'>-#define	VDEC_B_OUT_CTRL_NS				0x1208</div><div class='del'>-#define	VDEC_B_GEN_STAT					0x120C</div><div class='add'>+/* Video Decoder B Registers */</div><div class='add'>+#define	VDEC_B_MODE_CTRL			0x1200</div><div class='add'>+#define	VDEC_B_OUT_CTRL1			0x1204</div><div class='add'>+#define	VDEC_B_OUT_CTRL_NS			0x1208</div><div class='add'>+#define	VDEC_B_GEN_STAT				0x120C</div><div class='ctx'> #define	VDEC_B_INT_STAT_MASK			0x1210</div><div class='del'>-#define	VDEC_B_LUMA_CTRL				0x1214</div><div class='del'>-#define	VDEC_B_CHROMA_CTRL				0x1218</div><div class='del'>-#define	VDEC_B_CRUSH_CTRL				0x121C</div><div class='add'>+#define	VDEC_B_LUMA_CTRL			0x1214</div><div class='add'>+#define	VDEC_B_CHROMA_CTRL			0x1218</div><div class='add'>+#define	VDEC_B_CRUSH_CTRL			0x121C</div><div class='ctx'> #define	VDEC_B_HORIZ_TIM_CTRL			0x1220</div><div class='ctx'> #define	VDEC_B_VERT_TIM_CTRL			0x1224</div><div class='ctx'> #define	VDEC_B_MISC_TIM_CTRL			0x1228</div><div class='del'>-#define	VDEC_B_FIELD_COUNT				0x122C</div><div class='del'>-#define	VDEC_B_HSCALE_CTRL				0x1230</div><div class='del'>-#define	VDEC_B_VSCALE_CTRL				0x1234</div><div class='del'>-#define	VDEC_B_MAN_VGA_CTRL				0x1238</div><div class='del'>-#define	VDEC_B_MAN_AGC_CTRL				0x123C</div><div class='del'>-#define	VDEC_B_DFE_CTRL1				0x1240</div><div class='del'>-#define	VDEC_B_DFE_CTRL2				0x1244</div><div class='del'>-#define	VDEC_B_DFE_CTRL3				0x1248</div><div class='del'>-#define	VDEC_B_PLL_CTRL					0x124C</div><div class='add'>+#define	VDEC_B_FIELD_COUNT			0x122C</div><div class='add'>+#define	VDEC_B_HSCALE_CTRL			0x1230</div><div class='add'>+#define	VDEC_B_VSCALE_CTRL			0x1234</div><div class='add'>+#define	VDEC_B_MAN_VGA_CTRL			0x1238</div><div class='add'>+#define	VDEC_B_MAN_AGC_CTRL			0x123C</div><div class='add'>+#define	VDEC_B_DFE_CTRL1			0x1240</div><div class='add'>+#define	VDEC_B_DFE_CTRL2			0x1244</div><div class='add'>+#define	VDEC_B_DFE_CTRL3			0x1248</div><div class='add'>+#define	VDEC_B_PLL_CTRL				0x124C</div><div class='ctx'> #define	VDEC_B_PLL_CTRL_FAST			0x1250</div><div class='del'>-#define	VDEC_B_HTL_CTRL					0x1254</div><div class='del'>-#define	VDEC_B_SRC_CFG					0x1258</div><div class='del'>-#define	VDEC_B_SC_STEP_SIZE				0x125C</div><div class='add'>+#define	VDEC_B_HTL_CTRL				0x1254</div><div class='add'>+#define	VDEC_B_SRC_CFG				0x1258</div><div class='add'>+#define	VDEC_B_SC_STEP_SIZE			0x125C</div><div class='ctx'> #define	VDEC_B_SC_CONVERGE_CTRL			0x1260</div><div class='del'>-#define	VDEC_B_SC_LOOP_CTRL				0x1264</div><div class='add'>+#define	VDEC_B_SC_LOOP_CTRL			0x1264</div><div class='ctx'> #define	VDEC_B_COMB_2D_HFS_CFG			0x1268</div><div class='ctx'> #define	VDEC_B_COMB_2D_HFD_CFG			0x126C</div><div class='ctx'> #define	VDEC_B_COMB_2D_LF_CFG			0x1270</div><div class='ctx'> #define	VDEC_B_COMB_2D_BLEND			0x1274</div><div class='ctx'> #define	VDEC_B_COMB_MISC_CTRL			0x1278</div><div class='del'>-#define	VDEC_B_COMB_FLAT_THRESH_CTRL	0x127C</div><div class='del'>-#define	VDEC_B_COMB_TEST				0x1280</div><div class='del'>-#define	VDEC_B_BP_MISC_CTRL				0x1284</div><div class='del'>-#define	VDEC_B_VCR_DET_CTRL				0x1288</div><div class='add'>+#define	VDEC_B_COMB_FLAT_THRESH_CTRL		0x127C</div><div class='add'>+#define	VDEC_B_COMB_TEST			0x1280</div><div class='add'>+#define	VDEC_B_BP_MISC_CTRL			0x1284</div><div class='add'>+#define	VDEC_B_VCR_DET_CTRL			0x1288</div><div class='ctx'> #define	VDEC_B_NOISE_DET_CTRL			0x128C</div><div class='ctx'> #define	VDEC_B_COMB_FLAT_NOISE_CTRL		0x1290</div><div class='del'>-#define	VDEC_B_VERSION					0x13F8</div><div class='add'>+#define	VDEC_B_VERSION				0x13F8</div><div class='ctx'> #define	VDEC_B_SOFT_RST_CTRL			0x13FC</div><div class='ctx'> </div><div class='ctx'> /* Video Decoder C Registers */</div><div class='del'>-#define	VDEC_C_MODE_CTRL				0x1400</div><div class='del'>-#define	VDEC_C_OUT_CTRL1				0x1404</div><div class='del'>-#define	VDEC_C_OUT_CTRL_NS				0x1408</div><div class='del'>-#define	VDEC_C_GEN_STAT					0x140C</div><div class='add'>+#define	VDEC_C_MODE_CTRL			0x1400</div><div class='add'>+#define	VDEC_C_OUT_CTRL1			0x1404</div><div class='add'>+#define	VDEC_C_OUT_CTRL_NS			0x1408</div><div class='add'>+#define	VDEC_C_GEN_STAT				0x140C</div><div class='ctx'> #define	VDEC_C_INT_STAT_MASK			0x1410</div><div class='del'>-#define VDEC_C_LUMA_CTRL				0x1414</div><div class='del'>-#define VDEC_C_CHROMA_CTRL				0x1418</div><div class='del'>-#define	VDEC_C_CRUSH_CTRL				0x141C</div><div class='add'>+#define VDEC_C_LUMA_CTRL			0x1414</div><div class='add'>+#define VDEC_C_CHROMA_CTRL			0x1418</div><div class='add'>+#define	VDEC_C_CRUSH_CTRL			0x141C</div><div class='ctx'> #define	VDEC_C_HORIZ_TIM_CTRL			0x1420</div><div class='ctx'> #define	VDEC_C_VERT_TIM_CTRL			0x1424</div><div class='ctx'> #define	VDEC_C_MISC_TIM_CTRL			0x1428</div><div class='del'>-#define	VDEC_C_FIELD_COUNT				0x142C</div><div class='del'>-#define	VDEC_C_HSCALE_CTRL				0x1430</div><div class='del'>-#define	VDEC_C_VSCALE_CTRL				0x1434</div><div class='del'>-#define	VDEC_C_MAN_VGA_CTRL				0x1438</div><div class='del'>-#define	VDEC_C_MAN_AGC_CTRL				0x143C</div><div class='del'>-#define	VDEC_C_DFE_CTRL1				0x1440</div><div class='del'>-#define	VDEC_C_DFE_CTRL2				0x1444</div><div class='del'>-#define	VDEC_C_DFE_CTRL3				0x1448</div><div class='del'>-#define	VDEC_C_PLL_CTRL					0x144C</div><div class='add'>+#define	VDEC_C_FIELD_COUNT			0x142C</div><div class='add'>+#define	VDEC_C_HSCALE_CTRL			0x1430</div><div class='add'>+#define	VDEC_C_VSCALE_CTRL			0x1434</div><div class='add'>+#define	VDEC_C_MAN_VGA_CTRL			0x1438</div><div class='add'>+#define	VDEC_C_MAN_AGC_CTRL			0x143C</div><div class='add'>+#define	VDEC_C_DFE_CTRL1			0x1440</div><div class='add'>+#define	VDEC_C_DFE_CTRL2			0x1444</div><div class='add'>+#define	VDEC_C_DFE_CTRL3			0x1448</div><div class='add'>+#define	VDEC_C_PLL_CTRL				0x144C</div><div class='ctx'> #define	VDEC_C_PLL_CTRL_FAST			0x1450</div><div class='del'>-#define	VDEC_C_HTL_CTRL					0x1454</div><div class='del'>-#define	VDEC_C_SRC_CFG					0x1458</div><div class='del'>-#define	VDEC_C_SC_STEP_SIZE				0x145C</div><div class='add'>+#define	VDEC_C_HTL_CTRL				0x1454</div><div class='add'>+#define	VDEC_C_SRC_CFG				0x1458</div><div class='add'>+#define	VDEC_C_SC_STEP_SIZE			0x145C</div><div class='ctx'> #define	VDEC_C_SC_CONVERGE_CTRL			0x1460</div><div class='del'>-#define	VDEC_C_SC_LOOP_CTRL				0x1464</div><div class='add'>+#define	VDEC_C_SC_LOOP_CTRL			0x1464</div><div class='ctx'> #define	VDEC_C_COMB_2D_HFS_CFG			0x1468</div><div class='ctx'> #define	VDEC_C_COMB_2D_HFD_CFG			0x146C</div><div class='ctx'> #define	VDEC_C_COMB_2D_LF_CFG			0x1470</div><div class='ctx'> #define	VDEC_C_COMB_2D_BLEND			0x1474</div><div class='ctx'> #define	VDEC_C_COMB_MISC_CTRL			0x1478</div><div class='del'>-#define	VDEC_C_COMB_FLAT_THRESH_CTRL	0x147C</div><div class='del'>-#define	VDEC_C_COMB_TEST				0x1480</div><div class='del'>-#define	VDEC_C_BP_MISC_CTRL				0x1484</div><div class='del'>-#define	VDEC_C_VCR_DET_CTRL				0x1488</div><div class='add'>+#define	VDEC_C_COMB_FLAT_THRESH_CTRL		0x147C</div><div class='add'>+#define	VDEC_C_COMB_TEST			0x1480</div><div class='add'>+#define	VDEC_C_BP_MISC_CTRL			0x1484</div><div class='add'>+#define	VDEC_C_VCR_DET_CTRL			0x1488</div><div class='ctx'> #define	VDEC_C_NOISE_DET_CTRL			0x148C</div><div class='ctx'> #define	VDEC_C_COMB_FLAT_NOISE_CTRL		0x1490</div><div class='del'>-#define	VDEC_C_VERSION					0x15F8</div><div class='add'>+#define	VDEC_C_VERSION				0x15F8</div><div class='ctx'> #define	VDEC_C_SOFT_RST_CTRL			0x15FC</div><div class='ctx'> </div><div class='ctx'> /* Video Decoder D Registers */</div><div class='del'>-#define VDEC_D_MODE_CTRL				0x1600</div><div class='del'>-#define VDEC_D_OUT_CTRL1				0x1604</div><div class='del'>-#define VDEC_D_OUT_CTRL_NS				0x1608</div><div class='del'>-#define VDEC_D_GEN_STAT					0x160C</div><div class='add'>+#define VDEC_D_MODE_CTRL			0x1600</div><div class='add'>+#define VDEC_D_OUT_CTRL1			0x1604</div><div class='add'>+#define VDEC_D_OUT_CTRL_NS			0x1608</div><div class='add'>+#define VDEC_D_GEN_STAT				0x160C</div><div class='ctx'> #define VDEC_D_INT_STAT_MASK			0x1610</div><div class='del'>-#define VDEC_D_LUMA_CTRL				0x1614</div><div class='del'>-#define VDEC_D_CHROMA_CTRL				0x1618</div><div class='del'>-#define VDEC_D_CRUSH_CTRL				0x161C</div><div class='add'>+#define VDEC_D_LUMA_CTRL			0x1614</div><div class='add'>+#define VDEC_D_CHROMA_CTRL			0x1618</div><div class='add'>+#define VDEC_D_CRUSH_CTRL			0x161C</div><div class='ctx'> #define VDEC_D_HORIZ_TIM_CTRL			0x1620</div><div class='ctx'> #define VDEC_D_VERT_TIM_CTRL			0x1624</div><div class='ctx'> #define VDEC_D_MISC_TIM_CTRL			0x1628</div><div class='del'>-#define VDEC_D_FIELD_COUNT				0x162C</div><div class='del'>-#define VDEC_D_HSCALE_CTRL				0x1630</div><div class='del'>-#define VDEC_D_VSCALE_CTRL				0x1634</div><div class='del'>-#define VDEC_D_MAN_VGA_CTRL				0x1638</div><div class='del'>-#define VDEC_D_MAN_AGC_CTRL				0x163C</div><div class='del'>-#define VDEC_D_DFE_CTRL1				0x1640</div><div class='del'>-#define VDEC_D_DFE_CTRL2				0x1644</div><div class='del'>-#define VDEC_D_DFE_CTRL3				0x1648</div><div class='del'>-#define VDEC_D_PLL_CTRL					0x164C</div><div class='add'>+#define VDEC_D_FIELD_COUNT			0x162C</div><div class='add'>+#define VDEC_D_HSCALE_CTRL			0x1630</div><div class='add'>+#define VDEC_D_VSCALE_CTRL			0x1634</div><div class='add'>+#define VDEC_D_MAN_VGA_CTRL			0x1638</div><div class='add'>+#define VDEC_D_MAN_AGC_CTRL			0x163C</div><div class='add'>+#define VDEC_D_DFE_CTRL1			0x1640</div><div class='add'>+#define VDEC_D_DFE_CTRL2			0x1644</div><div class='add'>+#define VDEC_D_DFE_CTRL3			0x1648</div><div class='add'>+#define VDEC_D_PLL_CTRL				0x164C</div><div class='ctx'> #define VDEC_D_PLL_CTRL_FAST			0x1650</div><div class='del'>-#define VDEC_D_HTL_CTRL					0x1654</div><div class='del'>-#define VDEC_D_SRC_CFG					0x1658</div><div class='del'>-#define VDEC_D_SC_STEP_SIZE				0x165C</div><div class='add'>+#define VDEC_D_HTL_CTRL				0x1654</div><div class='add'>+#define VDEC_D_SRC_CFG				0x1658</div><div class='add'>+#define VDEC_D_SC_STEP_SIZE			0x165C</div><div class='ctx'> #define VDEC_D_SC_CONVERGE_CTRL			0x1660</div><div class='del'>-#define VDEC_D_SC_LOOP_CTRL				0x1664</div><div class='add'>+#define VDEC_D_SC_LOOP_CTRL			0x1664</div><div class='ctx'> #define VDEC_D_COMB_2D_HFS_CFG			0x1668</div><div class='ctx'> #define VDEC_D_COMB_2D_HFD_CFG			0x166C</div><div class='ctx'> #define VDEC_D_COMB_2D_LF_CFG			0x1670</div><div class='ctx'> #define VDEC_D_COMB_2D_BLEND			0x1674</div><div class='ctx'> #define VDEC_D_COMB_MISC_CTRL			0x1678</div><div class='del'>-#define VDEC_D_COMB_FLAT_THRESH_CTRL	0x167C</div><div class='del'>-#define VDEC_D_COMB_TEST				0x1680</div><div class='del'>-#define VDEC_D_BP_MISC_CTRL				0x1684</div><div class='del'>-#define VDEC_D_VCR_DET_CTRL				0x1688</div><div class='add'>+#define VDEC_D_COMB_FLAT_THRESH_CTRL		0x167C</div><div class='add'>+#define VDEC_D_COMB_TEST			0x1680</div><div class='add'>+#define VDEC_D_BP_MISC_CTRL			0x1684</div><div class='add'>+#define VDEC_D_VCR_DET_CTRL			0x1688</div><div class='ctx'> #define VDEC_D_NOISE_DET_CTRL			0x168C</div><div class='ctx'> #define VDEC_D_COMB_FLAT_NOISE_CTRL		0x1690</div><div class='del'>-#define VDEC_D_VERSION					0x17F8</div><div class='add'>+#define VDEC_D_VERSION				0x17F8</div><div class='ctx'> #define VDEC_D_SOFT_RST_CTRL			0x17FC</div><div class='ctx'> </div><div class='ctx'> /* Video Decoder E Registers */</div><div class='del'>-#define	VDEC_E_MODE_CTRL				0x1800</div><div class='del'>-#define	VDEC_E_OUT_CTRL1				0x1804</div><div class='del'>-#define	VDEC_E_OUT_CTRL_NS				0x1808</div><div class='del'>-#define	VDEC_E_GEN_STAT					0x180C</div><div class='add'>+#define	VDEC_E_MODE_CTRL			0x1800</div><div class='add'>+#define	VDEC_E_OUT_CTRL1			0x1804</div><div class='add'>+#define	VDEC_E_OUT_CTRL_NS			0x1808</div><div class='add'>+#define	VDEC_E_GEN_STAT				0x180C</div><div class='ctx'> #define	VDEC_E_INT_STAT_MASK			0x1810</div><div class='del'>-#define	VDEC_E_LUMA_CTRL				0x1814</div><div class='del'>-#define	VDEC_E_CHROMA_CTRL				0x1818</div><div class='del'>-#define	VDEC_E_CRUSH_CTRL				0x181C</div><div class='add'>+#define	VDEC_E_LUMA_CTRL			0x1814</div><div class='add'>+#define	VDEC_E_CHROMA_CTRL			0x1818</div><div class='add'>+#define	VDEC_E_CRUSH_CTRL			0x181C</div><div class='ctx'> #define	VDEC_E_HORIZ_TIM_CTRL			0x1820</div><div class='ctx'> #define	VDEC_E_VERT_TIM_CTRL			0x1824</div><div class='ctx'> #define	VDEC_E_MISC_TIM_CTRL			0x1828</div><div class='del'>-#define	VDEC_E_FIELD_COUNT				0x182C</div><div class='del'>-#define	VDEC_E_HSCALE_CTRL				0x1830</div><div class='del'>-#define	VDEC_E_VSCALE_CTRL				0x1834</div><div class='del'>-#define	VDEC_E_MAN_VGA_CTRL				0x1838</div><div class='del'>-#define	VDEC_E_MAN_AGC_CTRL				0x183C</div><div class='del'>-#define	VDEC_E_DFE_CTRL1				0x1840</div><div class='del'>-#define	VDEC_E_DFE_CTRL2				0x1844</div><div class='del'>-#define	VDEC_E_DFE_CTRL3				0x1848</div><div class='del'>-#define	VDEC_E_PLL_CTRL					0x184C</div><div class='add'>+#define	VDEC_E_FIELD_COUNT			0x182C</div><div class='add'>+#define	VDEC_E_HSCALE_CTRL			0x1830</div><div class='add'>+#define	VDEC_E_VSCALE_CTRL			0x1834</div><div class='add'>+#define	VDEC_E_MAN_VGA_CTRL			0x1838</div><div class='add'>+#define	VDEC_E_MAN_AGC_CTRL			0x183C</div><div class='add'>+#define	VDEC_E_DFE_CTRL1			0x1840</div><div class='add'>+#define	VDEC_E_DFE_CTRL2			0x1844</div><div class='add'>+#define	VDEC_E_DFE_CTRL3			0x1848</div><div class='add'>+#define	VDEC_E_PLL_CTRL				0x184C</div><div class='ctx'> #define	VDEC_E_PLL_CTRL_FAST			0x1850</div><div class='del'>-#define	VDEC_E_HTL_CTRL					0x1854</div><div class='del'>-#define	VDEC_E_SRC_CFG					0x1858</div><div class='del'>-#define	VDEC_E_SC_STEP_SIZE				0x185C</div><div class='add'>+#define	VDEC_E_HTL_CTRL				0x1854</div><div class='add'>+#define	VDEC_E_SRC_CFG				0x1858</div><div class='add'>+#define	VDEC_E_SC_STEP_SIZE			0x185C</div><div class='ctx'> #define	VDEC_E_SC_CONVERGE_CTRL			0x1860</div><div class='del'>-#define	VDEC_E_SC_LOOP_CTRL				0x1864</div><div class='add'>+#define	VDEC_E_SC_LOOP_CTRL			0x1864</div><div class='ctx'> #define	VDEC_E_COMB_2D_HFS_CFG			0x1868</div><div class='ctx'> #define	VDEC_E_COMB_2D_HFD_CFG			0x186C</div><div class='ctx'> #define	VDEC_E_COMB_2D_LF_CFG			0x1870</div><div class='ctx'> #define	VDEC_E_COMB_2D_BLEND			0x1874</div><div class='ctx'> #define	VDEC_E_COMB_MISC_CTRL			0x1878</div><div class='del'>-#define	VDEC_E_COMB_FLAT_THRESH_CTRL	0x187C</div><div class='del'>-#define	VDEC_E_COMB_TEST				0x1880</div><div class='del'>-#define	VDEC_E_BP_MISC_CTRL				0x1884</div><div class='del'>-#define	VDEC_E_VCR_DET_CTRL				0x1888</div><div class='add'>+#define	VDEC_E_COMB_FLAT_THRESH_CTRL		0x187C</div><div class='add'>+#define	VDEC_E_COMB_TEST			0x1880</div><div class='add'>+#define	VDEC_E_BP_MISC_CTRL			0x1884</div><div class='add'>+#define	VDEC_E_VCR_DET_CTRL			0x1888</div><div class='ctx'> #define	VDEC_E_NOISE_DET_CTRL			0x188C</div><div class='ctx'> #define	VDEC_E_COMB_FLAT_NOISE_CTRL		0x1890</div><div class='del'>-#define	VDEC_E_VERSION					0x19F8</div><div class='add'>+#define	VDEC_E_VERSION				0x19F8</div><div class='ctx'> #define	VDEC_E_SOFT_RST_CTRL			0x19FC</div><div class='ctx'> </div><div class='ctx'> /* Video Decoder F Registers */</div><div class='del'>-#define	VDEC_F_MODE_CTRL				0x1A00</div><div class='del'>-#define	VDEC_F_OUT_CTRL1				0x1A04</div><div class='del'>-#define	VDEC_F_OUT_CTRL_NS				0x1A08</div><div class='del'>-#define	VDEC_F_GEN_STAT					0x1A0C</div><div class='add'>+#define	VDEC_F_MODE_CTRL			0x1A00</div><div class='add'>+#define	VDEC_F_OUT_CTRL1			0x1A04</div><div class='add'>+#define	VDEC_F_OUT_CTRL_NS			0x1A08</div><div class='add'>+#define	VDEC_F_GEN_STAT				0x1A0C</div><div class='ctx'> #define	VDEC_F_INT_STAT_MASK			0x1A10</div><div class='del'>-#define	VDEC_F_LUMA_CTRL				0x1A14</div><div class='del'>-#define	VDEC_F_CHROMA_CTRL				0x1A18</div><div class='del'>-#define	VDEC_F_CRUSH_CTRL				0x1A1C</div><div class='add'>+#define	VDEC_F_LUMA_CTRL			0x1A14</div><div class='add'>+#define	VDEC_F_CHROMA_CTRL			0x1A18</div><div class='add'>+#define	VDEC_F_CRUSH_CTRL			0x1A1C</div><div class='ctx'> #define	VDEC_F_HORIZ_TIM_CTRL			0x1A20</div><div class='ctx'> #define	VDEC_F_VERT_TIM_CTRL			0x1A24</div><div class='ctx'> #define	VDEC_F_MISC_TIM_CTRL			0x1A28</div><div class='del'>-#define	VDEC_F_FIELD_COUNT				0x1A2C</div><div class='del'>-#define	VDEC_F_HSCALE_CTRL				0x1A30</div><div class='del'>-#define	VDEC_F_VSCALE_CTRL				0x1A34</div><div class='del'>-#define	VDEC_F_MAN_VGA_CTRL				0x1A38</div><div class='del'>-#define	VDEC_F_MAN_AGC_CTRL				0x1A3C</div><div class='del'>-#define	VDEC_F_DFE_CTRL1				0x1A40</div><div class='del'>-#define	VDEC_F_DFE_CTRL2				0x1A44</div><div class='del'>-#define	VDEC_F_DFE_CTRL3				0x1A48</div><div class='del'>-#define	VDEC_F_PLL_CTRL					0x1A4C</div><div class='add'>+#define	VDEC_F_FIELD_COUNT			0x1A2C</div><div class='add'>+#define	VDEC_F_HSCALE_CTRL			0x1A30</div><div class='add'>+#define	VDEC_F_VSCALE_CTRL			0x1A34</div><div class='add'>+#define	VDEC_F_MAN_VGA_CTRL			0x1A38</div><div class='add'>+#define	VDEC_F_MAN_AGC_CTRL			0x1A3C</div><div class='add'>+#define	VDEC_F_DFE_CTRL1			0x1A40</div><div class='add'>+#define	VDEC_F_DFE_CTRL2			0x1A44</div><div class='add'>+#define	VDEC_F_DFE_CTRL3			0x1A48</div><div class='add'>+#define	VDEC_F_PLL_CTRL				0x1A4C</div><div class='ctx'> #define	VDEC_F_PLL_CTRL_FAST			0x1A50</div><div class='del'>-#define	VDEC_F_HTL_CTRL					0x1A54</div><div class='del'>-#define	VDEC_F_SRC_CFG					0x1A58</div><div class='del'>-#define	VDEC_F_SC_STEP_SIZE				0x1A5C</div><div class='add'>+#define	VDEC_F_HTL_CTRL				0x1A54</div><div class='add'>+#define	VDEC_F_SRC_CFG				0x1A58</div><div class='add'>+#define	VDEC_F_SC_STEP_SIZE			0x1A5C</div><div class='ctx'> #define	VDEC_F_SC_CONVERGE_CTRL			0x1A60</div><div class='del'>-#define	VDEC_F_SC_LOOP_CTRL				0x1A64</div><div class='add'>+#define	VDEC_F_SC_LOOP_CTRL			0x1A64</div><div class='ctx'> #define	VDEC_F_COMB_2D_HFS_CFG			0x1A68</div><div class='ctx'> #define	VDEC_F_COMB_2D_HFD_CFG			0x1A6C</div><div class='ctx'> #define	VDEC_F_COMB_2D_LF_CFG			0x1A70</div><div class='ctx'> #define	VDEC_F_COMB_2D_BLEND			0x1A74</div><div class='ctx'> #define	VDEC_F_COMB_MISC_CTRL			0x1A78</div><div class='del'>-#define	VDEC_F_COMB_FLAT_THRESH_CTRL	0x1A7C</div><div class='del'>-#define	VDEC_F_COMB_TEST				0x1A80</div><div class='del'>-#define	VDEC_F_BP_MISC_CTRL				0x1A84</div><div class='del'>-#define	VDEC_F_VCR_DET_CTRL				0x1A88</div><div class='add'>+#define	VDEC_F_COMB_FLAT_THRESH_CTRL		0x1A7C</div><div class='add'>+#define	VDEC_F_COMB_TEST			0x1A80</div><div class='add'>+#define	VDEC_F_BP_MISC_CTRL			0x1A84</div><div class='add'>+#define	VDEC_F_VCR_DET_CTRL			0x1A88</div><div class='ctx'> #define	VDEC_F_NOISE_DET_CTRL			0x1A8C</div><div class='ctx'> #define	VDEC_F_COMB_FLAT_NOISE_CTRL		0x1A90</div><div class='del'>-#define	VDEC_F_VERSION					0x1BF8</div><div class='add'>+#define	VDEC_F_VERSION				0x1BF8</div><div class='ctx'> #define	VDEC_F_SOFT_RST_CTRL			0x1BFC</div><div class='ctx'> </div><div class='ctx'> /* Video Decoder G Registers */</div><div class='del'>-#define	VDEC_G_MODE_CTRL				0x1C00</div><div class='del'>-#define	VDEC_G_OUT_CTRL1				0x1C04</div><div class='del'>-#define	VDEC_G_OUT_CTRL_NS				0x1C08</div><div class='del'>-#define	VDEC_G_GEN_STAT					0x1C0C</div><div class='add'>+#define	VDEC_G_MODE_CTRL			0x1C00</div><div class='add'>+#define	VDEC_G_OUT_CTRL1			0x1C04</div><div class='add'>+#define	VDEC_G_OUT_CTRL_NS			0x1C08</div><div class='add'>+#define	VDEC_G_GEN_STAT				0x1C0C</div><div class='ctx'> #define	VDEC_G_INT_STAT_MASK			0x1C10</div><div class='del'>-#define	VDEC_G_LUMA_CTRL				0x1C14</div><div class='del'>-#define	VDEC_G_CHROMA_CTRL				0x1C18</div><div class='del'>-#define	VDEC_G_CRUSH_CTRL				0x1C1C</div><div class='add'>+#define	VDEC_G_LUMA_CTRL			0x1C14</div><div class='add'>+#define	VDEC_G_CHROMA_CTRL			0x1C18</div><div class='add'>+#define	VDEC_G_CRUSH_CTRL			0x1C1C</div><div class='ctx'> #define	VDEC_G_HORIZ_TIM_CTRL			0x1C20</div><div class='ctx'> #define	VDEC_G_VERT_TIM_CTRL			0x1C24</div><div class='ctx'> #define	VDEC_G_MISC_TIM_CTRL			0x1C28</div><div class='del'>-#define	VDEC_G_FIELD_COUNT				0x1C2C</div><div class='del'>-#define	VDEC_G_HSCALE_CTRL				0x1C30</div><div class='del'>-#define	VDEC_G_VSCALE_CTRL				0x1C34</div><div class='del'>-#define	VDEC_G_MAN_VGA_CTRL				0x1C38</div><div class='del'>-#define	VDEC_G_MAN_AGC_CTRL				0x1C3C</div><div class='del'>-#define	VDEC_G_DFE_CTRL1				0x1C40</div><div class='del'>-#define	VDEC_G_DFE_CTRL2				0x1C44</div><div class='del'>-#define	VDEC_G_DFE_CTRL3				0x1C48</div><div class='del'>-#define	VDEC_G_PLL_CTRL					0x1C4C</div><div class='add'>+#define	VDEC_G_FIELD_COUNT			0x1C2C</div><div class='add'>+#define	VDEC_G_HSCALE_CTRL			0x1C30</div><div class='add'>+#define	VDEC_G_VSCALE_CTRL			0x1C34</div><div class='add'>+#define	VDEC_G_MAN_VGA_CTRL			0x1C38</div><div class='add'>+#define	VDEC_G_MAN_AGC_CTRL			0x1C3C</div><div class='add'>+#define	VDEC_G_DFE_CTRL1			0x1C40</div><div class='add'>+#define	VDEC_G_DFE_CTRL2			0x1C44</div><div class='add'>+#define	VDEC_G_DFE_CTRL3			0x1C48</div><div class='add'>+#define	VDEC_G_PLL_CTRL				0x1C4C</div><div class='ctx'> #define	VDEC_G_PLL_CTRL_FAST			0x1C50</div><div class='del'>-#define	VDEC_G_HTL_CTRL					0x1C54</div><div class='del'>-#define	VDEC_G_SRC_CFG					0x1C58</div><div class='del'>-#define	VDEC_G_SC_STEP_SIZE				0x1C5C</div><div class='add'>+#define	VDEC_G_HTL_CTRL				0x1C54</div><div class='add'>+#define	VDEC_G_SRC_CFG				0x1C58</div><div class='add'>+#define	VDEC_G_SC_STEP_SIZE			0x1C5C</div><div class='ctx'> #define	VDEC_G_SC_CONVERGE_CTRL			0x1C60</div><div class='del'>-#define	VDEC_G_SC_LOOP_CTRL				0x1C64</div><div class='add'>+#define	VDEC_G_SC_LOOP_CTRL			0x1C64</div><div class='ctx'> #define	VDEC_G_COMB_2D_HFS_CFG			0x1C68</div><div class='ctx'> #define	VDEC_G_COMB_2D_HFD_CFG			0x1C6C</div><div class='ctx'> #define	VDEC_G_COMB_2D_LF_CFG			0x1C70</div><div class='ctx'> #define	VDEC_G_COMB_2D_BLEND			0x1C74</div><div class='ctx'> #define	VDEC_G_COMB_MISC_CTRL			0x1C78</div><div class='del'>-#define	VDEC_G_COMB_FLAT_THRESH_CTRL	0x1C7C</div><div class='del'>-#define	VDEC_G_COMB_TEST				0x1C80</div><div class='del'>-#define	VDEC_G_BP_MISC_CTRL				0x1C84</div><div class='del'>-#define	VDEC_G_VCR_DET_CTRL				0x1C88</div><div class='add'>+#define	VDEC_G_COMB_FLAT_THRESH_CTRL		0x1C7C</div><div class='add'>+#define	VDEC_G_COMB_TEST			0x1C80</div><div class='add'>+#define	VDEC_G_BP_MISC_CTRL			0x1C84</div><div class='add'>+#define	VDEC_G_VCR_DET_CTRL			0x1C88</div><div class='ctx'> #define	VDEC_G_NOISE_DET_CTRL			0x1C8C</div><div class='ctx'> #define	VDEC_G_COMB_FLAT_NOISE_CTRL		0x1C90</div><div class='del'>-#define	VDEC_G_VERSION					0x1DF8</div><div class='add'>+#define	VDEC_G_VERSION				0x1DF8</div><div class='ctx'> #define	VDEC_G_SOFT_RST_CTRL			0x1DFC</div><div class='ctx'> </div><div class='del'>-/*              Video Decoder H Registers  */</div><div class='del'>-#define	VDEC_H_MODE_CTRL				0x1E00</div><div class='del'>-#define	VDEC_H_OUT_CTRL1				0x1E04</div><div class='del'>-#define	VDEC_H_OUT_CTRL_NS				0x1E08</div><div class='del'>-#define	VDEC_H_GEN_STAT					0x1E0C</div><div class='add'>+/* Video Decoder H Registers  */</div><div class='add'>+#define	VDEC_H_MODE_CTRL			0x1E00</div><div class='add'>+#define	VDEC_H_OUT_CTRL1			0x1E04</div><div class='add'>+#define	VDEC_H_OUT_CTRL_NS			0x1E08</div><div class='add'>+#define	VDEC_H_GEN_STAT				0x1E0C</div><div class='ctx'> #define	VDEC_H_INT_STAT_MASK			0x1E1E</div><div class='del'>-#define	VDEC_H_LUMA_CTRL				0x1E14</div><div class='del'>-#define	VDEC_H_CHROMA_CTRL				0x1E18</div><div class='del'>-#define	VDEC_H_CRUSH_CTRL				0x1E1C</div><div class='add'>+#define	VDEC_H_LUMA_CTRL			0x1E14</div><div class='add'>+#define	VDEC_H_CHROMA_CTRL			0x1E18</div><div class='add'>+#define	VDEC_H_CRUSH_CTRL			0x1E1C</div><div class='ctx'> #define	VDEC_H_HORIZ_TIM_CTRL			0x1E20</div><div class='ctx'> #define	VDEC_H_VERT_TIM_CTRL			0x1E24</div><div class='ctx'> #define	VDEC_H_MISC_TIM_CTRL			0x1E28</div><div class='del'>-#define	VDEC_H_FIELD_COUNT				0x1E2C</div><div class='del'>-#define	VDEC_H_HSCALE_CTRL				0x1E30</div><div class='del'>-#define	VDEC_H_VSCALE_CTRL				0x1E34</div><div class='del'>-#define	VDEC_H_MAN_VGA_CTRL				0x1E38</div><div class='del'>-#define	VDEC_H_MAN_AGC_CTRL				0x1E3C</div><div class='del'>-#define	VDEC_H_DFE_CTRL1				0x1E40</div><div class='del'>-#define	VDEC_H_DFE_CTRL2				0x1E44</div><div class='del'>-#define	VDEC_H_DFE_CTRL3				0x1E48</div><div class='del'>-#define	VDEC_H_PLL_CTRL					0x1E4C</div><div class='add'>+#define	VDEC_H_FIELD_COUNT			0x1E2C</div><div class='add'>+#define	VDEC_H_HSCALE_CTRL			0x1E30</div><div class='add'>+#define	VDEC_H_VSCALE_CTRL			0x1E34</div><div class='add'>+#define	VDEC_H_MAN_VGA_CTRL			0x1E38</div><div class='add'>+#define	VDEC_H_MAN_AGC_CTRL			0x1E3C</div><div class='add'>+#define	VDEC_H_DFE_CTRL1			0x1E40</div><div class='add'>+#define	VDEC_H_DFE_CTRL2			0x1E44</div><div class='add'>+#define	VDEC_H_DFE_CTRL3			0x1E48</div><div class='add'>+#define	VDEC_H_PLL_CTRL				0x1E4C</div><div class='ctx'> #define	VDEC_H_PLL_CTRL_FAST			0x1E50</div><div class='del'>-#define	VDEC_H_HTL_CTRL					0x1E54</div><div class='del'>-#define	VDEC_H_SRC_CFG					0x1E58</div><div class='del'>-#define	VDEC_H_SC_STEP_SIZE				0x1E5C</div><div class='add'>+#define	VDEC_H_HTL_CTRL				0x1E54</div><div class='add'>+#define	VDEC_H_SRC_CFG				0x1E58</div><div class='add'>+#define	VDEC_H_SC_STEP_SIZE			0x1E5C</div><div class='ctx'> #define	VDEC_H_SC_CONVERGE_CTRL			0x1E60</div><div class='del'>-#define	VDEC_H_SC_LOOP_CTRL				0x1E64</div><div class='add'>+#define	VDEC_H_SC_LOOP_CTRL			0x1E64</div><div class='ctx'> #define	VDEC_H_COMB_2D_HFS_CFG			0x1E68</div><div class='ctx'> #define	VDEC_H_COMB_2D_HFD_CFG			0x1E6C</div><div class='ctx'> #define	VDEC_H_COMB_2D_LF_CFG			0x1E70</div><div class='ctx'> #define	VDEC_H_COMB_2D_BLEND			0x1E74</div><div class='ctx'> #define	VDEC_H_COMB_MISC_CTRL			0x1E78</div><div class='del'>-#define	VDEC_H_COMB_FLAT_THRESH_CTRL	0x1E7C</div><div class='del'>-#define	VDEC_H_COMB_TEST				0x1E80</div><div class='del'>-#define	VDEC_H_BP_MISC_CTRL				0x1E84</div><div class='del'>-#define	VDEC_H_VCR_DET_CTRL				0x1E88</div><div class='add'>+#define	VDEC_H_COMB_FLAT_THRESH_CTRL		0x1E7C</div><div class='add'>+#define	VDEC_H_COMB_TEST			0x1E80</div><div class='add'>+#define	VDEC_H_BP_MISC_CTRL			0x1E84</div><div class='add'>+#define	VDEC_H_VCR_DET_CTRL			0x1E88</div><div class='ctx'> #define	VDEC_H_NOISE_DET_CTRL			0x1E8C</div><div class='ctx'> #define	VDEC_H_COMB_FLAT_NOISE_CTRL		0x1E90</div><div class='del'>-#define	VDEC_H_VERSION					0x1FF8</div><div class='add'>+#define	VDEC_H_VERSION				0x1FF8</div><div class='ctx'> #define	VDEC_H_SOFT_RST_CTRL			0x1FFC</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /* LUMA_CTRL register fields */</div><div class='del'>-#define VDEC_A_BRITE_CTRL				0x1014</div><div class='add'>+#define VDEC_A_BRITE_CTRL			0x1014</div><div class='ctx'> #define VDEC_A_CNTRST_CTRL			0x1015</div><div class='ctx'> #define VDEC_A_PEAK_SEL				0x1016</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cx25821/cx25821-medusa-video.c b/drivers/media/video/cx25821/cx25821-medusa-video.c<br/>index fc780d0908dc..298a68d98c2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-medusa-video.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-medusa-video.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-medusa-video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx25821/cx25821-medusa-video.c</a></div><div class='hunk'>@@ -99,82 +99,67 @@ static int medusa_initialize_ntsc(struct cx25821_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MAX_DECODERS; i++) {</div><div class='ctx'> 		/* set video format NTSC-M */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0], MODE_CTRL + (0x200 * i),</div><div class='del'>-				     &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				MODE_CTRL + (0x200 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0xFFFFFFF0;</div><div class='ctx'> 		/* enable the fast locking mode bit[16] */</div><div class='ctx'> 		value |= 0x10001;</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0], MODE_CTRL + (0x200 * i),</div><div class='del'>-				      value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				MODE_CTRL + (0x200 * i), value);</div><div class='ctx'> </div><div class='ctx'> 		/* resolution NTSC 720x480 */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				     HORIZ_TIM_CTRL + (0x200 * i), &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				HORIZ_TIM_CTRL + (0x200 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0x00C00C00;</div><div class='ctx'> 		value |= 0x612D0074;</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      HORIZ_TIM_CTRL + (0x200 * i), value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				HORIZ_TIM_CTRL + (0x200 * i), value);</div><div class='ctx'> </div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				     VERT_TIM_CTRL + (0x200 * i), &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				VERT_TIM_CTRL + (0x200 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0x00C00C00;</div><div class='ctx'> 		value |= 0x1C1E001A;	/* vblank_cnt + 2 to get camera ID */</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      VERT_TIM_CTRL + (0x200 * i), value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				VERT_TIM_CTRL + (0x200 * i), value);</div><div class='ctx'> </div><div class='ctx'> 		/* chroma subcarrier step size */</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      SC_STEP_SIZE + (0x200 * i), 0x43E00000);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				SC_STEP_SIZE + (0x200 * i), 0x43E00000);</div><div class='ctx'> </div><div class='ctx'> 		/* enable VIP optional active */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				     OUT_CTRL_NS + (0x200 * i), &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				OUT_CTRL_NS + (0x200 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0xFFFBFFFF;</div><div class='ctx'> 		value |= 0x00040000;</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      OUT_CTRL_NS + (0x200 * i), value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				OUT_CTRL_NS + (0x200 * i), value);</div><div class='ctx'> </div><div class='ctx'> 		/* enable VIP optional active (VIP_OPT_AL) for direct output. */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0], OUT_CTRL1 + (0x200 * i),</div><div class='del'>-				     &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				OUT_CTRL1 + (0x200 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0xFFFBFFFF;</div><div class='ctx'> 		value |= 0x00040000;</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0], OUT_CTRL1 + (0x200 * i),</div><div class='del'>-				      value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				OUT_CTRL1 + (0x200 * i), value);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * clear VPRES_VERT_EN bit, fixes the chroma run away problem</div><div class='ctx'> 		 * when the input switching rate &lt; 16 fields</div><div class='ctx'> 		*/</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				     MISC_TIM_CTRL + (0x200 * i), &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				MISC_TIM_CTRL + (0x200 * i), &amp;tmp);</div><div class='ctx'> 		/* disable special play detection */</div><div class='ctx'> 		value = setBitAtPos(value, 14);</div><div class='ctx'> 		value = clearBitAtPos(value, 15);</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      MISC_TIM_CTRL + (0x200 * i), value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				MISC_TIM_CTRL + (0x200 * i), value);</div><div class='ctx'> </div><div class='ctx'> 		/* set vbi_gate_en to 0 */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0], DFE_CTRL1 + (0x200 * i),</div><div class='del'>-				     &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DFE_CTRL1 + (0x200 * i), &amp;tmp);</div><div class='ctx'> 		value = clearBitAtPos(value, 29);</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0], DFE_CTRL1 + (0x200 * i),</div><div class='del'>-				      value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DFE_CTRL1 + (0x200 * i), value);</div><div class='ctx'> </div><div class='ctx'> 		/* Enable the generation of blue field output if no video */</div><div class='ctx'> 		medusa_enable_bluefield_output(dev, i, 1);</div><div class='hunk'>@@ -182,61 +167,49 @@ static int medusa_initialize_ntsc(struct cx25821_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MAX_ENCODERS; i++) {</div><div class='ctx'> 		/* NTSC hclock */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				     DENC_A_REG_1 + (0x100 * i), &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_1 + (0x100 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0xF000FC00;</div><div class='ctx'> 		value |= 0x06B402D0;</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      DENC_A_REG_1 + (0x100 * i), value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_1 + (0x100 * i), value);</div><div class='ctx'> </div><div class='ctx'> 		/* burst begin and burst end */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				     DENC_A_REG_2 + (0x100 * i), &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_2 + (0x100 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0xFF000000;</div><div class='ctx'> 		value |= 0x007E9054;</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      DENC_A_REG_2 + (0x100 * i), value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_2 + (0x100 * i), value);</div><div class='ctx'> </div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				     DENC_A_REG_3 + (0x100 * i), &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_3 + (0x100 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0xFC00FE00;</div><div class='ctx'> 		value |= 0x00EC00F0;</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      DENC_A_REG_3 + (0x100 * i), value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_3 + (0x100 * i), value);</div><div class='ctx'> </div><div class='ctx'> 		/* set NTSC vblank, no phase alternation, 7.5 IRE pedestal */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				     DENC_A_REG_4 + (0x100 * i), &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_4 + (0x100 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0x00FCFFFF;</div><div class='ctx'> 		value |= 0x13020000;</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      DENC_A_REG_4 + (0x100 * i), value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_4 + (0x100 * i), value);</div><div class='ctx'> </div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				     DENC_A_REG_5 + (0x100 * i), &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_5 + (0x100 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0xFFFF0000;</div><div class='ctx'> 		value |= 0x0000E575;</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      DENC_A_REG_5 + (0x100 * i), value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_5 + (0x100 * i), value);</div><div class='ctx'> </div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      DENC_A_REG_6 + (0x100 * i), 0x009A89C1);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_6 + (0x100 * i), 0x009A89C1);</div><div class='ctx'> </div><div class='ctx'> 		/* Subcarrier Increment */</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      DENC_A_REG_7 + (0x100 * i), 0x21F07C1F);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_7 + (0x100 * i), 0x21F07C1F);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set picture resolutions */</div><div class='hunk'>@@ -261,34 +234,27 @@ static int medusa_PALCombInit(struct cx25821_dev *dev, int dec)</div><div class='ctx'> 	u32 value = 0, tmp = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Setup for 2D threshold */</div><div class='del'>-	ret_val =</div><div class='del'>-	    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0], COMB_2D_HFS_CFG + (0x200 * dec),</div><div class='del'>-			      0x20002861);</div><div class='del'>-	ret_val =</div><div class='del'>-	    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0], COMB_2D_HFD_CFG + (0x200 * dec),</div><div class='del'>-			      0x20002861);</div><div class='del'>-	ret_val =</div><div class='del'>-	    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0], COMB_2D_LF_CFG + (0x200 * dec),</div><div class='del'>-			      0x200A1023);</div><div class='add'>+	ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+			COMB_2D_HFS_CFG + (0x200 * dec), 0x20002861);</div><div class='add'>+	ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+			COMB_2D_HFD_CFG + (0x200 * dec), 0x20002861);</div><div class='add'>+	ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+			COMB_2D_LF_CFG + (0x200 * dec), 0x200A1023);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup flat chroma and luma thresholds */</div><div class='del'>-	value =</div><div class='del'>-	    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-			     COMB_FLAT_THRESH_CTRL + (0x200 * dec), &amp;tmp);</div><div class='add'>+	value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+			COMB_FLAT_THRESH_CTRL + (0x200 * dec), &amp;tmp);</div><div class='ctx'> 	value &amp;= 0x06230000;</div><div class='del'>-	ret_val =</div><div class='del'>-	    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-			      COMB_FLAT_THRESH_CTRL + (0x200 * dec), value);</div><div class='add'>+	ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+			COMB_FLAT_THRESH_CTRL + (0x200 * dec), value);</div><div class='ctx'> </div><div class='ctx'> 	/* set comb 2D blend */</div><div class='del'>-	ret_val =</div><div class='del'>-	    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0], COMB_2D_BLEND + (0x200 * dec),</div><div class='del'>-			      0x210F0F0F);</div><div class='add'>+	ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+			COMB_2D_BLEND + (0x200 * dec), 0x210F0F0F);</div><div class='ctx'> </div><div class='ctx'> 	/* COMB MISC CONTROL */</div><div class='del'>-	ret_val =</div><div class='del'>-	    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0], COMB_MISC_CTRL + (0x200 * dec),</div><div class='del'>-			      0x41120A7F);</div><div class='add'>+	ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+			COMB_MISC_CTRL + (0x200 * dec), 0x41120A7F);</div><div class='ctx'> </div><div class='ctx'> 	return ret_val;</div><div class='ctx'> }</div><div class='hunk'>@@ -304,83 +270,68 @@ static int medusa_initialize_pal(struct cx25821_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MAX_DECODERS; i++) {</div><div class='ctx'> 		/* set video format PAL-BDGHI */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0], MODE_CTRL + (0x200 * i),</div><div class='del'>-				     &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				MODE_CTRL + (0x200 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0xFFFFFFF0;</div><div class='ctx'> 		/* enable the fast locking mode bit[16] */</div><div class='ctx'> 		value |= 0x10004;</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0], MODE_CTRL + (0x200 * i),</div><div class='del'>-				      value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				MODE_CTRL + (0x200 * i), value);</div><div class='ctx'> </div><div class='ctx'> 		/* resolution PAL 720x576 */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				     HORIZ_TIM_CTRL + (0x200 * i), &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				HORIZ_TIM_CTRL + (0x200 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0x00C00C00;</div><div class='ctx'> 		value |= 0x632D007D;</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      HORIZ_TIM_CTRL + (0x200 * i), value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				HORIZ_TIM_CTRL + (0x200 * i), value);</div><div class='ctx'> </div><div class='ctx'> 		/* vblank656_cnt=x26, vactive_cnt=240h, vblank_cnt=x24 */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				     VERT_TIM_CTRL + (0x200 * i), &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				VERT_TIM_CTRL + (0x200 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0x00C00C00;</div><div class='ctx'> 		value |= 0x28240026;	/* vblank_cnt + 2 to get camera ID */</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      VERT_TIM_CTRL + (0x200 * i), value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				VERT_TIM_CTRL + (0x200 * i), value);</div><div class='ctx'> </div><div class='ctx'> 		/* chroma subcarrier step size */</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      SC_STEP_SIZE + (0x200 * i), 0x5411E2D0);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				SC_STEP_SIZE + (0x200 * i), 0x5411E2D0);</div><div class='ctx'> </div><div class='ctx'> 		/* enable VIP optional active */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				     OUT_CTRL_NS + (0x200 * i), &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				OUT_CTRL_NS + (0x200 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0xFFFBFFFF;</div><div class='ctx'> 		value |= 0x00040000;</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      OUT_CTRL_NS + (0x200 * i), value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				OUT_CTRL_NS + (0x200 * i), value);</div><div class='ctx'> </div><div class='ctx'> 		/* enable VIP optional active (VIP_OPT_AL) for direct output. */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0], OUT_CTRL1 + (0x200 * i),</div><div class='del'>-				     &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				OUT_CTRL1 + (0x200 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0xFFFBFFFF;</div><div class='ctx'> 		value |= 0x00040000;</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0], OUT_CTRL1 + (0x200 * i),</div><div class='del'>-				      value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				OUT_CTRL1 + (0x200 * i), value);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * clear VPRES_VERT_EN bit, fixes the chroma run away problem</div><div class='ctx'> 		 * when the input switching rate &lt; 16 fields</div><div class='ctx'> 		 */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				     MISC_TIM_CTRL + (0x200 * i), &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				MISC_TIM_CTRL + (0x200 * i), &amp;tmp);</div><div class='ctx'> 		/* disable special play detection */</div><div class='ctx'> 		value = setBitAtPos(value, 14);</div><div class='ctx'> 		value = clearBitAtPos(value, 15);</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      MISC_TIM_CTRL + (0x200 * i), value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				MISC_TIM_CTRL + (0x200 * i), value);</div><div class='ctx'> </div><div class='ctx'> 		/* set vbi_gate_en to 0 */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0], DFE_CTRL1 + (0x200 * i),</div><div class='del'>-				     &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DFE_CTRL1 + (0x200 * i), &amp;tmp);</div><div class='ctx'> 		value = clearBitAtPos(value, 29);</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0], DFE_CTRL1 + (0x200 * i),</div><div class='del'>-				      value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DFE_CTRL1 + (0x200 * i), value);</div><div class='ctx'> </div><div class='ctx'> 		medusa_PALCombInit(dev, i);</div><div class='ctx'> </div><div class='hunk'>@@ -390,62 +341,50 @@ static int medusa_initialize_pal(struct cx25821_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MAX_ENCODERS; i++) {</div><div class='ctx'> 		/* PAL hclock */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				     DENC_A_REG_1 + (0x100 * i), &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_1 + (0x100 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0xF000FC00;</div><div class='ctx'> 		value |= 0x06C002D0;</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      DENC_A_REG_1 + (0x100 * i), value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_1 + (0x100 * i), value);</div><div class='ctx'> </div><div class='ctx'> 		/* burst begin and burst end */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				     DENC_A_REG_2 + (0x100 * i), &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_2 + (0x100 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0xFF000000;</div><div class='ctx'> 		value |= 0x007E9754;</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      DENC_A_REG_2 + (0x100 * i), value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_2 + (0x100 * i), value);</div><div class='ctx'> </div><div class='ctx'> 		/* hblank and vactive */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				     DENC_A_REG_3 + (0x100 * i), &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_3 + (0x100 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0xFC00FE00;</div><div class='ctx'> 		value |= 0x00FC0120;</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      DENC_A_REG_3 + (0x100 * i), value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_3 + (0x100 * i), value);</div><div class='ctx'> </div><div class='ctx'> 		/* set PAL vblank, phase alternation, 0 IRE pedestal */</div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				     DENC_A_REG_4 + (0x100 * i), &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_4 + (0x100 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0x00FCFFFF;</div><div class='ctx'> 		value |= 0x14010000;</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      DENC_A_REG_4 + (0x100 * i), value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_4 + (0x100 * i), value);</div><div class='ctx'> </div><div class='del'>-		value =</div><div class='del'>-		    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				     DENC_A_REG_5 + (0x100 * i), &amp;tmp);</div><div class='add'>+		value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_5 + (0x100 * i), &amp;tmp);</div><div class='ctx'> 		value &amp;= 0xFFFF0000;</div><div class='ctx'> 		value |= 0x0000F078;</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      DENC_A_REG_5 + (0x100 * i), value);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_5 + (0x100 * i), value);</div><div class='ctx'> </div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      DENC_A_REG_6 + (0x100 * i), 0x00A493CF);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_6 + (0x100 * i), 0x00A493CF);</div><div class='ctx'> </div><div class='ctx'> 		/* Subcarrier Increment */</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      DENC_A_REG_7 + (0x100 * i), 0x2A098ACB);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				DENC_A_REG_7 + (0x100 * i), 0x2A098ACB);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set picture resolutions */</div><div class='hunk'>@@ -499,7 +438,7 @@ void medusa_set_resolution(struct cx25821_dev *dev, int width,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	/* validate the width - cannot be negative */</div><div class='add'>+	/* validate the width */</div><div class='ctx'> 	if (width &gt; MAX_WIDTH) {</div><div class='ctx'> 		pr_info("%s(): width %d &gt; MAX_WIDTH %d ! resetting to MAX_WIDTH\n",</div><div class='ctx'> 			__func__, width, MAX_WIDTH);</div><div class='hunk'>@@ -543,12 +482,10 @@ void medusa_set_resolution(struct cx25821_dev *dev, int width,</div><div class='ctx'> </div><div class='ctx'> 	for (; decoder &lt; decoder_count; decoder++) {</div><div class='ctx'> 		/* write scaling values for each decoder */</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      HSCALE_CTRL + (0x200 * decoder), hscale);</div><div class='del'>-		ret_val =</div><div class='del'>-		    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-				      VSCALE_CTRL + (0x200 * decoder), vscale);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				HSCALE_CTRL + (0x200 * decoder), hscale);</div><div class='add'>+		ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+				VSCALE_CTRL + (0x200 * decoder), vscale);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;lock);</div><div class='hunk'>@@ -606,8 +543,8 @@ static void medusa_set_decoderduration(struct cx25821_dev *dev, int decoder,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Map to Medusa register setting */</div><div class='del'>-static int mapM(int srcMin,</div><div class='del'>-		int srcMax, int srcVal, int dstMin, int dstMax, int *dstVal)</div><div class='add'>+static int mapM(int srcMin, int srcMax, int srcVal, int dstMin, int dstMax,</div><div class='add'>+		int *dstVal)</div><div class='ctx'> {</div><div class='ctx'> 	int numerator;</div><div class='ctx'> 	int denominator;</div><div class='hunk'>@@ -654,23 +591,19 @@ int medusa_set_brightness(struct cx25821_dev *dev, int brightness, int decoder)</div><div class='ctx'> 	u32 val = 0, tmp = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;lock);</div><div class='del'>-	if ((brightness &gt; VIDEO_PROCAMP_MAX)</div><div class='del'>-	    || (brightness &lt; VIDEO_PROCAMP_MIN)) {</div><div class='add'>+	if ((brightness &gt; VIDEO_PROCAMP_MAX) ||</div><div class='add'>+	    (brightness &lt; VIDEO_PROCAMP_MIN)) {</div><div class='ctx'> 		mutex_unlock(&amp;dev-&gt;lock);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='del'>-	ret_val =</div><div class='del'>-	    mapM(VIDEO_PROCAMP_MIN, VIDEO_PROCAMP_MAX, brightness,</div><div class='del'>-		 SIGNED_BYTE_MIN, SIGNED_BYTE_MAX, &amp;value);</div><div class='add'>+	ret_val = mapM(VIDEO_PROCAMP_MIN, VIDEO_PROCAMP_MAX, brightness,</div><div class='add'>+			SIGNED_BYTE_MIN, SIGNED_BYTE_MAX, &amp;value);</div><div class='ctx'> 	value = convert_to_twos(value, 8);</div><div class='del'>-	val =</div><div class='del'>-	    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-			     VDEC_A_BRITE_CTRL + (0x200 * decoder), &amp;tmp);</div><div class='add'>+	val = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+			VDEC_A_BRITE_CTRL + (0x200 * decoder), &amp;tmp);</div><div class='ctx'> 	val &amp;= 0xFFFFFF00;</div><div class='del'>-	ret_val |=</div><div class='del'>-	    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-			      VDEC_A_BRITE_CTRL + (0x200 * decoder),</div><div class='del'>-			      val | value);</div><div class='add'>+	ret_val |= cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+			VDEC_A_BRITE_CTRL + (0x200 * decoder), val | value);</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;lock);</div><div class='ctx'> 	return ret_val;</div><div class='ctx'> }</div><div class='hunk'>@@ -688,17 +621,13 @@ int medusa_set_contrast(struct cx25821_dev *dev, int contrast, int decoder)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret_val =</div><div class='del'>-	    mapM(VIDEO_PROCAMP_MIN, VIDEO_PROCAMP_MAX, contrast,</div><div class='del'>-		 UNSIGNED_BYTE_MIN, UNSIGNED_BYTE_MAX, &amp;value);</div><div class='del'>-	val =</div><div class='del'>-	    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-			     VDEC_A_CNTRST_CTRL + (0x200 * decoder), &amp;tmp);</div><div class='add'>+	ret_val = mapM(VIDEO_PROCAMP_MIN, VIDEO_PROCAMP_MAX, contrast,</div><div class='add'>+			UNSIGNED_BYTE_MIN, UNSIGNED_BYTE_MAX, &amp;value);</div><div class='add'>+	val = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+			VDEC_A_CNTRST_CTRL + (0x200 * decoder), &amp;tmp);</div><div class='ctx'> 	val &amp;= 0xFFFFFF00;</div><div class='del'>-	ret_val |=</div><div class='del'>-	    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-			      VDEC_A_CNTRST_CTRL + (0x200 * decoder),</div><div class='del'>-			      val | value);</div><div class='add'>+	ret_val |= cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+			VDEC_A_CNTRST_CTRL + (0x200 * decoder), val | value);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;lock);</div><div class='ctx'> 	return ret_val;</div><div class='hunk'>@@ -717,19 +646,16 @@ int medusa_set_hue(struct cx25821_dev *dev, int hue, int decoder)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret_val =</div><div class='del'>-	    mapM(VIDEO_PROCAMP_MIN, VIDEO_PROCAMP_MAX, hue, SIGNED_BYTE_MIN,</div><div class='del'>-		 SIGNED_BYTE_MAX, &amp;value);</div><div class='add'>+	ret_val = mapM(VIDEO_PROCAMP_MIN, VIDEO_PROCAMP_MAX, hue,</div><div class='add'>+			SIGNED_BYTE_MIN, SIGNED_BYTE_MAX, &amp;value);</div><div class='ctx'> </div><div class='ctx'> 	value = convert_to_twos(value, 8);</div><div class='del'>-	val =</div><div class='del'>-	    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-			     VDEC_A_HUE_CTRL + (0x200 * decoder), &amp;tmp);</div><div class='add'>+	val = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+			VDEC_A_HUE_CTRL + (0x200 * decoder), &amp;tmp);</div><div class='ctx'> 	val &amp;= 0xFFFFFF00;</div><div class='ctx'> </div><div class='del'>-	ret_val |=</div><div class='del'>-	    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-			      VDEC_A_HUE_CTRL + (0x200 * decoder), val | value);</div><div class='add'>+	ret_val |= cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+			VDEC_A_HUE_CTRL + (0x200 * decoder), val | value);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;lock);</div><div class='ctx'> 	return ret_val;</div><div class='hunk'>@@ -743,33 +669,26 @@ int medusa_set_saturation(struct cx25821_dev *dev, int saturation, int decoder)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if ((saturation &gt; VIDEO_PROCAMP_MAX)</div><div class='del'>-	    || (saturation &lt; VIDEO_PROCAMP_MIN)) {</div><div class='add'>+	if ((saturation &gt; VIDEO_PROCAMP_MAX) ||</div><div class='add'>+	    (saturation &lt; VIDEO_PROCAMP_MIN)) {</div><div class='ctx'> 		mutex_unlock(&amp;dev-&gt;lock);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret_val =</div><div class='del'>-	    mapM(VIDEO_PROCAMP_MIN, VIDEO_PROCAMP_MAX, saturation,</div><div class='del'>-		 UNSIGNED_BYTE_MIN, UNSIGNED_BYTE_MAX, &amp;value);</div><div class='add'>+	ret_val = mapM(VIDEO_PROCAMP_MIN, VIDEO_PROCAMP_MAX, saturation,</div><div class='add'>+			UNSIGNED_BYTE_MIN, UNSIGNED_BYTE_MAX, &amp;value);</div><div class='ctx'> </div><div class='del'>-	val =</div><div class='del'>-	    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-			     VDEC_A_USAT_CTRL + (0x200 * decoder), &amp;tmp);</div><div class='add'>+	val = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+			VDEC_A_USAT_CTRL + (0x200 * decoder), &amp;tmp);</div><div class='ctx'> 	val &amp;= 0xFFFFFF00;</div><div class='del'>-	ret_val |=</div><div class='del'>-	    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-			      VDEC_A_USAT_CTRL + (0x200 * decoder),</div><div class='del'>-			      val | value);</div><div class='del'>-</div><div class='del'>-	val =</div><div class='del'>-	    cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-			     VDEC_A_VSAT_CTRL + (0x200 * decoder), &amp;tmp);</div><div class='add'>+	ret_val |= cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+			VDEC_A_USAT_CTRL + (0x200 * decoder), val | value);</div><div class='add'>+</div><div class='add'>+	val = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+			VDEC_A_VSAT_CTRL + (0x200 * decoder), &amp;tmp);</div><div class='ctx'> 	val &amp;= 0xFFFFFF00;</div><div class='del'>-	ret_val |=</div><div class='del'>-	    cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='del'>-			      VDEC_A_VSAT_CTRL + (0x200 * decoder),</div><div class='del'>-			      val | value);</div><div class='add'>+	ret_val |= cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0],</div><div class='add'>+			VDEC_A_VSAT_CTRL + (0x200 * decoder), val | value);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;lock);</div><div class='ctx'> 	return ret_val;</div><div class='hunk'>@@ -830,9 +749,8 @@ int medusa_video_init(struct cx25821_dev *dev)</div><div class='ctx'> 	/* select AFE clock to output mode */</div><div class='ctx'> 	value = cx25821_i2c_read(&amp;dev-&gt;i2c_bus[0], AFE_AB_DIAG_CTRL, &amp;tmp);</div><div class='ctx'> 	value &amp;= 0x83FFFFFF;</div><div class='del'>-	ret_val =</div><div class='del'>-	   cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0], AFE_AB_DIAG_CTRL,</div><div class='del'>-			     value | 0x10000000);</div><div class='add'>+	ret_val = cx25821_i2c_write(&amp;dev-&gt;i2c_bus[0], AFE_AB_DIAG_CTRL,</div><div class='add'>+			value | 0x10000000);</div><div class='ctx'> </div><div class='ctx'> 	if (ret_val &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='head'>diff --git a/drivers/media/video/cx25821/cx25821-video-upstream-ch2.c b/drivers/media/video/cx25821/cx25821-video-upstream-ch2.c<br/>index 2a724ddfa53f..5a157cf4a95e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-video-upstream-ch2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-video-upstream-ch2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-video-upstream-ch2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx25821/cx25821-video-upstream-ch2.c</a></div><div class='hunk'>@@ -65,9 +65,8 @@ static __le32 *cx25821_update_riscprogram_ch2(struct cx25821_dev *dev,</div><div class='ctx'> 		*(rp++) = cpu_to_le32(dev-&gt;_data_buf_phys_addr_ch2 + offset);</div><div class='ctx'> 		*(rp++) = cpu_to_le32(0);	/* bits 63-32 */</div><div class='ctx'> </div><div class='del'>-		if ((lines &lt;= NTSC_FIELD_HEIGHT)</div><div class='del'>-		    || (line &lt; (NTSC_FIELD_HEIGHT - 1))</div><div class='del'>-		    || !(dev-&gt;_isNTSC_ch2)) {</div><div class='add'>+		if ((lines &lt;= NTSC_FIELD_HEIGHT) ||</div><div class='add'>+		    (line &lt; (NTSC_FIELD_HEIGHT - 1)) || !(dev-&gt;_isNTSC_ch2)) {</div><div class='ctx'> 			offset += dist_betwn_starts;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -85,7 +84,7 @@ static __le32 *cx25821_risc_field_upstream_ch2(struct cx25821_dev *dev,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int line, i;</div><div class='ctx'> 	struct sram_channel *sram_ch =</div><div class='del'>-	   dev-&gt;channels[dev-&gt;_channel2_upstream_select].sram_channels;</div><div class='add'>+		dev-&gt;channels[dev-&gt;_channel2_upstream_select].sram_channels;</div><div class='ctx'> 	int dist_betwn_starts = bpl * 2;</div><div class='ctx'> </div><div class='ctx'> 	/* sync instruction */</div><div class='hunk'>@@ -103,9 +102,8 @@ static __le32 *cx25821_risc_field_upstream_ch2(struct cx25821_dev *dev,</div><div class='ctx'> 		*(rp++) = cpu_to_le32(databuf_phys_addr + offset);</div><div class='ctx'> 		*(rp++) = cpu_to_le32(0);	/* bits 63-32 */</div><div class='ctx'> </div><div class='del'>-		if ((lines &lt;= NTSC_FIELD_HEIGHT)</div><div class='del'>-		    || (line &lt; (NTSC_FIELD_HEIGHT - 1))</div><div class='del'>-		    || !(dev-&gt;_isNTSC_ch2)) {</div><div class='add'>+		if ((lines &lt;= NTSC_FIELD_HEIGHT) ||</div><div class='add'>+		    (line &lt; (NTSC_FIELD_HEIGHT - 1)) || !(dev-&gt;_isNTSC_ch2)) {</div><div class='ctx'> 			offset += dist_betwn_starts;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -173,7 +171,7 @@ int cx25821_risc_buffer_upstream_ch2(struct cx25821_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 		fifo_enable = FIFO_DISABLE;</div><div class='ctx'> </div><div class='del'>-	       /* Even field */</div><div class='add'>+		/* Even field */</div><div class='ctx'> 		rp = cx25821_risc_field_upstream_ch2(dev, rp,</div><div class='ctx'> 				dev-&gt;_data_buf_phys_addr_ch2 + databuf_offset,</div><div class='ctx'> 				bottom_offset, 0x200, bpl, singlefield_lines,</div><div class='hunk'>@@ -189,9 +187,9 @@ int cx25821_risc_buffer_upstream_ch2(struct cx25821_dev *dev,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	       /*</div><div class='del'>-		  Loop to 2ndFrameRISC or to Start of</div><div class='del'>-		  Risc program &amp; generate IRQ</div><div class='del'>-	       */</div><div class='add'>+		* Loop to 2ndFrameRISC or to Start of</div><div class='add'>+		* Risc program &amp; generate IRQ</div><div class='add'>+		*/</div><div class='ctx'> 		*(rp++) = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | risc_flag);</div><div class='ctx'> 		*(rp++) = cpu_to_le32(risc_phys_jump_addr);</div><div class='ctx'> 		*(rp++) = cpu_to_le32(0);</div><div class='hunk'>@@ -203,7 +201,7 @@ int cx25821_risc_buffer_upstream_ch2(struct cx25821_dev *dev,</div><div class='ctx'> void cx25821_stop_upstream_video_ch2(struct cx25821_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sram_channel *sram_ch =</div><div class='del'>-	   dev-&gt;channels[VID_UPSTREAM_SRAM_CHANNEL_J].sram_channels;</div><div class='add'>+		dev-&gt;channels[VID_UPSTREAM_SRAM_CHANNEL_J].sram_channels;</div><div class='ctx'> 	u32 tmp = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;_is_running_ch2) {</div><div class='hunk'>@@ -262,9 +260,8 @@ int cx25821_get_frame_ch2(struct cx25821_dev *dev, struct sram_channel *sram_ch)</div><div class='ctx'> 	struct file *myfile;</div><div class='ctx'> 	int frame_index_temp = dev-&gt;_frame_index_ch2;</div><div class='ctx'> 	int i = 0;</div><div class='del'>-	int line_size =</div><div class='del'>-	    (dev-&gt;_pixel_format_ch2 ==</div><div class='del'>-	     PIXEL_FRMT_411) ? Y411_LINE_SZ : Y422_LINE_SZ;</div><div class='add'>+	int line_size = (dev-&gt;_pixel_format_ch2 == PIXEL_FRMT_411) ?</div><div class='add'>+		Y411_LINE_SZ : Y422_LINE_SZ;</div><div class='ctx'> 	int frame_size = 0;</div><div class='ctx'> 	int frame_offset = 0;</div><div class='ctx'> 	ssize_t vfs_read_retval = 0;</div><div class='hunk'>@@ -277,14 +274,11 @@ int cx25821_get_frame_ch2(struct cx25821_dev *dev, struct sram_channel *sram_ch)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;_isNTSC_ch2) {</div><div class='del'>-		frame_size =</div><div class='del'>-		    (line_size ==</div><div class='del'>-		     Y411_LINE_SZ) ? FRAME_SIZE_NTSC_Y411 :</div><div class='del'>-		    FRAME_SIZE_NTSC_Y422;</div><div class='add'>+		frame_size = (line_size == Y411_LINE_SZ) ?</div><div class='add'>+			FRAME_SIZE_NTSC_Y411 : FRAME_SIZE_NTSC_Y422;</div><div class='ctx'> 	} else {</div><div class='del'>-		frame_size =</div><div class='del'>-		    (line_size ==</div><div class='del'>-		     Y411_LINE_SZ) ? FRAME_SIZE_PAL_Y411 : FRAME_SIZE_PAL_Y422;</div><div class='add'>+		frame_size = (line_size == Y411_LINE_SZ) ?</div><div class='add'>+			FRAME_SIZE_PAL_Y411 : FRAME_SIZE_PAL_Y422;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	frame_offset = (frame_index_temp &gt; 0) ? frame_size : 0;</div><div class='hunk'>@@ -318,14 +312,14 @@ int cx25821_get_frame_ch2(struct cx25821_dev *dev, struct sram_channel *sram_ch)</div><div class='ctx'> 		for (i = 0; i &lt; dev-&gt;_lines_count_ch2; i++) {</div><div class='ctx'> 			pos = file_offset;</div><div class='ctx'> </div><div class='del'>-			vfs_read_retval =</div><div class='del'>-			    vfs_read(myfile, mybuf, line_size, &amp;pos);</div><div class='add'>+			vfs_read_retval = vfs_read(myfile, mybuf, line_size,</div><div class='add'>+					&amp;pos);</div><div class='ctx'> </div><div class='ctx'> 			if (vfs_read_retval &gt; 0 &amp;&amp; vfs_read_retval == line_size</div><div class='ctx'> 			    &amp;&amp; dev-&gt;_data_buf_virt_addr_ch2 != NULL) {</div><div class='ctx'> 				memcpy((void *)(dev-&gt;_data_buf_virt_addr_ch2 +</div><div class='ctx'> 						frame_offset / 4), mybuf,</div><div class='del'>-				       vfs_read_retval);</div><div class='add'>+						vfs_read_retval);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			file_offset += vfs_read_retval;</div><div class='hunk'>@@ -341,8 +335,8 @@ int cx25821_get_frame_ch2(struct cx25821_dev *dev, struct sram_channel *sram_ch)</div><div class='ctx'> 		if (i &gt; 0)</div><div class='ctx'> 			dev-&gt;_frame_count_ch2++;</div><div class='ctx'> </div><div class='del'>-		dev-&gt;_file_status_ch2 =</div><div class='del'>-		    (vfs_read_retval == line_size) ? IN_PROGRESS : END_OF_FILE;</div><div class='add'>+		dev-&gt;_file_status_ch2 = (vfs_read_retval == line_size) ?</div><div class='add'>+			IN_PROGRESS : END_OF_FILE;</div><div class='ctx'> </div><div class='ctx'> 		set_fs(old_fs);</div><div class='ctx'> 		filp_close(myfile, NULL);</div><div class='hunk'>@@ -353,8 +347,8 @@ int cx25821_get_frame_ch2(struct cx25821_dev *dev, struct sram_channel *sram_ch)</div><div class='ctx'> </div><div class='ctx'> static void cx25821_vidups_handler_ch2(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct cx25821_dev *dev =</div><div class='del'>-	    container_of(work, struct cx25821_dev, _irq_work_entry_ch2);</div><div class='add'>+	struct cx25821_dev *dev = container_of(work, struct cx25821_dev,</div><div class='add'>+			_irq_work_entry_ch2);</div><div class='ctx'> </div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		pr_err("ERROR %s(): since container_of(work_struct) FAILED!\n",</div><div class='hunk'>@@ -362,18 +356,16 @@ static void cx25821_vidups_handler_ch2(struct work_struct *work)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cx25821_get_frame_ch2(dev,</div><div class='del'>-			     dev-&gt;channels[dev-&gt;</div><div class='del'>-			       _channel2_upstream_select].sram_channels);</div><div class='add'>+	cx25821_get_frame_ch2(dev, dev-&gt;channels[dev-&gt;</div><div class='add'>+			_channel2_upstream_select].sram_channels);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cx25821_openfile_ch2(struct cx25821_dev *dev, struct sram_channel *sram_ch)</div><div class='ctx'> {</div><div class='ctx'> 	struct file *myfile;</div><div class='ctx'> 	int i = 0, j = 0;</div><div class='del'>-	int line_size =</div><div class='del'>-	    (dev-&gt;_pixel_format_ch2 ==</div><div class='del'>-	     PIXEL_FRMT_411) ? Y411_LINE_SZ : Y422_LINE_SZ;</div><div class='add'>+	int line_size = (dev-&gt;_pixel_format_ch2 == PIXEL_FRMT_411) ?</div><div class='add'>+		Y411_LINE_SZ : Y422_LINE_SZ;</div><div class='ctx'> 	ssize_t vfs_read_retval = 0;</div><div class='ctx'> 	char mybuf[line_size];</div><div class='ctx'> 	loff_t pos;</div><div class='hunk'>@@ -410,16 +402,16 @@ int cx25821_openfile_ch2(struct cx25821_dev *dev, struct sram_channel *sram_ch)</div><div class='ctx'> 			for (i = 0; i &lt; dev-&gt;_lines_count_ch2; i++) {</div><div class='ctx'> 				pos = offset;</div><div class='ctx'> </div><div class='del'>-				vfs_read_retval =</div><div class='del'>-				    vfs_read(myfile, mybuf, line_size, &amp;pos);</div><div class='add'>+				vfs_read_retval = vfs_read(myfile, mybuf,</div><div class='add'>+						line_size, &amp;pos);</div><div class='ctx'> </div><div class='del'>-				if (vfs_read_retval &gt; 0</div><div class='del'>-				    &amp;&amp; vfs_read_retval == line_size</div><div class='del'>-				    &amp;&amp; dev-&gt;_data_buf_virt_addr_ch2 != NULL) {</div><div class='add'>+				if (vfs_read_retval &gt; 0 &amp;&amp;</div><div class='add'>+				    vfs_read_retval == line_size &amp;&amp;</div><div class='add'>+				    dev-&gt;_data_buf_virt_addr_ch2 != NULL) {</div><div class='ctx'> 					memcpy((void *)(dev-&gt;</div><div class='ctx'> 							_data_buf_virt_addr_ch2</div><div class='ctx'> 							+ offset / 4), mybuf,</div><div class='del'>-					       vfs_read_retval);</div><div class='add'>+							vfs_read_retval);</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				offset += vfs_read_retval;</div><div class='hunk'>@@ -438,8 +430,8 @@ int cx25821_openfile_ch2(struct cx25821_dev *dev, struct sram_channel *sram_ch)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dev-&gt;_file_status_ch2 =</div><div class='del'>-		    (vfs_read_retval == line_size) ? IN_PROGRESS : END_OF_FILE;</div><div class='add'>+		dev-&gt;_file_status_ch2 = (vfs_read_retval == line_size) ?</div><div class='add'>+			IN_PROGRESS : END_OF_FILE;</div><div class='ctx'> </div><div class='ctx'> 		set_fs(old_fs);</div><div class='ctx'> 		myfile-&gt;f_pos = 0;</div><div class='hunk'>@@ -463,9 +455,8 @@ static int cx25821_upstream_buffer_prepare_ch2(struct cx25821_dev *dev,</div><div class='ctx'> 				    dev-&gt;_dma_phys_addr_ch2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;_dma_virt_addr_ch2 =</div><div class='del'>-	    pci_alloc_consistent(dev-&gt;pci, dev-&gt;upstream_riscbuf_size_ch2,</div><div class='del'>-				 &amp;dma_addr);</div><div class='add'>+	dev-&gt;_dma_virt_addr_ch2 = pci_alloc_consistent(dev-&gt;pci,</div><div class='add'>+			dev-&gt;upstream_riscbuf_size_ch2, &amp;dma_addr);</div><div class='ctx'> 	dev-&gt;_dma_virt_start_addr_ch2 = dev-&gt;_dma_virt_addr_ch2;</div><div class='ctx'> 	dev-&gt;_dma_phys_start_addr_ch2 = dma_addr;</div><div class='ctx'> 	dev-&gt;_dma_phys_addr_ch2 = dma_addr;</div><div class='hunk'>@@ -485,9 +476,8 @@ static int cx25821_upstream_buffer_prepare_ch2(struct cx25821_dev *dev,</div><div class='ctx'> 				    dev-&gt;_data_buf_phys_addr_ch2);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* For Video Data buffer allocation */</div><div class='del'>-	dev-&gt;_data_buf_virt_addr_ch2 =</div><div class='del'>-	    pci_alloc_consistent(dev-&gt;pci, dev-&gt;upstream_databuf_size_ch2,</div><div class='del'>-				 &amp;data_dma_addr);</div><div class='add'>+	dev-&gt;_data_buf_virt_addr_ch2 = pci_alloc_consistent(dev-&gt;pci,</div><div class='add'>+			dev-&gt;upstream_databuf_size_ch2, &amp;data_dma_addr);</div><div class='ctx'> 	dev-&gt;_data_buf_phys_addr_ch2 = data_dma_addr;</div><div class='ctx'> 	dev-&gt;_data_buf_size_ch2 = dev-&gt;upstream_databuf_size_ch2;</div><div class='ctx'> </div><div class='hunk'>@@ -563,8 +553,8 @@ int cx25821_video_upstream_irq_ch2(struct cx25821_dev *dev, int chan_num,</div><div class='ctx'> 				else</div><div class='ctx'> 					line_size_in_bytes = Y422_LINE_SZ;</div><div class='ctx'> 				risc_phys_jump_addr =</div><div class='del'>-				    dev-&gt;_dma_phys_start_addr_ch2 +</div><div class='del'>-				    odd_risc_prog_size;</div><div class='add'>+					dev-&gt;_dma_phys_start_addr_ch2 +</div><div class='add'>+					odd_risc_prog_size;</div><div class='ctx'> </div><div class='ctx'> 				rp = cx25821_update_riscprogram_ch2(dev,</div><div class='ctx'> 						dev-&gt;_dma_virt_start_addr_ch2,</div><div class='hunk'>@@ -612,11 +602,9 @@ static irqreturn_t cx25821_upstream_irq_ch2(int irq, void *dev_id)</div><div class='ctx'> 	vid_status = cx_read(sram_ch-&gt;int_stat);</div><div class='ctx'> </div><div class='ctx'> 	/* Only deal with our interrupt */</div><div class='del'>-	if (vid_status) {</div><div class='del'>-		handled =</div><div class='del'>-		    cx25821_video_upstream_irq_ch2(dev, channel_num,</div><div class='del'>-						   vid_status);</div><div class='del'>-	}</div><div class='add'>+	if (vid_status)</div><div class='add'>+		handled = cx25821_video_upstream_irq_ch2(dev, channel_num,</div><div class='add'>+				vid_status);</div><div class='ctx'> </div><div class='ctx'> 	if (handled &lt; 0)</div><div class='ctx'> 		cx25821_stop_upstream_video_ch2(dev);</div><div class='hunk'>@@ -691,8 +679,7 @@ int cx25821_start_video_dma_upstream_ch2(struct cx25821_dev *dev,</div><div class='ctx'> 	tmp = cx_read(sram_ch-&gt;int_msk);</div><div class='ctx'> 	cx_write(sram_ch-&gt;int_msk, tmp |= _intr_msk);</div><div class='ctx'> </div><div class='del'>-	err =</div><div class='del'>-	    request_irq(dev-&gt;pci-&gt;irq, cx25821_upstream_irq_ch2,</div><div class='add'>+	err = request_irq(dev-&gt;pci-&gt;irq, cx25821_upstream_irq_ch2,</div><div class='ctx'> 			IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		pr_err("%s: can't get upstream IRQ %d\n",</div><div class='hunk'>@@ -752,45 +739,38 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,</div><div class='ctx'> 	dev-&gt;_file_status_ch2 = RESET_STATUS;</div><div class='ctx'> 	dev-&gt;_lines_count_ch2 = dev-&gt;_isNTSC_ch2 ? 480 : 576;</div><div class='ctx'> 	dev-&gt;_pixel_format_ch2 = pixel_format;</div><div class='del'>-	dev-&gt;_line_size_ch2 =</div><div class='del'>-	    (dev-&gt;_pixel_format_ch2 ==</div><div class='del'>-	     PIXEL_FRMT_422) ? (WIDTH_D1 * 2) : (WIDTH_D1 * 3) / 2;</div><div class='add'>+	dev-&gt;_line_size_ch2 = (dev-&gt;_pixel_format_ch2 == PIXEL_FRMT_422) ?</div><div class='add'>+		(WIDTH_D1 * 2) : (WIDTH_D1 * 3) / 2;</div><div class='ctx'> 	data_frame_size = dev-&gt;_isNTSC_ch2 ? NTSC_DATA_BUF_SZ : PAL_DATA_BUF_SZ;</div><div class='del'>-	risc_buffer_size =</div><div class='del'>-	    dev-&gt;_isNTSC_ch2 ? NTSC_RISC_BUF_SIZE : PAL_RISC_BUF_SIZE;</div><div class='add'>+	risc_buffer_size = dev-&gt;_isNTSC_ch2 ?</div><div class='add'>+		NTSC_RISC_BUF_SIZE : PAL_RISC_BUF_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;input_filename_ch2) {</div><div class='ctx'> 		str_length = strlen(dev-&gt;input_filename_ch2);</div><div class='del'>-		dev-&gt;_filename_ch2 = kmalloc(str_length + 1, GFP_KERNEL);</div><div class='add'>+		dev-&gt;_filename_ch2 = kmemdup(dev-&gt;input_filename_ch2,</div><div class='add'>+					     str_length + 1, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 		if (!dev-&gt;_filename_ch2)</div><div class='ctx'> 			goto error;</div><div class='del'>-</div><div class='del'>-		memcpy(dev-&gt;_filename_ch2, dev-&gt;input_filename_ch2,</div><div class='del'>-		       str_length + 1);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		str_length = strlen(dev-&gt;_defaultname_ch2);</div><div class='del'>-		dev-&gt;_filename_ch2 = kmalloc(str_length + 1, GFP_KERNEL);</div><div class='add'>+		dev-&gt;_filename_ch2 = kmemdup(dev-&gt;_defaultname_ch2,</div><div class='add'>+					     str_length + 1, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 		if (!dev-&gt;_filename_ch2)</div><div class='ctx'> 			goto error;</div><div class='del'>-</div><div class='del'>-		memcpy(dev-&gt;_filename_ch2, dev-&gt;_defaultname_ch2,</div><div class='del'>-		       str_length + 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Default if filename is empty string */</div><div class='ctx'> 	if (strcmp(dev-&gt;input_filename_ch2, "") == 0) {</div><div class='ctx'> 		if (dev-&gt;_isNTSC_ch2) {</div><div class='del'>-			dev-&gt;_filename_ch2 =</div><div class='del'>-			    (dev-&gt;_pixel_format_ch2 ==</div><div class='del'>-			     PIXEL_FRMT_411) ? "/root/vid411.yuv" :</div><div class='del'>-			    "/root/vidtest.yuv";</div><div class='add'>+			dev-&gt;_filename_ch2 = (dev-&gt;_pixel_format_ch2 ==</div><div class='add'>+				PIXEL_FRMT_411) ? "/root/vid411.yuv" :</div><div class='add'>+				"/root/vidtest.yuv";</div><div class='ctx'> 		} else {</div><div class='del'>-			dev-&gt;_filename_ch2 =</div><div class='del'>-			    (dev-&gt;_pixel_format_ch2 ==</div><div class='del'>-			     PIXEL_FRMT_411) ? "/root/pal411.yuv" :</div><div class='del'>-			    "/root/pal422.yuv";</div><div class='add'>+			dev-&gt;_filename_ch2 = (dev-&gt;_pixel_format_ch2 ==</div><div class='add'>+				PIXEL_FRMT_411) ? "/root/pal411.yuv" :</div><div class='add'>+				"/root/pal422.yuv";</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cx25821/cx25821-video-upstream.c b/drivers/media/video/cx25821/cx25821-video-upstream.c<br/>index c0b80068f468..21e7d657f049 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-video-upstream.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-video-upstream.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-video-upstream.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx25821/cx25821-video-upstream.c</a></div><div class='hunk'>@@ -136,7 +136,7 @@ static __le32 *cx25821_risc_field_upstream(struct cx25821_dev *dev, __le32 * rp,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int line, i;</div><div class='ctx'> 	struct sram_channel *sram_ch =</div><div class='del'>-	   dev-&gt;channels[dev-&gt;_channel_upstream_select].sram_channels;</div><div class='add'>+		dev-&gt;channels[dev-&gt;_channel_upstream_select].sram_channels;</div><div class='ctx'> 	int dist_betwn_starts = bpl * 2;</div><div class='ctx'> </div><div class='ctx'> 	/* sync instruction */</div><div class='hunk'>@@ -194,15 +194,12 @@ int cx25821_risc_buffer_upstream(struct cx25821_dev *dev,</div><div class='ctx'> 	if (dev-&gt;_isNTSC) {</div><div class='ctx'> 		odd_num_lines = singlefield_lines + 1;</div><div class='ctx'> 		risc_program_size = FRAME1_VID_PROG_SIZE;</div><div class='del'>-		frame_size =</div><div class='del'>-		    (bpl ==</div><div class='del'>-		     Y411_LINE_SZ) ? FRAME_SIZE_NTSC_Y411 :</div><div class='del'>-		    FRAME_SIZE_NTSC_Y422;</div><div class='add'>+		frame_size = (bpl == Y411_LINE_SZ) ?</div><div class='add'>+			FRAME_SIZE_NTSC_Y411 : FRAME_SIZE_NTSC_Y422;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		risc_program_size = PAL_VID_PROG_SIZE;</div><div class='del'>-		frame_size =</div><div class='del'>-		    (bpl ==</div><div class='del'>-		     Y411_LINE_SZ) ? FRAME_SIZE_PAL_Y411 : FRAME_SIZE_PAL_Y422;</div><div class='add'>+		frame_size = (bpl == Y411_LINE_SZ) ?</div><div class='add'>+			FRAME_SIZE_PAL_Y411 : FRAME_SIZE_PAL_Y422;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Virtual address of Risc buffer program */</div><div class='hunk'>@@ -214,13 +211,9 @@ int cx25821_risc_buffer_upstream(struct cx25821_dev *dev,</div><div class='ctx'> 		if (UNSET != top_offset) {</div><div class='ctx'> 			fifo_enable = (frame == 0) ? FIFO_ENABLE : FIFO_DISABLE;</div><div class='ctx'> 			rp = cx25821_risc_field_upstream(dev, rp,</div><div class='del'>-							 dev-&gt;</div><div class='del'>-							 _data_buf_phys_addr +</div><div class='del'>-							 databuf_offset,</div><div class='del'>-							 top_offset, 0, bpl,</div><div class='del'>-							 odd_num_lines,</div><div class='del'>-							 fifo_enable,</div><div class='del'>-							 ODD_FIELD);</div><div class='add'>+					dev-&gt;_data_buf_phys_addr +</div><div class='add'>+					databuf_offset, top_offset, 0, bpl,</div><div class='add'>+					odd_num_lines, fifo_enable, ODD_FIELD);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		fifo_enable = FIFO_DISABLE;</div><div class='hunk'>@@ -234,8 +227,8 @@ int cx25821_risc_buffer_upstream(struct cx25821_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 		if (frame == 0) {</div><div class='ctx'> 			risc_flag = RISC_CNT_RESET;</div><div class='del'>-			risc_phys_jump_addr =</div><div class='del'>-			    dev-&gt;_dma_phys_start_addr + risc_program_size;</div><div class='add'>+			risc_phys_jump_addr = dev-&gt;_dma_phys_start_addr +</div><div class='add'>+				risc_program_size;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			risc_phys_jump_addr = dev-&gt;_dma_phys_start_addr;</div><div class='ctx'> 			risc_flag = RISC_CNT_INC;</div><div class='hunk'>@@ -255,7 +248,7 @@ int cx25821_risc_buffer_upstream(struct cx25821_dev *dev,</div><div class='ctx'> void cx25821_stop_upstream_video_ch1(struct cx25821_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sram_channel *sram_ch =</div><div class='del'>-	   dev-&gt;channels[VID_UPSTREAM_SRAM_CHANNEL_I].sram_channels;</div><div class='add'>+		dev-&gt;channels[VID_UPSTREAM_SRAM_CHANNEL_I].sram_channels;</div><div class='ctx'> 	u32 tmp = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;_is_running) {</div><div class='hunk'>@@ -312,9 +305,8 @@ int cx25821_get_frame(struct cx25821_dev *dev, struct sram_channel *sram_ch)</div><div class='ctx'> 	struct file *myfile;</div><div class='ctx'> 	int frame_index_temp = dev-&gt;_frame_index;</div><div class='ctx'> 	int i = 0;</div><div class='del'>-	int line_size =</div><div class='del'>-	    (dev-&gt;_pixel_format ==</div><div class='del'>-	     PIXEL_FRMT_411) ? Y411_LINE_SZ : Y422_LINE_SZ;</div><div class='add'>+	int line_size = (dev-&gt;_pixel_format == PIXEL_FRMT_411) ?</div><div class='add'>+		Y411_LINE_SZ : Y422_LINE_SZ;</div><div class='ctx'> 	int frame_size = 0;</div><div class='ctx'> 	int frame_offset = 0;</div><div class='ctx'> 	ssize_t vfs_read_retval = 0;</div><div class='hunk'>@@ -326,16 +318,12 @@ int cx25821_get_frame(struct cx25821_dev *dev, struct sram_channel *sram_ch)</div><div class='ctx'> 	if (dev-&gt;_file_status == END_OF_FILE)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;_isNTSC) {</div><div class='del'>-		frame_size =</div><div class='del'>-		    (line_size ==</div><div class='del'>-		     Y411_LINE_SZ) ? FRAME_SIZE_NTSC_Y411 :</div><div class='del'>-		    FRAME_SIZE_NTSC_Y422;</div><div class='del'>-	} else {</div><div class='del'>-		frame_size =</div><div class='del'>-		    (line_size ==</div><div class='del'>-		     Y411_LINE_SZ) ? FRAME_SIZE_PAL_Y411 : FRAME_SIZE_PAL_Y422;</div><div class='del'>-	}</div><div class='add'>+	if (dev-&gt;_isNTSC)</div><div class='add'>+		frame_size = (line_size == Y411_LINE_SZ) ?</div><div class='add'>+			FRAME_SIZE_NTSC_Y411 : FRAME_SIZE_NTSC_Y422;</div><div class='add'>+	else</div><div class='add'>+		frame_size = (line_size == Y411_LINE_SZ) ?</div><div class='add'>+			FRAME_SIZE_PAL_Y411 : FRAME_SIZE_PAL_Y422;</div><div class='ctx'> </div><div class='ctx'> 	frame_offset = (frame_index_temp &gt; 0) ? frame_size : 0;</div><div class='ctx'> 	file_offset = dev-&gt;_frame_count * frame_size;</div><div class='hunk'>@@ -369,8 +357,8 @@ int cx25821_get_frame(struct cx25821_dev *dev, struct sram_channel *sram_ch)</div><div class='ctx'> 		for (i = 0; i &lt; dev-&gt;_lines_count; i++) {</div><div class='ctx'> 			pos = file_offset;</div><div class='ctx'> </div><div class='del'>-			vfs_read_retval =</div><div class='del'>-			    vfs_read(myfile, mybuf, line_size, &amp;pos);</div><div class='add'>+			vfs_read_retval = vfs_read(myfile, mybuf, line_size,</div><div class='add'>+					&amp;pos);</div><div class='ctx'> </div><div class='ctx'> 			if (vfs_read_retval &gt; 0 &amp;&amp; vfs_read_retval == line_size</div><div class='ctx'> 			    &amp;&amp; dev-&gt;_data_buf_virt_addr != NULL) {</div><div class='hunk'>@@ -392,8 +380,8 @@ int cx25821_get_frame(struct cx25821_dev *dev, struct sram_channel *sram_ch)</div><div class='ctx'> 		if (i &gt; 0)</div><div class='ctx'> 			dev-&gt;_frame_count++;</div><div class='ctx'> </div><div class='del'>-		dev-&gt;_file_status =</div><div class='del'>-		    (vfs_read_retval == line_size) ? IN_PROGRESS : END_OF_FILE;</div><div class='add'>+		dev-&gt;_file_status = (vfs_read_retval == line_size) ?</div><div class='add'>+			IN_PROGRESS : END_OF_FILE;</div><div class='ctx'> </div><div class='ctx'> 		set_fs(old_fs);</div><div class='ctx'> 		filp_close(myfile, NULL);</div><div class='hunk'>@@ -404,8 +392,8 @@ int cx25821_get_frame(struct cx25821_dev *dev, struct sram_channel *sram_ch)</div><div class='ctx'> </div><div class='ctx'> static void cx25821_vidups_handler(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct cx25821_dev *dev =</div><div class='del'>-	    container_of(work, struct cx25821_dev, _irq_work_entry);</div><div class='add'>+	struct cx25821_dev *dev = container_of(work, struct cx25821_dev,</div><div class='add'>+			_irq_work_entry);</div><div class='ctx'> </div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		pr_err("ERROR %s(): since container_of(work_struct) FAILED!\n",</div><div class='hunk'>@@ -413,18 +401,16 @@ static void cx25821_vidups_handler(struct work_struct *work)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cx25821_get_frame(dev,</div><div class='del'>-			 dev-&gt;channels[dev-&gt;_channel_upstream_select].</div><div class='del'>-					       sram_channels);</div><div class='add'>+	cx25821_get_frame(dev, dev-&gt;channels[dev-&gt;_channel_upstream_select].</div><div class='add'>+			sram_channels);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cx25821_openfile(struct cx25821_dev *dev, struct sram_channel *sram_ch)</div><div class='ctx'> {</div><div class='ctx'> 	struct file *myfile;</div><div class='ctx'> 	int i = 0, j = 0;</div><div class='del'>-	int line_size =</div><div class='del'>-	    (dev-&gt;_pixel_format ==</div><div class='del'>-	     PIXEL_FRMT_411) ? Y411_LINE_SZ : Y422_LINE_SZ;</div><div class='add'>+	int line_size = (dev-&gt;_pixel_format == PIXEL_FRMT_411) ?</div><div class='add'>+		Y411_LINE_SZ : Y422_LINE_SZ;</div><div class='ctx'> 	ssize_t vfs_read_retval = 0;</div><div class='ctx'> 	char mybuf[line_size];</div><div class='ctx'> 	loff_t pos;</div><div class='hunk'>@@ -461,8 +447,8 @@ int cx25821_openfile(struct cx25821_dev *dev, struct sram_channel *sram_ch)</div><div class='ctx'> 			for (i = 0; i &lt; dev-&gt;_lines_count; i++) {</div><div class='ctx'> 				pos = offset;</div><div class='ctx'> </div><div class='del'>-				vfs_read_retval =</div><div class='del'>-				    vfs_read(myfile, mybuf, line_size, &amp;pos);</div><div class='add'>+				vfs_read_retval = vfs_read(myfile, mybuf,</div><div class='add'>+						line_size, &amp;pos);</div><div class='ctx'> </div><div class='ctx'> 				if (vfs_read_retval &gt; 0</div><div class='ctx'> 				    &amp;&amp; vfs_read_retval == line_size</div><div class='hunk'>@@ -489,8 +475,8 @@ int cx25821_openfile(struct cx25821_dev *dev, struct sram_channel *sram_ch)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dev-&gt;_file_status =</div><div class='del'>-		    (vfs_read_retval == line_size) ? IN_PROGRESS : END_OF_FILE;</div><div class='add'>+		dev-&gt;_file_status = (vfs_read_retval == line_size) ?</div><div class='add'>+			IN_PROGRESS : END_OF_FILE;</div><div class='ctx'> </div><div class='ctx'> 		set_fs(old_fs);</div><div class='ctx'> 		myfile-&gt;f_pos = 0;</div><div class='hunk'>@@ -507,14 +493,12 @@ int cx25821_upstream_buffer_prepare(struct cx25821_dev *dev,</div><div class='ctx'> 	dma_addr_t dma_addr;</div><div class='ctx'> 	dma_addr_t data_dma_addr;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;_dma_virt_addr != NULL) {</div><div class='add'>+	if (dev-&gt;_dma_virt_addr != NULL)</div><div class='ctx'> 		pci_free_consistent(dev-&gt;pci, dev-&gt;upstream_riscbuf_size,</div><div class='del'>-				    dev-&gt;_dma_virt_addr, dev-&gt;_dma_phys_addr);</div><div class='del'>-	}</div><div class='add'>+				dev-&gt;_dma_virt_addr, dev-&gt;_dma_phys_addr);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;_dma_virt_addr =</div><div class='del'>-	    pci_alloc_consistent(dev-&gt;pci, dev-&gt;upstream_riscbuf_size,</div><div class='del'>-				 &amp;dma_addr);</div><div class='add'>+	dev-&gt;_dma_virt_addr = pci_alloc_consistent(dev-&gt;pci,</div><div class='add'>+			dev-&gt;upstream_riscbuf_size, &amp;dma_addr);</div><div class='ctx'> 	dev-&gt;_dma_virt_start_addr = dev-&gt;_dma_virt_addr;</div><div class='ctx'> 	dev-&gt;_dma_phys_start_addr = dma_addr;</div><div class='ctx'> 	dev-&gt;_dma_phys_addr = dma_addr;</div><div class='hunk'>@@ -528,15 +512,13 @@ int cx25821_upstream_buffer_prepare(struct cx25821_dev *dev,</div><div class='ctx'> 	/* Clear memory at address */</div><div class='ctx'> 	memset(dev-&gt;_dma_virt_addr, 0, dev-&gt;_risc_size);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;_data_buf_virt_addr != NULL) {</div><div class='add'>+	if (dev-&gt;_data_buf_virt_addr != NULL)</div><div class='ctx'> 		pci_free_consistent(dev-&gt;pci, dev-&gt;upstream_databuf_size,</div><div class='del'>-				    dev-&gt;_data_buf_virt_addr,</div><div class='del'>-				    dev-&gt;_data_buf_phys_addr);</div><div class='del'>-	}</div><div class='add'>+				dev-&gt;_data_buf_virt_addr,</div><div class='add'>+				dev-&gt;_data_buf_phys_addr);</div><div class='ctx'> 	/* For Video Data buffer allocation */</div><div class='del'>-	dev-&gt;_data_buf_virt_addr =</div><div class='del'>-	    pci_alloc_consistent(dev-&gt;pci, dev-&gt;upstream_databuf_size,</div><div class='del'>-				 &amp;data_dma_addr);</div><div class='add'>+	dev-&gt;_data_buf_virt_addr = pci_alloc_consistent(dev-&gt;pci,</div><div class='add'>+			dev-&gt;upstream_databuf_size, &amp;data_dma_addr);</div><div class='ctx'> 	dev-&gt;_data_buf_phys_addr = data_dma_addr;</div><div class='ctx'> 	dev-&gt;_data_buf_size = dev-&gt;upstream_databuf_size;</div><div class='ctx'> </div><div class='hunk'>@@ -553,9 +535,8 @@ int cx25821_upstream_buffer_prepare(struct cx25821_dev *dev,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Create RISC programs */</div><div class='del'>-	ret =</div><div class='del'>-	    cx25821_risc_buffer_upstream(dev, dev-&gt;pci, 0, bpl,</div><div class='del'>-					 dev-&gt;_lines_count);</div><div class='add'>+	ret = cx25821_risc_buffer_upstream(dev, dev-&gt;pci, 0, bpl,</div><div class='add'>+			dev-&gt;_lines_count);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		pr_info("Failed creating Video Upstream Risc programs!\n");</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -672,10 +653,9 @@ static irqreturn_t cx25821_upstream_irq(int irq, void *dev_id)</div><div class='ctx'> 	vid_status = cx_read(sram_ch-&gt;int_stat);</div><div class='ctx'> </div><div class='ctx'> 	/* Only deal with our interrupt */</div><div class='del'>-	if (vid_status) {</div><div class='del'>-		handled =</div><div class='del'>-		    cx25821_video_upstream_irq(dev, channel_num, vid_status);</div><div class='del'>-	}</div><div class='add'>+	if (vid_status)</div><div class='add'>+		handled = cx25821_video_upstream_irq(dev, channel_num,</div><div class='add'>+				vid_status);</div><div class='ctx'> </div><div class='ctx'> 	if (handled &lt; 0)</div><div class='ctx'> 		cx25821_stop_upstream_video_ch1(dev);</div><div class='hunk'>@@ -747,8 +727,7 @@ int cx25821_start_video_dma_upstream(struct cx25821_dev *dev,</div><div class='ctx'> 	tmp = cx_read(sram_ch-&gt;int_msk);</div><div class='ctx'> 	cx_write(sram_ch-&gt;int_msk, tmp |= _intr_msk);</div><div class='ctx'> </div><div class='del'>-	err =</div><div class='del'>-	    request_irq(dev-&gt;pci-&gt;irq, cx25821_upstream_irq,</div><div class='add'>+	err = request_irq(dev-&gt;pci-&gt;irq, cx25821_upstream_irq,</div><div class='ctx'> 			IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		pr_err("%s: can't get upstream IRQ %d\n",</div><div class='hunk'>@@ -807,43 +786,38 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select,</div><div class='ctx'> 	dev-&gt;_file_status = RESET_STATUS;</div><div class='ctx'> 	dev-&gt;_lines_count = dev-&gt;_isNTSC ? 480 : 576;</div><div class='ctx'> 	dev-&gt;_pixel_format = pixel_format;</div><div class='del'>-	dev-&gt;_line_size =</div><div class='del'>-	    (dev-&gt;_pixel_format ==</div><div class='del'>-	     PIXEL_FRMT_422) ? (WIDTH_D1 * 2) : (WIDTH_D1 * 3) / 2;</div><div class='add'>+	dev-&gt;_line_size = (dev-&gt;_pixel_format == PIXEL_FRMT_422) ?</div><div class='add'>+		(WIDTH_D1 * 2) : (WIDTH_D1 * 3) / 2;</div><div class='ctx'> 	data_frame_size = dev-&gt;_isNTSC ? NTSC_DATA_BUF_SZ : PAL_DATA_BUF_SZ;</div><div class='del'>-	risc_buffer_size =</div><div class='del'>-	    dev-&gt;_isNTSC ? NTSC_RISC_BUF_SIZE : PAL_RISC_BUF_SIZE;</div><div class='add'>+	risc_buffer_size = dev-&gt;_isNTSC ?</div><div class='add'>+		NTSC_RISC_BUF_SIZE : PAL_RISC_BUF_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;input_filename) {</div><div class='ctx'> 		str_length = strlen(dev-&gt;input_filename);</div><div class='del'>-		dev-&gt;_filename = kmalloc(str_length + 1, GFP_KERNEL);</div><div class='add'>+		dev-&gt;_filename = kmemdup(dev-&gt;input_filename, str_length + 1,</div><div class='add'>+					 GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 		if (!dev-&gt;_filename)</div><div class='ctx'> 			goto error;</div><div class='del'>-</div><div class='del'>-		memcpy(dev-&gt;_filename, dev-&gt;input_filename, str_length + 1);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		str_length = strlen(dev-&gt;_defaultname);</div><div class='del'>-		dev-&gt;_filename = kmalloc(str_length + 1, GFP_KERNEL);</div><div class='add'>+		dev-&gt;_filename = kmemdup(dev-&gt;_defaultname, str_length + 1,</div><div class='add'>+					 GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 		if (!dev-&gt;_filename)</div><div class='ctx'> 			goto error;</div><div class='del'>-</div><div class='del'>-		memcpy(dev-&gt;_filename, dev-&gt;_defaultname, str_length + 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Default if filename is empty string */</div><div class='ctx'> 	if (strcmp(dev-&gt;input_filename, "") == 0) {</div><div class='ctx'> 		if (dev-&gt;_isNTSC) {</div><div class='ctx'> 			dev-&gt;_filename =</div><div class='del'>-			    (dev-&gt;_pixel_format ==</div><div class='del'>-			     PIXEL_FRMT_411) ? "/root/vid411.yuv" :</div><div class='del'>-			    "/root/vidtest.yuv";</div><div class='add'>+				(dev-&gt;_pixel_format == PIXEL_FRMT_411) ?</div><div class='add'>+				"/root/vid411.yuv" : "/root/vidtest.yuv";</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dev-&gt;_filename =</div><div class='del'>-			    (dev-&gt;_pixel_format ==</div><div class='del'>-			     PIXEL_FRMT_411) ? "/root/pal411.yuv" :</div><div class='del'>-			    "/root/pal422.yuv";</div><div class='add'>+				(dev-&gt;_pixel_format == PIXEL_FRMT_411) ?</div><div class='add'>+				"/root/pal411.yuv" : "/root/pal422.yuv";</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -852,13 +826,11 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select,</div><div class='ctx'> 	dev-&gt;_file_status = RESET_STATUS;</div><div class='ctx'> 	dev-&gt;_lines_count = dev-&gt;_isNTSC ? 480 : 576;</div><div class='ctx'> 	dev-&gt;_pixel_format = pixel_format;</div><div class='del'>-	dev-&gt;_line_size =</div><div class='del'>-	    (dev-&gt;_pixel_format ==</div><div class='del'>-	     PIXEL_FRMT_422) ? (WIDTH_D1 * 2) : (WIDTH_D1 * 3) / 2;</div><div class='add'>+	dev-&gt;_line_size = (dev-&gt;_pixel_format == PIXEL_FRMT_422) ?</div><div class='add'>+		(WIDTH_D1 * 2) : (WIDTH_D1 * 3) / 2;</div><div class='ctx'> </div><div class='del'>-	retval =</div><div class='del'>-	    cx25821_sram_channel_setup_upstream(dev, sram_ch, dev-&gt;_line_size,</div><div class='del'>-						0);</div><div class='add'>+	retval = cx25821_sram_channel_setup_upstream(dev, sram_ch,</div><div class='add'>+			dev-&gt;_line_size, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* setup fifo + format */</div><div class='ctx'> 	cx25821_set_pixelengine(dev, sram_ch, dev-&gt;_pixel_format);</div><div class='head'>diff --git a/drivers/media/video/cx25821/cx25821-video.c b/drivers/media/video/cx25821/cx25821-video.c<br/>index 4d6907cda75b..ffd8bc79c02e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-video.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821-video.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821-video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx25821/cx25821-video.c</a></div><div class='hunk'>@@ -118,12 +118,12 @@ void cx25821_dump_video_queue(struct cx25821_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (!list_empty(&amp;q-&gt;active)) {</div><div class='ctx'> 		list_for_each(item, &amp;q-&gt;active)</div><div class='del'>-		    buf = list_entry(item, struct cx25821_buffer, vb.queue);</div><div class='add'>+			buf = list_entry(item, struct cx25821_buffer, vb.queue);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!list_empty(&amp;q-&gt;queued)) {</div><div class='ctx'> 		list_for_each(item, &amp;q-&gt;queued)</div><div class='del'>-		    buf = list_entry(item, struct cx25821_buffer, vb.queue);</div><div class='add'>+			buf = list_entry(item, struct cx25821_buffer, vb.queue);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -140,8 +140,8 @@ void cx25821_video_wakeup(struct cx25821_dev *dev, struct cx25821_dmaqueue *q,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		buf =</div><div class='del'>-		    list_entry(q-&gt;active.next, struct cx25821_buffer, vb.queue);</div><div class='add'>+		buf = list_entry(q-&gt;active.next, struct cx25821_buffer,</div><div class='add'>+				vb.queue);</div><div class='ctx'> </div><div class='ctx'> 		/* count comes from the hw and it is 16bit wide --</div><div class='ctx'> 		 * this trick handles wrap-arounds correctly for</div><div class='hunk'>@@ -318,8 +318,8 @@ int cx25821_restart_video_queue(struct cx25821_dev *dev,</div><div class='ctx'> 	struct list_head *item;</div><div class='ctx'> </div><div class='ctx'> 	if (!list_empty(&amp;q-&gt;active)) {</div><div class='del'>-		buf =</div><div class='del'>-		    list_entry(q-&gt;active.next, struct cx25821_buffer, vb.queue);</div><div class='add'>+		buf = list_entry(q-&gt;active.next, struct cx25821_buffer,</div><div class='add'>+				vb.queue);</div><div class='ctx'> </div><div class='ctx'> 		cx25821_start_video_dma(dev, q, buf, channel);</div><div class='ctx'> </div><div class='hunk'>@@ -337,8 +337,8 @@ int cx25821_restart_video_queue(struct cx25821_dev *dev,</div><div class='ctx'> 		if (list_empty(&amp;q-&gt;queued))</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		buf =</div><div class='del'>-		    list_entry(q-&gt;queued.next, struct cx25821_buffer, vb.queue);</div><div class='add'>+		buf = list_entry(q-&gt;queued.next, struct cx25821_buffer,</div><div class='add'>+				vb.queue);</div><div class='ctx'> </div><div class='ctx'> 		if (NULL == prev) {</div><div class='ctx'> 			list_move_tail(&amp;buf-&gt;vb.queue, &amp;q-&gt;active);</div><div class='hunk'>@@ -375,8 +375,8 @@ void cx25821_vid_timeout(unsigned long data)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;dev-&gt;slock, flags);</div><div class='ctx'> 	while (!list_empty(&amp;q-&gt;active)) {</div><div class='del'>-		buf =</div><div class='del'>-		    list_entry(q-&gt;active.next, struct cx25821_buffer, vb.queue);</div><div class='add'>+		buf = list_entry(q-&gt;active.next, struct cx25821_buffer,</div><div class='add'>+				vb.queue);</div><div class='ctx'> 		list_del(&amp;buf-&gt;vb.queue);</div><div class='ctx'> </div><div class='ctx'> 		buf-&gt;vb.state = VIDEOBUF_ERROR;</div><div class='hunk'>@@ -484,8 +484,7 @@ int cx25821_video_register(struct cx25821_dev *dev)</div><div class='ctx'> 		cx25821_init_controls(dev, i);</div><div class='ctx'> </div><div class='ctx'> 		cx25821_risc_stopper(dev-&gt;pci, &amp;dev-&gt;channels[i].vidq.stopper,</div><div class='del'>-				dev-&gt;channels[i].sram_channels-&gt;dma_ctl,</div><div class='del'>-				0x11, 0);</div><div class='add'>+			dev-&gt;channels[i].sram_channels-&gt;dma_ctl, 0x11, 0);</div><div class='ctx'> </div><div class='ctx'> 		dev-&gt;channels[i].sram_channels = &amp;cx25821_sram_channels[i];</div><div class='ctx'> 		dev-&gt;channels[i].video_dev = NULL;</div><div class='hunk'>@@ -499,15 +498,14 @@ int cx25821_video_register(struct cx25821_dev *dev)</div><div class='ctx'> 		dev-&gt;channels[i].timeout_data.dev = dev;</div><div class='ctx'> 		dev-&gt;channels[i].timeout_data.channel =</div><div class='ctx'> 			&amp;cx25821_sram_channels[i];</div><div class='del'>-		dev-&gt;channels[i].vidq.timeout.function =</div><div class='del'>-			cx25821_vid_timeout;</div><div class='add'>+		dev-&gt;channels[i].vidq.timeout.function = cx25821_vid_timeout;</div><div class='ctx'> 		dev-&gt;channels[i].vidq.timeout.data =</div><div class='ctx'> 			(unsigned long)&amp;dev-&gt;channels[i].timeout_data;</div><div class='ctx'> 		init_timer(&amp;dev-&gt;channels[i].vidq.timeout);</div><div class='ctx'> </div><div class='ctx'> 		/* register v4l devices */</div><div class='del'>-		dev-&gt;channels[i].video_dev = cx25821_vdev_init(dev,</div><div class='del'>-				dev-&gt;pci, &amp;cx25821_video_device, "video");</div><div class='add'>+		dev-&gt;channels[i].video_dev = cx25821_vdev_init(dev, dev-&gt;pci,</div><div class='add'>+				&amp;cx25821_video_device, "video");</div><div class='ctx'> </div><div class='ctx'> 		err = video_register_device(dev-&gt;channels[i].video_dev,</div><div class='ctx'> 				VFL_TYPE_GRABBER, video_nr[dev-&gt;nr]);</div><div class='hunk'>@@ -528,7 +526,6 @@ int cx25821_video_register(struct cx25821_dev *dev)</div><div class='ctx'> #endif</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;lock);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail_unreg:</div><div class='hunk'>@@ -558,7 +555,7 @@ int cx25821_buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,</div><div class='ctx'> 	struct cx25821_fh *fh = q-&gt;priv_data;</div><div class='ctx'> 	struct cx25821_dev *dev = fh-&gt;dev;</div><div class='ctx'> 	struct cx25821_buffer *buf =</div><div class='del'>-	    container_of(vb, struct cx25821_buffer, vb);</div><div class='add'>+		container_of(vb, struct cx25821_buffer, vb);</div><div class='ctx'> 	int rc, init_buffer = 0;</div><div class='ctx'> 	u32 line0_offset, line1_offset;</div><div class='ctx'> 	struct videobuf_dmabuf *dma = videobuf_to_dma(&amp;buf-&gt;vb);</div><div class='hunk'>@@ -617,14 +614,13 @@ int cx25821_buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,</div><div class='ctx'> 			if (channel_opened &gt;= 0 &amp;&amp; channel_opened &lt;= 7) {</div><div class='ctx'> 				if (dev-&gt;channels[channel_opened]</div><div class='ctx'> 						.use_cif_resolution) {</div><div class='del'>-					if (dev-&gt;tvnorm &amp; V4L2_STD_PAL_BG</div><div class='del'>-					    || dev-&gt;tvnorm &amp; V4L2_STD_PAL_DK)</div><div class='add'>+					if (dev-&gt;tvnorm &amp; V4L2_STD_PAL_BG ||</div><div class='add'>+					    dev-&gt;tvnorm &amp; V4L2_STD_PAL_DK)</div><div class='ctx'> 						bpl_local = 352 &lt;&lt; 1;</div><div class='ctx'> 					else</div><div class='del'>-						bpl_local =</div><div class='del'>-						 dev-&gt;channels[channel_opened].</div><div class='del'>-						 cif_width &lt;&lt;</div><div class='del'>-						 1;</div><div class='add'>+						bpl_local = dev-&gt;channels[</div><div class='add'>+							channel_opened].</div><div class='add'>+							cif_width &lt;&lt; 1;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -685,7 +681,7 @@ void cx25821_buffer_release(struct videobuf_queue *q,</div><div class='ctx'> 			    struct videobuf_buffer *vb)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx25821_buffer *buf =</div><div class='del'>-	    container_of(vb, struct cx25821_buffer, vb);</div><div class='add'>+		container_of(vb, struct cx25821_buffer, vb);</div><div class='ctx'> </div><div class='ctx'> 	cx25821_free_buffer(q, buf);</div><div class='ctx'> }</div><div class='hunk'>@@ -723,7 +719,7 @@ int cx25821_video_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx25821_buffer *buf =</div><div class='del'>-	   container_of(vb, struct cx25821_buffer, vb);</div><div class='add'>+		container_of(vb, struct cx25821_buffer, vb);</div><div class='ctx'> 	struct cx25821_buffer *prev;</div><div class='ctx'> 	struct cx25821_fh *fh = vq-&gt;priv_data;</div><div class='ctx'> 	struct cx25821_dev *dev = fh-&gt;dev;</div><div class='hunk'>@@ -814,7 +810,7 @@ static int video_open(struct file *file)</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; MAX_VID_CHANNEL_NUM; i++) {</div><div class='ctx'> 			if (h-&gt;channels[i].video_dev &amp;&amp;</div><div class='del'>-			   h-&gt;channels[i].video_dev-&gt;minor == minor) {</div><div class='add'>+			    h-&gt;channels[i].video_dev-&gt;minor == minor) {</div><div class='ctx'> 				dev = h;</div><div class='ctx'> 				ch_id = i;</div><div class='ctx'> 				type  = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='hunk'>@@ -848,11 +844,10 @@ static int video_open(struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	v4l2_prio_open(&amp;dev-&gt;channels[ch_id].prio, &amp;fh-&gt;prio);</div><div class='ctx'> </div><div class='del'>-	videobuf_queue_sg_init(&amp;fh-&gt;vidq, &amp;cx25821_video_qops,</div><div class='del'>-			      &amp;dev-&gt;pci-&gt;dev, &amp;dev-&gt;slock,</div><div class='del'>-			      V4L2_BUF_TYPE_VIDEO_CAPTURE,</div><div class='del'>-			      V4L2_FIELD_INTERLACED,</div><div class='del'>-			      sizeof(struct cx25821_buffer), fh, NULL);</div><div class='add'>+	videobuf_queue_sg_init(&amp;fh-&gt;vidq, &amp;cx25821_video_qops, &amp;dev-&gt;pci-&gt;dev,</div><div class='add'>+			&amp;dev-&gt;slock, V4L2_BUF_TYPE_VIDEO_CAPTURE,</div><div class='add'>+			V4L2_FIELD_INTERLACED, sizeof(struct cx25821_buffer),</div><div class='add'>+			fh, NULL);</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, "post videobuf_queue_init()\n");</div><div class='ctx'> 	mutex_unlock(&amp;cx25821_devlist_mutex);</div><div class='hunk'>@@ -1168,8 +1163,8 @@ int cx25821_vidioc_querycap(struct file *file, void *priv,</div><div class='ctx'> 	strlcpy(cap-&gt;card, cx25821_boards[dev-&gt;board].name, sizeof(cap-&gt;card));</div><div class='ctx'> 	sprintf(cap-&gt;bus_info, "PCIe:%s", pci_name(dev-&gt;pci));</div><div class='ctx'> 	cap-&gt;version = CX25821_VERSION_CODE;</div><div class='del'>-	cap-&gt;capabilities =</div><div class='del'>-	    V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;</div><div class='add'>+	cap-&gt;capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |</div><div class='add'>+		V4L2_CAP_STREAMING;</div><div class='ctx'> 	if (UNSET != dev-&gt;tuner_type)</div><div class='ctx'> 		cap-&gt;capabilities |= V4L2_CAP_TUNER;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1454,38 +1449,38 @@ static const struct v4l2_queryctrl no_ctl = {</div><div class='ctx'> static struct v4l2_queryctrl cx25821_ctls[] = {</div><div class='ctx'> 	/* --- video --- */</div><div class='ctx'> 	{</div><div class='del'>-	 .id = V4L2_CID_BRIGHTNESS,</div><div class='del'>-	 .name = "Brightness",</div><div class='del'>-	 .minimum = 0,</div><div class='del'>-	 .maximum = 10000,</div><div class='del'>-	 .step = 1,</div><div class='del'>-	 .default_value = 6200,</div><div class='del'>-	 .type = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-	 }, {</div><div class='del'>-	     .id = V4L2_CID_CONTRAST,</div><div class='del'>-	     .name = "Contrast",</div><div class='del'>-	     .minimum = 0,</div><div class='del'>-	     .maximum = 10000,</div><div class='del'>-	     .step = 1,</div><div class='del'>-	     .default_value = 5000,</div><div class='del'>-	     .type = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-	     }, {</div><div class='del'>-		 .id = V4L2_CID_SATURATION,</div><div class='del'>-		 .name = "Saturation",</div><div class='del'>-		 .minimum = 0,</div><div class='del'>-		 .maximum = 10000,</div><div class='del'>-		 .step = 1,</div><div class='del'>-		 .default_value = 5000,</div><div class='del'>-		 .type = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-		 }, {</div><div class='del'>-		     .id = V4L2_CID_HUE,</div><div class='del'>-		     .name = "Hue",</div><div class='del'>-		     .minimum = 0,</div><div class='del'>-		     .maximum = 10000,</div><div class='del'>-		     .step = 1,</div><div class='del'>-		     .default_value = 5000,</div><div class='del'>-		     .type = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-		     }</div><div class='add'>+		.id = V4L2_CID_BRIGHTNESS,</div><div class='add'>+		.name = "Brightness",</div><div class='add'>+		.minimum = 0,</div><div class='add'>+		.maximum = 10000,</div><div class='add'>+		.step = 1,</div><div class='add'>+		.default_value = 6200,</div><div class='add'>+		.type = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+	}, {</div><div class='add'>+		.id = V4L2_CID_CONTRAST,</div><div class='add'>+		.name = "Contrast",</div><div class='add'>+		.minimum = 0,</div><div class='add'>+		.maximum = 10000,</div><div class='add'>+		.step = 1,</div><div class='add'>+		.default_value = 5000,</div><div class='add'>+		.type = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+	}, {</div><div class='add'>+		.id = V4L2_CID_SATURATION,</div><div class='add'>+		.name = "Saturation",</div><div class='add'>+		.minimum = 0,</div><div class='add'>+		.maximum = 10000,</div><div class='add'>+		.step = 1,</div><div class='add'>+		.default_value = 5000,</div><div class='add'>+		.type = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+	}, {</div><div class='add'>+		.id = V4L2_CID_HUE,</div><div class='add'>+		.name = "Hue",</div><div class='add'>+		.minimum = 0,</div><div class='add'>+		.maximum = 10000,</div><div class='add'>+		.step = 1,</div><div class='add'>+		.default_value = 5000,</div><div class='add'>+		.type = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> static const int CX25821_CTLS = ARRAY_SIZE(cx25821_ctls);</div><div class='ctx'> </div><div class='hunk'>@@ -1623,7 +1618,8 @@ int cx25821_vidioc_cropcap(struct file *file, void *priv,</div><div class='ctx'> </div><div class='ctx'> 	if (cropcap-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	cropcap-&gt;bounds.top = cropcap-&gt;bounds.left = 0;</div><div class='add'>+	cropcap-&gt;bounds.top = 0;</div><div class='add'>+	cropcap-&gt;bounds.left = 0;</div><div class='ctx'> 	cropcap-&gt;bounds.width = 720;</div><div class='ctx'> 	cropcap-&gt;bounds.height = dev-&gt;tvnorm == V4L2_STD_PAL_BG ? 576 : 480;</div><div class='ctx'> 	cropcap-&gt;pixelaspect.numerator =</div><div class='hunk'>@@ -1829,8 +1825,11 @@ static long video_ioctl_set(struct file *file, unsigned int cmd,</div><div class='ctx'> 	struct downstream_user_struct *data_from_user;</div><div class='ctx'> 	int command;</div><div class='ctx'> 	int width = 720;</div><div class='del'>-	int selected_channel = 0, pix_format = 0, i = 0;</div><div class='del'>-	int cif_enable = 0, cif_width = 0;</div><div class='add'>+	int selected_channel = 0;</div><div class='add'>+	int pix_format = 0;</div><div class='add'>+	int i = 0;</div><div class='add'>+	int cif_enable = 0;</div><div class='add'>+	int cif_width = 0;</div><div class='ctx'> 	u32 value = 0;</div><div class='ctx'> </div><div class='ctx'> 	data_from_user = (struct downstream_user_struct *)arg;</div><div class='hunk'>@@ -1895,8 +1894,8 @@ static long video_ioctl_set(struct file *file, unsigned int cmd,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (selected_channel &lt;= 7 &amp;&amp; selected_channel &gt;= 0) {</div><div class='del'>-			dev-&gt;channels[selected_channel].</div><div class='del'>-				use_cif_resolution = cif_enable;</div><div class='add'>+			dev-&gt;channels[selected_channel].use_cif_resolution =</div><div class='add'>+				cif_enable;</div><div class='ctx'> 			dev-&gt;channels[selected_channel].cif_width = width;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			for (i = 0; i &lt; VID_CHANNEL_NUM; i++) {</div><div class='hunk'>@@ -1932,9 +1931,9 @@ static long video_ioctl_set(struct file *file, unsigned int cmd,</div><div class='ctx'> static long cx25821_video_ioctl(struct file *file,</div><div class='ctx'> 				unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	int  ret = 0;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	struct cx25821_fh  *fh  = file-&gt;private_data;</div><div class='add'>+	struct cx25821_fh *fh = file-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	/* check to see if it's the video upstream */</div><div class='ctx'> 	if (fh-&gt;channel_id == SRAM_CH09) {</div><div class='head'>diff --git a/drivers/media/video/cx25821/cx25821.h b/drivers/media/video/cx25821/cx25821.h<br/>index 2d2d00932823..b9aa801b00a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25821/cx25821.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25821/cx25821.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx25821/cx25821.h</a></div><div class='hunk'>@@ -67,7 +67,7 @@</div><div class='ctx'> #define MAX_CAMERAS             16</div><div class='ctx'> </div><div class='ctx'> /* Max number of inputs by card */</div><div class='del'>-#define MAX_CX25821_INPUT 8</div><div class='add'>+#define MAX_CX25821_INPUT     8</div><div class='ctx'> #define INPUT(nr) (&amp;cx25821_boards[dev-&gt;board].input[nr])</div><div class='ctx'> #define RESOURCE_VIDEO0       1</div><div class='ctx'> #define RESOURCE_VIDEO1       2</div><div class='hunk'>@@ -85,7 +85,7 @@</div><div class='ctx'> </div><div class='ctx'> #define BUFFER_TIMEOUT     (HZ)	/* 0.5 seconds */</div><div class='ctx'> </div><div class='del'>-#define UNKNOWN_BOARD       0</div><div class='add'>+#define UNKNOWN_BOARD        0</div><div class='ctx'> #define CX25821_BOARD        1</div><div class='ctx'> </div><div class='ctx'> /* Currently supported by the driver */</div><div class='head'>diff --git a/drivers/media/video/cx25840/cx25840-audio.c b/drivers/media/video/cx25840/cx25840-audio.c<br/>index 005f11093642..34b96c7cfd62 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25840/cx25840-audio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25840/cx25840-audio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25840/cx25840-audio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx25840/cx25840-audio.c</a></div><div class='hunk'>@@ -480,7 +480,6 @@ void cx25840_audio_set_path(struct i2c_client *client)</div><div class='ctx'> </div><div class='ctx'> static void set_volume(struct i2c_client *client, int volume)</div><div class='ctx'> {</div><div class='del'>-	struct cx25840_state *state = to_state(i2c_get_clientdata(client));</div><div class='ctx'> 	int vol;</div><div class='ctx'> </div><div class='ctx'> 	/* Convert the volume to msp3400 values (0-127) */</div><div class='hunk'>@@ -496,14 +495,7 @@ static void set_volume(struct i2c_client *client, int volume)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* PATH1_VOLUME */</div><div class='del'>-	if (is_cx2388x(state)) {</div><div class='del'>-		/* for cx23885 volume doesn't work,</div><div class='del'>-		 * the calculation always results in</div><div class='del'>-		 * e4 regardless.</div><div class='del'>-		 */</div><div class='del'>-		cx25840_write(client, 0x8d4, volume);</div><div class='del'>-	} else</div><div class='del'>-		cx25840_write(client, 0x8d4, 228 - (vol * 2));</div><div class='add'>+	cx25840_write(client, 0x8d4, 228 - (vol * 2));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void set_balance(struct i2c_client *client, int balance)</div><div class='head'>diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c<br/>index cd9976408ab3..05247d4c340a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25840/cx25840-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx25840/cx25840-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25840/cx25840-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx25840/cx25840-core.c</a></div><div class='hunk'>@@ -18,6 +18,9 @@</div><div class='ctx'>  * CX2388[578] IRQ handling, IO Pin mux configuration and other small fixes are</div><div class='ctx'>  * Copyright (C) 2010 Andy Walls &lt;awalls@md.metrocast.net&gt;</div><div class='ctx'>  *</div><div class='add'>+ * CX23888 DIF support for the HVR1850</div><div class='add'>+ * Copyright (C) 2011 Steven Toth &lt;stoth@kernellabs.com&gt;</div><div class='add'>+ *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or</div><div class='ctx'>  * modify it under the terms of the GNU General Public License</div><div class='ctx'>  * as published by the Free Software Foundation; either version 2</div><div class='hunk'>@@ -40,6 +43,7 @@</div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/math64.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-chip-ident.h&gt;</div><div class='ctx'> #include &lt;media/cx25840.h&gt;</div><div class='hunk'>@@ -80,6 +84,7 @@ MODULE_PARM_DESC(debug, "Debugging messages [0=Off (default) 1=On]");</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='add'>+static void cx23885_std_setup(struct i2c_client *client);</div><div class='ctx'> </div><div class='ctx'> int cx25840_write(struct i2c_client *client, u16 addr, u8 value)</div><div class='ctx'> {</div><div class='hunk'>@@ -498,8 +503,13 @@ static void cx23885_initialize(struct i2c_client *client)</div><div class='ctx'> 		 * 50.0 MHz * (0xb + 0xe8ba26/0x2000000)/4 = 5 * 28.636363 MHz</div><div class='ctx'> 		 * 572.73 MHz before post divide</div><div class='ctx'> 		 */</div><div class='del'>-		cx25840_write4(client, 0x11c, 0x00e8ba26);</div><div class='del'>-		cx25840_write4(client, 0x118, 0x0000040b);</div><div class='add'>+		/* HVR1850 or 50MHz xtal */</div><div class='add'>+		cx25840_write(client, 0x2, 0x71);</div><div class='add'>+		cx25840_write4(client, 0x11c, 0x01d1744c);</div><div class='add'>+		cx25840_write4(client, 0x118, 0x00000416);</div><div class='add'>+		cx25840_write4(client, 0x404, 0x0010253e);</div><div class='add'>+		cx25840_write4(client, 0x42c, 0x42600000);</div><div class='add'>+		cx25840_write4(client, 0x44c, 0x161f1000);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case V4L2_IDENT_CX23887_AV:</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -533,8 +543,18 @@ static void cx23885_initialize(struct i2c_client *client)</div><div class='ctx'> 	 * 28.636363 MHz * (0xf + 0x02be2c9/0x2000000)/4 = 8 * 13.5 MHz</div><div class='ctx'> 	 * 432.0 MHz before post divide</div><div class='ctx'> 	 */</div><div class='del'>-	cx25840_write4(client, 0x10c, 0x002be2c9);</div><div class='del'>-	cx25840_write4(client, 0x108, 0x0000040f);</div><div class='add'>+</div><div class='add'>+	/* HVR1850 */</div><div class='add'>+	switch (state-&gt;id) {</div><div class='add'>+	case V4L2_IDENT_CX23888_AV:</div><div class='add'>+		/* 888/HVR1250 specific */</div><div class='add'>+		cx25840_write4(client, 0x10c, 0x13333333);</div><div class='add'>+		cx25840_write4(client, 0x108, 0x00000515);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		cx25840_write4(client, 0x10c, 0x002be2c9);</div><div class='add'>+		cx25840_write4(client, 0x108, 0x0000040f);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Luma */</div><div class='ctx'> 	cx25840_write4(client, 0x414, 0x00107d12);</div><div class='hunk'>@@ -556,8 +576,9 @@ static void cx23885_initialize(struct i2c_client *client)</div><div class='ctx'> 		 * 368.64 MHz before post divide</div><div class='ctx'> 		 * 122.88 MHz / 0xa = 12.288 MHz</div><div class='ctx'> 		 */</div><div class='del'>-		cx25840_write4(client, 0x114, 0x00bedfa4);</div><div class='del'>-		cx25840_write4(client, 0x110, 0x000a0307);</div><div class='add'>+		/* HVR1850  or 50MHz xtal */</div><div class='add'>+		cx25840_write4(client, 0x114, 0x017dbf48);</div><div class='add'>+		cx25840_write4(client, 0x110, 0x000a030e);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case V4L2_IDENT_CX23887_AV:</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -617,7 +638,10 @@ static void cx23885_initialize(struct i2c_client *client)</div><div class='ctx'> 	finish_wait(&amp;state-&gt;fw_wait, &amp;wait);</div><div class='ctx'> 	destroy_workqueue(q);</div><div class='ctx'> </div><div class='del'>-	cx25840_std_setup(client);</div><div class='add'>+	/* Call the cx23885 specific std setup func, we no longer rely on</div><div class='add'>+	 * the generic cx24840 func.</div><div class='add'>+	 */</div><div class='add'>+	cx23885_std_setup(client);</div><div class='ctx'> </div><div class='ctx'> 	/* (re)set input */</div><div class='ctx'> 	set_input(client, state-&gt;vid_input, state-&gt;aud_input);</div><div class='hunk'>@@ -631,6 +655,37 @@ static void cx23885_initialize(struct i2c_client *client)</div><div class='ctx'> 	/* Disable and clear audio interrupts - we don't use them */</div><div class='ctx'> 	cx25840_write(client, CX25840_AUD_INT_CTRL_REG, 0xff);</div><div class='ctx'> 	cx25840_write(client, CX25840_AUD_INT_STAT_REG, 0xff);</div><div class='add'>+</div><div class='add'>+	/* CC raw enable */</div><div class='add'>+	/*  - VIP 1.1 control codes - 10bit, blue field enable.</div><div class='add'>+	 *  - enable raw data during vertical blanking.</div><div class='add'>+	 *  - enable ancillary Data insertion for 656 or VIP.</div><div class='add'>+	 */</div><div class='add'>+	cx25840_write4(client, 0x404, 0x0010253e);</div><div class='add'>+</div><div class='add'>+	/* CC on  - Undocumented Register */</div><div class='add'>+	cx25840_write(client, 0x42f, 0x66);</div><div class='add'>+</div><div class='add'>+	/* HVR-1250 / HVR1850 DIF related */</div><div class='add'>+	/* Power everything up */</div><div class='add'>+	cx25840_write4(client, 0x130, 0x0);</div><div class='add'>+</div><div class='add'>+	/* Undocumented */</div><div class='add'>+	cx25840_write4(client, 0x478, 0x6628021F);</div><div class='add'>+</div><div class='add'>+	/* AFE_CLK_OUT_CTRL - Select the clock output source as output */</div><div class='add'>+	cx25840_write4(client, 0x144, 0x5);</div><div class='add'>+</div><div class='add'>+	/* I2C_OUT_CTL - I2S output configuration as</div><div class='add'>+	 * Master, Sony, Left justified, left sample on WS=1</div><div class='add'>+	 */</div><div class='add'>+	cx25840_write4(client, 0x918, 0x1a0);</div><div class='add'>+</div><div class='add'>+	/* AFE_DIAG_CTRL1 */</div><div class='add'>+	cx25840_write4(client, 0x134, 0x000a1800);</div><div class='add'>+</div><div class='add'>+	/* AFE_DIAG_CTRL3 - Inverted Polarity for Audio and Video */</div><div class='add'>+	cx25840_write4(client, 0x13c, 0x00310000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='hunk'>@@ -945,9 +1000,14 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp</div><div class='ctx'> 			   vid_input &lt;= CX25840_COMPOSITE8);</div><div class='ctx'> 	u8 is_component = (vid_input &amp; CX25840_COMPONENT_ON) ==</div><div class='ctx'> 			CX25840_COMPONENT_ON;</div><div class='add'>+	u8 is_dif = (vid_input &amp; CX25840_DIF_ON) ==</div><div class='add'>+			CX25840_DIF_ON;</div><div class='add'>+	u8 is_svideo = (vid_input &amp; CX25840_SVIDEO_ON) ==</div><div class='add'>+			CX25840_SVIDEO_ON;</div><div class='ctx'> 	int luma = vid_input &amp; 0xf0;</div><div class='ctx'> 	int chroma = vid_input &amp; 0xf00;</div><div class='ctx'> 	u8 reg;</div><div class='add'>+	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	v4l_dbg(1, cx25840_debug, client,</div><div class='ctx'> 		"decoder set video input %d, audio input %d\n",</div><div class='hunk'>@@ -1012,6 +1072,66 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp</div><div class='ctx'> 	else</div><div class='ctx'> 		cx25840_and_or(client, 0x401, ~0x6, is_composite ? 0 : 0x02);</div><div class='ctx'> </div><div class='add'>+	if (is_cx2388x(state)) {</div><div class='add'>+</div><div class='add'>+		/* Enable or disable the DIF for tuner use */</div><div class='add'>+		if (is_dif) {</div><div class='add'>+			cx25840_and_or(client, 0x102, ~0x80, 0x80);</div><div class='add'>+</div><div class='add'>+			/* Set of defaults for NTSC and PAL */</div><div class='add'>+			cx25840_write4(client, 0x31c, 0xc2262600);</div><div class='add'>+			cx25840_write4(client, 0x320, 0xc2262600);</div><div class='add'>+</div><div class='add'>+			/* 18271 IF - Nobody else yet uses a different</div><div class='add'>+			 * tuner with the DIF, so these are reasonable</div><div class='add'>+			 * assumptions (HVR1250 and HVR1850 specific).</div><div class='add'>+			 */</div><div class='add'>+			cx25840_write4(client, 0x318, 0xda262600);</div><div class='add'>+			cx25840_write4(client, 0x33c, 0x2a24c800);</div><div class='add'>+			cx25840_write4(client, 0x104, 0x0704dd00);</div><div class='add'>+		} else {</div><div class='add'>+			cx25840_write4(client, 0x300, 0x015c28f5);</div><div class='add'>+</div><div class='add'>+			cx25840_and_or(client, 0x102, ~0x80, 0);</div><div class='add'>+			cx25840_write4(client, 0x340, 0xdf7df83);</div><div class='add'>+			cx25840_write4(client, 0x104, 0x0704dd80);</div><div class='add'>+			cx25840_write4(client, 0x314, 0x22400600);</div><div class='add'>+			cx25840_write4(client, 0x318, 0x40002600);</div><div class='add'>+			cx25840_write4(client, 0x324, 0x40002600);</div><div class='add'>+			cx25840_write4(client, 0x32c, 0x0250e620);</div><div class='add'>+			cx25840_write4(client, 0x39c, 0x01FF0B00);</div><div class='add'>+</div><div class='add'>+			cx25840_write4(client, 0x410, 0xffff0dbf);</div><div class='add'>+			cx25840_write4(client, 0x414, 0x00137d03);</div><div class='add'>+			cx25840_write4(client, 0x418, 0x01008080);</div><div class='add'>+			cx25840_write4(client, 0x41c, 0x00000000);</div><div class='add'>+			cx25840_write4(client, 0x420, 0x001c3e0f);</div><div class='add'>+			cx25840_write4(client, 0x42c, 0x42600000);</div><div class='add'>+			cx25840_write4(client, 0x430, 0x0000039b);</div><div class='add'>+			cx25840_write4(client, 0x438, 0x00000000);</div><div class='add'>+</div><div class='add'>+			cx25840_write4(client, 0x440, 0xF8E3E824);</div><div class='add'>+			cx25840_write4(client, 0x444, 0x401040dc);</div><div class='add'>+			cx25840_write4(client, 0x448, 0xcd3f02a0);</div><div class='add'>+			cx25840_write4(client, 0x44c, 0x161f1000);</div><div class='add'>+			cx25840_write4(client, 0x450, 0x00000802);</div><div class='add'>+</div><div class='add'>+			cx25840_write4(client, 0x91c, 0x01000000);</div><div class='add'>+			cx25840_write4(client, 0x8e0, 0x03063870);</div><div class='add'>+			cx25840_write4(client, 0x8d4, 0x7FFF0024);</div><div class='add'>+			cx25840_write4(client, 0x8d0, 0x00063073);</div><div class='add'>+</div><div class='add'>+			cx25840_write4(client, 0x8c8, 0x00010000);</div><div class='add'>+			cx25840_write4(client, 0x8cc, 0x00080023);</div><div class='add'>+</div><div class='add'>+			/* DIF BYPASS */</div><div class='add'>+			cx25840_write4(client, 0x33c, 0x2a04c800);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Reset the DIF */</div><div class='add'>+		cx25840_write4(client, 0x398, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!is_cx2388x(state) &amp;&amp; !is_cx231xx(state)) {</div><div class='ctx'> 		/* Set CH_SEL_ADC2 to 1 if input comes from CH3 */</div><div class='ctx'> 		cx25840_and_or(client, 0x102, ~0x2, (reg &amp; 0x80) == 0 ? 2 : 0);</div><div class='hunk'>@@ -1036,6 +1156,33 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp</div><div class='ctx'> 				cx25840_and_or(client, 0x102, ~0x2, 0);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/* cx23885 / SVIDEO */</div><div class='add'>+		if (is_cx2388x(state) &amp;&amp; is_svideo) {</div><div class='add'>+#define AFE_CTRL  (0x104)</div><div class='add'>+#define MODE_CTRL (0x400)</div><div class='add'>+			cx25840_and_or(client, 0x102, ~0x2, 0x2);</div><div class='add'>+</div><div class='add'>+			val = cx25840_read4(client, MODE_CTRL);</div><div class='add'>+			val &amp;= 0xFFFFF9FF;</div><div class='add'>+</div><div class='add'>+			/* YC */</div><div class='add'>+			val |= 0x00000200;</div><div class='add'>+			val &amp;= ~0x2000;</div><div class='add'>+			cx25840_write4(client, MODE_CTRL, val);</div><div class='add'>+</div><div class='add'>+			val = cx25840_read4(client, AFE_CTRL);</div><div class='add'>+</div><div class='add'>+			/* Chroma in select */</div><div class='add'>+			val |= 0x00001000;</div><div class='add'>+			val &amp;= 0xfffffe7f;</div><div class='add'>+			/* Clear VGA_SEL_CH2 and VGA_SEL_CH3 (bits 7 and 8).</div><div class='add'>+			 * This sets them to use video rather than audio.</div><div class='add'>+			 * Only one of the two will be in use.</div><div class='add'>+			 */</div><div class='add'>+			cx25840_write4(client, AFE_CTRL, val);</div><div class='add'>+		} else</div><div class='add'>+			cx25840_and_or(client, 0x102, ~0x2, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;vid_input = vid_input;</div><div class='hunk'>@@ -1086,6 +1233,23 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp</div><div class='ctx'> 		cx25840_write4(client, 0x8d0, 0x1f063870);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (is_cx2388x(state)) {</div><div class='add'>+		/* HVR1850 */</div><div class='add'>+		/* AUD_IO_CTRL - I2S Input, Parallel1*/</div><div class='add'>+		/*  - Channel 1 src - Parallel1 (Merlin out) */</div><div class='add'>+		/*  - Channel 2 src - Parallel2 (Merlin out) */</div><div class='add'>+		/*  - Channel 3 src - Parallel3 (Merlin AC97 out) */</div><div class='add'>+		/*  - I2S source and dir - Merlin, output */</div><div class='add'>+		cx25840_write4(client, 0x124, 0x100);</div><div class='add'>+</div><div class='add'>+		if (!is_dif) {</div><div class='add'>+			/* Stop microcontroller if we don't need it</div><div class='add'>+			 * to avoid audio popping on svideo/composite use.</div><div class='add'>+			 */</div><div class='add'>+			cx25840_and_or(client, 0x803, ~0x10, 0x00);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1134,7 +1298,10 @@ static int set_v4lstd(struct i2c_client *client)</div><div class='ctx'> 	}</div><div class='ctx'> 	cx25840_and_or(client, 0x400, ~0xf, fmt);</div><div class='ctx'> 	cx25840_and_or(client, 0x403, ~0x3, pal_m);</div><div class='del'>-	cx25840_std_setup(client);</div><div class='add'>+	if (is_cx2388x(state))</div><div class='add'>+		cx23885_std_setup(client);</div><div class='add'>+	else</div><div class='add'>+		cx25840_std_setup(client);</div><div class='ctx'> 	if (!is_cx2583x(state))</div><div class='ctx'> 		input_change(client);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1539,6 +1706,56 @@ static int cx25840_s_stream(struct v4l2_subdev *sd, int enable)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Query the current detected video format */</div><div class='add'>+static int cx25840_g_std(struct v4l2_subdev *sd, v4l2_std_id *std)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = v4l2_get_subdevdata(sd);</div><div class='add'>+</div><div class='add'>+	v4l2_std_id stds[] = {</div><div class='add'>+		/* 0000 */ V4L2_STD_UNKNOWN,</div><div class='add'>+</div><div class='add'>+		/* 0001 */ V4L2_STD_NTSC_M,</div><div class='add'>+		/* 0010 */ V4L2_STD_NTSC_M_JP,</div><div class='add'>+		/* 0011 */ V4L2_STD_NTSC_443,</div><div class='add'>+		/* 0100 */ V4L2_STD_PAL,</div><div class='add'>+		/* 0101 */ V4L2_STD_PAL_M,</div><div class='add'>+		/* 0110 */ V4L2_STD_PAL_N,</div><div class='add'>+		/* 0111 */ V4L2_STD_PAL_Nc,</div><div class='add'>+		/* 1000 */ V4L2_STD_PAL_60,</div><div class='add'>+</div><div class='add'>+		/* 1001 */ V4L2_STD_UNKNOWN,</div><div class='add'>+		/* 1010 */ V4L2_STD_UNKNOWN,</div><div class='add'>+		/* 1001 */ V4L2_STD_UNKNOWN,</div><div class='add'>+		/* 1010 */ V4L2_STD_UNKNOWN,</div><div class='add'>+		/* 1011 */ V4L2_STD_UNKNOWN,</div><div class='add'>+		/* 1110 */ V4L2_STD_UNKNOWN,</div><div class='add'>+		/* 1111 */ V4L2_STD_UNKNOWN</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	u32 fmt = (cx25840_read4(client, 0x40c) &gt;&gt; 8) &amp; 0xf;</div><div class='add'>+	*std = stds[ fmt ];</div><div class='add'>+</div><div class='add'>+	v4l_dbg(1, cx25840_debug, client, "g_std fmt = %x, v4l2_std_id = 0x%x\n",</div><div class='add'>+		fmt, (unsigned int)stds[ fmt ]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx25840_g_input_status(struct v4l2_subdev *sd, u32 *status)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = v4l2_get_subdevdata(sd);</div><div class='add'>+</div><div class='add'>+	/* A limited function that checks for signal status and returns</div><div class='add'>+	 * the state.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Check for status of Horizontal lock (SRC lock isn't reliable) */</div><div class='add'>+	if ((cx25840_read4(client, 0x40c) &amp; 0x00010000) == 0)</div><div class='add'>+		*status |= V4L2_IN_ST_NO_SIGNAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cx25840_s_std(struct v4l2_subdev *sd, v4l2_std_id std)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx25840_state *state = to_state(sd);</div><div class='hunk'>@@ -1565,6 +1782,9 @@ static int cx25840_s_video_routing(struct v4l2_subdev *sd,</div><div class='ctx'> 	struct cx25840_state *state = to_state(sd);</div><div class='ctx'> 	struct i2c_client *client = v4l2_get_subdevdata(sd);</div><div class='ctx'> </div><div class='add'>+	if (is_cx2388x(state))</div><div class='add'>+		cx23885_std_setup(client);</div><div class='add'>+</div><div class='ctx'> 	return set_input(client, input, state-&gt;aud_input);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1574,6 +1794,8 @@ static int cx25840_s_audio_routing(struct v4l2_subdev *sd,</div><div class='ctx'> 	struct cx25840_state *state = to_state(sd);</div><div class='ctx'> 	struct i2c_client *client = v4l2_get_subdevdata(sd);</div><div class='ctx'> </div><div class='add'>+	if (is_cx2388x(state))</div><div class='add'>+		cx23885_std_setup(client);</div><div class='ctx'> 	return set_input(client, state-&gt;vid_input, input);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1786,6 +2008,3007 @@ static int cx25840_irq_handler(struct v4l2_subdev *sd, u32 status,</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='add'>+#define DIF_PLL_FREQ_WORD	(0x300)</div><div class='add'>+#define DIF_BPF_COEFF01		(0x348)</div><div class='add'>+#define DIF_BPF_COEFF23		(0x34c)</div><div class='add'>+#define DIF_BPF_COEFF45		(0x350)</div><div class='add'>+#define DIF_BPF_COEFF67		(0x354)</div><div class='add'>+#define DIF_BPF_COEFF89		(0x358)</div><div class='add'>+#define DIF_BPF_COEFF1011	(0x35c)</div><div class='add'>+#define DIF_BPF_COEFF1213	(0x360)</div><div class='add'>+#define DIF_BPF_COEFF1415	(0x364)</div><div class='add'>+#define DIF_BPF_COEFF1617	(0x368)</div><div class='add'>+#define DIF_BPF_COEFF1819	(0x36c)</div><div class='add'>+#define DIF_BPF_COEFF2021	(0x370)</div><div class='add'>+#define DIF_BPF_COEFF2223	(0x374)</div><div class='add'>+#define DIF_BPF_COEFF2425	(0x378)</div><div class='add'>+#define DIF_BPF_COEFF2627	(0x37c)</div><div class='add'>+#define DIF_BPF_COEFF2829	(0x380)</div><div class='add'>+#define DIF_BPF_COEFF3031	(0x384)</div><div class='add'>+#define DIF_BPF_COEFF3233	(0x388)</div><div class='add'>+#define DIF_BPF_COEFF3435	(0x38c)</div><div class='add'>+#define DIF_BPF_COEFF36		(0x390)</div><div class='add'>+</div><div class='add'>+void cx23885_dif_setup(struct i2c_client *client, u32 ifHz)</div><div class='add'>+{</div><div class='add'>+	u64 pll_freq;</div><div class='add'>+	u32 pll_freq_word;</div><div class='add'>+</div><div class='add'>+	v4l_dbg(1, cx25840_debug, client, "%s(%d)\n", __func__, ifHz);</div><div class='add'>+</div><div class='add'>+	/* Assuming TV */</div><div class='add'>+	/* Calculate the PLL frequency word based on the adjusted ifHz */</div><div class='add'>+        pll_freq = div_u64((u64)ifHz * 268435456, 50000000);</div><div class='add'>+        pll_freq_word = (u32)pll_freq;</div><div class='add'>+</div><div class='add'>+        cx25840_write4(client, DIF_PLL_FREQ_WORD,  pll_freq_word);</div><div class='add'>+</div><div class='add'>+	/* Round down to the nearest 100KHz */</div><div class='add'>+	ifHz = (ifHz / 100000) * 100000;</div><div class='add'>+</div><div class='add'>+	if (ifHz &lt; 3000000)</div><div class='add'>+		ifHz = 3000000;</div><div class='add'>+</div><div class='add'>+	if (ifHz &gt; 16000000)</div><div class='add'>+		ifHz = 16000000;</div><div class='add'>+</div><div class='add'>+	v4l_dbg(1, cx25840_debug, client, "%s(%d) again\n", __func__, ifHz);</div><div class='add'>+</div><div class='add'>+	switch (ifHz) {</div><div class='add'>+	case 3000000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00080012);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x001e0024);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x001bfff8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffb4ff50);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfed8fe68);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe24fe34);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfebaffc7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x014d031f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x04f0065d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x07010688);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x04c901d6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfe00f9d3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf600f342);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf235f337);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf64efb22);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0105070f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x0c460fce);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 3100000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00070012);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00220032);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x00370026);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xfff0ff91);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff0efe7c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe01fdcc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfe0afedb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x00440224);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x0434060c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0738074e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x06090361);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xff99fb39);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf6fef3b6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf21af2a5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf573fa33);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0034067d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x0bfb0fb9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 3200000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0004000e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00200038);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x004c004f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x002fffdf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff5cfeb6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe0dfd92);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd7ffe03);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xff36010a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x03410575);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x072607d2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x071804d5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0134fcb7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf81ff451);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf223f22e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf4a7f94b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xff6405e8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x0bae0fa4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 3300000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000ffff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00000008);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x001a0036);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0056006d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00670030);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xffbdff10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe46fd8d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd25fd4f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfe35ffe0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x0224049f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x06c9080e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x07ef0627);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x02c9fe45);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf961f513);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf250f1d2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf3ecf869);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xfe930552);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x0b5f0f8f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 3400000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xfffffffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffd0001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x000f002c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0054007d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x0093007c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x0024ff82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfea6fdbb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd03fcca);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfd51feb9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x00eb0392);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x06270802);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x08880750);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x044dffdb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xfabdf5f8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf2a0f193);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf342f78f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xfdc404b9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x0b0e0f78);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 3500000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xfffffffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffafff9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0002001b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0046007d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00ad00ba);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00870000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xff26fe1a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd1bfc7e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc99fda4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xffa5025c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x054507ad);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x08dd0847);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x05b80172);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xfc2ef6ff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf313f170);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf2abf6bd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xfcf6041f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x0abc0f61);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 3600000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xfffffffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff8fff3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xfff50006);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x002f006c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00b200e3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00dc007e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xffb9fea0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd6bfc71);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc17fcb1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfe65010b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x042d0713);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x08ec0906);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x07020302);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xfdaff823);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf3a7f16a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf228f5f5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xfc2a0384);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x0a670f4a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 3700000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff7ffef);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe9fff1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0010004d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00a100f2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x011a00f0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x0053ff44);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfdedfca2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfbd3fbef);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfd39ffae);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x02ea0638);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x08b50987);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x08230483);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xff39f960);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf45bf180);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf1b8f537);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xfb6102e7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x0a110f32);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 3800000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff9ffee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe1ffdd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xfff00024);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x007c00e5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x013a014a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x00e6fff8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfe98fd0f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfbd3fb67);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfc32fe54);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x01880525);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x083909c7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x091505ee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x00c7fab3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf52df1b4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf15df484);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xfa9b0249);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x09ba0f19);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 3900000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffbfff0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffdeffcf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffd1fff6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x004800be);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x01390184);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x016300ac);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xff5efdb1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc17fb23);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfb5cfd0d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x001703e4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x077b09c4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x09d2073c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0251fc18);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf61cf203);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf118f3dc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf9d801aa);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x09600eff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 4000000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffefff4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe1ffc8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffbaffca);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x000b0082);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x01170198);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01c10152);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x0030fe7b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc99fb24);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfac3fbe9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfea5027f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x0683097f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0a560867);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x03d2fd89);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf723f26f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf0e8f341);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf919010a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x09060ee5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 4100000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0002fffb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe8ffca);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffacffa4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffcd0036);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00d70184);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01f601dc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x00ffff60);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfd51fb6d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfa6efaf5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfd410103);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x055708f9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0a9e0969);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0543ff02);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf842f2f5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf0cef2b2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf85e006b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x08aa0ecb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 4200000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00050003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xfff3ffd3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffaaff8b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff95ffe5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x0080014a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01fe023f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x01ba0050);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfe35fbf8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfa62fa3b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfbf9ff7e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x04010836);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0aa90a3d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x069f007f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf975f395);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf0cbf231);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf7a9ffcb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x084c0eaf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 4300000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0008000a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0000ffe4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffb4ff81);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff6aff96);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x001c00f0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01d70271);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x0254013b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xff36fcbd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfa9ff9c5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfadbfdfe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x028c073b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0a750adf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x07e101fa);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xfab8f44e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf0ddf1be);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf6f9ff2b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x07ed0e94);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 4400000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0009000f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x000efff8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffc9ff87);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff52ff54);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xffb5007e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01860270);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02c00210);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0044fdb2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfb22f997);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf9f2fc90);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x0102060f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0a050b4c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0902036e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xfc0af51e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf106f15a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf64efe8b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x078d0e77);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 4500000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00080012);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0019000e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffe5ff9e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff4fff25);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff560000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x0112023b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02f702c0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x014dfec8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfbe5f9b3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf947fb41);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xff7004b9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x095a0b81);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0a0004d8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xfd65f603);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf144f104);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf5aafdec);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x072b0e5a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 4600000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00060012);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00200022);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0005ffc1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff61ff10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff09ff82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x008601d7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02f50340);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0241fff0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfcddfa19);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf8e2fa1e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfde30343);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x08790b7f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0ad50631);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xfec7f6fc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf198f0bd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf50dfd4e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x06c90e3d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 4700000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000ffff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0003000f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00220030);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0025ffed);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff87ff15);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfed6ff10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xffed014c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02b90386);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x03110119);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfdfefac4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf8c6f92f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfc6701b7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x07670b44);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0b7e0776);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x002df807);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf200f086);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf477fcb1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x06650e1e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 4800000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xfffffffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xffff0009);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x001e0038);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x003f001b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffbcff36);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfec2feb6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xff5600a5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x0248038d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x03b00232);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xff39fbab);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf8f4f87f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfb060020);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x062a0ad2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0bf908a3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0192f922);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf27df05e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf3e8fc14);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x06000e00);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 4900000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xfffffffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffc0002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00160037);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x00510046);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xfff9ff6d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfed0fe7c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfecefff0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x01aa0356);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0413032b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x007ffcc5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf96cf812);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf9cefe87);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x04c90a2c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0c4309b4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x02f3fa4a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf30ef046);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf361fb7a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x059b0de0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 5000000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xfffffffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff9fffa);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x000a002d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x00570067);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x0037ffb5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfefffe68);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe62ff3d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x00ec02e3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x043503f6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x01befe05);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfa27f7ee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf8c6fcf8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x034c0954);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0c5c0aa4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x044cfb7e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf3b1f03f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf2e2fae1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x05340dc0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 5100000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff8fff4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xfffd001e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0051007b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x006e0006);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff48fe7c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe1bfe9a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x001d023e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x04130488);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x02e6ff5b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfb1ef812);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf7f7fb7f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x01bc084e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0c430b72);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x059afcba);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf467f046);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf26cfa4a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x04cd0da0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 5200000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff8ffef);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xfff00009);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x003f007f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00980056);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xffa5feb6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe00fe15);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xff4b0170);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x03b004d7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x03e800b9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfc48f87f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf768fa23);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0022071f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0bf90c1b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x06dafdfd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf52df05e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf1fef9b5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x04640d7f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 5300000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000ffff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff9ffee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe6fff3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x00250072);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00af009c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x000cff10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe13fdb8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfe870089);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x031104e1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x04b8020f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfd98f92f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf71df8f0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfe8805ce);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0b7e0c9c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0808ff44);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf603f086);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf19af922);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x03fb0d5e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 5400000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffcffef);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe0ffe0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x00050056);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00b000d1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x0071ff82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe53fd8c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfddfff99);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x024104a3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x054a034d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xff01fa1e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf717f7ed);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfcf50461);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0ad50cf4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0921008d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf6e7f0bd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf13ff891);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x03920d3b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 5500000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffffff3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffdeffd1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffe5002f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x009c00ed);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00cb0000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfebafd94);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd61feb0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x014d0422);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x05970464);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0074fb41);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf759f721);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfb7502de);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0a000d21);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0a2201d4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf7d9f104);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf0edf804);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x03280d19);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 5600000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0003fffa);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe3ffc9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffc90002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x007500ef);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x010e007e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xff3dfdcf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd16fddd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x00440365);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x059b0548);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x01e3fc90);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf7dff691);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfa0f014d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x09020d23);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0b0a0318);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf8d7f15a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf0a5f779);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x02bd0cf6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 5700000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00060001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffecffc9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffb4ffd4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x004000d5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x013600f0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xffd3fe39);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd04fd31);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xff360277);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x055605ef);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x033efdfe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf8a5f642);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf8cbffb6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x07e10cfb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0bd50456);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf9dff1be);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf067f6f2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x02520cd2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 5800000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00080009);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xfff8ffd2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffaaffac);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x000200a3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x013c014a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x006dfec9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd2bfcb7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfe350165);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x04cb0651);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0477ff7e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf9a5f635);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf7b1fe20);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x069f0ca8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0c81058b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xfaf0f231);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf033f66d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x01e60cae);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 5900000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0009000e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0005ffe1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffacff90);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffc5005f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x01210184);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x00fcff72);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd8afc77);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfd51003f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x04020669);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x05830103);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfad7f66b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf6c8fc93);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x05430c2b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0d0d06b5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xfc08f2b2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf00af5ec);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x017b0c89);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 6000000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00070012);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0012fff5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffbaff82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff8e000f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00e80198);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01750028);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfe18fc75);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc99ff15);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x03050636);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0656027f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfc32f6e2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf614fb17);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x03d20b87);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0d7707d2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xfd26f341);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xefeaf56f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x010f0c64);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 6100000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xffff0000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00050012);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x001c000b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffd1ff84);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff66ffbe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00960184);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01cd00da);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfeccfcb2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc17fdf9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x01e005bc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x06e703e4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfdabf798);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf599f9b3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x02510abd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0dbf08df);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xfe48f3dc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xefd5f4f6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x00a20c3e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 6200000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xfffffffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0002000f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0021001f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xfff0ff97);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff50ff74);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x0034014a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01fa0179);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xff97fd2a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfbd3fcfa);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x00a304fe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x07310525);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xff37f886);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf55cf86e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x00c709d0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0de209db);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xff6df484);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xefcbf481);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0x00360c18);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 6300000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xfffffffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffe000a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0021002f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0010ffb8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff50ff3b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xffcc00f0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01fa01fa);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x0069fdd4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfbd3fc26);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xff5d0407);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x07310638);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x00c9f9a8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf55cf74e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xff3908c3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0de20ac3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0093f537);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xefcbf410);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xffca0bf2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 6400000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xfffffffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffb0003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x001c0037);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x002fffe2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff66ff17);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff6a007e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01cd0251);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x0134fea5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc17fb8b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfe2002e0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x06e70713);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x0255faf5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf599f658);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xfdaf0799);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0dbf0b96);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x01b8f5f5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xefd5f3a3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xff5e0bca);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 6500000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff9fffb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00120037);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x00460010);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff8eff0f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff180000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01750276);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x01e8ff8d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc99fb31);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfcfb0198);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x065607ad);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x03cefc64);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf614f592);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xfc2e0656);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0d770c52);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x02daf6bd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xefeaf33b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xfef10ba3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 6600000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff7fff5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0005002f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0054003c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffc5ff22);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfedfff82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x00fc0267);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x0276007e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfd51fb1c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfbfe003e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x05830802);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x0529fdec);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf6c8f4fe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xfabd04ff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0d0d0cf6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x03f8f78f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf00af2d7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xfe850b7b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 6700000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000ffff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff8fff0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xfff80020);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x00560060);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x0002ff4e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfec4ff10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x006d0225);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02d50166);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfe35fb4e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfb35fee1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0477080e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x065bff82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf7b1f4a0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf9610397);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0c810d80);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0510f869);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf033f278);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xfe1a0b52);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 6800000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffaffee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffec000c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x004c0078);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x0040ff8e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfecafeb6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xffd301b6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02fc0235);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xff36fbc5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfaaafd90);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x033e07d2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x075b011b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf8cbf47a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf81f0224);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0bd50def);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0621f94b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf067f21e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xfdae0b29);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 6900000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffdffef);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe3fff6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0037007f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x0075ffdc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfef2fe7c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xff3d0122);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02ea02dd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0044fc79);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfa65fc5d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x01e3074e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x082102ad);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfa0ff48c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf6fe00a9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0b0a0e43);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0729fa33);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf0a5f1c9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xfd430b00);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 7000000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0001fff3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffdeffe2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x001b0076);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x009c002d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff35fe68);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfeba0076);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x029f0352);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x014dfd60);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfa69fb53);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x00740688);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x08a7042d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfb75f4d6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf600ff2d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0a220e7a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0827fb22);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf0edf17a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xfcd80ad6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 7100000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0004fff9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe0ffd2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xfffb005e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00b0007a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff8ffe7c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe53ffc1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x0221038c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0241fe6e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfab6fa80);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xff010587);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x08e90590);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfcf5f556);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf52bfdb3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x09210e95);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0919fc15);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf13ff12f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xfc6e0aab);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 7200000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00070000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe6ffc9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffdb0039);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00af00b8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfff4feb6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe13ff10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x01790388);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0311ff92);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfb48f9ed);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfd980453);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x08e306cd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfe88f60a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf482fc40);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x08080e93);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x09fdfd0c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf19af0ea);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xfc050a81);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 7300000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00080008);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xfff0ffc9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffc1000d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x009800e2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x005bff10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe00fe74);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x00b50345);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x03b000bc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfc18f9a1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfc4802f9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x089807dc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0022f6f0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf407fada);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x06da0e74);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0ad3fe06);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf1fef0ab);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xfb9c0a55);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 7400000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0008000e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xfffdffd0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffafffdf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x006e00f2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00b8ff82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe1bfdf8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xffe302c8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x041301dc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfd1af99e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfb1e0183);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x080908b5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x01bcf801);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf3bdf985);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x059a0e38);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0b99ff03);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf26cf071);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xfb330a2a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 7500000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xffff0000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00070011);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x000affdf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffa9ffb5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x003700e6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x01010000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe62fda8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xff140219);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x043502e1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfe42f9e6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfa270000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x073a0953);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x034cf939);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf3a4f845);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x044c0de1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0c4f0000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf2e2f03c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xfacc09fe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 7600000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xffffffff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00040012);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0016fff3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffafff95);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xfff900c0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x0130007e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfecefd89);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfe560146);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x041303bc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xff81fa76);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf96cfe7d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x063209b1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x04c9fa93);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf3bdf71e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x02f30d6e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0cf200fd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf361f00e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xfa6509d1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 7700000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xfffffffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00010010);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x001e0008);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffc1ff84);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffbc0084);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x013e00f0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xff56fd9f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfdb8005c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x03b00460);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x00c7fb45);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf8f4fd07);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x04fa09ce);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x062afc07);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf407f614);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x01920ce0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0d8301fa);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf3e8efe5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xfa0009a4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 7800000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffd000b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0022001d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffdbff82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff870039);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x012a014a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xffedfde7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd47ff6b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x031104c6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x0202fc4c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf8c6fbad);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x039909a7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0767fd8e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf482f52b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x002d0c39);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0e0002f4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf477efc2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf99b0977);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 7900000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffa0004);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0020002d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xfffbff91);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff61ffe8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00f70184);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x0086fe5c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd0bfe85);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x024104e5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x0323fd7d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf8e2fa79);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x021d093f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0879ff22);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf52bf465);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xfec70b79);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0e6803eb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf50defa5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf937094a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 8000000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff8fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00190036);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x001bffaf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff4fff99);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00aa0198);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x0112fef3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd09fdb9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x014d04be);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x041bfecc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf947f978);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x00900897);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x095a00b9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf600f3c5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xfd650aa3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0ebc04de);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf5aaef8e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf8d5091c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 8100000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000ffff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff7fff6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x000e0038);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0037ffd7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff52ff56);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x004b0184);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x0186ffa1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd40fd16);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x00440452);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x04de0029);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf9f2f8b2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfefe07b5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0a05024d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf6fef34d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xfc0a09b8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0efa05cd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf64eef7d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf87308ed);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 8200000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff8fff0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00000031);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x004c0005);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff6aff27);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xffe4014a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01d70057);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfdacfca6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xff3603a7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x05610184);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfadbf82e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfd74069f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0a7503d6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf81ff2ff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xfab808b9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0f2306b5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf6f9ef72);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf81308bf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 8300000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffbffee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xfff30022);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x00560032);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff95ff10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff8000f0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01fe0106);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfe46fc71);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfe3502c7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x059e02ce);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfbf9f7f2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfbff055b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0aa9054c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf961f2db);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf97507aa);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0f350797);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf7a9ef6d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf7b40890);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 8400000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffeffee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe8000f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x00540058);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffcdff14);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff29007e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01f6019e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xff01fc7c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfd5101bf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x059203f6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfd41f7fe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfaa903f3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0a9e06a9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xfabdf2e2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf842068b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0f320871);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf85eef6e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf7560860);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 8500000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0002fff2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe1fff9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x00460073);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x000bff34);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfee90000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01c10215);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xffd0fcc5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc99009d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x053d04f1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfea5f853);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf97d0270);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0a5607e4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xfc2ef314);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf723055f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0f180943);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf919ef75);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf6fa0830);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 8600000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0005fff8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffdeffe4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x002f007f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x0048ff6b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfec7ff82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x0163025f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x00a2fd47);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc17ff73);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x04a405b2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0017f8ed);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf88500dc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x09d208f9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xfdaff370);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf61c0429);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0ee80a0b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xf9d8ef82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf6a00800);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 8700000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0007ffff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe1ffd4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0010007a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x007cffb2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfec6ff10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x00e60277);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x0168fdf9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfbd3fe50);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x03ce0631);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0188f9c8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf7c7ff43);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x091509e3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xff39f3f6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf52d02ea);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0ea30ac9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xfa9bef95);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf64607d0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 8800000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00090007);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe9ffca);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xfff00065);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00a10003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfee6feb6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x0053025b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x0213fed0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfbd3fd46);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x02c70668);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x02eafadb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf74bfdae);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x08230a9c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x00c7f4a3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf45b01a6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0e480b7c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xfb61efae);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf5ef079f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 8900000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xffff0000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0008000d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xfff5ffc8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffd10043);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00b20053);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff24fe7c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xffb9020c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x0295ffbb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc17fc64);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x019b0654);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x042dfc1c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf714fc2a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x07020b21);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0251f575);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf3a7005e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0dd80c24);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xfc2aefcd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf599076e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 9000000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xffffffff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00060011);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0002ffcf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffba0018);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00ad009a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff79fe68);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xff260192);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02e500ab);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc99fbb6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x005b05f7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0545fd81);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf723fabf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x05b80b70);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x03d2f669);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf313ff15);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0d550cbf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xfcf6eff2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf544073d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 9100000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xfffffffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00030012);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x000fffdd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffacffea);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x009300cf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xffdcfe7c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfea600f7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02fd0190);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfd51fb46);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xff150554);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0627fefd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf778f978);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x044d0b87);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0543f77d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf2a0fdcf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0cbe0d4e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xfdc4f01d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf4f2070b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 9200000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00000010);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x001afff0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffaaffbf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x006700ed);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x0043feb6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe460047);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02db0258);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfe35fb1b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfddc0473);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x06c90082);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf811f85e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x02c90b66);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x069ff8ad);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf250fc8d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0c140dcf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xfe93f04d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf4a106d9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 9300000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffc000c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00200006);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffb4ff9c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x002f00ef);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00a4ff10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe0dff92);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x028102f7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xff36fb37);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfcbf035e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x07260202);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf8e8f778);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x01340b0d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x07e1f9f4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf223fb51);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0b590e42);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xff64f083);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf45206a7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 9400000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff90005);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0022001a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffc9ff86);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xfff000d7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00f2ff82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe01fee5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x01f60362);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0044fb99);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfbcc0222);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x07380370);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf9f7f6cc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xff990a7e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0902fb50);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf21afa1f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0a8d0ea6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0034f0bf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf4050675);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 9500000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff8fffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x001e002b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffe5ff81);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffb400a5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x01280000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe24fe50);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x01460390);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x014dfc3a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfb1000ce);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x070104bf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfb37f65f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfe0009bc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0a00fcbb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf235f8f8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x09b20efc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0105f101);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf3ba0642);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 9600000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0001ffff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff8fff7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00150036);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0005ff8c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff810061);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x013d007e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe71fddf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x007c0380);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0241fd13);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfa94ff70);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x068005e2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfc9bf633);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfc7308ca);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0ad5fe30);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf274f7e0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x08c90f43);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x01d4f147);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf371060f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 9700000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff9fff1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00090038);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0025ffa7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff5e0012);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x013200f0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfee3fd9b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xffaa0331);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0311fe15);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfa60fe18);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x05bd06d1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfe1bf64a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfafa07ae);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0b7effab);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf2d5f6d7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x07d30f7a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x02a3f194);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf32905dc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 9800000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffcffee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xfffb0032);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x003fffcd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff4effc1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x0106014a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xff6efd8a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfedd02aa);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x03b0ff34);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfa74fcd7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x04bf0781);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xffaaf6a3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf99e066b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0bf90128);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf359f5e1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x06d20fa2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0370f1e5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf2e405a8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 9900000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xffffffee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffef0024);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0051fffa);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff54ff77);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00be0184);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x0006fdad);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfe2701f3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0413005e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfad1fbba);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x039007ee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x013bf73d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf868050a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0c4302a1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf3fdf4fe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x05c70fba);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x043bf23c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf2a10575);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 10000000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0003fff1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe50011);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x00570027);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff70ff3c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00620198);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x009efe01);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd95011a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x04350183);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfb71fad0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x023c0812);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x02c3f811);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf75e0390);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0c5c0411);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf4c1f432);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x04b30fc1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0503f297);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf2610541);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 10100000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0006fff7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffdffffc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x00510050);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff9dff18);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfffc0184);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x0128fe80);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd32002e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x04130292);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfc4dfa21);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x00d107ee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x0435f91c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf6850205);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0c430573);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf5a1f37d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x03990fba);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x05c7f2f8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf222050d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 10200000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0008fffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffdfffe7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x003f006e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffd6ff0f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff96014a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x0197ff1f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd05ff3e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x03b0037c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfd59f9b7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xff5d0781);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x0585fa56);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf5e4006f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0bf906c4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf69df2e0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x02790fa2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0688f35d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf1e604d8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 10300000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xffff0001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00090005);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe4ffd6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0025007e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x0014ff20);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff3c00f0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01e1ffd0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd12fe5c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x03110433);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfe88f996);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfdf106d1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x06aafbb7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf57efed8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0b7e07ff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf7b0f25e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x01560f7a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0745f3c7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf1ac04a4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 10400000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xffffffff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0008000c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffedffcb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0005007d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x0050ff4c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfef6007e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01ff0086);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd58fd97);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x024104ad);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xffcaf9c0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfc9905e2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x079afd35);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf555fd46);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0ad50920);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf8d9f1f6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x00310f43);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x07fdf435);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf174046f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 10500000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xfffffffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00050011);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xfffaffc8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffe5006b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x0082ff8c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfecc0000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01f00130);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfdd2fcfc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x014d04e3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x010efa32);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfb6404bf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x084efec5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf569fbc2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0a000a23);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xfa15f1ab);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xff0b0efc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x08b0f4a7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf13f043a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 10600000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00020012);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0007ffcd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffc9004c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00a4ffd9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfec3ff82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01b401c1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfe76fc97);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x004404d2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x0245fae8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfa5f0370);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x08c1005f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf5bcfa52);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x09020b04);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xfb60f17b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xfde70ea6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x095df51e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf10c0405);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 10700000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xffff0011);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0014ffdb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffb40023);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00b2002a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfedbff10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x0150022d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xff38fc6f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xff36047b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x035efbda);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf9940202);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x08ee01f5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf649f8fe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x07e10bc2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xfcb6f169);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xfcc60e42);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0a04f599);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf0db03d0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 10800000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffb000d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x001dffed);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffaafff5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00aa0077);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff13feb6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x00ce026b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x000afc85);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfe3503e3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x044cfcfb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf90c0082);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x08d5037f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf710f7cc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x069f0c59);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xfe16f173);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xfbaa0dcf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0aa5f617);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf0ad039b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 10900000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff90006);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00210003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffacffc8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x008e00b6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff63fe7c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x003a0275);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x00dafcda);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfd510313);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x0501fe40);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf8cbfefd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x087604f0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf80af6c2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x05430cc8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xff7af19a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xfa940d4e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0b3ff699);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf0810365);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 11000000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0001ffff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff8ffff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00210018);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffbaffa3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x006000e1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xffc4fe68);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xffa0024b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x019afd66);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc990216);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x0575ff99);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf8d4fd81);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x07d40640);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf932f5e6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x03d20d0d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x00dff1de);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf9860cbf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0bd1f71e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf058032f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 11100000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff8fff8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x001b0029);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffd1ff8a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x002600f2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x002cfe7c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xff0f01f0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x023bfe20);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc1700fa);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x05a200f7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf927fc1c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x06f40765);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfa82f53b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x02510d27);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0243f23d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf8810c24);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0c5cf7a7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf03102fa);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 11200000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffafff2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00110035);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xfff0ff81);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffe700e7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x008ffeb6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe94016d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02b0fefb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfbd3ffd1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x05850249);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf9c1fadb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x05de0858);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfbf2f4c4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x00c70d17);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x03a0f2b8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf7870b7c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0cdff833);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf00d02c4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 11300000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffdffee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00040038);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0010ff88);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffac00c2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00e2ff10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe3900cb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02f1ffe9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfbd3feaa);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x05210381);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfa9cf9c8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x04990912);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfd7af484);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xff390cdb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x04f4f34d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf69a0ac9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0d5af8c1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xefec028e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 11400000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0000ffee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xfff60033);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x002fff9f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff7b0087);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x011eff82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe080018);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02f900d8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc17fd96);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x04790490);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfbadf8ed);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x032f098e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xff10f47d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xfdaf0c75);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x063cf3fc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf5ba0a0b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0dccf952);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xefcd0258);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 11500000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0004fff1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffea0026);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0046ffc3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff5a003c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x013b0000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe04ff63);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02c801b8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc99fca6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x0397056a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfcecf853);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x01ad09c9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x00acf4ad);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xfc2e0be7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0773f4c2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf4e90943);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0e35f9e6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xefb10221);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 11600000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0007fff6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe20014);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0054ffee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff4effeb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x0137007e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe2efebb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x0260027a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfd51fbe6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x02870605);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfe4af7fe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x001d09c1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0243f515);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xfabd0b32);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0897f59e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf4280871);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0e95fa7c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef9701eb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 11700000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xffff0001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0008fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffdeffff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0056001d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff57ff9c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x011300f0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe82fe2e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x01ca0310);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfe35fb62);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x0155065a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xffbaf7f2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfe8c0977);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x03cef5b2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf9610a58);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x09a5f68f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf3790797);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0eebfb14);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef8001b5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 11800000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xffff0000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00080004);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe0ffe9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x004c0047);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff75ff58);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00d1014a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfef9fdc8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x0111036f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xff36fb21);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x00120665);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x012df82e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfd0708ec);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0542f682);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf81f095c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0a9af792);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf2db06b5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0f38fbad);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef6c017e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 11900000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xffffffff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0007000b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe7ffd8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x00370068);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffa4ff28);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00790184);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xff87fd91);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x00430392);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0044fb26);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfece0626);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0294f8b2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfb990825);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0698f77f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf6fe0842);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0b73f8a7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf25105cd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0f7bfc48);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef5a0148);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 12000000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00050010);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xfff2ffcc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x001b007b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffdfff10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00140198);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x0020fd8e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xff710375);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x014dfb73);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfd9a059f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x03e0f978);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfa4e0726);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x07c8f8a7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf600070c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0c2ff9c9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf1db04de);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0fb4fce5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef4b0111);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 12100000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00010012);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffffffc8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xfffb007e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x001dff14);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xffad0184);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x00b7fdbe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfea9031b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0241fc01);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfc8504d6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0504fa79);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf93005f6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x08caf9f2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf52b05c0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0ccbfaf9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf17903eb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0fe3fd83);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef3f00db);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 12200000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffe0011);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x000cffcc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffdb0071);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x0058ff32);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff4f014a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x013cfe1f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfdfb028a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0311fcc9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfb9d03d6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x05f4fbad);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf848049d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0999fb5b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf4820461);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0d46fc32);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf12d02f4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x1007fe21);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef3600a4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 12300000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffa000e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0017ffd9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffc10055);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x0088ff68);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff0400f0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01a6fea7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd7501cc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x03b0fdc0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfaef02a8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x06a7fd07);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf79d0326);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0a31fcda);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf40702f3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0d9ffd72);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf0f601fa);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x1021fec0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef2f006d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 12400000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0001ffff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff80007);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x001fffeb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffaf002d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00a8ffb0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfed3007e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01e9ff4c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd2000ee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0413fed8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfa82015c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0715fe7d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf7340198);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0a8dfe69);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf3bd017c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0dd5feb8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf0d500fd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x1031ff60);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef2b0037);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 12500000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff70000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00220000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffa90000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00b30000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfec20000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x02000000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd030000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x04350000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfa5e0000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x073b0000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf7110000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0aac0000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf3a40000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0de70000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf0c90000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x10360000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef290000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 12600000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff8fff9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x001f0015);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffafffd3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00a80050);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfed3ff82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01e900b4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd20ff12);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x04130128);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfa82fea4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x07150183);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf734fe68);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0a8d0197);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf3bdfe84);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0dd50148);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf0d5ff03);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x103100a0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef2bffc9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 12700000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffafff2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00170027);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffc1ffab);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00880098);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff04ff10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01a60159);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd75fe34);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x03b00240);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfaeffd58);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x06a702f9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf79dfcda);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0a310326);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf407fd0d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0d9f028e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf0f6fe06);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x10210140);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef2fff93);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 12800000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffeffef);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x000c0034);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffdbff8f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x005800ce);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff4ffeb6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x013c01e1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfdfbfd76);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x03110337);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfb9dfc2a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x05f40453);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf848fb63);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x099904a5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf482fb9f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0d4603ce);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf12dfd0c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x100701df);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef36ff5c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 12900000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0001ffee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffff0038);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xfffbff82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x001d00ec);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xffadfe7c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x00b70242);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfea9fce5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x024103ff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfc85fb2a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x05040587);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf930fa0a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x08ca060e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf52bfa40);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0ccb0507);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf179fc15);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0fe3027d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef3fff25);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 13000000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0005fff0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xfff20034);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x001bff85);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffdf00f0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x0014fe68);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x00200272);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xff71fc8b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x014d048d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfd9afa61);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x03e00688);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfa4ef8da);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x07c80759);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf600f8f4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0c2f0637);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf1dbfb22);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0fb4031b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef4bfeef);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 13100000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xffff0001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0007fff5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe70028);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0037ff98);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffa400d8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x0079fe7c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xff87026f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x0043fc6e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x004404da);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfecef9da);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0294074e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfb99f7db);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x06980881);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf6fef7be);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0b730759);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf251fa33);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0f7b03b8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef5afeb8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 13200000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xffff0000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0008fffc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe00017);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x004cffb9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff7500a8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00d1feb6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfef90238);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x0111fc91);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xff3604df);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x0012f99b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x012d07d2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfd07f714);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0542097e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf81ff6a4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x0a9a086e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf2dbf94b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0f380453);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef6cfe82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 13300000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xffffffff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00080003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffde0001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0056ffe3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff570064);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x0113ff10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe8201d2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x01cafcf0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfe35049e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x0155f9a6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xffba080e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfe8cf689);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x03ce0a4e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xf961f5a8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x09a50971);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf379f869);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0eeb04ec);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef80fe4b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 13400000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0007000a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe2ffec);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x00540012);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff4e0015);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x0137ff82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe2e0145);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x0260fd86);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfd51041a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x0287f9fb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfe4a0802);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x001df63f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x02430aeb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xfabdf4ce);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x08970a62);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf428f78f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0e950584);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xef97fe15);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 13500000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0004000f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffeaffda);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0046003d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff5affc4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x013b0000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe04009d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02c8fe48);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc99035a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x0397fa96);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfcec07ad);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x01adf637);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x00ac0b53);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xfc2ef419);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x07730b3e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf4e9f6bd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0e35061a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xefb1fddf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 13600000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00000012);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xfff6ffcd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x002f0061);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff7bff79);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x011e007e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe08ffe8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02f9ff28);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc17026a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x0479fb70);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfbad0713);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x032ff672);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xff100b83);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xfdaff38b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x063c0c04);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf5baf5f5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0dcc06ae);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xefcdfda8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 13700000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffd0012);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0004ffc8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x00100078);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffacff3e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00e200f0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe39ff35);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02f10017);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfbd30156);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x0521fc7f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfa9c0638);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x0499f6ee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfd7a0b7c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0xff39f325);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x04f40cb3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf69af537);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0d5a073f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xefecfd72);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 13800000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0001fffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffa000e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0011ffcb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xfff0007f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffe7ff19);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x008f014a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe94fe93);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02b00105);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfbd3002f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x0585fdb7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf9c10525);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x05def7a8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfbf20b3c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x00c7f2e9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x03a00d48);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf787f484);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0cdf07cd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf00dfd3c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 13900000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff80008);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x001bffd7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffd10076);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x0026ff0e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x002c0184);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xff0ffe10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x023b01e0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc17ff06);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x05a2ff09);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf92703e4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x06f4f89b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfa820ac5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0251f2d9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x02430dc3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf881f3dc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0c5c0859);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf031fd06);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 14000000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff80001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0021ffe8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffba005d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x0060ff1f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xffc40198);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xffa0fdb5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x019a029a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc99fdea);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x05750067);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf8d4027f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x07d4f9c0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf9320a1a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x03d2f2f3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0x00df0e22);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xf986f341);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0bd108e2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf058fcd1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 14100000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff9fffa);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0021fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffac0038);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x008eff4a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff630184);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x003afd8b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x00da0326);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfd51fced);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x050101c0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf8cb0103);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x0876fb10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf80a093e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0543f338);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xff7a0e66);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xfa94f2b2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0b3f0967);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf081fc9b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 14200000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffbfff3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x001d0013);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffaa000b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00aaff89);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff13014a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x00cefd95);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x000a037b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfe35fc1d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x044c0305);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf90cff7e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x08d5fc81);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf7100834);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x069ff3a7);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xfe160e8d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xfbaaf231);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0aa509e9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf0adfc65);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 14300000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xffffffef);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00140025);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffb4ffdd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00b2ffd6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfedb00f0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x0150fdd3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xff380391);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xff36fb85);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x035e0426);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xf994fdfe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x08eefe0b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf6490702);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x07e1f43e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xfcb60e97);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xfcc6f1be);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x0a040a67);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf0dbfc30);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 14400000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0002ffee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00070033);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffc9ffb4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00a40027);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfec3007e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01b4fe3f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfe760369);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0044fb2e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x02450518);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfa5ffc90);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x08c1ffa1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf5bc05ae);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0902f4fc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xfb600e85);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xfde7f15a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x095d0ae2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf10cfbfb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 14500000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xffff0002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0005ffef);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xfffa0038);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffe5ff95);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00820074);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfecc0000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01f0fed0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfdd20304);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x014dfb1d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x010e05ce);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfb64fb41);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x084e013b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf569043e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0a00f5dd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xfa150e55);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0xff0bf104);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x08b00b59);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf13ffbc6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 14600000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xffff0001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0008fff4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffed0035);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0005ff83);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x005000b4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfef6ff82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01ffff7a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd580269);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0241fb53);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xffca0640);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfc99fa1e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x079a02cb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf55502ba);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0ad5f6e0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf8d90e0a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0031f0bd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x07fd0bcb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf174fb91);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 14700000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xffffffff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0009fffb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe4002a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0025ff82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x001400e0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff3cff10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01e10030);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd1201a4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0311fbcd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfe88066a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xfdf1f92f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x06aa0449);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf57e0128);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0b7ef801);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf7b00da2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0156f086);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x07450c39);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf1acfb5c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 14800000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00080002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffdf0019);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x003fff92);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffd600f1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff96feb6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x019700e1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd0500c2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x03b0fc84);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfd590649);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0xff5df87f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x058505aa);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf5e4ff91);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0bf9f93c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf69d0d20);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0279f05e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x06880ca3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf1e6fb28);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 14900000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x00060009);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffdf0004);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0051ffb0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff9d00e8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xfffcfe7c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x01280180);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd32ffd2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0413fd6e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfc4d05df);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x00d1f812);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x043506e4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf685fdfb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0c43fa8d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf5a10c83);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0399f046);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x05c70d08);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf222faf3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 15000000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0003000f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffe5ffef);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x0057ffd9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff7000c4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x0062fe68);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x009e01ff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfd95fee6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0435fe7d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfb710530);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x023cf7ee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x02c307ef);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf75efc70);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0c5cfbef);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf4c10bce);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x04b3f03f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x05030d69);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf261fabf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 15100000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0000fffd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xffff0012);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xffefffdc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x00510006);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff540089);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00befe7c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0x00060253);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfe27fe0d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x0413ffa2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfad10446);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0390f812);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0x013b08c3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf868faf6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0c43fd5f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf3fd0b02);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x05c7f046);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x043b0dc4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf2a1fa8b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 15200000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0001fffe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffc0012);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0xfffbffce);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x003f0033);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff4e003f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x0106feb6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xff6e0276);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xfeddfd56);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x03b000cc);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfa740329);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x04bff87f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xffaa095d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xf99ef995);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0bf9fed8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf3590a1f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x06d2f05e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x03700e1b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf2e4fa58);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 15300000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x0001ffff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff9000f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0009ffc8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x00250059);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff5effee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x0132ff10);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfee30265);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0xffaafccf);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x031101eb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfa6001e8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x05bdf92f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfe1b09b6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfafaf852);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0b7e0055);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf2d50929);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x07d3f086);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x02a30e6c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf329fa24);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 15400000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00010001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff80009);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0015ffca);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0x00050074);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xff81ff9f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x013dff82);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe710221);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x007cfc80);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x024102ed);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfa940090);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0680fa1e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfc9b09cd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfc73f736);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0ad501d0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf2740820);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x08c9f0bd);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x01d40eb9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf371f9f1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 15500000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff80002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x001effd5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffe5007f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xffb4ff5b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x01280000);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe2401b0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x0146fc70);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x014d03c6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfb10ff32);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0701fb41);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xfb3709a1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xfe00f644);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x0a000345);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf2350708);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x09b2f104);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x01050eff);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf3baf9be);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 15600000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfff9fffb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0022ffe6);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffc9007a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0xfff0ff29);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00f2007e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe01011b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x01f6fc9e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0x00440467);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfbccfdde);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0738fc90);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf9f70934);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0xff99f582);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x090204b0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf21a05e1);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0a8df15a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0x00340f41);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf405f98b);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 15700000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0xfffcfff4);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x0020fffa);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffb40064);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x002fff11);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x00a400f0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe0d006e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x0281fd09);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xff3604c9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfcbffca2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0726fdfe);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf8e80888);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x0134f4f3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x07e1060c);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf22304af);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0b59f1be);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xff640f7d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf452f959);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 15800000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0x00000003);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0000fff0);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x001a0010);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffaa0041);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x0067ff13);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0x0043014a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfe46ffb9);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02dbfda8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfe3504e5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xfddcfb8d);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x06c9ff7e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf81107a2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x02c9f49a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x069f0753);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf2500373);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0c14f231);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xfe930fb3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf4a1f927);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 15900000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xffff0002);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0003ffee);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x000f0023);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffac0016);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x0093ff31);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xffdc0184);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xfea6ff09);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02fdfe70);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfd5104ba);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0xff15faac);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x06270103);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf7780688);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x044df479);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x05430883);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf2a00231);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0cbef2b2);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xfdc40fe3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf4f2f8f5);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 16000000:</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF01, 0xffff0001);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF23, 0x0006ffef);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF45, 0x00020031);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF67, 0xffbaffe8);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF89, 0x00adff66);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1011, 0xff790198);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1213, 0xff26fe6e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1415, 0x02e5ff55);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1617, 0xfc99044a);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF1819, 0x005bfa09);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2021, 0x0545027f);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2223, 0xf7230541);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2425, 0x05b8f490);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2627, 0x03d20997);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF2829, 0xf31300eb);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3031, 0x0d55f341);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3233, 0xfcf6100e);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF3435, 0xf544f8c3);</div><div class='add'>+		cx25840_write4(client, DIF_BPF_COEFF36, 0x110d0000);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cx23885_std_setup(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct cx25840_state *state = to_state(i2c_get_clientdata(client));</div><div class='add'>+	v4l2_std_id std = state-&gt;std;</div><div class='add'>+	u32 ifHz;</div><div class='add'>+</div><div class='add'>+	cx25840_write4(client, 0x478, 0x6628021F);</div><div class='add'>+	cx25840_write4(client, 0x400, 0x0);</div><div class='add'>+	cx25840_write4(client, 0x4b4, 0x20524030);</div><div class='add'>+	cx25840_write4(client, 0x47c, 0x010a8263);</div><div class='add'>+</div><div class='add'>+	if (std &amp; V4L2_STD_NTSC) {</div><div class='add'>+		v4l_dbg(1, cx25840_debug, client, "%s() Selecting NTSC",</div><div class='add'>+			__func__);</div><div class='add'>+</div><div class='add'>+		/* Horiz / vert timing */</div><div class='add'>+		cx25840_write4(client, 0x428, 0x1e1e601a);</div><div class='add'>+		cx25840_write4(client, 0x424, 0x5b2d007a);</div><div class='add'>+</div><div class='add'>+		/* DIF NTSC */</div><div class='add'>+		cx25840_write4(client, 0x304, 0x6503bc0c);</div><div class='add'>+		cx25840_write4(client, 0x308, 0xbd038c85);</div><div class='add'>+		cx25840_write4(client, 0x30c, 0x1db4640a);</div><div class='add'>+		cx25840_write4(client, 0x310, 0x00008800);</div><div class='add'>+		cx25840_write4(client, 0x314, 0x44400400);</div><div class='add'>+		cx25840_write4(client, 0x32c, 0x0c800800);</div><div class='add'>+		cx25840_write4(client, 0x330, 0x27000100);</div><div class='add'>+		cx25840_write4(client, 0x334, 0x1f296e1f);</div><div class='add'>+		cx25840_write4(client, 0x338, 0x009f50c1);</div><div class='add'>+		cx25840_write4(client, 0x340, 0x1befbf06);</div><div class='add'>+		cx25840_write4(client, 0x344, 0x000035e8);</div><div class='add'>+</div><div class='add'>+		/* DIF I/F */</div><div class='add'>+		ifHz = 5400000;</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		v4l_dbg(1, cx25840_debug, client, "%s() Selecting PAL-BG",</div><div class='add'>+			__func__);</div><div class='add'>+</div><div class='add'>+		/* Horiz / vert timing */</div><div class='add'>+		cx25840_write4(client, 0x428, 0x28244024);</div><div class='add'>+		cx25840_write4(client, 0x424, 0x5d2d0084);</div><div class='add'>+</div><div class='add'>+		/* DIF */</div><div class='add'>+		cx25840_write4(client, 0x304, 0x6503bc0c);</div><div class='add'>+		cx25840_write4(client, 0x308, 0xbd038c85);</div><div class='add'>+		cx25840_write4(client, 0x30c, 0x1db4640a);</div><div class='add'>+		cx25840_write4(client, 0x310, 0x00008800);</div><div class='add'>+		cx25840_write4(client, 0x314, 0x44400600);</div><div class='add'>+		cx25840_write4(client, 0x32c, 0x0c800800);</div><div class='add'>+		cx25840_write4(client, 0x330, 0x27000100);</div><div class='add'>+		cx25840_write4(client, 0x334, 0x213530ec);</div><div class='add'>+		cx25840_write4(client, 0x338, 0x00a65ba8);</div><div class='add'>+		cx25840_write4(client, 0x340, 0x1befbf06);</div><div class='add'>+		cx25840_write4(client, 0x344, 0x000035e8);</div><div class='add'>+</div><div class='add'>+		/* DIF I/F */</div><div class='add'>+		ifHz = 6000000;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cx23885_dif_setup(client, ifHz);</div><div class='add'>+</div><div class='add'>+	/* Explicitly ensure the inputs are reconfigured after</div><div class='add'>+	 * a standard change.</div><div class='add'>+	 */</div><div class='add'>+	set_input(client, state-&gt;vid_input, state-&gt;aud_input);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ----------------------------------------------------------------------- */</div><div class='add'>+</div><div class='ctx'> static const struct v4l2_ctrl_ops cx25840_ctrl_ops = {</div><div class='ctx'> 	.s_ctrl = cx25840_s_ctrl,</div><div class='ctx'> };</div><div class='hunk'>@@ -1801,6 +5024,7 @@ static const struct v4l2_subdev_core_ops cx25840_core_ops = {</div><div class='ctx'> 	.queryctrl = v4l2_subdev_queryctrl,</div><div class='ctx'> 	.querymenu = v4l2_subdev_querymenu,</div><div class='ctx'> 	.s_std = cx25840_s_std,</div><div class='add'>+	.g_std = cx25840_g_std,</div><div class='ctx'> 	.reset = cx25840_reset,</div><div class='ctx'> 	.load_fw = cx25840_load_fw,</div><div class='ctx'> 	.s_io_pin_config = common_s_io_pin_config,</div><div class='hunk'>@@ -1828,6 +5052,7 @@ static const struct v4l2_subdev_video_ops cx25840_video_ops = {</div><div class='ctx'> 	.s_routing = cx25840_s_video_routing,</div><div class='ctx'> 	.s_mbus_fmt = cx25840_s_mbus_fmt,</div><div class='ctx'> 	.s_stream = cx25840_s_stream,</div><div class='add'>+	.g_input_status = cx25840_g_input_status,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct v4l2_subdev_vbi_ops cx25840_vbi_ops = {</div><div class='head'>diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig<br/>index 5c42abdf422f..3598dc087b08 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx88/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx88/Kconfig</a></div><div class='hunk'>@@ -70,11 +70,6 @@ config VIDEO_CX88_DVB</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called cx88-dvb.</div><div class='ctx'> </div><div class='del'>-config VIDEO_CX88_MPEG</div><div class='del'>-	tristate</div><div class='del'>-	depends on VIDEO_CX88_DVB || VIDEO_CX88_BLACKBIRD</div><div class='del'>-	default y</div><div class='del'>-</div><div class='ctx'> config VIDEO_CX88_VP3054</div><div class='ctx'> 	tristate "VP-3054 Secondary I2C Bus Support"</div><div class='ctx'> 	default m</div><div class='hunk'>@@ -84,3 +79,8 @@ config VIDEO_CX88_VP3054</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='ctx'> 	  Secondary I2C bus, such at DNTV Live! DVB-T Pro.</div><div class='add'>+</div><div class='add'>+config VIDEO_CX88_MPEG</div><div class='add'>+	tristate</div><div class='add'>+	depends on VIDEO_CX88_DVB || VIDEO_CX88_BLACKBIRD</div><div class='add'>+	default y</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c<br/>index 68d1240f493c..04bf6627d362 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-alsa.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx88/cx88-alsa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-alsa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx88/cx88-alsa.c</a></div><div class='hunk'>@@ -96,7 +96,7 @@ typedef struct cx88_audio_dev snd_cx88_card_t;</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static const char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};</div><div class='add'>+static bool enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};</div><div class='ctx'> </div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable cx88x soundcard. default enabled.");</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c<br/>index 0d719faafd8a..cbd5d119a2c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-cards.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx88/cx88-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx88/cx88-cards.c</a></div><div class='hunk'>@@ -1306,7 +1306,7 @@ static const struct cx88_board cx88_boards[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	[CX88_BOARD_WINFAST_DTV2000H_J] = {</div><div class='ctx'> 		.name           = "WinFast DTV2000 H rev. J",</div><div class='del'>-		.tuner_type     = TUNER_PHILIPS_FMD1216ME_MK3,</div><div class='add'>+		.tuner_type     = TUNER_PHILIPS_FMD1216MEX_MK3,</div><div class='ctx'> 		.radio_type     = UNSET,</div><div class='ctx'> 		.tuner_addr     = ADDR_UNSET,</div><div class='ctx'> 		.radio_addr     = ADDR_UNSET,</div><div class='hunk'>@@ -1573,8 +1573,8 @@ static const struct cx88_board cx88_boards[] = {</div><div class='ctx'> 		.name           = "Pinnacle Hybrid PCTV",</div><div class='ctx'> 		.tuner_type     = TUNER_XC2028,</div><div class='ctx'> 		.tuner_addr     = 0x61,</div><div class='del'>-		.radio_type     = TUNER_XC2028,</div><div class='del'>-		.radio_addr     = 0x61,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='ctx'> 		.input          = { {</div><div class='ctx'> 			.type   = CX88_VMUX_TELEVISION,</div><div class='ctx'> 			.vmux   = 0,</div><div class='hunk'>@@ -1611,8 +1611,8 @@ static const struct cx88_board cx88_boards[] = {</div><div class='ctx'> 		.name           = "Leadtek TV2000 XP Global",</div><div class='ctx'> 		.tuner_type     = TUNER_XC2028,</div><div class='ctx'> 		.tuner_addr     = 0x61,</div><div class='del'>-		.radio_type     = TUNER_XC2028,</div><div class='del'>-		.radio_addr     = 0x61,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='ctx'> 		.input          = { {</div><div class='ctx'> 			.type   = CX88_VMUX_TELEVISION,</div><div class='ctx'> 			.vmux   = 0,</div><div class='hunk'>@@ -1643,6 +1643,78 @@ static const struct cx88_board cx88_boards[] = {</div><div class='ctx'> 			.gpio3  = 0x0000,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+	[CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F36] = {</div><div class='add'>+		.name           = "Leadtek TV2000 XP Global (SC4100)",</div><div class='add'>+		.tuner_type     = TUNER_XC4000,</div><div class='add'>+		.tuner_addr     = 0x61,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='add'>+		.input          = { {</div><div class='add'>+			.type   = CX88_VMUX_TELEVISION,</div><div class='add'>+			.vmux   = 0,</div><div class='add'>+			.gpio0  = 0x0400,       /* pin 2 = 0 */</div><div class='add'>+			.gpio1  = 0x0000,</div><div class='add'>+			.gpio2  = 0x0C04,       /* pin 18 = 1, pin 19 = 0 */</div><div class='add'>+			.gpio3  = 0x0000,</div><div class='add'>+		}, {</div><div class='add'>+			.type   = CX88_VMUX_COMPOSITE1,</div><div class='add'>+			.vmux   = 1,</div><div class='add'>+			.gpio0  = 0x0400,       /* pin 2 = 0 */</div><div class='add'>+			.gpio1  = 0x0000,</div><div class='add'>+			.gpio2  = 0x0C0C,       /* pin 18 = 1, pin 19 = 1 */</div><div class='add'>+			.gpio3  = 0x0000,</div><div class='add'>+		}, {</div><div class='add'>+			.type   = CX88_VMUX_SVIDEO,</div><div class='add'>+			.vmux   = 2,</div><div class='add'>+			.gpio0  = 0x0400,       /* pin 2 = 0 */</div><div class='add'>+			.gpio1  = 0x0000,</div><div class='add'>+			.gpio2  = 0x0C0C,       /* pin 18 = 1, pin 19 = 1 */</div><div class='add'>+			.gpio3  = 0x0000,</div><div class='add'>+		} },</div><div class='add'>+		.radio = {</div><div class='add'>+			.type   = CX88_RADIO,</div><div class='add'>+			.gpio0  = 0x0400,        /* pin 2 = 0 */</div><div class='add'>+			.gpio1  = 0x0000,</div><div class='add'>+			.gpio2  = 0x0C00,       /* pin 18 = 0, pin 19 = 0 */</div><div class='add'>+			.gpio3  = 0x0000,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F43] = {</div><div class='add'>+		.name           = "Leadtek TV2000 XP Global (XC4100)",</div><div class='add'>+		.tuner_type     = TUNER_XC4000,</div><div class='add'>+		.tuner_addr     = 0x61,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='add'>+		.input          = { {</div><div class='add'>+			.type   = CX88_VMUX_TELEVISION,</div><div class='add'>+			.vmux   = 0,</div><div class='add'>+			.gpio0  = 0x0400,       /* pin 2 = 0 */</div><div class='add'>+			.gpio1  = 0x6040,       /* pin 14 = 1, pin 13 = 0 */</div><div class='add'>+			.gpio2  = 0x0000,</div><div class='add'>+			.gpio3  = 0x0000,</div><div class='add'>+		}, {</div><div class='add'>+			.type   = CX88_VMUX_COMPOSITE1,</div><div class='add'>+			.vmux   = 1,</div><div class='add'>+			.gpio0  = 0x0400,       /* pin 2 = 0 */</div><div class='add'>+			.gpio1  = 0x6060,       /* pin 14 = 1, pin 13 = 1 */</div><div class='add'>+			.gpio2  = 0x0000,</div><div class='add'>+			.gpio3  = 0x0000,</div><div class='add'>+		}, {</div><div class='add'>+			.type   = CX88_VMUX_SVIDEO,</div><div class='add'>+			.vmux   = 2,</div><div class='add'>+			.gpio0  = 0x0400,       /* pin 2 = 0 */</div><div class='add'>+			.gpio1  = 0x6060,       /* pin 14 = 1, pin 13 = 1 */</div><div class='add'>+			.gpio2  = 0x0000,</div><div class='add'>+			.gpio3  = 0x0000,</div><div class='add'>+		} },</div><div class='add'>+		.radio = {</div><div class='add'>+			.type   = CX88_RADIO,</div><div class='add'>+			.gpio0  = 0x0400,        /* pin 2 = 0 */</div><div class='add'>+			.gpio1  = 0x6000,        /* pin 14 = 1, pin 13 = 0 */</div><div class='add'>+			.gpio2  = 0x0000,</div><div class='add'>+			.gpio3  = 0x0000,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='ctx'> 	[CX88_BOARD_POWERCOLOR_REAL_ANGEL] = {</div><div class='ctx'> 		.name           = "PowerColor RA330",	/* Long names may confuse LIRC. */</div><div class='ctx'> 		.tuner_type     = TUNER_XC2028,</div><div class='hunk'>@@ -2043,8 +2115,8 @@ static const struct cx88_board cx88_boards[] = {</div><div class='ctx'> 		.name           = "Terratec Cinergy HT PCI MKII",</div><div class='ctx'> 		.tuner_type     = TUNER_XC2028,</div><div class='ctx'> 		.tuner_addr     = 0x61,</div><div class='del'>-		.radio_type     = TUNER_XC2028,</div><div class='del'>-		.radio_addr     = 0x61,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='ctx'> 		.input          = { {</div><div class='ctx'> 			.type   = CX88_VMUX_TELEVISION,</div><div class='ctx'> 			.vmux   = 0,</div><div class='hunk'>@@ -2082,9 +2154,9 @@ static const struct cx88_board cx88_boards[] = {</div><div class='ctx'> 	[CX88_BOARD_WINFAST_DTV1800H] = {</div><div class='ctx'> 		.name           = "Leadtek WinFast DTV1800 Hybrid",</div><div class='ctx'> 		.tuner_type     = TUNER_XC2028,</div><div class='del'>-		.radio_type     = TUNER_XC2028,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='ctx'> 		.tuner_addr     = 0x61,</div><div class='del'>-		.radio_addr     = 0x61,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * GPIO setting</div><div class='ctx'> 		 *</div><div class='hunk'>@@ -2123,9 +2195,9 @@ static const struct cx88_board cx88_boards[] = {</div><div class='ctx'> 	[CX88_BOARD_WINFAST_DTV1800H_XC4000] = {</div><div class='ctx'> 		.name		= "Leadtek WinFast DTV1800 H (XC4000)",</div><div class='ctx'> 		.tuner_type	= TUNER_XC4000,</div><div class='del'>-		.radio_type	= TUNER_XC4000,</div><div class='add'>+		.radio_type	= UNSET,</div><div class='ctx'> 		.tuner_addr	= 0x61,</div><div class='del'>-		.radio_addr	= 0x61,</div><div class='add'>+		.radio_addr	= ADDR_UNSET,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * GPIO setting</div><div class='ctx'> 		 *</div><div class='hunk'>@@ -2164,9 +2236,9 @@ static const struct cx88_board cx88_boards[] = {</div><div class='ctx'> 	[CX88_BOARD_WINFAST_DTV2000H_PLUS] = {</div><div class='ctx'> 		.name		= "Leadtek WinFast DTV2000 H PLUS",</div><div class='ctx'> 		.tuner_type	= TUNER_XC4000,</div><div class='del'>-		.radio_type	= TUNER_XC4000,</div><div class='add'>+		.radio_type	= UNSET,</div><div class='ctx'> 		.tuner_addr	= 0x61,</div><div class='del'>-		.radio_addr	= 0x61,</div><div class='add'>+		.radio_addr	= ADDR_UNSET,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * GPIO</div><div class='ctx'> 		 *   2: 1: mute audio</div><div class='hunk'>@@ -2719,6 +2791,21 @@ static const struct cx88_subid cx88_subids[] = {</div><div class='ctx'> 		.subdevice = 0x6618,</div><div class='ctx'> 		.card      = CX88_BOARD_WINFAST_TV2000_XP_GLOBAL,</div><div class='ctx'> 	}, {</div><div class='add'>+		/* TV2000 XP Global [107d:6618] */</div><div class='add'>+		.subvendor = 0x107d,</div><div class='add'>+		.subdevice = 0x6619,</div><div class='add'>+		.card      = CX88_BOARD_WINFAST_TV2000_XP_GLOBAL,</div><div class='add'>+	}, {</div><div class='add'>+		/* WinFast TV2000 XP Global with XC4000 tuner */</div><div class='add'>+		.subvendor = 0x107d,</div><div class='add'>+		.subdevice = 0x6f36,</div><div class='add'>+		.card      = CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F36,</div><div class='add'>+	}, {</div><div class='add'>+		/* WinFast TV2000 XP Global with XC4000 tuner and different GPIOs */</div><div class='add'>+		.subvendor = 0x107d,</div><div class='add'>+		.subdevice = 0x6f43,</div><div class='add'>+		.card      = CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F43,</div><div class='add'>+	}, {</div><div class='ctx'> 		.subvendor = 0xb034,</div><div class='ctx'> 		.subdevice = 0x3034,</div><div class='ctx'> 		.card      = CX88_BOARD_PROF_7301,</div><div class='hunk'>@@ -3075,6 +3162,8 @@ static int cx88_xc4000_tuner_callback(struct cx88_core *core,</div><div class='ctx'> 	switch (core-&gt;boardnr) {</div><div class='ctx'> 	case CX88_BOARD_WINFAST_DTV1800H_XC4000:</div><div class='ctx'> 	case CX88_BOARD_WINFAST_DTV2000H_PLUS:</div><div class='add'>+	case CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F36:</div><div class='add'>+	case CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F43:</div><div class='ctx'> 		return cx88_xc4000_winfast2000h_plus_callback(core,</div><div class='ctx'> 							      command, arg);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3232,6 +3321,7 @@ static void cx88_card_setup_pre_i2c(struct cx88_core *core)</div><div class='ctx'> 		cx_set(MO_GP0_IO, 0x00001010);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case CX88_BOARD_WINFAST_DTV2000H_J:</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR3000:</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR4000:</div><div class='ctx'> 		/* Init GPIO */</div><div class='hunk'>@@ -3250,6 +3340,8 @@ static void cx88_card_setup_pre_i2c(struct cx88_core *core)</div><div class='ctx'> </div><div class='ctx'> 	case CX88_BOARD_WINFAST_DTV1800H_XC4000:</div><div class='ctx'> 	case CX88_BOARD_WINFAST_DTV2000H_PLUS:</div><div class='add'>+	case CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F36:</div><div class='add'>+	case CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F43:</div><div class='ctx'> 		cx88_xc4000_winfast2000h_plus_callback(core,</div><div class='ctx'> 						       XC4000_TUNER_RESET, 0);</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c<br/>index cf3d33ab541b..003937cd72f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-dvb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx88/cx88-dvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx88/cx88-dvb.c</a></div><div class='hunk'>@@ -815,9 +815,9 @@ static const u8 samsung_smt_7020_inittab[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int samsung_smt_7020_tuner_set_params(struct dvb_frontend *fe,</div><div class='del'>-	struct dvb_frontend_parameters *params)</div><div class='add'>+static int samsung_smt_7020_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct cx8802_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 buf[4];</div><div class='ctx'> 	u32 div;</div><div class='hunk'>@@ -827,14 +827,14 @@ static int samsung_smt_7020_tuner_set_params(struct dvb_frontend *fe,</div><div class='ctx'> 		.buf = buf,</div><div class='ctx'> 		.len = sizeof(buf) };</div><div class='ctx'> </div><div class='del'>-	div = params-&gt;frequency / 125;</div><div class='add'>+	div = c-&gt;frequency / 125;</div><div class='ctx'> </div><div class='ctx'> 	buf[0] = (div &gt;&gt; 8) &amp; 0x7f;</div><div class='ctx'> 	buf[1] = div &amp; 0xff;</div><div class='ctx'> 	buf[2] = 0x84;  /* 0xC4 */</div><div class='ctx'> 	buf[3] = 0x00;</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;frequency &lt; 1500000)</div><div class='add'>+	if (c-&gt;frequency &lt; 1500000)</div><div class='ctx'> 		buf[3] |= 0x10;</div><div class='ctx'> </div><div class='ctx'> 	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='hunk'>@@ -954,6 +954,7 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 	struct cx88_core *core = dev-&gt;core;</div><div class='ctx'> 	struct videobuf_dvb_frontend *fe0, *fe1 = NULL;</div><div class='ctx'> 	int mfe_shared = 0; /* bus not shared by default */</div><div class='add'>+	int res = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (0 != core-&gt;i2c_rc) {</div><div class='ctx'> 		printk(KERN_ERR "%s/2: no i2c-bus available, cannot attach dvb drivers\n", core-&gt;name);</div><div class='hunk'>@@ -999,7 +1000,6 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_WINFAST_DTV2000H:</div><div class='del'>-	case CX88_BOARD_WINFAST_DTV2000H_J:</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR1100:</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR1100LP:</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR1300:</div><div class='hunk'>@@ -1013,6 +1013,17 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 				goto frontend_detach;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case CX88_BOARD_WINFAST_DTV2000H_J:</div><div class='add'>+		fe0-&gt;dvb.frontend = dvb_attach(cx22702_attach,</div><div class='add'>+					       &amp;hauppauge_hvr_config,</div><div class='add'>+					       &amp;core-&gt;i2c_adap);</div><div class='add'>+		if (fe0-&gt;dvb.frontend != NULL) {</div><div class='add'>+			if (!dvb_attach(simple_tuner_attach, fe0-&gt;dvb.frontend,</div><div class='add'>+				   &amp;core-&gt;i2c_adap, 0x61,</div><div class='add'>+				   TUNER_PHILIPS_FMD1216MEX_MK3))</div><div class='add'>+				goto frontend_detach;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR3000:</div><div class='ctx'> 		/* MFE frontend 1 */</div><div class='ctx'> 		mfe_shared = 1;</div><div class='hunk'>@@ -1566,13 +1577,16 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 	call_all(core, core, s_power, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* register everything */</div><div class='del'>-	return videobuf_dvb_register_bus(&amp;dev-&gt;frontends, THIS_MODULE, dev,</div><div class='del'>-					 &amp;dev-&gt;pci-&gt;dev, adapter_nr, mfe_shared, NULL);</div><div class='add'>+	res = videobuf_dvb_register_bus(&amp;dev-&gt;frontends, THIS_MODULE, dev,</div><div class='add'>+		&amp;dev-&gt;pci-&gt;dev, adapter_nr, mfe_shared, NULL);</div><div class='add'>+	if (res)</div><div class='add'>+		goto frontend_detach;</div><div class='add'>+	return res;</div><div class='ctx'> </div><div class='ctx'> frontend_detach:</div><div class='ctx'> 	core-&gt;gate_ctrl = NULL;</div><div class='ctx'> 	videobuf_dvb_dealloc_frontends(&amp;dev-&gt;frontends);</div><div class='del'>-	return -EINVAL;</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------- */</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c<br/>index a1fe0abb6e43..de0f1af74e41 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx88/cx88-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx88/cx88-i2c.c</a></div><div class='hunk'>@@ -132,7 +132,7 @@ static void do_i2c_scan(const char *name, struct i2c_client *c)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* init + register i2c algo-bit adapter */</div><div class='add'>+/* init + register i2c adapter */</div><div class='ctx'> int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)</div><div class='ctx'> {</div><div class='ctx'> 	/* Prevents usage of invalid delay values */</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c<br/>index e614201b5ed3..ebf448c48ca3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-input.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx88/cx88-input.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx88/cx88-input.c</a></div><div class='hunk'>@@ -103,6 +103,8 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)</div><div class='ctx'> 	case CX88_BOARD_WINFAST_DTV1800H_XC4000:</div><div class='ctx'> 	case CX88_BOARD_WINFAST_DTV2000H_PLUS:</div><div class='ctx'> 	case CX88_BOARD_WINFAST_TV2000_XP_GLOBAL:</div><div class='add'>+	case CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F36:</div><div class='add'>+	case CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F43:</div><div class='ctx'> 		gpio = (gpio &amp; 0x6ff) | ((cx_read(MO_GP1_IO) &lt;&lt; 8) &amp; 0x900);</div><div class='ctx'> 		auxgpio = gpio;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -302,6 +304,8 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)</div><div class='ctx'> 	case CX88_BOARD_WINFAST2000XP_EXPERT:</div><div class='ctx'> 	case CX88_BOARD_WINFAST_DTV1000:</div><div class='ctx'> 	case CX88_BOARD_WINFAST_TV2000_XP_GLOBAL:</div><div class='add'>+	case CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F36:</div><div class='add'>+	case CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F43:</div><div class='ctx'> 		ir_codes = RC_MAP_WINFAST;</div><div class='ctx'> 		ir-&gt;gpio_addr = MO_GP0_IO;</div><div class='ctx'> 		ir-&gt;mask_keycode = 0x8f8;</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h<br/>index fa8d307e1a3d..c9659def2a78 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/cx88/cx88.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/cx88/cx88.h</a></div><div class='hunk'>@@ -244,6 +244,8 @@ extern const struct sram_channel const cx88_sram_channels[];</div><div class='ctx'> #define CX88_BOARD_TEVII_S464              86</div><div class='ctx'> #define CX88_BOARD_WINFAST_DTV2000H_PLUS   87</div><div class='ctx'> #define CX88_BOARD_WINFAST_DTV1800H_XC4000 88</div><div class='add'>+#define CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F36 89</div><div class='add'>+#define CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F43 90</div><div class='ctx'> </div><div class='ctx'> enum cx88_itype {</div><div class='ctx'> 	CX88_VMUX_COMPOSITE1 = 1,</div><div class='head'>diff --git a/drivers/media/video/davinci/dm355_ccdc.c b/drivers/media/video/davinci/dm355_ccdc.c<br/>index bd443ee76fff..f83baf3a52b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/dm355_ccdc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/dm355_ccdc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/dm355_ccdc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/davinci/dm355_ccdc.c</a></div><div class='hunk'>@@ -1069,15 +1069,4 @@ static struct platform_driver dm355_ccdc_driver = {</div><div class='ctx'> 	.probe = dm355_ccdc_probe,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init dm355_ccdc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;dm355_ccdc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit dm355_ccdc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;dm355_ccdc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(dm355_ccdc_init);</div><div class='del'>-module_exit(dm355_ccdc_exit);</div><div class='add'>+module_platform_driver(dm355_ccdc_driver);</div><div class='head'>diff --git a/drivers/media/video/davinci/dm644x_ccdc.c b/drivers/media/video/davinci/dm644x_ccdc.c<br/>index 8051c2956478..9303fe553b07 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/dm644x_ccdc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/dm644x_ccdc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/dm644x_ccdc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/davinci/dm644x_ccdc.c</a></div><div class='hunk'>@@ -1078,15 +1078,4 @@ static struct platform_driver dm644x_ccdc_driver = {</div><div class='ctx'> 	.probe = dm644x_ccdc_probe,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init dm644x_ccdc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;dm644x_ccdc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit dm644x_ccdc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;dm644x_ccdc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(dm644x_ccdc_init);</div><div class='del'>-module_exit(dm644x_ccdc_exit);</div><div class='add'>+module_platform_driver(dm644x_ccdc_driver);</div><div class='head'>diff --git a/drivers/media/video/davinci/isif.c b/drivers/media/video/davinci/isif.c<br/>index 29c29c668596..1e63852374be 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/isif.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/isif.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/isif.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/davinci/isif.c</a></div><div class='hunk'>@@ -1156,17 +1156,6 @@ static struct platform_driver isif_driver = {</div><div class='ctx'> 	.probe = isif_probe,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init isif_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;isif_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void isif_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;isif_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(isif_init);</div><div class='del'>-module_exit(isif_exit);</div><div class='add'>+module_platform_driver(isif_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/video/davinci/vpbe.c b/drivers/media/video/davinci/vpbe.c<br/>index d773d30de221..c4a82a1a8a97 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/vpbe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/vpbe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/vpbe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/davinci/vpbe.c</a></div><div class='hunk'>@@ -141,11 +141,12 @@ static int vpbe_enum_outputs(struct vpbe_device *vpbe_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vpbe_get_mode_info(struct vpbe_device *vpbe_dev, char *mode)</div><div class='add'>+static int vpbe_get_mode_info(struct vpbe_device *vpbe_dev, char *mode,</div><div class='add'>+			      int output_index)</div><div class='ctx'> {</div><div class='ctx'> 	struct vpbe_config *cfg = vpbe_dev-&gt;cfg;</div><div class='ctx'> 	struct vpbe_enc_mode_info var;</div><div class='del'>-	int curr_output = vpbe_dev-&gt;current_out_index;</div><div class='add'>+	int curr_output = output_index;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (NULL == mode)</div><div class='hunk'>@@ -245,6 +246,8 @@ static int vpbe_set_output(struct vpbe_device *vpbe_dev, int index)</div><div class='ctx'> 	struct encoder_config_info *curr_enc_info =</div><div class='ctx'> 			vpbe_current_encoder_info(vpbe_dev);</div><div class='ctx'> 	struct vpbe_config *cfg = vpbe_dev-&gt;cfg;</div><div class='add'>+	struct venc_platform_data *venc_device = vpbe_dev-&gt;venc_device;</div><div class='add'>+	enum v4l2_mbus_pixelcode if_params;</div><div class='ctx'> 	int enc_out_index;</div><div class='ctx'> 	int sd_index;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -274,6 +277,8 @@ static int vpbe_set_output(struct vpbe_device *vpbe_dev, int index)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if_params = cfg-&gt;outputs[index].if_params;</div><div class='add'>+		venc_device-&gt;setup_if_config(if_params);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -293,7 +298,7 @@ static int vpbe_set_output(struct vpbe_device *vpbe_dev, int index)</div><div class='ctx'> 	 * encoder.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = vpbe_get_mode_info(vpbe_dev,</div><div class='del'>-				 cfg-&gt;outputs[index].default_mode);</div><div class='add'>+				 cfg-&gt;outputs[index].default_mode, index);</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		struct osd_state *osd_device = vpbe_dev-&gt;osd_device;</div><div class='ctx'> </div><div class='hunk'>@@ -367,6 +372,11 @@ static int vpbe_s_dv_preset(struct vpbe_device *vpbe_dev,</div><div class='ctx'> </div><div class='ctx'> 	ret = v4l2_subdev_call(vpbe_dev-&gt;encoders[sd_index], video,</div><div class='ctx'> 					s_dv_preset, dv_preset);</div><div class='add'>+	if (!ret &amp;&amp; (vpbe_dev-&gt;amp != NULL)) {</div><div class='add'>+		/* Call amplifier subdevice */</div><div class='add'>+		ret = v4l2_subdev_call(vpbe_dev-&gt;amp, video,</div><div class='add'>+				s_dv_preset, dv_preset);</div><div class='add'>+	}</div><div class='ctx'> 	/* set the lcd controller output for the given mode */</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		struct osd_state *osd_device = vpbe_dev-&gt;osd_device;</div><div class='hunk'>@@ -566,6 +576,8 @@ static int platform_device_get(struct device *dev, void *data)</div><div class='ctx'> </div><div class='ctx'> 	if (strcmp("vpbe-osd", pdev-&gt;name) == 0)</div><div class='ctx'> 		vpbe_dev-&gt;osd_device = platform_get_drvdata(pdev);</div><div class='add'>+	if (strcmp("vpbe-venc", pdev-&gt;name) == 0)</div><div class='add'>+		vpbe_dev-&gt;venc_device = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -584,6 +596,7 @@ static int platform_device_get(struct device *dev, void *data)</div><div class='ctx'> static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct encoder_config_info *enc_info;</div><div class='add'>+	struct amp_config_info *amp_info;</div><div class='ctx'> 	struct v4l2_subdev **enc_subdev;</div><div class='ctx'> 	struct osd_state *osd_device;</div><div class='ctx'> 	struct i2c_adapter *i2c_adap;</div><div class='hunk'>@@ -704,6 +717,32 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)</div><div class='ctx'> 			v4l2_warn(&amp;vpbe_dev-&gt;v4l2_dev, "non-i2c encoders"</div><div class='ctx'> 				 " currently not supported");</div><div class='ctx'> 	}</div><div class='add'>+	/* Add amplifier subdevice for dm365 */</div><div class='add'>+	if ((strcmp(vpbe_dev-&gt;cfg-&gt;module_name, "dm365-vpbe-display") == 0) &amp;&amp;</div><div class='add'>+			vpbe_dev-&gt;cfg-&gt;amp != NULL) {</div><div class='add'>+		amp_info = vpbe_dev-&gt;cfg-&gt;amp;</div><div class='add'>+		if (amp_info-&gt;is_i2c) {</div><div class='add'>+			vpbe_dev-&gt;amp = v4l2_i2c_new_subdev_board(</div><div class='add'>+			&amp;vpbe_dev-&gt;v4l2_dev, i2c_adap,</div><div class='add'>+			&amp;amp_info-&gt;board_info, NULL);</div><div class='add'>+			if (!vpbe_dev-&gt;amp) {</div><div class='add'>+				v4l2_err(&amp;vpbe_dev-&gt;v4l2_dev,</div><div class='add'>+					 "amplifier %s failed to register",</div><div class='add'>+					 amp_info-&gt;module_name);</div><div class='add'>+				ret = -ENODEV;</div><div class='add'>+				goto vpbe_fail_amp_register;</div><div class='add'>+			}</div><div class='add'>+			v4l2_info(&amp;vpbe_dev-&gt;v4l2_dev,</div><div class='add'>+					  "v4l2 sub device %s registered\n",</div><div class='add'>+					  amp_info-&gt;module_name);</div><div class='add'>+		} else {</div><div class='add'>+			    vpbe_dev-&gt;amp = NULL;</div><div class='add'>+			    v4l2_warn(&amp;vpbe_dev-&gt;v4l2_dev, "non-i2c amplifiers"</div><div class='add'>+			    " currently not supported");</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+	    vpbe_dev-&gt;amp = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* set the current encoder and output to that of venc by default */</div><div class='ctx'> 	vpbe_dev-&gt;current_sd_index = 0;</div><div class='hunk'>@@ -731,6 +770,8 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)</div><div class='ctx'> 	/* TBD handling of bootargs for default output and mode */</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+vpbe_fail_amp_register:</div><div class='add'>+	kfree(vpbe_dev-&gt;amp);</div><div class='ctx'> vpbe_fail_sd_register:</div><div class='ctx'> 	kfree(vpbe_dev-&gt;encoders);</div><div class='ctx'> vpbe_fail_v4l2_device:</div><div class='hunk'>@@ -757,6 +798,7 @@ static void vpbe_deinitialize(struct device *dev, struct vpbe_device *vpbe_dev)</div><div class='ctx'> 	if (strcmp(vpbe_dev-&gt;cfg-&gt;module_name, "dm644x-vpbe-display") != 0)</div><div class='ctx'> 		clk_put(vpbe_dev-&gt;dac_clk);</div><div class='ctx'> </div><div class='add'>+	kfree(vpbe_dev-&gt;amp);</div><div class='ctx'> 	kfree(vpbe_dev-&gt;encoders);</div><div class='ctx'> 	vpbe_dev-&gt;initialized = 0;</div><div class='ctx'> 	/* disable vpss clocks */</div><div class='hunk'>@@ -811,8 +853,10 @@ static __devinit int vpbe_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;outputs-&gt;num_modes &gt; 0)</div><div class='ctx'> 		vpbe_dev-&gt;current_timings = vpbe_dev-&gt;cfg-&gt;outputs[0].modes[0];</div><div class='del'>-	else</div><div class='add'>+	else {</div><div class='add'>+		kfree(vpbe_dev);</div><div class='ctx'> 		return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* set the driver data in platform device */</div><div class='ctx'> 	platform_set_drvdata(pdev, vpbe_dev);</div><div class='hunk'>@@ -839,26 +883,4 @@ static struct platform_driver vpbe_driver = {</div><div class='ctx'> 	.remove = vpbe_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * vpbe_init: initialize the vpbe driver</div><div class='del'>- *</div><div class='del'>- * This function registers device and driver to the kernel</div><div class='del'>- */</div><div class='del'>-static __init int vpbe_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;vpbe_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * vpbe_cleanup : cleanup function for vpbe driver</div><div class='del'>- *</div><div class='del'>- * This will un-registers the device and driver to the kernel</div><div class='del'>- */</div><div class='del'>-static void vpbe_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;vpbe_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Function for module initialization and cleanup */</div><div class='del'>-module_init(vpbe_init);</div><div class='del'>-module_exit(vpbe_cleanup);</div><div class='add'>+module_platform_driver(vpbe_driver);</div><div class='head'>diff --git a/drivers/media/video/davinci/vpbe_display.c b/drivers/media/video/davinci/vpbe_display.c<br/>index 8588a86d9b45..1f3b1c729252 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/vpbe_display.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/vpbe_display.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/vpbe_display.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/davinci/vpbe_display.c</a></div><div class='hunk'>@@ -1746,15 +1746,16 @@ static __devinit int vpbe_display_probe(struct platform_device *pdev)</div><div class='ctx'> 	for (i = 0; i &lt; VPBE_DISPLAY_MAX_DEVICES; i++) {</div><div class='ctx'> 		if (register_device(disp_dev-&gt;dev[i], disp_dev, pdev)) {</div><div class='ctx'> 			err = -ENODEV;</div><div class='del'>-			goto probe_out;</div><div class='add'>+			goto probe_out_irq;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_DEBUG "Successfully completed the probing of vpbe v4l2 device\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-probe_out:</div><div class='add'>+probe_out_irq:</div><div class='ctx'> 	free_irq(res-&gt;start, disp_dev);</div><div class='add'>+probe_out:</div><div class='ctx'> 	for (k = 0; k &lt; VPBE_DISPLAY_MAX_DEVICES; k++) {</div><div class='ctx'> 		/* Get the pointer to the layer object */</div><div class='ctx'> 		vpbe_display_layer = disp_dev-&gt;dev[k];</div><div class='hunk'>@@ -1816,43 +1817,7 @@ static struct platform_driver vpbe_display_driver = {</div><div class='ctx'> 	.remove = __devexit_p(vpbe_display_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * vpbe_display_init()</div><div class='del'>- * This function registers device and driver to the kernel, requests irq</div><div class='del'>- * handler and allocates memory for layer objects</div><div class='del'>- */</div><div class='del'>-static __devinit int vpbe_display_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "vpbe_display_init\n");</div><div class='del'>-</div><div class='del'>-	/* Register driver to the kernel */</div><div class='del'>-	err = platform_driver_register(&amp;vpbe_display_driver);</div><div class='del'>-	if (0 != err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "vpbe_display_init:"</div><div class='del'>-			"VPBE V4L2 Display Driver V1.0 loaded\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * vpbe_display_cleanup()</div><div class='del'>- * This function un-registers device and driver to the kernel, frees requested</div><div class='del'>- * irq handler and de-allocates memory allocated for layer objects.</div><div class='del'>- */</div><div class='del'>-static void vpbe_display_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_DEBUG "vpbe_display_cleanup\n");</div><div class='del'>-</div><div class='del'>-	/* platform driver unregister */</div><div class='del'>-	platform_driver_unregister(&amp;vpbe_display_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Function for module initialization and cleanup */</div><div class='del'>-module_init(vpbe_display_init);</div><div class='del'>-module_exit(vpbe_display_cleanup);</div><div class='add'>+module_platform_driver(vpbe_display_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("TI DM644x/DM355/DM365 VPBE Display controller");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/video/davinci/vpbe_osd.c b/drivers/media/video/davinci/vpbe_osd.c<br/>index ceccf4302518..d6488b79ae3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/vpbe_osd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/vpbe_osd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/vpbe_osd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/davinci/vpbe_osd.c</a></div><div class='hunk'>@@ -248,11 +248,29 @@ static void _osd_set_rec601_attenuation(struct osd_state *sd,</div><div class='ctx'> 		osd_modify(sd, OSD_OSDWIN0MD_ATN0E,</div><div class='ctx'> 			  enable ? OSD_OSDWIN0MD_ATN0E : 0,</div><div class='ctx'> 			  OSD_OSDWIN0MD);</div><div class='add'>+		if (sd-&gt;vpbe_type == VPBE_VERSION_1)</div><div class='add'>+			osd_modify(sd, OSD_OSDWIN0MD_ATN0E,</div><div class='add'>+				  enable ? OSD_OSDWIN0MD_ATN0E : 0,</div><div class='add'>+				  OSD_OSDWIN0MD);</div><div class='add'>+		else if ((sd-&gt;vpbe_type == VPBE_VERSION_3) ||</div><div class='add'>+			   (sd-&gt;vpbe_type == VPBE_VERSION_2))</div><div class='add'>+			osd_modify(sd, OSD_EXTMODE_ATNOSD0EN,</div><div class='add'>+				  enable ? OSD_EXTMODE_ATNOSD0EN : 0,</div><div class='add'>+				  OSD_EXTMODE);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case OSDWIN_OSD1:</div><div class='ctx'> 		osd_modify(sd, OSD_OSDWIN1MD_ATN1E,</div><div class='ctx'> 			  enable ? OSD_OSDWIN1MD_ATN1E : 0,</div><div class='ctx'> 			  OSD_OSDWIN1MD);</div><div class='add'>+		if (sd-&gt;vpbe_type == VPBE_VERSION_1)</div><div class='add'>+			osd_modify(sd, OSD_OSDWIN1MD_ATN1E,</div><div class='add'>+				  enable ? OSD_OSDWIN1MD_ATN1E : 0,</div><div class='add'>+				  OSD_OSDWIN1MD);</div><div class='add'>+		else if ((sd-&gt;vpbe_type == VPBE_VERSION_3) ||</div><div class='add'>+			   (sd-&gt;vpbe_type == VPBE_VERSION_2))</div><div class='add'>+			osd_modify(sd, OSD_EXTMODE_ATNOSD1EN,</div><div class='add'>+				  enable ? OSD_EXTMODE_ATNOSD1EN : 0,</div><div class='add'>+				  OSD_EXTMODE);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -273,15 +291,71 @@ static void _osd_set_blending_factor(struct osd_state *sd,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void _osd_enable_rgb888_pixblend(struct osd_state *sd,</div><div class='add'>+					enum osd_win_layer osdwin)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	osd_modify(sd, OSD_MISCCTL_BLDSEL, 0, OSD_MISCCTL);</div><div class='add'>+	switch (osdwin) {</div><div class='add'>+	case OSDWIN_OSD0:</div><div class='add'>+		osd_modify(sd, OSD_EXTMODE_OSD0BLDCHR,</div><div class='add'>+			  OSD_EXTMODE_OSD0BLDCHR, OSD_EXTMODE);</div><div class='add'>+		break;</div><div class='add'>+	case OSDWIN_OSD1:</div><div class='add'>+		osd_modify(sd, OSD_EXTMODE_OSD1BLDCHR,</div><div class='add'>+			  OSD_EXTMODE_OSD1BLDCHR, OSD_EXTMODE);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void _osd_enable_color_key(struct osd_state *sd,</div><div class='ctx'> 				  enum osd_win_layer osdwin,</div><div class='ctx'> 				  unsigned colorkey,</div><div class='ctx'> 				  enum osd_pix_format pixfmt)</div><div class='ctx'> {</div><div class='ctx'> 	switch (pixfmt) {</div><div class='add'>+	case PIXFMT_1BPP:</div><div class='add'>+	case PIXFMT_2BPP:</div><div class='add'>+	case PIXFMT_4BPP:</div><div class='add'>+	case PIXFMT_8BPP:</div><div class='add'>+		if (sd-&gt;vpbe_type == VPBE_VERSION_3) {</div><div class='add'>+			switch (osdwin) {</div><div class='add'>+			case OSDWIN_OSD0:</div><div class='add'>+				osd_modify(sd, OSD_TRANSPBMPIDX_BMP0,</div><div class='add'>+					  colorkey &lt;&lt;</div><div class='add'>+					  OSD_TRANSPBMPIDX_BMP0_SHIFT,</div><div class='add'>+					  OSD_TRANSPBMPIDX);</div><div class='add'>+				break;</div><div class='add'>+			case OSDWIN_OSD1:</div><div class='add'>+				osd_modify(sd, OSD_TRANSPBMPIDX_BMP1,</div><div class='add'>+					  colorkey &lt;&lt;</div><div class='add'>+					  OSD_TRANSPBMPIDX_BMP1_SHIFT,</div><div class='add'>+					  OSD_TRANSPBMPIDX);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	case PIXFMT_RGB565:</div><div class='del'>-		osd_write(sd, colorkey &amp; OSD_TRANSPVAL_RGBTRANS,</div><div class='del'>-			  OSD_TRANSPVAL);</div><div class='add'>+		if (sd-&gt;vpbe_type == VPBE_VERSION_1)</div><div class='add'>+			osd_write(sd, colorkey &amp; OSD_TRANSPVAL_RGBTRANS,</div><div class='add'>+				  OSD_TRANSPVAL);</div><div class='add'>+		else if (sd-&gt;vpbe_type == VPBE_VERSION_3)</div><div class='add'>+			osd_write(sd, colorkey &amp; OSD_TRANSPVALL_RGBL,</div><div class='add'>+				  OSD_TRANSPVALL);</div><div class='add'>+		break;</div><div class='add'>+	case PIXFMT_YCbCrI:</div><div class='add'>+	case PIXFMT_YCrCbI:</div><div class='add'>+		if (sd-&gt;vpbe_type == VPBE_VERSION_3)</div><div class='add'>+			osd_modify(sd, OSD_TRANSPVALU_Y, colorkey,</div><div class='add'>+				   OSD_TRANSPVALU);</div><div class='add'>+		break;</div><div class='add'>+	case PIXFMT_RGB888:</div><div class='add'>+		if (sd-&gt;vpbe_type == VPBE_VERSION_3) {</div><div class='add'>+			osd_write(sd, colorkey &amp; OSD_TRANSPVALL_RGBL,</div><div class='add'>+				  OSD_TRANSPVALL);</div><div class='add'>+			osd_modify(sd, OSD_TRANSPVALU_RGBU, colorkey &gt;&gt; 16,</div><div class='add'>+				  OSD_TRANSPVALU);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -470,23 +544,188 @@ static int osd_enable_layer(struct osd_state *sd, enum osd_layer layer,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define OSD_SRC_ADDR_HIGH4	0x7800000</div><div class='add'>+#define OSD_SRC_ADDR_HIGH7	0x7F0000</div><div class='add'>+#define OSD_SRCADD_OFSET_SFT	23</div><div class='add'>+#define OSD_SRCADD_ADD_SFT	16</div><div class='add'>+#define OSD_WINADL_MASK		0xFFFF</div><div class='add'>+#define OSD_WINOFST_MASK	0x1000</div><div class='add'>+#define VPBE_REG_BASE		0x80000000</div><div class='add'>+</div><div class='ctx'> static void _osd_start_layer(struct osd_state *sd, enum osd_layer layer,</div><div class='ctx'> 			     unsigned long fb_base_phys,</div><div class='ctx'> 			     unsigned long cbcr_ofst)</div><div class='ctx'> {</div><div class='del'>-	switch (layer) {</div><div class='del'>-	case WIN_OSD0:</div><div class='del'>-		osd_write(sd, fb_base_phys &amp; ~0x1F, OSD_OSDWIN0ADR);</div><div class='del'>-		break;</div><div class='del'>-	case WIN_VID0:</div><div class='del'>-		osd_write(sd, fb_base_phys &amp; ~0x1F, OSD_VIDWIN0ADR);</div><div class='del'>-		break;</div><div class='del'>-	case WIN_OSD1:</div><div class='del'>-		osd_write(sd, fb_base_phys &amp; ~0x1F, OSD_OSDWIN1ADR);</div><div class='del'>-		break;</div><div class='del'>-	case WIN_VID1:</div><div class='del'>-		osd_write(sd, fb_base_phys &amp; ~0x1F, OSD_VIDWIN1ADR);</div><div class='del'>-		break;</div><div class='add'>+</div><div class='add'>+	if (sd-&gt;vpbe_type == VPBE_VERSION_1) {</div><div class='add'>+		switch (layer) {</div><div class='add'>+		case WIN_OSD0:</div><div class='add'>+			osd_write(sd, fb_base_phys &amp; ~0x1F, OSD_OSDWIN0ADR);</div><div class='add'>+			break;</div><div class='add'>+		case WIN_VID0:</div><div class='add'>+			osd_write(sd, fb_base_phys &amp; ~0x1F, OSD_VIDWIN0ADR);</div><div class='add'>+			break;</div><div class='add'>+		case WIN_OSD1:</div><div class='add'>+			osd_write(sd, fb_base_phys &amp; ~0x1F, OSD_OSDWIN1ADR);</div><div class='add'>+			break;</div><div class='add'>+		case WIN_VID1:</div><div class='add'>+			osd_write(sd, fb_base_phys &amp; ~0x1F, OSD_VIDWIN1ADR);</div><div class='add'>+			break;</div><div class='add'>+	      }</div><div class='add'>+	} else if (sd-&gt;vpbe_type == VPBE_VERSION_3) {</div><div class='add'>+		unsigned long fb_offset_32 =</div><div class='add'>+		    (fb_base_phys - VPBE_REG_BASE) &gt;&gt; 5;</div><div class='add'>+</div><div class='add'>+		switch (layer) {</div><div class='add'>+		case WIN_OSD0:</div><div class='add'>+			osd_modify(sd, OSD_OSDWINADH_O0AH,</div><div class='add'>+				  fb_offset_32 &gt;&gt; (OSD_SRCADD_ADD_SFT -</div><div class='add'>+						   OSD_OSDWINADH_O0AH_SHIFT),</div><div class='add'>+				  OSD_OSDWINADH);</div><div class='add'>+			osd_write(sd, fb_offset_32 &amp; OSD_OSDWIN0ADL_O0AL,</div><div class='add'>+				  OSD_OSDWIN0ADL);</div><div class='add'>+			break;</div><div class='add'>+		case WIN_VID0:</div><div class='add'>+			osd_modify(sd, OSD_VIDWINADH_V0AH,</div><div class='add'>+				  fb_offset_32 &gt;&gt; (OSD_SRCADD_ADD_SFT -</div><div class='add'>+						   OSD_VIDWINADH_V0AH_SHIFT),</div><div class='add'>+				  OSD_VIDWINADH);</div><div class='add'>+			osd_write(sd, fb_offset_32 &amp; OSD_VIDWIN0ADL_V0AL,</div><div class='add'>+				  OSD_VIDWIN0ADL);</div><div class='add'>+			break;</div><div class='add'>+		case WIN_OSD1:</div><div class='add'>+			osd_modify(sd, OSD_OSDWINADH_O1AH,</div><div class='add'>+				  fb_offset_32 &gt;&gt; (OSD_SRCADD_ADD_SFT -</div><div class='add'>+						   OSD_OSDWINADH_O1AH_SHIFT),</div><div class='add'>+				  OSD_OSDWINADH);</div><div class='add'>+			osd_write(sd, fb_offset_32 &amp; OSD_OSDWIN1ADL_O1AL,</div><div class='add'>+				  OSD_OSDWIN1ADL);</div><div class='add'>+			break;</div><div class='add'>+		case WIN_VID1:</div><div class='add'>+			osd_modify(sd, OSD_VIDWINADH_V1AH,</div><div class='add'>+				  fb_offset_32 &gt;&gt; (OSD_SRCADD_ADD_SFT -</div><div class='add'>+						   OSD_VIDWINADH_V1AH_SHIFT),</div><div class='add'>+				  OSD_VIDWINADH);</div><div class='add'>+			osd_write(sd, fb_offset_32 &amp; OSD_VIDWIN1ADL_V1AL,</div><div class='add'>+				  OSD_VIDWIN1ADL);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else if (sd-&gt;vpbe_type == VPBE_VERSION_2) {</div><div class='add'>+		struct osd_window_state *win = &amp;sd-&gt;win[layer];</div><div class='add'>+		unsigned long fb_offset_32, cbcr_offset_32;</div><div class='add'>+</div><div class='add'>+		fb_offset_32 = fb_base_phys - VPBE_REG_BASE;</div><div class='add'>+		if (cbcr_ofst)</div><div class='add'>+			cbcr_offset_32 = cbcr_ofst;</div><div class='add'>+		else</div><div class='add'>+			cbcr_offset_32 = win-&gt;lconfig.line_length *</div><div class='add'>+					 win-&gt;lconfig.ysize;</div><div class='add'>+		cbcr_offset_32 += fb_offset_32;</div><div class='add'>+		fb_offset_32 = fb_offset_32 &gt;&gt; 5;</div><div class='add'>+		cbcr_offset_32 = cbcr_offset_32 &gt;&gt; 5;</div><div class='add'>+		/*</div><div class='add'>+		 * DM365: start address is 27-bit long address b26 - b23 are</div><div class='add'>+		 * in offset register b12 - b9, and * bit 26 has to be '1'</div><div class='add'>+		 */</div><div class='add'>+		if (win-&gt;lconfig.pixfmt == PIXFMT_NV12) {</div><div class='add'>+			switch (layer) {</div><div class='add'>+			case WIN_VID0:</div><div class='add'>+			case WIN_VID1:</div><div class='add'>+				/* Y is in VID0 */</div><div class='add'>+				osd_modify(sd, OSD_VIDWIN0OFST_V0AH,</div><div class='add'>+					 ((fb_offset_32 &amp; OSD_SRC_ADDR_HIGH4) &gt;&gt;</div><div class='add'>+					 (OSD_SRCADD_OFSET_SFT -</div><div class='add'>+					 OSD_WINOFST_AH_SHIFT)) |</div><div class='add'>+					 OSD_WINOFST_MASK, OSD_VIDWIN0OFST);</div><div class='add'>+				osd_modify(sd, OSD_VIDWINADH_V0AH,</div><div class='add'>+					  (fb_offset_32 &amp; OSD_SRC_ADDR_HIGH7) &gt;&gt;</div><div class='add'>+					  (OSD_SRCADD_ADD_SFT -</div><div class='add'>+					  OSD_VIDWINADH_V0AH_SHIFT),</div><div class='add'>+					   OSD_VIDWINADH);</div><div class='add'>+				osd_write(sd, fb_offset_32 &amp; OSD_WINADL_MASK,</div><div class='add'>+					  OSD_VIDWIN0ADL);</div><div class='add'>+				/* CbCr is in VID1 */</div><div class='add'>+				osd_modify(sd, OSD_VIDWIN1OFST_V1AH,</div><div class='add'>+					 ((cbcr_offset_32 &amp;</div><div class='add'>+					 OSD_SRC_ADDR_HIGH4) &gt;&gt;</div><div class='add'>+					 (OSD_SRCADD_OFSET_SFT -</div><div class='add'>+					 OSD_WINOFST_AH_SHIFT)) |</div><div class='add'>+					 OSD_WINOFST_MASK, OSD_VIDWIN1OFST);</div><div class='add'>+				osd_modify(sd, OSD_VIDWINADH_V1AH,</div><div class='add'>+					  (cbcr_offset_32 &amp;</div><div class='add'>+					  OSD_SRC_ADDR_HIGH7) &gt;&gt;</div><div class='add'>+					  (OSD_SRCADD_ADD_SFT -</div><div class='add'>+					  OSD_VIDWINADH_V1AH_SHIFT),</div><div class='add'>+					  OSD_VIDWINADH);</div><div class='add'>+				osd_write(sd, cbcr_offset_32 &amp; OSD_WINADL_MASK,</div><div class='add'>+					  OSD_VIDWIN1ADL);</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'>+		switch (layer) {</div><div class='add'>+		case WIN_OSD0:</div><div class='add'>+			osd_modify(sd, OSD_OSDWIN0OFST_O0AH,</div><div class='add'>+				 ((fb_offset_32 &amp; OSD_SRC_ADDR_HIGH4) &gt;&gt;</div><div class='add'>+				 (OSD_SRCADD_OFSET_SFT -</div><div class='add'>+				 OSD_WINOFST_AH_SHIFT)) | OSD_WINOFST_MASK,</div><div class='add'>+				  OSD_OSDWIN0OFST);</div><div class='add'>+			osd_modify(sd, OSD_OSDWINADH_O0AH,</div><div class='add'>+				 (fb_offset_32 &amp; OSD_SRC_ADDR_HIGH7) &gt;&gt;</div><div class='add'>+				 (OSD_SRCADD_ADD_SFT -</div><div class='add'>+				 OSD_OSDWINADH_O0AH_SHIFT), OSD_OSDWINADH);</div><div class='add'>+			osd_write(sd, fb_offset_32 &amp; OSD_WINADL_MASK,</div><div class='add'>+					OSD_OSDWIN0ADL);</div><div class='add'>+			break;</div><div class='add'>+		case WIN_VID0:</div><div class='add'>+			if (win-&gt;lconfig.pixfmt != PIXFMT_NV12) {</div><div class='add'>+				osd_modify(sd, OSD_VIDWIN0OFST_V0AH,</div><div class='add'>+					 ((fb_offset_32 &amp; OSD_SRC_ADDR_HIGH4) &gt;&gt;</div><div class='add'>+					 (OSD_SRCADD_OFSET_SFT -</div><div class='add'>+					 OSD_WINOFST_AH_SHIFT)) |</div><div class='add'>+					 OSD_WINOFST_MASK, OSD_VIDWIN0OFST);</div><div class='add'>+				osd_modify(sd, OSD_VIDWINADH_V0AH,</div><div class='add'>+					  (fb_offset_32 &amp; OSD_SRC_ADDR_HIGH7) &gt;&gt;</div><div class='add'>+					  (OSD_SRCADD_ADD_SFT -</div><div class='add'>+					  OSD_VIDWINADH_V0AH_SHIFT),</div><div class='add'>+					  OSD_VIDWINADH);</div><div class='add'>+				osd_write(sd, fb_offset_32 &amp; OSD_WINADL_MASK,</div><div class='add'>+					  OSD_VIDWIN0ADL);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case WIN_OSD1:</div><div class='add'>+			osd_modify(sd, OSD_OSDWIN1OFST_O1AH,</div><div class='add'>+				 ((fb_offset_32 &amp; OSD_SRC_ADDR_HIGH4) &gt;&gt;</div><div class='add'>+				 (OSD_SRCADD_OFSET_SFT -</div><div class='add'>+				 OSD_WINOFST_AH_SHIFT)) | OSD_WINOFST_MASK,</div><div class='add'>+				  OSD_OSDWIN1OFST);</div><div class='add'>+			osd_modify(sd, OSD_OSDWINADH_O1AH,</div><div class='add'>+				  (fb_offset_32 &amp; OSD_SRC_ADDR_HIGH7) &gt;&gt;</div><div class='add'>+				  (OSD_SRCADD_ADD_SFT -</div><div class='add'>+				  OSD_OSDWINADH_O1AH_SHIFT),</div><div class='add'>+				  OSD_OSDWINADH);</div><div class='add'>+			osd_write(sd, fb_offset_32 &amp; OSD_WINADL_MASK,</div><div class='add'>+					OSD_OSDWIN1ADL);</div><div class='add'>+			break;</div><div class='add'>+		case WIN_VID1:</div><div class='add'>+			if (win-&gt;lconfig.pixfmt != PIXFMT_NV12) {</div><div class='add'>+				osd_modify(sd, OSD_VIDWIN1OFST_V1AH,</div><div class='add'>+					 ((fb_offset_32 &amp; OSD_SRC_ADDR_HIGH4) &gt;&gt;</div><div class='add'>+					 (OSD_SRCADD_OFSET_SFT -</div><div class='add'>+					 OSD_WINOFST_AH_SHIFT)) |</div><div class='add'>+					 OSD_WINOFST_MASK, OSD_VIDWIN1OFST);</div><div class='add'>+				osd_modify(sd, OSD_VIDWINADH_V1AH,</div><div class='add'>+					  (fb_offset_32 &amp; OSD_SRC_ADDR_HIGH7) &gt;&gt;</div><div class='add'>+					  (OSD_SRCADD_ADD_SFT -</div><div class='add'>+					  OSD_VIDWINADH_V1AH_SHIFT),</div><div class='add'>+					  OSD_VIDWINADH);</div><div class='add'>+				osd_write(sd, fb_offset_32 &amp; OSD_WINADL_MASK,</div><div class='add'>+					  OSD_VIDWIN1ADL);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -545,7 +784,7 @@ static int try_layer_config(struct osd_state *sd, enum osd_layer layer,</div><div class='ctx'> {</div><div class='ctx'> 	struct osd_state *osd = sd;</div><div class='ctx'> 	struct osd_window_state *win = &amp;osd-&gt;win[layer];</div><div class='del'>-	int bad_config;</div><div class='add'>+	int bad_config = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* verify that the pixel format is compatible with the layer */</div><div class='ctx'> 	switch (lconfig-&gt;pixfmt) {</div><div class='hunk'>@@ -554,17 +793,25 @@ static int try_layer_config(struct osd_state *sd, enum osd_layer layer,</div><div class='ctx'> 	case PIXFMT_4BPP:</div><div class='ctx'> 	case PIXFMT_8BPP:</div><div class='ctx'> 	case PIXFMT_RGB565:</div><div class='del'>-		bad_config = !is_osd_win(layer);</div><div class='add'>+		if (osd-&gt;vpbe_type == VPBE_VERSION_1)</div><div class='add'>+			bad_config = !is_vid_win(layer);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PIXFMT_YCbCrI:</div><div class='ctx'> 	case PIXFMT_YCrCbI:</div><div class='ctx'> 		bad_config = !is_vid_win(layer);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PIXFMT_RGB888:</div><div class='del'>-		bad_config = !is_vid_win(layer);</div><div class='add'>+		if (osd-&gt;vpbe_type == VPBE_VERSION_1)</div><div class='add'>+			bad_config = !is_vid_win(layer);</div><div class='add'>+		else if ((osd-&gt;vpbe_type == VPBE_VERSION_3) ||</div><div class='add'>+			 (osd-&gt;vpbe_type == VPBE_VERSION_2))</div><div class='add'>+			bad_config = !is_osd_win(layer);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PIXFMT_NV12:</div><div class='del'>-		bad_config = 1;</div><div class='add'>+		if (osd-&gt;vpbe_type != VPBE_VERSION_2)</div><div class='add'>+			bad_config = 1;</div><div class='add'>+		else</div><div class='add'>+			bad_config = is_osd_win(layer);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PIXFMT_OSD_ATTR:</div><div class='ctx'> 		bad_config = (layer != WIN_OSD1);</div><div class='hunk'>@@ -584,7 +831,8 @@ static int try_layer_config(struct osd_state *sd, enum osd_layer layer,</div><div class='ctx'> </div><div class='ctx'> 	/* DM6446: */</div><div class='ctx'> 	/* only one OSD window at a time can use RGB pixel formats */</div><div class='del'>-	if (is_osd_win(layer) &amp;&amp; is_rgb_pixfmt(lconfig-&gt;pixfmt)) {</div><div class='add'>+	  if ((osd-&gt;vpbe_type == VPBE_VERSION_1) &amp;&amp;</div><div class='add'>+		  is_osd_win(layer) &amp;&amp; is_rgb_pixfmt(lconfig-&gt;pixfmt)) {</div><div class='ctx'> 		enum osd_pix_format pixfmt;</div><div class='ctx'> 		if (layer == WIN_OSD0)</div><div class='ctx'> 			pixfmt = osd-&gt;win[WIN_OSD1].lconfig.pixfmt;</div><div class='hunk'>@@ -602,7 +850,8 @@ static int try_layer_config(struct osd_state *sd, enum osd_layer layer,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* DM6446: only one video window at a time can use RGB888 */</div><div class='del'>-	if (is_vid_win(layer) &amp;&amp; lconfig-&gt;pixfmt == PIXFMT_RGB888) {</div><div class='add'>+	if ((osd-&gt;vpbe_type == VPBE_VERSION_1) &amp;&amp; is_vid_win(layer) &amp;&amp;</div><div class='add'>+		lconfig-&gt;pixfmt == PIXFMT_RGB888) {</div><div class='ctx'> 		enum osd_pix_format pixfmt;</div><div class='ctx'> </div><div class='ctx'> 		if (layer == WIN_VID0)</div><div class='hunk'>@@ -652,7 +901,8 @@ static void _osd_disable_vid_rgb888(struct osd_state *sd)</div><div class='ctx'> 	 * The caller must ensure that neither video window is currently</div><div class='ctx'> 	 * configured for RGB888 pixel format.</div><div class='ctx'> 	 */</div><div class='del'>-	osd_clear(sd, OSD_MISCCTL_RGBEN, OSD_MISCCTL);</div><div class='add'>+	if (sd-&gt;vpbe_type == VPBE_VERSION_1)</div><div class='add'>+		osd_clear(sd, OSD_MISCCTL_RGBEN, OSD_MISCCTL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void _osd_enable_vid_rgb888(struct osd_state *sd,</div><div class='hunk'>@@ -665,13 +915,14 @@ static void _osd_enable_vid_rgb888(struct osd_state *sd,</div><div class='ctx'> 	 * currently configured for RGB888 pixel format, as this routine will</div><div class='ctx'> 	 * disable RGB888 pixel format for the other window.</div><div class='ctx'> 	 */</div><div class='del'>-	if (layer == WIN_VID0) {</div><div class='del'>-		osd_modify(sd, OSD_MISCCTL_RGBEN | OSD_MISCCTL_RGBWIN,</div><div class='del'>-			  OSD_MISCCTL_RGBEN, OSD_MISCCTL);</div><div class='del'>-	} else if (layer == WIN_VID1) {</div><div class='del'>-		osd_modify(sd, OSD_MISCCTL_RGBEN | OSD_MISCCTL_RGBWIN,</div><div class='del'>-			  OSD_MISCCTL_RGBEN | OSD_MISCCTL_RGBWIN,</div><div class='del'>-			  OSD_MISCCTL);</div><div class='add'>+	if (sd-&gt;vpbe_type == VPBE_VERSION_1) {</div><div class='add'>+		if (layer == WIN_VID0)</div><div class='add'>+			osd_modify(sd, OSD_MISCCTL_RGBEN | OSD_MISCCTL_RGBWIN,</div><div class='add'>+				  OSD_MISCCTL_RGBEN, OSD_MISCCTL);</div><div class='add'>+		else if (layer == WIN_VID1)</div><div class='add'>+			osd_modify(sd, OSD_MISCCTL_RGBEN | OSD_MISCCTL_RGBWIN,</div><div class='add'>+				  OSD_MISCCTL_RGBEN | OSD_MISCCTL_RGBWIN,</div><div class='add'>+				  OSD_MISCCTL);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -697,9 +948,30 @@ static void _osd_set_layer_config(struct osd_state *sd, enum osd_layer layer,</div><div class='ctx'> </div><div class='ctx'> 	switch (layer) {</div><div class='ctx'> 	case WIN_OSD0:</div><div class='del'>-		winmd_mask |= OSD_OSDWIN0MD_RGB0E;</div><div class='del'>-		if (lconfig-&gt;pixfmt == PIXFMT_RGB565)</div><div class='del'>-			winmd |= OSD_OSDWIN0MD_RGB0E;</div><div class='add'>+		if (sd-&gt;vpbe_type == VPBE_VERSION_1) {</div><div class='add'>+			winmd_mask |= OSD_OSDWIN0MD_RGB0E;</div><div class='add'>+			if (lconfig-&gt;pixfmt == PIXFMT_RGB565)</div><div class='add'>+				winmd |= OSD_OSDWIN0MD_RGB0E;</div><div class='add'>+		} else if ((sd-&gt;vpbe_type == VPBE_VERSION_3) ||</div><div class='add'>+		  (sd-&gt;vpbe_type == VPBE_VERSION_2)) {</div><div class='add'>+			winmd_mask |= OSD_OSDWIN0MD_BMP0MD;</div><div class='add'>+			switch (lconfig-&gt;pixfmt) {</div><div class='add'>+			case PIXFMT_RGB565:</div><div class='add'>+					winmd |= (1 &lt;&lt;</div><div class='add'>+					OSD_OSDWIN0MD_BMP0MD_SHIFT);</div><div class='add'>+					break;</div><div class='add'>+			case PIXFMT_RGB888:</div><div class='add'>+				winmd |= (2 &lt;&lt; OSD_OSDWIN0MD_BMP0MD_SHIFT);</div><div class='add'>+				_osd_enable_rgb888_pixblend(sd, OSDWIN_OSD0);</div><div class='add'>+				break;</div><div class='add'>+			case PIXFMT_YCbCrI:</div><div class='add'>+			case PIXFMT_YCrCbI:</div><div class='add'>+				winmd |= (3 &lt;&lt; OSD_OSDWIN0MD_BMP0MD_SHIFT);</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='ctx'> </div><div class='ctx'> 		winmd_mask |= OSD_OSDWIN0MD_BMW0 | OSD_OSDWIN0MD_OFF0;</div><div class='ctx'> </div><div class='hunk'>@@ -749,12 +1021,59 @@ static void _osd_set_layer_config(struct osd_state *sd, enum osd_layer layer,</div><div class='ctx'> 		 * For YUV420P format the register contents are</div><div class='ctx'> 		 * duplicated in both VID registers</div><div class='ctx'> 		 */</div><div class='add'>+		if ((sd-&gt;vpbe_type == VPBE_VERSION_2) &amp;&amp;</div><div class='add'>+				(lconfig-&gt;pixfmt == PIXFMT_NV12)) {</div><div class='add'>+			/* other window also */</div><div class='add'>+			if (lconfig-&gt;interlaced) {</div><div class='add'>+				winmd_mask |= OSD_VIDWINMD_VFF1;</div><div class='add'>+				winmd |= OSD_VIDWINMD_VFF1;</div><div class='add'>+				osd_modify(sd, winmd_mask, winmd,</div><div class='add'>+					  OSD_VIDWINMD);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			osd_modify(sd, OSD_MISCCTL_S420D,</div><div class='add'>+				    OSD_MISCCTL_S420D, OSD_MISCCTL);</div><div class='add'>+			osd_write(sd, lconfig-&gt;line_length &gt;&gt; 5,</div><div class='add'>+				  OSD_VIDWIN1OFST);</div><div class='add'>+			osd_write(sd, lconfig-&gt;xpos, OSD_VIDWIN1XP);</div><div class='add'>+			osd_write(sd, lconfig-&gt;xsize, OSD_VIDWIN1XL);</div><div class='add'>+			/*</div><div class='add'>+			  * if NV21 pixfmt and line length not 32B</div><div class='add'>+			  * aligned (e.g. NTSC), Need to set window</div><div class='add'>+			  * X pixel size to be 32B aligned as well</div><div class='add'>+			  */</div><div class='add'>+			if (lconfig-&gt;xsize % 32) {</div><div class='add'>+				osd_write(sd,</div><div class='add'>+					  ((lconfig-&gt;xsize + 31) &amp; ~31),</div><div class='add'>+					  OSD_VIDWIN1XL);</div><div class='add'>+				osd_write(sd,</div><div class='add'>+					  ((lconfig-&gt;xsize + 31) &amp; ~31),</div><div class='add'>+					  OSD_VIDWIN0XL);</div><div class='add'>+			}</div><div class='add'>+		} else if ((sd-&gt;vpbe_type == VPBE_VERSION_2) &amp;&amp;</div><div class='add'>+				(lconfig-&gt;pixfmt != PIXFMT_NV12)) {</div><div class='add'>+			osd_modify(sd, OSD_MISCCTL_S420D, ~OSD_MISCCTL_S420D,</div><div class='add'>+						OSD_MISCCTL);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (lconfig-&gt;interlaced) {</div><div class='ctx'> 			osd_write(sd, lconfig-&gt;ypos &gt;&gt; 1, OSD_VIDWIN0YP);</div><div class='ctx'> 			osd_write(sd, lconfig-&gt;ysize &gt;&gt; 1, OSD_VIDWIN0YL);</div><div class='add'>+			if ((sd-&gt;vpbe_type == VPBE_VERSION_2) &amp;&amp;</div><div class='add'>+				lconfig-&gt;pixfmt == PIXFMT_NV12) {</div><div class='add'>+				osd_write(sd, lconfig-&gt;ypos &gt;&gt; 1,</div><div class='add'>+					  OSD_VIDWIN1YP);</div><div class='add'>+				osd_write(sd, lconfig-&gt;ysize &gt;&gt; 1,</div><div class='add'>+					  OSD_VIDWIN1YL);</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			osd_write(sd, lconfig-&gt;ypos, OSD_VIDWIN0YP);</div><div class='ctx'> 			osd_write(sd, lconfig-&gt;ysize, OSD_VIDWIN0YL);</div><div class='add'>+			if ((sd-&gt;vpbe_type == VPBE_VERSION_2) &amp;&amp;</div><div class='add'>+				lconfig-&gt;pixfmt == PIXFMT_NV12) {</div><div class='add'>+				osd_write(sd, lconfig-&gt;ypos, OSD_VIDWIN1YP);</div><div class='add'>+				osd_write(sd, lconfig-&gt;ysize, OSD_VIDWIN1YL);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WIN_OSD1:</div><div class='hunk'>@@ -764,14 +1083,43 @@ static void _osd_set_layer_config(struct osd_state *sd, enum osd_layer layer,</div><div class='ctx'> 		 * attribute mode to a normal mode.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (lconfig-&gt;pixfmt == PIXFMT_OSD_ATTR) {</div><div class='del'>-			winmd_mask |=</div><div class='del'>-			    OSD_OSDWIN1MD_ATN1E | OSD_OSDWIN1MD_RGB1E |</div><div class='del'>-			    OSD_OSDWIN1MD_CLUTS1 |</div><div class='del'>-			    OSD_OSDWIN1MD_BLND1 | OSD_OSDWIN1MD_TE1;</div><div class='add'>+			if (sd-&gt;vpbe_type == VPBE_VERSION_1) {</div><div class='add'>+				winmd_mask |= OSD_OSDWIN1MD_ATN1E |</div><div class='add'>+				OSD_OSDWIN1MD_RGB1E | OSD_OSDWIN1MD_CLUTS1 |</div><div class='add'>+				OSD_OSDWIN1MD_BLND1 | OSD_OSDWIN1MD_TE1;</div><div class='add'>+			} else {</div><div class='add'>+				winmd_mask |= OSD_OSDWIN1MD_BMP1MD |</div><div class='add'>+				OSD_OSDWIN1MD_CLUTS1 | OSD_OSDWIN1MD_BLND1 |</div><div class='add'>+				OSD_OSDWIN1MD_TE1;</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='del'>-			winmd_mask |= OSD_OSDWIN1MD_RGB1E;</div><div class='del'>-			if (lconfig-&gt;pixfmt == PIXFMT_RGB565)</div><div class='del'>-				winmd |= OSD_OSDWIN1MD_RGB1E;</div><div class='add'>+			if (sd-&gt;vpbe_type == VPBE_VERSION_1) {</div><div class='add'>+				winmd_mask |= OSD_OSDWIN1MD_RGB1E;</div><div class='add'>+				if (lconfig-&gt;pixfmt == PIXFMT_RGB565)</div><div class='add'>+					winmd |= OSD_OSDWIN1MD_RGB1E;</div><div class='add'>+			} else if ((sd-&gt;vpbe_type == VPBE_VERSION_3)</div><div class='add'>+				   || (sd-&gt;vpbe_type == VPBE_VERSION_2)) {</div><div class='add'>+				winmd_mask |= OSD_OSDWIN1MD_BMP1MD;</div><div class='add'>+				switch (lconfig-&gt;pixfmt) {</div><div class='add'>+				case PIXFMT_RGB565:</div><div class='add'>+					winmd |=</div><div class='add'>+					    (1 &lt;&lt; OSD_OSDWIN1MD_BMP1MD_SHIFT);</div><div class='add'>+					break;</div><div class='add'>+				case PIXFMT_RGB888:</div><div class='add'>+					winmd |=</div><div class='add'>+					    (2 &lt;&lt; OSD_OSDWIN1MD_BMP1MD_SHIFT);</div><div class='add'>+					_osd_enable_rgb888_pixblend(sd,</div><div class='add'>+							OSDWIN_OSD1);</div><div class='add'>+					break;</div><div class='add'>+				case PIXFMT_YCbCrI:</div><div class='add'>+				case PIXFMT_YCrCbI:</div><div class='add'>+					winmd |=</div><div class='add'>+					    (3 &lt;&lt; OSD_OSDWIN1MD_BMP1MD_SHIFT);</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='ctx'> </div><div class='ctx'> 			winmd_mask |= OSD_OSDWIN1MD_BMW1;</div><div class='ctx'> 			switch (lconfig-&gt;pixfmt) {</div><div class='hunk'>@@ -822,15 +1170,45 @@ static void _osd_set_layer_config(struct osd_state *sd, enum osd_layer layer,</div><div class='ctx'> 		 * For YUV420P format the register contents are</div><div class='ctx'> 		 * duplicated in both VID registers</div><div class='ctx'> 		 */</div><div class='del'>-		osd_modify(sd, OSD_MISCCTL_S420D, ~OSD_MISCCTL_S420D,</div><div class='del'>-			   OSD_MISCCTL);</div><div class='add'>+		if (sd-&gt;vpbe_type == VPBE_VERSION_2) {</div><div class='add'>+			if (lconfig-&gt;pixfmt == PIXFMT_NV12) {</div><div class='add'>+				/* other window also */</div><div class='add'>+				if (lconfig-&gt;interlaced) {</div><div class='add'>+					winmd_mask |= OSD_VIDWINMD_VFF0;</div><div class='add'>+					winmd |= OSD_VIDWINMD_VFF0;</div><div class='add'>+					osd_modify(sd, winmd_mask, winmd,</div><div class='add'>+						  OSD_VIDWINMD);</div><div class='add'>+				}</div><div class='add'>+				osd_modify(sd, OSD_MISCCTL_S420D,</div><div class='add'>+					   OSD_MISCCTL_S420D, OSD_MISCCTL);</div><div class='add'>+				osd_write(sd, lconfig-&gt;line_length &gt;&gt; 5,</div><div class='add'>+					  OSD_VIDWIN0OFST);</div><div class='add'>+				osd_write(sd, lconfig-&gt;xpos, OSD_VIDWIN0XP);</div><div class='add'>+				osd_write(sd, lconfig-&gt;xsize, OSD_VIDWIN0XL);</div><div class='add'>+			} else {</div><div class='add'>+				osd_modify(sd, OSD_MISCCTL_S420D,</div><div class='add'>+					   ~OSD_MISCCTL_S420D, OSD_MISCCTL);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (lconfig-&gt;interlaced) {</div><div class='ctx'> 			osd_write(sd, lconfig-&gt;ypos &gt;&gt; 1, OSD_VIDWIN1YP);</div><div class='ctx'> 			osd_write(sd, lconfig-&gt;ysize &gt;&gt; 1, OSD_VIDWIN1YL);</div><div class='add'>+			if ((sd-&gt;vpbe_type == VPBE_VERSION_2) &amp;&amp;</div><div class='add'>+				lconfig-&gt;pixfmt == PIXFMT_NV12) {</div><div class='add'>+				osd_write(sd, lconfig-&gt;ypos &gt;&gt; 1,</div><div class='add'>+					  OSD_VIDWIN0YP);</div><div class='add'>+				osd_write(sd, lconfig-&gt;ysize &gt;&gt; 1,</div><div class='add'>+					  OSD_VIDWIN0YL);</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			osd_write(sd, lconfig-&gt;ypos, OSD_VIDWIN1YP);</div><div class='ctx'> 			osd_write(sd, lconfig-&gt;ysize, OSD_VIDWIN1YL);</div><div class='add'>+			if ((sd-&gt;vpbe_type == VPBE_VERSION_2) &amp;&amp;</div><div class='add'>+				lconfig-&gt;pixfmt == PIXFMT_NV12) {</div><div class='add'>+				osd_write(sd, lconfig-&gt;ypos, OSD_VIDWIN0YP);</div><div class='add'>+				osd_write(sd, lconfig-&gt;ysize, OSD_VIDWIN0YL);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1089,6 +1467,11 @@ static void _osd_init(struct osd_state *sd)</div><div class='ctx'> 	osd_write(sd, 0, OSD_OSDWIN1MD);</div><div class='ctx'> 	osd_write(sd, 0, OSD_RECTCUR);</div><div class='ctx'> 	osd_write(sd, 0, OSD_MISCCTL);</div><div class='add'>+	if (sd-&gt;vpbe_type == VPBE_VERSION_3) {</div><div class='add'>+		osd_write(sd, 0, OSD_VBNDRY);</div><div class='add'>+		osd_write(sd, 0, OSD_EXTMODE);</div><div class='add'>+		osd_write(sd, OSD_MISCCTL_DMANG, OSD_MISCCTL);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void osd_set_left_margin(struct osd_state *sd, u32 val)</div><div class='hunk'>@@ -1110,6 +1493,14 @@ static int osd_initialize(struct osd_state *osd)</div><div class='ctx'> 	/* set default Cb/Cr order */</div><div class='ctx'> 	osd-&gt;yc_pixfmt = PIXFMT_YCbCrI;</div><div class='ctx'> </div><div class='add'>+	if (osd-&gt;vpbe_type == VPBE_VERSION_3) {</div><div class='add'>+		/*</div><div class='add'>+		 * ROM CLUT1 on the DM355 is similar (identical?) to ROM CLUT0</div><div class='add'>+		 * on the DM6446, so make ROM_CLUT1 the default on the DM355.</div><div class='add'>+		 */</div><div class='add'>+		osd-&gt;rom_clut = ROM_CLUT1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	_osd_set_field_inversion(osd, osd-&gt;field_inversion);</div><div class='ctx'> 	_osd_set_rom_clut(osd, osd-&gt;rom_clut);</div><div class='ctx'> </div><div class='hunk'>@@ -1208,23 +1599,7 @@ static struct platform_driver osd_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int osd_init(void)</div><div class='del'>-{</div><div class='del'>-	if (platform_driver_register(&amp;osd_driver)) {</div><div class='del'>-		printk(KERN_ERR "Unable to register davinci osd driver\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void osd_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;osd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(osd_init);</div><div class='del'>-module_exit(osd_exit);</div><div class='add'>+module_platform_driver(osd_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("DaVinci OSD Manager Driver");</div><div class='head'>diff --git a/drivers/media/video/davinci/vpbe_venc.c b/drivers/media/video/davinci/vpbe_venc.c<br/>index 03a3e5c65ee7..00e80f59d5d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/vpbe_venc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/vpbe_venc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/vpbe_venc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/davinci/vpbe_venc.c</a></div><div class='hunk'>@@ -99,6 +99,8 @@ static inline u32 vdaccfg_write(struct v4l2_subdev *sd, u32 val)</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define VDAC_COMPONENT	0x543</div><div class='add'>+#define VDAC_S_VIDEO	0x210</div><div class='ctx'> /* This function sets the dac of the VPBE for various outputs</div><div class='ctx'>  */</div><div class='ctx'> static int venc_set_dac(struct v4l2_subdev *sd, u32 out_index)</div><div class='hunk'>@@ -109,11 +111,12 @@ static int venc_set_dac(struct v4l2_subdev *sd, u32 out_index)</div><div class='ctx'> 		venc_write(sd, VENC_DACSEL, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		v4l2_dbg(debug, 1, sd, "Setting output to S-Video\n");</div><div class='del'>-		venc_write(sd, VENC_DACSEL, 0x210);</div><div class='add'>+		v4l2_dbg(debug, 1, sd, "Setting output to Component\n");</div><div class='add'>+		venc_write(sd, VENC_DACSEL, VDAC_COMPONENT);</div><div class='ctx'> 		break;</div><div class='del'>-	case  2:</div><div class='del'>-		venc_write(sd, VENC_DACSEL, 0x543);</div><div class='add'>+	case 2:</div><div class='add'>+		v4l2_dbg(debug, 1, sd, "Setting output to S-video\n");</div><div class='add'>+		venc_write(sd, VENC_DACSEL, VDAC_S_VIDEO);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -124,6 +127,8 @@ static int venc_set_dac(struct v4l2_subdev *sd, u32 out_index)</div><div class='ctx'> </div><div class='ctx'> static void venc_enabledigitaloutput(struct v4l2_subdev *sd, int benable)</div><div class='ctx'> {</div><div class='add'>+	struct venc_state *venc = to_state(sd);</div><div class='add'>+	struct venc_platform_data *pdata = venc-&gt;pdata;</div><div class='ctx'> 	v4l2_dbg(debug, 2, sd, "venc_enabledigitaloutput\n");</div><div class='ctx'> </div><div class='ctx'> 	if (benable) {</div><div class='hunk'>@@ -155,7 +160,8 @@ static void venc_enabledigitaloutput(struct v4l2_subdev *sd, int benable)</div><div class='ctx'> </div><div class='ctx'> 		/* Disable LCD output control (accepting default polarity) */</div><div class='ctx'> 		venc_write(sd, VENC_LCDOUT, 0);</div><div class='del'>-		venc_write(sd, VENC_CMPNT, 0x100);</div><div class='add'>+		if (pdata-&gt;venc_type != VPBE_VERSION_3)</div><div class='add'>+			venc_write(sd, VENC_CMPNT, 0x100);</div><div class='ctx'> 		venc_write(sd, VENC_HSPLS, 0);</div><div class='ctx'> 		venc_write(sd, VENC_HINT, 0);</div><div class='ctx'> 		venc_write(sd, VENC_HSTART, 0);</div><div class='hunk'>@@ -178,11 +184,14 @@ static void venc_enabledigitaloutput(struct v4l2_subdev *sd, int benable)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define VDAC_CONFIG_SD_V3	0x0E21A6B6</div><div class='add'>+#define VDAC_CONFIG_SD_V2	0x081141CF</div><div class='ctx'> /*</div><div class='ctx'>  * setting NTSC mode</div><div class='ctx'>  */</div><div class='ctx'> static int venc_set_ntsc(struct v4l2_subdev *sd)</div><div class='ctx'> {</div><div class='add'>+	u32 val;</div><div class='ctx'> 	struct venc_state *venc = to_state(sd);</div><div class='ctx'> 	struct venc_platform_data *pdata = venc-&gt;pdata;</div><div class='ctx'> </div><div class='hunk'>@@ -195,12 +204,22 @@ static int venc_set_ntsc(struct v4l2_subdev *sd)</div><div class='ctx'> </div><div class='ctx'> 	venc_enabledigitaloutput(sd, 0);</div><div class='ctx'> </div><div class='del'>-	/* to set VENC CLK DIV to 1 - final clock is 54 MHz */</div><div class='del'>-	venc_modify(sd, VENC_VIDCTL, 0, 1 &lt;&lt; 1);</div><div class='del'>-	/* Set REC656 Mode */</div><div class='del'>-	venc_write(sd, VENC_YCCCTL, 0x1);</div><div class='del'>-	venc_modify(sd, VENC_VDPRO, 0, VENC_VDPRO_DAFRQ);</div><div class='del'>-	venc_modify(sd, VENC_VDPRO, 0, VENC_VDPRO_DAUPS);</div><div class='add'>+	if (pdata-&gt;venc_type == VPBE_VERSION_3) {</div><div class='add'>+		venc_write(sd, VENC_CLKCTL, 0x01);</div><div class='add'>+		venc_write(sd, VENC_VIDCTL, 0);</div><div class='add'>+		val = vdaccfg_write(sd, VDAC_CONFIG_SD_V3);</div><div class='add'>+	} else if (pdata-&gt;venc_type == VPBE_VERSION_2) {</div><div class='add'>+		venc_write(sd, VENC_CLKCTL, 0x01);</div><div class='add'>+		venc_write(sd, VENC_VIDCTL, 0);</div><div class='add'>+		vdaccfg_write(sd, VDAC_CONFIG_SD_V2);</div><div class='add'>+	} else {</div><div class='add'>+		/* to set VENC CLK DIV to 1 - final clock is 54 MHz */</div><div class='add'>+		venc_modify(sd, VENC_VIDCTL, 0, 1 &lt;&lt; 1);</div><div class='add'>+		/* Set REC656 Mode */</div><div class='add'>+		venc_write(sd, VENC_YCCCTL, 0x1);</div><div class='add'>+		venc_modify(sd, VENC_VDPRO, 0, VENC_VDPRO_DAFRQ);</div><div class='add'>+		venc_modify(sd, VENC_VDPRO, 0, VENC_VDPRO_DAUPS);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	venc_write(sd, VENC_VMOD, 0);</div><div class='ctx'> 	venc_modify(sd, VENC_VMOD, (1 &lt;&lt; VENC_VMOD_VIE_SHIFT),</div><div class='hunk'>@@ -220,6 +239,7 @@ static int venc_set_ntsc(struct v4l2_subdev *sd)</div><div class='ctx'> static int venc_set_pal(struct v4l2_subdev *sd)</div><div class='ctx'> {</div><div class='ctx'> 	struct venc_state *venc = to_state(sd);</div><div class='add'>+	struct venc_platform_data *pdata = venc-&gt;pdata;</div><div class='ctx'> </div><div class='ctx'> 	v4l2_dbg(debug, 2, sd, "venc_set_pal\n");</div><div class='ctx'> </div><div class='hunk'>@@ -230,10 +250,20 @@ static int venc_set_pal(struct v4l2_subdev *sd)</div><div class='ctx'> </div><div class='ctx'> 	venc_enabledigitaloutput(sd, 0);</div><div class='ctx'> </div><div class='del'>-	/* to set VENC CLK DIV to 1 - final clock is 54 MHz */</div><div class='del'>-	venc_modify(sd, VENC_VIDCTL, 0, 1 &lt;&lt; 1);</div><div class='del'>-	/* Set REC656 Mode */</div><div class='del'>-	venc_write(sd, VENC_YCCCTL, 0x1);</div><div class='add'>+	if (pdata-&gt;venc_type == VPBE_VERSION_3) {</div><div class='add'>+		venc_write(sd, VENC_CLKCTL, 0x1);</div><div class='add'>+		venc_write(sd, VENC_VIDCTL, 0);</div><div class='add'>+		vdaccfg_write(sd, VDAC_CONFIG_SD_V3);</div><div class='add'>+	} else if (pdata-&gt;venc_type == VPBE_VERSION_2) {</div><div class='add'>+		venc_write(sd, VENC_CLKCTL, 0x1);</div><div class='add'>+		venc_write(sd, VENC_VIDCTL, 0);</div><div class='add'>+		vdaccfg_write(sd, VDAC_CONFIG_SD_V2);</div><div class='add'>+	} else {</div><div class='add'>+		/* to set VENC CLK DIV to 1 - final clock is 54 MHz */</div><div class='add'>+		venc_modify(sd, VENC_VIDCTL, 0, 1 &lt;&lt; 1);</div><div class='add'>+		/* Set REC656 Mode */</div><div class='add'>+		venc_write(sd, VENC_YCCCTL, 0x1);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	venc_modify(sd, VENC_SYNCCTL, 1 &lt;&lt; VENC_SYNCCTL_OVD_SHIFT,</div><div class='ctx'> 			VENC_SYNCCTL_OVD);</div><div class='hunk'>@@ -252,6 +282,7 @@ static int venc_set_pal(struct v4l2_subdev *sd)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define VDAC_CONFIG_HD_V2	0x081141EF</div><div class='ctx'> /*</div><div class='ctx'>  * venc_set_480p59_94</div><div class='ctx'>  *</div><div class='hunk'>@@ -263,6 +294,9 @@ static int venc_set_480p59_94(struct v4l2_subdev *sd)</div><div class='ctx'> 	struct venc_platform_data *pdata = venc-&gt;pdata;</div><div class='ctx'> </div><div class='ctx'> 	v4l2_dbg(debug, 2, sd, "venc_set_480p59_94\n");</div><div class='add'>+	if ((pdata-&gt;venc_type != VPBE_VERSION_1) &amp;&amp;</div><div class='add'>+	    (pdata-&gt;venc_type != VPBE_VERSION_2))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Setup clock at VPSS &amp; VENC for SD */</div><div class='ctx'> 	if (pdata-&gt;setup_clock(VPBE_ENC_DV_PRESET, V4L2_DV_480P59_94) &lt; 0)</div><div class='hunk'>@@ -270,12 +304,18 @@ static int venc_set_480p59_94(struct v4l2_subdev *sd)</div><div class='ctx'> </div><div class='ctx'> 	venc_enabledigitaloutput(sd, 0);</div><div class='ctx'> </div><div class='add'>+	if (pdata-&gt;venc_type == VPBE_VERSION_2)</div><div class='add'>+		vdaccfg_write(sd, VDAC_CONFIG_HD_V2);</div><div class='ctx'> 	venc_write(sd, VENC_OSDCLK0, 0);</div><div class='ctx'> 	venc_write(sd, VENC_OSDCLK1, 1);</div><div class='del'>-	venc_modify(sd, VENC_VDPRO, VENC_VDPRO_DAFRQ,</div><div class='del'>-		    VENC_VDPRO_DAFRQ);</div><div class='del'>-	venc_modify(sd, VENC_VDPRO, VENC_VDPRO_DAUPS,</div><div class='del'>-		    VENC_VDPRO_DAUPS);</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;venc_type == VPBE_VERSION_1) {</div><div class='add'>+		venc_modify(sd, VENC_VDPRO, VENC_VDPRO_DAFRQ,</div><div class='add'>+			    VENC_VDPRO_DAFRQ);</div><div class='add'>+		venc_modify(sd, VENC_VDPRO, VENC_VDPRO_DAUPS,</div><div class='add'>+			    VENC_VDPRO_DAUPS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	venc_write(sd, VENC_VMOD, 0);</div><div class='ctx'> 	venc_modify(sd, VENC_VMOD, (1 &lt;&lt; VENC_VMOD_VIE_SHIFT),</div><div class='ctx'> 		    VENC_VMOD_VIE);</div><div class='hunk'>@@ -302,19 +342,27 @@ static int venc_set_576p50(struct v4l2_subdev *sd)</div><div class='ctx'> </div><div class='ctx'> 	v4l2_dbg(debug, 2, sd, "venc_set_576p50\n");</div><div class='ctx'> </div><div class='add'>+	if ((pdata-&gt;venc_type != VPBE_VERSION_1) &amp;&amp;</div><div class='add'>+	  (pdata-&gt;venc_type != VPBE_VERSION_2))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	/* Setup clock at VPSS &amp; VENC for SD */</div><div class='ctx'> 	if (pdata-&gt;setup_clock(VPBE_ENC_DV_PRESET, V4L2_DV_576P50) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	venc_enabledigitaloutput(sd, 0);</div><div class='ctx'> </div><div class='add'>+	if (pdata-&gt;venc_type == VPBE_VERSION_2)</div><div class='add'>+		vdaccfg_write(sd, VDAC_CONFIG_HD_V2);</div><div class='add'>+</div><div class='ctx'> 	venc_write(sd, VENC_OSDCLK0, 0);</div><div class='ctx'> 	venc_write(sd, VENC_OSDCLK1, 1);</div><div class='ctx'> </div><div class='del'>-	venc_modify(sd, VENC_VDPRO, VENC_VDPRO_DAFRQ,</div><div class='del'>-		    VENC_VDPRO_DAFRQ);</div><div class='del'>-	venc_modify(sd, VENC_VDPRO, VENC_VDPRO_DAUPS,</div><div class='del'>-		    VENC_VDPRO_DAUPS);</div><div class='add'>+	if (pdata-&gt;venc_type == VPBE_VERSION_1) {</div><div class='add'>+		venc_modify(sd, VENC_VDPRO, VENC_VDPRO_DAFRQ,</div><div class='add'>+			    VENC_VDPRO_DAFRQ);</div><div class='add'>+		venc_modify(sd, VENC_VDPRO, VENC_VDPRO_DAUPS,</div><div class='add'>+			    VENC_VDPRO_DAUPS);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	venc_write(sd, VENC_VMOD, 0);</div><div class='ctx'> 	venc_modify(sd, VENC_VMOD, (1 &lt;&lt; VENC_VMOD_VIE_SHIFT),</div><div class='hunk'>@@ -330,6 +378,63 @@ static int venc_set_576p50(struct v4l2_subdev *sd)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * venc_set_720p60_internal - Setup 720p60 in venc for dm365 only</div><div class='add'>+ */</div><div class='add'>+static int venc_set_720p60_internal(struct v4l2_subdev *sd)</div><div class='add'>+{</div><div class='add'>+	struct venc_state *venc = to_state(sd);</div><div class='add'>+	struct venc_platform_data *pdata = venc-&gt;pdata;</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;setup_clock(VPBE_ENC_DV_PRESET, V4L2_DV_720P60) &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	venc_enabledigitaloutput(sd, 0);</div><div class='add'>+</div><div class='add'>+	venc_write(sd, VENC_OSDCLK0, 0);</div><div class='add'>+	venc_write(sd, VENC_OSDCLK1, 1);</div><div class='add'>+</div><div class='add'>+	venc_write(sd, VENC_VMOD, 0);</div><div class='add'>+	/* DM365 component HD mode */</div><div class='add'>+	venc_modify(sd, VENC_VMOD, (1 &lt;&lt; VENC_VMOD_VIE_SHIFT),</div><div class='add'>+	    VENC_VMOD_VIE);</div><div class='add'>+	venc_modify(sd, VENC_VMOD, VENC_VMOD_HDMD, VENC_VMOD_HDMD);</div><div class='add'>+	venc_modify(sd, VENC_VMOD, (HDTV_720P &lt;&lt; VENC_VMOD_TVTYP_SHIFT),</div><div class='add'>+		    VENC_VMOD_TVTYP);</div><div class='add'>+	venc_modify(sd, VENC_VMOD, VENC_VMOD_VENC, VENC_VMOD_VENC);</div><div class='add'>+	venc_write(sd, VENC_XHINTVL, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * venc_set_1080i30_internal - Setup 1080i30 in venc for dm365 only</div><div class='add'>+ */</div><div class='add'>+static int venc_set_1080i30_internal(struct v4l2_subdev *sd)</div><div class='add'>+{</div><div class='add'>+	struct venc_state *venc = to_state(sd);</div><div class='add'>+	struct venc_platform_data *pdata = venc-&gt;pdata;</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;setup_clock(VPBE_ENC_DV_PRESET, V4L2_DV_1080P30) &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	venc_enabledigitaloutput(sd, 0);</div><div class='add'>+</div><div class='add'>+	venc_write(sd, VENC_OSDCLK0, 0);</div><div class='add'>+	venc_write(sd, VENC_OSDCLK1, 1);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	venc_write(sd, VENC_VMOD, 0);</div><div class='add'>+	/* DM365 component HD mode */</div><div class='add'>+	venc_modify(sd, VENC_VMOD, (1 &lt;&lt; VENC_VMOD_VIE_SHIFT),</div><div class='add'>+		    VENC_VMOD_VIE);</div><div class='add'>+	venc_modify(sd, VENC_VMOD, VENC_VMOD_HDMD, VENC_VMOD_HDMD);</div><div class='add'>+	venc_modify(sd, VENC_VMOD, (HDTV_1080I &lt;&lt; VENC_VMOD_TVTYP_SHIFT),</div><div class='add'>+		    VENC_VMOD_TVTYP);</div><div class='add'>+	venc_modify(sd, VENC_VMOD, VENC_VMOD_VENC, VENC_VMOD_VENC);</div><div class='add'>+	venc_write(sd, VENC_XHINTVL, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int venc_s_std_output(struct v4l2_subdev *sd, v4l2_std_id norm)</div><div class='ctx'> {</div><div class='ctx'> 	v4l2_dbg(debug, 1, sd, "venc_s_std_output\n");</div><div class='hunk'>@@ -345,13 +450,30 @@ static int venc_s_std_output(struct v4l2_subdev *sd, v4l2_std_id norm)</div><div class='ctx'> static int venc_s_dv_preset(struct v4l2_subdev *sd,</div><div class='ctx'> 			    struct v4l2_dv_preset *dv_preset)</div><div class='ctx'> {</div><div class='add'>+	struct venc_state *venc = to_state(sd);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	v4l2_dbg(debug, 1, sd, "venc_s_dv_preset\n");</div><div class='ctx'> </div><div class='ctx'> 	if (dv_preset-&gt;preset == V4L2_DV_576P50)</div><div class='ctx'> 		return venc_set_576p50(sd);</div><div class='ctx'> 	else if (dv_preset-&gt;preset == V4L2_DV_480P59_94)</div><div class='ctx'> 		return venc_set_480p59_94(sd);</div><div class='del'>-</div><div class='add'>+	else if ((dv_preset-&gt;preset == V4L2_DV_720P60) &amp;&amp;</div><div class='add'>+			(venc-&gt;pdata-&gt;venc_type == VPBE_VERSION_2)) {</div><div class='add'>+		/* TBD setup internal 720p mode here */</div><div class='add'>+		ret = venc_set_720p60_internal(sd);</div><div class='add'>+		/* for DM365 VPBE, there is DAC inside */</div><div class='add'>+		vdaccfg_write(sd, VDAC_CONFIG_HD_V2);</div><div class='add'>+		return ret;</div><div class='add'>+	} else if ((dv_preset-&gt;preset == V4L2_DV_1080I30) &amp;&amp;</div><div class='add'>+		(venc-&gt;pdata-&gt;venc_type == VPBE_VERSION_2)) {</div><div class='add'>+		/* TBD setup internal 1080i mode here */</div><div class='add'>+		ret = venc_set_1080i30_internal(sd);</div><div class='add'>+		/* for DM365 VPBE, there is DAC inside */</div><div class='add'>+		vdaccfg_write(sd, VDAC_CONFIG_HD_V2);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -508,11 +630,41 @@ static int venc_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto release_venc_mem_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (venc-&gt;pdata-&gt;venc_type != VPBE_VERSION_1) {</div><div class='add'>+		res = platform_get_resource(pdev, IORESOURCE_MEM, 1);</div><div class='add'>+		if (!res) {</div><div class='add'>+			dev_err(venc-&gt;pdev,</div><div class='add'>+				"Unable to get VDAC_CONFIG address map\n");</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+			goto unmap_venc_io;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!request_mem_region(res-&gt;start,</div><div class='add'>+					resource_size(res), "venc")) {</div><div class='add'>+			dev_err(venc-&gt;pdev,</div><div class='add'>+				"Unable to reserve VDAC_CONFIG  MMIO region\n");</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+			goto unmap_venc_io;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		venc-&gt;vdaccfg_reg = ioremap_nocache(res-&gt;start,</div><div class='add'>+						    resource_size(res));</div><div class='add'>+		if (!venc-&gt;vdaccfg_reg) {</div><div class='add'>+			dev_err(venc-&gt;pdev,</div><div class='add'>+				"Unable to map VDAC_CONFIG IO space\n");</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+			goto release_vdaccfg_mem_region;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	spin_lock_init(&amp;venc-&gt;lock);</div><div class='ctx'> 	platform_set_drvdata(pdev, venc);</div><div class='ctx'> 	dev_notice(venc-&gt;pdev, "VENC sub device probe success\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+release_vdaccfg_mem_region:</div><div class='add'>+	release_mem_region(res-&gt;start, resource_size(res));</div><div class='add'>+unmap_venc_io:</div><div class='add'>+	iounmap(venc-&gt;venc_base);</div><div class='ctx'> release_venc_mem_region:</div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	release_mem_region(res-&gt;start, resource_size(res));</div><div class='hunk'>@@ -529,6 +681,11 @@ static int venc_remove(struct platform_device *pdev)</div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	iounmap((void *)venc-&gt;venc_base);</div><div class='ctx'> 	release_mem_region(res-&gt;start, resource_size(res));</div><div class='add'>+	if (venc-&gt;pdata-&gt;venc_type != VPBE_VERSION_1) {</div><div class='add'>+		res = platform_get_resource(pdev, IORESOURCE_MEM, 1);</div><div class='add'>+		iounmap((void *)venc-&gt;vdaccfg_reg);</div><div class='add'>+		release_mem_region(res-&gt;start, resource_size(res));</div><div class='add'>+	}</div><div class='ctx'> 	kfree(venc);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -543,23 +700,7 @@ static struct platform_driver venc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int venc_init(void)</div><div class='del'>-{</div><div class='del'>-	if (platform_driver_register(&amp;venc_driver)) {</div><div class='del'>-		printk(KERN_ERR "Unable to register venc driver\n");</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 void venc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;venc_driver);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(venc_init);</div><div class='del'>-module_exit(venc_exit);</div><div class='add'>+module_platform_driver(venc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("VPBE VENC Driver");</div><div class='head'>diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c<br/>index 5b38fc93ff28..20cf271a774b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/vpfe_capture.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/vpfe_capture.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/vpfe_capture.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/davinci/vpfe_capture.c</a></div><div class='hunk'>@@ -2076,20 +2076,4 @@ static struct platform_driver vpfe_driver = {</div><div class='ctx'> 	.remove = __devexit_p(vpfe_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static __init int vpfe_init(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_NOTICE "vpfe_init\n");</div><div class='del'>-	/* Register driver to the kernel */</div><div class='del'>-	return platform_driver_register(&amp;vpfe_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * vpfe_cleanup : This function un-registers device driver</div><div class='del'>- */</div><div class='del'>-static void vpfe_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;vpfe_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(vpfe_init);</div><div class='del'>-module_exit(vpfe_cleanup);</div><div class='add'>+module_platform_driver(vpfe_driver);</div><div class='head'>diff --git a/drivers/media/video/davinci/vpif.h b/drivers/media/video/davinci/vpif.h<br/>index 10550bd93b06..25036cb11bea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/vpif.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/vpif.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/vpif.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/davinci/vpif.h</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;mach/dm646x.h&gt;</div><div class='add'>+#include &lt;media/davinci/vpif_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Maximum channel allowed */</div><div class='ctx'> #define VPIF_NUM_CHANNELS		(4)</div><div class='head'>diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c<br/>index 49e4deb50043..6504e40a31dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/vpif_capture.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/vpif_capture.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/vpif_capture.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/davinci/vpif_capture.c</a></div><div class='hunk'>@@ -2177,6 +2177,12 @@ static __init int vpif_probe(struct platform_device *pdev)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	err = v4l2_device_register(vpif_dev, &amp;vpif_obj.v4l2_dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		v4l2_err(vpif_dev-&gt;driver, "Error registering v4l2 device\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	k = 0;</div><div class='ctx'> 	while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, k))) {</div><div class='ctx'> 		for (i = res-&gt;start; i &lt;= res-&gt;end; i++) {</div><div class='hunk'>@@ -2246,12 +2252,6 @@ static __init int vpif_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto probe_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = v4l2_device_register(vpif_dev, &amp;vpif_obj.v4l2_dev);</div><div class='del'>-	if (err) {</div><div class='del'>-		v4l2_err(vpif_dev-&gt;driver, "Error registering v4l2 device\n");</div><div class='del'>-		goto probe_subdev_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; subdev_count; i++) {</div><div class='ctx'> 		subdevdata = &amp;config-&gt;subdev_info[i];</div><div class='ctx'> 		vpif_obj.sd[i] =</div><div class='hunk'>@@ -2281,7 +2281,6 @@ probe_subdev_out:</div><div class='ctx'> </div><div class='ctx'> 	j = VPIF_CAPTURE_MAX_DEVICES;</div><div class='ctx'> probe_out:</div><div class='del'>-	v4l2_device_unregister(&amp;vpif_obj.v4l2_dev);</div><div class='ctx'> 	for (k = 0; k &lt; j; k++) {</div><div class='ctx'> 		/* Get the pointer to the channel object */</div><div class='ctx'> 		ch = vpif_obj.dev[k];</div><div class='hunk'>@@ -2303,6 +2302,7 @@ vpif_int_err:</div><div class='ctx'> 		if (res)</div><div class='ctx'> 			i = res-&gt;end;</div><div class='ctx'> 	}</div><div class='add'>+	v4l2_device_unregister(&amp;vpif_obj.v4l2_dev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/davinci/vpif_capture.h b/drivers/media/video/davinci/vpif_capture.h<br/>index 064550f5ce4a..a693d4ebda55 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/vpif_capture.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/vpif_capture.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/vpif_capture.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/davinci/vpif_capture.h</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;media/v4l2-device.h&gt;</div><div class='ctx'> #include &lt;media/videobuf-core.h&gt;</div><div class='ctx'> #include &lt;media/videobuf-dma-contig.h&gt;</div><div class='del'>-#include &lt;mach/dm646x.h&gt;</div><div class='add'>+#include &lt;media/davinci/vpif_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "vpif.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/davinci/vpif_display.h b/drivers/media/video/davinci/vpif_display.h<br/>index 5d1936dafed2..56879d1a0684 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/vpif_display.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/davinci/vpif_display.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/davinci/vpif_display.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/davinci/vpif_display.h</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;media/v4l2-device.h&gt;</div><div class='ctx'> #include &lt;media/videobuf-core.h&gt;</div><div class='ctx'> #include &lt;media/videobuf-dma-contig.h&gt;</div><div class='add'>+#include &lt;media/davinci/vpif_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "vpif.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c<br/>index cff0768afbf5..e2a7b77c39c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-audio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/em28xx/em28xx-audio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-audio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/em28xx/em28xx-audio.c</a></div><div class='hunk'>@@ -193,7 +193,7 @@ static int em28xx_init_audio_isoc(struct em28xx *dev)</div><div class='ctx'> </div><div class='ctx'> 		urb-&gt;dev = dev-&gt;udev;</div><div class='ctx'> 		urb-&gt;context = dev;</div><div class='del'>-		urb-&gt;pipe = usb_rcvisocpipe(dev-&gt;udev, 0x83);</div><div class='add'>+		urb-&gt;pipe = usb_rcvisocpipe(dev-&gt;udev, EM28XX_EP_AUDIO);</div><div class='ctx'> 		urb-&gt;transfer_flags = URB_ISO_ASAP;</div><div class='ctx'> 		urb-&gt;transfer_buffer = dev-&gt;adev.transfer_buffer[i];</div><div class='ctx'> 		urb-&gt;interval = 1;</div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c<br/>index 9b747c266afa..4561cd89938d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-cards.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/em28xx/em28xx-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/em28xx/em28xx-cards.c</a></div><div class='hunk'>@@ -336,6 +336,23 @@ static struct em28xx_reg_seq pctv_460e[] = {</div><div class='ctx'> 	{             -1,   -1,   -1,  -1},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if 0</div><div class='add'>+static struct em28xx_reg_seq hauppauge_930c_gpio[] = {</div><div class='add'>+	{EM2874_R80_GPIO,	0x6f,	0xff,	10},</div><div class='add'>+	{EM2874_R80_GPIO,	0x4f,	0xff,	10}, /* xc5000 reset */</div><div class='add'>+	{EM2874_R80_GPIO,	0x6f,	0xff,	10},</div><div class='add'>+	{EM2874_R80_GPIO,	0x4f,	0xff,	10},</div><div class='add'>+	{ -1,			-1,	-1,	-1},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct em28xx_reg_seq hauppauge_930c_digital[] = {</div><div class='add'>+	{EM2874_R80_GPIO,	0xf6,	0xff,	10},</div><div class='add'>+	{EM2874_R80_GPIO,	0xe6,	0xff,	100},</div><div class='add'>+	{EM2874_R80_GPIO,	0xa6,	0xff,	10},</div><div class='add'>+	{ -1,			-1,	-1,	-1},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *  Board definitions</div><div class='ctx'>  */</div><div class='hunk'>@@ -839,6 +856,10 @@ struct em28xx_board em28xx_boards[] = {</div><div class='ctx'> 	[EM2870_BOARD_KWORLD_355U] = {</div><div class='ctx'> 		.name         = "Kworld 355 U DVB-T",</div><div class='ctx'> 		.valid        = EM28XX_BOARD_NOT_VALIDATED,</div><div class='add'>+		.tuner_type   = TUNER_ABSENT,</div><div class='add'>+		.tuner_gpio   = default_tuner_gpio,</div><div class='add'>+		.has_dvb      = 1,</div><div class='add'>+		.dvb_gpio     = default_digital,</div><div class='ctx'> 	},</div><div class='ctx'> 	[EM2870_BOARD_PINNACLE_PCTV_DVB] = {</div><div class='ctx'> 		.name         = "Pinnacle PCTV DVB-T",</div><div class='hunk'>@@ -887,6 +908,37 @@ struct em28xx_board em28xx_boards[] = {</div><div class='ctx'> 		.tuner_addr   = 0x41,</div><div class='ctx'> 		.dvb_gpio     = terratec_h5_digital, /* FIXME: probably wrong */</div><div class='ctx'> 		.tuner_gpio   = terratec_h5_gpio,</div><div class='add'>+#else</div><div class='add'>+		.tuner_type   = TUNER_ABSENT,</div><div class='add'>+#endif</div><div class='add'>+		.i2c_speed    = EM2874_I2C_SECONDARY_BUS_SELECT |</div><div class='add'>+				EM28XX_I2C_CLK_WAIT_ENABLE |</div><div class='add'>+				EM28XX_I2C_FREQ_400_KHZ,</div><div class='add'>+	},</div><div class='add'>+	[EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C] = {</div><div class='add'>+		.name         = "Hauppauge WinTV HVR 930C",</div><div class='add'>+		.has_dvb      = 1,</div><div class='add'>+#if 0 /* FIXME: Add analog support */</div><div class='add'>+		.tuner_type   = TUNER_XC5000,</div><div class='add'>+		.tuner_addr   = 0x41,</div><div class='add'>+		.dvb_gpio     = hauppauge_930c_digital,</div><div class='add'>+		.tuner_gpio   = hauppauge_930c_gpio,</div><div class='add'>+#else</div><div class='add'>+		.tuner_type   = TUNER_ABSENT,</div><div class='add'>+#endif</div><div class='add'>+		.ir_codes     = RC_MAP_HAUPPAUGE,</div><div class='add'>+		.i2c_speed    = EM2874_I2C_SECONDARY_BUS_SELECT |</div><div class='add'>+				EM28XX_I2C_CLK_WAIT_ENABLE |</div><div class='add'>+				EM28XX_I2C_FREQ_400_KHZ,</div><div class='add'>+	},</div><div class='add'>+	[EM2884_BOARD_CINERGY_HTC_STICK] = {</div><div class='add'>+		.name         = "Terratec Cinergy HTC Stick",</div><div class='add'>+		.has_dvb      = 1,</div><div class='add'>+#if 0</div><div class='add'>+		.tuner_type   = TUNER_PHILIPS_TDA8290,</div><div class='add'>+		.tuner_addr   = 0x41,</div><div class='add'>+		.dvb_gpio     = terratec_h5_digital, /* FIXME: probably wrong */</div><div class='add'>+		.tuner_gpio   = terratec_h5_gpio,</div><div class='ctx'> #endif</div><div class='ctx'> 		.i2c_speed    = EM2874_I2C_SECONDARY_BUS_SELECT |</div><div class='ctx'> 				EM28XX_I2C_CLK_WAIT_ENABLE |</div><div class='hunk'>@@ -1127,7 +1179,7 @@ struct em28xx_board em28xx_boards[] = {</div><div class='ctx'> 		.name         = "Terratec Cinergy 200 USB",</div><div class='ctx'> 		.is_em2800    = 1,</div><div class='ctx'> 		.has_ir_i2c   = 1,</div><div class='del'>-		.tuner_type   = TUNER_LG_PAL_NEW_TAPC,</div><div class='add'>+		.tuner_type   = TUNER_LG_TALN,</div><div class='ctx'> 		.tda9887_conf = TDA9887_PRESENT,</div><div class='ctx'> 		.decoder      = EM28XX_SAA711X,</div><div class='ctx'> 		.input        = { {</div><div class='hunk'>@@ -1218,7 +1270,7 @@ struct em28xx_board em28xx_boards[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	[EM2820_BOARD_PINNACLE_DVC_90] = {</div><div class='ctx'> 		.name         = "Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker "</div><div class='del'>-				"/ Kworld DVD Maker 2",</div><div class='add'>+			       "/ Kworld DVD Maker 2 / Plextor ConvertX PX-AV100U",</div><div class='ctx'> 		.tuner_type   = TUNER_ABSENT, /* capture only board */</div><div class='ctx'> 		.decoder      = EM28XX_SAA711X,</div><div class='ctx'> 		.input        = { {</div><div class='hunk'>@@ -1840,6 +1892,22 @@ struct em28xx_board em28xx_boards[] = {</div><div class='ctx'> 		.has_dvb       = 1,</div><div class='ctx'> 		.ir_codes      = RC_MAP_PINNACLE_PCTV_HD,</div><div class='ctx'> 	},</div><div class='add'>+	/* eb1a:5006 Honestech VIDBOX NW03</div><div class='add'>+	 * Empia EM2860, Philips SAA7113, Empia EMP202, No Tuner */</div><div class='add'>+	[EM2860_BOARD_HT_VIDBOX_NW03] = {</div><div class='add'>+		.name                = "Honestech Vidbox NW03",</div><div class='add'>+		.tuner_type          = TUNER_ABSENT,</div><div class='add'>+		.decoder             = EM28XX_SAA711X,</div><div class='add'>+		.input               = { {</div><div class='add'>+			.type     = EM28XX_VMUX_COMPOSITE1,</div><div class='add'>+			.vmux     = SAA7115_COMPOSITE0,</div><div class='add'>+			.amux     = EM28XX_AMUX_LINE_IN,</div><div class='add'>+		}, {</div><div class='add'>+			.type     = EM28XX_VMUX_SVIDEO,</div><div class='add'>+			.vmux     = SAA7115_SVIDEO3,  /* S-VIDEO needs confirming */</div><div class='add'>+			.amux     = EM28XX_AMUX_LINE_IN,</div><div class='add'>+		} },</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);</div><div class='ctx'> </div><div class='hunk'>@@ -1899,6 +1967,8 @@ struct usb_device_id em28xx_id_table[] = {</div><div class='ctx'> 			.driver_info = EM2800_BOARD_GRABBEEX_USB2800 },</div><div class='ctx'> 	{ USB_DEVICE(0xeb1a, 0xe357),</div><div class='ctx'> 			.driver_info = EM2870_BOARD_KWORLD_355U },</div><div class='add'>+	{ USB_DEVICE(0xeb1a, 0xe359),</div><div class='add'>+			.driver_info = EM2870_BOARD_KWORLD_355U },</div><div class='ctx'> 	{ USB_DEVICE(0x1b80, 0xe302),</div><div class='ctx'> 			.driver_info = EM2820_BOARD_PINNACLE_DVC_90 }, /* Kaiser Baas Video to DVD maker */</div><div class='ctx'> 	{ USB_DEVICE(0x1b80, 0xe304),</div><div class='hunk'>@@ -1914,17 +1984,23 @@ struct usb_device_id em28xx_id_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x0ccd, 0x0042),</div><div class='ctx'> 			.driver_info = EM2882_BOARD_TERRATEC_HYBRID_XS },</div><div class='ctx'> 	{ USB_DEVICE(0x0ccd, 0x0043),</div><div class='add'>+			.driver_info = EM2870_BOARD_TERRATEC_XS },</div><div class='add'>+	{ USB_DEVICE(0x0ccd, 0x008e),	/* Cinergy HTC USB XS Rev. 1 */</div><div class='add'>+			.driver_info = EM2884_BOARD_TERRATEC_H5 },</div><div class='add'>+	{ USB_DEVICE(0x0ccd, 0x00ac),	/* Cinergy HTC USB XS Rev. 2 */</div><div class='add'>+			.driver_info = EM2884_BOARD_TERRATEC_H5 },</div><div class='add'>+	{ USB_DEVICE(0x0ccd, 0x10a2),	/* H5 Rev. 1 */</div><div class='ctx'> 			.driver_info = EM2884_BOARD_TERRATEC_H5 },</div><div class='del'>-	{ USB_DEVICE(0x0ccd, 0x10a2),	/* Rev. 1 */</div><div class='add'>+	{ USB_DEVICE(0x0ccd, 0x10ad),	/* H5 Rev. 2 */</div><div class='ctx'> 			.driver_info = EM2884_BOARD_TERRATEC_H5 },</div><div class='del'>-	{ USB_DEVICE(0x0ccd, 0x10ad),	/* Rev. 2 */</div><div class='del'>-			.driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS },</div><div class='ctx'> 	{ USB_DEVICE(0x0ccd, 0x0084),</div><div class='ctx'> 			.driver_info = EM2860_BOARD_TERRATEC_AV350 },</div><div class='ctx'> 	{ USB_DEVICE(0x0ccd, 0x0096),</div><div class='ctx'> 			.driver_info = EM2860_BOARD_TERRATEC_GRABBY },</div><div class='ctx'> 	{ USB_DEVICE(0x0ccd, 0x10AF),</div><div class='ctx'> 			.driver_info = EM2860_BOARD_TERRATEC_GRABBY },</div><div class='add'>+	{ USB_DEVICE(0x0ccd, 0x00b2),</div><div class='add'>+			.driver_info = EM2884_BOARD_CINERGY_HTC_STICK },</div><div class='ctx'> 	{ USB_DEVICE(0x0fd9, 0x0033),</div><div class='ctx'> 			.driver_info = EM2860_BOARD_ELGATO_VIDEO_CAPTURE},</div><div class='ctx'> 	{ USB_DEVICE(0x185b, 0x2870),</div><div class='hunk'>@@ -1963,6 +2039,8 @@ struct usb_device_id em28xx_id_table[] = {</div><div class='ctx'> 			.driver_info = EM2880_BOARD_PINNACLE_PCTV_HD_PRO },</div><div class='ctx'> 	{ USB_DEVICE(0x0413, 0x6023),</div><div class='ctx'> 			.driver_info = EM2800_BOARD_LEADTEK_WINFAST_USBII },</div><div class='add'>+	{ USB_DEVICE(0x093b, 0xa003),</div><div class='add'>+		       .driver_info = EM2820_BOARD_PINNACLE_DVC_90 },</div><div class='ctx'> 	{ USB_DEVICE(0x093b, 0xa005),</div><div class='ctx'> 			.driver_info = EM2861_BOARD_PLEXTOR_PX_TV100U },</div><div class='ctx'> 	{ USB_DEVICE(0x04bb, 0x0515),</div><div class='hunk'>@@ -1975,6 +2053,12 @@ struct usb_device_id em28xx_id_table[] = {</div><div class='ctx'> 			.driver_info = EM28174_BOARD_PCTV_290E },</div><div class='ctx'> 	{ USB_DEVICE(0x2013, 0x024c),</div><div class='ctx'> 			.driver_info = EM28174_BOARD_PCTV_460E },</div><div class='add'>+	{ USB_DEVICE(0x2040, 0x1605),</div><div class='add'>+			.driver_info = EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C },</div><div class='add'>+	{ USB_DEVICE(0xeb1a, 0x5006),</div><div class='add'>+			.driver_info = EM2860_BOARD_HT_VIDBOX_NW03 },</div><div class='add'>+	{ USB_DEVICE(0x1b80, 0xe309), /* Sveon STV40 */</div><div class='add'>+			.driver_info = EM2860_BOARD_EASYCAP },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, em28xx_id_table);</div><div class='hunk'>@@ -2028,10 +2112,10 @@ int em28xx_tuner_callback(void *ptr, int component, int command, int arg)</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	struct em28xx *dev = ptr;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;tuner_type != TUNER_XC2028)</div><div class='add'>+	if (dev-&gt;tuner_type != TUNER_XC2028 &amp;&amp; dev-&gt;tuner_type != TUNER_XC5000)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (command != XC2028_TUNER_RESET)</div><div class='add'>+	if (command != XC2028_TUNER_RESET &amp;&amp; command != XC5000_TUNER_RESET)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	rc = em28xx_gpio_set(dev, dev-&gt;board.tuner_gpio);</div><div class='hunk'>@@ -2203,7 +2287,8 @@ void em28xx_pre_card_setup(struct em28xx *dev)</div><div class='ctx'> 	/* Set the initial XCLK and I2C clock values based on the board</div><div class='ctx'> 	   definition */</div><div class='ctx'> 	em28xx_write_reg(dev, EM28XX_R0F_XCLK, dev-&gt;board.xclk &amp; 0x7f);</div><div class='del'>-	em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, dev-&gt;board.i2c_speed);</div><div class='add'>+	if (!dev-&gt;board.is_em2800)</div><div class='add'>+		em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, dev-&gt;board.i2c_speed);</div><div class='ctx'> 	msleep(50);</div><div class='ctx'> </div><div class='ctx'> 	/* request some modules */</div><div class='hunk'>@@ -2832,11 +2917,10 @@ void em28xx_release_resources(struct em28xx *dev)</div><div class='ctx'>  * em28xx_init_dev()</div><div class='ctx'>  * allocates and inits the device structs, registers i2c bus and v4l device</div><div class='ctx'>  */</div><div class='del'>-static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,</div><div class='add'>+static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,</div><div class='ctx'> 			   struct usb_interface *interface,</div><div class='ctx'> 			   int minor)</div><div class='ctx'> {</div><div class='del'>-	struct em28xx *dev = *devhandle;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;udev = udev;</div><div class='hunk'>@@ -2931,7 +3015,7 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;board.is_em2800) {</div><div class='ctx'> 		/* Resets I2C speed */</div><div class='del'>-		em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, dev-&gt;board.i2c_speed);</div><div class='add'>+		retval = em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, dev-&gt;board.i2c_speed);</div><div class='ctx'> 		if (retval &lt; 0) {</div><div class='ctx'> 			em28xx_errdev("%s: em28xx_write_reg failed!"</div><div class='ctx'> 				      " retval [%d]\n",</div><div class='hunk'>@@ -3031,12 +3115,11 @@ unregister_dev:</div><div class='ctx'> static int em28xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> 			    const struct usb_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	const struct usb_endpoint_descriptor *endpoint;</div><div class='ctx'> 	struct usb_device *udev;</div><div class='ctx'> 	struct em28xx *dev = NULL;</div><div class='ctx'> 	int retval;</div><div class='del'>-	bool is_audio_only = false, has_audio = false;</div><div class='del'>-	int i, nr, isoc_pipe;</div><div class='add'>+	bool has_audio = false, has_video = false, has_dvb = false;</div><div class='add'>+	int i, nr;</div><div class='ctx'> 	const int ifnum = interface-&gt;altsetting[0].desc.bInterfaceNumber;</div><div class='ctx'> 	char *speed;</div><div class='ctx'> 	char descr[255] = "";</div><div class='hunk'>@@ -3068,54 +3151,65 @@ static int em28xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* allocate memory for our device state and initialize it */</div><div class='add'>+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='add'>+	if (dev == NULL) {</div><div class='add'>+		em28xx_err(DRIVER_NAME ": out of memory!\n");</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* compute alternate max packet sizes */</div><div class='add'>+	dev-&gt;alt_max_pkt_size = kmalloc(sizeof(dev-&gt;alt_max_pkt_size[0]) *</div><div class='add'>+					interface-&gt;num_altsetting, GFP_KERNEL);</div><div class='add'>+	if (dev-&gt;alt_max_pkt_size == NULL) {</div><div class='add'>+		em28xx_errdev("out of memory!\n");</div><div class='add'>+		kfree(dev);</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Get endpoints */</div><div class='ctx'> 	for (i = 0; i &lt; interface-&gt;num_altsetting; i++) {</div><div class='ctx'> 		int ep;</div><div class='ctx'> </div><div class='ctx'> 		for (ep = 0; ep &lt; interface-&gt;altsetting[i].desc.bNumEndpoints; ep++) {</div><div class='del'>-			struct usb_host_endpoint	*e;</div><div class='del'>-			e = &amp;interface-&gt;altsetting[i].endpoint[ep];</div><div class='del'>-</div><div class='del'>-			if (e-&gt;desc.bEndpointAddress == 0x83)</div><div class='del'>-				has_audio = true;</div><div class='add'>+			const struct usb_endpoint_descriptor *e;</div><div class='add'>+			int sizedescr, size;</div><div class='add'>+</div><div class='add'>+			e = &amp;interface-&gt;altsetting[i].endpoint[ep].desc;</div><div class='add'>+</div><div class='add'>+			sizedescr = le16_to_cpu(e-&gt;wMaxPacketSize);</div><div class='add'>+			size = sizedescr &amp; 0x7ff;</div><div class='add'>+</div><div class='add'>+			if (udev-&gt;speed == USB_SPEED_HIGH)</div><div class='add'>+				size = size * hb_mult(sizedescr);</div><div class='add'>+</div><div class='add'>+			if (usb_endpoint_xfer_isoc(e) &amp;&amp;</div><div class='add'>+			    usb_endpoint_dir_in(e)) {</div><div class='add'>+				switch (e-&gt;bEndpointAddress) {</div><div class='add'>+				case EM28XX_EP_AUDIO:</div><div class='add'>+					has_audio = true;</div><div class='add'>+					break;</div><div class='add'>+				case EM28XX_EP_ANALOG:</div><div class='add'>+					has_video = true;</div><div class='add'>+					dev-&gt;alt_max_pkt_size[i] = size;</div><div class='add'>+					break;</div><div class='add'>+				case EM28XX_EP_DIGITAL:</div><div class='add'>+					has_dvb = true;</div><div class='add'>+					if (size &gt; dev-&gt;dvb_max_pkt_size) {</div><div class='add'>+						dev-&gt;dvb_max_pkt_size = size;</div><div class='add'>+						dev-&gt;dvb_alt = i;</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'> 	}</div><div class='ctx'> </div><div class='del'>-	endpoint = &amp;interface-&gt;cur_altsetting-&gt;endpoint[0].desc;</div><div class='del'>-</div><div class='del'>-	/* check if the device has the iso in endpoint at the correct place */</div><div class='del'>-	if (usb_endpoint_xfer_isoc(endpoint)</div><div class='del'>-	    &amp;&amp;</div><div class='del'>-	    (interface-&gt;altsetting[1].endpoint[0].desc.wMaxPacketSize == 940)) {</div><div class='del'>-		/* It's a newer em2874/em2875 device */</div><div class='del'>-		isoc_pipe = 0;</div><div class='del'>-	} else {</div><div class='del'>-		int check_interface = 1;</div><div class='del'>-		isoc_pipe = 1;</div><div class='del'>-		endpoint = &amp;interface-&gt;cur_altsetting-&gt;endpoint[1].desc;</div><div class='del'>-		if (!usb_endpoint_xfer_isoc(endpoint))</div><div class='del'>-			check_interface = 0;</div><div class='del'>-</div><div class='del'>-		if (usb_endpoint_dir_out(endpoint))</div><div class='del'>-			check_interface = 0;</div><div class='del'>-</div><div class='del'>-		if (!check_interface) {</div><div class='del'>-			if (has_audio) {</div><div class='del'>-				is_audio_only = true;</div><div class='del'>-			} else {</div><div class='del'>-				em28xx_err(DRIVER_NAME " video device (%04x:%04x): "</div><div class='del'>-					"interface %i, class %i found.\n",</div><div class='del'>-					le16_to_cpu(udev-&gt;descriptor.idVendor),</div><div class='del'>-					le16_to_cpu(udev-&gt;descriptor.idProduct),</div><div class='del'>-					ifnum,</div><div class='del'>-					interface-&gt;altsetting[0].desc.bInterfaceClass);</div><div class='del'>-				em28xx_err(DRIVER_NAME " This is an anciliary "</div><div class='del'>-					"interface not used by the driver\n");</div><div class='del'>-</div><div class='del'>-				retval = -ENODEV;</div><div class='del'>-				goto err;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	if (!(has_audio || has_video || has_dvb)) {</div><div class='add'>+		retval = -ENODEV;</div><div class='add'>+		goto err_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (udev-&gt;speed) {</div><div class='hunk'>@@ -3141,6 +3235,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> 			strlcat(descr, " ", sizeof(descr));</div><div class='ctx'> 		strlcat(descr, udev-&gt;product, sizeof(descr));</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (*descr)</div><div class='ctx'> 		strlcat(descr, " ", sizeof(descr));</div><div class='ctx'> </div><div class='hunk'>@@ -3157,6 +3252,14 @@ static int em28xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> 		printk(KERN_INFO DRIVER_NAME</div><div class='ctx'> 		       ": Audio Vendor Class interface %i found\n",</div><div class='ctx'> 		       ifnum);</div><div class='add'>+	if (has_video)</div><div class='add'>+		printk(KERN_INFO DRIVER_NAME</div><div class='add'>+		       ": Video interface %i found\n",</div><div class='add'>+		       ifnum);</div><div class='add'>+	if (has_dvb)</div><div class='add'>+		printk(KERN_INFO DRIVER_NAME</div><div class='add'>+		       ": DVB interface %i found\n",</div><div class='add'>+		       ifnum);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make sure we have 480 Mbps of bandwidth, otherwise things like</div><div class='hunk'>@@ -3168,22 +3271,14 @@ static int em28xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> 		printk(DRIVER_NAME ": Device must be connected to a high-speed"</div><div class='ctx'> 		       " USB 2.0 port.\n");</div><div class='ctx'> 		retval = -ENODEV;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* allocate memory for our device state and initialize it */</div><div class='del'>-	dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='del'>-	if (dev == NULL) {</div><div class='del'>-		em28xx_err(DRIVER_NAME ": out of memory!\n");</div><div class='del'>-		retval = -ENOMEM;</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'> 	snprintf(dev-&gt;name, sizeof(dev-&gt;name), "em28xx #%d", nr);</div><div class='ctx'> 	dev-&gt;devno = nr;</div><div class='ctx'> 	dev-&gt;model = id-&gt;driver_info;</div><div class='ctx'> 	dev-&gt;alt   = -1;</div><div class='del'>-	dev-&gt;is_audio_only = is_audio_only;</div><div class='add'>+	dev-&gt;is_audio_only = has_audio &amp;&amp; !(has_video || has_dvb);</div><div class='ctx'> 	dev-&gt;has_alsa_audio = has_audio;</div><div class='ctx'> 	dev-&gt;audio_ifnum = ifnum;</div><div class='ctx'> </div><div class='hunk'>@@ -3196,26 +3291,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* compute alternate max packet sizes */</div><div class='ctx'> 	dev-&gt;num_alt = interface-&gt;num_altsetting;</div><div class='del'>-	dev-&gt;alt_max_pkt_size = kmalloc(32 * dev-&gt;num_alt, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;alt_max_pkt_size == NULL) {</div><div class='del'>-		em28xx_errdev("out of memory!\n");</div><div class='del'>-		kfree(dev);</div><div class='del'>-		retval = -ENOMEM;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; dev-&gt;num_alt ; i++) {</div><div class='del'>-		u16 tmp = le16_to_cpu(interface-&gt;altsetting[i].endpoint[isoc_pipe].desc.wMaxPacketSize);</div><div class='del'>-		unsigned int size = tmp &amp; 0x7ff;</div><div class='del'>-</div><div class='del'>-		if (udev-&gt;speed == USB_SPEED_HIGH)</div><div class='del'>-			size = size * hb_mult(tmp);</div><div class='del'>-</div><div class='del'>-		dev-&gt;alt_max_pkt_size[i] = size;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if ((card[nr] &gt;= 0) &amp;&amp; (card[nr] &lt; em28xx_bcount))</div><div class='ctx'> 		dev-&gt;model = card[nr];</div><div class='hunk'>@@ -3226,12 +3302,9 @@ static int em28xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> 	/* allocate device struct */</div><div class='ctx'> 	mutex_init(&amp;dev-&gt;lock);</div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;lock);</div><div class='del'>-	retval = em28xx_init_dev(&amp;dev, udev, interface, nr);</div><div class='add'>+	retval = em28xx_init_dev(dev, udev, interface, nr);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		mutex_unlock(&amp;dev-&gt;lock);</div><div class='del'>-		kfree(dev-&gt;alt_max_pkt_size);</div><div class='del'>-		kfree(dev);</div><div class='del'>-		goto err;</div><div class='add'>+		goto unlock_and_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	request_modules(dev);</div><div class='hunk'>@@ -3250,6 +3323,13 @@ static int em28xx_usb_probe(struct usb_interface *interface,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+unlock_and_free:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;lock);</div><div class='add'>+</div><div class='add'>+err_free:</div><div class='add'>+	kfree(dev-&gt;alt_max_pkt_size);</div><div class='add'>+	kfree(dev);</div><div class='add'>+</div><div class='ctx'> err:</div><div class='ctx'> 	clear_bit(nr, &amp;em28xx_devused);</div><div class='ctx'> </div><div class='hunk'>@@ -3325,26 +3405,4 @@ static struct usb_driver em28xx_usb_driver = {</div><div class='ctx'> 	.id_table = em28xx_id_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init em28xx_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	/* register this driver with the USB subsystem */</div><div class='del'>-	result = usb_register(&amp;em28xx_usb_driver);</div><div class='del'>-	if (result)</div><div class='del'>-		em28xx_err(DRIVER_NAME</div><div class='del'>-			   " usb_register failed. Error number %d.\n", result);</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO DRIVER_NAME " driver loaded\n");</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit em28xx_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver with the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;em28xx_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(em28xx_module_init);</div><div class='del'>-module_exit(em28xx_module_exit);</div><div class='add'>+module_usb_driver(em28xx_usb_driver);</div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c<br/>index 804a4ab47ac6..0aacc96f9a23 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/em28xx/em28xx-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/em28xx/em28xx-core.c</a></div><div class='hunk'>@@ -568,7 +568,7 @@ int em28xx_audio_setup(struct em28xx *dev)</div><div class='ctx'> 	em28xx_warn("AC97 features = 0x%04x\n", feat);</div><div class='ctx'> </div><div class='ctx'> 	/* Try to identify what audio processor we have */</div><div class='del'>-	if ((vid == 0xffffffff) &amp;&amp; (feat == 0x6a90))</div><div class='add'>+	if (((vid == 0xffffffff) || (vid == 0x83847650)) &amp;&amp; (feat == 0x6a90))</div><div class='ctx'> 		dev-&gt;audio_mode.ac97 = EM28XX_AC97_EM202;</div><div class='ctx'> 	else if ((vid &gt;&gt; 8) == 0x838476)</div><div class='ctx'> 		dev-&gt;audio_mode.ac97 = EM28XX_AC97_SIGMATEL;</div><div class='hunk'>@@ -1070,7 +1070,8 @@ int em28xx_init_isoc(struct em28xx *dev, int max_packets,</div><div class='ctx'> 			should also be using 'desc.bInterval'</div><div class='ctx'> 		 */</div><div class='ctx'> 		pipe = usb_rcvisocpipe(dev-&gt;udev,</div><div class='del'>-			dev-&gt;mode == EM28XX_ANALOG_MODE ? 0x82 : 0x84);</div><div class='add'>+				       dev-&gt;mode == EM28XX_ANALOG_MODE ?</div><div class='add'>+				       EM28XX_EP_ANALOG : EM28XX_EP_DIGITAL);</div><div class='ctx'> </div><div class='ctx'> 		usb_fill_int_urb(urb, dev-&gt;udev, pipe,</div><div class='ctx'> 				 dev-&gt;isoc_ctl.transfer_buffer[i], sb_size,</div><div class='hunk'>@@ -1108,62 +1109,6 @@ int em28xx_init_isoc(struct em28xx *dev, int max_packets,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(em28xx_init_isoc);</div><div class='ctx'> </div><div class='del'>-/* Determine the packet size for the DVB stream for the given device</div><div class='del'>-   (underlying value programmed into the eeprom) */</div><div class='del'>-int em28xx_isoc_dvb_max_packetsize(struct em28xx *dev)</div><div class='del'>-{</div><div class='del'>-	unsigned int chip_cfg2;</div><div class='del'>-	unsigned int packet_size;</div><div class='del'>-</div><div class='del'>-	switch (dev-&gt;chip_id) {</div><div class='del'>-	case CHIP_ID_EM2710:</div><div class='del'>-	case CHIP_ID_EM2750:</div><div class='del'>-	case CHIP_ID_EM2800:</div><div class='del'>-	case CHIP_ID_EM2820:</div><div class='del'>-	case CHIP_ID_EM2840:</div><div class='del'>-	case CHIP_ID_EM2860:</div><div class='del'>-		/* No DVB support */</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	case CHIP_ID_EM2870:</div><div class='del'>-	case CHIP_ID_EM2883:</div><div class='del'>-		/* TS max packet size stored in bits 1-0 of R01 */</div><div class='del'>-		chip_cfg2 = em28xx_read_reg(dev, EM28XX_R01_CHIPCFG2);</div><div class='del'>-		switch (chip_cfg2 &amp; EM28XX_CHIPCFG2_TS_PACKETSIZE_MASK) {</div><div class='del'>-		case EM28XX_CHIPCFG2_TS_PACKETSIZE_188:</div><div class='del'>-			packet_size = 188;</div><div class='del'>-			break;</div><div class='del'>-		case EM28XX_CHIPCFG2_TS_PACKETSIZE_376:</div><div class='del'>-			packet_size = 376;</div><div class='del'>-			break;</div><div class='del'>-		case EM28XX_CHIPCFG2_TS_PACKETSIZE_564:</div><div class='del'>-			packet_size = 564;</div><div class='del'>-			break;</div><div class='del'>-		case EM28XX_CHIPCFG2_TS_PACKETSIZE_752:</div><div class='del'>-			packet_size = 752;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case CHIP_ID_EM2874:</div><div class='del'>-		/*</div><div class='del'>-		 * FIXME: for now assumes 564 like it was before, but the</div><div class='del'>-		 * em2874 code should be added to return the proper value</div><div class='del'>-		 */</div><div class='del'>-		packet_size = 564;</div><div class='del'>-		break;</div><div class='del'>-	case CHIP_ID_EM2884:</div><div class='del'>-	case CHIP_ID_EM28174:</div><div class='del'>-	default:</div><div class='del'>-		/*</div><div class='del'>-		 * FIXME: same as em2874. 564 was enough for 22 Mbit DVB-T</div><div class='del'>-		 * but not enough for 44 Mbit DVB-C.</div><div class='del'>-		 */</div><div class='del'>-		packet_size = 752;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return packet_size;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(em28xx_isoc_dvb_max_packetsize);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * em28xx_wake_i2c()</div><div class='ctx'>  * configure i2c attached devices</div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c<br/>index cef7a2d409cb..9449423098e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-dvb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/em28xx/em28xx-dvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/em28xx/em28xx-dvb.c</a></div><div class='hunk'>@@ -44,6 +44,7 @@</div><div class='ctx'> #include "drxk.h"</div><div class='ctx'> #include "tda10071.h"</div><div class='ctx'> #include "a8293.h"</div><div class='add'>+#include "qt1010.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("driver for em28xx based DVB cards");</div><div class='ctx'> MODULE_AUTHOR("Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt;");</div><div class='hunk'>@@ -163,12 +164,12 @@ static int em28xx_start_streaming(struct em28xx_dvb *dvb)</div><div class='ctx'> 	struct em28xx *dev = dvb-&gt;adapter.priv;</div><div class='ctx'> 	int max_dvb_packet_size;</div><div class='ctx'> </div><div class='del'>-	usb_set_interface(dev-&gt;udev, 0, 1);</div><div class='add'>+	usb_set_interface(dev-&gt;udev, 0, dev-&gt;dvb_alt);</div><div class='ctx'> 	rc = em28xx_set_mode(dev, EM28XX_DIGITAL_MODE);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	max_dvb_packet_size = em28xx_isoc_dvb_max_packetsize(dev);</div><div class='add'>+	max_dvb_packet_size = dev-&gt;dvb_max_pkt_size;</div><div class='ctx'> 	if (max_dvb_packet_size &lt; 0)</div><div class='ctx'> 		return max_dvb_packet_size;</div><div class='ctx'> 	dprintk(1, "Using %d buffers each with %d bytes\n",</div><div class='hunk'>@@ -302,10 +303,12 @@ static struct zl10353_config em28xx_zl10353_xc3028_no_i2c_gate = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct drxd_config em28xx_drxd = {</div><div class='del'>-	.index = 0, .demod_address = 0x70, .demod_revision = 0xa2,</div><div class='del'>-	.demoda_address = 0x00, .pll_address = 0x00,</div><div class='del'>-	.pll_type = DRXD_PLL_NONE, .clock = 12000, .insert_rs_byte = 1,</div><div class='del'>-	.pll_set = NULL, .osc_deviation = NULL, .IF = 42800000,</div><div class='add'>+	.demod_address = 0x70,</div><div class='add'>+	.demod_revision = 0xa2,</div><div class='add'>+	.pll_type = DRXD_PLL_NONE,</div><div class='add'>+	.clock = 12000,</div><div class='add'>+	.insert_rs_byte = 1,</div><div class='add'>+	.IF = 42800000,</div><div class='ctx'> 	.disable_i2c_gate_ctrl = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -316,6 +319,14 @@ struct drxk_config terratec_h5_drxk = {</div><div class='ctx'> 	.microcode_name = "dvb-usb-terratec-h5-drxk.fw",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct drxk_config hauppauge_930c_drxk = {</div><div class='add'>+	.adr = 0x29,</div><div class='add'>+	.single_master = 1,</div><div class='add'>+	.no_i2c_bridge = 1,</div><div class='add'>+	.microcode_name = "dvb-usb-hauppauge-hvr930c-drxk.fw",</div><div class='add'>+	.chunk_size = 56,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int drxk_gate_ctrl(struct dvb_frontend *fe, int enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct em28xx_dvb *dvb = fe-&gt;sec_priv;</div><div class='hunk'>@@ -334,6 +345,73 @@ static int drxk_gate_ctrl(struct dvb_frontend *fe, int enable)</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void hauppauge_hvr930c_init(struct em28xx *dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	struct em28xx_reg_seq hauppauge_hvr930c_init[] = {</div><div class='add'>+		{EM2874_R80_GPIO,	0xff,	0xff,	0x65},</div><div class='add'>+		{EM2874_R80_GPIO,	0xfb,	0xff,	0x32},</div><div class='add'>+		{EM2874_R80_GPIO,	0xff,	0xff,	0xb8},</div><div class='add'>+		{ -1,                   -1,     -1,     -1},</div><div class='add'>+	};</div><div class='add'>+	struct em28xx_reg_seq hauppauge_hvr930c_end[] = {</div><div class='add'>+		{EM2874_R80_GPIO,	0xef,	0xff,	0x01},</div><div class='add'>+		{EM2874_R80_GPIO,	0xaf,	0xff,	0x65},</div><div class='add'>+		{EM2874_R80_GPIO,	0xef,	0xff,	0x76},</div><div class='add'>+		{EM2874_R80_GPIO,	0xef,	0xff,	0x01},</div><div class='add'>+		{EM2874_R80_GPIO,	0xcf,	0xff,	0x0b},</div><div class='add'>+		{EM2874_R80_GPIO,	0xef,	0xff,	0x40},</div><div class='add'>+</div><div class='add'>+		{EM2874_R80_GPIO,	0xcf,	0xff,	0x65},</div><div class='add'>+		{EM2874_R80_GPIO,	0xef,	0xff,	0x65},</div><div class='add'>+		{EM2874_R80_GPIO,	0xcf,	0xff,	0x0b},</div><div class='add'>+		{EM2874_R80_GPIO,	0xef,	0xff,	0x65},</div><div class='add'>+</div><div class='add'>+		{ -1,                   -1,     -1,     -1},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		unsigned char r[4];</div><div class='add'>+		int len;</div><div class='add'>+	} regs[] = {</div><div class='add'>+		{{ 0x06, 0x02, 0x00, 0x31 }, 4},</div><div class='add'>+		{{ 0x01, 0x02 }, 2},</div><div class='add'>+		{{ 0x01, 0x02, 0x00, 0xc6 }, 4},</div><div class='add'>+		{{ 0x01, 0x00 }, 2},</div><div class='add'>+		{{ 0x01, 0x00, 0xff, 0xaf }, 4},</div><div class='add'>+		{{ 0x01, 0x00, 0x03, 0xa0 }, 4},</div><div class='add'>+		{{ 0x01, 0x00 }, 2},</div><div class='add'>+		{{ 0x01, 0x00, 0x73, 0xaf }, 4},</div><div class='add'>+		{{ 0x04, 0x00 }, 2},</div><div class='add'>+		{{ 0x00, 0x04 }, 2},</div><div class='add'>+		{{ 0x00, 0x04, 0x00, 0x0a }, 4},</div><div class='add'>+		{{ 0x04, 0x14 }, 2},</div><div class='add'>+		{{ 0x04, 0x14, 0x00, 0x00 }, 4},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	em28xx_gpio_set(dev, hauppauge_hvr930c_init);</div><div class='add'>+	em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, 0x40);</div><div class='add'>+	msleep(10);</div><div class='add'>+	em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, 0x44);</div><div class='add'>+	msleep(10);</div><div class='add'>+</div><div class='add'>+	dev-&gt;i2c_client.addr = 0x82 &gt;&gt; 1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(regs); i++)</div><div class='add'>+		i2c_master_send(&amp;dev-&gt;i2c_client, regs[i].r, regs[i].len);</div><div class='add'>+	em28xx_gpio_set(dev, hauppauge_hvr930c_end);</div><div class='add'>+</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, 0x44);</div><div class='add'>+	msleep(30);</div><div class='add'>+</div><div class='add'>+	em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, 0x45);</div><div class='add'>+	msleep(10);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void terratec_h5_init(struct em28xx *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -425,13 +503,6 @@ static struct tda10023_config em28xx_tda10023_config = {</div><div class='ctx'> static struct cxd2820r_config em28xx_cxd2820r_config = {</div><div class='ctx'> 	.i2c_address = (0xd8 &gt;&gt; 1),</div><div class='ctx'> 	.ts_mode = CXD2820R_TS_SERIAL,</div><div class='del'>-	.if_dvbt_6  = 3300,</div><div class='del'>-	.if_dvbt_7  = 3500,</div><div class='del'>-	.if_dvbt_8  = 4000,</div><div class='del'>-	.if_dvbt2_6 = 3300,</div><div class='del'>-	.if_dvbt2_7 = 3500,</div><div class='del'>-	.if_dvbt2_8 = 4000,</div><div class='del'>-	.if_dvbc    = 5000,</div><div class='ctx'> </div><div class='ctx'> 	/* enable LNA for DVB-T2 and DVB-C */</div><div class='ctx'> 	.gpio_dvbt2[0] = CXD2820R_GPIO_E | CXD2820R_GPIO_O | CXD2820R_GPIO_L,</div><div class='hunk'>@@ -456,6 +527,17 @@ static const struct a8293_config em28xx_a8293_config = {</div><div class='ctx'> 	.i2c_addr = 0x08, /* (0x10 &gt;&gt; 1) */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct zl10353_config em28xx_zl10353_no_i2c_gate_dev = {</div><div class='add'>+	.demod_address = (0x1e &gt;&gt; 1),</div><div class='add'>+	.disable_i2c_gate_ctrl = 1,</div><div class='add'>+	.no_tuner = 1,</div><div class='add'>+	.parallel_ts = 1,</div><div class='add'>+};</div><div class='add'>+static struct qt1010_config em28xx_qt1010_config = {</div><div class='add'>+	.i2c_address = 0x62</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='ctx'> static int em28xx_attach_xc3028(u8 addr, struct em28xx *dev)</div><div class='hunk'>@@ -708,6 +790,14 @@ static int em28xx_dvb_init(struct em28xx *dev)</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case EM2870_BOARD_KWORLD_355U:</div><div class='add'>+		dvb-&gt;fe[0] = dvb_attach(zl10353_attach,</div><div class='add'>+					   &amp;em28xx_zl10353_no_i2c_gate_dev,</div><div class='add'>+					   &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dvb-&gt;fe[0] != NULL)</div><div class='add'>+			dvb_attach(qt1010_attach, dvb-&gt;fe[0],</div><div class='add'>+				   &amp;dev-&gt;i2c_adap, &amp;em28xx_qt1010_config);</div><div class='add'>+		break;</div><div class='ctx'> 	case EM2883_BOARD_KWORLD_HYBRID_330U:</div><div class='ctx'> 	case EM2882_BOARD_EVGA_INDTUBE:</div><div class='ctx'> 		dvb-&gt;fe[0] = dvb_attach(s5h1409_attach,</div><div class='hunk'>@@ -761,50 +851,72 @@ static int em28xx_dvb_init(struct em28xx *dev)</div><div class='ctx'> 				   &amp;dev-&gt;i2c_adap, &amp;kworld_a340_config);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case EM28174_BOARD_PCTV_290E:</div><div class='del'>-		/* MFE</div><div class='del'>-		 * FE 0 = DVB-T/T2 + FE 1 = DVB-C, both sharing same tuner. */</div><div class='del'>-		/* FE 0 */</div><div class='ctx'> 		dvb-&gt;fe[0] = dvb_attach(cxd2820r_attach,</div><div class='del'>-			&amp;em28xx_cxd2820r_config, &amp;dev-&gt;i2c_adap, NULL);</div><div class='add'>+					&amp;em28xx_cxd2820r_config,</div><div class='add'>+					&amp;dev-&gt;i2c_adap,</div><div class='add'>+					NULL);</div><div class='ctx'> 		if (dvb-&gt;fe[0]) {</div><div class='ctx'> 			/* FE 0 attach tuner */</div><div class='del'>-			if (!dvb_attach(tda18271_attach, dvb-&gt;fe[0], 0x60,</div><div class='del'>-				&amp;dev-&gt;i2c_adap, &amp;em28xx_cxd2820r_tda18271_config)) {</div><div class='add'>+			if (!dvb_attach(tda18271_attach,</div><div class='add'>+					dvb-&gt;fe[0],</div><div class='add'>+					0x60,</div><div class='add'>+					&amp;dev-&gt;i2c_adap,</div><div class='add'>+					&amp;em28xx_cxd2820r_tda18271_config)) {</div><div class='add'>+</div><div class='ctx'> 				dvb_frontend_detach(dvb-&gt;fe[0]);</div><div class='ctx'> 				result = -EINVAL;</div><div class='ctx'> 				goto out_free;</div><div class='ctx'> 			}</div><div class='del'>-			/* FE 1. This dvb_attach() cannot fail. */</div><div class='del'>-			dvb-&gt;fe[1] = dvb_attach(cxd2820r_attach, NULL, NULL,</div><div class='del'>-				dvb-&gt;fe[0]);</div><div class='del'>-			dvb-&gt;fe[1]-&gt;id = 1;</div><div class='del'>-			/* FE 1 attach tuner */</div><div class='del'>-			if (!dvb_attach(tda18271_attach, dvb-&gt;fe[1], 0x60,</div><div class='del'>-				&amp;dev-&gt;i2c_adap, &amp;em28xx_cxd2820r_tda18271_config)) {</div><div class='del'>-				dvb_frontend_detach(dvb-&gt;fe[1]);</div><div class='del'>-				/* leave FE 0 still active */</div><div class='del'>-			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C:</div><div class='add'>+	{</div><div class='add'>+		struct xc5000_config cfg;</div><div class='add'>+		hauppauge_hvr930c_init(dev);</div><div class='add'>+</div><div class='add'>+		dvb-&gt;fe[0] = dvb_attach(drxk_attach,</div><div class='add'>+					&amp;hauppauge_930c_drxk, &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (!dvb-&gt;fe[0]) {</div><div class='add'>+			result = -EINVAL;</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+		/* FIXME: do we need a pll semaphore? */</div><div class='add'>+		dvb-&gt;fe[0]-&gt;sec_priv = dvb;</div><div class='add'>+		sema_init(&amp;dvb-&gt;pll_mutex, 1);</div><div class='add'>+		dvb-&gt;gate_ctrl = dvb-&gt;fe[0]-&gt;ops.i2c_gate_ctrl;</div><div class='add'>+		dvb-&gt;fe[0]-&gt;ops.i2c_gate_ctrl = drxk_gate_ctrl;</div><div class='ctx'> </div><div class='del'>-			mfe_shared = 1;</div><div class='add'>+		/* Attach xc5000 */</div><div class='add'>+		memset(&amp;cfg, 0, sizeof(cfg));</div><div class='add'>+		cfg.i2c_address  = 0x61;</div><div class='add'>+		cfg.if_khz = 4000;</div><div class='add'>+</div><div class='add'>+		if (dvb-&gt;fe[0]-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			dvb-&gt;fe[0]-&gt;ops.i2c_gate_ctrl(dvb-&gt;fe[0], 1);</div><div class='add'>+		if (!dvb_attach(xc5000_attach, dvb-&gt;fe[0], &amp;dev-&gt;i2c_adap,</div><div class='add'>+				&amp;cfg)) {</div><div class='add'>+			result = -EINVAL;</div><div class='add'>+			goto out_free;</div><div class='ctx'> 		}</div><div class='add'>+		if (dvb-&gt;fe[0]-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			dvb-&gt;fe[0]-&gt;ops.i2c_gate_ctrl(dvb-&gt;fe[0], 0);</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> 	case EM2884_BOARD_TERRATEC_H5:</div><div class='add'>+	case EM2884_BOARD_CINERGY_HTC_STICK:</div><div class='ctx'> 		terratec_h5_init(dev);</div><div class='ctx'> </div><div class='del'>-		dvb-&gt;dont_attach_fe1 = 1;</div><div class='del'>-</div><div class='del'>-		dvb-&gt;fe[0] = dvb_attach(drxk_attach, &amp;terratec_h5_drxk, &amp;dev-&gt;i2c_adap, &amp;dvb-&gt;fe[1]);</div><div class='add'>+		dvb-&gt;fe[0] = dvb_attach(drxk_attach, &amp;terratec_h5_drxk, &amp;dev-&gt;i2c_adap);</div><div class='ctx'> 		if (!dvb-&gt;fe[0]) {</div><div class='ctx'> 			result = -EINVAL;</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 		/* FIXME: do we need a pll semaphore? */</div><div class='ctx'> 		dvb-&gt;fe[0]-&gt;sec_priv = dvb;</div><div class='ctx'> 		sema_init(&amp;dvb-&gt;pll_mutex, 1);</div><div class='ctx'> 		dvb-&gt;gate_ctrl = dvb-&gt;fe[0]-&gt;ops.i2c_gate_ctrl;</div><div class='ctx'> 		dvb-&gt;fe[0]-&gt;ops.i2c_gate_ctrl = drxk_gate_ctrl;</div><div class='del'>-		dvb-&gt;fe[1]-&gt;id = 1;</div><div class='ctx'> </div><div class='ctx'> 		/* Attach tda18271 to DVB-C frontend */</div><div class='ctx'> 		if (dvb-&gt;fe[0]-&gt;ops.i2c_gate_ctrl)</div><div class='hunk'>@@ -816,12 +928,6 @@ static int em28xx_dvb_init(struct em28xx *dev)</div><div class='ctx'> 		if (dvb-&gt;fe[0]-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 			dvb-&gt;fe[0]-&gt;ops.i2c_gate_ctrl(dvb-&gt;fe[0], 0);</div><div class='ctx'> </div><div class='del'>-		/* Hack - needed by drxk/tda18271c2dd */</div><div class='del'>-		dvb-&gt;fe[1]-&gt;tuner_priv = dvb-&gt;fe[0]-&gt;tuner_priv;</div><div class='del'>-		memcpy(&amp;dvb-&gt;fe[1]-&gt;ops.tuner_ops,</div><div class='del'>-		       &amp;dvb-&gt;fe[0]-&gt;ops.tuner_ops,</div><div class='del'>-		       sizeof(dvb-&gt;fe[0]-&gt;ops.tuner_ops));</div><div class='del'>-</div><div class='ctx'> 		break;</div><div class='ctx'> 	case EM28174_BOARD_PCTV_460E:</div><div class='ctx'> 		/* attach demod */</div><div class='hunk'>@@ -845,6 +951,8 @@ static int em28xx_dvb_init(struct em28xx *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	/* define general-purpose callback pointer */</div><div class='ctx'> 	dvb-&gt;fe[0]-&gt;callback = em28xx_tuner_callback;</div><div class='add'>+	if (dvb-&gt;fe[1])</div><div class='add'>+		dvb-&gt;fe[1]-&gt;callback = em28xx_tuner_callback;</div><div class='ctx'> </div><div class='ctx'> 	/* register everything */</div><div class='ctx'> 	result = em28xx_register_dvb(dvb, THIS_MODULE, dev, &amp;dev-&gt;udev-&gt;dev);</div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c<br/>index 679da4804281..2630b265b0e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-input.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/em28xx/em28xx-input.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/em28xx/em28xx-input.c</a></div><div class='hunk'>@@ -306,7 +306,8 @@ static void em28xx_ir_handle_key(struct em28xx_IR *ir)</div><div class='ctx'> 				   poll_result.rc_data[0],</div><div class='ctx'> 				   poll_result.toggle_bit);</div><div class='ctx'> </div><div class='del'>-		if (ir-&gt;dev-&gt;chip_id == CHIP_ID_EM2874)</div><div class='add'>+		if (ir-&gt;dev-&gt;chip_id == CHIP_ID_EM2874 ||</div><div class='add'>+		    ir-&gt;dev-&gt;chip_id == CHIP_ID_EM2884)</div><div class='ctx'> 			/* The em2874 clears the readcount field every time the</div><div class='ctx'> 			   register is read.  The em2860/2880 datasheet says that it</div><div class='ctx'> 			   is supposed to clear the readcount, but it doesn't.  So with</div><div class='hunk'>@@ -371,13 +372,15 @@ int em28xx_ir_change_protocol(struct rc_dev *rc_dev, u64 rc_type)</div><div class='ctx'> 	case CHIP_ID_EM2883:</div><div class='ctx'> 		ir-&gt;get_key = default_polling_getkey;</div><div class='ctx'> 		break;</div><div class='add'>+	case CHIP_ID_EM2884:</div><div class='ctx'> 	case CHIP_ID_EM2874:</div><div class='ctx'> 	case CHIP_ID_EM28174:</div><div class='ctx'> 		ir-&gt;get_key = em2874_polling_getkey;</div><div class='ctx'> 		em28xx_write_regs(dev, EM2874_R50_IR_CONFIG, &amp;ir_config, 1);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk("Unrecognized em28xx chip id: IR not supported\n");</div><div class='add'>+		printk("Unrecognized em28xx chip id 0x%02x: IR not supported\n",</div><div class='add'>+			dev-&gt;chip_id);</div><div class='ctx'> 		rc = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx-reg.h b/drivers/media/video/em28xx/em28xx-reg.h<br/>index 66f792361b97..2f6268505726 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-reg.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/em28xx/em28xx-reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/em28xx/em28xx-reg.h</a></div><div class='hunk'>@@ -12,6 +12,11 @@</div><div class='ctx'> #define EM_GPO_2   (1 &lt;&lt; 2)</div><div class='ctx'> #define EM_GPO_3   (1 &lt;&lt; 3)</div><div class='ctx'> </div><div class='add'>+/* em28xx endpoints */</div><div class='add'>+#define EM28XX_EP_ANALOG	0x82</div><div class='add'>+#define EM28XX_EP_AUDIO		0x83</div><div class='add'>+#define EM28XX_EP_DIGITAL	0x84</div><div class='add'>+</div><div class='ctx'> /* em2800 registers */</div><div class='ctx'> #define EM2800_R08_AUDIOSRC 0x08</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c<br/>index 9b4557a2f6d0..613300b51a9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-video.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/em28xx/em28xx-video.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/em28xx/em28xx-video.c</a></div><div class='hunk'>@@ -1070,6 +1070,10 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,</div><div class='ctx'> 		/* the em2800 can only scale down to 50% */</div><div class='ctx'> 		height = height &gt; (3 * maxh / 4) ? maxh : maxh / 2;</div><div class='ctx'> 		width = width &gt; (3 * maxw / 4) ? maxw : maxw / 2;</div><div class='add'>+                /* MaxPacketSize for em2800 is too small to capture at full resolution</div><div class='add'>+                 * use half of maxw as the scaler can only scale to 50% */</div><div class='add'>+		if (width == maxw &amp;&amp; height == maxh)</div><div class='add'>+			width /= 2;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* width must even because of the YUYV format</div><div class='ctx'> 		   height must be even because of interlacing */</div><div class='hunk'>@@ -2503,6 +2507,7 @@ int em28xx_register_analog_devices(struct em28xx *dev)</div><div class='ctx'> {</div><div class='ctx'>       u8 val;</div><div class='ctx'> 	int ret;</div><div class='add'>+	unsigned int maxw;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "%s: v4l2 driver version %s\n",</div><div class='ctx'> 		dev-&gt;name, EM28XX_VERSION);</div><div class='hunk'>@@ -2515,8 +2520,15 @@ int em28xx_register_analog_devices(struct em28xx *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Analog specific initialization */</div><div class='ctx'> 	dev-&gt;format = &amp;format[0];</div><div class='add'>+</div><div class='add'>+	maxw = norm_maxw(dev);</div><div class='add'>+        /* MaxPacketSize for em2800 is too small to capture at full resolution</div><div class='add'>+         * use half of maxw as the scaler can only scale to 50% */</div><div class='add'>+        if (dev-&gt;board.is_em2800)</div><div class='add'>+            maxw /= 2;</div><div class='add'>+</div><div class='ctx'> 	em28xx_set_video_format(dev, format[0].fourcc,</div><div class='del'>-				norm_maxw(dev), norm_maxh(dev));</div><div class='add'>+				maxw, norm_maxh(dev));</div><div class='ctx'> </div><div class='ctx'> 	video_mux(dev, dev-&gt;ctl_input);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h<br/>index 2a2cb7ed0014..22e252bcc41e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/em28xx/em28xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/em28xx/em28xx.h</a></div><div class='hunk'>@@ -38,6 +38,7 @@</div><div class='ctx'> #include &lt;media/videobuf-dvb.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> #include "tuner-xc2028.h"</div><div class='add'>+#include "xc5000.h"</div><div class='ctx'> #include "em28xx-reg.h"</div><div class='ctx'> </div><div class='ctx'> /* Boards supported by driver */</div><div class='hunk'>@@ -121,6 +122,9 @@</div><div class='ctx'> #define EM28174_BOARD_PCTV_290E                   78</div><div class='ctx'> #define EM2884_BOARD_TERRATEC_H5		  79</div><div class='ctx'> #define EM28174_BOARD_PCTV_460E                   80</div><div class='add'>+#define EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C	  81</div><div class='add'>+#define EM2884_BOARD_CINERGY_HTC_STICK		  82</div><div class='add'>+#define EM2860_BOARD_HT_VIDBOX_NW03 		  83</div><div class='ctx'> </div><div class='ctx'> /* Limits minimum and default number of buffers */</div><div class='ctx'> #define EM28XX_MIN_BUF 4</div><div class='hunk'>@@ -594,6 +598,8 @@ struct em28xx {</div><div class='ctx'> 	int max_pkt_size;	/* max packet size of isoc transaction */</div><div class='ctx'> 	int num_alt;		/* Number of alternative settings */</div><div class='ctx'> 	unsigned int *alt_max_pkt_size;	/* array of wMaxPacketSize */</div><div class='add'>+	int dvb_alt;				/* alternate for DVB */</div><div class='add'>+	unsigned int dvb_max_pkt_size;		/* wMaxPacketSize for DVB */</div><div class='ctx'> 	struct urb *urb[EM28XX_NUM_BUFS];	/* urb for isoc transfers */</div><div class='ctx'> 	char *transfer_buffer[EM28XX_NUM_BUFS];	/* transfer buffers for isoc</div><div class='ctx'> 						   transfer */</div><div class='hunk'>@@ -825,7 +831,7 @@ static inline unsigned int norm_maxw(struct em28xx *dev)</div><div class='ctx'> 	if (dev-&gt;board.is_webcam)</div><div class='ctx'> 		return dev-&gt;sensor_xres;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;board.max_range_640_480 || dev-&gt;board.is_em2800)</div><div class='add'>+	if (dev-&gt;board.max_range_640_480)</div><div class='ctx'> 		return 640;</div><div class='ctx'> </div><div class='ctx'> 	return 720;</div><div class='head'>diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c<br/>index d3777c86e1de..5539f09440ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/et61x251/et61x251_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/et61x251/et61x251_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/et61x251/et61x251_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/et61x251/et61x251_core.c</a></div><div class='hunk'>@@ -76,8 +76,8 @@ MODULE_PARM_DESC(video_nr,</div><div class='ctx'> 		 "\none and for every other camera."</div><div class='ctx'> 		 "\n");</div><div class='ctx'> </div><div class='del'>-static short force_munmap[] = {[0 ... ET61X251_MAX_DEVICES-1] =</div><div class='del'>-			       ET61X251_FORCE_MUNMAP};</div><div class='add'>+static bool force_munmap[] = {[0 ... ET61X251_MAX_DEVICES-1] =</div><div class='add'>+			      ET61X251_FORCE_MUNMAP};</div><div class='ctx'> module_param_array(force_munmap, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(force_munmap,</div><div class='ctx'> 		 "\n&lt;0|1[,...]&gt; Force the application to unmap previously"</div><div class='hunk'>@@ -2680,27 +2680,4 @@ static struct usb_driver et61x251_usb_driver = {</div><div class='ctx'> 	.disconnect = et61x251_usb_disconnect,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*****************************************************************************/</div><div class='del'>-</div><div class='del'>-static int __init et61x251_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	KDBG(2, ET61X251_MODULE_NAME " v" ET61X251_MODULE_VERSION);</div><div class='del'>-	KDBG(3, ET61X251_MODULE_AUTHOR);</div><div class='del'>-</div><div class='del'>-	if ((err = usb_register(&amp;et61x251_usb_driver)))</div><div class='del'>-		KDBG(1, "usb_register() failed");</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void __exit et61x251_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;et61x251_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-module_init(et61x251_module_init);</div><div class='del'>-module_exit(et61x251_module_exit);</div><div class='add'>+module_usb_driver(et61x251_usb_driver);</div><div class='head'>diff --git a/drivers/media/video/fsl-viu.c b/drivers/media/video/fsl-viu.c<br/>index 27cb197d0bd6..27e3e0c0b219 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/fsl-viu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/fsl-viu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/fsl-viu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/fsl-viu.c</a></div><div class='hunk'>@@ -1661,18 +1661,7 @@ static struct platform_driver viu_of_platform_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init viu_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;viu_of_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit viu_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;viu_of_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(viu_init);</div><div class='del'>-module_exit(viu_exit);</div><div class='add'>+module_platform_driver(viu_of_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Freescale Video-In(VIU)");</div><div class='ctx'> MODULE_AUTHOR("Hongjun Chen");</div><div class='head'>diff --git a/drivers/media/video/gspca/Kconfig b/drivers/media/video/gspca/Kconfig<br/>index 103af3fe5aa0..dfe268bfa4f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/Kconfig</a></div><div class='hunk'>@@ -77,6 +77,16 @@ config USB_GSPCA_JEILINJ</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called gspca_jeilinj.</div><div class='ctx'> </div><div class='add'>+config USB_GSPCA_JL2005BCD</div><div class='add'>+	tristate "JL2005B/C/D USB V4L2 driver"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want support for cameras based the</div><div class='add'>+	  JL2005B, JL2005C, or JL2005D chip.</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 gspca_jl2005bcd.</div><div class='add'>+</div><div class='ctx'> config USB_GSPCA_KINECT</div><div class='ctx'> 	tristate "Kinect sensor device USB Camera Driver"</div><div class='ctx'> 	depends on VIDEO_V4L2 &amp;&amp; USB_GSPCA</div><div class='head'>diff --git a/drivers/media/video/gspca/Makefile b/drivers/media/video/gspca/Makefile<br/>index f345f494d0f3..79ebe46e1ad7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/Makefile</a></div><div class='hunk'>@@ -5,6 +5,7 @@ obj-$(CONFIG_USB_GSPCA_CPIA1)    += gspca_cpia1.o</div><div class='ctx'> obj-$(CONFIG_USB_GSPCA_ETOMS)    += gspca_etoms.o</div><div class='ctx'> obj-$(CONFIG_USB_GSPCA_FINEPIX)  += gspca_finepix.o</div><div class='ctx'> obj-$(CONFIG_USB_GSPCA_JEILINJ)  += gspca_jeilinj.o</div><div class='add'>+obj-$(CONFIG_USB_GSPCA_JL2005BCD) += gspca_jl2005bcd.o</div><div class='ctx'> obj-$(CONFIG_USB_GSPCA_KINECT)   += gspca_kinect.o</div><div class='ctx'> obj-$(CONFIG_USB_GSPCA_KONICA)   += gspca_konica.o</div><div class='ctx'> obj-$(CONFIG_USB_GSPCA_MARS)     += gspca_mars.o</div><div class='hunk'>@@ -49,6 +50,7 @@ gspca_cpia1-objs    := cpia1.o</div><div class='ctx'> gspca_etoms-objs    := etoms.o</div><div class='ctx'> gspca_finepix-objs  := finepix.o</div><div class='ctx'> gspca_jeilinj-objs  := jeilinj.o</div><div class='add'>+gspca_jl2005bcd-objs  := jl2005bcd.o</div><div class='ctx'> gspca_kinect-objs   := kinect.o</div><div class='ctx'> gspca_konica-objs   := konica.o</div><div class='ctx'> gspca_mars-objs     := mars.o</div><div class='head'>diff --git a/drivers/media/video/gspca/benq.c b/drivers/media/video/gspca/benq.c<br/>index 6ae26160b81f..9769f17915c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/benq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/benq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/benq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/benq.c</a></div><div class='hunk'>@@ -76,7 +76,6 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	gspca_dev-&gt;cam.cam_mode = vga_mode;</div><div class='ctx'> 	gspca_dev-&gt;cam.nmodes = ARRAY_SIZE(vga_mode);</div><div class='ctx'> 	gspca_dev-&gt;cam.no_urb_create = 1;</div><div class='del'>-	gspca_dev-&gt;cam.reverse_alts = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -135,13 +134,17 @@ static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> </div><div class='ctx'> static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='add'>+	struct usb_interface *intf;</div><div class='add'>+</div><div class='ctx'> 	reg_w(gspca_dev, 0x003c, 0x0003);</div><div class='ctx'> 	reg_w(gspca_dev, 0x003c, 0x0004);</div><div class='ctx'> 	reg_w(gspca_dev, 0x003c, 0x0005);</div><div class='ctx'> 	reg_w(gspca_dev, 0x003c, 0x0006);</div><div class='ctx'> 	reg_w(gspca_dev, 0x003c, 0x0007);</div><div class='add'>+</div><div class='add'>+	intf = usb_ifnum_to_if(gspca_dev-&gt;dev, gspca_dev-&gt;iface);</div><div class='ctx'> 	usb_set_interface(gspca_dev-&gt;dev, gspca_dev-&gt;iface,</div><div class='del'>-					gspca_dev-&gt;nbalt - 1);</div><div class='add'>+					intf-&gt;num_altsetting - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='hunk'>@@ -288,15 +291,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c<br/>index 4c56dbef6d92..ea17b5d94ea4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/conex.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/conex.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/conex.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/conex.c</a></div><div class='hunk'>@@ -1067,15 +1067,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/cpia1.c b/drivers/media/video/gspca/cpia1.c<br/>index f9b86b2484b0..8f33bbd091ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/cpia1.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/cpia1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/cpia1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/cpia1.c</a></div><div class='hunk'>@@ -2132,15 +2132,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c<br/>index 0357d6d461d1..81a4adbd9f7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/etoms.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/etoms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/etoms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/etoms.c</a></div><div class='hunk'>@@ -895,16 +895,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/finepix.c b/drivers/media/video/gspca/finepix.c<br/>index ea48200fd3a0..0107513cd728 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/finepix.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/finepix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/finepix.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/finepix.c</a></div><div class='hunk'>@@ -290,16 +290,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/gl860/gl860.c b/drivers/media/video/gspca/gl860/gl860.c<br/>index 2ced3b73994f..c84e26006fc3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/gl860/gl860.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/gl860/gl860.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/gl860/gl860.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/gl860/gl860.c</a></div><div class='hunk'>@@ -337,7 +337,6 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	cam = &amp;gspca_dev-&gt;cam;</div><div class='del'>-	gspca_dev-&gt;nbalt = 4;</div><div class='ctx'> </div><div class='ctx'> 	switch (sd-&gt;sensor) {</div><div class='ctx'> 	case ID_MI1320:</div><div class='hunk'>@@ -524,22 +523,7 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> </div><div class='ctx'> /*====================== Init and Exit module functions ====================*/</div><div class='ctx'> </div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	PDEBUG(D_PROBE, "driver startup - version %s", DRIVER_VERSION);</div><div class='del'>-</div><div class='del'>-	if (usb_register(&amp;sd_driver) &lt; 0)</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 void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='ctx'> </div><div class='ctx'> /*==========================================================================*/</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c<br/>index 2ca10dfec91f..ca5a2b139d0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/gspca.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/gspca.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/gspca.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/gspca.c</a></div><div class='hunk'>@@ -633,23 +633,32 @@ static u32 which_bandwidth(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	u32 bandwidth;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	/* get the (max) image size */</div><div class='ctx'> 	i = gspca_dev-&gt;curr_mode;</div><div class='ctx'> 	bandwidth = gspca_dev-&gt;cam.cam_mode[i].sizeimage;</div><div class='ctx'> </div><div class='del'>-	/* if the image is compressed, estimate the mean image size */</div><div class='del'>-	if (bandwidth &lt; gspca_dev-&gt;cam.cam_mode[i].width *</div><div class='add'>+	/* if the image is compressed, estimate its mean size */</div><div class='add'>+	if (!gspca_dev-&gt;cam.needs_full_bandwidth &amp;&amp;</div><div class='add'>+	    bandwidth &lt; gspca_dev-&gt;cam.cam_mode[i].width *</div><div class='ctx'> 				gspca_dev-&gt;cam.cam_mode[i].height)</div><div class='del'>-		bandwidth /= 3;</div><div class='add'>+		bandwidth = bandwidth * 3 / 8;	/* 0.375 */</div><div class='ctx'> </div><div class='ctx'> 	/* estimate the frame rate */</div><div class='ctx'> 	if (gspca_dev-&gt;sd_desc-&gt;get_streamparm) {</div><div class='ctx'> 		struct v4l2_streamparm parm;</div><div class='ctx'> </div><div class='del'>-		parm.parm.capture.timeperframe.denominator = 15;</div><div class='ctx'> 		gspca_dev-&gt;sd_desc-&gt;get_streamparm(gspca_dev, &amp;parm);</div><div class='ctx'> 		bandwidth *= parm.parm.capture.timeperframe.denominator;</div><div class='add'>+		bandwidth /= parm.parm.capture.timeperframe.numerator;</div><div class='ctx'> 	} else {</div><div class='del'>-		bandwidth *= 15;		/* 15 fps */</div><div class='add'>+</div><div class='add'>+		/* don't hope more than 15 fps with USB 1.1 and</div><div class='add'>+		 * image resolution &gt;= 640x480 */</div><div class='add'>+		if (gspca_dev-&gt;width &gt;= 640</div><div class='add'>+		 &amp;&amp; gspca_dev-&gt;dev-&gt;speed == USB_SPEED_FULL)</div><div class='add'>+			bandwidth *= 15;		/* 15 fps */</div><div class='add'>+		else</div><div class='add'>+			bandwidth *= 30;		/* 30 fps */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	PDEBUG(D_STREAM, "min bandwidth: %d", bandwidth);</div><div class='hunk'>@@ -667,9 +676,8 @@ struct ep_tb_s {</div><div class='ctx'>  * build the table of the endpoints</div><div class='ctx'>  * and compute the minimum bandwidth for the image transfer</div><div class='ctx'>  */</div><div class='del'>-static int build_ep_tb(struct gspca_dev *gspca_dev,</div><div class='add'>+static int build_isoc_ep_tb(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			struct usb_interface *intf,</div><div class='del'>-			int xfer,</div><div class='ctx'> 			struct ep_tb_s *ep_tb)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_host_endpoint *ep;</div><div class='hunk'>@@ -687,17 +695,21 @@ static int build_ep_tb(struct gspca_dev *gspca_dev,</div><div class='ctx'> 		ep_tb-&gt;bandwidth = 2000 * 2000 * 120;</div><div class='ctx'> 		found = 0;</div><div class='ctx'> 		for (j = 0; j &lt; nbalt; j++) {</div><div class='del'>-			ep = alt_xfer(&amp;intf-&gt;altsetting[j], xfer);</div><div class='add'>+			ep = alt_xfer(&amp;intf-&gt;altsetting[j],</div><div class='add'>+				      USB_ENDPOINT_XFER_ISOC);</div><div class='ctx'> 			if (ep == NULL)</div><div class='ctx'> 				continue;</div><div class='add'>+			if (ep-&gt;desc.bInterval == 0) {</div><div class='add'>+				pr_err("alt %d iso endp with 0 interval\n", j);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='ctx'> 			psize = le16_to_cpu(ep-&gt;desc.wMaxPacketSize);</div><div class='del'>-			if (!gspca_dev-&gt;cam.bulk)		/* isoc */</div><div class='del'>-				psize = (psize &amp; 0x07ff) *</div><div class='del'>-						(1 + ((psize &gt;&gt; 11) &amp; 3));</div><div class='del'>-			bandwidth = psize * ep-&gt;desc.bInterval * 1000;</div><div class='add'>+			psize = (psize &amp; 0x07ff) * (1 + ((psize &gt;&gt; 11) &amp; 3));</div><div class='add'>+			bandwidth = psize * 1000;</div><div class='ctx'> 			if (gspca_dev-&gt;dev-&gt;speed == USB_SPEED_HIGH</div><div class='ctx'> 			 || gspca_dev-&gt;dev-&gt;speed == USB_SPEED_SUPER)</div><div class='ctx'> 				bandwidth *= 8;</div><div class='add'>+			bandwidth /= 1 &lt;&lt; (ep-&gt;desc.bInterval - 1);</div><div class='ctx'> 			if (bandwidth &lt;= last_bw)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (bandwidth &lt; ep_tb-&gt;bandwidth) {</div><div class='hunk'>@@ -715,6 +727,23 @@ static int build_ep_tb(struct gspca_dev *gspca_dev,</div><div class='ctx'> 		ep_tb++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If the camera:</div><div class='add'>+	 * has a usb audio class interface (a built in usb mic); and</div><div class='add'>+	 * is a usb 1 full speed device; and</div><div class='add'>+	 * uses the max full speed iso bandwidth; and</div><div class='add'>+	 * and has more than 1 alt setting</div><div class='add'>+	 * then skip the highest alt setting to spare bandwidth for the mic</div><div class='add'>+	 */</div><div class='add'>+	if (gspca_dev-&gt;audio &amp;&amp;</div><div class='add'>+			gspca_dev-&gt;dev-&gt;speed == USB_SPEED_FULL &amp;&amp;</div><div class='add'>+			last_bw &gt;= 1000000 &amp;&amp;</div><div class='add'>+			i &gt; 1) {</div><div class='add'>+		PDEBUG(D_STREAM, "dev has usb audio, skipping highest alt");</div><div class='add'>+		i--;</div><div class='add'>+		ep_tb--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* get the requested bandwidth and start at the highest atlsetting */</div><div class='ctx'> 	bandwidth = which_bandwidth(gspca_dev);</div><div class='ctx'> 	ep_tb--;</div><div class='hunk'>@@ -790,10 +819,7 @@ static int create_urbs(struct gspca_dev *gspca_dev,</div><div class='ctx'> 						    ep-&gt;desc.bEndpointAddress);</div><div class='ctx'> 			urb-&gt;transfer_flags = URB_ISO_ASAP</div><div class='ctx'> 					| URB_NO_TRANSFER_DMA_MAP;</div><div class='del'>-			if (gspca_dev-&gt;dev-&gt;speed == USB_SPEED_LOW)</div><div class='del'>-				urb-&gt;interval = ep-&gt;desc.bInterval;</div><div class='del'>-			else</div><div class='del'>-				urb-&gt;interval = 1 &lt;&lt; (ep-&gt;desc.bInterval - 1);</div><div class='add'>+			urb-&gt;interval = 1 &lt;&lt; (ep-&gt;desc.bInterval - 1);</div><div class='ctx'> 			urb-&gt;complete = isoc_irq;</div><div class='ctx'> 			urb-&gt;number_of_packets = npkt;</div><div class='ctx'> 			for (i = 0; i &lt; npkt; i++) {</div><div class='hunk'>@@ -848,7 +874,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	xfer = gspca_dev-&gt;cam.bulk ? USB_ENDPOINT_XFER_BULK</div><div class='ctx'> 				   : USB_ENDPOINT_XFER_ISOC;</div><div class='ctx'> </div><div class='del'>-	/* if the subdriver forced an altsetting, get the endpoint */</div><div class='add'>+	/* if bulk or the subdriver forced an altsetting, get the endpoint */</div><div class='ctx'> 	if (gspca_dev-&gt;alt != 0) {</div><div class='ctx'> 		gspca_dev-&gt;alt--;	/* (previous version compatibility) */</div><div class='ctx'> 		ep = alt_xfer(&amp;intf-&gt;altsetting[gspca_dev-&gt;alt], xfer);</div><div class='hunk'>@@ -863,7 +889,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)</div><div class='ctx'> </div><div class='ctx'> 	/* else, compute the minimum bandwidth</div><div class='ctx'> 	 * and build the endpoint table */</div><div class='del'>-		alt_idx = build_ep_tb(gspca_dev, intf, xfer, ep_tb);</div><div class='add'>+		alt_idx = build_isoc_ep_tb(gspca_dev, intf, ep_tb);</div><div class='ctx'> 		if (alt_idx &lt;= 0) {</div><div class='ctx'> 			pr_err("no transfer endpoint found\n");</div><div class='ctx'> 			ret = -EIO;</div><div class='hunk'>@@ -880,7 +906,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		if (alt != gspca_dev-&gt;alt) {</div><div class='ctx'> 			alt = gspca_dev-&gt;alt;</div><div class='del'>-			if (gspca_dev-&gt;nbalt &gt; 1) {</div><div class='add'>+			if (intf-&gt;num_altsetting &gt; 1) {</div><div class='ctx'> 				ret = usb_set_interface(gspca_dev-&gt;dev,</div><div class='ctx'> 							gspca_dev-&gt;iface,</div><div class='ctx'> 							alt);</div><div class='hunk'>@@ -2300,15 +2326,14 @@ int gspca_dev_probe2(struct usb_interface *intf,</div><div class='ctx'> 	}</div><div class='ctx'> 	gspca_dev-&gt;dev = dev;</div><div class='ctx'> 	gspca_dev-&gt;iface = intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber;</div><div class='del'>-	gspca_dev-&gt;nbalt = intf-&gt;num_altsetting;</div><div class='ctx'> </div><div class='ctx'> 	/* check if any audio device */</div><div class='del'>-	if (dev-&gt;config-&gt;desc.bNumInterfaces != 1) {</div><div class='add'>+	if (dev-&gt;actconfig-&gt;desc.bNumInterfaces != 1) {</div><div class='ctx'> 		int i;</div><div class='ctx'> 		struct usb_interface *intf2;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; dev-&gt;config-&gt;desc.bNumInterfaces; i++) {</div><div class='del'>-			intf2 = dev-&gt;config-&gt;interface[i];</div><div class='add'>+		for (i = 0; i &lt; dev-&gt;actconfig-&gt;desc.bNumInterfaces; i++) {</div><div class='add'>+			intf2 = dev-&gt;actconfig-&gt;interface[i];</div><div class='ctx'> 			if (intf2 != NULL</div><div class='ctx'> 			 &amp;&amp; intf2-&gt;altsetting != NULL</div><div class='ctx'> 			 &amp;&amp; intf2-&gt;altsetting-&gt;desc.bInterfaceClass ==</div><div class='hunk'>@@ -2389,7 +2414,7 @@ int gspca_dev_probe(struct usb_interface *intf,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* the USB video interface must be the first one */</div><div class='del'>-	if (dev-&gt;config-&gt;desc.bNumInterfaces != 1</div><div class='add'>+	if (dev-&gt;actconfig-&gt;desc.bNumInterfaces != 1</div><div class='ctx'> 	 &amp;&amp; intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber != 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h<br/>index e444f16e1497..589009f4496f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/gspca.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/gspca.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/gspca.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/gspca.h</a></div><div class='hunk'>@@ -69,7 +69,9 @@ struct cam {</div><div class='ctx'> 	u8 bulk;		/* image transfer by 0:isoc / 1:bulk */</div><div class='ctx'> 	u8 npkt;		/* number of packets in an ISOC message</div><div class='ctx'> 				 * 0 is the default value: 32 packets */</div><div class='del'>-	u8 reverse_alts;	/* Alt settings are in high to low order */</div><div class='add'>+	u8 needs_full_bandwidth;/* Set this flag to notify the bandwidth calc.</div><div class='add'>+				 * code that the cam fills all image buffers to</div><div class='add'>+				 * the max, even when using compression. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct gspca_dev;</div><div class='hunk'>@@ -208,7 +210,6 @@ struct gspca_dev {</div><div class='ctx'> 	char memory;			/* memory type (V4L2_MEMORY_xxx) */</div><div class='ctx'> 	__u8 iface;			/* USB interface number */</div><div class='ctx'> 	__u8 alt;			/* USB alternate setting */</div><div class='del'>-	__u8 nbalt;			/* number of USB alternate settings */</div><div class='ctx'> 	u8 audio;			/* presence of audio device */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/gspca/jeilinj.c b/drivers/media/video/gspca/jeilinj.c<br/>index 8e3dabe30077..5ab3f7e12760 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/jeilinj.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/jeilinj.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/jeilinj.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/jeilinj.c</a></div><div class='hunk'>@@ -582,16 +582,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/jl2005bcd.c b/drivers/media/video/gspca/jl2005bcd.c<br/>new file mode 100644<br/>index 000000000000..53f58ef367cf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/jl2005bcd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/jl2005bcd.c</a></div><div class='hunk'>@@ -0,0 +1,554 @@</div><div class='add'>+/*</div><div class='add'>+ * Jeilin JL2005B/C/D library</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Theodore Kilgore &lt;kilgota@auburn.edu&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'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define MODULE_NAME "jl2005bcd"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include "gspca.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Theodore Kilgore &lt;kilgota@auburn.edu&gt;");</div><div class='add'>+MODULE_DESCRIPTION("JL2005B/C/D USB Camera Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+/* Default timeouts, in ms */</div><div class='add'>+#define JL2005C_CMD_TIMEOUT 500</div><div class='add'>+#define JL2005C_DATA_TIMEOUT 1000</div><div class='add'>+</div><div class='add'>+/* Maximum transfer size to use. */</div><div class='add'>+#define JL2005C_MAX_TRANSFER 0x200</div><div class='add'>+#define FRAME_HEADER_LEN 16</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* specific webcam descriptor */</div><div class='add'>+struct sd {</div><div class='add'>+	struct gspca_dev gspca_dev;  /* !! must be the first item */</div><div class='add'>+	unsigned char firmware_id[6];</div><div class='add'>+	const struct v4l2_pix_format *cap_mode;</div><div class='add'>+	/* Driver stuff */</div><div class='add'>+	struct work_struct work_struct;</div><div class='add'>+	struct workqueue_struct *work_thread;</div><div class='add'>+	u8 frame_brightness;</div><div class='add'>+	int block_size;	/* block size of camera */</div><div class='add'>+	int vga;	/* 1 if vga cam, 0 if cif cam */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Camera has two resolution settings. What they are depends on model. */</div><div class='add'>+static const struct v4l2_pix_format cif_mode[] = {</div><div class='add'>+	{176, 144, V4L2_PIX_FMT_JL2005BCD, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 176,</div><div class='add'>+		.sizeimage = 176 * 144,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 0},</div><div class='add'>+	{352, 288, V4L2_PIX_FMT_JL2005BCD, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 352,</div><div class='add'>+		.sizeimage = 352 * 288,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct v4l2_pix_format vga_mode[] = {</div><div class='add'>+	{320, 240, V4L2_PIX_FMT_JL2005BCD, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 320,</div><div class='add'>+		.sizeimage = 320 * 240,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 0},</div><div class='add'>+	{640, 480, V4L2_PIX_FMT_JL2005BCD, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 640,</div><div class='add'>+		.sizeimage = 640 * 480,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB,</div><div class='add'>+		.priv = 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * cam uses endpoint 0x03 to send commands, 0x84 for read commands,</div><div class='add'>+ * and 0x82 for bulk data transfer.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* All commands are two bytes only */</div><div class='add'>+static int jl2005c_write2(struct gspca_dev *gspca_dev, unsigned char *command)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	memcpy(gspca_dev-&gt;usb_buf, command, 2);</div><div class='add'>+	retval = usb_bulk_msg(gspca_dev-&gt;dev,</div><div class='add'>+			usb_sndbulkpipe(gspca_dev-&gt;dev, 3),</div><div class='add'>+			gspca_dev-&gt;usb_buf, 2, NULL, 500);</div><div class='add'>+	if (retval &lt; 0)</div><div class='add'>+		pr_err("command write [%02x] error %d\n",</div><div class='add'>+		       gspca_dev-&gt;usb_buf[0], retval);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Response to a command is one byte in usb_buf[0], only if requested. */</div><div class='add'>+static int jl2005c_read1(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	retval = usb_bulk_msg(gspca_dev-&gt;dev,</div><div class='add'>+				usb_rcvbulkpipe(gspca_dev-&gt;dev, 0x84),</div><div class='add'>+				gspca_dev-&gt;usb_buf, 1, NULL, 500);</div><div class='add'>+	if (retval &lt; 0)</div><div class='add'>+		pr_err("read command [0x%02x] error %d\n",</div><div class='add'>+		       gspca_dev-&gt;usb_buf[0], retval);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Response appears in gspca_dev-&gt;usb_buf[0] */</div><div class='add'>+static int jl2005c_read_reg(struct gspca_dev *gspca_dev, unsigned char reg)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	static u8 instruction[2] = {0x95, 0x00};</div><div class='add'>+	/* put register to read in byte 1 */</div><div class='add'>+	instruction[1] = reg;</div><div class='add'>+	/* Send the read request */</div><div class='add'>+	retval = jl2005c_write2(gspca_dev, instruction);</div><div class='add'>+	if (retval &lt; 0)</div><div class='add'>+		return retval;</div><div class='add'>+	retval = jl2005c_read1(gspca_dev);</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jl2005c_start_new_frame(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int retval;</div><div class='add'>+	int frame_brightness = 0;</div><div class='add'>+</div><div class='add'>+	static u8 instruction[2] = {0x7f, 0x01};</div><div class='add'>+</div><div class='add'>+	retval = jl2005c_write2(gspca_dev, instruction);</div><div class='add'>+	if (retval &lt; 0)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	while (i &lt; 20 &amp;&amp; !frame_brightness) {</div><div class='add'>+		/* If we tried 20 times, give up. */</div><div class='add'>+		retval = jl2005c_read_reg(gspca_dev, 0x7e);</div><div class='add'>+		if (retval &lt; 0)</div><div class='add'>+			return retval;</div><div class='add'>+		frame_brightness = gspca_dev-&gt;usb_buf[0];</div><div class='add'>+		retval = jl2005c_read_reg(gspca_dev, 0x7d);</div><div class='add'>+		if (retval &lt; 0)</div><div class='add'>+			return retval;</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+	PDEBUG(D_FRAM, "frame_brightness is 0x%02x", gspca_dev-&gt;usb_buf[0]);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jl2005c_write_reg(struct gspca_dev *gspca_dev, unsigned char reg,</div><div class='add'>+						    unsigned char value)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+	u8 instruction[2];</div><div class='add'>+</div><div class='add'>+	instruction[0] = reg;</div><div class='add'>+	instruction[1] = value;</div><div class='add'>+</div><div class='add'>+	retval = jl2005c_write2(gspca_dev, instruction);</div><div class='add'>+	if (retval &lt; 0)</div><div class='add'>+			return retval;</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jl2005c_get_firmware_id(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *sd = (struct sd *)gspca_dev;</div><div class='add'>+	int i = 0;</div><div class='add'>+	int retval = -1;</div><div class='add'>+	unsigned char regs_to_read[] = {0x57, 0x02, 0x03, 0x5d, 0x5e, 0x5f};</div><div class='add'>+</div><div class='add'>+	PDEBUG(D_PROBE, "Running jl2005c_get_firmware_id");</div><div class='add'>+	/* Read the first ID byte once for warmup */</div><div class='add'>+	retval = jl2005c_read_reg(gspca_dev, regs_to_read[0]);</div><div class='add'>+	PDEBUG(D_PROBE, "response is %02x", gspca_dev-&gt;usb_buf[0]);</div><div class='add'>+	if (retval &lt; 0)</div><div class='add'>+		return retval;</div><div class='add'>+	/* Now actually get the ID string */</div><div class='add'>+	for (i = 0; i &lt; 6; i++) {</div><div class='add'>+		retval = jl2005c_read_reg(gspca_dev, regs_to_read[i]);</div><div class='add'>+		if (retval &lt; 0)</div><div class='add'>+			return retval;</div><div class='add'>+		sd-&gt;firmware_id[i] = gspca_dev-&gt;usb_buf[0];</div><div class='add'>+	}</div><div class='add'>+	PDEBUG(D_PROBE, "firmware ID is %02x%02x%02x%02x%02x%02x",</div><div class='add'>+						sd-&gt;firmware_id[0],</div><div class='add'>+						sd-&gt;firmware_id[1],</div><div class='add'>+						sd-&gt;firmware_id[2],</div><div class='add'>+						sd-&gt;firmware_id[3],</div><div class='add'>+						sd-&gt;firmware_id[4],</div><div class='add'>+						sd-&gt;firmware_id[5]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jl2005c_stream_start_vga_lg</div><div class='add'>+		    (struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int retval = -1;</div><div class='add'>+	static u8 instruction[][2] = {</div><div class='add'>+		{0x05, 0x00},</div><div class='add'>+		{0x7c, 0x00},</div><div class='add'>+		{0x7d, 0x18},</div><div class='add'>+		{0x02, 0x00},</div><div class='add'>+		{0x01, 0x00},</div><div class='add'>+		{0x04, 0x52},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(instruction); i++) {</div><div class='add'>+		msleep(60);</div><div class='add'>+		retval = jl2005c_write2(gspca_dev, instruction[i]);</div><div class='add'>+		if (retval &lt; 0)</div><div class='add'>+			return retval;</div><div class='add'>+	}</div><div class='add'>+	msleep(60);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jl2005c_stream_start_vga_small(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int retval = -1;</div><div class='add'>+	static u8 instruction[][2] = {</div><div class='add'>+		{0x06, 0x00},</div><div class='add'>+		{0x7c, 0x00},</div><div class='add'>+		{0x7d, 0x1a},</div><div class='add'>+		{0x02, 0x00},</div><div class='add'>+		{0x01, 0x00},</div><div class='add'>+		{0x04, 0x52},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(instruction); i++) {</div><div class='add'>+		msleep(60);</div><div class='add'>+		retval = jl2005c_write2(gspca_dev, instruction[i]);</div><div class='add'>+		if (retval &lt; 0)</div><div class='add'>+			return retval;</div><div class='add'>+	}</div><div class='add'>+	msleep(60);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jl2005c_stream_start_cif_lg(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int retval = -1;</div><div class='add'>+	static u8 instruction[][2] = {</div><div class='add'>+		{0x05, 0x00},</div><div class='add'>+		{0x7c, 0x00},</div><div class='add'>+		{0x7d, 0x30},</div><div class='add'>+		{0x02, 0x00},</div><div class='add'>+		{0x01, 0x00},</div><div class='add'>+		{0x04, 0x42},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(instruction); i++) {</div><div class='add'>+		msleep(60);</div><div class='add'>+		retval = jl2005c_write2(gspca_dev, instruction[i]);</div><div class='add'>+		if (retval &lt; 0)</div><div class='add'>+			return retval;</div><div class='add'>+	}</div><div class='add'>+	msleep(60);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jl2005c_stream_start_cif_small(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int retval = -1;</div><div class='add'>+	static u8 instruction[][2] = {</div><div class='add'>+		{0x06, 0x00},</div><div class='add'>+		{0x7c, 0x00},</div><div class='add'>+		{0x7d, 0x32},</div><div class='add'>+		{0x02, 0x00},</div><div class='add'>+		{0x01, 0x00},</div><div class='add'>+		{0x04, 0x42},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(instruction); i++) {</div><div class='add'>+		msleep(60);</div><div class='add'>+		retval = jl2005c_write2(gspca_dev, instruction[i]);</div><div class='add'>+		if (retval &lt; 0)</div><div class='add'>+			return retval;</div><div class='add'>+	}</div><div class='add'>+	msleep(60);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int jl2005c_stop(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	retval = jl2005c_write_reg(gspca_dev, 0x07, 0x00);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function is called as a workqueue function and runs whenever the camera</div><div class='add'>+ * is streaming data. Because it is a workqueue function it is allowed to sleep</div><div class='add'>+ * so we can use synchronous USB calls. To avoid possible collisions with other</div><div class='add'>+ * threads attempting to use the camera's USB interface the gspca usb_lock is</div><div class='add'>+ * used when performing the one USB control operation inside the workqueue,</div><div class='add'>+ * which tells the camera to close the stream. In practice the only thing</div><div class='add'>+ * which needs to be protected against is the usb_set_interface call that</div><div class='add'>+ * gspca makes during stream_off. Otherwise the camera doesn't provide any</div><div class='add'>+ * controls that the user could try to change.</div><div class='add'>+ */</div><div class='add'>+static void jl2005c_dostream(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct sd *dev = container_of(work, struct sd, work_struct);</div><div class='add'>+	struct gspca_dev *gspca_dev = &amp;dev-&gt;gspca_dev;</div><div class='add'>+	int bytes_left = 0; /* bytes remaining in current frame. */</div><div class='add'>+	int data_len;   /* size to use for the next read. */</div><div class='add'>+	int header_read = 0;</div><div class='add'>+	unsigned char header_sig[2] = {0x4a, 0x4c};</div><div class='add'>+	int act_len;</div><div class='add'>+	int packet_type;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 *buffer;</div><div class='add'>+</div><div class='add'>+	buffer = kmalloc(JL2005C_MAX_TRANSFER, GFP_KERNEL | GFP_DMA);</div><div class='add'>+	if (!buffer) {</div><div class='add'>+		pr_err("Couldn't allocate USB buffer\n");</div><div class='add'>+		goto quit_stream;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (gspca_dev-&gt;present &amp;&amp; gspca_dev-&gt;streaming) {</div><div class='add'>+		/* Check if this is a new frame. If so, start the frame first */</div><div class='add'>+		if (!header_read) {</div><div class='add'>+			mutex_lock(&amp;gspca_dev-&gt;usb_lock);</div><div class='add'>+			ret = jl2005c_start_new_frame(gspca_dev);</div><div class='add'>+			mutex_unlock(&amp;gspca_dev-&gt;usb_lock);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				goto quit_stream;</div><div class='add'>+			ret = usb_bulk_msg(gspca_dev-&gt;dev,</div><div class='add'>+				usb_rcvbulkpipe(gspca_dev-&gt;dev, 0x82),</div><div class='add'>+				buffer, JL2005C_MAX_TRANSFER, &amp;act_len,</div><div class='add'>+				JL2005C_DATA_TIMEOUT);</div><div class='add'>+			PDEBUG(D_PACK,</div><div class='add'>+				"Got %d bytes out of %d for header",</div><div class='add'>+					act_len, JL2005C_MAX_TRANSFER);</div><div class='add'>+			if (ret &lt; 0 || act_len &lt; JL2005C_MAX_TRANSFER)</div><div class='add'>+				goto quit_stream;</div><div class='add'>+			/* Check whether we actually got the first blodk */</div><div class='add'>+			if (memcmp(header_sig, buffer, 2) != 0) {</div><div class='add'>+				pr_err("First block is not the first block\n");</div><div class='add'>+				goto quit_stream;</div><div class='add'>+			}</div><div class='add'>+			/* total size to fetch is byte 7, times blocksize</div><div class='add'>+			 * of which we already got act_len */</div><div class='add'>+			bytes_left = buffer[0x07] * dev-&gt;block_size - act_len;</div><div class='add'>+			PDEBUG(D_PACK, "bytes_left = 0x%x", bytes_left);</div><div class='add'>+			/* We keep the header. It has other information, too.*/</div><div class='add'>+			packet_type = FIRST_PACKET;</div><div class='add'>+			gspca_frame_add(gspca_dev, packet_type,</div><div class='add'>+					buffer, act_len);</div><div class='add'>+			header_read = 1;</div><div class='add'>+		}</div><div class='add'>+		while (bytes_left &gt; 0 &amp;&amp; gspca_dev-&gt;present) {</div><div class='add'>+			data_len = bytes_left &gt; JL2005C_MAX_TRANSFER ?</div><div class='add'>+				JL2005C_MAX_TRANSFER : bytes_left;</div><div class='add'>+			ret = usb_bulk_msg(gspca_dev-&gt;dev,</div><div class='add'>+				usb_rcvbulkpipe(gspca_dev-&gt;dev, 0x82),</div><div class='add'>+				buffer, data_len, &amp;act_len,</div><div class='add'>+				JL2005C_DATA_TIMEOUT);</div><div class='add'>+			if (ret &lt; 0 || act_len &lt; data_len)</div><div class='add'>+				goto quit_stream;</div><div class='add'>+			PDEBUG(D_PACK,</div><div class='add'>+				"Got %d bytes out of %d for frame",</div><div class='add'>+						data_len, bytes_left);</div><div class='add'>+			bytes_left -= data_len;</div><div class='add'>+			if (bytes_left == 0) {</div><div class='add'>+				packet_type = LAST_PACKET;</div><div class='add'>+				header_read = 0;</div><div class='add'>+			} else</div><div class='add'>+				packet_type = INTER_PACKET;</div><div class='add'>+			gspca_frame_add(gspca_dev, packet_type,</div><div class='add'>+					buffer, data_len);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+quit_stream:</div><div class='add'>+	if (gspca_dev-&gt;present) {</div><div class='add'>+		mutex_lock(&amp;gspca_dev-&gt;usb_lock);</div><div class='add'>+		jl2005c_stop(gspca_dev);</div><div class='add'>+		mutex_unlock(&amp;gspca_dev-&gt;usb_lock);</div><div class='add'>+	}</div><div class='add'>+	kfree(buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* This function is called at probe time */</div><div class='add'>+static int sd_config(struct gspca_dev *gspca_dev,</div><div class='add'>+			const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct cam *cam;</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	cam = &amp;gspca_dev-&gt;cam;</div><div class='add'>+	/* We don't use the buffer gspca allocates so make it small. */</div><div class='add'>+	cam-&gt;bulk_size = 64;</div><div class='add'>+	cam-&gt;bulk = 1;</div><div class='add'>+	/* For the rest, the camera needs to be detected */</div><div class='add'>+	jl2005c_get_firmware_id(gspca_dev);</div><div class='add'>+	/* Here are some known firmware IDs</div><div class='add'>+	 * First some JL2005B cameras</div><div class='add'>+	 * {0x41, 0x07, 0x04, 0x2c, 0xe8, 0xf2}	Sakar KidzCam</div><div class='add'>+	 * {0x45, 0x02, 0x08, 0xb9, 0x00, 0xd2}	No-name JL2005B</div><div class='add'>+	 * JL2005C cameras</div><div class='add'>+	 * {0x01, 0x0c, 0x16, 0x10, 0xf8, 0xc8}	Argus DC-1512</div><div class='add'>+	 * {0x12, 0x04, 0x03, 0xc0, 0x00, 0xd8}	ICarly</div><div class='add'>+	 * {0x86, 0x08, 0x05, 0x02, 0x00, 0xd4}	Jazz</div><div class='add'>+	 *</div><div class='add'>+	 * Based upon this scanty evidence, we can detect a CIF camera by</div><div class='add'>+	 * testing byte 0 for 0x4x.</div><div class='add'>+	 */</div><div class='add'>+	if ((sd-&gt;firmware_id[0] &amp; 0xf0) == 0x40) {</div><div class='add'>+		cam-&gt;cam_mode	= cif_mode;</div><div class='add'>+		cam-&gt;nmodes	= ARRAY_SIZE(cif_mode);</div><div class='add'>+		sd-&gt;block_size	= 0x80;</div><div class='add'>+	} else {</div><div class='add'>+		cam-&gt;cam_mode	= vga_mode;</div><div class='add'>+		cam-&gt;nmodes	= ARRAY_SIZE(vga_mode);</div><div class='add'>+		sd-&gt;block_size	= 0x200;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;sd-&gt;work_struct, jl2005c_dostream);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* this function is called at probe and resume time */</div><div class='add'>+static int sd_init(struct gspca_dev *gspca_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 sd_start(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='add'>+	sd-&gt;cap_mode = gspca_dev-&gt;cam.cam_mode;</div><div class='add'>+</div><div class='add'>+	switch (gspca_dev-&gt;width) {</div><div class='add'>+	case 640:</div><div class='add'>+		PDEBUG(D_STREAM, "Start streaming at vga resolution");</div><div class='add'>+		jl2005c_stream_start_vga_lg(gspca_dev);</div><div class='add'>+		break;</div><div class='add'>+	case 320:</div><div class='add'>+		PDEBUG(D_STREAM, "Start streaming at qvga resolution");</div><div class='add'>+		jl2005c_stream_start_vga_small(gspca_dev);</div><div class='add'>+		break;</div><div class='add'>+	case 352:</div><div class='add'>+		PDEBUG(D_STREAM, "Start streaming at cif resolution");</div><div class='add'>+		jl2005c_stream_start_cif_lg(gspca_dev);</div><div class='add'>+		break;</div><div class='add'>+	case 176:</div><div class='add'>+		PDEBUG(D_STREAM, "Start streaming at qcif resolution");</div><div class='add'>+		jl2005c_stream_start_cif_small(gspca_dev);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_err("Unknown resolution specified\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Start the workqueue function to do the streaming */</div><div class='add'>+	sd-&gt;work_thread = create_singlethread_workqueue(MODULE_NAME);</div><div class='add'>+	queue_work(sd-&gt;work_thread, &amp;sd-&gt;work_struct);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* called on streamoff with alt==0 and on disconnect */</div><div class='add'>+/* the usb_lock is held at entry - restore on exit */</div><div class='add'>+static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct sd *dev = (struct sd *) gspca_dev;</div><div class='add'>+</div><div class='add'>+	/* wait for the work queue to terminate */</div><div class='add'>+	mutex_unlock(&amp;gspca_dev-&gt;usb_lock);</div><div class='add'>+	/* This waits for sq905c_dostream to finish */</div><div class='add'>+	destroy_workqueue(dev-&gt;work_thread);</div><div class='add'>+	dev-&gt;work_thread = NULL;</div><div class='add'>+	mutex_lock(&amp;gspca_dev-&gt;usb_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* sub-driver description */</div><div class='add'>+static const struct sd_desc sd_desc = {</div><div class='add'>+	.name = MODULE_NAME,</div><div class='add'>+	/* .ctrls = none have been detected */</div><div class='add'>+	/* .nctrls = ARRAY_SIZE(sd_ctrls),  */</div><div class='add'>+	.config = sd_config,</div><div class='add'>+	.init = sd_init,</div><div class='add'>+	.start = sd_start,</div><div class='add'>+	.stop0 = sd_stop0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* -- module initialisation -- */</div><div class='add'>+static const __devinitdata struct usb_device_id device_table[] = {</div><div class='add'>+	{USB_DEVICE(0x0979, 0x0227)},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(usb, device_table);</div><div class='add'>+</div><div class='add'>+/* -- device connect -- */</div><div class='add'>+static int sd_probe(struct usb_interface *intf,</div><div class='add'>+				const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	return gspca_dev_probe(intf, id, &amp;sd_desc, sizeof(struct sd),</div><div class='add'>+				THIS_MODULE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_driver sd_driver = {</div><div class='add'>+	.name = MODULE_NAME,</div><div class='add'>+	.id_table = device_table,</div><div class='add'>+	.probe = sd_probe,</div><div class='add'>+	.disconnect = gspca_disconnect,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = gspca_suspend,</div><div class='add'>+	.resume = gspca_resume,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* -- module insert / remove -- */</div><div class='add'>+static int __init sd_mod_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = usb_register(&amp;sd_driver);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static void __exit sd_mod_exit(void)</div><div class='add'>+{</div><div class='add'>+	usb_deregister(&amp;sd_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(sd_mod_init);</div><div class='add'>+module_exit(sd_mod_exit);</div><div class='head'>diff --git a/drivers/media/video/gspca/kinect.c b/drivers/media/video/gspca/kinect.c<br/>index 4fe51fda80f3..e8e8f2fe9166 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/kinect.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/kinect.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/kinect.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/kinect.c</a></div><div class='hunk'>@@ -413,16 +413,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/konica.c b/drivers/media/video/gspca/konica.c<br/>index f3f7fe0ec4b7..f0c0d74dfe92 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/konica.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/konica.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/konica.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/konica.c</a></div><div class='hunk'>@@ -247,9 +247,6 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	gspca_dev-&gt;cam.cam_mode = vga_mode;</div><div class='ctx'> 	gspca_dev-&gt;cam.nmodes = ARRAY_SIZE(vga_mode);</div><div class='ctx'> 	gspca_dev-&gt;cam.no_urb_create = 1;</div><div class='del'>-	/* The highest alt setting has an isoc packetsize of 0, so we</div><div class='del'>-	   don't want to use it */</div><div class='del'>-	gspca_dev-&gt;nbalt--;</div><div class='ctx'> </div><div class='ctx'> 	sd-&gt;brightness  = BRIGHTNESS_DEFAULT;</div><div class='ctx'> 	sd-&gt;contrast    = CONTRAST_DEFAULT;</div><div class='hunk'>@@ -634,15 +631,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c<br/>index 67533e5582a6..0c4493675438 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/m5602/m5602_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/m5602/m5602_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/m5602/m5602_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/m5602/m5602_core.c</a></div><div class='hunk'>@@ -27,8 +27,8 @@</div><div class='ctx'> </div><div class='ctx'> /* Kernel module parameters */</div><div class='ctx'> int force_sensor;</div><div class='del'>-static int dump_bridge;</div><div class='del'>-int dump_sensor;</div><div class='add'>+static bool dump_bridge;</div><div class='add'>+bool dump_sensor;</div><div class='ctx'> </div><div class='ctx'> static const struct usb_device_id m5602_table[] = {</div><div class='ctx'> 	{USB_DEVICE(0x0402, 0x5602)},</div><div class='hunk'>@@ -404,19 +404,7 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.disconnect = m5602_disconnect</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init mod_m5602_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit mod_m5602_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(mod_m5602_init);</div><div class='del'>-module_exit(mod_m5602_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.h b/drivers/media/video/gspca/m5602/m5602_mt9m111.h<br/>index b1f0c492036a..8c672b5c8c6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/m5602/m5602_mt9m111.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/m5602/m5602_mt9m111.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/m5602/m5602_mt9m111.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/m5602/m5602_mt9m111.h</a></div><div class='hunk'>@@ -106,7 +106,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Kernel module parameters */</div><div class='ctx'> extern int force_sensor;</div><div class='del'>-extern int dump_sensor;</div><div class='add'>+extern bool dump_sensor;</div><div class='ctx'> </div><div class='ctx'> int mt9m111_probe(struct sd *sd);</div><div class='ctx'> int mt9m111_init(struct sd *sd);</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_ov7660.h b/drivers/media/video/gspca/m5602/m5602_ov7660.h<br/>index 2efd607987ec..2b6a13b508f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/m5602/m5602_ov7660.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/m5602/m5602_ov7660.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/m5602/m5602_ov7660.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/m5602/m5602_ov7660.h</a></div><div class='hunk'>@@ -86,7 +86,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Kernel module parameters */</div><div class='ctx'> extern int force_sensor;</div><div class='del'>-extern int dump_sensor;</div><div class='add'>+extern bool dump_sensor;</div><div class='ctx'> </div><div class='ctx'> int ov7660_probe(struct sd *sd);</div><div class='ctx'> int ov7660_init(struct sd *sd);</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.h b/drivers/media/video/gspca/m5602/m5602_ov9650.h<br/>index da9a129b739d..f7aa5bf68983 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/m5602/m5602_ov9650.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/m5602/m5602_ov9650.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/m5602/m5602_ov9650.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/m5602/m5602_ov9650.h</a></div><div class='hunk'>@@ -135,7 +135,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Kernel module parameters */</div><div class='ctx'> extern int force_sensor;</div><div class='del'>-extern int dump_sensor;</div><div class='add'>+extern bool dump_sensor;</div><div class='ctx'> </div><div class='ctx'> int ov9650_probe(struct sd *sd);</div><div class='ctx'> int ov9650_init(struct sd *sd);</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_po1030.h b/drivers/media/video/gspca/m5602/m5602_po1030.h<br/>index 338359596398..81a2bcb88fe3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/m5602/m5602_po1030.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/m5602/m5602_po1030.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/m5602/m5602_po1030.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/m5602/m5602_po1030.h</a></div><div class='hunk'>@@ -147,7 +147,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Kernel module parameters */</div><div class='ctx'> extern int force_sensor;</div><div class='del'>-extern int dump_sensor;</div><div class='add'>+extern bool dump_sensor;</div><div class='ctx'> </div><div class='ctx'> int po1030_probe(struct sd *sd);</div><div class='ctx'> int po1030_init(struct sd *sd);</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h<br/>index 8cc7a3f6da72..8e0035e731c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/m5602/m5602_s5k4aa.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/m5602/m5602_s5k4aa.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/m5602/m5602_s5k4aa.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/m5602/m5602_s5k4aa.h</a></div><div class='hunk'>@@ -65,7 +65,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Kernel module parameters */</div><div class='ctx'> extern int force_sensor;</div><div class='del'>-extern int dump_sensor;</div><div class='add'>+extern bool dump_sensor;</div><div class='ctx'> </div><div class='ctx'> int s5k4aa_probe(struct sd *sd);</div><div class='ctx'> int s5k4aa_init(struct sd *sd);</div><div class='head'>diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.h b/drivers/media/video/gspca/m5602/m5602_s5k83a.h<br/>index 80a63a236e24..79952247b534 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/m5602/m5602_s5k83a.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/m5602/m5602_s5k83a.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/m5602/m5602_s5k83a.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/m5602/m5602_s5k83a.h</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Kernel module parameters */</div><div class='ctx'> extern int force_sensor;</div><div class='del'>-extern int dump_sensor;</div><div class='add'>+extern bool dump_sensor;</div><div class='ctx'> </div><div class='ctx'> int s5k83a_probe(struct sd *sd);</div><div class='ctx'> int s5k83a_init(struct sd *sd);</div><div class='head'>diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c<br/>index ef45fa575752..b0231465afae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/mars.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/mars.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/mars.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/mars.c</a></div><div class='hunk'>@@ -263,7 +263,6 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	cam-&gt;nmodes = ARRAY_SIZE(vga_mode);</div><div class='ctx'> 	cam-&gt;ctrls = sd-&gt;ctrls;</div><div class='ctx'> 	sd-&gt;quality = QUALITY_DEF;</div><div class='del'>-	gspca_dev-&gt;nbalt = 9;		/* use the altsetting 08 */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -517,15 +516,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/mr97310a.c b/drivers/media/video/gspca/mr97310a.c<br/>index 473e813b680e..d73e5bd3dbf7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/mr97310a.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/mr97310a.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/mr97310a.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/mr97310a.c</a></div><div class='hunk'>@@ -1259,15 +1259,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/nw80x.c b/drivers/media/video/gspca/nw80x.c<br/>index 7681814e594f..7167cac7359c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/nw80x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/nw80x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/nw80x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/nw80x.c</a></div><div class='hunk'>@@ -1763,8 +1763,8 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	if ((unsigned) webcam &gt;= NWEBCAMS)</div><div class='ctx'> 		webcam = 0;</div><div class='ctx'> 	sd-&gt;webcam = webcam;</div><div class='del'>-	gspca_dev-&gt;cam.reverse_alts = 1;</div><div class='ctx'> 	gspca_dev-&gt;cam.ctrls = sd-&gt;ctrls;</div><div class='add'>+	gspca_dev-&gt;cam.needs_full_bandwidth = 1;</div><div class='ctx'> 	sd-&gt;ag_cnt = -1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2118,18 +2118,7 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='ctx'> </div><div class='ctx'> module_param(webcam, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(webcam,</div><div class='head'>diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c<br/>index 6a01b35a9478..739e8a2a2d30 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/ov519.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/ov519.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/ov519.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/ov519.c</a></div><div class='hunk'>@@ -3348,7 +3348,6 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	case BRIDGE_W9968CF:</div><div class='ctx'> 		cam-&gt;cam_mode = w9968cf_vga_mode;</div><div class='ctx'> 		cam-&gt;nmodes = ARRAY_SIZE(w9968cf_vga_mode);</div><div class='del'>-		cam-&gt;reverse_alts = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3684,8 +3683,8 @@ static void ov511_mode_init_regs(struct sd *sd)</div><div class='ctx'> 	/* Check if we have enough bandwidth to disable compression */</div><div class='ctx'> 	fps = (interlaced ? 60 : 30) / (sd-&gt;clockdiv + 1) + 1;</div><div class='ctx'> 	needed = fps * sd-&gt;gspca_dev.width * sd-&gt;gspca_dev.height * 3 / 2;</div><div class='del'>-	/* 1400 is a conservative estimate of the max nr of isoc packets/sec */</div><div class='del'>-	if (needed &gt; 1400 * packet_size) {</div><div class='add'>+	/* 1000 isoc packets/sec */</div><div class='add'>+	if (needed &gt; 1000 * packet_size) {</div><div class='ctx'> 		/* Enable Y and UV quantization and compression */</div><div class='ctx'> 		reg_w(sd, R511_COMP_EN, 0x07);</div><div class='ctx'> 		reg_w(sd, R511_COMP_LUT_EN, 0x03);</div><div class='hunk'>@@ -5056,18 +5055,7 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='ctx'> </div><div class='ctx'> module_param(frame_rate, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(frame_rate, "Frame rate (5, 10, 15, 20 or 30 fps)");</div><div class='head'>diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c<br/>index 76907eced4a1..04753391de3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/ov534.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/ov534.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/ov534.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/ov534.c</a></div><div class='hunk'>@@ -1533,16 +1533,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/ov534_9.c b/drivers/media/video/gspca/ov534_9.c<br/>index b3b1ea60a841..fbfa02affa13 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/ov534_9.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/ov534_9.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/ov534_9.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/ov534_9.c</a></div><div class='hunk'>@@ -71,6 +71,7 @@ struct sd {</div><div class='ctx'> enum sensors {</div><div class='ctx'> 	SENSOR_OV965x,		/* ov9657 */</div><div class='ctx'> 	SENSOR_OV971x,		/* ov9712 */</div><div class='add'>+	SENSOR_OV562x,		/* ov5621 */</div><div class='ctx'> 	NSENSORS</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -207,6 +208,14 @@ static const struct v4l2_pix_format ov971x_mode[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct v4l2_pix_format ov562x_mode[] = {</div><div class='add'>+	{2592, 1680, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,</div><div class='add'>+		.bytesperline = 2592,</div><div class='add'>+		.sizeimage = 2592 * 1680,</div><div class='add'>+		.colorspace = V4L2_COLORSPACE_SRGB</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const u8 bridge_init[][2] = {</div><div class='ctx'> 	{0x88, 0xf8},</div><div class='ctx'> 	{0x89, 0xff},</div><div class='hunk'>@@ -830,6 +839,124 @@ static const u8 ov965x_start_2_sxga[][2] = {</div><div class='ctx'> 	{0xa3, 0x41},	/* bd60 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const u8 ov562x_init[][2] = {</div><div class='add'>+	{0x88, 0x20},</div><div class='add'>+	{0x89, 0x0a},</div><div class='add'>+	{0x8a, 0x90},</div><div class='add'>+	{0x8b, 0x06},</div><div class='add'>+	{0x8c, 0x01},</div><div class='add'>+	{0x8d, 0x10},</div><div class='add'>+	{0x1c, 0x00},</div><div class='add'>+	{0x1d, 0x48},</div><div class='add'>+	{0x1d, 0x00},</div><div class='add'>+	{0x1d, 0xff},</div><div class='add'>+	{0x1c, 0x0a},</div><div class='add'>+	{0x1d, 0x2e},</div><div class='add'>+	{0x1d, 0x1e},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ov562x_init_2[][2] = {</div><div class='add'>+	{0x12, 0x80},</div><div class='add'>+	{0x11, 0x41},</div><div class='add'>+	{0x13, 0x00},</div><div class='add'>+	{0x10, 0x1e},</div><div class='add'>+	{0x3b, 0x07},</div><div class='add'>+	{0x5b, 0x40},</div><div class='add'>+	{0x39, 0x07},</div><div class='add'>+	{0x53, 0x02},</div><div class='add'>+	{0x54, 0x60},</div><div class='add'>+	{0x04, 0x20},</div><div class='add'>+	{0x27, 0x04},</div><div class='add'>+	{0x3d, 0x40},</div><div class='add'>+	{0x36, 0x00},</div><div class='add'>+	{0xc5, 0x04},</div><div class='add'>+	{0x4e, 0x00},</div><div class='add'>+	{0x4f, 0x93},</div><div class='add'>+	{0x50, 0x7b},</div><div class='add'>+	{0xca, 0x0c},</div><div class='add'>+	{0xcb, 0x0f},</div><div class='add'>+	{0x39, 0x07},</div><div class='add'>+	{0x4a, 0x10},</div><div class='add'>+	{0x3e, 0x0a},</div><div class='add'>+	{0x3d, 0x00},</div><div class='add'>+	{0x0c, 0x38},</div><div class='add'>+	{0x38, 0x90},</div><div class='add'>+	{0x46, 0x30},</div><div class='add'>+	{0x4f, 0x93},</div><div class='add'>+	{0x50, 0x7b},</div><div class='add'>+	{0xab, 0x00},</div><div class='add'>+	{0xca, 0x0c},</div><div class='add'>+	{0xcb, 0x0f},</div><div class='add'>+	{0x37, 0x02},</div><div class='add'>+	{0x44, 0x48},</div><div class='add'>+	{0x8d, 0x44},</div><div class='add'>+	{0x2a, 0x00},</div><div class='add'>+	{0x2b, 0x00},</div><div class='add'>+	{0x32, 0x00},</div><div class='add'>+	{0x38, 0x90},</div><div class='add'>+	{0x53, 0x02},</div><div class='add'>+	{0x54, 0x60},</div><div class='add'>+	{0x12, 0x00},</div><div class='add'>+	{0x17, 0x12},</div><div class='add'>+	{0x18, 0xb4},</div><div class='add'>+	{0x19, 0x0c},</div><div class='add'>+	{0x1a, 0xf4},</div><div class='add'>+	{0x03, 0x4a},</div><div class='add'>+	{0x89, 0x20},</div><div class='add'>+	{0x83, 0x80},</div><div class='add'>+	{0xb7, 0x9d},</div><div class='add'>+	{0xb6, 0x11},</div><div class='add'>+	{0xb5, 0x55},</div><div class='add'>+	{0xb4, 0x00},</div><div class='add'>+	{0xa9, 0xf0},</div><div class='add'>+	{0xa8, 0x0a},</div><div class='add'>+	{0xb8, 0xf0},</div><div class='add'>+	{0xb9, 0xf0},</div><div class='add'>+	{0xba, 0xf0},</div><div class='add'>+	{0x81, 0x07},</div><div class='add'>+	{0x63, 0x44},</div><div class='add'>+	{0x13, 0xc7},</div><div class='add'>+	{0x14, 0x60},</div><div class='add'>+	{0x33, 0x75},</div><div class='add'>+	{0x2c, 0x00},</div><div class='add'>+	{0x09, 0x00},</div><div class='add'>+	{0x35, 0x30},</div><div class='add'>+	{0x27, 0x04},</div><div class='add'>+	{0x3c, 0x07},</div><div class='add'>+	{0x3a, 0x0a},</div><div class='add'>+	{0x3b, 0x07},</div><div class='add'>+	{0x01, 0x40},</div><div class='add'>+	{0x02, 0x40},</div><div class='add'>+	{0x16, 0x40},</div><div class='add'>+	{0x52, 0xb0},</div><div class='add'>+	{0x51, 0x83},</div><div class='add'>+	{0x21, 0xbb},</div><div class='add'>+	{0x22, 0x10},</div><div class='add'>+	{0x23, 0x03},</div><div class='add'>+	{0x35, 0x38},</div><div class='add'>+	{0x20, 0x90},</div><div class='add'>+	{0x28, 0x30},</div><div class='add'>+	{0x73, 0xe1},</div><div class='add'>+	{0x6c, 0x00},</div><div class='add'>+	{0x6d, 0x80},</div><div class='add'>+	{0x6e, 0x00},</div><div class='add'>+	{0x70, 0x04},</div><div class='add'>+	{0x71, 0x00},</div><div class='add'>+	{0x8d, 0x04},</div><div class='add'>+	{0x64, 0x00},</div><div class='add'>+	{0x65, 0x00},</div><div class='add'>+	{0x66, 0x00},</div><div class='add'>+	{0x67, 0x00},</div><div class='add'>+	{0x68, 0x00},</div><div class='add'>+	{0x69, 0x00},</div><div class='add'>+	{0x6a, 0x00},</div><div class='add'>+	{0x6b, 0x00},</div><div class='add'>+	{0x71, 0x94},</div><div class='add'>+	{0x74, 0x20},</div><div class='add'>+	{0x80, 0x09},</div><div class='add'>+	{0x85, 0xc0},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void reg_w_i(struct gspca_dev *gspca_dev, u16 reg, u8 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *udev = gspca_dev-&gt;dev;</div><div class='hunk'>@@ -1210,6 +1337,17 @@ static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> 			reg_w(gspca_dev, 0x56, 0x1f);</div><div class='ctx'> 		else</div><div class='ctx'> 			reg_w(gspca_dev, 0x56, 0x17);</div><div class='add'>+	} else if ((sensor_id &amp; 0xfff0) == 0x5620) {</div><div class='add'>+		sd-&gt;sensor = SENSOR_OV562x;</div><div class='add'>+</div><div class='add'>+		gspca_dev-&gt;cam.cam_mode = ov562x_mode;</div><div class='add'>+		gspca_dev-&gt;cam.nmodes = ARRAY_SIZE(ov562x_mode);</div><div class='add'>+</div><div class='add'>+		reg_w_array(gspca_dev, ov562x_init,</div><div class='add'>+				ARRAY_SIZE(ov562x_init));</div><div class='add'>+		sccb_w_array(gspca_dev, ov562x_init_2,</div><div class='add'>+				ARRAY_SIZE(ov562x_init_2));</div><div class='add'>+		reg_w(gspca_dev, 0xe0, 0x00);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err("Unknown sensor %04x", sensor_id);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1222,7 +1360,7 @@ static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='del'>-	if (sd-&gt;sensor == SENSOR_OV971x)</div><div class='add'>+	if (sd-&gt;sensor == SENSOR_OV971x || sd-&gt;sensor == SENSOR_OV562x)</div><div class='ctx'> 		return gspca_dev-&gt;usb_err;</div><div class='ctx'> 	switch (gspca_dev-&gt;curr_mode) {</div><div class='ctx'> 	case QVGA_MODE:			/* 320x240 */</div><div class='hunk'>@@ -1409,6 +1547,7 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> static const struct usb_device_id device_table[] = {</div><div class='ctx'> 	{USB_DEVICE(0x05a9, 0x8065)},</div><div class='ctx'> 	{USB_DEVICE(0x06f8, 0x3003)},</div><div class='add'>+	{USB_DEVICE(0x05a9, 0x1550)},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1432,16 +1571,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/pac207.c b/drivers/media/video/gspca/pac207.c<br/>index 1600df152fd6..3844c49f269c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/pac207.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/pac207.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/pac207.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/pac207.c</a></div><div class='hunk'>@@ -41,14 +41,14 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> #define PAC207_BRIGHTNESS_DEFAULT	46</div><div class='ctx'> </div><div class='ctx'> #define PAC207_EXPOSURE_MIN		3</div><div class='del'>-#define PAC207_EXPOSURE_MAX		26</div><div class='add'>+#define PAC207_EXPOSURE_MAX		90 /* 1 sec expo time / 1 fps */</div><div class='ctx'> #define PAC207_EXPOSURE_DEFAULT		5 /* power on default: 3 */</div><div class='del'>-#define PAC207_EXPOSURE_KNEE		8 /* 4 = 30 fps, 11 = 8, 15 = 6 */</div><div class='add'>+#define PAC207_EXPOSURE_KNEE		9 /* fps: 90 / exposure -&gt; 9: 10 fps */</div><div class='ctx'> </div><div class='ctx'> #define PAC207_GAIN_MIN			0</div><div class='ctx'> #define PAC207_GAIN_MAX			31</div><div class='del'>-#define PAC207_GAIN_DEFAULT		9 /* power on default: 9 */</div><div class='del'>-#define PAC207_GAIN_KNEE		31</div><div class='add'>+#define PAC207_GAIN_DEFAULT		7 /* power on default: 9 */</div><div class='add'>+#define PAC207_GAIN_KNEE		15</div><div class='ctx'> </div><div class='ctx'> #define PAC207_AUTOGAIN_DEADZONE	30</div><div class='ctx'> </div><div class='hunk'>@@ -332,7 +332,7 @@ static void pac207_do_auto_gain(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	if (sd-&gt;autogain_ignore_frames &gt; 0)</div><div class='ctx'> 		sd-&gt;autogain_ignore_frames--;</div><div class='ctx'> 	else if (gspca_auto_gain_n_exposure(gspca_dev, avg_lum,</div><div class='del'>-			100, PAC207_AUTOGAIN_DEADZONE,</div><div class='add'>+			90, PAC207_AUTOGAIN_DEADZONE,</div><div class='ctx'> 			PAC207_GAIN_KNEE, PAC207_EXPOSURE_KNEE))</div><div class='ctx'> 		sd-&gt;autogain_ignore_frames = PAC_AUTOGAIN_IGNORE_FRAMES;</div><div class='ctx'> }</div><div class='hunk'>@@ -569,15 +569,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/pac7302.c b/drivers/media/video/gspca/pac7302.c<br/>index 1c44f78ff9e2..9db2b34d172c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/pac7302.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/pac7302.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/pac7302.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/pac7302.c</a></div><div class='hunk'>@@ -1197,6 +1197,7 @@ static const struct usb_device_id device_table[] = {</div><div class='ctx'> 	{USB_DEVICE(0x093a, 0x2629), .driver_info = FL_VFLIP},</div><div class='ctx'> 	{USB_DEVICE(0x093a, 0x262a)},</div><div class='ctx'> 	{USB_DEVICE(0x093a, 0x262c)},</div><div class='add'>+	{USB_DEVICE(0x145f, 0x013c)},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, device_table);</div><div class='hunk'>@@ -1220,15 +1221,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c<br/>index 7509d05dc065..1ac111176ffa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/pac7311.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/pac7311.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/pac7311.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/pac7311.c</a></div><div class='hunk'>@@ -868,15 +868,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/se401.c b/drivers/media/video/gspca/se401.c<br/>index 3b71bbcd977a..bb70092c2229 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/se401.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/se401.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/se401.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/se401.c</a></div><div class='hunk'>@@ -376,7 +376,6 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	cam-&gt;bulk_size = BULK_SIZE;</div><div class='ctx'> 	cam-&gt;bulk_nurbs = 4;</div><div class='ctx'> 	cam-&gt;ctrls = sd-&gt;ctrls;</div><div class='del'>-	gspca_dev-&gt;nbalt = 1;  /* Ignore the bogus isoc alt settings */</div><div class='ctx'> 	sd-&gt;resetlevel = 0x2d; /* Set initial resetlevel */</div><div class='ctx'> </div><div class='ctx'> 	/* See if the camera supports brightness */</div><div class='hunk'>@@ -395,6 +394,14 @@ static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* function called at start time before URB creation */</div><div class='add'>+static int sd_isoc_init(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	gspca_dev-&gt;alt = 1;	/* Ignore the bogus isoc alt settings */</div><div class='add'>+</div><div class='add'>+	return gspca_dev-&gt;usb_err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* -- start the camera -- */</div><div class='ctx'> static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -714,6 +721,7 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='ctx'> 	.init = sd_init,</div><div class='add'>+	.isoc_init = sd_isoc_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='ctx'> 	.dq_callback = sd_dq_callback,</div><div class='hunk'>@@ -766,15 +774,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> 	.post_reset = sd_post_reset,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/sn9c2028.c b/drivers/media/video/gspca/sn9c2028.c<br/>index 48aae3926a33..478533cb1152 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sn9c2028.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/sn9c2028.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sn9c2028.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/sn9c2028.c</a></div><div class='hunk'>@@ -737,16 +737,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/sn9c20x.c b/drivers/media/video/gspca/sn9c20x.c<br/>index 86e07a139a16..9e198b45c3c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sn9c20x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/sn9c20x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sn9c20x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/sn9c20x.c</a></div><div class='hunk'>@@ -2048,6 +2048,7 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	struct cam *cam;</div><div class='ctx'> </div><div class='ctx'> 	cam = &amp;gspca_dev-&gt;cam;</div><div class='add'>+	cam-&gt;needs_full_bandwidth = 1;</div><div class='ctx'> </div><div class='ctx'> 	sd-&gt;sensor = (id-&gt;driver_info &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	sd-&gt;i2c_addr = id-&gt;driver_info &amp; 0xff;</div><div class='hunk'>@@ -2233,6 +2234,42 @@ static void configure_sensor_output(struct gspca_dev *gspca_dev, int mode)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int sd_isoc_init(struct gspca_dev *gspca_dev)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf;</div><div class='add'>+	u32 flags = gspca_dev-&gt;cam.cam_mode[(int)gspca_dev-&gt;curr_mode].priv;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When using the SN9C20X_I420 fmt the sn9c20x needs more bandwidth</div><div class='add'>+	 * than our regular bandwidth calculations reserve, so we force the</div><div class='add'>+	 * use of a specific altsetting when using the SN9C20X_I420 fmt.</div><div class='add'>+	 */</div><div class='add'>+	if (!(flags &amp; (MODE_RAW | MODE_JPEG))) {</div><div class='add'>+		intf = usb_ifnum_to_if(gspca_dev-&gt;dev, gspca_dev-&gt;iface);</div><div class='add'>+</div><div class='add'>+		if (intf-&gt;num_altsetting != 9) {</div><div class='add'>+			pr_warn("sn9c20x camera with unknown number of alt "</div><div class='add'>+			        "settings (%d), please report!\n",</div><div class='add'>+			        intf-&gt;num_altsetting);</div><div class='add'>+			gspca_dev-&gt;alt = intf-&gt;num_altsetting;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (gspca_dev-&gt;width) {</div><div class='add'>+		case 160: /* 160x120 */</div><div class='add'>+			gspca_dev-&gt;alt = 2;</div><div class='add'>+			break;</div><div class='add'>+		case 320: /* 320x240 */</div><div class='add'>+			gspca_dev-&gt;alt = 6;</div><div class='add'>+			break;</div><div class='add'>+		default:  /* &gt;= 640x480 */</div><div class='add'>+			gspca_dev-&gt;alt = 9;</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'> #define HW_WIN(mode, hstart, vstart) \</div><div class='ctx'> ((const u8 []){hstart, 0, vstart, 0, \</div><div class='ctx'> (mode &amp; MODE_SXGA ? 1280 &gt;&gt; 4 : 640 &gt;&gt; 4), \</div><div class='hunk'>@@ -2473,6 +2510,7 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.nctrls = ARRAY_SIZE(sd_ctrls),</div><div class='ctx'> 	.config = sd_config,</div><div class='ctx'> 	.init = sd_init,</div><div class='add'>+	.isoc_init = sd_isoc_init,</div><div class='ctx'> 	.start = sd_start,</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='hunk'>@@ -2554,15 +2592,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c<br/>index 146b459b08d5..6a1148d7fe92 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sonixb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/sonixb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sonixb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/sonixb.c</a></div><div class='hunk'>@@ -1079,20 +1079,23 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	cam-&gt;npkt = 36;			/* 36 packets per ISOC message */</div><div class='ctx'> </div><div class='del'>-	if (sensor_data[sd-&gt;sensor].flags &amp; F_COARSE_EXPO) {</div><div class='del'>-		sd-&gt;ctrls[EXPOSURE].min = COARSE_EXPOSURE_MIN;</div><div class='del'>-		sd-&gt;ctrls[EXPOSURE].max = COARSE_EXPOSURE_MAX;</div><div class='del'>-		sd-&gt;ctrls[EXPOSURE].def = COARSE_EXPOSURE_DEF;</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='ctx'> /* this function is called at probe and resume time */</div><div class='ctx'> static int sd_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	const __u8 stop = 0x09; /* Disable stream turn of LED */</div><div class='ctx'> </div><div class='add'>+	if (sensor_data[sd-&gt;sensor].flags &amp; F_COARSE_EXPO) {</div><div class='add'>+		sd-&gt;ctrls[EXPOSURE].min = COARSE_EXPOSURE_MIN;</div><div class='add'>+		sd-&gt;ctrls[EXPOSURE].max = COARSE_EXPOSURE_MAX;</div><div class='add'>+		sd-&gt;ctrls[EXPOSURE].def = COARSE_EXPOSURE_DEF;</div><div class='add'>+		if (sd-&gt;ctrls[EXPOSURE].val &gt; COARSE_EXPOSURE_MAX)</div><div class='add'>+			sd-&gt;ctrls[EXPOSURE].val = COARSE_EXPOSURE_DEF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	reg_w(gspca_dev, 0x01, &amp;stop, 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1527,15 +1530,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c<br/>index c746bf19ca14..0c9e6ddabd2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sonixj.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/sonixj.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sonixj.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/sonixj.c</a></div><div class='hunk'>@@ -1235,7 +1235,7 @@ static const u8 po2030n_sensor_param1[][8] = {</div><div class='ctx'> 	{DELAY, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* delay 8ms */</div><div class='ctx'> 	{0xa1, 0x6e, 0x1b, 0xf4, 0x00, 0x00, 0x00, 0x10},</div><div class='ctx'> 	{0xa1, 0x6e, 0x15, 0x04, 0x00, 0x00, 0x00, 0x10},</div><div class='del'>-	{0xd1, 0x6e, 0x16, 0x50, 0x40, 0x49, 0x40, 0x10},</div><div class='add'>+	{0xd1, 0x6e, 0x16, 0x40, 0x40, 0x40, 0x40, 0x10}, /* RGBG gains */</div><div class='ctx'> /*param2*/</div><div class='ctx'> 	{0xa1, 0x6e, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x10},</div><div class='ctx'> 	{0xa1, 0x6e, 0x04, 0x03, 0x00, 0x00, 0x00, 0x10},</div><div class='hunk'>@@ -1779,10 +1779,6 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	sd-&gt;ag_cnt = -1;</div><div class='ctx'> 	sd-&gt;quality = QUALITY_DEF;</div><div class='ctx'> </div><div class='del'>-	/* if USB 1.1, let some bandwidth for the audio device */</div><div class='del'>-	if (gspca_dev-&gt;audio &amp;&amp; gspca_dev-&gt;dev-&gt;speed &lt; USB_SPEED_HIGH)</div><div class='del'>-		gspca_dev-&gt;nbalt--;</div><div class='del'>-</div><div class='ctx'> 	INIT_WORK(&amp;sd-&gt;work, qual_upd);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2063,6 +2059,16 @@ static void setredblue(struct gspca_dev *gspca_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='add'>+	if (sd-&gt;sensor == SENSOR_PO2030N) {</div><div class='add'>+		u8 rg1b[] =		/* red  green1 blue (no g2) */</div><div class='add'>+			{0xc1, 0x6e, 0x16, 0x00, 0x40, 0x00, 0x00, 0x10};</div><div class='add'>+</div><div class='add'>+		/* 0x40 = normal value = gain x 1 */</div><div class='add'>+		rg1b[3] = sd-&gt;ctrls[RED].val * 2;</div><div class='add'>+		rg1b[5] = sd-&gt;ctrls[BLUE].val * 2;</div><div class='add'>+		i2c_w8(gspca_dev, rg1b);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	reg_w1(gspca_dev, 0x05, sd-&gt;ctrls[RED].val);</div><div class='ctx'> /*	reg_w1(gspca_dev, 0x07, 32); */</div><div class='ctx'> 	reg_w1(gspca_dev, 0x06, sd-&gt;ctrls[BLUE].val);</div><div class='hunk'>@@ -2397,7 +2403,7 @@ static int sd_start(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	reg_w1(gspca_dev, 0x17, reg17);</div><div class='ctx'> 	reg01 &amp;= ~S_PWR_DN;		/* sensor power on */</div><div class='ctx'> 	reg_w1(gspca_dev, 0x01, reg01);</div><div class='del'>-	reg01 &amp;= ~SYS_SEL_48M;</div><div class='add'>+	reg01 &amp;= ~SCL_SEL_OD;		/* remove open-drain mode */</div><div class='ctx'> 	reg_w1(gspca_dev, 0x01, reg01);</div><div class='ctx'> </div><div class='ctx'> 	switch (sd-&gt;sensor) {</div><div class='hunk'>@@ -3104,15 +3110,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/spca1528.c b/drivers/media/video/gspca/spca1528.c<br/>index 695673106e76..070b9c33b517 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca1528.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/spca1528.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca1528.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/spca1528.c</a></div><div class='hunk'>@@ -590,15 +590,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c<br/>index bb82c94ece14..103984708c77 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca500.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/spca500.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/spca500.c</a></div><div class='hunk'>@@ -1092,15 +1092,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c<br/>index 7aaac72aee91..9c16821addd4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca501.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/spca501.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca501.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/spca501.c</a></div><div class='hunk'>@@ -2188,15 +2188,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c<br/>index 16722dc60394..1320f35e39f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca505.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/spca505.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca505.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/spca505.c</a></div><div class='hunk'>@@ -815,15 +815,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/spca506.c b/drivers/media/video/gspca/spca506.c<br/>index 89fec4c500af..54eed87672d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca506.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/spca506.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca506.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/spca506.c</a></div><div class='hunk'>@@ -714,21 +714,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	ret = usb_register(&amp;sd_driver);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	PDEBUG(D_PROBE, "registered");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-	PDEBUG(D_PROBE, "deregistered");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c<br/>index a44fe3d25965..df4e16996461 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca508.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/spca508.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca508.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/spca508.c</a></div><div class='hunk'>@@ -1544,15 +1544,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c<br/>index c82fd53cef95..4a5f209ce719 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca561.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/spca561.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/spca561.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/spca561.c</a></div><div class='hunk'>@@ -451,7 +451,7 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cam = &amp;gspca_dev-&gt;cam;</div><div class='del'>-	gspca_dev-&gt;nbalt = 7 + 1;	/* choose alternate 7 first */</div><div class='add'>+	cam-&gt;needs_full_bandwidth = 1;</div><div class='ctx'> </div><div class='ctx'> 	sd-&gt;chip_revision = id-&gt;driver_info;</div><div class='ctx'> 	if (sd-&gt;chip_revision == Rev012A) {</div><div class='hunk'>@@ -1106,15 +1106,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/sq905.c b/drivers/media/video/gspca/sq905.c<br/>index df805f798282..2fe3c29bd6b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sq905.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/sq905.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sq905.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/sq905.c</a></div><div class='hunk'>@@ -432,16 +432,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/sq905c.c b/drivers/media/video/gspca/sq905c.c<br/>index c2c056056e08..ae783634712f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sq905c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/sq905c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sq905c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/sq905c.c</a></div><div class='hunk'>@@ -339,16 +339,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/sq930x.c b/drivers/media/video/gspca/sq930x.c<br/>index e4255b4905e7..1a8ba9b3550a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sq930x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/sq930x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sq930x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/sq930x.c</a></div><div class='hunk'>@@ -1197,15 +1197,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c<br/>index 42a7a28a6c8b..4ae7cc8f463a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/stk014.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/stk014.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/stk014.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/stk014.c</a></div><div class='hunk'>@@ -519,15 +519,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/stv0680.c b/drivers/media/video/gspca/stv0680.c<br/>index 4dcc7e37f9fd..461ed645f309 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/stv0680.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/stv0680.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/stv0680.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/stv0680.c</a></div><div class='hunk'>@@ -355,15 +355,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/stv06xx/stv06xx.c b/drivers/media/video/gspca/stv06xx/stv06xx.c<br/>index b1fca7db1015..91d99b4cc57b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/stv06xx/stv06xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/stv06xx/stv06xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/stv06xx/stv06xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/stv06xx/stv06xx.c</a></div><div class='hunk'>@@ -36,8 +36,8 @@ MODULE_AUTHOR("Erik Andrén");</div><div class='ctx'> MODULE_DESCRIPTION("STV06XX USB Camera Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static int dump_bridge;</div><div class='del'>-static int dump_sensor;</div><div class='add'>+static bool dump_bridge;</div><div class='add'>+static bool dump_sensor;</div><div class='ctx'> </div><div class='ctx'> int stv06xx_write_bridge(struct sd *sd, u16 address, u16 i2c_data)</div><div class='ctx'> {</div><div class='hunk'>@@ -304,7 +304,7 @@ static int stv06xx_isoc_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='ctx'> 	/* Start isoc bandwidth "negotiation" at max isoc bandwidth */</div><div class='del'>-	alt = &amp;gspca_dev-&gt;dev-&gt;config-&gt;intf_cache[0]-&gt;altsetting[1];</div><div class='add'>+	alt = &amp;gspca_dev-&gt;dev-&gt;actconfig-&gt;intf_cache[0]-&gt;altsetting[1];</div><div class='ctx'> 	alt-&gt;endpoint[0].desc.wMaxPacketSize =</div><div class='ctx'> 		cpu_to_le16(sd-&gt;sensor-&gt;max_packet_size[gspca_dev-&gt;curr_mode]);</div><div class='ctx'> </div><div class='hunk'>@@ -317,7 +317,7 @@ static int stv06xx_isoc_nego(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	struct usb_host_interface *alt;</div><div class='ctx'> 	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> </div><div class='del'>-	alt = &amp;gspca_dev-&gt;dev-&gt;config-&gt;intf_cache[0]-&gt;altsetting[1];</div><div class='add'>+	alt = &amp;gspca_dev-&gt;dev-&gt;actconfig-&gt;intf_cache[0]-&gt;altsetting[1];</div><div class='ctx'> 	packet_size = le16_to_cpu(alt-&gt;endpoint[0].desc.wMaxPacketSize);</div><div class='ctx'> 	min_packet_size = sd-&gt;sensor-&gt;min_packet_size[gspca_dev-&gt;curr_mode];</div><div class='ctx'> 	if (packet_size &lt;= min_packet_size)</div><div class='hunk'>@@ -612,18 +612,7 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='ctx'> </div><div class='ctx'> module_param(dump_bridge, bool, S_IRUGO | S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC(dump_bridge, "Dumps all usb bridge registers at startup");</div><div class='head'>diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c<br/>index c8909772435a..c80f0c0c75b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sunplus.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/sunplus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/sunplus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/sunplus.c</a></div><div class='hunk'>@@ -1211,15 +1211,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c<br/>index 90f0877eb599..9b9f85a8e60e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/t613.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/t613.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/t613.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/t613.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> </div><div class='ctx'> #define MODULE_NAME "t613"</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include "gspca.h"</div><div class='ctx'> </div><div class='hunk'>@@ -57,6 +58,7 @@ struct sd {</div><div class='ctx'> 	u8 effect;</div><div class='ctx'> </div><div class='ctx'> 	u8 sensor;</div><div class='add'>+	u8 button_pressed;</div><div class='ctx'> };</div><div class='ctx'> enum sensors {</div><div class='ctx'> 	SENSOR_OM6802,</div><div class='hunk'>@@ -1095,15 +1097,35 @@ static void sd_stopN(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		msleep(20);</div><div class='ctx'> 		reg_w(gspca_dev, 0x0309);</div><div class='ctx'> 	}</div><div class='add'>+#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)</div><div class='add'>+	/* If the last button state is pressed, release it now! */</div><div class='add'>+	if (sd-&gt;button_pressed) {</div><div class='add'>+		input_report_key(gspca_dev-&gt;input_dev, KEY_CAMERA, 0);</div><div class='add'>+		input_sync(gspca_dev-&gt;input_dev);</div><div class='add'>+		sd-&gt;button_pressed = 0;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sd_pkt_scan(struct gspca_dev *gspca_dev,</div><div class='ctx'> 			u8 *data,			/* isoc packet */</div><div class='ctx'> 			int len)			/* iso packet length */</div><div class='ctx'> {</div><div class='add'>+	struct sd *sd = (struct sd *) gspca_dev;</div><div class='ctx'> 	int pkt_type;</div><div class='ctx'> </div><div class='ctx'> 	if (data[0] == 0x5a) {</div><div class='add'>+#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)</div><div class='add'>+		if (len &gt; 20) {</div><div class='add'>+			u8 state = (data[20] &amp; 0x80) ? 1 : 0;</div><div class='add'>+			if (sd-&gt;button_pressed != state) {</div><div class='add'>+				input_report_key(gspca_dev-&gt;input_dev,</div><div class='add'>+						 KEY_CAMERA, state);</div><div class='add'>+				input_sync(gspca_dev-&gt;input_dev);</div><div class='add'>+				sd-&gt;button_pressed = state;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='ctx'> 		/* Control Packet, after this came the header again,</div><div class='ctx'> 		 * but extra bytes came in the packet before this,</div><div class='ctx'> 		 * sometimes an EOF arrives, sometimes not... */</div><div class='hunk'>@@ -1410,6 +1432,9 @@ static const struct sd_desc sd_desc = {</div><div class='ctx'> 	.stopN = sd_stopN,</div><div class='ctx'> 	.pkt_scan = sd_pkt_scan,</div><div class='ctx'> 	.querymenu = sd_querymenu,</div><div class='add'>+#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)</div><div class='add'>+	.other_input = 1,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* -- module initialisation -- */</div><div class='hunk'>@@ -1438,15 +1463,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/topro.c b/drivers/media/video/gspca/topro.c<br/>index 29596c59837f..444d3c5b9079 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/topro.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/topro.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/topro.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/topro.c</a></div><div class='hunk'>@@ -3946,7 +3946,7 @@ static int get_fr_idx(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		/* 640x480 * 30 fps does not work */</div><div class='ctx'> 		if (i == 6			/* if 30 fps */</div><div class='ctx'> 		 &amp;&amp; gspca_dev-&gt;width == 640)</div><div class='del'>-			i = 0x86;		/* 15 fps */</div><div class='add'>+			i = 0x05;		/* 15 fps */</div><div class='ctx'> 	} else {</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(rates_6810) - 1; i++) {</div><div class='ctx'> 			if (sd-&gt;framerate &gt;= rates_6810[i])</div><div class='hunk'>@@ -4971,18 +4971,7 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='ctx'> </div><div class='ctx'> module_param(force_sensor, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(force_sensor,</div><div class='head'>diff --git a/drivers/media/video/gspca/tv8532.c b/drivers/media/video/gspca/tv8532.c<br/>index 933ef2ca658c..c8922c5ffbf5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/tv8532.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/tv8532.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/tv8532.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/tv8532.c</a></div><div class='hunk'>@@ -418,16 +418,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c<br/>index 7ee2c8271dcc..208f6b2d512a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/vc032x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/vc032x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/vc032x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/vc032x.c</a></div><div class='hunk'>@@ -4230,15 +4230,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/vicam.c b/drivers/media/video/gspca/vicam.c<br/>index 81dd4c99d025..911152e169d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/vicam.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/vicam.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/vicam.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/vicam.c</a></div><div class='hunk'>@@ -324,7 +324,8 @@ static void sd_stop0(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	dev-&gt;work_thread = NULL;</div><div class='ctx'> 	mutex_lock(&amp;gspca_dev-&gt;usb_lock);</div><div class='ctx'> </div><div class='del'>-	vicam_set_camera_power(gspca_dev, 0);</div><div class='add'>+	if (gspca_dev-&gt;present)</div><div class='add'>+		vicam_set_camera_power(gspca_dev, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Table of supported USB devices */</div><div class='hunk'>@@ -368,16 +369,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/xirlink_cit.c b/drivers/media/video/gspca/xirlink_cit.c<br/>index 3aed42acdb5a..ecada178bceb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/xirlink_cit.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/xirlink_cit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/xirlink_cit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/xirlink_cit.c</a></div><div class='hunk'>@@ -995,14 +995,12 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	case CIT_MODEL0:</div><div class='ctx'> 		cam-&gt;cam_mode = model0_mode;</div><div class='ctx'> 		cam-&gt;nmodes = ARRAY_SIZE(model0_mode);</div><div class='del'>-		cam-&gt;reverse_alts = 1;</div><div class='ctx'> 		gspca_dev-&gt;ctrl_dis = ~((1 &lt;&lt; SD_CONTRAST) | (1 &lt;&lt; SD_HFLIP));</div><div class='ctx'> 		sd-&gt;sof_len = 4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CIT_MODEL1:</div><div class='ctx'> 		cam-&gt;cam_mode = cif_yuv_mode;</div><div class='ctx'> 		cam-&gt;nmodes = ARRAY_SIZE(cif_yuv_mode);</div><div class='del'>-		cam-&gt;reverse_alts = 1;</div><div class='ctx'> 		gspca_dev-&gt;ctrl_dis = (1 &lt;&lt; SD_HUE) | (1 &lt;&lt; SD_HFLIP);</div><div class='ctx'> 		sd-&gt;sof_len = 4;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2791,7 +2789,7 @@ static int sd_isoc_init(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Start isoc bandwidth "negotiation" at max isoc bandwidth */</div><div class='del'>-	alt = &amp;gspca_dev-&gt;dev-&gt;config-&gt;intf_cache[0]-&gt;altsetting[1];</div><div class='add'>+	alt = &amp;gspca_dev-&gt;dev-&gt;actconfig-&gt;intf_cache[0]-&gt;altsetting[1];</div><div class='ctx'> 	alt-&gt;endpoint[0].desc.wMaxPacketSize = cpu_to_le16(max_packet_size);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2814,7 +2812,7 @@ static int sd_isoc_nego(struct gspca_dev *gspca_dev)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	alt = &amp;gspca_dev-&gt;dev-&gt;config-&gt;intf_cache[0]-&gt;altsetting[1];</div><div class='add'>+	alt = &amp;gspca_dev-&gt;dev-&gt;actconfig-&gt;intf_cache[0]-&gt;altsetting[1];</div><div class='ctx'> 	packet_size = le16_to_cpu(alt-&gt;endpoint[0].desc.wMaxPacketSize);</div><div class='ctx'> 	if (packet_size &lt;= min_packet_size)</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -3325,15 +3323,4 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* -- module insert / remove -- */</div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='head'>diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c<br/>index 30ea1e479492..b9e15bb0328b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/zc3xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/gspca/zc3xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/gspca/zc3xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/gspca/zc3xx.c</a></div><div class='hunk'>@@ -5381,12 +5381,12 @@ static const struct usb_action tas5130c_NoFlikerScale[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct usb_action gc0303_InitialScale[] = {</div><div class='add'>+/* from usbvm305.inf 0ac8:305b 07/06/15 (3 - tas5130c) */</div><div class='add'>+static const struct usb_action gc0303_Initial[] = {</div><div class='ctx'> 	{0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL},		/* 00,00,01,cc, */</div><div class='ctx'> 	{0xa0, 0x02, ZC3XX_R008_CLOCKSETTING},		/* 00,08,02,cc, */</div><div class='ctx'> 	{0xa0, 0x01, ZC3XX_R010_CMOSSENSORSELECT},	/* 00,10,01,cc, */</div><div class='del'>-	{0xa0, 0x10, ZC3XX_R002_CLOCKSELECT},		/* 00,02,00,cc,</div><div class='del'>-							 * 0&lt;-&gt;10 */</div><div class='add'>+	{0xa0, 0x00, ZC3XX_R002_CLOCKSELECT},</div><div class='ctx'> 	{0xa0, 0x02, ZC3XX_R003_FRAMEWIDTHHIGH},	/* 00,03,02,cc, */</div><div class='ctx'> 	{0xa0, 0x80, ZC3XX_R004_FRAMEWIDTHLOW},		/* 00,04,80,cc, */</div><div class='ctx'> 	{0xa0, 0x01, ZC3XX_R005_FRAMEHEIGHTHIGH},	/* 00,05,01,cc, */</div><div class='hunk'>@@ -5405,29 +5405,22 @@ static const struct usb_action gc0303_InitialScale[] = {</div><div class='ctx'> 							 * 6&lt;-&gt;8 */</div><div class='ctx'> 	{0xa0, 0x10, ZC3XX_R087_EXPTIMEMID},		/* 00,87,10,cc, */</div><div class='ctx'> 	{0xa0, 0x98, ZC3XX_R08B_I2CDEVICEADDR},		/* 00,8b,98,cc, */</div><div class='del'>-	{0xaa, 0x1b, 0x0024},		/* 00,1b,24,aa, */</div><div class='del'>-	{0xdd, 0x00, 0x0080},		/* 00,00,80,dd, */</div><div class='del'>-	{0xaa, 0x1b, 0x0000},		/* 00,1b,00,aa, */</div><div class='del'>-	{0xaa, 0x13, 0x0002},		/* 00,13,02,aa, */</div><div class='del'>-	{0xaa, 0x15, 0x0004},		/* 00,15,04,aa */</div><div class='del'>-/*??	{0xaa, 0x01, 0x0000}, */</div><div class='ctx'> 	{0xaa, 0x01, 0x0000},</div><div class='ctx'> 	{0xaa, 0x1a, 0x0000},		/* 00,1a,00,aa, */</div><div class='ctx'> 	{0xaa, 0x1c, 0x0017},		/* 00,1c,17,aa, */</div><div class='add'>+	{0xaa, 0x1b, 0x0000},</div><div class='ctx'> 	{0xa0, 0x82, ZC3XX_R086_EXPTIMEHIGH},		/* 00,86,82,cc, */</div><div class='ctx'> 	{0xa0, 0x83, ZC3XX_R087_EXPTIMEMID},		/* 00,87,83,cc, */</div><div class='ctx'> 	{0xa0, 0x84, ZC3XX_R088_EXPTIMELOW},		/* 00,88,84,cc, */</div><div class='ctx'> 	{0xaa, 0x05, 0x0010},		/* 00,05,10,aa, */</div><div class='del'>-	{0xaa, 0x0a, 0x0000},		/* 00,0a,00,aa, */</div><div class='del'>-	{0xaa, 0x0b, 0x00a0},		/* 00,0b,a0,aa, */</div><div class='del'>-	{0xaa, 0x0c, 0x0000},		/* 00,0c,00,aa, */</div><div class='del'>-	{0xaa, 0x0d, 0x00a0},		/* 00,0d,a0,aa, */</div><div class='del'>-	{0xaa, 0x0e, 0x0000},		/* 00,0e,00,aa, */</div><div class='del'>-	{0xaa, 0x0f, 0x00a0},		/* 00,0f,a0,aa, */</div><div class='del'>-	{0xaa, 0x10, 0x0000},		/* 00,10,00,aa, */</div><div class='del'>-	{0xaa, 0x11, 0x00a0},		/* 00,11,a0,aa, */</div><div class='del'>-/*??	{0xa0, 0x00, 0x0039},</div><div class='del'>-	{0xa1, 0x01, 0x0037}, */</div><div class='add'>+	{0xaa, 0x0a, 0x0002},</div><div class='add'>+	{0xaa, 0x0b, 0x0000},</div><div class='add'>+	{0xaa, 0x0c, 0x0002},</div><div class='add'>+	{0xaa, 0x0d, 0x0000},</div><div class='add'>+	{0xaa, 0x0e, 0x0002},</div><div class='add'>+	{0xaa, 0x0f, 0x0000},</div><div class='add'>+	{0xaa, 0x10, 0x0002},</div><div class='add'>+	{0xaa, 0x11, 0x0000},</div><div class='ctx'> 	{0xaa, 0x16, 0x0001},		/* 00,16,01,aa, */</div><div class='ctx'> 	{0xaa, 0x17, 0x00e8},		/* 00,17,e6,aa, (e6 -&gt; e8) */</div><div class='ctx'> 	{0xaa, 0x18, 0x0002},		/* 00,18,02,aa, */</div><div class='hunk'>@@ -5442,17 +5435,18 @@ static const struct usb_action gc0303_InitialScale[] = {</div><div class='ctx'> 	{0xa0, 0x13, ZC3XX_R1CB_SHARPNESS05},		/* 01,cb,13,cc, */</div><div class='ctx'> 	{0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE},	/* 02,50,08,cc, */</div><div class='ctx'> 	{0xa0, 0x08, ZC3XX_R301_EEPROMACCESS},		/* 03,01,08,cc, */</div><div class='del'>-	{0xa0, 0x60, ZC3XX_R1A8_DIGITALGAIN},		/* 01,a8,60,cc, */</div><div class='add'>+	{0xa0, 0x58, ZC3XX_R1A8_DIGITALGAIN},</div><div class='ctx'> 	{0xa0, 0x61, ZC3XX_R116_RGAIN},			/* 01,16,61,cc, */</div><div class='ctx'> 	{0xa0, 0x65, ZC3XX_R118_BGAIN},			/* 01,18,65,cc */</div><div class='add'>+	{0xaa, 0x1b, 0x0000},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct usb_action gc0303_Initial[] = {</div><div class='add'>+static const struct usb_action gc0303_InitialScale[] = {</div><div class='ctx'> 	{0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL},		/* 00,00,01,cc, */</div><div class='ctx'> 	{0xa0, 0x02, ZC3XX_R008_CLOCKSETTING},		/* 00,08,02,cc, */</div><div class='ctx'> 	{0xa0, 0x01, ZC3XX_R010_CMOSSENSORSELECT},	/* 00,10,01,cc, */</div><div class='del'>-	{0xa0, 0x00, ZC3XX_R002_CLOCKSELECT},		/* 00,02,10,cc, */</div><div class='add'>+	{0xa0, 0x10, ZC3XX_R002_CLOCKSELECT},</div><div class='ctx'> 	{0xa0, 0x02, ZC3XX_R003_FRAMEWIDTHHIGH},	/* 00,03,02,cc, */</div><div class='ctx'> 	{0xa0, 0x80, ZC3XX_R004_FRAMEWIDTHLOW},		/* 00,04,80,cc, */</div><div class='ctx'> 	{0xa0, 0x01, ZC3XX_R005_FRAMEHEIGHTHIGH},	/* 00,05,01,cc, */</div><div class='hunk'>@@ -5471,34 +5465,26 @@ static const struct usb_action gc0303_Initial[] = {</div><div class='ctx'> 							 * 8&lt;-&gt;6 */</div><div class='ctx'> 	{0xa0, 0x10, ZC3XX_R087_EXPTIMEMID},		/* 00,87,10,cc, */</div><div class='ctx'> 	{0xa0, 0x98, ZC3XX_R08B_I2CDEVICEADDR},		/* 00,8b,98,cc, */</div><div class='del'>-	{0xaa, 0x1b, 0x0024},		/* 00,1b,24,aa, */</div><div class='del'>-	{0xdd, 0x00, 0x0080},		/* 00,00,80,dd, */</div><div class='del'>-	{0xaa, 0x1b, 0x0000},		/* 00,1b,00,aa, */</div><div class='del'>-	{0xaa, 0x13, 0x0002},		/* 00,13,02,aa, */</div><div class='del'>-	{0xaa, 0x15, 0x0004},		/* 00,15,04,aa */</div><div class='del'>-/*??	{0xaa, 0x01, 0x0000}, */</div><div class='ctx'> 	{0xaa, 0x01, 0x0000},</div><div class='ctx'> 	{0xaa, 0x1a, 0x0000},		/* 00,1a,00,aa, */</div><div class='ctx'> 	{0xaa, 0x1c, 0x0017},		/* 00,1c,17,aa, */</div><div class='add'>+	{0xaa, 0x1b, 0x0000},</div><div class='ctx'> 	{0xa0, 0x82, ZC3XX_R086_EXPTIMEHIGH},	/* 00,86,82,cc, */</div><div class='ctx'> 	{0xa0, 0x83, ZC3XX_R087_EXPTIMEMID},	/* 00,87,83,cc, */</div><div class='ctx'> 	{0xa0, 0x84, ZC3XX_R088_EXPTIMELOW},	/* 00,88,84,cc, */</div><div class='ctx'> 	{0xaa, 0x05, 0x0010},		/* 00,05,10,aa, */</div><div class='del'>-	{0xaa, 0x0a, 0x0000},		/* 00,0a,00,aa, */</div><div class='del'>-	{0xaa, 0x0b, 0x00a0},		/* 00,0b,a0,aa, */</div><div class='del'>-	{0xaa, 0x0c, 0x0000},		/* 00,0c,00,aa, */</div><div class='del'>-	{0xaa, 0x0d, 0x00a0},		/* 00,0d,a0,aa, */</div><div class='del'>-	{0xaa, 0x0e, 0x0000},		/* 00,0e,00,aa, */</div><div class='del'>-	{0xaa, 0x0f, 0x00a0},		/* 00,0f,a0,aa, */</div><div class='del'>-	{0xaa, 0x10, 0x0000},		/* 00,10,00,aa, */</div><div class='del'>-	{0xaa, 0x11, 0x00a0},		/* 00,11,a0,aa, */</div><div class='del'>-/*??	{0xa0, 0x00, 0x0039},</div><div class='del'>-	{0xa1, 0x01, 0x0037}, */</div><div class='add'>+	{0xaa, 0x0a, 0x0001},</div><div class='add'>+	{0xaa, 0x0b, 0x0000},</div><div class='add'>+	{0xaa, 0x0c, 0x0001},</div><div class='add'>+	{0xaa, 0x0d, 0x0000},</div><div class='add'>+	{0xaa, 0x0e, 0x0001},</div><div class='add'>+	{0xaa, 0x0f, 0x0000},</div><div class='add'>+	{0xaa, 0x10, 0x0001},</div><div class='add'>+	{0xaa, 0x11, 0x0000},</div><div class='ctx'> 	{0xaa, 0x16, 0x0001},		/* 00,16,01,aa, */</div><div class='ctx'> 	{0xaa, 0x17, 0x00e8},		/* 00,17,e6,aa (e6 -&gt; e8) */</div><div class='ctx'> 	{0xaa, 0x18, 0x0002},		/* 00,18,02,aa, */</div><div class='ctx'> 	{0xaa, 0x19, 0x0088},		/* 00,19,88,aa, */</div><div class='del'>-	{0xaa, 0x20, 0x0020},		/* 00,20,20,aa, */</div><div class='ctx'> 	{0xa0, 0xb7, ZC3XX_R101_SENSORCORRECTION},	/* 01,01,b7,cc, */</div><div class='ctx'> 	{0xa0, 0x05, ZC3XX_R012_VIDEOCONTROLFUNC},	/* 00,12,05,cc, */</div><div class='ctx'> 	{0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE},		/* 01,00,0d,cc, */</div><div class='hunk'>@@ -5508,36 +5494,37 @@ static const struct usb_action gc0303_Initial[] = {</div><div class='ctx'> 	{0xa0, 0x13, ZC3XX_R1CB_SHARPNESS05},		/* 01,cb,13,cc, */</div><div class='ctx'> 	{0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE},	/* 02,50,08,cc, */</div><div class='ctx'> 	{0xa0, 0x08, ZC3XX_R301_EEPROMACCESS},		/* 03,01,08,cc, */</div><div class='del'>-	{0xa0, 0x60, ZC3XX_R1A8_DIGITALGAIN},		/* 01,a8,60,cc, */</div><div class='add'>+	{0xa0, 0x58, ZC3XX_R1A8_DIGITALGAIN},</div><div class='ctx'> 	{0xa0, 0x61, ZC3XX_R116_RGAIN},		/* 01,16,61,cc, */</div><div class='ctx'> 	{0xa0, 0x65, ZC3XX_R118_BGAIN},		/* 01,18,65,cc */</div><div class='add'>+	{0xaa, 0x1b, 0x0000},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='del'>-static const struct usb_action gc0303_50HZScale[] = {</div><div class='add'>+static const struct usb_action gc0303_50HZ[] = {</div><div class='ctx'> 	{0xaa, 0x82, 0x0000},		/* 00,82,00,aa */</div><div class='ctx'> 	{0xaa, 0x83, 0x0001},		/* 00,83,01,aa */</div><div class='del'>-	{0xaa, 0x84, 0x00aa},		/* 00,84,aa,aa */</div><div class='add'>+	{0xaa, 0x84, 0x0063},</div><div class='ctx'> 	{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},	/* 01,90,00,cc, */</div><div class='ctx'> 	{0xa0, 0x06, ZC3XX_R191_EXPOSURELIMITMID},	/* 01,91,0d,cc, */</div><div class='ctx'> 	{0xa0, 0xa8, ZC3XX_R192_EXPOSURELIMITLOW},	/* 01,92,50,cc, */</div><div class='ctx'> 	{0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},	/* 01,95,00,cc, */</div><div class='ctx'> 	{0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},	/* 01,96,00,cc, */</div><div class='del'>-	{0xa0, 0x8e, ZC3XX_R197_ANTIFLICKERLOW},	/* 01,97,47,cc, */</div><div class='add'>+	{0xa0, 0x47, ZC3XX_R197_ANTIFLICKERLOW},	/* 01,97,47,cc, */</div><div class='ctx'> 	{0xa0, 0x0e, ZC3XX_R18C_AEFREEZE},		/* 01,8c,0e,cc, */</div><div class='ctx'> 	{0xa0, 0x15, ZC3XX_R18F_AEUNFREEZE},		/* 01,8f,15,cc, */</div><div class='ctx'> 	{0xa0, 0x10, ZC3XX_R1A9_DIGITALLIMITDIFF},	/* 01,a9,10,cc, */</div><div class='del'>-	{0xa0, 0x24, ZC3XX_R1AA_DIGITALGAINSTEP},	/* 01,aa,24,cc, */</div><div class='add'>+	{0xa0, 0x48, ZC3XX_R1AA_DIGITALGAINSTEP},</div><div class='ctx'> 	{0xa0, 0x62, ZC3XX_R01D_HSYNC_0},		/* 00,1d,62,cc, */</div><div class='ctx'> 	{0xa0, 0x90, ZC3XX_R01E_HSYNC_1},		/* 00,1e,90,cc, */</div><div class='ctx'> 	{0xa0, 0xc8, ZC3XX_R01F_HSYNC_2},		/* 00,1f,c8,cc, */</div><div class='ctx'> 	{0xa0, 0xff, ZC3XX_R020_HSYNC_3},		/* 00,20,ff,cc, */</div><div class='ctx'> 	{0xa0, 0x58, ZC3XX_R11D_GLOBALGAIN},		/* 01,1d,58,cc, */</div><div class='ctx'> 	{0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},	/* 01,80,42,cc, */</div><div class='del'>-	{0xa0, 0x78, ZC3XX_R18D_YTARGET},		/* 01,8d,78,cc */</div><div class='add'>+	{0xa0, 0x7f, ZC3XX_R18D_YTARGET},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct usb_action gc0303_50HZ[] = {</div><div class='add'>+static const struct usb_action gc0303_50HZScale[] = {</div><div class='ctx'> 	{0xaa, 0x82, 0x0000},		/* 00,82,00,aa */</div><div class='ctx'> 	{0xaa, 0x83, 0x0003},		/* 00,83,03,aa */</div><div class='ctx'> 	{0xaa, 0x84, 0x0054},		/* 00,84,54,aa */</div><div class='hunk'>@@ -5550,21 +5537,21 @@ static const struct usb_action gc0303_50HZ[] = {</div><div class='ctx'> 	{0xa0, 0x0e, ZC3XX_R18C_AEFREEZE},		/* 01,8c,0e,cc, */</div><div class='ctx'> 	{0xa0, 0x15, ZC3XX_R18F_AEUNFREEZE},		/* 01,8f,15,cc, */</div><div class='ctx'> 	{0xa0, 0x10, ZC3XX_R1A9_DIGITALLIMITDIFF},	/* 01,a9,10,cc, */</div><div class='del'>-	{0xa0, 0x24, ZC3XX_R1AA_DIGITALGAINSTEP},	/* 01,aa,24,cc, */</div><div class='add'>+	{0xa0, 0x48, ZC3XX_R1AA_DIGITALGAINSTEP},	/* 01,aa,24,cc, */</div><div class='ctx'> 	{0xa0, 0x62, ZC3XX_R01D_HSYNC_0},		/* 00,1d,62,cc, */</div><div class='ctx'> 	{0xa0, 0x90, ZC3XX_R01E_HSYNC_1},		/* 00,1e,90,cc, */</div><div class='ctx'> 	{0xa0, 0xc8, ZC3XX_R01F_HSYNC_2},		/* 00,1f,c8,cc, */</div><div class='ctx'> 	{0xa0, 0xff, ZC3XX_R020_HSYNC_3},		/* 00,20,ff,cc, */</div><div class='ctx'> 	{0xa0, 0x58, ZC3XX_R11D_GLOBALGAIN},		/* 01,1d,58,cc, */</div><div class='ctx'> 	{0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},	/* 01,80,42,cc, */</div><div class='del'>-	{0xa0, 0x78, ZC3XX_R18D_YTARGET},		/* 01,8d,78,cc */</div><div class='add'>+	{0xa0, 0x7f, ZC3XX_R18D_YTARGET},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct usb_action gc0303_60HZScale[] = {</div><div class='add'>+static const struct usb_action gc0303_60HZ[] = {</div><div class='ctx'> 	{0xaa, 0x82, 0x0000},		/* 00,82,00,aa */</div><div class='del'>-	{0xaa, 0x83, 0x0001},		/* 00,83,01,aa */</div><div class='del'>-	{0xaa, 0x84, 0x0062},		/* 00,84,62,aa */</div><div class='add'>+	{0xaa, 0x83, 0x0000},</div><div class='add'>+	{0xaa, 0x84, 0x003b},</div><div class='ctx'> 	{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},	/* 01,90,00,cc, */</div><div class='ctx'> 	{0xa0, 0x05, ZC3XX_R191_EXPOSURELIMITMID},	/* 01,91,05,cc, */</div><div class='ctx'> 	{0xa0, 0x88, ZC3XX_R192_EXPOSURELIMITLOW},	/* 01,92,88,cc, */</div><div class='hunk'>@@ -5581,14 +5568,14 @@ static const struct usb_action gc0303_60HZScale[] = {</div><div class='ctx'> 	{0xa0, 0xff, ZC3XX_R020_HSYNC_3},		/* 00,20,ff,cc, */</div><div class='ctx'> 	{0xa0, 0x58, ZC3XX_R11D_GLOBALGAIN},		/* 01,1d,58,cc, */</div><div class='ctx'> 	{0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},	/* 01,80,42,cc, */</div><div class='del'>-	{0xa0, 0x78, ZC3XX_R18D_YTARGET},		/* 01,8d,78,cc */</div><div class='add'>+	{0xa0, 0x80, ZC3XX_R18D_YTARGET},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct usb_action gc0303_60HZ[] = {</div><div class='add'>+static const struct usb_action gc0303_60HZScale[] = {</div><div class='ctx'> 	{0xaa, 0x82, 0x0000},		/* 00,82,00,aa */</div><div class='del'>-	{0xaa, 0x83, 0x0002},		/* 00,83,02,aa */</div><div class='del'>-	{0xaa, 0x84, 0x00c4},		/* 00,84,c4,aa */</div><div class='add'>+	{0xaa, 0x83, 0x0000},</div><div class='add'>+	{0xaa, 0x84, 0x0076},</div><div class='ctx'> 	{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},	/* 01,90,00,cc, */</div><div class='ctx'> 	{0xa0, 0x0b, ZC3XX_R191_EXPOSURELIMITMID},	/* 01,1,0b,cc, */</div><div class='ctx'> 	{0xa0, 0x10, ZC3XX_R192_EXPOSURELIMITLOW},	/* 01,2,10,cc, */</div><div class='hunk'>@@ -5605,18 +5592,18 @@ static const struct usb_action gc0303_60HZ[] = {</div><div class='ctx'> 	{0xa0, 0xff, ZC3XX_R020_HSYNC_3},		/* 00,0,ff,cc, */</div><div class='ctx'> 	{0xa0, 0x58, ZC3XX_R11D_GLOBALGAIN},		/* 01,d,58,cc, */</div><div class='ctx'> 	{0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},	/* 01,80,42,cc, */</div><div class='del'>-	{0xa0, 0x78, ZC3XX_R18D_YTARGET},		/* 01,d,78,cc */</div><div class='add'>+	{0xa0, 0x80, ZC3XX_R18D_YTARGET},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct usb_action gc0303_NoFlikerScale[] = {</div><div class='add'>+static const struct usb_action gc0303_NoFliker[] = {</div><div class='ctx'> 	{0xa0, 0x0c, ZC3XX_R100_OPERATIONMODE},		/* 01,00,0c,cc, */</div><div class='ctx'> 	{0xaa, 0x82, 0x0000},		/* 00,82,00,aa */</div><div class='ctx'> 	{0xaa, 0x83, 0x0000},		/* 00,83,00,aa */</div><div class='ctx'> 	{0xaa, 0x84, 0x0020},		/* 00,84,20,aa */</div><div class='ctx'> 	{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},	/* 01,0,00,cc, */</div><div class='del'>-	{0xa0, 0x05, ZC3XX_R191_EXPOSURELIMITMID},	/* 01,91,05,cc, */</div><div class='del'>-	{0xa0, 0x88, ZC3XX_R192_EXPOSURELIMITLOW},	/* 01,92,88,cc, */</div><div class='add'>+	{0xa0, 0x00, ZC3XX_R191_EXPOSURELIMITMID},</div><div class='add'>+	{0xa0, 0x48, ZC3XX_R192_EXPOSURELIMITLOW},</div><div class='ctx'> 	{0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},	/* 01,95,00,cc, */</div><div class='ctx'> 	{0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},	/* 01,96,00,cc, */</div><div class='ctx'> 	{0xa0, 0x10, ZC3XX_R197_ANTIFLICKERLOW},	/* 01,97,10,cc, */</div><div class='hunk'>@@ -5631,14 +5618,14 @@ static const struct usb_action gc0303_NoFlikerScale[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct usb_action gc0303_NoFliker[] = {</div><div class='add'>+static const struct usb_action gc0303_NoFlikerScale[] = {</div><div class='ctx'> 	{0xa0, 0x0c, ZC3XX_R100_OPERATIONMODE},		/* 01,00,0c,cc, */</div><div class='ctx'> 	{0xaa, 0x82, 0x0000},		/* 00,82,00,aa */</div><div class='ctx'> 	{0xaa, 0x83, 0x0000},		/* 00,83,00,aa */</div><div class='ctx'> 	{0xaa, 0x84, 0x0020},		/* 00,84,20,aa */</div><div class='ctx'> 	{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},	/* 01,90,00,cc, */</div><div class='del'>-	{0xa0, 0x0b, ZC3XX_R191_EXPOSURELIMITMID},	/* 01,91,0b,cc, */</div><div class='del'>-	{0xa0, 0x10, ZC3XX_R192_EXPOSURELIMITLOW},	/* 01,92,10,cc, */</div><div class='add'>+	{0xa0, 0x00, ZC3XX_R191_EXPOSURELIMITMID},</div><div class='add'>+	{0xa0, 0x48, ZC3XX_R192_EXPOSURELIMITLOW},</div><div class='ctx'> 	{0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},	/* 01,95,00,cc, */</div><div class='ctx'> 	{0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},	/* 01,96,00,cc, */</div><div class='ctx'> 	{0xa0, 0x10, ZC3XX_R197_ANTIFLICKERLOW},	/* 01,97,10,cc, */</div><div class='hunk'>@@ -5809,7 +5796,7 @@ static void setmatrix(struct gspca_dev *gspca_dev)</div><div class='ctx'> 	static const u8 tas5130c_matrix[9] =</div><div class='ctx'> 		{0x68, 0xec, 0xec, 0xec, 0x68, 0xec, 0xec, 0xec, 0x68};</div><div class='ctx'> 	static const u8 gc0303_matrix[9] =</div><div class='del'>-		{0x7b, 0xea, 0xea, 0xea, 0x7b, 0xea, 0xea, 0xea, 0x7b};</div><div class='add'>+		{0x6c, 0xea, 0xea, 0xea, 0x6c, 0xea, 0xea, 0xea, 0x6c};</div><div class='ctx'> 	static const u8 *matrix_tb[SENSOR_MAX] = {</div><div class='ctx'> 		[SENSOR_ADCM2700] =	adcm2700_matrix,</div><div class='ctx'> 		[SENSOR_CS2102] =	ov7620_matrix,</div><div class='hunk'>@@ -6426,10 +6413,6 @@ static int sd_config(struct gspca_dev *gspca_dev,</div><div class='ctx'> 	gspca_dev-&gt;cam.ctrls = sd-&gt;ctrls;</div><div class='ctx'> 	sd-&gt;quality = QUALITY_DEF;</div><div class='ctx'> </div><div class='del'>-	/* if USB 1.1, let some bandwidth for the audio device */</div><div class='del'>-	if (gspca_dev-&gt;audio &amp;&amp; gspca_dev-&gt;dev-&gt;speed &lt; USB_SPEED_HIGH)</div><div class='del'>-		gspca_dev-&gt;nbalt--;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7050,18 +7033,7 @@ static struct usb_driver sd_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sd_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sd_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sd_mod_init);</div><div class='del'>-module_exit(sd_mod_exit);</div><div class='add'>+module_usb_driver(sd_driver);</div><div class='ctx'> </div><div class='ctx'> module_param(force_sensor, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(force_sensor,</div><div class='head'>diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c<br/>index 441dacf642bb..e5eb56a5b618 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/hdpvr/hdpvr-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/hdpvr/hdpvr-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/hdpvr/hdpvr-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/hdpvr/hdpvr-core.c</a></div><div class='hunk'>@@ -49,7 +49,7 @@ module_param(default_audio_input, uint, S_IRUGO|S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC(default_audio_input, "default audio input: 0=RCA back / "</div><div class='ctx'> 		 "1=RCA front / 2=S/PDIF");</div><div class='ctx'> </div><div class='del'>-static int boost_audio;</div><div class='add'>+static bool boost_audio;</div><div class='ctx'> module_param(boost_audio, bool, S_IRUGO|S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC(boost_audio, "boost the audio signal");</div><div class='ctx'> </div><div class='hunk'>@@ -452,26 +452,7 @@ static struct usb_driver hdpvr_usb_driver = {</div><div class='ctx'> 	.id_table =	hdpvr_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init hdpvr_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	/* register this driver with the USB subsystem */</div><div class='del'>-	result = usb_register(&amp;hdpvr_usb_driver);</div><div class='del'>-	if (result)</div><div class='del'>-		err("usb_register failed. Error number %d", result);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit hdpvr_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver with the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;hdpvr_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(hdpvr_init);</div><div class='del'>-module_exit(hdpvr_exit);</div><div class='add'>+module_usb_driver(hdpvr_usb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_VERSION("0.2.1");</div><div class='head'>diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c<br/>index 3ab875d036e1..a7c41d32f414 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ir-kbd-i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ir-kbd-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ir-kbd-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/ir-kbd-i2c.c</a></div><div class='hunk'>@@ -244,7 +244,7 @@ static int get_key_avermedia_cardbus(struct IR_i2c *ir,</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static void ir_key_poll(struct IR_i2c *ir)</div><div class='add'>+static int ir_key_poll(struct IR_i2c *ir)</div><div class='ctx'> {</div><div class='ctx'> 	static u32 ir_key, ir_raw;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -253,20 +253,28 @@ static void ir_key_poll(struct IR_i2c *ir)</div><div class='ctx'> 	rc = ir-&gt;get_key(ir, &amp;ir_key, &amp;ir_raw);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		dprintk(2,"error\n");</div><div class='del'>-		return;</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dprintk(1, "%s: keycode = 0x%04x\n", __func__, ir_key);</div><div class='ctx'> 		rc_keydown(ir-&gt;rc, ir_key, 0);</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ir_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='add'>+	int rc;</div><div class='ctx'> 	struct IR_i2c *ir = container_of(work, struct IR_i2c, work.work);</div><div class='ctx'> </div><div class='del'>-	ir_key_poll(ir);</div><div class='add'>+	rc = ir_key_poll(ir);</div><div class='add'>+	if (rc == -ENODEV) {</div><div class='add'>+		rc_unregister_device(ir-&gt;rc);</div><div class='add'>+		ir-&gt;rc = NULL;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	schedule_delayed_work(&amp;ir-&gt;work, msecs_to_jiffies(ir-&gt;polling_interval));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -446,7 +454,8 @@ static int ir_remove(struct i2c_client *client)</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;ir-&gt;work);</div><div class='ctx'> </div><div class='ctx'> 	/* unregister device */</div><div class='del'>-	rc_unregister_device(ir-&gt;rc);</div><div class='add'>+	if (ir-&gt;rc)</div><div class='add'>+		rc_unregister_device(ir-&gt;rc);</div><div class='ctx'> </div><div class='ctx'> 	/* free memory */</div><div class='ctx'> 	kfree(ir);</div><div class='hunk'>@@ -489,11 +498,3 @@ static void __exit ir_fini(void)</div><div class='ctx'> </div><div class='ctx'> module_init(ir_init);</div><div class='ctx'> module_exit(ir_fini);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Overrides for Emacs so that we follow Linus's tabbing style.</div><div class='del'>- * ---------------------------------------------------------------------------</div><div class='del'>- * Local variables:</div><div class='del'>- * c-basic-offset: 8</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c<br/>index 41108a9a195e..3949b7dc2368 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-driver.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ivtv/ivtv-driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/ivtv/ivtv-driver.c</a></div><div class='hunk'>@@ -99,7 +99,7 @@ static int i2c_clock_period[IVTV_MAX_CARDS] = { -1, -1, -1, -1, -1, -1, -1, -1,</div><div class='ctx'> </div><div class='ctx'> static unsigned int cardtype_c = 1;</div><div class='ctx'> static unsigned int tuner_c = 1;</div><div class='del'>-static unsigned int radio_c = 1;</div><div class='add'>+static bool radio_c = 1;</div><div class='ctx'> static unsigned int i2c_clock_period_c = 1;</div><div class='ctx'> static char pal[] = "---";</div><div class='ctx'> static char secam[] = "--";</div><div class='hunk'>@@ -731,9 +731,6 @@ static int __devinit ivtv_init_struct1(struct ivtv *itv)</div><div class='ctx'> </div><div class='ctx'> 	init_kthread_work(&amp;itv-&gt;irq_work, ivtv_irq_work_handler);</div><div class='ctx'> </div><div class='del'>-	/* start counting open_id at 1 */</div><div class='del'>-	itv-&gt;open_id = 1;</div><div class='del'>-</div><div class='ctx'> 	/* Initial settings */</div><div class='ctx'> 	itv-&gt;cxhdl.port = CX2341X_PORT_MEMORY;</div><div class='ctx'> 	itv-&gt;cxhdl.capabilities = CX2341X_CAP_HAS_SLICED_VBI;</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h<br/>index 8f9cc17b518e..06f3d78389bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-driver.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ivtv/ivtv-driver.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-driver.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/ivtv/ivtv-driver.h</a></div><div class='hunk'>@@ -332,7 +332,7 @@ struct ivtv_stream {</div><div class='ctx'> 	const char *name;		/* name of the stream */</div><div class='ctx'> 	int type;			/* stream type */</div><div class='ctx'> </div><div class='del'>-	u32 id;</div><div class='add'>+	struct v4l2_fh *fh;		/* pointer to the streaming filehandle */</div><div class='ctx'> 	spinlock_t qlock; 		/* locks access to the queues */</div><div class='ctx'> 	unsigned long s_flags;		/* status flags, see above */</div><div class='ctx'> 	int dma;			/* can be PCI_DMA_TODEVICE, PCI_DMA_FROMDEVICE or PCI_DMA_NONE */</div><div class='hunk'>@@ -379,7 +379,6 @@ struct ivtv_stream {</div><div class='ctx'> </div><div class='ctx'> struct ivtv_open_id {</div><div class='ctx'> 	struct v4l2_fh fh;</div><div class='del'>-	u32 open_id;                    /* unique ID for this file descriptor */</div><div class='ctx'> 	int type;                       /* stream type */</div><div class='ctx'> 	int yuv_frames;                 /* 1: started OUT_UDMA_YUV output mode */</div><div class='ctx'> 	struct ivtv *itv;</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c<br/>index 38f052257f46..2cd6c89b7d91 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-fileops.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ivtv/ivtv-fileops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-fileops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/ivtv/ivtv-fileops.c</a></div><div class='hunk'>@@ -50,16 +50,16 @@ static int ivtv_claim_stream(struct ivtv_open_id *id, int type)</div><div class='ctx'> </div><div class='ctx'> 	if (test_and_set_bit(IVTV_F_S_CLAIMED, &amp;s-&gt;s_flags)) {</div><div class='ctx'> 		/* someone already claimed this stream */</div><div class='del'>-		if (s-&gt;id == id-&gt;open_id) {</div><div class='add'>+		if (s-&gt;fh == &amp;id-&gt;fh) {</div><div class='ctx'> 			/* yes, this file descriptor did. So that's OK. */</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		if (s-&gt;id == -1 &amp;&amp; (type == IVTV_DEC_STREAM_TYPE_VBI ||</div><div class='add'>+		if (s-&gt;fh == NULL &amp;&amp; (type == IVTV_DEC_STREAM_TYPE_VBI ||</div><div class='ctx'> 					 type == IVTV_ENC_STREAM_TYPE_VBI)) {</div><div class='ctx'> 			/* VBI is handled already internally, now also assign</div><div class='ctx'> 			   the file descriptor to this stream for external</div><div class='ctx'> 			   reading of the stream. */</div><div class='del'>-			s-&gt;id = id-&gt;open_id;</div><div class='add'>+			s-&gt;fh = &amp;id-&gt;fh;</div><div class='ctx'> 			IVTV_DEBUG_INFO("Start Read VBI\n");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -67,7 +67,7 @@ static int ivtv_claim_stream(struct ivtv_open_id *id, int type)</div><div class='ctx'> 		IVTV_DEBUG_INFO("Stream %d is busy\n", type);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	s-&gt;id = id-&gt;open_id;</div><div class='add'>+	s-&gt;fh = &amp;id-&gt;fh;</div><div class='ctx'> 	if (type == IVTV_DEC_STREAM_TYPE_VBI) {</div><div class='ctx'> 		/* Enable reinsertion interrupt */</div><div class='ctx'> 		ivtv_clear_irq_mask(itv, IVTV_IRQ_DEC_VBI_RE_INSERT);</div><div class='hunk'>@@ -104,7 +104,7 @@ void ivtv_release_stream(struct ivtv_stream *s)</div><div class='ctx'> 	struct ivtv *itv = s-&gt;itv;</div><div class='ctx'> 	struct ivtv_stream *s_vbi;</div><div class='ctx'> </div><div class='del'>-	s-&gt;id = -1;</div><div class='add'>+	s-&gt;fh = NULL;</div><div class='ctx'> 	if ((s-&gt;type == IVTV_DEC_STREAM_TYPE_VBI || s-&gt;type == IVTV_ENC_STREAM_TYPE_VBI) &amp;&amp;</div><div class='ctx'> 		test_bit(IVTV_F_S_INTERNAL_USE, &amp;s-&gt;s_flags)) {</div><div class='ctx'> 		/* this stream is still in use internally */</div><div class='hunk'>@@ -136,7 +136,7 @@ void ivtv_release_stream(struct ivtv_stream *s)</div><div class='ctx'> 		/* was already cleared */</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (s_vbi-&gt;id != -1) {</div><div class='add'>+	if (s_vbi-&gt;fh) {</div><div class='ctx'> 		/* VBI stream still claimed by a file descriptor */</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -268,11 +268,13 @@ static struct ivtv_buffer *ivtv_get_buffer(struct ivtv_stream *s, int non_block,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* wait for more data to arrive */</div><div class='add'>+		mutex_unlock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> 		prepare_to_wait(&amp;s-&gt;waitq, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='ctx'> 		/* New buffers might have become available before we were added to the waitqueue */</div><div class='ctx'> 		if (!s-&gt;q_full.buffers)</div><div class='ctx'> 			schedule();</div><div class='ctx'> 		finish_wait(&amp;s-&gt;waitq, &amp;wait);</div><div class='add'>+		mutex_lock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> 		if (signal_pending(current)) {</div><div class='ctx'> 			/* return if a signal was received */</div><div class='ctx'> 			IVTV_DEBUG_INFO("User stopped %s\n", s-&gt;name);</div><div class='hunk'>@@ -357,7 +359,7 @@ static ssize_t ivtv_read(struct ivtv_stream *s, char __user *ubuf, size_t tot_co</div><div class='ctx'> 	size_t tot_written = 0;</div><div class='ctx'> 	int single_frame = 0;</div><div class='ctx'> </div><div class='del'>-	if (atomic_read(&amp;itv-&gt;capturing) == 0 &amp;&amp; s-&gt;id == -1) {</div><div class='add'>+	if (atomic_read(&amp;itv-&gt;capturing) == 0 &amp;&amp; s-&gt;fh == NULL) {</div><div class='ctx'> 		/* shouldn't happen */</div><div class='ctx'> 		IVTV_DEBUG_WARN("Stream %s not initialized before read\n", s-&gt;name);</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -507,9 +509,7 @@ ssize_t ivtv_v4l2_read(struct file * filp, char __user *buf, size_t count, loff_</div><div class='ctx'> </div><div class='ctx'> 	IVTV_DEBUG_HI_FILE("read %zd bytes from %s\n", count, s-&gt;name);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> 	rc = ivtv_start_capture(id);</div><div class='del'>-	mutex_unlock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	return ivtv_read_pos(s, buf, count, pos, filp-&gt;f_flags &amp; O_NONBLOCK);</div><div class='hunk'>@@ -584,9 +584,7 @@ ssize_t ivtv_v4l2_write(struct file *filp, const char __user *user_buf, size_t c</div><div class='ctx'> 	set_bit(IVTV_F_S_APPL_IO, &amp;s-&gt;s_flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Start decoder (returns 0 if already started) */</div><div class='del'>-	mutex_lock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> 	rc = ivtv_start_decoding(id, itv-&gt;speed);</div><div class='del'>-	mutex_unlock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		IVTV_DEBUG_WARN("Failed start decode stream %s\n", s-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -627,11 +625,13 @@ retry:</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (filp-&gt;f_flags &amp; O_NONBLOCK)</div><div class='ctx'> 			return -EAGAIN;</div><div class='add'>+		mutex_unlock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> 		prepare_to_wait(&amp;s-&gt;waitq, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='ctx'> 		/* New buffers might have become free before we were added to the waitqueue */</div><div class='ctx'> 		if (!s-&gt;q_free.buffers)</div><div class='ctx'> 			schedule();</div><div class='ctx'> 		finish_wait(&amp;s-&gt;waitq, &amp;wait);</div><div class='add'>+		mutex_lock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> 		if (signal_pending(current)) {</div><div class='ctx'> 			IVTV_DEBUG_INFO("User stopped %s\n", s-&gt;name);</div><div class='ctx'> 			return -EINTR;</div><div class='hunk'>@@ -686,12 +686,14 @@ retry:</div><div class='ctx'> 			if (mode == OUT_YUV)</div><div class='ctx'> 				ivtv_yuv_setup_stream_frame(itv);</div><div class='ctx'> </div><div class='add'>+			mutex_unlock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> 			prepare_to_wait(&amp;itv-&gt;dma_waitq, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='ctx'> 			while (!(got_sig = signal_pending(current)) &amp;&amp;</div><div class='ctx'> 					test_bit(IVTV_F_S_DMA_PENDING, &amp;s-&gt;s_flags)) {</div><div class='ctx'> 				schedule();</div><div class='ctx'> 			}</div><div class='ctx'> 			finish_wait(&amp;itv-&gt;dma_waitq, &amp;wait);</div><div class='add'>+			mutex_lock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> 			if (got_sig) {</div><div class='ctx'> 				IVTV_DEBUG_INFO("User interrupted %s\n", s-&gt;name);</div><div class='ctx'> 				return -EINTR;</div><div class='hunk'>@@ -756,9 +758,7 @@ unsigned int ivtv_v4l2_enc_poll(struct file *filp, poll_table * wait)</div><div class='ctx'> 	if (!eof &amp;&amp; !test_bit(IVTV_F_S_STREAMING, &amp;s-&gt;s_flags)) {</div><div class='ctx'> 		int rc;</div><div class='ctx'> </div><div class='del'>-		mutex_lock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> 		rc = ivtv_start_capture(id);</div><div class='del'>-		mutex_unlock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			IVTV_DEBUG_INFO("Could not start capture for %s (%d)\n",</div><div class='ctx'> 					s-&gt;name, rc);</div><div class='hunk'>@@ -808,7 +808,7 @@ void ivtv_stop_capture(struct ivtv_open_id *id, int gop_end)</div><div class='ctx'> 		     id-&gt;type == IVTV_ENC_STREAM_TYPE_VBI) &amp;&amp;</div><div class='ctx'> 		    test_bit(IVTV_F_S_INTERNAL_USE, &amp;s-&gt;s_flags)) {</div><div class='ctx'> 			/* Also used internally, don't stop capturing */</div><div class='del'>-			s-&gt;id = -1;</div><div class='add'>+			s-&gt;fh = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		else {</div><div class='ctx'> 			ivtv_stop_v4l2_encode_stream(s, gop_end);</div><div class='hunk'>@@ -861,20 +861,9 @@ int ivtv_v4l2_close(struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	IVTV_DEBUG_FILE("close %s\n", s-&gt;name);</div><div class='ctx'> </div><div class='del'>-	v4l2_fh_del(fh);</div><div class='del'>-	v4l2_fh_exit(fh);</div><div class='del'>-</div><div class='del'>-	/* Easy case first: this stream was never claimed by us */</div><div class='del'>-	if (s-&gt;id != id-&gt;open_id) {</div><div class='del'>-		kfree(id);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 'Unclaim' this stream */</div><div class='del'>-</div><div class='ctx'> 	/* Stop radio */</div><div class='del'>-	mutex_lock(&amp;itv-&gt;serialize_lock);</div><div class='del'>-	if (id-&gt;type == IVTV_ENC_STREAM_TYPE_RAD) {</div><div class='add'>+	if (id-&gt;type == IVTV_ENC_STREAM_TYPE_RAD &amp;&amp;</div><div class='add'>+			v4l2_fh_is_singular_file(filp)) {</div><div class='ctx'> 		/* Closing radio device, return to TV mode */</div><div class='ctx'> 		ivtv_mute(itv);</div><div class='ctx'> 		/* Mark that the radio is no longer in use */</div><div class='hunk'>@@ -890,13 +879,25 @@ int ivtv_v4l2_close(struct file *filp)</div><div class='ctx'> 		if (atomic_read(&amp;itv-&gt;capturing) &gt; 0) {</div><div class='ctx'> 			/* Undo video mute */</div><div class='ctx'> 			ivtv_vapi(itv, CX2341X_ENC_MUTE_VIDEO, 1,</div><div class='del'>-				v4l2_ctrl_g_ctrl(itv-&gt;cxhdl.video_mute) |</div><div class='del'>-				(v4l2_ctrl_g_ctrl(itv-&gt;cxhdl.video_mute_yuv) &lt;&lt; 8));</div><div class='add'>+					v4l2_ctrl_g_ctrl(itv-&gt;cxhdl.video_mute) |</div><div class='add'>+					(v4l2_ctrl_g_ctrl(itv-&gt;cxhdl.video_mute_yuv) &lt;&lt; 8));</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Done! Unmute and continue. */</div><div class='ctx'> 		ivtv_unmute(itv);</div><div class='del'>-		ivtv_release_stream(s);</div><div class='del'>-	} else if (s-&gt;type &gt;= IVTV_DEC_STREAM_TYPE_MPG) {</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	v4l2_fh_del(fh);</div><div class='add'>+	v4l2_fh_exit(fh);</div><div class='add'>+</div><div class='add'>+	/* Easy case first: this stream was never claimed by us */</div><div class='add'>+	if (s-&gt;fh != &amp;id-&gt;fh) {</div><div class='add'>+		kfree(id);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 'Unclaim' this stream */</div><div class='add'>+</div><div class='add'>+	if (s-&gt;type &gt;= IVTV_DEC_STREAM_TYPE_MPG) {</div><div class='ctx'> 		struct ivtv_stream *s_vout = &amp;itv-&gt;streams[IVTV_DEC_STREAM_TYPE_VOUT];</div><div class='ctx'> </div><div class='ctx'> 		ivtv_stop_decoding(id, VIDEO_CMD_STOP_TO_BLACK | VIDEO_CMD_STOP_IMMEDIATELY, 0);</div><div class='hunk'>@@ -911,21 +912,25 @@ int ivtv_v4l2_close(struct file *filp)</div><div class='ctx'> 		ivtv_stop_capture(id, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(id);</div><div class='del'>-	mutex_unlock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ivtv_serialized_open(struct ivtv_stream *s, struct file *filp)</div><div class='add'>+int ivtv_v4l2_open(struct file *filp)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='ctx'> 	struct video_device *vdev = video_devdata(filp);</div><div class='del'>-#endif</div><div class='add'>+	struct ivtv_stream *s = video_get_drvdata(vdev);</div><div class='ctx'> 	struct ivtv *itv = s-&gt;itv;</div><div class='ctx'> 	struct ivtv_open_id *item;</div><div class='ctx'> 	int res = 0;</div><div class='ctx'> </div><div class='ctx'> 	IVTV_DEBUG_FILE("open %s\n", s-&gt;name);</div><div class='ctx'> </div><div class='add'>+	if (ivtv_init_on_first_open(itv)) {</div><div class='add'>+		IVTV_ERR("Failed to initialize on device %s\n",</div><div class='add'>+			 video_device_node_name(vdev));</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_VIDEO_ADV_DEBUG</div><div class='ctx'> 	/* Unless ivtv_fw_debug is set, error out if firmware dead. */</div><div class='ctx'> 	if (ivtv_fw_debug) {</div><div class='hunk'>@@ -966,31 +971,19 @@ static int ivtv_serialized_open(struct ivtv_stream *s, struct file *filp)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	v4l2_fh_init(&amp;item-&gt;fh, s-&gt;vdev);</div><div class='del'>-	if (res &lt; 0) {</div><div class='del'>-		v4l2_fh_exit(&amp;item-&gt;fh);</div><div class='del'>-		kfree(item);</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='ctx'> 	item-&gt;itv = itv;</div><div class='ctx'> 	item-&gt;type = s-&gt;type;</div><div class='ctx'> </div><div class='del'>-	item-&gt;open_id = itv-&gt;open_id++;</div><div class='ctx'> 	filp-&gt;private_data = &amp;item-&gt;fh;</div><div class='add'>+	v4l2_fh_add(&amp;item-&gt;fh);</div><div class='ctx'> </div><div class='del'>-	if (item-&gt;type == IVTV_ENC_STREAM_TYPE_RAD) {</div><div class='del'>-		/* Try to claim this stream */</div><div class='del'>-		if (ivtv_claim_stream(item, item-&gt;type)) {</div><div class='del'>-			/* No, it's already in use */</div><div class='del'>-			v4l2_fh_exit(&amp;item-&gt;fh);</div><div class='del'>-			kfree(item);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-</div><div class='add'>+	if (item-&gt;type == IVTV_ENC_STREAM_TYPE_RAD &amp;&amp;</div><div class='add'>+			v4l2_fh_is_singular_file(filp)) {</div><div class='ctx'> 		if (!test_bit(IVTV_F_I_RADIO_USER, &amp;itv-&gt;i_flags)) {</div><div class='ctx'> 			if (atomic_read(&amp;itv-&gt;capturing) &gt; 0) {</div><div class='ctx'> 				/* switching to radio while capture is</div><div class='ctx'> 				   in progress is not polite */</div><div class='del'>-				ivtv_release_stream(s);</div><div class='add'>+				v4l2_fh_del(&amp;item-&gt;fh);</div><div class='ctx'> 				v4l2_fh_exit(&amp;item-&gt;fh);</div><div class='ctx'> 				kfree(item);</div><div class='ctx'> 				return -EBUSY;</div><div class='hunk'>@@ -1022,32 +1015,9 @@ static int ivtv_serialized_open(struct ivtv_stream *s, struct file *filp)</div><div class='ctx'> 				1080 * ((itv-&gt;yuv_info.v4l2_src_h + 31) &amp; ~31);</div><div class='ctx'> 		itv-&gt;yuv_info.stream_size = 0;</div><div class='ctx'> 	}</div><div class='del'>-	v4l2_fh_add(&amp;item-&gt;fh);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ivtv_v4l2_open(struct file *filp)</div><div class='del'>-{</div><div class='del'>-	int res;</div><div class='del'>-	struct ivtv *itv = NULL;</div><div class='del'>-	struct ivtv_stream *s = NULL;</div><div class='del'>-	struct video_device *vdev = video_devdata(filp);</div><div class='del'>-</div><div class='del'>-	s = video_get_drvdata(vdev);</div><div class='del'>-	itv = s-&gt;itv;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;itv-&gt;serialize_lock);</div><div class='del'>-	if (ivtv_init_on_first_open(itv)) {</div><div class='del'>-		IVTV_ERR("Failed to initialize on device %s\n",</div><div class='del'>-			 video_device_node_name(vdev));</div><div class='del'>-		mutex_unlock(&amp;itv-&gt;serialize_lock);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-	res = ivtv_serialized_open(s, filp);</div><div class='del'>-	mutex_unlock(&amp;itv-&gt;serialize_lock);</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void ivtv_mute(struct ivtv *itv)</div><div class='ctx'> {</div><div class='ctx'> 	if (atomic_read(&amp;itv-&gt;capturing))</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-i2c.h b/drivers/media/video/ivtv/ivtv-i2c.h<br/>index 9332920ca4ff..7b9ec1cfeb80 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-i2c.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ivtv/ivtv-i2c.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-i2c.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/ivtv/ivtv-i2c.h</a></div><div class='hunk'>@@ -25,7 +25,7 @@ struct i2c_client *ivtv_i2c_new_ir_legacy(struct ivtv *itv);</div><div class='ctx'> int ivtv_i2c_register(struct ivtv *itv, unsigned idx);</div><div class='ctx'> struct v4l2_subdev *ivtv_find_hw(struct ivtv *itv, u32 hw);</div><div class='ctx'> </div><div class='del'>-/* init + register i2c algo-bit adapter */</div><div class='add'>+/* init + register i2c adapter */</div><div class='ctx'> int init_ivtv_i2c(struct ivtv *itv);</div><div class='ctx'> void exit_ivtv_i2c(struct ivtv *itv);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c<br/>index ecafa697326e..c4bc48143098 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-ioctl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ivtv/ivtv-ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/ivtv/ivtv-ioctl.c</a></div><div class='hunk'>@@ -179,6 +179,7 @@ int ivtv_set_speed(struct ivtv *itv, int speed)</div><div class='ctx'> 		ivtv_vapi(itv, CX2341X_DEC_PAUSE_PLAYBACK, 1, 0);</div><div class='ctx'> </div><div class='ctx'> 		/* Wait for any DMA to finish */</div><div class='add'>+		mutex_unlock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> 		prepare_to_wait(&amp;itv-&gt;dma_waitq, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='ctx'> 		while (test_bit(IVTV_F_I_DMA, &amp;itv-&gt;i_flags)) {</div><div class='ctx'> 			got_sig = signal_pending(current);</div><div class='hunk'>@@ -188,6 +189,7 @@ int ivtv_set_speed(struct ivtv *itv, int speed)</div><div class='ctx'> 			schedule();</div><div class='ctx'> 		}</div><div class='ctx'> 		finish_wait(&amp;itv-&gt;dma_waitq, &amp;wait);</div><div class='add'>+		mutex_lock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> 		if (got_sig)</div><div class='ctx'> 			return -EINTR;</div><div class='ctx'> </div><div class='hunk'>@@ -1107,6 +1109,7 @@ void ivtv_s_std_dec(struct ivtv *itv, v4l2_std_id *std)</div><div class='ctx'> 	 * happens within the first 100 lines of the top field.</div><div class='ctx'> 	 * Make 4 attempts to sync to the decoder before giving up.</div><div class='ctx'> 	 */</div><div class='add'>+	mutex_unlock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> 	for (f = 0; f &lt; 4; f++) {</div><div class='ctx'> 		prepare_to_wait(&amp;itv-&gt;vsync_waitq, &amp;wait,</div><div class='ctx'> 				TASK_UNINTERRUPTIBLE);</div><div class='hunk'>@@ -1115,6 +1118,7 @@ void ivtv_s_std_dec(struct ivtv *itv, v4l2_std_id *std)</div><div class='ctx'> 		schedule_timeout(msecs_to_jiffies(25));</div><div class='ctx'> 	}</div><div class='ctx'> 	finish_wait(&amp;itv-&gt;vsync_waitq, &amp;wait);</div><div class='add'>+	mutex_lock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (f == 4)</div><div class='ctx'> 		IVTV_WARN("Mode change failed to sync to decoder\n");</div><div class='hunk'>@@ -1842,8 +1846,7 @@ static long ivtv_default(struct file *file, void *fh, bool valid_prio,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long ivtv_serialized_ioctl(struct ivtv *itv, struct file *filp,</div><div class='del'>-		unsigned int cmd, unsigned long arg)</div><div class='add'>+long ivtv_v4l2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct video_device *vfd = video_devdata(filp);</div><div class='ctx'> 	long ret;</div><div class='hunk'>@@ -1855,21 +1858,6 @@ static long ivtv_serialized_ioctl(struct ivtv *itv, struct file *filp,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-long ivtv_v4l2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct ivtv_open_id *id = fh2id(filp-&gt;private_data);</div><div class='del'>-	struct ivtv *itv = id-&gt;itv;</div><div class='del'>-	long res;</div><div class='del'>-</div><div class='del'>-	/* DQEVENT can block, so this should not run with the serialize lock */</div><div class='del'>-	if (cmd == VIDIOC_DQEVENT)</div><div class='del'>-		return ivtv_serialized_ioctl(itv, filp, cmd, arg);</div><div class='del'>-	mutex_lock(&amp;itv-&gt;serialize_lock);</div><div class='del'>-	res = ivtv_serialized_ioctl(itv, filp, cmd, arg);</div><div class='del'>-	mutex_unlock(&amp;itv-&gt;serialize_lock);</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct v4l2_ioctl_ops ivtv_ioctl_ops = {</div><div class='ctx'> 	.vidioc_querycap    		    = ivtv_querycap,</div><div class='ctx'> 	.vidioc_s_audio     		    = ivtv_s_audio,</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-irq.c b/drivers/media/video/ivtv/ivtv-irq.c<br/>index 9c29e964d400..1b3b9578bf47 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ivtv/ivtv-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/ivtv/ivtv-irq.c</a></div><div class='hunk'>@@ -288,13 +288,13 @@ static void dma_post(struct ivtv_stream *s)</div><div class='ctx'> 			ivtv_process_vbi_data(itv, buf, 0, s-&gt;type);</div><div class='ctx'> 			s-&gt;q_dma.bytesused += buf-&gt;bytesused;</div><div class='ctx'> 		}</div><div class='del'>-		if (s-&gt;id == -1) {</div><div class='add'>+		if (s-&gt;fh == NULL) {</div><div class='ctx'> 			ivtv_queue_move(s, &amp;s-&gt;q_dma, NULL, &amp;s-&gt;q_free, 0);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	ivtv_queue_move(s, &amp;s-&gt;q_dma, NULL, &amp;s-&gt;q_full, s-&gt;q_dma.bytesused);</div><div class='del'>-	if (s-&gt;id != -1)</div><div class='add'>+	if (s-&gt;fh)</div><div class='ctx'> 		wake_up(&amp;s-&gt;waitq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c<br/>index e7794dc1330e..c6e28b4ebbed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-streams.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ivtv/ivtv-streams.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-streams.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/ivtv/ivtv-streams.c</a></div><div class='hunk'>@@ -159,7 +159,6 @@ static void ivtv_stream_init(struct ivtv *itv, int type)</div><div class='ctx'> 		s-&gt;buffers = (itv-&gt;options.kilobytes[type] * 1024 + s-&gt;buf_size - 1) / s-&gt;buf_size;</div><div class='ctx'> 	spin_lock_init(&amp;s-&gt;qlock);</div><div class='ctx'> 	init_waitqueue_head(&amp;s-&gt;waitq);</div><div class='del'>-	s-&gt;id = -1;</div><div class='ctx'> 	s-&gt;sg_handle = IVTV_DMA_UNMAPPED;</div><div class='ctx'> 	ivtv_queue_init(&amp;s-&gt;q_free);</div><div class='ctx'> 	ivtv_queue_init(&amp;s-&gt;q_full);</div><div class='hunk'>@@ -214,6 +213,7 @@ static int ivtv_prep_dev(struct ivtv *itv, int type)</div><div class='ctx'> 	s-&gt;vdev-&gt;fops = ivtv_stream_info[type].fops;</div><div class='ctx'> 	s-&gt;vdev-&gt;release = video_device_release;</div><div class='ctx'> 	s-&gt;vdev-&gt;tvnorms = V4L2_STD_ALL;</div><div class='add'>+	s-&gt;vdev-&gt;lock = &amp;itv-&gt;serialize_lock;</div><div class='ctx'> 	set_bit(V4L2_FL_USE_FH_PRIO, &amp;s-&gt;vdev-&gt;flags);</div><div class='ctx'> 	ivtv_set_funcs(s-&gt;vdev);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtv-yuv.c b/drivers/media/video/ivtv/ivtv-yuv.c<br/>index dcbab6ad4c26..2ad65eb29832 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-yuv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ivtv/ivtv-yuv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtv-yuv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/ivtv/ivtv-yuv.c</a></div><div class='hunk'>@@ -1149,23 +1149,37 @@ int ivtv_yuv_udma_stream_frame(struct ivtv *itv, void __user *src)</div><div class='ctx'> {</div><div class='ctx'> 	struct yuv_playback_info *yi = &amp;itv-&gt;yuv_info;</div><div class='ctx'> 	struct ivtv_dma_frame dma_args;</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='ctx'> 	ivtv_yuv_setup_stream_frame(itv);</div><div class='ctx'> </div><div class='ctx'> 	/* We only need to supply source addresses for this */</div><div class='ctx'> 	dma_args.y_source = src;</div><div class='ctx'> 	dma_args.uv_source = src + 720 * ((yi-&gt;v4l2_src_h + 31) &amp; ~31);</div><div class='del'>-	return ivtv_yuv_udma_frame(itv, &amp;dma_args);</div><div class='add'>+	/* Wait for frame DMA. Note that serialize_lock is locked,</div><div class='add'>+	   so to allow other processes to access the driver while</div><div class='add'>+	   we are waiting unlock first and later lock again. */</div><div class='add'>+	mutex_unlock(&amp;itv-&gt;serialize_lock);</div><div class='add'>+	res = ivtv_yuv_udma_frame(itv, &amp;dma_args);</div><div class='add'>+	mutex_lock(&amp;itv-&gt;serialize_lock);</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* IVTV_IOC_DMA_FRAME ioctl handler */</div><div class='ctx'> int ivtv_yuv_prep_frame(struct ivtv *itv, struct ivtv_dma_frame *args)</div><div class='ctx'> {</div><div class='del'>-/*	IVTV_DEBUG_INFO("yuv_prep_frame\n"); */</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='add'>+/*	IVTV_DEBUG_INFO("yuv_prep_frame\n"); */</div><div class='ctx'> 	ivtv_yuv_next_free(itv);</div><div class='ctx'> 	ivtv_yuv_setup_frame(itv, args);</div><div class='del'>-	return ivtv_yuv_udma_frame(itv, args);</div><div class='add'>+	/* Wait for frame DMA. Note that serialize_lock is locked,</div><div class='add'>+	   so to allow other processes to access the driver while</div><div class='add'>+	   we are waiting unlock first and later lock again. */</div><div class='add'>+	mutex_unlock(&amp;itv-&gt;serialize_lock);</div><div class='add'>+	res = ivtv_yuv_udma_frame(itv, args);</div><div class='add'>+	mutex_lock(&amp;itv-&gt;serialize_lock);</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ivtv_yuv_close(struct ivtv *itv)</div><div class='hunk'>@@ -1174,7 +1188,9 @@ void ivtv_yuv_close(struct ivtv *itv)</div><div class='ctx'> 	int h_filter, v_filter_1, v_filter_2;</div><div class='ctx'> </div><div class='ctx'> 	IVTV_DEBUG_YUV("ivtv_yuv_close\n");</div><div class='add'>+	mutex_unlock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> 	ivtv_waitq(&amp;itv-&gt;vsync_waitq);</div><div class='add'>+	mutex_lock(&amp;itv-&gt;serialize_lock);</div><div class='ctx'> </div><div class='ctx'> 	yi-&gt;running = 0;</div><div class='ctx'> 	atomic_set(&amp;yi-&gt;next_dma_frame, -1);</div><div class='head'>diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c<br/>index 6b7c9c823330..d0fbfcf7133d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtvfb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ivtv/ivtvfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ivtv/ivtvfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/ivtv/ivtvfb.c</a></div><div class='hunk'>@@ -58,7 +58,7 @@</div><div class='ctx'> /* card parameters */</div><div class='ctx'> static int ivtvfb_card_id = -1;</div><div class='ctx'> static int ivtvfb_debug = 0;</div><div class='del'>-static int osd_laced;</div><div class='add'>+static bool osd_laced;</div><div class='ctx'> static int osd_depth;</div><div class='ctx'> static int osd_upper;</div><div class='ctx'> static int osd_left;</div><div class='head'>diff --git a/drivers/media/video/m5mols/m5mols.h b/drivers/media/video/m5mols/m5mols.h<br/>index 82c8817bd32d..4b021e1ee5f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/m5mols/m5mols.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/m5mols/m5mols.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/m5mols/m5mols.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/m5mols/m5mols.h</a></div><div class='hunk'>@@ -163,7 +163,6 @@ struct m5mols_version {</div><div class='ctx'>  * @ffmt: current fmt according to resolution type</div><div class='ctx'>  * @res_type: current resolution type</div><div class='ctx'>  * @irq_waitq: waitqueue for the capture</div><div class='del'>- * @work_irq: workqueue for the IRQ</div><div class='ctx'>  * @flags: state variable for the interrupt handler</div><div class='ctx'>  * @handle: control handler</div><div class='ctx'>  * @autoexposure: Auto Exposure control</div><div class='hunk'>@@ -175,14 +174,12 @@ struct m5mols_version {</div><div class='ctx'>  * @ver: information of the version</div><div class='ctx'>  * @cap: the capture mode attributes</div><div class='ctx'>  * @power: current sensor's power status</div><div class='del'>- * @ctrl_sync: true means all controls of the sensor are initialized</div><div class='del'>- * @int_capture: true means the capture interrupt is issued once</div><div class='add'>+ * @isp_ready: 1 when the ISP controller has completed booting</div><div class='add'>+ * @ctrl_sync: 1 when the control handler state is restored in H/W</div><div class='ctx'>  * @lock_ae: true means the Auto Exposure is locked</div><div class='ctx'>  * @lock_awb: true means the Aut WhiteBalance is locked</div><div class='ctx'>  * @resolution:	register value for current resolution</div><div class='del'>- * @interrupt: register value for current interrupt status</div><div class='ctx'>  * @mode: register value for current operation mode</div><div class='del'>- * @mode_save: register value for current operation mode for saving</div><div class='ctx'>  * @set_power: optional power callback to the board code</div><div class='ctx'>  */</div><div class='ctx'> struct m5mols_info {</div><div class='hunk'>@@ -191,16 +188,16 @@ struct m5mols_info {</div><div class='ctx'> 	struct media_pad pad;</div><div class='ctx'> 	struct v4l2_mbus_framefmt ffmt[M5MOLS_RESTYPE_MAX];</div><div class='ctx'> 	int res_type;</div><div class='add'>+</div><div class='ctx'> 	wait_queue_head_t irq_waitq;</div><div class='del'>-	struct work_struct work_irq;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	atomic_t irq_done;</div><div class='ctx'> </div><div class='ctx'> 	struct v4l2_ctrl_handler handle;</div><div class='add'>+</div><div class='ctx'> 	/* Autoexposure/exposure control cluster */</div><div class='del'>-	struct {</div><div class='del'>-		struct v4l2_ctrl *autoexposure;</div><div class='del'>-		struct v4l2_ctrl *exposure;</div><div class='del'>-	};</div><div class='add'>+	struct v4l2_ctrl *autoexposure;</div><div class='add'>+	struct v4l2_ctrl *exposure;</div><div class='add'>+</div><div class='ctx'> 	struct v4l2_ctrl *autowb;</div><div class='ctx'> 	struct v4l2_ctrl *colorfx;</div><div class='ctx'> 	struct v4l2_ctrl *saturation;</div><div class='hunk'>@@ -208,21 +205,19 @@ struct m5mols_info {</div><div class='ctx'> </div><div class='ctx'> 	struct m5mols_version ver;</div><div class='ctx'> 	struct m5mols_capture cap;</div><div class='del'>-	bool power;</div><div class='del'>-	bool ctrl_sync;</div><div class='add'>+</div><div class='add'>+	unsigned int isp_ready:1;</div><div class='add'>+	unsigned int power:1;</div><div class='add'>+	unsigned int ctrl_sync:1;</div><div class='add'>+</div><div class='ctx'> 	bool lock_ae;</div><div class='ctx'> 	bool lock_awb;</div><div class='ctx'> 	u8 resolution;</div><div class='del'>-	u8 interrupt;</div><div class='ctx'> 	u8 mode;</div><div class='del'>-	u8 mode_save;</div><div class='add'>+</div><div class='ctx'> 	int (*set_power)(struct device *dev, int on);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define ST_CAPT_IRQ 0</div><div class='del'>-</div><div class='del'>-#define is_powered(__info) (__info-&gt;power)</div><div class='del'>-#define is_ctrl_synced(__info) (__info-&gt;ctrl_sync)</div><div class='ctx'> #define is_available_af(__info)	(__info-&gt;ver.af)</div><div class='ctx'> #define is_code(__code, __type) (__code == m5mols_default_ffmt[__type].code)</div><div class='ctx'> #define is_manufacturer(__info, __manufacturer)	\</div><div class='hunk'>@@ -257,7 +252,15 @@ int m5mols_read_u8(struct v4l2_subdev *sd, u32 reg_comb, u8 *val);</div><div class='ctx'> int m5mols_read_u16(struct v4l2_subdev *sd, u32 reg_comb, u16 *val);</div><div class='ctx'> int m5mols_read_u32(struct v4l2_subdev *sd, u32 reg_comb, u32 *val);</div><div class='ctx'> int m5mols_write(struct v4l2_subdev *sd, u32 reg_comb, u32 val);</div><div class='del'>-int m5mols_busy(struct v4l2_subdev *sd, u8 category, u8 cmd, u8 value);</div><div class='add'>+</div><div class='add'>+int m5mols_busy_wait(struct v4l2_subdev *sd, u32 reg, u32 value, u32 mask,</div><div class='add'>+		     int timeout);</div><div class='add'>+</div><div class='add'>+/* Mask value for busy waiting until M-5MOLS I2C interface is initialized */</div><div class='add'>+#define M5MOLS_I2C_RDY_WAIT_FL		(1 &lt;&lt; 16)</div><div class='add'>+/* ISP state transition timeout, in ms */</div><div class='add'>+#define M5MOLS_MODE_CHANGE_TIMEOUT	200</div><div class='add'>+#define M5MOLS_BUSY_WAIT_DEF_TIMEOUT	250</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Mode operation of the M-5MOLS</div><div class='hunk'>@@ -282,7 +285,8 @@ int m5mols_busy(struct v4l2_subdev *sd, u8 category, u8 cmd, u8 value);</div><div class='ctx'> int m5mols_mode(struct m5mols_info *info, u8 mode);</div><div class='ctx'> </div><div class='ctx'> int m5mols_enable_interrupt(struct v4l2_subdev *sd, u8 reg);</div><div class='del'>-int m5mols_sync_controls(struct m5mols_info *info);</div><div class='add'>+int m5mols_wait_interrupt(struct v4l2_subdev *sd, u8 condition, u32 timeout);</div><div class='add'>+int m5mols_restore_controls(struct m5mols_info *info);</div><div class='ctx'> int m5mols_start_capture(struct m5mols_info *info);</div><div class='ctx'> int m5mols_do_scenemode(struct m5mols_info *info, u8 mode);</div><div class='ctx'> int m5mols_lock_3a(struct m5mols_info *info, bool lock);</div><div class='head'>diff --git a/drivers/media/video/m5mols/m5mols_capture.c b/drivers/media/video/m5mols/m5mols_capture.c<br/>index 3248ac805711..ba25e8e2ba4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/m5mols/m5mols_capture.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/m5mols/m5mols_capture.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/m5mols/m5mols_capture.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/m5mols/m5mols_capture.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The Capture code for Fujitsu M-5MOLS ISP</div><div class='ctx'>  *</div><div class='hunk'>@@ -25,26 +26,11 @@</div><div class='ctx'> #include &lt;media/v4l2-device.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-subdev.h&gt;</div><div class='ctx'> #include &lt;media/m5mols.h&gt;</div><div class='add'>+#include &lt;media/s5p_fimc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "m5mols.h"</div><div class='ctx'> #include "m5mols_reg.h"</div><div class='ctx'> </div><div class='del'>-static int m5mols_capture_error_handler(struct m5mols_info *info,</div><div class='del'>-					int timeout)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* Disable all interrupts and clear relevant interrupt staus bits */</div><div class='del'>-	ret = m5mols_write(&amp;info-&gt;sd, SYSTEM_INT_ENABLE,</div><div class='del'>-			   info-&gt;interrupt &amp; ~(REG_INT_CAPTURE));</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (timeout == 0)</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> /**</div><div class='ctx'>  * m5mols_read_rational - I2C read of a rational number</div><div class='ctx'>  *</div><div class='hunk'>@@ -121,69 +107,54 @@ int m5mols_start_capture(struct m5mols_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct v4l2_subdev *sd = &amp;info-&gt;sd;</div><div class='ctx'> 	u8 resolution = info-&gt;resolution;</div><div class='del'>-	int timeout;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Preparing capture. Setting control &amp; interrupt before entering</div><div class='del'>-	 * capture mode</div><div class='del'>-	 *</div><div class='del'>-	 * 1) change to MONITOR mode for operating control &amp; interrupt</div><div class='del'>-	 * 2) set controls (considering v4l2_control value &amp; lock 3A)</div><div class='del'>-	 * 3) set interrupt</div><div class='del'>-	 * 4) change to CAPTURE mode</div><div class='add'>+	 * Synchronize the controls, set the capture frame resolution and color</div><div class='add'>+	 * format. The frame capture is initiated during switching from Monitor</div><div class='add'>+	 * to Capture mode.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = m5mols_mode(info, REG_MONITOR);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = m5mols_sync_controls(info);</div><div class='add'>+		ret = m5mols_restore_controls(info);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = m5mols_lock_3a(info, true);</div><div class='add'>+		ret = m5mols_write(sd, CAPP_YUVOUT_MAIN, REG_JPEG);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = m5mols_write(sd, CAPP_MAIN_IMAGE_SIZE, resolution);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = m5mols_enable_interrupt(sd, REG_INT_CAPTURE);</div><div class='add'>+		ret = m5mols_lock_3a(info, true);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		ret = m5mols_mode(info, REG_CAPTURE);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		/* Wait for capture interrupt, after changing capture mode */</div><div class='del'>-		timeout = wait_event_interruptible_timeout(info-&gt;irq_waitq,</div><div class='del'>-					   test_bit(ST_CAPT_IRQ, &amp;info-&gt;flags),</div><div class='del'>-					   msecs_to_jiffies(2000));</div><div class='del'>-		if (test_and_clear_bit(ST_CAPT_IRQ, &amp;info-&gt;flags))</div><div class='del'>-			ret = m5mols_capture_error_handler(info, timeout);</div><div class='del'>-	}</div><div class='add'>+	if (!ret)</div><div class='add'>+		/* Wait until a frame is captured to ISP internal memory */</div><div class='add'>+		ret = m5mols_wait_interrupt(sd, REG_INT_CAPTURE, 2000);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		ret = m5mols_lock_3a(info, false);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * Starting capture. Setting capture frame count and resolution and</div><div class='del'>-	 * the format(available format: JPEG, Bayer RAW, YUV).</div><div class='del'>-	 *</div><div class='del'>-	 * 1) select single or multi(enable to 25), format, size</div><div class='del'>-	 * 2) set interrupt</div><div class='del'>-	 * 3) start capture(for main image, now)</div><div class='del'>-	 * 4) get information</div><div class='del'>-	 * 5) notify file size to v4l2 device(e.g, to s5p-fimc v4l2 device)</div><div class='add'>+	 * Initiate the captured data transfer to a MIPI-CSI receiver.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = m5mols_write(sd, CAPC_SEL_FRAME, 1);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = m5mols_write(sd, CAPP_YUVOUT_MAIN, REG_JPEG);</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = m5mols_write(sd, CAPP_MAIN_IMAGE_SIZE, resolution);</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = m5mols_enable_interrupt(sd, REG_INT_CAPTURE);</div><div class='del'>-	if (!ret)</div><div class='ctx'> 		ret = m5mols_write(sd, CAPC_START, REG_CAP_START_MAIN);</div><div class='ctx'> 	if (!ret) {</div><div class='add'>+		bool captured = false;</div><div class='add'>+		unsigned int size;</div><div class='add'>+</div><div class='ctx'> 		/* Wait for the capture completion interrupt */</div><div class='del'>-		timeout = wait_event_interruptible_timeout(info-&gt;irq_waitq,</div><div class='del'>-					   test_bit(ST_CAPT_IRQ, &amp;info-&gt;flags),</div><div class='del'>-					   msecs_to_jiffies(2000));</div><div class='del'>-		if (test_and_clear_bit(ST_CAPT_IRQ, &amp;info-&gt;flags)) {</div><div class='add'>+		ret = m5mols_wait_interrupt(sd, REG_INT_CAPTURE, 2000);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			captured = true;</div><div class='ctx'> 			ret = m5mols_capture_info(info);</div><div class='del'>-			if (!ret)</div><div class='del'>-				v4l2_subdev_notify(sd, 0, &amp;info-&gt;cap.total);</div><div class='ctx'> 		}</div><div class='add'>+		size = captured ? info-&gt;cap.main : 0;</div><div class='add'>+		v4l2_dbg(1, m5mols_debug, sd, "%s: size: %d, thumb.: %d B\n",</div><div class='add'>+			 __func__, size, info-&gt;cap.thumb);</div><div class='add'>+</div><div class='add'>+		v4l2_subdev_notify(sd, S5P_FIMC_TX_END_NOTIFY, &amp;size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return m5mols_capture_error_handler(info, timeout);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/m5mols/m5mols_core.c b/drivers/media/video/m5mols/m5mols_core.c<br/>index e0f09e531800..93d768db9f33 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/m5mols/m5mols_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/m5mols/m5mols_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/m5mols/m5mols_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/m5mols/m5mols_core.c</a></div><div class='hunk'>@@ -135,10 +135,13 @@ static u32 m5mols_swap_byte(u8 *data, u8 length)</div><div class='ctx'>  * @reg: combination of size, category and command for the I2C packet</div><div class='ctx'>  * @size: desired size of I2C packet</div><div class='ctx'>  * @val: read value</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, or else negative errno.</div><div class='ctx'>  */</div><div class='ctx'> static int m5mols_read(struct v4l2_subdev *sd, u32 size, u32 reg, u32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = v4l2_get_subdevdata(sd);</div><div class='add'>+	struct m5mols_info *info = to_m5mols(sd);</div><div class='ctx'> 	u8 rbuf[M5MOLS_I2C_MAX_SIZE + 1];</div><div class='ctx'> 	u8 category = I2C_CATEGORY(reg);</div><div class='ctx'> 	u8 cmd = I2C_COMMAND(reg);</div><div class='hunk'>@@ -168,15 +171,17 @@ static int m5mols_read(struct v4l2_subdev *sd, u32 size, u32 reg, u32 *val)</div><div class='ctx'> 	usleep_range(200, 200);</div><div class='ctx'> </div><div class='ctx'> 	ret = i2c_transfer(client-&gt;adapter, msg, 2);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		v4l2_err(sd, "read failed: size:%d cat:%02x cmd:%02x. %d\n",</div><div class='del'>-			 size, category, cmd, ret);</div><div class='del'>-		return ret;</div><div class='add'>+</div><div class='add'>+	if (ret == 2) {</div><div class='add'>+		*val = m5mols_swap_byte(&amp;rbuf[1], size);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*val = m5mols_swap_byte(&amp;rbuf[1], size);</div><div class='add'>+	if (info-&gt;isp_ready)</div><div class='add'>+		v4l2_err(sd, "read failed: size:%d cat:%02x cmd:%02x. %d\n",</div><div class='add'>+			 size, category, cmd, ret);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret &lt; 0 ? ret : -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int m5mols_read_u8(struct v4l2_subdev *sd, u32 reg, u8 *val)</div><div class='hunk'>@@ -229,10 +234,13 @@ int m5mols_read_u32(struct v4l2_subdev *sd, u32 reg, u32 *val)</div><div class='ctx'>  * m5mols_write - I2C command write function</div><div class='ctx'>  * @reg: combination of size, category and command for the I2C packet</div><div class='ctx'>  * @val: value to write</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, or else negative errno.</div><div class='ctx'>  */</div><div class='ctx'> int m5mols_write(struct v4l2_subdev *sd, u32 reg, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = v4l2_get_subdevdata(sd);</div><div class='add'>+	struct m5mols_info *info = to_m5mols(sd);</div><div class='ctx'> 	u8 wbuf[M5MOLS_I2C_MAX_SIZE + 4];</div><div class='ctx'> 	u8 category = I2C_CATEGORY(reg);</div><div class='ctx'> 	u8 cmd = I2C_COMMAND(reg);</div><div class='hunk'>@@ -263,28 +271,45 @@ int m5mols_write(struct v4l2_subdev *sd, u32 reg, u32 val)</div><div class='ctx'> 	usleep_range(200, 200);</div><div class='ctx'> </div><div class='ctx'> 	ret = i2c_transfer(client-&gt;adapter, msg, 1);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		v4l2_err(sd, "write failed: size:%d cat:%02x cmd:%02x. %d\n",</div><div class='del'>-			size, category, cmd, ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+	if (ret == 1)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	if (info-&gt;isp_ready)</div><div class='add'>+		v4l2_err(sd, "write failed: cat:%02x cmd:%02x ret:%d\n",</div><div class='add'>+			 category, cmd, ret);</div><div class='add'>+</div><div class='add'>+	return ret &lt; 0 ? ret : -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int m5mols_busy(struct v4l2_subdev *sd, u8 category, u8 cmd, u8 mask)</div><div class='add'>+/**</div><div class='add'>+ * m5mols_busy_wait - Busy waiting with I2C register polling</div><div class='add'>+ * @reg: the I2C_REG() address of an 8-bit status register to check</div><div class='add'>+ * @value: expected status register value</div><div class='add'>+ * @mask: bit mask for the read status register value</div><div class='add'>+ * @timeout: timeout in miliseconds, or -1 for default timeout</div><div class='add'>+ *</div><div class='add'>+ * The @reg register value is ORed with @mask before comparing with @value.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if the requested condition became true within less than</div><div class='add'>+ *         @timeout ms, or else negative errno.</div><div class='add'>+ */</div><div class='add'>+int m5mols_busy_wait(struct v4l2_subdev *sd, u32 reg, u32 value, u32 mask,</div><div class='add'>+		     int timeout)</div><div class='ctx'> {</div><div class='del'>-	u8 busy;</div><div class='del'>-	int i;</div><div class='del'>-	int ret;</div><div class='add'>+	int ms = timeout &lt; 0 ? M5MOLS_BUSY_WAIT_DEF_TIMEOUT : timeout;</div><div class='add'>+	unsigned long end = jiffies + msecs_to_jiffies(ms);</div><div class='add'>+	u8 status;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; M5MOLS_I2C_CHECK_RETRY; i++) {</div><div class='del'>-		ret = m5mols_read_u8(sd, I2C_REG(category, cmd, 1), &amp;busy);</div><div class='del'>-		if (ret &lt; 0)</div><div class='add'>+	do {</div><div class='add'>+		int ret = m5mols_read_u8(sd, reg, &amp;status);</div><div class='add'>+</div><div class='add'>+		if (ret &lt; 0 &amp;&amp; !(mask &amp; M5MOLS_I2C_RDY_WAIT_FL))</div><div class='ctx'> 			return ret;</div><div class='del'>-		if ((busy &amp; mask) == mask)</div><div class='add'>+		if (!ret &amp;&amp; (status &amp; mask &amp; 0xff) == (value &amp; 0xff))</div><div class='ctx'> 			return 0;</div><div class='del'>-	}</div><div class='add'>+		usleep_range(100, 250);</div><div class='add'>+	} while (ms &gt; 0 &amp;&amp; time_is_after_jiffies(end));</div><div class='add'>+</div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -307,6 +332,20 @@ int m5mols_enable_interrupt(struct v4l2_subdev *sd, u8 reg)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int m5mols_wait_interrupt(struct v4l2_subdev *sd, u8 irq_mask, u32 timeout)</div><div class='add'>+{</div><div class='add'>+	struct m5mols_info *info = to_m5mols(sd);</div><div class='add'>+</div><div class='add'>+	int ret = wait_event_interruptible_timeout(info-&gt;irq_waitq,</div><div class='add'>+				atomic_add_unless(&amp;info-&gt;irq_done, -1, 0),</div><div class='add'>+				msecs_to_jiffies(timeout));</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return ret ? ret : -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	return m5mols_busy_wait(sd, SYSTEM_INT_FACTOR, irq_mask,</div><div class='add'>+				M5MOLS_I2C_RDY_WAIT_FL | irq_mask, -1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * m5mols_reg_mode - Write the mode and check busy status</div><div class='ctx'>  *</div><div class='hunk'>@@ -316,8 +355,10 @@ int m5mols_enable_interrupt(struct v4l2_subdev *sd, u8 reg)</div><div class='ctx'> static int m5mols_reg_mode(struct v4l2_subdev *sd, u8 mode)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = m5mols_write(sd, SYSTEM_SYSMODE, mode);</div><div class='del'>-</div><div class='del'>-	return ret ? ret : m5mols_busy(sd, CAT_SYSTEM, CAT0_SYSMODE, mode);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	return m5mols_busy_wait(sd, SYSTEM_SYSMODE, mode, 0xff,</div><div class='add'>+				M5MOLS_MODE_CHANGE_TIMEOUT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -338,13 +379,13 @@ int m5mols_mode(struct m5mols_info *info, u8 mode)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = m5mols_read_u8(sd, SYSTEM_SYSMODE, &amp;reg);</div><div class='del'>-	if ((!ret &amp;&amp; reg == mode) || ret)</div><div class='add'>+	if (ret || reg == mode)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	switch (reg) {</div><div class='ctx'> 	case REG_PARAMETER:</div><div class='ctx'> 		ret = m5mols_reg_mode(sd, REG_MONITOR);</div><div class='del'>-		if (!ret &amp;&amp; mode == REG_MONITOR)</div><div class='add'>+		if (mode == REG_MONITOR)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			ret = m5mols_reg_mode(sd, REG_CAPTURE);</div><div class='hunk'>@@ -361,7 +402,7 @@ int m5mols_mode(struct m5mols_info *info, u8 mode)</div><div class='ctx'> </div><div class='ctx'> 	case REG_CAPTURE:</div><div class='ctx'> 		ret = m5mols_reg_mode(sd, REG_MONITOR);</div><div class='del'>-		if (!ret &amp;&amp; mode == REG_MONITOR)</div><div class='add'>+		if (mode == REG_MONITOR)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			ret = m5mols_reg_mode(sd, REG_PARAMETER);</div><div class='hunk'>@@ -570,26 +611,25 @@ static struct v4l2_subdev_pad_ops m5mols_pad_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * m5mols_sync_controls - Apply default scene mode and the current controls</div><div class='add'>+ * m5mols_restore_controls - Apply current control values to the registers</div><div class='ctx'>  *</div><div class='del'>- * This is used only streaming for syncing between v4l2_ctrl framework and</div><div class='del'>- * m5mols's controls. First, do the scenemode to the sensor, then call</div><div class='del'>- * v4l2_ctrl_handler_setup. It can be same between some commands and</div><div class='del'>- * the scenemode's in the default v4l2_ctrls. But, such commands of control</div><div class='del'>- * should be prior to the scenemode's one.</div><div class='add'>+ * m5mols_do_scenemode() handles all parameters for which there is yet no</div><div class='add'>+ * individual control. It should be replaced at some point by setting each</div><div class='add'>+ * control individually, in required register set up order.</div><div class='ctx'>  */</div><div class='del'>-int m5mols_sync_controls(struct m5mols_info *info)</div><div class='add'>+int m5mols_restore_controls(struct m5mols_info *info)</div><div class='ctx'> {</div><div class='del'>-	int ret = -EINVAL;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!is_ctrl_synced(info)) {</div><div class='del'>-		ret = m5mols_do_scenemode(info, REG_SCENE_NORMAL);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+	if (info-&gt;ctrl_sync)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		v4l2_ctrl_handler_setup(&amp;info-&gt;handle);</div><div class='del'>-		info-&gt;ctrl_sync = true;</div><div class='del'>-	}</div><div class='add'>+	ret = m5mols_do_scenemode(info, REG_SCENE_NORMAL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = v4l2_ctrl_handler_setup(&amp;info-&gt;handle);</div><div class='add'>+	info-&gt;ctrl_sync = !ret;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -613,7 +653,7 @@ static int m5mols_start_monitor(struct m5mols_info *info)</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		ret = m5mols_mode(info, REG_MONITOR);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = m5mols_sync_controls(info);</div><div class='add'>+		ret = m5mols_restore_controls(info);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -645,17 +685,25 @@ static int m5mols_s_ctrl(struct v4l2_ctrl *ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	struct v4l2_subdev *sd = to_sd(ctrl);</div><div class='ctx'> 	struct m5mols_info *info = to_m5mols(sd);</div><div class='add'>+	int ispstate = info-&gt;mode;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	info-&gt;mode_save = info-&gt;mode;</div><div class='add'>+	/*</div><div class='add'>+	 * If needed, defer restoring the controls until</div><div class='add'>+	 * the device is fully initialized.</div><div class='add'>+	 */</div><div class='add'>+	if (!info-&gt;isp_ready) {</div><div class='add'>+		info-&gt;ctrl_sync = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = m5mols_mode(info, REG_PARAMETER);</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = m5mols_set_ctrl(ctrl);</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = m5mols_mode(info, info-&gt;mode_save);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = m5mols_set_ctrl(ctrl);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	return m5mols_mode(info, ispstate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct v4l2_ctrl_ops m5mols_ctrl_ops = {</div><div class='hunk'>@@ -669,10 +717,10 @@ static int m5mols_sensor_power(struct m5mols_info *info, bool enable)</div><div class='ctx'> 	const struct m5mols_platform_data *pdata = info-&gt;pdata;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (enable) {</div><div class='del'>-		if (is_powered(info))</div><div class='del'>-			return 0;</div><div class='add'>+	if (info-&gt;power == enable)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='add'>+	if (enable) {</div><div class='ctx'> 		if (info-&gt;set_power) {</div><div class='ctx'> 			ret = info-&gt;set_power(&amp;client-&gt;dev, 1);</div><div class='ctx'> 			if (ret)</div><div class='hunk'>@@ -686,15 +734,11 @@ static int m5mols_sensor_power(struct m5mols_info *info, bool enable)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		gpio_set_value(pdata-&gt;gpio_reset, !pdata-&gt;reset_polarity);</div><div class='del'>-		usleep_range(1000, 1000);</div><div class='del'>-		info-&gt;power = true;</div><div class='add'>+		info-&gt;power = 1;</div><div class='ctx'> </div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!is_powered(info))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	ret = regulator_bulk_disable(ARRAY_SIZE(supplies), supplies);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -703,8 +747,9 @@ static int m5mols_sensor_power(struct m5mols_info *info, bool enable)</div><div class='ctx'> 		info-&gt;set_power(&amp;client-&gt;dev, 0);</div><div class='ctx'> </div><div class='ctx'> 	gpio_set_value(pdata-&gt;gpio_reset, pdata-&gt;reset_polarity);</div><div class='del'>-	usleep_range(1000, 1000);</div><div class='del'>-	info-&gt;power = false;</div><div class='add'>+</div><div class='add'>+	info-&gt;isp_ready = 0;</div><div class='add'>+	info-&gt;power = 0;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -717,21 +762,29 @@ int __attribute__ ((weak)) m5mols_update_fw(struct v4l2_subdev *sd,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * m5mols_sensor_armboot - Booting M-5MOLS internal ARM core.</div><div class='add'>+ * m5mols_fw_start - M-5MOLS internal ARM controller initialization</div><div class='ctx'>  *</div><div class='del'>- * Booting internal ARM core makes the M-5MOLS is ready for getting commands</div><div class='del'>- * with I2C. It's the first thing to be done after it powered up. It must wait</div><div class='del'>- * at least 520ms recommended by M-5MOLS datasheet, after executing arm booting.</div><div class='add'>+ * Execute the M-5MOLS internal ARM controller initialization sequence.</div><div class='add'>+ * This function should be called after the supply voltage has been</div><div class='add'>+ * applied and before any requests to the device are made.</div><div class='ctx'>  */</div><div class='del'>-static int m5mols_sensor_armboot(struct v4l2_subdev *sd)</div><div class='add'>+static int m5mols_fw_start(struct v4l2_subdev *sd)</div><div class='ctx'> {</div><div class='add'>+	struct m5mols_info *info = to_m5mols(sd);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = m5mols_write(sd, FLASH_CAM_START, REG_START_ARM_BOOT);</div><div class='add'>+	atomic_set(&amp;info-&gt;irq_done, 0);</div><div class='add'>+	/* Wait until I2C slave is initialized in Flash Writer mode */</div><div class='add'>+	ret = m5mols_busy_wait(sd, FLASH_CAM_START, REG_IN_FLASH_MODE,</div><div class='add'>+			       M5MOLS_I2C_RDY_WAIT_FL | 0xff, -1);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = m5mols_write(sd, FLASH_CAM_START, REG_START_ARM_BOOT);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = m5mols_wait_interrupt(sd, REG_INT_MODE, 2000);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	msleep(520);</div><div class='add'>+	info-&gt;isp_ready = 1;</div><div class='ctx'> </div><div class='ctx'> 	ret = m5mols_get_version(sd);</div><div class='ctx'> 	if (!ret)</div><div class='hunk'>@@ -743,7 +796,8 @@ static int m5mols_sensor_armboot(struct v4l2_subdev *sd)</div><div class='ctx'> </div><div class='ctx'> 	ret = m5mols_write(sd, PARM_INTERFACE, REG_INTERFACE_MIPI);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = m5mols_enable_interrupt(sd, REG_INT_AF);</div><div class='add'>+		ret = m5mols_enable_interrupt(sd,</div><div class='add'>+				REG_INT_AF | REG_INT_CAPTURE);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -780,7 +834,7 @@ static int m5mols_init_controls(struct m5mols_info *info)</div><div class='ctx'> 			4, (1 &lt;&lt; V4L2_COLORFX_BW), V4L2_COLORFX_NONE);</div><div class='ctx'> 	info-&gt;autoexposure = v4l2_ctrl_new_std_menu(&amp;info-&gt;handle,</div><div class='ctx'> 			&amp;m5mols_ctrl_ops, V4L2_CID_EXPOSURE_AUTO,</div><div class='del'>-			1, 0, V4L2_EXPOSURE_MANUAL);</div><div class='add'>+			1, 0, V4L2_EXPOSURE_AUTO);</div><div class='ctx'> </div><div class='ctx'> 	sd-&gt;ctrl_handler = &amp;info-&gt;handle;</div><div class='ctx'> 	if (info-&gt;handle.error) {</div><div class='hunk'>@@ -809,16 +863,7 @@ static int m5mols_s_power(struct v4l2_subdev *sd, int on)</div><div class='ctx'> 	if (on) {</div><div class='ctx'> 		ret = m5mols_sensor_power(info, true);</div><div class='ctx'> 		if (!ret)</div><div class='del'>-			ret = m5mols_sensor_armboot(sd);</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = m5mols_init_controls(info);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		info-&gt;ffmt[M5MOLS_RESTYPE_MONITOR] =</div><div class='del'>-			m5mols_default_ffmt[M5MOLS_RESTYPE_MONITOR];</div><div class='del'>-		info-&gt;ffmt[M5MOLS_RESTYPE_CAPTURE] =</div><div class='del'>-			m5mols_default_ffmt[M5MOLS_RESTYPE_CAPTURE];</div><div class='add'>+			ret = m5mols_fw_start(sd);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -829,17 +874,14 @@ static int m5mols_s_power(struct v4l2_subdev *sd, int on)</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			ret = m5mols_write(sd, AF_MODE, REG_AF_POWEROFF);</div><div class='ctx'> 		if (!ret)</div><div class='del'>-			ret = m5mols_busy(sd, CAT_SYSTEM, CAT0_STATUS,</div><div class='del'>-					REG_AF_IDLE);</div><div class='del'>-		if (!ret)</div><div class='del'>-			v4l2_info(sd, "Success soft-landing lens\n");</div><div class='add'>+			ret = m5mols_busy_wait(sd, SYSTEM_STATUS, REG_AF_IDLE,</div><div class='add'>+					       0xff, -1);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			v4l2_warn(sd, "Soft landing lens failed\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = m5mols_sensor_power(info, false);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		v4l2_ctrl_handler_free(&amp;info-&gt;handle);</div><div class='del'>-		info-&gt;ctrl_sync = false;</div><div class='del'>-	}</div><div class='add'>+	info-&gt;ctrl_sync = 0;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -865,52 +907,33 @@ static const struct v4l2_subdev_core_ops m5mols_core_ops = {</div><div class='ctx'> 	.log_status	= m5mols_log_status,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * V4L2 subdev internal operations</div><div class='add'>+ */</div><div class='add'>+static int m5mols_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_mbus_framefmt *format = v4l2_subdev_get_try_format(fh, 0);</div><div class='add'>+</div><div class='add'>+	*format = m5mols_default_ffmt[0];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct v4l2_subdev_internal_ops m5mols_subdev_internal_ops = {</div><div class='add'>+	.open		= m5mols_open,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct v4l2_subdev_ops m5mols_ops = {</div><div class='ctx'> 	.core		= &amp;m5mols_core_ops,</div><div class='ctx'> 	.pad		= &amp;m5mols_pad_ops,</div><div class='ctx'> 	.video		= &amp;m5mols_video_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void m5mols_irq_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct m5mols_info *info =</div><div class='del'>-		container_of(work, struct m5mols_info, work_irq);</div><div class='del'>-	struct v4l2_subdev *sd = &amp;info-&gt;sd;</div><div class='del'>-	u8 reg;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!is_powered(info) ||</div><div class='del'>-			m5mols_read_u8(sd, SYSTEM_INT_FACTOR, &amp;info-&gt;interrupt))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (info-&gt;interrupt &amp; REG_INT_MASK) {</div><div class='del'>-	case REG_INT_AF:</div><div class='del'>-		if (!is_available_af(info))</div><div class='del'>-			break;</div><div class='del'>-		ret = m5mols_read_u8(sd, AF_STATUS, &amp;reg);</div><div class='del'>-		v4l2_dbg(2, m5mols_debug, sd, "AF %s\n",</div><div class='del'>-			 reg == REG_AF_FAIL ? "Failed" :</div><div class='del'>-			 reg == REG_AF_SUCCESS ? "Success" :</div><div class='del'>-			 reg == REG_AF_IDLE ? "Idle" : "Busy");</div><div class='del'>-		break;</div><div class='del'>-	case REG_INT_CAPTURE:</div><div class='del'>-		if (!test_and_set_bit(ST_CAPT_IRQ, &amp;info-&gt;flags))</div><div class='del'>-			wake_up_interruptible(&amp;info-&gt;irq_waitq);</div><div class='del'>-</div><div class='del'>-		v4l2_dbg(2, m5mols_debug, sd, "CAPTURE\n");</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		v4l2_dbg(2, m5mols_debug, sd, "Undefined: %02x\n", reg);</div><div class='del'>-		break;</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static irqreturn_t m5mols_irq_handler(int irq, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct v4l2_subdev *sd = data;</div><div class='del'>-	struct m5mols_info *info = to_m5mols(sd);</div><div class='add'>+	struct m5mols_info *info = to_m5mols(data);</div><div class='ctx'> </div><div class='del'>-	schedule_work(&amp;info-&gt;work_irq);</div><div class='add'>+	atomic_set(&amp;info-&gt;irq_done, 1);</div><div class='add'>+	wake_up_interruptible(&amp;info-&gt;irq_waitq);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -961,7 +984,9 @@ static int __devinit m5mols_probe(struct i2c_client *client,</div><div class='ctx'> 	sd = &amp;info-&gt;sd;</div><div class='ctx'> 	strlcpy(sd-&gt;name, MODULE_NAME, sizeof(sd-&gt;name));</div><div class='ctx'> 	v4l2_i2c_subdev_init(sd, client, &amp;m5mols_ops);</div><div class='add'>+	sd-&gt;flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;</div><div class='ctx'> </div><div class='add'>+	sd-&gt;internal_ops = &amp;m5mols_subdev_internal_ops;</div><div class='ctx'> 	info-&gt;pad.flags = MEDIA_PAD_FL_SOURCE;</div><div class='ctx'> 	ret = media_entity_init(&amp;sd-&gt;entity, 1, &amp;info-&gt;pad, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -969,7 +994,6 @@ static int __devinit m5mols_probe(struct i2c_client *client,</div><div class='ctx'> 	sd-&gt;entity.type = MEDIA_ENT_T_V4L2_SUBDEV_SENSOR;</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;info-&gt;irq_waitq);</div><div class='del'>-	INIT_WORK(&amp;info-&gt;work_irq, m5mols_irq_work);</div><div class='ctx'> 	ret = request_irq(client-&gt;irq, m5mols_irq_handler,</div><div class='ctx'> 			  IRQF_TRIGGER_RISING, MODULE_NAME, sd);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -977,7 +1001,20 @@ static int __devinit m5mols_probe(struct i2c_client *client,</div><div class='ctx'> 		goto out_me;</div><div class='ctx'> 	}</div><div class='ctx'> 	info-&gt;res_type = M5MOLS_RESTYPE_MONITOR;</div><div class='del'>-	return 0;</div><div class='add'>+	info-&gt;ffmt[0] = m5mols_default_ffmt[0];</div><div class='add'>+	info-&gt;ffmt[1] =	m5mols_default_ffmt[1];</div><div class='add'>+</div><div class='add'>+	ret = m5mols_sensor_power(info, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_me;</div><div class='add'>+</div><div class='add'>+	ret = m5mols_fw_start(sd);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = m5mols_init_controls(info);</div><div class='add'>+</div><div class='add'>+	m5mols_sensor_power(info, false);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return 0;</div><div class='ctx'> out_me:</div><div class='ctx'> 	media_entity_cleanup(&amp;sd-&gt;entity);</div><div class='ctx'> out_reg:</div><div class='hunk'>@@ -995,6 +1032,7 @@ static int __devexit m5mols_remove(struct i2c_client *client)</div><div class='ctx'> 	struct m5mols_info *info = to_m5mols(sd);</div><div class='ctx'> </div><div class='ctx'> 	v4l2_device_unregister_subdev(sd);</div><div class='add'>+	v4l2_ctrl_handler_free(sd-&gt;ctrl_handler);</div><div class='ctx'> 	free_irq(client-&gt;irq, sd);</div><div class='ctx'> </div><div class='ctx'> 	regulator_bulk_free(ARRAY_SIZE(supplies), supplies);</div><div class='head'>diff --git a/drivers/media/video/m5mols/m5mols_reg.h b/drivers/media/video/m5mols/m5mols_reg.h<br/>index c755bd6edfe9..ae4aced0f9b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/m5mols/m5mols_reg.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/m5mols/m5mols_reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/m5mols/m5mols_reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/m5mols/m5mols_reg.h</a></div><div class='hunk'>@@ -55,39 +55,31 @@</div><div class='ctx'>  * There is many registers between customer version address and awb one. For</div><div class='ctx'>  * more specific contents, see definition if file m5mols.h.</div><div class='ctx'>  */</div><div class='del'>-#define CAT0_VER_CUSTOMER	0x00	/* customer version */</div><div class='del'>-#define CAT0_VER_PROJECT	0x01	/* project version */</div><div class='del'>-#define CAT0_VER_FIRMWARE	0x02	/* Firmware version */</div><div class='del'>-#define CAT0_VER_HARDWARE	0x04	/* Hardware version */</div><div class='del'>-#define CAT0_VER_PARAMETER	0x06	/* Parameter version */</div><div class='del'>-#define CAT0_VER_AWB		0x08	/* Auto WB version */</div><div class='del'>-#define CAT0_VER_STRING		0x0a	/* string including M-5MOLS */</div><div class='del'>-#define CAT0_SYSMODE		0x0b	/* SYSTEM mode register */</div><div class='del'>-#define CAT0_STATUS		0x0c	/* SYSTEM mode status register */</div><div class='del'>-#define CAT0_INT_FACTOR		0x10	/* interrupt pending register */</div><div class='del'>-#define CAT0_INT_ENABLE		0x11	/* interrupt enable register */</div><div class='del'>-</div><div class='del'>-#define SYSTEM_VER_CUSTOMER	I2C_REG(CAT_SYSTEM, CAT0_VER_CUSTOMER, 1)</div><div class='del'>-#define SYSTEM_VER_PROJECT	I2C_REG(CAT_SYSTEM, CAT0_VER_PROJECT, 1)</div><div class='del'>-#define SYSTEM_VER_FIRMWARE	I2C_REG(CAT_SYSTEM, CAT0_VER_FIRMWARE, 2)</div><div class='del'>-#define SYSTEM_VER_HARDWARE	I2C_REG(CAT_SYSTEM, CAT0_VER_HARDWARE, 2)</div><div class='del'>-#define SYSTEM_VER_PARAMETER	I2C_REG(CAT_SYSTEM, CAT0_VER_PARAMETER, 2)</div><div class='del'>-#define SYSTEM_VER_AWB		I2C_REG(CAT_SYSTEM, CAT0_VER_AWB, 2)</div><div class='del'>-</div><div class='del'>-#define SYSTEM_SYSMODE		I2C_REG(CAT_SYSTEM, CAT0_SYSMODE, 1)</div><div class='add'>+#define SYSTEM_VER_CUSTOMER	I2C_REG(CAT_SYSTEM, 0x00, 1)</div><div class='add'>+#define SYSTEM_VER_PROJECT	I2C_REG(CAT_SYSTEM, 0x01, 1)</div><div class='add'>+#define SYSTEM_VER_FIRMWARE	I2C_REG(CAT_SYSTEM, 0x02, 2)</div><div class='add'>+#define SYSTEM_VER_HARDWARE	I2C_REG(CAT_SYSTEM, 0x04, 2)</div><div class='add'>+#define SYSTEM_VER_PARAMETER	I2C_REG(CAT_SYSTEM, 0x06, 2)</div><div class='add'>+#define SYSTEM_VER_AWB		I2C_REG(CAT_SYSTEM, 0x08, 2)</div><div class='add'>+</div><div class='add'>+#define SYSTEM_SYSMODE		I2C_REG(CAT_SYSTEM, 0x0b, 1)</div><div class='ctx'> #define REG_SYSINIT		0x00	/* SYSTEM mode */</div><div class='ctx'> #define REG_PARAMETER		0x01	/* PARAMETER mode */</div><div class='ctx'> #define REG_MONITOR		0x02	/* MONITOR mode */</div><div class='ctx'> #define REG_CAPTURE		0x03	/* CAPTURE mode */</div><div class='ctx'> </div><div class='ctx'> #define SYSTEM_CMD(__cmd)	I2C_REG(CAT_SYSTEM, cmd, 1)</div><div class='del'>-#define SYSTEM_VER_STRING	I2C_REG(CAT_SYSTEM, CAT0_VER_STRING, 1)</div><div class='add'>+#define SYSTEM_VER_STRING	I2C_REG(CAT_SYSTEM, 0x0a, 1)</div><div class='ctx'> #define REG_SAMSUNG_ELECTRO	"SE"	/* Samsung Electro-Mechanics */</div><div class='ctx'> #define REG_SAMSUNG_OPTICS	"OP"	/* Samsung Fiber-Optics */</div><div class='ctx'> #define REG_SAMSUNG_TECHWIN	"TB"	/* Samsung Techwin */</div><div class='add'>+/* SYSTEM mode status */</div><div class='add'>+#define SYSTEM_STATUS	I2C_REG(CAT_SYSTEM, 0x0c, 1)</div><div class='ctx'> </div><div class='del'>-#define SYSTEM_INT_FACTOR	I2C_REG(CAT_SYSTEM, CAT0_INT_FACTOR, 1)</div><div class='del'>-#define SYSTEM_INT_ENABLE	I2C_REG(CAT_SYSTEM, CAT0_INT_ENABLE, 1)</div><div class='add'>+/* Interrupt pending register */</div><div class='add'>+#define SYSTEM_INT_FACTOR	I2C_REG(CAT_SYSTEM, 0x10, 1)</div><div class='add'>+/* interrupt enable register */</div><div class='add'>+#define SYSTEM_INT_ENABLE	I2C_REG(CAT_SYSTEM, 0x11, 1)</div><div class='ctx'> #define REG_INT_MODE		(1 &lt;&lt; 0)</div><div class='ctx'> #define REG_INT_AF		(1 &lt;&lt; 1)</div><div class='ctx'> #define REG_INT_ZOOM		(1 &lt;&lt; 2)</div><div class='hunk'>@@ -105,20 +97,20 @@</div><div class='ctx'>  * can handle with preview(MONITOR) resolution size/frame per second/interface</div><div class='ctx'>  * between the sensor and the Application Processor/even the image effect.</div><div class='ctx'>  */</div><div class='del'>-#define CAT1_DATA_INTERFACE	0x00	/* interface between sensor and AP */</div><div class='del'>-#define CAT1_MONITOR_SIZE	0x01	/* resolution at the MONITOR mode */</div><div class='del'>-#define CAT1_MONITOR_FPS	0x02	/* frame per second at this mode */</div><div class='del'>-#define CAT1_EFFECT		0x0b	/* image effects */</div><div class='ctx'> </div><div class='del'>-#define PARM_MON_SIZE		I2C_REG(CAT_PARAM, CAT1_MONITOR_SIZE, 1)</div><div class='add'>+/* Resolution in the MONITOR mode */</div><div class='add'>+#define PARM_MON_SIZE		I2C_REG(CAT_PARAM, 0x01, 1)</div><div class='ctx'> </div><div class='del'>-#define PARM_MON_FPS		I2C_REG(CAT_PARAM, CAT1_MONITOR_FPS, 1)</div><div class='add'>+/* Frame rate */</div><div class='add'>+#define PARM_MON_FPS		I2C_REG(CAT_PARAM, 0x02, 1)</div><div class='ctx'> #define REG_FPS_30		0x02</div><div class='ctx'> </div><div class='del'>-#define PARM_INTERFACE		I2C_REG(CAT_PARAM, CAT1_DATA_INTERFACE, 1)</div><div class='add'>+/* Video bus between the sensor and a host processor */</div><div class='add'>+#define PARM_INTERFACE		I2C_REG(CAT_PARAM, 0x00, 1)</div><div class='ctx'> #define REG_INTERFACE_MIPI	0x02</div><div class='ctx'> </div><div class='del'>-#define PARM_EFFECT		I2C_REG(CAT_PARAM, CAT1_EFFECT, 1)</div><div class='add'>+/* Image effects */</div><div class='add'>+#define PARM_EFFECT		I2C_REG(CAT_PARAM, 0x0b, 1)</div><div class='ctx'> #define REG_EFFECT_OFF		0x00</div><div class='ctx'> #define REG_EFFECT_NEGA		0x01</div><div class='ctx'> #define REG_EFFECT_EMBOSS	0x06</div><div class='hunk'>@@ -135,39 +127,37 @@</div><div class='ctx'>  * another options like zoom/color effect(different with effect in PARAMETER</div><div class='ctx'>  * mode)/anti hand shaking algorithm.</div><div class='ctx'>  */</div><div class='del'>-#define CAT2_ZOOM		0x01	/* set the zoom position &amp; execute */</div><div class='del'>-#define CAT2_ZOOM_STEP		0x03	/* set the zoom step */</div><div class='del'>-#define CAT2_CFIXB		0x09	/* CB value for color effect */</div><div class='del'>-#define CAT2_CFIXR		0x0a	/* CR value for color effect */</div><div class='del'>-#define CAT2_COLOR_EFFECT	0x0b	/* set on/off of color effect */</div><div class='del'>-#define CAT2_CHROMA_LVL		0x0f	/* set chroma level */</div><div class='del'>-#define CAT2_CHROMA_EN		0x10	/* set on/off of choroma */</div><div class='del'>-#define CAT2_EDGE_LVL		0x11	/* set sharpness level */</div><div class='del'>-#define CAT2_EDGE_EN		0x12	/* set on/off sharpness */</div><div class='del'>-#define CAT2_TONE_CTL		0x25	/* set tone color(contrast) */</div><div class='del'>-</div><div class='del'>-#define MON_ZOOM		I2C_REG(CAT_MONITOR, CAT2_ZOOM, 1)</div><div class='del'>-</div><div class='del'>-#define MON_CFIXR		I2C_REG(CAT_MONITOR, CAT2_CFIXR, 1)</div><div class='del'>-#define MON_CFIXB		I2C_REG(CAT_MONITOR, CAT2_CFIXB, 1)</div><div class='add'>+</div><div class='add'>+/* Target digital zoom position */</div><div class='add'>+#define MON_ZOOM		I2C_REG(CAT_MONITOR, 0x01, 1)</div><div class='add'>+</div><div class='add'>+/* CR value for color effect */</div><div class='add'>+#define MON_CFIXR		I2C_REG(CAT_MONITOR, 0x0a, 1)</div><div class='add'>+/* CB value for color effect */</div><div class='add'>+#define MON_CFIXB		I2C_REG(CAT_MONITOR, 0x09, 1)</div><div class='ctx'> #define REG_CFIXB_SEPIA		0xd8</div><div class='ctx'> #define REG_CFIXR_SEPIA		0x18</div><div class='ctx'> </div><div class='del'>-#define MON_EFFECT		I2C_REG(CAT_MONITOR, CAT2_COLOR_EFFECT, 1)</div><div class='add'>+#define MON_EFFECT		I2C_REG(CAT_MONITOR, 0x0b, 1)</div><div class='ctx'> #define REG_COLOR_EFFECT_OFF	0x00</div><div class='ctx'> #define REG_COLOR_EFFECT_ON	0x01</div><div class='ctx'> </div><div class='del'>-#define MON_CHROMA_EN		I2C_REG(CAT_MONITOR, CAT2_CHROMA_EN, 1)</div><div class='del'>-#define MON_CHROMA_LVL		I2C_REG(CAT_MONITOR, CAT2_CHROMA_LVL, 1)</div><div class='add'>+/* Chroma enable */</div><div class='add'>+#define MON_CHROMA_EN		I2C_REG(CAT_MONITOR, 0x10, 1)</div><div class='add'>+/* Chroma level */</div><div class='add'>+#define MON_CHROMA_LVL		I2C_REG(CAT_MONITOR, 0x0f, 1)</div><div class='ctx'> #define REG_CHROMA_OFF		0x00</div><div class='ctx'> #define REG_CHROMA_ON		0x01</div><div class='ctx'> </div><div class='del'>-#define MON_EDGE_EN		I2C_REG(CAT_MONITOR, CAT2_EDGE_EN, 1)</div><div class='del'>-#define MON_EDGE_LVL		I2C_REG(CAT_MONITOR, CAT2_EDGE_LVL, 1)</div><div class='add'>+/* Sharpness on/off */</div><div class='add'>+#define MON_EDGE_EN		I2C_REG(CAT_MONITOR, 0x12, 1)</div><div class='add'>+/* Sharpness level */</div><div class='add'>+#define MON_EDGE_LVL		I2C_REG(CAT_MONITOR, 0x11, 1)</div><div class='ctx'> #define REG_EDGE_OFF		0x00</div><div class='ctx'> #define REG_EDGE_ON		0x01</div><div class='ctx'> </div><div class='del'>-#define MON_TONE_CTL		I2C_REG(CAT_MONITOR, CAT2_TONE_CTL, 1)</div><div class='add'>+/* Set color tone (contrast) */</div><div class='add'>+#define MON_TONE_CTL		I2C_REG(CAT_MONITOR, 0x25, 1)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Category 3 - Auto Exposure</div><div class='hunk'>@@ -179,27 +169,20 @@</div><div class='ctx'>  * different. So, this category also provide getting the max/min values. And,</div><div class='ctx'>  * each MONITOR and CAPTURE mode has each gain/shutter/max exposure values.</div><div class='ctx'>  */</div><div class='del'>-#define CAT3_AE_LOCK		0x00	/* locking Auto exposure */</div><div class='del'>-#define CAT3_AE_MODE		0x01	/* set AE mode, mode means range */</div><div class='del'>-#define CAT3_ISO		0x05	/* set ISO */</div><div class='del'>-#define CAT3_EV_PRESET_MONITOR	0x0a	/* EV(scenemode) preset for MONITOR */</div><div class='del'>-#define CAT3_EV_PRESET_CAPTURE	0x0b	/* EV(scenemode) preset for CAPTURE */</div><div class='del'>-#define CAT3_MANUAL_GAIN_MON	0x12	/* meteoring value for the MONITOR */</div><div class='del'>-#define CAT3_MAX_GAIN_MON	0x1a	/* max gain value for the MONITOR */</div><div class='del'>-#define CAT3_MANUAL_GAIN_CAP	0x26	/* meteoring value for the CAPTURE */</div><div class='del'>-#define CAT3_AE_INDEX		0x38	/* AE index */</div><div class='del'>-</div><div class='del'>-#define AE_LOCK			I2C_REG(CAT_AE, CAT3_AE_LOCK, 1)</div><div class='add'>+</div><div class='add'>+/* Auto Exposure locking */</div><div class='add'>+#define AE_LOCK			I2C_REG(CAT_AE, 0x00, 1)</div><div class='ctx'> #define REG_AE_UNLOCK		0x00</div><div class='ctx'> #define REG_AE_LOCK		0x01</div><div class='ctx'> </div><div class='del'>-#define AE_MODE			I2C_REG(CAT_AE, CAT3_AE_MODE, 1)</div><div class='add'>+/* Auto Exposure algorithm mode */</div><div class='add'>+#define AE_MODE			I2C_REG(CAT_AE, 0x01, 1)</div><div class='ctx'> #define REG_AE_OFF		0x00	/* AE off */</div><div class='ctx'> #define REG_AE_ALL		0x01	/* calc AE in all block integral */</div><div class='ctx'> #define REG_AE_CENTER		0x03	/* calc AE in center weighted */</div><div class='ctx'> #define REG_AE_SPOT		0x06	/* calc AE in specific spot */</div><div class='ctx'> </div><div class='del'>-#define AE_ISO			I2C_REG(CAT_AE, CAT3_ISO, 1)</div><div class='add'>+#define AE_ISO			I2C_REG(CAT_AE, 0x05, 1)</div><div class='ctx'> #define REG_ISO_AUTO		0x00</div><div class='ctx'> #define REG_ISO_50		0x01</div><div class='ctx'> #define REG_ISO_100		0x02</div><div class='hunk'>@@ -207,8 +190,10 @@</div><div class='ctx'> #define REG_ISO_400		0x04</div><div class='ctx'> #define REG_ISO_800		0x05</div><div class='ctx'> </div><div class='del'>-#define AE_EV_PRESET_MONITOR	I2C_REG(CAT_AE, CAT3_EV_PRESET_MONITOR, 1)</div><div class='del'>-#define AE_EV_PRESET_CAPTURE	I2C_REG(CAT_AE, CAT3_EV_PRESET_CAPTURE, 1)</div><div class='add'>+/* EV (scenemode) preset for MONITOR */</div><div class='add'>+#define AE_EV_PRESET_MONITOR	I2C_REG(CAT_AE, 0x0a, 1)</div><div class='add'>+/* EV (scenemode) preset for CAPTURE */</div><div class='add'>+#define AE_EV_PRESET_CAPTURE	I2C_REG(CAT_AE, 0x0b, 1)</div><div class='ctx'> #define REG_SCENE_NORMAL	0x00</div><div class='ctx'> #define REG_SCENE_PORTRAIT	0x01</div><div class='ctx'> #define REG_SCENE_LANDSCAPE	0x02</div><div class='hunk'>@@ -224,11 +209,14 @@</div><div class='ctx'> #define REG_SCENE_TEXT		0x0c</div><div class='ctx'> #define REG_SCENE_CANDLE	0x0d</div><div class='ctx'> </div><div class='del'>-#define AE_MAN_GAIN_MON		I2C_REG(CAT_AE, CAT3_MANUAL_GAIN_MON, 2)</div><div class='del'>-#define AE_MAX_GAIN_MON		I2C_REG(CAT_AE, CAT3_MAX_GAIN_MON, 2)</div><div class='del'>-#define AE_MAN_GAIN_CAP		I2C_REG(CAT_AE, CAT3_MANUAL_GAIN_CAP, 2)</div><div class='add'>+/* Manual gain in MONITOR mode */</div><div class='add'>+#define AE_MAN_GAIN_MON		I2C_REG(CAT_AE, 0x12, 2)</div><div class='add'>+/* Maximum gain in MONITOR mode */</div><div class='add'>+#define AE_MAX_GAIN_MON		I2C_REG(CAT_AE, 0x1a, 2)</div><div class='add'>+/* Manual gain in CAPTURE mode */</div><div class='add'>+#define AE_MAN_GAIN_CAP		I2C_REG(CAT_AE, 0x26, 2)</div><div class='ctx'> </div><div class='del'>-#define AE_INDEX		I2C_REG(CAT_AE, CAT3_AE_INDEX, 1)</div><div class='add'>+#define AE_INDEX		I2C_REG(CAT_AE, 0x38, 1)</div><div class='ctx'> #define REG_AE_INDEX_20_NEG	0x00</div><div class='ctx'> #define REG_AE_INDEX_15_NEG	0x01</div><div class='ctx'> #define REG_AE_INDEX_10_NEG	0x02</div><div class='hunk'>@@ -241,22 +229,19 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Category 6 - White Balance</div><div class='del'>- *</div><div class='del'>- * This category provide AWB locking/mode/preset/speed/gain bias, etc.</div><div class='ctx'>  */</div><div class='del'>-#define CAT6_AWB_LOCK		0x00	/* locking Auto Whitebalance */</div><div class='del'>-#define CAT6_AWB_MODE		0x02	/* set Auto or Manual */</div><div class='del'>-#define CAT6_AWB_MANUAL		0x03	/* set Manual(preset) value */</div><div class='ctx'> </div><div class='del'>-#define AWB_LOCK		I2C_REG(CAT_WB, CAT6_AWB_LOCK, 1)</div><div class='add'>+/* Auto Whitebalance locking */</div><div class='add'>+#define AWB_LOCK		I2C_REG(CAT_WB, 0x00, 1)</div><div class='ctx'> #define REG_AWB_UNLOCK		0x00</div><div class='ctx'> #define REG_AWB_LOCK		0x01</div><div class='ctx'> </div><div class='del'>-#define AWB_MODE		I2C_REG(CAT_WB, CAT6_AWB_MODE, 1)</div><div class='add'>+#define AWB_MODE		I2C_REG(CAT_WB, 0x02, 1)</div><div class='ctx'> #define REG_AWB_AUTO		0x01	/* AWB off */</div><div class='ctx'> #define REG_AWB_PRESET		0x02	/* AWB preset */</div><div class='ctx'> </div><div class='del'>-#define AWB_MANUAL		I2C_REG(CAT_WB, CAT6_AWB_MANUAL, 1)</div><div class='add'>+/* Manual WB (preset) */</div><div class='add'>+#define AWB_MANUAL		I2C_REG(CAT_WB, 0x03, 1)</div><div class='ctx'> #define REG_AWB_INCANDESCENT	0x01</div><div class='ctx'> #define REG_AWB_FLUORESCENT_1	0x02</div><div class='ctx'> #define REG_AWB_FLUORESCENT_2	0x03</div><div class='hunk'>@@ -269,42 +254,25 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Category 7 - EXIF information</div><div class='ctx'>  */</div><div class='del'>-#define CAT7_INFO_EXPTIME_NU	0x00</div><div class='del'>-#define CAT7_INFO_EXPTIME_DE	0x04</div><div class='del'>-#define CAT7_INFO_TV_NU		0x08</div><div class='del'>-#define CAT7_INFO_TV_DE		0x0c</div><div class='del'>-#define CAT7_INFO_AV_NU		0x10</div><div class='del'>-#define CAT7_INFO_AV_DE		0x14</div><div class='del'>-#define CAT7_INFO_BV_NU		0x18</div><div class='del'>-#define CAT7_INFO_BV_DE		0x1c</div><div class='del'>-#define CAT7_INFO_EBV_NU	0x20</div><div class='del'>-#define CAT7_INFO_EBV_DE	0x24</div><div class='del'>-#define CAT7_INFO_ISO		0x28</div><div class='del'>-#define CAT7_INFO_FLASH		0x2a</div><div class='del'>-#define CAT7_INFO_SDR		0x2c</div><div class='del'>-#define CAT7_INFO_QVAL		0x2e</div><div class='del'>-</div><div class='del'>-#define EXIF_INFO_EXPTIME_NU	I2C_REG(CAT_EXIF, CAT7_INFO_EXPTIME_NU, 4)</div><div class='del'>-#define EXIF_INFO_EXPTIME_DE	I2C_REG(CAT_EXIF, CAT7_INFO_EXPTIME_DE, 4)</div><div class='del'>-#define EXIF_INFO_TV_NU		I2C_REG(CAT_EXIF, CAT7_INFO_TV_NU, 4)</div><div class='del'>-#define EXIF_INFO_TV_DE		I2C_REG(CAT_EXIF, CAT7_INFO_TV_DE, 4)</div><div class='del'>-#define EXIF_INFO_AV_NU		I2C_REG(CAT_EXIF, CAT7_INFO_AV_NU, 4)</div><div class='del'>-#define EXIF_INFO_AV_DE		I2C_REG(CAT_EXIF, CAT7_INFO_AV_DE, 4)</div><div class='del'>-#define EXIF_INFO_BV_NU		I2C_REG(CAT_EXIF, CAT7_INFO_BV_NU, 4)</div><div class='del'>-#define EXIF_INFO_BV_DE		I2C_REG(CAT_EXIF, CAT7_INFO_BV_DE, 4)</div><div class='del'>-#define EXIF_INFO_EBV_NU	I2C_REG(CAT_EXIF, CAT7_INFO_EBV_NU, 4)</div><div class='del'>-#define EXIF_INFO_EBV_DE	I2C_REG(CAT_EXIF, CAT7_INFO_EBV_DE, 4)</div><div class='del'>-#define EXIF_INFO_ISO		I2C_REG(CAT_EXIF, CAT7_INFO_ISO, 2)</div><div class='del'>-#define EXIF_INFO_FLASH		I2C_REG(CAT_EXIF, CAT7_INFO_FLASH, 2)</div><div class='del'>-#define EXIF_INFO_SDR		I2C_REG(CAT_EXIF, CAT7_INFO_SDR, 2)</div><div class='del'>-#define EXIF_INFO_QVAL		I2C_REG(CAT_EXIF, CAT7_INFO_QVAL, 2)</div><div class='add'>+#define EXIF_INFO_EXPTIME_NU	I2C_REG(CAT_EXIF, 0x00, 4)</div><div class='add'>+#define EXIF_INFO_EXPTIME_DE	I2C_REG(CAT_EXIF, 0x04, 4)</div><div class='add'>+#define EXIF_INFO_TV_NU		I2C_REG(CAT_EXIF, 0x08, 4)</div><div class='add'>+#define EXIF_INFO_TV_DE		I2C_REG(CAT_EXIF, 0x0c, 4)</div><div class='add'>+#define EXIF_INFO_AV_NU		I2C_REG(CAT_EXIF, 0x10, 4)</div><div class='add'>+#define EXIF_INFO_AV_DE		I2C_REG(CAT_EXIF, 0x14, 4)</div><div class='add'>+#define EXIF_INFO_BV_NU		I2C_REG(CAT_EXIF, 0x18, 4)</div><div class='add'>+#define EXIF_INFO_BV_DE		I2C_REG(CAT_EXIF, 0x1c, 4)</div><div class='add'>+#define EXIF_INFO_EBV_NU	I2C_REG(CAT_EXIF, 0x20, 4)</div><div class='add'>+#define EXIF_INFO_EBV_DE	I2C_REG(CAT_EXIF, 0x24, 4)</div><div class='add'>+#define EXIF_INFO_ISO		I2C_REG(CAT_EXIF, 0x28, 2)</div><div class='add'>+#define EXIF_INFO_FLASH		I2C_REG(CAT_EXIF, 0x2a, 2)</div><div class='add'>+#define EXIF_INFO_SDR		I2C_REG(CAT_EXIF, 0x2c, 2)</div><div class='add'>+#define EXIF_INFO_QVAL		I2C_REG(CAT_EXIF, 0x2e, 2)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Category 9 - Face Detection</div><div class='ctx'>  */</div><div class='del'>-#define CAT9_FD_CTL		0x00</div><div class='del'>-</div><div class='del'>-#define FD_CTL			I2C_REG(CAT_FD, CAT9_FD_CTL, 1)</div><div class='add'>+#define FD_CTL			I2C_REG(CAT_FD, 0x00, 1)</div><div class='ctx'> #define BIT_FD_EN		0</div><div class='ctx'> #define BIT_FD_DRAW_FACE_FRAME	4</div><div class='ctx'> #define BIT_FD_DRAW_SMILE_LVL	6</div><div class='hunk'>@@ -314,62 +282,50 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Category A - Lens Parameter</div><div class='ctx'>  */</div><div class='del'>-#define CATA_AF_MODE		0x01</div><div class='del'>-#define CATA_AF_EXECUTE		0x02</div><div class='del'>-#define CATA_AF_STATUS		0x03</div><div class='del'>-#define CATA_AF_VERSION		0x0a</div><div class='del'>-</div><div class='del'>-#define AF_MODE			I2C_REG(CAT_LENS, CATA_AF_MODE, 1)</div><div class='add'>+#define AF_MODE			I2C_REG(CAT_LENS, 0x01, 1)</div><div class='ctx'> #define REG_AF_NORMAL		0x00	/* Normal AF, one time */</div><div class='ctx'> #define REG_AF_MACRO		0x01	/* Macro AF, one time */</div><div class='ctx'> #define REG_AF_POWEROFF		0x07</div><div class='ctx'> </div><div class='del'>-#define AF_EXECUTE		I2C_REG(CAT_LENS, CATA_AF_EXECUTE, 1)</div><div class='add'>+#define AF_EXECUTE		I2C_REG(CAT_LENS, 0x02, 1)</div><div class='ctx'> #define REG_AF_STOP		0x00</div><div class='ctx'> #define REG_AF_EXE_AUTO		0x01</div><div class='ctx'> #define REG_AF_EXE_CAF		0x02</div><div class='ctx'> </div><div class='del'>-#define AF_STATUS		I2C_REG(CAT_LENS, CATA_AF_STATUS, 1)</div><div class='add'>+#define AF_STATUS		I2C_REG(CAT_LENS, 0x03, 1)</div><div class='ctx'> #define REG_AF_FAIL		0x00</div><div class='ctx'> #define REG_AF_SUCCESS		0x02</div><div class='ctx'> #define REG_AF_IDLE		0x04</div><div class='ctx'> #define REG_AF_BUSY		0x05</div><div class='ctx'> </div><div class='del'>-#define AF_VERSION		I2C_REG(CAT_LENS, CATA_AF_VERSION, 1)</div><div class='add'>+#define AF_VERSION		I2C_REG(CAT_LENS, 0x0a, 1)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Category B - CAPTURE Parameter</div><div class='ctx'>  */</div><div class='del'>-#define CATB_YUVOUT_MAIN	0x00</div><div class='del'>-#define CATB_MAIN_IMAGE_SIZE	0x01</div><div class='del'>-#define CATB_MCC_MODE		0x1d</div><div class='del'>-#define CATB_WDR_EN		0x2c</div><div class='del'>-#define CATB_LIGHT_CTRL		0x40</div><div class='del'>-#define CATB_FLASH_CTRL		0x41</div><div class='del'>-</div><div class='del'>-#define CAPP_YUVOUT_MAIN	I2C_REG(CAT_CAPT_PARM, CATB_YUVOUT_MAIN, 1)</div><div class='add'>+#define CAPP_YUVOUT_MAIN	I2C_REG(CAT_CAPT_PARM, 0x00, 1)</div><div class='ctx'> #define REG_YUV422		0x00</div><div class='ctx'> #define REG_BAYER10		0x05</div><div class='ctx'> #define REG_BAYER8		0x06</div><div class='ctx'> #define REG_JPEG		0x10</div><div class='ctx'> </div><div class='del'>-#define CAPP_MAIN_IMAGE_SIZE	I2C_REG(CAT_CAPT_PARM, CATB_MAIN_IMAGE_SIZE, 1)</div><div class='add'>+#define CAPP_MAIN_IMAGE_SIZE	I2C_REG(CAT_CAPT_PARM, 0x01, 1)</div><div class='ctx'> </div><div class='del'>-#define CAPP_MCC_MODE		I2C_REG(CAT_CAPT_PARM, CATB_MCC_MODE, 1)</div><div class='add'>+#define CAPP_MCC_MODE		I2C_REG(CAT_CAPT_PARM, 0x1d, 1)</div><div class='ctx'> #define REG_MCC_OFF		0x00</div><div class='ctx'> #define REG_MCC_NORMAL		0x01</div><div class='ctx'> </div><div class='del'>-#define CAPP_WDR_EN		I2C_REG(CAT_CAPT_PARM, CATB_WDR_EN, 1)</div><div class='add'>+#define CAPP_WDR_EN		I2C_REG(CAT_CAPT_PARM, 0x2c, 1)</div><div class='ctx'> #define REG_WDR_OFF		0x00</div><div class='ctx'> #define REG_WDR_ON		0x01</div><div class='ctx'> #define REG_WDR_AUTO		0x02</div><div class='ctx'> </div><div class='del'>-#define CAPP_LIGHT_CTRL		I2C_REG(CAT_CAPT_PARM, CATB_LIGHT_CTRL, 1)</div><div class='add'>+#define CAPP_LIGHT_CTRL		I2C_REG(CAT_CAPT_PARM, 0x40, 1)</div><div class='ctx'> #define REG_LIGHT_OFF		0x00</div><div class='ctx'> #define REG_LIGHT_ON		0x01</div><div class='ctx'> #define REG_LIGHT_AUTO		0x02</div><div class='ctx'> </div><div class='del'>-#define CAPP_FLASH_CTRL		I2C_REG(CAT_CAPT_PARM, CATB_FLASH_CTRL, 1)</div><div class='add'>+#define CAPP_FLASH_CTRL		I2C_REG(CAT_CAPT_PARM, 0x41, 1)</div><div class='ctx'> #define REG_FLASH_OFF		0x00</div><div class='ctx'> #define REG_FLASH_ON		0x01</div><div class='ctx'> #define REG_FLASH_AUTO		0x02</div><div class='hunk'>@@ -377,34 +333,29 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Category C - CAPTURE Control</div><div class='ctx'>  */</div><div class='del'>-#define CATC_CAP_MODE		0x00</div><div class='del'>-#define CATC_CAP_SEL_FRAME	0x06	/* It determines Single or Multi */</div><div class='del'>-#define CATC_CAP_START		0x09</div><div class='del'>-#define CATC_CAP_IMAGE_SIZE	0x0d</div><div class='del'>-#define CATC_CAP_THUMB_SIZE	0x11</div><div class='del'>-</div><div class='del'>-#define CAPC_MODE		I2C_REG(CAT_CAPT_CTRL, CATC_CAP_MODE, 1)</div><div class='add'>+#define CAPC_MODE		I2C_REG(CAT_CAPT_CTRL, 0x00, 1)</div><div class='ctx'> #define REG_CAP_NONE		0x00</div><div class='ctx'> #define REG_CAP_ANTI_SHAKE	0x02</div><div class='ctx'> </div><div class='del'>-#define CAPC_SEL_FRAME		I2C_REG(CAT_CAPT_CTRL, CATC_CAP_SEL_FRAME, 1)</div><div class='add'>+/* Select single- or multi-shot capture */</div><div class='add'>+#define CAPC_SEL_FRAME		I2C_REG(CAT_CAPT_CTRL, 0x06, 1)</div><div class='ctx'> </div><div class='del'>-#define CAPC_START		I2C_REG(CAT_CAPT_CTRL, CATC_CAP_START, 1)</div><div class='add'>+#define CAPC_START		I2C_REG(CAT_CAPT_CTRL, 0x09, 1)</div><div class='ctx'> #define REG_CAP_START_MAIN	0x01</div><div class='ctx'> #define REG_CAP_START_THUMB	0x03</div><div class='ctx'> </div><div class='del'>-#define CAPC_IMAGE_SIZE		I2C_REG(CAT_CAPT_CTRL, CATC_CAP_IMAGE_SIZE, 4)</div><div class='del'>-#define CAPC_THUMB_SIZE		I2C_REG(CAT_CAPT_CTRL, CATC_CAP_THUMB_SIZE, 4)</div><div class='add'>+#define CAPC_IMAGE_SIZE		I2C_REG(CAT_CAPT_CTRL, 0x0d, 4)</div><div class='add'>+#define CAPC_THUMB_SIZE		I2C_REG(CAT_CAPT_CTRL, 0x11, 4)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Category F - Flash</div><div class='ctx'>  *</div><div class='ctx'>  * This mode provides functions about internal flash stuff and system startup.</div><div class='ctx'>  */</div><div class='del'>-#define CATF_CAM_START		0x12	/* It starts internal ARM core booting</div><div class='del'>-					 * after power-up */</div><div class='ctx'> </div><div class='del'>-#define FLASH_CAM_START		I2C_REG(CAT_FLASH, CATF_CAM_START, 1)</div><div class='del'>-#define REG_START_ARM_BOOT	0x01</div><div class='add'>+/* Starts internal ARM core booting after power-up */</div><div class='add'>+#define FLASH_CAM_START		I2C_REG(CAT_FLASH, 0x12, 1)</div><div class='add'>+#define REG_START_ARM_BOOT	0x01	/* write value */</div><div class='add'>+#define REG_IN_FLASH_MODE	0x00	/* read value */</div><div class='ctx'> </div><div class='ctx'> #endif	/* M5MOLS_REG_H */</div><div class='head'>diff --git a/drivers/media/video/marvell-ccic/mcam-core.c b/drivers/media/video/marvell-ccic/mcam-core.c<br/>index 80ec64d2d6d8..37d20e73908a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/marvell-ccic/mcam-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/marvell-ccic/mcam-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/marvell-ccic/mcam-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/marvell-ccic/mcam-core.c</a></div><div class='hunk'>@@ -51,7 +51,7 @@ static int delivered;</div><div class='ctx'>  * sense.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int alloc_bufs_at_read;</div><div class='add'>+static bool alloc_bufs_at_read;</div><div class='ctx'> module_param(alloc_bufs_at_read, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(alloc_bufs_at_read,</div><div class='ctx'> 		"Non-zero value causes DMA buffers to be allocated when the "</div><div class='hunk'>@@ -73,11 +73,11 @@ MODULE_PARM_DESC(dma_buf_size,</div><div class='ctx'> 		"parameters require larger buffers, an attempt to reallocate "</div><div class='ctx'> 		"will be made.");</div><div class='ctx'> #else /* MCAM_MODE_VMALLOC */</div><div class='del'>-static const int alloc_bufs_at_read = 0;</div><div class='add'>+static const bool alloc_bufs_at_read = 0;</div><div class='ctx'> static const int n_dma_bufs = 3;  /* Used by S/G_PARM */</div><div class='ctx'> #endif /* MCAM_MODE_VMALLOC */</div><div class='ctx'> </div><div class='del'>-static int flip;</div><div class='add'>+static bool flip;</div><div class='ctx'> module_param(flip, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(flip,</div><div class='ctx'> 		"If set, the sensor will be instructed to flip the image "</div><div class='hunk'>@@ -522,6 +522,15 @@ static void mcam_sg_next_buffer(struct mcam_camera *cam)</div><div class='ctx'>  */</div><div class='ctx'> static void mcam_ctlr_dma_sg(struct mcam_camera *cam)</div><div class='ctx'> {</div><div class='add'>+	/*</div><div class='add'>+	 * The list-empty condition can hit us at resume time</div><div class='add'>+	 * if the buffer list was empty when the system was suspended.</div><div class='add'>+	 */</div><div class='add'>+	if (list_empty(&amp;cam-&gt;buffers)) {</div><div class='add'>+		set_bit(CF_SG_RESTART, &amp;cam-&gt;flags);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mcam_reg_clear_bit(cam, REG_CTRL1, C1_DESC_3WORD);</div><div class='ctx'> 	mcam_sg_next_buffer(cam);</div><div class='ctx'> 	mcam_reg_set_bit(cam, REG_CTRL1, C1_DESC_ENA);</div><div class='hunk'>@@ -566,6 +575,7 @@ static void mcam_dma_sg_done(struct mcam_camera *cam, int frame)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		set_bit(CF_SG_RESTART, &amp;cam-&gt;flags);</div><div class='ctx'> 		singles++;</div><div class='add'>+		cam-&gt;vb_bufs[0] = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Now we can give the completed frame back to user space.</div><div class='hunk'>@@ -661,10 +671,10 @@ static int mcam_ctlr_configure(struct mcam_camera *cam)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;cam-&gt;dev_lock, flags);</div><div class='add'>+	clear_bit(CF_SG_RESTART, &amp;cam-&gt;flags);</div><div class='ctx'> 	cam-&gt;dma_setup(cam);</div><div class='ctx'> 	mcam_ctlr_image(cam);</div><div class='ctx'> 	mcam_set_config_needed(cam, 0);</div><div class='del'>-	clear_bit(CF_SG_RESTART, &amp;cam-&gt;flags);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;cam-&gt;dev_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -873,7 +883,8 @@ static int mcam_read_setup(struct mcam_camera *cam)</div><div class='ctx'> 	mcam_reset_buffers(cam);</div><div class='ctx'> 	mcam_ctlr_irq_enable(cam);</div><div class='ctx'> 	cam-&gt;state = S_STREAMING;</div><div class='del'>-	mcam_ctlr_start(cam);</div><div class='add'>+	if (!test_bit(CF_SG_RESTART, &amp;cam-&gt;flags))</div><div class='add'>+		mcam_ctlr_start(cam);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;cam-&gt;dev_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1818,11 +1829,15 @@ void mccic_shutdown(struct mcam_camera *cam)</div><div class='ctx'> </div><div class='ctx'> void mccic_suspend(struct mcam_camera *cam)</div><div class='ctx'> {</div><div class='del'>-	enum mcam_state cstate = cam-&gt;state;</div><div class='add'>+	mutex_lock(&amp;cam-&gt;s_mutex);</div><div class='add'>+	if (cam-&gt;users &gt; 0) {</div><div class='add'>+		enum mcam_state cstate = cam-&gt;state;</div><div class='ctx'> </div><div class='del'>-	mcam_ctlr_stop_dma(cam);</div><div class='del'>-	mcam_ctlr_power_down(cam);</div><div class='del'>-	cam-&gt;state = cstate;</div><div class='add'>+		mcam_ctlr_stop_dma(cam);</div><div class='add'>+		mcam_ctlr_power_down(cam);</div><div class='add'>+		cam-&gt;state = cstate;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;cam-&gt;s_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mccic_resume(struct mcam_camera *cam)</div><div class='hunk'>@@ -1839,8 +1854,15 @@ int mccic_resume(struct mcam_camera *cam)</div><div class='ctx'> 	mutex_unlock(&amp;cam-&gt;s_mutex);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(CF_CONFIG_NEEDED, &amp;cam-&gt;flags);</div><div class='del'>-	if (cam-&gt;state == S_STREAMING)</div><div class='add'>+	if (cam-&gt;state == S_STREAMING) {</div><div class='add'>+		/*</div><div class='add'>+		 * If there was a buffer in the DMA engine at suspend</div><div class='add'>+		 * time, put it back on the queue or we'll forget about it.</div><div class='add'>+		 */</div><div class='add'>+		if (cam-&gt;buffer_mode == B_DMA_sg &amp;&amp; cam-&gt;vb_bufs[0])</div><div class='add'>+			list_add(&amp;cam-&gt;vb_bufs[0]-&gt;queue, &amp;cam-&gt;buffers);</div><div class='ctx'> 		ret = mcam_read_setup(cam);</div><div class='add'>+	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='head'>diff --git a/drivers/media/video/marvell-ccic/mmp-driver.c b/drivers/media/video/marvell-ccic/mmp-driver.c<br/>index fb0b124b35f3..0d64e2d7474a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/marvell-ccic/mmp-driver.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/marvell-ccic/mmp-driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/marvell-ccic/mmp-driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/marvell-ccic/mmp-driver.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mcam-core.h"</div><div class='ctx'> </div><div class='hunk'>@@ -310,10 +311,44 @@ static int mmpcam_platform_remove(struct platform_device *pdev)</div><div class='ctx'> 	return mmpcam_remove(cam);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Suspend/resume support.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+static int mmpcam_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct mmp_camera *cam = mmpcam_find_device(pdev);</div><div class='add'>+</div><div class='add'>+	if (state.event != PM_EVENT_SUSPEND)</div><div class='add'>+		return 0;</div><div class='add'>+	mccic_suspend(&amp;cam-&gt;mcam);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mmpcam_resume(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct mmp_camera *cam = mmpcam_find_device(pdev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Power up unconditionally just in case the core tries to</div><div class='add'>+	 * touch a register even if nothing was active before; trust</div><div class='add'>+	 * me, it's better this way.</div><div class='add'>+	 */</div><div class='add'>+	mmpcam_power_up(&amp;cam-&gt;mcam);</div><div class='add'>+	return mccic_resume(&amp;cam-&gt;mcam);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver mmpcam_driver = {</div><div class='ctx'> 	.probe		= mmpcam_probe,</div><div class='ctx'> 	.remove		= mmpcam_platform_remove,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend	= mmpcam_suspend,</div><div class='add'>+	.resume		= mmpcam_resume,</div><div class='add'>+#endif</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "mmp-camera",</div><div class='ctx'> 		.owner	= THIS_MODULE</div><div class='head'>diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c<br/>index d0f538857285..d7cd0f633f63 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/msp3400-driver.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/msp3400-driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/msp3400-driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/msp3400-driver.c</a></div><div class='hunk'>@@ -69,12 +69,12 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> /* module parameters */</div><div class='ctx'> static int opmode   = OPMODE_AUTO;</div><div class='ctx'> int msp_debug;		 /* msp_debug output */</div><div class='del'>-int msp_once;		 /* no continuous stereo monitoring */</div><div class='del'>-int msp_amsound;	 /* hard-wire AM sound at 6.5 Hz (france),</div><div class='add'>+bool msp_once;		 /* no continuous stereo monitoring */</div><div class='add'>+bool msp_amsound;	 /* hard-wire AM sound at 6.5 Hz (france),</div><div class='ctx'> 			    the autoscan seems work well only with FM... */</div><div class='ctx'> int msp_standard = 1;    /* Override auto detect of audio msp_standard,</div><div class='ctx'> 			    if needed. */</div><div class='del'>-int msp_dolby;</div><div class='add'>+bool msp_dolby;</div><div class='ctx'> </div><div class='ctx'> int msp_stereo_thresh = 0x190; /* a2 threshold for stereo/bilingual</div><div class='ctx'> 					(msp34xxg only) 0x00a0-0x03c0 */</div><div class='head'>diff --git a/drivers/media/video/msp3400-driver.h b/drivers/media/video/msp3400-driver.h<br/>index 831e8db4368c..fbe5e0715f93 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/msp3400-driver.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/msp3400-driver.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/msp3400-driver.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/msp3400-driver.h</a></div><div class='hunk'>@@ -44,10 +44,10 @@</div><div class='ctx'> </div><div class='ctx'> /* module parameters */</div><div class='ctx'> extern int msp_debug;</div><div class='del'>-extern int msp_once;</div><div class='del'>-extern int msp_amsound;</div><div class='add'>+extern bool msp_once;</div><div class='add'>+extern bool msp_amsound;</div><div class='ctx'> extern int msp_standard;</div><div class='del'>-extern int msp_dolby;</div><div class='add'>+extern bool msp_dolby;</div><div class='ctx'> extern int msp_stereo_thresh;</div><div class='ctx'> </div><div class='ctx'> struct msp_state {</div><div class='head'>diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c<br/>index e2b1029b16cd..097c9d3d04a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/mt9m001.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mt9m001.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/mt9m001.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/mt9m001.c</a></div><div class='hunk'>@@ -109,14 +109,13 @@ static struct mt9m001 *to_mt9m001(const struct i2c_client *client)</div><div class='ctx'> </div><div class='ctx'> static int reg_read(struct i2c_client *client, const u8 reg)</div><div class='ctx'> {</div><div class='del'>-	s32 data = i2c_smbus_read_word_data(client, reg);</div><div class='del'>-	return data &lt; 0 ? data : swab16(data);</div><div class='add'>+	return i2c_smbus_read_word_swapped(client, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int reg_write(struct i2c_client *client, const u8 reg,</div><div class='ctx'> 		     const u16 data)</div><div class='ctx'> {</div><div class='del'>-	return i2c_smbus_write_word_data(client, reg, swab16(data));</div><div class='add'>+	return i2c_smbus_write_word_swapped(client, reg, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int reg_set(struct i2c_client *client, const u8 reg,</div><div class='head'>diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c<br/>index 398f96ffd35e..bee65bff46e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/mt9m111.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mt9m111.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/mt9m111.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/mt9m111.c</a></div><div class='hunk'>@@ -139,25 +139,52 @@</div><div class='ctx'> #define MT9M111_MAX_HEIGHT	1024</div><div class='ctx'> #define MT9M111_MAX_WIDTH	1280</div><div class='ctx'> </div><div class='add'>+struct mt9m111_context {</div><div class='add'>+	u16 read_mode;</div><div class='add'>+	u16 blanking_h;</div><div class='add'>+	u16 blanking_v;</div><div class='add'>+	u16 reducer_xzoom;</div><div class='add'>+	u16 reducer_yzoom;</div><div class='add'>+	u16 reducer_xsize;</div><div class='add'>+	u16 reducer_ysize;</div><div class='add'>+	u16 output_fmt_ctrl2;</div><div class='add'>+	u16 control;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mt9m111_context context_a = {</div><div class='add'>+	.read_mode		= MT9M111_READ_MODE_A,</div><div class='add'>+	.blanking_h		= MT9M111_HORIZONTAL_BLANKING_A,</div><div class='add'>+	.blanking_v		= MT9M111_VERTICAL_BLANKING_A,</div><div class='add'>+	.reducer_xzoom		= MT9M111_REDUCER_XZOOM_A,</div><div class='add'>+	.reducer_yzoom		= MT9M111_REDUCER_YZOOM_A,</div><div class='add'>+	.reducer_xsize		= MT9M111_REDUCER_XSIZE_A,</div><div class='add'>+	.reducer_ysize		= MT9M111_REDUCER_YSIZE_A,</div><div class='add'>+	.output_fmt_ctrl2	= MT9M111_OUTPUT_FORMAT_CTRL2_A,</div><div class='add'>+	.control		= MT9M111_CTXT_CTRL_RESTART,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mt9m111_context context_b = {</div><div class='add'>+	.read_mode		= MT9M111_READ_MODE_B,</div><div class='add'>+	.blanking_h		= MT9M111_HORIZONTAL_BLANKING_B,</div><div class='add'>+	.blanking_v		= MT9M111_VERTICAL_BLANKING_B,</div><div class='add'>+	.reducer_xzoom		= MT9M111_REDUCER_XZOOM_B,</div><div class='add'>+	.reducer_yzoom		= MT9M111_REDUCER_YZOOM_B,</div><div class='add'>+	.reducer_xsize		= MT9M111_REDUCER_XSIZE_B,</div><div class='add'>+	.reducer_ysize		= MT9M111_REDUCER_YSIZE_B,</div><div class='add'>+	.output_fmt_ctrl2	= MT9M111_OUTPUT_FORMAT_CTRL2_B,</div><div class='add'>+	.control		= MT9M111_CTXT_CTRL_RESTART |</div><div class='add'>+		MT9M111_CTXT_CTRL_DEFECTCOR_B | MT9M111_CTXT_CTRL_RESIZE_B |</div><div class='add'>+		MT9M111_CTXT_CTRL_CTRL2_B | MT9M111_CTXT_CTRL_GAMMA_B |</div><div class='add'>+		MT9M111_CTXT_CTRL_READ_MODE_B | MT9M111_CTXT_CTRL_VBLANK_SEL_B |</div><div class='add'>+		MT9M111_CTXT_CTRL_HBLANK_SEL_B,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* MT9M111 has only one fixed colorspace per pixelcode */</div><div class='ctx'> struct mt9m111_datafmt {</div><div class='ctx'> 	enum v4l2_mbus_pixelcode	code;</div><div class='ctx'> 	enum v4l2_colorspace		colorspace;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Find a data format by a pixel code in an array */</div><div class='del'>-static const struct mt9m111_datafmt *mt9m111_find_datafmt(</div><div class='del'>-	enum v4l2_mbus_pixelcode code, const struct mt9m111_datafmt *fmt,</div><div class='del'>-	int n)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; n; i++)</div><div class='del'>-		if (fmt[i].code == code)</div><div class='del'>-			return fmt + i;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct mt9m111_datafmt mt9m111_colour_fmts[] = {</div><div class='ctx'> 	{V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG},</div><div class='ctx'> 	{V4L2_MBUS_FMT_YVYU8_2X8, V4L2_COLORSPACE_JPEG},</div><div class='hunk'>@@ -173,27 +200,35 @@ static const struct mt9m111_datafmt mt9m111_colour_fmts[] = {</div><div class='ctx'> 	{V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum mt9m111_context {</div><div class='del'>-	HIGHPOWER = 0,</div><div class='del'>-	LOWPOWER,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct mt9m111 {</div><div class='ctx'> 	struct v4l2_subdev subdev;</div><div class='ctx'> 	struct v4l2_ctrl_handler hdl;</div><div class='ctx'> 	struct v4l2_ctrl *gain;</div><div class='ctx'> 	int model;	/* V4L2_IDENT_MT9M111 or V4L2_IDENT_MT9M112 code</div><div class='ctx'> 			 * from v4l2-chip-ident.h */</div><div class='del'>-	enum mt9m111_context context;</div><div class='del'>-	struct v4l2_rect rect;</div><div class='add'>+	struct mt9m111_context *ctx;</div><div class='add'>+	struct v4l2_rect rect;	/* cropping rectangle */</div><div class='add'>+	int width;		/* output */</div><div class='add'>+	int height;		/* sizes */</div><div class='ctx'> 	struct mutex power_lock; /* lock to protect power_count */</div><div class='ctx'> 	int power_count;</div><div class='ctx'> 	const struct mt9m111_datafmt *fmt;</div><div class='ctx'> 	int lastpage;	/* PageMap cache value */</div><div class='ctx'> 	unsigned char datawidth;</div><div class='del'>-	unsigned int powered:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Find a data format by a pixel code */</div><div class='add'>+static const struct mt9m111_datafmt *mt9m111_find_datafmt(struct mt9m111 *mt9m111,</div><div class='add'>+						enum v4l2_mbus_pixelcode code)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mt9m111_colour_fmts); i++)</div><div class='add'>+		if (mt9m111_colour_fmts[i].code == code)</div><div class='add'>+			return mt9m111_colour_fmts + i;</div><div class='add'>+</div><div class='add'>+	return mt9m111-&gt;fmt;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct mt9m111 *to_mt9m111(const struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	return container_of(i2c_get_clientdata(client), struct mt9m111, subdev);</div><div class='hunk'>@@ -211,7 +246,7 @@ static int reg_page_map_set(struct i2c_client *client, const u16 reg)</div><div class='ctx'> 	if (page &gt; 2)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = i2c_smbus_write_word_data(client, MT9M111_PAGE_MAP, swab16(page));</div><div class='add'>+	ret = i2c_smbus_write_word_swapped(client, MT9M111_PAGE_MAP, page);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		mt9m111-&gt;lastpage = page;</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -223,7 +258,7 @@ static int mt9m111_reg_read(struct i2c_client *client, const u16 reg)</div><div class='ctx'> </div><div class='ctx'> 	ret = reg_page_map_set(client, reg);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = swab16(i2c_smbus_read_word_data(client, reg &amp; 0xff));</div><div class='add'>+		ret = i2c_smbus_read_word_swapped(client, reg &amp; 0xff);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;client-&gt;dev, "read  reg.%03x -&gt; %04x\n", reg, ret);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -236,8 +271,7 @@ static int mt9m111_reg_write(struct i2c_client *client, const u16 reg,</div><div class='ctx'> </div><div class='ctx'> 	ret = reg_page_map_set(client, reg);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = i2c_smbus_write_word_data(client, reg &amp; 0xff,</div><div class='del'>-						swab16(data));</div><div class='add'>+		ret = i2c_smbus_write_word_swapped(client, reg &amp; 0xff, data);</div><div class='ctx'> 	dev_dbg(&amp;client-&gt;dev, "write reg.%03x = %04x -&gt; %d\n", reg, data, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -276,76 +310,63 @@ static int mt9m111_reg_mask(struct i2c_client *client, const u16 reg,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt9m111_set_context(struct mt9m111 *mt9m111,</div><div class='del'>-			       enum mt9m111_context ctxt)</div><div class='add'>+			       struct mt9m111_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = v4l2_get_subdevdata(&amp;mt9m111-&gt;subdev);</div><div class='del'>-	int valB = MT9M111_CTXT_CTRL_RESTART | MT9M111_CTXT_CTRL_DEFECTCOR_B</div><div class='del'>-		| MT9M111_CTXT_CTRL_RESIZE_B | MT9M111_CTXT_CTRL_CTRL2_B</div><div class='del'>-		| MT9M111_CTXT_CTRL_GAMMA_B | MT9M111_CTXT_CTRL_READ_MODE_B</div><div class='del'>-		| MT9M111_CTXT_CTRL_VBLANK_SEL_B</div><div class='del'>-		| MT9M111_CTXT_CTRL_HBLANK_SEL_B;</div><div class='del'>-	int valA = MT9M111_CTXT_CTRL_RESTART;</div><div class='del'>-</div><div class='del'>-	if (ctxt == HIGHPOWER)</div><div class='del'>-		return reg_write(CONTEXT_CONTROL, valB);</div><div class='del'>-	else</div><div class='del'>-		return reg_write(CONTEXT_CONTROL, valA);</div><div class='add'>+	return reg_write(CONTEXT_CONTROL, ctx-&gt;control);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt9m111_setup_rect(struct mt9m111 *mt9m111,</div><div class='del'>-			      struct v4l2_rect *rect)</div><div class='add'>+static int mt9m111_setup_rect_ctx(struct mt9m111 *mt9m111,</div><div class='add'>+			struct mt9m111_context *ctx, struct v4l2_rect *rect,</div><div class='add'>+			unsigned int width, unsigned int height)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = v4l2_get_subdevdata(&amp;mt9m111-&gt;subdev);</div><div class='del'>-	int ret, is_raw_format;</div><div class='del'>-	int width = rect-&gt;width;</div><div class='del'>-	int height = rect-&gt;height;</div><div class='add'>+	int ret = mt9m111_reg_write(client, ctx-&gt;reducer_xzoom, rect-&gt;width);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = mt9m111_reg_write(client, ctx-&gt;reducer_yzoom, rect-&gt;height);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = mt9m111_reg_write(client, ctx-&gt;reducer_xsize, width);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = mt9m111_reg_write(client, ctx-&gt;reducer_ysize, height);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (mt9m111-&gt;fmt-&gt;code == V4L2_MBUS_FMT_SBGGR8_1X8 ||</div><div class='del'>-	    mt9m111-&gt;fmt-&gt;code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE)</div><div class='del'>-		is_raw_format = 1;</div><div class='del'>-	else</div><div class='del'>-		is_raw_format = 0;</div><div class='add'>+static int mt9m111_setup_geometry(struct mt9m111 *mt9m111, struct v4l2_rect *rect,</div><div class='add'>+			int width, int height, enum v4l2_mbus_pixelcode code)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = v4l2_get_subdevdata(&amp;mt9m111-&gt;subdev);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = reg_write(COLUMN_START, rect-&gt;left);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		ret = reg_write(ROW_START, rect-&gt;top);</div><div class='ctx'> </div><div class='del'>-	if (is_raw_format) {</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = reg_write(WINDOW_WIDTH, width);</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = reg_write(WINDOW_HEIGHT, height);</div><div class='del'>-	} else {</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = reg_write(REDUCER_XZOOM_B, MT9M111_MAX_WIDTH);</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = reg_write(REDUCER_YZOOM_B, MT9M111_MAX_HEIGHT);</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = reg_write(REDUCER_XSIZE_B, width);</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = reg_write(REDUCER_YSIZE_B, height);</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = reg_write(REDUCER_XZOOM_A, MT9M111_MAX_WIDTH);</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = reg_write(REDUCER_YZOOM_A, MT9M111_MAX_HEIGHT);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = reg_write(WINDOW_WIDTH, rect-&gt;width);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = reg_write(WINDOW_HEIGHT, rect-&gt;height);</div><div class='add'>+</div><div class='add'>+	if (code != V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE) {</div><div class='add'>+		/* IFP in use, down-scaling possible */</div><div class='ctx'> 		if (!ret)</div><div class='del'>-			ret = reg_write(REDUCER_XSIZE_A, width);</div><div class='add'>+			ret = mt9m111_setup_rect_ctx(mt9m111, &amp;context_b,</div><div class='add'>+						     rect, width, height);</div><div class='ctx'> 		if (!ret)</div><div class='del'>-			ret = reg_write(REDUCER_YSIZE_A, height);</div><div class='add'>+			ret = mt9m111_setup_rect_ctx(mt9m111, &amp;context_a,</div><div class='add'>+						     rect, width, height);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "%s(%x): %ux%u@%u:%u -&gt; %ux%u = %d\n",</div><div class='add'>+		__func__, code, rect-&gt;width, rect-&gt;height, rect-&gt;left, rect-&gt;top,</div><div class='add'>+		width, height, ret);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt9m111_enable(struct mt9m111 *mt9m111)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client = v4l2_get_subdevdata(&amp;mt9m111-&gt;subdev);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = reg_set(RESET, MT9M111_RESET_CHIP_ENABLE);</div><div class='del'>-	if (!ret)</div><div class='del'>-		mt9m111-&gt;powered = 1;</div><div class='del'>-	return ret;</div><div class='add'>+	return reg_write(RESET, MT9M111_RESET_CHIP_ENABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt9m111_reset(struct mt9m111 *mt9m111)</div><div class='hunk'>@@ -363,43 +384,41 @@ static int mt9m111_reset(struct mt9m111 *mt9m111)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt9m111_make_rect(struct mt9m111 *mt9m111,</div><div class='del'>-			     struct v4l2_rect *rect)</div><div class='add'>+static int mt9m111_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)</div><div class='ctx'> {</div><div class='add'>+	struct v4l2_rect rect = a-&gt;c;</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(sd, struct mt9m111, subdev);</div><div class='add'>+	int width, height;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (a-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (mt9m111-&gt;fmt-&gt;code == V4L2_MBUS_FMT_SBGGR8_1X8 ||</div><div class='ctx'> 	    mt9m111-&gt;fmt-&gt;code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE) {</div><div class='ctx'> 		/* Bayer format - even size lengths */</div><div class='del'>-		rect-&gt;width	= ALIGN(rect-&gt;width, 2);</div><div class='del'>-		rect-&gt;height	= ALIGN(rect-&gt;height, 2);</div><div class='add'>+		rect.width	= ALIGN(rect.width, 2);</div><div class='add'>+		rect.height	= ALIGN(rect.height, 2);</div><div class='ctx'> 		/* Let the user play with the starting pixel */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: the datasheet doesn't specify minimum sizes */</div><div class='del'>-	soc_camera_limit_side(&amp;rect-&gt;left, &amp;rect-&gt;width,</div><div class='add'>+	soc_camera_limit_side(&amp;rect.left, &amp;rect.width,</div><div class='ctx'> 		     MT9M111_MIN_DARK_COLS, 2, MT9M111_MAX_WIDTH);</div><div class='ctx'> </div><div class='del'>-	soc_camera_limit_side(&amp;rect-&gt;top, &amp;rect-&gt;height,</div><div class='add'>+	soc_camera_limit_side(&amp;rect.top, &amp;rect.height,</div><div class='ctx'> 		     MT9M111_MIN_DARK_ROWS, 2, MT9M111_MAX_HEIGHT);</div><div class='ctx'> </div><div class='del'>-	return mt9m111_setup_rect(mt9m111, rect);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt9m111_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)</div><div class='del'>-{</div><div class='del'>-	struct v4l2_rect rect = a-&gt;c;</div><div class='del'>-	struct i2c_client *client = v4l2_get_subdevdata(sd);</div><div class='del'>-	struct mt9m111 *mt9m111 = container_of(sd, struct mt9m111, subdev);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dev_dbg(&amp;client-&gt;dev, "%s left=%d, top=%d, width=%d, height=%d\n",</div><div class='del'>-		__func__, rect.left, rect.top, rect.width, rect.height);</div><div class='add'>+	width = min(mt9m111-&gt;width, rect.width);</div><div class='add'>+	height = min(mt9m111-&gt;height, rect.height);</div><div class='ctx'> </div><div class='del'>-	if (a-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ret = mt9m111_make_rect(mt9m111, &amp;rect);</div><div class='del'>-	if (!ret)</div><div class='add'>+	ret = mt9m111_setup_geometry(mt9m111, &amp;rect, width, height, mt9m111-&gt;fmt-&gt;code);</div><div class='add'>+	if (!ret) {</div><div class='ctx'> 		mt9m111-&gt;rect = rect;</div><div class='add'>+		mt9m111-&gt;width = width;</div><div class='add'>+		mt9m111-&gt;height = height;</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'>@@ -434,8 +453,8 @@ static int mt9m111_g_fmt(struct v4l2_subdev *sd,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt9m111 *mt9m111 = container_of(sd, struct mt9m111, subdev);</div><div class='ctx'> </div><div class='del'>-	mf-&gt;width	= mt9m111-&gt;rect.width;</div><div class='del'>-	mf-&gt;height	= mt9m111-&gt;rect.height;</div><div class='add'>+	mf-&gt;width	= mt9m111-&gt;width;</div><div class='add'>+	mf-&gt;height	= mt9m111-&gt;height;</div><div class='ctx'> 	mf-&gt;code	= mt9m111-&gt;fmt-&gt;code;</div><div class='ctx'> 	mf-&gt;colorspace	= mt9m111-&gt;fmt-&gt;colorspace;</div><div class='ctx'> 	mf-&gt;field	= V4L2_FIELD_NONE;</div><div class='hunk'>@@ -504,46 +523,11 @@ static int mt9m111_set_pixfmt(struct mt9m111 *mt9m111,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = reg_mask(OUTPUT_FORMAT_CTRL2_A, data_outfmt2,</div><div class='del'>-		       mask_outfmt2);</div><div class='add'>+	ret = mt9m111_reg_mask(client, context_a.output_fmt_ctrl2,</div><div class='add'>+			       data_outfmt2, mask_outfmt2);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = reg_mask(OUTPUT_FORMAT_CTRL2_B, data_outfmt2,</div><div class='del'>-			       mask_outfmt2);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mt9m111_s_fmt(struct v4l2_subdev *sd,</div><div class='del'>-			 struct v4l2_mbus_framefmt *mf)</div><div class='del'>-{</div><div class='del'>-	struct i2c_client *client = v4l2_get_subdevdata(sd);</div><div class='del'>-	const struct mt9m111_datafmt *fmt;</div><div class='del'>-	struct mt9m111 *mt9m111 = container_of(sd, struct mt9m111, subdev);</div><div class='del'>-	struct v4l2_rect rect = {</div><div class='del'>-		.left	= mt9m111-&gt;rect.left,</div><div class='del'>-		.top	= mt9m111-&gt;rect.top,</div><div class='del'>-		.width	= mf-&gt;width,</div><div class='del'>-		.height	= mf-&gt;height,</div><div class='del'>-	};</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	fmt = mt9m111_find_datafmt(mf-&gt;code, mt9m111_colour_fmts,</div><div class='del'>-				   ARRAY_SIZE(mt9m111_colour_fmts));</div><div class='del'>-	if (!fmt)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	dev_dbg(&amp;client-&gt;dev,</div><div class='del'>-		"%s code=%x left=%d, top=%d, width=%d, height=%d\n", __func__,</div><div class='del'>-		mf-&gt;code, rect.left, rect.top, rect.width, rect.height);</div><div class='del'>-</div><div class='del'>-	ret = mt9m111_make_rect(mt9m111, &amp;rect);</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = mt9m111_set_pixfmt(mt9m111, mf-&gt;code);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		mt9m111-&gt;rect	= rect;</div><div class='del'>-		mt9m111-&gt;fmt	= fmt;</div><div class='del'>-		mf-&gt;colorspace	= fmt-&gt;colorspace;</div><div class='del'>-	}</div><div class='add'>+		ret = mt9m111_reg_mask(client, context_b.output_fmt_ctrl2,</div><div class='add'>+				       data_outfmt2, mask_outfmt2);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -551,42 +535,71 @@ static int mt9m111_s_fmt(struct v4l2_subdev *sd,</div><div class='ctx'> static int mt9m111_try_fmt(struct v4l2_subdev *sd,</div><div class='ctx'> 			   struct v4l2_mbus_framefmt *mf)</div><div class='ctx'> {</div><div class='add'>+	struct i2c_client *client = v4l2_get_subdevdata(sd);</div><div class='ctx'> 	struct mt9m111 *mt9m111 = container_of(sd, struct mt9m111, subdev);</div><div class='ctx'> 	const struct mt9m111_datafmt *fmt;</div><div class='del'>-	bool bayer = mf-&gt;code == V4L2_MBUS_FMT_SBGGR8_1X8 ||</div><div class='del'>-		mf-&gt;code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE;</div><div class='del'>-</div><div class='del'>-	fmt = mt9m111_find_datafmt(mf-&gt;code, mt9m111_colour_fmts,</div><div class='del'>-				   ARRAY_SIZE(mt9m111_colour_fmts));</div><div class='del'>-	if (!fmt) {</div><div class='del'>-		fmt = mt9m111-&gt;fmt;</div><div class='del'>-		mf-&gt;code = fmt-&gt;code;</div><div class='del'>-	}</div><div class='add'>+	struct v4l2_rect *rect = &amp;mt9m111-&gt;rect;</div><div class='add'>+	bool bayer;</div><div class='add'>+</div><div class='add'>+	fmt = mt9m111_find_datafmt(mt9m111, mf-&gt;code);</div><div class='add'>+</div><div class='add'>+	bayer = fmt-&gt;code == V4L2_MBUS_FMT_SBGGR8_1X8 ||</div><div class='add'>+		fmt-&gt;code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * With Bayer format enforce even side lengths, but let the user play</div><div class='ctx'> 	 * with the starting pixel</div><div class='ctx'> 	 */</div><div class='add'>+	if (bayer) {</div><div class='add'>+		rect-&gt;width = ALIGN(rect-&gt;width, 2);</div><div class='add'>+		rect-&gt;height = ALIGN(rect-&gt;height, 2);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (mf-&gt;height &gt; MT9M111_MAX_HEIGHT)</div><div class='del'>-		mf-&gt;height = MT9M111_MAX_HEIGHT;</div><div class='del'>-	else if (mf-&gt;height &lt; 2)</div><div class='del'>-		mf-&gt;height = 2;</div><div class='del'>-	else if (bayer)</div><div class='del'>-		mf-&gt;height = ALIGN(mf-&gt;height, 2);</div><div class='add'>+	if (fmt-&gt;code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE) {</div><div class='add'>+		/* IFP bypass mode, no scaling */</div><div class='add'>+		mf-&gt;width = rect-&gt;width;</div><div class='add'>+		mf-&gt;height = rect-&gt;height;</div><div class='add'>+	} else {</div><div class='add'>+		/* No upscaling */</div><div class='add'>+		if (mf-&gt;width &gt; rect-&gt;width)</div><div class='add'>+			mf-&gt;width = rect-&gt;width;</div><div class='add'>+		if (mf-&gt;height &gt; rect-&gt;height)</div><div class='add'>+			mf-&gt;height = rect-&gt;height;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (mf-&gt;width &gt; MT9M111_MAX_WIDTH)</div><div class='del'>-		mf-&gt;width = MT9M111_MAX_WIDTH;</div><div class='del'>-	else if (mf-&gt;width &lt; 2)</div><div class='del'>-		mf-&gt;width = 2;</div><div class='del'>-	else if (bayer)</div><div class='del'>-		mf-&gt;width = ALIGN(mf-&gt;width, 2);</div><div class='add'>+	dev_dbg(&amp;client-&gt;dev, "%s(): %ux%u, code=%x\n", __func__,</div><div class='add'>+		mf-&gt;width, mf-&gt;height, fmt-&gt;code);</div><div class='ctx'> </div><div class='add'>+	mf-&gt;code = fmt-&gt;code;</div><div class='ctx'> 	mf-&gt;colorspace = fmt-&gt;colorspace;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mt9m111_s_fmt(struct v4l2_subdev *sd,</div><div class='add'>+			 struct v4l2_mbus_framefmt *mf)</div><div class='add'>+{</div><div class='add'>+	const struct mt9m111_datafmt *fmt;</div><div class='add'>+	struct mt9m111 *mt9m111 = container_of(sd, struct mt9m111, subdev);</div><div class='add'>+	struct v4l2_rect *rect = &amp;mt9m111-&gt;rect;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mt9m111_try_fmt(sd, mf);</div><div class='add'>+	fmt = mt9m111_find_datafmt(mt9m111, mf-&gt;code);</div><div class='add'>+	/* try_fmt() guarantees fmt != NULL &amp;&amp; fmt-&gt;code == mf-&gt;code */</div><div class='add'>+</div><div class='add'>+	ret = mt9m111_setup_geometry(mt9m111, rect, mf-&gt;width, mf-&gt;height, mf-&gt;code);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = mt9m111_set_pixfmt(mt9m111, mf-&gt;code);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		mt9m111-&gt;width	= mf-&gt;width;</div><div class='add'>+		mt9m111-&gt;height	= mf-&gt;height;</div><div class='add'>+		mt9m111-&gt;fmt	= fmt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mt9m111_g_chip_ident(struct v4l2_subdev *sd,</div><div class='ctx'> 				struct v4l2_dbg_chip_ident *id)</div><div class='ctx'> {</div><div class='hunk'>@@ -650,17 +663,10 @@ static int mt9m111_set_flip(struct mt9m111 *mt9m111, int flip, int mask)</div><div class='ctx'> 	struct i2c_client *client = v4l2_get_subdevdata(&amp;mt9m111-&gt;subdev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (mt9m111-&gt;context == HIGHPOWER) {</div><div class='del'>-		if (flip)</div><div class='del'>-			ret = reg_set(READ_MODE_B, mask);</div><div class='del'>-		else</div><div class='del'>-			ret = reg_clear(READ_MODE_B, mask);</div><div class='del'>-	} else {</div><div class='del'>-		if (flip)</div><div class='del'>-			ret = reg_set(READ_MODE_A, mask);</div><div class='del'>-		else</div><div class='del'>-			ret = reg_clear(READ_MODE_A, mask);</div><div class='del'>-	}</div><div class='add'>+	if (flip)</div><div class='add'>+		ret = mt9m111_reg_set(client, mt9m111-&gt;ctx-&gt;read_mode, mask);</div><div class='add'>+	else</div><div class='add'>+		ret = mt9m111_reg_clear(client, mt9m111-&gt;ctx-&gt;read_mode, mask);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -738,30 +744,39 @@ static int mt9m111_s_ctrl(struct v4l2_ctrl *ctrl)</div><div class='ctx'> </div><div class='ctx'> static int mt9m111_suspend(struct mt9m111 *mt9m111)</div><div class='ctx'> {</div><div class='add'>+	struct i2c_client *client = v4l2_get_subdevdata(&amp;mt9m111-&gt;subdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	v4l2_ctrl_s_ctrl(mt9m111-&gt;gain, mt9m111_get_global_gain(mt9m111));</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	ret = reg_set(RESET, MT9M111_RESET_RESET_MODE);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = reg_set(RESET, MT9M111_RESET_RESET_SOC |</div><div class='add'>+			      MT9M111_RESET_OUTPUT_DISABLE |</div><div class='add'>+			      MT9M111_RESET_ANALOG_STANDBY);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = reg_clear(RESET, MT9M111_RESET_CHIP_ENABLE);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mt9m111_restore_state(struct mt9m111 *mt9m111)</div><div class='ctx'> {</div><div class='del'>-	mt9m111_set_context(mt9m111, mt9m111-&gt;context);</div><div class='add'>+	mt9m111_set_context(mt9m111, mt9m111-&gt;ctx);</div><div class='ctx'> 	mt9m111_set_pixfmt(mt9m111, mt9m111-&gt;fmt-&gt;code);</div><div class='del'>-	mt9m111_setup_rect(mt9m111, &amp;mt9m111-&gt;rect);</div><div class='add'>+	mt9m111_setup_geometry(mt9m111, &amp;mt9m111-&gt;rect,</div><div class='add'>+			mt9m111-&gt;width, mt9m111-&gt;height, mt9m111-&gt;fmt-&gt;code);</div><div class='ctx'> 	v4l2_ctrl_handler_setup(&amp;mt9m111-&gt;hdl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt9m111_resume(struct mt9m111 *mt9m111)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret = mt9m111_enable(mt9m111);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = mt9m111_reset(mt9m111);</div><div class='add'>+	if (!ret)</div><div class='add'>+		mt9m111_restore_state(mt9m111);</div><div class='ctx'> </div><div class='del'>-	if (mt9m111-&gt;powered) {</div><div class='del'>-		ret = mt9m111_enable(mt9m111);</div><div class='del'>-		if (!ret)</div><div class='del'>-			ret = mt9m111_reset(mt9m111);</div><div class='del'>-		if (!ret)</div><div class='del'>-			mt9m111_restore_state(mt9m111);</div><div class='del'>-	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -770,12 +785,13 @@ static int mt9m111_init(struct mt9m111 *mt9m111)</div><div class='ctx'> 	struct i2c_client *client = v4l2_get_subdevdata(&amp;mt9m111-&gt;subdev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mt9m111-&gt;context = HIGHPOWER;</div><div class='add'>+	/* Default HIGHPOWER context */</div><div class='add'>+	mt9m111-&gt;ctx = &amp;context_b;</div><div class='ctx'> 	ret = mt9m111_enable(mt9m111);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		ret = mt9m111_reset(mt9m111);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ret = mt9m111_set_context(mt9m111, mt9m111-&gt;context);</div><div class='add'>+		ret = mt9m111_set_context(mt9m111, mt9m111-&gt;ctx);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		dev_err(&amp;client-&gt;dev, "mt9m111 init failed: %d\n", ret);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/media/video/mt9p031.c b/drivers/media/video/mt9p031.c<br/>index 73c068993f05..93c3ec7426e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/mt9p031.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mt9p031.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/mt9p031.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/mt9p031.c</a></div><div class='hunk'>@@ -132,13 +132,12 @@ static struct mt9p031 *to_mt9p031(struct v4l2_subdev *sd)</div><div class='ctx'> </div><div class='ctx'> static int mt9p031_read(struct i2c_client *client, u8 reg)</div><div class='ctx'> {</div><div class='del'>-	s32 data = i2c_smbus_read_word_data(client, reg);</div><div class='del'>-	return data &lt; 0 ? data : be16_to_cpu(data);</div><div class='add'>+	return i2c_smbus_read_word_swapped(client, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt9p031_write(struct i2c_client *client, u8 reg, u16 data)</div><div class='ctx'> {</div><div class='del'>-	return i2c_smbus_write_word_data(client, reg, cpu_to_be16(data));</div><div class='add'>+	return i2c_smbus_write_word_swapped(client, reg, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt9p031_set_output_control(struct mt9p031 *mt9p031, u16 clear,</div><div class='head'>diff --git a/drivers/media/video/mt9t001.c b/drivers/media/video/mt9t001.c<br/>index 08074b8a2736..cd81d04a529e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/mt9t001.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mt9t001.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/mt9t001.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/mt9t001.c</a></div><div class='hunk'>@@ -133,13 +133,12 @@ static inline struct mt9t001 *to_mt9t001(struct v4l2_subdev *sd)</div><div class='ctx'> </div><div class='ctx'> static int mt9t001_read(struct i2c_client *client, u8 reg)</div><div class='ctx'> {</div><div class='del'>-	s32 data = i2c_smbus_read_word_data(client, reg);</div><div class='del'>-	return data &lt; 0 ? data : be16_to_cpu(data);</div><div class='add'>+	return i2c_smbus_read_word_swapped(client, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt9t001_write(struct i2c_client *client, u8 reg, u16 data)</div><div class='ctx'> {</div><div class='del'>-	return i2c_smbus_write_word_data(client, reg, cpu_to_be16(data));</div><div class='add'>+	return i2c_smbus_write_word_swapped(client, reg, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt9t001_set_output_control(struct mt9t001 *mt9t001, u16 clear,</div><div class='head'>diff --git a/drivers/media/video/mt9t031.c b/drivers/media/video/mt9t031.c<br/>index 0e78477452ff..84add1aef139 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/mt9t031.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mt9t031.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/mt9t031.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/mt9t031.c</a></div><div class='hunk'>@@ -90,14 +90,13 @@ static struct mt9t031 *to_mt9t031(const struct i2c_client *client)</div><div class='ctx'> </div><div class='ctx'> static int reg_read(struct i2c_client *client, const u8 reg)</div><div class='ctx'> {</div><div class='del'>-	s32 data = i2c_smbus_read_word_data(client, reg);</div><div class='del'>-	return data &lt; 0 ? data : swab16(data);</div><div class='add'>+	return i2c_smbus_read_word_swapped(client, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int reg_write(struct i2c_client *client, const u8 reg,</div><div class='ctx'> 		     const u16 data)</div><div class='ctx'> {</div><div class='del'>-	return i2c_smbus_write_word_data(client, reg, swab16(data));</div><div class='add'>+	return i2c_smbus_write_word_swapped(client, reg, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int reg_set(struct i2c_client *client, const u8 reg,</div><div class='head'>diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c<br/>index 690ee0d42eeb..944940758fa3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/mt9v022.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mt9v022.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/mt9v022.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/mt9v022.c</a></div><div class='hunk'>@@ -130,14 +130,13 @@ static struct mt9v022 *to_mt9v022(const struct i2c_client *client)</div><div class='ctx'> </div><div class='ctx'> static int reg_read(struct i2c_client *client, const u8 reg)</div><div class='ctx'> {</div><div class='del'>-	s32 data = i2c_smbus_read_word_data(client, reg);</div><div class='del'>-	return data &lt; 0 ? data : swab16(data);</div><div class='add'>+	return i2c_smbus_read_word_swapped(client, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int reg_write(struct i2c_client *client, const u8 reg,</div><div class='ctx'> 		     const u16 data)</div><div class='ctx'> {</div><div class='del'>-	return i2c_smbus_write_word_data(client, reg, swab16(data));</div><div class='add'>+	return i2c_smbus_write_word_swapped(client, reg, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int reg_set(struct i2c_client *client, const u8 reg,</div><div class='head'>diff --git a/drivers/media/video/mt9v032.c b/drivers/media/video/mt9v032.c<br/>index f080c162123f..d90b982cc218 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/mt9v032.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mt9v032.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/mt9v032.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/mt9v032.c</a></div><div class='hunk'>@@ -139,10 +139,10 @@ static struct mt9v032 *to_mt9v032(struct v4l2_subdev *sd)</div><div class='ctx'> </div><div class='ctx'> static int mt9v032_read(struct i2c_client *client, const u8 reg)</div><div class='ctx'> {</div><div class='del'>-	s32 data = i2c_smbus_read_word_data(client, reg);</div><div class='add'>+	s32 data = i2c_smbus_read_word_swapped(client, reg);</div><div class='ctx'> 	dev_dbg(&amp;client-&gt;dev, "%s: read 0x%04x from 0x%02x\n", __func__,</div><div class='del'>-		swab16(data), reg);</div><div class='del'>-	return data &lt; 0 ? data : swab16(data);</div><div class='add'>+		data, reg);</div><div class='add'>+	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt9v032_write(struct i2c_client *client, const u8 reg,</div><div class='hunk'>@@ -150,7 +150,7 @@ static int mt9v032_write(struct i2c_client *client, const u8 reg,</div><div class='ctx'> {</div><div class='ctx'> 	dev_dbg(&amp;client-&gt;dev, "%s: writing 0x%04x to 0x%02x\n", __func__,</div><div class='ctx'> 		data, reg);</div><div class='del'>-	return i2c_smbus_write_word_data(client, reg, swab16(data));</div><div class='add'>+	return i2c_smbus_write_word_swapped(client, reg, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mt9v032_set_chip_control(struct mt9v032 *mt9v032, u16 clear, u16 set)</div><div class='head'>diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c<br/>index 18e94c7d2be8..055d11ddb038 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/mx1_camera.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mx1_camera.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/mx1_camera.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/mx1_camera.c</a></div><div class='hunk'>@@ -487,7 +487,7 @@ static int mx1_camera_set_crop(struct soc_camera_device *icd,</div><div class='ctx'> 	return v4l2_subdev_call(sd, video, s_crop, a);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mx1_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)</div><div class='add'>+static int mx1_camera_set_bus_param(struct soc_camera_device *icd)</div><div class='ctx'> {</div><div class='ctx'> 	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);</div><div class='ctx'> 	struct soc_camera_host *ici = to_soc_camera_host(icd-&gt;parent);</div><div class='head'>diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c<br/>index a803d9ea8fd6..04aab0c538aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/mx2_camera.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mx2_camera.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/mx2_camera.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/mx2_camera.c</a></div><div class='hunk'>@@ -210,6 +210,22 @@</div><div class='ctx'> </div><div class='ctx'> #define MAX_VIDEO_MEM	16</div><div class='ctx'> </div><div class='add'>+struct mx2_prp_cfg {</div><div class='add'>+	int channel;</div><div class='add'>+	u32 in_fmt;</div><div class='add'>+	u32 out_fmt;</div><div class='add'>+	u32 src_pixel;</div><div class='add'>+	u32 ch1_pixel;</div><div class='add'>+	u32 irq_flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* prp configuration for a client-host fmt pair */</div><div class='add'>+struct mx2_fmt_cfg {</div><div class='add'>+	enum v4l2_mbus_pixelcode	in_fmt;</div><div class='add'>+	u32				out_fmt;</div><div class='add'>+	struct mx2_prp_cfg		cfg;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mx2_camera_dev {</div><div class='ctx'> 	struct device		*dev;</div><div class='ctx'> 	struct soc_camera_host	soc_host;</div><div class='hunk'>@@ -241,6 +257,8 @@ struct mx2_camera_dev {</div><div class='ctx'> 	void			*discard_buffer;</div><div class='ctx'> 	dma_addr_t		discard_buffer_dma;</div><div class='ctx'> 	size_t			discard_size;</div><div class='add'>+	struct mx2_fmt_cfg	*emma_prp;</div><div class='add'>+	u32			frame_count;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* buffer for one video frame */</div><div class='hunk'>@@ -253,6 +271,59 @@ struct mx2_buffer {</div><div class='ctx'> 	int bufnum;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct mx2_fmt_cfg mx27_emma_prp_table[] = {</div><div class='add'>+	/*</div><div class='add'>+	 * This is a generic configuration which is valid for most</div><div class='add'>+	 * prp input-output format combinations.</div><div class='add'>+	 * We set the incomming and outgoing pixelformat to a</div><div class='add'>+	 * 16 Bit wide format and adjust the bytesperline</div><div class='add'>+	 * accordingly. With this configuration the inputdata</div><div class='add'>+	 * will not be changed by the emma and could be any type</div><div class='add'>+	 * of 16 Bit Pixelformat.</div><div class='add'>+	 */</div><div class='add'>+	{</div><div class='add'>+		.in_fmt		= 0,</div><div class='add'>+		.out_fmt	= 0,</div><div class='add'>+		.cfg		= {</div><div class='add'>+			.channel	= 1,</div><div class='add'>+			.in_fmt		= PRP_CNTL_DATA_IN_RGB16,</div><div class='add'>+			.out_fmt	= PRP_CNTL_CH1_OUT_RGB16,</div><div class='add'>+			.src_pixel	= 0x2ca00565, /* RGB565 */</div><div class='add'>+			.ch1_pixel	= 0x2ca00565, /* RGB565 */</div><div class='add'>+			.irq_flags	= PRP_INTR_RDERR | PRP_INTR_CH1WERR |</div><div class='add'>+						PRP_INTR_CH1FC | PRP_INTR_LBOVF,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.in_fmt		= V4L2_MBUS_FMT_YUYV8_2X8,</div><div class='add'>+		.out_fmt	= V4L2_PIX_FMT_YUV420,</div><div class='add'>+		.cfg		= {</div><div class='add'>+			.channel	= 2,</div><div class='add'>+			.in_fmt		= PRP_CNTL_DATA_IN_YUV422,</div><div class='add'>+			.out_fmt	= PRP_CNTL_CH2_OUT_YUV420,</div><div class='add'>+			.src_pixel	= 0x22000888, /* YUV422 (YUYV) */</div><div class='add'>+			.irq_flags	= PRP_INTR_RDERR | PRP_INTR_CH2WERR |</div><div class='add'>+					PRP_INTR_CH2FC | PRP_INTR_LBOVF |</div><div class='add'>+					PRP_INTR_CH2OVF,</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mx2_fmt_cfg *mx27_emma_prp_get_format(</div><div class='add'>+					enum v4l2_mbus_pixelcode in_fmt,</div><div class='add'>+					u32 out_fmt)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; ARRAY_SIZE(mx27_emma_prp_table); i++)</div><div class='add'>+		if ((mx27_emma_prp_table[i].in_fmt == in_fmt) &amp;&amp;</div><div class='add'>+				(mx27_emma_prp_table[i].out_fmt == out_fmt)) {</div><div class='add'>+			return &amp;mx27_emma_prp_table[i];</div><div class='add'>+		}</div><div class='add'>+	/* If no match return the most generic configuration */</div><div class='add'>+	return &amp;mx27_emma_prp_table[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void mx2_camera_deactivate(struct mx2_camera_dev *pcdev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -301,6 +372,7 @@ static int mx2_camera_add_device(struct soc_camera_device *icd)</div><div class='ctx'> 	writel(pcdev-&gt;csicr1, pcdev-&gt;base_csi + CSICR1);</div><div class='ctx'> </div><div class='ctx'> 	pcdev-&gt;icd = icd;</div><div class='add'>+	pcdev-&gt;frame_count = 0;</div><div class='ctx'> </div><div class='ctx'> 	dev_info(icd-&gt;parent, "Camera driver attached to camera %d\n",</div><div class='ctx'> 		 icd-&gt;devnum);</div><div class='hunk'>@@ -719,55 +791,77 @@ static void mx27_camera_emma_buf_init(struct soc_camera_device *icd,</div><div class='ctx'> 	struct soc_camera_host *ici =</div><div class='ctx'> 		to_soc_camera_host(icd-&gt;parent);</div><div class='ctx'> 	struct mx2_camera_dev *pcdev = ici-&gt;priv;</div><div class='add'>+	struct mx2_fmt_cfg *prp = pcdev-&gt;emma_prp;</div><div class='add'>+	u32 imgsize = pcdev-&gt;icd-&gt;user_height * pcdev-&gt;icd-&gt;user_width;</div><div class='add'>+</div><div class='add'>+	if (prp-&gt;cfg.channel == 1) {</div><div class='add'>+		writel(pcdev-&gt;discard_buffer_dma,</div><div class='add'>+				pcdev-&gt;base_emma + PRP_DEST_RGB1_PTR);</div><div class='add'>+		writel(pcdev-&gt;discard_buffer_dma,</div><div class='add'>+				pcdev-&gt;base_emma + PRP_DEST_RGB2_PTR);</div><div class='add'>+</div><div class='add'>+		writel(PRP_CNTL_CH1EN |</div><div class='add'>+				PRP_CNTL_CSIEN |</div><div class='add'>+				prp-&gt;cfg.in_fmt |</div><div class='add'>+				prp-&gt;cfg.out_fmt |</div><div class='add'>+				PRP_CNTL_CH1_LEN |</div><div class='add'>+				PRP_CNTL_CH1BYP |</div><div class='add'>+				PRP_CNTL_CH1_TSKIP(0) |</div><div class='add'>+				PRP_CNTL_IN_TSKIP(0),</div><div class='add'>+				pcdev-&gt;base_emma + PRP_CNTL);</div><div class='add'>+</div><div class='add'>+		writel((icd-&gt;user_width &lt;&lt; 16) | icd-&gt;user_height,</div><div class='add'>+			pcdev-&gt;base_emma + PRP_SRC_FRAME_SIZE);</div><div class='add'>+		writel((icd-&gt;user_width &lt;&lt; 16) | icd-&gt;user_height,</div><div class='add'>+			pcdev-&gt;base_emma + PRP_CH1_OUT_IMAGE_SIZE);</div><div class='add'>+		writel(bytesperline,</div><div class='add'>+			pcdev-&gt;base_emma + PRP_DEST_CH1_LINE_STRIDE);</div><div class='add'>+		writel(prp-&gt;cfg.src_pixel,</div><div class='add'>+			pcdev-&gt;base_emma + PRP_SRC_PIXEL_FORMAT_CNTL);</div><div class='add'>+		writel(prp-&gt;cfg.ch1_pixel,</div><div class='add'>+			pcdev-&gt;base_emma + PRP_CH1_PIXEL_FORMAT_CNTL);</div><div class='add'>+	} else { /* channel 2 */</div><div class='add'>+		writel(pcdev-&gt;discard_buffer_dma,</div><div class='add'>+			pcdev-&gt;base_emma + PRP_DEST_Y_PTR);</div><div class='add'>+		writel(pcdev-&gt;discard_buffer_dma,</div><div class='add'>+			pcdev-&gt;base_emma + PRP_SOURCE_Y_PTR);</div><div class='add'>+</div><div class='add'>+		if (prp-&gt;cfg.out_fmt == PRP_CNTL_CH2_OUT_YUV420) {</div><div class='add'>+			writel(pcdev-&gt;discard_buffer_dma + imgsize,</div><div class='add'>+				pcdev-&gt;base_emma + PRP_DEST_CB_PTR);</div><div class='add'>+			writel(pcdev-&gt;discard_buffer_dma + ((5 * imgsize) / 4),</div><div class='add'>+				pcdev-&gt;base_emma + PRP_DEST_CR_PTR);</div><div class='add'>+			writel(pcdev-&gt;discard_buffer_dma + imgsize,</div><div class='add'>+				pcdev-&gt;base_emma + PRP_SOURCE_CB_PTR);</div><div class='add'>+			writel(pcdev-&gt;discard_buffer_dma + ((5 * imgsize) / 4),</div><div class='add'>+				pcdev-&gt;base_emma + PRP_SOURCE_CR_PTR);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	writel(pcdev-&gt;discard_buffer_dma,</div><div class='del'>-			pcdev-&gt;base_emma + PRP_DEST_RGB1_PTR);</div><div class='del'>-	writel(pcdev-&gt;discard_buffer_dma,</div><div class='del'>-			pcdev-&gt;base_emma + PRP_DEST_RGB2_PTR);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We only use the EMMA engine to get rid of the broken</div><div class='del'>-	 * DMA Engine. No color space consversion at the moment.</div><div class='del'>-	 * We set the incomming and outgoing pixelformat to an</div><div class='del'>-	 * 16 Bit wide format and adjust the bytesperline</div><div class='del'>-	 * accordingly. With this configuration the inputdata</div><div class='del'>-	 * will not be changed by the emma and could be any type</div><div class='del'>-	 * of 16 Bit Pixelformat.</div><div class='del'>-	 */</div><div class='del'>-	writel(PRP_CNTL_CH1EN |</div><div class='add'>+		writel(PRP_CNTL_CH2EN |</div><div class='ctx'> 			PRP_CNTL_CSIEN |</div><div class='del'>-			PRP_CNTL_DATA_IN_RGB16 |</div><div class='del'>-			PRP_CNTL_CH1_OUT_RGB16 |</div><div class='del'>-			PRP_CNTL_CH1_LEN |</div><div class='del'>-			PRP_CNTL_CH1BYP |</div><div class='del'>-			PRP_CNTL_CH1_TSKIP(0) |</div><div class='add'>+			prp-&gt;cfg.in_fmt |</div><div class='add'>+			prp-&gt;cfg.out_fmt |</div><div class='add'>+			PRP_CNTL_CH2_LEN |</div><div class='add'>+			PRP_CNTL_CH2_TSKIP(0) |</div><div class='ctx'> 			PRP_CNTL_IN_TSKIP(0),</div><div class='ctx'> 			pcdev-&gt;base_emma + PRP_CNTL);</div><div class='ctx'> </div><div class='del'>-	writel(((bytesperline &gt;&gt; 1) &lt;&lt; 16) | icd-&gt;user_height,</div><div class='add'>+		writel((icd-&gt;user_width &lt;&lt; 16) | icd-&gt;user_height,</div><div class='ctx'> 			pcdev-&gt;base_emma + PRP_SRC_FRAME_SIZE);</div><div class='del'>-	writel(((bytesperline &gt;&gt; 1) &lt;&lt; 16) | icd-&gt;user_height,</div><div class='del'>-			pcdev-&gt;base_emma + PRP_CH1_OUT_IMAGE_SIZE);</div><div class='del'>-	writel(bytesperline,</div><div class='del'>-			pcdev-&gt;base_emma + PRP_DEST_CH1_LINE_STRIDE);</div><div class='del'>-	writel(0x2ca00565, /* RGB565 */</div><div class='add'>+</div><div class='add'>+		writel((icd-&gt;user_width &lt;&lt; 16) | icd-&gt;user_height,</div><div class='add'>+			pcdev-&gt;base_emma + PRP_CH2_OUT_IMAGE_SIZE);</div><div class='add'>+</div><div class='add'>+		writel(prp-&gt;cfg.src_pixel,</div><div class='ctx'> 			pcdev-&gt;base_emma + PRP_SRC_PIXEL_FORMAT_CNTL);</div><div class='del'>-	writel(0x2ca00565, /* RGB565 */</div><div class='del'>-			pcdev-&gt;base_emma + PRP_CH1_PIXEL_FORMAT_CNTL);</div><div class='add'>+</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Enable interrupts */</div><div class='del'>-	writel(PRP_INTR_RDERR |</div><div class='del'>-			PRP_INTR_CH1WERR |</div><div class='del'>-			PRP_INTR_CH2WERR |</div><div class='del'>-			PRP_INTR_CH1FC |</div><div class='del'>-			PRP_INTR_CH2FC |</div><div class='del'>-			PRP_INTR_LBOVF |</div><div class='del'>-			PRP_INTR_CH2OVF,</div><div class='del'>-			pcdev-&gt;base_emma + PRP_INTR_CNTL);</div><div class='add'>+	writel(prp-&gt;cfg.irq_flags, pcdev-&gt;base_emma + PRP_INTR_CNTL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mx2_camera_set_bus_param(struct soc_camera_device *icd,</div><div class='del'>-		__u32 pixfmt)</div><div class='add'>+static int mx2_camera_set_bus_param(struct soc_camera_device *icd)</div><div class='ctx'> {</div><div class='ctx'> 	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);</div><div class='ctx'> 	struct soc_camera_host *ici = to_soc_camera_host(icd-&gt;parent);</div><div class='hunk'>@@ -911,9 +1005,58 @@ static int mx2_camera_set_crop(struct soc_camera_device *icd,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mx2_camera_get_formats(struct soc_camera_device *icd,</div><div class='add'>+				  unsigned int idx,</div><div class='add'>+				  struct soc_camera_format_xlate *xlate)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);</div><div class='add'>+	const struct soc_mbus_pixelfmt *fmt;</div><div class='add'>+	struct device *dev = icd-&gt;parent;</div><div class='add'>+	enum v4l2_mbus_pixelcode code;</div><div class='add'>+	int ret, formats = 0;</div><div class='add'>+</div><div class='add'>+	ret = v4l2_subdev_call(sd, video, enum_mbus_fmt, idx, &amp;code);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		/* no more formats */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	fmt = soc_mbus_get_fmtdesc(code);</div><div class='add'>+	if (!fmt) {</div><div class='add'>+		dev_err(dev, "Invalid format code #%u: %d\n", idx, code);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (code == V4L2_MBUS_FMT_YUYV8_2X8) {</div><div class='add'>+		formats++;</div><div class='add'>+		if (xlate) {</div><div class='add'>+			/*</div><div class='add'>+			 * CH2 can output YUV420 which is a standard format in</div><div class='add'>+			 * soc_mediabus.c</div><div class='add'>+			 */</div><div class='add'>+			xlate-&gt;host_fmt =</div><div class='add'>+				soc_mbus_get_fmtdesc(V4L2_MBUS_FMT_YUYV8_1_5X8);</div><div class='add'>+			xlate-&gt;code	= code;</div><div class='add'>+			dev_dbg(dev, "Providing host format %s for sensor code %d\n",</div><div class='add'>+			       xlate-&gt;host_fmt-&gt;name, code);</div><div class='add'>+			xlate++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Generic pass-trough */</div><div class='add'>+	formats++;</div><div class='add'>+	if (xlate) {</div><div class='add'>+		xlate-&gt;host_fmt = fmt;</div><div class='add'>+		xlate-&gt;code	= code;</div><div class='add'>+		xlate++;</div><div class='add'>+	}</div><div class='add'>+	return formats;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mx2_camera_set_fmt(struct soc_camera_device *icd,</div><div class='ctx'> 			       struct v4l2_format *f)</div><div class='ctx'> {</div><div class='add'>+	struct soc_camera_host *ici = to_soc_camera_host(icd-&gt;parent);</div><div class='add'>+	struct mx2_camera_dev *pcdev = ici-&gt;priv;</div><div class='ctx'> 	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);</div><div class='ctx'> 	const struct soc_camera_format_xlate *xlate;</div><div class='ctx'> 	struct v4l2_pix_format *pix = &amp;f-&gt;fmt.pix;</div><div class='hunk'>@@ -946,6 +1089,10 @@ static int mx2_camera_set_fmt(struct soc_camera_device *icd,</div><div class='ctx'> 	pix-&gt;colorspace		= mf.colorspace;</div><div class='ctx'> 	icd-&gt;current_fmt	= xlate;</div><div class='ctx'> </div><div class='add'>+	if (mx27_camera_emma(pcdev))</div><div class='add'>+		pcdev-&gt;emma_prp = mx27_emma_prp_get_format(xlate-&gt;code,</div><div class='add'>+						xlate-&gt;host_fmt-&gt;fourcc);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1011,7 +1158,12 @@ static int mx2_camera_try_fmt(struct soc_camera_device *icd,</div><div class='ctx'> </div><div class='ctx'> 	if (mf.field == V4L2_FIELD_ANY)</div><div class='ctx'> 		mf.field = V4L2_FIELD_NONE;</div><div class='del'>-	if (mf.field != V4L2_FIELD_NONE) {</div><div class='add'>+	/*</div><div class='add'>+	 * Driver supports interlaced images provided they have</div><div class='add'>+	 * both fields so that they can be processed as if they</div><div class='add'>+	 * were progressive.</div><div class='add'>+	 */</div><div class='add'>+	if (mf.field != V4L2_FIELD_NONE &amp;&amp; !V4L2_FIELD_HAS_BOTH(mf.field)) {</div><div class='ctx'> 		dev_err(icd-&gt;parent, "Field type %d unsupported.\n",</div><div class='ctx'> 				mf.field);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1173,6 +1325,7 @@ static struct soc_camera_host_ops mx2_soc_camera_host_ops = {</div><div class='ctx'> 	.remove		= mx2_camera_remove_device,</div><div class='ctx'> 	.set_fmt	= mx2_camera_set_fmt,</div><div class='ctx'> 	.set_crop	= mx2_camera_set_crop,</div><div class='add'>+	.get_formats	= mx2_camera_get_formats,</div><div class='ctx'> 	.try_fmt	= mx2_camera_try_fmt,</div><div class='ctx'> 	.init_videobuf	= mx2_camera_init_videobuf,</div><div class='ctx'> 	.reqbufs	= mx2_camera_reqbufs,</div><div class='hunk'>@@ -1184,6 +1337,8 @@ static struct soc_camera_host_ops mx2_soc_camera_host_ops = {</div><div class='ctx'> static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,</div><div class='ctx'> 		int bufnum, int state)</div><div class='ctx'> {</div><div class='add'>+	u32 imgsize = pcdev-&gt;icd-&gt;user_height * pcdev-&gt;icd-&gt;user_width;</div><div class='add'>+	struct mx2_fmt_cfg *prp = pcdev-&gt;emma_prp;</div><div class='ctx'> 	struct mx2_buffer *buf;</div><div class='ctx'> 	struct videobuf_buffer *vb;</div><div class='ctx'> 	unsigned long phys;</div><div class='hunk'>@@ -1197,12 +1352,22 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,</div><div class='ctx'> 		vb = &amp;buf-&gt;vb;</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 		phys = videobuf_to_dma_contig(vb);</div><div class='del'>-		if (readl(pcdev-&gt;base_emma + PRP_DEST_RGB1_PTR + 4 * bufnum)</div><div class='del'>-				!= phys) {</div><div class='del'>-			dev_err(pcdev-&gt;dev, "%p != %p\n", phys,</div><div class='del'>-					readl(pcdev-&gt;base_emma +</div><div class='del'>-						PRP_DEST_RGB1_PTR +</div><div class='del'>-						4 * bufnum));</div><div class='add'>+		if (prp-&gt;cfg.channel == 1) {</div><div class='add'>+			if (readl(pcdev-&gt;base_emma + PRP_DEST_RGB1_PTR +</div><div class='add'>+				4 * bufnum) != phys) {</div><div class='add'>+				dev_err(pcdev-&gt;dev, "%p != %p\n", phys,</div><div class='add'>+						readl(pcdev-&gt;base_emma +</div><div class='add'>+							PRP_DEST_RGB1_PTR +</div><div class='add'>+							4 * bufnum));</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (readl(pcdev-&gt;base_emma + PRP_DEST_Y_PTR -</div><div class='add'>+				0x14 * bufnum) != phys) {</div><div class='add'>+				dev_err(pcdev-&gt;dev, "%p != %p\n", phys,</div><div class='add'>+						readl(pcdev-&gt;base_emma +</div><div class='add'>+							PRP_DEST_Y_PTR -</div><div class='add'>+							0x14 * bufnum));</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='ctx'> 		dev_dbg(pcdev-&gt;dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__, vb,</div><div class='hunk'>@@ -1211,14 +1376,29 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,</div><div class='ctx'> 		list_del(&amp;vb-&gt;queue);</div><div class='ctx'> 		vb-&gt;state = state;</div><div class='ctx'> 		do_gettimeofday(&amp;vb-&gt;ts);</div><div class='del'>-		vb-&gt;field_count++;</div><div class='add'>+		vb-&gt;field_count = pcdev-&gt;frame_count * 2;</div><div class='add'>+		pcdev-&gt;frame_count++;</div><div class='ctx'> </div><div class='ctx'> 		wake_up(&amp;vb-&gt;done);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(&amp;pcdev-&gt;capture)) {</div><div class='del'>-		writel(pcdev-&gt;discard_buffer_dma, pcdev-&gt;base_emma +</div><div class='del'>-				PRP_DEST_RGB1_PTR + 4 * bufnum);</div><div class='add'>+		if (prp-&gt;cfg.channel == 1) {</div><div class='add'>+			writel(pcdev-&gt;discard_buffer_dma, pcdev-&gt;base_emma +</div><div class='add'>+					PRP_DEST_RGB1_PTR + 4 * bufnum);</div><div class='add'>+		} else {</div><div class='add'>+			writel(pcdev-&gt;discard_buffer_dma, pcdev-&gt;base_emma +</div><div class='add'>+						PRP_DEST_Y_PTR -</div><div class='add'>+						0x14 * bufnum);</div><div class='add'>+			if (prp-&gt;out_fmt == V4L2_PIX_FMT_YUV420) {</div><div class='add'>+				writel(pcdev-&gt;discard_buffer_dma + imgsize,</div><div class='add'>+				       pcdev-&gt;base_emma + PRP_DEST_CB_PTR -</div><div class='add'>+				       0x14 * bufnum);</div><div class='add'>+				writel(pcdev-&gt;discard_buffer_dma +</div><div class='add'>+				       ((5 * imgsize) / 4), pcdev-&gt;base_emma +</div><div class='add'>+				       PRP_DEST_CR_PTR - 0x14 * bufnum);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1233,7 +1413,18 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,</div><div class='ctx'> 	vb-&gt;state = VIDEOBUF_ACTIVE;</div><div class='ctx'> </div><div class='ctx'> 	phys = videobuf_to_dma_contig(vb);</div><div class='del'>-	writel(phys, pcdev-&gt;base_emma + PRP_DEST_RGB1_PTR + 4 * bufnum);</div><div class='add'>+	if (prp-&gt;cfg.channel == 1) {</div><div class='add'>+		writel(phys, pcdev-&gt;base_emma + PRP_DEST_RGB1_PTR + 4 * bufnum);</div><div class='add'>+	} else {</div><div class='add'>+		writel(phys, pcdev-&gt;base_emma +</div><div class='add'>+				PRP_DEST_Y_PTR - 0x14 * bufnum);</div><div class='add'>+		if (prp-&gt;cfg.out_fmt == PRP_CNTL_CH2_OUT_YUV420) {</div><div class='add'>+			writel(phys + imgsize, pcdev-&gt;base_emma +</div><div class='add'>+					PRP_DEST_CB_PTR - 0x14 * bufnum);</div><div class='add'>+			writel(phys + ((5 * imgsize) / 4), pcdev-&gt;base_emma +</div><div class='add'>+					PRP_DEST_CR_PTR - 0x14 * bufnum);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t mx27_camera_emma_irq(int irq_emma, void *data)</div><div class='hunk'>@@ -1253,10 +1444,12 @@ static irqreturn_t mx27_camera_emma_irq(int irq_emma, void *data)</div><div class='ctx'> 		 * the next one.</div><div class='ctx'> 		 */</div><div class='ctx'> 		cntl = readl(pcdev-&gt;base_emma + PRP_CNTL);</div><div class='del'>-		writel(cntl &amp; ~PRP_CNTL_CH1EN, pcdev-&gt;base_emma + PRP_CNTL);</div><div class='add'>+		writel(cntl &amp; ~(PRP_CNTL_CH1EN | PRP_CNTL_CH2EN),</div><div class='add'>+		       pcdev-&gt;base_emma + PRP_CNTL);</div><div class='ctx'> 		writel(cntl, pcdev-&gt;base_emma + PRP_CNTL);</div><div class='ctx'> 	}</div><div class='del'>-	if ((status &amp; (3 &lt;&lt; 5)) == (3 &lt;&lt; 5)</div><div class='add'>+	if ((((status &amp; (3 &lt;&lt; 5)) == (3 &lt;&lt; 5)) ||</div><div class='add'>+		((status &amp; (3 &lt;&lt; 3)) == (3 &lt;&lt; 3)))</div><div class='ctx'> 			&amp;&amp; !list_empty(&amp;pcdev-&gt;active_bufs)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Both buffers have triggered, process the one we're expecting</div><div class='hunk'>@@ -1267,9 +1460,9 @@ static irqreturn_t mx27_camera_emma_irq(int irq_emma, void *data)</div><div class='ctx'> 		mx27_camera_frame_done_emma(pcdev, buf-&gt;bufnum, VIDEOBUF_DONE);</div><div class='ctx'> 		status &amp;= ~(1 &lt;&lt; (6 - buf-&gt;bufnum)); /* mark processed */</div><div class='ctx'> 	}</div><div class='del'>-	if (status &amp; (1 &lt;&lt; 6))</div><div class='add'>+	if ((status &amp; (1 &lt;&lt; 6)) || (status &amp; (1 &lt;&lt; 4)))</div><div class='ctx'> 		mx27_camera_frame_done_emma(pcdev, 0, VIDEOBUF_DONE);</div><div class='del'>-	if (status &amp; (1 &lt;&lt; 5))</div><div class='add'>+	if ((status &amp; (1 &lt;&lt; 5)) || (status &amp; (1 &lt;&lt; 3)))</div><div class='ctx'> 		mx27_camera_frame_done_emma(pcdev, 1, VIDEOBUF_DONE);</div><div class='ctx'> </div><div class='ctx'> 	writel(status, pcdev-&gt;base_emma + PRP_INTRSTATUS);</div><div class='head'>diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c<br/>index f96f92f00f92..74522773e934 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/mx3_camera.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/mx3_camera.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/mx3_camera.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/mx3_camera.c</a></div><div class='hunk'>@@ -287,7 +287,7 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb)</div><div class='ctx'> 		sg_dma_len(sg)		= new_size;</div><div class='ctx'> </div><div class='ctx'> 		txd = ichan-&gt;dma_chan.device-&gt;device_prep_slave_sg(</div><div class='del'>-			&amp;ichan-&gt;dma_chan, sg, 1, DMA_FROM_DEVICE,</div><div class='add'>+			&amp;ichan-&gt;dma_chan, sg, 1, DMA_DEV_TO_MEM,</div><div class='ctx'> 			DMA_PREP_INTERRUPT);</div><div class='ctx'> 		if (!txd)</div><div class='ctx'> 			goto error;</div><div class='hunk'>@@ -982,12 +982,13 @@ static int mx3_camera_querycap(struct soc_camera_host *ici,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)</div><div class='add'>+static int mx3_camera_set_bus_param(struct soc_camera_device *icd)</div><div class='ctx'> {</div><div class='ctx'> 	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);</div><div class='ctx'> 	struct soc_camera_host *ici = to_soc_camera_host(icd-&gt;parent);</div><div class='ctx'> 	struct mx3_camera_dev *mx3_cam = ici-&gt;priv;</div><div class='ctx'> 	struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};</div><div class='add'>+	u32 pixfmt = icd-&gt;current_fmt-&gt;host_fmt-&gt;fourcc;</div><div class='ctx'> 	unsigned long bus_flags, common_flags;</div><div class='ctx'> 	u32 dw, sens_conf;</div><div class='ctx'> 	const struct soc_mbus_pixelfmt *fmt;</div><div class='hunk'>@@ -1285,19 +1286,7 @@ static struct platform_driver mx3_camera_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(mx3_camera_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init mx3_camera_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;mx3_camera_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit mx3_camera_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;mx3_camera_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(mx3_camera_init);</div><div class='del'>-module_exit(mx3_camera_exit);</div><div class='add'>+module_platform_driver(mx3_camera_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("i.MX3x SoC Camera Host driver");</div><div class='ctx'> MODULE_AUTHOR("Guennadi Liakhovetski &lt;lg@denx.de&gt;");</div><div class='head'>diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c<br/>index ee0d0b39cd17..1fb7d5bd5ec2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap/omap_vout.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap/omap_vout.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap/omap_vout.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap/omap_vout.c</a></div><div class='hunk'>@@ -70,9 +70,9 @@ static u32 video1_numbuffers = 3;</div><div class='ctx'> static u32 video2_numbuffers = 3;</div><div class='ctx'> static u32 video1_bufsize = OMAP_VOUT_MAX_BUF_SIZE;</div><div class='ctx'> static u32 video2_bufsize = OMAP_VOUT_MAX_BUF_SIZE;</div><div class='del'>-static u32 vid1_static_vrfb_alloc;</div><div class='del'>-static u32 vid2_static_vrfb_alloc;</div><div class='del'>-static int debug;</div><div class='add'>+static bool vid1_static_vrfb_alloc;</div><div class='add'>+static bool vid2_static_vrfb_alloc;</div><div class='add'>+static bool debug;</div><div class='ctx'> </div><div class='ctx'> /* Module parameters */</div><div class='ctx'> module_param(video1_numbuffers, uint, S_IRUGO);</div><div class='hunk'>@@ -424,7 +424,7 @@ static int omapvid_setup_overlay(struct omap_vout_device *vout,</div><div class='ctx'> 		"%s enable=%d addr=%x width=%d\n height=%d color_mode=%d\n"</div><div class='ctx'> 		"rotation=%d mirror=%d posx=%d posy=%d out_width = %d \n"</div><div class='ctx'> 		"out_height=%d rotation_type=%d screen_width=%d\n",</div><div class='del'>-		__func__, info.enabled, info.paddr, info.width, info.height,</div><div class='add'>+		__func__, ovl-&gt;is_enabled(ovl), info.paddr, info.width, info.height,</div><div class='ctx'> 		info.color_mode, info.rotation, info.mirror, info.pos_x,</div><div class='ctx'> 		info.pos_y, info.out_width, info.out_height, info.rotation_type,</div><div class='ctx'> 		info.screen_width);</div><div class='hunk'>@@ -524,10 +524,50 @@ static int omapvid_apply_changes(struct omap_vout_device *vout)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int omapvid_handle_interlace_display(struct omap_vout_device *vout,</div><div class='add'>+		unsigned int irqstatus, struct timeval timevalue)</div><div class='add'>+{</div><div class='add'>+	u32 fid;</div><div class='add'>+</div><div class='add'>+	if (vout-&gt;first_int) {</div><div class='add'>+		vout-&gt;first_int = 0;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (irqstatus &amp; DISPC_IRQ_EVSYNC_ODD)</div><div class='add'>+		fid = 1;</div><div class='add'>+	else if (irqstatus &amp; DISPC_IRQ_EVSYNC_EVEN)</div><div class='add'>+		fid = 0;</div><div class='add'>+	else</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	vout-&gt;field_id ^= 1;</div><div class='add'>+	if (fid != vout-&gt;field_id) {</div><div class='add'>+		if (fid == 0)</div><div class='add'>+			vout-&gt;field_id = fid;</div><div class='add'>+	} else if (0 == fid) {</div><div class='add'>+		if (vout-&gt;cur_frm == vout-&gt;next_frm)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		vout-&gt;cur_frm-&gt;ts = timevalue;</div><div class='add'>+		vout-&gt;cur_frm-&gt;state = VIDEOBUF_DONE;</div><div class='add'>+		wake_up_interruptible(&amp;vout-&gt;cur_frm-&gt;done);</div><div class='add'>+		vout-&gt;cur_frm = vout-&gt;next_frm;</div><div class='add'>+	} else {</div><div class='add'>+		if (list_empty(&amp;vout-&gt;dma_queue) ||</div><div class='add'>+				(vout-&gt;cur_frm != vout-&gt;next_frm))</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return vout-&gt;field_id;</div><div class='add'>+err:</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void omap_vout_isr(void *arg, unsigned int irqstatus)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	u32 addr, fid;</div><div class='add'>+	int ret, fid, mgr_id;</div><div class='add'>+	u32 addr, irq;</div><div class='ctx'> 	struct omap_overlay *ovl;</div><div class='ctx'> 	struct timeval timevalue;</div><div class='ctx'> 	struct omapvideo_info *ovid;</div><div class='hunk'>@@ -543,112 +583,73 @@ static void omap_vout_isr(void *arg, unsigned int irqstatus)</div><div class='ctx'> 	if (!ovl-&gt;manager || !ovl-&gt;manager-&gt;device)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	mgr_id = ovl-&gt;manager-&gt;id;</div><div class='ctx'> 	cur_display = ovl-&gt;manager-&gt;device;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;vout-&gt;vbq_lock);</div><div class='ctx'> 	do_gettimeofday(&amp;timevalue);</div><div class='ctx'> </div><div class='del'>-	if (cur_display-&gt;type != OMAP_DISPLAY_TYPE_VENC) {</div><div class='del'>-		switch (cur_display-&gt;type) {</div><div class='del'>-		case OMAP_DISPLAY_TYPE_DPI:</div><div class='del'>-			if (!(irqstatus &amp; (DISPC_IRQ_VSYNC | DISPC_IRQ_VSYNC2)))</div><div class='del'>-				goto vout_isr_err;</div><div class='del'>-			break;</div><div class='del'>-		case OMAP_DISPLAY_TYPE_HDMI:</div><div class='del'>-			if (!(irqstatus &amp; DISPC_IRQ_EVSYNC_EVEN))</div><div class='del'>-				goto vout_isr_err;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			goto vout_isr_err;</div><div class='del'>-		}</div><div class='del'>-		if (!vout-&gt;first_int &amp;&amp; (vout-&gt;cur_frm != vout-&gt;next_frm)) {</div><div class='del'>-			vout-&gt;cur_frm-&gt;ts = timevalue;</div><div class='del'>-			vout-&gt;cur_frm-&gt;state = VIDEOBUF_DONE;</div><div class='del'>-			wake_up_interruptible(&amp;vout-&gt;cur_frm-&gt;done);</div><div class='del'>-			vout-&gt;cur_frm = vout-&gt;next_frm;</div><div class='del'>-		}</div><div class='del'>-		vout-&gt;first_int = 0;</div><div class='del'>-		if (list_empty(&amp;vout-&gt;dma_queue))</div><div class='add'>+	switch (cur_display-&gt;type) {</div><div class='add'>+	case OMAP_DISPLAY_TYPE_DSI:</div><div class='add'>+	case OMAP_DISPLAY_TYPE_DPI:</div><div class='add'>+		if (mgr_id == OMAP_DSS_CHANNEL_LCD)</div><div class='add'>+			irq = DISPC_IRQ_VSYNC;</div><div class='add'>+		else if (mgr_id == OMAP_DSS_CHANNEL_LCD2)</div><div class='add'>+			irq = DISPC_IRQ_VSYNC2;</div><div class='add'>+		else</div><div class='ctx'> 			goto vout_isr_err;</div><div class='ctx'> </div><div class='del'>-		vout-&gt;next_frm = list_entry(vout-&gt;dma_queue.next,</div><div class='del'>-				struct videobuf_buffer, queue);</div><div class='del'>-		list_del(&amp;vout-&gt;next_frm-&gt;queue);</div><div class='del'>-</div><div class='del'>-		vout-&gt;next_frm-&gt;state = VIDEOBUF_ACTIVE;</div><div class='add'>+		if (!(irqstatus &amp; irq))</div><div class='add'>+			goto vout_isr_err;</div><div class='add'>+		break;</div><div class='add'>+	case OMAP_DISPLAY_TYPE_VENC:</div><div class='add'>+		fid = omapvid_handle_interlace_display(vout, irqstatus,</div><div class='add'>+				timevalue);</div><div class='add'>+		if (!fid)</div><div class='add'>+			goto vout_isr_err;</div><div class='add'>+		break;</div><div class='add'>+	case OMAP_DISPLAY_TYPE_HDMI:</div><div class='add'>+		if (!(irqstatus &amp; DISPC_IRQ_EVSYNC_EVEN))</div><div class='add'>+			goto vout_isr_err;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto vout_isr_err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		addr = (unsigned long) vout-&gt;queued_buf_addr[vout-&gt;next_frm-&gt;i]</div><div class='del'>-			+ vout-&gt;cropped_offset;</div><div class='add'>+	if (!vout-&gt;first_int &amp;&amp; (vout-&gt;cur_frm != vout-&gt;next_frm)) {</div><div class='add'>+		vout-&gt;cur_frm-&gt;ts = timevalue;</div><div class='add'>+		vout-&gt;cur_frm-&gt;state = VIDEOBUF_DONE;</div><div class='add'>+		wake_up_interruptible(&amp;vout-&gt;cur_frm-&gt;done);</div><div class='add'>+		vout-&gt;cur_frm = vout-&gt;next_frm;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* First save the configuration in ovelray structure */</div><div class='del'>-		ret = omapvid_init(vout, addr);</div><div class='del'>-		if (ret)</div><div class='del'>-			printk(KERN_ERR VOUT_NAME</div><div class='del'>-				"failed to set overlay info\n");</div><div class='del'>-		/* Enable the pipeline and set the Go bit */</div><div class='del'>-		ret = omapvid_apply_changes(vout);</div><div class='del'>-		if (ret)</div><div class='del'>-			printk(KERN_ERR VOUT_NAME "failed to change mode\n");</div><div class='del'>-	} else {</div><div class='add'>+	vout-&gt;first_int = 0;</div><div class='add'>+	if (list_empty(&amp;vout-&gt;dma_queue))</div><div class='add'>+		goto vout_isr_err;</div><div class='ctx'> </div><div class='del'>-		if (vout-&gt;first_int) {</div><div class='del'>-			vout-&gt;first_int = 0;</div><div class='del'>-			goto vout_isr_err;</div><div class='del'>-		}</div><div class='del'>-		if (irqstatus &amp; DISPC_IRQ_EVSYNC_ODD)</div><div class='del'>-			fid = 1;</div><div class='del'>-		else if (irqstatus &amp; DISPC_IRQ_EVSYNC_EVEN)</div><div class='del'>-			fid = 0;</div><div class='del'>-		else</div><div class='del'>-			goto vout_isr_err;</div><div class='add'>+	vout-&gt;next_frm = list_entry(vout-&gt;dma_queue.next,</div><div class='add'>+			struct videobuf_buffer, queue);</div><div class='add'>+	list_del(&amp;vout-&gt;next_frm-&gt;queue);</div><div class='ctx'> </div><div class='del'>-		vout-&gt;field_id ^= 1;</div><div class='del'>-		if (fid != vout-&gt;field_id) {</div><div class='del'>-			if (0 == fid)</div><div class='del'>-				vout-&gt;field_id = fid;</div><div class='add'>+	vout-&gt;next_frm-&gt;state = VIDEOBUF_ACTIVE;</div><div class='ctx'> </div><div class='del'>-			goto vout_isr_err;</div><div class='del'>-		}</div><div class='del'>-		if (0 == fid) {</div><div class='del'>-			if (vout-&gt;cur_frm == vout-&gt;next_frm)</div><div class='del'>-				goto vout_isr_err;</div><div class='del'>-</div><div class='del'>-			vout-&gt;cur_frm-&gt;ts = timevalue;</div><div class='del'>-			vout-&gt;cur_frm-&gt;state = VIDEOBUF_DONE;</div><div class='del'>-			wake_up_interruptible(&amp;vout-&gt;cur_frm-&gt;done);</div><div class='del'>-			vout-&gt;cur_frm = vout-&gt;next_frm;</div><div class='del'>-		} else if (1 == fid) {</div><div class='del'>-			if (list_empty(&amp;vout-&gt;dma_queue) ||</div><div class='del'>-					(vout-&gt;cur_frm != vout-&gt;next_frm))</div><div class='del'>-				goto vout_isr_err;</div><div class='del'>-</div><div class='del'>-			vout-&gt;next_frm = list_entry(vout-&gt;dma_queue.next,</div><div class='del'>-					struct videobuf_buffer, queue);</div><div class='del'>-			list_del(&amp;vout-&gt;next_frm-&gt;queue);</div><div class='del'>-</div><div class='del'>-			vout-&gt;next_frm-&gt;state = VIDEOBUF_ACTIVE;</div><div class='del'>-			addr = (unsigned long)</div><div class='del'>-				vout-&gt;queued_buf_addr[vout-&gt;next_frm-&gt;i] +</div><div class='del'>-				vout-&gt;cropped_offset;</div><div class='del'>-			/* First save the configuration in ovelray structure */</div><div class='del'>-			ret = omapvid_init(vout, addr);</div><div class='del'>-			if (ret)</div><div class='del'>-				printk(KERN_ERR VOUT_NAME</div><div class='del'>-						"failed to set overlay info\n");</div><div class='del'>-			/* Enable the pipeline and set the Go bit */</div><div class='del'>-			ret = omapvid_apply_changes(vout);</div><div class='del'>-			if (ret)</div><div class='del'>-				printk(KERN_ERR VOUT_NAME</div><div class='del'>-						"failed to change mode\n");</div><div class='del'>-		}</div><div class='add'>+	addr = (unsigned long) vout-&gt;queued_buf_addr[vout-&gt;next_frm-&gt;i]</div><div class='add'>+		+ vout-&gt;cropped_offset;</div><div class='ctx'> </div><div class='del'>-	}</div><div class='add'>+	/* First save the configuration in ovelray structure */</div><div class='add'>+	ret = omapvid_init(vout, addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		printk(KERN_ERR VOUT_NAME</div><div class='add'>+			"failed to set overlay info\n");</div><div class='add'>+	/* Enable the pipeline and set the Go bit */</div><div class='add'>+	ret = omapvid_apply_changes(vout);</div><div class='add'>+	if (ret)</div><div class='add'>+		printk(KERN_ERR VOUT_NAME "failed to change mode\n");</div><div class='ctx'> </div><div class='ctx'> vout_isr_err:</div><div class='ctx'> 	spin_unlock(&amp;vout-&gt;vbq_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* Video buffer call backs */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -664,10 +665,14 @@ static int omap_vout_buffer_setup(struct videobuf_queue *q, unsigned int *count,</div><div class='ctx'> 	u32 phy_addr = 0, virt_addr = 0;</div><div class='ctx'> 	struct omap_vout_device *vout = q-&gt;priv_data;</div><div class='ctx'> 	struct omapvideo_info *ovid = &amp;vout-&gt;vid_info;</div><div class='add'>+	int vid_max_buf_size;</div><div class='ctx'> </div><div class='ctx'> 	if (!vout)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	vid_max_buf_size = vout-&gt;vid == OMAP_VIDEO1 ? video1_bufsize :</div><div class='add'>+		video2_bufsize;</div><div class='add'>+</div><div class='ctx'> 	if (V4L2_BUF_TYPE_VIDEO_OUTPUT != q-&gt;type)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -690,7 +695,7 @@ static int omap_vout_buffer_setup(struct videobuf_queue *q, unsigned int *count,</div><div class='ctx'> 		video1_numbuffers : video2_numbuffers;</div><div class='ctx'> </div><div class='ctx'> 	/* Check the size of the buffer */</div><div class='del'>-	if (*size &gt; vout-&gt;buffer_size) {</div><div class='add'>+	if (*size &gt; vid_max_buf_size) {</div><div class='ctx'> 		v4l2_err(&amp;vout-&gt;vid_dev-&gt;v4l2_dev,</div><div class='ctx'> 				"buffer allocation mismatch [%u] [%u]\n",</div><div class='ctx'> 				*size, vout-&gt;buffer_size);</div><div class='hunk'>@@ -943,12 +948,8 @@ static int omap_vout_release(struct file *file)</div><div class='ctx'> 	/* Disable all the overlay managers connected with this interface */</div><div class='ctx'> 	for (i = 0; i &lt; ovid-&gt;num_overlays; i++) {</div><div class='ctx'> 		struct omap_overlay *ovl = ovid-&gt;overlays[i];</div><div class='del'>-		if (ovl-&gt;manager &amp;&amp; ovl-&gt;manager-&gt;device) {</div><div class='del'>-			struct omap_overlay_info info;</div><div class='del'>-			ovl-&gt;get_overlay_info(ovl, &amp;info);</div><div class='del'>-			info.enabled = 0;</div><div class='del'>-			ovl-&gt;set_overlay_info(ovl, &amp;info);</div><div class='del'>-		}</div><div class='add'>+		if (ovl-&gt;manager &amp;&amp; ovl-&gt;manager-&gt;device)</div><div class='add'>+			ovl-&gt;disable(ovl);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Turn off the pipeline */</div><div class='ctx'> 	ret = omapvid_apply_changes(vout);</div><div class='hunk'>@@ -1041,7 +1042,8 @@ static int vidioc_querycap(struct file *file, void *fh,</div><div class='ctx'> 	strlcpy(cap-&gt;driver, VOUT_NAME, sizeof(cap-&gt;driver));</div><div class='ctx'> 	strlcpy(cap-&gt;card, vout-&gt;vfd-&gt;name, sizeof(cap-&gt;card));</div><div class='ctx'> 	cap-&gt;bus_info[0] = '\0';</div><div class='del'>-	cap-&gt;capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT;</div><div class='add'>+	cap-&gt;capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT |</div><div class='add'>+		V4L2_CAP_VIDEO_OUTPUT_OVERLAY;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1668,7 +1670,6 @@ static int vidioc_streamon(struct file *file, void *fh, enum v4l2_buf_type i)</div><div class='ctx'> 		if (ovl-&gt;manager &amp;&amp; ovl-&gt;manager-&gt;device) {</div><div class='ctx'> 			struct omap_overlay_info info;</div><div class='ctx'> 			ovl-&gt;get_overlay_info(ovl, &amp;info);</div><div class='del'>-			info.enabled = 1;</div><div class='ctx'> 			info.paddr = addr;</div><div class='ctx'> 			if (ovl-&gt;set_overlay_info(ovl, &amp;info)) {</div><div class='ctx'> 				ret = -EINVAL;</div><div class='hunk'>@@ -1687,6 +1688,16 @@ static int vidioc_streamon(struct file *file, void *fh, enum v4l2_buf_type i)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		v4l2_err(&amp;vout-&gt;vid_dev-&gt;v4l2_dev, "failed to change mode\n");</div><div class='ctx'> </div><div class='add'>+	for (j = 0; j &lt; ovid-&gt;num_overlays; j++) {</div><div class='add'>+		struct omap_overlay *ovl = ovid-&gt;overlays[j];</div><div class='add'>+</div><div class='add'>+		if (ovl-&gt;manager &amp;&amp; ovl-&gt;manager-&gt;device) {</div><div class='add'>+			ret = ovl-&gt;enable(ovl);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto streamon_err1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='ctx'> streamon_err1:</div><div class='hunk'>@@ -1716,16 +1727,8 @@ static int vidioc_streamoff(struct file *file, void *fh, enum v4l2_buf_type i)</div><div class='ctx'> 	for (j = 0; j &lt; ovid-&gt;num_overlays; j++) {</div><div class='ctx'> 		struct omap_overlay *ovl = ovid-&gt;overlays[j];</div><div class='ctx'> </div><div class='del'>-		if (ovl-&gt;manager &amp;&amp; ovl-&gt;manager-&gt;device) {</div><div class='del'>-			struct omap_overlay_info info;</div><div class='del'>-</div><div class='del'>-			ovl-&gt;get_overlay_info(ovl, &amp;info);</div><div class='del'>-			info.enabled = 0;</div><div class='del'>-			ret = ovl-&gt;set_overlay_info(ovl, &amp;info);</div><div class='del'>-			if (ret)</div><div class='del'>-				v4l2_err(&amp;vout-&gt;vid_dev-&gt;v4l2_dev,</div><div class='del'>-				"failed to update overlay info in streamoff\n");</div><div class='del'>-		}</div><div class='add'>+		if (ovl-&gt;manager &amp;&amp; ovl-&gt;manager-&gt;device)</div><div class='add'>+			ovl-&gt;disable(ovl);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Turn of the pipeline */</div><div class='hunk'>@@ -1823,7 +1826,9 @@ static int vidioc_g_fbuf(struct file *file, void *fh,</div><div class='ctx'> 	ovid = &amp;vout-&gt;vid_info;</div><div class='ctx'> 	ovl = ovid-&gt;overlays[0];</div><div class='ctx'> </div><div class='del'>-	a-&gt;flags = 0x0;</div><div class='add'>+	/* The video overlay must stay within the framebuffer and can't be</div><div class='add'>+	   positioned independently. */</div><div class='add'>+	a-&gt;flags = V4L2_FBUF_FLAG_OVERLAY;</div><div class='ctx'> 	a-&gt;capability = V4L2_FBUF_CAP_LOCAL_ALPHA | V4L2_FBUF_CAP_CHROMAKEY</div><div class='ctx'> 		| V4L2_FBUF_CAP_SRC_CHROMAKEY;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/omap/omap_vout_vrfb.c b/drivers/media/video/omap/omap_vout_vrfb.c<br/>index ebebcac49225..4be26abf6cea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap/omap_vout_vrfb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap/omap_vout_vrfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap/omap_vout_vrfb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap/omap_vout_vrfb.c</a></div><div class='hunk'>@@ -84,7 +84,7 @@ void omap_vout_free_vrfb_buffers(struct omap_vout_device *vout)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int omap_vout_setup_vrfb_bufs(struct platform_device *pdev, int vid_num,</div><div class='del'>-			u32 static_vrfb_allocation)</div><div class='add'>+			      bool static_vrfb_allocation)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0, i, j;</div><div class='ctx'> 	struct omap_vout_device *vout;</div><div class='head'>diff --git a/drivers/media/video/omap/omap_voutdef.h b/drivers/media/video/omap/omap_voutdef.h<br/>index d793501cafcc..27a95d23b913 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap/omap_voutdef.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap/omap_voutdef.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap/omap_voutdef.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap/omap_voutdef.h</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #define MAC_VRFB_CTXS	4</div><div class='ctx'> #define MAX_VOUT_DEV	2</div><div class='ctx'> #define MAX_OVLS	3</div><div class='del'>-#define MAX_DISPLAYS	3</div><div class='add'>+#define MAX_DISPLAYS	10</div><div class='ctx'> #define MAX_MANAGERS	3</div><div class='ctx'> </div><div class='ctx'> #define QQVGA_WIDTH		160</div><div class='head'>diff --git a/drivers/media/video/omap1_camera.c b/drivers/media/video/omap1_camera.c<br/>index 6a6cf388bae4..c20f5ecd6790 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap1_camera.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap1_camera.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap1_camera.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap1_camera.c</a></div><div class='hunk'>@@ -1436,13 +1436,13 @@ static int omap1_cam_querycap(struct soc_camera_host *ici,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int omap1_cam_set_bus_param(struct soc_camera_device *icd,</div><div class='del'>-		__u32 pixfmt)</div><div class='add'>+static int omap1_cam_set_bus_param(struct soc_camera_device *icd)</div><div class='ctx'> {</div><div class='ctx'> 	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);</div><div class='ctx'> 	struct device *dev = icd-&gt;parent;</div><div class='ctx'> 	struct soc_camera_host *ici = to_soc_camera_host(dev);</div><div class='ctx'> 	struct omap1_cam_dev *pcdev = ici-&gt;priv;</div><div class='add'>+	u32 pixfmt = icd-&gt;current_fmt-&gt;host_fmt-&gt;fourcc;</div><div class='ctx'> 	const struct soc_camera_format_xlate *xlate;</div><div class='ctx'> 	const struct soc_mbus_pixelfmt *fmt;</div><div class='ctx'> 	struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};</div><div class='hunk'>@@ -1713,17 +1713,7 @@ static struct platform_driver omap1_cam_driver = {</div><div class='ctx'> 	.remove		= __exit_p(omap1_cam_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init omap1_cam_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;omap1_cam_driver);</div><div class='del'>-}</div><div class='del'>-module_init(omap1_cam_init);</div><div class='del'>-</div><div class='del'>-static void __exit omap1_cam_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;omap1_cam_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(omap1_cam_exit);</div><div class='add'>+module_platform_driver(omap1_cam_driver);</div><div class='ctx'> </div><div class='ctx'> module_param(sg_mode, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(sg_mode, "videobuf mode, 0: dma-contig (default), 1: dma-sg");</div><div class='head'>diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c<br/>index 45522e603185..7d3864144368 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap24xxcam.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap24xxcam.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap24xxcam.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap24xxcam.c</a></div><div class='hunk'>@@ -1868,21 +1868,7 @@ static struct platform_driver omap24xxcam_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Module initialisation and deinitialisation</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init omap24xxcam_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;omap24xxcam_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit omap24xxcam_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;omap24xxcam_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(omap24xxcam_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Sakari Ailus &lt;sakari.ailus@nokia.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("OMAP24xx Video for Linux camera driver");</div><div class='hunk'>@@ -1894,6 +1880,3 @@ MODULE_PARM_DESC(video_nr,</div><div class='ctx'> module_param(capture_mem, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(capture_mem, "Maximum amount of memory for capture "</div><div class='ctx'> 		 "buffers (default 4800kiB)");</div><div class='del'>-</div><div class='del'>-module_init(omap24xxcam_init);</div><div class='del'>-module_exit(omap24xxcam_cleanup);</div><div class='head'>diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c<br/>index b818cacf420f..12d5f923e1d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/isp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/isp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/isp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap3isp/isp.c</a></div><div class='hunk'>@@ -80,13 +80,6 @@</div><div class='ctx'> #include "isph3a.h"</div><div class='ctx'> #include "isphist.h"</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * this is provided as an interim solution until omap3isp doesn't need</div><div class='del'>- * any omap-specific iommu API</div><div class='del'>- */</div><div class='del'>-#define to_iommu(dev)							\</div><div class='del'>-	(struct omap_iommu *)platform_get_drvdata(to_platform_device(dev))</div><div class='del'>-</div><div class='ctx'> static unsigned int autoidle;</div><div class='ctx'> module_param(autoidle, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(autoidle, "Enable OMAP3ISP AUTOIDLE support");</div><div class='hunk'>@@ -410,6 +403,7 @@ static inline void isp_isr_dbg(struct isp_device *isp, u32 irqstatus)</div><div class='ctx'> static void isp_isr_sbl(struct isp_device *isp)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = isp-&gt;dev;</div><div class='add'>+	struct isp_pipeline *pipe;</div><div class='ctx'> 	u32 sbl_pcr;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -423,27 +417,38 @@ static void isp_isr_sbl(struct isp_device *isp)</div><div class='ctx'> 	if (sbl_pcr)</div><div class='ctx'> 		dev_dbg(dev, "SBL overflow (PCR = 0x%08x)\n", sbl_pcr);</div><div class='ctx'> </div><div class='del'>-	if (sbl_pcr &amp; (ISPSBL_PCR_CCDC_WBL_OVF | ISPSBL_PCR_CSIA_WBL_OVF</div><div class='del'>-		     | ISPSBL_PCR_CSIB_WBL_OVF)) {</div><div class='del'>-		isp-&gt;isp_ccdc.error = 1;</div><div class='del'>-		if (isp-&gt;isp_ccdc.output &amp; CCDC_OUTPUT_PREVIEW)</div><div class='del'>-			isp-&gt;isp_prev.error = 1;</div><div class='del'>-		if (isp-&gt;isp_ccdc.output &amp; CCDC_OUTPUT_RESIZER)</div><div class='del'>-			isp-&gt;isp_res.error = 1;</div><div class='add'>+	if (sbl_pcr &amp; ISPSBL_PCR_CSIB_WBL_OVF) {</div><div class='add'>+		pipe = to_isp_pipeline(&amp;isp-&gt;isp_ccp2.subdev.entity);</div><div class='add'>+		if (pipe != NULL)</div><div class='add'>+			pipe-&gt;error = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sbl_pcr &amp; ISPSBL_PCR_CSIA_WBL_OVF) {</div><div class='add'>+		pipe = to_isp_pipeline(&amp;isp-&gt;isp_csi2a.subdev.entity);</div><div class='add'>+		if (pipe != NULL)</div><div class='add'>+			pipe-&gt;error = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sbl_pcr &amp; ISPSBL_PCR_CCDC_WBL_OVF) {</div><div class='add'>+		pipe = to_isp_pipeline(&amp;isp-&gt;isp_ccdc.subdev.entity);</div><div class='add'>+		if (pipe != NULL)</div><div class='add'>+			pipe-&gt;error = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sbl_pcr &amp; ISPSBL_PCR_PRV_WBL_OVF) {</div><div class='del'>-		isp-&gt;isp_prev.error = 1;</div><div class='del'>-		if (isp-&gt;isp_res.input == RESIZER_INPUT_VP &amp;&amp;</div><div class='del'>-		    !(isp-&gt;isp_ccdc.output &amp; CCDC_OUTPUT_RESIZER))</div><div class='del'>-			isp-&gt;isp_res.error = 1;</div><div class='add'>+		pipe = to_isp_pipeline(&amp;isp-&gt;isp_prev.subdev.entity);</div><div class='add'>+		if (pipe != NULL)</div><div class='add'>+			pipe-&gt;error = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sbl_pcr &amp; (ISPSBL_PCR_RSZ1_WBL_OVF</div><div class='ctx'> 		       | ISPSBL_PCR_RSZ2_WBL_OVF</div><div class='ctx'> 		       | ISPSBL_PCR_RSZ3_WBL_OVF</div><div class='del'>-		       | ISPSBL_PCR_RSZ4_WBL_OVF))</div><div class='del'>-		isp-&gt;isp_res.error = 1;</div><div class='add'>+		       | ISPSBL_PCR_RSZ4_WBL_OVF)) {</div><div class='add'>+		pipe = to_isp_pipeline(&amp;isp-&gt;isp_res.subdev.entity);</div><div class='add'>+		if (pipe != NULL)</div><div class='add'>+			pipe-&gt;error = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (sbl_pcr &amp; ISPSBL_PCR_H3A_AF_WBL_OVF)</div><div class='ctx'> 		omap3isp_stat_sbl_overflow(&amp;isp-&gt;isp_af);</div><div class='hunk'>@@ -471,24 +476,17 @@ static irqreturn_t isp_isr(int irq, void *_isp)</div><div class='ctx'> 				       IRQ0STATUS_HS_VS_IRQ;</div><div class='ctx'> 	struct isp_device *isp = _isp;</div><div class='ctx'> 	u32 irqstatus;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	irqstatus = isp_reg_readl(isp, OMAP3_ISP_IOMEM_MAIN, ISP_IRQ0STATUS);</div><div class='ctx'> 	isp_reg_writel(isp, irqstatus, OMAP3_ISP_IOMEM_MAIN, ISP_IRQ0STATUS);</div><div class='ctx'> </div><div class='ctx'> 	isp_isr_sbl(isp);</div><div class='ctx'> </div><div class='del'>-	if (irqstatus &amp; IRQ0STATUS_CSIA_IRQ) {</div><div class='del'>-		ret = omap3isp_csi2_isr(&amp;isp-&gt;isp_csi2a);</div><div class='del'>-		if (ret)</div><div class='del'>-			isp-&gt;isp_ccdc.error = 1;</div><div class='del'>-	}</div><div class='add'>+	if (irqstatus &amp; IRQ0STATUS_CSIA_IRQ)</div><div class='add'>+		omap3isp_csi2_isr(&amp;isp-&gt;isp_csi2a);</div><div class='ctx'> </div><div class='del'>-	if (irqstatus &amp; IRQ0STATUS_CSIB_IRQ) {</div><div class='del'>-		ret = omap3isp_ccp2_isr(&amp;isp-&gt;isp_ccp2);</div><div class='del'>-		if (ret)</div><div class='del'>-			isp-&gt;isp_ccdc.error = 1;</div><div class='del'>-	}</div><div class='add'>+	if (irqstatus &amp; IRQ0STATUS_CSIB_IRQ)</div><div class='add'>+		omap3isp_ccp2_isr(&amp;isp-&gt;isp_ccp2);</div><div class='ctx'> </div><div class='ctx'> 	if (irqstatus &amp; IRQ0STATUS_CCDC_VD0_IRQ) {</div><div class='ctx'> 		if (isp-&gt;isp_ccdc.output &amp; CCDC_OUTPUT_PREVIEW)</div><div class='hunk'>@@ -1114,8 +1112,7 @@ isp_restore_context(struct isp_device *isp, struct isp_reg *reg_list)</div><div class='ctx'> static void isp_save_ctx(struct isp_device *isp)</div><div class='ctx'> {</div><div class='ctx'> 	isp_save_context(isp, isp_reg_list);</div><div class='del'>-	if (isp-&gt;iommu)</div><div class='del'>-		omap_iommu_save_ctx(isp-&gt;iommu);</div><div class='add'>+	omap_iommu_save_ctx(isp-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1128,8 +1125,7 @@ static void isp_save_ctx(struct isp_device *isp)</div><div class='ctx'> static void isp_restore_ctx(struct isp_device *isp)</div><div class='ctx'> {</div><div class='ctx'> 	isp_restore_context(isp, isp_reg_list);</div><div class='del'>-	if (isp-&gt;iommu)</div><div class='del'>-		omap_iommu_restore_ctx(isp-&gt;iommu);</div><div class='add'>+	omap_iommu_restore_ctx(isp-&gt;dev);</div><div class='ctx'> 	omap3isp_ccdc_restore_context(isp);</div><div class='ctx'> 	omap3isp_preview_restore_context(isp);</div><div class='ctx'> }</div><div class='hunk'>@@ -1983,7 +1979,7 @@ static int isp_remove(struct platform_device *pdev)</div><div class='ctx'> 	isp_cleanup_modules(isp);</div><div class='ctx'> </div><div class='ctx'> 	omap3isp_get(isp);</div><div class='del'>-	iommu_detach_device(isp-&gt;domain, isp-&gt;iommu_dev);</div><div class='add'>+	iommu_detach_device(isp-&gt;domain, &amp;pdev-&gt;dev);</div><div class='ctx'> 	iommu_domain_free(isp-&gt;domain);</div><div class='ctx'> 	omap3isp_put(isp);</div><div class='ctx'> </div><div class='hunk'>@@ -2131,17 +2127,6 @@ static int isp_probe(struct platform_device *pdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* IOMMU */</div><div class='del'>-	isp-&gt;iommu_dev = omap_find_iommu_device("isp");</div><div class='del'>-	if (!isp-&gt;iommu_dev) {</div><div class='del'>-		dev_err(isp-&gt;dev, "omap_find_iommu_device failed\n");</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto error_isp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* to be removed once iommu migration is complete */</div><div class='del'>-	isp-&gt;iommu = to_iommu(isp-&gt;iommu_dev);</div><div class='del'>-</div><div class='ctx'> 	isp-&gt;domain = iommu_domain_alloc(pdev-&gt;dev.bus);</div><div class='ctx'> 	if (!isp-&gt;domain) {</div><div class='ctx'> 		dev_err(isp-&gt;dev, "can't alloc iommu domain\n");</div><div class='hunk'>@@ -2149,7 +2134,7 @@ static int isp_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto error_isp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iommu_attach_device(isp-&gt;domain, isp-&gt;iommu_dev);</div><div class='add'>+	ret = iommu_attach_device(isp-&gt;domain, &amp;pdev-&gt;dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "can't attach iommu device: %d\n", ret);</div><div class='ctx'> 		goto free_domain;</div><div class='hunk'>@@ -2188,7 +2173,7 @@ error_modules:</div><div class='ctx'> error_irq:</div><div class='ctx'> 	free_irq(isp-&gt;irq_num, isp);</div><div class='ctx'> detach_dev:</div><div class='del'>-	iommu_detach_device(isp-&gt;domain, isp-&gt;iommu_dev);</div><div class='add'>+	iommu_detach_device(isp-&gt;domain, &amp;pdev-&gt;dev);</div><div class='ctx'> free_domain:</div><div class='ctx'> 	iommu_domain_free(isp-&gt;domain);</div><div class='ctx'> error_isp:</div><div class='hunk'>@@ -2242,24 +2227,7 @@ static struct platform_driver omap3isp_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * isp_init - ISP module initialization.</div><div class='del'>- */</div><div class='del'>-static int __init isp_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;omap3isp_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * isp_cleanup - ISP module cleanup.</div><div class='del'>- */</div><div class='del'>-static void __exit isp_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;omap3isp_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(isp_init);</div><div class='del'>-module_exit(isp_cleanup);</div><div class='add'>+module_platform_driver(omap3isp_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Nokia Corporation");</div><div class='ctx'> MODULE_DESCRIPTION("TI OMAP3 ISP driver");</div><div class='head'>diff --git a/drivers/media/video/omap3isp/isp.h b/drivers/media/video/omap3isp/isp.h<br/>index 705946ef4d60..d96603eb0d17 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/isp.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/isp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/isp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap3isp/isp.h</a></div><div class='hunk'>@@ -212,9 +212,7 @@ struct isp_device {</div><div class='ctx'> 	unsigned int sbl_resources;</div><div class='ctx'> 	unsigned int subclk_resources;</div><div class='ctx'> </div><div class='del'>-	struct omap_iommu *iommu;</div><div class='ctx'> 	struct iommu_domain *domain;</div><div class='del'>-	struct device *iommu_dev;</div><div class='ctx'> </div><div class='ctx'> 	struct isp_platform_callback platform_cb;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/media/video/omap3isp/ispccdc.c b/drivers/media/video/omap3isp/ispccdc.c<br/>index 54a4a3f22e2e..a74a79701d34 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispccdc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispccdc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispccdc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap3isp/ispccdc.c</a></div><div class='hunk'>@@ -366,7 +366,7 @@ static void ccdc_lsc_free_request(struct isp_ccdc_device *ccdc,</div><div class='ctx'> 		dma_unmap_sg(isp-&gt;dev, req-&gt;iovm-&gt;sgt-&gt;sgl,</div><div class='ctx'> 			     req-&gt;iovm-&gt;sgt-&gt;nents, DMA_TO_DEVICE);</div><div class='ctx'> 	if (req-&gt;table)</div><div class='del'>-		omap_iommu_vfree(isp-&gt;domain, isp-&gt;iommu, req-&gt;table);</div><div class='add'>+		omap_iommu_vfree(isp-&gt;domain, isp-&gt;dev, req-&gt;table);</div><div class='ctx'> 	kfree(req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -438,7 +438,7 @@ static int ccdc_lsc_config(struct isp_ccdc_device *ccdc,</div><div class='ctx'> </div><div class='ctx'> 		req-&gt;enable = 1;</div><div class='ctx'> </div><div class='del'>-		req-&gt;table = omap_iommu_vmalloc(isp-&gt;domain, isp-&gt;iommu, 0,</div><div class='add'>+		req-&gt;table = omap_iommu_vmalloc(isp-&gt;domain, isp-&gt;dev, 0,</div><div class='ctx'> 					req-&gt;config.size, IOMMU_FLAG);</div><div class='ctx'> 		if (IS_ERR_VALUE(req-&gt;table)) {</div><div class='ctx'> 			req-&gt;table = 0;</div><div class='hunk'>@@ -446,7 +446,7 @@ static int ccdc_lsc_config(struct isp_ccdc_device *ccdc,</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		req-&gt;iovm = omap_find_iovm_area(isp-&gt;iommu, req-&gt;table);</div><div class='add'>+		req-&gt;iovm = omap_find_iovm_area(isp-&gt;dev, req-&gt;table);</div><div class='ctx'> 		if (req-&gt;iovm == NULL) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			goto done;</div><div class='hunk'>@@ -462,7 +462,7 @@ static int ccdc_lsc_config(struct isp_ccdc_device *ccdc,</div><div class='ctx'> 		dma_sync_sg_for_cpu(isp-&gt;dev, req-&gt;iovm-&gt;sgt-&gt;sgl,</div><div class='ctx'> 				    req-&gt;iovm-&gt;sgt-&gt;nents, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='del'>-		table = omap_da_to_va(isp-&gt;iommu, req-&gt;table);</div><div class='add'>+		table = omap_da_to_va(isp-&gt;dev, req-&gt;table);</div><div class='ctx'> 		if (copy_from_user(table, config-&gt;lsc, req-&gt;config.size)) {</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 			goto done;</div><div class='hunk'>@@ -734,15 +734,15 @@ static int ccdc_config(struct isp_ccdc_device *ccdc,</div><div class='ctx'> 			 * already done by omap_iommu_vmalloc().</div><div class='ctx'> 			 */</div><div class='ctx'> 			size = ccdc-&gt;fpc.fpnum * 4;</div><div class='del'>-			table_new = omap_iommu_vmalloc(isp-&gt;domain, isp-&gt;iommu,</div><div class='add'>+			table_new = omap_iommu_vmalloc(isp-&gt;domain, isp-&gt;dev,</div><div class='ctx'> 							0, size, IOMMU_FLAG);</div><div class='ctx'> 			if (IS_ERR_VALUE(table_new))</div><div class='ctx'> 				return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-			if (copy_from_user(omap_da_to_va(isp-&gt;iommu, table_new),</div><div class='add'>+			if (copy_from_user(omap_da_to_va(isp-&gt;dev, table_new),</div><div class='ctx'> 					   (__force void __user *)</div><div class='ctx'> 					   ccdc-&gt;fpc.fpcaddr, size)) {</div><div class='del'>-				omap_iommu_vfree(isp-&gt;domain, isp-&gt;iommu,</div><div class='add'>+				omap_iommu_vfree(isp-&gt;domain, isp-&gt;dev,</div><div class='ctx'> 								table_new);</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -753,7 +753,7 @@ static int ccdc_config(struct isp_ccdc_device *ccdc,</div><div class='ctx'> </div><div class='ctx'> 		ccdc_configure_fpc(ccdc);</div><div class='ctx'> 		if (table_old != 0)</div><div class='del'>-			omap_iommu_vfree(isp-&gt;domain, isp-&gt;iommu, table_old);</div><div class='add'>+			omap_iommu_vfree(isp-&gt;domain, isp-&gt;dev, table_old);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ccdc_lsc_config(ccdc, ccdc_struct);</div><div class='hunk'>@@ -1406,9 +1406,8 @@ static int __ccdc_handle_stopping(struct isp_ccdc_device *ccdc, u32 event)</div><div class='ctx'> </div><div class='ctx'> static void ccdc_hs_vs_isr(struct isp_ccdc_device *ccdc)</div><div class='ctx'> {</div><div class='del'>-	struct isp_pipeline *pipe =</div><div class='del'>-		to_isp_pipeline(&amp;ccdc-&gt;video_out.video.entity);</div><div class='del'>-	struct video_device *vdev = ccdc-&gt;subdev.devnode;</div><div class='add'>+	struct isp_pipeline *pipe = to_isp_pipeline(&amp;ccdc-&gt;subdev.entity);</div><div class='add'>+	struct video_device *vdev = &amp;ccdc-&gt;subdev.devnode;</div><div class='ctx'> 	struct v4l2_event event;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;event, 0, sizeof(event));</div><div class='hunk'>@@ -1428,8 +1427,11 @@ static void ccdc_lsc_isr(struct isp_ccdc_device *ccdc, u32 events)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (events &amp; IRQ0STATUS_CCDC_LSC_PREF_ERR_IRQ) {</div><div class='add'>+		struct isp_pipeline *pipe =</div><div class='add'>+			to_isp_pipeline(&amp;ccdc-&gt;subdev.entity);</div><div class='add'>+</div><div class='ctx'> 		ccdc_lsc_error_handler(ccdc);</div><div class='del'>-		ccdc-&gt;error = 1;</div><div class='add'>+		pipe-&gt;error = true;</div><div class='ctx'> 		dev_dbg(to_device(ccdc), "lsc prefetch error\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1504,7 +1506,7 @@ static int ccdc_isr_buffer(struct isp_ccdc_device *ccdc)</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	buffer = omap3isp_video_buffer_next(&amp;ccdc-&gt;video_out, ccdc-&gt;error);</div><div class='add'>+	buffer = omap3isp_video_buffer_next(&amp;ccdc-&gt;video_out);</div><div class='ctx'> 	if (buffer != NULL) {</div><div class='ctx'> 		ccdc_set_outaddr(ccdc, buffer-&gt;isp_addr);</div><div class='ctx'> 		restart = 1;</div><div class='hunk'>@@ -1518,7 +1520,6 @@ static int ccdc_isr_buffer(struct isp_ccdc_device *ccdc)</div><div class='ctx'> 					ISP_PIPELINE_STREAM_SINGLESHOT);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='del'>-	ccdc-&gt;error = 0;</div><div class='ctx'> 	return restart;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1744,7 +1745,6 @@ static int ccdc_set_stream(struct v4l2_subdev *sd, int enable)</div><div class='ctx'> 		 */</div><div class='ctx'> 		ccdc_config_vp(ccdc);</div><div class='ctx'> 		ccdc_enable_vp(ccdc, 1);</div><div class='del'>-		ccdc-&gt;error = 0;</div><div class='ctx'> 		ccdc_print_status(ccdc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2309,7 +2309,7 @@ void omap3isp_ccdc_cleanup(struct isp_device *isp)</div><div class='ctx'> 	ccdc_lsc_free_queue(ccdc, &amp;ccdc-&gt;lsc.free_queue);</div><div class='ctx'> </div><div class='ctx'> 	if (ccdc-&gt;fpc.fpcaddr != 0)</div><div class='del'>-		omap_iommu_vfree(isp-&gt;domain, isp-&gt;iommu, ccdc-&gt;fpc.fpcaddr);</div><div class='add'>+		omap_iommu_vfree(isp-&gt;domain, isp-&gt;dev, ccdc-&gt;fpc.fpcaddr);</div><div class='ctx'> </div><div class='ctx'> 	mutex_destroy(&amp;ccdc-&gt;ioctl_lock);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/omap3isp/ispccdc.h b/drivers/media/video/omap3isp/ispccdc.h<br/>index 483a19cac1ad..6d0264bab75b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispccdc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispccdc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispccdc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap3isp/ispccdc.h</a></div><div class='hunk'>@@ -150,7 +150,6 @@ struct ispccdc_lsc {</div><div class='ctx'>  * @input: Active input</div><div class='ctx'>  * @output: Active outputs</div><div class='ctx'>  * @video_out: Output video node</div><div class='del'>- * @error: A hardware error occurred during capture</div><div class='ctx'>  * @alaw: A-law compression enabled (1) or disabled (0)</div><div class='ctx'>  * @lpf: Low pass filter enabled (1) or disabled (0)</div><div class='ctx'>  * @obclamp: Optical-black clamp enabled (1) or disabled (0)</div><div class='hunk'>@@ -178,7 +177,6 @@ struct isp_ccdc_device {</div><div class='ctx'> 	enum ccdc_input_entity input;</div><div class='ctx'> 	unsigned int output;</div><div class='ctx'> 	struct isp_video video_out;</div><div class='del'>-	unsigned int error;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int alaw:1,</div><div class='ctx'> 		     lpf:1,</div><div class='head'>diff --git a/drivers/media/video/omap3isp/ispccp2.c b/drivers/media/video/omap3isp/ispccp2.c<br/>index 904ca8c8b17f..70ddbf35b223 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispccp2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispccp2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispccp2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap3isp/ispccp2.c</a></div><div class='hunk'>@@ -556,7 +556,7 @@ static void ccp2_isr_buffer(struct isp_ccp2_device *ccp2)</div><div class='ctx'> 	struct isp_pipeline *pipe = to_isp_pipeline(&amp;ccp2-&gt;subdev.entity);</div><div class='ctx'> 	struct isp_buffer *buffer;</div><div class='ctx'> </div><div class='del'>-	buffer = omap3isp_video_buffer_next(&amp;ccp2-&gt;video_in, ccp2-&gt;error);</div><div class='add'>+	buffer = omap3isp_video_buffer_next(&amp;ccp2-&gt;video_in);</div><div class='ctx'> 	if (buffer != NULL)</div><div class='ctx'> 		ccp2_set_inaddr(ccp2, buffer-&gt;isp_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -567,8 +567,6 @@ static void ccp2_isr_buffer(struct isp_ccp2_device *ccp2)</div><div class='ctx'> 			omap3isp_pipeline_set_stream(pipe,</div><div class='ctx'> 						ISP_PIPELINE_STREAM_SINGLESHOT);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ccp2-&gt;error = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -576,13 +574,11 @@ static void ccp2_isr_buffer(struct isp_ccp2_device *ccp2)</div><div class='ctx'>  * @ccp2: Pointer to ISP CCP2 device</div><div class='ctx'>  *</div><div class='ctx'>  * This will handle the CCP2 interrupts</div><div class='del'>- *</div><div class='del'>- * Returns -EIO in case of error, or 0 on success.</div><div class='ctx'>  */</div><div class='del'>-int omap3isp_ccp2_isr(struct isp_ccp2_device *ccp2)</div><div class='add'>+void omap3isp_ccp2_isr(struct isp_ccp2_device *ccp2)</div><div class='ctx'> {</div><div class='add'>+	struct isp_pipeline *pipe = to_isp_pipeline(&amp;ccp2-&gt;subdev.entity);</div><div class='ctx'> 	struct isp_device *isp = to_isp_device(ccp2);</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	static const u32 ISPCCP2_LC01_ERROR =</div><div class='ctx'> 		ISPCCP2_LC01_IRQSTATUS_LC0_FIFO_OVF_IRQ |</div><div class='ctx'> 		ISPCCP2_LC01_IRQSTATUS_LC0_CRC_IRQ |</div><div class='hunk'>@@ -604,19 +600,18 @@ int omap3isp_ccp2_isr(struct isp_ccp2_device *ccp2)</div><div class='ctx'> 		       ISPCCP2_LCM_IRQSTATUS);</div><div class='ctx'> 	/* Errors */</div><div class='ctx'> 	if (lcx_irqstatus &amp; ISPCCP2_LC01_ERROR) {</div><div class='del'>-		ccp2-&gt;error = 1;</div><div class='add'>+		pipe-&gt;error = true;</div><div class='ctx'> 		dev_dbg(isp-&gt;dev, "CCP2 err:%x\n", lcx_irqstatus);</div><div class='del'>-		return -EIO;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (lcm_irqstatus &amp; ISPCCP2_LCM_IRQSTATUS_OCPERROR_IRQ) {</div><div class='del'>-		ccp2-&gt;error = 1;</div><div class='add'>+		pipe-&gt;error = true;</div><div class='ctx'> 		dev_dbg(isp-&gt;dev, "CCP2 OCP err:%x\n", lcm_irqstatus);</div><div class='del'>-		ret = -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (omap3isp_module_sync_is_stopping(&amp;ccp2-&gt;wait, &amp;ccp2-&gt;stopping))</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Frame number propagation */</div><div class='ctx'> 	if (lcx_irqstatus &amp; ISPCCP2_LC01_IRQSTATUS_LC0_FS_IRQ) {</div><div class='hunk'>@@ -629,8 +624,6 @@ int omap3isp_ccp2_isr(struct isp_ccp2_device *ccp2)</div><div class='ctx'> 	/* Handle queued buffers on frame end interrupts */</div><div class='ctx'> 	if (lcm_irqstatus &amp; ISPCCP2_LCM_IRQSTATUS_EOF_IRQ)</div><div class='ctx'> 		ccp2_isr_buffer(ccp2);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* -----------------------------------------------------------------------------</div><div class='hunk'>@@ -867,7 +860,6 @@ static int ccp2_s_stream(struct v4l2_subdev *sd, int enable)</div><div class='ctx'> 		if (enable == ISP_PIPELINE_STREAM_STOPPED)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		atomic_set(&amp;ccp2-&gt;stopping, 0);</div><div class='del'>-		ccp2-&gt;error = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (enable) {</div><div class='head'>diff --git a/drivers/media/video/omap3isp/ispccp2.h b/drivers/media/video/omap3isp/ispccp2.h<br/>index 6674e9de2cd7..76d65f4576ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispccp2.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispccp2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispccp2.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap3isp/ispccp2.h</a></div><div class='hunk'>@@ -82,7 +82,6 @@ struct isp_ccp2_device {</div><div class='ctx'> 	struct isp_video video_in;</div><div class='ctx'> 	struct isp_csiphy *phy;</div><div class='ctx'> 	struct regulator *vdds_csib;</div><div class='del'>-	unsigned int error;</div><div class='ctx'> 	enum isp_pipeline_stream_state state;</div><div class='ctx'> 	wait_queue_head_t wait;</div><div class='ctx'> 	atomic_t stopping;</div><div class='hunk'>@@ -94,6 +93,6 @@ void omap3isp_ccp2_cleanup(struct isp_device *isp);</div><div class='ctx'> int omap3isp_ccp2_register_entities(struct isp_ccp2_device *ccp2,</div><div class='ctx'> 			struct v4l2_device *vdev);</div><div class='ctx'> void omap3isp_ccp2_unregister_entities(struct isp_ccp2_device *ccp2);</div><div class='del'>-int omap3isp_ccp2_isr(struct isp_ccp2_device *ccp2);</div><div class='add'>+void omap3isp_ccp2_isr(struct isp_ccp2_device *ccp2);</div><div class='ctx'> </div><div class='ctx'> #endif	/* OMAP3_ISP_CCP2_H */</div><div class='head'>diff --git a/drivers/media/video/omap3isp/ispcsi2.c b/drivers/media/video/omap3isp/ispcsi2.c<br/>index 0c5f1cb9d99d..fcb5168996a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispcsi2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispcsi2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispcsi2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap3isp/ispcsi2.c</a></div><div class='hunk'>@@ -667,7 +667,7 @@ static void csi2_isr_buffer(struct isp_csi2_device *csi2)</div><div class='ctx'> </div><div class='ctx'> 	csi2_ctx_enable(isp, csi2, 0, 0);</div><div class='ctx'> </div><div class='del'>-	buffer = omap3isp_video_buffer_next(&amp;csi2-&gt;video_out, 0);</div><div class='add'>+	buffer = omap3isp_video_buffer_next(&amp;csi2-&gt;video_out);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Let video queue operation restart engine if there is an underrun</div><div class='hunk'>@@ -727,17 +727,15 @@ static void csi2_isr_ctx(struct isp_csi2_device *csi2,</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * omap3isp_csi2_isr - CSI2 interrupt handling.</div><div class='del'>- *</div><div class='del'>- * Return -EIO on Transmission error</div><div class='ctx'>  */</div><div class='del'>-int omap3isp_csi2_isr(struct isp_csi2_device *csi2)</div><div class='add'>+void omap3isp_csi2_isr(struct isp_csi2_device *csi2)</div><div class='ctx'> {</div><div class='add'>+	struct isp_pipeline *pipe = to_isp_pipeline(&amp;csi2-&gt;subdev.entity);</div><div class='ctx'> 	u32 csi2_irqstatus, cpxio1_irqstatus;</div><div class='ctx'> 	struct isp_device *isp = csi2-&gt;isp;</div><div class='del'>-	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!csi2-&gt;available)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	csi2_irqstatus = isp_reg_readl(isp, csi2-&gt;regs1, ISPCSI2_IRQSTATUS);</div><div class='ctx'> 	isp_reg_writel(isp, csi2_irqstatus, csi2-&gt;regs1, ISPCSI2_IRQSTATUS);</div><div class='hunk'>@@ -750,7 +748,7 @@ int omap3isp_csi2_isr(struct isp_csi2_device *csi2)</div><div class='ctx'> 			       csi2-&gt;regs1, ISPCSI2_PHY_IRQSTATUS);</div><div class='ctx'> 		dev_dbg(isp-&gt;dev, "CSI2: ComplexIO Error IRQ "</div><div class='ctx'> 			"%x\n", cpxio1_irqstatus);</div><div class='del'>-		retval = -EIO;</div><div class='add'>+		pipe-&gt;error = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (csi2_irqstatus &amp; (ISPCSI2_IRQSTATUS_OCP_ERR_IRQ |</div><div class='hunk'>@@ -775,11 +773,11 @@ int omap3isp_csi2_isr(struct isp_csi2_device *csi2)</div><div class='ctx'> 			 ISPCSI2_IRQSTATUS_COMPLEXIO2_ERR_IRQ) ? 1 : 0,</div><div class='ctx'> 			(csi2_irqstatus &amp;</div><div class='ctx'> 			 ISPCSI2_IRQSTATUS_FIFO_OVF_IRQ) ? 1 : 0);</div><div class='del'>-		retval = -EIO;</div><div class='add'>+		pipe-&gt;error = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (omap3isp_module_sync_is_stopping(&amp;csi2-&gt;wait, &amp;csi2-&gt;stopping))</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Successful cases */</div><div class='ctx'> 	if (csi2_irqstatus &amp; ISPCSI2_IRQSTATUS_CONTEXT(0))</div><div class='hunk'>@@ -787,8 +785,6 @@ int omap3isp_csi2_isr(struct isp_csi2_device *csi2)</div><div class='ctx'> </div><div class='ctx'> 	if (csi2_irqstatus &amp; ISPCSI2_IRQSTATUS_ECC_CORRECTION_IRQ)</div><div class='ctx'> 		dev_dbg(isp-&gt;dev, "CSI2: ECC correction done\n");</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* -----------------------------------------------------------------------------</div><div class='head'>diff --git a/drivers/media/video/omap3isp/ispcsi2.h b/drivers/media/video/omap3isp/ispcsi2.h<br/>index 456fb7fb8a0f..885ad79a7678 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispcsi2.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispcsi2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispcsi2.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap3isp/ispcsi2.h</a></div><div class='hunk'>@@ -156,7 +156,7 @@ struct isp_csi2_device {</div><div class='ctx'> 	atomic_t stopping;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int omap3isp_csi2_isr(struct isp_csi2_device *csi2);</div><div class='add'>+void omap3isp_csi2_isr(struct isp_csi2_device *csi2);</div><div class='ctx'> int omap3isp_csi2_reset(struct isp_csi2_device *csi2);</div><div class='ctx'> int omap3isp_csi2_init(struct isp_device *isp);</div><div class='ctx'> void omap3isp_csi2_cleanup(struct isp_device *isp);</div><div class='head'>diff --git a/drivers/media/video/omap3isp/isppreview.c b/drivers/media/video/omap3isp/isppreview.c<br/>index ccb876fe023f..6d0fb2c8c26d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/isppreview.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/isppreview.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/isppreview.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap3isp/isppreview.c</a></div><div class='hunk'>@@ -116,11 +116,11 @@ static struct omap3isp_prev_csc flr_prev_csc = {</div><div class='ctx'> #define PREV_MIN_IN_HEIGHT	8</div><div class='ctx'> #define PREV_MAX_IN_HEIGHT	16384</div><div class='ctx'> </div><div class='del'>-#define PREV_MIN_OUT_WIDTH	0</div><div class='del'>-#define PREV_MIN_OUT_HEIGHT	0</div><div class='del'>-#define PREV_MAX_OUT_WIDTH	1280</div><div class='del'>-#define PREV_MAX_OUT_WIDTH_ES2	3300</div><div class='del'>-#define PREV_MAX_OUT_WIDTH_3630	4096</div><div class='add'>+#define PREV_MIN_OUT_WIDTH		0</div><div class='add'>+#define PREV_MIN_OUT_HEIGHT		0</div><div class='add'>+#define PREV_MAX_OUT_WIDTH_REV_1	1280</div><div class='add'>+#define PREV_MAX_OUT_WIDTH_REV_2	3300</div><div class='add'>+#define PREV_MAX_OUT_WIDTH_REV_15	4096</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Coeficient Tables for the submodules in Preview.</div><div class='hunk'>@@ -1306,14 +1306,14 @@ static unsigned int preview_max_out_width(struct isp_prev_device *prev)</div><div class='ctx'> </div><div class='ctx'> 	switch (isp-&gt;revision) {</div><div class='ctx'> 	case ISP_REVISION_1_0:</div><div class='del'>-		return PREV_MAX_OUT_WIDTH;</div><div class='add'>+		return PREV_MAX_OUT_WIDTH_REV_1;</div><div class='ctx'> </div><div class='ctx'> 	case ISP_REVISION_2_0:</div><div class='ctx'> 	default:</div><div class='del'>-		return PREV_MAX_OUT_WIDTH_ES2;</div><div class='add'>+		return PREV_MAX_OUT_WIDTH_REV_2;</div><div class='ctx'> </div><div class='ctx'> 	case ISP_REVISION_15_0:</div><div class='del'>-		return PREV_MAX_OUT_WIDTH_3630;</div><div class='add'>+		return PREV_MAX_OUT_WIDTH_REV_15;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1404,16 +1404,14 @@ static void preview_isr_buffer(struct isp_prev_device *prev)</div><div class='ctx'> 	int restart = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (prev-&gt;input == PREVIEW_INPUT_MEMORY) {</div><div class='del'>-		buffer = omap3isp_video_buffer_next(&amp;prev-&gt;video_in,</div><div class='del'>-						    prev-&gt;error);</div><div class='add'>+		buffer = omap3isp_video_buffer_next(&amp;prev-&gt;video_in);</div><div class='ctx'> 		if (buffer != NULL)</div><div class='ctx'> 			preview_set_inaddr(prev, buffer-&gt;isp_addr);</div><div class='ctx'> 		pipe-&gt;state |= ISP_PIPELINE_IDLE_INPUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (prev-&gt;output &amp; PREVIEW_OUTPUT_MEMORY) {</div><div class='del'>-		buffer = omap3isp_video_buffer_next(&amp;prev-&gt;video_out,</div><div class='del'>-						    prev-&gt;error);</div><div class='add'>+		buffer = omap3isp_video_buffer_next(&amp;prev-&gt;video_out);</div><div class='ctx'> 		if (buffer != NULL) {</div><div class='ctx'> 			preview_set_outaddr(prev, buffer-&gt;isp_addr);</div><div class='ctx'> 			restart = 1;</div><div class='hunk'>@@ -1440,8 +1438,6 @@ static void preview_isr_buffer(struct isp_prev_device *prev)</div><div class='ctx'> 	default:</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	prev-&gt;error = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1565,7 +1561,6 @@ static int preview_set_stream(struct v4l2_subdev *sd, int enable)</div><div class='ctx'> 		omap3isp_subclk_enable(isp, OMAP3_ISP_SUBCLK_PREVIEW);</div><div class='ctx'> 		preview_configure(prev);</div><div class='ctx'> 		atomic_set(&amp;prev-&gt;stopping, 0);</div><div class='del'>-		prev-&gt;error = 0;</div><div class='ctx'> 		preview_print_status(prev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/omap3isp/isppreview.h b/drivers/media/video/omap3isp/isppreview.h<br/>index f54e775c2df4..09686607973c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/isppreview.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/isppreview.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/isppreview.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap3isp/isppreview.h</a></div><div class='hunk'>@@ -157,7 +157,6 @@ struct isptables_update {</div><div class='ctx'>  * @output: Bitmask of the active output</div><div class='ctx'>  * @video_in: Input video entity</div><div class='ctx'>  * @video_out: Output video entity</div><div class='del'>- * @error: A hardware error occurred during capture</div><div class='ctx'>  * @params: Module configuration data</div><div class='ctx'>  * @shadow_update: If set, update the hardware configured in the next interrupt</div><div class='ctx'>  * @underrun: Whether the preview entity has queued buffers on the output</div><div class='hunk'>@@ -179,7 +178,6 @@ struct isp_prev_device {</div><div class='ctx'> 	unsigned int output;</div><div class='ctx'> 	struct isp_video video_in;</div><div class='ctx'> 	struct isp_video video_out;</div><div class='del'>-	unsigned int error;</div><div class='ctx'> </div><div class='ctx'> 	struct prev_params params;</div><div class='ctx'> 	unsigned int shadow_update:1;</div><div class='head'>diff --git a/drivers/media/video/omap3isp/ispresizer.c b/drivers/media/video/omap3isp/ispresizer.c<br/>index 50e593bfcfaf..6958a9e3dc22 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispresizer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispresizer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispresizer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap3isp/ispresizer.c</a></div><div class='hunk'>@@ -1038,7 +1038,7 @@ static void resizer_isr_buffer(struct isp_res_device *res)</div><div class='ctx'> 	/* Complete the output buffer and, if reading from memory, the input</div><div class='ctx'> 	 * buffer.</div><div class='ctx'> 	 */</div><div class='del'>-	buffer = omap3isp_video_buffer_next(&amp;res-&gt;video_out, res-&gt;error);</div><div class='add'>+	buffer = omap3isp_video_buffer_next(&amp;res-&gt;video_out);</div><div class='ctx'> 	if (buffer != NULL) {</div><div class='ctx'> 		resizer_set_outaddr(res, buffer-&gt;isp_addr);</div><div class='ctx'> 		restart = 1;</div><div class='hunk'>@@ -1047,7 +1047,7 @@ static void resizer_isr_buffer(struct isp_res_device *res)</div><div class='ctx'> 	pipe-&gt;state |= ISP_PIPELINE_IDLE_OUTPUT;</div><div class='ctx'> </div><div class='ctx'> 	if (res-&gt;input == RESIZER_INPUT_MEMORY) {</div><div class='del'>-		buffer = omap3isp_video_buffer_next(&amp;res-&gt;video_in, 0);</div><div class='add'>+		buffer = omap3isp_video_buffer_next(&amp;res-&gt;video_in);</div><div class='ctx'> 		if (buffer != NULL)</div><div class='ctx'> 			resizer_set_inaddr(res, buffer-&gt;isp_addr);</div><div class='ctx'> 		pipe-&gt;state |= ISP_PIPELINE_IDLE_INPUT;</div><div class='hunk'>@@ -1064,8 +1064,6 @@ static void resizer_isr_buffer(struct isp_res_device *res)</div><div class='ctx'> 		if (restart)</div><div class='ctx'> 			resizer_enable_oneshot(res);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	res-&gt;error = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1154,7 +1152,6 @@ static int resizer_set_stream(struct v4l2_subdev *sd, int enable)</div><div class='ctx'> </div><div class='ctx'> 		omap3isp_subclk_enable(isp, OMAP3_ISP_SUBCLK_RESIZER);</div><div class='ctx'> 		resizer_configure(res);</div><div class='del'>-		res-&gt;error = 0;</div><div class='ctx'> 		resizer_print_status(res);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/omap3isp/ispresizer.h b/drivers/media/video/omap3isp/ispresizer.h<br/>index 76abc2e42126..70c1c0e1bbdf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispresizer.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispresizer.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispresizer.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap3isp/ispresizer.h</a></div><div class='hunk'>@@ -107,7 +107,6 @@ struct isp_res_device {</div><div class='ctx'> 	enum resizer_input_entity input;</div><div class='ctx'> 	struct isp_video video_in;</div><div class='ctx'> 	struct isp_video video_out;</div><div class='del'>-	unsigned int error;</div><div class='ctx'> </div><div class='ctx'> 	u32 addr_base;   /* stored source buffer address in memory mode */</div><div class='ctx'> 	u32 crop_offset; /* additional offset for crop in memory mode */</div><div class='head'>diff --git a/drivers/media/video/omap3isp/ispstat.c b/drivers/media/video/omap3isp/ispstat.c<br/>index bc0b2c7349b9..11871ecc6d25 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispstat.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispstat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispstat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap3isp/ispstat.c</a></div><div class='hunk'>@@ -366,7 +366,7 @@ static void isp_stat_bufs_free(struct ispstat *stat)</div><div class='ctx'> 				dma_unmap_sg(isp-&gt;dev, buf-&gt;iovm-&gt;sgt-&gt;sgl,</div><div class='ctx'> 					     buf-&gt;iovm-&gt;sgt-&gt;nents,</div><div class='ctx'> 					     DMA_FROM_DEVICE);</div><div class='del'>-			omap_iommu_vfree(isp-&gt;domain, isp-&gt;iommu,</div><div class='add'>+			omap_iommu_vfree(isp-&gt;domain, isp-&gt;dev,</div><div class='ctx'> 							buf-&gt;iommu_addr);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (!buf-&gt;virt_addr)</div><div class='hunk'>@@ -400,7 +400,7 @@ static int isp_stat_bufs_alloc_iommu(struct ispstat *stat, unsigned int size)</div><div class='ctx'> 		struct iovm_struct *iovm;</div><div class='ctx'> </div><div class='ctx'> 		WARN_ON(buf-&gt;dma_addr);</div><div class='del'>-		buf-&gt;iommu_addr = omap_iommu_vmalloc(isp-&gt;domain, isp-&gt;iommu, 0,</div><div class='add'>+		buf-&gt;iommu_addr = omap_iommu_vmalloc(isp-&gt;domain, isp-&gt;dev, 0,</div><div class='ctx'> 							size, IOMMU_FLAG);</div><div class='ctx'> 		if (IS_ERR((void *)buf-&gt;iommu_addr)) {</div><div class='ctx'> 			dev_err(stat-&gt;isp-&gt;dev,</div><div class='hunk'>@@ -410,7 +410,7 @@ static int isp_stat_bufs_alloc_iommu(struct ispstat *stat, unsigned int size)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		iovm = omap_find_iovm_area(isp-&gt;iommu, buf-&gt;iommu_addr);</div><div class='add'>+		iovm = omap_find_iovm_area(isp-&gt;dev, buf-&gt;iommu_addr);</div><div class='ctx'> 		if (!iovm ||</div><div class='ctx'> 		    !dma_map_sg(isp-&gt;dev, iovm-&gt;sgt-&gt;sgl, iovm-&gt;sgt-&gt;nents,</div><div class='ctx'> 				DMA_FROM_DEVICE)) {</div><div class='hunk'>@@ -419,7 +419,7 @@ static int isp_stat_bufs_alloc_iommu(struct ispstat *stat, unsigned int size)</div><div class='ctx'> 		}</div><div class='ctx'> 		buf-&gt;iovm = iovm;</div><div class='ctx'> </div><div class='del'>-		buf-&gt;virt_addr = omap_da_to_va(stat-&gt;isp-&gt;iommu,</div><div class='add'>+		buf-&gt;virt_addr = omap_da_to_va(stat-&gt;isp-&gt;dev,</div><div class='ctx'> 					  (u32)buf-&gt;iommu_addr);</div><div class='ctx'> 		buf-&gt;empty = 1;</div><div class='ctx'> 		dev_dbg(stat-&gt;isp-&gt;dev, "%s: buffer[%d] allocated."</div><div class='head'>diff --git a/drivers/media/video/omap3isp/ispvideo.c b/drivers/media/video/omap3isp/ispvideo.c<br/>index f2290578448c..b02070057724 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispvideo.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispvideo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispvideo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap3isp/ispvideo.c</a></div><div class='hunk'>@@ -211,14 +211,14 @@ static void isp_video_pix_to_mbus(const struct v4l2_pix_format *pix,</div><div class='ctx'> 	mbus-&gt;width = pix-&gt;width;</div><div class='ctx'> 	mbus-&gt;height = pix-&gt;height;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(formats); ++i) {</div><div class='add'>+	/* Skip the last format in the loop so that it will be selected if no</div><div class='add'>+	 * match is found.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(formats) - 1; ++i) {</div><div class='ctx'> 		if (formats[i].pixelformat == pix-&gt;pixelformat)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(i == ARRAY_SIZE(formats)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	mbus-&gt;code = formats[i].code;</div><div class='ctx'> 	mbus-&gt;colorspace = pix-&gt;colorspace;</div><div class='ctx'> 	mbus-&gt;field = pix-&gt;field;</div><div class='hunk'>@@ -453,7 +453,7 @@ ispmmu_vmap(struct isp_device *isp, const struct scatterlist *sglist, int sglen)</div><div class='ctx'> 	sgt-&gt;nents = sglen;</div><div class='ctx'> 	sgt-&gt;orig_nents = sglen;</div><div class='ctx'> </div><div class='del'>-	da = omap_iommu_vmap(isp-&gt;domain, isp-&gt;iommu, 0, sgt, IOMMU_FLAG);</div><div class='add'>+	da = omap_iommu_vmap(isp-&gt;domain, isp-&gt;dev, 0, sgt, IOMMU_FLAG);</div><div class='ctx'> 	if (IS_ERR_VALUE(da))</div><div class='ctx'> 		kfree(sgt);</div><div class='ctx'> </div><div class='hunk'>@@ -469,7 +469,7 @@ static void ispmmu_vunmap(struct isp_device *isp, dma_addr_t da)</div><div class='ctx'> {</div><div class='ctx'> 	struct sg_table *sgt;</div><div class='ctx'> </div><div class='del'>-	sgt = omap_iommu_vunmap(isp-&gt;domain, isp-&gt;iommu, (u32)da);</div><div class='add'>+	sgt = omap_iommu_vunmap(isp-&gt;domain, isp-&gt;dev, (u32)da);</div><div class='ctx'> 	kfree(sgt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -581,21 +581,20 @@ static const struct isp_video_queue_operations isp_video_queue_ops = {</div><div class='ctx'> /*</div><div class='ctx'>  * omap3isp_video_buffer_next - Complete the current buffer and return the next</div><div class='ctx'>  * @video: ISP video object</div><div class='del'>- * @error: Whether an error occurred during capture</div><div class='ctx'>  *</div><div class='ctx'>  * Remove the current video buffer from the DMA queue and fill its timestamp,</div><div class='ctx'>  * field count and state fields before waking up its completion handler.</div><div class='ctx'>  *</div><div class='del'>- * The buffer state is set to VIDEOBUF_DONE if no error occurred (@error is 0)</div><div class='del'>- * or VIDEOBUF_ERROR otherwise (@error is non-zero).</div><div class='add'>+ * For capture video nodes the buffer state is set to ISP_BUF_STATE_DONE if no</div><div class='add'>+ * error has been flagged in the pipeline, or to ISP_BUF_STATE_ERROR otherwise.</div><div class='add'>+ * For video output nodes the buffer state is always set to ISP_BUF_STATE_DONE.</div><div class='ctx'>  *</div><div class='ctx'>  * The DMA queue is expected to contain at least one buffer.</div><div class='ctx'>  *</div><div class='ctx'>  * Return a pointer to the next buffer in the DMA queue, or NULL if the queue is</div><div class='ctx'>  * empty.</div><div class='ctx'>  */</div><div class='del'>-struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video,</div><div class='del'>-					      unsigned int error)</div><div class='add'>+struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video)</div><div class='ctx'> {</div><div class='ctx'> 	struct isp_pipeline *pipe = to_isp_pipeline(&amp;video-&gt;video.entity);</div><div class='ctx'> 	struct isp_video_queue *queue = video-&gt;queue;</div><div class='hunk'>@@ -630,7 +629,13 @@ struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video,</div><div class='ctx'> 	else</div><div class='ctx'> 		buf-&gt;vbuf.sequence = atomic_read(&amp;pipe-&gt;frame_number);</div><div class='ctx'> </div><div class='del'>-	buf-&gt;state = error ? ISP_BUF_STATE_ERROR : ISP_BUF_STATE_DONE;</div><div class='add'>+	/* Report pipeline errors to userspace on the capture device side. */</div><div class='add'>+	if (queue-&gt;type == V4L2_BUF_TYPE_VIDEO_CAPTURE &amp;&amp; pipe-&gt;error) {</div><div class='add'>+		buf-&gt;state = ISP_BUF_STATE_ERROR;</div><div class='add'>+		pipe-&gt;error = false;</div><div class='add'>+	} else {</div><div class='add'>+		buf-&gt;state = ISP_BUF_STATE_DONE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	wake_up(&amp;buf-&gt;wait);</div><div class='ctx'> </div><div class='hunk'>@@ -1016,6 +1021,8 @@ isp_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='add'>+	pipe-&gt;error = false;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;pipe-&gt;lock, flags);</div><div class='ctx'> 	pipe-&gt;state &amp;= ~ISP_PIPELINE_STREAM;</div><div class='ctx'> 	pipe-&gt;state |= state;</div><div class='head'>diff --git a/drivers/media/video/omap3isp/ispvideo.h b/drivers/media/video/omap3isp/ispvideo.h<br/>index 08cbfa144e6e..d91bdb919be0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispvideo.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/omap3isp/ispvideo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/omap3isp/ispvideo.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/omap3isp/ispvideo.h</a></div><div class='hunk'>@@ -85,6 +85,10 @@ enum isp_pipeline_state {</div><div class='ctx'> 	ISP_PIPELINE_STREAM = 64,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * struct isp_pipeline - An ISP hardware pipeline</div><div class='add'>+ * @error: A hardware error occurred during capture</div><div class='add'>+ */</div><div class='ctx'> struct isp_pipeline {</div><div class='ctx'> 	struct media_pipeline pipe;</div><div class='ctx'> 	spinlock_t lock;		/* Pipeline state and queue flags */</div><div class='hunk'>@@ -96,6 +100,7 @@ struct isp_pipeline {</div><div class='ctx'> 	unsigned int max_rate;</div><div class='ctx'> 	atomic_t frame_number;</div><div class='ctx'> 	bool do_propagation; /* of frame number */</div><div class='add'>+	bool error;</div><div class='ctx'> 	struct v4l2_fract max_timeperframe;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -194,8 +199,7 @@ void omap3isp_video_cleanup(struct isp_video *video);</div><div class='ctx'> int omap3isp_video_register(struct isp_video *video,</div><div class='ctx'> 			    struct v4l2_device *vdev);</div><div class='ctx'> void omap3isp_video_unregister(struct isp_video *video);</div><div class='del'>-struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video,</div><div class='del'>-					      unsigned int error);</div><div class='add'>+struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video);</div><div class='ctx'> void omap3isp_video_resume(struct isp_video *video, int continuous);</div><div class='ctx'> struct media_pad *omap3isp_video_remote_pad(struct isp_video *video);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c<br/>index 8aa058531280..6a564964853a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ov7670.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/ov7670.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ov7670.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/ov7670.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@ MODULE_AUTHOR("Jonathan Corbet &lt;corbet@lwn.net&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("A low-level driver for OmniVision ov7670 sensors");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> module_param(debug, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(debug, "Debug level (0-1)");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c<br/>index 122b45760f0d..ebc2c7e39233 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-hdw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pvrusb2/pvrusb2-hdw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-hdw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/pvrusb2/pvrusb2-hdw.c</a></div><div class='hunk'>@@ -2546,8 +2546,9 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Define and configure additional controls from cx2341x module. */</div><div class='del'>-	hdw-&gt;mpeg_ctrl_info = kzalloc(</div><div class='del'>-		sizeof(*(hdw-&gt;mpeg_ctrl_info)) * MPEGDEF_COUNT, GFP_KERNEL);</div><div class='add'>+	hdw-&gt;mpeg_ctrl_info = kcalloc(MPEGDEF_COUNT,</div><div class='add'>+				      sizeof(*(hdw-&gt;mpeg_ctrl_info)),</div><div class='add'>+				      GFP_KERNEL);</div><div class='ctx'> 	if (!hdw-&gt;mpeg_ctrl_info) goto fail;</div><div class='ctx'> 	for (idx = 0; idx &lt; MPEGDEF_COUNT; idx++) {</div><div class='ctx'> 		cptr = hdw-&gt;controls + idx + CTRLDEF_COUNT;</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-ctrl.c b/drivers/media/video/pwc/pwc-ctrl.c<br/>index 3977addf3ba8..1f506fde97d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-ctrl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-ctrl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-ctrl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/pwc/pwc-ctrl.c</a></div><div class='hunk'>@@ -102,52 +102,18 @@ static struct Nala_table_entry Nala_table[PSZ_MAX][PWC_FPS_MAX_NALA] =</div><div class='ctx'> #include "pwc-nala.h"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void pwc_set_image_buffer_size(struct pwc_device *pdev);</div><div class='del'>-</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> </div><div class='del'>-static int _send_control_msg(struct pwc_device *pdev,</div><div class='del'>-	u8 request, u16 value, int index, void *buf, int buflen)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-	void *kbuf = NULL;</div><div class='del'>-</div><div class='del'>-	if (buflen) {</div><div class='del'>-		kbuf = kmalloc(buflen, GFP_KERNEL); /* not allowed on stack */</div><div class='del'>-		if (kbuf == NULL)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		memcpy(kbuf, buf, buflen);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = usb_control_msg(pdev-&gt;udev, usb_sndctrlpipe(pdev-&gt;udev, 0),</div><div class='del'>-		request,</div><div class='del'>-		USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='del'>-		value,</div><div class='del'>-		index,</div><div class='del'>-		kbuf, buflen, USB_CTRL_SET_TIMEOUT);</div><div class='del'>-</div><div class='del'>-	kfree(kbuf);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int recv_control_msg(struct pwc_device *pdev,</div><div class='del'>-	u8 request, u16 value, void *buf, int buflen)</div><div class='add'>+	u8 request, u16 value, int recv_count)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='del'>-	void *kbuf = kmalloc(buflen, GFP_KERNEL); /* not allowed on stack */</div><div class='del'>-</div><div class='del'>-	if (kbuf == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	rc = usb_control_msg(pdev-&gt;udev, usb_rcvctrlpipe(pdev-&gt;udev, 0),</div><div class='ctx'> 		request,</div><div class='ctx'> 		USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='del'>-		value,</div><div class='del'>-		pdev-&gt;vcinterface,</div><div class='del'>-		kbuf, buflen, USB_CTRL_GET_TIMEOUT);</div><div class='del'>-	memcpy(buf, kbuf, buflen);</div><div class='del'>-	kfree(kbuf);</div><div class='del'>-</div><div class='add'>+		value, pdev-&gt;vcinterface,</div><div class='add'>+		pdev-&gt;ctrl_buf, recv_count, USB_CTRL_GET_TIMEOUT);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		PWC_ERROR("recv_control_msg error %d req %02x val %04x\n",</div><div class='ctx'> 			  rc, request, value);</div><div class='hunk'>@@ -155,26 +121,39 @@ static int recv_control_msg(struct pwc_device *pdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int send_video_command(struct pwc_device *pdev,</div><div class='del'>-	int index, void *buf, int buflen)</div><div class='add'>+	int index, const unsigned char *buf, int buflen)</div><div class='ctx'> {</div><div class='del'>-	return _send_control_msg(pdev,</div><div class='del'>-		SET_EP_STREAM_CTL,</div><div class='del'>-		VIDEO_OUTPUT_CONTROL_FORMATTER,</div><div class='del'>-		index,</div><div class='del'>-		buf, buflen);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	memcpy(pdev-&gt;ctrl_buf, buf, buflen);</div><div class='add'>+</div><div class='add'>+	rc = usb_control_msg(pdev-&gt;udev, usb_sndctrlpipe(pdev-&gt;udev, 0),</div><div class='add'>+			SET_EP_STREAM_CTL,</div><div class='add'>+			USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='add'>+			VIDEO_OUTPUT_CONTROL_FORMATTER, index,</div><div class='add'>+			pdev-&gt;ctrl_buf, buflen, USB_CTRL_SET_TIMEOUT);</div><div class='add'>+	if (rc &gt;= 0)</div><div class='add'>+		memcpy(pdev-&gt;cmd_buf, buf, buflen);</div><div class='add'>+	else</div><div class='add'>+		PWC_ERROR("send_video_command error %d\n", rc);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int send_control_msg(struct pwc_device *pdev,</div><div class='ctx'> 	u8 request, u16 value, void *buf, int buflen)</div><div class='ctx'> {</div><div class='del'>-	return _send_control_msg(pdev,</div><div class='del'>-		request, value, pdev-&gt;vcinterface, buf, buflen);</div><div class='add'>+	return usb_control_msg(pdev-&gt;udev, usb_sndctrlpipe(pdev-&gt;udev, 0),</div><div class='add'>+			request,</div><div class='add'>+			USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='add'>+			value, pdev-&gt;vcinterface,</div><div class='add'>+			buf, buflen, USB_CTRL_SET_TIMEOUT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_video_mode_Nala(struct pwc_device *pdev, int size, int frames)</div><div class='add'>+static int set_video_mode_Nala(struct pwc_device *pdev, int size, int pixfmt,</div><div class='add'>+			       int frames, int *compression, int send_to_cam)</div><div class='ctx'> {</div><div class='del'>-	unsigned char buf[3];</div><div class='del'>-	int ret, fps;</div><div class='add'>+	int fps, ret = 0;</div><div class='ctx'> 	struct Nala_table_entry *pEntry;</div><div class='ctx'> 	int frames2frames[31] =</div><div class='ctx'> 	{ /* closest match of framerate */</div><div class='hunk'>@@ -196,35 +175,34 @@ static int set_video_mode_Nala(struct pwc_device *pdev, int size, int frames)</div><div class='ctx'> 	  7              /* 30    */</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (size &lt; 0 || size &gt; PSZ_CIF || frames &lt; 4 || frames &gt; 25)</div><div class='add'>+	if (size &lt; 0 || size &gt; PSZ_CIF)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if (frames &lt; 4)</div><div class='add'>+		frames = 4;</div><div class='add'>+	else if (frames &gt; 25)</div><div class='add'>+		frames = 25;</div><div class='ctx'> 	frames = frames2frames[frames];</div><div class='ctx'> 	fps = frames2table[frames];</div><div class='ctx'> 	pEntry = &amp;Nala_table[size][fps];</div><div class='ctx'> 	if (pEntry-&gt;alternate == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	memcpy(buf, pEntry-&gt;mode, 3);</div><div class='del'>-	ret = send_video_command(pdev, pdev-&gt;vendpoint, buf, 3);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		PWC_DEBUG_MODULE("Failed to send video command... %d\n", ret);</div><div class='add'>+	if (send_to_cam)</div><div class='add'>+		ret = send_video_command(pdev, pdev-&gt;vendpoint,</div><div class='add'>+					 pEntry-&gt;mode, 3);</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	}</div><div class='del'>-	if (pEntry-&gt;compressed &amp;&amp; pdev-&gt;pixfmt == V4L2_PIX_FMT_YUV420) {</div><div class='del'>-		ret = pwc_dec1_init(pdev, pdev-&gt;type, pdev-&gt;release, buf);</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='del'>-	pdev-&gt;cmd_len = 3;</div><div class='del'>-	memcpy(pdev-&gt;cmd_buf, buf, 3);</div><div class='add'>+	if (pEntry-&gt;compressed &amp;&amp; pixfmt == V4L2_PIX_FMT_YUV420)</div><div class='add'>+		pwc_dec1_init(pdev, pEntry-&gt;mode);</div><div class='ctx'> </div><div class='ctx'> 	/* Set various parameters */</div><div class='add'>+	pdev-&gt;pixfmt = pixfmt;</div><div class='ctx'> 	pdev-&gt;vframes = frames;</div><div class='del'>-	pdev-&gt;vsize = size;</div><div class='ctx'> 	pdev-&gt;valternate = pEntry-&gt;alternate;</div><div class='del'>-	pdev-&gt;image = pwc_image_sizes[size];</div><div class='del'>-	pdev-&gt;frame_size = (pdev-&gt;image.x * pdev-&gt;image.y * 3) / 2;</div><div class='add'>+	pdev-&gt;width  = pwc_image_sizes[size][0];</div><div class='add'>+	pdev-&gt;height = pwc_image_sizes[size][1];</div><div class='add'>+	pdev-&gt;frame_size = (pdev-&gt;width * pdev-&gt;height * 3) / 2;</div><div class='ctx'> 	if (pEntry-&gt;compressed) {</div><div class='ctx'> 		if (pdev-&gt;release &lt; 5) { /* 4 fold compression */</div><div class='ctx'> 			pdev-&gt;vbandlength = 528;</div><div class='hunk'>@@ -237,183 +215,142 @@ static int set_video_mode_Nala(struct pwc_device *pdev, int size, int frames)</div><div class='ctx'> 	}</div><div class='ctx'> 	else</div><div class='ctx'> 		pdev-&gt;vbandlength = 0;</div><div class='add'>+</div><div class='add'>+	/* Let pwc-if.c:isoc_init know we don't support higher compression */</div><div class='add'>+	*compression = 3;</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='del'>-static int set_video_mode_Timon(struct pwc_device *pdev, int size, int frames, int compression, int snapshot)</div><div class='add'>+static int set_video_mode_Timon(struct pwc_device *pdev, int size, int pixfmt,</div><div class='add'>+				int frames, int *compression, int send_to_cam)</div><div class='ctx'> {</div><div class='del'>-	unsigned char buf[13];</div><div class='ctx'> 	const struct Timon_table_entry *pChoose;</div><div class='del'>-	int ret, fps;</div><div class='add'>+	int fps, ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (size &gt;= PSZ_MAX || frames &lt; 5 || frames &gt; 30 || compression &lt; 0 || compression &gt; 3)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (size == PSZ_VGA &amp;&amp; frames &gt; 15)</div><div class='add'>+	if (size &gt;= PSZ_MAX || *compression &lt; 0 || *compression &gt; 3)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if (frames &lt; 5)</div><div class='add'>+		frames = 5;</div><div class='add'>+	else if (size == PSZ_VGA &amp;&amp; frames &gt; 15)</div><div class='add'>+		frames = 15;</div><div class='add'>+	else if (frames &gt; 30)</div><div class='add'>+		frames = 30;</div><div class='ctx'> 	fps = (frames / 5) - 1;</div><div class='ctx'> </div><div class='del'>-	/* Find a supported framerate with progressively higher compression ratios</div><div class='del'>-	   if the preferred ratio is not available.</div><div class='del'>-	*/</div><div class='add'>+	/* Find a supported framerate with progressively higher compression */</div><div class='ctx'> 	pChoose = NULL;</div><div class='del'>-	while (compression &lt;= 3) {</div><div class='del'>-	   pChoose = &amp;Timon_table[size][fps][compression];</div><div class='del'>-	   if (pChoose-&gt;alternate != 0)</div><div class='del'>-	     break;</div><div class='del'>-	   compression++;</div><div class='add'>+	while (*compression &lt;= 3) {</div><div class='add'>+		pChoose = &amp;Timon_table[size][fps][*compression];</div><div class='add'>+		if (pChoose-&gt;alternate != 0)</div><div class='add'>+			break;</div><div class='add'>+		(*compression)++;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pChoose == NULL || pChoose-&gt;alternate == 0)</div><div class='ctx'> 		return -ENOENT; /* Not supported. */</div><div class='ctx'> </div><div class='del'>-	memcpy(buf, pChoose-&gt;mode, 13);</div><div class='del'>-	if (snapshot)</div><div class='del'>-		buf[0] |= 0x80;</div><div class='del'>-	ret = send_video_command(pdev, pdev-&gt;vendpoint, buf, 13);</div><div class='add'>+	if (send_to_cam)</div><div class='add'>+		ret = send_video_command(pdev, pdev-&gt;vendpoint,</div><div class='add'>+					 pChoose-&gt;mode, 13);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (pChoose-&gt;bandlength &gt; 0 &amp;&amp; pdev-&gt;pixfmt == V4L2_PIX_FMT_YUV420) {</div><div class='del'>-		ret = pwc_dec23_init(pdev, pdev-&gt;type, buf);</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='del'>-	pdev-&gt;cmd_len = 13;</div><div class='del'>-	memcpy(pdev-&gt;cmd_buf, buf, 13);</div><div class='add'>+	if (pChoose-&gt;bandlength &gt; 0 &amp;&amp; pixfmt == V4L2_PIX_FMT_YUV420)</div><div class='add'>+		pwc_dec23_init(pdev, pChoose-&gt;mode);</div><div class='ctx'> </div><div class='ctx'> 	/* Set various parameters */</div><div class='del'>-	pdev-&gt;vframes = frames;</div><div class='del'>-	pdev-&gt;vsize = size;</div><div class='del'>-	pdev-&gt;vsnapshot = snapshot;</div><div class='add'>+	pdev-&gt;pixfmt = pixfmt;</div><div class='add'>+	pdev-&gt;vframes = (fps + 1) * 5;</div><div class='ctx'> 	pdev-&gt;valternate = pChoose-&gt;alternate;</div><div class='del'>-	pdev-&gt;image = pwc_image_sizes[size];</div><div class='add'>+	pdev-&gt;width  = pwc_image_sizes[size][0];</div><div class='add'>+	pdev-&gt;height = pwc_image_sizes[size][1];</div><div class='ctx'> 	pdev-&gt;vbandlength = pChoose-&gt;bandlength;</div><div class='ctx'> 	if (pChoose-&gt;bandlength &gt; 0)</div><div class='del'>-		pdev-&gt;frame_size = (pChoose-&gt;bandlength * pdev-&gt;image.y) / 4;</div><div class='add'>+		pdev-&gt;frame_size = (pChoose-&gt;bandlength * pdev-&gt;height) / 4;</div><div class='ctx'> 	else</div><div class='del'>-		pdev-&gt;frame_size = (pdev-&gt;image.x * pdev-&gt;image.y * 12) / 8;</div><div class='add'>+		pdev-&gt;frame_size = (pdev-&gt;width * pdev-&gt;height * 12) / 8;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int set_video_mode_Kiara(struct pwc_device *pdev, int size, int frames, int compression, int snapshot)</div><div class='add'>+static int set_video_mode_Kiara(struct pwc_device *pdev, int size, int pixfmt,</div><div class='add'>+				int frames, int *compression, int send_to_cam)</div><div class='ctx'> {</div><div class='ctx'> 	const struct Kiara_table_entry *pChoose = NULL;</div><div class='del'>-	int fps, ret;</div><div class='del'>-	unsigned char buf[12];</div><div class='del'>-	struct Kiara_table_entry RawEntry = {6, 773, 1272, {0xAD, 0xF4, 0x10, 0x27, 0xB6, 0x24, 0x96, 0x02, 0x30, 0x05, 0x03, 0x80}};</div><div class='add'>+	int fps, ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (size &gt;= PSZ_MAX || frames &lt; 5 || frames &gt; 30 || compression &lt; 0 || compression &gt; 3)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (size == PSZ_VGA &amp;&amp; frames &gt; 15)</div><div class='add'>+	if (size &gt;= PSZ_MAX || *compression &lt; 0 || *compression &gt; 3)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if (frames &lt; 5)</div><div class='add'>+		frames = 5;</div><div class='add'>+	else if (size == PSZ_VGA &amp;&amp; frames &gt; 15)</div><div class='add'>+		frames = 15;</div><div class='add'>+	else if (frames &gt; 30)</div><div class='add'>+		frames = 30;</div><div class='ctx'> 	fps = (frames / 5) - 1;</div><div class='ctx'> </div><div class='del'>-	/* special case: VGA @ 5 fps and snapshot is raw bayer mode */</div><div class='del'>-	if (size == PSZ_VGA &amp;&amp; frames == 5 &amp;&amp; snapshot &amp;&amp; pdev-&gt;pixfmt != V4L2_PIX_FMT_YUV420)</div><div class='del'>-	{</div><div class='del'>-		/* Only available in case the raw palette is selected or</div><div class='del'>-		   we have the decompressor available. This mode is</div><div class='del'>-		   only available in compressed form</div><div class='del'>-		*/</div><div class='del'>-		PWC_DEBUG_SIZE("Choosing VGA/5 BAYER mode.\n");</div><div class='del'>-		pChoose = &amp;RawEntry;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		/* Find a supported framerate with progressively higher compression ratios</div><div class='del'>-		   if the preferred ratio is not available.</div><div class='del'>-		   Skip this step when using RAW modes.</div><div class='del'>-		*/</div><div class='del'>-		snapshot = 0;</div><div class='del'>-		while (compression &lt;= 3) {</div><div class='del'>-			pChoose = &amp;Kiara_table[size][fps][compression];</div><div class='del'>-			if (pChoose-&gt;alternate != 0)</div><div class='del'>-				break;</div><div class='del'>-			compression++;</div><div class='del'>-		}</div><div class='add'>+	/* Find a supported framerate with progressively higher compression */</div><div class='add'>+	while (*compression &lt;= 3) {</div><div class='add'>+		pChoose = &amp;Kiara_table[size][fps][*compression];</div><div class='add'>+		if (pChoose-&gt;alternate != 0)</div><div class='add'>+			break;</div><div class='add'>+		(*compression)++;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pChoose == NULL || pChoose-&gt;alternate == 0)</div><div class='ctx'> 		return -ENOENT; /* Not supported. */</div><div class='ctx'> </div><div class='del'>-	PWC_TRACE("Using alternate setting %d.\n", pChoose-&gt;alternate);</div><div class='del'>-</div><div class='del'>-	/* usb_control_msg won't take staticly allocated arrays as argument?? */</div><div class='del'>-	memcpy(buf, pChoose-&gt;mode, 12);</div><div class='del'>-	if (snapshot)</div><div class='del'>-		buf[0] |= 0x80;</div><div class='del'>-</div><div class='ctx'> 	/* Firmware bug: video endpoint is 5, but commands are sent to endpoint 4 */</div><div class='del'>-	ret = send_video_command(pdev, 4 /* pdev-&gt;vendpoint */, buf, 12);</div><div class='add'>+	if (send_to_cam)</div><div class='add'>+		ret = send_video_command(pdev, 4, pChoose-&gt;mode, 12);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (pChoose-&gt;bandlength &gt; 0 &amp;&amp; pdev-&gt;pixfmt == V4L2_PIX_FMT_YUV420) {</div><div class='del'>-		ret = pwc_dec23_init(pdev, pdev-&gt;type, buf);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='add'>+	if (pChoose-&gt;bandlength &gt; 0 &amp;&amp; pixfmt == V4L2_PIX_FMT_YUV420)</div><div class='add'>+		pwc_dec23_init(pdev, pChoose-&gt;mode);</div><div class='ctx'> </div><div class='del'>-	pdev-&gt;cmd_len = 12;</div><div class='del'>-	memcpy(pdev-&gt;cmd_buf, buf, 12);</div><div class='ctx'> 	/* All set and go */</div><div class='del'>-	pdev-&gt;vframes = frames;</div><div class='del'>-	pdev-&gt;vsize = size;</div><div class='del'>-	pdev-&gt;vsnapshot = snapshot;</div><div class='add'>+	pdev-&gt;pixfmt = pixfmt;</div><div class='add'>+	pdev-&gt;vframes = (fps + 1) * 5;</div><div class='ctx'> 	pdev-&gt;valternate = pChoose-&gt;alternate;</div><div class='del'>-	pdev-&gt;image = pwc_image_sizes[size];</div><div class='add'>+	pdev-&gt;width  = pwc_image_sizes[size][0];</div><div class='add'>+	pdev-&gt;height = pwc_image_sizes[size][1];</div><div class='ctx'> 	pdev-&gt;vbandlength = pChoose-&gt;bandlength;</div><div class='ctx'> 	if (pdev-&gt;vbandlength &gt; 0)</div><div class='del'>-		pdev-&gt;frame_size = (pdev-&gt;vbandlength * pdev-&gt;image.y) / 4;</div><div class='add'>+		pdev-&gt;frame_size = (pdev-&gt;vbandlength * pdev-&gt;height) / 4;</div><div class='ctx'> 	else</div><div class='del'>-		pdev-&gt;frame_size = (pdev-&gt;image.x * pdev-&gt;image.y * 12) / 8;</div><div class='del'>-	PWC_TRACE("frame_size=%d, vframes=%d, vsize=%d, vsnapshot=%d, vbandlength=%d\n",</div><div class='del'>-	    pdev-&gt;frame_size,pdev-&gt;vframes,pdev-&gt;vsize,pdev-&gt;vsnapshot,pdev-&gt;vbandlength);</div><div class='add'>+		pdev-&gt;frame_size = (pdev-&gt;width * pdev-&gt;height * 12) / 8;</div><div class='add'>+	PWC_TRACE("frame_size=%d, vframes=%d, vsize=%d, vbandlength=%d\n",</div><div class='add'>+	    pdev-&gt;frame_size, pdev-&gt;vframes, size, pdev-&gt;vbandlength);</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'>-/**</div><div class='del'>-   @pdev: device structure</div><div class='del'>-   @width: viewport width</div><div class='del'>-   @height: viewport height</div><div class='del'>-   @frame: framerate, in fps</div><div class='del'>-   @compression: preferred compression ratio</div><div class='del'>-   @snapshot: snapshot mode or streaming</div><div class='del'>- */</div><div class='del'>-int pwc_set_video_mode(struct pwc_device *pdev, int width, int height, int frames, int compression, int snapshot)</div><div class='add'>+int pwc_set_video_mode(struct pwc_device *pdev, int width, int height,</div><div class='add'>+	int pixfmt, int frames, int *compression, int send_to_cam)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, size;</div><div class='ctx'> </div><div class='del'>-	PWC_DEBUG_FLOW("set_video_mode(%dx%d @ %d, pixfmt %08x).\n", width, height, frames, pdev-&gt;pixfmt);</div><div class='del'>-	size = pwc_decode_size(pdev, width, height);</div><div class='del'>-	if (size &lt; 0) {</div><div class='del'>-		PWC_DEBUG_MODULE("Could not find suitable size.\n");</div><div class='del'>-		return -ERANGE;</div><div class='del'>-	}</div><div class='add'>+	PWC_DEBUG_FLOW("set_video_mode(%dx%d @ %d, pixfmt %08x).\n",</div><div class='add'>+		       width, height, frames, pixfmt);</div><div class='add'>+	size = pwc_get_size(pdev, width, height);</div><div class='ctx'> 	PWC_TRACE("decode_size = %d.\n", size);</div><div class='ctx'> </div><div class='ctx'> 	if (DEVICE_USE_CODEC1(pdev-&gt;type)) {</div><div class='del'>-		ret = set_video_mode_Nala(pdev, size, frames);</div><div class='del'>-</div><div class='add'>+		ret = set_video_mode_Nala(pdev, size, pixfmt, frames,</div><div class='add'>+					  compression, send_to_cam);</div><div class='ctx'> 	} else if (DEVICE_USE_CODEC3(pdev-&gt;type)) {</div><div class='del'>-		ret = set_video_mode_Kiara(pdev, size, frames, compression, snapshot);</div><div class='del'>-</div><div class='add'>+		ret = set_video_mode_Kiara(pdev, size, pixfmt, frames,</div><div class='add'>+					   compression, send_to_cam);</div><div class='ctx'> 	} else {</div><div class='del'>-		ret = set_video_mode_Timon(pdev, size, frames, compression, snapshot);</div><div class='add'>+		ret = set_video_mode_Timon(pdev, size, pixfmt, frames,</div><div class='add'>+					   compression, send_to_cam);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		PWC_ERROR("Failed to set video mode %s@%d fps; return code = %d\n", size2name[size], frames, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	pdev-&gt;view.x = width;</div><div class='del'>-	pdev-&gt;view.y = height;</div><div class='del'>-	pdev-&gt;vcompression = compression;</div><div class='ctx'> 	pdev-&gt;frame_total_size = pdev-&gt;frame_size + pdev-&gt;frame_header_size + pdev-&gt;frame_trailer_size;</div><div class='del'>-	pwc_set_image_buffer_size(pdev);</div><div class='del'>-	PWC_DEBUG_SIZE("Set viewport to %dx%d, image size is %dx%d.\n", width, height, pwc_image_sizes[size].x, pwc_image_sizes[size].y);</div><div class='add'>+	PWC_DEBUG_SIZE("Set resolution to %dx%d\n", pdev-&gt;width, pdev-&gt;height);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -470,44 +407,15 @@ unsigned int pwc_get_fps(struct pwc_device *pdev, unsigned int index, unsigned i</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pwc_set_image_buffer_size(struct pwc_device *pdev)</div><div class='del'>-{</div><div class='del'>-	int factor = 0;</div><div class='del'>-</div><div class='del'>-	/* for V4L2_PIX_FMT_YUV420 */</div><div class='del'>-	switch (pdev-&gt;pixfmt) {</div><div class='del'>-	case V4L2_PIX_FMT_YUV420:</div><div class='del'>-		factor = 6;</div><div class='del'>-		break;</div><div class='del'>-	case V4L2_PIX_FMT_PWC1:</div><div class='del'>-	case V4L2_PIX_FMT_PWC2:</div><div class='del'>-		factor = 6; /* can be uncompressed YUV420P */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set sizes in bytes */</div><div class='del'>-	pdev-&gt;image.size = pdev-&gt;image.x * pdev-&gt;image.y * factor / 4;</div><div class='del'>-	pdev-&gt;view.size  = pdev-&gt;view.x  * pdev-&gt;view.y  * factor / 4;</div><div class='del'>-</div><div class='del'>-	/* Align offset, or you'll get some very weird results in</div><div class='del'>-	   YUV420 mode... x must be multiple of 4 (to get the Y's in</div><div class='del'>-	   place), and y even (or you'll mixup U &amp; V). This is less of a</div><div class='del'>-	   problem for YUV420P.</div><div class='del'>-	 */</div><div class='del'>-	pdev-&gt;offset.x = ((pdev-&gt;view.x - pdev-&gt;image.x) / 2) &amp; 0xFFFC;</div><div class='del'>-	pdev-&gt;offset.y = ((pdev-&gt;view.y - pdev-&gt;image.y) / 2) &amp; 0xFFFE;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int pwc_get_u8_ctrl(struct pwc_device *pdev, u8 request, u16 value, int *data)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 buf;</div><div class='ctx'> </div><div class='del'>-	ret = recv_control_msg(pdev, request, value, &amp;buf, sizeof(buf));</div><div class='add'>+	ret = recv_control_msg(pdev, request, value, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	*data = buf;</div><div class='add'>+	*data = pdev-&gt;ctrl_buf[0];</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -515,7 +423,8 @@ int pwc_set_u8_ctrl(struct pwc_device *pdev, u8 request, u16 value, u8 data)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = send_control_msg(pdev, request, value, &amp;data, sizeof(data));</div><div class='add'>+	pdev-&gt;ctrl_buf[0] = data;</div><div class='add'>+	ret = send_control_msg(pdev, request, value, pdev-&gt;ctrl_buf, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -525,37 +434,34 @@ int pwc_set_u8_ctrl(struct pwc_device *pdev, u8 request, u16 value, u8 data)</div><div class='ctx'> int pwc_get_s8_ctrl(struct pwc_device *pdev, u8 request, u16 value, int *data)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	s8 buf;</div><div class='ctx'> </div><div class='del'>-	ret = recv_control_msg(pdev, request, value, &amp;buf, sizeof(buf));</div><div class='add'>+	ret = recv_control_msg(pdev, request, value, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	*data = buf;</div><div class='add'>+	*data = ((s8 *)pdev-&gt;ctrl_buf)[0];</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int pwc_get_u16_ctrl(struct pwc_device *pdev, u8 request, u16 value, int *data)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 buf[2];</div><div class='ctx'> </div><div class='del'>-	ret = recv_control_msg(pdev, request, value, buf, sizeof(buf));</div><div class='add'>+	ret = recv_control_msg(pdev, request, value, 2);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	*data = (buf[1] &lt;&lt; 8) | buf[0];</div><div class='add'>+	*data = (pdev-&gt;ctrl_buf[1] &lt;&lt; 8) | pdev-&gt;ctrl_buf[0];</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int pwc_set_u16_ctrl(struct pwc_device *pdev, u8 request, u16 value, u16 data)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 buf[2];</div><div class='ctx'> </div><div class='del'>-	buf[0] = data &amp; 0xff;</div><div class='del'>-	buf[1] = data &gt;&gt; 8;</div><div class='del'>-	ret = send_control_msg(pdev, request, value, buf, sizeof(buf));</div><div class='add'>+	pdev-&gt;ctrl_buf[0] = data &amp; 0xff;</div><div class='add'>+	pdev-&gt;ctrl_buf[1] = data &gt;&gt; 8;</div><div class='add'>+	ret = send_control_msg(pdev, request, value, pdev-&gt;ctrl_buf, 2);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -576,7 +482,6 @@ int pwc_button_ctrl(struct pwc_device *pdev, u16 value)</div><div class='ctx'> /* POWER */</div><div class='ctx'> void pwc_camera_power(struct pwc_device *pdev, int power)</div><div class='ctx'> {</div><div class='del'>-	char buf;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	if (!pdev-&gt;power_save)</div><div class='hunk'>@@ -586,69 +491,18 @@ void pwc_camera_power(struct pwc_device *pdev, int power)</div><div class='ctx'> 		return;	/* Not supported by Nala or Timon &lt; release 6 */</div><div class='ctx'> </div><div class='ctx'> 	if (power)</div><div class='del'>-		buf = 0x00; /* active */</div><div class='add'>+		pdev-&gt;ctrl_buf[0] = 0x00; /* active */</div><div class='ctx'> 	else</div><div class='del'>-		buf = 0xFF; /* power save */</div><div class='del'>-	r = send_control_msg(pdev,</div><div class='del'>-		SET_STATUS_CTL, SET_POWER_SAVE_MODE_FORMATTER,</div><div class='del'>-		&amp;buf, sizeof(buf));</div><div class='del'>-</div><div class='add'>+		pdev-&gt;ctrl_buf[0] = 0xFF; /* power save */</div><div class='add'>+	r = send_control_msg(pdev, SET_STATUS_CTL,</div><div class='add'>+		SET_POWER_SAVE_MODE_FORMATTER, pdev-&gt;ctrl_buf, 1);</div><div class='ctx'> 	if (r &lt; 0)</div><div class='ctx'> 		PWC_ERROR("Failed to power %s camera (%d)\n",</div><div class='ctx'> 			  power ? "on" : "off", r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pwc_set_wb_speed(struct pwc_device *pdev, int speed)</div><div class='del'>-{</div><div class='del'>-	unsigned char buf;</div><div class='del'>-</div><div class='del'>-	/* useful range is 0x01..0x20 */</div><div class='del'>-	buf = speed / 0x7f0;</div><div class='del'>-	return send_control_msg(pdev,</div><div class='del'>-		SET_CHROM_CTL, AWB_CONTROL_SPEED_FORMATTER, &amp;buf, sizeof(buf));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pwc_get_wb_speed(struct pwc_device *pdev, int *value)</div><div class='del'>-{</div><div class='del'>-	unsigned char buf;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = recv_control_msg(pdev,</div><div class='del'>-		GET_CHROM_CTL, AWB_CONTROL_SPEED_FORMATTER, &amp;buf, sizeof(buf));</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	*value = buf * 0x7f0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int pwc_set_wb_delay(struct pwc_device *pdev, int delay)</div><div class='del'>-{</div><div class='del'>-	unsigned char buf;</div><div class='del'>-</div><div class='del'>-	/* useful range is 0x01..0x3F */</div><div class='del'>-	buf = (delay &gt;&gt; 10);</div><div class='del'>-	return send_control_msg(pdev,</div><div class='del'>-		SET_CHROM_CTL, AWB_CONTROL_DELAY_FORMATTER, &amp;buf, sizeof(buf));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pwc_get_wb_delay(struct pwc_device *pdev, int *value)</div><div class='del'>-{</div><div class='del'>-	unsigned char buf;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = recv_control_msg(pdev,</div><div class='del'>-		GET_CHROM_CTL, AWB_CONTROL_DELAY_FORMATTER, &amp;buf, sizeof(buf));</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	*value = buf &lt;&lt; 10;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value)</div><div class='ctx'> {</div><div class='del'>-	unsigned char buf[2];</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;type &lt; 730)</div><div class='hunk'>@@ -664,123 +518,20 @@ int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value)</div><div class='ctx'> 	if (off_value &gt; 0xff)</div><div class='ctx'> 		off_value = 0xff;</div><div class='ctx'> </div><div class='del'>-	buf[0] = on_value;</div><div class='del'>-	buf[1] = off_value;</div><div class='add'>+	pdev-&gt;ctrl_buf[0] = on_value;</div><div class='add'>+	pdev-&gt;ctrl_buf[1] = off_value;</div><div class='ctx'> </div><div class='ctx'> 	r = send_control_msg(pdev,</div><div class='del'>-		SET_STATUS_CTL, LED_FORMATTER, &amp;buf, sizeof(buf));</div><div class='add'>+		SET_STATUS_CTL, LED_FORMATTER, pdev-&gt;ctrl_buf, 2);</div><div class='ctx'> 	if (r &lt; 0)</div><div class='ctx'> 		PWC_ERROR("Failed to set LED on/off time (%d)\n", r);</div><div class='ctx'> </div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value)</div><div class='del'>-{</div><div class='del'>-	unsigned char buf[2];</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (pdev-&gt;type &lt; 730) {</div><div class='del'>-		*on_value = -1;</div><div class='del'>-		*off_value = -1;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = recv_control_msg(pdev,</div><div class='del'>-		GET_STATUS_CTL, LED_FORMATTER, &amp;buf, sizeof(buf));</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	*on_value = buf[0] * 100;</div><div class='del'>-	*off_value = buf[1] * 100;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int _pwc_mpt_reset(struct pwc_device *pdev, int flags)</div><div class='del'>-{</div><div class='del'>-	unsigned char buf;</div><div class='del'>-</div><div class='del'>-	buf = flags &amp; 0x03; // only lower two bits are currently used</div><div class='del'>-	return send_control_msg(pdev,</div><div class='del'>-		SET_MPT_CTL, PT_RESET_CONTROL_FORMATTER, &amp;buf, sizeof(buf));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int pwc_mpt_reset(struct pwc_device *pdev, int flags)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	ret = _pwc_mpt_reset(pdev, flags);</div><div class='del'>-	if (ret &gt;= 0) {</div><div class='del'>-		pdev-&gt;pan_angle = 0;</div><div class='del'>-		pdev-&gt;tilt_angle = 0;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int _pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt)</div><div class='del'>-{</div><div class='del'>-	unsigned char buf[4];</div><div class='del'>-</div><div class='del'>-	/* set new relative angle; angles are expressed in degrees * 100,</div><div class='del'>-	   but cam as .5 degree resolution, hence divide by 200. Also</div><div class='del'>-	   the angle must be multiplied by 64 before it's send to</div><div class='del'>-	   the cam (??)</div><div class='del'>-	 */</div><div class='del'>-	pan  =  64 * pan  / 100;</div><div class='del'>-	tilt = -64 * tilt / 100; /* positive tilt is down, which is not what the user would expect */</div><div class='del'>-	buf[0] = pan &amp; 0xFF;</div><div class='del'>-	buf[1] = (pan &gt;&gt; 8) &amp; 0xFF;</div><div class='del'>-	buf[2] = tilt &amp; 0xFF;</div><div class='del'>-	buf[3] = (tilt &gt;&gt; 8) &amp; 0xFF;</div><div class='del'>-	return send_control_msg(pdev,</div><div class='del'>-		SET_MPT_CTL, PT_RELATIVE_CONTROL_FORMATTER, &amp;buf, sizeof(buf));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* check absolute ranges */</div><div class='del'>-	if (pan  &lt; pdev-&gt;angle_range.pan_min  ||</div><div class='del'>-	    pan  &gt; pdev-&gt;angle_range.pan_max  ||</div><div class='del'>-	    tilt &lt; pdev-&gt;angle_range.tilt_min ||</div><div class='del'>-	    tilt &gt; pdev-&gt;angle_range.tilt_max)</div><div class='del'>-		return -ERANGE;</div><div class='del'>-</div><div class='del'>-	/* go to relative range, check again */</div><div class='del'>-	pan  -= pdev-&gt;pan_angle;</div><div class='del'>-	tilt -= pdev-&gt;tilt_angle;</div><div class='del'>-	/* angles are specified in degrees * 100, thus the limit = 36000 */</div><div class='del'>-	if (pan &lt; -36000 || pan &gt; 36000 || tilt &lt; -36000 || tilt &gt; 36000)</div><div class='del'>-		return -ERANGE;</div><div class='del'>-</div><div class='del'>-	ret = _pwc_mpt_set_angle(pdev, pan, tilt);</div><div class='del'>-	if (ret &gt;= 0) {</div><div class='del'>-		pdev-&gt;pan_angle  += pan;</div><div class='del'>-		pdev-&gt;tilt_angle += tilt;</div><div class='del'>-	}</div><div class='del'>-	if (ret == -EPIPE) /* stall -&gt; out of range */</div><div class='del'>-		ret = -ERANGE;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pwc_mpt_get_status(struct pwc_device *pdev, struct pwc_mpt_status *status)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	unsigned char buf[5];</div><div class='del'>-</div><div class='del'>-	ret = recv_control_msg(pdev,</div><div class='del'>-		GET_MPT_CTL, PT_STATUS_FORMATTER, &amp;buf, sizeof(buf));</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	status-&gt;status = buf[0] &amp; 0x7; // 3 bits are used for reporting</div><div class='del'>-	status-&gt;time_pan = (buf[1] &lt;&lt; 8) + buf[2];</div><div class='del'>-	status-&gt;time_tilt = (buf[3] &lt;&lt; 8) + buf[4];</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_USB_PWC_DEBUG</div><div class='ctx'> int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor)</div><div class='ctx'> {</div><div class='del'>-	unsigned char buf;</div><div class='ctx'> 	int ret = -1, request;</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;type &lt; 675)</div><div class='hunk'>@@ -790,431 +541,13 @@ int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor)</div><div class='ctx'> 	else</div><div class='ctx'> 		request = SENSOR_TYPE_FORMATTER2;</div><div class='ctx'> </div><div class='del'>-	ret = recv_control_msg(pdev,</div><div class='del'>-		GET_STATUS_CTL, request, &amp;buf, sizeof(buf));</div><div class='add'>+	ret = recv_control_msg(pdev, GET_STATUS_CTL, request, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	if (pdev-&gt;type &lt; 675)</div><div class='del'>-		*sensor = buf | 0x100;</div><div class='add'>+		*sensor = pdev-&gt;ctrl_buf[0] | 0x100;</div><div class='ctx'> 	else</div><div class='del'>-		*sensor = buf;</div><div class='add'>+		*sensor = pdev-&gt;ctrl_buf[0];</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>- /* End of Add-Ons                                    */</div><div class='del'>- /* ************************************************* */</div><div class='del'>-</div><div class='del'>-/* Linux 2.5.something and 2.6 pass direct pointers to arguments of</div><div class='del'>-   ioctl() calls. With 2.4, you have to do tedious copy_from_user()</div><div class='del'>-   and copy_to_user() calls. With these macros we circumvent this,</div><div class='del'>-   and let me maintain only one source file. The functionality is</div><div class='del'>-   exactly the same otherwise.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* define local variable for arg */</div><div class='del'>-#define ARG_DEF(ARG_type, ARG_name)\</div><div class='del'>-	ARG_type *ARG_name = arg;</div><div class='del'>-/* copy arg to local variable */</div><div class='del'>-#define ARG_IN(ARG_name) /* nothing */</div><div class='del'>-/* argument itself (referenced) */</div><div class='del'>-#define ARGR(ARG_name) (*ARG_name)</div><div class='del'>-/* argument address */</div><div class='del'>-#define ARGA(ARG_name) ARG_name</div><div class='del'>-/* copy local variable to arg */</div><div class='del'>-#define ARG_OUT(ARG_name) /* nothing */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Our ctrls use native values, but the old custom pwc ioctl interface expects</div><div class='del'>- * values from 0 - 65535, define 2 helper functions to scale things. */</div><div class='del'>-static int pwc_ioctl_g_ctrl(struct v4l2_ctrl *ctrl)</div><div class='del'>-{</div><div class='del'>-	return v4l2_ctrl_g_ctrl(ctrl) * 65535 / ctrl-&gt;maximum;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pwc_ioctl_s_ctrl(struct v4l2_ctrl *ctrl, int val)</div><div class='del'>-{</div><div class='del'>-	return v4l2_ctrl_s_ctrl(ctrl, val * ctrl-&gt;maximum / 65535);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-long pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)</div><div class='del'>-{</div><div class='del'>-	long ret = 0;</div><div class='del'>-</div><div class='del'>-	switch(cmd) {</div><div class='del'>-	case VIDIOCPWCRUSER:</div><div class='del'>-		ret = pwc_button_ctrl(pdev, RESTORE_USER_DEFAULTS_FORMATTER);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCSUSER:</div><div class='del'>-		ret = pwc_button_ctrl(pdev, SAVE_USER_DEFAULTS_FORMATTER);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCFACTORY:</div><div class='del'>-		ret = pwc_button_ctrl(pdev, RESTORE_FACTORY_DEFAULTS_FORMATTER);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCSCQUAL:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(int, qual)</div><div class='del'>-</div><div class='del'>-		if (vb2_is_streaming(&amp;pdev-&gt;vb_queue)) {</div><div class='del'>-			ret = -EBUSY;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ARG_IN(qual)</div><div class='del'>-		if (ARGR(qual) &lt; 0 || ARGR(qual) &gt; 3)</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		else</div><div class='del'>-			ret = pwc_set_video_mode(pdev, pdev-&gt;view.x, pdev-&gt;view.y, pdev-&gt;vframes, ARGR(qual), pdev-&gt;vsnapshot);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCGCQUAL:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(int, qual)</div><div class='del'>-</div><div class='del'>-		ARGR(qual) = pdev-&gt;vcompression;</div><div class='del'>-		ARG_OUT(qual)</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCPROBE:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(struct pwc_probe, probe)</div><div class='del'>-</div><div class='del'>-		strcpy(ARGR(probe).name, pdev-&gt;vdev.name);</div><div class='del'>-		ARGR(probe).type = pdev-&gt;type;</div><div class='del'>-		ARG_OUT(probe)</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCGSERIAL:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(struct pwc_serial, serial)</div><div class='del'>-</div><div class='del'>-		strcpy(ARGR(serial).serial, pdev-&gt;serial);</div><div class='del'>-		ARG_OUT(serial)</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCSAGC:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(int, agc)</div><div class='del'>-		ARG_IN(agc)</div><div class='del'>-		ret = v4l2_ctrl_s_ctrl(pdev-&gt;autogain, ARGR(agc) &lt; 0);</div><div class='del'>-		if (ret == 0 &amp;&amp; ARGR(agc) &gt;= 0)</div><div class='del'>-			ret = pwc_ioctl_s_ctrl(pdev-&gt;gain, ARGR(agc));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCGAGC:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(int, agc)</div><div class='del'>-		if (v4l2_ctrl_g_ctrl(pdev-&gt;autogain))</div><div class='del'>-			ARGR(agc) = -1;</div><div class='del'>-		else</div><div class='del'>-			ARGR(agc) = pwc_ioctl_g_ctrl(pdev-&gt;gain);</div><div class='del'>-		ARG_OUT(agc)</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCSSHUTTER:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(int, shutter)</div><div class='del'>-		ARG_IN(shutter)</div><div class='del'>-		ret = v4l2_ctrl_s_ctrl(pdev-&gt;exposure_auto,</div><div class='del'>-				       /* Menu idx 0 = auto, idx 1 = manual */</div><div class='del'>-				       ARGR(shutter) &gt;= 0);</div><div class='del'>-		if (ret == 0 &amp;&amp; ARGR(shutter) &gt;= 0)</div><div class='del'>-			ret = pwc_ioctl_s_ctrl(pdev-&gt;exposure, ARGR(shutter));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCSAWB:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(struct pwc_whitebalance, wb)</div><div class='del'>-		ARG_IN(wb)</div><div class='del'>-		ret = v4l2_ctrl_s_ctrl(pdev-&gt;auto_white_balance,</div><div class='del'>-				       ARGR(wb).mode);</div><div class='del'>-		if (ret == 0 &amp;&amp; ARGR(wb).mode == PWC_WB_MANUAL)</div><div class='del'>-			ret = pwc_ioctl_s_ctrl(pdev-&gt;red_balance,</div><div class='del'>-					       ARGR(wb).manual_red);</div><div class='del'>-		if (ret == 0 &amp;&amp; ARGR(wb).mode == PWC_WB_MANUAL)</div><div class='del'>-			ret = pwc_ioctl_s_ctrl(pdev-&gt;blue_balance,</div><div class='del'>-					       ARGR(wb).manual_blue);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCGAWB:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(struct pwc_whitebalance, wb)</div><div class='del'>-		ARGR(wb).mode = v4l2_ctrl_g_ctrl(pdev-&gt;auto_white_balance);</div><div class='del'>-		ARGR(wb).manual_red = ARGR(wb).read_red =</div><div class='del'>-			pwc_ioctl_g_ctrl(pdev-&gt;red_balance);</div><div class='del'>-		ARGR(wb).manual_blue = ARGR(wb).read_blue =</div><div class='del'>-			pwc_ioctl_g_ctrl(pdev-&gt;blue_balance);</div><div class='del'>-		ARG_OUT(wb)</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCSAWBSPEED:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(struct pwc_wb_speed, wbs)</div><div class='del'>-</div><div class='del'>-		if (ARGR(wbs).control_speed &gt; 0) {</div><div class='del'>-			ret = pwc_set_wb_speed(pdev, ARGR(wbs).control_speed);</div><div class='del'>-		}</div><div class='del'>-		if (ARGR(wbs).control_delay &gt; 0) {</div><div class='del'>-			ret = pwc_set_wb_delay(pdev, ARGR(wbs).control_delay);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCGAWBSPEED:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(struct pwc_wb_speed, wbs)</div><div class='del'>-</div><div class='del'>-		ret = pwc_get_wb_speed(pdev, &amp;ARGR(wbs).control_speed);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		ret = pwc_get_wb_delay(pdev, &amp;ARGR(wbs).control_delay);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		ARG_OUT(wbs)</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCSLED:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(struct pwc_leds, leds)</div><div class='del'>-</div><div class='del'>-		ARG_IN(leds)</div><div class='del'>-		ret = pwc_set_leds(pdev, ARGR(leds).led_on, ARGR(leds).led_off);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCGLED:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(struct pwc_leds, leds)</div><div class='del'>-</div><div class='del'>-		ret = pwc_get_leds(pdev, &amp;ARGR(leds).led_on, &amp;ARGR(leds).led_off);</div><div class='del'>-		ARG_OUT(leds)</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCSCONTOUR:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(int, contour)</div><div class='del'>-		ARG_IN(contour)</div><div class='del'>-		ret = v4l2_ctrl_s_ctrl(pdev-&gt;autocontour, ARGR(contour) &lt; 0);</div><div class='del'>-		if (ret == 0 &amp;&amp; ARGR(contour) &gt;= 0)</div><div class='del'>-			ret = pwc_ioctl_s_ctrl(pdev-&gt;contour, ARGR(contour));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCGCONTOUR:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(int, contour)</div><div class='del'>-		if (v4l2_ctrl_g_ctrl(pdev-&gt;autocontour))</div><div class='del'>-			ARGR(contour) = -1;</div><div class='del'>-		else</div><div class='del'>-			ARGR(contour) = pwc_ioctl_g_ctrl(pdev-&gt;contour);</div><div class='del'>-		ARG_OUT(contour)</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCSBACKLIGHT:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(int, backlight)</div><div class='del'>-		ARG_IN(backlight)</div><div class='del'>-		ret = v4l2_ctrl_s_ctrl(pdev-&gt;backlight, ARGR(backlight));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCGBACKLIGHT:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(int, backlight)</div><div class='del'>-		ARGR(backlight) = v4l2_ctrl_g_ctrl(pdev-&gt;backlight);</div><div class='del'>-		ARG_OUT(backlight)</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCSFLICKER:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(int, flicker)</div><div class='del'>-		ARG_IN(flicker)</div><div class='del'>-		ret = v4l2_ctrl_s_ctrl(pdev-&gt;flicker, ARGR(flicker));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCGFLICKER:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(int, flicker)</div><div class='del'>-		ARGR(flicker) = v4l2_ctrl_g_ctrl(pdev-&gt;flicker);</div><div class='del'>-		ARG_OUT(flicker)</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCSDYNNOISE:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(int, dynnoise)</div><div class='del'>-		ARG_IN(dynnoise)</div><div class='del'>-		ret = v4l2_ctrl_s_ctrl(pdev-&gt;noise_reduction, ARGR(dynnoise));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCGDYNNOISE:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(int, dynnoise)</div><div class='del'>-		ARGR(dynnoise) = v4l2_ctrl_g_ctrl(pdev-&gt;noise_reduction);</div><div class='del'>-		ARG_OUT(dynnoise);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCGREALSIZE:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(struct pwc_imagesize, size)</div><div class='del'>-</div><div class='del'>-		ARGR(size).width = pdev-&gt;image.x;</div><div class='del'>-		ARGR(size).height = pdev-&gt;image.y;</div><div class='del'>-		ARG_OUT(size)</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCMPTRESET:</div><div class='del'>-	{</div><div class='del'>-		if (pdev-&gt;features &amp; FEATURE_MOTOR_PANTILT)</div><div class='del'>-		{</div><div class='del'>-			ARG_DEF(int, flags)</div><div class='del'>-</div><div class='del'>-			ARG_IN(flags)</div><div class='del'>-			ret = pwc_mpt_reset(pdev, ARGR(flags));</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			ret = -ENXIO;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCMPTGRANGE:</div><div class='del'>-	{</div><div class='del'>-		if (pdev-&gt;features &amp; FEATURE_MOTOR_PANTILT)</div><div class='del'>-		{</div><div class='del'>-			ARG_DEF(struct pwc_mpt_range, range)</div><div class='del'>-</div><div class='del'>-			ARGR(range) = pdev-&gt;angle_range;</div><div class='del'>-			ARG_OUT(range)</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			ret = -ENXIO;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCMPTSANGLE:</div><div class='del'>-	{</div><div class='del'>-		int new_pan, new_tilt;</div><div class='del'>-</div><div class='del'>-		if (pdev-&gt;features &amp; FEATURE_MOTOR_PANTILT)</div><div class='del'>-		{</div><div class='del'>-			ARG_DEF(struct pwc_mpt_angles, angles)</div><div class='del'>-</div><div class='del'>-			ARG_IN(angles)</div><div class='del'>-			/* The camera can only set relative angles, so</div><div class='del'>-			   do some calculations when getting an absolute angle .</div><div class='del'>-			 */</div><div class='del'>-			if (ARGR(angles).absolute)</div><div class='del'>-			{</div><div class='del'>-				new_pan  = ARGR(angles).pan;</div><div class='del'>-				new_tilt = ARGR(angles).tilt;</div><div class='del'>-			}</div><div class='del'>-			else</div><div class='del'>-			{</div><div class='del'>-				new_pan  = pdev-&gt;pan_angle  + ARGR(angles).pan;</div><div class='del'>-				new_tilt = pdev-&gt;tilt_angle + ARGR(angles).tilt;</div><div class='del'>-			}</div><div class='del'>-			ret = pwc_mpt_set_angle(pdev, new_pan, new_tilt);</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			ret = -ENXIO;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCMPTGANGLE:</div><div class='del'>-	{</div><div class='del'>-</div><div class='del'>-		if (pdev-&gt;features &amp; FEATURE_MOTOR_PANTILT)</div><div class='del'>-		{</div><div class='del'>-			ARG_DEF(struct pwc_mpt_angles, angles)</div><div class='del'>-</div><div class='del'>-			ARGR(angles).absolute = 1;</div><div class='del'>-			ARGR(angles).pan  = pdev-&gt;pan_angle;</div><div class='del'>-			ARGR(angles).tilt = pdev-&gt;tilt_angle;</div><div class='del'>-			ARG_OUT(angles)</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			ret = -ENXIO;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCMPTSTATUS:</div><div class='del'>-	{</div><div class='del'>-		if (pdev-&gt;features &amp; FEATURE_MOTOR_PANTILT)</div><div class='del'>-		{</div><div class='del'>-			ARG_DEF(struct pwc_mpt_status, status)</div><div class='del'>-</div><div class='del'>-			ret = pwc_mpt_get_status(pdev, ARGA(status));</div><div class='del'>-			ARG_OUT(status)</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			ret = -ENXIO;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case VIDIOCPWCGVIDCMD:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(struct pwc_video_command, vcmd);</div><div class='del'>-</div><div class='del'>-		ARGR(vcmd).type = pdev-&gt;type;</div><div class='del'>-		ARGR(vcmd).release = pdev-&gt;release;</div><div class='del'>-		ARGR(vcmd).command_len = pdev-&gt;cmd_len;</div><div class='del'>-		memcpy(&amp;ARGR(vcmd).command_buf, pdev-&gt;cmd_buf, pdev-&gt;cmd_len);</div><div class='del'>-		ARGR(vcmd).bandlength = pdev-&gt;vbandlength;</div><div class='del'>-		ARGR(vcmd).frame_size = pdev-&gt;frame_size;</div><div class='del'>-		ARG_OUT(vcmd)</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	case VIDIOCPWCGVIDTABLE:</div><div class='del'>-	{</div><div class='del'>-		ARG_DEF(struct pwc_table_init_buffer, table);</div><div class='del'>-		ARGR(table).len = pdev-&gt;cmd_len;</div><div class='del'>-		memcpy(&amp;ARGR(table).buffer, pdev-&gt;decompress_data, pdev-&gt;decompressor-&gt;table_size);</div><div class='del'>-		ARG_OUT(table)</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	*/</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		ret = -ENOIOCTLCMD;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret &gt; 0)</div><div class='del'>-		return 0;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* vim: set cinoptions= formatoptions=croql cindent shiftwidth=8 tabstop=8: */</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-dec1.c b/drivers/media/video/pwc/pwc-dec1.c<br/>index be0e02cb487f..e899036aadf4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-dec1.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-dec1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-dec1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/pwc/pwc-dec1.c</a></div><div class='hunk'>@@ -22,19 +22,11 @@</div><div class='ctx'>    along with this program; if not, write to the Free Software</div><div class='ctx'>    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> */</div><div class='del'>-#include "pwc-dec1.h"</div><div class='add'>+#include "pwc.h"</div><div class='ctx'> </div><div class='del'>-int pwc_dec1_init(struct pwc_device *pwc, int type, int release, void *buffer)</div><div class='add'>+void pwc_dec1_init(struct pwc_device *pdev, const unsigned char *cmd)</div><div class='ctx'> {</div><div class='del'>-	struct pwc_dec1_private *pdec;</div><div class='add'>+	struct pwc_dec1_private *pdec = &amp;pdev-&gt;dec1;</div><div class='ctx'> </div><div class='del'>-	if (pwc-&gt;decompress_data == NULL) {</div><div class='del'>-		pdec = kmalloc(sizeof(struct pwc_dec1_private), GFP_KERNEL);</div><div class='del'>-		if (pdec == NULL)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		pwc-&gt;decompress_data = pdec;</div><div class='del'>-	}</div><div class='del'>-	pdec = pwc-&gt;decompress_data;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	pdec-&gt;version = pdev-&gt;release;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-dec1.h b/drivers/media/video/pwc/pwc-dec1.h<br/>index a57d8601080b..c565ef8f52fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-dec1.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-dec1.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-dec1.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/pwc/pwc-dec1.h</a></div><div class='hunk'>@@ -25,13 +25,15 @@</div><div class='ctx'> #ifndef PWC_DEC1_H</div><div class='ctx'> #define PWC_DEC1_H</div><div class='ctx'> </div><div class='del'>-#include "pwc.h"</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+</div><div class='add'>+struct pwc_device;</div><div class='ctx'> </div><div class='ctx'> struct pwc_dec1_private</div><div class='ctx'> {</div><div class='ctx'> 	int version;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int pwc_dec1_init(struct pwc_device *pwc, int type, int release, void *buffer);</div><div class='add'>+void pwc_dec1_init(struct pwc_device *pdev, const unsigned char *cmd);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-dec23.c b/drivers/media/video/pwc/pwc-dec23.c<br/>index 06a4e877ba40..3792fedff951 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-dec23.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-dec23.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-dec23.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/pwc/pwc-dec23.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> #include "pwc-timon.h"</div><div class='ctx'> #include "pwc-kiara.h"</div><div class='ctx'> #include "pwc-dec23.h"</div><div class='del'>-#include &lt;media/pwc-ioctl.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -51,13 +50,6 @@</div><div class='ctx'> # define USE_LOOKUP_TABLE_TO_CLAMP 1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * ENABLE_BAYER_DECODER</div><div class='del'>- *   0: bayer decoder is not build (save some space)</div><div class='del'>- *   1: bayer decoder is build and can be used</div><div class='del'>- */</div><div class='del'>-#define ENABLE_BAYER_DECODER 0</div><div class='del'>-</div><div class='ctx'> static void build_subblock_pattern(struct pwc_dec23_private *pdec)</div><div class='ctx'> {</div><div class='ctx'> 	static const unsigned int initial_values[12] = {</div><div class='hunk'>@@ -302,20 +294,17 @@ static unsigned char pwc_crop_table[256 + 2*MAX_OUTER_CROP_VALUE];</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* If the type or the command change, we rebuild the lookup table */</div><div class='del'>-int pwc_dec23_init(struct pwc_device *pwc, int type, unsigned char *cmd)</div><div class='add'>+void pwc_dec23_init(struct pwc_device *pdev, const unsigned char *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int flags, version, shift, i;</div><div class='del'>-	struct pwc_dec23_private *pdec;</div><div class='add'>+	struct pwc_dec23_private *pdec = &amp;pdev-&gt;dec23;</div><div class='ctx'> </div><div class='del'>-	if (pwc-&gt;decompress_data == NULL) {</div><div class='del'>-		pdec = kmalloc(sizeof(struct pwc_dec23_private), GFP_KERNEL);</div><div class='del'>-		if (pdec == NULL)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		pwc-&gt;decompress_data = pdec;</div><div class='del'>-	}</div><div class='del'>-	pdec = pwc-&gt;decompress_data;</div><div class='add'>+	mutex_init(&amp;pdec-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (DEVICE_USE_CODEC3(type)) {</div><div class='add'>+	if (pdec-&gt;last_cmd_valid &amp;&amp; pdec-&gt;last_cmd == cmd[2])</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (DEVICE_USE_CODEC3(pdev-&gt;type)) {</div><div class='ctx'> 		flags = cmd[2] &amp; 0x18;</div><div class='ctx'> 		if (flags == 8)</div><div class='ctx'> 			pdec-&gt;nbits = 7;	/* More bits, mean more bits to encode the stream, but better quality */</div><div class='hunk'>@@ -362,7 +351,8 @@ int pwc_dec23_init(struct pwc_device *pwc, int type, unsigned char *cmd)</div><div class='ctx'> 		pwc_crop_table[MAX_OUTER_CROP_VALUE+256+i] = 255;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	pdec-&gt;last_cmd = cmd[2];</div><div class='add'>+	pdec-&gt;last_cmd_valid = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -467,123 +457,6 @@ static void copy_image_block_CrCb(const int *src, unsigned char *dst, unsigned i</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if ENABLE_BAYER_DECODER</div><div class='del'>-/*</div><div class='del'>- * Format: 8x2 pixels</div><div class='del'>- *   . G . G . G . G . G . G . G</div><div class='del'>- *   . . . . . . . . . . . . . .</div><div class='del'>- *   . G . G . G . G . G . G . G</div><div class='del'>- *   . . . . . . . . . . . . . .</div><div class='del'>- *   or</div><div class='del'>- *   . . . . . . . . . . . . . .</div><div class='del'>- *   G . G . G . G . G . G . G .</div><div class='del'>- *   . . . . . . . . . . . . . .</div><div class='del'>- *   G . G . G . G . G . G . G .</div><div class='del'>-*/</div><div class='del'>-static void copy_image_block_Green(const int *src, unsigned char *dst, unsigned int bytes_per_line, unsigned int scalebits)</div><div class='del'>-{</div><div class='del'>-#if UNROLL_LOOP_FOR_COPY</div><div class='del'>-	/* Unroll all loops */</div><div class='del'>-	const unsigned char *cm = pwc_crop_table+MAX_OUTER_CROP_VALUE;</div><div class='del'>-	unsigned char *d = dst;</div><div class='del'>-	const int *c = src;</div><div class='del'>-</div><div class='del'>-	d[0] = cm[c[0] &gt;&gt; scalebits];</div><div class='del'>-	d[2] = cm[c[1] &gt;&gt; scalebits];</div><div class='del'>-	d[4] = cm[c[2] &gt;&gt; scalebits];</div><div class='del'>-	d[6] = cm[c[3] &gt;&gt; scalebits];</div><div class='del'>-	d[8] = cm[c[4] &gt;&gt; scalebits];</div><div class='del'>-	d[10] = cm[c[5] &gt;&gt; scalebits];</div><div class='del'>-	d[12] = cm[c[6] &gt;&gt; scalebits];</div><div class='del'>-	d[14] = cm[c[7] &gt;&gt; scalebits];</div><div class='del'>-</div><div class='del'>-	d = dst + bytes_per_line;</div><div class='del'>-	d[0] = cm[c[8] &gt;&gt; scalebits];</div><div class='del'>-	d[2] = cm[c[9] &gt;&gt; scalebits];</div><div class='del'>-	d[4] = cm[c[10] &gt;&gt; scalebits];</div><div class='del'>-	d[6] = cm[c[11] &gt;&gt; scalebits];</div><div class='del'>-	d[8] = cm[c[12] &gt;&gt; scalebits];</div><div class='del'>-	d[10] = cm[c[13] &gt;&gt; scalebits];</div><div class='del'>-	d[12] = cm[c[14] &gt;&gt; scalebits];</div><div class='del'>-	d[14] = cm[c[15] &gt;&gt; scalebits];</div><div class='del'>-#else</div><div class='del'>-	int i;</div><div class='del'>-	unsigned char *d;</div><div class='del'>-	const int *c = src;</div><div class='del'>-</div><div class='del'>-	d = dst;</div><div class='del'>-	for (i = 0; i &lt; 8; i++, c++)</div><div class='del'>-		d[i*2] = CLAMP((*c) &gt;&gt; scalebits);</div><div class='del'>-</div><div class='del'>-	d = dst + bytes_per_line;</div><div class='del'>-	for (i = 0; i &lt; 8; i++, c++)</div><div class='del'>-		d[i*2] = CLAMP((*c) &gt;&gt; scalebits);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if ENABLE_BAYER_DECODER</div><div class='del'>-/*</div><div class='del'>- * Format: 4x4 pixels</div><div class='del'>- *   R . R . R . R</div><div class='del'>- *   . B . B . B .</div><div class='del'>- *   R . R . R . R</div><div class='del'>- *   . B . B . B .</div><div class='del'>- */</div><div class='del'>-static void copy_image_block_RedBlue(const int *src, unsigned char *dst, unsigned int bytes_per_line, unsigned int scalebits)</div><div class='del'>-{</div><div class='del'>-#if UNROLL_LOOP_FOR_COPY</div><div class='del'>-	/* Unroll all loops */</div><div class='del'>-	const unsigned char *cm = pwc_crop_table+MAX_OUTER_CROP_VALUE;</div><div class='del'>-	unsigned char *d = dst;</div><div class='del'>-	const int *c = src;</div><div class='del'>-</div><div class='del'>-	d[0] = cm[c[0] &gt;&gt; scalebits];</div><div class='del'>-	d[2] = cm[c[1] &gt;&gt; scalebits];</div><div class='del'>-	d[4] = cm[c[2] &gt;&gt; scalebits];</div><div class='del'>-	d[6] = cm[c[3] &gt;&gt; scalebits];</div><div class='del'>-</div><div class='del'>-	d = dst + bytes_per_line;</div><div class='del'>-	d[1] = cm[c[4] &gt;&gt; scalebits];</div><div class='del'>-	d[3] = cm[c[5] &gt;&gt; scalebits];</div><div class='del'>-	d[5] = cm[c[6] &gt;&gt; scalebits];</div><div class='del'>-	d[7] = cm[c[7] &gt;&gt; scalebits];</div><div class='del'>-</div><div class='del'>-	d = dst + bytes_per_line*2;</div><div class='del'>-	d[0] = cm[c[8] &gt;&gt; scalebits];</div><div class='del'>-	d[2] = cm[c[9] &gt;&gt; scalebits];</div><div class='del'>-	d[4] = cm[c[10] &gt;&gt; scalebits];</div><div class='del'>-	d[6] = cm[c[11] &gt;&gt; scalebits];</div><div class='del'>-</div><div class='del'>-	d = dst + bytes_per_line*3;</div><div class='del'>-	d[1] = cm[c[12] &gt;&gt; scalebits];</div><div class='del'>-	d[3] = cm[c[13] &gt;&gt; scalebits];</div><div class='del'>-	d[5] = cm[c[14] &gt;&gt; scalebits];</div><div class='del'>-	d[7] = cm[c[15] &gt;&gt; scalebits];</div><div class='del'>-#else</div><div class='del'>-	int i;</div><div class='del'>-	unsigned char *d;</div><div class='del'>-	const int *c = src;</div><div class='del'>-</div><div class='del'>-	d = dst;</div><div class='del'>-	for (i = 0; i &lt; 4; i++, c++)</div><div class='del'>-		d[i*2] = CLAMP((*c) &gt;&gt; scalebits);</div><div class='del'>-</div><div class='del'>-	d = dst + bytes_per_line;</div><div class='del'>-	for (i = 0; i &lt; 4; i++, c++)</div><div class='del'>-		d[i*2+1] = CLAMP((*c) &gt;&gt; scalebits);</div><div class='del'>-</div><div class='del'>-	d = dst + bytes_per_line*2;</div><div class='del'>-	for (i = 0; i &lt; 4; i++, c++)</div><div class='del'>-		d[i*2] = CLAMP((*c) &gt;&gt; scalebits);</div><div class='del'>-</div><div class='del'>-	d = dst + bytes_per_line*3;</div><div class='del'>-	for (i = 0; i &lt; 4; i++, c++)</div><div class='del'>-		d[i*2+1] = CLAMP((*c) &gt;&gt; scalebits);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * To manage the stream, we keep bits in a 32 bits register.</div><div class='ctx'>  * fill_nbits(n): fill the reservoir with at least n bits</div><div class='hunk'>@@ -775,146 +648,44 @@ static void DecompressBand23(struct pwc_dec23_private *pdec,</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if ENABLE_BAYER_DECODER</div><div class='del'>-/*</div><div class='del'>- * Size need to be a multiple of 8 in width</div><div class='del'>- *</div><div class='del'>- * Return a block of four line encoded like this:</div><div class='del'>- *</div><div class='del'>- *   G R G R G R G R G R G R G R G R</div><div class='del'>- *   B G B G B G B G B G B G B G B G</div><div class='del'>- *   G R G R G R G R G R G R G R G R</div><div class='del'>- *   B G B G B G B G B G B G B G B G</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static void DecompressBandBayer(struct pwc_dec23_private *pdec,</div><div class='del'>-				const unsigned char *rawyuv,</div><div class='del'>-				unsigned char *rgbbayer,</div><div class='del'>-				unsigned int   compressed_image_width,</div><div class='del'>-				unsigned int   real_image_width)</div><div class='del'>-{</div><div class='del'>-	int compression_index, nblocks;</div><div class='del'>-	const unsigned char *ptable0004;</div><div class='del'>-	const unsigned char *ptable8004;</div><div class='del'>-	unsigned char *dest;</div><div class='del'>-</div><div class='del'>-	pdec-&gt;reservoir = 0;</div><div class='del'>-	pdec-&gt;nbits_in_reservoir = 0;</div><div class='del'>-	pdec-&gt;stream = rawyuv + 1;	/* The first byte of the stream is skipped */</div><div class='del'>-</div><div class='del'>-	get_nbits(pdec, 4, compression_index);</div><div class='del'>-</div><div class='del'>-	/* pass 1: uncompress RB component */</div><div class='del'>-	nblocks = compressed_image_width / 4;</div><div class='del'>-</div><div class='del'>-	ptable0004 = pdec-&gt;table_0004_pass1[compression_index];</div><div class='del'>-	ptable8004 = pdec-&gt;table_8004_pass1[compression_index];</div><div class='del'>-	dest = rgbbayer;</div><div class='del'>-</div><div class='del'>-	/* Each block decode a square of 4x4 */</div><div class='del'>-	while (nblocks) {</div><div class='del'>-		decode_block(pdec, ptable0004, ptable8004);</div><div class='del'>-		copy_image_block_RedBlue(pdec-&gt;temp_colors, rgbbayer, real_image_width, pdec-&gt;scalebits);</div><div class='del'>-		dest += 8;</div><div class='del'>-		nblocks--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* pass 2: uncompress G component */</div><div class='del'>-	nblocks = compressed_image_width / 8;</div><div class='del'>-</div><div class='del'>-	ptable0004 = pdec-&gt;table_0004_pass2[compression_index];</div><div class='del'>-	ptable8004 = pdec-&gt;table_8004_pass2[compression_index];</div><div class='del'>-</div><div class='del'>-	/* Each block decode a square of 4x4 */</div><div class='del'>-	while (nblocks) {</div><div class='del'>-		decode_block(pdec, ptable0004, ptable8004);</div><div class='del'>-		copy_image_block_Green(pdec-&gt;temp_colors, rgbbayer+1, real_image_width, pdec-&gt;scalebits);</div><div class='del'>-</div><div class='del'>-		decode_block(pdec, ptable0004, ptable8004);</div><div class='del'>-		copy_image_block_Green(pdec-&gt;temp_colors, rgbbayer+real_image_width, real_image_width, pdec-&gt;scalebits);</div><div class='del'>-</div><div class='del'>-		rgbbayer += 16;</div><div class='del'>-		nblocks -= 2;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  *</div><div class='ctx'>  * Uncompress a pwc23 buffer.</div><div class='ctx'>  *</div><div class='del'>- * pwc.view: size of the image wanted</div><div class='del'>- * pwc.image: size of the image returned by the camera</div><div class='del'>- * pwc.offset: (x,y) to displayer image in the view</div><div class='del'>- *</div><div class='ctx'>  * src: raw data</div><div class='ctx'>  * dst: image output</div><div class='del'>- * flags: PWCX_FLAG_PLANAR or PWCX_FLAG_BAYER</div><div class='ctx'>  */</div><div class='del'>-void pwc_dec23_decompress(const struct pwc_device *pwc,</div><div class='add'>+void pwc_dec23_decompress(struct pwc_device *pdev,</div><div class='ctx'> 			  const void *src,</div><div class='del'>-			  void *dst,</div><div class='del'>-			  int flags)</div><div class='add'>+			  void *dst)</div><div class='ctx'> {</div><div class='del'>-	int bandlines_left, stride, bytes_per_block;</div><div class='del'>-</div><div class='del'>-	bandlines_left = pwc-&gt;image.y / 4;</div><div class='del'>-	bytes_per_block = pwc-&gt;view.x * 4;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; PWCX_FLAG_BAYER) {</div><div class='del'>-#if ENABLE_BAYER_DECODER</div><div class='del'>-		/* RGB Bayer format */</div><div class='del'>-		unsigned char *rgbout;</div><div class='del'>-</div><div class='del'>-		stride = pwc-&gt;view.x * pwc-&gt;offset.y;</div><div class='del'>-		rgbout = dst + stride + pwc-&gt;offset.x;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		while (bandlines_left--) {</div><div class='del'>-</div><div class='del'>-			DecompressBandBayer(pwc-&gt;decompress_data,</div><div class='del'>-					    src,</div><div class='del'>-					    rgbout,</div><div class='del'>-					    pwc-&gt;image.x, pwc-&gt;view.x);</div><div class='del'>-</div><div class='del'>-			src += pwc-&gt;vbandlength;</div><div class='del'>-			rgbout += bytes_per_block;</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-#else</div><div class='del'>-		memset(dst, 0, pwc-&gt;view.x * pwc-&gt;view.y);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		/* YUV420P image format */</div><div class='del'>-		unsigned char *pout_planar_y;</div><div class='del'>-		unsigned char *pout_planar_u;</div><div class='del'>-		unsigned char *pout_planar_v;</div><div class='del'>-		unsigned int   plane_size;</div><div class='del'>-</div><div class='del'>-		plane_size = pwc-&gt;view.x * pwc-&gt;view.y;</div><div class='del'>-</div><div class='del'>-		/* offset in Y plane */</div><div class='del'>-		stride = pwc-&gt;view.x * pwc-&gt;offset.y;</div><div class='del'>-		pout_planar_y = dst + stride + pwc-&gt;offset.x;</div><div class='del'>-</div><div class='del'>-		/* offsets in U/V planes */</div><div class='del'>-		stride = (pwc-&gt;view.x * pwc-&gt;offset.y) / 4 + pwc-&gt;offset.x / 2;</div><div class='del'>-		pout_planar_u = dst + plane_size + stride;</div><div class='del'>-		pout_planar_v = dst + plane_size + plane_size / 4 + stride;</div><div class='del'>-</div><div class='del'>-		while (bandlines_left--) {</div><div class='del'>-</div><div class='del'>-			DecompressBand23(pwc-&gt;decompress_data,</div><div class='del'>-					 src,</div><div class='del'>-					 pout_planar_y, pout_planar_u, pout_planar_v,</div><div class='del'>-					 pwc-&gt;image.x, pwc-&gt;view.x);</div><div class='del'>-			src += pwc-&gt;vbandlength;</div><div class='del'>-			pout_planar_y += bytes_per_block;</div><div class='del'>-			pout_planar_u += pwc-&gt;view.x;</div><div class='del'>-			pout_planar_v += pwc-&gt;view.x;</div><div class='del'>-</div><div class='del'>-		}</div><div class='add'>+	int bandlines_left, bytes_per_block;</div><div class='add'>+	struct pwc_dec23_private *pdec = &amp;pdev-&gt;dec23;</div><div class='add'>+</div><div class='add'>+	/* YUV420P image format */</div><div class='add'>+	unsigned char *pout_planar_y;</div><div class='add'>+	unsigned char *pout_planar_u;</div><div class='add'>+	unsigned char *pout_planar_v;</div><div class='add'>+	unsigned int   plane_size;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pdec-&gt;lock);</div><div class='add'>+</div><div class='add'>+	bandlines_left = pdev-&gt;height / 4;</div><div class='add'>+	bytes_per_block = pdev-&gt;width * 4;</div><div class='add'>+	plane_size = pdev-&gt;height * pdev-&gt;width;</div><div class='add'>+</div><div class='add'>+	pout_planar_y = dst;</div><div class='add'>+	pout_planar_u = dst + plane_size;</div><div class='add'>+	pout_planar_v = dst + plane_size + plane_size / 4;</div><div class='add'>+</div><div class='add'>+	while (bandlines_left--) {</div><div class='add'>+		DecompressBand23(pdec, src,</div><div class='add'>+				 pout_planar_y, pout_planar_u, pout_planar_v,</div><div class='add'>+				 pdev-&gt;width, pdev-&gt;width);</div><div class='add'>+		src += pdev-&gt;vbandlength;</div><div class='add'>+		pout_planar_y += bytes_per_block;</div><div class='add'>+		pout_planar_u += pdev-&gt;width;</div><div class='add'>+		pout_planar_v += pdev-&gt;width;</div><div class='ctx'> 	}</div><div class='add'>+	mutex_unlock(&amp;pdec-&gt;lock);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-dec23.h b/drivers/media/video/pwc/pwc-dec23.h<br/>index a0ac4f3dff81..c655b1c1e6a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-dec23.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-dec23.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-dec23.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/pwc/pwc-dec23.h</a></div><div class='hunk'>@@ -25,15 +25,20 @@</div><div class='ctx'> #ifndef PWC_DEC23_H</div><div class='ctx'> #define PWC_DEC23_H</div><div class='ctx'> </div><div class='del'>-#include "pwc.h"</div><div class='add'>+struct pwc_device;</div><div class='ctx'> </div><div class='ctx'> struct pwc_dec23_private</div><div class='ctx'> {</div><div class='add'>+	struct mutex lock;</div><div class='add'>+</div><div class='add'>+	unsigned char last_cmd, last_cmd_valid;</div><div class='add'>+</div><div class='ctx'>   unsigned int scalebits;</div><div class='ctx'>   unsigned int nbitsmask, nbits; /* Number of bits of a color in the compressed stream */</div><div class='ctx'> </div><div class='ctx'>   unsigned int reservoir;</div><div class='ctx'>   unsigned int nbits_in_reservoir;</div><div class='add'>+</div><div class='ctx'>   const unsigned char *stream;</div><div class='ctx'>   int temp_colors[16];</div><div class='ctx'> </div><div class='hunk'>@@ -49,9 +54,8 @@ struct pwc_dec23_private</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int pwc_dec23_init(struct pwc_device *pwc, int type, unsigned char *cmd);</div><div class='del'>-void pwc_dec23_decompress(const struct pwc_device *pwc,</div><div class='add'>+void pwc_dec23_init(struct pwc_device *pdev, const unsigned char *cmd);</div><div class='add'>+void pwc_dec23_decompress(struct pwc_device *pdev,</div><div class='ctx'> 			  const void *src,</div><div class='del'>-			  void *dst,</div><div class='del'>-			  int flags);</div><div class='add'>+			  void *dst);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c<br/>index 01ff643e682d..122fbd0081eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-if.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-if.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-if.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/pwc/pwc-if.c</a></div><div class='hunk'>@@ -128,33 +128,23 @@ static struct usb_driver pwc_driver = {</div><div class='ctx'> #define MAX_DEV_HINTS	20</div><div class='ctx'> #define MAX_ISOC_ERRORS	20</div><div class='ctx'> </div><div class='del'>-static int default_fps = 10;</div><div class='ctx'> #ifdef CONFIG_USB_PWC_DEBUG</div><div class='ctx'> 	int pwc_trace = PWC_DEBUG_LEVEL;</div><div class='ctx'> #endif</div><div class='ctx'> static int power_save = -1;</div><div class='del'>-static int led_on = 100, led_off; /* defaults to LED that is on while in use */</div><div class='del'>-static int pwc_preferred_compression = 1; /* 0..3 = uncompressed..high */</div><div class='del'>-static struct {</div><div class='del'>-	int type;</div><div class='del'>-	char serial_number[30];</div><div class='del'>-	int device_node;</div><div class='del'>-	struct pwc_device *pdev;</div><div class='del'>-} device_hint[MAX_DEV_HINTS];</div><div class='add'>+static int leds[2] = { 100, 0 };</div><div class='ctx'> </div><div class='ctx'> /***/</div><div class='ctx'> </div><div class='del'>-static int pwc_video_open(struct file *file);</div><div class='ctx'> static int pwc_video_close(struct file *file);</div><div class='ctx'> static ssize_t pwc_video_read(struct file *file, char __user *buf,</div><div class='ctx'> 			  size_t count, loff_t *ppos);</div><div class='ctx'> static unsigned int pwc_video_poll(struct file *file, poll_table *wait);</div><div class='ctx'> static int  pwc_video_mmap(struct file *file, struct vm_area_struct *vma);</div><div class='del'>-static void pwc_video_release(struct video_device *vfd);</div><div class='ctx'> </div><div class='ctx'> static const struct v4l2_file_operations pwc_fops = {</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='del'>-	.open =		pwc_video_open,</div><div class='add'>+	.open =		v4l2_fh_open,</div><div class='ctx'> 	.release =     	pwc_video_close,</div><div class='ctx'> 	.read =		pwc_video_read,</div><div class='ctx'> 	.poll =		pwc_video_poll,</div><div class='hunk'>@@ -163,7 +153,7 @@ static const struct v4l2_file_operations pwc_fops = {</div><div class='ctx'> };</div><div class='ctx'> static struct video_device pwc_template = {</div><div class='ctx'> 	.name =		"Philips Webcam",	/* Filled in later */</div><div class='del'>-	.release =	pwc_video_release,</div><div class='add'>+	.release =	video_device_release_empty,</div><div class='ctx'> 	.fops =         &amp;pwc_fops,</div><div class='ctx'> 	.ioctl_ops =	&amp;pwc_ioctl_ops,</div><div class='ctx'> };</div><div class='hunk'>@@ -191,7 +181,6 @@ static void pwc_snapshot_button(struct pwc_device *pdev, int down)</div><div class='ctx'> {</div><div class='ctx'> 	if (down) {</div><div class='ctx'> 		PWC_TRACE("Snapshot button pressed.\n");</div><div class='del'>-		pdev-&gt;snapshot_button_status = 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		PWC_TRACE("Snapshot button released.\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -375,6 +364,7 @@ static int pwc_isoc_init(struct pwc_device *pdev)</div><div class='ctx'> 	int i, j, ret;</div><div class='ctx'> 	struct usb_interface *intf;</div><div class='ctx'> 	struct usb_host_interface *idesc = NULL;</div><div class='add'>+	int compression = 0; /* 0..3 = uncompressed..high */</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;iso_init)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -386,6 +376,12 @@ static int pwc_isoc_init(struct pwc_device *pdev)</div><div class='ctx'> 	pdev-&gt;visoc_errors = 0;</div><div class='ctx'> 	udev = pdev-&gt;udev;</div><div class='ctx'> </div><div class='add'>+retry:</div><div class='add'>+	/* We first try with low compression and then retry with a higher</div><div class='add'>+	   compression setting if there is not enough bandwidth. */</div><div class='add'>+	ret = pwc_set_video_mode(pdev, pdev-&gt;width, pdev-&gt;height, pdev-&gt;pixfmt,</div><div class='add'>+				 pdev-&gt;vframes, &amp;compression, 1);</div><div class='add'>+</div><div class='ctx'> 	/* Get the current alternate interface, adjust packet size */</div><div class='ctx'> 	intf = usb_ifnum_to_if(udev, 0);</div><div class='ctx'> 	if (intf)</div><div class='hunk'>@@ -408,9 +404,12 @@ static int pwc_isoc_init(struct pwc_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set alternate interface */</div><div class='del'>-	ret = 0;</div><div class='ctx'> 	PWC_DEBUG_OPEN("Setting alternate interface %d\n", pdev-&gt;valternate);</div><div class='ctx'> 	ret = usb_set_interface(pdev-&gt;udev, 0, pdev-&gt;valternate);</div><div class='add'>+	if (ret == -ENOSPC &amp;&amp; compression &lt; 3) {</div><div class='add'>+		compression++;</div><div class='add'>+		goto retry;</div><div class='add'>+	}</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -454,6 +453,12 @@ static int pwc_isoc_init(struct pwc_device *pdev)</div><div class='ctx'> 	/* link */</div><div class='ctx'> 	for (i = 0; i &lt; MAX_ISO_BUFS; i++) {</div><div class='ctx'> 		ret = usb_submit_urb(pdev-&gt;urbs[i], GFP_KERNEL);</div><div class='add'>+		if (ret == -ENOSPC &amp;&amp; compression &lt; 3) {</div><div class='add'>+			compression++;</div><div class='add'>+			pdev-&gt;iso_init = 1;</div><div class='add'>+			pwc_isoc_cleanup(pdev);</div><div class='add'>+			goto retry;</div><div class='add'>+		}</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			PWC_ERROR("isoc_init() submit_urb %d failed with error %d\n", i, ret);</div><div class='ctx'> 			pdev-&gt;iso_init = 1;</div><div class='hunk'>@@ -517,12 +522,11 @@ static void pwc_isoc_cleanup(struct pwc_device *pdev)</div><div class='ctx'> 	PWC_DEBUG_OPEN("&lt;&lt; pwc_isoc_cleanup()\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Release all queued buffers, no need to take queued_bufs_lock, since all</div><div class='del'>- * iso urbs have been killed when we're called so pwc_isoc_handler won't run.</div><div class='del'>- */</div><div class='ctx'> static void pwc_cleanup_queued_bufs(struct pwc_device *pdev)</div><div class='ctx'> {</div><div class='add'>+	unsigned long flags = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pdev-&gt;queued_bufs_lock, flags);</div><div class='ctx'> 	while (!list_empty(&amp;pdev-&gt;queued_bufs)) {</div><div class='ctx'> 		struct pwc_frame_buf *buf;</div><div class='ctx'> </div><div class='hunk'>@@ -531,84 +535,7 @@ static void pwc_cleanup_queued_bufs(struct pwc_device *pdev)</div><div class='ctx'> 		list_del(&amp;buf-&gt;list);</div><div class='ctx'> 		vb2_buffer_done(&amp;buf-&gt;vb, VB2_BUF_STATE_ERROR);</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*********</div><div class='del'>- * sysfs</div><div class='del'>- *********/</div><div class='del'>-static struct pwc_device *cd_to_pwc(struct device *cd)</div><div class='del'>-{</div><div class='del'>-	struct video_device *vdev = to_video_device(cd);</div><div class='del'>-	return video_get_drvdata(vdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t show_pan_tilt(struct device *class_dev,</div><div class='del'>-			     struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct pwc_device *pdev = cd_to_pwc(class_dev);</div><div class='del'>-	return sprintf(buf, "%d %d\n", pdev-&gt;pan_angle, pdev-&gt;tilt_angle);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t store_pan_tilt(struct device *class_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 pwc_device *pdev = cd_to_pwc(class_dev);</div><div class='del'>-	int pan, tilt;</div><div class='del'>-	int ret = -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (strncmp(buf, "reset", 5) == 0)</div><div class='del'>-		ret = pwc_mpt_reset(pdev, 0x3);</div><div class='del'>-</div><div class='del'>-	else if (sscanf(buf, "%d %d", &amp;pan, &amp;tilt) &gt; 0)</div><div class='del'>-		ret = pwc_mpt_set_angle(pdev, pan, tilt);</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	return strlen(buf);</div><div class='del'>-}</div><div class='del'>-static DEVICE_ATTR(pan_tilt, S_IRUGO | S_IWUSR, show_pan_tilt,</div><div class='del'>-		   store_pan_tilt);</div><div class='del'>-</div><div class='del'>-static ssize_t show_snapshot_button_status(struct device *class_dev,</div><div class='del'>-					   struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct pwc_device *pdev = cd_to_pwc(class_dev);</div><div class='del'>-	int status = pdev-&gt;snapshot_button_status;</div><div class='del'>-	pdev-&gt;snapshot_button_status = 0;</div><div class='del'>-	return sprintf(buf, "%d\n", status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEVICE_ATTR(button, S_IRUGO | S_IWUSR, show_snapshot_button_status,</div><div class='del'>-		   NULL);</div><div class='del'>-</div><div class='del'>-static int pwc_create_sysfs_files(struct pwc_device *pdev)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	rc = device_create_file(&amp;pdev-&gt;vdev.dev, &amp;dev_attr_button);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto err;</div><div class='del'>-	if (pdev-&gt;features &amp; FEATURE_MOTOR_PANTILT) {</div><div class='del'>-		rc = device_create_file(&amp;pdev-&gt;vdev.dev, &amp;dev_attr_pan_tilt);</div><div class='del'>-		if (rc)</div><div class='del'>-			goto err_button;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_button:</div><div class='del'>-	device_remove_file(&amp;pdev-&gt;vdev.dev, &amp;dev_attr_button);</div><div class='del'>-err:</div><div class='del'>-	PWC_ERROR("Could not create sysfs files.\n");</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pwc_remove_sysfs_files(struct pwc_device *pdev)</div><div class='del'>-{</div><div class='del'>-	if (pdev-&gt;features &amp; FEATURE_MOTOR_PANTILT)</div><div class='del'>-		device_remove_file(&amp;pdev-&gt;vdev.dev, &amp;dev_attr_pan_tilt);</div><div class='del'>-	device_remove_file(&amp;pdev-&gt;vdev.dev, &amp;dev_attr_button);</div><div class='add'>+	spin_unlock_irqrestore(&amp;pdev-&gt;queued_bufs_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_USB_PWC_DEBUG</div><div class='hunk'>@@ -644,85 +571,60 @@ static const char *pwc_sensor_type_to_string(unsigned int sensor_type)</div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> /* Video4Linux functions */</div><div class='ctx'> </div><div class='del'>-static int pwc_video_open(struct file *file)</div><div class='add'>+int pwc_test_n_set_capt_file(struct pwc_device *pdev, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vdev = video_devdata(file);</div><div class='del'>-	struct pwc_device *pdev;</div><div class='del'>-</div><div class='del'>-	PWC_DEBUG_OPEN("&gt;&gt; video_open called(vdev = 0x%p).\n", vdev);</div><div class='del'>-</div><div class='del'>-	pdev = video_get_drvdata(vdev);</div><div class='del'>-	if (!pdev-&gt;udev)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	int r = 0;</div><div class='ctx'> </div><div class='del'>-	file-&gt;private_data = vdev;</div><div class='del'>-	PWC_DEBUG_OPEN("&lt;&lt; video_open() returns 0.\n");</div><div class='del'>-	return 0;</div><div class='add'>+	mutex_lock(&amp;pdev-&gt;capt_file_lock);</div><div class='add'>+	if (pdev-&gt;capt_file != NULL &amp;&amp;</div><div class='add'>+	    pdev-&gt;capt_file != file) {</div><div class='add'>+		r = -EBUSY;</div><div class='add'>+		goto leave;</div><div class='add'>+	}</div><div class='add'>+	pdev-&gt;capt_file = file;</div><div class='add'>+leave:</div><div class='add'>+	mutex_unlock(&amp;pdev-&gt;capt_file_lock);</div><div class='add'>+	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pwc_video_release(struct video_device *vfd)</div><div class='add'>+static void pwc_video_release(struct v4l2_device *v)</div><div class='ctx'> {</div><div class='del'>-	struct pwc_device *pdev = container_of(vfd, struct pwc_device, vdev);</div><div class='del'>-	int hint;</div><div class='del'>-</div><div class='del'>-	/* search device_hint[] table if we occupy a slot, by any chance */</div><div class='del'>-	for (hint = 0; hint &lt; MAX_DEV_HINTS; hint++)</div><div class='del'>-		if (device_hint[hint].pdev == pdev)</div><div class='del'>-			device_hint[hint].pdev = NULL;</div><div class='del'>-</div><div class='del'>-	/* Free intermediate decompression buffer &amp; tables */</div><div class='del'>-	if (pdev-&gt;decompress_data != NULL) {</div><div class='del'>-		PWC_DEBUG_MEMORY("Freeing decompression buffer at %p.\n",</div><div class='del'>-				 pdev-&gt;decompress_data);</div><div class='del'>-		kfree(pdev-&gt;decompress_data);</div><div class='del'>-		pdev-&gt;decompress_data = NULL;</div><div class='del'>-	}</div><div class='add'>+	struct pwc_device *pdev = container_of(v, struct pwc_device, v4l2_dev);</div><div class='ctx'> </div><div class='ctx'> 	v4l2_ctrl_handler_free(&amp;pdev-&gt;ctrl_handler);</div><div class='del'>-</div><div class='add'>+	kfree(pdev-&gt;ctrl_buf);</div><div class='ctx'> 	kfree(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pwc_video_close(struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vdev = file-&gt;private_data;</div><div class='del'>-	struct pwc_device *pdev;</div><div class='del'>-</div><div class='del'>-	PWC_DEBUG_OPEN("&gt;&gt; video_close called(vdev = 0x%p).\n", vdev);</div><div class='add'>+	struct pwc_device *pdev = video_drvdata(file);</div><div class='ctx'> </div><div class='del'>-	pdev = video_get_drvdata(vdev);</div><div class='ctx'> 	if (pdev-&gt;capt_file == file) {</div><div class='ctx'> 		vb2_queue_release(&amp;pdev-&gt;vb_queue);</div><div class='ctx'> 		pdev-&gt;capt_file = NULL;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	PWC_DEBUG_OPEN("&lt;&lt; video_close()\n");</div><div class='del'>-	return 0;</div><div class='add'>+	return v4l2_fh_release(file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t pwc_video_read(struct file *file, char __user *buf,</div><div class='ctx'> 			      size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vdev = file-&gt;private_data;</div><div class='del'>-	struct pwc_device *pdev = video_get_drvdata(vdev);</div><div class='add'>+	struct pwc_device *pdev = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (!pdev-&gt;udev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (pdev-&gt;capt_file != NULL &amp;&amp;</div><div class='del'>-	    pdev-&gt;capt_file != file)</div><div class='add'>+	if (pwc_test_n_set_capt_file(pdev, file))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	pdev-&gt;capt_file = file;</div><div class='del'>-</div><div class='ctx'> 	return vb2_read(&amp;pdev-&gt;vb_queue, buf, count, ppos,</div><div class='ctx'> 			file-&gt;f_flags &amp; O_NONBLOCK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int pwc_video_poll(struct file *file, poll_table *wait)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vdev = file-&gt;private_data;</div><div class='del'>-	struct pwc_device *pdev = video_get_drvdata(vdev);</div><div class='add'>+	struct pwc_device *pdev = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (!pdev-&gt;udev)</div><div class='ctx'> 		return POLL_ERR;</div><div class='hunk'>@@ -732,8 +634,7 @@ static unsigned int pwc_video_poll(struct file *file, poll_table *wait)</div><div class='ctx'> </div><div class='ctx'> static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vdev = file-&gt;private_data;</div><div class='del'>-	struct pwc_device *pdev = video_get_drvdata(vdev);</div><div class='add'>+	struct pwc_device *pdev = video_drvdata(file);</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;capt_file != file)</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -749,6 +650,7 @@ static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,</div><div class='ctx'> 				unsigned int sizes[], void *alloc_ctxs[])</div><div class='ctx'> {</div><div class='ctx'> 	struct pwc_device *pdev = vb2_get_drv_priv(vq);</div><div class='add'>+	int size;</div><div class='ctx'> </div><div class='ctx'> 	if (*nbuffers &lt; MIN_FRAMES)</div><div class='ctx'> 		*nbuffers = MIN_FRAMES;</div><div class='hunk'>@@ -757,7 +659,9 @@ static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,</div><div class='ctx'> </div><div class='ctx'> 	*nplanes = 1;</div><div class='ctx'> </div><div class='del'>-	sizes[0] = PAGE_ALIGN((pdev-&gt;abs_max.x * pdev-&gt;abs_max.y * 3) / 2);</div><div class='add'>+	size = pwc_get_size(pdev, MAX_WIDTH, MAX_HEIGHT);</div><div class='add'>+	sizes[0] = PAGE_ALIGN(pwc_image_sizes[size][0] *</div><div class='add'>+			      pwc_image_sizes[size][1] * 3 / 2);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -812,56 +716,59 @@ static void buffer_queue(struct vb2_buffer *vb)</div><div class='ctx'> 	unsigned long flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;pdev-&gt;queued_bufs_lock, flags);</div><div class='del'>-	list_add_tail(&amp;buf-&gt;list, &amp;pdev-&gt;queued_bufs);</div><div class='add'>+	/* Check the device has not disconnected between prep and queuing */</div><div class='add'>+	if (pdev-&gt;udev)</div><div class='add'>+		list_add_tail(&amp;buf-&gt;list, &amp;pdev-&gt;queued_bufs);</div><div class='add'>+	else</div><div class='add'>+		vb2_buffer_done(&amp;buf-&gt;vb, VB2_BUF_STATE_ERROR);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;pdev-&gt;queued_bufs_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int start_streaming(struct vb2_queue *vq, unsigned int count)</div><div class='ctx'> {</div><div class='ctx'> 	struct pwc_device *pdev = vb2_get_drv_priv(vq);</div><div class='add'>+	int r;</div><div class='ctx'> </div><div class='del'>-	if (!pdev-&gt;udev)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	mutex_lock(&amp;pdev-&gt;udevlock);</div><div class='add'>+	if (!pdev-&gt;udev) {</div><div class='add'>+		r = -ENODEV;</div><div class='add'>+		goto leave;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Turn on camera and set LEDS on */</div><div class='ctx'> 	pwc_camera_power(pdev, 1);</div><div class='del'>-	if (pdev-&gt;power_save) {</div><div class='del'>-		/* Restore video mode */</div><div class='del'>-		pwc_set_video_mode(pdev, pdev-&gt;view.x, pdev-&gt;view.y,</div><div class='del'>-				   pdev-&gt;vframes, pdev-&gt;vcompression,</div><div class='del'>-				   pdev-&gt;vsnapshot);</div><div class='del'>-	}</div><div class='del'>-	pwc_set_leds(pdev, led_on, led_off);</div><div class='add'>+	pwc_set_leds(pdev, leds[0], leds[1]);</div><div class='ctx'> </div><div class='del'>-	return pwc_isoc_init(pdev);</div><div class='add'>+	r = pwc_isoc_init(pdev);</div><div class='add'>+	if (r) {</div><div class='add'>+		/* If we failed turn camera and LEDS back off */</div><div class='add'>+		pwc_set_leds(pdev, 0, 0);</div><div class='add'>+		pwc_camera_power(pdev, 0);</div><div class='add'>+		/* And cleanup any queued bufs!! */</div><div class='add'>+		pwc_cleanup_queued_bufs(pdev);</div><div class='add'>+	}</div><div class='add'>+leave:</div><div class='add'>+	mutex_unlock(&amp;pdev-&gt;udevlock);</div><div class='add'>+	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int stop_streaming(struct vb2_queue *vq)</div><div class='ctx'> {</div><div class='ctx'> 	struct pwc_device *pdev = vb2_get_drv_priv(vq);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;pdev-&gt;udevlock);</div><div class='ctx'> 	if (pdev-&gt;udev) {</div><div class='ctx'> 		pwc_set_leds(pdev, 0, 0);</div><div class='ctx'> 		pwc_camera_power(pdev, 0);</div><div class='ctx'> 		pwc_isoc_cleanup(pdev);</div><div class='ctx'> 	}</div><div class='add'>+	mutex_unlock(&amp;pdev-&gt;udevlock);</div><div class='add'>+</div><div class='ctx'> 	pwc_cleanup_queued_bufs(pdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pwc_lock(struct vb2_queue *vq)</div><div class='del'>-{</div><div class='del'>-	struct pwc_device *pdev = vb2_get_drv_priv(vq);</div><div class='del'>-	mutex_lock(&amp;pdev-&gt;modlock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pwc_unlock(struct vb2_queue *vq)</div><div class='del'>-{</div><div class='del'>-	struct pwc_device *pdev = vb2_get_drv_priv(vq);</div><div class='del'>-	mutex_unlock(&amp;pdev-&gt;modlock);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct vb2_ops pwc_vb_queue_ops = {</div><div class='ctx'> 	.queue_setup		= queue_setup,</div><div class='ctx'> 	.buf_init		= buffer_init,</div><div class='hunk'>@@ -871,8 +778,6 @@ static struct vb2_ops pwc_vb_queue_ops = {</div><div class='ctx'> 	.buf_queue		= buffer_queue,</div><div class='ctx'> 	.start_streaming	= start_streaming,</div><div class='ctx'> 	.stop_streaming		= stop_streaming,</div><div class='del'>-	.wait_prepare		= pwc_unlock,</div><div class='del'>-	.wait_finish		= pwc_lock,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='hunk'>@@ -887,9 +792,9 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	struct usb_device *udev = interface_to_usbdev(intf);</div><div class='ctx'> 	struct pwc_device *pdev = NULL;</div><div class='ctx'> 	int vendor_id, product_id, type_id;</div><div class='del'>-	int hint, rc;</div><div class='add'>+	int rc;</div><div class='ctx'> 	int features = 0;</div><div class='del'>-	int video_nr = -1; /* default: use next available device */</div><div class='add'>+	int compression = 0;</div><div class='ctx'> 	int my_power_save = power_save;</div><div class='ctx'> 	char serial_number[30], *name;</div><div class='ctx'> </div><div class='hunk'>@@ -1149,28 +1054,15 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	pdev-&gt;type = type_id;</div><div class='del'>-	pdev-&gt;vframes = default_fps;</div><div class='del'>-	strcpy(pdev-&gt;serial, serial_number);</div><div class='ctx'> 	pdev-&gt;features = features;</div><div class='del'>-	if (vendor_id == 0x046D &amp;&amp; product_id == 0x08B5) {</div><div class='del'>-		/* Logitech QuickCam Orbit</div><div class='del'>-		   The ranges have been determined experimentally; they may differ from cam to cam.</div><div class='del'>-		   Also, the exact ranges left-right and up-down are different for my cam</div><div class='del'>-		  */</div><div class='del'>-		pdev-&gt;angle_range.pan_min  = -7000;</div><div class='del'>-		pdev-&gt;angle_range.pan_max  =  7000;</div><div class='del'>-		pdev-&gt;angle_range.tilt_min = -3000;</div><div class='del'>-		pdev-&gt;angle_range.tilt_max =  2500;</div><div class='del'>-	}</div><div class='ctx'> 	pwc_construct(pdev); /* set min/max sizes correct */</div><div class='ctx'> </div><div class='del'>-	mutex_init(&amp;pdev-&gt;modlock);</div><div class='add'>+	mutex_init(&amp;pdev-&gt;capt_file_lock);</div><div class='ctx'> 	mutex_init(&amp;pdev-&gt;udevlock);</div><div class='ctx'> 	spin_lock_init(&amp;pdev-&gt;queued_bufs_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;pdev-&gt;queued_bufs);</div><div class='ctx'> </div><div class='ctx'> 	pdev-&gt;udev = udev;</div><div class='del'>-	pdev-&gt;vcompression = pwc_preferred_compression;</div><div class='ctx'> 	pdev-&gt;power_save = my_power_save;</div><div class='ctx'> </div><div class='ctx'> 	/* Init videobuf2 queue structure */</div><div class='hunk'>@@ -1185,35 +1077,21 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> </div><div class='ctx'> 	/* Init video_device structure */</div><div class='ctx'> 	memcpy(&amp;pdev-&gt;vdev, &amp;pwc_template, sizeof(pwc_template));</div><div class='del'>-	pdev-&gt;vdev.parent = &amp;intf-&gt;dev;</div><div class='del'>-	pdev-&gt;vdev.lock = &amp;pdev-&gt;modlock;</div><div class='ctx'> 	strcpy(pdev-&gt;vdev.name, name);</div><div class='add'>+	set_bit(V4L2_FL_USE_FH_PRIO, &amp;pdev-&gt;vdev.flags);</div><div class='ctx'> 	video_set_drvdata(&amp;pdev-&gt;vdev, pdev);</div><div class='ctx'> </div><div class='ctx'> 	pdev-&gt;release = le16_to_cpu(udev-&gt;descriptor.bcdDevice);</div><div class='ctx'> 	PWC_DEBUG_PROBE("Release: %04x\n", pdev-&gt;release);</div><div class='ctx'> </div><div class='del'>-	/* Now search device_hint[] table for a match, so we can hint a node number. */</div><div class='del'>-	for (hint = 0; hint &lt; MAX_DEV_HINTS; hint++) {</div><div class='del'>-		if (((device_hint[hint].type == -1) || (device_hint[hint].type == pdev-&gt;type)) &amp;&amp;</div><div class='del'>-		     (device_hint[hint].pdev == NULL)) {</div><div class='del'>-			/* so far, so good... try serial number */</div><div class='del'>-			if ((device_hint[hint].serial_number[0] == '*') || !strcmp(device_hint[hint].serial_number, serial_number)) {</div><div class='del'>-				/* match! */</div><div class='del'>-				video_nr = device_hint[hint].device_node;</div><div class='del'>-				PWC_DEBUG_PROBE("Found hint, will try to register as /dev/video%d\n", video_nr);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	/* Allocate USB command buffers */</div><div class='add'>+	pdev-&gt;ctrl_buf = kmalloc(sizeof(pdev-&gt;cmd_buf), GFP_KERNEL);</div><div class='add'>+	if (!pdev-&gt;ctrl_buf) {</div><div class='add'>+		PWC_ERROR("Oops, could not allocate memory for pwc_device.\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err_free_mem;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* occupy slot */</div><div class='del'>-	if (hint &lt; MAX_DEV_HINTS)</div><div class='del'>-		device_hint[hint].pdev = pdev;</div><div class='del'>-</div><div class='del'>-	PWC_DEBUG_PROBE("probe() function returning struct at 0x%p.\n", pdev);</div><div class='del'>-	usb_set_intfdata(intf, pdev);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_USB_PWC_DEBUG</div><div class='ctx'> 	/* Query sensor type */</div><div class='ctx'> 	if (pwc_get_cmos_sensor(pdev, &amp;rc) &gt;= 0) {</div><div class='hunk'>@@ -1227,8 +1105,8 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	pwc_set_leds(pdev, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup intial videomode */</div><div class='del'>-	rc = pwc_set_video_mode(pdev, pdev-&gt;view_max.x, pdev-&gt;view_max.y,</div><div class='del'>-				pdev-&gt;vframes, pdev-&gt;vcompression, 0);</div><div class='add'>+	rc = pwc_set_video_mode(pdev, MAX_WIDTH, MAX_HEIGHT,</div><div class='add'>+				V4L2_PIX_FMT_YUV420, 30, &amp;compression, 1);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_free_mem;</div><div class='ctx'> </div><div class='hunk'>@@ -1239,20 +1117,25 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 		goto err_free_mem;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pdev-&gt;vdev.ctrl_handler = &amp;pdev-&gt;ctrl_handler;</div><div class='del'>-</div><div class='ctx'> 	/* And powerdown the camera until streaming starts */</div><div class='ctx'> 	pwc_camera_power(pdev, 0);</div><div class='ctx'> </div><div class='del'>-	rc = video_register_device(&amp;pdev-&gt;vdev, VFL_TYPE_GRABBER, video_nr);</div><div class='del'>-	if (rc &lt; 0) {</div><div class='del'>-		PWC_ERROR("Failed to register as video device (%d).\n", rc);</div><div class='add'>+	/* Register the v4l2_device structure */</div><div class='add'>+	pdev-&gt;v4l2_dev.release = pwc_video_release;</div><div class='add'>+	rc = v4l2_device_register(&amp;intf-&gt;dev, &amp;pdev-&gt;v4l2_dev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		PWC_ERROR("Failed to register v4l2-device (%d).\n", rc);</div><div class='ctx'> 		goto err_free_controls;</div><div class='ctx'> 	}</div><div class='del'>-	rc = pwc_create_sysfs_files(pdev);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto err_video_unreg;</div><div class='ctx'> </div><div class='add'>+	pdev-&gt;v4l2_dev.ctrl_handler = &amp;pdev-&gt;ctrl_handler;</div><div class='add'>+	pdev-&gt;vdev.v4l2_dev = &amp;pdev-&gt;v4l2_dev;</div><div class='add'>+</div><div class='add'>+	rc = video_register_device(&amp;pdev-&gt;vdev, VFL_TYPE_GRABBER, -1);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		PWC_ERROR("Failed to register as video device (%d).\n", rc);</div><div class='add'>+		goto err_unregister_v4l2_dev;</div><div class='add'>+	}</div><div class='ctx'> 	PWC_INFO("Registered as %s.\n", video_device_node_name(&amp;pdev-&gt;vdev));</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_USB_PWC_INPUT_EVDEV</div><div class='hunk'>@@ -1261,7 +1144,6 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	if (!pdev-&gt;button_dev) {</div><div class='ctx'> 		PWC_ERROR("Err, insufficient memory for webcam snapshot button device.");</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='del'>-		pwc_remove_sysfs_files(pdev);</div><div class='ctx'> 		goto err_video_unreg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1279,7 +1161,6 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		input_free_device(pdev-&gt;button_dev);</div><div class='ctx'> 		pdev-&gt;button_dev = NULL;</div><div class='del'>-		pwc_remove_sysfs_files(pdev);</div><div class='ctx'> 		goto err_video_unreg;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1287,13 +1168,13 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_video_unreg:</div><div class='del'>-	if (hint &lt; MAX_DEV_HINTS)</div><div class='del'>-		device_hint[hint].pdev = NULL;</div><div class='ctx'> 	video_unregister_device(&amp;pdev-&gt;vdev);</div><div class='add'>+err_unregister_v4l2_dev:</div><div class='add'>+	v4l2_device_unregister(&amp;pdev-&gt;v4l2_dev);</div><div class='ctx'> err_free_controls:</div><div class='ctx'> 	v4l2_ctrl_handler_free(&amp;pdev-&gt;ctrl_handler);</div><div class='ctx'> err_free_mem:</div><div class='del'>-	usb_set_intfdata(intf, NULL);</div><div class='add'>+	kfree(pdev-&gt;ctrl_buf);</div><div class='ctx'> 	kfree(pdev);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -1301,27 +1182,26 @@ err_free_mem:</div><div class='ctx'> /* The user yanked out the cable... */</div><div class='ctx'> static void usb_pwc_disconnect(struct usb_interface *intf)</div><div class='ctx'> {</div><div class='del'>-	struct pwc_device *pdev  = usb_get_intfdata(intf);</div><div class='add'>+	struct v4l2_device *v = usb_get_intfdata(intf);</div><div class='add'>+	struct pwc_device *pdev = container_of(v, struct pwc_device, v4l2_dev);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;pdev-&gt;udevlock);</div><div class='del'>-	mutex_lock(&amp;pdev-&gt;modlock);</div><div class='del'>-</div><div class='del'>-	usb_set_intfdata(intf, NULL);</div><div class='ctx'> 	/* No need to keep the urbs around after disconnection */</div><div class='ctx'> 	pwc_isoc_cleanup(pdev);</div><div class='del'>-	pwc_cleanup_queued_bufs(pdev);</div><div class='ctx'> 	pdev-&gt;udev = NULL;</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;pdev-&gt;modlock);</div><div class='ctx'> 	mutex_unlock(&amp;pdev-&gt;udevlock);</div><div class='ctx'> </div><div class='del'>-	pwc_remove_sysfs_files(pdev);</div><div class='add'>+	pwc_cleanup_queued_bufs(pdev);</div><div class='add'>+</div><div class='ctx'> 	video_unregister_device(&amp;pdev-&gt;vdev);</div><div class='add'>+	v4l2_device_unregister(&amp;pdev-&gt;v4l2_dev);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_USB_PWC_INPUT_EVDEV</div><div class='ctx'> 	if (pdev-&gt;button_dev)</div><div class='ctx'> 		input_unregister_device(pdev-&gt;button_dev);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	v4l2_device_put(&amp;pdev-&gt;v4l2_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1329,30 +1209,19 @@ static void usb_pwc_disconnect(struct usb_interface *intf)</div><div class='ctx'>  * Initialization code &amp; module stuff</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int fps;</div><div class='del'>-static int compression = -1;</div><div class='del'>-static int leds[2] = { -1, -1 };</div><div class='ctx'> static unsigned int leds_nargs;</div><div class='del'>-static char *dev_hint[MAX_DEV_HINTS];</div><div class='del'>-static unsigned int dev_hint_nargs;</div><div class='ctx'> </div><div class='del'>-module_param(fps, int, 0444);</div><div class='ctx'> #ifdef CONFIG_USB_PWC_DEBUG</div><div class='ctx'> module_param_named(trace, pwc_trace, int, 0644);</div><div class='ctx'> #endif</div><div class='ctx'> module_param(power_save, int, 0644);</div><div class='del'>-module_param(compression, int, 0444);</div><div class='ctx'> module_param_array(leds, int, &amp;leds_nargs, 0444);</div><div class='del'>-module_param_array(dev_hint, charp, &amp;dev_hint_nargs, 0444);</div><div class='ctx'> </div><div class='del'>-MODULE_PARM_DESC(fps, "Initial frames per second. Varies with model, useful range 5-30");</div><div class='ctx'> #ifdef CONFIG_USB_PWC_DEBUG</div><div class='ctx'> MODULE_PARM_DESC(trace, "For debugging purposes");</div><div class='ctx'> #endif</div><div class='ctx'> MODULE_PARM_DESC(power_save, "Turn power saving for new cameras on or off");</div><div class='del'>-MODULE_PARM_DESC(compression, "Preferred compression quality. Range 0 (uncompressed) to 3 (high compression)");</div><div class='ctx'> MODULE_PARM_DESC(leds, "LED on,off time in milliseconds");</div><div class='del'>-MODULE_PARM_DESC(dev_hint, "Device node hints");</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Philips &amp; OEM USB webcam driver");</div><div class='ctx'> MODULE_AUTHOR("Luc Saillard &lt;luc@saillard.org&gt;");</div><div class='hunk'>@@ -1362,122 +1231,13 @@ MODULE_VERSION( PWC_VERSION );</div><div class='ctx'> </div><div class='ctx'> static int __init usb_pwc_init(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_USB_PWC_DEBUG</div><div class='del'>-	PWC_INFO("Philips webcam module version " PWC_VERSION " loaded.\n");</div><div class='del'>-	PWC_INFO("Supports Philips PCA645/646, PCVC675/680/690, PCVC720[40]/730/740/750 &amp; PCVC830/840.\n");</div><div class='del'>-	PWC_INFO("Also supports the Askey VC010, various Logitech Quickcams, Samsung MPC-C10 and MPC-C30,\n");</div><div class='del'>-	PWC_INFO("the Creative WebCam 5 &amp; Pro Ex, SOTEC Afina Eye and Visionite VCS-UC300 and VCS-UM100.\n");</div><div class='del'>-</div><div class='del'>-	if (pwc_trace &gt;= 0) {</div><div class='del'>-		PWC_DEBUG_MODULE("Trace options: 0x%04x\n", pwc_trace);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (fps) {</div><div class='del'>-		if (fps &lt; 4 || fps &gt; 30) {</div><div class='del'>-			PWC_ERROR("Framerate out of bounds (4-30).\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		default_fps = fps;</div><div class='del'>-		PWC_DEBUG_MODULE("Default framerate set to %d.\n", default_fps);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (compression &gt;= 0) {</div><div class='del'>-		if (compression &gt; 3) {</div><div class='del'>-			PWC_ERROR("Invalid compression setting; use a number between 0 (uncompressed) and 3 (high).\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		pwc_preferred_compression = compression;</div><div class='del'>-		PWC_DEBUG_MODULE("Preferred compression set to %d.\n", pwc_preferred_compression);</div><div class='del'>-	}</div><div class='del'>-	if (leds[0] &gt;= 0)</div><div class='del'>-		led_on = leds[0];</div><div class='del'>-	if (leds[1] &gt;= 0)</div><div class='del'>-		led_off = leds[1];</div><div class='del'>-</div><div class='del'>-	/* Big device node whoopla. Basically, it allows you to assign a</div><div class='del'>-	   device node (/dev/videoX) to a camera, based on its type</div><div class='del'>-	   &amp; serial number. The format is [type[.serialnumber]:]node.</div><div class='del'>-</div><div class='del'>-	   Any camera that isn't matched by these rules gets the next</div><div class='del'>-	   available free device node.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; MAX_DEV_HINTS; i++) {</div><div class='del'>-		char *s, *colon, *dot;</div><div class='del'>-</div><div class='del'>-		/* This loop also initializes the array */</div><div class='del'>-		device_hint[i].pdev = NULL;</div><div class='del'>-		s = dev_hint[i];</div><div class='del'>-		if (s != NULL &amp;&amp; *s != '\0') {</div><div class='del'>-			device_hint[i].type = -1; /* wildcard */</div><div class='del'>-			strcpy(device_hint[i].serial_number, "*");</div><div class='del'>-</div><div class='del'>-			/* parse string: chop at ':' &amp; '/' */</div><div class='del'>-			colon = dot = s;</div><div class='del'>-			while (*colon != '\0' &amp;&amp; *colon != ':')</div><div class='del'>-				colon++;</div><div class='del'>-			while (*dot != '\0' &amp;&amp; *dot != '.')</div><div class='del'>-				dot++;</div><div class='del'>-			/* Few sanity checks */</div><div class='del'>-			if (*dot != '\0' &amp;&amp; dot &gt; colon) {</div><div class='del'>-				PWC_ERROR("Malformed camera hint: the colon must be after the dot.\n");</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (*colon == '\0') {</div><div class='del'>-				/* No colon */</div><div class='del'>-				if (*dot != '\0') {</div><div class='del'>-					PWC_ERROR("Malformed camera hint: no colon + device node given.\n");</div><div class='del'>-					return -EINVAL;</div><div class='del'>-				}</div><div class='del'>-				else {</div><div class='del'>-					/* No type or serial number specified, just a number. */</div><div class='del'>-					device_hint[i].device_node =</div><div class='del'>-						simple_strtol(s, NULL, 10);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				/* There's a colon, so we have at least a type and a device node */</div><div class='del'>-				device_hint[i].type =</div><div class='del'>-					simple_strtol(s, NULL, 10);</div><div class='del'>-				device_hint[i].device_node =</div><div class='del'>-					simple_strtol(colon + 1, NULL, 10);</div><div class='del'>-				if (*dot != '\0') {</div><div class='del'>-					/* There's a serial number as well */</div><div class='del'>-					int k;</div><div class='del'>-</div><div class='del'>-					dot++;</div><div class='del'>-					k = 0;</div><div class='del'>-					while (*dot != ':' &amp;&amp; k &lt; 29) {</div><div class='del'>-						device_hint[i].serial_number[k++] = *dot;</div><div class='del'>-						dot++;</div><div class='del'>-					}</div><div class='del'>-					device_hint[i].serial_number[k] = '\0';</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			PWC_TRACE("device_hint[%d]:\n", i);</div><div class='del'>-			PWC_TRACE("  type    : %d\n", device_hint[i].type);</div><div class='del'>-			PWC_TRACE("  serial# : %s\n", device_hint[i].serial_number);</div><div class='del'>-			PWC_TRACE("  node    : %d\n", device_hint[i].device_node);</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-			device_hint[i].type = 0; /* not filled */</div><div class='del'>-	} /* ..for MAX_DEV_HINTS */</div><div class='del'>-</div><div class='del'>-	PWC_DEBUG_PROBE("Registering driver at address 0x%p.\n", &amp;pwc_driver);</div><div class='ctx'> 	return usb_register(&amp;pwc_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit usb_pwc_exit(void)</div><div class='ctx'> {</div><div class='del'>-	PWC_DEBUG_MODULE("Deregistering driver.\n");</div><div class='ctx'> 	usb_deregister(&amp;pwc_driver);</div><div class='del'>-	PWC_INFO("Philips webcam module removed.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(usb_pwc_init);</div><div class='ctx'> module_exit(usb_pwc_exit);</div><div class='del'>-</div><div class='del'>-/* vim: set cino= formatoptions=croql cindent shiftwidth=8 tabstop=8: */</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-kiara.h b/drivers/media/video/pwc/pwc-kiara.h<br/>index 047dad8c15f7..8e02b7ac2139 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-kiara.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-kiara.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-kiara.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/pwc/pwc-kiara.h</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #ifndef PWC_KIARA_H</div><div class='ctx'> #define PWC_KIARA_H</div><div class='ctx'> </div><div class='del'>-#include &lt;media/pwc-ioctl.h&gt;</div><div class='add'>+#include "pwc.h"</div><div class='ctx'> </div><div class='ctx'> #define PWC_FPS_MAX_KIARA 6</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-misc.c b/drivers/media/video/pwc/pwc-misc.c<br/>index 0b031336eab8..9be5adffa874 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-misc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-misc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/pwc/pwc-misc.c</a></div><div class='hunk'>@@ -27,67 +27,47 @@</div><div class='ctx'> </div><div class='ctx'> #include "pwc.h"</div><div class='ctx'> </div><div class='del'>-const struct pwc_coord pwc_image_sizes[PSZ_MAX] =</div><div class='add'>+const int pwc_image_sizes[PSZ_MAX][2] =</div><div class='ctx'> {</div><div class='del'>-	{ 128,  96, 0 }, /* sqcif */</div><div class='del'>-	{ 160, 120, 0 }, /* qsif */</div><div class='del'>-	{ 176, 144, 0 }, /* qcif */</div><div class='del'>-	{ 320, 240, 0 }, /* sif */</div><div class='del'>-	{ 352, 288, 0 }, /* cif */</div><div class='del'>-	{ 640, 480, 0 }, /* vga */</div><div class='add'>+	{ 128,  96 }, /* sqcif */</div><div class='add'>+	{ 160, 120 }, /* qsif */</div><div class='add'>+	{ 176, 144 }, /* qcif */</div><div class='add'>+	{ 320, 240 }, /* sif */</div><div class='add'>+	{ 352, 288 }, /* cif */</div><div class='add'>+	{ 640, 480 }, /* vga */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* x,y -&gt; PSZ_ */</div><div class='del'>-int pwc_decode_size(struct pwc_device *pdev, int width, int height)</div><div class='add'>+int pwc_get_size(struct pwc_device *pdev, int width, int height)</div><div class='ctx'> {</div><div class='del'>-	int i, find;</div><div class='del'>-</div><div class='del'>-	/* Make sure we don't go beyond our max size.</div><div class='del'>-	   NB: we have different limits for RAW and normal modes. In case</div><div class='del'>-	   you don't have the decompressor loaded or use RAW mode,</div><div class='del'>-	   the maximum viewable size is smaller.</div><div class='del'>-	*/</div><div class='del'>-	if (pdev-&gt;pixfmt != V4L2_PIX_FMT_YUV420)</div><div class='del'>-	{</div><div class='del'>-		if (width &gt; pdev-&gt;abs_max.x || height &gt; pdev-&gt;abs_max.y)</div><div class='del'>-		{</div><div class='del'>-			PWC_DEBUG_SIZE("VIDEO_PALETTE_RAW: going beyond abs_max.\n");</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		if (width &gt; pdev-&gt;view_max.x || height &gt; pdev-&gt;view_max.y)</div><div class='del'>-		{</div><div class='del'>-			PWC_DEBUG_SIZE("VIDEO_PALETTE_not RAW: going beyond view_max.\n");</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Find the largest size supported by the camera that fits into the</div><div class='del'>-	   requested size.</div><div class='del'>-	 */</div><div class='del'>-	find = -1;</div><div class='add'>+	   requested size. */</div><div class='add'>+	for (i = PSZ_MAX - 1; i &gt;= 0; i--) {</div><div class='add'>+		if (!(pdev-&gt;image_mask &amp; (1 &lt;&lt; i)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (pwc_image_sizes[i][0] &lt;= width &amp;&amp;</div><div class='add'>+		    pwc_image_sizes[i][1] &lt;= height)</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No mode found, return the smallest mode we have */</div><div class='ctx'> 	for (i = 0; i &lt; PSZ_MAX; i++) {</div><div class='del'>-		if (pdev-&gt;image_mask &amp; (1 &lt;&lt; i)) {</div><div class='del'>-			if (pwc_image_sizes[i].x &lt;= width &amp;&amp; pwc_image_sizes[i].y &lt;= height)</div><div class='del'>-				find = i;</div><div class='del'>-		}</div><div class='add'>+		if (pdev-&gt;image_mask &amp; (1 &lt;&lt; i))</div><div class='add'>+			return i;</div><div class='ctx'> 	}</div><div class='del'>-	return find;</div><div class='add'>+</div><div class='add'>+	/* Never reached there always is atleast one supported mode */</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* initialize variables depending on type and decompressor*/</div><div class='add'>+/* initialize variables depending on type and decompressor */</div><div class='ctx'> void pwc_construct(struct pwc_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	if (DEVICE_USE_CODEC1(pdev-&gt;type)) {</div><div class='ctx'> </div><div class='del'>-		pdev-&gt;view_min.x = 128;</div><div class='del'>-		pdev-&gt;view_min.y =  96;</div><div class='del'>-		pdev-&gt;view_max.x = 352;</div><div class='del'>-		pdev-&gt;view_max.y = 288;</div><div class='del'>-		pdev-&gt;abs_max.x  = 352;</div><div class='del'>-		pdev-&gt;abs_max.y  = 288;</div><div class='ctx'> 		pdev-&gt;image_mask = 1 &lt;&lt; PSZ_SQCIF | 1 &lt;&lt; PSZ_QCIF | 1 &lt;&lt; PSZ_CIF;</div><div class='ctx'> 		pdev-&gt;vcinterface = 2;</div><div class='ctx'> 		pdev-&gt;vendpoint = 4;</div><div class='hunk'>@@ -96,13 +76,7 @@ void pwc_construct(struct pwc_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	} else if (DEVICE_USE_CODEC3(pdev-&gt;type)) {</div><div class='ctx'> </div><div class='del'>-		pdev-&gt;view_min.x = 160;</div><div class='del'>-		pdev-&gt;view_min.y = 120;</div><div class='del'>-		pdev-&gt;view_max.x = 640;</div><div class='del'>-		pdev-&gt;view_max.y = 480;</div><div class='ctx'> 		pdev-&gt;image_mask = 1 &lt;&lt; PSZ_QSIF | 1 &lt;&lt; PSZ_SIF | 1 &lt;&lt; PSZ_VGA;</div><div class='del'>-		pdev-&gt;abs_max.x = 640;</div><div class='del'>-		pdev-&gt;abs_max.y = 480;</div><div class='ctx'> 		pdev-&gt;vcinterface = 3;</div><div class='ctx'> 		pdev-&gt;vendpoint = 5;</div><div class='ctx'> 		pdev-&gt;frame_header_size = TOUCAM_HEADER_SIZE;</div><div class='hunk'>@@ -110,20 +84,10 @@ void pwc_construct(struct pwc_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	} else /* if (DEVICE_USE_CODEC2(pdev-&gt;type)) */ {</div><div class='ctx'> </div><div class='del'>-		pdev-&gt;view_min.x = 128;</div><div class='del'>-		pdev-&gt;view_min.y =  96;</div><div class='del'>-		/* Anthill bug #38: PWC always reports max size, even without PWCX */</div><div class='del'>-		pdev-&gt;view_max.x = 640;</div><div class='del'>-		pdev-&gt;view_max.y = 480;</div><div class='ctx'> 		pdev-&gt;image_mask = 1 &lt;&lt; PSZ_SQCIF | 1 &lt;&lt; PSZ_QSIF | 1 &lt;&lt; PSZ_QCIF | 1 &lt;&lt; PSZ_SIF | 1 &lt;&lt; PSZ_CIF | 1 &lt;&lt; PSZ_VGA;</div><div class='del'>-		pdev-&gt;abs_max.x = 640;</div><div class='del'>-		pdev-&gt;abs_max.y = 480;</div><div class='ctx'> 		pdev-&gt;vcinterface = 3;</div><div class='ctx'> 		pdev-&gt;vendpoint = 4;</div><div class='ctx'> 		pdev-&gt;frame_header_size = 0;</div><div class='ctx'> 		pdev-&gt;frame_trailer_size = 0;</div><div class='ctx'> 	}</div><div class='del'>-	pdev-&gt;pixfmt = V4L2_PIX_FMT_YUV420; /* default */</div><div class='del'>-	pdev-&gt;view_min.size = pdev-&gt;view_min.x * pdev-&gt;view_min.y;</div><div class='del'>-	pdev-&gt;view_max.size = pdev-&gt;view_max.x * pdev-&gt;view_max.y;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-timon.h b/drivers/media/video/pwc/pwc-timon.h<br/>index a6e22224c95f..270c5b9010f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-timon.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-timon.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-timon.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/pwc/pwc-timon.h</a></div><div class='hunk'>@@ -42,7 +42,7 @@</div><div class='ctx'> #ifndef PWC_TIMON_H</div><div class='ctx'> #define PWC_TIMON_H</div><div class='ctx'> </div><div class='del'>-#include &lt;media/pwc-ioctl.h&gt;</div><div class='add'>+#include "pwc.h"</div><div class='ctx'> </div><div class='ctx'> #define PWC_FPS_MAX_TIMON 6</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-uncompress.c b/drivers/media/video/pwc/pwc-uncompress.c<br/>index 51265092bd31..b65903fbcf0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-uncompress.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-uncompress.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-uncompress.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/pwc/pwc-uncompress.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> </div><div class='ctx'> int pwc_decompress(struct pwc_device *pdev, struct pwc_frame_buf *fbuf)</div><div class='ctx'> {</div><div class='del'>-	int n, line, col, stride;</div><div class='add'>+	int n, line, col;</div><div class='ctx'> 	void *yuv, *image;</div><div class='ctx'> 	u16 *src;</div><div class='ctx'> 	u16 *dsty, *dstu, *dstv;</div><div class='hunk'>@@ -60,35 +60,23 @@ int pwc_decompress(struct pwc_device *pdev, struct pwc_frame_buf *fbuf)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vb2_set_plane_payload(&amp;fbuf-&gt;vb, 0, pdev-&gt;view.size);</div><div class='add'>+	vb2_set_plane_payload(&amp;fbuf-&gt;vb, 0,</div><div class='add'>+			      pdev-&gt;width * pdev-&gt;height * 3 / 2);</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;vbandlength == 0) {</div><div class='ctx'> 		/* Uncompressed mode.</div><div class='del'>-		 * We copy the data into the output buffer, using the viewport</div><div class='del'>-		 * size (which may be larger than the image size).</div><div class='del'>-		 * Unfortunately we have to do a bit of byte stuffing to get</div><div class='del'>-		 * the desired output format/size.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * We do some byte shuffling here to go from the</div><div class='ctx'> 		 * native format to YUV420P.</div><div class='ctx'> 		 */</div><div class='ctx'> 		src = (u16 *)yuv;</div><div class='del'>-		n = pdev-&gt;view.x * pdev-&gt;view.y;</div><div class='add'>+		n = pdev-&gt;width * pdev-&gt;height;</div><div class='add'>+		dsty = (u16 *)(image);</div><div class='add'>+		dstu = (u16 *)(image + n);</div><div class='add'>+		dstv = (u16 *)(image + n + n / 4);</div><div class='ctx'> </div><div class='del'>-		/* offset in Y plane */</div><div class='del'>-		stride = pdev-&gt;view.x * pdev-&gt;offset.y + pdev-&gt;offset.x;</div><div class='del'>-		dsty = (u16 *)(image + stride);</div><div class='del'>-</div><div class='del'>-		/* offsets in U/V planes */</div><div class='del'>-		stride = pdev-&gt;view.x * pdev-&gt;offset.y / 4 + pdev-&gt;offset.x / 2;</div><div class='del'>-		dstu = (u16 *)(image + n +         stride);</div><div class='del'>-		dstv = (u16 *)(image + n + n / 4 + stride);</div><div class='del'>-</div><div class='del'>-		/* increment after each line */</div><div class='del'>-		stride = (pdev-&gt;view.x - pdev-&gt;image.x) / 2; /* u16 is 2 bytes */</div><div class='del'>-</div><div class='del'>-		for (line = 0; line &lt; pdev-&gt;image.y; line++) {</div><div class='del'>-			for (col = 0; col &lt; pdev-&gt;image.x; col += 4) {</div><div class='add'>+		for (line = 0; line &lt; pdev-&gt;height; line++) {</div><div class='add'>+			for (col = 0; col &lt; pdev-&gt;width; col += 4) {</div><div class='ctx'> 				*dsty++ = *src++;</div><div class='ctx'> 				*dsty++ = *src++;</div><div class='ctx'> 				if (line &amp; 1)</div><div class='hunk'>@@ -96,11 +84,6 @@ int pwc_decompress(struct pwc_device *pdev, struct pwc_frame_buf *fbuf)</div><div class='ctx'> 				else</div><div class='ctx'> 					*dstu++ = *src++;</div><div class='ctx'> 			}</div><div class='del'>-			dsty += stride;</div><div class='del'>-			if (line &amp; 1)</div><div class='del'>-				dstv += (stride &gt;&gt; 1);</div><div class='del'>-			else</div><div class='del'>-				dstu += (stride &gt;&gt; 1);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -111,12 +94,6 @@ int pwc_decompress(struct pwc_device *pdev, struct pwc_frame_buf *fbuf)</div><div class='ctx'> 	 * the decompressor routines will write the data in planar format</div><div class='ctx'> 	 * immediately.</div><div class='ctx'> 	 */</div><div class='del'>-	if (pdev-&gt;vsize == PSZ_VGA &amp;&amp; pdev-&gt;vframes == 5 &amp;&amp; pdev-&gt;vsnapshot) {</div><div class='del'>-		PWC_ERROR("Mode Bayer is not supported for now\n");</div><div class='del'>-		/* flags |= PWCX_FLAG_BAYER; */</div><div class='del'>-		return -ENXIO; /* No such device or address: missing decompressor */</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (DEVICE_USE_CODEC1(pdev-&gt;type)) {</div><div class='ctx'> </div><div class='ctx'> 		/* TODO &amp; FIXME */</div><div class='hunk'>@@ -124,10 +101,7 @@ int pwc_decompress(struct pwc_device *pdev, struct pwc_frame_buf *fbuf)</div><div class='ctx'> 		return -ENXIO; /* No such device or address: missing decompressor */</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='del'>-		pwc_dec23_decompress(pdev, yuv, image, PWCX_FLAG_PLANAR);</div><div class='add'>+		pwc_dec23_decompress(pdev, yuv, image);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* vim: set cino= formatoptions=croql cindent shiftwidth=8 tabstop=8: */</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c<br/>index a10ff6b64acf..f495eeb5403a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-v4l.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc-v4l.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-v4l.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/pwc/pwc-v4l.c</a></div><div class='hunk'>@@ -49,6 +49,7 @@ static const struct v4l2_ctrl_ops pwc_ctrl_ops = {</div><div class='ctx'> </div><div class='ctx'> enum { awb_indoor, awb_outdoor, awb_fl, awb_manual, awb_auto };</div><div class='ctx'> enum { custom_autocontour, custom_contour, custom_noise_reduction,</div><div class='add'>+	custom_awb_speed, custom_awb_delay,</div><div class='ctx'> 	custom_save_user, custom_restore_user, custom_restore_factory };</div><div class='ctx'> </div><div class='ctx'> const char * const pwc_auto_whitebal_qmenu[] = {</div><div class='hunk'>@@ -138,6 +139,26 @@ static const struct v4l2_ctrl_config pwc_restore_factory_cfg = {</div><div class='ctx'> 	.name    = "Restore Factory Settings",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct v4l2_ctrl_config pwc_awb_speed_cfg = {</div><div class='add'>+	.ops	= &amp;pwc_ctrl_ops,</div><div class='add'>+	.id	= PWC_CID_CUSTOM(awb_speed),</div><div class='add'>+	.type	= V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+	.name	= "Auto White Balance Speed",</div><div class='add'>+	.min	= 1,</div><div class='add'>+	.max	= 32,</div><div class='add'>+	.step	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct v4l2_ctrl_config pwc_awb_delay_cfg = {</div><div class='add'>+	.ops	= &amp;pwc_ctrl_ops,</div><div class='add'>+	.id	= PWC_CID_CUSTOM(awb_delay),</div><div class='add'>+	.type	= V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+	.name	= "Auto White Balance Delay",</div><div class='add'>+	.min	= 0,</div><div class='add'>+	.max	= 63,</div><div class='add'>+	.step	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int pwc_init_controls(struct pwc_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct v4l2_ctrl_handler *hdl;</div><div class='hunk'>@@ -338,6 +359,23 @@ int pwc_init_controls(struct pwc_device *pdev)</div><div class='ctx'> 	if (pdev-&gt;restore_factory)</div><div class='ctx'> 		pdev-&gt;restore_factory-&gt;flags |= V4L2_CTRL_FLAG_UPDATE;</div><div class='ctx'> </div><div class='add'>+	/* Auto White Balance speed &amp; delay */</div><div class='add'>+	r = pwc_get_u8_ctrl(pdev, GET_CHROM_CTL,</div><div class='add'>+			    AWB_CONTROL_SPEED_FORMATTER, &amp;def);</div><div class='add'>+	if (r || def &lt; 1 || def &gt; 32)</div><div class='add'>+		def = 1;</div><div class='add'>+	cfg = pwc_awb_speed_cfg;</div><div class='add'>+	cfg.def = def;</div><div class='add'>+	pdev-&gt;awb_speed = v4l2_ctrl_new_custom(hdl, &amp;cfg, NULL);</div><div class='add'>+</div><div class='add'>+	r = pwc_get_u8_ctrl(pdev, GET_CHROM_CTL,</div><div class='add'>+			    AWB_CONTROL_DELAY_FORMATTER, &amp;def);</div><div class='add'>+	if (r || def &gt; 63)</div><div class='add'>+		def = 0;</div><div class='add'>+	cfg = pwc_awb_delay_cfg;</div><div class='add'>+	cfg.def = def;</div><div class='add'>+	pdev-&gt;awb_delay = v4l2_ctrl_new_custom(hdl, &amp;cfg, NULL);</div><div class='add'>+</div><div class='ctx'> 	if (!(pdev-&gt;features &amp; FEATURE_MOTOR_PANTILT))</div><div class='ctx'> 		return hdl-&gt;error;</div><div class='ctx'> </div><div class='hunk'>@@ -357,25 +395,16 @@ int pwc_init_controls(struct pwc_device *pdev)</div><div class='ctx'> 	return hdl-&gt;error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pwc_vidioc_fill_fmt(const struct pwc_device *pdev, struct v4l2_format *f)</div><div class='add'>+static void pwc_vidioc_fill_fmt(struct v4l2_format *f,</div><div class='add'>+	int width, int height, u32 pixfmt)</div><div class='ctx'> {</div><div class='ctx'> 	memset(&amp;f-&gt;fmt.pix, 0, sizeof(struct v4l2_pix_format));</div><div class='del'>-	f-&gt;fmt.pix.width        = pdev-&gt;view.x;</div><div class='del'>-	f-&gt;fmt.pix.height       = pdev-&gt;view.y;</div><div class='add'>+	f-&gt;fmt.pix.width        = width;</div><div class='add'>+	f-&gt;fmt.pix.height       = height;</div><div class='ctx'> 	f-&gt;fmt.pix.field        = V4L2_FIELD_NONE;</div><div class='del'>-	if (pdev-&gt;pixfmt == V4L2_PIX_FMT_YUV420) {</div><div class='del'>-		f-&gt;fmt.pix.pixelformat  = V4L2_PIX_FMT_YUV420;</div><div class='del'>-		f-&gt;fmt.pix.bytesperline = (f-&gt;fmt.pix.width * 3)/2;</div><div class='del'>-		f-&gt;fmt.pix.sizeimage = f-&gt;fmt.pix.height * f-&gt;fmt.pix.bytesperline;</div><div class='del'>-	} else {</div><div class='del'>-		/* vbandlength contains 4 lines ...  */</div><div class='del'>-		f-&gt;fmt.pix.bytesperline = pdev-&gt;vbandlength/4;</div><div class='del'>-		f-&gt;fmt.pix.sizeimage = pdev-&gt;frame_size + sizeof(struct pwc_raw_frame);</div><div class='del'>-		if (DEVICE_USE_CODEC1(pdev-&gt;type))</div><div class='del'>-			f-&gt;fmt.pix.pixelformat  = V4L2_PIX_FMT_PWC1;</div><div class='del'>-		else</div><div class='del'>-			f-&gt;fmt.pix.pixelformat  = V4L2_PIX_FMT_PWC2;</div><div class='del'>-	}</div><div class='add'>+	f-&gt;fmt.pix.pixelformat  = pixfmt;</div><div class='add'>+	f-&gt;fmt.pix.bytesperline = f-&gt;fmt.pix.width;</div><div class='add'>+	f-&gt;fmt.pix.sizeimage	= f-&gt;fmt.pix.height * f-&gt;fmt.pix.width * 3 / 2;</div><div class='ctx'> 	PWC_DEBUG_IOCTL("pwc_vidioc_fill_fmt() "</div><div class='ctx'> 			"width=%d, height=%d, bytesperline=%d, sizeimage=%d, pixelformat=%c%c%c%c\n",</div><div class='ctx'> 			f-&gt;fmt.pix.width,</div><div class='hunk'>@@ -391,6 +420,8 @@ static void pwc_vidioc_fill_fmt(const struct pwc_device *pdev, struct v4l2_forma</div><div class='ctx'> /* ioctl(VIDIOC_TRY_FMT) */</div><div class='ctx'> static int pwc_vidioc_try_fmt(struct pwc_device *pdev, struct v4l2_format *f)</div><div class='ctx'> {</div><div class='add'>+	int size;</div><div class='add'>+</div><div class='ctx'> 	if (f-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='ctx'> 		PWC_DEBUG_IOCTL("Bad video type must be V4L2_BUF_TYPE_VIDEO_CAPTURE\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -417,15 +448,11 @@ static int pwc_vidioc_try_fmt(struct pwc_device *pdev, struct v4l2_format *f)</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (f-&gt;fmt.pix.width &gt; pdev-&gt;view_max.x)</div><div class='del'>-		f-&gt;fmt.pix.width = pdev-&gt;view_max.x;</div><div class='del'>-	else if (f-&gt;fmt.pix.width &lt; pdev-&gt;view_min.x)</div><div class='del'>-		f-&gt;fmt.pix.width = pdev-&gt;view_min.x;</div><div class='del'>-</div><div class='del'>-	if (f-&gt;fmt.pix.height &gt; pdev-&gt;view_max.y)</div><div class='del'>-		f-&gt;fmt.pix.height = pdev-&gt;view_max.y;</div><div class='del'>-	else if (f-&gt;fmt.pix.height &lt; pdev-&gt;view_min.y)</div><div class='del'>-		f-&gt;fmt.pix.height = pdev-&gt;view_min.y;</div><div class='add'>+	size = pwc_get_size(pdev, f-&gt;fmt.pix.width, f-&gt;fmt.pix.height);</div><div class='add'>+	pwc_vidioc_fill_fmt(f,</div><div class='add'>+			    pwc_image_sizes[size][0],</div><div class='add'>+			    pwc_image_sizes[size][1],</div><div class='add'>+			    f-&gt;fmt.pix.pixelformat);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -435,68 +462,45 @@ static int pwc_vidioc_try_fmt(struct pwc_device *pdev, struct v4l2_format *f)</div><div class='ctx'> static int pwc_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f)</div><div class='ctx'> {</div><div class='ctx'> 	struct pwc_device *pdev = video_drvdata(file);</div><div class='del'>-	int ret, fps, snapshot, compression, pixelformat;</div><div class='del'>-</div><div class='del'>-	if (!pdev-&gt;udev)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	int ret, pixelformat, compression = 0;</div><div class='ctx'> </div><div class='del'>-	if (pdev-&gt;capt_file != NULL &amp;&amp;</div><div class='del'>-	    pdev-&gt;capt_file != file)</div><div class='add'>+	if (pwc_test_n_set_capt_file(pdev, file))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	pdev-&gt;capt_file = file;</div><div class='del'>-</div><div class='ctx'> 	ret = pwc_vidioc_try_fmt(pdev, f);</div><div class='del'>-	if (ret&lt;0)</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	pixelformat = f-&gt;fmt.pix.pixelformat;</div><div class='del'>-	compression = pdev-&gt;vcompression;</div><div class='del'>-	snapshot = 0;</div><div class='del'>-	fps = pdev-&gt;vframes;</div><div class='del'>-	if (f-&gt;fmt.pix.priv) {</div><div class='del'>-		compression = (f-&gt;fmt.pix.priv &amp; PWC_QLT_MASK) &gt;&gt; PWC_QLT_SHIFT;</div><div class='del'>-		snapshot = !!(f-&gt;fmt.pix.priv &amp; PWC_FPS_SNAPSHOT);</div><div class='del'>-		fps = (f-&gt;fmt.pix.priv &amp; PWC_FPS_FRMASK) &gt;&gt; PWC_FPS_SHIFT;</div><div class='del'>-		if (fps == 0)</div><div class='del'>-			fps = pdev-&gt;vframes;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (pixelformat != V4L2_PIX_FMT_YUV420 &amp;&amp;</div><div class='del'>-	    pixelformat != V4L2_PIX_FMT_PWC1 &amp;&amp;</div><div class='del'>-	    pixelformat != V4L2_PIX_FMT_PWC2)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	mutex_lock(&amp;pdev-&gt;udevlock);</div><div class='add'>+	if (!pdev-&gt;udev) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto leave;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (vb2_is_streaming(&amp;pdev-&gt;vb_queue))</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	if (pdev-&gt;iso_init) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto leave;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	PWC_DEBUG_IOCTL("Trying to set format to: width=%d height=%d fps=%d "</div><div class='del'>-			"compression=%d snapshot=%d format=%c%c%c%c\n",</div><div class='del'>-			f-&gt;fmt.pix.width, f-&gt;fmt.pix.height, fps,</div><div class='del'>-			compression, snapshot,</div><div class='add'>+			"format=%c%c%c%c\n",</div><div class='add'>+			f-&gt;fmt.pix.width, f-&gt;fmt.pix.height, pdev-&gt;vframes,</div><div class='ctx'> 			(pixelformat)&amp;255,</div><div class='ctx'> 			(pixelformat&gt;&gt;8)&amp;255,</div><div class='ctx'> 			(pixelformat&gt;&gt;16)&amp;255,</div><div class='ctx'> 			(pixelformat&gt;&gt;24)&amp;255);</div><div class='ctx'> </div><div class='del'>-	ret = pwc_set_video_mode(pdev,</div><div class='del'>-				 f-&gt;fmt.pix.width,</div><div class='del'>-				 f-&gt;fmt.pix.height,</div><div class='del'>-				 fps,</div><div class='del'>-				 compression,</div><div class='del'>-				 snapshot);</div><div class='add'>+	ret = pwc_set_video_mode(pdev, f-&gt;fmt.pix.width, f-&gt;fmt.pix.height,</div><div class='add'>+				 pixelformat, 30, &amp;compression, 0);</div><div class='ctx'> </div><div class='ctx'> 	PWC_DEBUG_IOCTL("pwc_set_video_mode(), return=%d\n", ret);</div><div class='ctx'> </div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	pdev-&gt;pixfmt = pixelformat;</div><div class='del'>-</div><div class='del'>-	pwc_vidioc_fill_fmt(pdev, f);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='add'>+	pwc_vidioc_fill_fmt(f, pdev-&gt;width, pdev-&gt;height, pdev-&gt;pixfmt);</div><div class='add'>+leave:</div><div class='add'>+	mutex_unlock(&amp;pdev-&gt;udevlock);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pwc_querycap(struct file *file, void *fh, struct v4l2_capability *cap)</div><div class='hunk'>@@ -536,30 +540,14 @@ static int pwc_s_input(struct file *file, void *fh, unsigned int i)</div><div class='ctx'> 	return i ? -EINVAL : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pwc_g_volatile_ctrl(struct v4l2_ctrl *ctrl)</div><div class='add'>+static int pwc_g_volatile_ctrl_unlocked(struct v4l2_ctrl *ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	struct pwc_device *pdev =</div><div class='ctx'> 		container_of(ctrl-&gt;handler, struct pwc_device, ctrl_handler);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Sometimes it can take quite long for the pwc to complete usb control</div><div class='del'>-	 * transfers, so release the modlock to give streaming by another</div><div class='del'>-	 * process / thread the chance to continue with a dqbuf.</div><div class='del'>-	 */</div><div class='del'>-	mutex_unlock(&amp;pdev-&gt;modlock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Take the udev-lock to protect against the disconnect handler</div><div class='del'>-	 * completing and setting dev-&gt;udev to NULL underneath us. Other code</div><div class='del'>-	 * does not need to do this since it is protected by the modlock.</div><div class='del'>-	 */</div><div class='del'>-	mutex_lock(&amp;pdev-&gt;udevlock);</div><div class='del'>-</div><div class='del'>-	if (!pdev-&gt;udev) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto leave;</div><div class='del'>-	}</div><div class='add'>+	if (!pdev-&gt;udev)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_AUTO_WHITE_BALANCE:</div><div class='hunk'>@@ -624,9 +612,18 @@ static int pwc_g_volatile_ctrl(struct v4l2_ctrl *ctrl)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		PWC_ERROR("g_ctrl %s error %d\n", ctrl-&gt;name, ret);</div><div class='ctx'> </div><div class='del'>-leave:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pwc_g_volatile_ctrl(struct v4l2_ctrl *ctrl)</div><div class='add'>+{</div><div class='add'>+	struct pwc_device *pdev =</div><div class='add'>+		container_of(ctrl-&gt;handler, struct pwc_device, ctrl_handler);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pdev-&gt;udevlock);</div><div class='add'>+	ret = pwc_g_volatile_ctrl_unlocked(ctrl);</div><div class='ctx'> 	mutex_unlock(&amp;pdev-&gt;udevlock);</div><div class='del'>-	mutex_lock(&amp;pdev-&gt;modlock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -643,6 +640,15 @@ static int pwc_set_awb(struct pwc_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 		if (pdev-&gt;auto_white_balance-&gt;val != awb_manual)</div><div class='ctx'> 			pdev-&gt;color_bal_valid = false; /* Force cache update */</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If this is a preset, update our red / blue balance values</div><div class='add'>+		 * so that events get generated for the new preset values</div><div class='add'>+		 */</div><div class='add'>+		if (pdev-&gt;auto_white_balance-&gt;val == awb_indoor ||</div><div class='add'>+		    pdev-&gt;auto_white_balance-&gt;val == awb_outdoor ||</div><div class='add'>+		    pdev-&gt;auto_white_balance-&gt;val == awb_fl)</div><div class='add'>+			pwc_g_volatile_ctrl_unlocked(pdev-&gt;auto_white_balance);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pdev-&gt;auto_white_balance-&gt;val != awb_manual)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -766,33 +772,33 @@ static int pwc_set_autogain_expo(struct pwc_device *pdev)</div><div class='ctx'> static int pwc_set_motor(struct pwc_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 buf[4];</div><div class='ctx'> </div><div class='del'>-	buf[0] = 0;</div><div class='add'>+	pdev-&gt;ctrl_buf[0] = 0;</div><div class='ctx'> 	if (pdev-&gt;motor_pan_reset-&gt;is_new)</div><div class='del'>-		buf[0] |= 0x01;</div><div class='add'>+		pdev-&gt;ctrl_buf[0] |= 0x01;</div><div class='ctx'> 	if (pdev-&gt;motor_tilt_reset-&gt;is_new)</div><div class='del'>-		buf[0] |= 0x02;</div><div class='add'>+		pdev-&gt;ctrl_buf[0] |= 0x02;</div><div class='ctx'> 	if (pdev-&gt;motor_pan_reset-&gt;is_new || pdev-&gt;motor_tilt_reset-&gt;is_new) {</div><div class='ctx'> 		ret = send_control_msg(pdev, SET_MPT_CTL,</div><div class='del'>-				       PT_RESET_CONTROL_FORMATTER, buf, 1);</div><div class='add'>+				       PT_RESET_CONTROL_FORMATTER,</div><div class='add'>+				       pdev-&gt;ctrl_buf, 1);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(buf, 0, sizeof(buf));</div><div class='add'>+	memset(pdev-&gt;ctrl_buf, 0, 4);</div><div class='ctx'> 	if (pdev-&gt;motor_pan-&gt;is_new) {</div><div class='del'>-		buf[0] = pdev-&gt;motor_pan-&gt;val &amp; 0xFF;</div><div class='del'>-		buf[1] = (pdev-&gt;motor_pan-&gt;val &gt;&gt; 8);</div><div class='add'>+		pdev-&gt;ctrl_buf[0] = pdev-&gt;motor_pan-&gt;val &amp; 0xFF;</div><div class='add'>+		pdev-&gt;ctrl_buf[1] = (pdev-&gt;motor_pan-&gt;val &gt;&gt; 8);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pdev-&gt;motor_tilt-&gt;is_new) {</div><div class='del'>-		buf[2] = pdev-&gt;motor_tilt-&gt;val &amp; 0xFF;</div><div class='del'>-		buf[3] = (pdev-&gt;motor_tilt-&gt;val &gt;&gt; 8);</div><div class='add'>+		pdev-&gt;ctrl_buf[2] = pdev-&gt;motor_tilt-&gt;val &amp; 0xFF;</div><div class='add'>+		pdev-&gt;ctrl_buf[3] = (pdev-&gt;motor_tilt-&gt;val &gt;&gt; 8);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pdev-&gt;motor_pan-&gt;is_new || pdev-&gt;motor_tilt-&gt;is_new) {</div><div class='ctx'> 		ret = send_control_msg(pdev, SET_MPT_CTL,</div><div class='ctx'> 				       PT_RELATIVE_CONTROL_FORMATTER,</div><div class='del'>-				       buf, sizeof(buf));</div><div class='add'>+				       pdev-&gt;ctrl_buf, 4);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -806,8 +812,6 @@ static int pwc_s_ctrl(struct v4l2_ctrl *ctrl)</div><div class='ctx'> 		container_of(ctrl-&gt;handler, struct pwc_device, ctrl_handler);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	/* See the comments on locking in pwc_g_volatile_ctrl */</div><div class='del'>-	mutex_unlock(&amp;pdev-&gt;modlock);</div><div class='ctx'> 	mutex_lock(&amp;pdev-&gt;udevlock);</div><div class='ctx'> </div><div class='ctx'> 	if (!pdev-&gt;udev) {</div><div class='hunk'>@@ -891,6 +895,16 @@ static int pwc_s_ctrl(struct v4l2_ctrl *ctrl)</div><div class='ctx'> 		ret = pwc_button_ctrl(pdev,</div><div class='ctx'> 				      RESTORE_FACTORY_DEFAULTS_FORMATTER);</div><div class='ctx'> 		break;</div><div class='add'>+	case PWC_CID_CUSTOM(awb_speed):</div><div class='add'>+		ret = pwc_set_u8_ctrl(pdev, SET_CHROM_CTL,</div><div class='add'>+				      AWB_CONTROL_SPEED_FORMATTER,</div><div class='add'>+				      ctrl-&gt;val);</div><div class='add'>+		break;</div><div class='add'>+	case PWC_CID_CUSTOM(awb_delay):</div><div class='add'>+		ret = pwc_set_u8_ctrl(pdev, SET_CHROM_CTL,</div><div class='add'>+				      AWB_CONTROL_DELAY_FORMATTER,</div><div class='add'>+				      ctrl-&gt;val);</div><div class='add'>+		break;</div><div class='ctx'> 	case V4L2_CID_PAN_RELATIVE:</div><div class='ctx'> 		ret = pwc_set_motor(pdev);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -903,7 +917,6 @@ static int pwc_s_ctrl(struct v4l2_ctrl *ctrl)</div><div class='ctx'> </div><div class='ctx'> leave:</div><div class='ctx'> 	mutex_unlock(&amp;pdev-&gt;udevlock);</div><div class='del'>-	mutex_lock(&amp;pdev-&gt;modlock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -933,9 +946,14 @@ static int pwc_g_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f)</div><div class='ctx'> {</div><div class='ctx'> 	struct pwc_device *pdev = video_drvdata(file);</div><div class='ctx'> </div><div class='add'>+	if (f-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pdev-&gt;udevlock); /* To avoid race with s_fmt */</div><div class='ctx'> 	PWC_DEBUG_IOCTL("ioctl(VIDIOC_G_FMT) return size %dx%d\n",</div><div class='del'>-			pdev-&gt;image.x, pdev-&gt;image.y);</div><div class='del'>-	pwc_vidioc_fill_fmt(pdev, f);</div><div class='add'>+			pdev-&gt;width, pdev-&gt;height);</div><div class='add'>+	pwc_vidioc_fill_fmt(f, pdev-&gt;width, pdev-&gt;height, pdev-&gt;pixfmt);</div><div class='add'>+	mutex_unlock(&amp;pdev-&gt;udevlock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -951,12 +969,9 @@ static int pwc_reqbufs(struct file *file, void *fh,</div><div class='ctx'> {</div><div class='ctx'> 	struct pwc_device *pdev = video_drvdata(file);</div><div class='ctx'> </div><div class='del'>-	if (pdev-&gt;capt_file != NULL &amp;&amp;</div><div class='del'>-	    pdev-&gt;capt_file != file)</div><div class='add'>+	if (pwc_test_n_set_capt_file(pdev, file))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	pdev-&gt;capt_file = file;</div><div class='del'>-</div><div class='ctx'> 	return vb2_reqbufs(&amp;pdev-&gt;vb_queue, rb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1025,25 +1040,21 @@ static int pwc_enum_framesizes(struct file *file, void *fh,</div><div class='ctx'> 	struct pwc_device *pdev = video_drvdata(file);</div><div class='ctx'> 	unsigned int i = 0, index = fsize-&gt;index;</div><div class='ctx'> </div><div class='del'>-	if (fsize-&gt;pixel_format == V4L2_PIX_FMT_YUV420) {</div><div class='add'>+	if (fsize-&gt;pixel_format == V4L2_PIX_FMT_YUV420 ||</div><div class='add'>+	    (fsize-&gt;pixel_format == V4L2_PIX_FMT_PWC1 &amp;&amp;</div><div class='add'>+			DEVICE_USE_CODEC1(pdev-&gt;type)) ||</div><div class='add'>+	    (fsize-&gt;pixel_format == V4L2_PIX_FMT_PWC2 &amp;&amp;</div><div class='add'>+			DEVICE_USE_CODEC23(pdev-&gt;type))) {</div><div class='ctx'> 		for (i = 0; i &lt; PSZ_MAX; i++) {</div><div class='del'>-			if (pdev-&gt;image_mask &amp; (1UL &lt;&lt; i)) {</div><div class='del'>-				if (!index--) {</div><div class='del'>-					fsize-&gt;type = V4L2_FRMSIZE_TYPE_DISCRETE;</div><div class='del'>-					fsize-&gt;discrete.width = pwc_image_sizes[i].x;</div><div class='del'>-					fsize-&gt;discrete.height = pwc_image_sizes[i].y;</div><div class='del'>-					return 0;</div><div class='del'>-				}</div><div class='add'>+			if (!(pdev-&gt;image_mask &amp; (1UL &lt;&lt; i)))</div><div class='add'>+				continue;</div><div class='add'>+			if (!index--) {</div><div class='add'>+				fsize-&gt;type = V4L2_FRMSIZE_TYPE_DISCRETE;</div><div class='add'>+				fsize-&gt;discrete.width = pwc_image_sizes[i][0];</div><div class='add'>+				fsize-&gt;discrete.height = pwc_image_sizes[i][1];</div><div class='add'>+				return 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	} else if (fsize-&gt;index == 0 &amp;&amp;</div><div class='del'>-			((fsize-&gt;pixel_format == V4L2_PIX_FMT_PWC1 &amp;&amp; DEVICE_USE_CODEC1(pdev-&gt;type)) ||</div><div class='del'>-			 (fsize-&gt;pixel_format == V4L2_PIX_FMT_PWC2 &amp;&amp; DEVICE_USE_CODEC23(pdev-&gt;type)))) {</div><div class='del'>-</div><div class='del'>-		fsize-&gt;type = V4L2_FRMSIZE_TYPE_DISCRETE;</div><div class='del'>-		fsize-&gt;discrete.width = pdev-&gt;abs_max.x;</div><div class='del'>-		fsize-&gt;discrete.height = pdev-&gt;abs_max.y;</div><div class='del'>-		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='hunk'>@@ -1056,8 +1067,8 @@ static int pwc_enum_frameintervals(struct file *file, void *fh,</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; PSZ_MAX; i++) {</div><div class='del'>-		if (pwc_image_sizes[i].x == fival-&gt;width &amp;&amp;</div><div class='del'>-				pwc_image_sizes[i].y == fival-&gt;height) {</div><div class='add'>+		if (pwc_image_sizes[i][0] == fival-&gt;width &amp;&amp;</div><div class='add'>+				pwc_image_sizes[i][1] == fival-&gt;height) {</div><div class='ctx'> 			size = i;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1078,20 +1089,69 @@ static int pwc_enum_frameintervals(struct file *file, void *fh,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pwc_log_status(struct file *file, void *priv)</div><div class='add'>+static int pwc_g_parm(struct file *file, void *fh,</div><div class='add'>+		      struct v4l2_streamparm *parm)</div><div class='ctx'> {</div><div class='ctx'> 	struct pwc_device *pdev = video_drvdata(file);</div><div class='ctx'> </div><div class='del'>-	v4l2_ctrl_handler_log_status(&amp;pdev-&gt;ctrl_handler, PWC_NAME);</div><div class='add'>+	if (parm-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(parm, 0, sizeof(*parm));</div><div class='add'>+</div><div class='add'>+	parm-&gt;type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='add'>+	parm-&gt;parm.capture.readbuffers = MIN_FRAMES;</div><div class='add'>+	parm-&gt;parm.capture.capability |= V4L2_CAP_TIMEPERFRAME;</div><div class='add'>+	parm-&gt;parm.capture.timeperframe.denominator = pdev-&gt;vframes;</div><div class='add'>+	parm-&gt;parm.capture.timeperframe.numerator = 1;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long pwc_default(struct file *file, void *fh, bool valid_prio,</div><div class='del'>-			int cmd, void *arg)</div><div class='add'>+static int pwc_s_parm(struct file *file, void *fh,</div><div class='add'>+		      struct v4l2_streamparm *parm)</div><div class='ctx'> {</div><div class='ctx'> 	struct pwc_device *pdev = video_drvdata(file);</div><div class='add'>+	int compression = 0;</div><div class='add'>+	int ret, fps;</div><div class='ctx'> </div><div class='del'>-	return pwc_ioctl(pdev, cmd, arg);</div><div class='add'>+	if (parm-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||</div><div class='add'>+	    parm-&gt;parm.capture.timeperframe.numerator == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (pwc_test_n_set_capt_file(pdev, file))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	fps = parm-&gt;parm.capture.timeperframe.denominator /</div><div class='add'>+	      parm-&gt;parm.capture.timeperframe.numerator;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pdev-&gt;udevlock);</div><div class='add'>+	if (!pdev-&gt;udev) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto leave;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;iso_init) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto leave;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = pwc_set_video_mode(pdev, pdev-&gt;width, pdev-&gt;height, pdev-&gt;pixfmt,</div><div class='add'>+				 fps, &amp;compression, 0);</div><div class='add'>+</div><div class='add'>+	pwc_g_parm(file, fh, parm);</div><div class='add'>+</div><div class='add'>+leave:</div><div class='add'>+	mutex_unlock(&amp;pdev-&gt;udevlock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pwc_log_status(struct file *file, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct pwc_device *pdev = video_drvdata(file);</div><div class='add'>+</div><div class='add'>+	v4l2_ctrl_handler_log_status(&amp;pdev-&gt;ctrl_handler, PWC_NAME);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct v4l2_ioctl_ops pwc_ioctl_ops = {</div><div class='hunk'>@@ -1112,8 +1172,6 @@ const struct v4l2_ioctl_ops pwc_ioctl_ops = {</div><div class='ctx'> 	.vidioc_log_status		    = pwc_log_status,</div><div class='ctx'> 	.vidioc_enum_framesizes		    = pwc_enum_framesizes,</div><div class='ctx'> 	.vidioc_enum_frameintervals	    = pwc_enum_frameintervals,</div><div class='del'>-	.vidioc_default		    = pwc_default,</div><div class='add'>+	.vidioc_g_parm			    = pwc_g_parm,</div><div class='add'>+	.vidioc_s_parm			    = pwc_s_parm,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* vim: set cino= formatoptions=croql cindent shiftwidth=8 tabstop=8: */</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h<br/>index 0e4e2d7b7872..e4d4d711dd1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pwc/pwc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/pwc/pwc.h</a></div><div class='hunk'>@@ -35,14 +35,17 @@</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/v4l2-device.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-ioctl.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-ctrls.h&gt;</div><div class='add'>+#include &lt;media/v4l2-fh.h&gt;</div><div class='add'>+#include &lt;media/v4l2-event.h&gt;</div><div class='ctx'> #include &lt;media/videobuf2-vmalloc.h&gt;</div><div class='ctx'> #ifdef CONFIG_USB_PWC_INPUT_EVDEV</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-#include &lt;media/pwc-ioctl.h&gt;</div><div class='add'>+#include "pwc-dec1.h"</div><div class='add'>+#include "pwc-dec23.h"</div><div class='ctx'> </div><div class='ctx'> /* Version block */</div><div class='ctx'> #define PWC_VERSION	"10.0.15"</div><div class='hunk'>@@ -106,6 +109,9 @@</div><div class='ctx'> #define FEATURE_CODEC1			0x0002</div><div class='ctx'> #define FEATURE_CODEC2			0x0004</div><div class='ctx'> </div><div class='add'>+#define MAX_WIDTH		640</div><div class='add'>+#define MAX_HEIGHT		480</div><div class='add'>+</div><div class='ctx'> /* Ignore errors in the first N frames, to allow for startup delays */</div><div class='ctx'> #define FRAME_LOWMARK 5</div><div class='ctx'> </div><div class='hunk'>@@ -128,9 +134,6 @@</div><div class='ctx'> #define DEVICE_USE_CODEC3(x) ((x)&gt;=700)</div><div class='ctx'> #define DEVICE_USE_CODEC23(x) ((x)&gt;=675)</div><div class='ctx'> </div><div class='del'>-/* from pwc-dec.h */</div><div class='del'>-#define PWCX_FLAG_PLANAR        0x0001</div><div class='del'>-</div><div class='ctx'> /* Request types: video */</div><div class='ctx'> #define SET_LUM_CTL			0x01</div><div class='ctx'> #define GET_LUM_CTL			0x02</div><div class='hunk'>@@ -186,6 +189,24 @@</div><div class='ctx'> #define PT_RESET_CONTROL_FORMATTER		0x02</div><div class='ctx'> #define PT_STATUS_FORMATTER			0x03</div><div class='ctx'> </div><div class='add'>+/* Enumeration of image sizes */</div><div class='add'>+#define PSZ_SQCIF	0x00</div><div class='add'>+#define PSZ_QSIF	0x01</div><div class='add'>+#define PSZ_QCIF	0x02</div><div class='add'>+#define PSZ_SIF		0x03</div><div class='add'>+#define PSZ_CIF		0x04</div><div class='add'>+#define PSZ_VGA		0x05</div><div class='add'>+#define PSZ_MAX		6</div><div class='add'>+</div><div class='add'>+struct pwc_raw_frame {</div><div class='add'>+	__le16 type;		/* type of the webcam */</div><div class='add'>+	__le16 vbandlength;	/* Size of 4 lines compressed (used by the</div><div class='add'>+				   decompressor) */</div><div class='add'>+	__u8   cmd[4];		/* the four byte of the command (in case of</div><div class='add'>+				   nala, only the first 3 bytes is filled) */</div><div class='add'>+	__u8   rawframe[0];	/* frame_size = H / 4 * vbandlength */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> /* intermediate buffers with raw data from the USB cam */</div><div class='ctx'> struct pwc_frame_buf</div><div class='ctx'> {</div><div class='hunk'>@@ -198,39 +219,36 @@ struct pwc_frame_buf</div><div class='ctx'> struct pwc_device</div><div class='ctx'> {</div><div class='ctx'> 	struct video_device vdev;</div><div class='del'>-	struct mutex modlock;</div><div class='add'>+	struct v4l2_device v4l2_dev;</div><div class='ctx'> </div><div class='ctx'> 	/* Pointer to our usb_device, may be NULL after unplug */</div><div class='ctx'> 	struct usb_device *udev;</div><div class='del'>-	/* Protects the setting of udev to NULL by our disconnect handler */</div><div class='ctx'> 	struct mutex udevlock;</div><div class='ctx'> </div><div class='ctx'> 	/* type of cam (645, 646, 675, 680, 690, 720, 730, 740, 750) */</div><div class='ctx'> 	int type;</div><div class='ctx'> 	int release;		/* release number */</div><div class='ctx'> 	int features;		/* feature bits */</div><div class='del'>-	char serial[30];	/* serial number (string) */</div><div class='ctx'> </div><div class='ctx'> 	/*** Video data ***/</div><div class='ctx'> 	struct file *capt_file;	/* file doing video capture */</div><div class='add'>+	struct mutex capt_file_lock;</div><div class='ctx'> 	int vendpoint;		/* video isoc endpoint */</div><div class='ctx'> 	int vcinterface;	/* video control interface */</div><div class='ctx'> 	int valternate;		/* alternate interface needed */</div><div class='del'>-	int vframes, vsize;	/* frames-per-second &amp; size (see PSZ_*) */</div><div class='add'>+	int vframes;		/* frames-per-second */</div><div class='ctx'> 	int pixfmt;		/* pixelformat: V4L2_PIX_FMT_YUV420 or _PWCX */</div><div class='ctx'> 	int vframe_count;	/* received frames */</div><div class='ctx'> 	int vmax_packet_size;	/* USB maxpacket size */</div><div class='ctx'> 	int vlast_packet_size;	/* for frame synchronisation */</div><div class='ctx'> 	int visoc_errors;	/* number of contiguous ISOC errors */</div><div class='del'>-	int vcompression;	/* desired compression factor */</div><div class='ctx'> 	int vbandlength;	/* compressed band length; 0 is uncompressed */</div><div class='del'>-	char vsnapshot;		/* snapshot mode */</div><div class='ctx'> 	char vsync;		/* used by isoc handler */</div><div class='ctx'> 	char vmirror;		/* for ToUCaM series */</div><div class='ctx'> 	char power_save;	/* Do powersaving for this cam */</div><div class='ctx'> </div><div class='del'>-	int cmd_len;</div><div class='ctx'> 	unsigned char cmd_buf[13];</div><div class='add'>+	unsigned char *ctrl_buf;</div><div class='ctx'> </div><div class='ctx'> 	struct urb *urbs[MAX_ISO_BUFS];</div><div class='ctx'> 	char iso_init;</div><div class='hunk'>@@ -253,7 +271,10 @@ struct pwc_device</div><div class='ctx'> 	int frame_total_size;	/* including header &amp; trailer */</div><div class='ctx'> 	int drop_frames;</div><div class='ctx'> </div><div class='del'>-	void *decompress_data;	/* private data for decompression engine */</div><div class='add'>+	union {	/* private data for decompression engine */</div><div class='add'>+		struct pwc_dec1_private dec1;</div><div class='add'>+		struct pwc_dec23_private dec23;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have an 'image' and a 'view', where 'image' is the fixed-size img</div><div class='hunk'>@@ -262,21 +283,8 @@ struct pwc_device</div><div class='ctx'> 	 * a gray or black border. view_min &lt;= image &lt;= view &lt;= view_max;</div><div class='ctx'> 	 */</div><div class='ctx'> 	int image_mask;				/* supported sizes */</div><div class='del'>-	struct pwc_coord view_min, view_max;	/* minimum and maximum view */</div><div class='del'>-	struct pwc_coord abs_max;		/* maximum supported size */</div><div class='del'>-	struct pwc_coord image, view;		/* image and viewport size */</div><div class='del'>-	struct pwc_coord offset;		/* offset of the viewport */</div><div class='add'>+	int width, height;			/* current resolution */</div><div class='ctx'> </div><div class='del'>-	/*** motorized pan/tilt feature */</div><div class='del'>-	struct pwc_mpt_range angle_range;</div><div class='del'>-	int pan_angle;			/* in degrees * 100 */</div><div class='del'>-	int tilt_angle;			/* absolute angle; 0,0 is home */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set to 1 when the user push the button, reset to 0</div><div class='del'>-	 * when this value is read from sysfs.</div><div class='del'>-	 */</div><div class='del'>-	int snapshot_button_status;</div><div class='ctx'> #ifdef CONFIG_USB_PWC_INPUT_EVDEV</div><div class='ctx'> 	struct input_dev *button_dev;	/* webcam snapshot button input */</div><div class='ctx'> 	char button_phys[64];</div><div class='hunk'>@@ -328,6 +336,8 @@ struct pwc_device</div><div class='ctx'> 	struct v4l2_ctrl		*save_user;</div><div class='ctx'> 	struct v4l2_ctrl		*restore_user;</div><div class='ctx'> 	struct v4l2_ctrl		*restore_factory;</div><div class='add'>+	struct v4l2_ctrl		*awb_speed;</div><div class='add'>+	struct v4l2_ctrl		*awb_delay;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		/* motor control cluster */</div><div class='ctx'> 		struct v4l2_ctrl	*motor_pan;</div><div class='hunk'>@@ -344,19 +354,20 @@ struct pwc_device</div><div class='ctx'> extern int pwc_trace;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+int pwc_test_n_set_capt_file(struct pwc_device *pdev, struct file *file);</div><div class='add'>+</div><div class='ctx'> /** Functions in pwc-misc.c */</div><div class='ctx'> /* sizes in pixels */</div><div class='del'>-extern const struct pwc_coord pwc_image_sizes[PSZ_MAX];</div><div class='add'>+extern const int pwc_image_sizes[PSZ_MAX][2];</div><div class='ctx'> </div><div class='del'>-int pwc_decode_size(struct pwc_device *pdev, int width, int height);</div><div class='add'>+int pwc_get_size(struct pwc_device *pdev, int width, int height);</div><div class='ctx'> void pwc_construct(struct pwc_device *pdev);</div><div class='ctx'> </div><div class='ctx'> /** Functions in pwc-ctrl.c */</div><div class='ctx'> /* Request a certain video mode. Returns &lt; 0 if not possible */</div><div class='del'>-extern int pwc_set_video_mode(struct pwc_device *pdev, int width, int height, int frames, int compression, int snapshot);</div><div class='add'>+extern int pwc_set_video_mode(struct pwc_device *pdev, int width, int height,</div><div class='add'>+	int pixfmt, int frames, int *compression, int send_to_cam);</div><div class='ctx'> extern unsigned int pwc_get_fps(struct pwc_device *pdev, unsigned int index, unsigned int size);</div><div class='del'>-extern int pwc_mpt_reset(struct pwc_device *pdev, int flags);</div><div class='del'>-extern int pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt);</div><div class='ctx'> extern int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value);</div><div class='ctx'> extern int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor);</div><div class='ctx'> extern int send_control_msg(struct pwc_device *pdev,</div><div class='hunk'>@@ -375,9 +386,6 @@ int pwc_init_controls(struct pwc_device *pdev);</div><div class='ctx'> /* Power down or up the camera; not supported by all models */</div><div class='ctx'> extern void pwc_camera_power(struct pwc_device *pdev, int power);</div><div class='ctx'> </div><div class='del'>-/* Private ioctl()s; see pwc-ioctl.h */</div><div class='del'>-extern long pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg);</div><div class='del'>-</div><div class='ctx'> extern const struct v4l2_ioctl_ops pwc_ioctl_ops;</div><div class='ctx'> </div><div class='ctx'> /** pwc-uncompress.c */</div><div class='head'>diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c<br/>index 79fb22c89ae9..0bd7da26d018 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pxa_camera.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/pxa_camera.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pxa_camera.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/pxa_camera.c</a></div><div class='hunk'>@@ -1133,12 +1133,13 @@ static void pxa_camera_setup_cicr(struct soc_camera_device *icd,</div><div class='ctx'> 	__raw_writel(cicr0, pcdev-&gt;base + CICR0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pxa_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)</div><div class='add'>+static int pxa_camera_set_bus_param(struct soc_camera_device *icd)</div><div class='ctx'> {</div><div class='ctx'> 	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);</div><div class='ctx'> 	struct soc_camera_host *ici = to_soc_camera_host(icd-&gt;parent);</div><div class='ctx'> 	struct pxa_camera_dev *pcdev = ici-&gt;priv;</div><div class='ctx'> 	struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};</div><div class='add'>+	u32 pixfmt = icd-&gt;current_fmt-&gt;host_fmt-&gt;fourcc;</div><div class='ctx'> 	unsigned long bus_flags, common_flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct pxa_cam *cam = icd-&gt;host_priv;</div><div class='hunk'>@@ -1851,19 +1852,7 @@ static struct platform_driver pxa_camera_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(pxa_camera_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init pxa_camera_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pxa_camera_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit pxa_camera_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pxa_camera_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(pxa_camera_init);</div><div class='del'>-module_exit(pxa_camera_exit);</div><div class='add'>+module_platform_driver(pxa_camera_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("PXA27x SoC Camera Host driver");</div><div class='ctx'> MODULE_AUTHOR("Guennadi Liakhovetski &lt;kernel@pengutronix.de&gt;");</div><div class='head'>diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c<br/>index 803c9c82e496..c1bef6187661 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/s2255drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s2255drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s2255drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s2255drv.c</a></div><div class='hunk'>@@ -2682,25 +2682,7 @@ static struct usb_driver s2255_driver = {</div><div class='ctx'> 	.id_table = s2255_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init usb_s2255_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	/* register this driver with the USB subsystem */</div><div class='del'>-	result = usb_register(&amp;s2255_driver);</div><div class='del'>-	if (result)</div><div class='del'>-		pr_err(KBUILD_MODNAME</div><div class='del'>-		       ": usb_register failed. Error number %d\n", result);</div><div class='del'>-	dprintk(2, "%s\n", __func__);</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit usb_s2255_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;s2255_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(usb_s2255_init);</div><div class='del'>-module_exit(usb_s2255_exit);</div><div class='add'>+module_usb_driver(s2255_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Sensoray 2255 Video for Linux driver");</div><div class='ctx'> MODULE_AUTHOR("Dean Anderson (Sensoray Company Inc.)");</div><div class='head'>diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c<br/>index 2cc3b9166724..a9e9653beeb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-fimc/fimc-capture.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-fimc/fimc-capture.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-fimc/fimc-capture.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-fimc/fimc-capture.c</a></div><div class='hunk'>@@ -63,6 +63,8 @@ static int fimc_init_capture(struct fimc_dev *fimc)</div><div class='ctx'> 		fimc_hw_set_effect(ctx, false);</div><div class='ctx'> 		fimc_hw_set_output_path(ctx);</div><div class='ctx'> 		fimc_hw_set_out_dma(ctx);</div><div class='add'>+		if (fimc-&gt;variant-&gt;has_alpha)</div><div class='add'>+			fimc_hw_set_rgb_alpha(ctx);</div><div class='ctx'> 		clear_bit(ST_CAPT_APPLY_CFG, &amp;fimc-&gt;state);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;fimc-&gt;slock, flags);</div><div class='hunk'>@@ -154,6 +156,8 @@ int fimc_capture_config_update(struct fimc_ctx *ctx)</div><div class='ctx'> 		fimc_hw_set_rotation(ctx);</div><div class='ctx'> 		fimc_prepare_dma_offset(ctx, &amp;ctx-&gt;d_frame);</div><div class='ctx'> 		fimc_hw_set_out_dma(ctx);</div><div class='add'>+		if (fimc-&gt;variant-&gt;has_alpha)</div><div class='add'>+			fimc_hw_set_rgb_alpha(ctx);</div><div class='ctx'> 		clear_bit(ST_CAPT_APPLY_CFG, &amp;fimc-&gt;state);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;ctx-&gt;slock);</div><div class='hunk'>@@ -689,7 +693,7 @@ static int fimc_pipeline_try_format(struct fimc_ctx *ctx,</div><div class='ctx'> 			mf-&gt;code = 0;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		if (mf-&gt;width != tfmt-&gt;width || mf-&gt;width != tfmt-&gt;width) {</div><div class='add'>+		if (mf-&gt;width != tfmt-&gt;width || mf-&gt;height != tfmt-&gt;height) {</div><div class='ctx'> 			u32 fcc = ffmt-&gt;fourcc;</div><div class='ctx'> 			tfmt-&gt;width  = mf-&gt;width;</div><div class='ctx'> 			tfmt-&gt;height = mf-&gt;height;</div><div class='hunk'>@@ -698,7 +702,8 @@ static int fimc_pipeline_try_format(struct fimc_ctx *ctx,</div><div class='ctx'> 					       NULL, &amp;fcc, FIMC_SD_PAD_SOURCE);</div><div class='ctx'> 			if (ffmt &amp;&amp; ffmt-&gt;mbus_code)</div><div class='ctx'> 				mf-&gt;code = ffmt-&gt;mbus_code;</div><div class='del'>-			if (mf-&gt;width != tfmt-&gt;width || mf-&gt;width != tfmt-&gt;width)</div><div class='add'>+			if (mf-&gt;width != tfmt-&gt;width ||</div><div class='add'>+			    mf-&gt;height != tfmt-&gt;height)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			tfmt-&gt;code = mf-&gt;code;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -706,7 +711,7 @@ static int fimc_pipeline_try_format(struct fimc_ctx *ctx,</div><div class='ctx'> 			ret = v4l2_subdev_call(csis, pad, set_fmt, NULL, &amp;sfmt);</div><div class='ctx'> </div><div class='ctx'> 		if (mf-&gt;code == tfmt-&gt;code &amp;&amp;</div><div class='del'>-		    mf-&gt;width == tfmt-&gt;width &amp;&amp; mf-&gt;width == tfmt-&gt;width)</div><div class='add'>+		    mf-&gt;width == tfmt-&gt;width &amp;&amp; mf-&gt;height == tfmt-&gt;height)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -812,6 +817,10 @@ static int fimc_capture_set_format(struct fimc_dev *fimc, struct v4l2_format *f)</div><div class='ctx'> 					  FIMC_SD_PAD_SOURCE);</div><div class='ctx'> 	if (!ff-&gt;fmt)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Update RGB Alpha control state and value range */</div><div class='add'>+	fimc_alpha_ctrl_update(ctx);</div><div class='add'>+</div><div class='ctx'> 	/* Try to match format at the host and the sensor */</div><div class='ctx'> 	if (!fimc-&gt;vid_cap.user_subdev_api) {</div><div class='ctx'> 		mf-&gt;code   = ff-&gt;fmt-&gt;mbus_code;</div><div class='hunk'>@@ -1235,6 +1244,9 @@ static int fimc_subdev_set_fmt(struct v4l2_subdev *sd,</div><div class='ctx'> 		*mf = fmt-&gt;format;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='add'>+	/* Update RGB Alpha control state and value range */</div><div class='add'>+	fimc_alpha_ctrl_update(ctx);</div><div class='add'>+</div><div class='ctx'> 	fimc_capture_mark_jpeg_xfer(ctx, fimc_fmt_is_jpeg(ffmt-&gt;color));</div><div class='ctx'> </div><div class='ctx'> 	ff = fmt-&gt;pad == FIMC_SD_PAD_SINK ?</div><div class='head'>diff --git a/drivers/media/video/s5p-fimc/fimc-core.c b/drivers/media/video/s5p-fimc/fimc-core.c<br/>index 07c6254faee3..81bcbb9492ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-fimc/fimc-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-fimc/fimc-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-fimc/fimc-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-fimc/fimc-core.c</a></div><div class='hunk'>@@ -52,13 +52,29 @@ static struct fimc_fmt fimc_formats[] = {</div><div class='ctx'> 		.colplanes	= 1,</div><div class='ctx'> 		.flags		= FMT_FLAGS_M2M,</div><div class='ctx'> 	}, {</div><div class='del'>-		.name		= "XRGB-8-8-8-8, 32 bpp",</div><div class='add'>+		.name		= "ARGB8888, 32 bpp",</div><div class='ctx'> 		.fourcc		= V4L2_PIX_FMT_RGB32,</div><div class='ctx'> 		.depth		= { 32 },</div><div class='ctx'> 		.color		= S5P_FIMC_RGB888,</div><div class='ctx'> 		.memplanes	= 1,</div><div class='ctx'> 		.colplanes	= 1,</div><div class='del'>-		.flags		= FMT_FLAGS_M2M,</div><div class='add'>+		.flags		= FMT_FLAGS_M2M | FMT_HAS_ALPHA,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "ARGB1555",</div><div class='add'>+		.fourcc		= V4L2_PIX_FMT_RGB555,</div><div class='add'>+		.depth		= { 16 },</div><div class='add'>+		.color		= S5P_FIMC_RGB555,</div><div class='add'>+		.memplanes	= 1,</div><div class='add'>+		.colplanes	= 1,</div><div class='add'>+		.flags		= FMT_FLAGS_M2M_OUT | FMT_HAS_ALPHA,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "ARGB4444",</div><div class='add'>+		.fourcc		= V4L2_PIX_FMT_RGB444,</div><div class='add'>+		.depth		= { 16 },</div><div class='add'>+		.color		= S5P_FIMC_RGB444,</div><div class='add'>+		.memplanes	= 1,</div><div class='add'>+		.colplanes	= 1,</div><div class='add'>+		.flags		= FMT_FLAGS_M2M_OUT | FMT_HAS_ALPHA,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name		= "YUV 4:2:2 packed, YCbYCr",</div><div class='ctx'> 		.fourcc		= V4L2_PIX_FMT_YUYV,</div><div class='hunk'>@@ -171,6 +187,14 @@ static struct fimc_fmt fimc_formats[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static unsigned int get_m2m_fmt_flags(unsigned int stream_type)</div><div class='add'>+{</div><div class='add'>+	if (stream_type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)</div><div class='add'>+		return FMT_FLAGS_M2M_IN;</div><div class='add'>+	else</div><div class='add'>+		return FMT_FLAGS_M2M_OUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int fimc_check_scaler_ratio(struct fimc_ctx *ctx, int sw, int sh,</div><div class='ctx'> 			    int dw, int dh, int rotation)</div><div class='ctx'> {</div><div class='hunk'>@@ -652,8 +676,11 @@ static void fimc_dma_run(void *priv)</div><div class='ctx'> 	if (ctx-&gt;state &amp; (FIMC_DST_ADDR | FIMC_PARAMS))</div><div class='ctx'> 		fimc_hw_set_output_addr(fimc, &amp;ctx-&gt;d_frame.paddr, -1);</div><div class='ctx'> </div><div class='del'>-	if (ctx-&gt;state &amp; FIMC_PARAMS)</div><div class='add'>+	if (ctx-&gt;state &amp; FIMC_PARAMS) {</div><div class='ctx'> 		fimc_hw_set_out_dma(ctx);</div><div class='add'>+		if (fimc-&gt;variant-&gt;has_alpha)</div><div class='add'>+			fimc_hw_set_rgb_alpha(ctx);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	fimc_activate_capture(ctx);</div><div class='ctx'> </div><div class='hunk'>@@ -750,12 +777,11 @@ static struct vb2_ops fimc_qops = {</div><div class='ctx'> #define ctrl_to_ctx(__ctrl) \</div><div class='ctx'> 	container_of((__ctrl)-&gt;handler, struct fimc_ctx, ctrl_handler)</div><div class='ctx'> </div><div class='del'>-static int fimc_s_ctrl(struct v4l2_ctrl *ctrl)</div><div class='add'>+static int __fimc_s_ctrl(struct fimc_ctx *ctx, struct v4l2_ctrl *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct fimc_ctx *ctx = ctrl_to_ctx(ctrl);</div><div class='ctx'> 	struct fimc_dev *fimc = ctx-&gt;fimc_dev;</div><div class='ctx'> 	struct samsung_fimc_variant *variant = fimc-&gt;variant;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	unsigned int flags = FIMC_DST_FMT | FIMC_SRC_FMT;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ctrl-&gt;flags &amp; V4L2_CTRL_FLAG_INACTIVE)</div><div class='hunk'>@@ -763,59 +789,77 @@ static int fimc_s_ctrl(struct v4l2_ctrl *ctrl)</div><div class='ctx'> </div><div class='ctx'> 	switch (ctrl-&gt;id) {</div><div class='ctx'> 	case V4L2_CID_HFLIP:</div><div class='del'>-		spin_lock_irqsave(&amp;ctx-&gt;slock, flags);</div><div class='ctx'> 		ctx-&gt;hflip = ctrl-&gt;val;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case V4L2_CID_VFLIP:</div><div class='del'>-		spin_lock_irqsave(&amp;ctx-&gt;slock, flags);</div><div class='ctx'> 		ctx-&gt;vflip = ctrl-&gt;val;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case V4L2_CID_ROTATE:</div><div class='ctx'> 		if (fimc_capture_pending(fimc) ||</div><div class='del'>-		    fimc_ctx_state_is_set(FIMC_DST_FMT | FIMC_SRC_FMT, ctx)) {</div><div class='add'>+		    (ctx-&gt;state &amp; flags) == flags) {</div><div class='ctx'> 			ret = fimc_check_scaler_ratio(ctx, ctx-&gt;s_frame.width,</div><div class='ctx'> 					ctx-&gt;s_frame.height, ctx-&gt;d_frame.width,</div><div class='ctx'> 					ctx-&gt;d_frame.height, ctrl-&gt;val);</div><div class='del'>-		}</div><div class='del'>-		if (ret) {</div><div class='del'>-			v4l2_err(fimc-&gt;m2m.vfd, "Out of scaler range\n");</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			if (ret)</div><div class='add'>+				return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		if ((ctrl-&gt;val == 90 || ctrl-&gt;val == 270) &amp;&amp;</div><div class='ctx'> 		    !variant-&gt;has_out_rot)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		spin_lock_irqsave(&amp;ctx-&gt;slock, flags);</div><div class='add'>+</div><div class='ctx'> 		ctx-&gt;rotation = ctrl-&gt;val;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	default:</div><div class='del'>-		v4l2_err(fimc-&gt;v4l2_dev, "Invalid control: 0x%X\n", ctrl-&gt;id);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	case V4L2_CID_ALPHA_COMPONENT:</div><div class='add'>+		ctx-&gt;d_frame.alpha = ctrl-&gt;val;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	ctx-&gt;state |= FIMC_PARAMS;</div><div class='ctx'> 	set_bit(ST_CAPT_APPLY_CFG, &amp;fimc-&gt;state);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ctx-&gt;slock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int fimc_s_ctrl(struct v4l2_ctrl *ctrl)</div><div class='add'>+{</div><div class='add'>+	struct fimc_ctx *ctx = ctrl_to_ctx(ctrl);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ctx-&gt;slock, flags);</div><div class='add'>+	ret = __fimc_s_ctrl(ctx, ctrl);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ctx-&gt;slock, flags);</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 v4l2_ctrl_ops fimc_ctrl_ops = {</div><div class='ctx'> 	.s_ctrl = fimc_s_ctrl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int fimc_ctrls_create(struct fimc_ctx *ctx)</div><div class='ctx'> {</div><div class='add'>+	struct samsung_fimc_variant *variant = ctx-&gt;fimc_dev-&gt;variant;</div><div class='add'>+	unsigned int max_alpha = fimc_get_alpha_mask(ctx-&gt;d_frame.fmt);</div><div class='add'>+</div><div class='ctx'> 	if (ctx-&gt;ctrls_rdy)</div><div class='ctx'> 		return 0;</div><div class='del'>-	v4l2_ctrl_handler_init(&amp;ctx-&gt;ctrl_handler, 3);</div><div class='add'>+	v4l2_ctrl_handler_init(&amp;ctx-&gt;ctrl_handler, 4);</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;ctrl_rotate = v4l2_ctrl_new_std(&amp;ctx-&gt;ctrl_handler, &amp;fimc_ctrl_ops,</div><div class='del'>-				     V4L2_CID_HFLIP, 0, 1, 1, 0);</div><div class='add'>+					V4L2_CID_ROTATE, 0, 270, 90, 0);</div><div class='ctx'> 	ctx-&gt;ctrl_hflip = v4l2_ctrl_new_std(&amp;ctx-&gt;ctrl_handler, &amp;fimc_ctrl_ops,</div><div class='del'>-				    V4L2_CID_VFLIP, 0, 1, 1, 0);</div><div class='add'>+					V4L2_CID_HFLIP, 0, 1, 1, 0);</div><div class='ctx'> 	ctx-&gt;ctrl_vflip = v4l2_ctrl_new_std(&amp;ctx-&gt;ctrl_handler, &amp;fimc_ctrl_ops,</div><div class='del'>-				    V4L2_CID_ROTATE, 0, 270, 90, 0);</div><div class='add'>+					V4L2_CID_VFLIP, 0, 1, 1, 0);</div><div class='add'>+	if (variant-&gt;has_alpha)</div><div class='add'>+		ctx-&gt;ctrl_alpha = v4l2_ctrl_new_std(&amp;ctx-&gt;ctrl_handler,</div><div class='add'>+				    &amp;fimc_ctrl_ops, V4L2_CID_ALPHA_COMPONENT,</div><div class='add'>+				    0, max_alpha, 1, 0);</div><div class='add'>+	else</div><div class='add'>+		ctx-&gt;ctrl_alpha = NULL;</div><div class='add'>+</div><div class='ctx'> 	ctx-&gt;ctrls_rdy = ctx-&gt;ctrl_handler.error == 0;</div><div class='ctx'> </div><div class='ctx'> 	return ctx-&gt;ctrl_handler.error;</div><div class='hunk'>@@ -826,11 +870,14 @@ void fimc_ctrls_delete(struct fimc_ctx *ctx)</div><div class='ctx'> 	if (ctx-&gt;ctrls_rdy) {</div><div class='ctx'> 		v4l2_ctrl_handler_free(&amp;ctx-&gt;ctrl_handler);</div><div class='ctx'> 		ctx-&gt;ctrls_rdy = false;</div><div class='add'>+		ctx-&gt;ctrl_alpha = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void fimc_ctrls_activate(struct fimc_ctx *ctx, bool active)</div><div class='ctx'> {</div><div class='add'>+	unsigned int has_alpha = ctx-&gt;d_frame.fmt-&gt;flags &amp; FMT_HAS_ALPHA;</div><div class='add'>+</div><div class='ctx'> 	if (!ctx-&gt;ctrls_rdy)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -838,6 +885,8 @@ void fimc_ctrls_activate(struct fimc_ctx *ctx, bool active)</div><div class='ctx'> 	v4l2_ctrl_activate(ctx-&gt;ctrl_rotate, active);</div><div class='ctx'> 	v4l2_ctrl_activate(ctx-&gt;ctrl_hflip, active);</div><div class='ctx'> 	v4l2_ctrl_activate(ctx-&gt;ctrl_vflip, active);</div><div class='add'>+	if (ctx-&gt;ctrl_alpha)</div><div class='add'>+		v4l2_ctrl_activate(ctx-&gt;ctrl_alpha, active &amp;&amp; has_alpha);</div><div class='ctx'> </div><div class='ctx'> 	if (active) {</div><div class='ctx'> 		ctx-&gt;rotation = ctx-&gt;ctrl_rotate-&gt;val;</div><div class='hunk'>@@ -851,6 +900,24 @@ void fimc_ctrls_activate(struct fimc_ctx *ctx, bool active)</div><div class='ctx'> 	mutex_unlock(&amp;ctx-&gt;ctrl_handler.lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Update maximum value of the alpha color control */</div><div class='add'>+void fimc_alpha_ctrl_update(struct fimc_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	struct fimc_dev *fimc = ctx-&gt;fimc_dev;</div><div class='add'>+	struct v4l2_ctrl *ctrl = ctx-&gt;ctrl_alpha;</div><div class='add'>+</div><div class='add'>+	if (ctrl == NULL || !fimc-&gt;variant-&gt;has_alpha)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	v4l2_ctrl_lock(ctrl);</div><div class='add'>+	ctrl-&gt;maximum = fimc_get_alpha_mask(ctx-&gt;d_frame.fmt);</div><div class='add'>+</div><div class='add'>+	if (ctrl-&gt;cur.val &gt; ctrl-&gt;maximum)</div><div class='add'>+		ctrl-&gt;cur.val = ctrl-&gt;maximum;</div><div class='add'>+</div><div class='add'>+	v4l2_ctrl_unlock(ctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * V4L2 ioctl handlers</div><div class='ctx'>  */</div><div class='hunk'>@@ -874,7 +941,8 @@ static int fimc_m2m_enum_fmt_mplane(struct file *file, void *priv,</div><div class='ctx'> {</div><div class='ctx'> 	struct fimc_fmt *fmt;</div><div class='ctx'> </div><div class='del'>-	fmt = fimc_find_format(NULL, NULL, FMT_FLAGS_M2M, f-&gt;index);</div><div class='add'>+	fmt = fimc_find_format(NULL, NULL, get_m2m_fmt_flags(f-&gt;type),</div><div class='add'>+			       f-&gt;index);</div><div class='ctx'> 	if (!fmt)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -938,6 +1006,7 @@ void fimc_adjust_mplane_format(struct fimc_fmt *fmt, u32 width, u32 height,</div><div class='ctx'> 	pix-&gt;colorspace	= V4L2_COLORSPACE_JPEG;</div><div class='ctx'> 	pix-&gt;field = V4L2_FIELD_NONE;</div><div class='ctx'> 	pix-&gt;num_planes = fmt-&gt;memplanes;</div><div class='add'>+	pix-&gt;pixelformat = fmt-&gt;fourcc;</div><div class='ctx'> 	pix-&gt;height = height;</div><div class='ctx'> 	pix-&gt;width = width;</div><div class='ctx'> </div><div class='hunk'>@@ -1017,7 +1086,8 @@ static int fimc_try_fmt_mplane(struct fimc_ctx *ctx, struct v4l2_format *f)</div><div class='ctx'> </div><div class='ctx'> 	dbg("w: %d, h: %d", pix-&gt;width, pix-&gt;height);</div><div class='ctx'> </div><div class='del'>-	fmt = fimc_find_format(&amp;pix-&gt;pixelformat, NULL, FMT_FLAGS_M2M, 0);</div><div class='add'>+	fmt = fimc_find_format(&amp;pix-&gt;pixelformat, NULL,</div><div class='add'>+			       get_m2m_fmt_flags(f-&gt;type), 0);</div><div class='ctx'> 	if (WARN(fmt == NULL, "Pixel format lookup failed"))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -1087,10 +1157,13 @@ static int fimc_m2m_s_fmt_mplane(struct file *file, void *fh,</div><div class='ctx'> </div><div class='ctx'> 	pix = &amp;f-&gt;fmt.pix_mp;</div><div class='ctx'> 	frame-&gt;fmt = fimc_find_format(&amp;pix-&gt;pixelformat, NULL,</div><div class='del'>-				      FMT_FLAGS_M2M, 0);</div><div class='add'>+				      get_m2m_fmt_flags(f-&gt;type), 0);</div><div class='ctx'> 	if (!frame-&gt;fmt)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* Update RGB Alpha control state and value range */</div><div class='add'>+	fimc_alpha_ctrl_update(ctx);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; frame-&gt;fmt-&gt;colplanes; i++) {</div><div class='ctx'> 		frame-&gt;payload[i] =</div><div class='ctx'> 			(pix-&gt;width * pix-&gt;height * frame-&gt;fmt-&gt;depth[i]) / 8;</div><div class='hunk'>@@ -1374,6 +1447,12 @@ static int fimc_m2m_open(struct file *file)</div><div class='ctx'> 	if (!ctx)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	v4l2_fh_init(&amp;ctx-&gt;fh, fimc-&gt;m2m.vfd);</div><div class='add'>+	ctx-&gt;fimc_dev = fimc;</div><div class='add'>+</div><div class='add'>+	/* Default color format */</div><div class='add'>+	ctx-&gt;s_frame.fmt = &amp;fimc_formats[0];</div><div class='add'>+	ctx-&gt;d_frame.fmt = &amp;fimc_formats[0];</div><div class='add'>+</div><div class='ctx'> 	ret = fimc_ctrls_create(ctx);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error_fh;</div><div class='hunk'>@@ -1383,10 +1462,6 @@ static int fimc_m2m_open(struct file *file)</div><div class='ctx'> 	file-&gt;private_data = &amp;ctx-&gt;fh;</div><div class='ctx'> 	v4l2_fh_add(&amp;ctx-&gt;fh);</div><div class='ctx'> </div><div class='del'>-	ctx-&gt;fimc_dev = fimc;</div><div class='del'>-	/* Default color format */</div><div class='del'>-	ctx-&gt;s_frame.fmt = &amp;fimc_formats[0];</div><div class='del'>-	ctx-&gt;d_frame.fmt = &amp;fimc_formats[0];</div><div class='ctx'> 	/* Setup the device context for memory-to-memory mode */</div><div class='ctx'> 	ctx-&gt;state = FIMC_CTX_M2M;</div><div class='ctx'> 	ctx-&gt;flags = 0;</div><div class='hunk'>@@ -1709,9 +1784,8 @@ static int fimc_runtime_resume(struct device *dev)</div><div class='ctx'> 	/* Resume the capture or mem-to-mem device */</div><div class='ctx'> 	if (fimc_capture_busy(fimc))</div><div class='ctx'> 		return fimc_capture_resume(fimc);</div><div class='del'>-	else if (fimc_m2m_pending(fimc))</div><div class='del'>-		return fimc_m2m_resume(fimc);</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	return fimc_m2m_resume(fimc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fimc_runtime_suspend(struct device *dev)</div><div class='hunk'>@@ -1893,6 +1967,7 @@ static struct samsung_fimc_variant fimc0_variant_exynos4 = {</div><div class='ctx'> 	.has_cam_if	 = 1,</div><div class='ctx'> 	.has_cistatus2	 = 1,</div><div class='ctx'> 	.has_mainscaler_ext = 1,</div><div class='add'>+	.has_alpha	 = 1,</div><div class='ctx'> 	.min_inp_pixsize = 16,</div><div class='ctx'> 	.min_out_pixsize = 16,</div><div class='ctx'> 	.hor_offs_align	 = 2,</div><div class='hunk'>@@ -1906,6 +1981,7 @@ static struct samsung_fimc_variant fimc3_variant_exynos4 = {</div><div class='ctx'> 	.has_cam_if	 = 1,</div><div class='ctx'> 	.has_cistatus2	 = 1,</div><div class='ctx'> 	.has_mainscaler_ext = 1,</div><div class='add'>+	.has_alpha	 = 1,</div><div class='ctx'> 	.min_inp_pixsize = 16,</div><div class='ctx'> 	.min_out_pixsize = 16,</div><div class='ctx'> 	.hor_offs_align	 = 2,</div><div class='head'>diff --git a/drivers/media/video/s5p-fimc/fimc-core.h b/drivers/media/video/s5p-fimc/fimc-core.h<br/>index c7f01c47b20f..4e20560c73d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-fimc/fimc-core.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-fimc/fimc-core.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-fimc/fimc-core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-fimc/fimc-core.h</a></div><div class='hunk'>@@ -85,7 +85,9 @@ enum fimc_datapath {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum fimc_color_fmt {</div><div class='del'>-	S5P_FIMC_RGB565 = 0x10,</div><div class='add'>+	S5P_FIMC_RGB444 = 0x10,</div><div class='add'>+	S5P_FIMC_RGB555,</div><div class='add'>+	S5P_FIMC_RGB565,</div><div class='ctx'> 	S5P_FIMC_RGB666,</div><div class='ctx'> 	S5P_FIMC_RGB888,</div><div class='ctx'> 	S5P_FIMC_RGB30_LOCAL,</div><div class='hunk'>@@ -160,8 +162,11 @@ struct fimc_fmt {</div><div class='ctx'> 	u16	colplanes;</div><div class='ctx'> 	u8	depth[VIDEO_MAX_PLANES];</div><div class='ctx'> 	u16	flags;</div><div class='del'>-#define FMT_FLAGS_CAM	(1 &lt;&lt; 0)</div><div class='del'>-#define FMT_FLAGS_M2M	(1 &lt;&lt; 1)</div><div class='add'>+#define FMT_FLAGS_CAM		(1 &lt;&lt; 0)</div><div class='add'>+#define FMT_FLAGS_M2M_IN	(1 &lt;&lt; 1)</div><div class='add'>+#define FMT_FLAGS_M2M_OUT	(1 &lt;&lt; 2)</div><div class='add'>+#define FMT_FLAGS_M2M		(1 &lt;&lt; 1 | 1 &lt;&lt; 2)</div><div class='add'>+#define FMT_HAS_ALPHA		(1 &lt;&lt; 3)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -283,6 +288,7 @@ struct fimc_frame {</div><div class='ctx'> 	struct fimc_addr	paddr;</div><div class='ctx'> 	struct fimc_dma_offset	dma_offset;</div><div class='ctx'> 	struct fimc_fmt		*fmt;</div><div class='add'>+	u8			alpha;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -387,6 +393,7 @@ struct samsung_fimc_variant {</div><div class='ctx'> 	unsigned int	has_cistatus2:1;</div><div class='ctx'> 	unsigned int	has_mainscaler_ext:1;</div><div class='ctx'> 	unsigned int	has_cam_if:1;</div><div class='add'>+	unsigned int	has_alpha:1;</div><div class='ctx'> 	struct fimc_pix_limit *pix_limit;</div><div class='ctx'> 	u16		min_inp_pixsize;</div><div class='ctx'> 	u16		min_out_pixsize;</div><div class='hunk'>@@ -482,7 +489,8 @@ struct fimc_dev {</div><div class='ctx'>  * @ctrl_handler:	v4l2 controls handler</div><div class='ctx'>  * @ctrl_rotate		image rotation control</div><div class='ctx'>  * @ctrl_hflip		horizontal flip control</div><div class='del'>- * @ctrl_vflip		vartical flip control</div><div class='add'>+ * @ctrl_vflip		vertical flip control</div><div class='add'>+ * @ctrl_alpha		RGB alpha control</div><div class='ctx'>  * @ctrls_rdy:		true if the control handler is initialized</div><div class='ctx'>  */</div><div class='ctx'> struct fimc_ctx {</div><div class='hunk'>@@ -509,6 +517,7 @@ struct fimc_ctx {</div><div class='ctx'> 	struct v4l2_ctrl	*ctrl_rotate;</div><div class='ctx'> 	struct v4l2_ctrl	*ctrl_hflip;</div><div class='ctx'> 	struct v4l2_ctrl	*ctrl_vflip;</div><div class='add'>+	struct v4l2_ctrl	*ctrl_alpha;</div><div class='ctx'> 	bool			ctrls_rdy;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -578,6 +587,17 @@ static inline int tiled_fmt(struct fimc_fmt *fmt)</div><div class='ctx'> 	return fmt-&gt;fourcc == V4L2_PIX_FMT_NV12MT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Return the alpha component bit mask */</div><div class='add'>+static inline int fimc_get_alpha_mask(struct fimc_fmt *fmt)</div><div class='add'>+{</div><div class='add'>+	switch (fmt-&gt;color) {</div><div class='add'>+	case S5P_FIMC_RGB444:	return 0x0f;</div><div class='add'>+	case S5P_FIMC_RGB555:	return 0x01;</div><div class='add'>+	case S5P_FIMC_RGB888:	return 0xff;</div><div class='add'>+	default:		return 0;</div><div class='add'>+	};</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void fimc_hw_clear_irq(struct fimc_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 cfg = readl(dev-&gt;regs + S5P_CIGCTRL);</div><div class='hunk'>@@ -674,6 +694,7 @@ void fimc_hw_set_prescaler(struct fimc_ctx *ctx);</div><div class='ctx'> void fimc_hw_set_mainscaler(struct fimc_ctx *ctx);</div><div class='ctx'> void fimc_hw_en_capture(struct fimc_ctx *ctx);</div><div class='ctx'> void fimc_hw_set_effect(struct fimc_ctx *ctx, bool active);</div><div class='add'>+void fimc_hw_set_rgb_alpha(struct fimc_ctx *ctx);</div><div class='ctx'> void fimc_hw_set_in_dma(struct fimc_ctx *ctx);</div><div class='ctx'> void fimc_hw_set_input_path(struct fimc_ctx *ctx);</div><div class='ctx'> void fimc_hw_set_output_path(struct fimc_ctx *ctx);</div><div class='hunk'>@@ -695,6 +716,7 @@ int fimc_vidioc_enum_fmt_mplane(struct file *file, void *priv,</div><div class='ctx'> int fimc_ctrls_create(struct fimc_ctx *ctx);</div><div class='ctx'> void fimc_ctrls_delete(struct fimc_ctx *ctx);</div><div class='ctx'> void fimc_ctrls_activate(struct fimc_ctx *ctx, bool active);</div><div class='add'>+void fimc_alpha_ctrl_update(struct fimc_ctx *ctx);</div><div class='ctx'> int fimc_fill_format(struct fimc_frame *frame, struct v4l2_format *f);</div><div class='ctx'> void fimc_adjust_mplane_format(struct fimc_fmt *fmt, u32 width, u32 height,</div><div class='ctx'> 			       struct v4l2_pix_format_mplane *pix);</div><div class='head'>diff --git a/drivers/media/video/s5p-fimc/fimc-mdevice.c b/drivers/media/video/s5p-fimc/fimc-mdevice.c<br/>index 615c862f0360..8ea4ee116e46 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-fimc/fimc-mdevice.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-fimc/fimc-mdevice.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-fimc/fimc-mdevice.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-fimc/fimc-mdevice.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-ctrls.h&gt;</div><div class='ctx'> #include &lt;media/media-device.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/s5p-fimc/fimc-reg.c b/drivers/media/video/s5p-fimc/fimc-reg.c<br/>index 44f5c2d1920b..15466d0529c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-fimc/fimc-reg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-fimc/fimc-reg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-fimc/fimc-reg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-fimc/fimc-reg.c</a></div><div class='hunk'>@@ -117,7 +117,7 @@ void fimc_hw_set_target_format(struct fimc_ctx *ctx)</div><div class='ctx'> 		  S5P_CITRGFMT_VSIZE_MASK);</div><div class='ctx'> </div><div class='ctx'> 	switch (frame-&gt;fmt-&gt;color) {</div><div class='del'>-	case S5P_FIMC_RGB565...S5P_FIMC_RGB888:</div><div class='add'>+	case S5P_FIMC_RGB444...S5P_FIMC_RGB888:</div><div class='ctx'> 		cfg |= S5P_CITRGFMT_RGB;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case S5P_FIMC_YCBCR420:</div><div class='hunk'>@@ -175,6 +175,7 @@ void fimc_hw_set_out_dma(struct fimc_ctx *ctx)</div><div class='ctx'> 	struct fimc_dev *dev = ctx-&gt;fimc_dev;</div><div class='ctx'> 	struct fimc_frame *frame = &amp;ctx-&gt;d_frame;</div><div class='ctx'> 	struct fimc_dma_offset *offset = &amp;frame-&gt;dma_offset;</div><div class='add'>+	struct fimc_fmt *fmt = frame-&gt;fmt;</div><div class='ctx'> </div><div class='ctx'> 	/* Set the input dma offsets. */</div><div class='ctx'> 	cfg = 0;</div><div class='hunk'>@@ -198,15 +199,22 @@ void fimc_hw_set_out_dma(struct fimc_ctx *ctx)</div><div class='ctx'> 	cfg = readl(dev-&gt;regs + S5P_CIOCTRL);</div><div class='ctx'> </div><div class='ctx'> 	cfg &amp;= ~(S5P_CIOCTRL_ORDER2P_MASK | S5P_CIOCTRL_ORDER422_MASK |</div><div class='del'>-		 S5P_CIOCTRL_YCBCR_PLANE_MASK);</div><div class='add'>+		 S5P_CIOCTRL_YCBCR_PLANE_MASK | S5P_CIOCTRL_RGB16FMT_MASK);</div><div class='ctx'> </div><div class='del'>-	if (frame-&gt;fmt-&gt;colplanes == 1)</div><div class='add'>+	if (fmt-&gt;colplanes == 1)</div><div class='ctx'> 		cfg |= ctx-&gt;out_order_1p;</div><div class='del'>-	else if (frame-&gt;fmt-&gt;colplanes == 2)</div><div class='add'>+	else if (fmt-&gt;colplanes == 2)</div><div class='ctx'> 		cfg |= ctx-&gt;out_order_2p | S5P_CIOCTRL_YCBCR_2PLANE;</div><div class='del'>-	else if (frame-&gt;fmt-&gt;colplanes == 3)</div><div class='add'>+	else if (fmt-&gt;colplanes == 3)</div><div class='ctx'> 		cfg |= S5P_CIOCTRL_YCBCR_3PLANE;</div><div class='ctx'> </div><div class='add'>+	if (fmt-&gt;color == S5P_FIMC_RGB565)</div><div class='add'>+		cfg |= S5P_CIOCTRL_RGB565;</div><div class='add'>+	else if (fmt-&gt;color == S5P_FIMC_RGB555)</div><div class='add'>+		cfg |= S5P_CIOCTRL_ARGB1555;</div><div class='add'>+	else if (fmt-&gt;color == S5P_FIMC_RGB444)</div><div class='add'>+		cfg |= S5P_CIOCTRL_ARGB4444;</div><div class='add'>+</div><div class='ctx'> 	writel(cfg, dev-&gt;regs + S5P_CIOCTRL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -278,22 +286,28 @@ static void fimc_hw_set_scaler(struct fimc_ctx *ctx)</div><div class='ctx'> 	if (sc-&gt;copy_mode)</div><div class='ctx'> 		cfg |= S5P_CISCCTRL_ONE2ONE;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	if (ctx-&gt;in_path == FIMC_DMA) {</div><div class='del'>-		if (src_frame-&gt;fmt-&gt;color == S5P_FIMC_RGB565)</div><div class='add'>+		switch (src_frame-&gt;fmt-&gt;color) {</div><div class='add'>+		case S5P_FIMC_RGB565:</div><div class='ctx'> 			cfg |= S5P_CISCCTRL_INRGB_FMT_RGB565;</div><div class='del'>-		else if (src_frame-&gt;fmt-&gt;color == S5P_FIMC_RGB666)</div><div class='add'>+			break;</div><div class='add'>+		case S5P_FIMC_RGB666:</div><div class='ctx'> 			cfg |= S5P_CISCCTRL_INRGB_FMT_RGB666;</div><div class='del'>-		else if (src_frame-&gt;fmt-&gt;color == S5P_FIMC_RGB888)</div><div class='add'>+			break;</div><div class='add'>+		case S5P_FIMC_RGB888:</div><div class='ctx'> 			cfg |= S5P_CISCCTRL_INRGB_FMT_RGB888;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;out_path == FIMC_DMA) {</div><div class='del'>-		if (dst_frame-&gt;fmt-&gt;color == S5P_FIMC_RGB565)</div><div class='add'>+		u32 color = dst_frame-&gt;fmt-&gt;color;</div><div class='add'>+</div><div class='add'>+		if (color &gt;= S5P_FIMC_RGB444 &amp;&amp; color &lt;= S5P_FIMC_RGB565)</div><div class='ctx'> 			cfg |= S5P_CISCCTRL_OUTRGB_FMT_RGB565;</div><div class='del'>-		else if (dst_frame-&gt;fmt-&gt;color == S5P_FIMC_RGB666)</div><div class='add'>+		else if (color == S5P_FIMC_RGB666)</div><div class='ctx'> 			cfg |= S5P_CISCCTRL_OUTRGB_FMT_RGB666;</div><div class='del'>-		else if (dst_frame-&gt;fmt-&gt;color == S5P_FIMC_RGB888)</div><div class='add'>+		else if (color == S5P_FIMC_RGB888)</div><div class='ctx'> 			cfg |= S5P_CISCCTRL_OUTRGB_FMT_RGB888;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		cfg |= S5P_CISCCTRL_OUTRGB_FMT_RGB888;</div><div class='hunk'>@@ -379,6 +393,21 @@ void fimc_hw_set_effect(struct fimc_ctx *ctx, bool active)</div><div class='ctx'> 	writel(cfg, dev-&gt;regs + S5P_CIIMGEFF);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void fimc_hw_set_rgb_alpha(struct fimc_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	struct fimc_dev *dev = ctx-&gt;fimc_dev;</div><div class='add'>+	struct fimc_frame *frame = &amp;ctx-&gt;d_frame;</div><div class='add'>+	u32 cfg;</div><div class='add'>+</div><div class='add'>+	if (!(frame-&gt;fmt-&gt;flags &amp; FMT_HAS_ALPHA))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cfg = readl(dev-&gt;regs + S5P_CIOCTRL);</div><div class='add'>+	cfg &amp;= ~S5P_CIOCTRL_ALPHA_OUT_MASK;</div><div class='add'>+	cfg |= (frame-&gt;alpha &lt;&lt; 4);</div><div class='add'>+	writel(cfg, dev-&gt;regs + S5P_CIOCTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void fimc_hw_set_in_dma_size(struct fimc_ctx *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct fimc_dev *dev = ctx-&gt;fimc_dev;</div><div class='head'>diff --git a/drivers/media/video/s5p-fimc/mipi-csis.c b/drivers/media/video/s5p-fimc/mipi-csis.c<br/>index 59d79bc2f58a..130335cf62fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-fimc/mipi-csis.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-fimc/mipi-csis.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-fimc/mipi-csis.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-fimc/mipi-csis.c</a></div><div class='hunk'>@@ -427,6 +427,23 @@ static int s5pcsis_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int s5pcsis_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_mbus_framefmt *format = v4l2_subdev_get_try_format(fh, 0);</div><div class='add'>+</div><div class='add'>+	format-&gt;colorspace = V4L2_COLORSPACE_JPEG;</div><div class='add'>+	format-&gt;code = s5pcsis_formats[0].code;</div><div class='add'>+	format-&gt;width = S5PCSIS_DEF_PIX_WIDTH;</div><div class='add'>+	format-&gt;height = S5PCSIS_DEF_PIX_HEIGHT;</div><div class='add'>+	format-&gt;field = V4L2_FIELD_NONE;</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 v4l2_subdev_internal_ops s5pcsis_sd_internal_ops = {</div><div class='add'>+	.open = s5pcsis_open,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct v4l2_subdev_core_ops s5pcsis_core_ops = {</div><div class='ctx'> 	.s_power = s5pcsis_s_power,</div><div class='ctx'> };</div><div class='hunk'>@@ -544,8 +561,13 @@ static int __devinit s5pcsis_probe(struct platform_device *pdev)</div><div class='ctx'> 	v4l2_subdev_init(&amp;state-&gt;sd, &amp;s5pcsis_subdev_ops);</div><div class='ctx'> 	state-&gt;sd.owner = THIS_MODULE;</div><div class='ctx'> 	strlcpy(state-&gt;sd.name, dev_name(&amp;pdev-&gt;dev), sizeof(state-&gt;sd.name));</div><div class='add'>+	state-&gt;sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;</div><div class='ctx'> 	state-&gt;csis_fmt = &amp;s5pcsis_formats[0];</div><div class='ctx'> </div><div class='add'>+	state-&gt;format.code = s5pcsis_formats[0].code;</div><div class='add'>+	state-&gt;format.width = S5PCSIS_DEF_PIX_WIDTH;</div><div class='add'>+	state-&gt;format.height = S5PCSIS_DEF_PIX_HEIGHT;</div><div class='add'>+</div><div class='ctx'> 	state-&gt;pads[CSIS_PAD_SINK].flags = MEDIA_PAD_FL_SINK;</div><div class='ctx'> 	state-&gt;pads[CSIS_PAD_SOURCE].flags = MEDIA_PAD_FL_SOURCE;</div><div class='ctx'> 	ret = media_entity_init(&amp;state-&gt;sd.entity,</div><div class='head'>diff --git a/drivers/media/video/s5p-fimc/mipi-csis.h b/drivers/media/video/s5p-fimc/mipi-csis.h<br/>index f5691336dd5c..2709286396e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-fimc/mipi-csis.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-fimc/mipi-csis.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-fimc/mipi-csis.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-fimc/mipi-csis.h</a></div><div class='hunk'>@@ -19,4 +19,7 @@</div><div class='ctx'> #define CSIS_PAD_SOURCE		1</div><div class='ctx'> #define CSIS_PADS_NUM		2</div><div class='ctx'> </div><div class='add'>+#define S5PCSIS_DEF_PIX_WIDTH	640</div><div class='add'>+#define S5PCSIS_DEF_PIX_HEIGHT	480</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/video/s5p-fimc/regs-fimc.h b/drivers/media/video/s5p-fimc/regs-fimc.h<br/>index c8e3b94bd91d..c7a5bc51d571 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-fimc/regs-fimc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-fimc/regs-fimc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-fimc/regs-fimc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-fimc/regs-fimc.h</a></div><div class='hunk'>@@ -107,6 +107,11 @@</div><div class='ctx'> #define S5P_CIOCTRL_YCBCR_3PLANE	(0 &lt;&lt; 3)</div><div class='ctx'> #define S5P_CIOCTRL_YCBCR_2PLANE	(1 &lt;&lt; 3)</div><div class='ctx'> #define S5P_CIOCTRL_YCBCR_PLANE_MASK	(1 &lt;&lt; 3)</div><div class='add'>+#define S5P_CIOCTRL_ALPHA_OUT_MASK	(0xff &lt;&lt; 4)</div><div class='add'>+#define S5P_CIOCTRL_RGB16FMT_MASK	(3 &lt;&lt; 16)</div><div class='add'>+#define S5P_CIOCTRL_RGB565		(0 &lt;&lt; 16)</div><div class='add'>+#define S5P_CIOCTRL_ARGB1555		(1 &lt;&lt; 16)</div><div class='add'>+#define S5P_CIOCTRL_ARGB4444		(2 &lt;&lt; 16)</div><div class='ctx'> #define S5P_CIOCTRL_ORDER2P_SHIFT	(24)</div><div class='ctx'> #define S5P_CIOCTRL_ORDER2P_MASK	(3 &lt;&lt; 24)</div><div class='ctx'> #define S5P_CIOCTRL_ORDER422_2P_LSB_CRCB (0 &lt;&lt; 24)</div><div class='head'>diff --git a/drivers/media/video/s5p-g2d/Makefile b/drivers/media/video/s5p-g2d/Makefile<br/>new file mode 100644<br/>index 000000000000..2c48c416a804<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-g2d/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-g2d/Makefile</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+s5p-g2d-objs := g2d.o g2d-hw.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D)	+= s5p-g2d.o</div><div class='head'>diff --git a/drivers/media/video/s5p-g2d/g2d-hw.c b/drivers/media/video/s5p-g2d/g2d-hw.c<br/>new file mode 100644<br/>index 000000000000..39937cf03c88<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-g2d/g2d-hw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-g2d/g2d-hw.c</a></div><div class='hunk'>@@ -0,0 +1,104 @@</div><div class='add'>+/*</div><div class='add'>+ * Samsung S5P G2D - 2D Graphics Accelerator Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ * Kamil Debski, &lt;k.debski@samsung.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 the</div><div class='add'>+ * Free Software Foundation; either version 2 of the</div><div class='add'>+ * License, or (at your option) any later version</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include "g2d.h"</div><div class='add'>+#include "g2d-regs.h"</div><div class='add'>+</div><div class='add'>+#define w(x, a)	writel((x), d-&gt;regs + (a))</div><div class='add'>+#define r(a)	readl(d-&gt;regs + (a))</div><div class='add'>+</div><div class='add'>+/* g2d_reset clears all g2d registers */</div><div class='add'>+void g2d_reset(struct g2d_dev *d)</div><div class='add'>+{</div><div class='add'>+	w(1, SOFT_RESET_REG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void g2d_set_src_size(struct g2d_dev *d, struct g2d_frame *f)</div><div class='add'>+{</div><div class='add'>+	u32 n;</div><div class='add'>+</div><div class='add'>+	w(f-&gt;stride &amp; 0xFFFF, SRC_STRIDE_REG);</div><div class='add'>+</div><div class='add'>+	n = f-&gt;o_height &amp; 0xFFF;</div><div class='add'>+	n &lt;&lt;= 16;</div><div class='add'>+	n |= f-&gt;o_width &amp; 0xFFF;</div><div class='add'>+	w(n, SRC_LEFT_TOP_REG);</div><div class='add'>+</div><div class='add'>+	n = f-&gt;bottom &amp; 0xFFF;</div><div class='add'>+	n &lt;&lt;= 16;</div><div class='add'>+	n |= f-&gt;right &amp; 0xFFF;</div><div class='add'>+	w(n, SRC_RIGHT_BOTTOM_REG);</div><div class='add'>+</div><div class='add'>+	w(f-&gt;fmt-&gt;hw, SRC_COLOR_MODE_REG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void g2d_set_src_addr(struct g2d_dev *d, dma_addr_t a)</div><div class='add'>+{</div><div class='add'>+	w(a, SRC_BASE_ADDR_REG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void g2d_set_dst_size(struct g2d_dev *d, struct g2d_frame *f)</div><div class='add'>+{</div><div class='add'>+	u32 n;</div><div class='add'>+</div><div class='add'>+	w(f-&gt;stride &amp; 0xFFFF, DST_STRIDE_REG);</div><div class='add'>+</div><div class='add'>+	n = f-&gt;o_height &amp; 0xFFF;</div><div class='add'>+	n &lt;&lt;= 16;</div><div class='add'>+	n |= f-&gt;o_width &amp; 0xFFF;</div><div class='add'>+	w(n, DST_LEFT_TOP_REG);</div><div class='add'>+</div><div class='add'>+	n = f-&gt;bottom &amp; 0xFFF;</div><div class='add'>+	n &lt;&lt;= 16;</div><div class='add'>+	n |= f-&gt;right &amp; 0xFFF;</div><div class='add'>+	w(n, DST_RIGHT_BOTTOM_REG);</div><div class='add'>+</div><div class='add'>+	w(f-&gt;fmt-&gt;hw, DST_COLOR_MODE_REG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void g2d_set_dst_addr(struct g2d_dev *d, dma_addr_t a)</div><div class='add'>+{</div><div class='add'>+	w(a, DST_BASE_ADDR_REG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void g2d_set_rop4(struct g2d_dev *d, u32 r)</div><div class='add'>+{</div><div class='add'>+	w(r, ROP4_REG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 g2d_cmd_stretch(u32 e)</div><div class='add'>+{</div><div class='add'>+	e &amp;= 1;</div><div class='add'>+	return e &lt;&lt; 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void g2d_set_cmd(struct g2d_dev *d, u32 c)</div><div class='add'>+{</div><div class='add'>+	w(c, BITBLT_COMMAND_REG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void g2d_start(struct g2d_dev *d)</div><div class='add'>+{</div><div class='add'>+	/* Clear cache */</div><div class='add'>+	w(0x7, CACHECTL_REG);</div><div class='add'>+	/* Enable interrupt */</div><div class='add'>+	w(1, INTEN_REG);</div><div class='add'>+	/* Start G2D engine */</div><div class='add'>+	w(1, BITBLT_START_REG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void g2d_clear_int(struct g2d_dev *d)</div><div class='add'>+{</div><div class='add'>+	w(1, INTC_PEND_REG);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/media/video/s5p-g2d/g2d-regs.h b/drivers/media/video/s5p-g2d/g2d-regs.h<br/>new file mode 100644<br/>index 000000000000..02e1cf50da4e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-g2d/g2d-regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-g2d/g2d-regs.h</a></div><div class='hunk'>@@ -0,0 +1,115 @@</div><div class='add'>+/*</div><div class='add'>+ * Samsung S5P G2D - 2D Graphics Accelerator Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ * Kamil Debski, &lt;k.debski@samsung.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 the</div><div class='add'>+ * Free Software Foundation; either version 2 of the</div><div class='add'>+ * License, or (at your option) any later version</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* General Registers */</div><div class='add'>+#define SOFT_RESET_REG		0x0000	/* Software reset reg */</div><div class='add'>+#define INTEN_REG		0x0004	/* Interrupt Enable reg */</div><div class='add'>+#define INTC_PEND_REG		0x000C	/* Interrupt Control Pending reg */</div><div class='add'>+#define FIFO_STAT_REG		0x0010	/* Command FIFO Status reg */</div><div class='add'>+#define AXI_ID_MODE_REG		0x0014	/* AXI Read ID Mode reg */</div><div class='add'>+#define CACHECTL_REG		0x0018	/* Cache &amp; Buffer clear reg */</div><div class='add'>+#define AXI_MODE_REG		0x001C	/* AXI Mode reg */</div><div class='add'>+</div><div class='add'>+/* Command Registers */</div><div class='add'>+#define BITBLT_START_REG	0x0100	/* BitBLT Start reg */</div><div class='add'>+#define BITBLT_COMMAND_REG	0x0104	/* Command reg for BitBLT */</div><div class='add'>+</div><div class='add'>+/* Parameter Setting Registers (Rotate &amp; Direction) */</div><div class='add'>+#define ROTATE_REG		0x0200	/* Rotation reg */</div><div class='add'>+#define SRC_MSK_DIRECT_REG	0x0204	/* Src and Mask Direction reg */</div><div class='add'>+#define DST_PAT_DIRECT_REG	0x0208	/* Dest and Pattern Direction reg */</div><div class='add'>+</div><div class='add'>+/* Parameter Setting Registers (Src) */</div><div class='add'>+#define SRC_SELECT_REG		0x0300	/* Src Image Selection reg */</div><div class='add'>+#define SRC_BASE_ADDR_REG	0x0304	/* Src Image Base Address reg */</div><div class='add'>+#define SRC_STRIDE_REG		0x0308	/* Src Stride reg */</div><div class='add'>+#define SRC_COLOR_MODE_REG	0x030C	/* Src Image Color Mode reg */</div><div class='add'>+#define SRC_LEFT_TOP_REG	0x0310	/* Src Left Top Coordinate reg */</div><div class='add'>+#define SRC_RIGHT_BOTTOM_REG	0x0314	/* Src Right Bottom Coordinate reg */</div><div class='add'>+</div><div class='add'>+/* Parameter Setting Registers (Dest) */</div><div class='add'>+#define DST_SELECT_REG		0x0400	/* Dest Image Selection reg */</div><div class='add'>+#define DST_BASE_ADDR_REG	0x0404	/* Dest Image Base Address reg */</div><div class='add'>+#define DST_STRIDE_REG		0x0408	/* Dest Stride reg */</div><div class='add'>+#define DST_COLOR_MODE_REG	0x040C	/* Dest Image Color Mode reg */</div><div class='add'>+#define DST_LEFT_TOP_REG	0x0410	/* Dest Left Top Coordinate reg */</div><div class='add'>+#define DST_RIGHT_BOTTOM_REG	0x0414	/* Dest Right Bottom Coordinate reg */</div><div class='add'>+</div><div class='add'>+/* Parameter Setting Registers (Pattern) */</div><div class='add'>+#define PAT_BASE_ADDR_REG	0x0500	/* Pattern Image Base Address reg */</div><div class='add'>+#define PAT_SIZE_REG		0x0504	/* Pattern Image Size reg */</div><div class='add'>+#define PAT_COLOR_MODE_REG	0x0508	/* Pattern Image Color Mode reg */</div><div class='add'>+#define PAT_OFFSET_REG		0x050C	/* Pattern Left Top Coordinate reg */</div><div class='add'>+#define PAT_STRIDE_REG		0x0510	/* Pattern Stride reg */</div><div class='add'>+</div><div class='add'>+/* Parameter Setting Registers (Mask) */</div><div class='add'>+#define MASK_BASE_ADDR_REG	0x0520	/* Mask Base Address reg */</div><div class='add'>+#define MASK_STRIDE_REG		0x0524	/* Mask Stride reg */</div><div class='add'>+</div><div class='add'>+/* Parameter Setting Registers (Clipping Window) */</div><div class='add'>+#define CW_LT_REG		0x0600	/* LeftTop coordinates of Clip Window */</div><div class='add'>+#define CW_RB_REG		0x0604	/* RightBottom coordinates of Clip</div><div class='add'>+								Window */</div><div class='add'>+</div><div class='add'>+/* Parameter Setting Registers (ROP &amp; Alpha Setting) */</div><div class='add'>+#define THIRD_OPERAND_REG	0x0610	/* Third Operand Selection reg */</div><div class='add'>+#define ROP4_REG		0x0614	/* Raster Operation reg */</div><div class='add'>+#define ALPHA_REG		0x0618	/* Alpha value, Fading offset value */</div><div class='add'>+</div><div class='add'>+/* Parameter Setting Registers (Color) */</div><div class='add'>+#define FG_COLOR_REG		0x0700	/* Foreground Color reg */</div><div class='add'>+#define BG_COLOR_REG		0x0704	/* Background Color reg */</div><div class='add'>+#define BS_COLOR_REG		0x0708	/* Blue Screen Color reg */</div><div class='add'>+</div><div class='add'>+/* Parameter Setting Registers (Color Key) */</div><div class='add'>+#define SRC_COLORKEY_CTRL_REG	0x0710	/* Src Colorkey control reg */</div><div class='add'>+#define SRC_COLORKEY_DR_MIN_REG	0x0714	/* Src Colorkey Decision Reference</div><div class='add'>+								Min reg */</div><div class='add'>+#define SRC_COLORKEY_DR_MAX_REG	0x0718	/* Src Colorkey Decision Reference</div><div class='add'>+								Max reg */</div><div class='add'>+#define DST_COLORKEY_CTRL_REG	0x071C	/* Dest Colorkey control reg */</div><div class='add'>+#define DST_COLORKEY_DR_MIN_REG	0x0720	/* Dest Colorkey Decision Reference</div><div class='add'>+								Min reg */</div><div class='add'>+#define DST_COLORKEY_DR_MAX_REG	0x0724	/* Dest Colorkey Decision Reference</div><div class='add'>+								Max reg */</div><div class='add'>+</div><div class='add'>+/* Color mode values */</div><div class='add'>+</div><div class='add'>+#define ORDER_XRGB		0</div><div class='add'>+#define ORDER_RGBX		1</div><div class='add'>+#define ORDER_XBGR		2</div><div class='add'>+#define ORDER_BGRX		3</div><div class='add'>+</div><div class='add'>+#define MODE_XRGB_8888		0</div><div class='add'>+#define MODE_ARGB_8888		1</div><div class='add'>+#define MODE_RGB_565		2</div><div class='add'>+#define MODE_XRGB_1555		3</div><div class='add'>+#define MODE_ARGB_1555		4</div><div class='add'>+#define MODE_XRGB_4444		5</div><div class='add'>+#define MODE_ARGB_4444		6</div><div class='add'>+#define MODE_PACKED_RGB_888	7</div><div class='add'>+</div><div class='add'>+#define COLOR_MODE(o, m)	(((o) &lt;&lt; 4) | (m))</div><div class='add'>+</div><div class='add'>+/* ROP4 operation values */</div><div class='add'>+#define ROP4_COPY		0xCCCC</div><div class='add'>+#define ROP4_INVERT		0x3333</div><div class='add'>+</div><div class='add'>+/* Hardware limits */</div><div class='add'>+#define MAX_WIDTH		8000</div><div class='add'>+#define MAX_HEIGHT		8000</div><div class='add'>+</div><div class='add'>+#define G2D_TIMEOUT		500</div><div class='add'>+</div><div class='add'>+#define DEFAULT_WIDTH		100</div><div class='add'>+#define DEFAULT_HEIGHT		100</div><div class='add'>+</div><div class='head'>diff --git a/drivers/media/video/s5p-g2d/g2d.c b/drivers/media/video/s5p-g2d/g2d.c<br/>new file mode 100644<br/>index 000000000000..febaa673d363<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-g2d/g2d.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-g2d/g2d.c</a></div><div class='hunk'>@@ -0,0 +1,811 @@</div><div class='add'>+/*</div><div class='add'>+ * Samsung S5P G2D - 2D Graphics Accelerator Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ * Kamil Debski, &lt;k.debski@samsung.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 the</div><div class='add'>+ * Free Software Foundation; either version 2 of the</div><div class='add'>+ * License, or (at your option) 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/fs.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;media/v4l2-mem2mem.h&gt;</div><div class='add'>+#include &lt;media/v4l2-device.h&gt;</div><div class='add'>+#include &lt;media/v4l2-ioctl.h&gt;</div><div class='add'>+#include &lt;media/videobuf2-core.h&gt;</div><div class='add'>+#include &lt;media/videobuf2-dma-contig.h&gt;</div><div class='add'>+</div><div class='add'>+#include "g2d.h"</div><div class='add'>+#include "g2d-regs.h"</div><div class='add'>+</div><div class='add'>+#define fh2ctx(__fh) container_of(__fh, struct g2d_ctx, fh)</div><div class='add'>+</div><div class='add'>+static struct g2d_fmt formats[] = {</div><div class='add'>+	{</div><div class='add'>+		.name	= "XRGB_8888",</div><div class='add'>+		.fourcc	= V4L2_PIX_FMT_RGB32,</div><div class='add'>+		.depth	= 32,</div><div class='add'>+		.hw	= COLOR_MODE(ORDER_XRGB, MODE_XRGB_8888),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "RGB_565",</div><div class='add'>+		.fourcc	= V4L2_PIX_FMT_RGB565X,</div><div class='add'>+		.depth	= 16,</div><div class='add'>+		.hw	= COLOR_MODE(ORDER_XRGB, MODE_RGB_565),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "XRGB_1555",</div><div class='add'>+		.fourcc	= V4L2_PIX_FMT_RGB555X,</div><div class='add'>+		.depth	= 16,</div><div class='add'>+		.hw	= COLOR_MODE(ORDER_XRGB, MODE_XRGB_1555),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "XRGB_4444",</div><div class='add'>+		.fourcc	= V4L2_PIX_FMT_RGB444,</div><div class='add'>+		.depth	= 16,</div><div class='add'>+		.hw	= COLOR_MODE(ORDER_XRGB, MODE_XRGB_4444),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name	= "PACKED_RGB_888",</div><div class='add'>+		.fourcc	= V4L2_PIX_FMT_RGB24,</div><div class='add'>+		.depth	= 24,</div><div class='add'>+		.hw	= COLOR_MODE(ORDER_XRGB, MODE_PACKED_RGB_888),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#define NUM_FORMATS ARRAY_SIZE(formats)</div><div class='add'>+</div><div class='add'>+struct g2d_frame def_frame = {</div><div class='add'>+	.width		= DEFAULT_WIDTH,</div><div class='add'>+	.height		= DEFAULT_HEIGHT,</div><div class='add'>+	.c_width	= DEFAULT_WIDTH,</div><div class='add'>+	.c_height	= DEFAULT_HEIGHT,</div><div class='add'>+	.o_width	= 0,</div><div class='add'>+	.o_height	= 0,</div><div class='add'>+	.fmt		= &amp;formats[0],</div><div class='add'>+	.right		= DEFAULT_WIDTH,</div><div class='add'>+	.bottom		= DEFAULT_HEIGHT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct g2d_fmt *find_fmt(struct v4l2_format *f)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	for (i = 0; i &lt; NUM_FORMATS; i++) {</div><div class='add'>+		if (formats[i].fourcc == f-&gt;fmt.pix.pixelformat)</div><div class='add'>+			return &amp;formats[i];</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'>+static struct g2d_frame *get_frame(struct g2d_ctx *ctx,</div><div class='add'>+							enum v4l2_buf_type type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case V4L2_BUF_TYPE_VIDEO_OUTPUT:</div><div class='add'>+		return &amp;ctx-&gt;in;</div><div class='add'>+	case V4L2_BUF_TYPE_VIDEO_CAPTURE:</div><div class='add'>+		return &amp;ctx-&gt;out;</div><div class='add'>+	default:</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int g2d_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,</div><div class='add'>+			   unsigned int *nbuffers, unsigned int *nplanes,</div><div class='add'>+			   unsigned int sizes[], void *alloc_ctxs[])</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = vb2_get_drv_priv(vq);</div><div class='add'>+	struct g2d_frame *f = get_frame(ctx, vq-&gt;type);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(f))</div><div class='add'>+		return PTR_ERR(f);</div><div class='add'>+</div><div class='add'>+	sizes[0] = f-&gt;size;</div><div class='add'>+	*nplanes = 1;</div><div class='add'>+	alloc_ctxs[0] = ctx-&gt;dev-&gt;alloc_ctx;</div><div class='add'>+</div><div class='add'>+	if (*nbuffers == 0)</div><div class='add'>+		*nbuffers = 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 g2d_buf_prepare(struct vb2_buffer *vb)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = vb2_get_drv_priv(vb-&gt;vb2_queue);</div><div class='add'>+	struct g2d_frame *f = get_frame(ctx, vb-&gt;vb2_queue-&gt;type);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(f))</div><div class='add'>+		return PTR_ERR(f);</div><div class='add'>+	vb2_set_plane_payload(vb, 0, f-&gt;size);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void g2d_buf_queue(struct vb2_buffer *vb)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = vb2_get_drv_priv(vb-&gt;vb2_queue);</div><div class='add'>+	v4l2_m2m_buf_queue(ctx-&gt;m2m_ctx, vb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct vb2_ops g2d_qops = {</div><div class='add'>+	.queue_setup	= g2d_queue_setup,</div><div class='add'>+	.buf_prepare	= g2d_buf_prepare,</div><div class='add'>+	.buf_queue	= g2d_buf_queue,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int queue_init(void *priv, struct vb2_queue *src_vq,</div><div class='add'>+						struct vb2_queue *dst_vq)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(src_vq, 0, sizeof(*src_vq));</div><div class='add'>+	src_vq-&gt;type = V4L2_BUF_TYPE_VIDEO_OUTPUT;</div><div class='add'>+	src_vq-&gt;io_modes = VB2_MMAP | VB2_USERPTR;</div><div class='add'>+	src_vq-&gt;drv_priv = ctx;</div><div class='add'>+	src_vq-&gt;ops = &amp;g2d_qops;</div><div class='add'>+	src_vq-&gt;mem_ops = &amp;vb2_dma_contig_memops;</div><div class='add'>+	src_vq-&gt;buf_struct_size = sizeof(struct v4l2_m2m_buffer);</div><div class='add'>+</div><div class='add'>+	ret = vb2_queue_init(src_vq);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	memset(dst_vq, 0, sizeof(*dst_vq));</div><div class='add'>+	dst_vq-&gt;type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='add'>+	dst_vq-&gt;io_modes = VB2_MMAP | VB2_USERPTR;</div><div class='add'>+	dst_vq-&gt;drv_priv = ctx;</div><div class='add'>+	dst_vq-&gt;ops = &amp;g2d_qops;</div><div class='add'>+	dst_vq-&gt;mem_ops = &amp;vb2_dma_contig_memops;</div><div class='add'>+	dst_vq-&gt;buf_struct_size = sizeof(struct v4l2_m2m_buffer);</div><div class='add'>+</div><div class='add'>+	return vb2_queue_init(dst_vq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int g2d_s_ctrl(struct v4l2_ctrl *ctrl)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = container_of(ctrl-&gt;handler, struct g2d_ctx,</div><div class='add'>+								ctrl_handler);</div><div class='add'>+	switch (ctrl-&gt;id) {</div><div class='add'>+	case V4L2_CID_COLORFX:</div><div class='add'>+		if (ctrl-&gt;val == V4L2_COLORFX_NEGATIVE)</div><div class='add'>+			ctx-&gt;rop = ROP4_INVERT;</div><div class='add'>+		else</div><div class='add'>+			ctx-&gt;rop = ROP4_COPY;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		v4l2_err(&amp;ctx-&gt;dev-&gt;v4l2_dev, "unknown control\n");</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 v4l2_ctrl_ops g2d_ctrl_ops = {</div><div class='add'>+	.s_ctrl		= g2d_s_ctrl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int g2d_setup_ctrls(struct g2d_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	struct g2d_dev *dev = ctx-&gt;dev;</div><div class='add'>+</div><div class='add'>+	v4l2_ctrl_handler_init(&amp;ctx-&gt;ctrl_handler, 1);</div><div class='add'>+	if (ctx-&gt;ctrl_handler.error) {</div><div class='add'>+		v4l2_err(&amp;dev-&gt;v4l2_dev, "v4l2_ctrl_handler_init failed\n");</div><div class='add'>+		return ctx-&gt;ctrl_handler.error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	v4l2_ctrl_new_std_menu(</div><div class='add'>+		&amp;ctx-&gt;ctrl_handler,</div><div class='add'>+		&amp;g2d_ctrl_ops,</div><div class='add'>+		V4L2_CID_COLORFX,</div><div class='add'>+		V4L2_COLORFX_NEGATIVE,</div><div class='add'>+		~((1 &lt;&lt; V4L2_COLORFX_NONE) | (1 &lt;&lt; V4L2_COLORFX_NEGATIVE)),</div><div class='add'>+		V4L2_COLORFX_NONE);</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;ctrl_handler.error) {</div><div class='add'>+		v4l2_err(&amp;dev-&gt;v4l2_dev, "v4l2_ctrl_handler_init failed\n");</div><div class='add'>+		return ctx-&gt;ctrl_handler.error;</div><div 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 g2d_open(struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct g2d_dev *dev = video_drvdata(file);</div><div class='add'>+	struct g2d_ctx *ctx = NULL;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	ctx-&gt;dev = dev;</div><div class='add'>+	/* Set default formats */</div><div class='add'>+	ctx-&gt;in		= def_frame;</div><div class='add'>+	ctx-&gt;out	= def_frame;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;m2m_ctx = v4l2_m2m_ctx_init(dev-&gt;m2m_dev, ctx, &amp;queue_init);</div><div class='add'>+	if (IS_ERR(ctx-&gt;m2m_ctx)) {</div><div class='add'>+		ret = PTR_ERR(ctx-&gt;m2m_ctx);</div><div class='add'>+		kfree(ctx);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	v4l2_fh_init(&amp;ctx-&gt;fh, video_devdata(file));</div><div class='add'>+	file-&gt;private_data = &amp;ctx-&gt;fh;</div><div class='add'>+	v4l2_fh_add(&amp;ctx-&gt;fh);</div><div class='add'>+</div><div class='add'>+	g2d_setup_ctrls(ctx);</div><div class='add'>+</div><div class='add'>+	/* Write the default values to the ctx struct */</div><div class='add'>+	v4l2_ctrl_handler_setup(&amp;ctx-&gt;ctrl_handler);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;fh.ctrl_handler = &amp;ctx-&gt;ctrl_handler;</div><div class='add'>+</div><div class='add'>+	v4l2_info(&amp;dev-&gt;v4l2_dev, "instance opened\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int g2d_release(struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct g2d_dev *dev = video_drvdata(file);</div><div class='add'>+	struct g2d_ctx *ctx = fh2ctx(file-&gt;private_data);</div><div class='add'>+</div><div class='add'>+	v4l2_ctrl_handler_free(&amp;ctx-&gt;ctrl_handler);</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'>+	kfree(ctx);</div><div class='add'>+	v4l2_info(&amp;dev-&gt;v4l2_dev, "instance closed\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int vidioc_querycap(struct file *file, void *priv,</div><div class='add'>+				struct v4l2_capability *cap)</div><div class='add'>+{</div><div class='add'>+	strncpy(cap-&gt;driver, G2D_NAME, sizeof(cap-&gt;driver) - 1);</div><div class='add'>+	strncpy(cap-&gt;card, G2D_NAME, sizeof(cap-&gt;card) - 1);</div><div class='add'>+	cap-&gt;bus_info[0] = 0;</div><div class='add'>+	cap-&gt;version = KERNEL_VERSION(1, 0, 0);</div><div class='add'>+	cap-&gt;capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT</div><div class='add'>+							| V4L2_CAP_STREAMING;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vidioc_enum_fmt(struct file *file, void *prv, struct v4l2_fmtdesc *f)</div><div class='add'>+{</div><div class='add'>+	struct g2d_fmt *fmt;</div><div class='add'>+	if (f-&gt;index &gt;= NUM_FORMATS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	fmt = &amp;formats[f-&gt;index];</div><div class='add'>+	f-&gt;pixelformat = fmt-&gt;fourcc;</div><div class='add'>+	strncpy(f-&gt;description, fmt-&gt;name, sizeof(f-&gt;description) - 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vidioc_g_fmt(struct file *file, void *prv, struct v4l2_format *f)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = prv;</div><div class='add'>+	struct vb2_queue *vq;</div><div class='add'>+	struct g2d_frame *frm;</div><div class='add'>+</div><div class='add'>+	vq = v4l2_m2m_get_vq(ctx-&gt;m2m_ctx, f-&gt;type);</div><div class='add'>+	if (!vq)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	frm = get_frame(ctx, f-&gt;type);</div><div class='add'>+	if (IS_ERR(frm))</div><div class='add'>+		return PTR_ERR(frm);</div><div class='add'>+</div><div class='add'>+	f-&gt;fmt.pix.width		= frm-&gt;width;</div><div class='add'>+	f-&gt;fmt.pix.height		= frm-&gt;height;</div><div class='add'>+	f-&gt;fmt.pix.field		= V4L2_FIELD_NONE;</div><div class='add'>+	f-&gt;fmt.pix.pixelformat		= frm-&gt;fmt-&gt;fourcc;</div><div class='add'>+	f-&gt;fmt.pix.bytesperline		= (frm-&gt;width * frm-&gt;fmt-&gt;depth) &gt;&gt; 3;</div><div class='add'>+	f-&gt;fmt.pix.sizeimage		= frm-&gt;size;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vidioc_try_fmt(struct file *file, void *prv, struct v4l2_format *f)</div><div class='add'>+{</div><div class='add'>+	struct g2d_fmt *fmt;</div><div class='add'>+	enum v4l2_field *field;</div><div class='add'>+</div><div class='add'>+	fmt = find_fmt(f);</div><div class='add'>+	if (!fmt)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	field = &amp;f-&gt;fmt.pix.field;</div><div class='add'>+	if (*field == V4L2_FIELD_ANY)</div><div class='add'>+		*field = V4L2_FIELD_NONE;</div><div class='add'>+	else if (*field != V4L2_FIELD_NONE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (f-&gt;fmt.pix.width &gt; MAX_WIDTH)</div><div class='add'>+		f-&gt;fmt.pix.width = MAX_WIDTH;</div><div class='add'>+	if (f-&gt;fmt.pix.height &gt; MAX_HEIGHT)</div><div class='add'>+		f-&gt;fmt.pix.height = MAX_HEIGHT;</div><div class='add'>+</div><div class='add'>+	if (f-&gt;fmt.pix.width &lt; 1)</div><div class='add'>+		f-&gt;fmt.pix.width = 1;</div><div class='add'>+	if (f-&gt;fmt.pix.height &lt; 1)</div><div class='add'>+		f-&gt;fmt.pix.height = 1;</div><div class='add'>+</div><div class='add'>+	f-&gt;fmt.pix.bytesperline = (f-&gt;fmt.pix.width * fmt-&gt;depth) &gt;&gt; 3;</div><div class='add'>+	f-&gt;fmt.pix.sizeimage = f-&gt;fmt.pix.height * f-&gt;fmt.pix.bytesperline;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vidioc_s_fmt(struct file *file, void *prv, struct v4l2_format *f)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = prv;</div><div class='add'>+	struct g2d_dev *dev = ctx-&gt;dev;</div><div class='add'>+	struct vb2_queue *vq;</div><div class='add'>+	struct g2d_frame *frm;</div><div class='add'>+	struct g2d_fmt *fmt;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Adjust all values accordingly to the hardware capabilities</div><div class='add'>+	 * and chosen format. */</div><div class='add'>+	ret = vidioc_try_fmt(file, prv, f);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	vq = v4l2_m2m_get_vq(ctx-&gt;m2m_ctx, f-&gt;type);</div><div class='add'>+	if (vb2_is_busy(vq)) {</div><div class='add'>+		v4l2_err(&amp;dev-&gt;v4l2_dev, "queue (%d) bust\n", f-&gt;type);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	frm = get_frame(ctx, f-&gt;type);</div><div class='add'>+	if (IS_ERR(frm))</div><div class='add'>+		return PTR_ERR(frm);</div><div class='add'>+	fmt = find_fmt(f);</div><div class='add'>+	if (!fmt)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	frm-&gt;width	= f-&gt;fmt.pix.width;</div><div class='add'>+	frm-&gt;height	= f-&gt;fmt.pix.height;</div><div class='add'>+	frm-&gt;size	= f-&gt;fmt.pix.sizeimage;</div><div class='add'>+	/* Reset crop settings */</div><div class='add'>+	frm-&gt;o_width	= 0;</div><div class='add'>+	frm-&gt;o_height	= 0;</div><div class='add'>+	frm-&gt;c_width	= frm-&gt;width;</div><div class='add'>+	frm-&gt;c_height	= frm-&gt;height;</div><div class='add'>+	frm-&gt;right	= frm-&gt;width;</div><div class='add'>+	frm-&gt;bottom	= frm-&gt;height;</div><div class='add'>+	frm-&gt;fmt	= fmt;</div><div class='add'>+	frm-&gt;stride	= f-&gt;fmt.pix.bytesperline;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int g2d_poll(struct file *file, struct poll_table_struct *wait)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = fh2ctx(file-&gt;private_data);</div><div class='add'>+	return v4l2_m2m_poll(file, ctx-&gt;m2m_ctx, wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int g2d_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = fh2ctx(file-&gt;private_data);</div><div class='add'>+	return v4l2_m2m_mmap(file, ctx-&gt;m2m_ctx, vma);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vidioc_reqbufs(struct file *file, void *priv,</div><div class='add'>+			struct v4l2_requestbuffers *reqbufs)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = priv;</div><div class='add'>+	return v4l2_m2m_reqbufs(file, ctx-&gt;m2m_ctx, reqbufs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vidioc_querybuf(struct file *file, void *priv,</div><div class='add'>+			struct v4l2_buffer *buf)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = priv;</div><div class='add'>+	return v4l2_m2m_querybuf(file, ctx-&gt;m2m_ctx, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = priv;</div><div class='add'>+	return v4l2_m2m_qbuf(file, ctx-&gt;m2m_ctx, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = priv;</div><div class='add'>+	return v4l2_m2m_dqbuf(file, ctx-&gt;m2m_ctx, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int vidioc_streamon(struct file *file, void *priv,</div><div class='add'>+					enum v4l2_buf_type type)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = priv;</div><div class='add'>+	return v4l2_m2m_streamon(file, ctx-&gt;m2m_ctx, type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vidioc_streamoff(struct file *file, void *priv,</div><div class='add'>+					enum v4l2_buf_type type)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = priv;</div><div class='add'>+	return v4l2_m2m_streamoff(file, ctx-&gt;m2m_ctx, type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vidioc_cropcap(struct file *file, void *priv,</div><div class='add'>+					struct v4l2_cropcap *cr)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = priv;</div><div class='add'>+	struct g2d_frame *f;</div><div class='add'>+</div><div class='add'>+	f = get_frame(ctx, cr-&gt;type);</div><div class='add'>+	if (IS_ERR(f))</div><div class='add'>+		return PTR_ERR(f);</div><div class='add'>+</div><div class='add'>+	cr-&gt;bounds.left		= 0;</div><div class='add'>+	cr-&gt;bounds.top		= 0;</div><div class='add'>+	cr-&gt;bounds.width	= f-&gt;width;</div><div class='add'>+	cr-&gt;bounds.height	= f-&gt;height;</div><div class='add'>+	cr-&gt;defrect		= cr-&gt;bounds;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vidioc_g_crop(struct file *file, void *prv, struct v4l2_crop *cr)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = prv;</div><div class='add'>+	struct g2d_frame *f;</div><div class='add'>+</div><div class='add'>+	f = get_frame(ctx, cr-&gt;type);</div><div class='add'>+	if (IS_ERR(f))</div><div class='add'>+		return PTR_ERR(f);</div><div class='add'>+</div><div class='add'>+	cr-&gt;c.left	= f-&gt;o_height;</div><div class='add'>+	cr-&gt;c.top	= f-&gt;o_width;</div><div class='add'>+	cr-&gt;c.width	= f-&gt;c_width;</div><div class='add'>+	cr-&gt;c.height	= f-&gt;c_height;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vidioc_try_crop(struct file *file, void *prv, struct v4l2_crop *cr)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = prv;</div><div class='add'>+	struct g2d_dev *dev = ctx-&gt;dev;</div><div class='add'>+	struct g2d_frame *f;</div><div class='add'>+</div><div class='add'>+	f = get_frame(ctx, cr-&gt;type);</div><div class='add'>+	if (IS_ERR(f))</div><div class='add'>+		return PTR_ERR(f);</div><div class='add'>+</div><div class='add'>+	if (cr-&gt;c.top &lt; 0 || cr-&gt;c.left &lt; 0) {</div><div class='add'>+		v4l2_err(&amp;dev-&gt;v4l2_dev,</div><div class='add'>+			"doesn't support negative values for top &amp; left\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 vidioc_s_crop(struct file *file, void *prv, struct v4l2_crop *cr)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = prv;</div><div class='add'>+	struct g2d_frame *f;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = vidioc_try_crop(file, prv, cr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	f = get_frame(ctx, cr-&gt;type);</div><div class='add'>+	if (IS_ERR(f))</div><div class='add'>+		return PTR_ERR(f);</div><div class='add'>+</div><div class='add'>+	f-&gt;c_width	= cr-&gt;c.width;</div><div class='add'>+	f-&gt;c_height	= cr-&gt;c.height;</div><div class='add'>+	f-&gt;o_width	= cr-&gt;c.left;</div><div class='add'>+	f-&gt;o_height	= cr-&gt;c.top;</div><div class='add'>+	f-&gt;bottom	= f-&gt;o_height + f-&gt;c_height;</div><div class='add'>+	f-&gt;right	= f-&gt;o_width + f-&gt;c_width;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void g2d_lock(void *prv)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = prv;</div><div class='add'>+	struct g2d_dev *dev = ctx-&gt;dev;</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void g2d_unlock(void *prv)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = prv;</div><div class='add'>+	struct g2d_dev *dev = ctx-&gt;dev;</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void job_abort(void *prv)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = prv;</div><div class='add'>+	struct g2d_dev *dev = ctx-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;curr == 0) /* No job currently running */</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = wait_event_timeout(dev-&gt;irq_queue,</div><div class='add'>+		dev-&gt;curr == 0,</div><div class='add'>+		msecs_to_jiffies(G2D_TIMEOUT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void device_run(void *prv)</div><div class='add'>+{</div><div class='add'>+	struct g2d_ctx *ctx = prv;</div><div class='add'>+	struct g2d_dev *dev = ctx-&gt;dev;</div><div class='add'>+	struct vb2_buffer *src, *dst;</div><div class='add'>+	u32 cmd = 0;</div><div class='add'>+</div><div class='add'>+	dev-&gt;curr = ctx;</div><div class='add'>+</div><div class='add'>+	src = v4l2_m2m_next_src_buf(ctx-&gt;m2m_ctx);</div><div class='add'>+	dst = v4l2_m2m_next_dst_buf(ctx-&gt;m2m_ctx);</div><div class='add'>+</div><div class='add'>+	clk_enable(dev-&gt;gate);</div><div class='add'>+	g2d_reset(dev);</div><div class='add'>+</div><div class='add'>+	g2d_set_src_size(dev, &amp;ctx-&gt;in);</div><div class='add'>+	g2d_set_src_addr(dev, vb2_dma_contig_plane_dma_addr(src, 0));</div><div class='add'>+</div><div class='add'>+	g2d_set_dst_size(dev, &amp;ctx-&gt;out);</div><div class='add'>+	g2d_set_dst_addr(dev, vb2_dma_contig_plane_dma_addr(dst, 0));</div><div class='add'>+</div><div class='add'>+	g2d_set_rop4(dev, ctx-&gt;rop);</div><div class='add'>+	if (ctx-&gt;in.c_width != ctx-&gt;out.c_width ||</div><div class='add'>+		ctx-&gt;in.c_height != ctx-&gt;out.c_height)</div><div class='add'>+		cmd |= g2d_cmd_stretch(1);</div><div class='add'>+	g2d_set_cmd(dev, cmd);</div><div class='add'>+	g2d_start(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t g2d_isr(int irq, void *prv)</div><div class='add'>+{</div><div class='add'>+	struct g2d_dev *dev = prv;</div><div class='add'>+	struct g2d_ctx *ctx = dev-&gt;curr;</div><div class='add'>+	struct vb2_buffer *src, *dst;</div><div class='add'>+</div><div class='add'>+	g2d_clear_int(dev);</div><div class='add'>+	clk_disable(dev-&gt;gate);</div><div class='add'>+</div><div class='add'>+	BUG_ON(ctx == 0);</div><div class='add'>+</div><div class='add'>+	src = v4l2_m2m_src_buf_remove(ctx-&gt;m2m_ctx);</div><div class='add'>+	dst = v4l2_m2m_dst_buf_remove(ctx-&gt;m2m_ctx);</div><div class='add'>+</div><div class='add'>+	BUG_ON(src == 0);</div><div class='add'>+	BUG_ON(dst == 0);</div><div class='add'>+</div><div class='add'>+	v4l2_m2m_buf_done(src, VB2_BUF_STATE_DONE);</div><div class='add'>+	v4l2_m2m_buf_done(dst, VB2_BUF_STATE_DONE);</div><div class='add'>+	v4l2_m2m_job_finish(dev-&gt;m2m_dev, ctx-&gt;m2m_ctx);</div><div class='add'>+</div><div class='add'>+	dev-&gt;curr = 0;</div><div class='add'>+	wake_up(&amp;dev-&gt;irq_queue);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct v4l2_file_operations g2d_fops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.open		= g2d_open,</div><div class='add'>+	.release	= g2d_release,</div><div class='add'>+	.poll		= g2d_poll,</div><div class='add'>+	.unlocked_ioctl	= video_ioctl2,</div><div class='add'>+	.mmap		= g2d_mmap,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct v4l2_ioctl_ops g2d_ioctl_ops = {</div><div class='add'>+	.vidioc_querycap	= vidioc_querycap,</div><div class='add'>+</div><div class='add'>+	.vidioc_enum_fmt_vid_cap	= vidioc_enum_fmt,</div><div class='add'>+	.vidioc_g_fmt_vid_cap		= vidioc_g_fmt,</div><div class='add'>+	.vidioc_try_fmt_vid_cap		= vidioc_try_fmt,</div><div class='add'>+	.vidioc_s_fmt_vid_cap		= vidioc_s_fmt,</div><div class='add'>+</div><div class='add'>+	.vidioc_enum_fmt_vid_out	= vidioc_enum_fmt,</div><div class='add'>+	.vidioc_g_fmt_vid_out		= vidioc_g_fmt,</div><div class='add'>+	.vidioc_try_fmt_vid_out		= vidioc_try_fmt,</div><div class='add'>+	.vidioc_s_fmt_vid_out		= vidioc_s_fmt,</div><div class='add'>+</div><div class='add'>+	.vidioc_reqbufs			= vidioc_reqbufs,</div><div class='add'>+	.vidioc_querybuf		= vidioc_querybuf,</div><div class='add'>+</div><div class='add'>+	.vidioc_qbuf			= vidioc_qbuf,</div><div class='add'>+	.vidioc_dqbuf			= vidioc_dqbuf,</div><div class='add'>+</div><div class='add'>+	.vidioc_streamon		= vidioc_streamon,</div><div class='add'>+	.vidioc_streamoff		= vidioc_streamoff,</div><div class='add'>+</div><div class='add'>+	.vidioc_g_crop			= vidioc_g_crop,</div><div class='add'>+	.vidioc_s_crop			= vidioc_s_crop,</div><div class='add'>+	.vidioc_cropcap			= vidioc_cropcap,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct video_device g2d_videodev = {</div><div class='add'>+	.name		= G2D_NAME,</div><div class='add'>+	.fops		= &amp;g2d_fops,</div><div class='add'>+	.ioctl_ops	= &amp;g2d_ioctl_ops,</div><div class='add'>+	.minor		= -1,</div><div class='add'>+	.release	= video_device_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct v4l2_m2m_ops g2d_m2m_ops = {</div><div class='add'>+	.device_run	= device_run,</div><div class='add'>+	.job_abort	= job_abort,</div><div class='add'>+	.lock		= g2d_lock,</div><div class='add'>+	.unlock		= g2d_unlock,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int g2d_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct g2d_dev *dev;</div><div class='add'>+	struct video_device *vfd;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	int ret = 0;</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 -ENOMEM;</div><div class='add'>+	spin_lock_init(&amp;dev-&gt;irqlock);</div><div class='add'>+	mutex_init(&amp;dev-&gt;mutex);</div><div class='add'>+	atomic_set(&amp;dev-&gt;num_inst, 0);</div><div class='add'>+	init_waitqueue_head(&amp;dev-&gt;irq_queue);</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!res) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to find registers\n");</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto free_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;res_regs = request_mem_region(res-&gt;start, resource_size(res),</div><div class='add'>+						dev_name(&amp;pdev-&gt;dev));</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;res_regs) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to obtain register region\n");</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto free_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;regs = ioremap(res-&gt;start, resource_size(res));</div><div class='add'>+	if (!dev-&gt;regs) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to map registers\n");</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto rel_res_regs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;clk = clk_get(&amp;pdev-&gt;dev, "sclk_fimg2d");</div><div class='add'>+	if (IS_ERR_OR_NULL(dev-&gt;clk)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to get g2d clock\n");</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto unmap_regs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;gate = clk_get(&amp;pdev-&gt;dev, "fimg2d");</div><div class='add'>+	if (IS_ERR_OR_NULL(dev-&gt;gate)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to get g2d clock gate\n");</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto put_clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='add'>+	if (!res) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to find IRQ\n");</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto put_clk_gate;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;irq = res-&gt;start;</div><div class='add'>+</div><div class='add'>+	ret = request_irq(dev-&gt;irq, g2d_isr, 0, pdev-&gt;name, dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to install IRQ\n");</div><div class='add'>+		goto put_clk_gate;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;alloc_ctx = vb2_dma_contig_init_ctx(&amp;pdev-&gt;dev);</div><div class='add'>+	if (IS_ERR(dev-&gt;alloc_ctx)) {</div><div class='add'>+		ret = PTR_ERR(dev-&gt;alloc_ctx);</div><div class='add'>+		goto rel_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = v4l2_device_register(&amp;pdev-&gt;dev, &amp;dev-&gt;v4l2_dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto alloc_ctx_cleanup;</div><div class='add'>+	vfd = video_device_alloc();</div><div class='add'>+	if (!vfd) {</div><div class='add'>+		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to allocate video device\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto unreg_v4l2_dev;</div><div class='add'>+	}</div><div class='add'>+	*vfd = g2d_videodev;</div><div class='add'>+	vfd-&gt;lock = &amp;dev-&gt;mutex;</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\n");</div><div class='add'>+		goto rel_vdev;</div><div class='add'>+	}</div><div class='add'>+	video_set_drvdata(vfd, dev);</div><div class='add'>+	snprintf(vfd-&gt;name, sizeof(vfd-&gt;name), "%s", g2d_videodev.name);</div><div class='add'>+	dev-&gt;vfd = vfd;</div><div class='add'>+	v4l2_info(&amp;dev-&gt;v4l2_dev, "device registered as /dev/video%d\n",</div><div class='add'>+								vfd-&gt;num);</div><div class='add'>+	platform_set_drvdata(pdev, dev);</div><div class='add'>+	dev-&gt;m2m_dev = v4l2_m2m_init(&amp;g2d_m2m_ops);</div><div class='add'>+	if (IS_ERR(dev-&gt;m2m_dev)) {</div><div class='add'>+		v4l2_err(&amp;dev-&gt;v4l2_dev, "Failed to init mem2mem device\n");</div><div class='add'>+		ret = PTR_ERR(dev-&gt;m2m_dev);</div><div class='add'>+		goto unreg_video_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	def_frame.stride = (def_frame.width * def_frame.fmt-&gt;depth) &gt;&gt; 3;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unreg_video_dev:</div><div class='add'>+	video_unregister_device(dev-&gt;vfd);</div><div class='add'>+rel_vdev:</div><div class='add'>+	video_device_release(vfd);</div><div class='add'>+unreg_v4l2_dev:</div><div class='add'>+	v4l2_device_unregister(&amp;dev-&gt;v4l2_dev);</div><div class='add'>+alloc_ctx_cleanup:</div><div class='add'>+	vb2_dma_contig_cleanup_ctx(dev-&gt;alloc_ctx);</div><div class='add'>+rel_irq:</div><div class='add'>+	free_irq(dev-&gt;irq, dev);</div><div class='add'>+put_clk_gate:</div><div class='add'>+	clk_put(dev-&gt;gate);</div><div class='add'>+put_clk:</div><div class='add'>+	clk_put(dev-&gt;clk);</div><div class='add'>+unmap_regs:</div><div class='add'>+	iounmap(dev-&gt;regs);</div><div class='add'>+rel_res_regs:</div><div class='add'>+	release_resource(dev-&gt;res_regs);</div><div class='add'>+free_dev:</div><div class='add'>+	kfree(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int g2d_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct g2d_dev *dev = (struct g2d_dev *)platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	v4l2_info(&amp;dev-&gt;v4l2_dev, "Removing " G2D_NAME);</div><div class='add'>+	v4l2_m2m_release(dev-&gt;m2m_dev);</div><div class='add'>+	video_unregister_device(dev-&gt;vfd);</div><div class='add'>+	v4l2_device_unregister(&amp;dev-&gt;v4l2_dev);</div><div class='add'>+	vb2_dma_contig_cleanup_ctx(dev-&gt;alloc_ctx);</div><div class='add'>+	free_irq(dev-&gt;irq, dev);</div><div class='add'>+	clk_put(dev-&gt;gate);</div><div class='add'>+	clk_put(dev-&gt;clk);</div><div class='add'>+	iounmap(dev-&gt;regs);</div><div class='add'>+	release_resource(dev-&gt;res_regs);</div><div class='add'>+	kfree(dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver g2d_pdrv = {</div><div class='add'>+	.probe		= g2d_probe,</div><div class='add'>+	.remove		= g2d_remove,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name = G2D_NAME,</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(g2d_pdrv);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Kamil Debski &lt;k.debski@samsung.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("S5P G2D 2d graphics accelerator driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/video/s5p-g2d/g2d.h b/drivers/media/video/s5p-g2d/g2d.h<br/>new file mode 100644<br/>index 000000000000..5eae90107bf8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-g2d/g2d.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-g2d/g2d.h</a></div><div class='hunk'>@@ -0,0 +1,83 @@</div><div class='add'>+/*</div><div class='add'>+ * Samsung S5P G2D - 2D Graphics Accelerator Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ * Kamil Debski, &lt;k.debski@samsung.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 the</div><div class='add'>+ * Free Software Foundation; either version 2 of the</div><div class='add'>+ * License, or (at your option) any later version</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;media/v4l2-device.h&gt;</div><div class='add'>+#include &lt;media/v4l2-ctrls.h&gt;</div><div class='add'>+</div><div class='add'>+#define G2D_NAME "s5p-g2d"</div><div class='add'>+</div><div class='add'>+struct g2d_dev {</div><div class='add'>+	struct v4l2_device	v4l2_dev;</div><div class='add'>+	struct v4l2_m2m_dev	*m2m_dev;</div><div class='add'>+	struct video_device	*vfd;</div><div class='add'>+	struct mutex		mutex;</div><div class='add'>+	spinlock_t		irqlock;</div><div class='add'>+	atomic_t		num_inst;</div><div class='add'>+	struct vb2_alloc_ctx	*alloc_ctx;</div><div class='add'>+	struct resource		*res_regs;</div><div class='add'>+	void __iomem		*regs;</div><div class='add'>+	struct clk		*clk;</div><div class='add'>+	struct clk		*gate;</div><div class='add'>+	struct g2d_ctx		*curr;</div><div class='add'>+	int irq;</div><div class='add'>+	wait_queue_head_t	irq_queue;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct g2d_frame {</div><div class='add'>+	/* Original dimensions */</div><div class='add'>+	u32	width;</div><div class='add'>+	u32	height;</div><div class='add'>+	/* Crop size */</div><div class='add'>+	u32	c_width;</div><div class='add'>+	u32	c_height;</div><div class='add'>+	/* Offset */</div><div class='add'>+	u32	o_width;</div><div class='add'>+	u32	o_height;</div><div class='add'>+	/* Image format */</div><div class='add'>+	struct g2d_fmt *fmt;</div><div class='add'>+	/* Variables that can calculated once and reused */</div><div class='add'>+	u32	stride;</div><div class='add'>+	u32	bottom;</div><div class='add'>+	u32	right;</div><div class='add'>+	u32	size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct g2d_ctx {</div><div class='add'>+	struct v4l2_fh fh;</div><div class='add'>+	struct g2d_dev		*dev;</div><div class='add'>+	struct v4l2_m2m_ctx     *m2m_ctx;</div><div class='add'>+	struct g2d_frame	in;</div><div class='add'>+	struct g2d_frame	out;</div><div class='add'>+	struct v4l2_ctrl_handler ctrl_handler;</div><div class='add'>+	u32 rop;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct g2d_fmt {</div><div class='add'>+	char	*name;</div><div class='add'>+	u32	fourcc;</div><div class='add'>+	int	depth;</div><div class='add'>+	u32	hw;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void g2d_reset(struct g2d_dev *d);</div><div class='add'>+void g2d_set_src_size(struct g2d_dev *d, struct g2d_frame *f);</div><div class='add'>+void g2d_set_src_addr(struct g2d_dev *d, dma_addr_t a);</div><div class='add'>+void g2d_set_dst_size(struct g2d_dev *d, struct g2d_frame *f);</div><div class='add'>+void g2d_set_dst_addr(struct g2d_dev *d, dma_addr_t a);</div><div class='add'>+void g2d_start(struct g2d_dev *d);</div><div class='add'>+void g2d_clear_int(struct g2d_dev *d);</div><div class='add'>+void g2d_set_rop4(struct g2d_dev *d, u32 r);</div><div class='add'>+u32 g2d_cmd_stretch(u32 e);</div><div class='add'>+void g2d_set_cmd(struct g2d_dev *d, u32 c);</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/media/video/s5p-jpeg/Makefile b/drivers/media/video/s5p-jpeg/Makefile<br/>new file mode 100644<br/>index 000000000000..ddc2900d88a2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-jpeg/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-jpeg/Makefile</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+s5p-jpeg-objs := jpeg-core.o</div><div class='add'>+obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG) := s5p-jpeg.o</div><div class='head'>diff --git a/drivers/media/video/s5p-jpeg/jpeg-core.c b/drivers/media/video/s5p-jpeg/jpeg-core.c<br/>new file mode 100644<br/>index 000000000000..1105a8749c8b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-jpeg/jpeg-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-jpeg/jpeg-core.c</a></div><div class='hunk'>@@ -0,0 +1,1482 @@</div><div class='add'>+/* linux/drivers/media/video/s5p-jpeg/jpeg-core.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * Author: Andrzej Pietrasiewicz &lt;andrzej.p@samsung.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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</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/err.h&gt;</div><div class='add'>+#include &lt;linux/gfp.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;media/v4l2-mem2mem.h&gt;</div><div class='add'>+#include &lt;media/v4l2-ioctl.h&gt;</div><div class='add'>+#include &lt;media/videobuf2-core.h&gt;</div><div class='add'>+#include &lt;media/videobuf2-dma-contig.h&gt;</div><div class='add'>+</div><div class='add'>+#include "jpeg-core.h"</div><div class='add'>+#include "jpeg-hw.h"</div><div class='add'>+</div><div class='add'>+static struct s5p_jpeg_fmt formats_enc[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "YUV 4:2:0 planar, YCbCr",</div><div class='add'>+		.fourcc		= V4L2_PIX_FMT_YUV420,</div><div class='add'>+		.depth		= 12,</div><div class='add'>+		.colplanes	= 3,</div><div class='add'>+		.types		= MEM2MEM_CAPTURE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "YUV 4:2:2 packed, YCbYCr",</div><div class='add'>+		.fourcc		= V4L2_PIX_FMT_YUYV,</div><div class='add'>+		.depth		= 16,</div><div class='add'>+		.colplanes	= 1,</div><div class='add'>+		.types		= MEM2MEM_CAPTURE | MEM2MEM_OUTPUT,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "RGB565",</div><div class='add'>+		.fourcc		= V4L2_PIX_FMT_RGB565,</div><div class='add'>+		.depth		= 16,</div><div class='add'>+		.colplanes	= 1,</div><div class='add'>+		.types		= MEM2MEM_OUTPUT,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#define NUM_FORMATS_ENC ARRAY_SIZE(formats_enc)</div><div class='add'>+</div><div class='add'>+static struct s5p_jpeg_fmt formats_dec[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "YUV 4:2:0 planar, YCbCr",</div><div class='add'>+		.fourcc		= V4L2_PIX_FMT_YUV420,</div><div class='add'>+		.depth		= 12,</div><div class='add'>+		.colplanes	= 3,</div><div class='add'>+		.h_align	= 4,</div><div class='add'>+		.v_align	= 4,</div><div class='add'>+		.types		= MEM2MEM_CAPTURE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "YUV 4:2:2 packed, YCbYCr",</div><div class='add'>+		.fourcc		= V4L2_PIX_FMT_YUYV,</div><div class='add'>+		.depth		= 16,</div><div class='add'>+		.colplanes	= 1,</div><div class='add'>+		.h_align	= 4,</div><div class='add'>+		.v_align	= 3,</div><div class='add'>+		.types		= MEM2MEM_CAPTURE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "JPEG JFIF",</div><div class='add'>+		.fourcc		= V4L2_PIX_FMT_JPEG,</div><div class='add'>+		.colplanes	= 1,</div><div class='add'>+		.types		= MEM2MEM_OUTPUT,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#define NUM_FORMATS_DEC ARRAY_SIZE(formats_dec)</div><div class='add'>+</div><div class='add'>+static const unsigned char qtbl_luminance[4][64] = {</div><div class='add'>+	{/* level 1 - high quality */</div><div class='add'>+		 8,  6,  6,  8, 12, 14, 16, 17,</div><div class='add'>+		 6,  6,  6,  8, 10, 13, 12, 15,</div><div class='add'>+		 6,  6,  7,  8, 13, 14, 18, 24,</div><div class='add'>+		 8,  8,  8, 14, 13, 19, 24, 35,</div><div class='add'>+		12, 10, 13, 13, 20, 26, 34, 39,</div><div class='add'>+		14, 13, 14, 19, 26, 34, 39, 39,</div><div class='add'>+		16, 12, 18, 24, 34, 39, 39, 39,</div><div class='add'>+		17, 15, 24, 35, 39, 39, 39, 39</div><div class='add'>+	},</div><div class='add'>+	{/* level 2 */</div><div class='add'>+		12,  8,  8, 12, 17, 21, 24, 23,</div><div class='add'>+		 8,  9,  9, 11, 15, 19, 18, 23,</div><div class='add'>+		 8,  9, 10, 12, 19, 20, 27, 36,</div><div class='add'>+		12, 11, 12, 21, 20, 28, 36, 53,</div><div class='add'>+		17, 15, 19, 20, 30, 39, 51, 59,</div><div class='add'>+		21, 19, 20, 28, 39, 51, 59, 59,</div><div class='add'>+		24, 18, 27, 36, 51, 59, 59, 59,</div><div class='add'>+		23, 23, 36, 53, 59, 59, 59, 59</div><div class='add'>+	},</div><div class='add'>+	{/* level 3 */</div><div class='add'>+		16, 11, 11, 16, 23, 27, 31, 30,</div><div class='add'>+		11, 12, 12, 15, 20, 23, 23, 30,</div><div class='add'>+		11, 12, 13, 16, 23, 26, 35, 47,</div><div class='add'>+		16, 15, 16, 23, 26, 37, 47, 64,</div><div class='add'>+		23, 20, 23, 26, 39, 51, 64, 64,</div><div class='add'>+		27, 23, 26, 37, 51, 64, 64, 64,</div><div class='add'>+		31, 23, 35, 47, 64, 64, 64, 64,</div><div class='add'>+		30, 30, 47, 64, 64, 64, 64, 64</div><div class='add'>+	},</div><div class='add'>+	{/*level 4 - low quality */</div><div class='add'>+		20, 16, 25, 39, 50, 46, 62, 68,</div><div class='add'>+		16, 18, 23, 38, 38, 53, 65, 68,</div><div class='add'>+		25, 23, 31, 38, 53, 65, 68, 68,</div><div class='add'>+		39, 38, 38, 53, 65, 68, 68, 68,</div><div class='add'>+		50, 38, 53, 65, 68, 68, 68, 68,</div><div class='add'>+		46, 53, 65, 68, 68, 68, 68, 68,</div><div class='add'>+		62, 65, 68, 68, 68, 68, 68, 68,</div><div class='add'>+		68, 68, 68, 68, 68, 68, 68, 68</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned char qtbl_chrominance[4][64] = {</div><div class='add'>+	{/* level 1 - high quality */</div><div class='add'>+		 9,  8,  9, 11, 14, 17, 19, 24,</div><div class='add'>+		 8, 10,  9, 11, 14, 13, 17, 22,</div><div class='add'>+		 9,  9, 13, 14, 13, 15, 23, 26,</div><div class='add'>+		11, 11, 14, 14, 15, 20, 26, 33,</div><div class='add'>+		14, 14, 13, 15, 20, 24, 33, 39,</div><div class='add'>+		17, 13, 15, 20, 24, 32, 39, 39,</div><div class='add'>+		19, 17, 23, 26, 33, 39, 39, 39,</div><div class='add'>+		24, 22, 26, 33, 39, 39, 39, 39</div><div class='add'>+	},</div><div class='add'>+	{/* level 2 */</div><div class='add'>+		13, 11, 13, 16, 20, 20, 29, 37,</div><div class='add'>+		11, 14, 14, 14, 16, 20, 26, 32,</div><div class='add'>+		13, 14, 15, 17, 20, 23, 35, 40,</div><div class='add'>+		16, 14, 17, 21, 23, 30, 40, 50,</div><div class='add'>+		20, 16, 20, 23, 30, 37, 50, 59,</div><div class='add'>+		20, 20, 23, 30, 37, 48, 59, 59,</div><div class='add'>+		29, 26, 35, 40, 50, 59, 59, 59,</div><div class='add'>+		37, 32, 40, 50, 59, 59, 59, 59</div><div class='add'>+	},</div><div class='add'>+	{/* level 3 */</div><div class='add'>+		17, 15, 17, 21, 20, 26, 38, 48,</div><div class='add'>+		15, 19, 18, 17, 20, 26, 35, 43,</div><div class='add'>+		17, 18, 20, 22, 26, 30, 46, 53,</div><div class='add'>+		21, 17, 22, 28, 30, 39, 53, 64,</div><div class='add'>+		20, 20, 26, 30, 39, 48, 64, 64,</div><div class='add'>+		26, 26, 30, 39, 48, 63, 64, 64,</div><div class='add'>+		38, 35, 46, 53, 64, 64, 64, 64,</div><div class='add'>+		48, 43, 53, 64, 64, 64, 64, 64</div><div class='add'>+	},</div><div class='add'>+	{/*level 4 - low quality */</div><div class='add'>+		21, 25, 32, 38, 54, 68, 68, 68,</div><div class='add'>+		25, 28, 24, 38, 54, 68, 68, 68,</div><div class='add'>+		32, 24, 32, 43, 66, 68, 68, 68,</div><div class='add'>+		38, 38, 43, 53, 68, 68, 68, 68,</div><div class='add'>+		54, 54, 66, 68, 68, 68, 68, 68,</div><div class='add'>+		68, 68, 68, 68, 68, 68, 68, 68,</div><div class='add'>+		68, 68, 68, 68, 68, 68, 68, 68,</div><div class='add'>+		68, 68, 68, 68, 68, 68, 68, 68</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned char hdctbl0[16] = {</div><div class='add'>+	0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned char hdctblg0[12] = {</div><div class='add'>+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0xa, 0xb</div><div class='add'>+};</div><div class='add'>+static const unsigned char hactbl0[16] = {</div><div class='add'>+	0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d</div><div class='add'>+};</div><div class='add'>+static const unsigned char hactblg0[162] = {</div><div class='add'>+	0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,</div><div class='add'>+	0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,</div><div class='add'>+	0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,</div><div class='add'>+	0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,</div><div class='add'>+	0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,</div><div class='add'>+	0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,</div><div class='add'>+	0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,</div><div class='add'>+	0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,</div><div class='add'>+	0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,</div><div class='add'>+	0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,</div><div class='add'>+	0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,</div><div class='add'>+	0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,</div><div class='add'>+	0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,</div><div class='add'>+	0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,</div><div class='add'>+	0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,</div><div class='add'>+	0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,</div><div class='add'>+	0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,</div><div class='add'>+	0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,</div><div class='add'>+	0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,</div><div class='add'>+	0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,</div><div class='add'>+	0xf9, 0xfa</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void jpeg_set_qtbl(void __iomem *regs, const unsigned char *qtbl,</div><div class='add'>+		   unsigned long tab, int len)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i++)</div><div class='add'>+		writel((unsigned int)qtbl[i], regs + tab + (i * 0x04));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_set_qtbl_lum(void __iomem *regs, int quality)</div><div class='add'>+{</div><div class='add'>+	/* this driver fills quantisation table 0 with data for luma */</div><div class='add'>+	jpeg_set_qtbl(regs, qtbl_luminance[quality], S5P_JPG_QTBL_CONTENT(0),</div><div class='add'>+		      ARRAY_SIZE(qtbl_luminance[quality]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_set_qtbl_chr(void __iomem *regs, int quality)</div><div class='add'>+{</div><div class='add'>+	/* this driver fills quantisation table 1 with data for chroma */</div><div class='add'>+	jpeg_set_qtbl(regs, qtbl_chrominance[quality], S5P_JPG_QTBL_CONTENT(1),</div><div class='add'>+		      ARRAY_SIZE(qtbl_chrominance[quality]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_set_htbl(void __iomem *regs, const unsigned char *htbl,</div><div class='add'>+		   unsigned long tab, int len)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i++)</div><div class='add'>+		writel((unsigned int)htbl[i], regs + tab + (i * 0x04));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_set_hdctbl(void __iomem *regs)</div><div class='add'>+{</div><div class='add'>+	/* this driver fills table 0 for this component */</div><div class='add'>+	jpeg_set_htbl(regs, hdctbl0, S5P_JPG_HDCTBL(0), ARRAY_SIZE(hdctbl0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_set_hdctblg(void __iomem *regs)</div><div class='add'>+{</div><div class='add'>+	/* this driver fills table 0 for this component */</div><div class='add'>+	jpeg_set_htbl(regs, hdctblg0, S5P_JPG_HDCTBLG(0), ARRAY_SIZE(hdctblg0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_set_hactbl(void __iomem *regs)</div><div class='add'>+{</div><div class='add'>+	/* this driver fills table 0 for this component */</div><div class='add'>+	jpeg_set_htbl(regs, hactbl0, S5P_JPG_HACTBL(0), ARRAY_SIZE(hactbl0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_set_hactblg(void __iomem *regs)</div><div class='add'>+{</div><div class='add'>+	/* this driver fills table 0 for this component */</div><div class='add'>+	jpeg_set_htbl(regs, hactblg0, S5P_JPG_HACTBLG(0), ARRAY_SIZE(hactblg0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ============================================================================</div><div class='add'>+ * Device file operations</div><div class='add'>+ * ============================================================================</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int queue_init(void *priv, struct vb2_queue *src_vq,</div><div class='add'>+		      struct vb2_queue *dst_vq);</div><div class='add'>+static struct s5p_jpeg_fmt *s5p_jpeg_find_format(unsigned int mode,</div><div class='add'>+						 __u32 pixelformat);</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_open(struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg *jpeg = video_drvdata(file);</div><div class='add'>+	struct video_device *vfd = video_devdata(file);</div><div class='add'>+	struct s5p_jpeg_ctx *ctx;</div><div class='add'>+	struct s5p_jpeg_fmt *out_fmt;</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof *ctx, GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = ctx;</div><div class='add'>+	ctx-&gt;jpeg = jpeg;</div><div class='add'>+	if (vfd == jpeg-&gt;vfd_encoder) {</div><div class='add'>+		ctx-&gt;mode = S5P_JPEG_ENCODE;</div><div class='add'>+		out_fmt = s5p_jpeg_find_format(ctx-&gt;mode, V4L2_PIX_FMT_RGB565);</div><div class='add'>+	} else {</div><div class='add'>+		ctx-&gt;mode = S5P_JPEG_DECODE;</div><div class='add'>+		out_fmt = s5p_jpeg_find_format(ctx-&gt;mode, V4L2_PIX_FMT_JPEG);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;m2m_ctx = v4l2_m2m_ctx_init(jpeg-&gt;m2m_dev, ctx, queue_init);</div><div class='add'>+	if (IS_ERR(ctx-&gt;m2m_ctx)) {</div><div class='add'>+		int err = PTR_ERR(ctx-&gt;m2m_ctx);</div><div class='add'>+		kfree(ctx);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;out_q.fmt = out_fmt;</div><div class='add'>+	ctx-&gt;cap_q.fmt = s5p_jpeg_find_format(ctx-&gt;mode, V4L2_PIX_FMT_YUYV);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_release(struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	v4l2_m2m_ctx_release(ctx-&gt;m2m_ctx);</div><div class='add'>+	kfree(ctx);</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 s5p_jpeg_poll(struct file *file,</div><div class='add'>+				 struct poll_table_struct *wait)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return v4l2_m2m_poll(file, ctx-&gt;m2m_ctx, wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return v4l2_m2m_mmap(file, ctx-&gt;m2m_ctx, vma);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct v4l2_file_operations s5p_jpeg_fops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.open		= s5p_jpeg_open,</div><div class='add'>+	.release	= s5p_jpeg_release,</div><div class='add'>+	.poll		= s5p_jpeg_poll,</div><div class='add'>+	.unlocked_ioctl	= video_ioctl2,</div><div class='add'>+	.mmap		= s5p_jpeg_mmap,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ============================================================================</div><div class='add'>+ * video ioctl operations</div><div class='add'>+ * ============================================================================</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int get_byte(struct s5p_jpeg_buffer *buf)</div><div class='add'>+{</div><div class='add'>+	if (buf-&gt;curr &gt;= buf-&gt;size)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return ((unsigned char *)buf-&gt;data)[buf-&gt;curr++];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_word_be(struct s5p_jpeg_buffer *buf, unsigned int *word)</div><div class='add'>+{</div><div class='add'>+	unsigned int temp;</div><div class='add'>+	int byte;</div><div class='add'>+</div><div class='add'>+	byte = get_byte(buf);</div><div class='add'>+	if (byte == -1)</div><div class='add'>+		return -1;</div><div class='add'>+	temp = byte &lt;&lt; 8;</div><div class='add'>+	byte = get_byte(buf);</div><div class='add'>+	if (byte == -1)</div><div class='add'>+		return -1;</div><div class='add'>+	*word = (unsigned int)byte | temp;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void skip(struct s5p_jpeg_buffer *buf, long len)</div><div class='add'>+{</div><div class='add'>+	if (len &lt;= 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	while (len--)</div><div class='add'>+		get_byte(buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool s5p_jpeg_parse_hdr(struct s5p_jpeg_q_data *result,</div><div class='add'>+			       unsigned long buffer, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	int c, components, notfound;</div><div class='add'>+	unsigned int height, width, word;</div><div class='add'>+	long length;</div><div class='add'>+	struct s5p_jpeg_buffer jpeg_buffer;</div><div class='add'>+</div><div class='add'>+	jpeg_buffer.size = size;</div><div class='add'>+	jpeg_buffer.data = buffer;</div><div class='add'>+	jpeg_buffer.curr = 0;</div><div class='add'>+</div><div class='add'>+	notfound = 1;</div><div class='add'>+	while (notfound) {</div><div class='add'>+		c = get_byte(&amp;jpeg_buffer);</div><div class='add'>+		if (c == -1)</div><div class='add'>+			break;</div><div class='add'>+		if (c != 0xff)</div><div class='add'>+			continue;</div><div class='add'>+		do</div><div class='add'>+			c = get_byte(&amp;jpeg_buffer);</div><div class='add'>+		while (c == 0xff);</div><div class='add'>+		if (c == -1)</div><div class='add'>+			break;</div><div class='add'>+		if (c == 0)</div><div class='add'>+			continue;</div><div class='add'>+		length = 0;</div><div class='add'>+		switch (c) {</div><div class='add'>+		/* SOF0: baseline JPEG */</div><div class='add'>+		case SOF0:</div><div class='add'>+			if (get_word_be(&amp;jpeg_buffer, &amp;word))</div><div class='add'>+				break;</div><div class='add'>+			if (get_byte(&amp;jpeg_buffer) == -1)</div><div class='add'>+				break;</div><div class='add'>+			if (get_word_be(&amp;jpeg_buffer, &amp;height))</div><div class='add'>+				break;</div><div class='add'>+			if (get_word_be(&amp;jpeg_buffer, &amp;width))</div><div class='add'>+				break;</div><div class='add'>+			components = get_byte(&amp;jpeg_buffer);</div><div class='add'>+			if (components == -1)</div><div class='add'>+				break;</div><div class='add'>+			notfound = 0;</div><div class='add'>+</div><div class='add'>+			skip(&amp;jpeg_buffer, components * 3);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* skip payload-less markers */</div><div class='add'>+		case RST ... RST + 7:</div><div class='add'>+		case SOI:</div><div class='add'>+		case EOI:</div><div class='add'>+		case TEM:</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* skip uninteresting payload markers */</div><div class='add'>+		default:</div><div class='add'>+			if (get_word_be(&amp;jpeg_buffer, &amp;word))</div><div class='add'>+				break;</div><div class='add'>+			length = (long)word - 2;</div><div class='add'>+			skip(&amp;jpeg_buffer, length);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	result-&gt;w = width;</div><div class='add'>+	result-&gt;h = height;</div><div class='add'>+	result-&gt;size = components;</div><div class='add'>+	return !notfound;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_querycap(struct file *file, void *priv,</div><div class='add'>+			   struct v4l2_capability *cap)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = priv;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;mode == S5P_JPEG_ENCODE) {</div><div class='add'>+		strlcpy(cap-&gt;driver, S5P_JPEG_M2M_NAME " encoder",</div><div class='add'>+			sizeof(cap-&gt;driver));</div><div class='add'>+		strlcpy(cap-&gt;card, S5P_JPEG_M2M_NAME " encoder",</div><div class='add'>+			sizeof(cap-&gt;card));</div><div class='add'>+	} else {</div><div class='add'>+		strlcpy(cap-&gt;driver, S5P_JPEG_M2M_NAME " decoder",</div><div class='add'>+			sizeof(cap-&gt;driver));</div><div class='add'>+		strlcpy(cap-&gt;card, S5P_JPEG_M2M_NAME " decoder",</div><div class='add'>+			sizeof(cap-&gt;card));</div><div class='add'>+	}</div><div class='add'>+	cap-&gt;bus_info[0] = 0;</div><div class='add'>+	cap-&gt;capabilities = V4L2_CAP_STREAMING |</div><div class='add'>+			    V4L2_CAP_VIDEO_CAPTURE |</div><div class='add'>+			    V4L2_CAP_VIDEO_OUTPUT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enum_fmt(struct s5p_jpeg_fmt *formats, int n,</div><div class='add'>+		    struct v4l2_fmtdesc *f, u32 type)</div><div class='add'>+{</div><div class='add'>+	int i, num = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n; ++i) {</div><div class='add'>+		if (formats[i].types &amp; type) {</div><div class='add'>+			/* index-th format of type type found ? */</div><div class='add'>+			if (num == f-&gt;index)</div><div class='add'>+				break;</div><div class='add'>+			/* Correct type but haven't reached our index yet,</div><div class='add'>+			 * just increment per-type index */</div><div class='add'>+			++num;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Format not found */</div><div class='add'>+	if (i &gt;= n)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	strlcpy(f-&gt;description, formats[i].name, sizeof(f-&gt;description));</div><div class='add'>+	f-&gt;pixelformat = formats[i].fourcc;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_enum_fmt_vid_cap(struct file *file, void *priv,</div><div class='add'>+				   struct v4l2_fmtdesc *f)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = priv;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;mode == S5P_JPEG_ENCODE)</div><div class='add'>+		return enum_fmt(formats_enc, NUM_FORMATS_ENC, f,</div><div class='add'>+				MEM2MEM_CAPTURE);</div><div class='add'>+</div><div class='add'>+	return enum_fmt(formats_dec, NUM_FORMATS_DEC, f, MEM2MEM_CAPTURE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_enum_fmt_vid_out(struct file *file, void *priv,</div><div class='add'>+				   struct v4l2_fmtdesc *f)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = priv;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;mode == S5P_JPEG_ENCODE)</div><div class='add'>+		return enum_fmt(formats_enc, NUM_FORMATS_ENC, f,</div><div class='add'>+				MEM2MEM_OUTPUT);</div><div class='add'>+</div><div class='add'>+	return enum_fmt(formats_dec, NUM_FORMATS_DEC, f, MEM2MEM_OUTPUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct s5p_jpeg_q_data *get_q_data(struct s5p_jpeg_ctx *ctx,</div><div class='add'>+					  enum v4l2_buf_type type)</div><div class='add'>+{</div><div class='add'>+	if (type == V4L2_BUF_TYPE_VIDEO_OUTPUT)</div><div class='add'>+		return &amp;ctx-&gt;out_q;</div><div class='add'>+	if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+		return &amp;ctx-&gt;cap_q;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_g_fmt(struct file *file, void *priv, struct v4l2_format *f)</div><div class='add'>+{</div><div class='add'>+	struct vb2_queue *vq;</div><div class='add'>+	struct s5p_jpeg_q_data *q_data = NULL;</div><div class='add'>+	struct v4l2_pix_format *pix = &amp;f-&gt;fmt.pix;</div><div class='add'>+	struct s5p_jpeg_ctx *ct = priv;</div><div class='add'>+</div><div class='add'>+	vq = v4l2_m2m_get_vq(ct-&gt;m2m_ctx, f-&gt;type);</div><div class='add'>+	if (!vq)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (f-&gt;type == V4L2_BUF_TYPE_VIDEO_CAPTURE &amp;&amp;</div><div class='add'>+	    ct-&gt;mode == S5P_JPEG_DECODE &amp;&amp; !ct-&gt;hdr_parsed)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	q_data = get_q_data(ct, f-&gt;type);</div><div class='add'>+	BUG_ON(q_data == NULL);</div><div class='add'>+</div><div class='add'>+	pix-&gt;width = q_data-&gt;w;</div><div class='add'>+	pix-&gt;height = q_data-&gt;h;</div><div class='add'>+	pix-&gt;field = V4L2_FIELD_NONE;</div><div class='add'>+	pix-&gt;pixelformat = q_data-&gt;fmt-&gt;fourcc;</div><div class='add'>+	pix-&gt;bytesperline = 0;</div><div class='add'>+	if (q_data-&gt;fmt-&gt;fourcc != V4L2_PIX_FMT_JPEG) {</div><div class='add'>+		u32 bpl = q_data-&gt;w;</div><div class='add'>+		if (q_data-&gt;fmt-&gt;colplanes == 1)</div><div class='add'>+			bpl = (bpl * q_data-&gt;fmt-&gt;depth) &gt;&gt; 3;</div><div class='add'>+		pix-&gt;bytesperline = bpl;</div><div class='add'>+	}</div><div class='add'>+	pix-&gt;sizeimage = q_data-&gt;size;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct s5p_jpeg_fmt *s5p_jpeg_find_format(unsigned int mode,</div><div class='add'>+						 u32 pixelformat)</div><div class='add'>+{</div><div class='add'>+	unsigned int k;</div><div class='add'>+	struct s5p_jpeg_fmt *formats;</div><div class='add'>+	int n;</div><div class='add'>+</div><div class='add'>+	if (mode == S5P_JPEG_ENCODE) {</div><div class='add'>+		formats = formats_enc;</div><div class='add'>+		n = NUM_FORMATS_ENC;</div><div class='add'>+	} else {</div><div class='add'>+		formats = formats_dec;</div><div class='add'>+		n = NUM_FORMATS_DEC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (k = 0; k &lt; n; k++) {</div><div class='add'>+		struct s5p_jpeg_fmt *fmt = &amp;formats[k];</div><div class='add'>+		if (fmt-&gt;fourcc == pixelformat)</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='add'>+</div><div class='add'>+static void jpeg_bound_align_image(u32 *w, unsigned int wmin, unsigned int wmax,</div><div class='add'>+				   unsigned int walign,</div><div class='add'>+				   u32 *h, unsigned int hmin, unsigned int hmax,</div><div class='add'>+				   unsigned int halign)</div><div class='add'>+{</div><div class='add'>+	int width, height, w_step, h_step;</div><div class='add'>+</div><div class='add'>+	width = *w;</div><div class='add'>+	height = *h;</div><div class='add'>+</div><div class='add'>+	w_step = 1 &lt;&lt; walign;</div><div class='add'>+	h_step = 1 &lt;&lt; halign;</div><div class='add'>+	v4l_bound_align_image(w, wmin, wmax, walign, h, hmin, hmax, halign, 0);</div><div class='add'>+</div><div class='add'>+	if (*w &lt; width &amp;&amp; (*w + w_step) &lt; wmax)</div><div class='add'>+		*w += w_step;</div><div class='add'>+	if (*h &lt; height &amp;&amp; (*h + h_step) &lt; hmax)</div><div class='add'>+		*h += h_step;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vidioc_try_fmt(struct v4l2_format *f, struct s5p_jpeg_fmt *fmt,</div><div class='add'>+			  struct s5p_jpeg_ctx *ctx, int q_type)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_pix_format *pix = &amp;f-&gt;fmt.pix;</div><div class='add'>+</div><div class='add'>+	if (pix-&gt;field == V4L2_FIELD_ANY)</div><div class='add'>+		pix-&gt;field = V4L2_FIELD_NONE;</div><div class='add'>+	else if (pix-&gt;field != V4L2_FIELD_NONE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* V4L2 specification suggests the driver corrects the format struct</div><div class='add'>+	 * if any of the dimensions is unsupported */</div><div class='add'>+	if (q_type == MEM2MEM_OUTPUT)</div><div class='add'>+		jpeg_bound_align_image(&amp;pix-&gt;width, S5P_JPEG_MIN_WIDTH,</div><div class='add'>+				       S5P_JPEG_MAX_WIDTH, 0,</div><div class='add'>+				       &amp;pix-&gt;height, S5P_JPEG_MIN_HEIGHT,</div><div class='add'>+				       S5P_JPEG_MAX_HEIGHT, 0);</div><div class='add'>+	else</div><div class='add'>+		jpeg_bound_align_image(&amp;pix-&gt;width, S5P_JPEG_MIN_WIDTH,</div><div class='add'>+				       S5P_JPEG_MAX_WIDTH, fmt-&gt;h_align,</div><div class='add'>+				       &amp;pix-&gt;height, S5P_JPEG_MIN_HEIGHT,</div><div class='add'>+				       S5P_JPEG_MAX_HEIGHT, fmt-&gt;v_align);</div><div class='add'>+</div><div class='add'>+	if (fmt-&gt;fourcc == V4L2_PIX_FMT_JPEG) {</div><div class='add'>+		if (pix-&gt;sizeimage &lt;= 0)</div><div class='add'>+			pix-&gt;sizeimage = PAGE_SIZE;</div><div class='add'>+		pix-&gt;bytesperline = 0;</div><div class='add'>+	} else {</div><div class='add'>+		u32 bpl = pix-&gt;bytesperline;</div><div class='add'>+</div><div class='add'>+		if (fmt-&gt;colplanes &gt; 1 &amp;&amp; bpl &lt; pix-&gt;width)</div><div class='add'>+			bpl = pix-&gt;width; /* planar */</div><div class='add'>+</div><div class='add'>+		if (fmt-&gt;colplanes == 1 &amp;&amp; /* packed */</div><div class='add'>+		    (bpl &lt;&lt; 3) * fmt-&gt;depth &lt; pix-&gt;width)</div><div class='add'>+			bpl = (pix-&gt;width * fmt-&gt;depth) &gt;&gt; 3;</div><div class='add'>+</div><div class='add'>+		pix-&gt;bytesperline = bpl;</div><div class='add'>+		pix-&gt;sizeimage = (pix-&gt;width * pix-&gt;height * fmt-&gt;depth) &gt;&gt; 3;</div><div 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 s5p_jpeg_try_fmt_vid_cap(struct file *file, void *priv,</div><div class='add'>+				  struct v4l2_format *f)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_fmt *fmt;</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = priv;</div><div class='add'>+</div><div class='add'>+	fmt = s5p_jpeg_find_format(ctx-&gt;mode, f-&gt;fmt.pix.pixelformat);</div><div class='add'>+	if (!fmt || !(fmt-&gt;types &amp; MEM2MEM_CAPTURE)) {</div><div class='add'>+		v4l2_err(&amp;ctx-&gt;jpeg-&gt;v4l2_dev,</div><div class='add'>+			 "Fourcc format (0x%08x) invalid.\n",</div><div class='add'>+			 f-&gt;fmt.pix.pixelformat);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return vidioc_try_fmt(f, fmt, ctx, MEM2MEM_CAPTURE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_try_fmt_vid_out(struct file *file, void *priv,</div><div class='add'>+				  struct v4l2_format *f)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_fmt *fmt;</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = priv;</div><div class='add'>+</div><div class='add'>+	fmt = s5p_jpeg_find_format(ctx-&gt;mode, f-&gt;fmt.pix.pixelformat);</div><div class='add'>+	if (!fmt || !(fmt-&gt;types &amp; MEM2MEM_OUTPUT)) {</div><div class='add'>+		v4l2_err(&amp;ctx-&gt;jpeg-&gt;v4l2_dev,</div><div class='add'>+			 "Fourcc format (0x%08x) invalid.\n",</div><div class='add'>+			 f-&gt;fmt.pix.pixelformat);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return vidioc_try_fmt(f, fmt, ctx, MEM2MEM_OUTPUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_s_fmt(struct s5p_jpeg_ctx *ct, struct v4l2_format *f)</div><div class='add'>+{</div><div class='add'>+	struct vb2_queue *vq;</div><div class='add'>+	struct s5p_jpeg_q_data *q_data = NULL;</div><div class='add'>+	struct v4l2_pix_format *pix = &amp;f-&gt;fmt.pix;</div><div class='add'>+</div><div class='add'>+	vq = v4l2_m2m_get_vq(ct-&gt;m2m_ctx, f-&gt;type);</div><div class='add'>+	if (!vq)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	q_data = get_q_data(ct, f-&gt;type);</div><div class='add'>+	BUG_ON(q_data == NULL);</div><div class='add'>+</div><div class='add'>+	if (vb2_is_busy(vq)) {</div><div class='add'>+		v4l2_err(&amp;ct-&gt;jpeg-&gt;v4l2_dev, "%s queue busy\n", __func__);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	q_data-&gt;fmt = s5p_jpeg_find_format(ct-&gt;mode, pix-&gt;pixelformat);</div><div class='add'>+	q_data-&gt;w = pix-&gt;width;</div><div class='add'>+	q_data-&gt;h = pix-&gt;height;</div><div class='add'>+	if (q_data-&gt;fmt-&gt;fourcc != V4L2_PIX_FMT_JPEG)</div><div class='add'>+		q_data-&gt;size = q_data-&gt;w * q_data-&gt;h * q_data-&gt;fmt-&gt;depth &gt;&gt; 3;</div><div class='add'>+	else</div><div class='add'>+		q_data-&gt;size = pix-&gt;sizeimage;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_s_fmt_vid_cap(struct file *file, void *priv,</div><div class='add'>+				struct v4l2_format *f)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = s5p_jpeg_try_fmt_vid_cap(file, priv, f);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return s5p_jpeg_s_fmt(priv, f);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_s_fmt_vid_out(struct file *file, void *priv,</div><div class='add'>+				struct v4l2_format *f)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = s5p_jpeg_try_fmt_vid_out(file, priv, f);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return s5p_jpeg_s_fmt(priv, f);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_reqbufs(struct file *file, void *priv,</div><div class='add'>+			  struct v4l2_requestbuffers *reqbufs)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = priv;</div><div class='add'>+</div><div class='add'>+	return v4l2_m2m_reqbufs(file, ctx-&gt;m2m_ctx, reqbufs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_querybuf(struct file *file, void *priv,</div><div class='add'>+			   struct v4l2_buffer *buf)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = priv;</div><div class='add'>+</div><div class='add'>+	return v4l2_m2m_querybuf(file, ctx-&gt;m2m_ctx, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = priv;</div><div class='add'>+</div><div class='add'>+	return v4l2_m2m_qbuf(file, ctx-&gt;m2m_ctx, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_dqbuf(struct file *file, void *priv,</div><div class='add'>+			  struct v4l2_buffer *buf)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = priv;</div><div class='add'>+</div><div class='add'>+	return v4l2_m2m_dqbuf(file, ctx-&gt;m2m_ctx, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_streamon(struct file *file, void *priv,</div><div class='add'>+			   enum v4l2_buf_type type)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = priv;</div><div class='add'>+</div><div class='add'>+	return v4l2_m2m_streamon(file, ctx-&gt;m2m_ctx, type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_streamoff(struct file *file, void *priv,</div><div class='add'>+			    enum v4l2_buf_type type)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = priv;</div><div class='add'>+</div><div class='add'>+	return v4l2_m2m_streamoff(file, ctx-&gt;m2m_ctx, type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5p_jpeg_g_selection(struct file *file, void *priv,</div><div class='add'>+			 struct v4l2_selection *s)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = priv;</div><div class='add'>+</div><div class='add'>+	if (s-&gt;type != V4L2_BUF_TYPE_VIDEO_OUTPUT &amp;&amp;</div><div class='add'>+	    s-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* For JPEG blob active == default == bounds */</div><div class='add'>+	switch (s-&gt;target) {</div><div class='add'>+	case V4L2_SEL_TGT_CROP_ACTIVE:</div><div class='add'>+	case V4L2_SEL_TGT_CROP_BOUNDS:</div><div class='add'>+	case V4L2_SEL_TGT_CROP_DEFAULT:</div><div class='add'>+	case V4L2_SEL_TGT_COMPOSE_ACTIVE:</div><div class='add'>+	case V4L2_SEL_TGT_COMPOSE_DEFAULT:</div><div class='add'>+		s-&gt;r.width = ctx-&gt;out_q.w;</div><div class='add'>+		s-&gt;r.height = ctx-&gt;out_q.h;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_SEL_TGT_COMPOSE_BOUNDS:</div><div class='add'>+	case V4L2_SEL_TGT_COMPOSE_PADDED:</div><div class='add'>+		s-&gt;r.width = ctx-&gt;cap_q.w;</div><div class='add'>+		s-&gt;r.height = ctx-&gt;cap_q.h;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	s-&gt;r.left = 0;</div><div class='add'>+	s-&gt;r.top = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_g_jpegcomp(struct file *file, void *priv,</div><div class='add'>+			       struct v4l2_jpegcompression *compr)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = priv;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;mode == S5P_JPEG_DECODE)</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+</div><div class='add'>+	memset(compr, 0, sizeof(*compr));</div><div class='add'>+	compr-&gt;quality = ctx-&gt;compr_quality;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_s_jpegcomp(struct file *file, void *priv,</div><div class='add'>+			       struct v4l2_jpegcompression *compr)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = priv;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;mode == S5P_JPEG_DECODE)</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+</div><div class='add'>+	compr-&gt;quality = clamp(compr-&gt;quality, S5P_JPEG_COMPR_QUAL_BEST,</div><div class='add'>+			       S5P_JPEG_COMPR_QUAL_WORST);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;compr_quality = S5P_JPEG_COMPR_QUAL_WORST - compr-&gt;quality;</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 v4l2_ioctl_ops s5p_jpeg_ioctl_ops = {</div><div class='add'>+	.vidioc_querycap		= s5p_jpeg_querycap,</div><div class='add'>+</div><div class='add'>+	.vidioc_enum_fmt_vid_cap	= s5p_jpeg_enum_fmt_vid_cap,</div><div class='add'>+	.vidioc_enum_fmt_vid_out	= s5p_jpeg_enum_fmt_vid_out,</div><div class='add'>+</div><div class='add'>+	.vidioc_g_fmt_vid_cap		= s5p_jpeg_g_fmt,</div><div class='add'>+	.vidioc_g_fmt_vid_out		= s5p_jpeg_g_fmt,</div><div class='add'>+</div><div class='add'>+	.vidioc_try_fmt_vid_cap		= s5p_jpeg_try_fmt_vid_cap,</div><div class='add'>+	.vidioc_try_fmt_vid_out		= s5p_jpeg_try_fmt_vid_out,</div><div class='add'>+</div><div class='add'>+	.vidioc_s_fmt_vid_cap		= s5p_jpeg_s_fmt_vid_cap,</div><div class='add'>+	.vidioc_s_fmt_vid_out		= s5p_jpeg_s_fmt_vid_out,</div><div class='add'>+</div><div class='add'>+	.vidioc_reqbufs			= s5p_jpeg_reqbufs,</div><div class='add'>+	.vidioc_querybuf		= s5p_jpeg_querybuf,</div><div class='add'>+</div><div class='add'>+	.vidioc_qbuf			= s5p_jpeg_qbuf,</div><div class='add'>+	.vidioc_dqbuf			= s5p_jpeg_dqbuf,</div><div class='add'>+</div><div class='add'>+	.vidioc_streamon		= s5p_jpeg_streamon,</div><div class='add'>+	.vidioc_streamoff		= s5p_jpeg_streamoff,</div><div class='add'>+</div><div class='add'>+	.vidioc_g_selection		= s5p_jpeg_g_selection,</div><div class='add'>+</div><div class='add'>+	.vidioc_g_jpegcomp		= s5p_jpeg_g_jpegcomp,</div><div class='add'>+	.vidioc_s_jpegcomp		= s5p_jpeg_s_jpegcomp,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ============================================================================</div><div class='add'>+ * mem2mem callbacks</div><div class='add'>+ * ============================================================================</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void s5p_jpeg_device_run(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = priv;</div><div class='add'>+	struct s5p_jpeg *jpeg = ctx-&gt;jpeg;</div><div class='add'>+	struct vb2_buffer *src_buf, *dst_buf;</div><div class='add'>+	unsigned long src_addr, dst_addr;</div><div class='add'>+</div><div class='add'>+	src_buf = v4l2_m2m_next_src_buf(ctx-&gt;m2m_ctx);</div><div class='add'>+	dst_buf = v4l2_m2m_next_dst_buf(ctx-&gt;m2m_ctx);</div><div class='add'>+	src_addr = vb2_dma_contig_plane_dma_addr(src_buf, 0);</div><div class='add'>+	dst_addr = vb2_dma_contig_plane_dma_addr(dst_buf, 0);</div><div class='add'>+</div><div class='add'>+	jpeg_reset(jpeg-&gt;regs);</div><div class='add'>+	jpeg_poweron(jpeg-&gt;regs);</div><div class='add'>+	jpeg_proc_mode(jpeg-&gt;regs, ctx-&gt;mode);</div><div class='add'>+	if (ctx-&gt;mode == S5P_JPEG_ENCODE) {</div><div class='add'>+		if (ctx-&gt;out_q.fmt-&gt;fourcc == V4L2_PIX_FMT_RGB565)</div><div class='add'>+			jpeg_input_raw_mode(jpeg-&gt;regs, S5P_JPEG_RAW_IN_565);</div><div class='add'>+		else</div><div class='add'>+			jpeg_input_raw_mode(jpeg-&gt;regs, S5P_JPEG_RAW_IN_422);</div><div class='add'>+		if (ctx-&gt;cap_q.fmt-&gt;fourcc == V4L2_PIX_FMT_YUYV)</div><div class='add'>+			jpeg_subsampling_mode(jpeg-&gt;regs,</div><div class='add'>+					      S5P_JPEG_SUBSAMPLING_422);</div><div class='add'>+		else</div><div class='add'>+			jpeg_subsampling_mode(jpeg-&gt;regs,</div><div class='add'>+					      S5P_JPEG_SUBSAMPLING_420);</div><div class='add'>+		jpeg_dri(jpeg-&gt;regs, 0);</div><div class='add'>+		jpeg_x(jpeg-&gt;regs, ctx-&gt;out_q.w);</div><div class='add'>+		jpeg_y(jpeg-&gt;regs, ctx-&gt;out_q.h);</div><div class='add'>+		jpeg_imgadr(jpeg-&gt;regs, src_addr);</div><div class='add'>+		jpeg_jpgadr(jpeg-&gt;regs, dst_addr);</div><div class='add'>+</div><div class='add'>+		/* ultimately comes from sizeimage from userspace */</div><div class='add'>+		jpeg_enc_stream_int(jpeg-&gt;regs, ctx-&gt;cap_q.size);</div><div class='add'>+</div><div class='add'>+		/* JPEG RGB to YCbCr conversion matrix */</div><div class='add'>+		jpeg_coef(jpeg-&gt;regs, 1, 1, S5P_JPEG_COEF11);</div><div class='add'>+		jpeg_coef(jpeg-&gt;regs, 1, 2, S5P_JPEG_COEF12);</div><div class='add'>+		jpeg_coef(jpeg-&gt;regs, 1, 3, S5P_JPEG_COEF13);</div><div class='add'>+		jpeg_coef(jpeg-&gt;regs, 2, 1, S5P_JPEG_COEF21);</div><div class='add'>+		jpeg_coef(jpeg-&gt;regs, 2, 2, S5P_JPEG_COEF22);</div><div class='add'>+		jpeg_coef(jpeg-&gt;regs, 2, 3, S5P_JPEG_COEF23);</div><div class='add'>+		jpeg_coef(jpeg-&gt;regs, 3, 1, S5P_JPEG_COEF31);</div><div class='add'>+		jpeg_coef(jpeg-&gt;regs, 3, 2, S5P_JPEG_COEF32);</div><div class='add'>+		jpeg_coef(jpeg-&gt;regs, 3, 3, S5P_JPEG_COEF33);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * JPEG IP allows storing 4 quantization tables</div><div class='add'>+		 * We fill table 0 for luma and table 1 for chroma</div><div class='add'>+		 */</div><div class='add'>+		jpeg_set_qtbl_lum(jpeg-&gt;regs, ctx-&gt;compr_quality);</div><div class='add'>+		jpeg_set_qtbl_chr(jpeg-&gt;regs, ctx-&gt;compr_quality);</div><div class='add'>+		/* use table 0 for Y */</div><div class='add'>+		jpeg_qtbl(jpeg-&gt;regs, 1, 0);</div><div class='add'>+		/* use table 1 for Cb and Cr*/</div><div class='add'>+		jpeg_qtbl(jpeg-&gt;regs, 2, 1);</div><div class='add'>+		jpeg_qtbl(jpeg-&gt;regs, 3, 1);</div><div class='add'>+</div><div class='add'>+		/* Y, Cb, Cr use Huffman table 0 */</div><div class='add'>+		jpeg_htbl_ac(jpeg-&gt;regs, 1);</div><div class='add'>+		jpeg_htbl_dc(jpeg-&gt;regs, 1);</div><div class='add'>+		jpeg_htbl_ac(jpeg-&gt;regs, 2);</div><div class='add'>+		jpeg_htbl_dc(jpeg-&gt;regs, 2);</div><div class='add'>+		jpeg_htbl_ac(jpeg-&gt;regs, 3);</div><div class='add'>+		jpeg_htbl_dc(jpeg-&gt;regs, 3);</div><div class='add'>+	} else {</div><div class='add'>+		jpeg_rst_int_enable(jpeg-&gt;regs, true);</div><div class='add'>+		jpeg_data_num_int_enable(jpeg-&gt;regs, true);</div><div class='add'>+		jpeg_final_mcu_num_int_enable(jpeg-&gt;regs, true);</div><div class='add'>+		jpeg_outform_raw(jpeg-&gt;regs, S5P_JPEG_RAW_OUT_422);</div><div class='add'>+		jpeg_jpgadr(jpeg-&gt;regs, src_addr);</div><div class='add'>+		jpeg_imgadr(jpeg-&gt;regs, dst_addr);</div><div class='add'>+	}</div><div class='add'>+	jpeg_start(jpeg-&gt;regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_job_ready(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = priv;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;mode == S5P_JPEG_DECODE)</div><div class='add'>+		return ctx-&gt;hdr_parsed;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s5p_jpeg_job_abort(void *priv)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct v4l2_m2m_ops s5p_jpeg_m2m_ops = {</div><div class='add'>+	.device_run	= s5p_jpeg_device_run,</div><div class='add'>+	.job_ready	= s5p_jpeg_job_ready,</div><div class='add'>+	.job_abort	= s5p_jpeg_job_abort,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ============================================================================</div><div class='add'>+ * Queue operations</div><div class='add'>+ * ============================================================================</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_queue_setup(struct vb2_queue *vq,</div><div class='add'>+			   const struct v4l2_format *fmt,</div><div class='add'>+			   unsigned int *nbuffers, unsigned int *nplanes,</div><div class='add'>+			   unsigned int sizes[], void *alloc_ctxs[])</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = vb2_get_drv_priv(vq);</div><div class='add'>+	struct s5p_jpeg_q_data *q_data = NULL;</div><div class='add'>+	unsigned int size, count = *nbuffers;</div><div class='add'>+</div><div class='add'>+	q_data = get_q_data(ctx, vq-&gt;type);</div><div class='add'>+	BUG_ON(q_data == NULL);</div><div class='add'>+</div><div class='add'>+	size = q_data-&gt;size;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * header is parsed during decoding and parsed information stored</div><div class='add'>+	 * in the context so we do not allow another buffer to overwrite it</div><div class='add'>+	 */</div><div class='add'>+	if (ctx-&gt;mode == S5P_JPEG_DECODE)</div><div class='add'>+		count = 1;</div><div class='add'>+</div><div class='add'>+	*nbuffers = count;</div><div class='add'>+	*nplanes = 1;</div><div class='add'>+	sizes[0] = size;</div><div class='add'>+	alloc_ctxs[0] = ctx-&gt;jpeg-&gt;alloc_ctx;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_buf_prepare(struct vb2_buffer *vb)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = vb2_get_drv_priv(vb-&gt;vb2_queue);</div><div class='add'>+	struct s5p_jpeg_q_data *q_data = NULL;</div><div class='add'>+</div><div class='add'>+	q_data = get_q_data(ctx, vb-&gt;vb2_queue-&gt;type);</div><div class='add'>+	BUG_ON(q_data == NULL);</div><div class='add'>+</div><div class='add'>+	if (vb2_plane_size(vb, 0) &lt; q_data-&gt;size) {</div><div class='add'>+		pr_err("%s data will not fit into plane (%lu &lt; %lu)\n",</div><div class='add'>+				__func__, vb2_plane_size(vb, 0),</div><div class='add'>+				(long)q_data-&gt;size);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vb2_set_plane_payload(vb, 0, q_data-&gt;size);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s5p_jpeg_buf_queue(struct vb2_buffer *vb)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = vb2_get_drv_priv(vb-&gt;vb2_queue);</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;mode == S5P_JPEG_DECODE &amp;&amp;</div><div class='add'>+	    vb-&gt;vb2_queue-&gt;type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {</div><div class='add'>+		struct s5p_jpeg_q_data tmp, *q_data;</div><div class='add'>+		ctx-&gt;hdr_parsed = s5p_jpeg_parse_hdr(&amp;tmp,</div><div class='add'>+		     (unsigned long)vb2_plane_vaddr(vb, 0),</div><div class='add'>+		     min((unsigned long)ctx-&gt;out_q.size,</div><div class='add'>+			 vb2_get_plane_payload(vb, 0)));</div><div class='add'>+		if (!ctx-&gt;hdr_parsed) {</div><div class='add'>+			vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		q_data = &amp;ctx-&gt;out_q;</div><div class='add'>+		q_data-&gt;w = tmp.w;</div><div class='add'>+		q_data-&gt;h = tmp.h;</div><div class='add'>+</div><div class='add'>+		q_data = &amp;ctx-&gt;cap_q;</div><div class='add'>+		q_data-&gt;w = tmp.w;</div><div class='add'>+		q_data-&gt;h = tmp.h;</div><div class='add'>+</div><div class='add'>+		jpeg_bound_align_image(&amp;q_data-&gt;w, S5P_JPEG_MIN_WIDTH,</div><div class='add'>+				       S5P_JPEG_MAX_WIDTH, q_data-&gt;fmt-&gt;h_align,</div><div class='add'>+				       &amp;q_data-&gt;h, S5P_JPEG_MIN_HEIGHT,</div><div class='add'>+				       S5P_JPEG_MAX_HEIGHT, q_data-&gt;fmt-&gt;v_align</div><div class='add'>+				      );</div><div class='add'>+		q_data-&gt;size = q_data-&gt;w * q_data-&gt;h * q_data-&gt;fmt-&gt;depth &gt;&gt; 3;</div><div class='add'>+	}</div><div class='add'>+	if (ctx-&gt;m2m_ctx)</div><div class='add'>+		v4l2_m2m_buf_queue(ctx-&gt;m2m_ctx, vb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s5p_jpeg_wait_prepare(struct vb2_queue *vq)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = vb2_get_drv_priv(vq);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ctx-&gt;jpeg-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s5p_jpeg_wait_finish(struct vb2_queue *vq)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = vb2_get_drv_priv(vq);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ctx-&gt;jpeg-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_start_streaming(struct vb2_queue *q, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = vb2_get_drv_priv(q);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_get_sync(ctx-&gt;jpeg-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return ret &gt; 0 ? 0 : ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_stop_streaming(struct vb2_queue *q)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = vb2_get_drv_priv(q);</div><div class='add'>+</div><div class='add'>+	pm_runtime_put(ctx-&gt;jpeg-&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 struct vb2_ops s5p_jpeg_qops = {</div><div class='add'>+	.queue_setup		= s5p_jpeg_queue_setup,</div><div class='add'>+	.buf_prepare		= s5p_jpeg_buf_prepare,</div><div class='add'>+	.buf_queue		= s5p_jpeg_buf_queue,</div><div class='add'>+	.wait_prepare		= s5p_jpeg_wait_prepare,</div><div class='add'>+	.wait_finish		= s5p_jpeg_wait_finish,</div><div class='add'>+	.start_streaming	= s5p_jpeg_start_streaming,</div><div class='add'>+	.stop_streaming		= s5p_jpeg_stop_streaming,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int queue_init(void *priv, struct vb2_queue *src_vq,</div><div class='add'>+		      struct vb2_queue *dst_vq)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg_ctx *ctx = priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(src_vq, 0, sizeof(*src_vq));</div><div class='add'>+	src_vq-&gt;type = V4L2_BUF_TYPE_VIDEO_OUTPUT;</div><div class='add'>+	src_vq-&gt;io_modes = VB2_MMAP | VB2_USERPTR;</div><div class='add'>+	src_vq-&gt;drv_priv = ctx;</div><div class='add'>+	src_vq-&gt;buf_struct_size = sizeof(struct v4l2_m2m_buffer);</div><div class='add'>+	src_vq-&gt;ops = &amp;s5p_jpeg_qops;</div><div class='add'>+	src_vq-&gt;mem_ops = &amp;vb2_dma_contig_memops;</div><div class='add'>+</div><div class='add'>+	ret = vb2_queue_init(src_vq);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	memset(dst_vq, 0, sizeof(*dst_vq));</div><div class='add'>+	dst_vq-&gt;type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='add'>+	dst_vq-&gt;io_modes = VB2_MMAP | VB2_USERPTR;</div><div class='add'>+	dst_vq-&gt;drv_priv = ctx;</div><div class='add'>+	dst_vq-&gt;buf_struct_size = sizeof(struct v4l2_m2m_buffer);</div><div class='add'>+	dst_vq-&gt;ops = &amp;s5p_jpeg_qops;</div><div class='add'>+	dst_vq-&gt;mem_ops = &amp;vb2_dma_contig_memops;</div><div class='add'>+</div><div class='add'>+	return vb2_queue_init(dst_vq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ============================================================================</div><div class='add'>+ * ISR</div><div class='add'>+ * ============================================================================</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static irqreturn_t s5p_jpeg_irq(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg *jpeg = dev_id;</div><div class='add'>+	struct s5p_jpeg_ctx *curr_ctx;</div><div class='add'>+	struct vb2_buffer *src_buf, *dst_buf;</div><div class='add'>+	unsigned long payload_size = 0;</div><div class='add'>+	enum vb2_buffer_state state = VB2_BUF_STATE_DONE;</div><div class='add'>+	bool enc_jpeg_too_large = false;</div><div class='add'>+	bool timer_elapsed = false;</div><div class='add'>+	bool op_completed = false;</div><div class='add'>+</div><div class='add'>+	curr_ctx = v4l2_m2m_get_curr_priv(jpeg-&gt;m2m_dev);</div><div class='add'>+</div><div class='add'>+	src_buf = v4l2_m2m_src_buf_remove(curr_ctx-&gt;m2m_ctx);</div><div class='add'>+	dst_buf = v4l2_m2m_dst_buf_remove(curr_ctx-&gt;m2m_ctx);</div><div class='add'>+</div><div class='add'>+	if (curr_ctx-&gt;mode == S5P_JPEG_ENCODE)</div><div class='add'>+		enc_jpeg_too_large = jpeg_enc_stream_stat(jpeg-&gt;regs);</div><div class='add'>+	timer_elapsed = jpeg_timer_stat(jpeg-&gt;regs);</div><div class='add'>+	op_completed = jpeg_result_stat_ok(jpeg-&gt;regs);</div><div class='add'>+	if (curr_ctx-&gt;mode == S5P_JPEG_DECODE)</div><div class='add'>+		op_completed = op_completed &amp;&amp; jpeg_stream_stat_ok(jpeg-&gt;regs);</div><div class='add'>+</div><div class='add'>+	if (enc_jpeg_too_large) {</div><div class='add'>+		state = VB2_BUF_STATE_ERROR;</div><div class='add'>+		jpeg_clear_enc_stream_stat(jpeg-&gt;regs);</div><div class='add'>+	} else if (timer_elapsed) {</div><div class='add'>+		state = VB2_BUF_STATE_ERROR;</div><div class='add'>+		jpeg_clear_timer_stat(jpeg-&gt;regs);</div><div class='add'>+	} else if (!op_completed) {</div><div class='add'>+		state = VB2_BUF_STATE_ERROR;</div><div class='add'>+	} else {</div><div class='add'>+		payload_size = jpeg_compressed_size(jpeg-&gt;regs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	v4l2_m2m_buf_done(src_buf, state);</div><div class='add'>+	if (curr_ctx-&gt;mode == S5P_JPEG_ENCODE)</div><div class='add'>+		vb2_set_plane_payload(dst_buf, 0, payload_size);</div><div class='add'>+	v4l2_m2m_buf_done(dst_buf, state);</div><div class='add'>+	v4l2_m2m_job_finish(jpeg-&gt;m2m_dev, curr_ctx-&gt;m2m_ctx);</div><div class='add'>+</div><div class='add'>+	jpeg_clear_int(jpeg-&gt;regs);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ============================================================================</div><div class='add'>+ * Driver basic infrastructure</div><div class='add'>+ * ============================================================================</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg *jpeg;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* JPEG IP abstraction struct */</div><div class='add'>+	jpeg = kzalloc(sizeof(struct s5p_jpeg), GFP_KERNEL);</div><div class='add'>+	if (!jpeg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;jpeg-&gt;lock);</div><div class='add'>+	jpeg-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* memory-mapped registers */</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!res) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot find IO resource\n");</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto jpeg_alloc_rollback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	jpeg-&gt;ioarea = request_mem_region(res-&gt;start, resource_size(res),</div><div class='add'>+					  pdev-&gt;name);</div><div class='add'>+	if (!jpeg-&gt;ioarea) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot request IO\n");</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto jpeg_alloc_rollback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	jpeg-&gt;regs = ioremap(res-&gt;start, resource_size(res));</div><div class='add'>+	if (!jpeg-&gt;regs) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot map IO\n");</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto mem_region_rollback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "registers %p (%p, %p)\n",</div><div class='add'>+		jpeg-&gt;regs, jpeg-&gt;ioarea, res);</div><div class='add'>+</div><div class='add'>+	/* interrupt service routine registration */</div><div class='add'>+	jpeg-&gt;irq = ret = platform_get_irq(pdev, 0);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot find IRQ\n");</div><div class='add'>+		goto ioremap_rollback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = request_irq(jpeg-&gt;irq, s5p_jpeg_irq, 0,</div><div class='add'>+			  dev_name(&amp;pdev-&gt;dev), jpeg);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot claim IRQ %d\n", jpeg-&gt;irq);</div><div class='add'>+		goto ioremap_rollback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* clocks */</div><div class='add'>+	jpeg-&gt;clk = clk_get(&amp;pdev-&gt;dev, "jpeg");</div><div class='add'>+	if (IS_ERR(jpeg-&gt;clk)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot get clock\n");</div><div class='add'>+		ret = PTR_ERR(jpeg-&gt;clk);</div><div class='add'>+		goto request_irq_rollback;</div><div class='add'>+	}</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "clock source %p\n", jpeg-&gt;clk);</div><div class='add'>+	clk_enable(jpeg-&gt;clk);</div><div class='add'>+</div><div class='add'>+	/* v4l2 device */</div><div class='add'>+	ret = v4l2_device_register(&amp;pdev-&gt;dev, &amp;jpeg-&gt;v4l2_dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to register v4l2 device\n");</div><div class='add'>+		goto clk_get_rollback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* mem2mem device */</div><div class='add'>+	jpeg-&gt;m2m_dev = v4l2_m2m_init(&amp;s5p_jpeg_m2m_ops);</div><div class='add'>+	if (IS_ERR(jpeg-&gt;m2m_dev)) {</div><div class='add'>+		v4l2_err(&amp;jpeg-&gt;v4l2_dev, "Failed to init mem2mem device\n");</div><div class='add'>+		ret = PTR_ERR(jpeg-&gt;m2m_dev);</div><div class='add'>+		goto device_register_rollback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	jpeg-&gt;alloc_ctx = vb2_dma_contig_init_ctx(&amp;pdev-&gt;dev);</div><div class='add'>+	if (IS_ERR(jpeg-&gt;alloc_ctx)) {</div><div class='add'>+		v4l2_err(&amp;jpeg-&gt;v4l2_dev, "Failed to init memory allocator\n");</div><div class='add'>+		ret = PTR_ERR(jpeg-&gt;alloc_ctx);</div><div class='add'>+		goto m2m_init_rollback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* JPEG encoder /dev/videoX node */</div><div class='add'>+	jpeg-&gt;vfd_encoder = video_device_alloc();</div><div class='add'>+	if (!jpeg-&gt;vfd_encoder) {</div><div class='add'>+		v4l2_err(&amp;jpeg-&gt;v4l2_dev, "Failed to allocate video device\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto vb2_allocator_rollback;</div><div class='add'>+	}</div><div class='add'>+	strlcpy(jpeg-&gt;vfd_encoder-&gt;name, S5P_JPEG_M2M_NAME,</div><div class='add'>+		sizeof(jpeg-&gt;vfd_encoder-&gt;name));</div><div class='add'>+	jpeg-&gt;vfd_encoder-&gt;fops		= &amp;s5p_jpeg_fops;</div><div class='add'>+	jpeg-&gt;vfd_encoder-&gt;ioctl_ops	= &amp;s5p_jpeg_ioctl_ops;</div><div class='add'>+	jpeg-&gt;vfd_encoder-&gt;minor	= -1;</div><div class='add'>+	jpeg-&gt;vfd_encoder-&gt;release	= video_device_release;</div><div class='add'>+	jpeg-&gt;vfd_encoder-&gt;lock		= &amp;jpeg-&gt;lock;</div><div class='add'>+	jpeg-&gt;vfd_encoder-&gt;v4l2_dev	= &amp;jpeg-&gt;v4l2_dev;</div><div class='add'>+</div><div class='add'>+	ret = video_register_device(jpeg-&gt;vfd_encoder, VFL_TYPE_GRABBER, -1);</div><div class='add'>+	if (ret) {</div><div class='add'>+		v4l2_err(&amp;jpeg-&gt;v4l2_dev, "Failed to register video device\n");</div><div class='add'>+		goto enc_vdev_alloc_rollback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	video_set_drvdata(jpeg-&gt;vfd_encoder, jpeg);</div><div class='add'>+	v4l2_info(&amp;jpeg-&gt;v4l2_dev,</div><div class='add'>+		  "encoder device registered as /dev/video%d\n",</div><div class='add'>+		  jpeg-&gt;vfd_encoder-&gt;num);</div><div class='add'>+</div><div class='add'>+	/* JPEG decoder /dev/videoX node */</div><div class='add'>+	jpeg-&gt;vfd_decoder = video_device_alloc();</div><div class='add'>+	if (!jpeg-&gt;vfd_decoder) {</div><div class='add'>+		v4l2_err(&amp;jpeg-&gt;v4l2_dev, "Failed to allocate video device\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto enc_vdev_register_rollback;</div><div class='add'>+	}</div><div class='add'>+	strlcpy(jpeg-&gt;vfd_decoder-&gt;name, S5P_JPEG_M2M_NAME,</div><div class='add'>+		sizeof(jpeg-&gt;vfd_decoder-&gt;name));</div><div class='add'>+	jpeg-&gt;vfd_decoder-&gt;fops		= &amp;s5p_jpeg_fops;</div><div class='add'>+	jpeg-&gt;vfd_decoder-&gt;ioctl_ops	= &amp;s5p_jpeg_ioctl_ops;</div><div class='add'>+	jpeg-&gt;vfd_decoder-&gt;minor	= -1;</div><div class='add'>+	jpeg-&gt;vfd_decoder-&gt;release	= video_device_release;</div><div class='add'>+	jpeg-&gt;vfd_decoder-&gt;lock		= &amp;jpeg-&gt;lock;</div><div class='add'>+	jpeg-&gt;vfd_decoder-&gt;v4l2_dev	= &amp;jpeg-&gt;v4l2_dev;</div><div class='add'>+</div><div class='add'>+	ret = video_register_device(jpeg-&gt;vfd_decoder, VFL_TYPE_GRABBER, -1);</div><div class='add'>+	if (ret) {</div><div class='add'>+		v4l2_err(&amp;jpeg-&gt;v4l2_dev, "Failed to register video device\n");</div><div class='add'>+		goto dec_vdev_alloc_rollback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	video_set_drvdata(jpeg-&gt;vfd_decoder, jpeg);</div><div class='add'>+	v4l2_info(&amp;jpeg-&gt;v4l2_dev,</div><div class='add'>+		  "decoder device registered as /dev/video%d\n",</div><div class='add'>+		  jpeg-&gt;vfd_decoder-&gt;num);</div><div class='add'>+</div><div class='add'>+	/* final statements &amp; power management */</div><div class='add'>+	platform_set_drvdata(pdev, jpeg);</div><div class='add'>+</div><div class='add'>+	pm_runtime_enable(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	v4l2_info(&amp;jpeg-&gt;v4l2_dev, "Samsung S5P JPEG codec\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+dec_vdev_alloc_rollback:</div><div class='add'>+	video_device_release(jpeg-&gt;vfd_decoder);</div><div class='add'>+</div><div class='add'>+enc_vdev_register_rollback:</div><div class='add'>+	video_unregister_device(jpeg-&gt;vfd_encoder);</div><div class='add'>+</div><div class='add'>+enc_vdev_alloc_rollback:</div><div class='add'>+	video_device_release(jpeg-&gt;vfd_encoder);</div><div class='add'>+</div><div class='add'>+vb2_allocator_rollback:</div><div class='add'>+	vb2_dma_contig_cleanup_ctx(jpeg-&gt;alloc_ctx);</div><div class='add'>+</div><div class='add'>+m2m_init_rollback:</div><div class='add'>+	v4l2_m2m_release(jpeg-&gt;m2m_dev);</div><div class='add'>+</div><div class='add'>+device_register_rollback:</div><div class='add'>+	v4l2_device_unregister(&amp;jpeg-&gt;v4l2_dev);</div><div class='add'>+</div><div class='add'>+clk_get_rollback:</div><div class='add'>+	clk_disable(jpeg-&gt;clk);</div><div class='add'>+	clk_put(jpeg-&gt;clk);</div><div class='add'>+</div><div class='add'>+request_irq_rollback:</div><div class='add'>+	free_irq(jpeg-&gt;irq, jpeg);</div><div class='add'>+</div><div class='add'>+ioremap_rollback:</div><div class='add'>+	iounmap(jpeg-&gt;regs);</div><div class='add'>+</div><div class='add'>+mem_region_rollback:</div><div class='add'>+	release_resource(jpeg-&gt;ioarea);</div><div class='add'>+	release_mem_region(jpeg-&gt;ioarea-&gt;start, resource_size(jpeg-&gt;ioarea));</div><div class='add'>+</div><div class='add'>+jpeg_alloc_rollback:</div><div class='add'>+	kfree(jpeg);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg *jpeg = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	pm_runtime_disable(jpeg-&gt;dev);</div><div class='add'>+</div><div class='add'>+	video_unregister_device(jpeg-&gt;vfd_decoder);</div><div class='add'>+	video_device_release(jpeg-&gt;vfd_decoder);</div><div class='add'>+	video_unregister_device(jpeg-&gt;vfd_encoder);</div><div class='add'>+	video_device_release(jpeg-&gt;vfd_encoder);</div><div class='add'>+	vb2_dma_contig_cleanup_ctx(jpeg-&gt;alloc_ctx);</div><div class='add'>+	v4l2_m2m_release(jpeg-&gt;m2m_dev);</div><div class='add'>+	v4l2_device_unregister(&amp;jpeg-&gt;v4l2_dev);</div><div class='add'>+</div><div class='add'>+	clk_disable(jpeg-&gt;clk);</div><div class='add'>+	clk_put(jpeg-&gt;clk);</div><div class='add'>+</div><div class='add'>+	free_irq(jpeg-&gt;irq, jpeg);</div><div class='add'>+</div><div class='add'>+	iounmap(jpeg-&gt;regs);</div><div class='add'>+</div><div class='add'>+	release_resource(jpeg-&gt;ioarea);</div><div class='add'>+	release_mem_region(jpeg-&gt;ioarea-&gt;start, resource_size(jpeg-&gt;ioarea));</div><div class='add'>+	kfree(jpeg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5p_jpeg_runtime_suspend(struct device *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 s5p_jpeg_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct s5p_jpeg *jpeg = dev_get_drvdata(dev);</div><div class='add'>+	/*</div><div class='add'>+	 * JPEG IP allows storing two Huffman tables for each component</div><div class='add'>+	 * We fill table 0 for each component</div><div class='add'>+	 */</div><div class='add'>+	jpeg_set_hdctbl(jpeg-&gt;regs);</div><div class='add'>+	jpeg_set_hdctblg(jpeg-&gt;regs);</div><div class='add'>+	jpeg_set_hactbl(jpeg-&gt;regs);</div><div class='add'>+	jpeg_set_hactblg(jpeg-&gt;regs);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops s5p_jpeg_pm_ops = {</div><div class='add'>+	.runtime_suspend = s5p_jpeg_runtime_suspend,</div><div class='add'>+	.runtime_resume	 = s5p_jpeg_runtime_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver s5p_jpeg_driver = {</div><div class='add'>+	.probe = s5p_jpeg_probe,</div><div class='add'>+	.remove = s5p_jpeg_remove,</div><div class='add'>+	.driver = {</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+		.name = S5P_JPEG_M2M_NAME,</div><div class='add'>+		.pm = &amp;s5p_jpeg_pm_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init</div><div class='add'>+s5p_jpeg_register(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	pr_info("S5P JPEG V4L2 Driver, (c) 2011 Samsung Electronics\n");</div><div class='add'>+</div><div class='add'>+	ret = platform_driver_register(&amp;s5p_jpeg_driver);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_err("%s: failed to register jpeg driver\n", __func__);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit</div><div class='add'>+s5p_jpeg_unregister(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;s5p_jpeg_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(s5p_jpeg_register);</div><div class='add'>+module_exit(s5p_jpeg_unregister);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Andrzej Pietrasiewicz &lt;andrzej.p@samsung.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Samsung JPEG codec driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='head'>diff --git a/drivers/media/video/s5p-jpeg/jpeg-core.h b/drivers/media/video/s5p-jpeg/jpeg-core.h<br/>new file mode 100644<br/>index 000000000000..facad6114f5e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-jpeg/jpeg-core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-jpeg/jpeg-core.h</a></div><div class='hunk'>@@ -0,0 +1,143 @@</div><div class='add'>+/* linux/drivers/media/video/s5p-jpeg/jpeg-core.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * Author: Andrzej Pietrasiewicz &lt;andrzej.p@samsung.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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef JPEG_CORE_H_</div><div class='add'>+#define JPEG_CORE_H_</div><div class='add'>+</div><div class='add'>+#include &lt;media/v4l2-device.h&gt;</div><div class='add'>+</div><div class='add'>+#define S5P_JPEG_M2M_NAME		"s5p-jpeg"</div><div class='add'>+</div><div class='add'>+/* JPEG compression quality setting */</div><div class='add'>+#define S5P_JPEG_COMPR_QUAL_BEST	0</div><div class='add'>+#define S5P_JPEG_COMPR_QUAL_WORST	3</div><div class='add'>+</div><div class='add'>+/* JPEG RGB to YCbCr conversion matrix coefficients */</div><div class='add'>+#define S5P_JPEG_COEF11			0x4d</div><div class='add'>+#define S5P_JPEG_COEF12			0x97</div><div class='add'>+#define S5P_JPEG_COEF13			0x1e</div><div class='add'>+#define S5P_JPEG_COEF21			0x2c</div><div class='add'>+#define S5P_JPEG_COEF22			0x57</div><div class='add'>+#define S5P_JPEG_COEF23			0x83</div><div class='add'>+#define S5P_JPEG_COEF31			0x83</div><div class='add'>+#define S5P_JPEG_COEF32			0x6e</div><div class='add'>+#define S5P_JPEG_COEF33			0x13</div><div class='add'>+</div><div class='add'>+/* a selection of JPEG markers */</div><div class='add'>+#define TEM				0x01</div><div class='add'>+#define SOF0				0xc0</div><div class='add'>+#define RST				0xd0</div><div class='add'>+#define SOI				0xd8</div><div class='add'>+#define EOI				0xd9</div><div class='add'>+#define DHP				0xde</div><div class='add'>+</div><div class='add'>+/* Flags that indicate a format can be used for capture/output */</div><div class='add'>+#define MEM2MEM_CAPTURE			(1 &lt;&lt; 0)</div><div class='add'>+#define MEM2MEM_OUTPUT			(1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct s5p_jpeg - JPEG IP abstraction</div><div class='add'>+ * @lock:		the mutex protecting this structure</div><div class='add'>+ * @v4l2_dev:		v4l2 device for mem2mem mode</div><div class='add'>+ * @vfd_encoder:	video device node for encoder mem2mem mode</div><div class='add'>+ * @vfd_decoder:	video device node for decoder mem2mem mode</div><div class='add'>+ * @m2m_dev:		v4l2 mem2mem device data</div><div class='add'>+ * @ioarea:		JPEG IP memory region</div><div class='add'>+ * @regs:		JPEG IP registers mapping</div><div class='add'>+ * @irq:		JPEG IP irq</div><div class='add'>+ * @clk:		JPEG IP clock</div><div class='add'>+ * @dev:		JPEG IP struct device</div><div class='add'>+ * @alloc_ctx:		videobuf2 memory allocator's context</div><div class='add'>+ */</div><div class='add'>+struct s5p_jpeg {</div><div class='add'>+	struct mutex		lock;</div><div class='add'>+</div><div class='add'>+	struct v4l2_device	v4l2_dev;</div><div class='add'>+	struct video_device	*vfd_encoder;</div><div class='add'>+	struct video_device	*vfd_decoder;</div><div class='add'>+	struct v4l2_m2m_dev	*m2m_dev;</div><div class='add'>+</div><div class='add'>+	struct resource		*ioarea;</div><div class='add'>+	void __iomem		*regs;</div><div class='add'>+	unsigned int		irq;</div><div class='add'>+	struct clk		*clk;</div><div class='add'>+	struct device		*dev;</div><div class='add'>+	void			*alloc_ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct jpeg_fmt - driver's internal color format data</div><div class='add'>+ * @name:	format descritpion</div><div class='add'>+ * @fourcc:	the fourcc code, 0 if not applicable</div><div class='add'>+ * @depth:	number of bits per pixel</div><div class='add'>+ * @colplanes:	number of color planes (1 for packed formats)</div><div class='add'>+ * @h_align:	horizontal alignment order (align to 2^h_align)</div><div class='add'>+ * @v_align:	vertical alignment order (align to 2^v_align)</div><div class='add'>+ * @types:	types of queue this format is applicable to</div><div class='add'>+ */</div><div class='add'>+struct s5p_jpeg_fmt {</div><div class='add'>+	char	*name;</div><div class='add'>+	u32	fourcc;</div><div class='add'>+	int	depth;</div><div class='add'>+	int	colplanes;</div><div class='add'>+	int	h_align;</div><div class='add'>+	int	v_align;</div><div class='add'>+	u32	types;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * s5p_jpeg_q_data - parameters of one queue</div><div class='add'>+ * @fmt:	driver-specific format of this queue</div><div class='add'>+ * @w:		image width</div><div class='add'>+ * @h:		image height</div><div class='add'>+ * @size:	image buffer size in bytes</div><div class='add'>+ */</div><div class='add'>+struct s5p_jpeg_q_data {</div><div class='add'>+	struct s5p_jpeg_fmt	*fmt;</div><div class='add'>+	u32			w;</div><div class='add'>+	u32			h;</div><div class='add'>+	u32			size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * s5p_jpeg_ctx - the device context data</div><div class='add'>+ * @jpeg:		JPEG IP device for this context</div><div class='add'>+ * @mode:		compression (encode) operation or decompression (decode)</div><div class='add'>+ * @compr_quality:	destination image quality in compression (encode) mode</div><div class='add'>+ * @m2m_ctx:		mem2mem device context</div><div class='add'>+ * @out_q:		source (output) queue information</div><div class='add'>+ * @cap_fmt:		destination (capture) queue queue information</div><div class='add'>+ * @hdr_parsed:		set if header has been parsed during decompression</div><div class='add'>+ */</div><div class='add'>+struct s5p_jpeg_ctx {</div><div class='add'>+	struct s5p_jpeg		*jpeg;</div><div class='add'>+	unsigned int		mode;</div><div class='add'>+	unsigned int		compr_quality;</div><div class='add'>+	struct v4l2_m2m_ctx	*m2m_ctx;</div><div class='add'>+	struct s5p_jpeg_q_data	out_q;</div><div class='add'>+	struct s5p_jpeg_q_data	cap_q;</div><div class='add'>+	bool			hdr_parsed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * s5p_jpeg_buffer - description of memory containing input JPEG data</div><div class='add'>+ * @size:	buffer size</div><div class='add'>+ * @curr:	current position in the buffer</div><div class='add'>+ * @data:	pointer to the data</div><div class='add'>+ */</div><div class='add'>+struct s5p_jpeg_buffer {</div><div class='add'>+	unsigned long size;</div><div class='add'>+	unsigned long curr;</div><div class='add'>+	unsigned long data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* JPEG_CORE_H */</div><div class='head'>diff --git a/drivers/media/video/s5p-jpeg/jpeg-hw.h b/drivers/media/video/s5p-jpeg/jpeg-hw.h<br/>new file mode 100644<br/>index 000000000000..e10c744e9f23<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-jpeg/jpeg-hw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-jpeg/jpeg-hw.h</a></div><div class='hunk'>@@ -0,0 +1,353 @@</div><div class='add'>+/* linux/drivers/media/video/s5p-jpeg/jpeg-hw.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * Author: Andrzej Pietrasiewicz &lt;andrzej.p@samsung.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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#ifndef JPEG_HW_H_</div><div class='add'>+#define JPEG_HW_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include "jpeg-hw.h"</div><div class='add'>+#include "jpeg-regs.h"</div><div class='add'>+</div><div class='add'>+#define S5P_JPEG_MIN_WIDTH		32</div><div class='add'>+#define S5P_JPEG_MIN_HEIGHT		32</div><div class='add'>+#define S5P_JPEG_MAX_WIDTH		8192</div><div class='add'>+#define S5P_JPEG_MAX_HEIGHT		8192</div><div class='add'>+#define S5P_JPEG_ENCODE			0</div><div class='add'>+#define S5P_JPEG_DECODE			1</div><div class='add'>+#define S5P_JPEG_RAW_IN_565		0</div><div class='add'>+#define S5P_JPEG_RAW_IN_422		1</div><div class='add'>+#define S5P_JPEG_SUBSAMPLING_422	0</div><div class='add'>+#define S5P_JPEG_SUBSAMPLING_420	1</div><div class='add'>+#define S5P_JPEG_RAW_OUT_422		0</div><div class='add'>+#define S5P_JPEG_RAW_OUT_420		1</div><div class='add'>+</div><div class='add'>+static inline void jpeg_reset(void __iomem *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	writel(1, regs + S5P_JPG_SW_RESET);</div><div class='add'>+	reg = readl(regs + S5P_JPG_SW_RESET);</div><div class='add'>+	/* no other way but polling for when JPEG IP becomes operational */</div><div class='add'>+	while (reg != 0) {</div><div class='add'>+		cpu_relax();</div><div class='add'>+		reg = readl(regs + S5P_JPG_SW_RESET);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_poweron(void __iomem *regs)</div><div class='add'>+{</div><div class='add'>+	writel(S5P_POWER_ON, regs + S5P_JPGCLKCON);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_input_raw_mode(void __iomem *regs, unsigned long mode)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg, m;</div><div class='add'>+</div><div class='add'>+	m = S5P_MOD_SEL_565;</div><div class='add'>+	if (mode == S5P_JPEG_RAW_IN_565)</div><div class='add'>+		m = S5P_MOD_SEL_565;</div><div class='add'>+	else if (mode == S5P_JPEG_RAW_IN_422)</div><div class='add'>+		m = S5P_MOD_SEL_422;</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPGCMOD);</div><div class='add'>+	reg &amp;= ~S5P_MOD_SEL_MASK;</div><div class='add'>+	reg |= m;</div><div class='add'>+	writel(reg, regs + S5P_JPGCMOD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_input_raw_y16(void __iomem *regs, bool y16)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPGCMOD);</div><div class='add'>+	if (y16)</div><div class='add'>+		reg |= S5P_MODE_Y16;</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~S5P_MODE_Y16_MASK;</div><div class='add'>+	writel(reg, regs + S5P_JPGCMOD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_proc_mode(void __iomem *regs, unsigned long mode)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg, m;</div><div class='add'>+</div><div class='add'>+	m = S5P_PROC_MODE_DECOMPR;</div><div class='add'>+	if (mode == S5P_JPEG_ENCODE)</div><div class='add'>+		m = S5P_PROC_MODE_COMPR;</div><div class='add'>+	else</div><div class='add'>+		m = S5P_PROC_MODE_DECOMPR;</div><div class='add'>+	reg = readl(regs + S5P_JPGMOD);</div><div class='add'>+	reg &amp;= ~S5P_PROC_MODE_MASK;</div><div class='add'>+	reg |= m;</div><div class='add'>+	writel(reg, regs + S5P_JPGMOD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_subsampling_mode(void __iomem *regs, unsigned long mode)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg, m;</div><div class='add'>+</div><div class='add'>+	m = S5P_SUBSAMPLING_MODE_422;</div><div class='add'>+	if (mode == S5P_JPEG_SUBSAMPLING_422)</div><div class='add'>+		m = S5P_SUBSAMPLING_MODE_422;</div><div class='add'>+	else if (mode == S5P_JPEG_SUBSAMPLING_420)</div><div class='add'>+		m = S5P_SUBSAMPLING_MODE_420;</div><div class='add'>+	reg = readl(regs + S5P_JPGMOD);</div><div class='add'>+	reg &amp;= ~S5P_SUBSAMPLING_MODE_MASK;</div><div class='add'>+	reg |= m;</div><div class='add'>+	writel(reg, regs + S5P_JPGMOD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_dri(void __iomem *regs, unsigned int dri)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPGDRI_U);</div><div class='add'>+	reg &amp;= ~0xff;</div><div class='add'>+	reg |= (dri &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	writel(reg, regs + S5P_JPGDRI_U);</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPGDRI_L);</div><div class='add'>+	reg &amp;= ~0xff;</div><div class='add'>+	reg |= dri &amp; 0xff;</div><div class='add'>+	writel(reg, regs + S5P_JPGDRI_L);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_qtbl(void __iomem *regs, unsigned int t, unsigned int n)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPG_QTBL);</div><div class='add'>+	reg &amp;= ~S5P_QT_NUMt_MASK(t);</div><div class='add'>+	reg |= (n &lt;&lt; S5P_QT_NUMt_SHIFT(t)) &amp; S5P_QT_NUMt_MASK(t);</div><div class='add'>+	writel(reg, regs + S5P_JPG_QTBL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_htbl_ac(void __iomem *regs, unsigned int t)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPG_HTBL);</div><div class='add'>+	reg &amp;= ~S5P_HT_NUMt_AC_MASK(t);</div><div class='add'>+	/* this driver uses table 0 for all color components */</div><div class='add'>+	reg |= (0 &lt;&lt; S5P_HT_NUMt_AC_SHIFT(t)) &amp; S5P_HT_NUMt_AC_MASK(t);</div><div class='add'>+	writel(reg, regs + S5P_JPG_HTBL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_htbl_dc(void __iomem *regs, unsigned int t)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPG_HTBL);</div><div class='add'>+	reg &amp;= ~S5P_HT_NUMt_DC_MASK(t);</div><div class='add'>+	/* this driver uses table 0 for all color components */</div><div class='add'>+	reg |= (0 &lt;&lt; S5P_HT_NUMt_DC_SHIFT(t)) &amp; S5P_HT_NUMt_DC_MASK(t);</div><div class='add'>+	writel(reg, regs + S5P_JPG_HTBL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_y(void __iomem *regs, unsigned int y)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPGY_U);</div><div class='add'>+	reg &amp;= ~0xff;</div><div class='add'>+	reg |= (y &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	writel(reg, regs + S5P_JPGY_U);</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPGY_L);</div><div class='add'>+	reg &amp;= ~0xff;</div><div class='add'>+	reg |= y &amp; 0xff;</div><div class='add'>+	writel(reg, regs + S5P_JPGY_L);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_x(void __iomem *regs, unsigned int x)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPGX_U);</div><div class='add'>+	reg &amp;= ~0xff;</div><div class='add'>+	reg |= (x &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	writel(reg, regs + S5P_JPGX_U);</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPGX_L);</div><div class='add'>+	reg &amp;= ~0xff;</div><div class='add'>+	reg |= x &amp; 0xff;</div><div class='add'>+	writel(reg, regs + S5P_JPGX_L);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_rst_int_enable(void __iomem *regs, bool enable)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPGINTSE);</div><div class='add'>+	reg &amp;= ~S5P_RSTm_INT_EN_MASK;</div><div class='add'>+	if (enable)</div><div class='add'>+		reg |= S5P_RSTm_INT_EN;</div><div class='add'>+	writel(reg, regs + S5P_JPGINTSE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_data_num_int_enable(void __iomem *regs, bool enable)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPGINTSE);</div><div class='add'>+	reg &amp;= ~S5P_DATA_NUM_INT_EN_MASK;</div><div class='add'>+	if (enable)</div><div class='add'>+		reg |= S5P_DATA_NUM_INT_EN;</div><div class='add'>+	writel(reg, regs + S5P_JPGINTSE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_final_mcu_num_int_enable(void __iomem *regs, bool enbl)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPGINTSE);</div><div class='add'>+	reg &amp;= ~S5P_FINAL_MCU_NUM_INT_EN_MASK;</div><div class='add'>+	if (enbl)</div><div class='add'>+		reg |= S5P_FINAL_MCU_NUM_INT_EN;</div><div class='add'>+	writel(reg, regs + S5P_JPGINTSE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_timer_enable(void __iomem *regs, unsigned long val)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPG_TIMER_SE);</div><div class='add'>+	reg |= S5P_TIMER_INT_EN;</div><div class='add'>+	reg &amp;= ~S5P_TIMER_INIT_MASK;</div><div class='add'>+	reg |= val &amp; S5P_TIMER_INIT_MASK;</div><div class='add'>+	writel(reg, regs + S5P_JPG_TIMER_SE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_timer_disable(void __iomem *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPG_TIMER_SE);</div><div class='add'>+	reg &amp;= ~S5P_TIMER_INT_EN_MASK;</div><div class='add'>+	writel(reg, regs + S5P_JPG_TIMER_SE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int jpeg_timer_stat(void __iomem *regs)</div><div class='add'>+{</div><div class='add'>+	return (int)((readl(regs + S5P_JPG_TIMER_ST) &amp; S5P_TIMER_INT_STAT_MASK)</div><div class='add'>+		     &gt;&gt; S5P_TIMER_INT_STAT_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_clear_timer_stat(void __iomem *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPG_TIMER_SE);</div><div class='add'>+	reg &amp;= ~S5P_TIMER_INT_STAT_MASK;</div><div class='add'>+	writel(reg, regs + S5P_JPG_TIMER_SE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_enc_stream_int(void __iomem *regs, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPG_ENC_STREAM_INTSE);</div><div class='add'>+	reg &amp;= ~S5P_ENC_STREAM_BOUND_MASK;</div><div class='add'>+	reg |= S5P_ENC_STREAM_INT_EN;</div><div class='add'>+	reg |= size &amp; S5P_ENC_STREAM_BOUND_MASK;</div><div class='add'>+	writel(reg, regs + S5P_JPG_ENC_STREAM_INTSE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int jpeg_enc_stream_stat(void __iomem *regs)</div><div class='add'>+{</div><div class='add'>+	return (int)(readl(regs + S5P_JPG_ENC_STREAM_INTST) &amp;</div><div class='add'>+		     S5P_ENC_STREAM_INT_STAT_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_clear_enc_stream_stat(void __iomem *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPG_ENC_STREAM_INTSE);</div><div class='add'>+	reg &amp;= ~S5P_ENC_STREAM_INT_MASK;</div><div class='add'>+	writel(reg, regs + S5P_JPG_ENC_STREAM_INTSE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_outform_raw(void __iomem *regs, unsigned long format)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg, f;</div><div class='add'>+</div><div class='add'>+	f = S5P_DEC_OUT_FORMAT_422;</div><div class='add'>+	if (format == S5P_JPEG_RAW_OUT_422)</div><div class='add'>+		f = S5P_DEC_OUT_FORMAT_422;</div><div class='add'>+	else if (format == S5P_JPEG_RAW_OUT_420)</div><div class='add'>+		f = S5P_DEC_OUT_FORMAT_420;</div><div class='add'>+	reg = readl(regs + S5P_JPG_OUTFORM);</div><div class='add'>+	reg &amp;= ~S5P_DEC_OUT_FORMAT_MASK;</div><div class='add'>+	reg |= f;</div><div class='add'>+	writel(reg, regs + S5P_JPG_OUTFORM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_jpgadr(void __iomem *regs, unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	writel(addr, regs + S5P_JPG_JPGADR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_imgadr(void __iomem *regs, unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	writel(addr, regs + S5P_JPG_IMGADR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_coef(void __iomem *regs, unsigned int i,</div><div class='add'>+			     unsigned int j, unsigned int coef)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPG_COEF(i));</div><div class='add'>+	reg &amp;= ~S5P_COEFn_MASK(j);</div><div class='add'>+	reg |= (coef &lt;&lt; S5P_COEFn_SHIFT(j)) &amp; S5P_COEFn_MASK(j);</div><div class='add'>+	writel(reg, regs + S5P_JPG_COEF(i));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_start(void __iomem *regs)</div><div class='add'>+{</div><div class='add'>+	writel(1, regs + S5P_JSTART);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int jpeg_result_stat_ok(void __iomem *regs)</div><div class='add'>+{</div><div class='add'>+	return (int)((readl(regs + S5P_JPGINTST) &amp; S5P_RESULT_STAT_MASK)</div><div class='add'>+		     &gt;&gt; S5P_RESULT_STAT_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int jpeg_stream_stat_ok(void __iomem *regs)</div><div class='add'>+{</div><div class='add'>+	return !(int)((readl(regs + S5P_JPGINTST) &amp; S5P_STREAM_STAT_MASK)</div><div class='add'>+		      &gt;&gt; S5P_STREAM_STAT_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void jpeg_clear_int(void __iomem *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+</div><div class='add'>+	reg = readl(regs + S5P_JPGINTST);</div><div class='add'>+	writel(S5P_INT_RELEASE, regs + S5P_JPGCOM);</div><div class='add'>+	reg = readl(regs + S5P_JPGOPR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int jpeg_compressed_size(void __iomem *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned long jpeg_size = 0;</div><div class='add'>+</div><div class='add'>+	jpeg_size |= (readl(regs + S5P_JPGCNT_U) &amp; 0xff) &lt;&lt; 16;</div><div class='add'>+	jpeg_size |= (readl(regs + S5P_JPGCNT_M) &amp; 0xff) &lt;&lt; 8;</div><div class='add'>+	jpeg_size |= (readl(regs + S5P_JPGCNT_L) &amp; 0xff);</div><div class='add'>+</div><div class='add'>+	return (unsigned int)jpeg_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* JPEG_HW_H_ */</div><div class='head'>diff --git a/drivers/media/video/s5p-jpeg/jpeg-regs.h b/drivers/media/video/s5p-jpeg/jpeg-regs.h<br/>new file mode 100644<br/>index 000000000000..91f4dd5f86dd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-jpeg/jpeg-regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-jpeg/jpeg-regs.h</a></div><div class='hunk'>@@ -0,0 +1,170 @@</div><div class='add'>+/* linux/drivers/media/video/s5p-jpeg/jpeg-regs.h</div><div class='add'>+ *</div><div class='add'>+ * Register definition file for Samsung JPEG codec driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * Author: Andrzej Pietrasiewicz &lt;andrzej.p@samsung.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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef JPEG_REGS_H_</div><div class='add'>+#define JPEG_REGS_H_</div><div class='add'>+</div><div class='add'>+/* JPEG mode register */</div><div class='add'>+#define S5P_JPGMOD			0x00</div><div class='add'>+#define S5P_PROC_MODE_MASK		(0x1 &lt;&lt; 3)</div><div class='add'>+#define S5P_PROC_MODE_DECOMPR		(0x1 &lt;&lt; 3)</div><div class='add'>+#define S5P_PROC_MODE_COMPR		(0x0 &lt;&lt; 3)</div><div class='add'>+#define S5P_SUBSAMPLING_MODE_MASK	0x7</div><div class='add'>+#define S5P_SUBSAMPLING_MODE_444	(0x0 &lt;&lt; 0)</div><div class='add'>+#define S5P_SUBSAMPLING_MODE_422	(0x1 &lt;&lt; 0)</div><div class='add'>+#define S5P_SUBSAMPLING_MODE_420	(0x2 &lt;&lt; 0)</div><div class='add'>+#define S5P_SUBSAMPLING_MODE_GRAY	(0x3 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* JPEG operation status register */</div><div class='add'>+#define S5P_JPGOPR			0x04</div><div class='add'>+</div><div class='add'>+/* Quantization tables*/</div><div class='add'>+#define S5P_JPG_QTBL			0x08</div><div class='add'>+#define S5P_QT_NUMt_SHIFT(t)		(((t) - 1) &lt;&lt; 1)</div><div class='add'>+#define S5P_QT_NUMt_MASK(t)		(0x3 &lt;&lt; S5P_QT_NUMt_SHIFT(t))</div><div class='add'>+</div><div class='add'>+/* Huffman tables */</div><div class='add'>+#define S5P_JPG_HTBL			0x0c</div><div class='add'>+#define S5P_HT_NUMt_AC_SHIFT(t)		(((t) &lt;&lt; 1) - 1)</div><div class='add'>+#define S5P_HT_NUMt_AC_MASK(t)		(0x1 &lt;&lt; S5P_HT_NUMt_AC_SHIFT(t))</div><div class='add'>+</div><div class='add'>+#define S5P_HT_NUMt_DC_SHIFT(t)		(((t) - 1) &lt;&lt; 1)</div><div class='add'>+#define S5P_HT_NUMt_DC_MASK(t)		(0x1 &lt;&lt; S5P_HT_NUMt_DC_SHIFT(t))</div><div class='add'>+</div><div class='add'>+/* JPEG restart interval register upper byte */</div><div class='add'>+#define S5P_JPGDRI_U			0x10</div><div class='add'>+</div><div class='add'>+/* JPEG restart interval register lower byte */</div><div class='add'>+#define S5P_JPGDRI_L			0x14</div><div class='add'>+</div><div class='add'>+/* JPEG vertical resolution register upper byte */</div><div class='add'>+#define S5P_JPGY_U			0x18</div><div class='add'>+</div><div class='add'>+/* JPEG vertical resolution register lower byte */</div><div class='add'>+#define S5P_JPGY_L			0x1c</div><div class='add'>+</div><div class='add'>+/* JPEG horizontal resolution register upper byte */</div><div class='add'>+#define S5P_JPGX_U			0x20</div><div class='add'>+</div><div class='add'>+/* JPEG horizontal resolution register lower byte */</div><div class='add'>+#define S5P_JPGX_L			0x24</div><div class='add'>+</div><div class='add'>+/* JPEG byte count register upper byte */</div><div class='add'>+#define S5P_JPGCNT_U			0x28</div><div class='add'>+</div><div class='add'>+/* JPEG byte count register middle byte */</div><div class='add'>+#define S5P_JPGCNT_M			0x2c</div><div class='add'>+</div><div class='add'>+/* JPEG byte count register lower byte */</div><div class='add'>+#define S5P_JPGCNT_L			0x30</div><div class='add'>+</div><div class='add'>+/* JPEG interrupt setting register */</div><div class='add'>+#define S5P_JPGINTSE			0x34</div><div class='add'>+#define S5P_RSTm_INT_EN_MASK		(0x1 &lt;&lt; 7)</div><div class='add'>+#define S5P_RSTm_INT_EN			(0x1 &lt;&lt; 7)</div><div class='add'>+#define S5P_DATA_NUM_INT_EN_MASK	(0x1 &lt;&lt; 6)</div><div class='add'>+#define S5P_DATA_NUM_INT_EN		(0x1 &lt;&lt; 6)</div><div class='add'>+#define S5P_FINAL_MCU_NUM_INT_EN_MASK	(0x1 &lt;&lt; 5)</div><div class='add'>+#define S5P_FINAL_MCU_NUM_INT_EN	(0x1 &lt;&lt; 5)</div><div class='add'>+</div><div class='add'>+/* JPEG interrupt status register */</div><div class='add'>+#define S5P_JPGINTST			0x38</div><div class='add'>+#define S5P_RESULT_STAT_SHIFT		6</div><div class='add'>+#define S5P_RESULT_STAT_MASK		(0x1 &lt;&lt; S5P_RESULT_STAT_SHIFT)</div><div class='add'>+#define S5P_STREAM_STAT_SHIFT		5</div><div class='add'>+#define S5P_STREAM_STAT_MASK		(0x1 &lt;&lt; S5P_STREAM_STAT_SHIFT)</div><div class='add'>+</div><div class='add'>+/* JPEG command register */</div><div class='add'>+#define S5P_JPGCOM			0x4c</div><div class='add'>+#define S5P_INT_RELEASE			(0x1 &lt;&lt; 2)</div><div class='add'>+</div><div class='add'>+/* Raw image data r/w address register */</div><div class='add'>+#define S5P_JPG_IMGADR			0x50</div><div class='add'>+</div><div class='add'>+/* JPEG file r/w address register */</div><div class='add'>+#define S5P_JPG_JPGADR			0x58</div><div class='add'>+</div><div class='add'>+/* Coefficient for RGB-to-YCbCr converter register */</div><div class='add'>+#define S5P_JPG_COEF(n)			(0x5c + (((n) - 1) &lt;&lt; 2))</div><div class='add'>+#define S5P_COEFn_SHIFT(j)		((3 - (j)) &lt;&lt; 3)</div><div class='add'>+#define S5P_COEFn_MASK(j)		(0xff &lt;&lt; S5P_COEFn_SHIFT(j))</div><div class='add'>+</div><div class='add'>+/* JPEG color mode register */</div><div class='add'>+#define S5P_JPGCMOD			0x68</div><div class='add'>+#define S5P_MOD_SEL_MASK		(0x7 &lt;&lt; 5)</div><div class='add'>+#define S5P_MOD_SEL_422			(0x1 &lt;&lt; 5)</div><div class='add'>+#define S5P_MOD_SEL_565			(0x2 &lt;&lt; 5)</div><div class='add'>+#define S5P_MODE_Y16_MASK		(0x1 &lt;&lt; 1)</div><div class='add'>+#define S5P_MODE_Y16			(0x1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+/* JPEG clock control register */</div><div class='add'>+#define S5P_JPGCLKCON			0x6c</div><div class='add'>+#define S5P_CLK_DOWN_READY		(0x1 &lt;&lt; 1)</div><div class='add'>+#define S5P_POWER_ON			(0x1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* JPEG start register */</div><div class='add'>+#define S5P_JSTART			0x70</div><div class='add'>+</div><div class='add'>+/* JPEG SW reset register */</div><div class='add'>+#define S5P_JPG_SW_RESET		0x78</div><div class='add'>+</div><div class='add'>+/* JPEG timer setting register */</div><div class='add'>+#define S5P_JPG_TIMER_SE		0x7c</div><div class='add'>+#define S5P_TIMER_INT_EN_MASK		(0x1 &lt;&lt; 31)</div><div class='add'>+#define S5P_TIMER_INT_EN		(0x1 &lt;&lt; 31)</div><div class='add'>+#define S5P_TIMER_INIT_MASK		0x7fffffff</div><div class='add'>+</div><div class='add'>+/* JPEG timer status register */</div><div class='add'>+#define S5P_JPG_TIMER_ST		0x80</div><div class='add'>+#define S5P_TIMER_INT_STAT_SHIFT	31</div><div class='add'>+#define S5P_TIMER_INT_STAT_MASK		(0x1 &lt;&lt; S5P_TIMER_INT_STAT_SHIFT)</div><div class='add'>+#define S5P_TIMER_CNT_SHIFT		0</div><div class='add'>+#define S5P_TIMER_CNT_MASK		0x7fffffff</div><div class='add'>+</div><div class='add'>+/* JPEG decompression output format register */</div><div class='add'>+#define S5P_JPG_OUTFORM			0x88</div><div class='add'>+#define S5P_DEC_OUT_FORMAT_MASK		(0x1 &lt;&lt; 0)</div><div class='add'>+#define S5P_DEC_OUT_FORMAT_422		(0x0 &lt;&lt; 0)</div><div class='add'>+#define S5P_DEC_OUT_FORMAT_420		(0x1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* JPEG version register */</div><div class='add'>+#define S5P_JPG_VERSION			0x8c</div><div class='add'>+</div><div class='add'>+/* JPEG compressed stream size interrupt setting register */</div><div class='add'>+#define S5P_JPG_ENC_STREAM_INTSE	0x98</div><div class='add'>+#define S5P_ENC_STREAM_INT_MASK		(0x1 &lt;&lt; 24)</div><div class='add'>+#define S5P_ENC_STREAM_INT_EN		(0x1 &lt;&lt; 24)</div><div class='add'>+#define S5P_ENC_STREAM_BOUND_MASK	0xffffff</div><div class='add'>+</div><div class='add'>+/* JPEG compressed stream size interrupt status register */</div><div class='add'>+#define S5P_JPG_ENC_STREAM_INTST	0x9c</div><div class='add'>+#define S5P_ENC_STREAM_INT_STAT_MASK	0x1</div><div class='add'>+</div><div class='add'>+/* JPEG quantizer table register */</div><div class='add'>+#define S5P_JPG_QTBL_CONTENT(n)		(0x400 + (n) * 0x100)</div><div class='add'>+</div><div class='add'>+/* JPEG DC Huffman table register */</div><div class='add'>+#define S5P_JPG_HDCTBL(n)		(0x800 + (n) * 0x400)</div><div class='add'>+</div><div class='add'>+/* JPEG DC Huffman table register */</div><div class='add'>+#define S5P_JPG_HDCTBLG(n)		(0x840 + (n) * 0x400)</div><div class='add'>+</div><div class='add'>+/* JPEG AC Huffman table register */</div><div class='add'>+#define S5P_JPG_HACTBL(n)		(0x880 + (n) * 0x400)</div><div class='add'>+</div><div class='add'>+/* JPEG AC Huffman table register */</div><div class='add'>+#define S5P_JPG_HACTBLG(n)		(0x8c0 + (n) * 0x400)</div><div class='add'>+</div><div class='add'>+#endif /* JPEG_REGS_H_ */</div><div class='add'>+</div><div class='head'>diff --git a/drivers/media/video/s5p-mfc/s5p_mfc.c b/drivers/media/video/s5p-mfc/s5p_mfc.c<br/>index 8be8b54eb749..83fe461af263 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-mfc/s5p_mfc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-mfc/s5p_mfc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-mfc/s5p_mfc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-mfc/s5p_mfc.c</a></div><div class='hunk'>@@ -18,7 +18,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/slab.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;media/videobuf2-core.h&gt;</div><div class='hunk'>@@ -475,7 +474,7 @@ static void s5p_mfc_handle_seq_done(struct s5p_mfc_ctx *ctx,</div><div class='ctx'> 			ctx-&gt;mv_size = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		ctx-&gt;dpb_count = s5p_mfc_get_dpb_count();</div><div class='del'>-		if (ctx-&gt;img_width == 0 || ctx-&gt;img_width == 0)</div><div class='add'>+		if (ctx-&gt;img_width == 0 || ctx-&gt;img_height == 0)</div><div class='ctx'> 			ctx-&gt;state = MFCINST_ERROR;</div><div class='ctx'> 		else</div><div class='ctx'> 			ctx-&gt;state = MFCINST_HEAD_PARSED;</div><div class='hunk'>@@ -1245,27 +1244,7 @@ static struct platform_driver s5p_mfc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char banner[] __initdata =</div><div class='del'>-			"S5P MFC V4L2 Driver, (C) 2011 Samsung Electronics\n";</div><div class='del'>-</div><div class='del'>-static int __init s5p_mfc_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	pr_info("%s", banner);</div><div class='del'>-	ret = platform_driver_register(&amp;s5p_mfc_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		pr_err("Platform device registration failed.\n");</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit s5p_mfc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;s5p_mfc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(s5p_mfc_init);</div><div class='del'>-module_exit(s5p_mfc_exit);</div><div class='add'>+module_platform_driver(s5p_mfc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Kamil Debski &lt;k.debski@samsung.com&gt;");</div><div class='head'>diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_dec.c b/drivers/media/video/s5p-mfc/s5p_mfc_dec.c<br/>index 844a4d7797bc..c25ec022d267 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-mfc/s5p_mfc_dec.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-mfc/s5p_mfc_dec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-mfc/s5p_mfc_dec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-mfc/s5p_mfc_dec.c</a></div><div class='hunk'>@@ -165,7 +165,7 @@ static struct mfc_control controls[] = {</div><div class='ctx'> 		.maximum = 32,</div><div class='ctx'> 		.step = 1,</div><div class='ctx'> 		.default_value = 1,</div><div class='del'>-		.flags = V4L2_CTRL_FLAG_VOLATILE,</div><div class='add'>+		.is_volatile = 1,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/s5p-tv/hdmi_drv.c b/drivers/media/video/s5p-tv/hdmi_drv.c<br/>index 0279e6e89feb..8b41a0410ab1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-tv/hdmi_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-tv/hdmi_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-tv/hdmi_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-tv/hdmi_drv.c</a></div><div class='hunk'>@@ -838,8 +838,8 @@ static int hdmi_resources_init(struct hdmi_device *hdev)</div><div class='ctx'> 		dev_err(dev, "failed to get clock 'hdmiphy'\n");</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='del'>-	res-&gt;regul_bulk = kzalloc(ARRAY_SIZE(supply) *</div><div class='del'>-		sizeof res-&gt;regul_bulk[0], GFP_KERNEL);</div><div class='add'>+	res-&gt;regul_bulk = kcalloc(ARRAY_SIZE(supply),</div><div class='add'>+				  sizeof(res-&gt;regul_bulk[0]), GFP_KERNEL);</div><div class='ctx'> 	if (!res-&gt;regul_bulk) {</div><div class='ctx'> 		dev_err(dev, "failed to get memory for regulators\n");</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -1016,28 +1016,4 @@ static struct platform_driver hdmi_driver __refdata = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* D R I V E R   I N I T I A L I Z A T I O N */</div><div class='del'>-</div><div class='del'>-static int __init hdmi_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	static const char banner[] __initdata = KERN_INFO \</div><div class='del'>-		"Samsung HDMI output driver, "</div><div class='del'>-		"(c) 2010-2011 Samsung Electronics Co., Ltd.\n";</div><div class='del'>-	printk(banner);</div><div class='del'>-</div><div class='del'>-	ret = platform_driver_register(&amp;hdmi_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		printk(KERN_ERR "HDMI platform driver register failed\n");</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-module_init(hdmi_init);</div><div class='del'>-</div><div class='del'>-static void __exit hdmi_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;hdmi_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(hdmi_exit);</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+module_platform_driver(hdmi_driver);</div><div class='head'>diff --git a/drivers/media/video/s5p-tv/mixer.h b/drivers/media/video/s5p-tv/mixer.h<br/>index 51ad59b30358..1597078c4a50 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-tv/mixer.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-tv/mixer.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-tv/mixer.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-tv/mixer.h</a></div><div class='hunk'>@@ -86,6 +86,17 @@ struct mxr_crop {</div><div class='ctx'> 	unsigned int field;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/** stages of geometry operations */</div><div class='add'>+enum mxr_geometry_stage {</div><div class='add'>+	MXR_GEOMETRY_SINK,</div><div class='add'>+	MXR_GEOMETRY_COMPOSE,</div><div class='add'>+	MXR_GEOMETRY_CROP,</div><div class='add'>+	MXR_GEOMETRY_SOURCE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* flag indicating that offset should be 0 */</div><div class='add'>+#define MXR_NO_OFFSET	0x80000000</div><div class='add'>+</div><div class='ctx'> /** description of transformation from source to destination image */</div><div class='ctx'> struct mxr_geometry {</div><div class='ctx'> 	/** cropping for source image */</div><div class='hunk'>@@ -133,7 +144,8 @@ struct mxr_layer_ops {</div><div class='ctx'> 	/** streaming stop/start */</div><div class='ctx'> 	void (*stream_set)(struct mxr_layer *, int);</div><div class='ctx'> 	/** adjusting geometry */</div><div class='del'>-	void (*fix_geometry)(struct mxr_layer *);</div><div class='add'>+	void (*fix_geometry)(struct mxr_layer *,</div><div class='add'>+		enum mxr_geometry_stage, unsigned long);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /** layer instance, a single window and content displayed on output */</div><div class='head'>diff --git a/drivers/media/video/s5p-tv/mixer_grp_layer.c b/drivers/media/video/s5p-tv/mixer_grp_layer.c<br/>index de8270c2b6e7..b93a21f5aa13 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-tv/mixer_grp_layer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-tv/mixer_grp_layer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-tv/mixer_grp_layer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-tv/mixer_grp_layer.c</a></div><div class='hunk'>@@ -101,47 +101,132 @@ static void mxr_graph_format_set(struct mxr_layer *layer)</div><div class='ctx'> 		layer-&gt;fmt, &amp;layer-&gt;geo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mxr_graph_fix_geometry(struct mxr_layer *layer)</div><div class='add'>+static inline unsigned int closest(unsigned int x, unsigned int a,</div><div class='add'>+	unsigned int b, unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	unsigned int mid = (a + b) / 2;</div><div class='add'>+</div><div class='add'>+	/* choosing closest value with constraints according to table:</div><div class='add'>+	 * -------------+-----+-----+-----+-------+</div><div class='add'>+	 * flags	|  0  |  LE |  GE | LE|GE |</div><div class='add'>+	 * -------------+-----+-----+-----+-------+</div><div class='add'>+	 * x &lt;= a	|  a  |  a  |  a  |   a   |</div><div class='add'>+	 * a &lt; x &lt;= mid	|  a  |  a  |  b  |   a   |</div><div class='add'>+	 * mid &lt; x &lt; b	|  b  |  a  |  b  |   b   |</div><div class='add'>+	 * b &lt;= x	|  b  |  b  |  b  |   b   |</div><div class='add'>+	 * -------------+-----+-----+-----+-------+</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* remove all non-constraint flags */</div><div class='add'>+	flags &amp;= V4L2_SEL_FLAG_LE | V4L2_SEL_FLAG_GE;</div><div class='add'>+</div><div class='add'>+	if (x &lt;= a)</div><div class='add'>+		return  a;</div><div class='add'>+	if (x &gt;= b)</div><div class='add'>+		return b;</div><div class='add'>+	if (flags == V4L2_SEL_FLAG_LE)</div><div class='add'>+		return a;</div><div class='add'>+	if (flags == V4L2_SEL_FLAG_GE)</div><div class='add'>+		return b;</div><div class='add'>+	if (x &lt;= mid)</div><div class='add'>+		return a;</div><div class='add'>+	return b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int do_center(unsigned int center,</div><div class='add'>+	unsigned int size, unsigned int upper, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	unsigned int lower;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; MXR_NO_OFFSET)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	lower = center - min(center, size / 2);</div><div class='add'>+	return min(lower, upper - size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mxr_graph_fix_geometry(struct mxr_layer *layer,</div><div class='add'>+	enum mxr_geometry_stage stage, unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct mxr_geometry *geo = &amp;layer-&gt;geo;</div><div class='add'>+	struct mxr_crop *src = &amp;geo-&gt;src;</div><div class='add'>+	struct mxr_crop *dst = &amp;geo-&gt;dst;</div><div class='add'>+	unsigned int x_center, y_center;</div><div class='ctx'> </div><div class='del'>-	/* limit to boundary size */</div><div class='del'>-	geo-&gt;src.full_width = clamp_val(geo-&gt;src.full_width, 1, 32767);</div><div class='del'>-	geo-&gt;src.full_height = clamp_val(geo-&gt;src.full_height, 1, 2047);</div><div class='del'>-	geo-&gt;src.width = clamp_val(geo-&gt;src.width, 1, geo-&gt;src.full_width);</div><div class='del'>-	geo-&gt;src.width = min(geo-&gt;src.width, 2047U);</div><div class='del'>-	/* not possible to crop of Y axis */</div><div class='del'>-	geo-&gt;src.y_offset = min(geo-&gt;src.y_offset, geo-&gt;src.full_height - 1);</div><div class='del'>-	geo-&gt;src.height = geo-&gt;src.full_height - geo-&gt;src.y_offset;</div><div class='del'>-	/* limitting offset */</div><div class='del'>-	geo-&gt;src.x_offset = min(geo-&gt;src.x_offset,</div><div class='del'>-		geo-&gt;src.full_width - geo-&gt;src.width);</div><div class='del'>-</div><div class='del'>-	/* setting position in output */</div><div class='del'>-	geo-&gt;dst.width = min(geo-&gt;dst.width, geo-&gt;dst.full_width);</div><div class='del'>-	geo-&gt;dst.height = min(geo-&gt;dst.height, geo-&gt;dst.full_height);</div><div class='del'>-</div><div class='del'>-	/* Mixer supports only 1x and 2x scaling */</div><div class='del'>-	if (geo-&gt;dst.width &gt;= 2 * geo-&gt;src.width) {</div><div class='del'>-		geo-&gt;x_ratio = 1;</div><div class='del'>-		geo-&gt;dst.width = 2 * geo-&gt;src.width;</div><div class='del'>-	} else {</div><div class='del'>-		geo-&gt;x_ratio = 0;</div><div class='del'>-		geo-&gt;dst.width = geo-&gt;src.width;</div><div class='del'>-	}</div><div class='add'>+	switch (stage) {</div><div class='ctx'> </div><div class='del'>-	if (geo-&gt;dst.height &gt;= 2 * geo-&gt;src.height) {</div><div class='del'>-		geo-&gt;y_ratio = 1;</div><div class='del'>-		geo-&gt;dst.height = 2 * geo-&gt;src.height;</div><div class='del'>-	} else {</div><div class='del'>-		geo-&gt;y_ratio = 0;</div><div class='del'>-		geo-&gt;dst.height = geo-&gt;src.height;</div><div class='del'>-	}</div><div class='add'>+	case MXR_GEOMETRY_SINK: /* nothing to be fixed here */</div><div class='add'>+		flags = 0;</div><div class='add'>+		/* fall through */</div><div class='add'>+</div><div class='add'>+	case MXR_GEOMETRY_COMPOSE:</div><div class='add'>+		/* remember center of the area */</div><div class='add'>+		x_center = dst-&gt;x_offset + dst-&gt;width / 2;</div><div class='add'>+		y_center = dst-&gt;y_offset + dst-&gt;height / 2;</div><div class='add'>+		/* round up/down to 2 multiple depending on flags */</div><div class='add'>+		if (flags &amp; V4L2_SEL_FLAG_LE) {</div><div class='add'>+			dst-&gt;width = round_down(dst-&gt;width, 2);</div><div class='add'>+			dst-&gt;height = round_down(dst-&gt;height, 2);</div><div class='add'>+		} else {</div><div class='add'>+			dst-&gt;width = round_up(dst-&gt;width, 2);</div><div class='add'>+			dst-&gt;height = round_up(dst-&gt;height, 2);</div><div class='add'>+		}</div><div class='add'>+		/* assure that compose rect is inside display area */</div><div class='add'>+		dst-&gt;width = min(dst-&gt;width, dst-&gt;full_width);</div><div class='add'>+		dst-&gt;height = min(dst-&gt;height, dst-&gt;full_height);</div><div class='add'>+</div><div class='add'>+		/* ensure that compose is reachable using 2x scaling */</div><div class='add'>+		dst-&gt;width = min(dst-&gt;width, 2 * src-&gt;full_width);</div><div class='add'>+		dst-&gt;height = min(dst-&gt;height, 2 * src-&gt;full_height);</div><div class='add'>+</div><div class='add'>+		/* setup offsets */</div><div class='add'>+		dst-&gt;x_offset = do_center(x_center, dst-&gt;width,</div><div class='add'>+			dst-&gt;full_width, flags);</div><div class='add'>+		dst-&gt;y_offset = do_center(y_center, dst-&gt;height,</div><div class='add'>+			dst-&gt;full_height, flags);</div><div class='add'>+		flags = 0;</div><div class='add'>+		/* fall through */</div><div class='ctx'> </div><div class='del'>-	geo-&gt;dst.x_offset = min(geo-&gt;dst.x_offset,</div><div class='del'>-		geo-&gt;dst.full_width - geo-&gt;dst.width);</div><div class='del'>-	geo-&gt;dst.y_offset = min(geo-&gt;dst.y_offset,</div><div class='del'>-		geo-&gt;dst.full_height - geo-&gt;dst.height);</div><div class='add'>+	case MXR_GEOMETRY_CROP:</div><div class='add'>+		/* remember center of the area */</div><div class='add'>+		x_center = src-&gt;x_offset + src-&gt;width / 2;</div><div class='add'>+		y_center = src-&gt;y_offset + src-&gt;height / 2;</div><div class='add'>+		/* ensure that cropping area lies inside the buffer */</div><div class='add'>+		if (src-&gt;full_width &lt; dst-&gt;width)</div><div class='add'>+			src-&gt;width = dst-&gt;width / 2;</div><div class='add'>+		else</div><div class='add'>+			src-&gt;width = closest(src-&gt;width, dst-&gt;width / 2,</div><div class='add'>+				dst-&gt;width, flags);</div><div class='add'>+</div><div class='add'>+		if (src-&gt;width == dst-&gt;width)</div><div class='add'>+			geo-&gt;x_ratio = 0;</div><div class='add'>+		else</div><div class='add'>+			geo-&gt;x_ratio = 1;</div><div class='add'>+</div><div class='add'>+		if (src-&gt;full_height &lt; dst-&gt;height)</div><div class='add'>+			src-&gt;height = dst-&gt;height / 2;</div><div class='add'>+		else</div><div class='add'>+			src-&gt;height = closest(src-&gt;height, dst-&gt;height / 2,</div><div class='add'>+				dst-&gt;height, flags);</div><div class='add'>+</div><div class='add'>+		if (src-&gt;height == dst-&gt;height)</div><div class='add'>+			geo-&gt;y_ratio = 0;</div><div class='add'>+		else</div><div class='add'>+			geo-&gt;y_ratio = 1;</div><div class='add'>+</div><div class='add'>+		/* setup offsets */</div><div class='add'>+		src-&gt;x_offset = do_center(x_center, src-&gt;width,</div><div class='add'>+			src-&gt;full_width, flags);</div><div class='add'>+		src-&gt;y_offset = do_center(y_center, src-&gt;height,</div><div class='add'>+			src-&gt;full_height, flags);</div><div class='add'>+		flags = 0;</div><div class='add'>+		/* fall through */</div><div class='add'>+	case MXR_GEOMETRY_SOURCE:</div><div class='add'>+		src-&gt;full_width = clamp_val(src-&gt;full_width,</div><div class='add'>+			src-&gt;width + src-&gt;x_offset, 32767);</div><div class='add'>+		src-&gt;full_height = clamp_val(src-&gt;full_height,</div><div class='add'>+			src-&gt;height + src-&gt;y_offset, 2047);</div><div class='add'>+	};</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* PUBLIC API */</div><div class='head'>diff --git a/drivers/media/video/s5p-tv/mixer_video.c b/drivers/media/video/s5p-tv/mixer_video.c<br/>index b47d0c06ecf5..7884baeff76a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-tv/mixer_video.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-tv/mixer_video.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-tv/mixer_video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-tv/mixer_video.c</a></div><div class='hunk'>@@ -170,18 +170,22 @@ static int mxr_querycap(struct file *file, void *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Geometry handling */</div><div class='del'>-static void mxr_layer_geo_fix(struct mxr_layer *layer)</div><div class='add'>+static void mxr_geometry_dump(struct mxr_device *mdev, struct mxr_geometry *geo)</div><div class='ctx'> {</div><div class='del'>-	struct mxr_device *mdev = layer-&gt;mdev;</div><div class='del'>-	struct v4l2_mbus_framefmt mbus_fmt;</div><div class='del'>-</div><div class='del'>-	/* TODO: add some dirty flag to avoid unnecessary adjustments */</div><div class='del'>-	mxr_get_mbus_fmt(mdev, &amp;mbus_fmt);</div><div class='del'>-	layer-&gt;geo.dst.full_width = mbus_fmt.width;</div><div class='del'>-	layer-&gt;geo.dst.full_height = mbus_fmt.height;</div><div class='del'>-	layer-&gt;geo.dst.field = mbus_fmt.field;</div><div class='del'>-	layer-&gt;ops.fix_geometry(layer);</div><div class='add'>+	mxr_dbg(mdev, "src.full_size = (%u, %u)\n",</div><div class='add'>+		geo-&gt;src.full_width, geo-&gt;src.full_height);</div><div class='add'>+	mxr_dbg(mdev, "src.size = (%u, %u)\n",</div><div class='add'>+		geo-&gt;src.width, geo-&gt;src.height);</div><div class='add'>+	mxr_dbg(mdev, "src.offset = (%u, %u)\n",</div><div class='add'>+		geo-&gt;src.x_offset, geo-&gt;src.y_offset);</div><div class='add'>+	mxr_dbg(mdev, "dst.full_size = (%u, %u)\n",</div><div class='add'>+		geo-&gt;dst.full_width, geo-&gt;dst.full_height);</div><div class='add'>+	mxr_dbg(mdev, "dst.size = (%u, %u)\n",</div><div class='add'>+		geo-&gt;dst.width, geo-&gt;dst.height);</div><div class='add'>+	mxr_dbg(mdev, "dst.offset = (%u, %u)\n",</div><div class='add'>+		geo-&gt;dst.x_offset, geo-&gt;dst.y_offset);</div><div class='add'>+	mxr_dbg(mdev, "ratio = (%u, %u)\n",</div><div class='add'>+		geo-&gt;x_ratio, geo-&gt;y_ratio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mxr_layer_default_geo(struct mxr_layer *layer)</div><div class='hunk'>@@ -204,27 +208,29 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)</div><div class='ctx'> 	layer-&gt;geo.src.width = layer-&gt;geo.src.full_width;</div><div class='ctx'> 	layer-&gt;geo.src.height = layer-&gt;geo.src.full_height;</div><div class='ctx'> </div><div class='del'>-	layer-&gt;ops.fix_geometry(layer);</div><div class='add'>+	mxr_geometry_dump(mdev, &amp;layer-&gt;geo);</div><div class='add'>+	layer-&gt;ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);</div><div class='add'>+	mxr_geometry_dump(mdev, &amp;layer-&gt;geo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mxr_geometry_dump(struct mxr_device *mdev, struct mxr_geometry *geo)</div><div class='add'>+static void mxr_layer_update_output(struct mxr_layer *layer)</div><div class='ctx'> {</div><div class='del'>-	mxr_dbg(mdev, "src.full_size = (%u, %u)\n",</div><div class='del'>-		geo-&gt;src.full_width, geo-&gt;src.full_height);</div><div class='del'>-	mxr_dbg(mdev, "src.size = (%u, %u)\n",</div><div class='del'>-		geo-&gt;src.width, geo-&gt;src.height);</div><div class='del'>-	mxr_dbg(mdev, "src.offset = (%u, %u)\n",</div><div class='del'>-		geo-&gt;src.x_offset, geo-&gt;src.y_offset);</div><div class='del'>-	mxr_dbg(mdev, "dst.full_size = (%u, %u)\n",</div><div class='del'>-		geo-&gt;dst.full_width, geo-&gt;dst.full_height);</div><div class='del'>-	mxr_dbg(mdev, "dst.size = (%u, %u)\n",</div><div class='del'>-		geo-&gt;dst.width, geo-&gt;dst.height);</div><div class='del'>-	mxr_dbg(mdev, "dst.offset = (%u, %u)\n",</div><div class='del'>-		geo-&gt;dst.x_offset, geo-&gt;dst.y_offset);</div><div class='del'>-	mxr_dbg(mdev, "ratio = (%u, %u)\n",</div><div class='del'>-		geo-&gt;x_ratio, geo-&gt;y_ratio);</div><div class='del'>-}</div><div class='add'>+	struct mxr_device *mdev = layer-&gt;mdev;</div><div class='add'>+	struct v4l2_mbus_framefmt mbus_fmt;</div><div class='add'>+</div><div class='add'>+	mxr_get_mbus_fmt(mdev, &amp;mbus_fmt);</div><div class='add'>+	/* checking if update is needed */</div><div class='add'>+	if (layer-&gt;geo.dst.full_width == mbus_fmt.width &amp;&amp;</div><div class='add'>+		layer-&gt;geo.dst.full_height == mbus_fmt.width)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='add'>+	layer-&gt;geo.dst.full_width = mbus_fmt.width;</div><div class='add'>+	layer-&gt;geo.dst.full_height = mbus_fmt.height;</div><div class='add'>+	layer-&gt;geo.dst.field = mbus_fmt.field;</div><div class='add'>+	layer-&gt;ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);</div><div class='add'>+</div><div class='add'>+	mxr_geometry_dump(mdev, &amp;layer-&gt;geo);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static const struct mxr_format *find_format_by_fourcc(</div><div class='ctx'> 	struct mxr_layer *layer, unsigned long fourcc);</div><div class='hunk'>@@ -249,37 +255,6 @@ static int mxr_enum_fmt(struct file *file, void  *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mxr_s_fmt(struct file *file, void *priv,</div><div class='del'>-	struct v4l2_format *f)</div><div class='del'>-{</div><div class='del'>-	struct mxr_layer *layer = video_drvdata(file);</div><div class='del'>-	const struct mxr_format *fmt;</div><div class='del'>-	struct v4l2_pix_format_mplane *pix;</div><div class='del'>-	struct mxr_device *mdev = layer-&gt;mdev;</div><div class='del'>-	struct mxr_geometry *geo = &amp;layer-&gt;geo;</div><div class='del'>-</div><div class='del'>-	mxr_dbg(mdev, "%s:%d\n", __func__, __LINE__);</div><div class='del'>-</div><div class='del'>-	pix = &amp;f-&gt;fmt.pix_mp;</div><div class='del'>-	fmt = find_format_by_fourcc(layer, pix-&gt;pixelformat);</div><div class='del'>-	if (fmt == NULL) {</div><div class='del'>-		mxr_warn(mdev, "not recognized fourcc: %08x\n",</div><div class='del'>-			pix-&gt;pixelformat);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	layer-&gt;fmt = fmt;</div><div class='del'>-	geo-&gt;src.full_width = pix-&gt;width;</div><div class='del'>-	geo-&gt;src.width = pix-&gt;width;</div><div class='del'>-	geo-&gt;src.full_height = pix-&gt;height;</div><div class='del'>-	geo-&gt;src.height = pix-&gt;height;</div><div class='del'>-	/* assure consistency of geometry */</div><div class='del'>-	mxr_layer_geo_fix(layer);</div><div class='del'>-	mxr_dbg(mdev, "width=%u height=%u span=%u\n",</div><div class='del'>-		geo-&gt;src.width, geo-&gt;src.height, geo-&gt;src.full_width);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static unsigned int divup(unsigned int divident, unsigned int divisor)</div><div class='ctx'> {</div><div class='ctx'> 	return (divident + divisor - 1) / divisor;</div><div class='hunk'>@@ -299,6 +274,10 @@ static void mxr_mplane_fill(struct v4l2_plane_pix_format *planes,</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	/* checking if nothing to fill */</div><div class='add'>+	if (!planes)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	memset(planes, 0, sizeof(*planes) * fmt-&gt;num_subframes);</div><div class='ctx'> 	for (i = 0; i &lt; fmt-&gt;num_planes; ++i) {</div><div class='ctx'> 		struct v4l2_plane_pix_format *plane = planes</div><div class='hunk'>@@ -332,73 +311,194 @@ static int mxr_g_fmt(struct file *file, void *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct mxr_crop *choose_crop_by_type(struct mxr_geometry *geo,</div><div class='del'>-	enum v4l2_buf_type type)</div><div class='del'>-{</div><div class='del'>-	switch (type) {</div><div class='del'>-	case V4L2_BUF_TYPE_VIDEO_OUTPUT:</div><div class='del'>-	case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:</div><div class='del'>-		return &amp;geo-&gt;dst;</div><div class='del'>-	case V4L2_BUF_TYPE_VIDEO_OVERLAY:</div><div class='del'>-		return &amp;geo-&gt;src;</div><div class='del'>-	default:</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mxr_g_crop(struct file *file, void *fh, struct v4l2_crop *a)</div><div class='add'>+static int mxr_s_fmt(struct file *file, void *priv,</div><div class='add'>+	struct v4l2_format *f)</div><div class='ctx'> {</div><div class='ctx'> 	struct mxr_layer *layer = video_drvdata(file);</div><div class='del'>-	struct mxr_crop *crop;</div><div class='add'>+	const struct mxr_format *fmt;</div><div class='add'>+	struct v4l2_pix_format_mplane *pix;</div><div class='add'>+	struct mxr_device *mdev = layer-&gt;mdev;</div><div class='add'>+	struct mxr_geometry *geo = &amp;layer-&gt;geo;</div><div class='ctx'> </div><div class='del'>-	mxr_dbg(layer-&gt;mdev, "%s:%d\n", __func__, __LINE__);</div><div class='del'>-	crop = choose_crop_by_type(&amp;layer-&gt;geo, a-&gt;type);</div><div class='del'>-	if (crop == NULL)</div><div class='add'>+	mxr_dbg(mdev, "%s:%d\n", __func__, __LINE__);</div><div class='add'>+</div><div class='add'>+	pix = &amp;f-&gt;fmt.pix_mp;</div><div class='add'>+	fmt = find_format_by_fourcc(layer, pix-&gt;pixelformat);</div><div class='add'>+	if (fmt == NULL) {</div><div class='add'>+		mxr_warn(mdev, "not recognized fourcc: %08x\n",</div><div class='add'>+			pix-&gt;pixelformat);</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	mxr_layer_geo_fix(layer);</div><div class='del'>-	a-&gt;c.left = crop-&gt;x_offset;</div><div class='del'>-	a-&gt;c.top = crop-&gt;y_offset;</div><div class='del'>-	a-&gt;c.width = crop-&gt;width;</div><div class='del'>-	a-&gt;c.height = crop-&gt;height;</div><div class='add'>+	}</div><div class='add'>+	layer-&gt;fmt = fmt;</div><div class='add'>+	/* set source size to highest accepted value */</div><div class='add'>+	geo-&gt;src.full_width = max(geo-&gt;dst.full_width, pix-&gt;width);</div><div class='add'>+	geo-&gt;src.full_height = max(geo-&gt;dst.full_height, pix-&gt;height);</div><div class='add'>+	layer-&gt;ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);</div><div class='add'>+	mxr_geometry_dump(mdev, &amp;layer-&gt;geo);</div><div class='add'>+	/* set cropping to total visible screen */</div><div class='add'>+	geo-&gt;src.width = pix-&gt;width;</div><div class='add'>+	geo-&gt;src.height = pix-&gt;height;</div><div class='add'>+	geo-&gt;src.x_offset = 0;</div><div class='add'>+	geo-&gt;src.y_offset = 0;</div><div class='add'>+	/* assure consistency of geometry */</div><div class='add'>+	layer-&gt;ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);</div><div class='add'>+	mxr_geometry_dump(mdev, &amp;layer-&gt;geo);</div><div class='add'>+	/* set full size to lowest possible value */</div><div class='add'>+	geo-&gt;src.full_width = 0;</div><div class='add'>+	geo-&gt;src.full_height = 0;</div><div class='add'>+	layer-&gt;ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);</div><div class='add'>+	mxr_geometry_dump(mdev, &amp;layer-&gt;geo);</div><div class='add'>+</div><div class='add'>+	/* returning results */</div><div class='add'>+	mxr_g_fmt(file, priv, f);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mxr_s_crop(struct file *file, void *fh, struct v4l2_crop *a)</div><div class='add'>+static int mxr_g_selection(struct file *file, void *fh,</div><div class='add'>+	struct v4l2_selection *s)</div><div class='ctx'> {</div><div class='ctx'> 	struct mxr_layer *layer = video_drvdata(file);</div><div class='del'>-	struct mxr_crop *crop;</div><div class='add'>+	struct mxr_geometry *geo = &amp;layer-&gt;geo;</div><div class='ctx'> </div><div class='ctx'> 	mxr_dbg(layer-&gt;mdev, "%s:%d\n", __func__, __LINE__);</div><div class='del'>-	crop = choose_crop_by_type(&amp;layer-&gt;geo, a-&gt;type);</div><div class='del'>-	if (crop == NULL)</div><div class='add'>+</div><div class='add'>+	if (s-&gt;type != V4L2_BUF_TYPE_VIDEO_OUTPUT &amp;&amp;</div><div class='add'>+		s-&gt;type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (s-&gt;target) {</div><div class='add'>+	case V4L2_SEL_TGT_CROP_ACTIVE:</div><div class='add'>+		s-&gt;r.left = geo-&gt;src.x_offset;</div><div class='add'>+		s-&gt;r.top = geo-&gt;src.y_offset;</div><div class='add'>+		s-&gt;r.width = geo-&gt;src.width;</div><div class='add'>+		s-&gt;r.height = geo-&gt;src.height;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_SEL_TGT_CROP_DEFAULT:</div><div class='add'>+	case V4L2_SEL_TGT_CROP_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 = geo-&gt;src.full_width;</div><div class='add'>+		s-&gt;r.height = geo-&gt;src.full_height;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_SEL_TGT_COMPOSE_ACTIVE:</div><div class='add'>+	case V4L2_SEL_TGT_COMPOSE_PADDED:</div><div class='add'>+		s-&gt;r.left = geo-&gt;dst.x_offset;</div><div class='add'>+		s-&gt;r.top = geo-&gt;dst.y_offset;</div><div class='add'>+		s-&gt;r.width = geo-&gt;dst.width;</div><div class='add'>+		s-&gt;r.height = geo-&gt;dst.height;</div><div class='add'>+		break;</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 = geo-&gt;dst.full_width;</div><div class='add'>+		s-&gt;r.height = geo-&gt;dst.full_height;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	crop-&gt;x_offset = a-&gt;c.left;</div><div class='del'>-	crop-&gt;y_offset = a-&gt;c.top;</div><div class='del'>-	crop-&gt;width = a-&gt;c.width;</div><div class='del'>-	crop-&gt;height = a-&gt;c.height;</div><div class='del'>-	mxr_layer_geo_fix(layer);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mxr_cropcap(struct file *file, void *fh, struct v4l2_cropcap *a)</div><div class='add'>+/* returns 1 if rectangle 'a' is inside 'b' */</div><div class='add'>+static int mxr_is_rect_inside(struct v4l2_rect *a, struct v4l2_rect *b)</div><div class='add'>+{</div><div class='add'>+	if (a-&gt;left &lt; b-&gt;left)</div><div class='add'>+		return 0;</div><div class='add'>+	if (a-&gt;top &lt; b-&gt;top)</div><div class='add'>+		return 0;</div><div class='add'>+	if (a-&gt;left + a-&gt;width &gt; b-&gt;left + b-&gt;width)</div><div class='add'>+		return 0;</div><div class='add'>+	if (a-&gt;top + a-&gt;height &gt; b-&gt;top + b-&gt;height)</div><div class='add'>+		return 0;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mxr_s_selection(struct file *file, void *fh,</div><div class='add'>+	struct v4l2_selection *s)</div><div class='ctx'> {</div><div class='ctx'> 	struct mxr_layer *layer = video_drvdata(file);</div><div class='del'>-	struct mxr_crop *crop;</div><div class='add'>+	struct mxr_geometry *geo = &amp;layer-&gt;geo;</div><div class='add'>+	struct mxr_crop *target = NULL;</div><div class='add'>+	enum mxr_geometry_stage stage;</div><div class='add'>+	struct mxr_geometry tmp;</div><div class='add'>+	struct v4l2_rect res;</div><div class='ctx'> </div><div class='del'>-	mxr_dbg(layer-&gt;mdev, "%s:%d\n", __func__, __LINE__);</div><div class='del'>-	crop = choose_crop_by_type(&amp;layer-&gt;geo, a-&gt;type);</div><div class='del'>-	if (crop == NULL)</div><div class='add'>+	memset(&amp;res, 0, sizeof res);</div><div class='add'>+</div><div class='add'>+	mxr_dbg(layer-&gt;mdev, "%s: rect: %dx%d@%d,%d\n", __func__,</div><div class='add'>+		s-&gt;r.width, s-&gt;r.height, s-&gt;r.left, s-&gt;r.top);</div><div class='add'>+</div><div class='add'>+	if (s-&gt;type != V4L2_BUF_TYPE_VIDEO_OUTPUT &amp;&amp;</div><div class='add'>+		s-&gt;type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	mxr_layer_geo_fix(layer);</div><div class='del'>-	a-&gt;bounds.left = 0;</div><div class='del'>-	a-&gt;bounds.top = 0;</div><div class='del'>-	a-&gt;bounds.width = crop-&gt;full_width;</div><div class='del'>-	a-&gt;bounds.top = crop-&gt;full_height;</div><div class='del'>-	a-&gt;defrect = a-&gt;bounds;</div><div class='del'>-	/* setting pixel aspect to 1/1 */</div><div class='del'>-	a-&gt;pixelaspect.numerator = 1;</div><div class='del'>-	a-&gt;pixelaspect.denominator = 1;</div><div class='add'>+</div><div class='add'>+	switch (s-&gt;target) {</div><div class='add'>+	/* ignore read-only targets */</div><div class='add'>+	case V4L2_SEL_TGT_CROP_DEFAULT:</div><div class='add'>+	case V4L2_SEL_TGT_CROP_BOUNDS:</div><div class='add'>+		res.width = geo-&gt;src.full_width;</div><div class='add'>+		res.height = geo-&gt;src.full_height;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* ignore read-only targets */</div><div class='add'>+	case V4L2_SEL_TGT_COMPOSE_DEFAULT:</div><div class='add'>+	case V4L2_SEL_TGT_COMPOSE_BOUNDS:</div><div class='add'>+		res.width = geo-&gt;dst.full_width;</div><div class='add'>+		res.height = geo-&gt;dst.full_height;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case V4L2_SEL_TGT_CROP_ACTIVE:</div><div class='add'>+		target = &amp;geo-&gt;src;</div><div class='add'>+		stage = MXR_GEOMETRY_CROP;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_SEL_TGT_COMPOSE_ACTIVE:</div><div class='add'>+	case V4L2_SEL_TGT_COMPOSE_PADDED:</div><div class='add'>+		target = &amp;geo-&gt;dst;</div><div class='add'>+		stage = MXR_GEOMETRY_COMPOSE;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	/* apply change and update geometry if needed */</div><div class='add'>+	if (target) {</div><div class='add'>+		/* backup current geometry if setup fails */</div><div class='add'>+		memcpy(&amp;tmp, geo, sizeof tmp);</div><div class='add'>+</div><div class='add'>+		/* apply requested selection */</div><div class='add'>+		target-&gt;x_offset = s-&gt;r.left;</div><div class='add'>+		target-&gt;y_offset = s-&gt;r.top;</div><div class='add'>+		target-&gt;width = s-&gt;r.width;</div><div class='add'>+		target-&gt;height = s-&gt;r.height;</div><div class='add'>+</div><div class='add'>+		layer-&gt;ops.fix_geometry(layer, stage, s-&gt;flags);</div><div class='add'>+</div><div class='add'>+		/* retrieve update selection rectangle */</div><div class='add'>+		res.left = target-&gt;x_offset;</div><div class='add'>+		res.top = target-&gt;y_offset;</div><div class='add'>+		res.width = target-&gt;width;</div><div class='add'>+		res.height = target-&gt;height;</div><div class='add'>+</div><div class='add'>+		mxr_geometry_dump(layer-&gt;mdev, &amp;layer-&gt;geo);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* checking if the rectangle satisfies constraints */</div><div class='add'>+	if ((s-&gt;flags &amp; V4L2_SEL_FLAG_LE) &amp;&amp; !mxr_is_rect_inside(&amp;res, &amp;s-&gt;r))</div><div class='add'>+		goto fail;</div><div class='add'>+	if ((s-&gt;flags &amp; V4L2_SEL_FLAG_GE) &amp;&amp; !mxr_is_rect_inside(&amp;s-&gt;r, &amp;res))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* return result rectangle */</div><div class='add'>+	s-&gt;r = res;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='add'>+fail:</div><div class='add'>+	/* restore old geometry, which is not touched if target is NULL */</div><div class='add'>+	if (target)</div><div class='add'>+		memcpy(geo, &amp;tmp, sizeof tmp);</div><div class='add'>+	return -ERANGE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mxr_enum_dv_presets(struct file *file, void *fh,</div><div class='hunk'>@@ -438,6 +538,8 @@ static int mxr_s_dv_preset(struct file *file, void *fh,</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;mdev-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	mxr_layer_update_output(layer);</div><div class='add'>+</div><div class='ctx'> 	/* any failure should return EINVAL according to V4L2 doc */</div><div class='ctx'> 	return ret ? -EINVAL : 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -478,6 +580,8 @@ static int mxr_s_std(struct file *file, void *fh, v4l2_std_id *norm)</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;mdev-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	mxr_layer_update_output(layer);</div><div class='add'>+</div><div class='ctx'> 	return ret ? -EINVAL : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -526,25 +630,27 @@ static int mxr_s_output(struct file *file, void *fh, unsigned int i)</div><div class='ctx'> 	struct video_device *vfd = video_devdata(file);</div><div class='ctx'> 	struct mxr_layer *layer = video_drvdata(file);</div><div class='ctx'> 	struct mxr_device *mdev = layer-&gt;mdev;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (i &gt;= mdev-&gt;output_cnt || mdev-&gt;output[i] == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mdev-&gt;mutex);</div><div class='ctx'> 	if (mdev-&gt;n_output &gt; 0) {</div><div class='del'>-		ret = -EBUSY;</div><div class='del'>-		goto done;</div><div class='add'>+		mutex_unlock(&amp;mdev-&gt;mutex);</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	mdev-&gt;current_output = i;</div><div class='ctx'> 	vfd-&gt;tvnorms = 0;</div><div class='ctx'> 	v4l2_subdev_call(to_outsd(mdev), video, g_tvnorms_output,</div><div class='ctx'> 		&amp;vfd-&gt;tvnorms);</div><div class='add'>+	mutex_unlock(&amp;mdev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* update layers geometry */</div><div class='add'>+	mxr_layer_update_output(layer);</div><div class='add'>+</div><div class='ctx'> 	mxr_dbg(mdev, "tvnorms = %08llx\n", vfd-&gt;tvnorms);</div><div class='ctx'> </div><div class='del'>-done:</div><div class='del'>-	mutex_unlock(&amp;mdev-&gt;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 int mxr_g_output(struct file *file, void *fh, unsigned int *p)</div><div class='hunk'>@@ -633,10 +739,9 @@ static const struct v4l2_ioctl_ops mxr_ioctl_ops = {</div><div class='ctx'> 	.vidioc_enum_output = mxr_enum_output,</div><div class='ctx'> 	.vidioc_s_output = mxr_s_output,</div><div class='ctx'> 	.vidioc_g_output = mxr_g_output,</div><div class='del'>-	/* Crop ioctls */</div><div class='del'>-	.vidioc_g_crop = mxr_g_crop,</div><div class='del'>-	.vidioc_s_crop = mxr_s_crop,</div><div class='del'>-	.vidioc_cropcap = mxr_cropcap,</div><div class='add'>+	/* selection ioctls */</div><div class='add'>+	.vidioc_g_selection = mxr_g_selection,</div><div class='add'>+	.vidioc_s_selection = mxr_s_selection,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int mxr_video_open(struct file *file)</div><div class='hunk'>@@ -805,10 +910,7 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)</div><div class='ctx'> 	/* block any changes in output configuration */</div><div class='ctx'> 	mxr_output_get(mdev);</div><div class='ctx'> </div><div class='del'>-	/* update layers geometry */</div><div class='del'>-	mxr_layer_geo_fix(layer);</div><div class='del'>-	mxr_geometry_dump(mdev, &amp;layer-&gt;geo);</div><div class='del'>-</div><div class='add'>+	mxr_layer_update_output(layer);</div><div class='ctx'> 	layer-&gt;ops.format_set(layer);</div><div class='ctx'> 	/* enabling layer in hardware */</div><div class='ctx'> 	spin_lock_irqsave(&amp;layer-&gt;enq_slock, flags);</div><div class='head'>diff --git a/drivers/media/video/s5p-tv/mixer_vp_layer.c b/drivers/media/video/s5p-tv/mixer_vp_layer.c<br/>index f3bb2e34cb51..3d13a636877b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-tv/mixer_vp_layer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-tv/mixer_vp_layer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-tv/mixer_vp_layer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-tv/mixer_vp_layer.c</a></div><div class='hunk'>@@ -127,47 +127,77 @@ static void mxr_vp_format_set(struct mxr_layer *layer)</div><div class='ctx'> 	mxr_reg_vp_format(layer-&gt;mdev, layer-&gt;fmt, &amp;layer-&gt;geo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mxr_vp_fix_geometry(struct mxr_layer *layer)</div><div class='add'>+static inline unsigned int do_center(unsigned int center,</div><div class='add'>+	unsigned int size, unsigned int upper, unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	struct mxr_geometry *geo = &amp;layer-&gt;geo;</div><div class='add'>+	unsigned int lower;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; MXR_NO_OFFSET)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	lower = center - min(center, size / 2);</div><div class='add'>+	return min(lower, upper - size);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* align horizontal size to 8 pixels */</div><div class='del'>-	geo-&gt;src.full_width = ALIGN(geo-&gt;src.full_width, 8);</div><div class='del'>-	/* limit to boundary size */</div><div class='del'>-	geo-&gt;src.full_width = clamp_val(geo-&gt;src.full_width, 8, 8192);</div><div class='del'>-	geo-&gt;src.full_height = clamp_val(geo-&gt;src.full_height, 1, 8192);</div><div class='del'>-	geo-&gt;src.width = clamp_val(geo-&gt;src.width, 32, geo-&gt;src.full_width);</div><div class='del'>-	geo-&gt;src.width = min(geo-&gt;src.width, 2047U);</div><div class='del'>-	geo-&gt;src.height = clamp_val(geo-&gt;src.height, 4, geo-&gt;src.full_height);</div><div class='del'>-	geo-&gt;src.height = min(geo-&gt;src.height, 2047U);</div><div class='del'>-</div><div class='del'>-	/* setting size of output window */</div><div class='del'>-	geo-&gt;dst.width = clamp_val(geo-&gt;dst.width, 8, geo-&gt;dst.full_width);</div><div class='del'>-	geo-&gt;dst.height = clamp_val(geo-&gt;dst.height, 1, geo-&gt;dst.full_height);</div><div class='del'>-</div><div class='del'>-	/* ensure that scaling is in range 1/4x to 16x */</div><div class='del'>-	if (geo-&gt;src.width &gt;= 4 * geo-&gt;dst.width)</div><div class='del'>-		geo-&gt;src.width = 4 * geo-&gt;dst.width;</div><div class='del'>-	if (geo-&gt;dst.width &gt;= 16 * geo-&gt;src.width)</div><div class='del'>-		geo-&gt;dst.width = 16 * geo-&gt;src.width;</div><div class='del'>-	if (geo-&gt;src.height &gt;= 4 * geo-&gt;dst.height)</div><div class='del'>-		geo-&gt;src.height = 4 * geo-&gt;dst.height;</div><div class='del'>-	if (geo-&gt;dst.height &gt;= 16 * geo-&gt;src.height)</div><div class='del'>-		geo-&gt;dst.height = 16 * geo-&gt;src.height;</div><div class='del'>-</div><div class='del'>-	/* setting scaling ratio */</div><div class='del'>-	geo-&gt;x_ratio = (geo-&gt;src.width &lt;&lt; 16) / geo-&gt;dst.width;</div><div class='del'>-	geo-&gt;y_ratio = (geo-&gt;src.height &lt;&lt; 16) / geo-&gt;dst.height;</div><div class='del'>-</div><div class='del'>-	/* adjust offsets */</div><div class='del'>-	geo-&gt;src.x_offset = min(geo-&gt;src.x_offset,</div><div class='del'>-		geo-&gt;src.full_width - geo-&gt;src.width);</div><div class='del'>-	geo-&gt;src.y_offset = min(geo-&gt;src.y_offset,</div><div class='del'>-		geo-&gt;src.full_height - geo-&gt;src.height);</div><div class='del'>-	geo-&gt;dst.x_offset = min(geo-&gt;dst.x_offset,</div><div class='del'>-		geo-&gt;dst.full_width - geo-&gt;dst.width);</div><div class='del'>-	geo-&gt;dst.y_offset = min(geo-&gt;dst.y_offset,</div><div class='del'>-		geo-&gt;dst.full_height - geo-&gt;dst.height);</div><div class='add'>+static void mxr_vp_fix_geometry(struct mxr_layer *layer,</div><div class='add'>+	enum mxr_geometry_stage stage, unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	struct mxr_geometry *geo = &amp;layer-&gt;geo;</div><div class='add'>+	struct mxr_crop *src = &amp;geo-&gt;src;</div><div class='add'>+	struct mxr_crop *dst = &amp;geo-&gt;dst;</div><div class='add'>+	unsigned long x_center, y_center;</div><div class='add'>+</div><div class='add'>+	switch (stage) {</div><div class='add'>+</div><div class='add'>+	case MXR_GEOMETRY_SINK: /* nothing to be fixed here */</div><div class='add'>+	case MXR_GEOMETRY_COMPOSE:</div><div class='add'>+		/* remember center of the area */</div><div class='add'>+		x_center = dst-&gt;x_offset + dst-&gt;width / 2;</div><div class='add'>+		y_center = dst-&gt;y_offset + dst-&gt;height / 2;</div><div class='add'>+</div><div class='add'>+		/* ensure that compose is reachable using 16x scaling */</div><div class='add'>+		dst-&gt;width = clamp(dst-&gt;width, 8U, 16 * src-&gt;full_width);</div><div class='add'>+		dst-&gt;height = clamp(dst-&gt;height, 1U, 16 * src-&gt;full_height);</div><div class='add'>+</div><div class='add'>+		/* setup offsets */</div><div class='add'>+		dst-&gt;x_offset = do_center(x_center, dst-&gt;width,</div><div class='add'>+			dst-&gt;full_width, flags);</div><div class='add'>+		dst-&gt;y_offset = do_center(y_center, dst-&gt;height,</div><div class='add'>+			dst-&gt;full_height, flags);</div><div class='add'>+		flags = 0; /* remove possible MXR_NO_OFFSET flag */</div><div class='add'>+		/* fall through */</div><div class='add'>+	case MXR_GEOMETRY_CROP:</div><div class='add'>+		/* remember center of the area */</div><div class='add'>+		x_center = src-&gt;x_offset + src-&gt;width / 2;</div><div class='add'>+		y_center = src-&gt;y_offset + src-&gt;height / 2;</div><div class='add'>+</div><div class='add'>+		/* ensure scaling is between 0.25x .. 16x */</div><div class='add'>+		src-&gt;width = clamp(src-&gt;width, round_up(dst-&gt;width / 16, 4),</div><div class='add'>+			dst-&gt;width * 4);</div><div class='add'>+		src-&gt;height = clamp(src-&gt;height, round_up(dst-&gt;height / 16, 4),</div><div class='add'>+			dst-&gt;height * 4);</div><div class='add'>+</div><div class='add'>+		/* hardware limits */</div><div class='add'>+		src-&gt;width = clamp(src-&gt;width, 32U, 2047U);</div><div class='add'>+		src-&gt;height = clamp(src-&gt;height, 4U, 2047U);</div><div class='add'>+</div><div class='add'>+		/* setup offsets */</div><div class='add'>+		src-&gt;x_offset = do_center(x_center, src-&gt;width,</div><div class='add'>+			src-&gt;full_width, flags);</div><div class='add'>+		src-&gt;y_offset = do_center(y_center, src-&gt;height,</div><div class='add'>+			src-&gt;full_height, flags);</div><div class='add'>+</div><div class='add'>+		/* setting scaling ratio */</div><div class='add'>+		geo-&gt;x_ratio = (src-&gt;width &lt;&lt; 16) / dst-&gt;width;</div><div class='add'>+		geo-&gt;y_ratio = (src-&gt;height &lt;&lt; 16) / dst-&gt;height;</div><div class='add'>+		/* fall through */</div><div class='add'>+</div><div class='add'>+	case MXR_GEOMETRY_SOURCE:</div><div class='add'>+		src-&gt;full_width = clamp(src-&gt;full_width,</div><div class='add'>+			ALIGN(src-&gt;width + src-&gt;x_offset, 8), 8192U);</div><div class='add'>+		src-&gt;full_height = clamp(src-&gt;full_height,</div><div class='add'>+			src-&gt;height + src-&gt;y_offset, 8192U);</div><div class='add'>+	};</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* PUBLIC API */</div><div class='head'>diff --git a/drivers/media/video/s5p-tv/sdo_drv.c b/drivers/media/video/s5p-tv/sdo_drv.c<br/>index 8cec67ef48c9..059e7749ce95 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-tv/sdo_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/s5p-tv/sdo_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/s5p-tv/sdo_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/s5p-tv/sdo_drv.c</a></div><div class='hunk'>@@ -457,24 +457,4 @@ static struct platform_driver sdo_driver __refdata = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sdo_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	static const char banner[] __initdata = KERN_INFO \</div><div class='del'>-		"Samsung Standard Definition Output (SDO) driver, "</div><div class='del'>-		"(c) 2010-2011 Samsung Electronics Co., Ltd.\n";</div><div class='del'>-	printk(banner);</div><div class='del'>-</div><div class='del'>-	ret = platform_driver_register(&amp;sdo_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		printk(KERN_ERR "SDO platform driver register failed\n");</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-module_init(sdo_init);</div><div class='del'>-</div><div class='del'>-static void __exit sdo_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sdo_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(sdo_exit);</div><div class='add'>+module_platform_driver(sdo_driver);</div><div class='head'>diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c<br/>index 5cfdbc78b918..0ef5484696b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7115.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7115.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7115.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/saa7115.c</a></div><div class='hunk'>@@ -57,7 +57,7 @@ MODULE_AUTHOR(  "Maxim Yevtyushkin, Kevin Thayer, Chris Kennedy, "</div><div class='ctx'> 		"Hans Verkuil, Mauro Carvalho Chehab");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> module_param(debug, bool, 0644);</div><div class='ctx'> </div><div class='ctx'> MODULE_PARM_DESC(debug, "Debug level (0-1)");</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c<br/>index 0f9fb99adeb4..065d0f6be4a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-cards.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7134/saa7134-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/saa7134/saa7134-cards.c</a></div><div class='hunk'>@@ -5691,6 +5691,27 @@ struct saa7134_board saa7134_boards[] = {</div><div class='ctx'> 			.amux = LINE1,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+	[SAA7134_BOARD_SENSORAY811_911] = {</div><div class='add'>+		.name		= "Sensoray 811/911",</div><div class='add'>+		.audio_clock	= 0x00200000,</div><div class='add'>+		.tuner_type	= TUNER_ABSENT,</div><div class='add'>+		.radio_type	= UNSET,</div><div class='add'>+		.tuner_addr	= ADDR_UNSET,</div><div class='add'>+		.radio_addr	= ADDR_UNSET,</div><div class='add'>+		.inputs		= {{</div><div class='add'>+			.name   = name_comp1,</div><div class='add'>+			.vmux   = 0,</div><div class='add'>+			.amux   = LINE1,</div><div class='add'>+		}, {</div><div class='add'>+			.name   = name_comp3,</div><div class='add'>+			.vmux   = 2,</div><div class='add'>+			.amux   = LINE1,</div><div class='add'>+		}, {</div><div class='add'>+			.name   = name_svideo,</div><div class='add'>+			.vmux   = 8,</div><div class='add'>+			.amux   = LINE1,</div><div class='add'>+		} },</div><div class='add'>+	},</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -6914,6 +6935,18 @@ struct pci_device_id saa7134_pci_tbl[] = {</div><div class='ctx'> 		.subdevice    = 0xd136,</div><div class='ctx'> 		.driver_data  = SAA7134_BOARD_MAGICPRO_PROHDTV_PRO2,</div><div class='ctx'> 	}, {</div><div class='add'>+		.vendor       = PCI_VENDOR_ID_PHILIPS,</div><div class='add'>+		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,</div><div class='add'>+		.subvendor    = 0x6000,</div><div class='add'>+		.subdevice    = 0x0811,</div><div class='add'>+		.driver_data  = SAA7134_BOARD_SENSORAY811_911,</div><div class='add'>+	}, {</div><div class='add'>+		.vendor       = PCI_VENDOR_ID_PHILIPS,</div><div class='add'>+		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,</div><div class='add'>+		.subvendor    = 0x6000,</div><div class='add'>+		.subdevice    = 0x0911,</div><div class='add'>+		.driver_data  = SAA7134_BOARD_SENSORAY811_911,</div><div class='add'>+	}, {</div><div class='ctx'> 		/* --- boards without eeprom + subsystem ID --- */</div><div class='ctx'> 		.vendor       = PCI_VENDOR_ID_PHILIPS,</div><div class='ctx'> 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c<br/>index ca65cda3e101..5fbb4e49495c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7134/saa7134-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/saa7134/saa7134-core.c</a></div><div class='hunk'>@@ -1263,7 +1263,6 @@ static int saa7134_resume(struct pci_dev *pci_dev)</div><div class='ctx'> 	saa7134_tvaudio_setmute(dev);</div><div class='ctx'> 	saa7134_tvaudio_setvolume(dev, dev-&gt;ctl_volume);</div><div class='ctx'> 	saa7134_tvaudio_init(dev);</div><div class='del'>-	saa7134_tvaudio_do_scan(dev);</div><div class='ctx'> 	saa7134_enable_i2s(dev);</div><div class='ctx'> 	saa7134_hw_enable2(dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c<br/>index 1e4ef1669887..089fa0fb5c94 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-dvb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7134/saa7134-dvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/saa7134/saa7134-dvb.c</a></div><div class='hunk'>@@ -183,9 +183,9 @@ static int mt352_avermedia_xc3028_init(struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt352_pinnacle_tuner_set_params(struct dvb_frontend* fe,</div><div class='del'>-					   struct dvb_frontend_parameters* params)</div><div class='add'>+static int mt352_pinnacle_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	u8 off[] = { 0x00, 0xf1};</div><div class='ctx'> 	u8 on[]  = { 0x00, 0x71};</div><div class='ctx'> 	struct i2c_msg msg = {.addr=0x43, .flags=0, .buf=off, .len = sizeof(off)};</div><div class='hunk'>@@ -196,7 +196,7 @@ static int mt352_pinnacle_tuner_set_params(struct dvb_frontend* fe,</div><div class='ctx'> 	/* set frequency (mt2050) */</div><div class='ctx'> 	f.tuner     = 0;</div><div class='ctx'> 	f.type      = V4L2_TUNER_DIGITAL_TV;</div><div class='del'>-	f.frequency = params-&gt;frequency / 1000 * 16 / 1000;</div><div class='add'>+	f.frequency = c-&gt;frequency / 1000 * 16 / 1000;</div><div class='ctx'> 	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='ctx'> 		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;msg, 1);</div><div class='hunk'>@@ -287,8 +287,9 @@ static int philips_tda1004x_request_firmware(struct dvb_frontend *fe,</div><div class='ctx'>  * these tuners are tu1216, td1316(a)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int philips_tda6651_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_tda6651_pll_set(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *c = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct saa7134_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	struct tda1004x_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u8 addr = state-&gt;config-&gt;tuner_address;</div><div class='hunk'>@@ -299,7 +300,7 @@ static int philips_tda6651_pll_set(struct dvb_frontend *fe, struct dvb_frontend_</div><div class='ctx'> 	u8 band, cp, filter;</div><div class='ctx'> </div><div class='ctx'> 	/* determine charge pump */</div><div class='del'>-	tuner_frequency = params-&gt;frequency + 36166000;</div><div class='add'>+	tuner_frequency = c-&gt;frequency + 36166000;</div><div class='ctx'> 	if (tuner_frequency &lt; 87000000)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	else if (tuner_frequency &lt; 130000000)</div><div class='hunk'>@@ -324,28 +325,28 @@ static int philips_tda6651_pll_set(struct dvb_frontend *fe, struct dvb_frontend_</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* determine band */</div><div class='del'>-	if (params-&gt;frequency &lt; 49000000)</div><div class='add'>+	if (c-&gt;frequency &lt; 49000000)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	else if (params-&gt;frequency &lt; 161000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 161000000)</div><div class='ctx'> 		band = 1;</div><div class='del'>-	else if (params-&gt;frequency &lt; 444000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 444000000)</div><div class='ctx'> 		band = 2;</div><div class='del'>-	else if (params-&gt;frequency &lt; 861000000)</div><div class='add'>+	else if (c-&gt;frequency &lt; 861000000)</div><div class='ctx'> 		band = 4;</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* setup PLL filter */</div><div class='del'>-	switch (params-&gt;u.ofdm.bandwidth) {</div><div class='del'>-	case BANDWIDTH_6_MHZ:</div><div class='add'>+	switch (c-&gt;bandwidth_hz) {</div><div class='add'>+	case 6000000:</div><div class='ctx'> 		filter = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case BANDWIDTH_7_MHZ:</div><div class='add'>+	case 7000000:</div><div class='ctx'> 		filter = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case BANDWIDTH_8_MHZ:</div><div class='add'>+	case 8000000:</div><div class='ctx'> 		filter = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -356,7 +357,7 @@ static int philips_tda6651_pll_set(struct dvb_frontend *fe, struct dvb_frontend_</div><div class='ctx'> 	/* calculate divisor</div><div class='ctx'> 	 * ((36166000+((1000000/6)/2)) + Finput)/(1000000/6)</div><div class='ctx'> 	 */</div><div class='del'>-	tuner_frequency = (((params-&gt;frequency / 1000) * 6) + 217496) / 1000;</div><div class='add'>+	tuner_frequency = (((c-&gt;frequency / 1000) * 6) + 217496) / 1000;</div><div class='ctx'> </div><div class='ctx'> 	/* setup tuner buffer */</div><div class='ctx'> 	tuner_buf[0] = (tuner_frequency &gt;&gt; 8) &amp; 0x7f;</div><div class='hunk'>@@ -436,9 +437,9 @@ static int philips_td1316_tuner_init(struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_td1316_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_td1316_tuner_set_params(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='del'>-	return philips_tda6651_pll_set(fe, params);</div><div class='add'>+	return philips_tda6651_pll_set(fe);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int philips_td1316_tuner_sleep(struct dvb_frontend *fe)</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c<br/>index d4ee24bf6928..22ecd7297d2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-input.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7134/saa7134-input.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/saa7134/saa7134-input.c</a></div><div class='hunk'>@@ -235,22 +235,25 @@ static int get_key_purpletv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)</div><div class='ctx'> </div><div class='ctx'> static int get_key_hvr1110(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)</div><div class='ctx'> {</div><div class='del'>-	unsigned char buf[5], cod4, code3, code4;</div><div class='add'>+	unsigned char buf[5];</div><div class='ctx'> </div><div class='ctx'> 	/* poll IR chip */</div><div class='ctx'> 	if (5 != i2c_master_recv(ir-&gt;c, buf, 5))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	cod4	= buf[4];</div><div class='del'>-	code4	= (cod4 &gt;&gt; 2);</div><div class='del'>-	code3	= buf[3];</div><div class='del'>-	if (code3 == 0)</div><div class='del'>-		/* no key pressed */</div><div class='add'>+	/* Check if some key were pressed */</div><div class='add'>+	if (!(buf[0] &amp; 0x80))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/* return key */</div><div class='del'>-	*ir_key = code4;</div><div class='del'>-	*ir_raw = code4;</div><div class='add'>+	/*</div><div class='add'>+	 * buf[3] &amp; 0x80 is always high.</div><div class='add'>+	 * buf[3] &amp; 0x40 is a parity bit. A repeat event is marked</div><div class='add'>+	 * by preserving it into two separate readings</div><div class='add'>+	 * buf[4] bits 0 and 1, and buf[1] and buf[2] are always</div><div class='add'>+	 * zero.</div><div class='add'>+	 */</div><div class='add'>+	*ir_key = 0x1fff &amp; ((buf[3] &lt;&lt; 8) | (buf[4] &gt;&gt; 2));</div><div class='add'>+	*ir_raw = *ir_key;</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -752,7 +755,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)</div><div class='ctx'> 		polling      = 50; /* ms */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_VIDEOMATE_M1F:</div><div class='del'>-		ir_codes     = RC_MAP_VIDEOMATE_M1F;</div><div class='add'>+		ir_codes     = RC_MAP_VIDEOMATE_K100;</div><div class='ctx'> 		mask_keycode = 0x0ff00;</div><div class='ctx'> 		mask_keyup   = 0x040000;</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c<br/>index 57e646bb48b3..b7a99bee2f98 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-tvaudio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7134/saa7134-tvaudio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-tvaudio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/saa7134/saa7134-tvaudio.c</a></div><div class='hunk'>@@ -332,6 +332,13 @@ static int tvaudio_checkcarrier(struct saa7134_dev *dev, struct mainscan *scan)</div><div class='ctx'> {</div><div class='ctx'> 	__s32 left,right,value;</div><div class='ctx'> </div><div class='add'>+	if (!(dev-&gt;tvnorm-&gt;id &amp; scan-&gt;std)) {</div><div class='add'>+		value = 0;</div><div class='add'>+		dprintk("skipping %d.%03d MHz [%4s]\n",</div><div class='add'>+			scan-&gt;carr / 1000, scan-&gt;carr % 1000, scan-&gt;name);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (audio_debug &gt; 1) {</div><div class='ctx'> 		int i;</div><div class='ctx'> 		dprintk("debug %d:",scan-&gt;carr);</div><div class='hunk'>@@ -348,30 +355,25 @@ static int tvaudio_checkcarrier(struct saa7134_dev *dev, struct mainscan *scan)</div><div class='ctx'> 		}</div><div class='ctx'> 		printk("\n");</div><div class='ctx'> 	}</div><div class='del'>-	if (dev-&gt;tvnorm-&gt;id &amp; scan-&gt;std) {</div><div class='del'>-		tvaudio_setcarrier(dev,scan-&gt;carr-90,scan-&gt;carr-90);</div><div class='del'>-		saa_readl(SAA7134_LEVEL_READOUT1 &gt;&gt; 2);</div><div class='del'>-		if (tvaudio_sleep(dev,SCAN_SAMPLE_DELAY))</div><div class='del'>-			return -1;</div><div class='del'>-		left = saa_readl(SAA7134_LEVEL_READOUT1 &gt;&gt; 2);</div><div class='del'>-</div><div class='del'>-		tvaudio_setcarrier(dev,scan-&gt;carr+90,scan-&gt;carr+90);</div><div class='del'>-		saa_readl(SAA7134_LEVEL_READOUT1 &gt;&gt; 2);</div><div class='del'>-		if (tvaudio_sleep(dev,SCAN_SAMPLE_DELAY))</div><div class='del'>-			return -1;</div><div class='del'>-		right = saa_readl(SAA7134_LEVEL_READOUT1 &gt;&gt; 2);</div><div class='del'>-</div><div class='del'>-		left &gt;&gt;= 16;</div><div class='del'>-		right &gt;&gt;= 16;</div><div class='del'>-		value = left &gt; right ? left - right : right - left;</div><div class='del'>-		dprintk("scanning %d.%03d MHz [%4s] =&gt;  dc is %5d [%d/%d]\n",</div><div class='del'>-			scan-&gt;carr / 1000, scan-&gt;carr % 1000,</div><div class='del'>-			scan-&gt;name, value, left, right);</div><div class='del'>-	} else {</div><div class='del'>-		value = 0;</div><div class='del'>-		dprintk("skipping %d.%03d MHz [%4s]\n",</div><div class='del'>-			scan-&gt;carr / 1000, scan-&gt;carr % 1000, scan-&gt;name);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	tvaudio_setcarrier(dev,scan-&gt;carr-90,scan-&gt;carr-90);</div><div class='add'>+	saa_readl(SAA7134_LEVEL_READOUT1 &gt;&gt; 2);</div><div class='add'>+	if (tvaudio_sleep(dev,SCAN_SAMPLE_DELAY))</div><div class='add'>+		return -1;</div><div class='add'>+	left = saa_readl(SAA7134_LEVEL_READOUT1 &gt;&gt; 2);</div><div class='add'>+</div><div class='add'>+	tvaudio_setcarrier(dev,scan-&gt;carr+90,scan-&gt;carr+90);</div><div class='add'>+	saa_readl(SAA7134_LEVEL_READOUT1 &gt;&gt; 2);</div><div class='add'>+	if (tvaudio_sleep(dev,SCAN_SAMPLE_DELAY))</div><div class='add'>+		return -1;</div><div class='add'>+	right = saa_readl(SAA7134_LEVEL_READOUT1 &gt;&gt; 2);</div><div class='add'>+</div><div class='add'>+	left &gt;&gt;= 16;</div><div class='add'>+	right &gt;&gt;= 16;</div><div class='add'>+	value = left &gt; right ? left - right : right - left;</div><div class='add'>+	dprintk("scanning %d.%03d MHz [%4s] =&gt;  dc is %5d [%d/%d]\n",</div><div class='add'>+		scan-&gt;carr / 1000, scan-&gt;carr % 1000,</div><div class='add'>+		scan-&gt;name, value, left, right);</div><div class='ctx'> 	return value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -546,6 +548,7 @@ static int tvaudio_thread(void *data)</div><div class='ctx'> 				dev-&gt;tvnorm-&gt;name, carrier/1000, carrier%1000,</div><div class='ctx'> 				max1, max2);</div><div class='ctx'> 			dev-&gt;last_carrier = carrier;</div><div class='add'>+			dev-&gt;automute = 0;</div><div class='ctx'> </div><div class='ctx'> 		} else if (0 != dev-&gt;last_carrier) {</div><div class='ctx'> 			/* no carrier -- try last detected one as fallback */</div><div class='hunk'>@@ -553,6 +556,7 @@ static int tvaudio_thread(void *data)</div><div class='ctx'> 			dprintk("audio carrier scan failed, "</div><div class='ctx'> 				"using %d.%03d MHz [last detected]\n",</div><div class='ctx'> 				carrier/1000, carrier%1000);</div><div class='add'>+			dev-&gt;automute = 1;</div><div class='ctx'> </div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* no carrier + no fallback -- use default */</div><div class='hunk'>@@ -560,9 +564,9 @@ static int tvaudio_thread(void *data)</div><div class='ctx'> 			dprintk("audio carrier scan failed, "</div><div class='ctx'> 				"using %d.%03d MHz [default]\n",</div><div class='ctx'> 				carrier/1000, carrier%1000);</div><div class='add'>+			dev-&gt;automute = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		tvaudio_setcarrier(dev,carrier,carrier);</div><div class='del'>-		dev-&gt;automute = 0;</div><div class='ctx'> 		saa_andorb(SAA7134_STEREO_DAC_OUTPUT_SELECT, 0x30, 0x00);</div><div class='ctx'> 		saa7134_tvaudio_setmute(dev);</div><div class='ctx'> 		/* find the exact tv audio norm */</div><div class='hunk'>@@ -601,7 +605,7 @@ static int tvaudio_thread(void *data)</div><div class='ctx'> 			if (kthread_should_stop())</div><div class='ctx'> 				break;</div><div class='ctx'> 			if (UNSET == dev-&gt;thread.mode) {</div><div class='del'>-				rx = tvaudio_getstereo(dev,&amp;tvaudio[i]);</div><div class='add'>+				rx = tvaudio_getstereo(dev, &amp;tvaudio[audio]);</div><div class='ctx'> 				mode = saa7134_tvaudio_rx2mode(rx);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				mode = dev-&gt;thread.mode;</div><div class='hunk'>@@ -1020,6 +1024,7 @@ int saa7134_tvaudio_init2(struct saa7134_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;thread.thread = NULL;</div><div class='add'>+	dev-&gt;thread.scan1 = dev-&gt;thread.scan2 = 0;</div><div class='ctx'> 	if (my_thread) {</div><div class='ctx'> 		saa7134_tvaudio_init(dev);</div><div class='ctx'> 		/* start tvaudio thread */</div><div class='hunk'>@@ -1029,13 +1034,19 @@ int saa7134_tvaudio_init2(struct saa7134_dev *dev)</div><div class='ctx'> 			       dev-&gt;name);</div><div class='ctx'> 			/* XXX: missing error handling here */</div><div class='ctx'> 		}</div><div class='del'>-		saa7134_tvaudio_do_scan(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	saa7134_enable_i2s(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int saa7134_tvaudio_close(struct saa7134_dev *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;automute = 1;</div><div class='add'>+	/* anything else to undo? */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int saa7134_tvaudio_fini(struct saa7134_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* shutdown tvaudio thread */</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c<br/>index 9cf7914f6f90..417034eb6ad2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-video.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7134/saa7134-video.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/saa7134/saa7134-video.c</a></div><div class='hunk'>@@ -1462,6 +1462,8 @@ static int video_release(struct file *file)</div><div class='ctx'> 	struct saa6588_command cmd;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	saa7134_tvaudio_close(dev);</div><div class='add'>+</div><div class='ctx'> 	/* turn off overlay */</div><div class='ctx'> 	if (res_check(fh, RESOURCE_OVERLAY)) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;dev-&gt;slock,flags);</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h<br/>index 9b550687213a..42fba4f93c72 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7134/saa7134.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/saa7134/saa7134.h</a></div><div class='hunk'>@@ -330,6 +330,7 @@ struct saa7134_card_ir {</div><div class='ctx'> #define SAA7134_BOARD_MAGICPRO_PROHDTV_PRO2 185</div><div class='ctx'> #define SAA7134_BOARD_BEHOLD_501            186</div><div class='ctx'> #define SAA7134_BOARD_BEHOLD_503FM          187</div><div class='add'>+#define SAA7134_BOARD_SENSORAY811_911       188</div><div class='ctx'> </div><div class='ctx'> #define SAA7134_MAXBOARDS 32</div><div class='ctx'> #define SAA7134_INPUT_MAX 8</div><div class='hunk'>@@ -817,6 +818,7 @@ void saa7134_tvaudio_init(struct saa7134_dev *dev);</div><div class='ctx'> int saa7134_tvaudio_init2(struct saa7134_dev *dev);</div><div class='ctx'> int saa7134_tvaudio_fini(struct saa7134_dev *dev);</div><div class='ctx'> int saa7134_tvaudio_do_scan(struct saa7134_dev *dev);</div><div class='add'>+int saa7134_tvaudio_close(struct saa7134_dev *dev);</div><div class='ctx'> </div><div class='ctx'> int saa_dsp_writel(struct saa7134_dev *dev, int reg, u32 value);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/saa7164/saa7164-bus.c b/drivers/media/video/saa7164/saa7164-bus.c<br/>index 466e1b02f91f..a7f58a998752 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7164/saa7164-bus.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7164/saa7164-bus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7164/saa7164-bus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/saa7164/saa7164-bus.c</a></div><div class='hunk'>@@ -149,7 +149,7 @@ int saa7164_bus_set(struct saa7164_dev *dev, struct tmComResInfo* msg,</div><div class='ctx'> 	saa7164_bus_verify(dev);</div><div class='ctx'> </div><div class='ctx'> 	msg-&gt;size = cpu_to_le16(msg-&gt;size);</div><div class='del'>-	msg-&gt;command = cpu_to_le16(msg-&gt;command);</div><div class='add'>+	msg-&gt;command = cpu_to_le32(msg-&gt;command);</div><div class='ctx'> 	msg-&gt;controlselector = cpu_to_le16(msg-&gt;controlselector);</div><div class='ctx'> </div><div class='ctx'> 	if (msg-&gt;size &gt; dev-&gt;bus.m_wMaxReqSize) {</div><div class='hunk'>@@ -464,7 +464,7 @@ int saa7164_bus_get(struct saa7164_dev *dev, struct tmComResInfo* msg,</div><div class='ctx'> </div><div class='ctx'> peekout:</div><div class='ctx'> 	msg-&gt;size = le16_to_cpu(msg-&gt;size);</div><div class='del'>-	msg-&gt;command = le16_to_cpu(msg-&gt;command);</div><div class='add'>+	msg-&gt;command = le32_to_cpu(msg-&gt;command);</div><div class='ctx'> 	msg-&gt;controlselector = le16_to_cpu(msg-&gt;controlselector);</div><div class='ctx'> 	ret = SAA_OK;</div><div class='ctx'> out:</div><div class='head'>diff --git a/drivers/media/video/saa7164/saa7164-cards.c b/drivers/media/video/saa7164/saa7164-cards.c<br/>index 971591d6450f..5b72da5ce418 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7164/saa7164-cards.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/saa7164/saa7164-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7164/saa7164-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/saa7164/saa7164-cards.c</a></div><div class='hunk'>@@ -269,8 +269,6 @@ struct saa7164_board saa7164_boards[] = {</div><div class='ctx'> 		.portb		= SAA7164_MPEG_DVB,</div><div class='ctx'> 		.portc		= SAA7164_MPEG_ENCODER,</div><div class='ctx'> 		.portd		= SAA7164_MPEG_ENCODER,</div><div class='del'>-		.portc		= SAA7164_MPEG_ENCODER,</div><div class='del'>-		.portd		= SAA7164_MPEG_ENCODER,</div><div class='ctx'> 		.porte		= SAA7164_MPEG_VBI,</div><div class='ctx'> 		.portf		= SAA7164_MPEG_VBI,</div><div class='ctx'> 		.chiprev	= SAA7164_CHIP_REV3,</div><div class='hunk'>@@ -333,8 +331,6 @@ struct saa7164_board saa7164_boards[] = {</div><div class='ctx'> 		.portd		= SAA7164_MPEG_ENCODER,</div><div class='ctx'> 		.porte		= SAA7164_MPEG_VBI,</div><div class='ctx'> 		.portf		= SAA7164_MPEG_VBI,</div><div class='del'>-		.porte		= SAA7164_MPEG_VBI,</div><div class='del'>-		.portf		= SAA7164_MPEG_VBI,</div><div class='ctx'> 		.chiprev	= SAA7164_CHIP_REV3,</div><div class='ctx'> 		.unit		= {{</div><div class='ctx'> 			.id		= 0x28,</div><div class='head'>diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c<br/>index c51decfcae19..f854d85a387c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/sh_mobile_ceu_camera.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/sh_mobile_ceu_camera.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/sh_mobile_ceu_camera.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/sh_mobile_ceu_camera.c</a></div><div class='hunk'>@@ -786,8 +786,7 @@ static struct v4l2_subdev *find_bus_subdev(struct sh_mobile_ceu_dev *pcdev,</div><div class='ctx'> 		V4L2_MBUS_DATA_ACTIVE_HIGH)</div><div class='ctx'> </div><div class='ctx'> /* Capture is not running, no interrupts, no locking needed */</div><div class='del'>-static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd,</div><div class='del'>-				       __u32 pixfmt)</div><div class='add'>+static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd)</div><div class='ctx'> {</div><div class='ctx'> 	struct soc_camera_host *ici = to_soc_camera_host(icd-&gt;parent);</div><div class='ctx'> 	struct sh_mobile_ceu_dev *pcdev = ici-&gt;priv;</div><div class='hunk'>@@ -925,11 +924,6 @@ static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd,</div><div class='ctx'> 	ceu_write(pcdev, CDOCR, value);</div><div class='ctx'> 	ceu_write(pcdev, CFWCR, 0); /* keep "datafetch firewall" disabled */</div><div class='ctx'> </div><div class='del'>-	dev_dbg(icd-&gt;parent, "S_FMT successful for %c%c%c%c %ux%u\n",</div><div class='del'>-		pixfmt &amp; 0xff, (pixfmt &gt;&gt; 8) &amp; 0xff,</div><div class='del'>-		(pixfmt &gt;&gt; 16) &amp; 0xff, (pixfmt &gt;&gt; 24) &amp; 0xff,</div><div class='del'>-		icd-&gt;user_width, icd-&gt;user_height);</div><div class='del'>-</div><div class='ctx'> 	capture_restore(pcdev, capsr);</div><div class='ctx'> </div><div class='ctx'> 	/* not in bundle mode: skip CBDSR, CDAYR2, CDACR2, CDBYR2, CDBCR2 */</div><div class='hunk'>@@ -1966,8 +1960,7 @@ static int sh_mobile_ceu_set_livecrop(struct soc_camera_device *icd,</div><div class='ctx'> 		if (!ret) {</div><div class='ctx'> 			icd-&gt;user_width		= out_width &amp; ~3;</div><div class='ctx'> 			icd-&gt;user_height	= out_height &amp; ~3;</div><div class='del'>-			ret = sh_mobile_ceu_set_bus_param(icd,</div><div class='del'>-					icd-&gt;current_fmt-&gt;host_fmt-&gt;fourcc);</div><div class='add'>+			ret = sh_mobile_ceu_set_bus_param(icd);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/sh_mobile_csi2.c b/drivers/media/video/sh_mobile_csi2.c<br/>index 8a652b53ff7e..05286500b4d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/sh_mobile_csi2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/sh_mobile_csi2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/sh_mobile_csi2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/sh_mobile_csi2.c</a></div><div class='hunk'>@@ -390,18 +390,7 @@ static struct platform_driver __refdata sh_csi2_pdrv = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sh_csi2_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sh_csi2_pdrv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sh_csi2_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sh_csi2_pdrv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sh_csi2_init);</div><div class='del'>-module_exit(sh_csi2_exit);</div><div class='add'>+module_platform_driver(sh_csi2_pdrv);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("SH-Mobile MIPI CSI-2 driver");</div><div class='ctx'> MODULE_AUTHOR("Guennadi Liakhovetski &lt;g.liakhovetski@gmx.de&gt;");</div><div class='head'>diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c<br/>index 16cb07c5c27b..c2882fa5be85 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/sn9c102/sn9c102_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/sn9c102/sn9c102_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/sn9c102/sn9c102_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/sn9c102/sn9c102_core.c</a></div><div class='hunk'>@@ -75,8 +75,8 @@ MODULE_PARM_DESC(video_nr,</div><div class='ctx'> 		 "\none and for every other camera."</div><div class='ctx'> 		 "\n");</div><div class='ctx'> </div><div class='del'>-static short force_munmap[] = {[0 ... SN9C102_MAX_DEVICES-1] =</div><div class='del'>-			       SN9C102_FORCE_MUNMAP};</div><div class='add'>+static bool force_munmap[] = {[0 ... SN9C102_MAX_DEVICES-1] =</div><div class='add'>+			      SN9C102_FORCE_MUNMAP};</div><div class='ctx'> module_param_array(force_munmap, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(force_munmap,</div><div class='ctx'> 		 " &lt;0|1[,...]&gt;"</div><div class='hunk'>@@ -3420,27 +3420,4 @@ static struct usb_driver sn9c102_usb_driver = {</div><div class='ctx'> 	.disconnect = sn9c102_usb_disconnect,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*****************************************************************************/</div><div class='del'>-</div><div class='del'>-static int __init sn9c102_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	KDBG(2, SN9C102_MODULE_NAME " v" SN9C102_MODULE_VERSION);</div><div class='del'>-	KDBG(3, SN9C102_MODULE_AUTHOR);</div><div class='del'>-</div><div class='del'>-	if ((err = usb_register(&amp;sn9c102_usb_driver)))</div><div class='del'>-		KDBG(1, "usb_register() failed");</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void __exit sn9c102_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sn9c102_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-module_init(sn9c102_module_init);</div><div class='del'>-module_exit(sn9c102_module_exit);</div><div class='add'>+module_usb_driver(sn9c102_usb_driver);</div><div class='head'>diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c<br/>index 62e4312515cb..b82710745ba8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/soc_camera.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/soc_camera.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/soc_camera.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/soc_camera.c</a></div><div class='hunk'>@@ -487,7 +487,7 @@ static int soc_camera_set_fmt(struct soc_camera_device *icd,</div><div class='ctx'> 		icd-&gt;user_width, icd-&gt;user_height);</div><div class='ctx'> </div><div class='ctx'> 	/* set physical bus parameters */</div><div class='del'>-	return ici-&gt;ops-&gt;set_bus_param(icd, pix-&gt;pixelformat);</div><div class='add'>+	return ici-&gt;ops-&gt;set_bus_param(icd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int soc_camera_open(struct file *file)</div><div class='hunk'>@@ -600,9 +600,9 @@ static int soc_camera_close(struct file *file)</div><div class='ctx'> 		pm_runtime_suspend(&amp;icd-&gt;vdev-&gt;dev);</div><div class='ctx'> 		pm_runtime_disable(&amp;icd-&gt;vdev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-		ici-&gt;ops-&gt;remove(icd);</div><div class='ctx'> 		if (ici-&gt;ops-&gt;init_videobuf2)</div><div class='ctx'> 			vb2_queue_release(&amp;icd-&gt;vb2_vidq);</div><div class='add'>+		ici-&gt;ops-&gt;remove(icd);</div><div class='ctx'> </div><div class='ctx'> 		soc_camera_power_off(icd, icl);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/video/soc_camera_platform.c b/drivers/media/video/soc_camera_platform.c<br/>index 4402a8a74f7a..f59ccade07c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/soc_camera_platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/soc_camera_platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/soc_camera_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/soc_camera_platform.c</a></div><div class='hunk'>@@ -189,18 +189,7 @@ static struct platform_driver soc_camera_platform_driver = {</div><div class='ctx'> 	.remove		= soc_camera_platform_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init soc_camera_platform_module_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;soc_camera_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit soc_camera_platform_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;soc_camera_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(soc_camera_platform_module_init);</div><div class='del'>-module_exit(soc_camera_platform_module_exit);</div><div class='add'>+module_platform_driver(soc_camera_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("SoC Camera Platform driver");</div><div class='ctx'> MODULE_AUTHOR("Magnus Damm");</div><div class='head'>diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c<br/>index cbc105f975de..d427f8436c70 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/stk-webcam.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/stk-webcam.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/stk-webcam.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/stk-webcam.c</a></div><div class='hunk'>@@ -38,11 +38,11 @@</div><div class='ctx'> #include "stk-webcam.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int hflip = 1;</div><div class='add'>+static bool hflip = 1;</div><div class='ctx'> module_param(hflip, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(hflip, "Horizontal image flip (mirror). Defaults to 1");</div><div class='ctx'> </div><div class='del'>-static int vflip = 1;</div><div class='add'>+static bool vflip = 1;</div><div class='ctx'> module_param(vflip, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(vflip, "Vertical image flip. Defaults to 1");</div><div class='ctx'> </div><div class='hunk'>@@ -377,8 +377,8 @@ static int stk_prepare_iso(struct stk_camera *dev)</div><div class='ctx'> 	if (dev-&gt;isobufs)</div><div class='ctx'> 		STK_ERROR("isobufs already allocated. Bad\n");</div><div class='ctx'> 	else</div><div class='del'>-		dev-&gt;isobufs = kzalloc(MAX_ISO_BUFS * sizeof(*dev-&gt;isobufs),</div><div class='del'>-					GFP_KERNEL);</div><div class='add'>+		dev-&gt;isobufs = kcalloc(MAX_ISO_BUFS, sizeof(*dev-&gt;isobufs),</div><div class='add'>+				       GFP_KERNEL);</div><div class='ctx'> 	if (dev-&gt;isobufs == NULL) {</div><div class='ctx'> 		STK_ERROR("Unable to allocate iso buffers\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1377,25 +1377,4 @@ static struct usb_driver stk_camera_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init stk_camera_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	result = usb_register(&amp;stk_camera_driver);</div><div class='del'>-	if (result)</div><div class='del'>-		STK_ERROR("usb_register failed ! Error number %d\n", result);</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 __exit stk_camera_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;stk_camera_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(stk_camera_init);</div><div class='del'>-module_exit(stk_camera_exit);</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+module_usb_driver(stk_camera_driver);</div><div class='head'>diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c<br/>index a0895bf07487..4ed1c7c28ae7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/timblogiw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/timblogiw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/timblogiw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/timblogiw.c</a></div><div class='hunk'>@@ -565,7 +565,7 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)</div><div class='ctx'> 	spin_unlock_irq(&amp;fh-&gt;queue_lock);</div><div class='ctx'> </div><div class='ctx'> 	desc = fh-&gt;chan-&gt;device-&gt;device_prep_slave_sg(fh-&gt;chan,</div><div class='del'>-		buf-&gt;sg, sg_elems, DMA_FROM_DEVICE,</div><div class='add'>+		buf-&gt;sg, sg_elems, DMA_DEV_TO_MEM,</div><div class='ctx'> 		DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);</div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		spin_lock_irq(&amp;fh-&gt;queue_lock);</div><div class='hunk'>@@ -872,20 +872,7 @@ static struct platform_driver timblogiw_platform_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(timblogiw_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Module functions */</div><div class='del'>-</div><div class='del'>-static int __init timblogiw_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;timblogiw_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit timblogiw_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;timblogiw_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(timblogiw_init);</div><div class='del'>-module_exit(timblogiw_exit);</div><div class='add'>+module_platform_driver(timblogiw_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION(TIMBLOGIWIN_NAME);</div><div class='ctx'> MODULE_AUTHOR("Pelagicore AB &lt;info@pelagicore.com&gt;");</div><div class='head'>diff --git a/drivers/media/video/tlg2300/pd-common.h b/drivers/media/video/tlg2300/pd-common.h<br/>index 56564e6aaac2..5dd73b7857d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tlg2300/pd-common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tlg2300/pd-common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tlg2300/pd-common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/tlg2300/pd-common.h</a></div><div class='hunk'>@@ -140,7 +140,7 @@ struct pd_dvb_adapter {</div><div class='ctx'> 	u8			reserved[3];</div><div class='ctx'> </div><div class='ctx'> 	/* data for power resume*/</div><div class='del'>-	struct dvb_frontend_parameters fe_param;</div><div class='add'>+	struct dtv_frontend_properties fe_param;</div><div class='ctx'> </div><div class='ctx'> 	/* for channel scanning */</div><div class='ctx'> 	int		prev_freq;</div><div class='head'>diff --git a/drivers/media/video/tlg2300/pd-dvb.c b/drivers/media/video/tlg2300/pd-dvb.c<br/>index d0da11ae19df..30fcb117e898 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tlg2300/pd-dvb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tlg2300/pd-dvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tlg2300/pd-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/tlg2300/pd-dvb.c</a></div><div class='hunk'>@@ -12,9 +12,9 @@</div><div class='ctx'> static void dvb_urb_cleanup(struct pd_dvb_adapter *pd_dvb);</div><div class='ctx'> </div><div class='ctx'> static int dvb_bandwidth[][2] = {</div><div class='del'>-	{ TLG_BW_8, BANDWIDTH_8_MHZ },</div><div class='del'>-	{ TLG_BW_7, BANDWIDTH_7_MHZ },</div><div class='del'>-	{ TLG_BW_6, BANDWIDTH_6_MHZ }</div><div class='add'>+	{ TLG_BW_8, 8000000 },</div><div class='add'>+	{ TLG_BW_7, 7000000 },</div><div class='add'>+	{ TLG_BW_6, 6000000 }</div><div class='ctx'> };</div><div class='ctx'> static int dvb_bandwidth_length = ARRAY_SIZE(dvb_bandwidth);</div><div class='ctx'> </div><div class='hunk'>@@ -146,9 +146,9 @@ static int fw_delay_overflow(struct pd_dvb_adapter *adapter)</div><div class='ctx'> 	return msec &gt; 800 ? true : false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int poseidon_set_fe(struct dvb_frontend *fe,</div><div class='del'>-			struct dvb_frontend_parameters *fep)</div><div class='add'>+static int poseidon_set_fe(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fep = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	s32 ret = 0, cmd_status = 0;</div><div class='ctx'> 	s32 i, bandwidth = -1;</div><div class='ctx'> 	struct poseidon *pd = fe-&gt;demodulator_priv;</div><div class='hunk'>@@ -159,7 +159,7 @@ static int poseidon_set_fe(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;pd-&gt;lock);</div><div class='ctx'> 	for (i = 0; i &lt; dvb_bandwidth_length; i++)</div><div class='del'>-		if (fep-&gt;u.ofdm.bandwidth == dvb_bandwidth[i][1])</div><div class='add'>+		if (fep-&gt;bandwidth_hz == dvb_bandwidth[i][1])</div><div class='ctx'> 			bandwidth = dvb_bandwidth[i][0];</div><div class='ctx'> </div><div class='ctx'> 	if (check_scan_ok(fep-&gt;frequency, bandwidth, pd_dvb)) {</div><div class='hunk'>@@ -210,7 +210,7 @@ static int pm_dvb_resume(struct poseidon *pd)</div><div class='ctx'> </div><div class='ctx'> 	poseidon_check_mode_dvbt(pd);</div><div class='ctx'> 	msleep(300);</div><div class='del'>-	poseidon_set_fe(&amp;pd_dvb-&gt;dvb_fe, &amp;pd_dvb-&gt;fe_param);</div><div class='add'>+	poseidon_set_fe(&amp;pd_dvb-&gt;dvb_fe);</div><div class='ctx'> </div><div class='ctx'> 	dvb_start_streaming(pd_dvb);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -227,13 +227,13 @@ static s32 poseidon_fe_init(struct dvb_frontend *fe)</div><div class='ctx'> 	pd-&gt;pm_resume  = pm_dvb_resume;</div><div class='ctx'> #endif</div><div class='ctx'> 	memset(&amp;pd_dvb-&gt;fe_param, 0,</div><div class='del'>-			sizeof(struct dvb_frontend_parameters));</div><div class='add'>+			sizeof(struct dtv_frontend_properties));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int poseidon_get_fe(struct dvb_frontend *fe,</div><div class='del'>-			struct dvb_frontend_parameters *fep)</div><div class='add'>+static int poseidon_get_fe(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	struct dtv_frontend_properties *fep = &amp;fe-&gt;dtv_property_cache;</div><div class='ctx'> 	struct poseidon *pd = fe-&gt;demodulator_priv;</div><div class='ctx'> 	struct pd_dvb_adapter *pd_dvb = &amp;pd-&gt;dvb_data;</div><div class='ctx'> </div><div class='hunk'>@@ -332,9 +332,9 @@ static int poseidon_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops poseidon_frontend_ops = {</div><div class='add'>+	.delsys = { SYS_DVBT },</div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name		= "Poseidon DVB-T",</div><div class='del'>-		.type		= FE_OFDM,</div><div class='ctx'> 		.frequency_min	= 174000000,</div><div class='ctx'> 		.frequency_max  = 862000000,</div><div class='ctx'> 		.frequency_stepsize	  = 62500,/* FIXME */</div><div class='head'>diff --git a/drivers/media/video/tlg2300/pd-main.c b/drivers/media/video/tlg2300/pd-main.c<br/>index 129f135d5a5f..c096b3f74200 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tlg2300/pd-main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tlg2300/pd-main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tlg2300/pd-main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/tlg2300/pd-main.c</a></div><div class='hunk'>@@ -374,7 +374,7 @@ static inline void set_map_flags(struct poseidon *pd, struct usb_device *udev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static bool check_firmware(struct usb_device *udev, int *down_firmware)</div><div class='add'>+static int check_firmware(struct usb_device *udev, int *down_firmware)</div><div class='ctx'> {</div><div class='ctx'> 	void *buf;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -398,7 +398,7 @@ static bool check_firmware(struct usb_device *udev, int *down_firmware)</div><div class='ctx'> 		*down_firmware = 1;</div><div class='ctx'> 		return firmware_download(udev);</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 poseidon_probe(struct usb_interface *interface,</div><div class='head'>diff --git a/drivers/media/video/tm6000/Kconfig b/drivers/media/video/tm6000/Kconfig<br/>index 114eec8a630a..a43b77abd931 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/tm6000/Kconfig</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> config VIDEO_TM6000</div><div class='ctx'> 	tristate "TV Master TM5600/6000/6010 driver"</div><div class='del'>-	depends on VIDEO_DEV &amp;&amp; I2C &amp;&amp; INPUT &amp;&amp; RC_CORE &amp;&amp; USB &amp;&amp; EXPERIMENTAL</div><div class='add'>+	depends on VIDEO_DEV &amp;&amp; I2C &amp;&amp; INPUT &amp;&amp; RC_CORE &amp;&amp; USB</div><div class='ctx'> 	select VIDEO_TUNER</div><div class='ctx'> 	select MEDIA_TUNER_XC2028</div><div class='ctx'> 	select MEDIA_TUNER_XC5000</div><div class='hunk'>@@ -16,7 +16,7 @@ config VIDEO_TM6000</div><div class='ctx'> </div><div class='ctx'> config VIDEO_TM6000_ALSA</div><div class='ctx'> 	tristate "TV Master TM5600/6000/6010 audio support"</div><div class='del'>-	depends on VIDEO_TM6000 &amp;&amp; SND &amp;&amp; EXPERIMENTAL</div><div class='add'>+	depends on VIDEO_TM6000 &amp;&amp; SND</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This is a video4linux driver for direct (DMA) audio for</div><div class='hunk'>@@ -27,7 +27,7 @@ config VIDEO_TM6000_ALSA</div><div class='ctx'> </div><div class='ctx'> config VIDEO_TM6000_DVB</div><div class='ctx'> 	tristate "DVB Support for tm6000 based TV cards"</div><div class='del'>-	depends on VIDEO_TM6000 &amp;&amp; DVB_CORE &amp;&amp; USB &amp;&amp; EXPERIMENTAL</div><div class='add'>+	depends on VIDEO_TM6000 &amp;&amp; DVB_CORE &amp;&amp; USB</div><div class='ctx'> 	select DVB_ZL10353</div><div class='ctx'> 	---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/video/tm6000/tm6000-alsa.c b/drivers/media/video/tm6000/tm6000-alsa.c<br/>index 7d675c72fd47..bd07ec707956 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000-alsa.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000-alsa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000-alsa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/tm6000/tm6000-alsa.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> </div><div class='del'>-static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};</div><div class='add'>+static bool enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};</div><div class='ctx'> </div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable tm6000x soundcard. default enabled.");</div><div class='hunk'>@@ -146,20 +146,21 @@ static int dsp_buffer_alloc(struct snd_pcm_substream *substream, int size)</div><div class='ctx'> #define DEFAULT_FIFO_SIZE	4096</div><div class='ctx'> </div><div class='ctx'> static struct snd_pcm_hardware snd_tm6000_digital_hw = {</div><div class='del'>-	.info = SNDRV_PCM_INFO_MMAP |</div><div class='add'>+	.info = SNDRV_PCM_INFO_BATCH |</div><div class='add'>+		SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='ctx'> 		SNDRV_PCM_INFO_MMAP_VALID,</div><div class='ctx'> 	.formats = SNDRV_PCM_FMTBIT_S16_LE,</div><div class='ctx'> </div><div class='del'>-	.rates = SNDRV_PCM_RATE_CONTINUOUS,</div><div class='add'>+	.rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_KNOT,</div><div class='ctx'> 	.rate_min = 48000,</div><div class='ctx'> 	.rate_max = 48000,</div><div class='ctx'> 	.channels_min = 2,</div><div class='ctx'> 	.channels_max = 2,</div><div class='ctx'> 	.period_bytes_min = 64,</div><div class='ctx'> 	.period_bytes_max = 12544,</div><div class='del'>-	.periods_min = 1,</div><div class='add'>+	.periods_min = 2,</div><div class='ctx'> 	.periods_max = 98,</div><div class='ctx'> 	.buffer_bytes_max = 62720 * 8,</div><div class='ctx'> };</div><div class='hunk'>@@ -181,6 +182,7 @@ static int snd_tm6000_pcm_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	chip-&gt;substream = substream;</div><div class='ctx'> </div><div class='ctx'> 	runtime-&gt;hw = snd_tm6000_digital_hw;</div><div class='add'>+	snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> _error:</div><div class='hunk'>@@ -347,9 +349,13 @@ static int snd_tm6000_card_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: /* fall through */</div><div class='add'>+	case SNDRV_PCM_TRIGGER_RESUME: /* fall through */</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 		atomic_set(&amp;core-&gt;stream_started, 1);</div><div class='ctx'> 		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH: /* fall through */</div><div class='add'>+	case SNDRV_PCM_TRIGGER_SUSPEND: /* fall through */</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='ctx'> 		atomic_set(&amp;core-&gt;stream_started, 0);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -371,6 +377,14 @@ static snd_pcm_uframes_t snd_tm6000_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return chip-&gt;buf_pos;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct page *snd_pcm_get_vmalloc_page(struct snd_pcm_substream *subs,</div><div class='add'>+					     unsigned long offset)</div><div class='add'>+{</div><div class='add'>+	void *pageptr = subs-&gt;runtime-&gt;dma_area + offset;</div><div class='add'>+</div><div class='add'>+	return vmalloc_to_page(pageptr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * operators</div><div class='ctx'>  */</div><div class='hunk'>@@ -383,6 +397,7 @@ static struct snd_pcm_ops snd_tm6000_pcm_ops = {</div><div class='ctx'> 	.prepare = snd_tm6000_prepare,</div><div class='ctx'> 	.trigger = snd_tm6000_card_trigger,</div><div class='ctx'> 	.pointer = snd_tm6000_pointer,</div><div class='add'>+	.page = snd_pcm_get_vmalloc_page,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/media/video/tm6000/tm6000-cards.c b/drivers/media/video/tm6000/tm6000-cards.c<br/>index ec2578a0fdf7..034659b13174 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000-cards.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000-cards.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/tm6000/tm6000-cards.c</a></div><div class='hunk'>@@ -351,6 +351,7 @@ static struct tm6000_board tm6000_boards[] = {</div><div class='ctx'> 		.tuner_addr   = 0xc2 &gt;&gt; 1,</div><div class='ctx'> 		.demod_addr   = 0x1e &gt;&gt; 1,</div><div class='ctx'> 		.type         = TM6010,</div><div class='add'>+		.ir_codes = RC_MAP_HAUPPAUGE,</div><div class='ctx'> 		.caps = {</div><div class='ctx'> 			.has_tuner    = 1,</div><div class='ctx'> 			.has_dvb      = 1,</div><div class='hunk'>@@ -639,6 +640,7 @@ static struct usb_device_id tm6000_id_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x6000, 0xdec3), .driver_info = TM6010_BOARD_BEHOLD_VOYAGER_LITE },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='add'>+MODULE_DEVICE_TABLE(usb, tm6000_id_table);</div><div class='ctx'> </div><div class='ctx'> /* Control power led for show some activity */</div><div class='ctx'> void tm6000_flash_led(struct tm6000_core *dev, u8 state)</div><div class='hunk'>@@ -941,6 +943,7 @@ static void tm6000_config_tuner(struct tm6000_core *dev)</div><div class='ctx'> 		case TM6010_BOARD_HAUPPAUGE_900H:</div><div class='ctx'> 		case TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE:</div><div class='ctx'> 		case TM6010_BOARD_TWINHAN_TU501:</div><div class='add'>+			ctl.max_len = 80;</div><div class='ctx'> 			ctl.fname = "xc3028L-v36.fw";</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -1002,6 +1005,7 @@ static int fill_board_specific_data(struct tm6000_core *dev)</div><div class='ctx'> 	/* setup per-model quirks */</div><div class='ctx'> 	switch (dev-&gt;model) {</div><div class='ctx'> 	case TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE:</div><div class='add'>+	case TM6010_BOARD_HAUPPAUGE_900H:</div><div class='ctx'> 		dev-&gt;quirks |= TM6000_QUIRK_NO_USB_DELAY;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1050,6 +1054,33 @@ static void use_alternative_detection_method(struct tm6000_core *dev)</div><div class='ctx'> 	       tm6000_boards[model].name, model);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_MODULES) &amp;&amp; defined(MODULE)</div><div class='add'>+static void request_module_async(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct tm6000_core *dev = container_of(work, struct tm6000_core,</div><div class='add'>+					       request_module_wk);</div><div class='add'>+</div><div class='add'>+	request_module("tm6000-alsa");</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;caps.has_dvb)</div><div class='add'>+		request_module("tm6000-dvb");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void request_modules(struct tm6000_core *dev)</div><div class='add'>+{</div><div class='add'>+	INIT_WORK(&amp;dev-&gt;request_module_wk, request_module_async);</div><div class='add'>+	schedule_work(&amp;dev-&gt;request_module_wk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void flush_request_modules(struct tm6000_core *dev)</div><div class='add'>+{</div><div class='add'>+	flush_work_sync(&amp;dev-&gt;request_module_wk);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define request_modules(dev)</div><div class='add'>+#define flush_request_modules(dev)</div><div class='add'>+#endif /* CONFIG_MODULES */</div><div class='add'>+</div><div class='ctx'> static int tm6000_init_dev(struct tm6000_core *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct v4l2_frequency f;</div><div class='hunk'>@@ -1112,6 +1143,8 @@ static int tm6000_init_dev(struct tm6000_core *dev)</div><div class='ctx'> </div><div class='ctx'> 	tm6000_ir_init(dev);</div><div class='ctx'> </div><div class='add'>+	request_modules(dev);</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1324,6 +1357,8 @@ static void tm6000_usb_disconnect(struct usb_interface *interface)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "tm6000: disconnecting %s\n", dev-&gt;name);</div><div class='ctx'> </div><div class='add'>+	flush_request_modules(dev);</div><div class='add'>+</div><div class='ctx'> 	tm6000_ir_fini(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;gpio.power_led) {</div><div class='hunk'>@@ -1371,31 +1406,7 @@ static struct usb_driver tm6000_usb_driver = {</div><div class='ctx'> 		.id_table = tm6000_id_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init tm6000_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "tm6000" " v4l2 driver version %d.%d.%d loaded\n",</div><div class='del'>-	       (TM6000_VERSION  &gt;&gt; 16) &amp; 0xff,</div><div class='del'>-	       (TM6000_VERSION  &gt;&gt; 8) &amp; 0xff, TM6000_VERSION  &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	/* register this driver with the USB subsystem */</div><div class='del'>-	result = usb_register(&amp;tm6000_usb_driver);</div><div class='del'>-	if (result)</div><div class='del'>-		printk(KERN_ERR "tm6000"</div><div class='del'>-			   " usb_register failed. Error number %d.\n", result);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit tm6000_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister at USB subsystem */</div><div class='del'>-	usb_deregister(&amp;tm6000_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(tm6000_module_init);</div><div class='del'>-module_exit(tm6000_module_exit);</div><div class='add'>+module_usb_driver(tm6000_usb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Trident TVMaster TM5600/TM6000/TM6010 USB2 adapter");</div><div class='ctx'> MODULE_AUTHOR("Mauro Carvalho Chehab");</div><div class='head'>diff --git a/drivers/media/video/tm6000/tm6000-core.c b/drivers/media/video/tm6000/tm6000-core.c<br/>index 9783616a0da2..22cc0116deb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/tm6000/tm6000-core.c</a></div><div class='hunk'>@@ -38,6 +38,7 @@ int tm6000_read_write_usb(struct tm6000_core *dev, u8 req_type, u8 req,</div><div class='ctx'> 	int          ret, i;</div><div class='ctx'> 	unsigned int pipe;</div><div class='ctx'> 	u8	     *data = NULL;</div><div class='add'>+	int delay = 5000;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;usb_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -88,7 +89,20 @@ int tm6000_read_write_usb(struct tm6000_core *dev, u8 req_type, u8 req,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(data);</div><div class='del'>-	msleep(5);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;quirks &amp; TM6000_QUIRK_NO_USB_DELAY)</div><div class='add'>+		delay = 0;</div><div class='add'>+</div><div class='add'>+	if (req == REQ_16_SET_GET_I2C_WR1_RDN &amp;&amp; !(req_type &amp; USB_DIR_IN)) {</div><div class='add'>+		unsigned int tsleep;</div><div class='add'>+		/* Calculate delay time, 14000us for 64 bytes */</div><div class='add'>+		tsleep = (len * 200) + 200;</div><div class='add'>+		if (tsleep &lt; delay)</div><div class='add'>+			tsleep = delay;</div><div class='add'>+		usleep_range(tsleep, tsleep + 1000);</div><div class='add'>+	}</div><div class='add'>+	else if (delay)</div><div class='add'>+		usleep_range(delay, delay + 1000);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;usb_lock);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -125,14 +139,14 @@ int tm6000_set_reg_mask(struct tm6000_core *dev, u8 req, u16 value,</div><div class='ctx'> 	u8 new_index;</div><div class='ctx'> </div><div class='ctx'> 	rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR, req,</div><div class='del'>-					value, index, buf, 1);</div><div class='add'>+					value, 0, buf, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	new_index = (buf[0] &amp; ~mask) | (index &amp; mask);</div><div class='ctx'> </div><div class='del'>-	if (new_index == index)</div><div class='add'>+	if (new_index == buf[0])</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return tm6000_read_write_usb(dev, USB_DIR_OUT | USB_TYPE_VENDOR,</div><div class='hunk'>@@ -536,16 +550,16 @@ static struct reg_init tm6010_init_tab[] = {</div><div class='ctx'> </div><div class='ctx'> 	{ TM6010_REQ05_R18_IMASK7, 0x00 },</div><div class='ctx'> </div><div class='del'>-	{ TM6010_REQ07_RD8_IR_LEADER1, 0xaa },</div><div class='del'>-	{ TM6010_REQ07_RD8_IR_LEADER0, 0x30 },</div><div class='del'>-	{ TM6010_REQ07_RD8_IR_PULSE_CNT1, 0x20 },</div><div class='del'>-	{ TM6010_REQ07_RD8_IR_PULSE_CNT0, 0xd0 },</div><div class='add'>+	{ TM6010_REQ07_RDC_IR_LEADER1, 0xaa },</div><div class='add'>+	{ TM6010_REQ07_RDD_IR_LEADER0, 0x30 },</div><div class='add'>+	{ TM6010_REQ07_RDE_IR_PULSE_CNT1, 0x20 },</div><div class='add'>+	{ TM6010_REQ07_RDF_IR_PULSE_CNT0, 0xd0 },</div><div class='ctx'> 	{ REQ_04_EN_DISABLE_MCU_INT, 0x02, 0x00 },</div><div class='del'>-	{ TM6010_REQ07_RD8_IR, 0x2f },</div><div class='add'>+	{ TM6010_REQ07_RD8_IR, 0x0f },</div><div class='ctx'> </div><div class='ctx'> 	/* set remote wakeup key:any key wakeup */</div><div class='ctx'> 	{ TM6010_REQ07_RE5_REMOTE_WAKEUP,  0xfe },</div><div class='del'>-	{ TM6010_REQ07_RD8_IR_WAKEUP_SEL,  0xff },</div><div class='add'>+	{ TM6010_REQ07_RDA_IR_WAKEUP_SEL,  0xff },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int tm6000_init(struct tm6000_core *dev)</div><div class='hunk'>@@ -599,55 +613,6 @@ int tm6000_init(struct tm6000_core *dev)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int tm6000_reset(struct tm6000_core *dev)</div><div class='del'>-{</div><div class='del'>-	int pipe;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	msleep(500);</div><div class='del'>-</div><div class='del'>-	err = usb_set_interface(dev-&gt;udev, dev-&gt;isoc_in.bInterfaceNumber, 0);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		tm6000_err("failed to select interface %d, alt. setting 0\n",</div><div class='del'>-				dev-&gt;isoc_in.bInterfaceNumber);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = usb_reset_configuration(dev-&gt;udev);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		tm6000_err("failed to reset configuration\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((dev-&gt;quirks &amp; TM6000_QUIRK_NO_USB_DELAY) == 0)</div><div class='del'>-		msleep(5);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Not all devices have int_in defined</div><div class='del'>-	 */</div><div class='del'>-	if (!dev-&gt;int_in.endp)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	err = usb_set_interface(dev-&gt;udev, dev-&gt;isoc_in.bInterfaceNumber, 2);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		tm6000_err("failed to select interface %d, alt. setting 2\n",</div><div class='del'>-				dev-&gt;isoc_in.bInterfaceNumber);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	msleep(5);</div><div class='del'>-</div><div class='del'>-	pipe = usb_rcvintpipe(dev-&gt;udev,</div><div class='del'>-			dev-&gt;int_in.endp-&gt;desc.bEndpointAddress &amp; USB_ENDPOINT_NUMBER_MASK);</div><div class='del'>-</div><div class='del'>-	err = usb_clear_halt(dev-&gt;udev, pipe);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		tm6000_err("usb_clear_halt failed: %d\n", err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> int tm6000_set_audio_bitrate(struct tm6000_core *dev, int bitrate)</div><div class='ctx'> {</div><div class='hunk'>@@ -696,11 +661,13 @@ int tm6000_set_audio_rinput(struct tm6000_core *dev)</div><div class='ctx'> 	if (dev-&gt;dev_type == TM6010) {</div><div class='ctx'> 		/* Audio crossbar setting, default SIF1 */</div><div class='ctx'> 		u8 areg_f0;</div><div class='add'>+		u8 areg_07 = 0x10;</div><div class='ctx'> </div><div class='ctx'> 		switch (dev-&gt;rinput.amux) {</div><div class='ctx'> 		case TM6000_AMUX_SIF1:</div><div class='ctx'> 		case TM6000_AMUX_SIF2:</div><div class='ctx'> 			areg_f0 = 0x03;</div><div class='add'>+			areg_07 = 0x30;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case TM6000_AMUX_ADC1:</div><div class='ctx'> 			areg_f0 = 0x00;</div><div class='hunk'>@@ -720,6 +687,9 @@ int tm6000_set_audio_rinput(struct tm6000_core *dev)</div><div class='ctx'> 		/* Set audio input crossbar */</div><div class='ctx'> 		tm6000_set_reg_mask(dev, TM6010_REQ08_RF0_DAUDIO_INPUT_CONFIG,</div><div class='ctx'> 							areg_f0, 0x0f);</div><div class='add'>+		/* Mux overflow workaround */</div><div class='add'>+		tm6000_set_reg_mask(dev, TM6010_REQ07_R07_OUTPUT_CONTROL,</div><div class='add'>+			areg_07, 0xf0);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u8 areg_eb;</div><div class='ctx'> 		/* Audio setting, default LINE1 */</div><div class='head'>diff --git a/drivers/media/video/tm6000/tm6000-dvb.c b/drivers/media/video/tm6000/tm6000-dvb.c<br/>index 5e6c129a4beb..e1f3f66e1e63 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000-dvb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000-dvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/tm6000/tm6000-dvb.c</a></div><div class='hunk'>@@ -89,9 +89,19 @@ static void tm6000_urb_received(struct urb *urb)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct tm6000_core *dev = urb-&gt;context;</div><div class='ctx'> </div><div class='del'>-	if (urb-&gt;status != 0)</div><div class='add'>+	switch (urb-&gt;status) {</div><div class='add'>+	case 0:</div><div class='add'>+	case -ETIMEDOUT:</div><div class='add'>+		break;</div><div class='add'>+	case -ENOENT:</div><div class='add'>+	case -ECONNRESET:</div><div class='add'>+	case -ESHUTDOWN:</div><div class='add'>+		return;</div><div class='add'>+	default:</div><div class='ctx'> 		print_err_status(dev, 0, urb-&gt;status);</div><div class='del'>-	else if (urb-&gt;actual_length &gt; 0)</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;actual_length &gt; 0)</div><div class='ctx'> 		dvb_dmx_swfilter(&amp;dev-&gt;dvb-&gt;demux, urb-&gt;transfer_buffer,</div><div class='ctx'> 						   urb-&gt;actual_length);</div><div class='ctx'> </div><div class='hunk'>@@ -151,7 +161,7 @@ static int tm6000_start_stream(struct tm6000_core *dev)</div><div class='ctx'> 		printk(KERN_ERR "tm6000: pipe resetted\n");</div><div class='ctx'> </div><div class='ctx'> /*	mutex_lock(&amp;tm6000_driver.open_close_mutex); */</div><div class='del'>-	ret = usb_submit_urb(dvb-&gt;bulk_urb, GFP_KERNEL);</div><div class='add'>+	ret = usb_submit_urb(dvb-&gt;bulk_urb, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> /*	mutex_unlock(&amp;tm6000_driver.open_close_mutex); */</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -396,6 +406,11 @@ static int dvb_init(struct tm6000_core *dev)</div><div class='ctx'> 	if (!dev-&gt;caps.has_dvb)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;udev-&gt;speed == USB_SPEED_FULL) {</div><div class='add'>+		printk(KERN_INFO "This USB2.0 device cannot be run on a USB1.1 port. (it lacks a hardware PID filter)\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dvb = kzalloc(sizeof(struct tm6000_dvb), GFP_KERNEL);</div><div class='ctx'> 	if (!dvb) {</div><div class='ctx'> 		printk(KERN_INFO "Cannot allocate memory\n");</div><div class='head'>diff --git a/drivers/media/video/tm6000/tm6000-i2c.c b/drivers/media/video/tm6000/tm6000-i2c.c<br/>index 0290bbf00c3e..c7e23e3dd75e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000-i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/tm6000/tm6000-i2c.c</a></div><div class='hunk'>@@ -46,11 +46,10 @@ static int tm6000_i2c_send_regs(struct tm6000_core *dev, unsigned char addr,</div><div class='ctx'> 				__u8 reg, char *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='del'>-	unsigned int tsleep;</div><div class='ctx'> 	unsigned int i2c_packet_limit = 16;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;dev_type == TM6010)</div><div class='del'>-		i2c_packet_limit = 64;</div><div class='add'>+		i2c_packet_limit = 80;</div><div class='ctx'> </div><div class='ctx'> 	if (!buf)</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -71,10 +70,6 @@ static int tm6000_i2c_send_regs(struct tm6000_core *dev, unsigned char addr,</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Calculate delay time, 14000us for 64 bytes */</div><div class='del'>-	tsleep = ((len * 200) + 200 + 1000) / 1000;</div><div class='del'>-	msleep(tsleep);</div><div class='del'>-</div><div class='ctx'> 	/* release mutex */</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -145,7 +140,6 @@ static int tm6000_i2c_recv_regs16(struct tm6000_core *dev, unsigned char addr,</div><div class='ctx'> 			return rc;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		msleep(1400 / 1000);</div><div class='ctx'> 		rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR |</div><div class='ctx'> 			USB_RECIP_DEVICE, REQ_35_AFTEK_TUNER_READ,</div><div class='ctx'> 			reg, 0, buf, len);</div><div class='head'>diff --git a/drivers/media/video/tm6000/tm6000-input.c b/drivers/media/video/tm6000/tm6000-input.c<br/>index 405d12729d05..7844607dd45a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000-input.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000-input.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000-input.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/tm6000/tm6000-input.c</a></div><div class='hunk'>@@ -31,22 +31,25 @@</div><div class='ctx'> </div><div class='ctx'> static unsigned int ir_debug;</div><div class='ctx'> module_param(ir_debug, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(ir_debug, "enable debug message [IR]");</div><div class='add'>+MODULE_PARM_DESC(ir_debug, "debug message level");</div><div class='ctx'> </div><div class='ctx'> static unsigned int enable_ir = 1;</div><div class='ctx'> module_param(enable_ir, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(enable_ir, "enable ir (default is enable)");</div><div class='ctx'> </div><div class='del'>-/* number of 50ms for ON-OFF-ON power led */</div><div class='del'>-/* show IR activity */</div><div class='del'>-#define PWLED_OFF 2</div><div class='add'>+static unsigned int ir_clock_mhz = 12;</div><div class='add'>+module_param(ir_clock_mhz, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(enable_ir, "ir clock, in MHz");</div><div class='add'>+</div><div class='add'>+#define URB_SUBMIT_DELAY	100	/* ms - Delay to submit an URB request on retrial and init */</div><div class='add'>+#define URB_INT_LED_DELAY	100	/* ms - Delay to turn led on again on int mode */</div><div class='ctx'> </div><div class='ctx'> #undef dprintk</div><div class='ctx'> </div><div class='del'>-#define dprintk(fmt, arg...) \</div><div class='del'>-	if (ir_debug) { \</div><div class='add'>+#define dprintk(level, fmt, arg...) do {\</div><div class='add'>+	if (ir_debug &gt;= level) \</div><div class='ctx'> 		printk(KERN_DEBUG "%s/ir: " fmt, ir-&gt;name , ## arg); \</div><div class='del'>-	}</div><div class='add'>+	} while (0)</div><div class='ctx'> </div><div class='ctx'> struct tm6000_ir_poll_result {</div><div class='ctx'> 	u16 rc_data;</div><div class='hunk'>@@ -62,20 +65,15 @@ struct tm6000_IR {</div><div class='ctx'> 	int			polling;</div><div class='ctx'> 	struct delayed_work	work;</div><div class='ctx'> 	u8			wait:1;</div><div class='del'>-	u8			key:1;</div><div class='del'>-	u8			pwled:1;</div><div class='del'>-	u8			pwledcnt;</div><div class='add'>+	u8			pwled:2;</div><div class='add'>+	u8			submit_urb:1;</div><div class='ctx'> 	u16			key_addr;</div><div class='ctx'> 	struct urb		*int_urb;</div><div class='del'>-	u8			*urb_data;</div><div class='del'>-</div><div class='del'>-	int (*get_key) (struct tm6000_IR *, struct tm6000_ir_poll_result *);</div><div class='ctx'> </div><div class='ctx'> 	/* IR device properties */</div><div class='ctx'> 	u64			rc_type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> void tm6000_ir_wait(struct tm6000_core *dev, u8 state)</div><div class='ctx'> {</div><div class='ctx'> 	struct tm6000_IR *ir = dev-&gt;ir;</div><div class='hunk'>@@ -83,62 +81,84 @@ void tm6000_ir_wait(struct tm6000_core *dev, u8 state)</div><div class='ctx'> 	if (!dev-&gt;ir)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	dprintk(2, "%s: %i\n",__func__, ir-&gt;wait);</div><div class='add'>+</div><div class='ctx'> 	if (state)</div><div class='ctx'> 		ir-&gt;wait = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		ir-&gt;wait = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int tm6000_ir_config(struct tm6000_IR *ir)</div><div class='ctx'> {</div><div class='ctx'> 	struct tm6000_core *dev = ir-&gt;dev;</div><div class='del'>-	u8 buf[10];</div><div class='del'>-	int rc;</div><div class='add'>+	u32 pulse = 0, leader = 0;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "%s\n",__func__);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The IR decoder supports RC-5 or NEC, with a configurable timing.</div><div class='add'>+	 * The timing configuration there is not that accurate, as it uses</div><div class='add'>+	 * approximate values. The NEC spec mentions a 562.5 unit period,</div><div class='add'>+	 * and RC-5 uses a 888.8 period.</div><div class='add'>+	 * Currently, driver assumes a clock provided by a 12 MHz XTAL, but</div><div class='add'>+	 * a modprobe parameter can adjust it.</div><div class='add'>+	 * Adjustments are required for other timings.</div><div class='add'>+	 * It seems that the 900ms timing for NEC is used to detect a RC-5</div><div class='add'>+	 * IR, in order to discard such decoding</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	switch (ir-&gt;rc_type) {</div><div class='ctx'> 	case RC_TYPE_NEC:</div><div class='del'>-		/* Setup IR decoder for NEC standard 12MHz system clock */</div><div class='del'>-		/* IR_LEADER_CNT = 0.9ms             */</div><div class='del'>-		tm6000_set_reg(dev, TM6010_REQ07_RD8_IR_LEADER1, 0xaa);</div><div class='del'>-		tm6000_set_reg(dev, TM6010_REQ07_RD8_IR_LEADER0, 0x30);</div><div class='del'>-		/* IR_PULSE_CNT = 0.7ms              */</div><div class='del'>-		tm6000_set_reg(dev, TM6010_REQ07_RD8_IR_PULSE_CNT1, 0x20);</div><div class='del'>-		tm6000_set_reg(dev, TM6010_REQ07_RD8_IR_PULSE_CNT0, 0xd0);</div><div class='del'>-		/* Remote WAKEUP = enable */</div><div class='del'>-		tm6000_set_reg(dev, TM6010_REQ07_RE5_REMOTE_WAKEUP, 0xfe);</div><div class='del'>-		/* IR_WKUP_SEL = Low byte in decoded IR data */</div><div class='del'>-		tm6000_set_reg(dev, TM6010_REQ07_RD8_IR_WAKEUP_SEL, 0xff);</div><div class='del'>-		/* IR_WKU_ADD code */</div><div class='del'>-		tm6000_set_reg(dev, TM6010_REQ07_RD8_IR_WAKEUP_ADD, 0xff);</div><div class='del'>-		tm6000_flash_led(dev, 0);</div><div class='del'>-		msleep(100);</div><div class='del'>-		tm6000_flash_led(dev, 1);</div><div class='add'>+		leader = 900;	/* ms */</div><div class='add'>+		pulse  = 700;	/* ms - the actual value would be 562 */</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		/* hack */</div><div class='del'>-		buf[0] = 0xff;</div><div class='del'>-		buf[1] = 0xff;</div><div class='del'>-		buf[2] = 0xf2;</div><div class='del'>-		buf[3] = 0x2b;</div><div class='del'>-		buf[4] = 0x20;</div><div class='del'>-		buf[5] = 0x35;</div><div class='del'>-		buf[6] = 0x60;</div><div class='del'>-		buf[7] = 0x04;</div><div class='del'>-		buf[8] = 0xc0;</div><div class='del'>-		buf[9] = 0x08;</div><div class='del'>-</div><div class='del'>-		rc = tm6000_read_write_usb(dev, USB_DIR_OUT | USB_TYPE_VENDOR |</div><div class='del'>-			USB_RECIP_DEVICE, REQ_00_SET_IR_VALUE, 0, 0, buf, 0x0a);</div><div class='del'>-		msleep(100);</div><div class='del'>-</div><div class='del'>-		if (rc &lt; 0) {</div><div class='del'>-			printk(KERN_INFO "IR configuration failed");</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='add'>+	case RC_TYPE_RC5:</div><div class='add'>+		leader = 900;	/* ms - from the NEC decoding */</div><div class='add'>+		pulse  = 1780;	/* ms - The actual value would be 1776 */</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	pulse = ir_clock_mhz * pulse;</div><div class='add'>+	leader = ir_clock_mhz * leader;</div><div class='add'>+	if (ir-&gt;rc_type == RC_TYPE_NEC)</div><div class='add'>+		leader = leader | 0x8000;</div><div class='add'>+</div><div class='add'>+	dprintk(2, "%s: %s, %d MHz, leader = 0x%04x, pulse = 0x%06x \n",</div><div class='add'>+		__func__,</div><div class='add'>+		(ir-&gt;rc_type == RC_TYPE_NEC) ? "NEC" : "RC-5",</div><div class='add'>+		ir_clock_mhz, leader, pulse);</div><div class='add'>+</div><div class='add'>+	/* Remote WAKEUP = enable, normal mode, from IR decoder output */</div><div class='add'>+	tm6000_set_reg(dev, TM6010_REQ07_RE5_REMOTE_WAKEUP, 0xfe);</div><div class='add'>+</div><div class='add'>+	/* Enable IR reception on non-busrt mode */</div><div class='add'>+	tm6000_set_reg(dev, TM6010_REQ07_RD8_IR, 0x2f);</div><div class='add'>+</div><div class='add'>+	/* IR_WKUP_SEL = Low byte in decoded IR data */</div><div class='add'>+	tm6000_set_reg(dev, TM6010_REQ07_RDA_IR_WAKEUP_SEL, 0xff);</div><div class='add'>+	/* IR_WKU_ADD code */</div><div class='add'>+	tm6000_set_reg(dev, TM6010_REQ07_RDB_IR_WAKEUP_ADD, 0xff);</div><div class='add'>+</div><div class='add'>+	tm6000_set_reg(dev, TM6010_REQ07_RDC_IR_LEADER1, leader &gt;&gt; 8);</div><div class='add'>+	tm6000_set_reg(dev, TM6010_REQ07_RDD_IR_LEADER0, leader);</div><div class='add'>+</div><div class='add'>+	tm6000_set_reg(dev, TM6010_REQ07_RDE_IR_PULSE_CNT1, pulse &gt;&gt; 8);</div><div class='add'>+	tm6000_set_reg(dev, TM6010_REQ07_RDF_IR_PULSE_CNT0, pulse);</div><div class='add'>+</div><div class='add'>+	if (!ir-&gt;polling)</div><div class='add'>+		tm6000_set_reg(dev, REQ_04_EN_DISABLE_MCU_INT, 2, 0);</div><div class='add'>+	else</div><div class='add'>+		tm6000_set_reg(dev, REQ_04_EN_DISABLE_MCU_INT, 2, 1);</div><div class='add'>+	msleep(10);</div><div class='add'>+</div><div class='add'>+	/* Shows that IR is working via the LED */</div><div class='add'>+	tm6000_flash_led(dev, 0);</div><div class='add'>+	msleep(100);</div><div class='add'>+	tm6000_flash_led(dev, 1);</div><div class='add'>+	ir-&gt;pwled = 1;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -146,132 +166,124 @@ static void tm6000_ir_urb_received(struct urb *urb)</div><div class='ctx'> {</div><div class='ctx'> 	struct tm6000_core *dev = urb-&gt;context;</div><div class='ctx'> 	struct tm6000_IR *ir = dev-&gt;ir;</div><div class='add'>+	struct tm6000_ir_poll_result poll_result;</div><div class='add'>+	char *buf;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (urb-&gt;status != 0)</div><div class='del'>-		printk(KERN_INFO "not ready\n");</div><div class='del'>-	else if (urb-&gt;actual_length &gt; 0) {</div><div class='del'>-		memcpy(ir-&gt;urb_data, urb-&gt;transfer_buffer, urb-&gt;actual_length);</div><div class='add'>+	dprintk(2, "%s\n",__func__);</div><div class='add'>+	if (urb-&gt;status &lt; 0 || urb-&gt;actual_length &lt;= 0) {</div><div class='add'>+		printk(KERN_INFO "tm6000: IR URB failure: status: %i, length %i\n",</div><div class='add'>+		       urb-&gt;status, urb-&gt;actual_length);</div><div class='add'>+		ir-&gt;submit_urb = 1;</div><div class='add'>+		schedule_delayed_work(&amp;ir-&gt;work, msecs_to_jiffies(URB_SUBMIT_DELAY));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	buf = urb-&gt;transfer_buffer;</div><div class='ctx'> </div><div class='del'>-		dprintk("data %02x %02x %02x %02x\n", ir-&gt;urb_data[0],</div><div class='del'>-			ir-&gt;urb_data[1], ir-&gt;urb_data[2], ir-&gt;urb_data[3]);</div><div class='add'>+	if (ir_debug)</div><div class='add'>+		print_hex_dump(KERN_DEBUG, "tm6000: IR data: ",</div><div class='add'>+			       DUMP_PREFIX_OFFSET,16, 1,</div><div class='add'>+			       buf, urb-&gt;actual_length, false);</div><div class='ctx'> </div><div class='del'>-		ir-&gt;key = 1;</div><div class='del'>-	}</div><div class='add'>+	poll_result.rc_data = buf[0];</div><div class='add'>+	if (urb-&gt;actual_length &gt; 1)</div><div class='add'>+		poll_result.rc_data |= buf[1] &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	dprintk(1, "%s, scancode: 0x%04x\n",__func__, poll_result.rc_data);</div><div class='add'>+	rc_keydown(ir-&gt;rc, poll_result.rc_data, 0);</div><div class='ctx'> </div><div class='ctx'> 	rc = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+	/*</div><div class='add'>+	 * Flash the led. We can't do it here, as it is running on IRQ context.</div><div class='add'>+	 * So, use the scheduler to do it, in a few ms.</div><div class='add'>+	 */</div><div class='add'>+	ir-&gt;pwled = 2;</div><div class='add'>+	schedule_delayed_work(&amp;ir-&gt;work, msecs_to_jiffies(10));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int default_polling_getkey(struct tm6000_IR *ir,</div><div class='del'>-				struct tm6000_ir_poll_result *poll_result)</div><div class='add'>+static void tm6000_ir_handle_key(struct work_struct *work)</div><div class='ctx'> {</div><div class='add'>+	struct tm6000_IR *ir = container_of(work, struct tm6000_IR, work.work);</div><div class='ctx'> 	struct tm6000_core *dev = ir-&gt;dev;</div><div class='add'>+	struct tm6000_ir_poll_result poll_result;</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	u8 buf[2];</div><div class='ctx'> </div><div class='del'>-	if (ir-&gt;wait &amp;&amp; !&amp;dev-&gt;int_in)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (&amp;dev-&gt;int_in) {</div><div class='del'>-		switch (ir-&gt;rc_type) {</div><div class='del'>-		case RC_TYPE_RC5:</div><div class='del'>-			poll_result-&gt;rc_data = ir-&gt;urb_data[0];</div><div class='del'>-			break;</div><div class='del'>-		case RC_TYPE_NEC:</div><div class='del'>-			if (ir-&gt;urb_data[1] == ((ir-&gt;key_addr &gt;&gt; 8) &amp; 0xff)) {</div><div class='del'>-				poll_result-&gt;rc_data = ir-&gt;urb_data[0]</div><div class='del'>-							| ir-&gt;urb_data[1] &lt;&lt; 8;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			poll_result-&gt;rc_data = ir-&gt;urb_data[0]</div><div class='del'>-					| ir-&gt;urb_data[1] &lt;&lt; 8;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		tm6000_set_reg(dev, REQ_04_EN_DISABLE_MCU_INT, 2, 0);</div><div class='del'>-		msleep(10);</div><div class='del'>-		tm6000_set_reg(dev, REQ_04_EN_DISABLE_MCU_INT, 2, 1);</div><div class='del'>-		msleep(10);</div><div class='del'>-</div><div class='del'>-		if (ir-&gt;rc_type == RC_TYPE_RC5) {</div><div class='del'>-			rc = tm6000_read_write_usb(dev, USB_DIR_IN |</div><div class='del'>-				USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='del'>-				REQ_02_GET_IR_CODE, 0, 0, buf, 1);</div><div class='del'>-</div><div class='del'>-			msleep(10);</div><div class='del'>-</div><div class='del'>-			dprintk("read data=%02x\n", buf[0]);</div><div class='del'>-			if (rc &lt; 0)</div><div class='del'>-				return rc;</div><div class='add'>+	if (ir-&gt;wait)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-			poll_result-&gt;rc_data = buf[0];</div><div class='del'>-		} else {</div><div class='del'>-			rc = tm6000_read_write_usb(dev, USB_DIR_IN |</div><div class='del'>-				USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='del'>-				REQ_02_GET_IR_CODE, 0, 0, buf, 2);</div><div class='add'>+	dprintk(3, "%s\n",__func__);</div><div class='ctx'> </div><div class='del'>-			msleep(10);</div><div class='add'>+	rc = tm6000_read_write_usb(dev, USB_DIR_IN |</div><div class='add'>+		USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='add'>+		REQ_02_GET_IR_CODE, 0, 0, buf, 2);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-			dprintk("read data=%04x\n", buf[0] | buf[1] &lt;&lt; 8);</div><div class='del'>-			if (rc &lt; 0)</div><div class='del'>-				return rc;</div><div class='add'>+	if (rc &gt; 1)</div><div class='add'>+		poll_result.rc_data = buf[0] | buf[1] &lt;&lt; 8;</div><div class='add'>+	else</div><div class='add'>+		poll_result.rc_data = buf[0];</div><div class='ctx'> </div><div class='del'>-			poll_result-&gt;rc_data = buf[0] | buf[1] &lt;&lt; 8;</div><div class='add'>+	/* Check if something was read */</div><div class='add'>+	if ((poll_result.rc_data &amp; 0xff) == 0xff) {</div><div class='add'>+		if (!ir-&gt;pwled) {</div><div class='add'>+			tm6000_flash_led(dev, 1);</div><div class='add'>+			ir-&gt;pwled = 1;</div><div class='ctx'> 		}</div><div class='del'>-		if ((poll_result-&gt;rc_data &amp; 0x00ff) != 0xff)</div><div class='del'>-			ir-&gt;key = 1;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	dprintk(1, "%s, scancode: 0x%04x\n",__func__, poll_result.rc_data);</div><div class='add'>+	rc_keydown(ir-&gt;rc, poll_result.rc_data, 0);</div><div class='add'>+	tm6000_flash_led(dev, 0);</div><div class='add'>+	ir-&gt;pwled = 0;</div><div class='add'>+</div><div class='add'>+	/* Re-schedule polling */</div><div class='add'>+	schedule_delayed_work(&amp;ir-&gt;work, msecs_to_jiffies(ir-&gt;polling));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tm6000_ir_handle_key(struct tm6000_IR *ir)</div><div class='add'>+static void tm6000_ir_int_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='add'>+	struct tm6000_IR *ir = container_of(work, struct tm6000_IR, work.work);</div><div class='ctx'> 	struct tm6000_core *dev = ir-&gt;dev;</div><div class='del'>-	int result;</div><div class='del'>-	struct tm6000_ir_poll_result poll_result;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	/* read the registers containing the IR status */</div><div class='del'>-	result = ir-&gt;get_key(ir, &amp;poll_result);</div><div class='del'>-	if (result &lt; 0) {</div><div class='del'>-		printk(KERN_INFO "ir-&gt;get_key() failed %d\n", result);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	dprintk(3, "%s, submit_urb = %d, pwled = %d\n",__func__, ir-&gt;submit_urb,</div><div class='add'>+		ir-&gt;pwled);</div><div class='ctx'> </div><div class='del'>-	dprintk("ir-&gt;get_key result data=%04x\n", poll_result.rc_data);</div><div class='add'>+	if (ir-&gt;submit_urb) {</div><div class='add'>+		dprintk(3, "Resubmit urb\n");</div><div class='add'>+		tm6000_set_reg(dev, REQ_04_EN_DISABLE_MCU_INT, 2, 0);</div><div class='ctx'> </div><div class='del'>-	if (ir-&gt;pwled) {</div><div class='del'>-		if (ir-&gt;pwledcnt &gt;= PWLED_OFF) {</div><div class='del'>-			ir-&gt;pwled = 0;</div><div class='del'>-			ir-&gt;pwledcnt = 0;</div><div class='del'>-			tm6000_flash_led(dev, 1);</div><div class='del'>-		} else</div><div class='del'>-			ir-&gt;pwledcnt += 1;</div><div class='add'>+		rc = usb_submit_urb(ir-&gt;int_urb, GFP_ATOMIC);</div><div class='add'>+		if (rc &lt; 0) {</div><div class='add'>+			printk(KERN_ERR "tm6000: Can't submit an IR interrupt. Error %i\n",</div><div class='add'>+			       rc);</div><div class='add'>+			/* Retry in 100 ms */</div><div class='add'>+			schedule_delayed_work(&amp;ir-&gt;work, msecs_to_jiffies(URB_SUBMIT_DELAY));</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		ir-&gt;submit_urb = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ir-&gt;key) {</div><div class='del'>-		rc_keydown(ir-&gt;rc, poll_result.rc_data, 0);</div><div class='del'>-		ir-&gt;key = 0;</div><div class='del'>-		ir-&gt;pwled = 1;</div><div class='del'>-		ir-&gt;pwledcnt = 0;</div><div class='add'>+	/* Led is enabled only if USB submit doesn't fail */</div><div class='add'>+	if (ir-&gt;pwled == 2) {</div><div class='ctx'> 		tm6000_flash_led(dev, 0);</div><div class='add'>+		ir-&gt;pwled = 0;</div><div class='add'>+		schedule_delayed_work(&amp;ir-&gt;work, msecs_to_jiffies(URB_INT_LED_DELAY));</div><div class='add'>+	} else if (!ir-&gt;pwled) {</div><div class='add'>+		tm6000_flash_led(dev, 1);</div><div class='add'>+		ir-&gt;pwled = 1;</div><div class='ctx'> 	}</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tm6000_ir_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct tm6000_IR *ir = container_of(work, struct tm6000_IR, work.work);</div><div class='del'>-</div><div class='del'>-	tm6000_ir_handle_key(ir);</div><div class='del'>-	schedule_delayed_work(&amp;ir-&gt;work, msecs_to_jiffies(ir-&gt;polling));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tm6000_ir_start(struct rc_dev *rc)</div><div class='ctx'> {</div><div class='ctx'> 	struct tm6000_IR *ir = rc-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	INIT_DELAYED_WORK(&amp;ir-&gt;work, tm6000_ir_work);</div><div class='add'>+	dprintk(2, "%s\n",__func__);</div><div class='add'>+</div><div class='ctx'> 	schedule_delayed_work(&amp;ir-&gt;work, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -281,6 +293,8 @@ static void tm6000_ir_stop(struct rc_dev *rc)</div><div class='ctx'> {</div><div class='ctx'> 	struct tm6000_IR *ir = rc-&gt;priv;</div><div class='ctx'> </div><div class='add'>+	dprintk(2, "%s\n",__func__);</div><div class='add'>+</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;ir-&gt;work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -291,10 +305,11 @@ static int tm6000_ir_change_protocol(struct rc_dev *rc, u64 rc_type)</div><div class='ctx'> 	if (!ir)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	dprintk(2, "%s\n",__func__);</div><div class='add'>+</div><div class='ctx'> 	if ((rc-&gt;rc_map.scan) &amp;&amp; (rc_type == RC_TYPE_NEC))</div><div class='ctx'> 		ir-&gt;key_addr = ((rc-&gt;rc_map.scan[0].scancode &gt;&gt; 8) &amp; 0xffff);</div><div class='ctx'> </div><div class='del'>-	ir-&gt;get_key = default_polling_getkey;</div><div class='ctx'> 	ir-&gt;rc_type = rc_type;</div><div class='ctx'> </div><div class='ctx'> 	tm6000_ir_config(ir);</div><div class='hunk'>@@ -302,17 +317,19 @@ static int tm6000_ir_change_protocol(struct rc_dev *rc, u64 rc_type)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int tm6000_ir_int_start(struct tm6000_core *dev)</div><div class='add'>+static int __tm6000_ir_int_start(struct rc_dev *rc)</div><div class='ctx'> {</div><div class='del'>-	struct tm6000_IR *ir = dev-&gt;ir;</div><div class='add'>+	struct tm6000_IR *ir = rc-&gt;priv;</div><div class='add'>+	struct tm6000_core *dev = ir-&gt;dev;</div><div class='ctx'> 	int pipe, size;</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	if (!ir)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	ir-&gt;int_urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	dprintk(2, "%s\n",__func__);</div><div class='add'>+</div><div class='add'>+	ir-&gt;int_urb = usb_alloc_urb(0, GFP_ATOMIC);</div><div class='ctx'> 	if (!ir-&gt;int_urb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -321,42 +338,59 @@ int tm6000_ir_int_start(struct tm6000_core *dev)</div><div class='ctx'> 		&amp; USB_ENDPOINT_NUMBER_MASK);</div><div class='ctx'> </div><div class='ctx'> 	size = usb_maxpacket(dev-&gt;udev, pipe, usb_pipeout(pipe));</div><div class='del'>-	dprintk("IR max size: %d\n", size);</div><div class='add'>+	dprintk(1, "IR max size: %d\n", size);</div><div class='ctx'> </div><div class='del'>-	ir-&gt;int_urb-&gt;transfer_buffer = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	ir-&gt;int_urb-&gt;transfer_buffer = kzalloc(size, GFP_ATOMIC);</div><div class='ctx'> 	if (ir-&gt;int_urb-&gt;transfer_buffer == NULL) {</div><div class='ctx'> 		usb_free_urb(ir-&gt;int_urb);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	dprintk("int interval: %d\n", dev-&gt;int_in.endp-&gt;desc.bInterval);</div><div class='add'>+	dprintk(1, "int interval: %d\n", dev-&gt;int_in.endp-&gt;desc.bInterval);</div><div class='add'>+</div><div class='ctx'> 	usb_fill_int_urb(ir-&gt;int_urb, dev-&gt;udev, pipe,</div><div class='ctx'> 		ir-&gt;int_urb-&gt;transfer_buffer, size,</div><div class='ctx'> 		tm6000_ir_urb_received, dev,</div><div class='ctx'> 		dev-&gt;int_in.endp-&gt;desc.bInterval);</div><div class='del'>-	err = usb_submit_urb(ir-&gt;int_urb, GFP_KERNEL);</div><div class='del'>-	if (err) {</div><div class='del'>-		kfree(ir-&gt;int_urb-&gt;transfer_buffer);</div><div class='del'>-		usb_free_urb(ir-&gt;int_urb);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	ir-&gt;urb_data = kzalloc(size, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	ir-&gt;submit_urb = 1;</div><div class='add'>+	schedule_delayed_work(&amp;ir-&gt;work, msecs_to_jiffies(URB_SUBMIT_DELAY));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void tm6000_ir_int_stop(struct tm6000_core *dev)</div><div class='add'>+static void __tm6000_ir_int_stop(struct rc_dev *rc)</div><div class='ctx'> {</div><div class='del'>-	struct tm6000_IR *ir = dev-&gt;ir;</div><div class='add'>+	struct tm6000_IR *ir = rc-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	if (!ir)</div><div class='add'>+	if (!ir || !ir-&gt;int_urb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	dprintk(2, "%s\n",__func__);</div><div class='add'>+</div><div class='ctx'> 	usb_kill_urb(ir-&gt;int_urb);</div><div class='ctx'> 	kfree(ir-&gt;int_urb-&gt;transfer_buffer);</div><div class='ctx'> 	usb_free_urb(ir-&gt;int_urb);</div><div class='ctx'> 	ir-&gt;int_urb = NULL;</div><div class='del'>-	kfree(ir-&gt;urb_data);</div><div class='del'>-	ir-&gt;urb_data = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tm6000_ir_int_start(struct tm6000_core *dev)</div><div class='add'>+{</div><div class='add'>+	struct tm6000_IR *ir = dev-&gt;ir;</div><div class='add'>+</div><div class='add'>+	if (!ir)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __tm6000_ir_int_start(ir-&gt;rc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tm6000_ir_int_stop(struct tm6000_core *dev)</div><div class='add'>+{</div><div class='add'>+	struct tm6000_IR *ir = dev-&gt;ir;</div><div class='add'>+</div><div class='add'>+	if (!ir || !ir-&gt;rc)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__tm6000_ir_int_stop(ir-&gt;rc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int tm6000_ir_init(struct tm6000_core *dev)</div><div class='hunk'>@@ -374,29 +408,36 @@ int tm6000_ir_init(struct tm6000_core *dev)</div><div class='ctx'> 	if (!dev-&gt;ir_codes)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ir = kzalloc(sizeof(*ir), GFP_KERNEL);</div><div class='add'>+	ir = kzalloc(sizeof(*ir), GFP_ATOMIC);</div><div class='ctx'> 	rc = rc_allocate_device();</div><div class='ctx'> 	if (!ir || !rc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	dprintk(2, "%s\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	/* record handles to ourself */</div><div class='ctx'> 	ir-&gt;dev = dev;</div><div class='ctx'> 	dev-&gt;ir = ir;</div><div class='ctx'> 	ir-&gt;rc = rc;</div><div class='ctx'> </div><div class='del'>-	/* input einrichten */</div><div class='add'>+	/* input setup */</div><div class='ctx'> 	rc-&gt;allowed_protos = RC_TYPE_RC5 | RC_TYPE_NEC;</div><div class='add'>+	/* Neded, in order to support NEC remotes with 24 or 32 bits */</div><div class='add'>+	rc-&gt;scanmask = 0xffff;</div><div class='ctx'> 	rc-&gt;priv = ir;</div><div class='ctx'> 	rc-&gt;change_protocol = tm6000_ir_change_protocol;</div><div class='del'>-	rc-&gt;open = tm6000_ir_start;</div><div class='del'>-	rc-&gt;close = tm6000_ir_stop;</div><div class='add'>+	if (dev-&gt;int_in.endp) {</div><div class='add'>+		rc-&gt;open    = __tm6000_ir_int_start;</div><div class='add'>+		rc-&gt;close   = __tm6000_ir_int_stop;</div><div class='add'>+		INIT_DELAYED_WORK(&amp;ir-&gt;work, tm6000_ir_int_work);</div><div class='add'>+	} else {</div><div class='add'>+		rc-&gt;open  = tm6000_ir_start;</div><div class='add'>+		rc-&gt;close = tm6000_ir_stop;</div><div class='add'>+		ir-&gt;polling = 50;</div><div class='add'>+		INIT_DELAYED_WORK(&amp;ir-&gt;work, tm6000_ir_handle_key);</div><div class='add'>+	}</div><div class='ctx'> 	rc-&gt;driver_type = RC_DRIVER_SCANCODE;</div><div class='ctx'> </div><div class='del'>-	ir-&gt;polling = 50;</div><div class='del'>-	ir-&gt;pwled = 0;</div><div class='del'>-	ir-&gt;pwledcnt = 0;</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> 	snprintf(ir-&gt;name, sizeof(ir-&gt;name), "tm5600/60x0 IR (%s)",</div><div class='ctx'> 						dev-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -415,15 +456,6 @@ int tm6000_ir_init(struct tm6000_core *dev)</div><div class='ctx'> 	rc-&gt;driver_name = "tm6000";</div><div class='ctx'> 	rc-&gt;dev.parent = &amp;dev-&gt;udev-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	if (&amp;dev-&gt;int_in) {</div><div class='del'>-		dprintk("IR over int\n");</div><div class='del'>-</div><div class='del'>-		err = tm6000_ir_int_start(dev);</div><div class='del'>-</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* ir register */</div><div class='ctx'> 	err = rc_register_device(rc);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -447,10 +479,19 @@ int tm6000_ir_fini(struct tm6000_core *dev)</div><div class='ctx'> 	if (!ir)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	dprintk(2, "%s\n",__func__);</div><div class='add'>+</div><div class='ctx'> 	rc_unregister_device(ir-&gt;rc);</div><div class='ctx'> </div><div class='del'>-	if (ir-&gt;int_urb)</div><div class='del'>-		tm6000_ir_int_stop(dev);</div><div class='add'>+	if (!ir-&gt;polling)</div><div class='add'>+		__tm6000_ir_int_stop(ir-&gt;rc);</div><div class='add'>+</div><div class='add'>+	tm6000_ir_stop(ir-&gt;rc);</div><div class='add'>+</div><div class='add'>+	/* Turn off the led */</div><div class='add'>+	tm6000_flash_led(dev, 0);</div><div class='add'>+	ir-&gt;pwled = 0;</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	kfree(ir);</div><div class='ctx'> 	dev-&gt;ir = NULL;</div><div class='head'>diff --git a/drivers/media/video/tm6000/tm6000-regs.h b/drivers/media/video/tm6000/tm6000-regs.h<br/>index 7f491b6de933..a38c251ed57b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000-regs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000-regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000-regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/tm6000/tm6000-regs.h</a></div><div class='hunk'>@@ -284,19 +284,19 @@ enum {</div><div class='ctx'> /* ONLY for TM6010 */</div><div class='ctx'> #define TM6010_REQ07_RD8_IR				0x07, 0xd8</div><div class='ctx'> /* ONLY for TM6010 */</div><div class='del'>-#define TM6010_REQ07_RD8_IR_BSIZE			0x07, 0xd9</div><div class='add'>+#define TM6010_REQ07_RD9_IR_BSIZE			0x07, 0xd9</div><div class='ctx'> /* ONLY for TM6010 */</div><div class='del'>-#define TM6010_REQ07_RD8_IR_WAKEUP_SEL			0x07, 0xda</div><div class='add'>+#define TM6010_REQ07_RDA_IR_WAKEUP_SEL			0x07, 0xda</div><div class='ctx'> /* ONLY for TM6010 */</div><div class='del'>-#define TM6010_REQ07_RD8_IR_WAKEUP_ADD			0x07, 0xdb</div><div class='add'>+#define TM6010_REQ07_RDB_IR_WAKEUP_ADD			0x07, 0xdb</div><div class='ctx'> /* ONLY for TM6010 */</div><div class='del'>-#define TM6010_REQ07_RD8_IR_LEADER1			0x07, 0xdc</div><div class='add'>+#define TM6010_REQ07_RDC_IR_LEADER1			0x07, 0xdc</div><div class='ctx'> /* ONLY for TM6010 */</div><div class='del'>-#define TM6010_REQ07_RD8_IR_LEADER0			0x07, 0xdd</div><div class='add'>+#define TM6010_REQ07_RDD_IR_LEADER0			0x07, 0xdd</div><div class='ctx'> /* ONLY for TM6010 */</div><div class='del'>-#define TM6010_REQ07_RD8_IR_PULSE_CNT1			0x07, 0xde</div><div class='add'>+#define TM6010_REQ07_RDE_IR_PULSE_CNT1			0x07, 0xde</div><div class='ctx'> /* ONLY for TM6010 */</div><div class='del'>-#define TM6010_REQ07_RD8_IR_PULSE_CNT0			0x07, 0xdf</div><div class='add'>+#define TM6010_REQ07_RDF_IR_PULSE_CNT0			0x07, 0xdf</div><div class='ctx'> /* ONLY for TM6010 */</div><div class='ctx'> #define TM6010_REQ07_RE0_DVIDEO_SOURCE			0x07, 0xe0</div><div class='ctx'> /* ONLY for TM6010 */</div><div class='head'>diff --git a/drivers/media/video/tm6000/tm6000-stds.c b/drivers/media/video/tm6000/tm6000-stds.c<br/>index 9a4145dc3d87..9dc0831d813f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000-stds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000-stds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000-stds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/tm6000/tm6000-stds.c</a></div><div class='hunk'>@@ -361,82 +361,51 @@ static int tm6000_set_audio_std(struct tm6000_core *dev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (tm6010_a_mode) {</div><div class='add'>+	/*</div><div class='add'>+	 * STD/MN shouldn't be affected by tm6010_a_mode, as there's just one</div><div class='add'>+	 * audio standard for each V4L2_STD type.</div><div class='add'>+	 */</div><div class='add'>+	if ((dev-&gt;norm &amp; V4L2_STD_NTSC) == V4L2_STD_NTSC_M_KR) {</div><div class='add'>+		areg_05 |= 0x04;</div><div class='add'>+	} else if ((dev-&gt;norm &amp; V4L2_STD_NTSC) == V4L2_STD_NTSC_M_JP) {</div><div class='add'>+		areg_05 |= 0x43;</div><div class='add'>+	} else if (dev-&gt;norm &amp; V4L2_STD_MN) {</div><div class='add'>+		areg_05 |= 0x22;</div><div class='add'>+	} else switch (tm6010_a_mode) {</div><div class='ctx'> 	/* auto */</div><div class='ctx'> 	case 0:</div><div class='del'>-		switch (dev-&gt;norm) {</div><div class='del'>-		case V4L2_STD_NTSC_M_KR:</div><div class='add'>+		if ((dev-&gt;norm &amp; V4L2_STD_SECAM) == V4L2_STD_SECAM_L)</div><div class='ctx'> 			areg_05 |= 0x00;</div><div class='del'>-			break;</div><div class='del'>-		case V4L2_STD_NTSC_M_JP:</div><div class='del'>-			areg_05 |= 0x40;</div><div class='del'>-			break;</div><div class='del'>-		case V4L2_STD_NTSC_M:</div><div class='del'>-		case V4L2_STD_PAL_M:</div><div class='del'>-		case V4L2_STD_PAL_N:</div><div class='del'>-			areg_05 |= 0x20;</div><div class='del'>-			break;</div><div class='del'>-		case V4L2_STD_PAL_Nc:</div><div class='del'>-			areg_05 |= 0x60;</div><div class='del'>-			break;</div><div class='del'>-		case V4L2_STD_SECAM_L:</div><div class='del'>-			areg_05 |= 0x00;</div><div class='del'>-			break;</div><div class='del'>-		case V4L2_STD_DK:</div><div class='add'>+		else	/* Other PAL/SECAM standards */</div><div class='ctx'> 			areg_05 |= 0x10;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* A2 */</div><div class='ctx'> 	case 1:</div><div class='del'>-		switch (dev-&gt;norm) {</div><div class='del'>-		case V4L2_STD_B:</div><div class='del'>-		case V4L2_STD_GH:</div><div class='del'>-			areg_05 = 0x05;</div><div class='del'>-			break;</div><div class='del'>-		case V4L2_STD_DK:</div><div class='add'>+		if (dev-&gt;norm &amp; V4L2_STD_DK)</div><div class='ctx'> 			areg_05 = 0x09;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		else</div><div class='add'>+			areg_05 = 0x05;</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* NICAM */</div><div class='ctx'> 	case 2:</div><div class='del'>-		switch (dev-&gt;norm) {</div><div class='del'>-		case V4L2_STD_B:</div><div class='del'>-		case V4L2_STD_GH:</div><div class='del'>-			areg_05 = 0x07;</div><div class='del'>-			break;</div><div class='del'>-		case V4L2_STD_DK:</div><div class='add'>+		if (dev-&gt;norm &amp; V4L2_STD_DK) {</div><div class='ctx'> 			areg_05 = 0x06;</div><div class='del'>-			break;</div><div class='del'>-		case V4L2_STD_PAL_I:</div><div class='add'>+		} else if (dev-&gt;norm &amp; V4L2_STD_PAL_I) {</div><div class='ctx'> 			areg_05 = 0x08;</div><div class='del'>-			break;</div><div class='del'>-		case V4L2_STD_SECAM_L:</div><div class='add'>+		} else if (dev-&gt;norm &amp; V4L2_STD_SECAM_L) {</div><div class='ctx'> 			areg_05 = 0x0a;</div><div class='ctx'> 			areg_02 = 0x02;</div><div class='del'>-			break;</div><div class='add'>+		} else {</div><div class='add'>+			areg_05 = 0x07;</div><div class='ctx'> 		}</div><div class='ctx'> 		nicam_flag = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	/* other */</div><div class='ctx'> 	case 3:</div><div class='del'>-		switch (dev-&gt;norm) {</div><div class='del'>-		/* DK3_A2 */</div><div class='del'>-		case V4L2_STD_DK:</div><div class='add'>+		if (dev-&gt;norm &amp; V4L2_STD_DK) {</div><div class='ctx'> 			areg_05 = 0x0b;</div><div class='del'>-			break;</div><div class='del'>-		/* Korea */</div><div class='del'>-		case V4L2_STD_NTSC_M_KR:</div><div class='del'>-			areg_05 = 0x04;</div><div class='del'>-			break;</div><div class='del'>-		/* EIAJ */</div><div class='del'>-		case V4L2_STD_NTSC_M_JP:</div><div class='del'>-			areg_05 = 0x03;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='add'>+		} else {</div><div class='ctx'> 			areg_05 = 0x02;</div><div class='del'>-			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -557,10 +526,16 @@ int tm6000_set_standard(struct tm6000_core *dev)</div><div class='ctx'> 		case TM6000_AMUX_ADC1:</div><div class='ctx'> 			tm6000_set_reg_mask(dev, TM6010_REQ08_RF0_DAUDIO_INPUT_CONFIG,</div><div class='ctx'> 				0x00, 0x0f);</div><div class='add'>+			/* Mux overflow workaround */</div><div class='add'>+			tm6000_set_reg_mask(dev, TM6010_REQ07_R07_OUTPUT_CONTROL,</div><div class='add'>+				0x10, 0xf0);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case TM6000_AMUX_ADC2:</div><div class='ctx'> 			tm6000_set_reg_mask(dev, TM6010_REQ08_RF0_DAUDIO_INPUT_CONFIG,</div><div class='ctx'> 				0x08, 0x0f);</div><div class='add'>+			/* Mux overflow workaround */</div><div class='add'>+			tm6000_set_reg_mask(dev, TM6010_REQ07_R07_OUTPUT_CONTROL,</div><div class='add'>+				0x10, 0xf0);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case TM6000_AMUX_SIF1:</div><div class='ctx'> 			reg_08_e2 |= 0x02;</div><div class='hunk'>@@ -570,6 +545,9 @@ int tm6000_set_standard(struct tm6000_core *dev)</div><div class='ctx'> 			tm6000_set_reg(dev, TM6010_REQ08_RE4_ADC_IN2_SEL, 0xf3);</div><div class='ctx'> 			tm6000_set_reg_mask(dev, TM6010_REQ08_RF0_DAUDIO_INPUT_CONFIG,</div><div class='ctx'> 				0x02, 0x0f);</div><div class='add'>+			/* Mux overflow workaround */</div><div class='add'>+			tm6000_set_reg_mask(dev, TM6010_REQ07_R07_OUTPUT_CONTROL,</div><div class='add'>+				0x30, 0xf0);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case TM6000_AMUX_SIF2:</div><div class='ctx'> 			reg_08_e2 |= 0x02;</div><div class='hunk'>@@ -579,6 +557,9 @@ int tm6000_set_standard(struct tm6000_core *dev)</div><div class='ctx'> 			tm6000_set_reg(dev, TM6010_REQ08_RE4_ADC_IN2_SEL, 0xf7);</div><div class='ctx'> 			tm6000_set_reg_mask(dev, TM6010_REQ08_RF0_DAUDIO_INPUT_CONFIG,</div><div class='ctx'> 				0x02, 0x0f);</div><div class='add'>+			/* Mux overflow workaround */</div><div class='add'>+			tm6000_set_reg_mask(dev, TM6010_REQ07_R07_OUTPUT_CONTROL,</div><div class='add'>+				0x30, 0xf0);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/drivers/media/video/tm6000/tm6000-video.c b/drivers/media/video/tm6000/tm6000-video.c<br/>index 1e5ace0b5d10..bc13db736e24 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000-video.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000-video.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000-video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/tm6000/tm6000-video.c</a></div><div class='hunk'>@@ -1605,16 +1605,25 @@ static int tm6000_release(struct file *file)</div><div class='ctx'> 	res_free(dev, fh);</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;users) {</div><div class='del'>-		int err;</div><div class='del'>-</div><div class='ctx'> 		tm6000_uninit_isoc(dev);</div><div class='ctx'> </div><div class='add'>+		/* Stop interrupt USB pipe */</div><div class='add'>+		tm6000_ir_int_stop(dev);</div><div class='add'>+</div><div class='add'>+		usb_reset_configuration(dev-&gt;udev);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;int_in.endp)</div><div class='add'>+			usb_set_interface(dev-&gt;udev,</div><div class='add'>+					dev-&gt;isoc_in.bInterfaceNumber, 2);</div><div class='add'>+		else</div><div class='add'>+			usb_set_interface(dev-&gt;udev,</div><div class='add'>+					dev-&gt;isoc_in.bInterfaceNumber, 0);</div><div class='add'>+</div><div class='add'>+		/* Start interrupt USB pipe */</div><div class='add'>+		tm6000_ir_int_start(dev);</div><div class='add'>+</div><div class='ctx'> 		if (!fh-&gt;radio)</div><div class='ctx'> 			videobuf_mmap_free(&amp;fh-&gt;vb_vidq);</div><div class='del'>-</div><div class='del'>-		err = tm6000_reset(dev);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			dev_err(&amp;vdev-&gt;dev, "reset failed: %d\n", err);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(fh);</div><div class='head'>diff --git a/drivers/media/video/tm6000/tm6000.h b/drivers/media/video/tm6000/tm6000.h<br/>index 2777e514eff2..27ba659cfa85 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tm6000/tm6000.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tm6000/tm6000.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/tm6000/tm6000.h</a></div><div class='hunk'>@@ -188,6 +188,9 @@ struct tm6000_core {</div><div class='ctx'> 	/* Device Capabilities*/</div><div class='ctx'> 	struct tm6000_capabilities	caps;</div><div class='ctx'> </div><div class='add'>+	/* Used to load alsa/dvb */</div><div class='add'>+        struct work_struct		request_module_wk;</div><div class='add'>+</div><div class='ctx'> 	/* Tuner configuration */</div><div class='ctx'> 	int				tuner_type;		/* type of the tuner */</div><div class='ctx'> 	int				tuner_addr;		/* tuner address */</div><div class='head'>diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c<br/>index 11cc980b0cd5..4059ea178c2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tuner-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tuner-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tuner-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/tuner-core.c</a></div><div class='hunk'>@@ -326,6 +326,7 @@ static void set_type(struct i2c_client *c, unsigned int type,</div><div class='ctx'> 		t-&gt;mode_mask = T_RADIO;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TUNER_PHILIPS_FMD1216ME_MK3:</div><div class='add'>+	case TUNER_PHILIPS_FMD1216MEX_MK3:</div><div class='ctx'> 		buffer[0] = 0x0b;</div><div class='ctx'> 		buffer[1] = 0xdc;</div><div class='ctx'> 		buffer[2] = 0x9c;</div><div class='head'>diff --git a/drivers/media/video/tvp514x.c b/drivers/media/video/tvp514x.c<br/>index 926f03931156..dd26cacd0556 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tvp514x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tvp514x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tvp514x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/tvp514x.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'> #define LOCK_RETRY_DELAY                (200)</div><div class='ctx'> </div><div class='ctx'> /* Debug functions */</div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> module_param(debug, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(debug, "Debug level (0-1)");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c<br/>index 6abaa16ae136..6be9910a6e24 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tvp5150.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tvp5150.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tvp5150.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/tvp5150.c</a></div><div class='hunk'>@@ -703,21 +703,21 @@ static int tvp5150_set_std(struct v4l2_subdev *sd, v4l2_std_id std)</div><div class='ctx'> 	/* First tests should be against specific std */</div><div class='ctx'> </div><div class='ctx'> 	if (std == V4L2_STD_ALL) {</div><div class='del'>-		fmt = 0;	/* Autodetect mode */</div><div class='add'>+		fmt = VIDEO_STD_AUTO_SWITCH_BIT;	/* Autodetect mode */</div><div class='ctx'> 	} else if (std &amp; V4L2_STD_NTSC_443) {</div><div class='del'>-		fmt = 0xa;</div><div class='add'>+		fmt = VIDEO_STD_NTSC_4_43_BIT;</div><div class='ctx'> 	} else if (std &amp; V4L2_STD_PAL_M) {</div><div class='del'>-		fmt = 0x6;</div><div class='add'>+		fmt = VIDEO_STD_PAL_M_BIT;</div><div class='ctx'> 	} else if (std &amp; (V4L2_STD_PAL_N | V4L2_STD_PAL_Nc)) {</div><div class='del'>-		fmt = 0x8;</div><div class='add'>+		fmt = VIDEO_STD_PAL_COMBINATION_N_BIT;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Then, test against generic ones */</div><div class='ctx'> 		if (std &amp; V4L2_STD_NTSC)</div><div class='del'>-			fmt = 0x2;</div><div class='add'>+			fmt = VIDEO_STD_NTSC_MJ_BIT;</div><div class='ctx'> 		else if (std &amp; V4L2_STD_PAL)</div><div class='del'>-			fmt = 0x4;</div><div class='add'>+			fmt = VIDEO_STD_PAL_BDGHIN_BIT;</div><div class='ctx'> 		else if (std &amp; V4L2_STD_SECAM)</div><div class='del'>-			fmt = 0xc;</div><div class='add'>+			fmt = VIDEO_STD_SECAM_BIT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	v4l2_dbg(1, debug, sd, "Set video std register to %d.\n", fmt);</div><div class='hunk'>@@ -779,6 +779,70 @@ static int tvp5150_s_ctrl(struct v4l2_ctrl *ctrl)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static v4l2_std_id tvp5150_read_std(struct v4l2_subdev *sd)</div><div class='add'>+{</div><div class='add'>+	int val = tvp5150_read(sd, TVP5150_STATUS_REG_5);</div><div class='add'>+</div><div class='add'>+	switch (val &amp; 0x0F) {</div><div class='add'>+	case 0x01:</div><div class='add'>+		return V4L2_STD_NTSC;</div><div class='add'>+	case 0x03:</div><div class='add'>+		return V4L2_STD_PAL;</div><div class='add'>+	case 0x05:</div><div class='add'>+		return V4L2_STD_PAL_M;</div><div class='add'>+	case 0x07:</div><div class='add'>+		return V4L2_STD_PAL_N | V4L2_STD_PAL_Nc;</div><div class='add'>+	case 0x09:</div><div class='add'>+		return V4L2_STD_NTSC_443;</div><div class='add'>+	case 0xb:</div><div class='add'>+		return V4L2_STD_SECAM;</div><div class='add'>+	default:</div><div class='add'>+		return V4L2_STD_UNKNOWN;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tvp5150_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned index,</div><div class='add'>+						enum v4l2_mbus_pixelcode *code)</div><div class='add'>+{</div><div class='add'>+	if (index)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*code = V4L2_MBUS_FMT_YUYV8_2X8;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tvp5150_mbus_fmt(struct v4l2_subdev *sd,</div><div class='add'>+			    struct v4l2_mbus_framefmt *f)</div><div class='add'>+{</div><div class='add'>+	struct tvp5150 *decoder = to_tvp5150(sd);</div><div class='add'>+	v4l2_std_id std;</div><div class='add'>+</div><div class='add'>+	if (f == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	tvp5150_reset(sd, 0);</div><div class='add'>+</div><div class='add'>+	/* Calculate height and width based on current standard */</div><div class='add'>+	if (decoder-&gt;norm == V4L2_STD_ALL)</div><div class='add'>+		std = tvp5150_read_std(sd);</div><div class='add'>+	else</div><div class='add'>+		std = decoder-&gt;norm;</div><div class='add'>+</div><div class='add'>+	f-&gt;width = 720;</div><div class='add'>+	if (std &amp; V4L2_STD_525_60)</div><div class='add'>+		f-&gt;height = 480;</div><div class='add'>+	else</div><div class='add'>+		f-&gt;height = 576;</div><div class='add'>+</div><div class='add'>+	f-&gt;code = V4L2_MBUS_FMT_YUYV8_2X8;</div><div class='add'>+	f-&gt;field = V4L2_FIELD_SEQ_TB;</div><div class='add'>+	f-&gt;colorspace = V4L2_COLORSPACE_SMPTE170M;</div><div class='add'>+</div><div class='add'>+	v4l2_dbg(1, debug, sd, "width = %d, height = %d\n", f-&gt;width,</div><div class='add'>+			f-&gt;height);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /****************************************************************************</div><div class='ctx'> 			I2C Command</div><div class='ctx'>  ****************************************************************************/</div><div class='hunk'>@@ -931,6 +995,9 @@ static const struct v4l2_subdev_tuner_ops tvp5150_tuner_ops = {</div><div class='ctx'> </div><div class='ctx'> static const struct v4l2_subdev_video_ops tvp5150_video_ops = {</div><div class='ctx'> 	.s_routing = tvp5150_s_routing,</div><div class='add'>+	.enum_mbus_fmt = tvp5150_enum_mbus_fmt,</div><div class='add'>+	.s_mbus_fmt = tvp5150_mbus_fmt,</div><div class='add'>+	.try_mbus_fmt = tvp5150_mbus_fmt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct v4l2_subdev_vbi_ops tvp5150_vbi_ops = {</div><div class='head'>diff --git a/drivers/media/video/tvp7002.c b/drivers/media/video/tvp7002.c<br/>index 7875e80cb2ff..236c559d5f51 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tvp7002.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/tvp7002.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tvp7002.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/tvp7002.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> #define TVP7002_CL_MASK		0x0f</div><div class='ctx'> </div><div class='ctx'> /* Debug functions */</div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> module_param(debug, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(debug, "Debug level (0-2)");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/upd64083.c b/drivers/media/video/upd64083.c<br/>index 9bbe61700fd5..65d065aa6091 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/upd64083.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/upd64083.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/upd64083.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/upd64083.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@ MODULE_DESCRIPTION("uPD64083 driver");</div><div class='ctx'> MODULE_AUTHOR("T. Adachi, Takeru KOMORIYA, Hans Verkuil");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> module_param(debug, bool, 0644);</div><div class='ctx'> </div><div class='ctx'> MODULE_PARM_DESC(debug, "Debug level (0-1)");</div><div class='head'>diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c<br/>index d7f97513b289..89fec029e924 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/usbvision/usbvision-i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/usbvision/usbvision-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/usbvision/usbvision-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/usbvision/usbvision-i2c.c</a></div><div class='hunk'>@@ -110,42 +110,20 @@ static inline int usb_find_address(struct i2c_adapter *i2c_adap,</div><div class='ctx'> </div><div class='ctx'> 	unsigned char addr;</div><div class='ctx'> 	int ret;</div><div class='del'>-	if ((flags &amp; I2C_M_TEN)) {</div><div class='del'>-		/* a ten bit address */</div><div class='del'>-		addr = 0xf0 | ((msg-&gt;addr &gt;&gt; 7) &amp; 0x03);</div><div class='del'>-		/* try extended address code... */</div><div class='del'>-		ret = try_write_address(i2c_adap, addr, retries);</div><div class='del'>-		if (ret != 1) {</div><div class='del'>-			dev_err(&amp;i2c_adap-&gt;dev,</div><div class='del'>-				"died at extended address code,	while writing\n");</div><div class='del'>-			return -EREMOTEIO;</div><div class='del'>-		}</div><div class='del'>-		add[0] = addr;</div><div class='del'>-		if (flags &amp; I2C_M_RD) {</div><div class='del'>-			/* okay, now switch into reading mode */</div><div class='del'>-			addr |= 0x01;</div><div class='del'>-			ret = try_read_address(i2c_adap, addr, retries);</div><div class='del'>-			if (ret != 1) {</div><div class='del'>-				dev_err(&amp;i2c_adap-&gt;dev,</div><div class='del'>-					"died at extended address code, while reading\n");</div><div class='del'>-				return -EREMOTEIO;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-	} else {		/* normal 7bit address  */</div><div class='del'>-		addr = (msg-&gt;addr &lt;&lt; 1);</div><div class='del'>-		if (flags &amp; I2C_M_RD)</div><div class='del'>-			addr |= 1;</div><div class='add'>+	addr = (msg-&gt;addr &lt;&lt; 1);</div><div class='add'>+	if (flags &amp; I2C_M_RD)</div><div class='add'>+		addr |= 1;</div><div class='ctx'> </div><div class='del'>-		add[0] = addr;</div><div class='del'>-		if (flags &amp; I2C_M_RD)</div><div class='del'>-			ret = try_read_address(i2c_adap, addr, retries);</div><div class='del'>-		else</div><div class='del'>-			ret = try_write_address(i2c_adap, addr, retries);</div><div class='add'>+	add[0] = addr;</div><div class='add'>+	if (flags &amp; I2C_M_RD)</div><div class='add'>+		ret = try_read_address(i2c_adap, addr, retries);</div><div class='add'>+	else</div><div class='add'>+		ret = try_write_address(i2c_adap, addr, retries);</div><div class='add'>+</div><div class='add'>+	if (ret != 1)</div><div class='add'>+		return -EREMOTEIO;</div><div class='ctx'> </div><div class='del'>-		if (ret != 1)</div><div class='del'>-			return -EREMOTEIO;</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -184,7 +162,7 @@ usbvision_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)</div><div class='ctx'> </div><div class='ctx'> static u32 functionality(struct i2c_adapter *adap)</div><div class='ctx'> {</div><div class='del'>-	return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR;</div><div class='add'>+	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* -----exported algorithm data: -------------------------------------	*/</div><div class='head'>diff --git a/drivers/media/video/uvc/Kconfig b/drivers/media/video/uvc/Kconfig<br/>index 2956a7637219..6c197da531b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/uvc/Kconfig</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='ctx'> config USB_VIDEO_CLASS</div><div class='ctx'> 	tristate "USB Video Class (UVC)"</div><div class='add'>+	select VIDEOBUF2_VMALLOC</div><div class='ctx'> 	---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='head'>diff --git a/drivers/media/video/uvc/Makefile b/drivers/media/video/uvc/Makefile<br/>index 2071ca8a2f03..c26d12fdb8f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/uvc/Makefile</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> uvcvideo-objs  := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o \</div><div class='del'>-		  uvc_status.o uvc_isight.o</div><div class='add'>+		  uvc_status.o uvc_isight.o uvc_debugfs.o</div><div class='ctx'> ifeq ($(CONFIG_MEDIA_CONTROLLER),y)</div><div class='ctx'> uvcvideo-objs  += uvc_entity.o</div><div class='ctx'> endif</div><div class='head'>diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c<br/>index 254d32688843..0efd3b10b353 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_ctrl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/uvc_ctrl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_ctrl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/uvc/uvc_ctrl.c</a></div><div class='hunk'>@@ -878,8 +878,21 @@ static int uvc_ctrl_populate_cache(struct uvc_video_chain *chain,</div><div class='ctx'> 				     chain-&gt;dev-&gt;intfnum, ctrl-&gt;info.selector,</div><div class='ctx'> 				     uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES),</div><div class='ctx'> 				     ctrl-&gt;info.size);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			if (UVC_ENTITY_TYPE(ctrl-&gt;entity) !=</div><div class='add'>+			    UVC_VC_EXTENSION_UNIT)</div><div class='add'>+				return ret;</div><div class='add'>+</div><div class='add'>+			/* GET_RES is mandatory for XU controls, but some</div><div class='add'>+			 * cameras still choke on it. Ignore errors and set the</div><div class='add'>+			 * resolution value to zero.</div><div class='add'>+			 */</div><div class='add'>+			uvc_warn_once(chain-&gt;dev, UVC_WARN_XU_GET_RES,</div><div class='add'>+				      "UVC non compliance - GET_RES failed on "</div><div class='add'>+				      "an XU control. Enabling workaround.\n");</div><div class='add'>+			memset(uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES), 0,</div><div class='add'>+			       ctrl-&gt;info.size);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ctrl-&gt;cached = 1;</div><div class='hunk'>@@ -1861,7 +1874,7 @@ int uvc_ctrl_init_device(struct uvc_device *dev)</div><div class='ctx'> 		if (ncontrols == 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		entity-&gt;controls = kzalloc(ncontrols * sizeof(*ctrl),</div><div class='add'>+		entity-&gt;controls = kcalloc(ncontrols, sizeof(*ctrl),</div><div class='ctx'> 					   GFP_KERNEL);</div><div class='ctx'> 		if (entity-&gt;controls == NULL)</div><div class='ctx'> 			return -ENOMEM;</div><div class='head'>diff --git a/drivers/media/video/uvc/uvc_debugfs.c b/drivers/media/video/uvc/uvc_debugfs.c<br/>new file mode 100644<br/>index 000000000000..14561a5abb79<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/uvc/uvc_debugfs.c</a></div><div class='hunk'>@@ -0,0 +1,136 @@</div><div class='add'>+/*</div><div class='add'>+ *      uvc_debugfs.c --  USB Video Class driver - Debugging support</div><div class='add'>+ *</div><div class='add'>+ *      Copyright (C) 2011</div><div class='add'>+ *          Laurent Pinchart (laurent.pinchart@ideasonboard.com)</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'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.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 "uvcvideo.h"</div><div class='add'>+</div><div class='add'>+/* -----------------------------------------------------------------------------</div><div class='add'>+ * Statistics</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define UVC_DEBUGFS_BUF_SIZE	1024</div><div class='add'>+</div><div class='add'>+struct uvc_debugfs_buffer {</div><div class='add'>+	size_t count;</div><div class='add'>+	char data[UVC_DEBUGFS_BUF_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int uvc_debugfs_stats_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct uvc_streaming *stream = inode-&gt;i_private;</div><div class='add'>+	struct uvc_debugfs_buffer *buf;</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(sizeof(*buf), GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	buf-&gt;count = uvc_video_stats_dump(stream, buf-&gt;data, sizeof(buf-&gt;data));</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = buf;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t uvc_debugfs_stats_read(struct file *file, char __user *user_buf,</div><div class='add'>+				      size_t nbytes, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct uvc_debugfs_buffer *buf = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, nbytes, ppos, buf-&gt;data,</div><div class='add'>+				       buf-&gt;count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int uvc_debugfs_stats_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	kfree(file-&gt;private_data);</div><div class='add'>+	file-&gt;private_data = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations uvc_debugfs_stats_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = uvc_debugfs_stats_open,</div><div class='add'>+	.llseek = no_llseek,</div><div class='add'>+	.read = uvc_debugfs_stats_read,</div><div class='add'>+	.release = uvc_debugfs_stats_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* -----------------------------------------------------------------------------</div><div class='add'>+ * Global and stream initialization/cleanup</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct dentry *uvc_debugfs_root_dir;</div><div class='add'>+</div><div class='add'>+int uvc_debugfs_init_stream(struct uvc_streaming *stream)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *udev = stream-&gt;dev-&gt;udev;</div><div class='add'>+	struct dentry *dent;</div><div class='add'>+	char dir_name[32];</div><div class='add'>+</div><div class='add'>+	if (uvc_debugfs_root_dir == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	sprintf(dir_name, "%u-%u", udev-&gt;bus-&gt;busnum, udev-&gt;devnum);</div><div class='add'>+</div><div class='add'>+	dent = debugfs_create_dir(dir_name, uvc_debugfs_root_dir);</div><div class='add'>+	if (IS_ERR_OR_NULL(dent)) {</div><div class='add'>+		uvc_printk(KERN_INFO, "Unable to create debugfs %s "</div><div class='add'>+			   "directory.\n", dir_name);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stream-&gt;debugfs_dir = dent;</div><div class='add'>+</div><div class='add'>+	dent = debugfs_create_file("stats", 0444, stream-&gt;debugfs_dir,</div><div class='add'>+				   stream, &amp;uvc_debugfs_stats_fops);</div><div class='add'>+	if (IS_ERR_OR_NULL(dent)) {</div><div class='add'>+		uvc_printk(KERN_INFO, "Unable to create debugfs stats file.\n");</div><div class='add'>+		uvc_debugfs_cleanup_stream(stream);</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 uvc_debugfs_cleanup_stream(struct uvc_streaming *stream)</div><div class='add'>+{</div><div class='add'>+	if (stream-&gt;debugfs_dir == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	debugfs_remove_recursive(stream-&gt;debugfs_dir);</div><div class='add'>+	stream-&gt;debugfs_dir = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int uvc_debugfs_init(void)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dir;</div><div class='add'>+</div><div class='add'>+	dir = debugfs_create_dir("uvcvideo", usb_debug_root);</div><div class='add'>+	if (IS_ERR_OR_NULL(dir)) {</div><div class='add'>+		uvc_printk(KERN_INFO, "Unable to create debugfs directory\n");</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uvc_debugfs_root_dir = dir;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void uvc_debugfs_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	if (uvc_debugfs_root_dir != NULL)</div><div class='add'>+		debugfs_remove_recursive(uvc_debugfs_root_dir);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c<br/>index 656d4c9e3b9f..a240d43d15d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_driver.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/uvc_driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/uvc/uvc_driver.c</a></div><div class='hunk'>@@ -1675,6 +1675,8 @@ static void uvc_unregister_video(struct uvc_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		video_unregister_device(stream-&gt;vdev);</div><div class='ctx'> 		stream-&gt;vdev = NULL;</div><div class='add'>+</div><div class='add'>+		uvc_debugfs_cleanup_stream(stream);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Decrement the stream count and call uvc_delete explicitly if there</div><div class='hunk'>@@ -1700,6 +1702,8 @@ static int uvc_register_video(struct uvc_device *dev,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	uvc_debugfs_init_stream(stream);</div><div class='add'>+</div><div class='ctx'> 	/* Register the device with V4L. */</div><div class='ctx'> 	vdev = video_device_alloc();</div><div class='ctx'> 	if (vdev == NULL) {</div><div class='hunk'>@@ -2033,6 +2037,15 @@ MODULE_PARM_DESC(timeout, "Streaming control requests timeout");</div><div class='ctx'>  * though they are compliant.</div><div class='ctx'>  */</div><div class='ctx'> static struct usb_device_id uvc_ids[] = {</div><div class='add'>+	/* LogiLink Wireless Webcam */</div><div class='add'>+	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE</div><div class='add'>+				| USB_DEVICE_ID_MATCH_INT_INFO,</div><div class='add'>+	  .idVendor		= 0x0416,</div><div class='add'>+	  .idProduct		= 0xa91a,</div><div class='add'>+	  .bInterfaceClass	= USB_CLASS_VIDEO,</div><div class='add'>+	  .bInterfaceSubClass	= 1,</div><div class='add'>+	  .bInterfaceProtocol	= 0,</div><div class='add'>+	  .driver_info		= UVC_QUIRK_PROBE_MINMAX },</div><div class='ctx'> 	/* Genius eFace 2025 */</div><div class='ctx'> 	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE</div><div class='ctx'> 				| USB_DEVICE_ID_MATCH_INT_INFO,</div><div class='hunk'>@@ -2396,17 +2409,24 @@ struct uvc_driver uvc_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init uvc_init(void)</div><div class='ctx'> {</div><div class='del'>-	int result;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	uvc_debugfs_init();</div><div class='ctx'> </div><div class='del'>-	result = usb_register(&amp;uvc_driver.driver);</div><div class='del'>-	if (result == 0)</div><div class='del'>-		printk(KERN_INFO DRIVER_DESC " (" DRIVER_VERSION ")\n");</div><div class='del'>-	return result;</div><div class='add'>+	ret = usb_register(&amp;uvc_driver.driver);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		uvc_debugfs_cleanup();</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO DRIVER_DESC " (" DRIVER_VERSION ")\n");</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit uvc_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	usb_deregister(&amp;uvc_driver.driver);</div><div class='add'>+	uvc_debugfs_cleanup();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(uvc_init);</div><div class='head'>diff --git a/drivers/media/video/uvc/uvc_isight.c b/drivers/media/video/uvc/uvc_isight.c<br/>index 74bbe8f18f3e..8510e7259e76 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_isight.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/uvc_isight.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_isight.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/uvc/uvc_isight.c</a></div><div class='hunk'>@@ -74,7 +74,7 @@ static int isight_decode(struct uvc_video_queue *queue, struct uvc_buffer *buf,</div><div class='ctx'> 	 * Empty buffers (bytesused == 0) don't trigger end of frame detection</div><div class='ctx'> 	 * as it doesn't make sense to return an empty buffer.</div><div class='ctx'> 	 */</div><div class='del'>-	if (is_header &amp;&amp; buf-&gt;buf.bytesused != 0) {</div><div class='add'>+	if (is_header &amp;&amp; buf-&gt;bytesused != 0) {</div><div class='ctx'> 		buf-&gt;state = UVC_BUF_STATE_DONE;</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -83,13 +83,13 @@ static int isight_decode(struct uvc_video_queue *queue, struct uvc_buffer *buf,</div><div class='ctx'> 	 * contain no data.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!is_header) {</div><div class='del'>-		maxlen = buf-&gt;buf.length - buf-&gt;buf.bytesused;</div><div class='del'>-		mem = queue-&gt;mem + buf-&gt;buf.m.offset + buf-&gt;buf.bytesused;</div><div class='add'>+		maxlen = buf-&gt;length - buf-&gt;bytesused;</div><div class='add'>+		mem = buf-&gt;mem + buf-&gt;bytesused;</div><div class='ctx'> 		nbytes = min(len, maxlen);</div><div class='ctx'> 		memcpy(mem, data, nbytes);</div><div class='del'>-		buf-&gt;buf.bytesused += nbytes;</div><div class='add'>+		buf-&gt;bytesused += nbytes;</div><div class='ctx'> </div><div class='del'>-		if (len &gt; maxlen || buf-&gt;buf.bytesused == buf-&gt;buf.length) {</div><div class='add'>+		if (len &gt; maxlen || buf-&gt;bytesused == buf-&gt;length) {</div><div class='ctx'> 			uvc_trace(UVC_TRACE_FRAME, "Frame complete "</div><div class='ctx'> 				  "(overflow).\n");</div><div class='ctx'> 			buf-&gt;state = UVC_BUF_STATE_DONE;</div><div class='head'>diff --git a/drivers/media/video/uvc/uvc_queue.c b/drivers/media/video/uvc/uvc_queue.c<br/>index 677691c44500..518f77d3a4d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_queue.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/uvc_queue.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_queue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/uvc/uvc_queue.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'>  *</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/mm.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='hunk'>@@ -19,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;media/videobuf2-vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "uvcvideo.h"</div><div class='ctx'> </div><div class='hunk'>@@ -29,467 +30,211 @@</div><div class='ctx'>  * Video queues is initialized by uvc_queue_init(). The function performs</div><div class='ctx'>  * basic initialization of the uvc_video_queue struct and never fails.</div><div class='ctx'>  *</div><div class='del'>- * Video buffer allocation and freeing are performed by uvc_alloc_buffers and</div><div class='del'>- * uvc_free_buffers respectively. The former acquires the video queue lock,</div><div class='del'>- * while the later must be called with the lock held (so that allocation can</div><div class='del'>- * free previously allocated buffers). Trying to free buffers that are mapped</div><div class='del'>- * to user space will return -EBUSY.</div><div class='del'>- *</div><div class='del'>- * Video buffers are managed using two queues. However, unlike most USB video</div><div class='del'>- * drivers that use an in queue and an out queue, we use a main queue to hold</div><div class='del'>- * all queued buffers (both 'empty' and 'done' buffers), and an irq queue to</div><div class='del'>- * hold empty buffers. This design (copied from video-buf) minimizes locking</div><div class='del'>- * in interrupt, as only one queue is shared between interrupt and user</div><div class='del'>- * contexts.</div><div class='del'>- *</div><div class='del'>- * Use cases</div><div class='del'>- * ---------</div><div class='del'>- *</div><div class='del'>- * Unless stated otherwise, all operations that modify the irq buffers queue</div><div class='del'>- * are protected by the irq spinlock.</div><div class='del'>- *</div><div class='del'>- * 1. The user queues the buffers, starts streaming and dequeues a buffer.</div><div class='del'>- *</div><div class='del'>- *    The buffers are added to the main and irq queues. Both operations are</div><div class='del'>- *    protected by the queue lock, and the later is protected by the irq</div><div class='del'>- *    spinlock as well.</div><div class='del'>- *</div><div class='del'>- *    The completion handler fetches a buffer from the irq queue and fills it</div><div class='del'>- *    with video data. If no buffer is available (irq queue empty), the handler</div><div class='del'>- *    returns immediately.</div><div class='del'>- *</div><div class='del'>- *    When the buffer is full, the completion handler removes it from the irq</div><div class='del'>- *    queue, marks it as done (UVC_BUF_STATE_DONE) and wakes its wait queue.</div><div class='del'>- *    At that point, any process waiting on the buffer will be woken up. If a</div><div class='del'>- *    process tries to dequeue a buffer after it has been marked done, the</div><div class='del'>- *    dequeing will succeed immediately.</div><div class='del'>- *</div><div class='del'>- * 2. Buffers are queued, user is waiting on a buffer and the device gets</div><div class='del'>- *    disconnected.</div><div class='del'>- *</div><div class='del'>- *    When the device is disconnected, the kernel calls the completion handler</div><div class='del'>- *    with an appropriate status code. The handler marks all buffers in the</div><div class='del'>- *    irq queue as being erroneous (UVC_BUF_STATE_ERROR) and wakes them up so</div><div class='del'>- *    that any process waiting on a buffer gets woken up.</div><div class='del'>- *</div><div class='del'>- *    Waking up up the first buffer on the irq list is not enough, as the</div><div class='del'>- *    process waiting on the buffer might restart the dequeue operation</div><div class='del'>- *    immediately.</div><div class='del'>- *</div><div class='add'>+ * Video buffers are managed by videobuf2. The driver uses a mutex to protect</div><div class='add'>+ * the videobuf2 queue operations by serializing calls to videobuf2 and a</div><div class='add'>+ * spinlock to protect the IRQ queue that holds the buffers to be processed by</div><div class='add'>+ * the driver.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,</div><div class='del'>-		    int drop_corrupted)</div><div class='del'>-{</div><div class='del'>-	mutex_init(&amp;queue-&gt;mutex);</div><div class='del'>-	spin_lock_init(&amp;queue-&gt;irqlock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;queue-&gt;mainqueue);</div><div class='del'>-	INIT_LIST_HEAD(&amp;queue-&gt;irqqueue);</div><div class='del'>-	queue-&gt;flags = drop_corrupted ? UVC_QUEUE_DROP_CORRUPTED : 0;</div><div class='del'>-	queue-&gt;type = type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Free the video buffers.</div><div class='del'>- *</div><div class='del'>- * This function must be called with the queue lock held.</div><div class='add'>+/* -----------------------------------------------------------------------------</div><div class='add'>+ * videobuf2 queue operations</div><div class='ctx'>  */</div><div class='del'>-static int __uvc_free_buffers(struct uvc_video_queue *queue)</div><div class='add'>+</div><div class='add'>+static int uvc_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,</div><div class='add'>+			   unsigned int *nbuffers, unsigned int *nplanes,</div><div class='add'>+			   unsigned int sizes[], void *alloc_ctxs[])</div><div class='ctx'> {</div><div class='del'>-	unsigned int i;</div><div class='add'>+	struct uvc_video_queue *queue = vb2_get_drv_priv(vq);</div><div class='add'>+	struct uvc_streaming *stream =</div><div class='add'>+			container_of(queue, struct uvc_streaming, queue);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; queue-&gt;count; ++i) {</div><div class='del'>-		if (queue-&gt;buffer[i].vma_use_count != 0)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-	}</div><div class='add'>+	if (*nbuffers &gt; UVC_MAX_VIDEO_BUFFERS)</div><div class='add'>+		*nbuffers = UVC_MAX_VIDEO_BUFFERS;</div><div class='ctx'> </div><div class='del'>-	if (queue-&gt;count) {</div><div class='del'>-		uvc_queue_cancel(queue, 0);</div><div class='del'>-		INIT_LIST_HEAD(&amp;queue-&gt;mainqueue);</div><div class='del'>-		vfree(queue-&gt;mem);</div><div class='del'>-		queue-&gt;count = 0;</div><div class='del'>-	}</div><div class='add'>+	*nplanes = 1;</div><div class='add'>+</div><div class='add'>+	sizes[0] = stream-&gt;ctrl.dwMaxVideoFrameSize;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int uvc_free_buffers(struct uvc_video_queue *queue)</div><div class='add'>+static int uvc_buffer_prepare(struct vb2_buffer *vb)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	struct uvc_video_queue *queue = vb2_get_drv_priv(vb-&gt;vb2_queue);</div><div class='add'>+	struct uvc_buffer *buf = container_of(vb, struct uvc_buffer, buf);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;queue-&gt;mutex);</div><div class='del'>-	ret = __uvc_free_buffers(queue);</div><div class='del'>-	mutex_unlock(&amp;queue-&gt;mutex);</div><div class='add'>+	if (vb-&gt;v4l2_buf.type == V4L2_BUF_TYPE_VIDEO_OUTPUT &amp;&amp;</div><div class='add'>+	    vb2_get_plane_payload(vb, 0) &gt; vb2_plane_size(vb, 0)) {</div><div class='add'>+		uvc_trace(UVC_TRACE_CAPTURE, "[E] Bytes used out of bounds.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='add'>+	if (unlikely(queue-&gt;flags &amp; UVC_QUEUE_DISCONNECTED))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Allocate the video buffers.</div><div class='del'>- *</div><div class='del'>- * Pages are reserved to make sure they will not be swapped, as they will be</div><div class='del'>- * filled in the URB completion handler.</div><div class='del'>- *</div><div class='del'>- * Buffers will be individually mapped, so they must all be page aligned.</div><div class='del'>- */</div><div class='del'>-int uvc_alloc_buffers(struct uvc_video_queue *queue, unsigned int nbuffers,</div><div class='del'>-		unsigned int buflength)</div><div class='del'>-{</div><div class='del'>-	unsigned int bufsize = PAGE_ALIGN(buflength);</div><div class='del'>-	unsigned int i;</div><div class='del'>-	void *mem = NULL;</div><div class='del'>-	int ret;</div><div class='add'>+	buf-&gt;state = UVC_BUF_STATE_QUEUED;</div><div class='add'>+	buf-&gt;error = 0;</div><div class='add'>+	buf-&gt;mem = vb2_plane_vaddr(vb, 0);</div><div class='add'>+	buf-&gt;length = vb2_plane_size(vb, 0);</div><div class='add'>+	if (vb-&gt;v4l2_buf.type == V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+		buf-&gt;bytesused = 0;</div><div class='add'>+	else</div><div class='add'>+		buf-&gt;bytesused = vb2_get_plane_payload(vb, 0);</div><div class='ctx'> </div><div class='del'>-	if (nbuffers &gt; UVC_MAX_VIDEO_BUFFERS)</div><div class='del'>-		nbuffers = UVC_MAX_VIDEO_BUFFERS;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;queue-&gt;mutex);</div><div class='add'>+static void uvc_buffer_queue(struct vb2_buffer *vb)</div><div class='add'>+{</div><div class='add'>+	struct uvc_video_queue *queue = vb2_get_drv_priv(vb-&gt;vb2_queue);</div><div class='add'>+	struct uvc_buffer *buf = container_of(vb, struct uvc_buffer, buf);</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if ((ret = __uvc_free_buffers(queue)) &lt; 0)</div><div class='del'>-		goto done;</div><div class='add'>+	spin_lock_irqsave(&amp;queue-&gt;irqlock, flags);</div><div class='add'>+	if (likely(!(queue-&gt;flags &amp; UVC_QUEUE_DISCONNECTED))) {</div><div class='add'>+		list_add_tail(&amp;buf-&gt;queue, &amp;queue-&gt;irqqueue);</div><div class='add'>+	} else {</div><div class='add'>+		/* If the device is disconnected return the buffer to userspace</div><div class='add'>+		 * directly. The next QBUF call will fail with -ENODEV.</div><div class='add'>+		 */</div><div class='add'>+		buf-&gt;state = UVC_BUF_STATE_ERROR;</div><div class='add'>+		vb2_buffer_done(&amp;buf-&gt;buf, VB2_BUF_STATE_ERROR);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Bail out if no buffers should be allocated. */</div><div class='del'>-	if (nbuffers == 0)</div><div class='del'>-		goto done;</div><div class='add'>+	spin_unlock_irqrestore(&amp;queue-&gt;irqlock, flags);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Decrement the number of buffers until allocation succeeds. */</div><div class='del'>-	for (; nbuffers &gt; 0; --nbuffers) {</div><div class='del'>-		mem = vmalloc_32(nbuffers * bufsize);</div><div class='del'>-		if (mem != NULL)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='add'>+static int uvc_buffer_finish(struct vb2_buffer *vb)</div><div class='add'>+{</div><div class='add'>+	struct uvc_video_queue *queue = vb2_get_drv_priv(vb-&gt;vb2_queue);</div><div class='add'>+	struct uvc_streaming *stream =</div><div class='add'>+			container_of(queue, struct uvc_streaming, queue);</div><div class='add'>+	struct uvc_buffer *buf = container_of(vb, struct uvc_buffer, buf);</div><div class='ctx'> </div><div class='del'>-	if (mem == NULL) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='add'>+	uvc_video_clock_update(stream, &amp;vb-&gt;v4l2_buf, buf);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nbuffers; ++i) {</div><div class='del'>-		memset(&amp;queue-&gt;buffer[i], 0, sizeof queue-&gt;buffer[i]);</div><div class='del'>-		queue-&gt;buffer[i].buf.index = i;</div><div class='del'>-		queue-&gt;buffer[i].buf.m.offset = i * bufsize;</div><div class='del'>-		queue-&gt;buffer[i].buf.length = buflength;</div><div class='del'>-		queue-&gt;buffer[i].buf.type = queue-&gt;type;</div><div class='del'>-		queue-&gt;buffer[i].buf.field = V4L2_FIELD_NONE;</div><div class='del'>-		queue-&gt;buffer[i].buf.memory = V4L2_MEMORY_MMAP;</div><div class='del'>-		queue-&gt;buffer[i].buf.flags = 0;</div><div class='del'>-		init_waitqueue_head(&amp;queue-&gt;buffer[i].wait);</div><div class='del'>-	}</div><div class='add'>+static struct vb2_ops uvc_queue_qops = {</div><div class='add'>+	.queue_setup = uvc_queue_setup,</div><div class='add'>+	.buf_prepare = uvc_buffer_prepare,</div><div class='add'>+	.buf_queue = uvc_buffer_queue,</div><div class='add'>+	.buf_finish = uvc_buffer_finish,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	queue-&gt;mem = mem;</div><div class='del'>-	queue-&gt;count = nbuffers;</div><div class='del'>-	queue-&gt;buf_size = bufsize;</div><div class='del'>-	ret = nbuffers;</div><div class='add'>+void uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,</div><div class='add'>+		    int drop_corrupted)</div><div class='add'>+{</div><div class='add'>+	queue-&gt;queue.type = type;</div><div class='add'>+	queue-&gt;queue.io_modes = VB2_MMAP;</div><div class='add'>+	queue-&gt;queue.drv_priv = queue;</div><div class='add'>+	queue-&gt;queue.buf_struct_size = sizeof(struct uvc_buffer);</div><div class='add'>+	queue-&gt;queue.ops = &amp;uvc_queue_qops;</div><div class='add'>+	queue-&gt;queue.mem_ops = &amp;vb2_vmalloc_memops;</div><div class='add'>+	vb2_queue_init(&amp;queue-&gt;queue);</div><div class='ctx'> </div><div class='del'>-done:</div><div class='del'>-	mutex_unlock(&amp;queue-&gt;mutex);</div><div class='del'>-	return ret;</div><div class='add'>+	mutex_init(&amp;queue-&gt;mutex);</div><div class='add'>+	spin_lock_init(&amp;queue-&gt;irqlock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;queue-&gt;irqqueue);</div><div class='add'>+	queue-&gt;flags = drop_corrupted ? UVC_QUEUE_DROP_CORRUPTED : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Check if buffers have been allocated.</div><div class='add'>+/* -----------------------------------------------------------------------------</div><div class='add'>+ * V4L2 queue operations</div><div class='ctx'>  */</div><div class='del'>-int uvc_queue_allocated(struct uvc_video_queue *queue)</div><div class='add'>+</div><div class='add'>+int uvc_alloc_buffers(struct uvc_video_queue *queue,</div><div class='add'>+		      struct v4l2_requestbuffers *rb)</div><div class='ctx'> {</div><div class='del'>-	int allocated;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;queue-&gt;mutex);</div><div class='del'>-	allocated = queue-&gt;count != 0;</div><div class='add'>+	ret = vb2_reqbufs(&amp;queue-&gt;queue, rb);</div><div class='ctx'> 	mutex_unlock(&amp;queue-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	return allocated;</div><div class='add'>+	return ret ? ret : rb-&gt;count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __uvc_query_buffer(struct uvc_buffer *buf,</div><div class='del'>-		struct v4l2_buffer *v4l2_buf)</div><div class='add'>+void uvc_free_buffers(struct uvc_video_queue *queue)</div><div class='ctx'> {</div><div class='del'>-	memcpy(v4l2_buf, &amp;buf-&gt;buf, sizeof *v4l2_buf);</div><div class='del'>-</div><div class='del'>-	if (buf-&gt;vma_use_count)</div><div class='del'>-		v4l2_buf-&gt;flags |= V4L2_BUF_FLAG_MAPPED;</div><div class='del'>-</div><div class='del'>-	switch (buf-&gt;state) {</div><div class='del'>-	case UVC_BUF_STATE_ERROR:</div><div class='del'>-	case UVC_BUF_STATE_DONE:</div><div class='del'>-		v4l2_buf-&gt;flags |= V4L2_BUF_FLAG_DONE;</div><div class='del'>-		break;</div><div class='del'>-	case UVC_BUF_STATE_QUEUED:</div><div class='del'>-	case UVC_BUF_STATE_ACTIVE:</div><div class='del'>-	case UVC_BUF_STATE_READY:</div><div class='del'>-		v4l2_buf-&gt;flags |= V4L2_BUF_FLAG_QUEUED;</div><div class='del'>-		break;</div><div class='del'>-	case UVC_BUF_STATE_IDLE:</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	mutex_lock(&amp;queue-&gt;mutex);</div><div class='add'>+	vb2_queue_release(&amp;queue-&gt;queue);</div><div class='add'>+	mutex_unlock(&amp;queue-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int uvc_query_buffer(struct uvc_video_queue *queue,</div><div class='del'>-		struct v4l2_buffer *v4l2_buf)</div><div class='add'>+int uvc_query_buffer(struct uvc_video_queue *queue, struct v4l2_buffer *buf)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;queue-&gt;mutex);</div><div class='del'>-	if (v4l2_buf-&gt;index &gt;= queue-&gt;count) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	__uvc_query_buffer(&amp;queue-&gt;buffer[v4l2_buf-&gt;index], v4l2_buf);</div><div class='del'>-</div><div class='del'>-done:</div><div class='add'>+	ret = vb2_querybuf(&amp;queue-&gt;queue, buf);</div><div class='ctx'> 	mutex_unlock(&amp;queue-&gt;mutex);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Queue a video buffer. Attempting to queue a buffer that has already been</div><div class='del'>- * queued will return -EINVAL.</div><div class='del'>- */</div><div class='del'>-int uvc_queue_buffer(struct uvc_video_queue *queue,</div><div class='del'>-	struct v4l2_buffer *v4l2_buf)</div><div class='add'>+int uvc_queue_buffer(struct uvc_video_queue *queue, struct v4l2_buffer *buf)</div><div class='ctx'> {</div><div class='del'>-	struct uvc_buffer *buf;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	uvc_trace(UVC_TRACE_CAPTURE, "Queuing buffer %u.\n", v4l2_buf-&gt;index);</div><div class='del'>-</div><div class='del'>-	if (v4l2_buf-&gt;type != queue-&gt;type ||</div><div class='del'>-	    v4l2_buf-&gt;memory != V4L2_MEMORY_MMAP) {</div><div class='del'>-		uvc_trace(UVC_TRACE_CAPTURE, "[E] Invalid buffer type (%u) "</div><div class='del'>-			"and/or memory (%u).\n", v4l2_buf-&gt;type,</div><div class='del'>-			v4l2_buf-&gt;memory);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;queue-&gt;mutex);</div><div class='del'>-	if (v4l2_buf-&gt;index &gt;= queue-&gt;count) {</div><div class='del'>-		uvc_trace(UVC_TRACE_CAPTURE, "[E] Out of range index.\n");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	buf = &amp;queue-&gt;buffer[v4l2_buf-&gt;index];</div><div class='del'>-	if (buf-&gt;state != UVC_BUF_STATE_IDLE) {</div><div class='del'>-		uvc_trace(UVC_TRACE_CAPTURE, "[E] Invalid buffer state "</div><div class='del'>-			"(%u).\n", buf-&gt;state);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (v4l2_buf-&gt;type == V4L2_BUF_TYPE_VIDEO_OUTPUT &amp;&amp;</div><div class='del'>-	    v4l2_buf-&gt;bytesused &gt; buf-&gt;buf.length) {</div><div class='del'>-		uvc_trace(UVC_TRACE_CAPTURE, "[E] Bytes used out of bounds.\n");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;queue-&gt;irqlock, flags);</div><div class='del'>-	if (queue-&gt;flags &amp; UVC_QUEUE_DISCONNECTED) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;queue-&gt;irqlock, flags);</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	buf-&gt;state = UVC_BUF_STATE_QUEUED;</div><div class='del'>-	if (v4l2_buf-&gt;type == V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='del'>-		buf-&gt;buf.bytesused = 0;</div><div class='del'>-	else</div><div class='del'>-		buf-&gt;buf.bytesused = v4l2_buf-&gt;bytesused;</div><div class='del'>-</div><div class='del'>-	list_add_tail(&amp;buf-&gt;stream, &amp;queue-&gt;mainqueue);</div><div class='del'>-	list_add_tail(&amp;buf-&gt;queue, &amp;queue-&gt;irqqueue);</div><div class='del'>-	spin_unlock_irqrestore(&amp;queue-&gt;irqlock, flags);</div><div class='del'>-</div><div class='del'>-done:</div><div class='add'>+	ret = vb2_qbuf(&amp;queue-&gt;queue, buf);</div><div class='ctx'> 	mutex_unlock(&amp;queue-&gt;mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int uvc_queue_waiton(struct uvc_buffer *buf, int nonblocking)</div><div class='del'>-{</div><div class='del'>-	if (nonblocking) {</div><div class='del'>-		return (buf-&gt;state != UVC_BUF_STATE_QUEUED &amp;&amp;</div><div class='del'>-			buf-&gt;state != UVC_BUF_STATE_ACTIVE &amp;&amp;</div><div class='del'>-			buf-&gt;state != UVC_BUF_STATE_READY)</div><div class='del'>-			? 0 : -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return wait_event_interruptible(buf-&gt;wait,</div><div class='del'>-		buf-&gt;state != UVC_BUF_STATE_QUEUED &amp;&amp;</div><div class='del'>-		buf-&gt;state != UVC_BUF_STATE_ACTIVE &amp;&amp;</div><div class='del'>-		buf-&gt;state != UVC_BUF_STATE_READY);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Dequeue a video buffer. If nonblocking is false, block until a buffer is</div><div class='del'>- * available.</div><div class='del'>- */</div><div class='del'>-int uvc_dequeue_buffer(struct uvc_video_queue *queue,</div><div class='del'>-		struct v4l2_buffer *v4l2_buf, int nonblocking)</div><div class='add'>+int uvc_dequeue_buffer(struct uvc_video_queue *queue, struct v4l2_buffer *buf,</div><div class='add'>+		       int nonblocking)</div><div class='ctx'> {</div><div class='del'>-	struct uvc_buffer *buf;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (v4l2_buf-&gt;type != queue-&gt;type ||</div><div class='del'>-	    v4l2_buf-&gt;memory != V4L2_MEMORY_MMAP) {</div><div class='del'>-		uvc_trace(UVC_TRACE_CAPTURE, "[E] Invalid buffer type (%u) "</div><div class='del'>-			"and/or memory (%u).\n", v4l2_buf-&gt;type,</div><div class='del'>-			v4l2_buf-&gt;memory);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;queue-&gt;mutex);</div><div class='del'>-	if (list_empty(&amp;queue-&gt;mainqueue)) {</div><div class='del'>-		uvc_trace(UVC_TRACE_CAPTURE, "[E] Empty buffer queue.\n");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	buf = list_first_entry(&amp;queue-&gt;mainqueue, struct uvc_buffer, stream);</div><div class='del'>-	if ((ret = uvc_queue_waiton(buf, nonblocking)) &lt; 0)</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	uvc_trace(UVC_TRACE_CAPTURE, "Dequeuing buffer %u (%u, %u bytes).\n",</div><div class='del'>-		buf-&gt;buf.index, buf-&gt;state, buf-&gt;buf.bytesused);</div><div class='del'>-</div><div class='del'>-	switch (buf-&gt;state) {</div><div class='del'>-	case UVC_BUF_STATE_ERROR:</div><div class='del'>-		uvc_trace(UVC_TRACE_CAPTURE, "[W] Corrupted data "</div><div class='del'>-			"(transmission error).\n");</div><div class='del'>-		ret = -EIO;</div><div class='del'>-	case UVC_BUF_STATE_DONE:</div><div class='del'>-		buf-&gt;state = UVC_BUF_STATE_IDLE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case UVC_BUF_STATE_IDLE:</div><div class='del'>-	case UVC_BUF_STATE_QUEUED:</div><div class='del'>-	case UVC_BUF_STATE_ACTIVE:</div><div class='del'>-	case UVC_BUF_STATE_READY:</div><div class='del'>-	default:</div><div class='del'>-		uvc_trace(UVC_TRACE_CAPTURE, "[E] Invalid buffer state %u "</div><div class='del'>-			"(driver bug?).\n", buf-&gt;state);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list_del(&amp;buf-&gt;stream);</div><div class='del'>-	__uvc_query_buffer(buf, v4l2_buf);</div><div class='del'>-</div><div class='del'>-done:</div><div class='add'>+	ret = vb2_dqbuf(&amp;queue-&gt;queue, buf, nonblocking);</div><div class='ctx'> 	mutex_unlock(&amp;queue-&gt;mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * VMA operations.</div><div class='del'>- */</div><div class='del'>-static void uvc_vm_open(struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	struct uvc_buffer *buffer = vma-&gt;vm_private_data;</div><div class='del'>-	buffer-&gt;vma_use_count++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void uvc_vm_close(struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	struct uvc_buffer *buffer = vma-&gt;vm_private_data;</div><div class='del'>-	buffer-&gt;vma_use_count--;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct vm_operations_struct uvc_vm_ops = {</div><div class='del'>-	.open		= uvc_vm_open,</div><div class='del'>-	.close		= uvc_vm_close,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Memory-map a video buffer.</div><div class='del'>- *</div><div class='del'>- * This function implements video buffers memory mapping and is intended to be</div><div class='del'>- * used by the device mmap handler.</div><div class='del'>- */</div><div class='ctx'> int uvc_queue_mmap(struct uvc_video_queue *queue, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	struct uvc_buffer *uninitialized_var(buffer);</div><div class='del'>-	struct page *page;</div><div class='del'>-	unsigned long addr, start, size;</div><div class='del'>-	unsigned int i;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	start = vma-&gt;vm_start;</div><div class='del'>-	size = vma-&gt;vm_end - vma-&gt;vm_start;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;queue-&gt;mutex);</div><div class='add'>+	ret = vb2_mmap(&amp;queue-&gt;queue, vma);</div><div class='add'>+	mutex_unlock(&amp;queue-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; queue-&gt;count; ++i) {</div><div class='del'>-		buffer = &amp;queue-&gt;buffer[i];</div><div class='del'>-		if ((buffer-&gt;buf.m.offset &gt;&gt; PAGE_SHIFT) == vma-&gt;vm_pgoff)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i == queue-&gt;count || PAGE_ALIGN(size) != queue-&gt;buf_size) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * VM_IO marks the area as being an mmaped region for I/O to a</div><div class='del'>-	 * device. It also prevents the region from being core dumped.</div><div class='del'>-	 */</div><div class='del'>-	vma-&gt;vm_flags |= VM_IO;</div><div class='del'>-</div><div class='del'>-	addr = (unsigned long)queue-&gt;mem + buffer-&gt;buf.m.offset;</div><div class='del'>-#ifdef CONFIG_MMU</div><div class='del'>-	while (size &gt; 0) {</div><div class='del'>-		page = vmalloc_to_page((void *)addr);</div><div class='del'>-		if ((ret = vm_insert_page(vma, start, page)) &lt; 0)</div><div class='del'>-			goto done;</div><div class='del'>-</div><div class='del'>-		start += PAGE_SIZE;</div><div class='del'>-		addr += PAGE_SIZE;</div><div class='del'>-		size -= PAGE_SIZE;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	vma-&gt;vm_ops = &amp;uvc_vm_ops;</div><div class='del'>-	vma-&gt;vm_private_data = buffer;</div><div class='del'>-	uvc_vm_open(vma);</div><div class='add'>+unsigned int uvc_queue_poll(struct uvc_video_queue *queue, struct file *file,</div><div class='add'>+			    poll_table *wait)</div><div class='add'>+{</div><div class='add'>+	unsigned int ret;</div><div class='ctx'> </div><div class='del'>-done:</div><div class='add'>+	mutex_lock(&amp;queue-&gt;mutex);</div><div class='add'>+	ret = vb2_poll(&amp;queue-&gt;queue, file, wait);</div><div class='ctx'> 	mutex_unlock(&amp;queue-&gt;mutex);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Poll the video queue.</div><div class='add'>+/* -----------------------------------------------------------------------------</div><div class='ctx'>  *</div><div class='del'>- * This function implements video queue polling and is intended to be used by</div><div class='del'>- * the device poll handler.</div><div class='ctx'>  */</div><div class='del'>-unsigned int uvc_queue_poll(struct uvc_video_queue *queue, struct file *file,</div><div class='del'>-		poll_table *wait)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check if buffers have been allocated.</div><div class='add'>+ */</div><div class='add'>+int uvc_queue_allocated(struct uvc_video_queue *queue)</div><div class='ctx'> {</div><div class='del'>-	struct uvc_buffer *buf;</div><div class='del'>-	unsigned int mask = 0;</div><div class='add'>+	int allocated;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;queue-&gt;mutex);</div><div class='del'>-	if (list_empty(&amp;queue-&gt;mainqueue)) {</div><div class='del'>-		mask |= POLLERR;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	buf = list_first_entry(&amp;queue-&gt;mainqueue, struct uvc_buffer, stream);</div><div class='del'>-</div><div class='del'>-	poll_wait(file, &amp;buf-&gt;wait, wait);</div><div class='del'>-	if (buf-&gt;state == UVC_BUF_STATE_DONE ||</div><div class='del'>-	    buf-&gt;state == UVC_BUF_STATE_ERROR) {</div><div class='del'>-		if (queue-&gt;type == V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='del'>-			mask |= POLLIN | POLLRDNORM;</div><div class='del'>-		else</div><div class='del'>-			mask |= POLLOUT | POLLWRNORM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-done:</div><div class='add'>+	allocated = vb2_is_busy(&amp;queue-&gt;queue);</div><div class='ctx'> 	mutex_unlock(&amp;queue-&gt;mutex);</div><div class='del'>-	return mask;</div><div class='add'>+</div><div class='add'>+	return allocated;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_MMU</div><div class='hunk'>@@ -515,7 +260,7 @@ unsigned long uvc_queue_get_unmapped_area(struct uvc_video_queue *queue,</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='del'>-	ret = (unsigned long)queue-&gt;mem + buffer-&gt;buf.m.offset;</div><div class='add'>+	ret = (unsigned long)buf-&gt;mem;</div><div class='ctx'> done:</div><div class='ctx'> 	mutex_unlock(&amp;queue-&gt;mutex);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -540,27 +285,24 @@ done:</div><div class='ctx'>  */</div><div class='ctx'> int uvc_queue_enable(struct uvc_video_queue *queue, int enable)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;queue-&gt;mutex);</div><div class='ctx'> 	if (enable) {</div><div class='del'>-		if (uvc_queue_streaming(queue)) {</div><div class='del'>-			ret = -EBUSY;</div><div class='add'>+		ret = vb2_streamon(&amp;queue-&gt;queue, queue-&gt;queue.type);</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			goto done;</div><div class='del'>-		}</div><div class='del'>-		queue-&gt;flags |= UVC_QUEUE_STREAMING;</div><div class='add'>+</div><div class='ctx'> 		queue-&gt;buf_used = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		uvc_queue_cancel(queue, 0);</div><div class='del'>-		INIT_LIST_HEAD(&amp;queue-&gt;mainqueue);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; queue-&gt;count; ++i) {</div><div class='del'>-			queue-&gt;buffer[i].error = 0;</div><div class='del'>-			queue-&gt;buffer[i].state = UVC_BUF_STATE_IDLE;</div><div class='del'>-		}</div><div class='add'>+		ret = vb2_streamoff(&amp;queue-&gt;queue, queue-&gt;queue.type);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto done;</div><div class='ctx'> </div><div class='del'>-		queue-&gt;flags &amp;= ~UVC_QUEUE_STREAMING;</div><div class='add'>+		spin_lock_irqsave(&amp;queue-&gt;irqlock, flags);</div><div class='add'>+		INIT_LIST_HEAD(&amp;queue-&gt;irqqueue);</div><div class='add'>+		spin_unlock_irqrestore(&amp;queue-&gt;irqlock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='hunk'>@@ -591,12 +333,12 @@ void uvc_queue_cancel(struct uvc_video_queue *queue, int disconnect)</div><div class='ctx'> 				       queue);</div><div class='ctx'> 		list_del(&amp;buf-&gt;queue);</div><div class='ctx'> 		buf-&gt;state = UVC_BUF_STATE_ERROR;</div><div class='del'>-		wake_up(&amp;buf-&gt;wait);</div><div class='add'>+		vb2_buffer_done(&amp;buf-&gt;buf, VB2_BUF_STATE_ERROR);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* This must be protected by the irqlock spinlock to avoid race</div><div class='del'>-	 * conditions between uvc_queue_buffer and the disconnection event that</div><div class='add'>+	 * conditions between uvc_buffer_queue and the disconnection event that</div><div class='ctx'> 	 * could result in an interruptible wait in uvc_dequeue_buffer. Do not</div><div class='del'>-	 * blindly replace this logic by checking for the UVC_DEV_DISCONNECTED</div><div class='add'>+	 * blindly replace this logic by checking for the UVC_QUEUE_DISCONNECTED</div><div class='ctx'> 	 * state outside the queue code.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (disconnect)</div><div class='hunk'>@@ -613,14 +355,12 @@ struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue,</div><div class='ctx'> 	if ((queue-&gt;flags &amp; UVC_QUEUE_DROP_CORRUPTED) &amp;&amp; buf-&gt;error) {</div><div class='ctx'> 		buf-&gt;error = 0;</div><div class='ctx'> 		buf-&gt;state = UVC_BUF_STATE_QUEUED;</div><div class='del'>-		buf-&gt;buf.bytesused = 0;</div><div class='add'>+		vb2_set_plane_payload(&amp;buf-&gt;buf, 0, 0);</div><div class='ctx'> 		return buf;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;queue-&gt;irqlock, flags);</div><div class='ctx'> 	list_del(&amp;buf-&gt;queue);</div><div class='del'>-	buf-&gt;error = 0;</div><div class='del'>-	buf-&gt;state = UVC_BUF_STATE_DONE;</div><div class='ctx'> 	if (!list_empty(&amp;queue-&gt;irqqueue))</div><div class='ctx'> 		nextbuf = list_first_entry(&amp;queue-&gt;irqqueue, struct uvc_buffer,</div><div class='ctx'> 					   queue);</div><div class='hunk'>@@ -628,7 +368,9 @@ struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue,</div><div class='ctx'> 		nextbuf = NULL;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;queue-&gt;irqlock, flags);</div><div class='ctx'> </div><div class='del'>-	wake_up(&amp;buf-&gt;wait);</div><div class='add'>+	buf-&gt;state = buf-&gt;error ? VB2_BUF_STATE_ERROR : UVC_BUF_STATE_DONE;</div><div class='add'>+	vb2_set_plane_payload(&amp;buf-&gt;buf, 0, buf-&gt;bytesused);</div><div class='add'>+	vb2_buffer_done(&amp;buf-&gt;buf, VB2_BUF_STATE_DONE);</div><div class='add'>+</div><div class='ctx'> 	return nextbuf;</div><div class='ctx'> }</div><div class='del'>-</div><div class='head'>diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c<br/>index dadf11f704dc..2ae4f880ea05 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_v4l2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/uvc_v4l2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_v4l2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/uvc/uvc_v4l2.c</a></div><div class='hunk'>@@ -58,6 +58,15 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case V4L2_CTRL_TYPE_MENU:</div><div class='add'>+		/* Prevent excessive memory consumption, as well as integer</div><div class='add'>+		 * overflows.</div><div class='add'>+		 */</div><div class='add'>+		if (xmap-&gt;menu_count == 0 ||</div><div class='add'>+		    xmap-&gt;menu_count &gt; UVC_MAX_CONTROL_MENU_ENTRIES) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		size = xmap-&gt;menu_count * sizeof(*map-&gt;menu_info);</div><div class='ctx'> 		map-&gt;menu_info = kmalloc(size, GFP_KERNEL);</div><div class='ctx'> 		if (map-&gt;menu_info == NULL) {</div><div class='hunk'>@@ -513,10 +522,7 @@ static int uvc_v4l2_release(struct file *file)</div><div class='ctx'> 	/* Only free resources if this is a privileged handle. */</div><div class='ctx'> 	if (uvc_has_privileges(handle)) {</div><div class='ctx'> 		uvc_video_enable(stream, 0);</div><div class='del'>-</div><div class='del'>-		if (uvc_free_buffers(&amp;stream-&gt;queue) &lt; 0)</div><div class='del'>-			uvc_printk(KERN_ERR, "uvc_v4l2_release: Unable to "</div><div class='del'>-					"free buffers.\n");</div><div class='add'>+		uvc_free_buffers(&amp;stream-&gt;queue);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Release the file handle. */</div><div class='hunk'>@@ -914,19 +920,11 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)</div><div class='ctx'> </div><div class='ctx'> 	/* Buffers &amp; streaming */</div><div class='ctx'> 	case VIDIOC_REQBUFS:</div><div class='del'>-	{</div><div class='del'>-		struct v4l2_requestbuffers *rb = arg;</div><div class='del'>-</div><div class='del'>-		if (rb-&gt;type != stream-&gt;type ||</div><div class='del'>-		    rb-&gt;memory != V4L2_MEMORY_MMAP)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		if ((ret = uvc_acquire_privileges(handle)) &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='ctx'> 		mutex_lock(&amp;stream-&gt;mutex);</div><div class='del'>-		ret = uvc_alloc_buffers(&amp;stream-&gt;queue, rb-&gt;count,</div><div class='del'>-					stream-&gt;ctrl.dwMaxVideoFrameSize);</div><div class='add'>+		ret = uvc_alloc_buffers(&amp;stream-&gt;queue, arg);</div><div class='ctx'> 		mutex_unlock(&amp;stream-&gt;mutex);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -934,18 +932,13 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)</div><div class='ctx'> 		if (ret == 0)</div><div class='ctx'> 			uvc_dismiss_privileges(handle);</div><div class='ctx'> </div><div class='del'>-		rb-&gt;count = ret;</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		break;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOC_QUERYBUF:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_buffer *buf = arg;</div><div class='ctx'> </div><div class='del'>-		if (buf-&gt;type != stream-&gt;type)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		if (!uvc_has_privileges(handle))</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c<br/>index b015e8e5e8b0..c7e69b8f81c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_video.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/uvc_video.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvc_video.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/uvc/uvc_video.c</a></div><div class='hunk'>@@ -351,25 +351,553 @@ done:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int uvc_commit_video(struct uvc_streaming *stream,</div><div class='del'>-	struct uvc_streaming_control *probe)</div><div class='add'>+static int uvc_commit_video(struct uvc_streaming *stream,</div><div class='add'>+			    struct uvc_streaming_control *probe)</div><div class='ctx'> {</div><div class='ctx'> 	return uvc_set_video_ctrl(stream, probe, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* -----------------------------------------------------------------------------</div><div class='add'>+ * Clocks and timestamps</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+uvc_video_clock_decode(struct uvc_streaming *stream, struct uvc_buffer *buf,</div><div class='add'>+		       const __u8 *data, int len)</div><div class='add'>+{</div><div class='add'>+	struct uvc_clock_sample *sample;</div><div class='add'>+	unsigned int header_size;</div><div class='add'>+	bool has_pts = false;</div><div class='add'>+	bool has_scr = false;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct timespec ts;</div><div class='add'>+	u16 host_sof;</div><div class='add'>+	u16 dev_sof;</div><div class='add'>+</div><div class='add'>+	switch (data[1] &amp; (UVC_STREAM_PTS | UVC_STREAM_SCR)) {</div><div class='add'>+	case UVC_STREAM_PTS | UVC_STREAM_SCR:</div><div class='add'>+		header_size = 12;</div><div class='add'>+		has_pts = true;</div><div class='add'>+		has_scr = true;</div><div class='add'>+		break;</div><div class='add'>+	case UVC_STREAM_PTS:</div><div class='add'>+		header_size = 6;</div><div class='add'>+		has_pts = true;</div><div class='add'>+		break;</div><div class='add'>+	case UVC_STREAM_SCR:</div><div class='add'>+		header_size = 8;</div><div class='add'>+		has_scr = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		header_size = 2;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for invalid headers. */</div><div class='add'>+	if (len &lt; header_size)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Extract the timestamps:</div><div class='add'>+	 *</div><div class='add'>+	 * - store the frame PTS in the buffer structure</div><div class='add'>+	 * - if the SCR field is present, retrieve the host SOF counter and</div><div class='add'>+	 *   kernel timestamps and store them with the SCR STC and SOF fields</div><div class='add'>+	 *   in the ring buffer</div><div class='add'>+	 */</div><div class='add'>+	if (has_pts &amp;&amp; buf != NULL)</div><div class='add'>+		buf-&gt;pts = get_unaligned_le32(&amp;data[2]);</div><div class='add'>+</div><div class='add'>+	if (!has_scr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* To limit the amount of data, drop SCRs with an SOF identical to the</div><div class='add'>+	 * previous one.</div><div class='add'>+	 */</div><div class='add'>+	dev_sof = get_unaligned_le16(&amp;data[header_size - 2]);</div><div class='add'>+	if (dev_sof == stream-&gt;clock.last_sof)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	stream-&gt;clock.last_sof = dev_sof;</div><div class='add'>+</div><div class='add'>+	host_sof = usb_get_current_frame_number(stream-&gt;dev-&gt;udev);</div><div class='add'>+	ktime_get_ts(&amp;ts);</div><div class='add'>+</div><div class='add'>+	/* The UVC specification allows device implementations that can't obtain</div><div class='add'>+	 * the USB frame number to keep their own frame counters as long as they</div><div class='add'>+	 * match the size and frequency of the frame number associated with USB</div><div class='add'>+	 * SOF tokens. The SOF values sent by such devices differ from the USB</div><div class='add'>+	 * SOF tokens by a fixed offset that needs to be estimated and accounted</div><div class='add'>+	 * for to make timestamp recovery as accurate as possible.</div><div class='add'>+	 *</div><div class='add'>+	 * The offset is estimated the first time a device SOF value is received</div><div class='add'>+	 * as the difference between the host and device SOF values. As the two</div><div class='add'>+	 * SOF values can differ slightly due to transmission delays, consider</div><div class='add'>+	 * that the offset is null if the difference is not higher than 10 ms</div><div class='add'>+	 * (negative differences can not happen and are thus considered as an</div><div class='add'>+	 * offset). The video commit control wDelay field should be used to</div><div class='add'>+	 * compute a dynamic threshold instead of using a fixed 10 ms value, but</div><div class='add'>+	 * devices don't report reliable wDelay values.</div><div class='add'>+	 *</div><div class='add'>+	 * See uvc_video_clock_host_sof() for an explanation regarding why only</div><div class='add'>+	 * the 8 LSBs of the delta are kept.</div><div class='add'>+	 */</div><div class='add'>+	if (stream-&gt;clock.sof_offset == (u16)-1) {</div><div class='add'>+		u16 delta_sof = (host_sof - dev_sof) &amp; 255;</div><div class='add'>+		if (delta_sof &gt;= 10)</div><div class='add'>+			stream-&gt;clock.sof_offset = delta_sof;</div><div class='add'>+		else</div><div class='add'>+			stream-&gt;clock.sof_offset = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_sof = (dev_sof + stream-&gt;clock.sof_offset) &amp; 2047;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;stream-&gt;clock.lock, flags);</div><div class='add'>+</div><div class='add'>+	sample = &amp;stream-&gt;clock.samples[stream-&gt;clock.head];</div><div class='add'>+	sample-&gt;dev_stc = get_unaligned_le32(&amp;data[header_size - 6]);</div><div class='add'>+	sample-&gt;dev_sof = dev_sof;</div><div class='add'>+	sample-&gt;host_sof = host_sof;</div><div class='add'>+	sample-&gt;host_ts = ts;</div><div class='add'>+</div><div class='add'>+	/* Update the sliding window head and count. */</div><div class='add'>+	stream-&gt;clock.head = (stream-&gt;clock.head + 1) % stream-&gt;clock.size;</div><div class='add'>+</div><div class='add'>+	if (stream-&gt;clock.count &lt; stream-&gt;clock.size)</div><div class='add'>+		stream-&gt;clock.count++;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;stream-&gt;clock.lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int uvc_video_clock_init(struct uvc_streaming *stream)</div><div class='add'>+{</div><div class='add'>+	struct uvc_clock *clock = &amp;stream-&gt;clock;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;clock-&gt;lock);</div><div class='add'>+	clock-&gt;head = 0;</div><div class='add'>+	clock-&gt;count = 0;</div><div class='add'>+	clock-&gt;size = 32;</div><div class='add'>+	clock-&gt;last_sof = -1;</div><div class='add'>+	clock-&gt;sof_offset = -1;</div><div class='add'>+</div><div class='add'>+	clock-&gt;samples = kmalloc(clock-&gt;size * sizeof(*clock-&gt;samples),</div><div class='add'>+				 GFP_KERNEL);</div><div class='add'>+	if (clock-&gt;samples == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void uvc_video_clock_cleanup(struct uvc_streaming *stream)</div><div class='add'>+{</div><div class='add'>+	kfree(stream-&gt;clock.samples);</div><div class='add'>+	stream-&gt;clock.samples = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * uvc_video_clock_host_sof - Return the host SOF value for a clock sample</div><div class='add'>+ *</div><div class='add'>+ * Host SOF counters reported by usb_get_current_frame_number() usually don't</div><div class='add'>+ * cover the whole 11-bits SOF range (0-2047) but are limited to the HCI frame</div><div class='add'>+ * schedule window. They can be limited to 8, 9 or 10 bits depending on the host</div><div class='add'>+ * controller and its configuration.</div><div class='add'>+ *</div><div class='add'>+ * We thus need to recover the SOF value corresponding to the host frame number.</div><div class='add'>+ * As the device and host frame numbers are sampled in a short interval, the</div><div class='add'>+ * difference between their values should be equal to a small delta plus an</div><div class='add'>+ * integer multiple of 256 caused by the host frame number limited precision.</div><div class='add'>+ *</div><div class='add'>+ * To obtain the recovered host SOF value, compute the small delta by masking</div><div class='add'>+ * the high bits of the host frame counter and device SOF difference and add it</div><div class='add'>+ * to the device SOF value.</div><div class='add'>+ */</div><div class='add'>+static u16 uvc_video_clock_host_sof(const struct uvc_clock_sample *sample)</div><div class='add'>+{</div><div class='add'>+	/* The delta value can be negative. */</div><div class='add'>+	s8 delta_sof;</div><div class='add'>+</div><div class='add'>+	delta_sof = (sample-&gt;host_sof - sample-&gt;dev_sof) &amp; 255;</div><div class='add'>+</div><div class='add'>+	return (sample-&gt;dev_sof + delta_sof) &amp; 2047;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * uvc_video_clock_update - Update the buffer timestamp</div><div class='add'>+ *</div><div class='add'>+ * This function converts the buffer PTS timestamp to the host clock domain by</div><div class='add'>+ * going through the USB SOF clock domain and stores the result in the V4L2</div><div class='add'>+ * buffer timestamp field.</div><div class='add'>+ *</div><div class='add'>+ * The relationship between the device clock and the host clock isn't known.</div><div class='add'>+ * However, the device and the host share the common USB SOF clock which can be</div><div class='add'>+ * used to recover that relationship.</div><div class='add'>+ *</div><div class='add'>+ * The relationship between the device clock and the USB SOF clock is considered</div><div class='add'>+ * to be linear over the clock samples sliding window and is given by</div><div class='add'>+ *</div><div class='add'>+ * SOF = m * PTS + p</div><div class='add'>+ *</div><div class='add'>+ * Several methods to compute the slope (m) and intercept (p) can be used. As</div><div class='add'>+ * the clock drift should be small compared to the sliding window size, we</div><div class='add'>+ * assume that the line that goes through the points at both ends of the window</div><div class='add'>+ * is a good approximation. Naming those points P1 and P2, we get</div><div class='add'>+ *</div><div class='add'>+ * SOF = (SOF2 - SOF1) / (STC2 - STC1) * PTS</div><div class='add'>+ *     + (SOF1 * STC2 - SOF2 * STC1) / (STC2 - STC1)</div><div class='add'>+ *</div><div class='add'>+ * or</div><div class='add'>+ *</div><div class='add'>+ * SOF = ((SOF2 - SOF1) * PTS + SOF1 * STC2 - SOF2 * STC1) / (STC2 - STC1)   (1)</div><div class='add'>+ *</div><div class='add'>+ * to avoid loosing precision in the division. Similarly, the host timestamp is</div><div class='add'>+ * computed with</div><div class='add'>+ *</div><div class='add'>+ * TS = ((TS2 - TS1) * PTS + TS1 * SOF2 - TS2 * SOF1) / (SOF2 - SOF1)	     (2)</div><div class='add'>+ *</div><div class='add'>+ * SOF values are coded on 11 bits by USB. We extend their precision with 16</div><div class='add'>+ * decimal bits, leading to a 11.16 coding.</div><div class='add'>+ *</div><div class='add'>+ * TODO: To avoid surprises with device clock values, PTS/STC timestamps should</div><div class='add'>+ * be normalized using the nominal device clock frequency reported through the</div><div class='add'>+ * UVC descriptors.</div><div class='add'>+ *</div><div class='add'>+ * Both the PTS/STC and SOF counters roll over, after a fixed but device</div><div class='add'>+ * specific amount of time for PTS/STC and after 2048ms for SOF. As long as the</div><div class='add'>+ * sliding window size is smaller than the rollover period, differences computed</div><div class='add'>+ * on unsigned integers will produce the correct result. However, the p term in</div><div class='add'>+ * the linear relations will be miscomputed.</div><div class='add'>+ *</div><div class='add'>+ * To fix the issue, we subtract a constant from the PTS and STC values to bring</div><div class='add'>+ * PTS to half the 32 bit STC range. The sliding window STC values then fit into</div><div class='add'>+ * the 32 bit range without any rollover.</div><div class='add'>+ *</div><div class='add'>+ * Similarly, we add 2048 to the device SOF values to make sure that the SOF</div><div class='add'>+ * computed by (1) will never be smaller than 0. This offset is then compensated</div><div class='add'>+ * by adding 2048 to the SOF values used in (2). However, this doesn't prevent</div><div class='add'>+ * rollovers between (1) and (2): the SOF value computed by (1) can be slightly</div><div class='add'>+ * lower than 4096, and the host SOF counters can have rolled over to 2048. This</div><div class='add'>+ * case is handled by subtracting 2048 from the SOF value if it exceeds the host</div><div class='add'>+ * SOF value at the end of the sliding window.</div><div class='add'>+ *</div><div class='add'>+ * Finally we subtract a constant from the host timestamps to bring the first</div><div class='add'>+ * timestamp of the sliding window to 1s.</div><div class='add'>+ */</div><div class='add'>+void uvc_video_clock_update(struct uvc_streaming *stream,</div><div class='add'>+			    struct v4l2_buffer *v4l2_buf,</div><div class='add'>+			    struct uvc_buffer *buf)</div><div class='add'>+{</div><div class='add'>+	struct uvc_clock *clock = &amp;stream-&gt;clock;</div><div class='add'>+	struct uvc_clock_sample *first;</div><div class='add'>+	struct uvc_clock_sample *last;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct timespec ts;</div><div class='add'>+	u32 delta_stc;</div><div class='add'>+	u32 y1, y2;</div><div class='add'>+	u32 x1, x2;</div><div class='add'>+	u32 mean;</div><div class='add'>+	u32 sof;</div><div class='add'>+	u32 div;</div><div class='add'>+	u32 rem;</div><div class='add'>+	u64 y;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;clock-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (clock-&gt;count &lt; clock-&gt;size)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	first = &amp;clock-&gt;samples[clock-&gt;head];</div><div class='add'>+	last = &amp;clock-&gt;samples[(clock-&gt;head - 1) % clock-&gt;size];</div><div class='add'>+</div><div class='add'>+	/* First step, PTS to SOF conversion. */</div><div class='add'>+	delta_stc = buf-&gt;pts - (1UL &lt;&lt; 31);</div><div class='add'>+	x1 = first-&gt;dev_stc - delta_stc;</div><div class='add'>+	x2 = last-&gt;dev_stc - delta_stc;</div><div class='add'>+	y1 = (first-&gt;dev_sof + 2048) &lt;&lt; 16;</div><div class='add'>+	y2 = (last-&gt;dev_sof + 2048) &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	if (y2 &lt; y1)</div><div class='add'>+		y2 += 2048 &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	y = (u64)(y2 - y1) * (1ULL &lt;&lt; 31) + (u64)y1 * (u64)x2</div><div class='add'>+	  - (u64)y2 * (u64)x1;</div><div class='add'>+	y = div_u64(y, x2 - x1);</div><div class='add'>+</div><div class='add'>+	sof = y;</div><div class='add'>+</div><div class='add'>+	uvc_trace(UVC_TRACE_CLOCK, "%s: PTS %u y %llu.%06llu SOF %u.%06llu "</div><div class='add'>+		  "(x1 %u x2 %u y1 %u y2 %u SOF offset %u)\n",</div><div class='add'>+		  stream-&gt;dev-&gt;name, buf-&gt;pts,</div><div class='add'>+		  y &gt;&gt; 16, div_u64((y &amp; 0xffff) * 1000000, 65536),</div><div class='add'>+		  sof &gt;&gt; 16, div_u64(((u64)sof &amp; 0xffff) * 1000000LLU, 65536),</div><div class='add'>+		  x1, x2, y1, y2, clock-&gt;sof_offset);</div><div class='add'>+</div><div class='add'>+	/* Second step, SOF to host clock conversion. */</div><div class='add'>+	ts = timespec_sub(last-&gt;host_ts, first-&gt;host_ts);</div><div class='add'>+	x1 = (uvc_video_clock_host_sof(first) + 2048) &lt;&lt; 16;</div><div class='add'>+	x2 = (uvc_video_clock_host_sof(last) + 2048) &lt;&lt; 16;</div><div class='add'>+	y1 = NSEC_PER_SEC;</div><div class='add'>+	y2 = (ts.tv_sec + 1) * NSEC_PER_SEC + ts.tv_nsec;</div><div class='add'>+</div><div class='add'>+	if (x2 &lt; x1)</div><div class='add'>+		x2 += 2048 &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	/* Interpolated and host SOF timestamps can wrap around at slightly</div><div class='add'>+	 * different times. Handle this by adding or removing 2048 to or from</div><div class='add'>+	 * the computed SOF value to keep it close to the SOF samples mean</div><div class='add'>+	 * value.</div><div class='add'>+	 */</div><div class='add'>+	mean = (x1 + x2) / 2;</div><div class='add'>+	if (mean - (1024 &lt;&lt; 16) &gt; sof)</div><div class='add'>+		sof += 2048 &lt;&lt; 16;</div><div class='add'>+	else if (sof &gt; mean + (1024 &lt;&lt; 16))</div><div class='add'>+		sof -= 2048 &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	y = (u64)(y2 - y1) * (u64)sof + (u64)y1 * (u64)x2</div><div class='add'>+	  - (u64)y2 * (u64)x1;</div><div class='add'>+	y = div_u64(y, x2 - x1);</div><div class='add'>+</div><div class='add'>+	div = div_u64_rem(y, NSEC_PER_SEC, &amp;rem);</div><div class='add'>+	ts.tv_sec = first-&gt;host_ts.tv_sec - 1 + div;</div><div class='add'>+	ts.tv_nsec = first-&gt;host_ts.tv_nsec + rem;</div><div class='add'>+	if (ts.tv_nsec &gt;= NSEC_PER_SEC) {</div><div class='add'>+		ts.tv_sec++;</div><div class='add'>+		ts.tv_nsec -= NSEC_PER_SEC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uvc_trace(UVC_TRACE_CLOCK, "%s: SOF %u.%06llu y %llu ts %lu.%06lu "</div><div class='add'>+		  "buf ts %lu.%06lu (x1 %u/%u/%u x2 %u/%u/%u y1 %u y2 %u)\n",</div><div class='add'>+		  stream-&gt;dev-&gt;name,</div><div class='add'>+		  sof &gt;&gt; 16, div_u64(((u64)sof &amp; 0xffff) * 1000000LLU, 65536),</div><div class='add'>+		  y, ts.tv_sec, ts.tv_nsec / NSEC_PER_USEC,</div><div class='add'>+		  v4l2_buf-&gt;timestamp.tv_sec, v4l2_buf-&gt;timestamp.tv_usec,</div><div class='add'>+		  x1, first-&gt;host_sof, first-&gt;dev_sof,</div><div class='add'>+		  x2, last-&gt;host_sof, last-&gt;dev_sof, y1, y2);</div><div class='add'>+</div><div class='add'>+	/* Update the V4L2 buffer. */</div><div class='add'>+	v4l2_buf-&gt;timestamp.tv_sec = ts.tv_sec;</div><div class='add'>+	v4l2_buf-&gt;timestamp.tv_usec = ts.tv_nsec / NSEC_PER_USEC;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	spin_unlock_irqrestore(&amp;stream-&gt;clock.lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* ------------------------------------------------------------------------</div><div class='del'>- * Video codecs</div><div class='add'>+ * Stream statistics</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* Values for bmHeaderInfo (Video and Still Image Payload Headers, 2.4.3.3) */</div><div class='del'>-#define UVC_STREAM_EOH	(1 &lt;&lt; 7)</div><div class='del'>-#define UVC_STREAM_ERR	(1 &lt;&lt; 6)</div><div class='del'>-#define UVC_STREAM_STI	(1 &lt;&lt; 5)</div><div class='del'>-#define UVC_STREAM_RES	(1 &lt;&lt; 4)</div><div class='del'>-#define UVC_STREAM_SCR	(1 &lt;&lt; 3)</div><div class='del'>-#define UVC_STREAM_PTS	(1 &lt;&lt; 2)</div><div class='del'>-#define UVC_STREAM_EOF	(1 &lt;&lt; 1)</div><div class='del'>-#define UVC_STREAM_FID	(1 &lt;&lt; 0)</div><div class='add'>+static void uvc_video_stats_decode(struct uvc_streaming *stream,</div><div class='add'>+		const __u8 *data, int len)</div><div class='add'>+{</div><div class='add'>+	unsigned int header_size;</div><div class='add'>+	bool has_pts = false;</div><div class='add'>+	bool has_scr = false;</div><div class='add'>+	u16 uninitialized_var(scr_sof);</div><div class='add'>+	u32 uninitialized_var(scr_stc);</div><div class='add'>+	u32 uninitialized_var(pts);</div><div class='add'>+</div><div class='add'>+	if (stream-&gt;stats.stream.nb_frames == 0 &amp;&amp;</div><div class='add'>+	    stream-&gt;stats.frame.nb_packets == 0)</div><div class='add'>+		ktime_get_ts(&amp;stream-&gt;stats.stream.start_ts);</div><div class='add'>+</div><div class='add'>+	switch (data[1] &amp; (UVC_STREAM_PTS | UVC_STREAM_SCR)) {</div><div class='add'>+	case UVC_STREAM_PTS | UVC_STREAM_SCR:</div><div class='add'>+		header_size = 12;</div><div class='add'>+		has_pts = true;</div><div class='add'>+		has_scr = true;</div><div class='add'>+		break;</div><div class='add'>+	case UVC_STREAM_PTS:</div><div class='add'>+		header_size = 6;</div><div class='add'>+		has_pts = true;</div><div class='add'>+		break;</div><div class='add'>+	case UVC_STREAM_SCR:</div><div class='add'>+		header_size = 8;</div><div class='add'>+		has_scr = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		header_size = 2;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for invalid headers. */</div><div class='add'>+	if (len &lt; header_size || data[0] &lt; header_size) {</div><div class='add'>+		stream-&gt;stats.frame.nb_invalid++;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Extract the timestamps. */</div><div class='add'>+	if (has_pts)</div><div class='add'>+		pts = get_unaligned_le32(&amp;data[2]);</div><div class='add'>+</div><div class='add'>+	if (has_scr) {</div><div class='add'>+		scr_stc = get_unaligned_le32(&amp;data[header_size - 6]);</div><div class='add'>+		scr_sof = get_unaligned_le16(&amp;data[header_size - 2]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Is PTS constant through the whole frame ? */</div><div class='add'>+	if (has_pts &amp;&amp; stream-&gt;stats.frame.nb_pts) {</div><div class='add'>+		if (stream-&gt;stats.frame.pts != pts) {</div><div class='add'>+			stream-&gt;stats.frame.nb_pts_diffs++;</div><div class='add'>+			stream-&gt;stats.frame.last_pts_diff =</div><div class='add'>+				stream-&gt;stats.frame.nb_packets;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (has_pts) {</div><div class='add'>+		stream-&gt;stats.frame.nb_pts++;</div><div class='add'>+		stream-&gt;stats.frame.pts = pts;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Do all frames have a PTS in their first non-empty packet, or before</div><div class='add'>+	 * their first empty packet ?</div><div class='add'>+	 */</div><div class='add'>+	if (stream-&gt;stats.frame.size == 0) {</div><div class='add'>+		if (len &gt; header_size)</div><div class='add'>+			stream-&gt;stats.frame.has_initial_pts = has_pts;</div><div class='add'>+		if (len == header_size &amp;&amp; has_pts)</div><div class='add'>+			stream-&gt;stats.frame.has_early_pts = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Do the SCR.STC and SCR.SOF fields vary through the frame ? */</div><div class='add'>+	if (has_scr &amp;&amp; stream-&gt;stats.frame.nb_scr) {</div><div class='add'>+		if (stream-&gt;stats.frame.scr_stc != scr_stc)</div><div class='add'>+			stream-&gt;stats.frame.nb_scr_diffs++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (has_scr) {</div><div class='add'>+		/* Expand the SOF counter to 32 bits and store its value. */</div><div class='add'>+		if (stream-&gt;stats.stream.nb_frames &gt; 0 ||</div><div class='add'>+		    stream-&gt;stats.frame.nb_scr &gt; 0)</div><div class='add'>+			stream-&gt;stats.stream.scr_sof_count +=</div><div class='add'>+				(scr_sof - stream-&gt;stats.stream.scr_sof) % 2048;</div><div class='add'>+		stream-&gt;stats.stream.scr_sof = scr_sof;</div><div class='add'>+</div><div class='add'>+		stream-&gt;stats.frame.nb_scr++;</div><div class='add'>+		stream-&gt;stats.frame.scr_stc = scr_stc;</div><div class='add'>+		stream-&gt;stats.frame.scr_sof = scr_sof;</div><div class='add'>+</div><div class='add'>+		if (scr_sof &lt; stream-&gt;stats.stream.min_sof)</div><div class='add'>+			stream-&gt;stats.stream.min_sof = scr_sof;</div><div class='add'>+		if (scr_sof &gt; stream-&gt;stats.stream.max_sof)</div><div class='add'>+			stream-&gt;stats.stream.max_sof = scr_sof;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Record the first non-empty packet number. */</div><div class='add'>+	if (stream-&gt;stats.frame.size == 0 &amp;&amp; len &gt; header_size)</div><div class='add'>+		stream-&gt;stats.frame.first_data = stream-&gt;stats.frame.nb_packets;</div><div class='add'>+</div><div class='add'>+	/* Update the frame size. */</div><div class='add'>+	stream-&gt;stats.frame.size += len - header_size;</div><div class='add'>+</div><div class='add'>+	/* Update the packets counters. */</div><div class='add'>+	stream-&gt;stats.frame.nb_packets++;</div><div class='add'>+	if (len &gt; header_size)</div><div class='add'>+		stream-&gt;stats.frame.nb_empty++;</div><div class='add'>+</div><div class='add'>+	if (data[1] &amp; UVC_STREAM_ERR)</div><div class='add'>+		stream-&gt;stats.frame.nb_errors++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void uvc_video_stats_update(struct uvc_streaming *stream)</div><div class='add'>+{</div><div class='add'>+	struct uvc_stats_frame *frame = &amp;stream-&gt;stats.frame;</div><div class='add'>+</div><div class='add'>+	uvc_trace(UVC_TRACE_STATS, "frame %u stats: %u/%u/%u packets, "</div><div class='add'>+		  "%u/%u/%u pts (%searly %sinitial), %u/%u scr, "</div><div class='add'>+		  "last pts/stc/sof %u/%u/%u\n",</div><div class='add'>+		  stream-&gt;sequence, frame-&gt;first_data,</div><div class='add'>+		  frame-&gt;nb_packets - frame-&gt;nb_empty, frame-&gt;nb_packets,</div><div class='add'>+		  frame-&gt;nb_pts_diffs, frame-&gt;last_pts_diff, frame-&gt;nb_pts,</div><div class='add'>+		  frame-&gt;has_early_pts ? "" : "!",</div><div class='add'>+		  frame-&gt;has_initial_pts ? "" : "!",</div><div class='add'>+		  frame-&gt;nb_scr_diffs, frame-&gt;nb_scr,</div><div class='add'>+		  frame-&gt;pts, frame-&gt;scr_stc, frame-&gt;scr_sof);</div><div class='add'>+</div><div class='add'>+	stream-&gt;stats.stream.nb_frames++;</div><div class='add'>+	stream-&gt;stats.stream.nb_packets += stream-&gt;stats.frame.nb_packets;</div><div class='add'>+	stream-&gt;stats.stream.nb_empty += stream-&gt;stats.frame.nb_empty;</div><div class='add'>+	stream-&gt;stats.stream.nb_errors += stream-&gt;stats.frame.nb_errors;</div><div class='add'>+	stream-&gt;stats.stream.nb_invalid += stream-&gt;stats.frame.nb_invalid;</div><div class='add'>+</div><div class='add'>+	if (frame-&gt;has_early_pts)</div><div class='add'>+		stream-&gt;stats.stream.nb_pts_early++;</div><div class='add'>+	if (frame-&gt;has_initial_pts)</div><div class='add'>+		stream-&gt;stats.stream.nb_pts_initial++;</div><div class='add'>+	if (frame-&gt;last_pts_diff &lt;= frame-&gt;first_data)</div><div class='add'>+		stream-&gt;stats.stream.nb_pts_constant++;</div><div class='add'>+	if (frame-&gt;nb_scr &gt;= frame-&gt;nb_packets - frame-&gt;nb_empty)</div><div class='add'>+		stream-&gt;stats.stream.nb_scr_count_ok++;</div><div class='add'>+	if (frame-&gt;nb_scr_diffs + 1 == frame-&gt;nb_scr)</div><div class='add'>+		stream-&gt;stats.stream.nb_scr_diffs_ok++;</div><div class='add'>+</div><div class='add'>+	memset(&amp;stream-&gt;stats.frame, 0, sizeof(stream-&gt;stats.frame));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+size_t uvc_video_stats_dump(struct uvc_streaming *stream, char *buf,</div><div class='add'>+			    size_t size)</div><div class='add'>+{</div><div class='add'>+	unsigned int scr_sof_freq;</div><div class='add'>+	unsigned int duration;</div><div class='add'>+	struct timespec ts;</div><div class='add'>+	size_t count = 0;</div><div class='add'>+</div><div class='add'>+	ts.tv_sec = stream-&gt;stats.stream.stop_ts.tv_sec</div><div class='add'>+		  - stream-&gt;stats.stream.start_ts.tv_sec;</div><div class='add'>+	ts.tv_nsec = stream-&gt;stats.stream.stop_ts.tv_nsec</div><div class='add'>+		   - stream-&gt;stats.stream.start_ts.tv_nsec;</div><div class='add'>+	if (ts.tv_nsec &lt; 0) {</div><div class='add'>+		ts.tv_sec--;</div><div class='add'>+		ts.tv_nsec += 1000000000;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Compute the SCR.SOF frequency estimate. At the nominal 1kHz SOF</div><div class='add'>+	 * frequency this will not overflow before more than 1h.</div><div class='add'>+	 */</div><div class='add'>+	duration = ts.tv_sec * 1000 + ts.tv_nsec / 1000000;</div><div class='add'>+	if (duration != 0)</div><div class='add'>+		scr_sof_freq = stream-&gt;stats.stream.scr_sof_count * 1000</div><div class='add'>+			     / duration;</div><div class='add'>+	else</div><div class='add'>+		scr_sof_freq = 0;</div><div class='add'>+</div><div class='add'>+	count += scnprintf(buf + count, size - count,</div><div class='add'>+			   "frames:  %u\npackets: %u\nempty:   %u\n"</div><div class='add'>+			   "errors:  %u\ninvalid: %u\n",</div><div class='add'>+			   stream-&gt;stats.stream.nb_frames,</div><div class='add'>+			   stream-&gt;stats.stream.nb_packets,</div><div class='add'>+			   stream-&gt;stats.stream.nb_empty,</div><div class='add'>+			   stream-&gt;stats.stream.nb_errors,</div><div class='add'>+			   stream-&gt;stats.stream.nb_invalid);</div><div class='add'>+	count += scnprintf(buf + count, size - count,</div><div class='add'>+			   "pts: %u early, %u initial, %u ok\n",</div><div class='add'>+			   stream-&gt;stats.stream.nb_pts_early,</div><div class='add'>+			   stream-&gt;stats.stream.nb_pts_initial,</div><div class='add'>+			   stream-&gt;stats.stream.nb_pts_constant);</div><div class='add'>+	count += scnprintf(buf + count, size - count,</div><div class='add'>+			   "scr: %u count ok, %u diff ok\n",</div><div class='add'>+			   stream-&gt;stats.stream.nb_scr_count_ok,</div><div class='add'>+			   stream-&gt;stats.stream.nb_scr_diffs_ok);</div><div class='add'>+	count += scnprintf(buf + count, size - count,</div><div class='add'>+			   "sof: %u &lt;= sof &lt;= %u, freq %u.%03u kHz\n",</div><div class='add'>+			   stream-&gt;stats.stream.min_sof,</div><div class='add'>+			   stream-&gt;stats.stream.max_sof,</div><div class='add'>+			   scr_sof_freq / 1000, scr_sof_freq % 1000);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void uvc_video_stats_start(struct uvc_streaming *stream)</div><div class='add'>+{</div><div class='add'>+	memset(&amp;stream-&gt;stats, 0, sizeof(stream-&gt;stats));</div><div class='add'>+	stream-&gt;stats.stream.min_sof = 2048;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void uvc_video_stats_stop(struct uvc_streaming *stream)</div><div class='add'>+{</div><div class='add'>+	ktime_get_ts(&amp;stream-&gt;stats.stream.stop_ts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ------------------------------------------------------------------------</div><div class='add'>+ * Video codecs</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> /* Video payload decoding is handled by uvc_video_decode_start(),</div><div class='ctx'>  * uvc_video_decode_data() and uvc_video_decode_end().</div><div class='hunk'>@@ -416,14 +944,9 @@ static int uvc_video_decode_start(struct uvc_streaming *stream,</div><div class='ctx'> 	 * - bHeaderLength value must be at least 2 bytes (see above)</div><div class='ctx'> 	 * - bHeaderLength value can't be larger than the packet size.</div><div class='ctx'> 	 */</div><div class='del'>-	if (len &lt; 2 || data[0] &lt; 2 || data[0] &gt; len)</div><div class='add'>+	if (len &lt; 2 || data[0] &lt; 2 || data[0] &gt; len) {</div><div class='add'>+		stream-&gt;stats.frame.nb_invalid++;</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Skip payloads marked with the error bit ("error frames"). */</div><div class='del'>-	if (data[1] &amp; UVC_STREAM_ERR) {</div><div class='del'>-		uvc_trace(UVC_TRACE_FRAME, "Dropping payload (error bit "</div><div class='del'>-			  "set).\n");</div><div class='del'>-		return -ENODATA;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fid = data[1] &amp; UVC_STREAM_FID;</div><div class='hunk'>@@ -431,8 +954,14 @@ static int uvc_video_decode_start(struct uvc_streaming *stream,</div><div class='ctx'> 	/* Increase the sequence number regardless of any buffer states, so</div><div class='ctx'> 	 * that discontinuous sequence numbers always indicate lost frames.</div><div class='ctx'> 	 */</div><div class='del'>-	if (stream-&gt;last_fid != fid)</div><div class='add'>+	if (stream-&gt;last_fid != fid) {</div><div class='ctx'> 		stream-&gt;sequence++;</div><div class='add'>+		if (stream-&gt;sequence)</div><div class='add'>+			uvc_video_stats_update(stream);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uvc_video_clock_decode(stream, buf, data, len);</div><div class='add'>+	uvc_video_stats_decode(stream, data, len);</div><div class='ctx'> </div><div class='ctx'> 	/* Store the payload FID bit and return immediately when the buffer is</div><div class='ctx'> 	 * NULL.</div><div class='hunk'>@@ -442,6 +971,13 @@ static int uvc_video_decode_start(struct uvc_streaming *stream,</div><div class='ctx'> 		return -ENODATA;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Mark the buffer as bad if the error bit is set. */</div><div class='add'>+	if (data[1] &amp; UVC_STREAM_ERR) {</div><div class='add'>+		uvc_trace(UVC_TRACE_FRAME, "Marking buffer as bad (error bit "</div><div class='add'>+			  "set).\n");</div><div class='add'>+		buf-&gt;error = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Synchronize to the input stream by waiting for the FID bit to be</div><div class='ctx'> 	 * toggled when the the buffer state is not UVC_BUF_STATE_ACTIVE.</div><div class='ctx'> 	 * stream-&gt;last_fid is initialized to -1, so the first isochronous</div><div class='hunk'>@@ -467,9 +1003,10 @@ static int uvc_video_decode_start(struct uvc_streaming *stream,</div><div class='ctx'> 		else</div><div class='ctx'> 			ktime_get_real_ts(&amp;ts);</div><div class='ctx'> </div><div class='del'>-		buf-&gt;buf.sequence = stream-&gt;sequence;</div><div class='del'>-		buf-&gt;buf.timestamp.tv_sec = ts.tv_sec;</div><div class='del'>-		buf-&gt;buf.timestamp.tv_usec = ts.tv_nsec / NSEC_PER_USEC;</div><div class='add'>+		buf-&gt;buf.v4l2_buf.sequence = stream-&gt;sequence;</div><div class='add'>+		buf-&gt;buf.v4l2_buf.timestamp.tv_sec = ts.tv_sec;</div><div class='add'>+		buf-&gt;buf.v4l2_buf.timestamp.tv_usec =</div><div class='add'>+			ts.tv_nsec / NSEC_PER_USEC;</div><div class='ctx'> </div><div class='ctx'> 		/* TODO: Handle PTS and SCR. */</div><div class='ctx'> 		buf-&gt;state = UVC_BUF_STATE_ACTIVE;</div><div class='hunk'>@@ -490,7 +1027,7 @@ static int uvc_video_decode_start(struct uvc_streaming *stream,</div><div class='ctx'> 	 * avoids detecting end of frame conditions at FID toggling if the</div><div class='ctx'> 	 * previous payload had the EOF bit set.</div><div class='ctx'> 	 */</div><div class='del'>-	if (fid != stream-&gt;last_fid &amp;&amp; buf-&gt;buf.bytesused != 0) {</div><div class='add'>+	if (fid != stream-&gt;last_fid &amp;&amp; buf-&gt;bytesused != 0) {</div><div class='ctx'> 		uvc_trace(UVC_TRACE_FRAME, "Frame complete (FID bit "</div><div class='ctx'> 				"toggled).\n");</div><div class='ctx'> 		buf-&gt;state = UVC_BUF_STATE_READY;</div><div class='hunk'>@@ -505,7 +1042,6 @@ static int uvc_video_decode_start(struct uvc_streaming *stream,</div><div class='ctx'> static void uvc_video_decode_data(struct uvc_streaming *stream,</div><div class='ctx'> 		struct uvc_buffer *buf, const __u8 *data, int len)</div><div class='ctx'> {</div><div class='del'>-	struct uvc_video_queue *queue = &amp;stream-&gt;queue;</div><div class='ctx'> 	unsigned int maxlen, nbytes;</div><div class='ctx'> 	void *mem;</div><div class='ctx'> </div><div class='hunk'>@@ -513,11 +1049,11 @@ static void uvc_video_decode_data(struct uvc_streaming *stream,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Copy the video data to the buffer. */</div><div class='del'>-	maxlen = buf-&gt;buf.length - buf-&gt;buf.bytesused;</div><div class='del'>-	mem = queue-&gt;mem + buf-&gt;buf.m.offset + buf-&gt;buf.bytesused;</div><div class='add'>+	maxlen = buf-&gt;length - buf-&gt;bytesused;</div><div class='add'>+	mem = buf-&gt;mem + buf-&gt;bytesused;</div><div class='ctx'> 	nbytes = min((unsigned int)len, maxlen);</div><div class='ctx'> 	memcpy(mem, data, nbytes);</div><div class='del'>-	buf-&gt;buf.bytesused += nbytes;</div><div class='add'>+	buf-&gt;bytesused += nbytes;</div><div class='ctx'> </div><div class='ctx'> 	/* Complete the current frame if the buffer size was exceeded. */</div><div class='ctx'> 	if (len &gt; maxlen) {</div><div class='hunk'>@@ -530,7 +1066,7 @@ static void uvc_video_decode_end(struct uvc_streaming *stream,</div><div class='ctx'> 		struct uvc_buffer *buf, const __u8 *data, int len)</div><div class='ctx'> {</div><div class='ctx'> 	/* Mark the buffer as done if the EOF marker is set. */</div><div class='del'>-	if (data[1] &amp; UVC_STREAM_EOF &amp;&amp; buf-&gt;buf.bytesused != 0) {</div><div class='add'>+	if (data[1] &amp; UVC_STREAM_EOF &amp;&amp; buf-&gt;bytesused != 0) {</div><div class='ctx'> 		uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n");</div><div class='ctx'> 		if (data[0] == len)</div><div class='ctx'> 			uvc_trace(UVC_TRACE_FRAME, "EOF in empty payload.\n");</div><div class='hunk'>@@ -568,8 +1104,8 @@ static int uvc_video_encode_data(struct uvc_streaming *stream,</div><div class='ctx'> 	void *mem;</div><div class='ctx'> </div><div class='ctx'> 	/* Copy video data to the URB buffer. */</div><div class='del'>-	mem = queue-&gt;mem + buf-&gt;buf.m.offset + queue-&gt;buf_used;</div><div class='del'>-	nbytes = min((unsigned int)len, buf-&gt;buf.bytesused - queue-&gt;buf_used);</div><div class='add'>+	mem = buf-&gt;mem + queue-&gt;buf_used;</div><div class='add'>+	nbytes = min((unsigned int)len, buf-&gt;bytesused - queue-&gt;buf_used);</div><div class='ctx'> 	nbytes = min(stream-&gt;bulk.max_payload_size - stream-&gt;bulk.payload_size,</div><div class='ctx'> 			nbytes);</div><div class='ctx'> 	memcpy(data, mem, nbytes);</div><div class='hunk'>@@ -624,7 +1160,7 @@ static void uvc_video_decode_isoc(struct urb *urb, struct uvc_streaming *stream,</div><div class='ctx'> 			urb-&gt;iso_frame_desc[i].actual_length);</div><div class='ctx'> </div><div class='ctx'> 		if (buf-&gt;state == UVC_BUF_STATE_READY) {</div><div class='del'>-			if (buf-&gt;buf.length != buf-&gt;buf.bytesused &amp;&amp;</div><div class='add'>+			if (buf-&gt;length != buf-&gt;bytesused &amp;&amp;</div><div class='ctx'> 			    !(stream-&gt;cur_format-&gt;flags &amp;</div><div class='ctx'> 			      UVC_FMT_FLAG_COMPRESSED))</div><div class='ctx'> 				buf-&gt;error = 1;</div><div class='hunk'>@@ -724,12 +1260,12 @@ static void uvc_video_encode_bulk(struct urb *urb, struct uvc_streaming *stream,</div><div class='ctx'> 	stream-&gt;bulk.payload_size += ret;</div><div class='ctx'> 	len -= ret;</div><div class='ctx'> </div><div class='del'>-	if (buf-&gt;buf.bytesused == stream-&gt;queue.buf_used ||</div><div class='add'>+	if (buf-&gt;bytesused == stream-&gt;queue.buf_used ||</div><div class='ctx'> 	    stream-&gt;bulk.payload_size == stream-&gt;bulk.max_payload_size) {</div><div class='del'>-		if (buf-&gt;buf.bytesused == stream-&gt;queue.buf_used) {</div><div class='add'>+		if (buf-&gt;bytesused == stream-&gt;queue.buf_used) {</div><div class='ctx'> 			stream-&gt;queue.buf_used = 0;</div><div class='ctx'> 			buf-&gt;state = UVC_BUF_STATE_READY;</div><div class='del'>-			buf-&gt;buf.sequence = ++stream-&gt;sequence;</div><div class='add'>+			buf-&gt;buf.v4l2_buf.sequence = ++stream-&gt;sequence;</div><div class='ctx'> 			uvc_queue_next_buffer(&amp;stream-&gt;queue, buf);</div><div class='ctx'> 			stream-&gt;last_fid ^= UVC_STREAM_FID;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -870,6 +1406,8 @@ static void uvc_uninit_video(struct uvc_streaming *stream, int free_buffers)</div><div class='ctx'> 	struct urb *urb;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='add'>+	uvc_video_stats_stop(stream);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; UVC_URBS; ++i) {</div><div class='ctx'> 		urb = stream-&gt;urb[i];</div><div class='ctx'> 		if (urb == NULL)</div><div class='hunk'>@@ -882,6 +1420,8 @@ static void uvc_uninit_video(struct uvc_streaming *stream, int free_buffers)</div><div class='ctx'> </div><div class='ctx'> 	if (free_buffers)</div><div class='ctx'> 		uvc_free_urb_buffers(stream);</div><div class='add'>+</div><div class='add'>+	uvc_video_clock_cleanup(stream);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1009,6 +1549,12 @@ static int uvc_init_video(struct uvc_streaming *stream, gfp_t gfp_flags)</div><div class='ctx'> 	stream-&gt;bulk.skip_payload = 0;</div><div class='ctx'> 	stream-&gt;bulk.payload_size = 0;</div><div class='ctx'> </div><div class='add'>+	uvc_video_stats_start(stream);</div><div class='add'>+</div><div class='add'>+	ret = uvc_video_clock_init(stream);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	if (intf-&gt;num_altsetting &gt; 1) {</div><div class='ctx'> 		struct usb_host_endpoint *best_ep = NULL;</div><div class='ctx'> 		unsigned int best_psize = 3 * 1024;</div><div class='hunk'>@@ -1283,6 +1829,11 @@ int uvc_video_enable(struct uvc_streaming *stream, int enable)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return uvc_init_video(stream, GFP_KERNEL);</div><div class='del'>-}</div><div class='add'>+	ret = uvc_init_video(stream, GFP_KERNEL);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		usb_set_interface(stream-&gt;dev-&gt;udev, stream-&gt;intfnum, 0);</div><div class='add'>+		uvc_queue_enable(&amp;stream-&gt;queue, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h<br/>index 4c1392ebcd4b..67f88d85bb16 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvcvideo.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/uvc/uvcvideo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/uvc/uvcvideo.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/uvc/uvcvideo.h</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</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='add'>+#include &lt;media/videobuf2-core.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='ctx'>  * UVC constants</div><div class='hunk'>@@ -113,6 +114,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Maximum allowed number of control mappings per device */</div><div class='ctx'> #define UVC_MAX_CONTROL_MAPPINGS	1024</div><div class='add'>+#define UVC_MAX_CONTROL_MENU_ENTRIES	32</div><div class='ctx'> </div><div class='ctx'> /* Devices quirks */</div><div class='ctx'> #define UVC_QUIRK_STATUS_INTERVAL	0x00000001</div><div class='hunk'>@@ -319,35 +321,30 @@ enum uvc_buffer_state {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct uvc_buffer {</div><div class='del'>-	unsigned long vma_use_count;</div><div class='del'>-	struct list_head stream;</div><div class='del'>-</div><div class='del'>-	/* Touched by interrupt handler. */</div><div class='del'>-	struct v4l2_buffer buf;</div><div class='add'>+	struct vb2_buffer buf;</div><div class='ctx'> 	struct list_head queue;</div><div class='del'>-	wait_queue_head_t wait;</div><div class='add'>+</div><div class='ctx'> 	enum uvc_buffer_state state;</div><div class='ctx'> 	unsigned int error;</div><div class='add'>+</div><div class='add'>+	void *mem;</div><div class='add'>+	unsigned int length;</div><div class='add'>+	unsigned int bytesused;</div><div class='add'>+</div><div class='add'>+	u32 pts;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define UVC_QUEUE_STREAMING		(1 &lt;&lt; 0)</div><div class='del'>-#define UVC_QUEUE_DISCONNECTED		(1 &lt;&lt; 1)</div><div class='del'>-#define UVC_QUEUE_DROP_CORRUPTED	(1 &lt;&lt; 2)</div><div class='add'>+#define UVC_QUEUE_DISCONNECTED		(1 &lt;&lt; 0)</div><div class='add'>+#define UVC_QUEUE_DROP_CORRUPTED	(1 &lt;&lt; 1)</div><div class='ctx'> </div><div class='ctx'> struct uvc_video_queue {</div><div class='del'>-	enum v4l2_buf_type type;</div><div class='add'>+	struct vb2_queue queue;</div><div class='add'>+	struct mutex mutex;			/* Protects queue */</div><div class='ctx'> </div><div class='del'>-	void *mem;</div><div class='ctx'> 	unsigned int flags;</div><div class='del'>-</div><div class='del'>-	unsigned int count;</div><div class='del'>-	unsigned int buf_size;</div><div class='ctx'> 	unsigned int buf_used;</div><div class='del'>-	struct uvc_buffer buffer[UVC_MAX_VIDEO_BUFFERS];</div><div class='del'>-	struct mutex mutex;	/* protects buffers and mainqueue */</div><div class='del'>-	spinlock_t irqlock;	/* protects irqqueue */</div><div class='ctx'> </div><div class='del'>-	struct list_head mainqueue;</div><div class='add'>+	spinlock_t irqlock;			/* Protects irqqueue */</div><div class='ctx'> 	struct list_head irqqueue;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -362,6 +359,51 @@ struct uvc_video_chain {</div><div class='ctx'> 	struct mutex ctrl_mutex;		/* Protects ctrl.info */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct uvc_stats_frame {</div><div class='add'>+	unsigned int size;		/* Number of bytes captured */</div><div class='add'>+	unsigned int first_data;	/* Index of the first non-empty packet */</div><div class='add'>+</div><div class='add'>+	unsigned int nb_packets;	/* Number of packets */</div><div class='add'>+	unsigned int nb_empty;		/* Number of empty packets */</div><div class='add'>+	unsigned int nb_invalid;	/* Number of packets with an invalid header */</div><div class='add'>+	unsigned int nb_errors;		/* Number of packets with the error bit set */</div><div class='add'>+</div><div class='add'>+	unsigned int nb_pts;		/* Number of packets with a PTS timestamp */</div><div class='add'>+	unsigned int nb_pts_diffs;	/* Number of PTS differences inside a frame */</div><div class='add'>+	unsigned int last_pts_diff;	/* Index of the last PTS difference */</div><div class='add'>+	bool has_initial_pts;		/* Whether the first non-empty packet has a PTS */</div><div class='add'>+	bool has_early_pts;		/* Whether a PTS is present before the first non-empty packet */</div><div class='add'>+	u32 pts;			/* PTS of the last packet */</div><div class='add'>+</div><div class='add'>+	unsigned int nb_scr;		/* Number of packets with a SCR timestamp */</div><div class='add'>+	unsigned int nb_scr_diffs;	/* Number of SCR.STC differences inside a frame */</div><div class='add'>+	u16 scr_sof;			/* SCR.SOF of the last packet */</div><div class='add'>+	u32 scr_stc;			/* SCR.STC of the last packet */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct uvc_stats_stream {</div><div class='add'>+	struct timespec start_ts;	/* Stream start timestamp */</div><div class='add'>+	struct timespec stop_ts;	/* Stream stop timestamp */</div><div class='add'>+</div><div class='add'>+	unsigned int nb_frames;		/* Number of frames */</div><div class='add'>+</div><div class='add'>+	unsigned int nb_packets;	/* Number of packets */</div><div class='add'>+	unsigned int nb_empty;		/* Number of empty packets */</div><div class='add'>+	unsigned int nb_invalid;	/* Number of packets with an invalid header */</div><div class='add'>+	unsigned int nb_errors;		/* Number of packets with the error bit set */</div><div class='add'>+</div><div class='add'>+	unsigned int nb_pts_constant;	/* Number of frames with constant PTS */</div><div class='add'>+	unsigned int nb_pts_early;	/* Number of frames with early PTS */</div><div class='add'>+	unsigned int nb_pts_initial;	/* Number of frames with initial PTS */</div><div class='add'>+</div><div class='add'>+	unsigned int nb_scr_count_ok;	/* Number of frames with at least one SCR per non empty packet */</div><div class='add'>+	unsigned int nb_scr_diffs_ok;	/* Number of frames with varying SCR.STC */</div><div class='add'>+	unsigned int scr_sof_count;	/* STC.SOF counter accumulated since stream start */</div><div class='add'>+	unsigned int scr_sof;		/* STC.SOF of the last packet */</div><div class='add'>+	unsigned int min_sof;		/* Minimum STC.SOF value */</div><div class='add'>+	unsigned int max_sof;		/* Maximum STC.SOF value */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct uvc_streaming {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	struct uvc_device *dev;</div><div class='hunk'>@@ -387,6 +429,7 @@ struct uvc_streaming {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct mutex mutex;</div><div class='ctx'> </div><div class='add'>+	/* Buffers queue. */</div><div class='ctx'> 	unsigned int frozen : 1;</div><div class='ctx'> 	struct uvc_video_queue queue;</div><div class='ctx'> 	void (*decode) (struct urb *urb, struct uvc_streaming *video,</div><div class='hunk'>@@ -408,6 +451,32 @@ struct uvc_streaming {</div><div class='ctx'> </div><div class='ctx'> 	__u32 sequence;</div><div class='ctx'> 	__u8 last_fid;</div><div class='add'>+</div><div class='add'>+	/* debugfs */</div><div class='add'>+	struct dentry *debugfs_dir;</div><div class='add'>+	struct {</div><div class='add'>+		struct uvc_stats_frame frame;</div><div class='add'>+		struct uvc_stats_stream stream;</div><div class='add'>+	} stats;</div><div class='add'>+</div><div class='add'>+	/* Timestamps support. */</div><div class='add'>+	struct uvc_clock {</div><div class='add'>+		struct uvc_clock_sample {</div><div class='add'>+			u32 dev_stc;</div><div class='add'>+			u16 dev_sof;</div><div class='add'>+			struct timespec host_ts;</div><div class='add'>+			u16 host_sof;</div><div class='add'>+		} *samples;</div><div class='add'>+</div><div class='add'>+		unsigned int head;</div><div class='add'>+		unsigned int count;</div><div class='add'>+		unsigned int size;</div><div class='add'>+</div><div class='add'>+		u16 last_sof;</div><div class='add'>+		u16 sof_offset;</div><div class='add'>+</div><div class='add'>+		spinlock_t lock;</div><div class='add'>+	} clock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum uvc_device_state {</div><div class='hunk'>@@ -479,9 +548,12 @@ struct uvc_driver {</div><div class='ctx'> #define UVC_TRACE_SUSPEND	(1 &lt;&lt; 8)</div><div class='ctx'> #define UVC_TRACE_STATUS	(1 &lt;&lt; 9)</div><div class='ctx'> #define UVC_TRACE_VIDEO		(1 &lt;&lt; 10)</div><div class='add'>+#define UVC_TRACE_STATS		(1 &lt;&lt; 11)</div><div class='add'>+#define UVC_TRACE_CLOCK		(1 &lt;&lt; 12)</div><div class='ctx'> </div><div class='ctx'> #define UVC_WARN_MINMAX		0</div><div class='ctx'> #define UVC_WARN_PROBE_DEF	1</div><div class='add'>+#define UVC_WARN_XU_GET_RES	2</div><div class='ctx'> </div><div class='ctx'> extern unsigned int uvc_clock_param;</div><div class='ctx'> extern unsigned int uvc_no_drop_param;</div><div class='hunk'>@@ -516,8 +588,8 @@ extern struct uvc_entity *uvc_entity_by_id(struct uvc_device *dev, int id);</div><div class='ctx'> extern void uvc_queue_init(struct uvc_video_queue *queue,</div><div class='ctx'> 		enum v4l2_buf_type type, int drop_corrupted);</div><div class='ctx'> extern int uvc_alloc_buffers(struct uvc_video_queue *queue,</div><div class='del'>-		unsigned int nbuffers, unsigned int buflength);</div><div class='del'>-extern int uvc_free_buffers(struct uvc_video_queue *queue);</div><div class='add'>+		struct v4l2_requestbuffers *rb);</div><div class='add'>+extern void uvc_free_buffers(struct uvc_video_queue *queue);</div><div class='ctx'> extern int uvc_query_buffer(struct uvc_video_queue *queue,</div><div class='ctx'> 		struct v4l2_buffer *v4l2_buf);</div><div class='ctx'> extern int uvc_queue_buffer(struct uvc_video_queue *queue,</div><div class='hunk'>@@ -539,7 +611,7 @@ extern unsigned long uvc_queue_get_unmapped_area(struct uvc_video_queue *queue,</div><div class='ctx'> extern int uvc_queue_allocated(struct uvc_video_queue *queue);</div><div class='ctx'> static inline int uvc_queue_streaming(struct uvc_video_queue *queue)</div><div class='ctx'> {</div><div class='del'>-	return queue-&gt;flags &amp; UVC_QUEUE_STREAMING;</div><div class='add'>+	return vb2_is_streaming(&amp;queue-&gt;queue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* V4L2 interface */</div><div class='hunk'>@@ -556,10 +628,11 @@ extern int uvc_video_resume(struct uvc_streaming *stream, int reset);</div><div class='ctx'> extern int uvc_video_enable(struct uvc_streaming *stream, int enable);</div><div class='ctx'> extern int uvc_probe_video(struct uvc_streaming *stream,</div><div class='ctx'> 		struct uvc_streaming_control *probe);</div><div class='del'>-extern int uvc_commit_video(struct uvc_streaming *stream,</div><div class='del'>-		struct uvc_streaming_control *ctrl);</div><div class='ctx'> extern int uvc_query_ctrl(struct uvc_device *dev, __u8 query, __u8 unit,</div><div class='ctx'> 		__u8 intfnum, __u8 cs, void *data, __u16 size);</div><div class='add'>+void uvc_video_clock_update(struct uvc_streaming *stream,</div><div class='add'>+			    struct v4l2_buffer *v4l2_buf,</div><div class='add'>+			    struct uvc_buffer *buf);</div><div class='ctx'> </div><div class='ctx'> /* Status */</div><div class='ctx'> extern int uvc_status_init(struct uvc_device *dev);</div><div class='hunk'>@@ -612,4 +685,13 @@ extern struct usb_host_endpoint *uvc_find_endpoint(</div><div class='ctx'> void uvc_video_decode_isight(struct urb *urb, struct uvc_streaming *stream,</div><div class='ctx'> 		struct uvc_buffer *buf);</div><div class='ctx'> </div><div class='add'>+/* debugfs and statistics */</div><div class='add'>+int uvc_debugfs_init(void);</div><div class='add'>+void uvc_debugfs_cleanup(void);</div><div class='add'>+int uvc_debugfs_init_stream(struct uvc_streaming *stream);</div><div class='add'>+void uvc_debugfs_cleanup_stream(struct uvc_streaming *stream);</div><div class='add'>+</div><div class='add'>+size_t uvc_video_stats_dump(struct uvc_streaming *stream, char *buf,</div><div class='add'>+			    size_t size);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/video/v4l2-compat-ioctl32.c<br/>index c68531b88279..af4419e6c658 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/v4l2-compat-ioctl32.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/v4l2-compat-ioctl32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/v4l2-compat-ioctl32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/v4l2-compat-ioctl32.c</a></div><div class='hunk'>@@ -985,6 +985,8 @@ long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 	case VIDIOC_CROPCAP:</div><div class='ctx'> 	case VIDIOC_G_CROP:</div><div class='ctx'> 	case VIDIOC_S_CROP:</div><div class='add'>+	case VIDIOC_G_SELECTION:</div><div class='add'>+	case VIDIOC_S_SELECTION:</div><div class='ctx'> 	case VIDIOC_G_JPEGCOMP:</div><div class='ctx'> 	case VIDIOC_S_JPEGCOMP:</div><div class='ctx'> 	case VIDIOC_QUERYSTD:</div><div class='head'>diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c<br/>index 0f415dade05a..cccd42be718a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/v4l2-ctrls.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/v4l2-ctrls.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/v4l2-ctrls.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/v4l2-ctrls.c</a></div><div class='hunk'>@@ -465,8 +465,9 @@ const char *v4l2_ctrl_get_name(u32 id)</div><div class='ctx'> 	case V4L2_CID_CHROMA_GAIN:		return "Chroma Gain";</div><div class='ctx'> 	case V4L2_CID_ILLUMINATORS_1:		return "Illuminator 1";</div><div class='ctx'> 	case V4L2_CID_ILLUMINATORS_2:		return "Illuminator 2";</div><div class='del'>-	case V4L2_CID_MIN_BUFFERS_FOR_CAPTURE:	return "Minimum Number of Capture Buffers";</div><div class='del'>-	case V4L2_CID_MIN_BUFFERS_FOR_OUTPUT:	return "Minimum Number of Output Buffers";</div><div class='add'>+	case V4L2_CID_MIN_BUFFERS_FOR_CAPTURE:	return "Min Number of Capture Buffers";</div><div class='add'>+	case V4L2_CID_MIN_BUFFERS_FOR_OUTPUT:	return "Min Number of Output Buffers";</div><div class='add'>+	case V4L2_CID_ALPHA_COMPONENT:		return "Alpha Component";</div><div class='ctx'> </div><div class='ctx'> 	/* MPEG controls */</div><div class='ctx'> 	/* Keep the order of the 'case's the same as in videodev2.h! */</div><div class='hunk'>@@ -505,25 +506,25 @@ const char *v4l2_ctrl_get_name(u32 id)</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_MUTE_YUV:	return "Video Mute YUV";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE:	return "Decoder Slice Interface";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER:	return "MPEG4 Loop Filter Enable";</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB:	return "The Number of Intra Refresh MBs";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB:	return "Number of Intra Refresh MBs";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_FRAME_RC_ENABLE:		return "Frame Level Rate Control Enable";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_MB_RC_ENABLE:			return "H264 MB Level Rate Control";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_HEADER_MODE:			return "Sequence Header Mode";</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_MAX_REF_PIC:			return "The Max Number of Reference Picture";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_MAX_REF_PIC:			return "Max Number of Reference Pics";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP:		return "H263 I-Frame QP Value";</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP:		return "H263 P frame QP Value";</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP:		return "H263 B frame QP Value";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP:		return "H263 P-Frame QP Value";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP:		return "H263 B-Frame QP Value";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_H263_MIN_QP:			return "H263 Minimum QP Value";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_H263_MAX_QP:			return "H263 Maximum QP Value";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_H264_I_FRAME_QP:		return "H264 I-Frame QP Value";</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_QP:		return "H264 P frame QP Value";</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP:		return "H264 B frame QP Value";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_QP:		return "H264 P-Frame QP Value";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP:		return "H264 B-Frame QP Value";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_H264_MAX_QP:			return "H264 Maximum QP Value";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_H264_MIN_QP:			return "H264 Minimum QP Value";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM:		return "H264 8x8 Transform Enable";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_H264_CPB_SIZE:			return "H264 CPB Buffer Size";</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE:		return "H264 Entorpy Mode";</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_H264_I_PERIOD:			return "H264 I Period";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE:		return "H264 Entropy Mode";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_H264_I_PERIOD:			return "H264 I-Frame Period";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_H264_LEVEL:			return "H264 Level";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA:	return "H264 Loop Filter Alpha Offset";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA:		return "H264 Loop Filter Beta Offset";</div><div class='hunk'>@@ -534,16 +535,16 @@ const char *v4l2_ctrl_get_name(u32 id)</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_ENABLE:		return "Aspect Ratio VUI Enable";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC:		return "VUI Aspect Ratio IDC";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP:		return "MPEG4 I-Frame QP Value";</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP:		return "MPEG4 P frame QP Value";</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP:		return "MPEG4 B frame QP Value";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP:		return "MPEG4 P-Frame QP Value";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP:		return "MPEG4 B-Frame QP Value";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_MPEG4_MIN_QP:			return "MPEG4 Minimum QP Value";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_MPEG4_MAX_QP:			return "MPEG4 Maximum QP Value";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL:			return "MPEG4 Level";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE:			return "MPEG4 Profile";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_MPEG4_QPEL:			return "Quarter Pixel Search Enable";</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES:		return "The Maximum Bytes Per Slice";</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB:		return "The Number of MB in a Slice";</div><div class='del'>-	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE:		return "The Slice Partitioning Method";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES:		return "Maximum Bytes in a Slice";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB:		return "Number of MBs in a Slice";</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE:		return "Slice Partitioning Method";</div><div class='ctx'> 	case V4L2_CID_MPEG_VIDEO_VBV_SIZE:			return "VBV Buffer Size";</div><div class='ctx'> </div><div class='ctx'> 	/* CAMERA controls */</div><div class='hunk'>@@ -579,7 +580,7 @@ const char *v4l2_ctrl_get_name(u32 id)</div><div class='ctx'> 	case V4L2_CID_AUDIO_LIMITER_ENABLED:	return "Audio Limiter Feature Enabled";</div><div class='ctx'> 	case V4L2_CID_AUDIO_LIMITER_RELEASE_TIME: return "Audio Limiter Release Time";</div><div class='ctx'> 	case V4L2_CID_AUDIO_LIMITER_DEVIATION:	return "Audio Limiter Deviation";</div><div class='del'>-	case V4L2_CID_AUDIO_COMPRESSION_ENABLED: return "Audio Compression Feature Enabled";</div><div class='add'>+	case V4L2_CID_AUDIO_COMPRESSION_ENABLED: return "Audio Compression Enabled";</div><div class='ctx'> 	case V4L2_CID_AUDIO_COMPRESSION_GAIN:	return "Audio Compression Gain";</div><div class='ctx'> 	case V4L2_CID_AUDIO_COMPRESSION_THRESHOLD: return "Audio Compression Threshold";</div><div class='ctx'> 	case V4L2_CID_AUDIO_COMPRESSION_ATTACK_TIME: return "Audio Compression Attack Time";</div><div class='hunk'>@@ -587,24 +588,24 @@ const char *v4l2_ctrl_get_name(u32 id)</div><div class='ctx'> 	case V4L2_CID_PILOT_TONE_ENABLED:	return "Pilot Tone Feature Enabled";</div><div class='ctx'> 	case V4L2_CID_PILOT_TONE_DEVIATION:	return "Pilot Tone Deviation";</div><div class='ctx'> 	case V4L2_CID_PILOT_TONE_FREQUENCY:	return "Pilot Tone Frequency";</div><div class='del'>-	case V4L2_CID_TUNE_PREEMPHASIS:		return "Pre-emphasis settings";</div><div class='add'>+	case V4L2_CID_TUNE_PREEMPHASIS:		return "Pre-Emphasis";</div><div class='ctx'> 	case V4L2_CID_TUNE_POWER_LEVEL:		return "Tune Power Level";</div><div class='ctx'> 	case V4L2_CID_TUNE_ANTENNA_CAPACITOR:	return "Tune Antenna Capacitor";</div><div class='ctx'> </div><div class='ctx'> 	/* Flash controls */</div><div class='del'>-	case V4L2_CID_FLASH_CLASS:		return "Flash controls";</div><div class='del'>-	case V4L2_CID_FLASH_LED_MODE:		return "LED mode";</div><div class='del'>-	case V4L2_CID_FLASH_STROBE_SOURCE:	return "Strobe source";</div><div class='add'>+	case V4L2_CID_FLASH_CLASS:		return "Flash Controls";</div><div class='add'>+	case V4L2_CID_FLASH_LED_MODE:		return "LED Mode";</div><div class='add'>+	case V4L2_CID_FLASH_STROBE_SOURCE:	return "Strobe Source";</div><div class='ctx'> 	case V4L2_CID_FLASH_STROBE:		return "Strobe";</div><div class='del'>-	case V4L2_CID_FLASH_STROBE_STOP:	return "Stop strobe";</div><div class='del'>-	case V4L2_CID_FLASH_STROBE_STATUS:	return "Strobe status";</div><div class='del'>-	case V4L2_CID_FLASH_TIMEOUT:		return "Strobe timeout";</div><div class='del'>-	case V4L2_CID_FLASH_INTENSITY:		return "Intensity, flash mode";</div><div class='del'>-	case V4L2_CID_FLASH_TORCH_INTENSITY:	return "Intensity, torch mode";</div><div class='del'>-	case V4L2_CID_FLASH_INDICATOR_INTENSITY: return "Intensity, indicator";</div><div class='add'>+	case V4L2_CID_FLASH_STROBE_STOP:	return "Stop Strobe";</div><div class='add'>+	case V4L2_CID_FLASH_STROBE_STATUS:	return "Strobe Status";</div><div class='add'>+	case V4L2_CID_FLASH_TIMEOUT:		return "Strobe Timeout";</div><div class='add'>+	case V4L2_CID_FLASH_INTENSITY:		return "Intensity, Flash Mode";</div><div class='add'>+	case V4L2_CID_FLASH_TORCH_INTENSITY:	return "Intensity, Torch Mode";</div><div class='add'>+	case V4L2_CID_FLASH_INDICATOR_INTENSITY: return "Intensity, Indicator";</div><div class='ctx'> 	case V4L2_CID_FLASH_FAULT:		return "Faults";</div><div class='ctx'> 	case V4L2_CID_FLASH_CHARGE:		return "Charge";</div><div class='del'>-	case V4L2_CID_FLASH_READY:		return "Ready to strobe";</div><div class='add'>+	case V4L2_CID_FLASH_READY:		return "Ready to Strobe";</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -1108,8 +1109,8 @@ int v4l2_ctrl_handler_init(struct v4l2_ctrl_handler *hdl,</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hdl-&gt;ctrls);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hdl-&gt;ctrl_refs);</div><div class='ctx'> 	hdl-&gt;nr_of_buckets = 1 + nr_of_controls_hint / 8;</div><div class='del'>-	hdl-&gt;buckets = kzalloc(sizeof(hdl-&gt;buckets[0]) * hdl-&gt;nr_of_buckets,</div><div class='del'>-								GFP_KERNEL);</div><div class='add'>+	hdl-&gt;buckets = kcalloc(hdl-&gt;nr_of_buckets, sizeof(hdl-&gt;buckets[0]),</div><div class='add'>+			       GFP_KERNEL);</div><div class='ctx'> 	hdl-&gt;error = hdl-&gt;buckets ? 0 : -ENOMEM;</div><div class='ctx'> 	return hdl-&gt;error;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c<br/>index a5c9ed128b97..96e9615663e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/v4l2-dev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/v4l2-dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/v4l2-dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/v4l2-dev.c</a></div><div class='hunk'>@@ -146,10 +146,9 @@ static void v4l2_device_release(struct device *cd)</div><div class='ctx'> 	struct v4l2_device *v4l2_dev = vdev-&gt;v4l2_dev;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;videodev_lock);</div><div class='del'>-	if (video_device[vdev-&gt;minor] != vdev) {</div><div class='del'>-		mutex_unlock(&amp;videodev_lock);</div><div class='add'>+	if (WARN_ON(video_device[vdev-&gt;minor] != vdev)) {</div><div class='ctx'> 		/* should not happen */</div><div class='del'>-		WARN_ON(1);</div><div class='add'>+		mutex_unlock(&amp;videodev_lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -168,7 +167,7 @@ static void v4l2_device_release(struct device *cd)</div><div class='ctx'> 	mutex_unlock(&amp;videodev_lock);</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MEDIA_CONTROLLER)</div><div class='del'>-	if (vdev-&gt;v4l2_dev &amp;&amp; vdev-&gt;v4l2_dev-&gt;mdev &amp;&amp;</div><div class='add'>+	if (v4l2_dev &amp;&amp; v4l2_dev-&gt;mdev &amp;&amp;</div><div class='ctx'> 	    vdev-&gt;vfl_type != VFL_TYPE_SUBDEV)</div><div class='ctx'> 		media_device_unregister_entity(&amp;vdev-&gt;entity);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -556,8 +555,7 @@ int __video_register_device(struct video_device *vdev, int type, int nr,</div><div class='ctx'> 	vdev-&gt;minor = -1;</div><div class='ctx'> </div><div class='ctx'> 	/* the release callback MUST be present */</div><div class='del'>-	WARN_ON(!vdev-&gt;release);</div><div class='del'>-	if (!vdev-&gt;release)</div><div class='add'>+	if (WARN_ON(!vdev-&gt;release))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* v4l2_fh support */</div><div class='hunk'>@@ -703,8 +701,8 @@ int __video_register_device(struct video_device *vdev, int type, int nr,</div><div class='ctx'> 	    vdev-&gt;vfl_type != VFL_TYPE_SUBDEV) {</div><div class='ctx'> 		vdev-&gt;entity.type = MEDIA_ENT_T_DEVNODE_V4L;</div><div class='ctx'> 		vdev-&gt;entity.name = vdev-&gt;name;</div><div class='del'>-		vdev-&gt;entity.v4l.major = VIDEO_MAJOR;</div><div class='del'>-		vdev-&gt;entity.v4l.minor = vdev-&gt;minor;</div><div class='add'>+		vdev-&gt;entity.info.v4l.major = VIDEO_MAJOR;</div><div class='add'>+		vdev-&gt;entity.info.v4l.minor = vdev-&gt;minor;</div><div class='ctx'> 		ret = media_device_register_entity(vdev-&gt;v4l2_dev-&gt;mdev,</div><div class='ctx'> 			&amp;vdev-&gt;entity);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='head'>diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c<br/>index 0edd618b9ddf..1f203b85a637 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/v4l2-device.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/v4l2-device.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/v4l2-device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/v4l2-device.c</a></div><div class='hunk'>@@ -234,8 +234,8 @@ int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev)</div><div class='ctx'> 			goto clean_up;</div><div class='ctx'> 		}</div><div class='ctx'> #if defined(CONFIG_MEDIA_CONTROLLER)</div><div class='del'>-		sd-&gt;entity.v4l.major = VIDEO_MAJOR;</div><div class='del'>-		sd-&gt;entity.v4l.minor = vdev-&gt;minor;</div><div class='add'>+		sd-&gt;entity.info.v4l.major = VIDEO_MAJOR;</div><div class='add'>+		sd-&gt;entity.info.v4l.minor = vdev-&gt;minor;</div><div class='ctx'> #endif</div><div class='ctx'> 		sd-&gt;devnode = vdev;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c<br/>index e1da8fc9dd2f..3f623859a337 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/v4l2-ioctl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/v4l2-ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/v4l2-ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/v4l2-ioctl.c</a></div><div class='hunk'>@@ -238,6 +238,8 @@ static const char *v4l2_ioctls[] = {</div><div class='ctx'> 	[_IOC_NR(VIDIOC_CROPCAP)]          = "VIDIOC_CROPCAP",</div><div class='ctx'> 	[_IOC_NR(VIDIOC_G_CROP)]           = "VIDIOC_G_CROP",</div><div class='ctx'> 	[_IOC_NR(VIDIOC_S_CROP)]           = "VIDIOC_S_CROP",</div><div class='add'>+	[_IOC_NR(VIDIOC_G_SELECTION)]      = "VIDIOC_G_SELECTION",</div><div class='add'>+	[_IOC_NR(VIDIOC_S_SELECTION)]      = "VIDIOC_S_SELECTION",</div><div class='ctx'> 	[_IOC_NR(VIDIOC_G_JPEGCOMP)]       = "VIDIOC_G_JPEGCOMP",</div><div class='ctx'> 	[_IOC_NR(VIDIOC_S_JPEGCOMP)]       = "VIDIOC_S_JPEGCOMP",</div><div class='ctx'> 	[_IOC_NR(VIDIOC_QUERYSTD)]         = "VIDIOC_QUERYSTD",</div><div class='hunk'>@@ -1547,11 +1549,32 @@ static long __video_do_ioctl(struct file *file,</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_crop *p = arg;</div><div class='ctx'> </div><div class='del'>-		if (!ops-&gt;vidioc_g_crop)</div><div class='add'>+		if (!ops-&gt;vidioc_g_crop &amp;&amp; !ops-&gt;vidioc_g_selection)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		dbgarg(cmd, "type=%s\n", prt_names(p-&gt;type, v4l2_type_names));</div><div class='del'>-		ret = ops-&gt;vidioc_g_crop(file, fh, p);</div><div class='add'>+</div><div class='add'>+		if (ops-&gt;vidioc_g_crop) {</div><div class='add'>+			ret = ops-&gt;vidioc_g_crop(file, fh, p);</div><div class='add'>+		} else {</div><div class='add'>+			/* simulate capture crop using selection api */</div><div class='add'>+			struct v4l2_selection s = {</div><div class='add'>+				.type = p-&gt;type,</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* crop means compose for output devices */</div><div class='add'>+			if (V4L2_TYPE_IS_OUTPUT(p-&gt;type))</div><div class='add'>+				s.target = V4L2_SEL_TGT_COMPOSE_ACTIVE;</div><div class='add'>+			else</div><div class='add'>+				s.target = V4L2_SEL_TGT_CROP_ACTIVE;</div><div class='add'>+</div><div class='add'>+			ret = ops-&gt;vidioc_g_selection(file, fh, &amp;s);</div><div class='add'>+</div><div class='add'>+			/* copying results to old structure on success */</div><div class='add'>+			if (!ret)</div><div class='add'>+				p-&gt;c = s.r;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			dbgrect(vfd, "", &amp;p-&gt;c);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1560,15 +1583,65 @@ static long __video_do_ioctl(struct file *file,</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_crop *p = arg;</div><div class='ctx'> </div><div class='del'>-		if (!ops-&gt;vidioc_s_crop)</div><div class='add'>+		if (!ops-&gt;vidioc_s_crop &amp;&amp; !ops-&gt;vidioc_s_selection)</div><div class='ctx'> 			break;</div><div class='add'>+</div><div class='ctx'> 		if (ret_prio) {</div><div class='ctx'> 			ret = ret_prio;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		dbgarg(cmd, "type=%s\n", prt_names(p-&gt;type, v4l2_type_names));</div><div class='ctx'> 		dbgrect(vfd, "", &amp;p-&gt;c);</div><div class='del'>-		ret = ops-&gt;vidioc_s_crop(file, fh, p);</div><div class='add'>+</div><div class='add'>+		if (ops-&gt;vidioc_s_crop) {</div><div class='add'>+			ret = ops-&gt;vidioc_s_crop(file, fh, p);</div><div class='add'>+		} else {</div><div class='add'>+			/* simulate capture crop using selection api */</div><div class='add'>+			struct v4l2_selection s = {</div><div class='add'>+				.type = p-&gt;type,</div><div class='add'>+				.r = p-&gt;c,</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			/* crop means compose for output devices */</div><div class='add'>+			if (V4L2_TYPE_IS_OUTPUT(p-&gt;type))</div><div class='add'>+				s.target = V4L2_SEL_TGT_COMPOSE_ACTIVE;</div><div class='add'>+			else</div><div class='add'>+				s.target = V4L2_SEL_TGT_CROP_ACTIVE;</div><div class='add'>+</div><div class='add'>+			ret = ops-&gt;vidioc_s_selection(file, fh, &amp;s);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_SELECTION:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_selection *p = arg;</div><div class='add'>+</div><div class='add'>+		if (!ops-&gt;vidioc_g_selection)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		dbgarg(cmd, "type=%s\n", prt_names(p-&gt;type, v4l2_type_names));</div><div class='add'>+</div><div class='add'>+		ret = ops-&gt;vidioc_g_selection(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgrect(vfd, "", &amp;p-&gt;r);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_SELECTION:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_selection *p = arg;</div><div class='add'>+</div><div class='add'>+		if (!ops-&gt;vidioc_s_selection)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (ret_prio) {</div><div class='add'>+			ret = ret_prio;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dbgarg(cmd, "type=%s\n", prt_names(p-&gt;type, v4l2_type_names));</div><div class='add'>+		dbgrect(vfd, "", &amp;p-&gt;r);</div><div class='add'>+</div><div class='add'>+		ret = ops-&gt;vidioc_s_selection(file, fh, p);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case VIDIOC_CROPCAP:</div><div class='hunk'>@@ -1576,11 +1649,42 @@ static long __video_do_ioctl(struct file *file,</div><div class='ctx'> 		struct v4l2_cropcap *p = arg;</div><div class='ctx'> </div><div class='ctx'> 		/*FIXME: Should also show v4l2_fract pixelaspect */</div><div class='del'>-		if (!ops-&gt;vidioc_cropcap)</div><div class='add'>+		if (!ops-&gt;vidioc_cropcap &amp;&amp; !ops-&gt;vidioc_g_selection)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		dbgarg(cmd, "type=%s\n", prt_names(p-&gt;type, v4l2_type_names));</div><div class='del'>-		ret = ops-&gt;vidioc_cropcap(file, fh, p);</div><div class='add'>+		if (ops-&gt;vidioc_cropcap) {</div><div class='add'>+			ret = ops-&gt;vidioc_cropcap(file, fh, p);</div><div class='add'>+		} else {</div><div class='add'>+			struct v4l2_selection s = { .type = p-&gt;type };</div><div class='add'>+</div><div class='add'>+			/* obtaining bounds */</div><div class='add'>+			if (V4L2_TYPE_IS_OUTPUT(p-&gt;type))</div><div class='add'>+				s.target = V4L2_SEL_TGT_COMPOSE_BOUNDS;</div><div class='add'>+			else</div><div class='add'>+				s.target = V4L2_SEL_TGT_CROP_BOUNDS;</div><div class='add'>+</div><div class='add'>+			ret = ops-&gt;vidioc_g_selection(file, fh, &amp;s);</div><div class='add'>+			if (ret)</div><div class='add'>+				break;</div><div class='add'>+			p-&gt;bounds = s.r;</div><div class='add'>+</div><div class='add'>+			/* obtaining defrect */</div><div class='add'>+			if (V4L2_TYPE_IS_OUTPUT(p-&gt;type))</div><div class='add'>+				s.target = V4L2_SEL_TGT_COMPOSE_DEFAULT;</div><div class='add'>+			else</div><div class='add'>+				s.target = V4L2_SEL_TGT_CROP_DEFAULT;</div><div class='add'>+</div><div class='add'>+			ret = ops-&gt;vidioc_g_selection(file, fh, &amp;s);</div><div class='add'>+			if (ret)</div><div class='add'>+				break;</div><div class='add'>+			p-&gt;defrect = s.r;</div><div class='add'>+</div><div class='add'>+			/* setting trivial pixelaspect */</div><div class='add'>+			p-&gt;pixelaspect.numerator = 1;</div><div class='add'>+			p-&gt;pixelaspect.denominator = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (!ret) {</div><div class='ctx'> 			dbgrect(vfd, "bounds ", &amp;p-&gt;bounds);</div><div class='ctx'> 			dbgrect(vfd, "defrect ", &amp;p-&gt;defrect);</div><div class='hunk'>@@ -1767,6 +1871,7 @@ static long __video_do_ioctl(struct file *file,</div><div class='ctx'> 	case VIDIOC_S_FREQUENCY:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_frequency *p = arg;</div><div class='add'>+		enum v4l2_tuner_type type;</div><div class='ctx'> </div><div class='ctx'> 		if (!ops-&gt;vidioc_s_frequency)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1774,9 +1879,14 @@ static long __video_do_ioctl(struct file *file,</div><div class='ctx'> 			ret = ret_prio;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		type = (vfd-&gt;vfl_type == VFL_TYPE_RADIO) ?</div><div class='add'>+			V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;</div><div class='ctx'> 		dbgarg(cmd, "tuner=%d, type=%d, frequency=%d\n",</div><div class='ctx'> 				p-&gt;tuner, p-&gt;type, p-&gt;frequency);</div><div class='del'>-		ret = ops-&gt;vidioc_s_frequency(file, fh, p);</div><div class='add'>+		if (p-&gt;type != type)</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		else</div><div class='add'>+			ret = ops-&gt;vidioc_s_frequency(file, fh, p);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case VIDIOC_G_SLICED_VBI_CAP:</div><div class='hunk'>@@ -2226,6 +2336,10 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,</div><div class='ctx'> 		struct v4l2_ext_controls *ctrls = parg;</div><div class='ctx'> </div><div class='ctx'> 		if (ctrls-&gt;count != 0) {</div><div class='add'>+			if (ctrls-&gt;count &gt; V4L2_CID_MAX_CTRLS) {</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 			*user_ptr = (void __user *)ctrls-&gt;controls;</div><div class='ctx'> 			*kernel_ptr = (void *)&amp;ctrls-&gt;controls;</div><div class='ctx'> 			*array_size = sizeof(struct v4l2_ext_control)</div><div class='head'>diff --git a/drivers/media/video/v4l2-subdev.c b/drivers/media/video/v4l2-subdev.c<br/>index 65ade5f03c2e..41d118ee2de6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/v4l2-subdev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/v4l2-subdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/v4l2-subdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/v4l2-subdev.c</a></div><div class='hunk'>@@ -193,6 +193,10 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)</div><div class='ctx'> 		return v4l2_subdev_call(sd, core, s_register, p);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	case VIDIOC_LOG_STATUS:</div><div class='add'>+		return v4l2_subdev_call(sd, core, log_status);</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)</div><div class='ctx'> 	case VIDIOC_SUBDEV_G_FMT: {</div><div class='ctx'> 		struct v4l2_subdev_format *format = arg;</div><div class='head'>diff --git a/drivers/media/video/via-camera.c b/drivers/media/video/via-camera.c<br/>index cbf13d09b4ac..20f7237b8242 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/via-camera.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/via-camera.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/via-camera.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/via-camera.c</a></div><div class='hunk'>@@ -34,13 +34,13 @@ MODULE_AUTHOR("Jonathan Corbet &lt;corbet@lwn.net&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("VIA framebuffer-based camera controller driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static int flip_image;</div><div class='add'>+static bool flip_image;</div><div class='ctx'> module_param(flip_image, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(flip_image,</div><div class='ctx'> 		"If set, the sensor will be instructed to flip the image "</div><div class='ctx'> 		"vertically.");</div><div class='ctx'> </div><div class='del'>-static int override_serial;</div><div class='add'>+static bool override_serial;</div><div class='ctx'> module_param(override_serial, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(override_serial,</div><div class='ctx'> 		"The camera driver will normally refuse to load if "</div><div class='hunk'>@@ -156,14 +156,10 @@ static struct via_format {</div><div class='ctx'> 		.mbus_code	= V4L2_MBUS_FMT_YUYV8_2X8,</div><div class='ctx'> 		.bpp		= 2,</div><div class='ctx'> 	},</div><div class='del'>-	{</div><div class='del'>-		.desc		= "RGB 565",</div><div class='del'>-		.pixelformat	= V4L2_PIX_FMT_RGB565,</div><div class='del'>-		.mbus_code	= V4L2_MBUS_FMT_RGB565_2X8_LE,</div><div class='del'>-		.bpp		= 2,</div><div class='del'>-	},</div><div class='ctx'> 	/* RGB444 and Bayer should be doable, but have never been</div><div class='del'>-	   tested with this driver. */</div><div class='add'>+	   tested with this driver. RGB565 seems to work at the default</div><div class='add'>+	   resolution, but results in color corruption when being scaled by</div><div class='add'>+	   viacam_set_scaled(), and is disabled as a result. */</div><div class='ctx'> };</div><div class='ctx'> #define N_VIA_FMTS ARRAY_SIZE(via_formats)</div><div class='ctx'> </div><div class='hunk'>@@ -1504,14 +1500,4 @@ static struct platform_driver viacam_driver = {</div><div class='ctx'> 	.remove = viacam_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int viacam_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;viacam_driver);</div><div class='del'>-}</div><div class='del'>-module_init(viacam_init);</div><div class='del'>-</div><div class='del'>-static void viacam_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;viacam_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(viacam_exit);</div><div class='add'>+module_platform_driver(viacam_driver);</div><div class='head'>diff --git a/drivers/media/video/videobuf-dvb.c b/drivers/media/video/videobuf-dvb.c<br/>index 3de7c7e4402d..59cb54aa2946 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/videobuf-dvb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/videobuf-dvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/videobuf-dvb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/videobuf-dvb.c</a></div><div class='hunk'>@@ -226,9 +226,10 @@ static int videobuf_dvb_register_frontend(struct dvb_adapter *adapter,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* register network adapter */</div><div class='del'>-	dvb_net_init(adapter, &amp;dvb-&gt;net, &amp;dvb-&gt;demux.dmx);</div><div class='del'>-	if (dvb-&gt;net.dvbdev == NULL) {</div><div class='del'>-		result = -ENOMEM;</div><div class='add'>+	result = dvb_net_init(adapter, &amp;dvb-&gt;net, &amp;dvb-&gt;demux.dmx);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		printk(KERN_WARNING "%s: dvb_net_init failed (errno = %d)\n",</div><div class='add'>+		       dvb-&gt;name, result);</div><div class='ctx'> 		goto fail_fe_conn;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c<br/>index 95a3f5e82aef..2e8f1df775b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/videobuf2-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/videobuf2-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/videobuf2-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/videobuf2-core.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@ module_param(debug, int, 0644);</div><div class='ctx'> 			printk(KERN_DEBUG "vb2: " fmt, ## arg);		\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-#define call_memop(q, plane, op, args...)				\</div><div class='add'>+#define call_memop(q, op, args...)					\</div><div class='ctx'> 	(((q)-&gt;mem_ops-&gt;op) ?						\</div><div class='ctx'> 		((q)-&gt;mem_ops-&gt;op(args)) : 0)</div><div class='ctx'> </div><div class='hunk'>@@ -52,7 +52,7 @@ static int __vb2_buf_mem_alloc(struct vb2_buffer *vb)</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate memory for all planes in this buffer */</div><div class='ctx'> 	for (plane = 0; plane &lt; vb-&gt;num_planes; ++plane) {</div><div class='del'>-		mem_priv = call_memop(q, plane, alloc, q-&gt;alloc_ctx[plane],</div><div class='add'>+		mem_priv = call_memop(q, alloc, q-&gt;alloc_ctx[plane],</div><div class='ctx'> 				      q-&gt;plane_sizes[plane]);</div><div class='ctx'> 		if (IS_ERR_OR_NULL(mem_priv))</div><div class='ctx'> 			goto free;</div><div class='hunk'>@@ -65,8 +65,10 @@ static int __vb2_buf_mem_alloc(struct vb2_buffer *vb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> free:</div><div class='ctx'> 	/* Free already allocated memory if one of the allocations failed */</div><div class='del'>-	for (; plane &gt; 0; --plane)</div><div class='del'>-		call_memop(q, plane, put, vb-&gt;planes[plane - 1].mem_priv);</div><div class='add'>+	for (; plane &gt; 0; --plane) {</div><div class='add'>+		call_memop(q, put, vb-&gt;planes[plane - 1].mem_priv);</div><div class='add'>+		vb-&gt;planes[plane - 1].mem_priv = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='hunk'>@@ -80,10 +82,10 @@ static void __vb2_buf_mem_free(struct vb2_buffer *vb)</div><div class='ctx'> 	unsigned int plane;</div><div class='ctx'> </div><div class='ctx'> 	for (plane = 0; plane &lt; vb-&gt;num_planes; ++plane) {</div><div class='del'>-		call_memop(q, plane, put, vb-&gt;planes[plane].mem_priv);</div><div class='add'>+		call_memop(q, put, vb-&gt;planes[plane].mem_priv);</div><div class='ctx'> 		vb-&gt;planes[plane].mem_priv = NULL;</div><div class='del'>-		dprintk(3, "Freed plane %d of buffer %d\n",</div><div class='del'>-				plane, vb-&gt;v4l2_buf.index);</div><div class='add'>+		dprintk(3, "Freed plane %d of buffer %d\n", plane,</div><div class='add'>+			vb-&gt;v4l2_buf.index);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -97,12 +99,9 @@ static void __vb2_buf_userptr_put(struct vb2_buffer *vb)</div><div class='ctx'> 	unsigned int plane;</div><div class='ctx'> </div><div class='ctx'> 	for (plane = 0; plane &lt; vb-&gt;num_planes; ++plane) {</div><div class='del'>-		void *mem_priv = vb-&gt;planes[plane].mem_priv;</div><div class='del'>-</div><div class='del'>-		if (mem_priv) {</div><div class='del'>-			call_memop(q, plane, put_userptr, mem_priv);</div><div class='del'>-			vb-&gt;planes[plane].mem_priv = NULL;</div><div class='del'>-		}</div><div class='add'>+		if (vb-&gt;planes[plane].mem_priv)</div><div class='add'>+			call_memop(q, put_userptr, vb-&gt;planes[plane].mem_priv);</div><div class='add'>+		vb-&gt;planes[plane].mem_priv = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -305,7 +304,7 @@ static bool __buffer_in_use(struct vb2_queue *q, struct vb2_buffer *vb)</div><div class='ctx'> 		 * case anyway. If num_users() returns more than 1,</div><div class='ctx'> 		 * we are not the only user of the plane's memory.</div><div class='ctx'> 		 */</div><div class='del'>-		if (mem_priv &amp;&amp; call_memop(q, plane, num_users, mem_priv) &gt; 1)</div><div class='add'>+		if (mem_priv &amp;&amp; call_memop(q, num_users, mem_priv) &gt; 1)</div><div class='ctx'> 			return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -731,10 +730,10 @@ void *vb2_plane_vaddr(struct vb2_buffer *vb, unsigned int plane_no)</div><div class='ctx'> {</div><div class='ctx'> 	struct vb2_queue *q = vb-&gt;vb2_queue;</div><div class='ctx'> </div><div class='del'>-	if (plane_no &gt; vb-&gt;num_planes)</div><div class='add'>+	if (plane_no &gt; vb-&gt;num_planes || !vb-&gt;planes[plane_no].mem_priv)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	return call_memop(q, plane_no, vaddr, vb-&gt;planes[plane_no].mem_priv);</div><div class='add'>+	return call_memop(q, vaddr, vb-&gt;planes[plane_no].mem_priv);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(vb2_plane_vaddr);</div><div class='hunk'>@@ -754,10 +753,10 @@ void *vb2_plane_cookie(struct vb2_buffer *vb, unsigned int plane_no)</div><div class='ctx'> {</div><div class='ctx'> 	struct vb2_queue *q = vb-&gt;vb2_queue;</div><div class='ctx'> </div><div class='del'>-	if (plane_no &gt; vb-&gt;num_planes)</div><div class='add'>+	if (plane_no &gt; vb-&gt;num_planes || !vb-&gt;planes[plane_no].mem_priv)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	return call_memop(q, plane_no, cookie, vb-&gt;planes[plane_no].mem_priv);</div><div class='add'>+	return call_memop(q, cookie, vb-&gt;planes[plane_no].mem_priv);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(vb2_plane_cookie);</div><div class='ctx'> </div><div class='hunk'>@@ -883,7 +882,8 @@ static int __qbuf_userptr(struct vb2_buffer *vb, const struct v4l2_buffer *b)</div><div class='ctx'> </div><div class='ctx'> 	for (plane = 0; plane &lt; vb-&gt;num_planes; ++plane) {</div><div class='ctx'> 		/* Skip the plane if already verified */</div><div class='del'>-		if (vb-&gt;v4l2_planes[plane].m.userptr == planes[plane].m.userptr</div><div class='add'>+		if (vb-&gt;v4l2_planes[plane].m.userptr &amp;&amp;</div><div class='add'>+		    vb-&gt;v4l2_planes[plane].m.userptr == planes[plane].m.userptr</div><div class='ctx'> 		    &amp;&amp; vb-&gt;v4l2_planes[plane].length == planes[plane].length)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -898,27 +898,23 @@ static int __qbuf_userptr(struct vb2_buffer *vb, const struct v4l2_buffer *b)</div><div class='ctx'> </div><div class='ctx'> 		/* Release previously acquired memory if present */</div><div class='ctx'> 		if (vb-&gt;planes[plane].mem_priv)</div><div class='del'>-			call_memop(q, plane, put_userptr,</div><div class='del'>-					vb-&gt;planes[plane].mem_priv);</div><div class='add'>+			call_memop(q, put_userptr, vb-&gt;planes[plane].mem_priv);</div><div class='ctx'> </div><div class='ctx'> 		vb-&gt;planes[plane].mem_priv = NULL;</div><div class='ctx'> 		vb-&gt;v4l2_planes[plane].m.userptr = 0;</div><div class='ctx'> 		vb-&gt;v4l2_planes[plane].length = 0;</div><div class='ctx'> </div><div class='ctx'> 		/* Acquire each plane's memory */</div><div class='del'>-		if (q-&gt;mem_ops-&gt;get_userptr) {</div><div class='del'>-			mem_priv = q-&gt;mem_ops-&gt;get_userptr(q-&gt;alloc_ctx[plane],</div><div class='del'>-							planes[plane].m.userptr,</div><div class='del'>-							planes[plane].length,</div><div class='del'>-							write);</div><div class='del'>-			if (IS_ERR(mem_priv)) {</div><div class='del'>-				dprintk(1, "qbuf: failed acquiring userspace "</div><div class='add'>+		mem_priv = call_memop(q, get_userptr, q-&gt;alloc_ctx[plane],</div><div class='add'>+				      planes[plane].m.userptr,</div><div class='add'>+				      planes[plane].length, write);</div><div class='add'>+		if (IS_ERR_OR_NULL(mem_priv)) {</div><div class='add'>+			dprintk(1, "qbuf: failed acquiring userspace "</div><div class='ctx'> 						"memory for plane %d\n", plane);</div><div class='del'>-				ret = PTR_ERR(mem_priv);</div><div class='del'>-				goto err;</div><div class='del'>-			}</div><div class='del'>-			vb-&gt;planes[plane].mem_priv = mem_priv;</div><div class='add'>+			ret = mem_priv ? PTR_ERR(mem_priv) : -EINVAL;</div><div class='add'>+			goto err;</div><div class='ctx'> 		}</div><div class='add'>+		vb-&gt;planes[plane].mem_priv = mem_priv;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -943,8 +939,7 @@ err:</div><div class='ctx'> 	/* In case of errors, release planes that were already acquired */</div><div class='ctx'> 	for (plane = 0; plane &lt; vb-&gt;num_planes; ++plane) {</div><div class='ctx'> 		if (vb-&gt;planes[plane].mem_priv)</div><div class='del'>-			call_memop(q, plane, put_userptr,</div><div class='del'>-				   vb-&gt;planes[plane].mem_priv);</div><div class='add'>+			call_memop(q, put_userptr, vb-&gt;planes[plane].mem_priv);</div><div class='ctx'> 		vb-&gt;planes[plane].mem_priv = NULL;</div><div class='ctx'> 		vb-&gt;v4l2_planes[plane].m.userptr = 0;</div><div class='ctx'> 		vb-&gt;v4l2_planes[plane].length = 0;</div><div class='hunk'>@@ -1081,46 +1076,76 @@ EXPORT_SYMBOL_GPL(vb2_prepare_buf);</div><div class='ctx'>  */</div><div class='ctx'> int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b)</div><div class='ctx'> {</div><div class='add'>+	struct rw_semaphore *mmap_sem = NULL;</div><div class='ctx'> 	struct vb2_buffer *vb;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In case of user pointer buffers vb2 allocator needs to get direct</div><div class='add'>+	 * access to userspace pages. This requires getting read access on</div><div class='add'>+	 * mmap semaphore in the current process structure. The same</div><div class='add'>+	 * semaphore is taken before calling mmap operation, while both mmap</div><div class='add'>+	 * and qbuf are called by the driver or v4l2 core with driver's lock</div><div class='add'>+	 * held. To avoid a AB-BA deadlock (mmap_sem then driver's lock in</div><div class='add'>+	 * mmap and driver's lock then mmap_sem in qbuf) the videobuf2 core</div><div class='add'>+	 * release driver's lock, takes mmap_sem and then takes again driver's</div><div class='add'>+	 * lock.</div><div class='add'>+	 *</div><div class='add'>+	 * To avoid race with other vb2 calls, which might be called after</div><div class='add'>+	 * releasing driver's lock, this operation is performed at the</div><div class='add'>+	 * beggining of qbuf processing. This way the queue status is</div><div class='add'>+	 * consistent after getting driver's lock back.</div><div class='add'>+	 */</div><div class='add'>+	if (q-&gt;memory == V4L2_MEMORY_USERPTR) {</div><div class='add'>+		mmap_sem = &amp;current-&gt;mm-&gt;mmap_sem;</div><div class='add'>+		call_qop(q, wait_prepare, q);</div><div class='add'>+		down_read(mmap_sem);</div><div class='add'>+		call_qop(q, wait_finish, q);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (q-&gt;fileio) {</div><div class='ctx'> 		dprintk(1, "qbuf: file io in progress\n");</div><div class='del'>-		return -EBUSY;</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (b-&gt;type != q-&gt;type) {</div><div class='ctx'> 		dprintk(1, "qbuf: invalid buffer type\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (b-&gt;index &gt;= q-&gt;num_buffers) {</div><div class='ctx'> 		dprintk(1, "qbuf: buffer index out of range\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	vb = q-&gt;bufs[b-&gt;index];</div><div class='ctx'> 	if (NULL == vb) {</div><div class='ctx'> 		/* Should never happen */</div><div class='ctx'> 		dprintk(1, "qbuf: buffer is NULL\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (b-&gt;memory != q-&gt;memory) {</div><div class='ctx'> 		dprintk(1, "qbuf: invalid memory type\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (vb-&gt;state) {</div><div class='ctx'> 	case VB2_BUF_STATE_DEQUEUED:</div><div class='ctx'> 		ret = __buf_prepare(vb, b);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+			goto unlock;</div><div class='ctx'> 	case VB2_BUF_STATE_PREPARED:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dprintk(1, "qbuf: buffer already in use\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1141,7 +1166,10 @@ int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b)</div><div class='ctx'> 	__fill_v4l2_buffer(vb, b);</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, "qbuf of buffer %d succeeded\n", vb-&gt;v4l2_buf.index);</div><div class='del'>-	return 0;</div><div class='add'>+unlock:</div><div class='add'>+	if (mmap_sem)</div><div class='add'>+		up_read(mmap_sem);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(vb2_qbuf);</div><div class='ctx'> </div><div class='hunk'>@@ -1521,7 +1549,6 @@ static int __find_plane_by_offset(struct vb2_queue *q, unsigned long off,</div><div class='ctx'> int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long off = vma-&gt;vm_pgoff &lt;&lt; PAGE_SHIFT;</div><div class='del'>-	struct vb2_plane *vb_plane;</div><div class='ctx'> 	struct vb2_buffer *vb;</div><div class='ctx'> 	unsigned int buffer, plane;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1558,9 +1585,8 @@ int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	vb = q-&gt;bufs[buffer];</div><div class='del'>-	vb_plane = &amp;vb-&gt;planes[plane];</div><div class='ctx'> </div><div class='del'>-	ret = q-&gt;mem_ops-&gt;mmap(vb_plane-&gt;mem_priv, vma);</div><div class='add'>+	ret = call_memop(q, mmap, vb-&gt;planes[plane].mem_priv, vma);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/videobuf2-dma-sg.c b/drivers/media/video/videobuf2-dma-sg.c<br/>index 3bad8b105fea..25c3b360e1ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/videobuf2-dma-sg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/videobuf2-dma-sg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/videobuf2-dma-sg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/videobuf2-dma-sg.c</a></div><div class='hunk'>@@ -140,7 +140,6 @@ static void *vb2_dma_sg_get_userptr(void *alloc_ctx, unsigned long vaddr,</div><div class='ctx'> 	if (!buf-&gt;pages)</div><div class='ctx'> 		goto userptr_fail_pages_array_alloc;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 	num_pages_from_user = get_user_pages(current, current-&gt;mm,</div><div class='ctx'> 					     vaddr &amp; PAGE_MASK,</div><div class='ctx'> 					     buf-&gt;sg_desc.num_pages,</div><div class='hunk'>@@ -148,7 +147,7 @@ static void *vb2_dma_sg_get_userptr(void *alloc_ctx, unsigned long vaddr,</div><div class='ctx'> 					     1, /* force */</div><div class='ctx'> 					     buf-&gt;pages,</div><div class='ctx'> 					     NULL);</div><div class='del'>-	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+</div><div class='ctx'> 	if (num_pages_from_user != buf-&gt;sg_desc.num_pages)</div><div class='ctx'> 		goto userptr_fail_get_user_pages;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/videobuf2-memops.c b/drivers/media/video/videobuf2-memops.c<br/>index 71a7a78c3fc0..c41cb60245d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/videobuf2-memops.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/videobuf2-memops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/videobuf2-memops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/videobuf2-memops.c</a></div><div class='hunk'>@@ -100,29 +100,26 @@ int vb2_get_contig_userptr(unsigned long vaddr, unsigned long size,</div><div class='ctx'> 	unsigned long offset, start, end;</div><div class='ctx'> 	unsigned long this_pfn, prev_pfn;</div><div class='ctx'> 	dma_addr_t pa = 0;</div><div class='del'>-	int ret = -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	start = vaddr;</div><div class='ctx'> 	offset = start &amp; ~PAGE_MASK;</div><div class='ctx'> 	end = start + size;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;mm-&gt;mmap_sem);</div><div class='ctx'> 	vma = find_vma(mm, start);</div><div class='ctx'> </div><div class='ctx'> 	if (vma == NULL || vma-&gt;vm_end &lt; end)</div><div class='del'>-		goto done;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	for (prev_pfn = 0; start &lt; end; start += PAGE_SIZE) {</div><div class='del'>-		ret = follow_pfn(vma, start, &amp;this_pfn);</div><div class='add'>+		int ret = follow_pfn(vma, start, &amp;this_pfn);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto done;</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='ctx'> 		if (prev_pfn == 0)</div><div class='ctx'> 			pa = this_pfn &lt;&lt; PAGE_SHIFT;</div><div class='del'>-		else if (this_pfn != prev_pfn + 1) {</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='add'>+		else if (this_pfn != prev_pfn + 1)</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='ctx'> 		prev_pfn = this_pfn;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -130,16 +127,11 @@ int vb2_get_contig_userptr(unsigned long vaddr, unsigned long size,</div><div class='ctx'> 	 * Memory is contigous, lock vma and return to the caller</div><div class='ctx'> 	 */</div><div class='ctx'> 	*res_vma = vb2_get_vma(vma);</div><div class='del'>-	if (*res_vma == NULL) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	*res_pa = pa + offset;</div><div class='del'>-	ret = 0;</div><div class='add'>+	if (*res_vma == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-done:</div><div class='del'>-	up_read(&amp;mm-&gt;mmap_sem);</div><div class='del'>-	return ret;</div><div class='add'>+	*res_pa = pa + offset;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(vb2_get_contig_userptr);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/videobuf2-vmalloc.c b/drivers/media/video/videobuf2-vmalloc.c<br/>index a3a884234059..4e789a178f8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/videobuf2-vmalloc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/videobuf2-vmalloc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/videobuf2-vmalloc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/videobuf2-vmalloc.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -20,7 +21,10 @@</div><div class='ctx'> </div><div class='ctx'> struct vb2_vmalloc_buf {</div><div class='ctx'> 	void				*vaddr;</div><div class='add'>+	struct page			**pages;</div><div class='add'>+	int				write;</div><div class='ctx'> 	unsigned long			size;</div><div class='add'>+	unsigned int			n_pages;</div><div class='ctx'> 	atomic_t			refcount;</div><div class='ctx'> 	struct vb2_vmarea_handler	handler;</div><div class='ctx'> };</div><div class='hunk'>@@ -31,7 +35,7 @@ static void *vb2_vmalloc_alloc(void *alloc_ctx, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	struct vb2_vmalloc_buf *buf;</div><div class='ctx'> </div><div class='del'>-	buf = kzalloc(sizeof *buf, GFP_KERNEL);</div><div class='add'>+	buf = kzalloc(sizeof(*buf), GFP_KERNEL);</div><div class='ctx'> 	if (!buf)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -42,15 +46,12 @@ static void *vb2_vmalloc_alloc(void *alloc_ctx, unsigned long size)</div><div class='ctx'> 	buf-&gt;handler.arg = buf;</div><div class='ctx'> </div><div class='ctx'> 	if (!buf-&gt;vaddr) {</div><div class='del'>-		printk(KERN_ERR "vmalloc of size %ld failed\n", buf-&gt;size);</div><div class='add'>+		pr_debug("vmalloc of size %ld failed\n", buf-&gt;size);</div><div class='ctx'> 		kfree(buf);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;buf-&gt;refcount);</div><div class='del'>-	printk(KERN_DEBUG "Allocated vmalloc buffer of size %ld at vaddr=%p\n",</div><div class='del'>-			buf-&gt;size, buf-&gt;vaddr);</div><div class='del'>-</div><div class='ctx'> 	return buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -59,21 +60,84 @@ static void vb2_vmalloc_put(void *buf_priv)</div><div class='ctx'> 	struct vb2_vmalloc_buf *buf = buf_priv;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_dec_and_test(&amp;buf-&gt;refcount)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: Freeing vmalloc mem at vaddr=%p\n",</div><div class='del'>-			__func__, buf-&gt;vaddr);</div><div class='ctx'> 		vfree(buf-&gt;vaddr);</div><div class='ctx'> 		kfree(buf);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *vb2_vmalloc_vaddr(void *buf_priv)</div><div class='add'>+static void *vb2_vmalloc_get_userptr(void *alloc_ctx, unsigned long vaddr,</div><div class='add'>+				     unsigned long size, int write)</div><div class='add'>+{</div><div class='add'>+	struct vb2_vmalloc_buf *buf;</div><div class='add'>+	unsigned long first, last;</div><div class='add'>+	int n_pages, offset;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(sizeof(*buf), GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	buf-&gt;write = write;</div><div class='add'>+	offset = vaddr &amp; ~PAGE_MASK;</div><div class='add'>+	buf-&gt;size = size;</div><div class='add'>+</div><div class='add'>+	first = vaddr &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	last  = (vaddr + size - 1) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	buf-&gt;n_pages = last - first + 1;</div><div class='add'>+	buf-&gt;pages = kzalloc(buf-&gt;n_pages * sizeof(struct page *), GFP_KERNEL);</div><div class='add'>+	if (!buf-&gt;pages)</div><div class='add'>+		goto fail_pages_array_alloc;</div><div class='add'>+</div><div class='add'>+	/* current-&gt;mm-&gt;mmap_sem is taken by videobuf2 core */</div><div class='add'>+	n_pages = get_user_pages(current, current-&gt;mm, vaddr &amp; PAGE_MASK,</div><div class='add'>+				 buf-&gt;n_pages, write, 1, /* force */</div><div class='add'>+				 buf-&gt;pages, NULL);</div><div class='add'>+	if (n_pages != buf-&gt;n_pages)</div><div class='add'>+		goto fail_get_user_pages;</div><div class='add'>+</div><div class='add'>+	buf-&gt;vaddr = vm_map_ram(buf-&gt;pages, buf-&gt;n_pages, -1, PAGE_KERNEL);</div><div class='add'>+	if (!buf-&gt;vaddr)</div><div class='add'>+		goto fail_get_user_pages;</div><div class='add'>+</div><div class='add'>+	buf-&gt;vaddr += offset;</div><div class='add'>+	return buf;</div><div class='add'>+</div><div class='add'>+fail_get_user_pages:</div><div class='add'>+	pr_debug("get_user_pages requested/got: %d/%d]\n", n_pages,</div><div class='add'>+		 buf-&gt;n_pages);</div><div class='add'>+	while (--n_pages &gt;= 0)</div><div class='add'>+		put_page(buf-&gt;pages[n_pages]);</div><div class='add'>+	kfree(buf-&gt;pages);</div><div class='add'>+</div><div class='add'>+fail_pages_array_alloc:</div><div class='add'>+	kfree(buf);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vb2_vmalloc_put_userptr(void *buf_priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct vb2_vmalloc_buf *buf = buf_priv;</div><div class='add'>+	unsigned long vaddr = (unsigned long)buf-&gt;vaddr &amp; PAGE_MASK;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (vaddr)</div><div class='add'>+		vm_unmap_ram((void *)vaddr, buf-&gt;n_pages);</div><div class='add'>+	for (i = 0; i &lt; buf-&gt;n_pages; ++i) {</div><div class='add'>+		if (buf-&gt;write)</div><div class='add'>+			set_page_dirty_lock(buf-&gt;pages[i]);</div><div class='add'>+		put_page(buf-&gt;pages[i]);</div><div class='add'>+	}</div><div class='add'>+	kfree(buf-&gt;pages);</div><div class='add'>+	kfree(buf);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!buf);</div><div class='add'>+static void *vb2_vmalloc_vaddr(void *buf_priv)</div><div class='add'>+{</div><div class='add'>+	struct vb2_vmalloc_buf *buf = buf_priv;</div><div class='ctx'> </div><div class='ctx'> 	if (!buf-&gt;vaddr) {</div><div class='del'>-		printk(KERN_ERR "Address of an unallocated plane requested\n");</div><div class='add'>+		pr_err("Address of an unallocated plane requested "</div><div class='add'>+		       "or cannot map user pointer\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -92,13 +156,13 @@ static int vb2_vmalloc_mmap(void *buf_priv, struct vm_area_struct *vma)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!buf) {</div><div class='del'>-		printk(KERN_ERR "No memory to map\n");</div><div class='add'>+		pr_err("No memory to map\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = remap_vmalloc_range(vma, buf-&gt;vaddr, 0);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		printk(KERN_ERR "Remapping vmalloc memory, error: %d\n", ret);</div><div class='add'>+		pr_err("Remapping vmalloc memory, error: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -121,6 +185,8 @@ static int vb2_vmalloc_mmap(void *buf_priv, struct vm_area_struct *vma)</div><div class='ctx'> const struct vb2_mem_ops vb2_vmalloc_memops = {</div><div class='ctx'> 	.alloc		= vb2_vmalloc_alloc,</div><div class='ctx'> 	.put		= vb2_vmalloc_put,</div><div class='add'>+	.get_userptr	= vb2_vmalloc_get_userptr,</div><div class='add'>+	.put_userptr	= vb2_vmalloc_put_userptr,</div><div class='ctx'> 	.vaddr		= vb2_vmalloc_vaddr,</div><div class='ctx'> 	.mmap		= vb2_vmalloc_mmap,</div><div class='ctx'> 	.num_users	= vb2_vmalloc_num_users,</div><div class='head'>diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c<br/>index 52a0a3736c82..4d7391ec8001 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/vino.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/vino.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/vino.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/vino.c</a></div><div class='hunk'>@@ -708,7 +708,7 @@ static int vino_allocate_buffer(struct vino_framebuffer *fb,</div><div class='ctx'> 		size, count);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate memory for table with virtual (page) addresses */</div><div class='del'>-	fb-&gt;desc_table.virtual = (unsigned long *)</div><div class='add'>+	fb-&gt;desc_table.virtual =</div><div class='ctx'> 		kmalloc(count * sizeof(unsigned long), GFP_KERNEL);</div><div class='ctx'> 	if (!fb-&gt;desc_table.virtual)</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/drivers/media/video/zoran/zoran_device.c b/drivers/media/video/zoran/zoran_device.c<br/>index e8a27844bf39..e86173bd1327 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/zoran/zoran_device.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/zoran/zoran_device.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zoran/zoran_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/zoran/zoran_device.c</a></div><div class='hunk'>@@ -57,7 +57,7 @@</div><div class='ctx'> 		   ZR36057_ISR_GIRQ1 | \</div><div class='ctx'> 		   ZR36057_ISR_JPEGRepIRQ )</div><div class='ctx'> </div><div class='del'>-static int lml33dpath;		/* default = 0</div><div class='add'>+static bool lml33dpath;		/* default = 0</div><div class='ctx'> 				 * 1 will use digital path in capture</div><div class='ctx'> 				 * mode instead of analog. It can be</div><div class='ctx'> 				 * used for picture adjustments using</div><div class='head'>diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c<br/>index d4d05d2ace65..4c09ab781ec3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/zoran/zoran_driver.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/zoran/zoran_driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zoran/zoran_driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/zoran/zoran_driver.c</a></div><div class='hunk'>@@ -1550,7 +1550,7 @@ static int zoran_enum_fmt(struct zoran *zr, struct v4l2_fmtdesc *fmt, int flag)</div><div class='ctx'> 		if (zoran_formats[i].flags &amp; flag &amp;&amp; num++ == fmt-&gt;index) {</div><div class='ctx'> 			strncpy(fmt-&gt;description, zoran_formats[i].name,</div><div class='ctx'> 				sizeof(fmt-&gt;description) - 1);</div><div class='del'>-			/* fmt struct pre-zeroed, so adding '\0' not neeed */</div><div class='add'>+			/* fmt struct pre-zeroed, so adding '\0' not needed */</div><div class='ctx'> 			fmt-&gt;pixelformat = zoran_formats[i].fourcc;</div><div class='ctx'> 			if (zoran_formats[i].flags &amp; ZORAN_FORMAT_COMPRESSED)</div><div class='ctx'> 				fmt-&gt;flags |= V4L2_FMT_FLAG_COMPRESSED;</div><div class='hunk'>@@ -1958,7 +1958,6 @@ static int zoran_g_fbuf(struct file *file, void *__fh,</div><div class='ctx'> 	mutex_unlock(&amp;zr-&gt;resource_lock);</div><div class='ctx'> 	fb-&gt;fmt.colorspace = V4L2_COLORSPACE_SRGB;</div><div class='ctx'> 	fb-&gt;fmt.field = V4L2_FIELD_INTERLACED;</div><div class='del'>-	fb-&gt;flags = V4L2_FBUF_FLAG_OVERLAY;</div><div class='ctx'> 	fb-&gt;capability = V4L2_FBUF_CAP_LIST_CLIPPING;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/media/video/zoran/zr36060.c b/drivers/media/video/zoran/zr36060.c<br/>index 5e4f57cbf314..f08546fe2234 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/zoran/zr36060.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/zoran/zr36060.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zoran/zr36060.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/zoran/zr36060.c</a></div><div class='hunk'>@@ -50,7 +50,7 @@</div><div class='ctx'> /* amount of chips attached via this driver */</div><div class='ctx'> static int zr36060_codecs;</div><div class='ctx'> </div><div class='del'>-static int low_bitrate;</div><div class='add'>+static bool low_bitrate;</div><div class='ctx'> module_param(low_bitrate, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(low_bitrate, "Buz compatibility option, halves bitrate");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c<br/>index e78cf94f491e..cd2e39fc4bf0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/zr364xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/media/video/zr364xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zr364xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/media/video/zr364xx.c</a></div><div class='hunk'>@@ -1695,28 +1695,7 @@ static struct usb_driver zr364xx_driver = {</div><div class='ctx'> 	.id_table = device_table</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init zr364xx_init(void)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	retval = usb_register(&amp;zr364xx_driver);</div><div class='del'>-	if (retval)</div><div class='del'>-		printk(KERN_ERR KBUILD_MODNAME ": usb_register failed!\n");</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void __exit zr364xx_exit(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC " module unloaded\n");</div><div class='del'>-	usb_deregister(&amp;zr364xx_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-module_init(zr364xx_init);</div><div class='del'>-module_exit(zr364xx_exit);</div><div class='add'>+module_usb_driver(zr364xx_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='head'>diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c<br/>index 6ce70e9615d3..5319e9b65847 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/memstick/host/jmb38x_ms.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/memstick/host/jmb38x_ms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/memstick/host/jmb38x_ms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/memstick/host/jmb38x_ms.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME "jmb38x_ms"</div><div class='ctx'> </div><div class='del'>-static int no_dma;</div><div class='add'>+static bool no_dma;</div><div class='ctx'> module_param(no_dma, bool, 0644);</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='head'>diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c<br/>index 668f5c6a0399..29b2172ae18f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/memstick/host/r592.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/memstick/host/r592.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/memstick/host/r592.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/memstick/host/r592.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/swab.h&gt;</div><div class='ctx'> #include "r592.h"</div><div class='ctx'> </div><div class='del'>-static int r592_enable_dma = 1;</div><div class='add'>+static bool r592_enable_dma = 1;</div><div class='ctx'> static int debug;</div><div class='ctx'> </div><div class='ctx'> static const char *tpc_names[] = {</div><div class='head'>diff --git a/drivers/memstick/host/tifm_ms.c b/drivers/memstick/host/tifm_ms.c<br/>index b7aacf47703a..6902b83eb1b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/memstick/host/tifm_ms.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/memstick/host/tifm_ms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/memstick/host/tifm_ms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/memstick/host/tifm_ms.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME "tifm_ms"</div><div class='ctx'> </div><div class='del'>-static int no_dma;</div><div class='add'>+static bool no_dma;</div><div class='ctx'> module_param(no_dma, bool, 0644);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/message/fusion/lsi/mpi_cnfg.h b/drivers/message/fusion/lsi/mpi_cnfg.h<br/>index 22027e7946f7..d9bcfba6b049 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi_cnfg.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/message/fusion/lsi/mpi_cnfg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi_cnfg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/message/fusion/lsi/mpi_cnfg.h</a></div><div class='hunk'>@@ -583,6 +583,7 @@ typedef struct _MSG_CONFIG_REPLY</div><div class='ctx'> #define MPI_MANUFACTPAGE_DEVID_SAS1066E             (0x005A)</div><div class='ctx'> #define MPI_MANUFACTPAGE_DEVID_SAS1068              (0x0054)</div><div class='ctx'> #define MPI_MANUFACTPAGE_DEVID_SAS1068E             (0x0058)</div><div class='add'>+#define MPI_MANUFACTPAGE_DEVID_SAS1068_820XELP      (0x0059)</div><div class='ctx'> #define MPI_MANUFACTPAGE_DEVID_SAS1078              (0x0062)</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/message/fusion/lsi/mpi_ioc.h b/drivers/message/fusion/lsi/mpi_ioc.h<br/>index fd6222882a0e..19fb21b8f0ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi_ioc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/message/fusion/lsi/mpi_ioc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi_ioc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/message/fusion/lsi/mpi_ioc.h</a></div><div class='hunk'>@@ -857,7 +857,7 @@ typedef struct _EVENT_DATA_SAS_DISCOVERY</div><div class='ctx'> #define MPI_EVENT_SAS_DSCVRY_PHY_BITS_MASK                  (0xFFFF0000)</div><div class='ctx'> #define MPI_EVENT_SAS_DSCVRY_PHY_BITS_SHIFT                 (16)</div><div class='ctx'> </div><div class='del'>-/* SAS Discovery Errror Event data */</div><div class='add'>+/* SAS Discovery Error Event data */</div><div class='ctx'> </div><div class='ctx'> typedef struct _EVENT_DATA_DISCOVERY_ERROR</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c<br/>index e9c6a6047a00..a7dc4672d996 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/mptbase.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/message/fusion/mptbase.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/mptbase.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/message/fusion/mptbase.c</a></div><div class='hunk'>@@ -115,7 +115,8 @@ module_param(mpt_fwfault_debug, int, 0600);</div><div class='ctx'> MODULE_PARM_DESC(mpt_fwfault_debug,</div><div class='ctx'> 		 "Enable detection of Firmware fault and halt Firmware on fault - (default=0)");</div><div class='ctx'> </div><div class='del'>-static char	MptCallbacksName[MPT_MAX_PROTOCOL_DRIVERS][50];</div><div class='add'>+static char	MptCallbacksName[MPT_MAX_PROTOCOL_DRIVERS]</div><div class='add'>+				[MPT_MAX_CALLBACKNAME_LEN+1];</div><div class='ctx'> </div><div class='ctx'> #ifdef MFCNT</div><div class='ctx'> static int mfcounter = 0;</div><div class='hunk'>@@ -717,8 +718,8 @@ mpt_register(MPT_CALLBACK cbfunc, MPT_DRIVER_CLASS dclass, char *func_name)</div><div class='ctx'> 			MptDriverClass[cb_idx] = dclass;</div><div class='ctx'> 			MptEvHandlers[cb_idx] = NULL;</div><div class='ctx'> 			last_drv_idx = cb_idx;</div><div class='del'>-			memcpy(MptCallbacksName[cb_idx], func_name,</div><div class='del'>-			    strlen(func_name) &gt; 50 ? 50 : strlen(func_name));</div><div class='add'>+			strlcpy(MptCallbacksName[cb_idx], func_name,</div><div class='add'>+				MPT_MAX_CALLBACKNAME_LEN+1);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h<br/>index b4d24dc081ae..76c05bc24cb7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/mptbase.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/message/fusion/mptbase.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/mptbase.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/message/fusion/mptbase.h</a></div><div class='hunk'>@@ -89,6 +89,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #define MPT_MAX_ADAPTERS		18</div><div class='ctx'> #define MPT_MAX_PROTOCOL_DRIVERS	16</div><div class='add'>+#define MPT_MAX_CALLBACKNAME_LEN	49</div><div class='ctx'> #define MPT_MAX_BUS			1	/* Do not change */</div><div class='ctx'> #define MPT_MAX_FC_DEVICES		255</div><div class='ctx'> #define MPT_MAX_SCSI_DEVICES		16</div><div class='head'>diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c<br/>index 9d9504298549..551262e4b96e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/mptsas.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/message/fusion/mptsas.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/mptsas.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/message/fusion/mptsas.c</a></div><div class='hunk'>@@ -5376,6 +5376,8 @@ static struct pci_device_id mptsas_pci_table[] = {</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID },</div><div class='ctx'> 	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1078,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID },</div><div class='add'>+	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068_820XELP,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID },</div><div class='ctx'> 	{0}	/* Terminating entry */</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, mptsas_pci_table);</div><div class='head'>diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c<br/>index 07dbeaf9df99..6d115c7208ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/i2o/i2o_proc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/message/i2o/i2o_proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/i2o/i2o_proc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/message/i2o/i2o_proc.c</a></div><div class='hunk'>@@ -56,7 +56,7 @@</div><div class='ctx'> /* Structure used to define /proc entries */</div><div class='ctx'> typedef struct _i2o_proc_entry_t {</div><div class='ctx'> 	char *name;		/* entry name */</div><div class='del'>-	mode_t mode;		/* mode */</div><div class='add'>+	umode_t mode;		/* mode */</div><div class='ctx'> 	const struct file_operations *fops;	/* open function */</div><div class='ctx'> } i2o_proc_entry;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mfd/88pm860x-i2c.c b/drivers/mfd/88pm860x-i2c.c<br/>index e017dc88622a..f93dd9571c3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/88pm860x-i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/88pm860x-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/88pm860x-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/88pm860x-i2c.c</a></div><div class='hunk'>@@ -12,51 +12,20 @@</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/i2c.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/88pm860x.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-static inline int pm860x_read_device(struct i2c_client *i2c,</div><div class='del'>-				     int reg, int bytes, void *dest)</div><div class='del'>-{</div><div class='del'>-	unsigned char data;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	data = (unsigned char)reg;</div><div class='del'>-	ret = i2c_master_send(i2c, &amp;data, 1);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = i2c_master_recv(i2c, dest, bytes);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int pm860x_write_device(struct i2c_client *i2c,</div><div class='del'>-				      int reg, int bytes, void *src)</div><div class='del'>-{</div><div class='del'>-	unsigned char buf[bytes + 1];</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	buf[0] = (unsigned char)reg;</div><div class='del'>-	memcpy(&amp;buf[1], src, bytes);</div><div class='del'>-</div><div class='del'>-	ret = i2c_master_send(i2c, buf, bytes + 1);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int pm860x_reg_read(struct i2c_client *i2c, int reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct pm860x_chip *chip = i2c_get_clientdata(i2c);</div><div class='del'>-	unsigned char data;</div><div class='add'>+	struct regmap *map = (i2c == chip-&gt;client) ? chip-&gt;regmap</div><div class='add'>+				: chip-&gt;regmap_companion;</div><div class='add'>+	unsigned int data;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;io_lock);</div><div class='del'>-	ret = pm860x_read_device(i2c, reg, 1, &amp;data);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;io_lock);</div><div class='del'>-</div><div class='add'>+	ret = regmap_read(map, reg, &amp;data);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -68,12 +37,11 @@ int pm860x_reg_write(struct i2c_client *i2c, int reg,</div><div class='ctx'> 		     unsigned char data)</div><div class='ctx'> {</div><div class='ctx'> 	struct pm860x_chip *chip = i2c_get_clientdata(i2c);</div><div class='add'>+	struct regmap *map = (i2c == chip-&gt;client) ? chip-&gt;regmap</div><div class='add'>+				: chip-&gt;regmap_companion;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;io_lock);</div><div class='del'>-	ret = pm860x_write_device(i2c, reg, 1, &amp;data);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;io_lock);</div><div class='del'>-</div><div class='add'>+	ret = regmap_write(map, reg, data);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pm860x_reg_write);</div><div class='hunk'>@@ -82,12 +50,11 @@ int pm860x_bulk_read(struct i2c_client *i2c, int reg,</div><div class='ctx'> 		     int count, unsigned char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct pm860x_chip *chip = i2c_get_clientdata(i2c);</div><div class='add'>+	struct regmap *map = (i2c == chip-&gt;client) ? chip-&gt;regmap</div><div class='add'>+				: chip-&gt;regmap_companion;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;io_lock);</div><div class='del'>-	ret = pm860x_read_device(i2c, reg, count, buf);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;io_lock);</div><div class='del'>-</div><div class='add'>+	ret = regmap_raw_read(map, reg, buf, count);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pm860x_bulk_read);</div><div class='hunk'>@@ -96,12 +63,11 @@ int pm860x_bulk_write(struct i2c_client *i2c, int reg,</div><div class='ctx'> 		      int count, unsigned char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct pm860x_chip *chip = i2c_get_clientdata(i2c);</div><div class='add'>+	struct regmap *map = (i2c == chip-&gt;client) ? chip-&gt;regmap</div><div class='add'>+				: chip-&gt;regmap_companion;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;io_lock);</div><div class='del'>-	ret = pm860x_write_device(i2c, reg, count, buf);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;io_lock);</div><div class='del'>-</div><div class='add'>+	ret = regmap_raw_write(map, reg, buf, count);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pm860x_bulk_write);</div><div class='hunk'>@@ -110,39 +76,78 @@ int pm860x_set_bits(struct i2c_client *i2c, int reg,</div><div class='ctx'> 		    unsigned char mask, unsigned char data)</div><div class='ctx'> {</div><div class='ctx'> 	struct pm860x_chip *chip = i2c_get_clientdata(i2c);</div><div class='del'>-	unsigned char value;</div><div class='add'>+	struct regmap *map = (i2c == chip-&gt;client) ? chip-&gt;regmap</div><div class='add'>+				: chip-&gt;regmap_companion;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;io_lock);</div><div class='del'>-	ret = pm860x_read_device(i2c, reg, 1, &amp;value);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	value &amp;= ~mask;</div><div class='del'>-	value |= data;</div><div class='del'>-	ret = pm860x_write_device(i2c, reg, 1, &amp;value);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;io_lock);</div><div class='add'>+	ret = regmap_update_bits(map, reg, mask, data);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pm860x_set_bits);</div><div class='ctx'> </div><div class='add'>+static int read_device(struct i2c_client *i2c, int reg,</div><div class='add'>+		       int bytes, void *dest)</div><div class='add'>+{</div><div class='add'>+	unsigned char msgbuf0[I2C_SMBUS_BLOCK_MAX + 3];</div><div class='add'>+	unsigned char msgbuf1[I2C_SMBUS_BLOCK_MAX + 2];</div><div class='add'>+	struct i2c_adapter *adap = i2c-&gt;adapter;</div><div class='add'>+	struct i2c_msg msg[2] = {{i2c-&gt;addr, 0, 1, msgbuf0},</div><div class='add'>+				 {i2c-&gt;addr, I2C_M_RD, 0, msgbuf1},</div><div class='add'>+				};</div><div class='add'>+	int num = 1, ret = 0;</div><div class='add'>+</div><div class='add'>+	if (dest == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	msgbuf0[0] = (unsigned char)reg;	/* command */</div><div class='add'>+	msg[1].len = bytes;</div><div class='add'>+</div><div class='add'>+	/* if data needs to read back, num should be 2 */</div><div class='add'>+	if (bytes &gt; 0)</div><div class='add'>+		num = 2;</div><div class='add'>+	ret = adap-&gt;algo-&gt;master_xfer(adap, msg, num);</div><div class='add'>+	memcpy(dest, msgbuf1, bytes);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int write_device(struct i2c_client *i2c, int reg,</div><div class='add'>+			int bytes, void *src)</div><div class='add'>+{</div><div class='add'>+	unsigned char buf[bytes + 1];</div><div class='add'>+	struct i2c_adapter *adap = i2c-&gt;adapter;</div><div class='add'>+	struct i2c_msg msg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	buf[0] = (unsigned char)reg;</div><div class='add'>+	memcpy(&amp;buf[1], src, bytes);</div><div class='add'>+	msg.addr = i2c-&gt;addr;</div><div class='add'>+	msg.flags = 0;</div><div class='add'>+	msg.len = bytes + 1;</div><div class='add'>+	msg.buf = buf;</div><div class='add'>+</div><div class='add'>+	ret = adap-&gt;algo-&gt;master_xfer(adap, &amp;msg, 1);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int pm860x_page_reg_read(struct i2c_client *i2c, int reg)</div><div class='ctx'> {</div><div class='del'>-	struct pm860x_chip *chip = i2c_get_clientdata(i2c);</div><div class='ctx'> 	unsigned char zero = 0;</div><div class='ctx'> 	unsigned char data;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;io_lock);</div><div class='del'>-	pm860x_write_device(i2c, 0xFA, 0, &amp;zero);</div><div class='del'>-	pm860x_write_device(i2c, 0xFB, 0, &amp;zero);</div><div class='del'>-	pm860x_write_device(i2c, 0xFF, 0, &amp;zero);</div><div class='del'>-	ret = pm860x_read_device(i2c, reg, 1, &amp;data);</div><div class='add'>+	i2c_lock_adapter(i2c-&gt;adapter);</div><div class='add'>+	read_device(i2c, 0xFA, 0, &amp;zero);</div><div class='add'>+	read_device(i2c, 0xFB, 0, &amp;zero);</div><div class='add'>+	read_device(i2c, 0xFF, 0, &amp;zero);</div><div class='add'>+	ret = read_device(i2c, reg, 1, &amp;data);</div><div class='ctx'> 	if (ret &gt;= 0)</div><div class='ctx'> 		ret = (int)data;</div><div class='del'>-	pm860x_write_device(i2c, 0xFE, 0, &amp;zero);</div><div class='del'>-	pm860x_write_device(i2c, 0xFC, 0, &amp;zero);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;io_lock);</div><div class='add'>+	read_device(i2c, 0xFE, 0, &amp;zero);</div><div class='add'>+	read_device(i2c, 0xFC, 0, &amp;zero);</div><div class='add'>+	i2c_unlock_adapter(i2c-&gt;adapter);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pm860x_page_reg_read);</div><div class='hunk'>@@ -150,18 +155,17 @@ EXPORT_SYMBOL(pm860x_page_reg_read);</div><div class='ctx'> int pm860x_page_reg_write(struct i2c_client *i2c, int reg,</div><div class='ctx'> 			  unsigned char data)</div><div class='ctx'> {</div><div class='del'>-	struct pm860x_chip *chip = i2c_get_clientdata(i2c);</div><div class='ctx'> 	unsigned char zero;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;io_lock);</div><div class='del'>-	pm860x_write_device(i2c, 0xFA, 0, &amp;zero);</div><div class='del'>-	pm860x_write_device(i2c, 0xFB, 0, &amp;zero);</div><div class='del'>-	pm860x_write_device(i2c, 0xFF, 0, &amp;zero);</div><div class='del'>-	ret = pm860x_write_device(i2c, reg, 1, &amp;data);</div><div class='del'>-	pm860x_write_device(i2c, 0xFE, 0, &amp;zero);</div><div class='del'>-	pm860x_write_device(i2c, 0xFC, 0, &amp;zero);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;io_lock);</div><div class='add'>+	i2c_lock_adapter(i2c-&gt;adapter);</div><div class='add'>+	read_device(i2c, 0xFA, 0, &amp;zero);</div><div class='add'>+	read_device(i2c, 0xFB, 0, &amp;zero);</div><div class='add'>+	read_device(i2c, 0xFF, 0, &amp;zero);</div><div class='add'>+	ret = write_device(i2c, reg, 1, &amp;data);</div><div class='add'>+	read_device(i2c, 0xFE, 0, &amp;zero);</div><div class='add'>+	read_device(i2c, 0xFC, 0, &amp;zero);</div><div class='add'>+	i2c_unlock_adapter(i2c-&gt;adapter);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pm860x_page_reg_write);</div><div class='hunk'>@@ -169,18 +173,17 @@ EXPORT_SYMBOL(pm860x_page_reg_write);</div><div class='ctx'> int pm860x_page_bulk_read(struct i2c_client *i2c, int reg,</div><div class='ctx'> 			  int count, unsigned char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct pm860x_chip *chip = i2c_get_clientdata(i2c);</div><div class='ctx'> 	unsigned char zero = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;io_lock);</div><div class='del'>-	pm860x_write_device(i2c, 0xFA, 0, &amp;zero);</div><div class='del'>-	pm860x_write_device(i2c, 0xFB, 0, &amp;zero);</div><div class='del'>-	pm860x_write_device(i2c, 0xFF, 0, &amp;zero);</div><div class='del'>-	ret = pm860x_read_device(i2c, reg, count, buf);</div><div class='del'>-	pm860x_write_device(i2c, 0xFE, 0, &amp;zero);</div><div class='del'>-	pm860x_write_device(i2c, 0xFC, 0, &amp;zero);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;io_lock);</div><div class='add'>+	i2c_lock_adapter(i2c-&gt;adapter);</div><div class='add'>+	read_device(i2c, 0xfa, 0, &amp;zero);</div><div class='add'>+	read_device(i2c, 0xfb, 0, &amp;zero);</div><div class='add'>+	read_device(i2c, 0xff, 0, &amp;zero);</div><div class='add'>+	ret = read_device(i2c, reg, count, buf);</div><div class='add'>+	read_device(i2c, 0xFE, 0, &amp;zero);</div><div class='add'>+	read_device(i2c, 0xFC, 0, &amp;zero);</div><div class='add'>+	i2c_unlock_adapter(i2c-&gt;adapter);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pm860x_page_bulk_read);</div><div class='hunk'>@@ -188,18 +191,18 @@ EXPORT_SYMBOL(pm860x_page_bulk_read);</div><div class='ctx'> int pm860x_page_bulk_write(struct i2c_client *i2c, int reg,</div><div class='ctx'> 			   int count, unsigned char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct pm860x_chip *chip = i2c_get_clientdata(i2c);</div><div class='ctx'> 	unsigned char zero = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;io_lock);</div><div class='del'>-	pm860x_write_device(i2c, 0xFA, 0, &amp;zero);</div><div class='del'>-	pm860x_write_device(i2c, 0xFB, 0, &amp;zero);</div><div class='del'>-	pm860x_write_device(i2c, 0xFF, 0, &amp;zero);</div><div class='del'>-	ret = pm860x_write_device(i2c, reg, count, buf);</div><div class='del'>-	pm860x_write_device(i2c, 0xFE, 0, &amp;zero);</div><div class='del'>-	pm860x_write_device(i2c, 0xFC, 0, &amp;zero);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;io_lock);</div><div class='add'>+	i2c_lock_adapter(i2c-&gt;adapter);</div><div class='add'>+	read_device(i2c, 0xFA, 0, &amp;zero);</div><div class='add'>+	read_device(i2c, 0xFB, 0, &amp;zero);</div><div class='add'>+	read_device(i2c, 0xFF, 0, &amp;zero);</div><div class='add'>+	ret = write_device(i2c, reg, count, buf);</div><div class='add'>+	read_device(i2c, 0xFE, 0, &amp;zero);</div><div class='add'>+	read_device(i2c, 0xFC, 0, &amp;zero);</div><div class='add'>+	i2c_unlock_adapter(i2c-&gt;adapter);</div><div class='add'>+	i2c_unlock_adapter(i2c-&gt;adapter);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pm860x_page_bulk_write);</div><div class='hunk'>@@ -207,25 +210,24 @@ EXPORT_SYMBOL(pm860x_page_bulk_write);</div><div class='ctx'> int pm860x_page_set_bits(struct i2c_client *i2c, int reg,</div><div class='ctx'> 			 unsigned char mask, unsigned char data)</div><div class='ctx'> {</div><div class='del'>-	struct pm860x_chip *chip = i2c_get_clientdata(i2c);</div><div class='ctx'> 	unsigned char zero;</div><div class='ctx'> 	unsigned char value;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;io_lock);</div><div class='del'>-	pm860x_write_device(i2c, 0xFA, 0, &amp;zero);</div><div class='del'>-	pm860x_write_device(i2c, 0xFB, 0, &amp;zero);</div><div class='del'>-	pm860x_write_device(i2c, 0xFF, 0, &amp;zero);</div><div class='del'>-	ret = pm860x_read_device(i2c, reg, 1, &amp;value);</div><div class='add'>+	i2c_lock_adapter(i2c-&gt;adapter);</div><div class='add'>+	read_device(i2c, 0xFA, 0, &amp;zero);</div><div class='add'>+	read_device(i2c, 0xFB, 0, &amp;zero);</div><div class='add'>+	read_device(i2c, 0xFF, 0, &amp;zero);</div><div class='add'>+	ret = read_device(i2c, reg, 1, &amp;value);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	value &amp;= ~mask;</div><div class='ctx'> 	value |= data;</div><div class='del'>-	ret = pm860x_write_device(i2c, reg, 1, &amp;value);</div><div class='add'>+	ret = write_device(i2c, reg, 1, &amp;value);</div><div class='ctx'> out:</div><div class='del'>-	pm860x_write_device(i2c, 0xFE, 0, &amp;zero);</div><div class='del'>-	pm860x_write_device(i2c, 0xFC, 0, &amp;zero);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;io_lock);</div><div class='add'>+	read_device(i2c, 0xFE, 0, &amp;zero);</div><div class='add'>+	read_device(i2c, 0xFC, 0, &amp;zero);</div><div class='add'>+	i2c_unlock_adapter(i2c-&gt;adapter);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pm860x_page_set_bits);</div><div class='hunk'>@@ -257,11 +259,17 @@ static int verify_addr(struct i2c_client *i2c)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct regmap_config pm860x_regmap_config = {</div><div class='add'>+	.reg_bits = 8,</div><div class='add'>+	.val_bits = 8,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __devinit pm860x_probe(struct i2c_client *client,</div><div class='ctx'> 				  const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pm860x_platform_data *pdata = client-&gt;dev.platform_data;</div><div class='ctx'> 	struct pm860x_chip *chip;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!pdata) {</div><div class='ctx'> 		pr_info("No platform data in %s!\n", __func__);</div><div class='hunk'>@@ -273,10 +281,17 @@ static int __devinit pm860x_probe(struct i2c_client *client,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;id = verify_addr(client);</div><div class='add'>+	chip-&gt;regmap = regmap_init_i2c(client, &amp;pm860x_regmap_config);</div><div class='add'>+	if (IS_ERR(chip-&gt;regmap)) {</div><div class='add'>+		ret = PTR_ERR(chip-&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'>+		kfree(chip);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> 	chip-&gt;client = client;</div><div class='ctx'> 	i2c_set_clientdata(client, chip);</div><div class='ctx'> 	chip-&gt;dev = &amp;client-&gt;dev;</div><div class='del'>-	mutex_init(&amp;chip-&gt;io_lock);</div><div class='ctx'> 	dev_set_drvdata(chip-&gt;dev, chip);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -290,6 +305,14 @@ static int __devinit pm860x_probe(struct i2c_client *client,</div><div class='ctx'> 		chip-&gt;companion_addr = pdata-&gt;companion_addr;</div><div class='ctx'> 		chip-&gt;companion = i2c_new_dummy(chip-&gt;client-&gt;adapter,</div><div class='ctx'> 						chip-&gt;companion_addr);</div><div class='add'>+		chip-&gt;regmap_companion = regmap_init_i2c(chip-&gt;companion,</div><div class='add'>+							&amp;pm860x_regmap_config);</div><div class='add'>+		if (IS_ERR(chip-&gt;regmap_companion)) {</div><div class='add'>+			ret = PTR_ERR(chip-&gt;regmap_companion);</div><div class='add'>+			dev_err(&amp;chip-&gt;companion-&gt;dev,</div><div class='add'>+				"Failed to allocate register map: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='ctx'> 		i2c_set_clientdata(chip-&gt;companion, chip);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -302,7 +325,11 @@ static int __devexit pm860x_remove(struct i2c_client *client)</div><div class='ctx'> 	struct pm860x_chip *chip = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	pm860x_device_exit(chip);</div><div class='del'>-	i2c_unregister_device(chip-&gt;companion);</div><div class='add'>+	if (chip-&gt;companion) {</div><div class='add'>+		regmap_exit(chip-&gt;regmap_companion);</div><div class='add'>+		i2c_unregister_device(chip-&gt;companion);</div><div class='add'>+	}</div><div class='add'>+	regmap_exit(chip-&gt;regmap);</div><div class='ctx'> 	kfree(chip);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig<br/>index f1391c21ef26..cd13e9f2f5e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/Kconfig</a></div><div class='hunk'>@@ -12,6 +12,7 @@ config MFD_CORE</div><div class='ctx'> config MFD_88PM860X</div><div class='ctx'> 	bool "Support Marvell 88PM8606/88PM8607"</div><div class='ctx'> 	depends on I2C=y &amp;&amp; GENERIC_HARDIRQS</div><div class='add'>+	select REGMAP_I2C</div><div class='ctx'> 	select MFD_CORE</div><div class='ctx'> 	help</div><div class='ctx'> 	  This supports for Marvell 88PM8606/88PM8607 Power Management IC.</div><div class='hunk'>@@ -199,7 +200,7 @@ config MENELAUS</div><div class='ctx'> </div><div class='ctx'> config TWL4030_CORE</div><div class='ctx'> 	bool "Texas Instruments TWL4030/TWL5030/TWL6030/TPS659x0 Support"</div><div class='del'>-	depends on I2C=y &amp;&amp; GENERIC_HARDIRQS</div><div class='add'>+	depends on I2C=y &amp;&amp; GENERIC_HARDIRQS &amp;&amp; IRQ_DOMAIN</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say yes here if you have TWL4030 / TWL6030 family chip on your board.</div><div class='ctx'> 	  This core driver provides register access and IRQ handling</div><div class='hunk'>@@ -257,7 +258,7 @@ config TWL6040_CORE</div><div class='ctx'> </div><div class='ctx'> config MFD_STMPE</div><div class='ctx'> 	bool "Support STMicroelectronics STMPE"</div><div class='del'>-	depends on I2C=y &amp;&amp; GENERIC_HARDIRQS</div><div class='add'>+	depends on (I2C=y || SPI_MASTER=y) &amp;&amp; GENERIC_HARDIRQS</div><div class='ctx'> 	select MFD_CORE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for the STMPE family of I/O Expanders from</div><div class='hunk'>@@ -278,6 +279,23 @@ config MFD_STMPE</div><div class='ctx'> 		Keypad: stmpe-keypad</div><div class='ctx'> 		Touchscreen: stmpe-ts</div><div class='ctx'> </div><div class='add'>+menu "STMPE Interface Drivers"</div><div class='add'>+depends on MFD_STMPE</div><div class='add'>+</div><div class='add'>+config STMPE_I2C</div><div class='add'>+	bool "STMPE I2C Inteface"</div><div class='add'>+	depends on I2C=y</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  This is used to enable I2C interface of STMPE</div><div class='add'>+</div><div class='add'>+config STMPE_SPI</div><div class='add'>+	bool "STMPE SPI Inteface"</div><div class='add'>+	depends on SPI_MASTER</div><div class='add'>+	help</div><div class='add'>+	  This is used to enable SPI interface of STMPE</div><div class='add'>+endmenu</div><div class='add'>+</div><div class='ctx'> config MFD_TC3589X</div><div class='ctx'> 	bool "Support Toshiba TC35892 and variants"</div><div class='ctx'> 	depends on I2C=y &amp;&amp; GENERIC_HARDIRQS</div><div class='hunk'>@@ -311,7 +329,7 @@ config MFD_TC6387XB</div><div class='ctx'> </div><div class='ctx'> config MFD_TC6393XB</div><div class='ctx'> 	bool "Support Toshiba TC6393XB"</div><div class='del'>-	depends on GPIOLIB &amp;&amp; ARM</div><div class='add'>+	depends on GPIOLIB &amp;&amp; ARM &amp;&amp; HAVE_CLK</div><div class='ctx'> 	select MFD_CORE</div><div class='ctx'> 	select MFD_TMIO</div><div class='ctx'> 	help</div><div class='hunk'>@@ -328,6 +346,34 @@ config PMIC_DA903X</div><div class='ctx'> 	  individual components like LCD backlight, voltage regulators,</div><div class='ctx'> 	  LEDs and battery-charger under the corresponding menus.</div><div class='ctx'> </div><div class='add'>+config PMIC_DA9052</div><div class='add'>+	bool</div><div class='add'>+	select MFD_CORE</div><div class='add'>+</div><div class='add'>+config MFD_DA9052_SPI</div><div class='add'>+	bool "Support Dialog Semiconductor DA9052/53 PMIC variants with SPI"</div><div class='add'>+	select REGMAP_SPI</div><div class='add'>+	select REGMAP_IRQ</div><div class='add'>+	select PMIC_DA9052</div><div class='add'>+	depends on SPI_MASTER=y</div><div class='add'>+	help</div><div class='add'>+	  Support for the Dialog Semiconductor DA9052 PMIC</div><div class='add'>+	  when controlled using SPI. This driver provides common support</div><div class='add'>+	  for accessing the device, additional drivers must be enabled in</div><div class='add'>+	  order to use the functionality of the device.</div><div class='add'>+</div><div class='add'>+config MFD_DA9052_I2C</div><div class='add'>+	bool "Support Dialog Semiconductor DA9052/53 PMIC variants with I2C"</div><div class='add'>+	select REGMAP_I2C</div><div class='add'>+	select REGMAP_IRQ</div><div class='add'>+	select PMIC_DA9052</div><div class='add'>+	depends on I2C=y</div><div class='add'>+	help</div><div class='add'>+	  Support for the Dialog Semiconductor DA9052 PMIC</div><div class='add'>+	  when controlled using I2C. This driver provides common support</div><div class='add'>+	  for accessing the device, additional drivers must be enabled in</div><div class='add'>+	  order to use the functionality of the device.</div><div class='add'>+</div><div class='ctx'> config PMIC_ADP5520</div><div class='ctx'> 	bool "Analog Devices ADP5520/01 MFD PMIC Core Support"</div><div class='ctx'> 	depends on I2C=y</div><div class='hunk'>@@ -371,6 +417,17 @@ config MFD_MAX8998</div><div class='ctx'> 	  additional drivers must be enabled in order to use the functionality</div><div class='ctx'> 	  of the device.</div><div class='ctx'> </div><div class='add'>+config MFD_S5M_CORE</div><div class='add'>+	bool "SAMSUNG S5M Series Support"</div><div class='add'>+	depends on I2C=y &amp;&amp; GENERIC_HARDIRQS</div><div class='add'>+	select MFD_CORE</div><div class='add'>+	select REGMAP_I2C</div><div class='add'>+	help</div><div class='add'>+	 Support for the Samsung Electronics S5M MFD series.</div><div class='add'>+	 This driver provies common support for accessing the device,</div><div class='add'>+	 additional drivers must be enabled in order to use the functionality</div><div class='add'>+	 of the device</div><div class='add'>+</div><div class='ctx'> config MFD_WM8400</div><div class='ctx'> 	tristate "Support Wolfson Microelectronics WM8400"</div><div class='ctx'> 	select MFD_CORE</div><div class='hunk'>@@ -477,6 +534,7 @@ config MFD_WM8994</div><div class='ctx'> 	bool "Support Wolfson Microelectronics WM8994"</div><div class='ctx'> 	select MFD_CORE</div><div class='ctx'> 	select REGMAP_I2C</div><div class='add'>+	select REGMAP_IRQ</div><div class='ctx'> 	depends on I2C=y &amp;&amp; GENERIC_HARDIRQS</div><div class='ctx'> 	help</div><div class='ctx'> 	  The WM8994 is a highly integrated hi-fi CODEC designed for</div><div class='head'>diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile<br/>index b2292eb75242..b953bab934f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/Makefile</a></div><div class='hunk'>@@ -16,6 +16,8 @@ obj-$(CONFIG_MFD_DM355EVM_MSP)	+= dm355evm_msp.o</div><div class='ctx'> obj-$(CONFIG_MFD_TI_SSP)	+= ti-ssp.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MFD_STMPE)		+= stmpe.o</div><div class='add'>+obj-$(CONFIG_STMPE_I2C)		+= stmpe-i2c.o</div><div class='add'>+obj-$(CONFIG_STMPE_SPI)		+= stmpe-spi.o</div><div class='ctx'> obj-$(CONFIG_MFD_TC3589X)	+= tc3589x.o</div><div class='ctx'> obj-$(CONFIG_MFD_T7L66XB)	+= t7l66xb.o tmio_core.o</div><div class='ctx'> obj-$(CONFIG_MFD_TC6387XB)	+= tc6387xb.o tmio_core.o</div><div class='hunk'>@@ -31,7 +33,7 @@ wm8350-objs			:= wm8350-core.o wm8350-regmap.o wm8350-gpio.o</div><div class='ctx'> wm8350-objs			+= wm8350-irq.o</div><div class='ctx'> obj-$(CONFIG_MFD_WM8350)	+= wm8350.o</div><div class='ctx'> obj-$(CONFIG_MFD_WM8350_I2C)	+= wm8350-i2c.o</div><div class='del'>-obj-$(CONFIG_MFD_WM8994)	+= wm8994-core.o wm8994-irq.o</div><div class='add'>+obj-$(CONFIG_MFD_WM8994)	+= wm8994-core.o wm8994-irq.o wm8994-regmap.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_TPS6105X)		+= tps6105x.o</div><div class='ctx'> obj-$(CONFIG_TPS65010)		+= tps65010.o</div><div class='hunk'>@@ -67,6 +69,11 @@ endif</div><div class='ctx'> obj-$(CONFIG_UCB1400_CORE)	+= ucb1400_core.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PMIC_DA903X)	+= da903x.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_PMIC_DA9052)	+= da9052-core.o</div><div class='add'>+obj-$(CONFIG_MFD_DA9052_SPI)	+= da9052-spi.o</div><div class='add'>+obj-$(CONFIG_MFD_DA9052_I2C)	+= da9052-i2c.o</div><div class='add'>+</div><div class='ctx'> max8925-objs			:= max8925-core.o max8925-i2c.o</div><div class='ctx'> obj-$(CONFIG_MFD_MAX8925)	+= max8925.o</div><div class='ctx'> obj-$(CONFIG_MFD_MAX8997)	+= max8997.o max8997-irq.o</div><div class='hunk'>@@ -104,3 +111,4 @@ obj-$(CONFIG_MFD_PM8XXX_IRQ) 	+= pm8xxx-irq.o</div><div class='ctx'> obj-$(CONFIG_TPS65911_COMPARATOR)	+= tps65911-comparator.o</div><div class='ctx'> obj-$(CONFIG_MFD_AAT2870_CORE)	+= aat2870-core.o</div><div class='ctx'> obj-$(CONFIG_MFD_INTEL_MSIC)	+= intel_msic.o</div><div class='add'>+obj-$(CONFIG_MFD_S5M_CORE)	+= s5m-core.o s5m-irq.o</div><div class='head'>diff --git a/drivers/mfd/aat2870-core.c b/drivers/mfd/aat2870-core.c<br/>index 02c42015ba51..3aa36eb5c79b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/aat2870-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/aat2870-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/aat2870-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/aat2870-core.c</a></div><div class='hunk'>@@ -407,13 +407,13 @@ static int aat2870_i2c_probe(struct i2c_client *client,</div><div class='ctx'> 		aat2870-&gt;init(aat2870);</div><div class='ctx'> </div><div class='ctx'> 	if (aat2870-&gt;en_pin &gt;= 0) {</div><div class='del'>-		ret = gpio_request(aat2870-&gt;en_pin, "aat2870-en");</div><div class='add'>+		ret = gpio_request_one(aat2870-&gt;en_pin, GPIOF_OUT_INIT_HIGH,</div><div class='add'>+				       "aat2870-en");</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			dev_err(&amp;client-&gt;dev,</div><div class='ctx'> 				"Failed to request GPIO %d\n", aat2870-&gt;en_pin);</div><div class='ctx'> 			goto out_kfree;</div><div class='ctx'> 		}</div><div class='del'>-		gpio_direction_output(aat2870-&gt;en_pin, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	aat2870_enable(aat2870);</div><div class='hunk'>@@ -468,9 +468,10 @@ static int aat2870_i2c_remove(struct i2c_client *client)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int aat2870_i2c_suspend(struct i2c_client *client, pm_message_t state)</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int aat2870_i2c_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct aat2870_data *aat2870 = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	aat2870_disable(aat2870);</div><div class='hunk'>@@ -478,8 +479,9 @@ static int aat2870_i2c_suspend(struct i2c_client *client, pm_message_t state)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aat2870_i2c_resume(struct i2c_client *client)</div><div class='add'>+static int aat2870_i2c_resume(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct aat2870_data *aat2870 = i2c_get_clientdata(client);</div><div class='ctx'> 	struct aat2870_register *reg = NULL;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -495,12 +497,12 @@ static int aat2870_i2c_resume(struct i2c_client *client)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-#define aat2870_i2c_suspend	NULL</div><div class='del'>-#define aat2870_i2c_resume	NULL</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(aat2870_pm_ops, aat2870_i2c_suspend,</div><div class='add'>+			 aat2870_i2c_resume);</div><div class='ctx'> </div><div class='del'>-static struct i2c_device_id aat2870_i2c_id_table[] = {</div><div class='add'>+static const struct i2c_device_id aat2870_i2c_id_table[] = {</div><div class='ctx'> 	{ "aat2870", 0 },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='hunk'>@@ -510,11 +512,10 @@ static struct i2c_driver aat2870_i2c_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "aat2870",</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='add'>+		.pm	= &amp;aat2870_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= aat2870_i2c_probe,</div><div class='ctx'> 	.remove		= aat2870_i2c_remove,</div><div class='del'>-	.suspend	= aat2870_i2c_suspend,</div><div class='del'>-	.resume		= aat2870_i2c_resume,</div><div class='ctx'> 	.id_table	= aat2870_i2c_id_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mfd/ab5500-core.c b/drivers/mfd/ab5500-core.c<br/>index ec10629a0b0b..bd56a764dea1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/ab5500-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ab5500-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/ab5500-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/ab5500-core.c</a></div><div class='hunk'>@@ -22,8 +22,8 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/mfd/ab5500/ab5500.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/abx500.h&gt;</div><div class='add'>+#include &lt;linux/mfd/abx500/ab5500.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='head'>diff --git a/drivers/mfd/ab5500-debugfs.c b/drivers/mfd/ab5500-debugfs.c<br/>index b7b2d3483fd4..72006940937a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/ab5500-debugfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ab5500-debugfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/ab5500-debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/ab5500-debugfs.c</a></div><div class='hunk'>@@ -7,8 +7,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/mfd/ab5500/ab5500.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/abx500.h&gt;</div><div class='add'>+#include &lt;linux/mfd/abx500/ab5500.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ab5500-core.h"</div><div class='head'>diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c<br/>index d3d572b2317b..53e2a80f42fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/ab8500-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ab8500-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/ab8500-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/ab8500-core.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/core.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/abx500.h&gt;</div><div class='del'>-#include &lt;linux/mfd/ab8500.h&gt;</div><div class='add'>+#include &lt;linux/mfd/abx500/ab8500.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/ab8500.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c<br/>index dedb7f65cea6..9a0211aa8897 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/ab8500-debugfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ab8500-debugfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/ab8500-debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/ab8500-debugfs.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mfd/abx500.h&gt;</div><div class='del'>-#include &lt;linux/mfd/ab8500.h&gt;</div><div class='add'>+#include &lt;linux/mfd/abx500/ab8500.h&gt;</div><div class='ctx'> </div><div class='ctx'> static u32 debug_bank;</div><div class='ctx'> static u32 debug_address;</div><div class='head'>diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c<br/>index e985d1701a83..c39fc716e1dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/ab8500-gpadc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ab8500-gpadc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/ab8500-gpadc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/ab8500-gpadc.c</a></div><div class='hunk'>@@ -18,9 +18,9 @@</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/list.h&gt;</div><div class='del'>-#include &lt;linux/mfd/ab8500.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/abx500.h&gt;</div><div class='del'>-#include &lt;linux/mfd/ab8500/gpadc.h&gt;</div><div class='add'>+#include &lt;linux/mfd/abx500/ab8500.h&gt;</div><div class='add'>+#include &lt;linux/mfd/abx500/ab8500-gpadc.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * GPADC register offsets</div><div class='head'>diff --git a/drivers/mfd/ab8500-i2c.c b/drivers/mfd/ab8500-i2c.c<br/>index 9be541c6b004..087fecd71ce0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/ab8500-i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ab8500-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/ab8500-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/ab8500-i2c.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</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/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/mfd/ab8500.h&gt;</div><div class='add'>+#include &lt;linux/mfd/abx500/ab8500.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/db8500-prcmu.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int ab8500_i2c_write(struct ab8500 *ab8500, u16 addr, u8 data)</div><div class='head'>diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c<br/>index f20feefac190..c28d4eb1eff0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/ab8500-sysctrl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ab8500-sysctrl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/ab8500-sysctrl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/ab8500-sysctrl.c</a></div><div class='hunk'>@@ -7,9 +7,9 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/mfd/ab8500.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/abx500.h&gt;</div><div class='del'>-#include &lt;linux/mfd/ab8500/sysctrl.h&gt;</div><div class='add'>+#include &lt;linux/mfd/abx500/ab8500.h&gt;</div><div class='add'>+#include &lt;linux/mfd/abx500/ab8500-sysctrl.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct device *sysctrl_dev;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mfd/cs5535-mfd.c b/drivers/mfd/cs5535-mfd.c<br/>index 155fa0407882..315fef5d466a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/cs5535-mfd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/cs5535-mfd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/cs5535-mfd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/cs5535-mfd.c</a></div><div class='hunk'>@@ -172,14 +172,14 @@ static void __devexit cs5535_mfd_remove(struct pci_dev *pdev)</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id cs5535_mfd_pci_tbl[] = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(cs5535_mfd_pci_tbl) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, cs5535_mfd_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver cs5535_mfd_drv = {</div><div class='add'>+static struct pci_driver cs5535_mfd_driver = {</div><div class='ctx'> 	.name = DRV_NAME,</div><div class='ctx'> 	.id_table = cs5535_mfd_pci_tbl,</div><div class='ctx'> 	.probe = cs5535_mfd_probe,</div><div class='hunk'>@@ -188,12 +188,12 @@ static struct pci_driver cs5535_mfd_drv = {</div><div class='ctx'> </div><div class='ctx'> static int __init cs5535_mfd_init(void)</div><div class='ctx'> {</div><div class='del'>-	return pci_register_driver(&amp;cs5535_mfd_drv);</div><div class='add'>+	return pci_register_driver(&amp;cs5535_mfd_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit cs5535_mfd_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;cs5535_mfd_drv);</div><div class='add'>+	pci_unregister_driver(&amp;cs5535_mfd_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(cs5535_mfd_init);</div><div class='head'>diff --git a/drivers/mfd/da9052-core.c b/drivers/mfd/da9052-core.c<br/>new file mode 100644<br/>index 000000000000..5ddde2a9176a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/da9052-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/da9052-core.c</a></div><div class='hunk'>@@ -0,0 +1,694 @@</div><div class='add'>+/*</div><div class='add'>+ * Device access for Dialog DA9052 PMICs.</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='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ *  under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ *  option) any later version.</div><div class='add'>+ */</div><div class='add'>+</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/input.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/mutex.h&gt;</div><div class='add'>+#include &lt;linux/mfd/core.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mfd/da9052/da9052.h&gt;</div><div class='add'>+#include &lt;linux/mfd/da9052/pdata.h&gt;</div><div class='add'>+#include &lt;linux/mfd/da9052/reg.h&gt;</div><div class='add'>+</div><div class='add'>+#define DA9052_NUM_IRQ_REGS		4</div><div class='add'>+#define DA9052_IRQ_MASK_POS_1		0x01</div><div class='add'>+#define DA9052_IRQ_MASK_POS_2		0x02</div><div class='add'>+#define DA9052_IRQ_MASK_POS_3		0x04</div><div class='add'>+#define DA9052_IRQ_MASK_POS_4		0x08</div><div class='add'>+#define DA9052_IRQ_MASK_POS_5		0x10</div><div class='add'>+#define DA9052_IRQ_MASK_POS_6		0x20</div><div class='add'>+#define DA9052_IRQ_MASK_POS_7		0x40</div><div class='add'>+#define DA9052_IRQ_MASK_POS_8		0x80</div><div class='add'>+</div><div class='add'>+static bool da9052_reg_readable(struct device *dev, unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case DA9052_PAGE0_CON_REG:</div><div class='add'>+	case DA9052_STATUS_A_REG:</div><div class='add'>+	case DA9052_STATUS_B_REG:</div><div class='add'>+	case DA9052_STATUS_C_REG:</div><div class='add'>+	case DA9052_STATUS_D_REG:</div><div class='add'>+	case DA9052_EVENT_A_REG:</div><div class='add'>+	case DA9052_EVENT_B_REG:</div><div class='add'>+	case DA9052_EVENT_C_REG:</div><div class='add'>+	case DA9052_EVENT_D_REG:</div><div class='add'>+	case DA9052_FAULTLOG_REG:</div><div class='add'>+	case DA9052_IRQ_MASK_A_REG:</div><div class='add'>+	case DA9052_IRQ_MASK_B_REG:</div><div class='add'>+	case DA9052_IRQ_MASK_C_REG:</div><div class='add'>+	case DA9052_IRQ_MASK_D_REG:</div><div class='add'>+	case DA9052_CONTROL_A_REG:</div><div class='add'>+	case DA9052_CONTROL_B_REG:</div><div class='add'>+	case DA9052_CONTROL_C_REG:</div><div class='add'>+	case DA9052_CONTROL_D_REG:</div><div class='add'>+	case DA9052_PDDIS_REG:</div><div class='add'>+	case DA9052_INTERFACE_REG:</div><div class='add'>+	case DA9052_RESET_REG:</div><div class='add'>+	case DA9052_GPIO_0_1_REG:</div><div class='add'>+	case DA9052_GPIO_2_3_REG:</div><div class='add'>+	case DA9052_GPIO_4_5_REG:</div><div class='add'>+	case DA9052_GPIO_6_7_REG:</div><div class='add'>+	case DA9052_GPIO_14_15_REG:</div><div class='add'>+	case DA9052_ID_0_1_REG:</div><div class='add'>+	case DA9052_ID_2_3_REG:</div><div class='add'>+	case DA9052_ID_4_5_REG:</div><div class='add'>+	case DA9052_ID_6_7_REG:</div><div class='add'>+	case DA9052_ID_8_9_REG:</div><div class='add'>+	case DA9052_ID_10_11_REG:</div><div class='add'>+	case DA9052_ID_12_13_REG:</div><div class='add'>+	case DA9052_ID_14_15_REG:</div><div class='add'>+	case DA9052_ID_16_17_REG:</div><div class='add'>+	case DA9052_ID_18_19_REG:</div><div class='add'>+	case DA9052_ID_20_21_REG:</div><div class='add'>+	case DA9052_SEQ_STATUS_REG:</div><div class='add'>+	case DA9052_SEQ_A_REG:</div><div class='add'>+	case DA9052_SEQ_B_REG:</div><div class='add'>+	case DA9052_SEQ_TIMER_REG:</div><div class='add'>+	case DA9052_BUCKA_REG:</div><div class='add'>+	case DA9052_BUCKB_REG:</div><div class='add'>+	case DA9052_BUCKCORE_REG:</div><div class='add'>+	case DA9052_BUCKPRO_REG:</div><div class='add'>+	case DA9052_BUCKMEM_REG:</div><div class='add'>+	case DA9052_BUCKPERI_REG:</div><div class='add'>+	case DA9052_LDO1_REG:</div><div class='add'>+	case DA9052_LDO2_REG:</div><div class='add'>+	case DA9052_LDO3_REG:</div><div class='add'>+	case DA9052_LDO4_REG:</div><div class='add'>+	case DA9052_LDO5_REG:</div><div class='add'>+	case DA9052_LDO6_REG:</div><div class='add'>+	case DA9052_LDO7_REG:</div><div class='add'>+	case DA9052_LDO8_REG:</div><div class='add'>+	case DA9052_LDO9_REG:</div><div class='add'>+	case DA9052_LDO10_REG:</div><div class='add'>+	case DA9052_SUPPLY_REG:</div><div class='add'>+	case DA9052_PULLDOWN_REG:</div><div class='add'>+	case DA9052_CHGBUCK_REG:</div><div class='add'>+	case DA9052_WAITCONT_REG:</div><div class='add'>+	case DA9052_ISET_REG:</div><div class='add'>+	case DA9052_BATCHG_REG:</div><div class='add'>+	case DA9052_CHG_CONT_REG:</div><div class='add'>+	case DA9052_INPUT_CONT_REG:</div><div class='add'>+	case DA9052_CHG_TIME_REG:</div><div class='add'>+	case DA9052_BBAT_CONT_REG:</div><div class='add'>+	case DA9052_BOOST_REG:</div><div class='add'>+	case DA9052_LED_CONT_REG:</div><div class='add'>+	case DA9052_LEDMIN123_REG:</div><div class='add'>+	case DA9052_LED1_CONF_REG:</div><div class='add'>+	case DA9052_LED2_CONF_REG:</div><div class='add'>+	case DA9052_LED3_CONF_REG:</div><div class='add'>+	case DA9052_LED1CONT_REG:</div><div class='add'>+	case DA9052_LED2CONT_REG:</div><div class='add'>+	case DA9052_LED3CONT_REG:</div><div class='add'>+	case DA9052_LED_CONT_4_REG:</div><div class='add'>+	case DA9052_LED_CONT_5_REG:</div><div class='add'>+	case DA9052_ADC_MAN_REG:</div><div class='add'>+	case DA9052_ADC_CONT_REG:</div><div class='add'>+	case DA9052_ADC_RES_L_REG:</div><div class='add'>+	case DA9052_ADC_RES_H_REG:</div><div class='add'>+	case DA9052_VDD_RES_REG:</div><div class='add'>+	case DA9052_VDD_MON_REG:</div><div class='add'>+	case DA9052_ICHG_AV_REG:</div><div class='add'>+	case DA9052_ICHG_THD_REG:</div><div class='add'>+	case DA9052_ICHG_END_REG:</div><div class='add'>+	case DA9052_TBAT_RES_REG:</div><div class='add'>+	case DA9052_TBAT_HIGHP_REG:</div><div class='add'>+	case DA9052_TBAT_HIGHN_REG:</div><div class='add'>+	case DA9052_TBAT_LOW_REG:</div><div class='add'>+	case DA9052_T_OFFSET_REG:</div><div class='add'>+	case DA9052_ADCIN4_RES_REG:</div><div class='add'>+	case DA9052_AUTO4_HIGH_REG:</div><div class='add'>+	case DA9052_AUTO4_LOW_REG:</div><div class='add'>+	case DA9052_ADCIN5_RES_REG:</div><div class='add'>+	case DA9052_AUTO5_HIGH_REG:</div><div class='add'>+	case DA9052_AUTO5_LOW_REG:</div><div class='add'>+	case DA9052_ADCIN6_RES_REG:</div><div class='add'>+	case DA9052_AUTO6_HIGH_REG:</div><div class='add'>+	case DA9052_AUTO6_LOW_REG:</div><div class='add'>+	case DA9052_TJUNC_RES_REG:</div><div class='add'>+	case DA9052_TSI_CONT_A_REG:</div><div class='add'>+	case DA9052_TSI_CONT_B_REG:</div><div class='add'>+	case DA9052_TSI_X_MSB_REG:</div><div class='add'>+	case DA9052_TSI_Y_MSB_REG:</div><div class='add'>+	case DA9052_TSI_LSB_REG:</div><div class='add'>+	case DA9052_TSI_Z_MSB_REG:</div><div class='add'>+	case DA9052_COUNT_S_REG:</div><div class='add'>+	case DA9052_COUNT_MI_REG:</div><div class='add'>+	case DA9052_COUNT_H_REG:</div><div class='add'>+	case DA9052_COUNT_D_REG:</div><div class='add'>+	case DA9052_COUNT_MO_REG:</div><div class='add'>+	case DA9052_COUNT_Y_REG:</div><div class='add'>+	case DA9052_ALARM_MI_REG:</div><div class='add'>+	case DA9052_ALARM_H_REG:</div><div class='add'>+	case DA9052_ALARM_D_REG:</div><div class='add'>+	case DA9052_ALARM_MO_REG:</div><div class='add'>+	case DA9052_ALARM_Y_REG:</div><div class='add'>+	case DA9052_SECOND_A_REG:</div><div class='add'>+	case DA9052_SECOND_B_REG:</div><div class='add'>+	case DA9052_SECOND_C_REG:</div><div class='add'>+	case DA9052_SECOND_D_REG:</div><div class='add'>+	case DA9052_PAGE1_CON_REG:</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 bool da9052_reg_writeable(struct device *dev, unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case DA9052_PAGE0_CON_REG:</div><div class='add'>+	case DA9052_EVENT_A_REG:</div><div class='add'>+	case DA9052_EVENT_B_REG:</div><div class='add'>+	case DA9052_EVENT_C_REG:</div><div class='add'>+	case DA9052_EVENT_D_REG:</div><div class='add'>+	case DA9052_IRQ_MASK_A_REG:</div><div class='add'>+	case DA9052_IRQ_MASK_B_REG:</div><div class='add'>+	case DA9052_IRQ_MASK_C_REG:</div><div class='add'>+	case DA9052_IRQ_MASK_D_REG:</div><div class='add'>+	case DA9052_CONTROL_A_REG:</div><div class='add'>+	case DA9052_CONTROL_B_REG:</div><div class='add'>+	case DA9052_CONTROL_C_REG:</div><div class='add'>+	case DA9052_CONTROL_D_REG:</div><div class='add'>+	case DA9052_PDDIS_REG:</div><div class='add'>+	case DA9052_RESET_REG:</div><div class='add'>+	case DA9052_GPIO_0_1_REG:</div><div class='add'>+	case DA9052_GPIO_2_3_REG:</div><div class='add'>+	case DA9052_GPIO_4_5_REG:</div><div class='add'>+	case DA9052_GPIO_6_7_REG:</div><div class='add'>+	case DA9052_GPIO_14_15_REG:</div><div class='add'>+	case DA9052_ID_0_1_REG:</div><div class='add'>+	case DA9052_ID_2_3_REG:</div><div class='add'>+	case DA9052_ID_4_5_REG:</div><div class='add'>+	case DA9052_ID_6_7_REG:</div><div class='add'>+	case DA9052_ID_8_9_REG:</div><div class='add'>+	case DA9052_ID_10_11_REG:</div><div class='add'>+	case DA9052_ID_12_13_REG:</div><div class='add'>+	case DA9052_ID_14_15_REG:</div><div class='add'>+	case DA9052_ID_16_17_REG:</div><div class='add'>+	case DA9052_ID_18_19_REG:</div><div class='add'>+	case DA9052_ID_20_21_REG:</div><div class='add'>+	case DA9052_SEQ_STATUS_REG:</div><div class='add'>+	case DA9052_SEQ_A_REG:</div><div class='add'>+	case DA9052_SEQ_B_REG:</div><div class='add'>+	case DA9052_SEQ_TIMER_REG:</div><div class='add'>+	case DA9052_BUCKA_REG:</div><div class='add'>+	case DA9052_BUCKB_REG:</div><div class='add'>+	case DA9052_BUCKCORE_REG:</div><div class='add'>+	case DA9052_BUCKPRO_REG:</div><div class='add'>+	case DA9052_BUCKMEM_REG:</div><div class='add'>+	case DA9052_BUCKPERI_REG:</div><div class='add'>+	case DA9052_LDO1_REG:</div><div class='add'>+	case DA9052_LDO2_REG:</div><div class='add'>+	case DA9052_LDO3_REG:</div><div class='add'>+	case DA9052_LDO4_REG:</div><div class='add'>+	case DA9052_LDO5_REG:</div><div class='add'>+	case DA9052_LDO6_REG:</div><div class='add'>+	case DA9052_LDO7_REG:</div><div class='add'>+	case DA9052_LDO8_REG:</div><div class='add'>+	case DA9052_LDO9_REG:</div><div class='add'>+	case DA9052_LDO10_REG:</div><div class='add'>+	case DA9052_SUPPLY_REG:</div><div class='add'>+	case DA9052_PULLDOWN_REG:</div><div class='add'>+	case DA9052_CHGBUCK_REG:</div><div class='add'>+	case DA9052_WAITCONT_REG:</div><div class='add'>+	case DA9052_ISET_REG:</div><div class='add'>+	case DA9052_BATCHG_REG:</div><div class='add'>+	case DA9052_CHG_CONT_REG:</div><div class='add'>+	case DA9052_INPUT_CONT_REG:</div><div class='add'>+	case DA9052_BBAT_CONT_REG:</div><div class='add'>+	case DA9052_BOOST_REG:</div><div class='add'>+	case DA9052_LED_CONT_REG:</div><div class='add'>+	case DA9052_LEDMIN123_REG:</div><div class='add'>+	case DA9052_LED1_CONF_REG:</div><div class='add'>+	case DA9052_LED2_CONF_REG:</div><div class='add'>+	case DA9052_LED3_CONF_REG:</div><div class='add'>+	case DA9052_LED1CONT_REG:</div><div class='add'>+	case DA9052_LED2CONT_REG:</div><div class='add'>+	case DA9052_LED3CONT_REG:</div><div class='add'>+	case DA9052_LED_CONT_4_REG:</div><div class='add'>+	case DA9052_LED_CONT_5_REG:</div><div class='add'>+	case DA9052_ADC_MAN_REG:</div><div class='add'>+	case DA9052_ADC_CONT_REG:</div><div class='add'>+	case DA9052_ADC_RES_L_REG:</div><div class='add'>+	case DA9052_ADC_RES_H_REG:</div><div class='add'>+	case DA9052_VDD_RES_REG:</div><div class='add'>+	case DA9052_VDD_MON_REG:</div><div class='add'>+	case DA9052_ICHG_THD_REG:</div><div class='add'>+	case DA9052_ICHG_END_REG:</div><div class='add'>+	case DA9052_TBAT_HIGHP_REG:</div><div class='add'>+	case DA9052_TBAT_HIGHN_REG:</div><div class='add'>+	case DA9052_TBAT_LOW_REG:</div><div class='add'>+	case DA9052_T_OFFSET_REG:</div><div class='add'>+	case DA9052_AUTO4_HIGH_REG:</div><div class='add'>+	case DA9052_AUTO4_LOW_REG:</div><div class='add'>+	case DA9052_AUTO5_HIGH_REG:</div><div class='add'>+	case DA9052_AUTO5_LOW_REG:</div><div class='add'>+	case DA9052_AUTO6_HIGH_REG:</div><div class='add'>+	case DA9052_AUTO6_LOW_REG:</div><div class='add'>+	case DA9052_TSI_CONT_A_REG:</div><div class='add'>+	case DA9052_TSI_CONT_B_REG:</div><div class='add'>+	case DA9052_COUNT_S_REG:</div><div class='add'>+	case DA9052_COUNT_MI_REG:</div><div class='add'>+	case DA9052_COUNT_H_REG:</div><div class='add'>+	case DA9052_COUNT_D_REG:</div><div class='add'>+	case DA9052_COUNT_MO_REG:</div><div class='add'>+	case DA9052_COUNT_Y_REG:</div><div class='add'>+	case DA9052_ALARM_MI_REG:</div><div class='add'>+	case DA9052_ALARM_H_REG:</div><div class='add'>+	case DA9052_ALARM_D_REG:</div><div class='add'>+	case DA9052_ALARM_MO_REG:</div><div class='add'>+	case DA9052_ALARM_Y_REG:</div><div class='add'>+	case DA9052_PAGE1_CON_REG:</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 bool da9052_reg_volatile(struct device *dev, unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case DA9052_STATUS_A_REG:</div><div class='add'>+	case DA9052_STATUS_B_REG:</div><div class='add'>+	case DA9052_STATUS_C_REG:</div><div class='add'>+	case DA9052_STATUS_D_REG:</div><div class='add'>+	case DA9052_EVENT_A_REG:</div><div class='add'>+	case DA9052_EVENT_B_REG:</div><div class='add'>+	case DA9052_EVENT_C_REG:</div><div class='add'>+	case DA9052_EVENT_D_REG:</div><div class='add'>+	case DA9052_FAULTLOG_REG:</div><div class='add'>+	case DA9052_CHG_TIME_REG:</div><div class='add'>+	case DA9052_ADC_RES_L_REG:</div><div class='add'>+	case DA9052_ADC_RES_H_REG:</div><div class='add'>+	case DA9052_VDD_RES_REG:</div><div class='add'>+	case DA9052_ICHG_AV_REG:</div><div class='add'>+	case DA9052_TBAT_RES_REG:</div><div class='add'>+	case DA9052_ADCIN4_RES_REG:</div><div class='add'>+	case DA9052_ADCIN5_RES_REG:</div><div class='add'>+	case DA9052_ADCIN6_RES_REG:</div><div class='add'>+	case DA9052_TJUNC_RES_REG:</div><div class='add'>+	case DA9052_TSI_X_MSB_REG:</div><div class='add'>+	case DA9052_TSI_Y_MSB_REG:</div><div class='add'>+	case DA9052_TSI_LSB_REG:</div><div class='add'>+	case DA9052_TSI_Z_MSB_REG:</div><div class='add'>+	case DA9052_COUNT_S_REG:</div><div class='add'>+	case DA9052_COUNT_MI_REG:</div><div class='add'>+	case DA9052_COUNT_H_REG:</div><div class='add'>+	case DA9052_COUNT_D_REG:</div><div class='add'>+	case DA9052_COUNT_MO_REG:</div><div class='add'>+	case DA9052_COUNT_Y_REG:</div><div class='add'>+	case DA9052_ALARM_MI_REG:</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 struct resource da9052_rtc_resource = {</div><div class='add'>+	.name = "ALM",</div><div class='add'>+	.start = DA9052_IRQ_ALARM,</div><div class='add'>+	.end   = DA9052_IRQ_ALARM,</div><div class='add'>+	.flags = IORESOURCE_IRQ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource da9052_onkey_resource = {</div><div class='add'>+	.name = "ONKEY",</div><div class='add'>+	.start = DA9052_IRQ_NONKEY,</div><div class='add'>+	.end   = DA9052_IRQ_NONKEY,</div><div class='add'>+	.flags = IORESOURCE_IRQ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource da9052_bat_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "BATT TEMP",</div><div class='add'>+		.start = DA9052_IRQ_TBAT,</div><div class='add'>+		.end   = DA9052_IRQ_TBAT,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "DCIN DET",</div><div class='add'>+		.start = DA9052_IRQ_DCIN,</div><div class='add'>+		.end   = DA9052_IRQ_DCIN,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "DCIN REM",</div><div class='add'>+		.start = DA9052_IRQ_DCINREM,</div><div class='add'>+		.end   = DA9052_IRQ_DCINREM,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "VBUS DET",</div><div class='add'>+		.start = DA9052_IRQ_VBUS,</div><div class='add'>+		.end   = DA9052_IRQ_VBUS,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "VBUS REM",</div><div class='add'>+		.start = DA9052_IRQ_VBUSREM,</div><div class='add'>+		.end   = DA9052_IRQ_VBUSREM,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "CHG END",</div><div class='add'>+		.start = DA9052_IRQ_CHGEND,</div><div class='add'>+		.end   = DA9052_IRQ_CHGEND,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource da9052_tsi_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "PENDWN",</div><div class='add'>+		.start = DA9052_IRQ_PENDOWN,</div><div class='add'>+		.end   = DA9052_IRQ_PENDOWN,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "TSIRDY",</div><div class='add'>+		.start = DA9052_IRQ_TSIREADY,</div><div class='add'>+		.end   = DA9052_IRQ_TSIREADY,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mfd_cell __devinitdata da9052_subdev_info[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-regulator",</div><div class='add'>+		.id = 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-regulator",</div><div class='add'>+		.id = 2,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-regulator",</div><div class='add'>+		.id = 3,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-regulator",</div><div class='add'>+		.id = 4,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-regulator",</div><div class='add'>+		.id = 5,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-regulator",</div><div class='add'>+		.id = 6,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-regulator",</div><div class='add'>+		.id = 7,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-regulator",</div><div class='add'>+		.id = 8,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-regulator",</div><div class='add'>+		.id = 9,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-regulator",</div><div class='add'>+		.id = 10,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-regulator",</div><div class='add'>+		.id = 11,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-regulator",</div><div class='add'>+		.id = 12,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-regulator",</div><div class='add'>+		.id = 13,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-regulator",</div><div class='add'>+		.id = 14,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-onkey",</div><div class='add'>+		.resources = &amp;da9052_onkey_resource,</div><div class='add'>+		.num_resources = 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-rtc",</div><div class='add'>+		.resources = &amp;da9052_rtc_resource,</div><div class='add'>+		.num_resources = 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-gpio",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-hwmon",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-leds",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-wled1",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-wled2",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-wled3",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-tsi",</div><div class='add'>+		.resources = da9052_tsi_resources,</div><div class='add'>+		.num_resources = ARRAY_SIZE(da9052_tsi_resources),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-bat",</div><div class='add'>+		.resources = da9052_bat_resources,</div><div class='add'>+		.num_resources = ARRAY_SIZE(da9052_bat_resources),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "da9052-watchdog",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct regmap_irq da9052_irqs[] = {</div><div class='add'>+	[DA9052_IRQ_DCIN] = {</div><div class='add'>+		.reg_offset = 0,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_1,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_VBUS] = {</div><div class='add'>+		.reg_offset = 0,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_2,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_DCINREM] = {</div><div class='add'>+		.reg_offset = 0,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_3,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_VBUSREM] = {</div><div class='add'>+		.reg_offset = 0,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_4,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_VDDLOW] = {</div><div class='add'>+		.reg_offset = 0,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_5,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_ALARM] = {</div><div class='add'>+		.reg_offset = 0,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_6,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_SEQRDY] = {</div><div class='add'>+		.reg_offset = 0,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_7,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_COMP1V2] = {</div><div class='add'>+		.reg_offset = 0,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_8,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_NONKEY] = {</div><div class='add'>+		.reg_offset = 1,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_1,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_IDFLOAT] = {</div><div class='add'>+		.reg_offset = 1,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_2,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_IDGND] = {</div><div class='add'>+		.reg_offset = 1,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_3,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_CHGEND] = {</div><div class='add'>+		.reg_offset = 1,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_4,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_TBAT] = {</div><div class='add'>+		.reg_offset = 1,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_5,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_ADC_EOM] = {</div><div class='add'>+		.reg_offset = 1,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_6,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_PENDOWN] = {</div><div class='add'>+		.reg_offset = 1,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_7,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_TSIREADY] = {</div><div class='add'>+		.reg_offset = 1,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_8,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_GPI0] = {</div><div class='add'>+		.reg_offset = 2,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_1,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_GPI1] = {</div><div class='add'>+		.reg_offset = 2,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_2,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_GPI2] = {</div><div class='add'>+		.reg_offset = 2,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_3,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_GPI3] = {</div><div class='add'>+		.reg_offset = 2,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_4,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_GPI4] = {</div><div class='add'>+		.reg_offset = 2,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_5,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_GPI5] = {</div><div class='add'>+		.reg_offset = 2,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_6,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_GPI6] = {</div><div class='add'>+		.reg_offset = 2,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_7,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_GPI7] = {</div><div class='add'>+		.reg_offset = 2,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_8,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_GPI8] = {</div><div class='add'>+		.reg_offset = 3,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_1,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_GPI9] = {</div><div class='add'>+		.reg_offset = 3,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_2,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_GPI10] = {</div><div class='add'>+		.reg_offset = 3,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_3,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_GPI11] = {</div><div class='add'>+		.reg_offset = 3,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_4,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_GPI12] = {</div><div class='add'>+		.reg_offset = 3,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_5,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_GPI13] = {</div><div class='add'>+		.reg_offset = 3,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_6,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_GPI14] = {</div><div class='add'>+		.reg_offset = 3,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_7,</div><div class='add'>+	},</div><div class='add'>+	[DA9052_IRQ_GPI15] = {</div><div class='add'>+		.reg_offset = 3,</div><div class='add'>+		.mask = DA9052_IRQ_MASK_POS_8,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct regmap_irq_chip da9052_regmap_irq_chip = {</div><div class='add'>+	.name = "da9052_irq",</div><div class='add'>+	.status_base = DA9052_EVENT_A_REG,</div><div class='add'>+	.mask_base = DA9052_IRQ_MASK_A_REG,</div><div class='add'>+	.ack_base = DA9052_EVENT_A_REG,</div><div class='add'>+	.num_regs = DA9052_NUM_IRQ_REGS,</div><div class='add'>+	.irqs = da9052_irqs,</div><div class='add'>+	.num_irqs = ARRAY_SIZE(da9052_irqs),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct regmap_config da9052_regmap_config = {</div><div class='add'>+	.reg_bits = 8,</div><div class='add'>+	.val_bits = 8,</div><div class='add'>+</div><div class='add'>+	.cache_type = REGCACHE_RBTREE,</div><div class='add'>+</div><div class='add'>+	.max_register = DA9052_PAGE1_CON_REG,</div><div class='add'>+	.readable_reg = da9052_reg_readable,</div><div class='add'>+	.writeable_reg = da9052_reg_writeable,</div><div class='add'>+	.volatile_reg = da9052_reg_volatile,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(da9052_regmap_config);</div><div class='add'>+</div><div class='add'>+int __devinit da9052_device_init(struct da9052 *da9052, u8 chip_id)</div><div class='add'>+{</div><div class='add'>+	struct da9052_pdata *pdata = da9052-&gt;dev-&gt;platform_data;</div><div class='add'>+	struct irq_desc *desc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;da9052-&gt;io_lock);</div><div class='add'>+</div><div class='add'>+	if (pdata &amp;&amp; pdata-&gt;init != NULL)</div><div class='add'>+		pdata-&gt;init(da9052);</div><div class='add'>+</div><div class='add'>+	da9052-&gt;chip_id = chip_id;</div><div class='add'>+</div><div class='add'>+	if (!pdata || !pdata-&gt;irq_base)</div><div class='add'>+		da9052-&gt;irq_base = -1;</div><div class='add'>+	else</div><div class='add'>+		da9052-&gt;irq_base = pdata-&gt;irq_base;</div><div class='add'>+</div><div class='add'>+	ret = regmap_add_irq_chip(da9052-&gt;regmap, da9052-&gt;chip_irq,</div><div class='add'>+				  IRQF_TRIGGER_LOW | IRQF_ONESHOT,</div><div class='add'>+				  da9052-&gt;irq_base, &amp;da9052_regmap_irq_chip,</div><div class='add'>+				  NULL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto regmap_err;</div><div class='add'>+</div><div class='add'>+	desc = irq_to_desc(da9052-&gt;chip_irq);</div><div class='add'>+	da9052-&gt;irq_base = regmap_irq_chip_get_base(desc-&gt;action-&gt;dev_id);</div><div class='add'>+</div><div class='add'>+	ret = mfd_add_devices(da9052-&gt;dev, -1, da9052_subdev_info,</div><div class='add'>+			      ARRAY_SIZE(da9052_subdev_info), NULL, 0);</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'>+	mfd_remove_devices(da9052-&gt;dev);</div><div class='add'>+regmap_err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void da9052_device_exit(struct da9052 *da9052)</div><div class='add'>+{</div><div class='add'>+	regmap_del_irq_chip(da9052-&gt;chip_irq,</div><div class='add'>+			    irq_get_irq_data(da9052-&gt;irq_base)-&gt;chip_data);</div><div class='add'>+	mfd_remove_devices(da9052-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("David Dajun Chen &lt;dchen@diasemi.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("DA9052 MFD Core");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mfd/da9052-i2c.c b/drivers/mfd/da9052-i2c.c<br/>new file mode 100644<br/>index 000000000000..44b97c70a61f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/da9052-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/da9052-i2c.c</a></div><div class='hunk'>@@ -0,0 +1,140 @@</div><div class='add'>+/*</div><div class='add'>+ * I2C access for DA9052 PMICs.</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='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'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/mfd/core.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mfd/da9052/da9052.h&gt;</div><div class='add'>+#include &lt;linux/mfd/da9052/reg.h&gt;</div><div class='add'>+</div><div class='add'>+static int da9052_i2c_enable_multiwrite(struct da9052 *da9052)</div><div class='add'>+{</div><div class='add'>+	int reg_val, ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(da9052-&gt;regmap, DA9052_CONTROL_B_REG, &amp;reg_val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (reg_val &amp; DA9052_CONTROL_B_WRITEMODE) {</div><div class='add'>+		reg_val &amp;= ~DA9052_CONTROL_B_WRITEMODE;</div><div class='add'>+		ret = regmap_write(da9052-&gt;regmap, DA9052_CONTROL_B_REG,</div><div class='add'>+				   reg_val);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit da9052_i2c_probe(struct i2c_client *client,</div><div class='add'>+				       const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct da9052 *da9052;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	da9052 = kzalloc(sizeof(struct da9052), GFP_KERNEL);</div><div class='add'>+	if (!da9052)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (!i2c_check_functionality(client-&gt;adapter,</div><div class='add'>+				     I2C_FUNC_SMBUS_BYTE_DATA)) {</div><div class='add'>+		dev_info(&amp;client-&gt;dev, "Error in %s:i2c_check_functionality\n",</div><div class='add'>+			 __func__);</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	da9052-&gt;dev = &amp;client-&gt;dev;</div><div class='add'>+	da9052-&gt;chip_irq = client-&gt;irq;</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(client, da9052);</div><div class='add'>+</div><div class='add'>+	da9052-&gt;regmap = regmap_init_i2c(client, &amp;da9052_regmap_config);</div><div class='add'>+	if (IS_ERR(da9052-&gt;regmap)) {</div><div class='add'>+		ret = PTR_ERR(da9052-&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'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = da9052_i2c_enable_multiwrite(da9052);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = da9052_device_init(da9052, id-&gt;driver_data);</div><div class='add'>+	if (ret != 0)</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'>+	kfree(da9052);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_i2c_remove(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct da9052 *da9052 = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	da9052_device_exit(da9052);</div><div class='add'>+	kfree(da9052);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_device_id da9052_i2c_id[] = {</div><div class='add'>+	{"da9052", DA9052},</div><div class='add'>+	{"da9053-aa", DA9053_AA},</div><div class='add'>+	{"da9053-ba", DA9053_BA},</div><div class='add'>+	{"da9053-bb", DA9053_BB},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_driver da9052_i2c_driver = {</div><div class='add'>+	.probe = da9052_i2c_probe,</div><div class='add'>+	.remove = da9052_i2c_remove,</div><div class='add'>+	.id_table = da9052_i2c_id,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "da9052",</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init da9052_i2c_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = i2c_add_driver(&amp;da9052_i2c_driver);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		pr_err("DA9052 I2C registration failed %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'>+subsys_initcall(da9052_i2c_init);</div><div class='add'>+</div><div class='add'>+static void __exit da9052_i2c_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;da9052_i2c_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(da9052_i2c_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("David Dajun Chen &lt;dchen@diasemi.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("I2C driver for Dialog DA9052 PMIC");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mfd/da9052-spi.c b/drivers/mfd/da9052-spi.c<br/>new file mode 100644<br/>index 000000000000..cdbc7cad326f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/da9052-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/da9052-spi.c</a></div><div class='hunk'>@@ -0,0 +1,115 @@</div><div class='add'>+/*</div><div class='add'>+ * SPI access for Dialog DA9052 PMICs.</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='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'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/mfd/core.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mfd/da9052/da9052.h&gt;</div><div class='add'>+</div><div class='add'>+static int da9052_spi_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	const struct spi_device_id *id = spi_get_device_id(spi);</div><div class='add'>+	struct da9052 *da9052 = kzalloc(sizeof(struct da9052), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!da9052)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spi-&gt;mode = SPI_MODE_0 | SPI_CPOL;</div><div class='add'>+	spi-&gt;bits_per_word = 8;</div><div class='add'>+	spi_setup(spi);</div><div class='add'>+</div><div class='add'>+	da9052-&gt;dev = &amp;spi-&gt;dev;</div><div class='add'>+	da9052-&gt;chip_irq = spi-&gt;irq;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;spi-&gt;dev, da9052);</div><div class='add'>+</div><div class='add'>+	da9052_regmap_config.read_flag_mask = 1;</div><div class='add'>+	da9052_regmap_config.write_flag_mask = 0;</div><div class='add'>+</div><div class='add'>+	da9052-&gt;regmap = regmap_init_spi(spi, &amp;da9052_regmap_config);</div><div class='add'>+	if (IS_ERR(da9052-&gt;regmap)) {</div><div class='add'>+		ret = PTR_ERR(da9052-&gt;regmap);</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "Failed to allocate register map: %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = da9052_device_init(da9052, id-&gt;driver_data);</div><div class='add'>+	if (ret != 0)</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'>+	kfree(da9052);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_spi_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct da9052 *da9052 = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	da9052_device_exit(da9052);</div><div class='add'>+	kfree(da9052);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct spi_device_id da9052_spi_id[] = {</div><div class='add'>+	{"da9052", DA9052},</div><div class='add'>+	{"da9053-aa", DA9053_AA},</div><div class='add'>+	{"da9053-ba", DA9053_BA},</div><div class='add'>+	{"da9053-bb", DA9053_BB},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_driver da9052_spi_driver = {</div><div class='add'>+	.probe = da9052_spi_probe,</div><div class='add'>+	.remove = __devexit_p(da9052_spi_remove),</div><div class='add'>+	.id_table = da9052_spi_id,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "da9052",</div><div class='add'>+		.bus = &amp;spi_bus_type,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init da9052_spi_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = spi_register_driver(&amp;da9052_spi_driver);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		pr_err("Failed to register DA9052 SPI driver, %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'>+subsys_initcall(da9052_spi_init);</div><div class='add'>+</div><div class='add'>+static void __exit da9052_spi_exit(void)</div><div class='add'>+{</div><div class='add'>+	spi_unregister_driver(&amp;da9052_spi_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(da9052_spi_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("David Dajun Chen &lt;dchen@diasemi.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("SPI driver for Dialog DA9052 PMIC");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c<br/>index a25ab9c6b5af..af8e0efedbe4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/db8500-prcmu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/db8500-prcmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/db8500-prcmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/db8500-prcmu.c</a></div><div class='hunk'>@@ -2102,14 +2102,11 @@ static struct irq_chip prcmu_irq_chip = {</div><div class='ctx'> void __init db8500_prcmu_early_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-</div><div class='del'>-	if (cpu_is_u8500v1()) {</div><div class='del'>-		tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE_V1);</div><div class='del'>-	} else if (cpu_is_u8500v2()) {</div><div class='add'>+	if (cpu_is_u8500v2()) {</div><div class='ctx'> 		void *tcpm_base = ioremap_nocache(U8500_PRCMU_TCPM_BASE, SZ_4K);</div><div class='ctx'> </div><div class='ctx'> 		if (tcpm_base != NULL) {</div><div class='del'>-			int version;</div><div class='add'>+			u32 version;</div><div class='ctx'> 			version = readl(tcpm_base + PRCMU_FW_VERSION_OFFSET);</div><div class='ctx'> 			prcmu_version.project_number = version &amp; 0xFF;</div><div class='ctx'> 			prcmu_version.api_version = (version &gt;&gt; 8) &amp; 0xFF;</div><div class='head'>diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c<br/>index 8ad88da647b9..7710227d284e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/dm355evm_msp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/dm355evm_msp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/dm355evm_msp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/dm355evm_msp.c</a></div><div class='hunk'>@@ -308,8 +308,7 @@ static int add_children(struct i2c_client *client)</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(config_inputs); i++) {</div><div class='ctx'> 		int gpio = dm355evm_msp_gpio.base + config_inputs[i].offset;</div><div class='ctx'> </div><div class='del'>-		gpio_request(gpio, config_inputs[i].label);</div><div class='del'>-		gpio_direction_input(gpio);</div><div class='add'>+		gpio_request_one(gpio, GPIOF_IN, config_inputs[i].label);</div><div class='ctx'> </div><div class='ctx'> 		/* make it easy for userspace to see these */</div><div class='ctx'> 		gpio_export(gpio, false);</div><div class='head'>diff --git a/drivers/mfd/intel_msic.c b/drivers/mfd/intel_msic.c<br/>index 97c27762174f..b76657eb0c51 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/intel_msic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/intel_msic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/intel_msic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/intel_msic.c</a></div><div class='hunk'>@@ -485,17 +485,7 @@ static struct platform_driver intel_msic_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init intel_msic_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;intel_msic_driver);</div><div class='del'>-}</div><div class='del'>-module_init(intel_msic_init);</div><div class='del'>-</div><div class='del'>-static void __exit intel_msic_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;intel_msic_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(intel_msic_exit);</div><div class='add'>+module_platform_driver(intel_msic_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Driver for Intel MSIC");</div><div class='ctx'> MODULE_AUTHOR("Mika Westerberg &lt;mika.westerberg@linux.intel.com&gt;");</div><div class='head'>diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c<br/>index 5c2a06acb77f..a9223ed1b7c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/janz-cmodio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/janz-cmodio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/janz-cmodio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/janz-cmodio.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Module Parameters */</div><div class='ctx'> static unsigned int num_modules = CMODIO_MAX_MODULES;</div><div class='del'>-static unsigned char *modules[CMODIO_MAX_MODULES] = {</div><div class='add'>+static char *modules[CMODIO_MAX_MODULES] = {</div><div class='ctx'> 	"empty", "empty", "empty", "empty",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c<br/>index ef39528088f2..87662a17dec6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/jz4740-adc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/jz4740-adc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/jz4740-adc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/jz4740-adc.c</a></div><div class='hunk'>@@ -181,7 +181,7 @@ static struct resource jz4740_battery_resources[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct mfd_cell jz4740_adc_cells[] = {</div><div class='add'>+static struct mfd_cell jz4740_adc_cells[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.id = 0,</div><div class='ctx'> 		.name = "jz4740-hwmon",</div><div class='hunk'>@@ -338,17 +338,7 @@ static struct platform_driver jz4740_adc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init jz4740_adc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;jz4740_adc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(jz4740_adc_init);</div><div class='del'>-</div><div class='del'>-static void __exit jz4740_adc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;jz4740_adc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(jz4740_adc_exit);</div><div class='add'>+module_platform_driver(jz4740_adc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("JZ4740 SoC ADC driver");</div><div class='ctx'> MODULE_AUTHOR("Lars-Peter Clausen &lt;lars@metafoo.de&gt;");</div><div class='head'>diff --git a/drivers/mfd/lpc_sch.c b/drivers/mfd/lpc_sch.c<br/>index ea1169b04779..abc421364a45 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/lpc_sch.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/lpc_sch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/lpc_sch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/lpc_sch.c</a></div><div class='hunk'>@@ -74,7 +74,7 @@ static struct mfd_cell tunnelcreek_cells[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id lpc_sch_ids[] = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(lpc_sch_ids) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC) },</div><div class='ctx'> 	{ 0, }</div><div class='head'>diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c<br/>index e1e59c92f758..ca881efedf75 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/max8925-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/max8925-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/max8925-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/max8925-core.c</a></div><div class='hunk'>@@ -210,21 +210,6 @@ static struct max8925_irq_data max8925_irqs[] = {</div><div class='ctx'> 		.mask_reg	= MAX8925_CHG_IRQ1_MASK,</div><div class='ctx'> 		.offs		= 1 &lt;&lt; 2,</div><div class='ctx'> 	},</div><div class='del'>-	[MAX8925_IRQ_VCHG_USB_OVP] = {</div><div class='del'>-		.reg		= MAX8925_CHG_IRQ1,</div><div class='del'>-		.mask_reg	= MAX8925_CHG_IRQ1_MASK,</div><div class='del'>-		.offs		= 1 &lt;&lt; 3,</div><div class='del'>-	},</div><div class='del'>-	[MAX8925_IRQ_VCHG_USB_F] =  {</div><div class='del'>-		.reg		= MAX8925_CHG_IRQ1,</div><div class='del'>-		.mask_reg	= MAX8925_CHG_IRQ1_MASK,</div><div class='del'>-		.offs		= 1 &lt;&lt; 4,</div><div class='del'>-	},</div><div class='del'>-	[MAX8925_IRQ_VCHG_USB_R] = {</div><div class='del'>-		.reg		= MAX8925_CHG_IRQ1,</div><div class='del'>-		.mask_reg	= MAX8925_CHG_IRQ1_MASK,</div><div class='del'>-		.offs		= 1 &lt;&lt; 5,</div><div class='del'>-	},</div><div class='ctx'> 	[MAX8925_IRQ_VCHG_THM_OK_R] = {</div><div class='ctx'> 		.reg		= MAX8925_CHG_IRQ2,</div><div class='ctx'> 		.mask_reg	= MAX8925_CHG_IRQ2_MASK,</div><div class='head'>diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c<br/>index 0219115e00c7..d9e4b36edee9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/max8925-i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/max8925-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/max8925-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/max8925-i2c.c</a></div><div class='hunk'>@@ -161,6 +161,8 @@ static int __devinit max8925_probe(struct i2c_client *client,</div><div class='ctx'> 	chip-&gt;adc = i2c_new_dummy(chip-&gt;i2c-&gt;adapter, ADC_I2C_ADDR);</div><div class='ctx'> 	i2c_set_clientdata(chip-&gt;adc, chip);</div><div class='ctx'> </div><div class='add'>+	device_init_wakeup(&amp;client-&gt;dev, 1);</div><div class='add'>+</div><div class='ctx'> 	max8925_device_init(chip, pdata);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -177,10 +179,35 @@ static int __devexit max8925_remove(struct i2c_client *client)</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 max8925_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = container_of(dev, struct i2c_client, dev);</div><div class='add'>+	struct max8925_chip *chip = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	if (device_may_wakeup(dev) &amp;&amp; chip-&gt;wakeup_flag)</div><div class='add'>+		enable_irq_wake(chip-&gt;core_irq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int max8925_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = container_of(dev, struct i2c_client, dev);</div><div class='add'>+	struct max8925_chip *chip = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	if (device_may_wakeup(dev) &amp;&amp; chip-&gt;wakeup_flag)</div><div class='add'>+		disable_irq_wake(chip-&gt;core_irq);</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(max8925_pm_ops, max8925_suspend, max8925_resume);</div><div class='add'>+</div><div class='ctx'> static struct i2c_driver max8925_driver = {</div><div class='ctx'> 	.driver	= {</div><div class='ctx'> 		.name	= "max8925",</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='add'>+		.pm     = &amp;max8925_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= max8925_probe,</div><div class='ctx'> 	.remove		= __devexit_p(max8925_remove),</div><div class='head'>diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c<br/>index 5be53ae9b61c..cb83a7ab53e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/max8997.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/max8997.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/max8997.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/max8997.c</a></div><div class='hunk'>@@ -43,7 +43,8 @@ static struct mfd_cell max8997_devs[] = {</div><div class='ctx'> 	{ .name = "max8997-battery", },</div><div class='ctx'> 	{ .name = "max8997-haptic", },</div><div class='ctx'> 	{ .name = "max8997-muic", },</div><div class='del'>-	{ .name = "max8997-flash", },</div><div class='add'>+	{ .name = "max8997-led", .id = 1 },</div><div class='add'>+	{ .name = "max8997-led", .id = 2 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int max8997_read_reg(struct i2c_client *i2c, u8 reg, u8 *dest)</div><div class='head'>diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c<br/>index de4096aee248..6ef56d28c056 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/max8998.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/max8998.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/max8998.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/max8998.c</a></div><div class='hunk'>@@ -176,6 +176,8 @@ static int max8998_i2c_probe(struct i2c_client *i2c,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='add'>+	device_init_wakeup(max8998-&gt;dev, max8998-&gt;wakeup);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='hunk'>@@ -210,7 +212,7 @@ static int max8998_suspend(struct device *dev)</div><div class='ctx'> 	struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);</div><div class='ctx'> 	struct max8998_dev *max8998 = i2c_get_clientdata(i2c);</div><div class='ctx'> </div><div class='del'>-	if (max8998-&gt;wakeup)</div><div class='add'>+	if (device_may_wakeup(dev))</div><div class='ctx'> 		irq_set_irq_wake(max8998-&gt;irq, 1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -220,7 +222,7 @@ static int max8998_resume(struct device *dev)</div><div class='ctx'> 	struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);</div><div class='ctx'> 	struct max8998_dev *max8998 = i2c_get_clientdata(i2c);</div><div class='ctx'> </div><div class='del'>-	if (max8998-&gt;wakeup)</div><div class='add'>+	if (device_may_wakeup(dev))</div><div class='ctx'> 		irq_set_irq_wake(max8998-&gt;irq, 0);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In LP3974, if IRQ registers are not "read &amp; clear"</div><div class='head'>diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c<br/>index e9619acc0237..7122386b4e3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/mc13xxx-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/mc13xxx-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/mc13xxx-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/mc13xxx-core.c</a></div><div class='hunk'>@@ -18,11 +18,15 @@</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/core.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/mc13xxx.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/of_gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct mc13xxx {</div><div class='ctx'> 	struct spi_device *spidev;</div><div class='ctx'> 	struct mutex lock;</div><div class='ctx'> 	int irq;</div><div class='add'>+	int flags;</div><div class='ctx'> </div><div class='ctx'> 	irq_handler_t irqhandler[MC13XXX_NUM_IRQ];</div><div class='ctx'> 	void *irqdata[MC13XXX_NUM_IRQ];</div><div class='hunk'>@@ -550,10 +554,7 @@ static const char *mc13xxx_get_chipname(struct mc13xxx *mc13xxx)</div><div class='ctx'> </div><div class='ctx'> int mc13xxx_get_flags(struct mc13xxx *mc13xxx)</div><div class='ctx'> {</div><div class='del'>-	struct mc13xxx_platform_data *pdata =</div><div class='del'>-		dev_get_platdata(&amp;mc13xxx-&gt;spidev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	return pdata-&gt;flags;</div><div class='add'>+	return mc13xxx-&gt;flags;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(mc13xxx_get_flags);</div><div class='ctx'> </div><div class='hunk'>@@ -615,13 +616,13 @@ int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx, unsigned int mode,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case MC13XXX_ADC_MODE_SINGLE_CHAN:</div><div class='del'>-		adc0 |= old_adc0 &amp; MC13XXX_ADC0_TSMOD_MASK;</div><div class='add'>+		adc0 |= old_adc0 &amp; MC13XXX_ADC0_CONFIG_MASK;</div><div class='ctx'> 		adc1 |= (channel &amp; 0x7) &lt;&lt; MC13XXX_ADC1_CHAN0_SHIFT;</div><div class='ctx'> 		adc1 |= MC13XXX_ADC1_RAND;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case MC13XXX_ADC_MODE_MULT_CHAN:</div><div class='del'>-		adc0 |= old_adc0 &amp; MC13XXX_ADC0_TSMOD_MASK;</div><div class='add'>+		adc0 |= old_adc0 &amp; MC13XXX_ADC0_CONFIG_MASK;</div><div class='ctx'> 		adc1 |= 4 &lt;&lt; MC13XXX_ADC1_CHAN1_SHIFT;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -696,17 +697,67 @@ static int mc13xxx_add_subdevice(struct mc13xxx *mc13xxx, const char *format)</div><div class='ctx'> 	return mc13xxx_add_subdevice_pdata(mc13xxx, format, NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+static int mc13xxx_probe_flags_dt(struct mc13xxx *mc13xxx)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = mc13xxx-&gt;spidev-&gt;dev.of_node;</div><div class='add'>+</div><div class='add'>+	if (!np)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (of_get_property(np, "fsl,mc13xxx-uses-adc", NULL))</div><div class='add'>+		mc13xxx-&gt;flags |= MC13XXX_USE_ADC;</div><div class='add'>+</div><div class='add'>+	if (of_get_property(np, "fsl,mc13xxx-uses-codec", NULL))</div><div class='add'>+		mc13xxx-&gt;flags |= MC13XXX_USE_CODEC;</div><div class='add'>+</div><div class='add'>+	if (of_get_property(np, "fsl,mc13xxx-uses-rtc", NULL))</div><div class='add'>+		mc13xxx-&gt;flags |= MC13XXX_USE_RTC;</div><div class='add'>+</div><div class='add'>+	if (of_get_property(np, "fsl,mc13xxx-uses-touch", NULL))</div><div class='add'>+		mc13xxx-&gt;flags |= MC13XXX_USE_TOUCHSCREEN;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int mc13xxx_probe_flags_dt(struct mc13xxx *mc13xxx)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const struct spi_device_id mc13xxx_device_id[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "mc13783",</div><div class='add'>+		.driver_data = MC13XXX_ID_MC13783,</div><div class='add'>+	}, {</div><div class='add'>+		.name = "mc13892",</div><div class='add'>+		.driver_data = MC13XXX_ID_MC13892,</div><div class='add'>+	}, {</div><div class='add'>+		/* sentinel */</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(spi, mc13xxx_device_id);</div><div class='add'>+</div><div class='add'>+static const struct of_device_id mc13xxx_dt_ids[] = {</div><div class='add'>+	{ .compatible = "fsl,mc13783", .data = (void *) MC13XXX_ID_MC13783, },</div><div class='add'>+	{ .compatible = "fsl,mc13892", .data = (void *) MC13XXX_ID_MC13892, },</div><div class='add'>+	{ /* sentinel */ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, mc13xxx_dt_ids);</div><div class='add'>+</div><div class='ctx'> static int mc13xxx_probe(struct spi_device *spi)</div><div class='ctx'> {</div><div class='add'>+	const struct of_device_id *of_id;</div><div class='add'>+	struct spi_driver *sdrv = to_spi_driver(spi-&gt;dev.driver);</div><div class='ctx'> 	struct mc13xxx *mc13xxx;</div><div class='ctx'> 	struct mc13xxx_platform_data *pdata = dev_get_platdata(&amp;spi-&gt;dev);</div><div class='ctx'> 	enum mc13xxx_id id;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!pdata) {</div><div class='del'>-		dev_err(&amp;spi-&gt;dev, "invalid platform data\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	of_id = of_match_device(mc13xxx_dt_ids, &amp;spi-&gt;dev);</div><div class='add'>+	if (of_id)</div><div class='add'>+		sdrv-&gt;id_table = &amp;mc13xxx_device_id[(enum mc13xxx_id) of_id-&gt;data];</div><div class='ctx'> </div><div class='ctx'> 	mc13xxx = kzalloc(sizeof(*mc13xxx), GFP_KERNEL);</div><div class='ctx'> 	if (!mc13xxx)</div><div class='hunk'>@@ -749,28 +800,33 @@ err_revision:</div><div class='ctx'> </div><div class='ctx'> 	mc13xxx_unlock(mc13xxx);</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;flags &amp; MC13XXX_USE_ADC)</div><div class='add'>+	if (mc13xxx_probe_flags_dt(mc13xxx) &lt; 0 &amp;&amp; pdata)</div><div class='add'>+		mc13xxx-&gt;flags = pdata-&gt;flags;</div><div class='add'>+</div><div class='add'>+	if (mc13xxx-&gt;flags &amp; MC13XXX_USE_ADC)</div><div class='ctx'> 		mc13xxx_add_subdevice(mc13xxx, "%s-adc");</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;flags &amp; MC13XXX_USE_CODEC)</div><div class='add'>+	if (mc13xxx-&gt;flags &amp; MC13XXX_USE_CODEC)</div><div class='ctx'> 		mc13xxx_add_subdevice(mc13xxx, "%s-codec");</div><div class='ctx'> </div><div class='del'>-	mc13xxx_add_subdevice_pdata(mc13xxx, "%s-regulator",</div><div class='del'>-		&amp;pdata-&gt;regulators, sizeof(pdata-&gt;regulators));</div><div class='del'>-</div><div class='del'>-	if (pdata-&gt;flags &amp; MC13XXX_USE_RTC)</div><div class='add'>+	if (mc13xxx-&gt;flags &amp; MC13XXX_USE_RTC)</div><div class='ctx'> 		mc13xxx_add_subdevice(mc13xxx, "%s-rtc");</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;flags &amp; MC13XXX_USE_TOUCHSCREEN)</div><div class='add'>+	if (mc13xxx-&gt;flags &amp; MC13XXX_USE_TOUCHSCREEN)</div><div class='ctx'> 		mc13xxx_add_subdevice(mc13xxx, "%s-ts");</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;leds)</div><div class='add'>+	if (pdata) {</div><div class='add'>+		mc13xxx_add_subdevice_pdata(mc13xxx, "%s-regulator",</div><div class='add'>+			&amp;pdata-&gt;regulators, sizeof(pdata-&gt;regulators));</div><div class='ctx'> 		mc13xxx_add_subdevice_pdata(mc13xxx, "%s-led",</div><div class='ctx'> 				pdata-&gt;leds, sizeof(*pdata-&gt;leds));</div><div class='del'>-</div><div class='del'>-	if (pdata-&gt;buttons)</div><div class='ctx'> 		mc13xxx_add_subdevice_pdata(mc13xxx, "%s-pwrbutton",</div><div class='ctx'> 				pdata-&gt;buttons, sizeof(*pdata-&gt;buttons));</div><div class='add'>+	} else {</div><div class='add'>+		mc13xxx_add_subdevice(mc13xxx, "%s-regulator");</div><div class='add'>+		mc13xxx_add_subdevice(mc13xxx, "%s-led");</div><div class='add'>+		mc13xxx_add_subdevice(mc13xxx, "%s-pwrbutton");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -788,25 +844,12 @@ static int __devexit mc13xxx_remove(struct spi_device *spi)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct spi_device_id mc13xxx_device_id[] = {</div><div class='del'>-	{</div><div class='del'>-		.name = "mc13783",</div><div class='del'>-		.driver_data = MC13XXX_ID_MC13783,</div><div class='del'>-	}, {</div><div class='del'>-		.name = "mc13892",</div><div class='del'>-		.driver_data = MC13XXX_ID_MC13892,</div><div class='del'>-	}, {</div><div class='del'>-		/* sentinel */</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(spi, mc13xxx_device_id);</div><div class='del'>-</div><div class='ctx'> static struct spi_driver mc13xxx_driver = {</div><div class='ctx'> 	.id_table = mc13xxx_device_id,</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "mc13xxx",</div><div class='del'>-		.bus = &amp;spi_bus_type,</div><div class='ctx'> 		.owner = THIS_MODULE,</div><div class='add'>+		.of_match_table = mc13xxx_dt_ids,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = mc13xxx_probe,</div><div class='ctx'> 	.remove = __devexit_p(mc13xxx_remove),</div><div class='head'>diff --git a/drivers/mfd/mcp-core.c b/drivers/mfd/mcp-core.c<br/>index 84815f9ef636..63be60bc3455 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/mcp-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/mcp-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/mcp-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/mcp-core.c</a></div><div class='hunk'>@@ -26,9 +26,35 @@</div><div class='ctx'> #define to_mcp(d)		container_of(d, struct mcp, attached_device)</div><div class='ctx'> #define to_mcp_driver(d)	container_of(d, struct mcp_driver, drv)</div><div class='ctx'> </div><div class='add'>+static const struct mcp_device_id *mcp_match_id(const struct mcp_device_id *id,</div><div class='add'>+						const char *codec)</div><div class='add'>+{</div><div class='add'>+	while (id-&gt;name[0]) {</div><div class='add'>+		if (strcmp(codec, id-&gt;name) == 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'>+const struct mcp_device_id *mcp_get_device_id(const struct mcp *mcp)</div><div class='add'>+{</div><div class='add'>+	const struct mcp_driver *driver =</div><div class='add'>+		to_mcp_driver(mcp-&gt;attached_device.driver);</div><div class='add'>+</div><div class='add'>+	return mcp_match_id(driver-&gt;id_table, mcp-&gt;codec);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(mcp_get_device_id);</div><div class='add'>+</div><div class='ctx'> static int mcp_bus_match(struct device *dev, struct device_driver *drv)</div><div class='ctx'> {</div><div class='del'>-	return 1;</div><div class='add'>+	const struct mcp *mcp = to_mcp(dev);</div><div class='add'>+	const struct mcp_driver *driver = to_mcp_driver(drv);</div><div class='add'>+</div><div class='add'>+	if (driver-&gt;id_table)</div><div class='add'>+		return !!mcp_match_id(driver-&gt;id_table, mcp-&gt;codec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mcp_bus_probe(struct device *dev)</div><div class='hunk'>@@ -74,9 +100,18 @@ static int mcp_bus_resume(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mcp_bus_uevent(struct device *dev, struct kobj_uevent_env *env)</div><div class='add'>+{</div><div class='add'>+	struct mcp *mcp = to_mcp(dev);</div><div class='add'>+</div><div class='add'>+	add_uevent_var(env, "MODALIAS=%s%s", MCP_MODULE_PREFIX, mcp-&gt;codec);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct bus_type mcp_bus_type = {</div><div class='ctx'> 	.name		= "mcp",</div><div class='ctx'> 	.match		= mcp_bus_match,</div><div class='add'>+	.uevent		= mcp_bus_uevent,</div><div class='ctx'> 	.probe		= mcp_bus_probe,</div><div class='ctx'> 	.remove		= mcp_bus_remove,</div><div class='ctx'> 	.suspend	= mcp_bus_suspend,</div><div class='hunk'>@@ -212,9 +247,14 @@ struct mcp *mcp_host_alloc(struct device *parent, size_t size)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(mcp_host_alloc);</div><div class='ctx'> </div><div class='del'>-int mcp_host_register(struct mcp *mcp)</div><div class='add'>+int mcp_host_register(struct mcp *mcp, void *pdata)</div><div class='ctx'> {</div><div class='add'>+	if (!mcp-&gt;codec)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mcp-&gt;attached_device.platform_data = pdata;</div><div class='ctx'> 	dev_set_name(&amp;mcp-&gt;attached_device, "mcp0");</div><div class='add'>+	request_module("%s%s", MCP_MODULE_PREFIX, mcp-&gt;codec);</div><div class='ctx'> 	return device_register(&amp;mcp-&gt;attached_device);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(mcp_host_register);</div><div class='head'>diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c<br/>index 2dab02d9ac8b..9adc2eb69492 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/mcp-sa11x0.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/mcp-sa11x0.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/mcp-sa11x0.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/mcp-sa11x0.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/mcp.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/dma.h&gt;</div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='hunk'>@@ -26,12 +27,19 @@</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;mach/mcp.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/assabet.h&gt;</div><div class='del'>-</div><div class='add'>+/* Register offsets */</div><div class='add'>+#define MCCR0	0x00</div><div class='add'>+#define MCDR0	0x08</div><div class='add'>+#define MCDR1	0x0C</div><div class='add'>+#define MCDR2	0x10</div><div class='add'>+#define MCSR	0x18</div><div class='add'>+#define MCCR1	0x00</div><div class='ctx'> </div><div class='ctx'> struct mcp_sa11x0 {</div><div class='del'>-	u32	mccr0;</div><div class='del'>-	u32	mccr1;</div><div class='add'>+	u32		mccr0;</div><div class='add'>+	u32		mccr1;</div><div class='add'>+	unsigned char	*mccr0_base;</div><div class='add'>+	unsigned char	*mccr1_base;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define priv(mcp)	((struct mcp_sa11x0 *)mcp_priv(mcp))</div><div class='hunk'>@@ -39,25 +47,25 @@ struct mcp_sa11x0 {</div><div class='ctx'> static void</div><div class='ctx'> mcp_sa11x0_set_telecom_divisor(struct mcp *mcp, unsigned int divisor)</div><div class='ctx'> {</div><div class='del'>-	unsigned int mccr0;</div><div class='add'>+	struct mcp_sa11x0 *priv = priv(mcp);</div><div class='ctx'> </div><div class='ctx'> 	divisor /= 32;</div><div class='ctx'> </div><div class='del'>-	mccr0 = Ser4MCCR0 &amp; ~0x00007f00;</div><div class='del'>-	mccr0 |= divisor &lt;&lt; 8;</div><div class='del'>-	Ser4MCCR0 = mccr0;</div><div class='add'>+	priv-&gt;mccr0 &amp;= ~0x00007f00;</div><div class='add'>+	priv-&gt;mccr0 |= divisor &lt;&lt; 8;</div><div class='add'>+	__raw_writel(priv-&gt;mccr0, priv-&gt;mccr0_base + MCCR0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mcp_sa11x0_set_audio_divisor(struct mcp *mcp, unsigned int divisor)</div><div class='ctx'> {</div><div class='del'>-	unsigned int mccr0;</div><div class='add'>+	struct mcp_sa11x0 *priv = priv(mcp);</div><div class='ctx'> </div><div class='ctx'> 	divisor /= 32;</div><div class='ctx'> </div><div class='del'>-	mccr0 = Ser4MCCR0 &amp; ~0x0000007f;</div><div class='del'>-	mccr0 |= divisor;</div><div class='del'>-	Ser4MCCR0 = mccr0;</div><div class='add'>+	priv-&gt;mccr0 &amp;= ~0x0000007f;</div><div class='add'>+	priv-&gt;mccr0 |= divisor;</div><div class='add'>+	__raw_writel(priv-&gt;mccr0, priv-&gt;mccr0_base + MCCR0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -71,12 +79,16 @@ mcp_sa11x0_write(struct mcp *mcp, unsigned int reg, unsigned int val)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -ETIME;</div><div class='ctx'> 	int i;</div><div class='add'>+	u32 mcpreg;</div><div class='add'>+	struct mcp_sa11x0 *priv = priv(mcp);</div><div class='ctx'> </div><div class='del'>-	Ser4MCDR2 = reg &lt;&lt; 17 | MCDR2_Wr | (val &amp; 0xffff);</div><div class='add'>+	mcpreg = reg &lt;&lt; 17 | MCDR2_Wr | (val &amp; 0xffff);</div><div class='add'>+	__raw_writel(mcpreg, priv-&gt;mccr0_base + MCDR2);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		udelay(mcp-&gt;rw_timeout);</div><div class='del'>-		if (Ser4MCSR &amp; MCSR_CWC) {</div><div class='add'>+		mcpreg = __raw_readl(priv-&gt;mccr0_base + MCSR);</div><div class='add'>+		if (mcpreg &amp; MCSR_CWC) {</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -97,13 +109,18 @@ mcp_sa11x0_read(struct mcp *mcp, unsigned int reg)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -ETIME;</div><div class='ctx'> 	int i;</div><div class='add'>+	u32 mcpreg;</div><div class='add'>+	struct mcp_sa11x0 *priv = priv(mcp);</div><div class='ctx'> </div><div class='del'>-	Ser4MCDR2 = reg &lt;&lt; 17 | MCDR2_Rd;</div><div class='add'>+	mcpreg = reg &lt;&lt; 17 | MCDR2_Rd;</div><div class='add'>+	__raw_writel(mcpreg, priv-&gt;mccr0_base + MCDR2);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		udelay(mcp-&gt;rw_timeout);</div><div class='del'>-		if (Ser4MCSR &amp; MCSR_CRC) {</div><div class='del'>-			ret = Ser4MCDR2 &amp; 0xffff;</div><div class='add'>+		mcpreg = __raw_readl(priv-&gt;mccr0_base + MCSR);</div><div class='add'>+		if (mcpreg &amp; MCSR_CRC) {</div><div class='add'>+			ret = __raw_readl(priv-&gt;mccr0_base + MCDR2)</div><div class='add'>+				&amp; 0xffff;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -116,13 +133,19 @@ mcp_sa11x0_read(struct mcp *mcp, unsigned int reg)</div><div class='ctx'> </div><div class='ctx'> static void mcp_sa11x0_enable(struct mcp *mcp)</div><div class='ctx'> {</div><div class='del'>-	Ser4MCSR = -1;</div><div class='del'>-	Ser4MCCR0 |= MCCR0_MCE;</div><div class='add'>+	struct mcp_sa11x0 *priv = priv(mcp);</div><div class='add'>+</div><div class='add'>+	__raw_writel(-1, priv-&gt;mccr0_base + MCSR);</div><div class='add'>+	priv-&gt;mccr0 |= MCCR0_MCE;</div><div class='add'>+	__raw_writel(priv-&gt;mccr0, priv-&gt;mccr0_base + MCCR0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mcp_sa11x0_disable(struct mcp *mcp)</div><div class='ctx'> {</div><div class='del'>-	Ser4MCCR0 &amp;= ~MCCR0_MCE;</div><div class='add'>+	struct mcp_sa11x0 *priv = priv(mcp);</div><div class='add'>+</div><div class='add'>+	priv-&gt;mccr0 &amp;= ~MCCR0_MCE;</div><div class='add'>+	__raw_writel(priv-&gt;mccr0, priv-&gt;mccr0_base + MCCR0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -142,50 +165,69 @@ static int mcp_sa11x0_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct mcp_plat_data *data = pdev-&gt;dev.platform_data;</div><div class='ctx'> 	struct mcp *mcp;</div><div class='ctx'> 	int ret;</div><div class='add'>+	struct mcp_sa11x0 *priv;</div><div class='add'>+	struct resource *res_mem0, *res_mem1;</div><div class='add'>+	u32 size0, size1;</div><div class='ctx'> </div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (!request_mem_region(0x80060000, 0x60, "sa11x0-mcp"))</div><div class='add'>+	if (!data-&gt;codec)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	res_mem0 = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!res_mem0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	size0 = res_mem0-&gt;end - res_mem0-&gt;start + 1;</div><div class='add'>+</div><div class='add'>+	res_mem1 = platform_get_resource(pdev, IORESOURCE_MEM, 1);</div><div class='add'>+	if (!res_mem1)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	size1 = res_mem1-&gt;end - res_mem1-&gt;start + 1;</div><div class='add'>+</div><div class='add'>+	if (!request_mem_region(res_mem0-&gt;start, size0, "sa11x0-mcp"))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='add'>+	if (!request_mem_region(res_mem1-&gt;start, size1, "sa11x0-mcp")) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto release;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mcp = mcp_host_alloc(&amp;pdev-&gt;dev, sizeof(struct mcp_sa11x0));</div><div class='ctx'> 	if (!mcp) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='del'>-		goto release;</div><div class='add'>+		goto release2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	priv = priv(mcp);</div><div class='add'>+</div><div class='ctx'> 	mcp-&gt;owner		= THIS_MODULE;</div><div class='ctx'> 	mcp-&gt;ops		= &amp;mcp_sa11x0;</div><div class='ctx'> 	mcp-&gt;sclk_rate		= data-&gt;sclk_rate;</div><div class='del'>-	mcp-&gt;dma_audio_rd	= DMA_Ser4MCP0Rd;</div><div class='del'>-	mcp-&gt;dma_audio_wr	= DMA_Ser4MCP0Wr;</div><div class='del'>-	mcp-&gt;dma_telco_rd	= DMA_Ser4MCP1Rd;</div><div class='del'>-	mcp-&gt;dma_telco_wr	= DMA_Ser4MCP1Wr;</div><div class='del'>-	mcp-&gt;gpio_base		= data-&gt;gpio_base;</div><div class='add'>+	mcp-&gt;dma_audio_rd	= DDAR_DevAdd(res_mem0-&gt;start + MCDR0)</div><div class='add'>+				+ DDAR_DevRd + DDAR_Brst4 + DDAR_8BitDev;</div><div class='add'>+	mcp-&gt;dma_audio_wr	= DDAR_DevAdd(res_mem0-&gt;start + MCDR0)</div><div class='add'>+				+ DDAR_DevWr + DDAR_Brst4 + DDAR_8BitDev;</div><div class='add'>+	mcp-&gt;dma_telco_rd	= DDAR_DevAdd(res_mem0-&gt;start + MCDR1)</div><div class='add'>+				+ DDAR_DevRd + DDAR_Brst4 + DDAR_8BitDev;</div><div class='add'>+	mcp-&gt;dma_telco_wr	= DDAR_DevAdd(res_mem0-&gt;start + MCDR1)</div><div class='add'>+				+ DDAR_DevWr + DDAR_Brst4 + DDAR_8BitDev;</div><div class='add'>+	mcp-&gt;codec		= data-&gt;codec;</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, mcp);</div><div class='ctx'> </div><div class='del'>-	if (machine_is_assabet()) {</div><div class='del'>-		ASSABET_BCR_set(ASSABET_BCR_CODEC_RST);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Setup the PPC unit correctly.</div><div class='del'>-	 */</div><div class='del'>-	PPDR &amp;= ~PPC_RXD4;</div><div class='del'>-	PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;</div><div class='del'>-	PSDR |= PPC_RXD4;</div><div class='del'>-	PSDR &amp;= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);</div><div class='del'>-	PPSR &amp;= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialise device.  Note that we initially</div><div class='ctx'> 	 * set the sampling rate to minimum.</div><div class='ctx'> 	 */</div><div class='del'>-	Ser4MCSR = -1;</div><div class='del'>-	Ser4MCCR1 = data-&gt;mccr1;</div><div class='del'>-	Ser4MCCR0 = data-&gt;mccr0 | 0x7f7f;</div><div class='add'>+	priv-&gt;mccr0_base = ioremap(res_mem0-&gt;start, size0);</div><div class='add'>+	priv-&gt;mccr1_base = ioremap(res_mem1-&gt;start, size1);</div><div class='add'>+</div><div class='add'>+	__raw_writel(-1, priv-&gt;mccr0_base + MCSR);</div><div class='add'>+	priv-&gt;mccr1 = data-&gt;mccr1;</div><div class='add'>+	priv-&gt;mccr0 = data-&gt;mccr0 | 0x7f7f;</div><div class='add'>+	__raw_writel(priv-&gt;mccr0, priv-&gt;mccr0_base + MCCR0);</div><div class='add'>+	__raw_writel(priv-&gt;mccr1, priv-&gt;mccr1_base + MCCR1);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Calculate the read/write timeout (us) from the bit clock</div><div class='hunk'>@@ -195,36 +237,53 @@ static int mcp_sa11x0_probe(struct platform_device *pdev)</div><div class='ctx'> 	mcp-&gt;rw_timeout = (64 * 3 * 1000000 + mcp-&gt;sclk_rate - 1) /</div><div class='ctx'> 			  mcp-&gt;sclk_rate;</div><div class='ctx'> </div><div class='del'>-	ret = mcp_host_register(mcp);</div><div class='add'>+	ret = mcp_host_register(mcp, data-&gt;codec_pdata);</div><div class='ctx'> 	if (ret == 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+ release2:</div><div class='add'>+	release_mem_region(res_mem1-&gt;start, size1);</div><div class='ctx'>  release:</div><div class='del'>-	release_mem_region(0x80060000, 0x60);</div><div class='add'>+	release_mem_region(res_mem0-&gt;start, size0);</div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mcp_sa11x0_remove(struct platform_device *dev)</div><div class='add'>+static int mcp_sa11x0_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct mcp *mcp = platform_get_drvdata(dev);</div><div class='add'>+	struct mcp *mcp = platform_get_drvdata(pdev);</div><div class='add'>+	struct mcp_sa11x0 *priv = priv(mcp);</div><div class='add'>+	struct resource *res_mem;</div><div class='add'>+	u32 size;</div><div class='ctx'> </div><div class='del'>-	platform_set_drvdata(dev, NULL);</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> 	mcp_host_unregister(mcp);</div><div class='del'>-	release_mem_region(0x80060000, 0x60);</div><div class='ctx'> </div><div class='add'>+	res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (res_mem) {</div><div class='add'>+		size = res_mem-&gt;end - res_mem-&gt;start + 1;</div><div class='add'>+		release_mem_region(res_mem-&gt;start, size);</div><div class='add'>+	}</div><div class='add'>+	res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);</div><div class='add'>+	if (res_mem) {</div><div class='add'>+		size = res_mem-&gt;end - res_mem-&gt;start + 1;</div><div class='add'>+		release_mem_region(res_mem-&gt;start, size);</div><div class='add'>+	}</div><div class='add'>+	iounmap(priv-&gt;mccr0_base);</div><div class='add'>+	iounmap(priv-&gt;mccr1_base);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mcp_sa11x0_suspend(struct platform_device *dev, pm_message_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct mcp *mcp = platform_get_drvdata(dev);</div><div class='add'>+	struct mcp_sa11x0 *priv = priv(mcp);</div><div class='add'>+	u32 mccr0;</div><div class='ctx'> </div><div class='del'>-	priv(mcp)-&gt;mccr0 = Ser4MCCR0;</div><div class='del'>-	priv(mcp)-&gt;mccr1 = Ser4MCCR1;</div><div class='del'>-	Ser4MCCR0 &amp;= ~MCCR0_MCE;</div><div class='add'>+	mccr0 = priv-&gt;mccr0 &amp; ~MCCR0_MCE;</div><div class='add'>+	__raw_writel(mccr0, priv-&gt;mccr0_base + MCCR0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -232,9 +291,10 @@ static int mcp_sa11x0_suspend(struct platform_device *dev, pm_message_t state)</div><div class='ctx'> static int mcp_sa11x0_resume(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mcp *mcp = platform_get_drvdata(dev);</div><div class='add'>+	struct mcp_sa11x0 *priv = priv(mcp);</div><div class='ctx'> </div><div class='del'>-	Ser4MCCR1 = priv(mcp)-&gt;mccr1;</div><div class='del'>-	Ser4MCCR0 = priv(mcp)-&gt;mccr0;</div><div class='add'>+	__raw_writel(priv-&gt;mccr0, priv-&gt;mccr0_base + MCCR0);</div><div class='add'>+	__raw_writel(priv-&gt;mccr1, priv-&gt;mccr1_base + MCCR1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -251,24 +311,14 @@ static struct platform_driver mcp_sa11x0_driver = {</div><div class='ctx'> 	.resume		= mcp_sa11x0_resume,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "sa11x0-mcp",</div><div class='add'>+		.owner  = THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This needs re-working</div><div class='ctx'>  */</div><div class='del'>-static int __init mcp_sa11x0_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;mcp_sa11x0_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit mcp_sa11x0_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;mcp_sa11x0_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(mcp_sa11x0_init);</div><div class='del'>-module_exit(mcp_sa11x0_exit);</div><div class='add'>+module_platform_driver(mcp_sa11x0_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Russell King &lt;rmk@arm.linux.org.uk&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("SA11x0 multimedia communications port driver");</div><div class='head'>diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c<br/>index 86e14583a082..68ac2c55d5ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/omap-usb-host.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/omap-usb-host.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/omap-usb-host.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/omap-usb-host.c</a></div><div class='hunk'>@@ -27,8 +27,9 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;plat/usb.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> </div><div class='del'>-#define USBHS_DRIVER_NAME	"usbhs-omap"</div><div class='add'>+#define USBHS_DRIVER_NAME	"usbhs_omap"</div><div class='ctx'> #define OMAP_EHCI_DEVICE	"ehci-omap"</div><div class='ctx'> #define OMAP_OHCI_DEVICE	"ohci-omap3"</div><div class='ctx'> </div><div class='hunk'>@@ -147,9 +148,6 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct usbhs_hcd_omap {</div><div class='del'>-	struct clk			*usbhost_ick;</div><div class='del'>-	struct clk			*usbhost_hs_fck;</div><div class='del'>-	struct clk			*usbhost_fs_fck;</div><div class='ctx'> 	struct clk			*xclk60mhsp1_ck;</div><div class='ctx'> 	struct clk			*xclk60mhsp2_ck;</div><div class='ctx'> 	struct clk			*utmi_p1_fck;</div><div class='hunk'>@@ -159,8 +157,7 @@ struct usbhs_hcd_omap {</div><div class='ctx'> 	struct clk			*usbhost_p2_fck;</div><div class='ctx'> 	struct clk			*usbtll_p2_fck;</div><div class='ctx'> 	struct clk			*init_60m_fclk;</div><div class='del'>-	struct clk			*usbtll_fck;</div><div class='del'>-	struct clk			*usbtll_ick;</div><div class='add'>+	struct clk			*ehci_logic_fck;</div><div class='ctx'> </div><div class='ctx'> 	void __iomem			*uhh_base;</div><div class='ctx'> 	void __iomem			*tll_base;</div><div class='hunk'>@@ -169,7 +166,6 @@ struct usbhs_hcd_omap {</div><div class='ctx'> </div><div class='ctx'> 	u32				usbhs_rev;</div><div class='ctx'> 	spinlock_t			lock;</div><div class='del'>-	int				count;</div><div class='ctx'> };</div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='hunk'>@@ -319,269 +315,6 @@ err_end:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * usbhs_omap_probe - initialize TI-based HCDs</div><div class='del'>- *</div><div class='del'>- * Allocates basic resources for this USB host controller.</div><div class='del'>- */</div><div class='del'>-static int __devinit usbhs_omap_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 usbhs_omap_platform_data	*pdata = dev-&gt;platform_data;</div><div class='del'>-	struct usbhs_hcd_omap		*omap;</div><div class='del'>-	struct resource			*res;</div><div class='del'>-	int				ret = 0;</div><div class='del'>-	int				i;</div><div class='del'>-</div><div class='del'>-	if (!pdata) {</div><div class='del'>-		dev_err(dev, "Missing platform data\n");</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto end_probe;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omap = kzalloc(sizeof(*omap), GFP_KERNEL);</div><div class='del'>-	if (!omap) {</div><div class='del'>-		dev_err(dev, "Memory allocation failed\n");</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto end_probe;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;omap-&gt;lock);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; OMAP3_HS_USB_PORTS; i++)</div><div class='del'>-		omap-&gt;platdata.port_mode[i] = pdata-&gt;port_mode[i];</div><div class='del'>-</div><div class='del'>-	omap-&gt;platdata.ehci_data = pdata-&gt;ehci_data;</div><div class='del'>-	omap-&gt;platdata.ohci_data = pdata-&gt;ohci_data;</div><div class='del'>-</div><div class='del'>-	omap-&gt;usbhost_ick = clk_get(dev, "usbhost_ick");</div><div class='del'>-	if (IS_ERR(omap-&gt;usbhost_ick)) {</div><div class='del'>-		ret =  PTR_ERR(omap-&gt;usbhost_ick);</div><div class='del'>-		dev_err(dev, "usbhost_ick failed error:%d\n", ret);</div><div class='del'>-		goto err_end;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omap-&gt;usbhost_hs_fck = clk_get(dev, "hs_fck");</div><div class='del'>-	if (IS_ERR(omap-&gt;usbhost_hs_fck)) {</div><div class='del'>-		ret = PTR_ERR(omap-&gt;usbhost_hs_fck);</div><div class='del'>-		dev_err(dev, "usbhost_hs_fck failed error:%d\n", ret);</div><div class='del'>-		goto err_usbhost_ick;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omap-&gt;usbhost_fs_fck = clk_get(dev, "fs_fck");</div><div class='del'>-	if (IS_ERR(omap-&gt;usbhost_fs_fck)) {</div><div class='del'>-		ret = PTR_ERR(omap-&gt;usbhost_fs_fck);</div><div class='del'>-		dev_err(dev, "usbhost_fs_fck failed error:%d\n", ret);</div><div class='del'>-		goto err_usbhost_hs_fck;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omap-&gt;usbtll_fck = clk_get(dev, "usbtll_fck");</div><div class='del'>-	if (IS_ERR(omap-&gt;usbtll_fck)) {</div><div class='del'>-		ret = PTR_ERR(omap-&gt;usbtll_fck);</div><div class='del'>-		dev_err(dev, "usbtll_fck failed error:%d\n", ret);</div><div class='del'>-		goto err_usbhost_fs_fck;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omap-&gt;usbtll_ick = clk_get(dev, "usbtll_ick");</div><div class='del'>-	if (IS_ERR(omap-&gt;usbtll_ick)) {</div><div class='del'>-		ret = PTR_ERR(omap-&gt;usbtll_ick);</div><div class='del'>-		dev_err(dev, "usbtll_ick failed error:%d\n", ret);</div><div class='del'>-		goto err_usbtll_fck;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omap-&gt;utmi_p1_fck = clk_get(dev, "utmi_p1_gfclk");</div><div class='del'>-	if (IS_ERR(omap-&gt;utmi_p1_fck)) {</div><div class='del'>-		ret = PTR_ERR(omap-&gt;utmi_p1_fck);</div><div class='del'>-		dev_err(dev, "utmi_p1_gfclk failed error:%d\n",	ret);</div><div class='del'>-		goto err_usbtll_ick;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omap-&gt;xclk60mhsp1_ck = clk_get(dev, "xclk60mhsp1_ck");</div><div class='del'>-	if (IS_ERR(omap-&gt;xclk60mhsp1_ck)) {</div><div class='del'>-		ret = PTR_ERR(omap-&gt;xclk60mhsp1_ck);</div><div class='del'>-		dev_err(dev, "xclk60mhsp1_ck failed error:%d\n", ret);</div><div class='del'>-		goto err_utmi_p1_fck;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omap-&gt;utmi_p2_fck = clk_get(dev, "utmi_p2_gfclk");</div><div class='del'>-	if (IS_ERR(omap-&gt;utmi_p2_fck)) {</div><div class='del'>-		ret = PTR_ERR(omap-&gt;utmi_p2_fck);</div><div class='del'>-		dev_err(dev, "utmi_p2_gfclk failed error:%d\n", ret);</div><div class='del'>-		goto err_xclk60mhsp1_ck;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omap-&gt;xclk60mhsp2_ck = clk_get(dev, "xclk60mhsp2_ck");</div><div class='del'>-	if (IS_ERR(omap-&gt;xclk60mhsp2_ck)) {</div><div class='del'>-		ret = PTR_ERR(omap-&gt;xclk60mhsp2_ck);</div><div class='del'>-		dev_err(dev, "xclk60mhsp2_ck failed error:%d\n", ret);</div><div class='del'>-		goto err_utmi_p2_fck;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omap-&gt;usbhost_p1_fck = clk_get(dev, "usb_host_hs_utmi_p1_clk");</div><div class='del'>-	if (IS_ERR(omap-&gt;usbhost_p1_fck)) {</div><div class='del'>-		ret = PTR_ERR(omap-&gt;usbhost_p1_fck);</div><div class='del'>-		dev_err(dev, "usbhost_p1_fck failed error:%d\n", ret);</div><div class='del'>-		goto err_xclk60mhsp2_ck;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omap-&gt;usbtll_p1_fck = clk_get(dev, "usb_tll_hs_usb_ch0_clk");</div><div class='del'>-	if (IS_ERR(omap-&gt;usbtll_p1_fck)) {</div><div class='del'>-		ret = PTR_ERR(omap-&gt;usbtll_p1_fck);</div><div class='del'>-		dev_err(dev, "usbtll_p1_fck failed error:%d\n", ret);</div><div class='del'>-		goto err_usbhost_p1_fck;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omap-&gt;usbhost_p2_fck = clk_get(dev, "usb_host_hs_utmi_p2_clk");</div><div class='del'>-	if (IS_ERR(omap-&gt;usbhost_p2_fck)) {</div><div class='del'>-		ret = PTR_ERR(omap-&gt;usbhost_p2_fck);</div><div class='del'>-		dev_err(dev, "usbhost_p2_fck failed error:%d\n", ret);</div><div class='del'>-		goto err_usbtll_p1_fck;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omap-&gt;usbtll_p2_fck = clk_get(dev, "usb_tll_hs_usb_ch1_clk");</div><div class='del'>-	if (IS_ERR(omap-&gt;usbtll_p2_fck)) {</div><div class='del'>-		ret = PTR_ERR(omap-&gt;usbtll_p2_fck);</div><div class='del'>-		dev_err(dev, "usbtll_p2_fck failed error:%d\n", ret);</div><div class='del'>-		goto err_usbhost_p2_fck;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omap-&gt;init_60m_fclk = clk_get(dev, "init_60m_fclk");</div><div class='del'>-	if (IS_ERR(omap-&gt;init_60m_fclk)) {</div><div class='del'>-		ret = PTR_ERR(omap-&gt;init_60m_fclk);</div><div class='del'>-		dev_err(dev, "init_60m_fclk failed error:%d\n", ret);</div><div class='del'>-		goto err_usbtll_p2_fck;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "uhh");</div><div class='del'>-	if (!res) {</div><div class='del'>-		dev_err(dev, "UHH EHCI get resource failed\n");</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto err_init_60m_fclk;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omap-&gt;uhh_base = ioremap(res-&gt;start, resource_size(res));</div><div class='del'>-	if (!omap-&gt;uhh_base) {</div><div class='del'>-		dev_err(dev, "UHH ioremap failed\n");</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_init_60m_fclk;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "tll");</div><div class='del'>-	if (!res) {</div><div class='del'>-		dev_err(dev, "UHH EHCI get resource failed\n");</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto err_tll;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omap-&gt;tll_base = ioremap(res-&gt;start, resource_size(res));</div><div class='del'>-	if (!omap-&gt;tll_base) {</div><div class='del'>-		dev_err(dev, "TLL ioremap failed\n");</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_tll;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, omap);</div><div class='del'>-</div><div class='del'>-	ret = omap_usbhs_alloc_children(pdev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(dev, "omap_usbhs_alloc_children failed\n");</div><div class='del'>-		goto err_alloc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	goto end_probe;</div><div class='del'>-</div><div class='del'>-err_alloc:</div><div class='del'>-	iounmap(omap-&gt;tll_base);</div><div class='del'>-</div><div class='del'>-err_tll:</div><div class='del'>-	iounmap(omap-&gt;uhh_base);</div><div class='del'>-</div><div class='del'>-err_init_60m_fclk:</div><div class='del'>-	clk_put(omap-&gt;init_60m_fclk);</div><div class='del'>-</div><div class='del'>-err_usbtll_p2_fck:</div><div class='del'>-	clk_put(omap-&gt;usbtll_p2_fck);</div><div class='del'>-</div><div class='del'>-err_usbhost_p2_fck:</div><div class='del'>-	clk_put(omap-&gt;usbhost_p2_fck);</div><div class='del'>-</div><div class='del'>-err_usbtll_p1_fck:</div><div class='del'>-	clk_put(omap-&gt;usbtll_p1_fck);</div><div class='del'>-</div><div class='del'>-err_usbhost_p1_fck:</div><div class='del'>-	clk_put(omap-&gt;usbhost_p1_fck);</div><div class='del'>-</div><div class='del'>-err_xclk60mhsp2_ck:</div><div class='del'>-	clk_put(omap-&gt;xclk60mhsp2_ck);</div><div class='del'>-</div><div class='del'>-err_utmi_p2_fck:</div><div class='del'>-	clk_put(omap-&gt;utmi_p2_fck);</div><div class='del'>-</div><div class='del'>-err_xclk60mhsp1_ck:</div><div class='del'>-	clk_put(omap-&gt;xclk60mhsp1_ck);</div><div class='del'>-</div><div class='del'>-err_utmi_p1_fck:</div><div class='del'>-	clk_put(omap-&gt;utmi_p1_fck);</div><div class='del'>-</div><div class='del'>-err_usbtll_ick:</div><div class='del'>-	clk_put(omap-&gt;usbtll_ick);</div><div class='del'>-</div><div class='del'>-err_usbtll_fck:</div><div class='del'>-	clk_put(omap-&gt;usbtll_fck);</div><div class='del'>-</div><div class='del'>-err_usbhost_fs_fck:</div><div class='del'>-	clk_put(omap-&gt;usbhost_fs_fck);</div><div class='del'>-</div><div class='del'>-err_usbhost_hs_fck:</div><div class='del'>-	clk_put(omap-&gt;usbhost_hs_fck);</div><div class='del'>-</div><div class='del'>-err_usbhost_ick:</div><div class='del'>-	clk_put(omap-&gt;usbhost_ick);</div><div class='del'>-</div><div class='del'>-err_end:</div><div class='del'>-	kfree(omap);</div><div class='del'>-</div><div class='del'>-end_probe:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * usbhs_omap_remove - shutdown processing for UHH &amp; TLL HCDs</div><div class='del'>- * @pdev: USB Host Controller being removed</div><div class='del'>- *</div><div class='del'>- * Reverses the effect of usbhs_omap_probe().</div><div class='del'>- */</div><div class='del'>-static int __devexit usbhs_omap_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct usbhs_hcd_omap *omap = platform_get_drvdata(pdev);</div><div class='del'>-</div><div class='del'>-	if (omap-&gt;count != 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"Either EHCI or OHCI is still using usbhs core\n");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iounmap(omap-&gt;tll_base);</div><div class='del'>-	iounmap(omap-&gt;uhh_base);</div><div class='del'>-	clk_put(omap-&gt;init_60m_fclk);</div><div class='del'>-	clk_put(omap-&gt;usbtll_p2_fck);</div><div class='del'>-	clk_put(omap-&gt;usbhost_p2_fck);</div><div class='del'>-	clk_put(omap-&gt;usbtll_p1_fck);</div><div class='del'>-	clk_put(omap-&gt;usbhost_p1_fck);</div><div class='del'>-	clk_put(omap-&gt;xclk60mhsp2_ck);</div><div class='del'>-	clk_put(omap-&gt;utmi_p2_fck);</div><div class='del'>-	clk_put(omap-&gt;xclk60mhsp1_ck);</div><div class='del'>-	clk_put(omap-&gt;utmi_p1_fck);</div><div class='del'>-	clk_put(omap-&gt;usbtll_ick);</div><div class='del'>-	clk_put(omap-&gt;usbtll_fck);</div><div class='del'>-	clk_put(omap-&gt;usbhost_fs_fck);</div><div class='del'>-	clk_put(omap-&gt;usbhost_hs_fck);</div><div class='del'>-	clk_put(omap-&gt;usbhost_ick);</div><div class='del'>-	kfree(omap);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool is_ohci_port(enum usbhs_omap_port_mode pmode)</div><div class='ctx'> {</div><div class='ctx'> 	switch (pmode) {</div><div class='hunk'>@@ -689,96 +422,101 @@ static void usbhs_omap_tll_init(struct device *dev, u8 tll_channel_count)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int usbhs_enable(struct device *dev)</div><div class='add'>+static int usbhs_runtime_resume(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct usbhs_hcd_omap		*omap = dev_get_drvdata(dev);</div><div class='ctx'> 	struct usbhs_omap_platform_data	*pdata = &amp;omap-&gt;platdata;</div><div class='del'>-	unsigned long			flags = 0;</div><div class='del'>-	int				ret = 0;</div><div class='del'>-	unsigned long			timeout;</div><div class='del'>-	unsigned			reg;</div><div class='add'>+	unsigned long			flags;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "usbhs_runtime_resume\n");</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "starting TI HSUSB Controller\n");</div><div class='ctx'> 	if (!pdata) {</div><div class='ctx'> 		dev_dbg(dev, "missing platform_data\n");</div><div class='ctx'> 		return  -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;omap-&gt;lock, flags);</div><div class='del'>-	if (omap-&gt;count &gt; 0)</div><div class='del'>-		goto end_count;</div><div class='ctx'> </div><div class='del'>-	clk_enable(omap-&gt;usbhost_ick);</div><div class='del'>-	clk_enable(omap-&gt;usbhost_hs_fck);</div><div class='del'>-	clk_enable(omap-&gt;usbhost_fs_fck);</div><div class='del'>-	clk_enable(omap-&gt;usbtll_fck);</div><div class='del'>-	clk_enable(omap-&gt;usbtll_ick);</div><div class='add'>+	if (omap-&gt;ehci_logic_fck &amp;&amp; !IS_ERR(omap-&gt;ehci_logic_fck))</div><div class='add'>+		clk_enable(omap-&gt;ehci_logic_fck);</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;ehci_data-&gt;phy_reset) {</div><div class='del'>-		if (gpio_is_valid(pdata-&gt;ehci_data-&gt;reset_gpio_port[0])) {</div><div class='del'>-			gpio_request(pdata-&gt;ehci_data-&gt;reset_gpio_port[0],</div><div class='del'>-						"USB1 PHY reset");</div><div class='del'>-			gpio_direction_output</div><div class='del'>-				(pdata-&gt;ehci_data-&gt;reset_gpio_port[0], 0);</div><div class='del'>-		}</div><div class='add'>+	if (is_ehci_tll_mode(pdata-&gt;port_mode[0])) {</div><div class='add'>+		clk_enable(omap-&gt;usbhost_p1_fck);</div><div class='add'>+		clk_enable(omap-&gt;usbtll_p1_fck);</div><div class='add'>+	}</div><div class='add'>+	if (is_ehci_tll_mode(pdata-&gt;port_mode[1])) {</div><div class='add'>+		clk_enable(omap-&gt;usbhost_p2_fck);</div><div class='add'>+		clk_enable(omap-&gt;usbtll_p2_fck);</div><div class='add'>+	}</div><div class='add'>+	clk_enable(omap-&gt;utmi_p1_fck);</div><div class='add'>+	clk_enable(omap-&gt;utmi_p2_fck);</div><div class='ctx'> </div><div class='del'>-		if (gpio_is_valid(pdata-&gt;ehci_data-&gt;reset_gpio_port[1])) {</div><div class='del'>-			gpio_request(pdata-&gt;ehci_data-&gt;reset_gpio_port[1],</div><div class='del'>-						"USB2 PHY reset");</div><div class='del'>-			gpio_direction_output</div><div class='del'>-				(pdata-&gt;ehci_data-&gt;reset_gpio_port[1], 0);</div><div class='del'>-		}</div><div class='add'>+	spin_unlock_irqrestore(&amp;omap-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-		/* Hold the PHY in RESET for enough time till DIR is high */</div><div class='del'>-		udelay(10);</div><div class='del'>-	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	omap-&gt;usbhs_rev = usbhs_read(omap-&gt;uhh_base, OMAP_UHH_REVISION);</div><div class='del'>-	dev_dbg(dev, "OMAP UHH_REVISION 0x%x\n", omap-&gt;usbhs_rev);</div><div class='add'>+static int usbhs_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct usbhs_hcd_omap		*omap = dev_get_drvdata(dev);</div><div class='add'>+	struct usbhs_omap_platform_data	*pdata = &amp;omap-&gt;platdata;</div><div class='add'>+	unsigned long			flags;</div><div class='ctx'> </div><div class='del'>-	/* perform TLL soft reset, and wait until reset is complete */</div><div class='del'>-	usbhs_write(omap-&gt;tll_base, OMAP_USBTLL_SYSCONFIG,</div><div class='del'>-			OMAP_USBTLL_SYSCONFIG_SOFTRESET);</div><div class='add'>+	dev_dbg(dev, "usbhs_runtime_suspend\n");</div><div class='ctx'> </div><div class='del'>-	/* Wait for TLL reset to complete */</div><div class='del'>-	timeout = jiffies + msecs_to_jiffies(1000);</div><div class='del'>-	while (!(usbhs_read(omap-&gt;tll_base, OMAP_USBTLL_SYSSTATUS)</div><div class='del'>-			&amp; OMAP_USBTLL_SYSSTATUS_RESETDONE)) {</div><div class='del'>-		cpu_relax();</div><div class='add'>+	if (!pdata) {</div><div class='add'>+		dev_dbg(dev, "missing platform_data\n");</div><div class='add'>+		return  -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (time_after(jiffies, timeout)) {</div><div class='del'>-			dev_dbg(dev, "operation timed out\n");</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto err_tll;</div><div class='del'>-		}</div><div class='add'>+	spin_lock_irqsave(&amp;omap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (is_ehci_tll_mode(pdata-&gt;port_mode[0])) {</div><div class='add'>+		clk_disable(omap-&gt;usbhost_p1_fck);</div><div class='add'>+		clk_disable(omap-&gt;usbtll_p1_fck);</div><div class='add'>+	}</div><div class='add'>+	if (is_ehci_tll_mode(pdata-&gt;port_mode[1])) {</div><div class='add'>+		clk_disable(omap-&gt;usbhost_p2_fck);</div><div class='add'>+		clk_disable(omap-&gt;usbtll_p2_fck);</div><div class='ctx'> 	}</div><div class='add'>+	clk_disable(omap-&gt;utmi_p2_fck);</div><div class='add'>+	clk_disable(omap-&gt;utmi_p1_fck);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "TLL RESET DONE\n");</div><div class='add'>+	if (omap-&gt;ehci_logic_fck &amp;&amp; !IS_ERR(omap-&gt;ehci_logic_fck))</div><div class='add'>+		clk_disable(omap-&gt;ehci_logic_fck);</div><div class='ctx'> </div><div class='del'>-	/* (1&lt;&lt;3) = no idle mode only for initial debugging */</div><div class='del'>-	usbhs_write(omap-&gt;tll_base, OMAP_USBTLL_SYSCONFIG,</div><div class='del'>-			OMAP_USBTLL_SYSCONFIG_ENAWAKEUP |</div><div class='del'>-			OMAP_USBTLL_SYSCONFIG_SIDLEMODE |</div><div class='del'>-			OMAP_USBTLL_SYSCONFIG_AUTOIDLE);</div><div class='add'>+	spin_unlock_irqrestore(&amp;omap-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	/* Put UHH in NoIdle/NoStandby mode */</div><div class='del'>-	reg = usbhs_read(omap-&gt;uhh_base, OMAP_UHH_SYSCONFIG);</div><div class='del'>-	if (is_omap_usbhs_rev1(omap)) {</div><div class='del'>-		reg |= (OMAP_UHH_SYSCONFIG_ENAWAKEUP</div><div class='del'>-				| OMAP_UHH_SYSCONFIG_SIDLEMODE</div><div class='del'>-				| OMAP_UHH_SYSCONFIG_CACTIVITY</div><div class='del'>-				| OMAP_UHH_SYSCONFIG_MIDLEMODE);</div><div class='del'>-		reg &amp;= ~OMAP_UHH_SYSCONFIG_AUTOIDLE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void omap_usbhs_init(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct usbhs_hcd_omap		*omap = dev_get_drvdata(dev);</div><div class='add'>+	struct usbhs_omap_platform_data	*pdata = &amp;omap-&gt;platdata;</div><div class='add'>+	unsigned long			flags;</div><div class='add'>+	unsigned			reg;</div><div class='ctx'> </div><div class='add'>+	dev_dbg(dev, "starting TI HSUSB Controller\n");</div><div class='ctx'> </div><div class='del'>-	} else if (is_omap_usbhs_rev2(omap)) {</div><div class='del'>-		reg &amp;= ~OMAP4_UHH_SYSCONFIG_IDLEMODE_CLEAR;</div><div class='del'>-		reg |= OMAP4_UHH_SYSCONFIG_NOIDLE;</div><div class='del'>-		reg &amp;= ~OMAP4_UHH_SYSCONFIG_STDBYMODE_CLEAR;</div><div class='del'>-		reg |= OMAP4_UHH_SYSCONFIG_NOSTDBY;</div><div class='add'>+	pm_runtime_get_sync(dev);</div><div class='add'>+	spin_lock_irqsave(&amp;omap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;ehci_data-&gt;phy_reset) {</div><div class='add'>+		if (gpio_is_valid(pdata-&gt;ehci_data-&gt;reset_gpio_port[0]))</div><div class='add'>+			gpio_request_one(pdata-&gt;ehci_data-&gt;reset_gpio_port[0],</div><div class='add'>+					 GPIOF_OUT_INIT_LOW, "USB1 PHY reset");</div><div class='add'>+</div><div class='add'>+		if (gpio_is_valid(pdata-&gt;ehci_data-&gt;reset_gpio_port[1]))</div><div class='add'>+			gpio_request_one(pdata-&gt;ehci_data-&gt;reset_gpio_port[1],</div><div class='add'>+					 GPIOF_OUT_INIT_LOW, "USB2 PHY reset");</div><div class='add'>+</div><div class='add'>+		/* Hold the PHY in RESET for enough time till DIR is high */</div><div class='add'>+		udelay(10);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	usbhs_write(omap-&gt;uhh_base, OMAP_UHH_SYSCONFIG, reg);</div><div class='add'>+	omap-&gt;usbhs_rev = usbhs_read(omap-&gt;uhh_base, OMAP_UHH_REVISION);</div><div class='add'>+	dev_dbg(dev, "OMAP UHH_REVISION 0x%x\n", omap-&gt;usbhs_rev);</div><div class='ctx'> </div><div class='ctx'> 	reg = usbhs_read(omap-&gt;uhh_base, OMAP_UHH_HOSTCONFIG);</div><div class='ctx'> 	/* setup ULPI bypass and burst configurations */</div><div class='hunk'>@@ -825,49 +563,6 @@ static int usbhs_enable(struct device *dev)</div><div class='ctx'> 		reg &amp;= ~OMAP4_P1_MODE_CLEAR;</div><div class='ctx'> 		reg &amp;= ~OMAP4_P2_MODE_CLEAR;</div><div class='ctx'> </div><div class='del'>-		if (is_ehci_phy_mode(pdata-&gt;port_mode[0])) {</div><div class='del'>-			ret = clk_set_parent(omap-&gt;utmi_p1_fck,</div><div class='del'>-						omap-&gt;xclk60mhsp1_ck);</div><div class='del'>-			if (ret != 0) {</div><div class='del'>-				dev_err(dev, "xclk60mhsp1_ck set parent"</div><div class='del'>-				"failed error:%d\n", ret);</div><div class='del'>-				goto err_tll;</div><div class='del'>-			}</div><div class='del'>-		} else if (is_ehci_tll_mode(pdata-&gt;port_mode[0])) {</div><div class='del'>-			ret = clk_set_parent(omap-&gt;utmi_p1_fck,</div><div class='del'>-						omap-&gt;init_60m_fclk);</div><div class='del'>-			if (ret != 0) {</div><div class='del'>-				dev_err(dev, "init_60m_fclk set parent"</div><div class='del'>-				"failed error:%d\n", ret);</div><div class='del'>-				goto err_tll;</div><div class='del'>-			}</div><div class='del'>-			clk_enable(omap-&gt;usbhost_p1_fck);</div><div class='del'>-			clk_enable(omap-&gt;usbtll_p1_fck);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (is_ehci_phy_mode(pdata-&gt;port_mode[1])) {</div><div class='del'>-			ret = clk_set_parent(omap-&gt;utmi_p2_fck,</div><div class='del'>-						omap-&gt;xclk60mhsp2_ck);</div><div class='del'>-			if (ret != 0) {</div><div class='del'>-				dev_err(dev, "xclk60mhsp1_ck set parent"</div><div class='del'>-					"failed error:%d\n", ret);</div><div class='del'>-				goto err_tll;</div><div class='del'>-			}</div><div class='del'>-		} else if (is_ehci_tll_mode(pdata-&gt;port_mode[1])) {</div><div class='del'>-			ret = clk_set_parent(omap-&gt;utmi_p2_fck,</div><div class='del'>-						omap-&gt;init_60m_fclk);</div><div class='del'>-			if (ret != 0) {</div><div class='del'>-				dev_err(dev, "init_60m_fclk set parent"</div><div class='del'>-				"failed error:%d\n", ret);</div><div class='del'>-				goto err_tll;</div><div class='del'>-			}</div><div class='del'>-			clk_enable(omap-&gt;usbhost_p2_fck);</div><div class='del'>-			clk_enable(omap-&gt;usbtll_p2_fck);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		clk_enable(omap-&gt;utmi_p1_fck);</div><div class='del'>-		clk_enable(omap-&gt;utmi_p2_fck);</div><div class='del'>-</div><div class='ctx'> 		if (is_ehci_tll_mode(pdata-&gt;port_mode[0]) ||</div><div class='ctx'> 			(is_ohci_port(pdata-&gt;port_mode[0])))</div><div class='ctx'> 			reg |= OMAP4_P1_MODE_TLL;</div><div class='hunk'>@@ -913,12 +608,15 @@ static int usbhs_enable(struct device *dev)</div><div class='ctx'> 				(pdata-&gt;ehci_data-&gt;reset_gpio_port[1], 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-end_count:</div><div class='del'>-	omap-&gt;count++;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;omap-&gt;lock, flags);</div><div class='del'>-	return 0;</div><div class='add'>+	pm_runtime_put_sync(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void omap_usbhs_deinit(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct usbhs_hcd_omap		*omap = dev_get_drvdata(dev);</div><div class='add'>+	struct usbhs_omap_platform_data	*pdata = &amp;omap-&gt;platdata;</div><div class='ctx'> </div><div class='del'>-err_tll:</div><div class='ctx'> 	if (pdata-&gt;ehci_data-&gt;phy_reset) {</div><div class='ctx'> 		if (gpio_is_valid(pdata-&gt;ehci_data-&gt;reset_gpio_port[0]))</div><div class='ctx'> 			gpio_free(pdata-&gt;ehci_data-&gt;reset_gpio_port[0]);</div><div class='hunk'>@@ -926,123 +624,272 @@ err_tll:</div><div class='ctx'> 		if (gpio_is_valid(pdata-&gt;ehci_data-&gt;reset_gpio_port[1]))</div><div class='ctx'> 			gpio_free(pdata-&gt;ehci_data-&gt;reset_gpio_port[1]);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	clk_disable(omap-&gt;usbtll_ick);</div><div class='del'>-	clk_disable(omap-&gt;usbtll_fck);</div><div class='del'>-	clk_disable(omap-&gt;usbhost_fs_fck);</div><div class='del'>-	clk_disable(omap-&gt;usbhost_hs_fck);</div><div class='del'>-	clk_disable(omap-&gt;usbhost_ick);</div><div class='del'>-	spin_unlock_irqrestore(&amp;omap-&gt;lock, flags);</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void usbhs_disable(struct device *dev)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * usbhs_omap_probe - initialize TI-based HCDs</div><div class='add'>+ *</div><div class='add'>+ * Allocates basic resources for this USB host controller.</div><div class='add'>+ */</div><div class='add'>+static int __devinit usbhs_omap_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct usbhs_hcd_omap		*omap = dev_get_drvdata(dev);</div><div class='del'>-	struct usbhs_omap_platform_data	*pdata = &amp;omap-&gt;platdata;</div><div class='del'>-	unsigned long			flags = 0;</div><div class='del'>-	unsigned long			timeout;</div><div class='add'>+	struct device			*dev =  &amp;pdev-&gt;dev;</div><div class='add'>+	struct usbhs_omap_platform_data	*pdata = dev-&gt;platform_data;</div><div class='add'>+	struct usbhs_hcd_omap		*omap;</div><div class='add'>+	struct resource			*res;</div><div class='add'>+	int				ret = 0;</div><div class='add'>+	int				i;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "stopping TI HSUSB Controller\n");</div><div class='add'>+	if (!pdata) {</div><div class='add'>+		dev_err(dev, "Missing platform data\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto end_probe;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;omap-&gt;lock, flags);</div><div class='add'>+	omap = kzalloc(sizeof(*omap), GFP_KERNEL);</div><div class='add'>+	if (!omap) {</div><div class='add'>+		dev_err(dev, "Memory allocation failed\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto end_probe;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (omap-&gt;count == 0)</div><div class='del'>-		goto end_disble;</div><div class='add'>+	spin_lock_init(&amp;omap-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	omap-&gt;count--;</div><div class='add'>+	for (i = 0; i &lt; OMAP3_HS_USB_PORTS; i++)</div><div class='add'>+		omap-&gt;platdata.port_mode[i] = pdata-&gt;port_mode[i];</div><div class='ctx'> </div><div class='del'>-	if (omap-&gt;count != 0)</div><div class='del'>-		goto end_disble;</div><div class='add'>+	omap-&gt;platdata.ehci_data = pdata-&gt;ehci_data;</div><div class='add'>+	omap-&gt;platdata.ohci_data = pdata-&gt;ohci_data;</div><div class='add'>+</div><div class='add'>+	pm_runtime_enable(dev);</div><div class='ctx'> </div><div class='del'>-	/* Reset OMAP modules for insmod/rmmod to work */</div><div class='del'>-	usbhs_write(omap-&gt;uhh_base, OMAP_UHH_SYSCONFIG,</div><div class='del'>-			is_omap_usbhs_rev2(omap) ?</div><div class='del'>-			OMAP4_UHH_SYSCONFIG_SOFTRESET :</div><div class='del'>-			OMAP_UHH_SYSCONFIG_SOFTRESET);</div><div class='ctx'> </div><div class='del'>-	timeout = jiffies + msecs_to_jiffies(100);</div><div class='del'>-	while (!(usbhs_read(omap-&gt;uhh_base, OMAP_UHH_SYSSTATUS)</div><div class='del'>-				&amp; (1 &lt;&lt; 0))) {</div><div class='del'>-		cpu_relax();</div><div class='add'>+	for (i = 0; i &lt; OMAP3_HS_USB_PORTS; i++)</div><div class='add'>+		if (is_ehci_phy_mode(i) || is_ehci_tll_mode(i) ||</div><div class='add'>+			is_ehci_hsic_mode(i)) {</div><div class='add'>+			omap-&gt;ehci_logic_fck = clk_get(dev, "ehci_logic_fck");</div><div class='add'>+			if (IS_ERR(omap-&gt;ehci_logic_fck)) {</div><div class='add'>+				ret = PTR_ERR(omap-&gt;ehci_logic_fck);</div><div class='add'>+				dev_warn(dev, "ehci_logic_fck failed:%d\n",</div><div class='add'>+					 ret);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (time_after(jiffies, timeout))</div><div class='del'>-			dev_dbg(dev, "operation timed out\n");</div><div class='add'>+	omap-&gt;utmi_p1_fck = clk_get(dev, "utmi_p1_gfclk");</div><div class='add'>+	if (IS_ERR(omap-&gt;utmi_p1_fck)) {</div><div class='add'>+		ret = PTR_ERR(omap-&gt;utmi_p1_fck);</div><div class='add'>+		dev_err(dev, "utmi_p1_gfclk failed error:%d\n",	ret);</div><div class='add'>+		goto err_end;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	while (!(usbhs_read(omap-&gt;uhh_base, OMAP_UHH_SYSSTATUS)</div><div class='del'>-				&amp; (1 &lt;&lt; 1))) {</div><div class='del'>-		cpu_relax();</div><div class='add'>+	omap-&gt;xclk60mhsp1_ck = clk_get(dev, "xclk60mhsp1_ck");</div><div class='add'>+	if (IS_ERR(omap-&gt;xclk60mhsp1_ck)) {</div><div class='add'>+		ret = PTR_ERR(omap-&gt;xclk60mhsp1_ck);</div><div class='add'>+		dev_err(dev, "xclk60mhsp1_ck failed error:%d\n", ret);</div><div class='add'>+		goto err_utmi_p1_fck;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	omap-&gt;utmi_p2_fck = clk_get(dev, "utmi_p2_gfclk");</div><div class='add'>+	if (IS_ERR(omap-&gt;utmi_p2_fck)) {</div><div class='add'>+		ret = PTR_ERR(omap-&gt;utmi_p2_fck);</div><div class='add'>+		dev_err(dev, "utmi_p2_gfclk failed error:%d\n", ret);</div><div class='add'>+		goto err_xclk60mhsp1_ck;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	omap-&gt;xclk60mhsp2_ck = clk_get(dev, "xclk60mhsp2_ck");</div><div class='add'>+	if (IS_ERR(omap-&gt;xclk60mhsp2_ck)) {</div><div class='add'>+		ret = PTR_ERR(omap-&gt;xclk60mhsp2_ck);</div><div class='add'>+		dev_err(dev, "xclk60mhsp2_ck failed error:%d\n", ret);</div><div class='add'>+		goto err_utmi_p2_fck;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (time_after(jiffies, timeout))</div><div class='del'>-			dev_dbg(dev, "operation timed out\n");</div><div class='add'>+	omap-&gt;usbhost_p1_fck = clk_get(dev, "usb_host_hs_utmi_p1_clk");</div><div class='add'>+	if (IS_ERR(omap-&gt;usbhost_p1_fck)) {</div><div class='add'>+		ret = PTR_ERR(omap-&gt;usbhost_p1_fck);</div><div class='add'>+		dev_err(dev, "usbhost_p1_fck failed error:%d\n", ret);</div><div class='add'>+		goto err_xclk60mhsp2_ck;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	omap-&gt;usbtll_p1_fck = clk_get(dev, "usb_tll_hs_usb_ch0_clk");</div><div class='add'>+	if (IS_ERR(omap-&gt;usbtll_p1_fck)) {</div><div class='add'>+		ret = PTR_ERR(omap-&gt;usbtll_p1_fck);</div><div class='add'>+		dev_err(dev, "usbtll_p1_fck failed error:%d\n", ret);</div><div class='add'>+		goto err_usbhost_p1_fck;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	omap-&gt;usbhost_p2_fck = clk_get(dev, "usb_host_hs_utmi_p2_clk");</div><div class='add'>+	if (IS_ERR(omap-&gt;usbhost_p2_fck)) {</div><div class='add'>+		ret = PTR_ERR(omap-&gt;usbhost_p2_fck);</div><div class='add'>+		dev_err(dev, "usbhost_p2_fck failed error:%d\n", ret);</div><div class='add'>+		goto err_usbtll_p1_fck;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	while (!(usbhs_read(omap-&gt;uhh_base, OMAP_UHH_SYSSTATUS)</div><div class='del'>-				&amp; (1 &lt;&lt; 2))) {</div><div class='del'>-		cpu_relax();</div><div class='add'>+	omap-&gt;usbtll_p2_fck = clk_get(dev, "usb_tll_hs_usb_ch1_clk");</div><div class='add'>+	if (IS_ERR(omap-&gt;usbtll_p2_fck)) {</div><div class='add'>+		ret = PTR_ERR(omap-&gt;usbtll_p2_fck);</div><div class='add'>+		dev_err(dev, "usbtll_p2_fck failed error:%d\n", ret);</div><div class='add'>+		goto err_usbhost_p2_fck;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (time_after(jiffies, timeout))</div><div class='del'>-			dev_dbg(dev, "operation timed out\n");</div><div class='add'>+	omap-&gt;init_60m_fclk = clk_get(dev, "init_60m_fclk");</div><div class='add'>+	if (IS_ERR(omap-&gt;init_60m_fclk)) {</div><div class='add'>+		ret = PTR_ERR(omap-&gt;init_60m_fclk);</div><div class='add'>+		dev_err(dev, "init_60m_fclk failed error:%d\n", ret);</div><div class='add'>+		goto err_usbtll_p2_fck;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	usbhs_write(omap-&gt;tll_base, OMAP_USBTLL_SYSCONFIG, (1 &lt;&lt; 1));</div><div class='add'>+	if (is_ehci_phy_mode(pdata-&gt;port_mode[0])) {</div><div class='add'>+		/* for OMAP3 , the clk set paretn fails */</div><div class='add'>+		ret = clk_set_parent(omap-&gt;utmi_p1_fck,</div><div class='add'>+					omap-&gt;xclk60mhsp1_ck);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			dev_err(dev, "xclk60mhsp1_ck set parent"</div><div class='add'>+				"failed error:%d\n", ret);</div><div class='add'>+	} else if (is_ehci_tll_mode(pdata-&gt;port_mode[0])) {</div><div class='add'>+		ret = clk_set_parent(omap-&gt;utmi_p1_fck,</div><div class='add'>+					omap-&gt;init_60m_fclk);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			dev_err(dev, "init_60m_fclk set parent"</div><div class='add'>+				"failed error:%d\n", ret);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	while (!(usbhs_read(omap-&gt;tll_base, OMAP_USBTLL_SYSSTATUS)</div><div class='del'>-				&amp; (1 &lt;&lt; 0))) {</div><div class='del'>-		cpu_relax();</div><div class='add'>+	if (is_ehci_phy_mode(pdata-&gt;port_mode[1])) {</div><div class='add'>+		ret = clk_set_parent(omap-&gt;utmi_p2_fck,</div><div class='add'>+					omap-&gt;xclk60mhsp2_ck);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			dev_err(dev, "xclk60mhsp2_ck set parent"</div><div class='add'>+					"failed error:%d\n", ret);</div><div class='add'>+	} else if (is_ehci_tll_mode(pdata-&gt;port_mode[1])) {</div><div class='add'>+		ret = clk_set_parent(omap-&gt;utmi_p2_fck,</div><div class='add'>+						omap-&gt;init_60m_fclk);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			dev_err(dev, "init_60m_fclk set parent"</div><div class='add'>+				"failed error:%d\n", ret);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (time_after(jiffies, timeout))</div><div class='del'>-			dev_dbg(dev, "operation timed out\n");</div><div class='add'>+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "uhh");</div><div class='add'>+	if (!res) {</div><div class='add'>+		dev_err(dev, "UHH EHCI get resource failed\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err_init_60m_fclk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_omap_usbhs_rev2(omap)) {</div><div class='del'>-		if (is_ehci_tll_mode(pdata-&gt;port_mode[0]))</div><div class='del'>-			clk_disable(omap-&gt;usbtll_p1_fck);</div><div class='del'>-		if (is_ehci_tll_mode(pdata-&gt;port_mode[1]))</div><div class='del'>-			clk_disable(omap-&gt;usbtll_p2_fck);</div><div class='del'>-		clk_disable(omap-&gt;utmi_p2_fck);</div><div class='del'>-		clk_disable(omap-&gt;utmi_p1_fck);</div><div class='add'>+	omap-&gt;uhh_base = ioremap(res-&gt;start, resource_size(res));</div><div class='add'>+	if (!omap-&gt;uhh_base) {</div><div class='add'>+		dev_err(dev, "UHH ioremap failed\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_init_60m_fclk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	clk_disable(omap-&gt;usbtll_ick);</div><div class='del'>-	clk_disable(omap-&gt;usbtll_fck);</div><div class='del'>-	clk_disable(omap-&gt;usbhost_fs_fck);</div><div class='del'>-	clk_disable(omap-&gt;usbhost_hs_fck);</div><div class='del'>-	clk_disable(omap-&gt;usbhost_ick);</div><div class='add'>+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "tll");</div><div class='add'>+	if (!res) {</div><div class='add'>+		dev_err(dev, "UHH EHCI get resource failed\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err_tll;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* The gpio_free migh sleep; so unlock the spinlock */</div><div class='del'>-	spin_unlock_irqrestore(&amp;omap-&gt;lock, flags);</div><div class='add'>+	omap-&gt;tll_base = ioremap(res-&gt;start, resource_size(res));</div><div class='add'>+	if (!omap-&gt;tll_base) {</div><div class='add'>+		dev_err(dev, "TLL ioremap failed\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_tll;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;ehci_data-&gt;phy_reset) {</div><div class='del'>-		if (gpio_is_valid(pdata-&gt;ehci_data-&gt;reset_gpio_port[0]))</div><div class='del'>-			gpio_free(pdata-&gt;ehci_data-&gt;reset_gpio_port[0]);</div><div class='add'>+	platform_set_drvdata(pdev, omap);</div><div class='ctx'> </div><div class='del'>-		if (gpio_is_valid(pdata-&gt;ehci_data-&gt;reset_gpio_port[1]))</div><div class='del'>-			gpio_free(pdata-&gt;ehci_data-&gt;reset_gpio_port[1]);</div><div class='add'>+	ret = omap_usbhs_alloc_children(pdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "omap_usbhs_alloc_children failed\n");</div><div class='add'>+		goto err_alloc;</div><div class='ctx'> 	}</div><div class='del'>-	return;</div><div class='ctx'> </div><div class='del'>-end_disble:</div><div class='del'>-	spin_unlock_irqrestore(&amp;omap-&gt;lock, flags);</div><div class='del'>-}</div><div class='add'>+	omap_usbhs_init(dev);</div><div class='ctx'> </div><div class='del'>-int omap_usbhs_enable(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return  usbhs_enable(dev-&gt;parent);</div><div class='add'>+	goto end_probe;</div><div class='add'>+</div><div class='add'>+err_alloc:</div><div class='add'>+	iounmap(omap-&gt;tll_base);</div><div class='add'>+</div><div class='add'>+err_tll:</div><div class='add'>+	iounmap(omap-&gt;uhh_base);</div><div class='add'>+</div><div class='add'>+err_init_60m_fclk:</div><div class='add'>+	clk_put(omap-&gt;init_60m_fclk);</div><div class='add'>+</div><div class='add'>+err_usbtll_p2_fck:</div><div class='add'>+	clk_put(omap-&gt;usbtll_p2_fck);</div><div class='add'>+</div><div class='add'>+err_usbhost_p2_fck:</div><div class='add'>+	clk_put(omap-&gt;usbhost_p2_fck);</div><div class='add'>+</div><div class='add'>+err_usbtll_p1_fck:</div><div class='add'>+	clk_put(omap-&gt;usbtll_p1_fck);</div><div class='add'>+</div><div class='add'>+err_usbhost_p1_fck:</div><div class='add'>+	clk_put(omap-&gt;usbhost_p1_fck);</div><div class='add'>+</div><div class='add'>+err_xclk60mhsp2_ck:</div><div class='add'>+	clk_put(omap-&gt;xclk60mhsp2_ck);</div><div class='add'>+</div><div class='add'>+err_utmi_p2_fck:</div><div class='add'>+	clk_put(omap-&gt;utmi_p2_fck);</div><div class='add'>+</div><div class='add'>+err_xclk60mhsp1_ck:</div><div class='add'>+	clk_put(omap-&gt;xclk60mhsp1_ck);</div><div class='add'>+</div><div class='add'>+err_utmi_p1_fck:</div><div class='add'>+	clk_put(omap-&gt;utmi_p1_fck);</div><div class='add'>+</div><div class='add'>+err_end:</div><div class='add'>+	clk_put(omap-&gt;ehci_logic_fck);</div><div class='add'>+	pm_runtime_disable(dev);</div><div class='add'>+	kfree(omap);</div><div class='add'>+</div><div class='add'>+end_probe:</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(omap_usbhs_enable);</div><div class='ctx'> </div><div class='del'>-void omap_usbhs_disable(struct device *dev)</div><div class='add'>+/**</div><div class='add'>+ * usbhs_omap_remove - shutdown processing for UHH &amp; TLL HCDs</div><div class='add'>+ * @pdev: USB Host Controller being removed</div><div class='add'>+ *</div><div class='add'>+ * Reverses the effect of usbhs_omap_probe().</div><div class='add'>+ */</div><div class='add'>+static int __devexit usbhs_omap_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	usbhs_disable(dev-&gt;parent);</div><div class='add'>+	struct usbhs_hcd_omap *omap = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	omap_usbhs_deinit(&amp;pdev-&gt;dev);</div><div class='add'>+	iounmap(omap-&gt;tll_base);</div><div class='add'>+	iounmap(omap-&gt;uhh_base);</div><div class='add'>+	clk_put(omap-&gt;init_60m_fclk);</div><div class='add'>+	clk_put(omap-&gt;usbtll_p2_fck);</div><div class='add'>+	clk_put(omap-&gt;usbhost_p2_fck);</div><div class='add'>+	clk_put(omap-&gt;usbtll_p1_fck);</div><div class='add'>+	clk_put(omap-&gt;usbhost_p1_fck);</div><div class='add'>+	clk_put(omap-&gt;xclk60mhsp2_ck);</div><div class='add'>+	clk_put(omap-&gt;utmi_p2_fck);</div><div class='add'>+	clk_put(omap-&gt;xclk60mhsp1_ck);</div><div class='add'>+	clk_put(omap-&gt;utmi_p1_fck);</div><div class='add'>+	clk_put(omap-&gt;ehci_logic_fck);</div><div class='add'>+	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='add'>+	kfree(omap);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(omap_usbhs_disable);</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops usbhsomap_dev_pm_ops = {</div><div class='add'>+	.runtime_suspend	= usbhs_runtime_suspend,</div><div class='add'>+	.runtime_resume		= usbhs_runtime_resume,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver usbhs_omap_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name		= (char *)usbhs_driver_name,</div><div class='ctx'> 		.owner		= THIS_MODULE,</div><div class='add'>+		.pm		= &amp;usbhsomap_dev_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> 	.remove		= __exit_p(usbhs_omap_remove),</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/mfd/pcf50633-adc.c b/drivers/mfd/pcf50633-adc.c<br/>index aed0d2a9b032..3927c17e4175 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/pcf50633-adc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/pcf50633-adc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/pcf50633-adc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/pcf50633-adc.c</a></div><div class='hunk'>@@ -249,17 +249,7 @@ static struct platform_driver pcf50633_adc_driver = {</div><div class='ctx'> 	.remove = __devexit_p(pcf50633_adc_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pcf50633_adc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pcf50633_adc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pcf50633_adc_init);</div><div class='del'>-</div><div class='del'>-static void __exit pcf50633_adc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pcf50633_adc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(pcf50633_adc_exit);</div><div class='add'>+module_platform_driver(pcf50633_adc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Balaji Rao &lt;balajirrao@openmoko.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("PCF50633 adc driver");</div><div class='head'>diff --git a/drivers/mfd/s5m-core.c b/drivers/mfd/s5m-core.c<br/>new file mode 100644<br/>index 000000000000..e075c113eec6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/s5m-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/s5m-core.c</a></div><div class='hunk'>@@ -0,0 +1,176 @@</div><div class='add'>+/*</div><div class='add'>+ * s5m87xx.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd</div><div class='add'>+ *              http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ *  under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ *  option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</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/init.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/mfd/core.h&gt;</div><div class='add'>+#include &lt;linux/mfd/s5m87xx/s5m-core.h&gt;</div><div class='add'>+#include &lt;linux/mfd/s5m87xx/s5m-pmic.h&gt;</div><div class='add'>+#include &lt;linux/mfd/s5m87xx/s5m-rtc.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+static struct mfd_cell s5m87xx_devs[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "s5m8767-pmic",</div><div class='add'>+	}, {</div><div class='add'>+		.name = "s5m-rtc",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int s5m_reg_read(struct s5m87xx_dev *s5m87xx, u8 reg, void *dest)</div><div class='add'>+{</div><div class='add'>+	return regmap_read(s5m87xx-&gt;regmap, reg, dest);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(s5m_reg_read);</div><div class='add'>+</div><div class='add'>+int s5m_bulk_read(struct s5m87xx_dev *s5m87xx, u8 reg, int count, u8 *buf)</div><div class='add'>+{</div><div class='add'>+	return regmap_bulk_read(s5m87xx-&gt;regmap, reg, buf, count);;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(s5m_bulk_read);</div><div class='add'>+</div><div class='add'>+int s5m_reg_write(struct s5m87xx_dev *s5m87xx, u8 reg, u8 value)</div><div class='add'>+{</div><div class='add'>+	return regmap_write(s5m87xx-&gt;regmap, reg, value);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(s5m_reg_write);</div><div class='add'>+</div><div class='add'>+int s5m_bulk_write(struct s5m87xx_dev *s5m87xx, u8 reg, int count, u8 *buf)</div><div class='add'>+{</div><div class='add'>+	return regmap_raw_write(s5m87xx-&gt;regmap, reg, buf, count * sizeof(u16));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(s5m_bulk_write);</div><div class='add'>+</div><div class='add'>+int s5m_reg_update(struct s5m87xx_dev *s5m87xx, u8 reg, u8 val, u8 mask)</div><div class='add'>+{</div><div class='add'>+	return regmap_update_bits(s5m87xx-&gt;regmap, reg, mask, val);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(s5m_reg_update);</div><div class='add'>+</div><div class='add'>+static struct regmap_config s5m_regmap_config = {</div><div class='add'>+	.reg_bits = 8,</div><div class='add'>+	.val_bits = 8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int s5m87xx_i2c_probe(struct i2c_client *i2c,</div><div class='add'>+			    const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct s5m_platform_data *pdata = i2c-&gt;dev.platform_data;</div><div class='add'>+	struct s5m87xx_dev *s5m87xx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	s5m87xx = kzalloc(sizeof(struct s5m87xx_dev), GFP_KERNEL);</div><div class='add'>+	if (s5m87xx == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(i2c, s5m87xx);</div><div class='add'>+	s5m87xx-&gt;dev = &amp;i2c-&gt;dev;</div><div class='add'>+	s5m87xx-&gt;i2c = i2c;</div><div class='add'>+	s5m87xx-&gt;irq = i2c-&gt;irq;</div><div class='add'>+	s5m87xx-&gt;type = id-&gt;driver_data;</div><div class='add'>+</div><div class='add'>+	if (pdata) {</div><div class='add'>+		s5m87xx-&gt;device_type = pdata-&gt;device_type;</div><div class='add'>+		s5m87xx-&gt;ono = pdata-&gt;ono;</div><div class='add'>+		s5m87xx-&gt;irq_base = pdata-&gt;irq_base;</div><div class='add'>+		s5m87xx-&gt;wakeup = pdata-&gt;wakeup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s5m87xx-&gt;regmap = regmap_init_i2c(i2c, &amp;s5m_regmap_config);</div><div class='add'>+	if (IS_ERR(s5m87xx-&gt;regmap)) {</div><div class='add'>+		error = PTR_ERR(s5m87xx-&gt;regmap);</div><div class='add'>+		dev_err(&amp;i2c-&gt;dev, "Failed to allocate register map: %d\n",</div><div class='add'>+			error);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s5m87xx-&gt;rtc = i2c_new_dummy(i2c-&gt;adapter, RTC_I2C_ADDR);</div><div class='add'>+	i2c_set_clientdata(s5m87xx-&gt;rtc, s5m87xx);</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;cfg_pmic_irq)</div><div class='add'>+		pdata-&gt;cfg_pmic_irq();</div><div class='add'>+</div><div class='add'>+	s5m_irq_init(s5m87xx);</div><div class='add'>+</div><div class='add'>+	pm_runtime_set_active(s5m87xx-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ret = mfd_add_devices(s5m87xx-&gt;dev, -1,</div><div class='add'>+				s5m87xx_devs, ARRAY_SIZE(s5m87xx_devs),</div><div class='add'>+				NULL, 0);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	mfd_remove_devices(s5m87xx-&gt;dev);</div><div class='add'>+	s5m_irq_exit(s5m87xx);</div><div class='add'>+	i2c_unregister_device(s5m87xx-&gt;rtc);</div><div class='add'>+	regmap_exit(s5m87xx-&gt;regmap);</div><div class='add'>+	kfree(s5m87xx);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s5m87xx_i2c_remove(struct i2c_client *i2c)</div><div class='add'>+{</div><div class='add'>+	struct s5m87xx_dev *s5m87xx = i2c_get_clientdata(i2c);</div><div class='add'>+</div><div class='add'>+	mfd_remove_devices(s5m87xx-&gt;dev);</div><div class='add'>+	s5m_irq_exit(s5m87xx);</div><div class='add'>+	i2c_unregister_device(s5m87xx-&gt;rtc);</div><div class='add'>+	regmap_exit(s5m87xx-&gt;regmap);</div><div class='add'>+	kfree(s5m87xx);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id s5m87xx_i2c_id[] = {</div><div class='add'>+	{ "s5m87xx", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, s5m87xx_i2c_id);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver s5m87xx_i2c_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		   .name = "s5m87xx",</div><div class='add'>+		   .owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe = s5m87xx_i2c_probe,</div><div class='add'>+	.remove = s5m87xx_i2c_remove,</div><div class='add'>+	.id_table = s5m87xx_i2c_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init s5m87xx_i2c_init(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;s5m87xx_i2c_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(s5m87xx_i2c_init);</div><div class='add'>+</div><div class='add'>+static void __exit s5m87xx_i2c_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;s5m87xx_i2c_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(s5m87xx_i2c_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Sangbeom Kim &lt;sbkim73@samsung.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Core support for the S5M MFD");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mfd/s5m-irq.c b/drivers/mfd/s5m-irq.c<br/>new file mode 100644<br/>index 000000000000..de76dfb6f0ad<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/s5m-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/s5m-irq.c</a></div><div class='hunk'>@@ -0,0 +1,487 @@</div><div class='add'>+/*</div><div class='add'>+ * s5m-irq.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Samsung Electronics Co., Ltd</div><div class='add'>+ *              http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ *  under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ *  option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.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/mfd/s5m87xx/s5m-core.h&gt;</div><div class='add'>+</div><div class='add'>+struct s5m_irq_data {</div><div class='add'>+	int reg;</div><div class='add'>+	int mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s5m_irq_data s5m8767_irqs[] = {</div><div class='add'>+	[S5M8767_IRQ_PWRR] = {</div><div class='add'>+		.reg = 1,</div><div class='add'>+		.mask = S5M8767_IRQ_PWRR_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8767_IRQ_PWRF] = {</div><div class='add'>+		.reg = 1,</div><div class='add'>+		.mask = S5M8767_IRQ_PWRF_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8767_IRQ_PWR1S] = {</div><div class='add'>+		.reg = 1,</div><div class='add'>+		.mask = S5M8767_IRQ_PWR1S_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8767_IRQ_JIGR] = {</div><div class='add'>+		.reg = 1,</div><div class='add'>+		.mask = S5M8767_IRQ_JIGR_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8767_IRQ_JIGF] = {</div><div class='add'>+		.reg = 1,</div><div class='add'>+		.mask = S5M8767_IRQ_JIGF_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8767_IRQ_LOWBAT2] = {</div><div class='add'>+		.reg = 1,</div><div class='add'>+		.mask = S5M8767_IRQ_LOWBAT2_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8767_IRQ_LOWBAT1] = {</div><div class='add'>+		.reg = 1,</div><div class='add'>+		.mask = S5M8767_IRQ_LOWBAT1_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8767_IRQ_MRB] = {</div><div class='add'>+		.reg = 2,</div><div class='add'>+		.mask = S5M8767_IRQ_MRB_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8767_IRQ_DVSOK2] = {</div><div class='add'>+		.reg = 2,</div><div class='add'>+		.mask = S5M8767_IRQ_DVSOK2_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8767_IRQ_DVSOK3] = {</div><div class='add'>+		.reg = 2,</div><div class='add'>+		.mask = S5M8767_IRQ_DVSOK3_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8767_IRQ_DVSOK4] = {</div><div class='add'>+		.reg = 2,</div><div class='add'>+		.mask = S5M8767_IRQ_DVSOK4_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8767_IRQ_RTC60S] = {</div><div class='add'>+		.reg = 3,</div><div class='add'>+		.mask = S5M8767_IRQ_RTC60S_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8767_IRQ_RTCA1] = {</div><div class='add'>+		.reg = 3,</div><div class='add'>+		.mask = S5M8767_IRQ_RTCA1_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8767_IRQ_RTCA2] = {</div><div class='add'>+		.reg = 3,</div><div class='add'>+		.mask = S5M8767_IRQ_RTCA2_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8767_IRQ_SMPL] = {</div><div class='add'>+		.reg = 3,</div><div class='add'>+		.mask = S5M8767_IRQ_SMPL_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8767_IRQ_RTC1S] = {</div><div class='add'>+		.reg = 3,</div><div class='add'>+		.mask = S5M8767_IRQ_RTC1S_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8767_IRQ_WTSR] = {</div><div class='add'>+		.reg = 3,</div><div class='add'>+		.mask = S5M8767_IRQ_WTSR_MASK,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s5m_irq_data s5m8763_irqs[] = {</div><div class='add'>+	[S5M8763_IRQ_DCINF] = {</div><div class='add'>+		.reg = 1,</div><div class='add'>+		.mask = S5M8763_IRQ_DCINF_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8763_IRQ_DCINR] = {</div><div class='add'>+		.reg = 1,</div><div class='add'>+		.mask = S5M8763_IRQ_DCINR_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8763_IRQ_JIGF] = {</div><div class='add'>+		.reg = 1,</div><div class='add'>+		.mask = S5M8763_IRQ_JIGF_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8763_IRQ_JIGR] = {</div><div class='add'>+		.reg = 1,</div><div class='add'>+		.mask = S5M8763_IRQ_JIGR_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8763_IRQ_PWRONF] = {</div><div class='add'>+		.reg = 1,</div><div class='add'>+		.mask = S5M8763_IRQ_PWRONF_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8763_IRQ_PWRONR] = {</div><div class='add'>+		.reg = 1,</div><div class='add'>+		.mask = S5M8763_IRQ_PWRONR_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8763_IRQ_WTSREVNT] = {</div><div class='add'>+		.reg = 2,</div><div class='add'>+		.mask = S5M8763_IRQ_WTSREVNT_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8763_IRQ_SMPLEVNT] = {</div><div class='add'>+		.reg = 2,</div><div class='add'>+		.mask = S5M8763_IRQ_SMPLEVNT_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8763_IRQ_ALARM1] = {</div><div class='add'>+		.reg = 2,</div><div class='add'>+		.mask = S5M8763_IRQ_ALARM1_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8763_IRQ_ALARM0] = {</div><div class='add'>+		.reg = 2,</div><div class='add'>+		.mask = S5M8763_IRQ_ALARM0_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8763_IRQ_ONKEY1S] = {</div><div class='add'>+		.reg = 3,</div><div class='add'>+		.mask = S5M8763_IRQ_ONKEY1S_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8763_IRQ_TOPOFFR] = {</div><div class='add'>+		.reg = 3,</div><div class='add'>+		.mask = S5M8763_IRQ_TOPOFFR_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8763_IRQ_DCINOVPR] = {</div><div class='add'>+		.reg = 3,</div><div class='add'>+		.mask = S5M8763_IRQ_DCINOVPR_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8763_IRQ_CHGRSTF] = {</div><div class='add'>+		.reg = 3,</div><div class='add'>+		.mask = S5M8763_IRQ_CHGRSTF_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8763_IRQ_DONER] = {</div><div class='add'>+		.reg = 3,</div><div class='add'>+		.mask = S5M8763_IRQ_DONER_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8763_IRQ_CHGFAULT] = {</div><div class='add'>+		.reg = 3,</div><div class='add'>+		.mask = S5M8763_IRQ_CHGFAULT_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8763_IRQ_LOBAT1] = {</div><div class='add'>+		.reg = 4,</div><div class='add'>+		.mask = S5M8763_IRQ_LOBAT1_MASK,</div><div class='add'>+	},</div><div class='add'>+	[S5M8763_IRQ_LOBAT2] = {</div><div class='add'>+		.reg = 4,</div><div class='add'>+		.mask = S5M8763_IRQ_LOBAT2_MASK,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct s5m_irq_data *</div><div class='add'>+irq_to_s5m8767_irq(struct s5m87xx_dev *s5m87xx, int irq)</div><div class='add'>+{</div><div class='add'>+	return &amp;s5m8767_irqs[irq - s5m87xx-&gt;irq_base];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s5m8767_irq_lock(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	struct s5m87xx_dev *s5m87xx = irq_data_get_irq_chip_data(data);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;s5m87xx-&gt;irqlock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s5m8767_irq_sync_unlock(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	struct s5m87xx_dev *s5m87xx = irq_data_get_irq_chip_data(data);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(s5m87xx-&gt;irq_masks_cur); i++) {</div><div class='add'>+		if (s5m87xx-&gt;irq_masks_cur[i] != s5m87xx-&gt;irq_masks_cache[i]) {</div><div class='add'>+			s5m87xx-&gt;irq_masks_cache[i] = s5m87xx-&gt;irq_masks_cur[i];</div><div class='add'>+			s5m_reg_write(s5m87xx, S5M8767_REG_INT1M + i,</div><div class='add'>+					s5m87xx-&gt;irq_masks_cur[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;s5m87xx-&gt;irqlock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s5m8767_irq_unmask(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	struct s5m87xx_dev *s5m87xx = irq_data_get_irq_chip_data(data);</div><div class='add'>+	struct s5m_irq_data *irq_data = irq_to_s5m8767_irq(s5m87xx,</div><div class='add'>+							       data-&gt;irq);</div><div class='add'>+</div><div class='add'>+	s5m87xx-&gt;irq_masks_cur[irq_data-&gt;reg - 1] &amp;= ~irq_data-&gt;mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s5m8767_irq_mask(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	struct s5m87xx_dev *s5m87xx = irq_data_get_irq_chip_data(data);</div><div class='add'>+	struct s5m_irq_data *irq_data = irq_to_s5m8767_irq(s5m87xx,</div><div class='add'>+							       data-&gt;irq);</div><div class='add'>+</div><div class='add'>+	s5m87xx-&gt;irq_masks_cur[irq_data-&gt;reg - 1] |= irq_data-&gt;mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip s5m8767_irq_chip = {</div><div class='add'>+	.name = "s5m8767",</div><div class='add'>+	.irq_bus_lock = s5m8767_irq_lock,</div><div class='add'>+	.irq_bus_sync_unlock = s5m8767_irq_sync_unlock,</div><div class='add'>+	.irq_mask = s5m8767_irq_mask,</div><div class='add'>+	.irq_unmask = s5m8767_irq_unmask,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct s5m_irq_data *</div><div class='add'>+irq_to_s5m8763_irq(struct s5m87xx_dev *s5m87xx, int irq)</div><div class='add'>+{</div><div class='add'>+	return &amp;s5m8763_irqs[irq - s5m87xx-&gt;irq_base];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s5m8763_irq_lock(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	struct s5m87xx_dev *s5m87xx = irq_data_get_irq_chip_data(data);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;s5m87xx-&gt;irqlock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s5m8763_irq_sync_unlock(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	struct s5m87xx_dev *s5m87xx = irq_data_get_irq_chip_data(data);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(s5m87xx-&gt;irq_masks_cur); i++) {</div><div class='add'>+		if (s5m87xx-&gt;irq_masks_cur[i] != s5m87xx-&gt;irq_masks_cache[i]) {</div><div class='add'>+			s5m87xx-&gt;irq_masks_cache[i] = s5m87xx-&gt;irq_masks_cur[i];</div><div class='add'>+			s5m_reg_write(s5m87xx, S5M8763_REG_IRQM1 + i,</div><div class='add'>+					s5m87xx-&gt;irq_masks_cur[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;s5m87xx-&gt;irqlock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s5m8763_irq_unmask(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	struct s5m87xx_dev *s5m87xx = irq_data_get_irq_chip_data(data);</div><div class='add'>+	struct s5m_irq_data *irq_data = irq_to_s5m8763_irq(s5m87xx,</div><div class='add'>+							       data-&gt;irq);</div><div class='add'>+</div><div class='add'>+	s5m87xx-&gt;irq_masks_cur[irq_data-&gt;reg - 1] &amp;= ~irq_data-&gt;mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s5m8763_irq_mask(struct irq_data *data)</div><div class='add'>+{</div><div class='add'>+	struct s5m87xx_dev *s5m87xx = irq_data_get_irq_chip_data(data);</div><div class='add'>+	struct s5m_irq_data *irq_data = irq_to_s5m8763_irq(s5m87xx,</div><div class='add'>+							       data-&gt;irq);</div><div class='add'>+</div><div class='add'>+	s5m87xx-&gt;irq_masks_cur[irq_data-&gt;reg - 1] |= irq_data-&gt;mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip s5m8763_irq_chip = {</div><div class='add'>+	.name = "s5m8763",</div><div class='add'>+	.irq_bus_lock = s5m8763_irq_lock,</div><div class='add'>+	.irq_bus_sync_unlock = s5m8763_irq_sync_unlock,</div><div class='add'>+	.irq_mask = s5m8763_irq_mask,</div><div class='add'>+	.irq_unmask = s5m8763_irq_unmask,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static irqreturn_t s5m8767_irq_thread(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct s5m87xx_dev *s5m87xx = data;</div><div class='add'>+	u8 irq_reg[NUM_IRQ_REGS-1];</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	ret = s5m_bulk_read(s5m87xx, S5M8767_REG_INT1,</div><div class='add'>+				NUM_IRQ_REGS - 1, irq_reg);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(s5m87xx-&gt;dev, "Failed to read interrupt register: %d\n",</div><div class='add'>+				ret);</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_IRQ_REGS - 1; i++)</div><div class='add'>+		irq_reg[i] &amp;= ~s5m87xx-&gt;irq_masks_cur[i];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; S5M8767_IRQ_NR; i++) {</div><div class='add'>+		if (irq_reg[s5m8767_irqs[i].reg - 1] &amp; s5m8767_irqs[i].mask)</div><div class='add'>+			handle_nested_irq(s5m87xx-&gt;irq_base + i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t s5m8763_irq_thread(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct s5m87xx_dev *s5m87xx = data;</div><div class='add'>+	u8 irq_reg[NUM_IRQ_REGS];</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ret = s5m_bulk_read(s5m87xx, S5M8763_REG_IRQ1,</div><div class='add'>+				NUM_IRQ_REGS, irq_reg);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(s5m87xx-&gt;dev, "Failed to read interrupt register: %d\n",</div><div class='add'>+				ret);</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_IRQ_REGS; i++)</div><div class='add'>+		irq_reg[i] &amp;= ~s5m87xx-&gt;irq_masks_cur[i];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; S5M8763_IRQ_NR; i++) {</div><div class='add'>+		if (irq_reg[s5m8763_irqs[i].reg - 1] &amp; s5m8763_irqs[i].mask)</div><div class='add'>+			handle_nested_irq(s5m87xx-&gt;irq_base + i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5m_irq_resume(struct s5m87xx_dev *s5m87xx)</div><div class='add'>+{</div><div class='add'>+	if (s5m87xx-&gt;irq &amp;&amp; s5m87xx-&gt;irq_base){</div><div class='add'>+		switch (s5m87xx-&gt;device_type) {</div><div class='add'>+		case S5M8763X:</div><div class='add'>+			s5m8763_irq_thread(s5m87xx-&gt;irq_base, s5m87xx);</div><div class='add'>+			break;</div><div class='add'>+		case S5M8767X:</div><div class='add'>+			s5m8767_irq_thread(s5m87xx-&gt;irq_base, s5m87xx);</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 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int s5m_irq_init(struct s5m87xx_dev *s5m87xx)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int cur_irq;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int type = s5m87xx-&gt;device_type;</div><div class='add'>+</div><div class='add'>+	if (!s5m87xx-&gt;irq) {</div><div class='add'>+		dev_warn(s5m87xx-&gt;dev,</div><div class='add'>+			 "No interrupt specified, no interrupts\n");</div><div class='add'>+		s5m87xx-&gt;irq_base = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!s5m87xx-&gt;irq_base) {</div><div class='add'>+		dev_err(s5m87xx-&gt;dev,</div><div class='add'>+			"No interrupt base specified, no interrupts\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;s5m87xx-&gt;irqlock);</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case S5M8763X:</div><div class='add'>+		for (i = 0; i &lt; NUM_IRQ_REGS; i++) {</div><div class='add'>+			s5m87xx-&gt;irq_masks_cur[i] = 0xff;</div><div class='add'>+			s5m87xx-&gt;irq_masks_cache[i] = 0xff;</div><div class='add'>+			s5m_reg_write(s5m87xx, S5M8763_REG_IRQM1 + i,</div><div class='add'>+						0xff);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		s5m_reg_write(s5m87xx, S5M8763_REG_STATUSM1, 0xff);</div><div class='add'>+		s5m_reg_write(s5m87xx, S5M8763_REG_STATUSM2, 0xff);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; S5M8763_IRQ_NR; i++) {</div><div class='add'>+			cur_irq = i + s5m87xx-&gt;irq_base;</div><div class='add'>+			irq_set_chip_data(cur_irq, s5m87xx);</div><div class='add'>+			irq_set_chip_and_handler(cur_irq, &amp;s5m8763_irq_chip,</div><div class='add'>+						 handle_edge_irq);</div><div class='add'>+			irq_set_nested_thread(cur_irq, 1);</div><div class='add'>+#ifdef CONFIG_ARM</div><div class='add'>+			set_irq_flags(cur_irq, IRQF_VALID);</div><div class='add'>+#else</div><div class='add'>+			irq_set_noprobe(cur_irq);</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = request_threaded_irq(s5m87xx-&gt;irq, NULL,</div><div class='add'>+					s5m8763_irq_thread,</div><div class='add'>+					IRQF_TRIGGER_FALLING | IRQF_ONESHOT,</div><div class='add'>+					"s5m87xx-irq", s5m87xx);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(s5m87xx-&gt;dev, "Failed to request IRQ %d: %d\n",</div><div class='add'>+				s5m87xx-&gt;irq, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case S5M8767X:</div><div class='add'>+		for (i = 0; i &lt; NUM_IRQ_REGS - 1; i++) {</div><div class='add'>+			s5m87xx-&gt;irq_masks_cur[i] = 0xff;</div><div class='add'>+			s5m87xx-&gt;irq_masks_cache[i] = 0xff;</div><div class='add'>+			s5m_reg_write(s5m87xx, S5M8767_REG_INT1M + i,</div><div class='add'>+						0xff);</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; S5M8767_IRQ_NR; i++) {</div><div class='add'>+			cur_irq = i + s5m87xx-&gt;irq_base;</div><div class='add'>+			irq_set_chip_data(cur_irq, s5m87xx);</div><div class='add'>+			if (ret) {</div><div class='add'>+				dev_err(s5m87xx-&gt;dev,</div><div class='add'>+					"Failed to irq_set_chip_data %d: %d\n",</div><div class='add'>+					s5m87xx-&gt;irq, ret);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			irq_set_chip_and_handler(cur_irq, &amp;s5m8767_irq_chip,</div><div class='add'>+						 handle_edge_irq);</div><div class='add'>+			irq_set_nested_thread(cur_irq, 1);</div><div class='add'>+#ifdef CONFIG_ARM</div><div class='add'>+			set_irq_flags(cur_irq, IRQF_VALID);</div><div class='add'>+#else</div><div class='add'>+			irq_set_noprobe(cur_irq);</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = request_threaded_irq(s5m87xx-&gt;irq, NULL,</div><div class='add'>+					   s5m8767_irq_thread,</div><div class='add'>+					   IRQF_TRIGGER_FALLING | IRQF_ONESHOT,</div><div class='add'>+					   "s5m87xx-irq", s5m87xx);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(s5m87xx-&gt;dev, "Failed to request IRQ %d: %d\n",</div><div class='add'>+				s5m87xx-&gt;irq, ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!s5m87xx-&gt;ono)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case S5M8763X:</div><div class='add'>+		ret = request_threaded_irq(s5m87xx-&gt;ono, NULL,</div><div class='add'>+						s5m8763_irq_thread,</div><div class='add'>+						IRQF_TRIGGER_FALLING |</div><div class='add'>+						IRQF_TRIGGER_RISING |</div><div class='add'>+						IRQF_ONESHOT, "s5m87xx-ono",</div><div class='add'>+						s5m87xx);</div><div class='add'>+		break;</div><div class='add'>+	case S5M8767X:</div><div class='add'>+		ret = request_threaded_irq(s5m87xx-&gt;ono, NULL,</div><div class='add'>+					s5m8767_irq_thread,</div><div class='add'>+					IRQF_TRIGGER_FALLING |</div><div class='add'>+					IRQF_TRIGGER_RISING |</div><div class='add'>+					IRQF_ONESHOT, "s5m87xx-ono", s5m87xx);</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'>+		dev_err(s5m87xx-&gt;dev, "Failed to request IRQ %d: %d\n",</div><div class='add'>+			s5m87xx-&gt;ono, ret);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void s5m_irq_exit(struct s5m87xx_dev *s5m87xx)</div><div class='add'>+{</div><div class='add'>+	if (s5m87xx-&gt;ono)</div><div class='add'>+		free_irq(s5m87xx-&gt;ono, s5m87xx);</div><div class='add'>+</div><div class='add'>+	if (s5m87xx-&gt;irq)</div><div class='add'>+		free_irq(s5m87xx-&gt;irq, s5m87xx);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c<br/>index df3702c1756d..f4d86117f44a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/sm501.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/sm501.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/sm501.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/sm501.c</a></div><div class='hunk'>@@ -1720,7 +1720,7 @@ static int sm501_plat_remove(struct platform_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id sm501_pci_tbl[] = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(sm501_pci_tbl) = {</div><div class='ctx'> 	{ 0x126f, 0x0501, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },</div><div class='ctx'> 	{ 0, },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c<br/>new file mode 100644<br/>index 000000000000..373f423b1181<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/stmpe-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/stmpe-i2c.c</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+/*</div><div class='add'>+ * ST Microelectronics MFD: stmpe's i2c client specific driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) ST-Ericsson SA 2010</div><div class='add'>+ * Copyright (C) ST Microelectronics SA 2011</div><div class='add'>+ *</div><div class='add'>+ * License Terms: GNU General Public License, version 2</div><div class='add'>+ * Author: Rabin Vincent &lt;rabin.vincent@stericsson.com&gt; for ST-Ericsson</div><div class='add'>+ * Author: Viresh Kumar &lt;viresh.kumar@st.com&gt; for ST Microelectronics</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include "stmpe.h"</div><div class='add'>+</div><div class='add'>+static int i2c_reg_read(struct stmpe *stmpe, u8 reg)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *i2c = stmpe-&gt;client;</div><div class='add'>+</div><div class='add'>+	return i2c_smbus_read_byte_data(i2c, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int i2c_reg_write(struct stmpe *stmpe, u8 reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *i2c = stmpe-&gt;client;</div><div class='add'>+</div><div class='add'>+	return i2c_smbus_write_byte_data(i2c, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int i2c_block_read(struct stmpe *stmpe, u8 reg, u8 length, u8 *values)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *i2c = stmpe-&gt;client;</div><div class='add'>+</div><div class='add'>+	return i2c_smbus_read_i2c_block_data(i2c, reg, length, values);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int i2c_block_write(struct stmpe *stmpe, u8 reg, u8 length,</div><div class='add'>+		const u8 *values)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *i2c = stmpe-&gt;client;</div><div class='add'>+</div><div class='add'>+	return i2c_smbus_write_i2c_block_data(i2c, reg, length, values);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct stmpe_client_info i2c_ci = {</div><div class='add'>+	.read_byte = i2c_reg_read,</div><div class='add'>+	.write_byte = i2c_reg_write,</div><div class='add'>+	.read_block = i2c_block_read,</div><div class='add'>+	.write_block = i2c_block_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit</div><div class='add'>+stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	i2c_ci.data = (void *)id;</div><div class='add'>+	i2c_ci.irq = i2c-&gt;irq;</div><div class='add'>+	i2c_ci.client = i2c;</div><div class='add'>+	i2c_ci.dev = &amp;i2c-&gt;dev;</div><div class='add'>+</div><div class='add'>+	return stmpe_probe(&amp;i2c_ci, id-&gt;driver_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit stmpe_i2c_remove(struct i2c_client *i2c)</div><div class='add'>+{</div><div class='add'>+	struct stmpe *stmpe = dev_get_drvdata(&amp;i2c-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return stmpe_remove(stmpe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id stmpe_i2c_id[] = {</div><div class='add'>+	{ "stmpe610", STMPE610 },</div><div class='add'>+	{ "stmpe801", STMPE801 },</div><div class='add'>+	{ "stmpe811", STMPE811 },</div><div class='add'>+	{ "stmpe1601", STMPE1601 },</div><div class='add'>+	{ "stmpe2401", STMPE2401 },</div><div class='add'>+	{ "stmpe2403", STMPE2403 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, stmpe_id);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver stmpe_i2c_driver = {</div><div class='add'>+	.driver.name	= "stmpe-i2c",</div><div class='add'>+	.driver.owner	= THIS_MODULE,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.driver.pm	= &amp;stmpe_dev_pm_ops,</div><div class='add'>+#endif</div><div class='add'>+	.probe		= stmpe_i2c_probe,</div><div class='add'>+	.remove		= __devexit_p(stmpe_i2c_remove),</div><div class='add'>+	.id_table	= stmpe_i2c_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init stmpe_init(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;stmpe_i2c_driver);</div><div class='add'>+}</div><div class='add'>+subsys_initcall(stmpe_init);</div><div class='add'>+</div><div class='add'>+static void __exit stmpe_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;stmpe_i2c_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(stmpe_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_DESCRIPTION("STMPE MFD I2C Interface Driver");</div><div class='add'>+MODULE_AUTHOR("Rabin Vincent &lt;rabin.vincent@stericsson.com&gt;");</div><div class='head'>diff --git a/drivers/mfd/stmpe-spi.c b/drivers/mfd/stmpe-spi.c<br/>new file mode 100644<br/>index 000000000000..b58c43c7ea93<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/stmpe-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/stmpe-spi.c</a></div><div class='hunk'>@@ -0,0 +1,150 @@</div><div class='add'>+/*</div><div class='add'>+ * ST Microelectronics MFD: stmpe's spi client specific driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) ST Microelectronics SA 2011</div><div class='add'>+ *</div><div class='add'>+ * License Terms: GNU General Public License, version 2</div><div class='add'>+ * Author: Viresh Kumar &lt;viresh.kumar@st.com&gt; for ST Microelectronics</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include "stmpe.h"</div><div class='add'>+</div><div class='add'>+#define READ_CMD	(1 &lt;&lt; 7)</div><div class='add'>+</div><div class='add'>+static int spi_reg_read(struct stmpe *stmpe, u8 reg)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = stmpe-&gt;client;</div><div class='add'>+	int status = spi_w8r16(spi, reg | READ_CMD);</div><div class='add'>+</div><div class='add'>+	return (status &lt; 0) ? status : status &gt;&gt; 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int spi_reg_write(struct stmpe *stmpe, u8 reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = stmpe-&gt;client;</div><div class='add'>+	u16 cmd = (val &lt;&lt; 8) | reg;</div><div class='add'>+</div><div class='add'>+	return spi_write(spi, (const u8 *)&amp;cmd, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int spi_block_read(struct stmpe *stmpe, u8 reg, u8 length, u8 *values)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; length; i++) {</div><div class='add'>+		ret = spi_reg_read(stmpe, reg + i);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		*(values + i) = 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 spi_block_write(struct stmpe *stmpe, u8 reg, u8 length,</div><div class='add'>+		const u8 *values)</div><div class='add'>+{</div><div class='add'>+	int ret = 0, i;</div><div class='add'>+</div><div class='add'>+	for (i = length; i &gt; 0; i--, reg++) {</div><div class='add'>+		ret = spi_reg_write(stmpe, reg, *(values + i - 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 ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void spi_init(struct stmpe *stmpe)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = stmpe-&gt;client;</div><div class='add'>+</div><div class='add'>+	spi-&gt;bits_per_word = 8;</div><div class='add'>+</div><div class='add'>+	/* This register is only present for stmpe811 */</div><div class='add'>+	if (stmpe-&gt;variant-&gt;id_val == 0x0811)</div><div class='add'>+		spi_reg_write(stmpe, STMPE811_REG_SPI_CFG, spi-&gt;mode);</div><div class='add'>+</div><div class='add'>+	if (spi_setup(spi) &lt; 0)</div><div class='add'>+		dev_dbg(&amp;spi-&gt;dev, "spi_setup failed\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct stmpe_client_info spi_ci = {</div><div class='add'>+	.read_byte = spi_reg_read,</div><div class='add'>+	.write_byte = spi_reg_write,</div><div class='add'>+	.read_block = spi_block_read,</div><div class='add'>+	.write_block = spi_block_write,</div><div class='add'>+	.init = spi_init,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit</div><div class='add'>+stmpe_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'>+</div><div class='add'>+	/* don't exceed max specified rate - 1MHz - Limitation of STMPE */</div><div class='add'>+	if (spi-&gt;max_speed_hz &gt; 1000000) {</div><div class='add'>+		dev_dbg(&amp;spi-&gt;dev, "f(sample) %d KHz?\n",</div><div class='add'>+				(spi-&gt;max_speed_hz/1000));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spi_ci.irq = spi-&gt;irq;</div><div class='add'>+	spi_ci.client = spi;</div><div class='add'>+	spi_ci.dev = &amp;spi-&gt;dev;</div><div class='add'>+</div><div class='add'>+	return stmpe_probe(&amp;spi_ci, id-&gt;driver_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit stmpe_spi_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct stmpe *stmpe = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return stmpe_remove(stmpe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct spi_device_id stmpe_spi_id[] = {</div><div class='add'>+	{ "stmpe610", STMPE610 },</div><div class='add'>+	{ "stmpe801", STMPE801 },</div><div class='add'>+	{ "stmpe811", STMPE811 },</div><div class='add'>+	{ "stmpe1601", STMPE1601 },</div><div class='add'>+	{ "stmpe2401", STMPE2401 },</div><div class='add'>+	{ "stmpe2403", STMPE2403 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(spi, stmpe_id);</div><div class='add'>+</div><div class='add'>+static struct spi_driver stmpe_spi_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "stmpe-spi",</div><div class='add'>+		.bus	= &amp;spi_bus_type,</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+		.pm	= &amp;stmpe_dev_pm_ops,</div><div class='add'>+#endif</div><div class='add'>+	},</div><div class='add'>+	.probe		= stmpe_spi_probe,</div><div class='add'>+	.remove		= __devexit_p(stmpe_spi_remove),</div><div class='add'>+	.id_table	= stmpe_spi_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init stmpe_init(void)</div><div class='add'>+{</div><div class='add'>+	return spi_register_driver(&amp;stmpe_spi_driver);</div><div class='add'>+}</div><div class='add'>+subsys_initcall(stmpe_init);</div><div class='add'>+</div><div class='add'>+static void __exit stmpe_exit(void)</div><div class='add'>+{</div><div class='add'>+	spi_unregister_driver(&amp;stmpe_spi_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(stmpe_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_DESCRIPTION("STMPE MFD SPI Interface Driver");</div><div class='add'>+MODULE_AUTHOR("Viresh Kumar &lt;viresh.kumar@st.com&gt;");</div><div class='head'>diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c<br/>index 2963689cf45c..e07947e56b2a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/stmpe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/stmpe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/stmpe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/stmpe.c</a></div><div class='hunk'>@@ -1,18 +1,20 @@</div><div class='ctx'> /*</div><div class='add'>+ * ST Microelectronics MFD: stmpe's driver</div><div class='add'>+ *</div><div class='ctx'>  * Copyright (C) ST-Ericsson SA 2010</div><div class='ctx'>  *</div><div class='ctx'>  * License Terms: GNU General Public License, version 2</div><div class='ctx'>  * Author: Rabin Vincent &lt;rabin.vincent@stericsson.com&gt; for ST-Ericsson</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.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='add'>+#include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/core.h&gt;</div><div class='del'>-#include &lt;linux/mfd/stmpe.h&gt;</div><div class='ctx'> #include "stmpe.h"</div><div class='ctx'> </div><div class='ctx'> static int __stmpe_enable(struct stmpe *stmpe, unsigned int blocks)</div><div class='hunk'>@@ -29,10 +31,9 @@ static int __stmpe_reg_read(struct stmpe *stmpe, u8 reg)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = i2c_smbus_read_byte_data(stmpe-&gt;i2c, reg);</div><div class='add'>+	ret = stmpe-&gt;ci-&gt;read_byte(stmpe, reg);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		dev_err(stmpe-&gt;dev, "failed to read reg %#x: %d\n",</div><div class='del'>-			reg, ret);</div><div class='add'>+		dev_err(stmpe-&gt;dev, "failed to read reg %#x: %d\n", reg, ret);</div><div class='ctx'> </div><div class='ctx'> 	dev_vdbg(stmpe-&gt;dev, "rd: reg %#x =&gt; data %#x\n", reg, ret);</div><div class='ctx'> </div><div class='hunk'>@@ -45,10 +46,9 @@ static int __stmpe_reg_write(struct stmpe *stmpe, u8 reg, u8 val)</div><div class='ctx'> </div><div class='ctx'> 	dev_vdbg(stmpe-&gt;dev, "wr: reg %#x &lt;= %#x\n", reg, val);</div><div class='ctx'> </div><div class='del'>-	ret = i2c_smbus_write_byte_data(stmpe-&gt;i2c, reg, val);</div><div class='add'>+	ret = stmpe-&gt;ci-&gt;write_byte(stmpe, reg, val);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		dev_err(stmpe-&gt;dev, "failed to write reg %#x: %d\n",</div><div class='del'>-			reg, ret);</div><div class='add'>+		dev_err(stmpe-&gt;dev, "failed to write reg %#x: %d\n", reg, ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -72,10 +72,9 @@ static int __stmpe_block_read(struct stmpe *stmpe, u8 reg, u8 length,</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = i2c_smbus_read_i2c_block_data(stmpe-&gt;i2c, reg, length, values);</div><div class='add'>+	ret = stmpe-&gt;ci-&gt;read_block(stmpe, reg, length, values);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		dev_err(stmpe-&gt;dev, "failed to read regs %#x: %d\n",</div><div class='del'>-			reg, ret);</div><div class='add'>+		dev_err(stmpe-&gt;dev, "failed to read regs %#x: %d\n", reg, ret);</div><div class='ctx'> </div><div class='ctx'> 	dev_vdbg(stmpe-&gt;dev, "rd: reg %#x (%d) =&gt; ret %#x\n", reg, length, ret);</div><div class='ctx'> 	stmpe_dump_bytes("stmpe rd: ", values, length);</div><div class='hunk'>@@ -91,11 +90,9 @@ static int __stmpe_block_write(struct stmpe *stmpe, u8 reg, u8 length,</div><div class='ctx'> 	dev_vdbg(stmpe-&gt;dev, "wr: regs %#x (%d)\n", reg, length);</div><div class='ctx'> 	stmpe_dump_bytes("stmpe wr: ", values, length);</div><div class='ctx'> </div><div class='del'>-	ret = i2c_smbus_write_i2c_block_data(stmpe-&gt;i2c, reg, length,</div><div class='del'>-					     values);</div><div class='add'>+	ret = stmpe-&gt;ci-&gt;write_block(stmpe, reg, length, values);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		dev_err(stmpe-&gt;dev, "failed to write regs %#x: %d\n",</div><div class='del'>-			reg, ret);</div><div class='add'>+		dev_err(stmpe-&gt;dev, "failed to write regs %#x: %d\n", reg, ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -245,12 +242,14 @@ int stmpe_set_altfunc(struct stmpe *stmpe, u32 pins, enum stmpe_block block)</div><div class='ctx'> 	u8 regaddr = stmpe-&gt;regs[STMPE_IDX_GPAFR_U_MSB];</div><div class='ctx'> 	int af_bits = variant-&gt;af_bits;</div><div class='ctx'> 	int numregs = DIV_ROUND_UP(stmpe-&gt;num_gpios * af_bits, 8);</div><div class='del'>-	int afperreg = 8 / af_bits;</div><div class='ctx'> 	int mask = (1 &lt;&lt; af_bits) - 1;</div><div class='ctx'> 	u8 regs[numregs];</div><div class='del'>-	int af;</div><div class='del'>-	int ret;</div><div class='add'>+	int af, afperreg, ret;</div><div class='add'>+</div><div class='add'>+	if (!variant-&gt;get_altfunc)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='add'>+	afperreg = 8 / af_bits;</div><div class='ctx'> 	mutex_lock(&amp;stmpe-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	ret = __stmpe_enable(stmpe, STMPE_BLOCK_GPIO);</div><div class='hunk'>@@ -325,7 +324,51 @@ static struct mfd_cell stmpe_keypad_cell = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Touchscreen (STMPE811)</div><div class='add'>+ * STMPE801</div><div class='add'>+ */</div><div class='add'>+static const u8 stmpe801_regs[] = {</div><div class='add'>+	[STMPE_IDX_CHIP_ID]	= STMPE801_REG_CHIP_ID,</div><div class='add'>+	[STMPE_IDX_ICR_LSB]	= STMPE801_REG_SYS_CTRL,</div><div class='add'>+	[STMPE_IDX_GPMR_LSB]	= STMPE801_REG_GPIO_MP_STA,</div><div class='add'>+	[STMPE_IDX_GPSR_LSB]	= STMPE801_REG_GPIO_SET_PIN,</div><div class='add'>+	[STMPE_IDX_GPCR_LSB]	= STMPE801_REG_GPIO_SET_PIN,</div><div class='add'>+	[STMPE_IDX_GPDR_LSB]	= STMPE801_REG_GPIO_DIR,</div><div class='add'>+	[STMPE_IDX_IEGPIOR_LSB] = STMPE801_REG_GPIO_INT_EN,</div><div class='add'>+	[STMPE_IDX_ISGPIOR_MSB] = STMPE801_REG_GPIO_INT_STA,</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct stmpe_variant_block stmpe801_blocks[] = {</div><div class='add'>+	{</div><div class='add'>+		.cell	= &amp;stmpe_gpio_cell,</div><div class='add'>+		.irq	= 0,</div><div class='add'>+		.block	= STMPE_BLOCK_GPIO,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stmpe801_enable(struct stmpe *stmpe, unsigned int blocks,</div><div class='add'>+			   bool enable)</div><div class='add'>+{</div><div class='add'>+	if (blocks &amp; STMPE_BLOCK_GPIO)</div><div class='add'>+		return 0;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct stmpe_variant_info stmpe801 = {</div><div class='add'>+	.name		= "stmpe801",</div><div class='add'>+	.id_val		= STMPE801_ID,</div><div class='add'>+	.id_mask	= 0xffff,</div><div class='add'>+	.num_gpios	= 8,</div><div class='add'>+	.regs		= stmpe801_regs,</div><div class='add'>+	.blocks		= stmpe801_blocks,</div><div class='add'>+	.num_blocks	= ARRAY_SIZE(stmpe801_blocks),</div><div class='add'>+	.num_irqs	= STMPE801_NR_INTERNAL_IRQS,</div><div class='add'>+	.enable		= stmpe801_enable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Touchscreen (STMPE811 or STMPE610)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static struct resource stmpe_ts_resources[] = {</div><div class='hunk'>@@ -350,7 +393,7 @@ static struct mfd_cell stmpe_ts_cell = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * STMPE811</div><div class='add'>+ * STMPE811 or STMPE610</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static const u8 stmpe811_regs[] = {</div><div class='hunk'>@@ -421,6 +464,21 @@ static struct stmpe_variant_info stmpe811 = {</div><div class='ctx'> 	.get_altfunc	= stmpe811_get_altfunc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Similar to 811, except number of gpios */</div><div class='add'>+static struct stmpe_variant_info stmpe610 = {</div><div class='add'>+	.name		= "stmpe610",</div><div class='add'>+	.id_val		= 0x0811,</div><div class='add'>+	.id_mask	= 0xffff,</div><div class='add'>+	.num_gpios	= 6,</div><div class='add'>+	.af_bits	= 1,</div><div class='add'>+	.regs		= stmpe811_regs,</div><div class='add'>+	.blocks		= stmpe811_blocks,</div><div class='add'>+	.num_blocks	= ARRAY_SIZE(stmpe811_blocks),</div><div class='add'>+	.num_irqs	= STMPE811_NR_INTERNAL_IRQS,</div><div class='add'>+	.enable		= stmpe811_enable,</div><div class='add'>+	.get_altfunc	= stmpe811_get_altfunc,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * STMPE1601</div><div class='ctx'>  */</div><div class='hunk'>@@ -655,6 +713,8 @@ static struct stmpe_variant_info stmpe2403 = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct stmpe_variant_info *stmpe_variant_info[] = {</div><div class='add'>+	[STMPE610]	= &amp;stmpe610,</div><div class='add'>+	[STMPE801]	= &amp;stmpe801,</div><div class='ctx'> 	[STMPE811]	= &amp;stmpe811,</div><div class='ctx'> 	[STMPE1601]	= &amp;stmpe1601,</div><div class='ctx'> 	[STMPE2401]	= &amp;stmpe2401,</div><div class='hunk'>@@ -671,6 +731,11 @@ static irqreturn_t stmpe_irq(int irq, void *data)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (variant-&gt;id_val == STMPE801_ID) {</div><div class='add'>+		handle_nested_irq(stmpe-&gt;irq_base);</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = stmpe_block_read(stmpe, israddr, num, isr);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='hunk'>@@ -757,14 +822,17 @@ static struct irq_chip stmpe_irq_chip = {</div><div class='ctx'> </div><div class='ctx'> static int __devinit stmpe_irq_init(struct stmpe *stmpe)</div><div class='ctx'> {</div><div class='add'>+	struct irq_chip *chip = NULL;</div><div class='ctx'> 	int num_irqs = stmpe-&gt;variant-&gt;num_irqs;</div><div class='ctx'> 	int base = stmpe-&gt;irq_base;</div><div class='ctx'> 	int irq;</div><div class='ctx'> </div><div class='add'>+	if (stmpe-&gt;variant-&gt;id_val != STMPE801_ID)</div><div class='add'>+		chip = &amp;stmpe_irq_chip;</div><div class='add'>+</div><div class='ctx'> 	for (irq = base; irq &lt; base + num_irqs; irq++) {</div><div class='ctx'> 		irq_set_chip_data(irq, stmpe);</div><div class='del'>-		irq_set_chip_and_handler(irq, &amp;stmpe_irq_chip,</div><div class='del'>-					 handle_edge_irq);</div><div class='add'>+		irq_set_chip_and_handler(irq, chip, handle_edge_irq);</div><div class='ctx'> 		irq_set_nested_thread(irq, 1);</div><div class='ctx'> #ifdef CONFIG_ARM</div><div class='ctx'> 		set_irq_flags(irq, IRQF_VALID);</div><div class='hunk'>@@ -796,7 +864,7 @@ static int __devinit stmpe_chip_init(struct stmpe *stmpe)</div><div class='ctx'> 	unsigned int irq_trigger = stmpe-&gt;pdata-&gt;irq_trigger;</div><div class='ctx'> 	int autosleep_timeout = stmpe-&gt;pdata-&gt;autosleep_timeout;</div><div class='ctx'> 	struct stmpe_variant_info *variant = stmpe-&gt;variant;</div><div class='del'>-	u8 icr = STMPE_ICR_LSB_GIM;</div><div class='add'>+	u8 icr;</div><div class='ctx'> 	unsigned int id;</div><div class='ctx'> 	u8 data[2];</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -819,16 +887,32 @@ static int __devinit stmpe_chip_init(struct stmpe *stmpe)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (irq_trigger == IRQF_TRIGGER_FALLING ||</div><div class='del'>-	    irq_trigger == IRQF_TRIGGER_RISING)</div><div class='del'>-		icr |= STMPE_ICR_LSB_EDGE;</div><div class='add'>+	if (id == STMPE801_ID)</div><div class='add'>+		icr = STMPE801_REG_SYS_CTRL_INT_EN;</div><div class='add'>+	else</div><div class='add'>+		icr = STMPE_ICR_LSB_GIM;</div><div class='add'>+</div><div class='add'>+	/* STMPE801 doesn't support Edge interrupts */</div><div class='add'>+	if (id != STMPE801_ID) {</div><div class='add'>+		if (irq_trigger == IRQF_TRIGGER_FALLING ||</div><div class='add'>+				irq_trigger == IRQF_TRIGGER_RISING)</div><div class='add'>+			icr |= STMPE_ICR_LSB_EDGE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (irq_trigger == IRQF_TRIGGER_RISING ||</div><div class='del'>-	    irq_trigger == IRQF_TRIGGER_HIGH)</div><div class='del'>-		icr |= STMPE_ICR_LSB_HIGH;</div><div class='add'>+			irq_trigger == IRQF_TRIGGER_HIGH) {</div><div class='add'>+		if (id == STMPE801_ID)</div><div class='add'>+			icr |= STMPE801_REG_SYS_CTRL_INT_HI;</div><div class='add'>+		else</div><div class='add'>+			icr |= STMPE_ICR_LSB_HIGH;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (stmpe-&gt;pdata-&gt;irq_invert_polarity)</div><div class='del'>-		icr ^= STMPE_ICR_LSB_HIGH;</div><div class='add'>+	if (stmpe-&gt;pdata-&gt;irq_invert_polarity) {</div><div class='add'>+		if (id == STMPE801_ID)</div><div class='add'>+			icr ^= STMPE801_REG_SYS_CTRL_INT_HI;</div><div class='add'>+		else</div><div class='add'>+			icr ^= STMPE_ICR_LSB_HIGH;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (stmpe-&gt;pdata-&gt;autosleep) {</div><div class='ctx'> 		ret = stmpe_autosleep(stmpe, autosleep_timeout);</div><div class='hunk'>@@ -873,32 +957,10 @@ static int __devinit stmpe_devices_init(struct stmpe *stmpe)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int stmpe_suspend(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct i2c_client *i2c = to_i2c_client(dev);</div><div class='del'>-</div><div class='del'>-	if (device_may_wakeup(&amp;i2c-&gt;dev))</div><div class='del'>-		enable_irq_wake(i2c-&gt;irq);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stmpe_resume(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct i2c_client *i2c = to_i2c_client(dev);</div><div class='del'>-</div><div class='del'>-	if (device_may_wakeup(&amp;i2c-&gt;dev))</div><div class='del'>-		disable_irq_wake(i2c-&gt;irq);</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 int __devinit stmpe_probe(struct i2c_client *i2c,</div><div class='del'>-				 const struct i2c_device_id *id)</div><div class='add'>+/* Called from client specific probe routines */</div><div class='add'>+int __devinit stmpe_probe(struct stmpe_client_info *ci, int partnum)</div><div class='ctx'> {</div><div class='del'>-	struct stmpe_platform_data *pdata = i2c-&gt;dev.platform_data;</div><div class='add'>+	struct stmpe_platform_data *pdata = dev_get_platdata(ci-&gt;dev);</div><div class='ctx'> 	struct stmpe *stmpe;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -912,30 +974,43 @@ static int __devinit stmpe_probe(struct i2c_client *i2c,</div><div class='ctx'> 	mutex_init(&amp;stmpe-&gt;irq_lock);</div><div class='ctx'> 	mutex_init(&amp;stmpe-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	stmpe-&gt;dev = &amp;i2c-&gt;dev;</div><div class='del'>-	stmpe-&gt;i2c = i2c;</div><div class='del'>-</div><div class='add'>+	stmpe-&gt;dev = ci-&gt;dev;</div><div class='add'>+	stmpe-&gt;client = ci-&gt;client;</div><div class='ctx'> 	stmpe-&gt;pdata = pdata;</div><div class='ctx'> 	stmpe-&gt;irq_base = pdata-&gt;irq_base;</div><div class='del'>-</div><div class='del'>-	stmpe-&gt;partnum = id-&gt;driver_data;</div><div class='del'>-	stmpe-&gt;variant = stmpe_variant_info[stmpe-&gt;partnum];</div><div class='add'>+	stmpe-&gt;ci = ci;</div><div class='add'>+	stmpe-&gt;partnum = partnum;</div><div class='add'>+	stmpe-&gt;variant = stmpe_variant_info[partnum];</div><div class='ctx'> 	stmpe-&gt;regs = stmpe-&gt;variant-&gt;regs;</div><div class='ctx'> 	stmpe-&gt;num_gpios = stmpe-&gt;variant-&gt;num_gpios;</div><div class='add'>+	dev_set_drvdata(stmpe-&gt;dev, stmpe);</div><div class='ctx'> </div><div class='del'>-	i2c_set_clientdata(i2c, stmpe);</div><div class='add'>+	if (ci-&gt;init)</div><div class='add'>+		ci-&gt;init(stmpe);</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;irq_over_gpio) {</div><div class='add'>+		ret = gpio_request_one(pdata-&gt;irq_gpio, GPIOF_DIR_IN, "stmpe");</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(stmpe-&gt;dev, "failed to request IRQ GPIO: %d\n",</div><div class='add'>+					ret);</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stmpe-&gt;irq = gpio_to_irq(pdata-&gt;irq_gpio);</div><div class='add'>+	} else {</div><div class='add'>+		stmpe-&gt;irq = ci-&gt;irq;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = stmpe_chip_init(stmpe);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_free;</div><div class='add'>+		goto free_gpio;</div><div class='ctx'> </div><div class='ctx'> 	ret = stmpe_irq_init(stmpe);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_free;</div><div class='add'>+		goto free_gpio;</div><div class='ctx'> </div><div class='del'>-	ret = request_threaded_irq(stmpe-&gt;i2c-&gt;irq, NULL, stmpe_irq,</div><div class='del'>-				   pdata-&gt;irq_trigger | IRQF_ONESHOT,</div><div class='del'>-				   "stmpe", stmpe);</div><div class='add'>+	ret = request_threaded_irq(stmpe-&gt;irq, NULL, stmpe_irq,</div><div class='add'>+			pdata-&gt;irq_trigger | IRQF_ONESHOT, "stmpe", stmpe);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(stmpe-&gt;dev, "failed to request IRQ: %d\n", ret);</div><div class='ctx'> 		goto out_removeirq;</div><div class='hunk'>@@ -951,67 +1026,55 @@ static int __devinit stmpe_probe(struct i2c_client *i2c,</div><div class='ctx'> </div><div class='ctx'> out_removedevs:</div><div class='ctx'> 	mfd_remove_devices(stmpe-&gt;dev);</div><div class='del'>-	free_irq(stmpe-&gt;i2c-&gt;irq, stmpe);</div><div class='add'>+	free_irq(stmpe-&gt;irq, stmpe);</div><div class='ctx'> out_removeirq:</div><div class='ctx'> 	stmpe_irq_remove(stmpe);</div><div class='add'>+free_gpio:</div><div class='add'>+	if (pdata-&gt;irq_over_gpio)</div><div class='add'>+		gpio_free(pdata-&gt;irq_gpio);</div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(stmpe);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit stmpe_remove(struct i2c_client *client)</div><div class='add'>+int stmpe_remove(struct stmpe *stmpe)</div><div class='ctx'> {</div><div class='del'>-	struct stmpe *stmpe = i2c_get_clientdata(client);</div><div class='del'>-</div><div class='ctx'> 	mfd_remove_devices(stmpe-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	free_irq(stmpe-&gt;i2c-&gt;irq, stmpe);</div><div class='add'>+	free_irq(stmpe-&gt;irq, stmpe);</div><div class='ctx'> 	stmpe_irq_remove(stmpe);</div><div class='ctx'> </div><div class='add'>+	if (stmpe-&gt;pdata-&gt;irq_over_gpio)</div><div class='add'>+		gpio_free(stmpe-&gt;pdata-&gt;irq_gpio);</div><div class='add'>+</div><div class='ctx'> 	kfree(stmpe);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct i2c_device_id stmpe_id[] = {</div><div class='del'>-	{ "stmpe811", STMPE811 },</div><div class='del'>-	{ "stmpe1601", STMPE1601 },</div><div class='del'>-	{ "stmpe2401", STMPE2401 },</div><div class='del'>-	{ "stmpe2403", STMPE2403 },</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(i2c, stmpe_id);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='del'>-static const struct dev_pm_ops stmpe_dev_pm_ops = {</div><div class='del'>-	.suspend	= stmpe_suspend,</div><div class='del'>-	.resume		= stmpe_resume,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='add'>+static int stmpe_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct stmpe *stmpe = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver stmpe_driver = {</div><div class='del'>-	.driver.name	= "stmpe",</div><div class='del'>-	.driver.owner	= THIS_MODULE,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.driver.pm	= &amp;stmpe_dev_pm_ops,</div><div class='del'>-#endif</div><div class='del'>-	.probe		= stmpe_probe,</div><div class='del'>-	.remove		= __devexit_p(stmpe_remove),</div><div class='del'>-	.id_table	= stmpe_id,</div><div class='del'>-};</div><div class='add'>+	if (device_may_wakeup(dev))</div><div class='add'>+		enable_irq_wake(stmpe-&gt;irq);</div><div class='ctx'> </div><div class='del'>-static int __init stmpe_init(void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;stmpe_driver);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-subsys_initcall(stmpe_init);</div><div class='ctx'> </div><div class='del'>-static void __exit stmpe_exit(void)</div><div class='add'>+static int stmpe_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	i2c_del_driver(&amp;stmpe_driver);</div><div class='add'>+	struct stmpe *stmpe = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (device_may_wakeup(dev))</div><div class='add'>+		disable_irq_wake(stmpe-&gt;irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-module_exit(stmpe_exit);</div><div class='ctx'> </div><div class='del'>-MODULE_LICENSE("GPL v2");</div><div class='del'>-MODULE_DESCRIPTION("STMPE MFD core driver");</div><div class='del'>-MODULE_AUTHOR("Rabin Vincent &lt;rabin.vincent@stericsson.com&gt;");</div><div class='add'>+const struct dev_pm_ops stmpe_dev_pm_ops = {</div><div class='add'>+	.suspend	= stmpe_suspend,</div><div class='add'>+	.resume		= stmpe_resume,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/mfd/stmpe.h b/drivers/mfd/stmpe.h<br/>index e4ee38956583..7b8e13f5b764 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/stmpe.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/stmpe.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/stmpe.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/stmpe.h</a></div><div class='hunk'>@@ -8,6 +8,14 @@</div><div class='ctx'> #ifndef __STMPE_H</div><div class='ctx'> #define __STMPE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/mfd/core.h&gt;</div><div class='add'>+#include &lt;linux/mfd/stmpe.h&gt;</div><div class='add'>+#include &lt;linux/printk.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+extern const struct dev_pm_ops stmpe_dev_pm_ops;</div><div class='add'>+</div><div class='ctx'> #ifdef STMPE_DUMP_BYTES</div><div class='ctx'> static inline void stmpe_dump_bytes(const char *str, const void *buf,</div><div class='ctx'> 				    size_t len)</div><div class='hunk'>@@ -67,11 +75,55 @@ struct stmpe_variant_info {</div><div class='ctx'> 	int (*enable_autosleep)(struct stmpe *stmpe, int autosleep_timeout);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct stmpe_client_info - i2c or spi specific routines/info</div><div class='add'>+ * @data: client specific data</div><div class='add'>+ * @read_byte: read single byte</div><div class='add'>+ * @write_byte: write single byte</div><div class='add'>+ * @read_block: read block or multiple bytes</div><div class='add'>+ * @write_block: write block or multiple bytes</div><div class='add'>+ * @init: client init routine, called during probe</div><div class='add'>+ */</div><div class='add'>+struct stmpe_client_info {</div><div class='add'>+	void *data;</div><div class='add'>+	int irq;</div><div class='add'>+	void *client;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	int (*read_byte)(struct stmpe *stmpe, u8 reg);</div><div class='add'>+	int (*write_byte)(struct stmpe *stmpe, u8 reg, u8 val);</div><div class='add'>+	int (*read_block)(struct stmpe *stmpe, u8 reg, u8 len, u8 *values);</div><div class='add'>+	int (*write_block)(struct stmpe *stmpe, u8 reg, u8 len,</div><div class='add'>+			const u8 *values);</div><div class='add'>+	void (*init)(struct stmpe *stmpe);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int stmpe_probe(struct stmpe_client_info *ci, int partnum);</div><div class='add'>+int stmpe_remove(struct stmpe *stmpe);</div><div class='add'>+</div><div class='ctx'> #define STMPE_ICR_LSB_HIGH	(1 &lt;&lt; 2)</div><div class='ctx'> #define STMPE_ICR_LSB_EDGE	(1 &lt;&lt; 1)</div><div class='ctx'> #define STMPE_ICR_LSB_GIM	(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * STMPE801</div><div class='add'>+ */</div><div class='add'>+#define STMPE801_ID			0x0108</div><div class='add'>+#define STMPE801_NR_INTERNAL_IRQS	1</div><div class='add'>+</div><div class='add'>+#define STMPE801_REG_CHIP_ID		0x00</div><div class='add'>+#define STMPE801_REG_VERSION_ID		0x02</div><div class='add'>+#define STMPE801_REG_SYS_CTRL		0x04</div><div class='add'>+#define STMPE801_REG_GPIO_INT_EN	0x08</div><div class='add'>+#define STMPE801_REG_GPIO_INT_STA	0x09</div><div class='add'>+#define STMPE801_REG_GPIO_MP_STA	0x10</div><div class='add'>+#define STMPE801_REG_GPIO_SET_PIN	0x11</div><div class='add'>+#define STMPE801_REG_GPIO_DIR		0x12</div><div class='add'>+</div><div class='add'>+#define STMPE801_REG_SYS_CTRL_RESET	(1 &lt;&lt; 7)</div><div class='add'>+#define STMPE801_REG_SYS_CTRL_INT_EN	(1 &lt;&lt; 2)</div><div class='add'>+#define STMPE801_REG_SYS_CTRL_INT_HI	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * STMPE811</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -87,6 +139,7 @@ struct stmpe_variant_info {</div><div class='ctx'> </div><div class='ctx'> #define STMPE811_REG_CHIP_ID		0x00</div><div class='ctx'> #define STMPE811_REG_SYS_CTRL2		0x04</div><div class='add'>+#define STMPE811_REG_SPI_CFG		0x08</div><div class='ctx'> #define STMPE811_REG_INT_CTRL		0x09</div><div class='ctx'> #define STMPE811_REG_INT_EN		0x0A</div><div class='ctx'> #define STMPE811_REG_INT_STA		0x0B</div><div class='head'>diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c<br/>index 91ad21ef7721..2d9e8799e733 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/t7l66xb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/t7l66xb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/t7l66xb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/t7l66xb.c</a></div><div class='hunk'>@@ -442,21 +442,7 @@ static struct platform_driver t7l66xb_platform_driver = {</div><div class='ctx'> </div><div class='ctx'> /*--------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-static int __init t7l66xb_init(void)</div><div class='del'>-{</div><div class='del'>-	int retval = 0;</div><div class='del'>-</div><div class='del'>-	retval = platform_driver_register(&amp;t7l66xb_platform_driver);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit t7l66xb_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;t7l66xb_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(t7l66xb_init);</div><div class='del'>-module_exit(t7l66xb_exit);</div><div class='add'>+module_platform_driver(t7l66xb_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Toshiba T7L66XB core driver");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c<br/>index 71bc835324d8..d20a284ad4ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/tc6387xb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/tc6387xb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/tc6387xb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/tc6387xb.c</a></div><div class='hunk'>@@ -234,19 +234,7 @@ static struct platform_driver tc6387xb_platform_driver = {</div><div class='ctx'> 	.resume         = tc6387xb_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init tc6387xb_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;tc6387xb_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit tc6387xb_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;tc6387xb_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(tc6387xb_init);</div><div class='del'>-module_exit(tc6387xb_exit);</div><div class='add'>+module_platform_driver(tc6387xb_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Toshiba TC6387XB core driver");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/mfd/ti-ssp.c b/drivers/mfd/ti-ssp.c<br/>index af9ab0e5ca64..4fb0e6c8e8fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/ti-ssp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ti-ssp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/ti-ssp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/ti-ssp.c</a></div><div class='hunk'>@@ -458,17 +458,7 @@ static struct platform_driver ti_ssp_driver = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ti_ssp_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ti_ssp_driver);</div><div class='del'>-}</div><div class='del'>-module_init(ti_ssp_init);</div><div class='del'>-</div><div class='del'>-static void __exit ti_ssp_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ti_ssp_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(ti_ssp_exit);</div><div class='add'>+module_platform_driver(ti_ssp_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Sequencer Serial Port (SSP) Driver");</div><div class='ctx'> MODULE_AUTHOR("Cyril Chemparathy");</div><div class='head'>diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c<br/>index 02d65692ceb4..0ba26fb12cf5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/timberdale.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/timberdale.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/timberdale.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/timberdale.c</a></div><div class='hunk'>@@ -857,7 +857,7 @@ static void __devexit timb_remove(struct pci_dev *dev)</div><div class='ctx'> 	kfree(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id timberdale_pci_tbl[] = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(timberdale_pci_tbl) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_TIMB, PCI_DEVICE_ID_TIMB) },</div><div class='ctx'> 	{ 0 }</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/mfd/tps65910-irq.c b/drivers/mfd/tps65910-irq.c<br/>index a56be931551c..95c0d7978bec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/tps65910-irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/tps65910-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/tps65910-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/tps65910-irq.c</a></div><div class='hunk'>@@ -215,6 +215,7 @@ int tps65910_irq_init(struct tps65910 *tps65910, int irq,</div><div class='ctx'> </div><div class='ctx'> int tps65910_irq_exit(struct tps65910 *tps65910)</div><div class='ctx'> {</div><div class='del'>-	free_irq(tps65910-&gt;chip_irq, tps65910);</div><div class='add'>+	if (tps65910-&gt;chip_irq)</div><div class='add'>+		free_irq(tps65910-&gt;chip_irq, tps65910);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c<br/>index c1da84bc1573..01cf5012a08f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/tps65910.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/tps65910.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/tps65910.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/tps65910.c</a></div><div class='hunk'>@@ -172,15 +172,12 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,</div><div class='ctx'> </div><div class='ctx'> 	tps65910_gpio_init(tps65910, pmic_plat_data-&gt;gpio_base);</div><div class='ctx'> </div><div class='del'>-	ret = tps65910_irq_init(tps65910, init_data-&gt;irq, init_data);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='add'>+	tps65910_irq_init(tps65910, init_data-&gt;irq, init_data);</div><div class='ctx'> </div><div class='ctx'> 	kfree(init_data);</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mfd_remove_devices(tps65910-&gt;dev);</div><div class='ctx'> 	kfree(tps65910);</div><div class='ctx'> 	kfree(init_data);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -190,8 +187,8 @@ static int tps65910_i2c_remove(struct i2c_client *i2c)</div><div class='ctx'> {</div><div class='ctx'> 	struct tps65910 *tps65910 = i2c_get_clientdata(i2c);</div><div class='ctx'> </div><div class='del'>-	mfd_remove_devices(tps65910-&gt;dev);</div><div class='ctx'> 	tps65910_irq_exit(tps65910);</div><div class='add'>+	mfd_remove_devices(tps65910-&gt;dev);</div><div class='ctx'> 	kfree(tps65910);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/mfd/tps65912-spi.c b/drivers/mfd/tps65912-spi.c<br/>index 6d71e0d25744..27d3302d56b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/tps65912-spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/tps65912-spi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/tps65912-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/tps65912-spi.c</a></div><div class='hunk'>@@ -111,7 +111,6 @@ static int __devexit tps65912_spi_remove(struct spi_device *spi)</div><div class='ctx'> static struct spi_driver tps65912_spi_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "tps65912",</div><div class='del'>-		.bus = &amp;spi_bus_type,</div><div class='ctx'> 		.owner = THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe	= tps65912_spi_probe,</div><div class='head'>diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c<br/>index 61e70cfaa774..e04e04ddc15e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/twl-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/twl-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/twl-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/twl-core.c</a></div><div class='hunk'>@@ -34,6 +34,11 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/irqdomain.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/regulator/machine.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -144,6 +149,9 @@</div><div class='ctx'> </div><div class='ctx'> #define TWL_MODULE_LAST TWL4030_MODULE_LAST</div><div class='ctx'> </div><div class='add'>+#define TWL4030_NR_IRQS    8</div><div class='add'>+#define TWL6030_NR_IRQS    20</div><div class='add'>+</div><div class='ctx'> /* Base Address defns for twl4030_map[] */</div><div class='ctx'> </div><div class='ctx'> /* subchip/slave 0 - USB ID */</div><div class='hunk'>@@ -255,6 +263,7 @@ struct twl_client {</div><div class='ctx'> </div><div class='ctx'> static struct twl_client twl_modules[TWL_NUM_SLAVES];</div><div class='ctx'> </div><div class='add'>+static struct irq_domain domain;</div><div class='ctx'> </div><div class='ctx'> /* mapping the module id to slave id and base address */</div><div class='ctx'> struct twl_mapping {</div><div class='hunk'>@@ -1183,14 +1192,48 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)</div><div class='ctx'> 	int				status;</div><div class='ctx'> 	unsigned			i;</div><div class='ctx'> 	struct twl4030_platform_data	*pdata = client-&gt;dev.platform_data;</div><div class='add'>+	struct device_node		*node = client-&gt;dev.of_node;</div><div class='ctx'> 	u8 temp;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	int nr_irqs = TWL4030_NR_IRQS;</div><div class='add'>+</div><div class='add'>+	if ((id-&gt;driver_data) &amp; TWL6030_CLASS)</div><div class='add'>+		nr_irqs = TWL6030_NR_IRQS;</div><div class='add'>+</div><div class='add'>+	if (node &amp;&amp; !pdata) {</div><div class='add'>+		/*</div><div class='add'>+		 * XXX: Temporary pdata until the information is correctly</div><div class='add'>+		 * retrieved by every TWL modules from DT.</div><div class='add'>+		 */</div><div class='add'>+		pdata = devm_kzalloc(&amp;client-&gt;dev,</div><div class='add'>+				     sizeof(struct twl4030_platform_data),</div><div class='add'>+				     GFP_KERNEL);</div><div class='add'>+		if (!pdata)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!pdata) {</div><div class='ctx'> 		dev_dbg(&amp;client-&gt;dev, "no platform data?\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	status = irq_alloc_descs(-1, pdata-&gt;irq_base, nr_irqs, 0);</div><div class='add'>+	if (IS_ERR_VALUE(status)) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Fail to allocate IRQ descs\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdata-&gt;irq_base = status;</div><div class='add'>+	pdata-&gt;irq_end = pdata-&gt;irq_base + nr_irqs;</div><div class='add'>+</div><div class='add'>+	domain.irq_base = pdata-&gt;irq_base;</div><div class='add'>+	domain.nr_irq = nr_irqs;</div><div class='add'>+#ifdef CONFIG_OF_IRQ</div><div class='add'>+	domain.of_node = of_node_get(node);</div><div class='add'>+	domain.ops = &amp;irq_domain_simple_ops;</div><div class='add'>+#endif</div><div class='add'>+	irq_domain_add(&amp;domain);</div><div class='add'>+</div><div class='ctx'> 	if (i2c_check_functionality(client-&gt;adapter, I2C_FUNC_I2C) == 0) {</div><div class='ctx'> 		dev_dbg(&amp;client-&gt;dev, "can't talk I2C?\n");</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -1270,7 +1313,13 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)</div><div class='ctx'> 		twl_i2c_write_u8(TWL4030_MODULE_INTBR, temp, REG_GPPUPDCTR1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = add_children(pdata, id-&gt;driver_data);</div><div class='add'>+#ifdef CONFIG_OF_DEVICE</div><div class='add'>+	if (node)</div><div class='add'>+		status = of_platform_populate(node, NULL, NULL, &amp;client-&gt;dev);</div><div class='add'>+	else</div><div class='add'>+#endif</div><div class='add'>+		status = add_children(pdata, id-&gt;driver_data);</div><div class='add'>+</div><div class='ctx'> fail:</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		twl_remove(client);</div><div class='head'>diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c<br/>index ae51ab5d0e5d..838ce4eb444e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/twl4030-audio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/twl4030-audio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/twl4030-audio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/twl4030-audio.c</a></div><div class='hunk'>@@ -261,17 +261,7 @@ static struct platform_driver twl4030_audio_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit twl4030_audio_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;twl4030_audio_driver);</div><div class='del'>-}</div><div class='del'>-module_init(twl4030_audio_init);</div><div class='del'>-</div><div class='del'>-static void __devexit twl4030_audio_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;twl4030_audio_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(twl4030_audio_exit);</div><div class='add'>+module_platform_driver(twl4030_audio_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Peter Ujfalusi &lt;peter.ujfalusi@ti.com&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c<br/>index 29f11e0765fe..b69bb517b102 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/twl4030-irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/twl4030-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/twl4030-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/twl4030-irq.c</a></div><div class='hunk'>@@ -492,7 +492,7 @@ static void twl4030_sih_bus_sync_unlock(struct irq_data *data)</div><div class='ctx'> 			u8	bytes[4];</div><div class='ctx'> 		} imr;</div><div class='ctx'> </div><div class='del'>-		/* byte[0] gets overwriten as we write ... */</div><div class='add'>+		/* byte[0] gets overwritten as we write ... */</div><div class='ctx'> 		imr.word = cpu_to_le32(agent-&gt;imr &lt;&lt; 8);</div><div class='ctx'> 		agent-&gt;imr_change_pending = false;</div><div class='ctx'> </div><div class='hunk'>@@ -667,6 +667,7 @@ int twl4030_sih_setup(int module)</div><div class='ctx'> 		irq_set_chip_data(irq, agent);</div><div class='ctx'> 		irq_set_chip_and_handler(irq, &amp;twl4030_sih_irq_chip,</div><div class='ctx'> 					 handle_edge_irq);</div><div class='add'>+		irq_set_nested_thread(irq, 1);</div><div class='ctx'> 		activate_irq(irq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mfd/twl4030-madc.c b/drivers/mfd/twl4030-madc.c<br/>index 834f824d3c11..456ecb5ac4fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/twl4030-madc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/twl4030-madc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/twl4030-madc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/twl4030-madc.c</a></div><div class='hunk'>@@ -807,19 +807,7 @@ static struct platform_driver twl4030_madc_driver = {</div><div class='ctx'> 		   },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init twl4030_madc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;twl4030_madc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(twl4030_madc_init);</div><div class='del'>-</div><div class='del'>-static void __exit twl4030_madc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;twl4030_madc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_exit(twl4030_madc_exit);</div><div class='add'>+module_platform_driver(twl4030_madc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("TWL4030 ADC driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c<br/>index a764676f0922..d905f5171153 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/twl4030-power.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/twl4030-power.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/twl4030-power.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/twl4030-power.c</a></div><div class='hunk'>@@ -34,7 +34,8 @@</div><div class='ctx'> static u8 twl4030_start_script_address = 0x2b;</div><div class='ctx'> </div><div class='ctx'> #define PWR_P1_SW_EVENTS	0x10</div><div class='del'>-#define PWR_DEVOFF	(1&lt;&lt;0)</div><div class='add'>+#define PWR_DEVOFF		(1 &lt;&lt; 0)</div><div class='add'>+#define SEQ_OFFSYNC		(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> #define PHY_TO_OFF_PM_MASTER(p)		(p - 0x36)</div><div class='ctx'> #define PHY_TO_OFF_PM_RECEIVER(p)	(p - 0x5b)</div><div class='hunk'>@@ -511,12 +512,27 @@ int twl4030_remove_script(u8 flags)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * In master mode, start the power off sequence.</div><div class='add'>+ * After a successful execution, TWL shuts down the power to the SoC</div><div class='add'>+ * and all peripherals connected to it.</div><div class='add'>+ */</div><div class='add'>+void twl4030_power_off(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, PWR_DEVOFF,</div><div class='add'>+			       TWL4030_PM_MASTER_P1_SW_EVENTS);</div><div class='add'>+	if (err)</div><div class='add'>+		pr_err("TWL4030 Unable to power off\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init twl4030_power_init(struct twl4030_power_data *twl4030_scripts)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct twl4030_resconfig *resconfig;</div><div class='del'>-	u8 address = twl4030_start_script_address;</div><div class='add'>+	u8 val, address = twl4030_start_script_address;</div><div class='ctx'> </div><div class='ctx'> 	err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER,</div><div class='ctx'> 			TWL4030_PM_MASTER_KEY_CFG1,</div><div class='hunk'>@@ -548,6 +564,28 @@ void __init twl4030_power_init(struct twl4030_power_data *twl4030_scripts)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Board has to be wired properly to use this feature */</div><div class='add'>+	if (twl4030_scripts-&gt;use_poweroff &amp;&amp; !pm_power_off) {</div><div class='add'>+		/* Default for SEQ_OFFSYNC is set, lets ensure this */</div><div class='add'>+		err = twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &amp;val,</div><div class='add'>+				      TWL4030_PM_MASTER_CFG_P123_TRANSITION);</div><div class='add'>+		if (err) {</div><div class='add'>+			pr_warning("TWL4030 Unable to read registers\n");</div><div class='add'>+</div><div class='add'>+		} else if (!(val &amp; SEQ_OFFSYNC)) {</div><div class='add'>+			val |= SEQ_OFFSYNC;</div><div class='add'>+			err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, val,</div><div class='add'>+					TWL4030_PM_MASTER_CFG_P123_TRANSITION);</div><div class='add'>+			if (err) {</div><div class='add'>+				pr_err("TWL4030 Unable to setup SEQ_OFFSYNC\n");</div><div class='add'>+				goto relock;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pm_power_off = twl4030_power_off;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+relock:</div><div class='ctx'> 	err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 0,</div><div class='ctx'> 			TWL4030_PM_MASTER_PROTECT_KEY);</div><div class='ctx'> 	if (err)</div><div class='head'>diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c<br/>index 3eee45ffb096..c6b456ad7342 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/twl6030-irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/twl6030-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/twl6030-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/twl6030-irq.c</a></div><div class='hunk'>@@ -138,8 +138,6 @@ static int twl6030_irq_thread(void *data)</div><div class='ctx'> 	static const unsigned max_i2c_errors = 100;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	current-&gt;flags |= PF_NOFREEZE;</div><div class='del'>-</div><div class='ctx'> 	while (!kthread_should_stop()) {</div><div class='ctx'> 		int i;</div><div class='ctx'> 		union {</div><div class='head'>diff --git a/drivers/mfd/twl6040-core.c b/drivers/mfd/twl6040-core.c<br/>index 268f80fd0439..dda86293dc9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/twl6040-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/twl6040-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/twl6040-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/twl6040-core.c</a></div><div class='hunk'>@@ -509,13 +509,10 @@ static int __devinit twl6040_probe(struct platform_device *pdev)</div><div class='ctx'> 		twl6040-&gt;audpwron = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (gpio_is_valid(twl6040-&gt;audpwron)) {</div><div class='del'>-		ret = gpio_request(twl6040-&gt;audpwron, "audpwron");</div><div class='add'>+		ret = gpio_request_one(twl6040-&gt;audpwron, GPIOF_OUT_INIT_LOW,</div><div class='add'>+				       "audpwron");</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto gpio1_err;</div><div class='del'>-</div><div class='del'>-		ret = gpio_direction_output(twl6040-&gt;audpwron, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto gpio2_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* codec interrupt */</div><div class='hunk'>@@ -619,18 +616,7 @@ static struct platform_driver twl6040_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit twl6040_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;twl6040_driver);</div><div class='del'>-}</div><div class='del'>-module_init(twl6040_init);</div><div class='del'>-</div><div class='del'>-static void __devexit twl6040_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;twl6040_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_exit(twl6040_exit);</div><div class='add'>+module_platform_driver(twl6040_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("TWL6040 MFD");</div><div class='ctx'> MODULE_AUTHOR("Misael Lopez Cruz &lt;misael.lopez@ti.com&gt;");</div><div class='head'>diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c<br/>index b281217334eb..91c4f25e0e55 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/ucb1x00-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ucb1x00-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/ucb1x00-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/ucb1x00-core.c</a></div><div class='hunk'>@@ -36,6 +36,15 @@ static DEFINE_MUTEX(ucb1x00_mutex);</div><div class='ctx'> static LIST_HEAD(ucb1x00_drivers);</div><div class='ctx'> static LIST_HEAD(ucb1x00_devices);</div><div class='ctx'> </div><div class='add'>+static struct mcp_device_id ucb1x00_id[] = {</div><div class='add'>+	{ "ucb1x00", 0 },  /* auto-detection */</div><div class='add'>+	{ "ucb1200", UCB_ID_1200 },</div><div class='add'>+	{ "ucb1300", UCB_ID_1300 },</div><div class='add'>+	{ "tc35143", UCB_ID_TC35143 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(mcp, ucb1x00_id);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	ucb1x00_io_set_dir - set IO direction</div><div class='ctx'>  *	@ucb: UCB1x00 structure describing chip</div><div class='hunk'>@@ -527,17 +536,33 @@ static struct class ucb1x00_class = {</div><div class='ctx'> </div><div class='ctx'> static int ucb1x00_probe(struct mcp *mcp)</div><div class='ctx'> {</div><div class='add'>+	const struct mcp_device_id *mid;</div><div class='ctx'> 	struct ucb1x00 *ucb;</div><div class='ctx'> 	struct ucb1x00_driver *drv;</div><div class='add'>+	struct ucb1x00_plat_data *pdata;</div><div class='ctx'> 	unsigned int id;</div><div class='ctx'> 	int ret = -ENODEV;</div><div class='ctx'> 	int temp;</div><div class='ctx'> </div><div class='ctx'> 	mcp_enable(mcp);</div><div class='ctx'> 	id = mcp_reg_read(mcp, UCB_ID);</div><div class='add'>+	mid = mcp_get_device_id(mcp);</div><div class='ctx'> </div><div class='del'>-	if (id != UCB_ID_1200 &amp;&amp; id != UCB_ID_1300 &amp;&amp; id != UCB_ID_TC35143) {</div><div class='del'>-		printk(KERN_WARNING "UCB1x00 ID not found: %04x\n", id);</div><div class='add'>+	if (mid &amp;&amp; mid-&gt;driver_data) {</div><div class='add'>+		if (id != mid-&gt;driver_data) {</div><div class='add'>+			printk(KERN_WARNING "%s wrong ID %04x found: %04x\n",</div><div class='add'>+				mid-&gt;name, (unsigned int) mid-&gt;driver_data, id);</div><div class='add'>+			goto err_disable;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		mid = &amp;ucb1x00_id[1];</div><div class='add'>+		while (mid-&gt;driver_data) {</div><div class='add'>+			if (id == mid-&gt;driver_data)</div><div class='add'>+				break;</div><div class='add'>+			mid++;</div><div class='add'>+		}</div><div class='add'>+		printk(KERN_WARNING "%s ID not found: %04x\n",</div><div class='add'>+			ucb1x00_id[0].name, id);</div><div class='ctx'> 		goto err_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -546,28 +571,28 @@ static int ucb1x00_probe(struct mcp *mcp)</div><div class='ctx'> 	if (!ucb)</div><div class='ctx'> 		goto err_disable;</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+	pdata = mcp-&gt;attached_device.platform_data;</div><div class='ctx'> 	ucb-&gt;dev.class = &amp;ucb1x00_class;</div><div class='ctx'> 	ucb-&gt;dev.parent = &amp;mcp-&gt;attached_device;</div><div class='del'>-	dev_set_name(&amp;ucb-&gt;dev, "ucb1x00");</div><div class='add'>+	dev_set_name(&amp;ucb-&gt;dev, mid-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;ucb-&gt;lock);</div><div class='ctx'> 	spin_lock_init(&amp;ucb-&gt;io_lock);</div><div class='ctx'> 	sema_init(&amp;ucb-&gt;adc_sem, 1);</div><div class='ctx'> </div><div class='del'>-	ucb-&gt;id  = id;</div><div class='add'>+	ucb-&gt;id  = mid;</div><div class='ctx'> 	ucb-&gt;mcp = mcp;</div><div class='ctx'> 	ucb-&gt;irq = ucb1x00_detect_irq(ucb);</div><div class='ctx'> 	if (ucb-&gt;irq == NO_IRQ) {</div><div class='del'>-		printk(KERN_ERR "UCB1x00: IRQ probe failed\n");</div><div class='add'>+		printk(KERN_ERR "%s: IRQ probe failed\n", mid-&gt;name);</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ucb-&gt;gpio.base = -1;</div><div class='del'>-	if (mcp-&gt;gpio_base != 0) {</div><div class='add'>+	if (pdata &amp;&amp; (pdata-&gt;gpio_base &gt;= 0)) {</div><div class='ctx'> 		ucb-&gt;gpio.label = dev_name(&amp;ucb-&gt;dev);</div><div class='del'>-		ucb-&gt;gpio.base = mcp-&gt;gpio_base;</div><div class='add'>+		ucb-&gt;gpio.base = pdata-&gt;gpio_base;</div><div class='ctx'> 		ucb-&gt;gpio.ngpio = 10;</div><div class='ctx'> 		ucb-&gt;gpio.set = ucb1x00_gpio_set;</div><div class='ctx'> 		ucb-&gt;gpio.get = ucb1x00_gpio_get;</div><div class='hunk'>@@ -580,10 +605,10 @@ static int ucb1x00_probe(struct mcp *mcp)</div><div class='ctx'> 		dev_info(&amp;ucb-&gt;dev, "gpio_base not set so no gpiolib support");</div><div class='ctx'> </div><div class='ctx'> 	ret = request_irq(ucb-&gt;irq, ucb1x00_irq, IRQF_TRIGGER_RISING,</div><div class='del'>-			  "UCB1x00", ucb);</div><div class='add'>+			  mid-&gt;name, ucb);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		printk(KERN_ERR "ucb1x00: unable to grab irq%d: %d\n",</div><div class='del'>-			ucb-&gt;irq, ret);</div><div class='add'>+		printk(KERN_ERR "%s: unable to grab irq%d: %d\n",</div><div class='add'>+			mid-&gt;name, ucb-&gt;irq, ret);</div><div class='ctx'> 		goto err_gpio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -705,6 +730,7 @@ static struct mcp_driver ucb1x00_driver = {</div><div class='ctx'> 	.remove		= ucb1x00_remove,</div><div class='ctx'> 	.suspend	= ucb1x00_suspend,</div><div class='ctx'> 	.resume		= ucb1x00_resume,</div><div class='add'>+	.id_table	= ucb1x00_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ucb1x00_init(void)</div><div class='head'>diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c<br/>index 38ffbd50a0d2..40ec3c118868 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/ucb1x00-ts.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/ucb1x00-ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/ucb1x00-ts.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/ucb1x00-ts.c</a></div><div class='hunk'>@@ -382,7 +382,7 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev)</div><div class='ctx'> 	ts-&gt;adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC;</div><div class='ctx'> </div><div class='ctx'> 	idev-&gt;name       = "Touchscreen panel";</div><div class='del'>-	idev-&gt;id.product = ts-&gt;ucb-&gt;id;</div><div class='add'>+	idev-&gt;id.product = ts-&gt;ucb-&gt;id-&gt;driver_data;</div><div class='ctx'> 	idev-&gt;open       = ucb1x00_ts_open;</div><div class='ctx'> 	idev-&gt;close      = ucb1x00_ts_close;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mfd/vx855.c b/drivers/mfd/vx855.c<br/>index d698703dbd46..b73cc15e0081 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/vx855.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/vx855.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/vx855.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/vx855.c</a></div><div class='hunk'>@@ -118,7 +118,7 @@ static void __devexit vx855_remove(struct pci_dev *pdev)</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id vx855_pci_tbl[] = {</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(vx855_pci_tbl) = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855) },</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c<br/>index 0a2b8d41a702..f5e54fae8ada 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/wm831x-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm831x-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/wm831x-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/wm831x-core.c</a></div><div class='hunk'>@@ -559,6 +559,8 @@ static int wm831x_write(struct wm831x *wm831x, unsigned short reg,</div><div class='ctx'> 		dev_vdbg(wm831x-&gt;dev, "Write %04x to R%d(0x%x)\n",</div><div class='ctx'> 			 buf[i], reg + i, reg + i);</div><div class='ctx'> 		ret = regmap_write(wm831x-&gt;regmap, reg + i, buf[i]);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1875,7 +1877,6 @@ err_irq:</div><div class='ctx'> err_regmap:</div><div class='ctx'> 	mfd_remove_devices(wm831x-&gt;dev);</div><div class='ctx'> 	regmap_exit(wm831x-&gt;regmap);</div><div class='del'>-	kfree(wm831x);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1887,7 +1888,6 @@ void wm831x_device_exit(struct wm831x *wm831x)</div><div class='ctx'> 		free_irq(wm831x-&gt;irq_base + WM831X_IRQ_AUXADC_DATA, wm831x);</div><div class='ctx'> 	wm831x_irq_exit(wm831x);</div><div class='ctx'> 	regmap_exit(wm831x-&gt;regmap);</div><div class='del'>-	kfree(wm831x);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int wm831x_device_suspend(struct wm831x *wm831x)</div><div class='head'>diff --git a/drivers/mfd/wm831x-i2c.c b/drivers/mfd/wm831x-i2c.c<br/>index ac8da1d439da..cb15609b0a48 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/wm831x-i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm831x-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/wm831x-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/wm831x-i2c.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@ static int wm831x_i2c_probe(struct i2c_client *i2c,</div><div class='ctx'> 	struct wm831x *wm831x;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	wm831x = kzalloc(sizeof(struct wm831x), GFP_KERNEL);</div><div class='add'>+	wm831x = devm_kzalloc(&amp;i2c-&gt;dev, sizeof(struct wm831x), GFP_KERNEL);</div><div class='ctx'> 	if (wm831x == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -42,7 +42,6 @@ static int wm831x_i2c_probe(struct i2c_client *i2c,</div><div class='ctx'> 		ret = PTR_ERR(wm831x-&gt;regmap);</div><div class='ctx'> 		dev_err(wm831x-&gt;dev, "Failed to allocate register map: %d\n",</div><div class='ctx'> 			ret);</div><div class='del'>-		kfree(wm831x);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c<br/>index f4747a4a9a93..bec4d0539160 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/wm831x-irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm831x-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/wm831x-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/wm831x-irq.c</a></div><div class='hunk'>@@ -325,11 +325,6 @@ static inline int irq_data_to_status_reg(struct wm831x_irq_data *irq_data)</div><div class='ctx'> 	return WM831X_INTERRUPT_STATUS_1 - 1 + irq_data-&gt;reg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int irq_data_to_mask_reg(struct wm831x_irq_data *irq_data)</div><div class='del'>-{</div><div class='del'>-	return WM831X_INTERRUPT_STATUS_1_MASK - 1 + irq_data-&gt;reg;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline struct wm831x_irq_data *irq_to_wm831x_irq(struct wm831x *wm831x,</div><div class='ctx'> 							int irq)</div><div class='ctx'> {</div><div class='hunk'>@@ -477,8 +472,7 @@ static irqreturn_t wm831x_irq_thread(int irq, void *data)</div><div class='ctx'> 		handle_nested_irq(wm831x-&gt;irq_base + WM831X_IRQ_TCHPD);</div><div class='ctx'> 	if (primary &amp; WM831X_TCHDATA_INT)</div><div class='ctx'> 		handle_nested_irq(wm831x-&gt;irq_base + WM831X_IRQ_TCHDATA);</div><div class='del'>-	if (primary &amp; (WM831X_TCHDATA_EINT | WM831X_TCHPD_EINT))</div><div class='del'>-		goto out;</div><div class='add'>+	primary &amp;= ~(WM831X_TCHDATA_EINT | WM831X_TCHPD_EINT);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(wm831x_irqs); i++) {</div><div class='ctx'> 		int offset = wm831x_irqs[i].reg - 1;</div><div class='head'>diff --git a/drivers/mfd/wm831x-spi.c b/drivers/mfd/wm831x-spi.c<br/>index 8d6a9a969dbc..62ef3254105f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/wm831x-spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm831x-spi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/wm831x-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/wm831x-spi.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@ static int __devinit wm831x_spi_probe(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	type = (enum wm831x_parent)id-&gt;driver_data;</div><div class='ctx'> </div><div class='del'>-	wm831x = kzalloc(sizeof(struct wm831x), GFP_KERNEL);</div><div class='add'>+	wm831x = devm_kzalloc(&amp;spi-&gt;dev, sizeof(struct wm831x), GFP_KERNEL);</div><div class='ctx'> 	if (wm831x == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -45,7 +45,6 @@ static int __devinit wm831x_spi_probe(struct spi_device *spi)</div><div class='ctx'> 		ret = PTR_ERR(wm831x-&gt;regmap);</div><div class='ctx'> 		dev_err(wm831x-&gt;dev, "Failed to allocate register map: %d\n",</div><div class='ctx'> 			ret);</div><div class='del'>-		kfree(wm831x);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -95,7 +94,6 @@ MODULE_DEVICE_TABLE(spi, wm831x_spi_id);</div><div class='ctx'> static struct spi_driver wm831x_spi_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "wm831x",</div><div class='del'>-		.bus	= &amp;spi_bus_type,</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 		.pm	= &amp;wm831x_spi_pm,</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c<br/>index e81cc31e4202..dd1caaac55e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/wm8350-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm8350-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/wm8350-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/wm8350-core.c</a></div><div class='hunk'>@@ -573,6 +573,8 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,</div><div class='ctx'> 	u16 id1, id2, mask_rev;</div><div class='ctx'> 	u16 cust_id, mode, chip_rev;</div><div class='ctx'> </div><div class='add'>+	dev_set_drvdata(wm8350-&gt;dev, wm8350);</div><div class='add'>+</div><div class='ctx'> 	/* get WM8350 revision and config mode */</div><div class='ctx'> 	ret = wm8350-&gt;read_dev(wm8350, WM8350_RESET_ID, sizeof(id1), &amp;id1);</div><div class='ctx'> 	if (ret != 0) {</div><div class='head'>diff --git a/drivers/mfd/wm8350-i2c.c b/drivers/mfd/wm8350-i2c.c<br/>index 5fe5de166adb..d955faaf27c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/wm8350-i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm8350-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/wm8350-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/wm8350-i2c.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@ static int wm8350_i2c_probe(struct i2c_client *i2c,</div><div class='ctx'> 	struct wm8350 *wm8350;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	wm8350 = kzalloc(sizeof(struct wm8350), GFP_KERNEL);</div><div class='add'>+	wm8350 = devm_kzalloc(&amp;i2c-&gt;dev, sizeof(struct wm8350), GFP_KERNEL);</div><div class='ctx'> 	if (wm8350 == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -80,7 +80,6 @@ static int wm8350_i2c_probe(struct i2c_client *i2c,</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	kfree(wm8350);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -89,7 +88,6 @@ static int wm8350_i2c_remove(struct i2c_client *i2c)</div><div class='ctx'> 	struct wm8350 *wm8350 = i2c_get_clientdata(i2c);</div><div class='ctx'> </div><div class='ctx'> 	wm8350_device_exit(wm8350);</div><div class='del'>-	kfree(wm8350);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c<br/>index 62b4626f4561..2204893444a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/wm8400-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm8400-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/wm8400-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/wm8400-core.c</a></div><div class='hunk'>@@ -344,7 +344,7 @@ static int wm8400_i2c_probe(struct i2c_client *i2c,</div><div class='ctx'> 	struct wm8400 *wm8400;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	wm8400 = kzalloc(sizeof(struct wm8400), GFP_KERNEL);</div><div class='add'>+	wm8400 = devm_kzalloc(&amp;i2c-&gt;dev, sizeof(struct wm8400), GFP_KERNEL);</div><div class='ctx'> 	if (wm8400 == NULL) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -353,7 +353,7 @@ static int wm8400_i2c_probe(struct i2c_client *i2c,</div><div class='ctx'> 	wm8400-&gt;regmap = regmap_init_i2c(i2c, &amp;wm8400_regmap_config);</div><div class='ctx'> 	if (IS_ERR(wm8400-&gt;regmap)) {</div><div class='ctx'> 		ret = PTR_ERR(wm8400-&gt;regmap);</div><div class='del'>-		goto struct_err;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wm8400-&gt;dev = &amp;i2c-&gt;dev;</div><div class='hunk'>@@ -367,8 +367,6 @@ static int wm8400_i2c_probe(struct i2c_client *i2c,</div><div class='ctx'> </div><div class='ctx'> map_err:</div><div class='ctx'> 	regmap_exit(wm8400-&gt;regmap);</div><div class='del'>-struct_err:</div><div class='del'>-	kfree(wm8400);</div><div class='ctx'> err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -379,7 +377,6 @@ static int wm8400_i2c_remove(struct i2c_client *i2c)</div><div class='ctx'> </div><div class='ctx'> 	wm8400_release(wm8400);</div><div class='ctx'> 	regmap_exit(wm8400-&gt;regmap);</div><div class='del'>-	kfree(wm8400);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c<br/>index 61894fced8ea..f117e7fb9321 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/wm8994-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm8994-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/wm8994-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/wm8994-core.c</a></div><div class='hunk'>@@ -28,11 +28,7 @@</div><div class='ctx'> #include &lt;linux/mfd/wm8994/pdata.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/wm8994/registers.h&gt;</div><div class='ctx'> </div><div class='del'>-static int wm8994_read(struct wm8994 *wm8994, unsigned short reg,</div><div class='del'>-		       int bytes, void *dest)</div><div class='del'>-{</div><div class='del'>-	return regmap_raw_read(wm8994-&gt;regmap, reg, dest, bytes);</div><div class='del'>-}</div><div class='add'>+#include "wm8994.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * wm8994_reg_read: Read a single WM8994 register.</div><div class='hunk'>@@ -68,12 +64,6 @@ int wm8994_bulk_read(struct wm8994 *wm8994, unsigned short reg,</div><div class='ctx'> 	return regmap_bulk_read(wm8994-&gt;regmap, reg, buf, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wm8994_write(struct wm8994 *wm8994, unsigned short reg,</div><div class='del'>-			int bytes, const void *src)</div><div class='del'>-{</div><div class='del'>-	return regmap_raw_write(wm8994-&gt;regmap, reg, src, bytes);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * wm8994_reg_write: Write a single WM8994 register.</div><div class='ctx'>  *</div><div class='hunk'>@@ -252,6 +242,20 @@ static int wm8994_suspend(struct device *dev)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	switch (wm8994-&gt;type) {</div><div class='add'>+	case WM1811:</div><div class='add'>+		ret = wm8994_reg_read(wm8994, WM8994_ANTIPOP_2);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(dev, "Failed to read jackdet: %d\n", ret);</div><div class='add'>+		} else if (ret &amp; WM1811_JACKDET_MODE_MASK) {</div><div class='add'>+			dev_dbg(dev, "CODEC still active, ignoring suspend\n");</div><div class='add'>+			return 0;</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='ctx'> 	/* Disable LDO pulldowns while the device is suspended if we</div><div class='ctx'> 	 * don't know that something will be driving them. */</div><div class='ctx'> 	if (!wm8994-&gt;ldo_ena_always_driven)</div><div class='hunk'>@@ -259,25 +263,14 @@ static int wm8994_suspend(struct device *dev)</div><div class='ctx'> 				WM8994_LDO1ENA_PD | WM8994_LDO2ENA_PD,</div><div class='ctx'> 				WM8994_LDO1ENA_PD | WM8994_LDO2ENA_PD);</div><div class='ctx'> </div><div class='del'>-	/* GPIO configuration state is saved here since we may be configuring</div><div class='del'>-	 * the GPIO alternate functions even if we're not using the gpiolib</div><div class='del'>-	 * driver for them.</div><div class='del'>-	 */</div><div class='del'>-	ret = wm8994_read(wm8994, WM8994_GPIO_1, WM8994_NUM_GPIO_REGS * 2,</div><div class='del'>-			  &amp;wm8994-&gt;gpio_regs);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		dev_err(dev, "Failed to save GPIO registers: %d\n", ret);</div><div class='del'>-</div><div class='del'>-	/* For similar reasons we also stash the regulator states */</div><div class='del'>-	ret = wm8994_read(wm8994, WM8994_LDO_1, WM8994_NUM_LDO_REGS * 2,</div><div class='del'>-			  &amp;wm8994-&gt;ldo_regs);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		dev_err(dev, "Failed to save LDO registers: %d\n", ret);</div><div class='del'>-</div><div class='ctx'> 	/* Explicitly put the device into reset in case regulators</div><div class='ctx'> 	 * don't get disabled in order to ensure consistent restart.</div><div class='ctx'> 	 */</div><div class='del'>-	wm8994_reg_write(wm8994, WM8994_SOFTWARE_RESET, 0x8994);</div><div class='add'>+	wm8994_reg_write(wm8994, WM8994_SOFTWARE_RESET,</div><div class='add'>+			 wm8994_reg_read(wm8994, WM8994_SOFTWARE_RESET));</div><div class='add'>+</div><div class='add'>+	regcache_cache_only(wm8994-&gt;regmap, true);</div><div class='add'>+	regcache_mark_dirty(wm8994-&gt;regmap);</div><div class='ctx'> </div><div class='ctx'> 	wm8994-&gt;suspended = true;</div><div class='ctx'> </div><div class='hunk'>@@ -294,7 +287,7 @@ static int wm8994_suspend(struct device *dev)</div><div class='ctx'> static int wm8994_resume(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct wm8994 *wm8994 = dev_get_drvdata(dev);</div><div class='del'>-	int ret, i;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* We may have lied to the PM core about suspending */</div><div class='ctx'> 	if (!wm8994-&gt;suspended)</div><div class='hunk'>@@ -307,27 +300,13 @@ static int wm8994_resume(struct device *dev)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Write register at a time as we use the cache on the CPU so store</div><div class='del'>-	 * it in native endian.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(wm8994-&gt;irq_masks_cur); i++) {</div><div class='del'>-		ret = wm8994_reg_write(wm8994, WM8994_INTERRUPT_STATUS_1_MASK</div><div class='del'>-				       + i, wm8994-&gt;irq_masks_cur[i]);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			dev_err(dev, "Failed to restore interrupt masks: %d\n",</div><div class='del'>-				ret);</div><div class='add'>+	regcache_cache_only(wm8994-&gt;regmap, false);</div><div class='add'>+	ret = regcache_sync(wm8994-&gt;regmap);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_err(dev, "Failed to restore register map: %d\n", ret);</div><div class='add'>+		goto err_enable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = wm8994_write(wm8994, WM8994_LDO_1, WM8994_NUM_LDO_REGS * 2,</div><div class='del'>-			   &amp;wm8994-&gt;ldo_regs);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		dev_err(dev, "Failed to restore LDO registers: %d\n", ret);</div><div class='del'>-</div><div class='del'>-	ret = wm8994_write(wm8994, WM8994_GPIO_1, WM8994_NUM_GPIO_REGS * 2,</div><div class='del'>-			   &amp;wm8994-&gt;gpio_regs);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		dev_err(dev, "Failed to restore GPIO registers: %d\n", ret);</div><div class='del'>-</div><div class='ctx'> 	/* Disable LDO pulldowns while the device is active */</div><div class='ctx'> 	wm8994_set_bits(wm8994, WM8994_PULL_CONTROL_2,</div><div class='ctx'> 			WM8994_LDO1ENA_PD | WM8994_LDO2ENA_PD,</div><div class='hunk'>@@ -336,6 +315,11 @@ static int wm8994_resume(struct device *dev)</div><div class='ctx'> 	wm8994-&gt;suspended = false;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_enable:</div><div class='add'>+	regulator_bulk_disable(wm8994-&gt;num_supplies, wm8994-&gt;supplies);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -361,19 +345,16 @@ static int wm8994_ldo_in_use(struct wm8994_pdata *pdata, int ldo)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct regmap_config wm8994_regmap_config = {</div><div class='del'>-	.reg_bits = 16,</div><div class='del'>-	.val_bits = 16,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Instantiate the generic non-control parts of the device.</div><div class='ctx'>  */</div><div class='ctx'> static int wm8994_device_init(struct wm8994 *wm8994, int irq)</div><div class='ctx'> {</div><div class='ctx'> 	struct wm8994_pdata *pdata = wm8994-&gt;dev-&gt;platform_data;</div><div class='add'>+	struct regmap_config *regmap_config;</div><div class='ctx'> 	const char *devname;</div><div class='ctx'> 	int ret, i;</div><div class='add'>+	int pulls = 0;</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(wm8994-&gt;dev, wm8994);</div><div class='ctx'> </div><div class='hunk'>@@ -402,9 +383,9 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)</div><div class='ctx'> 		goto err_regmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wm8994-&gt;supplies = kzalloc(sizeof(struct regulator_bulk_data) *</div><div class='del'>-				   wm8994-&gt;num_supplies,</div><div class='del'>-				   GFP_KERNEL);</div><div class='add'>+	wm8994-&gt;supplies = devm_kzalloc(wm8994-&gt;dev,</div><div class='add'>+					sizeof(struct regulator_bulk_data) *</div><div class='add'>+					wm8994-&gt;num_supplies, GFP_KERNEL);</div><div class='ctx'> 	if (!wm8994-&gt;supplies) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto err_regmap;</div><div class='hunk'>@@ -432,7 +413,7 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)</div><div class='ctx'> 				 wm8994-&gt;supplies);</div><div class='ctx'> 	if (ret != 0) {</div><div class='ctx'> 		dev_err(wm8994-&gt;dev, "Failed to get supplies: %d\n", ret);</div><div class='del'>-		goto err_supplies;</div><div class='add'>+		goto err_regmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = regulator_bulk_enable(wm8994-&gt;num_supplies,</div><div class='hunk'>@@ -482,25 +463,54 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)</div><div class='ctx'> 			ret);</div><div class='ctx'> 		goto err_enable;</div><div class='ctx'> 	}</div><div class='add'>+	wm8994-&gt;revision = ret;</div><div class='ctx'> </div><div class='ctx'> 	switch (wm8994-&gt;type) {</div><div class='ctx'> 	case WM8994:</div><div class='del'>-		switch (ret) {</div><div class='add'>+		switch (wm8994-&gt;revision) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> 		case 1:</div><div class='ctx'> 			dev_warn(wm8994-&gt;dev,</div><div class='ctx'> 				 "revision %c not fully supported\n",</div><div class='del'>-				 'A' + ret);</div><div class='add'>+				 'A' + wm8994-&gt;revision);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case WM1811:</div><div class='add'>+		/* Revision C did not change the relevant layer */</div><div class='add'>+		if (wm8994-&gt;revision &gt; 1)</div><div class='add'>+			wm8994-&gt;revision++;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_info(wm8994-&gt;dev, "%s revision %c\n", devname, 'A' + ret);</div><div class='add'>+	dev_info(wm8994-&gt;dev, "%s revision %c\n", devname,</div><div class='add'>+		 'A' + wm8994-&gt;revision);</div><div class='add'>+</div><div class='add'>+	switch (wm8994-&gt;type) {</div><div class='add'>+	case WM1811:</div><div class='add'>+		regmap_config = &amp;wm1811_regmap_config;</div><div class='add'>+		break;</div><div class='add'>+	case WM8994:</div><div class='add'>+		regmap_config = &amp;wm8994_regmap_config;</div><div class='add'>+		break;</div><div class='add'>+	case WM8958:</div><div class='add'>+		regmap_config = &amp;wm8958_regmap_config;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(wm8994-&gt;dev, "Unknown device type %d\n", wm8994-&gt;type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_reinit_cache(wm8994-&gt;regmap, regmap_config);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_err(wm8994-&gt;dev, "Failed to reinit register cache: %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (pdata) {</div><div class='ctx'> 		wm8994-&gt;irq_base = pdata-&gt;irq_base;</div><div class='hunk'>@@ -516,12 +526,16 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		wm8994-&gt;ldo_ena_always_driven = pdata-&gt;ldo_ena_always_driven;</div><div class='add'>+</div><div class='add'>+		if (pdata-&gt;spkmode_pu)</div><div class='add'>+			pulls |= WM8994_SPKMODE_PU;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Disable LDO pulldowns while the device is active */</div><div class='add'>+	/* Disable unneeded pulls */</div><div class='ctx'> 	wm8994_set_bits(wm8994, WM8994_PULL_CONTROL_2,</div><div class='del'>-			WM8994_LDO1ENA_PD | WM8994_LDO2ENA_PD,</div><div class='del'>-			0);</div><div class='add'>+			WM8994_LDO1ENA_PD | WM8994_LDO2ENA_PD |</div><div class='add'>+			WM8994_SPKMODE_PU | WM8994_CSNADDR_PD,</div><div class='add'>+			pulls);</div><div class='ctx'> </div><div class='ctx'> 	/* In some system designs where the regulators are not in use,</div><div class='ctx'> 	 * we can achieve a small reduction in leakage currents by</div><div class='hunk'>@@ -560,12 +574,9 @@ err_enable:</div><div class='ctx'> 			       wm8994-&gt;supplies);</div><div class='ctx'> err_get:</div><div class='ctx'> 	regulator_bulk_free(wm8994-&gt;num_supplies, wm8994-&gt;supplies);</div><div class='del'>-err_supplies:</div><div class='del'>-	kfree(wm8994-&gt;supplies);</div><div class='ctx'> err_regmap:</div><div class='ctx'> 	regmap_exit(wm8994-&gt;regmap);</div><div class='ctx'> 	mfd_remove_devices(wm8994-&gt;dev);</div><div class='del'>-	kfree(wm8994);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -577,18 +588,24 @@ static void wm8994_device_exit(struct wm8994 *wm8994)</div><div class='ctx'> 	regulator_bulk_disable(wm8994-&gt;num_supplies,</div><div class='ctx'> 			       wm8994-&gt;supplies);</div><div class='ctx'> 	regulator_bulk_free(wm8994-&gt;num_supplies, wm8994-&gt;supplies);</div><div class='del'>-	kfree(wm8994-&gt;supplies);</div><div class='ctx'> 	regmap_exit(wm8994-&gt;regmap);</div><div class='del'>-	kfree(wm8994);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct of_device_id wm8994_of_match[] = {</div><div class='add'>+	{ .compatible = "wlf,wm1811", },</div><div class='add'>+	{ .compatible = "wlf,wm8994", },</div><div class='add'>+	{ .compatible = "wlf,wm8958", },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, wm8994_of_match);</div><div class='add'>+</div><div class='ctx'> static int wm8994_i2c_probe(struct i2c_client *i2c,</div><div class='ctx'> 			    const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct wm8994 *wm8994;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	wm8994 = kzalloc(sizeof(struct wm8994), GFP_KERNEL);</div><div class='add'>+	wm8994 = devm_kzalloc(&amp;i2c-&gt;dev, sizeof(struct wm8994), GFP_KERNEL);</div><div class='ctx'> 	if (wm8994 == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -597,12 +614,11 @@ static int wm8994_i2c_probe(struct i2c_client *i2c,</div><div class='ctx'> 	wm8994-&gt;irq = i2c-&gt;irq;</div><div class='ctx'> 	wm8994-&gt;type = id-&gt;driver_data;</div><div class='ctx'> </div><div class='del'>-	wm8994-&gt;regmap = regmap_init_i2c(i2c, &amp;wm8994_regmap_config);</div><div class='add'>+	wm8994-&gt;regmap = regmap_init_i2c(i2c, &amp;wm8994_base_regmap_config);</div><div class='ctx'> 	if (IS_ERR(wm8994-&gt;regmap)) {</div><div class='ctx'> 		ret = PTR_ERR(wm8994-&gt;regmap);</div><div class='ctx'> 		dev_err(wm8994-&gt;dev, "Failed to allocate register map: %d\n",</div><div class='ctx'> 			ret);</div><div class='del'>-		kfree(wm8994);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -620,6 +636,7 @@ static int wm8994_i2c_remove(struct i2c_client *i2c)</div><div class='ctx'> </div><div class='ctx'> static const struct i2c_device_id wm8994_i2c_id[] = {</div><div class='ctx'> 	{ "wm1811", WM1811 },</div><div class='add'>+	{ "wm1811a", WM1811 },</div><div class='ctx'> 	{ "wm8994", WM8994 },</div><div class='ctx'> 	{ "wm8958", WM8958 },</div><div class='ctx'> 	{ }</div><div class='hunk'>@@ -634,6 +651,7 @@ static struct i2c_driver wm8994_i2c_driver = {</div><div class='ctx'> 		.name = "wm8994",</div><div class='ctx'> 		.owner = THIS_MODULE,</div><div class='ctx'> 		.pm = &amp;wm8994_pm_ops,</div><div class='add'>+		.of_match_table = wm8994_of_match,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = wm8994_i2c_probe,</div><div class='ctx'> 	.remove = wm8994_i2c_remove,</div><div class='head'>diff --git a/drivers/mfd/wm8994-irq.c b/drivers/mfd/wm8994-irq.c<br/>index d682f7bd112c..46b20c445ecf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/wm8994-irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mfd/wm8994-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/wm8994-irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/wm8994-irq.c</a></div><div class='hunk'>@@ -18,248 +18,127 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/core.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mfd/wm8994/core.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/wm8994/registers.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='del'>-struct wm8994_irq_data {</div><div class='del'>-	int reg;</div><div class='del'>-	int mask;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct wm8994_irq_data wm8994_irqs[] = {</div><div class='add'>+static struct regmap_irq wm8994_irqs[] = {</div><div class='ctx'> 	[WM8994_IRQ_TEMP_SHUT] = {</div><div class='del'>-		.reg = 2,</div><div class='add'>+		.reg_offset = 1,</div><div class='ctx'> 		.mask = WM8994_TEMP_SHUT_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_MIC1_DET] = {</div><div class='del'>-		.reg = 2,</div><div class='add'>+		.reg_offset = 1,</div><div class='ctx'> 		.mask = WM8994_MIC1_DET_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_MIC1_SHRT] = {</div><div class='del'>-		.reg = 2,</div><div class='add'>+		.reg_offset = 1,</div><div class='ctx'> 		.mask = WM8994_MIC1_SHRT_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_MIC2_DET] = {</div><div class='del'>-		.reg = 2,</div><div class='add'>+		.reg_offset = 1,</div><div class='ctx'> 		.mask = WM8994_MIC2_DET_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_MIC2_SHRT] = {</div><div class='del'>-		.reg = 2,</div><div class='add'>+		.reg_offset = 1,</div><div class='ctx'> 		.mask = WM8994_MIC2_SHRT_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_FLL1_LOCK] = {</div><div class='del'>-		.reg = 2,</div><div class='add'>+		.reg_offset = 1,</div><div class='ctx'> 		.mask = WM8994_FLL1_LOCK_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_FLL2_LOCK] = {</div><div class='del'>-		.reg = 2,</div><div class='add'>+		.reg_offset = 1,</div><div class='ctx'> 		.mask = WM8994_FLL2_LOCK_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_SRC1_LOCK] = {</div><div class='del'>-		.reg = 2,</div><div class='add'>+		.reg_offset = 1,</div><div class='ctx'> 		.mask = WM8994_SRC1_LOCK_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_SRC2_LOCK] = {</div><div class='del'>-		.reg = 2,</div><div class='add'>+		.reg_offset = 1,</div><div class='ctx'> 		.mask = WM8994_SRC2_LOCK_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_AIF1DRC1_SIG_DET] = {</div><div class='del'>-		.reg = 2,</div><div class='add'>+		.reg_offset = 1,</div><div class='ctx'> 		.mask = WM8994_AIF1DRC1_SIG_DET,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_AIF1DRC2_SIG_DET] = {</div><div class='del'>-		.reg = 2,</div><div class='add'>+		.reg_offset = 1,</div><div class='ctx'> 		.mask = WM8994_AIF1DRC2_SIG_DET_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_AIF2DRC_SIG_DET] = {</div><div class='del'>-		.reg = 2,</div><div class='add'>+		.reg_offset = 1,</div><div class='ctx'> 		.mask = WM8994_AIF2DRC_SIG_DET_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_FIFOS_ERR] = {</div><div class='del'>-		.reg = 2,</div><div class='add'>+		.reg_offset = 1,</div><div class='ctx'> 		.mask = WM8994_FIFOS_ERR_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_WSEQ_DONE] = {</div><div class='del'>-		.reg = 2,</div><div class='add'>+		.reg_offset = 1,</div><div class='ctx'> 		.mask = WM8994_WSEQ_DONE_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_DCS_DONE] = {</div><div class='del'>-		.reg = 2,</div><div class='add'>+		.reg_offset = 1,</div><div class='ctx'> 		.mask = WM8994_DCS_DONE_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_TEMP_WARN] = {</div><div class='del'>-		.reg = 2,</div><div class='add'>+		.reg_offset = 1,</div><div class='ctx'> 		.mask = WM8994_TEMP_WARN_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_GPIO(1)] = {</div><div class='del'>-		.reg = 1,</div><div class='ctx'> 		.mask = WM8994_GP1_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_GPIO(2)] = {</div><div class='del'>-		.reg = 1,</div><div class='ctx'> 		.mask = WM8994_GP2_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_GPIO(3)] = {</div><div class='del'>-		.reg = 1,</div><div class='ctx'> 		.mask = WM8994_GP3_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_GPIO(4)] = {</div><div class='del'>-		.reg = 1,</div><div class='ctx'> 		.mask = WM8994_GP4_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_GPIO(5)] = {</div><div class='del'>-		.reg = 1,</div><div class='ctx'> 		.mask = WM8994_GP5_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_GPIO(6)] = {</div><div class='del'>-		.reg = 1,</div><div class='ctx'> 		.mask = WM8994_GP6_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_GPIO(7)] = {</div><div class='del'>-		.reg = 1,</div><div class='ctx'> 		.mask = WM8994_GP7_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_GPIO(8)] = {</div><div class='del'>-		.reg = 1,</div><div class='ctx'> 		.mask = WM8994_GP8_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_GPIO(9)] = {</div><div class='del'>-		.reg = 1,</div><div class='ctx'> 		.mask = WM8994_GP8_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_GPIO(10)] = {</div><div class='del'>-		.reg = 1,</div><div class='ctx'> 		.mask = WM8994_GP10_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> 	[WM8994_IRQ_GPIO(11)] = {</div><div class='del'>-		.reg = 1,</div><div class='ctx'> 		.mask = WM8994_GP11_EINT,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline int irq_data_to_status_reg(struct wm8994_irq_data *irq_data)</div><div class='del'>-{</div><div class='del'>-	return WM8994_INTERRUPT_STATUS_1 - 1 + irq_data-&gt;reg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int irq_data_to_mask_reg(struct wm8994_irq_data *irq_data)</div><div class='del'>-{</div><div class='del'>-	return WM8994_INTERRUPT_STATUS_1_MASK - 1 + irq_data-&gt;reg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct wm8994_irq_data *irq_to_wm8994_irq(struct wm8994 *wm8994,</div><div class='del'>-							int irq)</div><div class='del'>-{</div><div class='del'>-	return &amp;wm8994_irqs[irq - wm8994-&gt;irq_base];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void wm8994_irq_lock(struct irq_data *data)</div><div class='del'>-{</div><div class='del'>-	struct wm8994 *wm8994 = irq_data_get_irq_chip_data(data);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;wm8994-&gt;irq_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void wm8994_irq_sync_unlock(struct irq_data *data)</div><div class='del'>-{</div><div class='del'>-	struct wm8994 *wm8994 = irq_data_get_irq_chip_data(data);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(wm8994-&gt;irq_masks_cur); i++) {</div><div class='del'>-		/* If there's been a change in the mask write it back</div><div class='del'>-		 * to the hardware. */</div><div class='del'>-		if (wm8994-&gt;irq_masks_cur[i] != wm8994-&gt;irq_masks_cache[i]) {</div><div class='del'>-			wm8994-&gt;irq_masks_cache[i] = wm8994-&gt;irq_masks_cur[i];</div><div class='del'>-			wm8994_reg_write(wm8994,</div><div class='del'>-					 WM8994_INTERRUPT_STATUS_1_MASK + i,</div><div class='del'>-					 wm8994-&gt;irq_masks_cur[i]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;wm8994-&gt;irq_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void wm8994_irq_enable(struct irq_data *data)</div><div class='del'>-{</div><div class='del'>-	struct wm8994 *wm8994 = irq_data_get_irq_chip_data(data);</div><div class='del'>-	struct wm8994_irq_data *irq_data = irq_to_wm8994_irq(wm8994,</div><div class='del'>-							     data-&gt;irq);</div><div class='del'>-</div><div class='del'>-	wm8994-&gt;irq_masks_cur[irq_data-&gt;reg - 1] &amp;= ~irq_data-&gt;mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void wm8994_irq_disable(struct irq_data *data)</div><div class='del'>-{</div><div class='del'>-	struct wm8994 *wm8994 = irq_data_get_irq_chip_data(data);</div><div class='del'>-	struct wm8994_irq_data *irq_data = irq_to_wm8994_irq(wm8994,</div><div class='del'>-							     data-&gt;irq);</div><div class='del'>-</div><div class='del'>-	wm8994-&gt;irq_masks_cur[irq_data-&gt;reg - 1] |= irq_data-&gt;mask;</div><div class='del'>-}</div><div class='add'>+static struct regmap_irq_chip wm8994_irq_chip = {</div><div class='add'>+	.name = "wm8994",</div><div class='add'>+	.irqs = wm8994_irqs,</div><div class='add'>+	.num_irqs = ARRAY_SIZE(wm8994_irqs),</div><div class='ctx'> </div><div class='del'>-static struct irq_chip wm8994_irq_chip = {</div><div class='del'>-	.name			= "wm8994",</div><div class='del'>-	.irq_bus_lock		= wm8994_irq_lock,</div><div class='del'>-	.irq_bus_sync_unlock	= wm8994_irq_sync_unlock,</div><div class='del'>-	.irq_disable		= wm8994_irq_disable,</div><div class='del'>-	.irq_enable		= wm8994_irq_enable,</div><div class='add'>+	.num_regs = 2,</div><div class='add'>+	.status_base = WM8994_INTERRUPT_STATUS_1,</div><div class='add'>+	.mask_base = WM8994_INTERRUPT_STATUS_1_MASK,</div><div class='add'>+	.ack_base = WM8994_INTERRUPT_STATUS_1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* The processing of the primary interrupt occurs in a thread so that</div><div class='del'>- * we can interact with the device over I2C or SPI. */</div><div class='del'>-static irqreturn_t wm8994_irq_thread(int irq, void *data)</div><div class='del'>-{</div><div class='del'>-	struct wm8994 *wm8994 = data;</div><div class='del'>-	unsigned int i;</div><div class='del'>-	u16 status[WM8994_NUM_IRQ_REGS];</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = wm8994_bulk_read(wm8994, WM8994_INTERRUPT_STATUS_1,</div><div class='del'>-			       WM8994_NUM_IRQ_REGS, status);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(wm8994-&gt;dev, "Failed to read interrupt status: %d\n",</div><div class='del'>-			ret);</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Bit swap and apply masking */</div><div class='del'>-	for (i = 0; i &lt; WM8994_NUM_IRQ_REGS; i++) {</div><div class='del'>-		status[i] = be16_to_cpu(status[i]);</div><div class='del'>-		status[i] &amp;= ~wm8994-&gt;irq_masks_cur[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Ack any unmasked IRQs */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(status); i++) {</div><div class='del'>-		if (status[i])</div><div class='del'>-			wm8994_reg_write(wm8994, WM8994_INTERRUPT_STATUS_1 + i,</div><div class='del'>-					 status[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Report */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(wm8994_irqs); i++) {</div><div class='del'>-		if (status[wm8994_irqs[i].reg - 1] &amp; wm8994_irqs[i].mask)</div><div class='del'>-			handle_nested_irq(wm8994-&gt;irq_base + i);</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='ctx'> int wm8994_irq_init(struct wm8994 *wm8994)</div><div class='ctx'> {</div><div class='del'>-	int i, cur_irq, ret;</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;wm8994-&gt;irq_lock);</div><div class='del'>-</div><div class='del'>-	/* Mask the individual interrupt sources */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(wm8994-&gt;irq_masks_cur); i++) {</div><div class='del'>-		wm8994-&gt;irq_masks_cur[i] = 0xffff;</div><div class='del'>-		wm8994-&gt;irq_masks_cache[i] = 0xffff;</div><div class='del'>-		wm8994_reg_write(wm8994, WM8994_INTERRUPT_STATUS_1_MASK + i,</div><div class='del'>-				 0xffff);</div><div class='del'>-	}</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!wm8994-&gt;irq) {</div><div class='ctx'> 		dev_warn(wm8994-&gt;dev,</div><div class='hunk'>@@ -274,30 +153,12 @@ int wm8994_irq_init(struct wm8994 *wm8994)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Register them with genirq */</div><div class='del'>-	for (cur_irq = wm8994-&gt;irq_base;</div><div class='del'>-	     cur_irq &lt; ARRAY_SIZE(wm8994_irqs) + wm8994-&gt;irq_base;</div><div class='del'>-	     cur_irq++) {</div><div class='del'>-		irq_set_chip_data(cur_irq, wm8994);</div><div class='del'>-		irq_set_chip_and_handler(cur_irq, &amp;wm8994_irq_chip,</div><div class='del'>-					 handle_edge_irq);</div><div class='del'>-		irq_set_nested_thread(cur_irq, 1);</div><div class='del'>-</div><div class='del'>-		/* ARM needs us to explicitly flag the IRQ as valid</div><div class='del'>-		 * and will set them noprobe when we do so. */</div><div class='del'>-#ifdef CONFIG_ARM</div><div class='del'>-		set_irq_flags(cur_irq, IRQF_VALID);</div><div class='del'>-#else</div><div class='del'>-		irq_set_noprobe(cur_irq);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = request_threaded_irq(wm8994-&gt;irq, NULL, wm8994_irq_thread,</div><div class='del'>-				   IRQF_TRIGGER_HIGH | IRQF_ONESHOT,</div><div class='del'>-				   "wm8994", wm8994);</div><div class='add'>+	ret = regmap_add_irq_chip(wm8994-&gt;regmap, wm8994-&gt;irq,</div><div class='add'>+				  IRQF_TRIGGER_HIGH | IRQF_ONESHOT,</div><div class='add'>+				  wm8994-&gt;irq_base, &amp;wm8994_irq_chip,</div><div class='add'>+				  &amp;wm8994-&gt;irq_data);</div><div class='ctx'> 	if (ret != 0) {</div><div class='del'>-		dev_err(wm8994-&gt;dev, "Failed to request IRQ %d: %d\n",</div><div class='del'>-			wm8994-&gt;irq, ret);</div><div class='add'>+		dev_err(wm8994-&gt;dev, "Failed to register IRQ chip: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -309,6 +170,5 @@ int wm8994_irq_init(struct wm8994 *wm8994)</div><div class='ctx'> </div><div class='ctx'> void wm8994_irq_exit(struct wm8994 *wm8994)</div><div class='ctx'> {</div><div class='del'>-	if (wm8994-&gt;irq)</div><div class='del'>-		free_irq(wm8994-&gt;irq, wm8994);</div><div class='add'>+	regmap_del_irq_chip(wm8994-&gt;irq, wm8994-&gt;irq_data);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/mfd/wm8994-regmap.c b/drivers/mfd/wm8994-regmap.c<br/>new file mode 100644<br/>index 000000000000..c598ae69b8ff<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/wm8994-regmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/wm8994-regmap.c</a></div><div class='hunk'>@@ -0,0 +1,1238 @@</div><div class='add'>+/*</div><div class='add'>+ * wm8994-regmap.c  --  Register map data for WM8994 series devices</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='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ *  under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ *  option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mfd/wm8994/core.h&gt;</div><div class='add'>+#include &lt;linux/mfd/wm8994/registers.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+#include "wm8994.h"</div><div class='add'>+</div><div class='add'>+static struct reg_default wm1811_defaults[] = {</div><div class='add'>+	{ 0x0000, 0x1811 },    /* R0    - Software Reset */</div><div class='add'>+	{ 0x0001, 0x0000 },    /* R1    - Power Management (1) */</div><div class='add'>+	{ 0x0002, 0x6000 },    /* R2    - Power Management (2) */</div><div class='add'>+	{ 0x0003, 0x0000 },    /* R3    - Power Management (3) */</div><div class='add'>+	{ 0x0004, 0x0000 },    /* R4    - Power Management (4) */</div><div class='add'>+	{ 0x0005, 0x0000 },    /* R5    - Power Management (5) */</div><div class='add'>+	{ 0x0006, 0x0000 },    /* R6    - Power Management (6) */</div><div class='add'>+	{ 0x0015, 0x0000 },    /* R21   - Input Mixer (1) */</div><div class='add'>+	{ 0x0018, 0x008B },    /* R24   - Left Line Input 1&amp;2 Volume */</div><div class='add'>+	{ 0x0019, 0x008B },    /* R25   - Left Line Input 3&amp;4 Volume */</div><div class='add'>+	{ 0x001A, 0x008B },    /* R26   - Right Line Input 1&amp;2 Volume */</div><div class='add'>+	{ 0x001B, 0x008B },    /* R27   - Right Line Input 3&amp;4 Volume */</div><div class='add'>+	{ 0x001C, 0x006D },    /* R28   - Left Output Volume */</div><div class='add'>+	{ 0x001D, 0x006D },    /* R29   - Right Output Volume */</div><div class='add'>+	{ 0x001E, 0x0066 },    /* R30   - Line Outputs Volume */</div><div class='add'>+	{ 0x001F, 0x0020 },    /* R31   - HPOUT2 Volume */</div><div class='add'>+	{ 0x0020, 0x0079 },    /* R32   - Left OPGA Volume */</div><div class='add'>+	{ 0x0021, 0x0079 },    /* R33   - Right OPGA Volume */</div><div class='add'>+	{ 0x0022, 0x0003 },    /* R34   - SPKMIXL Attenuation */</div><div class='add'>+	{ 0x0023, 0x0003 },    /* R35   - SPKMIXR Attenuation */</div><div class='add'>+	{ 0x0024, 0x0011 },    /* R36   - SPKOUT Mixers */</div><div class='add'>+	{ 0x0025, 0x0140 },    /* R37   - ClassD */</div><div class='add'>+	{ 0x0026, 0x0079 },    /* R38   - Speaker Volume Left */</div><div class='add'>+	{ 0x0027, 0x0079 },    /* R39   - Speaker Volume Right */</div><div class='add'>+	{ 0x0028, 0x0000 },    /* R40   - Input Mixer (2) */</div><div class='add'>+	{ 0x0029, 0x0000 },    /* R41   - Input Mixer (3) */</div><div class='add'>+	{ 0x002A, 0x0000 },    /* R42   - Input Mixer (4) */</div><div class='add'>+	{ 0x002B, 0x0000 },    /* R43   - Input Mixer (5) */</div><div class='add'>+	{ 0x002C, 0x0000 },    /* R44   - Input Mixer (6) */</div><div class='add'>+	{ 0x002D, 0x0000 },    /* R45   - Output Mixer (1) */</div><div class='add'>+	{ 0x002E, 0x0000 },    /* R46   - Output Mixer (2) */</div><div class='add'>+	{ 0x002F, 0x0000 },    /* R47   - Output Mixer (3) */</div><div class='add'>+	{ 0x0030, 0x0000 },    /* R48   - Output Mixer (4) */</div><div class='add'>+	{ 0x0031, 0x0000 },    /* R49   - Output Mixer (5) */</div><div class='add'>+	{ 0x0032, 0x0000 },    /* R50   - Output Mixer (6) */</div><div class='add'>+	{ 0x0033, 0x0000 },    /* R51   - HPOUT2 Mixer */</div><div class='add'>+	{ 0x0034, 0x0000 },    /* R52   - Line Mixer (1) */</div><div class='add'>+	{ 0x0035, 0x0000 },    /* R53   - Line Mixer (2) */</div><div class='add'>+	{ 0x0036, 0x0000 },    /* R54   - Speaker Mixer */</div><div class='add'>+	{ 0x0037, 0x0000 },    /* R55   - Additional Control */</div><div class='add'>+	{ 0x0038, 0x0000 },    /* R56   - AntiPOP (1) */</div><div class='add'>+	{ 0x0039, 0x0180 },    /* R57   - AntiPOP (2) */</div><div class='add'>+	{ 0x003B, 0x000D },    /* R59   - LDO 1 */</div><div class='add'>+	{ 0x003C, 0x0003 },    /* R60   - LDO 2 */</div><div class='add'>+	{ 0x003D, 0x0039 },    /* R61   - MICBIAS1 */</div><div class='add'>+	{ 0x003E, 0x0039 },    /* R62   - MICBIAS2 */</div><div class='add'>+	{ 0x004C, 0x1F25 },    /* R76   - Charge Pump (1) */</div><div class='add'>+	{ 0x004D, 0xAB19 },    /* R77   - Charge Pump (2) */</div><div class='add'>+	{ 0x0051, 0x0004 },    /* R81   - Class W (1) */</div><div class='add'>+	{ 0x0054, 0x0000 },    /* R84   - DC Servo (1) */</div><div class='add'>+	{ 0x0055, 0x054A },    /* R85   - DC Servo (2) */</div><div class='add'>+	{ 0x0058, 0x0000 },    /* R88   - DC Servo Readback */</div><div class='add'>+	{ 0x0059, 0x0000 },    /* R89   - DC Servo (4) */</div><div class='add'>+	{ 0x0060, 0x0000 },    /* R96   - Analogue HP (1) */</div><div class='add'>+	{ 0x00C5, 0x0000 },    /* R197  - Class D Test (5) */</div><div class='add'>+	{ 0x00D0, 0x7600 },    /* R208  - Mic Detect 1 */</div><div class='add'>+	{ 0x00D1, 0x007F },    /* R209  - Mic Detect 2 */</div><div class='add'>+	{ 0x00D2, 0x0000 },    /* R210  - Mic Detect 3 */</div><div class='add'>+	{ 0x0100, 0x0100 },    /* R256  - Chip Revision */</div><div class='add'>+	{ 0x0101, 0x8004 },    /* R257  - Control Interface */</div><div class='add'>+	{ 0x0200, 0x0000 },    /* R512  - AIF1 Clocking (1) */</div><div class='add'>+	{ 0x0201, 0x0000 },    /* R513  - AIF1 Clocking (2) */</div><div class='add'>+	{ 0x0204, 0x0000 },    /* R516  - AIF2 Clocking (1) */</div><div class='add'>+	{ 0x0205, 0x0000 },    /* R517  - AIF2 Clocking (2) */</div><div class='add'>+	{ 0x0208, 0x0000 },    /* R520  - Clocking (1) */</div><div class='add'>+	{ 0x0209, 0x0000 },    /* R521  - Clocking (2) */</div><div class='add'>+	{ 0x0210, 0x0083 },    /* R528  - AIF1 Rate */</div><div class='add'>+	{ 0x0211, 0x0083 },    /* R529  - AIF2 Rate */</div><div class='add'>+	{ 0x0212, 0x0000 },    /* R530  - Rate Status */</div><div class='add'>+	{ 0x0220, 0x0000 },    /* R544  - FLL1 Control (1) */</div><div class='add'>+	{ 0x0221, 0x0000 },    /* R545  - FLL1 Control (2) */</div><div class='add'>+	{ 0x0222, 0x0000 },    /* R546  - FLL1 Control (3) */</div><div class='add'>+	{ 0x0223, 0x0000 },    /* R547  - FLL1 Control (4) */</div><div class='add'>+	{ 0x0224, 0x0C80 },    /* R548  - FLL1 Control (5) */</div><div class='add'>+	{ 0x0226, 0x0000 },    /* R550  - FLL1 EFS 1 */</div><div class='add'>+	{ 0x0227, 0x0006 },    /* R551  - FLL1 EFS 2 */</div><div class='add'>+	{ 0x0240, 0x0000 },    /* R576  - FLL2Control (1) */</div><div class='add'>+	{ 0x0241, 0x0000 },    /* R577  - FLL2Control (2) */</div><div class='add'>+	{ 0x0242, 0x0000 },    /* R578  - FLL2Control (3) */</div><div class='add'>+	{ 0x0243, 0x0000 },    /* R579  - FLL2 Control (4) */</div><div class='add'>+	{ 0x0244, 0x0C80 },    /* R580  - FLL2Control (5) */</div><div class='add'>+	{ 0x0246, 0x0000 },    /* R582  - FLL2 EFS 1 */</div><div class='add'>+	{ 0x0247, 0x0006 },    /* R583  - FLL2 EFS 2 */</div><div class='add'>+	{ 0x0300, 0x4050 },    /* R768  - AIF1 Control (1) */</div><div class='add'>+	{ 0x0301, 0x4000 },    /* R769  - AIF1 Control (2) */</div><div class='add'>+	{ 0x0302, 0x0000 },    /* R770  - AIF1 Master/Slave */</div><div class='add'>+	{ 0x0303, 0x0040 },    /* R771  - AIF1 BCLK */</div><div class='add'>+	{ 0x0304, 0x0040 },    /* R772  - AIF1ADC LRCLK */</div><div class='add'>+	{ 0x0305, 0x0040 },    /* R773  - AIF1DAC LRCLK */</div><div class='add'>+	{ 0x0306, 0x0004 },    /* R774  - AIF1DAC Data */</div><div class='add'>+	{ 0x0307, 0x0100 },    /* R775  - AIF1ADC Data */</div><div class='add'>+	{ 0x0310, 0x4050 },    /* R784  - AIF2 Control (1) */</div><div class='add'>+	{ 0x0311, 0x4000 },    /* R785  - AIF2 Control (2) */</div><div class='add'>+	{ 0x0312, 0x0000 },    /* R786  - AIF2 Master/Slave */</div><div class='add'>+	{ 0x0313, 0x0040 },    /* R787  - AIF2 BCLK */</div><div class='add'>+	{ 0x0314, 0x0040 },    /* R788  - AIF2ADC LRCLK */</div><div class='add'>+	{ 0x0315, 0x0040 },    /* R789  - AIF2DAC LRCLK */</div><div class='add'>+	{ 0x0316, 0x0000 },    /* R790  - AIF2DAC Data */</div><div class='add'>+	{ 0x0317, 0x0000 },    /* R791  - AIF2ADC Data */</div><div class='add'>+	{ 0x0318, 0x0003 },    /* R792  - AIF2TX Control */</div><div class='add'>+	{ 0x0320, 0x0040 },    /* R800  - AIF3 Control (1) */</div><div class='add'>+	{ 0x0321, 0x0000 },    /* R801  - AIF3 Control (2) */</div><div class='add'>+	{ 0x0322, 0x0000 },    /* R802  - AIF3DAC Data */</div><div class='add'>+	{ 0x0323, 0x0000 },    /* R803  - AIF3ADC Data */</div><div class='add'>+	{ 0x0400, 0x00C0 },    /* R1024 - AIF1 ADC1 Left Volume */</div><div class='add'>+	{ 0x0401, 0x00C0 },    /* R1025 - AIF1 ADC1 Right Volume */</div><div class='add'>+	{ 0x0402, 0x00C0 },    /* R1026 - AIF1 DAC1 Left Volume */</div><div class='add'>+	{ 0x0403, 0x00C0 },    /* R1027 - AIF1 DAC1 Right Volume */</div><div class='add'>+	{ 0x0410, 0x0000 },    /* R1040 - AIF1 ADC1 Filters */</div><div class='add'>+	{ 0x0420, 0x0200 },    /* R1056 - AIF1 DAC1 Filters (1) */</div><div class='add'>+	{ 0x0421, 0x0010 },    /* R1057 - AIF1 DAC1 Filters (2) */</div><div class='add'>+	{ 0x0430, 0x0068 },    /* R1072 - AIF1 DAC1 Noise Gate */</div><div class='add'>+	{ 0x0440, 0x0098 },    /* R1088 - AIF1 DRC1 (1) */</div><div class='add'>+	{ 0x0441, 0x0845 },    /* R1089 - AIF1 DRC1 (2) */</div><div class='add'>+	{ 0x0442, 0x0000 },    /* R1090 - AIF1 DRC1 (3) */</div><div class='add'>+	{ 0x0443, 0x0000 },    /* R1091 - AIF1 DRC1 (4) */</div><div class='add'>+	{ 0x0444, 0x0000 },    /* R1092 - AIF1 DRC1 (5) */</div><div class='add'>+	{ 0x0480, 0x6318 },    /* R1152 - AIF1 DAC1 EQ Gains (1) */</div><div class='add'>+	{ 0x0481, 0x6300 },    /* R1153 - AIF1 DAC1 EQ Gains (2) */</div><div class='add'>+	{ 0x0482, 0x0FCA },    /* R1154 - AIF1 DAC1 EQ Band 1 A */</div><div class='add'>+	{ 0x0483, 0x0400 },    /* R1155 - AIF1 DAC1 EQ Band 1 B */</div><div class='add'>+	{ 0x0484, 0x00D8 },    /* R1156 - AIF1 DAC1 EQ Band 1 PG */</div><div class='add'>+	{ 0x0485, 0x1EB5 },    /* R1157 - AIF1 DAC1 EQ Band 2 A */</div><div class='add'>+	{ 0x0486, 0xF145 },    /* R1158 - AIF1 DAC1 EQ Band 2 B */</div><div class='add'>+	{ 0x0487, 0x0B75 },    /* R1159 - AIF1 DAC1 EQ Band 2 C */</div><div class='add'>+	{ 0x0488, 0x01C5 },    /* R1160 - AIF1 DAC1 EQ Band 2 PG */</div><div class='add'>+	{ 0x0489, 0x1C58 },    /* R1161 - AIF1 DAC1 EQ Band 3 A */</div><div class='add'>+	{ 0x048A, 0xF373 },    /* R1162 - AIF1 DAC1 EQ Band 3 B */</div><div class='add'>+	{ 0x048B, 0x0A54 },    /* R1163 - AIF1 DAC1 EQ Band 3 C */</div><div class='add'>+	{ 0x048C, 0x0558 },    /* R1164 - AIF1 DAC1 EQ Band 3 PG */</div><div class='add'>+	{ 0x048D, 0x168E },    /* R1165 - AIF1 DAC1 EQ Band 4 A */</div><div class='add'>+	{ 0x048E, 0xF829 },    /* R1166 - AIF1 DAC1 EQ Band 4 B */</div><div class='add'>+	{ 0x048F, 0x07AD },    /* R1167 - AIF1 DAC1 EQ Band 4 C */</div><div class='add'>+	{ 0x0490, 0x1103 },    /* R1168 - AIF1 DAC1 EQ Band 4 PG */</div><div class='add'>+	{ 0x0491, 0x0564 },    /* R1169 - AIF1 DAC1 EQ Band 5 A */</div><div class='add'>+	{ 0x0492, 0x0559 },    /* R1170 - AIF1 DAC1 EQ Band 5 B */</div><div class='add'>+	{ 0x0493, 0x4000 },    /* R1171 - AIF1 DAC1 EQ Band 5 PG */</div><div class='add'>+	{ 0x0494, 0x0000 },    /* R1172 - AIF1 DAC1 EQ Band 1 C */</div><div class='add'>+	{ 0x0500, 0x00C0 },    /* R1280 - AIF2 ADC Left Volume */</div><div class='add'>+	{ 0x0501, 0x00C0 },    /* R1281 - AIF2 ADC Right Volume */</div><div class='add'>+	{ 0x0502, 0x00C0 },    /* R1282 - AIF2 DAC Left Volume */</div><div class='add'>+	{ 0x0503, 0x00C0 },    /* R1283 - AIF2 DAC Right Volume */</div><div class='add'>+	{ 0x0510, 0x0000 },    /* R1296 - AIF2 ADC Filters */</div><div class='add'>+	{ 0x0520, 0x0200 },    /* R1312 - AIF2 DAC Filters (1) */</div><div class='add'>+	{ 0x0521, 0x0010 },    /* R1313 - AIF2 DAC Filters (2) */</div><div class='add'>+	{ 0x0530, 0x0068 },    /* R1328 - AIF2 DAC Noise Gate */</div><div class='add'>+	{ 0x0540, 0x0098 },    /* R1344 - AIF2 DRC (1) */</div><div class='add'>+	{ 0x0541, 0x0845 },    /* R1345 - AIF2 DRC (2) */</div><div class='add'>+	{ 0x0542, 0x0000 },    /* R1346 - AIF2 DRC (3) */</div><div class='add'>+	{ 0x0543, 0x0000 },    /* R1347 - AIF2 DRC (4) */</div><div class='add'>+	{ 0x0544, 0x0000 },    /* R1348 - AIF2 DRC (5) */</div><div class='add'>+	{ 0x0580, 0x6318 },    /* R1408 - AIF2 EQ Gains (1) */</div><div class='add'>+	{ 0x0581, 0x6300 },    /* R1409 - AIF2 EQ Gains (2) */</div><div class='add'>+	{ 0x0582, 0x0FCA },    /* R1410 - AIF2 EQ Band 1 A */</div><div class='add'>+	{ 0x0583, 0x0400 },    /* R1411 - AIF2 EQ Band 1 B */</div><div class='add'>+	{ 0x0584, 0x00D8 },    /* R1412 - AIF2 EQ Band 1 PG */</div><div class='add'>+	{ 0x0585, 0x1EB5 },    /* R1413 - AIF2 EQ Band 2 A */</div><div class='add'>+	{ 0x0586, 0xF145 },    /* R1414 - AIF2 EQ Band 2 B */</div><div class='add'>+	{ 0x0587, 0x0B75 },    /* R1415 - AIF2 EQ Band 2 C */</div><div class='add'>+	{ 0x0588, 0x01C5 },    /* R1416 - AIF2 EQ Band 2 PG */</div><div class='add'>+	{ 0x0589, 0x1C58 },    /* R1417 - AIF2 EQ Band 3 A */</div><div class='add'>+	{ 0x058A, 0xF373 },    /* R1418 - AIF2 EQ Band 3 B */</div><div class='add'>+	{ 0x058B, 0x0A54 },    /* R1419 - AIF2 EQ Band 3 C */</div><div class='add'>+	{ 0x058C, 0x0558 },    /* R1420 - AIF2 EQ Band 3 PG */</div><div class='add'>+	{ 0x058D, 0x168E },    /* R1421 - AIF2 EQ Band 4 A */</div><div class='add'>+	{ 0x058E, 0xF829 },    /* R1422 - AIF2 EQ Band 4 B */</div><div class='add'>+	{ 0x058F, 0x07AD },    /* R1423 - AIF2 EQ Band 4 C */</div><div class='add'>+	{ 0x0590, 0x1103 },    /* R1424 - AIF2 EQ Band 4 PG */</div><div class='add'>+	{ 0x0591, 0x0564 },    /* R1425 - AIF2 EQ Band 5 A */</div><div class='add'>+	{ 0x0592, 0x0559 },    /* R1426 - AIF2 EQ Band 5 B */</div><div class='add'>+	{ 0x0593, 0x4000 },    /* R1427 - AIF2 EQ Band 5 PG */</div><div class='add'>+	{ 0x0594, 0x0000 },    /* R1428 - AIF2 EQ Band 1 C */</div><div class='add'>+	{ 0x0600, 0x0000 },    /* R1536 - DAC1 Mixer Volumes */</div><div class='add'>+	{ 0x0601, 0x0000 },    /* R1537 - DAC1 Left Mixer Routing */</div><div class='add'>+	{ 0x0602, 0x0000 },    /* R1538 - DAC1 Right Mixer Routing */</div><div class='add'>+	{ 0x0603, 0x0000 },    /* R1539 - AIF2ADC Mixer Volumes */</div><div class='add'>+	{ 0x0604, 0x0000 },    /* R1540 - AIF2ADC Left Mixer Routing */</div><div class='add'>+	{ 0x0605, 0x0000 },    /* R1541 - AIF2ADC Right Mixer Routing */</div><div class='add'>+	{ 0x0606, 0x0000 },    /* R1542 - AIF1 ADC1 Left Mixer Routing */</div><div class='add'>+	{ 0x0607, 0x0000 },    /* R1543 - AIF1 ADC1 Right Mixer Routing */</div><div class='add'>+	{ 0x0610, 0x02C0 },    /* R1552 - DAC1 Left Volume */</div><div class='add'>+	{ 0x0611, 0x02C0 },    /* R1553 - DAC1 Right Volume */</div><div class='add'>+	{ 0x0612, 0x02C0 },    /* R1554 - AIF2TX Left Volume */</div><div class='add'>+	{ 0x0613, 0x02C0 },    /* R1555 - AIF2TX Right Volume */</div><div class='add'>+	{ 0x0614, 0x0000 },    /* R1556 - DAC Softmute */</div><div class='add'>+	{ 0x0620, 0x0002 },    /* R1568 - Oversampling */</div><div class='add'>+	{ 0x0621, 0x0000 },    /* R1569 - Sidetone */</div><div class='add'>+	{ 0x0700, 0x8100 },    /* R1792 - GPIO 1 */</div><div class='add'>+	{ 0x0701, 0xA101 },    /* R1793 - Pull Control (MCLK2) */</div><div class='add'>+	{ 0x0702, 0xA101 },    /* R1794 - Pull Control (BCLK2) */</div><div class='add'>+	{ 0x0703, 0xA101 },    /* R1795 - Pull Control (DACLRCLK2) */</div><div class='add'>+	{ 0x0704, 0xA101 },    /* R1796 - Pull Control (DACDAT2) */</div><div class='add'>+	{ 0x0707, 0xA101 },    /* R1799 - GPIO 8 */</div><div class='add'>+	{ 0x0708, 0xA101 },    /* R1800 - GPIO 9 */</div><div class='add'>+	{ 0x0709, 0xA101 },    /* R1801 - GPIO 10 */</div><div class='add'>+	{ 0x070A, 0xA101 },    /* R1802 - GPIO 11 */</div><div class='add'>+	{ 0x0720, 0x0000 },    /* R1824 - Pull Control (1) */</div><div class='add'>+	{ 0x0721, 0x0156 },    /* R1825 - Pull Control (2) */</div><div class='add'>+	{ 0x0730, 0x0000 },    /* R1840 - Interrupt Status 1 */</div><div class='add'>+	{ 0x0731, 0x0000 },    /* R1841 - Interrupt Status 2 */</div><div class='add'>+	{ 0x0732, 0x0000 },    /* R1842 - Interrupt Raw Status 2 */</div><div class='add'>+	{ 0x0738, 0x07FF },    /* R1848 - Interrupt Status 1 Mask */</div><div class='add'>+	{ 0x0739, 0xDFEF },    /* R1849 - Interrupt Status 2 Mask */</div><div class='add'>+	{ 0x0740, 0x0000 },    /* R1856 - Interrupt Control */</div><div class='add'>+	{ 0x0748, 0x003F },    /* R1864 - IRQ Debounce */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct reg_default wm8994_defaults[] = {</div><div class='add'>+	{ 0x0000, 0x8994 },    /* R0     - Software Reset */ </div><div class='add'>+	{ 0x0001, 0x0000 },    /* R1     - Power Management (1) */ </div><div class='add'>+	{ 0x0002, 0x6000 },    /* R2     - Power Management (2) */ </div><div class='add'>+	{ 0x0003, 0x0000 },    /* R3     - Power Management (3) */ </div><div class='add'>+	{ 0x0004, 0x0000 },    /* R4     - Power Management (4) */ </div><div class='add'>+	{ 0x0005, 0x0000 },    /* R5     - Power Management (5) */ </div><div class='add'>+	{ 0x0006, 0x0000 },    /* R6     - Power Management (6) */ </div><div class='add'>+	{ 0x0015, 0x0000 },    /* R21    - Input Mixer (1) */ </div><div class='add'>+	{ 0x0018, 0x008B },    /* R24    - Left Line Input 1&amp;2 Volume */ </div><div class='add'>+	{ 0x0019, 0x008B },    /* R25    - Left Line Input 3&amp;4 Volume */ </div><div class='add'>+	{ 0x001A, 0x008B },    /* R26    - Right Line Input 1&amp;2 Volume */ </div><div class='add'>+	{ 0x001B, 0x008B },    /* R27    - Right Line Input 3&amp;4 Volume */ </div><div class='add'>+	{ 0x001C, 0x006D },    /* R28    - Left Output Volume */ </div><div class='add'>+	{ 0x001D, 0x006D },    /* R29    - Right Output Volume */ </div><div class='add'>+	{ 0x001E, 0x0066 },    /* R30    - Line Outputs Volume */ </div><div class='add'>+	{ 0x001F, 0x0020 },    /* R31    - HPOUT2 Volume */ </div><div class='add'>+	{ 0x0020, 0x0079 },    /* R32    - Left OPGA Volume */ </div><div class='add'>+	{ 0x0021, 0x0079 },    /* R33    - Right OPGA Volume */ </div><div class='add'>+	{ 0x0022, 0x0003 },    /* R34    - SPKMIXL Attenuation */ </div><div class='add'>+	{ 0x0023, 0x0003 },    /* R35    - SPKMIXR Attenuation */ </div><div class='add'>+	{ 0x0024, 0x0011 },    /* R36    - SPKOUT Mixers */ </div><div class='add'>+	{ 0x0025, 0x0140 },    /* R37    - ClassD */ </div><div class='add'>+	{ 0x0026, 0x0079 },    /* R38    - Speaker Volume Left */ </div><div class='add'>+	{ 0x0027, 0x0079 },    /* R39    - Speaker Volume Right */ </div><div class='add'>+	{ 0x0028, 0x0000 },    /* R40    - Input Mixer (2) */ </div><div class='add'>+	{ 0x0029, 0x0000 },    /* R41    - Input Mixer (3) */ </div><div class='add'>+	{ 0x002A, 0x0000 },    /* R42    - Input Mixer (4) */ </div><div class='add'>+	{ 0x002B, 0x0000 },    /* R43    - Input Mixer (5) */ </div><div class='add'>+	{ 0x002C, 0x0000 },    /* R44    - Input Mixer (6) */ </div><div class='add'>+	{ 0x002D, 0x0000 },    /* R45    - Output Mixer (1) */ </div><div class='add'>+	{ 0x002E, 0x0000 },    /* R46    - Output Mixer (2) */ </div><div class='add'>+	{ 0x002F, 0x0000 },    /* R47    - Output Mixer (3) */ </div><div class='add'>+	{ 0x0030, 0x0000 },    /* R48    - Output Mixer (4) */ </div><div class='add'>+	{ 0x0031, 0x0000 },    /* R49    - Output Mixer (5) */ </div><div class='add'>+	{ 0x0032, 0x0000 },    /* R50    - Output Mixer (6) */ </div><div class='add'>+	{ 0x0033, 0x0000 },    /* R51    - HPOUT2 Mixer */ </div><div class='add'>+	{ 0x0034, 0x0000 },    /* R52    - Line Mixer (1) */ </div><div class='add'>+	{ 0x0035, 0x0000 },    /* R53    - Line Mixer (2) */ </div><div class='add'>+	{ 0x0036, 0x0000 },    /* R54    - Speaker Mixer */ </div><div class='add'>+	{ 0x0037, 0x0000 },    /* R55    - Additional Control */ </div><div class='add'>+	{ 0x0038, 0x0000 },    /* R56    - AntiPOP (1) */ </div><div class='add'>+	{ 0x0039, 0x0000 },    /* R57    - AntiPOP (2) */ </div><div class='add'>+	{ 0x003A, 0x0000 },    /* R58    - MICBIAS */ </div><div class='add'>+	{ 0x003B, 0x000D },    /* R59    - LDO 1 */ </div><div class='add'>+	{ 0x003C, 0x0003 },    /* R60    - LDO 2 */ </div><div class='add'>+	{ 0x004C, 0x1F25 },    /* R76    - Charge Pump (1) */ </div><div class='add'>+	{ 0x0051, 0x0004 },    /* R81    - Class W (1) */ </div><div class='add'>+	{ 0x0054, 0x0000 },    /* R84    - DC Servo (1) */ </div><div class='add'>+	{ 0x0055, 0x054A },    /* R85    - DC Servo (2) */ </div><div class='add'>+	{ 0x0057, 0x0000 },    /* R87    - DC Servo (4) */ </div><div class='add'>+	{ 0x0058, 0x0000 },    /* R88    - DC Servo Readback */ </div><div class='add'>+	{ 0x0060, 0x0000 },    /* R96    - Analogue HP (1) */ </div><div class='add'>+	{ 0x0100, 0x0003 },    /* R256   - Chip Revision */ </div><div class='add'>+	{ 0x0101, 0x8004 },    /* R257   - Control Interface */ </div><div class='add'>+	{ 0x0110, 0x0000 },    /* R272   - Write Sequencer Ctrl (1) */ </div><div class='add'>+	{ 0x0111, 0x0000 },    /* R273   - Write Sequencer Ctrl (2) */ </div><div class='add'>+	{ 0x0200, 0x0000 },    /* R512   - AIF1 Clocking (1) */ </div><div class='add'>+	{ 0x0201, 0x0000 },    /* R513   - AIF1 Clocking (2) */ </div><div class='add'>+	{ 0x0204, 0x0000 },    /* R516   - AIF2 Clocking (1) */ </div><div class='add'>+	{ 0x0205, 0x0000 },    /* R517   - AIF2 Clocking (2) */ </div><div class='add'>+	{ 0x0208, 0x0000 },    /* R520   - Clocking (1) */ </div><div class='add'>+	{ 0x0209, 0x0000 },    /* R521   - Clocking (2) */ </div><div class='add'>+	{ 0x0210, 0x0083 },    /* R528   - AIF1 Rate */ </div><div class='add'>+	{ 0x0211, 0x0083 },    /* R529   - AIF2 Rate */ </div><div class='add'>+	{ 0x0212, 0x0000 },    /* R530   - Rate Status */ </div><div class='add'>+	{ 0x0220, 0x0000 },    /* R544   - FLL1 Control (1) */ </div><div class='add'>+	{ 0x0221, 0x0000 },    /* R545   - FLL1 Control (2) */ </div><div class='add'>+	{ 0x0222, 0x0000 },    /* R546   - FLL1 Control (3) */ </div><div class='add'>+	{ 0x0223, 0x0000 },    /* R547   - FLL1 Control (4) */ </div><div class='add'>+	{ 0x0224, 0x0C80 },    /* R548   - FLL1 Control (5) */ </div><div class='add'>+	{ 0x0240, 0x0000 },    /* R576   - FLL2 Control (1) */ </div><div class='add'>+	{ 0x0241, 0x0000 },    /* R577   - FLL2 Control (2) */ </div><div class='add'>+	{ 0x0242, 0x0000 },    /* R578   - FLL2 Control (3) */ </div><div class='add'>+	{ 0x0243, 0x0000 },    /* R579   - FLL2 Control (4) */ </div><div class='add'>+	{ 0x0244, 0x0C80 },    /* R580   - FLL2 Control (5) */ </div><div class='add'>+	{ 0x0300, 0x4050 },    /* R768   - AIF1 Control (1) */ </div><div class='add'>+	{ 0x0301, 0x4000 },    /* R769   - AIF1 Control (2) */ </div><div class='add'>+	{ 0x0302, 0x0000 },    /* R770   - AIF1 Master/Slave */ </div><div class='add'>+	{ 0x0303, 0x0040 },    /* R771   - AIF1 BCLK */ </div><div class='add'>+	{ 0x0304, 0x0040 },    /* R772   - AIF1ADC LRCLK */ </div><div class='add'>+	{ 0x0305, 0x0040 },    /* R773   - AIF1DAC LRCLK */ </div><div class='add'>+	{ 0x0306, 0x0004 },    /* R774   - AIF1DAC Data */ </div><div class='add'>+	{ 0x0307, 0x0100 },    /* R775   - AIF1ADC Data */ </div><div class='add'>+	{ 0x0310, 0x4050 },    /* R784   - AIF2 Control (1) */ </div><div class='add'>+	{ 0x0311, 0x4000 },    /* R785   - AIF2 Control (2) */ </div><div class='add'>+	{ 0x0312, 0x0000 },    /* R786   - AIF2 Master/Slave */ </div><div class='add'>+	{ 0x0313, 0x0040 },    /* R787   - AIF2 BCLK */ </div><div class='add'>+	{ 0x0314, 0x0040 },    /* R788   - AIF2ADC LRCLK */ </div><div class='add'>+	{ 0x0315, 0x0040 },    /* R789   - AIF2DAC LRCLK */ </div><div class='add'>+	{ 0x0316, 0x0000 },    /* R790   - AIF2DAC Data */ </div><div class='add'>+	{ 0x0317, 0x0000 },    /* R791   - AIF2ADC Data */ </div><div class='add'>+	{ 0x0400, 0x00C0 },    /* R1024  - AIF1 ADC1 Left Volume */ </div><div class='add'>+	{ 0x0401, 0x00C0 },    /* R1025  - AIF1 ADC1 Right Volume */ </div><div class='add'>+	{ 0x0402, 0x00C0 },    /* R1026  - AIF1 DAC1 Left Volume */ </div><div class='add'>+	{ 0x0403, 0x00C0 },    /* R1027  - AIF1 DAC1 Right Volume */ </div><div class='add'>+	{ 0x0404, 0x00C0 },    /* R1028  - AIF1 ADC2 Left Volume */ </div><div class='add'>+	{ 0x0405, 0x00C0 },    /* R1029  - AIF1 ADC2 Right Volume */ </div><div class='add'>+	{ 0x0406, 0x00C0 },    /* R1030  - AIF1 DAC2 Left Volume */ </div><div class='add'>+	{ 0x0407, 0x00C0 },    /* R1031  - AIF1 DAC2 Right Volume */ </div><div class='add'>+	{ 0x0410, 0x0000 },    /* R1040  - AIF1 ADC1 Filters */ </div><div class='add'>+	{ 0x0411, 0x0000 },    /* R1041  - AIF1 ADC2 Filters */ </div><div class='add'>+	{ 0x0420, 0x0200 },    /* R1056  - AIF1 DAC1 Filters (1) */ </div><div class='add'>+	{ 0x0421, 0x0010 },    /* R1057  - AIF1 DAC1 Filters (2) */ </div><div class='add'>+	{ 0x0422, 0x0200 },    /* R1058  - AIF1 DAC2 Filters (1) */ </div><div class='add'>+	{ 0x0423, 0x0010 },    /* R1059  - AIF1 DAC2 Filters (2) */ </div><div class='add'>+	{ 0x0440, 0x0098 },    /* R1088  - AIF1 DRC1 (1) */ </div><div class='add'>+	{ 0x0441, 0x0845 },    /* R1089  - AIF1 DRC1 (2) */ </div><div class='add'>+	{ 0x0442, 0x0000 },    /* R1090  - AIF1 DRC1 (3) */ </div><div class='add'>+	{ 0x0443, 0x0000 },    /* R1091  - AIF1 DRC1 (4) */ </div><div class='add'>+	{ 0x0444, 0x0000 },    /* R1092  - AIF1 DRC1 (5) */ </div><div class='add'>+	{ 0x0450, 0x0098 },    /* R1104  - AIF1 DRC2 (1) */ </div><div class='add'>+	{ 0x0451, 0x0845 },    /* R1105  - AIF1 DRC2 (2) */ </div><div class='add'>+	{ 0x0452, 0x0000 },    /* R1106  - AIF1 DRC2 (3) */ </div><div class='add'>+	{ 0x0453, 0x0000 },    /* R1107  - AIF1 DRC2 (4) */ </div><div class='add'>+	{ 0x0454, 0x0000 },    /* R1108  - AIF1 DRC2 (5) */ </div><div class='add'>+	{ 0x0480, 0x6318 },    /* R1152  - AIF1 DAC1 EQ Gains (1) */ </div><div class='add'>+	{ 0x0481, 0x6300 },    /* R1153  - AIF1 DAC1 EQ Gains (2) */ </div><div class='add'>+	{ 0x0482, 0x0FCA },    /* R1154  - AIF1 DAC1 EQ Band 1 A */ </div><div class='add'>+	{ 0x0483, 0x0400 },    /* R1155  - AIF1 DAC1 EQ Band 1 B */ </div><div class='add'>+	{ 0x0484, 0x00D8 },    /* R1156  - AIF1 DAC1 EQ Band 1 PG */ </div><div class='add'>+	{ 0x0485, 0x1EB5 },    /* R1157  - AIF1 DAC1 EQ Band 2 A */ </div><div class='add'>+	{ 0x0486, 0xF145 },    /* R1158  - AIF1 DAC1 EQ Band 2 B */ </div><div class='add'>+	{ 0x0487, 0x0B75 },    /* R1159  - AIF1 DAC1 EQ Band 2 C */ </div><div class='add'>+	{ 0x0488, 0x01C5 },    /* R1160  - AIF1 DAC1 EQ Band 2 PG */ </div><div class='add'>+	{ 0x0489, 0x1C58 },    /* R1161  - AIF1 DAC1 EQ Band 3 A */ </div><div class='add'>+	{ 0x048A, 0xF373 },    /* R1162  - AIF1 DAC1 EQ Band 3 B */ </div><div class='add'>+	{ 0x048B, 0x0A54 },    /* R1163  - AIF1 DAC1 EQ Band 3 C */ </div><div class='add'>+	{ 0x048C, 0x0558 },    /* R1164  - AIF1 DAC1 EQ Band 3 PG */ </div><div class='add'>+	{ 0x048D, 0x168E },    /* R1165  - AIF1 DAC1 EQ Band 4 A */ </div><div class='add'>+	{ 0x048E, 0xF829 },    /* R1166  - AIF1 DAC1 EQ Band 4 B */ </div><div class='add'>+	{ 0x048F, 0x07AD },    /* R1167  - AIF1 DAC1 EQ Band 4 C */ </div><div class='add'>+	{ 0x0490, 0x1103 },    /* R1168  - AIF1 DAC1 EQ Band 4 PG */ </div><div class='add'>+	{ 0x0491, 0x0564 },    /* R1169  - AIF1 DAC1 EQ Band 5 A */ </div><div class='add'>+	{ 0x0492, 0x0559 },    /* R1170  - AIF1 DAC1 EQ Band 5 B */ </div><div class='add'>+	{ 0x0493, 0x4000 },    /* R1171  - AIF1 DAC1 EQ Band 5 PG */ </div><div class='add'>+	{ 0x04A0, 0x6318 },    /* R1184  - AIF1 DAC2 EQ Gains (1) */ </div><div class='add'>+	{ 0x04A1, 0x6300 },    /* R1185  - AIF1 DAC2 EQ Gains (2) */ </div><div class='add'>+	{ 0x04A2, 0x0FCA },    /* R1186  - AIF1 DAC2 EQ Band 1 A */ </div><div class='add'>+	{ 0x04A3, 0x0400 },    /* R1187  - AIF1 DAC2 EQ Band 1 B */ </div><div class='add'>+	{ 0x04A4, 0x00D8 },    /* R1188  - AIF1 DAC2 EQ Band 1 PG */ </div><div class='add'>+	{ 0x04A5, 0x1EB5 },    /* R1189  - AIF1 DAC2 EQ Band 2 A */ </div><div class='add'>+	{ 0x04A6, 0xF145 },    /* R1190  - AIF1 DAC2 EQ Band 2 B */ </div><div class='add'>+	{ 0x04A7, 0x0B75 },    /* R1191  - AIF1 DAC2 EQ Band 2 C */ </div><div class='add'>+	{ 0x04A8, 0x01C5 },    /* R1192  - AIF1 DAC2 EQ Band 2 PG */ </div><div class='add'>+	{ 0x04A9, 0x1C58 },    /* R1193  - AIF1 DAC2 EQ Band 3 A */ </div><div class='add'>+	{ 0x04AA, 0xF373 },    /* R1194  - AIF1 DAC2 EQ Band 3 B */ </div><div class='add'>+	{ 0x04AB, 0x0A54 },    /* R1195  - AIF1 DAC2 EQ Band 3 C */ </div><div class='add'>+	{ 0x04AC, 0x0558 },    /* R1196  - AIF1 DAC2 EQ Band 3 PG */ </div><div class='add'>+	{ 0x04AD, 0x168E },    /* R1197  - AIF1 DAC2 EQ Band 4 A */ </div><div class='add'>+	{ 0x04AE, 0xF829 },    /* R1198  - AIF1 DAC2 EQ Band 4 B */ </div><div class='add'>+	{ 0x04AF, 0x07AD },    /* R1199  - AIF1 DAC2 EQ Band 4 C */ </div><div class='add'>+	{ 0x04B0, 0x1103 },    /* R1200  - AIF1 DAC2 EQ Band 4 PG */ </div><div class='add'>+	{ 0x04B1, 0x0564 },    /* R1201  - AIF1 DAC2 EQ Band 5 A */ </div><div class='add'>+	{ 0x04B2, 0x0559 },    /* R1202  - AIF1 DAC2 EQ Band 5 B */ </div><div class='add'>+	{ 0x04B3, 0x4000 },    /* R1203  - AIF1 DAC2 EQ Band 5 PG */ </div><div class='add'>+	{ 0x0500, 0x00C0 },    /* R1280  - AIF2 ADC Left Volume */ </div><div class='add'>+	{ 0x0501, 0x00C0 },    /* R1281  - AIF2 ADC Right Volume */ </div><div class='add'>+	{ 0x0502, 0x00C0 },    /* R1282  - AIF2 DAC Left Volume */ </div><div class='add'>+	{ 0x0503, 0x00C0 },    /* R1283  - AIF2 DAC Right Volume */ </div><div class='add'>+	{ 0x0510, 0x0000 },    /* R1296  - AIF2 ADC Filters */ </div><div class='add'>+	{ 0x0520, 0x0200 },    /* R1312  - AIF2 DAC Filters (1) */ </div><div class='add'>+	{ 0x0521, 0x0010 },    /* R1313  - AIF2 DAC Filters (2) */ </div><div class='add'>+	{ 0x0540, 0x0098 },    /* R1344  - AIF2 DRC (1) */ </div><div class='add'>+	{ 0x0541, 0x0845 },    /* R1345  - AIF2 DRC (2) */ </div><div class='add'>+	{ 0x0542, 0x0000 },    /* R1346  - AIF2 DRC (3) */ </div><div class='add'>+	{ 0x0543, 0x0000 },    /* R1347  - AIF2 DRC (4) */ </div><div class='add'>+	{ 0x0544, 0x0000 },    /* R1348  - AIF2 DRC (5) */ </div><div class='add'>+	{ 0x0580, 0x6318 },    /* R1408  - AIF2 EQ Gains (1) */ </div><div class='add'>+	{ 0x0581, 0x6300 },    /* R1409  - AIF2 EQ Gains (2) */ </div><div class='add'>+	{ 0x0582, 0x0FCA },    /* R1410  - AIF2 EQ Band 1 A */ </div><div class='add'>+	{ 0x0583, 0x0400 },    /* R1411  - AIF2 EQ Band 1 B */ </div><div class='add'>+	{ 0x0584, 0x00D8 },    /* R1412  - AIF2 EQ Band 1 PG */ </div><div class='add'>+	{ 0x0585, 0x1EB5 },    /* R1413  - AIF2 EQ Band 2 A */ </div><div class='add'>+	{ 0x0586, 0xF145 },    /* R1414  - AIF2 EQ Band 2 B */ </div><div class='add'>+	{ 0x0587, 0x0B75 },    /* R1415  - AIF2 EQ Band 2 C */ </div><div class='add'>+	{ 0x0588, 0x01C5 },    /* R1416  - AIF2 EQ Band 2 PG */ </div><div class='add'>+	{ 0x0589, 0x1C58 },    /* R1417  - AIF2 EQ Band 3 A */ </div><div class='add'>+	{ 0x058A, 0xF373 },    /* R1418  - AIF2 EQ Band 3 B */ </div><div class='add'>+	{ 0x058B, 0x0A54 },    /* R1419  - AIF2 EQ Band 3 C */ </div><div class='add'>+	{ 0x058C, 0x0558 },    /* R1420  - AIF2 EQ Band 3 PG */ </div><div class='add'>+	{ 0x058D, 0x168E },    /* R1421  - AIF2 EQ Band 4 A */ </div><div class='add'>+	{ 0x058E, 0xF829 },    /* R1422  - AIF2 EQ Band 4 B */ </div><div class='add'>+	{ 0x058F, 0x07AD },    /* R1423  - AIF2 EQ Band 4 C */ </div><div class='add'>+	{ 0x0590, 0x1103 },    /* R1424  - AIF2 EQ Band 4 PG */ </div><div class='add'>+	{ 0x0591, 0x0564 },    /* R1425  - AIF2 EQ Band 5 A */ </div><div class='add'>+	{ 0x0592, 0x0559 },    /* R1426  - AIF2 EQ Band 5 B */ </div><div class='add'>+	{ 0x0593, 0x4000 },    /* R1427  - AIF2 EQ Band 5 PG */ </div><div class='add'>+	{ 0x0600, 0x0000 },    /* R1536  - DAC1 Mixer Volumes */ </div><div class='add'>+	{ 0x0601, 0x0000 },    /* R1537  - DAC1 Left Mixer Routing */ </div><div class='add'>+	{ 0x0602, 0x0000 },    /* R1538  - DAC1 Right Mixer Routing */ </div><div class='add'>+	{ 0x0603, 0x0000 },    /* R1539  - DAC2 Mixer Volumes */ </div><div class='add'>+	{ 0x0604, 0x0000 },    /* R1540  - DAC2 Left Mixer Routing */ </div><div class='add'>+	{ 0x0605, 0x0000 },    /* R1541  - DAC2 Right Mixer Routing */ </div><div class='add'>+	{ 0x0606, 0x0000 },    /* R1542  - AIF1 ADC1 Left Mixer Routing */ </div><div class='add'>+	{ 0x0607, 0x0000 },    /* R1543  - AIF1 ADC1 Right Mixer Routing */ </div><div class='add'>+	{ 0x0608, 0x0000 },    /* R1544  - AIF1 ADC2 Left Mixer Routing */ </div><div class='add'>+	{ 0x0609, 0x0000 },    /* R1545  - AIF1 ADC2 Right mixer Routing */ </div><div class='add'>+	{ 0x0610, 0x02C0 },    /* R1552  - DAC1 Left Volume */ </div><div class='add'>+	{ 0x0611, 0x02C0 },    /* R1553  - DAC1 Right Volume */ </div><div class='add'>+	{ 0x0612, 0x02C0 },    /* R1554  - DAC2 Left Volume */ </div><div class='add'>+	{ 0x0613, 0x02C0 },    /* R1555  - DAC2 Right Volume */ </div><div class='add'>+	{ 0x0614, 0x0000 },    /* R1556  - DAC Softmute */ </div><div class='add'>+	{ 0x0620, 0x0002 },    /* R1568  - Oversampling */ </div><div class='add'>+	{ 0x0621, 0x0000 },    /* R1569  - Sidetone */ </div><div class='add'>+	{ 0x0700, 0x8100 },    /* R1792  - GPIO 1 */ </div><div class='add'>+	{ 0x0701, 0xA101 },    /* R1793  - GPIO 2 */ </div><div class='add'>+	{ 0x0702, 0xA101 },    /* R1794  - GPIO 3 */ </div><div class='add'>+	{ 0x0703, 0xA101 },    /* R1795  - GPIO 4 */ </div><div class='add'>+	{ 0x0704, 0xA101 },    /* R1796  - GPIO 5 */ </div><div class='add'>+	{ 0x0705, 0xA101 },    /* R1797  - GPIO 6 */ </div><div class='add'>+	{ 0x0706, 0xA101 },    /* R1798  - GPIO 7 */ </div><div class='add'>+	{ 0x0707, 0xA101 },    /* R1799  - GPIO 8 */ </div><div class='add'>+	{ 0x0708, 0xA101 },    /* R1800  - GPIO 9 */ </div><div class='add'>+	{ 0x0709, 0xA101 },    /* R1801  - GPIO 10 */ </div><div class='add'>+	{ 0x070A, 0xA101 },    /* R1802  - GPIO 11 */ </div><div class='add'>+	{ 0x0720, 0x0000 },    /* R1824  - Pull Control (1) */ </div><div class='add'>+	{ 0x0721, 0x0156 },    /* R1825  - Pull Control (2) */ </div><div class='add'>+	{ 0x0730, 0x0000 },    /* R1840  - Interrupt Status 1 */ </div><div class='add'>+	{ 0x0731, 0x0000 },    /* R1841  - Interrupt Status 2 */ </div><div class='add'>+	{ 0x0732, 0x0000 },    /* R1842  - Interrupt Raw Status 2 */ </div><div class='add'>+	{ 0x0738, 0x07FF },    /* R1848  - Interrupt Status 1 Mask */ </div><div class='add'>+	{ 0x0739, 0xFFFF },    /* R1849  - Interrupt Status 2 Mask */ </div><div class='add'>+	{ 0x0740, 0x0000 },    /* R1856  - Interrupt Control */ </div><div class='add'>+	{ 0x0748, 0x003F },    /* R1864  - IRQ Debounce */ </div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct reg_default wm8958_defaults[] = {</div><div class='add'>+	{ 0x0000, 0x8958 },    /* R0     - Software Reset */ </div><div class='add'>+	{ 0x0001, 0x0000 },    /* R1     - Power Management (1) */</div><div class='add'>+	{ 0x0002, 0x6000 },    /* R2     - Power Management (2) */</div><div class='add'>+	{ 0x0003, 0x0000 },    /* R3     - Power Management (3) */</div><div class='add'>+	{ 0x0004, 0x0000 },    /* R4     - Power Management (4) */</div><div class='add'>+	{ 0x0005, 0x0000 },    /* R5     - Power Management (5) */</div><div class='add'>+	{ 0x0006, 0x0000 },    /* R6     - Power Management (6) */</div><div class='add'>+	{ 0x0015, 0x0000 },    /* R21    - Input Mixer (1) */</div><div class='add'>+	{ 0x0018, 0x008B },    /* R24    - Left Line Input 1&amp;2 Volume */</div><div class='add'>+	{ 0x0019, 0x008B },    /* R25    - Left Line Input 3&amp;4 Volume */</div><div class='add'>+	{ 0x001A, 0x008B },    /* R26    - Right Line Input 1&amp;2 Volume */</div><div class='add'>+	{ 0x001B, 0x008B },    /* R27    - Right Line Input 3&amp;4 Volume */</div><div class='add'>+	{ 0x001C, 0x006D },    /* R28    - Left Output Volume */</div><div class='add'>+	{ 0x001D, 0x006D },    /* R29    - Right Output Volume */</div><div class='add'>+	{ 0x001E, 0x0066 },    /* R30    - Line Outputs Volume */</div><div class='add'>+	{ 0x001F, 0x0020 },    /* R31    - HPOUT2 Volume */</div><div class='add'>+	{ 0x0020, 0x0079 },    /* R32    - Left OPGA Volume */</div><div class='add'>+	{ 0x0021, 0x0079 },    /* R33    - Right OPGA Volume */</div><div class='add'>+	{ 0x0022, 0x0003 },    /* R34    - SPKMIXL Attenuation */</div><div class='add'>+	{ 0x0023, 0x0003 },    /* R35    - SPKMIXR Attenuation */</div><div class='add'>+	{ 0x0024, 0x0011 },    /* R36    - SPKOUT Mixers */</div><div class='add'>+	{ 0x0025, 0x0140 },    /* R37    - ClassD */</div><div class='add'>+	{ 0x0026, 0x0079 },    /* R38    - Speaker Volume Left */</div><div class='add'>+	{ 0x0027, 0x0079 },    /* R39    - Speaker Volume Right */</div><div class='add'>+	{ 0x0028, 0x0000 },    /* R40    - Input Mixer (2) */</div><div class='add'>+	{ 0x0029, 0x0000 },    /* R41    - Input Mixer (3) */</div><div class='add'>+	{ 0x002A, 0x0000 },    /* R42    - Input Mixer (4) */</div><div class='add'>+	{ 0x002B, 0x0000 },    /* R43    - Input Mixer (5) */</div><div class='add'>+	{ 0x002C, 0x0000 },    /* R44    - Input Mixer (6) */</div><div class='add'>+	{ 0x002D, 0x0000 },    /* R45    - Output Mixer (1) */</div><div class='add'>+	{ 0x002E, 0x0000 },    /* R46    - Output Mixer (2) */</div><div class='add'>+	{ 0x002F, 0x0000 },    /* R47    - Output Mixer (3) */</div><div class='add'>+	{ 0x0030, 0x0000 },    /* R48    - Output Mixer (4) */</div><div class='add'>+	{ 0x0031, 0x0000 },    /* R49    - Output Mixer (5) */</div><div class='add'>+	{ 0x0032, 0x0000 },    /* R50    - Output Mixer (6) */</div><div class='add'>+	{ 0x0033, 0x0000 },    /* R51    - HPOUT2 Mixer */</div><div class='add'>+	{ 0x0034, 0x0000 },    /* R52    - Line Mixer (1) */</div><div class='add'>+	{ 0x0035, 0x0000 },    /* R53    - Line Mixer (2) */</div><div class='add'>+	{ 0x0036, 0x0000 },    /* R54    - Speaker Mixer */</div><div class='add'>+	{ 0x0037, 0x0000 },    /* R55    - Additional Control */</div><div class='add'>+	{ 0x0038, 0x0000 },    /* R56    - AntiPOP (1) */</div><div class='add'>+	{ 0x0039, 0x0180 },    /* R57    - AntiPOP (2) */</div><div class='add'>+	{ 0x003B, 0x000D },    /* R59    - LDO 1 */</div><div class='add'>+	{ 0x003C, 0x0005 },    /* R60    - LDO 2 */</div><div class='add'>+	{ 0x003D, 0x0039 },    /* R61    - MICBIAS1 */</div><div class='add'>+	{ 0x003E, 0x0039 },    /* R62    - MICBIAS2 */</div><div class='add'>+	{ 0x004C, 0x1F25 },    /* R76    - Charge Pump (1) */</div><div class='add'>+	{ 0x004D, 0xAB19 },    /* R77    - Charge Pump (2) */</div><div class='add'>+	{ 0x0051, 0x0004 },    /* R81    - Class W (1) */</div><div class='add'>+	{ 0x0055, 0x054A },    /* R85    - DC Servo (2) */</div><div class='add'>+	{ 0x0057, 0x0000 },    /* R87    - DC Servo (4) */</div><div class='add'>+	{ 0x0060, 0x0000 },    /* R96    - Analogue HP (1) */</div><div class='add'>+	{ 0x00C5, 0x0000 },    /* R197   - Class D Test (5) */</div><div class='add'>+	{ 0x00D0, 0x5600 },    /* R208   - Mic Detect 1 */</div><div class='add'>+	{ 0x00D1, 0x007F },    /* R209   - Mic Detect 2 */</div><div class='add'>+	{ 0x0101, 0x8004 },    /* R257   - Control Interface */</div><div class='add'>+	{ 0x0110, 0x0000 },    /* R272   - Write Sequencer Ctrl (1) */</div><div class='add'>+	{ 0x0111, 0x0000 },    /* R273   - Write Sequencer Ctrl (2) */</div><div class='add'>+	{ 0x0200, 0x0000 },    /* R512   - AIF1 Clocking (1) */</div><div class='add'>+	{ 0x0201, 0x0000 },    /* R513   - AIF1 Clocking (2) */</div><div class='add'>+	{ 0x0204, 0x0000 },    /* R516   - AIF2 Clocking (1) */</div><div class='add'>+	{ 0x0205, 0x0000 },    /* R517   - AIF2 Clocking (2) */</div><div class='add'>+	{ 0x0208, 0x0000 },    /* R520   - Clocking (1) */</div><div class='add'>+	{ 0x0209, 0x0000 },    /* R521   - Clocking (2) */</div><div class='add'>+	{ 0x0210, 0x0083 },    /* R528   - AIF1 Rate */</div><div class='add'>+	{ 0x0211, 0x0083 },    /* R529   - AIF2 Rate */</div><div class='add'>+	{ 0x0220, 0x0000 },    /* R544   - FLL1 Control (1) */</div><div class='add'>+	{ 0x0221, 0x0000 },    /* R545   - FLL1 Control (2) */</div><div class='add'>+	{ 0x0222, 0x0000 },    /* R546   - FLL1 Control (3) */</div><div class='add'>+	{ 0x0223, 0x0000 },    /* R547   - FLL1 Control (4) */</div><div class='add'>+	{ 0x0224, 0x0C80 },    /* R548   - FLL1 Control (5) */</div><div class='add'>+	{ 0x0226, 0x0000 },    /* R550   - FLL1 EFS 1 */</div><div class='add'>+	{ 0x0227, 0x0006 },    /* R551   - FLL1 EFS 2 */</div><div class='add'>+	{ 0x0240, 0x0000 },    /* R576   - FLL2Control (1) */</div><div class='add'>+	{ 0x0241, 0x0000 },    /* R577   - FLL2Control (2) */</div><div class='add'>+	{ 0x0242, 0x0000 },    /* R578   - FLL2Control (3) */</div><div class='add'>+	{ 0x0243, 0x0000 },    /* R579   - FLL2 Control (4) */</div><div class='add'>+	{ 0x0244, 0x0C80 },    /* R580   - FLL2Control (5) */</div><div class='add'>+	{ 0x0246, 0x0000 },    /* R582   - FLL2 EFS 1 */</div><div class='add'>+	{ 0x0247, 0x0006 },    /* R583   - FLL2 EFS 2 */</div><div class='add'>+	{ 0x0300, 0x4050 },    /* R768   - AIF1 Control (1) */</div><div class='add'>+	{ 0x0301, 0x4000 },    /* R769   - AIF1 Control (2) */</div><div class='add'>+	{ 0x0302, 0x0000 },    /* R770   - AIF1 Master/Slave */</div><div class='add'>+	{ 0x0303, 0x0040 },    /* R771   - AIF1 BCLK */</div><div class='add'>+	{ 0x0304, 0x0040 },    /* R772   - AIF1ADC LRCLK */</div><div class='add'>+	{ 0x0305, 0x0040 },    /* R773   - AIF1DAC LRCLK */</div><div class='add'>+	{ 0x0306, 0x0004 },    /* R774   - AIF1DAC Data */</div><div class='add'>+	{ 0x0307, 0x0100 },    /* R775   - AIF1ADC Data */</div><div class='add'>+	{ 0x0310, 0x4053 },    /* R784   - AIF2 Control (1) */</div><div class='add'>+	{ 0x0311, 0x4000 },    /* R785   - AIF2 Control (2) */</div><div class='add'>+	{ 0x0312, 0x0000 },    /* R786   - AIF2 Master/Slave */</div><div class='add'>+	{ 0x0313, 0x0040 },    /* R787   - AIF2 BCLK */</div><div class='add'>+	{ 0x0314, 0x0040 },    /* R788   - AIF2ADC LRCLK */</div><div class='add'>+	{ 0x0315, 0x0040 },    /* R789   - AIF2DAC LRCLK */</div><div class='add'>+	{ 0x0316, 0x0000 },    /* R790   - AIF2DAC Data */</div><div class='add'>+	{ 0x0317, 0x0000 },    /* R791   - AIF2ADC Data */</div><div class='add'>+	{ 0x0320, 0x0040 },    /* R800   - AIF3 Control (1) */</div><div class='add'>+	{ 0x0321, 0x0000 },    /* R801   - AIF3 Control (2) */</div><div class='add'>+	{ 0x0322, 0x0000 },    /* R802   - AIF3DAC Data */</div><div class='add'>+	{ 0x0323, 0x0000 },    /* R803   - AIF3ADC Data */</div><div class='add'>+	{ 0x0400, 0x00C0 },    /* R1024  - AIF1 ADC1 Left Volume */</div><div class='add'>+	{ 0x0401, 0x00C0 },    /* R1025  - AIF1 ADC1 Right Volume */</div><div class='add'>+	{ 0x0402, 0x00C0 },    /* R1026  - AIF1 DAC1 Left Volume */</div><div class='add'>+	{ 0x0403, 0x00C0 },    /* R1027  - AIF1 DAC1 Right Volume */</div><div class='add'>+	{ 0x0404, 0x00C0 },    /* R1028  - AIF1 ADC2 Left Volume */</div><div class='add'>+	{ 0x0405, 0x00C0 },    /* R1029  - AIF1 ADC2 Right Volume */</div><div class='add'>+	{ 0x0406, 0x00C0 },    /* R1030  - AIF1 DAC2 Left Volume */</div><div class='add'>+	{ 0x0407, 0x00C0 },    /* R1031  - AIF1 DAC2 Right Volume */</div><div class='add'>+	{ 0x0410, 0x0000 },    /* R1040  - AIF1 ADC1 Filters */</div><div class='add'>+	{ 0x0411, 0x0000 },    /* R1041  - AIF1 ADC2 Filters */</div><div class='add'>+	{ 0x0420, 0x0200 },    /* R1056  - AIF1 DAC1 Filters (1) */</div><div class='add'>+	{ 0x0421, 0x0010 },    /* R1057  - AIF1 DAC1 Filters (2) */</div><div class='add'>+	{ 0x0422, 0x0200 },    /* R1058  - AIF1 DAC2 Filters (1) */</div><div class='add'>+	{ 0x0423, 0x0010 },    /* R1059  - AIF1 DAC2 Filters (2) */</div><div class='add'>+	{ 0x0430, 0x0068 },    /* R1072  - AIF1 DAC1 Noise Gate */</div><div class='add'>+	{ 0x0431, 0x0068 },    /* R1073  - AIF1 DAC2 Noise Gate */</div><div class='add'>+	{ 0x0440, 0x0098 },    /* R1088  - AIF1 DRC1 (1) */</div><div class='add'>+	{ 0x0441, 0x0845 },    /* R1089  - AIF1 DRC1 (2) */</div><div class='add'>+	{ 0x0442, 0x0000 },    /* R1090  - AIF1 DRC1 (3) */</div><div class='add'>+	{ 0x0443, 0x0000 },    /* R1091  - AIF1 DRC1 (4) */</div><div class='add'>+	{ 0x0444, 0x0000 },    /* R1092  - AIF1 DRC1 (5) */</div><div class='add'>+	{ 0x0450, 0x0098 },    /* R1104  - AIF1 DRC2 (1) */</div><div class='add'>+	{ 0x0451, 0x0845 },    /* R1105  - AIF1 DRC2 (2) */</div><div class='add'>+	{ 0x0452, 0x0000 },    /* R1106  - AIF1 DRC2 (3) */</div><div class='add'>+	{ 0x0453, 0x0000 },    /* R1107  - AIF1 DRC2 (4) */</div><div class='add'>+	{ 0x0454, 0x0000 },    /* R1108  - AIF1 DRC2 (5) */</div><div class='add'>+	{ 0x0480, 0x6318 },    /* R1152  - AIF1 DAC1 EQ Gains (1) */</div><div class='add'>+	{ 0x0481, 0x6300 },    /* R1153  - AIF1 DAC1 EQ Gains (2) */</div><div class='add'>+	{ 0x0482, 0x0FCA },    /* R1154  - AIF1 DAC1 EQ Band 1 A */</div><div class='add'>+	{ 0x0483, 0x0400 },    /* R1155  - AIF1 DAC1 EQ Band 1 B */</div><div class='add'>+	{ 0x0484, 0x00D8 },    /* R1156  - AIF1 DAC1 EQ Band 1 PG */</div><div class='add'>+	{ 0x0485, 0x1EB5 },    /* R1157  - AIF1 DAC1 EQ Band 2 A */</div><div class='add'>+	{ 0x0486, 0xF145 },    /* R1158  - AIF1 DAC1 EQ Band 2 B */</div><div class='add'>+	{ 0x0487, 0x0B75 },    /* R1159  - AIF1 DAC1 EQ Band 2 C */</div><div class='add'>+	{ 0x0488, 0x01C5 },    /* R1160  - AIF1 DAC1 EQ Band 2 PG */</div><div class='add'>+	{ 0x0489, 0x1C58 },    /* R1161  - AIF1 DAC1 EQ Band 3 A */</div><div class='add'>+	{ 0x048A, 0xF373 },    /* R1162  - AIF1 DAC1 EQ Band 3 B */</div><div class='add'>+	{ 0x048B, 0x0A54 },    /* R1163  - AIF1 DAC1 EQ Band 3 C */</div><div class='add'>+	{ 0x048C, 0x0558 },    /* R1164  - AIF1 DAC1 EQ Band 3 PG */</div><div class='add'>+	{ 0x048D, 0x168E },    /* R1165  - AIF1 DAC1 EQ Band 4 A */</div><div class='add'>+	{ 0x048E, 0xF829 },    /* R1166  - AIF1 DAC1 EQ Band 4 B */</div><div class='add'>+	{ 0x048F, 0x07AD },    /* R1167  - AIF1 DAC1 EQ Band 4 C */</div><div class='add'>+	{ 0x0490, 0x1103 },    /* R1168  - AIF1 DAC1 EQ Band 4 PG */</div><div class='add'>+	{ 0x0491, 0x0564 },    /* R1169  - AIF1 DAC1 EQ Band 5 A */</div><div class='add'>+	{ 0x0492, 0x0559 },    /* R1170  - AIF1 DAC1 EQ Band 5 B */</div><div class='add'>+	{ 0x0493, 0x4000 },    /* R1171  - AIF1 DAC1 EQ Band 5 PG */</div><div class='add'>+	{ 0x0494, 0x0000 },    /* R1172  - AIF1 DAC1 EQ Band 1 C */</div><div class='add'>+	{ 0x04A0, 0x6318 },    /* R1184  - AIF1 DAC2 EQ Gains (1) */</div><div class='add'>+	{ 0x04A1, 0x6300 },    /* R1185  - AIF1 DAC2 EQ Gains (2) */</div><div class='add'>+	{ 0x04A2, 0x0FCA },    /* R1186  - AIF1 DAC2 EQ Band 1 A */</div><div class='add'>+	{ 0x04A3, 0x0400 },    /* R1187  - AIF1 DAC2 EQ Band 1 B */</div><div class='add'>+	{ 0x04A4, 0x00D8 },    /* R1188  - AIF1 DAC2 EQ Band 1 PG */</div><div class='add'>+	{ 0x04A5, 0x1EB5 },    /* R1189  - AIF1 DAC2 EQ Band 2 A */</div><div class='add'>+	{ 0x04A6, 0xF145 },    /* R1190  - AIF1 DAC2 EQ Band 2 B */</div><div class='add'>+	{ 0x04A7, 0x0B75 },    /* R1191  - AIF1 DAC2 EQ Band 2 C */</div><div class='add'>+	{ 0x04A8, 0x01C5 },    /* R1192  - AIF1 DAC2 EQ Band 2 PG */</div><div class='add'>+	{ 0x04A9, 0x1C58 },    /* R1193  - AIF1 DAC2 EQ Band 3 A */</div><div class='add'>+	{ 0x04AA, 0xF373 },    /* R1194  - AIF1 DAC2 EQ Band 3 B */</div><div class='add'>+	{ 0x04AB, 0x0A54 },    /* R1195  - AIF1 DAC2 EQ Band 3 C */</div><div class='add'>+	{ 0x04AC, 0x0558 },    /* R1196  - AIF1 DAC2 EQ Band 3 PG */</div><div class='add'>+	{ 0x04AD, 0x168E },    /* R1197  - AIF1 DAC2 EQ Band 4 A */</div><div class='add'>+	{ 0x04AE, 0xF829 },    /* R1198  - AIF1 DAC2 EQ Band 4 B */</div><div class='add'>+	{ 0x04AF, 0x07AD },    /* R1199  - AIF1 DAC2 EQ Band 4 C */</div><div class='add'>+	{ 0x04B0, 0x1103 },    /* R1200  - AIF1 DAC2 EQ Band 4 PG */</div><div class='add'>+	{ 0x04B1, 0x0564 },    /* R1201  - AIF1 DAC2 EQ Band 5 A */</div><div class='add'>+	{ 0x04B2, 0x0559 },    /* R1202  - AIF1 DAC2 EQ Band 5 B */</div><div class='add'>+	{ 0x04B3, 0x4000 },    /* R1203  - AIF1 DAC2 EQ Band 5 PG */</div><div class='add'>+	{ 0x04B4, 0x0000 },    /* R1204  - AIF1 DAC2EQ Band 1 C */</div><div class='add'>+	{ 0x0500, 0x00C0 },    /* R1280  - AIF2 ADC Left Volume */</div><div class='add'>+	{ 0x0501, 0x00C0 },    /* R1281  - AIF2 ADC Right Volume */</div><div class='add'>+	{ 0x0502, 0x00C0 },    /* R1282  - AIF2 DAC Left Volume */</div><div class='add'>+	{ 0x0503, 0x00C0 },    /* R1283  - AIF2 DAC Right Volume */</div><div class='add'>+	{ 0x0510, 0x0000 },    /* R1296  - AIF2 ADC Filters */</div><div class='add'>+	{ 0x0520, 0x0200 },    /* R1312  - AIF2 DAC Filters (1) */</div><div class='add'>+	{ 0x0521, 0x0010 },    /* R1313  - AIF2 DAC Filters (2) */</div><div class='add'>+	{ 0x0530, 0x0068 },    /* R1328  - AIF2 DAC Noise Gate */</div><div class='add'>+	{ 0x0540, 0x0098 },    /* R1344  - AIF2 DRC (1) */</div><div class='add'>+	{ 0x0541, 0x0845 },    /* R1345  - AIF2 DRC (2) */</div><div class='add'>+	{ 0x0542, 0x0000 },    /* R1346  - AIF2 DRC (3) */</div><div class='add'>+	{ 0x0543, 0x0000 },    /* R1347  - AIF2 DRC (4) */</div><div class='add'>+	{ 0x0544, 0x0000 },    /* R1348  - AIF2 DRC (5) */</div><div class='add'>+	{ 0x0580, 0x6318 },    /* R1408  - AIF2 EQ Gains (1) */</div><div class='add'>+	{ 0x0581, 0x6300 },    /* R1409  - AIF2 EQ Gains (2) */</div><div class='add'>+	{ 0x0582, 0x0FCA },    /* R1410  - AIF2 EQ Band 1 A */</div><div class='add'>+	{ 0x0583, 0x0400 },    /* R1411  - AIF2 EQ Band 1 B */</div><div class='add'>+	{ 0x0584, 0x00D8 },    /* R1412  - AIF2 EQ Band 1 PG */</div><div class='add'>+	{ 0x0585, 0x1EB5 },    /* R1413  - AIF2 EQ Band 2 A */</div><div class='add'>+	{ 0x0586, 0xF145 },    /* R1414  - AIF2 EQ Band 2 B */</div><div class='add'>+	{ 0x0587, 0x0B75 },    /* R1415  - AIF2 EQ Band 2 C */</div><div class='add'>+	{ 0x0588, 0x01C5 },    /* R1416  - AIF2 EQ Band 2 PG */</div><div class='add'>+	{ 0x0589, 0x1C58 },    /* R1417  - AIF2 EQ Band 3 A */</div><div class='add'>+	{ 0x058A, 0xF373 },    /* R1418  - AIF2 EQ Band 3 B */</div><div class='add'>+	{ 0x058B, 0x0A54 },    /* R1419  - AIF2 EQ Band 3 C */</div><div class='add'>+	{ 0x058C, 0x0558 },    /* R1420  - AIF2 EQ Band 3 PG */</div><div class='add'>+	{ 0x058D, 0x168E },    /* R1421  - AIF2 EQ Band 4 A */</div><div class='add'>+	{ 0x058E, 0xF829 },    /* R1422  - AIF2 EQ Band 4 B */</div><div class='add'>+	{ 0x058F, 0x07AD },    /* R1423  - AIF2 EQ Band 4 C */</div><div class='add'>+	{ 0x0590, 0x1103 },    /* R1424  - AIF2 EQ Band 4 PG */</div><div class='add'>+	{ 0x0591, 0x0564 },    /* R1425  - AIF2 EQ Band 5 A */</div><div class='add'>+	{ 0x0592, 0x0559 },    /* R1426  - AIF2 EQ Band 5 B */</div><div class='add'>+	{ 0x0593, 0x4000 },    /* R1427  - AIF2 EQ Band 5 PG */</div><div class='add'>+	{ 0x0594, 0x0000 },    /* R1428  - AIF2 EQ Band 1 C */</div><div class='add'>+	{ 0x0600, 0x0000 },    /* R1536  - DAC1 Mixer Volumes */</div><div class='add'>+	{ 0x0601, 0x0000 },    /* R1537  - DAC1 Left Mixer Routing */</div><div class='add'>+	{ 0x0602, 0x0000 },    /* R1538  - DAC1 Right Mixer Routing */</div><div class='add'>+	{ 0x0603, 0x0000 },    /* R1539  - DAC2 Mixer Volumes */</div><div class='add'>+	{ 0x0604, 0x0000 },    /* R1540  - DAC2 Left Mixer Routing */</div><div class='add'>+	{ 0x0605, 0x0000 },    /* R1541  - DAC2 Right Mixer Routing */</div><div class='add'>+	{ 0x0606, 0x0000 },    /* R1542  - AIF1 ADC1 Left Mixer Routing */</div><div class='add'>+	{ 0x0607, 0x0000 },    /* R1543  - AIF1 ADC1 Right Mixer Routing */</div><div class='add'>+	{ 0x0608, 0x0000 },    /* R1544  - AIF1 ADC2 Left Mixer Routing */</div><div class='add'>+	{ 0x0609, 0x0000 },    /* R1545  - AIF1 ADC2 Right mixer Routing */</div><div class='add'>+	{ 0x0610, 0x02C0 },    /* R1552  - DAC1 Left Volume */</div><div class='add'>+	{ 0x0611, 0x02C0 },    /* R1553  - DAC1 Right Volume */</div><div class='add'>+	{ 0x0612, 0x02C0 },    /* R1554  - DAC2 Left Volume */</div><div class='add'>+	{ 0x0613, 0x02C0 },    /* R1555  - DAC2 Right Volume */</div><div class='add'>+	{ 0x0614, 0x0000 },    /* R1556  - DAC Softmute */</div><div class='add'>+	{ 0x0620, 0x0002 },    /* R1568  - Oversampling */</div><div class='add'>+	{ 0x0621, 0x0000 },    /* R1569  - Sidetone */</div><div class='add'>+	{ 0x0700, 0x8100 },    /* R1792  - GPIO 1 */</div><div class='add'>+	{ 0x0701, 0xA101 },    /* R1793  - Pull Control (MCLK2) */</div><div class='add'>+	{ 0x0702, 0xA101 },    /* R1794  - Pull Control (BCLK2) */</div><div class='add'>+	{ 0x0703, 0xA101 },    /* R1795  - Pull Control (DACLRCLK2) */</div><div class='add'>+	{ 0x0704, 0xA101 },    /* R1796  - Pull Control (DACDAT2) */</div><div class='add'>+	{ 0x0705, 0xA101 },    /* R1797  - GPIO 6 */</div><div class='add'>+	{ 0x0707, 0xA101 },    /* R1799  - GPIO 8 */</div><div class='add'>+	{ 0x0708, 0xA101 },    /* R1800  - GPIO 9 */</div><div class='add'>+	{ 0x0709, 0xA101 },    /* R1801  - GPIO 10 */</div><div class='add'>+	{ 0x070A, 0xA101 },    /* R1802  - GPIO 11 */</div><div class='add'>+	{ 0x0720, 0x0000 },    /* R1824  - Pull Control (1) */</div><div class='add'>+	{ 0x0721, 0x0156 },    /* R1825  - Pull Control (2) */</div><div class='add'>+	{ 0x0738, 0x07FF },    /* R1848  - Interrupt Status 1 Mask */</div><div class='add'>+	{ 0x0739, 0xFFEF },    /* R1849  - Interrupt Status 2 Mask */</div><div class='add'>+	{ 0x0740, 0x0000 },    /* R1856  - Interrupt Control */</div><div class='add'>+	{ 0x0748, 0x003F },    /* R1864  - IRQ Debounce */</div><div class='add'>+	{ 0x0900, 0x1C00 },    /* R2304  - DSP2_Program */</div><div class='add'>+	{ 0x0901, 0x0000 },    /* R2305  - DSP2_Config */</div><div class='add'>+	{ 0x0A0D, 0x0000 },    /* R2573  - DSP2_ExecControl */</div><div class='add'>+	{ 0x2400, 0x003F },    /* R9216  - MBC Band 1 K (1) */</div><div class='add'>+	{ 0x2401, 0x8BD8 },    /* R9217  - MBC Band 1 K (2) */</div><div class='add'>+	{ 0x2402, 0x0032 },    /* R9218  - MBC Band 1 N1 (1) */</div><div class='add'>+	{ 0x2403, 0xF52D },    /* R9219  - MBC Band 1 N1 (2) */</div><div class='add'>+	{ 0x2404, 0x0065 },    /* R9220  - MBC Band 1 N2 (1) */</div><div class='add'>+	{ 0x2405, 0xAC8C },    /* R9221  - MBC Band 1 N2 (2) */</div><div class='add'>+	{ 0x2406, 0x006B },    /* R9222  - MBC Band 1 N3 (1) */</div><div class='add'>+	{ 0x2407, 0xE087 },    /* R9223  - MBC Band 1 N3 (2) */</div><div class='add'>+	{ 0x2408, 0x0072 },    /* R9224  - MBC Band 1 N4 (1) */</div><div class='add'>+	{ 0x2409, 0x1483 },    /* R9225  - MBC Band 1 N4 (2) */</div><div class='add'>+	{ 0x240A, 0x0072 },    /* R9226  - MBC Band 1 N5 (1) */</div><div class='add'>+	{ 0x240B, 0x1483 },    /* R9227  - MBC Band 1 N5 (2) */</div><div class='add'>+	{ 0x240C, 0x0043 },    /* R9228  - MBC Band 1 X1 (1) */</div><div class='add'>+	{ 0x240D, 0x3525 },    /* R9229  - MBC Band 1 X1 (2) */</div><div class='add'>+	{ 0x240E, 0x0006 },    /* R9230  - MBC Band 1 X2 (1) */</div><div class='add'>+	{ 0x240F, 0x6A4A },    /* R9231  - MBC Band 1 X2 (2) */</div><div class='add'>+	{ 0x2410, 0x0043 },    /* R9232  - MBC Band 1 X3 (1) */</div><div class='add'>+	{ 0x2411, 0x6079 },    /* R9233  - MBC Band 1 X3 (2) */</div><div class='add'>+	{ 0x2412, 0x000C },    /* R9234  - MBC Band 1 Attack (1) */</div><div class='add'>+	{ 0x2413, 0xCCCD },    /* R9235  - MBC Band 1 Attack (2) */</div><div class='add'>+	{ 0x2414, 0x0000 },    /* R9236  - MBC Band 1 Decay (1) */</div><div class='add'>+	{ 0x2415, 0x0800 },    /* R9237  - MBC Band 1 Decay (2) */</div><div class='add'>+	{ 0x2416, 0x003F },    /* R9238  - MBC Band 2 K (1) */</div><div class='add'>+	{ 0x2417, 0x8BD8 },    /* R9239  - MBC Band 2 K (2) */</div><div class='add'>+	{ 0x2418, 0x0032 },    /* R9240  - MBC Band 2 N1 (1) */</div><div class='add'>+	{ 0x2419, 0xF52D },    /* R9241  - MBC Band 2 N1 (2) */</div><div class='add'>+	{ 0x241A, 0x0065 },    /* R9242  - MBC Band 2 N2 (1) */</div><div class='add'>+	{ 0x241B, 0xAC8C },    /* R9243  - MBC Band 2 N2 (2) */</div><div class='add'>+	{ 0x241C, 0x006B },    /* R9244  - MBC Band 2 N3 (1) */</div><div class='add'>+	{ 0x241D, 0xE087 },    /* R9245  - MBC Band 2 N3 (2) */</div><div class='add'>+	{ 0x241E, 0x0072 },    /* R9246  - MBC Band 2 N4 (1) */</div><div class='add'>+	{ 0x241F, 0x1483 },    /* R9247  - MBC Band 2 N4 (2) */</div><div class='add'>+	{ 0x2420, 0x0072 },    /* R9248  - MBC Band 2 N5 (1) */</div><div class='add'>+	{ 0x2421, 0x1483 },    /* R9249  - MBC Band 2 N5 (2) */</div><div class='add'>+	{ 0x2422, 0x0043 },    /* R9250  - MBC Band 2 X1 (1) */</div><div class='add'>+	{ 0x2423, 0x3525 },    /* R9251  - MBC Band 2 X1 (2) */</div><div class='add'>+	{ 0x2424, 0x0006 },    /* R9252  - MBC Band 2 X2 (1) */</div><div class='add'>+	{ 0x2425, 0x6A4A },    /* R9253  - MBC Band 2 X2 (2) */</div><div class='add'>+	{ 0x2426, 0x0043 },    /* R9254  - MBC Band 2 X3 (1) */</div><div class='add'>+	{ 0x2427, 0x6079 },    /* R9255  - MBC Band 2 X3 (2) */</div><div class='add'>+	{ 0x2428, 0x000C },    /* R9256  - MBC Band 2 Attack (1) */</div><div class='add'>+	{ 0x2429, 0xCCCD },    /* R9257  - MBC Band 2 Attack (2) */</div><div class='add'>+	{ 0x242A, 0x0000 },    /* R9258  - MBC Band 2 Decay (1) */</div><div class='add'>+	{ 0x242B, 0x0800 },    /* R9259  - MBC Band 2 Decay (2) */</div><div class='add'>+	{ 0x242C, 0x005A },    /* R9260  - MBC_B2_PG2 (1) */</div><div class='add'>+	{ 0x242D, 0x7EFA },    /* R9261  - MBC_B2_PG2 (2) */</div><div class='add'>+	{ 0x242E, 0x005A },    /* R9262  - MBC_B1_PG2 (1) */</div><div class='add'>+	{ 0x242F, 0x7EFA },    /* R9263  - MBC_B1_PG2 (2) */</div><div class='add'>+	{ 0x2600, 0x00A7 },    /* R9728  - MBC Crossover (1) */</div><div class='add'>+	{ 0x2601, 0x0D1C },    /* R9729  - MBC Crossover (2) */</div><div class='add'>+	{ 0x2602, 0x0083 },    /* R9730  - MBC HPF (1) */</div><div class='add'>+	{ 0x2603, 0x98AD },    /* R9731  - MBC HPF (2) */</div><div class='add'>+	{ 0x2606, 0x0008 },    /* R9734  - MBC LPF (1) */</div><div class='add'>+	{ 0x2607, 0xE7A2 },    /* R9735  - MBC LPF (2) */</div><div class='add'>+	{ 0x260A, 0x0055 },    /* R9738  - MBC RMS Limit (1) */</div><div class='add'>+	{ 0x260B, 0x8C4B },    /* R9739  - MBC RMS Limit (2) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool wm1811_readable_register(struct device *dev, unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case WM8994_SOFTWARE_RESET:</div><div class='add'>+	case WM8994_POWER_MANAGEMENT_1:</div><div class='add'>+	case WM8994_POWER_MANAGEMENT_2:</div><div class='add'>+	case WM8994_POWER_MANAGEMENT_3:</div><div class='add'>+	case WM8994_POWER_MANAGEMENT_4:</div><div class='add'>+	case WM8994_POWER_MANAGEMENT_5:</div><div class='add'>+	case WM8994_POWER_MANAGEMENT_6:</div><div class='add'>+	case WM8994_INPUT_MIXER_1:</div><div class='add'>+	case WM8994_LEFT_LINE_INPUT_1_2_VOLUME:</div><div class='add'>+	case WM8994_LEFT_LINE_INPUT_3_4_VOLUME:</div><div class='add'>+	case WM8994_RIGHT_LINE_INPUT_1_2_VOLUME:</div><div class='add'>+	case WM8994_RIGHT_LINE_INPUT_3_4_VOLUME:</div><div class='add'>+	case WM8994_LEFT_OUTPUT_VOLUME:</div><div class='add'>+	case WM8994_RIGHT_OUTPUT_VOLUME:</div><div class='add'>+	case WM8994_LINE_OUTPUTS_VOLUME:</div><div class='add'>+	case WM8994_HPOUT2_VOLUME:</div><div class='add'>+	case WM8994_LEFT_OPGA_VOLUME:</div><div class='add'>+	case WM8994_RIGHT_OPGA_VOLUME:</div><div class='add'>+	case WM8994_SPKMIXL_ATTENUATION:</div><div class='add'>+	case WM8994_SPKMIXR_ATTENUATION:</div><div class='add'>+	case WM8994_SPKOUT_MIXERS:</div><div class='add'>+	case WM8994_CLASSD:</div><div class='add'>+	case WM8994_SPEAKER_VOLUME_LEFT:</div><div class='add'>+	case WM8994_SPEAKER_VOLUME_RIGHT:</div><div class='add'>+	case WM8994_INPUT_MIXER_2:</div><div class='add'>+	case WM8994_INPUT_MIXER_3:</div><div class='add'>+	case WM8994_INPUT_MIXER_4:</div><div class='add'>+	case WM8994_INPUT_MIXER_5:</div><div class='add'>+	case WM8994_INPUT_MIXER_6:</div><div class='add'>+	case WM8994_OUTPUT_MIXER_1:</div><div class='add'>+	case WM8994_OUTPUT_MIXER_2:</div><div class='add'>+	case WM8994_OUTPUT_MIXER_3:</div><div class='add'>+	case WM8994_OUTPUT_MIXER_4:</div><div class='add'>+	case WM8994_OUTPUT_MIXER_5:</div><div class='add'>+	case WM8994_OUTPUT_MIXER_6:</div><div class='add'>+	case WM8994_HPOUT2_MIXER:</div><div class='add'>+	case WM8994_LINE_MIXER_1:</div><div class='add'>+	case WM8994_LINE_MIXER_2:</div><div class='add'>+	case WM8994_SPEAKER_MIXER:</div><div class='add'>+	case WM8994_ADDITIONAL_CONTROL:</div><div class='add'>+	case WM8994_ANTIPOP_1:</div><div class='add'>+	case WM8994_ANTIPOP_2:</div><div class='add'>+	case WM8994_LDO_1:</div><div class='add'>+	case WM8994_LDO_2:</div><div class='add'>+	case WM8958_MICBIAS1:</div><div class='add'>+	case WM8958_MICBIAS2:</div><div class='add'>+	case WM8994_CHARGE_PUMP_1:</div><div class='add'>+	case WM8958_CHARGE_PUMP_2:</div><div class='add'>+	case WM8994_CLASS_W_1:</div><div class='add'>+	case WM8994_DC_SERVO_1:</div><div class='add'>+	case WM8994_DC_SERVO_2:</div><div class='add'>+	case WM8994_DC_SERVO_READBACK:</div><div class='add'>+	case WM8994_DC_SERVO_4:</div><div class='add'>+	case WM8994_ANALOGUE_HP_1:</div><div class='add'>+	case WM8958_MIC_DETECT_1:</div><div class='add'>+	case WM8958_MIC_DETECT_2:</div><div class='add'>+	case WM8958_MIC_DETECT_3:</div><div class='add'>+	case WM8994_CHIP_REVISION:</div><div class='add'>+	case WM8994_CONTROL_INTERFACE:</div><div class='add'>+	case WM8994_AIF1_CLOCKING_1:</div><div class='add'>+	case WM8994_AIF1_CLOCKING_2:</div><div class='add'>+	case WM8994_AIF2_CLOCKING_1:</div><div class='add'>+	case WM8994_AIF2_CLOCKING_2:</div><div class='add'>+	case WM8994_CLOCKING_1:</div><div class='add'>+	case WM8994_CLOCKING_2:</div><div class='add'>+	case WM8994_AIF1_RATE:</div><div class='add'>+	case WM8994_AIF2_RATE:</div><div class='add'>+	case WM8994_RATE_STATUS:</div><div class='add'>+	case WM8994_FLL1_CONTROL_1:</div><div class='add'>+	case WM8994_FLL1_CONTROL_2:</div><div class='add'>+	case WM8994_FLL1_CONTROL_3:</div><div class='add'>+	case WM8994_FLL1_CONTROL_4:</div><div class='add'>+	case WM8994_FLL1_CONTROL_5:</div><div class='add'>+	case WM8958_FLL1_EFS_1:</div><div class='add'>+	case WM8958_FLL1_EFS_2:</div><div class='add'>+	case WM8994_FLL2_CONTROL_1:</div><div class='add'>+	case WM8994_FLL2_CONTROL_2:</div><div class='add'>+	case WM8994_FLL2_CONTROL_3:</div><div class='add'>+	case WM8994_FLL2_CONTROL_4:</div><div class='add'>+	case WM8994_FLL2_CONTROL_5:</div><div class='add'>+	case WM8958_FLL2_EFS_1:</div><div class='add'>+	case WM8958_FLL2_EFS_2:</div><div class='add'>+	case WM8994_AIF1_CONTROL_1:</div><div class='add'>+	case WM8994_AIF1_CONTROL_2:</div><div class='add'>+	case WM8994_AIF1_MASTER_SLAVE:</div><div class='add'>+	case WM8994_AIF1_BCLK:</div><div class='add'>+	case WM8994_AIF1ADC_LRCLK:</div><div class='add'>+	case WM8994_AIF1DAC_LRCLK:</div><div class='add'>+	case WM8994_AIF1DAC_DATA:</div><div class='add'>+	case WM8994_AIF1ADC_DATA:</div><div class='add'>+	case WM8994_AIF2_CONTROL_1:</div><div class='add'>+	case WM8994_AIF2_CONTROL_2:</div><div class='add'>+	case WM8994_AIF2_MASTER_SLAVE:</div><div class='add'>+	case WM8994_AIF2_BCLK:</div><div class='add'>+	case WM8994_AIF2ADC_LRCLK:</div><div class='add'>+	case WM8994_AIF2DAC_LRCLK:</div><div class='add'>+	case WM8994_AIF2DAC_DATA:</div><div class='add'>+	case WM8994_AIF2ADC_DATA:</div><div class='add'>+	case WM1811_AIF2TX_CONTROL:</div><div class='add'>+	case WM8958_AIF3_CONTROL_1:</div><div class='add'>+	case WM8958_AIF3_CONTROL_2:</div><div class='add'>+	case WM8958_AIF3DAC_DATA:</div><div class='add'>+	case WM8958_AIF3ADC_DATA:</div><div class='add'>+	case WM8994_AIF1_ADC1_LEFT_VOLUME:</div><div class='add'>+	case WM8994_AIF1_ADC1_RIGHT_VOLUME:</div><div class='add'>+	case WM8994_AIF1_DAC1_LEFT_VOLUME:</div><div class='add'>+	case WM8994_AIF1_DAC1_RIGHT_VOLUME:</div><div class='add'>+	case WM8994_AIF1_ADC1_FILTERS:</div><div class='add'>+	case WM8994_AIF1_DAC1_FILTERS_1:</div><div class='add'>+	case WM8994_AIF1_DAC1_FILTERS_2:</div><div class='add'>+	case WM8958_AIF1_DAC1_NOISE_GATE:</div><div class='add'>+	case WM8994_AIF1_DRC1_1:</div><div class='add'>+	case WM8994_AIF1_DRC1_2:</div><div class='add'>+	case WM8994_AIF1_DRC1_3:</div><div class='add'>+	case WM8994_AIF1_DRC1_4:</div><div class='add'>+	case WM8994_AIF1_DRC1_5:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_GAINS_1:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_GAINS_2:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_1_A:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_1_B:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_1_PG:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_2_A:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_2_B:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_2_C:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_2_PG:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_3_A:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_3_B:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_3_C:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_3_PG:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_4_A:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_4_B:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_4_C:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_4_PG:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_5_A:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_5_B:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_5_PG:</div><div class='add'>+	case WM8994_AIF1_DAC1_EQ_BAND_1_C:</div><div class='add'>+	case WM8994_AIF2_ADC_LEFT_VOLUME:</div><div class='add'>+	case WM8994_AIF2_ADC_RIGHT_VOLUME:</div><div class='add'>+	case WM8994_AIF2_DAC_LEFT_VOLUME:</div><div class='add'>+	case WM8994_AIF2_DAC_RIGHT_VOLUME:</div><div class='add'>+	case WM8994_AIF2_ADC_FILTERS:</div><div class='add'>+	case WM8994_AIF2_DAC_FILTERS_1:</div><div class='add'>+	case WM8994_AIF2_DAC_FILTERS_2:</div><div class='add'>+	case WM8958_AIF2_DAC_NOISE_GATE:</div><div class='add'>+	case WM8994_AIF2_DRC_1:</div><div class='add'>+	case WM8994_AIF2_DRC_2:</div><div class='add'>+	case WM8994_AIF2_DRC_3:</div><div class='add'>+	case WM8994_AIF2_DRC_4:</div><div class='add'>+	case WM8994_AIF2_DRC_5:</div><div class='add'>+	case WM8994_AIF2_EQ_GAINS_1:</div><div class='add'>+	case WM8994_AIF2_EQ_GAINS_2:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_1_A:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_1_B:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_1_PG:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_2_A:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_2_B:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_2_C:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_2_PG:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_3_A:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_3_B:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_3_C:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_3_PG:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_4_A:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_4_B:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_4_C:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_4_PG:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_5_A:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_5_B:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_5_PG:</div><div class='add'>+	case WM8994_AIF2_EQ_BAND_1_C:</div><div class='add'>+	case WM8994_DAC1_MIXER_VOLUMES:</div><div class='add'>+	case WM8994_DAC1_LEFT_MIXER_ROUTING:</div><div class='add'>+	case WM8994_DAC1_RIGHT_MIXER_ROUTING:</div><div class='add'>+	case WM8994_DAC2_MIXER_VOLUMES:</div><div class='add'>+	case WM8994_DAC2_LEFT_MIXER_ROUTING:</div><div class='add'>+	case WM8994_DAC2_RIGHT_MIXER_ROUTING:</div><div class='add'>+	case WM8994_AIF1_ADC1_LEFT_MIXER_ROUTING:</div><div class='add'>+	case WM8994_AIF1_ADC1_RIGHT_MIXER_ROUTING:</div><div class='add'>+	case WM8994_DAC1_LEFT_VOLUME:</div><div class='add'>+	case WM8994_DAC1_RIGHT_VOLUME:</div><div class='add'>+	case WM8994_DAC2_LEFT_VOLUME:</div><div class='add'>+	case WM8994_DAC2_RIGHT_VOLUME:</div><div class='add'>+	case WM8994_DAC_SOFTMUTE:</div><div class='add'>+	case WM8994_OVERSAMPLING:</div><div class='add'>+	case WM8994_SIDETONE:</div><div class='add'>+	case WM8994_GPIO_1:</div><div class='add'>+	case WM8994_GPIO_2:</div><div class='add'>+	case WM8994_GPIO_3:</div><div class='add'>+	case WM8994_GPIO_4:</div><div class='add'>+	case WM8994_GPIO_5:</div><div class='add'>+	case WM8994_GPIO_6:</div><div class='add'>+	case WM8994_GPIO_8:</div><div class='add'>+	case WM8994_GPIO_9:</div><div class='add'>+	case WM8994_GPIO_10:</div><div class='add'>+	case WM8994_GPIO_11:</div><div class='add'>+	case WM8994_PULL_CONTROL_1:</div><div class='add'>+	case WM8994_PULL_CONTROL_2:</div><div class='add'>+	case WM8994_INTERRUPT_STATUS_1:</div><div class='add'>+	case WM8994_INTERRUPT_STATUS_2:</div><div class='add'>+	case WM8994_INTERRUPT_RAW_STATUS_2:</div><div class='add'>+	case WM8994_INTERRUPT_STATUS_1_MASK:</div><div class='add'>+	case WM8994_INTERRUPT_STATUS_2_MASK:</div><div class='add'>+	case WM8994_INTERRUPT_CONTROL:</div><div class='add'>+	case WM8994_IRQ_DEBOUNCE:</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 bool wm8994_readable_register(struct device *dev, unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case WM8994_DC_SERVO_READBACK:</div><div class='add'>+	case WM8994_WRITE_SEQUENCER_CTRL_1:</div><div class='add'>+	case WM8994_WRITE_SEQUENCER_CTRL_2:</div><div class='add'>+	case WM8994_AIF1_ADC2_LEFT_VOLUME:</div><div class='add'>+	case WM8994_AIF1_ADC2_RIGHT_VOLUME:</div><div class='add'>+	case WM8994_AIF1_DAC2_LEFT_VOLUME:</div><div class='add'>+	case WM8994_AIF1_DAC2_RIGHT_VOLUME:</div><div class='add'>+	case WM8994_AIF1_ADC2_FILTERS:</div><div class='add'>+	case WM8994_AIF1_DAC2_FILTERS_1:</div><div class='add'>+	case WM8994_AIF1_DAC2_FILTERS_2:</div><div class='add'>+	case WM8958_AIF1_DAC2_NOISE_GATE:</div><div class='add'>+	case WM8994_AIF1_DRC2_1:</div><div class='add'>+	case WM8994_AIF1_DRC2_2:</div><div class='add'>+	case WM8994_AIF1_DRC2_3:</div><div class='add'>+	case WM8994_AIF1_DRC2_4:</div><div class='add'>+	case WM8994_AIF1_DRC2_5:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_GAINS_1:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_GAINS_2:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_1_A:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_1_B:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_1_PG:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_2_A:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_2_B:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_2_C:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_2_PG:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_3_A:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_3_B:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_3_C:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_3_PG:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_4_A:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_4_B:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_4_C:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_4_PG:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_5_A:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_5_B:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_5_PG:</div><div class='add'>+	case WM8994_AIF1_DAC2_EQ_BAND_1_C:</div><div class='add'>+	case WM8994_DAC2_MIXER_VOLUMES:</div><div class='add'>+	case WM8994_DAC2_LEFT_MIXER_ROUTING:</div><div class='add'>+	case WM8994_DAC2_RIGHT_MIXER_ROUTING:</div><div class='add'>+	case WM8994_AIF1_ADC2_LEFT_MIXER_ROUTING:</div><div class='add'>+	case WM8994_AIF1_ADC2_RIGHT_MIXER_ROUTING:</div><div class='add'>+	case WM8994_DAC2_LEFT_VOLUME:</div><div class='add'>+	case WM8994_DAC2_RIGHT_VOLUME:</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return wm1811_readable_register(dev, reg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool wm8958_readable_register(struct device *dev, unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case WM8958_DSP2_PROGRAM:</div><div class='add'>+	case WM8958_DSP2_CONFIG:</div><div class='add'>+	case WM8958_DSP2_MAGICNUM:</div><div class='add'>+	case WM8958_DSP2_RELEASEYEAR:</div><div class='add'>+	case WM8958_DSP2_RELEASEMONTHDAY:</div><div class='add'>+	case WM8958_DSP2_RELEASETIME:</div><div class='add'>+	case WM8958_DSP2_VERMAJMIN:</div><div class='add'>+	case WM8958_DSP2_VERBUILD:</div><div class='add'>+	case WM8958_DSP2_TESTREG:</div><div class='add'>+	case WM8958_DSP2_XORREG:</div><div class='add'>+	case WM8958_DSP2_SHIFTMAXX:</div><div class='add'>+	case WM8958_DSP2_SHIFTMAXY:</div><div class='add'>+	case WM8958_DSP2_SHIFTMAXZ:</div><div class='add'>+	case WM8958_DSP2_SHIFTMAXEXTLO:</div><div class='add'>+	case WM8958_DSP2_AESSELECT:</div><div class='add'>+	case WM8958_DSP2_EXECCONTROL:</div><div class='add'>+	case WM8958_DSP2_SAMPLEBREAK:</div><div class='add'>+	case WM8958_DSP2_COUNTBREAK:</div><div class='add'>+	case WM8958_DSP2_INTSTATUS:</div><div class='add'>+	case WM8958_DSP2_EVENTSTATUS:</div><div class='add'>+	case WM8958_DSP2_INTMASK:</div><div class='add'>+	case WM8958_DSP2_CONFIGDWIDTH:</div><div class='add'>+	case WM8958_DSP2_CONFIGINSTR:</div><div class='add'>+	case WM8958_DSP2_CONFIGDMEM:</div><div class='add'>+	case WM8958_DSP2_CONFIGDELAYS:</div><div class='add'>+	case WM8958_DSP2_CONFIGNUMIO:</div><div class='add'>+	case WM8958_DSP2_CONFIGEXTDEPTH:</div><div class='add'>+	case WM8958_DSP2_CONFIGMULTIPLIER:</div><div class='add'>+	case WM8958_DSP2_CONFIGCTRLDWIDTH:</div><div class='add'>+	case WM8958_DSP2_CONFIGPIPELINE:</div><div class='add'>+	case WM8958_DSP2_SHIFTMAXEXTHI:</div><div class='add'>+	case WM8958_DSP2_SWVERSIONREG:</div><div class='add'>+	case WM8958_DSP2_CONFIGXMEM:</div><div class='add'>+	case WM8958_DSP2_CONFIGYMEM:</div><div class='add'>+	case WM8958_DSP2_CONFIGZMEM:</div><div class='add'>+	case WM8958_FW_BUILD_1:</div><div class='add'>+	case WM8958_FW_BUILD_0:</div><div class='add'>+	case WM8958_FW_ID_1:</div><div class='add'>+	case WM8958_FW_ID_0:</div><div class='add'>+	case WM8958_FW_MAJOR_1:</div><div class='add'>+	case WM8958_FW_MAJOR_0:</div><div class='add'>+	case WM8958_FW_MINOR_1:</div><div class='add'>+	case WM8958_FW_MINOR_0:</div><div class='add'>+	case WM8958_FW_PATCH_1:</div><div class='add'>+	case WM8958_FW_PATCH_0:</div><div class='add'>+	case WM8958_MBC_BAND_1_K_1:</div><div class='add'>+	case WM8958_MBC_BAND_1_K_2:</div><div class='add'>+	case WM8958_MBC_BAND_1_N1_1:</div><div class='add'>+	case WM8958_MBC_BAND_1_N1_2:</div><div class='add'>+	case WM8958_MBC_BAND_1_N2_1:</div><div class='add'>+	case WM8958_MBC_BAND_1_N2_2:</div><div class='add'>+	case WM8958_MBC_BAND_1_N3_1:</div><div class='add'>+	case WM8958_MBC_BAND_1_N3_2:</div><div class='add'>+	case WM8958_MBC_BAND_1_N4_1:</div><div class='add'>+	case WM8958_MBC_BAND_1_N4_2:</div><div class='add'>+	case WM8958_MBC_BAND_1_N5_1:</div><div class='add'>+	case WM8958_MBC_BAND_1_N5_2:</div><div class='add'>+	case WM8958_MBC_BAND_1_X1_1:</div><div class='add'>+	case WM8958_MBC_BAND_1_X1_2:</div><div class='add'>+	case WM8958_MBC_BAND_1_X2_1:</div><div class='add'>+	case WM8958_MBC_BAND_1_X2_2:</div><div class='add'>+	case WM8958_MBC_BAND_1_X3_1:</div><div class='add'>+	case WM8958_MBC_BAND_1_X3_2:</div><div class='add'>+	case WM8958_MBC_BAND_1_ATTACK_1:</div><div class='add'>+	case WM8958_MBC_BAND_1_ATTACK_2:</div><div class='add'>+	case WM8958_MBC_BAND_1_DECAY_1:</div><div class='add'>+	case WM8958_MBC_BAND_1_DECAY_2:</div><div class='add'>+	case WM8958_MBC_BAND_2_K_1:</div><div class='add'>+	case WM8958_MBC_BAND_2_K_2:</div><div class='add'>+	case WM8958_MBC_BAND_2_N1_1:</div><div class='add'>+	case WM8958_MBC_BAND_2_N1_2:</div><div class='add'>+	case WM8958_MBC_BAND_2_N2_1:</div><div class='add'>+	case WM8958_MBC_BAND_2_N2_2:</div><div class='add'>+	case WM8958_MBC_BAND_2_N3_1:</div><div class='add'>+	case WM8958_MBC_BAND_2_N3_2:</div><div class='add'>+	case WM8958_MBC_BAND_2_N4_1:</div><div class='add'>+	case WM8958_MBC_BAND_2_N4_2:</div><div class='add'>+	case WM8958_MBC_BAND_2_N5_1:</div><div class='add'>+	case WM8958_MBC_BAND_2_N5_2:</div><div class='add'>+	case WM8958_MBC_BAND_2_X1_1:</div><div class='add'>+	case WM8958_MBC_BAND_2_X1_2:</div><div class='add'>+	case WM8958_MBC_BAND_2_X2_1:</div><div class='add'>+	case WM8958_MBC_BAND_2_X2_2:</div><div class='add'>+	case WM8958_MBC_BAND_2_X3_1:</div><div class='add'>+	case WM8958_MBC_BAND_2_X3_2:</div><div class='add'>+	case WM8958_MBC_BAND_2_ATTACK_1:</div><div class='add'>+	case WM8958_MBC_BAND_2_ATTACK_2:</div><div class='add'>+	case WM8958_MBC_BAND_2_DECAY_1:</div><div class='add'>+	case WM8958_MBC_BAND_2_DECAY_2:</div><div class='add'>+	case WM8958_MBC_B2_PG2_1:</div><div class='add'>+	case WM8958_MBC_B2_PG2_2:</div><div class='add'>+	case WM8958_MBC_B1_PG2_1:</div><div class='add'>+	case WM8958_MBC_B1_PG2_2:</div><div class='add'>+	case WM8958_MBC_CROSSOVER_1:</div><div class='add'>+	case WM8958_MBC_CROSSOVER_2:</div><div class='add'>+	case WM8958_MBC_HPF_1:</div><div class='add'>+	case WM8958_MBC_HPF_2:</div><div class='add'>+	case WM8958_MBC_LPF_1:</div><div class='add'>+	case WM8958_MBC_LPF_2:</div><div class='add'>+	case WM8958_MBC_RMS_LIMIT_1:</div><div class='add'>+	case WM8958_MBC_RMS_LIMIT_2:</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return wm8994_readable_register(dev, reg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool wm8994_volatile_register(struct device *dev, unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case WM8994_SOFTWARE_RESET:</div><div class='add'>+	case WM8994_DC_SERVO_1:</div><div class='add'>+	case WM8994_DC_SERVO_READBACK:</div><div class='add'>+	case WM8994_RATE_STATUS:</div><div class='add'>+	case WM8958_MIC_DETECT_3:</div><div class='add'>+	case WM8994_DC_SERVO_4E:</div><div class='add'>+	case WM8994_CHIP_REVISION:</div><div class='add'>+	case WM8994_INTERRUPT_STATUS_1:</div><div class='add'>+	case WM8994_INTERRUPT_STATUS_2:</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 bool wm1811_volatile_register(struct device *dev, unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	struct wm8994 *wm8994 = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case WM8994_GPIO_6:</div><div class='add'>+		if (wm8994-&gt;revision &gt; 1)</div><div class='add'>+			return true;</div><div class='add'>+		else</div><div class='add'>+			return false;</div><div class='add'>+	default:</div><div class='add'>+		return wm8994_volatile_register(dev, reg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool wm8958_volatile_register(struct device *dev, unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case WM8958_DSP2_MAGICNUM:</div><div class='add'>+	case WM8958_DSP2_RELEASEYEAR:</div><div class='add'>+	case WM8958_DSP2_RELEASEMONTHDAY:</div><div class='add'>+	case WM8958_DSP2_RELEASETIME:</div><div class='add'>+	case WM8958_DSP2_VERMAJMIN:</div><div class='add'>+	case WM8958_DSP2_VERBUILD:</div><div class='add'>+	case WM8958_DSP2_EXECCONTROL:</div><div class='add'>+	case WM8958_DSP2_SWVERSIONREG:</div><div class='add'>+	case WM8958_DSP2_CONFIGXMEM:</div><div class='add'>+	case WM8958_DSP2_CONFIGYMEM:</div><div class='add'>+	case WM8958_DSP2_CONFIGZMEM:</div><div class='add'>+	case WM8958_FW_BUILD_1:</div><div class='add'>+	case WM8958_FW_BUILD_0:</div><div class='add'>+	case WM8958_FW_ID_1:</div><div class='add'>+	case WM8958_FW_ID_0:</div><div class='add'>+	case WM8958_FW_MAJOR_1:</div><div class='add'>+	case WM8958_FW_MAJOR_0:</div><div class='add'>+	case WM8958_FW_MINOR_1:</div><div class='add'>+	case WM8958_FW_MINOR_0:</div><div class='add'>+	case WM8958_FW_PATCH_1:</div><div class='add'>+	case WM8958_FW_PATCH_0:</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return wm8994_volatile_register(dev, reg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct regmap_config wm1811_regmap_config = {</div><div class='add'>+	.reg_bits = 16,</div><div class='add'>+	.val_bits = 16,</div><div class='add'>+</div><div class='add'>+	.cache_type = REGCACHE_RBTREE,</div><div class='add'>+</div><div class='add'>+	.reg_defaults = wm1811_defaults,</div><div class='add'>+	.num_reg_defaults = ARRAY_SIZE(wm1811_defaults),</div><div class='add'>+</div><div class='add'>+	.max_register = WM8994_MAX_REGISTER,</div><div class='add'>+	.volatile_reg = wm1811_volatile_register,</div><div class='add'>+	.readable_reg = wm1811_readable_register,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct regmap_config wm8994_regmap_config = {</div><div class='add'>+	.reg_bits = 16,</div><div class='add'>+	.val_bits = 16,</div><div class='add'>+</div><div class='add'>+	.cache_type = REGCACHE_RBTREE,</div><div class='add'>+</div><div class='add'>+	.reg_defaults = wm8994_defaults,</div><div class='add'>+	.num_reg_defaults = ARRAY_SIZE(wm8994_defaults),</div><div class='add'>+</div><div class='add'>+	.max_register = WM8994_MAX_REGISTER,</div><div class='add'>+	.volatile_reg = wm8994_volatile_register,</div><div class='add'>+	.readable_reg = wm8994_readable_register,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct regmap_config wm8958_regmap_config = {</div><div class='add'>+	.reg_bits = 16,</div><div class='add'>+	.val_bits = 16,</div><div class='add'>+</div><div class='add'>+	.cache_type = REGCACHE_RBTREE,</div><div class='add'>+</div><div class='add'>+	.reg_defaults = wm8958_defaults,</div><div class='add'>+	.num_reg_defaults = ARRAY_SIZE(wm8958_defaults),</div><div class='add'>+</div><div class='add'>+	.max_register = WM8994_MAX_REGISTER,</div><div class='add'>+	.volatile_reg = wm8958_volatile_register,</div><div class='add'>+	.readable_reg = wm8958_readable_register,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct regmap_config wm8994_base_regmap_config = {</div><div class='add'>+	.reg_bits = 16,</div><div class='add'>+	.val_bits = 16,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/mfd/wm8994.h b/drivers/mfd/wm8994.h<br/>new file mode 100644<br/>index 000000000000..6f39a84eeadf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/wm8994.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mfd/wm8994.h</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+/*</div><div class='add'>+ * wm8994.h -- WM8994 MFD internals</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='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ *  under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ *  option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MFD_WM8994_H__</div><div class='add'>+#define __MFD_WM8994_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+extern struct regmap_config wm1811_regmap_config;</div><div class='add'>+extern struct regmap_config wm8994_regmap_config;</div><div class='add'>+extern struct regmap_config wm8958_regmap_config;</div><div class='add'>+extern struct regmap_config wm8994_base_regmap_config;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig<br/>index 5664696f2d3a..6a1a092db146 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/Kconfig</a></div><div class='hunk'>@@ -500,6 +500,14 @@ config USB_SWITCH_FSA9480</div><div class='ctx'> 	  stereo and mono audio, video, microphone and UART data to use</div><div class='ctx'> 	  a common connector port.</div><div class='ctx'> </div><div class='add'>+config MAX8997_MUIC</div><div class='add'>+	tristate "MAX8997 MUIC Support"</div><div class='add'>+	depends on MFD_MAX8997</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for the MUIC device of</div><div class='add'>+	  Maxim MAX8997 PMIC.</div><div class='add'>+	  The MAX8997 MUIC is a USB port accessory detector and switch.</div><div class='add'>+</div><div class='ctx'> source "drivers/misc/c2port/Kconfig"</div><div class='ctx'> source "drivers/misc/eeprom/Kconfig"</div><div class='ctx'> source "drivers/misc/cb710/Kconfig"</div><div class='head'>diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile<br/>index b26495a02554..3e1d80106f04 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/Makefile</a></div><div class='hunk'>@@ -48,3 +48,4 @@ obj-y				+= lis3lv02d/</div><div class='ctx'> obj-y				+= carma/</div><div class='ctx'> obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o</div><div class='ctx'> obj-$(CONFIG_ALTERA_STAPL)	+=altera-stapl/</div><div class='add'>+obj-$(CONFIG_MAX8997_MUIC)	+= max8997-muic.o</div><div class='head'>diff --git a/drivers/misc/ab8500-pwm.c b/drivers/misc/ab8500-pwm.c<br/>index 2208a9d52622..d7a9aa14e5d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ab8500-pwm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ab8500-pwm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ab8500-pwm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ab8500-pwm.c</a></div><div class='hunk'>@@ -8,8 +8,8 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/pwm.h&gt;</div><div class='del'>-#include &lt;linux/mfd/ab8500.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/abx500.h&gt;</div><div class='add'>+#include &lt;linux/mfd/abx500/ab8500.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/misc/ad525x_dpot-i2c.c b/drivers/misc/ad525x_dpot-i2c.c<br/>index a39e0555df63..83adab69bfd4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ad525x_dpot-i2c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ad525x_dpot-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ad525x_dpot-i2c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ad525x_dpot-i2c.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for the Analog Devices digital potentiometers (I2C bus)</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2010 Michael Hennerich, Analog Devices Inc.</div><div class='add'>+ * Copyright (C) 2010-2011 Michael Hennerich, Analog Devices Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "ad525x_dpot.h"</div><div class='ctx'> </div><div class='del'>-/* ------------------------------------------------------------------------- */</div><div class='ctx'> /* I2C bus functions */</div><div class='ctx'> static int write_d8(void *client, u8 val)</div><div class='ctx'> {</div><div class='hunk'>@@ -60,18 +59,13 @@ static int __devinit ad_dpot_i2c_probe(struct i2c_client *client,</div><div class='ctx'> 		.bops = &amp;bops,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	struct ad_dpot_id dpot_id = {</div><div class='del'>-		.name = (char *) &amp;id-&gt;name,</div><div class='del'>-		.devid = id-&gt;driver_data,</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	if (!i2c_check_functionality(client-&gt;adapter,</div><div class='ctx'> 				     I2C_FUNC_SMBUS_WORD_DATA)) {</div><div class='ctx'> 		dev_err(&amp;client-&gt;dev, "SMBUS Word Data not Supported\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ad_dpot_probe(&amp;client-&gt;dev, &amp;bdata, &amp;dpot_id);</div><div class='add'>+	return ad_dpot_probe(&amp;client-&gt;dev, &amp;bdata, id-&gt;driver_data, id-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __devexit ad_dpot_i2c_remove(struct i2c_client *client)</div><div class='head'>diff --git a/drivers/misc/ad525x_dpot-spi.c b/drivers/misc/ad525x_dpot-spi.c<br/>index 7f9a55afe05d..822749e41fea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ad525x_dpot-spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ad525x_dpot-spi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ad525x_dpot-spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ad525x_dpot-spi.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for the Analog Devices digital potentiometers (SPI bus)</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2010 Michael Hennerich, Analog Devices Inc.</div><div class='add'>+ * Copyright (C) 2010-2011 Michael Hennerich, Analog Devices Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='hunk'>@@ -11,40 +11,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "ad525x_dpot.h"</div><div class='ctx'> </div><div class='del'>-static const struct ad_dpot_id ad_dpot_spi_devlist[] = {</div><div class='del'>-	{.name = "ad5160", .devid = AD5160_ID},</div><div class='del'>-	{.name = "ad5161", .devid = AD5161_ID},</div><div class='del'>-	{.name = "ad5162", .devid = AD5162_ID},</div><div class='del'>-	{.name = "ad5165", .devid = AD5165_ID},</div><div class='del'>-	{.name = "ad5200", .devid = AD5200_ID},</div><div class='del'>-	{.name = "ad5201", .devid = AD5201_ID},</div><div class='del'>-	{.name = "ad5203", .devid = AD5203_ID},</div><div class='del'>-	{.name = "ad5204", .devid = AD5204_ID},</div><div class='del'>-	{.name = "ad5206", .devid = AD5206_ID},</div><div class='del'>-	{.name = "ad5207", .devid = AD5207_ID},</div><div class='del'>-	{.name = "ad5231", .devid = AD5231_ID},</div><div class='del'>-	{.name = "ad5232", .devid = AD5232_ID},</div><div class='del'>-	{.name = "ad5233", .devid = AD5233_ID},</div><div class='del'>-	{.name = "ad5235", .devid = AD5235_ID},</div><div class='del'>-	{.name = "ad5260", .devid = AD5260_ID},</div><div class='del'>-	{.name = "ad5262", .devid = AD5262_ID},</div><div class='del'>-	{.name = "ad5263", .devid = AD5263_ID},</div><div class='del'>-	{.name = "ad5290", .devid = AD5290_ID},</div><div class='del'>-	{.name = "ad5291", .devid = AD5291_ID},</div><div class='del'>-	{.name = "ad5292", .devid = AD5292_ID},</div><div class='del'>-	{.name = "ad5293", .devid = AD5293_ID},</div><div class='del'>-	{.name = "ad7376", .devid = AD7376_ID},</div><div class='del'>-	{.name = "ad8400", .devid = AD8400_ID},</div><div class='del'>-	{.name = "ad8402", .devid = AD8402_ID},</div><div class='del'>-	{.name = "ad8403", .devid = AD8403_ID},</div><div class='del'>-	{.name = "adn2850", .devid = ADN2850_ID},</div><div class='del'>-	{.name = "ad5270", .devid = AD5270_ID},</div><div class='del'>-	{.name = "ad5271", .devid = AD5271_ID},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ------------------------------------------------------------------------- */</div><div class='del'>-</div><div class='ctx'> /* SPI bus functions */</div><div class='ctx'> static int write8(void *client, u8 val)</div><div class='ctx'> {</div><div class='hunk'>@@ -109,36 +75,16 @@ static const struct ad_dpot_bus_ops bops = {</div><div class='ctx'> 	.write_r8d8	= write16,</div><div class='ctx'> 	.write_r8d16	= write24,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static const struct ad_dpot_id *dpot_match_id(const struct ad_dpot_id *id,</div><div class='del'>-						char *name)</div><div class='del'>-{</div><div class='del'>-	while (id-&gt;name &amp;&amp; id-&gt;name[0]) {</div><div class='del'>-		if (strcmp(name, id-&gt;name) == 0)</div><div class='del'>-			return id;</div><div class='del'>-		id++;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __devinit ad_dpot_spi_probe(struct spi_device *spi)</div><div class='ctx'> {</div><div class='del'>-	char *name = spi-&gt;dev.platform_data;</div><div class='del'>-	const struct ad_dpot_id *dpot_id;</div><div class='del'>-</div><div class='ctx'> 	struct ad_dpot_bus_data bdata = {</div><div class='ctx'> 		.client = spi,</div><div class='ctx'> 		.bops = &amp;bops,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	dpot_id = dpot_match_id(ad_dpot_spi_devlist, name);</div><div class='del'>-</div><div class='del'>-	if (dpot_id == NULL) {</div><div class='del'>-		dev_err(&amp;spi-&gt;dev, "%s not in supported device list", name);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ad_dpot_probe(&amp;spi-&gt;dev, &amp;bdata, dpot_id);</div><div class='add'>+	return ad_dpot_probe(&amp;spi-&gt;dev, &amp;bdata,</div><div class='add'>+			     spi_get_device_id(spi)-&gt;driver_data,</div><div class='add'>+			     spi_get_device_id(spi)-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __devexit ad_dpot_spi_remove(struct spi_device *spi)</div><div class='hunk'>@@ -146,14 +92,47 @@ static int __devexit ad_dpot_spi_remove(struct spi_device *spi)</div><div class='ctx'> 	return ad_dpot_remove(&amp;spi-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct spi_device_id ad_dpot_spi_id[] = {</div><div class='add'>+	{"ad5160", AD5160_ID},</div><div class='add'>+	{"ad5161", AD5161_ID},</div><div class='add'>+	{"ad5162", AD5162_ID},</div><div class='add'>+	{"ad5165", AD5165_ID},</div><div class='add'>+	{"ad5200", AD5200_ID},</div><div class='add'>+	{"ad5201", AD5201_ID},</div><div class='add'>+	{"ad5203", AD5203_ID},</div><div class='add'>+	{"ad5204", AD5204_ID},</div><div class='add'>+	{"ad5206", AD5206_ID},</div><div class='add'>+	{"ad5207", AD5207_ID},</div><div class='add'>+	{"ad5231", AD5231_ID},</div><div class='add'>+	{"ad5232", AD5232_ID},</div><div class='add'>+	{"ad5233", AD5233_ID},</div><div class='add'>+	{"ad5235", AD5235_ID},</div><div class='add'>+	{"ad5260", AD5260_ID},</div><div class='add'>+	{"ad5262", AD5262_ID},</div><div class='add'>+	{"ad5263", AD5263_ID},</div><div class='add'>+	{"ad5290", AD5290_ID},</div><div class='add'>+	{"ad5291", AD5291_ID},</div><div class='add'>+	{"ad5292", AD5292_ID},</div><div class='add'>+	{"ad5293", AD5293_ID},</div><div class='add'>+	{"ad7376", AD7376_ID},</div><div class='add'>+	{"ad8400", AD8400_ID},</div><div class='add'>+	{"ad8402", AD8402_ID},</div><div class='add'>+	{"ad8403", AD8403_ID},</div><div class='add'>+	{"adn2850", ADN2850_ID},</div><div class='add'>+	{"ad5270", AD5270_ID},</div><div class='add'>+	{"ad5271", AD5271_ID},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(spi, ad_dpot_spi_id);</div><div class='add'>+</div><div class='ctx'> static struct spi_driver ad_dpot_spi_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "ad_dpot",</div><div class='del'>-		.bus	= &amp;spi_bus_type,</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= ad_dpot_spi_probe,</div><div class='ctx'> 	.remove		= __devexit_p(ad_dpot_spi_remove),</div><div class='add'>+	.id_table	= ad_dpot_spi_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ad_dpot_spi_init(void)</div><div class='head'>diff --git a/drivers/misc/ad525x_dpot.c b/drivers/misc/ad525x_dpot.c<br/>index 7cb911028d09..1d1d42615915 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ad525x_dpot.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ad525x_dpot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ad525x_dpot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ad525x_dpot.c</a></div><div class='hunk'>@@ -64,7 +64,7 @@</div><div class='ctx'>  * Author: Chris Verges &lt;chrisv@cyberswitching.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * derived from ad5252.c</div><div class='del'>- * Copyright (c) 2006 Michael Hennerich &lt;hennerich@blackfin.uclinux.org&gt;</div><div class='add'>+ * Copyright (c) 2006-2011 Michael Hennerich &lt;hennerich@blackfin.uclinux.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Licensed under the GPL-2 or later.</div><div class='ctx'>  */</div><div class='hunk'>@@ -76,8 +76,6 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#define DRIVER_VERSION			"0.2"</div><div class='del'>-</div><div class='ctx'> #include "ad525x_dpot.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -687,8 +685,9 @@ inline void ad_dpot_remove_files(struct device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__devinit int ad_dpot_probe(struct device *dev,</div><div class='del'>-		struct ad_dpot_bus_data *bdata, const struct ad_dpot_id *id)</div><div class='add'>+int __devinit ad_dpot_probe(struct device *dev,</div><div class='add'>+		struct ad_dpot_bus_data *bdata, unsigned long devid,</div><div class='add'>+			    const char *name)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	struct dpot_data *data;</div><div class='hunk'>@@ -704,13 +703,13 @@ __devinit int ad_dpot_probe(struct device *dev,</div><div class='ctx'> 	mutex_init(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;bdata = *bdata;</div><div class='del'>-	data-&gt;devid = id-&gt;devid;</div><div class='add'>+	data-&gt;devid = devid;</div><div class='ctx'> </div><div class='del'>-	data-&gt;max_pos = 1 &lt;&lt; DPOT_MAX_POS(data-&gt;devid);</div><div class='add'>+	data-&gt;max_pos = 1 &lt;&lt; DPOT_MAX_POS(devid);</div><div class='ctx'> 	data-&gt;rdac_mask = data-&gt;max_pos - 1;</div><div class='del'>-	data-&gt;feat = DPOT_FEAT(data-&gt;devid);</div><div class='del'>-	data-&gt;uid = DPOT_UID(data-&gt;devid);</div><div class='del'>-	data-&gt;wipers = DPOT_WIPERS(data-&gt;devid);</div><div class='add'>+	data-&gt;feat = DPOT_FEAT(devid);</div><div class='add'>+	data-&gt;uid = DPOT_UID(devid);</div><div class='add'>+	data-&gt;wipers = DPOT_WIPERS(devid);</div><div class='ctx'> </div><div class='ctx'> 	for (i = DPOT_RDAC0; i &lt; MAX_RDACS; i++)</div><div class='ctx'> 		if (data-&gt;wipers &amp; (1 &lt;&lt; i)) {</div><div class='hunk'>@@ -731,7 +730,7 @@ __devinit int ad_dpot_probe(struct device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_info(dev, "%s %d-Position Digital Potentiometer registered\n",</div><div class='del'>-		 id-&gt;name, data-&gt;max_pos);</div><div class='add'>+		 name, data-&gt;max_pos);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -745,7 +744,7 @@ exit_free:</div><div class='ctx'> 	dev_set_drvdata(dev, NULL);</div><div class='ctx'> exit:</div><div class='ctx'> 	dev_err(dev, "failed to create client for %s ID 0x%lX\n",</div><div class='del'>-			id-&gt;name, id-&gt;devid);</div><div class='add'>+		name, devid);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ad_dpot_probe);</div><div class='hunk'>@@ -770,4 +769,3 @@ MODULE_AUTHOR("Chris Verges &lt;chrisv@cyberswitching.com&gt;, "</div><div class='ctx'> 	      "Michael Hennerich &lt;hennerich@blackfin.uclinux.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Digital potentiometer driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(DRIVER_VERSION);</div><div class='head'>diff --git a/drivers/misc/ad525x_dpot.h b/drivers/misc/ad525x_dpot.h<br/>index 82b2cb77ae19..6bd1eba23bc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ad525x_dpot.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ad525x_dpot.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ad525x_dpot.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ad525x_dpot.h</a></div><div class='hunk'>@@ -208,12 +208,8 @@ struct ad_dpot_bus_data {</div><div class='ctx'> 	const struct ad_dpot_bus_ops *bops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct ad_dpot_id {</div><div class='del'>-	char *name;</div><div class='del'>-	unsigned long devid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int ad_dpot_probe(struct device *dev, struct ad_dpot_bus_data *bdata, const struct ad_dpot_id *id);</div><div class='add'>+int ad_dpot_probe(struct device *dev, struct ad_dpot_bus_data *bdata,</div><div class='add'>+		  unsigned long devid, const char *name);</div><div class='ctx'> int ad_dpot_remove(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/misc/bmp085.c b/drivers/misc/bmp085.c<br/>index 5f898cb706a6..b29a2be24591 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/bmp085.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/bmp085.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/bmp085.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/bmp085.c</a></div><div class='hunk'>@@ -216,7 +216,7 @@ static s32 bmp085_get_temperature(struct bmp085_data *data, int *temperature)</div><div class='ctx'> 		*temperature = (x1+x2+8) &gt;&gt; 4;</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='del'>-	return status;;</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c<br/>index eb5cd28bc6d8..a2d25e4857e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/carma/carma-fpga-program.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/carma/carma-fpga-program.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/carma/carma-fpga-program.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/carma/carma-fpga-program.c</a></div><div class='hunk'>@@ -513,7 +513,7 @@ static noinline int fpga_program_dma(struct fpga_dev *priv)</div><div class='ctx'> 	 * transaction, and then put it under external control</div><div class='ctx'> 	 */</div><div class='ctx'> 	memset(&amp;config, 0, sizeof(config));</div><div class='del'>-	config.direction = DMA_TO_DEVICE;</div><div class='add'>+	config.direction = DMA_MEM_TO_DEV;</div><div class='ctx'> 	config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;</div><div class='ctx'> 	config.dst_maxburst = fpga_fifo_size(priv-&gt;regs) / 2 / 4;</div><div class='ctx'> 	ret = chan-&gt;device-&gt;device_control(chan, DMA_SLAVE_CONFIG,</div><div class='head'>diff --git a/drivers/misc/eeprom/eeprom_93cx6.c b/drivers/misc/eeprom/eeprom_93cx6.c<br/>index 7b33de95c4bf..0ff4b02177be 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/eeprom/eeprom_93cx6.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/eeprom/eeprom_93cx6.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/eeprom/eeprom_93cx6.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/eeprom/eeprom_93cx6.c</a></div><div class='hunk'>@@ -63,6 +63,7 @@ static void eeprom_93cx6_startup(struct eeprom_93cx6 *eeprom)</div><div class='ctx'> 	eeprom-&gt;reg_data_out = 0;</div><div class='ctx'> 	eeprom-&gt;reg_data_clock = 0;</div><div class='ctx'> 	eeprom-&gt;reg_chip_select = 1;</div><div class='add'>+	eeprom-&gt;drive_data = 1;</div><div class='ctx'> 	eeprom-&gt;register_write(eeprom);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -101,6 +102,7 @@ static void eeprom_93cx6_write_bits(struct eeprom_93cx6 *eeprom,</div><div class='ctx'> 	 */</div><div class='ctx'> 	eeprom-&gt;reg_data_in = 0;</div><div class='ctx'> 	eeprom-&gt;reg_data_out = 0;</div><div class='add'>+	eeprom-&gt;drive_data = 1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Start writing all bits.</div><div class='hunk'>@@ -140,6 +142,7 @@ static void eeprom_93cx6_read_bits(struct eeprom_93cx6 *eeprom,</div><div class='ctx'> 	 */</div><div class='ctx'> 	eeprom-&gt;reg_data_in = 0;</div><div class='ctx'> 	eeprom-&gt;reg_data_out = 0;</div><div class='add'>+	eeprom-&gt;drive_data = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Start reading all bits.</div><div class='hunk'>@@ -231,3 +234,88 @@ void eeprom_93cx6_multiread(struct eeprom_93cx6 *eeprom, const u8 word,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(eeprom_93cx6_multiread);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * eeprom_93cx6_wren - set the write enable state</div><div class='add'>+ * @eeprom: Pointer to eeprom structure</div><div class='add'>+ * @enable: true to enable writes, otherwise disable writes</div><div class='add'>+ *</div><div class='add'>+ * Set the EEPROM write enable state to either allow or deny</div><div class='add'>+ * writes depending on the @enable value.</div><div class='add'>+ */</div><div class='add'>+void eeprom_93cx6_wren(struct eeprom_93cx6 *eeprom, bool enable)</div><div class='add'>+{</div><div class='add'>+	u16 command;</div><div class='add'>+</div><div class='add'>+	/* start the command */</div><div class='add'>+	eeprom_93cx6_startup(eeprom);</div><div class='add'>+</div><div class='add'>+	/* create command to enable/disable */</div><div class='add'>+</div><div class='add'>+	command = enable ? PCI_EEPROM_EWEN_OPCODE : PCI_EEPROM_EWDS_OPCODE;</div><div class='add'>+	command &lt;&lt;= (eeprom-&gt;width - 2);</div><div class='add'>+</div><div class='add'>+	eeprom_93cx6_write_bits(eeprom, command,</div><div class='add'>+				PCI_EEPROM_WIDTH_OPCODE + eeprom-&gt;width);</div><div class='add'>+</div><div class='add'>+	eeprom_93cx6_cleanup(eeprom);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(eeprom_93cx6_wren);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * eeprom_93cx6_write - write data to the EEPROM</div><div class='add'>+ * @eeprom: Pointer to eeprom structure</div><div class='add'>+ * @addr: Address to write data to.</div><div class='add'>+ * @data: The data to write to address @addr.</div><div class='add'>+ *</div><div class='add'>+ * Write the @data to the specified @addr in the EEPROM and</div><div class='add'>+ * waiting for the device to finish writing.</div><div class='add'>+ *</div><div class='add'>+ * Note, since we do not expect large number of write operations</div><div class='add'>+ * we delay in between parts of the operation to avoid using excessive</div><div class='add'>+ * amounts of CPU time busy waiting.</div><div class='add'>+ */</div><div class='add'>+void eeprom_93cx6_write(struct eeprom_93cx6 *eeprom, u8 addr, u16 data)</div><div class='add'>+{</div><div class='add'>+	int timeout = 100;</div><div class='add'>+	u16 command;</div><div class='add'>+</div><div class='add'>+	/* start the command */</div><div class='add'>+	eeprom_93cx6_startup(eeprom);</div><div class='add'>+</div><div class='add'>+	command = PCI_EEPROM_WRITE_OPCODE &lt;&lt; eeprom-&gt;width;</div><div class='add'>+	command |= addr;</div><div class='add'>+</div><div class='add'>+	/* send write command */</div><div class='add'>+	eeprom_93cx6_write_bits(eeprom, command,</div><div class='add'>+				PCI_EEPROM_WIDTH_OPCODE + eeprom-&gt;width);</div><div class='add'>+</div><div class='add'>+	/* send data */</div><div class='add'>+	eeprom_93cx6_write_bits(eeprom, data, 16);</div><div class='add'>+</div><div class='add'>+	/* get ready to check for busy */</div><div class='add'>+	eeprom-&gt;drive_data = 0;</div><div class='add'>+	eeprom-&gt;reg_chip_select = 1;</div><div class='add'>+	eeprom-&gt;register_write(eeprom);</div><div class='add'>+</div><div class='add'>+	/* wait at-least 250ns to get DO to be the busy signal */</div><div class='add'>+	usleep_range(1000, 2000);</div><div class='add'>+</div><div class='add'>+	/* wait for DO to go high to signify finish */</div><div class='add'>+</div><div class='add'>+	while (true) {</div><div class='add'>+		eeprom-&gt;register_read(eeprom);</div><div class='add'>+</div><div class='add'>+		if (eeprom-&gt;reg_data_out)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		usleep_range(1000, 2000);</div><div class='add'>+</div><div class='add'>+		if (--timeout &lt;= 0) {</div><div class='add'>+			printk(KERN_ERR "%s: timeout\n", __func__);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	eeprom_93cx6_cleanup(eeprom);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(eeprom_93cx6_write);</div><div class='head'>diff --git a/drivers/misc/ibmasm/command.c b/drivers/misc/ibmasm/command.c<br/>index 5c766b4fb238..7d56f45dee19 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/command.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/command.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/command.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ibmasm/command.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) IBM Corporation, 2004</div><div class='ctx'>  *</div><div class='del'>- * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='add'>+ * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/ibmasm/dot_command.c b/drivers/misc/ibmasm/dot_command.c<br/>index 3dd2dfb8da17..d7b2ca358b23 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/dot_command.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/dot_command.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/dot_command.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ibmasm/dot_command.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) IBM Corporation, 2004</div><div class='ctx'>  *</div><div class='del'>- * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='add'>+ * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/ibmasm/dot_command.h b/drivers/misc/ibmasm/dot_command.h<br/>index 6cbba1afef35..fc9fc9d4e087 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/dot_command.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/dot_command.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/dot_command.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ibmasm/dot_command.h</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) IBM Corporation, 2004</div><div class='ctx'>  *</div><div class='del'>- * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='add'>+ * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/ibmasm/event.c b/drivers/misc/ibmasm/event.c<br/>index 76bfda1ffaa9..8e540f4e9d52 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/event.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/event.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/event.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ibmasm/event.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) IBM Corporation, 2004</div><div class='ctx'>  *</div><div class='del'>- * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='add'>+ * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/ibmasm/heartbeat.c b/drivers/misc/ibmasm/heartbeat.c<br/>index 1bc4306572a4..90746378f9b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/heartbeat.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/heartbeat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/heartbeat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ibmasm/heartbeat.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) IBM Corporation, 2004</div><div class='ctx'>  *</div><div class='del'>- * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='add'>+ * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/ibmasm/i2o.h b/drivers/misc/ibmasm/i2o.h<br/>index bf2c738d2b72..2e9566dab2b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/i2o.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/i2o.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/i2o.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ibmasm/i2o.h</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) IBM Corporation, 2004</div><div class='ctx'>  *</div><div class='del'>- * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='add'>+ * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/ibmasm/ibmasm.h b/drivers/misc/ibmasm/ibmasm.h<br/>index 4d8a4e248b34..9b083448814d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/ibmasm.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/ibmasm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/ibmasm.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ibmasm/ibmasm.h</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) IBM Corporation, 2004</div><div class='ctx'>  *</div><div class='del'>- * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='add'>+ * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c<br/>index 89947723a27d..35361753b487 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/ibmasmfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/ibmasmfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/ibmasmfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ibmasm/ibmasmfs.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) IBM Corporation, 2004</div><div class='ctx'>  *</div><div class='del'>- * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='add'>+ * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/ibmasm/lowlevel.c b/drivers/misc/ibmasm/lowlevel.c<br/>index 4b2398e27fd5..5319ea261c05 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/lowlevel.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/lowlevel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/lowlevel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ibmasm/lowlevel.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) IBM Corporation, 2004</div><div class='ctx'>  *</div><div class='del'>- * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='add'>+ * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/ibmasm/lowlevel.h b/drivers/misc/ibmasm/lowlevel.h<br/>index 766766523a60..e97848f51b3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/lowlevel.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/lowlevel.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/lowlevel.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ibmasm/lowlevel.h</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) IBM Corporation, 2004</div><div class='ctx'>  *</div><div class='del'>- * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='add'>+ * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c<br/>index a234d965243b..1ccedb71e728 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/module.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/module.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/module.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ibmasm/module.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) IBM Corporation, 2004</div><div class='ctx'>  *</div><div class='del'>- * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='add'>+ * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This driver is based on code originally written by Pete Reynolds</div><div class='ctx'>  * and others.</div><div class='head'>diff --git a/drivers/misc/ibmasm/r_heartbeat.c b/drivers/misc/ibmasm/r_heartbeat.c<br/>index 2de487ac788c..232034f5da48 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/r_heartbeat.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/r_heartbeat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/r_heartbeat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ibmasm/r_heartbeat.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) IBM Corporation, 2004</div><div class='ctx'>  *</div><div class='del'>- * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='add'>+ * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/ibmasm/remote.h b/drivers/misc/ibmasm/remote.h<br/>index 00dbf1d4373a..a7729ef76acb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/remote.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/remote.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/remote.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ibmasm/remote.h</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) IBM Corporation, 2004</div><div class='ctx'>  *</div><div class='del'>- * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='add'>+ * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Originally written by Pete Reynolds</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/misc/ibmasm/uart.c b/drivers/misc/ibmasm/uart.c<br/>index 93baa350d698..1dcb9ae1905a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/uart.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ibmasm/uart.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/uart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ibmasm/uart.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) IBM Corporation, 2004</div><div class='ctx'>  *</div><div class='del'>- * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='add'>+ * Author: Max Asböck &lt;amax@us.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/isl29020.c b/drivers/misc/isl29020.c<br/>index 307aada5fffe..3d6cce663bea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/isl29020.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/isl29020.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/isl29020.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/isl29020.c</a></div><div class='hunk'>@@ -158,7 +158,7 @@ static int als_set_default_config(struct i2c_client *client)</div><div class='ctx'> 		dev_err(&amp;client-&gt;dev, "default write failed.");</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int  isl29020_probe(struct i2c_client *client,</div><div class='head'>diff --git a/drivers/misc/iwmc3200top/main.c b/drivers/misc/iwmc3200top/main.c<br/>index b1f4563be9ae..701eb600b127 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/iwmc3200top/main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/iwmc3200top/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/iwmc3200top/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/iwmc3200top/main.c</a></div><div class='hunk'>@@ -376,20 +376,20 @@ static int blocks;</div><div class='ctx'> module_param(blocks, int, 0604);</div><div class='ctx'> MODULE_PARM_DESC(blocks, "max_blocks_to_send");</div><div class='ctx'> </div><div class='del'>-static int dump;</div><div class='add'>+static bool dump;</div><div class='ctx'> module_param(dump, bool, 0604);</div><div class='ctx'> MODULE_PARM_DESC(dump, "dump_hex_content");</div><div class='ctx'> </div><div class='del'>-static int jump = 1;</div><div class='add'>+static bool jump = 1;</div><div class='ctx'> module_param(jump, bool, 0604);</div><div class='ctx'> </div><div class='del'>-static int direct = 1;</div><div class='add'>+static bool direct = 1;</div><div class='ctx'> module_param(direct, bool, 0604);</div><div class='ctx'> </div><div class='del'>-static int checksum = 1;</div><div class='add'>+static bool checksum = 1;</div><div class='ctx'> module_param(checksum, bool, 0604);</div><div class='ctx'> </div><div class='del'>-static int fw_download = 1;</div><div class='add'>+static bool fw_download = 1;</div><div class='ctx'> module_param(fw_download, bool, 0604);</div><div class='ctx'> </div><div class='ctx'> static int block_size = IWMC_SDIO_BLK_SIZE;</div><div class='hunk'>@@ -398,7 +398,7 @@ module_param(block_size, int, 0404);</div><div class='ctx'> static int download_trans_blks = IWMC_DEFAULT_TR_BLK;</div><div class='ctx'> module_param(download_trans_blks, int, 0604);</div><div class='ctx'> </div><div class='del'>-static int rubbish_barker;</div><div class='add'>+static bool rubbish_barker;</div><div class='ctx'> module_param(rubbish_barker, bool, 0604);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IWMC3200TOP_DEBUG</div><div class='head'>diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c<br/>index 29d12a70eb1b..a981e2a42f92 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/lis3lv02d/lis3lv02d.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/lis3lv02d/lis3lv02d.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/lis3lv02d/lis3lv02d.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/lis3lv02d/lis3lv02d.c</a></div><div class='hunk'>@@ -111,6 +111,8 @@ static struct kernel_param_ops param_ops_axis = {</div><div class='ctx'> 	.get = param_get_int,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define param_check_axis(name, p) param_check_int(name, p)</div><div class='add'>+</div><div class='ctx'> module_param_array_named(axes, lis3_dev.ac.as_array, axis, NULL, 0644);</div><div class='ctx'> MODULE_PARM_DESC(axes, "Axis-mapping for x,y,z directions");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/misc/max8997-muic.c b/drivers/misc/max8997-muic.c<br/>new file mode 100644<br/>index 000000000000..d74ef41aabd5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/max8997-muic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/max8997-muic.c</a></div><div class='hunk'>@@ -0,0 +1,505 @@</div><div class='add'>+/*</div><div class='add'>+ * max8997-muic.c - MAX8997 muic driver for the Maxim 8997</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2011 Samsung Electrnoics</div><div class='add'>+ *  Donggeun Kim &lt;dg77.kim@samsung.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'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</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/i2c.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/err.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/kobject.h&gt;</div><div class='add'>+#include &lt;linux/mfd/max8997.h&gt;</div><div class='add'>+#include &lt;linux/mfd/max8997-private.h&gt;</div><div class='add'>+</div><div class='add'>+/* MAX8997-MUIC STATUS1 register */</div><div class='add'>+#define STATUS1_ADC_SHIFT		0</div><div class='add'>+#define STATUS1_ADCLOW_SHIFT		5</div><div class='add'>+#define STATUS1_ADCERR_SHIFT		6</div><div class='add'>+#define STATUS1_ADC_MASK		(0x1f &lt;&lt; STATUS1_ADC_SHIFT)</div><div class='add'>+#define STATUS1_ADCLOW_MASK		(0x1 &lt;&lt; STATUS1_ADCLOW_SHIFT)</div><div class='add'>+#define STATUS1_ADCERR_MASK		(0x1 &lt;&lt; STATUS1_ADCERR_SHIFT)</div><div class='add'>+</div><div class='add'>+/* MAX8997-MUIC STATUS2 register */</div><div class='add'>+#define STATUS2_CHGTYP_SHIFT		0</div><div class='add'>+#define STATUS2_CHGDETRUN_SHIFT		3</div><div class='add'>+#define STATUS2_DCDTMR_SHIFT		4</div><div class='add'>+#define STATUS2_DBCHG_SHIFT		5</div><div class='add'>+#define STATUS2_VBVOLT_SHIFT		6</div><div class='add'>+#define STATUS2_CHGTYP_MASK		(0x7 &lt;&lt; STATUS2_CHGTYP_SHIFT)</div><div class='add'>+#define STATUS2_CHGDETRUN_MASK		(0x1 &lt;&lt; STATUS2_CHGDETRUN_SHIFT)</div><div class='add'>+#define STATUS2_DCDTMR_MASK		(0x1 &lt;&lt; STATUS2_DCDTMR_SHIFT)</div><div class='add'>+#define STATUS2_DBCHG_MASK		(0x1 &lt;&lt; STATUS2_DBCHG_SHIFT)</div><div class='add'>+#define STATUS2_VBVOLT_MASK		(0x1 &lt;&lt; STATUS2_VBVOLT_SHIFT)</div><div class='add'>+</div><div class='add'>+/* MAX8997-MUIC STATUS3 register */</div><div class='add'>+#define STATUS3_OVP_SHIFT		2</div><div class='add'>+#define STATUS3_OVP_MASK		(0x1 &lt;&lt; STATUS3_OVP_SHIFT)</div><div class='add'>+</div><div class='add'>+/* MAX8997-MUIC CONTROL1 register */</div><div class='add'>+#define COMN1SW_SHIFT			0</div><div class='add'>+#define COMP2SW_SHIFT			3</div><div class='add'>+#define COMN1SW_MASK			(0x7 &lt;&lt; COMN1SW_SHIFT)</div><div class='add'>+#define COMP2SW_MASK			(0x7 &lt;&lt; COMP2SW_SHIFT)</div><div class='add'>+#define SW_MASK				(COMP2SW_MASK | COMN1SW_MASK)</div><div class='add'>+</div><div class='add'>+#define MAX8997_SW_USB		((1 &lt;&lt; COMP2SW_SHIFT) | (1 &lt;&lt; COMN1SW_SHIFT))</div><div class='add'>+#define MAX8997_SW_AUDIO	((2 &lt;&lt; COMP2SW_SHIFT) | (2 &lt;&lt; COMN1SW_SHIFT))</div><div class='add'>+#define MAX8997_SW_UART		((3 &lt;&lt; COMP2SW_SHIFT) | (3 &lt;&lt; COMN1SW_SHIFT))</div><div class='add'>+#define MAX8997_SW_OPEN		((0 &lt;&lt; COMP2SW_SHIFT) | (0 &lt;&lt; COMN1SW_SHIFT))</div><div class='add'>+</div><div class='add'>+#define	MAX8997_ADC_GROUND		0x00</div><div class='add'>+#define	MAX8997_ADC_MHL			0x01</div><div class='add'>+#define	MAX8997_ADC_JIG_USB_1		0x18</div><div class='add'>+#define	MAX8997_ADC_JIG_USB_2		0x19</div><div class='add'>+#define	MAX8997_ADC_DESKDOCK		0x1a</div><div class='add'>+#define	MAX8997_ADC_JIG_UART		0x1c</div><div class='add'>+#define	MAX8997_ADC_CARDOCK		0x1d</div><div class='add'>+#define	MAX8997_ADC_OPEN		0x1f</div><div class='add'>+</div><div class='add'>+struct max8997_muic_irq {</div><div class='add'>+	unsigned int irq;</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct max8997_muic_irq muic_irqs[] = {</div><div class='add'>+	{ MAX8997_MUICIRQ_ADCError, "muic-ADC_error" },</div><div class='add'>+	{ MAX8997_MUICIRQ_ADCLow, "muic-ADC_low" },</div><div class='add'>+	{ MAX8997_MUICIRQ_ADC, "muic-ADC" },</div><div class='add'>+	{ MAX8997_MUICIRQ_VBVolt, "muic-VB_voltage" },</div><div class='add'>+	{ MAX8997_MUICIRQ_DBChg, "muic-DB_charger" },</div><div class='add'>+	{ MAX8997_MUICIRQ_DCDTmr, "muic-DCD_timer" },</div><div class='add'>+	{ MAX8997_MUICIRQ_ChgDetRun, "muic-CDR_status" },</div><div class='add'>+	{ MAX8997_MUICIRQ_ChgTyp, "muic-charger_type" },</div><div class='add'>+	{ MAX8997_MUICIRQ_OVP, "muic-over_voltage" },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct max8997_muic_info {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct max8997_dev *iodev;</div><div class='add'>+	struct i2c_client *muic;</div><div class='add'>+	struct max8997_muic_platform_data *muic_pdata;</div><div class='add'>+</div><div class='add'>+	int irq;</div><div class='add'>+	struct work_struct irq_work;</div><div class='add'>+</div><div class='add'>+	enum max8997_muic_charger_type pre_charger_type;</div><div class='add'>+	int pre_adc;</div><div class='add'>+</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int max8997_muic_handle_usb(struct max8997_muic_info *info,</div><div class='add'>+			enum max8997_muic_usb_type usb_type, bool attached)</div><div class='add'>+{</div><div class='add'>+	struct max8997_muic_platform_data *mdata = info-&gt;muic_pdata;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (usb_type == MAX8997_USB_HOST) {</div><div class='add'>+		/* switch to USB */</div><div class='add'>+		ret = max8997_update_reg(info-&gt;muic, MAX8997_MUIC_REG_CONTROL1,</div><div class='add'>+				attached ? MAX8997_SW_USB : MAX8997_SW_OPEN,</div><div class='add'>+				SW_MASK);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(info-&gt;dev, "failed to update muic register\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mdata-&gt;usb_callback)</div><div class='add'>+		mdata-&gt;usb_callback(usb_type, attached);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void max8997_muic_handle_mhl(struct max8997_muic_info *info,</div><div class='add'>+			bool attached)</div><div class='add'>+{</div><div class='add'>+	struct max8997_muic_platform_data *mdata = info-&gt;muic_pdata;</div><div class='add'>+</div><div class='add'>+	if (mdata-&gt;mhl_callback)</div><div class='add'>+		mdata-&gt;mhl_callback(attached);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int max8997_muic_handle_dock(struct max8997_muic_info *info,</div><div class='add'>+			int adc, bool attached)</div><div class='add'>+{</div><div class='add'>+	struct max8997_muic_platform_data *mdata = info-&gt;muic_pdata;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* switch to AUDIO */</div><div class='add'>+	ret = max8997_update_reg(info-&gt;muic, MAX8997_MUIC_REG_CONTROL1,</div><div class='add'>+				attached ? MAX8997_SW_AUDIO : MAX8997_SW_OPEN,</div><div class='add'>+				SW_MASK);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(info-&gt;dev, "failed to update muic register\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (adc) {</div><div class='add'>+	case MAX8997_ADC_DESKDOCK:</div><div class='add'>+		if (mdata-&gt;deskdock_callback)</div><div class='add'>+			mdata-&gt;deskdock_callback(attached);</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_ADC_CARDOCK:</div><div class='add'>+		if (mdata-&gt;cardock_callback)</div><div class='add'>+			mdata-&gt;cardock_callback(attached);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</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 max8997_muic_handle_jig_uart(struct max8997_muic_info *info,</div><div class='add'>+			bool attached)</div><div class='add'>+{</div><div class='add'>+	struct max8997_muic_platform_data *mdata = info-&gt;muic_pdata;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* switch to UART */</div><div class='add'>+	ret = max8997_update_reg(info-&gt;muic, MAX8997_MUIC_REG_CONTROL1,</div><div class='add'>+				attached ? MAX8997_SW_UART : MAX8997_SW_OPEN,</div><div class='add'>+				SW_MASK);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(info-&gt;dev, "failed to update muic register\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mdata-&gt;uart_callback)</div><div class='add'>+		mdata-&gt;uart_callback(attached);</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 max8997_muic_handle_adc_detach(struct max8997_muic_info *info)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (info-&gt;pre_adc) {</div><div class='add'>+	case MAX8997_ADC_GROUND:</div><div class='add'>+		ret = max8997_muic_handle_usb(info, MAX8997_USB_HOST, false);</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_ADC_MHL:</div><div class='add'>+		max8997_muic_handle_mhl(info, false);</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_ADC_JIG_USB_1:</div><div class='add'>+	case MAX8997_ADC_JIG_USB_2:</div><div class='add'>+		ret = max8997_muic_handle_usb(info, MAX8997_USB_DEVICE, false);</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_ADC_DESKDOCK:</div><div class='add'>+	case MAX8997_ADC_CARDOCK:</div><div class='add'>+		ret = max8997_muic_handle_dock(info, info-&gt;pre_adc, false);</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_ADC_JIG_UART:</div><div class='add'>+		ret = max8997_muic_handle_jig_uart(info, false);</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'>+static int max8997_muic_handle_adc(struct max8997_muic_info *info, int adc)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (adc) {</div><div class='add'>+	case MAX8997_ADC_GROUND:</div><div class='add'>+		ret = max8997_muic_handle_usb(info, MAX8997_USB_HOST, true);</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_ADC_MHL:</div><div class='add'>+		max8997_muic_handle_mhl(info, true);</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_ADC_JIG_USB_1:</div><div class='add'>+	case MAX8997_ADC_JIG_USB_2:</div><div class='add'>+		ret = max8997_muic_handle_usb(info, MAX8997_USB_DEVICE, true);</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_ADC_DESKDOCK:</div><div class='add'>+	case MAX8997_ADC_CARDOCK:</div><div class='add'>+		ret = max8997_muic_handle_dock(info, adc, true);</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_ADC_JIG_UART:</div><div class='add'>+		ret = max8997_muic_handle_jig_uart(info, true);</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_ADC_OPEN:</div><div class='add'>+		ret = max8997_muic_handle_adc_detach(info);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info-&gt;pre_adc = adc;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int max8997_muic_handle_charger_type(struct max8997_muic_info *info,</div><div class='add'>+				enum max8997_muic_charger_type charger_type)</div><div class='add'>+{</div><div class='add'>+	struct max8997_muic_platform_data *mdata = info-&gt;muic_pdata;</div><div class='add'>+	u8 adc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = max8997_read_reg(info-&gt;muic, MAX8997_MUIC_REG_STATUS1, &amp;adc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(info-&gt;dev, "failed to read muic register\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (charger_type) {</div><div class='add'>+	case MAX8997_CHARGER_TYPE_NONE:</div><div class='add'>+		if (mdata-&gt;charger_callback)</div><div class='add'>+			mdata-&gt;charger_callback(false, charger_type);</div><div class='add'>+		if (info-&gt;pre_charger_type == MAX8997_CHARGER_TYPE_USB) {</div><div class='add'>+			max8997_muic_handle_usb(info,</div><div class='add'>+					MAX8997_USB_DEVICE, false);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_CHARGER_TYPE_USB:</div><div class='add'>+		if ((adc &amp; STATUS1_ADC_MASK) == MAX8997_ADC_OPEN) {</div><div class='add'>+			max8997_muic_handle_usb(info,</div><div class='add'>+					MAX8997_USB_DEVICE, true);</div><div class='add'>+		}</div><div class='add'>+		if (mdata-&gt;charger_callback)</div><div class='add'>+			mdata-&gt;charger_callback(true, charger_type);</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_CHARGER_TYPE_DOWNSTREAM_PORT:</div><div class='add'>+	case MAX8997_CHARGER_TYPE_DEDICATED_CHG:</div><div class='add'>+	case MAX8997_CHARGER_TYPE_500MA:</div><div class='add'>+	case MAX8997_CHARGER_TYPE_1A:</div><div class='add'>+		if (mdata-&gt;charger_callback)</div><div class='add'>+			mdata-&gt;charger_callback(true, charger_type);</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'>+	info-&gt;pre_charger_type = charger_type;</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void max8997_muic_irq_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct max8997_muic_info *info = container_of(work,</div><div class='add'>+			struct max8997_muic_info, irq_work);</div><div class='add'>+	struct max8997_platform_data *pdata =</div><div class='add'>+				dev_get_platdata(info-&gt;iodev-&gt;dev);</div><div class='add'>+	u8 status[3];</div><div class='add'>+	u8 adc, chg_type;</div><div class='add'>+</div><div class='add'>+	int irq_type = info-&gt;irq - pdata-&gt;irq_base;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;info-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	ret = max8997_bulk_read(info-&gt;muic, MAX8997_MUIC_REG_STATUS1,</div><div class='add'>+				3, status);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(info-&gt;dev, "failed to read muic register\n");</div><div class='add'>+		mutex_unlock(&amp;info-&gt;mutex);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(info-&gt;dev, "%s: STATUS1:0x%x, 2:0x%x\n", __func__,</div><div class='add'>+			status[0], status[1]);</div><div class='add'>+</div><div class='add'>+	switch (irq_type) {</div><div class='add'>+	case MAX8997_MUICIRQ_ADC:</div><div class='add'>+		adc = status[0] &amp; STATUS1_ADC_MASK;</div><div class='add'>+		adc &gt;&gt;= STATUS1_ADC_SHIFT;</div><div class='add'>+</div><div class='add'>+		max8997_muic_handle_adc(info, adc);</div><div class='add'>+		break;</div><div class='add'>+	case MAX8997_MUICIRQ_ChgTyp:</div><div class='add'>+		chg_type = status[1] &amp; STATUS2_CHGTYP_MASK;</div><div class='add'>+		chg_type &gt;&gt;= STATUS2_CHGTYP_SHIFT;</div><div class='add'>+</div><div class='add'>+		max8997_muic_handle_charger_type(info, chg_type);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_info(info-&gt;dev, "misc interrupt: %s occurred\n",</div><div class='add'>+			 muic_irqs[irq_type].name);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;info-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t max8997_muic_irq_handler(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct max8997_muic_info *info = data;</div><div class='add'>+</div><div class='add'>+	dev_dbg(info-&gt;dev, "irq:%d\n", irq);</div><div class='add'>+	info-&gt;irq = irq;</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;info-&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 void max8997_muic_detect_dev(struct max8997_muic_info *info)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 status[2], adc, chg_type;</div><div class='add'>+</div><div class='add'>+	ret = max8997_bulk_read(info-&gt;muic, MAX8997_MUIC_REG_STATUS1,</div><div class='add'>+				2, status);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(info-&gt;dev, "failed to read muic register\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(info-&gt;dev, "STATUS1:0x%x, STATUS2:0x%x\n",</div><div class='add'>+			status[0], status[1]);</div><div class='add'>+</div><div class='add'>+	adc = status[0] &amp; STATUS1_ADC_MASK;</div><div class='add'>+	adc &gt;&gt;= STATUS1_ADC_SHIFT;</div><div class='add'>+</div><div class='add'>+	chg_type = status[1] &amp; STATUS2_CHGTYP_MASK;</div><div class='add'>+	chg_type &gt;&gt;= STATUS2_CHGTYP_SHIFT;</div><div class='add'>+</div><div class='add'>+	max8997_muic_handle_adc(info, adc);</div><div class='add'>+	max8997_muic_handle_charger_type(info, chg_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void max8997_initialize_device(struct max8997_muic_info *info)</div><div class='add'>+{</div><div class='add'>+	struct max8997_muic_platform_data *mdata = info-&gt;muic_pdata;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; mdata-&gt;num_init_data; i++) {</div><div class='add'>+		max8997_write_reg(info-&gt;muic, mdata-&gt;init_data[i].addr,</div><div class='add'>+				mdata-&gt;init_data[i].data);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit max8997_muic_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct max8997_dev *iodev = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='add'>+	struct max8997_platform_data *pdata = dev_get_platdata(iodev-&gt;dev);</div><div class='add'>+	struct max8997_muic_info *info;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	info = kzalloc(sizeof(struct max8997_muic_info), GFP_KERNEL);</div><div class='add'>+	if (!info) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to allocate memory\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_kfree;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!pdata-&gt;muic_pdata) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to get platform_data\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_pdata;</div><div class='add'>+	}</div><div class='add'>+	info-&gt;muic_pdata = pdata-&gt;muic_pdata;</div><div class='add'>+</div><div class='add'>+	info-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	info-&gt;iodev = iodev;</div><div class='add'>+	info-&gt;muic = iodev-&gt;muic;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, info);</div><div class='add'>+	mutex_init(&amp;info-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;info-&gt;irq_work, max8997_muic_irq_work);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(muic_irqs); i++) {</div><div class='add'>+		struct max8997_muic_irq *muic_irq = &amp;muic_irqs[i];</div><div class='add'>+</div><div class='add'>+		ret = request_threaded_irq(pdata-&gt;irq_base + muic_irq-&gt;irq,</div><div class='add'>+				NULL, max8997_muic_irq_handler,</div><div class='add'>+				0, muic_irq-&gt;name,</div><div class='add'>+				info);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+				"failed: irq request (IRQ: %d,"</div><div class='add'>+				" error :%d)\n",</div><div class='add'>+				muic_irq-&gt;irq, ret);</div><div class='add'>+</div><div class='add'>+			for (i = i - 1; i &gt;= 0; i--)</div><div class='add'>+				free_irq(muic_irq-&gt;irq, info);</div><div class='add'>+</div><div class='add'>+			goto err_irq;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize registers according to platform data */</div><div class='add'>+	max8997_initialize_device(info);</div><div class='add'>+</div><div class='add'>+	/* Initial device detection */</div><div class='add'>+	max8997_muic_detect_dev(info);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+err_irq:</div><div class='add'>+err_pdata:</div><div class='add'>+	kfree(info);</div><div class='add'>+err_kfree:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit max8997_muic_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct max8997_muic_info *info = platform_get_drvdata(pdev);</div><div class='add'>+	struct max8997_platform_data *pdata =</div><div class='add'>+				dev_get_platdata(info-&gt;iodev-&gt;dev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(muic_irqs); i++)</div><div class='add'>+		free_irq(pdata-&gt;irq_base + muic_irqs[i].irq, info);</div><div class='add'>+	cancel_work_sync(&amp;info-&gt;irq_work);</div><div class='add'>+</div><div class='add'>+	kfree(info);</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 max8997_muic_driver = {</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "max8997-muic",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe		= max8997_muic_probe,</div><div class='add'>+	.remove		= __devexit_p(max8997_muic_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init max8997_muic_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;max8997_muic_driver);</div><div class='add'>+}</div><div class='add'>+module_init(max8997_muic_init);</div><div class='add'>+</div><div class='add'>+static void __exit max8997_muic_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;max8997_muic_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(max8997_muic_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Maxim MAX8997 MUIC driver");</div><div class='add'>+MODULE_AUTHOR("Donggeun Kim &lt;dg77.kim@samsung.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c<br/>index 7768b87d995b..950dbe9ecb36 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/sgi-gru/gruprocfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/sgi-gru/gruprocfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-gru/gruprocfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/sgi-gru/gruprocfs.c</a></div><div class='hunk'>@@ -324,7 +324,7 @@ static const struct file_operations gru_fops = {</div><div class='ctx'> </div><div class='ctx'> static struct proc_entry {</div><div class='ctx'> 	char *name;</div><div class='del'>-	int mode;</div><div class='add'>+	umode_t mode;</div><div class='ctx'> 	const struct file_operations *fops;</div><div class='ctx'> 	struct proc_dir_entry *entry;</div><div class='ctx'> } proc_files[] = {</div><div class='head'>diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c<br/>index 42f067347bc7..3fac67a5204c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xpnet.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/sgi-xp/xpnet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/sgi-xp/xpnet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/sgi-xp/xpnet.c</a></div><div class='hunk'>@@ -576,7 +576,7 @@ xpnet_init(void)</div><div class='ctx'> 	 * report an error if the data is not retrievable and the</div><div class='ctx'> 	 * packet will be dropped.</div><div class='ctx'> 	 */</div><div class='del'>-	xpnet_device-&gt;features = NETIF_F_NO_CSUM;</div><div class='add'>+	xpnet_device-&gt;features = NETIF_F_HW_CSUM;</div><div class='ctx'> </div><div class='ctx'> 	result = register_netdev(xpnet_device);</div><div class='ctx'> 	if (result != 0) {</div><div class='head'>diff --git a/drivers/misc/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c<br/>index ba168a7d54d4..2b62232c2c6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ti-st/st_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ti-st/st_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ti-st/st_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ti-st/st_core.c</a></div><div class='hunk'>@@ -137,6 +137,8 @@ void st_send_frame(unsigned char chnl_id, struct st_data_s *st_gdata)</div><div class='ctx'>  * st_reg_complete -</div><div class='ctx'>  * to call registration complete callbacks</div><div class='ctx'>  * of all protocol stack drivers</div><div class='add'>+ * This function is being called with spin lock held, protocol drivers are</div><div class='add'>+ * only expected to complete their waits and do nothing more than that.</div><div class='ctx'>  */</div><div class='ctx'> void st_reg_complete(struct st_data_s *st_gdata, char err)</div><div class='ctx'> {</div><div class='hunk'>@@ -538,11 +540,12 @@ long st_register(struct st_proto_s *new_proto)</div><div class='ctx'> 		set_bit(ST_REG_IN_PROGRESS, &amp;st_gdata-&gt;st_state);</div><div class='ctx'> 		st_recv = st_kim_recv;</div><div class='ctx'> </div><div class='add'>+		/* enable the ST LL - to set default chip state */</div><div class='add'>+		st_ll_enable(st_gdata);</div><div class='add'>+</div><div class='ctx'> 		/* release lock previously held - re-locked below */</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;st_gdata-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-		/* enable the ST LL - to set default chip state */</div><div class='del'>-		st_ll_enable(st_gdata);</div><div class='ctx'> 		/* this may take a while to complete</div><div class='ctx'> 		 * since it involves BT fw download</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -553,10 +556,13 @@ long st_register(struct st_proto_s *new_proto)</div><div class='ctx'> 			    (test_bit(ST_REG_PENDING, &amp;st_gdata-&gt;st_state))) {</div><div class='ctx'> 				pr_err(" KIM failure complete callback ");</div><div class='ctx'> 				st_reg_complete(st_gdata, err);</div><div class='add'>+				clear_bit(ST_REG_PENDING, &amp;st_gdata-&gt;st_state);</div><div class='ctx'> 			}</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		spin_lock_irqsave(&amp;st_gdata-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 		clear_bit(ST_REG_IN_PROGRESS, &amp;st_gdata-&gt;st_state);</div><div class='ctx'> 		st_recv = st_int_recv;</div><div class='ctx'> </div><div class='hunk'>@@ -576,10 +582,10 @@ long st_register(struct st_proto_s *new_proto)</div><div class='ctx'> 		if (st_gdata-&gt;is_registered[new_proto-&gt;chnl_id] == true) {</div><div class='ctx'> 			pr_err(" proto %d already registered ",</div><div class='ctx'> 				   new_proto-&gt;chnl_id);</div><div class='add'>+			spin_unlock_irqrestore(&amp;st_gdata-&gt;lock, flags);</div><div class='ctx'> 			return -EALREADY;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_lock_irqsave(&amp;st_gdata-&gt;lock, flags);</div><div class='ctx'> 		add_channel_to_table(st_gdata, new_proto);</div><div class='ctx'> 		st_gdata-&gt;protos_registered++;</div><div class='ctx'> 		new_proto-&gt;write = st_write;</div><div class='hunk'>@@ -619,7 +625,7 @@ long st_unregister(struct st_proto_s *proto)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;st_gdata-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (st_gdata-&gt;list[proto-&gt;chnl_id] == NULL) {</div><div class='add'>+	if (st_gdata-&gt;is_registered[proto-&gt;chnl_id] == false) {</div><div class='ctx'> 		pr_err(" chnl_id %d not registered", proto-&gt;chnl_id);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;st_gdata-&gt;lock, flags);</div><div class='ctx'> 		return -EPROTONOSUPPORT;</div><div class='hunk'>@@ -629,6 +635,10 @@ long st_unregister(struct st_proto_s *proto)</div><div class='ctx'> 	remove_channel_from_table(st_gdata, proto);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;st_gdata-&gt;lock, flags);</div><div class='ctx'> </div><div class='add'>+	/* paranoid check */</div><div class='add'>+	if (st_gdata-&gt;protos_registered &lt; ST_EMPTY)</div><div class='add'>+		st_gdata-&gt;protos_registered = ST_EMPTY;</div><div class='add'>+</div><div class='ctx'> 	if ((st_gdata-&gt;protos_registered == ST_EMPTY) &amp;&amp;</div><div class='ctx'> 	    (!test_bit(ST_REG_PENDING, &amp;st_gdata-&gt;st_state))) {</div><div class='ctx'> 		pr_info(" all chnl_ids unregistered ");</div><div class='head'>diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c<br/>index 43ef8d162f2d..a7a861ceee2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ti-st/st_kim.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/misc/ti-st/st_kim.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ti-st/st_kim.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/misc/ti-st/st_kim.c</a></div><div class='hunk'>@@ -469,37 +469,21 @@ long st_kim_start(void *kim_data)</div><div class='ctx'> 		/* wait for ldisc to be installed */</div><div class='ctx'> 		err = wait_for_completion_timeout(&amp;kim_gdata-&gt;ldisc_installed,</div><div class='ctx'> 				msecs_to_jiffies(LDISC_TIME));</div><div class='del'>-		if (!err) {	/* timeout */</div><div class='del'>-			pr_err("line disc installation timed out ");</div><div class='del'>-			kim_gdata-&gt;ldisc_install = 0;</div><div class='del'>-			pr_info("ldisc_install = 0");</div><div class='del'>-			sysfs_notify(&amp;kim_gdata-&gt;kim_pdev-&gt;dev.kobj,</div><div class='del'>-					NULL, "install");</div><div class='del'>-			/* the following wait is never going to be completed,</div><div class='del'>-			 * since the ldisc was never installed, hence serving</div><div class='del'>-			 * as a mdelay of LDISC_TIME msecs */</div><div class='del'>-			err = wait_for_completion_timeout</div><div class='del'>-				(&amp;kim_gdata-&gt;ldisc_installed,</div><div class='del'>-				 msecs_to_jiffies(LDISC_TIME));</div><div class='del'>-			err = -ETIMEDOUT;</div><div class='add'>+		if (!err) {</div><div class='add'>+			/* ldisc installation timeout,</div><div class='add'>+			 * flush uart, power cycle BT_EN */</div><div class='add'>+			pr_err("ldisc installation timeout");</div><div class='add'>+			err = st_kim_stop(kim_gdata);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* ldisc installed now */</div><div class='del'>-			pr_info(" line discipline installed ");</div><div class='add'>+			pr_info("line discipline installed");</div><div class='ctx'> 			err = download_firmware(kim_gdata);</div><div class='ctx'> 			if (err != 0) {</div><div class='add'>+				/* ldisc installed but fw download failed,</div><div class='add'>+				 * flush uart &amp; power cycle BT_EN */</div><div class='ctx'> 				pr_err("download firmware failed");</div><div class='del'>-				kim_gdata-&gt;ldisc_install = 0;</div><div class='del'>-				pr_info("ldisc_install = 0");</div><div class='del'>-				sysfs_notify(&amp;kim_gdata-&gt;kim_pdev-&gt;dev.kobj,</div><div class='del'>-						NULL, "install");</div><div class='del'>-				/* this wait might be completed, though in the</div><div class='del'>-				 * tty_close() since the ldisc is already</div><div class='del'>-				 * installed */</div><div class='del'>-				err = wait_for_completion_timeout</div><div class='del'>-					(&amp;kim_gdata-&gt;ldisc_installed,</div><div class='del'>-					 msecs_to_jiffies(LDISC_TIME));</div><div class='del'>-				err = -EINVAL;</div><div class='add'>+				err = st_kim_stop(kim_gdata);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			} else {	/* on success don't retry */</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -510,8 +494,14 @@ long st_kim_start(void *kim_data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * st_kim_stop - called from ST Core, on the last un-registration</div><div class='del'>- *	toggle low the chip enable gpio</div><div class='add'>+ * st_kim_stop - stop communication with chip.</div><div class='add'>+ *	This can be called from ST Core/KIM, on the-</div><div class='add'>+ *	(a) last un-register when chip need not be powered there-after,</div><div class='add'>+ *	(b) upon failure to either install ldisc or download firmware.</div><div class='add'>+ *	The function is responsible to (a) notify UIM about un-installation,</div><div class='add'>+ *	(b) flush UART if the ldisc was installed.</div><div class='add'>+ *	(c) reset BT_EN - pull down nshutdown at the end.</div><div class='add'>+ *	(d) invoke platform's chip disabling routine.</div><div class='ctx'>  */</div><div class='ctx'> long st_kim_stop(void *kim_data)</div><div class='ctx'> {</div><div class='hunk'>@@ -519,12 +509,16 @@ long st_kim_stop(void *kim_data)</div><div class='ctx'> 	struct kim_data_s	*kim_gdata = (struct kim_data_s *)kim_data;</div><div class='ctx'> 	struct ti_st_plat_data	*pdata =</div><div class='ctx'> 		kim_gdata-&gt;kim_pdev-&gt;dev.platform_data;</div><div class='add'>+	struct tty_struct	*tty = kim_gdata-&gt;core_data-&gt;tty;</div><div class='ctx'> </div><div class='ctx'> 	INIT_COMPLETION(kim_gdata-&gt;ldisc_installed);</div><div class='ctx'> </div><div class='del'>-	/* Flush any pending characters in the driver and discipline. */</div><div class='del'>-	tty_ldisc_flush(kim_gdata-&gt;core_data-&gt;tty);</div><div class='del'>-	tty_driver_flush_buffer(kim_gdata-&gt;core_data-&gt;tty);</div><div class='add'>+	if (tty) {	/* can be called before ldisc is installed */</div><div class='add'>+		/* Flush any pending characters in the driver and discipline. */</div><div class='add'>+		tty_ldisc_flush(tty);</div><div class='add'>+		tty_driver_flush_buffer(tty);</div><div class='add'>+		tty-&gt;ops-&gt;flush_buffer(tty);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* send uninstall notification to UIM */</div><div class='ctx'> 	pr_info("ldisc_install = 0");</div><div class='hunk'>@@ -579,6 +573,28 @@ static ssize_t show_install(struct device *dev,</div><div class='ctx'> 	return sprintf(buf, "%d\n", kim_data-&gt;ldisc_install);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef DEBUG</div><div class='add'>+static ssize_t store_dev_name(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct kim_data_s *kim_data = dev_get_drvdata(dev);</div><div class='add'>+	pr_debug("storing dev name &gt;%s&lt;", buf);</div><div class='add'>+	strncpy(kim_data-&gt;dev_name, buf, count);</div><div class='add'>+	pr_debug("stored dev name &gt;%s&lt;", kim_data-&gt;dev_name);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_baud_rate(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct kim_data_s *kim_data = dev_get_drvdata(dev);</div><div class='add'>+	pr_debug("storing baud rate &gt;%s&lt;", buf);</div><div class='add'>+	sscanf(buf, "%ld", &amp;kim_data-&gt;baud_rate);</div><div class='add'>+	pr_debug("stored baud rate &gt;%ld&lt;", kim_data-&gt;baud_rate);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+#endif	/* if DEBUG */</div><div class='add'>+</div><div class='ctx'> static ssize_t show_dev_name(struct device *dev,</div><div class='ctx'> 		struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -605,10 +621,18 @@ static struct kobj_attribute ldisc_install =</div><div class='ctx'> __ATTR(install, 0444, (void *)show_install, NULL);</div><div class='ctx'> </div><div class='ctx'> static struct kobj_attribute uart_dev_name =</div><div class='add'>+#ifdef DEBUG	/* TODO: move this to debug-fs if possible */</div><div class='add'>+__ATTR(dev_name, 0644, (void *)show_dev_name, (void *)store_dev_name);</div><div class='add'>+#else</div><div class='ctx'> __ATTR(dev_name, 0444, (void *)show_dev_name, NULL);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct kobj_attribute uart_baud_rate =</div><div class='add'>+#ifdef DEBUG	/* TODO: move to debugfs */</div><div class='add'>+__ATTR(baud_rate, 0644, (void *)show_baud_rate, (void *)store_baud_rate);</div><div class='add'>+#else</div><div class='ctx'> __ATTR(baud_rate, 0444, (void *)show_baud_rate, NULL);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct kobj_attribute uart_flow_cntrl =</div><div class='ctx'> __ATTR(flow_cntrl, 0444, (void *)show_flow_cntrl, NULL);</div><div class='head'>diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile<br/>index 12eef393e216..400756ec7c49 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/Makefile</a></div><div class='hunk'>@@ -6,5 +6,4 @@ subdir-ccflags-$(CONFIG_MMC_DEBUG) := -DDEBUG</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MMC)		+= core/</div><div class='ctx'> obj-$(CONFIG_MMC)		+= card/</div><div class='del'>-obj-$(CONFIG_MMC)		+= host/</div><div class='del'>-</div><div class='add'>+obj-$(subst m,y,$(CONFIG_MMC))	+= host/</div><div class='head'>diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c<br/>index 1e0e27cbe987..0cad48a284a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/card/block.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/card/block.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/card/block.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/card/block.c</a></div><div class='hunk'>@@ -107,6 +107,8 @@ struct mmc_blk_data {</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned int	part_curr;</div><div class='ctx'> 	struct device_attribute force_ro;</div><div class='add'>+	struct device_attribute power_ro_lock;</div><div class='add'>+	int	area_type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(open_lock);</div><div class='hunk'>@@ -119,6 +121,7 @@ enum mmc_blk_status {</div><div class='ctx'> 	MMC_BLK_ABORT,</div><div class='ctx'> 	MMC_BLK_DATA_ERR,</div><div class='ctx'> 	MMC_BLK_ECC_ERR,</div><div class='add'>+	MMC_BLK_NOMEDIUM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_param(perdev_minors, int, 0444);</div><div class='hunk'>@@ -165,6 +168,70 @@ static void mmc_blk_put(struct mmc_blk_data *md)</div><div class='ctx'> 	mutex_unlock(&amp;open_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t power_ro_lock_show(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct mmc_blk_data *md = mmc_blk_get(dev_to_disk(dev));</div><div class='add'>+	struct mmc_card *card = md-&gt;queue.card;</div><div class='add'>+	int locked = 0;</div><div class='add'>+</div><div class='add'>+	if (card-&gt;ext_csd.boot_ro_lock &amp; EXT_CSD_BOOT_WP_B_PERM_WP_EN)</div><div class='add'>+		locked = 2;</div><div class='add'>+	else if (card-&gt;ext_csd.boot_ro_lock &amp; EXT_CSD_BOOT_WP_B_PWR_WP_EN)</div><div class='add'>+		locked = 1;</div><div class='add'>+</div><div class='add'>+	ret = snprintf(buf, PAGE_SIZE, "%d\n", locked);</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 power_ro_lock_store(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct mmc_blk_data *md, *part_md;</div><div class='add'>+	struct mmc_card *card;</div><div class='add'>+	unsigned long set;</div><div class='add'>+</div><div class='add'>+	if (kstrtoul(buf, 0, &amp;set))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (set != 1)</div><div class='add'>+		return count;</div><div class='add'>+</div><div class='add'>+	md = mmc_blk_get(dev_to_disk(dev));</div><div class='add'>+	card = md-&gt;queue.card;</div><div class='add'>+</div><div class='add'>+	mmc_claim_host(card-&gt;host);</div><div class='add'>+</div><div class='add'>+	ret = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BOOT_WP,</div><div class='add'>+				card-&gt;ext_csd.boot_ro_lock |</div><div class='add'>+				EXT_CSD_BOOT_WP_B_PWR_WP_EN,</div><div class='add'>+				card-&gt;ext_csd.part_time);</div><div class='add'>+	if (ret)</div><div class='add'>+		pr_err("%s: Locking boot partition ro until next power on failed: %d\n", md-&gt;disk-&gt;disk_name, ret);</div><div class='add'>+	else</div><div class='add'>+		card-&gt;ext_csd.boot_ro_lock |= EXT_CSD_BOOT_WP_B_PWR_WP_EN;</div><div class='add'>+</div><div class='add'>+	mmc_release_host(card-&gt;host);</div><div class='add'>+</div><div class='add'>+	if (!ret) {</div><div class='add'>+		pr_info("%s: Locking boot partition ro until next power on\n",</div><div class='add'>+			md-&gt;disk-&gt;disk_name);</div><div class='add'>+		set_disk_ro(md-&gt;disk, 1);</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(part_md, &amp;md-&gt;part, part)</div><div class='add'>+			if (part_md-&gt;area_type == MMC_BLK_DATA_AREA_BOOT) {</div><div class='add'>+				pr_info("%s: Locking boot partition ro until next power on\n", part_md-&gt;disk-&gt;disk_name);</div><div class='add'>+				set_disk_ro(part_md-&gt;disk, 1);</div><div class='add'>+			}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mmc_blk_put(md);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t force_ro_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			     char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -266,6 +333,9 @@ static struct mmc_blk_ioc_data *mmc_blk_ioctl_copy_from_user(</div><div class='ctx'> 		goto idata_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!idata-&gt;buf_bytes)</div><div class='add'>+		return idata;</div><div class='add'>+</div><div class='ctx'> 	idata-&gt;buf = kzalloc(idata-&gt;buf_bytes, GFP_KERNEL);</div><div class='ctx'> 	if (!idata-&gt;buf) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='hunk'>@@ -312,25 +382,6 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,</div><div class='ctx'> 	if (IS_ERR(idata))</div><div class='ctx'> 		return PTR_ERR(idata);</div><div class='ctx'> </div><div class='del'>-	cmd.opcode = idata-&gt;ic.opcode;</div><div class='del'>-	cmd.arg = idata-&gt;ic.arg;</div><div class='del'>-	cmd.flags = idata-&gt;ic.flags;</div><div class='del'>-</div><div class='del'>-	data.sg = &amp;sg;</div><div class='del'>-	data.sg_len = 1;</div><div class='del'>-	data.blksz = idata-&gt;ic.blksz;</div><div class='del'>-	data.blocks = idata-&gt;ic.blocks;</div><div class='del'>-</div><div class='del'>-	sg_init_one(data.sg, idata-&gt;buf, idata-&gt;buf_bytes);</div><div class='del'>-</div><div class='del'>-	if (idata-&gt;ic.write_flag)</div><div class='del'>-		data.flags = MMC_DATA_WRITE;</div><div class='del'>-	else</div><div class='del'>-		data.flags = MMC_DATA_READ;</div><div class='del'>-</div><div class='del'>-	mrq.cmd = &amp;cmd;</div><div class='del'>-	mrq.data = &amp;data;</div><div class='del'>-</div><div class='ctx'> 	md = mmc_blk_get(bdev-&gt;bd_disk);</div><div class='ctx'> 	if (!md) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='hunk'>@@ -343,6 +394,48 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,</div><div class='ctx'> 		goto cmd_done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	cmd.opcode = idata-&gt;ic.opcode;</div><div class='add'>+	cmd.arg = idata-&gt;ic.arg;</div><div class='add'>+	cmd.flags = idata-&gt;ic.flags;</div><div class='add'>+</div><div class='add'>+	if (idata-&gt;buf_bytes) {</div><div class='add'>+		data.sg = &amp;sg;</div><div class='add'>+		data.sg_len = 1;</div><div class='add'>+		data.blksz = idata-&gt;ic.blksz;</div><div class='add'>+		data.blocks = idata-&gt;ic.blocks;</div><div class='add'>+</div><div class='add'>+		sg_init_one(data.sg, idata-&gt;buf, idata-&gt;buf_bytes);</div><div class='add'>+</div><div class='add'>+		if (idata-&gt;ic.write_flag)</div><div class='add'>+			data.flags = MMC_DATA_WRITE;</div><div class='add'>+		else</div><div class='add'>+			data.flags = MMC_DATA_READ;</div><div class='add'>+</div><div class='add'>+		/* data.flags must already be set before doing this. */</div><div class='add'>+		mmc_set_data_timeout(&amp;data, card);</div><div class='add'>+</div><div class='add'>+		/* Allow overriding the timeout_ns for empirical tuning. */</div><div class='add'>+		if (idata-&gt;ic.data_timeout_ns)</div><div class='add'>+			data.timeout_ns = idata-&gt;ic.data_timeout_ns;</div><div class='add'>+</div><div class='add'>+		if ((cmd.flags &amp; MMC_RSP_R1B) == MMC_RSP_R1B) {</div><div class='add'>+			/*</div><div class='add'>+			 * Pretend this is a data transfer and rely on the</div><div class='add'>+			 * host driver to compute timeout.  When all host</div><div class='add'>+			 * drivers support cmd.cmd_timeout for R1B, this</div><div class='add'>+			 * can be changed to:</div><div class='add'>+			 *</div><div class='add'>+			 *     mrq.data = NULL;</div><div class='add'>+			 *     cmd.cmd_timeout = idata-&gt;ic.cmd_timeout_ms;</div><div class='add'>+			 */</div><div class='add'>+			data.timeout_ns = idata-&gt;ic.cmd_timeout_ms * 1000000;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mrq.data = &amp;data;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mrq.cmd = &amp;cmd;</div><div class='add'>+</div><div class='ctx'> 	mmc_claim_host(card-&gt;host);</div><div class='ctx'> </div><div class='ctx'> 	if (idata-&gt;ic.is_acmd) {</div><div class='hunk'>@@ -351,24 +444,6 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,</div><div class='ctx'> 			goto cmd_rel_host;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* data.flags must already be set before doing this. */</div><div class='del'>-	mmc_set_data_timeout(&amp;data, card);</div><div class='del'>-	/* Allow overriding the timeout_ns for empirical tuning. */</div><div class='del'>-	if (idata-&gt;ic.data_timeout_ns)</div><div class='del'>-		data.timeout_ns = idata-&gt;ic.data_timeout_ns;</div><div class='del'>-</div><div class='del'>-	if ((cmd.flags &amp; MMC_RSP_R1B) == MMC_RSP_R1B) {</div><div class='del'>-		/*</div><div class='del'>-		 * Pretend this is a data transfer and rely on the host driver</div><div class='del'>-		 * to compute timeout.  When all host drivers support</div><div class='del'>-		 * cmd.cmd_timeout for R1B, this can be changed to:</div><div class='del'>-		 *</div><div class='del'>-		 *     mrq.data = NULL;</div><div class='del'>-		 *     cmd.cmd_timeout = idata-&gt;ic.cmd_timeout_ms;</div><div class='del'>-		 */</div><div class='del'>-		data.timeout_ns = idata-&gt;ic.cmd_timeout_ms * 1000000;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	mmc_wait_for_req(card-&gt;host, &amp;mrq);</div><div class='ctx'> </div><div class='ctx'> 	if (cmd.error) {</div><div class='hunk'>@@ -565,6 +640,7 @@ static int get_card_status(struct mmc_card *card, u32 *status, int retries)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define ERR_NOMEDIUM	3</div><div class='ctx'> #define ERR_RETRY	2</div><div class='ctx'> #define ERR_ABORT	1</div><div class='ctx'> #define ERR_CONTINUE	0</div><div class='hunk'>@@ -632,6 +708,9 @@ static int mmc_blk_cmd_recovery(struct mmc_card *card, struct request *req,</div><div class='ctx'> 	u32 status, stop_status = 0;</div><div class='ctx'> 	int err, retry;</div><div class='ctx'> </div><div class='add'>+	if (mmc_card_removed(card))</div><div class='add'>+		return ERR_NOMEDIUM;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Try to get card status which indicates both the card state</div><div class='ctx'> 	 * and why there was no response.  If the first attempt fails,</div><div class='hunk'>@@ -648,8 +727,12 @@ static int mmc_blk_cmd_recovery(struct mmc_card *card, struct request *req,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We couldn't get a response from the card.  Give up. */</div><div class='del'>-	if (err)</div><div class='add'>+	if (err) {</div><div class='add'>+		/* Check if the card is removed */</div><div class='add'>+		if (mmc_detect_card_removed(card-&gt;host))</div><div class='add'>+			return ERR_NOMEDIUM;</div><div class='ctx'> 		return ERR_ABORT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Flag ECC errors */</div><div class='ctx'> 	if ((status &amp; R1_CARD_ECC_FAILED) ||</div><div class='hunk'>@@ -922,6 +1005,8 @@ static int mmc_blk_err_check(struct mmc_card *card,</div><div class='ctx'> 			return MMC_BLK_RETRY;</div><div class='ctx'> 		case ERR_ABORT:</div><div class='ctx'> 			return MMC_BLK_ABORT;</div><div class='add'>+		case ERR_NOMEDIUM:</div><div class='add'>+			return MMC_BLK_NOMEDIUM;</div><div class='ctx'> 		case ERR_CONTINUE:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1255,6 +1340,8 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc)</div><div class='ctx'> 			if (!ret)</div><div class='ctx'> 				goto start_new_req;</div><div class='ctx'> 			break;</div><div class='add'>+		case MMC_BLK_NOMEDIUM:</div><div class='add'>+			goto cmd_abort;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -1271,6 +1358,8 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc)</div><div class='ctx'> </div><div class='ctx'>  cmd_abort:</div><div class='ctx'> 	spin_lock_irq(&amp;md-&gt;lock);</div><div class='add'>+	if (mmc_card_removed(card))</div><div class='add'>+		req-&gt;cmd_flags |= REQ_QUIET;</div><div class='ctx'> 	while (ret)</div><div class='ctx'> 		ret = __blk_end_request(req, -EIO, blk_rq_cur_bytes(req));</div><div class='ctx'> 	spin_unlock_irq(&amp;md-&gt;lock);</div><div class='hunk'>@@ -1339,7 +1428,8 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card,</div><div class='ctx'> 					      struct device *parent,</div><div class='ctx'> 					      sector_t size,</div><div class='ctx'> 					      bool default_ro,</div><div class='del'>-					      const char *subname)</div><div class='add'>+					      const char *subname,</div><div class='add'>+					      int area_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct mmc_blk_data *md;</div><div class='ctx'> 	int devidx, ret;</div><div class='hunk'>@@ -1364,11 +1454,12 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card,</div><div class='ctx'> 	if (!subname) {</div><div class='ctx'> 		md-&gt;name_idx = find_first_zero_bit(name_use, max_devices);</div><div class='ctx'> 		__set_bit(md-&gt;name_idx, name_use);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='add'>+	} else</div><div class='ctx'> 		md-&gt;name_idx = ((struct mmc_blk_data *)</div><div class='ctx'> 				dev_to_disk(parent)-&gt;private_data)-&gt;name_idx;</div><div class='ctx'> </div><div class='add'>+	md-&gt;area_type = area_type;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set the read-only status based on the supported commands</div><div class='ctx'> 	 * and the write protect switch.</div><div class='hunk'>@@ -1462,7 +1553,8 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card)</div><div class='ctx'> 		size = card-&gt;csd.capacity &lt;&lt; (card-&gt;csd.read_blkbits - 9);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	md = mmc_blk_alloc_req(card, &amp;card-&gt;dev, size, false, NULL);</div><div class='add'>+	md = mmc_blk_alloc_req(card, &amp;card-&gt;dev, size, false, NULL,</div><div class='add'>+					MMC_BLK_DATA_AREA_MAIN);</div><div class='ctx'> 	return md;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1471,13 +1563,14 @@ static int mmc_blk_alloc_part(struct mmc_card *card,</div><div class='ctx'> 			      unsigned int part_type,</div><div class='ctx'> 			      sector_t size,</div><div class='ctx'> 			      bool default_ro,</div><div class='del'>-			      const char *subname)</div><div class='add'>+			      const char *subname,</div><div class='add'>+			      int area_type)</div><div class='ctx'> {</div><div class='ctx'> 	char cap_str[10];</div><div class='ctx'> 	struct mmc_blk_data *part_md;</div><div class='ctx'> </div><div class='ctx'> 	part_md = mmc_blk_alloc_req(card, disk_to_dev(md-&gt;disk), size, default_ro,</div><div class='del'>-				    subname);</div><div class='add'>+				    subname, area_type);</div><div class='ctx'> 	if (IS_ERR(part_md))</div><div class='ctx'> 		return PTR_ERR(part_md);</div><div class='ctx'> 	part_md-&gt;part_type = part_type;</div><div class='hunk'>@@ -1510,7 +1603,8 @@ static int mmc_blk_alloc_parts(struct mmc_card *card, struct mmc_blk_data *md)</div><div class='ctx'> 				card-&gt;part[idx].part_cfg,</div><div class='ctx'> 				card-&gt;part[idx].size &gt;&gt; 9,</div><div class='ctx'> 				card-&gt;part[idx].force_ro,</div><div class='del'>-				card-&gt;part[idx].name);</div><div class='add'>+				card-&gt;part[idx].name,</div><div class='add'>+				card-&gt;part[idx].area_type);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				return ret;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1539,9 +1633,16 @@ mmc_blk_set_blksize(struct mmc_blk_data *md, struct mmc_card *card)</div><div class='ctx'> </div><div class='ctx'> static void mmc_blk_remove_req(struct mmc_blk_data *md)</div><div class='ctx'> {</div><div class='add'>+	struct mmc_card *card;</div><div class='add'>+</div><div class='ctx'> 	if (md) {</div><div class='add'>+		card = md-&gt;queue.card;</div><div class='ctx'> 		if (md-&gt;disk-&gt;flags &amp; GENHD_FL_UP) {</div><div class='ctx'> 			device_remove_file(disk_to_dev(md-&gt;disk), &amp;md-&gt;force_ro);</div><div class='add'>+			if ((md-&gt;area_type &amp; MMC_BLK_DATA_AREA_BOOT) &amp;&amp;</div><div class='add'>+					card-&gt;ext_csd.boot_ro_lockable)</div><div class='add'>+				device_remove_file(disk_to_dev(md-&gt;disk),</div><div class='add'>+					&amp;md-&gt;power_ro_lock);</div><div class='ctx'> </div><div class='ctx'> 			/* Stop new requests from getting into the queue */</div><div class='ctx'> 			del_gendisk(md-&gt;disk);</div><div class='hunk'>@@ -1570,6 +1671,7 @@ static void mmc_blk_remove_parts(struct mmc_card *card,</div><div class='ctx'> static int mmc_add_disk(struct mmc_blk_data *md)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	struct mmc_card *card = md-&gt;queue.card;</div><div class='ctx'> </div><div class='ctx'> 	add_disk(md-&gt;disk);</div><div class='ctx'> 	md-&gt;force_ro.show = force_ro_show;</div><div class='hunk'>@@ -1579,18 +1681,53 @@ static int mmc_add_disk(struct mmc_blk_data *md)</div><div class='ctx'> 	md-&gt;force_ro.attr.mode = S_IRUGO | S_IWUSR;</div><div class='ctx'> 	ret = device_create_file(disk_to_dev(md-&gt;disk), &amp;md-&gt;force_ro);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		del_gendisk(md-&gt;disk);</div><div class='add'>+		goto force_ro_fail;</div><div class='add'>+</div><div class='add'>+	if ((md-&gt;area_type &amp; MMC_BLK_DATA_AREA_BOOT) &amp;&amp;</div><div class='add'>+	     card-&gt;ext_csd.boot_ro_lockable) {</div><div class='add'>+		mode_t mode;</div><div class='add'>+</div><div class='add'>+		if (card-&gt;ext_csd.boot_ro_lock &amp; EXT_CSD_BOOT_WP_B_PWR_WP_DIS)</div><div class='add'>+			mode = S_IRUGO;</div><div class='add'>+		else</div><div class='add'>+			mode = S_IRUGO | S_IWUSR;</div><div class='add'>+</div><div class='add'>+		md-&gt;power_ro_lock.show = power_ro_lock_show;</div><div class='add'>+		md-&gt;power_ro_lock.store = power_ro_lock_store;</div><div class='add'>+		md-&gt;power_ro_lock.attr.mode = mode;</div><div class='add'>+		md-&gt;power_ro_lock.attr.name =</div><div class='add'>+					"ro_lock_until_next_power_on";</div><div class='add'>+		ret = device_create_file(disk_to_dev(md-&gt;disk),</div><div class='add'>+				&amp;md-&gt;power_ro_lock);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto power_ro_lock_fail;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+power_ro_lock_fail:</div><div class='add'>+	device_remove_file(disk_to_dev(md-&gt;disk), &amp;md-&gt;force_ro);</div><div class='add'>+force_ro_fail:</div><div class='add'>+	del_gendisk(md-&gt;disk);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define CID_MANFID_SANDISK	0x2</div><div class='add'>+#define CID_MANFID_TOSHIBA	0x11</div><div class='add'>+#define CID_MANFID_MICRON	0x13</div><div class='add'>+</div><div class='ctx'> static const struct mmc_fixup blk_fixups[] =</div><div class='ctx'> {</div><div class='del'>-	MMC_FIXUP("SEM02G", 0x2, 0x100, add_quirk, MMC_QUIRK_INAND_CMD38),</div><div class='del'>-	MMC_FIXUP("SEM04G", 0x2, 0x100, add_quirk, MMC_QUIRK_INAND_CMD38),</div><div class='del'>-	MMC_FIXUP("SEM08G", 0x2, 0x100, add_quirk, MMC_QUIRK_INAND_CMD38),</div><div class='del'>-	MMC_FIXUP("SEM16G", 0x2, 0x100, add_quirk, MMC_QUIRK_INAND_CMD38),</div><div class='del'>-	MMC_FIXUP("SEM32G", 0x2, 0x100, add_quirk, MMC_QUIRK_INAND_CMD38),</div><div class='add'>+	MMC_FIXUP("SEM02G", CID_MANFID_SANDISK, 0x100, add_quirk,</div><div class='add'>+		  MMC_QUIRK_INAND_CMD38),</div><div class='add'>+	MMC_FIXUP("SEM04G", CID_MANFID_SANDISK, 0x100, add_quirk,</div><div class='add'>+		  MMC_QUIRK_INAND_CMD38),</div><div class='add'>+	MMC_FIXUP("SEM08G", CID_MANFID_SANDISK, 0x100, add_quirk,</div><div class='add'>+		  MMC_QUIRK_INAND_CMD38),</div><div class='add'>+	MMC_FIXUP("SEM16G", CID_MANFID_SANDISK, 0x100, add_quirk,</div><div class='add'>+		  MMC_QUIRK_INAND_CMD38),</div><div class='add'>+	MMC_FIXUP("SEM32G", CID_MANFID_SANDISK, 0x100, add_quirk,</div><div class='add'>+		  MMC_QUIRK_INAND_CMD38),</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Some MMC cards experience performance degradation with CMD23</div><div class='hunk'>@@ -1600,18 +1737,18 @@ static const struct mmc_fixup blk_fixups[] =</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * N.B. This doesn't affect SD cards.</div><div class='ctx'> 	 */</div><div class='del'>-	MMC_FIXUP("MMC08G", 0x11, CID_OEMID_ANY, add_quirk_mmc,</div><div class='add'>+	MMC_FIXUP("MMC08G", CID_MANFID_TOSHIBA, CID_OEMID_ANY, add_quirk_mmc,</div><div class='ctx'> 		  MMC_QUIRK_BLK_NO_CMD23),</div><div class='del'>-	MMC_FIXUP("MMC16G", 0x11, CID_OEMID_ANY, add_quirk_mmc,</div><div class='add'>+	MMC_FIXUP("MMC16G", CID_MANFID_TOSHIBA, CID_OEMID_ANY, add_quirk_mmc,</div><div class='ctx'> 		  MMC_QUIRK_BLK_NO_CMD23),</div><div class='del'>-	MMC_FIXUP("MMC32G", 0x11, CID_OEMID_ANY, add_quirk_mmc,</div><div class='add'>+	MMC_FIXUP("MMC32G", CID_MANFID_TOSHIBA, CID_OEMID_ANY, add_quirk_mmc,</div><div class='ctx'> 		  MMC_QUIRK_BLK_NO_CMD23),</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Some Micron MMC cards needs longer data read timeout than</div><div class='ctx'> 	 * indicated in CSD.</div><div class='ctx'> 	 */</div><div class='del'>-	MMC_FIXUP(CID_NAME_ANY, 0x13, 0x200, add_quirk_mmc,</div><div class='add'>+	MMC_FIXUP(CID_NAME_ANY, CID_MANFID_MICRON, 0x200, add_quirk_mmc,</div><div class='ctx'> 		  MMC_QUIRK_LONG_READ_TIME),</div><div class='ctx'> </div><div class='ctx'> 	END_FIXUP</div><div class='head'>diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c<br/>index b038c4a9468b..759714ed6bee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/card/mmc_test.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/card/mmc_test.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/card/mmc_test.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/card/mmc_test.c</a></div><div class='hunk'>@@ -1581,6 +1581,7 @@ static int mmc_test_area_init(struct mmc_test_card *test, int erase, int fill)</div><div class='ctx'> </div><div class='ctx'> 	t-&gt;max_segs = test-&gt;card-&gt;host-&gt;max_segs;</div><div class='ctx'> 	t-&gt;max_seg_sz = test-&gt;card-&gt;host-&gt;max_seg_size;</div><div class='add'>+	t-&gt;max_seg_sz -= t-&gt;max_seg_sz % 512;</div><div class='ctx'> </div><div class='ctx'> 	t-&gt;max_tfr = t-&gt;max_sz;</div><div class='ctx'> 	if (t-&gt;max_tfr &gt;&gt; 9 &gt; test-&gt;card-&gt;host-&gt;max_blk_count)</div><div class='hunk'>@@ -2949,7 +2950,7 @@ static void mmc_test_free_dbgfs_file(struct mmc_card *card)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __mmc_test_register_dbgfs_file(struct mmc_card *card,</div><div class='del'>-	const char *name, mode_t mode, const struct file_operations *fops)</div><div class='add'>+	const char *name, umode_t mode, const struct file_operations *fops)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *file = NULL;</div><div class='ctx'> 	struct mmc_test_dbgfs_file *df;</div><div class='head'>diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c<br/>index dcad59cbfef1..2517547b4366 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/card/queue.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/card/queue.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/card/queue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/card/queue.c</a></div><div class='hunk'>@@ -29,6 +29,8 @@</div><div class='ctx'>  */</div><div class='ctx'> static int mmc_prep_request(struct request_queue *q, struct request *req)</div><div class='ctx'> {</div><div class='add'>+	struct mmc_queue *mq = q-&gt;queuedata;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We only like normal block requests and discards.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -37,6 +39,9 @@ static int mmc_prep_request(struct request_queue *q, struct request *req)</div><div class='ctx'> 		return BLKPREP_KILL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (mq &amp;&amp; mmc_card_removed(mq-&gt;card))</div><div class='add'>+		return BLKPREP_KILL;</div><div class='add'>+</div><div class='ctx'> 	req-&gt;cmd_flags |= REQ_DONTPREP;</div><div class='ctx'> </div><div class='ctx'> 	return BLKPREP_OK;</div><div class='head'>diff --git a/drivers/mmc/core/Makefile b/drivers/mmc/core/Makefile<br/>index 639501970b41..dca4428380f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/core/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/core/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/core/Makefile</a></div><div class='hunk'>@@ -7,6 +7,6 @@ mmc_core-y			:= core.o bus.o host.o \</div><div class='ctx'> 				   mmc.o mmc_ops.o sd.o sd_ops.o \</div><div class='ctx'> 				   sdio.o sdio_ops.o sdio_bus.o \</div><div class='ctx'> 				   sdio_cis.o sdio_io.o sdio_irq.o \</div><div class='del'>-				   quirks.o</div><div class='add'>+				   quirks.o cd-gpio.o</div><div class='ctx'> </div><div class='ctx'> mmc_core-$(CONFIG_DEBUG_FS)	+= debugfs.o</div><div class='head'>diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c<br/>index 6be49249895a..5d011a39dfff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/core/bus.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/bus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/core/bus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/core/bus.c</a></div><div class='hunk'>@@ -303,10 +303,11 @@ int mmc_add_card(struct mmc_card *card)</div><div class='ctx'> 			mmc_card_ddr_mode(card) ? "DDR " : "",</div><div class='ctx'> 			type);</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(KERN_INFO "%s: new %s%s%s card at address %04x\n",</div><div class='add'>+		pr_info("%s: new %s%s%s%s card at address %04x\n",</div><div class='ctx'> 			mmc_hostname(card-&gt;host),</div><div class='del'>-			mmc_sd_card_uhs(card) ? "ultra high speed " :</div><div class='add'>+			mmc_card_uhs(card) ? "ultra high speed " :</div><div class='ctx'> 			(mmc_card_highspeed(card) ? "high speed " : ""),</div><div class='add'>+			(mmc_card_hs200(card) ? "HS200 " : ""),</div><div class='ctx'> 			mmc_card_ddr_mode(card) ? "DDR " : "",</div><div class='ctx'> 			type, card-&gt;rca);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/mmc/core/cd-gpio.c b/drivers/mmc/core/cd-gpio.c<br/>new file mode 100644<br/>index 000000000000..082202ae4a03<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/core/cd-gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/core/cd-gpio.c</a></div><div class='hunk'>@@ -0,0 +1,74 @@</div><div class='add'>+/*</div><div class='add'>+ * Generic GPIO card-detect helper</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011, Guennadi Liakhovetski &lt;g.liakhovetski@gmx.de&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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</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/gpio.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/mmc/host.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'>+</div><div class='add'>+struct mmc_cd_gpio {</div><div class='add'>+	unsigned int gpio;</div><div class='add'>+	char label[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static irqreturn_t mmc_cd_gpio_irqt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	/* Schedule a card detection after a debounce timeout */</div><div class='add'>+	mmc_detect_change(dev_id, msecs_to_jiffies(100));</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mmc_cd_gpio_request(struct mmc_host *host, unsigned int gpio,</div><div class='add'>+			unsigned int irq, unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	size_t len = strlen(dev_name(host-&gt;parent)) + 4;</div><div class='add'>+	struct mmc_cd_gpio *cd = kmalloc(sizeof(*cd) + len, GFP_KERNEL);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!cd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	snprintf(cd-&gt;label, len, "%s cd", dev_name(host-&gt;parent));</div><div class='add'>+</div><div class='add'>+	ret = gpio_request_one(gpio, GPIOF_DIR_IN, cd-&gt;label);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto egpioreq;</div><div class='add'>+</div><div class='add'>+	ret = request_threaded_irq(irq, NULL, mmc_cd_gpio_irqt,</div><div class='add'>+				   flags, cd-&gt;label, host);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto eirqreq;</div><div class='add'>+</div><div class='add'>+	cd-&gt;gpio = gpio;</div><div class='add'>+	host-&gt;hotplug.irq = irq;</div><div class='add'>+	host-&gt;hotplug.handler_priv = cd;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+eirqreq:</div><div class='add'>+	gpio_free(gpio);</div><div class='add'>+egpioreq:</div><div class='add'>+	kfree(cd);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(mmc_cd_gpio_request);</div><div class='add'>+</div><div class='add'>+void mmc_cd_gpio_free(struct mmc_host *host)</div><div class='add'>+{</div><div class='add'>+	struct mmc_cd_gpio *cd = host-&gt;hotplug.handler_priv;</div><div class='add'>+</div><div class='add'>+	free_irq(host-&gt;hotplug.irq, host);</div><div class='add'>+	gpio_free(cd-&gt;gpio);</div><div class='add'>+	kfree(cd);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(mmc_cd_gpio_free);</div><div class='head'>diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c<br/>index 950b97d7412a..f545a3e6eb80 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/core/core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/core/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/core/core.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@ static struct workqueue_struct *workqueue;</div><div class='ctx'>  * performance cost, and for other reasons may not always be desired.</div><div class='ctx'>  * So we allow it it to be disabled.</div><div class='ctx'>  */</div><div class='del'>-int use_spi_crc = 1;</div><div class='add'>+bool use_spi_crc = 1;</div><div class='ctx'> module_param(use_spi_crc, bool, 0);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -58,9 +58,9 @@ module_param(use_spi_crc, bool, 0);</div><div class='ctx'>  * overridden if necessary.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_MMC_UNSAFE_RESUME</div><div class='del'>-int mmc_assume_removable;</div><div class='add'>+bool mmc_assume_removable;</div><div class='ctx'> #else</div><div class='del'>-int mmc_assume_removable = 1;</div><div class='add'>+bool mmc_assume_removable = 1;</div><div class='ctx'> #endif</div><div class='ctx'> EXPORT_SYMBOL(mmc_assume_removable);</div><div class='ctx'> module_param_named(removable, mmc_assume_removable, bool, 0644);</div><div class='hunk'>@@ -140,7 +140,7 @@ void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq)</div><div class='ctx'> 			cmd-&gt;retries = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (err &amp;&amp; cmd-&gt;retries) {</div><div class='add'>+	if (err &amp;&amp; cmd-&gt;retries &amp;&amp; !mmc_card_removed(host-&gt;card)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Request starter must handle retries - see</div><div class='ctx'> 		 * mmc_wait_for_req_done().</div><div class='hunk'>@@ -247,6 +247,11 @@ static void __mmc_start_req(struct mmc_host *host, struct mmc_request *mrq)</div><div class='ctx'> {</div><div class='ctx'> 	init_completion(&amp;mrq-&gt;completion);</div><div class='ctx'> 	mrq-&gt;done = mmc_wait_done;</div><div class='add'>+	if (mmc_card_removed(host-&gt;card)) {</div><div class='add'>+		mrq-&gt;cmd-&gt;error = -ENOMEDIUM;</div><div class='add'>+		complete(&amp;mrq-&gt;completion);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	mmc_start_request(host, mrq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -259,7 +264,8 @@ static void mmc_wait_for_req_done(struct mmc_host *host,</div><div class='ctx'> 		wait_for_completion(&amp;mrq-&gt;completion);</div><div class='ctx'> </div><div class='ctx'> 		cmd = mrq-&gt;cmd;</div><div class='del'>-		if (!cmd-&gt;error || !cmd-&gt;retries)</div><div class='add'>+		if (!cmd-&gt;error || !cmd-&gt;retries ||</div><div class='add'>+		    mmc_card_removed(host-&gt;card))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		pr_debug("%s: req failed (CMD%u): %d, retrying...\n",</div><div class='hunk'>@@ -1456,7 +1462,7 @@ void mmc_detect_change(struct mmc_host *host, unsigned long delay)</div><div class='ctx'> 	WARN_ON(host-&gt;removed);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='add'>+	host-&gt;detect_change = 1;</div><div class='ctx'> 	mmc_schedule_delayed_work(&amp;host-&gt;detect, delay);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2049,6 +2055,43 @@ static int mmc_rescan_try_freq(struct mmc_host *host, unsigned freq)</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int _mmc_detect_card_removed(struct mmc_host *host)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if ((host-&gt;caps &amp; MMC_CAP_NONREMOVABLE) || !host-&gt;bus_ops-&gt;alive)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!host-&gt;card || mmc_card_removed(host-&gt;card))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	ret = host-&gt;bus_ops-&gt;alive(host);</div><div class='add'>+	if (ret) {</div><div class='add'>+		mmc_card_set_removed(host-&gt;card);</div><div class='add'>+		pr_debug("%s: card remove detected\n", mmc_hostname(host));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mmc_detect_card_removed(struct mmc_host *host)</div><div class='add'>+{</div><div class='add'>+	struct mmc_card *card = host-&gt;card;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!host-&gt;claimed);</div><div class='add'>+	/*</div><div class='add'>+	 * The card will be considered unchanged unless we have been asked to</div><div class='add'>+	 * detect a change or host requires polling to provide card detection.</div><div class='add'>+	 */</div><div class='add'>+	if (card &amp;&amp; !host-&gt;detect_change &amp;&amp; !(host-&gt;caps &amp; MMC_CAP_NEEDS_POLL))</div><div class='add'>+		return mmc_card_removed(card);</div><div class='add'>+</div><div class='add'>+	host-&gt;detect_change = 0;</div><div class='add'>+</div><div class='add'>+	return _mmc_detect_card_removed(host);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(mmc_detect_card_removed);</div><div class='add'>+</div><div class='ctx'> void mmc_rescan(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	static const unsigned freqs[] = { 400000, 300000, 200000, 100000 };</div><div class='hunk'>@@ -2069,6 +2112,8 @@ void mmc_rescan(struct work_struct *work)</div><div class='ctx'> 	    &amp;&amp; !(host-&gt;caps &amp; MMC_CAP_NONREMOVABLE))</div><div class='ctx'> 		host-&gt;bus_ops-&gt;detect(host);</div><div class='ctx'> </div><div class='add'>+	host-&gt;detect_change = 0;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Let mmc_bus_put() free the bus/bus_ops if we've found that</div><div class='ctx'> 	 * the card is no longer present.</div><div class='hunk'>@@ -2130,6 +2175,7 @@ void mmc_stop_host(struct mmc_host *host)</div><div class='ctx'> </div><div class='ctx'> 	mmc_bus_get(host);</div><div class='ctx'> 	if (host-&gt;bus_ops &amp;&amp; !host-&gt;bus_dead) {</div><div class='add'>+		/* Calling bus_ops-&gt;remove() with a claimed host can deadlock */</div><div class='ctx'> 		if (host-&gt;bus_ops-&gt;remove)</div><div class='ctx'> 			host-&gt;bus_ops-&gt;remove(host);</div><div class='ctx'> </div><div class='hunk'>@@ -2201,6 +2247,9 @@ int mmc_card_awake(struct mmc_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	int err = -ENOSYS;</div><div class='ctx'> </div><div class='add'>+	if (host-&gt;caps2 &amp; MMC_CAP2_NO_SLEEP_CMD)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	mmc_bus_get(host);</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;bus_ops &amp;&amp; !host-&gt;bus_dead &amp;&amp; host-&gt;bus_ops-&gt;awake)</div><div class='hunk'>@@ -2216,6 +2265,9 @@ int mmc_card_sleep(struct mmc_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	int err = -ENOSYS;</div><div class='ctx'> </div><div class='add'>+	if (host-&gt;caps2 &amp; MMC_CAP2_NO_SLEEP_CMD)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	mmc_bus_get(host);</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;bus_ops &amp;&amp; !host-&gt;bus_dead &amp;&amp; host-&gt;bus_ops-&gt;sleep)</div><div class='hunk'>@@ -2270,6 +2322,7 @@ EXPORT_SYMBOL(mmc_flush_cache);</div><div class='ctx'> int mmc_cache_ctrl(struct mmc_host *host, u8 enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct mmc_card *card = host-&gt;card;</div><div class='add'>+	unsigned int timeout;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!(host-&gt;caps2 &amp; MMC_CAP2_CACHE_CTRL) ||</div><div class='hunk'>@@ -2280,16 +2333,18 @@ int mmc_cache_ctrl(struct mmc_host *host, u8 enable)</div><div class='ctx'> 			(card-&gt;ext_csd.cache_size &gt; 0)) {</div><div class='ctx'> 		enable = !!enable;</div><div class='ctx'> </div><div class='del'>-		if (card-&gt;ext_csd.cache_ctrl ^ enable)</div><div class='add'>+		if (card-&gt;ext_csd.cache_ctrl ^ enable) {</div><div class='add'>+			timeout = enable ? card-&gt;ext_csd.generic_cmd6_time : 0;</div><div class='ctx'> 			err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,</div><div class='del'>-					EXT_CSD_CACHE_CTRL, enable, 0);</div><div class='del'>-		if (err)</div><div class='del'>-			pr_err("%s: cache %s error %d\n",</div><div class='del'>-					mmc_hostname(card-&gt;host),</div><div class='del'>-					enable ? "on" : "off",</div><div class='del'>-					err);</div><div class='del'>-		else</div><div class='del'>-			card-&gt;ext_csd.cache_ctrl = enable;</div><div class='add'>+					EXT_CSD_CACHE_CTRL, enable, timeout);</div><div class='add'>+			if (err)</div><div class='add'>+				pr_err("%s: cache %s error %d\n",</div><div class='add'>+						mmc_hostname(card-&gt;host),</div><div class='add'>+						enable ? "on" : "off",</div><div class='add'>+						err);</div><div class='add'>+			else</div><div class='add'>+				card-&gt;ext_csd.cache_ctrl = enable;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -2310,7 +2365,13 @@ int mmc_suspend_host(struct mmc_host *host)</div><div class='ctx'> 		cancel_delayed_work(&amp;host-&gt;disable);</div><div class='ctx'> 	cancel_delayed_work(&amp;host-&gt;detect);</div><div class='ctx'> 	mmc_flush_scheduled_work();</div><div class='del'>-	err = mmc_cache_ctrl(host, 0);</div><div class='add'>+	if (mmc_try_claim_host(host)) {</div><div class='add'>+		err = mmc_cache_ctrl(host, 0);</div><div class='add'>+		mmc_do_release_host(host);</div><div class='add'>+	} else {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -2338,7 +2399,9 @@ int mmc_suspend_host(struct mmc_host *host)</div><div class='ctx'> 			if (err == -ENOSYS || !host-&gt;bus_ops-&gt;resume) {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * We simply "remove" the card in this case.</div><div class='del'>-				 * It will be redetected on resume.</div><div class='add'>+				 * It will be redetected on resume.  (Calling</div><div class='add'>+				 * bus_ops-&gt;remove() with a claimed host can</div><div class='add'>+				 * deadlock.)</div><div class='ctx'> 				 */</div><div class='ctx'> 				if (host-&gt;bus_ops-&gt;remove)</div><div class='ctx'> 					host-&gt;bus_ops-&gt;remove(host);</div><div class='hunk'>@@ -2431,11 +2494,11 @@ int mmc_pm_notify(struct notifier_block *notify_block,</div><div class='ctx'> 		if (!host-&gt;bus_ops || host-&gt;bus_ops-&gt;suspend)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		mmc_claim_host(host);</div><div class='del'>-</div><div class='add'>+		/* Calling bus_ops-&gt;remove() with a claimed host can deadlock */</div><div class='ctx'> 		if (host-&gt;bus_ops-&gt;remove)</div><div class='ctx'> 			host-&gt;bus_ops-&gt;remove(host);</div><div class='ctx'> </div><div class='add'>+		mmc_claim_host(host);</div><div class='ctx'> 		mmc_detach_bus(host);</div><div class='ctx'> 		mmc_power_off(host);</div><div class='ctx'> 		mmc_release_host(host);</div><div class='head'>diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h<br/>index 14664f1fb16f..3bdafbca354f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/core/core.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/core.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/core/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/core/core.h</a></div><div class='hunk'>@@ -24,6 +24,7 @@ struct mmc_bus_ops {</div><div class='ctx'> 	int (*resume)(struct mmc_host *);</div><div class='ctx'> 	int (*power_save)(struct mmc_host *);</div><div class='ctx'> 	int (*power_restore)(struct mmc_host *);</div><div class='add'>+	int (*alive)(struct mmc_host *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops);</div><div class='hunk'>@@ -59,12 +60,14 @@ void mmc_rescan(struct work_struct *work);</div><div class='ctx'> void mmc_start_host(struct mmc_host *host);</div><div class='ctx'> void mmc_stop_host(struct mmc_host *host);</div><div class='ctx'> </div><div class='add'>+int _mmc_detect_card_removed(struct mmc_host *host);</div><div class='add'>+</div><div class='ctx'> int mmc_attach_mmc(struct mmc_host *host);</div><div class='ctx'> int mmc_attach_sd(struct mmc_host *host);</div><div class='ctx'> int mmc_attach_sdio(struct mmc_host *host);</div><div class='ctx'> </div><div class='ctx'> /* Module parameters */</div><div class='del'>-extern int use_spi_crc;</div><div class='add'>+extern bool use_spi_crc;</div><div class='ctx'> </div><div class='ctx'> /* Debugfs information for hosts and cards */</div><div class='ctx'> void mmc_add_host_debugfs(struct mmc_host *host);</div><div class='head'>diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c<br/>index 3923880118b6..9ab5b17d488a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/core/debugfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/debugfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/core/debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/core/debugfs.c</a></div><div class='hunk'>@@ -57,6 +57,8 @@ static int mmc_ios_show(struct seq_file *s, void *data)</div><div class='ctx'> 	const char *str;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(s, "clock:\t\t%u Hz\n", ios-&gt;clock);</div><div class='add'>+	if (host-&gt;actual_clock)</div><div class='add'>+		seq_printf(s, "actual clock:\t%u Hz\n", host-&gt;actual_clock);</div><div class='ctx'> 	seq_printf(s, "vdd:\t\t%u ", ios-&gt;vdd);</div><div class='ctx'> 	if ((1 &lt;&lt; ios-&gt;vdd) &amp; MMC_VDD_165_195)</div><div class='ctx'> 		seq_printf(s, "(1.65 - 1.95 V)\n");</div><div class='hunk'>@@ -133,6 +135,9 @@ static int mmc_ios_show(struct seq_file *s, void *data)</div><div class='ctx'> 	case MMC_TIMING_UHS_DDR50:</div><div class='ctx'> 		str = "sd uhs DDR50";</div><div class='ctx'> 		break;</div><div class='add'>+	case MMC_TIMING_MMC_HS200:</div><div class='add'>+		str = "mmc high-speed SDR200";</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		str = "invalid";</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c<br/>index d31c78b72b0f..30055f2b0d44 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/core/host.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/host.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/core/host.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/core/host.c</a></div><div class='hunk'>@@ -54,6 +54,27 @@ static DEFINE_IDR(mmc_host_idr);</div><div class='ctx'> static DEFINE_SPINLOCK(mmc_host_lock);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMC_CLKGATE</div><div class='add'>+static ssize_t clkgate_delay_show(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct mmc_host *host = cls_dev_to_mmc_host(dev);</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%lu\n", host-&gt;clkgate_delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t clkgate_delay_store(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct mmc_host *host = cls_dev_to_mmc_host(dev);</div><div class='add'>+	unsigned long flags, value;</div><div class='add'>+</div><div class='add'>+	if (kstrtoul(buf, 0, &amp;value))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;host-&gt;clk_lock, flags);</div><div class='add'>+	host-&gt;clkgate_delay = value;</div><div class='add'>+	spin_unlock_irqrestore(&amp;host-&gt;clk_lock, flags);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Enabling clock gating will make the core call out to the host</div><div class='hunk'>@@ -114,7 +135,7 @@ static void mmc_host_clk_gate_delayed(struct mmc_host *host)</div><div class='ctx'> static void mmc_host_clk_gate_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct mmc_host *host = container_of(work, struct mmc_host,</div><div class='del'>-					      clk_gate_work);</div><div class='add'>+					      clk_gate_work.work);</div><div class='ctx'> </div><div class='ctx'> 	mmc_host_clk_gate_delayed(host);</div><div class='ctx'> }</div><div class='hunk'>@@ -131,6 +152,8 @@ void mmc_host_clk_hold(struct mmc_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	/* cancel any clock gating work scheduled by mmc_host_clk_release() */</div><div class='add'>+	cancel_delayed_work_sync(&amp;host-&gt;clk_gate_work);</div><div class='ctx'> 	mutex_lock(&amp;host-&gt;clk_gate_mutex);</div><div class='ctx'> 	spin_lock_irqsave(&amp;host-&gt;clk_lock, flags);</div><div class='ctx'> 	if (host-&gt;clk_gated) {</div><div class='hunk'>@@ -180,7 +203,8 @@ void mmc_host_clk_release(struct mmc_host *host)</div><div class='ctx'> 	host-&gt;clk_requests--;</div><div class='ctx'> 	if (mmc_host_may_gate_card(host-&gt;card) &amp;&amp;</div><div class='ctx'> 	    !host-&gt;clk_requests)</div><div class='del'>-		queue_work(system_nrt_wq, &amp;host-&gt;clk_gate_work);</div><div class='add'>+		queue_delayed_work(system_nrt_wq, &amp;host-&gt;clk_gate_work,</div><div class='add'>+				msecs_to_jiffies(host-&gt;clkgate_delay));</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;host-&gt;clk_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -213,8 +237,13 @@ static inline void mmc_host_clk_init(struct mmc_host *host)</div><div class='ctx'> 	host-&gt;clk_requests = 0;</div><div class='ctx'> 	/* Hold MCI clock for 8 cycles by default */</div><div class='ctx'> 	host-&gt;clk_delay = 8;</div><div class='add'>+	/*</div><div class='add'>+	 * Default clock gating delay is 200ms.</div><div class='add'>+	 * This value can be tuned by writing into sysfs entry.</div><div class='add'>+	 */</div><div class='add'>+	host-&gt;clkgate_delay = 200;</div><div class='ctx'> 	host-&gt;clk_gated = false;</div><div class='del'>-	INIT_WORK(&amp;host-&gt;clk_gate_work, mmc_host_clk_gate_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;host-&gt;clk_gate_work, mmc_host_clk_gate_work);</div><div class='ctx'> 	spin_lock_init(&amp;host-&gt;clk_lock);</div><div class='ctx'> 	mutex_init(&amp;host-&gt;clk_gate_mutex);</div><div class='ctx'> }</div><div class='hunk'>@@ -229,7 +258,7 @@ static inline void mmc_host_clk_exit(struct mmc_host *host)</div><div class='ctx'> 	 * Wait for any outstanding gate and then make sure we're</div><div class='ctx'> 	 * ungated before exiting.</div><div class='ctx'> 	 */</div><div class='del'>-	if (cancel_work_sync(&amp;host-&gt;clk_gate_work))</div><div class='add'>+	if (cancel_delayed_work_sync(&amp;host-&gt;clk_gate_work))</div><div class='ctx'> 		mmc_host_clk_gate_delayed(host);</div><div class='ctx'> 	if (host-&gt;clk_gated)</div><div class='ctx'> 		mmc_host_clk_hold(host);</div><div class='hunk'>@@ -237,6 +266,17 @@ static inline void mmc_host_clk_exit(struct mmc_host *host)</div><div class='ctx'> 	WARN_ON(host-&gt;clk_requests &gt; 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void mmc_host_clk_sysfs_init(struct mmc_host *host)</div><div class='add'>+{</div><div class='add'>+	host-&gt;clkgate_delay_attr.show = clkgate_delay_show;</div><div class='add'>+	host-&gt;clkgate_delay_attr.store = clkgate_delay_store;</div><div class='add'>+	sysfs_attr_init(&amp;host-&gt;clkgate_delay_attr.attr);</div><div class='add'>+	host-&gt;clkgate_delay_attr.attr.name = "clkgate_delay";</div><div class='add'>+	host-&gt;clkgate_delay_attr.attr.mode = S_IRUGO | S_IWUSR;</div><div class='add'>+	if (device_create_file(&amp;host-&gt;class_dev, &amp;host-&gt;clkgate_delay_attr))</div><div class='add'>+		pr_err("%s: Failed to create clkgate_delay sysfs entry\n",</div><div class='add'>+				mmc_hostname(host));</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> static inline void mmc_host_clk_init(struct mmc_host *host)</div><div class='hunk'>@@ -247,6 +287,10 @@ static inline void mmc_host_clk_exit(struct mmc_host *host)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void mmc_host_clk_sysfs_init(struct mmc_host *host)</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'> /**</div><div class='hunk'>@@ -335,6 +379,7 @@ int mmc_add_host(struct mmc_host *host)</div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='ctx'> 	mmc_add_host_debugfs(host);</div><div class='ctx'> #endif</div><div class='add'>+	mmc_host_clk_sysfs_init(host);</div><div class='ctx'> </div><div class='ctx'> 	mmc_start_host(host);</div><div class='ctx'> 	register_pm_notifier(&amp;host-&gt;pm_notify);</div><div class='head'>diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c<br/>index d240427c1246..59b9ba52e66a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/core/mmc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/mmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/core/mmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/core/mmc.c</a></div><div class='hunk'>@@ -286,6 +286,27 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)</div><div class='ctx'> 	}</div><div class='ctx'> 	card-&gt;ext_csd.raw_card_type = ext_csd[EXT_CSD_CARD_TYPE];</div><div class='ctx'> 	switch (ext_csd[EXT_CSD_CARD_TYPE] &amp; EXT_CSD_CARD_TYPE_MASK) {</div><div class='add'>+	case EXT_CSD_CARD_TYPE_SDR_ALL:</div><div class='add'>+	case EXT_CSD_CARD_TYPE_SDR_ALL_DDR_1_8V:</div><div class='add'>+	case EXT_CSD_CARD_TYPE_SDR_ALL_DDR_1_2V:</div><div class='add'>+	case EXT_CSD_CARD_TYPE_SDR_ALL_DDR_52:</div><div class='add'>+		card-&gt;ext_csd.hs_max_dtr = 200000000;</div><div class='add'>+		card-&gt;ext_csd.card_type = EXT_CSD_CARD_TYPE_SDR_200;</div><div class='add'>+		break;</div><div class='add'>+	case EXT_CSD_CARD_TYPE_SDR_1_2V_ALL:</div><div class='add'>+	case EXT_CSD_CARD_TYPE_SDR_1_2V_DDR_1_8V:</div><div class='add'>+	case EXT_CSD_CARD_TYPE_SDR_1_2V_DDR_1_2V:</div><div class='add'>+	case EXT_CSD_CARD_TYPE_SDR_1_2V_DDR_52:</div><div class='add'>+		card-&gt;ext_csd.hs_max_dtr = 200000000;</div><div class='add'>+		card-&gt;ext_csd.card_type = EXT_CSD_CARD_TYPE_SDR_1_2V;</div><div class='add'>+		break;</div><div class='add'>+	case EXT_CSD_CARD_TYPE_SDR_1_8V_ALL:</div><div class='add'>+	case EXT_CSD_CARD_TYPE_SDR_1_8V_DDR_1_8V:</div><div class='add'>+	case EXT_CSD_CARD_TYPE_SDR_1_8V_DDR_1_2V:</div><div class='add'>+	case EXT_CSD_CARD_TYPE_SDR_1_8V_DDR_52:</div><div class='add'>+		card-&gt;ext_csd.hs_max_dtr = 200000000;</div><div class='add'>+		card-&gt;ext_csd.card_type = EXT_CSD_CARD_TYPE_SDR_1_8V;</div><div class='add'>+		break;</div><div class='ctx'> 	case EXT_CSD_CARD_TYPE_DDR_52 | EXT_CSD_CARD_TYPE_52 |</div><div class='ctx'> 	     EXT_CSD_CARD_TYPE_26:</div><div class='ctx'> 		card-&gt;ext_csd.hs_max_dtr = 52000000;</div><div class='hunk'>@@ -348,7 +369,8 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)</div><div class='ctx'> 				part_size = ext_csd[EXT_CSD_BOOT_MULT] &lt;&lt; 17;</div><div class='ctx'> 				mmc_part_add(card, part_size,</div><div class='ctx'> 					EXT_CSD_PART_CONFIG_ACC_BOOT0 + idx,</div><div class='del'>-					"boot%d", idx, true);</div><div class='add'>+					"boot%d", idx, true,</div><div class='add'>+					MMC_BLK_DATA_AREA_BOOT);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -435,7 +457,8 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)</div><div class='ctx'> 					hc_wp_grp_sz);</div><div class='ctx'> 				mmc_part_add(card, part_size &lt;&lt; 19,</div><div class='ctx'> 					EXT_CSD_PART_CONFIG_ACC_GP0 + idx,</div><div class='del'>-					"gp%d", idx, false);</div><div class='add'>+					"gp%d", idx, false,</div><div class='add'>+					MMC_BLK_DATA_AREA_GP);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		card-&gt;ext_csd.sec_trim_mult =</div><div class='hunk'>@@ -446,6 +469,14 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)</div><div class='ctx'> 			ext_csd[EXT_CSD_SEC_FEATURE_SUPPORT];</div><div class='ctx'> 		card-&gt;ext_csd.trim_timeout = 300 *</div><div class='ctx'> 			ext_csd[EXT_CSD_TRIM_MULT];</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Note that the call to mmc_part_add above defaults to read</div><div class='add'>+		 * only. If this default assumption is changed, the call must</div><div class='add'>+		 * take into account the value of boot_locked below.</div><div class='add'>+		 */</div><div class='add'>+		card-&gt;ext_csd.boot_ro_lock = ext_csd[EXT_CSD_BOOT_WP];</div><div class='add'>+		card-&gt;ext_csd.boot_ro_lockable = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (card-&gt;ext_csd.rev &gt;= 5) {</div><div class='hunk'>@@ -690,6 +721,79 @@ static int mmc_select_powerclass(struct mmc_card *card,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Selects the desired buswidth and switch to the HS200 mode</div><div class='add'>+ * if bus width set without error</div><div class='add'>+ */</div><div class='add'>+static int mmc_select_hs200(struct mmc_card *card)</div><div class='add'>+{</div><div class='add'>+	int idx, err = 0;</div><div class='add'>+	struct mmc_host *host;</div><div class='add'>+	static unsigned ext_csd_bits[] = {</div><div class='add'>+		EXT_CSD_BUS_WIDTH_4,</div><div class='add'>+		EXT_CSD_BUS_WIDTH_8,</div><div class='add'>+	};</div><div class='add'>+	static unsigned bus_widths[] = {</div><div class='add'>+		MMC_BUS_WIDTH_4,</div><div class='add'>+		MMC_BUS_WIDTH_8,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	BUG_ON(!card);</div><div class='add'>+</div><div class='add'>+	host = card-&gt;host;</div><div class='add'>+</div><div class='add'>+	if (card-&gt;ext_csd.card_type &amp; EXT_CSD_CARD_TYPE_SDR_1_2V &amp;&amp;</div><div class='add'>+	    host-&gt;caps2 &amp; MMC_CAP2_HS200_1_2V_SDR)</div><div class='add'>+		if (mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120, 0))</div><div class='add'>+			err = mmc_set_signal_voltage(host,</div><div class='add'>+						     MMC_SIGNAL_VOLTAGE_180, 0);</div><div class='add'>+</div><div class='add'>+	/* If fails try again during next card power cycle */</div><div class='add'>+	if (err)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	idx = (host-&gt;caps &amp; MMC_CAP_8_BIT_DATA) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Unlike SD, MMC cards dont have a configuration register to notify</div><div class='add'>+	 * supported bus width. So bus test command should be run to identify</div><div class='add'>+	 * the supported bus width or compare the ext csd values of current</div><div class='add'>+	 * bus width and ext csd values of 1 bit mode read earlier.</div><div class='add'>+	 */</div><div class='add'>+	for (; idx &gt;= 0; idx--) {</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Host is capable of 8bit transfer, then switch</div><div class='add'>+		 * the device to work in 8bit transfer mode. If the</div><div class='add'>+		 * mmc switch command returns error then switch to</div><div class='add'>+		 * 4bit transfer mode. On success set the corresponding</div><div class='add'>+		 * bus width on the host.</div><div class='add'>+		 */</div><div class='add'>+		err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,</div><div class='add'>+				 EXT_CSD_BUS_WIDTH,</div><div class='add'>+				 ext_csd_bits[idx],</div><div class='add'>+				 card-&gt;ext_csd.generic_cmd6_time);</div><div class='add'>+		if (err)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mmc_set_bus_width(card-&gt;host, bus_widths[idx]);</div><div class='add'>+</div><div class='add'>+		if (!(host-&gt;caps &amp; MMC_CAP_BUS_WIDTH_TEST))</div><div class='add'>+			err = mmc_compare_ext_csds(card, bus_widths[idx]);</div><div class='add'>+		else</div><div class='add'>+			err = mmc_bus_test(card, bus_widths[idx]);</div><div class='add'>+		if (!err)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* switch to HS200 mode if bus width set successfully */</div><div class='add'>+	if (!err)</div><div class='add'>+		err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,</div><div class='add'>+				 EXT_CSD_HS_TIMING, 2, 0);</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='ctx'>  * Handle the detection and initialisation of a card.</div><div class='ctx'>  *</div><div class='ctx'>  * In the case of a resume, "oldcard" will contain the card</div><div class='hunk'>@@ -895,11 +999,15 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Activate high speed (if supported)</div><div class='ctx'> 	 */</div><div class='del'>-	if ((card-&gt;ext_csd.hs_max_dtr != 0) &amp;&amp;</div><div class='del'>-		(host-&gt;caps &amp; MMC_CAP_MMC_HIGHSPEED)) {</div><div class='del'>-		err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,</div><div class='del'>-				 EXT_CSD_HS_TIMING, 1,</div><div class='del'>-				 card-&gt;ext_csd.generic_cmd6_time);</div><div class='add'>+	if (card-&gt;ext_csd.hs_max_dtr != 0) {</div><div class='add'>+		err = 0;</div><div class='add'>+		if (card-&gt;ext_csd.hs_max_dtr &gt; 52000000 &amp;&amp;</div><div class='add'>+		    host-&gt;caps2 &amp; MMC_CAP2_HS200)</div><div class='add'>+			err = mmc_select_hs200(card);</div><div class='add'>+		else if	(host-&gt;caps &amp; MMC_CAP_MMC_HIGHSPEED)</div><div class='add'>+			err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,</div><div class='add'>+					 EXT_CSD_HS_TIMING, 1, 0);</div><div class='add'>+</div><div class='ctx'> 		if (err &amp;&amp; err != -EBADMSG)</div><div class='ctx'> 			goto free_card;</div><div class='ctx'> </div><div class='hunk'>@@ -908,8 +1016,15 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,</div><div class='ctx'> 			       mmc_hostname(card-&gt;host));</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 		} else {</div><div class='del'>-			mmc_card_set_highspeed(card);</div><div class='del'>-			mmc_set_timing(card-&gt;host, MMC_TIMING_MMC_HS);</div><div class='add'>+			if (card-&gt;ext_csd.hs_max_dtr &gt; 52000000 &amp;&amp;</div><div class='add'>+			    host-&gt;caps2 &amp; MMC_CAP2_HS200) {</div><div class='add'>+				mmc_card_set_hs200(card);</div><div class='add'>+				mmc_set_timing(card-&gt;host,</div><div class='add'>+					       MMC_TIMING_MMC_HS200);</div><div class='add'>+			} else {</div><div class='add'>+				mmc_card_set_highspeed(card);</div><div class='add'>+				mmc_set_timing(card-&gt;host, MMC_TIMING_MMC_HS);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -934,7 +1049,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,</div><div class='ctx'> 	 */</div><div class='ctx'> 	max_dtr = (unsigned int)-1;</div><div class='ctx'> </div><div class='del'>-	if (mmc_card_highspeed(card)) {</div><div class='add'>+	if (mmc_card_highspeed(card) || mmc_card_hs200(card)) {</div><div class='ctx'> 		if (max_dtr &gt; card-&gt;ext_csd.hs_max_dtr)</div><div class='ctx'> 			max_dtr = card-&gt;ext_csd.hs_max_dtr;</div><div class='ctx'> 	} else if (max_dtr &gt; card-&gt;csd.max_dtr) {</div><div class='hunk'>@@ -960,9 +1075,48 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Indicate HS200 SDR mode (if supported).</div><div class='add'>+	 */</div><div class='add'>+	if (mmc_card_hs200(card)) {</div><div class='add'>+		u32 ext_csd_bits;</div><div class='add'>+		u32 bus_width = card-&gt;host-&gt;ios.bus_width;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * For devices supporting HS200 mode, the bus width has</div><div class='add'>+		 * to be set before executing the tuning function. If</div><div class='add'>+		 * set before tuning, then device will respond with CRC</div><div class='add'>+		 * errors for responses on CMD line. So for HS200 the</div><div class='add'>+		 * sequence will be</div><div class='add'>+		 * 1. set bus width 4bit / 8 bit (1 bit not supported)</div><div class='add'>+		 * 2. switch to HS200 mode</div><div class='add'>+		 * 3. set the clock to &gt; 52Mhz &lt;=200MHz and</div><div class='add'>+		 * 4. execute tuning for HS200</div><div class='add'>+		 */</div><div class='add'>+		if ((host-&gt;caps2 &amp; MMC_CAP2_HS200) &amp;&amp;</div><div class='add'>+		    card-&gt;host-&gt;ops-&gt;execute_tuning)</div><div class='add'>+			err = card-&gt;host-&gt;ops-&gt;execute_tuning(card-&gt;host,</div><div class='add'>+				MMC_SEND_TUNING_BLOCK_HS200);</div><div class='add'>+		if (err) {</div><div class='add'>+			pr_warning("%s: tuning execution failed\n",</div><div class='add'>+				   mmc_hostname(card-&gt;host));</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ext_csd_bits = (bus_width == MMC_BUS_WIDTH_8) ?</div><div class='add'>+				EXT_CSD_BUS_WIDTH_8 : EXT_CSD_BUS_WIDTH_4;</div><div class='add'>+		err = mmc_select_powerclass(card, ext_csd_bits, ext_csd);</div><div class='add'>+		if (err) {</div><div class='add'>+			pr_err("%s: power class selection to bus width %d failed\n",</div><div class='add'>+				mmc_hostname(card-&gt;host), 1 &lt;&lt; bus_width);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Activate wide bus and DDR (if supported).</div><div class='ctx'> 	 */</div><div class='del'>-	if ((card-&gt;csd.mmca_vsn &gt;= CSD_SPEC_VER_4) &amp;&amp;</div><div class='add'>+	if (!mmc_card_hs200(card) &amp;&amp;</div><div class='add'>+	    (card-&gt;csd.mmca_vsn &gt;= CSD_SPEC_VER_3) &amp;&amp;</div><div class='ctx'> 	    (host-&gt;caps &amp; (MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA))) {</div><div class='ctx'> 		static unsigned ext_csd_bits[][2] = {</div><div class='ctx'> 			{ EXT_CSD_BUS_WIDTH_8, EXT_CSD_DDR_BUS_WIDTH_8 },</div><div class='hunk'>@@ -1048,7 +1202,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,</div><div class='ctx'> 			 *</div><div class='ctx'> 			 * WARNING: eMMC rules are NOT the same as SD DDR</div><div class='ctx'> 			 */</div><div class='del'>-			if (ddr == EXT_CSD_CARD_TYPE_DDR_1_2V) {</div><div class='add'>+			if (ddr == MMC_1_2V_DDR_MODE) {</div><div class='ctx'> 				err = mmc_set_signal_voltage(host,</div><div class='ctx'> 					MMC_SIGNAL_VOLTAGE_120, 0);</div><div class='ctx'> 				if (err)</div><div class='hunk'>@@ -1067,14 +1221,23 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,</div><div class='ctx'> 	if ((host-&gt;caps2 &amp; MMC_CAP2_CACHE_CTRL) &amp;&amp;</div><div class='ctx'> 			card-&gt;ext_csd.cache_size &gt; 0) {</div><div class='ctx'> 		err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,</div><div class='del'>-				EXT_CSD_CACHE_CTRL, 1, 0);</div><div class='add'>+				EXT_CSD_CACHE_CTRL, 1,</div><div class='add'>+				card-&gt;ext_csd.generic_cmd6_time);</div><div class='ctx'> 		if (err &amp;&amp; err != -EBADMSG)</div><div class='ctx'> 			goto free_card;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Only if no error, cache is turned on successfully.</div><div class='ctx'> 		 */</div><div class='del'>-		card-&gt;ext_csd.cache_ctrl = err ? 0 : 1;</div><div class='add'>+		if (err) {</div><div class='add'>+			pr_warning("%s: Cache is supported, "</div><div class='add'>+					"but failed to turn on (%d)\n",</div><div class='add'>+					mmc_hostname(card-&gt;host), err);</div><div class='add'>+			card-&gt;ext_csd.cache_ctrl = 0;</div><div class='add'>+			err = 0;</div><div class='add'>+		} else {</div><div class='add'>+			card-&gt;ext_csd.cache_ctrl = 1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!oldcard)</div><div class='hunk'>@@ -1105,6 +1268,14 @@ static void mmc_remove(struct mmc_host *host)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Card detection - card is alive.</div><div class='add'>+ */</div><div class='add'>+static int mmc_alive(struct mmc_host *host)</div><div class='add'>+{</div><div class='add'>+	return mmc_send_status(host-&gt;card, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Card detection callback from host.</div><div class='ctx'>  */</div><div class='ctx'> static void mmc_detect(struct mmc_host *host)</div><div class='hunk'>@@ -1119,7 +1290,7 @@ static void mmc_detect(struct mmc_host *host)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Just check if our card has been removed.</div><div class='ctx'> 	 */</div><div class='del'>-	err = mmc_send_status(host-&gt;card, NULL);</div><div class='add'>+	err = _mmc_detect_card_removed(host);</div><div class='ctx'> </div><div class='ctx'> 	mmc_release_host(host);</div><div class='ctx'> </div><div class='hunk'>@@ -1224,6 +1395,7 @@ static const struct mmc_bus_ops mmc_ops = {</div><div class='ctx'> 	.suspend = NULL,</div><div class='ctx'> 	.resume = NULL,</div><div class='ctx'> 	.power_restore = mmc_power_restore,</div><div class='add'>+	.alive = mmc_alive,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mmc_bus_ops mmc_ops_unsafe = {</div><div class='hunk'>@@ -1234,6 +1406,7 @@ static const struct mmc_bus_ops mmc_ops_unsafe = {</div><div class='ctx'> 	.suspend = mmc_suspend,</div><div class='ctx'> 	.resume = mmc_resume,</div><div class='ctx'> 	.power_restore = mmc_power_restore,</div><div class='add'>+	.alive = mmc_alive,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void mmc_attach_bus_ops(struct mmc_host *host)</div><div class='head'>diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c<br/>index f2a05ea40f2a..c63ad03c29c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/core/sd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/sd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/core/sd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/core/sd.c</a></div><div class='hunk'>@@ -307,8 +307,8 @@ static int mmc_read_switch(struct mmc_card *card)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (status[13] &amp; UHS_SDR50_BUS_SPEED)</div><div class='del'>-		card-&gt;sw_caps.hs_max_dtr = 50000000;</div><div class='add'>+	if (status[13] &amp; SD_MODE_HIGH_SPEED)</div><div class='add'>+		card-&gt;sw_caps.hs_max_dtr = HIGH_SPEED_MAX_DTR;</div><div class='ctx'> </div><div class='ctx'> 	if (card-&gt;scr.sda_spec3) {</div><div class='ctx'> 		card-&gt;sw_caps.sd3_bus_mode = status[13];</div><div class='hunk'>@@ -661,7 +661,8 @@ static int mmc_sd_init_uhs_card(struct mmc_card *card)</div><div class='ctx'> </div><div class='ctx'> 	/* SPI mode doesn't define CMD19 */</div><div class='ctx'> 	if (!mmc_host_is_spi(card-&gt;host) &amp;&amp; card-&gt;host-&gt;ops-&gt;execute_tuning)</div><div class='del'>-		err = card-&gt;host-&gt;ops-&gt;execute_tuning(card-&gt;host);</div><div class='add'>+		err = card-&gt;host-&gt;ops-&gt;execute_tuning(card-&gt;host,</div><div class='add'>+						      MMC_SEND_TUNING_BLOCK);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	kfree(status);</div><div class='hunk'>@@ -960,7 +961,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,</div><div class='ctx'> 			goto free_card;</div><div class='ctx'> </div><div class='ctx'> 		/* Card is an ultra-high-speed card */</div><div class='del'>-		mmc_sd_card_set_uhs(card);</div><div class='add'>+		mmc_card_set_uhs(card);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Since initialization is now complete, enable preset</div><div class='hunk'>@@ -1019,6 +1020,14 @@ static void mmc_sd_remove(struct mmc_host *host)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Card detection - card is alive.</div><div class='add'>+ */</div><div class='add'>+static int mmc_sd_alive(struct mmc_host *host)</div><div class='add'>+{</div><div class='add'>+	return mmc_send_status(host-&gt;card, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Card detection callback from host.</div><div class='ctx'>  */</div><div class='ctx'> static void mmc_sd_detect(struct mmc_host *host)</div><div class='hunk'>@@ -1033,7 +1042,7 @@ static void mmc_sd_detect(struct mmc_host *host)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Just check if our card has been removed.</div><div class='ctx'> 	 */</div><div class='del'>-	err = mmc_send_status(host-&gt;card, NULL);</div><div class='add'>+	err = _mmc_detect_card_removed(host);</div><div class='ctx'> </div><div class='ctx'> 	mmc_release_host(host);</div><div class='ctx'> </div><div class='hunk'>@@ -1102,6 +1111,7 @@ static const struct mmc_bus_ops mmc_sd_ops = {</div><div class='ctx'> 	.suspend = NULL,</div><div class='ctx'> 	.resume = NULL,</div><div class='ctx'> 	.power_restore = mmc_sd_power_restore,</div><div class='add'>+	.alive = mmc_sd_alive,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mmc_bus_ops mmc_sd_ops_unsafe = {</div><div class='hunk'>@@ -1110,6 +1120,7 @@ static const struct mmc_bus_ops mmc_sd_ops_unsafe = {</div><div class='ctx'> 	.suspend = mmc_sd_suspend,</div><div class='ctx'> 	.resume = mmc_sd_resume,</div><div class='ctx'> 	.power_restore = mmc_sd_power_restore,</div><div class='add'>+	.alive = mmc_sd_alive,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void mmc_sd_attach_bus_ops(struct mmc_host *host)</div><div class='head'>diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c<br/>index 3ab565e32a6a..bd7bacc950dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/core/sdio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/sdio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/core/sdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/core/sdio.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mmc/host.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/card.h&gt;</div><div class='add'>+#include &lt;linux/mmc/mmc.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/sdio.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/sdio_func.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/sdio_ids.h&gt;</div><div class='hunk'>@@ -102,6 +103,7 @@ static int sdio_read_cccr(struct mmc_card *card)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int cccr_vsn;</div><div class='ctx'> 	unsigned char data;</div><div class='add'>+	unsigned char speed;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;card-&gt;cccr, 0, sizeof(struct sdio_cccr));</div><div class='ctx'> </div><div class='hunk'>@@ -140,12 +142,60 @@ static int sdio_read_cccr(struct mmc_card *card)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cccr_vsn &gt;= SDIO_CCCR_REV_1_20) {</div><div class='del'>-		ret = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_SPEED, 0, &amp;data);</div><div class='add'>+		ret = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_SPEED, 0, &amp;speed);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		if (data &amp; SDIO_SPEED_SHS)</div><div class='del'>-			card-&gt;cccr.high_speed = 1;</div><div class='add'>+		card-&gt;scr.sda_spec3 = 0;</div><div class='add'>+		card-&gt;sw_caps.sd3_bus_mode = 0;</div><div class='add'>+		card-&gt;sw_caps.sd3_drv_type = 0;</div><div class='add'>+		if (cccr_vsn &gt;= SDIO_CCCR_REV_3_00) {</div><div class='add'>+			card-&gt;scr.sda_spec3 = 1;</div><div class='add'>+			ret = mmc_io_rw_direct(card, 0, 0,</div><div class='add'>+				SDIO_CCCR_UHS, 0, &amp;data);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			if (card-&gt;host-&gt;caps &amp;</div><div class='add'>+				(MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 |</div><div class='add'>+				 MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 |</div><div class='add'>+				 MMC_CAP_UHS_DDR50)) {</div><div class='add'>+				if (data &amp; SDIO_UHS_DDR50)</div><div class='add'>+					card-&gt;sw_caps.sd3_bus_mode</div><div class='add'>+						|= SD_MODE_UHS_DDR50;</div><div class='add'>+</div><div class='add'>+				if (data &amp; SDIO_UHS_SDR50)</div><div class='add'>+					card-&gt;sw_caps.sd3_bus_mode</div><div class='add'>+						|= SD_MODE_UHS_SDR50;</div><div class='add'>+</div><div class='add'>+				if (data &amp; SDIO_UHS_SDR104)</div><div class='add'>+					card-&gt;sw_caps.sd3_bus_mode</div><div class='add'>+						|= SD_MODE_UHS_SDR104;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ret = mmc_io_rw_direct(card, 0, 0,</div><div class='add'>+				SDIO_CCCR_DRIVE_STRENGTH, 0, &amp;data);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			if (data &amp; SDIO_DRIVE_SDTA)</div><div class='add'>+				card-&gt;sw_caps.sd3_drv_type |= SD_DRIVER_TYPE_A;</div><div class='add'>+			if (data &amp; SDIO_DRIVE_SDTC)</div><div class='add'>+				card-&gt;sw_caps.sd3_drv_type |= SD_DRIVER_TYPE_C;</div><div class='add'>+			if (data &amp; SDIO_DRIVE_SDTD)</div><div class='add'>+				card-&gt;sw_caps.sd3_drv_type |= SD_DRIVER_TYPE_D;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* if no uhs mode ensure we check for high speed */</div><div class='add'>+		if (!card-&gt;sw_caps.sd3_bus_mode) {</div><div class='add'>+			if (speed &amp; SDIO_SPEED_SHS) {</div><div class='add'>+				card-&gt;cccr.high_speed = 1;</div><div class='add'>+				card-&gt;sw_caps.hs_max_dtr = 50000000;</div><div class='add'>+			} else {</div><div class='add'>+				card-&gt;cccr.high_speed = 0;</div><div class='add'>+				card-&gt;sw_caps.hs_max_dtr = 25000000;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -327,6 +377,194 @@ static unsigned mmc_sdio_get_max_clock(struct mmc_card *card)</div><div class='ctx'> 	return max_dtr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned char host_drive_to_sdio_drive(int host_strength)</div><div class='add'>+{</div><div class='add'>+	switch (host_strength) {</div><div class='add'>+	case MMC_SET_DRIVER_TYPE_A:</div><div class='add'>+		return SDIO_DTSx_SET_TYPE_A;</div><div class='add'>+	case MMC_SET_DRIVER_TYPE_B:</div><div class='add'>+		return SDIO_DTSx_SET_TYPE_B;</div><div class='add'>+	case MMC_SET_DRIVER_TYPE_C:</div><div class='add'>+		return SDIO_DTSx_SET_TYPE_C;</div><div class='add'>+	case MMC_SET_DRIVER_TYPE_D:</div><div class='add'>+		return SDIO_DTSx_SET_TYPE_D;</div><div class='add'>+	default:</div><div class='add'>+		return SDIO_DTSx_SET_TYPE_B;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sdio_select_driver_type(struct mmc_card *card)</div><div class='add'>+{</div><div class='add'>+	int host_drv_type = SD_DRIVER_TYPE_B;</div><div class='add'>+	int card_drv_type = SD_DRIVER_TYPE_B;</div><div class='add'>+	int drive_strength;</div><div class='add'>+	unsigned char card_strength;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the host doesn't support any of the Driver Types A,C or D,</div><div class='add'>+	 * or there is no board specific handler then default Driver</div><div class='add'>+	 * Type B is used.</div><div class='add'>+	 */</div><div class='add'>+	if (!(card-&gt;host-&gt;caps &amp;</div><div class='add'>+		(MMC_CAP_DRIVER_TYPE_A |</div><div class='add'>+		 MMC_CAP_DRIVER_TYPE_C |</div><div class='add'>+		 MMC_CAP_DRIVER_TYPE_D)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!card-&gt;host-&gt;ops-&gt;select_drive_strength)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (card-&gt;host-&gt;caps &amp; MMC_CAP_DRIVER_TYPE_A)</div><div class='add'>+		host_drv_type |= SD_DRIVER_TYPE_A;</div><div class='add'>+</div><div class='add'>+	if (card-&gt;host-&gt;caps &amp; MMC_CAP_DRIVER_TYPE_C)</div><div class='add'>+		host_drv_type |= SD_DRIVER_TYPE_C;</div><div class='add'>+</div><div class='add'>+	if (card-&gt;host-&gt;caps &amp; MMC_CAP_DRIVER_TYPE_D)</div><div class='add'>+		host_drv_type |= SD_DRIVER_TYPE_D;</div><div class='add'>+</div><div class='add'>+	if (card-&gt;sw_caps.sd3_drv_type &amp; SD_DRIVER_TYPE_A)</div><div class='add'>+		card_drv_type |= SD_DRIVER_TYPE_A;</div><div class='add'>+</div><div class='add'>+	if (card-&gt;sw_caps.sd3_drv_type &amp; SD_DRIVER_TYPE_C)</div><div class='add'>+		card_drv_type |= SD_DRIVER_TYPE_C;</div><div class='add'>+</div><div class='add'>+	if (card-&gt;sw_caps.sd3_drv_type &amp; SD_DRIVER_TYPE_D)</div><div class='add'>+		card_drv_type |= SD_DRIVER_TYPE_D;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The drive strength that the hardware can support</div><div class='add'>+	 * depends on the board design.  Pass the appropriate</div><div class='add'>+	 * information and let the hardware specific code</div><div class='add'>+	 * return what is possible given the options</div><div class='add'>+	 */</div><div class='add'>+	drive_strength = card-&gt;host-&gt;ops-&gt;select_drive_strength(</div><div class='add'>+		card-&gt;sw_caps.uhs_max_dtr,</div><div class='add'>+		host_drv_type, card_drv_type);</div><div class='add'>+</div><div class='add'>+	/* if error just use default for drive strength B */</div><div class='add'>+	err = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_DRIVE_STRENGTH, 0,</div><div class='add'>+		&amp;card_strength);</div><div class='add'>+	if (err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	card_strength &amp;= ~(SDIO_DRIVE_DTSx_MASK&lt;&lt;SDIO_DRIVE_DTSx_SHIFT);</div><div class='add'>+	card_strength |= host_drive_to_sdio_drive(drive_strength);</div><div class='add'>+</div><div class='add'>+	err = mmc_io_rw_direct(card, 1, 0, SDIO_CCCR_DRIVE_STRENGTH,</div><div class='add'>+		card_strength, NULL);</div><div class='add'>+</div><div class='add'>+	/* if error default to drive strength B */</div><div class='add'>+	if (!err)</div><div class='add'>+		mmc_set_driver_type(card-&gt;host, drive_strength);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int sdio_set_bus_speed_mode(struct mmc_card *card)</div><div class='add'>+{</div><div class='add'>+	unsigned int bus_speed, timing;</div><div class='add'>+	int err;</div><div class='add'>+	unsigned char speed;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the host doesn't support any of the UHS-I modes, fallback on</div><div class='add'>+	 * default speed.</div><div class='add'>+	 */</div><div class='add'>+	if (!(card-&gt;host-&gt;caps &amp; (MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 |</div><div class='add'>+	    MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_DDR50)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bus_speed = SDIO_SPEED_SDR12;</div><div class='add'>+	timing = MMC_TIMING_UHS_SDR12;</div><div class='add'>+	if ((card-&gt;host-&gt;caps &amp; MMC_CAP_UHS_SDR104) &amp;&amp;</div><div class='add'>+	    (card-&gt;sw_caps.sd3_bus_mode &amp; SD_MODE_UHS_SDR104)) {</div><div class='add'>+			bus_speed = SDIO_SPEED_SDR104;</div><div class='add'>+			timing = MMC_TIMING_UHS_SDR104;</div><div class='add'>+			card-&gt;sw_caps.uhs_max_dtr = UHS_SDR104_MAX_DTR;</div><div class='add'>+	} else if ((card-&gt;host-&gt;caps &amp; MMC_CAP_UHS_DDR50) &amp;&amp;</div><div class='add'>+		   (card-&gt;sw_caps.sd3_bus_mode &amp; SD_MODE_UHS_DDR50)) {</div><div class='add'>+			bus_speed = SDIO_SPEED_DDR50;</div><div class='add'>+			timing = MMC_TIMING_UHS_DDR50;</div><div class='add'>+			card-&gt;sw_caps.uhs_max_dtr = UHS_DDR50_MAX_DTR;</div><div class='add'>+	} else if ((card-&gt;host-&gt;caps &amp; (MMC_CAP_UHS_SDR104 |</div><div class='add'>+		    MMC_CAP_UHS_SDR50)) &amp;&amp; (card-&gt;sw_caps.sd3_bus_mode &amp;</div><div class='add'>+		    SD_MODE_UHS_SDR50)) {</div><div class='add'>+			bus_speed = SDIO_SPEED_SDR50;</div><div class='add'>+			timing = MMC_TIMING_UHS_SDR50;</div><div class='add'>+			card-&gt;sw_caps.uhs_max_dtr = UHS_SDR50_MAX_DTR;</div><div class='add'>+	} else if ((card-&gt;host-&gt;caps &amp; (MMC_CAP_UHS_SDR104 |</div><div class='add'>+		    MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR25)) &amp;&amp;</div><div class='add'>+		   (card-&gt;sw_caps.sd3_bus_mode &amp; SD_MODE_UHS_SDR25)) {</div><div class='add'>+			bus_speed = SDIO_SPEED_SDR25;</div><div class='add'>+			timing = MMC_TIMING_UHS_SDR25;</div><div class='add'>+			card-&gt;sw_caps.uhs_max_dtr = UHS_SDR25_MAX_DTR;</div><div class='add'>+	} else if ((card-&gt;host-&gt;caps &amp; (MMC_CAP_UHS_SDR104 |</div><div class='add'>+		    MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR25 |</div><div class='add'>+		    MMC_CAP_UHS_SDR12)) &amp;&amp; (card-&gt;sw_caps.sd3_bus_mode &amp;</div><div class='add'>+		    SD_MODE_UHS_SDR12)) {</div><div class='add'>+			bus_speed = SDIO_SPEED_SDR12;</div><div class='add'>+			timing = MMC_TIMING_UHS_SDR12;</div><div class='add'>+			card-&gt;sw_caps.uhs_max_dtr = UHS_SDR12_MAX_DTR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_SPEED, 0, &amp;speed);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	speed &amp;= ~SDIO_SPEED_BSS_MASK;</div><div class='add'>+	speed |= bus_speed;</div><div class='add'>+	err = mmc_io_rw_direct(card, 1, 0, SDIO_CCCR_SPEED, speed, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (bus_speed) {</div><div class='add'>+		mmc_set_timing(card-&gt;host, timing);</div><div class='add'>+		mmc_set_clock(card-&gt;host, card-&gt;sw_caps.uhs_max_dtr);</div><div 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'>+ * UHS-I specific initialization procedure</div><div class='add'>+ */</div><div class='add'>+static int mmc_sdio_init_uhs_card(struct mmc_card *card)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!card-&gt;scr.sda_spec3)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Switch to wider bus (if supported).</div><div class='add'>+	 */</div><div class='add'>+	if (card-&gt;host-&gt;caps &amp; MMC_CAP_4_BIT_DATA) {</div><div class='add'>+		err = sdio_enable_4bit_bus(card);</div><div class='add'>+		if (err &gt; 0) {</div><div class='add'>+			mmc_set_bus_width(card-&gt;host, MMC_BUS_WIDTH_4);</div><div class='add'>+			err = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the driver strength for the card */</div><div class='add'>+	sdio_select_driver_type(card);</div><div class='add'>+</div><div class='add'>+	/* Set bus speed mode of the card */</div><div class='add'>+	err = sdio_set_bus_speed_mode(card);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Initialize and start re-tuning timer */</div><div class='add'>+	if (!mmc_host_is_spi(card-&gt;host) &amp;&amp; card-&gt;host-&gt;ops-&gt;execute_tuning)</div><div class='add'>+		err = card-&gt;host-&gt;ops-&gt;execute_tuning(card-&gt;host,</div><div class='add'>+						      MMC_SEND_TUNING_BLOCK);</div><div class='add'>+</div><div class='add'>+out:</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'>  * Handle the detection and initialisation of a card.</div><div class='ctx'>  *</div><div class='hunk'>@@ -394,6 +632,30 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,</div><div class='ctx'> 		host-&gt;ops-&gt;init_card(host, card);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * If the host and card support UHS-I mode request the card</div><div class='add'>+	 * to switch to 1.8V signaling level.  No 1.8v signalling if</div><div class='add'>+	 * UHS mode is not enabled to maintain compatibilty and some</div><div class='add'>+	 * systems that claim 1.8v signalling in fact do not support</div><div class='add'>+	 * it.</div><div class='add'>+	 */</div><div class='add'>+	if ((ocr &amp; R4_18V_PRESENT) &amp;&amp;</div><div class='add'>+		(host-&gt;caps &amp;</div><div class='add'>+			(MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 |</div><div class='add'>+			 MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 |</div><div class='add'>+			 MMC_CAP_UHS_DDR50))) {</div><div class='add'>+		err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180,</div><div class='add'>+				true);</div><div class='add'>+		if (err) {</div><div class='add'>+			ocr &amp;= ~R4_18V_PRESENT;</div><div class='add'>+			host-&gt;ocr &amp;= ~R4_18V_PRESENT;</div><div class='add'>+		}</div><div class='add'>+		err = 0;</div><div class='add'>+	} else {</div><div class='add'>+		ocr &amp;= ~R4_18V_PRESENT;</div><div class='add'>+		host-&gt;ocr &amp;= ~R4_18V_PRESENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * For native busses:  set card RCA and quit open drain mode.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!powered_resume &amp;&amp; !mmc_host_is_spi(host)) {</div><div class='hunk'>@@ -492,29 +754,39 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto remove;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Switch to high-speed (if supported).</div><div class='del'>-	 */</div><div class='del'>-	err = sdio_enable_hs(card);</div><div class='del'>-	if (err &gt; 0)</div><div class='del'>-		mmc_sd_go_highspeed(card);</div><div class='del'>-	else if (err)</div><div class='del'>-		goto remove;</div><div class='add'>+	/* Initialization sequence for UHS-I cards */</div><div class='add'>+	/* Only if card supports 1.8v and UHS signaling */</div><div class='add'>+	if ((ocr &amp; R4_18V_PRESENT) &amp;&amp; card-&gt;sw_caps.sd3_bus_mode) {</div><div class='add'>+		err = mmc_sdio_init_uhs_card(card);</div><div class='add'>+		if (err)</div><div class='add'>+			goto remove;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Change to the card's maximum speed.</div><div class='del'>-	 */</div><div class='del'>-	mmc_set_clock(host, mmc_sdio_get_max_clock(card));</div><div class='add'>+		/* Card is an ultra-high-speed card */</div><div class='add'>+		mmc_card_set_uhs(card);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Switch to high-speed (if supported).</div><div class='add'>+		 */</div><div class='add'>+		err = sdio_enable_hs(card);</div><div class='add'>+		if (err &gt; 0)</div><div class='add'>+			mmc_sd_go_highspeed(card);</div><div class='add'>+		else if (err)</div><div class='add'>+			goto remove;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Switch to wider bus (if supported).</div><div class='del'>-	 */</div><div class='del'>-	err = sdio_enable_4bit_bus(card);</div><div class='del'>-	if (err &gt; 0)</div><div class='del'>-		mmc_set_bus_width(card-&gt;host, MMC_BUS_WIDTH_4);</div><div class='del'>-	else if (err)</div><div class='del'>-		goto remove;</div><div class='add'>+		/*</div><div class='add'>+		 * Change to the card's maximum speed.</div><div class='add'>+		 */</div><div class='add'>+		mmc_set_clock(host, mmc_sdio_get_max_clock(card));</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * Switch to wider bus (if supported).</div><div class='add'>+		 */</div><div class='add'>+		err = sdio_enable_4bit_bus(card);</div><div class='add'>+		if (err &gt; 0)</div><div class='add'>+			mmc_set_bus_width(card-&gt;host, MMC_BUS_WIDTH_4);</div><div class='add'>+		else if (err)</div><div class='add'>+			goto remove;</div><div class='add'>+	}</div><div class='ctx'> finish:</div><div class='ctx'> 	if (!oldcard)</div><div class='ctx'> 		host-&gt;card = card;</div><div class='hunk'>@@ -550,6 +822,14 @@ static void mmc_sdio_remove(struct mmc_host *host)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Card detection - card is alive.</div><div class='add'>+ */</div><div class='add'>+static int mmc_sdio_alive(struct mmc_host *host)</div><div class='add'>+{</div><div class='add'>+	return mmc_select_card(host-&gt;card);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Card detection callback from host.</div><div class='ctx'>  */</div><div class='ctx'> static void mmc_sdio_detect(struct mmc_host *host)</div><div class='hunk'>@@ -571,7 +851,7 @@ static void mmc_sdio_detect(struct mmc_host *host)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Just check if our card has been removed.</div><div class='ctx'> 	 */</div><div class='del'>-	err = mmc_select_card(host-&gt;card);</div><div class='add'>+	err = _mmc_detect_card_removed(host);</div><div class='ctx'> </div><div class='ctx'> 	mmc_release_host(host);</div><div class='ctx'> </div><div class='hunk'>@@ -749,6 +1029,7 @@ static const struct mmc_bus_ops mmc_sdio_ops = {</div><div class='ctx'> 	.suspend = mmc_sdio_suspend,</div><div class='ctx'> 	.resume = mmc_sdio_resume,</div><div class='ctx'> 	.power_restore = mmc_sdio_power_restore,</div><div class='add'>+	.alive = mmc_sdio_alive,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -797,8 +1078,17 @@ int mmc_attach_sdio(struct mmc_host *host)</div><div class='ctx'> 	 * Detect and init the card.</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = mmc_sdio_init_card(host, host-&gt;ocr, NULL, 0);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err;</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == -EAGAIN) {</div><div class='add'>+			/*</div><div class='add'>+			 * Retry initialization with S18R set to 0.</div><div class='add'>+			 */</div><div class='add'>+			host-&gt;ocr &amp;= ~R4_18V_PRESENT;</div><div class='add'>+			err = mmc_sdio_init_card(host, host-&gt;ocr, NULL, 0);</div><div class='add'>+		}</div><div class='add'>+		if (err)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='ctx'> 	card = host-&gt;card;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/mmc/core/sdio_io.c b/drivers/mmc/core/sdio_io.c<br/>index b1f3168f791b..8f6f5ac131fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/core/sdio_io.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/sdio_io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/core/sdio_io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/core/sdio_io.c</a></div><div class='hunk'>@@ -196,6 +196,9 @@ static inline unsigned int sdio_max_byte_size(struct sdio_func *func)</div><div class='ctx'> 	else</div><div class='ctx'> 		mval = min(mval, func-&gt;max_blksize);</div><div class='ctx'> </div><div class='add'>+	if (mmc_card_broken_byte_mode_512(func-&gt;card))</div><div class='add'>+		return min(mval, 511u);</div><div class='add'>+</div><div class='ctx'> 	return min(mval, 512u); /* maximum size for byte mode */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -314,7 +317,7 @@ static int sdio_io_rw_ext_helper(struct sdio_func *func, int write,</div><div class='ctx'> 			func-&gt;card-&gt;host-&gt;max_seg_size / func-&gt;cur_blksize);</div><div class='ctx'> 		max_blocks = min(max_blocks, 511u);</div><div class='ctx'> </div><div class='del'>-		while (remainder &gt; func-&gt;cur_blksize) {</div><div class='add'>+		while (remainder &gt;= func-&gt;cur_blksize) {</div><div class='ctx'> 			unsigned blocks;</div><div class='ctx'> </div><div class='ctx'> 			blocks = remainder / func-&gt;cur_blksize;</div><div class='hunk'>@@ -339,8 +342,9 @@ static int sdio_io_rw_ext_helper(struct sdio_func *func, int write,</div><div class='ctx'> 	while (remainder &gt; 0) {</div><div class='ctx'> 		size = min(remainder, sdio_max_byte_size(func));</div><div class='ctx'> </div><div class='add'>+		/* Indicate byte mode by setting "blocks" = 0 */</div><div class='ctx'> 		ret = mmc_io_rw_extended(func-&gt;card, write, func-&gt;num, addr,</div><div class='del'>-			 incr_addr, buf, 1, size);</div><div class='add'>+			 incr_addr, buf, 0, size);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/core/sdio_ops.c b/drivers/mmc/core/sdio_ops.c<br/>index b0517cc06200..d29e20630eed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/core/sdio_ops.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/core/sdio_ops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/core/sdio_ops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/core/sdio_ops.c</a></div><div class='hunk'>@@ -128,8 +128,6 @@ int mmc_io_rw_extended(struct mmc_card *card, int write, unsigned fn,</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!card);</div><div class='ctx'> 	BUG_ON(fn &gt; 7);</div><div class='del'>-	BUG_ON(blocks == 1 &amp;&amp; blksz &gt; 512);</div><div class='del'>-	WARN_ON(blocks == 0);</div><div class='ctx'> 	WARN_ON(blksz == 0);</div><div class='ctx'> </div><div class='ctx'> 	/* sanity check */</div><div class='hunk'>@@ -144,22 +142,20 @@ int mmc_io_rw_extended(struct mmc_card *card, int write, unsigned fn,</div><div class='ctx'> 	cmd.arg |= fn &lt;&lt; 28;</div><div class='ctx'> 	cmd.arg |= incr_addr ? 0x04000000 : 0x00000000;</div><div class='ctx'> 	cmd.arg |= addr &lt;&lt; 9;</div><div class='del'>-	if (blocks == 1 &amp;&amp; blksz &lt; 512)</div><div class='del'>-		cmd.arg |= blksz;			/* byte mode */</div><div class='del'>-	else if (blocks == 1 &amp;&amp; blksz == 512 &amp;&amp;</div><div class='del'>-		 !(mmc_card_broken_byte_mode_512(card)))</div><div class='del'>-		cmd.arg |= 0;				/* byte mode, 0==512 */</div><div class='add'>+	if (blocks == 0)</div><div class='add'>+		cmd.arg |= (blksz == 512) ? 0 : blksz;	/* byte mode */</div><div class='ctx'> 	else</div><div class='ctx'> 		cmd.arg |= 0x08000000 | blocks;		/* block mode */</div><div class='ctx'> 	cmd.flags = MMC_RSP_SPI_R5 | MMC_RSP_R5 | MMC_CMD_ADTC;</div><div class='ctx'> </div><div class='ctx'> 	data.blksz = blksz;</div><div class='del'>-	data.blocks = blocks;</div><div class='add'>+	/* Code in host drivers/fwk assumes that "blocks" always is &gt;=1 */</div><div class='add'>+	data.blocks = blocks ? blocks : 1;</div><div class='ctx'> 	data.flags = write ? MMC_DATA_WRITE : MMC_DATA_READ;</div><div class='ctx'> 	data.sg = &amp;sg;</div><div class='ctx'> 	data.sg_len = 1;</div><div class='ctx'> </div><div class='del'>-	sg_init_one(&amp;sg, buf, blksz * blocks);</div><div class='add'>+	sg_init_one(&amp;sg, buf, data.blksz * data.blocks);</div><div class='ctx'> </div><div class='ctx'> 	mmc_set_data_timeout(&amp;data, card);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile<br/>index b4b83f302e32..745f8fce2519 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/Makefile</a></div><div class='hunk'>@@ -9,6 +9,7 @@ obj-$(CONFIG_MMC_MXC)		+= mxcmmc.o</div><div class='ctx'> obj-$(CONFIG_MMC_MXS)		+= mxs-mmc.o</div><div class='ctx'> obj-$(CONFIG_MMC_SDHCI)		+= sdhci.o</div><div class='ctx'> obj-$(CONFIG_MMC_SDHCI_PCI)	+= sdhci-pci.o</div><div class='add'>+obj-$(subst m,y,$(CONFIG_MMC_SDHCI_PCI))	+= sdhci-pci-data.o</div><div class='ctx'> obj-$(CONFIG_MMC_SDHCI_PXAV3)	+= sdhci-pxav3.o</div><div class='ctx'> obj-$(CONFIG_MMC_SDHCI_PXAV2)	+= sdhci-pxav2.o</div><div class='ctx'> obj-$(CONFIG_MMC_SDHCI_S3C)	+= sdhci-s3c.o</div><div class='head'>diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c<br/>index a8b4d2aa18e5..947faa5d2ce4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/at91_mci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/at91_mci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/at91_mci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/at91_mci.c</a></div><div class='hunk'>@@ -236,7 +236,7 @@ static inline void at91_mci_sg_to_dma(struct at91mci_host *host, struct mmc_data</div><div class='ctx'> </div><div class='ctx'> 		sg = &amp;data-&gt;sg[i];</div><div class='ctx'> </div><div class='del'>-		sgbuffer = kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg-&gt;offset;</div><div class='add'>+		sgbuffer = kmap_atomic(sg_page(sg)) + sg-&gt;offset;</div><div class='ctx'> 		amount = min(size, sg-&gt;length);</div><div class='ctx'> 		size -= amount;</div><div class='ctx'> </div><div class='hunk'>@@ -252,7 +252,7 @@ static inline void at91_mci_sg_to_dma(struct at91mci_host *host, struct mmc_data</div><div class='ctx'> 			dmabuf = (unsigned *)tmpv;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		kunmap_atomic(sgbuffer, KM_BIO_SRC_IRQ);</div><div class='add'>+		kunmap_atomic(sgbuffer);</div><div class='ctx'> </div><div class='ctx'> 		if (size == 0)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -302,7 +302,7 @@ static void at91_mci_post_dma_read(struct at91mci_host *host)</div><div class='ctx'> </div><div class='ctx'> 		sg = &amp;data-&gt;sg[i];</div><div class='ctx'> </div><div class='del'>-		sgbuffer = kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg-&gt;offset;</div><div class='add'>+		sgbuffer = kmap_atomic(sg_page(sg)) + sg-&gt;offset;</div><div class='ctx'> 		amount = min(size, sg-&gt;length);</div><div class='ctx'> 		size -= amount;</div><div class='ctx'> </div><div class='hunk'>@@ -318,7 +318,7 @@ static void at91_mci_post_dma_read(struct at91mci_host *host)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		flush_kernel_dcache_page(sg_page(sg));</div><div class='del'>-		kunmap_atomic(sgbuffer, KM_BIO_SRC_IRQ);</div><div class='add'>+		kunmap_atomic(sgbuffer);</div><div class='ctx'> 		data-&gt;bytes_xfered += amount;</div><div class='ctx'> 		if (size == 0)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -741,7 +741,7 @@ static void at91_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='ctx'> 	at91_mci_write(host, AT91_MCI_MR, (at91_mci_read(host, AT91_MCI_MR) &amp; ~AT91_MCI_CLKDIV) | clkdiv);</div><div class='ctx'> </div><div class='ctx'> 	/* maybe switch power to the card */</div><div class='del'>-	if (host-&gt;board-&gt;vcc_pin) {</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;vcc_pin)) {</div><div class='ctx'> 		switch (ios-&gt;power_mode) {</div><div class='ctx'> 			case MMC_POWER_OFF:</div><div class='ctx'> 				gpio_set_value(host-&gt;board-&gt;vcc_pin, 0);</div><div class='hunk'>@@ -897,7 +897,7 @@ static int at91_mci_get_ro(struct mmc_host *mmc)</div><div class='ctx'> {</div><div class='ctx'> 	struct at91mci_host *host = mmc_priv(mmc);</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;board-&gt;wp_pin)</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;wp_pin))</div><div class='ctx'> 		return !!gpio_get_value(host-&gt;board-&gt;wp_pin);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Board doesn't support read only detection; let the mmc core</div><div class='hunk'>@@ -991,21 +991,21 @@ static int __init at91_mci_probe(struct platform_device *pdev)</div><div class='ctx'> 	 * Reserve GPIOs ... board init code makes sure these pins are set</div><div class='ctx'> 	 * up as GPIOs with the right direction (input, except for vcc)</div><div class='ctx'> 	 */</div><div class='del'>-	if (host-&gt;board-&gt;det_pin) {</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;det_pin)) {</div><div class='ctx'> 		ret = gpio_request(host-&gt;board-&gt;det_pin, "mmc_detect");</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			dev_dbg(&amp;pdev-&gt;dev, "couldn't claim card detect pin\n");</div><div class='ctx'> 			goto fail4b;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (host-&gt;board-&gt;wp_pin) {</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;wp_pin)) {</div><div class='ctx'> 		ret = gpio_request(host-&gt;board-&gt;wp_pin, "mmc_wp");</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			dev_dbg(&amp;pdev-&gt;dev, "couldn't claim wp sense pin\n");</div><div class='ctx'> 			goto fail4;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (host-&gt;board-&gt;vcc_pin) {</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;vcc_pin)) {</div><div class='ctx'> 		ret = gpio_request(host-&gt;board-&gt;vcc_pin, "mmc_vcc");</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			dev_dbg(&amp;pdev-&gt;dev, "couldn't claim vcc switch pin\n");</div><div class='hunk'>@@ -1057,7 +1057,7 @@ static int __init at91_mci_probe(struct platform_device *pdev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Add host to MMC layer</div><div class='ctx'> 	 */</div><div class='del'>-	if (host-&gt;board-&gt;det_pin) {</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;det_pin)) {</div><div class='ctx'> 		host-&gt;present = !gpio_get_value(host-&gt;board-&gt;det_pin);</div><div class='ctx'> 	}</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1068,7 +1068,7 @@ static int __init at91_mci_probe(struct platform_device *pdev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * monitor card insertion/removal if we can</div><div class='ctx'> 	 */</div><div class='del'>-	if (host-&gt;board-&gt;det_pin) {</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;det_pin)) {</div><div class='ctx'> 		ret = request_irq(gpio_to_irq(host-&gt;board-&gt;det_pin),</div><div class='ctx'> 				at91_mmc_det_irq, 0, mmc_hostname(mmc), host);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -1087,13 +1087,13 @@ fail0:</div><div class='ctx'> fail1:</div><div class='ctx'> 	clk_put(host-&gt;mci_clk);</div><div class='ctx'> fail2:</div><div class='del'>-	if (host-&gt;board-&gt;vcc_pin)</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;vcc_pin))</div><div class='ctx'> 		gpio_free(host-&gt;board-&gt;vcc_pin);</div><div class='ctx'> fail3:</div><div class='del'>-	if (host-&gt;board-&gt;wp_pin)</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;wp_pin))</div><div class='ctx'> 		gpio_free(host-&gt;board-&gt;wp_pin);</div><div class='ctx'> fail4:</div><div class='del'>-	if (host-&gt;board-&gt;det_pin)</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;det_pin))</div><div class='ctx'> 		gpio_free(host-&gt;board-&gt;det_pin);</div><div class='ctx'> fail4b:</div><div class='ctx'> 	if (host-&gt;buffer)</div><div class='hunk'>@@ -1125,7 +1125,7 @@ static int __exit at91_mci_remove(struct platform_device *pdev)</div><div class='ctx'> 		dma_free_coherent(&amp;pdev-&gt;dev, MCI_BUFSIZE,</div><div class='ctx'> 				host-&gt;buffer, host-&gt;physical_address);</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;board-&gt;det_pin) {</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;det_pin)) {</div><div class='ctx'> 		if (device_can_wakeup(&amp;pdev-&gt;dev))</div><div class='ctx'> 			free_irq(gpio_to_irq(host-&gt;board-&gt;det_pin), host);</div><div class='ctx'> 		device_init_wakeup(&amp;pdev-&gt;dev, 0);</div><div class='hunk'>@@ -1140,9 +1140,9 @@ static int __exit at91_mci_remove(struct platform_device *pdev)</div><div class='ctx'> 	clk_disable(host-&gt;mci_clk);			/* Disable the peripheral clock */</div><div class='ctx'> 	clk_put(host-&gt;mci_clk);</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;board-&gt;vcc_pin)</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;vcc_pin))</div><div class='ctx'> 		gpio_free(host-&gt;board-&gt;vcc_pin);</div><div class='del'>-	if (host-&gt;board-&gt;wp_pin)</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;wp_pin))</div><div class='ctx'> 		gpio_free(host-&gt;board-&gt;wp_pin);</div><div class='ctx'> </div><div class='ctx'> 	iounmap(host-&gt;baseaddr);</div><div class='hunk'>@@ -1163,7 +1163,7 @@ static int at91_mci_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='ctx'> 	struct at91mci_host *host = mmc_priv(mmc);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;board-&gt;det_pin &amp;&amp; device_may_wakeup(&amp;pdev-&gt;dev))</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;det_pin) &amp;&amp; device_may_wakeup(&amp;pdev-&gt;dev))</div><div class='ctx'> 		enable_irq_wake(host-&gt;board-&gt;det_pin);</div><div class='ctx'> </div><div class='ctx'> 	if (mmc)</div><div class='hunk'>@@ -1178,7 +1178,7 @@ static int at91_mci_resume(struct platform_device *pdev)</div><div class='ctx'> 	struct at91mci_host *host = mmc_priv(mmc);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;board-&gt;det_pin &amp;&amp; device_may_wakeup(&amp;pdev-&gt;dev))</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;det_pin) &amp;&amp; device_may_wakeup(&amp;pdev-&gt;dev))</div><div class='ctx'> 		disable_irq_wake(host-&gt;board-&gt;det_pin);</div><div class='ctx'> </div><div class='ctx'> 	if (mmc)</div><div class='head'>diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c<br/>index a7ee50271465..fcfe1eb5acc8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/atmel-mci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/atmel-mci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/atmel-mci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/atmel-mci.c</a></div><div class='hunk'>@@ -823,6 +823,7 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data)</div><div class='ctx'> 	struct scatterlist		*sg;</div><div class='ctx'> 	unsigned int			i;</div><div class='ctx'> 	enum dma_data_direction		direction;</div><div class='add'>+	enum dma_transfer_direction	slave_dirn;</div><div class='ctx'> 	unsigned int			sglen;</div><div class='ctx'> 	u32 iflags;</div><div class='ctx'> </div><div class='hunk'>@@ -860,16 +861,19 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data)</div><div class='ctx'> 	if (host-&gt;caps.has_dma)</div><div class='ctx'> 		atmci_writel(host, ATMCI_DMA, ATMCI_DMA_CHKSIZE(3) | ATMCI_DMAEN);</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;flags &amp; MMC_DATA_READ)</div><div class='add'>+	if (data-&gt;flags &amp; MMC_DATA_READ) {</div><div class='ctx'> 		direction = DMA_FROM_DEVICE;</div><div class='del'>-	else</div><div class='add'>+		slave_dirn = DMA_DEV_TO_MEM;</div><div class='add'>+	} else {</div><div class='ctx'> 		direction = DMA_TO_DEVICE;</div><div class='add'>+		slave_dirn = DMA_MEM_TO_DEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	sglen = dma_map_sg(chan-&gt;device-&gt;dev, data-&gt;sg,</div><div class='ctx'> 			data-&gt;sg_len, direction);</div><div class='ctx'> </div><div class='ctx'> 	desc = chan-&gt;device-&gt;device_prep_slave_sg(chan,</div><div class='del'>-			data-&gt;sg, sglen, direction,</div><div class='add'>+			data-&gt;sg, sglen, slave_dirn,</div><div class='ctx'> 			DMA_PREP_INTERRUPT | DMA_CTRL_ACK);</div><div class='ctx'> 	if (!desc)</div><div class='ctx'> 		goto unmap_exit;</div><div class='head'>diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c<br/>index 5d3b9ae64523..dbd0c8a4e98a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/au1xmmc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/au1xmmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/au1xmmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/au1xmmc.c</a></div><div class='hunk'>@@ -153,6 +153,7 @@ static inline int has_dbdma(void)</div><div class='ctx'> {</div><div class='ctx'> 	switch (alchemy_get_cputype()) {</div><div class='ctx'> 	case ALCHEMY_CPU_AU1200:</div><div class='add'>+	case ALCHEMY_CPU_AU1300:</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -768,11 +769,15 @@ static void au1xmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='ctx'> </div><div class='ctx'> 	config2 = au_readl(HOST_CONFIG2(host));</div><div class='ctx'> 	switch (ios-&gt;bus_width) {</div><div class='add'>+	case MMC_BUS_WIDTH_8:</div><div class='add'>+		config2 |= SD_CONFIG2_BB;</div><div class='add'>+		break;</div><div class='ctx'> 	case MMC_BUS_WIDTH_4:</div><div class='add'>+		config2 &amp;= ~SD_CONFIG2_BB;</div><div class='ctx'> 		config2 |= SD_CONFIG2_WB;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MMC_BUS_WIDTH_1:</div><div class='del'>-		config2 &amp;= ~SD_CONFIG2_WB;</div><div class='add'>+		config2 &amp;= ~(SD_CONFIG2_WB | SD_CONFIG2_BB);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	au_writel(config2, HOST_CONFIG2(host));</div><div class='hunk'>@@ -943,7 +948,7 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct mmc_host *mmc;</div><div class='ctx'> 	struct au1xmmc_host *host;</div><div class='ctx'> 	struct resource *r;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, iflag;</div><div class='ctx'> </div><div class='ctx'> 	mmc = mmc_alloc_host(sizeof(struct au1xmmc_host), &amp;pdev-&gt;dev);</div><div class='ctx'> 	if (!mmc) {</div><div class='hunk'>@@ -982,37 +987,43 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev)</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "no IRQ defined\n");</div><div class='ctx'> 		goto out3;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	host-&gt;irq = r-&gt;start;</div><div class='del'>-	/* IRQ is shared among both SD controllers */</div><div class='del'>-	ret = request_irq(host-&gt;irq, au1xmmc_irq, IRQF_SHARED,</div><div class='del'>-			  DRIVER_NAME, host);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "cannot grab IRQ\n");</div><div class='del'>-		goto out3;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	mmc-&gt;ops = &amp;au1xmmc_ops;</div><div class='ctx'> </div><div class='ctx'> 	mmc-&gt;f_min =   450000;</div><div class='ctx'> 	mmc-&gt;f_max = 24000000;</div><div class='ctx'> </div><div class='add'>+	mmc-&gt;max_blk_size = 2048;</div><div class='add'>+	mmc-&gt;max_blk_count = 512;</div><div class='add'>+</div><div class='add'>+	mmc-&gt;ocr_avail = AU1XMMC_OCR;</div><div class='add'>+	mmc-&gt;caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;</div><div class='add'>+	mmc-&gt;max_segs = AU1XMMC_DESCRIPTOR_COUNT;</div><div class='add'>+</div><div class='add'>+	iflag = IRQF_SHARED;	/* Au1100/Au1200: one int for both ctrls */</div><div class='add'>+</div><div class='ctx'> 	switch (alchemy_get_cputype()) {</div><div class='ctx'> 	case ALCHEMY_CPU_AU1100:</div><div class='ctx'> 		mmc-&gt;max_seg_size = AU1100_MMC_DESCRIPTOR_SIZE;</div><div class='del'>-		mmc-&gt;max_segs = AU1XMMC_DESCRIPTOR_COUNT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ALCHEMY_CPU_AU1200:</div><div class='ctx'> 		mmc-&gt;max_seg_size = AU1200_MMC_DESCRIPTOR_SIZE;</div><div class='del'>-		mmc-&gt;max_segs = AU1XMMC_DESCRIPTOR_COUNT;</div><div class='add'>+		break;</div><div class='add'>+	case ALCHEMY_CPU_AU1300:</div><div class='add'>+		iflag = 0;	/* nothing is shared */</div><div class='add'>+		mmc-&gt;max_seg_size = AU1200_MMC_DESCRIPTOR_SIZE;</div><div class='add'>+		mmc-&gt;f_max = 52000000;</div><div class='add'>+		if (host-&gt;ioarea-&gt;start == AU1100_SD0_PHYS_ADDR)</div><div class='add'>+			mmc-&gt;caps |= MMC_CAP_8_BIT_DATA;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mmc-&gt;max_blk_size = 2048;</div><div class='del'>-	mmc-&gt;max_blk_count = 512;</div><div class='del'>-</div><div class='del'>-	mmc-&gt;ocr_avail = AU1XMMC_OCR;</div><div class='del'>-	mmc-&gt;caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;</div><div class='add'>+	ret = request_irq(host-&gt;irq, au1xmmc_irq, iflag, DRIVER_NAME, host);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot grab IRQ\n");</div><div class='add'>+		goto out3;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;status = HOST_S_IDLE;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c<br/>index 0371bf502249..03666174ca48 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/bfin_sdh.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/bfin_sdh.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/bfin_sdh.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/bfin_sdh.c</a></div><div class='hunk'>@@ -627,17 +627,7 @@ static struct platform_driver sdh_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sdh_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sdh_driver);</div><div class='del'>-}</div><div class='del'>-module_init(sdh_init);</div><div class='del'>-</div><div class='del'>-static void __exit sdh_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sdh_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(sdh_exit);</div><div class='add'>+module_platform_driver(sdh_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Blackfin Secure Digital Host Driver");</div><div class='ctx'> MODULE_AUTHOR("Cliff Cai, Roy Huang");</div><div class='head'>diff --git a/drivers/mmc/host/cb710-mmc.c b/drivers/mmc/host/cb710-mmc.c<br/>index ce2a47b71dd6..83693fd7c6b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/cb710-mmc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/cb710-mmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/cb710-mmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/cb710-mmc.c</a></div><div class='hunk'>@@ -780,18 +780,7 @@ static struct platform_driver cb710_mmc_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init cb710_mmc_init_module(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;cb710_mmc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cb710_mmc_cleanup_module(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;cb710_mmc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(cb710_mmc_init_module);</div><div class='del'>-module_exit(cb710_mmc_cleanup_module);</div><div class='add'>+module_platform_driver(cb710_mmc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("MichaÅ‚ MirosÅ‚aw &lt;mirq-linux@rere.qmqm.pl&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("ENE CB710 memory card reader driver - MMC/SD part");</div><div class='head'>diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c<br/>index 3aaeb0841914..0e342793ff14 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/dw_mmc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/dw_mmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/dw_mmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/dw_mmc.c</a></div><div class='hunk'>@@ -588,11 +588,11 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot)</div><div class='ctx'> 	mci_writel(host, CTYPE, (slot-&gt;ctype &lt;&lt; slot-&gt;id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dw_mci_start_request(struct dw_mci *host,</div><div class='del'>-				 struct dw_mci_slot *slot)</div><div class='add'>+static void __dw_mci_start_request(struct dw_mci *host,</div><div class='add'>+				   struct dw_mci_slot *slot,</div><div class='add'>+				   struct mmc_command *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct mmc_request *mrq;</div><div class='del'>-	struct mmc_command *cmd;</div><div class='ctx'> 	struct mmc_data	*data;</div><div class='ctx'> 	u32 cmdflags;</div><div class='ctx'> </div><div class='hunk'>@@ -610,14 +610,13 @@ static void dw_mci_start_request(struct dw_mci *host,</div><div class='ctx'> 	host-&gt;completed_events = 0;</div><div class='ctx'> 	host-&gt;data_status = 0;</div><div class='ctx'> </div><div class='del'>-	data = mrq-&gt;data;</div><div class='add'>+	data = cmd-&gt;data;</div><div class='ctx'> 	if (data) {</div><div class='ctx'> 		dw_mci_set_timeout(host);</div><div class='ctx'> 		mci_writel(host, BYTCNT, data-&gt;blksz*data-&gt;blocks);</div><div class='ctx'> 		mci_writel(host, BLKSIZ, data-&gt;blksz);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd = mrq-&gt;cmd;</div><div class='ctx'> 	cmdflags = dw_mci_prepare_command(slot-&gt;mmc, cmd);</div><div class='ctx'> </div><div class='ctx'> 	/* this is the first command, send the initialization clock */</div><div class='hunk'>@@ -635,6 +634,16 @@ static void dw_mci_start_request(struct dw_mci *host,</div><div class='ctx'> 		host-&gt;stop_cmdr = dw_mci_prepare_command(slot-&gt;mmc, mrq-&gt;stop);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void dw_mci_start_request(struct dw_mci *host,</div><div class='add'>+				 struct dw_mci_slot *slot)</div><div class='add'>+{</div><div class='add'>+	struct mmc_request *mrq = slot-&gt;mrq;</div><div class='add'>+	struct mmc_command *cmd;</div><div class='add'>+</div><div class='add'>+	cmd = mrq-&gt;sbc ? mrq-&gt;sbc : mrq-&gt;cmd;</div><div class='add'>+	__dw_mci_start_request(host, slot, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* must be called with host-&gt;lock held */</div><div class='ctx'> static void dw_mci_queue_request(struct dw_mci *host, struct dw_mci_slot *slot,</div><div class='ctx'> 				 struct mmc_request *mrq)</div><div class='hunk'>@@ -698,12 +707,15 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	regs = mci_readl(slot-&gt;host, UHS_REG);</div><div class='add'>+</div><div class='ctx'> 	/* DDR mode set */</div><div class='del'>-	if (ios-&gt;timing == MMC_TIMING_UHS_DDR50) {</div><div class='del'>-		regs = mci_readl(slot-&gt;host, UHS_REG);</div><div class='add'>+	if (ios-&gt;timing == MMC_TIMING_UHS_DDR50)</div><div class='ctx'> 		regs |= (0x1 &lt;&lt; slot-&gt;id) &lt;&lt; 16;</div><div class='del'>-		mci_writel(slot-&gt;host, UHS_REG, regs);</div><div class='del'>-	}</div><div class='add'>+	else</div><div class='add'>+		regs &amp;= ~(0x1 &lt;&lt; slot-&gt;id) &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	mci_writel(slot-&gt;host, UHS_REG, regs);</div><div class='ctx'> </div><div class='ctx'> 	if (ios-&gt;clock) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -889,7 +901,14 @@ static void dw_mci_tasklet_func(unsigned long priv)</div><div class='ctx'> 			cmd = host-&gt;cmd;</div><div class='ctx'> 			host-&gt;cmd = NULL;</div><div class='ctx'> 			set_bit(EVENT_CMD_COMPLETE, &amp;host-&gt;completed_events);</div><div class='del'>-			dw_mci_command_complete(host, host-&gt;mrq-&gt;cmd);</div><div class='add'>+			dw_mci_command_complete(host, cmd);</div><div class='add'>+			if (cmd == host-&gt;mrq-&gt;sbc &amp;&amp; !cmd-&gt;error) {</div><div class='add'>+				prev_state = state = STATE_SENDING_CMD;</div><div class='add'>+				__dw_mci_start_request(host, host-&gt;cur_slot,</div><div class='add'>+						       host-&gt;mrq-&gt;cmd);</div><div class='add'>+				goto unlock;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			if (!host-&gt;mrq-&gt;data || cmd-&gt;error) {</div><div class='ctx'> 				dw_mci_request_end(host, host-&gt;mrq);</div><div class='ctx'> 				goto unlock;</div><div class='hunk'>@@ -967,6 +986,12 @@ static void dw_mci_tasklet_func(unsigned long priv)</div><div class='ctx'> 				goto unlock;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='add'>+			if (host-&gt;mrq-&gt;sbc &amp;&amp; !data-&gt;error) {</div><div class='add'>+				data-&gt;stop-&gt;error = 0;</div><div class='add'>+				dw_mci_request_end(host, host-&gt;mrq);</div><div class='add'>+				goto unlock;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			prev_state = state = STATE_SENDING_STOP;</div><div class='ctx'> 			if (!data-&gt;error)</div><div class='ctx'> 				send_stop_cmd(host, data);</div><div class='hunk'>@@ -1678,8 +1703,9 @@ static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id)</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;pdata-&gt;caps)</div><div class='ctx'> 		mmc-&gt;caps = host-&gt;pdata-&gt;caps;</div><div class='del'>-	else</div><div class='del'>-		mmc-&gt;caps = 0;</div><div class='add'>+</div><div class='add'>+	if (host-&gt;pdata-&gt;caps2)</div><div class='add'>+		mmc-&gt;caps2 = host-&gt;pdata-&gt;caps2;</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;pdata-&gt;get_bus_wd)</div><div class='ctx'> 		if (host-&gt;pdata-&gt;get_bus_wd(slot-&gt;id) &gt;= 4)</div><div class='hunk'>@@ -1923,7 +1949,7 @@ static int dw_mci_probe(struct platform_device *pdev)</div><div class='ctx'> 		 * should put it in the platform data.</div><div class='ctx'> 		 */</div><div class='ctx'> 		fifo_size = mci_readl(host, FIFOTH);</div><div class='del'>-		fifo_size = 1 + ((fifo_size &gt;&gt; 16) &amp; 0x7ff);</div><div class='add'>+		fifo_size = 1 + ((fifo_size &gt;&gt; 16) &amp; 0xfff);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		fifo_size = host-&gt;pdata-&gt;fifo_depth;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2062,14 +2088,14 @@ static int __exit dw_mci_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> /*</div><div class='ctx'>  * TODO: we should probably disable the clock to the card in the suspend path.</div><div class='ctx'>  */</div><div class='del'>-static int dw_mci_suspend(struct platform_device *pdev, pm_message_t mesg)</div><div class='add'>+static int dw_mci_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret;</div><div class='del'>-	struct dw_mci *host = platform_get_drvdata(pdev);</div><div class='add'>+	struct dw_mci *host = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; host-&gt;num_slots; i++) {</div><div class='ctx'> 		struct dw_mci_slot *slot = host-&gt;slot[i];</div><div class='hunk'>@@ -2092,10 +2118,10 @@ static int dw_mci_suspend(struct platform_device *pdev, pm_message_t mesg)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dw_mci_resume(struct platform_device *pdev)</div><div class='add'>+static int dw_mci_resume(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret;</div><div class='del'>-	struct dw_mci *host = platform_get_drvdata(pdev);</div><div class='add'>+	struct dw_mci *host = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;vmmc)</div><div class='ctx'> 		regulator_enable(host-&gt;vmmc);</div><div class='hunk'>@@ -2103,7 +2129,7 @@ static int dw_mci_resume(struct platform_device *pdev)</div><div class='ctx'> 	if (host-&gt;dma_ops-&gt;init)</div><div class='ctx'> 		host-&gt;dma_ops-&gt;init(host);</div><div class='ctx'> </div><div class='del'>-	if (!mci_wait_reset(&amp;pdev-&gt;dev, host)) {</div><div class='add'>+	if (!mci_wait_reset(dev, host)) {</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2131,14 +2157,15 @@ static int dw_mci_resume(struct platform_device *pdev)</div><div class='ctx'> #else</div><div class='ctx'> #define dw_mci_suspend	NULL</div><div class='ctx'> #define dw_mci_resume	NULL</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(dw_mci_pmops, dw_mci_suspend, dw_mci_resume);</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver dw_mci_driver = {</div><div class='ctx'> 	.remove		= __exit_p(dw_mci_remove),</div><div class='del'>-	.suspend	= dw_mci_suspend,</div><div class='del'>-	.resume		= dw_mci_resume,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name		= "dw_mmc",</div><div class='add'>+		.pm		= &amp;dw_mci_pmops,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h<br/>index 72c071f6e001..df392a1143f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/dw_mmc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/dw_mmc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/dw_mmc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/dw_mmc.h</a></div><div class='hunk'>@@ -126,7 +126,7 @@</div><div class='ctx'> #define SDMMC_CMD_RESP_EXP		BIT(6)</div><div class='ctx'> #define SDMMC_CMD_INDX(n)		((n) &amp; 0x1F)</div><div class='ctx'> /* Status register defines */</div><div class='del'>-#define SDMMC_GET_FCNT(x)		(((x)&gt;&gt;17) &amp; 0x1FF)</div><div class='add'>+#define SDMMC_GET_FCNT(x)		(((x)&gt;&gt;17) &amp; 0x1FFF)</div><div class='ctx'> /* Internal DMAC interrupt defines */</div><div class='ctx'> #define SDMMC_IDMAC_INT_AI		BIT(9)</div><div class='ctx'> #define SDMMC_IDMAC_INT_NI		BIT(8)</div><div class='head'>diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c<br/>index 74218ad677e4..c8852a8128a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/jz4740_mmc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/jz4740_mmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/jz4740_mmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/jz4740_mmc.c</a></div><div class='hunk'>@@ -1012,17 +1012,7 @@ static struct platform_driver jz4740_mmc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init jz4740_mmc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;jz4740_mmc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(jz4740_mmc_init);</div><div class='del'>-</div><div class='del'>-static void __exit jz4740_mmc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;jz4740_mmc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(jz4740_mmc_exit);</div><div class='add'>+module_platform_driver(jz4740_mmc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("JZ4740 SD/MMC controller driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c<br/>index 92946b84e9fa..273306c68d58 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/mmc_spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/mmc_spi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/mmc_spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/mmc_spi.c</a></div><div class='hunk'>@@ -1525,7 +1525,6 @@ static struct of_device_id mmc_spi_of_match_table[] __devinitdata = {</div><div class='ctx'> static struct spi_driver mmc_spi_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name =		"mmc_spi",</div><div class='del'>-		.bus =		&amp;spi_bus_type,</div><div class='ctx'> 		.owner =	THIS_MODULE,</div><div class='ctx'> 		.of_match_table = mmc_spi_of_match_table,</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c<br/>index 0726e59fd418..0d955ffaf44e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/mmci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/mmci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/mmci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/mmci.c</a></div><div class='hunk'>@@ -374,6 +374,7 @@ static int mmci_dma_prep_data(struct mmci_host *host, struct mmc_data *data,</div><div class='ctx'> 	struct dma_chan *chan;</div><div class='ctx'> 	struct dma_device *device;</div><div class='ctx'> 	struct dma_async_tx_descriptor *desc;</div><div class='add'>+	enum dma_data_direction buffer_dirn;</div><div class='ctx'> 	int nr_sg;</div><div class='ctx'> </div><div class='ctx'> 	/* Check if next job is already prepared */</div><div class='hunk'>@@ -387,10 +388,12 @@ static int mmci_dma_prep_data(struct mmci_host *host, struct mmc_data *data,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;flags &amp; MMC_DATA_READ) {</div><div class='del'>-		conf.direction = DMA_FROM_DEVICE;</div><div class='add'>+		conf.direction = DMA_DEV_TO_MEM;</div><div class='add'>+		buffer_dirn = DMA_FROM_DEVICE;</div><div class='ctx'> 		chan = host-&gt;dma_rx_channel;</div><div class='ctx'> 	} else {</div><div class='del'>-		conf.direction = DMA_TO_DEVICE;</div><div class='add'>+		conf.direction = DMA_MEM_TO_DEV;</div><div class='add'>+		buffer_dirn = DMA_TO_DEVICE;</div><div class='ctx'> 		chan = host-&gt;dma_tx_channel;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -403,7 +406,7 @@ static int mmci_dma_prep_data(struct mmci_host *host, struct mmc_data *data,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	device = chan-&gt;device;</div><div class='del'>-	nr_sg = dma_map_sg(device-&gt;dev, data-&gt;sg, data-&gt;sg_len, conf.direction);</div><div class='add'>+	nr_sg = dma_map_sg(device-&gt;dev, data-&gt;sg, data-&gt;sg_len, buffer_dirn);</div><div class='ctx'> 	if (nr_sg == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -426,7 +429,7 @@ static int mmci_dma_prep_data(struct mmci_host *host, struct mmc_data *data,</div><div class='ctx'>  unmap_exit:</div><div class='ctx'> 	if (!next)</div><div class='ctx'> 		dmaengine_terminate_all(chan);</div><div class='del'>-	dma_unmap_sg(device-&gt;dev, data-&gt;sg, data-&gt;sg_len, conf.direction);</div><div class='add'>+	dma_unmap_sg(device-&gt;dev, data-&gt;sg, data-&gt;sg_len, buffer_dirn);</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1245,6 +1248,7 @@ static int __devinit mmci_probe(struct amba_device *dev,</div><div class='ctx'> 	if (host-&gt;vcc == NULL)</div><div class='ctx'> 		mmc-&gt;ocr_avail = plat-&gt;ocr_mask;</div><div class='ctx'> 	mmc-&gt;caps = plat-&gt;capabilities;</div><div class='add'>+	mmc-&gt;caps2 = plat-&gt;capabilities2;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We can do SGIO</div><div class='hunk'>@@ -1502,6 +1506,8 @@ static struct amba_id mmci_ids[] = {</div><div class='ctx'> 	{ 0, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+MODULE_DEVICE_TABLE(amba, mmci_ids);</div><div class='add'>+</div><div class='ctx'> static struct amba_driver mmci_driver = {</div><div class='ctx'> 	.drv		= {</div><div class='ctx'> 		.name	= DRIVER_NAME,</div><div class='head'>diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c<br/>index 80d8eb143b48..1d14cda95e56 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/msm_sdcc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/msm_sdcc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/msm_sdcc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/msm_sdcc.c</a></div><div class='hunk'>@@ -689,8 +689,8 @@ msmsdcc_pio_irq(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 		/* Map the current scatter buffer */</div><div class='ctx'> 		local_irq_save(flags);</div><div class='del'>-		buffer = kmap_atomic(sg_page(host-&gt;pio.sg),</div><div class='del'>-				     KM_BIO_SRC_IRQ) + host-&gt;pio.sg-&gt;offset;</div><div class='add'>+		buffer = kmap_atomic(sg_page(host-&gt;pio.sg))</div><div class='add'>+				     + host-&gt;pio.sg-&gt;offset;</div><div class='ctx'> 		buffer += host-&gt;pio.sg_off;</div><div class='ctx'> 		remain = host-&gt;pio.sg-&gt;length - host-&gt;pio.sg_off;</div><div class='ctx'> 		len = 0;</div><div class='hunk'>@@ -700,7 +700,7 @@ msmsdcc_pio_irq(int irq, void *dev_id)</div><div class='ctx'> 			len = msmsdcc_pio_write(host, buffer, remain, status);</div><div class='ctx'> </div><div class='ctx'> 		/* Unmap the buffer */</div><div class='del'>-		kunmap_atomic(buffer, KM_BIO_SRC_IRQ);</div><div class='add'>+		kunmap_atomic(buffer);</div><div class='ctx'> 		local_irq_restore(flags);</div><div class='ctx'> </div><div class='ctx'> 		host-&gt;pio.sg_off += len;</div><div class='hunk'>@@ -1480,18 +1480,7 @@ static struct platform_driver msmsdcc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init msmsdcc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;msmsdcc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit msmsdcc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;msmsdcc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(msmsdcc_init);</div><div class='del'>-module_exit(msmsdcc_exit);</div><div class='add'>+module_platform_driver(msmsdcc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Qualcomm MSM 7X00A Multimedia Card Interface driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c<br/>index 211a4959c293..eeb8cd125b0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/mvsdio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/mvsdio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/mvsdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/mvsdio.c</a></div><div class='hunk'>@@ -679,8 +679,9 @@ static const struct mmc_host_ops mvsd_ops = {</div><div class='ctx'> 	.enable_sdio_irq	= mvsd_enable_sdio_irq,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __init mv_conf_mbus_windows(struct mvsd_host *host,</div><div class='del'>-					struct mbus_dram_target_info *dram)</div><div class='add'>+static void __init</div><div class='add'>+mv_conf_mbus_windows(struct mvsd_host *host,</div><div class='add'>+		     const struct mbus_dram_target_info *dram)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *iobase = host-&gt;base;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -691,7 +692,7 @@ static void __init mv_conf_mbus_windows(struct mvsd_host *host,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; dram-&gt;num_cs; i++) {</div><div class='del'>-		struct mbus_dram_window *cs = dram-&gt;cs + i;</div><div class='add'>+		const struct mbus_dram_window *cs = dram-&gt;cs + i;</div><div class='ctx'> 		writel(((cs-&gt;size - 1) &amp; 0xffff0000) |</div><div class='ctx'> 		       (cs-&gt;mbus_attr &lt;&lt; 8) |</div><div class='ctx'> 		       (dram-&gt;mbus_dram_target_id &lt;&lt; 4) | 1,</div><div class='hunk'>@@ -705,6 +706,7 @@ static int __init mvsd_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct mmc_host *mmc = NULL;</div><div class='ctx'> 	struct mvsd_host *host = NULL;</div><div class='ctx'> 	const struct mvsdio_platform_data *mvsd_data;</div><div class='add'>+	const struct mbus_dram_target_info *dram;</div><div class='ctx'> 	struct resource *r;</div><div class='ctx'> 	int ret, irq;</div><div class='ctx'> </div><div class='hunk'>@@ -755,8 +757,9 @@ static int __init mvsd_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* (Re-)program MBUS remapping windows if we are asked to. */</div><div class='del'>-	if (mvsd_data-&gt;dram != NULL)</div><div class='del'>-		mv_conf_mbus_windows(host, mvsd_data-&gt;dram);</div><div class='add'>+	dram = mv_mbus_dram_info();</div><div class='add'>+	if (dram)</div><div class='add'>+		mv_conf_mbus_windows(host, dram);</div><div class='ctx'> </div><div class='ctx'> 	mvsd_power_down(host);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c<br/>index 8e0fbe994047..4184b7946bbf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/mxcmmc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/mxcmmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/mxcmmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/mxcmmc.c</a></div><div class='hunk'>@@ -218,6 +218,7 @@ static int mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)</div><div class='ctx'> 	unsigned int blksz = data-&gt;blksz;</div><div class='ctx'> 	unsigned int datasize = nob * blksz;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='add'>+	enum dma_transfer_direction slave_dirn;</div><div class='ctx'> 	int i, nents;</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;flags &amp; MMC_DATA_STREAM)</div><div class='hunk'>@@ -240,10 +241,13 @@ static int mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;flags &amp; MMC_DATA_READ)</div><div class='add'>+	if (data-&gt;flags &amp; MMC_DATA_READ) {</div><div class='ctx'> 		host-&gt;dma_dir = DMA_FROM_DEVICE;</div><div class='del'>-	else</div><div class='add'>+		slave_dirn = DMA_DEV_TO_MEM;</div><div class='add'>+	} else {</div><div class='ctx'> 		host-&gt;dma_dir = DMA_TO_DEVICE;</div><div class='add'>+		slave_dirn = DMA_MEM_TO_DEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	nents = dma_map_sg(host-&gt;dma-&gt;device-&gt;dev, data-&gt;sg,</div><div class='ctx'> 				     data-&gt;sg_len,  host-&gt;dma_dir);</div><div class='hunk'>@@ -251,7 +255,7 @@ static int mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;desc = host-&gt;dma-&gt;device-&gt;device_prep_slave_sg(host-&gt;dma,</div><div class='del'>-		data-&gt;sg, data-&gt;sg_len, host-&gt;dma_dir,</div><div class='add'>+		data-&gt;sg, data-&gt;sg_len, slave_dirn,</div><div class='ctx'> 		DMA_PREP_INTERRUPT | DMA_CTRL_ACK);</div><div class='ctx'> </div><div class='ctx'> 	if (!host-&gt;desc) {</div><div class='hunk'>@@ -1047,18 +1051,7 @@ static struct platform_driver mxcmci_driver = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init mxcmci_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;mxcmci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit mxcmci_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;mxcmci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(mxcmci_init);</div><div class='del'>-module_exit(mxcmci_exit);</div><div class='add'>+module_platform_driver(mxcmci_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("i.MX Multimedia Card Interface Driver");</div><div class='ctx'> MODULE_AUTHOR("Sascha Hauer, Pengutronix");</div><div class='head'>diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c<br/>index 99b449d26a4d..382c835d217c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/mxs-mmc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/mxs-mmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/mxs-mmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/mxs-mmc.c</a></div><div class='hunk'>@@ -154,6 +154,7 @@ struct mxs_mmc_host {</div><div class='ctx'> 	struct dma_chan         	*dmach;</div><div class='ctx'> 	struct mxs_dma_data		dma_data;</div><div class='ctx'> 	unsigned int			dma_dir;</div><div class='add'>+	enum dma_transfer_direction	slave_dirn;</div><div class='ctx'> 	u32				ssp_pio_words[SSP_PIO_NUM];</div><div class='ctx'> </div><div class='ctx'> 	unsigned int			version;</div><div class='hunk'>@@ -324,7 +325,7 @@ static struct dma_async_tx_descriptor *mxs_mmc_prep_dma(</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	desc = host-&gt;dmach-&gt;device-&gt;device_prep_slave_sg(host-&gt;dmach,</div><div class='del'>-				sgl, sg_len, host-&gt;dma_dir, append);</div><div class='add'>+				sgl, sg_len, host-&gt;slave_dirn, append);</div><div class='ctx'> 	if (desc) {</div><div class='ctx'> 		desc-&gt;callback = mxs_mmc_dma_irq_callback;</div><div class='ctx'> 		desc-&gt;callback_param = host;</div><div class='hunk'>@@ -356,6 +357,7 @@ static void mxs_mmc_bc(struct mxs_mmc_host *host)</div><div class='ctx'> 	host-&gt;ssp_pio_words[1] = cmd0;</div><div class='ctx'> 	host-&gt;ssp_pio_words[2] = cmd1;</div><div class='ctx'> 	host-&gt;dma_dir = DMA_NONE;</div><div class='add'>+	host-&gt;slave_dirn = DMA_TRANS_NONE;</div><div class='ctx'> 	desc = mxs_mmc_prep_dma(host, 0);</div><div class='ctx'> 	if (!desc)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -395,6 +397,7 @@ static void mxs_mmc_ac(struct mxs_mmc_host *host)</div><div class='ctx'> 	host-&gt;ssp_pio_words[1] = cmd0;</div><div class='ctx'> 	host-&gt;ssp_pio_words[2] = cmd1;</div><div class='ctx'> 	host-&gt;dma_dir = DMA_NONE;</div><div class='add'>+	host-&gt;slave_dirn = DMA_TRANS_NONE;</div><div class='ctx'> 	desc = mxs_mmc_prep_dma(host, 0);</div><div class='ctx'> 	if (!desc)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -433,6 +436,7 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	unsigned short dma_data_dir, timeout;</div><div class='add'>+	enum dma_transfer_direction slave_dirn;</div><div class='ctx'> 	unsigned int data_size = 0, log2_blksz;</div><div class='ctx'> 	unsigned int blocks = data-&gt;blocks;</div><div class='ctx'> </div><div class='hunk'>@@ -448,9 +452,11 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host)</div><div class='ctx'> </div><div class='ctx'> 	if (data-&gt;flags &amp; MMC_DATA_WRITE) {</div><div class='ctx'> 		dma_data_dir = DMA_TO_DEVICE;</div><div class='add'>+		slave_dirn = DMA_MEM_TO_DEV;</div><div class='ctx'> 		read = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dma_data_dir = DMA_FROM_DEVICE;</div><div class='add'>+		slave_dirn = DMA_DEV_TO_MEM;</div><div class='ctx'> 		read = BM_SSP_CTRL0_READ;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -510,6 +516,7 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host)</div><div class='ctx'> 	host-&gt;ssp_pio_words[1] = cmd0;</div><div class='ctx'> 	host-&gt;ssp_pio_words[2] = cmd1;</div><div class='ctx'> 	host-&gt;dma_dir = DMA_NONE;</div><div class='add'>+	host-&gt;slave_dirn = DMA_TRANS_NONE;</div><div class='ctx'> 	desc = mxs_mmc_prep_dma(host, 0);</div><div class='ctx'> 	if (!desc)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -518,6 +525,7 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host)</div><div class='ctx'> 	WARN_ON(host-&gt;data != NULL);</div><div class='ctx'> 	host-&gt;data = data;</div><div class='ctx'> 	host-&gt;dma_dir = dma_data_dir;</div><div class='add'>+	host-&gt;slave_dirn = slave_dirn;</div><div class='ctx'> 	desc = mxs_mmc_prep_dma(host, 1);</div><div class='ctx'> 	if (!desc)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -713,7 +721,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)</div><div class='ctx'> 		ret = PTR_ERR(host-&gt;clk);</div><div class='ctx'> 		goto out_iounmap;</div><div class='ctx'> 	}</div><div class='del'>-	clk_enable(host-&gt;clk);</div><div class='add'>+	clk_prepare_enable(host-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	mxs_mmc_reset(host);</div><div class='ctx'> </div><div class='hunk'>@@ -772,7 +780,7 @@ out_free_dma:</div><div class='ctx'> 	if (host-&gt;dmach)</div><div class='ctx'> 		dma_release_channel(host-&gt;dmach);</div><div class='ctx'> out_clk_put:</div><div class='del'>-	clk_disable(host-&gt;clk);</div><div class='add'>+	clk_disable_unprepare(host-&gt;clk);</div><div class='ctx'> 	clk_put(host-&gt;clk);</div><div class='ctx'> out_iounmap:</div><div class='ctx'> 	iounmap(host-&gt;base);</div><div class='hunk'>@@ -798,7 +806,7 @@ static int mxs_mmc_remove(struct platform_device *pdev)</div><div class='ctx'> 	if (host-&gt;dmach)</div><div class='ctx'> 		dma_release_channel(host-&gt;dmach);</div><div class='ctx'> </div><div class='del'>-	clk_disable(host-&gt;clk);</div><div class='add'>+	clk_disable_unprepare(host-&gt;clk);</div><div class='ctx'> 	clk_put(host-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	iounmap(host-&gt;base);</div><div class='hunk'>@@ -819,7 +827,7 @@ static int mxs_mmc_suspend(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	ret = mmc_suspend_host(mmc);</div><div class='ctx'> </div><div class='del'>-	clk_disable(host-&gt;clk);</div><div class='add'>+	clk_disable_unprepare(host-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -830,7 +838,7 @@ static int mxs_mmc_resume(struct device *dev)</div><div class='ctx'> 	struct mxs_mmc_host *host = mmc_priv(mmc);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	clk_enable(host-&gt;clk);</div><div class='add'>+	clk_prepare_enable(host-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	ret = mmc_resume_host(mmc);</div><div class='ctx'> </div><div class='hunk'>@@ -855,18 +863,7 @@ static struct platform_driver mxs_mmc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init mxs_mmc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;mxs_mmc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit mxs_mmc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;mxs_mmc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(mxs_mmc_init);</div><div class='del'>-module_exit(mxs_mmc_exit);</div><div class='add'>+module_platform_driver(mxs_mmc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("FREESCALE MXS MMC peripheral");</div><div class='ctx'> MODULE_AUTHOR("Freescale Semiconductor");</div><div class='head'>diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c<br/>index 2dba999caf2c..887c0e598cf3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/omap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/omap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/omap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/omap.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  *  linux/drivers/mmc/host/omap.c</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 Nokia Corporation</div><div class='del'>- *  Written by Tuukka Tikkanen and Juha Yrjölä&lt;juha.yrjola@nokia.com&gt;</div><div class='add'>+ *  Written by Tuukka Tikkanen and Juha Yrjölä&lt;juha.yrjola@nokia.com&gt;</div><div class='ctx'>  *  Misc hacks here and there by Tony Lindgren &lt;tony@atomide.com&gt;</div><div class='ctx'>  *  Other hacks (DMA, SD, etc) by David Brownell</div><div class='ctx'>  *</div><div class='hunk'>@@ -1634,4 +1634,4 @@ module_exit(mmc_omap_exit);</div><div class='ctx'> MODULE_DESCRIPTION("OMAP Multimedia Card driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS("platform:" DRIVER_NAME);</div><div class='del'>-MODULE_AUTHOR("Juha Yrjölä");</div><div class='add'>+MODULE_AUTHOR("Juha Yrjölä");</div><div class='head'>diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c<br/>index d5fe43d53c51..fd0c661bbad3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/omap_hsmmc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/omap_hsmmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/omap_hsmmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/omap_hsmmc.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/host.h&gt;</div><div class='hunk'>@@ -120,7 +119,6 @@</div><div class='ctx'> </div><div class='ctx'> #define MMC_AUTOSUSPEND_DELAY	100</div><div class='ctx'> #define MMC_TIMEOUT_MS		20</div><div class='del'>-#define OMAP_MMC_MASTER_CLOCK	96000000</div><div class='ctx'> #define OMAP_MMC_MIN_CLOCK	400000</div><div class='ctx'> #define OMAP_MMC_MAX_CLOCK	52000000</div><div class='ctx'> #define DRIVER_NAME		"omap_hsmmc"</div><div class='hunk'>@@ -163,7 +161,6 @@ struct omap_hsmmc_host {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct	regulator	*vcc;</div><div class='ctx'> 	struct	regulator	*vcc_aux;</div><div class='del'>-	struct	work_struct	mmc_carddetect_work;</div><div class='ctx'> 	void	__iomem		*base;</div><div class='ctx'> 	resource_size_t		mapbase;</div><div class='ctx'> 	spinlock_t		irq_lock; /* Prevent races with irq handler */</div><div class='hunk'>@@ -598,12 +595,12 @@ static void omap_hsmmc_disable_irq(struct omap_hsmmc_host *host)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Calculate divisor for the given clock frequency */</div><div class='del'>-static u16 calc_divisor(struct mmc_ios *ios)</div><div class='add'>+static u16 calc_divisor(struct omap_hsmmc_host *host, struct mmc_ios *ios)</div><div class='ctx'> {</div><div class='ctx'> 	u16 dsor = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ios-&gt;clock) {</div><div class='del'>-		dsor = DIV_ROUND_UP(OMAP_MMC_MASTER_CLOCK, ios-&gt;clock);</div><div class='add'>+		dsor = DIV_ROUND_UP(clk_get_rate(host-&gt;fclk), ios-&gt;clock);</div><div class='ctx'> 		if (dsor &gt; 250)</div><div class='ctx'> 			dsor = 250;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -623,7 +620,7 @@ static void omap_hsmmc_set_clock(struct omap_hsmmc_host *host)</div><div class='ctx'> </div><div class='ctx'> 	regval = OMAP_HSMMC_READ(host-&gt;base, SYSCTL);</div><div class='ctx'> 	regval = regval &amp; ~(CLKD_MASK | DTO_MASK);</div><div class='del'>-	regval = regval | (calc_divisor(ios) &lt;&lt; 6) | (DTO &lt;&lt; 16);</div><div class='add'>+	regval = regval | (calc_divisor(host, ios) &lt;&lt; 6) | (DTO &lt;&lt; 16);</div><div class='ctx'> 	OMAP_HSMMC_WRITE(host-&gt;base, SYSCTL, regval);</div><div class='ctx'> 	OMAP_HSMMC_WRITE(host-&gt;base, SYSCTL,</div><div class='ctx'> 		OMAP_HSMMC_READ(host-&gt;base, SYSCTL) | ICE);</div><div class='hunk'>@@ -1280,17 +1277,16 @@ static void omap_hsmmc_protect_card(struct omap_hsmmc_host *host)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Work Item to notify the core about card insertion/removal</div><div class='add'>+ * irq handler to notify the core about card insertion/removal</div><div class='ctx'>  */</div><div class='del'>-static void omap_hsmmc_detect(struct work_struct *work)</div><div class='add'>+static irqreturn_t omap_hsmmc_detect(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	struct omap_hsmmc_host *host =</div><div class='del'>-		container_of(work, struct omap_hsmmc_host, mmc_carddetect_work);</div><div class='add'>+	struct omap_hsmmc_host *host = dev_id;</div><div class='ctx'> 	struct omap_mmc_slot_data *slot = &amp;mmc_slot(host);</div><div class='ctx'> 	int carddetect;</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;suspended)</div><div class='del'>-		return;</div><div class='add'>+		return IRQ_HANDLED;</div><div class='ctx'> </div><div class='ctx'> 	sysfs_notify(&amp;host-&gt;mmc-&gt;class_dev.kobj, NULL, "cover_switch");</div><div class='ctx'> </div><div class='hunk'>@@ -1305,19 +1301,6 @@ static void omap_hsmmc_detect(struct work_struct *work)</div><div class='ctx'> 		mmc_detect_change(host-&gt;mmc, (HZ * 200) / 1000);</div><div class='ctx'> 	else</div><div class='ctx'> 		mmc_detect_change(host-&gt;mmc, (HZ * 50) / 1000);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ISR for handling card insertion and removal</div><div class='del'>- */</div><div class='del'>-static irqreturn_t omap_hsmmc_cd_handler(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct omap_hsmmc_host *host = (struct omap_hsmmc_host *)dev_id;</div><div class='del'>-</div><div class='del'>-	if (host-&gt;suspended)</div><div class='del'>-		return IRQ_HANDLED;</div><div class='del'>-	schedule_work(&amp;host-&gt;mmc_carddetect_work);</div><div class='del'>-</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1919,7 +1902,6 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)</div><div class='ctx'> 	host-&gt;next_data.cookie = 1;</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, host);</div><div class='del'>-	INIT_WORK(&amp;host-&gt;mmc_carddetect_work, omap_hsmmc_detect);</div><div class='ctx'> </div><div class='ctx'> 	mmc-&gt;ops	= &amp;omap_hsmmc_ops;</div><div class='ctx'> </div><div class='hunk'>@@ -1991,6 +1973,8 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (mmc_slot(host).nonremovable)</div><div class='ctx'> 		mmc-&gt;caps |= MMC_CAP_NONREMOVABLE;</div><div class='ctx'> </div><div class='add'>+	mmc-&gt;pm_caps = mmc_slot(host).pm_caps;</div><div class='add'>+</div><div class='ctx'> 	omap_hsmmc_conf_bus_power(host);</div><div class='ctx'> </div><div class='ctx'> 	/* Select DMA lines */</div><div class='hunk'>@@ -2047,10 +2031,11 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* Request IRQ for card detect */</div><div class='ctx'> 	if ((mmc_slot(host).card_detect_irq)) {</div><div class='del'>-		ret = request_irq(mmc_slot(host).card_detect_irq,</div><div class='del'>-				  omap_hsmmc_cd_handler,</div><div class='del'>-				  IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='del'>-				  mmc_hostname(mmc), host);</div><div class='add'>+		ret = request_threaded_irq(mmc_slot(host).card_detect_irq,</div><div class='add'>+					   NULL,</div><div class='add'>+					   omap_hsmmc_detect,</div><div class='add'>+					   IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='add'>+					   mmc_hostname(mmc), host);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			dev_dbg(mmc_dev(host-&gt;mmc),</div><div class='ctx'> 				"Unable to grab MMC CD IRQ\n");</div><div class='hunk'>@@ -2129,7 +2114,6 @@ static int omap_hsmmc_remove(struct platform_device *pdev)</div><div class='ctx'> 		free_irq(host-&gt;irq, host);</div><div class='ctx'> 		if (mmc_slot(host).card_detect_irq)</div><div class='ctx'> 			free_irq(mmc_slot(host).card_detect_irq, host);</div><div class='del'>-		flush_work_sync(&amp;host-&gt;mmc_carddetect_work);</div><div class='ctx'> </div><div class='ctx'> 		pm_runtime_put_sync(host-&gt;dev);</div><div class='ctx'> 		pm_runtime_disable(host-&gt;dev);</div><div class='hunk'>@@ -2176,16 +2160,9 @@ static int omap_hsmmc_suspend(struct device *dev)</div><div class='ctx'> 				return ret;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		cancel_work_sync(&amp;host-&gt;mmc_carddetect_work);</div><div class='ctx'> 		ret = mmc_suspend_host(host-&gt;mmc);</div><div class='ctx'> </div><div class='del'>-		if (ret == 0) {</div><div class='del'>-			omap_hsmmc_disable_irq(host);</div><div class='del'>-			OMAP_HSMMC_WRITE(host-&gt;base, HCTL,</div><div class='del'>-				OMAP_HSMMC_READ(host-&gt;base, HCTL) &amp; ~SDBP);</div><div class='del'>-			if (host-&gt;got_dbclk)</div><div class='del'>-				clk_disable(host-&gt;dbclk);</div><div class='del'>-		} else {</div><div class='add'>+		if (ret) {</div><div class='ctx'> 			host-&gt;suspended = 0;</div><div class='ctx'> 			if (host-&gt;pdata-&gt;resume) {</div><div class='ctx'> 				ret = host-&gt;pdata-&gt;resume(&amp;pdev-&gt;dev,</div><div class='hunk'>@@ -2194,9 +2171,20 @@ static int omap_hsmmc_suspend(struct device *dev)</div><div class='ctx'> 					dev_dbg(mmc_dev(host-&gt;mmc),</div><div class='ctx'> 						"Unmask interrupt failed\n");</div><div class='ctx'> 			}</div><div class='add'>+			goto err;</div><div class='ctx'> 		}</div><div class='del'>-		pm_runtime_put_sync(host-&gt;dev);</div><div class='add'>+</div><div class='add'>+		if (!(host-&gt;mmc-&gt;pm_flags &amp; MMC_PM_KEEP_POWER)) {</div><div class='add'>+			omap_hsmmc_disable_irq(host);</div><div class='add'>+			OMAP_HSMMC_WRITE(host-&gt;base, HCTL,</div><div class='add'>+				OMAP_HSMMC_READ(host-&gt;base, HCTL) &amp; ~SDBP);</div><div class='add'>+		}</div><div class='add'>+		if (host-&gt;got_dbclk)</div><div class='add'>+			clk_disable(host-&gt;dbclk);</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='add'>+err:</div><div class='add'>+	pm_runtime_put_sync(host-&gt;dev);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2216,7 +2204,8 @@ static int omap_hsmmc_resume(struct device *dev)</div><div class='ctx'> 		if (host-&gt;got_dbclk)</div><div class='ctx'> 			clk_enable(host-&gt;dbclk);</div><div class='ctx'> </div><div class='del'>-		omap_hsmmc_conf_bus_power(host);</div><div class='add'>+		if (!(host-&gt;mmc-&gt;pm_flags &amp; MMC_PM_KEEP_POWER))</div><div class='add'>+			omap_hsmmc_conf_bus_power(host);</div><div class='ctx'> </div><div class='ctx'> 		if (host-&gt;pdata-&gt;resume) {</div><div class='ctx'> 			ret = host-&gt;pdata-&gt;resume(&amp;pdev-&gt;dev, host-&gt;slot_id);</div><div class='head'>diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c<br/>index fc4356e00d46..cb2dc0e75ba7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/pxamci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/pxamci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/pxamci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/pxamci.c</a></div><div class='hunk'>@@ -872,18 +872,7 @@ static struct platform_driver pxamci_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pxamci_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pxamci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit pxamci_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pxamci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(pxamci_init);</div><div class='del'>-module_exit(pxamci_exit);</div><div class='add'>+module_platform_driver(pxamci_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("PXA Multimedia Card Interface Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c<br/>index 720f99334a7f..1bcfd6dbb5cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/s3cmci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/s3cmci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/s3cmci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/s3cmci.c</a></div><div class='hunk'>@@ -1914,18 +1914,7 @@ static struct platform_driver s3cmci_driver = {</div><div class='ctx'> 	.shutdown	= s3cmci_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init s3cmci_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;s3cmci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit s3cmci_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;s3cmci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(s3cmci_init);</div><div class='del'>-module_exit(s3cmci_exit);</div><div class='add'>+module_platform_driver(s3cmci_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Samsung S3C MMC/SD Card Interface driver");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-cns3xxx.c b/drivers/mmc/host/sdhci-cns3xxx.c<br/>index b4257e700617..28a870804f60 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-cns3xxx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-cns3xxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-cns3xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/sdhci-cns3xxx.c</a></div><div class='hunk'>@@ -115,17 +115,7 @@ static struct platform_driver sdhci_cns3xxx_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(sdhci_cns3xxx_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sdhci_cns3xxx_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sdhci_cns3xxx_driver);</div><div class='del'>-}</div><div class='del'>-module_init(sdhci_cns3xxx_init);</div><div class='del'>-</div><div class='del'>-static void __exit sdhci_cns3xxx_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sdhci_cns3xxx_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(sdhci_cns3xxx_exit);</div><div class='add'>+module_platform_driver(sdhci_cns3xxx_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("SDHCI driver for CNS3xxx");</div><div class='ctx'> MODULE_AUTHOR("Scott Shu, "</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-dove.c b/drivers/mmc/host/sdhci-dove.c<br/>index a81312c91f70..46fd1fd1b605 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-dove.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-dove.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-dove.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/sdhci-dove.c</a></div><div class='hunk'>@@ -88,17 +88,7 @@ static struct platform_driver sdhci_dove_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(sdhci_dove_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sdhci_dove_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sdhci_dove_driver);</div><div class='del'>-}</div><div class='del'>-module_init(sdhci_dove_init);</div><div class='del'>-</div><div class='del'>-static void __exit sdhci_dove_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sdhci_dove_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(sdhci_dove_exit);</div><div class='add'>+module_platform_driver(sdhci_dove_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("SDHCI driver for Dove");</div><div class='ctx'> MODULE_AUTHOR("Saeed Bishara &lt;saeed@marvell.com&gt;, "</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c<br/>index 38ebc4ea259f..d601e41af282 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-esdhc-imx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-esdhc-imx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-esdhc-imx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/sdhci-esdhc-imx.c</a></div><div class='hunk'>@@ -606,17 +606,7 @@ static struct platform_driver sdhci_esdhc_imx_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(sdhci_esdhc_imx_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sdhci_esdhc_imx_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sdhci_esdhc_imx_driver);</div><div class='del'>-}</div><div class='del'>-module_init(sdhci_esdhc_imx_init);</div><div class='del'>-</div><div class='del'>-static void __exit sdhci_esdhc_imx_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sdhci_esdhc_imx_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(sdhci_esdhc_imx_exit);</div><div class='add'>+module_platform_driver(sdhci_esdhc_imx_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("SDHCI driver for Freescale i.MX eSDHC");</div><div class='ctx'> MODULE_AUTHOR("Wolfram Sang &lt;w.sang@pengutronix.de&gt;");</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-esdhc.h b/drivers/mmc/host/sdhci-esdhc.h<br/>index c3b08f111942..b97b2f5dafdb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-esdhc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-esdhc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-esdhc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/sdhci-esdhc.h</a></div><div class='hunk'>@@ -73,7 +73,7 @@ static inline void esdhc_set_clock(struct sdhci_host *host, unsigned int clock)</div><div class='ctx'> 		| (div &lt;&lt; ESDHC_DIVIDER_SHIFT)</div><div class='ctx'> 		| (pre_div &lt;&lt; ESDHC_PREDIV_SHIFT));</div><div class='ctx'> 	sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL);</div><div class='del'>-	mdelay(100);</div><div class='add'>+	mdelay(1);</div><div class='ctx'> out:</div><div class='ctx'> 	host-&gt;clock = clock;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c<br/>index 01e5f627e0f0..ff4adc018041 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-of-esdhc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-of-esdhc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-of-esdhc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/sdhci-of-esdhc.c</a></div><div class='hunk'>@@ -131,17 +131,7 @@ static struct platform_driver sdhci_esdhc_driver = {</div><div class='ctx'> 	.remove = __devexit_p(sdhci_esdhc_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sdhci_esdhc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sdhci_esdhc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(sdhci_esdhc_init);</div><div class='del'>-</div><div class='del'>-static void __exit sdhci_esdhc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sdhci_esdhc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(sdhci_esdhc_exit);</div><div class='add'>+module_platform_driver(sdhci_esdhc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("SDHCI OF driver for Freescale MPC eSDHC");</div><div class='ctx'> MODULE_AUTHOR("Xiaobo Xie &lt;X.Xie@freescale.com&gt;, "</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-of-hlwd.c b/drivers/mmc/host/sdhci-of-hlwd.c<br/>index 3619adc7d9fc..0ce088ae0228 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-of-hlwd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-of-hlwd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-of-hlwd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/sdhci-of-hlwd.c</a></div><div class='hunk'>@@ -93,17 +93,7 @@ static struct platform_driver sdhci_hlwd_driver = {</div><div class='ctx'> 	.remove = __devexit_p(sdhci_hlwd_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sdhci_hlwd_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sdhci_hlwd_driver);</div><div class='del'>-}</div><div class='del'>-module_init(sdhci_hlwd_init);</div><div class='del'>-</div><div class='del'>-static void __exit sdhci_hlwd_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sdhci_hlwd_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(sdhci_hlwd_exit);</div><div class='add'>+module_platform_driver(sdhci_hlwd_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Nintendo Wii SDHCI OF driver");</div><div class='ctx'> MODULE_AUTHOR("The GameCube Linux Team, Albert Herranz");</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-pci-data.c b/drivers/mmc/host/sdhci-pci-data.c<br/>new file mode 100644<br/>index 000000000000..a611217769f5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-pci-data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/sdhci-pci-data.c</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mmc/sdhci-pci-data.h&gt;</div><div class='add'>+</div><div class='add'>+struct sdhci_pci_data *(*sdhci_pci_get_data)(struct pci_dev *pdev, int slotno);</div><div class='add'>+EXPORT_SYMBOL_GPL(sdhci_pci_get_data);</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c<br/>index 6878a94626bc..7165e6a09274 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/sdhci-pci.c</a></div><div class='hunk'>@@ -23,8 +23,8 @@</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/sfi.h&gt;</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/mmc/sdhci-pci-data.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sdhci.h"</div><div class='ctx'> </div><div class='hunk'>@@ -61,6 +61,7 @@ struct sdhci_pci_fixes {</div><div class='ctx'> struct sdhci_pci_slot {</div><div class='ctx'> 	struct sdhci_pci_chip	*chip;</div><div class='ctx'> 	struct sdhci_host	*host;</div><div class='add'>+	struct sdhci_pci_data	*data;</div><div class='ctx'> </div><div class='ctx'> 	int			pci_bar;</div><div class='ctx'> 	int			rst_n_gpio;</div><div class='hunk'>@@ -171,32 +172,9 @@ static int mrst_hc_probe(struct sdhci_pci_chip *chip)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Medfield eMMC hardware reset GPIOs */</div><div class='del'>-static int mfd_emmc0_rst_gpio = -EINVAL;</div><div class='del'>-static int mfd_emmc1_rst_gpio = -EINVAL;</div><div class='del'>-</div><div class='del'>-static int mfd_emmc_gpio_parse(struct sfi_table_header *table)</div><div class='del'>-{</div><div class='del'>-	struct sfi_table_simple *sb = (struct sfi_table_simple *)table;</div><div class='del'>-	struct sfi_gpio_table_entry *entry;</div><div class='del'>-	int i, num;</div><div class='del'>-</div><div class='del'>-	num = SFI_GET_NUM_ENTRIES(sb, struct sfi_gpio_table_entry);</div><div class='del'>-	entry = (struct sfi_gpio_table_entry *)sb-&gt;pentry;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num; i++, entry++) {</div><div class='del'>-		if (!strncmp(entry-&gt;pin_name, "emmc0_rst", SFI_NAME_LEN))</div><div class='del'>-			mfd_emmc0_rst_gpio = entry-&gt;pin_no;</div><div class='del'>-		else if (!strncmp(entry-&gt;pin_name, "emmc1_rst", SFI_NAME_LEN))</div><div class='del'>-			mfd_emmc1_rst_gpio = entry-&gt;pin_no;</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'> #ifdef CONFIG_PM_RUNTIME</div><div class='ctx'> </div><div class='del'>-static irqreturn_t mfd_sd_cd(int irq, void *dev_id)</div><div class='add'>+static irqreturn_t sdhci_pci_sd_cd(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdhci_pci_slot *slot = dev_id;</div><div class='ctx'> 	struct sdhci_host *host = slot-&gt;host;</div><div class='hunk'>@@ -205,15 +183,16 @@ static irqreturn_t mfd_sd_cd(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define MFLD_SD_CD_PIN 69</div><div class='del'>-</div><div class='del'>-static int mfd_sd_probe_slot(struct sdhci_pci_slot *slot)</div><div class='add'>+static void sdhci_pci_add_own_cd(struct sdhci_pci_slot *slot)</div><div class='ctx'> {</div><div class='del'>-	int err, irq, gpio = MFLD_SD_CD_PIN;</div><div class='add'>+	int err, irq, gpio = slot-&gt;cd_gpio;</div><div class='ctx'> </div><div class='ctx'> 	slot-&gt;cd_gpio = -EINVAL;</div><div class='ctx'> 	slot-&gt;cd_irq = -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (!gpio_is_valid(gpio))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	err = gpio_request(gpio, "sd_cd");</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -226,72 +205,53 @@ static int mfd_sd_probe_slot(struct sdhci_pci_slot *slot)</div><div class='ctx'> 	if (irq &lt; 0)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='del'>-	err = request_irq(irq, mfd_sd_cd, IRQF_TRIGGER_RISING |</div><div class='add'>+	err = request_irq(irq, sdhci_pci_sd_cd, IRQF_TRIGGER_RISING |</div><div class='ctx'> 			  IRQF_TRIGGER_FALLING, "sd_cd", slot);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='ctx'> 	slot-&gt;cd_gpio = gpio;</div><div class='ctx'> 	slot-&gt;cd_irq = irq;</div><div class='del'>-	slot-&gt;host-&gt;quirks2 |= SDHCI_QUIRK2_OWN_CARD_DETECTION;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return;</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='ctx'> 	gpio_free(gpio);</div><div class='ctx'> out:</div><div class='ctx'> 	dev_warn(&amp;slot-&gt;chip-&gt;pdev-&gt;dev, "failed to setup card detect wake up\n");</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mfd_sd_remove_slot(struct sdhci_pci_slot *slot, int dead)</div><div class='add'>+static void sdhci_pci_remove_own_cd(struct sdhci_pci_slot *slot)</div><div class='ctx'> {</div><div class='ctx'> 	if (slot-&gt;cd_irq &gt;= 0)</div><div class='ctx'> 		free_irq(slot-&gt;cd_irq, slot);</div><div class='del'>-	gpio_free(slot-&gt;cd_gpio);</div><div class='add'>+	if (gpio_is_valid(slot-&gt;cd_gpio))</div><div class='add'>+		gpio_free(slot-&gt;cd_gpio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='del'>-#define mfd_sd_probe_slot	NULL</div><div class='del'>-#define mfd_sd_remove_slot	NULL</div><div class='add'>+static inline void sdhci_pci_add_own_cd(struct sdhci_pci_slot *slot)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void sdhci_pci_remove_own_cd(struct sdhci_pci_slot *slot)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int mfd_emmc_probe_slot(struct sdhci_pci_slot *slot)</div><div class='ctx'> {</div><div class='del'>-	const char *name = NULL;</div><div class='del'>-	int gpio = -EINVAL;</div><div class='del'>-</div><div class='del'>-	sfi_table_parse(SFI_SIG_GPIO, NULL, NULL, mfd_emmc_gpio_parse);</div><div class='del'>-</div><div class='del'>-	switch (slot-&gt;chip-&gt;pdev-&gt;device) {</div><div class='del'>-	case PCI_DEVICE_ID_INTEL_MFD_EMMC0:</div><div class='del'>-		gpio = mfd_emmc0_rst_gpio;</div><div class='del'>-		name = "eMMC0_reset";</div><div class='del'>-		break;</div><div class='del'>-	case PCI_DEVICE_ID_INTEL_MFD_EMMC1:</div><div class='del'>-		gpio = mfd_emmc1_rst_gpio;</div><div class='del'>-		name = "eMMC1_reset";</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!gpio_request(gpio, name)) {</div><div class='del'>-		gpio_direction_output(gpio, 1);</div><div class='del'>-		slot-&gt;rst_n_gpio = gpio;</div><div class='del'>-		slot-&gt;host-&gt;mmc-&gt;caps |= MMC_CAP_HW_RESET;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	slot-&gt;host-&gt;mmc-&gt;caps |= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE;</div><div class='del'>-</div><div class='ctx'> 	slot-&gt;host-&gt;mmc-&gt;caps2 = MMC_CAP2_BOOTPART_NOACC;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mfd_emmc_remove_slot(struct sdhci_pci_slot *slot, int dead)</div><div class='add'>+static int mfd_sdio_probe_slot(struct sdhci_pci_slot *slot)</div><div class='ctx'> {</div><div class='del'>-	gpio_free(slot-&gt;rst_n_gpio);</div><div class='add'>+	slot-&gt;host-&gt;mmc-&gt;caps |= MMC_CAP_POWER_OFF_CARD;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct sdhci_pci_fixes sdhci_intel_mrst_hc0 = {</div><div class='hunk'>@@ -307,20 +267,18 @@ static const struct sdhci_pci_fixes sdhci_intel_mrst_hc1_hc2 = {</div><div class='ctx'> static const struct sdhci_pci_fixes sdhci_intel_mfd_sd = {</div><div class='ctx'> 	.quirks		= SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,</div><div class='ctx'> 	.allow_runtime_pm = true,</div><div class='del'>-	.probe_slot	= mfd_sd_probe_slot,</div><div class='del'>-	.remove_slot	= mfd_sd_remove_slot,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct sdhci_pci_fixes sdhci_intel_mfd_sdio = {</div><div class='ctx'> 	.quirks		= SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,</div><div class='ctx'> 	.allow_runtime_pm = true,</div><div class='add'>+	.probe_slot	= mfd_sdio_probe_slot,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct sdhci_pci_fixes sdhci_intel_mfd_emmc = {</div><div class='ctx'> 	.quirks		= SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,</div><div class='ctx'> 	.allow_runtime_pm = true,</div><div class='ctx'> 	.probe_slot	= mfd_emmc_probe_slot,</div><div class='del'>-	.remove_slot	= mfd_emmc_remove_slot,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* O2Micro extra registers */</div><div class='hunk'>@@ -1012,11 +970,8 @@ static int sdhci_pci_suspend(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 		ret = sdhci_suspend_host(slot-&gt;host);</div><div class='ctx'> </div><div class='del'>-		if (ret) {</div><div class='del'>-			for (i--; i &gt;= 0; i--)</div><div class='del'>-				sdhci_resume_host(chip-&gt;slots[i]-&gt;host);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_pci_suspend;</div><div class='ctx'> </div><div class='ctx'> 		slot_pm_flags = slot-&gt;host-&gt;mmc-&gt;pm_flags;</div><div class='ctx'> 		if (slot_pm_flags &amp; MMC_PM_WAKE_SDIO_IRQ)</div><div class='hunk'>@@ -1027,11 +982,8 @@ static int sdhci_pci_suspend(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;fixes &amp;&amp; chip-&gt;fixes-&gt;suspend) {</div><div class='ctx'> 		ret = chip-&gt;fixes-&gt;suspend(chip);</div><div class='del'>-		if (ret) {</div><div class='del'>-			for (i = chip-&gt;num_slots - 1; i &gt;= 0; i--)</div><div class='del'>-				sdhci_resume_host(chip-&gt;slots[i]-&gt;host);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_pci_suspend;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pci_save_state(pdev);</div><div class='hunk'>@@ -1048,6 +1000,11 @@ static int sdhci_pci_suspend(struct device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_pci_suspend:</div><div class='add'>+	while (--i &gt;= 0)</div><div class='add'>+		sdhci_resume_host(chip-&gt;slots[i]-&gt;host);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sdhci_pci_resume(struct device *dev)</div><div class='hunk'>@@ -1113,23 +1070,22 @@ static int sdhci_pci_runtime_suspend(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 		ret = sdhci_runtime_suspend_host(slot-&gt;host);</div><div class='ctx'> </div><div class='del'>-		if (ret) {</div><div class='del'>-			for (i--; i &gt;= 0; i--)</div><div class='del'>-				sdhci_runtime_resume_host(chip-&gt;slots[i]-&gt;host);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_pci_runtime_suspend;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;fixes &amp;&amp; chip-&gt;fixes-&gt;suspend) {</div><div class='ctx'> 		ret = chip-&gt;fixes-&gt;suspend(chip);</div><div class='del'>-		if (ret) {</div><div class='del'>-			for (i = chip-&gt;num_slots - 1; i &gt;= 0; i--)</div><div class='del'>-				sdhci_runtime_resume_host(chip-&gt;slots[i]-&gt;host);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_pci_runtime_suspend;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_pci_runtime_suspend:</div><div class='add'>+	while (--i &gt;= 0)</div><div class='add'>+		sdhci_runtime_resume_host(chip-&gt;slots[i]-&gt;host);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sdhci_pci_runtime_resume(struct device *dev)</div><div class='hunk'>@@ -1190,11 +1146,12 @@ static const struct dev_pm_ops sdhci_pci_pm_ops = {</div><div class='ctx'> \*****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot(</div><div class='del'>-	struct pci_dev *pdev, struct sdhci_pci_chip *chip, int bar)</div><div class='add'>+	struct pci_dev *pdev, struct sdhci_pci_chip *chip, int first_bar,</div><div class='add'>+	int slotno)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdhci_pci_slot *slot;</div><div class='ctx'> 	struct sdhci_host *host;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, bar = first_bar + slotno;</div><div class='ctx'> </div><div class='ctx'> 	if (!(pci_resource_flags(pdev, bar) &amp; IORESOURCE_MEM)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "BAR %d is not iomem. Aborting.\n", bar);</div><div class='hunk'>@@ -1228,6 +1185,23 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot(</div><div class='ctx'> 	slot-&gt;host = host;</div><div class='ctx'> 	slot-&gt;pci_bar = bar;</div><div class='ctx'> 	slot-&gt;rst_n_gpio = -EINVAL;</div><div class='add'>+	slot-&gt;cd_gpio = -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Retrieve platform data if there is any */</div><div class='add'>+	if (*sdhci_pci_get_data)</div><div class='add'>+		slot-&gt;data = sdhci_pci_get_data(pdev, slotno);</div><div class='add'>+</div><div class='add'>+	if (slot-&gt;data) {</div><div class='add'>+		if (slot-&gt;data-&gt;setup) {</div><div class='add'>+			ret = slot-&gt;data-&gt;setup(slot-&gt;data);</div><div class='add'>+			if (ret) {</div><div class='add'>+				dev_err(&amp;pdev-&gt;dev, "platform setup failed\n");</div><div class='add'>+				goto free;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		slot-&gt;rst_n_gpio = slot-&gt;data-&gt;rst_n_gpio;</div><div class='add'>+		slot-&gt;cd_gpio = slot-&gt;data-&gt;cd_gpio;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;hw_name = "PCI";</div><div class='ctx'> 	host-&gt;ops = &amp;sdhci_pci_ops;</div><div class='hunk'>@@ -1238,7 +1212,7 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot(</div><div class='ctx'> 	ret = pci_request_region(pdev, bar, mmc_hostname(host-&gt;mmc));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "cannot request region\n");</div><div class='del'>-		goto free;</div><div class='add'>+		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;ioaddr = pci_ioremap_bar(pdev, bar);</div><div class='hunk'>@@ -1254,15 +1228,30 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot(</div><div class='ctx'> 			goto unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (gpio_is_valid(slot-&gt;rst_n_gpio)) {</div><div class='add'>+		if (!gpio_request(slot-&gt;rst_n_gpio, "eMMC_reset")) {</div><div class='add'>+			gpio_direction_output(slot-&gt;rst_n_gpio, 1);</div><div class='add'>+			slot-&gt;host-&gt;mmc-&gt;caps |= MMC_CAP_HW_RESET;</div><div class='add'>+		} else {</div><div class='add'>+			dev_warn(&amp;pdev-&gt;dev, "failed to request rst_n_gpio\n");</div><div class='add'>+			slot-&gt;rst_n_gpio = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	host-&gt;mmc-&gt;pm_caps = MMC_PM_KEEP_POWER | MMC_PM_WAKE_SDIO_IRQ;</div><div class='ctx'> </div><div class='ctx'> 	ret = sdhci_add_host(host);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto remove;</div><div class='ctx'> </div><div class='add'>+	sdhci_pci_add_own_cd(slot);</div><div class='add'>+</div><div class='ctx'> 	return slot;</div><div class='ctx'> </div><div class='ctx'> remove:</div><div class='add'>+	if (gpio_is_valid(slot-&gt;rst_n_gpio))</div><div class='add'>+		gpio_free(slot-&gt;rst_n_gpio);</div><div class='add'>+</div><div class='ctx'> 	if (chip-&gt;fixes &amp;&amp; chip-&gt;fixes-&gt;remove_slot)</div><div class='ctx'> 		chip-&gt;fixes-&gt;remove_slot(slot, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -1272,6 +1261,10 @@ unmap:</div><div class='ctx'> release:</div><div class='ctx'> 	pci_release_region(pdev, bar);</div><div class='ctx'> </div><div class='add'>+cleanup:</div><div class='add'>+	if (slot-&gt;data &amp;&amp; slot-&gt;data-&gt;cleanup)</div><div class='add'>+		slot-&gt;data-&gt;cleanup(slot-&gt;data);</div><div class='add'>+</div><div class='ctx'> free:</div><div class='ctx'> 	sdhci_free_host(host);</div><div class='ctx'> </div><div class='hunk'>@@ -1283,6 +1276,8 @@ static void sdhci_pci_remove_slot(struct sdhci_pci_slot *slot)</div><div class='ctx'> 	int dead;</div><div class='ctx'> 	u32 scratch;</div><div class='ctx'> </div><div class='add'>+	sdhci_pci_remove_own_cd(slot);</div><div class='add'>+</div><div class='ctx'> 	dead = 0;</div><div class='ctx'> 	scratch = readl(slot-&gt;host-&gt;ioaddr + SDHCI_INT_STATUS);</div><div class='ctx'> 	if (scratch == (u32)-1)</div><div class='hunk'>@@ -1290,9 +1285,15 @@ static void sdhci_pci_remove_slot(struct sdhci_pci_slot *slot)</div><div class='ctx'> </div><div class='ctx'> 	sdhci_remove_host(slot-&gt;host, dead);</div><div class='ctx'> </div><div class='add'>+	if (gpio_is_valid(slot-&gt;rst_n_gpio))</div><div class='add'>+		gpio_free(slot-&gt;rst_n_gpio);</div><div class='add'>+</div><div class='ctx'> 	if (slot-&gt;chip-&gt;fixes &amp;&amp; slot-&gt;chip-&gt;fixes-&gt;remove_slot)</div><div class='ctx'> 		slot-&gt;chip-&gt;fixes-&gt;remove_slot(slot, dead);</div><div class='ctx'> </div><div class='add'>+	if (slot-&gt;data &amp;&amp; slot-&gt;data-&gt;cleanup)</div><div class='add'>+		slot-&gt;data-&gt;cleanup(slot-&gt;data);</div><div class='add'>+</div><div class='ctx'> 	pci_release_region(slot-&gt;chip-&gt;pdev, slot-&gt;pci_bar);</div><div class='ctx'> </div><div class='ctx'> 	sdhci_free_host(slot-&gt;host);</div><div class='hunk'>@@ -1379,7 +1380,7 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	slots = chip-&gt;num_slots;	/* Quirk may have changed this */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; slots; i++) {</div><div class='del'>-		slot = sdhci_pci_probe_slot(pdev, chip, first_bar + i);</div><div class='add'>+		slot = sdhci_pci_probe_slot(pdev, chip, first_bar, i);</div><div class='ctx'> 		if (IS_ERR(slot)) {</div><div class='ctx'> 			for (i--; i &gt;= 0; i--)</div><div class='ctx'> 				sdhci_pci_remove_slot(chip-&gt;slots[i]);</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c<br/>index 7a039c3cb1f1..dbb75bfbcffb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-pxav2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-pxav2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-pxav2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/sdhci-pxav2.c</a></div><div class='hunk'>@@ -223,18 +223,8 @@ static struct platform_driver sdhci_pxav2_driver = {</div><div class='ctx'> 	.probe		= sdhci_pxav2_probe,</div><div class='ctx'> 	.remove		= __devexit_p(sdhci_pxav2_remove),</div><div class='ctx'> };</div><div class='del'>-static int __init sdhci_pxav2_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sdhci_pxav2_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sdhci_pxav2_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sdhci_pxav2_driver);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-module_init(sdhci_pxav2_init);</div><div class='del'>-module_exit(sdhci_pxav2_exit);</div><div class='add'>+module_platform_driver(sdhci_pxav2_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("SDHCI driver for pxav2");</div><div class='ctx'> MODULE_AUTHOR("Marvell International Ltd.");</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c<br/>index 15673a7ee6a5..f29695683556 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-pxav3.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-pxav3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-pxav3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/sdhci-pxav3.c</a></div><div class='hunk'>@@ -269,18 +269,8 @@ static struct platform_driver sdhci_pxav3_driver = {</div><div class='ctx'> 	.probe		= sdhci_pxav3_probe,</div><div class='ctx'> 	.remove		= __devexit_p(sdhci_pxav3_remove),</div><div class='ctx'> };</div><div class='del'>-static int __init sdhci_pxav3_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sdhci_pxav3_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sdhci_pxav3_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sdhci_pxav3_driver);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-module_init(sdhci_pxav3_init);</div><div class='del'>-module_exit(sdhci_pxav3_exit);</div><div class='add'>+module_platform_driver(sdhci_pxav3_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("SDHCI driver for pxav3");</div><div class='ctx'> MODULE_AUTHOR("Marvell International Ltd.");</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c<br/>index 0d33ff0d67fb..1af756ee0f9a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-s3c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-s3c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-s3c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/sdhci-s3c.c</a></div><div class='hunk'>@@ -80,7 +80,7 @@ static void sdhci_s3c_check_sclk(struct sdhci_host *host)</div><div class='ctx'> </div><div class='ctx'> 		tmp &amp;= ~S3C_SDHCI_CTRL2_SELBASECLK_MASK;</div><div class='ctx'> 		tmp |= ourhost-&gt;cur_clk &lt;&lt; S3C_SDHCI_CTRL2_SELBASECLK_SHIFT;</div><div class='del'>-		writel(tmp, host-&gt;ioaddr + 0x80);</div><div class='add'>+		writel(tmp, host-&gt;ioaddr + S3C_SDHCI_CONTROL2);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -435,14 +435,11 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	for (clks = 0, ptr = 0; ptr &lt; MAX_BUS_CLK; ptr++) {</div><div class='ctx'> 		struct clk *clk;</div><div class='del'>-		char *name = pdata-&gt;clocks[ptr];</div><div class='del'>-</div><div class='del'>-		if (name == NULL)</div><div class='del'>-			continue;</div><div class='add'>+		char name[14];</div><div class='ctx'> </div><div class='add'>+		snprintf(name, 14, "mmc_busclk.%d", ptr);</div><div class='ctx'> 		clk = clk_get(dev, name);</div><div class='ctx'> 		if (IS_ERR(clk)) {</div><div class='del'>-			dev_err(dev, "failed to get clock %s\n", name);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -524,6 +521,9 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (pdata-&gt;host_caps)</div><div class='ctx'> 		host-&gt;mmc-&gt;caps |= pdata-&gt;host_caps;</div><div class='ctx'> </div><div class='add'>+	if (pdata-&gt;pm_caps)</div><div class='add'>+		host-&gt;mmc-&gt;pm_caps |= pdata-&gt;pm_caps;</div><div class='add'>+</div><div class='ctx'> 	host-&gt;quirks |= (SDHCI_QUIRK_32BIT_DMA_ADDR |</div><div class='ctx'> 			 SDHCI_QUIRK_32BIT_DMA_SIZE);</div><div class='ctx'> </div><div class='hunk'>@@ -657,18 +657,7 @@ static struct platform_driver sdhci_s3c_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sdhci_s3c_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sdhci_s3c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sdhci_s3c_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sdhci_s3c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sdhci_s3c_init);</div><div class='del'>-module_exit(sdhci_s3c_exit);</div><div class='add'>+module_platform_driver(sdhci_s3c_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Samsung SDHCI (HSMMC) glue");</div><div class='ctx'> MODULE_AUTHOR("Ben Dooks, &lt;ben@simtec.co.uk&gt;");</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c<br/>index 63cc8b6a1c9e..b7f8b33c5f19 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-spear.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-spear.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-spear.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/sdhci-spear.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/host.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/sdhci-spear.h&gt;</div><div class='hunk'>@@ -271,26 +272,54 @@ static int __devexit sdhci_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</div><div class='add'>+static int sdhci_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 spear_sdhci *sdhci = dev_get_platdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = sdhci_suspend_host(host);</div><div class='add'>+	if (!ret)</div><div class='add'>+		clk_disable(sdhci-&gt;clk);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sdhci_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 spear_sdhci *sdhci = dev_get_platdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = clk_enable(sdhci-&gt;clk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_dbg(dev, "Resume: Error enabling clock\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sdhci_resume_host(host);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct dev_pm_ops sdhci_pm_ops = {</div><div class='add'>+	.suspend	= sdhci_suspend,</div><div class='add'>+	.resume		= sdhci_resume,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct platform_driver sdhci_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "sdhci",</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+		.pm	= &amp;sdhci_pm_ops,</div><div class='add'>+#endif</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= sdhci_probe,</div><div class='ctx'> 	.remove		= __devexit_p(sdhci_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sdhci_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sdhci_driver);</div><div class='del'>-}</div><div class='del'>-module_init(sdhci_init);</div><div class='del'>-</div><div class='del'>-static void __exit sdhci_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sdhci_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(sdhci_exit);</div><div class='add'>+module_platform_driver(sdhci_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("SPEAr Secure Digital Host Controller Interface driver");</div><div class='ctx'> MODULE_AUTHOR("Viresh Kumar &lt;viresh.kumar@st.com&gt;");</div><div class='head'>diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c<br/>index e2e18d3f949c..78a36eba4df0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-tegra.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci-tegra.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci-tegra.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/sdhci-tegra.c</a></div><div class='hunk'>@@ -324,17 +324,7 @@ static struct platform_driver sdhci_tegra_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(sdhci_tegra_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sdhci_tegra_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sdhci_tegra_driver);</div><div class='del'>-}</div><div class='del'>-module_init(sdhci_tegra_init);</div><div class='del'>-</div><div class='del'>-static void __exit sdhci_tegra_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sdhci_tegra_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(sdhci_tegra_exit);</div><div class='add'>+module_platform_driver(sdhci_tegra_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("SDHCI driver for Tegra");</div><div class='ctx'> MODULE_AUTHOR(" Google, Inc.");</div><div class='head'>diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c<br/>index 19ed580f2cab..8d66706824a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/sdhci.c</a></div><div class='hunk'>@@ -49,7 +49,7 @@ static void sdhci_finish_data(struct sdhci_host *);</div><div class='ctx'> </div><div class='ctx'> static void sdhci_send_command(struct sdhci_host *, struct mmc_command *);</div><div class='ctx'> static void sdhci_finish_command(struct sdhci_host *);</div><div class='del'>-static int sdhci_execute_tuning(struct mmc_host *mmc);</div><div class='add'>+static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode);</div><div class='ctx'> static void sdhci_tuning_timer(unsigned long data);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_RUNTIME</div><div class='hunk'>@@ -146,10 +146,8 @@ static void sdhci_set_card_detection(struct sdhci_host *host, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	u32 present, irqs;</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;quirks &amp; SDHCI_QUIRK_BROKEN_CARD_DETECTION)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (host-&gt;quirks2 &amp; SDHCI_QUIRK2_OWN_CARD_DETECTION)</div><div class='add'>+	if ((host-&gt;quirks &amp; SDHCI_QUIRK_BROKEN_CARD_DETECTION) ||</div><div class='add'>+	    !mmc_card_is_removable(host-&gt;mmc))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	present = sdhci_readl(host, SDHCI_PRESENT_STATE) &amp;</div><div class='hunk'>@@ -214,6 +212,11 @@ static void sdhci_reset(struct sdhci_host *host, u8 mask)</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;quirks &amp; SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET)</div><div class='ctx'> 		sdhci_clear_set_irqs(host, SDHCI_INT_ALL_MASK, ier);</div><div class='add'>+</div><div class='add'>+	if (host-&gt;flags &amp; (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) {</div><div class='add'>+		if ((host-&gt;ops-&gt;enable_dma) &amp;&amp; (mask &amp; SDHCI_RESET_ALL))</div><div class='add'>+			host-&gt;ops-&gt;enable_dma(host);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios);</div><div class='hunk'>@@ -423,12 +426,12 @@ static void sdhci_transfer_pio(struct sdhci_host *host)</div><div class='ctx'> static char *sdhci_kmap_atomic(struct scatterlist *sg, unsigned long *flags)</div><div class='ctx'> {</div><div class='ctx'> 	local_irq_save(*flags);</div><div class='del'>-	return kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg-&gt;offset;</div><div class='add'>+	return kmap_atomic(sg_page(sg)) + sg-&gt;offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sdhci_kunmap_atomic(void *buffer, unsigned long *flags)</div><div class='ctx'> {</div><div class='del'>-	kunmap_atomic(buffer, KM_BIO_SRC_IRQ);</div><div class='add'>+	kunmap_atomic(buffer);</div><div class='ctx'> 	local_irq_restore(*flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1016,7 +1019,8 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)</div><div class='ctx'> 		flags |= SDHCI_CMD_INDEX;</div><div class='ctx'> </div><div class='ctx'> 	/* CMD19 is special in that the Data Present Select should be set */</div><div class='del'>-	if (cmd-&gt;data || (cmd-&gt;opcode == MMC_SEND_TUNING_BLOCK))</div><div class='add'>+	if (cmd-&gt;data || cmd-&gt;opcode == MMC_SEND_TUNING_BLOCK ||</div><div class='add'>+	    cmd-&gt;opcode == MMC_SEND_TUNING_BLOCK_HS200)</div><div class='ctx'> 		flags |= SDHCI_CMD_DATA;</div><div class='ctx'> </div><div class='ctx'> 	sdhci_writew(host, SDHCI_MAKE_CMD(cmd-&gt;opcode, flags), SDHCI_COMMAND);</div><div class='hunk'>@@ -1066,12 +1070,15 @@ static void sdhci_finish_command(struct sdhci_host *host)</div><div class='ctx'> static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)</div><div class='ctx'> {</div><div class='ctx'> 	int div = 0; /* Initialized for compiler warning */</div><div class='add'>+	int real_div = div, clk_mul = 1;</div><div class='ctx'> 	u16 clk = 0;</div><div class='ctx'> 	unsigned long timeout;</div><div class='ctx'> </div><div class='del'>-	if (clock == host-&gt;clock)</div><div class='add'>+	if (clock &amp;&amp; clock == host-&gt;clock)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	host-&gt;mmc-&gt;actual_clock = 0;</div><div class='add'>+</div><div class='ctx'> 	if (host-&gt;ops-&gt;set_clock) {</div><div class='ctx'> 		host-&gt;ops-&gt;set_clock(host, clock);</div><div class='ctx'> 		if (host-&gt;quirks &amp; SDHCI_QUIRK_NONSTANDARD_CLOCK)</div><div class='hunk'>@@ -1109,6 +1116,8 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)</div><div class='ctx'> 				 * Control register.</div><div class='ctx'> 				 */</div><div class='ctx'> 				clk = SDHCI_PROG_CLOCK_MODE;</div><div class='add'>+				real_div = div;</div><div class='add'>+				clk_mul = host-&gt;clk_mul;</div><div class='ctx'> 				div--;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1122,6 +1131,7 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)</div><div class='ctx'> 						break;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='add'>+			real_div = div;</div><div class='ctx'> 			div &gt;&gt;= 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1130,9 +1140,13 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)</div><div class='ctx'> 			if ((host-&gt;max_clk / div) &lt;= clock)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='add'>+		real_div = div;</div><div class='ctx'> 		div &gt;&gt;= 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (real_div)</div><div class='add'>+		host-&gt;mmc-&gt;actual_clock = (host-&gt;max_clk * clk_mul) / real_div;</div><div class='add'>+</div><div class='ctx'> 	clk |= (div &amp; SDHCI_DIV_MASK) &lt;&lt; SDHCI_DIVIDER_SHIFT;</div><div class='ctx'> 	clk |= ((div &amp; SDHCI_DIV_HI_MASK) &gt;&gt; SDHCI_DIV_MASK_LEN)</div><div class='ctx'> 		&lt;&lt; SDHCI_DIVIDER_HI_SHIFT;</div><div class='hunk'>@@ -1160,7 +1174,7 @@ out:</div><div class='ctx'> 	host-&gt;clock = clock;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sdhci_set_power(struct sdhci_host *host, unsigned short power)</div><div class='add'>+static int sdhci_set_power(struct sdhci_host *host, unsigned short power)</div><div class='ctx'> {</div><div class='ctx'> 	u8 pwr = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1183,13 +1197,13 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned short power)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;pwr == pwr)</div><div class='del'>-		return;</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;pwr = pwr;</div><div class='ctx'> </div><div class='ctx'> 	if (pwr == 0) {</div><div class='ctx'> 		sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1216,6 +1230,8 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned short power)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (host-&gt;quirks &amp; SDHCI_QUIRK_DELAY_AFTER_POWER)</div><div class='ctx'> 		mdelay(10);</div><div class='add'>+</div><div class='add'>+	return power;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************\</div><div class='hunk'>@@ -1277,7 +1293,7 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='ctx'> 		if ((host-&gt;flags &amp; SDHCI_NEEDS_RETUNING) &amp;&amp;</div><div class='ctx'> 		    !(present_state &amp; (SDHCI_DOING_WRITE | SDHCI_DOING_READ))) {</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='del'>-			sdhci_execute_tuning(mmc);</div><div class='add'>+			sdhci_execute_tuning(mmc, mrq-&gt;cmd-&gt;opcode);</div><div class='ctx'> 			spin_lock_irqsave(&amp;host-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 			/* Restore original mmc_request structure */</div><div class='hunk'>@@ -1297,12 +1313,17 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='ctx'> static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	int vdd_bit = -1;</div><div class='ctx'> 	u8 ctrl;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;host-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;flags &amp; SDHCI_DEVICE_DEAD)</div><div class='del'>-		goto out;</div><div class='add'>+	if (host-&gt;flags &amp; SDHCI_DEVICE_DEAD) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='add'>+		if (host-&gt;vmmc &amp;&amp; ios-&gt;power_mode == MMC_POWER_OFF)</div><div class='add'>+			mmc_regulator_set_ocr(host-&gt;mmc, host-&gt;vmmc, 0);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Reset the chip on each power off.</div><div class='hunk'>@@ -1316,9 +1337,15 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)</div><div class='ctx'> 	sdhci_set_clock(host, ios-&gt;clock);</div><div class='ctx'> </div><div class='ctx'> 	if (ios-&gt;power_mode == MMC_POWER_OFF)</div><div class='del'>-		sdhci_set_power(host, -1);</div><div class='add'>+		vdd_bit = sdhci_set_power(host, -1);</div><div class='ctx'> 	else</div><div class='del'>-		sdhci_set_power(host, ios-&gt;vdd);</div><div class='add'>+		vdd_bit = sdhci_set_power(host, ios-&gt;vdd);</div><div class='add'>+</div><div class='add'>+	if (host-&gt;vmmc &amp;&amp; vdd_bit != -1) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='add'>+		mmc_regulator_set_ocr(host-&gt;mmc, host-&gt;vmmc, vdd_bit);</div><div class='add'>+		spin_lock_irqsave(&amp;host-&gt;lock, flags);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;ops-&gt;platform_send_init_74_clocks)</div><div class='ctx'> 		host-&gt;ops-&gt;platform_send_init_74_clocks(host, ios-&gt;power_mode);</div><div class='hunk'>@@ -1361,11 +1388,11 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)</div><div class='ctx'> 		unsigned int clock;</div><div class='ctx'> </div><div class='ctx'> 		/* In case of UHS-I modes, set High Speed Enable */</div><div class='del'>-		if ((ios-&gt;timing == MMC_TIMING_UHS_SDR50) ||</div><div class='add'>+		if ((ios-&gt;timing == MMC_TIMING_MMC_HS200) ||</div><div class='add'>+		    (ios-&gt;timing == MMC_TIMING_UHS_SDR50) ||</div><div class='ctx'> 		    (ios-&gt;timing == MMC_TIMING_UHS_SDR104) ||</div><div class='ctx'> 		    (ios-&gt;timing == MMC_TIMING_UHS_DDR50) ||</div><div class='del'>-		    (ios-&gt;timing == MMC_TIMING_UHS_SDR25) ||</div><div class='del'>-		    (ios-&gt;timing == MMC_TIMING_UHS_SDR12))</div><div class='add'>+		    (ios-&gt;timing == MMC_TIMING_UHS_SDR25))</div><div class='ctx'> 			ctrl |= SDHCI_CTRL_HISPD;</div><div class='ctx'> </div><div class='ctx'> 		ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);</div><div class='hunk'>@@ -1415,7 +1442,9 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)</div><div class='ctx'> 			ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);</div><div class='ctx'> 			/* Select Bus Speed Mode for host */</div><div class='ctx'> 			ctrl_2 &amp;= ~SDHCI_CTRL_UHS_MASK;</div><div class='del'>-			if (ios-&gt;timing == MMC_TIMING_UHS_SDR12)</div><div class='add'>+			if (ios-&gt;timing == MMC_TIMING_MMC_HS200)</div><div class='add'>+				ctrl_2 |= SDHCI_CTRL_HS_SDR200;</div><div class='add'>+			else if (ios-&gt;timing == MMC_TIMING_UHS_SDR12)</div><div class='ctx'> 				ctrl_2 |= SDHCI_CTRL_UHS_SDR12;</div><div class='ctx'> 			else if (ios-&gt;timing == MMC_TIMING_UHS_SDR25)</div><div class='ctx'> 				ctrl_2 |= SDHCI_CTRL_UHS_SDR25;</div><div class='hunk'>@@ -1443,7 +1472,6 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)</div><div class='ctx'> 	if(host-&gt;quirks &amp; SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS)</div><div class='ctx'> 		sdhci_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	mmiowb();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -1663,7 +1691,7 @@ static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sdhci_execute_tuning(struct mmc_host *mmc)</div><div class='add'>+static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdhci_host *host;</div><div class='ctx'> 	u16 ctrl;</div><div class='hunk'>@@ -1671,6 +1699,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc)</div><div class='ctx'> 	int tuning_loop_counter = MAX_TUNING_LOOP;</div><div class='ctx'> 	unsigned long timeout;</div><div class='ctx'> 	int err = 0;</div><div class='add'>+	bool requires_tuning_nonuhs = false;</div><div class='ctx'> </div><div class='ctx'> 	host = mmc_priv(mmc);</div><div class='ctx'> </div><div class='hunk'>@@ -1681,13 +1710,19 @@ static int sdhci_execute_tuning(struct mmc_host *mmc)</div><div class='ctx'> 	ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Host Controller needs tuning only in case of SDR104 mode</div><div class='del'>-	 * and for SDR50 mode when Use Tuning for SDR50 is set in</div><div class='add'>+	 * The Host Controller needs tuning only in case of SDR104 mode</div><div class='add'>+	 * and for SDR50 mode when Use Tuning for SDR50 is set in the</div><div class='ctx'> 	 * Capabilities register.</div><div class='add'>+	 * If the Host Controller supports the HS200 mode then the</div><div class='add'>+	 * tuning function has to be executed.</div><div class='ctx'> 	 */</div><div class='add'>+	if (((ctrl &amp; SDHCI_CTRL_UHS_MASK) == SDHCI_CTRL_UHS_SDR50) &amp;&amp;</div><div class='add'>+	    (host-&gt;flags &amp; SDHCI_SDR50_NEEDS_TUNING ||</div><div class='add'>+	     host-&gt;flags &amp; SDHCI_HS200_NEEDS_TUNING))</div><div class='add'>+		requires_tuning_nonuhs = true;</div><div class='add'>+</div><div class='ctx'> 	if (((ctrl &amp; SDHCI_CTRL_UHS_MASK) == SDHCI_CTRL_UHS_SDR104) ||</div><div class='del'>-	    (((ctrl &amp; SDHCI_CTRL_UHS_MASK) == SDHCI_CTRL_UHS_SDR50) &amp;&amp;</div><div class='del'>-	    (host-&gt;flags &amp; SDHCI_SDR50_NEEDS_TUNING)))</div><div class='add'>+	    requires_tuning_nonuhs)</div><div class='ctx'> 		ctrl |= SDHCI_CTRL_EXEC_TUNING;</div><div class='ctx'> 	else {</div><div class='ctx'> 		spin_unlock(&amp;host-&gt;lock);</div><div class='hunk'>@@ -1723,7 +1758,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc)</div><div class='ctx'> 		if (!tuning_loop_counter &amp;&amp; !timeout)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		cmd.opcode = MMC_SEND_TUNING_BLOCK;</div><div class='add'>+		cmd.opcode = opcode;</div><div class='ctx'> 		cmd.arg = 0;</div><div class='ctx'> 		cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;</div><div class='ctx'> 		cmd.retries = 0;</div><div class='hunk'>@@ -1738,7 +1773,17 @@ static int sdhci_execute_tuning(struct mmc_host *mmc)</div><div class='ctx'> 		 * block to the Host Controller. So we set the block size</div><div class='ctx'> 		 * to 64 here.</div><div class='ctx'> 		 */</div><div class='del'>-		sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 64), SDHCI_BLOCK_SIZE);</div><div class='add'>+		if (cmd.opcode == MMC_SEND_TUNING_BLOCK_HS200) {</div><div class='add'>+			if (mmc-&gt;ios.bus_width == MMC_BUS_WIDTH_8)</div><div class='add'>+				sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 128),</div><div class='add'>+					     SDHCI_BLOCK_SIZE);</div><div class='add'>+			else if (mmc-&gt;ios.bus_width == MMC_BUS_WIDTH_4)</div><div class='add'>+				sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 64),</div><div class='add'>+					     SDHCI_BLOCK_SIZE);</div><div class='add'>+		} else {</div><div class='add'>+			sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 64),</div><div class='add'>+				     SDHCI_BLOCK_SIZE);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The tuning block is sent by the card to the host controller.</div><div class='hunk'>@@ -2121,12 +2166,14 @@ static void sdhci_show_adma_error(struct sdhci_host *host) { }</div><div class='ctx'> </div><div class='ctx'> static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)</div><div class='ctx'> {</div><div class='add'>+	u32 command;</div><div class='ctx'> 	BUG_ON(intmask == 0);</div><div class='ctx'> </div><div class='ctx'> 	/* CMD19 generates _only_ Buffer Read Ready interrupt */</div><div class='ctx'> 	if (intmask &amp; SDHCI_INT_DATA_AVAIL) {</div><div class='del'>-		if (SDHCI_GET_CMD(sdhci_readw(host, SDHCI_COMMAND)) ==</div><div class='del'>-		    MMC_SEND_TUNING_BLOCK) {</div><div class='add'>+		command = SDHCI_GET_CMD(sdhci_readw(host, SDHCI_COMMAND));</div><div class='add'>+		if (command == MMC_SEND_TUNING_BLOCK ||</div><div class='add'>+		    command == MMC_SEND_TUNING_BLOCK_HS200) {</div><div class='ctx'> 			host-&gt;tuning_done = 1;</div><div class='ctx'> 			wake_up(&amp;host-&gt;buf_ready_int);</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -2330,26 +2377,33 @@ out:</div><div class='ctx'> int sdhci_suspend_host(struct sdhci_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	bool has_tuning_timer;</div><div class='ctx'> </div><div class='ctx'> 	sdhci_disable_card_detection(host);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable tuning since we are suspending */</div><div class='del'>-	if (host-&gt;version &gt;= SDHCI_SPEC_300 &amp;&amp; host-&gt;tuning_count &amp;&amp;</div><div class='del'>-	    host-&gt;tuning_mode == SDHCI_TUNING_MODE_1) {</div><div class='add'>+	has_tuning_timer = host-&gt;version &gt;= SDHCI_SPEC_300 &amp;&amp;</div><div class='add'>+		host-&gt;tuning_count &amp;&amp; host-&gt;tuning_mode == SDHCI_TUNING_MODE_1;</div><div class='add'>+	if (has_tuning_timer) {</div><div class='add'>+		del_timer_sync(&amp;host-&gt;tuning_timer);</div><div class='ctx'> 		host-&gt;flags &amp;= ~SDHCI_NEEDS_RETUNING;</div><div class='del'>-		mod_timer(&amp;host-&gt;tuning_timer, jiffies +</div><div class='del'>-			host-&gt;tuning_count * HZ);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = mmc_suspend_host(host-&gt;mmc);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (has_tuning_timer) {</div><div class='add'>+			host-&gt;flags |= SDHCI_NEEDS_RETUNING;</div><div class='add'>+			mod_timer(&amp;host-&gt;tuning_timer, jiffies +</div><div class='add'>+					host-&gt;tuning_count * HZ);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sdhci_enable_card_detection(host);</div><div class='add'>+</div><div class='ctx'> 		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	free_irq(host-&gt;irq, host);</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;vmmc)</div><div class='del'>-		ret = regulator_disable(host-&gt;vmmc);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2359,12 +2413,6 @@ int sdhci_resume_host(struct sdhci_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;vmmc) {</div><div class='del'>-		int ret = regulator_enable(host-&gt;vmmc);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (host-&gt;flags &amp; (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) {</div><div class='ctx'> 		if (host-&gt;ops-&gt;enable_dma)</div><div class='ctx'> 			host-&gt;ops-&gt;enable_dma(host);</div><div class='hunk'>@@ -2727,10 +2775,14 @@ int sdhci_add_host(struct sdhci_host *host)</div><div class='ctx'> 	if (caps[1] &amp; SDHCI_SUPPORT_DDR50)</div><div class='ctx'> 		mmc-&gt;caps |= MMC_CAP_UHS_DDR50;</div><div class='ctx'> </div><div class='del'>-	/* Does the host needs tuning for SDR50? */</div><div class='add'>+	/* Does the host need tuning for SDR50? */</div><div class='ctx'> 	if (caps[1] &amp; SDHCI_USE_SDR50_TUNING)</div><div class='ctx'> 		host-&gt;flags |= SDHCI_SDR50_NEEDS_TUNING;</div><div class='ctx'> </div><div class='add'>+	/* Does the host need tuning for HS200? */</div><div class='add'>+	if (mmc-&gt;caps2 &amp; MMC_CAP2_HS200)</div><div class='add'>+		host-&gt;flags |= SDHCI_HS200_NEEDS_TUNING;</div><div class='add'>+</div><div class='ctx'> 	/* Driver Type(s) (A, C, D) supported by the host */</div><div class='ctx'> 	if (caps[1] &amp; SDHCI_DRIVER_TYPE_A)</div><div class='ctx'> 		mmc-&gt;caps |= MMC_CAP_DRIVER_TYPE_A;</div><div class='hunk'>@@ -2926,8 +2978,6 @@ int sdhci_add_host(struct sdhci_host *host)</div><div class='ctx'> 	if (IS_ERR(host-&gt;vmmc)) {</div><div class='ctx'> 		pr_info("%s: no vmmc regulator found\n", mmc_hostname(mmc));</div><div class='ctx'> 		host-&gt;vmmc = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		regulator_enable(host-&gt;vmmc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sdhci_init(host, 0);</div><div class='hunk'>@@ -3016,10 +3066,8 @@ void sdhci_remove_host(struct sdhci_host *host, int dead)</div><div class='ctx'> 	tasklet_kill(&amp;host-&gt;card_tasklet);</div><div class='ctx'> 	tasklet_kill(&amp;host-&gt;finish_tasklet);</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;vmmc) {</div><div class='del'>-		regulator_disable(host-&gt;vmmc);</div><div class='add'>+	if (host-&gt;vmmc)</div><div class='ctx'> 		regulator_put(host-&gt;vmmc);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(host-&gt;adma_desc);</div><div class='ctx'> 	kfree(host-&gt;align_buffer);</div><div class='head'>diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h<br/>index a04d4d0c6fd2..ad265b96b75b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sdhci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sdhci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/sdhci.h</a></div><div class='hunk'>@@ -158,6 +158,7 @@</div><div class='ctx'> #define   SDHCI_CTRL_UHS_SDR50		0x0002</div><div class='ctx'> #define   SDHCI_CTRL_UHS_SDR104		0x0003</div><div class='ctx'> #define   SDHCI_CTRL_UHS_DDR50		0x0004</div><div class='add'>+#define   SDHCI_CTRL_HS_SDR200		0x0005 /* reserved value in SDIO spec */</div><div class='ctx'> #define  SDHCI_CTRL_VDD_180		0x0008</div><div class='ctx'> #define  SDHCI_CTRL_DRV_TYPE_MASK	0x0030</div><div class='ctx'> #define   SDHCI_CTRL_DRV_TYPE_B		0x0000</div><div class='head'>diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c<br/>index d5505f3fe2a1..f5d8b53be333 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sh_mmcif.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sh_mmcif.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sh_mmcif.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/sh_mmcif.c</a></div><div class='hunk'>@@ -16,6 +16,33 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The MMCIF driver is now processing MMC requests asynchronously, according</div><div class='add'>+ * to the Linux MMC API requirement.</div><div class='add'>+ *</div><div class='add'>+ * The MMCIF driver processes MMC requests in up to 3 stages: command, optional</div><div class='add'>+ * data, and optional stop. To achieve asynchronous processing each of these</div><div class='add'>+ * stages is split into two halves: a top and a bottom half. The top half</div><div class='add'>+ * initialises the hardware, installs a timeout handler to handle completion</div><div class='add'>+ * timeouts, and returns. In case of the command stage this immediately returns</div><div class='add'>+ * control to the caller, leaving all further processing to run asynchronously.</div><div class='add'>+ * All further request processing is performed by the bottom halves.</div><div class='add'>+ *</div><div class='add'>+ * The bottom half further consists of a "hard" IRQ handler, an IRQ handler</div><div class='add'>+ * thread, a DMA completion callback, if DMA is used, a timeout work, and</div><div class='add'>+ * request- and stage-specific handler methods.</div><div class='add'>+ *</div><div class='add'>+ * Each bottom half run begins with either a hardware interrupt, a DMA callback</div><div class='add'>+ * invocation, or a timeout work run. In case of an error or a successful</div><div class='add'>+ * processing completion, the MMC core is informed and the request processing is</div><div class='add'>+ * finished. In case processing has to continue, i.e., if data has to be read</div><div class='add'>+ * from or written to the card, or if a stop command has to be sent, the next</div><div class='add'>+ * top half is called, which performs the necessary hardware handling and</div><div class='add'>+ * reschedules the timeout work. This returns the driver state machine into the</div><div class='add'>+ * bottom half waiting state.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -123,6 +150,11 @@</div><div class='ctx'> #define MASK_MRBSYTO		(1 &lt;&lt; 1)</div><div class='ctx'> #define MASK_MRSPTO		(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='add'>+#define MASK_START_CMD		(MASK_MCMDVIO | MASK_MBUFVIO | MASK_MWDATERR | \</div><div class='add'>+				 MASK_MRDATERR | MASK_MRIDXERR | MASK_MRSPERR | \</div><div class='add'>+				 MASK_MCCSTO | MASK_MCRCSTO | MASK_MWDATTO | \</div><div class='add'>+				 MASK_MRDATTO | MASK_MRBSYTO | MASK_MRSPTO)</div><div class='add'>+</div><div class='ctx'> /* CE_HOST_STS1 */</div><div class='ctx'> #define STS1_CMDSEQ		(1 &lt;&lt; 31)</div><div class='ctx'> </div><div class='hunk'>@@ -162,9 +194,21 @@ enum mmcif_state {</div><div class='ctx'> 	STATE_IOS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum mmcif_wait_for {</div><div class='add'>+	MMCIF_WAIT_FOR_REQUEST,</div><div class='add'>+	MMCIF_WAIT_FOR_CMD,</div><div class='add'>+	MMCIF_WAIT_FOR_MREAD,</div><div class='add'>+	MMCIF_WAIT_FOR_MWRITE,</div><div class='add'>+	MMCIF_WAIT_FOR_READ,</div><div class='add'>+	MMCIF_WAIT_FOR_WRITE,</div><div class='add'>+	MMCIF_WAIT_FOR_READ_END,</div><div class='add'>+	MMCIF_WAIT_FOR_WRITE_END,</div><div class='add'>+	MMCIF_WAIT_FOR_STOP,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct sh_mmcif_host {</div><div class='ctx'> 	struct mmc_host *mmc;</div><div class='del'>-	struct mmc_data *data;</div><div class='add'>+	struct mmc_request *mrq;</div><div class='ctx'> 	struct platform_device *pd;</div><div class='ctx'> 	struct sh_dmae_slave dma_slave_tx;</div><div class='ctx'> 	struct sh_dmae_slave dma_slave_rx;</div><div class='hunk'>@@ -172,11 +216,17 @@ struct sh_mmcif_host {</div><div class='ctx'> 	unsigned int clk;</div><div class='ctx'> 	int bus_width;</div><div class='ctx'> 	bool sd_error;</div><div class='add'>+	bool dying;</div><div class='ctx'> 	long timeout;</div><div class='ctx'> 	void __iomem *addr;</div><div class='del'>-	struct completion intr_wait;</div><div class='add'>+	u32 *pio_ptr;</div><div class='add'>+	spinlock_t lock;		/* protect sh_mmcif_host::state */</div><div class='ctx'> 	enum mmcif_state state;</div><div class='del'>-	spinlock_t lock;</div><div class='add'>+	enum mmcif_wait_for wait_for;</div><div class='add'>+	struct delayed_work timeout_work;</div><div class='add'>+	size_t blocksize;</div><div class='add'>+	int sg_idx;</div><div class='add'>+	int sg_blkidx;</div><div class='ctx'> 	bool power;</div><div class='ctx'> 	bool card_present;</div><div class='ctx'> </div><div class='hunk'>@@ -202,19 +252,21 @@ static inline void sh_mmcif_bitclr(struct sh_mmcif_host *host,</div><div class='ctx'> static void mmcif_dma_complete(void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct sh_mmcif_host *host = arg;</div><div class='add'>+	struct mmc_data *data = host-&gt;mrq-&gt;data;</div><div class='add'>+</div><div class='ctx'> 	dev_dbg(&amp;host-&gt;pd-&gt;dev, "Command completed\n");</div><div class='ctx'> </div><div class='del'>-	if (WARN(!host-&gt;data, "%s: NULL data in DMA completion!\n",</div><div class='add'>+	if (WARN(!data, "%s: NULL data in DMA completion!\n",</div><div class='ctx'> 		 dev_name(&amp;host-&gt;pd-&gt;dev)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;data-&gt;flags &amp; MMC_DATA_READ)</div><div class='add'>+	if (data-&gt;flags &amp; MMC_DATA_READ)</div><div class='ctx'> 		dma_unmap_sg(host-&gt;chan_rx-&gt;device-&gt;dev,</div><div class='del'>-			     host-&gt;data-&gt;sg, host-&gt;data-&gt;sg_len,</div><div class='add'>+			     data-&gt;sg, data-&gt;sg_len,</div><div class='ctx'> 			     DMA_FROM_DEVICE);</div><div class='ctx'> 	else</div><div class='ctx'> 		dma_unmap_sg(host-&gt;chan_tx-&gt;device-&gt;dev,</div><div class='del'>-			     host-&gt;data-&gt;sg, host-&gt;data-&gt;sg_len,</div><div class='add'>+			     data-&gt;sg, data-&gt;sg_len,</div><div class='ctx'> 			     DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	complete(&amp;host-&gt;dma_complete);</div><div class='hunk'>@@ -222,18 +274,19 @@ static void mmcif_dma_complete(void *arg)</div><div class='ctx'> </div><div class='ctx'> static void sh_mmcif_start_dma_rx(struct sh_mmcif_host *host)</div><div class='ctx'> {</div><div class='del'>-	struct scatterlist *sg = host-&gt;data-&gt;sg;</div><div class='add'>+	struct mmc_data *data = host-&gt;mrq-&gt;data;</div><div class='add'>+	struct scatterlist *sg = data-&gt;sg;</div><div class='ctx'> 	struct dma_async_tx_descriptor *desc = NULL;</div><div class='ctx'> 	struct dma_chan *chan = host-&gt;chan_rx;</div><div class='ctx'> 	dma_cookie_t cookie = -EINVAL;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = dma_map_sg(chan-&gt;device-&gt;dev, sg, host-&gt;data-&gt;sg_len,</div><div class='add'>+	ret = dma_map_sg(chan-&gt;device-&gt;dev, sg, data-&gt;sg_len,</div><div class='ctx'> 			 DMA_FROM_DEVICE);</div><div class='ctx'> 	if (ret &gt; 0) {</div><div class='ctx'> 		host-&gt;dma_active = true;</div><div class='ctx'> 		desc = chan-&gt;device-&gt;device_prep_slave_sg(chan, sg, ret,</div><div class='del'>-			DMA_FROM_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);</div><div class='add'>+			DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (desc) {</div><div class='hunk'>@@ -244,7 +297,7 @@ static void sh_mmcif_start_dma_rx(struct sh_mmcif_host *host)</div><div class='ctx'> 		dma_async_issue_pending(chan);</div><div class='ctx'> 	}</div><div class='ctx'> 	dev_dbg(&amp;host-&gt;pd-&gt;dev, "%s(): mapped %d -&gt; %d, cookie %d\n",</div><div class='del'>-		__func__, host-&gt;data-&gt;sg_len, ret, cookie);</div><div class='add'>+		__func__, data-&gt;sg_len, ret, cookie);</div><div class='ctx'> </div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		/* DMA failed, fall back to PIO */</div><div class='hunk'>@@ -265,23 +318,24 @@ static void sh_mmcif_start_dma_rx(struct sh_mmcif_host *host)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;host-&gt;pd-&gt;dev, "%s(): desc %p, cookie %d, sg[%d]\n", __func__,</div><div class='del'>-		desc, cookie, host-&gt;data-&gt;sg_len);</div><div class='add'>+		desc, cookie, data-&gt;sg_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sh_mmcif_start_dma_tx(struct sh_mmcif_host *host)</div><div class='ctx'> {</div><div class='del'>-	struct scatterlist *sg = host-&gt;data-&gt;sg;</div><div class='add'>+	struct mmc_data *data = host-&gt;mrq-&gt;data;</div><div class='add'>+	struct scatterlist *sg = data-&gt;sg;</div><div class='ctx'> 	struct dma_async_tx_descriptor *desc = NULL;</div><div class='ctx'> 	struct dma_chan *chan = host-&gt;chan_tx;</div><div class='ctx'> 	dma_cookie_t cookie = -EINVAL;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = dma_map_sg(chan-&gt;device-&gt;dev, sg, host-&gt;data-&gt;sg_len,</div><div class='add'>+	ret = dma_map_sg(chan-&gt;device-&gt;dev, sg, data-&gt;sg_len,</div><div class='ctx'> 			 DMA_TO_DEVICE);</div><div class='ctx'> 	if (ret &gt; 0) {</div><div class='ctx'> 		host-&gt;dma_active = true;</div><div class='ctx'> 		desc = chan-&gt;device-&gt;device_prep_slave_sg(chan, sg, ret,</div><div class='del'>-			DMA_TO_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);</div><div class='add'>+			DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (desc) {</div><div class='hunk'>@@ -292,7 +346,7 @@ static void sh_mmcif_start_dma_tx(struct sh_mmcif_host *host)</div><div class='ctx'> 		dma_async_issue_pending(chan);</div><div class='ctx'> 	}</div><div class='ctx'> 	dev_dbg(&amp;host-&gt;pd-&gt;dev, "%s(): mapped %d -&gt; %d, cookie %d\n",</div><div class='del'>-		__func__, host-&gt;data-&gt;sg_len, ret, cookie);</div><div class='add'>+		__func__, data-&gt;sg_len, ret, cookie);</div><div class='ctx'> </div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		/* DMA failed, fall back to PIO */</div><div class='hunk'>@@ -399,7 +453,7 @@ static void sh_mmcif_clock_control(struct sh_mmcif_host *host, unsigned int clk)</div><div class='ctx'> 		sh_mmcif_bitset(host, MMCIF_CE_CLK_CTRL, CLK_SUP_PCLK);</div><div class='ctx'> 	else</div><div class='ctx'> 		sh_mmcif_bitset(host, MMCIF_CE_CLK_CTRL, CLK_CLEAR &amp;</div><div class='del'>-			(ilog2(__rounddown_pow_of_two(host-&gt;clk / clk)) &lt;&lt; 16));</div><div class='add'>+				((fls(host-&gt;clk / clk) - 1) &lt;&lt; 16));</div><div class='ctx'> </div><div class='ctx'> 	sh_mmcif_bitset(host, MMCIF_CE_CLK_CTRL, CLK_ENABLE);</div><div class='ctx'> }</div><div class='hunk'>@@ -421,7 +475,7 @@ static void sh_mmcif_sync_reset(struct sh_mmcif_host *host)</div><div class='ctx'> static int sh_mmcif_error_manage(struct sh_mmcif_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	u32 state1, state2;</div><div class='del'>-	int ret, timeout = 10000000;</div><div class='add'>+	int ret, timeout;</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;sd_error = false;</div><div class='ctx'> </div><div class='hunk'>@@ -433,155 +487,212 @@ static int sh_mmcif_error_manage(struct sh_mmcif_host *host)</div><div class='ctx'> 	if (state1 &amp; STS1_CMDSEQ) {</div><div class='ctx'> 		sh_mmcif_bitset(host, MMCIF_CE_CMD_CTRL, CMD_CTRL_BREAK);</div><div class='ctx'> 		sh_mmcif_bitset(host, MMCIF_CE_CMD_CTRL, ~CMD_CTRL_BREAK);</div><div class='del'>-		while (1) {</div><div class='del'>-			timeout--;</div><div class='del'>-			if (timeout &lt; 0) {</div><div class='del'>-				dev_err(&amp;host-&gt;pd-&gt;dev,</div><div class='del'>-					"Forceed end of command sequence timeout err\n");</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='add'>+		for (timeout = 10000000; timeout; timeout--) {</div><div class='ctx'> 			if (!(sh_mmcif_readl(host-&gt;addr, MMCIF_CE_HOST_STS1)</div><div class='del'>-								&amp; STS1_CMDSEQ))</div><div class='add'>+			      &amp; STS1_CMDSEQ))</div><div class='ctx'> 				break;</div><div class='ctx'> 			mdelay(1);</div><div class='ctx'> 		}</div><div class='add'>+		if (!timeout) {</div><div class='add'>+			dev_err(&amp;host-&gt;pd-&gt;dev,</div><div class='add'>+				"Forced end of command sequence timeout err\n");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='ctx'> 		sh_mmcif_sync_reset(host);</div><div class='ctx'> 		dev_dbg(&amp;host-&gt;pd-&gt;dev, "Forced end of command sequence\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (state2 &amp; STS2_CRC_ERR) {</div><div class='del'>-		dev_dbg(&amp;host-&gt;pd-&gt;dev, ": Happened CRC error\n");</div><div class='add'>+		dev_dbg(&amp;host-&gt;pd-&gt;dev, ": CRC error\n");</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 	} else if (state2 &amp; STS2_TIMEOUT_ERR) {</div><div class='del'>-		dev_dbg(&amp;host-&gt;pd-&gt;dev, ": Happened Timeout error\n");</div><div class='add'>+		dev_dbg(&amp;host-&gt;pd-&gt;dev, ": Timeout\n");</div><div class='ctx'> 		ret = -ETIMEDOUT;</div><div class='ctx'> 	} else {</div><div class='del'>-		dev_dbg(&amp;host-&gt;pd-&gt;dev, ": Happened End/Index error\n");</div><div class='add'>+		dev_dbg(&amp;host-&gt;pd-&gt;dev, ": End/Index error\n");</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sh_mmcif_single_read(struct sh_mmcif_host *host,</div><div class='del'>-					struct mmc_request *mrq)</div><div class='add'>+static bool sh_mmcif_next_block(struct sh_mmcif_host *host, u32 *p)</div><div class='ctx'> {</div><div class='del'>-	struct mmc_data *data = mrq-&gt;data;</div><div class='del'>-	long time;</div><div class='del'>-	u32 blocksize, i, *p = sg_virt(data-&gt;sg);</div><div class='add'>+	struct mmc_data *data = host-&gt;mrq-&gt;data;</div><div class='add'>+</div><div class='add'>+	host-&gt;sg_blkidx += host-&gt;blocksize;</div><div class='add'>+</div><div class='add'>+	/* data-&gt;sg-&gt;length must be a multiple of host-&gt;blocksize? */</div><div class='add'>+	BUG_ON(host-&gt;sg_blkidx &gt; data-&gt;sg-&gt;length);</div><div class='add'>+</div><div class='add'>+	if (host-&gt;sg_blkidx == data-&gt;sg-&gt;length) {</div><div class='add'>+		host-&gt;sg_blkidx = 0;</div><div class='add'>+		if (++host-&gt;sg_idx &lt; data-&gt;sg_len)</div><div class='add'>+			host-&gt;pio_ptr = sg_virt(++data-&gt;sg);</div><div class='add'>+	} else {</div><div class='add'>+		host-&gt;pio_ptr = p;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (host-&gt;sg_idx == data-&gt;sg_len)</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 sh_mmcif_single_read(struct sh_mmcif_host *host,</div><div class='add'>+				 struct mmc_request *mrq)</div><div class='add'>+{</div><div class='add'>+	host-&gt;blocksize = (sh_mmcif_readl(host-&gt;addr, MMCIF_CE_BLOCK_SET) &amp;</div><div class='add'>+			   BLOCK_SIZE_MASK) + 3;</div><div class='add'>+</div><div class='add'>+	host-&gt;wait_for = MMCIF_WAIT_FOR_READ;</div><div class='add'>+	schedule_delayed_work(&amp;host-&gt;timeout_work, host-&gt;timeout);</div><div class='ctx'> </div><div class='ctx'> 	/* buf read enable */</div><div class='ctx'> 	sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFREN);</div><div class='del'>-	time = wait_for_completion_interruptible_timeout(&amp;host-&gt;intr_wait,</div><div class='del'>-			host-&gt;timeout);</div><div class='del'>-	if (time &lt;= 0 || host-&gt;sd_error)</div><div class='del'>-		return sh_mmcif_error_manage(host);</div><div class='del'>-</div><div class='del'>-	blocksize = (BLOCK_SIZE_MASK &amp;</div><div class='del'>-			sh_mmcif_readl(host-&gt;addr, MMCIF_CE_BLOCK_SET)) + 3;</div><div class='del'>-	for (i = 0; i &lt; blocksize / 4; i++)</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool sh_mmcif_read_block(struct sh_mmcif_host *host)</div><div class='add'>+{</div><div class='add'>+	struct mmc_data *data = host-&gt;mrq-&gt;data;</div><div class='add'>+	u32 *p = sg_virt(data-&gt;sg);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (host-&gt;sd_error) {</div><div class='add'>+		data-&gt;error = sh_mmcif_error_manage(host);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; host-&gt;blocksize / 4; i++)</div><div class='ctx'> 		*p++ = sh_mmcif_readl(host-&gt;addr, MMCIF_CE_DATA);</div><div class='ctx'> </div><div class='ctx'> 	/* buffer read end */</div><div class='ctx'> 	sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFRE);</div><div class='del'>-	time = wait_for_completion_interruptible_timeout(&amp;host-&gt;intr_wait,</div><div class='del'>-			host-&gt;timeout);</div><div class='del'>-	if (time &lt;= 0 || host-&gt;sd_error)</div><div class='del'>-		return sh_mmcif_error_manage(host);</div><div class='add'>+	host-&gt;wait_for = MMCIF_WAIT_FOR_READ_END;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sh_mmcif_multi_read(struct sh_mmcif_host *host,</div><div class='del'>-					struct mmc_request *mrq)</div><div class='add'>+static void sh_mmcif_multi_read(struct sh_mmcif_host *host,</div><div class='add'>+				struct mmc_request *mrq)</div><div class='ctx'> {</div><div class='ctx'> 	struct mmc_data *data = mrq-&gt;data;</div><div class='del'>-	long time;</div><div class='del'>-	u32 blocksize, i, j, sec, *p;</div><div class='del'>-</div><div class='del'>-	blocksize = BLOCK_SIZE_MASK &amp; sh_mmcif_readl(host-&gt;addr,</div><div class='del'>-						     MMCIF_CE_BLOCK_SET);</div><div class='del'>-	for (j = 0; j &lt; data-&gt;sg_len; j++) {</div><div class='del'>-		p = sg_virt(data-&gt;sg);</div><div class='del'>-		for (sec = 0; sec &lt; data-&gt;sg-&gt;length / blocksize; sec++) {</div><div class='del'>-			sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFREN);</div><div class='del'>-			/* buf read enable */</div><div class='del'>-			time = wait_for_completion_interruptible_timeout(&amp;host-&gt;intr_wait,</div><div class='del'>-				host-&gt;timeout);</div><div class='del'>-</div><div class='del'>-			if (time &lt;= 0 || host-&gt;sd_error)</div><div class='del'>-				return sh_mmcif_error_manage(host);</div><div class='del'>-</div><div class='del'>-			for (i = 0; i &lt; blocksize / 4; i++)</div><div class='del'>-				*p++ = sh_mmcif_readl(host-&gt;addr,</div><div class='del'>-						      MMCIF_CE_DATA);</div><div class='del'>-		}</div><div class='del'>-		if (j &lt; data-&gt;sg_len - 1)</div><div class='del'>-			data-&gt;sg++;</div><div class='add'>+</div><div class='add'>+	if (!data-&gt;sg_len || !data-&gt;sg-&gt;length)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	host-&gt;blocksize = sh_mmcif_readl(host-&gt;addr, MMCIF_CE_BLOCK_SET) &amp;</div><div class='add'>+		BLOCK_SIZE_MASK;</div><div class='add'>+</div><div class='add'>+	host-&gt;wait_for = MMCIF_WAIT_FOR_MREAD;</div><div class='add'>+	host-&gt;sg_idx = 0;</div><div class='add'>+	host-&gt;sg_blkidx = 0;</div><div class='add'>+	host-&gt;pio_ptr = sg_virt(data-&gt;sg);</div><div class='add'>+	schedule_delayed_work(&amp;host-&gt;timeout_work, host-&gt;timeout);</div><div class='add'>+	sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFREN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool sh_mmcif_mread_block(struct sh_mmcif_host *host)</div><div class='add'>+{</div><div class='add'>+	struct mmc_data *data = host-&gt;mrq-&gt;data;</div><div class='add'>+	u32 *p = host-&gt;pio_ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (host-&gt;sd_error) {</div><div class='add'>+		data-&gt;error = sh_mmcif_error_manage(host);</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!data-&gt;sg-&gt;length);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; host-&gt;blocksize / 4; i++)</div><div class='add'>+		*p++ = sh_mmcif_readl(host-&gt;addr, MMCIF_CE_DATA);</div><div class='add'>+</div><div class='add'>+	if (!sh_mmcif_next_block(host, p))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;host-&gt;timeout_work, host-&gt;timeout);</div><div class='add'>+	sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFREN);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sh_mmcif_single_write(struct sh_mmcif_host *host,</div><div class='add'>+static void sh_mmcif_single_write(struct sh_mmcif_host *host,</div><div class='ctx'> 					struct mmc_request *mrq)</div><div class='ctx'> {</div><div class='del'>-	struct mmc_data *data = mrq-&gt;data;</div><div class='del'>-	long time;</div><div class='del'>-	u32 blocksize, i, *p = sg_virt(data-&gt;sg);</div><div class='add'>+	host-&gt;blocksize = (sh_mmcif_readl(host-&gt;addr, MMCIF_CE_BLOCK_SET) &amp;</div><div class='add'>+			   BLOCK_SIZE_MASK) + 3;</div><div class='ctx'> </div><div class='del'>-	sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFWEN);</div><div class='add'>+	host-&gt;wait_for = MMCIF_WAIT_FOR_WRITE;</div><div class='add'>+	schedule_delayed_work(&amp;host-&gt;timeout_work, host-&gt;timeout);</div><div class='ctx'> </div><div class='ctx'> 	/* buf write enable */</div><div class='del'>-	time = wait_for_completion_interruptible_timeout(&amp;host-&gt;intr_wait,</div><div class='del'>-			host-&gt;timeout);</div><div class='del'>-	if (time &lt;= 0 || host-&gt;sd_error)</div><div class='del'>-		return sh_mmcif_error_manage(host);</div><div class='del'>-</div><div class='del'>-	blocksize = (BLOCK_SIZE_MASK &amp;</div><div class='del'>-			sh_mmcif_readl(host-&gt;addr, MMCIF_CE_BLOCK_SET)) + 3;</div><div class='del'>-	for (i = 0; i &lt; blocksize / 4; i++)</div><div class='add'>+	sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFWEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool sh_mmcif_write_block(struct sh_mmcif_host *host)</div><div class='add'>+{</div><div class='add'>+	struct mmc_data *data = host-&gt;mrq-&gt;data;</div><div class='add'>+	u32 *p = sg_virt(data-&gt;sg);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (host-&gt;sd_error) {</div><div class='add'>+		data-&gt;error = sh_mmcif_error_manage(host);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; host-&gt;blocksize / 4; i++)</div><div class='ctx'> 		sh_mmcif_writel(host-&gt;addr, MMCIF_CE_DATA, *p++);</div><div class='ctx'> </div><div class='ctx'> 	/* buffer write end */</div><div class='ctx'> 	sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MDTRANE);</div><div class='add'>+	host-&gt;wait_for = MMCIF_WAIT_FOR_WRITE_END;</div><div class='ctx'> </div><div class='del'>-	time = wait_for_completion_interruptible_timeout(&amp;host-&gt;intr_wait,</div><div class='del'>-			host-&gt;timeout);</div><div class='del'>-	if (time &lt;= 0 || host-&gt;sd_error)</div><div class='del'>-		return sh_mmcif_error_manage(host);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sh_mmcif_multi_write(struct sh_mmcif_host *host,</div><div class='del'>-						struct mmc_request *mrq)</div><div class='add'>+static void sh_mmcif_multi_write(struct sh_mmcif_host *host,</div><div class='add'>+				struct mmc_request *mrq)</div><div class='ctx'> {</div><div class='ctx'> 	struct mmc_data *data = mrq-&gt;data;</div><div class='del'>-	long time;</div><div class='del'>-	u32 i, sec, j, blocksize, *p;</div><div class='ctx'> </div><div class='del'>-	blocksize = BLOCK_SIZE_MASK &amp; sh_mmcif_readl(host-&gt;addr,</div><div class='del'>-						     MMCIF_CE_BLOCK_SET);</div><div class='add'>+	if (!data-&gt;sg_len || !data-&gt;sg-&gt;length)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	for (j = 0; j &lt; data-&gt;sg_len; j++) {</div><div class='del'>-		p = sg_virt(data-&gt;sg);</div><div class='del'>-		for (sec = 0; sec &lt; data-&gt;sg-&gt;length / blocksize; sec++) {</div><div class='del'>-			sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFWEN);</div><div class='del'>-			/* buf write enable*/</div><div class='del'>-			time = wait_for_completion_interruptible_timeout(&amp;host-&gt;intr_wait,</div><div class='del'>-				host-&gt;timeout);</div><div class='add'>+	host-&gt;blocksize = sh_mmcif_readl(host-&gt;addr, MMCIF_CE_BLOCK_SET) &amp;</div><div class='add'>+		BLOCK_SIZE_MASK;</div><div class='ctx'> </div><div class='del'>-			if (time &lt;= 0 || host-&gt;sd_error)</div><div class='del'>-				return sh_mmcif_error_manage(host);</div><div class='add'>+	host-&gt;wait_for = MMCIF_WAIT_FOR_MWRITE;</div><div class='add'>+	host-&gt;sg_idx = 0;</div><div class='add'>+	host-&gt;sg_blkidx = 0;</div><div class='add'>+	host-&gt;pio_ptr = sg_virt(data-&gt;sg);</div><div class='add'>+	schedule_delayed_work(&amp;host-&gt;timeout_work, host-&gt;timeout);</div><div class='add'>+	sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFWEN);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			for (i = 0; i &lt; blocksize / 4; i++)</div><div class='del'>-				sh_mmcif_writel(host-&gt;addr,</div><div class='del'>-						MMCIF_CE_DATA, *p++);</div><div class='del'>-		}</div><div class='del'>-		if (j &lt; data-&gt;sg_len - 1)</div><div class='del'>-			data-&gt;sg++;</div><div class='add'>+static bool sh_mmcif_mwrite_block(struct sh_mmcif_host *host)</div><div class='add'>+{</div><div class='add'>+	struct mmc_data *data = host-&gt;mrq-&gt;data;</div><div class='add'>+	u32 *p = host-&gt;pio_ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (host-&gt;sd_error) {</div><div class='add'>+		data-&gt;error = sh_mmcif_error_manage(host);</div><div class='add'>+		return false;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!data-&gt;sg-&gt;length);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; host-&gt;blocksize / 4; i++)</div><div class='add'>+		sh_mmcif_writel(host-&gt;addr, MMCIF_CE_DATA, *p++);</div><div class='add'>+</div><div class='add'>+	if (!sh_mmcif_next_block(host, p))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;host-&gt;timeout_work, host-&gt;timeout);</div><div class='add'>+	sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MBUFWEN);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sh_mmcif_get_response(struct sh_mmcif_host *host,</div><div class='hunk'>@@ -603,8 +714,11 @@ static void sh_mmcif_get_cmd12response(struct sh_mmcif_host *host,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 sh_mmcif_set_cmd(struct sh_mmcif_host *host,</div><div class='del'>-		struct mmc_request *mrq, struct mmc_command *cmd, u32 opc)</div><div class='add'>+			    struct mmc_request *mrq)</div><div class='ctx'> {</div><div class='add'>+	struct mmc_data *data = mrq-&gt;data;</div><div class='add'>+	struct mmc_command *cmd = mrq-&gt;cmd;</div><div class='add'>+	u32 opc = cmd-&gt;opcode;</div><div class='ctx'> 	u32 tmp = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Response Type check */</div><div class='hunk'>@@ -636,7 +750,7 @@ static u32 sh_mmcif_set_cmd(struct sh_mmcif_host *host,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* WDAT / DATW */</div><div class='del'>-	if (host-&gt;data) {</div><div class='add'>+	if (data) {</div><div class='ctx'> 		tmp |= CMD_SET_WDAT;</div><div class='ctx'> 		switch (host-&gt;bus_width) {</div><div class='ctx'> 		case MMC_BUS_WIDTH_1:</div><div class='hunk'>@@ -660,7 +774,7 @@ static u32 sh_mmcif_set_cmd(struct sh_mmcif_host *host,</div><div class='ctx'> 	if (opc == MMC_READ_MULTIPLE_BLOCK || opc == MMC_WRITE_MULTIPLE_BLOCK) {</div><div class='ctx'> 		tmp |= CMD_SET_CMLTE | CMD_SET_CMD12EN;</div><div class='ctx'> 		sh_mmcif_bitset(host, MMCIF_CE_BLOCK_SET,</div><div class='del'>-					mrq-&gt;data-&gt;blocks &lt;&lt; 16);</div><div class='add'>+				data-&gt;blocks &lt;&lt; 16);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* RIDXC[1:0] check bits */</div><div class='ctx'> 	if (opc == MMC_SEND_OP_COND || opc == MMC_ALL_SEND_CID ||</div><div class='hunk'>@@ -674,68 +788,60 @@ static u32 sh_mmcif_set_cmd(struct sh_mmcif_host *host,</div><div class='ctx'> 		opc == MMC_SEND_CSD || opc == MMC_SEND_CID)</div><div class='ctx'> 		tmp |= CMD_SET_CRC7C_INTERNAL;</div><div class='ctx'> </div><div class='del'>-	return opc = ((opc &lt;&lt; 24) | tmp);</div><div class='add'>+	return (opc &lt;&lt; 24) | tmp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sh_mmcif_data_trans(struct sh_mmcif_host *host,</div><div class='del'>-				struct mmc_request *mrq, u32 opc)</div><div class='add'>+			       struct mmc_request *mrq, u32 opc)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	switch (opc) {</div><div class='ctx'> 	case MMC_READ_MULTIPLE_BLOCK:</div><div class='del'>-		ret = sh_mmcif_multi_read(host, mrq);</div><div class='del'>-		break;</div><div class='add'>+		sh_mmcif_multi_read(host, mrq);</div><div class='add'>+		return 0;</div><div class='ctx'> 	case MMC_WRITE_MULTIPLE_BLOCK:</div><div class='del'>-		ret = sh_mmcif_multi_write(host, mrq);</div><div class='del'>-		break;</div><div class='add'>+		sh_mmcif_multi_write(host, mrq);</div><div class='add'>+		return 0;</div><div class='ctx'> 	case MMC_WRITE_BLOCK:</div><div class='del'>-		ret = sh_mmcif_single_write(host, mrq);</div><div class='del'>-		break;</div><div class='add'>+		sh_mmcif_single_write(host, mrq);</div><div class='add'>+		return 0;</div><div class='ctx'> 	case MMC_READ_SINGLE_BLOCK:</div><div class='ctx'> 	case MMC_SEND_EXT_CSD:</div><div class='del'>-		ret = sh_mmcif_single_read(host, mrq);</div><div class='del'>-		break;</div><div class='add'>+		sh_mmcif_single_read(host, mrq);</div><div class='add'>+		return 0;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_err(&amp;host-&gt;pd-&gt;dev, "UNSUPPORTED CMD = d'%08d\n", opc);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		break;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sh_mmcif_start_cmd(struct sh_mmcif_host *host,</div><div class='del'>-			struct mmc_request *mrq, struct mmc_command *cmd)</div><div class='add'>+			       struct mmc_request *mrq)</div><div class='ctx'> {</div><div class='del'>-	long time;</div><div class='del'>-	int ret = 0, mask = 0;</div><div class='add'>+	struct mmc_command *cmd = mrq-&gt;cmd;</div><div class='ctx'> 	u32 opc = cmd-&gt;opcode;</div><div class='add'>+	u32 mask;</div><div class='ctx'> </div><div class='ctx'> 	switch (opc) {</div><div class='del'>-	/* respons busy check */</div><div class='add'>+	/* response busy check */</div><div class='ctx'> 	case MMC_SWITCH:</div><div class='ctx'> 	case MMC_STOP_TRANSMISSION:</div><div class='ctx'> 	case MMC_SET_WRITE_PROT:</div><div class='ctx'> 	case MMC_CLR_WRITE_PROT:</div><div class='ctx'> 	case MMC_ERASE:</div><div class='ctx'> 	case MMC_GEN_CMD:</div><div class='del'>-		mask = MASK_MRBSYE;</div><div class='add'>+		mask = MASK_START_CMD | MASK_MRBSYE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		mask = MASK_MCRSPE;</div><div class='add'>+		mask = MASK_START_CMD | MASK_MCRSPE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	mask |=	MASK_MCMDVIO | MASK_MBUFVIO | MASK_MWDATERR |</div><div class='del'>-		MASK_MRDATERR | MASK_MRIDXERR | MASK_MRSPERR |</div><div class='del'>-		MASK_MCCSTO | MASK_MCRCSTO | MASK_MWDATTO |</div><div class='del'>-		MASK_MRDATTO | MASK_MRBSYTO | MASK_MRSPTO;</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;data) {</div><div class='add'>+	if (mrq-&gt;data) {</div><div class='ctx'> 		sh_mmcif_writel(host-&gt;addr, MMCIF_CE_BLOCK_SET, 0);</div><div class='ctx'> 		sh_mmcif_writel(host-&gt;addr, MMCIF_CE_BLOCK_SET,</div><div class='ctx'> 				mrq-&gt;data-&gt;blksz);</div><div class='ctx'> 	}</div><div class='del'>-	opc = sh_mmcif_set_cmd(host, mrq, cmd, opc);</div><div class='add'>+	opc = sh_mmcif_set_cmd(host, mrq);</div><div class='ctx'> </div><div class='ctx'> 	sh_mmcif_writel(host-&gt;addr, MMCIF_CE_INT, 0xD80430C0);</div><div class='ctx'> 	sh_mmcif_writel(host-&gt;addr, MMCIF_CE_INT_MASK, mask);</div><div class='hunk'>@@ -744,80 +850,28 @@ static void sh_mmcif_start_cmd(struct sh_mmcif_host *host,</div><div class='ctx'> 	/* set cmd */</div><div class='ctx'> 	sh_mmcif_writel(host-&gt;addr, MMCIF_CE_CMD_SET, opc);</div><div class='ctx'> </div><div class='del'>-	time = wait_for_completion_interruptible_timeout(&amp;host-&gt;intr_wait,</div><div class='del'>-		host-&gt;timeout);</div><div class='del'>-	if (time &lt;= 0) {</div><div class='del'>-		cmd-&gt;error = sh_mmcif_error_manage(host);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (host-&gt;sd_error) {</div><div class='del'>-		switch (cmd-&gt;opcode) {</div><div class='del'>-		case MMC_ALL_SEND_CID:</div><div class='del'>-		case MMC_SELECT_CARD:</div><div class='del'>-		case MMC_APP_CMD:</div><div class='del'>-			cmd-&gt;error = -ETIMEDOUT;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			dev_dbg(&amp;host-&gt;pd-&gt;dev, "Cmd(d'%d) err\n",</div><div class='del'>-					cmd-&gt;opcode);</div><div class='del'>-			cmd-&gt;error = sh_mmcif_error_manage(host);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		host-&gt;sd_error = false;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (!(cmd-&gt;flags &amp; MMC_RSP_PRESENT)) {</div><div class='del'>-		cmd-&gt;error = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	sh_mmcif_get_response(host, cmd);</div><div class='del'>-	if (host-&gt;data) {</div><div class='del'>-		if (!host-&gt;dma_active) {</div><div class='del'>-			ret = sh_mmcif_data_trans(host, mrq, cmd-&gt;opcode);</div><div class='del'>-		} else {</div><div class='del'>-			long time =</div><div class='del'>-				wait_for_completion_interruptible_timeout(&amp;host-&gt;dma_complete,</div><div class='del'>-									  host-&gt;timeout);</div><div class='del'>-			if (!time)</div><div class='del'>-				ret = -ETIMEDOUT;</div><div class='del'>-			else if (time &lt; 0)</div><div class='del'>-				ret = time;</div><div class='del'>-			sh_mmcif_bitclr(host, MMCIF_CE_BUF_ACC,</div><div class='del'>-					BUF_ACC_DMAREN | BUF_ACC_DMAWEN);</div><div class='del'>-			host-&gt;dma_active = false;</div><div class='del'>-		}</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			mrq-&gt;data-&gt;bytes_xfered = 0;</div><div class='del'>-		else</div><div class='del'>-			mrq-&gt;data-&gt;bytes_xfered =</div><div class='del'>-				mrq-&gt;data-&gt;blocks * mrq-&gt;data-&gt;blksz;</div><div class='del'>-	}</div><div class='del'>-	cmd-&gt;error = ret;</div><div class='add'>+	host-&gt;wait_for = MMCIF_WAIT_FOR_CMD;</div><div class='add'>+	schedule_delayed_work(&amp;host-&gt;timeout_work, host-&gt;timeout);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sh_mmcif_stop_cmd(struct sh_mmcif_host *host,</div><div class='del'>-		struct mmc_request *mrq, struct mmc_command *cmd)</div><div class='add'>+			      struct mmc_request *mrq)</div><div class='ctx'> {</div><div class='del'>-	long time;</div><div class='del'>-</div><div class='del'>-	if (mrq-&gt;cmd-&gt;opcode == MMC_READ_MULTIPLE_BLOCK)</div><div class='add'>+	switch (mrq-&gt;cmd-&gt;opcode) {</div><div class='add'>+	case MMC_READ_MULTIPLE_BLOCK:</div><div class='ctx'> 		sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MCMD12DRE);</div><div class='del'>-	else if (mrq-&gt;cmd-&gt;opcode == MMC_WRITE_MULTIPLE_BLOCK)</div><div class='add'>+		break;</div><div class='add'>+	case MMC_WRITE_MULTIPLE_BLOCK:</div><div class='ctx'> 		sh_mmcif_bitset(host, MMCIF_CE_INT_MASK, MASK_MCMD12RBE);</div><div class='del'>-	else {</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		dev_err(&amp;host-&gt;pd-&gt;dev, "unsupported stop cmd\n");</div><div class='del'>-		cmd-&gt;error = sh_mmcif_error_manage(host);</div><div class='add'>+		mrq-&gt;stop-&gt;error = sh_mmcif_error_manage(host);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	time = wait_for_completion_interruptible_timeout(&amp;host-&gt;intr_wait,</div><div class='del'>-			host-&gt;timeout);</div><div class='del'>-	if (time &lt;= 0 || host-&gt;sd_error) {</div><div class='del'>-		cmd-&gt;error = sh_mmcif_error_manage(host);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	sh_mmcif_get_cmd12response(host, cmd);</div><div class='del'>-	cmd-&gt;error = 0;</div><div class='add'>+	host-&gt;wait_for = MMCIF_WAIT_FOR_STOP;</div><div class='add'>+	schedule_delayed_work(&amp;host-&gt;timeout_work, host-&gt;timeout);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sh_mmcif_request(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='hunk'>@@ -856,23 +910,10 @@ static void sh_mmcif_request(struct mmc_host *mmc, struct mmc_request *mrq)</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	host-&gt;data = mrq-&gt;data;</div><div class='del'>-	if (mrq-&gt;data) {</div><div class='del'>-		if (mrq-&gt;data-&gt;flags &amp; MMC_DATA_READ) {</div><div class='del'>-			if (host-&gt;chan_rx)</div><div class='del'>-				sh_mmcif_start_dma_rx(host);</div><div class='del'>-		} else {</div><div class='del'>-			if (host-&gt;chan_tx)</div><div class='del'>-				sh_mmcif_start_dma_tx(host);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	sh_mmcif_start_cmd(host, mrq, mrq-&gt;cmd);</div><div class='del'>-	host-&gt;data = NULL;</div><div class='ctx'> </div><div class='del'>-	if (!mrq-&gt;cmd-&gt;error &amp;&amp; mrq-&gt;stop)</div><div class='del'>-		sh_mmcif_stop_cmd(host, mrq, mrq-&gt;stop);</div><div class='del'>-	host-&gt;state = STATE_IDLE;</div><div class='del'>-	mmc_request_done(mmc, mrq);</div><div class='add'>+	host-&gt;mrq = mrq;</div><div class='add'>+</div><div class='add'>+	sh_mmcif_start_cmd(host, mrq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sh_mmcif_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='hunk'>@@ -947,9 +988,156 @@ static struct mmc_host_ops sh_mmcif_ops = {</div><div class='ctx'> 	.get_cd		= sh_mmcif_get_cd,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void sh_mmcif_detect(struct mmc_host *mmc)</div><div class='add'>+static bool sh_mmcif_end_cmd(struct sh_mmcif_host *host)</div><div class='ctx'> {</div><div class='del'>-	mmc_detect_change(mmc, 0);</div><div class='add'>+	struct mmc_command *cmd = host-&gt;mrq-&gt;cmd;</div><div class='add'>+	struct mmc_data *data = host-&gt;mrq-&gt;data;</div><div class='add'>+	long time;</div><div class='add'>+</div><div class='add'>+	if (host-&gt;sd_error) {</div><div class='add'>+		switch (cmd-&gt;opcode) {</div><div class='add'>+		case MMC_ALL_SEND_CID:</div><div class='add'>+		case MMC_SELECT_CARD:</div><div class='add'>+		case MMC_APP_CMD:</div><div class='add'>+			cmd-&gt;error = -ETIMEDOUT;</div><div class='add'>+			host-&gt;sd_error = false;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			cmd-&gt;error = sh_mmcif_error_manage(host);</div><div class='add'>+			dev_dbg(&amp;host-&gt;pd-&gt;dev, "Cmd(d'%d) error %d\n",</div><div class='add'>+				cmd-&gt;opcode, cmd-&gt;error);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if (!(cmd-&gt;flags &amp; MMC_RSP_PRESENT)) {</div><div class='add'>+		cmd-&gt;error = 0;</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sh_mmcif_get_response(host, cmd);</div><div class='add'>+</div><div class='add'>+	if (!data)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;flags &amp; MMC_DATA_READ) {</div><div class='add'>+		if (host-&gt;chan_rx)</div><div class='add'>+			sh_mmcif_start_dma_rx(host);</div><div class='add'>+	} else {</div><div class='add'>+		if (host-&gt;chan_tx)</div><div class='add'>+			sh_mmcif_start_dma_tx(host);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!host-&gt;dma_active) {</div><div class='add'>+		data-&gt;error = sh_mmcif_data_trans(host, host-&gt;mrq, cmd-&gt;opcode);</div><div class='add'>+		if (!data-&gt;error)</div><div class='add'>+			return true;</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Running in the IRQ thread, can sleep */</div><div class='add'>+	time = wait_for_completion_interruptible_timeout(&amp;host-&gt;dma_complete,</div><div class='add'>+							 host-&gt;timeout);</div><div class='add'>+	if (host-&gt;sd_error) {</div><div class='add'>+		dev_err(host-&gt;mmc-&gt;parent,</div><div class='add'>+			"Error IRQ while waiting for DMA completion!\n");</div><div class='add'>+		/* Woken up by an error IRQ: abort DMA */</div><div class='add'>+		if (data-&gt;flags &amp; MMC_DATA_READ)</div><div class='add'>+			dmaengine_terminate_all(host-&gt;chan_rx);</div><div class='add'>+		else</div><div class='add'>+			dmaengine_terminate_all(host-&gt;chan_tx);</div><div class='add'>+		data-&gt;error = sh_mmcif_error_manage(host);</div><div class='add'>+	} else if (!time) {</div><div class='add'>+		data-&gt;error = -ETIMEDOUT;</div><div class='add'>+	} else if (time &lt; 0) {</div><div class='add'>+		data-&gt;error = time;</div><div class='add'>+	}</div><div class='add'>+	sh_mmcif_bitclr(host, MMCIF_CE_BUF_ACC,</div><div class='add'>+			BUF_ACC_DMAREN | BUF_ACC_DMAWEN);</div><div class='add'>+	host-&gt;dma_active = false;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;error)</div><div class='add'>+		data-&gt;bytes_xfered = 0;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct sh_mmcif_host *host = dev_id;</div><div class='add'>+	struct mmc_request *mrq = host-&gt;mrq;</div><div class='add'>+	struct mmc_data *data = mrq-&gt;data;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;host-&gt;timeout_work);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * All handlers return true, if processing continues, and false, if the</div><div class='add'>+	 * request has to be completed - successfully or not</div><div class='add'>+	 */</div><div class='add'>+	switch (host-&gt;wait_for) {</div><div class='add'>+	case MMCIF_WAIT_FOR_REQUEST:</div><div class='add'>+		/* We're too late, the timeout has already kicked in */</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	case MMCIF_WAIT_FOR_CMD:</div><div class='add'>+		if (sh_mmcif_end_cmd(host))</div><div class='add'>+			/* Wait for data */</div><div class='add'>+			return IRQ_HANDLED;</div><div class='add'>+		break;</div><div class='add'>+	case MMCIF_WAIT_FOR_MREAD:</div><div class='add'>+		if (sh_mmcif_mread_block(host))</div><div class='add'>+			/* Wait for more data */</div><div class='add'>+			return IRQ_HANDLED;</div><div class='add'>+		break;</div><div class='add'>+	case MMCIF_WAIT_FOR_READ:</div><div class='add'>+		if (sh_mmcif_read_block(host))</div><div class='add'>+			/* Wait for data end */</div><div class='add'>+			return IRQ_HANDLED;</div><div class='add'>+		break;</div><div class='add'>+	case MMCIF_WAIT_FOR_MWRITE:</div><div class='add'>+		if (sh_mmcif_mwrite_block(host))</div><div class='add'>+			/* Wait data to write */</div><div class='add'>+			return IRQ_HANDLED;</div><div class='add'>+		break;</div><div class='add'>+	case MMCIF_WAIT_FOR_WRITE:</div><div class='add'>+		if (sh_mmcif_write_block(host))</div><div class='add'>+			/* Wait for data end */</div><div class='add'>+			return IRQ_HANDLED;</div><div class='add'>+		break;</div><div class='add'>+	case MMCIF_WAIT_FOR_STOP:</div><div class='add'>+		if (host-&gt;sd_error) {</div><div class='add'>+			mrq-&gt;stop-&gt;error = sh_mmcif_error_manage(host);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		sh_mmcif_get_cmd12response(host, mrq-&gt;stop);</div><div class='add'>+		mrq-&gt;stop-&gt;error = 0;</div><div class='add'>+		break;</div><div class='add'>+	case MMCIF_WAIT_FOR_READ_END:</div><div class='add'>+	case MMCIF_WAIT_FOR_WRITE_END:</div><div class='add'>+		if (host-&gt;sd_error)</div><div class='add'>+			data-&gt;error = sh_mmcif_error_manage(host);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (host-&gt;wait_for != MMCIF_WAIT_FOR_STOP) {</div><div class='add'>+		if (!mrq-&gt;cmd-&gt;error &amp;&amp; data &amp;&amp; !data-&gt;error)</div><div class='add'>+			data-&gt;bytes_xfered =</div><div class='add'>+				data-&gt;blocks * data-&gt;blksz;</div><div class='add'>+</div><div class='add'>+		if (mrq-&gt;stop &amp;&amp; !mrq-&gt;cmd-&gt;error &amp;&amp; (!data || !data-&gt;error)) {</div><div class='add'>+			sh_mmcif_stop_cmd(host, mrq);</div><div class='add'>+			if (!mrq-&gt;stop-&gt;error)</div><div class='add'>+				return IRQ_HANDLED;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	host-&gt;wait_for = MMCIF_WAIT_FOR_REQUEST;</div><div class='add'>+	host-&gt;state = STATE_IDLE;</div><div class='add'>+	host-&gt;mrq = NULL;</div><div class='add'>+	mmc_request_done(host-&gt;mmc, mrq);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t sh_mmcif_intr(int irq, void *dev_id)</div><div class='hunk'>@@ -960,7 +1148,12 @@ static irqreturn_t sh_mmcif_intr(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	state = sh_mmcif_readl(host-&gt;addr, MMCIF_CE_INT);</div><div class='ctx'> </div><div class='del'>-	if (state &amp; INT_RBSYE) {</div><div class='add'>+	if (state &amp; INT_ERR_STS) {</div><div class='add'>+		/* error interrupts - process first */</div><div class='add'>+		sh_mmcif_writel(host-&gt;addr, MMCIF_CE_INT, ~state);</div><div class='add'>+		sh_mmcif_bitclr(host, MMCIF_CE_INT_MASK, state);</div><div class='add'>+		err = 1;</div><div class='add'>+	} else if (state &amp; INT_RBSYE) {</div><div class='ctx'> 		sh_mmcif_writel(host-&gt;addr, MMCIF_CE_INT,</div><div class='ctx'> 				~(INT_RBSYE | INT_CRSPE));</div><div class='ctx'> 		sh_mmcif_bitclr(host, MMCIF_CE_INT_MASK, MASK_MRBSYE);</div><div class='hunk'>@@ -988,11 +1181,6 @@ static irqreturn_t sh_mmcif_intr(int irq, void *dev_id)</div><div class='ctx'> 		sh_mmcif_writel(host-&gt;addr, MMCIF_CE_INT,</div><div class='ctx'> 				~(INT_CMD12RBE | INT_CMD12CRE));</div><div class='ctx'> 		sh_mmcif_bitclr(host, MMCIF_CE_INT_MASK, MASK_MCMD12RBE);</div><div class='del'>-	} else if (state &amp; INT_ERR_STS) {</div><div class='del'>-		/* err interrupts */</div><div class='del'>-		sh_mmcif_writel(host-&gt;addr, MMCIF_CE_INT, ~state);</div><div class='del'>-		sh_mmcif_bitclr(host, MMCIF_CE_INT_MASK, state);</div><div class='del'>-		err = 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dev_dbg(&amp;host-&gt;pd-&gt;dev, "Unsupported interrupt: 0x%x\n", state);</div><div class='ctx'> 		sh_mmcif_writel(host-&gt;addr, MMCIF_CE_INT, ~state);</div><div class='hunk'>@@ -1003,14 +1191,57 @@ static irqreturn_t sh_mmcif_intr(int irq, void *dev_id)</div><div class='ctx'> 		host-&gt;sd_error = true;</div><div class='ctx'> 		dev_dbg(&amp;host-&gt;pd-&gt;dev, "int err state = %08x\n", state);</div><div class='ctx'> 	}</div><div class='del'>-	if (state &amp; ~(INT_CMD12RBE | INT_CMD12CRE))</div><div class='del'>-		complete(&amp;host-&gt;intr_wait);</div><div class='del'>-	else</div><div class='add'>+	if (state &amp; ~(INT_CMD12RBE | INT_CMD12CRE)) {</div><div class='add'>+		if (!host-&gt;dma_active)</div><div class='add'>+			return IRQ_WAKE_THREAD;</div><div class='add'>+		else if (host-&gt;sd_error)</div><div class='add'>+			mmcif_dma_complete(host);</div><div class='add'>+	} else {</div><div class='ctx'> 		dev_dbg(&amp;host-&gt;pd-&gt;dev, "Unexpected IRQ 0x%x\n", state);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mmcif_timeout_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct delayed_work *d = container_of(work, struct delayed_work, work);</div><div class='add'>+	struct sh_mmcif_host *host = container_of(d, struct sh_mmcif_host, timeout_work);</div><div class='add'>+	struct mmc_request *mrq = host-&gt;mrq;</div><div class='add'>+</div><div class='add'>+	if (host-&gt;dying)</div><div class='add'>+		/* Don't run after mmc_remove_host() */</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Handle races with cancel_delayed_work(), unless</div><div class='add'>+	 * cancel_delayed_work_sync() is used</div><div class='add'>+	 */</div><div class='add'>+	switch (host-&gt;wait_for) {</div><div class='add'>+	case MMCIF_WAIT_FOR_CMD:</div><div class='add'>+		mrq-&gt;cmd-&gt;error = sh_mmcif_error_manage(host);</div><div class='add'>+		break;</div><div class='add'>+	case MMCIF_WAIT_FOR_STOP:</div><div class='add'>+		mrq-&gt;stop-&gt;error = sh_mmcif_error_manage(host);</div><div class='add'>+		break;</div><div class='add'>+	case MMCIF_WAIT_FOR_MREAD:</div><div class='add'>+	case MMCIF_WAIT_FOR_MWRITE:</div><div class='add'>+	case MMCIF_WAIT_FOR_READ:</div><div class='add'>+	case MMCIF_WAIT_FOR_WRITE:</div><div class='add'>+	case MMCIF_WAIT_FOR_READ_END:</div><div class='add'>+	case MMCIF_WAIT_FOR_WRITE_END:</div><div class='add'>+		mrq-&gt;data-&gt;error = sh_mmcif_error_manage(host);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	host-&gt;state = STATE_IDLE;</div><div class='add'>+	host-&gt;wait_for = MMCIF_WAIT_FOR_REQUEST;</div><div class='add'>+	host-&gt;mrq = NULL;</div><div class='add'>+	mmc_request_done(host-&gt;mmc, mrq);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __devinit sh_mmcif_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0, irq[2];</div><div class='hunk'>@@ -1064,7 +1295,6 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)</div><div class='ctx'> 	host-&gt;clk = clk_get_rate(host-&gt;hclk);</div><div class='ctx'> 	host-&gt;pd = pdev;</div><div class='ctx'> </div><div class='del'>-	init_completion(&amp;host-&gt;intr_wait);</div><div class='ctx'> 	spin_lock_init(&amp;host-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	mmc-&gt;ops = &amp;sh_mmcif_ops;</div><div class='hunk'>@@ -1101,19 +1331,21 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	sh_mmcif_writel(host-&gt;addr, MMCIF_CE_INT_MASK, MASK_ALL);</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(irq[0], sh_mmcif_intr, 0, "sh_mmc:error", host);</div><div class='add'>+	ret = request_threaded_irq(irq[0], sh_mmcif_intr, sh_mmcif_irqt, 0, "sh_mmc:error", host);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "request_irq error (sh_mmc:error)\n");</div><div class='ctx'> 		goto clean_up3;</div><div class='ctx'> 	}</div><div class='del'>-	ret = request_irq(irq[1], sh_mmcif_intr, 0, "sh_mmc:int", host);</div><div class='add'>+	ret = request_threaded_irq(irq[1], sh_mmcif_intr, sh_mmcif_irqt, 0, "sh_mmc:int", host);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		free_irq(irq[0], host);</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "request_irq error (sh_mmc:int)\n");</div><div class='ctx'> 		goto clean_up3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sh_mmcif_detect(host-&gt;mmc);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;host-&gt;timeout_work, mmcif_timeout_work);</div><div class='add'>+</div><div class='add'>+	mmc_detect_change(host-&gt;mmc, 0);</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "driver version %s\n", DRIVER_VERSION);</div><div class='ctx'> 	dev_dbg(&amp;pdev-&gt;dev, "chip ver H'%04x\n",</div><div class='hunk'>@@ -1139,11 +1371,19 @@ static int __devexit sh_mmcif_remove(struct platform_device *pdev)</div><div class='ctx'> 	struct sh_mmcif_host *host = platform_get_drvdata(pdev);</div><div class='ctx'> 	int irq[2];</div><div class='ctx'> </div><div class='add'>+	host-&gt;dying = true;</div><div class='ctx'> 	pm_runtime_get_sync(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	mmc_remove_host(host-&gt;mmc);</div><div class='ctx'> 	sh_mmcif_writel(host-&gt;addr, MMCIF_CE_INT_MASK, MASK_ALL);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * FIXME: cancel_delayed_work(_sync)() and free_irq() race with the</div><div class='add'>+	 * mmc_remove_host() call above. But swapping order doesn't help either</div><div class='add'>+	 * (a query on the linux-mmc mailing list didn't bring any replies).</div><div class='add'>+	 */</div><div class='add'>+	cancel_delayed_work_sync(&amp;host-&gt;timeout_work);</div><div class='add'>+</div><div class='ctx'> 	if (host-&gt;addr)</div><div class='ctx'> 		iounmap(host-&gt;addr);</div><div class='ctx'> </div><div class='hunk'>@@ -1206,19 +1446,7 @@ static struct platform_driver sh_mmcif_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sh_mmcif_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sh_mmcif_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sh_mmcif_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sh_mmcif_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sh_mmcif_init);</div><div class='del'>-module_exit(sh_mmcif_exit);</div><div class='del'>-</div><div class='add'>+module_platform_driver(sh_mmcif_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("SuperH on-chip MMC/eMMC interface driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c<br/>index 41ae6466bd83..58da3c44acc5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/sh_mobile_sdhi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/sh_mobile_sdhi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/sh_mobile_sdhi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/sh_mobile_sdhi.c</a></div><div class='hunk'>@@ -282,18 +282,7 @@ static struct platform_driver sh_mobile_sdhi_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(sh_mobile_sdhi_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sh_mobile_sdhi_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sh_mobile_sdhi_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sh_mobile_sdhi_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sh_mobile_sdhi_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sh_mobile_sdhi_init);</div><div class='del'>-module_exit(sh_mobile_sdhi_exit);</div><div class='add'>+module_platform_driver(sh_mobile_sdhi_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("SuperH Mobile SDHI driver");</div><div class='ctx'> MODULE_AUTHOR("Magnus Damm");</div><div class='head'>diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c<br/>index f70d04664cac..43d962829f8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/tifm_sd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/tifm_sd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/tifm_sd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/tifm_sd.c</a></div><div class='hunk'>@@ -22,8 +22,8 @@</div><div class='ctx'> #define DRIVER_NAME "tifm_sd"</div><div class='ctx'> #define DRIVER_VERSION "0.8"</div><div class='ctx'> </div><div class='del'>-static int no_dma = 0;</div><div class='del'>-static int fixed_timeout = 0;</div><div class='add'>+static bool no_dma = 0;</div><div class='add'>+static bool fixed_timeout = 0;</div><div class='ctx'> module_param(no_dma, bool, 0644);</div><div class='ctx'> module_param(fixed_timeout, bool, 0644);</div><div class='ctx'> </div><div class='hunk'>@@ -118,7 +118,7 @@ static void tifm_sd_read_fifo(struct tifm_sd *host, struct page *pg,</div><div class='ctx'> 	unsigned char *buf;</div><div class='ctx'> 	unsigned int pos = 0, val;</div><div class='ctx'> </div><div class='del'>-	buf = kmap_atomic(pg, KM_BIO_DST_IRQ) + off;</div><div class='add'>+	buf = kmap_atomic(pg) + off;</div><div class='ctx'> 	if (host-&gt;cmd_flags &amp; DATA_CARRY) {</div><div class='ctx'> 		buf[pos++] = host-&gt;bounce_buf_data[0];</div><div class='ctx'> 		host-&gt;cmd_flags &amp;= ~DATA_CARRY;</div><div class='hunk'>@@ -134,7 +134,7 @@ static void tifm_sd_read_fifo(struct tifm_sd *host, struct page *pg,</div><div class='ctx'> 		}</div><div class='ctx'> 		buf[pos++] = (val &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	}</div><div class='del'>-	kunmap_atomic(buf - off, KM_BIO_DST_IRQ);</div><div class='add'>+	kunmap_atomic(buf - off);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tifm_sd_write_fifo(struct tifm_sd *host, struct page *pg,</div><div class='hunk'>@@ -144,7 +144,7 @@ static void tifm_sd_write_fifo(struct tifm_sd *host, struct page *pg,</div><div class='ctx'> 	unsigned char *buf;</div><div class='ctx'> 	unsigned int pos = 0, val;</div><div class='ctx'> </div><div class='del'>-	buf = kmap_atomic(pg, KM_BIO_SRC_IRQ) + off;</div><div class='add'>+	buf = kmap_atomic(pg) + off;</div><div class='ctx'> 	if (host-&gt;cmd_flags &amp; DATA_CARRY) {</div><div class='ctx'> 		val = host-&gt;bounce_buf_data[0] | ((buf[pos++] &lt;&lt; 8) &amp; 0xff00);</div><div class='ctx'> 		writel(val, sock-&gt;addr + SOCK_MMCSD_DATA);</div><div class='hunk'>@@ -161,7 +161,7 @@ static void tifm_sd_write_fifo(struct tifm_sd *host, struct page *pg,</div><div class='ctx'> 		val |= (buf[pos++] &lt;&lt; 8) &amp; 0xff00;</div><div class='ctx'> 		writel(val, sock-&gt;addr + SOCK_MMCSD_DATA);</div><div class='ctx'> 	}</div><div class='del'>-	kunmap_atomic(buf - off, KM_BIO_SRC_IRQ);</div><div class='add'>+	kunmap_atomic(buf - off);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tifm_sd_transfer_data(struct tifm_sd *host)</div><div class='hunk'>@@ -212,13 +212,13 @@ static void tifm_sd_copy_page(struct page *dst, unsigned int dst_off,</div><div class='ctx'> 			      struct page *src, unsigned int src_off,</div><div class='ctx'> 			      unsigned int count)</div><div class='ctx'> {</div><div class='del'>-	unsigned char *src_buf = kmap_atomic(src, KM_BIO_SRC_IRQ) + src_off;</div><div class='del'>-	unsigned char *dst_buf = kmap_atomic(dst, KM_BIO_DST_IRQ) + dst_off;</div><div class='add'>+	unsigned char *src_buf = kmap_atomic(src) + src_off;</div><div class='add'>+	unsigned char *dst_buf = kmap_atomic(dst) + dst_off;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(dst_buf, src_buf, count);</div><div class='ctx'> </div><div class='del'>-	kunmap_atomic(dst_buf - dst_off, KM_BIO_DST_IRQ);</div><div class='del'>-	kunmap_atomic(src_buf - src_off, KM_BIO_SRC_IRQ);</div><div class='add'>+	kunmap_atomic(dst_buf - dst_off);</div><div class='add'>+	kunmap_atomic(src_buf - src_off);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tifm_sd_bounce_block(struct tifm_sd *host, struct mmc_data *r_data)</div><div class='head'>diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c<br/>index a4ea10242787..113ce6c9cf32 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/tmio_mmc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/tmio_mmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/tmio_mmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/tmio_mmc.c</a></div><div class='hunk'>@@ -138,19 +138,7 @@ static struct platform_driver tmio_mmc_driver = {</div><div class='ctx'> 	.resume = tmio_mmc_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init tmio_mmc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;tmio_mmc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit tmio_mmc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;tmio_mmc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(tmio_mmc_init);</div><div class='del'>-module_exit(tmio_mmc_exit);</div><div class='add'>+module_platform_driver(tmio_mmc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Toshiba TMIO SD/MMC driver");</div><div class='ctx'> MODULE_AUTHOR("Ian Molton &lt;spyro@f2s.com&gt;");</div><div class='head'>diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h<br/>index 3020f98218f0..a95e6d901726 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/tmio_mmc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/tmio_mmc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/tmio_mmc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/tmio_mmc.h</a></div><div class='hunk'>@@ -105,13 +105,13 @@ static inline char *tmio_mmc_kmap_atomic(struct scatterlist *sg,</div><div class='ctx'> 					 unsigned long *flags)</div><div class='ctx'> {</div><div class='ctx'> 	local_irq_save(*flags);</div><div class='del'>-	return kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg-&gt;offset;</div><div class='add'>+	return kmap_atomic(sg_page(sg)) + sg-&gt;offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void tmio_mmc_kunmap_atomic(struct scatterlist *sg,</div><div class='ctx'> 					  unsigned long *flags, void *virt)</div><div class='ctx'> {</div><div class='del'>-	kunmap_atomic(virt - sg-&gt;offset, KM_BIO_SRC_IRQ);</div><div class='add'>+	kunmap_atomic(virt - sg-&gt;offset);</div><div class='ctx'> 	local_irq_restore(*flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c<br/>index 86f259cdfcbc..7a6e6cc8f8b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/tmio_mmc_dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/tmio_mmc_dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/tmio_mmc_dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/tmio_mmc_dma.c</a></div><div class='hunk'>@@ -77,7 +77,7 @@ static void tmio_mmc_start_dma_rx(struct tmio_mmc_host *host)</div><div class='ctx'> 	ret = dma_map_sg(chan-&gt;device-&gt;dev, sg, host-&gt;sg_len, DMA_FROM_DEVICE);</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='ctx'> 		desc = chan-&gt;device-&gt;device_prep_slave_sg(chan, sg, ret,</div><div class='del'>-			DMA_FROM_DEVICE, DMA_CTRL_ACK);</div><div class='add'>+			DMA_DEV_TO_MEM, DMA_CTRL_ACK);</div><div class='ctx'> </div><div class='ctx'> 	if (desc) {</div><div class='ctx'> 		cookie = dmaengine_submit(desc);</div><div class='hunk'>@@ -158,7 +158,7 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host *host)</div><div class='ctx'> 	ret = dma_map_sg(chan-&gt;device-&gt;dev, sg, host-&gt;sg_len, DMA_TO_DEVICE);</div><div class='ctx'> 	if (ret &gt; 0)</div><div class='ctx'> 		desc = chan-&gt;device-&gt;device_prep_slave_sg(chan, sg, ret,</div><div class='del'>-			DMA_TO_DEVICE, DMA_CTRL_ACK);</div><div class='add'>+			DMA_MEM_TO_DEV, DMA_CTRL_ACK);</div><div class='ctx'> </div><div class='ctx'> 	if (desc) {</div><div class='ctx'> 		cookie = dmaengine_submit(desc);</div><div class='head'>diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c<br/>index 4208b3958069..abad01b37cfb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/tmio_mmc_pio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/tmio_mmc_pio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/tmio_mmc_pio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/tmio_mmc_pio.c</a></div><div class='hunk'>@@ -800,8 +800,7 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='ctx'> 	} else if (ios-&gt;power_mode != MMC_POWER_UP) {</div><div class='ctx'> 		if (host-&gt;set_pwr &amp;&amp; ios-&gt;power_mode == MMC_POWER_OFF)</div><div class='ctx'> 			host-&gt;set_pwr(host-&gt;pdev, 0);</div><div class='del'>-		if ((pdata-&gt;flags &amp; TMIO_MMC_HAS_COLD_CD) &amp;&amp;</div><div class='del'>-		    pdata-&gt;power) {</div><div class='add'>+		if (pdata-&gt;power) {</div><div class='ctx'> 			pdata-&gt;power = false;</div><div class='ctx'> 			pm_runtime_put(&amp;host-&gt;pdev-&gt;dev);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -915,6 +914,23 @@ int __devinit tmio_mmc_host_probe(struct tmio_mmc_host **host,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto pm_disable;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * There are 4 different scenarios for the card detection:</div><div class='add'>+	 *  1) an external gpio irq handles the cd (best for power savings)</div><div class='add'>+	 *  2) internal sdhi irq handles the cd</div><div class='add'>+	 *  3) a worker thread polls the sdhi - indicated by MMC_CAP_NEEDS_POLL</div><div class='add'>+	 *  4) the medium is non-removable - indicated by MMC_CAP_NONREMOVABLE</div><div class='add'>+	 *</div><div class='add'>+	 *  While we increment the rtpm counter for all scenarios when the mmc</div><div class='add'>+	 *  core activates us by calling an appropriate set_ios(), we must</div><div class='add'>+	 *  additionally ensure that in case 2) the tmio mmc hardware stays</div><div class='add'>+	 *  powered on during runtime for the card detection to work.</div><div class='add'>+	 */</div><div class='add'>+	if (!(pdata-&gt;flags &amp; TMIO_MMC_HAS_COLD_CD</div><div class='add'>+		|| mmc-&gt;caps &amp; MMC_CAP_NEEDS_POLL</div><div class='add'>+		|| mmc-&gt;caps &amp; MMC_CAP_NONREMOVABLE))</div><div class='add'>+		pm_runtime_get_noresume(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	tmio_mmc_clk_stop(_host);</div><div class='ctx'> 	tmio_mmc_reset(_host);</div><div class='ctx'> </div><div class='hunk'>@@ -933,12 +949,6 @@ int __devinit tmio_mmc_host_probe(struct tmio_mmc_host **host,</div><div class='ctx'> 	/* See if we also get DMA */</div><div class='ctx'> 	tmio_mmc_request_dma(_host, pdata);</div><div class='ctx'> </div><div class='del'>-	/* We have to keep the device powered for its card detection to work */</div><div class='del'>-	if (!(pdata-&gt;flags &amp; TMIO_MMC_HAS_COLD_CD)) {</div><div class='del'>-		pdata-&gt;power = true;</div><div class='del'>-		pm_runtime_get_noresume(&amp;pdev-&gt;dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	mmc_add_host(mmc);</div><div class='ctx'> </div><div class='ctx'> 	/* Unmask the IRQs we want to know about */</div><div class='hunk'>@@ -974,7 +984,9 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host)</div><div class='ctx'> 	 * the controller, the runtime PM is suspended and pdata-&gt;power == false,</div><div class='ctx'> 	 * so, our .runtime_resume() will not try to detect a card in the slot.</div><div class='ctx'> 	 */</div><div class='del'>-	if (host-&gt;pdata-&gt;flags &amp; TMIO_MMC_HAS_COLD_CD)</div><div class='add'>+	if (host-&gt;pdata-&gt;flags &amp; TMIO_MMC_HAS_COLD_CD</div><div class='add'>+		|| host-&gt;mmc-&gt;caps &amp; MMC_CAP_NEEDS_POLL</div><div class='add'>+		|| host-&gt;mmc-&gt;caps &amp; MMC_CAP_NONREMOVABLE)</div><div class='ctx'> 		pm_runtime_get_sync(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	mmc_remove_host(host-&gt;mmc);</div><div class='head'>diff --git a/drivers/mmc/host/ushc.c b/drivers/mmc/host/ushc.c<br/>index f08f944ac53c..c0105a2e269a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/ushc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/ushc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/ushc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/ushc.c</a></div><div class='hunk'>@@ -562,17 +562,7 @@ static struct usb_driver ushc_driver = {</div><div class='ctx'> 	.disconnect = ushc_disconnect,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ushc_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;ushc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(ushc_init);</div><div class='del'>-</div><div class='del'>-static void __exit ushc_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;ushc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(ushc_exit);</div><div class='add'>+module_usb_driver(ushc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("USB SD Host Controller driver");</div><div class='ctx'> MODULE_AUTHOR("David Vrabel &lt;david.vrabel@csr.com&gt;");</div><div class='head'>diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c<br/>index 2ec978bc32ba..3135a1a5d75d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/host/vub300.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mmc/host/vub300.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/host/vub300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mmc/host/vub300.c</a></div><div class='hunk'>@@ -223,25 +223,25 @@ enum SD_RESPONSE_TYPE {</div><div class='ctx'> #define FUN(c) (0x000007 &amp; (c-&gt;arg&gt;&gt;28))</div><div class='ctx'> #define REG(c) (0x01FFFF &amp; (c-&gt;arg&gt;&gt;9))</div><div class='ctx'> </div><div class='del'>-static int limit_speed_to_24_MHz;</div><div class='add'>+static bool limit_speed_to_24_MHz;</div><div class='ctx'> module_param(limit_speed_to_24_MHz, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(limit_speed_to_24_MHz, "Limit Max SDIO Clock Speed to 24 MHz");</div><div class='ctx'> </div><div class='del'>-static int pad_input_to_usb_pkt;</div><div class='add'>+static bool pad_input_to_usb_pkt;</div><div class='ctx'> module_param(pad_input_to_usb_pkt, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(pad_input_to_usb_pkt,</div><div class='ctx'> 		 "Pad USB data input transfers to whole USB Packet");</div><div class='ctx'> </div><div class='del'>-static int disable_offload_processing;</div><div class='add'>+static bool disable_offload_processing;</div><div class='ctx'> module_param(disable_offload_processing, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(disable_offload_processing, "Disable Offload Processing");</div><div class='ctx'> </div><div class='del'>-static int force_1_bit_data_xfers;</div><div class='add'>+static bool force_1_bit_data_xfers;</div><div class='ctx'> module_param(force_1_bit_data_xfers, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(force_1_bit_data_xfers,</div><div class='ctx'> 		 "Force SDIO Data Transfers to 1-bit Mode");</div><div class='ctx'> </div><div class='del'>-static int force_polling_for_irqs;</div><div class='add'>+static bool force_polling_for_irqs;</div><div class='ctx'> module_param(force_polling_for_irqs, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(force_polling_for_irqs, "Force Polling for SDIO interrupts");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig<br/>index 318a869286ab..1be621841400 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/Kconfig</a></div><div class='hunk'>@@ -140,6 +140,14 @@ config MTD_AR7_PARTS</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  TI AR7 partitioning support</div><div class='ctx'> </div><div class='add'>+config MTD_BCM63XX_PARTS</div><div class='add'>+	tristate "BCM63XX CFE partitioning support"</div><div class='add'>+	depends on BCM63XX</div><div class='add'>+	select CRC32</div><div class='add'>+	help</div><div class='add'>+	  This provides partions parsing for BCM63xx devices with CFE</div><div class='add'>+	  bootloaders.</div><div class='add'>+</div><div class='ctx'> comment "User Modules And Translation Layers"</div><div class='ctx'> </div><div class='ctx'> config MTD_CHAR</div><div class='head'>diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile<br/>index 9aaac3ac89f3..f90135429dc7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/Makefile</a></div><div class='hunk'>@@ -11,6 +11,7 @@ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o</div><div class='ctx'> obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o</div><div class='ctx'> obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o</div><div class='ctx'> obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o</div><div class='add'>+obj-$(CONFIG_MTD_BCM63XX_PARTS)	+= bcm63xxpart.o</div><div class='ctx'> </div><div class='ctx'> # 'Users' - code which presents functionality to userspace.</div><div class='ctx'> obj-$(CONFIG_MTD_CHAR)		+= mtdchar.o</div><div class='head'>diff --git a/drivers/mtd/afs.c b/drivers/mtd/afs.c<br/>index 89a02f6f65dc..5a3942bf109c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/afs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/afs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/afs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/afs.c</a></div><div class='hunk'>@@ -75,7 +75,7 @@ afs_read_footer(struct mtd_info *mtd, u_int *img_start, u_int *iis_start,</div><div class='ctx'> 	size_t sz;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = mtd-&gt;read(mtd, ptr, sizeof(fs), &amp;sz, (u_char *) &amp;fs);</div><div class='add'>+	ret = mtd_read(mtd, ptr, sizeof(fs), &amp;sz, (u_char *)&amp;fs);</div><div class='ctx'> 	if (ret &gt;= 0 &amp;&amp; sz != sizeof(fs))</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -132,7 +132,7 @@ afs_read_iis(struct mtd_info *mtd, struct image_info_struct *iis, u_int ptr)</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> </div><div class='ctx'> 	memset(iis, 0, sizeof(*iis));</div><div class='del'>-	ret = mtd-&gt;read(mtd, ptr, sizeof(*iis), &amp;sz, (u_char *) iis);</div><div class='add'>+	ret = mtd_read(mtd, ptr, sizeof(*iis), &amp;sz, (u_char *)iis);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto failed;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/ar7part.c b/drivers/mtd/ar7part.c<br/>index f40ea4547554..945393129952 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/ar7part.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ar7part.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/ar7part.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/ar7part.c</a></div><div class='hunk'>@@ -73,8 +73,8 @@ static int create_mtd_partitions(struct mtd_info *master,</div><div class='ctx'> </div><div class='ctx'> 	do { /* Try 10 blocks starting from master-&gt;erasesize */</div><div class='ctx'> 		offset = pre_size;</div><div class='del'>-		master-&gt;read(master, offset,</div><div class='del'>-			     sizeof(header), &amp;len, (uint8_t *)&amp;header);</div><div class='add'>+		mtd_read(master, offset, sizeof(header), &amp;len,</div><div class='add'>+			 (uint8_t *)&amp;header);</div><div class='ctx'> 		if (!strncmp((char *)&amp;header, "TIENV0.8", 8))</div><div class='ctx'> 			ar7_parts[1].offset = pre_size;</div><div class='ctx'> 		if (header.checksum == LOADER_MAGIC1)</div><div class='hunk'>@@ -95,16 +95,16 @@ static int create_mtd_partitions(struct mtd_info *master,</div><div class='ctx'> 	case LOADER_MAGIC1:</div><div class='ctx'> 		while (header.length) {</div><div class='ctx'> 			offset += sizeof(header) + header.length;</div><div class='del'>-			master-&gt;read(master, offset, sizeof(header),</div><div class='del'>-				     &amp;len, (uint8_t *)&amp;header);</div><div class='add'>+			mtd_read(master, offset, sizeof(header), &amp;len,</div><div class='add'>+				 (uint8_t *)&amp;header);</div><div class='ctx'> 		}</div><div class='ctx'> 		root_offset = offset + sizeof(header) + 4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LOADER_MAGIC2:</div><div class='ctx'> 		while (header.length) {</div><div class='ctx'> 			offset += sizeof(header) + header.length;</div><div class='del'>-			master-&gt;read(master, offset, sizeof(header),</div><div class='del'>-				     &amp;len, (uint8_t *)&amp;header);</div><div class='add'>+			mtd_read(master, offset, sizeof(header), &amp;len,</div><div class='add'>+				 (uint8_t *)&amp;header);</div><div class='ctx'> 		}</div><div class='ctx'> 		root_offset = offset + sizeof(header) + 4 + 0xff;</div><div class='ctx'> 		root_offset &amp;= ~(uint32_t)0xff;</div><div class='hunk'>@@ -114,8 +114,7 @@ static int create_mtd_partitions(struct mtd_info *master,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	master-&gt;read(master, root_offset,</div><div class='del'>-		sizeof(header), &amp;len, (u8 *)&amp;header);</div><div class='add'>+	mtd_read(master, root_offset, sizeof(header), &amp;len, (u8 *)&amp;header);</div><div class='ctx'> 	if (header.checksum != SQUASHFS_MAGIC) {</div><div class='ctx'> 		root_offset += master-&gt;erasesize - 1;</div><div class='ctx'> 		root_offset &amp;= ~(master-&gt;erasesize - 1);</div><div class='head'>diff --git a/drivers/mtd/bcm63xxpart.c b/drivers/mtd/bcm63xxpart.c<br/>new file mode 100644<br/>index 000000000000..608321ee056e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/bcm63xxpart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/bcm63xxpart.c</a></div><div class='hunk'>@@ -0,0 +1,222 @@</div><div class='add'>+/*</div><div class='add'>+ * BCM63XX CFE image tag parser</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2006-2008  Florian Fainelli &lt;florian@openwrt.org&gt;</div><div class='add'>+ *			  Mike Albon &lt;malbon@openwrt.org&gt;</div><div class='add'>+ * Copyright © 2009-2010  Daniel Dickinson &lt;openwrt@cshore.neomailbox.net&gt;</div><div class='add'>+ * Copyright © 2011 Jonas Gorski &lt;jonas.gorski@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'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach-bcm63xx/bcm963xx_tag.h&gt;</div><div class='add'>+#include &lt;asm/mach-bcm63xx/board_bcm963xx.h&gt;</div><div class='add'>+</div><div class='add'>+#define BCM63XX_EXTENDED_SIZE	0xBFC00000	/* Extended flash address */</div><div class='add'>+</div><div class='add'>+#define BCM63XX_MIN_CFE_SIZE	0x10000		/* always at least 64KiB */</div><div class='add'>+#define BCM63XX_MIN_NVRAM_SIZE	0x10000		/* always at least 64KiB */</div><div class='add'>+</div><div class='add'>+#define BCM63XX_CFE_MAGIC_OFFSET 0x4e0</div><div class='add'>+</div><div class='add'>+static int bcm63xx_detect_cfe(struct mtd_info *master)</div><div class='add'>+{</div><div class='add'>+	char buf[9];</div><div class='add'>+	int ret;</div><div class='add'>+	size_t retlen;</div><div class='add'>+</div><div class='add'>+	ret = mtd_read(master, BCM963XX_CFE_VERSION_OFFSET, 5, &amp;retlen,</div><div class='add'>+		       (void *)buf);</div><div class='add'>+	buf[retlen] = 0;</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 (strncmp("cfe-v", buf, 5) == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* very old CFE's do not have the cfe-v string, so check for magic */</div><div class='add'>+	ret = mtd_read(master, BCM63XX_CFE_MAGIC_OFFSET, 8, &amp;retlen,</div><div class='add'>+		       (void *)buf);</div><div class='add'>+	buf[retlen] = 0;</div><div class='add'>+</div><div class='add'>+	return strncmp("CFE1CFE1", buf, 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,</div><div class='add'>+					struct mtd_partition **pparts,</div><div class='add'>+					struct mtd_part_parser_data *data)</div><div class='add'>+{</div><div class='add'>+	/* CFE, NVRAM and global Linux are always present */</div><div class='add'>+	int nrparts = 3, curpart = 0;</div><div class='add'>+	struct bcm_tag *buf;</div><div class='add'>+	struct mtd_partition *parts;</div><div class='add'>+	int ret;</div><div class='add'>+	size_t retlen;</div><div class='add'>+	unsigned int rootfsaddr, kerneladdr, spareaddr;</div><div class='add'>+	unsigned int rootfslen, kernellen, sparelen, totallen;</div><div class='add'>+	unsigned int cfelen, nvramlen;</div><div class='add'>+	int namelen = 0;</div><div class='add'>+	int i;</div><div class='add'>+	u32 computed_crc;</div><div class='add'>+</div><div class='add'>+	if (bcm63xx_detect_cfe(master))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cfelen = max_t(uint32_t, master-&gt;erasesize, BCM63XX_MIN_CFE_SIZE);</div><div class='add'>+	nvramlen = max_t(uint32_t, master-&gt;erasesize, BCM63XX_MIN_NVRAM_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Allocate memory for buffer */</div><div class='add'>+	buf = vmalloc(sizeof(struct bcm_tag));</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Get the tag */</div><div class='add'>+	ret = mtd_read(master, cfelen, sizeof(struct bcm_tag), &amp;retlen,</div><div class='add'>+		       (void *)buf);</div><div class='add'>+</div><div class='add'>+	if (retlen != sizeof(struct bcm_tag)) {</div><div class='add'>+		vfree(buf);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	computed_crc = crc32_le(IMAGETAG_CRC_START, (u8 *)buf,</div><div class='add'>+				offsetof(struct bcm_tag, header_crc));</div><div class='add'>+	if (computed_crc == buf-&gt;header_crc) {</div><div class='add'>+		char *boardid = &amp;(buf-&gt;board_id[0]);</div><div class='add'>+		char *tagversion = &amp;(buf-&gt;tag_version[0]);</div><div class='add'>+</div><div class='add'>+		sscanf(buf-&gt;kernel_address, "%u", &amp;kerneladdr);</div><div class='add'>+		sscanf(buf-&gt;kernel_length, "%u", &amp;kernellen);</div><div class='add'>+		sscanf(buf-&gt;total_length, "%u", &amp;totallen);</div><div class='add'>+</div><div class='add'>+		pr_info("CFE boot tag found with version %s and board type %s\n",</div><div class='add'>+			tagversion, boardid);</div><div class='add'>+</div><div class='add'>+		kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE;</div><div class='add'>+		rootfsaddr = kerneladdr + kernellen;</div><div class='add'>+		spareaddr = roundup(totallen, master-&gt;erasesize) + cfelen;</div><div class='add'>+		sparelen = master-&gt;size - spareaddr - nvramlen;</div><div class='add'>+		rootfslen = spareaddr - rootfsaddr;</div><div class='add'>+	} else {</div><div class='add'>+		pr_warn("CFE boot tag CRC invalid (expected %08x, actual %08x)\n",</div><div class='add'>+			buf-&gt;header_crc, computed_crc);</div><div class='add'>+		kernellen = 0;</div><div class='add'>+		rootfslen = 0;</div><div class='add'>+		rootfsaddr = 0;</div><div class='add'>+		spareaddr = cfelen;</div><div class='add'>+		sparelen = master-&gt;size - cfelen - nvramlen;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Determine number of partitions */</div><div class='add'>+	namelen = 8;</div><div class='add'>+	if (rootfslen &gt; 0) {</div><div class='add'>+		nrparts++;</div><div class='add'>+		namelen += 6;</div><div class='add'>+	}</div><div class='add'>+	if (kernellen &gt; 0) {</div><div class='add'>+		nrparts++;</div><div class='add'>+		namelen += 6;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ask kernel for more memory */</div><div class='add'>+	parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL);</div><div class='add'>+	if (!parts) {</div><div class='add'>+		vfree(buf);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Start building partition list */</div><div class='add'>+	parts[curpart].name = "CFE";</div><div class='add'>+	parts[curpart].offset = 0;</div><div class='add'>+	parts[curpart].size = cfelen;</div><div class='add'>+	curpart++;</div><div class='add'>+</div><div class='add'>+	if (kernellen &gt; 0) {</div><div class='add'>+		parts[curpart].name = "kernel";</div><div class='add'>+		parts[curpart].offset = kerneladdr;</div><div class='add'>+		parts[curpart].size = kernellen;</div><div class='add'>+		curpart++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rootfslen &gt; 0) {</div><div class='add'>+		parts[curpart].name = "rootfs";</div><div class='add'>+		parts[curpart].offset = rootfsaddr;</div><div class='add'>+		parts[curpart].size = rootfslen;</div><div class='add'>+		if (sparelen &gt; 0)</div><div class='add'>+			parts[curpart].size += sparelen;</div><div class='add'>+		curpart++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	parts[curpart].name = "nvram";</div><div class='add'>+	parts[curpart].offset = master-&gt;size - nvramlen;</div><div class='add'>+	parts[curpart].size = nvramlen;</div><div class='add'>+</div><div class='add'>+	/* Global partition "linux" to make easy firmware upgrade */</div><div class='add'>+	curpart++;</div><div class='add'>+	parts[curpart].name = "linux";</div><div class='add'>+	parts[curpart].offset = cfelen;</div><div class='add'>+	parts[curpart].size = master-&gt;size - cfelen - nvramlen;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nrparts; i++)</div><div class='add'>+		pr_info("Partition %d is %s offset %lx and length %lx\n", i,</div><div class='add'>+			parts[i].name, (long unsigned int)(parts[i].offset),</div><div class='add'>+			(long unsigned int)(parts[i].size));</div><div class='add'>+</div><div class='add'>+	pr_info("Spare partition is offset %x and length %x\n",	spareaddr,</div><div class='add'>+		sparelen);</div><div class='add'>+</div><div class='add'>+	*pparts = parts;</div><div class='add'>+	vfree(buf);</div><div class='add'>+</div><div class='add'>+	return nrparts;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mtd_part_parser bcm63xx_cfe_parser = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.parse_fn = bcm63xx_parse_cfe_partitions,</div><div class='add'>+	.name = "bcm63xxpart",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init bcm63xx_cfe_parser_init(void)</div><div class='add'>+{</div><div class='add'>+	return register_mtd_parser(&amp;bcm63xx_cfe_parser);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit bcm63xx_cfe_parser_exit(void)</div><div class='add'>+{</div><div class='add'>+	deregister_mtd_parser(&amp;bcm63xx_cfe_parser);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(bcm63xx_cfe_parser_init);</div><div class='add'>+module_exit(bcm63xx_cfe_parser_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Daniel Dickinson &lt;openwrt@cshore.neomailbox.net&gt;");</div><div class='add'>+MODULE_AUTHOR("Florian Fainelli &lt;florian@openwrt.org&gt;");</div><div class='add'>+MODULE_AUTHOR("Mike Albon &lt;malbon@openwrt.org&gt;");</div><div class='add'>+MODULE_AUTHOR("Jonas Gorski &lt;jonas.gorski@gmail.com");</div><div class='add'>+MODULE_DESCRIPTION("MTD partitioning for BCM63XX CFE bootloaders");</div><div class='head'>diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c<br/>index 179814a95f3a..85e80180b65b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/chips/cfi_cmdset_0020.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/chips/cfi_cmdset_0020.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/chips/cfi_cmdset_0020.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/chips/cfi_cmdset_0020.c</a></div><div class='hunk'>@@ -139,8 +139,9 @@ struct mtd_info *cfi_cmdset_0020(struct map_info *map, int primary)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Do some byteswapping if necessary */</div><div class='del'>-		extp-&gt;FeatureSupport = cfi32_to_cpu(extp-&gt;FeatureSupport);</div><div class='del'>-		extp-&gt;BlkStatusRegMask = cfi32_to_cpu(extp-&gt;BlkStatusRegMask);</div><div class='add'>+		extp-&gt;FeatureSupport = cfi32_to_cpu(map, extp-&gt;FeatureSupport);</div><div class='add'>+		extp-&gt;BlkStatusRegMask = cfi32_to_cpu(map,</div><div class='add'>+						extp-&gt;BlkStatusRegMask);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG_CFI_FEATURES</div><div class='ctx'> 		/* Tell the user about it in lots of lovely detail */</div><div class='hunk'>@@ -698,7 +699,8 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			memcpy(buffer+buflen, elem_base, ECCBUF_SIZE-buflen);</div><div class='del'>-			ret = mtd-&gt;write(mtd, to, ECCBUF_SIZE, &amp;thislen, buffer);</div><div class='add'>+			ret = mtd_write(mtd, to, ECCBUF_SIZE, &amp;thislen,</div><div class='add'>+					buffer);</div><div class='ctx'> 			totlen += thislen;</div><div class='ctx'> 			if (ret || thislen != ECCBUF_SIZE)</div><div class='ctx'> 				goto write_error;</div><div class='hunk'>@@ -707,7 +709,8 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,</div><div class='ctx'> 			to += ECCBUF_SIZE;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ECCBUF_DIV(elem_len)) { /* write clean aligned data */</div><div class='del'>-			ret = mtd-&gt;write(mtd, to, ECCBUF_DIV(elem_len), &amp;thislen, elem_base);</div><div class='add'>+			ret = mtd_write(mtd, to, ECCBUF_DIV(elem_len),</div><div class='add'>+					&amp;thislen, elem_base);</div><div class='ctx'> 			totlen += thislen;</div><div class='ctx'> 			if (ret || thislen != ECCBUF_DIV(elem_len))</div><div class='ctx'> 				goto write_error;</div><div class='hunk'>@@ -721,7 +724,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (buflen) { /* flush last page, even if not full */</div><div class='ctx'> 		/* This is sometimes intended behaviour, really */</div><div class='del'>-		ret = mtd-&gt;write(mtd, to, buflen, &amp;thislen, buffer);</div><div class='add'>+		ret = mtd_write(mtd, to, buflen, &amp;thislen, buffer);</div><div class='ctx'> 		totlen += thislen;</div><div class='ctx'> 		if (ret || thislen != ECCBUF_SIZE)</div><div class='ctx'> 			goto write_error;</div><div class='head'>diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig<br/>index 283d887f7825..37b05c3f2792 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/devices/Kconfig</a></div><div class='hunk'>@@ -191,6 +191,7 @@ comment "Disk-On-Chip Device Drivers"</div><div class='ctx'> </div><div class='ctx'> config MTD_DOC2000</div><div class='ctx'> 	tristate "M-Systems Disk-On-Chip 2000 and Millennium (DEPRECATED)"</div><div class='add'>+	depends on MTD_NAND</div><div class='ctx'> 	select MTD_DOCPROBE</div><div class='ctx'> 	select MTD_NAND_IDS</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -213,6 +214,7 @@ config MTD_DOC2000</div><div class='ctx'> </div><div class='ctx'> config MTD_DOC2001</div><div class='ctx'> 	tristate "M-Systems Disk-On-Chip Millennium-only alternative driver (DEPRECATED)"</div><div class='add'>+	depends on MTD_NAND</div><div class='ctx'> 	select MTD_DOCPROBE</div><div class='ctx'> 	select MTD_NAND_IDS</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -234,6 +236,7 @@ config MTD_DOC2001</div><div class='ctx'> </div><div class='ctx'> config MTD_DOC2001PLUS</div><div class='ctx'> 	tristate "M-Systems Disk-On-Chip Millennium Plus"</div><div class='add'>+	depends on MTD_NAND</div><div class='ctx'> 	select MTD_DOCPROBE</div><div class='ctx'> 	select MTD_NAND_IDS</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -251,6 +254,8 @@ config MTD_DOC2001PLUS</div><div class='ctx'> </div><div class='ctx'> config MTD_DOCG3</div><div class='ctx'> 	tristate "M-Systems Disk-On-Chip G3"</div><div class='add'>+	select BCH</div><div class='add'>+	select BCH_CONST_PARAMS</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This provides an MTD device driver for the M-Systems DiskOnChip</div><div class='ctx'> 	  G3 devices.</div><div class='hunk'>@@ -259,6 +264,13 @@ config MTD_DOCG3</div><div class='ctx'> 	  M-Systems and now Sandisk. The support is very experimental,</div><div class='ctx'> 	  and doesn't give access to any write operations.</div><div class='ctx'> </div><div class='add'>+if MTD_DOCG3</div><div class='add'>+config BCH_CONST_M</div><div class='add'>+	default 14</div><div class='add'>+config BCH_CONST_T</div><div class='add'>+	default 4</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> config MTD_DOCPROBE</div><div class='ctx'> 	tristate</div><div class='ctx'> 	select MTD_DOCECC</div><div class='head'>diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c<br/>index b78f23169d4e..e7e46d1e7463 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/block2mtd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/block2mtd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/block2mtd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/devices/block2mtd.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -288,7 +287,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)</div><div class='ctx'> 	dev-&gt;mtd.flags = MTD_CAP_RAM;</div><div class='ctx'> 	dev-&gt;mtd.erase = block2mtd_erase;</div><div class='ctx'> 	dev-&gt;mtd.write = block2mtd_write;</div><div class='del'>-	dev-&gt;mtd.writev = default_mtd_writev;</div><div class='add'>+	dev-&gt;mtd.writev = mtd_writev;</div><div class='ctx'> 	dev-&gt;mtd.sync = block2mtd_sync;</div><div class='ctx'> 	dev-&gt;mtd.read = block2mtd_read;</div><div class='ctx'> 	dev-&gt;mtd.priv = dev;</div><div class='head'>diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c<br/>index e9fad9151219..b1cdf6479019 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/doc2000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/doc2000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/doc2000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/devices/doc2000.c</a></div><div class='hunk'>@@ -562,23 +562,14 @@ void DoC2k_init(struct mtd_info *mtd)</div><div class='ctx'> </div><div class='ctx'> 	mtd-&gt;type = MTD_NANDFLASH;</div><div class='ctx'> 	mtd-&gt;flags = MTD_CAP_NANDFLASH;</div><div class='del'>-	mtd-&gt;size = 0;</div><div class='del'>-	mtd-&gt;erasesize = 0;</div><div class='ctx'> 	mtd-&gt;writesize = 512;</div><div class='ctx'> 	mtd-&gt;oobsize = 16;</div><div class='ctx'> 	mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	mtd-&gt;erase = doc_erase;</div><div class='del'>-	mtd-&gt;point = NULL;</div><div class='del'>-	mtd-&gt;unpoint = NULL;</div><div class='ctx'> 	mtd-&gt;read = doc_read;</div><div class='ctx'> 	mtd-&gt;write = doc_write;</div><div class='ctx'> 	mtd-&gt;read_oob = doc_read_oob;</div><div class='ctx'> 	mtd-&gt;write_oob = doc_write_oob;</div><div class='del'>-	mtd-&gt;sync = NULL;</div><div class='del'>-</div><div class='del'>-	this-&gt;totlen = 0;</div><div class='del'>-	this-&gt;numchips = 0;</div><div class='del'>-</div><div class='ctx'> 	this-&gt;curfloor = -1;</div><div class='ctx'> 	this-&gt;curchip = -1;</div><div class='ctx'> 	mutex_init(&amp;this-&gt;lock);</div><div class='head'>diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c<br/>index a3f7a27499be..7543b98f46c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/doc2001.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/doc2001.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/doc2001.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/devices/doc2001.c</a></div><div class='hunk'>@@ -343,25 +343,17 @@ void DoCMil_init(struct mtd_info *mtd)</div><div class='ctx'> </div><div class='ctx'> 	mtd-&gt;type = MTD_NANDFLASH;</div><div class='ctx'> 	mtd-&gt;flags = MTD_CAP_NANDFLASH;</div><div class='del'>-	mtd-&gt;size = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: erase size is not always 8KiB */</div><div class='ctx'> 	mtd-&gt;erasesize = 0x2000;</div><div class='del'>-</div><div class='ctx'> 	mtd-&gt;writesize = 512;</div><div class='ctx'> 	mtd-&gt;oobsize = 16;</div><div class='ctx'> 	mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	mtd-&gt;erase = doc_erase;</div><div class='del'>-	mtd-&gt;point = NULL;</div><div class='del'>-	mtd-&gt;unpoint = NULL;</div><div class='ctx'> 	mtd-&gt;read = doc_read;</div><div class='ctx'> 	mtd-&gt;write = doc_write;</div><div class='ctx'> 	mtd-&gt;read_oob = doc_read_oob;</div><div class='ctx'> 	mtd-&gt;write_oob = doc_write_oob;</div><div class='del'>-	mtd-&gt;sync = NULL;</div><div class='del'>-</div><div class='del'>-	this-&gt;totlen = 0;</div><div class='del'>-	this-&gt;numchips = 0;</div><div class='ctx'> 	this-&gt;curfloor = -1;</div><div class='ctx'> 	this-&gt;curchip = -1;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c<br/>index 99351bc3e0ed..177510d0e7ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/doc2001plus.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/doc2001plus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/doc2001plus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/devices/doc2001plus.c</a></div><div class='hunk'>@@ -467,23 +467,14 @@ void DoCMilPlus_init(struct mtd_info *mtd)</div><div class='ctx'> </div><div class='ctx'> 	mtd-&gt;type = MTD_NANDFLASH;</div><div class='ctx'> 	mtd-&gt;flags = MTD_CAP_NANDFLASH;</div><div class='del'>-	mtd-&gt;size = 0;</div><div class='del'>-</div><div class='del'>-	mtd-&gt;erasesize = 0;</div><div class='ctx'> 	mtd-&gt;writesize = 512;</div><div class='ctx'> 	mtd-&gt;oobsize = 16;</div><div class='ctx'> 	mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	mtd-&gt;erase = doc_erase;</div><div class='del'>-	mtd-&gt;point = NULL;</div><div class='del'>-	mtd-&gt;unpoint = NULL;</div><div class='ctx'> 	mtd-&gt;read = doc_read;</div><div class='ctx'> 	mtd-&gt;write = doc_write;</div><div class='ctx'> 	mtd-&gt;read_oob = doc_read_oob;</div><div class='ctx'> 	mtd-&gt;write_oob = doc_write_oob;</div><div class='del'>-	mtd-&gt;sync = NULL;</div><div class='del'>-</div><div class='del'>-	this-&gt;totlen = 0;</div><div class='del'>-	this-&gt;numchips = 0;</div><div class='ctx'> 	this-&gt;curfloor = -1;</div><div class='ctx'> 	this-&gt;curchip = -1;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c<br/>index bdcf5df982e8..ad11ef0a81f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/docg3.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/docg3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/docg3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/devices/docg3.c</a></div><div class='hunk'>@@ -29,6 +29,9 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/bitmap.h&gt;</div><div class='add'>+#include &lt;linux/bitrev.h&gt;</div><div class='add'>+#include &lt;linux/bch.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='hunk'>@@ -41,11 +44,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * As no specification is available from M-Systems/Sandisk, this drivers lacks</div><div class='ctx'>  * several functions available on the chip, as :</div><div class='del'>- *  - block erase</div><div class='del'>- *  - page write</div><div class='ctx'>  *  - IPL write</div><div class='del'>- *  - ECC fixing (lack of BCH algorith understanding)</div><div class='del'>- *  - powerdown / powerup</div><div class='ctx'>  *</div><div class='ctx'>  * The bus data width (8bits versus 16bits) is not handled (if_cfg flag), and</div><div class='ctx'>  * the driver assumes a 16bits data bus.</div><div class='hunk'>@@ -53,8 +52,7 @@</div><div class='ctx'>  * DocG3 relies on 2 ECC algorithms, which are handled in hardware :</div><div class='ctx'>  *  - a 1 byte Hamming code stored in the OOB for each page</div><div class='ctx'>  *  - a 7 bytes BCH code stored in the OOB for each page</div><div class='del'>- * The BCH part is only used for check purpose, no correction is available as</div><div class='del'>- * some information is missing. What is known is that :</div><div class='add'>+ * The BCH ECC is :</div><div class='ctx'>  *  - BCH is in GF(2^14)</div><div class='ctx'>  *  - BCH is over data of 520 bytes (512 page + 7 page_info bytes</div><div class='ctx'>  *                                   + 1 hamming byte)</div><div class='hunk'>@@ -63,6 +61,30 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+static unsigned int reliable_mode;</div><div class='add'>+module_param(reliable_mode, uint, 0);</div><div class='add'>+MODULE_PARM_DESC(reliable_mode, "Set the docg3 mode (0=normal MLC, 1=fast, "</div><div class='add'>+		 "2=reliable) : MLC normal operations are in normal mode");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct docg3_oobinfo - DiskOnChip G3 OOB layout</div><div class='add'>+ * @eccbytes: 8 bytes are used (1 for Hamming ECC, 7 for BCH ECC)</div><div class='add'>+ * @eccpos: ecc positions (byte 7 is Hamming ECC, byte 8-14 are BCH ECC)</div><div class='add'>+ * @oobfree: free pageinfo bytes (byte 0 until byte 6, byte 15</div><div class='add'>+ * @oobavail: 8 available bytes remaining after ECC toll</div><div class='add'>+ */</div><div class='add'>+static struct nand_ecclayout docg3_oobinfo = {</div><div class='add'>+	.eccbytes = 8,</div><div class='add'>+	.eccpos = {7, 8, 9, 10, 11, 12, 13, 14},</div><div class='add'>+	.oobfree = {{0, 7}, {15, 1} },</div><div class='add'>+	.oobavail = 8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct docg3_bch - BCH engine</div><div class='add'>+ */</div><div class='add'>+static struct bch_control *docg3_bch;</div><div class='add'>+</div><div class='ctx'> static inline u8 doc_readb(struct docg3 *docg3, u16 reg)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val = readb(docg3-&gt;base + reg);</div><div class='hunk'>@@ -82,7 +104,7 @@ static inline u16 doc_readw(struct docg3 *docg3, u16 reg)</div><div class='ctx'> static inline void doc_writeb(struct docg3 *docg3, u8 val, u16 reg)</div><div class='ctx'> {</div><div class='ctx'> 	writeb(val, docg3-&gt;base + reg);</div><div class='del'>-	trace_docg3_io(1, 16, reg, val);</div><div class='add'>+	trace_docg3_io(1, 8, reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void doc_writew(struct docg3 *docg3, u16 val, u16 reg)</div><div class='hunk'>@@ -143,7 +165,7 @@ static void doc_delay(struct docg3 *docg3, int nbNOPs)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	doc_dbg("NOP x %d\n", nbNOPs);</div><div class='add'>+	doc_vdbg("NOP x %d\n", nbNOPs);</div><div class='ctx'> 	for (i = 0; i &lt; nbNOPs; i++)</div><div class='ctx'> 		doc_writeb(docg3, 0, DOC_NOP);</div><div class='ctx'> }</div><div class='hunk'>@@ -196,8 +218,8 @@ static int doc_reset_seq(struct docg3 *docg3)</div><div class='ctx'> /**</div><div class='ctx'>  * doc_read_data_area - Read data from data area</div><div class='ctx'>  * @docg3: the device</div><div class='del'>- * @buf: the buffer to fill in</div><div class='del'>- * @len: the lenght to read</div><div class='add'>+ * @buf: the buffer to fill in (might be NULL is dummy reads)</div><div class='add'>+ * @len: the length to read</div><div class='ctx'>  * @first: first time read, DOC_READADDRESS should be set</div><div class='ctx'>  *</div><div class='ctx'>  * Reads bytes from flash data. Handles the single byte / even bytes reads.</div><div class='hunk'>@@ -218,8 +240,10 @@ static void doc_read_data_area(struct docg3 *docg3, void *buf, int len,</div><div class='ctx'> 	dst16 = buf;</div><div class='ctx'> 	for (i = 0; i &lt; len4; i += 2) {</div><div class='ctx'> 		data16 = doc_readw(docg3, DOC_IOSPACE_DATA);</div><div class='del'>-		*dst16 = data16;</div><div class='del'>-		dst16++;</div><div class='add'>+		if (dst16) {</div><div class='add'>+			*dst16 = data16;</div><div class='add'>+			dst16++;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cdr) {</div><div class='hunk'>@@ -229,26 +253,84 @@ static void doc_read_data_area(struct docg3 *docg3, void *buf, int len,</div><div class='ctx'> 		dst8 = (u8 *)dst16;</div><div class='ctx'> 		for (i = 0; i &lt; cdr; i++) {</div><div class='ctx'> 			data8 = doc_readb(docg3, DOC_IOSPACE_DATA);</div><div class='del'>-			*dst8 = data8;</div><div class='del'>-			dst8++;</div><div class='add'>+			if (dst8) {</div><div class='add'>+				*dst8 = data8;</div><div class='add'>+				dst8++;</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'>- * doc_set_data_mode - Sets the flash to reliable data mode</div><div class='add'>+ * doc_write_data_area - Write data into data area</div><div class='add'>+ * @docg3: the device</div><div class='add'>+ * @buf: the buffer to get input bytes from</div><div class='add'>+ * @len: the length to write</div><div class='add'>+ *</div><div class='add'>+ * Writes bytes into flash data. Handles the single byte / even bytes writes.</div><div class='add'>+ */</div><div class='add'>+static void doc_write_data_area(struct docg3 *docg3, const void *buf, int len)</div><div class='add'>+{</div><div class='add'>+	int i, cdr, len4;</div><div class='add'>+	u16 *src16;</div><div class='add'>+	u8 *src8;</div><div class='add'>+</div><div class='add'>+	doc_dbg("doc_write_data_area(buf=%p, len=%d)\n", buf, len);</div><div class='add'>+	cdr = len &amp; 0x3;</div><div class='add'>+	len4 = len - cdr;</div><div class='add'>+</div><div class='add'>+	doc_writew(docg3, DOC_IOSPACE_DATA, DOC_READADDRESS);</div><div class='add'>+	src16 = (u16 *)buf;</div><div class='add'>+	for (i = 0; i &lt; len4; i += 2) {</div><div class='add'>+		doc_writew(docg3, *src16, DOC_IOSPACE_DATA);</div><div class='add'>+		src16++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	src8 = (u8 *)src16;</div><div class='add'>+	for (i = 0; i &lt; cdr; i++) {</div><div class='add'>+		doc_writew(docg3, DOC_IOSPACE_DATA | DOC_READADDR_ONE_BYTE,</div><div class='add'>+			   DOC_READADDRESS);</div><div class='add'>+		doc_writeb(docg3, *src8, DOC_IOSPACE_DATA);</div><div class='add'>+		src8++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * doc_set_data_mode - Sets the flash to normal or reliable data mode</div><div class='ctx'>  * @docg3: the device</div><div class='ctx'>  *</div><div class='ctx'>  * The reliable data mode is a bit slower than the fast mode, but less errors</div><div class='ctx'>  * occur.  Entering the reliable mode cannot be done without entering the fast</div><div class='ctx'>  * mode first.</div><div class='add'>+ *</div><div class='add'>+ * In reliable mode, pages 2*n and 2*n+1 are clones. Writing to page 0 of blocks</div><div class='add'>+ * (4,5) make the hardware write also to page 1 of blocks blocks(4,5). Reading</div><div class='add'>+ * from page 0 of blocks (4,5) or from page 1 of blocks (4,5) gives the same</div><div class='add'>+ * result, which is a logical and between bytes from page 0 and page 1 (which is</div><div class='add'>+ * consistent with the fact that writing to a page is _clearing_ bits of that</div><div class='add'>+ * page).</div><div class='ctx'>  */</div><div class='ctx'> static void doc_set_reliable_mode(struct docg3 *docg3)</div><div class='ctx'> {</div><div class='del'>-	doc_dbg("doc_set_reliable_mode()\n");</div><div class='del'>-	doc_flash_sequence(docg3, DOC_SEQ_SET_MODE);</div><div class='del'>-	doc_flash_command(docg3, DOC_CMD_FAST_MODE);</div><div class='del'>-	doc_flash_command(docg3, DOC_CMD_RELIABLE_MODE);</div><div class='add'>+	static char *strmode[] = { "normal", "fast", "reliable", "invalid" };</div><div class='add'>+</div><div class='add'>+	doc_dbg("doc_set_reliable_mode(%s)\n", strmode[docg3-&gt;reliable]);</div><div class='add'>+	switch (docg3-&gt;reliable) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		doc_flash_sequence(docg3, DOC_SEQ_SET_FASTMODE);</div><div class='add'>+		doc_flash_command(docg3, DOC_CMD_FAST_MODE);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		doc_flash_sequence(docg3, DOC_SEQ_SET_RELIABLEMODE);</div><div class='add'>+		doc_flash_command(docg3, DOC_CMD_FAST_MODE);</div><div class='add'>+		doc_flash_command(docg3, DOC_CMD_RELIABLE_MODE);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		doc_err("doc_set_reliable_mode(): invalid mode\n");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	doc_delay(docg3, 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -325,6 +407,37 @@ static int doc_set_extra_page_mode(struct docg3 *docg3)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * doc_setup_addr_sector - Setup blocks/page/ofs address for one plane</div><div class='add'>+ * @docg3: the device</div><div class='add'>+ * @sector: the sector</div><div class='add'>+ */</div><div class='add'>+static void doc_setup_addr_sector(struct docg3 *docg3, int sector)</div><div class='add'>+{</div><div class='add'>+	doc_delay(docg3, 1);</div><div class='add'>+	doc_flash_address(docg3, sector &amp; 0xff);</div><div class='add'>+	doc_flash_address(docg3, (sector &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+	doc_flash_address(docg3, (sector &gt;&gt; 16) &amp; 0xff);</div><div class='add'>+	doc_delay(docg3, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * doc_setup_writeaddr_sector - Setup blocks/page/ofs address for one plane</div><div class='add'>+ * @docg3: the device</div><div class='add'>+ * @sector: the sector</div><div class='add'>+ * @ofs: the offset in the page, between 0 and (512 + 16 + 512)</div><div class='add'>+ */</div><div class='add'>+static void doc_setup_writeaddr_sector(struct docg3 *docg3, int sector, int ofs)</div><div class='add'>+{</div><div class='add'>+	ofs = ofs &gt;&gt; 2;</div><div class='add'>+	doc_delay(docg3, 1);</div><div class='add'>+	doc_flash_address(docg3, ofs &amp; 0xff);</div><div class='add'>+	doc_flash_address(docg3, sector &amp; 0xff);</div><div class='add'>+	doc_flash_address(docg3, (sector &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+	doc_flash_address(docg3, (sector &gt;&gt; 16) &amp; 0xff);</div><div class='add'>+	doc_delay(docg3, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * doc_seek - Set both flash planes to the specified block, page for reading</div><div class='ctx'>  * @docg3: the device</div><div class='ctx'>  * @block0: the first plane block index</div><div class='hunk'>@@ -360,34 +473,80 @@ static int doc_read_seek(struct docg3 *docg3, int block0, int block1, int page,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	sector = (block0 &lt;&lt; DOC_ADDR_BLOCK_SHIFT) + (page &amp; DOC_ADDR_PAGE_MASK);</div><div class='ctx'> 	doc_flash_sequence(docg3, DOC_SEQ_READ);</div><div class='add'>+	sector = (block0 &lt;&lt; DOC_ADDR_BLOCK_SHIFT) + (page &amp; DOC_ADDR_PAGE_MASK);</div><div class='ctx'> 	doc_flash_command(docg3, DOC_CMD_PROG_BLOCK_ADDR);</div><div class='del'>-	doc_delay(docg3, 1);</div><div class='del'>-	doc_flash_address(docg3, sector &amp; 0xff);</div><div class='del'>-	doc_flash_address(docg3, (sector &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-	doc_flash_address(docg3, (sector &gt;&gt; 16) &amp; 0xff);</div><div class='del'>-	doc_delay(docg3, 1);</div><div class='add'>+	doc_setup_addr_sector(docg3, sector);</div><div class='ctx'> </div><div class='ctx'> 	sector = (block1 &lt;&lt; DOC_ADDR_BLOCK_SHIFT) + (page &amp; DOC_ADDR_PAGE_MASK);</div><div class='ctx'> 	doc_flash_command(docg3, DOC_CMD_PROG_BLOCK_ADDR);</div><div class='add'>+	doc_setup_addr_sector(docg3, sector);</div><div class='ctx'> 	doc_delay(docg3, 1);</div><div class='del'>-	doc_flash_address(docg3, sector &amp; 0xff);</div><div class='del'>-	doc_flash_address(docg3, (sector &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-	doc_flash_address(docg3, (sector &gt;&gt; 16) &amp; 0xff);</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'>+ * doc_write_seek - Set both flash planes to the specified block, page for writing</div><div class='add'>+ * @docg3: the device</div><div class='add'>+ * @block0: the first plane block index</div><div class='add'>+ * @block1: the second plane block index</div><div class='add'>+ * @page: the page index within the block</div><div class='add'>+ * @ofs: offset in page to write</div><div class='add'>+ *</div><div class='add'>+ * Programs the flash even and odd planes to the specific block and page.</div><div class='add'>+ * Alternatively, programs the flash to the wear area of the specified page.</div><div class='add'>+ */</div><div class='add'>+static int doc_write_seek(struct docg3 *docg3, int block0, int block1, int page,</div><div class='add'>+			 int ofs)</div><div class='add'>+{</div><div class='add'>+	int ret = 0, sector;</div><div class='add'>+</div><div class='add'>+	doc_dbg("doc_write_seek(blocks=(%d,%d), page=%d, ofs=%d)\n",</div><div class='add'>+		block0, block1, page, ofs);</div><div class='add'>+</div><div class='add'>+	doc_set_reliable_mode(docg3);</div><div class='add'>+</div><div class='add'>+	if (ofs &lt; 2 * DOC_LAYOUT_PAGE_SIZE) {</div><div class='add'>+		doc_flash_sequence(docg3, DOC_SEQ_SET_PLANE1);</div><div class='add'>+		doc_flash_command(docg3, DOC_CMD_READ_PLANE1);</div><div class='add'>+		doc_delay(docg3, 2);</div><div class='add'>+	} else {</div><div class='add'>+		doc_flash_sequence(docg3, DOC_SEQ_SET_PLANE2);</div><div class='add'>+		doc_flash_command(docg3, DOC_CMD_READ_PLANE2);</div><div class='add'>+		doc_delay(docg3, 2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	doc_flash_sequence(docg3, DOC_SEQ_PAGE_SETUP);</div><div class='add'>+	doc_flash_command(docg3, DOC_CMD_PROG_CYCLE1);</div><div class='add'>+</div><div class='add'>+	sector = (block0 &lt;&lt; DOC_ADDR_BLOCK_SHIFT) + (page &amp; DOC_ADDR_PAGE_MASK);</div><div class='add'>+	doc_setup_writeaddr_sector(docg3, sector, ofs);</div><div class='add'>+</div><div class='add'>+	doc_flash_command(docg3, DOC_CMD_PROG_CYCLE3);</div><div class='ctx'> 	doc_delay(docg3, 2);</div><div class='add'>+	ret = doc_wait_ready(docg3);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	doc_flash_command(docg3, DOC_CMD_PROG_CYCLE1);</div><div class='add'>+	sector = (block1 &lt;&lt; DOC_ADDR_BLOCK_SHIFT) + (page &amp; DOC_ADDR_PAGE_MASK);</div><div class='add'>+	doc_setup_writeaddr_sector(docg3, sector, ofs);</div><div class='add'>+	doc_delay(docg3, 1);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * doc_read_page_ecc_init - Initialize hardware ECC engine</div><div class='ctx'>  * @docg3: the device</div><div class='ctx'>  * @len: the number of bytes covered by the ECC (BCH covered)</div><div class='ctx'>  *</div><div class='ctx'>  * The function does initialize the hardware ECC engine to compute the Hamming</div><div class='del'>- * ECC (on 1 byte) and the BCH Syndroms (on 7 bytes).</div><div class='add'>+ * ECC (on 1 byte) and the BCH hardware ECC (on 7 bytes).</div><div class='ctx'>  *</div><div class='ctx'>  * Return 0 if succeeded, -EIO on error</div><div class='ctx'>  */</div><div class='hunk'>@@ -403,6 +562,106 @@ static int doc_read_page_ecc_init(struct docg3 *docg3, int len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * doc_write_page_ecc_init - Initialize hardware BCH ECC engine</div><div class='add'>+ * @docg3: the device</div><div class='add'>+ * @len: the number of bytes covered by the ECC (BCH covered)</div><div class='add'>+ *</div><div class='add'>+ * The function does initialize the hardware ECC engine to compute the Hamming</div><div class='add'>+ * ECC (on 1 byte) and the BCH hardware ECC (on 7 bytes).</div><div class='add'>+ *</div><div class='add'>+ * Return 0 if succeeded, -EIO on error</div><div class='add'>+ */</div><div class='add'>+static int doc_write_page_ecc_init(struct docg3 *docg3, int len)</div><div class='add'>+{</div><div class='add'>+	doc_writew(docg3, DOC_ECCCONF0_WRITE_MODE</div><div class='add'>+		   | DOC_ECCCONF0_BCH_ENABLE | DOC_ECCCONF0_HAMMING_ENABLE</div><div class='add'>+		   | (len &amp; DOC_ECCCONF0_DATA_BYTES_MASK),</div><div class='add'>+		   DOC_ECCCONF0);</div><div class='add'>+	doc_delay(docg3, 4);</div><div class='add'>+	doc_register_readb(docg3, DOC_FLASHCONTROL);</div><div class='add'>+	return doc_wait_ready(docg3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * doc_ecc_disable - Disable Hamming and BCH ECC hardware calculator</div><div class='add'>+ * @docg3: the device</div><div class='add'>+ *</div><div class='add'>+ * Disables the hardware ECC generator and checker, for unchecked reads (as when</div><div class='add'>+ * reading OOB only or write status byte).</div><div class='add'>+ */</div><div class='add'>+static void doc_ecc_disable(struct docg3 *docg3)</div><div class='add'>+{</div><div class='add'>+	doc_writew(docg3, DOC_ECCCONF0_READ_MODE, DOC_ECCCONF0);</div><div class='add'>+	doc_delay(docg3, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * doc_hamming_ecc_init - Initialize hardware Hamming ECC engine</div><div class='add'>+ * @docg3: the device</div><div class='add'>+ * @nb_bytes: the number of bytes covered by the ECC (Hamming covered)</div><div class='add'>+ *</div><div class='add'>+ * This function programs the ECC hardware to compute the hamming code on the</div><div class='add'>+ * last provided N bytes to the hardware generator.</div><div class='add'>+ */</div><div class='add'>+static void doc_hamming_ecc_init(struct docg3 *docg3, int nb_bytes)</div><div class='add'>+{</div><div class='add'>+	u8 ecc_conf1;</div><div class='add'>+</div><div class='add'>+	ecc_conf1 = doc_register_readb(docg3, DOC_ECCCONF1);</div><div class='add'>+	ecc_conf1 &amp;= ~DOC_ECCCONF1_HAMMING_BITS_MASK;</div><div class='add'>+	ecc_conf1 |= (nb_bytes &amp; DOC_ECCCONF1_HAMMING_BITS_MASK);</div><div class='add'>+	doc_writeb(docg3, ecc_conf1, DOC_ECCCONF1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * doc_ecc_bch_fix_data - Fix if need be read data from flash</div><div class='add'>+ * @docg3: the device</div><div class='add'>+ * @buf: the buffer of read data (512 + 7 + 1 bytes)</div><div class='add'>+ * @hwecc: the hardware calculated ECC.</div><div class='add'>+ *         It's in fact recv_ecc ^ calc_ecc, where recv_ecc was read from OOB</div><div class='add'>+ *         area data, and calc_ecc the ECC calculated by the hardware generator.</div><div class='add'>+ *</div><div class='add'>+ * Checks if the received data matches the ECC, and if an error is detected,</div><div class='add'>+ * tries to fix the bit flips (at most 4) in the buffer buf.  As the docg3</div><div class='add'>+ * understands the (data, ecc, syndroms) in an inverted order in comparison to</div><div class='add'>+ * the BCH library, the function reverses the order of bits (ie. bit7 and bit0,</div><div class='add'>+ * bit6 and bit 1, ...) for all ECC data.</div><div class='add'>+ *</div><div class='add'>+ * The hardware ecc unit produces oob_ecc ^ calc_ecc.  The kernel's bch</div><div class='add'>+ * algorithm is used to decode this.  However the hw operates on page</div><div class='add'>+ * data in a bit order that is the reverse of that of the bch alg,</div><div class='add'>+ * requiring that the bits be reversed on the result.  Thanks to Ivan</div><div class='add'>+ * Djelic for his analysis.</div><div class='add'>+ *</div><div class='add'>+ * Returns number of fixed bits (0, 1, 2, 3, 4) or -EBADMSG if too many bit</div><div class='add'>+ * errors were detected and cannot be fixed.</div><div class='add'>+ */</div><div class='add'>+static int doc_ecc_bch_fix_data(struct docg3 *docg3, void *buf, u8 *hwecc)</div><div class='add'>+{</div><div class='add'>+	u8 ecc[DOC_ECC_BCH_SIZE];</div><div class='add'>+	int errorpos[DOC_ECC_BCH_T], i, numerrs;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DOC_ECC_BCH_SIZE; i++)</div><div class='add'>+		ecc[i] = bitrev8(hwecc[i]);</div><div class='add'>+	numerrs = decode_bch(docg3_bch, NULL, DOC_ECC_BCH_COVERED_BYTES,</div><div class='add'>+			     NULL, ecc, NULL, errorpos);</div><div class='add'>+	BUG_ON(numerrs == -EINVAL);</div><div class='add'>+	if (numerrs &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; numerrs; i++)</div><div class='add'>+		errorpos[i] = (errorpos[i] &amp; ~7) | (7 - (errorpos[i] &amp; 7));</div><div class='add'>+	for (i = 0; i &lt; numerrs; i++)</div><div class='add'>+		if (errorpos[i] &lt; DOC_ECC_BCH_COVERED_BYTES*8)</div><div class='add'>+			/* error is located in data, correct it */</div><div class='add'>+			change_bit(errorpos[i], buf);</div><div class='add'>+out:</div><div class='add'>+	doc_dbg("doc_ecc_bch_fix_data: flipped %d bits\n", numerrs);</div><div class='add'>+	return numerrs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * doc_read_page_prepare - Prepares reading data from a flash page</div><div class='ctx'>  * @docg3: the device</div><div class='ctx'>  * @block0: the first plane block index on flash memory</div><div class='hunk'>@@ -488,16 +747,40 @@ static int doc_read_page_getbytes(struct docg3 *docg3, int len, u_char *buf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * doc_get_hw_bch_syndroms - Get hardware calculated BCH syndroms</div><div class='add'>+ * doc_write_page_putbytes - Writes bytes into a prepared page</div><div class='add'>+ * @docg3: the device</div><div class='add'>+ * @len: the number of bytes to be written</div><div class='add'>+ * @buf: the buffer of input bytes</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void doc_write_page_putbytes(struct docg3 *docg3, int len,</div><div class='add'>+				    const u_char *buf)</div><div class='add'>+{</div><div class='add'>+	doc_write_data_area(docg3, buf, len);</div><div class='add'>+	doc_delay(docg3, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * doc_get_bch_hw_ecc - Get hardware calculated BCH ECC</div><div class='ctx'>  * @docg3: the device</div><div class='del'>- * @syns:  the array of 7 integers where the syndroms will be stored</div><div class='add'>+ * @hwecc:  the array of 7 integers where the hardware ecc will be stored</div><div class='ctx'>  */</div><div class='del'>-static void doc_get_hw_bch_syndroms(struct docg3 *docg3, int *syns)</div><div class='add'>+static void doc_get_bch_hw_ecc(struct docg3 *docg3, u8 *hwecc)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; DOC_ECC_BCH_SIZE; i++)</div><div class='del'>-		syns[i] = doc_register_readb(docg3, DOC_BCH_SYNDROM(i));</div><div class='add'>+		hwecc[i] = doc_register_readb(docg3, DOC_BCH_HW_ECC(i));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * doc_page_finish - Ends reading/writing of a flash page</div><div class='add'>+ * @docg3: the device</div><div class='add'>+ */</div><div class='add'>+static void doc_page_finish(struct docg3 *docg3)</div><div class='add'>+{</div><div class='add'>+	doc_writeb(docg3, 0, DOC_DATAEND);</div><div class='add'>+	doc_delay(docg3, 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -510,8 +793,7 @@ static void doc_get_hw_bch_syndroms(struct docg3 *docg3, int *syns)</div><div class='ctx'>  */</div><div class='ctx'> static void doc_read_page_finish(struct docg3 *docg3)</div><div class='ctx'> {</div><div class='del'>-	doc_writeb(docg3, 0, DOC_DATAEND);</div><div class='del'>-	doc_delay(docg3, 2);</div><div class='add'>+	doc_page_finish(docg3);</div><div class='ctx'> 	doc_set_device_id(docg3, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -523,18 +805,29 @@ static void doc_read_page_finish(struct docg3 *docg3)</div><div class='ctx'>  * @block1: second plane block index calculated</div><div class='ctx'>  * @page: page calculated</div><div class='ctx'>  * @ofs: offset in page</div><div class='add'>+ * @reliable: 0 if docg3 in normal mode, 1 if docg3 in fast mode, 2 if docg3 in</div><div class='add'>+ * reliable mode.</div><div class='add'>+ *</div><div class='add'>+ * The calculation is based on the reliable/normal mode. In normal mode, the 64</div><div class='add'>+ * pages of a block are available. In reliable mode, as pages 2*n and 2*n+1 are</div><div class='add'>+ * clones, only 32 pages per block are available.</div><div class='ctx'>  */</div><div class='ctx'> static void calc_block_sector(loff_t from, int *block0, int *block1, int *page,</div><div class='del'>-			      int *ofs)</div><div class='add'>+			      int *ofs, int reliable)</div><div class='ctx'> {</div><div class='del'>-	uint sector;</div><div class='add'>+	uint sector, pages_biblock;</div><div class='add'>+</div><div class='add'>+	pages_biblock = DOC_LAYOUT_PAGES_PER_BLOCK * DOC_LAYOUT_NBPLANES;</div><div class='add'>+	if (reliable == 1 || reliable == 2)</div><div class='add'>+		pages_biblock /= 2;</div><div class='ctx'> </div><div class='ctx'> 	sector = from / DOC_LAYOUT_PAGE_SIZE;</div><div class='del'>-	*block0 = sector / (DOC_LAYOUT_PAGES_PER_BLOCK * DOC_LAYOUT_NBPLANES)</div><div class='del'>-		* DOC_LAYOUT_NBPLANES;</div><div class='add'>+	*block0 = sector / pages_biblock * DOC_LAYOUT_NBPLANES;</div><div class='ctx'> 	*block1 = *block0 + 1;</div><div class='del'>-	*page = sector % (DOC_LAYOUT_PAGES_PER_BLOCK * DOC_LAYOUT_NBPLANES);</div><div class='add'>+	*page = sector % pages_biblock;</div><div class='ctx'> 	*page /= DOC_LAYOUT_NBPLANES;</div><div class='add'>+	if (reliable == 1 || reliable == 2)</div><div class='add'>+		*page *= 2;</div><div class='ctx'> 	if (sector % 2)</div><div class='ctx'> 		*ofs = DOC_LAYOUT_PAGE_OOB_SIZE;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -542,99 +835,124 @@ static void calc_block_sector(loff_t from, int *block0, int *block1, int *page,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * doc_read - Read bytes from flash</div><div class='add'>+ * doc_read_oob - Read out of band bytes from flash</div><div class='ctx'>  * @mtd: the device</div><div class='ctx'>  * @from: the offset from first block and first page, in bytes, aligned on page</div><div class='ctx'>  *        size</div><div class='del'>- * @len: the number of bytes to read (must be a multiple of 4)</div><div class='del'>- * @retlen: the number of bytes actually read</div><div class='del'>- * @buf: the filled in buffer</div><div class='add'>+ * @ops: the mtd oob structure</div><div class='ctx'>  *</div><div class='del'>- * Reads flash memory pages. This function does not read the OOB chunk, but only</div><div class='del'>- * the page data.</div><div class='add'>+ * Reads flash memory OOB area of pages.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 if read successfull, of -EIO, -EINVAL if an error occured</div><div class='ctx'>  */</div><div class='del'>-static int doc_read(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='del'>-	     size_t *retlen, u_char *buf)</div><div class='add'>+static int doc_read_oob(struct mtd_info *mtd, loff_t from,</div><div class='add'>+			struct mtd_oob_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct docg3 *docg3 = mtd-&gt;priv;</div><div class='del'>-	int block0, block1, page, readlen, ret, ofs = 0;</div><div class='del'>-	int syn[DOC_ECC_BCH_SIZE], eccconf1;</div><div class='del'>-	u8 oob[DOC_LAYOUT_OOB_SIZE];</div><div class='add'>+	int block0, block1, page, ret, ofs = 0;</div><div class='add'>+	u8 *oobbuf = ops-&gt;oobbuf;</div><div class='add'>+	u8 *buf = ops-&gt;datbuf;</div><div class='add'>+	size_t len, ooblen, nbdata, nboob;</div><div class='add'>+	u8 hwecc[DOC_ECC_BCH_SIZE], eccconf1;</div><div class='add'>+</div><div class='add'>+	if (buf)</div><div class='add'>+		len = ops-&gt;len;</div><div class='add'>+	else</div><div class='add'>+		len = 0;</div><div class='add'>+	if (oobbuf)</div><div class='add'>+		ooblen = ops-&gt;ooblen;</div><div class='add'>+	else</div><div class='add'>+		ooblen = 0;</div><div class='add'>+</div><div class='add'>+	if (oobbuf &amp;&amp; ops-&gt;mode == MTD_OPS_PLACE_OOB)</div><div class='add'>+		oobbuf += ops-&gt;ooboffs;</div><div class='add'>+</div><div class='add'>+	doc_dbg("doc_read_oob(from=%lld, mode=%d, data=(%p:%zu), oob=(%p:%zu))\n",</div><div class='add'>+		from, ops-&gt;mode, buf, len, oobbuf, ooblen);</div><div class='add'>+	if ((len % DOC_LAYOUT_PAGE_SIZE) || (ooblen % DOC_LAYOUT_OOB_SIZE) ||</div><div class='add'>+	    (from % DOC_LAYOUT_PAGE_SIZE))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ret = -EINVAL;</div><div class='del'>-	doc_dbg("doc_read(from=%lld, len=%zu, buf=%p)\n", from, len, buf);</div><div class='del'>-	if (from % DOC_LAYOUT_PAGE_SIZE)</div><div class='del'>-		goto err;</div><div class='del'>-	if (len % 4)</div><div class='del'>-		goto err;</div><div class='del'>-	calc_block_sector(from, &amp;block0, &amp;block1, &amp;page, &amp;ofs);</div><div class='add'>+	calc_block_sector(from + len, &amp;block0, &amp;block1, &amp;page, &amp;ofs,</div><div class='add'>+			  docg3-&gt;reliable);</div><div class='ctx'> 	if (block1 &gt; docg3-&gt;max_block)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	*retlen = 0;</div><div class='add'>+	ops-&gt;oobretlen = 0;</div><div class='add'>+	ops-&gt;retlen = 0;</div><div class='ctx'> 	ret = 0;</div><div class='del'>-	readlen = min_t(size_t, len, (size_t)DOC_LAYOUT_PAGE_SIZE);</div><div class='del'>-	while (!ret &amp;&amp; len &gt; 0) {</div><div class='del'>-		readlen = min_t(size_t, len, (size_t)DOC_LAYOUT_PAGE_SIZE);</div><div class='add'>+	while (!ret &amp;&amp; (len &gt; 0 || ooblen &gt; 0)) {</div><div class='add'>+		calc_block_sector(from, &amp;block0, &amp;block1, &amp;page, &amp;ofs,</div><div class='add'>+			docg3-&gt;reliable);</div><div class='add'>+		nbdata = min_t(size_t, len, (size_t)DOC_LAYOUT_PAGE_SIZE);</div><div class='add'>+		nboob = min_t(size_t, ooblen, (size_t)DOC_LAYOUT_OOB_SIZE);</div><div class='ctx'> 		ret = doc_read_page_prepare(docg3, block0, block1, page, ofs);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto err;</div><div class='del'>-		ret = doc_read_page_ecc_init(docg3, DOC_ECC_BCH_COVERED_BYTES);</div><div class='add'>+		ret = doc_read_page_ecc_init(docg3, DOC_ECC_BCH_TOTAL_BYTES);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto err_in_read;</div><div class='del'>-		ret = doc_read_page_getbytes(docg3, readlen, buf, 1);</div><div class='del'>-		if (ret &lt; readlen)</div><div class='add'>+		ret = doc_read_page_getbytes(docg3, nbdata, buf, 1);</div><div class='add'>+		if (ret &lt; nbdata)</div><div class='ctx'> 			goto err_in_read;</div><div class='del'>-		ret = doc_read_page_getbytes(docg3, DOC_LAYOUT_OOB_SIZE,</div><div class='del'>-					     oob, 0);</div><div class='del'>-		if (ret &lt; DOC_LAYOUT_OOB_SIZE)</div><div class='add'>+		doc_read_page_getbytes(docg3, DOC_LAYOUT_PAGE_SIZE - nbdata,</div><div class='add'>+				       NULL, 0);</div><div class='add'>+		ret = doc_read_page_getbytes(docg3, nboob, oobbuf, 0);</div><div class='add'>+		if (ret &lt; nboob)</div><div class='ctx'> 			goto err_in_read;</div><div class='add'>+		doc_read_page_getbytes(docg3, DOC_LAYOUT_OOB_SIZE - nboob,</div><div class='add'>+				       NULL, 0);</div><div class='ctx'> </div><div class='del'>-		*retlen += readlen;</div><div class='del'>-		buf += readlen;</div><div class='del'>-		len -= readlen;</div><div class='del'>-</div><div class='del'>-		ofs ^= DOC_LAYOUT_PAGE_OOB_SIZE;</div><div class='del'>-		if (ofs == 0)</div><div class='del'>-			page += 2;</div><div class='del'>-		if (page &gt; DOC_ADDR_PAGE_MASK) {</div><div class='del'>-			page = 0;</div><div class='del'>-			block0 += 2;</div><div class='del'>-			block1 += 2;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * There should be a BCH bitstream fixing algorithm here ...</div><div class='del'>-		 * By now, a page read failure is triggered by BCH error</div><div class='del'>-		 */</div><div class='del'>-		doc_get_hw_bch_syndroms(docg3, syn);</div><div class='add'>+		doc_get_bch_hw_ecc(docg3, hwecc);</div><div class='ctx'> 		eccconf1 = doc_register_readb(docg3, DOC_ECCCONF1);</div><div class='ctx'> </div><div class='del'>-		doc_dbg("OOB - INFO: %02x:%02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='del'>-			 oob[0], oob[1], oob[2], oob[3], oob[4],</div><div class='del'>-			 oob[5], oob[6]);</div><div class='del'>-		doc_dbg("OOB - HAMMING: %02x\n", oob[7]);</div><div class='del'>-		doc_dbg("OOB - BCH_ECC: %02x:%02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='del'>-			 oob[8], oob[9], oob[10], oob[11], oob[12],</div><div class='del'>-			 oob[13], oob[14]);</div><div class='del'>-		doc_dbg("OOB - UNUSED: %02x\n", oob[15]);</div><div class='add'>+		if (nboob &gt;= DOC_LAYOUT_OOB_SIZE) {</div><div class='add'>+			doc_dbg("OOB - INFO: %02x:%02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+				oobbuf[0], oobbuf[1], oobbuf[2], oobbuf[3],</div><div class='add'>+				oobbuf[4], oobbuf[5], oobbuf[6]);</div><div class='add'>+			doc_dbg("OOB - HAMMING: %02x\n", oobbuf[7]);</div><div class='add'>+			doc_dbg("OOB - BCH_ECC: %02x:%02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+				oobbuf[8], oobbuf[9], oobbuf[10], oobbuf[11],</div><div class='add'>+				oobbuf[12], oobbuf[13], oobbuf[14]);</div><div class='add'>+			doc_dbg("OOB - UNUSED: %02x\n", oobbuf[15]);</div><div class='add'>+		}</div><div class='ctx'> 		doc_dbg("ECC checks: ECCConf1=%x\n", eccconf1);</div><div class='del'>-		doc_dbg("ECC BCH syndrom: %02x:%02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='del'>-			syn[0], syn[1], syn[2], syn[3], syn[4], syn[5], syn[6]);</div><div class='del'>-</div><div class='del'>-		ret = -EBADMSG;</div><div class='del'>-		if (block0 &gt;= DOC_LAYOUT_BLOCK_FIRST_DATA) {</div><div class='del'>-			if (eccconf1 &amp; DOC_ECCCONF1_BCH_SYNDROM_ERR)</div><div class='del'>-				goto err_in_read;</div><div class='del'>-			if (is_prot_seq_error(docg3))</div><div class='del'>-				goto err_in_read;</div><div class='add'>+		doc_dbg("ECC HW_ECC: %02x:%02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+			hwecc[0], hwecc[1], hwecc[2], hwecc[3], hwecc[4],</div><div class='add'>+			hwecc[5], hwecc[6]);</div><div class='add'>+</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		if (is_prot_seq_error(docg3))</div><div class='add'>+			goto err_in_read;</div><div class='add'>+		ret = 0;</div><div class='add'>+		if ((block0 &gt;= DOC_LAYOUT_BLOCK_FIRST_DATA) &amp;&amp;</div><div class='add'>+		    (eccconf1 &amp; DOC_ECCCONF1_BCH_SYNDROM_ERR) &amp;&amp;</div><div class='add'>+		    (eccconf1 &amp; DOC_ECCCONF1_PAGE_IS_WRITTEN) &amp;&amp;</div><div class='add'>+		    (ops-&gt;mode != MTD_OPS_RAW) &amp;&amp;</div><div class='add'>+		    (nbdata == DOC_LAYOUT_PAGE_SIZE)) {</div><div class='add'>+			ret = doc_ecc_bch_fix_data(docg3, buf, hwecc);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				mtd-&gt;ecc_stats.failed++;</div><div class='add'>+				ret = -EBADMSG;</div><div class='add'>+			}</div><div class='add'>+			if (ret &gt; 0) {</div><div class='add'>+				mtd-&gt;ecc_stats.corrected += ret;</div><div class='add'>+				ret = -EUCLEAN;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		doc_read_page_finish(docg3);</div><div class='add'>+		ops-&gt;retlen += nbdata;</div><div class='add'>+		ops-&gt;oobretlen += nboob;</div><div class='add'>+		buf += nbdata;</div><div class='add'>+		oobbuf += nboob;</div><div class='add'>+		len -= nbdata;</div><div class='add'>+		ooblen -= nboob;</div><div class='add'>+		from += DOC_LAYOUT_PAGE_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> err_in_read:</div><div class='ctx'> 	doc_read_page_finish(docg3);</div><div class='ctx'> err:</div><div class='hunk'>@@ -642,54 +960,33 @@ err:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * doc_read_oob - Read out of band bytes from flash</div><div class='add'>+ * doc_read - Read bytes from flash</div><div class='ctx'>  * @mtd: the device</div><div class='ctx'>  * @from: the offset from first block and first page, in bytes, aligned on page</div><div class='ctx'>  *        size</div><div class='del'>- * @ops: the mtd oob structure</div><div class='add'>+ * @len: the number of bytes to read (must be a multiple of 4)</div><div class='add'>+ * @retlen: the number of bytes actually read</div><div class='add'>+ * @buf: the filled in buffer</div><div class='ctx'>  *</div><div class='del'>- * Reads flash memory OOB area of pages.</div><div class='add'>+ * Reads flash memory pages. This function does not read the OOB chunk, but only</div><div class='add'>+ * the page data.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 if read successfull, of -EIO, -EINVAL if an error occured</div><div class='ctx'>  */</div><div class='del'>-static int doc_read_oob(struct mtd_info *mtd, loff_t from,</div><div class='del'>-			struct mtd_oob_ops *ops)</div><div class='add'>+static int doc_read(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='add'>+	     size_t *retlen, u_char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct docg3 *docg3 = mtd-&gt;priv;</div><div class='del'>-	int block0, block1, page, ofs, ret;</div><div class='del'>-	u8 *buf = ops-&gt;oobbuf;</div><div class='del'>-	size_t len = ops-&gt;ooblen;</div><div class='del'>-</div><div class='del'>-	doc_dbg("doc_read_oob(from=%lld, buf=%p, len=%zu)\n", from, buf, len);</div><div class='del'>-	if (len != DOC_LAYOUT_OOB_SIZE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	switch (ops-&gt;mode) {</div><div class='del'>-	case MTD_OPS_PLACE_OOB:</div><div class='del'>-		buf += ops-&gt;ooboffs;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	struct mtd_oob_ops ops;</div><div class='add'>+	size_t ret;</div><div class='ctx'> </div><div class='del'>-	calc_block_sector(from, &amp;block0, &amp;block1, &amp;page, &amp;ofs);</div><div class='del'>-	if (block1 &gt; docg3-&gt;max_block)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ret = doc_read_page_prepare(docg3, block0, block1, page,</div><div class='del'>-				    ofs + DOC_LAYOUT_PAGE_SIZE);</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = doc_read_page_ecc_init(docg3, DOC_LAYOUT_OOB_SIZE);</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = doc_read_page_getbytes(docg3, DOC_LAYOUT_OOB_SIZE,</div><div class='del'>-					     buf, 1);</div><div class='del'>-	doc_read_page_finish(docg3);</div><div class='add'>+	memset(&amp;ops, 0, sizeof(ops));</div><div class='add'>+	ops.datbuf = buf;</div><div class='add'>+	ops.len = len;</div><div class='add'>+	ops.mode = MTD_OPS_AUTO_OOB;</div><div class='ctx'> </div><div class='del'>-	if (ret &gt; 0)</div><div class='del'>-		ops-&gt;oobretlen = ret;</div><div class='del'>-	else</div><div class='del'>-		ops-&gt;oobretlen = 0;</div><div class='del'>-	return (ret &gt; 0) ? 0 : ret;</div><div class='add'>+	ret = doc_read_oob(mtd, from, &amp;ops);</div><div class='add'>+	*retlen = ops.retlen;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int doc_reload_bbt(struct docg3 *docg3)</div><div class='hunk'>@@ -726,7 +1023,8 @@ static int doc_block_isbad(struct mtd_info *mtd, loff_t from)</div><div class='ctx'> 	struct docg3 *docg3 = mtd-&gt;priv;</div><div class='ctx'> 	int block0, block1, page, ofs, is_good;</div><div class='ctx'> </div><div class='del'>-	calc_block_sector(from, &amp;block0, &amp;block1, &amp;page, &amp;ofs);</div><div class='add'>+	calc_block_sector(from, &amp;block0, &amp;block1, &amp;page, &amp;ofs,</div><div class='add'>+		docg3-&gt;reliable);</div><div class='ctx'> 	doc_dbg("doc_block_isbad(from=%lld) =&gt; block=(%d,%d), page=%d, ofs=%d\n",</div><div class='ctx'> 		from, block0, block1, page, ofs);</div><div class='ctx'> </div><div class='hunk'>@@ -739,6 +1037,7 @@ static int doc_block_isbad(struct mtd_info *mtd, loff_t from)</div><div class='ctx'> 	return !is_good;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if 0</div><div class='ctx'> /**</div><div class='ctx'>  * doc_get_erase_count - Get block erase count</div><div class='ctx'>  * @docg3: the device</div><div class='hunk'>@@ -758,7 +1057,7 @@ static int doc_get_erase_count(struct docg3 *docg3, loff_t from)</div><div class='ctx'> 	doc_dbg("doc_get_erase_count(from=%lld, buf=%p)\n", from, buf);</div><div class='ctx'> 	if (from % DOC_LAYOUT_PAGE_SIZE)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	calc_block_sector(from, &amp;block0, &amp;block1, &amp;page, &amp;ofs);</div><div class='add'>+	calc_block_sector(from, &amp;block0, &amp;block1, &amp;page, &amp;ofs, docg3-&gt;reliable);</div><div class='ctx'> 	if (block1 &gt; docg3-&gt;max_block)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -780,6 +1079,558 @@ static int doc_get_erase_count(struct docg3 *docg3, loff_t from)</div><div class='ctx'> </div><div class='ctx'> 	return max(plane1_erase_count, plane2_erase_count);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * doc_get_op_status - get erase/write operation status</div><div class='add'>+ * @docg3: the device</div><div class='add'>+ *</div><div class='add'>+ * Queries the status from the chip, and returns it</div><div class='add'>+ *</div><div class='add'>+ * Returns the status (bits DOC_PLANES_STATUS_*)</div><div class='add'>+ */</div><div class='add'>+static int doc_get_op_status(struct docg3 *docg3)</div><div class='add'>+{</div><div class='add'>+	u8 status;</div><div class='add'>+</div><div class='add'>+	doc_flash_sequence(docg3, DOC_SEQ_PLANES_STATUS);</div><div class='add'>+	doc_flash_command(docg3, DOC_CMD_PLANES_STATUS);</div><div class='add'>+	doc_delay(docg3, 5);</div><div class='add'>+</div><div class='add'>+	doc_ecc_disable(docg3);</div><div class='add'>+	doc_read_data_area(docg3, &amp;status, 1, 1);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * doc_write_erase_wait_status - wait for write or erase completion</div><div class='add'>+ * @docg3: the device</div><div class='add'>+ *</div><div class='add'>+ * Wait for the chip to be ready again after erase or write operation, and check</div><div class='add'>+ * erase/write status.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if erase successfull, -EIO if erase/write issue, -ETIMEOUT if</div><div class='add'>+ * timeout</div><div class='add'>+ */</div><div class='add'>+static int doc_write_erase_wait_status(struct docg3 *docg3)</div><div class='add'>+{</div><div class='add'>+	int status, ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!doc_is_ready(docg3))</div><div class='add'>+		usleep_range(3000, 3000);</div><div class='add'>+	if (!doc_is_ready(docg3)) {</div><div class='add'>+		doc_dbg("Timeout reached and the chip is still not ready\n");</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = doc_get_op_status(docg3);</div><div class='add'>+	if (status &amp; DOC_PLANES_STATUS_FAIL) {</div><div class='add'>+		doc_dbg("Erase/Write failed on (a) plane(s), status = %x\n",</div><div class='add'>+			status);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	doc_page_finish(docg3);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * doc_erase_block - Erase a couple of blocks</div><div class='add'>+ * @docg3: the device</div><div class='add'>+ * @block0: the first block to erase (leftmost plane)</div><div class='add'>+ * @block1: the second block to erase (rightmost plane)</div><div class='add'>+ *</div><div class='add'>+ * Erase both blocks, and return operation status</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if erase successful, -EIO if erase issue, -ETIMEOUT if chip not</div><div class='add'>+ * ready for too long</div><div class='add'>+ */</div><div class='add'>+static int doc_erase_block(struct docg3 *docg3, int block0, int block1)</div><div class='add'>+{</div><div class='add'>+	int ret, sector;</div><div class='add'>+</div><div class='add'>+	doc_dbg("doc_erase_block(blocks=(%d,%d))\n", block0, block1);</div><div class='add'>+	ret = doc_reset_seq(docg3);</div><div class='add'>+	if (ret)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	doc_set_reliable_mode(docg3);</div><div class='add'>+	doc_flash_sequence(docg3, DOC_SEQ_ERASE);</div><div class='add'>+</div><div class='add'>+	sector = block0 &lt;&lt; DOC_ADDR_BLOCK_SHIFT;</div><div class='add'>+	doc_flash_command(docg3, DOC_CMD_PROG_BLOCK_ADDR);</div><div class='add'>+	doc_setup_addr_sector(docg3, sector);</div><div class='add'>+	sector = block1 &lt;&lt; DOC_ADDR_BLOCK_SHIFT;</div><div class='add'>+	doc_flash_command(docg3, DOC_CMD_PROG_BLOCK_ADDR);</div><div class='add'>+	doc_setup_addr_sector(docg3, sector);</div><div class='add'>+	doc_delay(docg3, 1);</div><div class='add'>+</div><div class='add'>+	doc_flash_command(docg3, DOC_CMD_ERASECYCLE2);</div><div class='add'>+	doc_delay(docg3, 2);</div><div class='add'>+</div><div class='add'>+	if (is_prot_seq_error(docg3)) {</div><div class='add'>+		doc_err("Erase blocks %d,%d error\n", block0, block1);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return doc_write_erase_wait_status(docg3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * doc_erase - Erase a portion of the chip</div><div class='add'>+ * @mtd: the device</div><div class='add'>+ * @info: the erase info</div><div class='add'>+ *</div><div class='add'>+ * Erase a bunch of contiguous blocks, by pairs, as a "mtd" page of 1024 is</div><div class='add'>+ * split into 2 pages of 512 bytes on 2 contiguous blocks.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if erase successful, -EINVAL if adressing error, -EIO if erase</div><div class='add'>+ * issue</div><div class='add'>+ */</div><div class='add'>+static int doc_erase(struct mtd_info *mtd, struct erase_info *info)</div><div class='add'>+{</div><div class='add'>+	struct docg3 *docg3 = mtd-&gt;priv;</div><div class='add'>+	uint64_t len;</div><div class='add'>+	int block0, block1, page, ret, ofs = 0;</div><div class='add'>+</div><div class='add'>+	doc_dbg("doc_erase(from=%lld, len=%lld\n", info-&gt;addr, info-&gt;len);</div><div class='add'>+	doc_set_device_id(docg3, docg3-&gt;device_id);</div><div class='add'>+</div><div class='add'>+	info-&gt;state = MTD_ERASE_PENDING;</div><div class='add'>+	calc_block_sector(info-&gt;addr + info-&gt;len, &amp;block0, &amp;block1, &amp;page,</div><div class='add'>+			  &amp;ofs, docg3-&gt;reliable);</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	if (block1 &gt; docg3-&gt;max_block || page || ofs)</div><div class='add'>+		goto reset_err;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	calc_block_sector(info-&gt;addr, &amp;block0, &amp;block1, &amp;page, &amp;ofs,</div><div class='add'>+			  docg3-&gt;reliable);</div><div class='add'>+	doc_set_reliable_mode(docg3);</div><div class='add'>+	for (len = info-&gt;len; !ret &amp;&amp; len &gt; 0; len -= mtd-&gt;erasesize) {</div><div class='add'>+		info-&gt;state = MTD_ERASING;</div><div class='add'>+		ret = doc_erase_block(docg3, block0, block1);</div><div class='add'>+		block0 += 2;</div><div class='add'>+		block1 += 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto reset_err;</div><div class='add'>+</div><div class='add'>+	info-&gt;state = MTD_ERASE_DONE;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+reset_err:</div><div class='add'>+	info-&gt;state = MTD_ERASE_FAILED;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * doc_write_page - Write a single page to the chip</div><div class='add'>+ * @docg3: the device</div><div class='add'>+ * @to: the offset from first block and first page, in bytes, aligned on page</div><div class='add'>+ *      size</div><div class='add'>+ * @buf: buffer to get bytes from</div><div class='add'>+ * @oob: buffer to get out of band bytes from (can be NULL if no OOB should be</div><div class='add'>+ *       written)</div><div class='add'>+ * @autoecc: if 0, all 16 bytes from OOB are taken, regardless of HW Hamming or</div><div class='add'>+ *           BCH computations. If 1, only bytes 0-7 and byte 15 are taken,</div><div class='add'>+ *           remaining ones are filled with hardware Hamming and BCH</div><div class='add'>+ *           computations. Its value is not meaningfull is oob == NULL.</div><div class='add'>+ *</div><div class='add'>+ * Write one full page (ie. 1 page split on two planes), of 512 bytes, with the</div><div class='add'>+ * OOB data. The OOB ECC is automatically computed by the hardware Hamming and</div><div class='add'>+ * BCH generator if autoecc is not null.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if write successful, -EIO if write error, -EAGAIN if timeout</div><div class='add'>+ */</div><div class='add'>+static int doc_write_page(struct docg3 *docg3, loff_t to, const u_char *buf,</div><div class='add'>+			  const u_char *oob, int autoecc)</div><div class='add'>+{</div><div class='add'>+	int block0, block1, page, ret, ofs = 0;</div><div class='add'>+	u8 hwecc[DOC_ECC_BCH_SIZE], hamming;</div><div class='add'>+</div><div class='add'>+	doc_dbg("doc_write_page(to=%lld)\n", to);</div><div class='add'>+	calc_block_sector(to, &amp;block0, &amp;block1, &amp;page, &amp;ofs, docg3-&gt;reliable);</div><div class='add'>+</div><div class='add'>+	doc_set_device_id(docg3, docg3-&gt;device_id);</div><div class='add'>+	ret = doc_reset_seq(docg3);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* Program the flash address block and page */</div><div class='add'>+	ret = doc_write_seek(docg3, block0, block1, page, ofs);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	doc_write_page_ecc_init(docg3, DOC_ECC_BCH_TOTAL_BYTES);</div><div class='add'>+	doc_delay(docg3, 2);</div><div class='add'>+	doc_write_page_putbytes(docg3, DOC_LAYOUT_PAGE_SIZE, buf);</div><div class='add'>+</div><div class='add'>+	if (oob &amp;&amp; autoecc) {</div><div class='add'>+		doc_write_page_putbytes(docg3, DOC_LAYOUT_OOB_PAGEINFO_SZ, oob);</div><div class='add'>+		doc_delay(docg3, 2);</div><div class='add'>+		oob += DOC_LAYOUT_OOB_UNUSED_OFS;</div><div class='add'>+</div><div class='add'>+		hamming = doc_register_readb(docg3, DOC_HAMMINGPARITY);</div><div class='add'>+		doc_delay(docg3, 2);</div><div class='add'>+		doc_write_page_putbytes(docg3, DOC_LAYOUT_OOB_HAMMING_SZ,</div><div class='add'>+					&amp;hamming);</div><div class='add'>+		doc_delay(docg3, 2);</div><div class='add'>+</div><div class='add'>+		doc_get_bch_hw_ecc(docg3, hwecc);</div><div class='add'>+		doc_write_page_putbytes(docg3, DOC_LAYOUT_OOB_BCH_SZ, hwecc);</div><div class='add'>+		doc_delay(docg3, 2);</div><div class='add'>+</div><div class='add'>+		doc_write_page_putbytes(docg3, DOC_LAYOUT_OOB_UNUSED_SZ, oob);</div><div class='add'>+	}</div><div class='add'>+	if (oob &amp;&amp; !autoecc)</div><div class='add'>+		doc_write_page_putbytes(docg3, DOC_LAYOUT_OOB_SIZE, oob);</div><div class='add'>+</div><div class='add'>+	doc_delay(docg3, 2);</div><div class='add'>+	doc_page_finish(docg3);</div><div class='add'>+	doc_delay(docg3, 2);</div><div class='add'>+	doc_flash_command(docg3, DOC_CMD_PROG_CYCLE2);</div><div class='add'>+	doc_delay(docg3, 2);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The wait status will perform another doc_page_finish() call, but that</div><div class='add'>+	 * seems to please the docg3, so leave it.</div><div class='add'>+	 */</div><div class='add'>+	ret = doc_write_erase_wait_status(docg3);</div><div class='add'>+	return ret;</div><div class='add'>+err:</div><div class='add'>+	doc_read_page_finish(docg3);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * doc_guess_autoecc - Guess autoecc mode from mbd_oob_ops</div><div class='add'>+ * @ops: the oob operations</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 or 1 if success, -EINVAL if invalid oob mode</div><div class='add'>+ */</div><div class='add'>+static int doc_guess_autoecc(struct mtd_oob_ops *ops)</div><div class='add'>+{</div><div class='add'>+	int autoecc;</div><div class='add'>+</div><div class='add'>+	switch (ops-&gt;mode) {</div><div class='add'>+	case MTD_OPS_PLACE_OOB:</div><div class='add'>+	case MTD_OPS_AUTO_OOB:</div><div class='add'>+		autoecc = 1;</div><div class='add'>+		break;</div><div class='add'>+	case MTD_OPS_RAW:</div><div class='add'>+		autoecc = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		autoecc = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return autoecc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * doc_fill_autooob - Fill a 16 bytes OOB from 8 non-ECC bytes</div><div class='add'>+ * @dst: the target 16 bytes OOB buffer</div><div class='add'>+ * @oobsrc: the source 8 bytes non-ECC OOB buffer</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void doc_fill_autooob(u8 *dst, u8 *oobsrc)</div><div class='add'>+{</div><div class='add'>+	memcpy(dst, oobsrc, DOC_LAYOUT_OOB_PAGEINFO_SZ);</div><div class='add'>+	dst[DOC_LAYOUT_OOB_UNUSED_OFS] = oobsrc[DOC_LAYOUT_OOB_PAGEINFO_SZ];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * doc_backup_oob - Backup OOB into docg3 structure</div><div class='add'>+ * @docg3: the device</div><div class='add'>+ * @to: the page offset in the chip</div><div class='add'>+ * @ops: the OOB size and buffer</div><div class='add'>+ *</div><div class='add'>+ * As the docg3 should write a page with its OOB in one pass, and some userland</div><div class='add'>+ * applications do write_oob() to setup the OOB and then write(), store the OOB</div><div class='add'>+ * into a temporary storage. This is very dangerous, as 2 concurrent</div><div class='add'>+ * applications could store an OOB, and then write their pages (which will</div><div class='add'>+ * result into one having its OOB corrupted).</div><div class='add'>+ *</div><div class='add'>+ * The only reliable way would be for userland to call doc_write_oob() with both</div><div class='add'>+ * the page data _and_ the OOB area.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if success, -EINVAL if ops content invalid</div><div class='add'>+ */</div><div class='add'>+static int doc_backup_oob(struct docg3 *docg3, loff_t to,</div><div class='add'>+			  struct mtd_oob_ops *ops)</div><div class='add'>+{</div><div class='add'>+	int ooblen = ops-&gt;ooblen, autoecc;</div><div class='add'>+</div><div class='add'>+	if (ooblen != DOC_LAYOUT_OOB_SIZE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	autoecc = doc_guess_autoecc(ops);</div><div class='add'>+	if (autoecc &lt; 0)</div><div class='add'>+		return autoecc;</div><div class='add'>+</div><div class='add'>+	docg3-&gt;oob_write_ofs = to;</div><div class='add'>+	docg3-&gt;oob_autoecc = autoecc;</div><div class='add'>+	if (ops-&gt;mode == MTD_OPS_AUTO_OOB) {</div><div class='add'>+		doc_fill_autooob(docg3-&gt;oob_write_buf, ops-&gt;oobbuf);</div><div class='add'>+		ops-&gt;oobretlen = 8;</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(docg3-&gt;oob_write_buf, ops-&gt;oobbuf, DOC_LAYOUT_OOB_SIZE);</div><div class='add'>+		ops-&gt;oobretlen = DOC_LAYOUT_OOB_SIZE;</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'>+ * doc_write_oob - Write out of band bytes to flash</div><div class='add'>+ * @mtd: the device</div><div class='add'>+ * @ofs: the offset from first block and first page, in bytes, aligned on page</div><div class='add'>+ *       size</div><div class='add'>+ * @ops: the mtd oob structure</div><div class='add'>+ *</div><div class='add'>+ * Either write OOB data into a temporary buffer, for the subsequent write</div><div class='add'>+ * page. The provided OOB should be 16 bytes long. If a data buffer is provided</div><div class='add'>+ * as well, issue the page write.</div><div class='add'>+ * Or provide data without OOB, and then a all zeroed OOB will be used (ECC will</div><div class='add'>+ * still be filled in if asked for).</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 is successfull, EINVAL if length is not 14 bytes</div><div class='add'>+ */</div><div class='add'>+static int doc_write_oob(struct mtd_info *mtd, loff_t ofs,</div><div class='add'>+			 struct mtd_oob_ops *ops)</div><div class='add'>+{</div><div class='add'>+	struct docg3 *docg3 = mtd-&gt;priv;</div><div class='add'>+	int block0, block1, page, ret, pofs = 0, autoecc, oobdelta;</div><div class='add'>+	u8 *oobbuf = ops-&gt;oobbuf;</div><div class='add'>+	u8 *buf = ops-&gt;datbuf;</div><div class='add'>+	size_t len, ooblen;</div><div class='add'>+	u8 oob[DOC_LAYOUT_OOB_SIZE];</div><div class='add'>+</div><div class='add'>+	if (buf)</div><div class='add'>+		len = ops-&gt;len;</div><div class='add'>+	else</div><div class='add'>+		len = 0;</div><div class='add'>+	if (oobbuf)</div><div class='add'>+		ooblen = ops-&gt;ooblen;</div><div class='add'>+	else</div><div class='add'>+		ooblen = 0;</div><div class='add'>+</div><div class='add'>+	if (oobbuf &amp;&amp; ops-&gt;mode == MTD_OPS_PLACE_OOB)</div><div class='add'>+		oobbuf += ops-&gt;ooboffs;</div><div class='add'>+</div><div class='add'>+	doc_dbg("doc_write_oob(from=%lld, mode=%d, data=(%p:%zu), oob=(%p:%zu))\n",</div><div class='add'>+		ofs, ops-&gt;mode, buf, len, oobbuf, ooblen);</div><div class='add'>+	switch (ops-&gt;mode) {</div><div class='add'>+	case MTD_OPS_PLACE_OOB:</div><div class='add'>+	case MTD_OPS_RAW:</div><div class='add'>+		oobdelta = mtd-&gt;oobsize;</div><div class='add'>+		break;</div><div class='add'>+	case MTD_OPS_AUTO_OOB:</div><div class='add'>+		oobdelta = mtd-&gt;ecclayout-&gt;oobavail;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		oobdelta = 0;</div><div class='add'>+	}</div><div class='add'>+	if ((len % DOC_LAYOUT_PAGE_SIZE) || (ooblen % oobdelta) ||</div><div class='add'>+	    (ofs % DOC_LAYOUT_PAGE_SIZE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (len &amp;&amp; ooblen &amp;&amp;</div><div class='add'>+	    (len / DOC_LAYOUT_PAGE_SIZE) != (ooblen / oobdelta))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+	calc_block_sector(ofs + len, &amp;block0, &amp;block1, &amp;page, &amp;pofs,</div><div class='add'>+			  docg3-&gt;reliable);</div><div class='add'>+	if (block1 &gt; docg3-&gt;max_block)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ops-&gt;oobretlen = 0;</div><div class='add'>+	ops-&gt;retlen = 0;</div><div class='add'>+	ret = 0;</div><div class='add'>+	if (len == 0 &amp;&amp; ooblen == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (len == 0 &amp;&amp; ooblen &gt; 0)</div><div class='add'>+		return doc_backup_oob(docg3, ofs, ops);</div><div class='add'>+</div><div class='add'>+	autoecc = doc_guess_autoecc(ops);</div><div class='add'>+	if (autoecc &lt; 0)</div><div class='add'>+		return autoecc;</div><div class='add'>+</div><div class='add'>+	while (!ret &amp;&amp; len &gt; 0) {</div><div class='add'>+		memset(oob, 0, sizeof(oob));</div><div class='add'>+		if (ofs == docg3-&gt;oob_write_ofs)</div><div class='add'>+			memcpy(oob, docg3-&gt;oob_write_buf, DOC_LAYOUT_OOB_SIZE);</div><div class='add'>+		else if (ooblen &gt; 0 &amp;&amp; ops-&gt;mode == MTD_OPS_AUTO_OOB)</div><div class='add'>+			doc_fill_autooob(oob, oobbuf);</div><div class='add'>+		else if (ooblen &gt; 0)</div><div class='add'>+			memcpy(oob, oobbuf, DOC_LAYOUT_OOB_SIZE);</div><div class='add'>+		ret = doc_write_page(docg3, ofs, buf, oob, autoecc);</div><div class='add'>+</div><div class='add'>+		ofs += DOC_LAYOUT_PAGE_SIZE;</div><div class='add'>+		len -= DOC_LAYOUT_PAGE_SIZE;</div><div class='add'>+		buf += DOC_LAYOUT_PAGE_SIZE;</div><div class='add'>+		if (ooblen) {</div><div class='add'>+			oobbuf += oobdelta;</div><div class='add'>+			ooblen -= oobdelta;</div><div class='add'>+			ops-&gt;oobretlen += oobdelta;</div><div class='add'>+		}</div><div class='add'>+		ops-&gt;retlen += DOC_LAYOUT_PAGE_SIZE;</div><div class='add'>+	}</div><div class='add'>+err:</div><div class='add'>+	doc_set_device_id(docg3, 0);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * doc_write - Write a buffer to the chip</div><div class='add'>+ * @mtd: the device</div><div class='add'>+ * @to: the offset from first block and first page, in bytes, aligned on page</div><div class='add'>+ *      size</div><div class='add'>+ * @len: the number of bytes to write (must be a full page size, ie. 512)</div><div class='add'>+ * @retlen: the number of bytes actually written (0 or 512)</div><div class='add'>+ * @buf: the buffer to get bytes from</div><div class='add'>+ *</div><div class='add'>+ * Writes data to the chip.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if write successful, -EIO if write error</div><div class='add'>+ */</div><div class='add'>+static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='add'>+		     size_t *retlen, const u_char *buf)</div><div class='add'>+{</div><div class='add'>+	struct docg3 *docg3 = mtd-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+	struct mtd_oob_ops ops;</div><div class='add'>+</div><div class='add'>+	doc_dbg("doc_write(to=%lld, len=%zu)\n", to, len);</div><div class='add'>+	ops.datbuf = (char *)buf;</div><div class='add'>+	ops.len = len;</div><div class='add'>+	ops.mode = MTD_OPS_PLACE_OOB;</div><div class='add'>+	ops.oobbuf = NULL;</div><div class='add'>+	ops.ooblen = 0;</div><div class='add'>+	ops.ooboffs = 0;</div><div class='add'>+</div><div class='add'>+	ret = doc_write_oob(mtd, to, &amp;ops);</div><div class='add'>+	*retlen = ops.retlen;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct docg3 *sysfs_dev2docg3(struct device *dev,</div><div class='add'>+				     struct device_attribute *attr)</div><div class='add'>+{</div><div class='add'>+	int floor;</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct mtd_info **docg3_floors = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	floor = attr-&gt;attr.name[1] - '0';</div><div class='add'>+	if (floor &lt; 0 || floor &gt;= DOC_MAX_NBFLOORS)</div><div class='add'>+		return NULL;</div><div class='add'>+	else</div><div class='add'>+		return docg3_floors[floor]-&gt;priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t dps0_is_key_locked(struct device *dev,</div><div class='add'>+				  struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct docg3 *docg3 = sysfs_dev2docg3(dev, attr);</div><div class='add'>+	int dps0;</div><div class='add'>+</div><div class='add'>+	doc_set_device_id(docg3, docg3-&gt;device_id);</div><div class='add'>+	dps0 = doc_register_readb(docg3, DOC_DPS0_STATUS);</div><div class='add'>+	doc_set_device_id(docg3, 0);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", !(dps0 &amp; DOC_DPS_KEY_OK));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t dps1_is_key_locked(struct device *dev,</div><div class='add'>+				  struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct docg3 *docg3 = sysfs_dev2docg3(dev, attr);</div><div class='add'>+	int dps1;</div><div class='add'>+</div><div class='add'>+	doc_set_device_id(docg3, docg3-&gt;device_id);</div><div class='add'>+	dps1 = doc_register_readb(docg3, DOC_DPS1_STATUS);</div><div class='add'>+	doc_set_device_id(docg3, 0);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", !(dps1 &amp; DOC_DPS_KEY_OK));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t dps0_insert_key(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'>+	struct docg3 *docg3 = sysfs_dev2docg3(dev, attr);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (count != DOC_LAYOUT_DPS_KEY_LENGTH)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	doc_set_device_id(docg3, docg3-&gt;device_id);</div><div class='add'>+	for (i = 0; i &lt; DOC_LAYOUT_DPS_KEY_LENGTH; i++)</div><div class='add'>+		doc_writeb(docg3, buf[i], DOC_DPS0_KEY);</div><div class='add'>+	doc_set_device_id(docg3, 0);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t dps1_insert_key(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'>+	struct docg3 *docg3 = sysfs_dev2docg3(dev, attr);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (count != DOC_LAYOUT_DPS_KEY_LENGTH)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	doc_set_device_id(docg3, docg3-&gt;device_id);</div><div class='add'>+	for (i = 0; i &lt; DOC_LAYOUT_DPS_KEY_LENGTH; i++)</div><div class='add'>+		doc_writeb(docg3, buf[i], DOC_DPS1_KEY);</div><div class='add'>+	doc_set_device_id(docg3, 0);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define FLOOR_SYSFS(id) { \</div><div class='add'>+	__ATTR(f##id##_dps0_is_keylocked, S_IRUGO, dps0_is_key_locked, NULL), \</div><div class='add'>+	__ATTR(f##id##_dps1_is_keylocked, S_IRUGO, dps1_is_key_locked, NULL), \</div><div class='add'>+	__ATTR(f##id##_dps0_protection_key, S_IWUGO, NULL, dps0_insert_key), \</div><div class='add'>+	__ATTR(f##id##_dps1_protection_key, S_IWUGO, NULL, dps1_insert_key), \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_attribute doc_sys_attrs[DOC_MAX_NBFLOORS][4] = {</div><div class='add'>+	FLOOR_SYSFS(0), FLOOR_SYSFS(1), FLOOR_SYSFS(2), FLOOR_SYSFS(3)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int doc_register_sysfs(struct platform_device *pdev,</div><div class='add'>+			      struct mtd_info **floors)</div><div class='add'>+{</div><div class='add'>+	int ret = 0, floor, i = 0;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	for (floor = 0; !ret &amp;&amp; floor &lt; DOC_MAX_NBFLOORS &amp;&amp; floors[floor];</div><div class='add'>+	     floor++)</div><div class='add'>+		for (i = 0; !ret &amp;&amp; i &lt; 4; i++)</div><div class='add'>+			ret = device_create_file(dev, &amp;doc_sys_attrs[floor][i]);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return 0;</div><div class='add'>+	do {</div><div class='add'>+		while (--i &gt;= 0)</div><div class='add'>+			device_remove_file(dev, &amp;doc_sys_attrs[floor][i]);</div><div class='add'>+		i = 4;</div><div class='add'>+	} while (--floor &gt;= 0);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void doc_unregister_sysfs(struct platform_device *pdev,</div><div class='add'>+				 struct mtd_info **floors)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	int floor, i;</div><div class='add'>+</div><div class='add'>+	for (floor = 0; floor &lt; DOC_MAX_NBFLOORS &amp;&amp; floors[floor];</div><div class='add'>+	     floor++)</div><div class='add'>+		for (i = 0; i &lt; 4; i++)</div><div class='add'>+			device_remove_file(dev, &amp;doc_sys_attrs[floor][i]);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Debug sysfs entries</div><div class='hunk'>@@ -852,13 +1703,15 @@ static int dbg_protection_show(struct seq_file *s, void *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct docg3 *docg3 = (struct docg3 *)s-&gt;private;</div><div class='ctx'> 	int pos = 0;</div><div class='del'>-	int protect = doc_register_readb(docg3, DOC_PROTECTION);</div><div class='del'>-	int dps0 = doc_register_readb(docg3, DOC_DPS0_STATUS);</div><div class='del'>-	int dps0_low = doc_register_readb(docg3, DOC_DPS0_ADDRLOW);</div><div class='del'>-	int dps0_high = doc_register_readb(docg3, DOC_DPS0_ADDRHIGH);</div><div class='del'>-	int dps1 = doc_register_readb(docg3, DOC_DPS1_STATUS);</div><div class='del'>-	int dps1_low = doc_register_readb(docg3, DOC_DPS1_ADDRLOW);</div><div class='del'>-	int dps1_high = doc_register_readb(docg3, DOC_DPS1_ADDRHIGH);</div><div class='add'>+	int protect, dps0, dps0_low, dps0_high, dps1, dps1_low, dps1_high;</div><div class='add'>+</div><div class='add'>+	protect = doc_register_readb(docg3, DOC_PROTECTION);</div><div class='add'>+	dps0 = doc_register_readb(docg3, DOC_DPS0_STATUS);</div><div class='add'>+	dps0_low = doc_register_readw(docg3, DOC_DPS0_ADDRLOW);</div><div class='add'>+	dps0_high = doc_register_readw(docg3, DOC_DPS0_ADDRHIGH);</div><div class='add'>+	dps1 = doc_register_readb(docg3, DOC_DPS1_STATUS);</div><div class='add'>+	dps1_low = doc_register_readw(docg3, DOC_DPS1_ADDRLOW);</div><div class='add'>+	dps1_high = doc_register_readw(docg3, DOC_DPS1_ADDRHIGH);</div><div class='ctx'> </div><div class='ctx'> 	pos += seq_printf(s, "Protection = 0x%02x (",</div><div class='ctx'> 			 protect);</div><div class='hunk'>@@ -947,52 +1800,54 @@ static void __init doc_set_driver_info(int chip_id, struct mtd_info *mtd)</div><div class='ctx'> </div><div class='ctx'> 	cfg = doc_register_readb(docg3, DOC_CONFIGURATION);</div><div class='ctx'> 	docg3-&gt;if_cfg = (cfg &amp; DOC_CONF_IF_CFG ? 1 : 0);</div><div class='add'>+	docg3-&gt;reliable = reliable_mode;</div><div class='ctx'> </div><div class='ctx'> 	switch (chip_id) {</div><div class='ctx'> 	case DOC_CHIPID_G3:</div><div class='del'>-		mtd-&gt;name = "DiskOnChip G3";</div><div class='add'>+		mtd-&gt;name = kasprintf(GFP_KERNEL, "DiskOnChip G3 floor %d",</div><div class='add'>+				      docg3-&gt;device_id);</div><div class='ctx'> 		docg3-&gt;max_block = 2047;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	mtd-&gt;type = MTD_NANDFLASH;</div><div class='del'>-	/*</div><div class='del'>-	 * Once write methods are added, the correct flags will be set.</div><div class='del'>-	 * mtd-&gt;flags = MTD_CAP_NANDFLASH;</div><div class='del'>-	 */</div><div class='del'>-	mtd-&gt;flags = MTD_CAP_ROM;</div><div class='add'>+	mtd-&gt;flags = MTD_CAP_NANDFLASH;</div><div class='ctx'> 	mtd-&gt;size = (docg3-&gt;max_block + 1) * DOC_LAYOUT_BLOCK_SIZE;</div><div class='add'>+	if (docg3-&gt;reliable == 2)</div><div class='add'>+		mtd-&gt;size /= 2;</div><div class='ctx'> 	mtd-&gt;erasesize = DOC_LAYOUT_BLOCK_SIZE * DOC_LAYOUT_NBPLANES;</div><div class='add'>+	if (docg3-&gt;reliable == 2)</div><div class='add'>+		mtd-&gt;erasesize /= 2;</div><div class='ctx'> 	mtd-&gt;writesize = DOC_LAYOUT_PAGE_SIZE;</div><div class='ctx'> 	mtd-&gt;oobsize = DOC_LAYOUT_OOB_SIZE;</div><div class='ctx'> 	mtd-&gt;owner = THIS_MODULE;</div><div class='del'>-	mtd-&gt;erase = NULL;</div><div class='del'>-	mtd-&gt;point = NULL;</div><div class='del'>-	mtd-&gt;unpoint = NULL;</div><div class='add'>+	mtd-&gt;erase = doc_erase;</div><div class='ctx'> 	mtd-&gt;read = doc_read;</div><div class='del'>-	mtd-&gt;write = NULL;</div><div class='add'>+	mtd-&gt;write = doc_write;</div><div class='ctx'> 	mtd-&gt;read_oob = doc_read_oob;</div><div class='del'>-	mtd-&gt;write_oob = NULL;</div><div class='del'>-	mtd-&gt;sync = NULL;</div><div class='add'>+	mtd-&gt;write_oob = doc_write_oob;</div><div class='ctx'> 	mtd-&gt;block_isbad = doc_block_isbad;</div><div class='add'>+	mtd-&gt;ecclayout = &amp;docg3_oobinfo;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * doc_probe - Probe the IO space for a DiskOnChip G3 chip</div><div class='del'>- * @pdev: platform device</div><div class='add'>+ * doc_probe_device - Check if a device is available</div><div class='add'>+ * @base: the io space where the device is probed</div><div class='add'>+ * @floor: the floor of the probed device</div><div class='add'>+ * @dev: the device</div><div class='ctx'>  *</div><div class='del'>- * Probes for a G3 chip at the specified IO space in the platform data</div><div class='del'>- * ressources.</div><div class='add'>+ * Checks whether a device at the specified IO range, and floor is available.</div><div class='ctx'>  *</div><div class='del'>- * Returns 0 on success, -ENOMEM, -ENXIO on error</div><div class='add'>+ * Returns a mtd_info struct if there is a device, ENODEV if none found, ENOMEM</div><div class='add'>+ * if a memory allocation failed. If floor 0 is checked, a reset of the ASIC is</div><div class='add'>+ * launched.</div><div class='ctx'>  */</div><div class='del'>-static int __init docg3_probe(struct platform_device *pdev)</div><div class='add'>+static struct mtd_info *doc_probe_device(void __iomem *base, int floor,</div><div class='add'>+					 struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct device *dev = &amp;pdev-&gt;dev;</div><div class='del'>-	struct docg3 *docg3;</div><div class='del'>-	struct mtd_info *mtd;</div><div class='del'>-	struct resource *ress;</div><div class='ctx'> 	int ret, bbt_nbpages;</div><div class='ctx'> 	u16 chip_id, chip_id_inv;</div><div class='add'>+	struct docg3 *docg3;</div><div class='add'>+	struct mtd_info *mtd;</div><div class='ctx'> </div><div class='ctx'> 	ret = -ENOMEM;</div><div class='ctx'> 	docg3 = kzalloc(sizeof(struct docg3), GFP_KERNEL);</div><div class='hunk'>@@ -1002,69 +1857,218 @@ static int __init docg3_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (!mtd)</div><div class='ctx'> 		goto nomem2;</div><div class='ctx'> 	mtd-&gt;priv = docg3;</div><div class='add'>+	bbt_nbpages = DIV_ROUND_UP(docg3-&gt;max_block + 1,</div><div class='add'>+				   8 * DOC_LAYOUT_PAGE_SIZE);</div><div class='add'>+	docg3-&gt;bbt = kzalloc(bbt_nbpages * DOC_LAYOUT_PAGE_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!docg3-&gt;bbt)</div><div class='add'>+		goto nomem3;</div><div class='ctx'> </div><div class='del'>-	ret = -ENXIO;</div><div class='del'>-	ress = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	if (!ress) {</div><div class='del'>-		dev_err(dev, "No I/O memory resource defined\n");</div><div class='del'>-		goto noress;</div><div class='del'>-	}</div><div class='del'>-	docg3-&gt;base = ioremap(ress-&gt;start, DOC_IOSPACE_SIZE);</div><div class='del'>-</div><div class='del'>-	docg3-&gt;dev = &amp;pdev-&gt;dev;</div><div class='del'>-	docg3-&gt;device_id = 0;</div><div class='add'>+	docg3-&gt;dev = dev;</div><div class='add'>+	docg3-&gt;device_id = floor;</div><div class='add'>+	docg3-&gt;base = base;</div><div class='ctx'> 	doc_set_device_id(docg3, docg3-&gt;device_id);</div><div class='del'>-	doc_set_asic_mode(docg3, DOC_ASICMODE_RESET);</div><div class='add'>+	if (!floor)</div><div class='add'>+		doc_set_asic_mode(docg3, DOC_ASICMODE_RESET);</div><div class='ctx'> 	doc_set_asic_mode(docg3, DOC_ASICMODE_NORMAL);</div><div class='ctx'> </div><div class='ctx'> 	chip_id = doc_register_readw(docg3, DOC_CHIPID);</div><div class='ctx'> 	chip_id_inv = doc_register_readw(docg3, DOC_CHIPID_INV);</div><div class='ctx'> </div><div class='del'>-	ret = -ENODEV;</div><div class='add'>+	ret = 0;</div><div class='ctx'> 	if (chip_id != (u16)(~chip_id_inv)) {</div><div class='del'>-		doc_info("No device found at IO addr %p\n",</div><div class='del'>-			 (void *)ress-&gt;start);</div><div class='del'>-		goto nochipfound;</div><div class='add'>+		goto nomem3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (chip_id) {</div><div class='ctx'> 	case DOC_CHIPID_G3:</div><div class='del'>-		doc_info("Found a G3 DiskOnChip at addr %p\n",</div><div class='del'>-			 (void *)ress-&gt;start);</div><div class='add'>+		doc_info("Found a G3 DiskOnChip at addr %p, floor %d\n",</div><div class='add'>+			 base, floor);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		doc_err("Chip id %04x is not a DiskOnChip G3 chip\n", chip_id);</div><div class='del'>-		goto nochipfound;</div><div class='add'>+		goto nomem3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	doc_set_driver_info(chip_id, mtd);</div><div class='del'>-	platform_set_drvdata(pdev, mtd);</div><div class='ctx'> </div><div class='del'>-	ret = -ENOMEM;</div><div class='del'>-	bbt_nbpages = DIV_ROUND_UP(docg3-&gt;max_block + 1,</div><div class='del'>-				   8 * DOC_LAYOUT_PAGE_SIZE);</div><div class='del'>-	docg3-&gt;bbt = kzalloc(bbt_nbpages * DOC_LAYOUT_PAGE_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!docg3-&gt;bbt)</div><div class='del'>-		goto nochipfound;</div><div class='add'>+	doc_hamming_ecc_init(docg3, DOC_LAYOUT_OOB_PAGEINFO_SZ);</div><div class='ctx'> 	doc_reload_bbt(docg3);</div><div class='add'>+	return mtd;</div><div class='ctx'> </div><div class='del'>-	ret = mtd_device_parse_register(mtd, part_probes,</div><div class='del'>-					NULL, NULL, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto register_error;</div><div class='add'>+nomem3:</div><div class='add'>+	kfree(mtd);</div><div class='add'>+nomem2:</div><div class='add'>+	kfree(docg3);</div><div class='add'>+nomem1:</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	doc_dbg_register(docg3);</div><div class='del'>-	return 0;</div><div class='add'>+/**</div><div class='add'>+ * doc_release_device - Release a docg3 floor</div><div class='add'>+ * @mtd: the device</div><div class='add'>+ */</div><div class='add'>+static void doc_release_device(struct mtd_info *mtd)</div><div class='add'>+{</div><div class='add'>+	struct docg3 *docg3 = mtd-&gt;priv;</div><div class='ctx'> </div><div class='del'>-register_error:</div><div class='add'>+	mtd_device_unregister(mtd);</div><div class='ctx'> 	kfree(docg3-&gt;bbt);</div><div class='del'>-nochipfound:</div><div class='del'>-	iounmap(docg3-&gt;base);</div><div class='del'>-noress:</div><div class='add'>+	kfree(docg3);</div><div class='add'>+	kfree(mtd-&gt;name);</div><div class='ctx'> 	kfree(mtd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * docg3_resume - Awakens docg3 floor</div><div class='add'>+ * @pdev: platfrom device</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 (always successfull)</div><div class='add'>+ */</div><div class='add'>+static int docg3_resume(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct mtd_info **docg3_floors, *mtd;</div><div class='add'>+	struct docg3 *docg3;</div><div class='add'>+</div><div class='add'>+	docg3_floors = platform_get_drvdata(pdev);</div><div class='add'>+	mtd = docg3_floors[0];</div><div class='add'>+	docg3 = mtd-&gt;priv;</div><div class='add'>+</div><div class='add'>+	doc_dbg("docg3_resume()\n");</div><div class='add'>+	for (i = 0; i &lt; 12; i++)</div><div class='add'>+		doc_readb(docg3, DOC_IOSPACE_IPL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * docg3_suspend - Put in low power mode the docg3 floor</div><div class='add'>+ * @pdev: platform device</div><div class='add'>+ * @state: power state</div><div class='add'>+ *</div><div class='add'>+ * Shuts off most of docg3 circuitery to lower power consumption.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if suspend succeeded, -EIO if chip refused suspend</div><div class='add'>+ */</div><div class='add'>+static int docg3_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	int floor, i;</div><div class='add'>+	struct mtd_info **docg3_floors, *mtd;</div><div class='add'>+	struct docg3 *docg3;</div><div class='add'>+	u8 ctrl, pwr_down;</div><div class='add'>+</div><div class='add'>+	docg3_floors = platform_get_drvdata(pdev);</div><div class='add'>+	for (floor = 0; floor &lt; DOC_MAX_NBFLOORS; floor++) {</div><div class='add'>+		mtd = docg3_floors[floor];</div><div class='add'>+		if (!mtd)</div><div class='add'>+			continue;</div><div class='add'>+		docg3 = mtd-&gt;priv;</div><div class='add'>+</div><div class='add'>+		doc_writeb(docg3, floor, DOC_DEVICESELECT);</div><div class='add'>+		ctrl = doc_register_readb(docg3, DOC_FLASHCONTROL);</div><div class='add'>+		ctrl &amp;= ~DOC_CTRL_VIOLATION &amp; ~DOC_CTRL_CE;</div><div class='add'>+		doc_writeb(docg3, ctrl, DOC_FLASHCONTROL);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 10; i++) {</div><div class='add'>+			usleep_range(3000, 4000);</div><div class='add'>+			pwr_down = doc_register_readb(docg3, DOC_POWERMODE);</div><div class='add'>+			if (pwr_down &amp; DOC_POWERDOWN_READY)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		if (pwr_down &amp; DOC_POWERDOWN_READY) {</div><div class='add'>+			doc_dbg("docg3_suspend(): floor %d powerdown ok\n",</div><div class='add'>+				floor);</div><div class='add'>+		} else {</div><div class='add'>+			doc_err("docg3_suspend(): floor %d powerdown failed\n",</div><div class='add'>+				floor);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mtd = docg3_floors[0];</div><div class='add'>+	docg3 = mtd-&gt;priv;</div><div class='add'>+	doc_set_asic_mode(docg3, DOC_ASICMODE_POWERDOWN);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * doc_probe - Probe the IO space for a DiskOnChip G3 chip</div><div class='add'>+ * @pdev: platform device</div><div class='add'>+ *</div><div class='add'>+ * Probes for a G3 chip at the specified IO space in the platform data</div><div class='add'>+ * ressources. The floor 0 must be available.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, -ENOMEM, -ENXIO on error</div><div class='add'>+ */</div><div class='add'>+static int __init docg3_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 mtd_info *mtd;</div><div class='add'>+	struct resource *ress;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	int ret, floor, found = 0;</div><div class='add'>+	struct mtd_info **docg3_floors;</div><div class='add'>+</div><div class='add'>+	ret = -ENXIO;</div><div class='add'>+	ress = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!ress) {</div><div class='add'>+		dev_err(dev, "No I/O memory resource defined\n");</div><div class='add'>+		goto noress;</div><div class='add'>+	}</div><div class='add'>+	base = ioremap(ress-&gt;start, DOC_IOSPACE_SIZE);</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	docg3_floors = kzalloc(sizeof(*docg3_floors) * DOC_MAX_NBFLOORS,</div><div class='add'>+			       GFP_KERNEL);</div><div class='add'>+	if (!docg3_floors)</div><div class='add'>+		goto nomem1;</div><div class='add'>+	docg3_bch = init_bch(DOC_ECC_BCH_M, DOC_ECC_BCH_T,</div><div class='add'>+			     DOC_ECC_BCH_PRIMPOLY);</div><div class='add'>+	if (!docg3_bch)</div><div class='add'>+		goto nomem2;</div><div class='add'>+</div><div class='add'>+	for (floor = 0; floor &lt; DOC_MAX_NBFLOORS; floor++) {</div><div class='add'>+		mtd = doc_probe_device(base, floor, dev);</div><div class='add'>+		if (IS_ERR(mtd)) {</div><div class='add'>+			ret = PTR_ERR(mtd);</div><div class='add'>+			goto err_probe;</div><div class='add'>+		}</div><div class='add'>+		if (!mtd) {</div><div class='add'>+			if (floor == 0)</div><div class='add'>+				goto notfound;</div><div class='add'>+			else</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+		docg3_floors[floor] = mtd;</div><div class='add'>+		ret = mtd_device_parse_register(mtd, part_probes, NULL, NULL,</div><div class='add'>+						0);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_probe;</div><div class='add'>+		found++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = doc_register_sysfs(pdev, docg3_floors);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_probe;</div><div class='add'>+	if (!found)</div><div class='add'>+		goto notfound;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, docg3_floors);</div><div class='add'>+	doc_dbg_register(docg3_floors[0]-&gt;priv);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+notfound:</div><div class='add'>+	ret = -ENODEV;</div><div class='add'>+	dev_info(dev, "No supported DiskOnChip found\n");</div><div class='add'>+err_probe:</div><div class='add'>+	free_bch(docg3_bch);</div><div class='add'>+	for (floor = 0; floor &lt; DOC_MAX_NBFLOORS; floor++)</div><div class='add'>+		if (docg3_floors[floor])</div><div class='add'>+			doc_release_device(docg3_floors[floor]);</div><div class='ctx'> nomem2:</div><div class='del'>-	kfree(docg3);</div><div class='add'>+	kfree(docg3_floors);</div><div class='ctx'> nomem1:</div><div class='add'>+	iounmap(base);</div><div class='add'>+noress:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1076,15 +2080,20 @@ nomem1:</div><div class='ctx'>  */</div><div class='ctx'> static int __exit docg3_release(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct mtd_info *mtd = platform_get_drvdata(pdev);</div><div class='del'>-	struct docg3 *docg3 = mtd-&gt;priv;</div><div class='add'>+	struct mtd_info **docg3_floors = platform_get_drvdata(pdev);</div><div class='add'>+	struct docg3 *docg3 = docg3_floors[0]-&gt;priv;</div><div class='add'>+	void __iomem *base = docg3-&gt;base;</div><div class='add'>+	int floor;</div><div class='ctx'> </div><div class='add'>+	doc_unregister_sysfs(pdev, docg3_floors);</div><div class='ctx'> 	doc_dbg_unregister(docg3);</div><div class='del'>-	mtd_device_unregister(mtd);</div><div class='del'>-	iounmap(docg3-&gt;base);</div><div class='del'>-	kfree(docg3-&gt;bbt);</div><div class='del'>-	kfree(docg3);</div><div class='del'>-	kfree(mtd);</div><div class='add'>+	for (floor = 0; floor &lt; DOC_MAX_NBFLOORS; floor++)</div><div class='add'>+		if (docg3_floors[floor])</div><div class='add'>+			doc_release_device(docg3_floors[floor]);</div><div class='add'>+</div><div class='add'>+	kfree(docg3_floors);</div><div class='add'>+	free_bch(docg3_bch);</div><div class='add'>+	iounmap(base);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1093,6 +2102,8 @@ static struct platform_driver g3_driver = {</div><div class='ctx'> 		.name	= "docg3",</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='add'>+	.suspend	= docg3_suspend,</div><div class='add'>+	.resume		= docg3_resume,</div><div class='ctx'> 	.remove		= __exit_p(docg3_release),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/devices/docg3.h b/drivers/mtd/devices/docg3.h<br/>index 0d407be24594..db0da436b493 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/docg3.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/docg3.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/docg3.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/devices/docg3.h</a></div><div class='hunk'>@@ -51,10 +51,19 @@</div><div class='ctx'> #define DOC_LAYOUT_WEAR_OFFSET		(DOC_LAYOUT_PAGE_OOB_SIZE * 2)</div><div class='ctx'> #define DOC_LAYOUT_BLOCK_SIZE					\</div><div class='ctx'> 	(DOC_LAYOUT_PAGES_PER_BLOCK * DOC_LAYOUT_PAGE_SIZE)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ECC related constants</div><div class='add'>+ */</div><div class='add'>+#define DOC_ECC_BCH_M			14</div><div class='add'>+#define DOC_ECC_BCH_T			4</div><div class='add'>+#define DOC_ECC_BCH_PRIMPOLY		0x4443</div><div class='ctx'> #define DOC_ECC_BCH_SIZE		7</div><div class='ctx'> #define DOC_ECC_BCH_COVERED_BYTES				\</div><div class='ctx'> 	(DOC_LAYOUT_PAGE_SIZE + DOC_LAYOUT_OOB_PAGEINFO_SZ +	\</div><div class='del'>-	 DOC_LAYOUT_OOB_HAMMING_SZ + DOC_LAYOUT_OOB_BCH_SZ)</div><div class='add'>+	 DOC_LAYOUT_OOB_HAMMING_SZ)</div><div class='add'>+#define DOC_ECC_BCH_TOTAL_BYTES					\</div><div class='add'>+	(DOC_ECC_BCH_COVERED_BYTES + DOC_LAYOUT_OOB_BCH_SZ)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Blocks distribution</div><div class='hunk'>@@ -80,6 +89,7 @@</div><div class='ctx'> </div><div class='ctx'> #define DOC_CHIPID_G3			0x200</div><div class='ctx'> #define DOC_ERASE_MARK			0xaa</div><div class='add'>+#define DOC_MAX_NBFLOORS		4</div><div class='ctx'> /*</div><div class='ctx'>  * Flash registers</div><div class='ctx'>  */</div><div class='hunk'>@@ -105,9 +115,11 @@</div><div class='ctx'> #define DOC_ECCCONF1			0x1042</div><div class='ctx'> #define DOC_ECCPRESET			0x1044</div><div class='ctx'> #define DOC_HAMMINGPARITY		0x1046</div><div class='del'>-#define DOC_BCH_SYNDROM(idx)		(0x1048 + (idx &lt;&lt; 1))</div><div class='add'>+#define DOC_BCH_HW_ECC(idx)		(0x1048 + idx)</div><div class='ctx'> </div><div class='ctx'> #define DOC_PROTECTION			0x1056</div><div class='add'>+#define DOC_DPS0_KEY			0x105c</div><div class='add'>+#define DOC_DPS1_KEY			0x105e</div><div class='ctx'> #define DOC_DPS0_ADDRLOW		0x1060</div><div class='ctx'> #define DOC_DPS0_ADDRHIGH		0x1062</div><div class='ctx'> #define DOC_DPS1_ADDRLOW		0x1064</div><div class='hunk'>@@ -117,6 +129,7 @@</div><div class='ctx'> </div><div class='ctx'> #define DOC_ASICMODECONFIRM		0x1072</div><div class='ctx'> #define DOC_CHIPID_INV			0x1074</div><div class='add'>+#define DOC_POWERMODE			0x107c</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Flash sequences</div><div class='hunk'>@@ -124,11 +137,14 @@</div><div class='ctx'>  */</div><div class='ctx'> #define DOC_SEQ_RESET			0x00</div><div class='ctx'> #define DOC_SEQ_PAGE_SIZE_532		0x03</div><div class='del'>-#define DOC_SEQ_SET_MODE		0x09</div><div class='add'>+#define DOC_SEQ_SET_FASTMODE		0x05</div><div class='add'>+#define DOC_SEQ_SET_RELIABLEMODE	0x09</div><div class='ctx'> #define DOC_SEQ_READ			0x12</div><div class='ctx'> #define DOC_SEQ_SET_PLANE1		0x0e</div><div class='ctx'> #define DOC_SEQ_SET_PLANE2		0x10</div><div class='ctx'> #define DOC_SEQ_PAGE_SETUP		0x1d</div><div class='add'>+#define DOC_SEQ_ERASE			0x27</div><div class='add'>+#define DOC_SEQ_PLANES_STATUS		0x31</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Flash commands</div><div class='hunk'>@@ -143,7 +159,10 @@</div><div class='ctx'> #define DOC_CMD_PROG_BLOCK_ADDR		0x60</div><div class='ctx'> #define DOC_CMD_PROG_CYCLE1		0x80</div><div class='ctx'> #define DOC_CMD_PROG_CYCLE2		0x10</div><div class='add'>+#define DOC_CMD_PROG_CYCLE3		0x11</div><div class='ctx'> #define DOC_CMD_ERASECYCLE2		0xd0</div><div class='add'>+#define DOC_CMD_READ_STATUS		0x70</div><div class='add'>+#define DOC_CMD_PLANES_STATUS		0x71</div><div class='ctx'> </div><div class='ctx'> #define DOC_CMD_RELIABLE_MODE		0x22</div><div class='ctx'> #define DOC_CMD_FAST_MODE		0xa2</div><div class='hunk'>@@ -174,6 +193,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Flash register : DOC_ECCCONF0</div><div class='ctx'>  */</div><div class='add'>+#define DOC_ECCCONF0_WRITE_MODE		0x0000</div><div class='ctx'> #define DOC_ECCCONF0_READ_MODE		0x8000</div><div class='ctx'> #define DOC_ECCCONF0_AUTO_ECC_ENABLE	0x4000</div><div class='ctx'> #define DOC_ECCCONF0_HAMMING_ENABLE	0x1000</div><div class='hunk'>@@ -185,7 +205,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #define DOC_ECCCONF1_BCH_SYNDROM_ERR	0x80</div><div class='ctx'> #define DOC_ECCCONF1_UNKOWN1		0x40</div><div class='del'>-#define DOC_ECCCONF1_UNKOWN2		0x20</div><div class='add'>+#define DOC_ECCCONF1_PAGE_IS_WRITTEN	0x20</div><div class='ctx'> #define DOC_ECCCONF1_UNKOWN3		0x10</div><div class='ctx'> #define DOC_ECCCONF1_HAMMING_BITS_MASK	0x0f</div><div class='ctx'> </div><div class='hunk'>@@ -223,13 +243,46 @@</div><div class='ctx'> #define DOC_READADDR_ONE_BYTE		0x4000</div><div class='ctx'> #define DOC_READADDR_ADDR_MASK		0x1fff</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Flash register : DOC_POWERMODE</div><div class='add'>+ */</div><div class='add'>+#define DOC_POWERDOWN_READY		0x80</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Status of erase and write operation</div><div class='add'>+ */</div><div class='add'>+#define DOC_PLANES_STATUS_FAIL		0x01</div><div class='add'>+#define DOC_PLANES_STATUS_PLANE0_KO	0x02</div><div class='add'>+#define DOC_PLANES_STATUS_PLANE1_KO	0x04</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * DPS key management</div><div class='add'>+ *</div><div class='add'>+ * Each floor of docg3 has 2 protection areas: DPS0 and DPS1. These areas span</div><div class='add'>+ * across block boundaries, and define whether these blocks can be read or</div><div class='add'>+ * written.</div><div class='add'>+ * The definition is dynamically stored in page 0 of blocks (2,3) for DPS0, and</div><div class='add'>+ * page 0 of blocks (4,5) for DPS1.</div><div class='add'>+ */</div><div class='add'>+#define DOC_LAYOUT_DPS_KEY_LENGTH	8</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct docg3 - DiskOnChip driver private data</div><div class='ctx'>  * @dev: the device currently under control</div><div class='ctx'>  * @base: mapped IO space</div><div class='ctx'>  * @device_id: number of the cascaded DoCG3 device (0, 1, 2 or 3)</div><div class='ctx'>  * @if_cfg: if true, reads are on 16bits, else reads are on 8bits</div><div class='add'>+</div><div class='add'>+ * @reliable: if 0, docg3 in normal mode, if 1 docg3 in fast mode, if 2 in</div><div class='add'>+ *            reliable mode</div><div class='add'>+ *            Fast mode implies more errors than normal mode.</div><div class='add'>+ *            Reliable mode implies that page 2*n and 2*n+1 are clones.</div><div class='ctx'>  * @bbt: bad block table cache</div><div class='add'>+ * @oob_write_ofs: offset of the MTD where this OOB should belong (ie. in next</div><div class='add'>+ *                 page_write)</div><div class='add'>+ * @oob_autoecc: if 1, use only bytes 0-7, 15, and fill the others with HW ECC</div><div class='add'>+ *               if 0, use all the 16 bytes.</div><div class='add'>+ * @oob_write_buf: prepared OOB for next page_write</div><div class='ctx'>  * @debugfs_root: debugfs root node</div><div class='ctx'>  */</div><div class='ctx'> struct docg3 {</div><div class='hunk'>@@ -237,8 +290,12 @@ struct docg3 {</div><div class='ctx'> 	void __iomem *base;</div><div class='ctx'> 	unsigned int device_id:4;</div><div class='ctx'> 	unsigned int if_cfg:1;</div><div class='add'>+	unsigned int reliable:2;</div><div class='ctx'> 	int max_block;</div><div class='ctx'> 	u8 *bbt;</div><div class='add'>+	loff_t oob_write_ofs;</div><div class='add'>+	int oob_autoecc;</div><div class='add'>+	u8 oob_write_buf[DOC_LAYOUT_OOB_SIZE];</div><div class='ctx'> 	struct dentry *debugfs_root;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/devices/docprobe.c b/drivers/mtd/devices/docprobe.c<br/>index 45116bb30297..706b847b46b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/docprobe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/docprobe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/docprobe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/devices/docprobe.c</a></div><div class='hunk'>@@ -241,8 +241,7 @@ static void __init DoC_Probe(unsigned long physadr)</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		docfound = 1;</div><div class='del'>-		mtd = kmalloc(sizeof(struct DiskOnChip) + sizeof(struct mtd_info), GFP_KERNEL);</div><div class='del'>-</div><div class='add'>+		mtd = kzalloc(sizeof(struct DiskOnChip) + sizeof(struct mtd_info), GFP_KERNEL);</div><div class='ctx'> 		if (!mtd) {</div><div class='ctx'> 			printk(KERN_WARNING "Cannot allocate memory for data structures. Dropping.\n");</div><div class='ctx'> 			iounmap(docptr);</div><div class='hunk'>@@ -250,10 +249,6 @@ static void __init DoC_Probe(unsigned long physadr)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		this = (struct DiskOnChip *)(&amp;mtd[1]);</div><div class='del'>-</div><div class='del'>-		memset((char *)mtd,0, sizeof(struct mtd_info));</div><div class='del'>-		memset((char *)this, 0, sizeof(struct DiskOnChip));</div><div class='del'>-</div><div class='ctx'> 		mtd-&gt;priv = this;</div><div class='ctx'> 		this-&gt;virtadr = docptr;</div><div class='ctx'> 		this-&gt;physadr = physadr;</div><div class='head'>diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c<br/>index 884904d3f9d2..7c60dddbefc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/m25p80.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/m25p80.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/m25p80.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/devices/m25p80.c</a></div><div class='hunk'>@@ -992,7 +992,6 @@ static int __devexit m25p_remove(struct spi_device *spi)</div><div class='ctx'> static struct spi_driver m25p80_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "m25p80",</div><div class='del'>-		.bus	= &amp;spi_bus_type,</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> 	.id_table	= m25p_ids,</div><div class='head'>diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c<br/>index d75c7af18a63..236057ead0d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/mtd_dataflash.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/mtd_dataflash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/mtd_dataflash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/devices/mtd_dataflash.c</a></div><div class='hunk'>@@ -936,7 +936,6 @@ static int __devexit dataflash_remove(struct spi_device *spi)</div><div class='ctx'> static struct spi_driver dataflash_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name		= "mtd_dataflash",</div><div class='del'>-		.bus		= &amp;spi_bus_type,</div><div class='ctx'> 		.owner		= THIS_MODULE,</div><div class='ctx'> 		.of_match_table = dataflash_dt_ids,</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c<br/>index d38ef3bffe8d..5fc198350b94 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/sst25l.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/devices/sst25l.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/sst25l.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/devices/sst25l.c</a></div><div class='hunk'>@@ -378,7 +378,7 @@ static int __devinit sst25l_probe(struct spi_device *spi)</div><div class='ctx'> 	struct flash_info *flash_info;</div><div class='ctx'> 	struct sst25l_flash *flash;</div><div class='ctx'> 	struct flash_platform_data *data;</div><div class='del'>-	int ret, i;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	flash_info = sst25l_match_device(spi);</div><div class='ctx'> 	if (!flash_info)</div><div class='hunk'>@@ -444,7 +444,6 @@ static int __devexit sst25l_remove(struct spi_device *spi)</div><div class='ctx'> static struct spi_driver sst25l_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "sst25l",</div><div class='del'>-		.bus	= &amp;spi_bus_type,</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= sst25l_probe,</div><div class='head'>diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c<br/>index c7382bb686c6..19d637266fcd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/ftl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ftl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/ftl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/ftl.c</a></div><div class='hunk'>@@ -168,8 +168,8 @@ static int scan_header(partition_t *part)</div><div class='ctx'> 	 (offset + sizeof(header)) &lt; max_offset;</div><div class='ctx'> 	 offset += part-&gt;mbd.mtd-&gt;erasesize ? : 0x2000) {</div><div class='ctx'> </div><div class='del'>-	err = part-&gt;mbd.mtd-&gt;read(part-&gt;mbd.mtd, offset, sizeof(header), &amp;ret,</div><div class='del'>-			      (unsigned char *)&amp;header);</div><div class='add'>+	err = mtd_read(part-&gt;mbd.mtd, offset, sizeof(header), &amp;ret,</div><div class='add'>+                       (unsigned char *)&amp;header);</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='ctx'> 	    return err;</div><div class='hunk'>@@ -224,8 +224,8 @@ static int build_maps(partition_t *part)</div><div class='ctx'>     for (i = 0; i &lt; le16_to_cpu(part-&gt;header.NumEraseUnits); i++) {</div><div class='ctx'> 	offset = ((i + le16_to_cpu(part-&gt;header.FirstPhysicalEUN))</div><div class='ctx'> 		      &lt;&lt; part-&gt;header.EraseUnitSize);</div><div class='del'>-	ret = part-&gt;mbd.mtd-&gt;read(part-&gt;mbd.mtd, offset, sizeof(header), &amp;retval,</div><div class='del'>-			      (unsigned char *)&amp;header);</div><div class='add'>+	ret = mtd_read(part-&gt;mbd.mtd, offset, sizeof(header), &amp;retval,</div><div class='add'>+                       (unsigned char *)&amp;header);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 	    goto out_XferInfo;</div><div class='hunk'>@@ -289,9 +289,9 @@ static int build_maps(partition_t *part)</div><div class='ctx'> 	part-&gt;EUNInfo[i].Deleted = 0;</div><div class='ctx'> 	offset = part-&gt;EUNInfo[i].Offset + le32_to_cpu(header.BAMOffset);</div><div class='ctx'> </div><div class='del'>-	ret = part-&gt;mbd.mtd-&gt;read(part-&gt;mbd.mtd, offset,</div><div class='del'>-			      part-&gt;BlocksPerUnit * sizeof(uint32_t), &amp;retval,</div><div class='del'>-			      (unsigned char *)part-&gt;bam_cache);</div><div class='add'>+	ret = mtd_read(part-&gt;mbd.mtd, offset,</div><div class='add'>+                       part-&gt;BlocksPerUnit * sizeof(uint32_t), &amp;retval,</div><div class='add'>+                       (unsigned char *)part-&gt;bam_cache);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_bam_cache;</div><div class='hunk'>@@ -355,7 +355,7 @@ static int erase_xfer(partition_t *part,</div><div class='ctx'>     erase-&gt;len = 1 &lt;&lt; part-&gt;header.EraseUnitSize;</div><div class='ctx'>     erase-&gt;priv = (u_long)part;</div><div class='ctx'> </div><div class='del'>-    ret = part-&gt;mbd.mtd-&gt;erase(part-&gt;mbd.mtd, erase);</div><div class='add'>+    ret = mtd_erase(part-&gt;mbd.mtd, erase);</div><div class='ctx'> </div><div class='ctx'>     if (!ret)</div><div class='ctx'> 	    xfer-&gt;EraseCount++;</div><div class='hunk'>@@ -422,8 +422,8 @@ static int prepare_xfer(partition_t *part, int i)</div><div class='ctx'>     header.LogicalEUN = cpu_to_le16(0xffff);</div><div class='ctx'>     header.EraseCount = cpu_to_le32(xfer-&gt;EraseCount);</div><div class='ctx'> </div><div class='del'>-    ret = part-&gt;mbd.mtd-&gt;write(part-&gt;mbd.mtd, xfer-&gt;Offset, sizeof(header),</div><div class='del'>-			   &amp;retlen, (u_char *)&amp;header);</div><div class='add'>+    ret = mtd_write(part-&gt;mbd.mtd, xfer-&gt;Offset, sizeof(header), &amp;retlen,</div><div class='add'>+                    (u_char *)&amp;header);</div><div class='ctx'> </div><div class='ctx'>     if (ret) {</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -438,8 +438,8 @@ static int prepare_xfer(partition_t *part, int i)</div><div class='ctx'> </div><div class='ctx'>     for (i = 0; i &lt; nbam; i++, offset += sizeof(uint32_t)) {</div><div class='ctx'> </div><div class='del'>-	ret = part-&gt;mbd.mtd-&gt;write(part-&gt;mbd.mtd, offset, sizeof(uint32_t),</div><div class='del'>-			       &amp;retlen, (u_char *)&amp;ctl);</div><div class='add'>+	ret = mtd_write(part-&gt;mbd.mtd, offset, sizeof(uint32_t), &amp;retlen,</div><div class='add'>+                        (u_char *)&amp;ctl);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 	    return ret;</div><div class='hunk'>@@ -485,9 +485,9 @@ static int copy_erase_unit(partition_t *part, uint16_t srcunit,</div><div class='ctx'> </div><div class='ctx'> 	offset = eun-&gt;Offset + le32_to_cpu(part-&gt;header.BAMOffset);</div><div class='ctx'> </div><div class='del'>-	ret = part-&gt;mbd.mtd-&gt;read(part-&gt;mbd.mtd, offset,</div><div class='del'>-			      part-&gt;BlocksPerUnit * sizeof(uint32_t),</div><div class='del'>-			      &amp;retlen, (u_char *) (part-&gt;bam_cache));</div><div class='add'>+	ret = mtd_read(part-&gt;mbd.mtd, offset,</div><div class='add'>+                       part-&gt;BlocksPerUnit * sizeof(uint32_t), &amp;retlen,</div><div class='add'>+                       (u_char *)(part-&gt;bam_cache));</div><div class='ctx'> </div><div class='ctx'> 	/* mark the cache bad, in case we get an error later */</div><div class='ctx'> 	part-&gt;bam_index = 0xffff;</div><div class='hunk'>@@ -503,8 +503,8 @@ static int copy_erase_unit(partition_t *part, uint16_t srcunit,</div><div class='ctx'>     offset = xfer-&gt;Offset + 20; /* Bad! */</div><div class='ctx'>     unit = cpu_to_le16(0x7fff);</div><div class='ctx'> </div><div class='del'>-    ret = part-&gt;mbd.mtd-&gt;write(part-&gt;mbd.mtd, offset, sizeof(uint16_t),</div><div class='del'>-			   &amp;retlen, (u_char *) &amp;unit);</div><div class='add'>+    ret = mtd_write(part-&gt;mbd.mtd, offset, sizeof(uint16_t), &amp;retlen,</div><div class='add'>+                    (u_char *)&amp;unit);</div><div class='ctx'> </div><div class='ctx'>     if (ret) {</div><div class='ctx'> 	printk( KERN_WARNING "ftl: Failed to write back to BAM cache in copy_erase_unit()!\n");</div><div class='hunk'>@@ -523,16 +523,16 @@ static int copy_erase_unit(partition_t *part, uint16_t srcunit,</div><div class='ctx'> 	    break;</div><div class='ctx'> 	case BLOCK_DATA:</div><div class='ctx'> 	case BLOCK_REPLACEMENT:</div><div class='del'>-	    ret = part-&gt;mbd.mtd-&gt;read(part-&gt;mbd.mtd, src, SECTOR_SIZE,</div><div class='del'>-                        &amp;retlen, (u_char *) buf);</div><div class='add'>+	    ret = mtd_read(part-&gt;mbd.mtd, src, SECTOR_SIZE, &amp;retlen,</div><div class='add'>+                           (u_char *)buf);</div><div class='ctx'> 	    if (ret) {</div><div class='ctx'> 		printk(KERN_WARNING "ftl: Error reading old xfer unit in copy_erase_unit\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	    ret = part-&gt;mbd.mtd-&gt;write(part-&gt;mbd.mtd, dest, SECTOR_SIZE,</div><div class='del'>-                        &amp;retlen, (u_char *) buf);</div><div class='add'>+	    ret = mtd_write(part-&gt;mbd.mtd, dest, SECTOR_SIZE, &amp;retlen,</div><div class='add'>+                            (u_char *)buf);</div><div class='ctx'> 	    if (ret)  {</div><div class='ctx'> 		printk(KERN_WARNING "ftl: Error writing new xfer unit in copy_erase_unit\n");</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -550,9 +550,11 @@ static int copy_erase_unit(partition_t *part, uint16_t srcunit,</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     /* Write the BAM to the transfer unit */</div><div class='del'>-    ret = part-&gt;mbd.mtd-&gt;write(part-&gt;mbd.mtd, xfer-&gt;Offset + le32_to_cpu(part-&gt;header.BAMOffset),</div><div class='del'>-                    part-&gt;BlocksPerUnit * sizeof(int32_t), &amp;retlen,</div><div class='del'>-		    (u_char *)part-&gt;bam_cache);</div><div class='add'>+    ret = mtd_write(part-&gt;mbd.mtd,</div><div class='add'>+                    xfer-&gt;Offset + le32_to_cpu(part-&gt;header.BAMOffset),</div><div class='add'>+                    part-&gt;BlocksPerUnit * sizeof(int32_t),</div><div class='add'>+                    &amp;retlen,</div><div class='add'>+                    (u_char *)part-&gt;bam_cache);</div><div class='ctx'>     if (ret) {</div><div class='ctx'> 	printk( KERN_WARNING "ftl: Error writing BAM in copy_erase_unit\n");</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -560,8 +562,8 @@ static int copy_erase_unit(partition_t *part, uint16_t srcunit,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'>     /* All clear? Then update the LogicalEUN again */</div><div class='del'>-    ret = part-&gt;mbd.mtd-&gt;write(part-&gt;mbd.mtd, xfer-&gt;Offset + 20, sizeof(uint16_t),</div><div class='del'>-			   &amp;retlen, (u_char *)&amp;srcunitswap);</div><div class='add'>+    ret = mtd_write(part-&gt;mbd.mtd, xfer-&gt;Offset + 20, sizeof(uint16_t),</div><div class='add'>+                    &amp;retlen, (u_char *)&amp;srcunitswap);</div><div class='ctx'> </div><div class='ctx'>     if (ret) {</div><div class='ctx'> 	printk(KERN_WARNING "ftl: Error writing new LogicalEUN in copy_erase_unit\n");</div><div class='hunk'>@@ -648,8 +650,7 @@ static int reclaim_block(partition_t *part)</div><div class='ctx'> 	    if (queued) {</div><div class='ctx'> 		pr_debug("ftl_cs: waiting for transfer "</div><div class='ctx'> 		      "unit to be prepared...\n");</div><div class='del'>-		if (part-&gt;mbd.mtd-&gt;sync)</div><div class='del'>-			part-&gt;mbd.mtd-&gt;sync(part-&gt;mbd.mtd);</div><div class='add'>+		mtd_sync(part-&gt;mbd.mtd);</div><div class='ctx'> 	    } else {</div><div class='ctx'> 		static int ne = 0;</div><div class='ctx'> 		if (++ne &lt; 5)</div><div class='hunk'>@@ -747,10 +748,11 @@ static uint32_t find_free(partition_t *part)</div><div class='ctx'> 	/* Invalidate cache */</div><div class='ctx'> 	part-&gt;bam_index = 0xffff;</div><div class='ctx'> </div><div class='del'>-	ret = part-&gt;mbd.mtd-&gt;read(part-&gt;mbd.mtd,</div><div class='del'>-		       part-&gt;EUNInfo[eun].Offset + le32_to_cpu(part-&gt;header.BAMOffset),</div><div class='del'>-		       part-&gt;BlocksPerUnit * sizeof(uint32_t),</div><div class='del'>-		       &amp;retlen, (u_char *) (part-&gt;bam_cache));</div><div class='add'>+	ret = mtd_read(part-&gt;mbd.mtd,</div><div class='add'>+                       part-&gt;EUNInfo[eun].Offset + le32_to_cpu(part-&gt;header.BAMOffset),</div><div class='add'>+                       part-&gt;BlocksPerUnit * sizeof(uint32_t),</div><div class='add'>+                       &amp;retlen,</div><div class='add'>+                       (u_char *)(part-&gt;bam_cache));</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 	    printk(KERN_WARNING"ftl: Error reading BAM in find_free\n");</div><div class='hunk'>@@ -810,8 +812,8 @@ static int ftl_read(partition_t *part, caddr_t buffer,</div><div class='ctx'> 	else {</div><div class='ctx'> 	    offset = (part-&gt;EUNInfo[log_addr / bsize].Offset</div><div class='ctx'> 			  + (log_addr % bsize));</div><div class='del'>-	    ret = part-&gt;mbd.mtd-&gt;read(part-&gt;mbd.mtd, offset, SECTOR_SIZE,</div><div class='del'>-			   &amp;retlen, (u_char *) buffer);</div><div class='add'>+	    ret = mtd_read(part-&gt;mbd.mtd, offset, SECTOR_SIZE, &amp;retlen,</div><div class='add'>+                           (u_char *)buffer);</div><div class='ctx'> </div><div class='ctx'> 	    if (ret) {</div><div class='ctx'> 		printk(KERN_WARNING "Error reading MTD device in ftl_read()\n");</div><div class='hunk'>@@ -849,8 +851,8 @@ static int set_bam_entry(partition_t *part, uint32_t log_addr,</div><div class='ctx'> 		  le32_to_cpu(part-&gt;header.BAMOffset));</div><div class='ctx'> </div><div class='ctx'> #ifdef PSYCHO_DEBUG</div><div class='del'>-    ret = part-&gt;mbd.mtd-&gt;read(part-&gt;mbd.mtd, offset, sizeof(uint32_t),</div><div class='del'>-                        &amp;retlen, (u_char *)&amp;old_addr);</div><div class='add'>+    ret = mtd_read(part-&gt;mbd.mtd, offset, sizeof(uint32_t), &amp;retlen,</div><div class='add'>+                   (u_char *)&amp;old_addr);</div><div class='ctx'>     if (ret) {</div><div class='ctx'> 	printk(KERN_WARNING"ftl: Error reading old_addr in set_bam_entry: %d\n",ret);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -886,8 +888,8 @@ static int set_bam_entry(partition_t *part, uint32_t log_addr,</div><div class='ctx'> #endif</div><div class='ctx'> 	part-&gt;bam_cache[blk] = le_virt_addr;</div><div class='ctx'>     }</div><div class='del'>-    ret = part-&gt;mbd.mtd-&gt;write(part-&gt;mbd.mtd, offset, sizeof(uint32_t),</div><div class='del'>-                            &amp;retlen, (u_char *)&amp;le_virt_addr);</div><div class='add'>+    ret = mtd_write(part-&gt;mbd.mtd, offset, sizeof(uint32_t), &amp;retlen,</div><div class='add'>+                    (u_char *)&amp;le_virt_addr);</div><div class='ctx'> </div><div class='ctx'>     if (ret) {</div><div class='ctx'> 	printk(KERN_NOTICE "ftl_cs: set_bam_entry() failed!\n");</div><div class='hunk'>@@ -946,8 +948,7 @@ static int ftl_write(partition_t *part, caddr_t buffer,</div><div class='ctx'> 	part-&gt;EUNInfo[part-&gt;bam_index].Deleted++;</div><div class='ctx'> 	offset = (part-&gt;EUNInfo[part-&gt;bam_index].Offset +</div><div class='ctx'> 		      blk * SECTOR_SIZE);</div><div class='del'>-	ret = part-&gt;mbd.mtd-&gt;write(part-&gt;mbd.mtd, offset, SECTOR_SIZE, &amp;retlen,</div><div class='del'>-                                     buffer);</div><div class='add'>+	ret = mtd_write(part-&gt;mbd.mtd, offset, SECTOR_SIZE, &amp;retlen, buffer);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 	    printk(KERN_NOTICE "ftl_cs: block write failed!\n");</div><div class='head'>diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c<br/>index dd034efd1875..28646c95cfb8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/inftlcore.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/inftlcore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/inftlcore.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/inftlcore.c</a></div><div class='hunk'>@@ -158,7 +158,7 @@ int inftl_read_oob(struct mtd_info *mtd, loff_t offs, size_t len,</div><div class='ctx'> 	ops.oobbuf = buf;</div><div class='ctx'> 	ops.datbuf = NULL;</div><div class='ctx'> </div><div class='del'>-	res = mtd-&gt;read_oob(mtd, offs &amp; ~(mtd-&gt;writesize - 1), &amp;ops);</div><div class='add'>+	res = mtd_read_oob(mtd, offs &amp; ~(mtd-&gt;writesize - 1), &amp;ops);</div><div class='ctx'> 	*retlen = ops.oobretlen;</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -178,7 +178,7 @@ int inftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len,</div><div class='ctx'> 	ops.oobbuf = buf;</div><div class='ctx'> 	ops.datbuf = NULL;</div><div class='ctx'> </div><div class='del'>-	res = mtd-&gt;write_oob(mtd, offs &amp; ~(mtd-&gt;writesize - 1), &amp;ops);</div><div class='add'>+	res = mtd_write_oob(mtd, offs &amp; ~(mtd-&gt;writesize - 1), &amp;ops);</div><div class='ctx'> 	*retlen = ops.oobretlen;</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -199,7 +199,7 @@ static int inftl_write(struct mtd_info *mtd, loff_t offs, size_t len,</div><div class='ctx'> 	ops.datbuf = buf;</div><div class='ctx'> 	ops.len = len;</div><div class='ctx'> </div><div class='del'>-	res = mtd-&gt;write_oob(mtd, offs &amp; ~(mtd-&gt;writesize - 1), &amp;ops);</div><div class='add'>+	res = mtd_write_oob(mtd, offs &amp; ~(mtd-&gt;writesize - 1), &amp;ops);</div><div class='ctx'> 	*retlen = ops.retlen;</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -343,14 +343,17 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned</div><div class='ctx'> 		if (BlockMap[block] == BLOCK_NIL)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		ret = mtd-&gt;read(mtd, (inftl-&gt;EraseSize * BlockMap[block]) +</div><div class='del'>-				(block * SECTORSIZE), SECTORSIZE, &amp;retlen,</div><div class='del'>-				movebuf);</div><div class='add'>+		ret = mtd_read(mtd,</div><div class='add'>+			       (inftl-&gt;EraseSize * BlockMap[block]) + (block * SECTORSIZE),</div><div class='add'>+			       SECTORSIZE,</div><div class='add'>+			       &amp;retlen,</div><div class='add'>+			       movebuf);</div><div class='ctx'> 		if (ret &lt; 0 &amp;&amp; !mtd_is_bitflip(ret)) {</div><div class='del'>-			ret = mtd-&gt;read(mtd,</div><div class='del'>-					(inftl-&gt;EraseSize * BlockMap[block]) +</div><div class='del'>-					(block * SECTORSIZE), SECTORSIZE,</div><div class='del'>-					&amp;retlen, movebuf);</div><div class='add'>+			ret = mtd_read(mtd,</div><div class='add'>+				       (inftl-&gt;EraseSize * BlockMap[block]) + (block * SECTORSIZE),</div><div class='add'>+				       SECTORSIZE,</div><div class='add'>+				       &amp;retlen,</div><div class='add'>+				       movebuf);</div><div class='ctx'> 			if (ret != -EIO)</div><div class='ctx'> 				pr_debug("INFTL: error went away on retry?\n");</div><div class='ctx'> 		}</div><div class='hunk'>@@ -914,7 +917,7 @@ foundit:</div><div class='ctx'> 	} else {</div><div class='ctx'> 		size_t retlen;</div><div class='ctx'> 		loff_t ptr = (thisEUN * inftl-&gt;EraseSize) + blockofs;</div><div class='del'>-		int ret = mtd-&gt;read(mtd, ptr, SECTORSIZE, &amp;retlen, buffer);</div><div class='add'>+		int ret = mtd_read(mtd, ptr, SECTORSIZE, &amp;retlen, buffer);</div><div class='ctx'> </div><div class='ctx'> 		/* Handle corrected bit flips gracefully */</div><div class='ctx'> 		if (ret &lt; 0 &amp;&amp; !mtd_is_bitflip(ret))</div><div class='head'>diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c<br/>index 2ff601f816ce..4adc0374fb6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/inftlmount.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/inftlmount.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/inftlmount.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/inftlmount.c</a></div><div class='hunk'>@@ -73,8 +73,8 @@ static int find_boot_record(struct INFTLrecord *inftl)</div><div class='ctx'> 		 * Check for BNAND header first. Then whinge if it's found</div><div class='ctx'> 		 * but later checks fail.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = mtd-&gt;read(mtd, block * inftl-&gt;EraseSize,</div><div class='del'>-				SECTORSIZE, &amp;retlen, buf);</div><div class='add'>+		ret = mtd_read(mtd, block * inftl-&gt;EraseSize, SECTORSIZE,</div><div class='add'>+			       &amp;retlen, buf);</div><div class='ctx'> 		/* We ignore ret in case the ECC of the MediaHeader is invalid</div><div class='ctx'> 		   (which is apparently acceptable) */</div><div class='ctx'> 		if (retlen != SECTORSIZE) {</div><div class='hunk'>@@ -118,8 +118,8 @@ static int find_boot_record(struct INFTLrecord *inftl)</div><div class='ctx'> 		memcpy(mh, buf, sizeof(struct INFTLMediaHeader));</div><div class='ctx'> </div><div class='ctx'> 		/* Read the spare media header at offset 4096 */</div><div class='del'>-		mtd-&gt;read(mtd, block * inftl-&gt;EraseSize + 4096,</div><div class='del'>-			  SECTORSIZE, &amp;retlen, buf);</div><div class='add'>+		mtd_read(mtd, block * inftl-&gt;EraseSize + 4096, SECTORSIZE,</div><div class='add'>+			 &amp;retlen, buf);</div><div class='ctx'> 		if (retlen != SECTORSIZE) {</div><div class='ctx'> 			printk(KERN_WARNING "INFTL: Unable to read spare "</div><div class='ctx'> 			       "Media Header\n");</div><div class='hunk'>@@ -220,7 +220,7 @@ static int find_boot_record(struct INFTLrecord *inftl)</div><div class='ctx'> 				 */</div><div class='ctx'> 				instr-&gt;addr = ip-&gt;Reserved0 * inftl-&gt;EraseSize;</div><div class='ctx'> 				instr-&gt;len = inftl-&gt;EraseSize;</div><div class='del'>-				mtd-&gt;erase(mtd, instr);</div><div class='add'>+				mtd_erase(mtd, instr);</div><div class='ctx'> 			}</div><div class='ctx'> 			if ((ip-&gt;lastUnit - ip-&gt;firstUnit + 1) &lt; ip-&gt;virtualUnits) {</div><div class='ctx'> 				printk(KERN_WARNING "INFTL: Media Header "</div><div class='hunk'>@@ -306,7 +306,8 @@ static int find_boot_record(struct INFTLrecord *inftl)</div><div class='ctx'> 			/* If any of the physical eraseblocks are bad, don't</div><div class='ctx'> 			   use the unit. */</div><div class='ctx'> 			for (physblock = 0; physblock &lt; inftl-&gt;EraseSize; physblock += inftl-&gt;mbd.mtd-&gt;erasesize) {</div><div class='del'>-				if (inftl-&gt;mbd.mtd-&gt;block_isbad(inftl-&gt;mbd.mtd, i * inftl-&gt;EraseSize + physblock))</div><div class='add'>+				if (mtd_block_isbad(inftl-&gt;mbd.mtd,</div><div class='add'>+						    i * inftl-&gt;EraseSize + physblock))</div><div class='ctx'> 					inftl-&gt;PUtable[i] = BLOCK_RESERVED;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -342,7 +343,7 @@ static int check_free_sectors(struct INFTLrecord *inftl, unsigned int address,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; len; i += SECTORSIZE) {</div><div class='del'>-		if (mtd-&gt;read(mtd, address, SECTORSIZE, &amp;retlen, buf))</div><div class='add'>+		if (mtd_read(mtd, address, SECTORSIZE, &amp;retlen, buf))</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		if (memcmpb(buf, 0xff, SECTORSIZE) != 0)</div><div class='ctx'> 			return -1;</div><div class='hunk'>@@ -393,7 +394,7 @@ int INFTL_formatblock(struct INFTLrecord *inftl, int block)</div><div class='ctx'> 	   mark only the failed block in the bbt. */</div><div class='ctx'> 	for (physblock = 0; physblock &lt; inftl-&gt;EraseSize;</div><div class='ctx'> 	     physblock += instr-&gt;len, instr-&gt;addr += instr-&gt;len) {</div><div class='del'>-		mtd-&gt;erase(inftl-&gt;mbd.mtd, instr);</div><div class='add'>+		mtd_erase(inftl-&gt;mbd.mtd, instr);</div><div class='ctx'> </div><div class='ctx'> 		if (instr-&gt;state == MTD_ERASE_FAILED) {</div><div class='ctx'> 			printk(KERN_WARNING "INFTL: error while formatting block %d\n",</div><div class='hunk'>@@ -423,7 +424,7 @@ int INFTL_formatblock(struct INFTLrecord *inftl, int block)</div><div class='ctx'> fail:</div><div class='ctx'> 	/* could not format, update the bad block table (caller is responsible</div><div class='ctx'> 	   for setting the PUtable to BLOCK_RESERVED on failure) */</div><div class='del'>-	inftl-&gt;mbd.mtd-&gt;block_markbad(inftl-&gt;mbd.mtd, instr-&gt;addr);</div><div class='add'>+	mtd_block_markbad(inftl-&gt;mbd.mtd, instr-&gt;addr);</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/lpddr/lpddr_cmds.c b/drivers/mtd/lpddr/lpddr_cmds.c<br/>index 1dca31d9a8b3..536bbceaeaad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/lpddr/lpddr_cmds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/lpddr/lpddr_cmds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/lpddr/lpddr_cmds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/lpddr/lpddr_cmds.c</a></div><div class='hunk'>@@ -70,19 +70,12 @@ struct mtd_info *lpddr_cmdset(struct map_info *map)</div><div class='ctx'> 	mtd-&gt;erase = lpddr_erase;</div><div class='ctx'> 	mtd-&gt;write = lpddr_write_buffers;</div><div class='ctx'> 	mtd-&gt;writev = lpddr_writev;</div><div class='del'>-	mtd-&gt;read_oob = NULL;</div><div class='del'>-	mtd-&gt;write_oob = NULL;</div><div class='del'>-	mtd-&gt;sync = NULL;</div><div class='ctx'> 	mtd-&gt;lock = lpddr_lock;</div><div class='ctx'> 	mtd-&gt;unlock = lpddr_unlock;</div><div class='del'>-	mtd-&gt;suspend = NULL;</div><div class='del'>-	mtd-&gt;resume = NULL;</div><div class='ctx'> 	if (map_is_linear(map)) {</div><div class='ctx'> 		mtd-&gt;point = lpddr_point;</div><div class='ctx'> 		mtd-&gt;unpoint = lpddr_unpoint;</div><div class='ctx'> 	}</div><div class='del'>-	mtd-&gt;block_isbad = NULL;</div><div class='del'>-	mtd-&gt;block_markbad = NULL;</div><div class='ctx'> 	mtd-&gt;size = 1 &lt;&lt; lpddr-&gt;qinfo-&gt;DevSizeShift;</div><div class='ctx'> 	mtd-&gt;erasesize = 1 &lt;&lt; lpddr-&gt;qinfo-&gt;UniformBlockSizeShift;</div><div class='ctx'> 	mtd-&gt;writesize = 1 &lt;&lt; lpddr-&gt;qinfo-&gt;BufSizeShift;</div><div class='head'>diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig<br/>index 8e0c4bf9f7fb..6c5c431c64af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/maps/Kconfig</a></div><div class='hunk'>@@ -242,15 +242,6 @@ config MTD_NETtel</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for flash chips on NETtel/SecureEdge/SnapGear boards.</div><div class='ctx'> </div><div class='del'>-config MTD_BCM963XX</div><div class='del'>-        tristate "Map driver for Broadcom BCM963xx boards"</div><div class='del'>-        depends on BCM63XX</div><div class='del'>-	select MTD_MAP_BANK_WIDTH_2</div><div class='del'>-	select MTD_CFI_I1</div><div class='del'>-        help</div><div class='del'>-	  Support for parsing CFE image tag and creating MTD partitions on</div><div class='del'>-	  Broadcom BCM63xx boards.</div><div class='del'>-</div><div class='ctx'> config MTD_LANTIQ</div><div class='ctx'> 	tristate "Lantiq SoC NOR support"</div><div class='ctx'> 	depends on LANTIQ</div><div class='head'>diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile<br/>index 45dcb8b14f22..68a9a91d344f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/maps/Makefile</a></div><div class='hunk'>@@ -55,6 +55,5 @@ obj-$(CONFIG_MTD_BFIN_ASYNC)	+= bfin-async-flash.o</div><div class='ctx'> obj-$(CONFIG_MTD_RBTX4939)	+= rbtx4939-flash.o</div><div class='ctx'> obj-$(CONFIG_MTD_VMU)		+= vmu-flash.o</div><div class='ctx'> obj-$(CONFIG_MTD_GPIO_ADDR)	+= gpio-addr-flash.o</div><div class='del'>-obj-$(CONFIG_MTD_BCM963XX)	+= bcm963xx-flash.o</div><div class='ctx'> obj-$(CONFIG_MTD_LATCH_ADDR)	+= latch-addr-flash.o</div><div class='ctx'> obj-$(CONFIG_MTD_LANTIQ)	+= lantiq-flash.o</div><div class='head'>diff --git a/drivers/mtd/maps/bcm963xx-flash.c b/drivers/mtd/maps/bcm963xx-flash.c<br/>deleted file mode 100644<br/>index 736ca10ca9f1..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/bcm963xx-flash.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/bcm963xx-flash.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,277 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright © 2006-2008  Florian Fainelli &lt;florian@openwrt.org&gt;</div><div class='del'>- *			  Mike Albon &lt;malbon@openwrt.org&gt;</div><div class='del'>- * Copyright © 2009-2010  Daniel Dickinson &lt;openwrt@cshore.neomailbox.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'>- * 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='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/mtd/map.h&gt;</div><div class='del'>-#include &lt;linux/mtd/mtd.h&gt;</div><div class='del'>-#include &lt;linux/mtd/partitions.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-bcm63xx/bcm963xx_tag.h&gt;</div><div class='del'>-</div><div class='del'>-#define BCM63XX_BUSWIDTH	2		/* Buswidth */</div><div class='del'>-#define BCM63XX_EXTENDED_SIZE	0xBFC00000	/* Extended flash address */</div><div class='del'>-</div><div class='del'>-#define PFX KBUILD_MODNAME ": "</div><div class='del'>-</div><div class='del'>-static struct mtd_partition *parsed_parts;</div><div class='del'>-</div><div class='del'>-static struct mtd_info *bcm963xx_mtd_info;</div><div class='del'>-</div><div class='del'>-static struct map_info bcm963xx_map = {</div><div class='del'>-	.name		= "bcm963xx",</div><div class='del'>-	.bankwidth	= BCM63XX_BUSWIDTH,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int parse_cfe_partitions(struct mtd_info *master,</div><div class='del'>-						struct mtd_partition **pparts)</div><div class='del'>-{</div><div class='del'>-	/* CFE, NVRAM and global Linux are always present */</div><div class='del'>-	int nrparts = 3, curpart = 0;</div><div class='del'>-	struct bcm_tag *buf;</div><div class='del'>-	struct mtd_partition *parts;</div><div class='del'>-	int ret;</div><div class='del'>-	size_t retlen;</div><div class='del'>-	unsigned int rootfsaddr, kerneladdr, spareaddr;</div><div class='del'>-	unsigned int rootfslen, kernellen, sparelen, totallen;</div><div class='del'>-	int namelen = 0;</div><div class='del'>-	int i;</div><div class='del'>-	char *boardid;</div><div class='del'>-	char *tagversion;</div><div class='del'>-</div><div class='del'>-	/* Allocate memory for buffer */</div><div class='del'>-	buf = vmalloc(sizeof(struct bcm_tag));</div><div class='del'>-	if (!buf)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* Get the tag */</div><div class='del'>-	ret = master-&gt;read(master, master-&gt;erasesize, sizeof(struct bcm_tag),</div><div class='del'>-							&amp;retlen, (void *)buf);</div><div class='del'>-	if (retlen != sizeof(struct bcm_tag)) {</div><div class='del'>-		vfree(buf);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sscanf(buf-&gt;kernel_address, "%u", &amp;kerneladdr);</div><div class='del'>-	sscanf(buf-&gt;kernel_length, "%u", &amp;kernellen);</div><div class='del'>-	sscanf(buf-&gt;total_length, "%u", &amp;totallen);</div><div class='del'>-	tagversion = &amp;(buf-&gt;tag_version[0]);</div><div class='del'>-	boardid = &amp;(buf-&gt;board_id[0]);</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO PFX "CFE boot tag found with version %s "</div><div class='del'>-				"and board type %s\n", tagversion, boardid);</div><div class='del'>-</div><div class='del'>-	kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE;</div><div class='del'>-	rootfsaddr = kerneladdr + kernellen;</div><div class='del'>-	spareaddr = roundup(totallen, master-&gt;erasesize) + master-&gt;erasesize;</div><div class='del'>-	sparelen = master-&gt;size - spareaddr - master-&gt;erasesize;</div><div class='del'>-	rootfslen = spareaddr - rootfsaddr;</div><div class='del'>-</div><div class='del'>-	/* Determine number of partitions */</div><div class='del'>-	namelen = 8;</div><div class='del'>-	if (rootfslen &gt; 0) {</div><div class='del'>-		nrparts++;</div><div class='del'>-		namelen += 6;</div><div class='del'>-	};</div><div class='del'>-	if (kernellen &gt; 0) {</div><div class='del'>-		nrparts++;</div><div class='del'>-		namelen += 6;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* Ask kernel for more memory */</div><div class='del'>-	parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL);</div><div class='del'>-	if (!parts) {</div><div class='del'>-		vfree(buf);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* Start building partition list */</div><div class='del'>-	parts[curpart].name = "CFE";</div><div class='del'>-	parts[curpart].offset = 0;</div><div class='del'>-	parts[curpart].size = master-&gt;erasesize;</div><div class='del'>-	curpart++;</div><div class='del'>-</div><div class='del'>-	if (kernellen &gt; 0) {</div><div class='del'>-		parts[curpart].name = "kernel";</div><div class='del'>-		parts[curpart].offset = kerneladdr;</div><div class='del'>-		parts[curpart].size = kernellen;</div><div class='del'>-		curpart++;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (rootfslen &gt; 0) {</div><div class='del'>-		parts[curpart].name = "rootfs";</div><div class='del'>-		parts[curpart].offset = rootfsaddr;</div><div class='del'>-		parts[curpart].size = rootfslen;</div><div class='del'>-		if (sparelen &gt; 0)</div><div class='del'>-			parts[curpart].size += sparelen;</div><div class='del'>-		curpart++;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	parts[curpart].name = "nvram";</div><div class='del'>-	parts[curpart].offset = master-&gt;size - master-&gt;erasesize;</div><div class='del'>-	parts[curpart].size = master-&gt;erasesize;</div><div class='del'>-</div><div class='del'>-	/* Global partition "linux" to make easy firmware upgrade */</div><div class='del'>-	curpart++;</div><div class='del'>-	parts[curpart].name = "linux";</div><div class='del'>-	parts[curpart].offset = parts[0].size;</div><div class='del'>-	parts[curpart].size = master-&gt;size - parts[0].size - parts[3].size;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nrparts; i++)</div><div class='del'>-		printk(KERN_INFO PFX "Partition %d is %s offset %lx and "</div><div class='del'>-					"length %lx\n", i, parts[i].name,</div><div class='del'>-					(long unsigned int)(parts[i].offset),</div><div class='del'>-					(long unsigned int)(parts[i].size));</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO PFX "Spare partition is %x offset and length %x\n",</div><div class='del'>-							spareaddr, sparelen);</div><div class='del'>-	*pparts = parts;</div><div class='del'>-	vfree(buf);</div><div class='del'>-</div><div class='del'>-	return nrparts;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int bcm963xx_detect_cfe(struct mtd_info *master)</div><div class='del'>-{</div><div class='del'>-	int idoffset = 0x4e0;</div><div class='del'>-	static char idstring[8] = "CFE1CFE1";</div><div class='del'>-	char buf[9];</div><div class='del'>-	int ret;</div><div class='del'>-	size_t retlen;</div><div class='del'>-</div><div class='del'>-	ret = master-&gt;read(master, idoffset, 8, &amp;retlen, (void *)buf);</div><div class='del'>-	buf[retlen] = 0;</div><div class='del'>-	printk(KERN_INFO PFX "Read Signature value of %s\n", buf);</div><div class='del'>-</div><div class='del'>-	return strncmp(idstring, buf, 8);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bcm963xx_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-	int parsed_nr_parts = 0;</div><div class='del'>-	char *part_type;</div><div class='del'>-	struct resource *r;</div><div class='del'>-</div><div class='del'>-	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	if (!r) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "no resource supplied\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bcm963xx_map.phys = r-&gt;start;</div><div class='del'>-	bcm963xx_map.size = resource_size(r);</div><div class='del'>-	bcm963xx_map.virt = ioremap(r-&gt;start, resource_size(r));</div><div class='del'>-	if (!bcm963xx_map.virt) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to ioremap\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "0x%08lx at 0x%08x\n",</div><div class='del'>-					bcm963xx_map.size, bcm963xx_map.phys);</div><div class='del'>-</div><div class='del'>-	simple_map_init(&amp;bcm963xx_map);</div><div class='del'>-</div><div class='del'>-	bcm963xx_mtd_info = do_map_probe("cfi_probe", &amp;bcm963xx_map);</div><div class='del'>-	if (!bcm963xx_mtd_info) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to probe using CFI\n");</div><div class='del'>-		bcm963xx_mtd_info = do_map_probe("jedec_probe", &amp;bcm963xx_map);</div><div class='del'>-		if (bcm963xx_mtd_info)</div><div class='del'>-			goto probe_ok;</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to probe using JEDEC\n");</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto err_probe;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-probe_ok:</div><div class='del'>-	bcm963xx_mtd_info-&gt;owner = THIS_MODULE;</div><div class='del'>-</div><div class='del'>-	/* This is mutually exclusive */</div><div class='del'>-	if (bcm963xx_detect_cfe(bcm963xx_mtd_info) == 0) {</div><div class='del'>-		dev_info(&amp;pdev-&gt;dev, "CFE bootloader detected\n");</div><div class='del'>-		if (parsed_nr_parts == 0) {</div><div class='del'>-			int ret = parse_cfe_partitions(bcm963xx_mtd_info,</div><div class='del'>-							&amp;parsed_parts);</div><div class='del'>-			if (ret &gt; 0) {</div><div class='del'>-				part_type = "CFE";</div><div class='del'>-				parsed_nr_parts = ret;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		dev_info(&amp;pdev-&gt;dev, "unsupported bootloader\n");</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto err_probe;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mtd_device_register(bcm963xx_mtd_info, parsed_parts,</div><div class='del'>-				   parsed_nr_parts);</div><div class='del'>-</div><div class='del'>-err_probe:</div><div class='del'>-	iounmap(bcm963xx_map.virt);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bcm963xx_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	if (bcm963xx_mtd_info) {</div><div class='del'>-		mtd_device_unregister(bcm963xx_mtd_info);</div><div class='del'>-		map_destroy(bcm963xx_mtd_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bcm963xx_map.virt) {</div><div class='del'>-		iounmap(bcm963xx_map.virt);</div><div class='del'>-		bcm963xx_map.virt = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct platform_driver bcm63xx_mtd_dev = {</div><div class='del'>-	.probe	= bcm963xx_probe,</div><div class='del'>-	.remove = bcm963xx_remove,</div><div class='del'>-	.driver = {</div><div class='del'>-		.name	= "bcm963xx-flash",</div><div class='del'>-		.owner	= THIS_MODULE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init bcm963xx_mtd_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;bcm63xx_mtd_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit bcm963xx_mtd_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;bcm63xx_mtd_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(bcm963xx_mtd_init);</div><div class='del'>-module_exit(bcm963xx_mtd_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("Broadcom BCM63xx MTD driver for CFE and RedBoot");</div><div class='del'>-MODULE_AUTHOR("Daniel Dickinson &lt;openwrt@cshore.neomailbox.net&gt;");</div><div class='del'>-MODULE_AUTHOR("Florian Fainelli &lt;florian@openwrt.org&gt;");</div><div class='del'>-MODULE_AUTHOR("Mike Albon &lt;malbon@openwrt.org&gt;");</div><div class='head'>diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c<br/>index 6d6b2b5674ee..650126c361f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/bfin-async-flash.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/bfin-async-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/bfin-async-flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/maps/bfin-async-flash.c</a></div><div class='hunk'>@@ -190,17 +190,7 @@ static struct platform_driver bfin_flash_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init bfin_flash_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;bfin_flash_driver);</div><div class='del'>-}</div><div class='del'>-module_init(bfin_flash_init);</div><div class='del'>-</div><div class='del'>-static void __exit bfin_flash_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;bfin_flash_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(bfin_flash_exit);</div><div class='add'>+module_platform_driver(bfin_flash_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("MTD map driver for Blackfins with flash/ethernet on same async bank");</div><div class='head'>diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c<br/>index 1ec66f031c51..33cce895859f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/gpio-addr-flash.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/gpio-addr-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/gpio-addr-flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/maps/gpio-addr-flash.c</a></div><div class='hunk'>@@ -279,17 +279,7 @@ static struct platform_driver gpio_flash_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init gpio_flash_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;gpio_flash_driver);</div><div class='del'>-}</div><div class='del'>-module_init(gpio_flash_init);</div><div class='del'>-</div><div class='del'>-static void __exit gpio_flash_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;gpio_flash_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(gpio_flash_exit);</div><div class='add'>+module_platform_driver(gpio_flash_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Mike Frysinger &lt;vapier@gentoo.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("MTD map driver for flashes addressed physically and with gpios");</div><div class='head'>diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c<br/>index 437fcd2f352f..fc7d4d0d9a4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ixp2000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/ixp2000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ixp2000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/maps/ixp2000.c</a></div><div class='hunk'>@@ -246,18 +246,8 @@ static struct platform_driver ixp2000_flash_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ixp2000_flash_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ixp2000_flash_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ixp2000_flash_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ixp2000_flash_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(ixp2000_flash_driver);</div><div class='ctx'> </div><div class='del'>-module_init(ixp2000_flash_init);</div><div class='del'>-module_exit(ixp2000_flash_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Deepak Saxena &lt;dsaxena@plexity.net&gt;");</div><div class='ctx'> MODULE_ALIAS("platform:IXP2000-Flash");</div><div class='head'>diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c<br/>index 30409015a3de..8b5410162d70 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ixp4xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/ixp4xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ixp4xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/maps/ixp4xx.c</a></div><div class='hunk'>@@ -270,19 +270,7 @@ static struct platform_driver ixp4xx_flash_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ixp4xx_flash_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ixp4xx_flash_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ixp4xx_flash_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ixp4xx_flash_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-module_init(ixp4xx_flash_init);</div><div class='del'>-module_exit(ixp4xx_flash_exit);</div><div class='add'>+module_platform_driver(ixp4xx_flash_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("MTD map driver for Intel IXP4xx systems");</div><div class='head'>diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c<br/>index 4f10e27ada55..7b889de9477b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/lantiq-flash.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/lantiq-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/lantiq-flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/maps/lantiq-flash.c</a></div><div class='hunk'>@@ -159,7 +159,7 @@ ltq_mtd_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (!ltq_mtd-&gt;mtd) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "probing failed\n");</div><div class='ctx'> 		err = -ENXIO;</div><div class='del'>-		goto err_unmap;</div><div class='add'>+		goto err_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ltq_mtd-&gt;mtd-&gt;owner = THIS_MODULE;</div><div class='hunk'>@@ -179,8 +179,6 @@ ltq_mtd_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> err_destroy:</div><div class='ctx'> 	map_destroy(ltq_mtd-&gt;mtd);</div><div class='del'>-err_unmap:</div><div class='del'>-	iounmap(ltq_mtd-&gt;map-&gt;virt);</div><div class='ctx'> err_free:</div><div class='ctx'> 	kfree(ltq_mtd-&gt;map);</div><div class='ctx'> err_out:</div><div class='hunk'>@@ -198,8 +196,6 @@ ltq_mtd_remove(struct platform_device *pdev)</div><div class='ctx'> 			mtd_device_unregister(ltq_mtd-&gt;mtd);</div><div class='ctx'> 			map_destroy(ltq_mtd-&gt;mtd);</div><div class='ctx'> 		}</div><div class='del'>-		if (ltq_mtd-&gt;map-&gt;virt)</div><div class='del'>-			iounmap(ltq_mtd-&gt;map-&gt;virt);</div><div class='ctx'> 		kfree(ltq_mtd-&gt;map);</div><div class='ctx'> 		kfree(ltq_mtd);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/mtd/maps/latch-addr-flash.c b/drivers/mtd/maps/latch-addr-flash.c<br/>index 119baa7d7477..8fed58e3a4a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/latch-addr-flash.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/latch-addr-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/latch-addr-flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/maps/latch-addr-flash.c</a></div><div class='hunk'>@@ -223,17 +223,7 @@ static struct platform_driver latch_addr_flash_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init latch_addr_flash_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;latch_addr_flash_driver);</div><div class='del'>-}</div><div class='del'>-module_init(latch_addr_flash_init);</div><div class='del'>-</div><div class='del'>-static void __exit latch_addr_flash_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;latch_addr_flash_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(latch_addr_flash_exit);</div><div class='add'>+module_platform_driver(latch_addr_flash_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("David Griego &lt;dgriego@mvista.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("MTD map driver for flashes addressed physically with upper "</div><div class='head'>diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c<br/>index 66e8200079c2..abc562653b31 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/physmap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/physmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/physmap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/maps/physmap.c</a></div><div class='hunk'>@@ -85,6 +85,7 @@ static int physmap_flash_probe(struct platform_device *dev)</div><div class='ctx'> 	struct physmap_flash_data *physmap_data;</div><div class='ctx'> 	struct physmap_flash_info *info;</div><div class='ctx'> 	const char **probe_type;</div><div class='add'>+	const char **part_types;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int devices_found = 0;</div><div class='hunk'>@@ -171,7 +172,9 @@ static int physmap_flash_probe(struct platform_device *dev)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='del'>-	mtd_device_parse_register(info-&gt;cmtd, part_probe_types, 0,</div><div class='add'>+	part_types = physmap_data-&gt;part_probe_types ? : part_probe_types;</div><div class='add'>+</div><div class='add'>+	mtd_device_parse_register(info-&gt;cmtd, part_types, 0,</div><div class='ctx'> 				  physmap_data-&gt;parts, physmap_data-&gt;nr_parts);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -187,9 +190,8 @@ static void physmap_flash_shutdown(struct platform_device *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MAX_RESOURCES &amp;&amp; info-&gt;mtd[i]; i++)</div><div class='del'>-		if (info-&gt;mtd[i]-&gt;suspend &amp;&amp; info-&gt;mtd[i]-&gt;resume)</div><div class='del'>-			if (info-&gt;mtd[i]-&gt;suspend(info-&gt;mtd[i]) == 0)</div><div class='del'>-				info-&gt;mtd[i]-&gt;resume(info-&gt;mtd[i]);</div><div class='add'>+		if (mtd_suspend(info-&gt;mtd[i]) == 0)</div><div class='add'>+			mtd_resume(info-&gt;mtd[i]);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> #define physmap_flash_shutdown NULL</div><div class='head'>diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c<br/>index 7d65f9d3e690..2e6fb6831d55 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/physmap_of.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/physmap_of.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/physmap_of.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/maps/physmap_of.c</a></div><div class='hunk'>@@ -338,18 +338,7 @@ static struct platform_driver of_flash_driver = {</div><div class='ctx'> 	.remove		= of_flash_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init of_flash_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;of_flash_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit of_flash_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;of_flash_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(of_flash_init);</div><div class='del'>-module_exit(of_flash_exit);</div><div class='add'>+module_platform_driver(of_flash_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Vitaly Wool &lt;vwool@ru.mvista.com&gt;");</div><div class='head'>diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c<br/>index 2a25b6789af4..436d121185b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/pxa2xx-flash.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/pxa2xx-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/pxa2xx-flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/maps/pxa2xx-flash.c</a></div><div class='hunk'>@@ -125,8 +125,8 @@ static void pxa2xx_flash_shutdown(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pxa2xx_flash_info *info = platform_get_drvdata(dev);</div><div class='ctx'> </div><div class='del'>-	if (info &amp;&amp; info-&gt;mtd-&gt;suspend(info-&gt;mtd) == 0)</div><div class='del'>-		info-&gt;mtd-&gt;resume(info-&gt;mtd);</div><div class='add'>+	if (info &amp;&amp; mtd_suspend(info-&gt;mtd) == 0)</div><div class='add'>+		mtd_resume(info-&gt;mtd);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> #define pxa2xx_flash_shutdown NULL</div><div class='hunk'>@@ -142,18 +142,7 @@ static struct platform_driver pxa2xx_flash_driver = {</div><div class='ctx'> 	.shutdown	= pxa2xx_flash_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init init_pxa2xx_flash(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pxa2xx_flash_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cleanup_pxa2xx_flash(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pxa2xx_flash_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init_pxa2xx_flash);</div><div class='del'>-module_exit(cleanup_pxa2xx_flash);</div><div class='add'>+module_platform_driver(pxa2xx_flash_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Nicolas Pitre &lt;nico@fluxnic.net&gt;");</div><div class='head'>diff --git a/drivers/mtd/maps/rbtx4939-flash.c b/drivers/mtd/maps/rbtx4939-flash.c<br/>index 0237f197fd12..3da63fc6f16e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/rbtx4939-flash.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/rbtx4939-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/rbtx4939-flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/maps/rbtx4939-flash.c</a></div><div class='hunk'>@@ -119,9 +119,8 @@ static void rbtx4939_flash_shutdown(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct rbtx4939_flash_info *info = platform_get_drvdata(dev);</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;mtd-&gt;suspend &amp;&amp; info-&gt;mtd-&gt;resume)</div><div class='del'>-		if (info-&gt;mtd-&gt;suspend(info-&gt;mtd) == 0)</div><div class='del'>-			info-&gt;mtd-&gt;resume(info-&gt;mtd);</div><div class='add'>+	if (mtd_suspend(info-&gt;mtd) == 0)</div><div class='add'>+		mtd_resume(info-&gt;mtd);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> #define rbtx4939_flash_shutdown NULL</div><div class='hunk'>@@ -137,18 +136,7 @@ static struct platform_driver rbtx4939_flash_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init rbtx4939_flash_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;rbtx4939_flash_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit rbtx4939_flash_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;rbtx4939_flash_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(rbtx4939_flash_init);</div><div class='del'>-module_exit(rbtx4939_flash_exit);</div><div class='add'>+module_platform_driver(rbtx4939_flash_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("RBTX4939 MTD map driver");</div><div class='head'>diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c<br/>index fa9c0a9670cd..502821997707 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/sa1100-flash.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/sa1100-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/sa1100-flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/maps/sa1100-flash.c</a></div><div class='hunk'>@@ -377,8 +377,8 @@ static int __exit sa1100_mtd_remove(struct platform_device *pdev)</div><div class='ctx'> static void sa1100_mtd_shutdown(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sa_info *info = platform_get_drvdata(dev);</div><div class='del'>-	if (info &amp;&amp; info-&gt;mtd-&gt;suspend(info-&gt;mtd) == 0)</div><div class='del'>-		info-&gt;mtd-&gt;resume(info-&gt;mtd);</div><div class='add'>+	if (info &amp;&amp; mtd_suspend(info-&gt;mtd) == 0)</div><div class='add'>+		mtd_resume(info-&gt;mtd);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> #define sa1100_mtd_shutdown NULL</div><div class='hunk'>@@ -394,18 +394,7 @@ static struct platform_driver sa1100_mtd_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sa1100_mtd_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sa1100_mtd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sa1100_mtd_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sa1100_mtd_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sa1100_mtd_init);</div><div class='del'>-module_exit(sa1100_mtd_exit);</div><div class='add'>+module_platform_driver(sa1100_mtd_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Nicolas Pitre");</div><div class='ctx'> MODULE_DESCRIPTION("SA1100 CFI map driver");</div><div class='head'>diff --git a/drivers/mtd/maps/scb2_flash.c b/drivers/mtd/maps/scb2_flash.c<br/>index d88c8426bb0f..934a72c80078 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/scb2_flash.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/scb2_flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/scb2_flash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/maps/scb2_flash.c</a></div><div class='hunk'>@@ -204,8 +204,7 @@ scb2_flash_remove(struct pci_dev *dev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* disable flash writes */</div><div class='del'>-	if (scb2_mtd-&gt;lock)</div><div class='del'>-		scb2_mtd-&gt;lock(scb2_mtd, 0, scb2_mtd-&gt;size);</div><div class='add'>+	mtd_lock(scb2_mtd, 0, scb2_mtd-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 	mtd_device_unregister(scb2_mtd);</div><div class='ctx'> 	map_destroy(scb2_mtd);</div><div class='head'>diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c<br/>index 2d66234f57cb..175e537b444f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/sun_uflash.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/maps/sun_uflash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/sun_uflash.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/maps/sun_uflash.c</a></div><div class='hunk'>@@ -158,15 +158,4 @@ static struct platform_driver uflash_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(uflash_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init uflash_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;uflash_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit uflash_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;uflash_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(uflash_init);</div><div class='del'>-module_exit(uflash_exit);</div><div class='add'>+module_platform_driver(uflash_driver);</div><div class='head'>diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c<br/>index ed8b5e744b12..424ca5f93c6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/mtd_blkdevs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/mtd_blkdevs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/mtd_blkdevs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/mtd_blkdevs.c</a></div><div class='hunk'>@@ -215,7 +215,7 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;open++)</div><div class='add'>+	if (dev-&gt;open)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='ctx'> 	kref_get(&amp;dev-&gt;ref);</div><div class='hunk'>@@ -235,6 +235,7 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode)</div><div class='ctx'> 		goto error_release;</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='add'>+	dev-&gt;open++;</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;lock);</div><div class='ctx'> 	blktrans_dev_put(dev);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c<br/>index 7c1dc908a174..af6591237b9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/mtdblock.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/mtdblock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/mtdblock.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/mtdblock.c</a></div><div class='hunk'>@@ -85,7 +85,7 @@ static int erase_write (struct mtd_info *mtd, unsigned long pos,</div><div class='ctx'> 	set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> 	add_wait_queue(&amp;wait_q, &amp;wait);</div><div class='ctx'> </div><div class='del'>-	ret = mtd-&gt;erase(mtd, &amp;erase);</div><div class='add'>+	ret = mtd_erase(mtd, &amp;erase);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		set_current_state(TASK_RUNNING);</div><div class='ctx'> 		remove_wait_queue(&amp;wait_q, &amp;wait);</div><div class='hunk'>@@ -102,7 +102,7 @@ static int erase_write (struct mtd_info *mtd, unsigned long pos,</div><div class='ctx'> 	 * Next, write the data to flash.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	ret = mtd-&gt;write(mtd, pos, len, &amp;retlen, buf);</div><div class='add'>+	ret = mtd_write(mtd, pos, len, &amp;retlen, buf);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	if (retlen != len)</div><div class='hunk'>@@ -152,7 +152,7 @@ static int do_cached_write (struct mtdblk_dev *mtdblk, unsigned long pos,</div><div class='ctx'> 		mtd-&gt;name, pos, len);</div><div class='ctx'> </div><div class='ctx'> 	if (!sect_size)</div><div class='del'>-		return mtd-&gt;write(mtd, pos, len, &amp;retlen, buf);</div><div class='add'>+		return mtd_write(mtd, pos, len, &amp;retlen, buf);</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt; 0) {</div><div class='ctx'> 		unsigned long sect_start = (pos/sect_size)*sect_size;</div><div class='hunk'>@@ -184,8 +184,8 @@ static int do_cached_write (struct mtdblk_dev *mtdblk, unsigned long pos,</div><div class='ctx'> 			    mtdblk-&gt;cache_offset != sect_start) {</div><div class='ctx'> 				/* fill the cache with the current sector */</div><div class='ctx'> 				mtdblk-&gt;cache_state = STATE_EMPTY;</div><div class='del'>-				ret = mtd-&gt;read(mtd, sect_start, sect_size,</div><div class='del'>-						&amp;retlen, mtdblk-&gt;cache_data);</div><div class='add'>+				ret = mtd_read(mtd, sect_start, sect_size,</div><div class='add'>+					       &amp;retlen, mtdblk-&gt;cache_data);</div><div class='ctx'> 				if (ret)</div><div class='ctx'> 					return ret;</div><div class='ctx'> 				if (retlen != sect_size)</div><div class='hunk'>@@ -222,7 +222,7 @@ static int do_cached_read (struct mtdblk_dev *mtdblk, unsigned long pos,</div><div class='ctx'> 			mtd-&gt;name, pos, len);</div><div class='ctx'> </div><div class='ctx'> 	if (!sect_size)</div><div class='del'>-		return mtd-&gt;read(mtd, pos, len, &amp;retlen, buf);</div><div class='add'>+		return mtd_read(mtd, pos, len, &amp;retlen, buf);</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt; 0) {</div><div class='ctx'> 		unsigned long sect_start = (pos/sect_size)*sect_size;</div><div class='hunk'>@@ -241,7 +241,7 @@ static int do_cached_read (struct mtdblk_dev *mtdblk, unsigned long pos,</div><div class='ctx'> 		    mtdblk-&gt;cache_offset == sect_start) {</div><div class='ctx'> 			memcpy (buf, mtdblk-&gt;cache_data + offset, size);</div><div class='ctx'> 		} else {</div><div class='del'>-			ret = mtd-&gt;read(mtd, pos, size, &amp;retlen, buf);</div><div class='add'>+			ret = mtd_read(mtd, pos, size, &amp;retlen, buf);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				return ret;</div><div class='ctx'> 			if (retlen != size)</div><div class='hunk'>@@ -322,8 +322,7 @@ static int mtdblock_release(struct mtd_blktrans_dev *mbd)</div><div class='ctx'> </div><div class='ctx'> 	if (!--mtdblk-&gt;count) {</div><div class='ctx'> 		/* It was the last usage. Free the cache */</div><div class='del'>-		if (mbd-&gt;mtd-&gt;sync)</div><div class='del'>-			mbd-&gt;mtd-&gt;sync(mbd-&gt;mtd);</div><div class='add'>+		mtd_sync(mbd-&gt;mtd);</div><div class='ctx'> 		vfree(mtdblk-&gt;cache_data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -341,9 +340,7 @@ static int mtdblock_flush(struct mtd_blktrans_dev *dev)</div><div class='ctx'> 	mutex_lock(&amp;mtdblk-&gt;cache_mutex);</div><div class='ctx'> 	write_cached_data(mtdblk);</div><div class='ctx'> 	mutex_unlock(&amp;mtdblk-&gt;cache_mutex);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;mtd-&gt;sync)</div><div class='del'>-		dev-&gt;mtd-&gt;sync(dev-&gt;mtd);</div><div class='add'>+	mtd_sync(dev-&gt;mtd);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/mtdblock_ro.c b/drivers/mtd/mtdblock_ro.c<br/>index 0470a6e86309..92759a9d2985 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/mtdblock_ro.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/mtdblock_ro.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/mtdblock_ro.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/mtdblock_ro.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@ static int mtdblock_readsect(struct mtd_blktrans_dev *dev,</div><div class='ctx'> {</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;mtd-&gt;read(dev-&gt;mtd, (block * 512), 512, &amp;retlen, buf))</div><div class='add'>+	if (mtd_read(dev-&gt;mtd, (block * 512), 512, &amp;retlen, buf))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -40,7 +40,7 @@ static int mtdblock_writesect(struct mtd_blktrans_dev *dev,</div><div class='ctx'> {</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;mtd-&gt;write(dev-&gt;mtd, (block * 512), 512, &amp;retlen, buf))</div><div class='add'>+	if (mtd_write(dev-&gt;mtd, (block * 512), 512, &amp;retlen, buf))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c<br/>index e7dc732ddabc..50c6a1e7f675 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/mtdchar.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/mtdchar.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/mtdchar.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/mtdchar.c</a></div><div class='hunk'>@@ -51,7 +51,7 @@ struct mtd_file_info {</div><div class='ctx'> 	enum mtd_file_modes mode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static loff_t mtd_lseek (struct file *file, loff_t offset, int orig)</div><div class='add'>+static loff_t mtdchar_lseek(struct file *file, loff_t offset, int orig)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_file_info *mfi = file-&gt;private_data;</div><div class='ctx'> 	struct mtd_info *mtd = mfi-&gt;mtd;</div><div class='hunk'>@@ -77,7 +77,7 @@ static loff_t mtd_lseek (struct file *file, loff_t offset, int orig)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int mtd_open(struct inode *inode, struct file *file)</div><div class='add'>+static int mtdchar_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	int minor = iminor(inode);</div><div class='ctx'> 	int devnum = minor &gt;&gt; 1;</div><div class='hunk'>@@ -142,11 +142,11 @@ static int mtd_open(struct inode *inode, struct file *file)</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;mtd_mutex);</div><div class='ctx'> 	return ret;</div><div class='del'>-} /* mtd_open */</div><div class='add'>+} /* mtdchar_open */</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='ctx'> </div><div class='del'>-static int mtd_close(struct inode *inode, struct file *file)</div><div class='add'>+static int mtdchar_close(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_file_info *mfi = file-&gt;private_data;</div><div class='ctx'> 	struct mtd_info *mtd = mfi-&gt;mtd;</div><div class='hunk'>@@ -154,8 +154,8 @@ static int mtd_close(struct inode *inode, struct file *file)</div><div class='ctx'> 	pr_debug("MTD_close\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Only sync if opened RW */</div><div class='del'>-	if ((file-&gt;f_mode &amp; FMODE_WRITE) &amp;&amp; mtd-&gt;sync)</div><div class='del'>-		mtd-&gt;sync(mtd);</div><div class='add'>+	if ((file-&gt;f_mode &amp; FMODE_WRITE))</div><div class='add'>+		mtd_sync(mtd);</div><div class='ctx'> </div><div class='ctx'> 	iput(mfi-&gt;ino);</div><div class='ctx'> </div><div class='hunk'>@@ -164,7 +164,7 @@ static int mtd_close(struct inode *inode, struct file *file)</div><div class='ctx'> 	kfree(mfi);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-} /* mtd_close */</div><div class='add'>+} /* mtdchar_close */</div><div class='ctx'> </div><div class='ctx'> /* Back in June 2001, dwmw2 wrote:</div><div class='ctx'>  *</div><div class='hunk'>@@ -184,11 +184,12 @@ static int mtd_close(struct inode *inode, struct file *file)</div><div class='ctx'>  * alignment requirements are not met in the NAND subdriver.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t *ppos)</div><div class='add'>+static ssize_t mtdchar_read(struct file *file, char __user *buf, size_t count,</div><div class='add'>+			loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_file_info *mfi = file-&gt;private_data;</div><div class='ctx'> 	struct mtd_info *mtd = mfi-&gt;mtd;</div><div class='del'>-	size_t retlen=0;</div><div class='add'>+	size_t retlen;</div><div class='ctx'> 	size_t total_retlen=0;</div><div class='ctx'> 	int ret=0;</div><div class='ctx'> 	int len;</div><div class='hunk'>@@ -212,10 +213,12 @@ static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t</div><div class='ctx'> </div><div class='ctx'> 		switch (mfi-&gt;mode) {</div><div class='ctx'> 		case MTD_FILE_MODE_OTP_FACTORY:</div><div class='del'>-			ret = mtd-&gt;read_fact_prot_reg(mtd, *ppos, len, &amp;retlen, kbuf);</div><div class='add'>+			ret = mtd_read_fact_prot_reg(mtd, *ppos, len,</div><div class='add'>+						     &amp;retlen, kbuf);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case MTD_FILE_MODE_OTP_USER:</div><div class='del'>-			ret = mtd-&gt;read_user_prot_reg(mtd, *ppos, len, &amp;retlen, kbuf);</div><div class='add'>+			ret = mtd_read_user_prot_reg(mtd, *ppos, len,</div><div class='add'>+						     &amp;retlen, kbuf);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case MTD_FILE_MODE_RAW:</div><div class='ctx'> 		{</div><div class='hunk'>@@ -226,12 +229,12 @@ static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t</div><div class='ctx'> 			ops.oobbuf = NULL;</div><div class='ctx'> 			ops.len = len;</div><div class='ctx'> </div><div class='del'>-			ret = mtd-&gt;read_oob(mtd, *ppos, &amp;ops);</div><div class='add'>+			ret = mtd_read_oob(mtd, *ppos, &amp;ops);</div><div class='ctx'> 			retlen = ops.retlen;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		default:</div><div class='del'>-			ret = mtd-&gt;read(mtd, *ppos, len, &amp;retlen, kbuf);</div><div class='add'>+			ret = mtd_read(mtd, *ppos, len, &amp;retlen, kbuf);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Nand returns -EBADMSG on ECC errors, but it returns</div><div class='ctx'> 		 * the data. For our userspace tools it is important</div><div class='hunk'>@@ -265,9 +268,10 @@ static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t</div><div class='ctx'> </div><div class='ctx'> 	kfree(kbuf);</div><div class='ctx'> 	return total_retlen;</div><div class='del'>-} /* mtd_read */</div><div class='add'>+} /* mtdchar_read */</div><div class='ctx'> </div><div class='del'>-static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count,loff_t *ppos)</div><div class='add'>+static ssize_t mtdchar_write(struct file *file, const char __user *buf, size_t count,</div><div class='add'>+			loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_file_info *mfi = file-&gt;private_data;</div><div class='ctx'> 	struct mtd_info *mtd = mfi-&gt;mtd;</div><div class='hunk'>@@ -306,11 +310,8 @@ static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count</div><div class='ctx'> 			ret = -EROFS;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case MTD_FILE_MODE_OTP_USER:</div><div class='del'>-			if (!mtd-&gt;write_user_prot_reg) {</div><div class='del'>-				ret = -EOPNOTSUPP;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			ret = mtd-&gt;write_user_prot_reg(mtd, *ppos, len, &amp;retlen, kbuf);</div><div class='add'>+			ret = mtd_write_user_prot_reg(mtd, *ppos, len,</div><div class='add'>+						      &amp;retlen, kbuf);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case MTD_FILE_MODE_RAW:</div><div class='hunk'>@@ -323,13 +324,13 @@ static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count</div><div class='ctx'> 			ops.ooboffs = 0;</div><div class='ctx'> 			ops.len = len;</div><div class='ctx'> </div><div class='del'>-			ret = mtd-&gt;write_oob(mtd, *ppos, &amp;ops);</div><div class='add'>+			ret = mtd_write_oob(mtd, *ppos, &amp;ops);</div><div class='ctx'> 			retlen = ops.retlen;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			ret = (*(mtd-&gt;write))(mtd, *ppos, len, &amp;retlen, kbuf);</div><div class='add'>+			ret = mtd_write(mtd, *ppos, len, &amp;retlen, kbuf);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!ret) {</div><div class='ctx'> 			*ppos += retlen;</div><div class='hunk'>@@ -345,7 +346,7 @@ static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count</div><div class='ctx'> </div><div class='ctx'> 	kfree(kbuf);</div><div class='ctx'> 	return total_retlen;</div><div class='del'>-} /* mtd_write */</div><div class='add'>+} /* mtdchar_write */</div><div class='ctx'> </div><div class='ctx'> /*======================================================================</div><div class='ctx'> </div><div class='hunk'>@@ -361,20 +362,22 @@ static void mtdchar_erase_callback (struct erase_info *instr)</div><div class='ctx'> static int otp_select_filemode(struct mtd_file_info *mfi, int mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_info *mtd = mfi-&gt;mtd;</div><div class='add'>+	size_t retlen;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Make a fake call to mtd_read_fact_prot_reg() to check if OTP</div><div class='add'>+	 * operations are supported.</div><div class='add'>+	 */</div><div class='add'>+	if (mtd_read_fact_prot_reg(mtd, -1, -1, &amp;retlen, NULL) == -EOPNOTSUPP)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case MTD_OTP_FACTORY:</div><div class='del'>-		if (!mtd-&gt;read_fact_prot_reg)</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-		else</div><div class='del'>-			mfi-&gt;mode = MTD_FILE_MODE_OTP_FACTORY;</div><div class='add'>+		mfi-&gt;mode = MTD_FILE_MODE_OTP_FACTORY;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MTD_OTP_USER:</div><div class='del'>-		if (!mtd-&gt;read_fact_prot_reg)</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-		else</div><div class='del'>-			mfi-&gt;mode = MTD_FILE_MODE_OTP_USER;</div><div class='add'>+		mfi-&gt;mode = MTD_FILE_MODE_OTP_USER;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -EINVAL;</div><div class='hunk'>@@ -387,7 +390,7 @@ static int otp_select_filemode(struct mtd_file_info *mfi, int mode)</div><div class='ctx'> # define otp_select_filemode(f,m)	-EOPNOTSUPP</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int mtd_do_writeoob(struct file *file, struct mtd_info *mtd,</div><div class='add'>+static int mtdchar_writeoob(struct file *file, struct mtd_info *mtd,</div><div class='ctx'> 	uint64_t start, uint32_t length, void __user *ptr,</div><div class='ctx'> 	uint32_t __user *retp)</div><div class='ctx'> {</div><div class='hunk'>@@ -424,7 +427,7 @@ static int mtd_do_writeoob(struct file *file, struct mtd_info *mtd,</div><div class='ctx'> 		return PTR_ERR(ops.oobbuf);</div><div class='ctx'> </div><div class='ctx'> 	start &amp;= ~((uint64_t)mtd-&gt;writesize - 1);</div><div class='del'>-	ret = mtd-&gt;write_oob(mtd, start, &amp;ops);</div><div class='add'>+	ret = mtd_write_oob(mtd, start, &amp;ops);</div><div class='ctx'> </div><div class='ctx'> 	if (ops.oobretlen &gt; 0xFFFFFFFFU)</div><div class='ctx'> 		ret = -EOVERFLOW;</div><div class='hunk'>@@ -436,7 +439,7 @@ static int mtd_do_writeoob(struct file *file, struct mtd_info *mtd,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mtd_do_readoob(struct file *file, struct mtd_info *mtd,</div><div class='add'>+static int mtdchar_readoob(struct file *file, struct mtd_info *mtd,</div><div class='ctx'> 	uint64_t start, uint32_t length, void __user *ptr,</div><div class='ctx'> 	uint32_t __user *retp)</div><div class='ctx'> {</div><div class='hunk'>@@ -447,13 +450,8 @@ static int mtd_do_readoob(struct file *file, struct mtd_info *mtd,</div><div class='ctx'> 	if (length &gt; 4096)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!mtd-&gt;read_oob)</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-	else</div><div class='del'>-		ret = access_ok(VERIFY_WRITE, ptr,</div><div class='del'>-				length) ? 0 : -EFAULT;</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	if (!access_ok(VERIFY_WRITE, ptr, length))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	ops.ooblen = length;</div><div class='ctx'> 	ops.ooboffs = start &amp; (mtd-&gt;writesize - 1);</div><div class='hunk'>@@ -469,7 +467,7 @@ static int mtd_do_readoob(struct file *file, struct mtd_info *mtd,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	start &amp;= ~((uint64_t)mtd-&gt;writesize - 1);</div><div class='del'>-	ret = mtd-&gt;read_oob(mtd, start, &amp;ops);</div><div class='add'>+	ret = mtd_read_oob(mtd, start, &amp;ops);</div><div class='ctx'> </div><div class='ctx'> 	if (put_user(ops.oobretlen, retp))</div><div class='ctx'> 		ret = -EFAULT;</div><div class='hunk'>@@ -530,7 +528,7 @@ static int shrink_ecclayout(const struct nand_ecclayout *from,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mtd_blkpg_ioctl(struct mtd_info *mtd,</div><div class='add'>+static int mtdchar_blkpg_ioctl(struct mtd_info *mtd,</div><div class='ctx'> 			   struct blkpg_ioctl_arg __user *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct blkpg_ioctl_arg a;</div><div class='hunk'>@@ -566,7 +564,7 @@ static int mtd_blkpg_ioctl(struct mtd_info *mtd,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mtd_write_ioctl(struct mtd_info *mtd,</div><div class='add'>+static int mtdchar_write_ioctl(struct mtd_info *mtd,</div><div class='ctx'> 		struct mtd_write_req __user *argp)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_write_req req;</div><div class='hunk'>@@ -607,7 +605,7 @@ static int mtd_write_ioctl(struct mtd_info *mtd,</div><div class='ctx'> 		ops.oobbuf = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = mtd-&gt;write_oob(mtd, (loff_t)req.start, &amp;ops);</div><div class='add'>+	ret = mtd_write_oob(mtd, (loff_t)req.start, &amp;ops);</div><div class='ctx'> </div><div class='ctx'> 	kfree(ops.datbuf);</div><div class='ctx'> 	kfree(ops.oobbuf);</div><div class='hunk'>@@ -615,7 +613,7 @@ static int mtd_write_ioctl(struct mtd_info *mtd,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='add'>+static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_file_info *mfi = file-&gt;private_data;</div><div class='ctx'> 	struct mtd_info *mtd = mfi-&gt;mtd;</div><div class='hunk'>@@ -729,7 +727,7 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> 			  wq_head is no longer there when the</div><div class='ctx'> 			  callback routine tries to wake us up.</div><div class='ctx'> 			*/</div><div class='del'>-			ret = mtd-&gt;erase(mtd, erase);</div><div class='add'>+			ret = mtd_erase(mtd, erase);</div><div class='ctx'> 			if (!ret) {</div><div class='ctx'> 				set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='ctx'> 				add_wait_queue(&amp;waitq, &amp;wait);</div><div class='hunk'>@@ -755,7 +753,7 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> 		if (copy_from_user(&amp;buf, argp, sizeof(buf)))</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 		else</div><div class='del'>-			ret = mtd_do_writeoob(file, mtd, buf.start, buf.length,</div><div class='add'>+			ret = mtdchar_writeoob(file, mtd, buf.start, buf.length,</div><div class='ctx'> 				buf.ptr, &amp;buf_user-&gt;length);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -769,7 +767,7 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> 		if (copy_from_user(&amp;buf, argp, sizeof(buf)))</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 		else</div><div class='del'>-			ret = mtd_do_readoob(file, mtd, buf.start, buf.length,</div><div class='add'>+			ret = mtdchar_readoob(file, mtd, buf.start, buf.length,</div><div class='ctx'> 				buf.ptr, &amp;buf_user-&gt;start);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -782,7 +780,7 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> 		if (copy_from_user(&amp;buf, argp, sizeof(buf)))</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 		else</div><div class='del'>-			ret = mtd_do_writeoob(file, mtd, buf.start, buf.length,</div><div class='add'>+			ret = mtdchar_writeoob(file, mtd, buf.start, buf.length,</div><div class='ctx'> 				(void __user *)(uintptr_t)buf.usr_ptr,</div><div class='ctx'> 				&amp;buf_user-&gt;length);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -796,7 +794,7 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> 		if (copy_from_user(&amp;buf, argp, sizeof(buf)))</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 		else</div><div class='del'>-			ret = mtd_do_readoob(file, mtd, buf.start, buf.length,</div><div class='add'>+			ret = mtdchar_readoob(file, mtd, buf.start, buf.length,</div><div class='ctx'> 				(void __user *)(uintptr_t)buf.usr_ptr,</div><div class='ctx'> 				&amp;buf_user-&gt;length);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -804,7 +802,7 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> </div><div class='ctx'> 	case MEMWRITE:</div><div class='ctx'> 	{</div><div class='del'>-		ret = mtd_write_ioctl(mtd,</div><div class='add'>+		ret = mtdchar_write_ioctl(mtd,</div><div class='ctx'> 		      (struct mtd_write_req __user *)arg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -816,10 +814,7 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> 		if (copy_from_user(&amp;einfo, argp, sizeof(einfo)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		if (!mtd-&gt;lock)</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-		else</div><div class='del'>-			ret = mtd-&gt;lock(mtd, einfo.start, einfo.length);</div><div class='add'>+		ret = mtd_lock(mtd, einfo.start, einfo.length);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -830,10 +825,7 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> 		if (copy_from_user(&amp;einfo, argp, sizeof(einfo)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		if (!mtd-&gt;unlock)</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-		else</div><div class='del'>-			ret = mtd-&gt;unlock(mtd, einfo.start, einfo.length);</div><div class='add'>+		ret = mtd_unlock(mtd, einfo.start, einfo.length);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -844,10 +836,7 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> 		if (copy_from_user(&amp;einfo, argp, sizeof(einfo)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		if (!mtd-&gt;is_locked)</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-		else</div><div class='del'>-			ret = mtd-&gt;is_locked(mtd, einfo.start, einfo.length);</div><div class='add'>+		ret = mtd_is_locked(mtd, einfo.start, einfo.length);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -878,10 +867,7 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> </div><div class='ctx'> 		if (copy_from_user(&amp;offs, argp, sizeof(loff_t)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (!mtd-&gt;block_isbad)</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-		else</div><div class='del'>-			return mtd-&gt;block_isbad(mtd, offs);</div><div class='add'>+		return mtd_block_isbad(mtd, offs);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -891,10 +877,7 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> </div><div class='ctx'> 		if (copy_from_user(&amp;offs, argp, sizeof(loff_t)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (!mtd-&gt;block_markbad)</div><div class='del'>-			ret = -EOPNOTSUPP;</div><div class='del'>-		else</div><div class='del'>-			return mtd-&gt;block_markbad(mtd, offs);</div><div class='add'>+		return mtd_block_markbad(mtd, offs);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -919,17 +902,15 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> 		struct otp_info *buf = kmalloc(4096, GFP_KERNEL);</div><div class='ctx'> 		if (!buf)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='ctx'> 		switch (mfi-&gt;mode) {</div><div class='ctx'> 		case MTD_FILE_MODE_OTP_FACTORY:</div><div class='del'>-			if (mtd-&gt;get_fact_prot_info)</div><div class='del'>-				ret = mtd-&gt;get_fact_prot_info(mtd, buf, 4096);</div><div class='add'>+			ret = mtd_get_fact_prot_info(mtd, buf, 4096);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case MTD_FILE_MODE_OTP_USER:</div><div class='del'>-			if (mtd-&gt;get_user_prot_info)</div><div class='del'>-				ret = mtd-&gt;get_user_prot_info(mtd, buf, 4096);</div><div class='add'>+			ret = mtd_get_user_prot_info(mtd, buf, 4096);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='add'>+			ret = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ret &gt;= 0) {</div><div class='hunk'>@@ -953,9 +934,7 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		if (copy_from_user(&amp;oinfo, argp, sizeof(oinfo)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (!mtd-&gt;lock_user_prot_reg)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		ret = mtd-&gt;lock_user_prot_reg(mtd, oinfo.start, oinfo.length);</div><div class='add'>+		ret = mtd_lock_user_prot_reg(mtd, oinfo.start, oinfo.length);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -999,7 +978,7 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case MTD_FILE_MODE_RAW:</div><div class='del'>-			if (!mtd-&gt;read_oob || !mtd-&gt;write_oob)</div><div class='add'>+			if (!mtd_has_oob(mtd))</div><div class='ctx'> 				return -EOPNOTSUPP;</div><div class='ctx'> 			mfi-&gt;mode = arg;</div><div class='ctx'> </div><div class='hunk'>@@ -1014,7 +993,7 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> </div><div class='ctx'> 	case BLKPG:</div><div class='ctx'> 	{</div><div class='del'>-		ret = mtd_blkpg_ioctl(mtd,</div><div class='add'>+		ret = mtdchar_blkpg_ioctl(mtd,</div><div class='ctx'> 		      (struct blkpg_ioctl_arg __user *)arg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1033,12 +1012,12 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> 	return ret;</div><div class='ctx'> } /* memory_ioctl */</div><div class='ctx'> </div><div class='del'>-static long mtd_unlocked_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='add'>+static long mtdchar_unlocked_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;mtd_mutex);</div><div class='del'>-	ret = mtd_ioctl(file, cmd, arg);</div><div class='add'>+	ret = mtdchar_ioctl(file, cmd, arg);</div><div class='ctx'> 	mutex_unlock(&amp;mtd_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1055,7 +1034,7 @@ struct mtd_oob_buf32 {</div><div class='ctx'> #define MEMWRITEOOB32		_IOWR('M', 3, struct mtd_oob_buf32)</div><div class='ctx'> #define MEMREADOOB32		_IOWR('M', 4, struct mtd_oob_buf32)</div><div class='ctx'> </div><div class='del'>-static long mtd_compat_ioctl(struct file *file, unsigned int cmd,</div><div class='add'>+static long mtdchar_compat_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 	unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_file_info *mfi = file-&gt;private_data;</div><div class='hunk'>@@ -1074,7 +1053,7 @@ static long mtd_compat_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 		if (copy_from_user(&amp;buf, argp, sizeof(buf)))</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 		else</div><div class='del'>-			ret = mtd_do_writeoob(file, mtd, buf.start,</div><div class='add'>+			ret = mtdchar_writeoob(file, mtd, buf.start,</div><div class='ctx'> 				buf.length, compat_ptr(buf.ptr),</div><div class='ctx'> 				&amp;buf_user-&gt;length);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1089,13 +1068,13 @@ static long mtd_compat_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 		if (copy_from_user(&amp;buf, argp, sizeof(buf)))</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 		else</div><div class='del'>-			ret = mtd_do_readoob(file, mtd, buf.start,</div><div class='add'>+			ret = mtdchar_readoob(file, mtd, buf.start,</div><div class='ctx'> 				buf.length, compat_ptr(buf.ptr),</div><div class='ctx'> 				&amp;buf_user-&gt;start);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	default:</div><div class='del'>-		ret = mtd_ioctl(file, cmd, (unsigned long)argp);</div><div class='add'>+		ret = mtdchar_ioctl(file, cmd, (unsigned long)argp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;mtd_mutex);</div><div class='hunk'>@@ -1111,7 +1090,7 @@ static long mtd_compat_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'>  *   mappings)</div><div class='ctx'>  */</div><div class='ctx'> #ifndef CONFIG_MMU</div><div class='del'>-static unsigned long mtd_get_unmapped_area(struct file *file,</div><div class='add'>+static unsigned long mtdchar_get_unmapped_area(struct file *file,</div><div class='ctx'> 					   unsigned long addr,</div><div class='ctx'> 					   unsigned long len,</div><div class='ctx'> 					   unsigned long pgoff,</div><div class='hunk'>@@ -1119,32 +1098,28 @@ static unsigned long mtd_get_unmapped_area(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_file_info *mfi = file-&gt;private_data;</div><div class='ctx'> 	struct mtd_info *mtd = mfi-&gt;mtd;</div><div class='add'>+	unsigned long offset;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (mtd-&gt;get_unmapped_area) {</div><div class='del'>-		unsigned long offset;</div><div class='del'>-</div><div class='del'>-		if (addr != 0)</div><div class='del'>-			return (unsigned long) -EINVAL;</div><div class='del'>-</div><div class='del'>-		if (len &gt; mtd-&gt;size || pgoff &gt;= (mtd-&gt;size &gt;&gt; PAGE_SHIFT))</div><div class='del'>-			return (unsigned long) -EINVAL;</div><div class='add'>+	if (addr != 0)</div><div class='add'>+		return (unsigned long) -EINVAL;</div><div class='ctx'> </div><div class='del'>-		offset = pgoff &lt;&lt; PAGE_SHIFT;</div><div class='del'>-		if (offset &gt; mtd-&gt;size - len)</div><div class='del'>-			return (unsigned long) -EINVAL;</div><div class='add'>+	if (len &gt; mtd-&gt;size || pgoff &gt;= (mtd-&gt;size &gt;&gt; PAGE_SHIFT))</div><div class='add'>+		return (unsigned long) -EINVAL;</div><div class='ctx'> </div><div class='del'>-		return mtd-&gt;get_unmapped_area(mtd, len, offset, flags);</div><div class='del'>-	}</div><div class='add'>+	offset = pgoff &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	if (offset &gt; mtd-&gt;size - len)</div><div class='add'>+		return (unsigned long) -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* can't map directly */</div><div class='del'>-	return (unsigned long) -ENOSYS;</div><div class='add'>+	ret = mtd_get_unmapped_area(mtd, len, offset, flags);</div><div class='add'>+	return ret == -EOPNOTSUPP ? -ENOSYS : ret;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * set up a mapping for shared memory segments</div><div class='ctx'>  */</div><div class='del'>-static int mtd_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+static int mtdchar_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> 	struct mtd_file_info *mfi = file-&gt;private_data;</div><div class='hunk'>@@ -1185,18 +1160,18 @@ static int mtd_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> static const struct file_operations mtd_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.llseek		= mtd_lseek,</div><div class='del'>-	.read		= mtd_read,</div><div class='del'>-	.write		= mtd_write,</div><div class='del'>-	.unlocked_ioctl	= mtd_unlocked_ioctl,</div><div class='add'>+	.llseek		= mtdchar_lseek,</div><div class='add'>+	.read		= mtdchar_read,</div><div class='add'>+	.write		= mtdchar_write,</div><div class='add'>+	.unlocked_ioctl	= mtdchar_unlocked_ioctl,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_ioctl	= mtd_compat_ioctl,</div><div class='add'>+	.compat_ioctl	= mtdchar_compat_ioctl,</div><div class='ctx'> #endif</div><div class='del'>-	.open		= mtd_open,</div><div class='del'>-	.release	= mtd_close,</div><div class='del'>-	.mmap		= mtd_mmap,</div><div class='add'>+	.open		= mtdchar_open,</div><div class='add'>+	.release	= mtdchar_close,</div><div class='add'>+	.mmap		= mtdchar_mmap,</div><div class='ctx'> #ifndef CONFIG_MMU</div><div class='del'>-	.get_unmapped_area = mtd_get_unmapped_area,</div><div class='add'>+	.get_unmapped_area = mtdchar_get_unmapped_area,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c<br/>index 6df4d4d4eb92..1ed5103b219b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/mtdconcat.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/mtdconcat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/mtdconcat.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/mtdconcat.c</a></div><div class='hunk'>@@ -91,7 +91,7 @@ concat_read(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 			/* Entire transaction goes into this subdev */</div><div class='ctx'> 			size = len;</div><div class='ctx'> </div><div class='del'>-		err = subdev-&gt;read(subdev, from, size, &amp;retsize, buf);</div><div class='add'>+		err = mtd_read(subdev, from, size, &amp;retsize, buf);</div><div class='ctx'> </div><div class='ctx'> 		/* Save information about bitflips! */</div><div class='ctx'> 		if (unlikely(err)) {</div><div class='hunk'>@@ -148,7 +148,7 @@ concat_write(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> 		if (!(subdev-&gt;flags &amp; MTD_WRITEABLE))</div><div class='ctx'> 			err = -EROFS;</div><div class='ctx'> 		else</div><div class='del'>-			err = subdev-&gt;write(subdev, to, size, &amp;retsize, buf);</div><div class='add'>+			err = mtd_write(subdev, to, size, &amp;retsize, buf);</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -227,8 +227,9 @@ concat_writev(struct mtd_info *mtd, const struct kvec *vecs,</div><div class='ctx'> 		if (!(subdev-&gt;flags &amp; MTD_WRITEABLE))</div><div class='ctx'> 			err = -EROFS;</div><div class='ctx'> 		else</div><div class='del'>-			err = subdev-&gt;writev(subdev, &amp;vecs_copy[entry_low],</div><div class='del'>-				entry_high - entry_low + 1, to, &amp;retsize);</div><div class='add'>+			err = mtd_writev(subdev, &amp;vecs_copy[entry_low],</div><div class='add'>+					 entry_high - entry_low + 1, to,</div><div class='add'>+					 &amp;retsize);</div><div class='ctx'> </div><div class='ctx'> 		vecs_copy[entry_high].iov_len = old_iov_len - size;</div><div class='ctx'> 		vecs_copy[entry_high].iov_base += size;</div><div class='hunk'>@@ -273,7 +274,7 @@ concat_read_oob(struct mtd_info *mtd, loff_t from, struct mtd_oob_ops *ops)</div><div class='ctx'> 		if (from + devops.len &gt; subdev-&gt;size)</div><div class='ctx'> 			devops.len = subdev-&gt;size - from;</div><div class='ctx'> </div><div class='del'>-		err = subdev-&gt;read_oob(subdev, from, &amp;devops);</div><div class='add'>+		err = mtd_read_oob(subdev, from, &amp;devops);</div><div class='ctx'> 		ops-&gt;retlen += devops.retlen;</div><div class='ctx'> 		ops-&gt;oobretlen += devops.oobretlen;</div><div class='ctx'> </div><div class='hunk'>@@ -333,7 +334,7 @@ concat_write_oob(struct mtd_info *mtd, loff_t to, struct mtd_oob_ops *ops)</div><div class='ctx'> 		if (to + devops.len &gt; subdev-&gt;size)</div><div class='ctx'> 			devops.len = subdev-&gt;size - to;</div><div class='ctx'> </div><div class='del'>-		err = subdev-&gt;write_oob(subdev, to, &amp;devops);</div><div class='add'>+		err = mtd_write_oob(subdev, to, &amp;devops);</div><div class='ctx'> 		ops-&gt;retlen += devops.oobretlen;</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -379,7 +380,7 @@ static int concat_dev_erase(struct mtd_info *mtd, struct erase_info *erase)</div><div class='ctx'> 	 * FIXME: Allow INTERRUPTIBLE. Which means</div><div class='ctx'> 	 * not having the wait_queue head on the stack.</div><div class='ctx'> 	 */</div><div class='del'>-	err = mtd-&gt;erase(mtd, erase);</div><div class='add'>+	err = mtd_erase(mtd, erase);</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='ctx'> 		add_wait_queue(&amp;waitq, &amp;wait);</div><div class='hunk'>@@ -554,12 +555,9 @@ static int concat_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)</div><div class='ctx'> 		else</div><div class='ctx'> 			size = len;</div><div class='ctx'> </div><div class='del'>-		if (subdev-&gt;lock) {</div><div class='del'>-			err = subdev-&gt;lock(subdev, ofs, size);</div><div class='del'>-			if (err)</div><div class='del'>-				break;</div><div class='del'>-		} else</div><div class='del'>-			err = -EOPNOTSUPP;</div><div class='add'>+		err = mtd_lock(subdev, ofs, size);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		len -= size;</div><div class='ctx'> 		if (len == 0)</div><div class='hunk'>@@ -594,12 +592,9 @@ static int concat_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)</div><div class='ctx'> 		else</div><div class='ctx'> 			size = len;</div><div class='ctx'> </div><div class='del'>-		if (subdev-&gt;unlock) {</div><div class='del'>-			err = subdev-&gt;unlock(subdev, ofs, size);</div><div class='del'>-			if (err)</div><div class='del'>-				break;</div><div class='del'>-		} else</div><div class='del'>-			err = -EOPNOTSUPP;</div><div class='add'>+		err = mtd_unlock(subdev, ofs, size);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		len -= size;</div><div class='ctx'> 		if (len == 0)</div><div class='hunk'>@@ -619,7 +614,7 @@ static void concat_sync(struct mtd_info *mtd)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; concat-&gt;num_subdev; i++) {</div><div class='ctx'> 		struct mtd_info *subdev = concat-&gt;subdev[i];</div><div class='del'>-		subdev-&gt;sync(subdev);</div><div class='add'>+		mtd_sync(subdev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -630,7 +625,7 @@ static int concat_suspend(struct mtd_info *mtd)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; concat-&gt;num_subdev; i++) {</div><div class='ctx'> 		struct mtd_info *subdev = concat-&gt;subdev[i];</div><div class='del'>-		if ((rc = subdev-&gt;suspend(subdev)) &lt; 0)</div><div class='add'>+		if ((rc = mtd_suspend(subdev)) &lt; 0)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -643,7 +638,7 @@ static void concat_resume(struct mtd_info *mtd)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; concat-&gt;num_subdev; i++) {</div><div class='ctx'> 		struct mtd_info *subdev = concat-&gt;subdev[i];</div><div class='del'>-		subdev-&gt;resume(subdev);</div><div class='add'>+		mtd_resume(subdev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -652,7 +647,7 @@ static int concat_block_isbad(struct mtd_info *mtd, loff_t ofs)</div><div class='ctx'> 	struct mtd_concat *concat = CONCAT(mtd);</div><div class='ctx'> 	int i, res = 0;</div><div class='ctx'> </div><div class='del'>-	if (!concat-&gt;subdev[0]-&gt;block_isbad)</div><div class='add'>+	if (!mtd_can_have_bb(concat-&gt;subdev[0]))</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='ctx'> 	if (ofs &gt; mtd-&gt;size)</div><div class='hunk'>@@ -666,7 +661,7 @@ static int concat_block_isbad(struct mtd_info *mtd, loff_t ofs)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		res = subdev-&gt;block_isbad(subdev, ofs);</div><div class='add'>+		res = mtd_block_isbad(subdev, ofs);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -678,7 +673,7 @@ static int concat_block_markbad(struct mtd_info *mtd, loff_t ofs)</div><div class='ctx'> 	struct mtd_concat *concat = CONCAT(mtd);</div><div class='ctx'> 	int i, err = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!concat-&gt;subdev[0]-&gt;block_markbad)</div><div class='add'>+	if (!mtd_can_have_bb(concat-&gt;subdev[0]))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ofs &gt; mtd-&gt;size)</div><div class='hunk'>@@ -692,7 +687,7 @@ static int concat_block_markbad(struct mtd_info *mtd, loff_t ofs)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = subdev-&gt;block_markbad(subdev, ofs);</div><div class='add'>+		err = mtd_block_markbad(subdev, ofs);</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			mtd-&gt;ecc_stats.badblocks++;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -725,11 +720,7 @@ static unsigned long concat_get_unmapped_area(struct mtd_info *mtd,</div><div class='ctx'> 		if (offset + len &gt; subdev-&gt;size)</div><div class='ctx'> 			return (unsigned long) -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (subdev-&gt;get_unmapped_area)</div><div class='del'>-			return subdev-&gt;get_unmapped_area(subdev, len, offset,</div><div class='del'>-							 flags);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='add'>+		return mtd_get_unmapped_area(subdev, len, offset, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return (unsigned long) -ENOSYS;</div><div class='head'>diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c<br/>index b01993ea260e..6ae9ca01388b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/mtdcore.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/mtdcore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/mtdcore.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/mtdcore.c</a></div><div class='hunk'>@@ -107,7 +107,8 @@ static LIST_HEAD(mtd_notifiers);</div><div class='ctx'>  */</div><div class='ctx'> static void mtd_release(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	dev_t index = MTD_DEVT(dev_to_mtd(dev)-&gt;index);</div><div class='add'>+	struct mtd_info *mtd = dev_get_drvdata(dev);</div><div class='add'>+	dev_t index = MTD_DEVT(mtd-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	/* remove /dev/mtdXro node if needed */</div><div class='ctx'> 	if (index)</div><div class='hunk'>@@ -116,27 +117,24 @@ static void mtd_release(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static int mtd_cls_suspend(struct device *dev, pm_message_t state)</div><div class='ctx'> {</div><div class='del'>-	struct mtd_info *mtd = dev_to_mtd(dev);</div><div class='add'>+	struct mtd_info *mtd = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='del'>-	if (mtd &amp;&amp; mtd-&gt;suspend)</div><div class='del'>-		return mtd-&gt;suspend(mtd);</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='add'>+	return mtd_suspend(mtd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mtd_cls_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct mtd_info *mtd = dev_to_mtd(dev);</div><div class='del'>-	</div><div class='add'>+	struct mtd_info *mtd = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='ctx'> 	if (mtd &amp;&amp; mtd-&gt;resume)</div><div class='del'>-		mtd-&gt;resume(mtd);</div><div class='add'>+		mtd_resume(mtd);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t mtd_type_show(struct device *dev,</div><div class='ctx'> 		struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct mtd_info *mtd = dev_to_mtd(dev);</div><div class='add'>+	struct mtd_info *mtd = dev_get_drvdata(dev);</div><div class='ctx'> 	char *type;</div><div class='ctx'> </div><div class='ctx'> 	switch (mtd-&gt;type) {</div><div class='hunk'>@@ -172,7 +170,7 @@ static DEVICE_ATTR(type, S_IRUGO, mtd_type_show, NULL);</div><div class='ctx'> static ssize_t mtd_flags_show(struct device *dev,</div><div class='ctx'> 		struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct mtd_info *mtd = dev_to_mtd(dev);</div><div class='add'>+	struct mtd_info *mtd = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "0x%lx\n", (unsigned long)mtd-&gt;flags);</div><div class='ctx'> </div><div class='hunk'>@@ -182,7 +180,7 @@ static DEVICE_ATTR(flags, S_IRUGO, mtd_flags_show, NULL);</div><div class='ctx'> static ssize_t mtd_size_show(struct device *dev,</div><div class='ctx'> 		struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct mtd_info *mtd = dev_to_mtd(dev);</div><div class='add'>+	struct mtd_info *mtd = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%llu\n",</div><div class='ctx'> 		(unsigned long long)mtd-&gt;size);</div><div class='hunk'>@@ -193,7 +191,7 @@ static DEVICE_ATTR(size, S_IRUGO, mtd_size_show, NULL);</div><div class='ctx'> static ssize_t mtd_erasesize_show(struct device *dev,</div><div class='ctx'> 		struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct mtd_info *mtd = dev_to_mtd(dev);</div><div class='add'>+	struct mtd_info *mtd = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%lu\n", (unsigned long)mtd-&gt;erasesize);</div><div class='ctx'> </div><div class='hunk'>@@ -203,7 +201,7 @@ static DEVICE_ATTR(erasesize, S_IRUGO, mtd_erasesize_show, NULL);</div><div class='ctx'> static ssize_t mtd_writesize_show(struct device *dev,</div><div class='ctx'> 		struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct mtd_info *mtd = dev_to_mtd(dev);</div><div class='add'>+	struct mtd_info *mtd = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%lu\n", (unsigned long)mtd-&gt;writesize);</div><div class='ctx'> </div><div class='hunk'>@@ -213,7 +211,7 @@ static DEVICE_ATTR(writesize, S_IRUGO, mtd_writesize_show, NULL);</div><div class='ctx'> static ssize_t mtd_subpagesize_show(struct device *dev,</div><div class='ctx'> 		struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct mtd_info *mtd = dev_to_mtd(dev);</div><div class='add'>+	struct mtd_info *mtd = dev_get_drvdata(dev);</div><div class='ctx'> 	unsigned int subpagesize = mtd-&gt;writesize &gt;&gt; mtd-&gt;subpage_sft;</div><div class='ctx'> </div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%u\n", subpagesize);</div><div class='hunk'>@@ -224,7 +222,7 @@ static DEVICE_ATTR(subpagesize, S_IRUGO, mtd_subpagesize_show, NULL);</div><div class='ctx'> static ssize_t mtd_oobsize_show(struct device *dev,</div><div class='ctx'> 		struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct mtd_info *mtd = dev_to_mtd(dev);</div><div class='add'>+	struct mtd_info *mtd = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%lu\n", (unsigned long)mtd-&gt;oobsize);</div><div class='ctx'> </div><div class='hunk'>@@ -234,7 +232,7 @@ static DEVICE_ATTR(oobsize, S_IRUGO, mtd_oobsize_show, NULL);</div><div class='ctx'> static ssize_t mtd_numeraseregions_show(struct device *dev,</div><div class='ctx'> 		struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct mtd_info *mtd = dev_to_mtd(dev);</div><div class='add'>+	struct mtd_info *mtd = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%u\n", mtd-&gt;numeraseregions);</div><div class='ctx'> </div><div class='hunk'>@@ -245,7 +243,7 @@ static DEVICE_ATTR(numeraseregions, S_IRUGO, mtd_numeraseregions_show,</div><div class='ctx'> static ssize_t mtd_name_show(struct device *dev,</div><div class='ctx'> 		struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct mtd_info *mtd = dev_to_mtd(dev);</div><div class='add'>+	struct mtd_info *mtd = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%s\n", mtd-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -338,9 +336,9 @@ int add_mtd_device(struct mtd_info *mtd)</div><div class='ctx'> 	mtd-&gt;writesize_mask = (1 &lt;&lt; mtd-&gt;writesize_shift) - 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Some chips always power up locked. Unlock them now */</div><div class='del'>-	if ((mtd-&gt;flags &amp; MTD_WRITEABLE)</div><div class='del'>-	    &amp;&amp; (mtd-&gt;flags &amp; MTD_POWERUP_LOCK) &amp;&amp; mtd-&gt;unlock) {</div><div class='del'>-		if (mtd-&gt;unlock(mtd, 0, mtd-&gt;size))</div><div class='add'>+	if ((mtd-&gt;flags &amp; MTD_WRITEABLE) &amp;&amp; (mtd-&gt;flags &amp; MTD_POWERUP_LOCK)) {</div><div class='add'>+		error = mtd_unlock(mtd, 0, mtd-&gt;size);</div><div class='add'>+		if (error &amp;&amp; error != -EOPNOTSUPP)</div><div class='ctx'> 			printk(KERN_WARNING</div><div class='ctx'> 			       "%s: unlock failed, writes may not work\n",</div><div class='ctx'> 			       mtd-&gt;name);</div><div class='hunk'>@@ -516,7 +514,6 @@ EXPORT_SYMBOL_GPL(mtd_device_unregister);</div><div class='ctx'>  *	or removal of MTD devices. Causes the 'add' callback to be immediately</div><div class='ctx'>  *	invoked for each MTD device currently present in the system.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> void register_mtd_user (struct mtd_notifier *new)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_info *mtd;</div><div class='hunk'>@@ -532,6 +529,7 @@ void register_mtd_user (struct mtd_notifier *new)</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;mtd_table_mutex);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(register_mtd_user);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	unregister_mtd_user - unregister a 'user' of MTD devices.</div><div class='hunk'>@@ -542,7 +540,6 @@ void register_mtd_user (struct mtd_notifier *new)</div><div class='ctx'>  *	'remove' callback to be immediately invoked for each MTD device</div><div class='ctx'>  *	currently present in the system.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> int unregister_mtd_user (struct mtd_notifier *old)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_info *mtd;</div><div class='hunk'>@@ -558,7 +555,7 @@ int unregister_mtd_user (struct mtd_notifier *old)</div><div class='ctx'> 	mutex_unlock(&amp;mtd_table_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='add'>+EXPORT_SYMBOL_GPL(unregister_mtd_user);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	get_mtd_device - obtain a validated handle for an MTD device</div><div class='hunk'>@@ -571,7 +568,6 @@ int unregister_mtd_user (struct mtd_notifier *old)</div><div class='ctx'>  *	both, return the num'th driver only if its address matches. Return</div><div class='ctx'>  *	error code if not.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_info *ret = NULL, *other;</div><div class='hunk'>@@ -604,6 +600,7 @@ out:</div><div class='ctx'> 	mutex_unlock(&amp;mtd_table_mutex);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(get_mtd_device);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> int __get_mtd_device(struct mtd_info *mtd)</div><div class='hunk'>@@ -624,6 +621,7 @@ int __get_mtd_device(struct mtd_info *mtd)</div><div class='ctx'> 	mtd-&gt;usecount++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(__get_mtd_device);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	get_mtd_device_nm - obtain a validated handle for an MTD device by</div><div class='hunk'>@@ -633,7 +631,6 @@ int __get_mtd_device(struct mtd_info *mtd)</div><div class='ctx'>  * 	This function returns MTD device description structure in case of</div><div class='ctx'>  * 	success and an error code in case of failure.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> struct mtd_info *get_mtd_device_nm(const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	int err = -ENODEV;</div><div class='hunk'>@@ -662,6 +659,7 @@ out_unlock:</div><div class='ctx'> 	mutex_unlock(&amp;mtd_table_mutex);</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(get_mtd_device_nm);</div><div class='ctx'> </div><div class='ctx'> void put_mtd_device(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='hunk'>@@ -670,6 +668,7 @@ void put_mtd_device(struct mtd_info *mtd)</div><div class='ctx'> 	mutex_unlock(&amp;mtd_table_mutex);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(put_mtd_device);</div><div class='ctx'> </div><div class='ctx'> void __put_mtd_device(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='hunk'>@@ -681,39 +680,65 @@ void __put_mtd_device(struct mtd_info *mtd)</div><div class='ctx'> </div><div class='ctx'> 	module_put(mtd-&gt;owner);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(__put_mtd_device);</div><div class='ctx'> </div><div class='del'>-/* default_mtd_writev - default mtd writev method for MTD devices that</div><div class='del'>- *			don't implement their own</div><div class='add'>+/*</div><div class='add'>+ * default_mtd_writev - the default writev method</div><div class='add'>+ * @mtd: mtd device description object pointer</div><div class='add'>+ * @vecs: the vectors to write</div><div class='add'>+ * @count: count of vectors in @vecs</div><div class='add'>+ * @to: the MTD device offset to write to</div><div class='add'>+ * @retlen: on exit contains the count of bytes written to the MTD device.</div><div class='add'>+ *</div><div class='add'>+ * This function returns zero in case of success and a negative error code in</div><div class='add'>+ * case of failure.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-int default_mtd_writev(struct mtd_info *mtd, const struct kvec *vecs,</div><div class='del'>-		       unsigned long count, loff_t to, size_t *retlen)</div><div class='add'>+static int default_mtd_writev(struct mtd_info *mtd, const struct kvec *vecs,</div><div class='add'>+			      unsigned long count, loff_t to, size_t *retlen)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long i;</div><div class='ctx'> 	size_t totlen = 0, thislen;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if(!mtd-&gt;write) {</div><div class='del'>-		ret = -EROFS;</div><div class='del'>-	} else {</div><div class='del'>-		for (i=0; i&lt;count; i++) {</div><div class='del'>-			if (!vecs[i].iov_len)</div><div class='del'>-				continue;</div><div class='del'>-			ret = mtd-&gt;write(mtd, to, vecs[i].iov_len, &amp;thislen, vecs[i].iov_base);</div><div class='del'>-			totlen += thislen;</div><div class='del'>-			if (ret || thislen != vecs[i].iov_len)</div><div class='del'>-				break;</div><div class='del'>-			to += vecs[i].iov_len;</div><div class='del'>-		}</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		if (!vecs[i].iov_len)</div><div class='add'>+			continue;</div><div class='add'>+		ret = mtd_write(mtd, to, vecs[i].iov_len, &amp;thislen,</div><div class='add'>+				vecs[i].iov_base);</div><div class='add'>+		totlen += thislen;</div><div class='add'>+		if (ret || thislen != vecs[i].iov_len)</div><div class='add'>+			break;</div><div class='add'>+		to += vecs[i].iov_len;</div><div class='ctx'> 	}</div><div class='del'>-	if (retlen)</div><div class='del'>-		*retlen = totlen;</div><div class='add'>+	*retlen = totlen;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * mtd_writev - the vector-based MTD write method</div><div class='add'>+ * @mtd: mtd device description object pointer</div><div class='add'>+ * @vecs: the vectors to write</div><div class='add'>+ * @count: count of vectors in @vecs</div><div class='add'>+ * @to: the MTD device offset to write to</div><div class='add'>+ * @retlen: on exit contains the count of bytes written to the MTD device.</div><div class='add'>+ *</div><div class='add'>+ * This function returns zero in case of success and a negative error code in</div><div class='add'>+ * case of failure.</div><div class='add'>+ */</div><div class='add'>+int mtd_writev(struct mtd_info *mtd, const struct kvec *vecs,</div><div class='add'>+	       unsigned long count, loff_t to, size_t *retlen)</div><div class='add'>+{</div><div class='add'>+	*retlen = 0;</div><div class='add'>+	if (!mtd-&gt;writev)</div><div class='add'>+		return default_mtd_writev(mtd, vecs, count, to, retlen);</div><div class='add'>+	return mtd-&gt;writev(mtd, vecs, count, to, retlen);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mtd_writev);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * mtd_kmalloc_up_to - allocate a contiguous buffer up to the specified size</div><div class='del'>- * @size: A pointer to the ideal or maximum size of the allocation. Points</div><div class='add'>+ * @mtd: mtd device description object pointer</div><div class='add'>+ * @size: a pointer to the ideal or maximum size of the allocation, points</div><div class='ctx'>  *        to the actual allocation size on success.</div><div class='ctx'>  *</div><div class='ctx'>  * This routine attempts to allocate a contiguous kernel buffer up to</div><div class='hunk'>@@ -758,15 +783,6 @@ void *mtd_kmalloc_up_to(const struct mtd_info *mtd, size_t *size)</div><div class='ctx'> 	 */</div><div class='ctx'> 	return kmalloc(*size, GFP_KERNEL);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(get_mtd_device);</div><div class='del'>-EXPORT_SYMBOL_GPL(get_mtd_device_nm);</div><div class='del'>-EXPORT_SYMBOL_GPL(__get_mtd_device);</div><div class='del'>-EXPORT_SYMBOL_GPL(put_mtd_device);</div><div class='del'>-EXPORT_SYMBOL_GPL(__put_mtd_device);</div><div class='del'>-EXPORT_SYMBOL_GPL(register_mtd_user);</div><div class='del'>-EXPORT_SYMBOL_GPL(unregister_mtd_user);</div><div class='del'>-EXPORT_SYMBOL_GPL(default_mtd_writev);</div><div class='ctx'> EXPORT_SYMBOL_GPL(mtd_kmalloc_up_to);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='head'>diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c<br/>index 1e2fa6236705..3ce99e00a49e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/mtdoops.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/mtdoops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/mtdoops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/mtdoops.c</a></div><div class='hunk'>@@ -112,7 +112,7 @@ static int mtdoops_erase_block(struct mtdoops_context *cxt, int offset)</div><div class='ctx'> 	set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> 	add_wait_queue(&amp;wait_q, &amp;wait);</div><div class='ctx'> </div><div class='del'>-	ret = mtd-&gt;erase(mtd, &amp;erase);</div><div class='add'>+	ret = mtd_erase(mtd, &amp;erase);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		set_current_state(TASK_RUNNING);</div><div class='ctx'> 		remove_wait_queue(&amp;wait_q, &amp;wait);</div><div class='hunk'>@@ -169,8 +169,8 @@ static void mtdoops_workfunc_erase(struct work_struct *work)</div><div class='ctx'> 			cxt-&gt;nextpage = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	while (mtd-&gt;block_isbad) {</div><div class='del'>-		ret = mtd-&gt;block_isbad(mtd, cxt-&gt;nextpage * record_size);</div><div class='add'>+	while (mtd_can_have_bb(mtd)) {</div><div class='add'>+		ret = mtd_block_isbad(mtd, cxt-&gt;nextpage * record_size);</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='hunk'>@@ -199,8 +199,8 @@ badblock:</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mtd-&gt;block_markbad &amp;&amp; ret == -EIO) {</div><div class='del'>-		ret = mtd-&gt;block_markbad(mtd, cxt-&gt;nextpage * record_size);</div><div class='add'>+	if (mtd_can_have_bb(mtd) &amp;&amp; ret == -EIO) {</div><div class='add'>+		ret = mtd_block_markbad(mtd, cxt-&gt;nextpage * record_size);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			printk(KERN_ERR "mtdoops: block_markbad failed, aborting\n");</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -221,12 +221,16 @@ static void mtdoops_write(struct mtdoops_context *cxt, int panic)</div><div class='ctx'> 	hdr[0] = cxt-&gt;nextcount;</div><div class='ctx'> 	hdr[1] = MTDOOPS_KERNMSG_MAGIC;</div><div class='ctx'> </div><div class='del'>-	if (panic)</div><div class='del'>-		ret = mtd-&gt;panic_write(mtd, cxt-&gt;nextpage * record_size,</div><div class='del'>-					record_size, &amp;retlen, cxt-&gt;oops_buf);</div><div class='del'>-	else</div><div class='del'>-		ret = mtd-&gt;write(mtd, cxt-&gt;nextpage * record_size,</div><div class='del'>-					record_size, &amp;retlen, cxt-&gt;oops_buf);</div><div class='add'>+	if (panic) {</div><div class='add'>+		ret = mtd_panic_write(mtd, cxt-&gt;nextpage * record_size,</div><div class='add'>+				      record_size, &amp;retlen, cxt-&gt;oops_buf);</div><div class='add'>+		if (ret == -EOPNOTSUPP) {</div><div class='add'>+			printk(KERN_ERR "mtdoops: Cannot write from panic without panic_write\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		ret = mtd_write(mtd, cxt-&gt;nextpage * record_size,</div><div class='add'>+				record_size, &amp;retlen, cxt-&gt;oops_buf);</div><div class='ctx'> </div><div class='ctx'> 	if (retlen != record_size || ret &lt; 0)</div><div class='ctx'> 		printk(KERN_ERR "mtdoops: write failure at %ld (%td of %ld written), error %d\n",</div><div class='hunk'>@@ -253,10 +257,13 @@ static void find_next_position(struct mtdoops_context *cxt)</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> </div><div class='ctx'> 	for (page = 0; page &lt; cxt-&gt;oops_pages; page++) {</div><div class='add'>+		if (mtd_can_have_bb(mtd) &amp;&amp;</div><div class='add'>+		    mtd_block_isbad(mtd, page * record_size))</div><div class='add'>+			continue;</div><div class='ctx'> 		/* Assume the page is used */</div><div class='ctx'> 		mark_page_used(cxt, page);</div><div class='del'>-		ret = mtd-&gt;read(mtd, page * record_size, MTDOOPS_HEADER_SIZE,</div><div class='del'>-				&amp;retlen, (u_char *) &amp;count[0]);</div><div class='add'>+		ret = mtd_read(mtd, page * record_size, MTDOOPS_HEADER_SIZE,</div><div class='add'>+			       &amp;retlen, (u_char *)&amp;count[0]);</div><div class='ctx'> 		if (retlen != MTDOOPS_HEADER_SIZE ||</div><div class='ctx'> 				(ret &lt; 0 &amp;&amp; !mtd_is_bitflip(ret))) {</div><div class='ctx'> 			printk(KERN_ERR "mtdoops: read failure at %ld (%td of %d read), err %d\n",</div><div class='hunk'>@@ -308,8 +315,7 @@ static void mtdoops_do_dump(struct kmsg_dumper *dumper,</div><div class='ctx'> 	char *dst;</div><div class='ctx'> </div><div class='ctx'> 	if (reason != KMSG_DUMP_OOPS &amp;&amp;</div><div class='del'>-	    reason != KMSG_DUMP_PANIC &amp;&amp;</div><div class='del'>-	    reason != KMSG_DUMP_KEXEC)</div><div class='add'>+	    reason != KMSG_DUMP_PANIC)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Only dump oopses if dump_oops is set */</div><div class='hunk'>@@ -327,13 +333,8 @@ static void mtdoops_do_dump(struct kmsg_dumper *dumper,</div><div class='ctx'> 	memcpy(dst + l1_cpy, s2 + s2_start, l2_cpy);</div><div class='ctx'> </div><div class='ctx'> 	/* Panics must be written immediately */</div><div class='del'>-	if (reason != KMSG_DUMP_OOPS) {</div><div class='del'>-		if (!cxt-&gt;mtd-&gt;panic_write)</div><div class='del'>-			printk(KERN_ERR "mtdoops: Cannot write from panic without panic_write\n");</div><div class='del'>-		else</div><div class='del'>-			mtdoops_write(cxt, 1);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	if (reason != KMSG_DUMP_OOPS)</div><div class='add'>+		mtdoops_write(cxt, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* For other cases, schedule work to write it "nicely" */</div><div class='ctx'> 	schedule_work(&amp;cxt-&gt;work_write);</div><div class='hunk'>@@ -369,7 +370,7 @@ static void mtdoops_notify_add(struct mtd_info *mtd)</div><div class='ctx'> </div><div class='ctx'> 	/* oops_page_used is a bit field */</div><div class='ctx'> 	cxt-&gt;oops_page_used = vmalloc(DIV_ROUND_UP(mtdoops_pages,</div><div class='del'>-			BITS_PER_LONG));</div><div class='add'>+			BITS_PER_LONG) * sizeof(unsigned long));</div><div class='ctx'> 	if (!cxt-&gt;oops_page_used) {</div><div class='ctx'> 		printk(KERN_ERR "mtdoops: could not allocate page array\n");</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c<br/>index a0bd2de4752b..a3d44c3416b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/mtdpart.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/mtdpart.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/mtdpart.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/mtdpart.c</a></div><div class='hunk'>@@ -70,8 +70,7 @@ static int part_read(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 		len = 0;</div><div class='ctx'> 	else if (from + len &gt; mtd-&gt;size)</div><div class='ctx'> 		len = mtd-&gt;size - from;</div><div class='del'>-	res = part-&gt;master-&gt;read(part-&gt;master, from + part-&gt;offset,</div><div class='del'>-				   len, retlen, buf);</div><div class='add'>+	res = mtd_read(part-&gt;master, from + part-&gt;offset, len, retlen, buf);</div><div class='ctx'> 	if (unlikely(res)) {</div><div class='ctx'> 		if (mtd_is_bitflip(res))</div><div class='ctx'> 			mtd-&gt;ecc_stats.corrected += part-&gt;master-&gt;ecc_stats.corrected - stats.corrected;</div><div class='hunk'>@@ -89,15 +88,15 @@ static int part_point(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 		len = 0;</div><div class='ctx'> 	else if (from + len &gt; mtd-&gt;size)</div><div class='ctx'> 		len = mtd-&gt;size - from;</div><div class='del'>-	return part-&gt;master-&gt;point (part-&gt;master, from + part-&gt;offset,</div><div class='del'>-				    len, retlen, virt, phys);</div><div class='add'>+	return mtd_point(part-&gt;master, from + part-&gt;offset, len, retlen,</div><div class='add'>+			 virt, phys);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void part_unpoint(struct mtd_info *mtd, loff_t from, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='ctx'> </div><div class='del'>-	part-&gt;master-&gt;unpoint(part-&gt;master, from + part-&gt;offset, len);</div><div class='add'>+	mtd_unpoint(part-&gt;master, from + part-&gt;offset, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long part_get_unmapped_area(struct mtd_info *mtd,</div><div class='hunk'>@@ -108,8 +107,7 @@ static unsigned long part_get_unmapped_area(struct mtd_info *mtd,</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='ctx'> </div><div class='ctx'> 	offset += part-&gt;offset;</div><div class='del'>-	return part-&gt;master-&gt;get_unmapped_area(part-&gt;master, len, offset,</div><div class='del'>-					       flags);</div><div class='add'>+	return mtd_get_unmapped_area(part-&gt;master, len, offset, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_read_oob(struct mtd_info *mtd, loff_t from,</div><div class='hunk'>@@ -140,7 +138,7 @@ static int part_read_oob(struct mtd_info *mtd, loff_t from,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	res = part-&gt;master-&gt;read_oob(part-&gt;master, from + part-&gt;offset, ops);</div><div class='add'>+	res = mtd_read_oob(part-&gt;master, from + part-&gt;offset, ops);</div><div class='ctx'> 	if (unlikely(res)) {</div><div class='ctx'> 		if (mtd_is_bitflip(res))</div><div class='ctx'> 			mtd-&gt;ecc_stats.corrected++;</div><div class='hunk'>@@ -154,30 +152,28 @@ static int part_read_user_prot_reg(struct mtd_info *mtd, loff_t from,</div><div class='ctx'> 		size_t len, size_t *retlen, u_char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='del'>-	return part-&gt;master-&gt;read_user_prot_reg(part-&gt;master, from,</div><div class='del'>-					len, retlen, buf);</div><div class='add'>+	return mtd_read_user_prot_reg(part-&gt;master, from, len, retlen, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_get_user_prot_info(struct mtd_info *mtd,</div><div class='ctx'> 		struct otp_info *buf, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='del'>-	return part-&gt;master-&gt;get_user_prot_info(part-&gt;master, buf, len);</div><div class='add'>+	return mtd_get_user_prot_info(part-&gt;master, buf, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_read_fact_prot_reg(struct mtd_info *mtd, loff_t from,</div><div class='ctx'> 		size_t len, size_t *retlen, u_char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='del'>-	return part-&gt;master-&gt;read_fact_prot_reg(part-&gt;master, from,</div><div class='del'>-					len, retlen, buf);</div><div class='add'>+	return mtd_read_fact_prot_reg(part-&gt;master, from, len, retlen, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_get_fact_prot_info(struct mtd_info *mtd, struct otp_info *buf,</div><div class='ctx'> 		size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='del'>-	return part-&gt;master-&gt;get_fact_prot_info(part-&gt;master, buf, len);</div><div class='add'>+	return mtd_get_fact_prot_info(part-&gt;master, buf, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_write(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='hunk'>@@ -190,8 +186,7 @@ static int part_write(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> 		len = 0;</div><div class='ctx'> 	else if (to + len &gt; mtd-&gt;size)</div><div class='ctx'> 		len = mtd-&gt;size - to;</div><div class='del'>-	return part-&gt;master-&gt;write(part-&gt;master, to + part-&gt;offset,</div><div class='del'>-				    len, retlen, buf);</div><div class='add'>+	return mtd_write(part-&gt;master, to + part-&gt;offset, len, retlen, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_panic_write(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='hunk'>@@ -204,8 +199,8 @@ static int part_panic_write(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> 		len = 0;</div><div class='ctx'> 	else if (to + len &gt; mtd-&gt;size)</div><div class='ctx'> 		len = mtd-&gt;size - to;</div><div class='del'>-	return part-&gt;master-&gt;panic_write(part-&gt;master, to + part-&gt;offset,</div><div class='del'>-				    len, retlen, buf);</div><div class='add'>+	return mtd_panic_write(part-&gt;master, to + part-&gt;offset, len, retlen,</div><div class='add'>+			       buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_write_oob(struct mtd_info *mtd, loff_t to,</div><div class='hunk'>@@ -220,22 +215,21 @@ static int part_write_oob(struct mtd_info *mtd, loff_t to,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (ops-&gt;datbuf &amp;&amp; to + ops-&gt;len &gt; mtd-&gt;size)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	return part-&gt;master-&gt;write_oob(part-&gt;master, to + part-&gt;offset, ops);</div><div class='add'>+	return mtd_write_oob(part-&gt;master, to + part-&gt;offset, ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_write_user_prot_reg(struct mtd_info *mtd, loff_t from,</div><div class='ctx'> 		size_t len, size_t *retlen, u_char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='del'>-	return part-&gt;master-&gt;write_user_prot_reg(part-&gt;master, from,</div><div class='del'>-					len, retlen, buf);</div><div class='add'>+	return mtd_write_user_prot_reg(part-&gt;master, from, len, retlen, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_lock_user_prot_reg(struct mtd_info *mtd, loff_t from,</div><div class='ctx'> 		size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='del'>-	return part-&gt;master-&gt;lock_user_prot_reg(part-&gt;master, from, len);</div><div class='add'>+	return mtd_lock_user_prot_reg(part-&gt;master, from, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_writev(struct mtd_info *mtd, const struct kvec *vecs,</div><div class='hunk'>@@ -244,8 +238,8 @@ static int part_writev(struct mtd_info *mtd, const struct kvec *vecs,</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='ctx'> 	if (!(mtd-&gt;flags &amp; MTD_WRITEABLE))</div><div class='ctx'> 		return -EROFS;</div><div class='del'>-	return part-&gt;master-&gt;writev(part-&gt;master, vecs, count,</div><div class='del'>-					to + part-&gt;offset, retlen);</div><div class='add'>+	return mtd_writev(part-&gt;master, vecs, count, to + part-&gt;offset,</div><div class='add'>+			  retlen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_erase(struct mtd_info *mtd, struct erase_info *instr)</div><div class='hunk'>@@ -257,7 +251,7 @@ static int part_erase(struct mtd_info *mtd, struct erase_info *instr)</div><div class='ctx'> 	if (instr-&gt;addr &gt;= mtd-&gt;size)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	instr-&gt;addr += part-&gt;offset;</div><div class='del'>-	ret = part-&gt;master-&gt;erase(part-&gt;master, instr);</div><div class='add'>+	ret = mtd_erase(part-&gt;master, instr);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		if (instr-&gt;fail_addr != MTD_FAIL_ADDR_UNKNOWN)</div><div class='ctx'> 			instr-&gt;fail_addr -= part-&gt;offset;</div><div class='hunk'>@@ -285,7 +279,7 @@ static int part_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='ctx'> 	if ((len + ofs) &gt; mtd-&gt;size)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	return part-&gt;master-&gt;lock(part-&gt;master, ofs + part-&gt;offset, len);</div><div class='add'>+	return mtd_lock(part-&gt;master, ofs + part-&gt;offset, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)</div><div class='hunk'>@@ -293,7 +287,7 @@ static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='ctx'> 	if ((len + ofs) &gt; mtd-&gt;size)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	return part-&gt;master-&gt;unlock(part-&gt;master, ofs + part-&gt;offset, len);</div><div class='add'>+	return mtd_unlock(part-&gt;master, ofs + part-&gt;offset, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)</div><div class='hunk'>@@ -301,25 +295,25 @@ static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='ctx'> 	if ((len + ofs) &gt; mtd-&gt;size)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	return part-&gt;master-&gt;is_locked(part-&gt;master, ofs + part-&gt;offset, len);</div><div class='add'>+	return mtd_is_locked(part-&gt;master, ofs + part-&gt;offset, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void part_sync(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='del'>-	part-&gt;master-&gt;sync(part-&gt;master);</div><div class='add'>+	mtd_sync(part-&gt;master);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_suspend(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='del'>-	return part-&gt;master-&gt;suspend(part-&gt;master);</div><div class='add'>+	return mtd_suspend(part-&gt;master);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void part_resume(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='del'>-	part-&gt;master-&gt;resume(part-&gt;master);</div><div class='add'>+	mtd_resume(part-&gt;master);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_block_isbad(struct mtd_info *mtd, loff_t ofs)</div><div class='hunk'>@@ -328,7 +322,7 @@ static int part_block_isbad(struct mtd_info *mtd, loff_t ofs)</div><div class='ctx'> 	if (ofs &gt;= mtd-&gt;size)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	ofs += part-&gt;offset;</div><div class='del'>-	return part-&gt;master-&gt;block_isbad(part-&gt;master, ofs);</div><div class='add'>+	return mtd_block_isbad(part-&gt;master, ofs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_block_markbad(struct mtd_info *mtd, loff_t ofs)</div><div class='hunk'>@@ -341,7 +335,7 @@ static int part_block_markbad(struct mtd_info *mtd, loff_t ofs)</div><div class='ctx'> 	if (ofs &gt;= mtd-&gt;size)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	ofs += part-&gt;offset;</div><div class='del'>-	res = part-&gt;master-&gt;block_markbad(part-&gt;master, ofs);</div><div class='add'>+	res = mtd_block_markbad(part-&gt;master, ofs);</div><div class='ctx'> 	if (!res)</div><div class='ctx'> 		mtd-&gt;ecc_stats.badblocks++;</div><div class='ctx'> 	return res;</div><div class='hunk'>@@ -559,8 +553,7 @@ static struct mtd_part *allocate_partition(struct mtd_info *master,</div><div class='ctx'> 		uint64_t offs = 0;</div><div class='ctx'> </div><div class='ctx'> 		while (offs &lt; slave-&gt;mtd.size) {</div><div class='del'>-			if (master-&gt;block_isbad(master,</div><div class='del'>-						offs + slave-&gt;offset))</div><div class='add'>+			if (mtd_block_isbad(master, offs + slave-&gt;offset))</div><div class='ctx'> 				slave-&gt;mtd.ecc_stats.badblocks++;</div><div class='ctx'> 			offs += slave-&gt;mtd.erasesize;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/mtd/mtdswap.c b/drivers/mtd/mtdswap.c<br/>index bd9590c723e4..c92f0f6bc130 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/mtdswap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/mtdswap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/mtdswap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/mtdswap.c</a></div><div class='hunk'>@@ -274,12 +274,12 @@ static int mtdswap_handle_badblock(struct mtdswap_dev *d, struct swap_eb *eb)</div><div class='ctx'> 	eb-&gt;root = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* badblocks not supported */</div><div class='del'>-	if (!d-&gt;mtd-&gt;block_markbad)</div><div class='add'>+	if (!mtd_can_have_bb(d-&gt;mtd))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	offset = mtdswap_eb_offset(d, eb);</div><div class='ctx'> 	dev_warn(d-&gt;dev, "Marking bad block at %08llx\n", offset);</div><div class='del'>-	ret = d-&gt;mtd-&gt;block_markbad(d-&gt;mtd, offset);</div><div class='add'>+	ret = mtd_block_markbad(d-&gt;mtd, offset);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_warn(d-&gt;dev, "Mark block bad failed for block at %08llx "</div><div class='hunk'>@@ -312,7 +312,7 @@ static int mtdswap_handle_write_error(struct mtdswap_dev *d, struct swap_eb *eb)</div><div class='ctx'> static int mtdswap_read_oob(struct mtdswap_dev *d, loff_t from,</div><div class='ctx'> 			struct mtd_oob_ops *ops)</div><div class='ctx'> {</div><div class='del'>-	int ret = d-&gt;mtd-&gt;read_oob(d-&gt;mtd, from, ops);</div><div class='add'>+	int ret = mtd_read_oob(d-&gt;mtd, from, ops);</div><div class='ctx'> </div><div class='ctx'> 	if (mtd_is_bitflip(ret))</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -343,7 +343,7 @@ static int mtdswap_read_markers(struct mtdswap_dev *d, struct swap_eb *eb)</div><div class='ctx'> 	offset = mtdswap_eb_offset(d, eb);</div><div class='ctx'> </div><div class='ctx'> 	/* Check first if the block is bad. */</div><div class='del'>-	if (d-&gt;mtd-&gt;block_isbad &amp;&amp; d-&gt;mtd-&gt;block_isbad(d-&gt;mtd, offset))</div><div class='add'>+	if (mtd_can_have_bb(d-&gt;mtd) &amp;&amp; mtd_block_isbad(d-&gt;mtd, offset))</div><div class='ctx'> 		return MTDSWAP_SCANNED_BAD;</div><div class='ctx'> </div><div class='ctx'> 	ops.ooblen = 2 * d-&gt;mtd-&gt;ecclayout-&gt;oobavail;</div><div class='hunk'>@@ -403,7 +403,7 @@ static int mtdswap_write_marker(struct mtdswap_dev *d, struct swap_eb *eb,</div><div class='ctx'> 		offset = mtdswap_eb_offset(d, eb) + d-&gt;mtd-&gt;writesize;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = d-&gt;mtd-&gt;write_oob(d-&gt;mtd, offset , &amp;ops);</div><div class='add'>+	ret = mtd_write_oob(d-&gt;mtd, offset, &amp;ops);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_warn(d-&gt;dev, "Write OOB failed for block at %08llx "</div><div class='hunk'>@@ -567,7 +567,7 @@ retry:</div><div class='ctx'> 	erase.len	= mtd-&gt;erasesize;</div><div class='ctx'> 	erase.priv	= (u_long)&amp;wq;</div><div class='ctx'> </div><div class='del'>-	ret = mtd-&gt;erase(mtd, &amp;erase);</div><div class='add'>+	ret = mtd_erase(mtd, &amp;erase);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		if (retries++ &lt; MTDSWAP_ERASE_RETRIES) {</div><div class='ctx'> 			dev_warn(d-&gt;dev,</div><div class='hunk'>@@ -689,7 +689,7 @@ retry:</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	writepos = (loff_t)*bp &lt;&lt; PAGE_SHIFT;</div><div class='del'>-	ret =  mtd-&gt;write(mtd, writepos, PAGE_SIZE, &amp;retlen, buf);</div><div class='add'>+	ret =  mtd_write(mtd, writepos, PAGE_SIZE, &amp;retlen, buf);</div><div class='ctx'> 	if (ret == -EIO || mtd_is_eccerr(ret)) {</div><div class='ctx'> 		d-&gt;curr_write_pos--;</div><div class='ctx'> 		eb-&gt;active_count--;</div><div class='hunk'>@@ -736,7 +736,7 @@ static int mtdswap_move_block(struct mtdswap_dev *d, unsigned int oldblock,</div><div class='ctx'> 	retries = 0;</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='del'>-	ret = mtd-&gt;read(mtd, readpos, PAGE_SIZE, &amp;retlen, d-&gt;page_buf);</div><div class='add'>+	ret = mtd_read(mtd, readpos, PAGE_SIZE, &amp;retlen, d-&gt;page_buf);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0 &amp;&amp; !mtd_is_bitflip(ret)) {</div><div class='ctx'> 		oldeb = d-&gt;eb_data + oldblock / d-&gt;pages_per_eblk;</div><div class='hunk'>@@ -946,7 +946,7 @@ static unsigned int mtdswap_eblk_passes(struct mtdswap_dev *d,</div><div class='ctx'> 			patt = mtdswap_test_patt(test + i);</div><div class='ctx'> 			memset(d-&gt;page_buf, patt, mtd-&gt;writesize);</div><div class='ctx'> 			memset(d-&gt;oob_buf, patt, mtd-&gt;ecclayout-&gt;oobavail);</div><div class='del'>-			ret = mtd-&gt;write_oob(mtd, pos, &amp;ops);</div><div class='add'>+			ret = mtd_write_oob(mtd, pos, &amp;ops);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -955,7 +955,7 @@ static unsigned int mtdswap_eblk_passes(struct mtdswap_dev *d,</div><div class='ctx'> </div><div class='ctx'> 		pos = base;</div><div class='ctx'> 		for (i = 0; i &lt; mtd_pages; i++) {</div><div class='del'>-			ret = mtd-&gt;read_oob(mtd, pos, &amp;ops);</div><div class='add'>+			ret = mtd_read_oob(mtd, pos, &amp;ops);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -1047,8 +1047,7 @@ static int mtdswap_flush(struct mtd_blktrans_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtdswap_dev *d = MTDSWAP_MBD_TO_MTDSWAP(dev);</div><div class='ctx'> </div><div class='del'>-	if (d-&gt;mtd-&gt;sync)</div><div class='del'>-		d-&gt;mtd-&gt;sync(d-&gt;mtd);</div><div class='add'>+	mtd_sync(d-&gt;mtd);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1059,9 +1058,9 @@ static unsigned int mtdswap_badblocks(struct mtd_info *mtd, uint64_t size)</div><div class='ctx'> </div><div class='ctx'> 	badcnt = 0;</div><div class='ctx'> </div><div class='del'>-	if (mtd-&gt;block_isbad)</div><div class='add'>+	if (mtd_can_have_bb(mtd))</div><div class='ctx'> 		for (offset = 0; offset &lt; size; offset += mtd-&gt;erasesize)</div><div class='del'>-			if (mtd-&gt;block_isbad(mtd, offset))</div><div class='add'>+			if (mtd_block_isbad(mtd, offset))</div><div class='ctx'> 				badcnt++;</div><div class='ctx'> </div><div class='ctx'> 	return badcnt;</div><div class='hunk'>@@ -1161,7 +1160,7 @@ static int mtdswap_readsect(struct mtd_blktrans_dev *dev,</div><div class='ctx'> 	retries = 0;</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='del'>-	ret = mtd-&gt;read(mtd, readpos, PAGE_SIZE, &amp;retlen, buf);</div><div class='add'>+	ret = mtd_read(mtd, readpos, PAGE_SIZE, &amp;retlen, buf);</div><div class='ctx'> </div><div class='ctx'> 	d-&gt;mtd_read_count++;</div><div class='ctx'> 	if (mtd_is_bitflip(ret)) {</div><div class='head'>diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig<br/>index cce7b70824c3..31b034b7eba3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/Kconfig</a></div><div class='hunk'>@@ -110,7 +110,7 @@ config MTD_NAND_AMS_DELTA</div><div class='ctx'> </div><div class='ctx'> config MTD_NAND_OMAP2</div><div class='ctx'> 	tristate "NAND Flash device on OMAP2, OMAP3 and OMAP4"</div><div class='del'>-	depends on ARM &amp;&amp; (ARCH_OMAP2 || ARCH_OMAP3 || ARCH_OMAP4)</div><div class='add'>+	depends on ARCH_OMAP2PLUS</div><div class='ctx'> 	help</div><div class='ctx'>           Support for NAND flash on Texas Instruments OMAP2, OMAP3 and OMAP4</div><div class='ctx'> 	  platforms.</div><div class='hunk'>@@ -420,7 +420,6 @@ config MTD_NAND_NANDSIM</div><div class='ctx'> config MTD_NAND_GPMI_NAND</div><div class='ctx'>         bool "GPMI NAND Flash Controller driver"</div><div class='ctx'>         depends on MTD_NAND &amp;&amp; (SOC_IMX23 || SOC_IMX28)</div><div class='del'>-	select MTD_PARTITIONS</div><div class='ctx'> 	select MTD_CMDLINE_PARTS</div><div class='ctx'>         help</div><div class='ctx'> 	 Enables NAND Flash support for IMX23 or IMX28.</div><div class='head'>diff --git a/drivers/mtd/nand/alauda.c b/drivers/mtd/nand/alauda.c<br/>index eb40ea829ab2..6a5ff64a139e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/alauda.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/alauda.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/alauda.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/alauda.c</a></div><div class='hunk'>@@ -717,17 +717,6 @@ static struct usb_driver alauda_driver = {</div><div class='ctx'> 	.id_table =	alauda_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alauda_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;alauda_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alauda_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;alauda_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alauda_init);</div><div class='del'>-module_exit(alauda_exit);</div><div class='add'>+module_usb_driver(alauda_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c<br/>index 9e6b498c9beb..3197e9764fcd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/ams-delta.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/ams-delta.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/ams-delta.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/ams-delta.c</a></div><div class='hunk'>@@ -280,17 +280,7 @@ static struct platform_driver ams_delta_nand_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ams_delta_nand_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ams_delta_nand_driver);</div><div class='del'>-}</div><div class='del'>-module_init(ams_delta_nand_init);</div><div class='del'>-</div><div class='del'>-static void __exit ams_delta_nand_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ams_delta_nand_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(ams_delta_nand_exit);</div><div class='add'>+module_platform_driver(ams_delta_nand_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Jonathan McDowell &lt;noodles@earth.li&gt;");</div><div class='head'>diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c<br/>index 23e5d77c39fc..4dd056e2e16a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/atmel_nand.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/atmel_nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/atmel_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/atmel_nand.c</a></div><div class='hunk'>@@ -113,7 +113,7 @@ static int cpu_has_dma(void)</div><div class='ctx'>  */</div><div class='ctx'> static void atmel_nand_enable(struct atmel_nand_host *host)</div><div class='ctx'> {</div><div class='del'>-	if (host-&gt;board-&gt;enable_pin)</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;enable_pin))</div><div class='ctx'> 		gpio_set_value(host-&gt;board-&gt;enable_pin, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -122,7 +122,7 @@ static void atmel_nand_enable(struct atmel_nand_host *host)</div><div class='ctx'>  */</div><div class='ctx'> static void atmel_nand_disable(struct atmel_nand_host *host)</div><div class='ctx'> {</div><div class='del'>-	if (host-&gt;board-&gt;enable_pin)</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;enable_pin))</div><div class='ctx'> 		gpio_set_value(host-&gt;board-&gt;enable_pin, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -492,7 +492,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)</div><div class='ctx'> 	nand_chip-&gt;IO_ADDR_W = host-&gt;io_base;</div><div class='ctx'> 	nand_chip-&gt;cmd_ctrl = atmel_nand_cmd_ctrl;</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;board-&gt;rdy_pin)</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;rdy_pin))</div><div class='ctx'> 		nand_chip-&gt;dev_ready = atmel_nand_device_ready;</div><div class='ctx'> </div><div class='ctx'> 	regs = platform_get_resource(pdev, IORESOURCE_MEM, 1);</div><div class='hunk'>@@ -530,7 +530,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)</div><div class='ctx'> 	platform_set_drvdata(pdev, host);</div><div class='ctx'> 	atmel_nand_enable(host);</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;board-&gt;det_pin) {</div><div class='add'>+	if (gpio_is_valid(host-&gt;board-&gt;det_pin)) {</div><div class='ctx'> 		if (gpio_get_value(host-&gt;board-&gt;det_pin)) {</div><div class='ctx'> 			printk(KERN_INFO "No SmartMedia card inserted.\n");</div><div class='ctx'> 			res = -ENXIO;</div><div class='head'>diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c<br/>index 7dd3700f2303..73abbc3e093e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/au1550nd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/au1550nd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/au1550nd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/au1550nd.c</a></div><div class='hunk'>@@ -17,35 +17,19 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='add'>+#include &lt;asm/mach-au1x00/au1550nd.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MIPS_PB1550</div><div class='del'>-#include &lt;asm/mach-pb1x00/pb1550.h&gt;</div><div class='del'>-#elif defined(CONFIG_MIPS_DB1550)</div><div class='del'>-#include &lt;asm/mach-db1x00/db1x00.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#include &lt;asm/mach-db1x00/bcsr.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * MTD structure for NAND controller</div><div class='del'>- */</div><div class='del'>-static struct mtd_info *au1550_mtd = NULL;</div><div class='del'>-static void __iomem *p_nand;</div><div class='del'>-static int nand_width = 1;	/* default x8 */</div><div class='del'>-static void (*au1550_write_byte)(struct mtd_info *, u_char);</div><div class='add'>+struct au1550nd_ctx {</div><div class='add'>+	struct mtd_info info;</div><div class='add'>+	struct nand_chip chip;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Define partitions for flash device</div><div class='del'>- */</div><div class='del'>-static const struct mtd_partition partition_info[] = {</div><div class='del'>-	{</div><div class='del'>-	 .name = "NAND FS 0",</div><div class='del'>-	 .offset = 0,</div><div class='del'>-	 .size = 8 * 1024 * 1024},</div><div class='del'>-	{</div><div class='del'>-	 .name = "NAND FS 1",</div><div class='del'>-	 .offset = MTDPART_OFS_APPEND,</div><div class='del'>-	 .size = MTDPART_SIZ_FULL}</div><div class='add'>+	int cs;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	void (*write_byte)(struct mtd_info *, u_char);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -259,24 +243,25 @@ static int au_verify_buf16(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='ctx'> </div><div class='ctx'> static void au1550_hwcontrol(struct mtd_info *mtd, int cmd)</div><div class='ctx'> {</div><div class='del'>-	register struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct au1550nd_ctx *ctx = container_of(mtd, struct au1550nd_ctx, info);</div><div class='add'>+	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> </div><div class='ctx'> 	case NAND_CTL_SETCLE:</div><div class='del'>-		this-&gt;IO_ADDR_W = p_nand + MEM_STNAND_CMD;</div><div class='add'>+		this-&gt;IO_ADDR_W = ctx-&gt;base + MEM_STNAND_CMD;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case NAND_CTL_CLRCLE:</div><div class='del'>-		this-&gt;IO_ADDR_W = p_nand + MEM_STNAND_DATA;</div><div class='add'>+		this-&gt;IO_ADDR_W = ctx-&gt;base + MEM_STNAND_DATA;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case NAND_CTL_SETALE:</div><div class='del'>-		this-&gt;IO_ADDR_W = p_nand + MEM_STNAND_ADDR;</div><div class='add'>+		this-&gt;IO_ADDR_W = ctx-&gt;base + MEM_STNAND_ADDR;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case NAND_CTL_CLRALE:</div><div class='del'>-		this-&gt;IO_ADDR_W = p_nand + MEM_STNAND_DATA;</div><div class='add'>+		this-&gt;IO_ADDR_W = ctx-&gt;base + MEM_STNAND_DATA;</div><div class='ctx'> 		/* FIXME: Nobody knows why this is necessary,</div><div class='ctx'> 		 * but it works only that way */</div><div class='ctx'> 		udelay(1);</div><div class='hunk'>@@ -284,7 +269,7 @@ static void au1550_hwcontrol(struct mtd_info *mtd, int cmd)</div><div class='ctx'> </div><div class='ctx'> 	case NAND_CTL_SETNCE:</div><div class='ctx'> 		/* assert (force assert) chip enable */</div><div class='del'>-		au_writel((1 &lt;&lt; (4 + NAND_CS)), MEM_STNDCTL);</div><div class='add'>+		au_writel((1 &lt;&lt; (4 + ctx-&gt;cs)), MEM_STNDCTL);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case NAND_CTL_CLRNCE:</div><div class='hunk'>@@ -331,9 +316,10 @@ static void au1550_select_chip(struct mtd_info *mtd, int chip)</div><div class='ctx'>  */</div><div class='ctx'> static void au1550_command(struct mtd_info *mtd, unsigned command, int column, int page_addr)</div><div class='ctx'> {</div><div class='del'>-	register struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct au1550nd_ctx *ctx = container_of(mtd, struct au1550nd_ctx, info);</div><div class='add'>+	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	int ce_override = 0, i;</div><div class='del'>-	ulong flags;</div><div class='add'>+	unsigned long flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Begin command latch cycle */</div><div class='ctx'> 	au1550_hwcontrol(mtd, NAND_CTL_SETCLE);</div><div class='hunk'>@@ -354,9 +340,9 @@ static void au1550_command(struct mtd_info *mtd, unsigned command, int column, i</div><div class='ctx'> 			column -= 256;</div><div class='ctx'> 			readcmd = NAND_CMD_READ1;</div><div class='ctx'> 		}</div><div class='del'>-		au1550_write_byte(mtd, readcmd);</div><div class='add'>+		ctx-&gt;write_byte(mtd, readcmd);</div><div class='ctx'> 	}</div><div class='del'>-	au1550_write_byte(mtd, command);</div><div class='add'>+	ctx-&gt;write_byte(mtd, command);</div><div class='ctx'> </div><div class='ctx'> 	/* Set ALE and clear CLE to start address cycle */</div><div class='ctx'> 	au1550_hwcontrol(mtd, NAND_CTL_CLRCLE);</div><div class='hunk'>@@ -369,10 +355,10 @@ static void au1550_command(struct mtd_info *mtd, unsigned command, int column, i</div><div class='ctx'> 			/* Adjust columns for 16 bit buswidth */</div><div class='ctx'> 			if (this-&gt;options &amp; NAND_BUSWIDTH_16)</div><div class='ctx'> 				column &gt;&gt;= 1;</div><div class='del'>-			au1550_write_byte(mtd, column);</div><div class='add'>+			ctx-&gt;write_byte(mtd, column);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (page_addr != -1) {</div><div class='del'>-			au1550_write_byte(mtd, (u8)(page_addr &amp; 0xff));</div><div class='add'>+			ctx-&gt;write_byte(mtd, (u8)(page_addr &amp; 0xff));</div><div class='ctx'> </div><div class='ctx'> 			if (command == NAND_CMD_READ0 ||</div><div class='ctx'> 			    command == NAND_CMD_READ1 ||</div><div class='hunk'>@@ -390,11 +376,12 @@ static void au1550_command(struct mtd_info *mtd, unsigned command, int column, i</div><div class='ctx'> 				au1550_hwcontrol(mtd, NAND_CTL_SETNCE);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			au1550_write_byte(mtd, (u8)(page_addr &gt;&gt; 8));</div><div class='add'>+			ctx-&gt;write_byte(mtd, (u8)(page_addr &gt;&gt; 8));</div><div class='ctx'> </div><div class='ctx'> 			/* One more address cycle for devices &gt; 32MiB */</div><div class='ctx'> 			if (this-&gt;chipsize &gt; (32 &lt;&lt; 20))</div><div class='del'>-				au1550_write_byte(mtd, (u8)((page_addr &gt;&gt; 16) &amp; 0x0f));</div><div class='add'>+				ctx-&gt;write_byte(mtd,</div><div class='add'>+						((page_addr &gt;&gt; 16) &amp; 0x0f));</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Latch in address */</div><div class='ctx'> 		au1550_hwcontrol(mtd, NAND_CTL_CLRALE);</div><div class='hunk'>@@ -440,121 +427,79 @@ static void au1550_command(struct mtd_info *mtd, unsigned command, int column, i</div><div class='ctx'> 	while(!this-&gt;dev_ready(mtd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Main initialization routine</div><div class='del'>- */</div><div class='del'>-static int __init au1xxx_nand_init(void)</div><div class='add'>+static int __devinit find_nand_cs(unsigned long nand_base)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this;</div><div class='del'>-	u16 boot_swapboot = 0;	/* default value */</div><div class='del'>-	int retval;</div><div class='del'>-	u32 mem_staddr;</div><div class='del'>-	u32 nand_phys;</div><div class='del'>-</div><div class='del'>-	/* Allocate memory for MTD device structure and private data */</div><div class='del'>-	au1550_mtd = kzalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);</div><div class='del'>-	if (!au1550_mtd) {</div><div class='del'>-		printk("Unable to allocate NAND MTD dev structure.\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get pointer to private data */</div><div class='del'>-	this = (struct nand_chip *)(&amp;au1550_mtd[1]);</div><div class='del'>-</div><div class='del'>-	/* Link the private data with the MTD structure */</div><div class='del'>-	au1550_mtd-&gt;priv = this;</div><div class='del'>-	au1550_mtd-&gt;owner = THIS_MODULE;</div><div class='del'>-</div><div class='add'>+	void __iomem *base =</div><div class='add'>+			(void __iomem *)KSEG1ADDR(AU1000_STATIC_MEM_PHYS_ADDR);</div><div class='add'>+	unsigned long addr, staddr, start, mask, end;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	/* MEM_STNDCTL: disable ints, disable nand boot */</div><div class='del'>-	au_writel(0, MEM_STNDCTL);</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		addr = 0x1000 + (i * 0x10);			/* CSx */</div><div class='add'>+		staddr = __raw_readl(base + addr + 0x08);	/* STADDRx */</div><div class='add'>+		/* figure out the decoded range of this CS */</div><div class='add'>+		start = (staddr &lt;&lt; 4) &amp; 0xfffc0000;</div><div class='add'>+		mask = (staddr &lt;&lt; 18) &amp; 0xfffc0000;</div><div class='add'>+		end = (start | (start - 1)) &amp; ~(start ^ mask);</div><div class='add'>+		if ((nand_base &gt;= start) &amp;&amp; (nand_base &lt; end))</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MIPS_PB1550</div><div class='del'>-	/* set gpio206 high */</div><div class='del'>-	gpio_direction_input(206);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	boot_swapboot = (au_readl(MEM_STSTAT) &amp; (0x7 &lt;&lt; 1)) | ((bcsr_read(BCSR_STATUS) &gt;&gt; 6) &amp; 0x1);</div><div class='add'>+static int __devinit au1550nd_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct au1550nd_platdata *pd;</div><div class='add'>+	struct au1550nd_ctx *ctx;</div><div class='add'>+	struct nand_chip *this;</div><div class='add'>+	struct resource *r;</div><div class='add'>+	int ret, cs;</div><div class='ctx'> </div><div class='del'>-	switch (boot_swapboot) {</div><div class='del'>-	case 0:</div><div class='del'>-	case 2:</div><div class='del'>-	case 8:</div><div class='del'>-	case 0xC:</div><div class='del'>-	case 0xD:</div><div class='del'>-		/* x16 NAND Flash */</div><div class='del'>-		nand_width = 0;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-	case 9:</div><div class='del'>-	case 3:</div><div class='del'>-	case 0xE:</div><div class='del'>-	case 0xF:</div><div class='del'>-		/* x8 NAND Flash */</div><div class='del'>-		nand_width = 1;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk("Pb1550 NAND: bad boot:swap\n");</div><div class='del'>-		retval = -EINVAL;</div><div class='del'>-		goto outmem;</div><div class='add'>+	pd = pdev-&gt;dev.platform_data;</div><div class='add'>+	if (!pd) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "missing platform data\n");</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Configure chip-select; normally done by boot code, e.g. YAMON */</div><div class='del'>-#ifdef NAND_STCFG</div><div class='del'>-	if (NAND_CS == 0) {</div><div class='del'>-		au_writel(NAND_STCFG,  MEM_STCFG0);</div><div class='del'>-		au_writel(NAND_STTIME, MEM_STTIME0);</div><div class='del'>-		au_writel(NAND_STADDR, MEM_STADDR0);</div><div class='del'>-	}</div><div class='del'>-	if (NAND_CS == 1) {</div><div class='del'>-		au_writel(NAND_STCFG,  MEM_STCFG1);</div><div class='del'>-		au_writel(NAND_STTIME, MEM_STTIME1);</div><div class='del'>-		au_writel(NAND_STADDR, MEM_STADDR1);</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+	if (!ctx) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "no memory for NAND context\n");</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	if (NAND_CS == 2) {</div><div class='del'>-		au_writel(NAND_STCFG,  MEM_STCFG2);</div><div class='del'>-		au_writel(NAND_STTIME, MEM_STTIME2);</div><div class='del'>-		au_writel(NAND_STADDR, MEM_STADDR2);</div><div class='add'>+</div><div class='add'>+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!r) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "no NAND memory resource\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out1;</div><div class='ctx'> 	}</div><div class='del'>-	if (NAND_CS == 3) {</div><div class='del'>-		au_writel(NAND_STCFG,  MEM_STCFG3);</div><div class='del'>-		au_writel(NAND_STTIME, MEM_STTIME3);</div><div class='del'>-		au_writel(NAND_STADDR, MEM_STADDR3);</div><div class='add'>+	if (request_mem_region(r-&gt;start, resource_size(r), "au1550-nand")) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot claim NAND memory area\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out1;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Locate NAND chip-select in order to determine NAND phys address */</div><div class='del'>-	mem_staddr = 0x00000000;</div><div class='del'>-	if (((au_readl(MEM_STCFG0) &amp; 0x7) == 0x5) &amp;&amp; (NAND_CS == 0))</div><div class='del'>-		mem_staddr = au_readl(MEM_STADDR0);</div><div class='del'>-	else if (((au_readl(MEM_STCFG1) &amp; 0x7) == 0x5) &amp;&amp; (NAND_CS == 1))</div><div class='del'>-		mem_staddr = au_readl(MEM_STADDR1);</div><div class='del'>-	else if (((au_readl(MEM_STCFG2) &amp; 0x7) == 0x5) &amp;&amp; (NAND_CS == 2))</div><div class='del'>-		mem_staddr = au_readl(MEM_STADDR2);</div><div class='del'>-	else if (((au_readl(MEM_STCFG3) &amp; 0x7) == 0x5) &amp;&amp; (NAND_CS == 3))</div><div class='del'>-		mem_staddr = au_readl(MEM_STADDR3);</div><div class='del'>-</div><div class='del'>-	if (mem_staddr == 0x00000000) {</div><div class='del'>-		printk("Au1xxx NAND: ERROR WITH NAND CHIP-SELECT\n");</div><div class='del'>-		kfree(au1550_mtd);</div><div class='del'>-		return 1;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;base = ioremap_nocache(r-&gt;start, 0x1000);</div><div class='add'>+	if (!ctx-&gt;base) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot remap NAND memory area\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out2;</div><div class='ctx'> 	}</div><div class='del'>-	nand_phys = (mem_staddr &lt;&lt; 4) &amp; 0xFFFC0000;</div><div class='ctx'> </div><div class='del'>-	p_nand = ioremap(nand_phys, 0x1000);</div><div class='add'>+	this = &amp;ctx-&gt;chip;</div><div class='add'>+	ctx-&gt;info.priv = this;</div><div class='add'>+	ctx-&gt;info.owner = THIS_MODULE;</div><div class='ctx'> </div><div class='del'>-	/* make controller and MTD agree */</div><div class='del'>-	if (NAND_CS == 0)</div><div class='del'>-		nand_width = au_readl(MEM_STCFG0) &amp; (1 &lt;&lt; 22);</div><div class='del'>-	if (NAND_CS == 1)</div><div class='del'>-		nand_width = au_readl(MEM_STCFG1) &amp; (1 &lt;&lt; 22);</div><div class='del'>-	if (NAND_CS == 2)</div><div class='del'>-		nand_width = au_readl(MEM_STCFG2) &amp; (1 &lt;&lt; 22);</div><div class='del'>-	if (NAND_CS == 3)</div><div class='del'>-		nand_width = au_readl(MEM_STCFG3) &amp; (1 &lt;&lt; 22);</div><div class='add'>+	/* figure out which CS# r-&gt;start belongs to */</div><div class='add'>+	cs = find_nand_cs(r-&gt;start);</div><div class='add'>+	if (cs &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot detect NAND chipselect\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out3;</div><div class='add'>+	}</div><div class='add'>+	ctx-&gt;cs = cs;</div><div class='ctx'> </div><div class='del'>-	/* Set address of hardware control function */</div><div class='ctx'> 	this-&gt;dev_ready = au1550_device_ready;</div><div class='ctx'> 	this-&gt;select_chip = au1550_select_chip;</div><div class='ctx'> 	this-&gt;cmdfunc = au1550_command;</div><div class='hunk'>@@ -565,54 +510,57 @@ static int __init au1xxx_nand_init(void)</div><div class='ctx'> </div><div class='ctx'> 	this-&gt;options = NAND_NO_AUTOINCR;</div><div class='ctx'> </div><div class='del'>-	if (!nand_width)</div><div class='add'>+	if (pd-&gt;devwidth)</div><div class='ctx'> 		this-&gt;options |= NAND_BUSWIDTH_16;</div><div class='ctx'> </div><div class='del'>-	this-&gt;read_byte = (!nand_width) ? au_read_byte16 : au_read_byte;</div><div class='del'>-	au1550_write_byte = (!nand_width) ? au_write_byte16 : au_write_byte;</div><div class='add'>+	this-&gt;read_byte = (pd-&gt;devwidth) ? au_read_byte16 : au_read_byte;</div><div class='add'>+	ctx-&gt;write_byte = (pd-&gt;devwidth) ? au_write_byte16 : au_write_byte;</div><div class='ctx'> 	this-&gt;read_word = au_read_word;</div><div class='del'>-	this-&gt;write_buf = (!nand_width) ? au_write_buf16 : au_write_buf;</div><div class='del'>-	this-&gt;read_buf = (!nand_width) ? au_read_buf16 : au_read_buf;</div><div class='del'>-	this-&gt;verify_buf = (!nand_width) ? au_verify_buf16 : au_verify_buf;</div><div class='del'>-</div><div class='del'>-	/* Scan to find existence of the device */</div><div class='del'>-	if (nand_scan(au1550_mtd, 1)) {</div><div class='del'>-		retval = -ENXIO;</div><div class='del'>-		goto outio;</div><div class='add'>+	this-&gt;write_buf = (pd-&gt;devwidth) ? au_write_buf16 : au_write_buf;</div><div class='add'>+	this-&gt;read_buf = (pd-&gt;devwidth) ? au_read_buf16 : au_read_buf;</div><div class='add'>+	this-&gt;verify_buf = (pd-&gt;devwidth) ? au_verify_buf16 : au_verify_buf;</div><div class='add'>+</div><div class='add'>+	ret = nand_scan(&amp;ctx-&gt;info, 1);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "NAND scan failed with %d\n", ret);</div><div class='add'>+		goto out3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Register the partitions */</div><div class='del'>-	mtd_device_register(au1550_mtd, partition_info,</div><div class='del'>-			    ARRAY_SIZE(partition_info));</div><div class='add'>+	mtd_device_register(&amp;ctx-&gt;info, pd-&gt;parts, pd-&gt;num_parts);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- outio:</div><div class='del'>-	iounmap(p_nand);</div><div class='del'>-</div><div class='del'>- outmem:</div><div class='del'>-	kfree(au1550_mtd);</div><div class='del'>-	return retval;</div><div class='add'>+out3:</div><div class='add'>+	iounmap(ctx-&gt;base);</div><div class='add'>+out2:</div><div class='add'>+	release_mem_region(r-&gt;start, resource_size(r));</div><div class='add'>+out1:</div><div class='add'>+	kfree(ctx);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(au1xxx_nand_init);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Clean up routine</div><div class='del'>- */</div><div class='del'>-static void __exit au1550_cleanup(void)</div><div class='add'>+static int __devexit au1550nd_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	/* Release resources, unregister device */</div><div class='del'>-	nand_release(au1550_mtd);</div><div class='add'>+	struct au1550nd_ctx *ctx = platform_get_drvdata(pdev);</div><div class='add'>+	struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> </div><div class='del'>-	/* Free the MTD device structure */</div><div class='del'>-	kfree(au1550_mtd);</div><div class='del'>-</div><div class='del'>-	/* Unmap */</div><div class='del'>-	iounmap(p_nand);</div><div class='add'>+	nand_release(&amp;ctx-&gt;info);</div><div class='add'>+	iounmap(ctx-&gt;base);</div><div class='add'>+	release_mem_region(r-&gt;start, 0x1000);</div><div class='add'>+	kfree(ctx);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_exit(au1550_cleanup);</div><div class='add'>+static struct platform_driver au1550nd_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "au1550-nand",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe		= au1550nd_probe,</div><div class='add'>+	.remove		= __devexit_p(au1550nd_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(au1550nd_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Embedded Edge, LLC");</div><div class='head'>diff --git a/drivers/mtd/nand/bcm_umi_nand.c b/drivers/mtd/nand/bcm_umi_nand.c<br/>index 46b58d672847..50387fd4009b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/bcm_umi_nand.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/bcm_umi_nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/bcm_umi_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/bcm_umi_nand.c</a></div><div class='hunk'>@@ -546,18 +546,7 @@ static struct platform_driver nand_driver = {</div><div class='ctx'> 	.resume = bcm_umi_nand_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init nand_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;nand_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nand_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;nand_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(nand_init);</div><div class='del'>-module_exit(nand_exit);</div><div class='add'>+module_platform_driver(nand_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Broadcom");</div><div class='head'>diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c<br/>index c153e1f77f90..6e566156956f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/davinci_nand.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/davinci_nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/davinci_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/davinci_nand.c</a></div><div class='hunk'>@@ -675,7 +675,9 @@ static int __init nand_davinci_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	davinci_nand_writel(info, A1CR_OFFSET + info-&gt;core_chipsel * 4, val);</div><div class='ctx'> </div><div class='del'>-	ret = davinci_aemif_setup_timing(info-&gt;timing, info-&gt;base,</div><div class='add'>+	ret = 0;</div><div class='add'>+	if (info-&gt;timing)</div><div class='add'>+		ret = davinci_aemif_setup_timing(info-&gt;timing, info-&gt;base,</div><div class='ctx'> 							info-&gt;core_chipsel);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_dbg(&amp;pdev-&gt;dev, "NAND timing values setup fail\n");</div><div class='head'>diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c<br/>index 5780dbab6113..df921e7a496c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/diskonchip.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/diskonchip.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/diskonchip.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/diskonchip.c</a></div><div class='hunk'>@@ -1072,7 +1072,7 @@ static int __init find_media_headers(struct mtd_info *mtd, u_char *buf, const ch</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> </div><div class='ctx'> 	for (offs = 0; offs &lt; mtd-&gt;size; offs += mtd-&gt;erasesize) {</div><div class='del'>-		ret = mtd-&gt;read(mtd, offs, mtd-&gt;writesize, &amp;retlen, buf);</div><div class='add'>+		ret = mtd_read(mtd, offs, mtd-&gt;writesize, &amp;retlen, buf);</div><div class='ctx'> 		if (retlen != mtd-&gt;writesize)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -1097,7 +1097,7 @@ static int __init find_media_headers(struct mtd_info *mtd, u_char *buf, const ch</div><div class='ctx'> 	/* Only one mediaheader was found.  We want buf to contain a</div><div class='ctx'> 	   mediaheader on return, so we'll have to re-read the one we found. */</div><div class='ctx'> 	offs = doc-&gt;mh0_page &lt;&lt; this-&gt;page_shift;</div><div class='del'>-	ret = mtd-&gt;read(mtd, offs, mtd-&gt;writesize, &amp;retlen, buf);</div><div class='add'>+	ret = mtd_read(mtd, offs, mtd-&gt;writesize, &amp;retlen, buf);</div><div class='ctx'> 	if (retlen != mtd-&gt;writesize) {</div><div class='ctx'> 		/* Insanity.  Give up. */</div><div class='ctx'> 		printk(KERN_ERR "Read DiskOnChip Media Header once, but can't reread it???\n");</div><div class='head'>diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c<br/>index eedd8ee2c9ac..7195ee6efe12 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/fsl_elbc_nand.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/fsl_elbc_nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/fsl_elbc_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/fsl_elbc_nand.c</a></div><div class='hunk'>@@ -166,15 +166,22 @@ static void set_addr(struct mtd_info *mtd, int column, int page_addr, int oob)</div><div class='ctx'> </div><div class='ctx'> 	elbc_fcm_ctrl-&gt;page = page_addr;</div><div class='ctx'> </div><div class='del'>-	out_be32(&amp;lbc-&gt;fbar,</div><div class='del'>-	         page_addr &gt;&gt; (chip-&gt;phys_erase_shift - chip-&gt;page_shift));</div><div class='del'>-</div><div class='ctx'> 	if (priv-&gt;page_size) {</div><div class='add'>+		/*</div><div class='add'>+		 * large page size chip : FPAR[PI] save the lowest 6 bits,</div><div class='add'>+		 *                        FBAR[BLK] save the other bits.</div><div class='add'>+		 */</div><div class='add'>+		out_be32(&amp;lbc-&gt;fbar, page_addr &gt;&gt; 6);</div><div class='ctx'> 		out_be32(&amp;lbc-&gt;fpar,</div><div class='ctx'> 		         ((page_addr &lt;&lt; FPAR_LP_PI_SHIFT) &amp; FPAR_LP_PI) |</div><div class='ctx'> 		         (oob ? FPAR_LP_MS : 0) | column);</div><div class='ctx'> 		buf_num = (page_addr &amp; 1) &lt;&lt; 2;</div><div class='ctx'> 	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * small page size chip : FPAR[PI] save the lowest 5 bits,</div><div class='add'>+		 *                        FBAR[BLK] save the other bits.</div><div class='add'>+		 */</div><div class='add'>+		out_be32(&amp;lbc-&gt;fbar, page_addr &gt;&gt; 5);</div><div class='ctx'> 		out_be32(&amp;lbc-&gt;fpar,</div><div class='ctx'> 		         ((page_addr &lt;&lt; FPAR_SP_PI_SHIFT) &amp; FPAR_SP_PI) |</div><div class='ctx'> 		         (oob ? FPAR_SP_MS : 0) | column);</div><div class='hunk'>@@ -349,20 +356,22 @@ static void fsl_elbc_cmdfunc(struct mtd_info *mtd, unsigned int command,</div><div class='ctx'> 		fsl_elbc_run_command(mtd);</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* READID must read all 5 possible bytes while CEB is active */</div><div class='ctx'> 	case NAND_CMD_READID:</div><div class='del'>-		dev_vdbg(priv-&gt;dev, "fsl_elbc_cmdfunc: NAND_CMD_READID.\n");</div><div class='add'>+	case NAND_CMD_PARAM:</div><div class='add'>+		dev_vdbg(priv-&gt;dev, "fsl_elbc_cmdfunc: NAND_CMD %x\n", command);</div><div class='ctx'> </div><div class='ctx'> 		out_be32(&amp;lbc-&gt;fir, (FIR_OP_CM0 &lt;&lt; FIR_OP0_SHIFT) |</div><div class='ctx'> 		                    (FIR_OP_UA  &lt;&lt; FIR_OP1_SHIFT) |</div><div class='ctx'> 		                    (FIR_OP_RBW &lt;&lt; FIR_OP2_SHIFT));</div><div class='del'>-		out_be32(&amp;lbc-&gt;fcr, NAND_CMD_READID &lt;&lt; FCR_CMD0_SHIFT);</div><div class='del'>-		/* nand_get_flash_type() reads 8 bytes of entire ID string */</div><div class='del'>-		out_be32(&amp;lbc-&gt;fbcr, 8);</div><div class='del'>-		elbc_fcm_ctrl-&gt;read_bytes = 8;</div><div class='add'>+		out_be32(&amp;lbc-&gt;fcr, command &lt;&lt; FCR_CMD0_SHIFT);</div><div class='add'>+		/*</div><div class='add'>+		 * although currently it's 8 bytes for READID, we always read</div><div class='add'>+		 * the maximum 256 bytes(for PARAM)</div><div class='add'>+		 */</div><div class='add'>+		out_be32(&amp;lbc-&gt;fbcr, 256);</div><div class='add'>+		elbc_fcm_ctrl-&gt;read_bytes = 256;</div><div class='ctx'> 		elbc_fcm_ctrl-&gt;use_mdr = 1;</div><div class='del'>-		elbc_fcm_ctrl-&gt;mdr = 0;</div><div class='del'>-</div><div class='add'>+		elbc_fcm_ctrl-&gt;mdr = column;</div><div class='ctx'> 		set_addr(mtd, 0, 0, 0);</div><div class='ctx'> 		fsl_elbc_run_command(mtd);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -407,9 +416,17 @@ static void fsl_elbc_cmdfunc(struct mtd_info *mtd, unsigned int command,</div><div class='ctx'> 		         page_addr, column);</div><div class='ctx'> </div><div class='ctx'> 		elbc_fcm_ctrl-&gt;column = column;</div><div class='del'>-		elbc_fcm_ctrl-&gt;oob = 0;</div><div class='ctx'> 		elbc_fcm_ctrl-&gt;use_mdr = 1;</div><div class='ctx'> </div><div class='add'>+		if (column &gt;= mtd-&gt;writesize) {</div><div class='add'>+			/* OOB area */</div><div class='add'>+			column -= mtd-&gt;writesize;</div><div class='add'>+			elbc_fcm_ctrl-&gt;oob = 1;</div><div class='add'>+		} else {</div><div class='add'>+			WARN_ON(column != 0);</div><div class='add'>+			elbc_fcm_ctrl-&gt;oob = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		fcr = (NAND_CMD_STATUS   &lt;&lt; FCR_CMD1_SHIFT) |</div><div class='ctx'> 		      (NAND_CMD_SEQIN    &lt;&lt; FCR_CMD2_SHIFT) |</div><div class='ctx'> 		      (NAND_CMD_PAGEPROG &lt;&lt; FCR_CMD3_SHIFT);</div><div class='hunk'>@@ -434,16 +451,12 @@ static void fsl_elbc_cmdfunc(struct mtd_info *mtd, unsigned int command,</div><div class='ctx'> 			         (FIR_OP_CW1 &lt;&lt; FIR_OP6_SHIFT) |</div><div class='ctx'> 			         (FIR_OP_RS  &lt;&lt; FIR_OP7_SHIFT));</div><div class='ctx'> </div><div class='del'>-			if (column &gt;= mtd-&gt;writesize) {</div><div class='add'>+			if (elbc_fcm_ctrl-&gt;oob)</div><div class='ctx'> 				/* OOB area --&gt; READOOB */</div><div class='del'>-				column -= mtd-&gt;writesize;</div><div class='ctx'> 				fcr |= NAND_CMD_READOOB &lt;&lt; FCR_CMD0_SHIFT;</div><div class='del'>-				elbc_fcm_ctrl-&gt;oob = 1;</div><div class='del'>-			} else {</div><div class='del'>-				WARN_ON(column != 0);</div><div class='add'>+			else</div><div class='ctx'> 				/* First 256 bytes --&gt; READ0 */</div><div class='ctx'> 				fcr |= NAND_CMD_READ0 &lt;&lt; FCR_CMD0_SHIFT;</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		out_be32(&amp;lbc-&gt;fcr, fcr);</div><div class='hunk'>@@ -463,7 +476,8 @@ static void fsl_elbc_cmdfunc(struct mtd_info *mtd, unsigned int command,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (elbc_fcm_ctrl-&gt;oob || elbc_fcm_ctrl-&gt;column != 0 ||</div><div class='ctx'> 		    elbc_fcm_ctrl-&gt;index != mtd-&gt;writesize + mtd-&gt;oobsize)</div><div class='del'>-			out_be32(&amp;lbc-&gt;fbcr, elbc_fcm_ctrl-&gt;index);</div><div class='add'>+			out_be32(&amp;lbc-&gt;fbcr,</div><div class='add'>+				elbc_fcm_ctrl-&gt;index - elbc_fcm_ctrl-&gt;column);</div><div class='ctx'> 		else</div><div class='ctx'> 			out_be32(&amp;lbc-&gt;fbcr, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -659,9 +673,7 @@ static int fsl_elbc_chip_init_tail(struct mtd_info *mtd)</div><div class='ctx'> 	if (chip-&gt;pagemask &amp; 0xff000000)</div><div class='ctx'> 		al++;</div><div class='ctx'> </div><div class='del'>-	/* add to ECCM mode set in fsl_elbc_init */</div><div class='del'>-	priv-&gt;fmr |= (12 &lt;&lt; FMR_CWTO_SHIFT) |  /* Timeout &gt; 12 ms */</div><div class='del'>-	             (al &lt;&lt; FMR_AL_SHIFT);</div><div class='add'>+	priv-&gt;fmr |= al &lt;&lt; FMR_AL_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(priv-&gt;dev, "fsl_elbc_init: nand-&gt;numchips = %d\n",</div><div class='ctx'> 	        chip-&gt;numchips);</div><div class='hunk'>@@ -764,8 +776,10 @@ static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)</div><div class='ctx'> 	priv-&gt;mtd.priv = chip;</div><div class='ctx'> 	priv-&gt;mtd.owner = THIS_MODULE;</div><div class='ctx'> </div><div class='del'>-	/* Set the ECCM according to the settings in bootloader.*/</div><div class='del'>-	priv-&gt;fmr = in_be32(&amp;lbc-&gt;fmr) &amp; FMR_ECCM;</div><div class='add'>+	/* set timeout to maximum */</div><div class='add'>+	priv-&gt;fmr = 15 &lt;&lt; FMR_CWTO_SHIFT;</div><div class='add'>+	if (in_be32(&amp;lbc-&gt;bank[priv-&gt;bank].or) &amp; OR_FCM_PGS)</div><div class='add'>+		priv-&gt;fmr |= FMR_ECCM;</div><div class='ctx'> </div><div class='ctx'> 	/* fill in nand_chip structure */</div><div class='ctx'> 	/* set up function call table */</div><div class='hunk'>@@ -971,18 +985,7 @@ static struct platform_driver fsl_elbc_nand_driver = {</div><div class='ctx'> 	.remove = fsl_elbc_nand_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init fsl_elbc_nand_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;fsl_elbc_nand_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit fsl_elbc_nand_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;fsl_elbc_nand_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(fsl_elbc_nand_init);</div><div class='del'>-module_exit(fsl_elbc_nand_exit);</div><div class='add'>+module_platform_driver(fsl_elbc_nand_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Freescale");</div><div class='head'>diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c<br/>index b4f3cc9f32fb..45df542b9c61 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/fsl_upm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/fsl_upm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/fsl_upm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/fsl_upm.c</a></div><div class='hunk'>@@ -353,17 +353,7 @@ static struct platform_driver of_fun_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(fun_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init fun_module_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;of_fun_driver);</div><div class='del'>-}</div><div class='del'>-module_init(fun_module_init);</div><div class='del'>-</div><div class='del'>-static void __exit fun_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;of_fun_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(fun_module_exit);</div><div class='add'>+module_platform_driver(of_fun_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Anton Vorontsov &lt;avorontsov@ru.mvista.com&gt;");</div><div class='head'>diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c<br/>index 2c2060b2800e..27000a5f5f47 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/gpio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/gpio.c</a></div><div class='hunk'>@@ -27,6 +27,9 @@</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/nand-gpio.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/of_gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct gpiomtd {</div><div class='ctx'> 	void __iomem		*io_sync;</div><div class='hunk'>@@ -171,6 +174,96 @@ static int gpio_nand_devready(struct mtd_info *mtd)</div><div class='ctx'> 	return gpio_get_value(gpiomtd-&gt;plat.gpio_rdy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+static const struct of_device_id gpio_nand_id_table[] = {</div><div class='add'>+	{ .compatible = "gpio-control-nand" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, gpio_nand_id_table);</div><div class='add'>+</div><div class='add'>+static int gpio_nand_get_config_of(const struct device *dev,</div><div class='add'>+				   struct gpio_nand_platdata *plat)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (!of_property_read_u32(dev-&gt;of_node, "bank-width", &amp;val)) {</div><div class='add'>+		if (val == 2) {</div><div class='add'>+			plat-&gt;options |= NAND_BUSWIDTH_16;</div><div class='add'>+		} else if (val != 1) {</div><div class='add'>+			dev_err(dev, "invalid bank-width %u\n", val);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	plat-&gt;gpio_rdy = of_get_gpio(dev-&gt;of_node, 0);</div><div class='add'>+	plat-&gt;gpio_nce = of_get_gpio(dev-&gt;of_node, 1);</div><div class='add'>+	plat-&gt;gpio_ale = of_get_gpio(dev-&gt;of_node, 2);</div><div class='add'>+	plat-&gt;gpio_cle = of_get_gpio(dev-&gt;of_node, 3);</div><div class='add'>+	plat-&gt;gpio_nwp = of_get_gpio(dev-&gt;of_node, 4);</div><div class='add'>+</div><div class='add'>+	if (!of_property_read_u32(dev-&gt;of_node, "chip-delay", &amp;val))</div><div class='add'>+		plat-&gt;chip_delay = val;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct resource *gpio_nand_get_io_sync_of(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct resource *r = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*r), GFP_KERNEL);</div><div class='add'>+	u64 addr;</div><div class='add'>+</div><div class='add'>+	if (!r || of_property_read_u64(pdev-&gt;dev.of_node,</div><div class='add'>+				       "gpio-control-nand,io-sync-reg", &amp;addr))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	r-&gt;start = addr;</div><div class='add'>+	r-&gt;end = r-&gt;start + 0x3;</div><div class='add'>+	r-&gt;flags = IORESOURCE_MEM;</div><div class='add'>+</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+#else /* CONFIG_OF */</div><div class='add'>+#define gpio_nand_id_table NULL</div><div class='add'>+static inline int gpio_nand_get_config_of(const struct device *dev,</div><div class='add'>+					  struct gpio_nand_platdata *plat)</div><div class='add'>+{</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct resource *</div><div class='add'>+gpio_nand_get_io_sync_of(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_OF */</div><div class='add'>+</div><div class='add'>+static inline int gpio_nand_get_config(const struct device *dev,</div><div class='add'>+				       struct gpio_nand_platdata *plat)</div><div class='add'>+{</div><div class='add'>+	int ret = gpio_nand_get_config_of(dev, plat);</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 (dev-&gt;platform_data) {</div><div class='add'>+		memcpy(plat, dev-&gt;platform_data, sizeof(*plat));</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 inline struct resource *</div><div class='add'>+gpio_nand_get_io_sync(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct resource *r = gpio_nand_get_io_sync_of(pdev);</div><div class='add'>+</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	return platform_get_resource(pdev, IORESOURCE_MEM, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __devexit gpio_nand_remove(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct gpiomtd *gpiomtd = platform_get_drvdata(dev);</div><div class='hunk'>@@ -178,7 +271,7 @@ static int __devexit gpio_nand_remove(struct platform_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	nand_release(&amp;gpiomtd-&gt;mtd_info);</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource(dev, IORESOURCE_MEM, 1);</div><div class='add'>+	res = gpio_nand_get_io_sync(dev);</div><div class='ctx'> 	iounmap(gpiomtd-&gt;io_sync);</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		release_mem_region(res-&gt;start, resource_size(res));</div><div class='hunk'>@@ -226,9 +319,10 @@ static int __devinit gpio_nand_probe(struct platform_device *dev)</div><div class='ctx'> 	struct gpiomtd *gpiomtd;</div><div class='ctx'> 	struct nand_chip *this;</div><div class='ctx'> 	struct resource *res0, *res1;</div><div class='del'>-	int ret;</div><div class='add'>+	struct mtd_part_parser_data ppdata = {};</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;dev.platform_data)</div><div class='add'>+	if (!dev-&gt;dev.of_node &amp;&amp; !dev-&gt;dev.platform_data)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	res0 = platform_get_resource(dev, IORESOURCE_MEM, 0);</div><div class='hunk'>@@ -248,7 +342,7 @@ static int __devinit gpio_nand_probe(struct platform_device *dev)</div><div class='ctx'> 		goto err_map;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	res1 = platform_get_resource(dev, IORESOURCE_MEM, 1);</div><div class='add'>+	res1 = gpio_nand_get_io_sync(dev);</div><div class='ctx'> 	if (res1) {</div><div class='ctx'> 		gpiomtd-&gt;io_sync = request_and_remap(res1, 4, "NAND sync", &amp;ret);</div><div class='ctx'> 		if (!gpiomtd-&gt;io_sync) {</div><div class='hunk'>@@ -257,7 +351,9 @@ static int __devinit gpio_nand_probe(struct platform_device *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;gpiomtd-&gt;plat, dev-&gt;dev.platform_data, sizeof(gpiomtd-&gt;plat));</div><div class='add'>+	ret = gpio_nand_get_config(&amp;dev-&gt;dev, &amp;gpiomtd-&gt;plat);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_nce;</div><div class='ctx'> </div><div class='ctx'> 	ret = gpio_request(gpiomtd-&gt;plat.gpio_nce, "NAND NCE");</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -316,8 +412,12 @@ static int __devinit gpio_nand_probe(struct platform_device *dev)</div><div class='ctx'> 		gpiomtd-&gt;plat.adjust_parts(&amp;gpiomtd-&gt;plat,</div><div class='ctx'> 					   gpiomtd-&gt;mtd_info.size);</div><div class='ctx'> </div><div class='del'>-	mtd_device_register(&amp;gpiomtd-&gt;mtd_info, gpiomtd-&gt;plat.parts,</div><div class='del'>-			    gpiomtd-&gt;plat.num_parts);</div><div class='add'>+	ppdata.of_node = dev-&gt;dev.of_node;</div><div class='add'>+	ret = mtd_device_parse_register(&amp;gpiomtd-&gt;mtd_info, NULL, &amp;ppdata,</div><div class='add'>+					gpiomtd-&gt;plat.parts,</div><div class='add'>+					gpiomtd-&gt;plat.num_parts);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_wp;</div><div class='ctx'> 	platform_set_drvdata(dev, gpiomtd);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -352,6 +452,7 @@ static struct platform_driver gpio_nand_driver = {</div><div class='ctx'> 	.remove		= gpio_nand_remove,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "gpio-nand",</div><div class='add'>+		.of_match_table = gpio_nand_id_table,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c<br/>index de4db7604a3f..7f680420bfab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/gpmi-nand/gpmi-lib.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/gpmi-nand/gpmi-lib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/gpmi-nand/gpmi-lib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/gpmi-nand/gpmi-lib.c</a></div><div class='hunk'>@@ -126,7 +126,7 @@ int gpmi_init(struct gpmi_nand_data *this)</div><div class='ctx'> 	struct resources *r = &amp;this-&gt;resources;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = clk_enable(r-&gt;clock);</div><div class='add'>+	ret = clk_prepare_enable(r-&gt;clock);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	ret = gpmi_reset_block(r-&gt;gpmi_regs, false);</div><div class='hunk'>@@ -146,7 +146,7 @@ int gpmi_init(struct gpmi_nand_data *this)</div><div class='ctx'> 	/* Select BCH ECC. */</div><div class='ctx'> 	writel(BM_GPMI_CTRL1_BCH_MODE, r-&gt;gpmi_regs + HW_GPMI_CTRL1_SET);</div><div class='ctx'> </div><div class='del'>-	clk_disable(r-&gt;clock);</div><div class='add'>+	clk_disable_unprepare(r-&gt;clock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> err_out:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -202,7 +202,7 @@ int bch_set_geometry(struct gpmi_nand_data *this)</div><div class='ctx'> 	ecc_strength  = bch_geo-&gt;ecc_strength &gt;&gt; 1;</div><div class='ctx'> 	page_size     = bch_geo-&gt;page_size;</div><div class='ctx'> </div><div class='del'>-	ret = clk_enable(r-&gt;clock);</div><div class='add'>+	ret = clk_prepare_enable(r-&gt;clock);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='hunk'>@@ -229,7 +229,7 @@ int bch_set_geometry(struct gpmi_nand_data *this)</div><div class='ctx'> 	writel(BM_BCH_CTRL_COMPLETE_IRQ_EN,</div><div class='ctx'> 				r-&gt;bch_regs + HW_BCH_CTRL_SET);</div><div class='ctx'> </div><div class='del'>-	clk_disable(r-&gt;clock);</div><div class='add'>+	clk_disable_unprepare(r-&gt;clock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> err_out:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -704,7 +704,7 @@ void gpmi_begin(struct gpmi_nand_data *this)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Enable the clock. */</div><div class='del'>-	ret = clk_enable(r-&gt;clock);</div><div class='add'>+	ret = clk_prepare_enable(r-&gt;clock);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("We failed in enable the clk\n");</div><div class='ctx'> 		goto err_out;</div><div class='hunk'>@@ -773,7 +773,7 @@ err_out:</div><div class='ctx'> void gpmi_end(struct gpmi_nand_data *this)</div><div class='ctx'> {</div><div class='ctx'> 	struct resources *r = &amp;this-&gt;resources;</div><div class='del'>-	clk_disable(r-&gt;clock);</div><div class='add'>+	clk_disable_unprepare(r-&gt;clock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Clears a BCH interrupt. */</div><div class='hunk'>@@ -827,7 +827,7 @@ int gpmi_send_command(struct gpmi_nand_data *this)</div><div class='ctx'> 	pio[1] = pio[2] = 0;</div><div class='ctx'> 	desc = channel-&gt;device-&gt;device_prep_slave_sg(channel,</div><div class='ctx'> 					(struct scatterlist *)pio,</div><div class='del'>-					ARRAY_SIZE(pio), DMA_NONE, 0);</div><div class='add'>+					ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);</div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		pr_err("step 1 error\n");</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -839,7 +839,7 @@ int gpmi_send_command(struct gpmi_nand_data *this)</div><div class='ctx'> 	sg_init_one(sgl, this-&gt;cmd_buffer, this-&gt;command_length);</div><div class='ctx'> 	dma_map_sg(this-&gt;dev, sgl, 1, DMA_TO_DEVICE);</div><div class='ctx'> 	desc = channel-&gt;device-&gt;device_prep_slave_sg(channel,</div><div class='del'>-					sgl, 1, DMA_TO_DEVICE, 1);</div><div class='add'>+					sgl, 1, DMA_MEM_TO_DEV, 1);</div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		pr_err("step 2 error\n");</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -872,7 +872,7 @@ int gpmi_send_data(struct gpmi_nand_data *this)</div><div class='ctx'> 	pio[1] = 0;</div><div class='ctx'> 	desc = channel-&gt;device-&gt;device_prep_slave_sg(channel,</div><div class='ctx'> 					(struct scatterlist *)pio,</div><div class='del'>-					ARRAY_SIZE(pio), DMA_NONE, 0);</div><div class='add'>+					ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);</div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		pr_err("step 1 error\n");</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -881,7 +881,7 @@ int gpmi_send_data(struct gpmi_nand_data *this)</div><div class='ctx'> 	/* [2] send DMA request */</div><div class='ctx'> 	prepare_data_dma(this, DMA_TO_DEVICE);</div><div class='ctx'> 	desc = channel-&gt;device-&gt;device_prep_slave_sg(channel, &amp;this-&gt;data_sgl,</div><div class='del'>-						1, DMA_TO_DEVICE, 1);</div><div class='add'>+						1, DMA_MEM_TO_DEV, 1);</div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		pr_err("step 2 error\n");</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -908,7 +908,7 @@ int gpmi_read_data(struct gpmi_nand_data *this)</div><div class='ctx'> 	pio[1] = 0;</div><div class='ctx'> 	desc = channel-&gt;device-&gt;device_prep_slave_sg(channel,</div><div class='ctx'> 					(struct scatterlist *)pio,</div><div class='del'>-					ARRAY_SIZE(pio), DMA_NONE, 0);</div><div class='add'>+					ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);</div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		pr_err("step 1 error\n");</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -917,7 +917,7 @@ int gpmi_read_data(struct gpmi_nand_data *this)</div><div class='ctx'> 	/* [2] : send DMA request */</div><div class='ctx'> 	prepare_data_dma(this, DMA_FROM_DEVICE);</div><div class='ctx'> 	desc = channel-&gt;device-&gt;device_prep_slave_sg(channel, &amp;this-&gt;data_sgl,</div><div class='del'>-						1, DMA_FROM_DEVICE, 1);</div><div class='add'>+						1, DMA_DEV_TO_MEM, 1);</div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		pr_err("step 2 error\n");</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -964,7 +964,7 @@ int gpmi_send_page(struct gpmi_nand_data *this,</div><div class='ctx'> </div><div class='ctx'> 	desc = channel-&gt;device-&gt;device_prep_slave_sg(channel,</div><div class='ctx'> 					(struct scatterlist *)pio,</div><div class='del'>-					ARRAY_SIZE(pio), DMA_NONE, 0);</div><div class='add'>+					ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);</div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		pr_err("step 2 error\n");</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -998,7 +998,8 @@ int gpmi_read_page(struct gpmi_nand_data *this,</div><div class='ctx'> 		| BF_GPMI_CTRL0_XFER_COUNT(0);</div><div class='ctx'> 	pio[1] = 0;</div><div class='ctx'> 	desc = channel-&gt;device-&gt;device_prep_slave_sg(channel,</div><div class='del'>-				(struct scatterlist *)pio, 2, DMA_NONE, 0);</div><div class='add'>+				(struct scatterlist *)pio, 2,</div><div class='add'>+				DMA_TRANS_NONE, 0);</div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		pr_err("step 1 error\n");</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -1027,7 +1028,7 @@ int gpmi_read_page(struct gpmi_nand_data *this,</div><div class='ctx'> 	pio[5] = auxiliary;</div><div class='ctx'> 	desc = channel-&gt;device-&gt;device_prep_slave_sg(channel,</div><div class='ctx'> 					(struct scatterlist *)pio,</div><div class='del'>-					ARRAY_SIZE(pio), DMA_NONE, 1);</div><div class='add'>+					ARRAY_SIZE(pio), DMA_TRANS_NONE, 1);</div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		pr_err("step 2 error\n");</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -1045,7 +1046,8 @@ int gpmi_read_page(struct gpmi_nand_data *this,</div><div class='ctx'> 		| BF_GPMI_CTRL0_XFER_COUNT(geo-&gt;page_size);</div><div class='ctx'> 	pio[1] = 0;</div><div class='ctx'> 	desc = channel-&gt;device-&gt;device_prep_slave_sg(channel,</div><div class='del'>-				(struct scatterlist *)pio, 2, DMA_NONE, 1);</div><div class='add'>+				(struct scatterlist *)pio, 2,</div><div class='add'>+				DMA_TRANS_NONE, 1);</div><div class='ctx'> 	if (!desc) {</div><div class='ctx'> 		pr_err("step 3 error\n");</div><div class='ctx'> 		return -1;</div><div class='head'>diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c<br/>index e2664073a89b..ac3b9f255e00 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/jz4740_nand.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/jz4740_nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/jz4740_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/jz4740_nand.c</a></div><div class='hunk'>@@ -423,17 +423,7 @@ static struct platform_driver jz_nand_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init jz_nand_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;jz_nand_driver);</div><div class='del'>-}</div><div class='del'>-module_init(jz_nand_init);</div><div class='del'>-</div><div class='del'>-static void __exit jz_nand_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;jz_nand_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(jz_nand_exit);</div><div class='add'>+module_platform_driver(jz_nand_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Lars-Peter Clausen &lt;lars@metafoo.de&gt;");</div><div class='head'>diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c<br/>index 5ede64706346..c240cf1af961 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/mpc5121_nfc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/mpc5121_nfc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/mpc5121_nfc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/mpc5121_nfc.c</a></div><div class='hunk'>@@ -879,19 +879,7 @@ static struct platform_driver mpc5121_nfc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init mpc5121_nfc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;mpc5121_nfc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(mpc5121_nfc_init);</div><div class='del'>-</div><div class='del'>-static void __exit mpc5121_nfc_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;mpc5121_nfc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_exit(mpc5121_nfc_cleanup);</div><div class='add'>+module_platform_driver(mpc5121_nfc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Freescale Semiconductor, Inc.");</div><div class='ctx'> MODULE_DESCRIPTION("MPC5121 NAND MTD driver");</div><div class='head'>diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c<br/>index 3ed9c5e4d34e..35b4565050f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nand_base.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/nand_base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nand_base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/nand_base.c</a></div><div class='hunk'>@@ -3132,8 +3132,8 @@ ident_done:</div><div class='ctx'> 	 * Bad block marker is stored in the last page of each block</div><div class='ctx'> 	 * on Samsung and Hynix MLC devices; stored in first two pages</div><div class='ctx'> 	 * of each block on Micron devices with 2KiB pages and on</div><div class='del'>-	 * SLC Samsung, Hynix, Toshiba and AMD/Spansion. All others scan</div><div class='del'>-	 * only the first page.</div><div class='add'>+	 * SLC Samsung, Hynix, Toshiba, AMD/Spansion, and Macronix.</div><div class='add'>+	 * All others scan only the first page.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((chip-&gt;cellinfo &amp; NAND_CI_CELLTYPE_MSK) &amp;&amp;</div><div class='ctx'> 			(*maf_id == NAND_MFR_SAMSUNG ||</div><div class='hunk'>@@ -3143,7 +3143,8 @@ ident_done:</div><div class='ctx'> 				(*maf_id == NAND_MFR_SAMSUNG ||</div><div class='ctx'> 				 *maf_id == NAND_MFR_HYNIX ||</div><div class='ctx'> 				 *maf_id == NAND_MFR_TOSHIBA ||</div><div class='del'>-				 *maf_id == NAND_MFR_AMD)) ||</div><div class='add'>+				 *maf_id == NAND_MFR_AMD ||</div><div class='add'>+				 *maf_id == NAND_MFR_MACRONIX)) ||</div><div class='ctx'> 			(mtd-&gt;writesize == 2048 &amp;&amp;</div><div class='ctx'> 			 *maf_id == NAND_MFR_MICRON))</div><div class='ctx'> 		chip-&gt;bbt_options |= NAND_BBT_SCAN2NDPAGE;</div><div class='head'>diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c<br/>index 69148ae3bf58..20a112f591fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nand_bbt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/nand_bbt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nand_bbt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/nand_bbt.c</a></div><div class='hunk'>@@ -201,7 +201,7 @@ static int read_bbt(struct mtd_info *mtd, uint8_t *buf, int page, int num,</div><div class='ctx'> 			from += marker_len;</div><div class='ctx'> 			marker_len = 0;</div><div class='ctx'> 		}</div><div class='del'>-		res = mtd-&gt;read(mtd, from, len, &amp;retlen, buf);</div><div class='add'>+		res = mtd_read(mtd, from, len, &amp;retlen, buf);</div><div class='ctx'> 		if (res &lt; 0) {</div><div class='ctx'> 			if (mtd_is_eccerr(res)) {</div><div class='ctx'> 				pr_info("nand_bbt: ECC error in BBT at "</div><div class='hunk'>@@ -298,7 +298,7 @@ static int scan_read_raw_data(struct mtd_info *mtd, uint8_t *buf, loff_t offs,</div><div class='ctx'> 	if (td-&gt;options &amp; NAND_BBT_VERSION)</div><div class='ctx'> 		len++;</div><div class='ctx'> </div><div class='del'>-	return mtd-&gt;read(mtd, offs, len, &amp;retlen, buf);</div><div class='add'>+	return mtd_read(mtd, offs, len, &amp;retlen, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Scan read raw data from flash */</div><div class='hunk'>@@ -317,7 +317,7 @@ static int scan_read_raw_oob(struct mtd_info *mtd, uint8_t *buf, loff_t offs,</div><div class='ctx'> 		ops.len = min(len, (size_t)mtd-&gt;writesize);</div><div class='ctx'> 		ops.oobbuf = buf + ops.len;</div><div class='ctx'> </div><div class='del'>-		res = mtd-&gt;read_oob(mtd, offs, &amp;ops);</div><div class='add'>+		res = mtd_read_oob(mtd, offs, &amp;ops);</div><div class='ctx'> </div><div class='ctx'> 		if (res)</div><div class='ctx'> 			return res;</div><div class='hunk'>@@ -350,7 +350,7 @@ static int scan_write_bbt(struct mtd_info *mtd, loff_t offs, size_t len,</div><div class='ctx'> 	ops.oobbuf = oob;</div><div class='ctx'> 	ops.len = len;</div><div class='ctx'> </div><div class='del'>-	return mtd-&gt;write_oob(mtd, offs, &amp;ops);</div><div class='add'>+	return mtd_write_oob(mtd, offs, &amp;ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 bbt_get_ver_offs(struct mtd_info *mtd, struct nand_bbt_descr *td)</div><div class='hunk'>@@ -434,7 +434,7 @@ static int scan_block_fast(struct mtd_info *mtd, struct nand_bbt_descr *bd,</div><div class='ctx'> 		 * Read the full oob until read_oob is fixed to handle single</div><div class='ctx'> 		 * byte reads for 16 bit buswidth.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = mtd-&gt;read_oob(mtd, offs, &amp;ops);</div><div class='add'>+		ret = mtd_read_oob(mtd, offs, &amp;ops);</div><div class='ctx'> 		/* Ignore ECC errors when checking for BBM */</div><div class='ctx'> 		if (ret &amp;&amp; !mtd_is_bitflip_or_eccerr(ret))</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -756,7 +756,7 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf,</div><div class='ctx'> 			/* Make it block aligned */</div><div class='ctx'> 			to &amp;= ~((loff_t)((1 &lt;&lt; this-&gt;bbt_erase_shift) - 1));</div><div class='ctx'> 			len = 1 &lt;&lt; this-&gt;bbt_erase_shift;</div><div class='del'>-			res = mtd-&gt;read(mtd, to, len, &amp;retlen, buf);</div><div class='add'>+			res = mtd_read(mtd, to, len, &amp;retlen, buf);</div><div class='ctx'> 			if (res &lt; 0) {</div><div class='ctx'> 				if (retlen != len) {</div><div class='ctx'> 					pr_info("nand_bbt: error reading block "</div><div class='hunk'>@@ -769,7 +769,7 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf,</div><div class='ctx'> 			/* Read oob data */</div><div class='ctx'> 			ops.ooblen = (len &gt;&gt; this-&gt;page_shift) * mtd-&gt;oobsize;</div><div class='ctx'> 			ops.oobbuf = &amp;buf[len];</div><div class='del'>-			res = mtd-&gt;read_oob(mtd, to + mtd-&gt;writesize, &amp;ops);</div><div class='add'>+			res = mtd_read_oob(mtd, to + mtd-&gt;writesize, &amp;ops);</div><div class='ctx'> 			if (res &lt; 0 || ops.oobretlen != ops.ooblen)</div><div class='ctx'> 				goto outerr;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c<br/>index 00cf1b0d6053..af4fe8ca7b5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nand_ids.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/nand_ids.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nand_ids.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/nand_ids.c</a></div><div class='hunk'>@@ -73,11 +73,12 @@ struct nand_flash_dev nand_flash_ids[] = {</div><div class='ctx'> #define LP_OPTIONS (NAND_SAMSUNG_LP_OPTIONS | NAND_NO_READRDY | NAND_NO_AUTOINCR)</div><div class='ctx'> #define LP_OPTIONS16 (LP_OPTIONS | NAND_BUSWIDTH_16)</div><div class='ctx'> </div><div class='del'>-	/*512 Megabit */</div><div class='add'>+	/* 512 Megabit */</div><div class='ctx'> 	{"NAND 64MiB 1,8V 8-bit",	0xA2, 0,  64, 0, LP_OPTIONS},</div><div class='ctx'> 	{"NAND 64MiB 1,8V 8-bit",	0xA0, 0,  64, 0, LP_OPTIONS},</div><div class='ctx'> 	{"NAND 64MiB 3,3V 8-bit",	0xF2, 0,  64, 0, LP_OPTIONS},</div><div class='ctx'> 	{"NAND 64MiB 3,3V 8-bit",	0xD0, 0,  64, 0, LP_OPTIONS},</div><div class='add'>+	{"NAND 64MiB 3,3V 8-bit",	0xF0, 0,  64, 0, LP_OPTIONS},</div><div class='ctx'> 	{"NAND 64MiB 1,8V 16-bit",	0xB2, 0,  64, 0, LP_OPTIONS16},</div><div class='ctx'> 	{"NAND 64MiB 1,8V 16-bit",	0xB0, 0,  64, 0, LP_OPTIONS16},</div><div class='ctx'> 	{"NAND 64MiB 3,3V 16-bit",	0xC2, 0,  64, 0, LP_OPTIONS16},</div><div class='hunk'>@@ -176,6 +177,7 @@ struct nand_manufacturers nand_manuf_ids[] = {</div><div class='ctx'> 	{NAND_MFR_HYNIX, "Hynix"},</div><div class='ctx'> 	{NAND_MFR_MICRON, "Micron"},</div><div class='ctx'> 	{NAND_MFR_AMD, "AMD"},</div><div class='add'>+	{NAND_MFR_MACRONIX, "Macronix"},</div><div class='ctx'> 	{0x0, "Unknown"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c<br/>index 34c03be77301..261f478f8cc3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nandsim.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/nandsim.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nandsim.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/nandsim.c</a></div><div class='hunk'>@@ -737,7 +737,7 @@ static int parse_badblocks(struct nandsim *ns, struct mtd_info *mtd)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		offset = erase_block_no * ns-&gt;geom.secsz;</div><div class='del'>-		if (mtd-&gt;block_markbad(mtd, offset)) {</div><div class='add'>+		if (mtd_block_markbad(mtd, offset)) {</div><div class='ctx'> 			NS_ERR("invalid badblocks.\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c<br/>index f8aacf48ecdd..ec688548c880 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/ndfc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/ndfc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/ndfc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/ndfc.c</a></div><div class='hunk'>@@ -294,18 +294,7 @@ static struct platform_driver ndfc_driver = {</div><div class='ctx'> 	.remove = __devexit_p(ndfc_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ndfc_nand_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ndfc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ndfc_nand_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ndfc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ndfc_nand_init);</div><div class='del'>-module_exit(ndfc_nand_exit);</div><div class='add'>+module_platform_driver(ndfc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Thomas Gleixner &lt;tglx@linutronix.de&gt;");</div><div class='head'>diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c<br/>index b463ecfb4c1a..a86aa812ca13 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nomadik_nand.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/nomadik_nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nomadik_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/nomadik_nand.c</a></div><div class='hunk'>@@ -201,7 +201,7 @@ static int nomadik_nand_suspend(struct device *dev)</div><div class='ctx'> 	struct nomadik_nand_host *host = dev_get_drvdata(dev);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	if (host)</div><div class='del'>-		ret = host-&gt;mtd.suspend(&amp;host-&gt;mtd);</div><div class='add'>+		ret = mtd_suspend(&amp;host-&gt;mtd);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -209,7 +209,7 @@ static int nomadik_nand_resume(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct nomadik_nand_host *host = dev_get_drvdata(dev);</div><div class='ctx'> 	if (host)</div><div class='del'>-		host-&gt;mtd.resume(&amp;host-&gt;mtd);</div><div class='add'>+		mtd_resume(&amp;host-&gt;mtd);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -228,19 +228,7 @@ static struct platform_driver nomadik_nand_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init nand_nomadik_init(void)</div><div class='del'>-{</div><div class='del'>-	pr_info("Nomadik NAND driver\n");</div><div class='del'>-	return platform_driver_register(&amp;nomadik_nand_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nand_nomadik_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;nomadik_nand_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(nand_nomadik_init);</div><div class='del'>-module_exit(nand_nomadik_exit);</div><div class='add'>+module_platform_driver(nomadik_nand_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("ST Microelectronics (sachin.verma@st.com)");</div><div class='head'>diff --git a/drivers/mtd/nand/nuc900_nand.c b/drivers/mtd/nand/nuc900_nand.c<br/>index fa8faedfad6e..8febe46e1105 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nuc900_nand.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/nuc900_nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nuc900_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/nuc900_nand.c</a></div><div class='hunk'>@@ -364,18 +364,7 @@ static struct platform_driver nuc900_nand_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init nuc900_nand_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;nuc900_nand_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit nuc900_nand_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;nuc900_nand_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(nuc900_nand_init);</div><div class='del'>-module_exit(nuc900_nand_exit);</div><div class='add'>+module_platform_driver(nuc900_nand_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Wan ZongShun &lt;mcuos.com@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("w90p910/NUC9xx nand driver!");</div><div class='head'>diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c<br/>index f745f00f3167..b3a883e2a22f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/omap2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/omap2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/omap2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/omap2.c</a></div><div class='hunk'>@@ -1145,20 +1145,7 @@ static struct platform_driver omap_nand_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init omap_nand_init(void)</div><div class='del'>-{</div><div class='del'>-	pr_info("%s driver initializing\n", DRIVER_NAME);</div><div class='del'>-</div><div class='del'>-	return platform_driver_register(&amp;omap_nand_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit omap_nand_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;omap_nand_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(omap_nand_init);</div><div class='del'>-module_exit(omap_nand_exit);</div><div class='add'>+module_platform_driver(omap_nand_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_ALIAS("platform:" DRIVER_NAME);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c<br/>index a97264ececdb..974dbf8251c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/pasemi_nand.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/pasemi_nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/pasemi_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/pasemi_nand.c</a></div><div class='hunk'>@@ -230,17 +230,7 @@ static struct platform_driver pasemi_nand_driver =</div><div class='ctx'> 	.remove		= pasemi_nand_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pasemi_nand_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pasemi_nand_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pasemi_nand_init);</div><div class='del'>-</div><div class='del'>-static void __exit pasemi_nand_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pasemi_nand_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(pasemi_nand_exit);</div><div class='add'>+module_platform_driver(pasemi_nand_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Egor Martovetsky &lt;egor@pasemi.com&gt;");</div><div class='head'>diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c<br/>index ea8e1234e0e2..7f2da6953357 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/plat_nand.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/plat_nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/plat_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/plat_nand.c</a></div><div class='hunk'>@@ -148,18 +148,7 @@ static struct platform_driver plat_nand_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init plat_nand_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;plat_nand_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit plat_nand_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;plat_nand_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(plat_nand_init);</div><div class='del'>-module_exit(plat_nand_exit);</div><div class='add'>+module_platform_driver(plat_nand_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Vitaly Wool");</div><div class='head'>diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c<br/>index 9eb7f879969e..5c3d719c37e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/pxa3xx_nand.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/pxa3xx_nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/pxa3xx_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/pxa3xx_nand.c</a></div><div class='hunk'>@@ -185,7 +185,7 @@ struct pxa3xx_nand_info {</div><div class='ctx'> 	uint32_t		ndcb2;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int use_dma = 1;</div><div class='add'>+static bool use_dma = 1;</div><div class='ctx'> module_param(use_dma, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(use_dma, "enable DMA for data transferring to/from NAND HW");</div><div class='ctx'> </div><div class='hunk'>@@ -1258,7 +1258,7 @@ static int pxa3xx_nand_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> 	for (cs = 0; cs &lt; pdata-&gt;num_cs; cs++) {</div><div class='ctx'> 		mtd = info-&gt;host[cs]-&gt;mtd;</div><div class='del'>-		mtd-&gt;suspend(mtd);</div><div class='add'>+		mtd_suspend(mtd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1291,7 +1291,7 @@ static int pxa3xx_nand_resume(struct platform_device *pdev)</div><div class='ctx'> 	nand_writel(info, NDSR, NDSR_MASK);</div><div class='ctx'> 	for (cs = 0; cs &lt; pdata-&gt;num_cs; cs++) {</div><div class='ctx'> 		mtd = info-&gt;host[cs]-&gt;mtd;</div><div class='del'>-		mtd-&gt;resume(mtd);</div><div class='add'>+		mtd_resume(mtd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1311,17 +1311,7 @@ static struct platform_driver pxa3xx_nand_driver = {</div><div class='ctx'> 	.resume		= pxa3xx_nand_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pxa3xx_nand_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pxa3xx_nand_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pxa3xx_nand_init);</div><div class='del'>-</div><div class='del'>-static void __exit pxa3xx_nand_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pxa3xx_nand_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(pxa3xx_nand_exit);</div><div class='add'>+module_platform_driver(pxa3xx_nand_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("PXA3xx NAND controller driver");</div><div class='head'>diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c<br/>index f20f393bfda6..769a4e096b3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/r852.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/r852.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/r852.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/r852.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include "r852.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int r852_enable_dma = 1;</div><div class='add'>+static bool r852_enable_dma = 1;</div><div class='ctx'> module_param(r852_enable_dma, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(r852_enable_dma, "Enable usage of the DMA (default)");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c<br/>index 619d2a504788..b175c0fd8b93 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/sharpsl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/sharpsl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/sharpsl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/sharpsl.c</a></div><div class='hunk'>@@ -230,17 +230,7 @@ static struct platform_driver sharpsl_nand_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(sharpsl_nand_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sharpsl_nand_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sharpsl_nand_driver);</div><div class='del'>-}</div><div class='del'>-module_init(sharpsl_nand_init);</div><div class='del'>-</div><div class='del'>-static void __exit sharpsl_nand_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sharpsl_nand_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(sharpsl_nand_exit);</div><div class='add'>+module_platform_driver(sharpsl_nand_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Richard Purdie &lt;rpurdie@rpsys.net&gt;");</div><div class='head'>diff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/sm_common.c<br/>index 32ae5af7444f..774c3c266713 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/sm_common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/sm_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/sm_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/sm_common.c</a></div><div class='hunk'>@@ -55,7 +55,7 @@ static int sm_block_markbad(struct mtd_info *mtd, loff_t ofs)</div><div class='ctx'> 	ops.datbuf = NULL;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	ret = mtd-&gt;write_oob(mtd, ofs, &amp;ops);</div><div class='add'>+	ret = mtd_write_oob(mtd, ofs, &amp;ops);</div><div class='ctx'> 	if (ret &lt; 0 || ops.oobretlen != SM_OOB_SIZE) {</div><div class='ctx'> 		printk(KERN_NOTICE</div><div class='ctx'> 			"sm_common: can't mark sector at %i as bad\n",</div><div class='head'>diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c<br/>index 0fb24f9c2327..e02b08bcf0c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/socrates_nand.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/socrates_nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/socrates_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/socrates_nand.c</a></div><div class='hunk'>@@ -273,18 +273,7 @@ static struct platform_driver socrates_nand_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(socrates_nand_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init socrates_nand_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;socrates_nand_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit socrates_nand_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;socrates_nand_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(socrates_nand_init);</div><div class='del'>-module_exit(socrates_nand_exit);</div><div class='add'>+module_platform_driver(socrates_nand_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Ilya Yanok");</div><div class='head'>diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c<br/>index beebd95f7690..6caa0cd9d6a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/tmio_nand.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/tmio_nand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/tmio_nand.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/tmio_nand.c</a></div><div class='hunk'>@@ -533,18 +533,7 @@ static struct platform_driver tmio_driver = {</div><div class='ctx'> 	.resume		= tmio_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init tmio_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;tmio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit tmio_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;tmio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(tmio_init);</div><div class='del'>-module_exit(tmio_exit);</div><div class='add'>+module_platform_driver(tmio_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> MODULE_AUTHOR("Ian Molton, Dirk Opfer, Chris Humbert, Dmitry Baryshkov");</div><div class='head'>diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c<br/>index ace46fdaef58..c7c4f1d11c77 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/txx9ndfmc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nand/txx9ndfmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/txx9ndfmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nand/txx9ndfmc.c</a></div><div class='hunk'>@@ -298,11 +298,7 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)</div><div class='ctx'> 	drvdata = devm_kzalloc(&amp;dev-&gt;dev, sizeof(*drvdata), GFP_KERNEL);</div><div class='ctx'> 	if (!drvdata)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	if (!devm_request_mem_region(&amp;dev-&gt;dev, res-&gt;start,</div><div class='del'>-				     resource_size(res), dev_name(&amp;dev-&gt;dev)))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	drvdata-&gt;base = devm_ioremap(&amp;dev-&gt;dev, res-&gt;start,</div><div class='del'>-				     resource_size(res));</div><div class='add'>+	drvdata-&gt;base = devm_request_and_ioremap(&amp;dev-&gt;dev, res);</div><div class='ctx'> 	if (!drvdata-&gt;base)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c<br/>index cda77b562ad4..a75382aff5f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nftlcore.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nftlcore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nftlcore.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nftlcore.c</a></div><div class='hunk'>@@ -56,7 +56,7 @@ static void nftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)</div><div class='ctx'> 	if (memcmp(mtd-&gt;name, "DiskOnChip", 10))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!mtd-&gt;block_isbad) {</div><div class='add'>+	if (!mtd_can_have_bb(mtd)) {</div><div class='ctx'> 		printk(KERN_ERR</div><div class='ctx'> "NFTL no longer supports the old DiskOnChip drivers loaded via docprobe.\n"</div><div class='ctx'> "Please use the new diskonchip driver under the NAND subsystem.\n");</div><div class='hunk'>@@ -153,7 +153,7 @@ int nftl_read_oob(struct mtd_info *mtd, loff_t offs, size_t len,</div><div class='ctx'> 	ops.oobbuf = buf;</div><div class='ctx'> 	ops.datbuf = NULL;</div><div class='ctx'> </div><div class='del'>-	res = mtd-&gt;read_oob(mtd, offs &amp; ~mask, &amp;ops);</div><div class='add'>+	res = mtd_read_oob(mtd, offs &amp; ~mask, &amp;ops);</div><div class='ctx'> 	*retlen = ops.oobretlen;</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -174,7 +174,7 @@ int nftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len,</div><div class='ctx'> 	ops.oobbuf = buf;</div><div class='ctx'> 	ops.datbuf = NULL;</div><div class='ctx'> </div><div class='del'>-	res = mtd-&gt;write_oob(mtd, offs &amp; ~mask, &amp;ops);</div><div class='add'>+	res = mtd_write_oob(mtd, offs &amp; ~mask, &amp;ops);</div><div class='ctx'> 	*retlen = ops.oobretlen;</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -198,7 +198,7 @@ static int nftl_write(struct mtd_info *mtd, loff_t offs, size_t len,</div><div class='ctx'> 	ops.datbuf = buf;</div><div class='ctx'> 	ops.len = len;</div><div class='ctx'> </div><div class='del'>-	res = mtd-&gt;write_oob(mtd, offs &amp; ~mask, &amp;ops);</div><div class='add'>+	res = mtd_write_oob(mtd, offs &amp; ~mask, &amp;ops);</div><div class='ctx'> 	*retlen = ops.retlen;</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -423,12 +423,17 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p</div><div class='ctx'> 		if (BlockMap[block] == BLOCK_NIL)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		ret = mtd-&gt;read(mtd, (nftl-&gt;EraseSize * BlockMap[block]) + (block * 512),</div><div class='del'>-				512, &amp;retlen, movebuf);</div><div class='add'>+		ret = mtd_read(mtd,</div><div class='add'>+			       (nftl-&gt;EraseSize * BlockMap[block]) + (block * 512),</div><div class='add'>+			       512,</div><div class='add'>+			       &amp;retlen,</div><div class='add'>+			       movebuf);</div><div class='ctx'> 		if (ret &lt; 0 &amp;&amp; !mtd_is_bitflip(ret)) {</div><div class='del'>-			ret = mtd-&gt;read(mtd, (nftl-&gt;EraseSize * BlockMap[block])</div><div class='del'>-					+ (block * 512), 512, &amp;retlen,</div><div class='del'>-					movebuf);</div><div class='add'>+			ret = mtd_read(mtd,</div><div class='add'>+				       (nftl-&gt;EraseSize * BlockMap[block]) + (block * 512),</div><div class='add'>+				       512,</div><div class='add'>+				       &amp;retlen,</div><div class='add'>+				       movebuf);</div><div class='ctx'> 			if (ret != -EIO)</div><div class='ctx'> 				printk("Error went away on retry.\n");</div><div class='ctx'> 		}</div><div class='hunk'>@@ -771,7 +776,7 @@ static int nftl_readblock(struct mtd_blktrans_dev *mbd, unsigned long block,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		loff_t ptr = (lastgoodEUN * nftl-&gt;EraseSize) + blockofs;</div><div class='ctx'> 		size_t retlen;</div><div class='del'>-		int res = mtd-&gt;read(mtd, ptr, 512, &amp;retlen, buffer);</div><div class='add'>+		int res = mtd_read(mtd, ptr, 512, &amp;retlen, buffer);</div><div class='ctx'> </div><div class='ctx'> 		if (res &lt; 0 &amp;&amp; !mtd_is_bitflip(res))</div><div class='ctx'> 			return -EIO;</div><div class='head'>diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c<br/>index ac4092591aea..51b9d6af307f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nftlmount.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/nftlmount.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nftlmount.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/nftlmount.c</a></div><div class='hunk'>@@ -63,8 +63,8 @@ static int find_boot_record(struct NFTLrecord *nftl)</div><div class='ctx'> </div><div class='ctx'> 		/* Check for ANAND header first. Then can whinge if it's found but later</div><div class='ctx'> 		   checks fail */</div><div class='del'>-		ret = mtd-&gt;read(mtd, block * nftl-&gt;EraseSize, SECTORSIZE,</div><div class='del'>-				&amp;retlen, buf);</div><div class='add'>+		ret = mtd_read(mtd, block * nftl-&gt;EraseSize, SECTORSIZE,</div><div class='add'>+			       &amp;retlen, buf);</div><div class='ctx'> 		/* We ignore ret in case the ECC of the MediaHeader is invalid</div><div class='ctx'> 		   (which is apparently acceptable) */</div><div class='ctx'> 		if (retlen != SECTORSIZE) {</div><div class='hunk'>@@ -242,7 +242,8 @@ The new DiskOnChip driver already scanned the bad block table.  Just query it.</div><div class='ctx'> 			if (buf[i &amp; (SECTORSIZE - 1)] != 0xff)</div><div class='ctx'> 				nftl-&gt;ReplUnitTable[i] = BLOCK_RESERVED;</div><div class='ctx'> #endif</div><div class='del'>-			if (nftl-&gt;mbd.mtd-&gt;block_isbad(nftl-&gt;mbd.mtd, i * nftl-&gt;EraseSize))</div><div class='add'>+			if (mtd_block_isbad(nftl-&gt;mbd.mtd,</div><div class='add'>+					    i * nftl-&gt;EraseSize))</div><div class='ctx'> 				nftl-&gt;ReplUnitTable[i] = BLOCK_RESERVED;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -274,7 +275,7 @@ static int check_free_sectors(struct NFTLrecord *nftl, unsigned int address, int</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; len; i += SECTORSIZE) {</div><div class='del'>-		if (mtd-&gt;read(mtd, address, SECTORSIZE, &amp;retlen, buf))</div><div class='add'>+		if (mtd_read(mtd, address, SECTORSIZE, &amp;retlen, buf))</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		if (memcmpb(buf, 0xff, SECTORSIZE) != 0)</div><div class='ctx'> 			return -1;</div><div class='hunk'>@@ -326,7 +327,7 @@ int NFTL_formatblock(struct NFTLrecord *nftl, int block)</div><div class='ctx'> 	instr-&gt;mtd = nftl-&gt;mbd.mtd;</div><div class='ctx'> 	instr-&gt;addr = block * nftl-&gt;EraseSize;</div><div class='ctx'> 	instr-&gt;len = nftl-&gt;EraseSize;</div><div class='del'>-	mtd-&gt;erase(mtd, instr);</div><div class='add'>+	mtd_erase(mtd, instr);</div><div class='ctx'> </div><div class='ctx'> 	if (instr-&gt;state == MTD_ERASE_FAILED) {</div><div class='ctx'> 		printk("Error while formatting block %d\n", block);</div><div class='hunk'>@@ -355,7 +356,7 @@ int NFTL_formatblock(struct NFTLrecord *nftl, int block)</div><div class='ctx'> fail:</div><div class='ctx'> 	/* could not format, update the bad block table (caller is responsible</div><div class='ctx'> 	   for setting the ReplUnitTable to BLOCK_RESERVED on failure) */</div><div class='del'>-	nftl-&gt;mbd.mtd-&gt;block_markbad(nftl-&gt;mbd.mtd, instr-&gt;addr);</div><div class='add'>+	mtd_block_markbad(nftl-&gt;mbd.mtd, instr-&gt;addr);</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/onenand/generic.c<br/>index 7813095264a5..0ccd5bff2544 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/onenand/generic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/onenand/generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/onenand/generic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/onenand/generic.c</a></div><div class='hunk'>@@ -115,21 +115,9 @@ static struct platform_driver generic_onenand_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(generic_onenand_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-MODULE_ALIAS("platform:" DRIVER_NAME);</div><div class='del'>-</div><div class='del'>-static int __init generic_onenand_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;generic_onenand_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit generic_onenand_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;generic_onenand_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(generic_onenand_init);</div><div class='del'>-module_exit(generic_onenand_exit);</div><div class='add'>+module_platform_driver(generic_onenand_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Kyungmin Park &lt;kyungmin.park@samsung.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Glue layer for OneNAND flash on generic boards");</div><div class='add'>+MODULE_ALIAS("platform:" DRIVER_NAME);</div><div class='head'>diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c<br/>index a8394730b4b6..a061bc163da2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/onenand/onenand_base.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/onenand/onenand_base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/onenand/onenand_base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/onenand/onenand_base.c</a></div><div class='hunk'>@@ -2633,7 +2633,6 @@ static int onenand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)</div><div class='ctx'>  */</div><div class='ctx'> static int onenand_block_markbad(struct mtd_info *mtd, loff_t ofs)</div><div class='ctx'> {</div><div class='del'>-	struct onenand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = onenand_block_isbad(mtd, ofs);</div><div class='hunk'>@@ -2645,7 +2644,7 @@ static int onenand_block_markbad(struct mtd_info *mtd, loff_t ofs)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	onenand_get_device(mtd, FL_WRITING);</div><div class='del'>-	ret = this-&gt;block_markbad(mtd, ofs);</div><div class='add'>+	ret = mtd_block_markbad(mtd, ofs);</div><div class='ctx'> 	onenand_release_device(mtd);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c<br/>index 5474547eafc2..fa1ee43f735b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/onenand/samsung.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/onenand/samsung.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/onenand/samsung.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/onenand/samsung.c</a></div><div class='hunk'>@@ -1133,18 +1133,7 @@ static struct platform_driver s3c_onenand_driver = {</div><div class='ctx'> 	.remove         = __devexit_p(s3c_onenand_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init s3c_onenand_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;s3c_onenand_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit s3c_onenand_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;s3c_onenand_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(s3c_onenand_init);</div><div class='del'>-module_exit(s3c_onenand_exit);</div><div class='add'>+module_platform_driver(s3c_onenand_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Kyungmin Park &lt;kyungmin.park@samsung.com&gt;");</div><div class='head'>diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c<br/>index e366b1d84ead..48970c14beff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/redboot.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/redboot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/redboot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/redboot.c</a></div><div class='hunk'>@@ -78,8 +78,8 @@ static int parse_redboot_partitions(struct mtd_info *master,</div><div class='ctx'> </div><div class='ctx'> 	if ( directory &lt; 0 ) {</div><div class='ctx'> 		offset = master-&gt;size + directory * master-&gt;erasesize;</div><div class='del'>-		while (master-&gt;block_isbad &amp;&amp; </div><div class='del'>-		       master-&gt;block_isbad(master, offset)) {</div><div class='add'>+		while (mtd_can_have_bb(master) &amp;&amp;</div><div class='add'>+		       mtd_block_isbad(master, offset)) {</div><div class='ctx'> 			if (!offset) {</div><div class='ctx'> 			nogood:</div><div class='ctx'> 				printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n");</div><div class='hunk'>@@ -89,8 +89,8 @@ static int parse_redboot_partitions(struct mtd_info *master,</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		offset = directory * master-&gt;erasesize;</div><div class='del'>-		while (master-&gt;block_isbad &amp;&amp; </div><div class='del'>-		       master-&gt;block_isbad(master, offset)) {</div><div class='add'>+		while (mtd_can_have_bb(master) &amp;&amp;</div><div class='add'>+		       mtd_block_isbad(master, offset)) {</div><div class='ctx'> 			offset += master-&gt;erasesize;</div><div class='ctx'> 			if (offset == master-&gt;size)</div><div class='ctx'> 				goto nogood;</div><div class='hunk'>@@ -104,8 +104,8 @@ static int parse_redboot_partitions(struct mtd_info *master,</div><div class='ctx'> 	printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",</div><div class='ctx'> 	       master-&gt;name, offset);</div><div class='ctx'> </div><div class='del'>-	ret = master-&gt;read(master, offset,</div><div class='del'>-			   master-&gt;erasesize, &amp;retlen, (void *)buf);</div><div class='add'>+	ret = mtd_read(master, offset, master-&gt;erasesize, &amp;retlen,</div><div class='add'>+		       (void *)buf);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c<br/>index 73ae217a4252..233b946e5d66 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/rfd_ftl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/rfd_ftl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/rfd_ftl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/rfd_ftl.c</a></div><div class='hunk'>@@ -200,9 +200,9 @@ static int scan_header(struct partition *part)</div><div class='ctx'> 		part-&gt;sector_map[i] = -1;</div><div class='ctx'> </div><div class='ctx'> 	for (i=0, blocks_found=0; i&lt;part-&gt;total_blocks; i++) {</div><div class='del'>-		rc = part-&gt;mbd.mtd-&gt;read(part-&gt;mbd.mtd,</div><div class='del'>-				i * part-&gt;block_size, part-&gt;header_size,</div><div class='del'>-				&amp;retlen, (u_char*)part-&gt;header_cache);</div><div class='add'>+		rc = mtd_read(part-&gt;mbd.mtd, i * part-&gt;block_size,</div><div class='add'>+			      part-&gt;header_size, &amp;retlen,</div><div class='add'>+			      (u_char *)part-&gt;header_cache);</div><div class='ctx'> </div><div class='ctx'> 		if (!rc &amp;&amp; retlen != part-&gt;header_size)</div><div class='ctx'> 			rc = -EIO;</div><div class='hunk'>@@ -250,8 +250,8 @@ static int rfd_ftl_readsect(struct mtd_blktrans_dev *dev, u_long sector, char *b</div><div class='ctx'> </div><div class='ctx'> 	addr = part-&gt;sector_map[sector];</div><div class='ctx'> 	if (addr != -1) {</div><div class='del'>-		rc = part-&gt;mbd.mtd-&gt;read(part-&gt;mbd.mtd, addr, SECTOR_SIZE,</div><div class='del'>-						&amp;retlen, (u_char*)buf);</div><div class='add'>+		rc = mtd_read(part-&gt;mbd.mtd, addr, SECTOR_SIZE, &amp;retlen,</div><div class='add'>+			      (u_char *)buf);</div><div class='ctx'> 		if (!rc &amp;&amp; retlen != SECTOR_SIZE)</div><div class='ctx'> 			rc = -EIO;</div><div class='ctx'> </div><div class='hunk'>@@ -304,9 +304,8 @@ static void erase_callback(struct erase_info *erase)</div><div class='ctx'> 	part-&gt;blocks[i].used_sectors = 0;</div><div class='ctx'> 	part-&gt;blocks[i].erases++;</div><div class='ctx'> </div><div class='del'>-	rc = part-&gt;mbd.mtd-&gt;write(part-&gt;mbd.mtd,</div><div class='del'>-		part-&gt;blocks[i].offset, sizeof(magic), &amp;retlen,</div><div class='del'>-		(u_char*)&amp;magic);</div><div class='add'>+	rc = mtd_write(part-&gt;mbd.mtd, part-&gt;blocks[i].offset, sizeof(magic),</div><div class='add'>+		       &amp;retlen, (u_char *)&amp;magic);</div><div class='ctx'> </div><div class='ctx'> 	if (!rc &amp;&amp; retlen != sizeof(magic))</div><div class='ctx'> 		rc = -EIO;</div><div class='hunk'>@@ -342,7 +341,7 @@ static int erase_block(struct partition *part, int block)</div><div class='ctx'> 	part-&gt;blocks[block].state = BLOCK_ERASING;</div><div class='ctx'> 	part-&gt;blocks[block].free_sectors = 0;</div><div class='ctx'> </div><div class='del'>-	rc = part-&gt;mbd.mtd-&gt;erase(part-&gt;mbd.mtd, erase);</div><div class='add'>+	rc = mtd_erase(part-&gt;mbd.mtd, erase);</div><div class='ctx'> </div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		printk(KERN_ERR PREFIX "erase of region %llx,%llx on '%s' "</div><div class='hunk'>@@ -372,9 +371,8 @@ static int move_block_contents(struct partition *part, int block_no, u_long *old</div><div class='ctx'> 	if (!map)</div><div class='ctx'> 		goto err2;</div><div class='ctx'> </div><div class='del'>-	rc = part-&gt;mbd.mtd-&gt;read(part-&gt;mbd.mtd,</div><div class='del'>-		part-&gt;blocks[block_no].offset, part-&gt;header_size,</div><div class='del'>-		&amp;retlen, (u_char*)map);</div><div class='add'>+	rc = mtd_read(part-&gt;mbd.mtd, part-&gt;blocks[block_no].offset,</div><div class='add'>+		      part-&gt;header_size, &amp;retlen, (u_char *)map);</div><div class='ctx'> </div><div class='ctx'> 	if (!rc &amp;&amp; retlen != part-&gt;header_size)</div><div class='ctx'> 		rc = -EIO;</div><div class='hunk'>@@ -413,8 +411,8 @@ static int move_block_contents(struct partition *part, int block_no, u_long *old</div><div class='ctx'> 			}</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		rc = part-&gt;mbd.mtd-&gt;read(part-&gt;mbd.mtd, addr,</div><div class='del'>-			SECTOR_SIZE, &amp;retlen, sector_data);</div><div class='add'>+		rc = mtd_read(part-&gt;mbd.mtd, addr, SECTOR_SIZE, &amp;retlen,</div><div class='add'>+			      sector_data);</div><div class='ctx'> </div><div class='ctx'> 		if (!rc &amp;&amp; retlen != SECTOR_SIZE)</div><div class='ctx'> 			rc = -EIO;</div><div class='hunk'>@@ -450,8 +448,7 @@ static int reclaim_block(struct partition *part, u_long *old_sector)</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/* we have a race if sync doesn't exist */</div><div class='del'>-	if (part-&gt;mbd.mtd-&gt;sync)</div><div class='del'>-		part-&gt;mbd.mtd-&gt;sync(part-&gt;mbd.mtd);</div><div class='add'>+	mtd_sync(part-&gt;mbd.mtd);</div><div class='ctx'> </div><div class='ctx'> 	score = 0x7fffffff; /* MAX_INT */</div><div class='ctx'> 	best_block = -1;</div><div class='hunk'>@@ -563,8 +560,9 @@ static int find_writable_block(struct partition *part, u_long *old_sector)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = part-&gt;mbd.mtd-&gt;read(part-&gt;mbd.mtd, part-&gt;blocks[block].offset,</div><div class='del'>-		part-&gt;header_size, &amp;retlen, (u_char*)part-&gt;header_cache);</div><div class='add'>+	rc = mtd_read(part-&gt;mbd.mtd, part-&gt;blocks[block].offset,</div><div class='add'>+		      part-&gt;header_size, &amp;retlen,</div><div class='add'>+		      (u_char *)part-&gt;header_cache);</div><div class='ctx'> </div><div class='ctx'> 	if (!rc &amp;&amp; retlen != part-&gt;header_size)</div><div class='ctx'> 		rc = -EIO;</div><div class='hunk'>@@ -595,8 +593,8 @@ static int mark_sector_deleted(struct partition *part, u_long old_addr)</div><div class='ctx'> </div><div class='ctx'> 	addr = part-&gt;blocks[block].offset +</div><div class='ctx'> 			(HEADER_MAP_OFFSET + offset) * sizeof(u16);</div><div class='del'>-	rc = part-&gt;mbd.mtd-&gt;write(part-&gt;mbd.mtd, addr,</div><div class='del'>-		sizeof(del), &amp;retlen, (u_char*)&amp;del);</div><div class='add'>+	rc = mtd_write(part-&gt;mbd.mtd, addr, sizeof(del), &amp;retlen,</div><div class='add'>+		       (u_char *)&amp;del);</div><div class='ctx'> </div><div class='ctx'> 	if (!rc &amp;&amp; retlen != sizeof(del))</div><div class='ctx'> 		rc = -EIO;</div><div class='hunk'>@@ -668,8 +666,8 @@ static int do_writesect(struct mtd_blktrans_dev *dev, u_long sector, char *buf,</div><div class='ctx'> </div><div class='ctx'> 	addr = (i + part-&gt;header_sectors_per_block) * SECTOR_SIZE +</div><div class='ctx'> 		block-&gt;offset;</div><div class='del'>-	rc = part-&gt;mbd.mtd-&gt;write(part-&gt;mbd.mtd,</div><div class='del'>-		addr, SECTOR_SIZE, &amp;retlen, (u_char*)buf);</div><div class='add'>+	rc = mtd_write(part-&gt;mbd.mtd, addr, SECTOR_SIZE, &amp;retlen,</div><div class='add'>+		       (u_char *)buf);</div><div class='ctx'> </div><div class='ctx'> 	if (!rc &amp;&amp; retlen != SECTOR_SIZE)</div><div class='ctx'> 		rc = -EIO;</div><div class='hunk'>@@ -688,8 +686,8 @@ static int do_writesect(struct mtd_blktrans_dev *dev, u_long sector, char *buf,</div><div class='ctx'> 	part-&gt;header_cache[i + HEADER_MAP_OFFSET] = entry;</div><div class='ctx'> </div><div class='ctx'> 	addr = block-&gt;offset + (HEADER_MAP_OFFSET + i) * sizeof(u16);</div><div class='del'>-	rc = part-&gt;mbd.mtd-&gt;write(part-&gt;mbd.mtd, addr,</div><div class='del'>-			sizeof(entry), &amp;retlen, (u_char*)&amp;entry);</div><div class='add'>+	rc = mtd_write(part-&gt;mbd.mtd, addr, sizeof(entry), &amp;retlen,</div><div class='add'>+		       (u_char *)&amp;entry);</div><div class='ctx'> </div><div class='ctx'> 	if (!rc &amp;&amp; retlen != sizeof(entry))</div><div class='ctx'> 		rc = -EIO;</div><div class='head'>diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c<br/>index fddb714e323c..072ed5970e2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/sm_ftl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/sm_ftl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/sm_ftl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/sm_ftl.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> struct workqueue_struct *cache_flush_workqueue;</div><div class='ctx'> </div><div class='ctx'> static int cache_timeout = 1000;</div><div class='del'>-module_param(cache_timeout, bool, S_IRUGO);</div><div class='add'>+module_param(cache_timeout, int, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(cache_timeout,</div><div class='ctx'> 	"Timeout (in ms) for cache flush (1000 ms default");</div><div class='ctx'> </div><div class='hunk'>@@ -278,7 +278,7 @@ again:</div><div class='ctx'> </div><div class='ctx'> 	/* Unfortunately, oob read will _always_ succeed,</div><div class='ctx'> 		despite card removal..... */</div><div class='del'>-	ret = mtd-&gt;read_oob(mtd, sm_mkoffset(ftl, zone, block, boffset), &amp;ops);</div><div class='add'>+	ret = mtd_read_oob(mtd, sm_mkoffset(ftl, zone, block, boffset), &amp;ops);</div><div class='ctx'> </div><div class='ctx'> 	/* Test for unknown errors */</div><div class='ctx'> 	if (ret != 0 &amp;&amp; !mtd_is_bitflip_or_eccerr(ret)) {</div><div class='hunk'>@@ -343,7 +343,7 @@ static int sm_write_sector(struct sm_ftl *ftl,</div><div class='ctx'> 	ops.ooblen = SM_OOB_SIZE;</div><div class='ctx'> 	ops.oobbuf = (void *)oob;</div><div class='ctx'> </div><div class='del'>-	ret = mtd-&gt;write_oob(mtd, sm_mkoffset(ftl, zone, block, boffset), &amp;ops);</div><div class='add'>+	ret = mtd_write_oob(mtd, sm_mkoffset(ftl, zone, block, boffset), &amp;ops);</div><div class='ctx'> </div><div class='ctx'> 	/* Now we assume that hardware will catch write bitflip errors */</div><div class='ctx'> 	/* If you are paranoid, use CONFIG_MTD_NAND_VERIFY_WRITE */</div><div class='hunk'>@@ -479,7 +479,7 @@ static int sm_erase_block(struct sm_ftl *ftl, int zone_num, uint16_t block,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mtd-&gt;erase(mtd, &amp;erase)) {</div><div class='add'>+	if (mtd_erase(mtd, &amp;erase)) {</div><div class='ctx'> 		sm_printk("erase of block %d in zone %d failed",</div><div class='ctx'> 							block, zone_num);</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -645,8 +645,8 @@ int sm_get_media_info(struct sm_ftl *ftl, struct mtd_info *mtd)</div><div class='ctx'> 	if (!ftl-&gt;smallpagenand &amp;&amp; mtd-&gt;oobsize &lt; SM_OOB_SIZE)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	/* We use these functions for IO */</div><div class='del'>-	if (!mtd-&gt;read_oob || !mtd-&gt;write_oob)</div><div class='add'>+	/* We use OOB */</div><div class='add'>+	if (!mtd_has_oob(mtd))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* Find geometry information */</div><div class='head'>diff --git a/drivers/mtd/ssfdc.c b/drivers/mtd/ssfdc.c<br/>index 976e3d28b962..ab2a52a039c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/ssfdc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ssfdc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/ssfdc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/ssfdc.c</a></div><div class='hunk'>@@ -122,9 +122,9 @@ static int get_valid_cis_sector(struct mtd_info *mtd)</div><div class='ctx'> 	 * is not SSFDC formatted</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (k = 0, offset = 0; k &lt; 4; k++, offset += mtd-&gt;erasesize) {</div><div class='del'>-		if (!mtd-&gt;block_isbad(mtd, offset)) {</div><div class='del'>-			ret = mtd-&gt;read(mtd, offset, SECTOR_SIZE, &amp;retlen,</div><div class='del'>-				sect_buf);</div><div class='add'>+		if (mtd_block_isbad(mtd, offset)) {</div><div class='add'>+			ret = mtd_read(mtd, offset, SECTOR_SIZE, &amp;retlen,</div><div class='add'>+				       sect_buf);</div><div class='ctx'> </div><div class='ctx'> 			/* CIS pattern match on the sector buffer */</div><div class='ctx'> 			if (ret &lt; 0 || retlen != SECTOR_SIZE) {</div><div class='hunk'>@@ -156,7 +156,7 @@ static int read_physical_sector(struct mtd_info *mtd, uint8_t *sect_buf,</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> 	loff_t offset = (loff_t)sect_no &lt;&lt; SECTOR_SHIFT;</div><div class='ctx'> </div><div class='del'>-	ret = mtd-&gt;read(mtd, offset, SECTOR_SIZE, &amp;retlen, sect_buf);</div><div class='add'>+	ret = mtd_read(mtd, offset, SECTOR_SIZE, &amp;retlen, sect_buf);</div><div class='ctx'> 	if (ret &lt; 0 || retlen != SECTOR_SIZE)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='hunk'>@@ -175,7 +175,7 @@ static int read_raw_oob(struct mtd_info *mtd, loff_t offs, uint8_t *buf)</div><div class='ctx'> 	ops.oobbuf = buf;</div><div class='ctx'> 	ops.datbuf = NULL;</div><div class='ctx'> </div><div class='del'>-	ret = mtd-&gt;read_oob(mtd, offs, &amp;ops);</div><div class='add'>+	ret = mtd_read_oob(mtd, offs, &amp;ops);</div><div class='ctx'> 	if (ret &lt; 0 || ops.oobretlen != OOB_SIZE)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='hunk'>@@ -255,7 +255,7 @@ static int build_logical_block_map(struct ssfdcr_record *ssfdc)</div><div class='ctx'> 	for (phys_block = ssfdc-&gt;cis_block + 1; phys_block &lt; ssfdc-&gt;map_len;</div><div class='ctx'> 			phys_block++) {</div><div class='ctx'> 		offset = (unsigned long)phys_block * ssfdc-&gt;erase_size;</div><div class='del'>-		if (mtd-&gt;block_isbad(mtd, offset))</div><div class='add'>+		if (mtd_block_isbad(mtd, offset))</div><div class='ctx'> 			continue;	/* skip bad blocks */</div><div class='ctx'> </div><div class='ctx'> 		ret = read_raw_oob(mtd, offset, oob_buf);</div><div class='head'>diff --git a/drivers/mtd/tests/mtd_oobtest.c b/drivers/mtd/tests/mtd_oobtest.c<br/>index 933f7e5f32d3..ed9b62827f1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/tests/mtd_oobtest.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/tests/mtd_oobtest.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/tests/mtd_oobtest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/tests/mtd_oobtest.c</a></div><div class='hunk'>@@ -78,7 +78,7 @@ static int erase_eraseblock(int ebnum)</div><div class='ctx'> 	ei.addr = addr;</div><div class='ctx'> 	ei.len  = mtd-&gt;erasesize;</div><div class='ctx'> </div><div class='del'>-	err = mtd-&gt;erase(mtd, &amp;ei);</div><div class='add'>+	err = mtd_erase(mtd, &amp;ei);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(PRINT_PREF "error %d while erasing EB %d\n", err, ebnum);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -139,7 +139,7 @@ static int write_eraseblock(int ebnum)</div><div class='ctx'> 		ops.ooboffs   = use_offset;</div><div class='ctx'> 		ops.datbuf    = NULL;</div><div class='ctx'> 		ops.oobbuf    = writebuf;</div><div class='del'>-		err = mtd-&gt;write_oob(mtd, addr, &amp;ops);</div><div class='add'>+		err = mtd_write_oob(mtd, addr, &amp;ops);</div><div class='ctx'> 		if (err || ops.oobretlen != use_len) {</div><div class='ctx'> 			printk(PRINT_PREF "error: writeoob failed at %#llx\n",</div><div class='ctx'> 			       (long long)addr);</div><div class='hunk'>@@ -192,7 +192,7 @@ static int verify_eraseblock(int ebnum)</div><div class='ctx'> 		ops.ooboffs   = use_offset;</div><div class='ctx'> 		ops.datbuf    = NULL;</div><div class='ctx'> 		ops.oobbuf    = readbuf;</div><div class='del'>-		err = mtd-&gt;read_oob(mtd, addr, &amp;ops);</div><div class='add'>+		err = mtd_read_oob(mtd, addr, &amp;ops);</div><div class='ctx'> 		if (err || ops.oobretlen != use_len) {</div><div class='ctx'> 			printk(PRINT_PREF "error: readoob failed at %#llx\n",</div><div class='ctx'> 			       (long long)addr);</div><div class='hunk'>@@ -219,7 +219,7 @@ static int verify_eraseblock(int ebnum)</div><div class='ctx'> 			ops.ooboffs   = 0;</div><div class='ctx'> 			ops.datbuf    = NULL;</div><div class='ctx'> 			ops.oobbuf    = readbuf;</div><div class='del'>-			err = mtd-&gt;read_oob(mtd, addr, &amp;ops);</div><div class='add'>+			err = mtd_read_oob(mtd, addr, &amp;ops);</div><div class='ctx'> 			if (err || ops.oobretlen != mtd-&gt;ecclayout-&gt;oobavail) {</div><div class='ctx'> 				printk(PRINT_PREF "error: readoob failed at "</div><div class='ctx'> 				       "%#llx\n", (long long)addr);</div><div class='hunk'>@@ -284,7 +284,7 @@ static int verify_eraseblock_in_one_go(int ebnum)</div><div class='ctx'> 	ops.ooboffs   = 0;</div><div class='ctx'> 	ops.datbuf    = NULL;</div><div class='ctx'> 	ops.oobbuf    = readbuf;</div><div class='del'>-	err = mtd-&gt;read_oob(mtd, addr, &amp;ops);</div><div class='add'>+	err = mtd_read_oob(mtd, addr, &amp;ops);</div><div class='ctx'> 	if (err || ops.oobretlen != len) {</div><div class='ctx'> 		printk(PRINT_PREF "error: readoob failed at %#llx\n",</div><div class='ctx'> 		       (long long)addr);</div><div class='hunk'>@@ -329,7 +329,7 @@ static int is_block_bad(int ebnum)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> </div><div class='del'>-	ret = mtd-&gt;block_isbad(mtd, addr);</div><div class='add'>+	ret = mtd_block_isbad(mtd, addr);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		printk(PRINT_PREF "block %d is bad\n", ebnum);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -524,7 +524,7 @@ static int __init mtd_oobtest_init(void)</div><div class='ctx'> 	ops.oobbuf    = writebuf;</div><div class='ctx'> 	printk(PRINT_PREF "attempting to start write past end of OOB\n");</div><div class='ctx'> 	printk(PRINT_PREF "an error is expected...\n");</div><div class='del'>-	err = mtd-&gt;write_oob(mtd, addr0, &amp;ops);</div><div class='add'>+	err = mtd_write_oob(mtd, addr0, &amp;ops);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(PRINT_PREF "error occurred as expected\n");</div><div class='ctx'> 		err = 0;</div><div class='hunk'>@@ -544,7 +544,7 @@ static int __init mtd_oobtest_init(void)</div><div class='ctx'> 	ops.oobbuf    = readbuf;</div><div class='ctx'> 	printk(PRINT_PREF "attempting to start read past end of OOB\n");</div><div class='ctx'> 	printk(PRINT_PREF "an error is expected...\n");</div><div class='del'>-	err = mtd-&gt;read_oob(mtd, addr0, &amp;ops);</div><div class='add'>+	err = mtd_read_oob(mtd, addr0, &amp;ops);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(PRINT_PREF "error occurred as expected\n");</div><div class='ctx'> 		err = 0;</div><div class='hunk'>@@ -568,7 +568,7 @@ static int __init mtd_oobtest_init(void)</div><div class='ctx'> 		ops.oobbuf    = writebuf;</div><div class='ctx'> 		printk(PRINT_PREF "attempting to write past end of device\n");</div><div class='ctx'> 		printk(PRINT_PREF "an error is expected...\n");</div><div class='del'>-		err = mtd-&gt;write_oob(mtd, mtd-&gt;size - mtd-&gt;writesize, &amp;ops);</div><div class='add'>+		err = mtd_write_oob(mtd, mtd-&gt;size - mtd-&gt;writesize, &amp;ops);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			printk(PRINT_PREF "error occurred as expected\n");</div><div class='ctx'> 			err = 0;</div><div class='hunk'>@@ -588,7 +588,7 @@ static int __init mtd_oobtest_init(void)</div><div class='ctx'> 		ops.oobbuf    = readbuf;</div><div class='ctx'> 		printk(PRINT_PREF "attempting to read past end of device\n");</div><div class='ctx'> 		printk(PRINT_PREF "an error is expected...\n");</div><div class='del'>-		err = mtd-&gt;read_oob(mtd, mtd-&gt;size - mtd-&gt;writesize, &amp;ops);</div><div class='add'>+		err = mtd_read_oob(mtd, mtd-&gt;size - mtd-&gt;writesize, &amp;ops);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			printk(PRINT_PREF "error occurred as expected\n");</div><div class='ctx'> 			err = 0;</div><div class='hunk'>@@ -612,7 +612,7 @@ static int __init mtd_oobtest_init(void)</div><div class='ctx'> 		ops.oobbuf    = writebuf;</div><div class='ctx'> 		printk(PRINT_PREF "attempting to write past end of device\n");</div><div class='ctx'> 		printk(PRINT_PREF "an error is expected...\n");</div><div class='del'>-		err = mtd-&gt;write_oob(mtd, mtd-&gt;size - mtd-&gt;writesize, &amp;ops);</div><div class='add'>+		err = mtd_write_oob(mtd, mtd-&gt;size - mtd-&gt;writesize, &amp;ops);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			printk(PRINT_PREF "error occurred as expected\n");</div><div class='ctx'> 			err = 0;</div><div class='hunk'>@@ -632,7 +632,7 @@ static int __init mtd_oobtest_init(void)</div><div class='ctx'> 		ops.oobbuf    = readbuf;</div><div class='ctx'> 		printk(PRINT_PREF "attempting to read past end of device\n");</div><div class='ctx'> 		printk(PRINT_PREF "an error is expected...\n");</div><div class='del'>-		err = mtd-&gt;read_oob(mtd, mtd-&gt;size - mtd-&gt;writesize, &amp;ops);</div><div class='add'>+		err = mtd_read_oob(mtd, mtd-&gt;size - mtd-&gt;writesize, &amp;ops);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			printk(PRINT_PREF "error occurred as expected\n");</div><div class='ctx'> 			err = 0;</div><div class='hunk'>@@ -670,7 +670,7 @@ static int __init mtd_oobtest_init(void)</div><div class='ctx'> 			ops.ooboffs   = 0;</div><div class='ctx'> 			ops.datbuf    = NULL;</div><div class='ctx'> 			ops.oobbuf    = writebuf;</div><div class='del'>-			err = mtd-&gt;write_oob(mtd, addr, &amp;ops);</div><div class='add'>+			err = mtd_write_oob(mtd, addr, &amp;ops);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			if (i % 256 == 0)</div><div class='hunk'>@@ -698,7 +698,7 @@ static int __init mtd_oobtest_init(void)</div><div class='ctx'> 		ops.ooboffs   = 0;</div><div class='ctx'> 		ops.datbuf    = NULL;</div><div class='ctx'> 		ops.oobbuf    = readbuf;</div><div class='del'>-		err = mtd-&gt;read_oob(mtd, addr, &amp;ops);</div><div class='add'>+		err = mtd_read_oob(mtd, addr, &amp;ops);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		if (memcmp(readbuf, writebuf, mtd-&gt;ecclayout-&gt;oobavail * 2)) {</div><div class='head'>diff --git a/drivers/mtd/tests/mtd_pagetest.c b/drivers/mtd/tests/mtd_pagetest.c<br/>index afafb6935fd0..252ddb092fb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/tests/mtd_pagetest.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/tests/mtd_pagetest.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/tests/mtd_pagetest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/tests/mtd_pagetest.c</a></div><div class='hunk'>@@ -77,7 +77,7 @@ static int erase_eraseblock(int ebnum)</div><div class='ctx'> 	ei.addr = addr;</div><div class='ctx'> 	ei.len  = mtd-&gt;erasesize;</div><div class='ctx'> </div><div class='del'>-	err = mtd-&gt;erase(mtd, &amp;ei);</div><div class='add'>+	err = mtd_erase(mtd, &amp;ei);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(PRINT_PREF "error %d while erasing EB %d\n", err, ebnum);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -95,12 +95,12 @@ static int erase_eraseblock(int ebnum)</div><div class='ctx'> static int write_eraseblock(int ebnum)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	size_t written = 0;</div><div class='add'>+	size_t written;</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> </div><div class='ctx'> 	set_random_data(writebuf, mtd-&gt;erasesize);</div><div class='ctx'> 	cond_resched();</div><div class='del'>-	err = mtd-&gt;write(mtd, addr, mtd-&gt;erasesize, &amp;written, writebuf);</div><div class='add'>+	err = mtd_write(mtd, addr, mtd-&gt;erasesize, &amp;written, writebuf);</div><div class='ctx'> 	if (err || written != mtd-&gt;erasesize)</div><div class='ctx'> 		printk(PRINT_PREF "error: write failed at %#llx\n",</div><div class='ctx'> 		       (long long)addr);</div><div class='hunk'>@@ -111,7 +111,7 @@ static int write_eraseblock(int ebnum)</div><div class='ctx'> static int verify_eraseblock(int ebnum)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t j;</div><div class='del'>-	size_t read = 0;</div><div class='add'>+	size_t read;</div><div class='ctx'> 	int err = 0, i;</div><div class='ctx'> 	loff_t addr0, addrn;</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='hunk'>@@ -127,7 +127,7 @@ static int verify_eraseblock(int ebnum)</div><div class='ctx'> 	set_random_data(writebuf, mtd-&gt;erasesize);</div><div class='ctx'> 	for (j = 0; j &lt; pgcnt - 1; ++j, addr += pgsize) {</div><div class='ctx'> 		/* Do a read to set the internal dataRAMs to different data */</div><div class='del'>-		err = mtd-&gt;read(mtd, addr0, bufsize, &amp;read, twopages);</div><div class='add'>+		err = mtd_read(mtd, addr0, bufsize, &amp;read, twopages);</div><div class='ctx'> 		if (mtd_is_bitflip(err))</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 		if (err || read != bufsize) {</div><div class='hunk'>@@ -135,7 +135,7 @@ static int verify_eraseblock(int ebnum)</div><div class='ctx'> 			       (long long)addr0);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='del'>-		err = mtd-&gt;read(mtd, addrn - bufsize, bufsize, &amp;read, twopages);</div><div class='add'>+		err = mtd_read(mtd, addrn - bufsize, bufsize, &amp;read, twopages);</div><div class='ctx'> 		if (mtd_is_bitflip(err))</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 		if (err || read != bufsize) {</div><div class='hunk'>@@ -144,8 +144,7 @@ static int verify_eraseblock(int ebnum)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		memset(twopages, 0, bufsize);</div><div class='del'>-		read = 0;</div><div class='del'>-		err = mtd-&gt;read(mtd, addr, bufsize, &amp;read, twopages);</div><div class='add'>+		err = mtd_read(mtd, addr, bufsize, &amp;read, twopages);</div><div class='ctx'> 		if (mtd_is_bitflip(err))</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 		if (err || read != bufsize) {</div><div class='hunk'>@@ -163,7 +162,7 @@ static int verify_eraseblock(int ebnum)</div><div class='ctx'> 	if (addr &lt;= addrn - pgsize - pgsize &amp;&amp; !bbt[ebnum + 1]) {</div><div class='ctx'> 		unsigned long oldnext = next;</div><div class='ctx'> 		/* Do a read to set the internal dataRAMs to different data */</div><div class='del'>-		err = mtd-&gt;read(mtd, addr0, bufsize, &amp;read, twopages);</div><div class='add'>+		err = mtd_read(mtd, addr0, bufsize, &amp;read, twopages);</div><div class='ctx'> 		if (mtd_is_bitflip(err))</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 		if (err || read != bufsize) {</div><div class='hunk'>@@ -171,7 +170,7 @@ static int verify_eraseblock(int ebnum)</div><div class='ctx'> 			       (long long)addr0);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='del'>-		err = mtd-&gt;read(mtd, addrn - bufsize, bufsize, &amp;read, twopages);</div><div class='add'>+		err = mtd_read(mtd, addrn - bufsize, bufsize, &amp;read, twopages);</div><div class='ctx'> 		if (mtd_is_bitflip(err))</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 		if (err || read != bufsize) {</div><div class='hunk'>@@ -180,8 +179,7 @@ static int verify_eraseblock(int ebnum)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		memset(twopages, 0, bufsize);</div><div class='del'>-		read = 0;</div><div class='del'>-		err = mtd-&gt;read(mtd, addr, bufsize, &amp;read, twopages);</div><div class='add'>+		err = mtd_read(mtd, addr, bufsize, &amp;read, twopages);</div><div class='ctx'> 		if (mtd_is_bitflip(err))</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 		if (err || read != bufsize) {</div><div class='hunk'>@@ -203,7 +201,7 @@ static int verify_eraseblock(int ebnum)</div><div class='ctx'> </div><div class='ctx'> static int crosstest(void)</div><div class='ctx'> {</div><div class='del'>-	size_t read = 0;</div><div class='add'>+	size_t read;</div><div class='ctx'> 	int err = 0, i;</div><div class='ctx'> 	loff_t addr, addr0, addrn;</div><div class='ctx'> 	unsigned char *pp1, *pp2, *pp3, *pp4;</div><div class='hunk'>@@ -228,9 +226,8 @@ static int crosstest(void)</div><div class='ctx'> 		addrn -= mtd-&gt;erasesize;</div><div class='ctx'> </div><div class='ctx'> 	/* Read 2nd-to-last page to pp1 */</div><div class='del'>-	read = 0;</div><div class='ctx'> 	addr = addrn - pgsize - pgsize;</div><div class='del'>-	err = mtd-&gt;read(mtd, addr, pgsize, &amp;read, pp1);</div><div class='add'>+	err = mtd_read(mtd, addr, pgsize, &amp;read, pp1);</div><div class='ctx'> 	if (mtd_is_bitflip(err))</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	if (err || read != pgsize) {</div><div class='hunk'>@@ -241,9 +238,8 @@ static int crosstest(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Read 3rd-to-last page to pp1 */</div><div class='del'>-	read = 0;</div><div class='ctx'> 	addr = addrn - pgsize - pgsize - pgsize;</div><div class='del'>-	err = mtd-&gt;read(mtd, addr, pgsize, &amp;read, pp1);</div><div class='add'>+	err = mtd_read(mtd, addr, pgsize, &amp;read, pp1);</div><div class='ctx'> 	if (mtd_is_bitflip(err))</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	if (err || read != pgsize) {</div><div class='hunk'>@@ -254,10 +250,9 @@ static int crosstest(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Read first page to pp2 */</div><div class='del'>-	read = 0;</div><div class='ctx'> 	addr = addr0;</div><div class='ctx'> 	printk(PRINT_PREF "reading page at %#llx\n", (long long)addr);</div><div class='del'>-	err = mtd-&gt;read(mtd, addr, pgsize, &amp;read, pp2);</div><div class='add'>+	err = mtd_read(mtd, addr, pgsize, &amp;read, pp2);</div><div class='ctx'> 	if (mtd_is_bitflip(err))</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	if (err || read != pgsize) {</div><div class='hunk'>@@ -268,10 +263,9 @@ static int crosstest(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Read last page to pp3 */</div><div class='del'>-	read = 0;</div><div class='ctx'> 	addr = addrn - pgsize;</div><div class='ctx'> 	printk(PRINT_PREF "reading page at %#llx\n", (long long)addr);</div><div class='del'>-	err = mtd-&gt;read(mtd, addr, pgsize, &amp;read, pp3);</div><div class='add'>+	err = mtd_read(mtd, addr, pgsize, &amp;read, pp3);</div><div class='ctx'> 	if (mtd_is_bitflip(err))</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	if (err || read != pgsize) {</div><div class='hunk'>@@ -282,10 +276,9 @@ static int crosstest(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Read first page again to pp4 */</div><div class='del'>-	read = 0;</div><div class='ctx'> 	addr = addr0;</div><div class='ctx'> 	printk(PRINT_PREF "reading page at %#llx\n", (long long)addr);</div><div class='del'>-	err = mtd-&gt;read(mtd, addr, pgsize, &amp;read, pp4);</div><div class='add'>+	err = mtd_read(mtd, addr, pgsize, &amp;read, pp4);</div><div class='ctx'> 	if (mtd_is_bitflip(err))</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	if (err || read != pgsize) {</div><div class='hunk'>@@ -309,7 +302,7 @@ static int crosstest(void)</div><div class='ctx'> </div><div class='ctx'> static int erasecrosstest(void)</div><div class='ctx'> {</div><div class='del'>-	size_t read = 0, written = 0;</div><div class='add'>+	size_t read, written;</div><div class='ctx'> 	int err = 0, i, ebnum, ebnum2;</div><div class='ctx'> 	loff_t addr0;</div><div class='ctx'> 	char *readbuf = twopages;</div><div class='hunk'>@@ -335,7 +328,7 @@ static int erasecrosstest(void)</div><div class='ctx'> 	printk(PRINT_PREF "writing 1st page of block %d\n", ebnum);</div><div class='ctx'> 	set_random_data(writebuf, pgsize);</div><div class='ctx'> 	strcpy(writebuf, "There is no data like this!");</div><div class='del'>-	err = mtd-&gt;write(mtd, addr0, pgsize, &amp;written, writebuf);</div><div class='add'>+	err = mtd_write(mtd, addr0, pgsize, &amp;written, writebuf);</div><div class='ctx'> 	if (err || written != pgsize) {</div><div class='ctx'> 		printk(PRINT_PREF "error: write failed at %#llx\n",</div><div class='ctx'> 		       (long long)addr0);</div><div class='hunk'>@@ -344,7 +337,7 @@ static int erasecrosstest(void)</div><div class='ctx'> </div><div class='ctx'> 	printk(PRINT_PREF "reading 1st page of block %d\n", ebnum);</div><div class='ctx'> 	memset(readbuf, 0, pgsize);</div><div class='del'>-	err = mtd-&gt;read(mtd, addr0, pgsize, &amp;read, readbuf);</div><div class='add'>+	err = mtd_read(mtd, addr0, pgsize, &amp;read, readbuf);</div><div class='ctx'> 	if (mtd_is_bitflip(err))</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	if (err || read != pgsize) {</div><div class='hunk'>@@ -368,7 +361,7 @@ static int erasecrosstest(void)</div><div class='ctx'> 	printk(PRINT_PREF "writing 1st page of block %d\n", ebnum);</div><div class='ctx'> 	set_random_data(writebuf, pgsize);</div><div class='ctx'> 	strcpy(writebuf, "There is no data like this!");</div><div class='del'>-	err = mtd-&gt;write(mtd, addr0, pgsize, &amp;written, writebuf);</div><div class='add'>+	err = mtd_write(mtd, addr0, pgsize, &amp;written, writebuf);</div><div class='ctx'> 	if (err || written != pgsize) {</div><div class='ctx'> 		printk(PRINT_PREF "error: write failed at %#llx\n",</div><div class='ctx'> 		       (long long)addr0);</div><div class='hunk'>@@ -382,7 +375,7 @@ static int erasecrosstest(void)</div><div class='ctx'> </div><div class='ctx'> 	printk(PRINT_PREF "reading 1st page of block %d\n", ebnum);</div><div class='ctx'> 	memset(readbuf, 0, pgsize);</div><div class='del'>-	err = mtd-&gt;read(mtd, addr0, pgsize, &amp;read, readbuf);</div><div class='add'>+	err = mtd_read(mtd, addr0, pgsize, &amp;read, readbuf);</div><div class='ctx'> 	if (mtd_is_bitflip(err))</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	if (err || read != pgsize) {</div><div class='hunk'>@@ -405,7 +398,7 @@ static int erasecrosstest(void)</div><div class='ctx'> </div><div class='ctx'> static int erasetest(void)</div><div class='ctx'> {</div><div class='del'>-	size_t read = 0, written = 0;</div><div class='add'>+	size_t read, written;</div><div class='ctx'> 	int err = 0, i, ebnum, ok = 1;</div><div class='ctx'> 	loff_t addr0;</div><div class='ctx'> </div><div class='hunk'>@@ -425,7 +418,7 @@ static int erasetest(void)</div><div class='ctx'> </div><div class='ctx'> 	printk(PRINT_PREF "writing 1st page of block %d\n", ebnum);</div><div class='ctx'> 	set_random_data(writebuf, pgsize);</div><div class='del'>-	err = mtd-&gt;write(mtd, addr0, pgsize, &amp;written, writebuf);</div><div class='add'>+	err = mtd_write(mtd, addr0, pgsize, &amp;written, writebuf);</div><div class='ctx'> 	if (err || written != pgsize) {</div><div class='ctx'> 		printk(PRINT_PREF "error: write failed at %#llx\n",</div><div class='ctx'> 		       (long long)addr0);</div><div class='hunk'>@@ -438,7 +431,7 @@ static int erasetest(void)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	printk(PRINT_PREF "reading 1st page of block %d\n", ebnum);</div><div class='del'>-	err = mtd-&gt;read(mtd, addr0, pgsize, &amp;read, twopages);</div><div class='add'>+	err = mtd_read(mtd, addr0, pgsize, &amp;read, twopages);</div><div class='ctx'> 	if (mtd_is_bitflip(err))</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	if (err || read != pgsize) {</div><div class='hunk'>@@ -469,7 +462,7 @@ static int is_block_bad(int ebnum)</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = mtd-&gt;block_isbad(mtd, addr);</div><div class='add'>+	ret = mtd_block_isbad(mtd, addr);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		printk(PRINT_PREF "block %d is bad\n", ebnum);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/mtd/tests/mtd_readtest.c b/drivers/mtd/tests/mtd_readtest.c<br/>index 550fe51225a7..121aba189cec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/tests/mtd_readtest.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/tests/mtd_readtest.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/tests/mtd_readtest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/tests/mtd_readtest.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@ static int pgcnt;</div><div class='ctx'> </div><div class='ctx'> static int read_eraseblock_by_page(int ebnum)</div><div class='ctx'> {</div><div class='del'>-	size_t read = 0;</div><div class='add'>+	size_t read;</div><div class='ctx'> 	int i, ret, err = 0;</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> 	void *buf = iobuf;</div><div class='hunk'>@@ -52,7 +52,7 @@ static int read_eraseblock_by_page(int ebnum)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pgcnt; i++) {</div><div class='ctx'> 		memset(buf, 0 , pgcnt);</div><div class='del'>-		ret = mtd-&gt;read(mtd, addr, pgsize, &amp;read, buf);</div><div class='add'>+		ret = mtd_read(mtd, addr, pgsize, &amp;read, buf);</div><div class='ctx'> 		if (ret == -EUCLEAN)</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 		if (ret || read != pgsize) {</div><div class='hunk'>@@ -74,7 +74,7 @@ static int read_eraseblock_by_page(int ebnum)</div><div class='ctx'> 			ops.ooboffs   = 0;</div><div class='ctx'> 			ops.datbuf    = NULL;</div><div class='ctx'> 			ops.oobbuf    = oobbuf;</div><div class='del'>-			ret = mtd-&gt;read_oob(mtd, addr, &amp;ops);</div><div class='add'>+			ret = mtd_read_oob(mtd, addr, &amp;ops);</div><div class='ctx'> 			if ((ret &amp;&amp; !mtd_is_bitflip(ret)) ||</div><div class='ctx'> 					ops.oobretlen != mtd-&gt;oobsize) {</div><div class='ctx'> 				printk(PRINT_PREF "error: read oob failed at "</div><div class='hunk'>@@ -132,7 +132,7 @@ static int is_block_bad(int ebnum)</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = mtd-&gt;block_isbad(mtd, addr);</div><div class='add'>+	ret = mtd_block_isbad(mtd, addr);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		printk(PRINT_PREF "block %d is bad\n", ebnum);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -148,8 +148,7 @@ static int scan_for_bad_eraseblocks(void)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* NOR flash does not implement block_isbad */</div><div class='del'>-	if (mtd-&gt;block_isbad == NULL)</div><div class='add'>+	if (!mtd_can_have_bb(mtd))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	printk(PRINT_PREF "scanning for bad eraseblocks\n");</div><div class='head'>diff --git a/drivers/mtd/tests/mtd_speedtest.c b/drivers/mtd/tests/mtd_speedtest.c<br/>index 493b367bdd35..2aec4f3b72be 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/tests/mtd_speedtest.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/tests/mtd_speedtest.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/tests/mtd_speedtest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/tests/mtd_speedtest.c</a></div><div class='hunk'>@@ -79,7 +79,7 @@ static int erase_eraseblock(int ebnum)</div><div class='ctx'> 	ei.addr = addr;</div><div class='ctx'> 	ei.len  = mtd-&gt;erasesize;</div><div class='ctx'> </div><div class='del'>-	err = mtd-&gt;erase(mtd, &amp;ei);</div><div class='add'>+	err = mtd_erase(mtd, &amp;ei);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(PRINT_PREF "error %d while erasing EB %d\n", err, ebnum);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -105,7 +105,7 @@ static int multiblock_erase(int ebnum, int blocks)</div><div class='ctx'> 	ei.addr = addr;</div><div class='ctx'> 	ei.len  = mtd-&gt;erasesize * blocks;</div><div class='ctx'> </div><div class='del'>-	err = mtd-&gt;erase(mtd, &amp;ei);</div><div class='add'>+	err = mtd_erase(mtd, &amp;ei);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(PRINT_PREF "error %d while erasing EB %d, blocks %d\n",</div><div class='ctx'> 		       err, ebnum, blocks);</div><div class='hunk'>@@ -139,11 +139,11 @@ static int erase_whole_device(void)</div><div class='ctx'> </div><div class='ctx'> static int write_eraseblock(int ebnum)</div><div class='ctx'> {</div><div class='del'>-	size_t written = 0;</div><div class='add'>+	size_t written;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> </div><div class='del'>-	err = mtd-&gt;write(mtd, addr, mtd-&gt;erasesize, &amp;written, iobuf);</div><div class='add'>+	err = mtd_write(mtd, addr, mtd-&gt;erasesize, &amp;written, iobuf);</div><div class='ctx'> 	if (err || written != mtd-&gt;erasesize) {</div><div class='ctx'> 		printk(PRINT_PREF "error: write failed at %#llx\n", addr);</div><div class='ctx'> 		if (!err)</div><div class='hunk'>@@ -155,13 +155,13 @@ static int write_eraseblock(int ebnum)</div><div class='ctx'> </div><div class='ctx'> static int write_eraseblock_by_page(int ebnum)</div><div class='ctx'> {</div><div class='del'>-	size_t written = 0;</div><div class='add'>+	size_t written;</div><div class='ctx'> 	int i, err = 0;</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> 	void *buf = iobuf;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pgcnt; i++) {</div><div class='del'>-		err = mtd-&gt;write(mtd, addr, pgsize, &amp;written, buf);</div><div class='add'>+		err = mtd_write(mtd, addr, pgsize, &amp;written, buf);</div><div class='ctx'> 		if (err || written != pgsize) {</div><div class='ctx'> 			printk(PRINT_PREF "error: write failed at %#llx\n",</div><div class='ctx'> 			       addr);</div><div class='hunk'>@@ -178,13 +178,13 @@ static int write_eraseblock_by_page(int ebnum)</div><div class='ctx'> </div><div class='ctx'> static int write_eraseblock_by_2pages(int ebnum)</div><div class='ctx'> {</div><div class='del'>-	size_t written = 0, sz = pgsize * 2;</div><div class='add'>+	size_t written, sz = pgsize * 2;</div><div class='ctx'> 	int i, n = pgcnt / 2, err = 0;</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> 	void *buf = iobuf;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; n; i++) {</div><div class='del'>-		err = mtd-&gt;write(mtd, addr, sz, &amp;written, buf);</div><div class='add'>+		err = mtd_write(mtd, addr, sz, &amp;written, buf);</div><div class='ctx'> 		if (err || written != sz) {</div><div class='ctx'> 			printk(PRINT_PREF "error: write failed at %#llx\n",</div><div class='ctx'> 			       addr);</div><div class='hunk'>@@ -196,7 +196,7 @@ static int write_eraseblock_by_2pages(int ebnum)</div><div class='ctx'> 		buf += sz;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pgcnt % 2) {</div><div class='del'>-		err = mtd-&gt;write(mtd, addr, pgsize, &amp;written, buf);</div><div class='add'>+		err = mtd_write(mtd, addr, pgsize, &amp;written, buf);</div><div class='ctx'> 		if (err || written != pgsize) {</div><div class='ctx'> 			printk(PRINT_PREF "error: write failed at %#llx\n",</div><div class='ctx'> 			       addr);</div><div class='hunk'>@@ -210,11 +210,11 @@ static int write_eraseblock_by_2pages(int ebnum)</div><div class='ctx'> </div><div class='ctx'> static int read_eraseblock(int ebnum)</div><div class='ctx'> {</div><div class='del'>-	size_t read = 0;</div><div class='add'>+	size_t read;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> </div><div class='del'>-	err = mtd-&gt;read(mtd, addr, mtd-&gt;erasesize, &amp;read, iobuf);</div><div class='add'>+	err = mtd_read(mtd, addr, mtd-&gt;erasesize, &amp;read, iobuf);</div><div class='ctx'> 	/* Ignore corrected ECC errors */</div><div class='ctx'> 	if (mtd_is_bitflip(err))</div><div class='ctx'> 		err = 0;</div><div class='hunk'>@@ -229,13 +229,13 @@ static int read_eraseblock(int ebnum)</div><div class='ctx'> </div><div class='ctx'> static int read_eraseblock_by_page(int ebnum)</div><div class='ctx'> {</div><div class='del'>-	size_t read = 0;</div><div class='add'>+	size_t read;</div><div class='ctx'> 	int i, err = 0;</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> 	void *buf = iobuf;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pgcnt; i++) {</div><div class='del'>-		err = mtd-&gt;read(mtd, addr, pgsize, &amp;read, buf);</div><div class='add'>+		err = mtd_read(mtd, addr, pgsize, &amp;read, buf);</div><div class='ctx'> 		/* Ignore corrected ECC errors */</div><div class='ctx'> 		if (mtd_is_bitflip(err))</div><div class='ctx'> 			err = 0;</div><div class='hunk'>@@ -255,13 +255,13 @@ static int read_eraseblock_by_page(int ebnum)</div><div class='ctx'> </div><div class='ctx'> static int read_eraseblock_by_2pages(int ebnum)</div><div class='ctx'> {</div><div class='del'>-	size_t read = 0, sz = pgsize * 2;</div><div class='add'>+	size_t read, sz = pgsize * 2;</div><div class='ctx'> 	int i, n = pgcnt / 2, err = 0;</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> 	void *buf = iobuf;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; n; i++) {</div><div class='del'>-		err = mtd-&gt;read(mtd, addr, sz, &amp;read, buf);</div><div class='add'>+		err = mtd_read(mtd, addr, sz, &amp;read, buf);</div><div class='ctx'> 		/* Ignore corrected ECC errors */</div><div class='ctx'> 		if (mtd_is_bitflip(err))</div><div class='ctx'> 			err = 0;</div><div class='hunk'>@@ -276,7 +276,7 @@ static int read_eraseblock_by_2pages(int ebnum)</div><div class='ctx'> 		buf += sz;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pgcnt % 2) {</div><div class='del'>-		err = mtd-&gt;read(mtd, addr, pgsize, &amp;read, buf);</div><div class='add'>+		err = mtd_read(mtd, addr, pgsize, &amp;read, buf);</div><div class='ctx'> 		/* Ignore corrected ECC errors */</div><div class='ctx'> 		if (mtd_is_bitflip(err))</div><div class='ctx'> 			err = 0;</div><div class='hunk'>@@ -296,7 +296,7 @@ static int is_block_bad(int ebnum)</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = mtd-&gt;block_isbad(mtd, addr);</div><div class='add'>+	ret = mtd_block_isbad(mtd, addr);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		printk(PRINT_PREF "block %d is bad\n", ebnum);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -336,8 +336,7 @@ static int scan_for_bad_eraseblocks(void)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* NOR flash does not implement block_isbad */</div><div class='del'>-	if (mtd-&gt;block_isbad == NULL)</div><div class='add'>+	if (!mtd_can_have_bb(mtd))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	printk(PRINT_PREF "scanning for bad eraseblocks\n");</div><div class='head'>diff --git a/drivers/mtd/tests/mtd_stresstest.c b/drivers/mtd/tests/mtd_stresstest.c<br/>index 52ffd9120e0d..7b33f22d0b58 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/tests/mtd_stresstest.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/tests/mtd_stresstest.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/tests/mtd_stresstest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/tests/mtd_stresstest.c</a></div><div class='hunk'>@@ -112,7 +112,7 @@ static int erase_eraseblock(int ebnum)</div><div class='ctx'> 	ei.addr = addr;</div><div class='ctx'> 	ei.len  = mtd-&gt;erasesize;</div><div class='ctx'> </div><div class='del'>-	err = mtd-&gt;erase(mtd, &amp;ei);</div><div class='add'>+	err = mtd_erase(mtd, &amp;ei);</div><div class='ctx'> 	if (unlikely(err)) {</div><div class='ctx'> 		printk(PRINT_PREF "error %d while erasing EB %d\n", err, ebnum);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -132,7 +132,7 @@ static int is_block_bad(int ebnum)</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = mtd-&gt;block_isbad(mtd, addr);</div><div class='add'>+	ret = mtd_block_isbad(mtd, addr);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		printk(PRINT_PREF "block %d is bad\n", ebnum);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -140,7 +140,7 @@ static int is_block_bad(int ebnum)</div><div class='ctx'> </div><div class='ctx'> static int do_read(void)</div><div class='ctx'> {</div><div class='del'>-	size_t read = 0;</div><div class='add'>+	size_t read;</div><div class='ctx'> 	int eb = rand_eb();</div><div class='ctx'> 	int offs = rand_offs();</div><div class='ctx'> 	int len = rand_len(offs), err;</div><div class='hunk'>@@ -153,7 +153,7 @@ static int do_read(void)</div><div class='ctx'> 			len = mtd-&gt;erasesize - offs;</div><div class='ctx'> 	}</div><div class='ctx'> 	addr = eb * mtd-&gt;erasesize + offs;</div><div class='del'>-	err = mtd-&gt;read(mtd, addr, len, &amp;read, readbuf);</div><div class='add'>+	err = mtd_read(mtd, addr, len, &amp;read, readbuf);</div><div class='ctx'> 	if (mtd_is_bitflip(err))</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	if (unlikely(err || read != len)) {</div><div class='hunk'>@@ -169,7 +169,7 @@ static int do_read(void)</div><div class='ctx'> static int do_write(void)</div><div class='ctx'> {</div><div class='ctx'> 	int eb = rand_eb(), offs, err, len;</div><div class='del'>-	size_t written = 0;</div><div class='add'>+	size_t written;</div><div class='ctx'> 	loff_t addr;</div><div class='ctx'> </div><div class='ctx'> 	offs = offsets[eb];</div><div class='hunk'>@@ -192,7 +192,7 @@ static int do_write(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	addr = eb * mtd-&gt;erasesize + offs;</div><div class='del'>-	err = mtd-&gt;write(mtd, addr, len, &amp;written, writebuf);</div><div class='add'>+	err = mtd_write(mtd, addr, len, &amp;written, writebuf);</div><div class='ctx'> 	if (unlikely(err || written != len)) {</div><div class='ctx'> 		printk(PRINT_PREF "error: write failed at 0x%llx\n",</div><div class='ctx'> 		       (long long)addr);</div><div class='hunk'>@@ -227,8 +227,7 @@ static int scan_for_bad_eraseblocks(void)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* NOR flash does not implement block_isbad */</div><div class='del'>-	if (mtd-&gt;block_isbad == NULL)</div><div class='add'>+	if (!mtd_can_have_bb(mtd))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	printk(PRINT_PREF "scanning for bad eraseblocks\n");</div><div class='hunk'>@@ -284,6 +283,12 @@ static int __init mtd_stresstest_init(void)</div><div class='ctx'> 	       (unsigned long long)mtd-&gt;size, mtd-&gt;erasesize,</div><div class='ctx'> 	       pgsize, ebcnt, pgcnt, mtd-&gt;oobsize);</div><div class='ctx'> </div><div class='add'>+	if (ebcnt &lt; 2) {</div><div class='add'>+		printk(PRINT_PREF "error: need at least 2 eraseblocks\n");</div><div class='add'>+		err = -ENOSPC;</div><div class='add'>+		goto out_put_mtd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Read or write up 2 eraseblocks at a time */</div><div class='ctx'> 	bufsize = mtd-&gt;erasesize * 2;</div><div class='ctx'> </div><div class='hunk'>@@ -322,6 +327,7 @@ out:</div><div class='ctx'> 	kfree(bbt);</div><div class='ctx'> 	vfree(writebuf);</div><div class='ctx'> 	vfree(readbuf);</div><div class='add'>+out_put_mtd:</div><div class='ctx'> 	put_mtd_device(mtd);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		printk(PRINT_PREF "error %d occurred\n", err);</div><div class='head'>diff --git a/drivers/mtd/tests/mtd_subpagetest.c b/drivers/mtd/tests/mtd_subpagetest.c<br/>index 1a05bfac4eee..9667bf535282 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/tests/mtd_subpagetest.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/tests/mtd_subpagetest.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/tests/mtd_subpagetest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/tests/mtd_subpagetest.c</a></div><div class='hunk'>@@ -80,7 +80,7 @@ static int erase_eraseblock(int ebnum)</div><div class='ctx'> 	ei.addr = addr;</div><div class='ctx'> 	ei.len  = mtd-&gt;erasesize;</div><div class='ctx'> </div><div class='del'>-	err = mtd-&gt;erase(mtd, &amp;ei);</div><div class='add'>+	err = mtd_erase(mtd, &amp;ei);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(PRINT_PREF "error %d while erasing EB %d\n", err, ebnum);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -115,12 +115,12 @@ static int erase_whole_device(void)</div><div class='ctx'> </div><div class='ctx'> static int write_eraseblock(int ebnum)</div><div class='ctx'> {</div><div class='del'>-	size_t written = 0;</div><div class='add'>+	size_t written;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> </div><div class='ctx'> 	set_random_data(writebuf, subpgsize);</div><div class='del'>-	err = mtd-&gt;write(mtd, addr, subpgsize, &amp;written, writebuf);</div><div class='add'>+	err = mtd_write(mtd, addr, subpgsize, &amp;written, writebuf);</div><div class='ctx'> 	if (unlikely(err || written != subpgsize)) {</div><div class='ctx'> 		printk(PRINT_PREF "error: write failed at %#llx\n",</div><div class='ctx'> 		       (long long)addr);</div><div class='hunk'>@@ -134,7 +134,7 @@ static int write_eraseblock(int ebnum)</div><div class='ctx'> 	addr += subpgsize;</div><div class='ctx'> </div><div class='ctx'> 	set_random_data(writebuf, subpgsize);</div><div class='del'>-	err = mtd-&gt;write(mtd, addr, subpgsize, &amp;written, writebuf);</div><div class='add'>+	err = mtd_write(mtd, addr, subpgsize, &amp;written, writebuf);</div><div class='ctx'> 	if (unlikely(err || written != subpgsize)) {</div><div class='ctx'> 		printk(PRINT_PREF "error: write failed at %#llx\n",</div><div class='ctx'> 		       (long long)addr);</div><div class='hunk'>@@ -150,7 +150,7 @@ static int write_eraseblock(int ebnum)</div><div class='ctx'> </div><div class='ctx'> static int write_eraseblock2(int ebnum)</div><div class='ctx'> {</div><div class='del'>-	size_t written = 0;</div><div class='add'>+	size_t written;</div><div class='ctx'> 	int err = 0, k;</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> </div><div class='hunk'>@@ -158,7 +158,7 @@ static int write_eraseblock2(int ebnum)</div><div class='ctx'> 		if (addr + (subpgsize * k) &gt; (ebnum + 1) * mtd-&gt;erasesize)</div><div class='ctx'> 			break;</div><div class='ctx'> 		set_random_data(writebuf, subpgsize * k);</div><div class='del'>-		err = mtd-&gt;write(mtd, addr, subpgsize * k, &amp;written, writebuf);</div><div class='add'>+		err = mtd_write(mtd, addr, subpgsize * k, &amp;written, writebuf);</div><div class='ctx'> 		if (unlikely(err || written != subpgsize * k)) {</div><div class='ctx'> 			printk(PRINT_PREF "error: write failed at %#llx\n",</div><div class='ctx'> 			       (long long)addr);</div><div class='hunk'>@@ -189,14 +189,13 @@ static void print_subpage(unsigned char *p)</div><div class='ctx'> </div><div class='ctx'> static int verify_eraseblock(int ebnum)</div><div class='ctx'> {</div><div class='del'>-	size_t read = 0;</div><div class='add'>+	size_t read;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> </div><div class='ctx'> 	set_random_data(writebuf, subpgsize);</div><div class='ctx'> 	clear_data(readbuf, subpgsize);</div><div class='del'>-	read = 0;</div><div class='del'>-	err = mtd-&gt;read(mtd, addr, subpgsize, &amp;read, readbuf);</div><div class='add'>+	err = mtd_read(mtd, addr, subpgsize, &amp;read, readbuf);</div><div class='ctx'> 	if (unlikely(err || read != subpgsize)) {</div><div class='ctx'> 		if (mtd_is_bitflip(err) &amp;&amp; read == subpgsize) {</div><div class='ctx'> 			printk(PRINT_PREF "ECC correction at %#llx\n",</div><div class='hunk'>@@ -223,8 +222,7 @@ static int verify_eraseblock(int ebnum)</div><div class='ctx'> </div><div class='ctx'> 	set_random_data(writebuf, subpgsize);</div><div class='ctx'> 	clear_data(readbuf, subpgsize);</div><div class='del'>-	read = 0;</div><div class='del'>-	err = mtd-&gt;read(mtd, addr, subpgsize, &amp;read, readbuf);</div><div class='add'>+	err = mtd_read(mtd, addr, subpgsize, &amp;read, readbuf);</div><div class='ctx'> 	if (unlikely(err || read != subpgsize)) {</div><div class='ctx'> 		if (mtd_is_bitflip(err) &amp;&amp; read == subpgsize) {</div><div class='ctx'> 			printk(PRINT_PREF "ECC correction at %#llx\n",</div><div class='hunk'>@@ -252,7 +250,7 @@ static int verify_eraseblock(int ebnum)</div><div class='ctx'> </div><div class='ctx'> static int verify_eraseblock2(int ebnum)</div><div class='ctx'> {</div><div class='del'>-	size_t read = 0;</div><div class='add'>+	size_t read;</div><div class='ctx'> 	int err = 0, k;</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> </div><div class='hunk'>@@ -261,8 +259,7 @@ static int verify_eraseblock2(int ebnum)</div><div class='ctx'> 			break;</div><div class='ctx'> 		set_random_data(writebuf, subpgsize * k);</div><div class='ctx'> 		clear_data(readbuf, subpgsize * k);</div><div class='del'>-		read = 0;</div><div class='del'>-		err = mtd-&gt;read(mtd, addr, subpgsize * k, &amp;read, readbuf);</div><div class='add'>+		err = mtd_read(mtd, addr, subpgsize * k, &amp;read, readbuf);</div><div class='ctx'> 		if (unlikely(err || read != subpgsize * k)) {</div><div class='ctx'> 			if (mtd_is_bitflip(err) &amp;&amp; read == subpgsize * k) {</div><div class='ctx'> 				printk(PRINT_PREF "ECC correction at %#llx\n",</div><div class='hunk'>@@ -288,15 +285,14 @@ static int verify_eraseblock2(int ebnum)</div><div class='ctx'> static int verify_eraseblock_ff(int ebnum)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t j;</div><div class='del'>-	size_t read = 0;</div><div class='add'>+	size_t read;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> </div><div class='ctx'> 	memset(writebuf, 0xff, subpgsize);</div><div class='ctx'> 	for (j = 0; j &lt; mtd-&gt;erasesize / subpgsize; ++j) {</div><div class='ctx'> 		clear_data(readbuf, subpgsize);</div><div class='del'>-		read = 0;</div><div class='del'>-		err = mtd-&gt;read(mtd, addr, subpgsize, &amp;read, readbuf);</div><div class='add'>+		err = mtd_read(mtd, addr, subpgsize, &amp;read, readbuf);</div><div class='ctx'> 		if (unlikely(err || read != subpgsize)) {</div><div class='ctx'> 			if (mtd_is_bitflip(err) &amp;&amp; read == subpgsize) {</div><div class='ctx'> 				printk(PRINT_PREF "ECC correction at %#llx\n",</div><div class='hunk'>@@ -344,7 +340,7 @@ static int is_block_bad(int ebnum)</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = mtd-&gt;block_isbad(mtd, addr);</div><div class='add'>+	ret = mtd_block_isbad(mtd, addr);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		printk(PRINT_PREF "block %d is bad\n", ebnum);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/mtd/tests/mtd_torturetest.c b/drivers/mtd/tests/mtd_torturetest.c<br/>index 03ab649a6964..b65861bc7b8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/tests/mtd_torturetest.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/tests/mtd_torturetest.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/tests/mtd_torturetest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/tests/mtd_torturetest.c</a></div><div class='hunk'>@@ -105,7 +105,7 @@ static inline int erase_eraseblock(int ebnum)</div><div class='ctx'> 	ei.addr = addr;</div><div class='ctx'> 	ei.len  = mtd-&gt;erasesize;</div><div class='ctx'> </div><div class='del'>-	err = mtd-&gt;erase(mtd, &amp;ei);</div><div class='add'>+	err = mtd_erase(mtd, &amp;ei);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(PRINT_PREF "error %d while erasing EB %d\n", err, ebnum);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -127,7 +127,7 @@ static inline int erase_eraseblock(int ebnum)</div><div class='ctx'> static inline int check_eraseblock(int ebnum, unsigned char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int err, retries = 0;</div><div class='del'>-	size_t read = 0;</div><div class='add'>+	size_t read;</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> 	size_t len = mtd-&gt;erasesize;</div><div class='ctx'> </div><div class='hunk'>@@ -137,7 +137,7 @@ static inline int check_eraseblock(int ebnum, unsigned char *buf)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='del'>-	err = mtd-&gt;read(mtd, addr, len, &amp;read, check_buf);</div><div class='add'>+	err = mtd_read(mtd, addr, len, &amp;read, check_buf);</div><div class='ctx'> 	if (mtd_is_bitflip(err))</div><div class='ctx'> 		printk(PRINT_PREF "single bit flip occurred at EB %d "</div><div class='ctx'> 		       "MTD reported that it was fixed.\n", ebnum);</div><div class='hunk'>@@ -181,7 +181,7 @@ retry:</div><div class='ctx'> static inline int write_pattern(int ebnum, void *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	size_t written = 0;</div><div class='add'>+	size_t written;</div><div class='ctx'> 	loff_t addr = ebnum * mtd-&gt;erasesize;</div><div class='ctx'> 	size_t len = mtd-&gt;erasesize;</div><div class='ctx'> </div><div class='hunk'>@@ -189,7 +189,7 @@ static inline int write_pattern(int ebnum, void *buf)</div><div class='ctx'> 		addr = (ebnum + 1) * mtd-&gt;erasesize - pgcnt * pgsize;</div><div class='ctx'> 		len = pgcnt * pgsize;</div><div class='ctx'> 	}</div><div class='del'>-	err = mtd-&gt;write(mtd, addr, len, &amp;written, buf);</div><div class='add'>+	err = mtd_write(mtd, addr, len, &amp;written, buf);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(PRINT_PREF "error %d while writing EB %d, written %zd"</div><div class='ctx'> 		      " bytes\n", err, ebnum, written);</div><div class='hunk'>@@ -290,10 +290,9 @@ static int __init tort_init(void)</div><div class='ctx'> 	 * Check if there is a bad eraseblock among those we are going to test.</div><div class='ctx'> 	 */</div><div class='ctx'> 	memset(&amp;bad_ebs[0], 0, sizeof(int) * ebcnt);</div><div class='del'>-	if (mtd-&gt;block_isbad) {</div><div class='add'>+	if (mtd_can_have_bb(mtd)) {</div><div class='ctx'> 		for (i = eb; i &lt; eb + ebcnt; i++) {</div><div class='del'>-			err = mtd-&gt;block_isbad(mtd,</div><div class='del'>-					       (loff_t)i * mtd-&gt;erasesize);</div><div class='add'>+			err = mtd_block_isbad(mtd, (loff_t)i * mtd-&gt;erasesize);</div><div class='ctx'> </div><div class='ctx'> 			if (err &lt; 0) {</div><div class='ctx'> 				printk(PRINT_PREF "block_isbad() returned %d "</div><div class='head'>diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c<br/>index 6c3fb5ab20f5..115749f20f9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/build.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/build.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/build.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/ubi/build.c</a></div><div class='hunk'>@@ -664,7 +664,7 @@ static int io_init(struct ubi_device *ubi)</div><div class='ctx'> 	ubi-&gt;peb_count  = mtd_div_by_eb(ubi-&gt;mtd-&gt;size, ubi-&gt;mtd);</div><div class='ctx'> 	ubi-&gt;flash_size = ubi-&gt;mtd-&gt;size;</div><div class='ctx'> </div><div class='del'>-	if (ubi-&gt;mtd-&gt;block_isbad &amp;&amp; ubi-&gt;mtd-&gt;block_markbad)</div><div class='add'>+	if (mtd_can_have_bb(ubi-&gt;mtd))</div><div class='ctx'> 		ubi-&gt;bad_allowed = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (ubi-&gt;mtd-&gt;type == MTD_NORFLASH) {</div><div class='head'>diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c<br/>index 3320a50ba4f0..ad76592fb2f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/cdev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/cdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/cdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/ubi/cdev.c</a></div><div class='hunk'>@@ -632,6 +632,9 @@ static int verify_mkvol_req(const struct ubi_device *ubi,</div><div class='ctx'> 	if (req-&gt;alignment != 1 &amp;&amp; n)</div><div class='ctx'> 		goto bad;</div><div class='ctx'> </div><div class='add'>+	if (!req-&gt;name[0] || !req-&gt;name_len)</div><div class='add'>+		goto bad;</div><div class='add'>+</div><div class='ctx'> 	if (req-&gt;name_len &gt; UBI_VOL_NAME_MAX) {</div><div class='ctx'> 		err = -ENAMETOOLONG;</div><div class='ctx'> 		goto bad;</div><div class='head'>diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c<br/>index ab80c0debac8..e2cdebf40840 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/debug.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/ubi/debug.c</a></div><div class='hunk'>@@ -216,7 +216,7 @@ void ubi_dbg_dump_flash(struct ubi_device *ubi, int pnum, int offset, int len)</div><div class='ctx'> 	buf = vmalloc(len);</div><div class='ctx'> 	if (!buf)</div><div class='ctx'> 		return;</div><div class='del'>-	err = ubi-&gt;mtd-&gt;read(ubi-&gt;mtd, addr, len, &amp;read, buf);</div><div class='add'>+	err = mtd_read(ubi-&gt;mtd, addr, len, &amp;read, buf);</div><div class='ctx'> 	if (err &amp;&amp; err != -EUCLEAN) {</div><div class='ctx'> 		ubi_err("error %d while reading %d bytes from PEB %d:%d, "</div><div class='ctx'> 			"read %zd bytes", err, len, pnum, offset, read);</div><div class='head'>diff --git a/drivers/mtd/ubi/debug.h b/drivers/mtd/ubi/debug.h<br/>index 64fbb0021825..ead2cd16ba75 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/debug.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/debug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/ubi/debug.h</a></div><div class='hunk'>@@ -43,7 +43,10 @@</div><div class='ctx'> 	pr_debug("UBI DBG " type ": " fmt "\n", ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> /* Just a debugging messages not related to any specific UBI subsystem */</div><div class='del'>-#define dbg_msg(fmt, ...) ubi_dbg_msg("msg", fmt, ##__VA_ARGS__)</div><div class='add'>+#define dbg_msg(fmt, ...)                                    \</div><div class='add'>+	printk(KERN_DEBUG "UBI DBG (pid %d): %s: " fmt "\n", \</div><div class='add'>+	       current-&gt;pid, __func__, ##__VA_ARGS__)</div><div class='add'>+</div><div class='ctx'> /* General debugging messages */</div><div class='ctx'> #define dbg_gen(fmt, ...) ubi_dbg_msg("gen", fmt, ##__VA_ARGS__)</div><div class='ctx'> /* Messages from the eraseblock association sub-system */</div><div class='head'>diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c<br/>index fb7f19b62d91..cd26da8ad225 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/eba.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/eba.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/eba.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/ubi/eba.c</a></div><div class='hunk'>@@ -1028,12 +1028,14 @@ int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to,</div><div class='ctx'> 	 * 'ubi_wl_put_peb()' function on the @ubi-&gt;move_mutex. In turn, we are</div><div class='ctx'> 	 * holding @ubi-&gt;move_mutex and go sleep on the LEB lock. So, if the</div><div class='ctx'> 	 * LEB is already locked, we just do not move it and return</div><div class='del'>-	 * %MOVE_CANCEL_RACE, which means that UBI will re-try, but later.</div><div class='add'>+	 * %MOVE_RETRY. Note, we do not return %MOVE_CANCEL_RACE here because</div><div class='add'>+	 * we do not know the reasons of the contention - it may be just a</div><div class='add'>+	 * normal I/O on this LEB, so we want to re-try.</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = leb_write_trylock(ubi, vol_id, lnum);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dbg_wl("contention on LEB %d:%d, cancel", vol_id, lnum);</div><div class='del'>-		return MOVE_CANCEL_RACE;</div><div class='add'>+		return MOVE_RETRY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c<br/>index f20b6f22f240..5cde4e5ca3e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/io.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/ubi/io.c</a></div><div class='hunk'>@@ -170,7 +170,7 @@ int ubi_io_read(const struct ubi_device *ubi, void *buf, int pnum, int offset,</div><div class='ctx'> </div><div class='ctx'> 	addr = (loff_t)pnum * ubi-&gt;peb_size + offset;</div><div class='ctx'> retry:</div><div class='del'>-	err = ubi-&gt;mtd-&gt;read(ubi-&gt;mtd, addr, len, &amp;read, buf);</div><div class='add'>+	err = mtd_read(ubi-&gt;mtd, addr, len, &amp;read, buf);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		const char *errstr = mtd_is_eccerr(err) ? " (ECC error)" : "";</div><div class='ctx'> </div><div class='hunk'>@@ -289,7 +289,7 @@ int ubi_io_write(struct ubi_device *ubi, const void *buf, int pnum, int offset,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	addr = (loff_t)pnum * ubi-&gt;peb_size + offset;</div><div class='del'>-	err = ubi-&gt;mtd-&gt;write(ubi-&gt;mtd, addr, len, &amp;written, buf);</div><div class='add'>+	err = mtd_write(ubi-&gt;mtd, addr, len, &amp;written, buf);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		ubi_err("error %d while writing %d bytes to PEB %d:%d, written "</div><div class='ctx'> 			"%zd bytes", err, len, pnum, offset, written);</div><div class='hunk'>@@ -361,7 +361,7 @@ retry:</div><div class='ctx'> 	ei.callback = erase_callback;</div><div class='ctx'> 	ei.priv     = (unsigned long)&amp;wq;</div><div class='ctx'> </div><div class='del'>-	err = ubi-&gt;mtd-&gt;erase(ubi-&gt;mtd, &amp;ei);</div><div class='add'>+	err = mtd_erase(ubi-&gt;mtd, &amp;ei);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		if (retries++ &lt; UBI_IO_RETRIES) {</div><div class='ctx'> 			dbg_io("error %d while erasing PEB %d, retry",</div><div class='hunk'>@@ -525,11 +525,10 @@ static int nor_erase_prepare(struct ubi_device *ubi, int pnum)</div><div class='ctx'> 	 * the header comment in scan.c for more information).</div><div class='ctx'> 	 */</div><div class='ctx'> 	addr = (loff_t)pnum * ubi-&gt;peb_size;</div><div class='del'>-	err = ubi-&gt;mtd-&gt;write(ubi-&gt;mtd, addr, 4, &amp;written, (void *)&amp;data);</div><div class='add'>+	err = mtd_write(ubi-&gt;mtd, addr, 4, &amp;written, (void *)&amp;data);</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		addr += ubi-&gt;vid_hdr_aloffset;</div><div class='del'>-		err = ubi-&gt;mtd-&gt;write(ubi-&gt;mtd, addr, 4, &amp;written,</div><div class='del'>-				      (void *)&amp;data);</div><div class='add'>+		err = mtd_write(ubi-&gt;mtd, addr, 4, &amp;written, (void *)&amp;data);</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -635,7 +634,7 @@ int ubi_io_is_bad(const struct ubi_device *ubi, int pnum)</div><div class='ctx'> 	if (ubi-&gt;bad_allowed) {</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='del'>-		ret = mtd-&gt;block_isbad(mtd, (loff_t)pnum * ubi-&gt;peb_size);</div><div class='add'>+		ret = mtd_block_isbad(mtd, (loff_t)pnum * ubi-&gt;peb_size);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			ubi_err("error %d while checking if PEB %d is bad",</div><div class='ctx'> 				ret, pnum);</div><div class='hunk'>@@ -670,7 +669,7 @@ int ubi_io_mark_bad(const struct ubi_device *ubi, int pnum)</div><div class='ctx'> 	if (!ubi-&gt;bad_allowed)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	err = mtd-&gt;block_markbad(mtd, (loff_t)pnum * ubi-&gt;peb_size);</div><div class='add'>+	err = mtd_block_markbad(mtd, (loff_t)pnum * ubi-&gt;peb_size);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		ubi_err("cannot mark PEB %d bad, error %d", pnum, err);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1357,7 +1356,7 @@ int ubi_dbg_check_write(struct ubi_device *ubi, const void *buf, int pnum,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ubi-&gt;mtd-&gt;read(ubi-&gt;mtd, addr, len, &amp;read, buf1);</div><div class='add'>+	err = mtd_read(ubi-&gt;mtd, addr, len, &amp;read, buf1);</div><div class='ctx'> 	if (err &amp;&amp; !mtd_is_bitflip(err))</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='hunk'>@@ -1421,7 +1420,7 @@ int ubi_dbg_check_all_ff(struct ubi_device *ubi, int pnum, int offset, int len)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ubi-&gt;mtd-&gt;read(ubi-&gt;mtd, addr, len, &amp;read, buf);</div><div class='add'>+	err = mtd_read(ubi-&gt;mtd, addr, len, &amp;read, buf);</div><div class='ctx'> 	if (err &amp;&amp; !mtd_is_bitflip(err)) {</div><div class='ctx'> 		ubi_err("error %d while reading %d bytes from PEB %d:%d, "</div><div class='ctx'> 			"read %zd bytes", err, len, pnum, offset, read);</div><div class='head'>diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c<br/>index 1a35fc5e3b40..9fdb35367fe0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/kapi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/kapi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/kapi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/ubi/kapi.c</a></div><div class='hunk'>@@ -714,9 +714,7 @@ int ubi_sync(int ubi_num)</div><div class='ctx'> 	if (!ubi)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (ubi-&gt;mtd-&gt;sync)</div><div class='del'>-		ubi-&gt;mtd-&gt;sync(ubi-&gt;mtd);</div><div class='del'>-</div><div class='add'>+	mtd_sync(ubi-&gt;mtd);</div><div class='ctx'> 	ubi_put_device(ubi);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h<br/>index dc64c767fd21..d51d75d34446 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/ubi.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/ubi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/ubi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/ubi/ubi.h</a></div><div class='hunk'>@@ -120,6 +120,7 @@ enum {</div><div class='ctx'>  *                     PEB</div><div class='ctx'>  * MOVE_CANCEL_BITFLIPS: canceled because a bit-flip was detected in the</div><div class='ctx'>  *                       target PEB</div><div class='add'>+ * MOVE_RETRY: retry scrubbing the PEB</div><div class='ctx'>  */</div><div class='ctx'> enum {</div><div class='ctx'> 	MOVE_CANCEL_RACE = 1,</div><div class='hunk'>@@ -127,6 +128,7 @@ enum {</div><div class='ctx'> 	MOVE_TARGET_RD_ERR,</div><div class='ctx'> 	MOVE_TARGET_WR_ERR,</div><div class='ctx'> 	MOVE_CANCEL_BITFLIPS,</div><div class='add'>+	MOVE_RETRY,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c<br/>index 9ad18da1891d..17cec0c01544 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/vtbl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/vtbl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/vtbl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/ubi/vtbl.c</a></div><div class='hunk'>@@ -306,7 +306,7 @@ static int create_vtbl(struct ubi_device *ubi, struct ubi_scan_info *si,</div><div class='ctx'> 		       int copy, void *vtbl)</div><div class='ctx'> {</div><div class='ctx'> 	int err, tries = 0;</div><div class='del'>-	static struct ubi_vid_hdr *vid_hdr;</div><div class='add'>+	struct ubi_vid_hdr *vid_hdr;</div><div class='ctx'> 	struct ubi_scan_leb *new_seb;</div><div class='ctx'> </div><div class='ctx'> 	ubi_msg("create volume table (copy #%d)", copy + 1);</div><div class='hunk'>@@ -322,7 +322,7 @@ retry:</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vid_hdr-&gt;vol_type = UBI_VID_DYNAMIC;</div><div class='add'>+	vid_hdr-&gt;vol_type = UBI_LAYOUT_VOLUME_TYPE;</div><div class='ctx'> 	vid_hdr-&gt;vol_id = cpu_to_be32(UBI_LAYOUT_VOLUME_ID);</div><div class='ctx'> 	vid_hdr-&gt;compat = UBI_LAYOUT_VOLUME_COMPAT;</div><div class='ctx'> 	vid_hdr-&gt;data_size = vid_hdr-&gt;used_ebs =</div><div class='hunk'>@@ -632,7 +632,7 @@ static int init_volumes(struct ubi_device *ubi, const struct ubi_scan_info *si,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	vol-&gt;reserved_pebs = UBI_LAYOUT_VOLUME_EBS;</div><div class='del'>-	vol-&gt;alignment = 1;</div><div class='add'>+	vol-&gt;alignment = UBI_LAYOUT_VOLUME_ALIGN;</div><div class='ctx'> 	vol-&gt;vol_type = UBI_DYNAMIC_VOLUME;</div><div class='ctx'> 	vol-&gt;name_len = sizeof(UBI_LAYOUT_VOLUME_NAME) - 1;</div><div class='ctx'> 	memcpy(vol-&gt;name, UBI_LAYOUT_VOLUME_NAME, vol-&gt;name_len + 1);</div><div class='head'>diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c<br/>index 42c684cf3688..0696e36b0539 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/wl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/mtd/ubi/wl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/ubi/wl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/mtd/ubi/wl.c</a></div><div class='hunk'>@@ -795,7 +795,10 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk,</div><div class='ctx'> 			protect = 1;</div><div class='ctx'> 			goto out_not_moved;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='add'>+		if (err == MOVE_RETRY) {</div><div class='add'>+			scrubbing = 1;</div><div class='add'>+			goto out_not_moved;</div><div class='add'>+		}</div><div class='ctx'> 		if (err == MOVE_CANCEL_BITFLIPS || err == MOVE_TARGET_WR_ERR ||</div><div class='ctx'> 		    err == MOVE_TARGET_RD_ERR) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -1049,7 +1052,6 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk,</div><div class='ctx'> </div><div class='ctx'> 	ubi_err("failed to erase PEB %d, error %d", pnum, err);</div><div class='ctx'> 	kfree(wl_wrk);</div><div class='del'>-	kmem_cache_free(ubi_wl_entry_slab, e);</div><div class='ctx'> </div><div class='ctx'> 	if (err == -EINTR || err == -ENOMEM || err == -EAGAIN ||</div><div class='ctx'> 	    err == -EBUSY) {</div><div class='hunk'>@@ -1062,14 +1064,16 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk,</div><div class='ctx'> 			goto out_ro;</div><div class='ctx'> 		}</div><div class='ctx'> 		return err;</div><div class='del'>-	} else if (err != -EIO) {</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kmem_cache_free(ubi_wl_entry_slab, e);</div><div class='add'>+	if (err != -EIO)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If this is not %-EIO, we have no idea what to do. Scheduling</div><div class='ctx'> 		 * this physical eraseblock for erasure again would cause</div><div class='ctx'> 		 * errors again and again. Well, lets switch to R/O mode.</div><div class='ctx'> 		 */</div><div class='ctx'> 		goto out_ro;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* It is %-EIO, the PEB went bad */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig<br/>index 654a5e94e0e7..b98285446a5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/Kconfig</a></div><div class='hunk'>@@ -125,6 +125,8 @@ config IFB</div><div class='ctx'> 	  'ifb1' etc.</div><div class='ctx'> 	  Look at the iproute2 documentation directory for usage etc</div><div class='ctx'> </div><div class='add'>+source "drivers/net/team/Kconfig"</div><div class='add'>+</div><div class='ctx'> config MACVLAN</div><div class='ctx'> 	tristate "MAC-VLAN support (EXPERIMENTAL)"</div><div class='ctx'> 	depends on EXPERIMENTAL</div><div class='hunk'>@@ -241,6 +243,8 @@ source "drivers/atm/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/net/caif/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "drivers/net/dsa/Kconfig"</div><div class='add'>+</div><div class='ctx'> source "drivers/net/ethernet/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/net/fddi/Kconfig"</div><div class='hunk'>@@ -338,4 +342,6 @@ config VMXNET3</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called vmxnet3.</div><div class='ctx'> </div><div class='add'>+source "drivers/net/hyperv/Kconfig"</div><div class='add'>+</div><div class='ctx'> endif # NETDEVICES</div><div class='head'>diff --git a/drivers/net/Makefile b/drivers/net/Makefile<br/>index fa877cd2b139..a6b8ce11a22f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/Makefile</a></div><div class='hunk'>@@ -17,6 +17,7 @@ obj-$(CONFIG_NET) += Space.o loopback.o</div><div class='ctx'> obj-$(CONFIG_NETCONSOLE) += netconsole.o</div><div class='ctx'> obj-$(CONFIG_PHYLIB) += phy/</div><div class='ctx'> obj-$(CONFIG_RIONET) += rionet.o</div><div class='add'>+obj-$(CONFIG_NET_TEAM) += team/</div><div class='ctx'> obj-$(CONFIG_TUN) += tun.o</div><div class='ctx'> obj-$(CONFIG_VETH) += veth.o</div><div class='ctx'> obj-$(CONFIG_VIRTIO_NET) += virtio_net.o</div><div class='hunk'>@@ -29,6 +30,7 @@ obj-$(CONFIG_DEV_APPLETALK) += appletalk/</div><div class='ctx'> obj-$(CONFIG_CAIF) += caif/</div><div class='ctx'> obj-$(CONFIG_CAN) += can/</div><div class='ctx'> obj-$(CONFIG_ETRAX_ETHERNET) += cris/</div><div class='add'>+obj-$(CONFIG_NET_DSA) += dsa/</div><div class='ctx'> obj-$(CONFIG_ETHERNET) += ethernet/</div><div class='ctx'> obj-$(CONFIG_FDDI) += fddi/</div><div class='ctx'> obj-$(CONFIG_HIPPI) += hippi/</div><div class='hunk'>@@ -66,3 +68,5 @@ obj-$(CONFIG_USB_USBNET)        += usb/</div><div class='ctx'> obj-$(CONFIG_USB_ZD1201)        += usb/</div><div class='ctx'> obj-$(CONFIG_USB_IPHETH)        += usb/</div><div class='ctx'> obj-$(CONFIG_USB_CDC_PHONET)   += usb/</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_HYPERV_NET) += hyperv/</div><div class='head'>diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c<br/>index 106b88a04738..342626f4bc46 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bonding/bond_alb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/bonding/bond_alb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bonding/bond_alb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/bonding/bond_alb.c</a></div><div class='hunk'>@@ -99,16 +99,26 @@ static inline u8 _simple_hash(const u8 *hash_start, int hash_size)</div><div class='ctx'> </div><div class='ctx'> /*********************** tlb specific functions ***************************/</div><div class='ctx'> </div><div class='del'>-static inline void _lock_tx_hashtbl(struct bonding *bond)</div><div class='add'>+static inline void _lock_tx_hashtbl_bh(struct bonding *bond)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock_bh(&amp;(BOND_ALB_INFO(bond).tx_hashtbl_lock));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void _unlock_tx_hashtbl(struct bonding *bond)</div><div class='add'>+static inline void _unlock_tx_hashtbl_bh(struct bonding *bond)</div><div class='ctx'> {</div><div class='ctx'> 	spin_unlock_bh(&amp;(BOND_ALB_INFO(bond).tx_hashtbl_lock));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void _lock_tx_hashtbl(struct bonding *bond)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;(BOND_ALB_INFO(bond).tx_hashtbl_lock));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void _unlock_tx_hashtbl(struct bonding *bond)</div><div class='add'>+{</div><div class='add'>+	spin_unlock(&amp;(BOND_ALB_INFO(bond).tx_hashtbl_lock));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Caller must hold tx_hashtbl lock */</div><div class='ctx'> static inline void tlb_init_table_entry(struct tlb_client_info *entry, int save_load)</div><div class='ctx'> {</div><div class='hunk'>@@ -129,14 +139,13 @@ static inline void tlb_init_slave(struct slave *slave)</div><div class='ctx'> 	SLAVE_TLB_INFO(slave).head = TLB_NULL_INDEX;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Caller must hold bond lock for read */</div><div class='del'>-static void tlb_clear_slave(struct bonding *bond, struct slave *slave, int save_load)</div><div class='add'>+/* Caller must hold bond lock for read, BH disabled */</div><div class='add'>+static void __tlb_clear_slave(struct bonding *bond, struct slave *slave,</div><div class='add'>+			 int save_load)</div><div class='ctx'> {</div><div class='ctx'> 	struct tlb_client_info *tx_hash_table;</div><div class='ctx'> 	u32 index;</div><div class='ctx'> </div><div class='del'>-	_lock_tx_hashtbl(bond);</div><div class='del'>-</div><div class='ctx'> 	/* clear slave from tx_hashtbl */</div><div class='ctx'> 	tx_hash_table = BOND_ALB_INFO(bond).tx_hashtbl;</div><div class='ctx'> </div><div class='hunk'>@@ -151,8 +160,15 @@ static void tlb_clear_slave(struct bonding *bond, struct slave *slave, int save_</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tlb_init_slave(slave);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	_unlock_tx_hashtbl(bond);</div><div class='add'>+/* Caller must hold bond lock for read */</div><div class='add'>+static void tlb_clear_slave(struct bonding *bond, struct slave *slave,</div><div class='add'>+			 int save_load)</div><div class='add'>+{</div><div class='add'>+	_lock_tx_hashtbl_bh(bond);</div><div class='add'>+	__tlb_clear_slave(bond, slave, save_load);</div><div class='add'>+	_unlock_tx_hashtbl_bh(bond);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Must be called before starting the monitor timer */</div><div class='hunk'>@@ -169,7 +185,7 @@ static int tlb_initialize(struct bonding *bond)</div><div class='ctx'> 		       bond-&gt;dev-&gt;name);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='del'>-	_lock_tx_hashtbl(bond);</div><div class='add'>+	_lock_tx_hashtbl_bh(bond);</div><div class='ctx'> </div><div class='ctx'> 	bond_info-&gt;tx_hashtbl = new_hashtbl;</div><div class='ctx'> </div><div class='hunk'>@@ -177,7 +193,7 @@ static int tlb_initialize(struct bonding *bond)</div><div class='ctx'> 		tlb_init_table_entry(&amp;bond_info-&gt;tx_hashtbl[i], 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	_unlock_tx_hashtbl(bond);</div><div class='add'>+	_unlock_tx_hashtbl_bh(bond);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -187,12 +203,12 @@ static void tlb_deinitialize(struct bonding *bond)</div><div class='ctx'> {</div><div class='ctx'> 	struct alb_bond_info *bond_info = &amp;(BOND_ALB_INFO(bond));</div><div class='ctx'> </div><div class='del'>-	_lock_tx_hashtbl(bond);</div><div class='add'>+	_lock_tx_hashtbl_bh(bond);</div><div class='ctx'> </div><div class='ctx'> 	kfree(bond_info-&gt;tx_hashtbl);</div><div class='ctx'> 	bond_info-&gt;tx_hashtbl = NULL;</div><div class='ctx'> </div><div class='del'>-	_unlock_tx_hashtbl(bond);</div><div class='add'>+	_unlock_tx_hashtbl_bh(bond);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long long compute_gap(struct slave *slave)</div><div class='hunk'>@@ -226,15 +242,13 @@ static struct slave *tlb_get_least_loaded_slave(struct bonding *bond)</div><div class='ctx'> 	return least_loaded;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Caller must hold bond lock for read */</div><div class='del'>-static struct slave *tlb_choose_channel(struct bonding *bond, u32 hash_index, u32 skb_len)</div><div class='add'>+static struct slave *__tlb_choose_channel(struct bonding *bond, u32 hash_index,</div><div class='add'>+						u32 skb_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct alb_bond_info *bond_info = &amp;(BOND_ALB_INFO(bond));</div><div class='ctx'> 	struct tlb_client_info *hash_table;</div><div class='ctx'> 	struct slave *assigned_slave;</div><div class='ctx'> </div><div class='del'>-	_lock_tx_hashtbl(bond);</div><div class='del'>-</div><div class='ctx'> 	hash_table = bond_info-&gt;tx_hashtbl;</div><div class='ctx'> 	assigned_slave = hash_table[hash_index].tx_slave;</div><div class='ctx'> 	if (!assigned_slave) {</div><div class='hunk'>@@ -263,22 +277,46 @@ static struct slave *tlb_choose_channel(struct bonding *bond, u32 hash_index, u3</div><div class='ctx'> 		hash_table[hash_index].tx_bytes += skb_len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	_unlock_tx_hashtbl(bond);</div><div class='del'>-</div><div class='ctx'> 	return assigned_slave;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Caller must hold bond lock for read */</div><div class='add'>+static struct slave *tlb_choose_channel(struct bonding *bond, u32 hash_index,</div><div class='add'>+					u32 skb_len)</div><div class='add'>+{</div><div class='add'>+	struct slave *tx_slave;</div><div class='add'>+	/*</div><div class='add'>+	 * We don't need to disable softirq here, becase</div><div class='add'>+	 * tlb_choose_channel() is only called by bond_alb_xmit()</div><div class='add'>+	 * which already has softirq disabled.</div><div class='add'>+	 */</div><div class='add'>+	_lock_tx_hashtbl(bond);</div><div class='add'>+	tx_slave = __tlb_choose_channel(bond, hash_index, skb_len);</div><div class='add'>+	_unlock_tx_hashtbl(bond);</div><div class='add'>+	return tx_slave;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*********************** rlb specific functions ***************************/</div><div class='del'>-static inline void _lock_rx_hashtbl(struct bonding *bond)</div><div class='add'>+static inline void _lock_rx_hashtbl_bh(struct bonding *bond)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock_bh(&amp;(BOND_ALB_INFO(bond).rx_hashtbl_lock));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void _unlock_rx_hashtbl(struct bonding *bond)</div><div class='add'>+static inline void _unlock_rx_hashtbl_bh(struct bonding *bond)</div><div class='ctx'> {</div><div class='ctx'> 	spin_unlock_bh(&amp;(BOND_ALB_INFO(bond).rx_hashtbl_lock));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void _lock_rx_hashtbl(struct bonding *bond)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;(BOND_ALB_INFO(bond).rx_hashtbl_lock));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void _unlock_rx_hashtbl(struct bonding *bond)</div><div class='add'>+{</div><div class='add'>+	spin_unlock(&amp;(BOND_ALB_INFO(bond).rx_hashtbl_lock));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* when an ARP REPLY is received from a client update its info</div><div class='ctx'>  * in the rx_hashtbl</div><div class='ctx'>  */</div><div class='hunk'>@@ -288,7 +326,7 @@ static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp)</div><div class='ctx'> 	struct rlb_client_info *client_info;</div><div class='ctx'> 	u32 hash_index;</div><div class='ctx'> </div><div class='del'>-	_lock_rx_hashtbl(bond);</div><div class='add'>+	_lock_rx_hashtbl_bh(bond);</div><div class='ctx'> </div><div class='ctx'> 	hash_index = _simple_hash((u8*)&amp;(arp-&gt;ip_src), sizeof(arp-&gt;ip_src));</div><div class='ctx'> 	client_info = &amp;(bond_info-&gt;rx_hashtbl[hash_index]);</div><div class='hunk'>@@ -303,7 +341,7 @@ static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp)</div><div class='ctx'> 		bond_info-&gt;rx_ntt = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	_unlock_rx_hashtbl(bond);</div><div class='add'>+	_unlock_rx_hashtbl_bh(bond);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rlb_arp_recv(struct sk_buff *skb, struct bonding *bond,</div><div class='hunk'>@@ -401,7 +439,7 @@ static void rlb_clear_slave(struct bonding *bond, struct slave *slave)</div><div class='ctx'> 	u32 index, next_index;</div><div class='ctx'> </div><div class='ctx'> 	/* clear slave from rx_hashtbl */</div><div class='del'>-	_lock_rx_hashtbl(bond);</div><div class='add'>+	_lock_rx_hashtbl_bh(bond);</div><div class='ctx'> </div><div class='ctx'> 	rx_hash_table = bond_info-&gt;rx_hashtbl;</div><div class='ctx'> 	index = bond_info-&gt;rx_hashtbl_head;</div><div class='hunk'>@@ -432,7 +470,7 @@ static void rlb_clear_slave(struct bonding *bond, struct slave *slave)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	_unlock_rx_hashtbl(bond);</div><div class='add'>+	_unlock_rx_hashtbl_bh(bond);</div><div class='ctx'> </div><div class='ctx'> 	write_lock_bh(&amp;bond-&gt;curr_slave_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -489,7 +527,7 @@ static void rlb_update_rx_clients(struct bonding *bond)</div><div class='ctx'> 	struct rlb_client_info *client_info;</div><div class='ctx'> 	u32 hash_index;</div><div class='ctx'> </div><div class='del'>-	_lock_rx_hashtbl(bond);</div><div class='add'>+	_lock_rx_hashtbl_bh(bond);</div><div class='ctx'> </div><div class='ctx'> 	hash_index = bond_info-&gt;rx_hashtbl_head;</div><div class='ctx'> 	for (; hash_index != RLB_NULL_INDEX; hash_index = client_info-&gt;next) {</div><div class='hunk'>@@ -507,7 +545,7 @@ static void rlb_update_rx_clients(struct bonding *bond)</div><div class='ctx'> 	 */</div><div class='ctx'> 	bond_info-&gt;rlb_update_delay_counter = RLB_UPDATE_DELAY;</div><div class='ctx'> </div><div class='del'>-	_unlock_rx_hashtbl(bond);</div><div class='add'>+	_unlock_rx_hashtbl_bh(bond);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The slave was assigned a new mac address - update the clients */</div><div class='hunk'>@@ -518,7 +556,7 @@ static void rlb_req_update_slave_clients(struct bonding *bond, struct slave *sla</div><div class='ctx'> 	int ntt = 0;</div><div class='ctx'> 	u32 hash_index;</div><div class='ctx'> </div><div class='del'>-	_lock_rx_hashtbl(bond);</div><div class='add'>+	_lock_rx_hashtbl_bh(bond);</div><div class='ctx'> </div><div class='ctx'> 	hash_index = bond_info-&gt;rx_hashtbl_head;</div><div class='ctx'> 	for (; hash_index != RLB_NULL_INDEX; hash_index = client_info-&gt;next) {</div><div class='hunk'>@@ -538,7 +576,7 @@ static void rlb_req_update_slave_clients(struct bonding *bond, struct slave *sla</div><div class='ctx'> 		bond_info-&gt;rlb_update_retry_counter = RLB_UPDATE_RETRY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	_unlock_rx_hashtbl(bond);</div><div class='add'>+	_unlock_rx_hashtbl_bh(bond);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* mark all clients using src_ip to be updated */</div><div class='hunk'>@@ -709,7 +747,7 @@ static void rlb_rebalance(struct bonding *bond)</div><div class='ctx'> 	int ntt;</div><div class='ctx'> 	u32 hash_index;</div><div class='ctx'> </div><div class='del'>-	_lock_rx_hashtbl(bond);</div><div class='add'>+	_lock_rx_hashtbl_bh(bond);</div><div class='ctx'> </div><div class='ctx'> 	ntt = 0;</div><div class='ctx'> 	hash_index = bond_info-&gt;rx_hashtbl_head;</div><div class='hunk'>@@ -727,7 +765,7 @@ static void rlb_rebalance(struct bonding *bond)</div><div class='ctx'> 	if (ntt) {</div><div class='ctx'> 		bond_info-&gt;rx_ntt = 1;</div><div class='ctx'> 	}</div><div class='del'>-	_unlock_rx_hashtbl(bond);</div><div class='add'>+	_unlock_rx_hashtbl_bh(bond);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Caller must hold rx_hashtbl lock */</div><div class='hunk'>@@ -751,7 +789,7 @@ static int rlb_initialize(struct bonding *bond)</div><div class='ctx'> 		       bond-&gt;dev-&gt;name);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='del'>-	_lock_rx_hashtbl(bond);</div><div class='add'>+	_lock_rx_hashtbl_bh(bond);</div><div class='ctx'> </div><div class='ctx'> 	bond_info-&gt;rx_hashtbl = new_hashtbl;</div><div class='ctx'> </div><div class='hunk'>@@ -761,7 +799,7 @@ static int rlb_initialize(struct bonding *bond)</div><div class='ctx'> 		rlb_init_table_entry(bond_info-&gt;rx_hashtbl + i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	_unlock_rx_hashtbl(bond);</div><div class='add'>+	_unlock_rx_hashtbl_bh(bond);</div><div class='ctx'> </div><div class='ctx'> 	/* register to receive ARPs */</div><div class='ctx'> 	bond-&gt;recv_probe = rlb_arp_recv;</div><div class='hunk'>@@ -773,13 +811,13 @@ static void rlb_deinitialize(struct bonding *bond)</div><div class='ctx'> {</div><div class='ctx'> 	struct alb_bond_info *bond_info = &amp;(BOND_ALB_INFO(bond));</div><div class='ctx'> </div><div class='del'>-	_lock_rx_hashtbl(bond);</div><div class='add'>+	_lock_rx_hashtbl_bh(bond);</div><div class='ctx'> </div><div class='ctx'> 	kfree(bond_info-&gt;rx_hashtbl);</div><div class='ctx'> 	bond_info-&gt;rx_hashtbl = NULL;</div><div class='ctx'> 	bond_info-&gt;rx_hashtbl_head = RLB_NULL_INDEX;</div><div class='ctx'> </div><div class='del'>-	_unlock_rx_hashtbl(bond);</div><div class='add'>+	_unlock_rx_hashtbl_bh(bond);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rlb_clear_vlan(struct bonding *bond, unsigned short vlan_id)</div><div class='hunk'>@@ -787,7 +825,7 @@ static void rlb_clear_vlan(struct bonding *bond, unsigned short vlan_id)</div><div class='ctx'> 	struct alb_bond_info *bond_info = &amp;(BOND_ALB_INFO(bond));</div><div class='ctx'> 	u32 curr_index;</div><div class='ctx'> </div><div class='del'>-	_lock_rx_hashtbl(bond);</div><div class='add'>+	_lock_rx_hashtbl_bh(bond);</div><div class='ctx'> </div><div class='ctx'> 	curr_index = bond_info-&gt;rx_hashtbl_head;</div><div class='ctx'> 	while (curr_index != RLB_NULL_INDEX) {</div><div class='hunk'>@@ -812,7 +850,7 @@ static void rlb_clear_vlan(struct bonding *bond, unsigned short vlan_id)</div><div class='ctx'> 		curr_index = next_index;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	_unlock_rx_hashtbl(bond);</div><div class='add'>+	_unlock_rx_hashtbl_bh(bond);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*********************** tlb/rlb shared functions *********************/</div><div class='hunk'>@@ -1320,7 +1358,9 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)</div><div class='ctx'> 		res = bond_dev_queue_xmit(bond, skb, tx_slave-&gt;dev);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (tx_slave) {</div><div class='del'>-			tlb_clear_slave(bond, tx_slave, 0);</div><div class='add'>+			_lock_tx_hashtbl(bond);</div><div class='add'>+			__tlb_clear_slave(bond, tx_slave, 0);</div><div class='add'>+			_unlock_tx_hashtbl(bond);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/bonding/bond_ipv6.c b/drivers/net/bonding/bond_ipv6.c<br/>deleted file mode 100644<br/>index 027a0ee7d85b..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bonding/bond_ipv6.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/bonding/bond_ipv6.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,225 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright(c) 2008 Hewlett-Packard Development Company, L.P.</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</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, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY</div><div class='del'>- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License</div><div class='del'>- * for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License along</div><div class='del'>- * with this program; if not, write to the 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'>- * 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'>- */</div><div class='del'>-</div><div class='del'>-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/if_vlan.h&gt;</div><div class='del'>-#include &lt;net/ipv6.h&gt;</div><div class='del'>-#include &lt;net/ndisc.h&gt;</div><div class='del'>-#include &lt;net/addrconf.h&gt;</div><div class='del'>-#include &lt;net/netns/generic.h&gt;</div><div class='del'>-#include "bonding.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Assign bond-&gt;master_ipv6 to the next IPv6 address in the list, or</div><div class='del'>- * zero it out if there are none.</div><div class='del'>- */</div><div class='del'>-static void bond_glean_dev_ipv6(struct net_device *dev, struct in6_addr *addr)</div><div class='del'>-{</div><div class='del'>-	struct inet6_dev *idev;</div><div class='del'>-</div><div class='del'>-	if (!dev)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	idev = in6_dev_get(dev);</div><div class='del'>-	if (!idev)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	read_lock_bh(&amp;idev-&gt;lock);</div><div class='del'>-	if (!list_empty(&amp;idev-&gt;addr_list)) {</div><div class='del'>-		struct inet6_ifaddr *ifa</div><div class='del'>-			= list_first_entry(&amp;idev-&gt;addr_list,</div><div class='del'>-					   struct inet6_ifaddr, if_list);</div><div class='del'>-		ipv6_addr_copy(addr, &amp;ifa-&gt;addr);</div><div class='del'>-	} else</div><div class='del'>-		ipv6_addr_set(addr, 0, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	read_unlock_bh(&amp;idev-&gt;lock);</div><div class='del'>-</div><div class='del'>-	in6_dev_put(idev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bond_na_send(struct net_device *slave_dev,</div><div class='del'>-			 struct in6_addr *daddr,</div><div class='del'>-			 int router,</div><div class='del'>-			 unsigned short vlan_id)</div><div class='del'>-{</div><div class='del'>-	struct in6_addr mcaddr;</div><div class='del'>-	struct icmp6hdr icmp6h = {</div><div class='del'>-		.icmp6_type = NDISC_NEIGHBOUR_ADVERTISEMENT,</div><div class='del'>-	};</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	icmp6h.icmp6_router = router;</div><div class='del'>-	icmp6h.icmp6_solicited = 0;</div><div class='del'>-	icmp6h.icmp6_override = 1;</div><div class='del'>-</div><div class='del'>-	addrconf_addr_solict_mult(daddr, &amp;mcaddr);</div><div class='del'>-</div><div class='del'>-	pr_debug("ipv6 na on slave %s: dest %pI6, src %pI6\n",</div><div class='del'>-		 slave_dev-&gt;name, &amp;mcaddr, daddr);</div><div class='del'>-</div><div class='del'>-	skb = ndisc_build_skb(slave_dev, &amp;mcaddr, daddr, &amp;icmp6h, daddr,</div><div class='del'>-			      ND_OPT_TARGET_LL_ADDR);</div><div class='del'>-</div><div class='del'>-	if (!skb) {</div><div class='del'>-		pr_err("NA packet allocation failed\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (vlan_id) {</div><div class='del'>-		/* The Ethernet header is not present yet, so it is</div><div class='del'>-		 * too early to insert a VLAN tag.  Force use of an</div><div class='del'>-		 * out-of-line tag here and let dev_hard_start_xmit()</div><div class='del'>-		 * insert it if the slave hardware can't.</div><div class='del'>-		 */</div><div class='del'>-		skb = __vlan_hwaccel_put_tag(skb, vlan_id);</div><div class='del'>-		if (!skb) {</div><div class='del'>-			pr_err("failed to insert VLAN tag\n");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ndisc_send_skb(skb, slave_dev, NULL, &amp;mcaddr, daddr, &amp;icmp6h);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Kick out an unsolicited Neighbor Advertisement for an IPv6 address on</div><div class='del'>- * the bonding master.  This will help the switch learn our address</div><div class='del'>- * if in active-backup mode.</div><div class='del'>- *</div><div class='del'>- * Caller must hold curr_slave_lock for read or better</div><div class='del'>- */</div><div class='del'>-void bond_send_unsolicited_na(struct bonding *bond)</div><div class='del'>-{</div><div class='del'>-	struct slave *slave = bond-&gt;curr_active_slave;</div><div class='del'>-	struct vlan_entry *vlan;</div><div class='del'>-	struct inet6_dev *idev;</div><div class='del'>-	int is_router;</div><div class='del'>-</div><div class='del'>-	pr_debug("%s: bond %s slave %s\n", bond-&gt;dev-&gt;name,</div><div class='del'>-		 __func__, slave ? slave-&gt;dev-&gt;name : "NULL");</div><div class='del'>-</div><div class='del'>-	if (!slave || !bond-&gt;send_unsol_na ||</div><div class='del'>-	    test_bit(__LINK_STATE_LINKWATCH_PENDING, &amp;slave-&gt;dev-&gt;state))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	bond-&gt;send_unsol_na--;</div><div class='del'>-</div><div class='del'>-	idev = in6_dev_get(bond-&gt;dev);</div><div class='del'>-	if (!idev)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	is_router = !!idev-&gt;cnf.forwarding;</div><div class='del'>-</div><div class='del'>-	in6_dev_put(idev);</div><div class='del'>-</div><div class='del'>-	if (!ipv6_addr_any(&amp;bond-&gt;master_ipv6))</div><div class='del'>-		bond_na_send(slave-&gt;dev, &amp;bond-&gt;master_ipv6, is_router, 0);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(vlan, &amp;bond-&gt;vlan_list, vlan_list) {</div><div class='del'>-		if (!ipv6_addr_any(&amp;vlan-&gt;vlan_ipv6)) {</div><div class='del'>-			bond_na_send(slave-&gt;dev, &amp;vlan-&gt;vlan_ipv6, is_router,</div><div class='del'>-				     vlan-&gt;vlan_id);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * bond_inet6addr_event: handle inet6addr notifier chain events.</div><div class='del'>- *</div><div class='del'>- * We keep track of device IPv6 addresses primarily to use as source</div><div class='del'>- * addresses in NS probes.</div><div class='del'>- *</div><div class='del'>- * We track one IPv6 for the main device (if it has one).</div><div class='del'>- */</div><div class='del'>-static int bond_inet6addr_event(struct notifier_block *this,</div><div class='del'>-				unsigned long event,</div><div class='del'>-				void *ptr)</div><div class='del'>-{</div><div class='del'>-	struct inet6_ifaddr *ifa = ptr;</div><div class='del'>-	struct net_device *vlan_dev, *event_dev = ifa-&gt;idev-&gt;dev;</div><div class='del'>-	struct bonding *bond;</div><div class='del'>-	struct vlan_entry *vlan;</div><div class='del'>-	struct bond_net *bn = net_generic(dev_net(event_dev), bond_net_id);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(bond, &amp;bn-&gt;dev_list, bond_list) {</div><div class='del'>-		if (bond-&gt;dev == event_dev) {</div><div class='del'>-			switch (event) {</div><div class='del'>-			case NETDEV_UP:</div><div class='del'>-				if (ipv6_addr_any(&amp;bond-&gt;master_ipv6))</div><div class='del'>-					ipv6_addr_copy(&amp;bond-&gt;master_ipv6,</div><div class='del'>-						       &amp;ifa-&gt;addr);</div><div class='del'>-				return NOTIFY_OK;</div><div class='del'>-			case NETDEV_DOWN:</div><div class='del'>-				if (ipv6_addr_equal(&amp;bond-&gt;master_ipv6,</div><div class='del'>-						    &amp;ifa-&gt;addr))</div><div class='del'>-					bond_glean_dev_ipv6(bond-&gt;dev,</div><div class='del'>-							    &amp;bond-&gt;master_ipv6);</div><div class='del'>-				return NOTIFY_OK;</div><div class='del'>-			default:</div><div class='del'>-				return NOTIFY_DONE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		list_for_each_entry(vlan, &amp;bond-&gt;vlan_list, vlan_list) {</div><div class='del'>-			rcu_read_lock();</div><div class='del'>-			vlan_dev = __vlan_find_dev_deep(bond-&gt;dev,</div><div class='del'>-							vlan-&gt;vlan_id);</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			if (vlan_dev == event_dev) {</div><div class='del'>-				switch (event) {</div><div class='del'>-				case NETDEV_UP:</div><div class='del'>-					if (ipv6_addr_any(&amp;vlan-&gt;vlan_ipv6))</div><div class='del'>-						ipv6_addr_copy(&amp;vlan-&gt;vlan_ipv6,</div><div class='del'>-							       &amp;ifa-&gt;addr);</div><div class='del'>-					return NOTIFY_OK;</div><div class='del'>-				case NETDEV_DOWN:</div><div class='del'>-					if (ipv6_addr_equal(&amp;vlan-&gt;vlan_ipv6,</div><div class='del'>-							    &amp;ifa-&gt;addr))</div><div class='del'>-						bond_glean_dev_ipv6(vlan_dev,</div><div class='del'>-								    &amp;vlan-&gt;vlan_ipv6);</div><div class='del'>-					return NOTIFY_OK;</div><div class='del'>-				default:</div><div class='del'>-					return NOTIFY_DONE;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return NOTIFY_DONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block bond_inet6addr_notifier = {</div><div class='del'>-	.notifier_call = bond_inet6addr_event,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void bond_register_ipv6_notifier(void)</div><div class='del'>-{</div><div class='del'>-	register_inet6addr_notifier(&amp;bond_inet6addr_notifier);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bond_unregister_ipv6_notifier(void)</div><div class='del'>-{</div><div class='del'>-	unregister_inet6addr_notifier(&amp;bond_inet6addr_notifier);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c<br/>index 7f8756825b8a..435984ad8b2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bonding/bond_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/bonding/bond_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bonding/bond_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/bonding/bond_main.c</a></div><div class='hunk'>@@ -428,27 +428,34 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,</div><div class='ctx'>  * @bond_dev: bonding net device that got called</div><div class='ctx'>  * @vid: vlan id being added</div><div class='ctx'>  */</div><div class='del'>-static void bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid)</div><div class='add'>+static int bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = netdev_priv(bond_dev);</div><div class='del'>-	struct slave *slave;</div><div class='add'>+	struct slave *slave, *stop_at;</div><div class='ctx'> 	int i, res;</div><div class='ctx'> </div><div class='ctx'> 	bond_for_each_slave(bond, slave, i) {</div><div class='del'>-		struct net_device *slave_dev = slave-&gt;dev;</div><div class='del'>-		const struct net_device_ops *slave_ops = slave_dev-&gt;netdev_ops;</div><div class='del'>-</div><div class='del'>-		if ((slave_dev-&gt;features &amp; NETIF_F_HW_VLAN_FILTER) &amp;&amp;</div><div class='del'>-		    slave_ops-&gt;ndo_vlan_rx_add_vid) {</div><div class='del'>-			slave_ops-&gt;ndo_vlan_rx_add_vid(slave_dev, vid);</div><div class='del'>-		}</div><div class='add'>+		res = vlan_vid_add(slave-&gt;dev, vid);</div><div class='add'>+		if (res)</div><div class='add'>+			goto unwind;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	res = bond_add_vlan(bond, vid);</div><div class='ctx'> 	if (res) {</div><div class='ctx'> 		pr_err("%s: Error: Failed to add vlan id %d\n",</div><div class='ctx'> 		       bond_dev-&gt;name, vid);</div><div class='add'>+		return res;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unwind:</div><div class='add'>+	/* unwind from head to the slave that failed */</div><div class='add'>+	stop_at = slave;</div><div class='add'>+	bond_for_each_slave_from_to(bond, slave, i, bond-&gt;first_slave, stop_at)</div><div class='add'>+		vlan_vid_del(slave-&gt;dev, vid);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -456,56 +463,48 @@ static void bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid)</div><div class='ctx'>  * @bond_dev: bonding net device that got called</div><div class='ctx'>  * @vid: vlan id being removed</div><div class='ctx'>  */</div><div class='del'>-static void bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid)</div><div class='add'>+static int bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = netdev_priv(bond_dev);</div><div class='ctx'> 	struct slave *slave;</div><div class='ctx'> 	int i, res;</div><div class='ctx'> </div><div class='del'>-	bond_for_each_slave(bond, slave, i) {</div><div class='del'>-		struct net_device *slave_dev = slave-&gt;dev;</div><div class='del'>-		const struct net_device_ops *slave_ops = slave_dev-&gt;netdev_ops;</div><div class='del'>-</div><div class='del'>-		if ((slave_dev-&gt;features &amp; NETIF_F_HW_VLAN_FILTER) &amp;&amp;</div><div class='del'>-		    slave_ops-&gt;ndo_vlan_rx_kill_vid) {</div><div class='del'>-			slave_ops-&gt;ndo_vlan_rx_kill_vid(slave_dev, vid);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	bond_for_each_slave(bond, slave, i)</div><div class='add'>+		vlan_vid_del(slave-&gt;dev, vid);</div><div class='ctx'> </div><div class='ctx'> 	res = bond_del_vlan(bond, vid);</div><div class='ctx'> 	if (res) {</div><div class='ctx'> 		pr_err("%s: Error: Failed to remove vlan id %d\n",</div><div class='ctx'> 		       bond_dev-&gt;name, vid);</div><div class='add'>+		return res;</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 bond_add_vlans_on_slave(struct bonding *bond, struct net_device *slave_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct vlan_entry *vlan;</div><div class='del'>-	const struct net_device_ops *slave_ops = slave_dev-&gt;netdev_ops;</div><div class='del'>-</div><div class='del'>-	if (!(slave_dev-&gt;features &amp; NETIF_F_HW_VLAN_FILTER) ||</div><div class='del'>-	    !(slave_ops-&gt;ndo_vlan_rx_add_vid))</div><div class='del'>-		return;</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(vlan, &amp;bond-&gt;vlan_list, vlan_list)</div><div class='del'>-		slave_ops-&gt;ndo_vlan_rx_add_vid(slave_dev, vlan-&gt;vlan_id);</div><div class='add'>+	list_for_each_entry(vlan, &amp;bond-&gt;vlan_list, vlan_list) {</div><div class='add'>+		res = vlan_vid_add(slave_dev, vlan-&gt;vlan_id);</div><div class='add'>+		if (res)</div><div class='add'>+			pr_warning("%s: Failed to add vlan id %d to device %s\n",</div><div class='add'>+				   bond-&gt;dev-&gt;name, vlan-&gt;vlan_id,</div><div class='add'>+				   slave_dev-&gt;name);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bond_del_vlans_from_slave(struct bonding *bond,</div><div class='ctx'> 				      struct net_device *slave_dev)</div><div class='ctx'> {</div><div class='del'>-	const struct net_device_ops *slave_ops = slave_dev-&gt;netdev_ops;</div><div class='ctx'> 	struct vlan_entry *vlan;</div><div class='ctx'> </div><div class='del'>-	if (!(slave_dev-&gt;features &amp; NETIF_F_HW_VLAN_FILTER) ||</div><div class='del'>-	    !(slave_ops-&gt;ndo_vlan_rx_kill_vid))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	list_for_each_entry(vlan, &amp;bond-&gt;vlan_list, vlan_list) {</div><div class='ctx'> 		if (!vlan-&gt;vlan_id)</div><div class='ctx'> 			continue;</div><div class='del'>-		slave_ops-&gt;ndo_vlan_rx_kill_vid(slave_dev, vlan-&gt;vlan_id);</div><div class='add'>+		vlan_vid_del(slave_dev, vlan-&gt;vlan_id);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1325,11 +1324,12 @@ static int bond_sethwaddr(struct net_device *bond_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 bond_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static netdev_features_t bond_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct slave *slave;</div><div class='ctx'> 	struct bonding *bond = netdev_priv(dev);</div><div class='del'>-	u32 mask;</div><div class='add'>+	netdev_features_t mask;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	read_lock(&amp;bond-&gt;lock);</div><div class='hunk'>@@ -1363,7 +1363,7 @@ static void bond_compute_features(struct bonding *bond)</div><div class='ctx'> {</div><div class='ctx'> 	struct slave *slave;</div><div class='ctx'> 	struct net_device *bond_dev = bond-&gt;dev;</div><div class='del'>-	u32 vlan_features = BOND_VLAN_FEATURES;</div><div class='add'>+	netdev_features_t vlan_features = BOND_VLAN_FEATURES;</div><div class='ctx'> 	unsigned short max_hard_header_len = ETH_HLEN;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1822,7 +1822,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)</div><div class='ctx'> 				 "but new slave device does not support netpoll.\n",</div><div class='ctx'> 				 bond_dev-&gt;name);</div><div class='ctx'> 			res = -EBUSY;</div><div class='del'>-			goto err_close;</div><div class='add'>+			goto err_detach;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1831,7 +1831,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)</div><div class='ctx'> </div><div class='ctx'> 	res = bond_create_slave_symlinks(bond_dev, slave_dev);</div><div class='ctx'> 	if (res)</div><div class='del'>-		goto err_close;</div><div class='add'>+		goto err_detach;</div><div class='ctx'> </div><div class='ctx'> 	res = netdev_rx_handler_register(slave_dev, bond_handle_frame,</div><div class='ctx'> 					 new_slave);</div><div class='hunk'>@@ -1852,6 +1852,11 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)</div><div class='ctx'> err_dest_symlinks:</div><div class='ctx'> 	bond_destroy_slave_symlinks(bond_dev, slave_dev);</div><div class='ctx'> </div><div class='add'>+err_detach:</div><div class='add'>+	write_lock_bh(&amp;bond-&gt;lock);</div><div class='add'>+	bond_detach_slave(bond, new_slave);</div><div class='add'>+	write_unlock_bh(&amp;bond-&gt;lock);</div><div class='add'>+</div><div class='ctx'> err_close:</div><div class='ctx'> 	dev_close(slave_dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1897,7 +1902,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)</div><div class='ctx'> 	struct bonding *bond = netdev_priv(bond_dev);</div><div class='ctx'> 	struct slave *slave, *oldcurrent;</div><div class='ctx'> 	struct sockaddr addr;</div><div class='del'>-	u32 old_features = bond_dev-&gt;features;</div><div class='add'>+	netdev_features_t old_features = bond_dev-&gt;features;</div><div class='ctx'> </div><div class='ctx'> 	/* slave is not a slave or master is not master of this slave */</div><div class='ctx'> 	if (!(slave_dev-&gt;flags &amp; IFF_SLAVE) ||</div><div class='hunk'>@@ -4339,7 +4344,7 @@ static void bond_setup(struct net_device *bond_dev)</div><div class='ctx'> 				NETIF_F_HW_VLAN_RX |</div><div class='ctx'> 				NETIF_F_HW_VLAN_FILTER;</div><div class='ctx'> </div><div class='del'>-	bond_dev-&gt;hw_features &amp;= ~(NETIF_F_ALL_CSUM &amp; ~NETIF_F_NO_CSUM);</div><div class='add'>+	bond_dev-&gt;hw_features &amp;= ~(NETIF_F_ALL_CSUM &amp; ~NETIF_F_HW_CSUM);</div><div class='ctx'> 	bond_dev-&gt;features |= bond_dev-&gt;hw_features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c<br/>index 4ef7e2fd9fe6..aef42f045320 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bonding/bond_sysfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/bonding/bond_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bonding/bond_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/bonding/bond_sysfs.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/fs.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='head'>diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c<br/>index 073352517adc..0a4fc62a381d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/caif/caif_hsi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/caif/caif_hsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/caif/caif_hsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/caif/caif_hsi.c</a></div><div class='hunk'>@@ -117,15 +117,6 @@ static int cfhsi_flush_fifo(struct cfhsi *cfhsi)</div><div class='ctx'> 	dev_dbg(&amp;cfhsi-&gt;ndev-&gt;dev, "%s.\n",</div><div class='ctx'> 		__func__);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	ret = cfhsi-&gt;dev-&gt;cfhsi_wake_up(cfhsi-&gt;dev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_warn(&amp;cfhsi-&gt;ndev-&gt;dev,</div><div class='del'>-			"%s: can't wake up HSI interface: %d.\n",</div><div class='del'>-			__func__, ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	do {</div><div class='ctx'> 		ret = cfhsi-&gt;dev-&gt;cfhsi_fifo_occupancy(cfhsi-&gt;dev,</div><div class='ctx'> 				&amp;fifo_occupancy);</div><div class='hunk'>@@ -168,8 +159,6 @@ static int cfhsi_flush_fifo(struct cfhsi *cfhsi)</div><div class='ctx'> 		}</div><div class='ctx'> 	} while (1);</div><div class='ctx'> </div><div class='del'>-	cfhsi-&gt;dev-&gt;cfhsi_wake_down(cfhsi-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -944,7 +933,7 @@ static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		/* Create HSI frame. */</div><div class='ctx'> 		len = cfhsi_tx_frm(desc, cfhsi);</div><div class='del'>-		BUG_ON(!len);</div><div class='add'>+		WARN_ON(!len);</div><div class='ctx'> </div><div class='ctx'> 		/* Set up new transfer. */</div><div class='ctx'> 		res = cfhsi-&gt;dev-&gt;cfhsi_tx(cfhsi-&gt;tx_buf, len, cfhsi-&gt;dev);</div><div class='head'>diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c<br/>index 23406e62c0b0..8a3054b84812 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/caif/caif_serial.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/caif/caif_serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/caif/caif_serial.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/caif/caif_serial.c</a></div><div class='hunk'>@@ -38,15 +38,15 @@ MODULE_ALIAS_LDISC(N_CAIF);</div><div class='ctx'> /*This list is protected by the rtnl lock. */</div><div class='ctx'> static LIST_HEAD(ser_list);</div><div class='ctx'> </div><div class='del'>-static int ser_loop;</div><div class='add'>+static bool ser_loop;</div><div class='ctx'> module_param(ser_loop, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(ser_loop, "Run in simulated loopback mode.");</div><div class='ctx'> </div><div class='del'>-static int ser_use_stx = 1;</div><div class='add'>+static bool ser_use_stx = true;</div><div class='ctx'> module_param(ser_use_stx, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(ser_use_stx, "STX enabled or not.");</div><div class='ctx'> </div><div class='del'>-static int ser_use_fcs = 1;</div><div class='add'>+static bool ser_use_fcs = true;</div><div class='ctx'> </div><div class='ctx'> module_param(ser_use_fcs, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(ser_use_fcs, "FCS enabled or not.");</div><div class='hunk'>@@ -261,7 +261,7 @@ static int handle_tx(struct ser_device *ser)</div><div class='ctx'> 		skb_pull(skb, tty_wr);</div><div class='ctx'> 		if (skb-&gt;len == 0) {</div><div class='ctx'> 			struct sk_buff *tmp = skb_dequeue(&amp;ser-&gt;head);</div><div class='del'>-			BUG_ON(tmp != skb);</div><div class='add'>+			WARN_ON(tmp != skb);</div><div class='ctx'> 			if (in_interrupt())</div><div class='ctx'> 				dev_kfree_skb_irq(skb);</div><div class='ctx'> 			else</div><div class='hunk'>@@ -305,7 +305,7 @@ static void ldisc_tx_wakeup(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> 	ser = tty-&gt;disc_data;</div><div class='ctx'> 	BUG_ON(ser == NULL);</div><div class='del'>-	BUG_ON(ser-&gt;tty != tty);</div><div class='add'>+	WARN_ON(ser-&gt;tty != tty);</div><div class='ctx'> 	handle_tx(ser);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/caif/caif_shmcore.c b/drivers/net/caif/caif_shmcore.c<br/>index d4b26fb24ed9..5b2041319a32 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/caif/caif_shmcore.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/caif/caif_shmcore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/caif/caif_shmcore.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/caif/caif_shmcore.c</a></div><div class='hunk'>@@ -238,11 +238,11 @@ int caif_shmdrv_rx_cb(u32 mbx_msg, void *priv)</div><div class='ctx'> 		if ((avail_emptybuff &gt; HIGH_WATERMARK) &amp;&amp;</div><div class='ctx'> 					(!pshm_drv-&gt;tx_empty_available)) {</div><div class='ctx'> 			pshm_drv-&gt;tx_empty_available = 1;</div><div class='add'>+			spin_unlock_irqrestore(&amp;pshm_drv-&gt;lock, flags);</div><div class='ctx'> 			pshm_drv-&gt;cfdev.flowctrl</div><div class='ctx'> 					(pshm_drv-&gt;pshm_dev-&gt;pshm_netdev,</div><div class='ctx'> 								CAIF_FLOW_ON);</div><div class='ctx'> </div><div class='del'>-			spin_unlock_irqrestore(&amp;pshm_drv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 			/* Schedule the work queue. if required */</div><div class='ctx'> 			if (!work_pending(&amp;pshm_drv-&gt;shm_tx_work))</div><div class='hunk'>@@ -285,6 +285,7 @@ static void shm_rx_work_func(struct work_struct *rx_work)</div><div class='ctx'> 			list_entry(pshm_drv-&gt;rx_full_list.next, struct buf_list,</div><div class='ctx'> 					list);</div><div class='ctx'> 		list_del_init(&amp;pbuf-&gt;list);</div><div class='add'>+		spin_unlock_irqrestore(&amp;pshm_drv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 		/* Retrieve pointer to start of the packet descriptor area. */</div><div class='ctx'> 		pck_desc = (struct shm_pck_desc *) pbuf-&gt;desc_vptr;</div><div class='hunk'>@@ -336,7 +337,11 @@ static void shm_rx_work_func(struct work_struct *rx_work)</div><div class='ctx'> 			/* Get a suitable CAIF packet and copy in data. */</div><div class='ctx'> 			skb = netdev_alloc_skb(pshm_drv-&gt;pshm_dev-&gt;pshm_netdev,</div><div class='ctx'> 							frm_pck_len + 1);</div><div class='del'>-			BUG_ON(skb == NULL);</div><div class='add'>+</div><div class='add'>+			if (skb == NULL) {</div><div class='add'>+				pr_info("OOM: Try next frame in descriptor\n");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			p = skb_put(skb, frm_pck_len);</div><div class='ctx'> 			memcpy(p, pbuf-&gt;desc_vptr + frm_pck_ofs, frm_pck_len);</div><div class='hunk'>@@ -360,6 +365,7 @@ static void shm_rx_work_func(struct work_struct *rx_work)</div><div class='ctx'> 			pck_desc++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		spin_lock_irqsave(&amp;pshm_drv-&gt;lock, flags);</div><div class='ctx'> 		list_add_tail(&amp;pbuf-&gt;list, &amp;pshm_drv-&gt;rx_pend_list);</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock_irqrestore(&amp;pshm_drv-&gt;lock, flags);</div><div class='hunk'>@@ -412,7 +418,6 @@ static void shm_tx_work_func(struct work_struct *tx_work)</div><div class='ctx'> </div><div class='ctx'> 		if (skb == NULL)</div><div class='ctx'> 			goto send_msg;</div><div class='del'>-</div><div class='ctx'> 		/* Check the available no. of buffers in the empty list */</div><div class='ctx'> 		list_for_each(pos, &amp;pshm_drv-&gt;tx_empty_list)</div><div class='ctx'> 			avail_emptybuff++;</div><div class='hunk'>@@ -421,9 +426,11 @@ static void shm_tx_work_func(struct work_struct *tx_work)</div><div class='ctx'> 					pshm_drv-&gt;tx_empty_available) {</div><div class='ctx'> 			/* Update blocking condition. */</div><div class='ctx'> 			pshm_drv-&gt;tx_empty_available = 0;</div><div class='add'>+			spin_unlock_irqrestore(&amp;pshm_drv-&gt;lock, flags);</div><div class='ctx'> 			pshm_drv-&gt;cfdev.flowctrl</div><div class='ctx'> 					(pshm_drv-&gt;pshm_dev-&gt;pshm_netdev,</div><div class='ctx'> 					CAIF_FLOW_OFF);</div><div class='add'>+			spin_lock_irqsave(&amp;pshm_drv-&gt;lock, flags);</div><div class='ctx'> 		}</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We simply return back to the caller if we do not have space</div><div class='hunk'>@@ -469,6 +476,8 @@ static void shm_tx_work_func(struct work_struct *tx_work)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			skb = skb_dequeue(&amp;pshm_drv-&gt;sk_qhead);</div><div class='add'>+			if (skb == NULL)</div><div class='add'>+				break;</div><div class='ctx'> 			/* Copy in CAIF frame. */</div><div class='ctx'> 			skb_copy_bits(skb, 0, pbuf-&gt;desc_vptr +</div><div class='ctx'> 					pbuf-&gt;frm_ofs + SHM_HDR_LEN +</div><div class='hunk'>@@ -477,7 +486,7 @@ static void shm_tx_work_func(struct work_struct *tx_work)</div><div class='ctx'> 			pshm_drv-&gt;pshm_dev-&gt;pshm_netdev-&gt;stats.tx_packets++;</div><div class='ctx'> 			pshm_drv-&gt;pshm_dev-&gt;pshm_netdev-&gt;stats.tx_bytes +=</div><div class='ctx'> 									frmlen;</div><div class='del'>-			dev_kfree_skb(skb);</div><div class='add'>+			dev_kfree_skb_irq(skb);</div><div class='ctx'> </div><div class='ctx'> 			/* Fill in the shared memory packet descriptor area. */</div><div class='ctx'> 			pck_desc = (struct shm_pck_desc *) (pbuf-&gt;desc_vptr);</div><div class='hunk'>@@ -512,16 +521,11 @@ send_msg:</div><div class='ctx'> static int shm_netdev_tx(struct sk_buff *skb, struct net_device *shm_netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct shmdrv_layer *pshm_drv;</div><div class='del'>-	unsigned long flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	pshm_drv = netdev_priv(shm_netdev);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;pshm_drv-&gt;lock, flags);</div><div class='del'>-</div><div class='ctx'> 	skb_queue_tail(&amp;pshm_drv-&gt;sk_qhead, skb);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;pshm_drv-&gt;lock, flags);</div><div class='del'>-</div><div class='ctx'> 	/* Schedule Tx work queue. for deferred processing of skbs*/</div><div class='ctx'> 	if (!work_pending(&amp;pshm_drv-&gt;shm_tx_work))</div><div class='ctx'> 		queue_work(pshm_drv-&gt;pshm_tx_workqueue, &amp;pshm_drv-&gt;shm_tx_work);</div><div class='hunk'>@@ -606,6 +610,7 @@ int caif_shmcore_probe(struct shmdev_layer *pshm_dev)</div><div class='ctx'> 		pshm_drv-&gt;shm_rx_addr = pshm_dev-&gt;shm_base_addr +</div><div class='ctx'> 						(NR_TX_BUF * TX_BUF_SZ);</div><div class='ctx'> </div><div class='add'>+	spin_lock_init(&amp;pshm_drv-&gt;lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;pshm_drv-&gt;tx_empty_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;pshm_drv-&gt;tx_pend_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;pshm_drv-&gt;tx_full_list);</div><div class='hunk'>@@ -640,7 +645,7 @@ int caif_shmcore_probe(struct shmdev_layer *pshm_dev)</div><div class='ctx'> 		tx_buf-&gt;frm_ofs = SHM_CAIF_FRM_OFS;</div><div class='ctx'> </div><div class='ctx'> 		if (pshm_dev-&gt;shm_loopback)</div><div class='del'>-			tx_buf-&gt;desc_vptr = (char *)tx_buf-&gt;phy_addr;</div><div class='add'>+			tx_buf-&gt;desc_vptr = (unsigned char *)tx_buf-&gt;phy_addr;</div><div class='ctx'> 		else</div><div class='ctx'> 			tx_buf-&gt;desc_vptr =</div><div class='ctx'> 					ioremap(tx_buf-&gt;phy_addr, TX_BUF_SZ);</div><div class='hunk'>@@ -664,7 +669,7 @@ int caif_shmcore_probe(struct shmdev_layer *pshm_dev)</div><div class='ctx'> 		rx_buf-&gt;len = RX_BUF_SZ;</div><div class='ctx'> </div><div class='ctx'> 		if (pshm_dev-&gt;shm_loopback)</div><div class='del'>-			rx_buf-&gt;desc_vptr = (char *)rx_buf-&gt;phy_addr;</div><div class='add'>+			rx_buf-&gt;desc_vptr = (unsigned char *)rx_buf-&gt;phy_addr;</div><div class='ctx'> 		else</div><div class='ctx'> 			rx_buf-&gt;desc_vptr =</div><div class='ctx'> 					ioremap(rx_buf-&gt;phy_addr, RX_BUF_SZ);</div><div class='head'>diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c<br/>index 05e791f46aef..96391c36fa74 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/caif/caif_spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/caif/caif_spi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/caif/caif_spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/caif/caif_spi.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@ MODULE_DESCRIPTION("CAIF SPI driver");</div><div class='ctx'> /* Returns the number of padding bytes for alignment. */</div><div class='ctx'> #define PAD_POW2(x, pow) ((((x)&amp;((pow)-1))==0) ? 0 : (((pow)-((x)&amp;((pow)-1)))))</div><div class='ctx'> </div><div class='del'>-static int spi_loop;</div><div class='add'>+static bool spi_loop;</div><div class='ctx'> module_param(spi_loop, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(spi_loop, "SPI running in loopback mode.");</div><div class='ctx'> </div><div class='hunk'>@@ -226,7 +226,7 @@ static ssize_t dbgfs_frame(struct file *file, char __user *user_buf,</div><div class='ctx'> 			"Tx data (Len: %d):\n", cfspi-&gt;tx_cpck_len);</div><div class='ctx'> </div><div class='ctx'> 	len += print_frame((buf + len), (DEBUGFS_BUF_SIZE - len),</div><div class='del'>-			   cfspi-&gt;xfer.va_tx,</div><div class='add'>+			   cfspi-&gt;xfer.va_tx[0],</div><div class='ctx'> 			   (cfspi-&gt;tx_cpck_len + SPI_CMD_SZ), 100);</div><div class='ctx'> </div><div class='ctx'> 	len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),</div><div class='hunk'>@@ -599,48 +599,11 @@ static int cfspi_close(struct net_device *dev)</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-static const struct net_device_ops cfspi_ops = {</div><div class='del'>-	.ndo_open = cfspi_open,</div><div class='del'>-	.ndo_stop = cfspi_close,</div><div class='del'>-	.ndo_start_xmit = cfspi_xmit</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static void cfspi_setup(struct net_device *dev)</div><div class='add'>+static int cfspi_init(struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	int res = 0;</div><div class='ctx'> 	struct cfspi *cfspi = netdev_priv(dev);</div><div class='del'>-	dev-&gt;features = 0;</div><div class='del'>-	dev-&gt;netdev_ops = &amp;cfspi_ops;</div><div class='del'>-	dev-&gt;type = ARPHRD_CAIF;</div><div class='del'>-	dev-&gt;flags = IFF_NOARP | IFF_POINTOPOINT;</div><div class='del'>-	dev-&gt;tx_queue_len = 0;</div><div class='del'>-	dev-&gt;mtu = SPI_MAX_PAYLOAD_SIZE;</div><div class='del'>-	dev-&gt;destructor = free_netdev;</div><div class='del'>-	skb_queue_head_init(&amp;cfspi-&gt;qhead);</div><div class='del'>-	skb_queue_head_init(&amp;cfspi-&gt;chead);</div><div class='del'>-	cfspi-&gt;cfdev.link_select = CAIF_LINK_HIGH_BANDW;</div><div class='del'>-	cfspi-&gt;cfdev.use_frag = false;</div><div class='del'>-	cfspi-&gt;cfdev.use_stx = false;</div><div class='del'>-	cfspi-&gt;cfdev.use_fcs = false;</div><div class='del'>-	cfspi-&gt;ndev = dev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int cfspi_spi_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct cfspi *cfspi = NULL;</div><div class='del'>-	struct net_device *ndev;</div><div class='del'>-	struct cfspi_dev *dev;</div><div class='del'>-	int res;</div><div class='del'>-	dev = (struct cfspi_dev *)pdev-&gt;dev.platform_data;</div><div class='del'>-</div><div class='del'>-	ndev = alloc_netdev(sizeof(struct cfspi),</div><div class='del'>-			"cfspi%d", cfspi_setup);</div><div class='del'>-	if (!ndev)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	cfspi = netdev_priv(ndev);</div><div class='del'>-	netif_stop_queue(ndev);</div><div class='del'>-	cfspi-&gt;ndev = ndev;</div><div class='del'>-	cfspi-&gt;pdev = pdev;</div><div class='ctx'> </div><div class='ctx'> 	/* Set flow info. */</div><div class='ctx'> 	cfspi-&gt;flow_off_sent = 0;</div><div class='hunk'>@@ -656,16 +619,11 @@ int cfspi_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 		cfspi-&gt;slave_talked = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Assign the SPI device. */</div><div class='del'>-	cfspi-&gt;dev = dev;</div><div class='del'>-	/* Assign the device ifc to this SPI interface. */</div><div class='del'>-	dev-&gt;ifc = &amp;cfspi-&gt;ifc;</div><div class='del'>-</div><div class='ctx'> 	/* Allocate DMA buffers. */</div><div class='del'>-	cfspi-&gt;xfer.va_tx = dma_alloc(&amp;cfspi-&gt;xfer.pa_tx);</div><div class='del'>-	if (!cfspi-&gt;xfer.va_tx) {</div><div class='add'>+	cfspi-&gt;xfer.va_tx[0] = dma_alloc(&amp;cfspi-&gt;xfer.pa_tx[0]);</div><div class='add'>+	if (!cfspi-&gt;xfer.va_tx[0]) {</div><div class='ctx'> 		res = -ENODEV;</div><div class='del'>-		goto err_dma_alloc_tx;</div><div class='add'>+		goto err_dma_alloc_tx_0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cfspi-&gt;xfer.va_rx = dma_alloc(&amp;cfspi-&gt;xfer.pa_rx);</div><div class='hunk'>@@ -714,6 +672,87 @@ int cfspi_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* Schedule the work queue. */</div><div class='ctx'> 	queue_work(cfspi-&gt;wq, &amp;cfspi-&gt;work);</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ err_create_wq:</div><div class='add'>+	dma_free(cfspi-&gt;xfer.va_rx, cfspi-&gt;xfer.pa_rx);</div><div class='add'>+ err_dma_alloc_rx:</div><div class='add'>+	dma_free(cfspi-&gt;xfer.va_tx[0], cfspi-&gt;xfer.pa_tx[0]);</div><div class='add'>+ err_dma_alloc_tx_0:</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cfspi_uninit(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cfspi *cfspi = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	/* Remove from list. */</div><div class='add'>+	spin_lock(&amp;cfspi_list_lock);</div><div class='add'>+	list_del(&amp;cfspi-&gt;list);</div><div class='add'>+	spin_unlock(&amp;cfspi_list_lock);</div><div class='add'>+</div><div class='add'>+	cfspi-&gt;ndev = NULL;</div><div class='add'>+	/* Free DMA buffers. */</div><div class='add'>+	dma_free(cfspi-&gt;xfer.va_rx, cfspi-&gt;xfer.pa_rx);</div><div class='add'>+	dma_free(cfspi-&gt;xfer.va_tx[0], cfspi-&gt;xfer.pa_tx[0]);</div><div class='add'>+	set_bit(SPI_TERMINATE, &amp;cfspi-&gt;state);</div><div class='add'>+	wake_up_interruptible(&amp;cfspi-&gt;wait);</div><div class='add'>+	destroy_workqueue(cfspi-&gt;wq);</div><div class='add'>+	/* Destroy debugfs directory and files. */</div><div class='add'>+	dev_debugfs_rem(cfspi);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops cfspi_ops = {</div><div class='add'>+	.ndo_open = cfspi_open,</div><div class='add'>+	.ndo_stop = cfspi_close,</div><div class='add'>+	.ndo_init = cfspi_init,</div><div class='add'>+	.ndo_uninit = cfspi_uninit,</div><div class='add'>+	.ndo_start_xmit = cfspi_xmit</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void cfspi_setup(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cfspi *cfspi = netdev_priv(dev);</div><div class='add'>+	dev-&gt;features = 0;</div><div class='add'>+	dev-&gt;netdev_ops = &amp;cfspi_ops;</div><div class='add'>+	dev-&gt;type = ARPHRD_CAIF;</div><div class='add'>+	dev-&gt;flags = IFF_NOARP | IFF_POINTOPOINT;</div><div class='add'>+	dev-&gt;tx_queue_len = 0;</div><div class='add'>+	dev-&gt;mtu = SPI_MAX_PAYLOAD_SIZE;</div><div class='add'>+	dev-&gt;destructor = free_netdev;</div><div class='add'>+	skb_queue_head_init(&amp;cfspi-&gt;qhead);</div><div class='add'>+	skb_queue_head_init(&amp;cfspi-&gt;chead);</div><div class='add'>+	cfspi-&gt;cfdev.link_select = CAIF_LINK_HIGH_BANDW;</div><div class='add'>+	cfspi-&gt;cfdev.use_frag = false;</div><div class='add'>+	cfspi-&gt;cfdev.use_stx = false;</div><div class='add'>+	cfspi-&gt;cfdev.use_fcs = false;</div><div class='add'>+	cfspi-&gt;ndev = dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cfspi_spi_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct cfspi *cfspi = NULL;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	struct cfspi_dev *dev;</div><div class='add'>+	int res;</div><div class='add'>+	dev = (struct cfspi_dev *)pdev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	ndev = alloc_netdev(sizeof(struct cfspi),</div><div class='add'>+			"cfspi%d", cfspi_setup);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	cfspi = netdev_priv(ndev);</div><div class='add'>+	netif_stop_queue(ndev);</div><div class='add'>+	cfspi-&gt;ndev = ndev;</div><div class='add'>+	cfspi-&gt;pdev = pdev;</div><div class='add'>+</div><div class='add'>+	/* Assign the SPI device. */</div><div class='add'>+	cfspi-&gt;dev = dev;</div><div class='add'>+	/* Assign the device ifc to this SPI interface. */</div><div class='add'>+	dev-&gt;ifc = &amp;cfspi-&gt;ifc;</div><div class='add'>+</div><div class='ctx'> 	/* Register network device. */</div><div class='ctx'> 	res = register_netdev(ndev);</div><div class='ctx'> 	if (res) {</div><div class='hunk'>@@ -723,15 +762,6 @@ int cfspi_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 	return res;</div><div class='ctx'> </div><div class='ctx'>  err_net_reg:</div><div class='del'>-	dev_debugfs_rem(cfspi);</div><div class='del'>-	set_bit(SPI_TERMINATE, &amp;cfspi-&gt;state);</div><div class='del'>-	wake_up_interruptible(&amp;cfspi-&gt;wait);</div><div class='del'>-	destroy_workqueue(cfspi-&gt;wq);</div><div class='del'>- err_create_wq:</div><div class='del'>-	dma_free(cfspi-&gt;xfer.va_rx, cfspi-&gt;xfer.pa_rx);</div><div class='del'>- err_dma_alloc_rx:</div><div class='del'>-	dma_free(cfspi-&gt;xfer.va_tx, cfspi-&gt;xfer.pa_tx);</div><div class='del'>- err_dma_alloc_tx:</div><div class='ctx'> 	free_netdev(ndev);</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='hunk'>@@ -739,34 +769,8 @@ int cfspi_spi_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> int cfspi_spi_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *list_node;</div><div class='del'>-	struct list_head *n;</div><div class='del'>-	struct cfspi *cfspi = NULL;</div><div class='del'>-	struct cfspi_dev *dev;</div><div class='del'>-</div><div class='del'>-	dev = (struct cfspi_dev *)pdev-&gt;dev.platform_data;</div><div class='del'>-	spin_lock(&amp;cfspi_list_lock);</div><div class='del'>-	list_for_each_safe(list_node, n, &amp;cfspi_list) {</div><div class='del'>-		cfspi = list_entry(list_node, struct cfspi, list);</div><div class='del'>-		/* Find the corresponding device. */</div><div class='del'>-		if (cfspi-&gt;dev == dev) {</div><div class='del'>-			/* Remove from list. */</div><div class='del'>-			list_del(list_node);</div><div class='del'>-			/* Free DMA buffers. */</div><div class='del'>-			dma_free(cfspi-&gt;xfer.va_rx, cfspi-&gt;xfer.pa_rx);</div><div class='del'>-			dma_free(cfspi-&gt;xfer.va_tx, cfspi-&gt;xfer.pa_tx);</div><div class='del'>-			set_bit(SPI_TERMINATE, &amp;cfspi-&gt;state);</div><div class='del'>-			wake_up_interruptible(&amp;cfspi-&gt;wait);</div><div class='del'>-			destroy_workqueue(cfspi-&gt;wq);</div><div class='del'>-			/* Destroy debugfs directory and files. */</div><div class='del'>-			dev_debugfs_rem(cfspi);</div><div class='del'>-			unregister_netdev(cfspi-&gt;ndev);</div><div class='del'>-			spin_unlock(&amp;cfspi_list_lock);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;cfspi_list_lock);</div><div class='del'>-	return -ENODEV;</div><div class='add'>+	/* Everything is done in cfspi_uninit(). */</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit cfspi_exit_module(void)</div><div class='hunk'>@@ -777,7 +781,7 @@ static void __exit cfspi_exit_module(void)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_safe(list_node, n, &amp;cfspi_list) {</div><div class='ctx'> 		cfspi = list_entry(list_node, struct cfspi, list);</div><div class='del'>-		platform_device_unregister(cfspi-&gt;pdev);</div><div class='add'>+		unregister_netdev(cfspi-&gt;ndev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Destroy sysfs files. */</div><div class='head'>diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig<br/>index f6c98fb4a517..ab45758c49a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/Kconfig</a></div><div class='hunk'>@@ -116,6 +116,8 @@ source "drivers/net/can/sja1000/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/net/can/c_can/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "drivers/net/can/cc770/Kconfig"</div><div class='add'>+</div><div class='ctx'> source "drivers/net/can/usb/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/net/can/softing/Kconfig"</div><div class='head'>diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile<br/>index 24ebfe8d758a..938be37b670c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/Makefile</a></div><div class='hunk'>@@ -14,6 +14,7 @@ obj-y				+= softing/</div><div class='ctx'> obj-$(CONFIG_CAN_SJA1000)	+= sja1000/</div><div class='ctx'> obj-$(CONFIG_CAN_MSCAN)		+= mscan/</div><div class='ctx'> obj-$(CONFIG_CAN_C_CAN)		+= c_can/</div><div class='add'>+obj-$(CONFIG_CAN_CC770)		+= cc770/</div><div class='ctx'> obj-$(CONFIG_CAN_AT91)		+= at91_can.o</div><div class='ctx'> obj-$(CONFIG_CAN_TI_HECC)	+= ti_hecc.o</div><div class='ctx'> obj-$(CONFIG_CAN_MCP251X)	+= mcp251x.o</div><div class='head'>diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c<br/>index 044ea0647b04..6ea905c2cf6d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/at91_can.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/at91_can.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/at91_can.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/at91_can.c</a></div><div class='hunk'>@@ -1383,18 +1383,7 @@ static struct platform_driver at91_can_driver = {</div><div class='ctx'> 	.id_table = at91_can_id_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init at91_can_module_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;at91_can_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit at91_can_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;at91_can_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(at91_can_module_init);</div><div class='del'>-module_exit(at91_can_module_exit);</div><div class='add'>+module_platform_driver(at91_can_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Marc Kleine-Budde &lt;mkl@pengutronix.de&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/can/bfin_can.c b/drivers/net/can/bfin_can.c<br/>index a1c5abc38cd2..349e0fabb63a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/bfin_can.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/bfin_can.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/bfin_can.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/bfin_can.c</a></div><div class='hunk'>@@ -676,17 +676,7 @@ static struct platform_driver bfin_can_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init bfin_can_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;bfin_can_driver);</div><div class='del'>-}</div><div class='del'>-module_init(bfin_can_init);</div><div class='del'>-</div><div class='del'>-static void __exit bfin_can_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;bfin_can_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(bfin_can_exit);</div><div class='add'>+module_platform_driver(bfin_can_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Barry Song &lt;21cnbao@gmail.com&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c<br/>index 0b5c6f8bdd34..5e1a5ff6476e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/c_can/c_can_platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/c_can/c_can_platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/c_can/c_can_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/c_can/c_can_platform.c</a></div><div class='hunk'>@@ -197,17 +197,7 @@ static struct platform_driver c_can_plat_driver = {</div><div class='ctx'> 	.remove = __devexit_p(c_can_plat_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init c_can_plat_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;c_can_plat_driver);</div><div class='del'>-}</div><div class='del'>-module_init(c_can_plat_init);</div><div class='del'>-</div><div class='del'>-static void __exit c_can_plat_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;c_can_plat_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(c_can_plat_exit);</div><div class='add'>+module_platform_driver(c_can_plat_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Bhupesh Sharma &lt;bhupesh.sharma@st.com&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/can/cc770/Kconfig b/drivers/net/can/cc770/Kconfig<br/>new file mode 100644<br/>index 000000000000..22c07a8c8b43<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/cc770/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/cc770/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+menuconfig CAN_CC770</div><div class='add'>+	tristate "Bosch CC770 and Intel AN82527 devices"</div><div class='add'>+	depends on CAN_DEV &amp;&amp; HAS_IOMEM</div><div class='add'>+</div><div class='add'>+if CAN_CC770</div><div class='add'>+</div><div class='add'>+config CAN_CC770_ISA</div><div class='add'>+	tristate "ISA Bus based legacy CC770 driver"</div><div class='add'>+	---help---</div><div class='add'>+	  This driver adds legacy support for CC770 and AN82527 chips</div><div class='add'>+	  connected to the ISA bus using I/O port, memory mapped or</div><div class='add'>+	  indirect access.</div><div class='add'>+</div><div class='add'>+config CAN_CC770_PLATFORM</div><div class='add'>+	tristate "Generic Platform Bus based CC770 driver"</div><div class='add'>+	---help---</div><div class='add'>+	  This driver adds support for the CC770 and AN82527 chips</div><div class='add'>+	  connected to the "platform bus" (Linux abstraction for directly</div><div class='add'>+	  to the processor attached devices).</div><div class='add'>+</div><div class='add'>+endif</div><div class='head'>diff --git a/drivers/net/can/cc770/Makefile b/drivers/net/can/cc770/Makefile<br/>new file mode 100644<br/>index 000000000000..9fb8321b33eb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/cc770/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/cc770/Makefile</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+#</div><div class='add'>+#  Makefile for the Bosch CC770 CAN controller drivers.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CAN_CC770) += cc770.o</div><div class='add'>+obj-$(CONFIG_CAN_CC770_ISA) += cc770_isa.o</div><div class='add'>+obj-$(CONFIG_CAN_CC770_PLATFORM) += cc770_platform.o</div><div class='add'>+</div><div class='add'>+ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG</div><div class='head'>diff --git a/drivers/net/can/cc770/cc770.c b/drivers/net/can/cc770/cc770.c<br/>new file mode 100644<br/>index 000000000000..766896747643<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/cc770/cc770.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/cc770/cc770.c</a></div><div class='hunk'>@@ -0,0 +1,881 @@</div><div class='add'>+/*</div><div class='add'>+ * Core driver for the CC770 and AN82527 CAN controllers</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2009, 2011 Wolfgang Grandegger &lt;wg@grandegger.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 version 2 of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/fcntl.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.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'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/can/error.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/can/platform/cc770.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cc770.h"</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Wolfgang Grandegger &lt;wg@grandegger.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_DESCRIPTION(KBUILD_MODNAME "CAN netdevice driver");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The CC770 is a CAN controller from Bosch, which is 100% compatible</div><div class='add'>+ * with the AN82527 from Intel, but with "bugs" being fixed and some</div><div class='add'>+ * additional functionality, mainly:</div><div class='add'>+ *</div><div class='add'>+ * 1. RX and TX error counters are readable.</div><div class='add'>+ * 2. Support of silent (listen-only) mode.</div><div class='add'>+ * 3. Message object 15 can receive all types of frames, also RTR and EFF.</div><div class='add'>+ *</div><div class='add'>+ * Details are available from Bosch's "CC770_Product_Info_2007-01.pdf",</div><div class='add'>+ * which explains in detail the compatibility between the CC770 and the</div><div class='add'>+ * 82527. This driver use the additional functionality 3. on real CC770</div><div class='add'>+ * devices. Unfortunately, the CC770 does still not store the message</div><div class='add'>+ * identifier of received remote transmission request frames and</div><div class='add'>+ * therefore it's set to 0.</div><div class='add'>+ *</div><div class='add'>+ * The message objects 1..14 can be used for TX and RX while the message</div><div class='add'>+ * objects 15 is optimized for RX. It has a shadow register for reliable</div><div class='add'>+ * data receiption under heavy bus load. Therefore it makes sense to use</div><div class='add'>+ * this message object for the needed use case. The frame type (EFF/SFF)</div><div class='add'>+ * for the message object 15 can be defined via kernel module parameter</div><div class='add'>+ * "msgobj15_eff". If not equal 0, it will receive 29-bit EFF frames,</div><div class='add'>+ * otherwise 11 bit SFF messages.</div><div class='add'>+ */</div><div class='add'>+static int msgobj15_eff;</div><div class='add'>+module_param(msgobj15_eff, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(msgobj15_eff, "Extended 29-bit frames for message object 15 "</div><div class='add'>+		 "(default: 11-bit standard frames)");</div><div class='add'>+</div><div class='add'>+static int i82527_compat;</div><div class='add'>+module_param(i82527_compat, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(i82527_compat, "Strict Intel 82527 comptibility mode "</div><div class='add'>+		 "without using additional functions");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This driver uses the last 5 message objects 11..15. The definitions</div><div class='add'>+ * and structure below allows to configure and assign them to the real</div><div class='add'>+ * message object.</div><div class='add'>+ */</div><div class='add'>+static unsigned char cc770_obj_flags[CC770_OBJ_MAX] = {</div><div class='add'>+	[CC770_OBJ_RX0] = CC770_OBJ_FLAG_RX,</div><div class='add'>+	[CC770_OBJ_RX1] = CC770_OBJ_FLAG_RX | CC770_OBJ_FLAG_EFF,</div><div class='add'>+	[CC770_OBJ_RX_RTR0] = CC770_OBJ_FLAG_RX | CC770_OBJ_FLAG_RTR,</div><div class='add'>+	[CC770_OBJ_RX_RTR1] = CC770_OBJ_FLAG_RX | CC770_OBJ_FLAG_RTR |</div><div class='add'>+			      CC770_OBJ_FLAG_EFF,</div><div class='add'>+	[CC770_OBJ_TX] = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct can_bittiming_const cc770_bittiming_const = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='add'>+	.tseg1_min = 1,</div><div class='add'>+	.tseg1_max = 16,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 8,</div><div class='add'>+	.sjw_max = 4,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 64,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int intid2obj(unsigned int intid)</div><div class='add'>+{</div><div class='add'>+	if (intid == 2)</div><div class='add'>+		return 0;</div><div class='add'>+	else</div><div class='add'>+		return MSGOBJ_LAST + 2 - intid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enable_all_objs(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+	u8 msgcfg;</div><div class='add'>+	unsigned char obj_flags;</div><div class='add'>+	unsigned int o, mo;</div><div class='add'>+</div><div class='add'>+	for (o = 0; o &lt; ARRAY_SIZE(priv-&gt;obj_flags); o++) {</div><div class='add'>+		obj_flags = priv-&gt;obj_flags[o];</div><div class='add'>+		mo = obj2msgobj(o);</div><div class='add'>+</div><div class='add'>+		if (obj_flags &amp; CC770_OBJ_FLAG_RX) {</div><div class='add'>+			/*</div><div class='add'>+			 * We don't need extra objects for RTR and EFF if</div><div class='add'>+			 * the additional CC770 functions are enabled.</div><div class='add'>+			 */</div><div class='add'>+			if (priv-&gt;control_normal_mode &amp; CTRL_EAF) {</div><div class='add'>+				if (o &gt; 0)</div><div class='add'>+					continue;</div><div class='add'>+				netdev_dbg(dev, "Message object %d for "</div><div class='add'>+					   "RX data, RTR, SFF and EFF\n", mo);</div><div class='add'>+			} else {</div><div class='add'>+				netdev_dbg(dev,</div><div class='add'>+					   "Message object %d for RX %s %s\n",</div><div class='add'>+					   mo, obj_flags &amp; CC770_OBJ_FLAG_RTR ?</div><div class='add'>+					   "RTR" : "data",</div><div class='add'>+					   obj_flags &amp; CC770_OBJ_FLAG_EFF ?</div><div class='add'>+					   "EFF" : "SFF");</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (obj_flags &amp; CC770_OBJ_FLAG_EFF)</div><div class='add'>+				msgcfg = MSGCFG_XTD;</div><div class='add'>+			else</div><div class='add'>+				msgcfg = 0;</div><div class='add'>+			if (obj_flags &amp; CC770_OBJ_FLAG_RTR)</div><div class='add'>+				msgcfg |= MSGCFG_DIR;</div><div class='add'>+</div><div class='add'>+			cc770_write_reg(priv, msgobj[mo].config, msgcfg);</div><div class='add'>+			cc770_write_reg(priv, msgobj[mo].ctrl0,</div><div class='add'>+					MSGVAL_SET | TXIE_RES |</div><div class='add'>+					RXIE_SET | INTPND_RES);</div><div class='add'>+</div><div class='add'>+			if (obj_flags &amp; CC770_OBJ_FLAG_RTR)</div><div class='add'>+				cc770_write_reg(priv, msgobj[mo].ctrl1,</div><div class='add'>+						NEWDAT_RES | CPUUPD_SET |</div><div class='add'>+						TXRQST_RES | RMTPND_RES);</div><div class='add'>+			else</div><div class='add'>+				cc770_write_reg(priv, msgobj[mo].ctrl1,</div><div class='add'>+						NEWDAT_RES | MSGLST_RES |</div><div class='add'>+						TXRQST_RES | RMTPND_RES);</div><div class='add'>+		} else {</div><div class='add'>+			netdev_dbg(dev, "Message object %d for "</div><div class='add'>+				   "TX data, RTR, SFF and EFF\n", mo);</div><div class='add'>+</div><div class='add'>+			cc770_write_reg(priv, msgobj[mo].ctrl1,</div><div class='add'>+					RMTPND_RES | TXRQST_RES |</div><div class='add'>+					CPUUPD_RES | NEWDAT_RES);</div><div class='add'>+			cc770_write_reg(priv, msgobj[mo].ctrl0,</div><div class='add'>+					MSGVAL_RES | TXIE_RES |</div><div class='add'>+					RXIE_RES | INTPND_RES);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void disable_all_objs(const struct cc770_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int o, mo;</div><div class='add'>+</div><div class='add'>+	for (o = 0; o &lt;  ARRAY_SIZE(priv-&gt;obj_flags); o++) {</div><div class='add'>+		mo = obj2msgobj(o);</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;obj_flags[o] &amp; CC770_OBJ_FLAG_RX) {</div><div class='add'>+			if (o &gt; 0 &amp;&amp; priv-&gt;control_normal_mode &amp; CTRL_EAF)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			cc770_write_reg(priv, msgobj[mo].ctrl1,</div><div class='add'>+					NEWDAT_RES | MSGLST_RES |</div><div class='add'>+					TXRQST_RES | RMTPND_RES);</div><div class='add'>+			cc770_write_reg(priv, msgobj[mo].ctrl0,</div><div class='add'>+					MSGVAL_RES | TXIE_RES |</div><div class='add'>+					RXIE_RES | INTPND_RES);</div><div class='add'>+		} else {</div><div class='add'>+			/* Clear message object for send */</div><div class='add'>+			cc770_write_reg(priv, msgobj[mo].ctrl1,</div><div class='add'>+					RMTPND_RES | TXRQST_RES |</div><div class='add'>+					CPUUPD_RES | NEWDAT_RES);</div><div class='add'>+			cc770_write_reg(priv, msgobj[mo].ctrl0,</div><div class='add'>+					MSGVAL_RES | TXIE_RES |</div><div class='add'>+					RXIE_RES | INTPND_RES);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_reset_mode(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	/* Enable configuration and puts chip in bus-off, disable interrupts */</div><div class='add'>+	cc770_write_reg(priv, control, CTRL_CCE | CTRL_INI);</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+</div><div class='add'>+	/* Clear interrupts */</div><div class='add'>+	cc770_read_reg(priv, interrupt);</div><div class='add'>+</div><div class='add'>+	/* Clear status register */</div><div class='add'>+	cc770_write_reg(priv, status, 0);</div><div class='add'>+</div><div class='add'>+	/* Disable all used message objects */</div><div class='add'>+	disable_all_objs(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_normal_mode(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	/* Clear interrupts */</div><div class='add'>+	cc770_read_reg(priv, interrupt);</div><div class='add'>+</div><div class='add'>+	/* Clear status register and pre-set last error code */</div><div class='add'>+	cc770_write_reg(priv, status, STAT_LEC_MASK);</div><div class='add'>+</div><div class='add'>+	/* Enable all used message objects*/</div><div class='add'>+	enable_all_objs(dev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clear bus-off, interrupts only for errors,</div><div class='add'>+	 * not for status change</div><div class='add'>+	 */</div><div class='add'>+	cc770_write_reg(priv, control, priv-&gt;control_normal_mode);</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chipset_init(struct cc770_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int mo, id, data;</div><div class='add'>+</div><div class='add'>+	/* Enable configuration and put chip in bus-off, disable interrupts */</div><div class='add'>+	cc770_write_reg(priv, control, (CTRL_CCE | CTRL_INI));</div><div class='add'>+</div><div class='add'>+	/* Set CLKOUT divider and slew rates */</div><div class='add'>+	cc770_write_reg(priv, clkout, priv-&gt;clkout);</div><div class='add'>+</div><div class='add'>+	/* Configure CPU interface / CLKOUT enable */</div><div class='add'>+	cc770_write_reg(priv, cpu_interface, priv-&gt;cpu_interface);</div><div class='add'>+</div><div class='add'>+	/* Set bus configuration  */</div><div class='add'>+	cc770_write_reg(priv, bus_config, priv-&gt;bus_config);</div><div class='add'>+</div><div class='add'>+	/* Clear interrupts */</div><div class='add'>+	cc770_read_reg(priv, interrupt);</div><div class='add'>+</div><div class='add'>+	/* Clear status register */</div><div class='add'>+	cc770_write_reg(priv, status, 0);</div><div class='add'>+</div><div class='add'>+	/* Clear and invalidate message objects */</div><div class='add'>+	for (mo = MSGOBJ_FIRST; mo &lt;= MSGOBJ_LAST; mo++) {</div><div class='add'>+		cc770_write_reg(priv, msgobj[mo].ctrl0,</div><div class='add'>+				INTPND_UNC | RXIE_RES |</div><div class='add'>+				TXIE_RES | MSGVAL_RES);</div><div class='add'>+		cc770_write_reg(priv, msgobj[mo].ctrl0,</div><div class='add'>+				INTPND_RES | RXIE_RES |</div><div class='add'>+				TXIE_RES | MSGVAL_RES);</div><div class='add'>+		cc770_write_reg(priv, msgobj[mo].ctrl1,</div><div class='add'>+				NEWDAT_RES | MSGLST_RES |</div><div class='add'>+				TXRQST_RES | RMTPND_RES);</div><div class='add'>+		for (data = 0; data &lt; 8; data++)</div><div class='add'>+			cc770_write_reg(priv, msgobj[mo].data[data], 0);</div><div class='add'>+		for (id = 0; id &lt; 4; id++)</div><div class='add'>+			cc770_write_reg(priv, msgobj[mo].id[id], 0);</div><div class='add'>+		cc770_write_reg(priv, msgobj[mo].config, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set all global ID masks to "don't care" */</div><div class='add'>+	cc770_write_reg(priv, global_mask_std[0], 0);</div><div class='add'>+	cc770_write_reg(priv, global_mask_std[1], 0);</div><div class='add'>+	cc770_write_reg(priv, global_mask_ext[0], 0);</div><div class='add'>+	cc770_write_reg(priv, global_mask_ext[1], 0);</div><div class='add'>+	cc770_write_reg(priv, global_mask_ext[2], 0);</div><div class='add'>+	cc770_write_reg(priv, global_mask_ext[3], 0);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cc770_probe_chip(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	/* Enable configuration, put chip in bus-off, disable ints */</div><div class='add'>+	cc770_write_reg(priv, control, CTRL_CCE | CTRL_EAF | CTRL_INI);</div><div class='add'>+	/* Configure cpu interface / CLKOUT disable */</div><div class='add'>+	cc770_write_reg(priv, cpu_interface, priv-&gt;cpu_interface);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if hardware reset is still inactive or maybe there</div><div class='add'>+	 * is no chip in this address space</div><div class='add'>+	 */</div><div class='add'>+	if (cc770_read_reg(priv, cpu_interface) &amp; CPUIF_RST) {</div><div class='add'>+		netdev_info(dev, "probing @0x%p failed (reset)\n",</div><div class='add'>+			    priv-&gt;reg_base);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Write and read back test pattern (some arbitrary values) */</div><div class='add'>+	cc770_write_reg(priv, msgobj[1].data[1], 0x25);</div><div class='add'>+	cc770_write_reg(priv, msgobj[2].data[3], 0x52);</div><div class='add'>+	cc770_write_reg(priv, msgobj[10].data[6], 0xc3);</div><div class='add'>+	if ((cc770_read_reg(priv, msgobj[1].data[1]) != 0x25) ||</div><div class='add'>+	    (cc770_read_reg(priv, msgobj[2].data[3]) != 0x52) ||</div><div class='add'>+	    (cc770_read_reg(priv, msgobj[10].data[6]) != 0xc3)) {</div><div class='add'>+		netdev_info(dev, "probing @0x%p failed (pattern)\n",</div><div class='add'>+			    priv-&gt;reg_base);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if this chip is a CC770 supporting additional functions */</div><div class='add'>+	if (cc770_read_reg(priv, control) &amp; CTRL_EAF)</div><div class='add'>+		priv-&gt;control_normal_mode |= CTRL_EAF;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cc770_start(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	/* leave reset mode */</div><div class='add'>+	if (priv-&gt;can.state != CAN_STATE_STOPPED)</div><div class='add'>+		set_reset_mode(dev);</div><div class='add'>+</div><div class='add'>+	/* leave reset mode */</div><div class='add'>+	set_normal_mode(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cc770_set_mode(struct net_device *dev, enum can_mode mode)</div><div class='add'>+{</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case CAN_MODE_START:</div><div class='add'>+		cc770_start(dev);</div><div class='add'>+		netif_wake_queue(dev);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cc770_set_bittiming(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='add'>+	u8 btr0, btr1;</div><div class='add'>+</div><div class='add'>+	btr0 = ((bt-&gt;brp - 1) &amp; 0x3f) | (((bt-&gt;sjw - 1) &amp; 0x3) &lt;&lt; 6);</div><div class='add'>+	btr1 = ((bt-&gt;prop_seg + bt-&gt;phase_seg1 - 1) &amp; 0xf) |</div><div class='add'>+		(((bt-&gt;phase_seg2 - 1) &amp; 0x7) &lt;&lt; 4);</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_3_SAMPLES)</div><div class='add'>+		btr1 |= 0x80;</div><div class='add'>+</div><div class='add'>+	netdev_info(dev, "setting BTR0=0x%02x BTR1=0x%02x\n", btr0, btr1);</div><div class='add'>+</div><div class='add'>+	cc770_write_reg(priv, bit_timing_0, btr0);</div><div class='add'>+	cc770_write_reg(priv, bit_timing_1, btr1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cc770_get_berr_counter(const struct net_device *dev,</div><div class='add'>+				  struct can_berr_counter *bec)</div><div class='add'>+{</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	bec-&gt;txerr = cc770_read_reg(priv, tx_error_counter);</div><div class='add'>+	bec-&gt;rxerr = cc770_read_reg(priv, rx_error_counter);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t cc770_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='add'>+	struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='add'>+	unsigned int mo = obj2msgobj(CC770_OBJ_TX);</div><div class='add'>+	u8 dlc, rtr;</div><div class='add'>+	u32 id;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (can_dropped_invalid_skb(dev, skb))</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+	if ((cc770_read_reg(priv,</div><div class='add'>+			    msgobj[mo].ctrl1) &amp; TXRQST_UNC) == TXRQST_SET) {</div><div class='add'>+		netdev_err(dev, "TX register is still occupied!\n");</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(dev);</div><div class='add'>+</div><div class='add'>+	dlc = cf-&gt;can_dlc;</div><div class='add'>+	id = cf-&gt;can_id;</div><div class='add'>+	if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='add'>+		rtr = 0;</div><div class='add'>+	else</div><div class='add'>+		rtr = MSGCFG_DIR;</div><div class='add'>+	cc770_write_reg(priv, msgobj[mo].ctrl1,</div><div class='add'>+			RMTPND_RES | TXRQST_RES | CPUUPD_SET | NEWDAT_RES);</div><div class='add'>+	cc770_write_reg(priv, msgobj[mo].ctrl0,</div><div class='add'>+			MSGVAL_SET | TXIE_SET | RXIE_RES | INTPND_RES);</div><div class='add'>+	if (id &amp; CAN_EFF_FLAG) {</div><div class='add'>+		id &amp;= CAN_EFF_MASK;</div><div class='add'>+		cc770_write_reg(priv, msgobj[mo].config,</div><div class='add'>+				(dlc &lt;&lt; 4) | rtr | MSGCFG_XTD);</div><div class='add'>+		cc770_write_reg(priv, msgobj[mo].id[3], id &lt;&lt; 3);</div><div class='add'>+		cc770_write_reg(priv, msgobj[mo].id[2], id &gt;&gt; 5);</div><div class='add'>+		cc770_write_reg(priv, msgobj[mo].id[1], id &gt;&gt; 13);</div><div class='add'>+		cc770_write_reg(priv, msgobj[mo].id[0], id &gt;&gt; 21);</div><div class='add'>+	} else {</div><div class='add'>+		id &amp;= CAN_SFF_MASK;</div><div class='add'>+		cc770_write_reg(priv, msgobj[mo].config, (dlc &lt;&lt; 4) | rtr);</div><div class='add'>+		cc770_write_reg(priv, msgobj[mo].id[0], id &gt;&gt; 3);</div><div class='add'>+		cc770_write_reg(priv, msgobj[mo].id[1], id &lt;&lt; 5);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dlc; i++)</div><div class='add'>+		cc770_write_reg(priv, msgobj[mo].data[i], cf-&gt;data[i]);</div><div class='add'>+</div><div class='add'>+	cc770_write_reg(priv, msgobj[mo].ctrl1,</div><div class='add'>+			RMTPND_RES | TXRQST_SET | CPUUPD_RES | NEWDAT_UNC);</div><div class='add'>+</div><div class='add'>+	stats-&gt;tx_bytes += dlc;</div><div class='add'>+</div><div class='add'>+	can_put_echo_skb(skb, dev, 0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * HM: We had some cases of repeated IRQs so make sure the</div><div class='add'>+	 * INT is acknowledged I know it's already further up, but</div><div class='add'>+	 * doing again fixed the issue</div><div class='add'>+	 */</div><div class='add'>+	cc770_write_reg(priv, msgobj[mo].ctrl0,</div><div class='add'>+			MSGVAL_UNC | TXIE_UNC | RXIE_UNC | INTPND_RES);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cc770_rx(struct net_device *dev, unsigned int mo, u8 ctrl1)</div><div class='add'>+{</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 config;</div><div class='add'>+	u32 id;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_skb(dev, &amp;cf);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	config = cc770_read_reg(priv, msgobj[mo].config);</div><div class='add'>+</div><div class='add'>+	if (ctrl1 &amp; RMTPND_SET) {</div><div class='add'>+		/*</div><div class='add'>+		 * Unfortunately, the chip does not store the real message</div><div class='add'>+		 * identifier of the received remote transmission request</div><div class='add'>+		 * frame. Therefore we set it to 0.</div><div class='add'>+		 */</div><div class='add'>+		cf-&gt;can_id = CAN_RTR_FLAG;</div><div class='add'>+		if (config &amp; MSGCFG_XTD)</div><div class='add'>+			cf-&gt;can_id |= CAN_EFF_FLAG;</div><div class='add'>+		cf-&gt;can_dlc = 0;</div><div class='add'>+	} else {</div><div class='add'>+		if (config &amp; MSGCFG_XTD) {</div><div class='add'>+			id = cc770_read_reg(priv, msgobj[mo].id[3]);</div><div class='add'>+			id |= cc770_read_reg(priv, msgobj[mo].id[2]) &lt;&lt; 8;</div><div class='add'>+			id |= cc770_read_reg(priv, msgobj[mo].id[1]) &lt;&lt; 16;</div><div class='add'>+			id |= cc770_read_reg(priv, msgobj[mo].id[0]) &lt;&lt; 24;</div><div class='add'>+			id &gt;&gt;= 3;</div><div class='add'>+			id |= CAN_EFF_FLAG;</div><div class='add'>+		} else {</div><div class='add'>+			id = cc770_read_reg(priv, msgobj[mo].id[1]);</div><div class='add'>+			id |= cc770_read_reg(priv, msgobj[mo].id[0]) &lt;&lt; 8;</div><div class='add'>+			id &gt;&gt;= 5;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cf-&gt;can_id = id;</div><div class='add'>+		cf-&gt;can_dlc = get_can_dlc((config &amp; 0xf0) &gt;&gt; 4);</div><div class='add'>+		for (i = 0; i &lt; cf-&gt;can_dlc; i++)</div><div class='add'>+			cf-&gt;data[i] = cc770_read_reg(priv, msgobj[mo].data[i]);</div><div class='add'>+	}</div><div class='add'>+	netif_rx(skb);</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_packets++;</div><div class='add'>+	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cc770_err(struct net_device *dev, u8 status)</div><div class='add'>+{</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 lec;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(dev, "status interrupt (%#x)\n", status);</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(dev, &amp;cf);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Use extended functions of the CC770 */</div><div class='add'>+	if (priv-&gt;control_normal_mode &amp; CTRL_EAF) {</div><div class='add'>+		cf-&gt;data[6] = cc770_read_reg(priv, tx_error_counter);</div><div class='add'>+		cf-&gt;data[7] = cc770_read_reg(priv, rx_error_counter);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status &amp; STAT_BOFF) {</div><div class='add'>+		/* Disable interrupts */</div><div class='add'>+		cc770_write_reg(priv, control, CTRL_INI);</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_BUSOFF;</div><div class='add'>+		priv-&gt;can.state = CAN_STATE_BUS_OFF;</div><div class='add'>+		can_bus_off(dev);</div><div class='add'>+	} else if (status &amp; STAT_WARN) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+		/* Only the CC770 does show error passive */</div><div class='add'>+		if (cf-&gt;data[7] &gt; 127) {</div><div class='add'>+			cf-&gt;data[1] = CAN_ERR_CRTL_RX_PASSIVE |</div><div class='add'>+				CAN_ERR_CRTL_TX_PASSIVE;</div><div class='add'>+			priv-&gt;can.state = CAN_STATE_ERROR_PASSIVE;</div><div class='add'>+			priv-&gt;can.can_stats.error_passive++;</div><div class='add'>+		} else {</div><div class='add'>+			cf-&gt;data[1] = CAN_ERR_CRTL_RX_WARNING |</div><div class='add'>+				CAN_ERR_CRTL_TX_WARNING;</div><div class='add'>+			priv-&gt;can.state = CAN_STATE_ERROR_WARNING;</div><div class='add'>+			priv-&gt;can.can_stats.error_warning++;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Back to error avtive */</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_PROT;</div><div class='add'>+		cf-&gt;data[2] = CAN_ERR_PROT_ACTIVE;</div><div class='add'>+		priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lec = status &amp; STAT_LEC_MASK;</div><div class='add'>+	if (lec &lt; 7 &amp;&amp; lec &gt; 0) {</div><div class='add'>+		if (lec == STAT_LEC_ACK) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_ACK;</div><div class='add'>+		} else {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_PROT;</div><div class='add'>+			switch (lec) {</div><div class='add'>+			case STAT_LEC_STUFF:</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='add'>+				break;</div><div class='add'>+			case STAT_LEC_FORM:</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='add'>+				break;</div><div class='add'>+			case STAT_LEC_BIT1:</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_BIT1;</div><div class='add'>+				break;</div><div class='add'>+			case STAT_LEC_BIT0:</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_BIT0;</div><div class='add'>+				break;</div><div class='add'>+			case STAT_LEC_CRC:</div><div class='add'>+				cf-&gt;data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_rx(skb);</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_packets++;</div><div class='add'>+	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cc770_status_interrupt(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+	u8 status;</div><div class='add'>+</div><div class='add'>+	status = cc770_read_reg(priv, status);</div><div class='add'>+	/* Reset the status register including RXOK and TXOK */</div><div class='add'>+	cc770_write_reg(priv, status, STAT_LEC_MASK);</div><div class='add'>+</div><div class='add'>+	if (status &amp; (STAT_WARN | STAT_BOFF) ||</div><div class='add'>+	    (status &amp; STAT_LEC_MASK) != STAT_LEC_MASK) {</div><div class='add'>+		cc770_err(dev, status);</div><div class='add'>+		return status &amp; STAT_BOFF;</div><div 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 cc770_rx_interrupt(struct net_device *dev, unsigned int o)</div><div class='add'>+{</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='add'>+	unsigned int mo = obj2msgobj(o);</div><div class='add'>+	u8 ctrl1;</div><div class='add'>+	int n = CC770_MAX_MSG;</div><div class='add'>+</div><div class='add'>+	while (n--) {</div><div class='add'>+		ctrl1 = cc770_read_reg(priv, msgobj[mo].ctrl1);</div><div class='add'>+</div><div class='add'>+		if (!(ctrl1 &amp; NEWDAT_SET))  {</div><div class='add'>+			/* Check for RTR if additional functions are enabled */</div><div class='add'>+			if (priv-&gt;control_normal_mode &amp; CTRL_EAF) {</div><div class='add'>+				if (!(cc770_read_reg(priv, msgobj[mo].ctrl0) &amp;</div><div class='add'>+				      INTPND_SET))</div><div class='add'>+					break;</div><div class='add'>+			} else {</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ctrl1 &amp; MSGLST_SET) {</div><div class='add'>+			stats-&gt;rx_over_errors++;</div><div class='add'>+			stats-&gt;rx_errors++;</div><div class='add'>+		}</div><div class='add'>+		if (mo &lt; MSGOBJ_LAST)</div><div class='add'>+			cc770_write_reg(priv, msgobj[mo].ctrl1,</div><div class='add'>+					NEWDAT_RES | MSGLST_RES |</div><div class='add'>+					TXRQST_UNC | RMTPND_UNC);</div><div class='add'>+		cc770_rx(dev, mo, ctrl1);</div><div class='add'>+</div><div class='add'>+		cc770_write_reg(priv, msgobj[mo].ctrl0,</div><div class='add'>+				MSGVAL_SET | TXIE_RES |</div><div class='add'>+				RXIE_SET | INTPND_RES);</div><div class='add'>+		cc770_write_reg(priv, msgobj[mo].ctrl1,</div><div class='add'>+				NEWDAT_RES | MSGLST_RES |</div><div class='add'>+				TXRQST_RES | RMTPND_RES);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cc770_rtr_interrupt(struct net_device *dev, unsigned int o)</div><div class='add'>+{</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+	unsigned int mo = obj2msgobj(o);</div><div class='add'>+	u8 ctrl0, ctrl1;</div><div class='add'>+	int n = CC770_MAX_MSG;</div><div class='add'>+</div><div class='add'>+	while (n--) {</div><div class='add'>+		ctrl0 = cc770_read_reg(priv, msgobj[mo].ctrl0);</div><div class='add'>+		if (!(ctrl0 &amp; INTPND_SET))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ctrl1 = cc770_read_reg(priv, msgobj[mo].ctrl1);</div><div class='add'>+		cc770_rx(dev, mo, ctrl1);</div><div class='add'>+</div><div class='add'>+		cc770_write_reg(priv, msgobj[mo].ctrl0,</div><div class='add'>+				MSGVAL_SET | TXIE_RES |</div><div class='add'>+				RXIE_SET | INTPND_RES);</div><div class='add'>+		cc770_write_reg(priv, msgobj[mo].ctrl1,</div><div class='add'>+				NEWDAT_RES | CPUUPD_SET |</div><div class='add'>+				TXRQST_RES | RMTPND_RES);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cc770_tx_interrupt(struct net_device *dev, unsigned int o)</div><div class='add'>+{</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='add'>+	unsigned int mo = obj2msgobj(o);</div><div class='add'>+</div><div class='add'>+	/* Nothing more to send, switch off interrupts */</div><div class='add'>+	cc770_write_reg(priv, msgobj[mo].ctrl0,</div><div class='add'>+			MSGVAL_RES | TXIE_RES | RXIE_RES | INTPND_RES);</div><div class='add'>+	/*</div><div class='add'>+	 * We had some cases of repeated IRQ so make sure the</div><div class='add'>+	 * INT is acknowledged</div><div class='add'>+	 */</div><div class='add'>+	cc770_write_reg(priv, msgobj[mo].ctrl0,</div><div class='add'>+			MSGVAL_UNC | TXIE_UNC | RXIE_UNC | INTPND_RES);</div><div class='add'>+</div><div class='add'>+	stats-&gt;tx_packets++;</div><div class='add'>+	can_get_echo_skb(dev, 0);</div><div class='add'>+	netif_wake_queue(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+irqreturn_t cc770_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = (struct net_device *)dev_id;</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+	u8 intid;</div><div class='add'>+	int o, n = 0;</div><div class='add'>+</div><div class='add'>+	/* Shared interrupts and IRQ off? */</div><div class='add'>+	if (priv-&gt;can.state == CAN_STATE_STOPPED)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;pre_irq)</div><div class='add'>+		priv-&gt;pre_irq(priv);</div><div class='add'>+</div><div class='add'>+	while (n &lt; CC770_MAX_IRQ) {</div><div class='add'>+		/* Read the highest pending interrupt request */</div><div class='add'>+		intid = cc770_read_reg(priv, interrupt);</div><div class='add'>+		if (!intid)</div><div class='add'>+			break;</div><div class='add'>+		n++;</div><div class='add'>+</div><div class='add'>+		if (intid == 1) {</div><div class='add'>+			/* Exit in case of bus-off */</div><div class='add'>+			if (cc770_status_interrupt(dev))</div><div class='add'>+				break;</div><div class='add'>+		} else {</div><div class='add'>+			o = intid2obj(intid);</div><div class='add'>+</div><div class='add'>+			if (o &gt;= CC770_OBJ_MAX) {</div><div class='add'>+				netdev_err(dev, "Unexpected interrupt id %d\n",</div><div class='add'>+					   intid);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (priv-&gt;obj_flags[o] &amp; CC770_OBJ_FLAG_RTR)</div><div class='add'>+				cc770_rtr_interrupt(dev, o);</div><div class='add'>+			else if (priv-&gt;obj_flags[o] &amp; CC770_OBJ_FLAG_RX)</div><div class='add'>+				cc770_rx_interrupt(dev, o);</div><div class='add'>+			else</div><div class='add'>+				cc770_tx_interrupt(dev, o);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;post_irq)</div><div class='add'>+		priv-&gt;post_irq(priv);</div><div class='add'>+</div><div class='add'>+	if (n &gt;= CC770_MAX_IRQ)</div><div class='add'>+		netdev_dbg(dev, "%d messages handled in ISR", n);</div><div class='add'>+</div><div class='add'>+	return (n) ? IRQ_HANDLED : IRQ_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cc770_open(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* set chip into reset mode */</div><div class='add'>+	set_reset_mode(dev);</div><div class='add'>+</div><div class='add'>+	/* common open */</div><div class='add'>+	err = open_candev(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = request_irq(dev-&gt;irq, &amp;cc770_interrupt, priv-&gt;irq_flags,</div><div class='add'>+			  dev-&gt;name, dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		close_candev(dev);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* init and start chip */</div><div class='add'>+	cc770_start(dev);</div><div class='add'>+</div><div class='add'>+	netif_start_queue(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cc770_close(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	netif_stop_queue(dev);</div><div class='add'>+	set_reset_mode(dev);</div><div class='add'>+</div><div class='add'>+	free_irq(dev-&gt;irq, dev);</div><div class='add'>+	close_candev(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct net_device *alloc_cc770dev(int sizeof_priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct cc770_priv *priv;</div><div class='add'>+</div><div class='add'>+	dev = alloc_candev(sizeof(struct cc770_priv) + sizeof_priv,</div><div class='add'>+			   CC770_ECHO_SKB_MAX);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	priv-&gt;dev = dev;</div><div class='add'>+	priv-&gt;can.bittiming_const = &amp;cc770_bittiming_const;</div><div class='add'>+	priv-&gt;can.do_set_bittiming = cc770_set_bittiming;</div><div class='add'>+	priv-&gt;can.do_set_mode = cc770_set_mode;</div><div class='add'>+	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;</div><div class='add'>+</div><div class='add'>+	memcpy(priv-&gt;obj_flags, cc770_obj_flags, sizeof(cc770_obj_flags));</div><div class='add'>+</div><div class='add'>+	if (sizeof_priv)</div><div class='add'>+		priv-&gt;priv = (void *)priv + sizeof(struct cc770_priv);</div><div class='add'>+</div><div class='add'>+	return dev;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(alloc_cc770dev);</div><div class='add'>+</div><div class='add'>+void free_cc770dev(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	free_candev(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(free_cc770dev);</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops cc770_netdev_ops = {</div><div class='add'>+	.ndo_open = cc770_open,</div><div class='add'>+	.ndo_stop = cc770_close,</div><div class='add'>+	.ndo_start_xmit = cc770_start_xmit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int register_cc770dev(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = cc770_probe_chip(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	dev-&gt;netdev_ops = &amp;cc770_netdev_ops;</div><div class='add'>+</div><div class='add'>+	dev-&gt;flags |= IFF_ECHO;	/* we support local echo */</div><div class='add'>+</div><div class='add'>+	/* Should we use additional functions? */</div><div class='add'>+	if (!i82527_compat &amp;&amp; priv-&gt;control_normal_mode &amp; CTRL_EAF) {</div><div class='add'>+		priv-&gt;can.do_get_berr_counter = cc770_get_berr_counter;</div><div class='add'>+		priv-&gt;control_normal_mode = CTRL_IE | CTRL_EAF | CTRL_EIE;</div><div class='add'>+		netdev_dbg(dev, "i82527 mode with additional functions\n");</div><div class='add'>+	} else {</div><div class='add'>+		priv-&gt;control_normal_mode = CTRL_IE | CTRL_EIE;</div><div class='add'>+		netdev_dbg(dev, "strict i82527 compatibility mode\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chipset_init(priv);</div><div class='add'>+	set_reset_mode(dev);</div><div class='add'>+</div><div class='add'>+	return register_candev(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(register_cc770dev);</div><div class='add'>+</div><div class='add'>+void unregister_cc770dev(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	set_reset_mode(dev);</div><div class='add'>+	unregister_candev(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(unregister_cc770dev);</div><div class='add'>+</div><div class='add'>+static __init int cc770_init(void)</div><div class='add'>+{</div><div class='add'>+	if (msgobj15_eff) {</div><div class='add'>+		cc770_obj_flags[CC770_OBJ_RX0] |= CC770_OBJ_FLAG_EFF;</div><div class='add'>+		cc770_obj_flags[CC770_OBJ_RX1] &amp;= ~CC770_OBJ_FLAG_EFF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_info("CAN netdevice driver\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+module_init(cc770_init);</div><div class='add'>+</div><div class='add'>+static __exit void cc770_exit(void)</div><div class='add'>+{</div><div class='add'>+	pr_info("driver removed\n");</div><div class='add'>+}</div><div class='add'>+module_exit(cc770_exit);</div><div class='head'>diff --git a/drivers/net/can/cc770/cc770.h b/drivers/net/can/cc770/cc770.h<br/>new file mode 100644<br/>index 000000000000..a1739db98d91<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/cc770/cc770.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/cc770/cc770.h</a></div><div class='hunk'>@@ -0,0 +1,203 @@</div><div class='add'>+/*</div><div class='add'>+ * Core driver for the CC770 and AN82527 CAN controllers</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2009, 2011 Wolfgang Grandegger &lt;wg@grandegger.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 version 2 of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef CC770_DEV_H</div><div class='add'>+#define CC770_DEV_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+</div><div class='add'>+struct cc770_msgobj {</div><div class='add'>+	u8 ctrl0;</div><div class='add'>+	u8 ctrl1;</div><div class='add'>+	u8 id[4];</div><div class='add'>+	u8 config;</div><div class='add'>+	u8 data[8];</div><div class='add'>+	u8 dontuse;		/* padding */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct cc770_regs {</div><div class='add'>+	union {</div><div class='add'>+		struct cc770_msgobj msgobj[16]; /* Message object 1..15 */</div><div class='add'>+		struct {</div><div class='add'>+			u8 control;		/* Control Register */</div><div class='add'>+			u8 status;		/* Status Register */</div><div class='add'>+			u8 cpu_interface;	/* CPU Interface Register */</div><div class='add'>+			u8 dontuse1;</div><div class='add'>+			u8 high_speed_read[2];	/* High Speed Read */</div><div class='add'>+			u8 global_mask_std[2];	/* Standard Global Mask */</div><div class='add'>+			u8 global_mask_ext[4];	/* Extended Global Mask */</div><div class='add'>+			u8 msg15_mask[4];	/* Message 15 Mask */</div><div class='add'>+			u8 dontuse2[15];</div><div class='add'>+			u8 clkout;		/* Clock Out Register */</div><div class='add'>+			u8 dontuse3[15];</div><div class='add'>+			u8 bus_config;		/* Bus Configuration Register */</div><div class='add'>+			u8 dontuse4[15];</div><div class='add'>+			u8 bit_timing_0;	/* Bit Timing Register byte 0 */</div><div class='add'>+			u8 dontuse5[15];</div><div class='add'>+			u8 bit_timing_1;	/* Bit Timing Register byte 1 */</div><div class='add'>+			u8 dontuse6[15];</div><div class='add'>+			u8 interrupt;		/* Interrupt Register */</div><div class='add'>+			u8 dontuse7[15];</div><div class='add'>+			u8 rx_error_counter;	/* Receive Error Counter */</div><div class='add'>+			u8 dontuse8[15];</div><div class='add'>+			u8 tx_error_counter;	/* Transmit Error Counter */</div><div class='add'>+			u8 dontuse9[31];</div><div class='add'>+			u8 p1_conf;</div><div class='add'>+			u8 dontuse10[15];</div><div class='add'>+			u8 p2_conf;</div><div class='add'>+			u8 dontuse11[15];</div><div class='add'>+			u8 p1_in;</div><div class='add'>+			u8 dontuse12[15];</div><div class='add'>+			u8 p2_in;</div><div class='add'>+			u8 dontuse13[15];</div><div class='add'>+			u8 p1_out;</div><div class='add'>+			u8 dontuse14[15];</div><div class='add'>+			u8 p2_out;</div><div class='add'>+			u8 dontuse15[15];</div><div class='add'>+			u8 serial_reset_addr;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* Control Register (0x00) */</div><div class='add'>+#define CTRL_INI	0x01	/* Initialization */</div><div class='add'>+#define CTRL_IE		0x02	/* Interrupt Enable */</div><div class='add'>+#define CTRL_SIE	0x04	/* Status Interrupt Enable */</div><div class='add'>+#define CTRL_EIE	0x08	/* Error Interrupt Enable */</div><div class='add'>+#define CTRL_EAF	0x20	/* Enable additional functions */</div><div class='add'>+#define CTRL_CCE	0x40	/* Change Configuration Enable */</div><div class='add'>+</div><div class='add'>+/* Status Register (0x01) */</div><div class='add'>+#define STAT_LEC_STUFF	0x01	/* Stuff error */</div><div class='add'>+#define STAT_LEC_FORM	0x02	/* Form error */</div><div class='add'>+#define STAT_LEC_ACK	0x03	/* Acknowledgement error */</div><div class='add'>+#define STAT_LEC_BIT1	0x04	/* Bit1 error */</div><div class='add'>+#define STAT_LEC_BIT0	0x05	/* Bit0 error */</div><div class='add'>+#define STAT_LEC_CRC	0x06	/* CRC error */</div><div class='add'>+#define STAT_LEC_MASK	0x07	/* Last Error Code mask */</div><div class='add'>+#define STAT_TXOK	0x08	/* Transmit Message Successfully */</div><div class='add'>+#define STAT_RXOK	0x10	/* Receive Message Successfully */</div><div class='add'>+#define STAT_WAKE	0x20	/* Wake Up Status */</div><div class='add'>+#define STAT_WARN	0x40	/* Warning Status */</div><div class='add'>+#define STAT_BOFF	0x80	/* Bus Off Status */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CPU Interface Register (0x02)</div><div class='add'>+ * Clock Out Register (0x1f)</div><div class='add'>+ * Bus Configuration Register (0x2f)</div><div class='add'>+ *</div><div class='add'>+ * see include/linux/can/platform/cc770.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Message Control Register 0 (Base Address + 0x0) */</div><div class='add'>+#define INTPND_RES	0x01	/* No Interrupt pending */</div><div class='add'>+#define INTPND_SET	0x02	/* Interrupt pending */</div><div class='add'>+#define INTPND_UNC	0x03</div><div class='add'>+#define RXIE_RES	0x04	/* Receive Interrupt Disable */</div><div class='add'>+#define RXIE_SET	0x08	/* Receive Interrupt Enable */</div><div class='add'>+#define RXIE_UNC	0x0c</div><div class='add'>+#define TXIE_RES	0x10	/* Transmit Interrupt Disable */</div><div class='add'>+#define TXIE_SET	0x20	/* Transmit Interrupt Enable */</div><div class='add'>+#define TXIE_UNC	0x30</div><div class='add'>+#define MSGVAL_RES	0x40	/* Message Invalid */</div><div class='add'>+#define MSGVAL_SET	0x80	/* Message Valid */</div><div class='add'>+#define MSGVAL_UNC	0xc0</div><div class='add'>+</div><div class='add'>+/* Message Control Register 1 (Base Address + 0x01) */</div><div class='add'>+#define NEWDAT_RES	0x01	/* No New Data */</div><div class='add'>+#define NEWDAT_SET	0x02	/* New Data */</div><div class='add'>+#define NEWDAT_UNC	0x03</div><div class='add'>+#define MSGLST_RES	0x04	/* No Message Lost */</div><div class='add'>+#define MSGLST_SET	0x08	/* Message Lost */</div><div class='add'>+#define MSGLST_UNC	0x0c</div><div class='add'>+#define CPUUPD_RES	0x04	/* No CPU Updating */</div><div class='add'>+#define CPUUPD_SET	0x08	/* CPU Updating */</div><div class='add'>+#define CPUUPD_UNC	0x0c</div><div class='add'>+#define TXRQST_RES	0x10	/* No Transmission Request */</div><div class='add'>+#define TXRQST_SET	0x20	/* Transmission Request */</div><div class='add'>+#define TXRQST_UNC	0x30</div><div class='add'>+#define RMTPND_RES	0x40	/* No Remote Request Pending */</div><div class='add'>+#define RMTPND_SET	0x80	/* Remote Request Pending */</div><div class='add'>+#define RMTPND_UNC	0xc0</div><div class='add'>+</div><div class='add'>+/* Message Configuration Register (Base Address + 0x06) */</div><div class='add'>+#define MSGCFG_XTD	0x04	/* Extended Identifier */</div><div class='add'>+#define MSGCFG_DIR	0x08	/* Direction is Transmit */</div><div class='add'>+</div><div class='add'>+#define MSGOBJ_FIRST	1</div><div class='add'>+#define MSGOBJ_LAST	15</div><div class='add'>+</div><div class='add'>+#define CC770_IO_SIZE	0x100</div><div class='add'>+#define CC770_MAX_IRQ	20	/* max. number of interrupts handled in ISR */</div><div class='add'>+#define CC770_MAX_MSG	4	/* max. number of messages handled in ISR */</div><div class='add'>+</div><div class='add'>+#define CC770_ECHO_SKB_MAX	1</div><div class='add'>+</div><div class='add'>+#define cc770_read_reg(priv, member)					\</div><div class='add'>+	priv-&gt;read_reg(priv, offsetof(struct cc770_regs, member))</div><div class='add'>+</div><div class='add'>+#define cc770_write_reg(priv, member, value)				\</div><div class='add'>+	priv-&gt;write_reg(priv, offsetof(struct cc770_regs, member), value)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Message objects and flags used by this driver</div><div class='add'>+ */</div><div class='add'>+#define CC770_OBJ_FLAG_RX	0x01</div><div class='add'>+#define CC770_OBJ_FLAG_RTR	0x02</div><div class='add'>+#define CC770_OBJ_FLAG_EFF	0x04</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CC770_OBJ_RX0 = 0,	/* for receiving normal messages */</div><div class='add'>+	CC770_OBJ_RX1,		/* for receiving normal messages */</div><div class='add'>+	CC770_OBJ_RX_RTR0,	/* for receiving remote transmission requests */</div><div class='add'>+	CC770_OBJ_RX_RTR1,	/* for receiving remote transmission requests */</div><div class='add'>+	CC770_OBJ_TX,		/* for sending messages */</div><div class='add'>+	CC770_OBJ_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define obj2msgobj(o)	(MSGOBJ_LAST - (o)) /* message object 11..15 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CC770 private data structure</div><div class='add'>+ */</div><div class='add'>+struct cc770_priv {</div><div class='add'>+	struct can_priv can;	/* must be the first member */</div><div class='add'>+	struct sk_buff *echo_skb;</div><div class='add'>+</div><div class='add'>+	/* the lower-layer is responsible for appropriate locking */</div><div class='add'>+	u8 (*read_reg)(const struct cc770_priv *priv, int reg);</div><div class='add'>+	void (*write_reg)(const struct cc770_priv *priv, int reg, u8 val);</div><div class='add'>+	void (*pre_irq)(const struct cc770_priv *priv);</div><div class='add'>+	void (*post_irq)(const struct cc770_priv *priv);</div><div class='add'>+</div><div class='add'>+	void *priv;		/* for board-specific data */</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	void __iomem *reg_base;	 /* ioremap'ed address to registers */</div><div class='add'>+	unsigned long irq_flags; /* for request_irq() */</div><div class='add'>+</div><div class='add'>+	unsigned char obj_flags[CC770_OBJ_MAX];</div><div class='add'>+	u8 control_normal_mode;	/* Control register for normal mode */</div><div class='add'>+	u8 cpu_interface;	/* CPU interface register */</div><div class='add'>+	u8 clkout;		/* Clock out register */</div><div class='add'>+	u8 bus_config;		/* Bus conffiguration register */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct net_device *alloc_cc770dev(int sizeof_priv);</div><div class='add'>+void free_cc770dev(struct net_device *dev);</div><div class='add'>+int register_cc770dev(struct net_device *dev);</div><div class='add'>+void unregister_cc770dev(struct net_device *dev);</div><div class='add'>+</div><div class='add'>+#endif /* CC770_DEV_H */</div><div class='head'>diff --git a/drivers/net/can/cc770/cc770_isa.c b/drivers/net/can/cc770/cc770_isa.c<br/>new file mode 100644<br/>index 000000000000..4be5fe2c40a5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/cc770/cc770_isa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/cc770/cc770_isa.c</a></div><div class='hunk'>@@ -0,0 +1,367 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for CC770 and AN82527 CAN controllers on the legacy ISA bus</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2009, 2011 Wolfgang Grandegger &lt;wg@grandegger.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 version 2 of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Bosch CC770 and Intel AN82527 CAN controllers on the ISA or PC-104 bus.</div><div class='add'>+ * The I/O port or memory address and the IRQ number must be specified via</div><div class='add'>+ * module parameters:</div><div class='add'>+ *</div><div class='add'>+ *   insmod cc770_isa.ko port=0x310,0x380 irq=7,11</div><div class='add'>+ *</div><div class='add'>+ * for ISA devices using I/O ports or:</div><div class='add'>+ *</div><div class='add'>+ *   insmod cc770_isa.ko mem=0xd1000,0xd1000 irq=7,11</div><div class='add'>+ *</div><div class='add'>+ * for memory mapped ISA devices.</div><div class='add'>+ *</div><div class='add'>+ * Indirect access via address and data port is supported as well:</div><div class='add'>+ *</div><div class='add'>+ *   insmod cc770_isa.ko port=0x310,0x380 indirect=1 irq=7,11</div><div class='add'>+ *</div><div class='add'>+ * Furthermore, the following mode parameter can be defined:</div><div class='add'>+ *</div><div class='add'>+ *   clk: External oscillator clock frequency (default=16000000 [16 MHz])</div><div class='add'>+ *   cir: CPU interface register (default=0x40 [DSC])</div><div class='add'>+ *   bcr: Bus configuration register (default=0x40 [CBY])</div><div class='add'>+ *   cor: Clockout register (default=0x00)</div><div class='add'>+ *</div><div class='add'>+ * Note: for clk, cir, bcr and cor, the first argument re-defines the</div><div class='add'>+ * default for all other devices, e.g.:</div><div class='add'>+ *</div><div class='add'>+ *   insmod cc770_isa.ko mem=0xd1000,0xd1000 irq=7,11 clk=24000000</div><div class='add'>+ *</div><div class='add'>+ * is equivalent to</div><div class='add'>+ *</div><div class='add'>+ *   insmod cc770_isa.ko mem=0xd1000,0xd1000 irq=7,11 clk=24000000,24000000</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/can.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/can/platform/cc770.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cc770.h"</div><div class='add'>+</div><div class='add'>+#define MAXDEV 8</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Wolfgang Grandegger &lt;wg@grandegger.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Socket-CAN driver for CC770 on the ISA bus");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+</div><div class='add'>+#define CLK_DEFAULT	16000000	/* 16 MHz */</div><div class='add'>+#define COR_DEFAULT	0x00</div><div class='add'>+#define BCR_DEFAULT	BUSCFG_CBY</div><div class='add'>+</div><div class='add'>+static unsigned long port[MAXDEV];</div><div class='add'>+static unsigned long mem[MAXDEV];</div><div class='add'>+static int __devinitdata irq[MAXDEV];</div><div class='add'>+static int __devinitdata clk[MAXDEV];</div><div class='add'>+static u8 __devinitdata cir[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};</div><div class='add'>+static u8 __devinitdata cor[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};</div><div class='add'>+static u8 __devinitdata bcr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};</div><div class='add'>+static int __devinitdata indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1};</div><div class='add'>+</div><div class='add'>+module_param_array(port, ulong, NULL, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(port, "I/O port number");</div><div class='add'>+</div><div class='add'>+module_param_array(mem, ulong, NULL, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(mem, "I/O memory address");</div><div class='add'>+</div><div class='add'>+module_param_array(indirect, int, NULL, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(indirect, "Indirect access via address and data port");</div><div class='add'>+</div><div class='add'>+module_param_array(irq, int, NULL, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(irq, "IRQ number");</div><div class='add'>+</div><div class='add'>+module_param_array(clk, int, NULL, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(clk, "External oscillator clock frequency "</div><div class='add'>+		 "(default=16000000 [16 MHz])");</div><div class='add'>+</div><div class='add'>+module_param_array(cir, byte, NULL, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(cir, "CPU interface register (default=0x40 [DSC])");</div><div class='add'>+</div><div class='add'>+module_param_array(cor, byte, NULL, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(cor, "Clockout register (default=0x00)");</div><div class='add'>+</div><div class='add'>+module_param_array(bcr, byte, NULL, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(bcr, "Bus configuration register (default=0x40 [CBY])");</div><div class='add'>+</div><div class='add'>+#define CC770_IOSIZE          0x20</div><div class='add'>+#define CC770_IOSIZE_INDIRECT 0x02</div><div class='add'>+</div><div class='add'>+static struct platform_device *cc770_isa_devs[MAXDEV];</div><div class='add'>+</div><div class='add'>+static u8 cc770_isa_mem_read_reg(const struct cc770_priv *priv, int reg)</div><div class='add'>+{</div><div class='add'>+	return readb(priv-&gt;reg_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cc770_isa_mem_write_reg(const struct cc770_priv *priv,</div><div class='add'>+				      int reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	writeb(val, priv-&gt;reg_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 cc770_isa_port_read_reg(const struct cc770_priv *priv, int reg)</div><div class='add'>+{</div><div class='add'>+	return inb((unsigned long)priv-&gt;reg_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cc770_isa_port_write_reg(const struct cc770_priv *priv,</div><div class='add'>+				       int reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	outb(val, (unsigned long)priv-&gt;reg_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 cc770_isa_port_read_reg_indirect(const struct cc770_priv *priv,</div><div class='add'>+					     int reg)</div><div class='add'>+{</div><div class='add'>+	unsigned long base = (unsigned long)priv-&gt;reg_base;</div><div class='add'>+</div><div class='add'>+	outb(reg, base);</div><div class='add'>+	return inb(base + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cc770_isa_port_write_reg_indirect(const struct cc770_priv *priv,</div><div class='add'>+						int reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	unsigned long base = (unsigned long)priv-&gt;reg_base;</div><div class='add'>+</div><div class='add'>+	outb(reg, base);</div><div class='add'>+	outb(val, base + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit cc770_isa_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct cc770_priv *priv;</div><div class='add'>+	void __iomem *base = NULL;</div><div class='add'>+	int iosize = CC770_IOSIZE;</div><div class='add'>+	int idx = pdev-&gt;id;</div><div class='add'>+	int err;</div><div class='add'>+	u32 clktmp;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "probing idx=%d: port=%#lx, mem=%#lx, irq=%d\n",</div><div class='add'>+		idx, port[idx], mem[idx], irq[idx]);</div><div class='add'>+	if (mem[idx]) {</div><div class='add'>+		if (!request_mem_region(mem[idx], iosize, KBUILD_MODNAME)) {</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		base = ioremap_nocache(mem[idx], iosize);</div><div class='add'>+		if (!base) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto exit_release;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (indirect[idx] &gt; 0 ||</div><div class='add'>+		    (indirect[idx] == -1 &amp;&amp; indirect[0] &gt; 0))</div><div class='add'>+			iosize = CC770_IOSIZE_INDIRECT;</div><div class='add'>+		if (!request_region(port[idx], iosize, KBUILD_MODNAME)) {</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = alloc_cc770dev(0);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto exit_unmap;</div><div class='add'>+	}</div><div class='add'>+	priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;irq = irq[idx];</div><div class='add'>+	priv-&gt;irq_flags = IRQF_SHARED;</div><div class='add'>+	if (mem[idx]) {</div><div class='add'>+		priv-&gt;reg_base = base;</div><div class='add'>+		dev-&gt;base_addr = mem[idx];</div><div class='add'>+		priv-&gt;read_reg = cc770_isa_mem_read_reg;</div><div class='add'>+		priv-&gt;write_reg = cc770_isa_mem_write_reg;</div><div class='add'>+	} else {</div><div class='add'>+		priv-&gt;reg_base = (void __iomem *)port[idx];</div><div class='add'>+		dev-&gt;base_addr = port[idx];</div><div class='add'>+</div><div class='add'>+		if (iosize == CC770_IOSIZE_INDIRECT) {</div><div class='add'>+			priv-&gt;read_reg = cc770_isa_port_read_reg_indirect;</div><div class='add'>+			priv-&gt;write_reg = cc770_isa_port_write_reg_indirect;</div><div class='add'>+		} else {</div><div class='add'>+			priv-&gt;read_reg = cc770_isa_port_read_reg;</div><div class='add'>+			priv-&gt;write_reg = cc770_isa_port_write_reg;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (clk[idx])</div><div class='add'>+		clktmp = clk[idx];</div><div class='add'>+	else if (clk[0])</div><div class='add'>+		clktmp = clk[0];</div><div class='add'>+	else</div><div class='add'>+		clktmp = CLK_DEFAULT;</div><div class='add'>+	priv-&gt;can.clock.freq = clktmp;</div><div class='add'>+</div><div class='add'>+	if (cir[idx] != 0xff) {</div><div class='add'>+		priv-&gt;cpu_interface = cir[idx];</div><div class='add'>+	} else if (cir[0] != 0xff) {</div><div class='add'>+		priv-&gt;cpu_interface = cir[0];</div><div class='add'>+	} else {</div><div class='add'>+		/* The system clock may not exceed 10 MHz */</div><div class='add'>+		if (clktmp &gt; 10000000) {</div><div class='add'>+			priv-&gt;cpu_interface |= CPUIF_DSC;</div><div class='add'>+			clktmp /= 2;</div><div class='add'>+		}</div><div class='add'>+		/* The memory clock may not exceed 8 MHz */</div><div class='add'>+		if (clktmp &gt; 8000000)</div><div class='add'>+			priv-&gt;cpu_interface |= CPUIF_DMC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;cpu_interface &amp; CPUIF_DSC)</div><div class='add'>+		priv-&gt;can.clock.freq /= 2;</div><div class='add'>+</div><div class='add'>+	if (bcr[idx] != 0xff)</div><div class='add'>+		priv-&gt;bus_config = bcr[idx];</div><div class='add'>+	else if (bcr[0] != 0xff)</div><div class='add'>+		priv-&gt;bus_config = bcr[0];</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;bus_config = BCR_DEFAULT;</div><div class='add'>+</div><div class='add'>+	if (cor[idx] != 0xff)</div><div class='add'>+		priv-&gt;clkout = cor[idx];</div><div class='add'>+	else if (cor[0] != 0xff)</div><div class='add'>+		priv-&gt;clkout = cor[0];</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;clkout = COR_DEFAULT;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;pdev-&gt;dev, dev);</div><div class='add'>+	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	err = register_cc770dev(dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"couldn't register device (err=%d)\n", err);</div><div class='add'>+		goto exit_unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "device registered (reg_base=0x%p, irq=%d)\n",</div><div class='add'>+		 priv-&gt;reg_base, dev-&gt;irq);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ exit_unmap:</div><div class='add'>+	if (mem[idx])</div><div class='add'>+		iounmap(base);</div><div class='add'>+ exit_release:</div><div class='add'>+	if (mem[idx])</div><div class='add'>+		release_mem_region(mem[idx], iosize);</div><div class='add'>+	else</div><div class='add'>+		release_region(port[idx], iosize);</div><div class='add'>+ exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit cc770_isa_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+	int idx = pdev-&gt;id;</div><div class='add'>+</div><div class='add'>+	unregister_cc770dev(dev);</div><div class='add'>+	dev_set_drvdata(&amp;pdev-&gt;dev, NULL);</div><div class='add'>+</div><div class='add'>+	if (mem[idx]) {</div><div class='add'>+		iounmap(priv-&gt;reg_base);</div><div class='add'>+		release_mem_region(mem[idx], CC770_IOSIZE);</div><div class='add'>+	} else {</div><div class='add'>+		if (priv-&gt;read_reg == cc770_isa_port_read_reg_indirect)</div><div class='add'>+			release_region(port[idx], CC770_IOSIZE_INDIRECT);</div><div class='add'>+		else</div><div class='add'>+			release_region(port[idx], CC770_IOSIZE);</div><div class='add'>+	}</div><div class='add'>+	free_cc770dev(dev);</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 cc770_isa_driver = {</div><div class='add'>+	.probe = cc770_isa_probe,</div><div class='add'>+	.remove = __devexit_p(cc770_isa_remove),</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init cc770_isa_init(void)</div><div class='add'>+{</div><div class='add'>+	int idx, err;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; ARRAY_SIZE(cc770_isa_devs); idx++) {</div><div class='add'>+		if ((port[idx] || mem[idx]) &amp;&amp; irq[idx]) {</div><div class='add'>+			cc770_isa_devs[idx] =</div><div class='add'>+				platform_device_alloc(KBUILD_MODNAME, idx);</div><div class='add'>+			if (!cc770_isa_devs[idx]) {</div><div class='add'>+				err = -ENOMEM;</div><div class='add'>+				goto exit_free_devices;</div><div class='add'>+			}</div><div class='add'>+			err = platform_device_add(cc770_isa_devs[idx]);</div><div class='add'>+			if (err) {</div><div class='add'>+				platform_device_put(cc770_isa_devs[idx]);</div><div class='add'>+				goto exit_free_devices;</div><div class='add'>+			}</div><div class='add'>+			pr_debug("platform device %d: port=%#lx, mem=%#lx, "</div><div class='add'>+				 "irq=%d\n",</div><div class='add'>+				 idx, port[idx], mem[idx], irq[idx]);</div><div class='add'>+		} else if (idx == 0 || port[idx] || mem[idx]) {</div><div class='add'>+			pr_err("insufficient parameters supplied\n");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto exit_free_devices;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = platform_driver_register(&amp;cc770_isa_driver);</div><div class='add'>+	if (err)</div><div class='add'>+		goto exit_free_devices;</div><div class='add'>+</div><div class='add'>+	pr_info("driver for max. %d devices registered\n", MAXDEV);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+exit_free_devices:</div><div class='add'>+	while (--idx &gt;= 0) {</div><div class='add'>+		if (cc770_isa_devs[idx])</div><div class='add'>+			platform_device_unregister(cc770_isa_devs[idx]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+module_init(cc770_isa_init);</div><div class='add'>+</div><div class='add'>+static void __exit cc770_isa_exit(void)</div><div class='add'>+{</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	platform_driver_unregister(&amp;cc770_isa_driver);</div><div class='add'>+	for (idx = 0; idx &lt; ARRAY_SIZE(cc770_isa_devs); idx++) {</div><div class='add'>+		if (cc770_isa_devs[idx])</div><div class='add'>+			platform_device_unregister(cc770_isa_devs[idx]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+module_exit(cc770_isa_exit);</div><div class='head'>diff --git a/drivers/net/can/cc770/cc770_platform.c b/drivers/net/can/cc770/cc770_platform.c<br/>new file mode 100644<br/>index 000000000000..53115eee8075<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/cc770/cc770_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/cc770/cc770_platform.c</a></div><div class='hunk'>@@ -0,0 +1,272 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for CC770 and AN82527 CAN controllers on the platform bus</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2009, 2011 Wolfgang Grandegger &lt;wg@grandegger.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 version 2 of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If platform data are used you should have similar definitions</div><div class='add'>+ * in your board-specific code:</div><div class='add'>+ *</div><div class='add'>+ *   static struct cc770_platform_data myboard_cc770_pdata = {</div><div class='add'>+ *           .osc_freq = 16000000,</div><div class='add'>+ *           .cir = 0x41,</div><div class='add'>+ *           .cor = 0x20,</div><div class='add'>+ *           .bcr = 0x40,</div><div class='add'>+ *   };</div><div class='add'>+ *</div><div class='add'>+ * Please see include/linux/can/platform/cc770.h for description of</div><div class='add'>+ * above fields.</div><div class='add'>+ *</div><div class='add'>+ * If the device tree is used, you need a CAN node definition in your</div><div class='add'>+ * DTS file similar to:</div><div class='add'>+ *</div><div class='add'>+ *   can@3,100 {</div><div class='add'>+ *           compatible = "bosch,cc770";</div><div class='add'>+ *           reg = &lt;3 0x100 0x80&gt;;</div><div class='add'>+ *           interrupts = &lt;2 0&gt;;</div><div class='add'>+ *           interrupt-parent = &lt;&amp;mpic&gt;;</div><div class='add'>+ *           bosch,external-clock-frequency = &lt;16000000&gt;;</div><div class='add'>+ *   };</div><div class='add'>+ *</div><div class='add'>+ * See "Documentation/devicetree/bindings/net/can/cc770.txt" for further</div><div class='add'>+ * information.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/can.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/can/platform/cc770.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cc770.h"</div><div class='add'>+</div><div class='add'>+#define DRV_NAME "cc770_platform"</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Wolfgang Grandegger &lt;wg@grandegger.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Socket-CAN driver for CC770 on the platform bus");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+</div><div class='add'>+#define CC770_PLATFORM_CAN_CLOCK  16000000</div><div class='add'>+</div><div class='add'>+static u8 cc770_platform_read_reg(const struct cc770_priv *priv, int reg)</div><div class='add'>+{</div><div class='add'>+	return ioread8(priv-&gt;reg_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cc770_platform_write_reg(const struct cc770_priv *priv, int reg,</div><div class='add'>+				     u8 val)</div><div class='add'>+{</div><div class='add'>+	iowrite8(val, priv-&gt;reg_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit cc770_get_of_node_data(struct platform_device *pdev,</div><div class='add'>+					    struct cc770_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='add'>+	const u32 *prop;</div><div class='add'>+	int prop_size;</div><div class='add'>+	u32 clkext;</div><div class='add'>+</div><div class='add'>+	prop = of_get_property(np, "bosch,external-clock-frequency",</div><div class='add'>+			       &amp;prop_size);</div><div class='add'>+	if (prop &amp;&amp; (prop_size ==  sizeof(u32)))</div><div class='add'>+		clkext = *prop;</div><div class='add'>+	else</div><div class='add'>+		clkext = CC770_PLATFORM_CAN_CLOCK; /* default */</div><div class='add'>+	priv-&gt;can.clock.freq = clkext;</div><div class='add'>+</div><div class='add'>+	/* The system clock may not exceed 10 MHz */</div><div class='add'>+	if (priv-&gt;can.clock.freq &gt; 10000000) {</div><div class='add'>+		priv-&gt;cpu_interface |= CPUIF_DSC;</div><div class='add'>+		priv-&gt;can.clock.freq /= 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The memory clock may not exceed 8 MHz */</div><div class='add'>+	if (priv-&gt;can.clock.freq &gt; 8000000)</div><div class='add'>+		priv-&gt;cpu_interface |= CPUIF_DMC;</div><div class='add'>+</div><div class='add'>+	if (of_get_property(np, "bosch,divide-memory-clock", NULL))</div><div class='add'>+		priv-&gt;cpu_interface |= CPUIF_DMC;</div><div class='add'>+	if (of_get_property(np, "bosch,iso-low-speed-mux", NULL))</div><div class='add'>+		priv-&gt;cpu_interface |= CPUIF_MUX;</div><div class='add'>+</div><div class='add'>+	if (!of_get_property(np, "bosch,no-comperator-bypass", NULL))</div><div class='add'>+		priv-&gt;bus_config |= BUSCFG_CBY;</div><div class='add'>+	if (of_get_property(np, "bosch,disconnect-rx0-input", NULL))</div><div class='add'>+		priv-&gt;bus_config |= BUSCFG_DR0;</div><div class='add'>+	if (of_get_property(np, "bosch,disconnect-rx1-input", NULL))</div><div class='add'>+		priv-&gt;bus_config |= BUSCFG_DR1;</div><div class='add'>+	if (of_get_property(np, "bosch,disconnect-tx1-output", NULL))</div><div class='add'>+		priv-&gt;bus_config |= BUSCFG_DT1;</div><div class='add'>+	if (of_get_property(np, "bosch,polarity-dominant", NULL))</div><div class='add'>+		priv-&gt;bus_config |= BUSCFG_POL;</div><div class='add'>+</div><div class='add'>+	prop = of_get_property(np, "bosch,clock-out-frequency", &amp;prop_size);</div><div class='add'>+	if (prop &amp;&amp; (prop_size == sizeof(u32)) &amp;&amp; *prop &gt; 0) {</div><div class='add'>+		u32 cdv = clkext / *prop;</div><div class='add'>+		int slew;</div><div class='add'>+</div><div class='add'>+		if (cdv &gt; 0 &amp;&amp; cdv &lt; 16) {</div><div class='add'>+			priv-&gt;cpu_interface |= CPUIF_CEN;</div><div class='add'>+			priv-&gt;clkout |= (cdv - 1) &amp; CLKOUT_CD_MASK;</div><div class='add'>+</div><div class='add'>+			prop = of_get_property(np, "bosch,slew-rate",</div><div class='add'>+					       &amp;prop_size);</div><div class='add'>+			if (prop &amp;&amp; (prop_size == sizeof(u32))) {</div><div class='add'>+				slew = *prop;</div><div class='add'>+			} else {</div><div class='add'>+				/* Determine default slew rate */</div><div class='add'>+				slew = (CLKOUT_SL_MASK &gt;&gt;</div><div class='add'>+					CLKOUT_SL_SHIFT) -</div><div class='add'>+					((cdv * clkext - 1) / 8000000);</div><div class='add'>+				if (slew &lt; 0)</div><div class='add'>+					slew = 0;</div><div class='add'>+			}</div><div class='add'>+			priv-&gt;clkout |= (slew &lt;&lt; CLKOUT_SL_SHIFT) &amp;</div><div class='add'>+				CLKOUT_SL_MASK;</div><div class='add'>+		} else {</div><div class='add'>+			dev_dbg(&amp;pdev-&gt;dev, "invalid clock-out-frequency\n");</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 __devinit cc770_get_platform_data(struct platform_device *pdev,</div><div class='add'>+					     struct cc770_priv *priv)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct cc770_platform_data *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.clock.freq = pdata-&gt;osc_freq;</div><div class='add'>+	if (priv-&gt;cpu_interface | CPUIF_DSC)</div><div class='add'>+		priv-&gt;can.clock.freq /= 2;</div><div class='add'>+	priv-&gt;clkout = pdata-&gt;cor;</div><div class='add'>+	priv-&gt;bus_config = pdata-&gt;bcr;</div><div class='add'>+	priv-&gt;cpu_interface = pdata-&gt;cir;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit cc770_platform_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct cc770_priv *priv;</div><div class='add'>+	struct resource *mem;</div><div class='add'>+	resource_size_t mem_size;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	int err, irq;</div><div class='add'>+</div><div class='add'>+	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (!mem || irq &lt;= 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	mem_size = resource_size(mem);</div><div class='add'>+	if (!request_mem_region(mem-&gt;start, mem_size, pdev-&gt;name))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	base = ioremap(mem-&gt;start, mem_size);</div><div class='add'>+	if (!base) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto exit_release_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = alloc_cc770dev(0);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto exit_unmap_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;irq = irq;</div><div class='add'>+	priv = netdev_priv(dev);</div><div class='add'>+	priv-&gt;read_reg = cc770_platform_read_reg;</div><div class='add'>+	priv-&gt;write_reg = cc770_platform_write_reg;</div><div class='add'>+	priv-&gt;irq_flags = IRQF_SHARED;</div><div class='add'>+	priv-&gt;reg_base = base;</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;dev.of_node)</div><div class='add'>+		err = cc770_get_of_node_data(pdev, priv);</div><div class='add'>+	else if (pdev-&gt;dev.platform_data)</div><div class='add'>+		err = cc770_get_platform_data(pdev, priv);</div><div class='add'>+	else</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+	if (err)</div><div class='add'>+		goto exit_free_cc770;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev,</div><div class='add'>+		 "reg_base=0x%p irq=%d clock=%d cpu_interface=0x%02x "</div><div class='add'>+		 "bus_config=0x%02x clkout=0x%02x\n",</div><div class='add'>+		 priv-&gt;reg_base, dev-&gt;irq, priv-&gt;can.clock.freq,</div><div class='add'>+		 priv-&gt;cpu_interface, priv-&gt;bus_config, priv-&gt;clkout);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;pdev-&gt;dev, dev);</div><div class='add'>+	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	err = register_cc770dev(dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"couldn't register CC700 device (err=%d)\n", err);</div><div class='add'>+		goto exit_free_cc770;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+exit_free_cc770:</div><div class='add'>+	free_cc770dev(dev);</div><div class='add'>+exit_unmap_mem:</div><div class='add'>+	iounmap(base);</div><div class='add'>+exit_release_mem:</div><div class='add'>+	release_mem_region(mem-&gt;start, mem_size);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit cc770_platform_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+	struct cc770_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct resource *mem;</div><div class='add'>+</div><div class='add'>+	unregister_cc770dev(dev);</div><div class='add'>+	iounmap(priv-&gt;reg_base);</div><div class='add'>+	free_cc770dev(dev);</div><div class='add'>+</div><div class='add'>+	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	release_mem_region(mem-&gt;start, resource_size(mem));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct of_device_id __devinitdata cc770_platform_table[] = {</div><div class='add'>+	{.compatible = "bosch,cc770"}, /* CC770 from Bosch */</div><div class='add'>+	{.compatible = "intc,82527"},  /* AN82527 from Intel CP */</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver cc770_platform_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = DRV_NAME,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+		.of_match_table = cc770_platform_table,</div><div class='add'>+	},</div><div class='add'>+	.probe = cc770_platform_probe,</div><div class='add'>+	.remove = __devexit_p(cc770_platform_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(cc770_platform_driver);</div><div class='head'>diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c<br/>index 25695bde0549..120f1ab5a2ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/dev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/dev.c</a></div><div class='hunk'>@@ -454,7 +454,7 @@ static void can_setup(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* New-style flags. */</div><div class='ctx'> 	dev-&gt;flags = IFF_NOARP;</div><div class='del'>-	dev-&gt;features = NETIF_F_NO_CSUM;</div><div class='add'>+	dev-&gt;features = NETIF_F_HW_CSUM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf)</div><div class='head'>diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c<br/>index e02337953f41..7fd8089946fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/flexcan.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/flexcan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/flexcan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/flexcan.c</a></div><div class='hunk'>@@ -802,7 +802,7 @@ static int flexcan_open(struct net_device *dev)</div><div class='ctx'> 	struct flexcan_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	clk_enable(priv-&gt;clk);</div><div class='add'>+	clk_prepare_enable(priv-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	err = open_candev(dev);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -824,7 +824,7 @@ static int flexcan_open(struct net_device *dev)</div><div class='ctx'>  out_close:</div><div class='ctx'> 	close_candev(dev);</div><div class='ctx'>  out:</div><div class='del'>-	clk_disable(priv-&gt;clk);</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -838,7 +838,7 @@ static int flexcan_close(struct net_device *dev)</div><div class='ctx'> 	flexcan_chip_stop(dev);</div><div class='ctx'> </div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='del'>-	clk_disable(priv-&gt;clk);</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	close_candev(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -877,7 +877,7 @@ static int __devinit register_flexcandev(struct net_device *dev)</div><div class='ctx'> 	struct flexcan_regs __iomem *regs = priv-&gt;base;</div><div class='ctx'> 	u32 reg, err;</div><div class='ctx'> </div><div class='del'>-	clk_enable(priv-&gt;clk);</div><div class='add'>+	clk_prepare_enable(priv-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	/* select "bus clock", chip must be disabled */</div><div class='ctx'> 	flexcan_chip_disable(priv);</div><div class='hunk'>@@ -911,7 +911,7 @@ static int __devinit register_flexcandev(struct net_device *dev)</div><div class='ctx'>  out:</div><div class='ctx'> 	/* disable core and turn off clocks */</div><div class='ctx'> 	flexcan_chip_disable(priv);</div><div class='del'>-	clk_disable(priv-&gt;clk);</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1060,20 +1060,7 @@ static struct platform_driver flexcan_driver = {</div><div class='ctx'> 	.remove = __devexit_p(flexcan_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init flexcan_init(void)</div><div class='del'>-{</div><div class='del'>-	pr_info("%s netdevice driver\n", DRV_NAME);</div><div class='del'>-	return platform_driver_register(&amp;flexcan_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit flexcan_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;flexcan_driver);</div><div class='del'>-	pr_info("%s: driver removed\n", DRV_NAME);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(flexcan_init);</div><div class='del'>-module_exit(flexcan_exit);</div><div class='add'>+module_platform_driver(flexcan_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Sascha Hauer &lt;kernel@pengutronix.de&gt;, "</div><div class='ctx'> 	      "Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;");</div><div class='head'>diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c<br/>index 32778d56d330..08c893cb7896 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/janz-ican3.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/janz-ican3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/janz-ican3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/janz-ican3.c</a></div><div class='hunk'>@@ -1803,20 +1803,9 @@ static struct platform_driver ican3_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(ican3_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ican3_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ican3_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ican3_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ican3_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(ican3_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Ira W. Snyder &lt;iws@ovro.caltech.edu&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Janz MODULbus VMOD-ICAN3 Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS("platform:janz-ican3");</div><div class='del'>-</div><div class='del'>-module_init(ican3_init);</div><div class='del'>-module_exit(ican3_exit);</div><div class='head'>diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c<br/>index 5fedc3375562..5caa572d71e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/mscan/mpc5xxx_can.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/mscan/mpc5xxx_can.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/mscan/mpc5xxx_can.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/mscan/mpc5xxx_can.c</a></div><div class='hunk'>@@ -411,17 +411,7 @@ static struct platform_driver mpc5xxx_can_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init mpc5xxx_can_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;mpc5xxx_can_driver);</div><div class='del'>-}</div><div class='del'>-module_init(mpc5xxx_can_init);</div><div class='del'>-</div><div class='del'>-static void __exit mpc5xxx_can_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;mpc5xxx_can_driver);</div><div class='del'>-};</div><div class='del'>-module_exit(mpc5xxx_can_exit);</div><div class='add'>+module_platform_driver(mpc5xxx_can_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Wolfgang Grandegger &lt;wg@grandegger.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Freescale MPC5xxx CAN driver");</div><div class='head'>diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c<br/>index ec4a3119e2c9..1c82dd8b896e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/mscan/mscan.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/mscan/mscan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/mscan/mscan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/mscan/mscan.c</a></div><div class='hunk'>@@ -581,7 +581,10 @@ static int mscan_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;open_time = jiffies;</div><div class='ctx'> </div><div class='del'>-	clrbits8(&amp;regs-&gt;canctl1, MSCAN_LISTEN);</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY)</div><div class='add'>+		setbits8(&amp;regs-&gt;canctl1, MSCAN_LISTEN);</div><div class='add'>+	else</div><div class='add'>+		clrbits8(&amp;regs-&gt;canctl1, MSCAN_LISTEN);</div><div class='ctx'> </div><div class='ctx'> 	ret = mscan_start(dev);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -690,7 +693,8 @@ struct net_device *alloc_mscandev(void)</div><div class='ctx'> 	priv-&gt;can.bittiming_const = &amp;mscan_bittiming_const;</div><div class='ctx'> 	priv-&gt;can.do_set_bittiming = mscan_do_set_bittiming;</div><div class='ctx'> 	priv-&gt;can.do_set_mode = mscan_do_set_mode;</div><div class='del'>-	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;</div><div class='add'>+	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES |</div><div class='add'>+		CAN_CTRLMODE_LISTENONLY;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; TX_QUEUE_SIZE; i++) {</div><div class='ctx'> 		priv-&gt;tx_queue[i].id = i;</div><div class='head'>diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig<br/>index fe9e64d476eb..36e9d594069d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/sja1000/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/sja1000/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/sja1000/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/sja1000/Kconfig</a></div><div class='hunk'>@@ -6,7 +6,6 @@ if CAN_SJA1000</div><div class='ctx'> </div><div class='ctx'> config CAN_SJA1000_ISA</div><div class='ctx'> 	tristate "ISA Bus based legacy SJA1000 driver"</div><div class='del'>-	depends on ISA</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This driver adds legacy support for SJA1000 chips connected to</div><div class='ctx'> 	  the ISA bus using I/O port, memory mapped or indirect access.</div><div class='head'>diff --git a/drivers/net/can/sja1000/sja1000_isa.c b/drivers/net/can/sja1000/sja1000_isa.c<br/>index 496223e9e2fc..90c5c2dfd2fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/sja1000/sja1000_isa.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/sja1000/sja1000_isa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/sja1000/sja1000_isa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/sja1000/sja1000_isa.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</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='del'>-#include &lt;linux/isa.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -44,9 +44,9 @@ static unsigned long port[MAXDEV];</div><div class='ctx'> static unsigned long mem[MAXDEV];</div><div class='ctx'> static int __devinitdata irq[MAXDEV];</div><div class='ctx'> static int __devinitdata clk[MAXDEV];</div><div class='del'>-static char __devinitdata cdr[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1};</div><div class='del'>-static char __devinitdata ocr[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1};</div><div class='del'>-static char __devinitdata indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1};</div><div class='add'>+static unsigned char __devinitdata cdr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};</div><div class='add'>+static unsigned char __devinitdata ocr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};</div><div class='add'>+static int __devinitdata indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1};</div><div class='ctx'> </div><div class='ctx'> module_param_array(port, ulong, NULL, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(port, "I/O port number");</div><div class='hunk'>@@ -54,7 +54,7 @@ MODULE_PARM_DESC(port, "I/O port number");</div><div class='ctx'> module_param_array(mem, ulong, NULL, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(mem, "I/O memory address");</div><div class='ctx'> </div><div class='del'>-module_param_array(indirect, byte, NULL, S_IRUGO);</div><div class='add'>+module_param_array(indirect, int, NULL, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(indirect, "Indirect access via address and data port");</div><div class='ctx'> </div><div class='ctx'> module_param_array(irq, int, NULL, S_IRUGO);</div><div class='hunk'>@@ -75,6 +75,8 @@ MODULE_PARM_DESC(ocr, "Output control register "</div><div class='ctx'> #define SJA1000_IOSIZE          0x20</div><div class='ctx'> #define SJA1000_IOSIZE_INDIRECT 0x02</div><div class='ctx'> </div><div class='add'>+static struct platform_device *sja1000_isa_devs[MAXDEV];</div><div class='add'>+</div><div class='ctx'> static u8 sja1000_isa_mem_read_reg(const struct sja1000_priv *priv, int reg)</div><div class='ctx'> {</div><div class='ctx'> 	return readb(priv-&gt;reg_base + reg);</div><div class='hunk'>@@ -115,26 +117,18 @@ static void sja1000_isa_port_write_reg_indirect(const struct sja1000_priv *priv,</div><div class='ctx'> 	outb(val, base + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit sja1000_isa_match(struct device *pdev, unsigned int idx)</div><div class='del'>-{</div><div class='del'>-	if (port[idx] || mem[idx]) {</div><div class='del'>-		if (irq[idx])</div><div class='del'>-			return 1;</div><div class='del'>-	} else if (idx)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	dev_err(pdev, "insufficient parameters supplied\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit sja1000_isa_probe(struct device *pdev, unsigned int idx)</div><div class='add'>+static int __devinit sja1000_isa_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct sja1000_priv *priv;</div><div class='ctx'> 	void __iomem *base = NULL;</div><div class='ctx'> 	int iosize = SJA1000_IOSIZE;</div><div class='add'>+	int idx = pdev-&gt;id;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "probing idx=%d: port=%#lx, mem=%#lx, irq=%d\n",</div><div class='add'>+		idx, port[idx], mem[idx], irq[idx]);</div><div class='add'>+</div><div class='ctx'> 	if (mem[idx]) {</div><div class='ctx'> 		if (!request_mem_region(mem[idx], iosize, DRV_NAME)) {</div><div class='ctx'> 			err = -EBUSY;</div><div class='hunk'>@@ -189,31 +183,31 @@ static int __devinit sja1000_isa_probe(struct device *pdev, unsigned int idx)</div><div class='ctx'> 	else</div><div class='ctx'> 		priv-&gt;can.clock.freq = CLK_DEFAULT / 2;</div><div class='ctx'> </div><div class='del'>-	if (ocr[idx] != -1)</div><div class='del'>-		priv-&gt;ocr = ocr[idx] &amp; 0xff;</div><div class='del'>-	else if (ocr[0] != -1)</div><div class='del'>-		priv-&gt;ocr = ocr[0] &amp; 0xff;</div><div class='add'>+	if (ocr[idx] != 0xff)</div><div class='add'>+		priv-&gt;ocr = ocr[idx];</div><div class='add'>+	else if (ocr[0] != 0xff)</div><div class='add'>+		priv-&gt;ocr = ocr[0];</div><div class='ctx'> 	else</div><div class='ctx'> 		priv-&gt;ocr = OCR_DEFAULT;</div><div class='ctx'> </div><div class='del'>-	if (cdr[idx] != -1)</div><div class='del'>-		priv-&gt;cdr = cdr[idx] &amp; 0xff;</div><div class='del'>-	else if (cdr[0] != -1)</div><div class='del'>-		priv-&gt;cdr = cdr[0] &amp; 0xff;</div><div class='add'>+	if (cdr[idx] != 0xff)</div><div class='add'>+		priv-&gt;cdr = cdr[idx];</div><div class='add'>+	else if (cdr[0] != 0xff)</div><div class='add'>+		priv-&gt;cdr = cdr[0];</div><div class='ctx'> 	else</div><div class='ctx'> 		priv-&gt;cdr = CDR_DEFAULT;</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(pdev, dev);</div><div class='del'>-	SET_NETDEV_DEV(dev, pdev);</div><div class='add'>+	dev_set_drvdata(&amp;pdev-&gt;dev, dev);</div><div class='add'>+	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	err = register_sja1000dev(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(pdev, "registering %s failed (err=%d)\n",</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "registering %s failed (err=%d)\n",</div><div class='ctx'> 			DRV_NAME, err);</div><div class='ctx'> 		goto exit_unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_info(pdev, "%s device registered (reg_base=0x%p, irq=%d)\n",</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "%s device registered (reg_base=0x%p, irq=%d)\n",</div><div class='ctx'> 		 DRV_NAME, priv-&gt;reg_base, dev-&gt;irq);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -229,13 +223,14 @@ static int __devinit sja1000_isa_probe(struct device *pdev, unsigned int idx)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit sja1000_isa_remove(struct device *pdev, unsigned int idx)</div><div class='add'>+static int __devexit sja1000_isa_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = dev_get_drvdata(pdev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='ctx'> 	struct sja1000_priv *priv = netdev_priv(dev);</div><div class='add'>+	int idx = pdev-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 	unregister_sja1000dev(dev);</div><div class='del'>-	dev_set_drvdata(pdev, NULL);</div><div class='add'>+	dev_set_drvdata(&amp;pdev-&gt;dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (mem[idx]) {</div><div class='ctx'> 		iounmap(priv-&gt;reg_base);</div><div class='hunk'>@@ -251,29 +246,70 @@ static int __devexit sja1000_isa_remove(struct device *pdev, unsigned int idx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct isa_driver sja1000_isa_driver = {</div><div class='del'>-	.match = sja1000_isa_match,</div><div class='add'>+static struct platform_driver sja1000_isa_driver = {</div><div class='ctx'> 	.probe = sja1000_isa_probe,</div><div class='ctx'> 	.remove = __devexit_p(sja1000_isa_remove),</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = DRV_NAME,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init sja1000_isa_init(void)</div><div class='ctx'> {</div><div class='del'>-	int err = isa_register_driver(&amp;sja1000_isa_driver, MAXDEV);</div><div class='add'>+	int idx, err;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; MAXDEV; idx++) {</div><div class='add'>+		if ((port[idx] || mem[idx]) &amp;&amp; irq[idx]) {</div><div class='add'>+			sja1000_isa_devs[idx] =</div><div class='add'>+				platform_device_alloc(DRV_NAME, idx);</div><div class='add'>+			if (!sja1000_isa_devs[idx]) {</div><div class='add'>+				err = -ENOMEM;</div><div class='add'>+				goto exit_free_devices;</div><div class='add'>+			}</div><div class='add'>+			err = platform_device_add(sja1000_isa_devs[idx]);</div><div class='add'>+			if (err) {</div><div class='add'>+				platform_device_put(sja1000_isa_devs[idx]);</div><div class='add'>+				goto exit_free_devices;</div><div class='add'>+			}</div><div class='add'>+			pr_debug("%s: platform device %d: port=%#lx, mem=%#lx, "</div><div class='add'>+				 "irq=%d\n",</div><div class='add'>+				 DRV_NAME, idx, port[idx], mem[idx], irq[idx]);</div><div class='add'>+		} else if (idx == 0 || port[idx] || mem[idx]) {</div><div class='add'>+				pr_err("%s: insufficient parameters supplied\n",</div><div class='add'>+				       DRV_NAME);</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto exit_free_devices;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = platform_driver_register(&amp;sja1000_isa_driver);</div><div class='add'>+	if (err)</div><div class='add'>+		goto exit_free_devices;</div><div class='add'>+</div><div class='add'>+	pr_info("Legacy %s driver for max. %d devices registered\n",</div><div class='add'>+		DRV_NAME, MAXDEV);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+exit_free_devices:</div><div class='add'>+	while (--idx &gt;= 0) {</div><div class='add'>+		if (sja1000_isa_devs[idx])</div><div class='add'>+			platform_device_unregister(sja1000_isa_devs[idx]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!err)</div><div class='del'>-		printk(KERN_INFO</div><div class='del'>-		       "Legacy %s driver for max. %d devices registered\n",</div><div class='del'>-		       DRV_NAME, MAXDEV);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit sja1000_isa_exit(void)</div><div class='ctx'> {</div><div class='del'>-	isa_unregister_driver(&amp;sja1000_isa_driver);</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	platform_driver_unregister(&amp;sja1000_isa_driver);</div><div class='add'>+	for (idx = 0; idx &lt; MAXDEV; idx++) {</div><div class='add'>+		if (sja1000_isa_devs[idx])</div><div class='add'>+			platform_device_unregister(sja1000_isa_devs[idx]);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(sja1000_isa_init);</div><div class='head'>diff --git a/drivers/net/can/sja1000/sja1000_of_platform.c b/drivers/net/can/sja1000/sja1000_of_platform.c<br/>index c3dd9d09be57..f2683eb6a3d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/sja1000/sja1000_of_platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/sja1000/sja1000_of_platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/sja1000/sja1000_of_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/sja1000/sja1000_of_platform.c</a></div><div class='hunk'>@@ -220,14 +220,4 @@ static struct platform_driver sja1000_ofp_driver = {</div><div class='ctx'> 	.remove = __devexit_p(sja1000_ofp_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sja1000_ofp_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sja1000_ofp_driver);</div><div class='del'>-}</div><div class='del'>-module_init(sja1000_ofp_init);</div><div class='del'>-</div><div class='del'>-static void __exit sja1000_ofp_exit(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_unregister(&amp;sja1000_ofp_driver);</div><div class='del'>-};</div><div class='del'>-module_exit(sja1000_ofp_exit);</div><div class='add'>+module_platform_driver(sja1000_ofp_driver);</div><div class='head'>diff --git a/drivers/net/can/sja1000/sja1000_platform.c b/drivers/net/can/sja1000/sja1000_platform.c<br/>index d9fadc489b32..4f50145f6483 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/sja1000/sja1000_platform.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/sja1000/sja1000_platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/sja1000/sja1000_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/sja1000/sja1000_platform.c</a></div><div class='hunk'>@@ -185,15 +185,4 @@ static struct platform_driver sp_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sp_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sp_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sp_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sp_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sp_init);</div><div class='del'>-module_exit(sp_exit);</div><div class='add'>+module_platform_driver(sp_driver);</div><div class='head'>diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c<br/>index a979b006f459..3f1ebcc2cb83 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/slcan.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/slcan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/slcan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/slcan.c</a></div><div class='hunk'>@@ -387,7 +387,7 @@ static void slc_setup(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* New-style flags. */</div><div class='ctx'> 	dev-&gt;flags		= IFF_NOARP;</div><div class='del'>-	dev-&gt;features           = NETIF_F_NO_CSUM;</div><div class='add'>+	dev-&gt;features           = NETIF_F_HW_CSUM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /******************************************</div><div class='head'>diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c<br/>index 09a8b86cf1ac..a7c77c744ee9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/softing/softing_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/softing/softing_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/softing/softing_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/softing/softing_main.c</a></div><div class='hunk'>@@ -874,21 +874,9 @@ static struct platform_driver softing_driver = {</div><div class='ctx'> 	.remove = __devexit_p(softing_pdev_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-MODULE_ALIAS("platform:softing");</div><div class='del'>-</div><div class='del'>-static int __init softing_start(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;softing_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit softing_stop(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;softing_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(softing_start);</div><div class='del'>-module_exit(softing_stop);</div><div class='add'>+module_platform_driver(softing_driver);</div><div class='ctx'> </div><div class='add'>+MODULE_ALIAS("platform:softing");</div><div class='ctx'> MODULE_DESCRIPTION("Softing DPRAM CAN driver");</div><div class='ctx'> MODULE_AUTHOR("Kurt Van Dijck &lt;kurt.van.dijck@eia.be&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c<br/>index 2adc294f512a..df809e3f130e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/ti_hecc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/ti_hecc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/ti_hecc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/ti_hecc.c</a></div><div class='hunk'>@@ -1037,20 +1037,7 @@ static struct platform_driver ti_hecc_driver = {</div><div class='ctx'> 	.resume = ti_hecc_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ti_hecc_init_driver(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO DRV_DESC "\n");</div><div class='del'>-	return platform_driver_register(&amp;ti_hecc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ti_hecc_exit_driver(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO DRV_DESC " unloaded\n");</div><div class='del'>-	platform_driver_unregister(&amp;ti_hecc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_exit(ti_hecc_exit_driver);</div><div class='del'>-module_init(ti_hecc_init_driver);</div><div class='add'>+module_platform_driver(ti_hecc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Anant Gole &lt;anantgole@ti.com&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c<br/>index a72c7bfb4090..9697c14b8dc6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/usb/ems_usb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/usb/ems_usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/usb/ems_usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/usb/ems_usb.c</a></div><div class='hunk'>@@ -1115,28 +1115,4 @@ static struct usb_driver ems_usb_driver = {</div><div class='ctx'> 	.id_table = ems_usb_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ems_usb_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "CPC-USB kernel driver loaded\n");</div><div class='del'>-</div><div class='del'>-	/* register this driver with the USB subsystem */</div><div class='del'>-	err = usb_register(&amp;ems_usb_driver);</div><div class='del'>-</div><div class='del'>-	if (err) {</div><div class='del'>-		err("usb_register failed. Error number %d\n", err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ems_usb_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver with the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;ems_usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ems_usb_init);</div><div class='del'>-module_exit(ems_usb_exit);</div><div class='add'>+module_usb_driver(ems_usb_driver);</div><div class='head'>diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c<br/>index eb8b0e600282..92774637aad8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/usb/esd_usb2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/usb/esd_usb2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/usb/esd_usb2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/usb/esd_usb2.c</a></div><div class='hunk'>@@ -1108,25 +1108,4 @@ static struct usb_driver esd_usb2_driver = {</div><div class='ctx'> 	.id_table = esd_usb2_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init esd_usb2_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* register this driver with the USB subsystem */</div><div class='del'>-	err = usb_register(&amp;esd_usb2_driver);</div><div class='del'>-</div><div class='del'>-	if (err) {</div><div class='del'>-		err("usb_register failed. Error number %d\n", err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-module_init(esd_usb2_init);</div><div class='del'>-</div><div class='del'>-static void __exit esd_usb2_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver with the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;esd_usb2_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(esd_usb2_exit);</div><div class='add'>+module_usb_driver(esd_usb2_driver);</div><div class='head'>diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c<br/>index f93e2d6fc88c..ea2d94285936 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/can/vcan.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/can/vcan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/can/vcan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/can/vcan.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@ MODULE_AUTHOR("Urs Thuermann &lt;urs.thuermann@volkswagen.de&gt;");</div><div class='ctx'>  * See Documentation/networking/can.txt for details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int echo; /* echo testing. Default: 0 (Off) */</div><div class='add'>+static bool echo; /* echo testing. Default: 0 (Off) */</div><div class='ctx'> module_param(echo, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(echo, "Echo sent frames (for testing). Default: 0 (Off)");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig<br/>new file mode 100644<br/>index 000000000000..dd151d53d506<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/dsa/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/dsa/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+menu "Distributed Switch Architecture drivers"</div><div class='add'>+	depends on NET_DSA</div><div class='add'>+</div><div class='add'>+config NET_DSA_MV88E6XXX</div><div class='add'>+	tristate</div><div class='add'>+	default n</div><div class='add'>+</div><div class='add'>+config NET_DSA_MV88E6060</div><div class='add'>+	tristate "Marvell 88E6060 ethernet switch chip support"</div><div class='add'>+	select NET_DSA_TAG_TRAILER</div><div class='add'>+	---help---</div><div class='add'>+	  This enables support for the Marvell 88E6060 ethernet switch</div><div class='add'>+	  chip.</div><div class='add'>+</div><div class='add'>+config NET_DSA_MV88E6XXX_NEED_PPU</div><div class='add'>+	bool</div><div class='add'>+	default n</div><div class='add'>+</div><div class='add'>+config NET_DSA_MV88E6131</div><div class='add'>+	tristate "Marvell 88E6085/6095/6095F/6131 ethernet switch chip support"</div><div class='add'>+	select NET_DSA_MV88E6XXX</div><div class='add'>+	select NET_DSA_MV88E6XXX_NEED_PPU</div><div class='add'>+	select NET_DSA_TAG_DSA</div><div class='add'>+	---help---</div><div class='add'>+	  This enables support for the Marvell 88E6085/6095/6095F/6131</div><div class='add'>+	  ethernet switch chips.</div><div class='add'>+</div><div class='add'>+config NET_DSA_MV88E6123_61_65</div><div class='add'>+	tristate "Marvell 88E6123/6161/6165 ethernet switch chip support"</div><div class='add'>+	select NET_DSA_MV88E6XXX</div><div class='add'>+	select NET_DSA_TAG_EDSA</div><div class='add'>+	---help---</div><div class='add'>+	  This enables support for the Marvell 88E6123/6161/6165</div><div class='add'>+	  ethernet switch chips.</div><div class='add'>+</div><div class='add'>+endmenu</div><div class='head'>diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile<br/>new file mode 100644<br/>index 000000000000..f3bda05536cc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/dsa/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/dsa/Makefile</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx_drv.o</div><div class='add'>+mv88e6xxx_drv-y += mv88e6xxx.o</div><div class='add'>+ifdef CONFIG_NET_DSA_MV88E6123_61_65</div><div class='add'>+mv88e6xxx_drv-y += mv88e6123_61_65.o</div><div class='add'>+endif</div><div class='add'>+ifdef CONFIG_NET_DSA_MV88E6131</div><div class='add'>+mv88e6xxx_drv-y += mv88e6131.o</div><div class='add'>+endif</div><div class='head'>diff --git a/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c<br/>index 8f4ff5a2c813..7fc4e81d4d43 100644<br/>--- a/<a href='/cgit/linux.git/tree/net/dsa/mv88e6060.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dsa/mv88e6060.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/dsa/mv88e6060.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/dsa/mv88e6060.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='del'>-#include "dsa_priv.h"</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define REG_PORT(p)		(8 + (p))</div><div class='ctx'> #define REG_GLOBAL		0x0f</div><div class='hunk'>@@ -286,3 +286,8 @@ static void __exit mv88e6060_cleanup(void)</div><div class='ctx'> 	unregister_switch_driver(&amp;mv88e6060_switch_driver);</div><div class='ctx'> }</div><div class='ctx'> module_exit(mv88e6060_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Lennert Buytenhek &lt;buytenh@wantstofly.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Driver for Marvell 88E6060 ethernet switch chip");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("platform:mv88e6060");</div><div class='head'>diff --git a/net/dsa/mv88e6123_61_65.c b/drivers/net/dsa/mv88e6123_61_65.c<br/>index 52faaa21a4d9..c0a458fc698f 100644<br/>--- a/<a href='/cgit/linux.git/tree/net/dsa/mv88e6123_61_65.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dsa/mv88e6123_61_65.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/dsa/mv88e6123_61_65.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/dsa/mv88e6123_61_65.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='del'>-#include "dsa_priv.h"</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='ctx'> #include "mv88e6xxx.h"</div><div class='ctx'> </div><div class='ctx'> static char *mv88e6123_61_65_probe(struct mii_bus *bus, int sw_addr)</div><div class='hunk'>@@ -419,7 +419,7 @@ static int mv88e6123_61_65_get_sset_count(struct dsa_switch *ds)</div><div class='ctx'> 	return ARRAY_SIZE(mv88e6123_61_65_hw_stats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dsa_switch_driver mv88e6123_61_65_switch_driver = {</div><div class='add'>+struct dsa_switch_driver mv88e6123_61_65_switch_driver = {</div><div class='ctx'> 	.tag_protocol		= cpu_to_be16(ETH_P_EDSA),</div><div class='ctx'> 	.priv_size		= sizeof(struct mv88e6xxx_priv_state),</div><div class='ctx'> 	.probe			= mv88e6123_61_65_probe,</div><div class='hunk'>@@ -433,15 +433,6 @@ static struct dsa_switch_driver mv88e6123_61_65_switch_driver = {</div><div class='ctx'> 	.get_sset_count		= mv88e6123_61_65_get_sset_count,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init mv88e6123_61_65_init(void)</div><div class='del'>-{</div><div class='del'>-	register_switch_driver(&amp;mv88e6123_61_65_switch_driver);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-module_init(mv88e6123_61_65_init);</div><div class='del'>-</div><div class='del'>-static void __exit mv88e6123_61_65_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	unregister_switch_driver(&amp;mv88e6123_61_65_switch_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(mv88e6123_61_65_cleanup);</div><div class='add'>+MODULE_ALIAS("platform:mv88e6123");</div><div class='add'>+MODULE_ALIAS("platform:mv88e6161");</div><div class='add'>+MODULE_ALIAS("platform:mv88e6165");</div><div class='head'>diff --git a/net/dsa/mv88e6131.c b/drivers/net/dsa/mv88e6131.c<br/>index 9bd1061fa4ee..e0eb68243834 100644<br/>--- a/<a href='/cgit/linux.git/tree/net/dsa/mv88e6131.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dsa/mv88e6131.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/dsa/mv88e6131.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/dsa/mv88e6131.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='del'>-#include "dsa_priv.h"</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='ctx'> #include "mv88e6xxx.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -415,7 +415,7 @@ static int mv88e6131_get_sset_count(struct dsa_switch *ds)</div><div class='ctx'> 	return ARRAY_SIZE(mv88e6131_hw_stats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dsa_switch_driver mv88e6131_switch_driver = {</div><div class='add'>+struct dsa_switch_driver mv88e6131_switch_driver = {</div><div class='ctx'> 	.tag_protocol		= cpu_to_be16(ETH_P_DSA),</div><div class='ctx'> 	.priv_size		= sizeof(struct mv88e6xxx_priv_state),</div><div class='ctx'> 	.probe			= mv88e6131_probe,</div><div class='hunk'>@@ -429,15 +429,7 @@ static struct dsa_switch_driver mv88e6131_switch_driver = {</div><div class='ctx'> 	.get_sset_count		= mv88e6131_get_sset_count,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init mv88e6131_init(void)</div><div class='del'>-{</div><div class='del'>-	register_switch_driver(&amp;mv88e6131_switch_driver);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-module_init(mv88e6131_init);</div><div class='del'>-</div><div class='del'>-static void __exit mv88e6131_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	unregister_switch_driver(&amp;mv88e6131_switch_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(mv88e6131_cleanup);</div><div class='add'>+MODULE_ALIAS("platform:mv88e6085");</div><div class='add'>+MODULE_ALIAS("platform:mv88e6095");</div><div class='add'>+MODULE_ALIAS("platform:mv88e6095f");</div><div class='add'>+MODULE_ALIAS("platform:mv88e6131");</div><div class='head'>diff --git a/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c<br/>index efe661a9def4..5467c040824a 100644<br/>--- a/<a href='/cgit/linux.git/tree/net/dsa/mv88e6xxx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dsa/mv88e6xxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/dsa/mv88e6xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/dsa/mv88e6xxx.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='del'>-#include "dsa_priv.h"</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='ctx'> #include "mv88e6xxx.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -520,3 +520,30 @@ void mv88e6xxx_get_ethtool_stats(struct dsa_switch *ds,</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;ps-&gt;stats_mutex);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int __init mv88e6xxx_init(void)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_MV88E6131)</div><div class='add'>+	register_switch_driver(&amp;mv88e6131_switch_driver);</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_MV88E6123_61_65)</div><div class='add'>+	register_switch_driver(&amp;mv88e6123_61_65_switch_driver);</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+module_init(mv88e6xxx_init);</div><div class='add'>+</div><div class='add'>+static void __exit mv88e6xxx_cleanup(void)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_MV88E6123_61_65)</div><div class='add'>+	unregister_switch_driver(&amp;mv88e6123_61_65_switch_driver);</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_MV88E6131)</div><div class='add'>+	unregister_switch_driver(&amp;mv88e6131_switch_driver);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+module_exit(mv88e6xxx_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Lennert Buytenhek &lt;buytenh@wantstofly.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Driver for Marvell 88E6XXX ethernet switch chips");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/net/dsa/mv88e6xxx.h b/drivers/net/dsa/mv88e6xxx.h<br/>index 61156ca26a0d..fc2cd7b90e8d 100644<br/>--- a/<a href='/cgit/linux.git/tree/net/dsa/mv88e6xxx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>net/dsa/mv88e6xxx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/dsa/mv88e6xxx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/dsa/mv88e6xxx.h</a></div><div class='hunk'>@@ -71,6 +71,9 @@ void mv88e6xxx_get_ethtool_stats(struct dsa_switch *ds,</div><div class='ctx'> 				 int nr_stats, struct mv88e6xxx_hw_stat *stats,</div><div class='ctx'> 				 int port, uint64_t *data);</div><div class='ctx'> </div><div class='add'>+extern struct dsa_switch_driver mv88e6131_switch_driver;</div><div class='add'>+extern struct dsa_switch_driver mv88e6123_61_65_switch_driver;</div><div class='add'>+</div><div class='ctx'> #define REG_READ(addr, reg)						\</div><div class='ctx'> 	({								\</div><div class='ctx'> 		int __ret;						\</div><div class='head'>diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c<br/>index a7c5e8831e8c..087648ea1edb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/dummy.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/dummy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/dummy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/dummy.c</a></div><div class='hunk'>@@ -134,7 +134,7 @@ static void dummy_setup(struct net_device *dev)</div><div class='ctx'> 	dev-&gt;flags |= IFF_NOARP;</div><div class='ctx'> 	dev-&gt;flags &amp;= ~IFF_MULTICAST;</div><div class='ctx'> 	dev-&gt;features	|= NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO;</div><div class='del'>-	dev-&gt;features	|= NETIF_F_NO_CSUM | NETIF_F_HIGHDMA | NETIF_F_LLTX;</div><div class='add'>+	dev-&gt;features	|= NETIF_F_HW_CSUM | NETIF_F_HIGHDMA | NETIF_F_LLTX;</div><div class='ctx'> 	random_ether_addr(dev-&gt;dev_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/3com/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c<br/>index 972f80ecc510..da410f036869 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/3com/3c589_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/3com/3c589_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/3com/3c589_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/3com/3c589_cs.c</a></div><div class='hunk'>@@ -468,9 +468,10 @@ static void tc589_reset(struct net_device *dev)</div><div class='ctx'> static void netdev_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 			       struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	sprintf(info-&gt;bus_info, "PCMCIA 0x%lx", dev-&gt;base_addr);</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	snprintf(info-&gt;bus_info, sizeof(info-&gt;bus_info),</div><div class='add'>+		"PCMCIA 0x%lx", dev-&gt;base_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops netdev_ethtool_ops = {</div><div class='head'>diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c<br/>index b42c06baba89..8153a3e0a1a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/3com/3c59x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/3com/3c59x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/3com/3c59x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/3com/3c59x.c</a></div><div class='hunk'>@@ -2929,15 +2929,17 @@ static void vortex_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct vortex_private *vp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='ctx'> 	if (VORTEX_PCI(vp)) {</div><div class='del'>-		strcpy(info-&gt;bus_info, pci_name(VORTEX_PCI(vp)));</div><div class='add'>+		strlcpy(info-&gt;bus_info, pci_name(VORTEX_PCI(vp)),</div><div class='add'>+			sizeof(info-&gt;bus_info));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (VORTEX_EISA(vp))</div><div class='del'>-			strcpy(info-&gt;bus_info, dev_name(vp-&gt;gendev));</div><div class='add'>+			strlcpy(info-&gt;bus_info, dev_name(vp-&gt;gendev),</div><div class='add'>+				sizeof(info-&gt;bus_info));</div><div class='ctx'> 		else</div><div class='del'>-			sprintf(info-&gt;bus_info, "EISA 0x%lx %d",</div><div class='del'>-					dev-&gt;base_addr, dev-&gt;irq);</div><div class='add'>+			snprintf(info-&gt;bus_info, sizeof(info-&gt;bus_info),</div><div class='add'>+				"EISA 0x%lx %d", dev-&gt;base_addr, dev-&gt;irq);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c<br/>index 20ea07508ac7..6d6bc754b1a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/3com/typhoon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/3com/typhoon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/3com/typhoon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/3com/typhoon.c</a></div><div class='hunk'>@@ -988,21 +988,23 @@ typhoon_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> </div><div class='ctx'> 	smp_rmb();</div><div class='ctx'> 	if(tp-&gt;card_state == Sleeping) {</div><div class='del'>-		strcpy(info-&gt;fw_version, "Sleep image");</div><div class='add'>+		strlcpy(info-&gt;fw_version, "Sleep image",</div><div class='add'>+			sizeof(info-&gt;fw_version));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		INIT_COMMAND_WITH_RESPONSE(&amp;xp_cmd, TYPHOON_CMD_READ_VERSIONS);</div><div class='ctx'> 		if(typhoon_issue_command(tp, 1, &amp;xp_cmd, 3, xp_resp) &lt; 0) {</div><div class='del'>-			strcpy(info-&gt;fw_version, "Unknown runtime");</div><div class='add'>+			strlcpy(info-&gt;fw_version, "Unknown runtime",</div><div class='add'>+				sizeof(info-&gt;fw_version));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			u32 sleep_ver = le32_to_cpu(xp_resp[0].parm2);</div><div class='del'>-			snprintf(info-&gt;fw_version, 32, "%02x.%03x.%03x",</div><div class='del'>-				 sleep_ver &gt;&gt; 24, (sleep_ver &gt;&gt; 12) &amp; 0xfff,</div><div class='del'>-				 sleep_ver &amp; 0xfff);</div><div class='add'>+			snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version),</div><div class='add'>+				"%02x.%03x.%03x", sleep_ver &gt;&gt; 24,</div><div class='add'>+				(sleep_ver &gt;&gt; 12) &amp; 0xfff, sleep_ver &amp; 0xfff);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, KBUILD_MODNAME);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(pci_dev));</div><div class='add'>+	strlcpy(info-&gt;driver, KBUILD_MODNAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='head'>diff --git a/drivers/net/ethernet/8390/8390.h b/drivers/net/ethernet/8390/8390.h<br/>index 58a12e4c78f9..ef325ffa1b5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/8390.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/8390.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/8390.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/8390/8390.h</a></div><div class='hunk'>@@ -14,8 +14,6 @@</div><div class='ctx'> </div><div class='ctx'> #define TX_PAGES 12	/* Two Tx slots */</div><div class='ctx'> </div><div class='del'>-#define ETHER_ADDR_LEN 6</div><div class='del'>-</div><div class='ctx'> /* The 8390 specific per-packet-header format. */</div><div class='ctx'> struct e8390_pkt_hdr {</div><div class='ctx'>   unsigned char status; /* status */</div><div class='head'>diff --git a/drivers/net/ethernet/8390/apne.c b/drivers/net/ethernet/8390/apne.c<br/>index 547737340cbb..3ad5d2f9a49c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/apne.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/apne.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/apne.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/8390/apne.c</a></div><div class='hunk'>@@ -318,7 +318,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)</div><div class='ctx'>     i = request_irq(dev-&gt;irq, apne_interrupt, IRQF_SHARED, DRV_NAME, dev);</div><div class='ctx'>     if (i) return i;</div><div class='ctx'> </div><div class='del'>-    for(i = 0; i &lt; ETHER_ADDR_LEN; i++)</div><div class='add'>+    for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 	dev-&gt;dev_addr[i] = SA_prom[i];</div><div class='ctx'> </div><div class='ctx'>     printk(" %pM\n", dev-&gt;dev_addr);</div><div class='head'>diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c<br/>index e9f8432f55b4..0f92e3567f68 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/ax88796.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/ax88796.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/ax88796.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/8390/ax88796.c</a></div><div class='hunk'>@@ -623,7 +623,8 @@ static int ax_mii_init(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	ax-&gt;mii_bus-&gt;name = "ax88796_mii_bus";</div><div class='ctx'> 	ax-&gt;mii_bus-&gt;parent = dev-&gt;dev.parent;</div><div class='del'>-	snprintf(ax-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%x", pdev-&gt;id);</div><div class='add'>+	snprintf(ax-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%s-%x",</div><div class='add'>+		pdev-&gt;name, pdev-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	ax-&gt;mii_bus-&gt;irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);</div><div class='ctx'> 	if (!ax-&gt;mii_bus-&gt;irq) {</div><div class='hunk'>@@ -735,15 +736,14 @@ static int ax_init_dev(struct net_device *dev)</div><div class='ctx'> 	if (ax-&gt;plat-&gt;flags &amp; AXFLG_MAC_FROMDEV) {</div><div class='ctx'> 		ei_outb(E8390_NODMA + E8390_PAGE1 + E8390_STOP,</div><div class='ctx'> 			ei_local-&gt;mem + E8390_CMD); /* 0x61 */</div><div class='del'>-		for (i = 0; i &lt; ETHER_ADDR_LEN; i++)</div><div class='add'>+		for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 			dev-&gt;dev_addr[i] =</div><div class='ctx'> 				ei_inb(ioaddr + EN1_PHYS_SHIFT(i));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((ax-&gt;plat-&gt;flags &amp; AXFLG_MAC_FROMPLATFORM) &amp;&amp;</div><div class='ctx'> 	    ax-&gt;plat-&gt;mac_addr)</div><div class='del'>-		memcpy(dev-&gt;dev_addr, ax-&gt;plat-&gt;mac_addr,</div><div class='del'>-		       ETHER_ADDR_LEN);</div><div class='add'>+		memcpy(dev-&gt;dev_addr, ax-&gt;plat-&gt;mac_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	ax_reset_8390(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -991,18 +991,7 @@ static struct platform_driver axdrv = {</div><div class='ctx'> 	.resume		= ax_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init axdrv_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;axdrv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit axdrv_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;axdrv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(axdrv_init);</div><div class='del'>-module_exit(axdrv_exit);</div><div class='add'>+module_platform_driver(axdrv);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("AX88796 10/100 Ethernet platform driver");</div><div class='ctx'> MODULE_AUTHOR("Ben Dooks, &lt;ben@simtec.co.uk&gt;");</div><div class='head'>diff --git a/drivers/net/ethernet/8390/es3210.c b/drivers/net/ethernet/8390/es3210.c<br/>index 7a09575ecff0..6428f9e7a554 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/es3210.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/es3210.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/es3210.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/8390/es3210.c</a></div><div class='hunk'>@@ -195,7 +195,7 @@ static int __init es_probe1(struct net_device *dev, int ioaddr)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ETHER_ADDR_LEN ; i++)</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN ; i++)</div><div class='ctx'> 		dev-&gt;dev_addr[i] = inb(ioaddr + ES_SA_PROM + i);</div><div class='ctx'> </div><div class='ctx'> /*	Check the Racal vendor ID as well. */</div><div class='head'>diff --git a/drivers/net/ethernet/8390/hp-plus.c b/drivers/net/ethernet/8390/hp-plus.c<br/>index eeac843dcd2d..d42938b6b596 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/hp-plus.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/hp-plus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/hp-plus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/8390/hp-plus.c</a></div><div class='hunk'>@@ -202,7 +202,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)</div><div class='ctx'> 	/* Retrieve and checksum the station address. */</div><div class='ctx'> 	outw(MAC_Page, ioaddr + HP_PAGING);</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; ETHER_ADDR_LEN; i++) {</div><div class='add'>+	for(i = 0; i &lt; ETH_ALEN; i++) {</div><div class='ctx'> 		unsigned char inval = inb(ioaddr + 8 + i);</div><div class='ctx'> 		dev-&gt;dev_addr[i] = inval;</div><div class='ctx'> 		checksum += inval;</div><div class='head'>diff --git a/drivers/net/ethernet/8390/hp.c b/drivers/net/ethernet/8390/hp.c<br/>index 18564d4a7c04..113f1e075a26 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/hp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/hp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/hp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/8390/hp.c</a></div><div class='hunk'>@@ -156,7 +156,7 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)</div><div class='ctx'> </div><div class='ctx'> 	printk("%s: %s (ID %02x) at %#3x,", dev-&gt;name, name, board_id, ioaddr);</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; ETHER_ADDR_LEN; i++)</div><div class='add'>+	for(i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 		dev-&gt;dev_addr[i] = inb(ioaddr + i);</div><div class='ctx'> </div><div class='ctx'> 	printk(" %pM", dev-&gt;dev_addr);</div><div class='head'>diff --git a/drivers/net/ethernet/8390/hydra.c b/drivers/net/ethernet/8390/hydra.c<br/>index 3dac937a67c4..5370c884620b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/hydra.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/hydra.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/hydra.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/8390/hydra.c</a></div><div class='hunk'>@@ -129,7 +129,7 @@ static int __devinit hydra_init(struct zorro_dev *z)</div><div class='ctx'>     if (!dev)</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-    for(j = 0; j &lt; ETHER_ADDR_LEN; j++)</div><div class='add'>+    for (j = 0; j &lt; ETH_ALEN; j++)</div><div class='ctx'> 	dev-&gt;dev_addr[j] = *((u8 *)(board + HYDRA_ADDRPROM + 2*j));</div><div class='ctx'> </div><div class='ctx'>     /* We must set the 8390 for word mode. */</div><div class='head'>diff --git a/drivers/net/ethernet/8390/lne390.c b/drivers/net/ethernet/8390/lne390.c<br/>index f9888d20177b..69490ae018ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/lne390.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/lne390.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/lne390.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/8390/lne390.c</a></div><div class='hunk'>@@ -191,14 +191,14 @@ static int __init lne390_probe1(struct net_device *dev, int ioaddr)</div><div class='ctx'> 		|| inb(ioaddr + LNE390_SA_PROM + 1) != LNE390_ADDR1</div><div class='ctx'> 		|| inb(ioaddr + LNE390_SA_PROM + 2) != LNE390_ADDR2 ) {</div><div class='ctx'> 		printk("lne390.c: card not found");</div><div class='del'>-		for(i = 0; i &lt; ETHER_ADDR_LEN; i++)</div><div class='add'>+		for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 			printk(" %02x", inb(ioaddr + LNE390_SA_PROM + i));</div><div class='ctx'> 		printk(" (invalid prefix).\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; ETHER_ADDR_LEN; i++)</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 		dev-&gt;dev_addr[i] = inb(ioaddr + LNE390_SA_PROM + i);</div><div class='ctx'> 	printk("lne390.c: LNE390%X in EISA slot %d, address %pM.\n",</div><div class='ctx'> 	       0xa+revision, ioaddr/0x1000, dev-&gt;dev_addr);</div><div class='head'>diff --git a/drivers/net/ethernet/8390/ne-h8300.c b/drivers/net/ethernet/8390/ne-h8300.c<br/>index cd36a6a5f408..9b9c77d5a65c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/ne-h8300.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/ne-h8300.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/ne-h8300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/8390/ne-h8300.c</a></div><div class='hunk'>@@ -312,7 +312,7 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;base_addr = ioaddr;</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; ETHER_ADDR_LEN; i++)</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 		dev-&gt;dev_addr[i] = SA_prom[i];</div><div class='ctx'> 	printk(" %pM\n", dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c<br/>index 1063093b3afc..f92ea2a65a57 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/ne.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/ne.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/ne.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/8390/ne.c</a></div><div class='hunk'>@@ -503,12 +503,12 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)</div><div class='ctx'> #ifdef CONFIG_PLAT_MAPPI</div><div class='ctx'> 	outb_p(E8390_NODMA + E8390_PAGE1 + E8390_STOP,</div><div class='ctx'> 		ioaddr + E8390_CMD); /* 0x61 */</div><div class='del'>-	for (i = 0 ; i &lt; ETHER_ADDR_LEN ; i++) {</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++) {</div><div class='ctx'> 		dev-&gt;dev_addr[i] = SA_prom[i]</div><div class='ctx'> 			= inb_p(ioaddr + EN1_PHYS_SHIFT(i));</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='del'>-	for(i = 0; i &lt; ETHER_ADDR_LEN; i++) {</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++) {</div><div class='ctx'> 		dev-&gt;dev_addr[i] = SA_prom[i];</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/8390/ne2.c b/drivers/net/ethernet/8390/ne2.c<br/>index 70cdc6996342..922b32036c63 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/ne2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/ne2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/ne2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/8390/ne2.c</a></div><div class='hunk'>@@ -460,7 +460,7 @@ static int __init ne2_probe1(struct net_device *dev, int slot)</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;base_addr = base_addr;</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; ETHER_ADDR_LEN; i++)</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 		dev-&gt;dev_addr[i] = SA_prom[i];</div><div class='ctx'> </div><div class='ctx'> 	printk(" %pM\n", dev-&gt;dev_addr);</div><div class='head'>diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c<br/>index 39923425ba25..3fab04a0034a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/ne2k-pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/ne2k-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/ne2k-pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/8390/ne2k-pci.c</a></div><div class='hunk'>@@ -639,9 +639,9 @@ static void ne2k_pci_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 	struct ei_device *ei = netdev_priv(dev);</div><div class='ctx'> 	struct pci_dev *pci_dev = (struct pci_dev *) ei-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(pci_dev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops ne2k_pci_ethtool_ops = {</div><div class='head'>diff --git a/drivers/net/ethernet/8390/ne3210.c b/drivers/net/ethernet/8390/ne3210.c<br/>index 243ed2aee88e..2a3e8057feae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/ne3210.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/ne3210.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/ne3210.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/8390/ne3210.c</a></div><div class='hunk'>@@ -125,7 +125,7 @@ static int __init ne3210_eisa_probe (struct device *device)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	port_index = inb(ioaddr + NE3210_CFG2) &gt;&gt; 6;</div><div class='del'>-	for(i = 0; i &lt; ETHER_ADDR_LEN; i++)</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 		dev-&gt;dev_addr[i] = inb(ioaddr + NE3210_SA_PROM + i);</div><div class='ctx'> 	printk("ne3210.c: NE3210 in EISA slot %d, media: %s, addr: %pM.\n",</div><div class='ctx'> 		edev-&gt;slot, ifmap[port_index], dev-&gt;dev_addr);</div><div class='head'>diff --git a/drivers/net/ethernet/8390/stnic.c b/drivers/net/ethernet/8390/stnic.c<br/>index d85f0a84bc7b..3b903759980a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/stnic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/stnic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/stnic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/8390/stnic.c</a></div><div class='hunk'>@@ -114,7 +114,7 @@ static int __init stnic_probe(void)</div><div class='ctx'> #ifdef CONFIG_SH_STANDARD_BIOS</div><div class='ctx'>   sh_bios_get_node_addr (stnic_eadr);</div><div class='ctx'> #endif</div><div class='del'>-  for (i = 0; i &lt; ETHER_ADDR_LEN; i++)</div><div class='add'>+  for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'>     dev-&gt;dev_addr[i] = stnic_eadr[i];</div><div class='ctx'> </div><div class='ctx'>   /* Set the base address to point to the NIC, not the "real" base! */</div><div class='head'>diff --git a/drivers/net/ethernet/8390/zorro8390.c b/drivers/net/ethernet/8390/zorro8390.c<br/>index 3aa9fe9999b5..bcd27323b203 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/zorro8390.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/8390/zorro8390.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/8390/zorro8390.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/8390/zorro8390.c</a></div><div class='hunk'>@@ -365,7 +365,7 @@ static int __devinit zorro8390_init(struct net_device *dev,</div><div class='ctx'> 	if (i)</div><div class='ctx'> 		return i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ETHER_ADDR_LEN; i++)</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 		dev-&gt;dev_addr[i] = SA_prom[i];</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("Found ethernet address: %pM\n", dev-&gt;dev_addr);</div><div class='head'>diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig<br/>index 597f4d45c632..3474a61d4705 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/Kconfig</a></div><div class='hunk'>@@ -28,6 +28,7 @@ source "drivers/net/ethernet/cadence/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/adi/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/broadcom/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/brocade/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/calxeda/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/chelsio/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/cirrus/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/cisco/Kconfig"</div><div class='head'>diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile<br/>index be5dde040261..08d5f0388877 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/Makefile</a></div><div class='hunk'>@@ -10,10 +10,11 @@ obj-$(CONFIG_NET_VENDOR_ALTEON) += alteon/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_AMD) += amd/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_APPLE) += apple/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/</div><div class='del'>-obj-$(CONFIG_NET_ATMEL) += cadence/</div><div class='add'>+obj-$(CONFIG_NET_CADENCE) += cadence/</div><div class='ctx'> obj-$(CONFIG_NET_BFIN) += adi/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/</div><div class='add'>+obj-$(CONFIG_NET_CALXEDA_XGMAC) += calxeda/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_CIRRUS) += cirrus/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/</div><div class='head'>diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c<br/>index 6d9f6911000f..cb4f38a17f20 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/adaptec/starfire.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/adaptec/starfire.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/adaptec/starfire.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/adaptec/starfire.c</a></div><div class='hunk'>@@ -607,7 +607,7 @@ static const struct ethtool_ops ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef VLAN_SUPPORT</div><div class='del'>-static void netdev_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='add'>+static int netdev_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -617,9 +617,11 @@ static void netdev_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> 	set_bit(vid, np-&gt;active_vlans);</div><div class='ctx'> 	set_rx_mode(dev);</div><div class='ctx'> 	spin_unlock(&amp;np-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void netdev_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='add'>+static int netdev_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -629,6 +631,8 @@ static void netdev_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> 	clear_bit(vid, np-&gt;active_vlans);</div><div class='ctx'> 	set_rx_mode(dev);</div><div class='ctx'> 	spin_unlock(&amp;np-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif /* VLAN_SUPPORT */</div><div class='ctx'> </div><div class='hunk'>@@ -1842,9 +1846,9 @@ static int check_if_running(struct net_device *dev)</div><div class='ctx'> static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)</div><div class='head'>diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c<br/>index b6d69c91db96..d812a103e032 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/adi/bfin_mac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/adi/bfin_mac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/adi/bfin_mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/adi/bfin_mac.c</a></div><div class='hunk'>@@ -1670,7 +1670,8 @@ static int __devinit bfin_mii_bus_probe(struct platform_device *pdev)</div><div class='ctx'> 	miibus-&gt;name = "bfin_mii_bus";</div><div class='ctx'> 	miibus-&gt;phy_mask = mii_bus_pd-&gt;phy_mask;</div><div class='ctx'> </div><div class='del'>-	snprintf(miibus-&gt;id, MII_BUS_ID_SIZE, "0");</div><div class='add'>+	snprintf(miibus-&gt;id, MII_BUS_ID_SIZE, "%s-%x",</div><div class='add'>+		pdev-&gt;name, pdev-&gt;id);</div><div class='ctx'> 	miibus-&gt;irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);</div><div class='ctx'> 	if (!miibus-&gt;irq)</div><div class='ctx'> 		goto out_err_irq_alloc;</div><div class='head'>diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c<br/>index 442fefa4f2ca..c885aa905dec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/aeroflex/greth.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/aeroflex/greth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/aeroflex/greth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/aeroflex/greth.c</a></div><div class='hunk'>@@ -1623,18 +1623,7 @@ static struct platform_driver greth_of_driver = {</div><div class='ctx'> 	.remove = __devexit_p(greth_of_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init greth_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;greth_of_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit greth_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;greth_of_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(greth_init);</div><div class='del'>-module_exit(greth_cleanup);</div><div class='add'>+module_platform_driver(greth_of_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Aeroflex Gaisler AB.");</div><div class='ctx'> MODULE_DESCRIPTION("Aeroflex Gaisler Ethernet MAC driver");</div><div class='head'>diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c<br/>index a9745f4ddbfe..33e0a8c20f6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/amd/amd8111e.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/amd/amd8111e.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/amd/amd8111e.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/amd/amd8111e.c</a></div><div class='hunk'>@@ -499,7 +499,7 @@ static int amd8111e_restart(struct net_device *dev)</div><div class='ctx'> 	writel( VAL0 | APAD_XMT | REX_RTRY, mmio + CMD2 );</div><div class='ctx'> </div><div class='ctx'> 	/* Setting the MAC address to the device */</div><div class='del'>-	for(i = 0; i &lt; ETH_ADDR_LEN; i++)</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 		writeb( dev-&gt;dev_addr[i], mmio + PADR + i );</div><div class='ctx'> </div><div class='ctx'> 	/* Enable interrupt coalesce */</div><div class='hunk'>@@ -1412,10 +1412,11 @@ static void amd8111e_get_drvinfo(struct net_device* dev, struct ethtool_drvinfo</div><div class='ctx'> {</div><div class='ctx'> 	struct amd8111e_priv *lp = netdev_priv(dev);</div><div class='ctx'> 	struct pci_dev *pci_dev = lp-&gt;pci_dev;</div><div class='del'>-	strcpy (info-&gt;driver, MODULE_NAME);</div><div class='del'>-	strcpy (info-&gt;version, MODULE_VERS);</div><div class='del'>-	sprintf(info-&gt;fw_version,"%u",chip_version);</div><div class='del'>-	strcpy (info-&gt;bus_info, pci_name(pci_dev));</div><div class='add'>+	strlcpy(info-&gt;driver, MODULE_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, MODULE_VERS, sizeof(info-&gt;version));</div><div class='add'>+	snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version),</div><div class='add'>+		"%u", chip_version);</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int amd8111e_get_regs_len(struct net_device *dev)</div><div class='hunk'>@@ -1549,7 +1550,7 @@ static int amd8111e_set_mac_address(struct net_device *dev, void *p)</div><div class='ctx'> 	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='ctx'> 	spin_lock_irq(&amp;lp-&gt;lock);</div><div class='ctx'> 	/* Setting the MAC address to the device */</div><div class='del'>-	for(i = 0; i &lt; ETH_ADDR_LEN; i++)</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 		writeb( dev-&gt;dev_addr[i], lp-&gt;mmio + PADR + i );</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(&amp;lp-&gt;lock);</div><div class='hunk'>@@ -1885,7 +1886,7 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Initializing MAC address */</div><div class='del'>-	for(i = 0; i &lt; ETH_ADDR_LEN; i++)</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 		dev-&gt;dev_addr[i] = readb(lp-&gt;mmio + PADR + i);</div><div class='ctx'> </div><div class='ctx'> 	/* Setting user defined parametrs */</div><div class='head'>diff --git a/drivers/net/ethernet/amd/amd8111e.h b/drivers/net/ethernet/amd/amd8111e.h<br/>index 2ff2e7a12dd0..8baa3527ba74 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/amd/amd8111e.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/amd/amd8111e.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/amd/amd8111e.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/amd/amd8111e.h</a></div><div class='hunk'>@@ -586,7 +586,6 @@ typedef enum {</div><div class='ctx'> </div><div class='ctx'> #define PKT_BUFF_SZ			1536</div><div class='ctx'> #define MIN_PKT_LEN			60</div><div class='del'>-#define ETH_ADDR_LEN			6</div><div class='ctx'> </div><div class='ctx'> #define  AMD8111E_TX_TIMEOUT		(3 * HZ)/* 3 sec */</div><div class='ctx'> #define SOFT_TIMER_FREQ 		0xBEBC  /* 0.5 sec */</div><div class='hunk'>@@ -808,8 +807,8 @@ typedef enum {</div><div class='ctx'> </div><div class='ctx'> static int card_idx;</div><div class='ctx'> static int speed_duplex[MAX_UNITS] = { 0, };</div><div class='del'>-static int coalesce[MAX_UNITS] = {1,1,1,1,1,1,1,1};</div><div class='del'>-static int dynamic_ipg[MAX_UNITS] = {0,0,0,0,0,0,0,0};</div><div class='add'>+static bool coalesce[MAX_UNITS] = { [ 0 ... MAX_UNITS-1] = true };</div><div class='add'>+static bool dynamic_ipg[MAX_UNITS] = { [ 0 ... MAX_UNITS-1] = false };</div><div class='ctx'> static unsigned int chip_version;</div><div class='ctx'> </div><div class='ctx'> #endif /* _AMD8111E_H */</div><div class='head'>diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c<br/>index 4865ff14bebf..8b95dd314253 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/amd/au1000_eth.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/amd/au1000_eth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/amd/au1000_eth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/amd/au1000_eth.c</a></div><div class='hunk'>@@ -1171,7 +1171,8 @@ static int __devinit au1000_probe(struct platform_device *pdev)</div><div class='ctx'> 	aup-&gt;mii_bus-&gt;write = au1000_mdiobus_write;</div><div class='ctx'> 	aup-&gt;mii_bus-&gt;reset = au1000_mdiobus_reset;</div><div class='ctx'> 	aup-&gt;mii_bus-&gt;name = "au1000_eth_mii";</div><div class='del'>-	snprintf(aup-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%x", aup-&gt;mac_id);</div><div class='add'>+	snprintf(aup-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%s-%x",</div><div class='add'>+		pdev-&gt;name, aup-&gt;mac_id);</div><div class='ctx'> 	aup-&gt;mii_bus-&gt;irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);</div><div class='ctx'> 	if (aup-&gt;mii_bus-&gt;irq == NULL)</div><div class='ctx'> 		goto err_out;</div><div class='hunk'>@@ -1339,18 +1340,7 @@ static struct platform_driver au1000_eth_driver = {</div><div class='ctx'> 		.owner  = THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-MODULE_ALIAS("platform:au1000-eth");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int __init au1000_init_module(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;au1000_eth_driver);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void __exit au1000_exit_module(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;au1000_eth_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(au1000_eth_driver);</div><div class='ctx'> </div><div class='del'>-module_init(au1000_init_module);</div><div class='del'>-module_exit(au1000_exit_module);</div><div class='add'>+MODULE_ALIAS("platform:au1000-eth");</div><div class='head'>diff --git a/drivers/net/ethernet/amd/nmclan_cs.c b/drivers/net/ethernet/amd/nmclan_cs.c<br/>index 3accd5d21b08..6be0dd67631a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/amd/nmclan_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/amd/nmclan_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/amd/nmclan_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/amd/nmclan_cs.c</a></div><div class='hunk'>@@ -160,8 +160,6 @@ Include Files</div><div class='ctx'> Defines</div><div class='ctx'> ---------------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-#define ETHER_ADDR_LEN			ETH_ALEN</div><div class='del'>-					/* 6 bytes in an Ethernet Address */</div><div class='ctx'> #define MACE_LADRF_LEN			8</div><div class='ctx'> 					/* 8 bytes in Logical Address Filter */</div><div class='ctx'> </div><div class='hunk'>@@ -600,7 +598,7 @@ static int mace_init(mace_private *lp, unsigned int ioaddr, char *enet_addr)</div><div class='ctx'>   	}</div><div class='ctx'>   }</div><div class='ctx'>   /* Set PADR register */</div><div class='del'>-  for (i = 0; i &lt; ETHER_ADDR_LEN; i++)</div><div class='add'>+  for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'>     mace_write(lp, ioaddr, MACE_PADR, enet_addr[i]);</div><div class='ctx'> </div><div class='ctx'>   /* MAC Configuration Control Register should be written last */</div><div class='hunk'>@@ -639,11 +637,11 @@ static int nmclan_config(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'>   /* Read the ethernet address from the CIS. */</div><div class='ctx'>   len = pcmcia_get_tuple(link, 0x80, &amp;buf);</div><div class='del'>-  if (!buf || len &lt; ETHER_ADDR_LEN) {</div><div class='add'>+  if (!buf || len &lt; ETH_ALEN) {</div><div class='ctx'> 	  kfree(buf);</div><div class='ctx'> 	  goto failed;</div><div class='ctx'>   }</div><div class='del'>-  memcpy(dev-&gt;dev_addr, buf, ETHER_ADDR_LEN);</div><div class='add'>+  memcpy(dev-&gt;dev_addr, buf, ETH_ALEN);</div><div class='ctx'>   kfree(buf);</div><div class='ctx'> </div><div class='ctx'>   /* Verify configuration by reading the MACE ID. */</div><div class='hunk'>@@ -822,9 +820,10 @@ static int mace_close(struct net_device *dev)</div><div class='ctx'> static void netdev_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 			       struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	sprintf(info-&gt;bus_info, "PCMCIA 0x%lx", dev-&gt;base_addr);</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	snprintf(info-&gt;bus_info, sizeof(info-&gt;bus_info),</div><div class='add'>+		"PCMCIA 0x%lx", dev-&gt;base_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops netdev_ethtool_ops = {</div><div class='hunk'>@@ -1420,7 +1419,7 @@ Output</div><div class='ctx'> static void set_multicast_list(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>   mace_private *lp = netdev_priv(dev);</div><div class='del'>-  int adr[ETHER_ADDR_LEN] = {0}; /* Ethernet address */</div><div class='add'>+  int adr[ETH_ALEN] = {0}; /* Ethernet address */</div><div class='ctx'>   struct netdev_hw_addr *ha;</div><div class='ctx'> </div><div class='ctx'> #ifdef PCMCIA_DEBUG</div><div class='hunk'>@@ -1442,7 +1441,7 @@ static void set_multicast_list(struct net_device *dev)</div><div class='ctx'>     /* Calculate multicast logical address filter */</div><div class='ctx'>     memset(lp-&gt;multicast_ladrf, 0, MACE_LADRF_LEN);</div><div class='ctx'>     netdev_for_each_mc_addr(ha, dev) {</div><div class='del'>-      memcpy(adr, ha-&gt;addr, ETHER_ADDR_LEN);</div><div class='add'>+      memcpy(adr, ha-&gt;addr, ETH_ALEN);</div><div class='ctx'>       BuildLAF(lp-&gt;multicast_ladrf, adr);</div><div class='ctx'>     }</div><div class='ctx'>   }</div><div class='head'>diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c<br/>index f92bc6e34828..20e6dab0186c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/amd/pcnet32.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/amd/pcnet32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/amd/pcnet32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/amd/pcnet32.c</a></div><div class='hunk'>@@ -711,12 +711,14 @@ static void pcnet32_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct pcnet32_private *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='ctx'> 	if (lp-&gt;pci_dev)</div><div class='del'>-		strcpy(info-&gt;bus_info, pci_name(lp-&gt;pci_dev));</div><div class='add'>+		strlcpy(info-&gt;bus_info, pci_name(lp-&gt;pci_dev),</div><div class='add'>+			sizeof(info-&gt;bus_info));</div><div class='ctx'> 	else</div><div class='del'>-		sprintf(info-&gt;bus_info, "VLB 0x%lx", dev-&gt;base_addr);</div><div class='add'>+		snprintf(info-&gt;bus_info, sizeof(info-&gt;bus_info),</div><div class='add'>+			"VLB 0x%lx", dev-&gt;base_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 pcnet32_get_link(struct net_device *dev)</div><div class='head'>diff --git a/drivers/net/ethernet/amd/sunlance.c b/drivers/net/ethernet/amd/sunlance.c<br/>index 8fda457f94cf..7ea16d32a5f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/amd/sunlance.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/amd/sunlance.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/amd/sunlance.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/amd/sunlance.c</a></div><div class='hunk'>@@ -1540,17 +1540,4 @@ static struct platform_driver sunlance_sbus_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(sunlance_sbus_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* Find all the lance cards on the system and initialize them */</div><div class='del'>-static int __init sparc_lance_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sunlance_sbus_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sparc_lance_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sunlance_sbus_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sparc_lance_init);</div><div class='del'>-module_exit(sparc_lance_exit);</div><div class='add'>+module_platform_driver(sunlance_sbus_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c b/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c<br/>index 7be884d0aaf6..0a9326aa58b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c</a></div><div class='hunk'>@@ -232,7 +232,6 @@ static void atl1c_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> 	strlcpy(drvinfo-&gt;driver,  atl1c_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='ctx'> 	strlcpy(drvinfo-&gt;version, atl1c_driver_version,</div><div class='ctx'> 		sizeof(drvinfo-&gt;version));</div><div class='del'>-	strlcpy(drvinfo-&gt;fw_version, "N/A", sizeof(drvinfo-&gt;fw_version));</div><div class='ctx'> 	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='ctx'> 		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	drvinfo-&gt;n_stats = 0;</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c<br/>index 02c7ed8d9eca..b8591246eb4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/atheros/atl1c/atl1c_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/atheros/atl1c/atl1c_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/atheros/atl1c/atl1c_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/atheros/atl1c/atl1c_main.c</a></div><div class='hunk'>@@ -411,7 +411,7 @@ static void atl1c_set_multi(struct net_device *netdev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __atl1c_vlan_mode(u32 features, u32 *mac_ctrl_data)</div><div class='add'>+static void __atl1c_vlan_mode(netdev_features_t features, u32 *mac_ctrl_data)</div><div class='ctx'> {</div><div class='ctx'> 	if (features &amp; NETIF_F_HW_VLAN_RX) {</div><div class='ctx'> 		/* enable VLAN tag insert/strip */</div><div class='hunk'>@@ -422,7 +422,8 @@ static void __atl1c_vlan_mode(u32 features, u32 *mac_ctrl_data)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void atl1c_vlan_mode(struct net_device *netdev, u32 features)</div><div class='add'>+static void atl1c_vlan_mode(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct atl1c_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='hunk'>@@ -482,7 +483,8 @@ static void atl1c_set_rxbufsize(struct atl1c_adapter *adapter,</div><div class='ctx'> 		roundup(mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN, 8) : AT_RX_BUF_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 atl1c_fix_features(struct net_device *netdev, u32 features)</div><div class='add'>+static netdev_features_t atl1c_fix_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since there is no support for separate rx/tx vlan accel</div><div class='hunk'>@@ -499,9 +501,10 @@ static u32 atl1c_fix_features(struct net_device *netdev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int atl1c_set_features(struct net_device *netdev, u32 features)</div><div class='add'>+static int atl1c_set_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='del'>-	u32 changed = netdev-&gt;features ^ features;</div><div class='add'>+	netdev_features_t changed = netdev-&gt;features ^ features;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; NETIF_F_HW_VLAN_RX)</div><div class='ctx'> 		atl1c_vlan_mode(netdev, features);</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c b/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c<br/>index 6269438d365f..6e61f9f9ebb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c</a></div><div class='hunk'>@@ -310,10 +310,12 @@ static void atl1e_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct atl1e_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	strncpy(drvinfo-&gt;driver,  atl1e_driver_name, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;version, atl1e_driver_version, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;fw_version, "L1e", 32);</div><div class='del'>-	strncpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev), 32);</div><div class='add'>+	strlcpy(drvinfo-&gt;driver,  atl1e_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, atl1e_driver_version,</div><div class='add'>+		sizeof(drvinfo-&gt;version));</div><div class='add'>+	strlcpy(drvinfo-&gt;fw_version, "L1e", sizeof(drvinfo-&gt;fw_version));</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	drvinfo-&gt;n_stats = 0;</div><div class='ctx'> 	drvinfo-&gt;testinfo_len = 0;</div><div class='ctx'> 	drvinfo-&gt;regdump_len = atl1e_get_regs_len(netdev);</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c<br/>index 95483bcac1d0..c915c0873810 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/atheros/atl1e/atl1e_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/atheros/atl1e/atl1e_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/atheros/atl1e/atl1e_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/atheros/atl1e/atl1e_main.c</a></div><div class='hunk'>@@ -313,7 +313,7 @@ static void atl1e_set_multi(struct net_device *netdev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __atl1e_vlan_mode(u32 features, u32 *mac_ctrl_data)</div><div class='add'>+static void __atl1e_vlan_mode(netdev_features_t features, u32 *mac_ctrl_data)</div><div class='ctx'> {</div><div class='ctx'> 	if (features &amp; NETIF_F_HW_VLAN_RX) {</div><div class='ctx'> 		/* enable VLAN tag insert/strip */</div><div class='hunk'>@@ -324,7 +324,8 @@ static void __atl1e_vlan_mode(u32 features, u32 *mac_ctrl_data)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void atl1e_vlan_mode(struct net_device *netdev, u32 features)</div><div class='add'>+static void atl1e_vlan_mode(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct atl1e_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	u32 mac_ctrl_data = 0;</div><div class='hunk'>@@ -370,7 +371,8 @@ static int atl1e_set_mac_addr(struct net_device *netdev, void *p)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 atl1e_fix_features(struct net_device *netdev, u32 features)</div><div class='add'>+static netdev_features_t atl1e_fix_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since there is no support for separate rx/tx vlan accel</div><div class='hunk'>@@ -384,9 +386,10 @@ static u32 atl1e_fix_features(struct net_device *netdev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int atl1e_set_features(struct net_device *netdev, u32 features)</div><div class='add'>+static int atl1e_set_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='del'>-	u32 changed = netdev-&gt;features ^ features;</div><div class='add'>+	netdev_features_t changed = netdev-&gt;features ^ features;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; NETIF_F_HW_VLAN_RX)</div><div class='ctx'> 		atl1e_vlan_mode(netdev, features);</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c<br/>index 33a4e35f5ee8..9bd204976648 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/atheros/atlx/atl1.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/atheros/atlx/atl1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/atheros/atlx/atl1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/atheros/atlx/atl1.c</a></div><div class='hunk'>@@ -3365,7 +3365,6 @@ static void atl1_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> 	strlcpy(drvinfo-&gt;driver, ATLX_DRIVER_NAME, sizeof(drvinfo-&gt;driver));</div><div class='ctx'> 	strlcpy(drvinfo-&gt;version, ATLX_DRIVER_VERSION,</div><div class='ctx'> 		sizeof(drvinfo-&gt;version));</div><div class='del'>-	strlcpy(drvinfo-&gt;fw_version, "N/A", sizeof(drvinfo-&gt;fw_version));</div><div class='ctx'> 	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='ctx'> 		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	drvinfo-&gt;eedump_len = ATL1_EEDUMP_LEN;</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c<br/>index 1feae5928a4b..071f4c858969 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/atheros/atlx/atl2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/atheros/atlx/atl2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/atheros/atlx/atl2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/atheros/atlx/atl2.c</a></div><div class='hunk'>@@ -361,7 +361,7 @@ static inline void atl2_irq_disable(struct atl2_adapter *adapter)</div><div class='ctx'>     synchronize_irq(adapter-&gt;pdev-&gt;irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __atl2_vlan_mode(u32 features, u32 *ctrl)</div><div class='add'>+static void __atl2_vlan_mode(netdev_features_t features, u32 *ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	if (features &amp; NETIF_F_HW_VLAN_RX) {</div><div class='ctx'> 		/* enable VLAN tag insert/strip */</div><div class='hunk'>@@ -372,7 +372,8 @@ static void __atl2_vlan_mode(u32 features, u32 *ctrl)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void atl2_vlan_mode(struct net_device *netdev, u32 features)</div><div class='add'>+static void atl2_vlan_mode(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	u32 ctrl;</div><div class='hunk'>@@ -391,7 +392,8 @@ static void atl2_restore_vlan(struct atl2_adapter *adapter)</div><div class='ctx'> 	atl2_vlan_mode(adapter-&gt;netdev, adapter-&gt;netdev-&gt;features);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 atl2_fix_features(struct net_device *netdev, u32 features)</div><div class='add'>+static netdev_features_t atl2_fix_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since there is no support for separate rx/tx vlan accel</div><div class='hunk'>@@ -405,9 +407,10 @@ static u32 atl2_fix_features(struct net_device *netdev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int atl2_set_features(struct net_device *netdev, u32 features)</div><div class='add'>+static int atl2_set_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='del'>-	u32 changed = netdev-&gt;features ^ features;</div><div class='add'>+	netdev_features_t changed = netdev-&gt;features ^ features;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; NETIF_F_HW_VLAN_RX)</div><div class='ctx'> 		atl2_vlan_mode(netdev, features);</div><div class='hunk'>@@ -2049,10 +2052,12 @@ static void atl2_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	strncpy(drvinfo-&gt;driver,  atl2_driver_name, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;version, atl2_driver_version, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;fw_version, "L2", 32);</div><div class='del'>-	strncpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev), 32);</div><div class='add'>+	strlcpy(drvinfo-&gt;driver,  atl2_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, atl2_driver_version,</div><div class='add'>+		sizeof(drvinfo-&gt;version));</div><div class='add'>+	strlcpy(drvinfo-&gt;fw_version, "L2", sizeof(drvinfo-&gt;fw_version));</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	drvinfo-&gt;n_stats = 0;</div><div class='ctx'> 	drvinfo-&gt;testinfo_len = 0;</div><div class='ctx'> 	drvinfo-&gt;regdump_len = atl2_get_regs_len(netdev);</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atlx/atlx.c b/drivers/net/ethernet/atheros/atlx/atlx.c<br/>index aabcf4b5745a..8ff7411094d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/atheros/atlx/atlx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/atheros/atlx/atlx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/atheros/atlx/atlx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/atheros/atlx/atlx.c</a></div><div class='hunk'>@@ -211,7 +211,7 @@ static void atlx_link_chg_task(struct work_struct *work)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;adapter-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __atlx_vlan_mode(u32 features, u32 *ctrl)</div><div class='add'>+static void __atlx_vlan_mode(netdev_features_t features, u32 *ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	if (features &amp; NETIF_F_HW_VLAN_RX) {</div><div class='ctx'> 		/* enable VLAN tag insert/strip */</div><div class='hunk'>@@ -222,7 +222,8 @@ static void __atlx_vlan_mode(u32 features, u32 *ctrl)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void atlx_vlan_mode(struct net_device *netdev, u32 features)</div><div class='add'>+static void atlx_vlan_mode(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct atlx_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -242,7 +243,8 @@ static void atlx_restore_vlan(struct atlx_adapter *adapter)</div><div class='ctx'> 	atlx_vlan_mode(adapter-&gt;netdev, adapter-&gt;netdev-&gt;features);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 atlx_fix_features(struct net_device *netdev, u32 features)</div><div class='add'>+static netdev_features_t atlx_fix_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since there is no support for separate rx/tx vlan accel</div><div class='hunk'>@@ -256,9 +258,10 @@ static u32 atlx_fix_features(struct net_device *netdev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int atlx_set_features(struct net_device *netdev, u32 features)</div><div class='add'>+static int atlx_set_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='del'>-	u32 changed = netdev-&gt;features ^ features;</div><div class='add'>+	netdev_features_t changed = netdev-&gt;features ^ features;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; NETIF_F_HW_VLAN_RX)</div><div class='ctx'> 		atlx_vlan_mode(netdev, features);</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c<br/>index a11a8ad94226..986019b2c849 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bcm63xx_enet.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bcm63xx_enet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bcm63xx_enet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/bcm63xx_enet.c</a></div><div class='hunk'>@@ -1469,7 +1469,7 @@ static int bcm_enet_set_pauseparam(struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ethtool_ops bcm_enet_ethtool_ops = {</div><div class='add'>+static const struct ethtool_ops bcm_enet_ethtool_ops = {</div><div class='ctx'> 	.get_strings		= bcm_enet_get_strings,</div><div class='ctx'> 	.get_sset_count		= bcm_enet_get_sset_count,</div><div class='ctx'> 	.get_ethtool_stats      = bcm_enet_get_ethtool_stats,</div><div class='hunk'>@@ -1727,7 +1727,7 @@ static int __devinit bcm_enet_probe(struct platform_device *pdev)</div><div class='ctx'> 		bus-&gt;priv = priv;</div><div class='ctx'> 		bus-&gt;read = bcm_enet_mdio_read_phylib;</div><div class='ctx'> 		bus-&gt;write = bcm_enet_mdio_write_phylib;</div><div class='del'>-		sprintf(bus-&gt;id, "%d", priv-&gt;mac_id);</div><div class='add'>+		sprintf(bus-&gt;id, "%s-%d", pdev-&gt;name, priv-&gt;mac_id);</div><div class='ctx'> </div><div class='ctx'> 		/* only probe bus where we think the PHY is, because</div><div class='ctx'> 		 * the mdio read operation return 0 instead of 0xffff</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c<br/>index 965c7235804d..021fb818007a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/bnx2.c</a></div><div class='hunk'>@@ -57,11 +57,11 @@</div><div class='ctx'> #include "bnx2_fw.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_MODULE_NAME		"bnx2"</div><div class='del'>-#define DRV_MODULE_VERSION	"2.1.11"</div><div class='del'>-#define DRV_MODULE_RELDATE	"July 20, 2011"</div><div class='del'>-#define FW_MIPS_FILE_06		"bnx2/bnx2-mips-06-6.2.1.fw"</div><div class='add'>+#define DRV_MODULE_VERSION	"2.2.1"</div><div class='add'>+#define DRV_MODULE_RELDATE	"Dec 18, 2011"</div><div class='add'>+#define FW_MIPS_FILE_06		"bnx2/bnx2-mips-06-6.2.3.fw"</div><div class='ctx'> #define FW_RV2P_FILE_06		"bnx2/bnx2-rv2p-06-6.0.15.fw"</div><div class='del'>-#define FW_MIPS_FILE_09		"bnx2/bnx2-mips-09-6.2.1a.fw"</div><div class='add'>+#define FW_MIPS_FILE_09		"bnx2/bnx2-mips-09-6.2.1b.fw"</div><div class='ctx'> #define FW_RV2P_FILE_09_Ax	"bnx2/bnx2-rv2p-09ax-6.0.17.fw"</div><div class='ctx'> #define FW_RV2P_FILE_09		"bnx2/bnx2-rv2p-09-6.0.17.fw"</div><div class='ctx'> </div><div class='hunk'>@@ -409,7 +409,7 @@ static int bnx2_unregister_cnic(struct net_device *dev)</div><div class='ctx'> 	mutex_lock(&amp;bp-&gt;cnic_lock);</div><div class='ctx'> 	cp-&gt;drv_state = 0;</div><div class='ctx'> 	bnapi-&gt;cnic_present = 0;</div><div class='del'>-	rcu_assign_pointer(bp-&gt;cnic_ops, NULL);</div><div class='add'>+	RCU_INIT_POINTER(bp-&gt;cnic_ops, NULL);</div><div class='ctx'> 	mutex_unlock(&amp;bp-&gt;cnic_lock);</div><div class='ctx'> 	synchronize_rcu();</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2054,8 +2054,8 @@ __acquires(&amp;bp-&gt;phy_lock)</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;autoneg &amp; AUTONEG_SPEED) {</div><div class='ctx'> 		u32 adv_reg, adv1000_reg;</div><div class='del'>-		u32 new_adv_reg = 0;</div><div class='del'>-		u32 new_adv1000_reg = 0;</div><div class='add'>+		u32 new_adv = 0;</div><div class='add'>+		u32 new_adv1000 = 0;</div><div class='ctx'> </div><div class='ctx'> 		bnx2_read_phy(bp, bp-&gt;mii_adv, &amp;adv_reg);</div><div class='ctx'> 		adv_reg &amp;= (PHY_ALL_10_100_SPEED | ADVERTISE_PAUSE_CAP |</div><div class='hunk'>@@ -2064,27 +2064,18 @@ __acquires(&amp;bp-&gt;phy_lock)</div><div class='ctx'> 		bnx2_read_phy(bp, MII_CTRL1000, &amp;adv1000_reg);</div><div class='ctx'> 		adv1000_reg &amp;= PHY_ALL_1000_SPEED;</div><div class='ctx'> </div><div class='del'>-		if (bp-&gt;advertising &amp; ADVERTISED_10baseT_Half)</div><div class='del'>-			new_adv_reg |= ADVERTISE_10HALF;</div><div class='del'>-		if (bp-&gt;advertising &amp; ADVERTISED_10baseT_Full)</div><div class='del'>-			new_adv_reg |= ADVERTISE_10FULL;</div><div class='del'>-		if (bp-&gt;advertising &amp; ADVERTISED_100baseT_Half)</div><div class='del'>-			new_adv_reg |= ADVERTISE_100HALF;</div><div class='del'>-		if (bp-&gt;advertising &amp; ADVERTISED_100baseT_Full)</div><div class='del'>-			new_adv_reg |= ADVERTISE_100FULL;</div><div class='del'>-		if (bp-&gt;advertising &amp; ADVERTISED_1000baseT_Full)</div><div class='del'>-			new_adv1000_reg |= ADVERTISE_1000FULL;</div><div class='add'>+		new_adv = ethtool_adv_to_mii_adv_t(bp-&gt;advertising);</div><div class='add'>+		new_adv |= ADVERTISE_CSMA;</div><div class='add'>+		new_adv |= bnx2_phy_get_pause_adv(bp);</div><div class='ctx'> </div><div class='del'>-		new_adv_reg |= ADVERTISE_CSMA;</div><div class='add'>+		new_adv1000 |= ethtool_adv_to_mii_ctrl1000_t(bp-&gt;advertising);</div><div class='ctx'> </div><div class='del'>-		new_adv_reg |= bnx2_phy_get_pause_adv(bp);</div><div class='del'>-</div><div class='del'>-		if ((adv1000_reg != new_adv1000_reg) ||</div><div class='del'>-			(adv_reg != new_adv_reg) ||</div><div class='add'>+		if ((adv1000_reg != new_adv1000) ||</div><div class='add'>+			(adv_reg != new_adv) ||</div><div class='ctx'> 			((bmcr &amp; BMCR_ANENABLE) == 0)) {</div><div class='ctx'> </div><div class='del'>-			bnx2_write_phy(bp, bp-&gt;mii_adv, new_adv_reg);</div><div class='del'>-			bnx2_write_phy(bp, MII_CTRL1000, new_adv1000_reg);</div><div class='add'>+			bnx2_write_phy(bp, bp-&gt;mii_adv, new_adv);</div><div class='add'>+			bnx2_write_phy(bp, MII_CTRL1000, new_adv1000);</div><div class='ctx'> 			bnx2_write_phy(bp, bp-&gt;mii_bmcr, BMCR_ANRESTART |</div><div class='ctx'> 				BMCR_ANENABLE);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2734,31 +2725,27 @@ bnx2_free_rx_page(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='del'>-bnx2_alloc_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index, gfp_t gfp)</div><div class='add'>+bnx2_alloc_rx_data(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	u8 *data;</div><div class='ctx'> 	struct sw_bd *rx_buf = &amp;rxr-&gt;rx_buf_ring[index];</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='ctx'> 	struct rx_bd *rxbd = &amp;rxr-&gt;rx_desc_ring[RX_RING(index)][RX_IDX(index)];</div><div class='del'>-	unsigned long align;</div><div class='ctx'> </div><div class='del'>-	skb = __netdev_alloc_skb(bp-&gt;dev, bp-&gt;rx_buf_size, gfp);</div><div class='del'>-	if (skb == NULL) {</div><div class='add'>+	data = kmalloc(bp-&gt;rx_buf_size, gfp);</div><div class='add'>+	if (!data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely((align = (unsigned long) skb-&gt;data &amp; (BNX2_RX_ALIGN - 1))))</div><div class='del'>-		skb_reserve(skb, BNX2_RX_ALIGN - align);</div><div class='del'>-</div><div class='del'>-	mapping = dma_map_single(&amp;bp-&gt;pdev-&gt;dev, skb-&gt;data, bp-&gt;rx_buf_use_size,</div><div class='add'>+	mapping = dma_map_single(&amp;bp-&gt;pdev-&gt;dev,</div><div class='add'>+				 get_l2_fhdr(data),</div><div class='add'>+				 bp-&gt;rx_buf_use_size,</div><div class='ctx'> 				 PCI_DMA_FROMDEVICE);</div><div class='ctx'> 	if (dma_mapping_error(&amp;bp-&gt;pdev-&gt;dev, mapping)) {</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='add'>+		kfree(data);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rx_buf-&gt;skb = skb;</div><div class='del'>-	rx_buf-&gt;desc = (struct l2_fhdr *) skb-&gt;data;</div><div class='add'>+	rx_buf-&gt;data = data;</div><div class='ctx'> 	dma_unmap_addr_set(rx_buf, mapping, mapping);</div><div class='ctx'> </div><div class='ctx'> 	rxbd-&gt;rx_bd_haddr_hi = (u64) mapping &gt;&gt; 32;</div><div class='hunk'>@@ -2823,6 +2810,7 @@ bnx2_tx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)</div><div class='ctx'> 	struct bnx2_tx_ring_info *txr = &amp;bnapi-&gt;tx_ring;</div><div class='ctx'> 	u16 hw_cons, sw_cons, sw_ring_cons;</div><div class='ctx'> 	int tx_pkt = 0, index;</div><div class='add'>+	unsigned int tx_bytes = 0;</div><div class='ctx'> 	struct netdev_queue *txq;</div><div class='ctx'> </div><div class='ctx'> 	index = (bnapi - bp-&gt;bnx2_napi);</div><div class='hunk'>@@ -2877,6 +2865,7 @@ bnx2_tx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)</div><div class='ctx'> </div><div class='ctx'> 		sw_cons = NEXT_TX_BD(sw_cons);</div><div class='ctx'> </div><div class='add'>+		tx_bytes += skb-&gt;len;</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 		tx_pkt++;</div><div class='ctx'> 		if (tx_pkt == budget)</div><div class='hunk'>@@ -2886,6 +2875,7 @@ bnx2_tx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)</div><div class='ctx'> 			hw_cons = bnx2_get_hw_tx_cons(bnapi);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netdev_tx_completed_queue(txq, tx_pkt, tx_bytes);</div><div class='ctx'> 	txr-&gt;hw_tx_cons = hw_cons;</div><div class='ctx'> 	txr-&gt;tx_cons = sw_cons;</div><div class='ctx'> </div><div class='hunk'>@@ -2965,8 +2955,8 @@ bnx2_reuse_rx_skb_pages(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-bnx2_reuse_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr,</div><div class='del'>-		  struct sk_buff *skb, u16 cons, u16 prod)</div><div class='add'>+bnx2_reuse_rx_data(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr,</div><div class='add'>+		   u8 *data, u16 cons, u16 prod)</div><div class='ctx'> {</div><div class='ctx'> 	struct sw_bd *cons_rx_buf, *prod_rx_buf;</div><div class='ctx'> 	struct rx_bd *cons_bd, *prod_bd;</div><div class='hunk'>@@ -2980,8 +2970,7 @@ bnx2_reuse_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr,</div><div class='ctx'> </div><div class='ctx'> 	rxr-&gt;rx_prod_bseq += bp-&gt;rx_buf_use_size;</div><div class='ctx'> </div><div class='del'>-	prod_rx_buf-&gt;skb = skb;</div><div class='del'>-	prod_rx_buf-&gt;desc = (struct l2_fhdr *) skb-&gt;data;</div><div class='add'>+	prod_rx_buf-&gt;data = data;</div><div class='ctx'> </div><div class='ctx'> 	if (cons == prod)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2995,33 +2984,39 @@ bnx2_reuse_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr,</div><div class='ctx'> 	prod_bd-&gt;rx_bd_haddr_lo = cons_bd-&gt;rx_bd_haddr_lo;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-bnx2_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, struct sk_buff *skb,</div><div class='add'>+static struct sk_buff *</div><div class='add'>+bnx2_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u8 *data,</div><div class='ctx'> 	    unsigned int len, unsigned int hdr_len, dma_addr_t dma_addr,</div><div class='ctx'> 	    u32 ring_idx)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u16 prod = ring_idx &amp; 0xffff;</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	err = bnx2_alloc_rx_skb(bp, rxr, prod, GFP_ATOMIC);</div><div class='add'>+	err = bnx2_alloc_rx_data(bp, rxr, prod, GFP_ATOMIC);</div><div class='ctx'> 	if (unlikely(err)) {</div><div class='del'>-		bnx2_reuse_rx_skb(bp, rxr, skb, (u16) (ring_idx &gt;&gt; 16), prod);</div><div class='add'>+		bnx2_reuse_rx_data(bp, rxr, data, (u16) (ring_idx &gt;&gt; 16), prod);</div><div class='add'>+error:</div><div class='ctx'> 		if (hdr_len) {</div><div class='ctx'> 			unsigned int raw_len = len + 4;</div><div class='ctx'> 			int pages = PAGE_ALIGN(raw_len - hdr_len) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 			bnx2_reuse_rx_skb_pages(bp, rxr, NULL, pages);</div><div class='ctx'> 		}</div><div class='del'>-		return err;</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb_reserve(skb, BNX2_RX_OFFSET);</div><div class='ctx'> 	dma_unmap_single(&amp;bp-&gt;pdev-&gt;dev, dma_addr, bp-&gt;rx_buf_use_size,</div><div class='ctx'> 			 PCI_DMA_FROMDEVICE);</div><div class='del'>-</div><div class='add'>+	skb = build_skb(data);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		kfree(data);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	skb_reserve(skb, ((u8 *)get_l2_fhdr(data) - data) + BNX2_RX_OFFSET);</div><div class='ctx'> 	if (hdr_len == 0) {</div><div class='ctx'> 		skb_put(skb, len);</div><div class='del'>-		return 0;</div><div class='add'>+		return skb;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		unsigned int i, frag_len, frag_size, pages;</div><div class='ctx'> 		struct sw_pg *rx_pg;</div><div class='hunk'>@@ -3052,7 +3047,7 @@ bnx2_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, struct sk_buff *skb,</div><div class='ctx'> 					skb_frag_size_sub(frag, tail);</div><div class='ctx'> 					skb-&gt;data_len -= tail;</div><div class='ctx'> 				}</div><div class='del'>-				return 0;</div><div class='add'>+				return skb;</div><div class='ctx'> 			}</div><div class='ctx'> 			rx_pg = &amp;rxr-&gt;rx_pg_ring[pg_cons];</div><div class='ctx'> </div><div class='hunk'>@@ -3074,7 +3069,7 @@ bnx2_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, struct sk_buff *skb,</div><div class='ctx'> 				rxr-&gt;rx_pg_prod = pg_prod;</div><div class='ctx'> 				bnx2_reuse_rx_skb_pages(bp, rxr, skb,</div><div class='ctx'> 							pages - i);</div><div class='del'>-				return err;</div><div class='add'>+				return NULL;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			dma_unmap_page(&amp;bp-&gt;pdev-&gt;dev, mapping_old,</div><div class='hunk'>@@ -3091,7 +3086,7 @@ bnx2_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, struct sk_buff *skb,</div><div class='ctx'> 		rxr-&gt;rx_pg_prod = pg_prod;</div><div class='ctx'> 		rxr-&gt;rx_pg_cons = pg_cons;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u16</div><div class='hunk'>@@ -3130,19 +3125,17 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)</div><div class='ctx'> 		struct sw_bd *rx_buf, *next_rx_buf;</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='ctx'> 		dma_addr_t dma_addr;</div><div class='add'>+		u8 *data;</div><div class='ctx'> </div><div class='ctx'> 		sw_ring_cons = RX_RING_IDX(sw_cons);</div><div class='ctx'> 		sw_ring_prod = RX_RING_IDX(sw_prod);</div><div class='ctx'> </div><div class='ctx'> 		rx_buf = &amp;rxr-&gt;rx_buf_ring[sw_ring_cons];</div><div class='del'>-		skb = rx_buf-&gt;skb;</div><div class='del'>-		prefetchw(skb);</div><div class='del'>-</div><div class='del'>-		next_rx_buf =</div><div class='del'>-			&amp;rxr-&gt;rx_buf_ring[RX_RING_IDX(NEXT_RX_BD(sw_cons))];</div><div class='del'>-		prefetch(next_rx_buf-&gt;desc);</div><div class='add'>+		data = rx_buf-&gt;data;</div><div class='add'>+		rx_buf-&gt;data = NULL;</div><div class='ctx'> </div><div class='del'>-		rx_buf-&gt;skb = NULL;</div><div class='add'>+		rx_hdr = get_l2_fhdr(data);</div><div class='add'>+		prefetch(rx_hdr);</div><div class='ctx'> </div><div class='ctx'> 		dma_addr = dma_unmap_addr(rx_buf, mapping);</div><div class='ctx'> </div><div class='hunk'>@@ -3150,7 +3143,10 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)</div><div class='ctx'> 			BNX2_RX_OFFSET + BNX2_RX_COPY_THRESH,</div><div class='ctx'> 			PCI_DMA_FROMDEVICE);</div><div class='ctx'> </div><div class='del'>-		rx_hdr = rx_buf-&gt;desc;</div><div class='add'>+		next_rx_buf =</div><div class='add'>+			&amp;rxr-&gt;rx_buf_ring[RX_RING_IDX(NEXT_RX_BD(sw_cons))];</div><div class='add'>+		prefetch(get_l2_fhdr(next_rx_buf-&gt;data));</div><div class='add'>+</div><div class='ctx'> 		len = rx_hdr-&gt;l2_fhdr_pkt_len;</div><div class='ctx'> 		status = rx_hdr-&gt;l2_fhdr_status;</div><div class='ctx'> </div><div class='hunk'>@@ -3169,7 +3165,7 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)</div><div class='ctx'> 				       L2_FHDR_ERRORS_TOO_SHORT |</div><div class='ctx'> 				       L2_FHDR_ERRORS_GIANT_FRAME))) {</div><div class='ctx'> </div><div class='del'>-			bnx2_reuse_rx_skb(bp, rxr, skb, sw_ring_cons,</div><div class='add'>+			bnx2_reuse_rx_data(bp, rxr, data, sw_ring_cons,</div><div class='ctx'> 					  sw_ring_prod);</div><div class='ctx'> 			if (pg_ring_used) {</div><div class='ctx'> 				int pages;</div><div class='hunk'>@@ -3184,30 +3180,29 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)</div><div class='ctx'> 		len -= 4;</div><div class='ctx'> </div><div class='ctx'> 		if (len &lt;= bp-&gt;rx_copy_thresh) {</div><div class='del'>-			struct sk_buff *new_skb;</div><div class='del'>-</div><div class='del'>-			new_skb = netdev_alloc_skb(bp-&gt;dev, len + 6);</div><div class='del'>-			if (new_skb == NULL) {</div><div class='del'>-				bnx2_reuse_rx_skb(bp, rxr, skb, sw_ring_cons,</div><div class='add'>+			skb = netdev_alloc_skb(bp-&gt;dev, len + 6);</div><div class='add'>+			if (skb == NULL) {</div><div class='add'>+				bnx2_reuse_rx_data(bp, rxr, data, sw_ring_cons,</div><div class='ctx'> 						  sw_ring_prod);</div><div class='ctx'> 				goto next_rx;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* aligned copy */</div><div class='del'>-			skb_copy_from_linear_data_offset(skb,</div><div class='del'>-							 BNX2_RX_OFFSET - 6,</div><div class='del'>-				      new_skb-&gt;data, len + 6);</div><div class='del'>-			skb_reserve(new_skb, 6);</div><div class='del'>-			skb_put(new_skb, len);</div><div class='add'>+			memcpy(skb-&gt;data,</div><div class='add'>+			       (u8 *)rx_hdr + BNX2_RX_OFFSET - 6,</div><div class='add'>+			       len + 6);</div><div class='add'>+			skb_reserve(skb, 6);</div><div class='add'>+			skb_put(skb, len);</div><div class='ctx'> </div><div class='del'>-			bnx2_reuse_rx_skb(bp, rxr, skb,</div><div class='add'>+			bnx2_reuse_rx_data(bp, rxr, data,</div><div class='ctx'> 				sw_ring_cons, sw_ring_prod);</div><div class='ctx'> </div><div class='del'>-			skb = new_skb;</div><div class='del'>-		} else if (unlikely(bnx2_rx_skb(bp, rxr, skb, len, hdr_len,</div><div class='del'>-			   dma_addr, (sw_ring_cons &lt;&lt; 16) | sw_ring_prod)))</div><div class='del'>-			goto next_rx;</div><div class='del'>-</div><div class='add'>+		} else {</div><div class='add'>+			skb = bnx2_rx_skb(bp, rxr, data, len, hdr_len, dma_addr,</div><div class='add'>+					  (sw_ring_cons &lt;&lt; 16) | sw_ring_prod);</div><div class='add'>+			if (!skb)</div><div class='add'>+				goto next_rx;</div><div class='add'>+		}</div><div class='ctx'> 		if ((status &amp; L2_FHDR_STATUS_L2_VLAN_TAG) &amp;&amp;</div><div class='ctx'> 		    !(bp-&gt;rx_mode &amp; BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG))</div><div class='ctx'> 			__vlan_hwaccel_put_tag(skb, rx_hdr-&gt;l2_fhdr_vlan_tag);</div><div class='hunk'>@@ -5234,7 +5229,7 @@ bnx2_init_rx_ring(struct bnx2 *bp, int ring_num)</div><div class='ctx'> </div><div class='ctx'> 	ring_prod = prod = rxr-&gt;rx_prod;</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;rx_ring_size; i++) {</div><div class='del'>-		if (bnx2_alloc_rx_skb(bp, rxr, ring_prod, GFP_KERNEL) &lt; 0) {</div><div class='add'>+		if (bnx2_alloc_rx_data(bp, rxr, ring_prod, GFP_KERNEL) &lt; 0) {</div><div class='ctx'> 			netdev_warn(bp-&gt;dev, "init'ed rx ring %d with %d/%d skbs only\n",</div><div class='ctx'> 				    ring_num, i, bp-&gt;rx_ring_size);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -5329,7 +5324,7 @@ bnx2_set_rx_ring_size(struct bnx2 *bp, u32 size)</div><div class='ctx'> 	rx_size = bp-&gt;dev-&gt;mtu + ETH_HLEN + BNX2_RX_OFFSET + 8;</div><div class='ctx'> </div><div class='ctx'> 	rx_space = SKB_DATA_ALIGN(rx_size + BNX2_RX_ALIGN) + NET_SKB_PAD +</div><div class='del'>-		sizeof(struct skb_shared_info);</div><div class='add'>+		SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;rx_copy_thresh = BNX2_RX_COPY_THRESH;</div><div class='ctx'> 	bp-&gt;rx_pg_ring_size = 0;</div><div class='hunk'>@@ -5351,8 +5346,9 @@ bnx2_set_rx_ring_size(struct bnx2 *bp, u32 size)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;rx_buf_use_size = rx_size;</div><div class='del'>-	/* hw alignment */</div><div class='del'>-	bp-&gt;rx_buf_size = bp-&gt;rx_buf_use_size + BNX2_RX_ALIGN;</div><div class='add'>+	/* hw alignment + build_skb() overhead*/</div><div class='add'>+	bp-&gt;rx_buf_size = SKB_DATA_ALIGN(bp-&gt;rx_buf_use_size + BNX2_RX_ALIGN) +</div><div class='add'>+		NET_SKB_PAD + SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='ctx'> 	bp-&gt;rx_jumbo_thresh = rx_size - BNX2_RX_OFFSET;</div><div class='ctx'> 	bp-&gt;rx_ring_size = size;</div><div class='ctx'> 	bp-&gt;rx_max_ring = bnx2_find_max_ring(size, MAX_RX_RINGS);</div><div class='hunk'>@@ -5400,6 +5396,7 @@ bnx2_free_tx_skbs(struct bnx2 *bp)</div><div class='ctx'> 			}</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 		}</div><div class='add'>+		netdev_tx_reset_queue(netdev_get_tx_queue(bp-&gt;dev, i));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5418,9 +5415,9 @@ bnx2_free_rx_skbs(struct bnx2 *bp)</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; bp-&gt;rx_max_ring_idx; j++) {</div><div class='ctx'> 			struct sw_bd *rx_buf = &amp;rxr-&gt;rx_buf_ring[j];</div><div class='del'>-			struct sk_buff *skb = rx_buf-&gt;skb;</div><div class='add'>+			u8 *data = rx_buf-&gt;data;</div><div class='ctx'> </div><div class='del'>-			if (skb == NULL)</div><div class='add'>+			if (data == NULL)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			dma_unmap_single(&amp;bp-&gt;pdev-&gt;dev,</div><div class='hunk'>@@ -5428,9 +5425,9 @@ bnx2_free_rx_skbs(struct bnx2 *bp)</div><div class='ctx'> 					 bp-&gt;rx_buf_use_size,</div><div class='ctx'> 					 PCI_DMA_FROMDEVICE);</div><div class='ctx'> </div><div class='del'>-			rx_buf-&gt;skb = NULL;</div><div class='add'>+			rx_buf-&gt;data = NULL;</div><div class='ctx'> </div><div class='del'>-			dev_kfree_skb(skb);</div><div class='add'>+			kfree(data);</div><div class='ctx'> 		}</div><div class='ctx'> 		for (j = 0; j &lt; bp-&gt;rx_max_pg_ring_idx; j++)</div><div class='ctx'> 			bnx2_free_rx_page(bp, rxr, j);</div><div class='hunk'>@@ -5736,7 +5733,8 @@ static int</div><div class='ctx'> bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int pkt_size, num_pkts, i;</div><div class='del'>-	struct sk_buff *skb, *rx_skb;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 *data;</div><div class='ctx'> 	unsigned char *packet;</div><div class='ctx'> 	u16 rx_start_idx, rx_idx;</div><div class='ctx'> 	dma_addr_t map;</div><div class='hunk'>@@ -5828,14 +5826,14 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rx_buf = &amp;rxr-&gt;rx_buf_ring[rx_start_idx];</div><div class='del'>-	rx_skb = rx_buf-&gt;skb;</div><div class='add'>+	data = rx_buf-&gt;data;</div><div class='ctx'> </div><div class='del'>-	rx_hdr = rx_buf-&gt;desc;</div><div class='del'>-	skb_reserve(rx_skb, BNX2_RX_OFFSET);</div><div class='add'>+	rx_hdr = get_l2_fhdr(data);</div><div class='add'>+	data = (u8 *)rx_hdr + BNX2_RX_OFFSET;</div><div class='ctx'> </div><div class='ctx'> 	dma_sync_single_for_cpu(&amp;bp-&gt;pdev-&gt;dev,</div><div class='ctx'> 		dma_unmap_addr(rx_buf, mapping),</div><div class='del'>-		bp-&gt;rx_buf_size, PCI_DMA_FROMDEVICE);</div><div class='add'>+		bp-&gt;rx_buf_use_size, PCI_DMA_FROMDEVICE);</div><div class='ctx'> </div><div class='ctx'> 	if (rx_hdr-&gt;l2_fhdr_status &amp;</div><div class='ctx'> 		(L2_FHDR_ERRORS_BAD_CRC |</div><div class='hunk'>@@ -5852,7 +5850,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 14; i &lt; pkt_size; i++) {</div><div class='del'>-		if (*(rx_skb-&gt;data + i) != (unsigned char) (i &amp; 0xff)) {</div><div class='add'>+		if (*(data + i) != (unsigned char) (i &amp; 0xff)) {</div><div class='ctx'> 			goto loopback_test_done;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6552,6 +6550,8 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	txbd-&gt;tx_bd_vlan_tag_flags |= TX_BD_FLAGS_END;</div><div class='ctx'> </div><div class='add'>+	netdev_tx_sent_queue(txq, skb-&gt;len);</div><div class='add'>+</div><div class='ctx'> 	prod = NEXT_TX_BD(prod);</div><div class='ctx'> 	txr-&gt;tx_prod_bseq += skb-&gt;len;</div><div class='ctx'> </div><div class='hunk'>@@ -6873,10 +6873,10 @@ bnx2_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_MODULE_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_MODULE_VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(bp-&gt;pdev));</div><div class='del'>-	strcpy(info-&gt;fw_version, bp-&gt;fw_version);</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_MODULE_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(bp-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strlcpy(info-&gt;fw_version, bp-&gt;fw_version, sizeof(info-&gt;fw_version));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define BNX2_REGDUMP_LEN		(32 * 1024)</div><div class='hunk'>@@ -7571,8 +7571,8 @@ bnx2_set_phys_id(struct net_device *dev, enum ethtool_phys_id_state state)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32</div><div class='del'>-bnx2_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static netdev_features_t</div><div class='add'>+bnx2_fix_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -7583,7 +7583,7 @@ bnx2_fix_features(struct net_device *dev, u32 features)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-bnx2_set_features(struct net_device *dev, u32 features)</div><div class='add'>+bnx2_set_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2.h b/drivers/net/ethernet/broadcom/bnx2.h<br/>index 99d31a7d6aaa..1db2d51ba3f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/bnx2.h</a></div><div class='hunk'>@@ -6563,12 +6563,25 @@ struct l2_fhdr {</div><div class='ctx'> #define MB_TX_CID_ADDR	MB_GET_CID_ADDR(TX_CID)</div><div class='ctx'> #define MB_RX_CID_ADDR	MB_GET_CID_ADDR(RX_CID)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This driver uses new build_skb() API :</div><div class='add'>+ * RX ring buffer contains pointer to kmalloc() data only,</div><div class='add'>+ * skb are built only after Hardware filled the frame.</div><div class='add'>+ */</div><div class='ctx'> struct sw_bd {</div><div class='del'>-	struct sk_buff		*skb;</div><div class='del'>-	struct l2_fhdr		*desc;</div><div class='add'>+	u8			*data;</div><div class='ctx'> 	DEFINE_DMA_UNMAP_ADDR(mapping);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Its faster to compute this from data than storing it in sw_bd</div><div class='add'>+ * (less cache misses)</div><div class='add'>+ */</div><div class='add'>+static inline struct l2_fhdr *get_l2_fhdr(u8 *data)</div><div class='add'>+{</div><div class='add'>+	return (struct l2_fhdr *)(PTR_ALIGN(data, BNX2_RX_ALIGN) + NET_SKB_PAD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> struct sw_pg {</div><div class='ctx'> 	struct page		*page;</div><div class='ctx'> 	DEFINE_DMA_UNMAP_ADDR(mapping);</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h<br/>index aec7212ac983..8c73d34b2ff1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/bnx2x/bnx2x.h</a></div><div class='hunk'>@@ -23,8 +23,8 @@</div><div class='ctx'>  * (you will need to reboot afterwards) */</div><div class='ctx'> /* #define BNX2X_STOP_ON_ERROR */</div><div class='ctx'> </div><div class='del'>-#define DRV_MODULE_VERSION      "1.70.30-0"</div><div class='del'>-#define DRV_MODULE_RELDATE      "2011/10/25"</div><div class='add'>+#define DRV_MODULE_VERSION      "1.70.35-0"</div><div class='add'>+#define DRV_MODULE_RELDATE      "2011/11/10"</div><div class='ctx'> #define BNX2X_BC_VER            0x040200</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_DCB)</div><div class='hunk'>@@ -293,8 +293,13 @@ enum {</div><div class='ctx'> #define FCOE_TXQ_IDX(bp)	(MAX_ETH_TXQ_IDX(bp))</div><div class='ctx'> </div><div class='ctx'> /* fast path */</div><div class='add'>+/*</div><div class='add'>+ * This driver uses new build_skb() API :</div><div class='add'>+ * RX ring buffer contains pointer to kmalloc() data only,</div><div class='add'>+ * skb are built only after Hardware filled the frame.</div><div class='add'>+ */</div><div class='ctx'> struct sw_rx_bd {</div><div class='del'>-	struct sk_buff	*skb;</div><div class='add'>+	u8		*data;</div><div class='ctx'> 	DEFINE_DMA_UNMAP_ADDR(mapping);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -411,8 +416,7 @@ union db_prod {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Number of u64 elements in SGE mask array */</div><div class='del'>-#define RX_SGE_MASK_LEN			((NUM_RX_SGE_PAGES * RX_SGE_CNT) / \</div><div class='del'>-					 BIT_VEC64_ELEM_SZ)</div><div class='add'>+#define RX_SGE_MASK_LEN			(NUM_RX_SGE / BIT_VEC64_ELEM_SZ)</div><div class='ctx'> #define RX_SGE_MASK_LEN_MASK		(RX_SGE_MASK_LEN - 1)</div><div class='ctx'> #define NEXT_SGE_MASK_ELEM(el)		(((el) + 1) &amp; RX_SGE_MASK_LEN_MASK)</div><div class='ctx'> </div><div class='hunk'>@@ -425,8 +429,8 @@ union host_hc_status_block {</div><div class='ctx'> </div><div class='ctx'> struct bnx2x_agg_info {</div><div class='ctx'> 	/*</div><div class='del'>-	 * First aggregation buffer is an skb, the following - are pages.</div><div class='del'>-	 * We will preallocate the skbs for each aggregation when</div><div class='add'>+	 * First aggregation buffer is a data buffer, the following - are pages.</div><div class='add'>+	 * We will preallocate the data buffer for each aggregation when</div><div class='ctx'> 	 * we open the interface and will replace the BD at the consumer</div><div class='ctx'> 	 * with this one when we receive the TPA_START CQE in order to</div><div class='ctx'> 	 * keep the Rx BD ring consistent.</div><div class='hunk'>@@ -440,6 +444,7 @@ struct bnx2x_agg_info {</div><div class='ctx'> 	u16			parsing_flags;</div><div class='ctx'> 	u16			vlan_tag;</div><div class='ctx'> 	u16			len_on_bd;</div><div class='add'>+	u32			rxhash;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define Q_STATS_OFFSET32(stat_name) \</div><div class='hunk'>@@ -507,6 +512,7 @@ struct bnx2x_fastpath {</div><div class='ctx'> 	__le16			fp_hc_idx;</div><div class='ctx'> </div><div class='ctx'> 	u8			index;		/* number in fp array */</div><div class='add'>+	u8			rx_queue;	/* index for skb_record */</div><div class='ctx'> 	u8			cl_id;		/* eth client id */</div><div class='ctx'> 	u8			cl_qzone_id;</div><div class='ctx'> 	u8			fw_sb_id;	/* status block number in FW */</div><div class='hunk'>@@ -881,6 +887,8 @@ struct bnx2x_common {</div><div class='ctx'> #define CHIP_PORT_MODE_NONE			0x2</div><div class='ctx'> #define CHIP_MODE(bp)			(bp-&gt;common.chip_port_mode)</div><div class='ctx'> #define CHIP_MODE_IS_4_PORT(bp) (CHIP_MODE(bp) == CHIP_4_PORT_MODE)</div><div class='add'>+</div><div class='add'>+	u32			boot_mode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* IGU MSIX STATISTICS on 57712: 64 for VFs; 4 for PFs; 4 for Attentions */</div><div class='hunk'>@@ -1042,6 +1050,8 @@ struct bnx2x_slowpath {</div><div class='ctx'> </div><div class='ctx'> 	u32				wb_comp;</div><div class='ctx'> 	u32				wb_data[4];</div><div class='add'>+</div><div class='add'>+	union drv_info_to_mcp		drv_info_to_mcp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define bnx2x_sp(bp, var)		(&amp;bp-&gt;slowpath-&gt;var)</div><div class='hunk'>@@ -1122,18 +1132,21 @@ enum {</div><div class='ctx'> enum {</div><div class='ctx'> 	BNX2X_PORT_QUERY_IDX,</div><div class='ctx'> 	BNX2X_PF_QUERY_IDX,</div><div class='add'>+	BNX2X_FCOE_QUERY_IDX,</div><div class='ctx'> 	BNX2X_FIRST_QUEUE_QUERY_IDX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bnx2x_fw_stats_req {</div><div class='ctx'> 	struct stats_query_header hdr;</div><div class='del'>-	struct stats_query_entry query[STATS_QUERY_CMD_COUNT];</div><div class='add'>+	struct stats_query_entry query[FP_SB_MAX_E1x+</div><div class='add'>+		BNX2X_FIRST_QUEUE_QUERY_IDX];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bnx2x_fw_stats_data {</div><div class='ctx'> 	struct stats_counter	storm_counters;</div><div class='ctx'> 	struct per_port_stats	port;</div><div class='ctx'> 	struct per_pf_stats	pf;</div><div class='add'>+	struct fcoe_statistics_params	fcoe;</div><div class='ctx'> 	struct per_queue_stats  queue_stats[1];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1141,6 +1154,7 @@ struct bnx2x_fw_stats_data {</div><div class='ctx'> enum {</div><div class='ctx'> 	BNX2X_SP_RTNL_SETUP_TC,</div><div class='ctx'> 	BNX2X_SP_RTNL_TX_TIMEOUT,</div><div class='add'>+	BNX2X_SP_RTNL_FAN_FAILURE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1186,10 +1200,20 @@ struct bnx2x {</div><div class='ctx'> #define ETH_MAX_JUMBO_PACKET_SIZE	9600</div><div class='ctx'> </div><div class='ctx'> 	/* Max supported alignment is 256 (8 shift) */</div><div class='del'>-#define BNX2X_RX_ALIGN_SHIFT		((L1_CACHE_SHIFT &lt; 8) ? \</div><div class='del'>-					 L1_CACHE_SHIFT : 8)</div><div class='del'>-	/* FW use 2 Cache lines Alignment for start packet and size  */</div><div class='del'>-#define BNX2X_FW_RX_ALIGN		(2 &lt;&lt; BNX2X_RX_ALIGN_SHIFT)</div><div class='add'>+#define BNX2X_RX_ALIGN_SHIFT		min(8, L1_CACHE_SHIFT)</div><div class='add'>+</div><div class='add'>+	/* FW uses 2 Cache lines Alignment for start packet and size</div><div class='add'>+	 *</div><div class='add'>+	 * We assume skb_build() uses sizeof(struct skb_shared_info) bytes</div><div class='add'>+	 * at the end of skb-&gt;data, to avoid wasting a full cache line.</div><div class='add'>+	 * This reduces memory use (skb-&gt;truesize).</div><div class='add'>+	 */</div><div class='add'>+#define BNX2X_FW_RX_ALIGN_START	(1UL &lt;&lt; BNX2X_RX_ALIGN_SHIFT)</div><div class='add'>+</div><div class='add'>+#define BNX2X_FW_RX_ALIGN_END					\</div><div class='add'>+	max(1UL &lt;&lt; BNX2X_RX_ALIGN_SHIFT, 			\</div><div class='add'>+	    SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))</div><div class='add'>+</div><div class='ctx'> #define BNX2X_PXP_DRAM_ALIGN		(BNX2X_RX_ALIGN_SHIFT - 5)</div><div class='ctx'> </div><div class='ctx'> 	struct host_sp_status_block *def_status_blk;</div><div class='hunk'>@@ -1249,6 +1273,7 @@ struct bnx2x {</div><div class='ctx'> #define NO_ISCSI_OOO_FLAG		(1 &lt;&lt; 13)</div><div class='ctx'> #define NO_ISCSI_FLAG			(1 &lt;&lt; 14)</div><div class='ctx'> #define NO_FCOE_FLAG			(1 &lt;&lt; 15)</div><div class='add'>+#define BC_SUPPORTS_PFC_STATS		(1 &lt;&lt; 17)</div><div class='ctx'> </div><div class='ctx'> #define NO_ISCSI(bp)		((bp)-&gt;flags &amp; NO_ISCSI_FLAG)</div><div class='ctx'> #define NO_ISCSI_OOO(bp)	((bp)-&gt;flags &amp; NO_ISCSI_OOO_FLAG)</div><div class='hunk'>@@ -1984,13 +2009,6 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,</div><div class='ctx'> #define HW_PRTY_ASSERT_SET_4 (AEU_INPUTS_ATTN_BITS_PGLUE_PARITY_ERROR | \</div><div class='ctx'> 			      AEU_INPUTS_ATTN_BITS_ATC_PARITY_ERROR)</div><div class='ctx'> </div><div class='del'>-#define RSS_FLAGS(bp) \</div><div class='del'>-		(TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_IPV4_CAPABILITY | \</div><div class='del'>-		 TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_IPV4_TCP_CAPABILITY | \</div><div class='del'>-		 TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_IPV6_CAPABILITY | \</div><div class='del'>-		 TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_IPV6_TCP_CAPABILITY | \</div><div class='del'>-		 (bp-&gt;multi_mode &lt;&lt; \</div><div class='del'>-		  TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_MODE_SHIFT))</div><div class='ctx'> #define MULTI_MASK			0x7f</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2055,6 +2073,8 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,</div><div class='ctx'> #define BNX2X_VPD_LEN			128</div><div class='ctx'> #define VENDOR_ID_LEN			4</div><div class='ctx'> </div><div class='add'>+int bnx2x_close(struct net_device *dev);</div><div class='add'>+</div><div class='ctx'> /* Congestion management fairness mode */</div><div class='ctx'> #define CMNG_FNS_NONE		0</div><div class='ctx'> #define CMNG_FNS_MINMAX		1</div><div class='hunk'>@@ -2072,4 +2092,16 @@ static const u32 dmae_reg_go_c[] = {</div><div class='ctx'> </div><div class='ctx'> void bnx2x_set_ethtool_ops(struct net_device *netdev);</div><div class='ctx'> void bnx2x_notify_link_changed(struct bnx2x *bp);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define BNX2X_MF_PROTOCOL(bp) \</div><div class='add'>+	((bp)-&gt;mf_config[BP_VN(bp)] &amp; FUNC_MF_CFG_PROTOCOL_MASK)</div><div class='add'>+</div><div class='add'>+#ifdef BCM_CNIC</div><div class='add'>+#define BNX2X_IS_MF_PROTOCOL_ISCSI(bp) \</div><div class='add'>+	(BNX2X_MF_PROTOCOL(bp) == FUNC_MF_CFG_PROTOCOL_ISCSI)</div><div class='add'>+</div><div class='add'>+#define IS_MF_ISCSI_SD(bp) (IS_MF_SD(bp) &amp;&amp; BNX2X_IS_MF_PROTOCOL_ISCSI(bp))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* bnx2x.h */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c<br/>index 580b44edb066..2b731b253598 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c</a></div><div class='hunk'>@@ -79,19 +79,21 @@ static inline void bnx2x_bz_fp(struct bnx2x *bp, int index)</div><div class='ctx'>  * @to:		destination FP index</div><div class='ctx'>  *</div><div class='ctx'>  * Makes sure the contents of the bp-&gt;fp[to].napi is kept</div><div class='del'>- * intact.</div><div class='add'>+ * intact. This is done by first copying the napi struct from</div><div class='add'>+ * the target to the source, and then mem copying the entire</div><div class='add'>+ * source onto the target</div><div class='ctx'>  */</div><div class='ctx'> static inline void bnx2x_move_fp(struct bnx2x *bp, int from, int to)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x_fastpath *from_fp = &amp;bp-&gt;fp[from];</div><div class='ctx'> 	struct bnx2x_fastpath *to_fp = &amp;bp-&gt;fp[to];</div><div class='del'>-	struct napi_struct orig_napi = to_fp-&gt;napi;</div><div class='add'>+</div><div class='add'>+	/* Copy the NAPI object as it has been already initialized */</div><div class='add'>+	from_fp-&gt;napi = to_fp-&gt;napi;</div><div class='add'>+</div><div class='ctx'> 	/* Move bnx2x_fastpath contents */</div><div class='ctx'> 	memcpy(to_fp, from_fp, sizeof(*to_fp));</div><div class='ctx'> 	to_fp-&gt;index = to;</div><div class='del'>-</div><div class='del'>-	/* Restore the NAPI object as it has been already initialized */</div><div class='del'>-	to_fp-&gt;napi = orig_napi;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int load_count[2][3] = { {0} }; /* per-path: 0-common, 1-port0, 2-port1 */</div><div class='hunk'>@@ -100,7 +102,8 @@ int load_count[2][3] = { {0} }; /* per-path: 0-common, 1-port0, 2-port1 */</div><div class='ctx'>  * return idx of last bd freed</div><div class='ctx'>  */</div><div class='ctx'> static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata,</div><div class='del'>-			     u16 idx)</div><div class='add'>+			     u16 idx, unsigned int *pkts_compl,</div><div class='add'>+			     unsigned int *bytes_compl)</div><div class='ctx'> {</div><div class='ctx'> 	struct sw_tx_bd *tx_buf = &amp;txdata-&gt;tx_buf_ring[idx];</div><div class='ctx'> 	struct eth_tx_start_bd *tx_start_bd;</div><div class='hunk'>@@ -157,6 +160,10 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata,</div><div class='ctx'> </div><div class='ctx'> 	/* release skb */</div><div class='ctx'> 	WARN_ON(!skb);</div><div class='add'>+	if (skb) {</div><div class='add'>+		(*pkts_compl)++;</div><div class='add'>+		(*bytes_compl) += skb-&gt;len;</div><div class='add'>+	}</div><div class='ctx'> 	dev_kfree_skb_any(skb);</div><div class='ctx'> 	tx_buf-&gt;first_bd = 0;</div><div class='ctx'> 	tx_buf-&gt;skb = NULL;</div><div class='hunk'>@@ -168,6 +175,7 @@ int bnx2x_tx_int(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_queue *txq;</div><div class='ctx'> 	u16 hw_cons, sw_cons, bd_cons = txdata-&gt;tx_bd_cons;</div><div class='add'>+	unsigned int pkts_compl = 0, bytes_compl = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef BNX2X_STOP_ON_ERROR</div><div class='ctx'> 	if (unlikely(bp-&gt;panic))</div><div class='hunk'>@@ -187,10 +195,14 @@ int bnx2x_tx_int(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata)</div><div class='ctx'> 				      " pkt_cons %u\n",</div><div class='ctx'> 		   txdata-&gt;txq_index, hw_cons, sw_cons, pkt_cons);</div><div class='ctx'> </div><div class='del'>-		bd_cons = bnx2x_free_tx_pkt(bp, txdata, pkt_cons);</div><div class='add'>+		bd_cons = bnx2x_free_tx_pkt(bp, txdata, pkt_cons,</div><div class='add'>+		    &amp;pkts_compl, &amp;bytes_compl);</div><div class='add'>+</div><div class='ctx'> 		sw_cons++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netdev_tx_completed_queue(txq, pkts_compl, bytes_compl);</div><div class='add'>+</div><div class='ctx'> 	txdata-&gt;tx_pkt_cons = sw_cons;</div><div class='ctx'> 	txdata-&gt;tx_bd_cons = bd_cons;</div><div class='ctx'> </div><div class='hunk'>@@ -292,8 +304,21 @@ static void bnx2x_update_sge_prod(struct bnx2x_fastpath *fp,</div><div class='ctx'> 	   fp-&gt;last_max_sge, fp-&gt;rx_sge_prod);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Set Toeplitz hash value in the skb using the value from the</div><div class='add'>+ * CQE (calculated by HW).</div><div class='add'>+ */</div><div class='add'>+static u32 bnx2x_get_rxhash(const struct bnx2x *bp,</div><div class='add'>+			    const struct eth_fast_path_rx_cqe *cqe)</div><div class='add'>+{</div><div class='add'>+	/* Set Toeplitz hash from CQE */</div><div class='add'>+	if ((bp-&gt;dev-&gt;features &amp; NETIF_F_RXHASH) &amp;&amp;</div><div class='add'>+	    (cqe-&gt;status_flags &amp; ETH_FAST_PATH_RX_CQE_RSS_HASH_FLG))</div><div class='add'>+		return le32_to_cpu(cqe-&gt;rss_hash_result);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,</div><div class='del'>-			    struct sk_buff *skb, u16 cons, u16 prod,</div><div class='add'>+			    u16 cons, u16 prod,</div><div class='ctx'> 			    struct eth_fast_path_rx_cqe *cqe)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = fp-&gt;bp;</div><div class='hunk'>@@ -308,9 +333,9 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,</div><div class='ctx'> 	if (tpa_info-&gt;tpa_state != BNX2X_TPA_STOP)</div><div class='ctx'> 		BNX2X_ERR("start of bin not in stop [%d]\n", queue);</div><div class='ctx'> </div><div class='del'>-	/* Try to map an empty skb from the aggregation info  */</div><div class='add'>+	/* Try to map an empty data buffer from the aggregation info  */</div><div class='ctx'> 	mapping = dma_map_single(&amp;bp-&gt;pdev-&gt;dev,</div><div class='del'>-				 first_buf-&gt;skb-&gt;data,</div><div class='add'>+				 first_buf-&gt;data + NET_SKB_PAD,</div><div class='ctx'> 				 fp-&gt;rx_buf_size, DMA_FROM_DEVICE);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  ...if it fails - move the skb from the consumer to the producer</div><div class='hunk'>@@ -320,15 +345,15 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(dma_mapping_error(&amp;bp-&gt;pdev-&gt;dev, mapping))) {</div><div class='ctx'> 		/* Move the BD from the consumer to the producer */</div><div class='del'>-		bnx2x_reuse_rx_skb(fp, cons, prod);</div><div class='add'>+		bnx2x_reuse_rx_data(fp, cons, prod);</div><div class='ctx'> 		tpa_info-&gt;tpa_state = BNX2X_TPA_ERROR;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* move empty skb from pool to prod */</div><div class='del'>-	prod_rx_buf-&gt;skb = first_buf-&gt;skb;</div><div class='add'>+	/* move empty data from pool to prod */</div><div class='add'>+	prod_rx_buf-&gt;data = first_buf-&gt;data;</div><div class='ctx'> 	dma_unmap_addr_set(prod_rx_buf, mapping, mapping);</div><div class='del'>-	/* point prod_bd to new skb */</div><div class='add'>+	/* point prod_bd to new data */</div><div class='ctx'> 	prod_bd-&gt;addr_hi = cpu_to_le32(U64_HI(mapping));</div><div class='ctx'> 	prod_bd-&gt;addr_lo = cpu_to_le32(U64_LO(mapping));</div><div class='ctx'> </div><div class='hunk'>@@ -342,6 +367,7 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,</div><div class='ctx'> 	tpa_info-&gt;tpa_state = BNX2X_TPA_START;</div><div class='ctx'> 	tpa_info-&gt;len_on_bd = le16_to_cpu(cqe-&gt;len_on_bd);</div><div class='ctx'> 	tpa_info-&gt;placement_offset = cqe-&gt;placement_offset;</div><div class='add'>+	tpa_info-&gt;rxhash = bnx2x_get_rxhash(bp, cqe);</div><div class='ctx'> </div><div class='ctx'> #ifdef BNX2X_STOP_ON_ERROR</div><div class='ctx'> 	fp-&gt;tpa_queue_used |= (1 &lt;&lt; queue);</div><div class='hunk'>@@ -469,11 +495,12 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x_agg_info *tpa_info = &amp;fp-&gt;tpa_info[queue];</div><div class='ctx'> 	struct sw_rx_bd *rx_buf = &amp;tpa_info-&gt;first_buf;</div><div class='del'>-	u8 pad = tpa_info-&gt;placement_offset;</div><div class='add'>+	u32 pad = tpa_info-&gt;placement_offset;</div><div class='ctx'> 	u16 len = tpa_info-&gt;len_on_bd;</div><div class='del'>-	struct sk_buff *skb = rx_buf-&gt;skb;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	u8 *data = rx_buf-&gt;data;</div><div class='ctx'> 	/* alloc new skb */</div><div class='del'>-	struct sk_buff *new_skb;</div><div class='add'>+	u8 *new_data;</div><div class='ctx'> 	u8 old_tpa_state = tpa_info-&gt;tpa_state;</div><div class='ctx'> </div><div class='ctx'> 	tpa_info-&gt;tpa_state = BNX2X_TPA_STOP;</div><div class='hunk'>@@ -484,18 +511,18 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,</div><div class='ctx'> 	if (old_tpa_state == BNX2X_TPA_ERROR)</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='del'>-	/* Try to allocate the new skb */</div><div class='del'>-	new_skb = netdev_alloc_skb(bp-&gt;dev, fp-&gt;rx_buf_size);</div><div class='add'>+	/* Try to allocate the new data */</div><div class='add'>+	new_data = kmalloc(fp-&gt;rx_buf_size + NET_SKB_PAD, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 	/* Unmap skb in the pool anyway, as we are going to change</div><div class='ctx'> 	   pool entry status to BNX2X_TPA_STOP even if new skb allocation</div><div class='ctx'> 	   fails. */</div><div class='ctx'> 	dma_unmap_single(&amp;bp-&gt;pdev-&gt;dev, dma_unmap_addr(rx_buf, mapping),</div><div class='ctx'> 			 fp-&gt;rx_buf_size, DMA_FROM_DEVICE);</div><div class='add'>+	if (likely(new_data))</div><div class='add'>+		skb = build_skb(data);</div><div class='ctx'> </div><div class='del'>-	if (likely(new_skb)) {</div><div class='del'>-		prefetch(skb);</div><div class='del'>-		prefetch(((char *)(skb)) + L1_CACHE_BYTES);</div><div class='add'>+	if (likely(skb)) {</div><div class='ctx'> </div><div class='ctx'> #ifdef BNX2X_STOP_ON_ERROR</div><div class='ctx'> 		if (pad + len &gt; fp-&gt;rx_buf_size) {</div><div class='hunk'>@@ -507,8 +534,9 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-		skb_reserve(skb, pad);</div><div class='add'>+		skb_reserve(skb, pad + NET_SKB_PAD);</div><div class='ctx'> 		skb_put(skb, len);</div><div class='add'>+		skb-&gt;rxhash = tpa_info-&gt;rxhash;</div><div class='ctx'> </div><div class='ctx'> 		skb-&gt;protocol = eth_type_trans(skb, bp-&gt;dev);</div><div class='ctx'> 		skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='hunk'>@@ -524,8 +552,8 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-		/* put new skb in bin */</div><div class='del'>-		rx_buf-&gt;skb = new_skb;</div><div class='add'>+		/* put new data in bin */</div><div class='add'>+		rx_buf-&gt;data = new_data;</div><div class='ctx'> </div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -537,19 +565,6 @@ drop:</div><div class='ctx'> 	fp-&gt;eth_q_stats.rx_skb_alloc_failed++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Set Toeplitz hash value in the skb using the value from the</div><div class='del'>- * CQE (calculated by HW).</div><div class='del'>- */</div><div class='del'>-static inline void bnx2x_set_skb_rxhash(struct bnx2x *bp, union eth_rx_cqe *cqe,</div><div class='del'>-					struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	/* Set Toeplitz hash from CQE */</div><div class='del'>-	if ((bp-&gt;dev-&gt;features &amp; NETIF_F_RXHASH) &amp;&amp;</div><div class='del'>-	    (cqe-&gt;fast_path_cqe.status_flags &amp;</div><div class='del'>-	     ETH_FAST_PATH_RX_CQE_RSS_HASH_FLG))</div><div class='del'>-		skb-&gt;rxhash =</div><div class='del'>-		le32_to_cpu(cqe-&gt;fast_path_cqe.rss_hash_result);</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)</div><div class='ctx'> {</div><div class='hunk'>@@ -592,6 +607,7 @@ int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)</div><div class='ctx'> 		u8 cqe_fp_flags;</div><div class='ctx'> 		enum eth_rx_cqe_type cqe_fp_type;</div><div class='ctx'> 		u16 len, pad;</div><div class='add'>+		u8 *data;</div><div class='ctx'> </div><div class='ctx'> #ifdef BNX2X_STOP_ON_ERROR</div><div class='ctx'> 		if (unlikely(bp-&gt;panic))</div><div class='hunk'>@@ -602,13 +618,6 @@ int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)</div><div class='ctx'> 		bd_prod = RX_BD(bd_prod);</div><div class='ctx'> 		bd_cons = RX_BD(bd_cons);</div><div class='ctx'> </div><div class='del'>-		/* Prefetch the page containing the BD descriptor</div><div class='del'>-		   at producer's index. It will be needed when new skb is</div><div class='del'>-		   allocated */</div><div class='del'>-		prefetch((void *)(PAGE_ALIGN((unsigned long)</div><div class='del'>-					     (&amp;fp-&gt;rx_desc_ring[bd_prod])) -</div><div class='del'>-				  PAGE_SIZE + 1));</div><div class='del'>-</div><div class='ctx'> 		cqe = &amp;fp-&gt;rx_comp_ring[comp_ring_cons];</div><div class='ctx'> 		cqe_fp = &amp;cqe-&gt;fast_path_cqe;</div><div class='ctx'> 		cqe_fp_flags = cqe_fp-&gt;type_error_flags;</div><div class='hunk'>@@ -624,138 +633,123 @@ int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)</div><div class='ctx'> 		if (unlikely(CQE_TYPE_SLOW(cqe_fp_type))) {</div><div class='ctx'> 			bnx2x_sp_event(fp, cqe);</div><div class='ctx'> 			goto next_cqe;</div><div class='add'>+		}</div><div class='add'>+		rx_buf = &amp;fp-&gt;rx_buf_ring[bd_cons];</div><div class='add'>+		data = rx_buf-&gt;data;</div><div class='ctx'> </div><div class='del'>-		/* this is an rx packet */</div><div class='del'>-		} else {</div><div class='del'>-			rx_buf = &amp;fp-&gt;rx_buf_ring[bd_cons];</div><div class='del'>-			skb = rx_buf-&gt;skb;</div><div class='del'>-			prefetch(skb);</div><div class='del'>-</div><div class='del'>-			if (!CQE_TYPE_FAST(cqe_fp_type)) {</div><div class='add'>+		if (!CQE_TYPE_FAST(cqe_fp_type)) {</div><div class='ctx'> #ifdef BNX2X_STOP_ON_ERROR</div><div class='del'>-				/* sanity check */</div><div class='del'>-				if (fp-&gt;disable_tpa &amp;&amp;</div><div class='del'>-				    (CQE_TYPE_START(cqe_fp_type) ||</div><div class='del'>-				     CQE_TYPE_STOP(cqe_fp_type)))</div><div class='del'>-					BNX2X_ERR("START/STOP packet while "</div><div class='del'>-						  "disable_tpa type %x\n",</div><div class='del'>-						  CQE_TYPE(cqe_fp_type));</div><div class='add'>+			/* sanity check */</div><div class='add'>+			if (fp-&gt;disable_tpa &amp;&amp;</div><div class='add'>+			    (CQE_TYPE_START(cqe_fp_type) ||</div><div class='add'>+			     CQE_TYPE_STOP(cqe_fp_type)))</div><div class='add'>+				BNX2X_ERR("START/STOP packet while "</div><div class='add'>+					  "disable_tpa type %x\n",</div><div class='add'>+					  CQE_TYPE(cqe_fp_type));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-				if (CQE_TYPE_START(cqe_fp_type)) {</div><div class='del'>-					u16 queue = cqe_fp-&gt;queue_index;</div><div class='del'>-					DP(NETIF_MSG_RX_STATUS,</div><div class='del'>-					   "calling tpa_start on queue %d\n",</div><div class='del'>-					   queue);</div><div class='add'>+			if (CQE_TYPE_START(cqe_fp_type)) {</div><div class='add'>+				u16 queue = cqe_fp-&gt;queue_index;</div><div class='add'>+				DP(NETIF_MSG_RX_STATUS,</div><div class='add'>+				   "calling tpa_start on queue %d\n",</div><div class='add'>+				   queue);</div><div class='ctx'> </div><div class='del'>-					bnx2x_tpa_start(fp, queue, skb,</div><div class='del'>-							bd_cons, bd_prod,</div><div class='del'>-							cqe_fp);</div><div class='del'>-</div><div class='del'>-					/* Set Toeplitz hash for LRO skb */</div><div class='del'>-					bnx2x_set_skb_rxhash(bp, cqe, skb);</div><div class='del'>-</div><div class='del'>-					goto next_rx;</div><div class='del'>-</div><div class='del'>-				} else {</div><div class='del'>-					u16 queue =</div><div class='del'>-						cqe-&gt;end_agg_cqe.queue_index;</div><div class='del'>-					DP(NETIF_MSG_RX_STATUS,</div><div class='del'>-					   "calling tpa_stop on queue %d\n",</div><div class='del'>-					   queue);</div><div class='del'>-</div><div class='del'>-					bnx2x_tpa_stop(bp, fp, queue,</div><div class='del'>-						       &amp;cqe-&gt;end_agg_cqe,</div><div class='del'>-						       comp_ring_cons);</div><div class='add'>+				bnx2x_tpa_start(fp, queue,</div><div class='add'>+						bd_cons, bd_prod,</div><div class='add'>+						cqe_fp);</div><div class='add'>+				goto next_rx;</div><div class='add'>+			} else {</div><div class='add'>+				u16 queue =</div><div class='add'>+					cqe-&gt;end_agg_cqe.queue_index;</div><div class='add'>+				DP(NETIF_MSG_RX_STATUS,</div><div class='add'>+				   "calling tpa_stop on queue %d\n",</div><div class='add'>+				   queue);</div><div class='add'>+</div><div class='add'>+				bnx2x_tpa_stop(bp, fp, queue,</div><div class='add'>+					       &amp;cqe-&gt;end_agg_cqe,</div><div class='add'>+					       comp_ring_cons);</div><div class='ctx'> #ifdef BNX2X_STOP_ON_ERROR</div><div class='del'>-					if (bp-&gt;panic)</div><div class='del'>-						return 0;</div><div class='add'>+				if (bp-&gt;panic)</div><div class='add'>+					return 0;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-					bnx2x_update_sge_prod(fp, cqe_fp);</div><div class='del'>-					goto next_cqe;</div><div class='del'>-				}</div><div class='add'>+				bnx2x_update_sge_prod(fp, cqe_fp);</div><div class='add'>+				goto next_cqe;</div><div class='ctx'> 			}</div><div class='del'>-			/* non TPA */</div><div class='del'>-			len = le16_to_cpu(cqe_fp-&gt;pkt_len);</div><div class='del'>-			pad = cqe_fp-&gt;placement_offset;</div><div class='del'>-			dma_sync_single_for_cpu(&amp;bp-&gt;pdev-&gt;dev,</div><div class='add'>+		}</div><div class='add'>+		/* non TPA */</div><div class='add'>+		len = le16_to_cpu(cqe_fp-&gt;pkt_len);</div><div class='add'>+		pad = cqe_fp-&gt;placement_offset;</div><div class='add'>+		dma_sync_single_for_cpu(&amp;bp-&gt;pdev-&gt;dev,</div><div class='ctx'> 					dma_unmap_addr(rx_buf, mapping),</div><div class='del'>-						       pad + RX_COPY_THRESH,</div><div class='del'>-						       DMA_FROM_DEVICE);</div><div class='del'>-			prefetch(((char *)(skb)) + L1_CACHE_BYTES);</div><div class='add'>+					pad + RX_COPY_THRESH,</div><div class='add'>+					DMA_FROM_DEVICE);</div><div class='add'>+		pad += NET_SKB_PAD;</div><div class='add'>+		prefetch(data + pad); /* speedup eth_type_trans() */</div><div class='add'>+		/* is this an error packet? */</div><div class='add'>+		if (unlikely(cqe_fp_flags &amp; ETH_RX_ERROR_FALGS)) {</div><div class='add'>+			DP(NETIF_MSG_RX_ERR,</div><div class='add'>+			   "ERROR  flags %x  rx packet %u\n",</div><div class='add'>+			   cqe_fp_flags, sw_comp_cons);</div><div class='add'>+			fp-&gt;eth_q_stats.rx_err_discard_pkt++;</div><div class='add'>+			goto reuse_rx;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			/* is this an error packet? */</div><div class='del'>-			if (unlikely(cqe_fp_flags &amp; ETH_RX_ERROR_FALGS)) {</div><div class='add'>+		/* Since we don't have a jumbo ring</div><div class='add'>+		 * copy small packets if mtu &gt; 1500</div><div class='add'>+		 */</div><div class='add'>+		if ((bp-&gt;dev-&gt;mtu &gt; ETH_MAX_PACKET_SIZE) &amp;&amp;</div><div class='add'>+		    (len &lt;= RX_COPY_THRESH)) {</div><div class='add'>+			skb = netdev_alloc_skb_ip_align(bp-&gt;dev, len);</div><div class='add'>+			if (skb == NULL) {</div><div class='ctx'> 				DP(NETIF_MSG_RX_ERR,</div><div class='del'>-				   "ERROR  flags %x  rx packet %u\n",</div><div class='del'>-				   cqe_fp_flags, sw_comp_cons);</div><div class='del'>-				fp-&gt;eth_q_stats.rx_err_discard_pkt++;</div><div class='add'>+				   "ERROR  packet dropped because of alloc failure\n");</div><div class='add'>+				fp-&gt;eth_q_stats.rx_skb_alloc_failed++;</div><div class='ctx'> 				goto reuse_rx;</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='del'>-			/* Since we don't have a jumbo ring</div><div class='del'>-			 * copy small packets if mtu &gt; 1500</div><div class='del'>-			 */</div><div class='del'>-			if ((bp-&gt;dev-&gt;mtu &gt; ETH_MAX_PACKET_SIZE) &amp;&amp;</div><div class='del'>-			    (len &lt;= RX_COPY_THRESH)) {</div><div class='del'>-				struct sk_buff *new_skb;</div><div class='del'>-</div><div class='del'>-				new_skb = netdev_alloc_skb(bp-&gt;dev, len + pad);</div><div class='del'>-				if (new_skb == NULL) {</div><div class='del'>-					DP(NETIF_MSG_RX_ERR,</div><div class='del'>-					   "ERROR  packet dropped "</div><div class='del'>-					   "because of alloc failure\n");</div><div class='del'>-					fp-&gt;eth_q_stats.rx_skb_alloc_failed++;</div><div class='del'>-					goto reuse_rx;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				/* aligned copy */</div><div class='del'>-				skb_copy_from_linear_data_offset(skb, pad,</div><div class='del'>-						    new_skb-&gt;data + pad, len);</div><div class='del'>-				skb_reserve(new_skb, pad);</div><div class='del'>-				skb_put(new_skb, len);</div><div class='del'>-</div><div class='del'>-				bnx2x_reuse_rx_skb(fp, bd_cons, bd_prod);</div><div class='del'>-</div><div class='del'>-				skb = new_skb;</div><div class='del'>-</div><div class='del'>-			} else</div><div class='del'>-			if (likely(bnx2x_alloc_rx_skb(bp, fp, bd_prod) == 0)) {</div><div class='add'>+			memcpy(skb-&gt;data, data + pad, len);</div><div class='add'>+			bnx2x_reuse_rx_data(fp, bd_cons, bd_prod);</div><div class='add'>+		} else {</div><div class='add'>+			if (likely(bnx2x_alloc_rx_data(bp, fp, bd_prod) == 0)) {</div><div class='ctx'> 				dma_unmap_single(&amp;bp-&gt;pdev-&gt;dev,</div><div class='del'>-					dma_unmap_addr(rx_buf, mapping),</div><div class='add'>+						 dma_unmap_addr(rx_buf, mapping),</div><div class='ctx'> 						 fp-&gt;rx_buf_size,</div><div class='ctx'> 						 DMA_FROM_DEVICE);</div><div class='add'>+				skb = build_skb(data);</div><div class='add'>+				if (unlikely(!skb)) {</div><div class='add'>+					kfree(data);</div><div class='add'>+					fp-&gt;eth_q_stats.rx_skb_alloc_failed++;</div><div class='add'>+					goto next_rx;</div><div class='add'>+				}</div><div class='ctx'> 				skb_reserve(skb, pad);</div><div class='del'>-				skb_put(skb, len);</div><div class='del'>-</div><div class='ctx'> 			} else {</div><div class='ctx'> 				DP(NETIF_MSG_RX_ERR,</div><div class='ctx'> 				   "ERROR  packet dropped because "</div><div class='ctx'> 				   "of alloc failure\n");</div><div class='ctx'> 				fp-&gt;eth_q_stats.rx_skb_alloc_failed++;</div><div class='ctx'> reuse_rx:</div><div class='del'>-				bnx2x_reuse_rx_skb(fp, bd_cons, bd_prod);</div><div class='add'>+				bnx2x_reuse_rx_data(fp, bd_cons, bd_prod);</div><div class='ctx'> 				goto next_rx;</div><div class='ctx'> 			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			skb-&gt;protocol = eth_type_trans(skb, bp-&gt;dev);</div><div class='add'>+		skb_put(skb, len);</div><div class='add'>+		skb-&gt;protocol = eth_type_trans(skb, bp-&gt;dev);</div><div class='ctx'> </div><div class='del'>-			/* Set Toeplitz hash for a none-LRO skb */</div><div class='del'>-			bnx2x_set_skb_rxhash(bp, cqe, skb);</div><div class='add'>+		/* Set Toeplitz hash for a none-LRO skb */</div><div class='add'>+		skb-&gt;rxhash = bnx2x_get_rxhash(bp, cqe_fp);</div><div class='ctx'> </div><div class='del'>-			skb_checksum_none_assert(skb);</div><div class='add'>+		skb_checksum_none_assert(skb);</div><div class='ctx'> </div><div class='del'>-			if (bp-&gt;dev-&gt;features &amp; NETIF_F_RXCSUM) {</div><div class='add'>+		if (bp-&gt;dev-&gt;features &amp; NETIF_F_RXCSUM) {</div><div class='ctx'> </div><div class='del'>-				if (likely(BNX2X_RX_CSUM_OK(cqe)))</div><div class='del'>-					skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-				else</div><div class='del'>-					fp-&gt;eth_q_stats.hw_csum_err++;</div><div class='del'>-			}</div><div class='add'>+			if (likely(BNX2X_RX_CSUM_OK(cqe)))</div><div class='add'>+				skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+			else</div><div class='add'>+				fp-&gt;eth_q_stats.hw_csum_err++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		skb_record_rx_queue(skb, fp-&gt;index);</div><div class='add'>+		skb_record_rx_queue(skb, fp-&gt;rx_queue);</div><div class='ctx'> </div><div class='ctx'> 		if (le16_to_cpu(cqe_fp-&gt;pars_flags.flags) &amp;</div><div class='ctx'> 		    PARSING_FLAGS_VLAN)</div><div class='hunk'>@@ -765,7 +759,7 @@ reuse_rx:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> next_rx:</div><div class='del'>-		rx_buf-&gt;skb = NULL;</div><div class='add'>+		rx_buf-&gt;data = NULL;</div><div class='ctx'> </div><div class='ctx'> 		bd_cons = NEXT_RX_IDX(bd_cons);</div><div class='ctx'> 		bd_prod = NEXT_RX_IDX(bd_prod);</div><div class='hunk'>@@ -1011,9 +1005,9 @@ void bnx2x_init_rx_rings(struct bnx2x *bp)</div><div class='ctx'> 				struct sw_rx_bd *first_buf =</div><div class='ctx'> 					&amp;tpa_info-&gt;first_buf;</div><div class='ctx'> </div><div class='del'>-				first_buf-&gt;skb = netdev_alloc_skb(bp-&gt;dev,</div><div class='del'>-						       fp-&gt;rx_buf_size);</div><div class='del'>-				if (!first_buf-&gt;skb) {</div><div class='add'>+				first_buf-&gt;data = kmalloc(fp-&gt;rx_buf_size + NET_SKB_PAD,</div><div class='add'>+							  GFP_ATOMIC);</div><div class='add'>+				if (!first_buf-&gt;data) {</div><div class='ctx'> 					BNX2X_ERR("Failed to allocate TPA "</div><div class='ctx'> 						  "skb pool for queue[%d] - "</div><div class='ctx'> 						  "disabling TPA on this "</div><div class='hunk'>@@ -1093,16 +1087,18 @@ static void bnx2x_free_tx_skbs(struct bnx2x *bp)</div><div class='ctx'> 		struct bnx2x_fastpath *fp = &amp;bp-&gt;fp[i];</div><div class='ctx'> 		for_each_cos_in_tx_queue(fp, cos) {</div><div class='ctx'> 			struct bnx2x_fp_txdata *txdata = &amp;fp-&gt;txdata[cos];</div><div class='add'>+			unsigned pkts_compl = 0, bytes_compl = 0;</div><div class='ctx'> </div><div class='del'>-			u16 bd_cons = txdata-&gt;tx_bd_cons;</div><div class='ctx'> 			u16 sw_prod = txdata-&gt;tx_pkt_prod;</div><div class='ctx'> 			u16 sw_cons = txdata-&gt;tx_pkt_cons;</div><div class='ctx'> </div><div class='ctx'> 			while (sw_cons != sw_prod) {</div><div class='del'>-				bd_cons = bnx2x_free_tx_pkt(bp, txdata,</div><div class='del'>-							    TX_BD(sw_cons));</div><div class='add'>+				bnx2x_free_tx_pkt(bp, txdata, TX_BD(sw_cons),</div><div class='add'>+				    &amp;pkts_compl, &amp;bytes_compl);</div><div class='ctx'> 				sw_cons++;</div><div class='ctx'> 			}</div><div class='add'>+			netdev_tx_reset_queue(</div><div class='add'>+			    netdev_get_tx_queue(bp-&gt;dev, txdata-&gt;txq_index));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1118,16 +1114,16 @@ static void bnx2x_free_rx_bds(struct bnx2x_fastpath *fp)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NUM_RX_BD; i++) {</div><div class='ctx'> 		struct sw_rx_bd *rx_buf = &amp;fp-&gt;rx_buf_ring[i];</div><div class='del'>-		struct sk_buff *skb = rx_buf-&gt;skb;</div><div class='add'>+		u8 *data = rx_buf-&gt;data;</div><div class='ctx'> </div><div class='del'>-		if (skb == NULL)</div><div class='add'>+		if (data == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		dma_unmap_single(&amp;bp-&gt;pdev-&gt;dev,</div><div class='ctx'> 				 dma_unmap_addr(rx_buf, mapping),</div><div class='ctx'> 				 fp-&gt;rx_buf_size, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='del'>-		rx_buf-&gt;skb = NULL;</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='add'>+		rx_buf-&gt;data = NULL;</div><div class='add'>+		kfree(data);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1445,6 +1441,11 @@ void bnx2x_set_num_queues(struct bnx2x *bp)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef BCM_CNIC</div><div class='add'>+	/* override in ISCSI SD mod */</div><div class='add'>+	if (IS_MF_ISCSI_SD(bp))</div><div class='add'>+		bp-&gt;num_queues = 1;</div><div class='add'>+#endif</div><div class='ctx'> 	/* Add special queues */</div><div class='ctx'> 	bp-&gt;num_queues += NON_ETH_CONTEXT_USE;</div><div class='ctx'> }</div><div class='hunk'>@@ -1509,6 +1510,7 @@ static inline void bnx2x_set_rx_buf_size(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> 	for_each_queue(bp, i) {</div><div class='ctx'> 		struct bnx2x_fastpath *fp = &amp;bp-&gt;fp[i];</div><div class='add'>+		u32 mtu;</div><div class='ctx'> </div><div class='ctx'> 		/* Always use a mini-jumbo MTU for the FCoE L2 ring */</div><div class='ctx'> 		if (IS_FCOE_IDX(i))</div><div class='hunk'>@@ -1518,13 +1520,15 @@ static inline void bnx2x_set_rx_buf_size(struct bnx2x *bp)</div><div class='ctx'> 			 * IP_HEADER_ALIGNMENT_PADDING to prevent a buffer</div><div class='ctx'> 			 * overrun attack.</div><div class='ctx'> 			 */</div><div class='del'>-			fp-&gt;rx_buf_size =</div><div class='del'>-				BNX2X_FCOE_MINI_JUMBO_MTU + ETH_OVREHEAD +</div><div class='del'>-				BNX2X_FW_RX_ALIGN + IP_HEADER_ALIGNMENT_PADDING;</div><div class='add'>+			mtu = BNX2X_FCOE_MINI_JUMBO_MTU;</div><div class='ctx'> 		else</div><div class='del'>-			fp-&gt;rx_buf_size =</div><div class='del'>-				bp-&gt;dev-&gt;mtu + ETH_OVREHEAD +</div><div class='del'>-				BNX2X_FW_RX_ALIGN + IP_HEADER_ALIGNMENT_PADDING;</div><div class='add'>+			mtu = bp-&gt;dev-&gt;mtu;</div><div class='add'>+		fp-&gt;rx_buf_size = BNX2X_FW_RX_ALIGN_START +</div><div class='add'>+				  IP_HEADER_ALIGNMENT_PADDING +</div><div class='add'>+				  ETH_OVREHEAD +</div><div class='add'>+				  mtu +</div><div class='add'>+				  BNX2X_FW_RX_ALIGN_END;</div><div class='add'>+		/* Note : rx_buf_size doesnt take into account NET_SKB_PAD */</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1541,7 +1545,8 @@ static inline int bnx2x_init_rss_pf(struct bnx2x *bp)</div><div class='ctx'> 	if (bp-&gt;multi_mode != ETH_RSS_MODE_DISABLED) {</div><div class='ctx'> 		for (i = 0; i &lt; sizeof(ind_table); i++)</div><div class='ctx'> 			ind_table[i] =</div><div class='del'>-				bp-&gt;fp-&gt;cl_id +	(i % num_eth_queues);</div><div class='add'>+				bp-&gt;fp-&gt;cl_id +</div><div class='add'>+				ethtool_rxfh_indir_default(i, num_eth_queues);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1929,13 +1934,17 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!bp-&gt;port.pmf)</div><div class='add'>+	if (bp-&gt;port.pmf)</div><div class='add'>+		bnx2x_update_drv_flags(bp, DRV_FLAGS_DCB_CONFIGURED, 0);</div><div class='add'>+	else</div><div class='ctx'> 		bnx2x__link_status_update(bp);</div><div class='ctx'> </div><div class='ctx'> 	/* start the timer */</div><div class='ctx'> 	mod_timer(&amp;bp-&gt;timer, jiffies + bp-&gt;current_interval);</div><div class='ctx'> </div><div class='ctx'> #ifdef BCM_CNIC</div><div class='add'>+	/* re-read iscsi info */</div><div class='add'>+	bnx2x_get_iscsi_info(bp);</div><div class='ctx'> 	bnx2x_setup_cnic_irq_info(bp);</div><div class='ctx'> 	if (bp-&gt;state == BNX2X_STATE_OPEN)</div><div class='ctx'> 		bnx2x_cnic_notify(bp, CNIC_CTL_START_CMD);</div><div class='hunk'>@@ -2799,6 +2808,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		mapping = skb_frag_dma_map(&amp;bp-&gt;pdev-&gt;dev, frag, 0,</div><div class='ctx'> 					   skb_frag_size(frag), DMA_TO_DEVICE);</div><div class='ctx'> 		if (unlikely(dma_mapping_error(&amp;bp-&gt;pdev-&gt;dev, mapping))) {</div><div class='add'>+			unsigned int pkts_compl = 0, bytes_compl = 0;</div><div class='ctx'> </div><div class='ctx'> 			DP(NETIF_MSG_TX_QUEUED, "Unable to map page - "</div><div class='ctx'> 						"dropping packet...\n");</div><div class='hunk'>@@ -2810,7 +2820,8 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			 */</div><div class='ctx'> 			first_bd-&gt;nbd = cpu_to_le16(nbd);</div><div class='ctx'> 			bnx2x_free_tx_pkt(bp, txdata,</div><div class='del'>-					  TX_BD(txdata-&gt;tx_pkt_prod));</div><div class='add'>+					  TX_BD(txdata-&gt;tx_pkt_prod),</div><div class='add'>+					  &amp;pkts_compl, &amp;bytes_compl);</div><div class='ctx'> 			return NETDEV_TX_OK;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2871,6 +2882,8 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		   pbd_e2-&gt;parsing_data);</div><div class='ctx'> 	DP(NETIF_MSG_TX_QUEUED, "doorbell: nbd %d  bd %u\n", nbd, bd_prod);</div><div class='ctx'> </div><div class='add'>+	netdev_tx_sent_queue(txq, skb-&gt;len);</div><div class='add'>+</div><div class='ctx'> 	txdata-&gt;tx_pkt_prod++;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make sure that the BD data is updated before updating the producer</div><div class='hunk'>@@ -2981,9 +2994,14 @@ int bnx2x_change_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	if (!is_valid_ether_addr((u8 *)(addr-&gt;sa_data)))</div><div class='add'>+	if (!bnx2x_is_valid_ether_addr(bp, addr-&gt;sa_data))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+#ifdef BCM_CNIC</div><div class='add'>+	if (IS_MF_ISCSI_SD(bp) &amp;&amp; !is_zero_ether_addr(addr-&gt;sa_data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (netif_running(dev))  {</div><div class='ctx'> 		rc = bnx2x_set_eth_mac(bp, false);</div><div class='ctx'> 		if (rc)</div><div class='hunk'>@@ -3098,7 +3116,12 @@ static int bnx2x_alloc_fp_mem_at(struct bnx2x *bp, int index)</div><div class='ctx'> 	u8 cos;</div><div class='ctx'> 	int rx_ring_size = 0;</div><div class='ctx'> </div><div class='del'>-	/* if rx_ring_size specified - use it */</div><div class='add'>+#ifdef BCM_CNIC</div><div class='add'>+	if (IS_MF_ISCSI_SD(bp)) {</div><div class='add'>+		rx_ring_size = MIN_RX_SIZE_NONTPA;</div><div class='add'>+		bp-&gt;rx_ring_size = rx_ring_size;</div><div class='add'>+	} else</div><div class='add'>+#endif</div><div class='ctx'> 	if (!bp-&gt;rx_ring_size) {</div><div class='ctx'> </div><div class='ctx'> 		rx_ring_size = MAX_RX_AVAIL/BNX2X_NUM_RX_QUEUES(bp);</div><div class='hunk'>@@ -3108,7 +3131,7 @@ static int bnx2x_alloc_fp_mem_at(struct bnx2x *bp, int index)</div><div class='ctx'> 				     MIN_RX_SIZE_TPA, rx_ring_size);</div><div class='ctx'> </div><div class='ctx'> 		bp-&gt;rx_ring_size = rx_ring_size;</div><div class='del'>-	} else</div><div class='add'>+	} else /* if rx_ring_size specified - use it */</div><div class='ctx'> 		rx_ring_size = bp-&gt;rx_ring_size;</div><div class='ctx'> </div><div class='ctx'> 	/* Common */</div><div class='hunk'>@@ -3278,14 +3301,14 @@ int __devinit bnx2x_alloc_mem_bp(struct bnx2x *bp)</div><div class='ctx'> 	msix_table_size = bp-&gt;igu_sb_cnt + 1;</div><div class='ctx'> </div><div class='ctx'> 	/* fp array: RSS plus CNIC related L2 queues */</div><div class='del'>-	fp = kzalloc((BNX2X_MAX_RSS_COUNT(bp) + NON_ETH_CONTEXT_USE) *</div><div class='add'>+	fp = kcalloc(BNX2X_MAX_RSS_COUNT(bp) + NON_ETH_CONTEXT_USE,</div><div class='ctx'> 		     sizeof(*fp), GFP_KERNEL);</div><div class='ctx'> 	if (!fp)</div><div class='ctx'> 		goto alloc_err;</div><div class='ctx'> 	bp-&gt;fp = fp;</div><div class='ctx'> </div><div class='ctx'> 	/* msix table */</div><div class='del'>-	tbl = kzalloc(msix_table_size * sizeof(*tbl), GFP_KERNEL);</div><div class='add'>+	tbl = kcalloc(msix_table_size, sizeof(*tbl), GFP_KERNEL);</div><div class='ctx'> 	if (!tbl)</div><div class='ctx'> 		goto alloc_err;</div><div class='ctx'> 	bp-&gt;msix_table = tbl;</div><div class='hunk'>@@ -3409,7 +3432,8 @@ int bnx2x_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 	return bnx2x_reload_if_running(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 bnx2x_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+netdev_features_t bnx2x_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -3420,7 +3444,7 @@ u32 bnx2x_fix_features(struct net_device *dev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int bnx2x_set_features(struct net_device *dev, u32 features)</div><div class='add'>+int bnx2x_set_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> 	u32 flags = bp-&gt;flags;</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 283d663da180..bf27c54ff2e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h</a></div><div class='hunk'>@@ -20,6 +20,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;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #include "bnx2x.h"</div><div class='hunk'>@@ -533,8 +534,9 @@ int bnx2x_change_mtu(struct net_device *dev, int new_mtu);</div><div class='ctx'>  */</div><div class='ctx'> int bnx2x_fcoe_get_wwn(struct net_device *dev, u64 *wwn, int type);</div><div class='ctx'> #endif</div><div class='del'>-u32 bnx2x_fix_features(struct net_device *dev, u32 features);</div><div class='del'>-int bnx2x_set_features(struct net_device *dev, u32 features);</div><div class='add'>+netdev_features_t bnx2x_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features);</div><div class='add'>+int bnx2x_set_features(struct net_device *dev, netdev_features_t features);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * bnx2x_tx_timeout - tx timeout netdev callback</div><div class='hunk'>@@ -874,8 +876,7 @@ static inline void bnx2x_clear_sge_mask_next_elems(struct bnx2x_fastpath *fp)</div><div class='ctx'> static inline void bnx2x_init_sge_ring_bit_mask(struct bnx2x_fastpath *fp)</div><div class='ctx'> {</div><div class='ctx'> 	/* Set the mask to all 1-s: it's faster to compare to 0 than to 0xf-s */</div><div class='del'>-	memset(fp-&gt;sge_mask, 0xff,</div><div class='del'>-	       (NUM_RX_SGE &gt;&gt; BIT_VEC64_ELEM_SHIFT)*sizeof(u64));</div><div class='add'>+	memset(fp-&gt;sge_mask, 0xff, sizeof(fp-&gt;sge_mask));</div><div class='ctx'> </div><div class='ctx'> 	/* Clear the two last indices in the page to 1:</div><div class='ctx'> 	   these are the indices that correspond to the "next" element,</div><div class='hunk'>@@ -911,26 +912,27 @@ static inline int bnx2x_alloc_rx_sge(struct bnx2x *bp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int bnx2x_alloc_rx_skb(struct bnx2x *bp,</div><div class='del'>-				     struct bnx2x_fastpath *fp, u16 index)</div><div class='add'>+static inline int bnx2x_alloc_rx_data(struct bnx2x *bp,</div><div class='add'>+				      struct bnx2x_fastpath *fp, u16 index)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	u8 *data;</div><div class='ctx'> 	struct sw_rx_bd *rx_buf = &amp;fp-&gt;rx_buf_ring[index];</div><div class='ctx'> 	struct eth_rx_bd *rx_bd = &amp;fp-&gt;rx_desc_ring[index];</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='ctx'> </div><div class='del'>-	skb = netdev_alloc_skb(bp-&gt;dev, fp-&gt;rx_buf_size);</div><div class='del'>-	if (unlikely(skb == NULL))</div><div class='add'>+	data = kmalloc(fp-&gt;rx_buf_size + NET_SKB_PAD, GFP_ATOMIC);</div><div class='add'>+	if (unlikely(data == NULL))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	mapping = dma_map_single(&amp;bp-&gt;pdev-&gt;dev, skb-&gt;data, fp-&gt;rx_buf_size,</div><div class='add'>+	mapping = dma_map_single(&amp;bp-&gt;pdev-&gt;dev, data + NET_SKB_PAD,</div><div class='add'>+				 fp-&gt;rx_buf_size,</div><div class='ctx'> 				 DMA_FROM_DEVICE);</div><div class='ctx'> 	if (unlikely(dma_mapping_error(&amp;bp-&gt;pdev-&gt;dev, mapping))) {</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='add'>+		kfree(data);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rx_buf-&gt;skb = skb;</div><div class='add'>+	rx_buf-&gt;data = data;</div><div class='ctx'> 	dma_unmap_addr_set(rx_buf, mapping, mapping);</div><div class='ctx'> </div><div class='ctx'> 	rx_bd-&gt;addr_hi = cpu_to_le32(U64_HI(mapping));</div><div class='hunk'>@@ -939,12 +941,12 @@ static inline int bnx2x_alloc_rx_skb(struct bnx2x *bp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* note that we are not allocating a new skb,</div><div class='add'>+/* note that we are not allocating a new buffer,</div><div class='ctx'>  * we are just moving one from cons to prod</div><div class='ctx'>  * we are not creating a new mapping,</div><div class='ctx'>  * so there is no need to check for dma_mapping_error().</div><div class='ctx'>  */</div><div class='del'>-static inline void bnx2x_reuse_rx_skb(struct bnx2x_fastpath *fp,</div><div class='add'>+static inline void bnx2x_reuse_rx_data(struct bnx2x_fastpath *fp,</div><div class='ctx'> 				      u16 cons, u16 prod)</div><div class='ctx'> {</div><div class='ctx'> 	struct sw_rx_bd *cons_rx_buf = &amp;fp-&gt;rx_buf_ring[cons];</div><div class='hunk'>@@ -954,7 +956,7 @@ static inline void bnx2x_reuse_rx_skb(struct bnx2x_fastpath *fp,</div><div class='ctx'> </div><div class='ctx'> 	dma_unmap_addr_set(prod_rx_buf, mapping,</div><div class='ctx'> 			   dma_unmap_addr(cons_rx_buf, mapping));</div><div class='del'>-	prod_rx_buf-&gt;skb = cons_rx_buf-&gt;skb;</div><div class='add'>+	prod_rx_buf-&gt;data = cons_rx_buf-&gt;data;</div><div class='ctx'> 	*prod_bd = *cons_bd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1030,9 +1032,9 @@ static inline void bnx2x_free_tpa_pool(struct bnx2x *bp,</div><div class='ctx'> 	for (i = 0; i &lt; last; i++) {</div><div class='ctx'> 		struct bnx2x_agg_info *tpa_info = &amp;fp-&gt;tpa_info[i];</div><div class='ctx'> 		struct sw_rx_bd *first_buf = &amp;tpa_info-&gt;first_buf;</div><div class='del'>-		struct sk_buff *skb = first_buf-&gt;skb;</div><div class='add'>+		u8 *data = first_buf-&gt;data;</div><div class='ctx'> </div><div class='del'>-		if (skb == NULL) {</div><div class='add'>+		if (data == NULL) {</div><div class='ctx'> 			DP(NETIF_MSG_IFDOWN, "tpa bin %d empty on free\n", i);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1040,8 +1042,8 @@ static inline void bnx2x_free_tpa_pool(struct bnx2x *bp,</div><div class='ctx'> 			dma_unmap_single(&amp;bp-&gt;pdev-&gt;dev,</div><div class='ctx'> 					 dma_unmap_addr(first_buf, mapping),</div><div class='ctx'> 					 fp-&gt;rx_buf_size, DMA_FROM_DEVICE);</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		first_buf-&gt;skb = NULL;</div><div class='add'>+		kfree(data);</div><div class='add'>+		first_buf-&gt;data = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1149,7 +1151,7 @@ static inline int bnx2x_alloc_rx_bds(struct bnx2x_fastpath *fp,</div><div class='ctx'> 	 * fp-&gt;eth_q_stats.rx_skb_alloc_failed = 0</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; rx_ring_size; i++) {</div><div class='del'>-		if (bnx2x_alloc_rx_skb(bp, fp, ring_prod) &lt; 0) {</div><div class='add'>+		if (bnx2x_alloc_rx_data(bp, fp, ring_prod) &lt; 0) {</div><div class='ctx'> 			fp-&gt;eth_q_stats.rx_skb_alloc_failed++;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1318,6 +1320,7 @@ static inline void bnx2x_init_fcoe_fp(struct bnx2x *bp)</div><div class='ctx'> 	struct bnx2x_fastpath *fp = bnx2x_fcoe_fp(bp);</div><div class='ctx'> 	unsigned long q_type = 0;</div><div class='ctx'> </div><div class='add'>+	bnx2x_fcoe(bp, rx_queue) = BNX2X_NUM_ETH_QUEUES(bp);</div><div class='ctx'> 	bnx2x_fcoe(bp, cl_id) = bnx2x_cnic_eth_cl_id(bp,</div><div class='ctx'> 						     BNX2X_FCOE_ETH_CL_ID_IDX);</div><div class='ctx'> 	/** Current BNX2X_FCOE_ETH_CID deffinition implies not more than</div><div class='hunk'>@@ -1488,4 +1491,77 @@ static inline u16 bnx2x_extract_max_cfg(struct bnx2x *bp, u32 mf_cfg)</div><div class='ctx'> 	return max_cfg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * bnx2x_get_iscsi_info - update iSCSI params according to licensing info.</div><div class='add'>+ *</div><div class='add'>+ * @bp:		driver handle</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+void bnx2x_get_iscsi_info(struct bnx2x *bp);</div><div class='add'>+</div><div class='add'>+/* returns func by VN for current port */</div><div class='add'>+static inline int func_by_vn(struct bnx2x *bp, int vn)</div><div class='add'>+{</div><div class='add'>+	return 2 * vn + BP_PORT(bp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bnx2x_link_sync_notify - send notification to other functions.</div><div class='add'>+ *</div><div class='add'>+ * @bp:		driver handle</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static inline void bnx2x_link_sync_notify(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+	int func;</div><div class='add'>+	int vn;</div><div class='add'>+</div><div class='add'>+	/* Set the attention towards other drivers on the same port */</div><div class='add'>+	for (vn = VN_0; vn &lt; BP_MAX_VN_NUM(bp); vn++) {</div><div class='add'>+		if (vn == BP_VN(bp))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		func = func_by_vn(bp, vn);</div><div class='add'>+		REG_WR(bp, MISC_REG_AEU_GENERAL_ATTN_0 +</div><div class='add'>+		       (LINK_SYNC_ATTENTION_BIT_FUNC_0 + func)*4, 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bnx2x_update_drv_flags - update flags in shmem</div><div class='add'>+ *</div><div class='add'>+ * @bp:		driver handle</div><div class='add'>+ * @flags:	flags to update</div><div class='add'>+ * @set:	set or clear</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static inline void bnx2x_update_drv_flags(struct bnx2x *bp, u32 flags, u32 set)</div><div class='add'>+{</div><div class='add'>+	if (SHMEM2_HAS(bp, drv_flags)) {</div><div class='add'>+		u32 drv_flags;</div><div class='add'>+		bnx2x_acquire_hw_lock(bp, HW_LOCK_DRV_FLAGS);</div><div class='add'>+		drv_flags = SHMEM2_RD(bp, drv_flags);</div><div class='add'>+</div><div class='add'>+		if (set)</div><div class='add'>+			SET_FLAGS(drv_flags, flags);</div><div class='add'>+		else</div><div class='add'>+			RESET_FLAGS(drv_flags, flags);</div><div class='add'>+</div><div class='add'>+		SHMEM2_WR(bp, drv_flags, drv_flags);</div><div class='add'>+		DP(NETIF_MSG_HW, "drv_flags 0x%08x\n", drv_flags);</div><div class='add'>+		bnx2x_release_hw_lock(bp, HW_LOCK_DRV_FLAGS);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool bnx2x_is_valid_ether_addr(struct bnx2x *bp, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	if (is_valid_ether_addr(addr))</div><div class='add'>+		return true;</div><div class='add'>+#ifdef BCM_CNIC</div><div class='add'>+	if (is_zero_ether_addr(addr) &amp;&amp; IS_MF_ISCSI_SD(bp))</div><div class='add'>+		return true;</div><div class='add'>+#endif</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* BNX2X_CMN_H */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c<br/>index 51bd7485ab18..5051cf3deb20 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c</a></div><div class='hunk'>@@ -685,24 +685,6 @@ int bnx2x_dcbnl_update_applist(struct bnx2x *bp, bool delall)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline void bnx2x_update_drv_flags(struct bnx2x *bp, u32 flags, u32 set)</div><div class='del'>-{</div><div class='del'>-	if (SHMEM2_HAS(bp, drv_flags)) {</div><div class='del'>-		u32 drv_flags;</div><div class='del'>-		bnx2x_acquire_hw_lock(bp, HW_LOCK_DRV_FLAGS);</div><div class='del'>-		drv_flags = SHMEM2_RD(bp, drv_flags);</div><div class='del'>-</div><div class='del'>-		if (set)</div><div class='del'>-			SET_FLAGS(drv_flags, flags);</div><div class='del'>-		else</div><div class='del'>-			RESET_FLAGS(drv_flags, flags);</div><div class='del'>-</div><div class='del'>-		SHMEM2_WR(bp, drv_flags, drv_flags);</div><div class='del'>-		DP(NETIF_MSG_HW, "drv_flags 0x%08x\n", drv_flags);</div><div class='del'>-		bnx2x_release_hw_lock(bp, HW_LOCK_DRV_FLAGS);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void bnx2x_dcbx_update_tc_mapping(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	u8 prio, cos;</div><div class='hunk'>@@ -755,18 +737,26 @@ void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state)</div><div class='ctx'> 			/* mark DCBX result for PMF migration */</div><div class='ctx'> 			bnx2x_update_drv_flags(bp, DRV_FLAGS_DCB_CONFIGURED, 1);</div><div class='ctx'> #ifdef BCM_DCBNL</div><div class='del'>-			/**</div><div class='add'>+			/*</div><div class='ctx'> 			 * Add new app tlvs to dcbnl</div><div class='ctx'> 			 */</div><div class='ctx'> 			bnx2x_dcbnl_update_applist(bp, false);</div><div class='ctx'> #endif</div><div class='del'>-			bnx2x_dcbx_stop_hw_tx(bp);</div><div class='del'>-</div><div class='del'>-			/* reconfigure the netdevice with the results of the new</div><div class='add'>+			/*</div><div class='add'>+			 * reconfigure the netdevice with the results of the new</div><div class='ctx'> 			 * dcbx negotiation.</div><div class='ctx'> 			 */</div><div class='ctx'> 			bnx2x_dcbx_update_tc_mapping(bp);</div><div class='ctx'> </div><div class='add'>+			/*</div><div class='add'>+			 * allow other funtions to update their netdevices</div><div class='add'>+			 * accordingly</div><div class='add'>+			 */</div><div class='add'>+			if (IS_MF(bp))</div><div class='add'>+				bnx2x_link_sync_notify(bp);</div><div class='add'>+</div><div class='add'>+			bnx2x_dcbx_stop_hw_tx(bp);</div><div class='add'>+</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	case BNX2X_DCBX_STATE_TX_PAUSED:</div><div class='hunk'>@@ -775,6 +765,7 @@ void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state)</div><div class='ctx'> </div><div class='ctx'> 		bnx2x_dcbx_update_ets_params(bp);</div><div class='ctx'> 		bnx2x_dcbx_resume_hw_tx(bp);</div><div class='add'>+</div><div class='ctx'> 		return;</div><div class='ctx'> 	case BNX2X_DCBX_STATE_TX_RELEASED:</div><div class='ctx'> 		DP(NETIF_MSG_LINK, "BNX2X_DCBX_STATE_TX_RELEASED\n");</div><div class='hunk'>@@ -883,7 +874,7 @@ static void bnx2x_dcbx_admin_mib_updated_params(struct bnx2x *bp,</div><div class='ctx'> 		/*For IEEE admin_recommendation_bw_precentage</div><div class='ctx'> 		 *For IEEE admin_recommendation_ets_pg */</div><div class='ctx'> 		af-&gt;pfc.pri_en_bitmap = (u8)dp-&gt;admin_pfc_bitmap;</div><div class='del'>-		for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		for (i = 0; i &lt; DCBX_CONFIG_MAX_APP_PROTOCOL; i++) {</div><div class='ctx'> 			if (dp-&gt;admin_priority_app_table[i].valid) {</div><div class='ctx'> 				struct bnx2x_admin_priority_app_table *table =</div><div class='ctx'> 					dp-&gt;admin_priority_app_table;</div><div class='hunk'>@@ -923,7 +914,7 @@ static void bnx2x_dcbx_admin_mib_updated_params(struct bnx2x *bp,</div><div class='ctx'> </div><div class='ctx'> void bnx2x_dcbx_set_state(struct bnx2x *bp, bool dcb_on, u32 dcbx_enabled)</div><div class='ctx'> {</div><div class='del'>-	if (!CHIP_IS_E1x(bp) &amp;&amp; !CHIP_IS_E3(bp)) {</div><div class='add'>+	if (!CHIP_IS_E1x(bp)) {</div><div class='ctx'> 		bp-&gt;dcb_state = dcb_on;</div><div class='ctx'> 		bp-&gt;dcbx_enabled = dcbx_enabled;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1863,7 +1854,7 @@ static void bnx2x_dcbx_fw_struct(struct bnx2x *bp,</div><div class='ctx'> void bnx2x_dcbx_pmf_update(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	/* if we need to syncronize DCBX result from prev PMF</div><div class='del'>-	 * read it from shmem and update bp accordingly</div><div class='add'>+	 * read it from shmem and update bp and netdev accordingly</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (SHMEM2_HAS(bp, drv_flags) &amp;&amp;</div><div class='ctx'> 	   GET_FLAGS(SHMEM2_RD(bp, drv_flags), DRV_FLAGS_DCB_CONFIGURED)) {</div><div class='hunk'>@@ -1875,6 +1866,22 @@ void bnx2x_dcbx_pmf_update(struct bnx2x *bp)</div><div class='ctx'> 					  bp-&gt;dcbx_error);</div><div class='ctx'> 		bnx2x_get_dcbx_drv_param(bp, &amp;bp-&gt;dcbx_local_feat,</div><div class='ctx'> 					 bp-&gt;dcbx_error);</div><div class='add'>+#ifdef BCM_DCBNL</div><div class='add'>+		/*</div><div class='add'>+		 * Add new app tlvs to dcbnl</div><div class='add'>+		 */</div><div class='add'>+		bnx2x_dcbnl_update_applist(bp, false);</div><div class='add'>+		/*</div><div class='add'>+		 * Send a notification for the new negotiated parameters</div><div class='add'>+		 */</div><div class='add'>+		dcbnl_cee_notify(bp-&gt;dev, RTM_GETDCB, DCB_CMD_CEE_GET, 0, 0);</div><div class='add'>+#endif</div><div class='add'>+		/*</div><div class='add'>+		 * reconfigure the netdevice with the results of the new</div><div class='add'>+		 * dcbx negotiation.</div><div class='add'>+		 */</div><div class='add'>+		bnx2x_dcbx_update_tc_mapping(bp);</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2242,7 +2249,7 @@ static int bnx2x_set_admin_app_up(struct bnx2x *bp, u8 idtype, u16 idval, u8 up)</div><div class='ctx'> 	int i, ff;</div><div class='ctx'> </div><div class='ctx'> 	/* iterate over the app entries looking for idtype and idval */</div><div class='del'>-	for (i = 0, ff = -1; i &lt; 4; i++) {</div><div class='add'>+	for (i = 0, ff = -1; i &lt; DCBX_CONFIG_MAX_APP_PROTOCOL; i++) {</div><div class='ctx'> 		struct bnx2x_admin_priority_app_table *app_ent =</div><div class='ctx'> 			&amp;bp-&gt;dcbx_config_params.admin_priority_app_table[i];</div><div class='ctx'> 		if (bnx2x_admin_app_is_equal(app_ent, idtype, idval))</div><div class='hunk'>@@ -2251,7 +2258,7 @@ static int bnx2x_set_admin_app_up(struct bnx2x *bp, u8 idtype, u16 idval, u8 up)</div><div class='ctx'> 		if (ff &lt; 0 &amp;&amp; !app_ent-&gt;valid)</div><div class='ctx'> 			ff = i;</div><div class='ctx'> 	}</div><div class='del'>-	if (i &lt; 4)</div><div class='add'>+	if (i &lt; DCBX_CONFIG_MAX_APP_PROTOCOL)</div><div class='ctx'> 		/* if found overwrite up */</div><div class='ctx'> 		bp-&gt;dcbx_config_params.</div><div class='ctx'> 			admin_priority_app_table[i].priority = up;</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h<br/>index 2c6a3bca6f28..2ab9254e2d5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h</a></div><div class='hunk'>@@ -90,6 +90,7 @@ struct bnx2x_admin_priority_app_table {</div><div class='ctx'> 		u32 app_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define DCBX_CONFIG_MAX_APP_PROTOCOL 4</div><div class='ctx'> struct bnx2x_config_dcbx_params {</div><div class='ctx'> 	u32 overwrite_settings;</div><div class='ctx'> 	u32 admin_dcbx_version;</div><div class='hunk'>@@ -109,7 +110,8 @@ struct bnx2x_config_dcbx_params {</div><div class='ctx'> 	u32 admin_recommendation_bw_precentage[8];</div><div class='ctx'> 	u32 admin_recommendation_ets_pg[8];</div><div class='ctx'> 	u32 admin_pfc_bitmap;</div><div class='del'>-	struct bnx2x_admin_priority_app_table admin_priority_app_table[4];</div><div class='add'>+	struct bnx2x_admin_priority_app_table</div><div class='add'>+		admin_priority_app_table[DCBX_CONFIG_MAX_APP_PROTOCOL];</div><div class='ctx'> 	u32 admin_default_priority;</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 f0ca8b27a55e..f99c6e312a5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c</a></div><div class='hunk'>@@ -107,6 +107,10 @@ static const struct {</div><div class='ctx'> 				4, STATS_FLAGS_PORT, "rx_filtered_packets" },</div><div class='ctx'> 	{ STATS_OFFSET32(mf_tag_discard),</div><div class='ctx'> 				4, STATS_FLAGS_PORT, "rx_mf_tag_discard" },</div><div class='add'>+	{ STATS_OFFSET32(pfc_frames_received_hi),</div><div class='add'>+				8, STATS_FLAGS_PORT, "pfc_frames_received" },</div><div class='add'>+	{ STATS_OFFSET32(pfc_frames_sent_hi),</div><div class='add'>+				8, STATS_FLAGS_PORT, "pfc_frames_sent" },</div><div class='ctx'> 	{ STATS_OFFSET32(brb_drop_hi),</div><div class='ctx'> 				8, STATS_FLAGS_PORT, "rx_brb_discard" },</div><div class='ctx'> 	{ STATS_OFFSET32(brb_truncate_hi),</div><div class='hunk'>@@ -352,7 +356,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> 		DP(NETIF_MSG_LINK, "Unsupported port type\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	/* Save new config in case command complete successuly */</div><div class='add'>+	/* Save new config in case command complete successully */</div><div class='ctx'> 	new_multi_phy_config = bp-&gt;link_params.multi_phy_config;</div><div class='ctx'> 	/* Get the new cfg_idx */</div><div class='ctx'> 	cfg_idx = bnx2x_get_link_cfg_idx(bp);</div><div class='hunk'>@@ -361,13 +365,18 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> 	DP(NETIF_MSG_LINK, "cfg_idx = %x\n", cfg_idx);</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;autoneg == AUTONEG_ENABLE) {</div><div class='add'>+		u32 an_supported_speed = bp-&gt;port.supported[cfg_idx];</div><div class='add'>+		if (bp-&gt;link_params.phy[EXT_PHY1].type ==</div><div class='add'>+		    PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833)</div><div class='add'>+			an_supported_speed |= (SUPPORTED_100baseT_Half |</div><div class='add'>+					       SUPPORTED_100baseT_Full);</div><div class='ctx'> 		if (!(bp-&gt;port.supported[cfg_idx] &amp; SUPPORTED_Autoneg)) {</div><div class='ctx'> 			DP(NETIF_MSG_LINK, "Autoneg not supported\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* advertise the requested speed and duplex if supported */</div><div class='del'>-		if (cmd-&gt;advertising &amp; ~(bp-&gt;port.supported[cfg_idx])) {</div><div class='add'>+		if (cmd-&gt;advertising &amp; ~an_supported_speed) {</div><div class='ctx'> 			DP(NETIF_MSG_LINK, "Advertisement parameters "</div><div class='ctx'> 					   "are not supported\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -761,8 +770,8 @@ static void bnx2x_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> 	u8 phy_fw_ver[PHY_FW_VER_LEN];</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_MODULE_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_MODULE_VERSION);</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_MODULE_VERSION, sizeof(info-&gt;version));</div><div class='ctx'> </div><div class='ctx'> 	phy_fw_ver[0] = '\0';</div><div class='ctx'> 	if (bp-&gt;port.pmf) {</div><div class='hunk'>@@ -773,14 +782,14 @@ static void bnx2x_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 		bnx2x_release_phy_lock(bp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strncpy(info-&gt;fw_version, bp-&gt;fw_ver, 32);</div><div class='add'>+	strlcpy(info-&gt;fw_version, bp-&gt;fw_ver, sizeof(info-&gt;fw_version));</div><div class='ctx'> 	snprintf(info-&gt;fw_version + strlen(bp-&gt;fw_ver), 32 - strlen(bp-&gt;fw_ver),</div><div class='ctx'> 		 "bc %d.%d.%d%s%s",</div><div class='ctx'> 		 (bp-&gt;common.bc_ver &amp; 0xff0000) &gt;&gt; 16,</div><div class='ctx'> 		 (bp-&gt;common.bc_ver &amp; 0xff00) &gt;&gt; 8,</div><div class='ctx'> 		 (bp-&gt;common.bc_ver &amp; 0xff),</div><div class='ctx'> 		 ((phy_fw_ver[0] != '\0') ? " phy " : ""), phy_fw_ver);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(bp-&gt;pdev));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(bp-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> 	info-&gt;n_stats = BNX2X_NUM_STATS;</div><div class='ctx'> 	info-&gt;testinfo_len = BNX2X_NUM_TESTS;</div><div class='ctx'> 	info-&gt;eedump_len = bp-&gt;common.flash_size;</div><div class='hunk'>@@ -1740,6 +1749,8 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode)</div><div class='ctx'> 	struct sw_rx_bd *rx_buf;</div><div class='ctx'> 	u16 len;</div><div class='ctx'> 	int rc = -ENODEV;</div><div class='add'>+	u8 *data;</div><div class='add'>+	struct netdev_queue *txq = netdev_get_tx_queue(bp-&gt;dev, txdata-&gt;txq_index);</div><div class='ctx'> </div><div class='ctx'> 	/* check the loopback mode */</div><div class='ctx'> 	switch (loopback_mode) {</div><div class='hunk'>@@ -1748,8 +1759,18 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BNX2X_MAC_LOOPBACK:</div><div class='del'>-		bp-&gt;link_params.loopback_mode = CHIP_IS_E3(bp) ?</div><div class='del'>-						LOOPBACK_XMAC : LOOPBACK_BMAC;</div><div class='add'>+		if (CHIP_IS_E3(bp)) {</div><div class='add'>+			int cfg_idx = bnx2x_get_link_cfg_idx(bp);</div><div class='add'>+			if (bp-&gt;port.supported[cfg_idx] &amp;</div><div class='add'>+			    (SUPPORTED_10000baseT_Full |</div><div class='add'>+			     SUPPORTED_20000baseMLD2_Full |</div><div class='add'>+			     SUPPORTED_20000baseKR2_Full))</div><div class='add'>+				bp-&gt;link_params.loopback_mode = LOOPBACK_XMAC;</div><div class='add'>+			else</div><div class='add'>+				bp-&gt;link_params.loopback_mode = LOOPBACK_UMAC;</div><div class='add'>+		} else</div><div class='add'>+			bp-&gt;link_params.loopback_mode = LOOPBACK_BMAC;</div><div class='add'>+</div><div class='ctx'> 		bnx2x_phy_init(&amp;bp-&gt;link_params, &amp;bp-&gt;link_vars);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1784,6 +1805,8 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode)</div><div class='ctx'> 	tx_start_idx = le16_to_cpu(*txdata-&gt;tx_cons_sb);</div><div class='ctx'> 	rx_start_idx = le16_to_cpu(*fp_rx-&gt;rx_cons_sb);</div><div class='ctx'> </div><div class='add'>+	netdev_tx_sent_queue(txq, skb-&gt;len);</div><div class='add'>+</div><div class='ctx'> 	pkt_prod = txdata-&gt;tx_pkt_prod++;</div><div class='ctx'> 	tx_buf = &amp;txdata-&gt;tx_buf_ring[TX_BD(pkt_prod)];</div><div class='ctx'> 	tx_buf-&gt;first_bd = txdata-&gt;tx_bd_prod;</div><div class='hunk'>@@ -1865,10 +1888,9 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode)</div><div class='ctx'> 	dma_sync_single_for_cpu(&amp;bp-&gt;pdev-&gt;dev,</div><div class='ctx'> 				   dma_unmap_addr(rx_buf, mapping),</div><div class='ctx'> 				   fp_rx-&gt;rx_buf_size, DMA_FROM_DEVICE);</div><div class='del'>-	skb = rx_buf-&gt;skb;</div><div class='del'>-	skb_reserve(skb, cqe-&gt;fast_path_cqe.placement_offset);</div><div class='add'>+	data = rx_buf-&gt;data + NET_SKB_PAD + cqe-&gt;fast_path_cqe.placement_offset;</div><div class='ctx'> 	for (i = ETH_HLEN; i &lt; pkt_size; i++)</div><div class='del'>-		if (*(skb-&gt;data + i) != (unsigned char) (i &amp; 0xff))</div><div class='add'>+		if (*(data + i) != (unsigned char) (i &amp; 0xff))</div><div class='ctx'> 			goto test_loopback_rx_exit;</div><div class='ctx'> </div><div class='ctx'> 	rc = 0;</div><div class='hunk'>@@ -2285,18 +2307,20 @@ static int bnx2x_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_get_rxfh_indir(struct net_device *dev,</div><div class='del'>-				struct ethtool_rxfh_indir *indir)</div><div class='add'>+static u32 bnx2x_get_rxfh_indir_size(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bnx2x *bp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	return (bp-&gt;multi_mode == ETH_RSS_MODE_DISABLED ?</div><div class='add'>+		0 : T_ETH_INDIRECTION_TABLE_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnx2x_get_rxfh_indir(struct net_device *dev, u32 *indir)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='del'>-	size_t copy_size =</div><div class='del'>-		min_t(size_t, indir-&gt;size, T_ETH_INDIRECTION_TABLE_SIZE);</div><div class='ctx'> 	u8 ind_table[T_ETH_INDIRECTION_TABLE_SIZE] = {0};</div><div class='ctx'> 	size_t i;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;multi_mode == ETH_RSS_MODE_DISABLED)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='ctx'> 	/* Get the current configuration of the RSS indirection table */</div><div class='ctx'> 	bnx2x_get_rss_ind_table(&amp;bp-&gt;rss_conf_obj, ind_table);</div><div class='ctx'> </div><div class='hunk'>@@ -2309,33 +2333,19 @@ static int bnx2x_get_rxfh_indir(struct net_device *dev,</div><div class='ctx'> 	 * align the returned table to the Client ID of the leading RSS</div><div class='ctx'> 	 * queue.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; copy_size; i++)</div><div class='del'>-		indir-&gt;ring_index[i] = ind_table[i] - bp-&gt;fp-&gt;cl_id;</div><div class='del'>-</div><div class='del'>-	indir-&gt;size = T_ETH_INDIRECTION_TABLE_SIZE;</div><div class='add'>+	for (i = 0; i &lt; T_ETH_INDIRECTION_TABLE_SIZE; i++)</div><div class='add'>+		indir[i] = ind_table[i] - bp-&gt;fp-&gt;cl_id;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_set_rxfh_indir(struct net_device *dev,</div><div class='del'>-				const struct ethtool_rxfh_indir *indir)</div><div class='add'>+static int bnx2x_set_rxfh_indir(struct net_device *dev, const u32 *indir)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> 	size_t i;</div><div class='ctx'> 	u8 ind_table[T_ETH_INDIRECTION_TABLE_SIZE] = {0};</div><div class='del'>-	u32 num_eth_queues = BNX2X_NUM_ETH_QUEUES(bp);</div><div class='del'>-</div><div class='del'>-	if (bp-&gt;multi_mode == ETH_RSS_MODE_DISABLED)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	/* validate the size */</div><div class='del'>-	if (indir-&gt;size != T_ETH_INDIRECTION_TABLE_SIZE)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; T_ETH_INDIRECTION_TABLE_SIZE; i++) {</div><div class='del'>-		/* validate the indices */</div><div class='del'>-		if (indir-&gt;ring_index[i] &gt;= num_eth_queues)</div><div class='del'>-			return -EINVAL;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The same as in bnx2x_get_rxfh_indir: we can't use a memcpy()</div><div class='ctx'> 		 * as an internal storage of an indirection table is a u8 array</div><div class='hunk'>@@ -2345,7 +2355,7 @@ static int bnx2x_set_rxfh_indir(struct net_device *dev,</div><div class='ctx'> 		 * align the received table to the Client ID of the leading RSS</div><div class='ctx'> 		 * queue</div><div class='ctx'> 		 */</div><div class='del'>-		ind_table[i] = indir-&gt;ring_index[i] + bp-&gt;fp-&gt;cl_id;</div><div class='add'>+		ind_table[i] = indir[i] + bp-&gt;fp-&gt;cl_id;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return bnx2x_config_rss_pf(bp, ind_table, false);</div><div class='hunk'>@@ -2378,6 +2388,7 @@ static const struct ethtool_ops bnx2x_ethtool_ops = {</div><div class='ctx'> 	.set_phys_id		= bnx2x_set_phys_id,</div><div class='ctx'> 	.get_ethtool_stats	= bnx2x_get_ethtool_stats,</div><div class='ctx'> 	.get_rxnfc		= bnx2x_get_rxnfc,</div><div class='add'>+	.get_rxfh_indir_size	= bnx2x_get_rxfh_indir_size,</div><div class='ctx'> 	.get_rxfh_indir		= bnx2x_get_rxfh_indir,</div><div class='ctx'> 	.set_rxfh_indir		= bnx2x_set_rxfh_indir,</div><div class='ctx'> };</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 fc754cb6cc0f..3e30c8642c26 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h</a></div><div class='hunk'>@@ -1247,11 +1247,14 @@ struct drv_func_mb {</div><div class='ctx'> 	#define DRV_MSG_CODE_VRFY_SPECIFIC_PHY_OPT_MDL  0xa1000000</div><div class='ctx'> 	#define REQ_BC_VER_4_VRFY_SPECIFIC_PHY_OPT_MDL  0x00050234</div><div class='ctx'> 	#define REQ_BC_VER_4_SFP_TX_DISABLE_SUPPORTED   0x00070014</div><div class='add'>+	#define REQ_BC_VER_4_PFC_STATS_SUPPORTED        0x00070201</div><div class='ctx'> </div><div class='ctx'> 	#define DRV_MSG_CODE_DCBX_ADMIN_PMF_MSG         0xb0000000</div><div class='ctx'> 	#define DRV_MSG_CODE_DCBX_PMF_DRV_OK            0xb2000000</div><div class='ctx'> </div><div class='ctx'> 	#define DRV_MSG_CODE_VF_DISABLED_DONE           0xc0000000</div><div class='add'>+	#define DRV_MSG_CODE_DRV_INFO_ACK               0xd8000000</div><div class='add'>+	#define DRV_MSG_CODE_DRV_INFO_NACK              0xd9000000</div><div class='ctx'> </div><div class='ctx'> 	#define DRV_MSG_CODE_SET_MF_BW                  0xe0000000</div><div class='ctx'> 	#define REQ_BC_VER_4_SET_MF_BW                  0x00060202</div><div class='hunk'>@@ -1304,6 +1307,8 @@ struct drv_func_mb {</div><div class='ctx'> 	#define FW_MSG_CODE_VRFY_OPT_MDL_INVLD_IMG      0xa0200000</div><div class='ctx'> 	#define FW_MSG_CODE_VRFY_OPT_MDL_UNAPPROVED     0xa0300000</div><div class='ctx'> 	#define FW_MSG_CODE_VF_DISABLED_DONE            0xb0000000</div><div class='add'>+	#define FW_MSG_CODE_DRV_INFO_ACK                0xd8100000</div><div class='add'>+	#define FW_MSG_CODE_DRV_INFO_NACK               0xd9100000</div><div class='ctx'> </div><div class='ctx'> 	#define FW_MSG_CODE_SET_MF_BW_SENT              0xe0000000</div><div class='ctx'> 	#define FW_MSG_CODE_SET_MF_BW_DONE              0xe1000000</div><div class='hunk'>@@ -1360,6 +1365,7 @@ struct drv_func_mb {</div><div class='ctx'> </div><div class='ctx'> 	#define DRV_STATUS_DCBX_EVENT_MASK              0x000f0000</div><div class='ctx'> 	#define DRV_STATUS_DCBX_NEGOTIATION_RESULTS     0x00010000</div><div class='add'>+	#define DRV_STATUS_DRV_INFO_REQ                 0x04000000</div><div class='ctx'> </div><div class='ctx'> 	u32 virt_mac_upper;</div><div class='ctx'> 	#define VIRT_MAC_SIGN_MASK                      0xffff0000</div><div class='hunk'>@@ -1964,9 +1970,38 @@ struct shmem2_region {</div><div class='ctx'> 	u32 extended_dev_info_shared_addr;</div><div class='ctx'> 	u32 ncsi_oem_data_addr;</div><div class='ctx'> </div><div class='del'>-	u32 ocsd_host_addr;</div><div class='del'>-	u32 ocbb_host_addr;</div><div class='del'>-	u32 ocsd_req_update_interval;</div><div class='add'>+	u32 ocsd_host_addr; /* initialized by option ROM */</div><div class='add'>+	u32 ocbb_host_addr; /* initialized by option ROM */</div><div class='add'>+	u32 ocsd_req_update_interval; /* initialized by option ROM */</div><div class='add'>+	u32 temperature_in_half_celsius;</div><div class='add'>+	u32 glob_struct_in_host;</div><div class='add'>+</div><div class='add'>+	u32 dcbx_neg_res_ext_offset;</div><div class='add'>+#define SHMEM_DCBX_NEG_RES_EXT_NONE			0x00000000</div><div class='add'>+</div><div class='add'>+	u32 drv_capabilities_flag[E2_FUNC_MAX];</div><div class='add'>+#define DRV_FLAGS_CAPABILITIES_LOADED_SUPPORTED 0x00000001</div><div class='add'>+#define DRV_FLAGS_CAPABILITIES_LOADED_L2        0x00000002</div><div class='add'>+#define DRV_FLAGS_CAPABILITIES_LOADED_FCOE      0x00000004</div><div class='add'>+#define DRV_FLAGS_CAPABILITIES_LOADED_ISCSI     0x00000008</div><div class='add'>+</div><div class='add'>+	u32 extended_dev_info_shared_cfg_size;</div><div class='add'>+</div><div class='add'>+	u32 dcbx_en[PORT_MAX];</div><div class='add'>+</div><div class='add'>+	/* The offset points to the multi threaded meta structure */</div><div class='add'>+	u32 multi_thread_data_offset;</div><div class='add'>+</div><div class='add'>+	/* address of DMAable host address holding values from the drivers */</div><div class='add'>+	u32 drv_info_host_addr_lo;</div><div class='add'>+	u32 drv_info_host_addr_hi;</div><div class='add'>+</div><div class='add'>+	/* general values written by the MFW (such as current version) */</div><div class='add'>+	u32 drv_info_control;</div><div class='add'>+#define DRV_INFO_CONTROL_VER_MASK          0x000000ff</div><div class='add'>+#define DRV_INFO_CONTROL_VER_SHIFT         0</div><div class='add'>+#define DRV_INFO_CONTROL_OP_CODE_MASK      0x0000ff00</div><div class='add'>+#define DRV_INFO_CONTROL_OP_CODE_SHIFT     8</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2501,14 +2536,18 @@ struct mac_stx {</div><div class='ctx'> #define MAC_STX_IDX_MAX                     2</div><div class='ctx'> </div><div class='ctx'> struct host_port_stats {</div><div class='del'>-	u32            host_port_stats_start;</div><div class='add'>+	u32            host_port_stats_counter;</div><div class='ctx'> </div><div class='ctx'> 	struct mac_stx mac_stx[MAC_STX_IDX_MAX];</div><div class='ctx'> </div><div class='ctx'> 	u32            brb_drop_hi;</div><div class='ctx'> 	u32            brb_drop_lo;</div><div class='ctx'> </div><div class='del'>-	u32            host_port_stats_end;</div><div class='add'>+	u32            not_used; /* obsolete */</div><div class='add'>+	u32            pfc_frames_tx_hi;</div><div class='add'>+	u32            pfc_frames_tx_lo;</div><div class='add'>+	u32            pfc_frames_rx_hi;</div><div class='add'>+	u32            pfc_frames_rx_lo;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2548,6 +2587,118 @@ struct host_func_stats {</div><div class='ctx'> /* VIC definitions */</div><div class='ctx'> #define VICSTATST_UIF_INDEX 2</div><div class='ctx'> </div><div class='add'>+/* current drv_info version */</div><div class='add'>+#define DRV_INFO_CUR_VER 1</div><div class='add'>+</div><div class='add'>+/* drv_info op codes supported */</div><div class='add'>+enum drv_info_opcode {</div><div class='add'>+	ETH_STATS_OPCODE,</div><div class='add'>+	FCOE_STATS_OPCODE,</div><div class='add'>+	ISCSI_STATS_OPCODE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ETH_STAT_INFO_VERSION_LEN	12</div><div class='add'>+/*  Per PCI Function Ethernet Statistics required from the driver */</div><div class='add'>+struct eth_stats_info {</div><div class='add'>+	/* Function's Driver Version. padded to 12 */</div><div class='add'>+	u8 version[ETH_STAT_INFO_VERSION_LEN];</div><div class='add'>+	/* Locally Admin Addr. BigEndian EIU48. Actual size is 6 bytes */</div><div class='add'>+	u8 mac_local[8];</div><div class='add'>+	u8 mac_add1[8];		/* Additional Programmed MAC Addr 1. */</div><div class='add'>+	u8 mac_add2[8];		/* Additional Programmed MAC Addr 2. */</div><div class='add'>+	u32 mtu_size;		/* MTU Size. Note   : Negotiated MTU */</div><div class='add'>+	u32 feature_flags;	/* Feature_Flags. */</div><div class='add'>+#define FEATURE_ETH_CHKSUM_OFFLOAD_MASK		0x01</div><div class='add'>+#define FEATURE_ETH_LSO_MASK			0x02</div><div class='add'>+#define FEATURE_ETH_BOOTMODE_MASK		0x1C</div><div class='add'>+#define FEATURE_ETH_BOOTMODE_SHIFT		2</div><div class='add'>+#define FEATURE_ETH_BOOTMODE_NONE		(0x0 &lt;&lt; 2)</div><div class='add'>+#define FEATURE_ETH_BOOTMODE_PXE		(0x1 &lt;&lt; 2)</div><div class='add'>+#define FEATURE_ETH_BOOTMODE_ISCSI		(0x2 &lt;&lt; 2)</div><div class='add'>+#define FEATURE_ETH_BOOTMODE_FCOE		(0x3 &lt;&lt; 2)</div><div class='add'>+#define FEATURE_ETH_TOE_MASK			0x20</div><div class='add'>+	u32 lso_max_size;	/* LSO MaxOffloadSize. */</div><div class='add'>+	u32 lso_min_seg_cnt;	/* LSO MinSegmentCount. */</div><div class='add'>+	/* Num Offloaded Connections TCP_IPv4. */</div><div class='add'>+	u32 ipv4_ofld_cnt;</div><div class='add'>+	/* Num Offloaded Connections TCP_IPv6. */</div><div class='add'>+	u32 ipv6_ofld_cnt;</div><div class='add'>+	u32 promiscuous_mode;	/* Promiscuous Mode. non-zero true */</div><div class='add'>+	u32 txq_size;		/* TX Descriptors Queue Size */</div><div class='add'>+	u32 rxq_size;		/* RX Descriptors Queue Size */</div><div class='add'>+	/* TX Descriptor Queue Avg Depth. % Avg Queue Depth since last poll */</div><div class='add'>+	u32 txq_avg_depth;</div><div class='add'>+	/* RX Descriptors Queue Avg Depth. % Avg Queue Depth since last poll */</div><div class='add'>+	u32 rxq_avg_depth;</div><div class='add'>+	/* IOV_Offload. 0=none; 1=MultiQueue, 2=VEB 3= VEPA*/</div><div class='add'>+	u32 iov_offload;</div><div class='add'>+	/* Number of NetQueue/VMQ Config'd. */</div><div class='add'>+	u32 netq_cnt;</div><div class='add'>+	u32 vf_cnt;		/* Num VF assigned to this PF. */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*  Per PCI Function FCOE Statistics required from the driver */</div><div class='add'>+struct fcoe_stats_info {</div><div class='add'>+	u8 version[12];		/* Function's Driver Version. */</div><div class='add'>+	u8 mac_local[8];	/* Locally Admin Addr. */</div><div class='add'>+	u8 mac_add1[8];		/* Additional Programmed MAC Addr 1. */</div><div class='add'>+	u8 mac_add2[8];		/* Additional Programmed MAC Addr 2. */</div><div class='add'>+	/* QoS Priority (per 802.1p). 0-7255 */</div><div class='add'>+	u32 qos_priority;</div><div class='add'>+	u32 txq_size;		/* FCoE TX Descriptors Queue Size. */</div><div class='add'>+	u32 rxq_size;		/* FCoE RX Descriptors Queue Size. */</div><div class='add'>+	/* FCoE TX Descriptor Queue Avg Depth. */</div><div class='add'>+	u32 txq_avg_depth;</div><div class='add'>+	/* FCoE RX Descriptors Queue Avg Depth. */</div><div class='add'>+	u32 rxq_avg_depth;</div><div class='add'>+	u32 rx_frames_lo;	/* FCoE RX Frames received. */</div><div class='add'>+	u32 rx_frames_hi;	/* FCoE RX Frames received. */</div><div class='add'>+	u32 rx_bytes_lo;	/* FCoE RX Bytes received. */</div><div class='add'>+	u32 rx_bytes_hi;	/* FCoE RX Bytes received. */</div><div class='add'>+	u32 tx_frames_lo;	/* FCoE TX Frames sent. */</div><div class='add'>+	u32 tx_frames_hi;	/* FCoE TX Frames sent. */</div><div class='add'>+	u32 tx_bytes_lo;	/* FCoE TX Bytes sent. */</div><div class='add'>+	u32 tx_bytes_hi;	/* FCoE TX Bytes sent. */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Per PCI  Function iSCSI Statistics required from the driver*/</div><div class='add'>+struct iscsi_stats_info {</div><div class='add'>+	u8 version[12];		/* Function's Driver Version. */</div><div class='add'>+	u8 mac_local[8];	/* Locally Admin iSCSI MAC Addr. */</div><div class='add'>+	u8 mac_add1[8];		/* Additional Programmed MAC Addr 1. */</div><div class='add'>+	/* QoS Priority (per 802.1p). 0-7255 */</div><div class='add'>+	u32 qos_priority;</div><div class='add'>+	u8 initiator_name[64];	/* iSCSI Boot Initiator Node name. */</div><div class='add'>+	u8 ww_port_name[64];	/* iSCSI World wide port name */</div><div class='add'>+	u8 boot_target_name[64];/* iSCSI Boot Target Name. */</div><div class='add'>+	u8 boot_target_ip[16];	/* iSCSI Boot Target IP. */</div><div class='add'>+	u32 boot_target_portal;	/* iSCSI Boot Target Portal. */</div><div class='add'>+	u8 boot_init_ip[16];	/* iSCSI Boot Initiator IP Address. */</div><div class='add'>+	u32 max_frame_size;	/* Max Frame Size. bytes */</div><div class='add'>+	u32 txq_size;		/* PDU TX Descriptors Queue Size. */</div><div class='add'>+	u32 rxq_size;		/* PDU RX Descriptors Queue Size. */</div><div class='add'>+	u32 txq_avg_depth;	/* PDU TX Descriptor Queue Avg Depth. */</div><div class='add'>+	u32 rxq_avg_depth;	/* PDU RX Descriptors Queue Avg Depth. */</div><div class='add'>+	u32 rx_pdus_lo;		/* iSCSI PDUs received. */</div><div class='add'>+	u32 rx_pdus_hi;		/* iSCSI PDUs received. */</div><div class='add'>+	u32 rx_bytes_lo;	/* iSCSI RX Bytes received. */</div><div class='add'>+	u32 rx_bytes_hi;	/* iSCSI RX Bytes received. */</div><div class='add'>+	u32 tx_pdus_lo;		/* iSCSI PDUs sent. */</div><div class='add'>+	u32 tx_pdus_hi;		/* iSCSI PDUs sent. */</div><div class='add'>+	u32 tx_bytes_lo;	/* iSCSI PDU TX Bytes sent. */</div><div class='add'>+	u32 tx_bytes_hi;	/* iSCSI PDU TX Bytes sent. */</div><div class='add'>+	u32 pcp_prior_map_tbl;	/* C-PCP to S-PCP Priority MapTable.</div><div class='add'>+				 * 9 nibbles, the position of each nibble</div><div class='add'>+				 * represents the C-PCP value, the value</div><div class='add'>+				 * of the nibble = S-PCP value.</div><div class='add'>+				 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union drv_info_to_mcp {</div><div class='add'>+	struct eth_stats_info	ether_stat;</div><div class='add'>+	struct fcoe_stats_info	fcoe_stat;</div><div class='add'>+	struct iscsi_stats_info	iscsi_stat;</div><div class='add'>+};</div><div class='ctx'> #define BCM_5710_FW_MAJOR_VERSION			7</div><div class='ctx'> #define BCM_5710_FW_MINOR_VERSION			0</div><div class='ctx'> #define BCM_5710_FW_REVISION_VERSION		29</div><div class='hunk'>@@ -4161,8 +4312,62 @@ struct ustorm_eth_rx_producers {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * cfc delete event data</div><div class='add'>+ * FCoE RX statistics parameters section#0</div><div class='ctx'>  */</div><div class='add'>+struct fcoe_rx_stat_params_section0 {</div><div class='add'>+	__le32 fcoe_rx_pkt_cnt;</div><div class='add'>+	__le32 fcoe_rx_byte_cnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FCoE RX statistics parameters section#1</div><div class='add'>+ */</div><div class='add'>+struct fcoe_rx_stat_params_section1 {</div><div class='add'>+	__le32 fcoe_ver_cnt;</div><div class='add'>+	__le32 fcoe_rx_drop_pkt_cnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FCoE RX statistics parameters section#2</div><div class='add'>+ */</div><div class='add'>+struct fcoe_rx_stat_params_section2 {</div><div class='add'>+	__le32 fc_crc_cnt;</div><div class='add'>+	__le32 eofa_del_cnt;</div><div class='add'>+	__le32 miss_frame_cnt;</div><div class='add'>+	__le32 seq_timeout_cnt;</div><div class='add'>+	__le32 drop_seq_cnt;</div><div class='add'>+	__le32 fcoe_rx_drop_pkt_cnt;</div><div class='add'>+	__le32 fcp_rx_pkt_cnt;</div><div class='add'>+	__le32 reserved0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FCoE TX statistics parameters</div><div class='add'>+ */</div><div class='add'>+struct fcoe_tx_stat_params {</div><div class='add'>+	__le32 fcoe_tx_pkt_cnt;</div><div class='add'>+	__le32 fcoe_tx_byte_cnt;</div><div class='add'>+	__le32 fcp_tx_pkt_cnt;</div><div class='add'>+	__le32 reserved0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FCoE statistics parameters</div><div class='add'>+ */</div><div class='add'>+struct fcoe_statistics_params {</div><div class='add'>+	struct fcoe_tx_stat_params tx_stat;</div><div class='add'>+	struct fcoe_rx_stat_params_section0 rx_stat0;</div><div class='add'>+	struct fcoe_rx_stat_params_section1 rx_stat1;</div><div class='add'>+	struct fcoe_rx_stat_params_section2 rx_stat2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * cfc delete event data</div><div class='add'>+*/</div><div class='ctx'> struct cfc_del_event_data {</div><div class='ctx'> 	u32 cid;</div><div class='ctx'> 	u32 reserved0;</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c<br/>index 882f48f0a03c..2091e5dbbcdd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> #include "bnx2x.h"</div><div class='ctx'> #include "bnx2x_cmn.h"</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /********************************************************/</div><div class='ctx'> #define ETH_HLEN			14</div><div class='ctx'> /* L2 header size + 2*VLANs (8 bytes) + LLC SNAP (8 bytes) */</div><div class='hunk'>@@ -163,6 +162,11 @@</div><div class='ctx'> #define EDC_MODE_LIMITING				0x0044</div><div class='ctx'> #define EDC_MODE_PASSIVE_DAC			0x0055</div><div class='ctx'> </div><div class='add'>+/* BRB default for class 0 E2 */</div><div class='add'>+#define DEFAULT0_E2_BRB_MAC_PAUSE_XOFF_THR	170</div><div class='add'>+#define DEFAULT0_E2_BRB_MAC_PAUSE_XON_THR		250</div><div class='add'>+#define DEFAULT0_E2_BRB_MAC_FULL_XOFF_THR		10</div><div class='add'>+#define DEFAULT0_E2_BRB_MAC_FULL_XON_THR		50</div><div class='ctx'> </div><div class='ctx'> /* BRB thresholds for E2*/</div><div class='ctx'> #define PFC_E2_BRB_MAC_PAUSE_XOFF_THR_PAUSE		170</div><div class='hunk'>@@ -177,6 +181,12 @@</div><div class='ctx'> #define PFC_E2_BRB_MAC_FULL_XON_THR_PAUSE			50</div><div class='ctx'> #define PFC_E2_BRB_MAC_FULL_XON_THR_NON_PAUSE		250</div><div class='ctx'> </div><div class='add'>+/* BRB default for class 0 E3A0 */</div><div class='add'>+#define DEFAULT0_E3A0_BRB_MAC_PAUSE_XOFF_THR	290</div><div class='add'>+#define DEFAULT0_E3A0_BRB_MAC_PAUSE_XON_THR	410</div><div class='add'>+#define DEFAULT0_E3A0_BRB_MAC_FULL_XOFF_THR	10</div><div class='add'>+#define DEFAULT0_E3A0_BRB_MAC_FULL_XON_THR	50</div><div class='add'>+</div><div class='ctx'> /* BRB thresholds for E3A0 */</div><div class='ctx'> #define PFC_E3A0_BRB_MAC_PAUSE_XOFF_THR_PAUSE		290</div><div class='ctx'> #define PFC_E3A0_BRB_MAC_PAUSE_XOFF_THR_NON_PAUSE		0</div><div class='hunk'>@@ -190,6 +200,11 @@</div><div class='ctx'> #define PFC_E3A0_BRB_MAC_FULL_XON_THR_PAUSE		50</div><div class='ctx'> #define PFC_E3A0_BRB_MAC_FULL_XON_THR_NON_PAUSE		410</div><div class='ctx'> </div><div class='add'>+/* BRB default for E3B0 */</div><div class='add'>+#define DEFAULT0_E3B0_BRB_MAC_PAUSE_XOFF_THR	330</div><div class='add'>+#define DEFAULT0_E3B0_BRB_MAC_PAUSE_XON_THR	490</div><div class='add'>+#define DEFAULT0_E3B0_BRB_MAC_FULL_XOFF_THR	15</div><div class='add'>+#define DEFAULT0_E3B0_BRB_MAC_FULL_XON_THR	55</div><div class='ctx'> </div><div class='ctx'> /* BRB thresholds for E3B0 2 port mode*/</div><div class='ctx'> #define PFC_E3B0_2P_BRB_MAC_PAUSE_XOFF_THR_PAUSE		1025</div><div class='hunk'>@@ -239,18 +254,29 @@</div><div class='ctx'> #define PFC_E3B0_4P_BRB_MAC_FULL_XON_THR_PAUSE		50</div><div class='ctx'> #define PFC_E3B0_4P_BRB_MAC_FULL_XON_THR_NON_PAUSE	384</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* only for E3B0*/</div><div class='ctx'> #define PFC_E3B0_4P_BRB_FULL_LB_XOFF_THR			304</div><div class='ctx'> #define PFC_E3B0_4P_BRB_FULL_LB_XON_THR			384</div><div class='del'>-#define PFC_E3B0_4P_LB_GUART				120</div><div class='add'>+#define PFC_E3B0_4P_LB_GUART		120</div><div class='ctx'> </div><div class='ctx'> #define PFC_E3B0_4P_BRB_MAC_0_CLASS_T_GUART		120</div><div class='del'>-#define PFC_E3B0_4P_BRB_MAC_0_CLASS_T_GUART_HYST		80</div><div class='add'>+#define PFC_E3B0_4P_BRB_MAC_0_CLASS_T_GUART_HYST	80</div><div class='ctx'> </div><div class='ctx'> #define PFC_E3B0_4P_BRB_MAC_1_CLASS_T_GUART		80</div><div class='del'>-#define PFC_E3B0_4P_BRB_MAC_1_CLASS_T_GUART_HYST		120</div><div class='add'>+#define PFC_E3B0_4P_BRB_MAC_1_CLASS_T_GUART_HYST	120</div><div class='add'>+</div><div class='add'>+/* Pause defines*/</div><div class='add'>+#define DEFAULT_E3B0_BRB_FULL_LB_XOFF_THR			330</div><div class='add'>+#define DEFAULT_E3B0_BRB_FULL_LB_XON_THR			490</div><div class='add'>+#define DEFAULT_E3B0_LB_GUART		40</div><div class='ctx'> </div><div class='add'>+#define DEFAULT_E3B0_BRB_MAC_0_CLASS_T_GUART		40</div><div class='add'>+#define DEFAULT_E3B0_BRB_MAC_0_CLASS_T_GUART_HYST	0</div><div class='add'>+</div><div class='add'>+#define DEFAULT_E3B0_BRB_MAC_1_CLASS_T_GUART		40</div><div class='add'>+#define DEFAULT_E3B0_BRB_MAC_1_CLASS_T_GUART_HYST	0</div><div class='add'>+</div><div class='add'>+/* ETS defines*/</div><div class='ctx'> #define DCBX_INVALID_COS					(0xFF)</div><div class='ctx'> </div><div class='ctx'> #define ETS_BW_LIMIT_CREDIT_UPPER_BOUND		(0x5000)</div><div class='hunk'>@@ -440,7 +466,7 @@ static u32 bnx2x_ets_get_min_w_val_nig(const struct link_vars *vars)</div><div class='ctx'> 	u32 min_w_val = 0;</div><div class='ctx'> 	/* Calculate min_w_val.*/</div><div class='ctx'> 	if (vars-&gt;link_up) {</div><div class='del'>-		if (SPEED_20000 == vars-&gt;line_speed)</div><div class='add'>+		if (vars-&gt;line_speed == SPEED_20000)</div><div class='ctx'> 			min_w_val = ETS_E3B0_NIG_MIN_W_VAL_20GBPS;</div><div class='ctx'> 		else</div><div class='ctx'> 			min_w_val = ETS_E3B0_NIG_MIN_W_VAL_UP_TO_10GBPS;</div><div class='hunk'>@@ -490,7 +516,7 @@ static void bnx2x_ets_e3b0_set_credit_upper_bound_nig(</div><div class='ctx'> 	REG_WR(bp, (port) ? NIG_REG_P1_TX_ARB_CREDIT_UPPER_BOUND_5 :</div><div class='ctx'> 		   NIG_REG_P0_TX_ARB_CREDIT_UPPER_BOUND_5, credit_upper_bound);</div><div class='ctx'> </div><div class='del'>-	if (0 == port) {</div><div class='add'>+	if (!port) {</div><div class='ctx'> 		REG_WR(bp, NIG_REG_P0_TX_ARB_CREDIT_UPPER_BOUND_6,</div><div class='ctx'> 			credit_upper_bound);</div><div class='ctx'> 		REG_WR(bp, NIG_REG_P0_TX_ARB_CREDIT_UPPER_BOUND_7,</div><div class='hunk'>@@ -584,7 +610,7 @@ static void bnx2x_ets_e3b0_nig_disabled(const struct link_params *params,</div><div class='ctx'> 		   NIG_REG_P0_TX_ARB_CREDIT_WEIGHT_4, 0x0);</div><div class='ctx'> 	REG_WR(bp, (port) ? NIG_REG_P1_TX_ARB_CREDIT_WEIGHT_5 :</div><div class='ctx'> 		   NIG_REG_P0_TX_ARB_CREDIT_WEIGHT_5, 0x0);</div><div class='del'>-	if (0 == port) {</div><div class='add'>+	if (!port) {</div><div class='ctx'> 		REG_WR(bp, NIG_REG_P0_TX_ARB_CREDIT_WEIGHT_6, 0x0);</div><div class='ctx'> 		REG_WR(bp, NIG_REG_P0_TX_ARB_CREDIT_WEIGHT_7, 0x0);</div><div class='ctx'> 		REG_WR(bp, NIG_REG_P0_TX_ARB_CREDIT_WEIGHT_8, 0x0);</div><div class='hunk'>@@ -612,7 +638,7 @@ static void bnx2x_ets_e3b0_set_credit_upper_bound_pbf(</div><div class='ctx'> 	* In 2 port mode port0 has COS0-5 that can be used for WFQ.In 4</div><div class='ctx'> 	* port mode port1 has COS0-2 that can be used for WFQ.</div><div class='ctx'> 	*/</div><div class='del'>-	if (0 == port) {</div><div class='add'>+	if (!port) {</div><div class='ctx'> 		base_upper_bound = PBF_REG_COS0_UPPER_BOUND_P0;</div><div class='ctx'> 		max_cos = DCBX_E3B0_MAX_NUM_COS_PORT0;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -674,7 +700,7 @@ static void bnx2x_ets_e3b0_pbf_disabled(const struct link_params *params)</div><div class='ctx'> 	* In 2 port mode port0 has COS0-5 that can be used for WFQ.</div><div class='ctx'> 	* In 4 port mode port1 has COS0-2 that can be used for WFQ.</div><div class='ctx'> 	*/</div><div class='del'>-	if (0 == port) {</div><div class='add'>+	if (!port) {</div><div class='ctx'> 		base_weight = PBF_REG_COS0_WEIGHT_P0;</div><div class='ctx'> 		max_cos = DCBX_E3B0_MAX_NUM_COS_PORT0;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -846,34 +872,47 @@ static int bnx2x_ets_e3b0_set_cos_bw(struct bnx2x *bp,</div><div class='ctx'> ******************************************************************************/</div><div class='ctx'> static int bnx2x_ets_e3b0_get_total_bw(</div><div class='ctx'> 	const struct link_params *params,</div><div class='del'>-	const struct bnx2x_ets_params *ets_params,</div><div class='add'>+	struct bnx2x_ets_params *ets_params,</div><div class='ctx'> 	u16 *total_bw)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	u8 cos_idx = 0;</div><div class='add'>+	u8 is_bw_cos_exist = 0;</div><div class='ctx'> </div><div class='ctx'> 	*total_bw = 0 ;</div><div class='add'>+</div><div class='ctx'> 	/* Calculate total BW requested */</div><div class='ctx'> 	for (cos_idx = 0; cos_idx &lt; ets_params-&gt;num_of_cos; cos_idx++) {</div><div class='del'>-		if (bnx2x_cos_state_bw == ets_params-&gt;cos[cos_idx].state) {</div><div class='add'>+		if (ets_params-&gt;cos[cos_idx].state == bnx2x_cos_state_bw) {</div><div class='add'>+			is_bw_cos_exist = 1;</div><div class='add'>+			if (!ets_params-&gt;cos[cos_idx].params.bw_params.bw) {</div><div class='add'>+				DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config BW"</div><div class='add'>+						   "was set to 0\n");</div><div class='add'>+				/*</div><div class='add'>+				 * This is to prevent a state when ramrods</div><div class='add'>+				 * can't be sent</div><div class='add'>+				*/</div><div class='add'>+				ets_params-&gt;cos[cos_idx].params.bw_params.bw</div><div class='add'>+					 = 1;</div><div class='add'>+			}</div><div class='ctx'> 			*total_bw +=</div><div class='ctx'> 				ets_params-&gt;cos[cos_idx].params.bw_params.bw;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check total BW is valid */</div><div class='del'>-	if ((100 != *total_bw) || (0 == *total_bw)) {</div><div class='del'>-		if (0 == *total_bw) {</div><div class='add'>+	if ((is_bw_cos_exist == 1) &amp;&amp; (*total_bw != 100)) {</div><div class='add'>+		if (*total_bw == 0) {</div><div class='ctx'> 			DP(NETIF_MSG_LINK,</div><div class='del'>-			   "bnx2x_ets_E3B0_config toatl BW shouldn't be 0\n");</div><div class='add'>+			   "bnx2x_ets_E3B0_config total BW shouldn't be 0\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		DP(NETIF_MSG_LINK,</div><div class='del'>-		   "bnx2x_ets_E3B0_config toatl BW should be 100\n");</div><div class='del'>-		/**</div><div class='del'>-		*   We can handle a case whre the BW isn't 100 this can happen</div><div class='del'>-		*   if the TC are joined.</div><div class='del'>-		*/</div><div class='add'>+		   "bnx2x_ets_E3B0_config total BW should be 100\n");</div><div class='add'>+		/*</div><div class='add'>+		 * We can handle a case whre the BW isn't 100 this can happen</div><div class='add'>+		 * if the TC are joined.</div><div class='add'>+		 */</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -904,7 +943,7 @@ static int bnx2x_ets_e3b0_sp_pri_to_cos_set(const struct link_params *params,</div><div class='ctx'> 	const u8 max_num_of_cos = (port) ? DCBX_E3B0_MAX_NUM_COS_PORT1 :</div><div class='ctx'> 		DCBX_E3B0_MAX_NUM_COS_PORT0;</div><div class='ctx'> </div><div class='del'>-	if (DCBX_INVALID_COS != sp_pri_to_cos[pri]) {</div><div class='add'>+	if (sp_pri_to_cos[pri] != DCBX_INVALID_COS) {</div><div class='ctx'> 		DP(NETIF_MSG_LINK, "bnx2x_ets_e3b0_sp_pri_to_cos_set invalid "</div><div class='ctx'> 				   "parameter There can't be two COS's with "</div><div class='ctx'> 				   "the same strict pri\n");</div><div class='hunk'>@@ -913,7 +952,7 @@ static int bnx2x_ets_e3b0_sp_pri_to_cos_set(const struct link_params *params,</div><div class='ctx'> </div><div class='ctx'> 	if (pri &gt; max_num_of_cos) {</div><div class='ctx'> 		DP(NETIF_MSG_LINK, "bnx2x_ets_e3b0_sp_pri_to_cos_set invalid "</div><div class='del'>-			       "parameter Illegal strict priority\n");</div><div class='add'>+		   "parameter Illegal strict priority\n");</div><div class='ctx'> 	    return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -995,8 +1034,8 @@ static int bnx2x_ets_e3b0_sp_set_pri_cli_reg(const struct link_params *params,</div><div class='ctx'> </div><div class='ctx'> 	/* Set all the strict priority first */</div><div class='ctx'> 	for (i = 0; i &lt; max_num_of_cos; i++) {</div><div class='del'>-		if (DCBX_INVALID_COS != sp_pri_to_cos[i]) {</div><div class='del'>-			if (DCBX_MAX_NUM_COS &lt;= sp_pri_to_cos[i]) {</div><div class='add'>+		if (sp_pri_to_cos[i] != DCBX_INVALID_COS) {</div><div class='add'>+			if (sp_pri_to_cos[i] &gt;= DCBX_MAX_NUM_COS) {</div><div class='ctx'> 				DP(NETIF_MSG_LINK,</div><div class='ctx'> 					   "bnx2x_ets_e3b0_sp_set_pri_cli_reg "</div><div class='ctx'> 					   "invalid cos entry\n");</div><div class='hunk'>@@ -1010,7 +1049,7 @@ static int bnx2x_ets_e3b0_sp_set_pri_cli_reg(const struct link_params *params,</div><div class='ctx'> 			    sp_pri_to_cos[i], pri_set);</div><div class='ctx'> 			pri_bitmask = 1 &lt;&lt; sp_pri_to_cos[i];</div><div class='ctx'> 			/* COS is used remove it from bitmap.*/</div><div class='del'>-			if (0 == (pri_bitmask &amp; cos_bit_to_set)) {</div><div class='add'>+			if (!(pri_bitmask &amp; cos_bit_to_set)) {</div><div class='ctx'> 				DP(NETIF_MSG_LINK,</div><div class='ctx'> 					"bnx2x_ets_e3b0_sp_set_pri_cli_reg "</div><div class='ctx'> 					"invalid There can't be two COS's with"</div><div class='hunk'>@@ -1072,7 +1111,7 @@ static int bnx2x_ets_e3b0_sp_set_pri_cli_reg(const struct link_params *params,</div><div class='ctx'> ******************************************************************************/</div><div class='ctx'> int bnx2x_ets_e3b0_config(const struct link_params *params,</div><div class='ctx'> 			 const struct link_vars *vars,</div><div class='del'>-			 const struct bnx2x_ets_params *ets_params)</div><div class='add'>+			 struct bnx2x_ets_params *ets_params)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	int bnx2x_status = 0;</div><div class='hunk'>@@ -1105,15 +1144,15 @@ int bnx2x_ets_e3b0_config(const struct link_params *params,</div><div class='ctx'> 	/* Prepare BW parameters*/</div><div class='ctx'> 	bnx2x_status = bnx2x_ets_e3b0_get_total_bw(params, ets_params,</div><div class='ctx'> 						   &amp;total_bw);</div><div class='del'>-	if (0 != bnx2x_status) {</div><div class='add'>+	if (bnx2x_status) {</div><div class='ctx'> 		DP(NETIF_MSG_LINK,</div><div class='ctx'> 		   "bnx2x_ets_E3B0_config get_total_bw failed\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/**</div><div class='del'>-	 *  Upper bound is set according to current link speed (min_w_val</div><div class='del'>-	 *  should be the same for upper bound and COS credit val).</div><div class='add'>+	/*</div><div class='add'>+	 * Upper bound is set according to current link speed (min_w_val</div><div class='add'>+	 * should be the same for upper bound and COS credit val).</div><div class='ctx'> 	 */</div><div class='ctx'> 	bnx2x_ets_e3b0_set_credit_upper_bound_nig(params, min_w_val_nig);</div><div class='ctx'> 	bnx2x_ets_e3b0_set_credit_upper_bound_pbf(params, min_w_val_pbf);</div><div class='hunk'>@@ -1122,7 +1161,7 @@ int bnx2x_ets_e3b0_config(const struct link_params *params,</div><div class='ctx'> 	for (cos_entry = 0; cos_entry &lt; ets_params-&gt;num_of_cos; cos_entry++) {</div><div class='ctx'> 		if (bnx2x_cos_state_bw == ets_params-&gt;cos[cos_entry].state) {</div><div class='ctx'> 			cos_bw_bitmap |= (1 &lt;&lt; cos_entry);</div><div class='del'>-			/**</div><div class='add'>+			/*</div><div class='ctx'> 			 * The function also sets the BW in HW(not the mappin</div><div class='ctx'> 			 * yet)</div><div class='ctx'> 			 */</div><div class='hunk'>@@ -1146,7 +1185,7 @@ int bnx2x_ets_e3b0_config(const struct link_params *params,</div><div class='ctx'> 			   "bnx2x_ets_e3b0_config cos state not valid\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		if (0 != bnx2x_status) {</div><div class='add'>+		if (bnx2x_status) {</div><div class='ctx'> 			DP(NETIF_MSG_LINK,</div><div class='ctx'> 			   "bnx2x_ets_e3b0_config set cos bw failed\n");</div><div class='ctx'> 			return bnx2x_status;</div><div class='hunk'>@@ -1157,7 +1196,7 @@ int bnx2x_ets_e3b0_config(const struct link_params *params,</div><div class='ctx'> 	bnx2x_status = bnx2x_ets_e3b0_sp_set_pri_cli_reg(params,</div><div class='ctx'> 							 sp_pri_to_cos);</div><div class='ctx'> </div><div class='del'>-	if (0 != bnx2x_status) {</div><div class='add'>+	if (bnx2x_status) {</div><div class='ctx'> 		DP(NETIF_MSG_LINK,</div><div class='ctx'> 		   "bnx2x_ets_E3B0_config set_pri_cli_reg failed\n");</div><div class='ctx'> 		return bnx2x_status;</div><div class='hunk'>@@ -1168,7 +1207,7 @@ int bnx2x_ets_e3b0_config(const struct link_params *params,</div><div class='ctx'> 					      cos_sp_bitmap,</div><div class='ctx'> 					      cos_bw_bitmap);</div><div class='ctx'> </div><div class='del'>-	if (0 != bnx2x_status) {</div><div class='add'>+	if (bnx2x_status) {</div><div class='ctx'> 		DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config SP failed\n");</div><div class='ctx'> 		return bnx2x_status;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1232,9 +1271,9 @@ void bnx2x_ets_bw_limit(const struct link_params *params, const u32 cos0_bw,</div><div class='ctx'> </div><div class='ctx'> 	DP(NETIF_MSG_LINK, "ETS enabled BW limit configuration\n");</div><div class='ctx'> </div><div class='del'>-	if ((0 == total_bw) ||</div><div class='del'>-	    (0 == cos0_bw) ||</div><div class='del'>-	    (0 == cos1_bw)) {</div><div class='add'>+	if ((!total_bw) ||</div><div class='add'>+	    (!cos0_bw) ||</div><div class='add'>+	    (!cos1_bw)) {</div><div class='ctx'> 		DP(NETIF_MSG_LINK, "Total BW can't be zero\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1290,7 +1329,7 @@ int bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos)</div><div class='ctx'> 	 * dbg0-010     dbg1-001     cos1-100     cos0-011     MCP-000</div><div class='ctx'> 	 * dbg0-010     dbg1-001     cos0-011     cos1-100     MCP-000</div><div class='ctx'> 	 */</div><div class='del'>-	val = (0 == strict_cos) ? 0x2318 : 0x22E0;</div><div class='add'>+	val = (!strict_cos) ? 0x2318 : 0x22E0;</div><div class='ctx'> 	REG_WR(bp, NIG_REG_P0_TX_ARB_PRIORITY_CLIENT, val);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1298,7 +1337,6 @@ int bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos)</div><div class='ctx'> /******************************************************************/</div><div class='ctx'> /*			PFC section				  */</div><div class='ctx'> /******************************************************************/</div><div class='del'>-</div><div class='ctx'> static void bnx2x_update_pfc_xmac(struct link_params *params,</div><div class='ctx'> 				  struct link_vars *vars,</div><div class='ctx'> 				  u8 is_lb)</div><div class='hunk'>@@ -1401,7 +1439,7 @@ void bnx2x_pfc_statistic(struct link_params *params, struct link_vars *vars,</div><div class='ctx'> 	if (!vars-&gt;link_up)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (MAC_TYPE_EMAC == vars-&gt;mac_type) {</div><div class='add'>+	if (vars-&gt;mac_type == MAC_TYPE_EMAC) {</div><div class='ctx'> 		DP(NETIF_MSG_LINK, "About to read PFC stats from EMAC\n");</div><div class='ctx'> 		bnx2x_emac_get_pfc_stat(params, pfc_frames_sent,</div><div class='ctx'> 					pfc_frames_received);</div><div class='hunk'>@@ -1435,6 +1473,18 @@ static void bnx2x_set_mdio_clk(struct bnx2x *bp, u32 chip_id, u8 port)</div><div class='ctx'> </div><div class='ctx'> 	udelay(40);</div><div class='ctx'> }</div><div class='add'>+static u8 bnx2x_is_4_port_mode(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+	u32 port4mode_ovwr_val;</div><div class='add'>+	/* Check 4-port override enabled */</div><div class='add'>+	port4mode_ovwr_val = REG_RD(bp, MISC_REG_PORT4MODE_EN_OVWR);</div><div class='add'>+	if (port4mode_ovwr_val &amp; (1&lt;&lt;0)) {</div><div class='add'>+		/* Return 4-port mode override value */</div><div class='add'>+		return ((port4mode_ovwr_val &amp; (1&lt;&lt;1)) == (1&lt;&lt;1));</div><div class='add'>+	}</div><div class='add'>+	/* Return 4-port mode from input pin */</div><div class='add'>+	return (u8)REG_RD(bp, MISC_REG_PORT4MODE_EN);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_emac_init(struct link_params *params,</div><div class='ctx'> 			    struct link_vars *vars)</div><div class='hunk'>@@ -1601,31 +1651,18 @@ static void bnx2x_umac_enable(struct link_params *params,</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 bnx2x_is_4_port_mode(struct bnx2x *bp)</div><div class='del'>-{</div><div class='del'>-	u32 port4mode_ovwr_val;</div><div class='del'>-	/* Check 4-port override enabled */</div><div class='del'>-	port4mode_ovwr_val = REG_RD(bp, MISC_REG_PORT4MODE_EN_OVWR);</div><div class='del'>-	if (port4mode_ovwr_val &amp; (1&lt;&lt;0)) {</div><div class='del'>-		/* Return 4-port mode override value */</div><div class='del'>-		return ((port4mode_ovwr_val &amp; (1&lt;&lt;1)) == (1&lt;&lt;1));</div><div class='del'>-	}</div><div class='del'>-	/* Return 4-port mode from input pin */</div><div class='del'>-	return (u8)REG_RD(bp, MISC_REG_PORT4MODE_EN);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Define the XMAC mode */</div><div class='ctx'> static void bnx2x_xmac_init(struct link_params *params, u32 max_speed)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	u32 is_port4mode = bnx2x_is_4_port_mode(bp);</div><div class='ctx'> </div><div class='del'>-	/**</div><div class='del'>-	* In 4-port mode, need to set the mode only once, so if XMAC is</div><div class='del'>-	* already out of reset, it means the mode has already been set,</div><div class='del'>-	* and it must not* reset the XMAC again, since it controls both</div><div class='del'>-	* ports of the path</div><div class='del'>-	**/</div><div class='add'>+	/*</div><div class='add'>+	 * In 4-port mode, need to set the mode only once, so if XMAC is</div><div class='add'>+	 * already out of reset, it means the mode has already been set,</div><div class='add'>+	 * and it must not* reset the XMAC again, since it controls both</div><div class='add'>+	 * ports of the path</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	if ((CHIP_NUM(bp) == CHIP_NUM_57840) &amp;&amp;</div><div class='ctx'> 	    (REG_RD(bp, MISC_REG_RESET_REG_2) &amp;</div><div class='hunk'>@@ -1743,6 +1780,7 @@ static int bnx2x_xmac_enable(struct link_params *params,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> static int bnx2x_emac_enable(struct link_params *params,</div><div class='ctx'> 			     struct link_vars *vars, u8 lb)</div><div class='ctx'> {</div><div class='hunk'>@@ -1999,7 +2037,6 @@ static void bnx2x_update_pfc_bmac2(struct link_params *params,</div><div class='ctx'> 	REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_BMAC_CONTROL, wb_data, 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* PFC BRB internal port configuration params */</div><div class='ctx'> struct bnx2x_pfc_brb_threshold_val {</div><div class='ctx'> 	u32 pause_xoff;</div><div class='hunk'>@@ -2009,6 +2046,8 @@ struct bnx2x_pfc_brb_threshold_val {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bnx2x_pfc_brb_e3b0_val {</div><div class='add'>+	u32 per_class_guaranty_mode;</div><div class='add'>+	u32 lb_guarantied_hyst;</div><div class='ctx'> 	u32 full_lb_xoff_th;</div><div class='ctx'> 	u32 full_lb_xon_threshold;</div><div class='ctx'> 	u32 lb_guarantied;</div><div class='hunk'>@@ -2021,6 +2060,9 @@ struct bnx2x_pfc_brb_e3b0_val {</div><div class='ctx'> struct bnx2x_pfc_brb_th_val {</div><div class='ctx'> 	struct bnx2x_pfc_brb_threshold_val pauseable_th;</div><div class='ctx'> 	struct bnx2x_pfc_brb_threshold_val non_pauseable_th;</div><div class='add'>+	struct bnx2x_pfc_brb_threshold_val default_class0;</div><div class='add'>+	struct bnx2x_pfc_brb_threshold_val default_class1;</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> static int bnx2x_pfc_brb_get_config_params(</div><div class='ctx'> 				struct link_params *params,</div><div class='hunk'>@@ -2028,140 +2070,200 @@ static int bnx2x_pfc_brb_get_config_params(</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	DP(NETIF_MSG_LINK, "Setting PFC BRB configuration\n");</div><div class='add'>+</div><div class='add'>+	config_val-&gt;default_class1.pause_xoff = 0;</div><div class='add'>+	config_val-&gt;default_class1.pause_xon = 0;</div><div class='add'>+	config_val-&gt;default_class1.full_xoff = 0;</div><div class='add'>+	config_val-&gt;default_class1.full_xon = 0;</div><div class='add'>+</div><div class='ctx'> 	if (CHIP_IS_E2(bp)) {</div><div class='add'>+		/*  class0 defaults */</div><div class='add'>+		config_val-&gt;default_class0.pause_xoff =</div><div class='add'>+			DEFAULT0_E2_BRB_MAC_PAUSE_XOFF_THR;</div><div class='add'>+		config_val-&gt;default_class0.pause_xon =</div><div class='add'>+			DEFAULT0_E2_BRB_MAC_PAUSE_XON_THR;</div><div class='add'>+		config_val-&gt;default_class0.full_xoff =</div><div class='add'>+			DEFAULT0_E2_BRB_MAC_FULL_XOFF_THR;</div><div class='add'>+		config_val-&gt;default_class0.full_xon =</div><div class='add'>+			DEFAULT0_E2_BRB_MAC_FULL_XON_THR;</div><div class='add'>+		/*  pause able*/</div><div class='ctx'> 		config_val-&gt;pauseable_th.pause_xoff =</div><div class='del'>-		    PFC_E2_BRB_MAC_PAUSE_XOFF_THR_PAUSE;</div><div class='add'>+			PFC_E2_BRB_MAC_PAUSE_XOFF_THR_PAUSE;</div><div class='ctx'> 		config_val-&gt;pauseable_th.pause_xon =</div><div class='del'>-		    PFC_E2_BRB_MAC_PAUSE_XON_THR_PAUSE;</div><div class='add'>+			PFC_E2_BRB_MAC_PAUSE_XON_THR_PAUSE;</div><div class='ctx'> 		config_val-&gt;pauseable_th.full_xoff =</div><div class='del'>-		    PFC_E2_BRB_MAC_FULL_XOFF_THR_PAUSE;</div><div class='add'>+			PFC_E2_BRB_MAC_FULL_XOFF_THR_PAUSE;</div><div class='ctx'> 		config_val-&gt;pauseable_th.full_xon =</div><div class='del'>-		    PFC_E2_BRB_MAC_FULL_XON_THR_PAUSE;</div><div class='add'>+			PFC_E2_BRB_MAC_FULL_XON_THR_PAUSE;</div><div class='ctx'> 		/* non pause able*/</div><div class='ctx'> 		config_val-&gt;non_pauseable_th.pause_xoff =</div><div class='del'>-		    PFC_E2_BRB_MAC_PAUSE_XOFF_THR_NON_PAUSE;</div><div class='add'>+			PFC_E2_BRB_MAC_PAUSE_XOFF_THR_NON_PAUSE;</div><div class='ctx'> 		config_val-&gt;non_pauseable_th.pause_xon =</div><div class='del'>-		    PFC_E2_BRB_MAC_PAUSE_XON_THR_NON_PAUSE;</div><div class='add'>+			PFC_E2_BRB_MAC_PAUSE_XON_THR_NON_PAUSE;</div><div class='ctx'> 		config_val-&gt;non_pauseable_th.full_xoff =</div><div class='del'>-		    PFC_E2_BRB_MAC_FULL_XOFF_THR_NON_PAUSE;</div><div class='add'>+			PFC_E2_BRB_MAC_FULL_XOFF_THR_NON_PAUSE;</div><div class='ctx'> 		config_val-&gt;non_pauseable_th.full_xon =</div><div class='del'>-		    PFC_E2_BRB_MAC_FULL_XON_THR_NON_PAUSE;</div><div class='add'>+			PFC_E2_BRB_MAC_FULL_XON_THR_NON_PAUSE;</div><div class='ctx'> 	} else if (CHIP_IS_E3A0(bp)) {</div><div class='add'>+		/*  class0 defaults */</div><div class='add'>+		config_val-&gt;default_class0.pause_xoff =</div><div class='add'>+			DEFAULT0_E3A0_BRB_MAC_PAUSE_XOFF_THR;</div><div class='add'>+		config_val-&gt;default_class0.pause_xon =</div><div class='add'>+			DEFAULT0_E3A0_BRB_MAC_PAUSE_XON_THR;</div><div class='add'>+		config_val-&gt;default_class0.full_xoff =</div><div class='add'>+			DEFAULT0_E3A0_BRB_MAC_FULL_XOFF_THR;</div><div class='add'>+		config_val-&gt;default_class0.full_xon =</div><div class='add'>+			DEFAULT0_E3A0_BRB_MAC_FULL_XON_THR;</div><div class='add'>+		/*  pause able */</div><div class='ctx'> 		config_val-&gt;pauseable_th.pause_xoff =</div><div class='del'>-		    PFC_E3A0_BRB_MAC_PAUSE_XOFF_THR_PAUSE;</div><div class='add'>+			PFC_E3A0_BRB_MAC_PAUSE_XOFF_THR_PAUSE;</div><div class='ctx'> 		config_val-&gt;pauseable_th.pause_xon =</div><div class='del'>-		    PFC_E3A0_BRB_MAC_PAUSE_XON_THR_PAUSE;</div><div class='add'>+			PFC_E3A0_BRB_MAC_PAUSE_XON_THR_PAUSE;</div><div class='ctx'> 		config_val-&gt;pauseable_th.full_xoff =</div><div class='del'>-		    PFC_E3A0_BRB_MAC_FULL_XOFF_THR_PAUSE;</div><div class='add'>+			PFC_E3A0_BRB_MAC_FULL_XOFF_THR_PAUSE;</div><div class='ctx'> 		config_val-&gt;pauseable_th.full_xon =</div><div class='del'>-		    PFC_E3A0_BRB_MAC_FULL_XON_THR_PAUSE;</div><div class='add'>+			PFC_E3A0_BRB_MAC_FULL_XON_THR_PAUSE;</div><div class='ctx'> 		/* non pause able*/</div><div class='ctx'> 		config_val-&gt;non_pauseable_th.pause_xoff =</div><div class='del'>-		    PFC_E3A0_BRB_MAC_PAUSE_XOFF_THR_NON_PAUSE;</div><div class='add'>+			PFC_E3A0_BRB_MAC_PAUSE_XOFF_THR_NON_PAUSE;</div><div class='ctx'> 		config_val-&gt;non_pauseable_th.pause_xon =</div><div class='del'>-		    PFC_E3A0_BRB_MAC_PAUSE_XON_THR_NON_PAUSE;</div><div class='add'>+			PFC_E3A0_BRB_MAC_PAUSE_XON_THR_NON_PAUSE;</div><div class='ctx'> 		config_val-&gt;non_pauseable_th.full_xoff =</div><div class='del'>-		    PFC_E3A0_BRB_MAC_FULL_XOFF_THR_NON_PAUSE;</div><div class='add'>+			PFC_E3A0_BRB_MAC_FULL_XOFF_THR_NON_PAUSE;</div><div class='ctx'> 		config_val-&gt;non_pauseable_th.full_xon =</div><div class='del'>-		    PFC_E3A0_BRB_MAC_FULL_XON_THR_NON_PAUSE;</div><div class='add'>+			PFC_E3A0_BRB_MAC_FULL_XON_THR_NON_PAUSE;</div><div class='ctx'> 	} else if (CHIP_IS_E3B0(bp)) {</div><div class='add'>+		/*  class0 defaults */</div><div class='add'>+		config_val-&gt;default_class0.pause_xoff =</div><div class='add'>+			DEFAULT0_E3B0_BRB_MAC_PAUSE_XOFF_THR;</div><div class='add'>+		config_val-&gt;default_class0.pause_xon =</div><div class='add'>+		    DEFAULT0_E3B0_BRB_MAC_PAUSE_XON_THR;</div><div class='add'>+		config_val-&gt;default_class0.full_xoff =</div><div class='add'>+		    DEFAULT0_E3B0_BRB_MAC_FULL_XOFF_THR;</div><div class='add'>+		config_val-&gt;default_class0.full_xon =</div><div class='add'>+		    DEFAULT0_E3B0_BRB_MAC_FULL_XON_THR;</div><div class='add'>+</div><div class='ctx'> 		if (params-&gt;phy[INT_PHY].flags &amp;</div><div class='ctx'> 		    FLAGS_4_PORT_MODE) {</div><div class='ctx'> 			config_val-&gt;pauseable_th.pause_xoff =</div><div class='del'>-			    PFC_E3B0_4P_BRB_MAC_PAUSE_XOFF_THR_PAUSE;</div><div class='add'>+				PFC_E3B0_4P_BRB_MAC_PAUSE_XOFF_THR_PAUSE;</div><div class='ctx'> 			config_val-&gt;pauseable_th.pause_xon =</div><div class='del'>-			    PFC_E3B0_4P_BRB_MAC_PAUSE_XON_THR_PAUSE;</div><div class='add'>+				PFC_E3B0_4P_BRB_MAC_PAUSE_XON_THR_PAUSE;</div><div class='ctx'> 			config_val-&gt;pauseable_th.full_xoff =</div><div class='del'>-			    PFC_E3B0_4P_BRB_MAC_FULL_XOFF_THR_PAUSE;</div><div class='add'>+				PFC_E3B0_4P_BRB_MAC_FULL_XOFF_THR_PAUSE;</div><div class='ctx'> 			config_val-&gt;pauseable_th.full_xon =</div><div class='del'>-			    PFC_E3B0_4P_BRB_MAC_FULL_XON_THR_PAUSE;</div><div class='add'>+				PFC_E3B0_4P_BRB_MAC_FULL_XON_THR_PAUSE;</div><div class='ctx'> 			/* non pause able*/</div><div class='ctx'> 			config_val-&gt;non_pauseable_th.pause_xoff =</div><div class='del'>-			    PFC_E3B0_4P_BRB_MAC_PAUSE_XOFF_THR_NON_PAUSE;</div><div class='add'>+			PFC_E3B0_4P_BRB_MAC_PAUSE_XOFF_THR_NON_PAUSE;</div><div class='ctx'> 			config_val-&gt;non_pauseable_th.pause_xon =</div><div class='del'>-			    PFC_E3B0_4P_BRB_MAC_PAUSE_XON_THR_NON_PAUSE;</div><div class='add'>+			PFC_E3B0_4P_BRB_MAC_PAUSE_XON_THR_NON_PAUSE;</div><div class='ctx'> 			config_val-&gt;non_pauseable_th.full_xoff =</div><div class='del'>-			    PFC_E3B0_4P_BRB_MAC_FULL_XOFF_THR_NON_PAUSE;</div><div class='add'>+			PFC_E3B0_4P_BRB_MAC_FULL_XOFF_THR_NON_PAUSE;</div><div class='ctx'> 			config_val-&gt;non_pauseable_th.full_xon =</div><div class='del'>-			    PFC_E3B0_4P_BRB_MAC_FULL_XON_THR_NON_PAUSE;</div><div class='del'>-	    } else {</div><div class='del'>-		config_val-&gt;pauseable_th.pause_xoff =</div><div class='del'>-		    PFC_E3B0_2P_BRB_MAC_PAUSE_XOFF_THR_PAUSE;</div><div class='del'>-		config_val-&gt;pauseable_th.pause_xon =</div><div class='del'>-		    PFC_E3B0_2P_BRB_MAC_PAUSE_XON_THR_PAUSE;</div><div class='del'>-		config_val-&gt;pauseable_th.full_xoff =</div><div class='del'>-		    PFC_E3B0_2P_BRB_MAC_FULL_XOFF_THR_PAUSE;</div><div class='del'>-		config_val-&gt;pauseable_th.full_xon =</div><div class='del'>-			PFC_E3B0_2P_BRB_MAC_FULL_XON_THR_PAUSE;</div><div class='del'>-		/* non pause able*/</div><div class='del'>-		config_val-&gt;non_pauseable_th.pause_xoff =</div><div class='del'>-		    PFC_E3B0_2P_BRB_MAC_PAUSE_XOFF_THR_NON_PAUSE;</div><div class='del'>-		config_val-&gt;non_pauseable_th.pause_xon =</div><div class='del'>-		    PFC_E3B0_2P_BRB_MAC_PAUSE_XON_THR_NON_PAUSE;</div><div class='del'>-		config_val-&gt;non_pauseable_th.full_xoff =</div><div class='del'>-		    PFC_E3B0_2P_BRB_MAC_FULL_XOFF_THR_NON_PAUSE;</div><div class='del'>-		config_val-&gt;non_pauseable_th.full_xon =</div><div class='del'>-		    PFC_E3B0_2P_BRB_MAC_FULL_XON_THR_NON_PAUSE;</div><div class='del'>-	    }</div><div class='add'>+			PFC_E3B0_4P_BRB_MAC_FULL_XON_THR_NON_PAUSE;</div><div class='add'>+		} else {</div><div class='add'>+			config_val-&gt;pauseable_th.pause_xoff =</div><div class='add'>+				PFC_E3B0_2P_BRB_MAC_PAUSE_XOFF_THR_PAUSE;</div><div class='add'>+			config_val-&gt;pauseable_th.pause_xon =</div><div class='add'>+				PFC_E3B0_2P_BRB_MAC_PAUSE_XON_THR_PAUSE;</div><div class='add'>+			config_val-&gt;pauseable_th.full_xoff =</div><div class='add'>+				PFC_E3B0_2P_BRB_MAC_FULL_XOFF_THR_PAUSE;</div><div class='add'>+			config_val-&gt;pauseable_th.full_xon =</div><div class='add'>+				PFC_E3B0_2P_BRB_MAC_FULL_XON_THR_PAUSE;</div><div class='add'>+			/* non pause able*/</div><div class='add'>+			config_val-&gt;non_pauseable_th.pause_xoff =</div><div class='add'>+				PFC_E3B0_2P_BRB_MAC_PAUSE_XOFF_THR_NON_PAUSE;</div><div class='add'>+			config_val-&gt;non_pauseable_th.pause_xon =</div><div class='add'>+				PFC_E3B0_2P_BRB_MAC_PAUSE_XON_THR_NON_PAUSE;</div><div class='add'>+			config_val-&gt;non_pauseable_th.full_xoff =</div><div class='add'>+				PFC_E3B0_2P_BRB_MAC_FULL_XOFF_THR_NON_PAUSE;</div><div class='add'>+			config_val-&gt;non_pauseable_th.full_xon =</div><div class='add'>+				PFC_E3B0_2P_BRB_MAC_FULL_XON_THR_NON_PAUSE;</div><div class='add'>+		}</div><div class='ctx'> 	} else</div><div class='ctx'> 	    return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static void bnx2x_pfc_brb_get_e3b0_config_params(struct link_params *params,</div><div class='del'>-						 struct bnx2x_pfc_brb_e3b0_val</div><div class='del'>-						 *e3b0_val,</div><div class='del'>-						 u32 cos0_pauseable,</div><div class='del'>-						 u32 cos1_pauseable)</div><div class='add'>+static void bnx2x_pfc_brb_get_e3b0_config_params(</div><div class='add'>+		struct link_params *params,</div><div class='add'>+		struct bnx2x_pfc_brb_e3b0_val</div><div class='add'>+		*e3b0_val,</div><div class='add'>+		struct bnx2x_nig_brb_pfc_port_params *pfc_params,</div><div class='add'>+		const u8 pfc_enabled)</div><div class='ctx'> {</div><div class='del'>-	if (params-&gt;phy[INT_PHY].flags &amp; FLAGS_4_PORT_MODE) {</div><div class='add'>+	if (pfc_enabled &amp;&amp; pfc_params) {</div><div class='add'>+		e3b0_val-&gt;per_class_guaranty_mode = 1;</div><div class='add'>+		e3b0_val-&gt;lb_guarantied_hyst = 80;</div><div class='add'>+</div><div class='add'>+		if (params-&gt;phy[INT_PHY].flags &amp;</div><div class='add'>+		    FLAGS_4_PORT_MODE) {</div><div class='add'>+			e3b0_val-&gt;full_lb_xoff_th =</div><div class='add'>+				PFC_E3B0_4P_BRB_FULL_LB_XOFF_THR;</div><div class='add'>+			e3b0_val-&gt;full_lb_xon_threshold =</div><div class='add'>+				PFC_E3B0_4P_BRB_FULL_LB_XON_THR;</div><div class='add'>+			e3b0_val-&gt;lb_guarantied =</div><div class='add'>+				PFC_E3B0_4P_LB_GUART;</div><div class='add'>+			e3b0_val-&gt;mac_0_class_t_guarantied =</div><div class='add'>+				PFC_E3B0_4P_BRB_MAC_0_CLASS_T_GUART;</div><div class='add'>+			e3b0_val-&gt;mac_0_class_t_guarantied_hyst =</div><div class='add'>+				PFC_E3B0_4P_BRB_MAC_0_CLASS_T_GUART_HYST;</div><div class='add'>+			e3b0_val-&gt;mac_1_class_t_guarantied =</div><div class='add'>+				PFC_E3B0_4P_BRB_MAC_1_CLASS_T_GUART;</div><div class='add'>+			e3b0_val-&gt;mac_1_class_t_guarantied_hyst =</div><div class='add'>+				PFC_E3B0_4P_BRB_MAC_1_CLASS_T_GUART_HYST;</div><div class='add'>+		} else {</div><div class='add'>+			e3b0_val-&gt;full_lb_xoff_th =</div><div class='add'>+				PFC_E3B0_2P_BRB_FULL_LB_XOFF_THR;</div><div class='add'>+			e3b0_val-&gt;full_lb_xon_threshold =</div><div class='add'>+				PFC_E3B0_2P_BRB_FULL_LB_XON_THR;</div><div class='add'>+			e3b0_val-&gt;mac_0_class_t_guarantied_hyst =</div><div class='add'>+				PFC_E3B0_2P_BRB_MAC_0_CLASS_T_GUART_HYST;</div><div class='add'>+			e3b0_val-&gt;mac_1_class_t_guarantied =</div><div class='add'>+				PFC_E3B0_2P_BRB_MAC_1_CLASS_T_GUART;</div><div class='add'>+			e3b0_val-&gt;mac_1_class_t_guarantied_hyst =</div><div class='add'>+				PFC_E3B0_2P_BRB_MAC_1_CLASS_T_GUART_HYST;</div><div class='add'>+</div><div class='add'>+			if (pfc_params-&gt;cos0_pauseable !=</div><div class='add'>+				pfc_params-&gt;cos1_pauseable) {</div><div class='add'>+				/* nonpauseable= Lossy + pauseable = Lossless*/</div><div class='add'>+				e3b0_val-&gt;lb_guarantied =</div><div class='add'>+					PFC_E3B0_2P_MIX_PAUSE_LB_GUART;</div><div class='add'>+				e3b0_val-&gt;mac_0_class_t_guarantied =</div><div class='add'>+			       PFC_E3B0_2P_MIX_PAUSE_MAC_0_CLASS_T_GUART;</div><div class='add'>+			} else if (pfc_params-&gt;cos0_pauseable) {</div><div class='add'>+				/* Lossless +Lossless*/</div><div class='add'>+				e3b0_val-&gt;lb_guarantied =</div><div class='add'>+					PFC_E3B0_2P_PAUSE_LB_GUART;</div><div class='add'>+				e3b0_val-&gt;mac_0_class_t_guarantied =</div><div class='add'>+				   PFC_E3B0_2P_PAUSE_MAC_0_CLASS_T_GUART;</div><div class='add'>+			} else {</div><div class='add'>+				/* Lossy +Lossy*/</div><div class='add'>+				e3b0_val-&gt;lb_guarantied =</div><div class='add'>+					PFC_E3B0_2P_NON_PAUSE_LB_GUART;</div><div class='add'>+				e3b0_val-&gt;mac_0_class_t_guarantied =</div><div class='add'>+			       PFC_E3B0_2P_NON_PAUSE_MAC_0_CLASS_T_GUART;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		e3b0_val-&gt;per_class_guaranty_mode = 0;</div><div class='add'>+		e3b0_val-&gt;lb_guarantied_hyst = 0;</div><div class='ctx'> 		e3b0_val-&gt;full_lb_xoff_th =</div><div class='del'>-		    PFC_E3B0_4P_BRB_FULL_LB_XOFF_THR;</div><div class='add'>+			DEFAULT_E3B0_BRB_FULL_LB_XOFF_THR;</div><div class='ctx'> 		e3b0_val-&gt;full_lb_xon_threshold =</div><div class='del'>-		    PFC_E3B0_4P_BRB_FULL_LB_XON_THR;</div><div class='add'>+			DEFAULT_E3B0_BRB_FULL_LB_XON_THR;</div><div class='ctx'> 		e3b0_val-&gt;lb_guarantied =</div><div class='del'>-		    PFC_E3B0_4P_LB_GUART;</div><div class='add'>+			DEFAULT_E3B0_LB_GUART;</div><div class='ctx'> 		e3b0_val-&gt;mac_0_class_t_guarantied =</div><div class='del'>-		    PFC_E3B0_4P_BRB_MAC_0_CLASS_T_GUART;</div><div class='add'>+			DEFAULT_E3B0_BRB_MAC_0_CLASS_T_GUART;</div><div class='ctx'> 		e3b0_val-&gt;mac_0_class_t_guarantied_hyst =</div><div class='del'>-		    PFC_E3B0_4P_BRB_MAC_0_CLASS_T_GUART_HYST;</div><div class='add'>+			DEFAULT_E3B0_BRB_MAC_0_CLASS_T_GUART_HYST;</div><div class='ctx'> 		e3b0_val-&gt;mac_1_class_t_guarantied =</div><div class='del'>-		    PFC_E3B0_4P_BRB_MAC_1_CLASS_T_GUART;</div><div class='add'>+			DEFAULT_E3B0_BRB_MAC_1_CLASS_T_GUART;</div><div class='ctx'> 		e3b0_val-&gt;mac_1_class_t_guarantied_hyst =</div><div class='del'>-		    PFC_E3B0_4P_BRB_MAC_1_CLASS_T_GUART_HYST;</div><div class='del'>-	} else {</div><div class='del'>-		e3b0_val-&gt;full_lb_xoff_th =</div><div class='del'>-		    PFC_E3B0_2P_BRB_FULL_LB_XOFF_THR;</div><div class='del'>-		e3b0_val-&gt;full_lb_xon_threshold =</div><div class='del'>-		    PFC_E3B0_2P_BRB_FULL_LB_XON_THR;</div><div class='del'>-		e3b0_val-&gt;mac_0_class_t_guarantied_hyst =</div><div class='del'>-		    PFC_E3B0_2P_BRB_MAC_0_CLASS_T_GUART_HYST;</div><div class='del'>-		e3b0_val-&gt;mac_1_class_t_guarantied =</div><div class='del'>-		    PFC_E3B0_2P_BRB_MAC_1_CLASS_T_GUART;</div><div class='del'>-		e3b0_val-&gt;mac_1_class_t_guarantied_hyst =</div><div class='del'>-		    PFC_E3B0_2P_BRB_MAC_1_CLASS_T_GUART_HYST;</div><div class='del'>-</div><div class='del'>-		if (cos0_pauseable != cos1_pauseable) {</div><div class='del'>-			/* nonpauseable= Lossy + pauseable = Lossless*/</div><div class='del'>-			e3b0_val-&gt;lb_guarantied =</div><div class='del'>-			    PFC_E3B0_2P_MIX_PAUSE_LB_GUART;</div><div class='del'>-			e3b0_val-&gt;mac_0_class_t_guarantied =</div><div class='del'>-			    PFC_E3B0_2P_MIX_PAUSE_MAC_0_CLASS_T_GUART;</div><div class='del'>-		} else if (cos0_pauseable) {</div><div class='del'>-			/* Lossless +Lossless*/</div><div class='del'>-			e3b0_val-&gt;lb_guarantied =</div><div class='del'>-			    PFC_E3B0_2P_PAUSE_LB_GUART;</div><div class='del'>-			e3b0_val-&gt;mac_0_class_t_guarantied =</div><div class='del'>-			    PFC_E3B0_2P_PAUSE_MAC_0_CLASS_T_GUART;</div><div class='del'>-		} else {</div><div class='del'>-			/* Lossy +Lossy*/</div><div class='del'>-			e3b0_val-&gt;lb_guarantied =</div><div class='del'>-			    PFC_E3B0_2P_NON_PAUSE_LB_GUART;</div><div class='del'>-			e3b0_val-&gt;mac_0_class_t_guarantied =</div><div class='del'>-			    PFC_E3B0_2P_NON_PAUSE_MAC_0_CLASS_T_GUART;</div><div class='del'>-		}</div><div class='add'>+			DEFAULT_E3B0_BRB_MAC_1_CLASS_T_GUART_HYST;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> static int bnx2x_update_pfc_brb(struct link_params *params,</div><div class='hunk'>@@ -2172,23 +2274,28 @@ static int bnx2x_update_pfc_brb(struct link_params *params,</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	struct bnx2x_pfc_brb_th_val config_val = { {0} };</div><div class='ctx'> 	struct bnx2x_pfc_brb_threshold_val *reg_th_config =</div><div class='del'>-	    &amp;config_val.pauseable_th;</div><div class='add'>+		&amp;config_val.pauseable_th;</div><div class='ctx'> 	struct bnx2x_pfc_brb_e3b0_val e3b0_val = {0};</div><div class='del'>-	int set_pfc = params-&gt;feature_config_flags &amp;</div><div class='add'>+	const int set_pfc = params-&gt;feature_config_flags &amp;</div><div class='ctx'> 		FEATURE_CONFIG_PFC_ENABLED;</div><div class='add'>+	const u8 pfc_enabled = (set_pfc &amp;&amp; pfc_params);</div><div class='ctx'> 	int bnx2x_status = 0;</div><div class='ctx'> 	u8 port = params-&gt;port;</div><div class='ctx'> </div><div class='ctx'> 	/* default - pause configuration */</div><div class='ctx'> 	reg_th_config = &amp;config_val.pauseable_th;</div><div class='ctx'> 	bnx2x_status = bnx2x_pfc_brb_get_config_params(params, &amp;config_val);</div><div class='del'>-	if (0 != bnx2x_status)</div><div class='add'>+	if (bnx2x_status)</div><div class='ctx'> 		return bnx2x_status;</div><div class='ctx'> </div><div class='del'>-	if (set_pfc &amp;&amp; pfc_params)</div><div class='add'>+	if (pfc_enabled) {</div><div class='ctx'> 		/* First COS */</div><div class='del'>-		if (!pfc_params-&gt;cos0_pauseable)</div><div class='add'>+		if (pfc_params-&gt;cos0_pauseable)</div><div class='add'>+			reg_th_config = &amp;config_val.pauseable_th;</div><div class='add'>+		else</div><div class='ctx'> 			reg_th_config = &amp;config_val.non_pauseable_th;</div><div class='add'>+	} else</div><div class='add'>+		reg_th_config = &amp;config_val.default_class0;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The number of free blocks below which the pause signal to class 0</div><div class='ctx'> 	 * of MAC #n is asserted. n=0,1</div><div class='hunk'>@@ -2215,122 +2322,119 @@ static int bnx2x_update_pfc_brb(struct link_params *params,</div><div class='ctx'> 	REG_WR(bp, (port) ? BRB1_REG_FULL_0_XON_THRESHOLD_1 :</div><div class='ctx'> 	       BRB1_REG_FULL_0_XON_THRESHOLD_0 , reg_th_config-&gt;full_xon);</div><div class='ctx'> </div><div class='del'>-	if (set_pfc &amp;&amp; pfc_params) {</div><div class='add'>+	if (pfc_enabled) {</div><div class='ctx'> 		/* Second COS */</div><div class='ctx'> 		if (pfc_params-&gt;cos1_pauseable)</div><div class='ctx'> 			reg_th_config = &amp;config_val.pauseable_th;</div><div class='ctx'> 		else</div><div class='ctx'> 			reg_th_config = &amp;config_val.non_pauseable_th;</div><div class='add'>+	} else</div><div class='add'>+		reg_th_config = &amp;config_val.default_class1;</div><div class='add'>+	/*</div><div class='add'>+	 * The number of free blocks below which the pause signal to</div><div class='add'>+	 * class 1 of MAC #n is asserted. n=0,1</div><div class='add'>+	 */</div><div class='add'>+	REG_WR(bp, (port) ? BRB1_REG_PAUSE_1_XOFF_THRESHOLD_1 :</div><div class='add'>+	       BRB1_REG_PAUSE_1_XOFF_THRESHOLD_0,</div><div class='add'>+	       reg_th_config-&gt;pause_xoff);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The number of free blocks above which the pause signal to</div><div class='add'>+	 * class 1 of MAC #n is de-asserted. n=0,1</div><div class='add'>+	 */</div><div class='add'>+	REG_WR(bp, (port) ? BRB1_REG_PAUSE_1_XON_THRESHOLD_1 :</div><div class='add'>+	       BRB1_REG_PAUSE_1_XON_THRESHOLD_0,</div><div class='add'>+	       reg_th_config-&gt;pause_xon);</div><div class='add'>+	/*</div><div class='add'>+	 * The number of free blocks below which the full signal to</div><div class='add'>+	 * class 1 of MAC #n is asserted. n=0,1</div><div class='add'>+	 */</div><div class='add'>+	REG_WR(bp, (port) ? BRB1_REG_FULL_1_XOFF_THRESHOLD_1 :</div><div class='add'>+	       BRB1_REG_FULL_1_XOFF_THRESHOLD_0,</div><div class='add'>+	       reg_th_config-&gt;full_xoff);</div><div class='add'>+	/*</div><div class='add'>+	 * The number of free blocks above which the full signal to</div><div class='add'>+	 * class 1 of MAC #n is de-asserted. n=0,1</div><div class='add'>+	 */</div><div class='add'>+	REG_WR(bp, (port) ? BRB1_REG_FULL_1_XON_THRESHOLD_1 :</div><div class='add'>+	       BRB1_REG_FULL_1_XON_THRESHOLD_0,</div><div class='add'>+	       reg_th_config-&gt;full_xon);</div><div class='add'>+</div><div class='add'>+	if (CHIP_IS_E3B0(bp)) {</div><div class='add'>+		bnx2x_pfc_brb_get_e3b0_config_params(</div><div class='add'>+			params,</div><div class='add'>+			&amp;e3b0_val,</div><div class='add'>+			pfc_params,</div><div class='add'>+			pfc_enabled);</div><div class='add'>+</div><div class='add'>+		REG_WR(bp, BRB1_REG_PER_CLASS_GUARANTY_MODE,</div><div class='add'>+			   e3b0_val.per_class_guaranty_mode);</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='del'>-		 * The number of free blocks below which the pause signal to</div><div class='del'>-		 * class 1 of MAC #n is asserted. n=0,1</div><div class='del'>-		**/</div><div class='del'>-		REG_WR(bp, (port) ? BRB1_REG_PAUSE_1_XOFF_THRESHOLD_1 :</div><div class='del'>-		       BRB1_REG_PAUSE_1_XOFF_THRESHOLD_0,</div><div class='del'>-		       reg_th_config-&gt;pause_xoff);</div><div class='add'>+		 * The hysteresis on the guarantied buffer space for the Lb</div><div class='add'>+		 * port before signaling XON.</div><div class='add'>+		 */</div><div class='add'>+		REG_WR(bp, BRB1_REG_LB_GUARANTIED_HYST,</div><div class='add'>+			   e3b0_val.lb_guarantied_hyst);</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='del'>-		 * The number of free blocks above which the pause signal to</div><div class='del'>-		 * class 1 of MAC #n is de-asserted. n=0,1</div><div class='add'>+		 * The number of free blocks below which the full signal to the</div><div class='add'>+		 * LB port is asserted.</div><div class='ctx'> 		 */</div><div class='del'>-		REG_WR(bp, (port) ? BRB1_REG_PAUSE_1_XON_THRESHOLD_1 :</div><div class='del'>-		       BRB1_REG_PAUSE_1_XON_THRESHOLD_0,</div><div class='del'>-		       reg_th_config-&gt;pause_xon);</div><div class='add'>+		REG_WR(bp, BRB1_REG_FULL_LB_XOFF_THRESHOLD,</div><div class='add'>+		       e3b0_val.full_lb_xoff_th);</div><div class='ctx'> 		/*</div><div class='del'>-		 * The number of free blocks below which the full signal to</div><div class='del'>-		 * class 1 of MAC #n is asserted. n=0,1</div><div class='add'>+		 * The number of free blocks above which the full signal to the</div><div class='add'>+		 * LB port is de-asserted.</div><div class='ctx'> 		 */</div><div class='del'>-		REG_WR(bp, (port) ? BRB1_REG_FULL_1_XOFF_THRESHOLD_1 :</div><div class='del'>-		       BRB1_REG_FULL_1_XOFF_THRESHOLD_0,</div><div class='del'>-		       reg_th_config-&gt;full_xoff);</div><div class='add'>+		REG_WR(bp, BRB1_REG_FULL_LB_XON_THRESHOLD,</div><div class='add'>+		       e3b0_val.full_lb_xon_threshold);</div><div class='ctx'> 		/*</div><div class='del'>-		 * The number of free blocks above which the full signal to</div><div class='del'>-		 * class 1 of MAC #n is de-asserted. n=0,1</div><div class='add'>+		 * The number of blocks guarantied for the MAC #n port. n=0,1</div><div class='ctx'> 		 */</div><div class='del'>-		REG_WR(bp, (port) ? BRB1_REG_FULL_1_XON_THRESHOLD_1 :</div><div class='del'>-		       BRB1_REG_FULL_1_XON_THRESHOLD_0,</div><div class='del'>-		       reg_th_config-&gt;full_xon);</div><div class='ctx'> </div><div class='add'>+		/* The number of blocks guarantied for the LB port.*/</div><div class='add'>+		REG_WR(bp, BRB1_REG_LB_GUARANTIED,</div><div class='add'>+		       e3b0_val.lb_guarantied);</div><div class='ctx'> </div><div class='del'>-		if (CHIP_IS_E3B0(bp)) {</div><div class='del'>-			/*Should be done by init tool */</div><div class='del'>-			/*</div><div class='del'>-			* BRB_empty_for_dup = BRB1_REG_BRB_EMPTY_THRESHOLD</div><div class='del'>-			* reset value</div><div class='del'>-			* 944</div><div class='del'>-			*/</div><div class='del'>-</div><div class='del'>-			/**</div><div class='del'>-			 * The hysteresis on the guarantied buffer space for the Lb port</div><div class='del'>-			 * before signaling XON.</div><div class='del'>-			 **/</div><div class='del'>-			REG_WR(bp, BRB1_REG_LB_GUARANTIED_HYST, 80);</div><div class='del'>-</div><div class='del'>-			bnx2x_pfc_brb_get_e3b0_config_params(</div><div class='del'>-			    params,</div><div class='del'>-			    &amp;e3b0_val,</div><div class='del'>-			    pfc_params-&gt;cos0_pauseable,</div><div class='del'>-			    pfc_params-&gt;cos1_pauseable);</div><div class='del'>-			/**</div><div class='del'>-			 * The number of free blocks below which the full signal to the</div><div class='del'>-			 * LB port is asserted.</div><div class='del'>-			*/</div><div class='del'>-			REG_WR(bp, BRB1_REG_FULL_LB_XOFF_THRESHOLD,</div><div class='del'>-				   e3b0_val.full_lb_xoff_th);</div><div class='del'>-			/**</div><div class='del'>-			 * The number of free blocks above which the full signal to the</div><div class='del'>-			 * LB port is de-asserted.</div><div class='del'>-			*/</div><div class='del'>-			REG_WR(bp, BRB1_REG_FULL_LB_XON_THRESHOLD,</div><div class='del'>-				   e3b0_val.full_lb_xon_threshold);</div><div class='del'>-			/**</div><div class='del'>-			* The number of blocks guarantied for the MAC #n port. n=0,1</div><div class='del'>-			*/</div><div class='del'>-</div><div class='del'>-			/*The number of blocks guarantied for the LB port.*/</div><div class='del'>-			REG_WR(bp, BRB1_REG_LB_GUARANTIED,</div><div class='del'>-			       e3b0_val.lb_guarantied);</div><div class='del'>-</div><div class='del'>-			/**</div><div class='del'>-			 * The number of blocks guarantied for the MAC #n port.</div><div class='del'>-			*/</div><div class='del'>-			REG_WR(bp, BRB1_REG_MAC_GUARANTIED_0,</div><div class='del'>-				   2 * e3b0_val.mac_0_class_t_guarantied);</div><div class='del'>-			REG_WR(bp, BRB1_REG_MAC_GUARANTIED_1,</div><div class='del'>-				   2 * e3b0_val.mac_1_class_t_guarantied);</div><div class='del'>-			/**</div><div class='del'>-			 * The number of blocks guarantied for class #t in MAC0. t=0,1</div><div class='del'>-			*/</div><div class='del'>-			REG_WR(bp, BRB1_REG_MAC_0_CLASS_0_GUARANTIED,</div><div class='del'>-			       e3b0_val.mac_0_class_t_guarantied);</div><div class='del'>-			REG_WR(bp, BRB1_REG_MAC_0_CLASS_1_GUARANTIED,</div><div class='del'>-			       e3b0_val.mac_0_class_t_guarantied);</div><div class='del'>-			/**</div><div class='del'>-			 * The hysteresis on the guarantied buffer space for class in</div><div class='del'>-			 * MAC0.  t=0,1</div><div class='del'>-			*/</div><div class='del'>-			REG_WR(bp, BRB1_REG_MAC_0_CLASS_0_GUARANTIED_HYST,</div><div class='del'>-			       e3b0_val.mac_0_class_t_guarantied_hyst);</div><div class='del'>-			REG_WR(bp, BRB1_REG_MAC_0_CLASS_1_GUARANTIED_HYST,</div><div class='del'>-			       e3b0_val.mac_0_class_t_guarantied_hyst);</div><div class='del'>-</div><div class='del'>-			/**</div><div class='del'>-			 * The number of blocks guarantied for class #t in MAC1.t=0,1</div><div class='del'>-			*/</div><div class='del'>-			REG_WR(bp, BRB1_REG_MAC_1_CLASS_0_GUARANTIED,</div><div class='del'>-			       e3b0_val.mac_1_class_t_guarantied);</div><div class='del'>-			REG_WR(bp, BRB1_REG_MAC_1_CLASS_1_GUARANTIED,</div><div class='del'>-			       e3b0_val.mac_1_class_t_guarantied);</div><div class='del'>-			/**</div><div class='del'>-			 * The hysteresis on the guarantied buffer space for class #t</div><div class='del'>-			* in MAC1.  t=0,1</div><div class='del'>-			*/</div><div class='del'>-			REG_WR(bp, BRB1_REG_MAC_1_CLASS_0_GUARANTIED_HYST,</div><div class='del'>-			       e3b0_val.mac_1_class_t_guarantied_hyst);</div><div class='del'>-			REG_WR(bp, BRB1_REG_MAC_1_CLASS_1_GUARANTIED_HYST,</div><div class='del'>-			       e3b0_val.mac_1_class_t_guarantied_hyst);</div><div class='del'>-</div><div class='del'>-	    }</div><div class='add'>+		/*</div><div class='add'>+		 * The number of blocks guarantied for the MAC #n port.</div><div class='add'>+		 */</div><div class='add'>+		REG_WR(bp, BRB1_REG_MAC_GUARANTIED_0,</div><div class='add'>+		       2 * e3b0_val.mac_0_class_t_guarantied);</div><div class='add'>+		REG_WR(bp, BRB1_REG_MAC_GUARANTIED_1,</div><div class='add'>+		       2 * e3b0_val.mac_1_class_t_guarantied);</div><div class='add'>+		/*</div><div class='add'>+		 * The number of blocks guarantied for class #t in MAC0. t=0,1</div><div class='add'>+		 */</div><div class='add'>+		REG_WR(bp, BRB1_REG_MAC_0_CLASS_0_GUARANTIED,</div><div class='add'>+		       e3b0_val.mac_0_class_t_guarantied);</div><div class='add'>+		REG_WR(bp, BRB1_REG_MAC_0_CLASS_1_GUARANTIED,</div><div class='add'>+		       e3b0_val.mac_0_class_t_guarantied);</div><div class='add'>+		/*</div><div class='add'>+		 * The hysteresis on the guarantied buffer space for class in</div><div class='add'>+		 * MAC0.  t=0,1</div><div class='add'>+		 */</div><div class='add'>+		REG_WR(bp, BRB1_REG_MAC_0_CLASS_0_GUARANTIED_HYST,</div><div class='add'>+		       e3b0_val.mac_0_class_t_guarantied_hyst);</div><div class='add'>+		REG_WR(bp, BRB1_REG_MAC_0_CLASS_1_GUARANTIED_HYST,</div><div class='add'>+		       e3b0_val.mac_0_class_t_guarantied_hyst);</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * The number of blocks guarantied for class #t in MAC1.t=0,1</div><div class='add'>+		 */</div><div class='add'>+		REG_WR(bp, BRB1_REG_MAC_1_CLASS_0_GUARANTIED,</div><div class='add'>+		       e3b0_val.mac_1_class_t_guarantied);</div><div class='add'>+		REG_WR(bp, BRB1_REG_MAC_1_CLASS_1_GUARANTIED,</div><div class='add'>+		       e3b0_val.mac_1_class_t_guarantied);</div><div class='add'>+		/*</div><div class='add'>+		 * The hysteresis on the guarantied buffer space for class #t</div><div class='add'>+		 * in MAC1.  t=0,1</div><div class='add'>+		 */</div><div class='add'>+		REG_WR(bp, BRB1_REG_MAC_1_CLASS_0_GUARANTIED_HYST,</div><div class='add'>+		       e3b0_val.mac_1_class_t_guarantied_hyst);</div><div class='add'>+		REG_WR(bp, BRB1_REG_MAC_1_CLASS_1_GUARANTIED_HYST,</div><div class='add'>+		       e3b0_val.mac_1_class_t_guarantied_hyst);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return bnx2x_status;</div><div class='hunk'>@@ -2398,7 +2502,7 @@ static void bnx2x_update_pfc_nig(struct link_params *params,</div><div class='ctx'> 		struct bnx2x_nig_brb_pfc_port_params *nig_params)</div><div class='ctx'> {</div><div class='ctx'> 	u32 xcm_mask = 0, ppp_enable = 0, pause_enable = 0, llfc_out_en = 0;</div><div class='del'>-	u32 llfc_enable = 0, xcm0_out_en = 0, p0_hwpfc_enable = 0;</div><div class='add'>+	u32 llfc_enable = 0, xcm_out_en = 0, hwpfc_enable = 0;</div><div class='ctx'> 	u32 pkt_priority_to_cos = 0;</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	u8 port = params-&gt;port;</div><div class='hunk'>@@ -2412,9 +2516,8 @@ static void bnx2x_update_pfc_nig(struct link_params *params,</div><div class='ctx'> 	 * MAC control frames (that are not pause packets)</div><div class='ctx'> 	 * will be forwarded to the XCM.</div><div class='ctx'> 	 */</div><div class='del'>-	xcm_mask = REG_RD(bp,</div><div class='del'>-				port ? NIG_REG_LLH1_XCM_MASK :</div><div class='del'>-				NIG_REG_LLH0_XCM_MASK);</div><div class='add'>+	xcm_mask = REG_RD(bp, port ? NIG_REG_LLH1_XCM_MASK :</div><div class='add'>+			  NIG_REG_LLH0_XCM_MASK);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * nig params will override non PFC params, since it's possible to</div><div class='ctx'> 	 * do transition from PFC to SAFC</div><div class='hunk'>@@ -2429,8 +2532,8 @@ static void bnx2x_update_pfc_nig(struct link_params *params,</div><div class='ctx'> 		ppp_enable = 1;</div><div class='ctx'> 		xcm_mask &amp;= ~(port ? NIG_LLH1_XCM_MASK_REG_LLH1_XCM_MASK_BCN :</div><div class='ctx'> 				     NIG_LLH0_XCM_MASK_REG_LLH0_XCM_MASK_BCN);</div><div class='del'>-		xcm0_out_en = 0;</div><div class='del'>-		p0_hwpfc_enable = 1;</div><div class='add'>+		xcm_out_en = 0;</div><div class='add'>+		hwpfc_enable = 1;</div><div class='ctx'> 	} else  {</div><div class='ctx'> 		if (nig_params) {</div><div class='ctx'> 			llfc_out_en = nig_params-&gt;llfc_out_en;</div><div class='hunk'>@@ -2441,7 +2544,7 @@ static void bnx2x_update_pfc_nig(struct link_params *params,</div><div class='ctx'> </div><div class='ctx'> 		xcm_mask |= (port ? NIG_LLH1_XCM_MASK_REG_LLH1_XCM_MASK_BCN :</div><div class='ctx'> 			NIG_LLH0_XCM_MASK_REG_LLH0_XCM_MASK_BCN);</div><div class='del'>-		xcm0_out_en = 1;</div><div class='add'>+		xcm_out_en = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (CHIP_IS_E3(bp))</div><div class='hunk'>@@ -2460,13 +2563,16 @@ static void bnx2x_update_pfc_nig(struct link_params *params,</div><div class='ctx'> 	REG_WR(bp, port ? NIG_REG_LLH1_XCM_MASK :</div><div class='ctx'> 	       NIG_REG_LLH0_XCM_MASK, xcm_mask);</div><div class='ctx'> </div><div class='del'>-	REG_WR(bp,  NIG_REG_LLFC_EGRESS_SRC_ENABLE_0, 0x7);</div><div class='add'>+	REG_WR(bp, port ? NIG_REG_LLFC_EGRESS_SRC_ENABLE_1 :</div><div class='add'>+	       NIG_REG_LLFC_EGRESS_SRC_ENABLE_0, 0x7);</div><div class='ctx'> </div><div class='ctx'> 	/* output enable for RX_XCM # IF */</div><div class='del'>-	REG_WR(bp, NIG_REG_XCM0_OUT_EN, xcm0_out_en);</div><div class='add'>+	REG_WR(bp, port ? NIG_REG_XCM1_OUT_EN :</div><div class='add'>+	       NIG_REG_XCM0_OUT_EN, xcm_out_en);</div><div class='ctx'> </div><div class='ctx'> 	/* HW PFC TX enable */</div><div class='del'>-	REG_WR(bp, NIG_REG_P0_HWPFC_ENABLE, p0_hwpfc_enable);</div><div class='add'>+	REG_WR(bp, port ? NIG_REG_P1_HWPFC_ENABLE :</div><div class='add'>+	       NIG_REG_P0_HWPFC_ENABLE, hwpfc_enable);</div><div class='ctx'> </div><div class='ctx'> 	if (nig_params) {</div><div class='ctx'> 		u8 i = 0;</div><div class='hunk'>@@ -2515,7 +2621,7 @@ int bnx2x_update_pfc(struct link_params *params,</div><div class='ctx'> </div><div class='ctx'> 	/* update BRB params */</div><div class='ctx'> 	bnx2x_status = bnx2x_update_pfc_brb(params, vars, pfc_params);</div><div class='del'>-	if (0 != bnx2x_status)</div><div class='add'>+	if (bnx2x_status)</div><div class='ctx'> 		return bnx2x_status;</div><div class='ctx'> </div><div class='ctx'> 	if (!vars-&gt;link_up)</div><div class='hunk'>@@ -2533,7 +2639,6 @@ int bnx2x_update_pfc(struct link_params *params,</div><div class='ctx'> 			bnx2x_emac_enable(params, vars, 0);</div><div class='ctx'> 			return bnx2x_status;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 		if (CHIP_IS_E2(bp))</div><div class='ctx'> 			bnx2x_update_pfc_bmac2(params, vars, bmac_loopback);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -3053,7 +3158,6 @@ static int bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,</div><div class='ctx'> 		DP(NETIF_MSG_LINK, "write phy register failed\n");</div><div class='ctx'> 		netdev_err(bp-&gt;dev,  "MDC/MDIO access timeout\n");</div><div class='ctx'> 		rc = -EFAULT;</div><div class='del'>-</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* data */</div><div class='ctx'> 		tmp = ((phy-&gt;addr &lt;&lt; 21) | (devad &lt;&lt; 16) | val |</div><div class='hunk'>@@ -3090,8 +3194,6 @@ static int bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,</div><div class='ctx'> 			       EMAC_MDIO_STATUS_10MB);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /******************************************************************/</div><div class='ctx'> /*			BSC access functions from E3	          */</div><div class='ctx'> /******************************************************************/</div><div class='hunk'>@@ -3339,7 +3441,7 @@ static void bnx2x_set_aer_mmd(struct link_params *params,</div><div class='ctx'> 		aer_val = 0x3800 + offset - 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		aer_val = 0x3800 + offset;</div><div class='del'>-	DP(NETIF_MSG_LINK, "Set AER to 0x%x\n", aer_val);</div><div class='add'>+</div><div class='ctx'> 	CL22_WR_OVER_CL45(bp, phy, MDIO_REG_BANK_AER_BLOCK,</div><div class='ctx'> 			  MDIO_AER_BLOCK_AER_REG, aer_val);</div><div class='ctx'> </div><div class='hunk'>@@ -3661,7 +3763,15 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy,</div><div class='ctx'> 	/* Advertise pause */</div><div class='ctx'> 	bnx2x_ext_phy_set_pause(params, phy, vars);</div><div class='ctx'> </div><div class='del'>-	vars-&gt;rx_tx_asic_rst = MAX_KR_LINK_RETRY;</div><div class='add'>+	/*</div><div class='add'>+	 * Set KR Autoneg Work-Around flag for Warpcore version older than D108</div><div class='add'>+	 */</div><div class='add'>+	bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,</div><div class='add'>+			MDIO_WC_REG_UC_INFO_B1_VERSION, &amp;val16);</div><div class='add'>+	if (val16 &lt; 0xd108) {</div><div class='add'>+		DP(NETIF_MSG_LINK, "Enable AN KR work-around\n");</div><div class='add'>+		vars-&gt;rx_tx_asic_rst = MAX_KR_LINK_RETRY;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,</div><div class='ctx'> 			MDIO_WC_REG_DIGITAL5_MISC7, &amp;val16);</div><div class='hunk'>@@ -3942,13 +4052,11 @@ static void bnx2x_warpcore_set_20G_DXGXS(struct bnx2x *bp,</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_warpcore_set_sgmii_speed(struct bnx2x_phy *phy,</div><div class='ctx'> 					   struct link_params *params,</div><div class='del'>-					   u8 fiber_mode)</div><div class='add'>+					   u8 fiber_mode,</div><div class='add'>+					   u8 always_autoneg)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	u16 val16, digctrl_kx1, digctrl_kx2;</div><div class='del'>-	u8 lane;</div><div class='del'>-</div><div class='del'>-	lane = bnx2x_get_warpcore_lane(phy, params);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear XFI clock comp in non-10G single lane mode. */</div><div class='ctx'> 	bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,</div><div class='hunk'>@@ -3956,7 +4064,7 @@ static void bnx2x_warpcore_set_sgmii_speed(struct bnx2x_phy *phy,</div><div class='ctx'> 	bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,</div><div class='ctx'> 			 MDIO_WC_REG_RX66_CONTROL, val16 &amp; ~(3&lt;&lt;13));</div><div class='ctx'> </div><div class='del'>-	if (phy-&gt;req_line_speed == SPEED_AUTO_NEG) {</div><div class='add'>+	if (always_autoneg || phy-&gt;req_line_speed == SPEED_AUTO_NEG) {</div><div class='ctx'> 		/* SGMII Autoneg */</div><div class='ctx'> 		bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,</div><div class='ctx'> 				MDIO_WC_REG_COMBO_IEEE0_MIICTRL, &amp;val16);</div><div class='hunk'>@@ -3967,7 +4075,7 @@ static void bnx2x_warpcore_set_sgmii_speed(struct bnx2x_phy *phy,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,</div><div class='ctx'> 				MDIO_WC_REG_COMBO_IEEE0_MIICTRL, &amp;val16);</div><div class='del'>-		val16 &amp;= 0xcfbf;</div><div class='add'>+		val16 &amp;= 0xcebf;</div><div class='ctx'> 		switch (phy-&gt;req_line_speed) {</div><div class='ctx'> 		case SPEED_10:</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -4043,9 +4151,7 @@ static void bnx2x_warpcore_reset_lane(struct bnx2x *bp,</div><div class='ctx'> 	bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,</div><div class='ctx'> 			 MDIO_WC_REG_DIGITAL5_MISC6, &amp;val);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Clear SFI/XFI link settings registers */</div><div class='add'>+/* Clear SFI/XFI link settings registers */</div><div class='ctx'> static void bnx2x_warpcore_clear_regs(struct bnx2x_phy *phy,</div><div class='ctx'> 				      struct link_params *params,</div><div class='ctx'> 				      u16 lane)</div><div class='hunk'>@@ -4250,7 +4356,7 @@ static void bnx2x_warpcore_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 		vars-&gt;phy_flags |= PHY_SGMII_FLAG;</div><div class='ctx'> 		DP(NETIF_MSG_LINK, "Setting SGMII mode\n");</div><div class='ctx'> 		bnx2x_warpcore_clear_regs(phy, params, lane);</div><div class='del'>-		bnx2x_warpcore_set_sgmii_speed(phy, params, 0);</div><div class='add'>+		bnx2x_warpcore_set_sgmii_speed(phy, params, 0, 1);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		switch (serdes_net_if) {</div><div class='ctx'> 		case PORT_HW_CFG_NET_SERDES_IF_KR:</div><div class='hunk'>@@ -4278,7 +4384,8 @@ static void bnx2x_warpcore_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 				}</div><div class='ctx'> 				bnx2x_warpcore_set_sgmii_speed(phy,</div><div class='ctx'> 								params,</div><div class='del'>-								fiber_mode);</div><div class='add'>+								fiber_mode,</div><div class='add'>+								0);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='hunk'>@@ -4291,7 +4398,8 @@ static void bnx2x_warpcore_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 				bnx2x_warpcore_set_10G_XFI(phy, params, 0);</div><div class='ctx'> 			} else if (vars-&gt;line_speed == SPEED_1000) {</div><div class='ctx'> 				DP(NETIF_MSG_LINK, "Setting 1G Fiber\n");</div><div class='del'>-				bnx2x_warpcore_set_sgmii_speed(phy, params, 1);</div><div class='add'>+				bnx2x_warpcore_set_sgmii_speed(</div><div class='add'>+						phy, params, 1, 0);</div><div class='ctx'> 			}</div><div class='ctx'> 			/* Issue Module detection */</div><div class='ctx'> 			if (bnx2x_is_sfp_module_plugged(phy, params))</div><div class='hunk'>@@ -4428,12 +4536,6 @@ static void bnx2x_set_warpcore_loopback(struct bnx2x_phy *phy,</div><div class='ctx'> </div><div class='ctx'> 		/* Switch back to 4-copy registers */</div><div class='ctx'> 		bnx2x_set_aer_mmd(params, phy);</div><div class='del'>-		/* Global loopback, not recommended. */</div><div class='del'>-		bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,</div><div class='del'>-				MDIO_WC_REG_COMBO_IEEE0_MIICTRL, &amp;val16);</div><div class='del'>-		bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,</div><div class='del'>-				MDIO_WC_REG_COMBO_IEEE0_MIICTRL, val16 |</div><div class='del'>-				0x4000);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* 10G &amp; 20G */</div><div class='ctx'> 		bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,</div><div class='hunk'>@@ -4450,25 +4552,14 @@ static void bnx2x_set_warpcore_loopback(struct bnx2x_phy *phy,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-void bnx2x_link_status_update(struct link_params *params,</div><div class='del'>-			      struct link_vars *vars)</div><div class='add'>+void bnx2x_sync_link(struct link_params *params,</div><div class='add'>+			   struct link_vars *vars)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	u8 link_10g_plus;</div><div class='del'>-	u8 port = params-&gt;port;</div><div class='del'>-	u32 sync_offset, media_types;</div><div class='del'>-	/* Update PHY configuration */</div><div class='del'>-	set_phy_vars(params, vars);</div><div class='del'>-</div><div class='del'>-	vars-&gt;link_status = REG_RD(bp, params-&gt;shmem_base +</div><div class='del'>-				   offsetof(struct shmem_region,</div><div class='del'>-					    port_mb[port].link_status));</div><div class='del'>-</div><div class='del'>-	vars-&gt;link_up = (vars-&gt;link_status &amp; LINK_STATUS_LINK_UP);</div><div class='del'>-	vars-&gt;phy_flags = PHY_XGXS_FLAG;</div><div class='ctx'> 	if (vars-&gt;link_status &amp; LINK_STATUS_PHYSICAL_LINK_FLAG)</div><div class='ctx'> 		vars-&gt;phy_flags |= PHY_PHYSICAL_LINK_FLAG;</div><div class='del'>-</div><div class='add'>+	vars-&gt;link_up = (vars-&gt;link_status &amp; LINK_STATUS_LINK_UP);</div><div class='ctx'> 	if (vars-&gt;link_up) {</div><div class='ctx'> 		DP(NETIF_MSG_LINK, "phy link up\n");</div><div class='ctx'> </div><div class='hunk'>@@ -4563,7 +4654,23 @@ void bnx2x_link_status_update(struct link_params *params,</div><div class='ctx'> 		if (vars-&gt;link_status &amp; LINK_STATUS_PHYSICAL_LINK_FLAG)</div><div class='ctx'> 			vars-&gt;phy_flags |= PHY_HALF_OPEN_CONN_FLAG;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnx2x_link_status_update(struct link_params *params,</div><div class='add'>+			      struct link_vars *vars)</div><div class='add'>+{</div><div class='add'>+	struct bnx2x *bp = params-&gt;bp;</div><div class='add'>+	u8 port = params-&gt;port;</div><div class='add'>+	u32 sync_offset, media_types;</div><div class='add'>+	/* Update PHY configuration */</div><div class='add'>+	set_phy_vars(params, vars);</div><div class='ctx'> </div><div class='add'>+	vars-&gt;link_status = REG_RD(bp, params-&gt;shmem_base +</div><div class='add'>+				   offsetof(struct shmem_region,</div><div class='add'>+					    port_mb[port].link_status));</div><div class='add'>+</div><div class='add'>+	vars-&gt;phy_flags = PHY_XGXS_FLAG;</div><div class='add'>+	bnx2x_sync_link(params, vars);</div><div class='ctx'> 	/* Sync media type */</div><div class='ctx'> 	sync_offset = params-&gt;shmem_base +</div><div class='ctx'> 			offsetof(struct shmem_region,</div><div class='hunk'>@@ -4602,7 +4709,6 @@ void bnx2x_link_status_update(struct link_params *params,</div><div class='ctx'> 		 vars-&gt;line_speed, vars-&gt;duplex, vars-&gt;flow_ctrl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static void bnx2x_set_master_ln(struct link_params *params,</div><div class='ctx'> 				struct bnx2x_phy *phy)</div><div class='ctx'> {</div><div class='hunk'>@@ -4676,11 +4782,8 @@ static void bnx2x_set_swap_lanes(struct link_params *params,</div><div class='ctx'> 	 *  Each two bits represents a lane number:</div><div class='ctx'> 	 *  No swap is 0123 =&gt; 0x1b no need to enable the swap</div><div class='ctx'> 	 */</div><div class='del'>-	u16 ser_lane, rx_lane_swap, tx_lane_swap;</div><div class='add'>+	u16 rx_lane_swap, tx_lane_swap;</div><div class='ctx'> </div><div class='del'>-	ser_lane = ((params-&gt;lane_config &amp;</div><div class='del'>-		     PORT_HW_CFG_LANE_SWAP_CFG_MASTER_MASK) &gt;&gt;</div><div class='del'>-		    PORT_HW_CFG_LANE_SWAP_CFG_MASTER_SHIFT);</div><div class='ctx'> 	rx_lane_swap = ((params-&gt;lane_config &amp;</div><div class='ctx'> 			 PORT_HW_CFG_LANE_SWAP_CFG_RX_MASK) &gt;&gt;</div><div class='ctx'> 			PORT_HW_CFG_LANE_SWAP_CFG_RX_SHIFT);</div><div class='hunk'>@@ -5356,7 +5459,6 @@ static int bnx2x_link_settings_status(struct bnx2x_phy *phy,</div><div class='ctx'> 				      struct link_params *params,</div><div class='ctx'> 				      struct link_vars *vars)</div><div class='ctx'> {</div><div class='del'>-</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> </div><div class='ctx'> 	u16 gp_status, duplex = DUPLEX_HALF, link_up = 0, speed_mask;</div><div class='hunk'>@@ -5403,9 +5505,7 @@ static int bnx2x_warpcore_read_status(struct bnx2x_phy *phy,</div><div class='ctx'> 				     struct link_params *params,</div><div class='ctx'> 				     struct link_vars *vars)</div><div class='ctx'> {</div><div class='del'>-</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='del'>-</div><div class='ctx'> 	u8 lane;</div><div class='ctx'> 	u16 gp_status1, gp_speed, link_up, duplex = DUPLEX_FULL;</div><div class='ctx'> 	int rc = 0;</div><div class='hunk'>@@ -6678,7 +6778,6 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /*			    External Phy section			     */</div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -8103,7 +8202,15 @@ static void bnx2x_warpcore_power_module(struct link_params *params,</div><div class='ctx'> static void bnx2x_warpcore_hw_reset(struct bnx2x_phy *phy,</div><div class='ctx'> 				    struct link_params *params)</div><div class='ctx'> {</div><div class='add'>+	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	bnx2x_warpcore_power_module(params, phy, 0);</div><div class='add'>+	/* Put Warpcore in low power mode */</div><div class='add'>+	REG_WR(bp, MISC_REG_WC0_RESET, 0x0c0e);</div><div class='add'>+</div><div class='add'>+	/* Put LCPLL in low power mode */</div><div class='add'>+	REG_WR(bp, MISC_REG_LCPLL_E40_PWRDWN, 1);</div><div class='add'>+	REG_WR(bp, MISC_REG_LCPLL_E40_RESETB_ANA, 0);</div><div class='add'>+	REG_WR(bp, MISC_REG_LCPLL_E40_RESETB_DIG, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_power_sfp_module(struct link_params *params,</div><div class='hunk'>@@ -9040,13 +9147,13 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,</div><div class='ctx'> 			DP(NETIF_MSG_LINK,</div><div class='ctx'> 			   "8727 Power fault has been detected on port %d\n",</div><div class='ctx'> 			   oc_port);</div><div class='del'>-			netdev_err(bp-&gt;dev, "Error:  Power fault on Port %d has"</div><div class='del'>-					    " been detected and the power to "</div><div class='del'>-					    "that SFP+ module has been removed"</div><div class='del'>-					    " to prevent failure of the card."</div><div class='del'>-					    " Please remove the SFP+ module and"</div><div class='del'>-					    " restart the system to clear this"</div><div class='del'>-					    " error.\n",</div><div class='add'>+			netdev_err(bp-&gt;dev, "Error: Power fault on Port %d has "</div><div class='add'>+					    "been detected and the power to "</div><div class='add'>+					    "that SFP+ module has been removed "</div><div class='add'>+					    "to prevent failure of the card. "</div><div class='add'>+					    "Please remove the SFP+ module and "</div><div class='add'>+					    "restart the system to clear this "</div><div class='add'>+					    "error.\n",</div><div class='ctx'> 			 oc_port);</div><div class='ctx'> 			/* Disable all RX_ALARMs except for mod_abs */</div><div class='ctx'> 			bnx2x_cl45_write(bp, phy,</div><div class='hunk'>@@ -9169,66 +9276,72 @@ static void bnx2x_8727_link_reset(struct bnx2x_phy *phy,</div><div class='ctx'> /*		BCM8481/BCM84823/BCM84833 PHY SECTION	          */</div><div class='ctx'> /******************************************************************/</div><div class='ctx'> static void bnx2x_save_848xx_spirom_version(struct bnx2x_phy *phy,</div><div class='del'>-					   struct link_params *params)</div><div class='add'>+					    struct bnx2x *bp,</div><div class='add'>+					    u8 port)</div><div class='ctx'> {</div><div class='ctx'> 	u16 val, fw_ver1, fw_ver2, cnt;</div><div class='del'>-	u8 port;</div><div class='del'>-	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> </div><div class='del'>-	port = params-&gt;port;</div><div class='add'>+	if (phy-&gt;type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {</div><div class='add'>+		bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD, 0x400f, &amp;fw_ver1);</div><div class='add'>+		bnx2x_save_spirom_version(bp, port,</div><div class='add'>+				((fw_ver1 &amp; 0xf000)&gt;&gt;5) | (fw_ver1 &amp; 0x7f),</div><div class='add'>+				phy-&gt;ver_addr);</div><div class='add'>+	} else {</div><div class='add'>+		/* For 32-bit registers in 848xx, access via MDIO2ARM i/f. */</div><div class='add'>+		/* (1) set reg 0xc200_0014(SPI_BRIDGE_CTRL_2) to 0x03000000 */</div><div class='add'>+		bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA819, 0x0014);</div><div class='add'>+		bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81A, 0xc200);</div><div class='add'>+		bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81B, 0x0000);</div><div class='add'>+		bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81C, 0x0300);</div><div class='add'>+		bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA817, 0x0009);</div><div class='add'>+</div><div class='add'>+		for (cnt = 0; cnt &lt; 100; cnt++) {</div><div class='add'>+			bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA818, &amp;val);</div><div class='add'>+			if (val &amp; 1)</div><div class='add'>+				break;</div><div class='add'>+			udelay(5);</div><div class='add'>+		}</div><div class='add'>+		if (cnt == 100) {</div><div class='add'>+			DP(NETIF_MSG_LINK, "Unable to read 848xx "</div><div class='add'>+					"phy fw version(1)\n");</div><div class='add'>+			bnx2x_save_spirom_version(bp, port, 0,</div><div class='add'>+						  phy-&gt;ver_addr);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* For the 32 bits registers in 848xx, access via MDIO2ARM interface.*/</div><div class='del'>-	/* (1) set register 0xc200_0014(SPI_BRIDGE_CTRL_2) to 0x03000000 */</div><div class='del'>-	bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA819, 0x0014);</div><div class='del'>-	bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81A, 0xc200);</div><div class='del'>-	bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81B, 0x0000);</div><div class='del'>-	bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81C, 0x0300);</div><div class='del'>-	bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA817, 0x0009);</div><div class='ctx'> </div><div class='del'>-	for (cnt = 0; cnt &lt; 100; cnt++) {</div><div class='del'>-		bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA818, &amp;val);</div><div class='del'>-		if (val &amp; 1)</div><div class='del'>-			break;</div><div class='del'>-		udelay(5);</div><div class='del'>-	}</div><div class='del'>-	if (cnt == 100) {</div><div class='del'>-		DP(NETIF_MSG_LINK, "Unable to read 848xx phy fw version(1)\n");</div><div class='del'>-		bnx2x_save_spirom_version(bp, port, 0,</div><div class='del'>-					  phy-&gt;ver_addr);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+		/* 2) read register 0xc200_0000 (SPI_FW_STATUS) */</div><div class='add'>+		bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA819, 0x0000);</div><div class='add'>+		bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81A, 0xc200);</div><div class='add'>+		bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA817, 0x000A);</div><div class='add'>+		for (cnt = 0; cnt &lt; 100; cnt++) {</div><div class='add'>+			bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA818, &amp;val);</div><div class='add'>+			if (val &amp; 1)</div><div class='add'>+				break;</div><div class='add'>+			udelay(5);</div><div class='add'>+		}</div><div class='add'>+		if (cnt == 100) {</div><div class='add'>+			DP(NETIF_MSG_LINK, "Unable to read 848xx phy fw "</div><div class='add'>+					"version(2)\n");</div><div class='add'>+			bnx2x_save_spirom_version(bp, port, 0,</div><div class='add'>+						  phy-&gt;ver_addr);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		/* lower 16 bits of the register SPI_FW_STATUS */</div><div class='add'>+		bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA81B, &amp;fw_ver1);</div><div class='add'>+		/* upper 16 bits of register SPI_FW_STATUS */</div><div class='add'>+		bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA81C, &amp;fw_ver2);</div><div class='ctx'> </div><div class='del'>-	/* 2) read register 0xc200_0000 (SPI_FW_STATUS) */</div><div class='del'>-	bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA819, 0x0000);</div><div class='del'>-	bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81A, 0xc200);</div><div class='del'>-	bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA817, 0x000A);</div><div class='del'>-	for (cnt = 0; cnt &lt; 100; cnt++) {</div><div class='del'>-		bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA818, &amp;val);</div><div class='del'>-		if (val &amp; 1)</div><div class='del'>-			break;</div><div class='del'>-		udelay(5);</div><div class='del'>-	}</div><div class='del'>-	if (cnt == 100) {</div><div class='del'>-		DP(NETIF_MSG_LINK, "Unable to read 848xx phy fw version(2)\n");</div><div class='del'>-		bnx2x_save_spirom_version(bp, port, 0,</div><div class='add'>+		bnx2x_save_spirom_version(bp, port, (fw_ver2&lt;&lt;16) | fw_ver1,</div><div class='ctx'> 					  phy-&gt;ver_addr);</div><div class='del'>-		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* lower 16 bits of the register SPI_FW_STATUS */</div><div class='del'>-	bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA81B, &amp;fw_ver1);</div><div class='del'>-	/* upper 16 bits of register SPI_FW_STATUS */</div><div class='del'>-	bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA81C, &amp;fw_ver2);</div><div class='del'>-</div><div class='del'>-	bnx2x_save_spirom_version(bp, port, (fw_ver2&lt;&lt;16) | fw_ver1,</div><div class='del'>-				  phy-&gt;ver_addr);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> static void bnx2x_848xx_set_led(struct bnx2x *bp,</div><div class='ctx'> 				struct bnx2x_phy *phy)</div><div class='ctx'> {</div><div class='del'>-	u16 val;</div><div class='add'>+	u16 val, offset;</div><div class='ctx'> </div><div class='ctx'> 	/* PHYC_CTL_LED_CTL */</div><div class='ctx'> 	bnx2x_cl45_read(bp, phy,</div><div class='hunk'>@@ -9263,14 +9376,22 @@ static void bnx2x_848xx_set_led(struct bnx2x *bp,</div><div class='ctx'> 			MDIO_PMA_REG_8481_LED3_BLINK,</div><div class='ctx'> 			0);</div><div class='ctx'> </div><div class='del'>-	bnx2x_cl45_read(bp, phy,</div><div class='add'>+	/* Configure the blink rate to ~15.9 Hz */</div><div class='add'>+	bnx2x_cl45_write(bp, phy,</div><div class='ctx'> 			MDIO_PMA_DEVAD,</div><div class='del'>-			MDIO_PMA_REG_84823_CTL_LED_CTL_1, &amp;val);</div><div class='del'>-	val |= MDIO_PMA_REG_84823_LED3_STRETCH_EN; /* stretch_en for LED3*/</div><div class='add'>+			MDIO_PMA_REG_84823_CTL_SLOW_CLK_CNT_HIGH,</div><div class='add'>+			MDIO_PMA_REG_84823_BLINK_RATE_VAL_15P9HZ);</div><div class='ctx'> </div><div class='add'>+	if (phy-&gt;type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833)</div><div class='add'>+		offset = MDIO_PMA_REG_84833_CTL_LED_CTL_1;</div><div class='add'>+	else</div><div class='add'>+		offset = MDIO_PMA_REG_84823_CTL_LED_CTL_1;</div><div class='add'>+</div><div class='add'>+	bnx2x_cl45_read(bp, phy,</div><div class='add'>+			MDIO_PMA_DEVAD, offset, &amp;val);</div><div class='add'>+	val |= MDIO_PMA_REG_84823_LED3_STRETCH_EN; /* stretch_en for LED3*/</div><div class='ctx'> 	bnx2x_cl45_write(bp, phy,</div><div class='del'>-			 MDIO_PMA_DEVAD,</div><div class='del'>-			 MDIO_PMA_REG_84823_CTL_LED_CTL_1, val);</div><div class='add'>+			 MDIO_PMA_DEVAD, offset, val);</div><div class='ctx'> </div><div class='ctx'> 	/* 'Interrupt Mask' */</div><div class='ctx'> 	bnx2x_cl45_write(bp, phy,</div><div class='hunk'>@@ -9283,14 +9404,17 @@ static int bnx2x_848xx_cmn_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 				       struct link_vars *vars)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='del'>-	u16 autoneg_val, an_1000_val, an_10_100_val;</div><div class='add'>+	u16 autoneg_val, an_1000_val, an_10_100_val, an_10g_val;</div><div class='ctx'> 	u16 tmp_req_line_speed;</div><div class='ctx'> </div><div class='ctx'> 	tmp_req_line_speed = phy-&gt;req_line_speed;</div><div class='del'>-	if (phy-&gt;type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833)</div><div class='add'>+	if (phy-&gt;type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {</div><div class='ctx'> 		if (phy-&gt;req_line_speed == SPEED_10000)</div><div class='ctx'> 			phy-&gt;req_line_speed = SPEED_AUTO_NEG;</div><div class='del'>-</div><div class='add'>+	} else {</div><div class='add'>+		/* Save spirom version */</div><div class='add'>+		bnx2x_save_848xx_spirom_version(phy, bp, params-&gt;port);</div><div class='add'>+	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This phy uses the NIG latch mechanism since link indication</div><div class='ctx'> 	 * arrives through its LED4 and not via its LASI signal, so we</div><div class='hunk'>@@ -9338,13 +9462,10 @@ static int bnx2x_848xx_cmn_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 			 an_1000_val);</div><div class='ctx'> </div><div class='ctx'> 	/* set 100 speed advertisement */</div><div class='del'>-	if (((phy-&gt;req_line_speed == SPEED_AUTO_NEG) &amp;&amp;</div><div class='add'>+	if ((phy-&gt;req_line_speed == SPEED_AUTO_NEG) &amp;&amp;</div><div class='ctx'> 	     (phy-&gt;speed_cap_mask &amp;</div><div class='ctx'> 	      (PORT_HW_CFG_SPEED_CAPABILITY_D0_100M_FULL |</div><div class='del'>-	       PORT_HW_CFG_SPEED_CAPABILITY_D0_100M_HALF)) &amp;&amp;</div><div class='del'>-	     (phy-&gt;supported &amp;</div><div class='del'>-	      (SUPPORTED_100baseT_Half |</div><div class='del'>-	       SUPPORTED_100baseT_Full)))) {</div><div class='add'>+	       PORT_HW_CFG_SPEED_CAPABILITY_D0_100M_HALF))) {</div><div class='ctx'> 		an_10_100_val |= (1&lt;&lt;7);</div><div class='ctx'> 		/* Enable autoneg and restart autoneg for legacy speeds */</div><div class='ctx'> 		autoneg_val |= (1&lt;&lt;9 | 1&lt;&lt;12);</div><div class='hunk'>@@ -9378,6 +9499,8 @@ static int bnx2x_848xx_cmn_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 		bnx2x_cl45_write(bp, phy,</div><div class='ctx'> 				 MDIO_AN_DEVAD, MDIO_AN_REG_8481_AUX_CTRL,</div><div class='ctx'> 				 (1&lt;&lt;15 | 1&lt;&lt;9 | 7&lt;&lt;0));</div><div class='add'>+		/* The PHY needs this set even for forced link. */</div><div class='add'>+		an_10_100_val |= (1&lt;&lt;8) | (1&lt;&lt;7);</div><div class='ctx'> 		DP(NETIF_MSG_LINK, "Setting 100M force\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((phy-&gt;req_line_speed == SPEED_10) &amp;&amp;</div><div class='hunk'>@@ -9415,18 +9538,23 @@ static int bnx2x_848xx_cmn_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 			DP(NETIF_MSG_LINK, "Advertising 10G\n");</div><div class='ctx'> 			/* Restart autoneg for 10G*/</div><div class='ctx'> </div><div class='add'>+			bnx2x_cl45_read(bp, phy,</div><div class='add'>+					MDIO_AN_DEVAD,</div><div class='add'>+					MDIO_AN_REG_8481_10GBASE_T_AN_CTRL,</div><div class='add'>+					&amp;an_10g_val);</div><div class='ctx'> 			bnx2x_cl45_write(bp, phy,</div><div class='del'>-				 MDIO_AN_DEVAD, MDIO_AN_REG_CTRL,</div><div class='del'>-				 0x3200);</div><div class='add'>+					 MDIO_AN_DEVAD,</div><div class='add'>+					 MDIO_AN_REG_8481_10GBASE_T_AN_CTRL,</div><div class='add'>+					 an_10g_val | 0x1000);</div><div class='add'>+			bnx2x_cl45_write(bp, phy,</div><div class='add'>+					 MDIO_AN_DEVAD, MDIO_AN_REG_CTRL,</div><div class='add'>+					 0x3200);</div><div class='ctx'> 	} else</div><div class='ctx'> 		bnx2x_cl45_write(bp, phy,</div><div class='ctx'> 				 MDIO_AN_DEVAD,</div><div class='ctx'> 				 MDIO_AN_REG_8481_10GBASE_T_AN_CTRL,</div><div class='ctx'> 				 1);</div><div class='ctx'> </div><div class='del'>-	/* Save spirom version */</div><div class='del'>-	bnx2x_save_848xx_spirom_version(phy, params);</div><div class='del'>-</div><div class='ctx'> 	phy-&gt;req_line_speed = tmp_req_line_speed;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -9449,74 +9577,95 @@ static int bnx2x_8481_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 	return bnx2x_848xx_cmn_config_init(phy, params, vars);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define PHY84833_HDSHK_WAIT 300</div><div class='del'>-static int bnx2x_84833_pair_swap_cfg(struct bnx2x_phy *phy,</div><div class='add'>+#define PHY84833_CMDHDLR_WAIT 300</div><div class='add'>+#define PHY84833_CMDHDLR_MAX_ARGS 5</div><div class='add'>+static int bnx2x_84833_cmd_hdlr(struct bnx2x_phy *phy,</div><div class='ctx'> 				   struct link_params *params,</div><div class='del'>-				   struct link_vars *vars)</div><div class='add'>+		   u16 fw_cmd,</div><div class='add'>+		   u16 cmd_args[])</div><div class='ctx'> {</div><div class='ctx'> 	u32 idx;</div><div class='del'>-	u32 pair_swap;</div><div class='ctx'> 	u16 val;</div><div class='del'>-	u16 data;</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='del'>-	/* Do pair swap */</div><div class='del'>-</div><div class='del'>-	/* Check for configuration. */</div><div class='del'>-	pair_swap = REG_RD(bp, params-&gt;shmem_base +</div><div class='del'>-			   offsetof(struct shmem_region,</div><div class='del'>-			dev_info.port_hw_config[params-&gt;port].xgbt_phy_cfg)) &amp;</div><div class='del'>-		PORT_HW_CFG_RJ45_PAIR_SWAP_MASK;</div><div class='del'>-</div><div class='del'>-	if (pair_swap == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	data = (u16)pair_swap;</div><div class='del'>-</div><div class='ctx'> 	/* Write CMD_OPEN_OVERRIDE to STATUS reg */</div><div class='ctx'> 	bnx2x_cl45_write(bp, phy, MDIO_CTL_DEVAD,</div><div class='del'>-			MDIO_84833_TOP_CFG_SCRATCH_REG2,</div><div class='del'>-			PHY84833_CMD_OPEN_OVERRIDE);</div><div class='del'>-	for (idx = 0; idx &lt; PHY84833_HDSHK_WAIT; idx++) {</div><div class='add'>+			MDIO_84833_CMD_HDLR_STATUS,</div><div class='add'>+			PHY84833_STATUS_CMD_OPEN_OVERRIDE);</div><div class='add'>+	for (idx = 0; idx &lt; PHY84833_CMDHDLR_WAIT; idx++) {</div><div class='ctx'> 		bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD,</div><div class='del'>-				MDIO_84833_TOP_CFG_SCRATCH_REG2, &amp;val);</div><div class='del'>-		if (val == PHY84833_CMD_OPEN_FOR_CMDS)</div><div class='add'>+				MDIO_84833_CMD_HDLR_STATUS, &amp;val);</div><div class='add'>+		if (val == PHY84833_STATUS_CMD_OPEN_FOR_CMDS)</div><div class='ctx'> 			break;</div><div class='ctx'> 		msleep(1);</div><div class='ctx'> 	}</div><div class='del'>-	if (idx &gt;= PHY84833_HDSHK_WAIT) {</div><div class='del'>-		DP(NETIF_MSG_LINK, "Pairswap: FW not ready.\n");</div><div class='add'>+	if (idx &gt;= PHY84833_CMDHDLR_WAIT) {</div><div class='add'>+		DP(NETIF_MSG_LINK, "FW cmd: FW not ready.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Prepare argument(s) and issue command */</div><div class='add'>+	for (idx = 0; idx &lt; PHY84833_CMDHDLR_MAX_ARGS; idx++) {</div><div class='add'>+		bnx2x_cl45_write(bp, phy, MDIO_CTL_DEVAD,</div><div class='add'>+				MDIO_84833_CMD_HDLR_DATA1 + idx,</div><div class='add'>+				cmd_args[idx]);</div><div class='add'>+	}</div><div class='ctx'> 	bnx2x_cl45_write(bp, phy, MDIO_CTL_DEVAD,</div><div class='del'>-			MDIO_84833_TOP_CFG_SCRATCH_REG4,</div><div class='del'>-			data);</div><div class='del'>-	/* Issue pair swap command */</div><div class='del'>-	bnx2x_cl45_write(bp, phy, MDIO_CTL_DEVAD,</div><div class='del'>-			MDIO_84833_TOP_CFG_SCRATCH_REG0,</div><div class='del'>-			PHY84833_DIAG_CMD_PAIR_SWAP_CHANGE);</div><div class='del'>-	for (idx = 0; idx &lt; PHY84833_HDSHK_WAIT; idx++) {</div><div class='add'>+			MDIO_84833_CMD_HDLR_COMMAND, fw_cmd);</div><div class='add'>+	for (idx = 0; idx &lt; PHY84833_CMDHDLR_WAIT; idx++) {</div><div class='ctx'> 		bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD,</div><div class='del'>-				MDIO_84833_TOP_CFG_SCRATCH_REG2, &amp;val);</div><div class='del'>-		if ((val == PHY84833_CMD_COMPLETE_PASS) ||</div><div class='del'>-			(val == PHY84833_CMD_COMPLETE_ERROR))</div><div class='add'>+				MDIO_84833_CMD_HDLR_STATUS, &amp;val);</div><div class='add'>+		if ((val == PHY84833_STATUS_CMD_COMPLETE_PASS) ||</div><div class='add'>+			(val == PHY84833_STATUS_CMD_COMPLETE_ERROR))</div><div class='ctx'> 			break;</div><div class='ctx'> 		msleep(1);</div><div class='ctx'> 	}</div><div class='del'>-	if ((idx &gt;= PHY84833_HDSHK_WAIT) ||</div><div class='del'>-		(val == PHY84833_CMD_COMPLETE_ERROR)) {</div><div class='del'>-		DP(NETIF_MSG_LINK, "Pairswap: override failed.\n");</div><div class='add'>+	if ((idx &gt;= PHY84833_CMDHDLR_WAIT) ||</div><div class='add'>+		(val == PHY84833_STATUS_CMD_COMPLETE_ERROR)) {</div><div class='add'>+		DP(NETIF_MSG_LINK, "FW cmd failed.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='add'>+	/* Gather returning data */</div><div class='add'>+	for (idx = 0; idx &lt; PHY84833_CMDHDLR_MAX_ARGS; idx++) {</div><div class='add'>+		bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD,</div><div class='add'>+				MDIO_84833_CMD_HDLR_DATA1 + idx,</div><div class='add'>+				&amp;cmd_args[idx]);</div><div class='add'>+	}</div><div class='ctx'> 	bnx2x_cl45_write(bp, phy, MDIO_CTL_DEVAD,</div><div class='del'>-			MDIO_84833_TOP_CFG_SCRATCH_REG2,</div><div class='del'>-			PHY84833_CMD_CLEAR_COMPLETE);</div><div class='del'>-	DP(NETIF_MSG_LINK, "Pairswap OK, val=0x%x\n", data);</div><div class='add'>+			MDIO_84833_CMD_HDLR_STATUS,</div><div class='add'>+			PHY84833_STATUS_CMD_CLEAR_COMPLETE);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+static int bnx2x_84833_pair_swap_cfg(struct bnx2x_phy *phy,</div><div class='add'>+				   struct link_params *params,</div><div class='add'>+				   struct link_vars *vars)</div><div class='add'>+{</div><div class='add'>+	u32 pair_swap;</div><div class='add'>+	u16 data[PHY84833_CMDHDLR_MAX_ARGS];</div><div class='add'>+	int status;</div><div class='add'>+	struct bnx2x *bp = params-&gt;bp;</div><div class='add'>+</div><div class='add'>+	/* Check for configuration. */</div><div class='add'>+	pair_swap = REG_RD(bp, params-&gt;shmem_base +</div><div class='add'>+			   offsetof(struct shmem_region,</div><div class='add'>+			dev_info.port_hw_config[params-&gt;port].xgbt_phy_cfg)) &amp;</div><div class='add'>+		PORT_HW_CFG_RJ45_PAIR_SWAP_MASK;</div><div class='add'>+</div><div class='add'>+	if (pair_swap == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Only the second argument is used for this command */</div><div class='add'>+	data[1] = (u16)pair_swap;</div><div class='add'>+</div><div class='add'>+	status = bnx2x_84833_cmd_hdlr(phy, params,</div><div class='add'>+		PHY84833_CMD_SET_PAIR_SWAP, data);</div><div class='add'>+	if (status == 0)</div><div class='add'>+		DP(NETIF_MSG_LINK, "Pairswap OK, val=0x%x\n", data[1]);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u8 bnx2x_84833_get_reset_gpios(struct bnx2x *bp,</div><div class='ctx'> 				      u32 shmem_base_path[],</div><div class='ctx'> 				      u32 chip_id)</div><div class='hunk'>@@ -9579,24 +9728,6 @@ static int bnx2x_84833_hw_reset_phy(struct bnx2x_phy *phy,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_84833_common_init_phy(struct bnx2x *bp,</div><div class='del'>-						u32 shmem_base_path[],</div><div class='del'>-						u32 chip_id)</div><div class='del'>-{</div><div class='del'>-	u8 reset_gpios;</div><div class='del'>-</div><div class='del'>-	reset_gpios = bnx2x_84833_get_reset_gpios(bp, shmem_base_path, chip_id);</div><div class='del'>-</div><div class='del'>-	bnx2x_set_mult_gpio(bp, reset_gpios, MISC_REGISTERS_GPIO_OUTPUT_LOW);</div><div class='del'>-	udelay(10);</div><div class='del'>-	bnx2x_set_mult_gpio(bp, reset_gpios, MISC_REGISTERS_GPIO_OUTPUT_HIGH);</div><div class='del'>-	msleep(800);</div><div class='del'>-	DP(NETIF_MSG_LINK, "84833 reset pulse on pin values 0x%x\n",</div><div class='del'>-		reset_gpios);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define PHY84833_CONSTANT_LATENCY 1193</div><div class='ctx'> static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 				   struct link_params *params,</div><div class='hunk'>@@ -9605,8 +9736,8 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	u8 port, initialize = 1;</div><div class='ctx'> 	u16 val;</div><div class='del'>-	u16 temp;</div><div class='del'>-	u32 actual_phy_selection, cms_enable, idx;</div><div class='add'>+	u32 actual_phy_selection, cms_enable;</div><div class='add'>+	u16 cmd_args[PHY84833_CMDHDLR_MAX_ARGS];</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	msleep(1);</div><div class='hunk'>@@ -9625,34 +9756,24 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 		bnx2x_cl45_write(bp, phy,</div><div class='ctx'> 				MDIO_PMA_DEVAD,</div><div class='ctx'> 				MDIO_PMA_REG_CTRL, 0x8000);</div><div class='del'>-		/* Bring PHY out of super isolate mode */</div><div class='del'>-		bnx2x_cl45_read(bp, phy,</div><div class='del'>-				MDIO_CTL_DEVAD,</div><div class='del'>-				MDIO_84833_TOP_CFG_XGPHY_STRAP1, &amp;val);</div><div class='del'>-		val &amp;= ~MDIO_84833_SUPER_ISOLATE;</div><div class='del'>-		bnx2x_cl45_write(bp, phy,</div><div class='del'>-				MDIO_CTL_DEVAD,</div><div class='del'>-				MDIO_84833_TOP_CFG_XGPHY_STRAP1, val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_wait_reset_complete(bp, phy, params);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for GPHY to come out of reset */</div><div class='ctx'> 	msleep(50);</div><div class='del'>-</div><div class='del'>-	if (phy-&gt;type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833)</div><div class='del'>-		bnx2x_84833_pair_swap_cfg(phy, params, vars);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * BCM84823 requires that XGXS links up first @ 10G for normal behavior</div><div class='del'>-	 */</div><div class='del'>-	temp = vars-&gt;line_speed;</div><div class='del'>-	vars-&gt;line_speed = SPEED_10000;</div><div class='del'>-	bnx2x_set_autoneg(&amp;params-&gt;phy[INT_PHY], params, vars, 0);</div><div class='del'>-	bnx2x_program_serdes(&amp;params-&gt;phy[INT_PHY], params, vars);</div><div class='del'>-	vars-&gt;line_speed = temp;</div><div class='del'>-</div><div class='del'>-	/* Set dual-media configuration according to configuration */</div><div class='add'>+	if (phy-&gt;type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {</div><div class='add'>+		/*</div><div class='add'>+		 * BCM84823 requires that XGXS links up first @ 10G for normal</div><div class='add'>+		 * behavior.</div><div class='add'>+		 */</div><div class='add'>+		u16 temp;</div><div class='add'>+		temp = vars-&gt;line_speed;</div><div class='add'>+		vars-&gt;line_speed = SPEED_10000;</div><div class='add'>+		bnx2x_set_autoneg(&amp;params-&gt;phy[INT_PHY], params, vars, 0);</div><div class='add'>+		bnx2x_program_serdes(&amp;params-&gt;phy[INT_PHY], params, vars);</div><div class='add'>+		vars-&gt;line_speed = temp;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD,</div><div class='ctx'> 			MDIO_CTL_REG_84823_MEDIA, &amp;val);</div><div class='hunk'>@@ -9698,70 +9819,23 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 	DP(NETIF_MSG_LINK, "Multi_phy config = 0x%x, Media control = 0x%x\n",</div><div class='ctx'> 		   params-&gt;multi_phy_config, val);</div><div class='ctx'> </div><div class='del'>-	/* AutogrEEEn */</div><div class='del'>-	if (params-&gt;feature_config_flags &amp;</div><div class='del'>-		FEATURE_CONFIG_AUTOGREEEN_ENABLED) {</div><div class='del'>-		/* Ensure that f/w is ready */</div><div class='del'>-		for (idx = 0; idx &lt; PHY84833_HDSHK_WAIT; idx++) {</div><div class='del'>-			bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD,</div><div class='del'>-					MDIO_84833_TOP_CFG_SCRATCH_REG2, &amp;val);</div><div class='del'>-			if (val == PHY84833_CMD_OPEN_FOR_CMDS)</div><div class='del'>-				break;</div><div class='del'>-			usleep_range(1000, 1000);</div><div class='del'>-		}</div><div class='del'>-		if (idx &gt;= PHY84833_HDSHK_WAIT) {</div><div class='del'>-			DP(NETIF_MSG_LINK, "AutogrEEEn: FW not ready.\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Select EEE mode */</div><div class='del'>-		bnx2x_cl45_write(bp, phy, MDIO_CTL_DEVAD,</div><div class='del'>-				MDIO_84833_TOP_CFG_SCRATCH_REG3,</div><div class='del'>-				0x2);</div><div class='del'>-</div><div class='del'>-		/* Set Idle and Latency */</div><div class='del'>-		bnx2x_cl45_write(bp, phy, MDIO_CTL_DEVAD,</div><div class='del'>-				MDIO_84833_TOP_CFG_SCRATCH_REG4,</div><div class='del'>-				PHY84833_CONSTANT_LATENCY + 1);</div><div class='del'>-</div><div class='del'>-		bnx2x_cl45_write(bp, phy, MDIO_CTL_DEVAD,</div><div class='del'>-				MDIO_84833_TOP_CFG_DATA3_REG,</div><div class='del'>-				PHY84833_CONSTANT_LATENCY + 1);</div><div class='del'>-</div><div class='del'>-		bnx2x_cl45_write(bp, phy, MDIO_CTL_DEVAD,</div><div class='del'>-				MDIO_84833_TOP_CFG_DATA4_REG,</div><div class='del'>-				PHY84833_CONSTANT_LATENCY);</div><div class='del'>-</div><div class='del'>-		/* Send EEE instruction to command register */</div><div class='del'>-		bnx2x_cl45_write(bp, phy, MDIO_CTL_DEVAD,</div><div class='del'>-				MDIO_84833_TOP_CFG_SCRATCH_REG0,</div><div class='del'>-				PHY84833_DIAG_CMD_SET_EEE_MODE);</div><div class='del'>-</div><div class='del'>-		/* Ensure that the command has completed */</div><div class='del'>-		for (idx = 0; idx &lt; PHY84833_HDSHK_WAIT; idx++) {</div><div class='del'>-			bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD,</div><div class='del'>-					MDIO_84833_TOP_CFG_SCRATCH_REG2, &amp;val);</div><div class='del'>-			if ((val == PHY84833_CMD_COMPLETE_PASS) ||</div><div class='del'>-				(val == PHY84833_CMD_COMPLETE_ERROR))</div><div class='del'>-				break;</div><div class='del'>-			usleep_range(1000, 1000);</div><div class='del'>-		}</div><div class='del'>-		if ((idx &gt;= PHY84833_HDSHK_WAIT) ||</div><div class='del'>-			(val == PHY84833_CMD_COMPLETE_ERROR)) {</div><div class='del'>-			DP(NETIF_MSG_LINK, "AutogrEEEn: command failed.\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='add'>+	if (phy-&gt;type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {</div><div class='add'>+		bnx2x_84833_pair_swap_cfg(phy, params, vars);</div><div class='ctx'> </div><div class='del'>-		/* Reset command handler */</div><div class='del'>-		bnx2x_cl45_write(bp, phy, MDIO_CTL_DEVAD,</div><div class='del'>-			    MDIO_84833_TOP_CFG_SCRATCH_REG2,</div><div class='del'>-			    PHY84833_CMD_CLEAR_COMPLETE);</div><div class='add'>+		/* Keep AutogrEEEn disabled. */</div><div class='add'>+		cmd_args[0] = 0x0;</div><div class='add'>+		cmd_args[1] = 0x0;</div><div class='add'>+		cmd_args[2] = PHY84833_CONSTANT_LATENCY + 1;</div><div class='add'>+		cmd_args[3] = PHY84833_CONSTANT_LATENCY;</div><div class='add'>+		rc = bnx2x_84833_cmd_hdlr(phy, params,</div><div class='add'>+			PHY84833_CMD_SET_EEE_MODE, cmd_args);</div><div class='add'>+		if (rc != 0)</div><div class='add'>+			DP(NETIF_MSG_LINK, "Cfg AutogrEEEn failed.\n");</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	if (initialize)</div><div class='ctx'> 		rc = bnx2x_848xx_cmn_config_init(phy, params, vars);</div><div class='ctx'> 	else</div><div class='del'>-		bnx2x_save_848xx_spirom_version(phy, params);</div><div class='add'>+		bnx2x_save_848xx_spirom_version(phy, bp, params-&gt;port);</div><div class='ctx'> 	/* 84833 PHY has a better feature and doesn't need to support this. */</div><div class='ctx'> 	if (phy-&gt;type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84823) {</div><div class='ctx'> 		cms_enable = REG_RD(bp, params-&gt;shmem_base +</div><div class='hunk'>@@ -9779,6 +9853,16 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 				 MDIO_CTL_REG_84823_USER_CTRL_REG, val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (phy-&gt;type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {</div><div class='add'>+		/* Bring PHY out of super isolate mode as the final step. */</div><div class='add'>+		bnx2x_cl45_read(bp, phy,</div><div class='add'>+				MDIO_CTL_DEVAD,</div><div class='add'>+				MDIO_84833_TOP_CFG_XGPHY_STRAP1, &amp;val);</div><div class='add'>+		val &amp;= ~MDIO_84833_SUPER_ISOLATE;</div><div class='add'>+		bnx2x_cl45_write(bp, phy,</div><div class='add'>+				MDIO_CTL_DEVAD,</div><div class='add'>+				MDIO_84833_TOP_CFG_XGPHY_STRAP1, val);</div><div class='add'>+	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -9916,10 +10000,11 @@ static void bnx2x_848x3_link_reset(struct bnx2x_phy *phy,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bnx2x_cl45_read(bp, phy,</div><div class='ctx'> 				MDIO_CTL_DEVAD,</div><div class='del'>-				0x400f, &amp;val16);</div><div class='add'>+				MDIO_84833_TOP_CFG_XGPHY_STRAP1, &amp;val16);</div><div class='add'>+		val16 |= MDIO_84833_SUPER_ISOLATE;</div><div class='ctx'> 		bnx2x_cl45_write(bp, phy,</div><div class='del'>-				MDIO_PMA_DEVAD,</div><div class='del'>-				MDIO_PMA_REG_CTRL, 0x800);</div><div class='add'>+				 MDIO_CTL_DEVAD,</div><div class='add'>+				 MDIO_84833_TOP_CFG_XGPHY_STRAP1, val16);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -10144,8 +10229,10 @@ static int bnx2x_54618se_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 	DP(NETIF_MSG_LINK, "54618SE cfg init\n");</div><div class='ctx'> 	usleep_range(1000, 1000);</div><div class='ctx'> </div><div class='del'>-	/* This works with E3 only, no need to check the chip</div><div class='del'>-	   before determining the port. */</div><div class='add'>+	/*</div><div class='add'>+	 * This works with E3 only, no need to check the chip</div><div class='add'>+	 * before determining the port.</div><div class='add'>+	 */</div><div class='ctx'> 	port = params-&gt;port;</div><div class='ctx'> </div><div class='ctx'> 	cfg_pin = (REG_RD(bp, params-&gt;shmem_base +</div><div class='hunk'>@@ -11218,7 +11305,9 @@ static int bnx2x_populate_int_phy(struct bnx2x *bp, u32 shmem_base, u8 port,</div><div class='ctx'> 				       offsetof(struct shmem_region,</div><div class='ctx'> 			dev_info.port_feature_config[port].link_config)) &amp;</div><div class='ctx'> 			  PORT_FEATURE_CONNECTED_SWITCH_MASK);</div><div class='del'>-	chip_id = REG_RD(bp, MISC_REG_CHIP_NUM) &lt;&lt; 16;</div><div class='add'>+	chip_id = (REG_RD(bp, MISC_REG_CHIP_NUM) &lt;&lt; 16) |</div><div class='add'>+		((REG_RD(bp, MISC_REG_CHIP_REV) &amp; 0xf) &lt;&lt; 12);</div><div class='add'>+</div><div class='ctx'> 	DP(NETIF_MSG_LINK, ":chip_id = 0x%x\n", chip_id);</div><div class='ctx'> 	if (USES_WARPCORE(bp)) {</div><div class='ctx'> 		u32 serdes_net_if;</div><div class='hunk'>@@ -11397,6 +11486,10 @@ static int bnx2x_populate_ext_phy(struct bnx2x *bp,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	default:</div><div class='ctx'> 		*phy = phy_null;</div><div class='add'>+		/* In case external PHY wasn't found */</div><div class='add'>+		if ((phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT) &amp;&amp;</div><div class='add'>+		    (phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN))</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -11436,6 +11529,19 @@ static int bnx2x_populate_ext_phy(struct bnx2x *bp,</div><div class='ctx'> 	}</div><div class='ctx'> 	phy-&gt;mdio_ctrl = bnx2x_get_emac_base(bp, mdc_mdio_access, port);</div><div class='ctx'> </div><div class='add'>+	if ((phy-&gt;type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) &amp;&amp;</div><div class='add'>+	    (phy-&gt;ver_addr)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Remove 100Mb link supported for BCM84833 when phy fw</div><div class='add'>+		 * version lower than or equal to 1.39</div><div class='add'>+		 */</div><div class='add'>+		u32 raw_ver = REG_RD(bp, phy-&gt;ver_addr);</div><div class='add'>+		if (((raw_ver &amp; 0x7F) &lt;= 39) &amp;&amp;</div><div class='add'>+		    (((raw_ver &amp; 0xF80) &gt;&gt; 7) &lt;= 1))</div><div class='add'>+			phy-&gt;supported &amp;= ~(SUPPORTED_100baseT_Half |</div><div class='add'>+					    SUPPORTED_100baseT_Full);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In case mdc/mdio_access of the external phy is different than the</div><div class='ctx'> 	 * mdc/mdio access of the XGXS, a HW lock must be taken in each access</div><div class='hunk'>@@ -11570,7 +11676,7 @@ u32 bnx2x_phy_selection(struct link_params *params)</div><div class='ctx'> </div><div class='ctx'> int bnx2x_phy_probe(struct link_params *params)</div><div class='ctx'> {</div><div class='del'>-	u8 phy_index, actual_phy_idx, link_cfg_idx;</div><div class='add'>+	u8 phy_index, actual_phy_idx;</div><div class='ctx'> 	u32 phy_config_swapped, sync_offset, media_types;</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	struct bnx2x_phy *phy;</div><div class='hunk'>@@ -11581,7 +11687,6 @@ int bnx2x_phy_probe(struct link_params *params)</div><div class='ctx'> </div><div class='ctx'> 	for (phy_index = INT_PHY; phy_index &lt; MAX_PHYS;</div><div class='ctx'> 	      phy_index++) {</div><div class='del'>-		link_cfg_idx = LINK_CONFIG_IDX(phy_index);</div><div class='ctx'> 		actual_phy_idx = phy_index;</div><div class='ctx'> 		if (phy_config_swapped) {</div><div class='ctx'> 			if (phy_index == EXT_PHY1)</div><div class='hunk'>@@ -12247,6 +12352,77 @@ static int bnx2x_8727_common_init_phy(struct bnx2x *bp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnx2x_84833_common_init_phy(struct bnx2x *bp,</div><div class='add'>+						u32 shmem_base_path[],</div><div class='add'>+						u32 shmem2_base_path[],</div><div class='add'>+						u8 phy_index,</div><div class='add'>+						u32 chip_id)</div><div class='add'>+{</div><div class='add'>+	u8 reset_gpios;</div><div class='add'>+	reset_gpios = bnx2x_84833_get_reset_gpios(bp, shmem_base_path, chip_id);</div><div class='add'>+	bnx2x_set_mult_gpio(bp, reset_gpios, MISC_REGISTERS_GPIO_OUTPUT_LOW);</div><div class='add'>+	udelay(10);</div><div class='add'>+	bnx2x_set_mult_gpio(bp, reset_gpios, MISC_REGISTERS_GPIO_OUTPUT_HIGH);</div><div class='add'>+	DP(NETIF_MSG_LINK, "84833 reset pulse on pin values 0x%x\n",</div><div class='add'>+		reset_gpios);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnx2x_84833_pre_init_phy(struct bnx2x *bp,</div><div class='add'>+					       struct bnx2x_phy *phy)</div><div class='add'>+{</div><div class='add'>+	u16 val, cnt;</div><div class='add'>+	/* Wait for FW completing its initialization. */</div><div class='add'>+	for (cnt = 0; cnt &lt; 1500; cnt++) {</div><div class='add'>+		bnx2x_cl45_read(bp, phy,</div><div class='add'>+				MDIO_PMA_DEVAD,</div><div class='add'>+				MDIO_PMA_REG_CTRL, &amp;val);</div><div class='add'>+		if (!(val &amp; (1&lt;&lt;15)))</div><div class='add'>+			break;</div><div class='add'>+		msleep(1);</div><div class='add'>+	}</div><div class='add'>+	if (cnt &gt;= 1500) {</div><div class='add'>+		DP(NETIF_MSG_LINK, "84833 reset timeout\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Put the port in super isolate mode. */</div><div class='add'>+	bnx2x_cl45_read(bp, phy,</div><div class='add'>+			MDIO_CTL_DEVAD,</div><div class='add'>+			MDIO_84833_TOP_CFG_XGPHY_STRAP1, &amp;val);</div><div class='add'>+	val |= MDIO_84833_SUPER_ISOLATE;</div><div class='add'>+	bnx2x_cl45_write(bp, phy,</div><div class='add'>+			 MDIO_CTL_DEVAD,</div><div class='add'>+			 MDIO_84833_TOP_CFG_XGPHY_STRAP1, val);</div><div class='add'>+</div><div class='add'>+	/* Save spirom version */</div><div class='add'>+	bnx2x_save_848xx_spirom_version(phy, bp, PORT_0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnx2x_pre_init_phy(struct bnx2x *bp,</div><div class='add'>+				  u32 shmem_base,</div><div class='add'>+				  u32 shmem2_base,</div><div class='add'>+				  u32 chip_id)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+	struct bnx2x_phy phy;</div><div class='add'>+	bnx2x_set_mdio_clk(bp, chip_id, PORT_0);</div><div class='add'>+	if (bnx2x_populate_phy(bp, EXT_PHY1, shmem_base, shmem2_base,</div><div class='add'>+			       PORT_0, &amp;phy)) {</div><div class='add'>+		DP(NETIF_MSG_LINK, "populate_phy failed\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	switch (phy.type) {</div><div class='add'>+	case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833:</div><div class='add'>+		rc = bnx2x_84833_pre_init_phy(bp, &amp;phy);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnx2x_ext_phy_common_init(struct bnx2x *bp, u32 shmem_base_path[],</div><div class='ctx'> 				     u32 shmem2_base_path[], u8 phy_index,</div><div class='ctx'> 				     u32 ext_phy_type, u32 chip_id)</div><div class='hunk'>@@ -12281,7 +12457,9 @@ static int bnx2x_ext_phy_common_init(struct bnx2x *bp, u32 shmem_base_path[],</div><div class='ctx'> 		 * GPIO3's are linked, and so both need to be toggled</div><div class='ctx'> 		 * to obtain required 2us pulse.</div><div class='ctx'> 		 */</div><div class='del'>-		rc = bnx2x_84833_common_init_phy(bp, shmem_base_path, chip_id);</div><div class='add'>+		rc = bnx2x_84833_common_init_phy(bp, shmem_base_path,</div><div class='add'>+						shmem2_base_path,</div><div class='add'>+						phy_index, chip_id);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_FAILURE:</div><div class='ctx'> 		rc = -EINVAL;</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h<br/>index 2a46e633abe9..e02a68a7fb85 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h</a></div><div class='hunk'>@@ -479,7 +479,7 @@ int bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos);</div><div class='ctx'> /*  Configure the COS to ETS according to BW and SP settings.*/</div><div class='ctx'> int bnx2x_ets_e3b0_config(const struct link_params *params,</div><div class='ctx'> 			 const struct link_vars *vars,</div><div class='del'>-			 const struct bnx2x_ets_params *ets_params);</div><div class='add'>+			 struct bnx2x_ets_params *ets_params);</div><div class='ctx'> /* Read pfc statistic*/</div><div class='ctx'> void bnx2x_pfc_statistic(struct link_params *params, struct link_vars *vars,</div><div class='ctx'> 						 u32 pfc_frames_sent[2],</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 2f6361e949f0..ffeaaa95ed96 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c</a></div><div class='hunk'>@@ -2318,12 +2318,6 @@ static void bnx2x_calc_vn_weight_sum(struct bnx2x *bp)</div><div class='ctx'> 					CMNG_FLAGS_PER_PORT_FAIRNESS_VN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* returns func by VN for current port */</div><div class='del'>-static inline int func_by_vn(struct bnx2x *bp, int vn)</div><div class='del'>-{</div><div class='del'>-	return 2 * vn + BP_PORT(bp);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void bnx2x_init_vn_minmax(struct bnx2x *bp, int vn)</div><div class='ctx'> {</div><div class='ctx'> 	struct rate_shaping_vars_per_vn m_rs_vn;</div><div class='hunk'>@@ -2475,22 +2469,6 @@ static void bnx2x_cmng_fns_init(struct bnx2x *bp, u8 read_cfg, u8 cmng_type)</div><div class='ctx'> 	   "rate shaping and fairness are disabled\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void bnx2x_link_sync_notify(struct bnx2x *bp)</div><div class='del'>-{</div><div class='del'>-	int func;</div><div class='del'>-	int vn;</div><div class='del'>-</div><div class='del'>-	/* Set the attention towards other drivers on the same port */</div><div class='del'>-	for (vn = VN_0; vn &lt; BP_MAX_VN_NUM(bp); vn++) {</div><div class='del'>-		if (vn == BP_VN(bp))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		func = func_by_vn(bp, vn);</div><div class='del'>-		REG_WR(bp, MISC_REG_AEU_GENERAL_ATTN_0 +</div><div class='del'>-		       (LINK_SYNC_ATTENTION_BIT_FUNC_0 + func)*4, 1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* This function is called upon link interrupt */</div><div class='ctx'> static void bnx2x_link_attn(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='hunk'>@@ -2549,6 +2527,9 @@ void bnx2x__link_status_update(struct bnx2x *bp)</div><div class='ctx'> 	if (bp-&gt;state != BNX2X_STATE_OPEN)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/* read updated dcb configuration */</div><div class='add'>+	bnx2x_dcbx_pmf_update(bp);</div><div class='add'>+</div><div class='ctx'> 	bnx2x_link_status_update(&amp;bp-&gt;link_params, &amp;bp-&gt;link_vars);</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;link_vars.link_up)</div><div class='hunk'>@@ -2643,15 +2624,6 @@ u32 bnx2x_fw_command(struct bnx2x *bp, u32 command, u32 param)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 stat_counter_valid(struct bnx2x *bp, struct bnx2x_fastpath *fp)</div><div class='del'>-{</div><div class='del'>-#ifdef BCM_CNIC</div><div class='del'>-	/* Statistics are not supported for CNIC Clients at the moment */</div><div class='del'>-	if (IS_FCOE_FP(fp))</div><div class='del'>-		return false;</div><div class='del'>-#endif</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> void bnx2x_func_init(struct bnx2x *bp, struct bnx2x_func_init_params *p)</div><div class='ctx'> {</div><div class='hunk'>@@ -2695,11 +2667,11 @@ static inline unsigned long bnx2x_get_common_flags(struct bnx2x *bp,</div><div class='ctx'> 	 *  parent connection). The statistics are zeroed when the parent</div><div class='ctx'> 	 *  connection is initialized.</div><div class='ctx'> 	 */</div><div class='del'>-	if (stat_counter_valid(bp, fp)) {</div><div class='del'>-		__set_bit(BNX2X_Q_FLG_STATS, &amp;flags);</div><div class='del'>-		if (zero_stats)</div><div class='del'>-			__set_bit(BNX2X_Q_FLG_ZERO_STATS, &amp;flags);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	__set_bit(BNX2X_Q_FLG_STATS, &amp;flags);</div><div class='add'>+	if (zero_stats)</div><div class='add'>+		__set_bit(BNX2X_Q_FLG_ZERO_STATS, &amp;flags);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	return flags;</div><div class='ctx'> }</div><div class='hunk'>@@ -2808,8 +2780,8 @@ static void bnx2x_pf_rx_q_prep(struct bnx2x *bp,</div><div class='ctx'> 	/* This should be a maximum number of data bytes that may be</div><div class='ctx'> 	 * placed on the BD (not including paddings).</div><div class='ctx'> 	 */</div><div class='del'>-	rxq_init-&gt;buf_sz = fp-&gt;rx_buf_size - BNX2X_FW_RX_ALIGN -</div><div class='del'>-		IP_HEADER_ALIGNMENT_PADDING;</div><div class='add'>+	rxq_init-&gt;buf_sz = fp-&gt;rx_buf_size - BNX2X_FW_RX_ALIGN_START -</div><div class='add'>+		BNX2X_FW_RX_ALIGN_END -	IP_HEADER_ALIGNMENT_PADDING;</div><div class='ctx'> </div><div class='ctx'> 	rxq_init-&gt;cl_qzone_id = fp-&gt;cl_qzone_id;</div><div class='ctx'> 	rxq_init-&gt;tpa_agg_sz = tpa_agg_size;</div><div class='hunk'>@@ -2940,6 +2912,143 @@ static void bnx2x_e1h_enable(struct bnx2x *bp)</div><div class='ctx'> 	 */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define DRV_INFO_ETH_STAT_NUM_MACS_REQUIRED 3</div><div class='add'>+</div><div class='add'>+static void bnx2x_drv_info_ether_stat(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+	struct eth_stats_info *ether_stat =</div><div class='add'>+		&amp;bp-&gt;slowpath-&gt;drv_info_to_mcp.ether_stat;</div><div class='add'>+</div><div class='add'>+	/* leave last char as NULL */</div><div class='add'>+	memcpy(ether_stat-&gt;version, DRV_MODULE_VERSION,</div><div class='add'>+	       ETH_STAT_INFO_VERSION_LEN - 1);</div><div class='add'>+</div><div class='add'>+	bp-&gt;fp[0].mac_obj.get_n_elements(bp, &amp;bp-&gt;fp[0].mac_obj,</div><div class='add'>+					 DRV_INFO_ETH_STAT_NUM_MACS_REQUIRED,</div><div class='add'>+					 ether_stat-&gt;mac_local);</div><div class='add'>+</div><div class='add'>+	ether_stat-&gt;mtu_size = bp-&gt;dev-&gt;mtu;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;dev-&gt;features &amp; NETIF_F_RXCSUM)</div><div class='add'>+		ether_stat-&gt;feature_flags |= FEATURE_ETH_CHKSUM_OFFLOAD_MASK;</div><div class='add'>+	if (bp-&gt;dev-&gt;features &amp; NETIF_F_TSO)</div><div class='add'>+		ether_stat-&gt;feature_flags |= FEATURE_ETH_LSO_MASK;</div><div class='add'>+	ether_stat-&gt;feature_flags |= bp-&gt;common.boot_mode;</div><div class='add'>+</div><div class='add'>+	ether_stat-&gt;promiscuous_mode = (bp-&gt;dev-&gt;flags &amp; IFF_PROMISC) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	ether_stat-&gt;txq_size = bp-&gt;tx_ring_size;</div><div class='add'>+	ether_stat-&gt;rxq_size = bp-&gt;rx_ring_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnx2x_drv_info_fcoe_stat(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+#ifdef BCM_CNIC</div><div class='add'>+	struct bnx2x_dcbx_app_params *app = &amp;bp-&gt;dcbx_port_params.app;</div><div class='add'>+	struct fcoe_stats_info *fcoe_stat =</div><div class='add'>+		&amp;bp-&gt;slowpath-&gt;drv_info_to_mcp.fcoe_stat;</div><div class='add'>+</div><div class='add'>+	memcpy(fcoe_stat-&gt;mac_local, bp-&gt;fip_mac, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	fcoe_stat-&gt;qos_priority =</div><div class='add'>+		app-&gt;traffic_type_priority[LLFC_TRAFFIC_TYPE_FCOE];</div><div class='add'>+</div><div class='add'>+	/* insert FCoE stats from ramrod response */</div><div class='add'>+	if (!NO_FCOE(bp)) {</div><div class='add'>+		struct tstorm_per_queue_stats *fcoe_q_tstorm_stats =</div><div class='add'>+			&amp;bp-&gt;fw_stats_data-&gt;queue_stats[FCOE_IDX].</div><div class='add'>+			tstorm_queue_statistics;</div><div class='add'>+</div><div class='add'>+		struct xstorm_per_queue_stats *fcoe_q_xstorm_stats =</div><div class='add'>+			&amp;bp-&gt;fw_stats_data-&gt;queue_stats[FCOE_IDX].</div><div class='add'>+			xstorm_queue_statistics;</div><div class='add'>+</div><div class='add'>+		struct fcoe_statistics_params *fw_fcoe_stat =</div><div class='add'>+			&amp;bp-&gt;fw_stats_data-&gt;fcoe;</div><div class='add'>+</div><div class='add'>+		ADD_64(fcoe_stat-&gt;rx_bytes_hi, 0, fcoe_stat-&gt;rx_bytes_lo,</div><div class='add'>+		       fw_fcoe_stat-&gt;rx_stat0.fcoe_rx_byte_cnt);</div><div class='add'>+</div><div class='add'>+		ADD_64(fcoe_stat-&gt;rx_bytes_hi,</div><div class='add'>+		       fcoe_q_tstorm_stats-&gt;rcv_ucast_bytes.hi,</div><div class='add'>+		       fcoe_stat-&gt;rx_bytes_lo,</div><div class='add'>+		       fcoe_q_tstorm_stats-&gt;rcv_ucast_bytes.lo);</div><div class='add'>+</div><div class='add'>+		ADD_64(fcoe_stat-&gt;rx_bytes_hi,</div><div class='add'>+		       fcoe_q_tstorm_stats-&gt;rcv_bcast_bytes.hi,</div><div class='add'>+		       fcoe_stat-&gt;rx_bytes_lo,</div><div class='add'>+		       fcoe_q_tstorm_stats-&gt;rcv_bcast_bytes.lo);</div><div class='add'>+</div><div class='add'>+		ADD_64(fcoe_stat-&gt;rx_bytes_hi,</div><div class='add'>+		       fcoe_q_tstorm_stats-&gt;rcv_mcast_bytes.hi,</div><div class='add'>+		       fcoe_stat-&gt;rx_bytes_lo,</div><div class='add'>+		       fcoe_q_tstorm_stats-&gt;rcv_mcast_bytes.lo);</div><div class='add'>+</div><div class='add'>+		ADD_64(fcoe_stat-&gt;rx_frames_hi, 0, fcoe_stat-&gt;rx_frames_lo,</div><div class='add'>+		       fw_fcoe_stat-&gt;rx_stat0.fcoe_rx_pkt_cnt);</div><div class='add'>+</div><div class='add'>+		ADD_64(fcoe_stat-&gt;rx_frames_hi, 0, fcoe_stat-&gt;rx_frames_lo,</div><div class='add'>+		       fcoe_q_tstorm_stats-&gt;rcv_ucast_pkts);</div><div class='add'>+</div><div class='add'>+		ADD_64(fcoe_stat-&gt;rx_frames_hi, 0, fcoe_stat-&gt;rx_frames_lo,</div><div class='add'>+		       fcoe_q_tstorm_stats-&gt;rcv_bcast_pkts);</div><div class='add'>+</div><div class='add'>+		ADD_64(fcoe_stat-&gt;rx_frames_hi, 0, fcoe_stat-&gt;rx_frames_lo,</div><div class='add'>+		       fcoe_q_tstorm_stats-&gt;rcv_mcast_pkts);</div><div class='add'>+</div><div class='add'>+		ADD_64(fcoe_stat-&gt;tx_bytes_hi, 0, fcoe_stat-&gt;tx_bytes_lo,</div><div class='add'>+		       fw_fcoe_stat-&gt;tx_stat.fcoe_tx_byte_cnt);</div><div class='add'>+</div><div class='add'>+		ADD_64(fcoe_stat-&gt;tx_bytes_hi,</div><div class='add'>+		       fcoe_q_xstorm_stats-&gt;ucast_bytes_sent.hi,</div><div class='add'>+		       fcoe_stat-&gt;tx_bytes_lo,</div><div class='add'>+		       fcoe_q_xstorm_stats-&gt;ucast_bytes_sent.lo);</div><div class='add'>+</div><div class='add'>+		ADD_64(fcoe_stat-&gt;tx_bytes_hi,</div><div class='add'>+		       fcoe_q_xstorm_stats-&gt;bcast_bytes_sent.hi,</div><div class='add'>+		       fcoe_stat-&gt;tx_bytes_lo,</div><div class='add'>+		       fcoe_q_xstorm_stats-&gt;bcast_bytes_sent.lo);</div><div class='add'>+</div><div class='add'>+		ADD_64(fcoe_stat-&gt;tx_bytes_hi,</div><div class='add'>+		       fcoe_q_xstorm_stats-&gt;mcast_bytes_sent.hi,</div><div class='add'>+		       fcoe_stat-&gt;tx_bytes_lo,</div><div class='add'>+		       fcoe_q_xstorm_stats-&gt;mcast_bytes_sent.lo);</div><div class='add'>+</div><div class='add'>+		ADD_64(fcoe_stat-&gt;tx_frames_hi, 0, fcoe_stat-&gt;tx_frames_lo,</div><div class='add'>+		       fw_fcoe_stat-&gt;tx_stat.fcoe_tx_pkt_cnt);</div><div class='add'>+</div><div class='add'>+		ADD_64(fcoe_stat-&gt;tx_frames_hi, 0, fcoe_stat-&gt;tx_frames_lo,</div><div class='add'>+		       fcoe_q_xstorm_stats-&gt;ucast_pkts_sent);</div><div class='add'>+</div><div class='add'>+		ADD_64(fcoe_stat-&gt;tx_frames_hi, 0, fcoe_stat-&gt;tx_frames_lo,</div><div class='add'>+		       fcoe_q_xstorm_stats-&gt;bcast_pkts_sent);</div><div class='add'>+</div><div class='add'>+		ADD_64(fcoe_stat-&gt;tx_frames_hi, 0, fcoe_stat-&gt;tx_frames_lo,</div><div class='add'>+		       fcoe_q_xstorm_stats-&gt;mcast_pkts_sent);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ask L5 driver to add data to the struct */</div><div class='add'>+	bnx2x_cnic_notify(bp, CNIC_CTL_FCOE_STATS_GET_CMD);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnx2x_drv_info_iscsi_stat(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+#ifdef BCM_CNIC</div><div class='add'>+	struct bnx2x_dcbx_app_params *app = &amp;bp-&gt;dcbx_port_params.app;</div><div class='add'>+	struct iscsi_stats_info *iscsi_stat =</div><div class='add'>+		&amp;bp-&gt;slowpath-&gt;drv_info_to_mcp.iscsi_stat;</div><div class='add'>+</div><div class='add'>+	memcpy(iscsi_stat-&gt;mac_local, bp-&gt;cnic_eth_dev.iscsi_mac, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	iscsi_stat-&gt;qos_priority =</div><div class='add'>+		app-&gt;traffic_type_priority[LLFC_TRAFFIC_TYPE_ISCSI];</div><div class='add'>+</div><div class='add'>+	/* ask L5 driver to add data to the struct */</div><div class='add'>+	bnx2x_cnic_notify(bp, CNIC_CTL_ISCSI_STATS_GET_CMD);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* called due to MCP event (on pmf):</div><div class='ctx'>  *	reread new bandwidth configuration</div><div class='ctx'>  *	configure FW</div><div class='hunk'>@@ -2960,6 +3069,50 @@ static inline void bnx2x_set_mf_bw(struct bnx2x *bp)</div><div class='ctx'> 	bnx2x_fw_command(bp, DRV_MSG_CODE_SET_MF_BW_ACK, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnx2x_handle_drv_info_req(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+	enum drv_info_opcode op_code;</div><div class='add'>+	u32 drv_info_ctl = SHMEM2_RD(bp, drv_info_control);</div><div class='add'>+</div><div class='add'>+	/* if drv_info version supported by MFW doesn't match - send NACK */</div><div class='add'>+	if ((drv_info_ctl &amp; DRV_INFO_CONTROL_VER_MASK) != DRV_INFO_CUR_VER) {</div><div class='add'>+		bnx2x_fw_command(bp, DRV_MSG_CODE_DRV_INFO_NACK, 0);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	op_code = (drv_info_ctl &amp; DRV_INFO_CONTROL_OP_CODE_MASK) &gt;&gt;</div><div class='add'>+		  DRV_INFO_CONTROL_OP_CODE_SHIFT;</div><div class='add'>+</div><div class='add'>+	memset(&amp;bp-&gt;slowpath-&gt;drv_info_to_mcp, 0,</div><div class='add'>+	       sizeof(union drv_info_to_mcp));</div><div class='add'>+</div><div class='add'>+	switch (op_code) {</div><div class='add'>+	case ETH_STATS_OPCODE:</div><div class='add'>+		bnx2x_drv_info_ether_stat(bp);</div><div class='add'>+		break;</div><div class='add'>+	case FCOE_STATS_OPCODE:</div><div class='add'>+		bnx2x_drv_info_fcoe_stat(bp);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_STATS_OPCODE:</div><div class='add'>+		bnx2x_drv_info_iscsi_stat(bp);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* if op code isn't supported - send NACK */</div><div class='add'>+		bnx2x_fw_command(bp, DRV_MSG_CODE_DRV_INFO_NACK, 0);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if we got drv_info attn from MFW then these fields are defined in</div><div class='add'>+	 * shmem2 for sure</div><div class='add'>+	 */</div><div class='add'>+	SHMEM2_WR(bp, drv_info_host_addr_lo,</div><div class='add'>+		U64_LO(bnx2x_sp_mapping(bp, drv_info_to_mcp)));</div><div class='add'>+	SHMEM2_WR(bp, drv_info_host_addr_hi,</div><div class='add'>+		U64_HI(bnx2x_sp_mapping(bp, drv_info_to_mcp)));</div><div class='add'>+</div><div class='add'>+	bnx2x_fw_command(bp, DRV_MSG_CODE_DRV_INFO_ACK, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnx2x_dcc_event(struct bnx2x *bp, u32 dcc_event)</div><div class='ctx'> {</div><div class='ctx'> 	DP(BNX2X_MSG_MCP, "dcc_event 0x%x\n", dcc_event);</div><div class='hunk'>@@ -3318,6 +3471,17 @@ static inline void bnx2x_fan_failure(struct bnx2x *bp)</div><div class='ctx'> 	netdev_err(bp-&gt;dev, "Fan Failure on Network Controller has caused"</div><div class='ctx'> 	       " the driver to shutdown the card to prevent permanent"</div><div class='ctx'> 	       " damage.  Please contact OEM Support for assistance\n");</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Scheudle device reset (unload)</div><div class='add'>+	 * This is due to some boards consuming sufficient power when driver is</div><div class='add'>+	 * up to overheat if fan fails.</div><div class='add'>+	 */</div><div class='add'>+	smp_mb__before_clear_bit();</div><div class='add'>+	set_bit(BNX2X_SP_RTNL_FAN_FAILURE, &amp;bp-&gt;sp_rtnl_state);</div><div class='add'>+	smp_mb__after_clear_bit();</div><div class='add'>+	schedule_delayed_work(&amp;bp-&gt;sp_rtnl_task, 0);</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void bnx2x_attn_int_deasserted0(struct bnx2x *bp, u32 attn)</div><div class='hunk'>@@ -3456,6 +3620,8 @@ static inline void bnx2x_attn_int_deasserted3(struct bnx2x *bp, u32 attn)</div><div class='ctx'> 			if (val &amp; DRV_STATUS_SET_MF_BW)</div><div class='ctx'> 				bnx2x_set_mf_bw(bp);</div><div class='ctx'> </div><div class='add'>+			if (val &amp; DRV_STATUS_DRV_INFO_REQ)</div><div class='add'>+				bnx2x_handle_drv_info_req(bp);</div><div class='ctx'> 			if ((bp-&gt;port.pmf == 0) &amp;&amp; (val &amp; DRV_STATUS_PMF))</div><div class='ctx'> 				bnx2x_pmf_update(bp);</div><div class='ctx'> </div><div class='hunk'>@@ -5247,7 +5413,7 @@ static void bnx2x_init_eth_fp(struct bnx2x *bp, int fp_idx)</div><div class='ctx'> 	u8 cos;</div><div class='ctx'> 	unsigned long q_type = 0;</div><div class='ctx'> 	u32 cids[BNX2X_MULTI_TX_COS] = { 0 };</div><div class='del'>-</div><div class='add'>+	fp-&gt;rx_queue = fp_idx;</div><div class='ctx'> 	fp-&gt;cid = fp_idx;</div><div class='ctx'> 	fp-&gt;cl_id = bnx2x_fp_cl_id(fp);</div><div class='ctx'> 	fp-&gt;fw_sb_id = bnx2x_fp_fw_sb_id(fp);</div><div class='hunk'>@@ -6856,13 +7022,16 @@ void bnx2x_free_mem(struct bnx2x *bp)</div><div class='ctx'> static inline int bnx2x_alloc_fw_stats_mem(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int num_groups;</div><div class='add'>+	int is_fcoe_stats = NO_FCOE(bp) ? 0 : 1;</div><div class='ctx'> </div><div class='del'>-	/* number of eth_queues */</div><div class='del'>-	u8 num_queue_stats = BNX2X_NUM_ETH_QUEUES(bp);</div><div class='add'>+	/* number of queues for statistics is number of eth queues + FCoE */</div><div class='add'>+	u8 num_queue_stats = BNX2X_NUM_ETH_QUEUES(bp) + is_fcoe_stats;</div><div class='ctx'> </div><div class='ctx'> 	/* Total number of FW statistics requests =</div><div class='del'>-	 * 1 for port stats + 1 for PF stats + num_eth_queues */</div><div class='del'>-	bp-&gt;fw_stats_num = 2 + num_queue_stats;</div><div class='add'>+	 * 1 for port stats + 1 for PF stats + potential 1 for FCoE stats +</div><div class='add'>+	 * num of queues</div><div class='add'>+	 */</div><div class='add'>+	bp-&gt;fw_stats_num = 2 + is_fcoe_stats + num_queue_stats;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* Request is built from stats_query_header and an array of</div><div class='hunk'>@@ -6870,8 +7039,8 @@ static inline int bnx2x_alloc_fw_stats_mem(struct bnx2x *bp)</div><div class='ctx'> 	 * STATS_QUERY_CMD_COUNT rules. The real number or requests is</div><div class='ctx'> 	 * configured in the stats_query_header.</div><div class='ctx'> 	 */</div><div class='del'>-	num_groups = (2 + num_queue_stats) / STATS_QUERY_CMD_COUNT +</div><div class='del'>-		(((2 + num_queue_stats) % STATS_QUERY_CMD_COUNT) ? 1 : 0);</div><div class='add'>+	num_groups = ((bp-&gt;fw_stats_num) / STATS_QUERY_CMD_COUNT) +</div><div class='add'>+		     (((bp-&gt;fw_stats_num) % STATS_QUERY_CMD_COUNT) ? 1 : 0);</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;fw_stats_req_sz = sizeof(struct stats_query_header) +</div><div class='ctx'> 			num_groups * sizeof(struct stats_query_cmd_group);</div><div class='hunk'>@@ -6880,9 +7049,13 @@ static inline int bnx2x_alloc_fw_stats_mem(struct bnx2x *bp)</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * stats_counter holds per-STORM counters that are incremented</div><div class='ctx'> 	 * when STORM has finished with the current request.</div><div class='add'>+	 *</div><div class='add'>+	 * memory for FCoE offloaded statistics are counted anyway,</div><div class='add'>+	 * even if they will not be sent.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bp-&gt;fw_stats_data_sz = sizeof(struct per_port_stats) +</div><div class='ctx'> 		sizeof(struct per_pf_stats) +</div><div class='add'>+		sizeof(struct fcoe_statistics_params) +</div><div class='ctx'> 		sizeof(struct per_queue_stats) * num_queue_stats +</div><div class='ctx'> 		sizeof(struct stats_counter);</div><div class='ctx'> </div><div class='hunk'>@@ -7025,6 +7198,13 @@ int bnx2x_set_eth_mac(struct bnx2x *bp, bool set)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ramrod_flags = 0;</div><div class='ctx'> </div><div class='add'>+#ifdef BCM_CNIC</div><div class='add'>+	if (is_zero_ether_addr(bp-&gt;dev-&gt;dev_addr) &amp;&amp; IS_MF_ISCSI_SD(bp)) {</div><div class='add'>+		DP(NETIF_MSG_IFUP, "Ignoring Zero MAC for iSCSI SD mode\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	DP(NETIF_MSG_IFUP, "Adding Eth MAC\n");</div><div class='ctx'> </div><div class='ctx'> 	__set_bit(RAMROD_COMP_WAIT, &amp;ramrod_flags);</div><div class='hunk'>@@ -8522,6 +8702,17 @@ sp_rtnl_not_reset:</div><div class='ctx'> 	if (test_and_clear_bit(BNX2X_SP_RTNL_SETUP_TC, &amp;bp-&gt;sp_rtnl_state))</div><div class='ctx'> 		bnx2x_setup_tc(bp-&gt;dev, bp-&gt;dcbx_port_params.ets.num_of_cos);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * in case of fan failure we need to reset id if the "stop on error"</div><div class='add'>+	 * debug flag is set, since we trying to prevent permanent overheating</div><div class='add'>+	 * damage</div><div class='add'>+	 */</div><div class='add'>+	if (test_and_clear_bit(BNX2X_SP_RTNL_FAN_FAILURE, &amp;bp-&gt;sp_rtnl_state)) {</div><div class='add'>+		DP(BNX2X_MSG_SP, "fan failure detected. Unloading driver\n");</div><div class='add'>+		netif_device_detach(bp-&gt;dev);</div><div class='add'>+		bnx2x_close(bp-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> sp_rtnl_exit:</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> }</div><div class='hunk'>@@ -8708,7 +8899,7 @@ static void __devinit bnx2x_undi_unload(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> static void __devinit bnx2x_get_common_hwinfo(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='del'>-	u32 val, val2, val3, val4, id;</div><div class='add'>+	u32 val, val2, val3, val4, id, boot_mode;</div><div class='ctx'> 	u16 pmc;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the chip revision id and number. */</div><div class='hunk'>@@ -8817,6 +9008,26 @@ static void __devinit bnx2x_get_common_hwinfo(struct bnx2x *bp)</div><div class='ctx'> 	bp-&gt;link_params.feature_config_flags |=</div><div class='ctx'> 		(val &gt;= REQ_BC_VER_4_SFP_TX_DISABLE_SUPPORTED) ?</div><div class='ctx'> 		FEATURE_CONFIG_BC_SUPPORTS_SFP_TX_DISABLED : 0;</div><div class='add'>+	bp-&gt;flags |= (val &gt;= REQ_BC_VER_4_PFC_STATS_SUPPORTED) ?</div><div class='add'>+			BC_SUPPORTS_PFC_STATS : 0;</div><div class='add'>+</div><div class='add'>+	boot_mode = SHMEM_RD(bp,</div><div class='add'>+			dev_info.port_feature_config[BP_PORT(bp)].mba_config) &amp;</div><div class='add'>+			PORT_FEATURE_MBA_BOOT_AGENT_TYPE_MASK;</div><div class='add'>+	switch (boot_mode) {</div><div class='add'>+	case PORT_FEATURE_MBA_BOOT_AGENT_TYPE_PXE:</div><div class='add'>+		bp-&gt;common.boot_mode = FEATURE_ETH_BOOTMODE_PXE;</div><div class='add'>+		break;</div><div class='add'>+	case PORT_FEATURE_MBA_BOOT_AGENT_TYPE_ISCSIB:</div><div class='add'>+		bp-&gt;common.boot_mode = FEATURE_ETH_BOOTMODE_ISCSI;</div><div class='add'>+		break;</div><div class='add'>+	case PORT_FEATURE_MBA_BOOT_AGENT_TYPE_FCOE_BOOT:</div><div class='add'>+		bp-&gt;common.boot_mode = FEATURE_ETH_BOOTMODE_FCOE;</div><div class='add'>+		break;</div><div class='add'>+	case PORT_FEATURE_MBA_BOOT_AGENT_TYPE_NONE:</div><div class='add'>+		bp-&gt;common.boot_mode = FEATURE_ETH_BOOTMODE_NONE;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	pci_read_config_word(bp-&gt;pdev, bp-&gt;pm_cap + PCI_PM_PMC, &amp;pmc);</div><div class='ctx'> 	bp-&gt;flags |= (pmc &amp; PCI_PM_CAP_PME_D3cold) ? 0 : NO_WOL_FLAG;</div><div class='hunk'>@@ -9267,22 +9478,43 @@ static void __devinit bnx2x_get_port_hwinfo(struct bnx2x *bp)</div><div class='ctx'> 							bp-&gt;common.shmem2_base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef BCM_CNIC</div><div class='del'>-static void __devinit bnx2x_get_cnic_info(struct bnx2x *bp)</div><div class='add'>+void bnx2x_get_iscsi_info(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='add'>+#ifdef BCM_CNIC</div><div class='ctx'> 	int port = BP_PORT(bp);</div><div class='del'>-	int func = BP_ABS_FUNC(bp);</div><div class='ctx'> </div><div class='ctx'> 	u32 max_iscsi_conn = FW_ENCODE_32BIT_PATTERN ^ SHMEM_RD(bp,</div><div class='ctx'> 				drv_lic_key[port].max_iscsi_conn);</div><div class='del'>-	u32 max_fcoe_conn = FW_ENCODE_32BIT_PATTERN ^ SHMEM_RD(bp,</div><div class='del'>-				drv_lic_key[port].max_fcoe_conn);</div><div class='ctx'> </div><div class='del'>-	/* Get the number of maximum allowed iSCSI and FCoE connections */</div><div class='add'>+	/* Get the number of maximum allowed iSCSI connections */</div><div class='ctx'> 	bp-&gt;cnic_eth_dev.max_iscsi_conn =</div><div class='ctx'> 		(max_iscsi_conn &amp; BNX2X_MAX_ISCSI_INIT_CONN_MASK) &gt;&gt;</div><div class='ctx'> 		BNX2X_MAX_ISCSI_INIT_CONN_SHIFT;</div><div class='ctx'> </div><div class='add'>+	BNX2X_DEV_INFO("max_iscsi_conn 0x%x\n",</div><div class='add'>+		       bp-&gt;cnic_eth_dev.max_iscsi_conn);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If maximum allowed number of connections is zero -</div><div class='add'>+	 * disable the feature.</div><div class='add'>+	 */</div><div class='add'>+	if (!bp-&gt;cnic_eth_dev.max_iscsi_conn)</div><div class='add'>+		bp-&gt;flags |= NO_ISCSI_FLAG;</div><div class='add'>+#else</div><div class='add'>+	bp-&gt;flags |= NO_ISCSI_FLAG;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit bnx2x_get_fcoe_info(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+#ifdef BCM_CNIC</div><div class='add'>+	int port = BP_PORT(bp);</div><div class='add'>+	int func = BP_ABS_FUNC(bp);</div><div class='add'>+</div><div class='add'>+	u32 max_fcoe_conn = FW_ENCODE_32BIT_PATTERN ^ SHMEM_RD(bp,</div><div class='add'>+				drv_lic_key[port].max_fcoe_conn);</div><div class='add'>+</div><div class='add'>+	/* Get the number of maximum allowed FCoE connections */</div><div class='ctx'> 	bp-&gt;cnic_eth_dev.max_fcoe_conn =</div><div class='ctx'> 		(max_fcoe_conn &amp; BNX2X_MAX_FCOE_INIT_CONN_MASK) &gt;&gt;</div><div class='ctx'> 		BNX2X_MAX_FCOE_INIT_CONN_SHIFT;</div><div class='hunk'>@@ -9334,21 +9566,29 @@ static void __devinit bnx2x_get_cnic_info(struct bnx2x *bp)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	BNX2X_DEV_INFO("max_iscsi_conn 0x%x max_fcoe_conn 0x%x\n",</div><div class='del'>-		       bp-&gt;cnic_eth_dev.max_iscsi_conn,</div><div class='del'>-		       bp-&gt;cnic_eth_dev.max_fcoe_conn);</div><div class='add'>+	BNX2X_DEV_INFO("max_fcoe_conn 0x%x\n", bp-&gt;cnic_eth_dev.max_fcoe_conn);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If maximum allowed number of connections is zero -</div><div class='ctx'> 	 * disable the feature.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!bp-&gt;cnic_eth_dev.max_iscsi_conn)</div><div class='del'>-		bp-&gt;flags |= NO_ISCSI_OOO_FLAG | NO_ISCSI_FLAG;</div><div class='del'>-</div><div class='ctx'> 	if (!bp-&gt;cnic_eth_dev.max_fcoe_conn)</div><div class='ctx'> 		bp-&gt;flags |= NO_FCOE_FLAG;</div><div class='del'>-}</div><div class='add'>+#else</div><div class='add'>+	bp-&gt;flags |= NO_FCOE_FLAG;</div><div class='ctx'> #endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit bnx2x_get_cnic_info(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * iSCSI may be dynamically disabled but reading</div><div class='add'>+	 * info here we will decrease memory usage by driver</div><div class='add'>+	 * if the feature is disabled for good</div><div class='add'>+	 */</div><div class='add'>+	bnx2x_get_iscsi_info(bp);</div><div class='add'>+	bnx2x_get_fcoe_info(bp);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='hunk'>@@ -9374,7 +9614,8 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)</div><div class='ctx'> 			bnx2x_set_mac_buf(bp-&gt;dev-&gt;dev_addr, val, val2);</div><div class='ctx'> </div><div class='ctx'> #ifdef BCM_CNIC</div><div class='del'>-		/* iSCSI and FCoE NPAR MACs: if there is no either iSCSI or</div><div class='add'>+		/*</div><div class='add'>+		 * iSCSI and FCoE NPAR MACs: if there is no either iSCSI or</div><div class='ctx'> 		 * FCoE MAC then the appropriate feature should be disabled.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (IS_MF_SI(bp)) {</div><div class='hunk'>@@ -9396,11 +9637,22 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)</div><div class='ctx'> 				val = MF_CFG_RD(bp, func_ext_config[func].</div><div class='ctx'> 						    fcoe_mac_addr_lower);</div><div class='ctx'> 				bnx2x_set_mac_buf(fip_mac, val, val2);</div><div class='del'>-				BNX2X_DEV_INFO("Read FCoE L2 MAC to %pM\n",</div><div class='add'>+				BNX2X_DEV_INFO("Read FCoE L2 MAC: %pM\n",</div><div class='ctx'> 					       fip_mac);</div><div class='ctx'> </div><div class='ctx'> 			} else</div><div class='ctx'> 				bp-&gt;flags |= NO_FCOE_FLAG;</div><div class='add'>+		} else { /* SD mode */</div><div class='add'>+			if (BNX2X_IS_MF_PROTOCOL_ISCSI(bp)) {</div><div class='add'>+				/* use primary mac as iscsi mac */</div><div class='add'>+				memcpy(iscsi_mac, bp-&gt;dev-&gt;dev_addr, ETH_ALEN);</div><div class='add'>+				/* Zero primary MAC configuration */</div><div class='add'>+				memset(bp-&gt;dev-&gt;dev_addr, 0, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+				BNX2X_DEV_INFO("SD ISCSI MODE\n");</div><div class='add'>+				BNX2X_DEV_INFO("Read iSCSI MAC: %pM\n",</div><div class='add'>+					       iscsi_mac);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -9449,7 +9701,7 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (!is_valid_ether_addr(bp-&gt;dev-&gt;dev_addr))</div><div class='add'>+	if (!bnx2x_is_valid_ether_addr(bp, bp-&gt;dev-&gt;dev_addr))</div><div class='ctx'> 		dev_err(&amp;bp-&gt;pdev-&gt;dev,</div><div class='ctx'> 			"bad Ethernet MAC address configuration: "</div><div class='ctx'> 			"%pM, change it manually before bringing up "</div><div class='hunk'>@@ -9661,9 +9913,7 @@ static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp)</div><div class='ctx'> 	/* Get MAC addresses */</div><div class='ctx'> 	bnx2x_get_mac_hwinfo(bp);</div><div class='ctx'> </div><div class='del'>-#ifdef BCM_CNIC</div><div class='ctx'> 	bnx2x_get_cnic_info(bp);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Get current FW pulse sequence */</div><div class='ctx'> 	if (!BP_NOMCP(bp)) {</div><div class='hunk'>@@ -9681,30 +9931,49 @@ static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp)</div><div class='ctx'> static void __devinit bnx2x_read_fwinfo(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int cnt, i, block_end, rodi;</div><div class='del'>-	char vpd_data[BNX2X_VPD_LEN+1];</div><div class='add'>+	char vpd_start[BNX2X_VPD_LEN+1];</div><div class='ctx'> 	char str_id_reg[VENDOR_ID_LEN+1];</div><div class='ctx'> 	char str_id_cap[VENDOR_ID_LEN+1];</div><div class='add'>+	char *vpd_data;</div><div class='add'>+	char *vpd_extended_data = NULL;</div><div class='ctx'> 	u8 len;</div><div class='ctx'> </div><div class='del'>-	cnt = pci_read_vpd(bp-&gt;pdev, 0, BNX2X_VPD_LEN, vpd_data);</div><div class='add'>+	cnt = pci_read_vpd(bp-&gt;pdev, 0, BNX2X_VPD_LEN, vpd_start);</div><div class='ctx'> 	memset(bp-&gt;fw_ver, 0, sizeof(bp-&gt;fw_ver));</div><div class='ctx'> </div><div class='ctx'> 	if (cnt &lt; BNX2X_VPD_LEN)</div><div class='ctx'> 		goto out_not_found;</div><div class='ctx'> </div><div class='del'>-	i = pci_vpd_find_tag(vpd_data, 0, BNX2X_VPD_LEN,</div><div class='add'>+	/* VPD RO tag should be first tag after identifier string, hence</div><div class='add'>+	 * we should be able to find it in first BNX2X_VPD_LEN chars</div><div class='add'>+	 */</div><div class='add'>+	i = pci_vpd_find_tag(vpd_start, 0, BNX2X_VPD_LEN,</div><div class='ctx'> 			     PCI_VPD_LRDT_RO_DATA);</div><div class='ctx'> 	if (i &lt; 0)</div><div class='ctx'> 		goto out_not_found;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	block_end = i + PCI_VPD_LRDT_TAG_SIZE +</div><div class='del'>-		    pci_vpd_lrdt_size(&amp;vpd_data[i]);</div><div class='add'>+		    pci_vpd_lrdt_size(&amp;vpd_start[i]);</div><div class='ctx'> </div><div class='ctx'> 	i += PCI_VPD_LRDT_TAG_SIZE;</div><div class='ctx'> </div><div class='del'>-	if (block_end &gt; BNX2X_VPD_LEN)</div><div class='del'>-		goto out_not_found;</div><div class='add'>+	if (block_end &gt; BNX2X_VPD_LEN) {</div><div class='add'>+		vpd_extended_data = kmalloc(block_end, GFP_KERNEL);</div><div class='add'>+		if (vpd_extended_data  == NULL)</div><div class='add'>+			goto out_not_found;</div><div class='add'>+</div><div class='add'>+		/* read rest of vpd image into vpd_extended_data */</div><div class='add'>+		memcpy(vpd_extended_data, vpd_start, BNX2X_VPD_LEN);</div><div class='add'>+		cnt = pci_read_vpd(bp-&gt;pdev, BNX2X_VPD_LEN,</div><div class='add'>+				   block_end - BNX2X_VPD_LEN,</div><div class='add'>+				   vpd_extended_data + BNX2X_VPD_LEN);</div><div class='add'>+		if (cnt &lt; (block_end - BNX2X_VPD_LEN))</div><div class='add'>+			goto out_not_found;</div><div class='add'>+		vpd_data = vpd_extended_data;</div><div class='add'>+	} else</div><div class='add'>+		vpd_data = vpd_start;</div><div class='add'>+</div><div class='add'>+	/* now vpd_data holds full vpd content in both cases */</div><div class='ctx'> </div><div class='ctx'> 	rodi = pci_vpd_find_info_keyword(vpd_data, i, block_end,</div><div class='ctx'> 				   PCI_VPD_RO_KEYWORD_MFR_ID);</div><div class='hunk'>@@ -9736,9 +10005,11 @@ static void __devinit bnx2x_read_fwinfo(struct bnx2x *bp)</div><div class='ctx'> 				bp-&gt;fw_ver[len] = ' ';</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		kfree(vpd_extended_data);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> out_not_found:</div><div class='add'>+	kfree(vpd_extended_data);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -9840,15 +10111,20 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;multi_mode = multi_mode;</div><div class='ctx'> </div><div class='add'>+	bp-&gt;disable_tpa = disable_tpa;</div><div class='add'>+</div><div class='add'>+#ifdef BCM_CNIC</div><div class='add'>+	bp-&gt;disable_tpa |= IS_MF_ISCSI_SD(bp);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/* Set TPA flags */</div><div class='del'>-	if (disable_tpa) {</div><div class='add'>+	if (bp-&gt;disable_tpa) {</div><div class='ctx'> 		bp-&gt;flags &amp;= ~TPA_ENABLE_FLAG;</div><div class='ctx'> 		bp-&gt;dev-&gt;features &amp;= ~NETIF_F_LRO;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bp-&gt;flags |= TPA_ENABLE_FLAG;</div><div class='ctx'> 		bp-&gt;dev-&gt;features |= NETIF_F_LRO;</div><div class='ctx'> 	}</div><div class='del'>-	bp-&gt;disable_tpa = disable_tpa;</div><div class='ctx'> </div><div class='ctx'> 	if (CHIP_IS_E1(bp))</div><div class='ctx'> 		bp-&gt;dropless_fc = 0;</div><div class='hunk'>@@ -9965,7 +10241,7 @@ static int bnx2x_open(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called with rtnl_lock */</div><div class='del'>-static int bnx2x_close(struct net_device *dev)</div><div class='add'>+int bnx2x_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -10119,6 +10395,11 @@ void bnx2x_set_rx_mode(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;rx_mode = rx_mode;</div><div class='add'>+#ifdef BCM_CNIC</div><div class='add'>+	/* handle ISCSI SD mode */</div><div class='add'>+	if (IS_MF_ISCSI_SD(bp))</div><div class='add'>+		bp-&gt;rx_mode = BNX2X_RX_MODE_NONE;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Schedule the rx_mode command */</div><div class='ctx'> 	if (test_bit(BNX2X_FILTER_RX_MODE_PENDING, &amp;bp-&gt;sp_state)) {</div><div class='hunk'>@@ -10198,6 +10479,15 @@ static void poll_bnx2x(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static int bnx2x_validate_addr(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bnx2x *bp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (!bnx2x_is_valid_ether_addr(bp, dev-&gt;dev_addr))</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops bnx2x_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= bnx2x_open,</div><div class='ctx'> 	.ndo_stop		= bnx2x_close,</div><div class='hunk'>@@ -10205,7 +10495,7 @@ static const struct net_device_ops bnx2x_netdev_ops = {</div><div class='ctx'> 	.ndo_select_queue	= bnx2x_select_queue,</div><div class='ctx'> 	.ndo_set_rx_mode	= bnx2x_set_rx_mode,</div><div class='ctx'> 	.ndo_set_mac_address	= bnx2x_change_mac_addr,</div><div class='del'>-	.ndo_validate_addr	= eth_validate_addr,</div><div class='add'>+	.ndo_validate_addr	= bnx2x_validate_addr,</div><div class='ctx'> 	.ndo_do_ioctl		= bnx2x_ioctl,</div><div class='ctx'> 	.ndo_change_mtu		= bnx2x_change_mtu,</div><div class='ctx'> 	.ndo_fix_features	= bnx2x_fix_features,</div><div class='hunk'>@@ -10823,8 +11113,8 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	bp-&gt;qm_cid_count = bnx2x_set_qm_cid_count(bp);</div><div class='ctx'> </div><div class='ctx'> #ifdef BCM_CNIC</div><div class='del'>-	/* disable FCOE L2 queue for E1x and E3*/</div><div class='del'>-	if (CHIP_IS_E1x(bp) || CHIP_IS_E3(bp))</div><div class='add'>+	/* disable FCOE L2 queue for E1x */</div><div class='add'>+	if (CHIP_IS_E1x(bp))</div><div class='ctx'> 		bp-&gt;flags |= NO_FCOE_FLAG;</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='hunk'>@@ -11486,6 +11776,38 @@ static int bnx2x_drv_ctl(struct net_device *dev, struct drv_ctl_info *ctl)</div><div class='ctx'> 		smp_mb__after_atomic_inc();</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	case DRV_CTL_ULP_REGISTER_CMD: {</div><div class='add'>+		int ulp_type = ctl-&gt;data.ulp_type;</div><div class='add'>+</div><div class='add'>+		if (CHIP_IS_E3(bp)) {</div><div class='add'>+			int idx = BP_FW_MB_IDX(bp);</div><div class='add'>+			u32 cap;</div><div class='add'>+</div><div class='add'>+			cap = SHMEM2_RD(bp, drv_capabilities_flag[idx]);</div><div class='add'>+			if (ulp_type == CNIC_ULP_ISCSI)</div><div class='add'>+				cap |= DRV_FLAGS_CAPABILITIES_LOADED_ISCSI;</div><div class='add'>+			else if (ulp_type == CNIC_ULP_FCOE)</div><div class='add'>+				cap |= DRV_FLAGS_CAPABILITIES_LOADED_FCOE;</div><div class='add'>+			SHMEM2_WR(bp, drv_capabilities_flag[idx], cap);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case DRV_CTL_ULP_UNREGISTER_CMD: {</div><div class='add'>+		int ulp_type = ctl-&gt;data.ulp_type;</div><div class='add'>+</div><div class='add'>+		if (CHIP_IS_E3(bp)) {</div><div class='add'>+			int idx = BP_FW_MB_IDX(bp);</div><div class='add'>+			u32 cap;</div><div class='add'>+</div><div class='add'>+			cap = SHMEM2_RD(bp, drv_capabilities_flag[idx]);</div><div class='add'>+			if (ulp_type == CNIC_ULP_ISCSI)</div><div class='add'>+				cap &amp;= ~DRV_FLAGS_CAPABILITIES_LOADED_ISCSI;</div><div class='add'>+			else if (ulp_type == CNIC_ULP_FCOE)</div><div class='add'>+				cap &amp;= ~DRV_FLAGS_CAPABILITIES_LOADED_FCOE;</div><div class='add'>+			SHMEM2_WR(bp, drv_capabilities_flag[idx], cap);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		BNX2X_ERR("unknown command %x\n", ctl-&gt;cmd);</div><div class='hunk'>@@ -11561,7 +11883,7 @@ static int bnx2x_unregister_cnic(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;bp-&gt;cnic_mutex);</div><div class='ctx'> 	cp-&gt;drv_state = 0;</div><div class='del'>-	rcu_assign_pointer(bp-&gt;cnic_ops, NULL);</div><div class='add'>+	RCU_INIT_POINTER(bp-&gt;cnic_ops, NULL);</div><div class='ctx'> 	mutex_unlock(&amp;bp-&gt;cnic_mutex);</div><div class='ctx'> 	synchronize_rcu();</div><div class='ctx'> 	kfree(bp-&gt;cnic_kwq);</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h<br/>index e58073ef33b4..dddbcf6e154e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h</a></div><div class='hunk'>@@ -160,8 +160,11 @@</div><div class='ctx'> #define BRB1_REG_PAUSE_HIGH_THRESHOLD_1 			 0x6007c</div><div class='ctx'> /* [RW 10] Write client 0: Assert pause threshold. */</div><div class='ctx'> #define BRB1_REG_PAUSE_LOW_THRESHOLD_0				 0x60068</div><div class='del'>-#define BRB1_REG_PAUSE_LOW_THRESHOLD_1				 0x6006c</div><div class='del'>-/* [R 24] The number of full blocks occupied by port. */</div><div class='add'>+/* [RW 1] Indicates if to use per-class guaranty mode (new mode) or per-MAC</div><div class='add'>+ * guaranty mode (backwards-compatible mode). 0=per-MAC guaranty mode (BC</div><div class='add'>+ * mode). 1=per-class guaranty mode (new mode). */</div><div class='add'>+#define BRB1_REG_PER_CLASS_GUARANTY_MODE			 0x60268</div><div class='add'>+/* [R 24] The number of full blocks occpied by port. */</div><div class='ctx'> #define BRB1_REG_PORT_NUM_OCC_BLOCKS_0				 0x60094</div><div class='ctx'> /* [RW 1] Reset the design by software. */</div><div class='ctx'> #define BRB1_REG_SOFT_RESET					 0x600dc</div><div class='hunk'>@@ -1619,6 +1622,14 @@</div><div class='ctx'>    register bits. */</div><div class='ctx'> #define MISC_REG_LCPLL_CTRL_1					 0xa2a4</div><div class='ctx'> #define MISC_REG_LCPLL_CTRL_REG_2				 0xa2a8</div><div class='add'>+/* [RW 1] LCPLL power down. Global register. Active High. Reset on POR</div><div class='add'>+ * reset. */</div><div class='add'>+#define MISC_REG_LCPLL_E40_PWRDWN				 0xaa74</div><div class='add'>+/* [RW 1] LCPLL VCO reset. Global register. Active Low Reset on POR reset. */</div><div class='add'>+#define MISC_REG_LCPLL_E40_RESETB_ANA				 0xaa78</div><div class='add'>+/* [RW 1] LCPLL post-divider reset. Global register. Active Low Reset on POR</div><div class='add'>+ * reset. */</div><div class='add'>+#define MISC_REG_LCPLL_E40_RESETB_DIG				 0xaa7c</div><div class='ctx'> /* [RW 4] Interrupt mask register #0 read/write */</div><div class='ctx'> #define MISC_REG_MISC_INT_MASK					 0xa388</div><div class='ctx'> /* [RW 1] Parity mask register #0 read/write */</div><div class='hunk'>@@ -1754,6 +1765,7 @@</div><div class='ctx'>  * is compared to the value on ctrl_md_devad. Drives output</div><div class='ctx'>  * misc_xgxs0_phy_addr. Global register. */</div><div class='ctx'> #define MISC_REG_WC0_CTRL_PHY_ADDR				 0xa9cc</div><div class='add'>+#define MISC_REG_WC0_RESET					 0xac30</div><div class='ctx'> /* [RW 2] XMAC Core port mode. Indicates the number of ports on the system</div><div class='ctx'>    side. This should be less than or equal to phy_port_mode; if some of the</div><div class='ctx'>    ports are not used. This enables reduction of frequency on the core side.</div><div class='hunk'>@@ -2164,6 +2176,7 @@</div><div class='ctx'>  * set to 0x345678021. This is a new register (with 2_) added in E3 B0 to</div><div class='ctx'>  * accommodate the 9 input clients to ETS arbiter. */</div><div class='ctx'> #define NIG_REG_P0_TX_ARB_PRIORITY_CLIENT2_MSB			 0x18684</div><div class='add'>+#define NIG_REG_P1_HWPFC_ENABLE					 0x181d0</div><div class='ctx'> #define NIG_REG_P1_MAC_IN_EN					 0x185c0</div><div class='ctx'> /* [RW 1] Output enable for TX MAC interface */</div><div class='ctx'> #define NIG_REG_P1_MAC_OUT_EN					 0x185c4</div><div class='hunk'>@@ -6823,11 +6836,13 @@ Theotherbitsarereservedandshouldbezero*/</div><div class='ctx'> #define MDIO_CTL_REG_84823_MEDIA_PRIORITY_COPPER	0x0000</div><div class='ctx'> #define MDIO_CTL_REG_84823_MEDIA_PRIORITY_FIBER		0x0100</div><div class='ctx'> #define MDIO_CTL_REG_84823_MEDIA_FIBER_1G			0x1000</div><div class='del'>-#define MDIO_CTL_REG_84823_USER_CTRL_REG		0x4005</div><div class='del'>-#define MDIO_CTL_REG_84823_USER_CTRL_CMS		0x0080</div><div class='del'>-</div><div class='del'>-#define MDIO_PMA_REG_84823_CTL_LED_CTL_1		0xa8e3</div><div class='del'>-#define MDIO_PMA_REG_84823_LED3_STRETCH_EN		0x0080</div><div class='add'>+#define MDIO_CTL_REG_84823_USER_CTRL_REG			0x4005</div><div class='add'>+#define MDIO_CTL_REG_84823_USER_CTRL_CMS			0x0080</div><div class='add'>+#define MDIO_PMA_REG_84823_CTL_SLOW_CLK_CNT_HIGH		0xa82b</div><div class='add'>+#define MDIO_PMA_REG_84823_BLINK_RATE_VAL_15P9HZ	0x2f</div><div class='add'>+#define MDIO_PMA_REG_84823_CTL_LED_CTL_1			0xa8e3</div><div class='add'>+#define MDIO_PMA_REG_84833_CTL_LED_CTL_1			0xa8ec</div><div class='add'>+#define MDIO_PMA_REG_84823_LED3_STRETCH_EN			0x0080</div><div class='ctx'> </div><div class='ctx'> /* BCM84833 only */</div><div class='ctx'> #define MDIO_84833_TOP_CFG_XGPHY_STRAP1			0x401a</div><div class='hunk'>@@ -6838,26 +6853,35 @@ Theotherbitsarereservedandshouldbezero*/</div><div class='ctx'> #define MDIO_84833_TOP_CFG_SCRATCH_REG2			0x4007</div><div class='ctx'> #define MDIO_84833_TOP_CFG_SCRATCH_REG3			0x4008</div><div class='ctx'> #define MDIO_84833_TOP_CFG_SCRATCH_REG4			0x4009</div><div class='del'>-#define MDIO_84833_TOP_CFG_DATA3_REG			0x4011</div><div class='del'>-#define MDIO_84833_TOP_CFG_DATA4_REG			0x4012</div><div class='add'>+#define MDIO_84833_TOP_CFG_SCRATCH_REG26		0x4037</div><div class='add'>+#define MDIO_84833_TOP_CFG_SCRATCH_REG27		0x4038</div><div class='add'>+#define MDIO_84833_TOP_CFG_SCRATCH_REG28		0x4039</div><div class='add'>+#define MDIO_84833_TOP_CFG_SCRATCH_REG29		0x403a</div><div class='add'>+#define MDIO_84833_TOP_CFG_SCRATCH_REG30		0x403b</div><div class='add'>+#define MDIO_84833_TOP_CFG_SCRATCH_REG31		0x403c</div><div class='add'>+#define MDIO_84833_CMD_HDLR_COMMAND	MDIO_84833_TOP_CFG_SCRATCH_REG0</div><div class='add'>+#define MDIO_84833_CMD_HDLR_STATUS	MDIO_84833_TOP_CFG_SCRATCH_REG26</div><div class='add'>+#define MDIO_84833_CMD_HDLR_DATA1	MDIO_84833_TOP_CFG_SCRATCH_REG27</div><div class='add'>+#define MDIO_84833_CMD_HDLR_DATA2	MDIO_84833_TOP_CFG_SCRATCH_REG28</div><div class='add'>+#define MDIO_84833_CMD_HDLR_DATA3	MDIO_84833_TOP_CFG_SCRATCH_REG29</div><div class='add'>+#define MDIO_84833_CMD_HDLR_DATA4	MDIO_84833_TOP_CFG_SCRATCH_REG30</div><div class='add'>+#define MDIO_84833_CMD_HDLR_DATA5	MDIO_84833_TOP_CFG_SCRATCH_REG31</div><div class='ctx'> </div><div class='ctx'> /* Mailbox command set used by 84833. */</div><div class='del'>-#define PHY84833_DIAG_CMD_PAIR_SWAP_CHANGE		0x2</div><div class='add'>+#define PHY84833_CMD_SET_PAIR_SWAP			0x8001</div><div class='add'>+#define PHY84833_CMD_GET_EEE_MODE			0x8008</div><div class='add'>+#define PHY84833_CMD_SET_EEE_MODE			0x8009</div><div class='ctx'> /* Mailbox status set used by 84833. */</div><div class='del'>-#define PHY84833_CMD_RECEIVED				0x0001</div><div class='del'>-#define PHY84833_CMD_IN_PROGRESS			0x0002</div><div class='del'>-#define PHY84833_CMD_COMPLETE_PASS			0x0004</div><div class='del'>-#define PHY84833_CMD_COMPLETE_ERROR			0x0008</div><div class='del'>-#define PHY84833_CMD_OPEN_FOR_CMDS			0x0010</div><div class='del'>-#define PHY84833_CMD_SYSTEM_BOOT			0x0020</div><div class='del'>-#define PHY84833_CMD_NOT_OPEN_FOR_CMDS			0x0040</div><div class='del'>-#define PHY84833_CMD_CLEAR_COMPLETE			0x0080</div><div class='del'>-#define PHY84833_CMD_OPEN_OVERRIDE			0xa5a5</div><div class='del'>-</div><div class='add'>+#define PHY84833_STATUS_CMD_RECEIVED			0x0001</div><div class='add'>+#define PHY84833_STATUS_CMD_IN_PROGRESS			0x0002</div><div class='add'>+#define PHY84833_STATUS_CMD_COMPLETE_PASS		0x0004</div><div class='add'>+#define PHY84833_STATUS_CMD_COMPLETE_ERROR		0x0008</div><div class='add'>+#define PHY84833_STATUS_CMD_OPEN_FOR_CMDS		0x0010</div><div class='add'>+#define PHY84833_STATUS_CMD_SYSTEM_BOOT			0x0020</div><div class='add'>+#define PHY84833_STATUS_CMD_NOT_OPEN_FOR_CMDS		0x0040</div><div class='add'>+#define PHY84833_STATUS_CMD_CLEAR_COMPLETE		0x0080</div><div class='add'>+#define PHY84833_STATUS_CMD_OPEN_OVERRIDE		0xa5a5</div><div class='ctx'> </div><div class='del'>-/* 84833 F/W Feature Commands */</div><div class='del'>-#define PHY84833_DIAG_CMD_GET_EEE_MODE			0x27</div><div class='del'>-#define PHY84833_DIAG_CMD_SET_EEE_MODE			0x28</div><div class='ctx'> </div><div class='ctx'> /* Warpcore clause 45 addressing */</div><div class='ctx'> #define MDIO_WC_DEVAD					0x3</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 14517691f8db..5ac616093f9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c</a></div><div class='hunk'>@@ -30,6 +30,8 @@</div><div class='ctx'> </div><div class='ctx'> #define BNX2X_MAX_EMUL_MULTI		16</div><div class='ctx'> </div><div class='add'>+#define MAC_LEADING_ZERO_CNT (ALIGN(ETH_ALEN, sizeof(u32)) - ETH_ALEN)</div><div class='add'>+</div><div class='ctx'> /**** Exe Queue interfaces ****/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -441,6 +443,36 @@ static bool bnx2x_put_credit_vlan_mac(struct bnx2x_vlan_mac_obj *o)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnx2x_get_n_elements(struct bnx2x *bp, struct bnx2x_vlan_mac_obj *o,</div><div class='add'>+				int n, u8 *buf)</div><div class='add'>+{</div><div class='add'>+	struct bnx2x_vlan_mac_registry_elem *pos;</div><div class='add'>+	u8 *next = buf;</div><div class='add'>+	int counter = 0;</div><div class='add'>+</div><div class='add'>+	/* traverse list */</div><div class='add'>+	list_for_each_entry(pos, &amp;o-&gt;head, link) {</div><div class='add'>+		if (counter &lt; n) {</div><div class='add'>+			/* place leading zeroes in buffer */</div><div class='add'>+			memset(next, 0, MAC_LEADING_ZERO_CNT);</div><div class='add'>+</div><div class='add'>+			/* place mac after leading zeroes*/</div><div class='add'>+			memcpy(next + MAC_LEADING_ZERO_CNT, pos-&gt;u.mac.mac,</div><div class='add'>+			       ETH_ALEN);</div><div class='add'>+</div><div class='add'>+			/* calculate address of next element and</div><div class='add'>+			 * advance counter</div><div class='add'>+			 */</div><div class='add'>+			counter++;</div><div class='add'>+			next = buf + counter * ALIGN(ETH_ALEN, sizeof(u32));</div><div class='add'>+</div><div class='add'>+			DP(BNX2X_MSG_SP, "copied element number %d to address %p element was %pM\n",</div><div class='add'>+			   counter, next, pos-&gt;u.mac.mac);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return counter * ETH_ALEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* check_add() callbacks */</div><div class='ctx'> static int bnx2x_check_mac_add(struct bnx2x_vlan_mac_obj *o,</div><div class='ctx'> 			       union bnx2x_classification_ramrod_data *data)</div><div class='hunk'>@@ -1886,6 +1918,7 @@ void bnx2x_init_mac_obj(struct bnx2x *bp,</div><div class='ctx'> 		mac_obj-&gt;check_move        = bnx2x_check_move;</div><div class='ctx'> 		mac_obj-&gt;ramrod_cmd        =</div><div class='ctx'> 			RAMROD_CMD_ID_ETH_CLASSIFICATION_RULES;</div><div class='add'>+		mac_obj-&gt;get_n_elements    = bnx2x_get_n_elements;</div><div class='ctx'> </div><div class='ctx'> 		/* Exe Queue */</div><div class='ctx'> 		bnx2x_exe_queue_init(bp,</div><div class='hunk'>@@ -3342,7 +3375,7 @@ static inline int bnx2x_mcast_refresh_registry_e1(struct bnx2x *bp,</div><div class='ctx'> 		if (!list_empty(&amp;o-&gt;registry.exact_match.macs))</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		elem = kzalloc(sizeof(*elem)*len, GFP_ATOMIC);</div><div class='add'>+		elem = kcalloc(len, sizeof(*elem), GFP_ATOMIC);</div><div class='ctx'> 		if (!elem) {</div><div class='ctx'> 			BNX2X_ERR("Failed to allocate registry memory\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h<br/>index 9a517c2e9f1b..992308ff82e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h</a></div><div class='hunk'>@@ -285,6 +285,19 @@ struct bnx2x_vlan_mac_obj {</div><div class='ctx'> 	/* RAMROD command to be used */</div><div class='ctx'> 	int				ramrod_cmd;</div><div class='ctx'> </div><div class='add'>+	/* copy first n elements onto preallocated buffer</div><div class='add'>+	 *</div><div class='add'>+	 * @param n number of elements to get</div><div class='add'>+	 * @param buf buffer preallocated by caller into which elements</div><div class='add'>+	 *            will be copied. Note elements are 4-byte aligned</div><div class='add'>+	 *            so buffer size must be able to accomodate the</div><div class='add'>+	 *            aligned elements.</div><div class='add'>+	 *</div><div class='add'>+	 * @return number of copied bytes</div><div class='add'>+	 */</div><div class='add'>+	int (*get_n_elements)(struct bnx2x *bp, struct bnx2x_vlan_mac_obj *o,</div><div class='add'>+			      int n, u8 *buf);</div><div class='add'>+</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * Checks if ADD-ramrod with the given params may be performed.</div><div class='ctx'> 	 *</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c<br/>index 02ac6a771bf9..bc0121ac291e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c</a></div><div class='hunk'>@@ -39,6 +39,17 @@ static inline long bnx2x_hilo(u32 *hiref)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u16 bnx2x_get_port_stats_dma_len(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+	u16 res = sizeof(struct host_port_stats) &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	/* if PFC stats are not supported by the MFW, don't DMA them */</div><div class='add'>+	if (!(bp-&gt;flags &amp;  BC_SUPPORTS_PFC_STATS))</div><div class='add'>+		res -= (sizeof(u32)*4) &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Init service functions</div><div class='ctx'>  */</div><div class='hunk'>@@ -178,7 +189,8 @@ static void bnx2x_stats_pmf_update(struct bnx2x *bp)</div><div class='ctx'> 				   DMAE_LEN32_RD_MAX * 4);</div><div class='ctx'> 	dmae-&gt;dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, port_stats) +</div><div class='ctx'> 				   DMAE_LEN32_RD_MAX * 4);</div><div class='del'>-	dmae-&gt;len = (sizeof(struct host_port_stats) &gt;&gt; 2) - DMAE_LEN32_RD_MAX;</div><div class='add'>+	dmae-&gt;len = bnx2x_get_port_stats_dma_len(bp) - DMAE_LEN32_RD_MAX;</div><div class='add'>+</div><div class='ctx'> 	dmae-&gt;comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, stats_comp));</div><div class='ctx'> 	dmae-&gt;comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, stats_comp));</div><div class='ctx'> 	dmae-&gt;comp_val = DMAE_COMP_VAL;</div><div class='hunk'>@@ -217,7 +229,7 @@ static void bnx2x_port_stats_init(struct bnx2x *bp)</div><div class='ctx'> 		dmae-&gt;src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, port_stats));</div><div class='ctx'> 		dmae-&gt;dst_addr_lo = bp-&gt;port.port_stx &gt;&gt; 2;</div><div class='ctx'> 		dmae-&gt;dst_addr_hi = 0;</div><div class='del'>-		dmae-&gt;len = sizeof(struct host_port_stats) &gt;&gt; 2;</div><div class='add'>+		dmae-&gt;len = bnx2x_get_port_stats_dma_len(bp);</div><div class='ctx'> 		dmae-&gt;comp_addr_lo = dmae_reg_go_c[loader_idx] &gt;&gt; 2;</div><div class='ctx'> 		dmae-&gt;comp_addr_hi = 0;</div><div class='ctx'> 		dmae-&gt;comp_val = 1;</div><div class='hunk'>@@ -540,6 +552,25 @@ static void bnx2x_bmac_stats_update(struct bnx2x *bp)</div><div class='ctx'> 		UPDATE_STAT64(tx_stat_gterr,</div><div class='ctx'> 				tx_stat_dot3statsinternalmactransmiterrors);</div><div class='ctx'> 		UPDATE_STAT64(tx_stat_gtufl, tx_stat_mac_ufl);</div><div class='add'>+</div><div class='add'>+		/* collect PFC stats */</div><div class='add'>+		DIFF_64(diff.hi, new-&gt;tx_stat_gtpp_hi,</div><div class='add'>+			pstats-&gt;pfc_frames_tx_hi,</div><div class='add'>+			diff.lo, new-&gt;tx_stat_gtpp_lo,</div><div class='add'>+			pstats-&gt;pfc_frames_tx_lo);</div><div class='add'>+		pstats-&gt;pfc_frames_tx_hi = new-&gt;tx_stat_gtpp_hi;</div><div class='add'>+		pstats-&gt;pfc_frames_tx_lo = new-&gt;tx_stat_gtpp_lo;</div><div class='add'>+		ADD_64(pstats-&gt;pfc_frames_tx_hi, diff.hi,</div><div class='add'>+			pstats-&gt;pfc_frames_tx_lo, diff.lo);</div><div class='add'>+</div><div class='add'>+		DIFF_64(diff.hi, new-&gt;rx_stat_grpp_hi,</div><div class='add'>+			pstats-&gt;pfc_frames_rx_hi,</div><div class='add'>+			diff.lo, new-&gt;rx_stat_grpp_lo,</div><div class='add'>+			pstats-&gt;pfc_frames_rx_lo);</div><div class='add'>+		pstats-&gt;pfc_frames_rx_hi = new-&gt;rx_stat_grpp_hi;</div><div class='add'>+		pstats-&gt;pfc_frames_rx_lo = new-&gt;rx_stat_grpp_lo;</div><div class='add'>+		ADD_64(pstats-&gt;pfc_frames_rx_hi, diff.hi,</div><div class='add'>+			pstats-&gt;pfc_frames_rx_lo, diff.lo);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	estats-&gt;pause_frames_received_hi =</div><div class='hunk'>@@ -551,6 +582,15 @@ static void bnx2x_bmac_stats_update(struct bnx2x *bp)</div><div class='ctx'> 				pstats-&gt;mac_stx[1].tx_stat_outxoffsent_hi;</div><div class='ctx'> 	estats-&gt;pause_frames_sent_lo =</div><div class='ctx'> 				pstats-&gt;mac_stx[1].tx_stat_outxoffsent_lo;</div><div class='add'>+</div><div class='add'>+	estats-&gt;pfc_frames_received_hi =</div><div class='add'>+				pstats-&gt;pfc_frames_rx_hi;</div><div class='add'>+	estats-&gt;pfc_frames_received_lo =</div><div class='add'>+				pstats-&gt;pfc_frames_rx_lo;</div><div class='add'>+	estats-&gt;pfc_frames_sent_hi =</div><div class='add'>+				pstats-&gt;pfc_frames_tx_hi;</div><div class='add'>+	estats-&gt;pfc_frames_sent_lo =</div><div class='add'>+				pstats-&gt;pfc_frames_tx_lo;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_mstat_stats_update(struct bnx2x *bp)</div><div class='hunk'>@@ -571,6 +611,11 @@ static void bnx2x_mstat_stats_update(struct bnx2x *bp)</div><div class='ctx'> 	ADD_STAT64(stats_tx.tx_gtxpf, tx_stat_outxoffsent);</div><div class='ctx'> 	ADD_STAT64(stats_tx.tx_gtxpf, tx_stat_flowcontroldone);</div><div class='ctx'> </div><div class='add'>+	/* collect pfc stats */</div><div class='add'>+	ADD_64(pstats-&gt;pfc_frames_tx_hi, new-&gt;stats_tx.tx_gtxpp_hi,</div><div class='add'>+		pstats-&gt;pfc_frames_tx_lo, new-&gt;stats_tx.tx_gtxpp_lo);</div><div class='add'>+	ADD_64(pstats-&gt;pfc_frames_rx_hi, new-&gt;stats_rx.rx_grxpp_hi,</div><div class='add'>+		pstats-&gt;pfc_frames_rx_lo, new-&gt;stats_rx.rx_grxpp_lo);</div><div class='ctx'> </div><div class='ctx'> 	ADD_STAT64(stats_tx.tx_gt64, tx_stat_etherstatspkts64octets);</div><div class='ctx'> 	ADD_STAT64(stats_tx.tx_gt127,</div><div class='hunk'>@@ -628,6 +673,15 @@ static void bnx2x_mstat_stats_update(struct bnx2x *bp)</div><div class='ctx'> 				pstats-&gt;mac_stx[1].tx_stat_outxoffsent_hi;</div><div class='ctx'> 	estats-&gt;pause_frames_sent_lo =</div><div class='ctx'> 				pstats-&gt;mac_stx[1].tx_stat_outxoffsent_lo;</div><div class='add'>+</div><div class='add'>+	estats-&gt;pfc_frames_received_hi =</div><div class='add'>+				pstats-&gt;pfc_frames_rx_hi;</div><div class='add'>+	estats-&gt;pfc_frames_received_lo =</div><div class='add'>+				pstats-&gt;pfc_frames_rx_lo;</div><div class='add'>+	estats-&gt;pfc_frames_sent_hi =</div><div class='add'>+				pstats-&gt;pfc_frames_tx_hi;</div><div class='add'>+	estats-&gt;pfc_frames_sent_lo =</div><div class='add'>+				pstats-&gt;pfc_frames_tx_lo;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_emac_stats_update(struct bnx2x *bp)</div><div class='hunk'>@@ -740,7 +794,7 @@ static int bnx2x_hw_stats_update(struct bnx2x *bp)</div><div class='ctx'> 	estats-&gt;brb_drop_hi = pstats-&gt;brb_drop_hi;</div><div class='ctx'> 	estats-&gt;brb_drop_lo = pstats-&gt;brb_drop_lo;</div><div class='ctx'> </div><div class='del'>-	pstats-&gt;host_port_stats_start = ++pstats-&gt;host_port_stats_end;</div><div class='add'>+	pstats-&gt;host_port_stats_counter++;</div><div class='ctx'> </div><div class='ctx'> 	if (!BP_NOMCP(bp)) {</div><div class='ctx'> 		u32 nig_timer_max =</div><div class='hunk'>@@ -1265,7 +1319,7 @@ static void bnx2x_port_stats_stop(struct bnx2x *bp)</div><div class='ctx'> 		dmae-&gt;src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, port_stats));</div><div class='ctx'> 		dmae-&gt;dst_addr_lo = bp-&gt;port.port_stx &gt;&gt; 2;</div><div class='ctx'> 		dmae-&gt;dst_addr_hi = 0;</div><div class='del'>-		dmae-&gt;len = sizeof(struct host_port_stats) &gt;&gt; 2;</div><div class='add'>+		dmae-&gt;len = bnx2x_get_port_stats_dma_len(bp);</div><div class='ctx'> 		if (bp-&gt;func_stx) {</div><div class='ctx'> 			dmae-&gt;comp_addr_lo = dmae_reg_go_c[loader_idx] &gt;&gt; 2;</div><div class='ctx'> 			dmae-&gt;comp_addr_hi = 0;</div><div class='hunk'>@@ -1349,12 +1403,14 @@ void bnx2x_stats_handle(struct bnx2x *bp, enum bnx2x_stats_event event)</div><div class='ctx'> 	enum bnx2x_stats_state state;</div><div class='ctx'> 	if (unlikely(bp-&gt;panic))</div><div class='ctx'> 		return;</div><div class='del'>-	bnx2x_stats_stm[bp-&gt;stats_state][event].action(bp);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;bp-&gt;stats_lock);</div><div class='ctx'> 	state = bp-&gt;stats_state;</div><div class='ctx'> 	bp-&gt;stats_state = bnx2x_stats_stm[state][event].next_state;</div><div class='ctx'> 	spin_unlock_bh(&amp;bp-&gt;stats_lock);</div><div class='ctx'> </div><div class='add'>+	bnx2x_stats_stm[state][event].action(bp);</div><div class='add'>+</div><div class='ctx'> 	if ((event != STATS_EVENT_UPDATE) || netif_msg_timer(bp))</div><div class='ctx'> 		DP(BNX2X_MSG_STATS, "state %d -&gt; event %d -&gt; state %d\n",</div><div class='ctx'> 		   state, event, bp-&gt;stats_state);</div><div class='hunk'>@@ -1380,7 +1436,7 @@ static void bnx2x_port_stats_base_init(struct bnx2x *bp)</div><div class='ctx'> 	dmae-&gt;src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, port_stats));</div><div class='ctx'> 	dmae-&gt;dst_addr_lo = bp-&gt;port.port_stx &gt;&gt; 2;</div><div class='ctx'> 	dmae-&gt;dst_addr_hi = 0;</div><div class='del'>-	dmae-&gt;len = sizeof(struct host_port_stats) &gt;&gt; 2;</div><div class='add'>+	dmae-&gt;len = bnx2x_get_port_stats_dma_len(bp);</div><div class='ctx'> 	dmae-&gt;comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, stats_comp));</div><div class='ctx'> 	dmae-&gt;comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, stats_comp));</div><div class='ctx'> 	dmae-&gt;comp_val = DMAE_COMP_VAL;</div><div class='hunk'>@@ -1457,6 +1513,7 @@ static void bnx2x_func_stats_base_update(struct bnx2x *bp)</div><div class='ctx'> static inline void bnx2x_prep_fw_stats_req(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='add'>+	int first_queue_query_index;</div><div class='ctx'> 	struct stats_query_header *stats_hdr = &amp;bp-&gt;fw_stats_req-&gt;hdr;</div><div class='ctx'> </div><div class='ctx'> 	dma_addr_t cur_data_offset;</div><div class='hunk'>@@ -1512,14 +1569,40 @@ static inline void bnx2x_prep_fw_stats_req(struct bnx2x *bp)</div><div class='ctx'> 	cur_query_entry-&gt;address.hi = cpu_to_le32(U64_HI(cur_data_offset));</div><div class='ctx'> 	cur_query_entry-&gt;address.lo = cpu_to_le32(U64_LO(cur_data_offset));</div><div class='ctx'> </div><div class='add'>+	/**** FCoE FW statistics data ****/</div><div class='add'>+	if (!NO_FCOE(bp)) {</div><div class='add'>+		cur_data_offset = bp-&gt;fw_stats_data_mapping +</div><div class='add'>+			offsetof(struct bnx2x_fw_stats_data, fcoe);</div><div class='add'>+</div><div class='add'>+		cur_query_entry =</div><div class='add'>+			&amp;bp-&gt;fw_stats_req-&gt;query[BNX2X_FCOE_QUERY_IDX];</div><div class='add'>+</div><div class='add'>+		cur_query_entry-&gt;kind = STATS_TYPE_FCOE;</div><div class='add'>+		/* For FCoE query index is a DONT CARE */</div><div class='add'>+		cur_query_entry-&gt;index = BP_PORT(bp);</div><div class='add'>+		cur_query_entry-&gt;funcID = cpu_to_le16(BP_FUNC(bp));</div><div class='add'>+		cur_query_entry-&gt;address.hi =</div><div class='add'>+			cpu_to_le32(U64_HI(cur_data_offset));</div><div class='add'>+		cur_query_entry-&gt;address.lo =</div><div class='add'>+			cpu_to_le32(U64_LO(cur_data_offset));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/**** Clients' queries ****/</div><div class='ctx'> 	cur_data_offset = bp-&gt;fw_stats_data_mapping +</div><div class='ctx'> 		offsetof(struct bnx2x_fw_stats_data, queue_stats);</div><div class='ctx'> </div><div class='add'>+	/* first queue query index depends whether FCoE offloaded request will</div><div class='add'>+	 * be included in the ramrod</div><div class='add'>+	 */</div><div class='add'>+	if (!NO_FCOE(bp))</div><div class='add'>+		first_queue_query_index = BNX2X_FIRST_QUEUE_QUERY_IDX;</div><div class='add'>+	else</div><div class='add'>+		first_queue_query_index = BNX2X_FIRST_QUEUE_QUERY_IDX - 1;</div><div class='add'>+</div><div class='ctx'> 	for_each_eth_queue(bp, i) {</div><div class='ctx'> 		cur_query_entry =</div><div class='ctx'> 			&amp;bp-&gt;fw_stats_req-&gt;</div><div class='del'>-					query[BNX2X_FIRST_QUEUE_QUERY_IDX + i];</div><div class='add'>+					query[first_queue_query_index + i];</div><div class='ctx'> </div><div class='ctx'> 		cur_query_entry-&gt;kind = STATS_TYPE_QUEUE;</div><div class='ctx'> 		cur_query_entry-&gt;index = bnx2x_stats_id(&amp;bp-&gt;fp[i]);</div><div class='hunk'>@@ -1531,6 +1614,21 @@ static inline void bnx2x_prep_fw_stats_req(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> 		cur_data_offset += sizeof(struct per_queue_stats);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* add FCoE queue query if needed */</div><div class='add'>+	if (!NO_FCOE(bp)) {</div><div class='add'>+		cur_query_entry =</div><div class='add'>+			&amp;bp-&gt;fw_stats_req-&gt;</div><div class='add'>+					query[first_queue_query_index + i];</div><div class='add'>+</div><div class='add'>+		cur_query_entry-&gt;kind = STATS_TYPE_QUEUE;</div><div class='add'>+		cur_query_entry-&gt;index = bnx2x_stats_id(&amp;bp-&gt;fp[FCOE_IDX]);</div><div class='add'>+		cur_query_entry-&gt;funcID = cpu_to_le16(BP_FUNC(bp));</div><div class='add'>+		cur_query_entry-&gt;address.hi =</div><div class='add'>+			cpu_to_le32(U64_HI(cur_data_offset));</div><div class='add'>+		cur_query_entry-&gt;address.lo =</div><div class='add'>+			cpu_to_le32(U64_LO(cur_data_offset));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bnx2x_stats_init(struct bnx2x *bp)</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h<br/>index 5d8ce2f6afef..683deb053109 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h</a></div><div class='hunk'>@@ -193,6 +193,12 @@ struct bnx2x_eth_stats {</div><div class='ctx'> 	u32 total_tpa_aggregated_frames_lo;</div><div class='ctx'> 	u32 total_tpa_bytes_hi;</div><div class='ctx'> 	u32 total_tpa_bytes_lo;</div><div class='add'>+</div><div class='add'>+	/* PFC */</div><div class='add'>+	u32 pfc_frames_received_hi;</div><div class='add'>+	u32 pfc_frames_received_lo;</div><div class='add'>+	u32 pfc_frames_sent_hi;</div><div class='add'>+	u32 pfc_frames_sent_lo;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c<br/>index 6f10c6939834..dd3a0a232ea0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/cnic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/cnic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/cnic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/cnic.c</a></div><div class='hunk'>@@ -250,6 +250,21 @@ static u32 cnic_reg_rd_ind(struct cnic_dev *dev, u32 off)</div><div class='ctx'> 	return io-&gt;data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void cnic_ulp_ctl(struct cnic_dev *dev, int ulp_type, bool reg)</div><div class='add'>+{</div><div class='add'>+	struct cnic_local *cp = dev-&gt;cnic_priv;</div><div class='add'>+	struct cnic_eth_dev *ethdev = cp-&gt;ethdev;</div><div class='add'>+	struct drv_ctl_info info;</div><div class='add'>+</div><div class='add'>+	if (reg)</div><div class='add'>+		info.cmd = DRV_CTL_ULP_REGISTER_CMD;</div><div class='add'>+	else</div><div class='add'>+		info.cmd = DRV_CTL_ULP_UNREGISTER_CMD;</div><div class='add'>+</div><div class='add'>+	info.data.ulp_type = ulp_type;</div><div class='add'>+	ethdev-&gt;drv_ctl(dev-&gt;netdev, &amp;info);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cnic_in_use(struct cnic_sock *csk)</div><div class='ctx'> {</div><div class='ctx'> 	return test_bit(SK_F_INUSE, &amp;csk-&gt;flags);</div><div class='hunk'>@@ -506,7 +521,7 @@ int cnic_unregister_driver(int ulp_type)</div><div class='ctx'> 	}</div><div class='ctx'> 	read_unlock(&amp;cnic_dev_lock);</div><div class='ctx'> </div><div class='del'>-	rcu_assign_pointer(cnic_ulp_tbl[ulp_type], NULL);</div><div class='add'>+	RCU_INIT_POINTER(cnic_ulp_tbl[ulp_type], NULL);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;cnic_lock);</div><div class='ctx'> 	synchronize_rcu();</div><div class='hunk'>@@ -563,6 +578,8 @@ static int cnic_register_device(struct cnic_dev *dev, int ulp_type,</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;cnic_lock);</div><div class='ctx'> </div><div class='add'>+	cnic_ulp_ctl(dev, ulp_type, true);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -579,7 +596,7 @@ static int cnic_unregister_device(struct cnic_dev *dev, int ulp_type)</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_lock(&amp;cnic_lock);</div><div class='ctx'> 	if (rcu_dereference(cp-&gt;ulp_ops[ulp_type])) {</div><div class='del'>-		rcu_assign_pointer(cp-&gt;ulp_ops[ulp_type], NULL);</div><div class='add'>+		RCU_INIT_POINTER(cp-&gt;ulp_ops[ulp_type], NULL);</div><div class='ctx'> 		cnic_put(dev);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pr_err("%s: device not registered to this ulp type %d\n",</div><div class='hunk'>@@ -602,6 +619,8 @@ static int cnic_unregister_device(struct cnic_dev *dev, int ulp_type)</div><div class='ctx'> 	if (test_bit(ULP_F_CALL_PENDING, &amp;cp-&gt;ulp_flags[ulp_type]))</div><div class='ctx'> 		netdev_warn(dev-&gt;netdev, "Failed waiting for ULP up call to complete\n");</div><div class='ctx'> </div><div class='add'>+	cnic_ulp_ctl(dev, ulp_type, false);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(cnic_unregister_driver);</div><div class='hunk'>@@ -1342,7 +1361,7 @@ static int cnic_submit_kwqe_16(struct cnic_dev *dev, u32 cmd, u32 cid,</div><div class='ctx'> 	if (ret == 1)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return -EBUSY;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cnic_reply_bnx2x_kcqes(struct cnic_dev *dev, int ulp_type,</div><div class='hunk'>@@ -1830,7 +1849,7 @@ static int cnic_bnx2x_iscsi_ofld1(struct cnic_dev *dev, struct kwqe *wqes[],</div><div class='ctx'> done:</div><div class='ctx'> 	cqes[0] = (struct kcqe *) &amp;kcqe;</div><div class='ctx'> 	cnic_reply_bnx2x_kcqes(dev, CNIC_ULP_ISCSI, cqes, 1);</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='hunk'>@@ -1928,7 +1947,7 @@ destroy_reply:</div><div class='ctx'> 	cqes[0] = (struct kcqe *) &amp;kcqe;</div><div class='ctx'> 	cnic_reply_bnx2x_kcqes(dev, CNIC_ULP_ISCSI, cqes, 1);</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 void cnic_init_storm_conn_bufs(struct cnic_dev *dev,</div><div class='hunk'>@@ -2494,6 +2513,57 @@ static int cnic_bnx2x_fcoe_fw_destroy(struct cnic_dev *dev, struct kwqe *kwqe)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void cnic_bnx2x_kwqe_err(struct cnic_dev *dev, struct kwqe *kwqe)</div><div class='add'>+{</div><div class='add'>+	struct cnic_local *cp = dev-&gt;cnic_priv;</div><div class='add'>+	struct kcqe kcqe;</div><div class='add'>+	struct kcqe *cqes[1];</div><div class='add'>+	u32 cid;</div><div class='add'>+	u32 opcode = KWQE_OPCODE(kwqe-&gt;kwqe_op_flag);</div><div class='add'>+	u32 layer_code = kwqe-&gt;kwqe_op_flag &amp; KWQE_LAYER_MASK;</div><div class='add'>+	int ulp_type;</div><div class='add'>+</div><div class='add'>+	cid = kwqe-&gt;kwqe_info0;</div><div class='add'>+	memset(&amp;kcqe, 0, sizeof(kcqe));</div><div class='add'>+</div><div class='add'>+	if (layer_code == KWQE_FLAGS_LAYER_MASK_L5_ISCSI) {</div><div class='add'>+		ulp_type = CNIC_ULP_ISCSI;</div><div class='add'>+		if (opcode == ISCSI_KWQE_OPCODE_UPDATE_CONN)</div><div class='add'>+			cid = kwqe-&gt;kwqe_info1;</div><div class='add'>+</div><div class='add'>+		kcqe.kcqe_op_flag = (opcode + 0x10) &lt;&lt; KCQE_FLAGS_OPCODE_SHIFT;</div><div class='add'>+		kcqe.kcqe_op_flag |= KCQE_FLAGS_LAYER_MASK_L5_ISCSI;</div><div class='add'>+		kcqe.kcqe_info1 = ISCSI_KCQE_COMPLETION_STATUS_NIC_ERROR;</div><div class='add'>+		kcqe.kcqe_info2 = cid;</div><div class='add'>+		cnic_get_l5_cid(cp, BNX2X_SW_CID(cid), &amp;kcqe.kcqe_info0);</div><div class='add'>+</div><div class='add'>+	} else if (layer_code == KWQE_FLAGS_LAYER_MASK_L4) {</div><div class='add'>+		struct l4_kcq *l4kcqe = (struct l4_kcq *) &amp;kcqe;</div><div class='add'>+		u32 kcqe_op;</div><div class='add'>+</div><div class='add'>+		ulp_type = CNIC_ULP_L4;</div><div class='add'>+		if (opcode == L4_KWQE_OPCODE_VALUE_CONNECT1)</div><div class='add'>+			kcqe_op = L4_KCQE_OPCODE_VALUE_CONNECT_COMPLETE;</div><div class='add'>+		else if (opcode == L4_KWQE_OPCODE_VALUE_RESET)</div><div class='add'>+			kcqe_op = L4_KCQE_OPCODE_VALUE_RESET_COMP;</div><div class='add'>+		else if (opcode == L4_KWQE_OPCODE_VALUE_CLOSE)</div><div class='add'>+			kcqe_op = L4_KCQE_OPCODE_VALUE_CLOSE_COMP;</div><div class='add'>+		else</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		kcqe.kcqe_op_flag = (kcqe_op &lt;&lt; KCQE_FLAGS_OPCODE_SHIFT) |</div><div class='add'>+				    KCQE_FLAGS_LAYER_MASK_L4;</div><div class='add'>+		l4kcqe-&gt;status = L4_KCQE_COMPLETION_STATUS_NIC_ERROR;</div><div class='add'>+		l4kcqe-&gt;cid = cid;</div><div class='add'>+		cnic_get_l5_cid(cp, BNX2X_SW_CID(cid), &amp;l4kcqe-&gt;conn_id);</div><div class='add'>+	} else {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cqes[0] = (struct kcqe *) &amp;kcqe;</div><div class='add'>+	cnic_reply_bnx2x_kcqes(dev, ulp_type, cqes, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cnic_submit_bnx2x_iscsi_kwqes(struct cnic_dev *dev,</div><div class='ctx'> 					 struct kwqe *wqes[], u32 num_wqes)</div><div class='ctx'> {</div><div class='hunk'>@@ -2551,9 +2621,17 @@ static int cnic_submit_bnx2x_iscsi_kwqes(struct cnic_dev *dev,</div><div class='ctx'> 				   opcode);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (ret &lt; 0)</div><div class='add'>+		if (ret &lt; 0) {</div><div class='ctx'> 			netdev_err(dev-&gt;netdev, "KWQE(0x%x) failed\n",</div><div class='ctx'> 				   opcode);</div><div class='add'>+</div><div class='add'>+			/* Possibly bnx2x parity error, send completion</div><div class='add'>+			 * to ulp drivers with error code to speed up</div><div class='add'>+			 * cleanup and reset recovery.</div><div class='add'>+			 */</div><div class='add'>+			if (ret == -EIO || ret == -EAGAIN)</div><div class='add'>+				cnic_bnx2x_kwqe_err(dev, kwqe);</div><div class='add'>+		}</div><div class='ctx'> 		i += work;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3052,9 +3130,26 @@ static void cnic_ulp_start(struct cnic_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cnic_copy_ulp_stats(struct cnic_dev *dev, int ulp_type)</div><div class='add'>+{</div><div class='add'>+	struct cnic_local *cp = dev-&gt;cnic_priv;</div><div class='add'>+	struct cnic_ulp_ops *ulp_ops;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;cnic_lock);</div><div class='add'>+	ulp_ops = cnic_ulp_tbl_prot(ulp_type);</div><div class='add'>+	if (ulp_ops &amp;&amp; ulp_ops-&gt;cnic_get_stats)</div><div class='add'>+		rc = ulp_ops-&gt;cnic_get_stats(cp-&gt;ulp_handle[ulp_type]);</div><div class='add'>+	else</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+	mutex_unlock(&amp;cnic_lock);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cnic_ctl(void *data, struct cnic_ctl_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct cnic_dev *dev = data;</div><div class='add'>+	int ulp_type = CNIC_ULP_ISCSI;</div><div class='ctx'> </div><div class='ctx'> 	switch (info-&gt;cmd) {</div><div class='ctx'> 	case CNIC_CTL_STOP_CMD:</div><div class='hunk'>@@ -3100,6 +3195,15 @@ static int cnic_ctl(void *data, struct cnic_ctl_info *info)</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	case CNIC_CTL_FCOE_STATS_GET_CMD:</div><div class='add'>+		ulp_type = CNIC_ULP_FCOE;</div><div class='add'>+		/* fall through */</div><div class='add'>+	case CNIC_CTL_ISCSI_STATS_GET_CMD:</div><div class='add'>+		cnic_hold(dev);</div><div class='add'>+		cnic_copy_ulp_stats(dev, ulp_type);</div><div class='add'>+		cnic_put(dev);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3475,7 +3579,7 @@ static int cnic_get_v6_route(struct sockaddr_in6 *dst_addr,</div><div class='ctx'> 	struct flowi6 fl6;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;fl6, 0, sizeof(fl6));</div><div class='del'>-	ipv6_addr_copy(&amp;fl6.daddr, &amp;dst_addr-&gt;sin6_addr);</div><div class='add'>+	fl6.daddr = dst_addr-&gt;sin6_addr;</div><div class='ctx'> 	if (ipv6_addr_type(&amp;fl6.daddr) &amp; IPV6_ADDR_LINKLOCAL)</div><div class='ctx'> 		fl6.flowi6_oif = dst_addr-&gt;sin6_scope_id;</div><div class='ctx'> </div><div class='hunk'>@@ -3804,6 +3908,9 @@ static void cnic_cm_process_kcqe(struct cnic_dev *dev, struct kcqe *kcqe)</div><div class='ctx'> 	case L4_KCQE_OPCODE_VALUE_RESET_COMP:</div><div class='ctx'> 	case L5CM_RAMROD_CMD_ID_SEARCHER_DELETE:</div><div class='ctx'> 	case L5CM_RAMROD_CMD_ID_TERMINATE_OFFLOAD:</div><div class='add'>+		if (l4kcqe-&gt;status == L4_KCQE_COMPLETION_STATUS_NIC_ERROR)</div><div class='add'>+			set_bit(SK_F_HW_ERR, &amp;csk-&gt;flags);</div><div class='add'>+</div><div class='ctx'> 		cp-&gt;close_conn(csk, opcode);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -3931,7 +4038,9 @@ static void cnic_close_bnx2x_conn(struct cnic_sock *csk, u32 opcode)</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='ctx'> 		if (cnic_ready_to_close(csk, opcode)) {</div><div class='del'>-			if (test_bit(SK_F_PG_OFFLD_COMPLETE, &amp;csk-&gt;flags))</div><div class='add'>+			if (test_bit(SK_F_HW_ERR, &amp;csk-&gt;flags))</div><div class='add'>+				close_complete = 1;</div><div class='add'>+			else if (test_bit(SK_F_PG_OFFLD_COMPLETE, &amp;csk-&gt;flags))</div><div class='ctx'> 				cmd = L5CM_RAMROD_CMD_ID_SEARCHER_DELETE;</div><div class='ctx'> 			else</div><div class='ctx'> 				close_complete = 1;</div><div class='hunk'>@@ -4824,6 +4933,7 @@ static int cnic_start_bnx2x_hw(struct cnic_dev *dev)</div><div class='ctx'> 	int func = CNIC_FUNC(cp), ret;</div><div class='ctx'> 	u32 pfid;</div><div class='ctx'> </div><div class='add'>+	dev-&gt;stats_addr = ethdev-&gt;addr_drv_info_to_mcp;</div><div class='ctx'> 	cp-&gt;port_mode = CHIP_PORT_MODE_NONE;</div><div class='ctx'> </div><div class='ctx'> 	if (BNX2X_CHIP_IS_E2_PLUS(cp-&gt;chip_id)) {</div><div class='hunk'>@@ -5134,7 +5244,7 @@ static void cnic_stop_hw(struct cnic_dev *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 		cnic_shutdown_rings(dev);</div><div class='ctx'> 		clear_bit(CNIC_F_CNIC_UP, &amp;dev-&gt;flags);</div><div class='del'>-		rcu_assign_pointer(cp-&gt;ulp_ops[CNIC_ULP_L4], NULL);</div><div class='add'>+		RCU_INIT_POINTER(cp-&gt;ulp_ops[CNIC_ULP_L4], NULL);</div><div class='ctx'> 		synchronize_rcu();</div><div class='ctx'> 		cnic_cm_shutdown(dev);</div><div class='ctx'> 		cp-&gt;stop_hw(dev);</div><div class='hunk'>@@ -5288,6 +5398,8 @@ static struct cnic_dev *init_bnx2x_cnic(struct net_device *dev)</div><div class='ctx'> 	cdev-&gt;pcidev = pdev;</div><div class='ctx'> 	cp-&gt;chip_id = ethdev-&gt;chip_id;</div><div class='ctx'> </div><div class='add'>+	cdev-&gt;stats_addr = ethdev-&gt;addr_drv_info_to_mcp;</div><div class='add'>+</div><div class='ctx'> 	if (!(ethdev-&gt;drv_state &amp; CNIC_DRV_STATE_NO_ISCSI))</div><div class='ctx'> 		cdev-&gt;max_iscsi_conn = ethdev-&gt;max_iscsi_conn;</div><div class='ctx'> 	if (BNX2X_CHIP_IS_E2_PLUS(cp-&gt;chip_id) &amp;&amp;</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/cnic_defs.h b/drivers/net/ethernet/broadcom/cnic_defs.h<br/>index 239de898f071..86936f6b6dbc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/cnic_defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/cnic_defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/cnic_defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/cnic_defs.h</a></div><div class='hunk'>@@ -85,6 +85,7 @@</div><div class='ctx'> </div><div class='ctx'> /* KCQ (kernel completion queue) completion status */</div><div class='ctx'> #define L4_KCQE_COMPLETION_STATUS_SUCCESS           (0)</div><div class='add'>+#define L4_KCQE_COMPLETION_STATUS_NIC_ERROR         (4)</div><div class='ctx'> #define L4_KCQE_COMPLETION_STATUS_TIMEOUT           (0x93)</div><div class='ctx'> </div><div class='ctx'> #define L4_KCQE_COMPLETION_STATUS_CTX_ALLOC_FAIL    (0x83)</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h<br/>index 79443e0dbf96..1517763d4e55 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/cnic_if.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/cnic_if.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/cnic_if.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/cnic_if.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* cnic_if.h: Broadcom CNIC core network driver.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2006-2011 Broadcom Corporation</div><div class='add'>+ * Copyright (c) 2006-2012 Broadcom 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 the GNU General Public License as published by</div><div class='hunk'>@@ -12,8 +12,8 @@</div><div class='ctx'> #ifndef CNIC_IF_H</div><div class='ctx'> #define CNIC_IF_H</div><div class='ctx'> </div><div class='del'>-#define CNIC_MODULE_VERSION	"2.5.7"</div><div class='del'>-#define CNIC_MODULE_RELDATE	"July 20, 2011"</div><div class='add'>+#define CNIC_MODULE_VERSION	"2.5.8"</div><div class='add'>+#define CNIC_MODULE_RELDATE	"Jan 3, 2012"</div><div class='ctx'> </div><div class='ctx'> #define CNIC_ULP_RDMA		0</div><div class='ctx'> #define CNIC_ULP_ISCSI		1</div><div class='hunk'>@@ -86,6 +86,8 @@ struct kcqe {</div><div class='ctx'> #define CNIC_CTL_START_CMD		2</div><div class='ctx'> #define CNIC_CTL_COMPLETION_CMD		3</div><div class='ctx'> #define CNIC_CTL_STOP_ISCSI_CMD		4</div><div class='add'>+#define CNIC_CTL_FCOE_STATS_GET_CMD	5</div><div class='add'>+#define CNIC_CTL_ISCSI_STATS_GET_CMD	6</div><div class='ctx'> </div><div class='ctx'> #define DRV_CTL_IO_WR_CMD		0x101</div><div class='ctx'> #define DRV_CTL_IO_RD_CMD		0x102</div><div class='hunk'>@@ -96,6 +98,8 @@ struct kcqe {</div><div class='ctx'> #define DRV_CTL_STOP_L2_CMD		0x107</div><div class='ctx'> #define DRV_CTL_RET_L2_SPQ_CREDIT_CMD	0x10c</div><div class='ctx'> #define DRV_CTL_ISCSI_STOPPED_CMD	0x10d</div><div class='add'>+#define DRV_CTL_ULP_REGISTER_CMD	0x10e</div><div class='add'>+#define DRV_CTL_ULP_UNREGISTER_CMD	0x10f</div><div class='ctx'> </div><div class='ctx'> struct cnic_ctl_completion {</div><div class='ctx'> 	u32	cid;</div><div class='hunk'>@@ -133,6 +137,7 @@ struct drv_ctl_info {</div><div class='ctx'> 		struct drv_ctl_spq_credit credit;</div><div class='ctx'> 		struct drv_ctl_io io;</div><div class='ctx'> 		struct drv_ctl_l2_ring ring;</div><div class='add'>+		int ulp_type;</div><div class='ctx'> 		char bytes[MAX_DRV_CTL_DATA];</div><div class='ctx'> 	} data;</div><div class='ctx'> };</div><div class='hunk'>@@ -201,6 +206,7 @@ struct cnic_eth_dev {</div><div class='ctx'> 					       struct kwqe_16 *[], u32);</div><div class='ctx'> 	int		(*drv_ctl)(struct net_device *, struct drv_ctl_info *);</div><div class='ctx'> 	unsigned long	reserved1[2];</div><div class='add'>+	union drv_info_to_mcp	*addr_drv_info_to_mcp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cnic_sockaddr {</div><div class='hunk'>@@ -255,6 +261,7 @@ struct cnic_sock {</div><div class='ctx'> #define SK_F_CONNECT_START	4</div><div class='ctx'> #define SK_F_IPV6		5</div><div class='ctx'> #define SK_F_CLOSING		7</div><div class='add'>+#define SK_F_HW_ERR		8</div><div class='ctx'> </div><div class='ctx'> 	atomic_t ref_count;</div><div class='ctx'> 	u32 state;</div><div class='hunk'>@@ -297,6 +304,8 @@ struct cnic_dev {</div><div class='ctx'> 	int		max_fcoe_conn;</div><div class='ctx'> 	int		max_rdma_conn;</div><div class='ctx'> </div><div class='add'>+	union drv_info_to_mcp	*stats_addr;</div><div class='add'>+</div><div class='ctx'> 	void		*cnic_priv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -326,6 +335,7 @@ struct cnic_ulp_ops {</div><div class='ctx'> 	void (*cm_remote_abort)(struct cnic_sock *);</div><div class='ctx'> 	int (*iscsi_nl_send_msg)(void *ulp_ctx, u32 msg_type,</div><div class='ctx'> 				  char *data, u16 data_size);</div><div class='add'>+	int (*cnic_get_stats)(void *ulp_ctx);</div><div class='ctx'> 	struct module *owner;</div><div class='ctx'> 	atomic_t ref_count;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c<br/>index 0a1d7f279fc8..084904ceaa30 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/sb1250-mac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/sb1250-mac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/sb1250-mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/sb1250-mac.c</a></div><div class='hunk'>@@ -163,7 +163,6 @@ enum sbmac_state {</div><div class='ctx'> #define SBMAC_MAX_TXDESCR	256</div><div class='ctx'> #define SBMAC_MAX_RXDESCR	256</div><div class='ctx'> </div><div class='del'>-#define ETHER_ADDR_LEN		6</div><div class='ctx'> #define ENET_PACKET_SIZE	1518</div><div class='ctx'> /*#define ENET_PACKET_SIZE	9216 */</div><div class='ctx'> </div><div class='hunk'>@@ -266,7 +265,7 @@ struct sbmac_softc {</div><div class='ctx'> 	int			sbm_pause;	/* current pause setting */</div><div class='ctx'> 	int			sbm_link;	/* current link state */</div><div class='ctx'> </div><div class='del'>-	unsigned char		sbm_hwaddr[ETHER_ADDR_LEN];</div><div class='add'>+	unsigned char		sbm_hwaddr[ETH_ALEN];</div><div class='ctx'> </div><div class='ctx'> 	struct sbmacdma		sbm_txdma;	/* only channel 0 for now */</div><div class='ctx'> 	struct sbmacdma		sbm_rxdma;</div><div class='hunk'>@@ -2260,7 +2259,8 @@ static int sbmac_init(struct platform_device *pldev, long long base)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sc-&gt;mii_bus-&gt;name = sbmac_mdio_string;</div><div class='del'>-	snprintf(sc-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%x", idx);</div><div class='add'>+	snprintf(sc-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%s-%x",</div><div class='add'>+		pldev-&gt;name, idx);</div><div class='ctx'> 	sc-&gt;mii_bus-&gt;priv = sc;</div><div class='ctx'> 	sc-&gt;mii_bus-&gt;read = sbmac_mii_read;</div><div class='ctx'> 	sc-&gt;mii_bus-&gt;write = sbmac_mii_write;</div><div class='hunk'>@@ -2676,15 +2676,4 @@ static struct platform_driver sbmac_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sbmac_init_module(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sbmac_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sbmac_cleanup_module(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sbmac_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sbmac_init_module);</div><div class='del'>-module_exit(sbmac_cleanup_module);</div><div class='add'>+module_platform_driver(sbmac_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c<br/>index bf4074167d6a..d529af99157d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/tg3.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/tg3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/tg3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/tg3.c</a></div><div class='hunk'>@@ -89,10 +89,10 @@ static inline void _tg3_flag_clear(enum TG3_FLAGS flag, unsigned long *bits)</div><div class='ctx'> </div><div class='ctx'> #define DRV_MODULE_NAME		"tg3"</div><div class='ctx'> #define TG3_MAJ_NUM			3</div><div class='del'>-#define TG3_MIN_NUM			121</div><div class='add'>+#define TG3_MIN_NUM			122</div><div class='ctx'> #define DRV_MODULE_VERSION	\</div><div class='ctx'> 	__stringify(TG3_MAJ_NUM) "." __stringify(TG3_MIN_NUM)</div><div class='del'>-#define DRV_MODULE_RELDATE	"November 2, 2011"</div><div class='add'>+#define DRV_MODULE_RELDATE	"December 7, 2011"</div><div class='ctx'> </div><div class='ctx'> #define RESET_KIND_SHUTDOWN	0</div><div class='ctx'> #define RESET_KIND_INIT		1</div><div class='hunk'>@@ -135,7 +135,6 @@ static inline void _tg3_flag_clear(enum TG3_FLAGS flag, unsigned long *bits)</div><div class='ctx'> 	(tg3_flag(tp, LRG_PROD_RING_CAP) ? \</div><div class='ctx'> 	 TG3_RX_JMB_MAX_SIZE_5717 : TG3_RX_JMB_MAX_SIZE_5700)</div><div class='ctx'> #define TG3_DEF_RX_JUMBO_RING_PENDING	100</div><div class='del'>-#define TG3_RSS_INDIR_TBL_SIZE		128</div><div class='ctx'> </div><div class='ctx'> /* Do not place this n-ring entries value into the tp struct itself,</div><div class='ctx'>  * we really want to expose these constants to GCC so that modulo et</div><div class='hunk'>@@ -194,12 +193,13 @@ static inline void _tg3_flag_clear(enum TG3_FLAGS flag, unsigned long *bits)</div><div class='ctx'> #if (NET_IP_ALIGN != 0)</div><div class='ctx'> #define TG3_RX_OFFSET(tp)	((tp)-&gt;rx_offset)</div><div class='ctx'> #else</div><div class='del'>-#define TG3_RX_OFFSET(tp)	0</div><div class='add'>+#define TG3_RX_OFFSET(tp)	(NET_SKB_PAD)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* minimum number of free TX descriptors required to wake up TX process */</div><div class='ctx'> #define TG3_TX_WAKEUP_THRESH(tnapi)		((tnapi)-&gt;tx_pending / 4)</div><div class='del'>-#define TG3_TX_BD_DMA_MAX		4096</div><div class='add'>+#define TG3_TX_BD_DMA_MAX_2K		2048</div><div class='add'>+#define TG3_TX_BD_DMA_MAX_4K		4096</div><div class='ctx'> </div><div class='ctx'> #define TG3_RAW_IP_ALIGN 2</div><div class='ctx'> </div><div class='hunk'>@@ -1670,22 +1670,6 @@ static void tg3_link_report(struct tg3 *tp)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u16 tg3_advert_flowctrl_1000T(u8 flow_ctrl)</div><div class='del'>-{</div><div class='del'>-	u16 miireg;</div><div class='del'>-</div><div class='del'>-	if ((flow_ctrl &amp; FLOW_CTRL_TX) &amp;&amp; (flow_ctrl &amp; FLOW_CTRL_RX))</div><div class='del'>-		miireg = ADVERTISE_PAUSE_CAP;</div><div class='del'>-	else if (flow_ctrl &amp; FLOW_CTRL_TX)</div><div class='del'>-		miireg = ADVERTISE_PAUSE_ASYM;</div><div class='del'>-	else if (flow_ctrl &amp; FLOW_CTRL_RX)</div><div class='del'>-		miireg = ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;</div><div class='del'>-	else</div><div class='del'>-		miireg = 0;</div><div class='del'>-</div><div class='del'>-	return miireg;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static u16 tg3_advert_flowctrl_1000X(u8 flow_ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	u16 miireg;</div><div class='hunk'>@@ -1706,18 +1690,12 @@ static u8 tg3_resolve_flowctrl_1000X(u16 lcladv, u16 rmtadv)</div><div class='ctx'> {</div><div class='ctx'> 	u8 cap = 0;</div><div class='ctx'> </div><div class='del'>-	if (lcladv &amp; ADVERTISE_1000XPAUSE) {</div><div class='del'>-		if (lcladv &amp; ADVERTISE_1000XPSE_ASYM) {</div><div class='del'>-			if (rmtadv &amp; LPA_1000XPAUSE)</div><div class='del'>-				cap = FLOW_CTRL_TX | FLOW_CTRL_RX;</div><div class='del'>-			else if (rmtadv &amp; LPA_1000XPAUSE_ASYM)</div><div class='del'>-				cap = FLOW_CTRL_RX;</div><div class='del'>-		} else {</div><div class='del'>-			if (rmtadv &amp; LPA_1000XPAUSE)</div><div class='del'>-				cap = FLOW_CTRL_TX | FLOW_CTRL_RX;</div><div class='del'>-		}</div><div class='del'>-	} else if (lcladv &amp; ADVERTISE_1000XPSE_ASYM) {</div><div class='del'>-		if ((rmtadv &amp; LPA_1000XPAUSE) &amp;&amp; (rmtadv &amp; LPA_1000XPAUSE_ASYM))</div><div class='add'>+	if (lcladv &amp; rmtadv &amp; ADVERTISE_1000XPAUSE) {</div><div class='add'>+		cap = FLOW_CTRL_TX | FLOW_CTRL_RX;</div><div class='add'>+	} else if (lcladv &amp; rmtadv &amp; ADVERTISE_1000XPSE_ASYM) {</div><div class='add'>+		if (lcladv &amp; ADVERTISE_1000XPAUSE)</div><div class='add'>+			cap = FLOW_CTRL_RX;</div><div class='add'>+		if (rmtadv &amp; ADVERTISE_1000XPAUSE)</div><div class='ctx'> 			cap = FLOW_CTRL_TX;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1792,7 +1770,7 @@ static void tg3_adjust_link(struct net_device *dev)</div><div class='ctx'> 		if (phydev-&gt;duplex == DUPLEX_HALF)</div><div class='ctx'> 			mac_mode |= MAC_MODE_HALF_DUPLEX;</div><div class='ctx'> 		else {</div><div class='del'>-			lcl_adv = tg3_advert_flowctrl_1000T(</div><div class='add'>+			lcl_adv = mii_advertise_flowctrl(</div><div class='ctx'> 				  tp-&gt;link_config.flowctrl);</div><div class='ctx'> </div><div class='ctx'> 			if (phydev-&gt;pause)</div><div class='hunk'>@@ -2160,7 +2138,7 @@ static void tg3_phy_eee_enable(struct tg3 *tp)</div><div class='ctx'> 	if (tp-&gt;link_config.active_speed == SPEED_1000 &amp;&amp;</div><div class='ctx'> 	    (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5717 ||</div><div class='ctx'> 	     GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5719 ||</div><div class='del'>-	     GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57765) &amp;&amp;</div><div class='add'>+	     tg3_flag(tp, 57765_CLASS)) &amp;&amp;</div><div class='ctx'> 	    !TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) {</div><div class='ctx'> 		val = MII_TG3_DSP_TAP26_ALNOKO |</div><div class='ctx'> 		      MII_TG3_DSP_TAP26_RMRXSTO;</div><div class='hunk'>@@ -2679,8 +2657,7 @@ static void tg3_frob_aux_power(struct tg3 *tp, bool include_wol)</div><div class='ctx'> 	bool need_vaux = false;</div><div class='ctx'> </div><div class='ctx'> 	/* The GPIOs do something completely different on 57765. */</div><div class='del'>-	if (!tg3_flag(tp, IS_NIC) ||</div><div class='del'>-	    GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57765)</div><div class='add'>+	if (!tg3_flag(tp, IS_NIC) || tg3_flag(tp, 57765_CLASS))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5717 ||</div><div class='hunk'>@@ -3594,37 +3571,24 @@ static int tg3_phy_autoneg_cfg(struct tg3 *tp, u32 advertise, u32 flowctrl)</div><div class='ctx'> 	u32 val, new_adv;</div><div class='ctx'> </div><div class='ctx'> 	new_adv = ADVERTISE_CSMA;</div><div class='del'>-	if (advertise &amp; ADVERTISED_10baseT_Half)</div><div class='del'>-		new_adv |= ADVERTISE_10HALF;</div><div class='del'>-	if (advertise &amp; ADVERTISED_10baseT_Full)</div><div class='del'>-		new_adv |= ADVERTISE_10FULL;</div><div class='del'>-	if (advertise &amp; ADVERTISED_100baseT_Half)</div><div class='del'>-		new_adv |= ADVERTISE_100HALF;</div><div class='del'>-	if (advertise &amp; ADVERTISED_100baseT_Full)</div><div class='del'>-		new_adv |= ADVERTISE_100FULL;</div><div class='del'>-</div><div class='del'>-	new_adv |= tg3_advert_flowctrl_1000T(flowctrl);</div><div class='add'>+	new_adv |= ethtool_adv_to_mii_adv_t(advertise) &amp; ADVERTISE_ALL;</div><div class='add'>+	new_adv |= mii_advertise_flowctrl(flowctrl);</div><div class='ctx'> </div><div class='ctx'> 	err = tg3_writephy(tp, MII_ADVERTISE, new_adv);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	if (tp-&gt;phy_flags &amp; TG3_PHYFLG_10_100_ONLY)</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	new_adv = 0;</div><div class='del'>-	if (advertise &amp; ADVERTISED_1000baseT_Half)</div><div class='del'>-		new_adv |= ADVERTISE_1000HALF;</div><div class='del'>-	if (advertise &amp; ADVERTISED_1000baseT_Full)</div><div class='del'>-		new_adv |= ADVERTISE_1000FULL;</div><div class='add'>+	if (!(tp-&gt;phy_flags &amp; TG3_PHYFLG_10_100_ONLY)) {</div><div class='add'>+		new_adv = ethtool_adv_to_mii_ctrl1000_t(advertise);</div><div class='ctx'> </div><div class='del'>-	if (tp-&gt;pci_chip_rev_id == CHIPREV_ID_5701_A0 ||</div><div class='del'>-	    tp-&gt;pci_chip_rev_id == CHIPREV_ID_5701_B0)</div><div class='del'>-		new_adv |= CTL1000_AS_MASTER | CTL1000_ENABLE_MASTER;</div><div class='add'>+		if (tp-&gt;pci_chip_rev_id == CHIPREV_ID_5701_A0 ||</div><div class='add'>+		    tp-&gt;pci_chip_rev_id == CHIPREV_ID_5701_B0)</div><div class='add'>+			new_adv |= CTL1000_AS_MASTER | CTL1000_ENABLE_MASTER;</div><div class='ctx'> </div><div class='del'>-	err = tg3_writephy(tp, MII_CTRL1000, new_adv);</div><div class='del'>-	if (err)</div><div class='del'>-		goto done;</div><div class='add'>+		err = tg3_writephy(tp, MII_CTRL1000, new_adv);</div><div class='add'>+		if (err)</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(tp-&gt;phy_flags &amp; TG3_PHYFLG_EEE_CAP))</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -3650,6 +3614,7 @@ static int tg3_phy_autoneg_cfg(struct tg3 *tp, u32 advertise, u32 flowctrl)</div><div class='ctx'> 		switch (GET_ASIC_REV(tp-&gt;pci_chip_rev_id)) {</div><div class='ctx'> 		case ASIC_REV_5717:</div><div class='ctx'> 		case ASIC_REV_57765:</div><div class='add'>+		case ASIC_REV_57766:</div><div class='ctx'> 		case ASIC_REV_5719:</div><div class='ctx'> 			/* If we advertised any eee advertisements above... */</div><div class='ctx'> 			if (val)</div><div class='hunk'>@@ -3786,76 +3751,61 @@ static int tg3_init_5401phy_dsp(struct tg3 *tp)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tg3_copper_is_advertising_all(struct tg3 *tp, u32 mask)</div><div class='add'>+static bool tg3_phy_copper_an_config_ok(struct tg3 *tp, u32 *lcladv)</div><div class='ctx'> {</div><div class='del'>-	u32 adv_reg, all_mask = 0;</div><div class='add'>+	u32 advmsk, tgtadv, advertising;</div><div class='ctx'> </div><div class='del'>-	if (mask &amp; ADVERTISED_10baseT_Half)</div><div class='del'>-		all_mask |= ADVERTISE_10HALF;</div><div class='del'>-	if (mask &amp; ADVERTISED_10baseT_Full)</div><div class='del'>-		all_mask |= ADVERTISE_10FULL;</div><div class='del'>-	if (mask &amp; ADVERTISED_100baseT_Half)</div><div class='del'>-		all_mask |= ADVERTISE_100HALF;</div><div class='del'>-	if (mask &amp; ADVERTISED_100baseT_Full)</div><div class='del'>-		all_mask |= ADVERTISE_100FULL;</div><div class='add'>+	advertising = tp-&gt;link_config.advertising;</div><div class='add'>+	tgtadv = ethtool_adv_to_mii_adv_t(advertising) &amp; ADVERTISE_ALL;</div><div class='ctx'> </div><div class='del'>-	if (tg3_readphy(tp, MII_ADVERTISE, &amp;adv_reg))</div><div class='del'>-		return 0;</div><div class='add'>+	advmsk = ADVERTISE_ALL;</div><div class='add'>+	if (tp-&gt;link_config.active_duplex == DUPLEX_FULL) {</div><div class='add'>+		tgtadv |= mii_advertise_flowctrl(tp-&gt;link_config.flowctrl);</div><div class='add'>+		advmsk |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if ((adv_reg &amp; ADVERTISE_ALL) != all_mask)</div><div class='del'>-		return 0;</div><div class='add'>+	if (tg3_readphy(tp, MII_ADVERTISE, lcladv))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if ((*lcladv &amp; advmsk) != tgtadv)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (!(tp-&gt;phy_flags &amp; TG3_PHYFLG_10_100_ONLY)) {</div><div class='ctx'> 		u32 tg3_ctrl;</div><div class='ctx'> </div><div class='del'>-		all_mask = 0;</div><div class='del'>-		if (mask &amp; ADVERTISED_1000baseT_Half)</div><div class='del'>-			all_mask |= ADVERTISE_1000HALF;</div><div class='del'>-		if (mask &amp; ADVERTISED_1000baseT_Full)</div><div class='del'>-			all_mask |= ADVERTISE_1000FULL;</div><div class='add'>+		tgtadv = ethtool_adv_to_mii_ctrl1000_t(advertising);</div><div class='ctx'> </div><div class='ctx'> 		if (tg3_readphy(tp, MII_CTRL1000, &amp;tg3_ctrl))</div><div class='del'>-			return 0;</div><div class='add'>+			return false;</div><div class='ctx'> </div><div class='ctx'> 		tg3_ctrl &amp;= (ADVERTISE_1000HALF | ADVERTISE_1000FULL);</div><div class='del'>-		if (tg3_ctrl != all_mask)</div><div class='del'>-			return 0;</div><div class='add'>+		if (tg3_ctrl != tgtadv)</div><div class='add'>+			return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tg3_adv_1000T_flowctrl_ok(struct tg3 *tp, u32 *lcladv, u32 *rmtadv)</div><div class='add'>+static bool tg3_phy_copper_fetch_rmtadv(struct tg3 *tp, u32 *rmtadv)</div><div class='ctx'> {</div><div class='del'>-	u32 curadv, reqadv;</div><div class='del'>-</div><div class='del'>-	if (tg3_readphy(tp, MII_ADVERTISE, lcladv))</div><div class='del'>-		return 1;</div><div class='add'>+	u32 lpeth = 0;</div><div class='ctx'> </div><div class='del'>-	curadv = *lcladv &amp; (ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);</div><div class='del'>-	reqadv = tg3_advert_flowctrl_1000T(tp-&gt;link_config.flowctrl);</div><div class='add'>+	if (!(tp-&gt;phy_flags &amp; TG3_PHYFLG_10_100_ONLY)) {</div><div class='add'>+		u32 val;</div><div class='ctx'> </div><div class='del'>-	if (tp-&gt;link_config.active_duplex == DUPLEX_FULL) {</div><div class='del'>-		if (curadv != reqadv)</div><div class='del'>-			return 0;</div><div class='add'>+		if (tg3_readphy(tp, MII_STAT1000, &amp;val))</div><div class='add'>+			return false;</div><div class='ctx'> </div><div class='del'>-		if (tg3_flag(tp, PAUSE_AUTONEG))</div><div class='del'>-			tg3_readphy(tp, MII_LPA, rmtadv);</div><div class='del'>-	} else {</div><div class='del'>-		/* Reprogram the advertisement register, even if it</div><div class='del'>-		 * does not affect the current link.  If the link</div><div class='del'>-		 * gets renegotiated in the future, we can save an</div><div class='del'>-		 * additional renegotiation cycle by advertising</div><div class='del'>-		 * it correctly in the first place.</div><div class='del'>-		 */</div><div class='del'>-		if (curadv != reqadv) {</div><div class='del'>-			*lcladv &amp;= ~(ADVERTISE_PAUSE_CAP |</div><div class='del'>-				     ADVERTISE_PAUSE_ASYM);</div><div class='del'>-			tg3_writephy(tp, MII_ADVERTISE, *lcladv | reqadv);</div><div class='del'>-		}</div><div class='add'>+		lpeth = mii_stat1000_to_ethtool_lpa_t(val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	if (tg3_readphy(tp, MII_LPA, rmtadv))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	lpeth |= mii_lpa_to_ethtool_lpa_t(*rmtadv);</div><div class='add'>+	tp-&gt;link_config.rmt_adv = lpeth;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)</div><div class='hunk'>@@ -3961,6 +3911,8 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)</div><div class='ctx'> 	current_link_up = 0;</div><div class='ctx'> 	current_speed = SPEED_INVALID;</div><div class='ctx'> 	current_duplex = DUPLEX_INVALID;</div><div class='add'>+	tp-&gt;phy_flags &amp;= ~TG3_PHYFLG_MDIX_STATE;</div><div class='add'>+	tp-&gt;link_config.rmt_adv = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;phy_flags &amp; TG3_PHYFLG_CAPACITIVE_COUPLING) {</div><div class='ctx'> 		err = tg3_phy_auxctl_read(tp,</div><div class='hunk'>@@ -4016,12 +3968,9 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)</div><div class='ctx'> </div><div class='ctx'> 		if (tp-&gt;link_config.autoneg == AUTONEG_ENABLE) {</div><div class='ctx'> 			if ((bmcr &amp; BMCR_ANENABLE) &amp;&amp;</div><div class='del'>-			    tg3_copper_is_advertising_all(tp,</div><div class='del'>-						tp-&gt;link_config.advertising)) {</div><div class='del'>-				if (tg3_adv_1000T_flowctrl_ok(tp, &amp;lcl_adv,</div><div class='del'>-								  &amp;rmt_adv))</div><div class='del'>-					current_link_up = 1;</div><div class='del'>-			}</div><div class='add'>+			    tg3_phy_copper_an_config_ok(tp, &amp;lcl_adv) &amp;&amp;</div><div class='add'>+			    tg3_phy_copper_fetch_rmtadv(tp, &amp;rmt_adv))</div><div class='add'>+				current_link_up = 1;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (!(bmcr &amp; BMCR_ANENABLE) &amp;&amp;</div><div class='ctx'> 			    tp-&gt;link_config.speed == current_speed &amp;&amp;</div><div class='hunk'>@@ -4033,8 +3982,22 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (current_link_up == 1 &amp;&amp;</div><div class='del'>-		    tp-&gt;link_config.active_duplex == DUPLEX_FULL)</div><div class='add'>+		    tp-&gt;link_config.active_duplex == DUPLEX_FULL) {</div><div class='add'>+			u32 reg, bit;</div><div class='add'>+</div><div class='add'>+			if (tp-&gt;phy_flags &amp; TG3_PHYFLG_IS_FET) {</div><div class='add'>+				reg = MII_TG3_FET_GEN_STAT;</div><div class='add'>+				bit = MII_TG3_FET_GEN_STAT_MDIXSTAT;</div><div class='add'>+			} else {</div><div class='add'>+				reg = MII_TG3_EXT_STAT;</div><div class='add'>+				bit = MII_TG3_EXT_STAT_MDIX;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!tg3_readphy(tp, reg, &amp;val) &amp;&amp; (val &amp; bit))</div><div class='add'>+				tp-&gt;phy_flags |= TG3_PHYFLG_MDIX_STATE;</div><div class='add'>+</div><div class='ctx'> 			tg3_setup_flow_control(tp, lcl_adv, rmt_adv);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> relink:</div><div class='hunk'>@@ -4643,6 +4606,9 @@ restart_autoneg:</div><div class='ctx'> 			if (sg_dig_status &amp; SG_DIG_PARTNER_ASYM_PAUSE)</div><div class='ctx'> 				remote_adv |= LPA_1000XPAUSE_ASYM;</div><div class='ctx'> </div><div class='add'>+			tp-&gt;link_config.rmt_adv =</div><div class='add'>+					   mii_adv_to_ethtool_adv_x(remote_adv);</div><div class='add'>+</div><div class='ctx'> 			tg3_setup_flow_control(tp, local_adv, remote_adv);</div><div class='ctx'> 			current_link_up = 1;</div><div class='ctx'> 			tp-&gt;serdes_counter = 0;</div><div class='hunk'>@@ -4714,6 +4680,9 @@ static int tg3_setup_fiber_by_hand(struct tg3 *tp, u32 mac_status)</div><div class='ctx'> 			if (rxflags &amp; MR_LP_ADV_ASYM_PAUSE)</div><div class='ctx'> 				remote_adv |= LPA_1000XPAUSE_ASYM;</div><div class='ctx'> </div><div class='add'>+			tp-&gt;link_config.rmt_adv =</div><div class='add'>+					   mii_adv_to_ethtool_adv_x(remote_adv);</div><div class='add'>+</div><div class='ctx'> 			tg3_setup_flow_control(tp, local_adv, remote_adv);</div><div class='ctx'> </div><div class='ctx'> 			current_link_up = 1;</div><div class='hunk'>@@ -4796,6 +4765,7 @@ static int tg3_setup_fiber_phy(struct tg3 *tp, int force_reset)</div><div class='ctx'> 	udelay(40);</div><div class='ctx'> </div><div class='ctx'> 	current_link_up = 0;</div><div class='add'>+	tp-&gt;link_config.rmt_adv = 0;</div><div class='ctx'> 	mac_status = tr32(MAC_STATUS);</div><div class='ctx'> </div><div class='ctx'> 	if (tg3_flag(tp, HW_AUTONEG))</div><div class='hunk'>@@ -4887,6 +4857,7 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, int force_reset)</div><div class='ctx'> 	current_link_up = 0;</div><div class='ctx'> 	current_speed = SPEED_INVALID;</div><div class='ctx'> 	current_duplex = DUPLEX_INVALID;</div><div class='add'>+	tp-&gt;link_config.rmt_adv = 0;</div><div class='ctx'> </div><div class='ctx'> 	err |= tg3_readphy(tp, MII_BMSR, &amp;bmsr);</div><div class='ctx'> 	err |= tg3_readphy(tp, MII_BMSR, &amp;bmsr);</div><div class='hunk'>@@ -4903,23 +4874,19 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, int force_reset)</div><div class='ctx'> 	    (tp-&gt;phy_flags &amp; TG3_PHYFLG_PARALLEL_DETECT)) {</div><div class='ctx'> 		/* do nothing, just check for link up at the end */</div><div class='ctx'> 	} else if (tp-&gt;link_config.autoneg == AUTONEG_ENABLE) {</div><div class='del'>-		u32 adv, new_adv;</div><div class='add'>+		u32 adv, newadv;</div><div class='ctx'> </div><div class='ctx'> 		err |= tg3_readphy(tp, MII_ADVERTISE, &amp;adv);</div><div class='del'>-		new_adv = adv &amp; ~(ADVERTISE_1000XFULL | ADVERTISE_1000XHALF |</div><div class='del'>-				  ADVERTISE_1000XPAUSE |</div><div class='del'>-				  ADVERTISE_1000XPSE_ASYM |</div><div class='del'>-				  ADVERTISE_SLCT);</div><div class='del'>-</div><div class='del'>-		new_adv |= tg3_advert_flowctrl_1000X(tp-&gt;link_config.flowctrl);</div><div class='add'>+		newadv = adv &amp; ~(ADVERTISE_1000XFULL | ADVERTISE_1000XHALF |</div><div class='add'>+				 ADVERTISE_1000XPAUSE |</div><div class='add'>+				 ADVERTISE_1000XPSE_ASYM |</div><div class='add'>+				 ADVERTISE_SLCT);</div><div class='ctx'> </div><div class='del'>-		if (tp-&gt;link_config.advertising &amp; ADVERTISED_1000baseT_Half)</div><div class='del'>-			new_adv |= ADVERTISE_1000XHALF;</div><div class='del'>-		if (tp-&gt;link_config.advertising &amp; ADVERTISED_1000baseT_Full)</div><div class='del'>-			new_adv |= ADVERTISE_1000XFULL;</div><div class='add'>+		newadv |= tg3_advert_flowctrl_1000X(tp-&gt;link_config.flowctrl);</div><div class='add'>+		newadv |= ethtool_adv_to_mii_adv_x(tp-&gt;link_config.advertising);</div><div class='ctx'> </div><div class='del'>-		if ((new_adv != adv) || !(bmcr &amp; BMCR_ANENABLE)) {</div><div class='del'>-			tg3_writephy(tp, MII_ADVERTISE, new_adv);</div><div class='add'>+		if ((newadv != adv) || !(bmcr &amp; BMCR_ANENABLE)) {</div><div class='add'>+			tg3_writephy(tp, MII_ADVERTISE, newadv);</div><div class='ctx'> 			bmcr |= BMCR_ANENABLE | BMCR_ANRESTART;</div><div class='ctx'> 			tg3_writephy(tp, MII_BMCR, bmcr);</div><div class='ctx'> </div><div class='hunk'>@@ -4997,6 +4964,9 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, int force_reset)</div><div class='ctx'> 					current_duplex = DUPLEX_FULL;</div><div class='ctx'> 				else</div><div class='ctx'> 					current_duplex = DUPLEX_HALF;</div><div class='add'>+</div><div class='add'>+				tp-&gt;link_config.rmt_adv =</div><div class='add'>+					   mii_adv_to_ethtool_adv_x(remote_adv);</div><div class='ctx'> 			} else if (!tg3_flag(tp, 5780_CLASS)) {</div><div class='ctx'> 				/* Link is up via parallel detect */</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -5320,6 +5290,7 @@ static void tg3_tx(struct tg3_napi *tnapi)</div><div class='ctx'> 	u32 sw_idx = tnapi-&gt;tx_cons;</div><div class='ctx'> 	struct netdev_queue *txq;</div><div class='ctx'> 	int index = tnapi - tp-&gt;napi;</div><div class='add'>+	unsigned int pkts_compl = 0, bytes_compl = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (tg3_flag(tp, ENABLE_TSS))</div><div class='ctx'> 		index--;</div><div class='hunk'>@@ -5370,6 +5341,9 @@ static void tg3_tx(struct tg3_napi *tnapi)</div><div class='ctx'> 			sw_idx = NEXT_TX(sw_idx);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		pkts_compl++;</div><div class='add'>+		bytes_compl += skb-&gt;len;</div><div class='add'>+</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(tx_bug)) {</div><div class='hunk'>@@ -5378,6 +5352,8 @@ static void tg3_tx(struct tg3_napi *tnapi)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netdev_completed_queue(tp-&gt;dev, pkts_compl, bytes_compl);</div><div class='add'>+</div><div class='ctx'> 	tnapi-&gt;tx_cons = sw_idx;</div><div class='ctx'> </div><div class='ctx'> 	/* Need to make the tx_cons update visible to tg3_start_xmit()</div><div class='hunk'>@@ -5397,15 +5373,15 @@ static void tg3_tx(struct tg3_napi *tnapi)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tg3_rx_skb_free(struct tg3 *tp, struct ring_info *ri, u32 map_sz)</div><div class='add'>+static void tg3_rx_data_free(struct tg3 *tp, struct ring_info *ri, u32 map_sz)</div><div class='ctx'> {</div><div class='del'>-	if (!ri-&gt;skb)</div><div class='add'>+	if (!ri-&gt;data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	pci_unmap_single(tp-&gt;pdev, dma_unmap_addr(ri, mapping),</div><div class='ctx'> 			 map_sz, PCI_DMA_FROMDEVICE);</div><div class='del'>-	dev_kfree_skb_any(ri-&gt;skb);</div><div class='del'>-	ri-&gt;skb = NULL;</div><div class='add'>+	kfree(ri-&gt;data);</div><div class='add'>+	ri-&gt;data = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns size of skb allocated or &lt; 0 on error.</div><div class='hunk'>@@ -5419,28 +5395,28 @@ static void tg3_rx_skb_free(struct tg3 *tp, struct ring_info *ri, u32 map_sz)</div><div class='ctx'>  * buffers the cpu only reads the last cacheline of the RX descriptor</div><div class='ctx'>  * (to fetch the error flags, vlan tag, checksum, and opaque cookie).</div><div class='ctx'>  */</div><div class='del'>-static int tg3_alloc_rx_skb(struct tg3 *tp, struct tg3_rx_prodring_set *tpr,</div><div class='add'>+static int tg3_alloc_rx_data(struct tg3 *tp, struct tg3_rx_prodring_set *tpr,</div><div class='ctx'> 			    u32 opaque_key, u32 dest_idx_unmasked)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3_rx_buffer_desc *desc;</div><div class='ctx'> 	struct ring_info *map;</div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	u8 *data;</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='del'>-	int skb_size, dest_idx;</div><div class='add'>+	int skb_size, data_size, dest_idx;</div><div class='ctx'> </div><div class='ctx'> 	switch (opaque_key) {</div><div class='ctx'> 	case RXD_OPAQUE_RING_STD:</div><div class='ctx'> 		dest_idx = dest_idx_unmasked &amp; tp-&gt;rx_std_ring_mask;</div><div class='ctx'> 		desc = &amp;tpr-&gt;rx_std[dest_idx];</div><div class='ctx'> 		map = &amp;tpr-&gt;rx_std_buffers[dest_idx];</div><div class='del'>-		skb_size = tp-&gt;rx_pkt_map_sz;</div><div class='add'>+		data_size = tp-&gt;rx_pkt_map_sz;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case RXD_OPAQUE_RING_JUMBO:</div><div class='ctx'> 		dest_idx = dest_idx_unmasked &amp; tp-&gt;rx_jmb_ring_mask;</div><div class='ctx'> 		desc = &amp;tpr-&gt;rx_jmb[dest_idx].std;</div><div class='ctx'> 		map = &amp;tpr-&gt;rx_jmb_buffers[dest_idx];</div><div class='del'>-		skb_size = TG3_RX_JMB_MAP_SZ;</div><div class='add'>+		data_size = TG3_RX_JMB_MAP_SZ;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -5453,31 +5429,33 @@ static int tg3_alloc_rx_skb(struct tg3 *tp, struct tg3_rx_prodring_set *tpr,</div><div class='ctx'> 	 * Callers depend upon this behavior and assume that</div><div class='ctx'> 	 * we leave everything unchanged if we fail.</div><div class='ctx'> 	 */</div><div class='del'>-	skb = netdev_alloc_skb(tp-&gt;dev, skb_size + TG3_RX_OFFSET(tp));</div><div class='del'>-	if (skb == NULL)</div><div class='add'>+	skb_size = SKB_DATA_ALIGN(data_size + TG3_RX_OFFSET(tp)) +</div><div class='add'>+		   SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='add'>+	data = kmalloc(skb_size, GFP_ATOMIC);</div><div class='add'>+	if (!data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	skb_reserve(skb, TG3_RX_OFFSET(tp));</div><div class='del'>-</div><div class='del'>-	mapping = pci_map_single(tp-&gt;pdev, skb-&gt;data, skb_size,</div><div class='add'>+	mapping = pci_map_single(tp-&gt;pdev,</div><div class='add'>+				 data + TG3_RX_OFFSET(tp),</div><div class='add'>+				 data_size,</div><div class='ctx'> 				 PCI_DMA_FROMDEVICE);</div><div class='ctx'> 	if (pci_dma_mapping_error(tp-&gt;pdev, mapping)) {</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='add'>+		kfree(data);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	map-&gt;skb = skb;</div><div class='add'>+	map-&gt;data = data;</div><div class='ctx'> 	dma_unmap_addr_set(map, mapping, mapping);</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;addr_hi = ((u64)mapping &gt;&gt; 32);</div><div class='ctx'> 	desc-&gt;addr_lo = ((u64)mapping &amp; 0xffffffff);</div><div class='ctx'> </div><div class='del'>-	return skb_size;</div><div class='add'>+	return data_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* We only need to move over in the address because the other</div><div class='ctx'>  * members of the RX descriptor are invariant.  See notes above</div><div class='del'>- * tg3_alloc_rx_skb for full details.</div><div class='add'>+ * tg3_alloc_rx_data for full details.</div><div class='ctx'>  */</div><div class='ctx'> static void tg3_recycle_rx(struct tg3_napi *tnapi,</div><div class='ctx'> 			   struct tg3_rx_prodring_set *dpr,</div><div class='hunk'>@@ -5511,7 +5489,7 @@ static void tg3_recycle_rx(struct tg3_napi *tnapi,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dest_map-&gt;skb = src_map-&gt;skb;</div><div class='add'>+	dest_map-&gt;data = src_map-&gt;data;</div><div class='ctx'> 	dma_unmap_addr_set(dest_map, mapping,</div><div class='ctx'> 			   dma_unmap_addr(src_map, mapping));</div><div class='ctx'> 	dest_desc-&gt;addr_hi = src_desc-&gt;addr_hi;</div><div class='hunk'>@@ -5522,7 +5500,7 @@ static void tg3_recycle_rx(struct tg3_napi *tnapi,</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> </div><div class='del'>-	src_map-&gt;skb = NULL;</div><div class='add'>+	src_map-&gt;data = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The RX ring scheme is composed of multiple rings which post fresh</div><div class='hunk'>@@ -5576,19 +5554,20 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='ctx'> 		dma_addr_t dma_addr;</div><div class='ctx'> 		u32 opaque_key, desc_idx, *post_ptr;</div><div class='add'>+		u8 *data;</div><div class='ctx'> </div><div class='ctx'> 		desc_idx = desc-&gt;opaque &amp; RXD_OPAQUE_INDEX_MASK;</div><div class='ctx'> 		opaque_key = desc-&gt;opaque &amp; RXD_OPAQUE_RING_MASK;</div><div class='ctx'> 		if (opaque_key == RXD_OPAQUE_RING_STD) {</div><div class='ctx'> 			ri = &amp;tp-&gt;napi[0].prodring.rx_std_buffers[desc_idx];</div><div class='ctx'> 			dma_addr = dma_unmap_addr(ri, mapping);</div><div class='del'>-			skb = ri-&gt;skb;</div><div class='add'>+			data = ri-&gt;data;</div><div class='ctx'> 			post_ptr = &amp;std_prod_idx;</div><div class='ctx'> 			rx_std_posted++;</div><div class='ctx'> 		} else if (opaque_key == RXD_OPAQUE_RING_JUMBO) {</div><div class='ctx'> 			ri = &amp;tp-&gt;napi[0].prodring.rx_jmb_buffers[desc_idx];</div><div class='ctx'> 			dma_addr = dma_unmap_addr(ri, mapping);</div><div class='del'>-			skb = ri-&gt;skb;</div><div class='add'>+			data = ri-&gt;data;</div><div class='ctx'> 			post_ptr = &amp;jmb_prod_idx;</div><div class='ctx'> 		} else</div><div class='ctx'> 			goto next_pkt_nopost;</div><div class='hunk'>@@ -5606,13 +5585,14 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)</div><div class='ctx'> 			goto next_pkt;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		prefetch(data + TG3_RX_OFFSET(tp));</div><div class='ctx'> 		len = ((desc-&gt;idx_len &amp; RXD_LEN_MASK) &gt;&gt; RXD_LEN_SHIFT) -</div><div class='ctx'> 		      ETH_FCS_LEN;</div><div class='ctx'> </div><div class='ctx'> 		if (len &gt; TG3_RX_COPY_THRESH(tp)) {</div><div class='ctx'> 			int skb_size;</div><div class='ctx'> </div><div class='del'>-			skb_size = tg3_alloc_rx_skb(tp, tpr, opaque_key,</div><div class='add'>+			skb_size = tg3_alloc_rx_data(tp, tpr, opaque_key,</div><div class='ctx'> 						    *post_ptr);</div><div class='ctx'> 			if (skb_size &lt; 0)</div><div class='ctx'> 				goto drop_it;</div><div class='hunk'>@@ -5620,35 +5600,37 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)</div><div class='ctx'> 			pci_unmap_single(tp-&gt;pdev, dma_addr, skb_size,</div><div class='ctx'> 					 PCI_DMA_FROMDEVICE);</div><div class='ctx'> </div><div class='del'>-			/* Ensure that the update to the skb happens</div><div class='add'>+			skb = build_skb(data);</div><div class='add'>+			if (!skb) {</div><div class='add'>+				kfree(data);</div><div class='add'>+				goto drop_it_no_recycle;</div><div class='add'>+			}</div><div class='add'>+			skb_reserve(skb, TG3_RX_OFFSET(tp));</div><div class='add'>+			/* Ensure that the update to the data happens</div><div class='ctx'> 			 * after the usage of the old DMA mapping.</div><div class='ctx'> 			 */</div><div class='ctx'> 			smp_wmb();</div><div class='ctx'> </div><div class='del'>-			ri-&gt;skb = NULL;</div><div class='add'>+			ri-&gt;data = NULL;</div><div class='ctx'> </div><div class='del'>-			skb_put(skb, len);</div><div class='ctx'> 		} else {</div><div class='del'>-			struct sk_buff *copy_skb;</div><div class='del'>-</div><div class='ctx'> 			tg3_recycle_rx(tnapi, tpr, opaque_key,</div><div class='ctx'> 				       desc_idx, *post_ptr);</div><div class='ctx'> </div><div class='del'>-			copy_skb = netdev_alloc_skb(tp-&gt;dev, len +</div><div class='del'>-						    TG3_RAW_IP_ALIGN);</div><div class='del'>-			if (copy_skb == NULL)</div><div class='add'>+			skb = netdev_alloc_skb(tp-&gt;dev,</div><div class='add'>+					       len + TG3_RAW_IP_ALIGN);</div><div class='add'>+			if (skb == NULL)</div><div class='ctx'> 				goto drop_it_no_recycle;</div><div class='ctx'> </div><div class='del'>-			skb_reserve(copy_skb, TG3_RAW_IP_ALIGN);</div><div class='del'>-			skb_put(copy_skb, len);</div><div class='add'>+			skb_reserve(skb, TG3_RAW_IP_ALIGN);</div><div class='ctx'> 			pci_dma_sync_single_for_cpu(tp-&gt;pdev, dma_addr, len, PCI_DMA_FROMDEVICE);</div><div class='del'>-			skb_copy_from_linear_data(skb, copy_skb-&gt;data, len);</div><div class='add'>+			memcpy(skb-&gt;data,</div><div class='add'>+			       data + TG3_RX_OFFSET(tp),</div><div class='add'>+			       len);</div><div class='ctx'> 			pci_dma_sync_single_for_device(tp-&gt;pdev, dma_addr, len, PCI_DMA_FROMDEVICE);</div><div class='del'>-</div><div class='del'>-			/* We'll reuse the original ring buffer. */</div><div class='del'>-			skb = copy_skb;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		skb_put(skb, len);</div><div class='ctx'> 		if ((tp-&gt;dev-&gt;features &amp; NETIF_F_RXCSUM) &amp;&amp;</div><div class='ctx'> 		    (desc-&gt;type_flags &amp; RXD_FLAG_TCPUDP_CSUM) &amp;&amp;</div><div class='ctx'> 		    (((desc-&gt;ip_tcp_csum &amp; RXD_TCPCSUM_MASK)</div><div class='hunk'>@@ -5787,7 +5769,7 @@ static int tg3_rx_prodring_xfer(struct tg3 *tp,</div><div class='ctx'> 		di = dpr-&gt;rx_std_prod_idx;</div><div class='ctx'> </div><div class='ctx'> 		for (i = di; i &lt; di + cpycnt; i++) {</div><div class='del'>-			if (dpr-&gt;rx_std_buffers[i].skb) {</div><div class='add'>+			if (dpr-&gt;rx_std_buffers[i].data) {</div><div class='ctx'> 				cpycnt = i - di;</div><div class='ctx'> 				err = -ENOSPC;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -5845,7 +5827,7 @@ static int tg3_rx_prodring_xfer(struct tg3 *tp,</div><div class='ctx'> 		di = dpr-&gt;rx_jmb_prod_idx;</div><div class='ctx'> </div><div class='ctx'> 		for (i = di; i &lt; di + cpycnt; i++) {</div><div class='del'>-			if (dpr-&gt;rx_jmb_buffers[i].skb) {</div><div class='add'>+			if (dpr-&gt;rx_jmb_buffers[i].data) {</div><div class='ctx'> 				cpycnt = i - di;</div><div class='ctx'> 				err = -ENOSPC;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -6443,25 +6425,25 @@ static bool tg3_tx_frag_set(struct tg3_napi *tnapi, u32 *entry, u32 *budget,</div><div class='ctx'> 	bool hwbug = false;</div><div class='ctx'> </div><div class='ctx'> 	if (tg3_flag(tp, SHORT_DMA_BUG) &amp;&amp; len &lt;= 8)</div><div class='del'>-		hwbug = 1;</div><div class='add'>+		hwbug = true;</div><div class='ctx'> </div><div class='ctx'> 	if (tg3_4g_overflow_test(map, len))</div><div class='del'>-		hwbug = 1;</div><div class='add'>+		hwbug = true;</div><div class='ctx'> </div><div class='ctx'> 	if (tg3_40bit_overflow_test(tp, map, len))</div><div class='del'>-		hwbug = 1;</div><div class='add'>+		hwbug = true;</div><div class='ctx'> </div><div class='del'>-	if (tg3_flag(tp, 4K_FIFO_LIMIT)) {</div><div class='add'>+	if (tp-&gt;dma_limit) {</div><div class='ctx'> 		u32 prvidx = *entry;</div><div class='ctx'> 		u32 tmp_flag = flags &amp; ~TXD_FLAG_END;</div><div class='del'>-		while (len &gt; TG3_TX_BD_DMA_MAX &amp;&amp; *budget) {</div><div class='del'>-			u32 frag_len = TG3_TX_BD_DMA_MAX;</div><div class='del'>-			len -= TG3_TX_BD_DMA_MAX;</div><div class='add'>+		while (len &gt; tp-&gt;dma_limit &amp;&amp; *budget) {</div><div class='add'>+			u32 frag_len = tp-&gt;dma_limit;</div><div class='add'>+			len -= tp-&gt;dma_limit;</div><div class='ctx'> </div><div class='ctx'> 			/* Avoid the 8byte DMA problem */</div><div class='ctx'> 			if (len &lt;= 8) {</div><div class='del'>-				len += TG3_TX_BD_DMA_MAX / 2;</div><div class='del'>-				frag_len = TG3_TX_BD_DMA_MAX / 2;</div><div class='add'>+				len += tp-&gt;dma_limit / 2;</div><div class='add'>+				frag_len = tp-&gt;dma_limit / 2;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			tnapi-&gt;tx_buffers[*entry].fragmented = true;</div><div class='hunk'>@@ -6482,7 +6464,7 @@ static bool tg3_tx_frag_set(struct tg3_napi *tnapi, u32 *entry, u32 *budget,</div><div class='ctx'> 				*budget -= 1;</div><div class='ctx'> 				*entry = NEXT_TX(*entry);</div><div class='ctx'> 			} else {</div><div class='del'>-				hwbug = 1;</div><div class='add'>+				hwbug = true;</div><div class='ctx'> 				tnapi-&gt;tx_buffers[prvidx].fragmented = false;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -6816,6 +6798,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_tx_timestamp(skb);</div><div class='add'>+	netdev_sent_queue(tp-&gt;dev, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* Packets are ready, update Tx producer idx local and on card. */</div><div class='ctx'> 	tw32_tx_mbox(tnapi-&gt;prodmbox, entry);</div><div class='hunk'>@@ -6968,7 +6951,7 @@ static int tg3_phy_lpbk_set(struct tg3 *tp, u32 speed, bool extlpbk)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tg3_set_loopback(struct net_device *dev, u32 features)</div><div class='add'>+static void tg3_set_loopback(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -6994,7 +6977,8 @@ static void tg3_set_loopback(struct net_device *dev, u32 features)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 tg3_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static netdev_features_t tg3_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -7004,9 +6988,9 @@ static u32 tg3_fix_features(struct net_device *dev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tg3_set_features(struct net_device *dev, u32 features)</div><div class='add'>+static int tg3_set_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='del'>-	u32 changed = dev-&gt;features ^ features;</div><div class='add'>+	netdev_features_t changed = dev-&gt;features ^ features;</div><div class='ctx'> </div><div class='ctx'> 	if ((changed &amp; NETIF_F_LOOPBACK) &amp;&amp; netif_running(dev))</div><div class='ctx'> 		tg3_set_loopback(dev, features);</div><div class='hunk'>@@ -7082,14 +7066,14 @@ static void tg3_rx_prodring_free(struct tg3 *tp,</div><div class='ctx'> 	if (tpr != &amp;tp-&gt;napi[0].prodring) {</div><div class='ctx'> 		for (i = tpr-&gt;rx_std_cons_idx; i != tpr-&gt;rx_std_prod_idx;</div><div class='ctx'> 		     i = (i + 1) &amp; tp-&gt;rx_std_ring_mask)</div><div class='del'>-			tg3_rx_skb_free(tp, &amp;tpr-&gt;rx_std_buffers[i],</div><div class='add'>+			tg3_rx_data_free(tp, &amp;tpr-&gt;rx_std_buffers[i],</div><div class='ctx'> 					tp-&gt;rx_pkt_map_sz);</div><div class='ctx'> </div><div class='ctx'> 		if (tg3_flag(tp, JUMBO_CAPABLE)) {</div><div class='ctx'> 			for (i = tpr-&gt;rx_jmb_cons_idx;</div><div class='ctx'> 			     i != tpr-&gt;rx_jmb_prod_idx;</div><div class='ctx'> 			     i = (i + 1) &amp; tp-&gt;rx_jmb_ring_mask) {</div><div class='del'>-				tg3_rx_skb_free(tp, &amp;tpr-&gt;rx_jmb_buffers[i],</div><div class='add'>+				tg3_rx_data_free(tp, &amp;tpr-&gt;rx_jmb_buffers[i],</div><div class='ctx'> 						TG3_RX_JMB_MAP_SZ);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -7098,12 +7082,12 @@ static void tg3_rx_prodring_free(struct tg3 *tp,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt;= tp-&gt;rx_std_ring_mask; i++)</div><div class='del'>-		tg3_rx_skb_free(tp, &amp;tpr-&gt;rx_std_buffers[i],</div><div class='add'>+		tg3_rx_data_free(tp, &amp;tpr-&gt;rx_std_buffers[i],</div><div class='ctx'> 				tp-&gt;rx_pkt_map_sz);</div><div class='ctx'> </div><div class='ctx'> 	if (tg3_flag(tp, JUMBO_CAPABLE) &amp;&amp; !tg3_flag(tp, 5780_CLASS)) {</div><div class='ctx'> 		for (i = 0; i &lt;= tp-&gt;rx_jmb_ring_mask; i++)</div><div class='del'>-			tg3_rx_skb_free(tp, &amp;tpr-&gt;rx_jmb_buffers[i],</div><div class='add'>+			tg3_rx_data_free(tp, &amp;tpr-&gt;rx_jmb_buffers[i],</div><div class='ctx'> 					TG3_RX_JMB_MAP_SZ);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -7159,7 +7143,7 @@ static int tg3_rx_prodring_alloc(struct tg3 *tp,</div><div class='ctx'> </div><div class='ctx'> 	/* Now allocate fresh SKBs for each rx ring. */</div><div class='ctx'> 	for (i = 0; i &lt; tp-&gt;rx_pending; i++) {</div><div class='del'>-		if (tg3_alloc_rx_skb(tp, tpr, RXD_OPAQUE_RING_STD, i) &lt; 0) {</div><div class='add'>+		if (tg3_alloc_rx_data(tp, tpr, RXD_OPAQUE_RING_STD, i) &lt; 0) {</div><div class='ctx'> 			netdev_warn(tp-&gt;dev,</div><div class='ctx'> 				    "Using a smaller RX standard ring. Only "</div><div class='ctx'> 				    "%d out of %d buffers were allocated "</div><div class='hunk'>@@ -7191,7 +7175,7 @@ static int tg3_rx_prodring_alloc(struct tg3 *tp,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; tp-&gt;rx_jumbo_pending; i++) {</div><div class='del'>-		if (tg3_alloc_rx_skb(tp, tpr, RXD_OPAQUE_RING_JUMBO, i) &lt; 0) {</div><div class='add'>+		if (tg3_alloc_rx_data(tp, tpr, RXD_OPAQUE_RING_JUMBO, i) &lt; 0) {</div><div class='ctx'> 			netdev_warn(tp-&gt;dev,</div><div class='ctx'> 				    "Using a smaller RX jumbo ring. Only %d "</div><div class='ctx'> 				    "out of %d buffers were allocated "</div><div class='hunk'>@@ -7297,6 +7281,7 @@ static void tg3_free_rings(struct tg3 *tp)</div><div class='ctx'> 			dev_kfree_skb_any(skb);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	netdev_reset_queue(tp-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Initialize tx/rx rings for packet processing.</div><div class='hunk'>@@ -7591,8 +7576,6 @@ static int tg3_abort_hw(struct tg3 *tp, int silent)</div><div class='ctx'> 		if (tnapi-&gt;hw_status)</div><div class='ctx'> 			memset(tnapi-&gt;hw_status, 0, TG3_HW_STATUS_SIZE);</div><div class='ctx'> 	}</div><div class='del'>-	if (tp-&gt;hw_stats)</div><div class='del'>-		memset(tp-&gt;hw_stats, 0, sizeof(struct tg3_hw_stats));</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -7626,15 +7609,11 @@ static void tg3_restore_pci_state(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> 	pci_write_config_word(tp-&gt;pdev, PCI_COMMAND, tp-&gt;pci_cmd);</div><div class='ctx'> </div><div class='del'>-	if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) != ASIC_REV_5785) {</div><div class='del'>-		if (tg3_flag(tp, PCI_EXPRESS))</div><div class='del'>-			pcie_set_readrq(tp-&gt;pdev, tp-&gt;pcie_readrq);</div><div class='del'>-		else {</div><div class='del'>-			pci_write_config_byte(tp-&gt;pdev, PCI_CACHE_LINE_SIZE,</div><div class='del'>-					      tp-&gt;pci_cacheline_sz);</div><div class='del'>-			pci_write_config_byte(tp-&gt;pdev, PCI_LATENCY_TIMER,</div><div class='del'>-					      tp-&gt;pci_lat_timer);</div><div class='del'>-		}</div><div class='add'>+	if (!tg3_flag(tp, PCI_EXPRESS)) {</div><div class='add'>+		pci_write_config_byte(tp-&gt;pdev, PCI_CACHE_LINE_SIZE,</div><div class='add'>+				      tp-&gt;pci_cacheline_sz);</div><div class='add'>+		pci_write_config_byte(tp-&gt;pdev, PCI_LATENCY_TIMER,</div><div class='add'>+				      tp-&gt;pci_lat_timer);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure PCI-X relaxed ordering bit is clear. */</div><div class='hunk'>@@ -7819,8 +7798,6 @@ static int tg3_chip_reset(struct tg3 *tp)</div><div class='ctx'> 				      pci_pcie_cap(tp-&gt;pdev) + PCI_EXP_DEVCTL,</div><div class='ctx'> 				      val16);</div><div class='ctx'> </div><div class='del'>-		pcie_set_readrq(tp-&gt;pdev, tp-&gt;pcie_readrq);</div><div class='del'>-</div><div class='ctx'> 		/* Clear error status */</div><div class='ctx'> 		pci_write_config_word(tp-&gt;pdev,</div><div class='ctx'> 				      pci_pcie_cap(tp-&gt;pdev) + PCI_EXP_DEVSTA,</div><div class='hunk'>@@ -7914,6 +7891,11 @@ static int tg3_chip_reset(struct tg3 *tp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct rtnl_link_stats64 *tg3_get_stats64(struct net_device *,</div><div class='add'>+						 struct rtnl_link_stats64 *);</div><div class='add'>+static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *,</div><div class='add'>+						struct tg3_ethtool_stats *);</div><div class='add'>+</div><div class='ctx'> /* tp-&gt;lock is held. */</div><div class='ctx'> static int tg3_halt(struct tg3 *tp, int kind, int silent)</div><div class='ctx'> {</div><div class='hunk'>@@ -7931,6 +7913,15 @@ static int tg3_halt(struct tg3 *tp, int kind, int silent)</div><div class='ctx'> 	tg3_write_sig_legacy(tp, kind);</div><div class='ctx'> 	tg3_write_sig_post_reset(tp, kind);</div><div class='ctx'> </div><div class='add'>+	if (tp-&gt;hw_stats) {</div><div class='add'>+		/* Save the stats across chip resets... */</div><div class='add'>+		tg3_get_stats64(tp-&gt;dev, &amp;tp-&gt;net_stats_prev),</div><div class='add'>+		tg3_get_estats(tp, &amp;tp-&gt;estats_prev);</div><div class='add'>+</div><div class='add'>+		/* And make sure the next sample is new data */</div><div class='add'>+		memset(tp-&gt;hw_stats, 0, sizeof(struct tg3_hw_stats));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -8074,7 +8065,7 @@ static void tg3_rings_reset(struct tg3 *tp)</div><div class='ctx'> 		limit = NIC_SRAM_SEND_RCB + TG3_BDINFO_SIZE * 16;</div><div class='ctx'> 	else if (tg3_flag(tp, 5717_PLUS))</div><div class='ctx'> 		limit = NIC_SRAM_SEND_RCB + TG3_BDINFO_SIZE * 4;</div><div class='del'>-	else if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57765)</div><div class='add'>+	else if (tg3_flag(tp, 57765_CLASS))</div><div class='ctx'> 		limit = NIC_SRAM_SEND_RCB + TG3_BDINFO_SIZE * 2;</div><div class='ctx'> 	else</div><div class='ctx'> 		limit = NIC_SRAM_SEND_RCB + TG3_BDINFO_SIZE;</div><div class='hunk'>@@ -8091,7 +8082,7 @@ static void tg3_rings_reset(struct tg3 *tp)</div><div class='ctx'> 	else if (!tg3_flag(tp, 5705_PLUS))</div><div class='ctx'> 		limit = NIC_SRAM_RCV_RET_RCB + TG3_BDINFO_SIZE * 16;</div><div class='ctx'> 	else if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5755 ||</div><div class='del'>-		 GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57765)</div><div class='add'>+		 tg3_flag(tp, 57765_CLASS))</div><div class='ctx'> 		limit = NIC_SRAM_RCV_RET_RCB + TG3_BDINFO_SIZE * 4;</div><div class='ctx'> 	else</div><div class='ctx'> 		limit = NIC_SRAM_RCV_RET_RCB + TG3_BDINFO_SIZE;</div><div class='hunk'>@@ -8197,7 +8188,8 @@ static void tg3_setup_rxbd_thresholds(struct tg3 *tp)</div><div class='ctx'> 	if (!tg3_flag(tp, 5750_PLUS) ||</div><div class='ctx'> 	    tg3_flag(tp, 5780_CLASS) ||</div><div class='ctx'> 	    GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5750 ||</div><div class='del'>-	    GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5752)</div><div class='add'>+	    GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5752 ||</div><div class='add'>+	    tg3_flag(tp, 57765_PLUS))</div><div class='ctx'> 		bdcache_maxcnt = TG3_SRAM_RX_STD_BDCACHE_SIZE_5700;</div><div class='ctx'> 	else if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5755 ||</div><div class='ctx'> 		 GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5787)</div><div class='hunk'>@@ -8217,10 +8209,7 @@ static void tg3_setup_rxbd_thresholds(struct tg3 *tp)</div><div class='ctx'> 	if (!tg3_flag(tp, JUMBO_CAPABLE) || tg3_flag(tp, 5780_CLASS))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!tg3_flag(tp, 5705_PLUS))</div><div class='del'>-		bdcache_maxcnt = TG3_SRAM_RX_JMB_BDCACHE_SIZE_5700;</div><div class='del'>-	else</div><div class='del'>-		bdcache_maxcnt = TG3_SRAM_RX_JMB_BDCACHE_SIZE_5717;</div><div class='add'>+	bdcache_maxcnt = TG3_SRAM_RX_JMB_BDCACHE_SIZE_5700;</div><div class='ctx'> </div><div class='ctx'> 	host_rep_thresh = max_t(u32, tp-&gt;rx_jumbo_pending / 8, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -8231,6 +8220,54 @@ static void tg3_setup_rxbd_thresholds(struct tg3 *tp)</div><div class='ctx'> 		tw32(JMB_REPLENISH_LWM, bdcache_maxcnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void tg3_rss_init_dflt_indir_tbl(struct tg3 *tp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TG3_RSS_INDIR_TBL_SIZE; i++)</div><div class='add'>+		tp-&gt;rss_ind_tbl[i] =</div><div class='add'>+			ethtool_rxfh_indir_default(i, tp-&gt;irq_cnt - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tg3_rss_check_indir_tbl(struct tg3 *tp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!tg3_flag(tp, SUPPORT_MSIX))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (tp-&gt;irq_cnt &lt;= 2) {</div><div class='add'>+		memset(&amp;tp-&gt;rss_ind_tbl[0], 0, sizeof(tp-&gt;rss_ind_tbl));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Validate table against current IRQ count */</div><div class='add'>+	for (i = 0; i &lt; TG3_RSS_INDIR_TBL_SIZE; i++) {</div><div class='add'>+		if (tp-&gt;rss_ind_tbl[i] &gt;= tp-&gt;irq_cnt - 1)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i != TG3_RSS_INDIR_TBL_SIZE)</div><div class='add'>+		tg3_rss_init_dflt_indir_tbl(tp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tg3_rss_write_indir_tbl(struct tg3 *tp)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+	u32 reg = MAC_RSS_INDIR_TBL_0;</div><div class='add'>+</div><div class='add'>+	while (i &lt; TG3_RSS_INDIR_TBL_SIZE) {</div><div class='add'>+		u32 val = tp-&gt;rss_ind_tbl[i];</div><div class='add'>+		i++;</div><div class='add'>+		for (; i % 8; i++) {</div><div class='add'>+			val &lt;&lt;= 4;</div><div class='add'>+			val |= tp-&gt;rss_ind_tbl[i];</div><div class='add'>+		}</div><div class='add'>+		tw32(reg, val);</div><div class='add'>+		reg += 4;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* tp-&gt;lock is held. */</div><div class='ctx'> static int tg3_reset_hw(struct tg3 *tp, int reset_phy)</div><div class='ctx'> {</div><div class='hunk'>@@ -8337,7 +8374,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)</div><div class='ctx'> 		tw32(GRC_MODE, grc_mode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57765) {</div><div class='add'>+	if (tg3_flag(tp, 57765_CLASS)) {</div><div class='ctx'> 		if (tp-&gt;pci_chip_rev_id == CHIPREV_ID_57765_A0) {</div><div class='ctx'> 			u32 grc_mode = tr32(GRC_MODE);</div><div class='ctx'> </div><div class='hunk'>@@ -8425,7 +8462,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)</div><div class='ctx'> 		      ~DMA_RWCTRL_DIS_CACHE_ALIGNMENT;</div><div class='ctx'> 		if (tp-&gt;pci_chip_rev_id == CHIPREV_ID_57765_A0)</div><div class='ctx'> 			val &amp;= ~DMA_RWCTRL_CRDRDR_RDMA_MRRS_MSK;</div><div class='del'>-		if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) != ASIC_REV_57765 &amp;&amp;</div><div class='add'>+		if (!tg3_flag(tp, 57765_CLASS) &amp;&amp;</div><div class='ctx'> 		    GET_ASIC_REV(tp-&gt;pci_chip_rev_id) != ASIC_REV_5717)</div><div class='ctx'> 			val |= DMA_RWCTRL_TAGGED_STAT_WA;</div><div class='ctx'> 		tw32(TG3PCI_DMA_RW_CTRL, val | tp-&gt;dma_rwctrl);</div><div class='hunk'>@@ -8572,7 +8609,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)</div><div class='ctx'> 			tw32(RCVDBDI_JUMBO_BD + TG3_BDINFO_MAXLEN_FLAGS,</div><div class='ctx'> 			     val | BDINFO_FLAGS_USE_EXT_RECV);</div><div class='ctx'> 			if (!tg3_flag(tp, USE_JUMBO_BDFLAG) ||</div><div class='del'>-			    GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57765)</div><div class='add'>+			    tg3_flag(tp, 57765_CLASS))</div><div class='ctx'> 				tw32(RCVDBDI_JUMBO_BD + TG3_BDINFO_NIC_ADDR,</div><div class='ctx'> 				     NIC_SRAM_RX_JUMBO_BUFFER_DESC);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -8581,10 +8618,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (tg3_flag(tp, 57765_PLUS)) {</div><div class='del'>-			if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57765)</div><div class='del'>-				val = TG3_RX_STD_MAX_SIZE_5700;</div><div class='del'>-			else</div><div class='del'>-				val = TG3_RX_STD_MAX_SIZE_5717;</div><div class='add'>+			val = TG3_RX_STD_RING_SIZE(tp);</div><div class='ctx'> 			val &lt;&lt;= BDINFO_FLAGS_MAXLEN_SHIFT;</div><div class='ctx'> 			val |= (TG3_RX_STD_DMA_SZ &lt;&lt; 2);</div><div class='ctx'> 		} else</div><div class='hunk'>@@ -8661,6 +8695,9 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)</div><div class='ctx'> 	if (tg3_flag(tp, PCI_EXPRESS))</div><div class='ctx'> 		rdmac_mode |= RDMAC_MODE_FIFO_LONG_BURST;</div><div class='ctx'> </div><div class='add'>+	if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57766)</div><div class='add'>+		rdmac_mode |= RDMAC_MODE_JMB_2K_MMRR;</div><div class='add'>+</div><div class='ctx'> 	if (tg3_flag(tp, HW_TSO_1) ||</div><div class='ctx'> 	    tg3_flag(tp, HW_TSO_2) ||</div><div class='ctx'> 	    tg3_flag(tp, HW_TSO_3))</div><div class='hunk'>@@ -8809,9 +8846,11 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)</div><div class='ctx'> 	tw32_f(GRC_LOCAL_CTRL, tp-&gt;grc_local_ctrl);</div><div class='ctx'> 	udelay(100);</div><div class='ctx'> </div><div class='del'>-	if (tg3_flag(tp, USING_MSIX) &amp;&amp; tp-&gt;irq_cnt &gt; 1) {</div><div class='add'>+	if (tg3_flag(tp, USING_MSIX)) {</div><div class='ctx'> 		val = tr32(MSGINT_MODE);</div><div class='del'>-		val |= MSGINT_MODE_MULTIVEC_EN | MSGINT_MODE_ENABLE;</div><div class='add'>+		val |= MSGINT_MODE_ENABLE;</div><div class='add'>+		if (tp-&gt;irq_cnt &gt; 1)</div><div class='add'>+			val |= MSGINT_MODE_MULTIVEC_EN;</div><div class='ctx'> 		if (!tg3_flag(tp, 1SHOT_MSI))</div><div class='ctx'> 			val |= MSGINT_MODE_ONE_SHOT_DISABLE;</div><div class='ctx'> 		tw32(MSGINT_MODE, val);</div><div class='hunk'>@@ -8924,28 +8963,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)</div><div class='ctx'> 	udelay(100);</div><div class='ctx'> </div><div class='ctx'> 	if (tg3_flag(tp, ENABLE_RSS)) {</div><div class='del'>-		int i = 0;</div><div class='del'>-		u32 reg = MAC_RSS_INDIR_TBL_0;</div><div class='del'>-</div><div class='del'>-		if (tp-&gt;irq_cnt == 2) {</div><div class='del'>-			for (i = 0; i &lt; TG3_RSS_INDIR_TBL_SIZE; i += 8) {</div><div class='del'>-				tw32(reg, 0x0);</div><div class='del'>-				reg += 4;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			u32 val;</div><div class='del'>-</div><div class='del'>-			while (i &lt; TG3_RSS_INDIR_TBL_SIZE) {</div><div class='del'>-				val = i % (tp-&gt;irq_cnt - 1);</div><div class='del'>-				i++;</div><div class='del'>-				for (; i % 8; i++) {</div><div class='del'>-					val &lt;&lt;= 4;</div><div class='del'>-					val |= (i % (tp-&gt;irq_cnt - 1));</div><div class='del'>-				}</div><div class='del'>-				tw32(reg, val);</div><div class='del'>-				reg += 4;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		tg3_rss_write_indir_tbl(tp);</div><div class='ctx'> </div><div class='ctx'> 		/* Setup the "secret" hash key. */</div><div class='ctx'> 		tw32(MAC_RSS_HASH_KEY_0, 0x5f865437);</div><div class='hunk'>@@ -9002,7 +9020,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)</div><div class='ctx'> 	/* Prevent chip from dropping frames when flow control</div><div class='ctx'> 	 * is enabled.</div><div class='ctx'> 	 */</div><div class='del'>-	if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57765)</div><div class='add'>+	if (tg3_flag(tp, 57765_CLASS))</div><div class='ctx'> 		val = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		val = 2;</div><div class='hunk'>@@ -9217,7 +9235,7 @@ static void tg3_timer(unsigned long __opaque)</div><div class='ctx'> 	spin_lock(&amp;tp-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5717 ||</div><div class='del'>-	    GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57765)</div><div class='add'>+	    tg3_flag(tp, 57765_CLASS))</div><div class='ctx'> 		tg3_chk_missed_msi(tp);</div><div class='ctx'> </div><div class='ctx'> 	if (!tg3_flag(tp, TAGGED_STATUS)) {</div><div class='hunk'>@@ -9532,19 +9550,18 @@ static int tg3_request_firmware(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> static bool tg3_enable_msix(struct tg3 *tp)</div><div class='ctx'> {</div><div class='del'>-	int i, rc, cpus = num_online_cpus();</div><div class='add'>+	int i, rc;</div><div class='ctx'> 	struct msix_entry msix_ent[tp-&gt;irq_max];</div><div class='ctx'> </div><div class='del'>-	if (cpus == 1)</div><div class='del'>-		/* Just fallback to the simpler MSI mode. */</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We want as many rx rings enabled as there are cpus.</div><div class='del'>-	 * The first MSIX vector only deals with link interrupts, etc,</div><div class='del'>-	 * so we add one to the number of vectors we are requesting.</div><div class='del'>-	 */</div><div class='del'>-	tp-&gt;irq_cnt = min_t(unsigned, cpus + 1, tp-&gt;irq_max);</div><div class='add'>+	tp-&gt;irq_cnt = num_online_cpus();</div><div class='add'>+	if (tp-&gt;irq_cnt &gt; 1) {</div><div class='add'>+		/* We want as many rx rings enabled as there are cpus.</div><div class='add'>+		 * In multiqueue MSI-X mode, the first MSI-X vector</div><div class='add'>+		 * only deals with link interrupts, etc, so we add</div><div class='add'>+		 * one to the number of vectors we are requesting.</div><div class='add'>+		 */</div><div class='add'>+		tp-&gt;irq_cnt = min_t(unsigned, tp-&gt;irq_cnt + 1, tp-&gt;irq_max);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; tp-&gt;irq_max; i++) {</div><div class='ctx'> 		msix_ent[i].entry  = i;</div><div class='hunk'>@@ -9669,6 +9686,8 @@ static int tg3_open(struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	tg3_ints_init(tp);</div><div class='ctx'> </div><div class='add'>+	tg3_rss_check_indir_tbl(tp);</div><div class='add'>+</div><div class='ctx'> 	/* The placement of this call is tied</div><div class='ctx'> 	 * to the setup and use of Host TX descriptors.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -9700,8 +9719,8 @@ static int tg3_open(struct net_device *dev)</div><div class='ctx'> 		tg3_free_rings(tp);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (tg3_flag(tp, TAGGED_STATUS) &amp;&amp;</div><div class='del'>-			GET_ASIC_REV(tp-&gt;pci_chip_rev_id) != ASIC_REV_5717 &amp;&amp;</div><div class='del'>-			GET_ASIC_REV(tp-&gt;pci_chip_rev_id) != ASIC_REV_57765)</div><div class='add'>+		    GET_ASIC_REV(tp-&gt;pci_chip_rev_id) != ASIC_REV_5717 &amp;&amp;</div><div class='add'>+		    !tg3_flag(tp, 57765_CLASS))</div><div class='ctx'> 			tp-&gt;timer_offset = HZ;</div><div class='ctx'> 		else</div><div class='ctx'> 			tp-&gt;timer_offset = HZ / 10;</div><div class='hunk'>@@ -9782,10 +9801,6 @@ err_out1:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct rtnl_link_stats64 *tg3_get_stats64(struct net_device *,</div><div class='del'>-						 struct rtnl_link_stats64 *);</div><div class='del'>-static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *);</div><div class='del'>-</div><div class='ctx'> static int tg3_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -9817,10 +9832,9 @@ static int tg3_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	tg3_ints_fini(tp);</div><div class='ctx'> </div><div class='del'>-	tg3_get_stats64(tp-&gt;dev, &amp;tp-&gt;net_stats_prev);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;tp-&gt;estats_prev, tg3_get_estats(tp),</div><div class='del'>-	       sizeof(tp-&gt;estats_prev));</div><div class='add'>+	/* Clear stats across close / open calls */</div><div class='add'>+	memset(&amp;tp-&gt;net_stats_prev, 0, sizeof(tp-&gt;net_stats_prev));</div><div class='add'>+	memset(&amp;tp-&gt;estats_prev, 0, sizeof(tp-&gt;estats_prev));</div><div class='ctx'> </div><div class='ctx'> 	tg3_napi_fini(tp);</div><div class='ctx'> </div><div class='hunk'>@@ -9868,9 +9882,9 @@ static u64 calc_crc_errors(struct tg3 *tp)</div><div class='ctx'> 	estats-&gt;member =	old_estats-&gt;member + \</div><div class='ctx'> 				get_stat64(&amp;hw_stats-&gt;member)</div><div class='ctx'> </div><div class='del'>-static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *tp)</div><div class='add'>+static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *tp,</div><div class='add'>+					       struct tg3_ethtool_stats *estats)</div><div class='ctx'> {</div><div class='del'>-	struct tg3_ethtool_stats *estats = &amp;tp-&gt;estats;</div><div class='ctx'> 	struct tg3_ethtool_stats *old_estats = &amp;tp-&gt;estats_prev;</div><div class='ctx'> 	struct tg3_hw_stats *hw_stats = tp-&gt;hw_stats;</div><div class='ctx'> </div><div class='hunk'>@@ -10318,12 +10332,20 @@ static int tg3_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> 			cmd-&gt;advertising |= ADVERTISED_Asym_Pause;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (netif_running(dev)) {</div><div class='add'>+	if (netif_running(dev) &amp;&amp; netif_carrier_ok(dev)) {</div><div class='ctx'> 		ethtool_cmd_speed_set(cmd, tp-&gt;link_config.active_speed);</div><div class='ctx'> 		cmd-&gt;duplex = tp-&gt;link_config.active_duplex;</div><div class='add'>+		cmd-&gt;lp_advertising = tp-&gt;link_config.rmt_adv;</div><div class='add'>+		if (!(tp-&gt;phy_flags &amp; TG3_PHYFLG_ANY_SERDES)) {</div><div class='add'>+			if (tp-&gt;phy_flags &amp; TG3_PHYFLG_MDIX_STATE)</div><div class='add'>+				cmd-&gt;eth_tp_mdix = ETH_TP_MDI_X;</div><div class='add'>+			else</div><div class='add'>+				cmd-&gt;eth_tp_mdix = ETH_TP_MDI;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ethtool_cmd_speed_set(cmd, SPEED_INVALID);</div><div class='ctx'> 		cmd-&gt;duplex = DUPLEX_INVALID;</div><div class='add'>+		cmd-&gt;eth_tp_mdix = ETH_TP_MDI_INVALID;</div><div class='ctx'> 	}</div><div class='ctx'> 	cmd-&gt;phy_address = tp-&gt;phy_addr;</div><div class='ctx'> 	cmd-&gt;transceiver = XCVR_INTERNAL;</div><div class='hunk'>@@ -10428,10 +10450,10 @@ static void tg3_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_MODULE_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_MODULE_VERSION);</div><div class='del'>-	strcpy(info-&gt;fw_version, tp-&gt;fw_ver);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(tp-&gt;pdev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_MODULE_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;fw_version, tp-&gt;fw_ver, sizeof(info-&gt;fw_version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(tp-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tg3_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='hunk'>@@ -10590,12 +10612,12 @@ static void tg3_get_pauseparam(struct net_device *dev, struct ethtool_pauseparam</div><div class='ctx'> </div><div class='ctx'> 	epause-&gt;autoneg = !!tg3_flag(tp, PAUSE_AUTONEG);</div><div class='ctx'> </div><div class='del'>-	if (tp-&gt;link_config.active_flowctrl &amp; FLOW_CTRL_RX)</div><div class='add'>+	if (tp-&gt;link_config.flowctrl &amp; FLOW_CTRL_RX)</div><div class='ctx'> 		epause-&gt;rx_pause = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		epause-&gt;rx_pause = 0;</div><div class='ctx'> </div><div class='del'>-	if (tp-&gt;link_config.active_flowctrl &amp; FLOW_CTRL_TX)</div><div class='add'>+	if (tp-&gt;link_config.flowctrl &amp; FLOW_CTRL_TX)</div><div class='ctx'> 		epause-&gt;tx_pause = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		epause-&gt;tx_pause = 0;</div><div class='hunk'>@@ -10715,6 +10737,78 @@ static int tg3_get_sset_count(struct net_device *dev, int sset)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int tg3_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,</div><div class='add'>+			 u32 *rules __always_unused)</div><div class='add'>+{</div><div class='add'>+	struct tg3 *tp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (!tg3_flag(tp, SUPPORT_MSIX))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (info-&gt;cmd) {</div><div class='add'>+	case ETHTOOL_GRXRINGS:</div><div class='add'>+		if (netif_running(tp-&gt;dev))</div><div class='add'>+			info-&gt;data = tp-&gt;irq_cnt;</div><div class='add'>+		else {</div><div class='add'>+			info-&gt;data = num_online_cpus();</div><div class='add'>+			if (info-&gt;data &gt; TG3_IRQ_MAX_VECS_RSS)</div><div class='add'>+				info-&gt;data = TG3_IRQ_MAX_VECS_RSS;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* The first interrupt vector only</div><div class='add'>+		 * handles link interrupts.</div><div class='add'>+		 */</div><div class='add'>+		info-&gt;data -= 1;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 tg3_get_rxfh_indir_size(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	u32 size = 0;</div><div class='add'>+	struct tg3 *tp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (tg3_flag(tp, SUPPORT_MSIX))</div><div class='add'>+		size = TG3_RSS_INDIR_TBL_SIZE;</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tg3_get_rxfh_indir(struct net_device *dev, u32 *indir)</div><div class='add'>+{</div><div class='add'>+	struct tg3 *tp = netdev_priv(dev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TG3_RSS_INDIR_TBL_SIZE; i++)</div><div class='add'>+		indir[i] = tp-&gt;rss_ind_tbl[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 tg3_set_rxfh_indir(struct net_device *dev, const u32 *indir)</div><div class='add'>+{</div><div class='add'>+	struct tg3 *tp = netdev_priv(dev);</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TG3_RSS_INDIR_TBL_SIZE; i++)</div><div class='add'>+		tp-&gt;rss_ind_tbl[i] = indir[i];</div><div class='add'>+</div><div class='add'>+	if (!netif_running(dev) || !tg3_flag(tp, ENABLE_RSS))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* It is legal to write the indirection</div><div class='add'>+	 * table while the device is running.</div><div class='add'>+	 */</div><div class='add'>+	tg3_full_lock(tp, 0);</div><div class='add'>+	tg3_rss_write_indir_tbl(tp);</div><div class='add'>+	tg3_full_unlock(tp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void tg3_get_strings(struct net_device *dev, u32 stringset, u8 *buf)</div><div class='ctx'> {</div><div class='ctx'> 	switch (stringset) {</div><div class='hunk'>@@ -10769,7 +10863,8 @@ static void tg3_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'> 				   struct ethtool_stats *estats, u64 *tmp_stats)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='del'>-	memcpy(tmp_stats, tg3_get_estats(tp), sizeof(tp-&gt;estats));</div><div class='add'>+</div><div class='add'>+	tg3_get_estats(tp, (struct tg3_ethtool_stats *)tmp_stats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __be32 *tg3_vpd_readblock(struct tg3 *tp, u32 *vpdlen)</div><div class='hunk'>@@ -11352,7 +11447,7 @@ static int tg3_test_memory(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> 	if (tg3_flag(tp, 5717_PLUS))</div><div class='ctx'> 		mem_tbl = mem_tbl_5717;</div><div class='del'>-	else if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57765)</div><div class='add'>+	else if (tg3_flag(tp, 57765_CLASS))</div><div class='ctx'> 		mem_tbl = mem_tbl_57765;</div><div class='ctx'> 	else if (tg3_flag(tp, 5755_PLUS))</div><div class='ctx'> 		mem_tbl = mem_tbl_5755;</div><div class='hunk'>@@ -11400,8 +11495,8 @@ static int tg3_run_loopback(struct tg3 *tp, u32 pktsz, bool tso_loopback)</div><div class='ctx'> 	u32 rx_start_idx, rx_idx, tx_idx, opaque_key;</div><div class='ctx'> 	u32 base_flags = 0, mss = 0, desc_idx, coal_now, data_off, val;</div><div class='ctx'> 	u32 budget;</div><div class='del'>-	struct sk_buff *skb, *rx_skb;</div><div class='del'>-	u8 *tx_data;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 *tx_data, *rx_data;</div><div class='ctx'> 	dma_addr_t map;</div><div class='ctx'> 	int num_pkts, tx_len, rx_len, i, err;</div><div class='ctx'> 	struct tg3_rx_buffer_desc *desc;</div><div class='hunk'>@@ -11569,11 +11664,11 @@ static int tg3_run_loopback(struct tg3 *tp, u32 pktsz, bool tso_loopback)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (opaque_key == RXD_OPAQUE_RING_STD) {</div><div class='del'>-			rx_skb = tpr-&gt;rx_std_buffers[desc_idx].skb;</div><div class='add'>+			rx_data = tpr-&gt;rx_std_buffers[desc_idx].data;</div><div class='ctx'> 			map = dma_unmap_addr(&amp;tpr-&gt;rx_std_buffers[desc_idx],</div><div class='ctx'> 					     mapping);</div><div class='ctx'> 		} else if (opaque_key == RXD_OPAQUE_RING_JUMBO) {</div><div class='del'>-			rx_skb = tpr-&gt;rx_jmb_buffers[desc_idx].skb;</div><div class='add'>+			rx_data = tpr-&gt;rx_jmb_buffers[desc_idx].data;</div><div class='ctx'> 			map = dma_unmap_addr(&amp;tpr-&gt;rx_jmb_buffers[desc_idx],</div><div class='ctx'> 					     mapping);</div><div class='ctx'> 		} else</div><div class='hunk'>@@ -11582,15 +11677,16 @@ static int tg3_run_loopback(struct tg3 *tp, u32 pktsz, bool tso_loopback)</div><div class='ctx'> 		pci_dma_sync_single_for_cpu(tp-&gt;pdev, map, rx_len,</div><div class='ctx'> 					    PCI_DMA_FROMDEVICE);</div><div class='ctx'> </div><div class='add'>+		rx_data += TG3_RX_OFFSET(tp);</div><div class='ctx'> 		for (i = data_off; i &lt; rx_len; i++, val++) {</div><div class='del'>-			if (*(rx_skb-&gt;data + i) != (u8) (val &amp; 0xff))</div><div class='add'>+			if (*(rx_data + i) != (u8) (val &amp; 0xff))</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='del'>-	/* tg3_free_rings will unmap and free the rx_skb */</div><div class='add'>+	/* tg3_free_rings will unmap and free the rx_data */</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -11943,6 +12039,10 @@ static const struct ethtool_ops tg3_ethtool_ops = {</div><div class='ctx'> 	.get_coalesce		= tg3_get_coalesce,</div><div class='ctx'> 	.set_coalesce		= tg3_set_coalesce,</div><div class='ctx'> 	.get_sset_count		= tg3_get_sset_count,</div><div class='add'>+	.get_rxnfc		= tg3_get_rxnfc,</div><div class='add'>+	.get_rxfh_indir_size    = tg3_get_rxfh_indir_size,</div><div class='add'>+	.get_rxfh_indir		= tg3_get_rxfh_indir,</div><div class='add'>+	.set_rxfh_indir		= tg3_set_rxfh_indir,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __devinit tg3_get_eeprom_size(struct tg3 *tp)</div><div class='hunk'>@@ -12612,7 +12712,7 @@ static void __devinit tg3_nvram_init(struct tg3 *tp)</div><div class='ctx'> 		else if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5906)</div><div class='ctx'> 			tg3_get_5906_nvram_info(tp);</div><div class='ctx'> 		else if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57780 ||</div><div class='del'>-			 GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57765)</div><div class='add'>+			 tg3_flag(tp, 57765_CLASS))</div><div class='ctx'> 			tg3_get_57780_nvram_info(tp);</div><div class='ctx'> 		else if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5717 ||</div><div class='ctx'> 			 GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5719)</div><div class='hunk'>@@ -13218,8 +13318,7 @@ static u32 __devinit tg3_read_otp_phycfg(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> static void __devinit tg3_phy_init_link_config(struct tg3 *tp)</div><div class='ctx'> {</div><div class='del'>-	u32 adv = ADVERTISED_Autoneg |</div><div class='del'>-		  ADVERTISED_Pause;</div><div class='add'>+	u32 adv = ADVERTISED_Autoneg;</div><div class='ctx'> </div><div class='ctx'> 	if (!(tp-&gt;phy_flags &amp; TG3_PHYFLG_10_100_ONLY))</div><div class='ctx'> 		adv |= ADVERTISED_1000baseT_Half |</div><div class='hunk'>@@ -13322,7 +13421,7 @@ static int __devinit tg3_phy_probe(struct tg3 *tp)</div><div class='ctx'> 	if (!(tp-&gt;phy_flags &amp; TG3_PHYFLG_ANY_SERDES) &amp;&amp;</div><div class='ctx'> 	    !tg3_flag(tp, ENABLE_APE) &amp;&amp;</div><div class='ctx'> 	    !tg3_flag(tp, ENABLE_ASF)) {</div><div class='del'>-		u32 bmsr, mask;</div><div class='add'>+		u32 bmsr, dummy;</div><div class='ctx'> </div><div class='ctx'> 		tg3_readphy(tp, MII_BMSR, &amp;bmsr);</div><div class='ctx'> 		if (!tg3_readphy(tp, MII_BMSR, &amp;bmsr) &amp;&amp;</div><div class='hunk'>@@ -13335,10 +13434,7 @@ static int __devinit tg3_phy_probe(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> 		tg3_phy_set_wirespeed(tp);</div><div class='ctx'> </div><div class='del'>-		mask = (ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |</div><div class='del'>-			ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full |</div><div class='del'>-			ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full);</div><div class='del'>-		if (!tg3_copper_is_advertising_all(tp, mask)) {</div><div class='add'>+		if (!tg3_phy_copper_an_config_ok(tp, &amp;dummy)) {</div><div class='ctx'> 			tg3_phy_autoneg_cfg(tp, tp-&gt;link_config.advertising,</div><div class='ctx'> 					    tp-&gt;link_config.flowctrl);</div><div class='ctx'> </div><div class='hunk'>@@ -13460,6 +13556,17 @@ out_no_vpd:</div><div class='ctx'> 			strcpy(tp-&gt;board_part_number, "BCM57795");</div><div class='ctx'> 		else</div><div class='ctx'> 			goto nomatch;</div><div class='add'>+	} else if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57766) {</div><div class='add'>+		if (tp-&gt;pdev-&gt;device == TG3PCI_DEVICE_TIGON3_57762)</div><div class='add'>+			strcpy(tp-&gt;board_part_number, "BCM57762");</div><div class='add'>+		else if (tp-&gt;pdev-&gt;device == TG3PCI_DEVICE_TIGON3_57766)</div><div class='add'>+			strcpy(tp-&gt;board_part_number, "BCM57766");</div><div class='add'>+		else if (tp-&gt;pdev-&gt;device == TG3PCI_DEVICE_TIGON3_57782)</div><div class='add'>+			strcpy(tp-&gt;board_part_number, "BCM57782");</div><div class='add'>+		else if (tp-&gt;pdev-&gt;device == TG3PCI_DEVICE_TIGON3_57786)</div><div class='add'>+			strcpy(tp-&gt;board_part_number, "BCM57786");</div><div class='add'>+		else</div><div class='add'>+			goto nomatch;</div><div class='ctx'> 	} else if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5906) {</div><div class='ctx'> 		strcpy(tp-&gt;board_part_number, "BCM95906");</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -13798,7 +13905,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)</div><div class='ctx'> 			 tp-&gt;pdev-&gt;device == TG3PCI_DEVICE_TIGON3_57761 ||</div><div class='ctx'> 			 tp-&gt;pdev-&gt;device == TG3PCI_DEVICE_TIGON3_57765 ||</div><div class='ctx'> 			 tp-&gt;pdev-&gt;device == TG3PCI_DEVICE_TIGON3_57791 ||</div><div class='del'>-			 tp-&gt;pdev-&gt;device == TG3PCI_DEVICE_TIGON3_57795)</div><div class='add'>+			 tp-&gt;pdev-&gt;device == TG3PCI_DEVICE_TIGON3_57795 ||</div><div class='add'>+			 tp-&gt;pdev-&gt;device == TG3PCI_DEVICE_TIGON3_57762 ||</div><div class='add'>+			 tp-&gt;pdev-&gt;device == TG3PCI_DEVICE_TIGON3_57766 ||</div><div class='add'>+			 tp-&gt;pdev-&gt;device == TG3PCI_DEVICE_TIGON3_57782 ||</div><div class='add'>+			 tp-&gt;pdev-&gt;device == TG3PCI_DEVICE_TIGON3_57786)</div><div class='ctx'> 			pci_read_config_dword(tp-&gt;pdev,</div><div class='ctx'> 					      TG3PCI_GEN15_PRODID_ASICREV,</div><div class='ctx'> 					      &amp;prod_id_asic_rev);</div><div class='hunk'>@@ -13945,7 +14056,10 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)</div><div class='ctx'> 		tg3_flag_set(tp, 5717_PLUS);</div><div class='ctx'> </div><div class='ctx'> 	if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57765 ||</div><div class='del'>-	    tg3_flag(tp, 5717_PLUS))</div><div class='add'>+	    GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57766)</div><div class='add'>+		tg3_flag_set(tp, 57765_CLASS);</div><div class='add'>+</div><div class='add'>+	if (tg3_flag(tp, 57765_CLASS) || tg3_flag(tp, 5717_PLUS))</div><div class='ctx'> 		tg3_flag_set(tp, 57765_PLUS);</div><div class='ctx'> </div><div class='ctx'> 	/* Intentionally exclude ASIC_REV_5906 */</div><div class='hunk'>@@ -13997,9 +14111,13 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)</div><div class='ctx'> 	if (tg3_flag(tp, HW_TSO_1) ||</div><div class='ctx'> 	    tg3_flag(tp, HW_TSO_2) ||</div><div class='ctx'> 	    tg3_flag(tp, HW_TSO_3) ||</div><div class='del'>-	    (tp-&gt;fw_needed &amp;&amp; !tg3_flag(tp, ENABLE_ASF)))</div><div class='add'>+	    tp-&gt;fw_needed) {</div><div class='add'>+		/* For firmware TSO, assume ASF is disabled.</div><div class='add'>+		 * We'll disable TSO later if we discover ASF</div><div class='add'>+		 * is enabled in tg3_get_eeprom_hw_cfg().</div><div class='add'>+		 */</div><div class='ctx'> 		tg3_flag_set(tp, TSO_CAPABLE);</div><div class='del'>-	else {</div><div class='add'>+	} else {</div><div class='ctx'> 		tg3_flag_clear(tp, TSO_CAPABLE);</div><div class='ctx'> 		tg3_flag_clear(tp, TSO_BUG);</div><div class='ctx'> 		tp-&gt;fw_needed = NULL;</div><div class='hunk'>@@ -14027,6 +14145,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)</div><div class='ctx'> 		if (tg3_flag(tp, 57765_PLUS)) {</div><div class='ctx'> 			tg3_flag_set(tp, SUPPORT_MSIX);</div><div class='ctx'> 			tp-&gt;irq_max = TG3_IRQ_MAX_VECS;</div><div class='add'>+			tg3_rss_init_dflt_indir_tbl(tp);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -14034,9 +14153,13 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)</div><div class='ctx'> 		tg3_flag_set(tp, SHORT_DMA_BUG);</div><div class='ctx'> </div><div class='ctx'> 	if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5719)</div><div class='del'>-		tg3_flag_set(tp, 4K_FIFO_LIMIT);</div><div class='add'>+		tp-&gt;dma_limit = TG3_TX_BD_DMA_MAX_4K;</div><div class='add'>+	else if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57766)</div><div class='add'>+		tp-&gt;dma_limit = TG3_TX_BD_DMA_MAX_2K;</div><div class='ctx'> </div><div class='del'>-	if (tg3_flag(tp, 5717_PLUS))</div><div class='add'>+	if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5717 ||</div><div class='add'>+	    GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5719 ||</div><div class='add'>+	    GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5720)</div><div class='ctx'> 		tg3_flag_set(tp, LRG_PROD_RING_CAP);</div><div class='ctx'> </div><div class='ctx'> 	if (tg3_flag(tp, 57765_PLUS) &amp;&amp;</div><div class='hunk'>@@ -14056,12 +14179,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> 		tg3_flag_set(tp, PCI_EXPRESS);</div><div class='ctx'> </div><div class='del'>-		tp-&gt;pcie_readrq = 4096;</div><div class='del'>-		if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5719 ||</div><div class='del'>-		    GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5720)</div><div class='del'>-			tp-&gt;pcie_readrq = 2048;</div><div class='del'>-</div><div class='del'>-		pcie_set_readrq(tp-&gt;pdev, tp-&gt;pcie_readrq);</div><div class='add'>+		if (tp-&gt;pci_chip_rev_id == CHIPREV_ID_5719_A0) {</div><div class='add'>+			int readrq = pcie_get_readrq(tp-&gt;pdev);</div><div class='add'>+			if (readrq &gt; 2048)</div><div class='add'>+				pcie_set_readrq(tp-&gt;pdev, 2048);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		pci_read_config_word(tp-&gt;pdev,</div><div class='ctx'> 				     pci_pcie_cap(tp-&gt;pdev) + PCI_EXP_LNKCTL,</div><div class='hunk'>@@ -14273,6 +14395,12 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)</div><div class='ctx'> 	 */</div><div class='ctx'> 	tg3_get_eeprom_hw_cfg(tp);</div><div class='ctx'> </div><div class='add'>+	if (tp-&gt;fw_needed &amp;&amp; tg3_flag(tp, ENABLE_ASF)) {</div><div class='add'>+		tg3_flag_clear(tp, TSO_CAPABLE);</div><div class='add'>+		tg3_flag_clear(tp, TSO_BUG);</div><div class='add'>+		tp-&gt;fw_needed = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (tg3_flag(tp, ENABLE_APE)) {</div><div class='ctx'> 		/* Allow reads and writes to the</div><div class='ctx'> 		 * APE register and memory space.</div><div class='hunk'>@@ -14311,7 +14439,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> 	if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5755 ||</div><div class='ctx'> 	    GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57780 ||</div><div class='del'>-	    GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_57765)</div><div class='add'>+	    tg3_flag(tp, 57765_CLASS))</div><div class='ctx'> 		tp-&gt;grc_local_ctrl |= GRC_LCLCTRL_GPIO_UART_SEL;</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;pdev-&gt;device == PCI_DEVICE_ID_TIGON3_5761 ||</div><div class='hunk'>@@ -14548,11 +14676,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)</div><div class='ctx'> 	else</div><div class='ctx'> 		tg3_flag_clear(tp, POLL_SERDES);</div><div class='ctx'> </div><div class='del'>-	tp-&gt;rx_offset = NET_IP_ALIGN;</div><div class='add'>+	tp-&gt;rx_offset = NET_SKB_PAD + NET_IP_ALIGN;</div><div class='ctx'> 	tp-&gt;rx_copy_thresh = TG3_RX_COPY_THRESHOLD;</div><div class='ctx'> 	if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5701 &amp;&amp;</div><div class='ctx'> 	    tg3_flag(tp, PCIX_MODE)) {</div><div class='del'>-		tp-&gt;rx_offset = 0;</div><div class='add'>+		tp-&gt;rx_offset = NET_SKB_PAD;</div><div class='ctx'> #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS</div><div class='ctx'> 		tp-&gt;rx_copy_thresh = ~(u16)0;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -15313,7 +15441,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	u32 sndmbx, rcvmbx, intmbx;</div><div class='ctx'> 	char str[40];</div><div class='ctx'> 	u64 dma_mask, persist_dma_mask;</div><div class='del'>-	u32 features = 0;</div><div class='add'>+	netdev_features_t features = 0;</div><div class='ctx'> </div><div class='ctx'> 	printk_once(KERN_INFO "%s\n", version);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h<br/>index 94b4bd049a33..aea8f72c24fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/tg3.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/broadcom/tg3.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/broadcom/tg3.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/broadcom/tg3.h</a></div><div class='hunk'>@@ -31,6 +31,8 @@</div><div class='ctx'> #define TG3_RX_RET_MAX_SIZE_5705	512</div><div class='ctx'> #define TG3_RX_RET_MAX_SIZE_5717	4096</div><div class='ctx'> </div><div class='add'>+#define TG3_RSS_INDIR_TBL_SIZE		128</div><div class='add'>+</div><div class='ctx'> /* First 256 bytes are a mirror of PCI config space. */</div><div class='ctx'> #define TG3PCI_VENDOR			0x00000000</div><div class='ctx'> #define  TG3PCI_VENDOR_BROADCOM		 0x14e4</div><div class='hunk'>@@ -57,6 +59,10 @@</div><div class='ctx'> #define  TG3PCI_DEVICE_TIGON3_57795	 0x16b6</div><div class='ctx'> #define  TG3PCI_DEVICE_TIGON3_5719	 0x1657</div><div class='ctx'> #define  TG3PCI_DEVICE_TIGON3_5720	 0x165f</div><div class='add'>+#define  TG3PCI_DEVICE_TIGON3_57762	 0x1682</div><div class='add'>+#define  TG3PCI_DEVICE_TIGON3_57766	 0x1686</div><div class='add'>+#define  TG3PCI_DEVICE_TIGON3_57786	 0x16b3</div><div class='add'>+#define  TG3PCI_DEVICE_TIGON3_57782	 0x16b7</div><div class='ctx'> /* 0x04 --&gt; 0x2c unused */</div><div class='ctx'> #define TG3PCI_SUBVENDOR_ID_BROADCOM		PCI_VENDOR_ID_BROADCOM</div><div class='ctx'> #define TG3PCI_SUBDEVICE_ID_BROADCOM_95700A6	0x1644</div><div class='hunk'>@@ -168,6 +174,7 @@</div><div class='ctx'> #define   ASIC_REV_57765		 0x57785</div><div class='ctx'> #define   ASIC_REV_5719			 0x5719</div><div class='ctx'> #define   ASIC_REV_5720			 0x5720</div><div class='add'>+#define   ASIC_REV_57766		 0x57766</div><div class='ctx'> #define  GET_CHIP_REV(CHIP_REV_ID)	((CHIP_REV_ID) &gt;&gt; 8)</div><div class='ctx'> #define   CHIPREV_5700_AX		 0x70</div><div class='ctx'> #define   CHIPREV_5700_BX		 0x71</div><div class='hunk'>@@ -1340,6 +1347,7 @@</div><div class='ctx'> #define  RDMAC_MODE_MBUF_SBD_CRPT_ENAB	 0x00002000</div><div class='ctx'> #define  RDMAC_MODE_FIFO_SIZE_128	 0x00020000</div><div class='ctx'> #define  RDMAC_MODE_FIFO_LONG_BURST	 0x00030000</div><div class='add'>+#define  RDMAC_MODE_JMB_2K_MMRR		 0x00800000</div><div class='ctx'> #define  RDMAC_MODE_MULT_DMA_RD_DIS	 0x01000000</div><div class='ctx'> #define  RDMAC_MODE_IPV4_LSO_EN		 0x08000000</div><div class='ctx'> #define  RDMAC_MODE_IPV6_LSO_EN		 0x10000000</div><div class='hunk'>@@ -2174,6 +2182,7 @@</div><div class='ctx'> #define  MII_TG3_EXT_CTRL_TBI		0x8000</div><div class='ctx'> </div><div class='ctx'> #define MII_TG3_EXT_STAT		0x11 /* Extended status register */</div><div class='add'>+#define  MII_TG3_EXT_STAT_MDIX		0x2000</div><div class='ctx'> #define  MII_TG3_EXT_STAT_LPASS		0x0100</div><div class='ctx'> </div><div class='ctx'> #define MII_TG3_RXR_COUNTERS		0x14 /* Local/Remote Receiver Counts */</div><div class='hunk'>@@ -2277,6 +2286,9 @@</div><div class='ctx'> #define  MII_TG3_FET_PTEST_FRC_TX_LINK	0x1000</div><div class='ctx'> #define  MII_TG3_FET_PTEST_FRC_TX_LOCK	0x0800</div><div class='ctx'> </div><div class='add'>+#define MII_TG3_FET_GEN_STAT		0x1c</div><div class='add'>+#define  MII_TG3_FET_GEN_STAT_MDIXSTAT	0x2000</div><div class='add'>+</div><div class='ctx'> #define MII_TG3_FET_TEST		0x1f</div><div class='ctx'> #define  MII_TG3_FET_SHADOW_EN		0x0080</div><div class='ctx'> </div><div class='hunk'>@@ -2662,9 +2674,13 @@ struct tg3_hw_stats {</div><div class='ctx'> /* 'mapping' is superfluous as the chip does not write into</div><div class='ctx'>  * the tx/rx post rings so we could just fetch it from there.</div><div class='ctx'>  * But the cache behavior is better how we are doing it now.</div><div class='add'>+ *</div><div class='add'>+ * This driver uses new build_skb() API :</div><div class='add'>+ * RX ring buffer contains pointer to kmalloc() data only,</div><div class='add'>+ * skb are built only after Hardware filled the frame.</div><div class='ctx'>  */</div><div class='ctx'> struct ring_info {</div><div class='del'>-	struct sk_buff			*skb;</div><div class='add'>+	u8				*data;</div><div class='ctx'> 	DEFINE_DMA_UNMAP_ADDR(mapping);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2690,6 +2706,7 @@ struct tg3_link_config {</div><div class='ctx'> #define DUPLEX_INVALID		0xff</div><div class='ctx'> #define AUTONEG_INVALID		0xff</div><div class='ctx'> 	u16				active_speed;</div><div class='add'>+	u32				rmt_adv;</div><div class='ctx'> </div><div class='ctx'> 	/* When we go in and out of low power mode we need</div><div class='ctx'> 	 * to swap with this state.</div><div class='hunk'>@@ -2865,6 +2882,8 @@ enum TG3_FLAGS {</div><div class='ctx'> 	TG3_FLAG_NVRAM_BUFFERED,</div><div class='ctx'> 	TG3_FLAG_SUPPORT_MSI,</div><div class='ctx'> 	TG3_FLAG_SUPPORT_MSIX,</div><div class='add'>+	TG3_FLAG_USING_MSI,</div><div class='add'>+	TG3_FLAG_USING_MSIX,</div><div class='ctx'> 	TG3_FLAG_PCIX_MODE,</div><div class='ctx'> 	TG3_FLAG_PCI_HIGH_SPEED,</div><div class='ctx'> 	TG3_FLAG_PCI_32BIT,</div><div class='hunk'>@@ -2880,7 +2899,6 @@ enum TG3_FLAGS {</div><div class='ctx'> 	TG3_FLAG_CHIP_RESETTING,</div><div class='ctx'> 	TG3_FLAG_INIT_COMPLETE,</div><div class='ctx'> 	TG3_FLAG_TSO_BUG,</div><div class='del'>-	TG3_FLAG_IS_5788,</div><div class='ctx'> 	TG3_FLAG_MAX_RXPEND_64,</div><div class='ctx'> 	TG3_FLAG_TSO_CAPABLE,</div><div class='ctx'> 	TG3_FLAG_PCI_EXPRESS, /* BCM5785 + pci_is_pcie() */</div><div class='hunk'>@@ -2889,14 +2907,9 @@ enum TG3_FLAGS {</div><div class='ctx'> 	TG3_FLAG_IS_NIC,</div><div class='ctx'> 	TG3_FLAG_FLASH,</div><div class='ctx'> 	TG3_FLAG_HW_TSO_1,</div><div class='del'>-	TG3_FLAG_5705_PLUS,</div><div class='del'>-	TG3_FLAG_5750_PLUS,</div><div class='add'>+	TG3_FLAG_HW_TSO_2,</div><div class='ctx'> 	TG3_FLAG_HW_TSO_3,</div><div class='del'>-	TG3_FLAG_USING_MSI,</div><div class='del'>-	TG3_FLAG_USING_MSIX,</div><div class='ctx'> 	TG3_FLAG_ICH_WORKAROUND,</div><div class='del'>-	TG3_FLAG_5780_CLASS,</div><div class='del'>-	TG3_FLAG_HW_TSO_2,</div><div class='ctx'> 	TG3_FLAG_1SHOT_MSI,</div><div class='ctx'> 	TG3_FLAG_NO_FWARE_REPORTED,</div><div class='ctx'> 	TG3_FLAG_NO_NVRAM_ADDR_TRANS,</div><div class='hunk'>@@ -2910,18 +2923,23 @@ enum TG3_FLAGS {</div><div class='ctx'> 	TG3_FLAG_RGMII_EXT_IBND_RX_EN,</div><div class='ctx'> 	TG3_FLAG_RGMII_EXT_IBND_TX_EN,</div><div class='ctx'> 	TG3_FLAG_CLKREQ_BUG,</div><div class='del'>-	TG3_FLAG_5755_PLUS,</div><div class='ctx'> 	TG3_FLAG_NO_NVRAM,</div><div class='ctx'> 	TG3_FLAG_ENABLE_RSS,</div><div class='ctx'> 	TG3_FLAG_ENABLE_TSS,</div><div class='ctx'> 	TG3_FLAG_SHORT_DMA_BUG,</div><div class='ctx'> 	TG3_FLAG_USE_JUMBO_BDFLAG,</div><div class='ctx'> 	TG3_FLAG_L1PLLPD_EN,</div><div class='del'>-	TG3_FLAG_57765_PLUS,</div><div class='ctx'> 	TG3_FLAG_APE_HAS_NCSI,</div><div class='del'>-	TG3_FLAG_5717_PLUS,</div><div class='ctx'> 	TG3_FLAG_4K_FIFO_LIMIT,</div><div class='ctx'> 	TG3_FLAG_RESET_TASK_PENDING,</div><div class='add'>+	TG3_FLAG_5705_PLUS,</div><div class='add'>+	TG3_FLAG_IS_5788,</div><div class='add'>+	TG3_FLAG_5750_PLUS,</div><div class='add'>+	TG3_FLAG_5780_CLASS,</div><div class='add'>+	TG3_FLAG_5755_PLUS,</div><div class='add'>+	TG3_FLAG_57765_PLUS,</div><div class='add'>+	TG3_FLAG_57765_CLASS,</div><div class='add'>+	TG3_FLAG_5717_PLUS,</div><div class='ctx'> </div><div class='ctx'> 	/* Add new flags before this comment and TG3_FLAG_NUMBER_OF_FLAGS */</div><div class='ctx'> 	TG3_FLAG_NUMBER_OF_FLAGS,	/* Last entry in enum TG3_FLAGS */</div><div class='hunk'>@@ -2985,6 +3003,7 @@ struct tg3 {</div><div class='ctx'> 	/* begin "tx thread" cacheline section */</div><div class='ctx'> 	void				(*write32_tx_mbox) (struct tg3 *, u32,</div><div class='ctx'> 							    u32);</div><div class='add'>+	u32				dma_limit;</div><div class='ctx'> </div><div class='ctx'> 	/* begin "rx thread" cacheline section */</div><div class='ctx'> 	struct tg3_napi			napi[TG3_IRQ_MAX_VECS];</div><div class='hunk'>@@ -3005,7 +3024,6 @@ struct tg3 {</div><div class='ctx'> 	unsigned long			rx_dropped;</div><div class='ctx'> 	unsigned long			tx_dropped;</div><div class='ctx'> 	struct rtnl_link_stats64	net_stats_prev;</div><div class='del'>-	struct tg3_ethtool_stats	estats;</div><div class='ctx'> 	struct tg3_ethtool_stats	estats_prev;</div><div class='ctx'> </div><div class='ctx'> 	DECLARE_BITMAP(tg3_flags, TG3_FLAG_NUMBER_OF_FLAGS);</div><div class='hunk'>@@ -3131,10 +3149,12 @@ struct tg3 {</div><div class='ctx'> #define TG3_PHYFLG_SERDES_PREEMPHASIS	0x00010000</div><div class='ctx'> #define TG3_PHYFLG_PARALLEL_DETECT	0x00020000</div><div class='ctx'> #define TG3_PHYFLG_EEE_CAP		0x00040000</div><div class='add'>+#define TG3_PHYFLG_MDIX_STATE		0x00200000</div><div class='ctx'> </div><div class='ctx'> 	u32				led_ctrl;</div><div class='ctx'> 	u32				phy_otp;</div><div class='ctx'> 	u32				setlpicnt;</div><div class='add'>+	u8				rss_ind_tbl[TG3_RSS_INDIR_TBL_SIZE];</div><div class='ctx'> </div><div class='ctx'> #define TG3_BPN_SIZE			24</div><div class='ctx'> 	char				board_part_number[TG3_BPN_SIZE];</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/Makefile b/drivers/net/ethernet/brocade/bna/Makefile<br/>index 74d3abca1960..6027302ae73a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/brocade/bna/Makefile</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_BNA) += bna.o</div><div class='ctx'> </div><div class='del'>-bna-objs := bnad.o bnad_ethtool.o bna_enet.o bna_tx_rx.o</div><div class='add'>+bna-objs := bnad.o bnad_ethtool.o bnad_debugfs.o bna_enet.o bna_tx_rx.o</div><div class='ctx'> bna-objs += bfa_msgq.o bfa_ioc.o bfa_ioc_ct.o bfa_cee.o</div><div class='ctx'> bna-objs += cna_fwimg.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bfa_cee.c b/drivers/net/ethernet/brocade/bna/bfa_cee.c<br/>index 8e627186507c..29f284f79e02 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bfa_cee.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bfa_cee.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bfa_cee.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/brocade/bna/bfa_cee.c</a></div><div class='hunk'>@@ -185,6 +185,41 @@ bfa_nw_cee_mem_claim(struct bfa_cee *cee, u8 *dma_kva, u64 dma_pa)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * bfa_cee_get_attr()</div><div class='add'>+ *</div><div class='add'>+ * @brief	Send the request to the f/w to fetch CEE attributes.</div><div class='add'>+ *</div><div class='add'>+ * @param[in]	Pointer to the CEE module data structure.</div><div class='add'>+ *</div><div class='add'>+ * @return	Status</div><div class='add'>+ */</div><div class='add'>+enum bfa_status</div><div class='add'>+bfa_nw_cee_get_attr(struct bfa_cee *cee, struct bfa_cee_attr *attr,</div><div class='add'>+		    bfa_cee_get_attr_cbfn_t cbfn, void *cbarg)</div><div class='add'>+{</div><div class='add'>+	struct bfi_cee_get_req *cmd;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!((cee != NULL) &amp;&amp; (cee-&gt;ioc != NULL)));</div><div class='add'>+	if (!bfa_nw_ioc_is_operational(cee-&gt;ioc))</div><div class='add'>+		return BFA_STATUS_IOC_FAILURE;</div><div class='add'>+</div><div class='add'>+	if (cee-&gt;get_attr_pending == true)</div><div class='add'>+		return  BFA_STATUS_DEVBUSY;</div><div class='add'>+</div><div class='add'>+	cee-&gt;get_attr_pending = true;</div><div class='add'>+	cmd = (struct bfi_cee_get_req *) cee-&gt;get_cfg_mb.msg;</div><div class='add'>+	cee-&gt;attr = attr;</div><div class='add'>+	cee-&gt;cbfn.get_attr_cbfn = cbfn;</div><div class='add'>+	cee-&gt;cbfn.get_attr_cbarg = cbarg;</div><div class='add'>+	bfi_h2i_set(cmd-&gt;mh, BFI_MC_CEE, BFI_CEE_H2I_GET_CFG_REQ,</div><div class='add'>+		    bfa_ioc_portid(cee-&gt;ioc));</div><div class='add'>+	bfa_dma_be_addr_set(cmd-&gt;dma_addr, cee-&gt;attr_dma.pa);</div><div class='add'>+	bfa_nw_ioc_mbox_queue(cee-&gt;ioc, &amp;cee-&gt;get_cfg_mb, NULL, NULL);</div><div class='add'>+</div><div class='add'>+	return BFA_STATUS_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * bfa_cee_isrs()</div><div class='ctx'>  *</div><div class='ctx'>  * @brief Handles Mail-box interrupts for CEE module.</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bfa_cee.h b/drivers/net/ethernet/brocade/bna/bfa_cee.h<br/>index 58d54e98d595..93fde633d6f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bfa_cee.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bfa_cee.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bfa_cee.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/brocade/bna/bfa_cee.h</a></div><div class='hunk'>@@ -59,5 +59,7 @@ u32 bfa_nw_cee_meminfo(void);</div><div class='ctx'> void bfa_nw_cee_mem_claim(struct bfa_cee *cee, u8 *dma_kva,</div><div class='ctx'> 	u64 dma_pa);</div><div class='ctx'> void bfa_nw_cee_attach(struct bfa_cee *cee, struct bfa_ioc *ioc, void *dev);</div><div class='del'>-</div><div class='add'>+enum bfa_status bfa_nw_cee_get_attr(struct bfa_cee *cee,</div><div class='add'>+				struct bfa_cee_attr *attr,</div><div class='add'>+				bfa_cee_get_attr_cbfn_t cbfn, void *cbarg);</div><div class='ctx'> #endif /* __BFA_CEE_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bfa_defs.h b/drivers/net/ethernet/brocade/bna/bfa_defs.h<br/>index 2f12d68021d5..871c6309334c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bfa_defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bfa_defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bfa_defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/brocade/bna/bfa_defs.h</a></div><div class='hunk'>@@ -219,41 +219,39 @@ enum {</div><div class='ctx'>  * All numerical fields are in big-endian format.</div><div class='ctx'>  */</div><div class='ctx'> struct bfa_mfg_block {</div><div class='del'>-	u8		version;	/*!&lt; manufacturing block version */</div><div class='del'>-	u8		mfg_sig[3];	/*!&lt; characters 'M', 'F', 'G' */</div><div class='del'>-	u16	mfgsize;	/*!&lt; mfg block size */</div><div class='del'>-	u16	u16_chksum;	/*!&lt; old u16 checksum */</div><div class='del'>-	char		brcd_serialnum[STRSZ(BFA_MFG_SERIALNUM_SIZE)];</div><div class='del'>-	char		brcd_partnum[STRSZ(BFA_MFG_PARTNUM_SIZE)];</div><div class='del'>-	u8		mfg_day;	/*!&lt; manufacturing day */</div><div class='del'>-	u8		mfg_month;	/*!&lt; manufacturing month */</div><div class='del'>-	u16	mfg_year;	/*!&lt; manufacturing year */</div><div class='del'>-	u64		mfg_wwn;	/*!&lt; wwn base for this adapter */</div><div class='del'>-	u8		num_wwn;	/*!&lt; number of wwns assigned */</div><div class='del'>-	u8		mfg_speeds;	/*!&lt; speeds allowed for this adapter */</div><div class='del'>-	u8		rsv[2];</div><div class='del'>-	char		supplier_id[STRSZ(BFA_MFG_SUPPLIER_ID_SIZE)];</div><div class='del'>-	char		supplier_partnum[STRSZ(BFA_MFG_SUPPLIER_PARTNUM_SIZE)];</div><div class='del'>-	char</div><div class='del'>-		supplier_serialnum[STRSZ(BFA_MFG_SUPPLIER_SERIALNUM_SIZE)];</div><div class='del'>-	char</div><div class='del'>-		supplier_revision[STRSZ(BFA_MFG_SUPPLIER_REVISION_SIZE)];</div><div class='del'>-	mac_t		mfg_mac;	/*!&lt; mac address */</div><div class='del'>-	u8		num_mac;	/*!&lt; number of mac addresses */</div><div class='del'>-	u8		rsv2;</div><div class='del'>-	u32		card_type;	/*!&lt; card type */</div><div class='del'>-	char		cap_nic;	/*!&lt; capability nic */</div><div class='del'>-	char		cap_cna;	/*!&lt; capability cna */</div><div class='del'>-	char		cap_hba;	/*!&lt; capability hba */</div><div class='del'>-	char		cap_fc16g;	/*!&lt; capability fc 16g */</div><div class='del'>-	char		cap_sriov;	/*!&lt; capability sriov */</div><div class='del'>-	char		cap_mezz;	/*!&lt; capability mezz */</div><div class='del'>-	u8		rsv3;</div><div class='del'>-	u8		mfg_nports;	/*!&lt; number of ports */</div><div class='del'>-	char		media[8];	/*!&lt; xfi/xaui */</div><div class='del'>-	char		initial_mode[8];/*!&lt; initial mode: hba/cna/nic */</div><div class='del'>-	u8		rsv4[84];</div><div class='del'>-	u8		md5_chksum[BFA_MFG_CHKSUM_SIZE]; /*!&lt; md5 checksum */</div><div class='add'>+	u8	version;	/* manufacturing block version */</div><div class='add'>+	u8	mfg_sig[3];	/* characters 'M', 'F', 'G' */</div><div class='add'>+	u16	mfgsize;	/* mfg block size */</div><div class='add'>+	u16	u16_chksum;	/* old u16 checksum */</div><div class='add'>+	char	brcd_serialnum[STRSZ(BFA_MFG_SERIALNUM_SIZE)];</div><div class='add'>+	char	brcd_partnum[STRSZ(BFA_MFG_PARTNUM_SIZE)];</div><div class='add'>+	u8	mfg_day;	/* manufacturing day */</div><div class='add'>+	u8	mfg_month;	/* manufacturing month */</div><div class='add'>+	u16	mfg_year;	/* manufacturing year */</div><div class='add'>+	u64	mfg_wwn;	/* wwn base for this adapter */</div><div class='add'>+	u8	num_wwn;	/* number of wwns assigned */</div><div class='add'>+	u8	mfg_speeds;	/* speeds allowed for this adapter */</div><div class='add'>+	u8	rsv[2];</div><div class='add'>+	char	supplier_id[STRSZ(BFA_MFG_SUPPLIER_ID_SIZE)];</div><div class='add'>+	char	supplier_partnum[STRSZ(BFA_MFG_SUPPLIER_PARTNUM_SIZE)];</div><div class='add'>+	char	supplier_serialnum[STRSZ(BFA_MFG_SUPPLIER_SERIALNUM_SIZE)];</div><div class='add'>+	char	supplier_revision[STRSZ(BFA_MFG_SUPPLIER_REVISION_SIZE)];</div><div class='add'>+	mac_t	mfg_mac;	/* base mac address */</div><div class='add'>+	u8	num_mac;	/* number of mac addresses */</div><div class='add'>+	u8	rsv2;</div><div class='add'>+	u32	card_type;	/* card type          */</div><div class='add'>+	char	cap_nic;	/* capability nic     */</div><div class='add'>+	char	cap_cna;	/* capability cna     */</div><div class='add'>+	char	cap_hba;	/* capability hba     */</div><div class='add'>+	char	cap_fc16g;	/* capability fc 16g      */</div><div class='add'>+	char	cap_sriov;	/* capability sriov       */</div><div class='add'>+	char	cap_mezz;	/* capability mezz        */</div><div class='add'>+	u8	rsv3;</div><div class='add'>+	u8	mfg_nports;	/* number of ports        */</div><div class='add'>+	char	media[8];	/* xfi/xaui           */</div><div class='add'>+	char	initial_mode[8]; /* initial mode: hba/cna/nic */</div><div class='add'>+	u8	rsv4[84];</div><div class='add'>+	u8	md5_chksum[BFA_MFG_CHKSUM_SIZE]; /* md5 checksum */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #pragma pack()</div><div class='hunk'>@@ -293,4 +291,34 @@ enum bfa_mode {</div><div class='ctx'> 	BFA_MODE_NIC		= 3</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ *	Flash module specific</div><div class='add'>+ */</div><div class='add'>+#define BFA_FLASH_PART_ENTRY_SIZE	32	/* partition entry size */</div><div class='add'>+#define BFA_FLASH_PART_MAX		32	/* maximal # of partitions */</div><div class='add'>+#define BFA_TOTAL_FLASH_SIZE		0x400000</div><div class='add'>+#define BFA_FLASH_PART_MFG		7</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * flash partition attributes</div><div class='add'>+ */</div><div class='add'>+struct bfa_flash_part_attr {</div><div class='add'>+	u32	part_type;	/* partition type */</div><div class='add'>+	u32	part_instance;	/* partition instance */</div><div class='add'>+	u32	part_off;	/* partition offset */</div><div class='add'>+	u32	part_size;	/* partition size */</div><div class='add'>+	u32	part_len;	/* partition content length */</div><div class='add'>+	u32	part_status;	/* partition status */</div><div class='add'>+	char	rsv[BFA_FLASH_PART_ENTRY_SIZE - 24];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * flash attributes</div><div class='add'>+ */</div><div class='add'>+struct bfa_flash_attr {</div><div class='add'>+	u32	status;	/* flash overall status */</div><div class='add'>+	u32	npart;  /* num of partitions */</div><div class='add'>+	struct bfa_flash_part_attr part[BFA_FLASH_PART_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif /* __BFA_DEFS_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c<br/>index b0307a00a109..abfad275b5f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bfa_ioc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bfa_ioc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bfa_ioc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/brocade/bna/bfa_ioc.c</a></div><div class='hunk'>@@ -74,6 +74,7 @@ static void bfa_ioc_check_attr_wwns(struct bfa_ioc *ioc);</div><div class='ctx'> static void bfa_ioc_event_notify(struct bfa_ioc *, enum bfa_ioc_event);</div><div class='ctx'> static void bfa_ioc_disable_comp(struct bfa_ioc *ioc);</div><div class='ctx'> static void bfa_ioc_lpu_stop(struct bfa_ioc *ioc);</div><div class='add'>+static void bfa_nw_ioc_debug_save_ftrc(struct bfa_ioc *ioc);</div><div class='ctx'> static void bfa_ioc_fail_notify(struct bfa_ioc *ioc);</div><div class='ctx'> static void bfa_ioc_pf_enabled(struct bfa_ioc *ioc);</div><div class='ctx'> static void bfa_ioc_pf_disabled(struct bfa_ioc *ioc);</div><div class='hunk'>@@ -997,6 +998,7 @@ bfa_iocpf_sm_disabled(struct bfa_iocpf *iocpf, enum iocpf_event event)</div><div class='ctx'> static void</div><div class='ctx'> bfa_iocpf_sm_initfail_sync_entry(struct bfa_iocpf *iocpf)</div><div class='ctx'> {</div><div class='add'>+	bfa_nw_ioc_debug_save_ftrc(iocpf-&gt;ioc);</div><div class='ctx'> 	bfa_ioc_hw_sem_get(iocpf-&gt;ioc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1743,6 +1745,114 @@ bfa_ioc_mbox_flush(struct bfa_ioc *ioc)</div><div class='ctx'> 		bfa_q_deq(&amp;mod-&gt;cmd_q, &amp;cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * Read data from SMEM to host through PCI memmap</div><div class='add'>+ *</div><div class='add'>+ * @param[in]  ioc     memory for IOC</div><div class='add'>+ * @param[in]  tbuf    app memory to store data from smem</div><div class='add'>+ * @param[in]  soff    smem offset</div><div class='add'>+ * @param[in]  sz      size of smem in bytes</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+bfa_nw_ioc_smem_read(struct bfa_ioc *ioc, void *tbuf, u32 soff, u32 sz)</div><div class='add'>+{</div><div class='add'>+	u32 pgnum, loff, r32;</div><div class='add'>+	int i, len;</div><div class='add'>+	u32 *buf = tbuf;</div><div class='add'>+</div><div class='add'>+	pgnum = PSS_SMEM_PGNUM(ioc-&gt;ioc_regs.smem_pg0, soff);</div><div class='add'>+	loff = PSS_SMEM_PGOFF(soff);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *  Hold semaphore to serialize pll init and fwtrc.</div><div class='add'>+	*/</div><div class='add'>+	if (bfa_nw_ioc_sem_get(ioc-&gt;ioc_regs.ioc_init_sem_reg) == 0)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	writel(pgnum, ioc-&gt;ioc_regs.host_page_num_fn);</div><div class='add'>+</div><div class='add'>+	len = sz/sizeof(u32);</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		r32 = swab32(readl((loff) + (ioc-&gt;ioc_regs.smem_page_start)));</div><div class='add'>+		buf[i] = be32_to_cpu(r32);</div><div class='add'>+		loff += sizeof(u32);</div><div class='add'>+</div><div class='add'>+		/**</div><div class='add'>+		 * handle page offset wrap around</div><div class='add'>+		 */</div><div class='add'>+		loff = PSS_SMEM_PGOFF(loff);</div><div class='add'>+		if (loff == 0) {</div><div class='add'>+			pgnum++;</div><div class='add'>+			writel(pgnum, ioc-&gt;ioc_regs.host_page_num_fn);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writel(PSS_SMEM_PGNUM(ioc-&gt;ioc_regs.smem_pg0, 0),</div><div class='add'>+	       ioc-&gt;ioc_regs.host_page_num_fn);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * release semaphore</div><div class='add'>+	 */</div><div class='add'>+	readl(ioc-&gt;ioc_regs.ioc_init_sem_reg);</div><div class='add'>+	writel(1, ioc-&gt;ioc_regs.ioc_init_sem_reg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Retrieve saved firmware trace from a prior IOC failure.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+bfa_nw_ioc_debug_fwtrc(struct bfa_ioc *ioc, void *trcdata, int *trclen)</div><div class='add'>+{</div><div class='add'>+	u32 loff = BFI_IOC_TRC_OFF + BNA_DBG_FWTRC_LEN * ioc-&gt;port_id;</div><div class='add'>+	int tlen, status = 0;</div><div class='add'>+</div><div class='add'>+	tlen = *trclen;</div><div class='add'>+	if (tlen &gt; BNA_DBG_FWTRC_LEN)</div><div class='add'>+		tlen = BNA_DBG_FWTRC_LEN;</div><div class='add'>+</div><div class='add'>+	status = bfa_nw_ioc_smem_read(ioc, trcdata, loff, tlen);</div><div class='add'>+	*trclen = tlen;</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Save firmware trace if configured.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+bfa_nw_ioc_debug_save_ftrc(struct bfa_ioc *ioc)</div><div class='add'>+{</div><div class='add'>+	int tlen;</div><div class='add'>+</div><div class='add'>+	if (ioc-&gt;dbg_fwsave_once) {</div><div class='add'>+		ioc-&gt;dbg_fwsave_once = 0;</div><div class='add'>+		if (ioc-&gt;dbg_fwsave_len) {</div><div class='add'>+			tlen = ioc-&gt;dbg_fwsave_len;</div><div class='add'>+			bfa_nw_ioc_debug_fwtrc(ioc, ioc-&gt;dbg_fwsave, &amp;tlen);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Retrieve saved firmware trace from a prior IOC failure.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+bfa_nw_ioc_debug_fwsave(struct bfa_ioc *ioc, void *trcdata, int *trclen)</div><div class='add'>+{</div><div class='add'>+	int tlen;</div><div class='add'>+</div><div class='add'>+	if (ioc-&gt;dbg_fwsave_len == 0)</div><div class='add'>+		return BFA_STATUS_ENOFSAVE;</div><div class='add'>+</div><div class='add'>+	tlen = *trclen;</div><div class='add'>+	if (tlen &gt; ioc-&gt;dbg_fwsave_len)</div><div class='add'>+		tlen = ioc-&gt;dbg_fwsave_len;</div><div class='add'>+</div><div class='add'>+	memcpy(trcdata, ioc-&gt;dbg_fwsave, tlen);</div><div class='add'>+	*trclen = tlen;</div><div class='add'>+	return BFA_STATUS_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> bfa_ioc_fail_notify(struct bfa_ioc *ioc)</div><div class='ctx'> {</div><div class='hunk'>@@ -1751,6 +1861,7 @@ bfa_ioc_fail_notify(struct bfa_ioc *ioc)</div><div class='ctx'> 	 */</div><div class='ctx'> 	ioc-&gt;cbfn-&gt;hbfail_cbfn(ioc-&gt;bfa);</div><div class='ctx'> 	bfa_ioc_event_notify(ioc, BFA_IOC_E_FAILED);</div><div class='add'>+	bfa_nw_ioc_debug_save_ftrc(ioc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2058,6 +2169,16 @@ bfa_nw_ioc_disable(struct bfa_ioc *ioc)</div><div class='ctx'> 	bfa_fsm_send_event(ioc, IOC_E_DISABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * Initialize memory for saving firmware trace.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+bfa_nw_ioc_debug_memclaim(struct bfa_ioc *ioc, void *dbg_fwsave)</div><div class='add'>+{</div><div class='add'>+	ioc-&gt;dbg_fwsave = dbg_fwsave;</div><div class='add'>+	ioc-&gt;dbg_fwsave_len = ioc-&gt;iocpf.auto_recover ? BNA_DBG_FWTRC_LEN : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u32</div><div class='ctx'> bfa_ioc_smem_pgnum(struct bfa_ioc *ioc, u32 fmaddr)</div><div class='ctx'> {</div><div class='hunk'>@@ -2172,6 +2293,15 @@ bfa_nw_ioc_is_disabled(struct bfa_ioc *ioc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * return true if IOC is operational</div><div class='add'>+ */</div><div class='add'>+bool</div><div class='add'>+bfa_nw_ioc_is_operational(struct bfa_ioc *ioc)</div><div class='add'>+{</div><div class='add'>+	return bfa_fsm_cmp_state(ioc, bfa_ioc_sm_op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * Add to IOC heartbeat failure notification queue. To be used by common</div><div class='ctx'>  * modules such as cee, port, diag.</div><div class='ctx'>  */</div><div class='hunk'>@@ -2471,3 +2601,366 @@ bfa_ioc_poll_fwinit(struct bfa_ioc *ioc)</div><div class='ctx'> 			msecs_to_jiffies(BFA_IOC_POLL_TOV));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Flash module specific</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FLASH DMA buffer should be big enough to hold both MFG block and</div><div class='add'>+ * asic block(64k) at the same time and also should be 2k aligned to</div><div class='add'>+ * avoid write segement to cross sector boundary.</div><div class='add'>+ */</div><div class='add'>+#define BFA_FLASH_SEG_SZ	2048</div><div class='add'>+#define BFA_FLASH_DMA_BUF_SZ	\</div><div class='add'>+	roundup(0x010000 + sizeof(struct bfa_mfg_block), BFA_FLASH_SEG_SZ)</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+bfa_flash_cb(struct bfa_flash *flash)</div><div class='add'>+{</div><div class='add'>+	flash-&gt;op_busy = 0;</div><div class='add'>+	if (flash-&gt;cbfn)</div><div class='add'>+		flash-&gt;cbfn(flash-&gt;cbarg, flash-&gt;status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+bfa_flash_notify(void *cbarg, enum bfa_ioc_event event)</div><div class='add'>+{</div><div class='add'>+	struct bfa_flash *flash = cbarg;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case BFA_IOC_E_DISABLED:</div><div class='add'>+	case BFA_IOC_E_FAILED:</div><div class='add'>+		if (flash-&gt;op_busy) {</div><div class='add'>+			flash-&gt;status = BFA_STATUS_IOC_FAILURE;</div><div class='add'>+			flash-&gt;cbfn(flash-&gt;cbarg, flash-&gt;status);</div><div class='add'>+			flash-&gt;op_busy = 0;</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'>+</div><div class='add'>+/*</div><div class='add'>+ * Send flash write request.</div><div class='add'>+ *</div><div class='add'>+ * @param[in] cbarg - callback argument</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+bfa_flash_write_send(struct bfa_flash *flash)</div><div class='add'>+{</div><div class='add'>+	struct bfi_flash_write_req *msg =</div><div class='add'>+			(struct bfi_flash_write_req *) flash-&gt;mb.msg;</div><div class='add'>+	u32	len;</div><div class='add'>+</div><div class='add'>+	msg-&gt;type = be32_to_cpu(flash-&gt;type);</div><div class='add'>+	msg-&gt;instance = flash-&gt;instance;</div><div class='add'>+	msg-&gt;offset = be32_to_cpu(flash-&gt;addr_off + flash-&gt;offset);</div><div class='add'>+	len = (flash-&gt;residue &lt; BFA_FLASH_DMA_BUF_SZ) ?</div><div class='add'>+	       flash-&gt;residue : BFA_FLASH_DMA_BUF_SZ;</div><div class='add'>+	msg-&gt;length = be32_to_cpu(len);</div><div class='add'>+</div><div class='add'>+	/* indicate if it's the last msg of the whole write operation */</div><div class='add'>+	msg-&gt;last = (len == flash-&gt;residue) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	bfi_h2i_set(msg-&gt;mh, BFI_MC_FLASH, BFI_FLASH_H2I_WRITE_REQ,</div><div class='add'>+		    bfa_ioc_portid(flash-&gt;ioc));</div><div class='add'>+	bfa_alen_set(&amp;msg-&gt;alen, len, flash-&gt;dbuf_pa);</div><div class='add'>+	memcpy(flash-&gt;dbuf_kva, flash-&gt;ubuf + flash-&gt;offset, len);</div><div class='add'>+	bfa_nw_ioc_mbox_queue(flash-&gt;ioc, &amp;flash-&gt;mb, NULL, NULL);</div><div class='add'>+</div><div class='add'>+	flash-&gt;residue -= len;</div><div class='add'>+	flash-&gt;offset += len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Send flash read request.</div><div class='add'>+ *</div><div class='add'>+ * @param[in] cbarg - callback argument</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+bfa_flash_read_send(void *cbarg)</div><div class='add'>+{</div><div class='add'>+	struct bfa_flash *flash = cbarg;</div><div class='add'>+	struct bfi_flash_read_req *msg =</div><div class='add'>+			(struct bfi_flash_read_req *) flash-&gt;mb.msg;</div><div class='add'>+	u32	len;</div><div class='add'>+</div><div class='add'>+	msg-&gt;type = be32_to_cpu(flash-&gt;type);</div><div class='add'>+	msg-&gt;instance = flash-&gt;instance;</div><div class='add'>+	msg-&gt;offset = be32_to_cpu(flash-&gt;addr_off + flash-&gt;offset);</div><div class='add'>+	len = (flash-&gt;residue &lt; BFA_FLASH_DMA_BUF_SZ) ?</div><div class='add'>+	       flash-&gt;residue : BFA_FLASH_DMA_BUF_SZ;</div><div class='add'>+	msg-&gt;length = be32_to_cpu(len);</div><div class='add'>+	bfi_h2i_set(msg-&gt;mh, BFI_MC_FLASH, BFI_FLASH_H2I_READ_REQ,</div><div class='add'>+		    bfa_ioc_portid(flash-&gt;ioc));</div><div class='add'>+	bfa_alen_set(&amp;msg-&gt;alen, len, flash-&gt;dbuf_pa);</div><div class='add'>+	bfa_nw_ioc_mbox_queue(flash-&gt;ioc, &amp;flash-&gt;mb, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Process flash response messages upon receiving interrupts.</div><div class='add'>+ *</div><div class='add'>+ * @param[in] flasharg - flash structure</div><div class='add'>+ * @param[in] msg - message structure</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+bfa_flash_intr(void *flasharg, struct bfi_mbmsg *msg)</div><div class='add'>+{</div><div class='add'>+	struct bfa_flash *flash = flasharg;</div><div class='add'>+	u32	status;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct bfi_flash_query_rsp *query;</div><div class='add'>+		struct bfi_flash_write_rsp *write;</div><div class='add'>+		struct bfi_flash_read_rsp *read;</div><div class='add'>+		struct bfi_mbmsg   *msg;</div><div class='add'>+	} m;</div><div class='add'>+</div><div class='add'>+	m.msg = msg;</div><div class='add'>+</div><div class='add'>+	/* receiving response after ioc failure */</div><div class='add'>+	if (!flash-&gt;op_busy &amp;&amp; msg-&gt;mh.msg_id != BFI_FLASH_I2H_EVENT)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (msg-&gt;mh.msg_id) {</div><div class='add'>+	case BFI_FLASH_I2H_QUERY_RSP:</div><div class='add'>+		status = be32_to_cpu(m.query-&gt;status);</div><div class='add'>+		if (status == BFA_STATUS_OK) {</div><div class='add'>+			u32	i;</div><div class='add'>+			struct bfa_flash_attr *attr, *f;</div><div class='add'>+</div><div class='add'>+			attr = (struct bfa_flash_attr *) flash-&gt;ubuf;</div><div class='add'>+			f = (struct bfa_flash_attr *) flash-&gt;dbuf_kva;</div><div class='add'>+			attr-&gt;status = be32_to_cpu(f-&gt;status);</div><div class='add'>+			attr-&gt;npart = be32_to_cpu(f-&gt;npart);</div><div class='add'>+			for (i = 0; i &lt; attr-&gt;npart; i++) {</div><div class='add'>+				attr-&gt;part[i].part_type =</div><div class='add'>+					be32_to_cpu(f-&gt;part[i].part_type);</div><div class='add'>+				attr-&gt;part[i].part_instance =</div><div class='add'>+					be32_to_cpu(f-&gt;part[i].part_instance);</div><div class='add'>+				attr-&gt;part[i].part_off =</div><div class='add'>+					be32_to_cpu(f-&gt;part[i].part_off);</div><div class='add'>+				attr-&gt;part[i].part_size =</div><div class='add'>+					be32_to_cpu(f-&gt;part[i].part_size);</div><div class='add'>+				attr-&gt;part[i].part_len =</div><div class='add'>+					be32_to_cpu(f-&gt;part[i].part_len);</div><div class='add'>+				attr-&gt;part[i].part_status =</div><div class='add'>+					be32_to_cpu(f-&gt;part[i].part_status);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		flash-&gt;status = status;</div><div class='add'>+		bfa_flash_cb(flash);</div><div class='add'>+		break;</div><div class='add'>+	case BFI_FLASH_I2H_WRITE_RSP:</div><div class='add'>+		status = be32_to_cpu(m.write-&gt;status);</div><div class='add'>+		if (status != BFA_STATUS_OK || flash-&gt;residue == 0) {</div><div class='add'>+			flash-&gt;status = status;</div><div class='add'>+			bfa_flash_cb(flash);</div><div class='add'>+		} else</div><div class='add'>+			bfa_flash_write_send(flash);</div><div class='add'>+		break;</div><div class='add'>+	case BFI_FLASH_I2H_READ_RSP:</div><div class='add'>+		status = be32_to_cpu(m.read-&gt;status);</div><div class='add'>+		if (status != BFA_STATUS_OK) {</div><div class='add'>+			flash-&gt;status = status;</div><div class='add'>+			bfa_flash_cb(flash);</div><div class='add'>+		} else {</div><div class='add'>+			u32 len = be32_to_cpu(m.read-&gt;length);</div><div class='add'>+			memcpy(flash-&gt;ubuf + flash-&gt;offset,</div><div class='add'>+			       flash-&gt;dbuf_kva, len);</div><div class='add'>+			flash-&gt;residue -= len;</div><div class='add'>+			flash-&gt;offset += len;</div><div class='add'>+			if (flash-&gt;residue == 0) {</div><div class='add'>+				flash-&gt;status = status;</div><div class='add'>+				bfa_flash_cb(flash);</div><div class='add'>+			} else</div><div class='add'>+				bfa_flash_read_send(flash);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case BFI_FLASH_I2H_BOOT_VER_RSP:</div><div class='add'>+	case BFI_FLASH_I2H_EVENT:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flash memory info API.</div><div class='add'>+ */</div><div class='add'>+u32</div><div class='add'>+bfa_nw_flash_meminfo(void)</div><div class='add'>+{</div><div class='add'>+	return roundup(BFA_FLASH_DMA_BUF_SZ, BFA_DMA_ALIGN_SZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flash attach API.</div><div class='add'>+ *</div><div class='add'>+ * @param[in] flash - flash structure</div><div class='add'>+ * @param[in] ioc  - ioc structure</div><div class='add'>+ * @param[in] dev  - device structure</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+bfa_nw_flash_attach(struct bfa_flash *flash, struct bfa_ioc *ioc, void *dev)</div><div class='add'>+{</div><div class='add'>+	flash-&gt;ioc = ioc;</div><div class='add'>+	flash-&gt;cbfn = NULL;</div><div class='add'>+	flash-&gt;cbarg = NULL;</div><div class='add'>+	flash-&gt;op_busy = 0;</div><div class='add'>+</div><div class='add'>+	bfa_nw_ioc_mbox_regisr(flash-&gt;ioc, BFI_MC_FLASH, bfa_flash_intr, flash);</div><div class='add'>+	bfa_q_qe_init(&amp;flash-&gt;ioc_notify);</div><div class='add'>+	bfa_ioc_notify_init(&amp;flash-&gt;ioc_notify, bfa_flash_notify, flash);</div><div class='add'>+	list_add_tail(&amp;flash-&gt;ioc_notify.qe, &amp;flash-&gt;ioc-&gt;notify_q);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Claim memory for flash</div><div class='add'>+ *</div><div class='add'>+ * @param[in] flash - flash structure</div><div class='add'>+ * @param[in] dm_kva - pointer to virtual memory address</div><div class='add'>+ * @param[in] dm_pa - physical memory address</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+bfa_nw_flash_memclaim(struct bfa_flash *flash, u8 *dm_kva, u64 dm_pa)</div><div class='add'>+{</div><div class='add'>+	flash-&gt;dbuf_kva = dm_kva;</div><div class='add'>+	flash-&gt;dbuf_pa = dm_pa;</div><div class='add'>+	memset(flash-&gt;dbuf_kva, 0, BFA_FLASH_DMA_BUF_SZ);</div><div class='add'>+	dm_kva += roundup(BFA_FLASH_DMA_BUF_SZ, BFA_DMA_ALIGN_SZ);</div><div class='add'>+	dm_pa += roundup(BFA_FLASH_DMA_BUF_SZ, BFA_DMA_ALIGN_SZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get flash attribute.</div><div class='add'>+ *</div><div class='add'>+ * @param[in] flash - flash structure</div><div class='add'>+ * @param[in] attr - flash attribute structure</div><div class='add'>+ * @param[in] cbfn - callback function</div><div class='add'>+ * @param[in] cbarg - callback argument</div><div class='add'>+ *</div><div class='add'>+ * Return status.</div><div class='add'>+ */</div><div class='add'>+enum bfa_status</div><div class='add'>+bfa_nw_flash_get_attr(struct bfa_flash *flash, struct bfa_flash_attr *attr,</div><div class='add'>+		      bfa_cb_flash cbfn, void *cbarg)</div><div class='add'>+{</div><div class='add'>+	struct bfi_flash_query_req *msg =</div><div class='add'>+			(struct bfi_flash_query_req *) flash-&gt;mb.msg;</div><div class='add'>+</div><div class='add'>+	if (!bfa_nw_ioc_is_operational(flash-&gt;ioc))</div><div class='add'>+		return BFA_STATUS_IOC_NON_OP;</div><div class='add'>+</div><div class='add'>+	if (flash-&gt;op_busy)</div><div class='add'>+		return BFA_STATUS_DEVBUSY;</div><div class='add'>+</div><div class='add'>+	flash-&gt;op_busy = 1;</div><div class='add'>+	flash-&gt;cbfn = cbfn;</div><div class='add'>+	flash-&gt;cbarg = cbarg;</div><div class='add'>+	flash-&gt;ubuf = (u8 *) attr;</div><div class='add'>+</div><div class='add'>+	bfi_h2i_set(msg-&gt;mh, BFI_MC_FLASH, BFI_FLASH_H2I_QUERY_REQ,</div><div class='add'>+		    bfa_ioc_portid(flash-&gt;ioc));</div><div class='add'>+	bfa_alen_set(&amp;msg-&gt;alen, sizeof(struct bfa_flash_attr), flash-&gt;dbuf_pa);</div><div class='add'>+	bfa_nw_ioc_mbox_queue(flash-&gt;ioc, &amp;flash-&gt;mb, NULL, NULL);</div><div class='add'>+</div><div class='add'>+	return BFA_STATUS_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Update flash partition.</div><div class='add'>+ *</div><div class='add'>+ * @param[in] flash - flash structure</div><div class='add'>+ * @param[in] type - flash partition type</div><div class='add'>+ * @param[in] instance - flash partition instance</div><div class='add'>+ * @param[in] buf - update data buffer</div><div class='add'>+ * @param[in] len - data buffer length</div><div class='add'>+ * @param[in] offset - offset relative to the partition starting address</div><div class='add'>+ * @param[in] cbfn - callback function</div><div class='add'>+ * @param[in] cbarg - callback argument</div><div class='add'>+ *</div><div class='add'>+ * Return status.</div><div class='add'>+ */</div><div class='add'>+enum bfa_status</div><div class='add'>+bfa_nw_flash_update_part(struct bfa_flash *flash, u32 type, u8 instance,</div><div class='add'>+			 void *buf, u32 len, u32 offset,</div><div class='add'>+			 bfa_cb_flash cbfn, void *cbarg)</div><div class='add'>+{</div><div class='add'>+	if (!bfa_nw_ioc_is_operational(flash-&gt;ioc))</div><div class='add'>+		return BFA_STATUS_IOC_NON_OP;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 'len' must be in word (4-byte) boundary</div><div class='add'>+	 */</div><div class='add'>+	if (!len || (len &amp; 0x03))</div><div class='add'>+		return BFA_STATUS_FLASH_BAD_LEN;</div><div class='add'>+</div><div class='add'>+	if (type == BFA_FLASH_PART_MFG)</div><div class='add'>+		return BFA_STATUS_EINVAL;</div><div class='add'>+</div><div class='add'>+	if (flash-&gt;op_busy)</div><div class='add'>+		return BFA_STATUS_DEVBUSY;</div><div class='add'>+</div><div class='add'>+	flash-&gt;op_busy = 1;</div><div class='add'>+	flash-&gt;cbfn = cbfn;</div><div class='add'>+	flash-&gt;cbarg = cbarg;</div><div class='add'>+	flash-&gt;type = type;</div><div class='add'>+	flash-&gt;instance = instance;</div><div class='add'>+	flash-&gt;residue = len;</div><div class='add'>+	flash-&gt;offset = 0;</div><div class='add'>+	flash-&gt;addr_off = offset;</div><div class='add'>+	flash-&gt;ubuf = buf;</div><div class='add'>+</div><div class='add'>+	bfa_flash_write_send(flash);</div><div class='add'>+</div><div class='add'>+	return BFA_STATUS_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read flash partition.</div><div class='add'>+ *</div><div class='add'>+ * @param[in] flash - flash structure</div><div class='add'>+ * @param[in] type - flash partition type</div><div class='add'>+ * @param[in] instance - flash partition instance</div><div class='add'>+ * @param[in] buf - read data buffer</div><div class='add'>+ * @param[in] len - data buffer length</div><div class='add'>+ * @param[in] offset - offset relative to the partition starting address</div><div class='add'>+ * @param[in] cbfn - callback function</div><div class='add'>+ * @param[in] cbarg - callback argument</div><div class='add'>+ *</div><div class='add'>+ * Return status.</div><div class='add'>+ */</div><div class='add'>+enum bfa_status</div><div class='add'>+bfa_nw_flash_read_part(struct bfa_flash *flash, u32 type, u8 instance,</div><div class='add'>+		       void *buf, u32 len, u32 offset,</div><div class='add'>+		       bfa_cb_flash cbfn, void *cbarg)</div><div class='add'>+{</div><div class='add'>+	if (!bfa_nw_ioc_is_operational(flash-&gt;ioc))</div><div class='add'>+		return BFA_STATUS_IOC_NON_OP;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 'len' must be in word (4-byte) boundary</div><div class='add'>+	 */</div><div class='add'>+	if (!len || (len &amp; 0x03))</div><div class='add'>+		return BFA_STATUS_FLASH_BAD_LEN;</div><div class='add'>+</div><div class='add'>+	if (flash-&gt;op_busy)</div><div class='add'>+		return BFA_STATUS_DEVBUSY;</div><div class='add'>+</div><div class='add'>+	flash-&gt;op_busy = 1;</div><div class='add'>+	flash-&gt;cbfn = cbfn;</div><div class='add'>+	flash-&gt;cbarg = cbarg;</div><div class='add'>+	flash-&gt;type = type;</div><div class='add'>+	flash-&gt;instance = instance;</div><div class='add'>+	flash-&gt;residue = len;</div><div class='add'>+	flash-&gt;offset = 0;</div><div class='add'>+	flash-&gt;addr_off = offset;</div><div class='add'>+	flash-&gt;ubuf = buf;</div><div class='add'>+</div><div class='add'>+	bfa_flash_read_send(flash);</div><div class='add'>+</div><div class='add'>+	return BFA_STATUS_OK;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.h b/drivers/net/ethernet/brocade/bna/bfa_ioc.h<br/>index ca158d1eaef3..3b4460fdc148 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bfa_ioc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bfa_ioc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bfa_ioc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/brocade/bna/bfa_ioc.h</a></div><div class='hunk'>@@ -27,6 +27,8 @@</div><div class='ctx'> #define BFA_IOC_HWSEM_TOV	500	/* msecs */</div><div class='ctx'> #define BFA_IOC_HB_TOV		500	/* msecs */</div><div class='ctx'> #define BFA_IOC_POLL_TOV	200	/* msecs */</div><div class='add'>+#define BNA_DBG_FWTRC_LEN      (BFI_IOC_TRC_ENTS * BFI_IOC_TRC_ENT_SZ + \</div><div class='add'>+				BFI_IOC_TRC_HDR_SZ)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * PCI device information required by IOC</div><div class='hunk'>@@ -68,6 +70,16 @@ __bfa_dma_be_addr_set(union bfi_addr_u *dma_addr, u64 pa)</div><div class='ctx'> 	dma_addr-&gt;a32.addr_hi = (u32) htonl(upper_32_bits(pa));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define bfa_alen_set(__alen, __len, __pa)	\</div><div class='add'>+	__bfa_alen_set(__alen, __len, (u64)__pa)</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+__bfa_alen_set(struct bfi_alen *alen, u32 len, u64 pa)</div><div class='add'>+{</div><div class='add'>+	alen-&gt;al_len = cpu_to_be32(len);</div><div class='add'>+	bfa_dma_be_addr_set(alen-&gt;al_addr, pa);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct bfa_ioc_regs {</div><div class='ctx'> 	void __iomem *hfn_mbox_cmd;</div><div class='ctx'> 	void __iomem *hfn_mbox;</div><div class='hunk'>@@ -296,6 +308,7 @@ void bfa_nw_ioc_disable(struct bfa_ioc *ioc);</div><div class='ctx'> </div><div class='ctx'> void bfa_nw_ioc_error_isr(struct bfa_ioc *ioc);</div><div class='ctx'> bool bfa_nw_ioc_is_disabled(struct bfa_ioc *ioc);</div><div class='add'>+bool bfa_nw_ioc_is_operational(struct bfa_ioc *ioc);</div><div class='ctx'> void bfa_nw_ioc_get_attr(struct bfa_ioc *ioc, struct bfa_ioc_attr *ioc_attr);</div><div class='ctx'> void bfa_nw_ioc_notify_register(struct bfa_ioc *ioc,</div><div class='ctx'> 	struct bfa_ioc_notify *notify);</div><div class='hunk'>@@ -307,6 +320,9 @@ void bfa_nw_ioc_fwver_get(struct bfa_ioc *ioc,</div><div class='ctx'> bool bfa_nw_ioc_fwver_cmp(struct bfa_ioc *ioc,</div><div class='ctx'> 			struct bfi_ioc_image_hdr *fwhdr);</div><div class='ctx'> mac_t bfa_nw_ioc_get_mac(struct bfa_ioc *ioc);</div><div class='add'>+void bfa_nw_ioc_debug_memclaim(struct bfa_ioc *ioc, void *dbg_fwsave);</div><div class='add'>+int bfa_nw_ioc_debug_fwtrc(struct bfa_ioc *ioc, void *trcdata, int *trclen);</div><div class='add'>+int bfa_nw_ioc_debug_fwsave(struct bfa_ioc *ioc, void *trcdata, int *trclen);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Timeout APIs</div><div class='hunk'>@@ -322,4 +338,42 @@ void bfa_nw_iocpf_sem_timeout(void *ioc);</div><div class='ctx'> u32 *bfa_cb_image_get_chunk(enum bfi_asic_gen asic_gen, u32 off);</div><div class='ctx'> u32 bfa_cb_image_get_size(enum bfi_asic_gen asic_gen);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ *	Flash module specific</div><div class='add'>+ */</div><div class='add'>+typedef void	(*bfa_cb_flash) (void *cbarg, enum bfa_status status);</div><div class='add'>+</div><div class='add'>+struct bfa_flash {</div><div class='add'>+	struct bfa_ioc *ioc;		/* back pointer to ioc */</div><div class='add'>+	u32		type;		/* partition type */</div><div class='add'>+	u8		instance;	/* partition instance */</div><div class='add'>+	u8		rsv[3];</div><div class='add'>+	u32		op_busy;	/*  operation busy flag */</div><div class='add'>+	u32		residue;	/*  residual length */</div><div class='add'>+	u32		offset;		/*  offset */</div><div class='add'>+	enum bfa_status	status;		/*  status */</div><div class='add'>+	u8		*dbuf_kva;	/*  dma buf virtual address */</div><div class='add'>+	u64		dbuf_pa;	/*  dma buf physical address */</div><div class='add'>+	bfa_cb_flash	cbfn;		/*  user callback function */</div><div class='add'>+	void		*cbarg;		/*  user callback arg */</div><div class='add'>+	u8		*ubuf;		/*  user supplied buffer */</div><div class='add'>+	u32		addr_off;	/*  partition address offset */</div><div class='add'>+	struct bfa_mbox_cmd mb;		/*  mailbox */</div><div class='add'>+	struct bfa_ioc_notify ioc_notify; /*  ioc event notify */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum bfa_status bfa_nw_flash_get_attr(struct bfa_flash *flash,</div><div class='add'>+			struct bfa_flash_attr *attr,</div><div class='add'>+			bfa_cb_flash cbfn, void *cbarg);</div><div class='add'>+enum bfa_status bfa_nw_flash_update_part(struct bfa_flash *flash,</div><div class='add'>+			u32 type, u8 instance, void *buf, u32 len, u32 offset,</div><div class='add'>+			bfa_cb_flash cbfn, void *cbarg);</div><div class='add'>+enum bfa_status bfa_nw_flash_read_part(struct bfa_flash *flash,</div><div class='add'>+			u32 type, u8 instance, void *buf, u32 len, u32 offset,</div><div class='add'>+			bfa_cb_flash cbfn, void *cbarg);</div><div class='add'>+u32	bfa_nw_flash_meminfo(void);</div><div class='add'>+void	bfa_nw_flash_attach(struct bfa_flash *flash,</div><div class='add'>+			    struct bfa_ioc *ioc, void *dev);</div><div class='add'>+void	bfa_nw_flash_memclaim(struct bfa_flash *flash, u8 *dm_kva, u64 dm_pa);</div><div class='add'>+</div><div class='ctx'> #endif /* __BFA_IOC_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bfi.h b/drivers/net/ethernet/brocade/bna/bfi.h<br/>index 7a1393aabd43..0d9df695397a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bfi.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bfi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bfi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/brocade/bna/bfi.h</a></div><div class='hunk'>@@ -83,6 +83,14 @@ union bfi_addr_u {</div><div class='ctx'> 	} a32;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * Generic DMA addr-len pair.</div><div class='add'>+ */</div><div class='add'>+struct bfi_alen {</div><div class='add'>+	union bfi_addr_u	al_addr;	/* DMA addr of buffer	*/</div><div class='add'>+	u32			al_len;		/* length of buffer */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Large Message structure - 128 Bytes size Msgs</div><div class='ctx'>  */</div><div class='hunk'>@@ -249,6 +257,8 @@ struct bfi_ioc_getattr_reply {</div><div class='ctx'>  */</div><div class='ctx'> #define BFI_IOC_TRC_OFF		(0x4b00)</div><div class='ctx'> #define BFI_IOC_TRC_ENTS	256</div><div class='add'>+#define BFI_IOC_TRC_ENT_SZ	16</div><div class='add'>+#define BFI_IOC_TRC_HDR_SZ	32</div><div class='ctx'> </div><div class='ctx'> #define BFI_IOC_FW_SIGNATURE	(0xbfadbfad)</div><div class='ctx'> #define BFI_IOC_MD5SUM_SZ	4</div><div class='hunk'>@@ -476,6 +486,93 @@ struct bfi_msgq_i2h_cmdq_copy_req {</div><div class='ctx'> 	u16     len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ *      FLASH module specific</div><div class='add'>+ */</div><div class='add'>+enum bfi_flash_h2i_msgs {</div><div class='add'>+	BFI_FLASH_H2I_QUERY_REQ = 1,</div><div class='add'>+	BFI_FLASH_H2I_ERASE_REQ = 2,</div><div class='add'>+	BFI_FLASH_H2I_WRITE_REQ = 3,</div><div class='add'>+	BFI_FLASH_H2I_READ_REQ = 4,</div><div class='add'>+	BFI_FLASH_H2I_BOOT_VER_REQ = 5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum bfi_flash_i2h_msgs {</div><div class='add'>+	BFI_FLASH_I2H_QUERY_RSP = BFA_I2HM(1),</div><div class='add'>+	BFI_FLASH_I2H_ERASE_RSP = BFA_I2HM(2),</div><div class='add'>+	BFI_FLASH_I2H_WRITE_RSP = BFA_I2HM(3),</div><div class='add'>+	BFI_FLASH_I2H_READ_RSP = BFA_I2HM(4),</div><div class='add'>+	BFI_FLASH_I2H_BOOT_VER_RSP = BFA_I2HM(5),</div><div class='add'>+	BFI_FLASH_I2H_EVENT = BFA_I2HM(127),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flash query request</div><div class='add'>+ */</div><div class='add'>+struct bfi_flash_query_req {</div><div class='add'>+	struct bfi_mhdr mh;   /* Common msg header */</div><div class='add'>+	struct bfi_alen alen;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flash write request</div><div class='add'>+ */</div><div class='add'>+struct bfi_flash_write_req {</div><div class='add'>+	struct bfi_mhdr mh;	/* Common msg header */</div><div class='add'>+	struct bfi_alen alen;</div><div class='add'>+	u32	type;   /* partition type */</div><div class='add'>+	u8	instance; /* partition instance */</div><div class='add'>+	u8	last;</div><div class='add'>+	u8	rsv[2];</div><div class='add'>+	u32	offset;</div><div class='add'>+	u32	length;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flash read request</div><div class='add'>+ */</div><div class='add'>+struct bfi_flash_read_req {</div><div class='add'>+	struct bfi_mhdr mh;	/* Common msg header */</div><div class='add'>+	u32	type;		/* partition type */</div><div class='add'>+	u8	instance;	/* partition instance */</div><div class='add'>+	u8	rsv[3];</div><div class='add'>+	u32	offset;</div><div class='add'>+	u32	length;</div><div class='add'>+	struct bfi_alen alen;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flash query response</div><div class='add'>+ */</div><div class='add'>+struct bfi_flash_query_rsp {</div><div class='add'>+	struct bfi_mhdr mh;	/* Common msg header */</div><div class='add'>+	u32	status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flash read response</div><div class='add'>+ */</div><div class='add'>+struct bfi_flash_read_rsp {</div><div class='add'>+	struct bfi_mhdr mh;	/* Common msg header */</div><div class='add'>+	u32	type;		/* partition type */</div><div class='add'>+	u8	instance;	/* partition instance */</div><div class='add'>+	u8	rsv[3];</div><div class='add'>+	u32	status;</div><div class='add'>+	u32	length;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flash write response</div><div class='add'>+ */</div><div class='add'>+struct bfi_flash_write_rsp {</div><div class='add'>+	struct bfi_mhdr mh;	/* Common msg header */</div><div class='add'>+	u32	type;		/* partition type */</div><div class='add'>+	u8	instance;	/* partition instance */</div><div class='add'>+	u8	rsv[3];</div><div class='add'>+	u32	status;</div><div class='add'>+	u32	length;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #pragma pack()</div><div class='ctx'> </div><div class='ctx'> #endif /* __BFI_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c<br/>index 26f5c5abfd1f..9ccc586e3767 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bna_enet.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bna_enet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bna_enet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/brocade/bna/bna_enet.c</a></div><div class='hunk'>@@ -1727,6 +1727,7 @@ bna_ioceth_init(struct bna_ioceth *ioceth, struct bna *bna,</div><div class='ctx'> 	bfa_nw_ioc_mem_claim(&amp;ioceth-&gt;ioc, kva, dma);</div><div class='ctx'> </div><div class='ctx'> 	kva = res_info[BNA_RES_MEM_T_FWTRC].res_u.mem_info.mdl[0].kva;</div><div class='add'>+	bfa_nw_ioc_debug_memclaim(&amp;ioceth-&gt;ioc, kva);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * Attach common modules (Diag, SFP, CEE, Port) and claim respective</div><div class='hunk'>@@ -1740,6 +1741,11 @@ bna_ioceth_init(struct bna_ioceth *ioceth, struct bna *bna,</div><div class='ctx'> 	kva += bfa_nw_cee_meminfo();</div><div class='ctx'> 	dma += bfa_nw_cee_meminfo();</div><div class='ctx'> </div><div class='add'>+	bfa_nw_flash_attach(&amp;bna-&gt;flash, &amp;ioceth-&gt;ioc, bna);</div><div class='add'>+	bfa_nw_flash_memclaim(&amp;bna-&gt;flash, kva, dma);</div><div class='add'>+	kva += bfa_nw_flash_meminfo();</div><div class='add'>+	dma += bfa_nw_flash_meminfo();</div><div class='add'>+</div><div class='ctx'> 	bfa_msgq_attach(&amp;bna-&gt;msgq, &amp;ioceth-&gt;ioc);</div><div class='ctx'> 	bfa_msgq_memclaim(&amp;bna-&gt;msgq, kva, dma);</div><div class='ctx'> 	bfa_msgq_regisr(&amp;bna-&gt;msgq, BFI_MC_ENET, bna_msgq_rsp_handler, bna);</div><div class='hunk'>@@ -1892,7 +1898,8 @@ bna_res_req(struct bna_res_info *res_info)</div><div class='ctx'> 	res_info[BNA_RES_MEM_T_COM].res_u.mem_info.num = 1;</div><div class='ctx'> 	res_info[BNA_RES_MEM_T_COM].res_u.mem_info.len = ALIGN(</div><div class='ctx'> 				(bfa_nw_cee_meminfo() +</div><div class='del'>-				bfa_msgq_meminfo()), PAGE_SIZE);</div><div class='add'>+				 bfa_nw_flash_meminfo() +</div><div class='add'>+				 bfa_msgq_meminfo()), PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* DMA memory for retrieving IOC attributes */</div><div class='ctx'> 	res_info[BNA_RES_MEM_T_ATTR].res_type = BNA_RES_T_MEM;</div><div class='hunk'>@@ -1904,8 +1911,8 @@ bna_res_req(struct bna_res_info *res_info)</div><div class='ctx'> 	/* Virtual memory for retreiving fw_trc */</div><div class='ctx'> 	res_info[BNA_RES_MEM_T_FWTRC].res_type = BNA_RES_T_MEM;</div><div class='ctx'> 	res_info[BNA_RES_MEM_T_FWTRC].res_u.mem_info.mem_type = BNA_MEM_T_KVA;</div><div class='del'>-	res_info[BNA_RES_MEM_T_FWTRC].res_u.mem_info.num = 0;</div><div class='del'>-	res_info[BNA_RES_MEM_T_FWTRC].res_u.mem_info.len = 0;</div><div class='add'>+	res_info[BNA_RES_MEM_T_FWTRC].res_u.mem_info.num = 1;</div><div class='add'>+	res_info[BNA_RES_MEM_T_FWTRC].res_u.mem_info.len = BNA_DBG_FWTRC_LEN;</div><div class='ctx'> </div><div class='ctx'> 	/* DMA memory for retreiving stats */</div><div class='ctx'> 	res_info[BNA_RES_MEM_T_STATS].res_type = BNA_RES_T_MEM;</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bna_types.h b/drivers/net/ethernet/brocade/bna/bna_types.h<br/>index d090fbfb12fa..e8d3ab7ea6cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bna_types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bna_types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bna_types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/brocade/bna/bna_types.h</a></div><div class='hunk'>@@ -427,7 +427,7 @@ struct bna_ethport {</div><div class='ctx'> </div><div class='ctx'> /* Doorbell structure */</div><div class='ctx'> struct bna_ib_dbell {</div><div class='del'>-	void *__iomem doorbell_addr;</div><div class='add'>+	void __iomem   *doorbell_addr;</div><div class='ctx'> 	u32		doorbell_ack;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -463,7 +463,7 @@ struct bna_tcb {</div><div class='ctx'> 	u32		consumer_index;</div><div class='ctx'> 	volatile u32	*hw_consumer_index;</div><div class='ctx'> 	u32		q_depth;</div><div class='del'>-	void *__iomem q_dbell;</div><div class='add'>+	void __iomem   *q_dbell;</div><div class='ctx'> 	struct bna_ib_dbell *i_dbell;</div><div class='ctx'> 	int			page_idx;</div><div class='ctx'> 	int			page_count;</div><div class='hunk'>@@ -599,7 +599,7 @@ struct bna_rcb {</div><div class='ctx'> 	u32		producer_index;</div><div class='ctx'> 	u32		consumer_index;</div><div class='ctx'> 	u32		q_depth;</div><div class='del'>-	void *__iomem q_dbell;</div><div class='add'>+	void __iomem   *q_dbell;</div><div class='ctx'> 	int			page_idx;</div><div class='ctx'> 	int			page_count;</div><div class='ctx'> 	/* Control path */</div><div class='hunk'>@@ -966,6 +966,7 @@ struct bna {</div><div class='ctx'> </div><div class='ctx'> 	struct bna_ioceth ioceth;</div><div class='ctx'> 	struct bfa_cee cee;</div><div class='add'>+	struct bfa_flash flash;</div><div class='ctx'> 	struct bfa_msgq msgq;</div><div class='ctx'> </div><div class='ctx'> 	struct bna_ethport ethport;</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c<br/>index 7f3091e7eb42..be7d91e4b785 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bnad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bnad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bnad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/brocade/bna/bnad.c</a></div><div class='hunk'>@@ -44,11 +44,18 @@ static uint bnad_ioc_auto_recover = 1;</div><div class='ctx'> module_param(bnad_ioc_auto_recover, uint, 0444);</div><div class='ctx'> MODULE_PARM_DESC(bnad_ioc_auto_recover, "Enable / Disable auto recovery");</div><div class='ctx'> </div><div class='add'>+static uint bna_debugfs_enable = 1;</div><div class='add'>+module_param(bna_debugfs_enable, uint, S_IRUGO | S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(bna_debugfs_enable, "Enables debugfs feature, default=1,"</div><div class='add'>+		 " Range[false:0|true:1]");</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Global variables</div><div class='ctx'>  */</div><div class='ctx'> u32 bnad_rxqs_per_cq = 2;</div><div class='del'>-</div><div class='add'>+static u32 bna_id;</div><div class='add'>+static struct mutex bnad_list_mutex;</div><div class='add'>+static LIST_HEAD(bnad_list);</div><div class='ctx'> static const u8 bnad_bcast_addr[] =  {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -75,6 +82,23 @@ do {								\</div><div class='ctx'> </div><div class='ctx'> #define BNAD_TXRX_SYNC_MDELAY	250	/* 250 msecs */</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+bnad_add_to_list(struct bnad *bnad)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;bnad_list_mutex);</div><div class='add'>+	list_add_tail(&amp;bnad-&gt;list_entry, &amp;bnad_list);</div><div class='add'>+	bnad-&gt;id = bna_id++;</div><div class='add'>+	mutex_unlock(&amp;bnad_list_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+bnad_remove_from_list(struct bnad *bnad)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;bnad_list_mutex);</div><div class='add'>+	list_del(&amp;bnad-&gt;list_entry);</div><div class='add'>+	mutex_unlock(&amp;bnad_list_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Reinitialize completions in CQ, once Rx is taken down</div><div class='ctx'>  */</div><div class='hunk'>@@ -723,7 +747,7 @@ void</div><div class='ctx'> bnad_cb_ethport_link_status(struct bnad *bnad,</div><div class='ctx'> 			enum bna_link_status link_status)</div><div class='ctx'> {</div><div class='del'>-	bool link_up = 0;</div><div class='add'>+	bool link_up = false;</div><div class='ctx'> </div><div class='ctx'> 	link_up = (link_status == BNA_LINK_UP) || (link_status == BNA_CEE_UP);</div><div class='ctx'> </div><div class='hunk'>@@ -1084,6 +1108,16 @@ bnad_cb_enet_mtu_set(struct bnad *bnad)</div><div class='ctx'> 	complete(&amp;bnad-&gt;bnad_completions.mtu_comp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void</div><div class='add'>+bnad_cb_completion(void *arg, enum bfa_status status)</div><div class='add'>+{</div><div class='add'>+	struct bnad_iocmd_comp *iocmd_comp =</div><div class='add'>+			(struct bnad_iocmd_comp *)arg;</div><div class='add'>+</div><div class='add'>+	iocmd_comp-&gt;comp_status = (u32) status;</div><div class='add'>+	complete(&amp;iocmd_comp-&gt;comp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Resource allocation, free functions */</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -2968,7 +3002,7 @@ bnad_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+static int</div><div class='ctx'> bnad_vlan_rx_add_vid(struct net_device *netdev,</div><div class='ctx'> 				 unsigned short vid)</div><div class='ctx'> {</div><div class='hunk'>@@ -2976,7 +3010,7 @@ bnad_vlan_rx_add_vid(struct net_device *netdev,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!bnad-&gt;rx_info[0].rx)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;bnad-&gt;conf_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -2986,9 +3020,11 @@ bnad_vlan_rx_add_vid(struct net_device *netdev,</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;bnad-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+static int</div><div class='ctx'> bnad_vlan_rx_kill_vid(struct net_device *netdev,</div><div class='ctx'> 				  unsigned short vid)</div><div class='ctx'> {</div><div class='hunk'>@@ -2996,7 +3032,7 @@ bnad_vlan_rx_kill_vid(struct net_device *netdev,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!bnad-&gt;rx_info[0].rx)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;bnad-&gt;conf_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -3006,6 +3042,8 @@ bnad_vlan_rx_kill_vid(struct net_device *netdev,</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;bnad-&gt;conf_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='hunk'>@@ -3163,12 +3201,14 @@ bnad_lock_init(struct bnad *bnad)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock_init(&amp;bnad-&gt;bna_lock);</div><div class='ctx'> 	mutex_init(&amp;bnad-&gt;conf_mutex);</div><div class='add'>+	mutex_init(&amp;bnad_list_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> bnad_lock_uninit(struct bnad *bnad)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_destroy(&amp;bnad-&gt;conf_mutex);</div><div class='add'>+	mutex_destroy(&amp;bnad_list_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* PCI Initialization */</div><div class='hunk'>@@ -3186,7 +3226,7 @@ bnad_pci_init(struct bnad *bnad,</div><div class='ctx'> 		goto disable_device;</div><div class='ctx'> 	if (!dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(64)) &amp;&amp;</div><div class='ctx'> 	    !dma_set_coherent_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(64))) {</div><div class='del'>-		*using_dac = 1;</div><div class='add'>+		*using_dac = true;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 		if (err) {</div><div class='hunk'>@@ -3195,7 +3235,7 @@ bnad_pci_init(struct bnad *bnad,</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto release_regions;</div><div class='ctx'> 		}</div><div class='del'>-		*using_dac = 0;</div><div class='add'>+		*using_dac = false;</div><div class='ctx'> 	}</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3249,8 +3289,8 @@ bnad_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	bnad = netdev_priv(netdev);</div><div class='del'>-</div><div class='ctx'> 	bnad_lock_init(bnad);</div><div class='add'>+	bnad_add_to_list(bnad);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;bnad-&gt;conf_mutex);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3277,6 +3317,10 @@ bnad_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	/* Set link to down state */</div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='ctx'> </div><div class='add'>+	/* Setup the debugfs node for this bfad */</div><div class='add'>+	if (bna_debugfs_enable)</div><div class='add'>+		bnad_debugfs_init(bnad);</div><div class='add'>+</div><div class='ctx'> 	/* Get resource requirement form bna */</div><div class='ctx'> 	spin_lock_irqsave(&amp;bnad-&gt;bna_lock, flags);</div><div class='ctx'> 	bna_res_req(&amp;bnad-&gt;res_info[0]);</div><div class='hunk'>@@ -3398,11 +3442,15 @@ disable_ioceth:</div><div class='ctx'> res_free:</div><div class='ctx'> 	bnad_res_free(bnad, &amp;bnad-&gt;res_info[0], BNA_RES_T_MAX);</div><div class='ctx'> drv_uninit:</div><div class='add'>+	/* Remove the debugfs node for this bnad */</div><div class='add'>+	kfree(bnad-&gt;regdata);</div><div class='add'>+	bnad_debugfs_uninit(bnad);</div><div class='ctx'> 	bnad_uninit(bnad);</div><div class='ctx'> pci_uninit:</div><div class='ctx'> 	bnad_pci_uninit(pdev);</div><div class='ctx'> unlock_mutex:</div><div class='ctx'> 	mutex_unlock(&amp;bnad-&gt;conf_mutex);</div><div class='add'>+	bnad_remove_from_list(bnad);</div><div class='ctx'> 	bnad_lock_uninit(bnad);</div><div class='ctx'> 	free_netdev(netdev);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -3441,7 +3489,11 @@ bnad_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 	bnad_disable_msix(bnad);</div><div class='ctx'> 	bnad_pci_uninit(pdev);</div><div class='ctx'> 	mutex_unlock(&amp;bnad-&gt;conf_mutex);</div><div class='add'>+	bnad_remove_from_list(bnad);</div><div class='ctx'> 	bnad_lock_uninit(bnad);</div><div class='add'>+	/* Remove the debugfs node for this bnad */</div><div class='add'>+	kfree(bnad-&gt;regdata);</div><div class='add'>+	bnad_debugfs_uninit(bnad);</div><div class='ctx'> 	bnad_uninit(bnad);</div><div class='ctx'> 	free_netdev(netdev);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bnad.h b/drivers/net/ethernet/brocade/bna/bnad.h<br/>index 5487ca42d018..55824d92699f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bnad.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bnad.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bnad.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/brocade/bna/bnad.h</a></div><div class='hunk'>@@ -124,6 +124,12 @@ enum bnad_link_state {</div><div class='ctx'> 	BNAD_LS_UP		= 1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct bnad_iocmd_comp {</div><div class='add'>+	struct bnad		*bnad;</div><div class='add'>+	struct completion	comp;</div><div class='add'>+	int			comp_status;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct bnad_completion {</div><div class='ctx'> 	struct completion	ioc_comp;</div><div class='ctx'> 	struct completion	ucast_comp;</div><div class='hunk'>@@ -251,6 +257,8 @@ struct bnad_unmap_q {</div><div class='ctx'> </div><div class='ctx'> struct bnad {</div><div class='ctx'> 	struct net_device	*netdev;</div><div class='add'>+	u32			id;</div><div class='add'>+	struct list_head	list_entry;</div><div class='ctx'> </div><div class='ctx'> 	/* Data path */</div><div class='ctx'> 	struct bnad_tx_info tx_info[BNAD_MAX_TX];</div><div class='hunk'>@@ -320,12 +328,26 @@ struct bnad {</div><div class='ctx'> 	char			adapter_name[BNAD_NAME_LEN];</div><div class='ctx'> 	char			port_name[BNAD_NAME_LEN];</div><div class='ctx'> 	char			mbox_irq_name[BNAD_NAME_LEN];</div><div class='add'>+</div><div class='add'>+	/* debugfs specific data */</div><div class='add'>+	char	*regdata;</div><div class='add'>+	u32	reglen;</div><div class='add'>+	struct dentry *bnad_dentry_files[5];</div><div class='add'>+	struct dentry *port_debugfs_root;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnad_drvinfo {</div><div class='add'>+	struct bfa_ioc_attr  ioc_attr;</div><div class='add'>+	struct bfa_cee_attr  cee_attr;</div><div class='add'>+	struct bfa_flash_attr flash_attr;</div><div class='add'>+	u32	cee_status;</div><div class='add'>+	u32	flash_status;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * EXTERN VARIABLES</div><div class='ctx'>  */</div><div class='del'>-extern struct firmware *bfi_fw;</div><div class='add'>+extern const struct firmware *bfi_fw;</div><div class='ctx'> extern u32		bnad_rxqs_per_cq;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -340,6 +362,7 @@ extern int bnad_mac_addr_set_locked(struct bnad *bnad, u8 *mac_addr);</div><div class='ctx'> extern int bnad_enable_default_bcast(struct bnad *bnad);</div><div class='ctx'> extern void bnad_restore_vlans(struct bnad *bnad, u32 rx_id);</div><div class='ctx'> extern void bnad_set_ethtool_ops(struct net_device *netdev);</div><div class='add'>+extern void bnad_cb_completion(void *arg, enum bfa_status status);</div><div class='ctx'> </div><div class='ctx'> /* Configuration &amp; setup */</div><div class='ctx'> extern void bnad_tx_coalescing_timeo_set(struct bnad *bnad);</div><div class='hunk'>@@ -359,6 +382,10 @@ extern void bnad_netdev_qstats_fill(struct bnad *bnad,</div><div class='ctx'> extern void bnad_netdev_hwstats_fill(struct bnad *bnad,</div><div class='ctx'> 		struct rtnl_link_stats64 *stats);</div><div class='ctx'> </div><div class='add'>+/* Debugfs */</div><div class='add'>+void	bnad_debugfs_init(struct bnad *bnad);</div><div class='add'>+void	bnad_debugfs_uninit(struct bnad *bnad);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * MACROS</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bnad_debugfs.c b/drivers/net/ethernet/brocade/bna/bnad_debugfs.c<br/>new file mode 100644<br/>index 000000000000..592ad3929f53<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bnad_debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/brocade/bna/bnad_debugfs.c</a></div><div class='hunk'>@@ -0,0 +1,623 @@</div><div class='add'>+/*</div><div class='add'>+ * Linux network driver for Brocade Converged Network Adapter.</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 (GPL) Version 2 as</div><div class='add'>+ * published by the Free Software Foundation</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2005-2011 Brocade Communications Systems, Inc.</div><div class='add'>+ * All rights reserved</div><div class='add'>+ * www.brocade.com</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/module.h&gt;</div><div class='add'>+#include "bnad.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * BNA debufs interface</div><div class='add'>+ *</div><div class='add'>+ * To access the interface, debugfs file system should be mounted</div><div class='add'>+ * if not already mounted using:</div><div class='add'>+ *	mount -t debugfs none /sys/kernel/debug</div><div class='add'>+ *</div><div class='add'>+ * BNA Hierarchy:</div><div class='add'>+ *	- bna/pci_dev:&lt;pci_name&gt;</div><div class='add'>+ * where the pci_name corresponds to the one under /sys/bus/pci/drivers/bna</div><div class='add'>+ *</div><div class='add'>+ * Debugging service available per pci_dev:</div><div class='add'>+ *	fwtrc:  To collect current firmware trace.</div><div class='add'>+ *	fwsave: To collect last saved fw trace as a result of firmware crash.</div><div class='add'>+ *	regwr:  To write one word to chip register</div><div class='add'>+ *	regrd:  To read one or more words from chip register.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct bnad_debug_info {</div><div class='add'>+	char *debug_buffer;</div><div class='add'>+	void *i_private;</div><div class='add'>+	int buffer_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+bnad_debugfs_open_fwtrc(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct bnad *bnad = inode-&gt;i_private;</div><div class='add'>+	struct bnad_debug_info *fw_debug;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	fw_debug = kzalloc(sizeof(struct bnad_debug_info), GFP_KERNEL);</div><div class='add'>+	if (!fw_debug)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fw_debug-&gt;buffer_len = BNA_DBG_FWTRC_LEN;</div><div class='add'>+</div><div class='add'>+	fw_debug-&gt;debug_buffer = kzalloc(fw_debug-&gt;buffer_len, GFP_KERNEL);</div><div class='add'>+	if (!fw_debug-&gt;debug_buffer) {</div><div class='add'>+		kfree(fw_debug);</div><div class='add'>+		fw_debug = NULL;</div><div class='add'>+		pr_warn("bna %s: Failed to allocate fwtrc buffer\n",</div><div class='add'>+			pci_name(bnad-&gt;pcidev));</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+	rc = bfa_nw_ioc_debug_fwtrc(&amp;bnad-&gt;bna.ioceth.ioc,</div><div class='add'>+			fw_debug-&gt;debug_buffer,</div><div class='add'>+			&amp;fw_debug-&gt;buffer_len);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+	if (rc != BFA_STATUS_OK) {</div><div class='add'>+		kfree(fw_debug-&gt;debug_buffer);</div><div class='add'>+		fw_debug-&gt;debug_buffer = NULL;</div><div class='add'>+		kfree(fw_debug);</div><div class='add'>+		fw_debug = NULL;</div><div class='add'>+		pr_warn("bnad %s: Failed to collect fwtrc\n",</div><div class='add'>+			pci_name(bnad-&gt;pcidev));</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = fw_debug;</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'>+bnad_debugfs_open_fwsave(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct bnad *bnad = inode-&gt;i_private;</div><div class='add'>+	struct bnad_debug_info *fw_debug;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	fw_debug = kzalloc(sizeof(struct bnad_debug_info), GFP_KERNEL);</div><div class='add'>+	if (!fw_debug)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fw_debug-&gt;buffer_len = BNA_DBG_FWTRC_LEN;</div><div class='add'>+</div><div class='add'>+	fw_debug-&gt;debug_buffer = kzalloc(fw_debug-&gt;buffer_len, GFP_KERNEL);</div><div class='add'>+	if (!fw_debug-&gt;debug_buffer) {</div><div class='add'>+		kfree(fw_debug);</div><div class='add'>+		fw_debug = NULL;</div><div class='add'>+		pr_warn("bna %s: Failed to allocate fwsave buffer\n",</div><div class='add'>+			pci_name(bnad-&gt;pcidev));</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+	rc = bfa_nw_ioc_debug_fwsave(&amp;bnad-&gt;bna.ioceth.ioc,</div><div class='add'>+			fw_debug-&gt;debug_buffer,</div><div class='add'>+			&amp;fw_debug-&gt;buffer_len);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+	if (rc != BFA_STATUS_OK &amp;&amp; rc != BFA_STATUS_ENOFSAVE) {</div><div class='add'>+		kfree(fw_debug-&gt;debug_buffer);</div><div class='add'>+		fw_debug-&gt;debug_buffer = NULL;</div><div class='add'>+		kfree(fw_debug);</div><div class='add'>+		fw_debug = NULL;</div><div class='add'>+		pr_warn("bna %s: Failed to collect fwsave\n",</div><div class='add'>+			pci_name(bnad-&gt;pcidev));</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = fw_debug;</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'>+bnad_debugfs_open_reg(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct bnad_debug_info *reg_debug;</div><div class='add'>+</div><div class='add'>+	reg_debug = kzalloc(sizeof(struct bnad_debug_info), GFP_KERNEL);</div><div class='add'>+	if (!reg_debug)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	reg_debug-&gt;i_private = inode-&gt;i_private;</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = reg_debug;</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'>+bnad_get_debug_drvinfo(struct bnad *bnad, void *buffer, u32 len)</div><div class='add'>+{</div><div class='add'>+	struct bnad_drvinfo *drvinfo = (struct bnad_drvinfo *) buffer;</div><div class='add'>+	struct bnad_iocmd_comp fcomp;</div><div class='add'>+	unsigned long flags = 0;</div><div class='add'>+	int ret = BFA_STATUS_FAILED;</div><div class='add'>+</div><div class='add'>+	/* Get IOC info */</div><div class='add'>+	spin_lock_irqsave(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+	bfa_nw_ioc_get_attr(&amp;bnad-&gt;bna.ioceth.ioc, &amp;drvinfo-&gt;ioc_attr);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Retrieve CEE related info */</div><div class='add'>+	fcomp.bnad = bnad;</div><div class='add'>+	fcomp.comp_status = 0;</div><div class='add'>+	init_completion(&amp;fcomp.comp);</div><div class='add'>+	spin_lock_irqsave(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+	ret = bfa_nw_cee_get_attr(&amp;bnad-&gt;bna.cee, &amp;drvinfo-&gt;cee_attr,</div><div class='add'>+				bnad_cb_completion, &amp;fcomp);</div><div class='add'>+	if (ret != BFA_STATUS_OK) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+	wait_for_completion(&amp;fcomp.comp);</div><div class='add'>+	drvinfo-&gt;cee_status = fcomp.comp_status;</div><div class='add'>+</div><div class='add'>+	/* Retrieve flash partition info */</div><div class='add'>+	fcomp.comp_status = 0;</div><div class='add'>+	init_completion(&amp;fcomp.comp);</div><div class='add'>+	spin_lock_irqsave(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+	ret = bfa_nw_flash_get_attr(&amp;bnad-&gt;bna.flash, &amp;drvinfo-&gt;flash_attr,</div><div class='add'>+				bnad_cb_completion, &amp;fcomp);</div><div class='add'>+	if (ret != BFA_STATUS_OK) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+	wait_for_completion(&amp;fcomp.comp);</div><div class='add'>+	drvinfo-&gt;flash_status = fcomp.comp_status;</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</div><div class='add'>+bnad_debugfs_open_drvinfo(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct bnad *bnad = inode-&gt;i_private;</div><div class='add'>+	struct bnad_debug_info *drv_info;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	drv_info = kzalloc(sizeof(struct bnad_debug_info), GFP_KERNEL);</div><div class='add'>+	if (!drv_info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	drv_info-&gt;buffer_len = sizeof(struct bnad_drvinfo);</div><div class='add'>+</div><div class='add'>+	drv_info-&gt;debug_buffer = kzalloc(drv_info-&gt;buffer_len, GFP_KERNEL);</div><div class='add'>+	if (!drv_info-&gt;debug_buffer) {</div><div class='add'>+		kfree(drv_info);</div><div class='add'>+		drv_info = NULL;</div><div class='add'>+		pr_warn("bna %s: Failed to allocate drv info buffer\n",</div><div class='add'>+			pci_name(bnad-&gt;pcidev));</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;bnad-&gt;conf_mutex);</div><div class='add'>+	rc = bnad_get_debug_drvinfo(bnad, drv_info-&gt;debug_buffer,</div><div class='add'>+				drv_info-&gt;buffer_len);</div><div class='add'>+	mutex_unlock(&amp;bnad-&gt;conf_mutex);</div><div class='add'>+	if (rc != BFA_STATUS_OK) {</div><div class='add'>+		kfree(drv_info-&gt;debug_buffer);</div><div class='add'>+		drv_info-&gt;debug_buffer = NULL;</div><div class='add'>+		kfree(drv_info);</div><div class='add'>+		drv_info = NULL;</div><div class='add'>+		pr_warn("bna %s: Failed to collect drvinfo\n",</div><div class='add'>+			pci_name(bnad-&gt;pcidev));</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = drv_info;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Changes the current file position */</div><div class='add'>+static loff_t</div><div class='add'>+bnad_debugfs_lseek(struct file *file, loff_t offset, int orig)</div><div class='add'>+{</div><div class='add'>+	loff_t pos = file-&gt;f_pos;</div><div class='add'>+	struct bnad_debug_info *debug = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (!debug)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (orig) {</div><div class='add'>+	case 0:</div><div class='add'>+		file-&gt;f_pos = offset;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		file-&gt;f_pos += offset;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		file-&gt;f_pos = debug-&gt;buffer_len - offset;</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 (file-&gt;f_pos &lt; 0 || file-&gt;f_pos &gt; debug-&gt;buffer_len) {</div><div class='add'>+		file-&gt;f_pos = pos;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return file-&gt;f_pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+bnad_debugfs_read(struct file *file, char __user *buf,</div><div class='add'>+		  size_t nbytes, loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	struct bnad_debug_info *debug = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (!debug || !debug-&gt;debug_buffer)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(buf, nbytes, pos,</div><div class='add'>+				debug-&gt;debug_buffer, debug-&gt;buffer_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BFA_REG_CT_ADDRSZ	(0x40000)</div><div class='add'>+#define BFA_REG_CB_ADDRSZ	(0x20000)</div><div class='add'>+#define BFA_REG_ADDRSZ(__ioc)	\</div><div class='add'>+	((u32)(bfa_asic_id_ctc(bfa_ioc_devid(__ioc)) ?  \</div><div class='add'>+	 BFA_REG_CT_ADDRSZ : BFA_REG_CB_ADDRSZ))</div><div class='add'>+#define BFA_REG_ADDRMSK(__ioc)	(BFA_REG_ADDRSZ(__ioc) - 1)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Function to check if the register offset passed is valid.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+bna_reg_offset_check(struct bfa_ioc *ioc, u32 offset, u32 len)</div><div class='add'>+{</div><div class='add'>+	u8 area;</div><div class='add'>+</div><div class='add'>+	/* check [16:15] */</div><div class='add'>+	area = (offset &gt;&gt; 15) &amp; 0x7;</div><div class='add'>+	if (area == 0) {</div><div class='add'>+		/* PCIe core register */</div><div class='add'>+		if ((offset + (len&lt;&lt;2)) &gt; 0x8000)	/* 8k dwords or 32KB */</div><div class='add'>+			return BFA_STATUS_EINVAL;</div><div class='add'>+	} else if (area == 0x1) {</div><div class='add'>+		/* CB 32 KB memory page */</div><div class='add'>+		if ((offset + (len&lt;&lt;2)) &gt; 0x10000)	/* 8k dwords or 32KB */</div><div class='add'>+			return BFA_STATUS_EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		/* CB register space 64KB */</div><div class='add'>+		if ((offset + (len&lt;&lt;2)) &gt; BFA_REG_ADDRMSK(ioc))</div><div class='add'>+			return BFA_STATUS_EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return BFA_STATUS_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+bnad_debugfs_read_regrd(struct file *file, char __user *buf,</div><div class='add'>+			size_t nbytes, loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	struct bnad_debug_info *regrd_debug = file-&gt;private_data;</div><div class='add'>+	struct bnad *bnad = (struct bnad *)regrd_debug-&gt;i_private;</div><div class='add'>+	ssize_t rc;</div><div class='add'>+</div><div class='add'>+	if (!bnad-&gt;regdata)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rc = simple_read_from_buffer(buf, nbytes, pos,</div><div class='add'>+			bnad-&gt;regdata, bnad-&gt;reglen);</div><div class='add'>+</div><div class='add'>+	if ((*pos + nbytes) &gt;= bnad-&gt;reglen) {</div><div class='add'>+		kfree(bnad-&gt;regdata);</div><div class='add'>+		bnad-&gt;regdata = NULL;</div><div class='add'>+		bnad-&gt;reglen = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+bnad_debugfs_write_regrd(struct file *file, const char __user *buf,</div><div class='add'>+		size_t nbytes, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct bnad_debug_info *regrd_debug = file-&gt;private_data;</div><div class='add'>+	struct bnad *bnad = (struct bnad *)regrd_debug-&gt;i_private;</div><div class='add'>+	struct bfa_ioc *ioc = &amp;bnad-&gt;bna.ioceth.ioc;</div><div class='add'>+	int addr, len, rc, i;</div><div class='add'>+	u32 *regbuf;</div><div class='add'>+	void __iomem *rb, *reg_addr;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	void *kern_buf;</div><div class='add'>+</div><div class='add'>+	/* Allocate memory to store the user space buf */</div><div class='add'>+	kern_buf = kzalloc(nbytes, GFP_KERNEL);</div><div class='add'>+	if (!kern_buf) {</div><div class='add'>+		pr_warn("bna %s: Failed to allocate user buffer\n",</div><div class='add'>+			pci_name(bnad-&gt;pcidev));</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(kern_buf, (void  __user *)buf, nbytes)) {</div><div class='add'>+		kfree(kern_buf);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = sscanf(kern_buf, "%x:%x", &amp;addr, &amp;len);</div><div class='add'>+	if (rc &lt; 2) {</div><div class='add'>+		pr_warn("bna %s: Failed to read user buffer\n",</div><div class='add'>+			pci_name(bnad-&gt;pcidev));</div><div class='add'>+		kfree(kern_buf);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(kern_buf);</div><div class='add'>+	kfree(bnad-&gt;regdata);</div><div class='add'>+	bnad-&gt;regdata = NULL;</div><div class='add'>+	bnad-&gt;reglen = 0;</div><div class='add'>+</div><div class='add'>+	bnad-&gt;regdata = kzalloc(len &lt;&lt; 2, GFP_KERNEL);</div><div class='add'>+	if (!bnad-&gt;regdata) {</div><div class='add'>+		pr_warn("bna %s: Failed to allocate regrd buffer\n",</div><div class='add'>+			pci_name(bnad-&gt;pcidev));</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bnad-&gt;reglen = len &lt;&lt; 2;</div><div class='add'>+	rb = bfa_ioc_bar0(ioc);</div><div class='add'>+	addr &amp;= BFA_REG_ADDRMSK(ioc);</div><div class='add'>+</div><div class='add'>+	/* offset and len sanity check */</div><div class='add'>+	rc = bna_reg_offset_check(ioc, addr, len);</div><div class='add'>+	if (rc) {</div><div class='add'>+		pr_warn("bna %s: Failed reg offset check\n",</div><div class='add'>+			pci_name(bnad-&gt;pcidev));</div><div class='add'>+		kfree(bnad-&gt;regdata);</div><div class='add'>+		bnad-&gt;regdata = NULL;</div><div class='add'>+		bnad-&gt;reglen = 0;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg_addr = rb + addr;</div><div class='add'>+	regbuf =  (u32 *)bnad-&gt;regdata;</div><div class='add'>+	spin_lock_irqsave(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		*regbuf = readl(reg_addr);</div><div class='add'>+		regbuf++;</div><div class='add'>+		reg_addr += sizeof(u32);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+</div><div class='add'>+	return nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+bnad_debugfs_write_regwr(struct file *file, const char __user *buf,</div><div class='add'>+		size_t nbytes, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct bnad_debug_info *debug = file-&gt;private_data;</div><div class='add'>+	struct bnad *bnad = (struct bnad *)debug-&gt;i_private;</div><div class='add'>+	struct bfa_ioc *ioc = &amp;bnad-&gt;bna.ioceth.ioc;</div><div class='add'>+	int addr, val, rc;</div><div class='add'>+	void __iomem *reg_addr;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	void *kern_buf;</div><div class='add'>+</div><div class='add'>+	/* Allocate memory to store the user space buf */</div><div class='add'>+	kern_buf = kzalloc(nbytes, GFP_KERNEL);</div><div class='add'>+	if (!kern_buf) {</div><div class='add'>+		pr_warn("bna %s: Failed to allocate user buffer\n",</div><div class='add'>+			pci_name(bnad-&gt;pcidev));</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(kern_buf, (void  __user *)buf, nbytes)) {</div><div class='add'>+		kfree(kern_buf);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = sscanf(kern_buf, "%x:%x", &amp;addr, &amp;val);</div><div class='add'>+	if (rc &lt; 2) {</div><div class='add'>+		pr_warn("bna %s: Failed to read user buffer\n",</div><div class='add'>+			pci_name(bnad-&gt;pcidev));</div><div class='add'>+		kfree(kern_buf);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	kfree(kern_buf);</div><div class='add'>+</div><div class='add'>+	addr &amp;= BFA_REG_ADDRMSK(ioc); /* offset only 17 bit and word align */</div><div class='add'>+</div><div class='add'>+	/* offset and len sanity check */</div><div class='add'>+	rc = bna_reg_offset_check(ioc, addr, 1);</div><div class='add'>+	if (rc) {</div><div class='add'>+		pr_warn("bna %s: Failed reg offset check\n",</div><div class='add'>+			pci_name(bnad-&gt;pcidev));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg_addr = (bfa_ioc_bar0(ioc)) + addr;</div><div class='add'>+	spin_lock_irqsave(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+	writel(val, reg_addr);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+</div><div class='add'>+	return nbytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+bnad_debugfs_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct bnad_debug_info *debug = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (!debug)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = NULL;</div><div class='add'>+	kfree(debug);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+bnad_debugfs_buffer_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct bnad_debug_info *debug = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (!debug)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	kfree(debug-&gt;debug_buffer);</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = NULL;</div><div class='add'>+	kfree(debug);</div><div class='add'>+	debug = NULL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations bnad_debugfs_op_fwtrc = {</div><div class='add'>+	.owner		=	THIS_MODULE,</div><div class='add'>+	.open		=	bnad_debugfs_open_fwtrc,</div><div class='add'>+	.llseek		=	bnad_debugfs_lseek,</div><div class='add'>+	.read		=	bnad_debugfs_read,</div><div class='add'>+	.release	=	bnad_debugfs_buffer_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations bnad_debugfs_op_fwsave = {</div><div class='add'>+	.owner		=	THIS_MODULE,</div><div class='add'>+	.open		=	bnad_debugfs_open_fwsave,</div><div class='add'>+	.llseek		=	bnad_debugfs_lseek,</div><div class='add'>+	.read		=	bnad_debugfs_read,</div><div class='add'>+	.release	=	bnad_debugfs_buffer_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations bnad_debugfs_op_regrd = {</div><div class='add'>+	.owner		=       THIS_MODULE,</div><div class='add'>+	.open		=	bnad_debugfs_open_reg,</div><div class='add'>+	.llseek		=	bnad_debugfs_lseek,</div><div class='add'>+	.read		=	bnad_debugfs_read_regrd,</div><div class='add'>+	.write		=	bnad_debugfs_write_regrd,</div><div class='add'>+	.release	=	bnad_debugfs_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations bnad_debugfs_op_regwr = {</div><div class='add'>+	.owner		=	THIS_MODULE,</div><div class='add'>+	.open		=	bnad_debugfs_open_reg,</div><div class='add'>+	.llseek		=	bnad_debugfs_lseek,</div><div class='add'>+	.write		=	bnad_debugfs_write_regwr,</div><div class='add'>+	.release	=	bnad_debugfs_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations bnad_debugfs_op_drvinfo = {</div><div class='add'>+	.owner		=	THIS_MODULE,</div><div class='add'>+	.open		=	bnad_debugfs_open_drvinfo,</div><div class='add'>+	.llseek		=	bnad_debugfs_lseek,</div><div class='add'>+	.read		=	bnad_debugfs_read,</div><div class='add'>+	.release	=	bnad_debugfs_buffer_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnad_debugfs_entry {</div><div class='add'>+	const char *name;</div><div class='add'>+	mode_t  mode;</div><div class='add'>+	const struct file_operations *fops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bnad_debugfs_entry bnad_debugfs_files[] = {</div><div class='add'>+	{ "fwtrc",  S_IFREG|S_IRUGO, &amp;bnad_debugfs_op_fwtrc, },</div><div class='add'>+	{ "fwsave", S_IFREG|S_IRUGO, &amp;bnad_debugfs_op_fwsave, },</div><div class='add'>+	{ "regrd",  S_IFREG|S_IRUGO|S_IWUSR, &amp;bnad_debugfs_op_regrd, },</div><div class='add'>+	{ "regwr",  S_IFREG|S_IWUSR, &amp;bnad_debugfs_op_regwr, },</div><div class='add'>+	{ "drvinfo", S_IFREG|S_IRUGO, &amp;bnad_debugfs_op_drvinfo, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct dentry *bna_debugfs_root;</div><div class='add'>+static atomic_t bna_debugfs_port_count;</div><div class='add'>+</div><div class='add'>+/* Initialize debugfs interface for BNA */</div><div class='add'>+void</div><div class='add'>+bnad_debugfs_init(struct bnad *bnad)</div><div class='add'>+{</div><div class='add'>+	const struct bnad_debugfs_entry *file;</div><div class='add'>+	char name[64];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Setup the BNA debugfs root directory*/</div><div class='add'>+	if (!bna_debugfs_root) {</div><div class='add'>+		bna_debugfs_root = debugfs_create_dir("bna", NULL);</div><div class='add'>+		atomic_set(&amp;bna_debugfs_port_count, 0);</div><div class='add'>+		if (!bna_debugfs_root) {</div><div class='add'>+			pr_warn("BNA: debugfs root dir creation failed\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup the pci_dev debugfs directory for the port */</div><div class='add'>+	snprintf(name, sizeof(name), "pci_dev:%s", pci_name(bnad-&gt;pcidev));</div><div class='add'>+	if (!bnad-&gt;port_debugfs_root) {</div><div class='add'>+		bnad-&gt;port_debugfs_root =</div><div class='add'>+			debugfs_create_dir(name, bna_debugfs_root);</div><div class='add'>+		if (!bnad-&gt;port_debugfs_root) {</div><div class='add'>+			pr_warn("bna pci_dev %s: root dir creation failed\n",</div><div class='add'>+				pci_name(bnad-&gt;pcidev));</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		atomic_inc(&amp;bna_debugfs_port_count);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(bnad_debugfs_files); i++) {</div><div class='add'>+			file = &amp;bnad_debugfs_files[i];</div><div class='add'>+			bnad-&gt;bnad_dentry_files[i] =</div><div class='add'>+					debugfs_create_file(file-&gt;name,</div><div class='add'>+							file-&gt;mode,</div><div class='add'>+							bnad-&gt;port_debugfs_root,</div><div class='add'>+							bnad,</div><div class='add'>+							file-&gt;fops);</div><div class='add'>+			if (!bnad-&gt;bnad_dentry_files[i]) {</div><div class='add'>+				pr_warn(</div><div class='add'>+				     "BNA pci_dev:%s: create %s entry failed\n",</div><div class='add'>+				     pci_name(bnad-&gt;pcidev), file-&gt;name);</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'>+/* Uninitialize debugfs interface for BNA */</div><div class='add'>+void</div><div class='add'>+bnad_debugfs_uninit(struct bnad *bnad)</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(bnad_debugfs_files); i++) {</div><div class='add'>+		if (bnad-&gt;bnad_dentry_files[i]) {</div><div class='add'>+			debugfs_remove(bnad-&gt;bnad_dentry_files[i]);</div><div class='add'>+			bnad-&gt;bnad_dentry_files[i] = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Remove the pci_dev debugfs directory for the port */</div><div class='add'>+	if (bnad-&gt;port_debugfs_root) {</div><div class='add'>+		debugfs_remove(bnad-&gt;port_debugfs_root);</div><div class='add'>+		bnad-&gt;port_debugfs_root = NULL;</div><div class='add'>+		atomic_dec(&amp;bna_debugfs_port_count);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Remove the BNA debugfs root directory */</div><div class='add'>+	if (atomic_read(&amp;bna_debugfs_port_count) == 0) {</div><div class='add'>+		debugfs_remove(bna_debugfs_root);</div><div class='add'>+		bna_debugfs_root = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c<br/>index fd3dcc1e9145..9b44ec8096ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bnad_ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/bnad_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/bnad_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/brocade/bna/bnad_ethtool.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> 	sizeof(struct bnad_drv_stats) / sizeof(u64) +		\</div><div class='ctx'> 	offsetof(struct bfi_enet_stats, rxf_stats[0]) / sizeof(u64))</div><div class='ctx'> </div><div class='del'>-static char *bnad_net_stats_strings[BNAD_ETHTOOL_STATS_NUM] = {</div><div class='add'>+static const char *bnad_net_stats_strings[BNAD_ETHTOOL_STATS_NUM] = {</div><div class='ctx'> 	"rx_packets",</div><div class='ctx'> 	"tx_packets",</div><div class='ctx'> 	"rx_bytes",</div><div class='hunk'>@@ -296,8 +296,8 @@ bnad_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> 	struct bfa_ioc_attr *ioc_attr;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	strcpy(drvinfo-&gt;driver, BNAD_NAME);</div><div class='del'>-	strcpy(drvinfo-&gt;version, BNAD_VERSION);</div><div class='add'>+	strlcpy(drvinfo-&gt;driver, BNAD_NAME, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, BNAD_VERSION, sizeof(drvinfo-&gt;version));</div><div class='ctx'> </div><div class='ctx'> 	ioc_attr = kzalloc(sizeof(*ioc_attr), GFP_KERNEL);</div><div class='ctx'> 	if (ioc_attr) {</div><div class='hunk'>@@ -305,12 +305,13 @@ bnad_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> 		bfa_nw_ioc_get_attr(&amp;bnad-&gt;bna.ioceth.ioc, ioc_attr);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='ctx'> </div><div class='del'>-		strncpy(drvinfo-&gt;fw_version, ioc_attr-&gt;adapter_attr.fw_ver,</div><div class='del'>-			sizeof(drvinfo-&gt;fw_version) - 1);</div><div class='add'>+		strlcpy(drvinfo-&gt;fw_version, ioc_attr-&gt;adapter_attr.fw_ver,</div><div class='add'>+			sizeof(drvinfo-&gt;fw_version));</div><div class='ctx'> 		kfree(ioc_attr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strncpy(drvinfo-&gt;bus_info, pci_name(bnad-&gt;pcidev), ETHTOOL_BUSINFO_LEN);</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(bnad-&gt;pcidev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -934,7 +935,144 @@ bnad_get_sset_count(struct net_device *netdev, int sset)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ethtool_ops bnad_ethtool_ops = {</div><div class='add'>+static u32</div><div class='add'>+bnad_get_flash_partition_by_offset(struct bnad *bnad, u32 offset,</div><div class='add'>+				u32 *base_offset)</div><div class='add'>+{</div><div class='add'>+	struct bfa_flash_attr *flash_attr;</div><div class='add'>+	struct bnad_iocmd_comp fcomp;</div><div class='add'>+	u32 i, flash_part = 0, ret;</div><div class='add'>+	unsigned long flags = 0;</div><div class='add'>+</div><div class='add'>+	flash_attr = kzalloc(sizeof(struct bfa_flash_attr), GFP_KERNEL);</div><div class='add'>+	if (!flash_attr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fcomp.bnad = bnad;</div><div class='add'>+	fcomp.comp_status = 0;</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;fcomp.comp);</div><div class='add'>+	spin_lock_irqsave(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+	ret = bfa_nw_flash_get_attr(&amp;bnad-&gt;bna.flash, flash_attr,</div><div class='add'>+				bnad_cb_completion, &amp;fcomp);</div><div class='add'>+	if (ret != BFA_STATUS_OK) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+		kfree(flash_attr);</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+	wait_for_completion(&amp;fcomp.comp);</div><div class='add'>+	ret = fcomp.comp_status;</div><div class='add'>+</div><div class='add'>+	/* Check for the flash type &amp; base offset value */</div><div class='add'>+	if (ret == BFA_STATUS_OK) {</div><div class='add'>+		for (i = 0; i &lt; flash_attr-&gt;npart; i++) {</div><div class='add'>+			if (offset &gt;= flash_attr-&gt;part[i].part_off &amp;&amp;</div><div class='add'>+			    offset &lt; (flash_attr-&gt;part[i].part_off +</div><div class='add'>+				      flash_attr-&gt;part[i].part_size)) {</div><div class='add'>+				flash_part = flash_attr-&gt;part[i].part_type;</div><div class='add'>+				*base_offset = flash_attr-&gt;part[i].part_off;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	kfree(flash_attr);</div><div class='add'>+	return flash_part;</div><div class='add'>+out_err:</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+bnad_get_eeprom_len(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	return BFA_TOTAL_FLASH_SIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+bnad_get_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,</div><div class='add'>+		u8 *bytes)</div><div class='add'>+{</div><div class='add'>+	struct bnad *bnad = netdev_priv(netdev);</div><div class='add'>+	struct bnad_iocmd_comp fcomp;</div><div class='add'>+	u32 flash_part = 0, base_offset = 0;</div><div class='add'>+	unsigned long flags = 0;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Check if the flash read request is valid */</div><div class='add'>+	if (eeprom-&gt;magic != (bnad-&gt;pcidev-&gt;vendor |</div><div class='add'>+			     (bnad-&gt;pcidev-&gt;device &lt;&lt; 16)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	/* Query the flash partition based on the offset */</div><div class='add'>+	flash_part = bnad_get_flash_partition_by_offset(bnad,</div><div class='add'>+				eeprom-&gt;offset, &amp;base_offset);</div><div class='add'>+	if (flash_part &lt;= 0)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	fcomp.bnad = bnad;</div><div class='add'>+	fcomp.comp_status = 0;</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;fcomp.comp);</div><div class='add'>+	spin_lock_irqsave(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+	ret = bfa_nw_flash_read_part(&amp;bnad-&gt;bna.flash, flash_part,</div><div class='add'>+				bnad-&gt;id, bytes, eeprom-&gt;len,</div><div class='add'>+				eeprom-&gt;offset - base_offset,</div><div class='add'>+				bnad_cb_completion, &amp;fcomp);</div><div class='add'>+	if (ret != BFA_STATUS_OK) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+	wait_for_completion(&amp;fcomp.comp);</div><div class='add'>+	ret = fcomp.comp_status;</div><div class='add'>+done:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+bnad_set_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,</div><div class='add'>+		u8 *bytes)</div><div class='add'>+{</div><div class='add'>+	struct bnad *bnad = netdev_priv(netdev);</div><div class='add'>+	struct bnad_iocmd_comp fcomp;</div><div class='add'>+	u32 flash_part = 0, base_offset = 0;</div><div class='add'>+	unsigned long flags = 0;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Check if the flash update request is valid */</div><div class='add'>+	if (eeprom-&gt;magic != (bnad-&gt;pcidev-&gt;vendor |</div><div class='add'>+			     (bnad-&gt;pcidev-&gt;device &lt;&lt; 16)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Query the flash partition based on the offset */</div><div class='add'>+	flash_part = bnad_get_flash_partition_by_offset(bnad,</div><div class='add'>+				eeprom-&gt;offset, &amp;base_offset);</div><div class='add'>+	if (flash_part &lt;= 0)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	fcomp.bnad = bnad;</div><div class='add'>+	fcomp.comp_status = 0;</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;fcomp.comp);</div><div class='add'>+	spin_lock_irqsave(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+	ret = bfa_nw_flash_update_part(&amp;bnad-&gt;bna.flash, flash_part,</div><div class='add'>+				bnad-&gt;id, bytes, eeprom-&gt;len,</div><div class='add'>+				eeprom-&gt;offset - base_offset,</div><div class='add'>+				bnad_cb_completion, &amp;fcomp);</div><div class='add'>+	if (ret != BFA_STATUS_OK) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='add'>+	wait_for_completion(&amp;fcomp.comp);</div><div class='add'>+	ret = fcomp.comp_status;</div><div class='add'>+done:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops bnad_ethtool_ops = {</div><div class='ctx'> 	.get_settings = bnad_get_settings,</div><div class='ctx'> 	.set_settings = bnad_set_settings,</div><div class='ctx'> 	.get_drvinfo = bnad_get_drvinfo,</div><div class='hunk'>@@ -948,7 +1086,10 @@ static struct ethtool_ops bnad_ethtool_ops = {</div><div class='ctx'> 	.set_pauseparam = bnad_set_pauseparam,</div><div class='ctx'> 	.get_strings = bnad_get_strings,</div><div class='ctx'> 	.get_ethtool_stats = bnad_get_ethtool_stats,</div><div class='del'>-	.get_sset_count = bnad_get_sset_count</div><div class='add'>+	.get_sset_count = bnad_get_sset_count,</div><div class='add'>+	.get_eeprom_len = bnad_get_eeprom_len,</div><div class='add'>+	.get_eeprom = bnad_get_eeprom,</div><div class='add'>+	.set_eeprom = bnad_set_eeprom,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/cna.h b/drivers/net/ethernet/brocade/bna/cna.h<br/>index 1b3e90dfbd9a..32e8f178ab76 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/cna.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/cna.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/cna.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/brocade/bna/cna.h</a></div><div class='hunk'>@@ -43,8 +43,7 @@ extern char bfa_version[];</div><div class='ctx'> </div><div class='ctx'> #pragma pack(1)</div><div class='ctx'> </div><div class='del'>-#define MAC_ADDRLEN	(6)</div><div class='del'>-typedef struct mac { u8 mac[MAC_ADDRLEN]; } mac_t;</div><div class='add'>+typedef struct mac { u8 mac[ETH_ALEN]; } mac_t;</div><div class='ctx'> </div><div class='ctx'> #pragma pack()</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/cna_fwimg.c b/drivers/net/ethernet/brocade/bna/cna_fwimg.c<br/>index 725b9fff337f..cfc22a64157e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/cna_fwimg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/brocade/bna/cna_fwimg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/brocade/bna/cna_fwimg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/brocade/bna/cna_fwimg.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'>  * www.brocade.com</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='add'>+#include "bnad.h"</div><div class='ctx'> #include "bfi.h"</div><div class='ctx'> #include "cna.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig<br/>index b48378a41e49..db931916da08 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/cadence/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/cadence/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/cadence/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/cadence/Kconfig</a></div><div class='hunk'>@@ -5,8 +5,8 @@</div><div class='ctx'> config HAVE_NET_MACB</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='del'>-config NET_ATMEL</div><div class='del'>-	bool "Atmel devices"</div><div class='add'>+config NET_CADENCE</div><div class='add'>+	bool "Cadence devices"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on HAVE_NET_MACB || (ARM &amp;&amp; ARCH_AT91RM9200)</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -21,7 +21,7 @@ config NET_ATMEL</div><div class='ctx'> 	  the remaining Atmel network card questions. If you say Y, you will be</div><div class='ctx'> 	  asked for your specific card in the following questions.</div><div class='ctx'> </div><div class='del'>-if NET_ATMEL</div><div class='add'>+if NET_CADENCE</div><div class='ctx'> </div><div class='ctx'> config ARM_AT91_ETHER</div><div class='ctx'> 	tristate "AT91RM9200 Ethernet support"</div><div class='hunk'>@@ -33,14 +33,16 @@ config ARM_AT91_ETHER</div><div class='ctx'> 	  ethernet support, then you should always answer Y to this.</div><div class='ctx'> </div><div class='ctx'> config MACB</div><div class='del'>-	tristate "Atmel MACB support"</div><div class='add'>+	tristate "Cadence MACB/GEM support"</div><div class='ctx'> 	depends on HAVE_NET_MACB</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	---help---</div><div class='del'>-	  The Atmel MACB ethernet interface is found on many AT32 and AT91</div><div class='del'>-	  parts. Say Y to include support for the MACB chip.</div><div class='add'>+	  The Cadence MACB ethernet interface is found on many Atmel AT32 and</div><div class='add'>+	  AT91 parts.  This driver also supports the Cadence GEM (Gigabit</div><div class='add'>+	  Ethernet MAC found in some ARM SoC devices).  Note: the Gigabit mode</div><div class='add'>+	  is not yet supported.  Say Y to include support for the MACB/GEM chip.</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 macb.</div><div class='ctx'> </div><div class='del'>-endif # NET_ATMEL</div><div class='add'>+endif # NET_CADENCE</div><div class='head'>diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c<br/>index 56624d303487..1a5b6efa0120 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/cadence/at91_ether.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/cadence/at91_ether.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/cadence/at91_ether.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/cadence/at91_ether.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/platform_data/macb.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='hunk'>@@ -255,8 +256,7 @@ static void enable_phyirq(struct net_device *dev)</div><div class='ctx'> 	unsigned int dsintr, irq_number;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	irq_number = lp-&gt;board_data.phy_irq_pin;</div><div class='del'>-	if (!irq_number) {</div><div class='add'>+	if (!gpio_is_valid(lp-&gt;board_data.phy_irq_pin)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * PHY doesn't have an IRQ pin (RTL8201, DP83847, AC101L),</div><div class='ctx'> 		 * or board does not have it connected.</div><div class='hunk'>@@ -265,6 +265,7 @@ static void enable_phyirq(struct net_device *dev)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	irq_number = lp-&gt;board_data.phy_irq_pin;</div><div class='ctx'> 	status = request_irq(irq_number, at91ether_phy_interrupt, 0, dev-&gt;name, dev);</div><div class='ctx'> 	if (status) {</div><div class='ctx'> 		printk(KERN_ERR "at91_ether: PHY IRQ %d request failed - status %d!\n", irq_number, status);</div><div class='hunk'>@@ -319,8 +320,7 @@ static void disable_phyirq(struct net_device *dev)</div><div class='ctx'> 	unsigned int dsintr;</div><div class='ctx'> 	unsigned int irq_number;</div><div class='ctx'> </div><div class='del'>-	irq_number = lp-&gt;board_data.phy_irq_pin;</div><div class='del'>-	if (!irq_number) {</div><div class='add'>+	if (!gpio_is_valid(lp-&gt;board_data.phy_irq_pin)) {</div><div class='ctx'> 		del_timer_sync(&amp;lp-&gt;check_timer);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -365,6 +365,7 @@ static void disable_phyirq(struct net_device *dev)</div><div class='ctx'> 	disable_mdi();</div><div class='ctx'> 	spin_unlock_irq(&amp;lp-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	irq_number = lp-&gt;board_data.phy_irq_pin;</div><div class='ctx'> 	free_irq(irq_number, dev);			/* Free interrupt handler */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -984,7 +985,7 @@ static const struct net_device_ops at91ether_netdev_ops = {</div><div class='ctx'> static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_address,</div><div class='ctx'> 			struct platform_device *pdev, struct clk *ether_clk)</div><div class='ctx'> {</div><div class='del'>-	struct at91_eth_data *board_data = pdev-&gt;dev.platform_data;</div><div class='add'>+	struct macb_platform_data *board_data = pdev-&gt;dev.platform_data;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct at91_private *lp;</div><div class='ctx'> 	unsigned int val;</div><div class='hunk'>@@ -1077,7 +1078,7 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add</div><div class='ctx'> 	netif_carrier_off(dev);		/* will be enabled in open() */</div><div class='ctx'> </div><div class='ctx'> 	/* If board has no PHY IRQ, use a timer to poll the PHY */</div><div class='del'>-	if (!lp-&gt;board_data.phy_irq_pin) {</div><div class='add'>+	if (!gpio_is_valid(lp-&gt;board_data.phy_irq_pin)) {</div><div class='ctx'> 		init_timer(&amp;lp-&gt;check_timer);</div><div class='ctx'> 		lp-&gt;check_timer.data = (unsigned long)dev;</div><div class='ctx'> 		lp-&gt;check_timer.function = at91ether_check_link;</div><div class='hunk'>@@ -1169,7 +1170,8 @@ static int __devexit at91ether_remove(struct platform_device *pdev)</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct at91_private *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (lp-&gt;board_data.phy_irq_pin &gt;= 32)</div><div class='add'>+	if (gpio_is_valid(lp-&gt;board_data.phy_irq_pin) &amp;&amp;</div><div class='add'>+	    lp-&gt;board_data.phy_irq_pin &gt;= 32)</div><div class='ctx'> 		gpio_free(lp-&gt;board_data.phy_irq_pin);</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(dev);</div><div class='hunk'>@@ -1188,11 +1190,12 @@ static int at91ether_suspend(struct platform_device *pdev, pm_message_t mesg)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *net_dev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct at91_private *lp = netdev_priv(net_dev);</div><div class='del'>-	int phy_irq = lp-&gt;board_data.phy_irq_pin;</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(net_dev)) {</div><div class='del'>-		if (phy_irq)</div><div class='add'>+		if (gpio_is_valid(lp-&gt;board_data.phy_irq_pin)) {</div><div class='add'>+			int phy_irq = lp-&gt;board_data.phy_irq_pin;</div><div class='ctx'> 			disable_irq(phy_irq);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		netif_stop_queue(net_dev);</div><div class='ctx'> 		netif_device_detach(net_dev);</div><div class='hunk'>@@ -1206,7 +1209,6 @@ static int at91ether_resume(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *net_dev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct at91_private *lp = netdev_priv(net_dev);</div><div class='del'>-	int phy_irq = lp-&gt;board_data.phy_irq_pin;</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(net_dev)) {</div><div class='ctx'> 		clk_enable(lp-&gt;ether_clk);</div><div class='hunk'>@@ -1214,8 +1216,10 @@ static int at91ether_resume(struct platform_device *pdev)</div><div class='ctx'> 		netif_device_attach(net_dev);</div><div class='ctx'> 		netif_start_queue(net_dev);</div><div class='ctx'> </div><div class='del'>-		if (phy_irq)</div><div class='add'>+		if (gpio_is_valid(lp-&gt;board_data.phy_irq_pin)) {</div><div class='add'>+			int phy_irq = lp-&gt;board_data.phy_irq_pin;</div><div class='ctx'> 			enable_irq(phy_irq);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/cadence/at91_ether.h b/drivers/net/ethernet/cadence/at91_ether.h<br/>index 353f4dab62be..3725fbb0defe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/cadence/at91_ether.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/cadence/at91_ether.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/cadence/at91_ether.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/cadence/at91_ether.h</a></div><div class='hunk'>@@ -85,7 +85,9 @@ struct recv_desc_bufs</div><div class='ctx'> struct at91_private</div><div class='ctx'> {</div><div class='ctx'> 	struct mii_if_info mii;			/* ethtool support */</div><div class='del'>-	struct at91_eth_data board_data;	/* board-specific configuration */</div><div class='add'>+	struct macb_platform_data board_data;	/* board-specific</div><div class='add'>+						 * configuration (shared with</div><div class='add'>+						 * macb for common data */</div><div class='ctx'> 	struct clk *ether_clk;			/* clock */</div><div class='ctx'> </div><div class='ctx'> 	/* PHY */</div><div class='head'>diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c<br/>index a437b46e5490..23200680d4c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/cadence/macb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/cadence/macb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/cadence/macb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/cadence/macb.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Atmel MACB Ethernet Controller driver</div><div class='add'>+ * Cadence MACB/GEM Ethernet Controller driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2004-2006 Atmel Corporation</div><div class='ctx'>  *</div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</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/moduleparam.h&gt;</div><div class='hunk'>@@ -19,11 +20,12 @@</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/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/platform_data/macb.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/board.h&gt;</div><div class='del'>-#include &lt;mach/cpu.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/of_net.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "macb.h"</div><div class='ctx'> </div><div class='hunk'>@@ -60,9 +62,9 @@ static void __macb_set_hwaddr(struct macb *bp)</div><div class='ctx'> 	u16 top;</div><div class='ctx'> </div><div class='ctx'> 	bottom = cpu_to_le32(*((u32 *)bp-&gt;dev-&gt;dev_addr));</div><div class='del'>-	macb_writel(bp, SA1B, bottom);</div><div class='add'>+	macb_or_gem_writel(bp, SA1B, bottom);</div><div class='ctx'> 	top = cpu_to_le16(*((u16 *)(bp-&gt;dev-&gt;dev_addr + 4)));</div><div class='del'>-	macb_writel(bp, SA1T, top);</div><div class='add'>+	macb_or_gem_writel(bp, SA1T, top);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init macb_get_hwaddr(struct macb *bp)</div><div class='hunk'>@@ -71,8 +73,8 @@ static void __init macb_get_hwaddr(struct macb *bp)</div><div class='ctx'> 	u16 top;</div><div class='ctx'> 	u8 addr[6];</div><div class='ctx'> </div><div class='del'>-	bottom = macb_readl(bp, SA1B);</div><div class='del'>-	top = macb_readl(bp, SA1T);</div><div class='add'>+	bottom = macb_or_gem_readl(bp, SA1B);</div><div class='add'>+	top = macb_or_gem_readl(bp, SA1T);</div><div class='ctx'> </div><div class='ctx'> 	addr[0] = bottom &amp; 0xff;</div><div class='ctx'> 	addr[1] = (bottom &gt;&gt; 8) &amp; 0xff;</div><div class='hunk'>@@ -84,7 +86,7 @@ static void __init macb_get_hwaddr(struct macb *bp)</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='ctx'> 	} else {</div><div class='del'>-		dev_info(&amp;bp-&gt;pdev-&gt;dev, "invalid hw address, using random\n");</div><div class='add'>+		netdev_info(bp-&gt;dev, "invalid hw address, using random\n");</div><div class='ctx'> 		random_ether_addr(bp-&gt;dev-&gt;dev_addr);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -178,11 +180,12 @@ static void macb_handle_link_change(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (status_change) {</div><div class='ctx'> 		if (phydev-&gt;link)</div><div class='del'>-			printk(KERN_INFO "%s: link up (%d/%s)\n",</div><div class='del'>-			       dev-&gt;name, phydev-&gt;speed,</div><div class='del'>-			       DUPLEX_FULL == phydev-&gt;duplex ? "Full":"Half");</div><div class='add'>+			netdev_info(dev, "link up (%d/%s)\n",</div><div class='add'>+				    phydev-&gt;speed,</div><div class='add'>+				    phydev-&gt;duplex == DUPLEX_FULL ?</div><div class='add'>+				    "Full" : "Half");</div><div class='ctx'> 		else</div><div class='del'>-			printk(KERN_INFO "%s: link down\n", dev-&gt;name);</div><div class='add'>+			netdev_info(dev, "link down\n");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -191,25 +194,21 @@ 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='ctx'> 	struct phy_device *phydev;</div><div class='del'>-	struct eth_platform_data *pdata;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	phydev = phy_find_first(bp-&gt;mii_bus);</div><div class='ctx'> 	if (!phydev) {</div><div class='del'>-		printk (KERN_ERR "%s: no PHY found\n", dev-&gt;name);</div><div class='add'>+		netdev_err(dev, "no PHY found\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pdata = bp-&gt;pdev-&gt;dev.platform_data;</div><div class='ctx'> 	/* TODO : add pin_irq */</div><div class='ctx'> </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, 0,</div><div class='del'>-				 pdata &amp;&amp; pdata-&gt;is_rmii ?</div><div class='del'>-				 PHY_INTERFACE_MODE_RMII :</div><div class='del'>-				 PHY_INTERFACE_MODE_MII);</div><div class='add'>+				 bp-&gt;phy_interface);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		printk(KERN_ERR "%s: Could not attach to PHY\n", dev-&gt;name);</div><div class='add'>+		netdev_err(dev, "Could not attach to PHY\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -228,7 +227,7 @@ 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 eth_platform_data *pdata;</div><div class='add'>+	struct macb_platform_data *pdata;</div><div class='ctx'> 	int err = -ENXIO, i;</div><div class='ctx'> </div><div class='ctx'> 	/* Enable management port */</div><div class='hunk'>@@ -244,7 +243,8 @@ static int macb_mii_init(struct macb *bp)</div><div class='ctx'> 	bp-&gt;mii_bus-&gt;read = &amp;macb_mdio_read;</div><div class='ctx'> 	bp-&gt;mii_bus-&gt;write = &amp;macb_mdio_write;</div><div class='ctx'> 	bp-&gt;mii_bus-&gt;reset = &amp;macb_mdio_reset;</div><div class='del'>-	snprintf(bp-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%x", bp-&gt;pdev-&gt;id);</div><div class='add'>+	snprintf(bp-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%s-%x",</div><div class='add'>+		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;dev-&gt;dev;</div><div class='ctx'> 	pdata = bp-&gt;pdev-&gt;dev.platform_data;</div><div class='hunk'>@@ -285,8 +285,8 @@ err_out:</div><div class='ctx'> static void macb_update_stats(struct macb *bp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 __iomem *reg = bp-&gt;regs + MACB_PFR;</div><div class='del'>-	u32 *p = &amp;bp-&gt;hw_stats.rx_pause_frames;</div><div class='del'>-	u32 *end = &amp;bp-&gt;hw_stats.tx_pause_frames + 1;</div><div class='add'>+	u32 *p = &amp;bp-&gt;hw_stats.macb.rx_pause_frames;</div><div class='add'>+	u32 *end = &amp;bp-&gt;hw_stats.macb.tx_pause_frames + 1;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON((unsigned long)(end - p - 1) != (MACB_TPF - MACB_PFR) / 4);</div><div class='ctx'> </div><div class='hunk'>@@ -303,14 +303,13 @@ static void macb_tx(struct macb *bp)</div><div class='ctx'> 	status = macb_readl(bp, TSR);</div><div class='ctx'> 	macb_writel(bp, TSR, status);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;bp-&gt;pdev-&gt;dev, "macb_tx status = %02lx\n",</div><div class='del'>-		(unsigned long)status);</div><div class='add'>+	netdev_dbg(bp-&gt;dev, "macb_tx status = %02lx\n", (unsigned long)status);</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; (MACB_BIT(UND) | MACB_BIT(TSR_RLE))) {</div><div class='ctx'> 		int i;</div><div class='del'>-		printk(KERN_ERR "%s: TX %s, resetting buffers\n",</div><div class='del'>-			bp-&gt;dev-&gt;name, status &amp; MACB_BIT(UND) ?</div><div class='del'>-			"underrun" : "retry limit exceeded");</div><div class='add'>+		netdev_err(bp-&gt;dev, "TX %s, resetting buffers\n",</div><div class='add'>+			   status &amp; MACB_BIT(UND) ?</div><div class='add'>+			   "underrun" : "retry limit exceeded");</div><div class='ctx'> </div><div class='ctx'> 		/* Transfer ongoing, disable transmitter, to avoid confusion */</div><div class='ctx'> 		if (status &amp; MACB_BIT(TGO))</div><div class='hunk'>@@ -369,8 +368,8 @@ static void macb_tx(struct macb *bp)</div><div class='ctx'> 		if (!(bufstat &amp; MACB_BIT(TX_USED)))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		dev_dbg(&amp;bp-&gt;pdev-&gt;dev, "skb %u (data %p) TX complete\n",</div><div class='del'>-			tail, skb-&gt;data);</div><div class='add'>+		netdev_dbg(bp-&gt;dev, "skb %u (data %p) TX complete\n",</div><div class='add'>+			   tail, skb-&gt;data);</div><div class='ctx'> 		dma_unmap_single(&amp;bp-&gt;pdev-&gt;dev, rp-&gt;mapping, skb-&gt;len,</div><div class='ctx'> 				 DMA_TO_DEVICE);</div><div class='ctx'> 		bp-&gt;stats.tx_packets++;</div><div class='hunk'>@@ -395,8 +394,8 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag,</div><div class='ctx'> </div><div class='ctx'> 	len = MACB_BFEXT(RX_FRMLEN, bp-&gt;rx_ring[last_frag].ctrl);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;bp-&gt;pdev-&gt;dev, "macb_rx_frame frags %u - %u (len %u)\n",</div><div class='del'>-		first_frag, last_frag, len);</div><div class='add'>+	netdev_dbg(bp-&gt;dev, "macb_rx_frame frags %u - %u (len %u)\n",</div><div class='add'>+		   first_frag, last_frag, len);</div><div class='ctx'> </div><div class='ctx'> 	skb = dev_alloc_skb(len + RX_OFFSET);</div><div class='ctx'> 	if (!skb) {</div><div class='hunk'>@@ -437,8 +436,8 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag,</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;stats.rx_packets++;</div><div class='ctx'> 	bp-&gt;stats.rx_bytes += len;</div><div class='del'>-	dev_dbg(&amp;bp-&gt;pdev-&gt;dev, "received skb of length %u, csum: %08x\n",</div><div class='del'>-		skb-&gt;len, skb-&gt;csum);</div><div class='add'>+	netdev_dbg(bp-&gt;dev, "received skb of length %u, csum: %08x\n",</div><div class='add'>+		   skb-&gt;len, skb-&gt;csum);</div><div class='ctx'> 	netif_receive_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -515,8 +514,8 @@ static int macb_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> </div><div class='ctx'> 	work_done = 0;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;bp-&gt;pdev-&gt;dev, "poll: status = %08lx, budget = %d\n",</div><div class='del'>-		(unsigned long)status, budget);</div><div class='add'>+	netdev_dbg(bp-&gt;dev, "poll: status = %08lx, budget = %d\n",</div><div class='add'>+		   (unsigned long)status, budget);</div><div class='ctx'> </div><div class='ctx'> 	work_done = macb_rx(bp, budget);</div><div class='ctx'> 	if (work_done &lt; budget) {</div><div class='hunk'>@@ -565,8 +564,7 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)</div><div class='ctx'> 			macb_writel(bp, IDR, MACB_RX_INT_FLAGS);</div><div class='ctx'> </div><div class='ctx'> 			if (napi_schedule_prep(&amp;bp-&gt;napi)) {</div><div class='del'>-				dev_dbg(&amp;bp-&gt;pdev-&gt;dev,</div><div class='del'>-					"scheduling RX softirq\n");</div><div class='add'>+				netdev_dbg(bp-&gt;dev, "scheduling RX softirq\n");</div><div class='ctx'> 				__napi_schedule(&amp;bp-&gt;napi);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -582,16 +580,19 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 		if (status &amp; MACB_BIT(ISR_ROVR)) {</div><div class='ctx'> 			/* We missed at least one packet */</div><div class='del'>-			bp-&gt;hw_stats.rx_overruns++;</div><div class='add'>+			if (macb_is_gem(bp))</div><div class='add'>+				bp-&gt;hw_stats.gem.rx_overruns++;</div><div class='add'>+			else</div><div class='add'>+				bp-&gt;hw_stats.macb.rx_overruns++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (status &amp; MACB_BIT(HRESP)) {</div><div class='ctx'> 			/*</div><div class='del'>-			 * TODO: Reset the hardware, and maybe move the printk</div><div class='del'>-			 * to a lower-priority context as well (work queue?)</div><div class='add'>+			 * TODO: Reset the hardware, and maybe move the</div><div class='add'>+			 * netdev_err to a lower-priority context as well</div><div class='add'>+			 * (work queue?)</div><div class='ctx'> 			 */</div><div class='del'>-			printk(KERN_ERR "%s: DMA bus error: HRESP not OK\n",</div><div class='del'>-			       dev-&gt;name);</div><div class='add'>+			netdev_err(dev, "DMA bus error: HRESP not OK\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		status = macb_readl(bp, ISR);</div><div class='hunk'>@@ -626,16 +627,12 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-	int i;</div><div class='del'>-	dev_dbg(&amp;bp-&gt;pdev-&gt;dev,</div><div class='del'>-		"start_xmit: len %u head %p data %p tail %p end %p\n",</div><div class='del'>-		skb-&gt;len, skb-&gt;head, skb-&gt;data,</div><div class='del'>-		skb_tail_pointer(skb), skb_end_pointer(skb));</div><div class='del'>-	dev_dbg(&amp;bp-&gt;pdev-&gt;dev,</div><div class='del'>-		"data:");</div><div class='del'>-	for (i = 0; i &lt; 16; i++)</div><div class='del'>-		printk(" %02x", (unsigned int)skb-&gt;data[i]);</div><div class='del'>-	printk("\n");</div><div class='add'>+	netdev_dbg(bp-&gt;dev,</div><div class='add'>+		   "start_xmit: len %u head %p data %p tail %p end %p\n",</div><div class='add'>+		   skb-&gt;len, skb-&gt;head, skb-&gt;data,</div><div class='add'>+		   skb_tail_pointer(skb), skb_end_pointer(skb));</div><div class='add'>+	print_hex_dump(KERN_DEBUG, "data: ", DUMP_PREFIX_OFFSET, 16, 1,</div><div class='add'>+		       skb-&gt;data, 16, true);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	len = skb-&gt;len;</div><div class='hunk'>@@ -645,21 +642,20 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	if (TX_BUFFS_AVAIL(bp) &lt; 1) {</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;bp-&gt;lock, flags);</div><div class='del'>-		dev_err(&amp;bp-&gt;pdev-&gt;dev,</div><div class='del'>-			"BUG! Tx Ring full when queue awake!\n");</div><div class='del'>-		dev_dbg(&amp;bp-&gt;pdev-&gt;dev, "tx_head = %u, tx_tail = %u\n",</div><div class='del'>-			bp-&gt;tx_head, bp-&gt;tx_tail);</div><div class='add'>+		netdev_err(bp-&gt;dev, "BUG! Tx Ring full when queue awake!\n");</div><div class='add'>+		netdev_dbg(bp-&gt;dev, "tx_head = %u, tx_tail = %u\n",</div><div class='add'>+			   bp-&gt;tx_head, bp-&gt;tx_tail);</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	entry = bp-&gt;tx_head;</div><div class='del'>-	dev_dbg(&amp;bp-&gt;pdev-&gt;dev, "Allocated ring entry %u\n", entry);</div><div class='add'>+	netdev_dbg(bp-&gt;dev, "Allocated ring entry %u\n", entry);</div><div class='ctx'> 	mapping = dma_map_single(&amp;bp-&gt;pdev-&gt;dev, skb-&gt;data,</div><div class='ctx'> 				 len, DMA_TO_DEVICE);</div><div class='ctx'> 	bp-&gt;tx_skb[entry].skb = skb;</div><div class='ctx'> 	bp-&gt;tx_skb[entry].mapping = mapping;</div><div class='del'>-	dev_dbg(&amp;bp-&gt;pdev-&gt;dev, "Mapped skb data %p to DMA addr %08lx\n",</div><div class='del'>-		skb-&gt;data, (unsigned long)mapping);</div><div class='add'>+	netdev_dbg(bp-&gt;dev, "Mapped skb data %p to DMA addr %08lx\n",</div><div class='add'>+		   skb-&gt;data, (unsigned long)mapping);</div><div class='ctx'> </div><div class='ctx'> 	ctrl = MACB_BF(TX_FRMLEN, len);</div><div class='ctx'> 	ctrl |= MACB_BIT(TX_LAST);</div><div class='hunk'>@@ -723,27 +719,27 @@ static int macb_alloc_consistent(struct macb *bp)</div><div class='ctx'> 					 &amp;bp-&gt;rx_ring_dma, GFP_KERNEL);</div><div class='ctx'> 	if (!bp-&gt;rx_ring)</div><div class='ctx'> 		goto out_err;</div><div class='del'>-	dev_dbg(&amp;bp-&gt;pdev-&gt;dev,</div><div class='del'>-		"Allocated RX ring of %d bytes at %08lx (mapped %p)\n",</div><div class='del'>-		size, (unsigned long)bp-&gt;rx_ring_dma, bp-&gt;rx_ring);</div><div class='add'>+	netdev_dbg(bp-&gt;dev,</div><div class='add'>+		   "Allocated RX ring of %d bytes at %08lx (mapped %p)\n",</div><div class='add'>+		   size, (unsigned long)bp-&gt;rx_ring_dma, bp-&gt;rx_ring);</div><div class='ctx'> </div><div class='ctx'> 	size = TX_RING_BYTES;</div><div class='ctx'> 	bp-&gt;tx_ring = dma_alloc_coherent(&amp;bp-&gt;pdev-&gt;dev, size,</div><div class='ctx'> 					 &amp;bp-&gt;tx_ring_dma, GFP_KERNEL);</div><div class='ctx'> 	if (!bp-&gt;tx_ring)</div><div class='ctx'> 		goto out_err;</div><div class='del'>-	dev_dbg(&amp;bp-&gt;pdev-&gt;dev,</div><div class='del'>-		"Allocated TX ring of %d bytes at %08lx (mapped %p)\n",</div><div class='del'>-		size, (unsigned long)bp-&gt;tx_ring_dma, bp-&gt;tx_ring);</div><div class='add'>+	netdev_dbg(bp-&gt;dev,</div><div class='add'>+		   "Allocated TX ring of %d bytes at %08lx (mapped %p)\n",</div><div class='add'>+		   size, (unsigned long)bp-&gt;tx_ring_dma, bp-&gt;tx_ring);</div><div class='ctx'> </div><div class='ctx'> 	size = RX_RING_SIZE * RX_BUFFER_SIZE;</div><div class='ctx'> 	bp-&gt;rx_buffers = dma_alloc_coherent(&amp;bp-&gt;pdev-&gt;dev, size,</div><div class='ctx'> 					    &amp;bp-&gt;rx_buffers_dma, GFP_KERNEL);</div><div class='ctx'> 	if (!bp-&gt;rx_buffers)</div><div class='ctx'> 		goto out_err;</div><div class='del'>-	dev_dbg(&amp;bp-&gt;pdev-&gt;dev,</div><div class='del'>-		"Allocated RX buffers of %d bytes at %08lx (mapped %p)\n",</div><div class='del'>-		size, (unsigned long)bp-&gt;rx_buffers_dma, bp-&gt;rx_buffers);</div><div class='add'>+	netdev_dbg(bp-&gt;dev,</div><div class='add'>+		   "Allocated RX buffers of %d bytes at %08lx (mapped %p)\n",</div><div class='add'>+		   size, (unsigned long)bp-&gt;rx_buffers_dma, bp-&gt;rx_buffers);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -797,6 +793,84 @@ static void macb_reset_hw(struct macb *bp)</div><div class='ctx'> 	macb_readl(bp, ISR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 gem_mdc_clk_div(struct macb *bp)</div><div class='add'>+{</div><div class='add'>+	u32 config;</div><div class='add'>+	unsigned long pclk_hz = clk_get_rate(bp-&gt;pclk);</div><div class='add'>+</div><div class='add'>+	if (pclk_hz &lt;= 20000000)</div><div class='add'>+		config = GEM_BF(CLK, GEM_CLK_DIV8);</div><div class='add'>+	else if (pclk_hz &lt;= 40000000)</div><div class='add'>+		config = GEM_BF(CLK, GEM_CLK_DIV16);</div><div class='add'>+	else if (pclk_hz &lt;= 80000000)</div><div class='add'>+		config = GEM_BF(CLK, GEM_CLK_DIV32);</div><div class='add'>+	else if (pclk_hz &lt;= 120000000)</div><div class='add'>+		config = GEM_BF(CLK, GEM_CLK_DIV48);</div><div class='add'>+	else if (pclk_hz &lt;= 160000000)</div><div class='add'>+		config = GEM_BF(CLK, GEM_CLK_DIV64);</div><div class='add'>+	else</div><div class='add'>+		config = GEM_BF(CLK, GEM_CLK_DIV96);</div><div class='add'>+</div><div class='add'>+	return config;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 macb_mdc_clk_div(struct macb *bp)</div><div class='add'>+{</div><div class='add'>+	u32 config;</div><div class='add'>+	unsigned long pclk_hz;</div><div class='add'>+</div><div class='add'>+	if (macb_is_gem(bp))</div><div class='add'>+		return gem_mdc_clk_div(bp);</div><div class='add'>+</div><div class='add'>+	pclk_hz = clk_get_rate(bp-&gt;pclk);</div><div class='add'>+	if (pclk_hz &lt;= 20000000)</div><div class='add'>+		config = MACB_BF(CLK, MACB_CLK_DIV8);</div><div class='add'>+	else if (pclk_hz &lt;= 40000000)</div><div class='add'>+		config = MACB_BF(CLK, MACB_CLK_DIV16);</div><div class='add'>+	else if (pclk_hz &lt;= 80000000)</div><div class='add'>+		config = MACB_BF(CLK, MACB_CLK_DIV32);</div><div class='add'>+	else</div><div class='add'>+		config = MACB_BF(CLK, MACB_CLK_DIV64);</div><div class='add'>+</div><div class='add'>+	return config;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get the DMA bus width field of the network configuration register that we</div><div class='add'>+ * should program.  We find the width from decoding the design configuration</div><div class='add'>+ * register to find the maximum supported data bus width.</div><div class='add'>+ */</div><div class='add'>+static u32 macb_dbw(struct macb *bp)</div><div class='add'>+{</div><div class='add'>+	if (!macb_is_gem(bp))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (GEM_BFEXT(DBWDEF, gem_readl(bp, DCFG1))) {</div><div class='add'>+	case 4:</div><div class='add'>+		return GEM_BF(DBW, GEM_DBW128);</div><div class='add'>+	case 2:</div><div class='add'>+		return GEM_BF(DBW, GEM_DBW64);</div><div class='add'>+	case 1:</div><div class='add'>+	default:</div><div class='add'>+		return GEM_BF(DBW, GEM_DBW32);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Configure the receive DMA engine to use the correct receive buffer size.</div><div class='add'>+ * This is a configurable parameter for GEM.</div><div class='add'>+ */</div><div class='add'>+static void macb_configure_dma(struct macb *bp)</div><div class='add'>+{</div><div class='add'>+	u32 dmacfg;</div><div class='add'>+</div><div class='add'>+	if (macb_is_gem(bp)) {</div><div class='add'>+		dmacfg = gem_readl(bp, DMACFG) &amp; ~GEM_BF(RXBS, -1L);</div><div class='add'>+		dmacfg |= GEM_BF(RXBS, RX_BUFFER_SIZE / 64);</div><div class='add'>+		gem_writel(bp, DMACFG, dmacfg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void macb_init_hw(struct macb *bp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 config;</div><div class='hunk'>@@ -804,7 +878,7 @@ static void macb_init_hw(struct macb *bp)</div><div class='ctx'> 	macb_reset_hw(bp);</div><div class='ctx'> 	__macb_set_hwaddr(bp);</div><div class='ctx'> </div><div class='del'>-	config = macb_readl(bp, NCFGR) &amp; MACB_BF(CLK, -1L);</div><div class='add'>+	config = macb_mdc_clk_div(bp);</div><div class='ctx'> 	config |= MACB_BIT(PAE);		/* PAuse Enable */</div><div class='ctx'> 	config |= MACB_BIT(DRFCS);		/* Discard Rx FCS */</div><div class='ctx'> 	config |= MACB_BIT(BIG);		/* Receive oversized frames */</div><div class='hunk'>@@ -812,8 +886,11 @@ static void macb_init_hw(struct macb *bp)</div><div class='ctx'> 		config |= MACB_BIT(CAF);	/* Copy All Frames */</div><div class='ctx'> 	if (!(bp-&gt;dev-&gt;flags &amp; IFF_BROADCAST))</div><div class='ctx'> 		config |= MACB_BIT(NBC);	/* No BroadCast */</div><div class='add'>+	config |= macb_dbw(bp);</div><div class='ctx'> 	macb_writel(bp, NCFGR, config);</div><div class='ctx'> </div><div class='add'>+	macb_configure_dma(bp);</div><div class='add'>+</div><div class='ctx'> 	/* Initialize TX and RX buffers */</div><div class='ctx'> 	macb_writel(bp, RBQP, bp-&gt;rx_ring_dma);</div><div class='ctx'> 	macb_writel(bp, TBQP, bp-&gt;tx_ring_dma);</div><div class='hunk'>@@ -909,8 +986,8 @@ static void macb_sethashtable(struct net_device *dev)</div><div class='ctx'> 		mc_filter[bitnr &gt;&gt; 5] |= 1 &lt;&lt; (bitnr &amp; 31);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	macb_writel(bp, HRB, mc_filter[0]);</div><div class='del'>-	macb_writel(bp, HRT, mc_filter[1]);</div><div class='add'>+	macb_or_gem_writel(bp, HRB, mc_filter[0]);</div><div class='add'>+	macb_or_gem_writel(bp, HRT, mc_filter[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -932,8 +1009,8 @@ static void macb_set_rx_mode(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='ctx'> 		/* Enable all multicast mode */</div><div class='del'>-		macb_writel(bp, HRB, -1);</div><div class='del'>-		macb_writel(bp, HRT, -1);</div><div class='add'>+		macb_or_gem_writel(bp, HRB, -1);</div><div class='add'>+		macb_or_gem_writel(bp, HRT, -1);</div><div class='ctx'> 		cfg |= MACB_BIT(NCFGR_MTI);</div><div class='ctx'> 	} else if (!netdev_mc_empty(dev)) {</div><div class='ctx'> 		/* Enable specific multicasts */</div><div class='hunk'>@@ -941,8 +1018,8 @@ static void macb_set_rx_mode(struct net_device *dev)</div><div class='ctx'> 		cfg |= MACB_BIT(NCFGR_MTI);</div><div class='ctx'> 	} else if (dev-&gt;flags &amp; (~IFF_ALLMULTI)) {</div><div class='ctx'> 		/* Disable all multicast mode */</div><div class='del'>-		macb_writel(bp, HRB, 0);</div><div class='del'>-		macb_writel(bp, HRT, 0);</div><div class='add'>+		macb_or_gem_writel(bp, HRB, 0);</div><div class='add'>+		macb_or_gem_writel(bp, HRT, 0);</div><div class='ctx'> 		cfg &amp;= ~MACB_BIT(NCFGR_MTI);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -954,7 +1031,7 @@ static int macb_open(struct net_device *dev)</div><div class='ctx'> 	struct macb *bp = netdev_priv(dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;bp-&gt;pdev-&gt;dev, "open\n");</div><div class='add'>+	netdev_dbg(bp-&gt;dev, "open\n");</div><div class='ctx'> </div><div class='ctx'> 	/* if the phy is not yet register, retry later*/</div><div class='ctx'> 	if (!bp-&gt;phy_dev)</div><div class='hunk'>@@ -965,9 +1042,8 @@ static int macb_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	err = macb_alloc_consistent(bp);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "%s: Unable to allocate DMA memory (error %d)\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='add'>+		netdev_err(dev, "Unable to allocate DMA memory (error %d)\n",</div><div class='add'>+			   err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1005,11 +1081,62 @@ static int macb_close(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void gem_update_stats(struct macb *bp)</div><div class='add'>+{</div><div class='add'>+	u32 __iomem *reg = bp-&gt;regs + GEM_OTX;</div><div class='add'>+	u32 *p = &amp;bp-&gt;hw_stats.gem.tx_octets_31_0;</div><div class='add'>+	u32 *end = &amp;bp-&gt;hw_stats.gem.rx_udp_checksum_errors + 1;</div><div class='add'>+</div><div class='add'>+	for (; p &lt; end; p++, reg++)</div><div class='add'>+		*p += __raw_readl(reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_device_stats *gem_get_stats(struct macb *bp)</div><div class='add'>+{</div><div class='add'>+	struct gem_stats *hwstat = &amp;bp-&gt;hw_stats.gem;</div><div class='add'>+	struct net_device_stats *nstat = &amp;bp-&gt;stats;</div><div class='add'>+</div><div class='add'>+	gem_update_stats(bp);</div><div class='add'>+</div><div class='add'>+	nstat-&gt;rx_errors = (hwstat-&gt;rx_frame_check_sequence_errors +</div><div class='add'>+			    hwstat-&gt;rx_alignment_errors +</div><div class='add'>+			    hwstat-&gt;rx_resource_errors +</div><div class='add'>+			    hwstat-&gt;rx_overruns +</div><div class='add'>+			    hwstat-&gt;rx_oversize_frames +</div><div class='add'>+			    hwstat-&gt;rx_jabbers +</div><div class='add'>+			    hwstat-&gt;rx_undersized_frames +</div><div class='add'>+			    hwstat-&gt;rx_length_field_frame_errors);</div><div class='add'>+	nstat-&gt;tx_errors = (hwstat-&gt;tx_late_collisions +</div><div class='add'>+			    hwstat-&gt;tx_excessive_collisions +</div><div class='add'>+			    hwstat-&gt;tx_underrun +</div><div class='add'>+			    hwstat-&gt;tx_carrier_sense_errors);</div><div class='add'>+	nstat-&gt;multicast = hwstat-&gt;rx_multicast_frames;</div><div class='add'>+	nstat-&gt;collisions = (hwstat-&gt;tx_single_collision_frames +</div><div class='add'>+			     hwstat-&gt;tx_multiple_collision_frames +</div><div class='add'>+			     hwstat-&gt;tx_excessive_collisions);</div><div class='add'>+	nstat-&gt;rx_length_errors = (hwstat-&gt;rx_oversize_frames +</div><div class='add'>+				   hwstat-&gt;rx_jabbers +</div><div class='add'>+				   hwstat-&gt;rx_undersized_frames +</div><div class='add'>+				   hwstat-&gt;rx_length_field_frame_errors);</div><div class='add'>+	nstat-&gt;rx_over_errors = hwstat-&gt;rx_resource_errors;</div><div class='add'>+	nstat-&gt;rx_crc_errors = hwstat-&gt;rx_frame_check_sequence_errors;</div><div class='add'>+	nstat-&gt;rx_frame_errors = hwstat-&gt;rx_alignment_errors;</div><div class='add'>+	nstat-&gt;rx_fifo_errors = hwstat-&gt;rx_overruns;</div><div class='add'>+	nstat-&gt;tx_aborted_errors = hwstat-&gt;tx_excessive_collisions;</div><div class='add'>+	nstat-&gt;tx_carrier_errors = hwstat-&gt;tx_carrier_sense_errors;</div><div class='add'>+	nstat-&gt;tx_fifo_errors = hwstat-&gt;tx_underrun;</div><div class='add'>+</div><div class='add'>+	return nstat;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct net_device_stats *macb_get_stats(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct macb *bp = netdev_priv(dev);</div><div class='ctx'> 	struct net_device_stats *nstat = &amp;bp-&gt;stats;</div><div class='del'>-	struct macb_stats *hwstat = &amp;bp-&gt;hw_stats;</div><div class='add'>+	struct macb_stats *hwstat = &amp;bp-&gt;hw_stats.macb;</div><div class='add'>+</div><div class='add'>+	if (macb_is_gem(bp))</div><div class='add'>+		return gem_get_stats(bp);</div><div class='ctx'> </div><div class='ctx'> 	/* read stats from hardware */</div><div class='ctx'> 	macb_update_stats(bp);</div><div class='hunk'>@@ -1117,14 +1244,59 @@ static const struct net_device_ops macb_netdev_ops = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_OF)</div><div class='add'>+static const struct of_device_id macb_dt_ids[] = {</div><div class='add'>+	{ .compatible = "cdns,at32ap7000-macb" },</div><div class='add'>+	{ .compatible = "cdns,at91sam9260-macb" },</div><div class='add'>+	{ .compatible = "cdns,macb" },</div><div class='add'>+	{ .compatible = "cdns,pc302-gem" },</div><div class='add'>+	{ .compatible = "cdns,gem" },</div><div class='add'>+	{ /* sentinel */ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, macb_dt_ids);</div><div class='add'>+</div><div class='add'>+static int __devinit macb_get_phy_mode_dt(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'>+</div><div class='add'>+	if (np)</div><div class='add'>+		return of_get_phy_mode(np);</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit macb_get_hwaddr_dt(struct macb *bp)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = bp-&gt;pdev-&gt;dev.of_node;</div><div class='add'>+	if (np) {</div><div class='add'>+		const char *mac = of_get_mac_address(np);</div><div class='add'>+		if (mac) {</div><div class='add'>+			memcpy(bp-&gt;dev-&gt;dev_addr, mac, ETH_ALEN);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int __devinit macb_get_phy_mode_dt(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+static int __devinit macb_get_hwaddr_dt(struct macb *bp)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int __init macb_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct eth_platform_data *pdata;</div><div class='add'>+	struct macb_platform_data *pdata;</div><div class='ctx'> 	struct resource *regs;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct macb *bp;</div><div class='ctx'> 	struct phy_device *phydev;</div><div class='del'>-	unsigned long pclk_hz;</div><div class='ctx'> 	u32 config;</div><div class='ctx'> 	int err = -ENXIO;</div><div class='ctx'> </div><div class='hunk'>@@ -1152,28 +1324,19 @@ static int __init macb_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_ARCH_AT91)</div><div class='del'>-	bp-&gt;pclk = clk_get(&amp;pdev-&gt;dev, "macb_clk");</div><div class='add'>+	bp-&gt;pclk = clk_get(&amp;pdev-&gt;dev, "pclk");</div><div class='ctx'> 	if (IS_ERR(bp-&gt;pclk)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to get macb_clk\n");</div><div class='ctx'> 		goto err_out_free_dev;</div><div class='ctx'> 	}</div><div class='ctx'> 	clk_enable(bp-&gt;pclk);</div><div class='del'>-#else</div><div class='del'>-	bp-&gt;pclk = clk_get(&amp;pdev-&gt;dev, "pclk");</div><div class='del'>-	if (IS_ERR(bp-&gt;pclk)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to get pclk\n");</div><div class='del'>-		goto err_out_free_dev;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	bp-&gt;hclk = clk_get(&amp;pdev-&gt;dev, "hclk");</div><div class='ctx'> 	if (IS_ERR(bp-&gt;hclk)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to get hclk\n");</div><div class='ctx'> 		goto err_out_put_pclk;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	clk_enable(bp-&gt;pclk);</div><div class='ctx'> 	clk_enable(bp-&gt;hclk);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;regs = ioremap(regs-&gt;start, resource_size(regs));</div><div class='ctx'> 	if (!bp-&gt;regs) {</div><div class='hunk'>@@ -1185,9 +1348,8 @@ static int __init macb_probe(struct platform_device *pdev)</div><div class='ctx'> 	dev-&gt;irq = platform_get_irq(pdev, 0);</div><div class='ctx'> 	err = request_irq(dev-&gt;irq, macb_interrupt, 0, dev-&gt;name, dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "%s: Unable to request IRQ %d (error %d)\n",</div><div class='del'>-		       dev-&gt;name, dev-&gt;irq, err);</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Unable to request IRQ %d (error %d)\n",</div><div class='add'>+			dev-&gt;irq, err);</div><div class='ctx'> 		goto err_out_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1198,31 +1360,37 @@ static int __init macb_probe(struct platform_device *pdev)</div><div class='ctx'> 	dev-&gt;base_addr = regs-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 	/* Set MII management clock divider */</div><div class='del'>-	pclk_hz = clk_get_rate(bp-&gt;pclk);</div><div class='del'>-	if (pclk_hz &lt;= 20000000)</div><div class='del'>-		config = MACB_BF(CLK, MACB_CLK_DIV8);</div><div class='del'>-	else if (pclk_hz &lt;= 40000000)</div><div class='del'>-		config = MACB_BF(CLK, MACB_CLK_DIV16);</div><div class='del'>-	else if (pclk_hz &lt;= 80000000)</div><div class='del'>-		config = MACB_BF(CLK, MACB_CLK_DIV32);</div><div class='del'>-	else</div><div class='del'>-		config = MACB_BF(CLK, MACB_CLK_DIV64);</div><div class='add'>+	config = macb_mdc_clk_div(bp);</div><div class='add'>+	config |= macb_dbw(bp);</div><div class='ctx'> 	macb_writel(bp, NCFGR, config);</div><div class='ctx'> </div><div class='del'>-	macb_get_hwaddr(bp);</div><div class='del'>-	pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	err = macb_get_hwaddr_dt(bp);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		macb_get_hwaddr(bp);</div><div class='add'>+</div><div class='add'>+	err = macb_get_phy_mode_dt(pdev);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+		if (pdata &amp;&amp; pdata-&gt;is_rmii)</div><div class='add'>+			bp-&gt;phy_interface = PHY_INTERFACE_MODE_RMII;</div><div class='add'>+		else</div><div class='add'>+			bp-&gt;phy_interface = PHY_INTERFACE_MODE_MII;</div><div class='add'>+	} else {</div><div class='add'>+		bp-&gt;phy_interface = err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (pdata &amp;&amp; pdata-&gt;is_rmii)</div><div class='add'>+	if (bp-&gt;phy_interface == PHY_INTERFACE_MODE_RMII)</div><div class='ctx'> #if defined(CONFIG_ARCH_AT91)</div><div class='del'>-		macb_writel(bp, USRIO, (MACB_BIT(RMII) | MACB_BIT(CLKEN)) );</div><div class='add'>+		macb_or_gem_writel(bp, USRIO, (MACB_BIT(RMII) |</div><div class='add'>+					       MACB_BIT(CLKEN)));</div><div class='ctx'> #else</div><div class='del'>-		macb_writel(bp, USRIO, 0);</div><div class='add'>+		macb_or_gem_writel(bp, USRIO, 0);</div><div class='ctx'> #endif</div><div class='ctx'> 	else</div><div class='ctx'> #if defined(CONFIG_ARCH_AT91)</div><div class='del'>-		macb_writel(bp, USRIO, MACB_BIT(CLKEN));</div><div class='add'>+		macb_or_gem_writel(bp, USRIO, MACB_BIT(CLKEN));</div><div class='ctx'> #else</div><div class='del'>-		macb_writel(bp, USRIO, MACB_BIT(MII));</div><div class='add'>+		macb_or_gem_writel(bp, USRIO, MACB_BIT(MII));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;tx_pending = DEF_TX_RING_PENDING;</div><div class='hunk'>@@ -1239,13 +1407,13 @@ static int __init macb_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, dev);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s: Atmel MACB at 0x%08lx irq %d (%pM)\n",</div><div class='del'>-	       dev-&gt;name, dev-&gt;base_addr, dev-&gt;irq, dev-&gt;dev_addr);</div><div class='add'>+	netdev_info(dev, "Cadence %s at 0x%08lx irq %d (%pM)\n",</div><div class='add'>+		    macb_is_gem(bp) ? "GEM" : "MACB", dev-&gt;base_addr,</div><div class='add'>+		    dev-&gt;irq, dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='ctx'> 	phydev = bp-&gt;phy_dev;</div><div class='del'>-	printk(KERN_INFO "%s: attached PHY driver [%s] "</div><div class='del'>-		"(mii_bus:phy_addr=%s, irq=%d)\n", dev-&gt;name,</div><div class='del'>-		phydev-&gt;drv-&gt;name, dev_name(&amp;phydev-&gt;dev), phydev-&gt;irq);</div><div class='add'>+	netdev_info(dev, "attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",</div><div class='add'>+		    phydev-&gt;drv-&gt;name, dev_name(&amp;phydev-&gt;dev), phydev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1256,14 +1424,10 @@ err_out_free_irq:</div><div class='ctx'> err_out_iounmap:</div><div class='ctx'> 	iounmap(bp-&gt;regs);</div><div class='ctx'> err_out_disable_clocks:</div><div class='del'>-#ifndef CONFIG_ARCH_AT91</div><div class='ctx'> 	clk_disable(bp-&gt;hclk);</div><div class='ctx'> 	clk_put(bp-&gt;hclk);</div><div class='del'>-#endif</div><div class='ctx'> 	clk_disable(bp-&gt;pclk);</div><div class='del'>-#ifndef CONFIG_ARCH_AT91</div><div class='ctx'> err_out_put_pclk:</div><div class='del'>-#endif</div><div class='ctx'> 	clk_put(bp-&gt;pclk);</div><div class='ctx'> err_out_free_dev:</div><div class='ctx'> 	free_netdev(dev);</div><div class='hunk'>@@ -1289,10 +1453,8 @@ static int __exit macb_remove(struct platform_device *pdev)</div><div class='ctx'> 		unregister_netdev(dev);</div><div class='ctx'> 		free_irq(dev-&gt;irq, dev);</div><div class='ctx'> 		iounmap(bp-&gt;regs);</div><div class='del'>-#ifndef CONFIG_ARCH_AT91</div><div class='ctx'> 		clk_disable(bp-&gt;hclk);</div><div class='ctx'> 		clk_put(bp-&gt;hclk);</div><div class='del'>-#endif</div><div class='ctx'> 		clk_disable(bp-&gt;pclk);</div><div class='ctx'> 		clk_put(bp-&gt;pclk);</div><div class='ctx'> 		free_netdev(dev);</div><div class='hunk'>@@ -1310,9 +1472,7 @@ static int macb_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> 	netif_device_detach(netdev);</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_ARCH_AT91</div><div class='ctx'> 	clk_disable(bp-&gt;hclk);</div><div class='del'>-#endif</div><div class='ctx'> 	clk_disable(bp-&gt;pclk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1324,9 +1484,7 @@ static int macb_resume(struct platform_device *pdev)</div><div class='ctx'> 	struct macb *bp = netdev_priv(netdev);</div><div class='ctx'> </div><div class='ctx'> 	clk_enable(bp-&gt;pclk);</div><div class='del'>-#ifndef CONFIG_ARCH_AT91</div><div class='ctx'> 	clk_enable(bp-&gt;hclk);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	netif_device_attach(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1344,6 +1502,7 @@ static struct platform_driver macb_driver = {</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name		= "macb",</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='add'>+		.of_match_table	= of_match_ptr(macb_dt_ids),</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1361,6 +1520,6 @@ module_init(macb_init);</div><div class='ctx'> module_exit(macb_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("Atmel MACB Ethernet driver");</div><div class='add'>+MODULE_DESCRIPTION("Cadence MACB/GEM Ethernet driver");</div><div class='ctx'> MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");</div><div class='ctx'> MODULE_ALIAS("platform:macb");</div><div class='head'>diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h<br/>index d3212f6db703..335e288f5314 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/cadence/macb.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/cadence/macb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/cadence/macb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/cadence/macb.h</a></div><div class='hunk'>@@ -59,6 +59,24 @@</div><div class='ctx'> #define MACB_TPQ				0x00bc</div><div class='ctx'> #define MACB_USRIO				0x00c0</div><div class='ctx'> #define MACB_WOL				0x00c4</div><div class='add'>+#define MACB_MID				0x00fc</div><div class='add'>+</div><div class='add'>+/* GEM register offsets. */</div><div class='add'>+#define GEM_NCFGR				0x0004</div><div class='add'>+#define GEM_USRIO				0x000c</div><div class='add'>+#define GEM_DMACFG				0x0010</div><div class='add'>+#define GEM_HRB					0x0080</div><div class='add'>+#define GEM_HRT					0x0084</div><div class='add'>+#define GEM_SA1B				0x0088</div><div class='add'>+#define GEM_SA1T				0x008C</div><div class='add'>+#define GEM_OTX					0x0100</div><div class='add'>+#define GEM_DCFG1				0x0280</div><div class='add'>+#define GEM_DCFG2				0x0284</div><div class='add'>+#define GEM_DCFG3				0x0288</div><div class='add'>+#define GEM_DCFG4				0x028c</div><div class='add'>+#define GEM_DCFG5				0x0290</div><div class='add'>+#define GEM_DCFG6				0x0294</div><div class='add'>+#define GEM_DCFG7				0x0298</div><div class='ctx'> </div><div class='ctx'> /* Bitfields in NCR */</div><div class='ctx'> #define MACB_LB_OFFSET				0</div><div class='hunk'>@@ -126,6 +144,21 @@</div><div class='ctx'> #define MACB_IRXFCS_OFFSET			19</div><div class='ctx'> #define MACB_IRXFCS_SIZE			1</div><div class='ctx'> </div><div class='add'>+/* GEM specific NCFGR bitfields. */</div><div class='add'>+#define GEM_CLK_OFFSET				18</div><div class='add'>+#define GEM_CLK_SIZE				3</div><div class='add'>+#define GEM_DBW_OFFSET				21</div><div class='add'>+#define GEM_DBW_SIZE				2</div><div class='add'>+</div><div class='add'>+/* Constants for data bus width. */</div><div class='add'>+#define GEM_DBW32				0</div><div class='add'>+#define GEM_DBW64				1</div><div class='add'>+#define GEM_DBW128				2</div><div class='add'>+</div><div class='add'>+/* Bitfields in DMACFG. */</div><div class='add'>+#define GEM_RXBS_OFFSET				16</div><div class='add'>+#define GEM_RXBS_SIZE				8</div><div class='add'>+</div><div class='ctx'> /* Bitfields in NSR */</div><div class='ctx'> #define MACB_NSR_LINK_OFFSET			0</div><div class='ctx'> #define MACB_NSR_LINK_SIZE			1</div><div class='hunk'>@@ -228,12 +261,30 @@</div><div class='ctx'> #define MACB_WOL_MTI_OFFSET			19</div><div class='ctx'> #define MACB_WOL_MTI_SIZE			1</div><div class='ctx'> </div><div class='add'>+/* Bitfields in MID */</div><div class='add'>+#define MACB_IDNUM_OFFSET			16</div><div class='add'>+#define MACB_IDNUM_SIZE				16</div><div class='add'>+#define MACB_REV_OFFSET				0</div><div class='add'>+#define MACB_REV_SIZE				16</div><div class='add'>+</div><div class='add'>+/* Bitfields in DCFG1. */</div><div class='add'>+#define GEM_DBWDEF_OFFSET			25</div><div class='add'>+#define GEM_DBWDEF_SIZE				3</div><div class='add'>+</div><div class='ctx'> /* Constants for CLK */</div><div class='ctx'> #define MACB_CLK_DIV8				0</div><div class='ctx'> #define MACB_CLK_DIV16				1</div><div class='ctx'> #define MACB_CLK_DIV32				2</div><div class='ctx'> #define MACB_CLK_DIV64				3</div><div class='ctx'> </div><div class='add'>+/* GEM specific constants for CLK. */</div><div class='add'>+#define GEM_CLK_DIV8				0</div><div class='add'>+#define GEM_CLK_DIV16				1</div><div class='add'>+#define GEM_CLK_DIV32				2</div><div class='add'>+#define GEM_CLK_DIV48				3</div><div class='add'>+#define GEM_CLK_DIV64				4</div><div class='add'>+#define GEM_CLK_DIV96				5</div><div class='add'>+</div><div class='ctx'> /* Constants for MAN register */</div><div class='ctx'> #define MACB_MAN_SOF				1</div><div class='ctx'> #define MACB_MAN_WRITE				1</div><div class='hunk'>@@ -254,11 +305,52 @@</div><div class='ctx'> 		    &lt;&lt; MACB_##name##_OFFSET))		\</div><div class='ctx'> 	 | MACB_BF(name,value))</div><div class='ctx'> </div><div class='add'>+#define GEM_BIT(name)					\</div><div class='add'>+	(1 &lt;&lt; GEM_##name##_OFFSET)</div><div class='add'>+#define GEM_BF(name, value)				\</div><div class='add'>+	(((value) &amp; ((1 &lt;&lt; GEM_##name##_SIZE) - 1))	\</div><div class='add'>+	 &lt;&lt; GEM_##name##_OFFSET)</div><div class='add'>+#define GEM_BFEXT(name, value)\</div><div class='add'>+	(((value) &gt;&gt; GEM_##name##_OFFSET)		\</div><div class='add'>+	 &amp; ((1 &lt;&lt; GEM_##name##_SIZE) - 1))</div><div class='add'>+#define GEM_BFINS(name, value, old)			\</div><div class='add'>+	(((old) &amp; ~(((1 &lt;&lt; GEM_##name##_SIZE) - 1)	\</div><div class='add'>+		    &lt;&lt; GEM_##name##_OFFSET))		\</div><div class='add'>+	 | GEM_BF(name, value))</div><div class='add'>+</div><div class='ctx'> /* Register access macros */</div><div class='ctx'> #define macb_readl(port,reg)				\</div><div class='ctx'> 	__raw_readl((port)-&gt;regs + MACB_##reg)</div><div class='ctx'> #define macb_writel(port,reg,value)			\</div><div class='ctx'> 	__raw_writel((value), (port)-&gt;regs + MACB_##reg)</div><div class='add'>+#define gem_readl(port, reg)				\</div><div class='add'>+	__raw_readl((port)-&gt;regs + GEM_##reg)</div><div class='add'>+#define gem_writel(port, reg, value)			\</div><div class='add'>+	__raw_writel((value), (port)-&gt;regs + GEM_##reg)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Conditional GEM/MACB macros.  These perform the operation to the correct</div><div class='add'>+ * register dependent on whether the device is a GEM or a MACB.  For registers</div><div class='add'>+ * and bitfields that are common across both devices, use macb_{read,write}l</div><div class='add'>+ * to avoid the cost of the conditional.</div><div class='add'>+ */</div><div class='add'>+#define macb_or_gem_writel(__bp, __reg, __value) \</div><div class='add'>+	({ \</div><div class='add'>+		if (macb_is_gem((__bp))) \</div><div class='add'>+			gem_writel((__bp), __reg, __value); \</div><div class='add'>+		else \</div><div class='add'>+			macb_writel((__bp), __reg, __value); \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define macb_or_gem_readl(__bp, __reg) \</div><div class='add'>+	({ \</div><div class='add'>+		u32 __v; \</div><div class='add'>+		if (macb_is_gem((__bp))) \</div><div class='add'>+			__v = gem_readl((__bp), __reg); \</div><div class='add'>+		else \</div><div class='add'>+			__v = macb_readl((__bp), __reg); \</div><div class='add'>+		__v; \</div><div class='add'>+	})</div><div class='ctx'> </div><div class='ctx'> struct dma_desc {</div><div class='ctx'> 	u32	addr;</div><div class='hunk'>@@ -358,6 +450,54 @@ struct macb_stats {</div><div class='ctx'> 	u32	tx_pause_frames;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct gem_stats {</div><div class='add'>+	u32	tx_octets_31_0;</div><div class='add'>+	u32	tx_octets_47_32;</div><div class='add'>+	u32	tx_frames;</div><div class='add'>+	u32	tx_broadcast_frames;</div><div class='add'>+	u32	tx_multicast_frames;</div><div class='add'>+	u32	tx_pause_frames;</div><div class='add'>+	u32	tx_64_byte_frames;</div><div class='add'>+	u32	tx_65_127_byte_frames;</div><div class='add'>+	u32	tx_128_255_byte_frames;</div><div class='add'>+	u32	tx_256_511_byte_frames;</div><div class='add'>+	u32	tx_512_1023_byte_frames;</div><div class='add'>+	u32	tx_1024_1518_byte_frames;</div><div class='add'>+	u32	tx_greater_than_1518_byte_frames;</div><div class='add'>+	u32	tx_underrun;</div><div class='add'>+	u32	tx_single_collision_frames;</div><div class='add'>+	u32	tx_multiple_collision_frames;</div><div class='add'>+	u32	tx_excessive_collisions;</div><div class='add'>+	u32	tx_late_collisions;</div><div class='add'>+	u32	tx_deferred_frames;</div><div class='add'>+	u32	tx_carrier_sense_errors;</div><div class='add'>+	u32	rx_octets_31_0;</div><div class='add'>+	u32	rx_octets_47_32;</div><div class='add'>+	u32	rx_frames;</div><div class='add'>+	u32	rx_broadcast_frames;</div><div class='add'>+	u32	rx_multicast_frames;</div><div class='add'>+	u32	rx_pause_frames;</div><div class='add'>+	u32	rx_64_byte_frames;</div><div class='add'>+	u32	rx_65_127_byte_frames;</div><div class='add'>+	u32	rx_128_255_byte_frames;</div><div class='add'>+	u32	rx_256_511_byte_frames;</div><div class='add'>+	u32	rx_512_1023_byte_frames;</div><div class='add'>+	u32	rx_1024_1518_byte_frames;</div><div class='add'>+	u32	rx_greater_than_1518_byte_frames;</div><div class='add'>+	u32	rx_undersized_frames;</div><div class='add'>+	u32	rx_oversize_frames;</div><div class='add'>+	u32	rx_jabbers;</div><div class='add'>+	u32	rx_frame_check_sequence_errors;</div><div class='add'>+	u32	rx_length_field_frame_errors;</div><div class='add'>+	u32	rx_symbol_errors;</div><div class='add'>+	u32	rx_alignment_errors;</div><div class='add'>+	u32	rx_resource_errors;</div><div class='add'>+	u32	rx_overruns;</div><div class='add'>+	u32	rx_ip_header_checksum_errors;</div><div class='add'>+	u32	rx_tcp_checksum_errors;</div><div class='add'>+	u32	rx_udp_checksum_errors;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct macb {</div><div class='ctx'> 	void __iomem		*regs;</div><div class='ctx'> </div><div class='hunk'>@@ -376,7 +516,10 @@ struct macb {</div><div class='ctx'> 	struct net_device	*dev;</div><div class='ctx'> 	struct napi_struct	napi;</div><div class='ctx'> 	struct net_device_stats	stats;</div><div class='del'>-	struct macb_stats	hw_stats;</div><div class='add'>+	union {</div><div class='add'>+		struct macb_stats	macb;</div><div class='add'>+		struct gem_stats	gem;</div><div class='add'>+	}			hw_stats;</div><div class='ctx'> </div><div class='ctx'> 	dma_addr_t		rx_ring_dma;</div><div class='ctx'> 	dma_addr_t		tx_ring_dma;</div><div class='hunk'>@@ -389,6 +532,13 @@ struct macb {</div><div class='ctx'> 	unsigned int 		link;</div><div class='ctx'> 	unsigned int 		speed;</div><div class='ctx'> 	unsigned int 		duplex;</div><div class='add'>+</div><div class='add'>+	phy_interface_t		phy_interface;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline bool macb_is_gem(struct macb *bp)</div><div class='add'>+{</div><div class='add'>+	return MACB_BFEXT(IDNUM, macb_readl(bp, MID)) == 0x2;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _MACB_H */</div><div class='head'>diff --git a/drivers/net/ethernet/calxeda/Kconfig b/drivers/net/ethernet/calxeda/Kconfig<br/>new file mode 100644<br/>index 000000000000..aba435c3d4ae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/calxeda/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/calxeda/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+config NET_CALXEDA_XGMAC</div><div class='add'>+	tristate "Calxeda 1G/10G XGMAC Ethernet driver"</div><div class='add'>+	depends on HAS_IOMEM</div><div class='add'>+	select CRC32</div><div class='add'>+	help</div><div class='add'>+	  This is the driver for the XGMAC Ethernet IP block found on Calxeda</div><div class='add'>+	  Highbank platforms.</div><div class='head'>diff --git a/drivers/net/ethernet/calxeda/Makefile b/drivers/net/ethernet/calxeda/Makefile<br/>new file mode 100644<br/>index 000000000000..f0ef08067f97<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/calxeda/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/calxeda/Makefile</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+obj-$(CONFIG_NET_CALXEDA_XGMAC) += xgmac.o</div><div class='head'>diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c<br/>new file mode 100644<br/>index 000000000000..1fce186a9031<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/calxeda/xgmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/calxeda/xgmac.c</a></div><div class='hunk'>@@ -0,0 +1,1928 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2010-2011 Calxeda, Inc.</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 and conditions of the GNU General Public License,</div><div class='add'>+ * version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</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/kernel.h&gt;</div><div class='add'>+#include &lt;linux/circ_buf.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/if.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+/* XGMAC Register definitions */</div><div class='add'>+#define XGMAC_CONTROL		0x00000000	/* MAC Configuration */</div><div class='add'>+#define XGMAC_FRAME_FILTER	0x00000004	/* MAC Frame Filter */</div><div class='add'>+#define XGMAC_FLOW_CTRL		0x00000018	/* MAC Flow Control */</div><div class='add'>+#define XGMAC_VLAN_TAG		0x0000001C	/* VLAN Tags */</div><div class='add'>+#define XGMAC_VERSION		0x00000020	/* Version */</div><div class='add'>+#define XGMAC_VLAN_INCL		0x00000024	/* VLAN tag for tx frames */</div><div class='add'>+#define XGMAC_LPI_CTRL		0x00000028	/* LPI Control and Status */</div><div class='add'>+#define XGMAC_LPI_TIMER		0x0000002C	/* LPI Timers Control */</div><div class='add'>+#define XGMAC_TX_PACE		0x00000030	/* Transmit Pace and Stretch */</div><div class='add'>+#define XGMAC_VLAN_HASH		0x00000034	/* VLAN Hash Table */</div><div class='add'>+#define XGMAC_DEBUG		0x00000038	/* Debug */</div><div class='add'>+#define XGMAC_INT_STAT		0x0000003C	/* Interrupt and Control */</div><div class='add'>+#define XGMAC_ADDR_HIGH(reg)	(0x00000040 + ((reg) * 8))</div><div class='add'>+#define XGMAC_ADDR_LOW(reg)	(0x00000044 + ((reg) * 8))</div><div class='add'>+#define XGMAC_HASH(n)		(0x00000300 + (n) * 4) /* HASH table regs */</div><div class='add'>+#define XGMAC_NUM_HASH		16</div><div class='add'>+#define XGMAC_OMR		0x00000400</div><div class='add'>+#define XGMAC_REMOTE_WAKE	0x00000700	/* Remote Wake-Up Frm Filter */</div><div class='add'>+#define XGMAC_PMT		0x00000704	/* PMT Control and Status */</div><div class='add'>+#define XGMAC_MMC_CTRL		0x00000800	/* XGMAC MMC Control */</div><div class='add'>+#define XGMAC_MMC_INTR_RX	0x00000804	/* Recieve Interrupt */</div><div class='add'>+#define XGMAC_MMC_INTR_TX	0x00000808	/* Transmit Interrupt */</div><div class='add'>+#define XGMAC_MMC_INTR_MASK_RX	0x0000080c	/* Recieve Interrupt Mask */</div><div class='add'>+#define XGMAC_MMC_INTR_MASK_TX	0x00000810	/* Transmit Interrupt Mask */</div><div class='add'>+</div><div class='add'>+/* Hardware TX Statistics Counters */</div><div class='add'>+#define XGMAC_MMC_TXOCTET_GB_LO	0x00000814</div><div class='add'>+#define XGMAC_MMC_TXOCTET_GB_HI	0x00000818</div><div class='add'>+#define XGMAC_MMC_TXFRAME_GB_LO	0x0000081C</div><div class='add'>+#define XGMAC_MMC_TXFRAME_GB_HI	0x00000820</div><div class='add'>+#define XGMAC_MMC_TXBCFRAME_G	0x00000824</div><div class='add'>+#define XGMAC_MMC_TXMCFRAME_G	0x0000082C</div><div class='add'>+#define XGMAC_MMC_TXUCFRAME_GB	0x00000864</div><div class='add'>+#define XGMAC_MMC_TXMCFRAME_GB	0x0000086C</div><div class='add'>+#define XGMAC_MMC_TXBCFRAME_GB	0x00000874</div><div class='add'>+#define XGMAC_MMC_TXUNDERFLOW	0x0000087C</div><div class='add'>+#define XGMAC_MMC_TXOCTET_G_LO	0x00000884</div><div class='add'>+#define XGMAC_MMC_TXOCTET_G_HI	0x00000888</div><div class='add'>+#define XGMAC_MMC_TXFRAME_G_LO	0x0000088C</div><div class='add'>+#define XGMAC_MMC_TXFRAME_G_HI	0x00000890</div><div class='add'>+#define XGMAC_MMC_TXPAUSEFRAME	0x00000894</div><div class='add'>+#define XGMAC_MMC_TXVLANFRAME	0x0000089C</div><div class='add'>+</div><div class='add'>+/* Hardware RX Statistics Counters */</div><div class='add'>+#define XGMAC_MMC_RXFRAME_GB_LO	0x00000900</div><div class='add'>+#define XGMAC_MMC_RXFRAME_GB_HI	0x00000904</div><div class='add'>+#define XGMAC_MMC_RXOCTET_GB_LO	0x00000908</div><div class='add'>+#define XGMAC_MMC_RXOCTET_GB_HI	0x0000090C</div><div class='add'>+#define XGMAC_MMC_RXOCTET_G_LO	0x00000910</div><div class='add'>+#define XGMAC_MMC_RXOCTET_G_HI	0x00000914</div><div class='add'>+#define XGMAC_MMC_RXBCFRAME_G	0x00000918</div><div class='add'>+#define XGMAC_MMC_RXMCFRAME_G	0x00000920</div><div class='add'>+#define XGMAC_MMC_RXCRCERR	0x00000928</div><div class='add'>+#define XGMAC_MMC_RXRUNT	0x00000930</div><div class='add'>+#define XGMAC_MMC_RXJABBER	0x00000934</div><div class='add'>+#define XGMAC_MMC_RXUCFRAME_G	0x00000970</div><div class='add'>+#define XGMAC_MMC_RXLENGTHERR	0x00000978</div><div class='add'>+#define XGMAC_MMC_RXPAUSEFRAME	0x00000988</div><div class='add'>+#define XGMAC_MMC_RXOVERFLOW	0x00000990</div><div class='add'>+#define XGMAC_MMC_RXVLANFRAME	0x00000998</div><div class='add'>+#define XGMAC_MMC_RXWATCHDOG	0x000009a0</div><div class='add'>+</div><div class='add'>+/* DMA Control and Status Registers */</div><div class='add'>+#define XGMAC_DMA_BUS_MODE	0x00000f00	/* Bus Mode */</div><div class='add'>+#define XGMAC_DMA_TX_POLL	0x00000f04	/* Transmit Poll Demand */</div><div class='add'>+#define XGMAC_DMA_RX_POLL	0x00000f08	/* Received Poll Demand */</div><div class='add'>+#define XGMAC_DMA_RX_BASE_ADDR	0x00000f0c	/* Receive List Base */</div><div class='add'>+#define XGMAC_DMA_TX_BASE_ADDR	0x00000f10	/* Transmit List Base */</div><div class='add'>+#define XGMAC_DMA_STATUS	0x00000f14	/* Status Register */</div><div class='add'>+#define XGMAC_DMA_CONTROL	0x00000f18	/* Ctrl (Operational Mode) */</div><div class='add'>+#define XGMAC_DMA_INTR_ENA	0x00000f1c	/* Interrupt Enable */</div><div class='add'>+#define XGMAC_DMA_MISS_FRAME_CTR 0x00000f20	/* Missed Frame Counter */</div><div class='add'>+#define XGMAC_DMA_RI_WDOG_TIMER	0x00000f24	/* RX Intr Watchdog Timer */</div><div class='add'>+#define XGMAC_DMA_AXI_BUS	0x00000f28	/* AXI Bus Mode */</div><div class='add'>+#define XGMAC_DMA_AXI_STATUS	0x00000f2C	/* AXI Status */</div><div class='add'>+#define XGMAC_DMA_HW_FEATURE	0x00000f58	/* Enabled Hardware Features */</div><div class='add'>+</div><div class='add'>+#define XGMAC_ADDR_AE		0x80000000</div><div class='add'>+#define XGMAC_MAX_FILTER_ADDR	31</div><div class='add'>+</div><div class='add'>+/* PMT Control and Status */</div><div class='add'>+#define XGMAC_PMT_POINTER_RESET	0x80000000</div><div class='add'>+#define XGMAC_PMT_GLBL_UNICAST	0x00000200</div><div class='add'>+#define XGMAC_PMT_WAKEUP_RX_FRM	0x00000040</div><div class='add'>+#define XGMAC_PMT_MAGIC_PKT	0x00000020</div><div class='add'>+#define XGMAC_PMT_WAKEUP_FRM_EN	0x00000004</div><div class='add'>+#define XGMAC_PMT_MAGIC_PKT_EN	0x00000002</div><div class='add'>+#define XGMAC_PMT_POWERDOWN	0x00000001</div><div class='add'>+</div><div class='add'>+#define XGMAC_CONTROL_SPD	0x40000000	/* Speed control */</div><div class='add'>+#define XGMAC_CONTROL_SPD_MASK	0x60000000</div><div class='add'>+#define XGMAC_CONTROL_SPD_1G	0x60000000</div><div class='add'>+#define XGMAC_CONTROL_SPD_2_5G	0x40000000</div><div class='add'>+#define XGMAC_CONTROL_SPD_10G	0x00000000</div><div class='add'>+#define XGMAC_CONTROL_SARC	0x10000000	/* Source Addr Insert/Replace */</div><div class='add'>+#define XGMAC_CONTROL_SARK_MASK	0x18000000</div><div class='add'>+#define XGMAC_CONTROL_CAR	0x04000000	/* CRC Addition/Replacement */</div><div class='add'>+#define XGMAC_CONTROL_CAR_MASK	0x06000000</div><div class='add'>+#define XGMAC_CONTROL_DP	0x01000000	/* Disable Padding */</div><div class='add'>+#define XGMAC_CONTROL_WD	0x00800000	/* Disable Watchdog on rx */</div><div class='add'>+#define XGMAC_CONTROL_JD	0x00400000	/* Jabber disable */</div><div class='add'>+#define XGMAC_CONTROL_JE	0x00100000	/* Jumbo frame */</div><div class='add'>+#define XGMAC_CONTROL_LM	0x00001000	/* Loop-back mode */</div><div class='add'>+#define XGMAC_CONTROL_IPC	0x00000400	/* Checksum Offload */</div><div class='add'>+#define XGMAC_CONTROL_ACS	0x00000080	/* Automatic Pad/FCS Strip */</div><div class='add'>+#define XGMAC_CONTROL_DDIC	0x00000010	/* Disable Deficit Idle Count */</div><div class='add'>+#define XGMAC_CONTROL_TE	0x00000008	/* Transmitter Enable */</div><div class='add'>+#define XGMAC_CONTROL_RE	0x00000004	/* Receiver Enable */</div><div class='add'>+</div><div class='add'>+/* XGMAC Frame Filter defines */</div><div class='add'>+#define XGMAC_FRAME_FILTER_PR	0x00000001	/* Promiscuous Mode */</div><div class='add'>+#define XGMAC_FRAME_FILTER_HUC	0x00000002	/* Hash Unicast */</div><div class='add'>+#define XGMAC_FRAME_FILTER_HMC	0x00000004	/* Hash Multicast */</div><div class='add'>+#define XGMAC_FRAME_FILTER_DAIF	0x00000008	/* DA Inverse Filtering */</div><div class='add'>+#define XGMAC_FRAME_FILTER_PM	0x00000010	/* Pass all multicast */</div><div class='add'>+#define XGMAC_FRAME_FILTER_DBF	0x00000020	/* Disable Broadcast frames */</div><div class='add'>+#define XGMAC_FRAME_FILTER_SAIF	0x00000100	/* Inverse Filtering */</div><div class='add'>+#define XGMAC_FRAME_FILTER_SAF	0x00000200	/* Source Address Filter */</div><div class='add'>+#define XGMAC_FRAME_FILTER_HPF	0x00000400	/* Hash or perfect Filter */</div><div class='add'>+#define XGMAC_FRAME_FILTER_VHF	0x00000800	/* VLAN Hash Filter */</div><div class='add'>+#define XGMAC_FRAME_FILTER_VPF	0x00001000	/* VLAN Perfect Filter */</div><div class='add'>+#define XGMAC_FRAME_FILTER_RA	0x80000000	/* Receive all mode */</div><div class='add'>+</div><div class='add'>+/* XGMAC FLOW CTRL defines */</div><div class='add'>+#define XGMAC_FLOW_CTRL_PT_MASK	0xffff0000	/* Pause Time Mask */</div><div class='add'>+#define XGMAC_FLOW_CTRL_PT_SHIFT	16</div><div class='add'>+#define XGMAC_FLOW_CTRL_DZQP	0x00000080	/* Disable Zero-Quanta Phase */</div><div class='add'>+#define XGMAC_FLOW_CTRL_PLT	0x00000020	/* Pause Low Threshhold */</div><div class='add'>+#define XGMAC_FLOW_CTRL_PLT_MASK 0x00000030	/* PLT MASK */</div><div class='add'>+#define XGMAC_FLOW_CTRL_UP	0x00000008	/* Unicast Pause Frame Detect */</div><div class='add'>+#define XGMAC_FLOW_CTRL_RFE	0x00000004	/* Rx Flow Control Enable */</div><div class='add'>+#define XGMAC_FLOW_CTRL_TFE	0x00000002	/* Tx Flow Control Enable */</div><div class='add'>+#define XGMAC_FLOW_CTRL_FCB_BPA	0x00000001	/* Flow Control Busy ... */</div><div class='add'>+</div><div class='add'>+/* XGMAC_INT_STAT reg */</div><div class='add'>+#define XGMAC_INT_STAT_PMT	0x0080		/* PMT Interrupt Status */</div><div class='add'>+#define XGMAC_INT_STAT_LPI	0x0040		/* LPI Interrupt Status */</div><div class='add'>+</div><div class='add'>+/* DMA Bus Mode register defines */</div><div class='add'>+#define DMA_BUS_MODE_SFT_RESET	0x00000001	/* Software Reset */</div><div class='add'>+#define DMA_BUS_MODE_DSL_MASK	0x0000007c	/* Descriptor Skip Length */</div><div class='add'>+#define DMA_BUS_MODE_DSL_SHIFT	2		/* (in DWORDS) */</div><div class='add'>+#define DMA_BUS_MODE_ATDS	0x00000080	/* Alternate Descriptor Size */</div><div class='add'>+</div><div class='add'>+/* Programmable burst length */</div><div class='add'>+#define DMA_BUS_MODE_PBL_MASK	0x00003f00	/* Programmable Burst Len */</div><div class='add'>+#define DMA_BUS_MODE_PBL_SHIFT	8</div><div class='add'>+#define DMA_BUS_MODE_FB		0x00010000	/* Fixed burst */</div><div class='add'>+#define DMA_BUS_MODE_RPBL_MASK	0x003e0000	/* Rx-Programmable Burst Len */</div><div class='add'>+#define DMA_BUS_MODE_RPBL_SHIFT	17</div><div class='add'>+#define DMA_BUS_MODE_USP	0x00800000</div><div class='add'>+#define DMA_BUS_MODE_8PBL	0x01000000</div><div class='add'>+#define DMA_BUS_MODE_AAL	0x02000000</div><div class='add'>+</div><div class='add'>+/* DMA Bus Mode register defines */</div><div class='add'>+#define DMA_BUS_PR_RATIO_MASK	0x0000c000	/* Rx/Tx priority ratio */</div><div class='add'>+#define DMA_BUS_PR_RATIO_SHIFT	14</div><div class='add'>+#define DMA_BUS_FB		0x00010000	/* Fixed Burst */</div><div class='add'>+</div><div class='add'>+/* DMA Control register defines */</div><div class='add'>+#define DMA_CONTROL_ST		0x00002000	/* Start/Stop Transmission */</div><div class='add'>+#define DMA_CONTROL_SR		0x00000002	/* Start/Stop Receive */</div><div class='add'>+#define DMA_CONTROL_DFF		0x01000000	/* Disable flush of rx frames */</div><div class='add'>+</div><div class='add'>+/* DMA Normal interrupt */</div><div class='add'>+#define DMA_INTR_ENA_NIE	0x00010000	/* Normal Summary */</div><div class='add'>+#define DMA_INTR_ENA_AIE	0x00008000	/* Abnormal Summary */</div><div class='add'>+#define DMA_INTR_ENA_ERE	0x00004000	/* Early Receive */</div><div class='add'>+#define DMA_INTR_ENA_FBE	0x00002000	/* Fatal Bus Error */</div><div class='add'>+#define DMA_INTR_ENA_ETE	0x00000400	/* Early Transmit */</div><div class='add'>+#define DMA_INTR_ENA_RWE	0x00000200	/* Receive Watchdog */</div><div class='add'>+#define DMA_INTR_ENA_RSE	0x00000100	/* Receive Stopped */</div><div class='add'>+#define DMA_INTR_ENA_RUE	0x00000080	/* Receive Buffer Unavailable */</div><div class='add'>+#define DMA_INTR_ENA_RIE	0x00000040	/* Receive Interrupt */</div><div class='add'>+#define DMA_INTR_ENA_UNE	0x00000020	/* Tx Underflow */</div><div class='add'>+#define DMA_INTR_ENA_OVE	0x00000010	/* Receive Overflow */</div><div class='add'>+#define DMA_INTR_ENA_TJE	0x00000008	/* Transmit Jabber */</div><div class='add'>+#define DMA_INTR_ENA_TUE	0x00000004	/* Transmit Buffer Unavail */</div><div class='add'>+#define DMA_INTR_ENA_TSE	0x00000002	/* Transmit Stopped */</div><div class='add'>+#define DMA_INTR_ENA_TIE	0x00000001	/* Transmit Interrupt */</div><div class='add'>+</div><div class='add'>+#define DMA_INTR_NORMAL		(DMA_INTR_ENA_NIE | DMA_INTR_ENA_RIE | \</div><div class='add'>+				 DMA_INTR_ENA_TUE)</div><div class='add'>+</div><div class='add'>+#define DMA_INTR_ABNORMAL	(DMA_INTR_ENA_AIE | DMA_INTR_ENA_FBE | \</div><div class='add'>+				 DMA_INTR_ENA_RWE | DMA_INTR_ENA_RSE | \</div><div class='add'>+				 DMA_INTR_ENA_RUE | DMA_INTR_ENA_UNE | \</div><div class='add'>+				 DMA_INTR_ENA_OVE | DMA_INTR_ENA_TJE | \</div><div class='add'>+				 DMA_INTR_ENA_TSE)</div><div class='add'>+</div><div class='add'>+/* DMA default interrupt mask */</div><div class='add'>+#define DMA_INTR_DEFAULT_MASK	(DMA_INTR_NORMAL | DMA_INTR_ABNORMAL)</div><div class='add'>+</div><div class='add'>+/* DMA Status register defines */</div><div class='add'>+#define DMA_STATUS_GMI		0x08000000	/* MMC interrupt */</div><div class='add'>+#define DMA_STATUS_GLI		0x04000000	/* GMAC Line interface int */</div><div class='add'>+#define DMA_STATUS_EB_MASK	0x00380000	/* Error Bits Mask */</div><div class='add'>+#define DMA_STATUS_EB_TX_ABORT	0x00080000	/* Error Bits - TX Abort */</div><div class='add'>+#define DMA_STATUS_EB_RX_ABORT	0x00100000	/* Error Bits - RX Abort */</div><div class='add'>+#define DMA_STATUS_TS_MASK	0x00700000	/* Transmit Process State */</div><div class='add'>+#define DMA_STATUS_TS_SHIFT	20</div><div class='add'>+#define DMA_STATUS_RS_MASK	0x000e0000	/* Receive Process State */</div><div class='add'>+#define DMA_STATUS_RS_SHIFT	17</div><div class='add'>+#define DMA_STATUS_NIS		0x00010000	/* Normal Interrupt Summary */</div><div class='add'>+#define DMA_STATUS_AIS		0x00008000	/* Abnormal Interrupt Summary */</div><div class='add'>+#define DMA_STATUS_ERI		0x00004000	/* Early Receive Interrupt */</div><div class='add'>+#define DMA_STATUS_FBI		0x00002000	/* Fatal Bus Error Interrupt */</div><div class='add'>+#define DMA_STATUS_ETI		0x00000400	/* Early Transmit Interrupt */</div><div class='add'>+#define DMA_STATUS_RWT		0x00000200	/* Receive Watchdog Timeout */</div><div class='add'>+#define DMA_STATUS_RPS		0x00000100	/* Receive Process Stopped */</div><div class='add'>+#define DMA_STATUS_RU		0x00000080	/* Receive Buffer Unavailable */</div><div class='add'>+#define DMA_STATUS_RI		0x00000040	/* Receive Interrupt */</div><div class='add'>+#define DMA_STATUS_UNF		0x00000020	/* Transmit Underflow */</div><div class='add'>+#define DMA_STATUS_OVF		0x00000010	/* Receive Overflow */</div><div class='add'>+#define DMA_STATUS_TJT		0x00000008	/* Transmit Jabber Timeout */</div><div class='add'>+#define DMA_STATUS_TU		0x00000004	/* Transmit Buffer Unavail */</div><div class='add'>+#define DMA_STATUS_TPS		0x00000002	/* Transmit Process Stopped */</div><div class='add'>+#define DMA_STATUS_TI		0x00000001	/* Transmit Interrupt */</div><div class='add'>+</div><div class='add'>+/* Common MAC defines */</div><div class='add'>+#define MAC_ENABLE_TX		0x00000008	/* Transmitter Enable */</div><div class='add'>+#define MAC_ENABLE_RX		0x00000004	/* Receiver Enable */</div><div class='add'>+</div><div class='add'>+/* XGMAC Operation Mode Register */</div><div class='add'>+#define XGMAC_OMR_TSF		0x00200000	/* TX FIFO Store and Forward */</div><div class='add'>+#define XGMAC_OMR_FTF		0x00100000	/* Flush Transmit FIFO */</div><div class='add'>+#define XGMAC_OMR_TTC		0x00020000	/* Transmit Threshhold Ctrl */</div><div class='add'>+#define XGMAC_OMR_TTC_MASK	0x00030000</div><div class='add'>+#define XGMAC_OMR_RFD		0x00006000	/* FC Deactivation Threshhold */</div><div class='add'>+#define XGMAC_OMR_RFD_MASK	0x00007000	/* FC Deact Threshhold MASK */</div><div class='add'>+#define XGMAC_OMR_RFA		0x00000600	/* FC Activation Threshhold */</div><div class='add'>+#define XGMAC_OMR_RFA_MASK	0x00000E00	/* FC Act Threshhold MASK */</div><div class='add'>+#define XGMAC_OMR_EFC		0x00000100	/* Enable Hardware FC */</div><div class='add'>+#define XGMAC_OMR_FEF		0x00000080	/* Forward Error Frames */</div><div class='add'>+#define XGMAC_OMR_DT		0x00000040	/* Drop TCP/IP csum Errors */</div><div class='add'>+#define XGMAC_OMR_RSF		0x00000020	/* RX FIFO Store and Forward */</div><div class='add'>+#define XGMAC_OMR_RTC		0x00000010	/* RX Threshhold Ctrl */</div><div class='add'>+#define XGMAC_OMR_RTC_MASK	0x00000018	/* RX Threshhold Ctrl MASK */</div><div class='add'>+</div><div class='add'>+/* XGMAC HW Features Register */</div><div class='add'>+#define DMA_HW_FEAT_TXCOESEL	0x00010000	/* TX Checksum offload */</div><div class='add'>+</div><div class='add'>+#define XGMAC_MMC_CTRL_CNT_FRZ	0x00000008</div><div class='add'>+</div><div class='add'>+/* XGMAC Descriptor Defines */</div><div class='add'>+#define MAX_DESC_BUF_SZ		(0x2000 - 8)</div><div class='add'>+</div><div class='add'>+#define RXDESC_EXT_STATUS	0x00000001</div><div class='add'>+#define RXDESC_CRC_ERR		0x00000002</div><div class='add'>+#define RXDESC_RX_ERR		0x00000008</div><div class='add'>+#define RXDESC_RX_WDOG		0x00000010</div><div class='add'>+#define RXDESC_FRAME_TYPE	0x00000020</div><div class='add'>+#define RXDESC_GIANT_FRAME	0x00000080</div><div class='add'>+#define RXDESC_LAST_SEG		0x00000100</div><div class='add'>+#define RXDESC_FIRST_SEG	0x00000200</div><div class='add'>+#define RXDESC_VLAN_FRAME	0x00000400</div><div class='add'>+#define RXDESC_OVERFLOW_ERR	0x00000800</div><div class='add'>+#define RXDESC_LENGTH_ERR	0x00001000</div><div class='add'>+#define RXDESC_SA_FILTER_FAIL	0x00002000</div><div class='add'>+#define RXDESC_DESCRIPTOR_ERR	0x00004000</div><div class='add'>+#define RXDESC_ERROR_SUMMARY	0x00008000</div><div class='add'>+#define RXDESC_FRAME_LEN_OFFSET	16</div><div class='add'>+#define RXDESC_FRAME_LEN_MASK	0x3fff0000</div><div class='add'>+#define RXDESC_DA_FILTER_FAIL	0x40000000</div><div class='add'>+</div><div class='add'>+#define RXDESC1_END_RING	0x00008000</div><div class='add'>+</div><div class='add'>+#define RXDESC_IP_PAYLOAD_MASK	0x00000003</div><div class='add'>+#define RXDESC_IP_PAYLOAD_UDP	0x00000001</div><div class='add'>+#define RXDESC_IP_PAYLOAD_TCP	0x00000002</div><div class='add'>+#define RXDESC_IP_PAYLOAD_ICMP	0x00000003</div><div class='add'>+#define RXDESC_IP_HEADER_ERR	0x00000008</div><div class='add'>+#define RXDESC_IP_PAYLOAD_ERR	0x00000010</div><div class='add'>+#define RXDESC_IPV4_PACKET	0x00000040</div><div class='add'>+#define RXDESC_IPV6_PACKET	0x00000080</div><div class='add'>+#define TXDESC_UNDERFLOW_ERR	0x00000001</div><div class='add'>+#define TXDESC_JABBER_TIMEOUT	0x00000002</div><div class='add'>+#define TXDESC_LOCAL_FAULT	0x00000004</div><div class='add'>+#define TXDESC_REMOTE_FAULT	0x00000008</div><div class='add'>+#define TXDESC_VLAN_FRAME	0x00000010</div><div class='add'>+#define TXDESC_FRAME_FLUSHED	0x00000020</div><div class='add'>+#define TXDESC_IP_HEADER_ERR	0x00000040</div><div class='add'>+#define TXDESC_PAYLOAD_CSUM_ERR	0x00000080</div><div class='add'>+#define TXDESC_ERROR_SUMMARY	0x00008000</div><div class='add'>+#define TXDESC_SA_CTRL_INSERT	0x00040000</div><div class='add'>+#define TXDESC_SA_CTRL_REPLACE	0x00080000</div><div class='add'>+#define TXDESC_2ND_ADDR_CHAINED	0x00100000</div><div class='add'>+#define TXDESC_END_RING		0x00200000</div><div class='add'>+#define TXDESC_CSUM_IP		0x00400000</div><div class='add'>+#define TXDESC_CSUM_IP_PAYLD	0x00800000</div><div class='add'>+#define TXDESC_CSUM_ALL		0x00C00000</div><div class='add'>+#define TXDESC_CRC_EN_REPLACE	0x01000000</div><div class='add'>+#define TXDESC_CRC_EN_APPEND	0x02000000</div><div class='add'>+#define TXDESC_DISABLE_PAD	0x04000000</div><div class='add'>+#define TXDESC_FIRST_SEG	0x10000000</div><div class='add'>+#define TXDESC_LAST_SEG		0x20000000</div><div class='add'>+#define TXDESC_INTERRUPT	0x40000000</div><div class='add'>+</div><div class='add'>+#define DESC_OWN		0x80000000</div><div class='add'>+#define DESC_BUFFER1_SZ_MASK	0x00001fff</div><div class='add'>+#define DESC_BUFFER2_SZ_MASK	0x1fff0000</div><div class='add'>+#define DESC_BUFFER2_SZ_OFFSET	16</div><div class='add'>+</div><div class='add'>+struct xgmac_dma_desc {</div><div class='add'>+	__le32 flags;</div><div class='add'>+	__le32 buf_size;</div><div class='add'>+	__le32 buf1_addr;		/* Buffer 1 Address Pointer */</div><div class='add'>+	__le32 buf2_addr;		/* Buffer 2 Address Pointer */</div><div class='add'>+	__le32 ext_status;</div><div class='add'>+	__le32 res[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xgmac_extra_stats {</div><div class='add'>+	/* Transmit errors */</div><div class='add'>+	unsigned long tx_jabber;</div><div class='add'>+	unsigned long tx_frame_flushed;</div><div class='add'>+	unsigned long tx_payload_error;</div><div class='add'>+	unsigned long tx_ip_header_error;</div><div class='add'>+	unsigned long tx_local_fault;</div><div class='add'>+	unsigned long tx_remote_fault;</div><div class='add'>+	/* Receive errors */</div><div class='add'>+	unsigned long rx_watchdog;</div><div class='add'>+	unsigned long rx_da_filter_fail;</div><div class='add'>+	unsigned long rx_sa_filter_fail;</div><div class='add'>+	unsigned long rx_payload_error;</div><div class='add'>+	unsigned long rx_ip_header_error;</div><div class='add'>+	/* Tx/Rx IRQ errors */</div><div class='add'>+	unsigned long tx_undeflow;</div><div class='add'>+	unsigned long tx_process_stopped;</div><div class='add'>+	unsigned long rx_buf_unav;</div><div class='add'>+	unsigned long rx_process_stopped;</div><div class='add'>+	unsigned long tx_early;</div><div class='add'>+	unsigned long fatal_bus_error;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xgmac_priv {</div><div class='add'>+	struct xgmac_dma_desc *dma_rx;</div><div class='add'>+	struct sk_buff **rx_skbuff;</div><div class='add'>+	unsigned int rx_tail;</div><div class='add'>+	unsigned int rx_head;</div><div class='add'>+</div><div class='add'>+	struct xgmac_dma_desc *dma_tx;</div><div class='add'>+	struct sk_buff **tx_skbuff;</div><div class='add'>+	unsigned int tx_head;</div><div class='add'>+	unsigned int tx_tail;</div><div class='add'>+</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	struct sk_buff_head rx_recycle;</div><div class='add'>+	unsigned int dma_buf_sz;</div><div class='add'>+	dma_addr_t dma_rx_phy;</div><div class='add'>+	dma_addr_t dma_tx_phy;</div><div class='add'>+</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct device *device;</div><div class='add'>+	struct napi_struct napi;</div><div class='add'>+</div><div class='add'>+	struct xgmac_extra_stats xstats;</div><div class='add'>+</div><div class='add'>+	spinlock_t stats_lock;</div><div class='add'>+	int pmt_irq;</div><div class='add'>+	char rx_pause;</div><div class='add'>+	char tx_pause;</div><div class='add'>+	int wolopts;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* XGMAC Configuration Settings */</div><div class='add'>+#define MAX_MTU			9000</div><div class='add'>+#define PAUSE_TIME		0x400</div><div class='add'>+</div><div class='add'>+#define DMA_RX_RING_SZ		256</div><div class='add'>+#define DMA_TX_RING_SZ		128</div><div class='add'>+/* minimum number of free TX descriptors required to wake up TX process */</div><div class='add'>+#define TX_THRESH		(DMA_TX_RING_SZ/4)</div><div class='add'>+</div><div class='add'>+/* DMA descriptor ring helpers */</div><div class='add'>+#define dma_ring_incr(n, s)	(((n) + 1) &amp; ((s) - 1))</div><div class='add'>+#define dma_ring_space(h, t, s)	CIRC_SPACE(h, t, s)</div><div class='add'>+#define dma_ring_cnt(h, t, s)	CIRC_CNT(h, t, s)</div><div class='add'>+</div><div class='add'>+/* XGMAC Descriptor Access Helpers */</div><div class='add'>+static inline void desc_set_buf_len(struct xgmac_dma_desc *p, u32 buf_sz)</div><div class='add'>+{</div><div class='add'>+	if (buf_sz &gt; MAX_DESC_BUF_SZ)</div><div class='add'>+		p-&gt;buf_size = cpu_to_le32(MAX_DESC_BUF_SZ |</div><div class='add'>+			(buf_sz - MAX_DESC_BUF_SZ) &lt;&lt; DESC_BUFFER2_SZ_OFFSET);</div><div class='add'>+	else</div><div class='add'>+		p-&gt;buf_size = cpu_to_le32(buf_sz);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int desc_get_buf_len(struct xgmac_dma_desc *p)</div><div class='add'>+{</div><div class='add'>+	u32 len = cpu_to_le32(p-&gt;flags);</div><div class='add'>+	return (len &amp; DESC_BUFFER1_SZ_MASK) +</div><div class='add'>+		((len &amp; DESC_BUFFER2_SZ_MASK) &gt;&gt; DESC_BUFFER2_SZ_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void desc_init_rx_desc(struct xgmac_dma_desc *p, int ring_size,</div><div class='add'>+				     int buf_sz)</div><div class='add'>+{</div><div class='add'>+	struct xgmac_dma_desc *end = p + ring_size - 1;</div><div class='add'>+</div><div class='add'>+	memset(p, 0, sizeof(*p) * ring_size);</div><div class='add'>+</div><div class='add'>+	for (; p &lt;= end; p++)</div><div class='add'>+		desc_set_buf_len(p, buf_sz);</div><div class='add'>+</div><div class='add'>+	end-&gt;buf_size |= cpu_to_le32(RXDESC1_END_RING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void desc_init_tx_desc(struct xgmac_dma_desc *p, u32 ring_size)</div><div class='add'>+{</div><div class='add'>+	memset(p, 0, sizeof(*p) * ring_size);</div><div class='add'>+	p[ring_size - 1].flags = cpu_to_le32(TXDESC_END_RING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int desc_get_owner(struct xgmac_dma_desc *p)</div><div class='add'>+{</div><div class='add'>+	return le32_to_cpu(p-&gt;flags) &amp; DESC_OWN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void desc_set_rx_owner(struct xgmac_dma_desc *p)</div><div class='add'>+{</div><div class='add'>+	/* Clear all fields and set the owner */</div><div class='add'>+	p-&gt;flags = cpu_to_le32(DESC_OWN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void desc_set_tx_owner(struct xgmac_dma_desc *p, u32 flags)</div><div class='add'>+{</div><div class='add'>+	u32 tmpflags = le32_to_cpu(p-&gt;flags);</div><div class='add'>+	tmpflags &amp;= TXDESC_END_RING;</div><div class='add'>+	tmpflags |= flags | DESC_OWN;</div><div class='add'>+	p-&gt;flags = cpu_to_le32(tmpflags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int desc_get_tx_ls(struct xgmac_dma_desc *p)</div><div class='add'>+{</div><div class='add'>+	return le32_to_cpu(p-&gt;flags) &amp; TXDESC_LAST_SEG;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 desc_get_buf_addr(struct xgmac_dma_desc *p)</div><div class='add'>+{</div><div class='add'>+	return le32_to_cpu(p-&gt;buf1_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void desc_set_buf_addr(struct xgmac_dma_desc *p,</div><div class='add'>+				     u32 paddr, int len)</div><div class='add'>+{</div><div class='add'>+	p-&gt;buf1_addr = cpu_to_le32(paddr);</div><div class='add'>+	if (len &gt; MAX_DESC_BUF_SZ)</div><div class='add'>+		p-&gt;buf2_addr = cpu_to_le32(paddr + MAX_DESC_BUF_SZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void desc_set_buf_addr_and_size(struct xgmac_dma_desc *p,</div><div class='add'>+					      u32 paddr, int len)</div><div class='add'>+{</div><div class='add'>+	desc_set_buf_len(p, len);</div><div class='add'>+	desc_set_buf_addr(p, paddr, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int desc_get_rx_frame_len(struct xgmac_dma_desc *p)</div><div class='add'>+{</div><div class='add'>+	u32 data = le32_to_cpu(p-&gt;flags);</div><div class='add'>+	u32 len = (data &amp; RXDESC_FRAME_LEN_MASK) &gt;&gt; RXDESC_FRAME_LEN_OFFSET;</div><div class='add'>+	if (data &amp; RXDESC_FRAME_TYPE)</div><div class='add'>+		len -= ETH_FCS_LEN;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xgmac_dma_flush_tx_fifo(void __iomem *ioaddr)</div><div class='add'>+{</div><div class='add'>+	int timeout = 1000;</div><div class='add'>+	u32 reg = readl(ioaddr + XGMAC_OMR);</div><div class='add'>+	writel(reg | XGMAC_OMR_FTF, ioaddr + XGMAC_OMR);</div><div class='add'>+</div><div class='add'>+	while ((timeout-- &gt; 0) &amp;&amp; readl(ioaddr + XGMAC_OMR) &amp; XGMAC_OMR_FTF)</div><div class='add'>+		udelay(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int desc_get_tx_status(struct xgmac_priv *priv, struct xgmac_dma_desc *p)</div><div class='add'>+{</div><div class='add'>+	struct xgmac_extra_stats *x = &amp;priv-&gt;xstats;</div><div class='add'>+	u32 status = le32_to_cpu(p-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if (!(status &amp; TXDESC_ERROR_SUMMARY))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;dev, "tx desc error = 0x%08x\n", status);</div><div class='add'>+	if (status &amp; TXDESC_JABBER_TIMEOUT)</div><div class='add'>+		x-&gt;tx_jabber++;</div><div class='add'>+	if (status &amp; TXDESC_FRAME_FLUSHED)</div><div class='add'>+		x-&gt;tx_frame_flushed++;</div><div class='add'>+	if (status &amp; TXDESC_UNDERFLOW_ERR)</div><div class='add'>+		xgmac_dma_flush_tx_fifo(priv-&gt;base);</div><div class='add'>+	if (status &amp; TXDESC_IP_HEADER_ERR)</div><div class='add'>+		x-&gt;tx_ip_header_error++;</div><div class='add'>+	if (status &amp; TXDESC_LOCAL_FAULT)</div><div class='add'>+		x-&gt;tx_local_fault++;</div><div class='add'>+	if (status &amp; TXDESC_REMOTE_FAULT)</div><div class='add'>+		x-&gt;tx_remote_fault++;</div><div class='add'>+	if (status &amp; TXDESC_PAYLOAD_CSUM_ERR)</div><div class='add'>+		x-&gt;tx_payload_error++;</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int desc_get_rx_status(struct xgmac_priv *priv, struct xgmac_dma_desc *p)</div><div class='add'>+{</div><div class='add'>+	struct xgmac_extra_stats *x = &amp;priv-&gt;xstats;</div><div class='add'>+	int ret = CHECKSUM_UNNECESSARY;</div><div class='add'>+	u32 status = le32_to_cpu(p-&gt;flags);</div><div class='add'>+	u32 ext_status = le32_to_cpu(p-&gt;ext_status);</div><div class='add'>+</div><div class='add'>+	if (status &amp; RXDESC_DA_FILTER_FAIL) {</div><div class='add'>+		netdev_dbg(priv-&gt;dev, "XGMAC RX : Dest Address filter fail\n");</div><div class='add'>+		x-&gt;rx_da_filter_fail++;</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if packet has checksum already */</div><div class='add'>+	if ((status &amp; RXDESC_FRAME_TYPE) &amp;&amp; (status &amp; RXDESC_EXT_STATUS) &amp;&amp;</div><div class='add'>+		!(ext_status &amp; RXDESC_IP_PAYLOAD_MASK))</div><div class='add'>+		ret = CHECKSUM_NONE;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;dev, "rx status - frame type=%d, csum = %d, ext stat %08x\n",</div><div class='add'>+		   (status &amp; RXDESC_FRAME_TYPE) ? 1 : 0, ret, ext_status);</div><div class='add'>+</div><div class='add'>+	if (!(status &amp; RXDESC_ERROR_SUMMARY))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Handle any errors */</div><div class='add'>+	if (status &amp; (RXDESC_DESCRIPTOR_ERR | RXDESC_OVERFLOW_ERR |</div><div class='add'>+		RXDESC_GIANT_FRAME | RXDESC_LENGTH_ERR | RXDESC_CRC_ERR))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (status &amp; RXDESC_EXT_STATUS) {</div><div class='add'>+		if (ext_status &amp; RXDESC_IP_HEADER_ERR)</div><div class='add'>+			x-&gt;rx_ip_header_error++;</div><div class='add'>+		if (ext_status &amp; RXDESC_IP_PAYLOAD_ERR)</div><div class='add'>+			x-&gt;rx_payload_error++;</div><div class='add'>+		netdev_dbg(priv-&gt;dev, "IP checksum error - stat %08x\n",</div><div class='add'>+			   ext_status);</div><div class='add'>+		return CHECKSUM_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void xgmac_mac_enable(void __iomem *ioaddr)</div><div class='add'>+{</div><div class='add'>+	u32 value = readl(ioaddr + XGMAC_CONTROL);</div><div class='add'>+	value |= MAC_ENABLE_RX | MAC_ENABLE_TX;</div><div class='add'>+	writel(value, ioaddr + XGMAC_CONTROL);</div><div class='add'>+</div><div class='add'>+	value = readl(ioaddr + XGMAC_DMA_CONTROL);</div><div class='add'>+	value |= DMA_CONTROL_ST | DMA_CONTROL_SR;</div><div class='add'>+	writel(value, ioaddr + XGMAC_DMA_CONTROL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void xgmac_mac_disable(void __iomem *ioaddr)</div><div class='add'>+{</div><div class='add'>+	u32 value = readl(ioaddr + XGMAC_DMA_CONTROL);</div><div class='add'>+	value &amp;= ~(DMA_CONTROL_ST | DMA_CONTROL_SR);</div><div class='add'>+	writel(value, ioaddr + XGMAC_DMA_CONTROL);</div><div class='add'>+</div><div class='add'>+	value = readl(ioaddr + XGMAC_CONTROL);</div><div class='add'>+	value &amp;= ~(MAC_ENABLE_TX | MAC_ENABLE_RX);</div><div class='add'>+	writel(value, ioaddr + XGMAC_CONTROL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xgmac_set_mac_addr(void __iomem *ioaddr, unsigned char *addr,</div><div class='add'>+			       int num)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	data = (addr[5] &lt;&lt; 8) | addr[4] | (num ? XGMAC_ADDR_AE : 0);</div><div class='add'>+	writel(data, ioaddr + XGMAC_ADDR_HIGH(num));</div><div class='add'>+	data = (addr[3] &lt;&lt; 24) | (addr[2] &lt;&lt; 16) | (addr[1] &lt;&lt; 8) | addr[0];</div><div class='add'>+	writel(data, ioaddr + XGMAC_ADDR_LOW(num));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xgmac_get_mac_addr(void __iomem *ioaddr, unsigned char *addr,</div><div class='add'>+			       int num)</div><div class='add'>+{</div><div class='add'>+	u32 hi_addr, lo_addr;</div><div class='add'>+</div><div class='add'>+	/* Read the MAC address from the hardware */</div><div class='add'>+	hi_addr = readl(ioaddr + XGMAC_ADDR_HIGH(num));</div><div class='add'>+	lo_addr = readl(ioaddr + XGMAC_ADDR_LOW(num));</div><div class='add'>+</div><div class='add'>+	/* Extract the MAC address from the high and low words */</div><div class='add'>+	addr[0] = lo_addr &amp; 0xff;</div><div class='add'>+	addr[1] = (lo_addr &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	addr[2] = (lo_addr &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	addr[3] = (lo_addr &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+	addr[4] = hi_addr &amp; 0xff;</div><div class='add'>+	addr[5] = (hi_addr &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgmac_set_flow_ctrl(struct xgmac_priv *priv, int rx, int tx)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+	unsigned int flow = 0;</div><div class='add'>+</div><div class='add'>+	priv-&gt;rx_pause = rx;</div><div class='add'>+	priv-&gt;tx_pause = tx;</div><div class='add'>+</div><div class='add'>+	if (rx || tx) {</div><div class='add'>+		if (rx)</div><div class='add'>+			flow |= XGMAC_FLOW_CTRL_RFE;</div><div class='add'>+		if (tx)</div><div class='add'>+			flow |= XGMAC_FLOW_CTRL_TFE;</div><div class='add'>+</div><div class='add'>+		flow |= XGMAC_FLOW_CTRL_PLT | XGMAC_FLOW_CTRL_UP;</div><div class='add'>+		flow |= (PAUSE_TIME &lt;&lt; XGMAC_FLOW_CTRL_PT_SHIFT);</div><div class='add'>+</div><div class='add'>+		writel(flow, priv-&gt;base + XGMAC_FLOW_CTRL);</div><div class='add'>+</div><div class='add'>+		reg = readl(priv-&gt;base + XGMAC_OMR);</div><div class='add'>+		reg |= XGMAC_OMR_EFC;</div><div class='add'>+		writel(reg, priv-&gt;base + XGMAC_OMR);</div><div class='add'>+	} else {</div><div class='add'>+		writel(0, priv-&gt;base + XGMAC_FLOW_CTRL);</div><div class='add'>+</div><div class='add'>+		reg = readl(priv-&gt;base + XGMAC_OMR);</div><div class='add'>+		reg &amp;= ~XGMAC_OMR_EFC;</div><div class='add'>+		writel(reg, priv-&gt;base + XGMAC_OMR);</div><div 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 xgmac_rx_refill(struct xgmac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct xgmac_dma_desc *p;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+</div><div class='add'>+	while (dma_ring_space(priv-&gt;rx_head, priv-&gt;rx_tail, DMA_RX_RING_SZ) &gt; 1) {</div><div class='add'>+		int entry = priv-&gt;rx_head;</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		p = priv-&gt;dma_rx + entry;</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;rx_skbuff[entry] != NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		skb = __skb_dequeue(&amp;priv-&gt;rx_recycle);</div><div class='add'>+		if (skb == NULL)</div><div class='add'>+			skb = netdev_alloc_skb(priv-&gt;dev, priv-&gt;dma_buf_sz);</div><div class='add'>+		if (unlikely(skb == NULL))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		priv-&gt;rx_skbuff[entry] = skb;</div><div class='add'>+		paddr = dma_map_single(priv-&gt;device, skb-&gt;data,</div><div class='add'>+					 priv-&gt;dma_buf_sz, DMA_FROM_DEVICE);</div><div class='add'>+		desc_set_buf_addr(p, paddr, priv-&gt;dma_buf_sz);</div><div class='add'>+</div><div class='add'>+		netdev_dbg(priv-&gt;dev, "rx ring: head %d, tail %d\n",</div><div class='add'>+			priv-&gt;rx_head, priv-&gt;rx_tail);</div><div class='add'>+</div><div class='add'>+		priv-&gt;rx_head = dma_ring_incr(priv-&gt;rx_head, DMA_RX_RING_SZ);</div><div class='add'>+		/* Ensure descriptor is in memory before handing to h/w */</div><div class='add'>+		wmb();</div><div class='add'>+		desc_set_rx_owner(p);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * init_xgmac_dma_desc_rings - init the RX/TX descriptor rings</div><div class='add'>+ * @dev: net device structure</div><div class='add'>+ * Description:  this function initializes the DMA RX/TX descriptors</div><div class='add'>+ * and allocates the socket buffers.</div><div class='add'>+ */</div><div class='add'>+static int xgmac_dma_desc_rings_init(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(dev);</div><div class='add'>+	unsigned int bfsize;</div><div class='add'>+</div><div class='add'>+	/* Set the Buffer size according to the MTU;</div><div class='add'>+	 * indeed, in case of jumbo we need to bump-up the buffer sizes.</div><div class='add'>+	 */</div><div class='add'>+	bfsize = ALIGN(dev-&gt;mtu + ETH_HLEN + ETH_FCS_LEN + NET_IP_ALIGN + 64,</div><div class='add'>+		       64);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;dev, "mtu [%d] bfsize [%d]\n", dev-&gt;mtu, bfsize);</div><div class='add'>+</div><div class='add'>+	priv-&gt;rx_skbuff = kzalloc(sizeof(struct sk_buff *) * DMA_RX_RING_SZ,</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;rx_skbuff)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;dma_rx = dma_alloc_coherent(priv-&gt;device,</div><div class='add'>+					  DMA_RX_RING_SZ *</div><div class='add'>+					  sizeof(struct xgmac_dma_desc),</div><div class='add'>+					  &amp;priv-&gt;dma_rx_phy,</div><div class='add'>+					  GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;dma_rx)</div><div class='add'>+		goto err_dma_rx;</div><div class='add'>+</div><div class='add'>+	priv-&gt;tx_skbuff = kzalloc(sizeof(struct sk_buff *) * DMA_TX_RING_SZ,</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;tx_skbuff)</div><div class='add'>+		goto err_tx_skb;</div><div class='add'>+</div><div class='add'>+	priv-&gt;dma_tx = dma_alloc_coherent(priv-&gt;device,</div><div class='add'>+					  DMA_TX_RING_SZ *</div><div class='add'>+					  sizeof(struct xgmac_dma_desc),</div><div class='add'>+					  &amp;priv-&gt;dma_tx_phy,</div><div class='add'>+					  GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;dma_tx)</div><div class='add'>+		goto err_dma_tx;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;dev, "DMA desc rings: virt addr (Rx %p, "</div><div class='add'>+	    "Tx %p)\n\tDMA phy addr (Rx 0x%08x, Tx 0x%08x)\n",</div><div class='add'>+	    priv-&gt;dma_rx, priv-&gt;dma_tx,</div><div class='add'>+	    (unsigned int)priv-&gt;dma_rx_phy, (unsigned int)priv-&gt;dma_tx_phy);</div><div class='add'>+</div><div class='add'>+	priv-&gt;rx_tail = 0;</div><div class='add'>+	priv-&gt;rx_head = 0;</div><div class='add'>+	priv-&gt;dma_buf_sz = bfsize;</div><div class='add'>+	desc_init_rx_desc(priv-&gt;dma_rx, DMA_RX_RING_SZ, priv-&gt;dma_buf_sz);</div><div class='add'>+	xgmac_rx_refill(priv);</div><div class='add'>+</div><div class='add'>+	priv-&gt;tx_tail = 0;</div><div class='add'>+	priv-&gt;tx_head = 0;</div><div class='add'>+	desc_init_tx_desc(priv-&gt;dma_tx, DMA_TX_RING_SZ);</div><div class='add'>+</div><div class='add'>+	writel(priv-&gt;dma_tx_phy, priv-&gt;base + XGMAC_DMA_TX_BASE_ADDR);</div><div class='add'>+	writel(priv-&gt;dma_rx_phy, priv-&gt;base + XGMAC_DMA_RX_BASE_ADDR);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_dma_tx:</div><div class='add'>+	kfree(priv-&gt;tx_skbuff);</div><div class='add'>+err_tx_skb:</div><div class='add'>+	dma_free_coherent(priv-&gt;device,</div><div class='add'>+			  DMA_RX_RING_SZ * sizeof(struct xgmac_dma_desc),</div><div class='add'>+			  priv-&gt;dma_rx, priv-&gt;dma_rx_phy);</div><div class='add'>+err_dma_rx:</div><div class='add'>+	kfree(priv-&gt;rx_skbuff);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xgmac_free_rx_skbufs(struct xgmac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct xgmac_dma_desc *p;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;rx_skbuff)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DMA_RX_RING_SZ; i++) {</div><div class='add'>+		if (priv-&gt;rx_skbuff[i] == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		p = priv-&gt;dma_rx + i;</div><div class='add'>+		dma_unmap_single(priv-&gt;device, desc_get_buf_addr(p),</div><div class='add'>+				 priv-&gt;dma_buf_sz, DMA_FROM_DEVICE);</div><div class='add'>+		dev_kfree_skb_any(priv-&gt;rx_skbuff[i]);</div><div class='add'>+		priv-&gt;rx_skbuff[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xgmac_free_tx_skbufs(struct xgmac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i, f;</div><div class='add'>+	struct xgmac_dma_desc *p;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;tx_skbuff)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DMA_TX_RING_SZ; i++) {</div><div class='add'>+		if (priv-&gt;tx_skbuff[i] == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		p = priv-&gt;dma_tx + i;</div><div class='add'>+		dma_unmap_single(priv-&gt;device, desc_get_buf_addr(p),</div><div class='add'>+				 desc_get_buf_len(p), DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+		for (f = 0; f &lt; skb_shinfo(priv-&gt;tx_skbuff[i])-&gt;nr_frags; f++) {</div><div class='add'>+			p = priv-&gt;dma_tx + i++;</div><div class='add'>+			dma_unmap_page(priv-&gt;device, desc_get_buf_addr(p),</div><div class='add'>+				       desc_get_buf_len(p), DMA_TO_DEVICE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dev_kfree_skb_any(priv-&gt;tx_skbuff[i]);</div><div class='add'>+		priv-&gt;tx_skbuff[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xgmac_free_dma_desc_rings(struct xgmac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	/* Release the DMA TX/RX socket buffers */</div><div class='add'>+	xgmac_free_rx_skbufs(priv);</div><div class='add'>+	xgmac_free_tx_skbufs(priv);</div><div class='add'>+</div><div class='add'>+	/* Free the consistent memory allocated for descriptor rings */</div><div class='add'>+	if (priv-&gt;dma_tx) {</div><div class='add'>+		dma_free_coherent(priv-&gt;device,</div><div class='add'>+				  DMA_TX_RING_SZ * sizeof(struct xgmac_dma_desc),</div><div class='add'>+				  priv-&gt;dma_tx, priv-&gt;dma_tx_phy);</div><div class='add'>+		priv-&gt;dma_tx = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (priv-&gt;dma_rx) {</div><div class='add'>+		dma_free_coherent(priv-&gt;device,</div><div class='add'>+				  DMA_RX_RING_SZ * sizeof(struct xgmac_dma_desc),</div><div class='add'>+				  priv-&gt;dma_rx, priv-&gt;dma_rx_phy);</div><div class='add'>+		priv-&gt;dma_rx = NULL;</div><div class='add'>+	}</div><div class='add'>+	kfree(priv-&gt;rx_skbuff);</div><div class='add'>+	priv-&gt;rx_skbuff = NULL;</div><div class='add'>+	kfree(priv-&gt;tx_skbuff);</div><div class='add'>+	priv-&gt;tx_skbuff = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xgmac_tx:</div><div class='add'>+ * @priv: private driver structure</div><div class='add'>+ * Description: it reclaims resources after transmission completes.</div><div class='add'>+ */</div><div class='add'>+static void xgmac_tx_complete(struct xgmac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	void __iomem *ioaddr = priv-&gt;base;</div><div class='add'>+</div><div class='add'>+	writel(DMA_STATUS_TU | DMA_STATUS_NIS, ioaddr + XGMAC_DMA_STATUS);</div><div class='add'>+</div><div class='add'>+	while (dma_ring_cnt(priv-&gt;tx_head, priv-&gt;tx_tail, DMA_TX_RING_SZ)) {</div><div class='add'>+		unsigned int entry = priv-&gt;tx_tail;</div><div class='add'>+		struct sk_buff *skb = priv-&gt;tx_skbuff[entry];</div><div class='add'>+		struct xgmac_dma_desc *p = priv-&gt;dma_tx + entry;</div><div class='add'>+</div><div class='add'>+		/* Check if the descriptor is owned by the DMA. */</div><div class='add'>+		if (desc_get_owner(p))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Verify tx error by looking at the last segment */</div><div class='add'>+		if (desc_get_tx_ls(p))</div><div class='add'>+			desc_get_tx_status(priv, p);</div><div class='add'>+</div><div class='add'>+		netdev_dbg(priv-&gt;dev, "tx ring: curr %d, dirty %d\n",</div><div class='add'>+			priv-&gt;tx_head, priv-&gt;tx_tail);</div><div class='add'>+</div><div class='add'>+		dma_unmap_single(priv-&gt;device, desc_get_buf_addr(p),</div><div class='add'>+				 desc_get_buf_len(p), DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+		priv-&gt;tx_skbuff[entry] = NULL;</div><div class='add'>+		priv-&gt;tx_tail = dma_ring_incr(entry, DMA_TX_RING_SZ);</div><div class='add'>+</div><div class='add'>+		if (!skb) {</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='add'>+			entry = priv-&gt;tx_tail = dma_ring_incr(priv-&gt;tx_tail,</div><div class='add'>+							      DMA_TX_RING_SZ);</div><div class='add'>+			p = priv-&gt;dma_tx + priv-&gt;tx_tail;</div><div class='add'>+</div><div class='add'>+			dma_unmap_page(priv-&gt;device, desc_get_buf_addr(p),</div><div class='add'>+				       desc_get_buf_len(p), DMA_TO_DEVICE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If there's room in the queue (limit it to size)</div><div class='add'>+		 * we add this skb back into the pool,</div><div class='add'>+		 * if it's the right size.</div><div class='add'>+		 */</div><div class='add'>+		if ((skb_queue_len(&amp;priv-&gt;rx_recycle) &lt;</div><div class='add'>+			DMA_RX_RING_SZ) &amp;&amp;</div><div class='add'>+			skb_recycle_check(skb, priv-&gt;dma_buf_sz))</div><div class='add'>+			__skb_queue_head(&amp;priv-&gt;rx_recycle, 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'>+	if (dma_ring_space(priv-&gt;tx_head, priv-&gt;tx_tail, DMA_TX_RING_SZ) &gt;</div><div class='add'>+	    TX_THRESH)</div><div class='add'>+		netif_wake_queue(priv-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xgmac_tx_err:</div><div class='add'>+ * @priv: pointer to the private device structure</div><div class='add'>+ * Description: it cleans the descriptors and restarts the transmission</div><div class='add'>+ * in case of errors.</div><div class='add'>+ */</div><div class='add'>+static void xgmac_tx_err(struct xgmac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 reg, value, inten;</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(priv-&gt;dev);</div><div class='add'>+</div><div class='add'>+	inten = readl(priv-&gt;base + XGMAC_DMA_INTR_ENA);</div><div class='add'>+	writel(0, priv-&gt;base + XGMAC_DMA_INTR_ENA);</div><div class='add'>+</div><div class='add'>+	reg = readl(priv-&gt;base + XGMAC_DMA_CONTROL);</div><div class='add'>+	writel(reg &amp; ~DMA_CONTROL_ST, priv-&gt;base + XGMAC_DMA_CONTROL);</div><div class='add'>+	do {</div><div class='add'>+		value = readl(priv-&gt;base + XGMAC_DMA_STATUS) &amp; 0x700000;</div><div class='add'>+	} while (value &amp;&amp; (value != 0x600000));</div><div class='add'>+</div><div class='add'>+	xgmac_free_tx_skbufs(priv);</div><div class='add'>+	desc_init_tx_desc(priv-&gt;dma_tx, DMA_TX_RING_SZ);</div><div class='add'>+	priv-&gt;tx_tail = 0;</div><div class='add'>+	priv-&gt;tx_head = 0;</div><div class='add'>+	writel(reg | DMA_CONTROL_ST, priv-&gt;base + XGMAC_DMA_CONTROL);</div><div class='add'>+</div><div class='add'>+	writel(DMA_STATUS_TU | DMA_STATUS_TPS | DMA_STATUS_NIS | DMA_STATUS_AIS,</div><div class='add'>+		priv-&gt;base + XGMAC_DMA_STATUS);</div><div class='add'>+	writel(inten, priv-&gt;base + XGMAC_DMA_INTR_ENA);</div><div class='add'>+</div><div class='add'>+	netif_wake_queue(priv-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgmac_hw_init(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	u32 value, ctrl;</div><div class='add'>+	int limit;</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(dev);</div><div class='add'>+	void __iomem *ioaddr = priv-&gt;base;</div><div class='add'>+</div><div class='add'>+	/* Save the ctrl register value */</div><div class='add'>+	ctrl = readl(ioaddr + XGMAC_CONTROL) &amp; XGMAC_CONTROL_SPD_MASK;</div><div class='add'>+</div><div class='add'>+	/* SW reset */</div><div class='add'>+	value = DMA_BUS_MODE_SFT_RESET;</div><div class='add'>+	writel(value, ioaddr + XGMAC_DMA_BUS_MODE);</div><div class='add'>+	limit = 15000;</div><div class='add'>+	while (limit-- &amp;&amp;</div><div class='add'>+		(readl(ioaddr + XGMAC_DMA_BUS_MODE) &amp; DMA_BUS_MODE_SFT_RESET))</div><div class='add'>+		cpu_relax();</div><div class='add'>+	if (limit &lt; 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	value = (0x10 &lt;&lt; DMA_BUS_MODE_PBL_SHIFT) |</div><div class='add'>+		(0x10 &lt;&lt; DMA_BUS_MODE_RPBL_SHIFT) |</div><div class='add'>+		DMA_BUS_MODE_FB | DMA_BUS_MODE_ATDS | DMA_BUS_MODE_AAL;</div><div class='add'>+	writel(value, ioaddr + XGMAC_DMA_BUS_MODE);</div><div class='add'>+</div><div class='add'>+	/* Enable interrupts */</div><div class='add'>+	writel(DMA_INTR_DEFAULT_MASK, ioaddr + XGMAC_DMA_STATUS);</div><div class='add'>+	writel(DMA_INTR_DEFAULT_MASK, ioaddr + XGMAC_DMA_INTR_ENA);</div><div class='add'>+</div><div class='add'>+	/* XGMAC requires AXI bus init. This is a 'magic number' for now */</div><div class='add'>+	writel(0x000100E, ioaddr + XGMAC_DMA_AXI_BUS);</div><div class='add'>+</div><div class='add'>+	ctrl |= XGMAC_CONTROL_DDIC | XGMAC_CONTROL_JE | XGMAC_CONTROL_ACS |</div><div class='add'>+		XGMAC_CONTROL_CAR;</div><div class='add'>+	if (dev-&gt;features &amp; NETIF_F_RXCSUM)</div><div class='add'>+		ctrl |= XGMAC_CONTROL_IPC;</div><div class='add'>+	writel(ctrl, ioaddr + XGMAC_CONTROL);</div><div class='add'>+</div><div class='add'>+	value = DMA_CONTROL_DFF;</div><div class='add'>+	writel(value, ioaddr + XGMAC_DMA_CONTROL);</div><div class='add'>+</div><div class='add'>+	/* Set the HW DMA mode and the COE */</div><div class='add'>+	writel(XGMAC_OMR_TSF | XGMAC_OMR_RSF | XGMAC_OMR_RFD | XGMAC_OMR_RFA,</div><div class='add'>+		ioaddr + XGMAC_OMR);</div><div class='add'>+</div><div class='add'>+	/* Reset the MMC counters */</div><div class='add'>+	writel(1, ioaddr + XGMAC_MMC_CTRL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  xgmac_open - open entry point of the driver</div><div class='add'>+ *  @dev : pointer to the device structure.</div><div class='add'>+ *  Description:</div><div class='add'>+ *  This function is the open entry point of the driver.</div><div class='add'>+ *  Return value:</div><div class='add'>+ *  0 on success and an appropriate (-)ve integer as defined in errno.h</div><div class='add'>+ *  file on failure.</div><div class='add'>+ */</div><div class='add'>+static int xgmac_open(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(dev);</div><div class='add'>+	void __iomem *ioaddr = priv-&gt;base;</div><div class='add'>+</div><div class='add'>+	/* Check that the MAC address is valid.  If its not, refuse</div><div class='add'>+	 * to bring the device up. The user must specify an</div><div class='add'>+	 * address using the following linux command:</div><div class='add'>+	 *      ifconfig eth0 hw ether xx:xx:xx:xx:xx:xx  */</div><div class='add'>+	if (!is_valid_ether_addr(dev-&gt;dev_addr)) {</div><div class='add'>+		random_ether_addr(dev-&gt;dev_addr);</div><div class='add'>+		netdev_dbg(priv-&gt;dev, "generated random MAC address %pM\n",</div><div class='add'>+			dev-&gt;dev_addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_queue_head_init(&amp;priv-&gt;rx_recycle);</div><div class='add'>+	memset(&amp;priv-&gt;xstats, 0, sizeof(struct xgmac_extra_stats));</div><div class='add'>+</div><div class='add'>+	/* Initialize the XGMAC and descriptors */</div><div class='add'>+	xgmac_hw_init(dev);</div><div class='add'>+	xgmac_set_mac_addr(ioaddr, dev-&gt;dev_addr, 0);</div><div class='add'>+	xgmac_set_flow_ctrl(priv, priv-&gt;rx_pause, priv-&gt;tx_pause);</div><div class='add'>+</div><div class='add'>+	ret = xgmac_dma_desc_rings_init(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Enable the MAC Rx/Tx */</div><div class='add'>+	xgmac_mac_enable(ioaddr);</div><div class='add'>+</div><div class='add'>+	napi_enable(&amp;priv-&gt;napi);</div><div class='add'>+	netif_start_queue(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  xgmac_release - close entry point of the driver</div><div class='add'>+ *  @dev : device pointer.</div><div class='add'>+ *  Description:</div><div class='add'>+ *  This is the stop entry point of the driver.</div><div class='add'>+ */</div><div class='add'>+static int xgmac_stop(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(dev);</div><div class='add'>+</div><div class='add'>+	if (readl(priv-&gt;base + XGMAC_DMA_INTR_ENA))</div><div class='add'>+		napi_disable(&amp;priv-&gt;napi);</div><div class='add'>+</div><div class='add'>+	writel(0, priv-&gt;base + XGMAC_DMA_INTR_ENA);</div><div class='add'>+	skb_queue_purge(&amp;priv-&gt;rx_recycle);</div><div class='add'>+</div><div class='add'>+	/* Disable the MAC core */</div><div class='add'>+	xgmac_mac_disable(priv-&gt;base);</div><div class='add'>+</div><div class='add'>+	/* Release and free the Rx/Tx resources */</div><div class='add'>+	xgmac_free_dma_desc_rings(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'>+ *  xgmac_xmit:</div><div class='add'>+ *  @skb : the socket buffer</div><div class='add'>+ *  @dev : device pointer</div><div class='add'>+ *  Description : Tx entry point of the driver.</div><div class='add'>+ */</div><div class='add'>+static netdev_tx_t xgmac_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(dev);</div><div class='add'>+	unsigned int entry;</div><div class='add'>+	int i;</div><div class='add'>+	int nfrags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='add'>+	struct xgmac_dma_desc *desc, *first;</div><div class='add'>+	unsigned int desc_flags;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+</div><div class='add'>+	if (dma_ring_space(priv-&gt;tx_head, priv-&gt;tx_tail, DMA_TX_RING_SZ) &lt;</div><div class='add'>+	    (nfrags + 1)) {</div><div class='add'>+		writel(DMA_INTR_DEFAULT_MASK | DMA_INTR_ENA_TIE,</div><div class='add'>+			priv-&gt;base + XGMAC_DMA_INTR_ENA);</div><div class='add'>+		netif_stop_queue(dev);</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc_flags = (skb-&gt;ip_summed == CHECKSUM_PARTIAL) ?</div><div class='add'>+		TXDESC_CSUM_ALL : 0;</div><div class='add'>+	entry = priv-&gt;tx_head;</div><div class='add'>+	desc = priv-&gt;dma_tx + entry;</div><div class='add'>+	first = desc;</div><div class='add'>+</div><div class='add'>+	len = skb_headlen(skb);</div><div class='add'>+	paddr = dma_map_single(priv-&gt;device, skb-&gt;data, len, DMA_TO_DEVICE);</div><div class='add'>+	if (dma_mapping_error(priv-&gt;device, paddr)) {</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;tx_skbuff[entry] = skb;</div><div class='add'>+	desc_set_buf_addr_and_size(desc, paddr, len);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nfrags; i++) {</div><div class='add'>+		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='add'>+</div><div class='add'>+		len = frag-&gt;size;</div><div class='add'>+</div><div class='add'>+		paddr = skb_frag_dma_map(priv-&gt;device, frag, 0, len,</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='add'>+		if (dma_mapping_error(priv-&gt;device, paddr)) {</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		entry = dma_ring_incr(entry, DMA_TX_RING_SZ);</div><div class='add'>+		desc = priv-&gt;dma_tx + entry;</div><div class='add'>+		priv-&gt;tx_skbuff[entry] = NULL;</div><div class='add'>+</div><div class='add'>+		desc_set_buf_addr_and_size(desc, paddr, len);</div><div class='add'>+		if (i &lt; (nfrags - 1))</div><div class='add'>+			desc_set_tx_owner(desc, desc_flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Interrupt on completition only for the latest segment */</div><div class='add'>+	if (desc != first)</div><div class='add'>+		desc_set_tx_owner(desc, desc_flags |</div><div class='add'>+			TXDESC_LAST_SEG | TXDESC_INTERRUPT);</div><div class='add'>+	else</div><div class='add'>+		desc_flags |= TXDESC_LAST_SEG | TXDESC_INTERRUPT;</div><div class='add'>+</div><div class='add'>+	/* Set owner on first desc last to avoid race condition */</div><div class='add'>+	wmb();</div><div class='add'>+	desc_set_tx_owner(first, desc_flags | TXDESC_FIRST_SEG);</div><div class='add'>+</div><div class='add'>+	priv-&gt;tx_head = dma_ring_incr(entry, DMA_TX_RING_SZ);</div><div class='add'>+</div><div class='add'>+	writel(1, priv-&gt;base + XGMAC_DMA_TX_POLL);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgmac_rx(struct xgmac_priv *priv, int limit)</div><div class='add'>+{</div><div class='add'>+	unsigned int entry;</div><div class='add'>+	unsigned int count = 0;</div><div class='add'>+	struct xgmac_dma_desc *p;</div><div class='add'>+</div><div class='add'>+	while (count &lt; limit) {</div><div class='add'>+		int ip_checksum;</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		int frame_len;</div><div class='add'>+</div><div class='add'>+		writel(DMA_STATUS_RI | DMA_STATUS_NIS,</div><div class='add'>+		       priv-&gt;base + XGMAC_DMA_STATUS);</div><div class='add'>+</div><div class='add'>+		entry = priv-&gt;rx_tail;</div><div class='add'>+		p = priv-&gt;dma_rx + entry;</div><div class='add'>+		if (desc_get_owner(p))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		count++;</div><div class='add'>+		priv-&gt;rx_tail = dma_ring_incr(priv-&gt;rx_tail, DMA_RX_RING_SZ);</div><div class='add'>+</div><div class='add'>+		/* read the status of the incoming frame */</div><div class='add'>+		ip_checksum = desc_get_rx_status(priv, p);</div><div class='add'>+		if (ip_checksum &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		skb = priv-&gt;rx_skbuff[entry];</div><div class='add'>+		if (unlikely(!skb)) {</div><div class='add'>+			netdev_err(priv-&gt;dev, "Inconsistent Rx descriptor chain\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		priv-&gt;rx_skbuff[entry] = NULL;</div><div class='add'>+</div><div class='add'>+		frame_len = desc_get_rx_frame_len(p);</div><div class='add'>+		netdev_dbg(priv-&gt;dev, "RX frame size %d, COE status: %d\n",</div><div class='add'>+			frame_len, ip_checksum);</div><div class='add'>+</div><div class='add'>+		skb_put(skb, frame_len);</div><div class='add'>+		dma_unmap_single(priv-&gt;device, desc_get_buf_addr(p),</div><div class='add'>+				 frame_len, DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+		skb-&gt;protocol = eth_type_trans(skb, priv-&gt;dev);</div><div class='add'>+		skb-&gt;ip_summed = ip_checksum;</div><div class='add'>+		if (ip_checksum == CHECKSUM_NONE)</div><div class='add'>+			netif_receive_skb(skb);</div><div class='add'>+		else</div><div class='add'>+			napi_gro_receive(&amp;priv-&gt;napi, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xgmac_rx_refill(priv);</div><div class='add'>+</div><div class='add'>+	writel(1, priv-&gt;base + XGMAC_DMA_RX_POLL);</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='add'>+ *  xgmac_poll - xgmac poll method (NAPI)</div><div class='add'>+ *  @napi : pointer to the napi structure.</div><div class='add'>+ *  @budget : maximum number of packets that the current CPU can receive from</div><div class='add'>+ *	      all interfaces.</div><div class='add'>+ *  Description :</div><div class='add'>+ *   This function implements the the reception process.</div><div class='add'>+ *   Also it runs the TX completion thread</div><div class='add'>+ */</div><div class='add'>+static int xgmac_poll(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct xgmac_priv *priv = container_of(napi,</div><div class='add'>+				       struct xgmac_priv, napi);</div><div class='add'>+	int work_done = 0;</div><div class='add'>+</div><div class='add'>+	xgmac_tx_complete(priv);</div><div class='add'>+	work_done = xgmac_rx(priv, budget);</div><div class='add'>+</div><div class='add'>+	if (work_done &lt; budget) {</div><div class='add'>+		napi_complete(napi);</div><div class='add'>+		writel(DMA_INTR_DEFAULT_MASK, priv-&gt;base + XGMAC_DMA_INTR_ENA);</div><div class='add'>+	}</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  xgmac_tx_timeout</div><div class='add'>+ *  @dev : Pointer to net device structure</div><div class='add'>+ *  Description: this function is called when a packet transmission fails to</div><div class='add'>+ *   complete within a reasonable tmrate. The driver will mark the error in the</div><div class='add'>+ *   netdev structure and arrange for the device to be reset to a sane state</div><div class='add'>+ *   in order to transmit a new packet.</div><div class='add'>+ */</div><div class='add'>+static void xgmac_tx_timeout(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	/* Clear Tx resources and restart transmitting again */</div><div class='add'>+	xgmac_tx_err(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  xgmac_set_rx_mode - entry point for multicast addressing</div><div class='add'>+ *  @dev : pointer to the device structure</div><div class='add'>+ *  Description:</div><div class='add'>+ *  This function is a driver entry point which gets called by the kernel</div><div class='add'>+ *  whenever multicast addresses must be enabled/disabled.</div><div class='add'>+ *  Return value:</div><div class='add'>+ *  void.</div><div class='add'>+ */</div><div class='add'>+static void xgmac_set_rx_mode(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(dev);</div><div class='add'>+	void __iomem *ioaddr = priv-&gt;base;</div><div class='add'>+	unsigned int value = 0;</div><div class='add'>+	u32 hash_filter[XGMAC_NUM_HASH];</div><div class='add'>+	int reg = 1;</div><div class='add'>+	struct netdev_hw_addr *ha;</div><div class='add'>+	bool use_hash = false;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;dev, "# mcasts %d, # unicast %d\n",</div><div class='add'>+		 netdev_mc_count(dev), netdev_uc_count(dev));</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+		writel(XGMAC_FRAME_FILTER_PR, ioaddr + XGMAC_FRAME_FILTER);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(hash_filter, 0, sizeof(hash_filter));</div><div class='add'>+</div><div class='add'>+	if (netdev_uc_count(dev) &gt; XGMAC_MAX_FILTER_ADDR) {</div><div class='add'>+		use_hash = true;</div><div class='add'>+		value |= XGMAC_FRAME_FILTER_HUC | XGMAC_FRAME_FILTER_HPF;</div><div class='add'>+	}</div><div class='add'>+	netdev_for_each_uc_addr(ha, dev) {</div><div class='add'>+		if (use_hash) {</div><div class='add'>+			u32 bit_nr = ~ether_crc(ETH_ALEN, ha-&gt;addr) &gt;&gt; 23;</div><div class='add'>+</div><div class='add'>+			/* The most significant 4 bits determine the register to</div><div class='add'>+			 * use (H/L) while the other 5 bits determine the bit</div><div class='add'>+			 * within the register. */</div><div class='add'>+			hash_filter[bit_nr &gt;&gt; 5] |= 1 &lt;&lt; (bit_nr &amp; 31);</div><div class='add'>+		} else {</div><div class='add'>+			xgmac_set_mac_addr(ioaddr, ha-&gt;addr, reg);</div><div class='add'>+			reg++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='add'>+		value |= XGMAC_FRAME_FILTER_PM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((netdev_mc_count(dev) + reg - 1) &gt; XGMAC_MAX_FILTER_ADDR) {</div><div class='add'>+		use_hash = true;</div><div class='add'>+		value |= XGMAC_FRAME_FILTER_HMC | XGMAC_FRAME_FILTER_HPF;</div><div class='add'>+	}</div><div class='add'>+	netdev_for_each_mc_addr(ha, dev) {</div><div class='add'>+		if (use_hash) {</div><div class='add'>+			u32 bit_nr = ~ether_crc(ETH_ALEN, ha-&gt;addr) &gt;&gt; 23;</div><div class='add'>+</div><div class='add'>+			/* The most significant 4 bits determine the register to</div><div class='add'>+			 * use (H/L) while the other 5 bits determine the bit</div><div class='add'>+			 * within the register. */</div><div class='add'>+			hash_filter[bit_nr &gt;&gt; 5] |= 1 &lt;&lt; (bit_nr &amp; 31);</div><div class='add'>+		} else {</div><div class='add'>+			xgmac_set_mac_addr(ioaddr, ha-&gt;addr, reg);</div><div class='add'>+			reg++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	for (i = 0; i &lt; XGMAC_NUM_HASH; i++)</div><div class='add'>+		writel(hash_filter[i], ioaddr + XGMAC_HASH(i));</div><div class='add'>+</div><div class='add'>+	writel(value, ioaddr + XGMAC_FRAME_FILTER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  xgmac_change_mtu - entry point to change MTU size for the device.</div><div class='add'>+ *  @dev : device pointer.</div><div class='add'>+ *  @new_mtu : the new MTU size for the device.</div><div class='add'>+ *  Description: the Maximum Transfer Unit (MTU) is used by the network layer</div><div class='add'>+ *  to drive packet transmission. Ethernet has an MTU of 1500 octets</div><div class='add'>+ *  (ETH_DATA_LEN). This value can be changed with ifconfig.</div><div class='add'>+ *  Return value:</div><div class='add'>+ *  0 on success and an appropriate (-)ve integer as defined in errno.h</div><div class='add'>+ *  file on failure.</div><div class='add'>+ */</div><div class='add'>+static int xgmac_change_mtu(struct net_device *dev, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(dev);</div><div class='add'>+	int old_mtu;</div><div class='add'>+</div><div class='add'>+	if ((new_mtu &lt; 46) || (new_mtu &gt; MAX_MTU)) {</div><div class='add'>+		netdev_err(priv-&gt;dev, "invalid MTU, max MTU is: %d\n", MAX_MTU);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	old_mtu = dev-&gt;mtu;</div><div class='add'>+	dev-&gt;mtu = new_mtu;</div><div class='add'>+</div><div class='add'>+	/* return early if the buffer sizes will not change */</div><div class='add'>+	if (old_mtu &lt;= ETH_DATA_LEN &amp;&amp; new_mtu &lt;= ETH_DATA_LEN)</div><div class='add'>+		return 0;</div><div class='add'>+	if (old_mtu == new_mtu)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Stop everything, get ready to change the MTU */</div><div class='add'>+	if (!netif_running(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Bring the interface down and then back up */</div><div class='add'>+	xgmac_stop(dev);</div><div class='add'>+	return xgmac_open(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t xgmac_pmt_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	u32 intr_status;</div><div class='add'>+	struct net_device *dev = (struct net_device *)dev_id;</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(dev);</div><div class='add'>+	void __iomem *ioaddr = priv-&gt;base;</div><div class='add'>+</div><div class='add'>+	intr_status = readl(ioaddr + XGMAC_INT_STAT);</div><div class='add'>+	if (intr_status &amp; XGMAC_INT_STAT_PMT) {</div><div class='add'>+		netdev_dbg(priv-&gt;dev, "received Magic frame\n");</div><div class='add'>+		/* clear the PMT bits 5 and 6 by reading the PMT */</div><div class='add'>+		readl(ioaddr + XGMAC_PMT);</div><div class='add'>+	}</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t xgmac_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	u32 intr_status;</div><div class='add'>+	bool tx_err = false;</div><div class='add'>+	struct net_device *dev = (struct net_device *)dev_id;</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct xgmac_extra_stats *x = &amp;priv-&gt;xstats;</div><div class='add'>+</div><div class='add'>+	/* read the status register (CSR5) */</div><div class='add'>+	intr_status = readl(priv-&gt;base + XGMAC_DMA_STATUS);</div><div class='add'>+	intr_status &amp;= readl(priv-&gt;base + XGMAC_DMA_INTR_ENA);</div><div class='add'>+	writel(intr_status, priv-&gt;base + XGMAC_DMA_STATUS);</div><div class='add'>+</div><div class='add'>+	/* It displays the DMA process states (CSR5 register) */</div><div class='add'>+	/* ABNORMAL interrupts */</div><div class='add'>+	if (unlikely(intr_status &amp; DMA_STATUS_AIS)) {</div><div class='add'>+		if (intr_status &amp; DMA_STATUS_TJT) {</div><div class='add'>+			netdev_err(priv-&gt;dev, "transmit jabber\n");</div><div class='add'>+			x-&gt;tx_jabber++;</div><div class='add'>+		}</div><div class='add'>+		if (intr_status &amp; DMA_STATUS_RU)</div><div class='add'>+			x-&gt;rx_buf_unav++;</div><div class='add'>+		if (intr_status &amp; DMA_STATUS_RPS) {</div><div class='add'>+			netdev_err(priv-&gt;dev, "receive process stopped\n");</div><div class='add'>+			x-&gt;rx_process_stopped++;</div><div class='add'>+		}</div><div class='add'>+		if (intr_status &amp; DMA_STATUS_ETI) {</div><div class='add'>+			netdev_err(priv-&gt;dev, "transmit early interrupt\n");</div><div class='add'>+			x-&gt;tx_early++;</div><div class='add'>+		}</div><div class='add'>+		if (intr_status &amp; DMA_STATUS_TPS) {</div><div class='add'>+			netdev_err(priv-&gt;dev, "transmit process stopped\n");</div><div class='add'>+			x-&gt;tx_process_stopped++;</div><div class='add'>+			tx_err = true;</div><div class='add'>+		}</div><div class='add'>+		if (intr_status &amp; DMA_STATUS_FBI) {</div><div class='add'>+			netdev_err(priv-&gt;dev, "fatal bus error\n");</div><div class='add'>+			x-&gt;fatal_bus_error++;</div><div class='add'>+			tx_err = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (tx_err)</div><div class='add'>+			xgmac_tx_err(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TX/RX NORMAL interrupts */</div><div class='add'>+	if (intr_status &amp; (DMA_STATUS_RI | DMA_STATUS_TU)) {</div><div class='add'>+		writel(DMA_INTR_ABNORMAL, priv-&gt;base + XGMAC_DMA_INTR_ENA);</div><div class='add'>+		napi_schedule(&amp;priv-&gt;napi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='add'>+/* Polling receive - used by NETCONSOLE and other diagnostic tools</div><div class='add'>+ * to allow network I/O with interrupts disabled. */</div><div class='add'>+static void xgmac_poll_controller(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	disable_irq(dev-&gt;irq);</div><div class='add'>+	xgmac_interrupt(dev-&gt;irq, dev);</div><div class='add'>+	enable_irq(dev-&gt;irq);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct rtnl_link_stats64 *</div><div class='add'>+xgmac_get_stats64(struct net_device *dev,</div><div class='add'>+		       struct rtnl_link_stats64 *storage)</div><div class='add'>+{</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(dev);</div><div class='add'>+	void __iomem *base = priv-&gt;base;</div><div class='add'>+	u32 count;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;priv-&gt;stats_lock);</div><div class='add'>+	writel(XGMAC_MMC_CTRL_CNT_FRZ, base + XGMAC_MMC_CTRL);</div><div class='add'>+</div><div class='add'>+	storage-&gt;rx_bytes = readl(base + XGMAC_MMC_RXOCTET_G_LO);</div><div class='add'>+	storage-&gt;rx_bytes |= (u64)(readl(base + XGMAC_MMC_RXOCTET_G_HI)) &lt;&lt; 32;</div><div class='add'>+</div><div class='add'>+	storage-&gt;rx_packets = readl(base + XGMAC_MMC_RXFRAME_GB_LO);</div><div class='add'>+	storage-&gt;multicast = readl(base + XGMAC_MMC_RXMCFRAME_G);</div><div class='add'>+	storage-&gt;rx_crc_errors = readl(base + XGMAC_MMC_RXCRCERR);</div><div class='add'>+	storage-&gt;rx_length_errors = readl(base + XGMAC_MMC_RXLENGTHERR);</div><div class='add'>+	storage-&gt;rx_missed_errors = readl(base + XGMAC_MMC_RXOVERFLOW);</div><div class='add'>+</div><div class='add'>+	storage-&gt;tx_bytes = readl(base + XGMAC_MMC_TXOCTET_G_LO);</div><div class='add'>+	storage-&gt;tx_bytes |= (u64)(readl(base + XGMAC_MMC_TXOCTET_G_HI)) &lt;&lt; 32;</div><div class='add'>+</div><div class='add'>+	count = readl(base + XGMAC_MMC_TXFRAME_GB_LO);</div><div class='add'>+	storage-&gt;tx_errors = count - readl(base + XGMAC_MMC_TXFRAME_G_LO);</div><div class='add'>+	storage-&gt;tx_packets = count;</div><div class='add'>+	storage-&gt;tx_fifo_errors = readl(base + XGMAC_MMC_TXUNDERFLOW);</div><div class='add'>+</div><div class='add'>+	writel(0, base + XGMAC_MMC_CTRL);</div><div class='add'>+	spin_unlock_bh(&amp;priv-&gt;stats_lock);</div><div class='add'>+	return storage;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgmac_set_mac_address(struct net_device *dev, void *p)</div><div class='add'>+{</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(dev);</div><div class='add'>+	void __iomem *ioaddr = priv-&gt;base;</div><div class='add'>+	struct sockaddr *addr = p;</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+</div><div class='add'>+	xgmac_set_mac_addr(ioaddr, dev-&gt;dev_addr, 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 xgmac_set_features(struct net_device *dev, netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(dev);</div><div class='add'>+	void __iomem *ioaddr = priv-&gt;base;</div><div class='add'>+	u32 changed = dev-&gt;features ^ features;</div><div class='add'>+</div><div class='add'>+	if (!(changed &amp; NETIF_F_RXCSUM))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ctrl = readl(ioaddr + XGMAC_CONTROL);</div><div class='add'>+	if (features &amp; NETIF_F_RXCSUM)</div><div class='add'>+		ctrl |= XGMAC_CONTROL_IPC;</div><div class='add'>+	else</div><div class='add'>+		ctrl &amp;= ~XGMAC_CONTROL_IPC;</div><div class='add'>+	writel(ctrl, ioaddr + XGMAC_CONTROL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops xgmac_netdev_ops = {</div><div class='add'>+	.ndo_open = xgmac_open,</div><div class='add'>+	.ndo_start_xmit = xgmac_xmit,</div><div class='add'>+	.ndo_stop = xgmac_stop,</div><div class='add'>+	.ndo_change_mtu = xgmac_change_mtu,</div><div class='add'>+	.ndo_set_rx_mode = xgmac_set_rx_mode,</div><div class='add'>+	.ndo_tx_timeout = xgmac_tx_timeout,</div><div class='add'>+	.ndo_get_stats64 = xgmac_get_stats64,</div><div class='add'>+#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='add'>+	.ndo_poll_controller = xgmac_poll_controller,</div><div class='add'>+#endif</div><div class='add'>+	.ndo_set_mac_address = xgmac_set_mac_address,</div><div class='add'>+	.ndo_set_features = xgmac_set_features,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int xgmac_ethtool_getsettings(struct net_device *dev,</div><div class='add'>+					  struct ethtool_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	cmd-&gt;autoneg = 0;</div><div class='add'>+	cmd-&gt;duplex = DUPLEX_FULL;</div><div class='add'>+	ethtool_cmd_speed_set(cmd, 10000);</div><div class='add'>+	cmd-&gt;supported = 0;</div><div class='add'>+	cmd-&gt;advertising = 0;</div><div class='add'>+	cmd-&gt;transceiver = XCVR_INTERNAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xgmac_get_pauseparam(struct net_device *netdev,</div><div class='add'>+				      struct ethtool_pauseparam *pause)</div><div class='add'>+{</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	pause-&gt;rx_pause = priv-&gt;rx_pause;</div><div class='add'>+	pause-&gt;tx_pause = priv-&gt;tx_pause;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgmac_set_pauseparam(struct net_device *netdev,</div><div class='add'>+				     struct ethtool_pauseparam *pause)</div><div class='add'>+{</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (pause-&gt;autoneg)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return xgmac_set_flow_ctrl(priv, pause-&gt;rx_pause, pause-&gt;tx_pause);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct xgmac_stats {</div><div class='add'>+	char stat_string[ETH_GSTRING_LEN];</div><div class='add'>+	int stat_offset;</div><div class='add'>+	bool is_reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define XGMAC_STAT(m)	\</div><div class='add'>+	{ #m, offsetof(struct xgmac_priv, xstats.m), false }</div><div class='add'>+#define XGMAC_HW_STAT(m, reg_offset)	\</div><div class='add'>+	{ #m, reg_offset, true }</div><div class='add'>+</div><div class='add'>+static const struct xgmac_stats xgmac_gstrings_stats[] = {</div><div class='add'>+	XGMAC_STAT(tx_frame_flushed),</div><div class='add'>+	XGMAC_STAT(tx_payload_error),</div><div class='add'>+	XGMAC_STAT(tx_ip_header_error),</div><div class='add'>+	XGMAC_STAT(tx_local_fault),</div><div class='add'>+	XGMAC_STAT(tx_remote_fault),</div><div class='add'>+	XGMAC_STAT(tx_early),</div><div class='add'>+	XGMAC_STAT(tx_process_stopped),</div><div class='add'>+	XGMAC_STAT(tx_jabber),</div><div class='add'>+	XGMAC_STAT(rx_buf_unav),</div><div class='add'>+	XGMAC_STAT(rx_process_stopped),</div><div class='add'>+	XGMAC_STAT(rx_payload_error),</div><div class='add'>+	XGMAC_STAT(rx_ip_header_error),</div><div class='add'>+	XGMAC_STAT(rx_da_filter_fail),</div><div class='add'>+	XGMAC_STAT(rx_sa_filter_fail),</div><div class='add'>+	XGMAC_STAT(fatal_bus_error),</div><div class='add'>+	XGMAC_HW_STAT(rx_watchdog, XGMAC_MMC_RXWATCHDOG),</div><div class='add'>+	XGMAC_HW_STAT(tx_vlan, XGMAC_MMC_TXVLANFRAME),</div><div class='add'>+	XGMAC_HW_STAT(rx_vlan, XGMAC_MMC_RXVLANFRAME),</div><div class='add'>+	XGMAC_HW_STAT(tx_pause, XGMAC_MMC_TXPAUSEFRAME),</div><div class='add'>+	XGMAC_HW_STAT(rx_pause, XGMAC_MMC_RXPAUSEFRAME),</div><div class='add'>+};</div><div class='add'>+#define XGMAC_STATS_LEN ARRAY_SIZE(xgmac_gstrings_stats)</div><div class='add'>+</div><div class='add'>+static void xgmac_get_ethtool_stats(struct net_device *dev,</div><div class='add'>+					 struct ethtool_stats *dummy,</div><div class='add'>+					 u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(dev);</div><div class='add'>+	void *p = priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; XGMAC_STATS_LEN; i++) {</div><div class='add'>+		if (xgmac_gstrings_stats[i].is_reg)</div><div class='add'>+			*data++ = readl(priv-&gt;base +</div><div class='add'>+				xgmac_gstrings_stats[i].stat_offset);</div><div class='add'>+		else</div><div class='add'>+			*data++ = *(u32 *)(p +</div><div class='add'>+				xgmac_gstrings_stats[i].stat_offset);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgmac_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 XGMAC_STATS_LEN;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xgmac_get_strings(struct net_device *dev, u32 stringset,</div><div class='add'>+				   u8 *data)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u8 *p = data;</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; XGMAC_STATS_LEN; i++) {</div><div class='add'>+			memcpy(p, xgmac_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'>+		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'>+static void xgmac_get_wol(struct net_device *dev,</div><div class='add'>+			       struct ethtool_wolinfo *wol)</div><div class='add'>+{</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (device_can_wakeup(priv-&gt;device)) {</div><div class='add'>+		wol-&gt;supported = WAKE_MAGIC | WAKE_UCAST;</div><div class='add'>+		wol-&gt;wolopts = priv-&gt;wolopts;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgmac_set_wol(struct net_device *dev,</div><div class='add'>+			      struct ethtool_wolinfo *wol)</div><div class='add'>+{</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(dev);</div><div class='add'>+	u32 support = WAKE_MAGIC | WAKE_UCAST;</div><div class='add'>+</div><div class='add'>+	if (!device_can_wakeup(priv-&gt;device))</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (wol-&gt;wolopts &amp; ~support)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	priv-&gt;wolopts = wol-&gt;wolopts;</div><div class='add'>+</div><div class='add'>+	if (wol-&gt;wolopts) {</div><div class='add'>+		device_set_wakeup_enable(priv-&gt;device, 1);</div><div class='add'>+		enable_irq_wake(dev-&gt;irq);</div><div class='add'>+	} else {</div><div class='add'>+		device_set_wakeup_enable(priv-&gt;device, 0);</div><div class='add'>+		disable_irq_wake(dev-&gt;irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops xgmac_ethtool_ops = {</div><div class='add'>+	.get_settings = xgmac_ethtool_getsettings,</div><div class='add'>+	.get_link = ethtool_op_get_link,</div><div class='add'>+	.get_pauseparam = xgmac_get_pauseparam,</div><div class='add'>+	.set_pauseparam = xgmac_set_pauseparam,</div><div class='add'>+	.get_ethtool_stats = xgmac_get_ethtool_stats,</div><div class='add'>+	.get_strings = xgmac_get_strings,</div><div class='add'>+	.get_wol = xgmac_get_wol,</div><div class='add'>+	.set_wol = xgmac_set_wol,</div><div class='add'>+	.get_sset_count = xgmac_get_sset_count,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xgmac_probe</div><div class='add'>+ * @pdev: platform device pointer</div><div class='add'>+ * Description: the driver is initialized through platform_device.</div><div class='add'>+ */</div><div class='add'>+static int xgmac_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	struct net_device *ndev = NULL;</div><div class='add'>+	struct xgmac_priv *priv = NULL;</div><div class='add'>+	u32 uid;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!res)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!request_mem_region(res-&gt;start, resource_size(res), pdev-&gt;name))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	ndev = alloc_etherdev(sizeof(struct xgmac_priv));</div><div class='add'>+	if (!ndev) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_alloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='add'>+	priv = netdev_priv(ndev);</div><div class='add'>+	platform_set_drvdata(pdev, ndev);</div><div class='add'>+	ether_setup(ndev);</div><div class='add'>+	ndev-&gt;netdev_ops = &amp;xgmac_netdev_ops;</div><div class='add'>+	SET_ETHTOOL_OPS(ndev, &amp;xgmac_ethtool_ops);</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;stats_lock);</div><div class='add'>+</div><div class='add'>+	priv-&gt;device = &amp;pdev-&gt;dev;</div><div class='add'>+	priv-&gt;dev = ndev;</div><div class='add'>+	priv-&gt;rx_pause = 1;</div><div class='add'>+	priv-&gt;tx_pause = 1;</div><div class='add'>+</div><div class='add'>+	priv-&gt;base = ioremap(res-&gt;start, resource_size(res));</div><div class='add'>+	if (!priv-&gt;base) {</div><div class='add'>+		netdev_err(ndev, "ioremap failed\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_io;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uid = readl(priv-&gt;base + XGMAC_VERSION);</div><div class='add'>+	netdev_info(ndev, "h/w version is 0x%x\n", uid);</div><div class='add'>+</div><div class='add'>+	writel(0, priv-&gt;base + XGMAC_DMA_INTR_ENA);</div><div class='add'>+	ndev-&gt;irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (ndev-&gt;irq == -ENXIO) {</div><div class='add'>+		netdev_err(ndev, "No irq resource\n");</div><div class='add'>+		ret = ndev-&gt;irq;</div><div class='add'>+		goto err_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = request_irq(ndev-&gt;irq, xgmac_interrupt, 0,</div><div class='add'>+			  dev_name(&amp;pdev-&gt;dev), ndev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		netdev_err(ndev, "Could not request irq %d - ret %d)\n",</div><div class='add'>+			ndev-&gt;irq, ret);</div><div class='add'>+		goto err_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;pmt_irq = platform_get_irq(pdev, 1);</div><div class='add'>+	if (priv-&gt;pmt_irq == -ENXIO) {</div><div class='add'>+		netdev_err(ndev, "No pmt irq resource\n");</div><div class='add'>+		ret = priv-&gt;pmt_irq;</div><div class='add'>+		goto err_pmt_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = request_irq(priv-&gt;pmt_irq, xgmac_pmt_interrupt, 0,</div><div class='add'>+			  dev_name(&amp;pdev-&gt;dev), ndev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		netdev_err(ndev, "Could not request irq %d - ret %d)\n",</div><div class='add'>+			priv-&gt;pmt_irq, ret);</div><div class='add'>+		goto err_pmt_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device_set_wakeup_capable(&amp;pdev-&gt;dev, 1);</div><div class='add'>+	if (device_can_wakeup(priv-&gt;device))</div><div class='add'>+		priv-&gt;wolopts = WAKE_MAGIC;	/* Magic Frame as default */</div><div class='add'>+</div><div class='add'>+	ndev-&gt;hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA;</div><div class='add'>+	if (readl(priv-&gt;base + XGMAC_DMA_HW_FEATURE) &amp; DMA_HW_FEAT_TXCOESEL)</div><div class='add'>+		ndev-&gt;hw_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |</div><div class='add'>+				     NETIF_F_RXCSUM;</div><div class='add'>+	ndev-&gt;features |= ndev-&gt;hw_features;</div><div class='add'>+	ndev-&gt;priv_flags |= IFF_UNICAST_FLT;</div><div class='add'>+</div><div class='add'>+	/* Get the MAC address */</div><div class='add'>+	xgmac_get_mac_addr(priv-&gt;base, ndev-&gt;dev_addr, 0);</div><div class='add'>+	if (!is_valid_ether_addr(ndev-&gt;dev_addr))</div><div class='add'>+		netdev_warn(ndev, "MAC address %pM not valid",</div><div class='add'>+			 ndev-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+	netif_napi_add(ndev, &amp;priv-&gt;napi, xgmac_poll, 64);</div><div class='add'>+	ret = register_netdev(ndev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_reg;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_reg:</div><div class='add'>+	netif_napi_del(&amp;priv-&gt;napi);</div><div class='add'>+	free_irq(priv-&gt;pmt_irq, ndev);</div><div class='add'>+err_pmt_irq:</div><div class='add'>+	free_irq(ndev-&gt;irq, ndev);</div><div class='add'>+err_irq:</div><div class='add'>+	iounmap(priv-&gt;base);</div><div class='add'>+err_io:</div><div class='add'>+	free_netdev(ndev);</div><div class='add'>+err_alloc:</div><div class='add'>+	release_mem_region(res-&gt;start, resource_size(res));</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xgmac_dvr_remove</div><div class='add'>+ * @pdev: platform device pointer</div><div class='add'>+ * Description: this function resets the TX/RX processes, disables the MAC RX/TX</div><div class='add'>+ * changes the link status, releases the DMA descriptor rings,</div><div class='add'>+ * unregisters the MDIO bus and unmaps the allocated memory.</div><div class='add'>+ */</div><div class='add'>+static int xgmac_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct resource *res;</div><div class='add'>+</div><div class='add'>+	xgmac_mac_disable(priv-&gt;base);</div><div class='add'>+</div><div class='add'>+	/* Free the IRQ lines */</div><div class='add'>+	free_irq(ndev-&gt;irq, ndev);</div><div class='add'>+	free_irq(priv-&gt;pmt_irq, ndev);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+	unregister_netdev(ndev);</div><div class='add'>+	netif_napi_del(&amp;priv-&gt;napi);</div><div class='add'>+</div><div class='add'>+	iounmap(priv-&gt;base);</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	release_mem_region(res-&gt;start, resource_size(res));</div><div class='add'>+</div><div class='add'>+	free_netdev(ndev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static void xgmac_pmt(void __iomem *ioaddr, unsigned long mode)</div><div class='add'>+{</div><div class='add'>+	unsigned int pmt = 0;</div><div class='add'>+</div><div class='add'>+	if (mode &amp; WAKE_MAGIC)</div><div class='add'>+		pmt |= XGMAC_PMT_POWERDOWN | XGMAC_PMT_MAGIC_PKT;</div><div class='add'>+	if (mode &amp; WAKE_UCAST)</div><div class='add'>+		pmt |= XGMAC_PMT_POWERDOWN | XGMAC_PMT_GLBL_UNICAST;</div><div class='add'>+</div><div class='add'>+	writel(pmt, ioaddr + XGMAC_PMT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgmac_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = platform_get_drvdata(to_platform_device(dev));</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(ndev);</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	if (!ndev || !netif_running(ndev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	netif_device_detach(ndev);</div><div class='add'>+	napi_disable(&amp;priv-&gt;napi);</div><div class='add'>+	writel(0, priv-&gt;base + XGMAC_DMA_INTR_ENA);</div><div class='add'>+</div><div class='add'>+	if (device_may_wakeup(priv-&gt;device)) {</div><div class='add'>+		/* Stop TX/RX DMA Only */</div><div class='add'>+		value = readl(priv-&gt;base + XGMAC_DMA_CONTROL);</div><div class='add'>+		value &amp;= ~(DMA_CONTROL_ST | DMA_CONTROL_SR);</div><div class='add'>+		writel(value, priv-&gt;base + XGMAC_DMA_CONTROL);</div><div class='add'>+</div><div class='add'>+		xgmac_pmt(priv-&gt;base, priv-&gt;wolopts);</div><div class='add'>+	} else</div><div class='add'>+		xgmac_mac_disable(priv-&gt;base);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgmac_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = platform_get_drvdata(to_platform_device(dev));</div><div class='add'>+	struct xgmac_priv *priv = netdev_priv(ndev);</div><div class='add'>+	void __iomem *ioaddr = priv-&gt;base;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(ndev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	xgmac_pmt(ioaddr, 0);</div><div class='add'>+</div><div class='add'>+	/* Enable the MAC and DMA */</div><div class='add'>+	xgmac_mac_enable(ioaddr);</div><div class='add'>+	writel(DMA_INTR_DEFAULT_MASK, ioaddr + XGMAC_DMA_STATUS);</div><div class='add'>+	writel(DMA_INTR_DEFAULT_MASK, ioaddr + XGMAC_DMA_INTR_ENA);</div><div class='add'>+</div><div class='add'>+	netif_device_attach(ndev);</div><div class='add'>+	napi_enable(&amp;priv-&gt;napi);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(xgmac_pm_ops, xgmac_suspend, xgmac_resume);</div><div class='add'>+#define XGMAC_PM_OPS (&amp;xgmac_pm_ops)</div><div class='add'>+#else</div><div class='add'>+#define XGMAC_PM_OPS NULL</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='add'>+</div><div class='add'>+static const struct of_device_id xgmac_of_match[] = {</div><div class='add'>+	{ .compatible = "calxeda,hb-xgmac", },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, xgmac_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver xgmac_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "calxedaxgmac",</div><div class='add'>+		.of_match_table = xgmac_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe = xgmac_probe,</div><div class='add'>+	.remove = xgmac_remove,</div><div class='add'>+	.driver.pm = XGMAC_PM_OPS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(xgmac_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Calxeda, Inc.");</div><div class='add'>+MODULE_DESCRIPTION("Calxeda 10G XGMAC driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c<br/>index ca26d97171bd..1d17c92f2dda 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb/cxgb2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb/cxgb2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb/cxgb2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/chelsio/cxgb/cxgb2.c</a></div><div class='hunk'>@@ -434,10 +434,10 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = dev-&gt;ml_priv;</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;fw_version, "N/A");</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(adapter-&gt;pdev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+		sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_sset_count(struct net_device *dev, int sset)</div><div class='hunk'>@@ -849,7 +849,8 @@ static int t1_set_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 t1_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static netdev_features_t t1_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since there is no support for separate rx/tx vlan accel</div><div class='hunk'>@@ -863,9 +864,9 @@ static u32 t1_fix_features(struct net_device *dev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int t1_set_features(struct net_device *dev, u32 features)</div><div class='add'>+static int t1_set_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='del'>-	u32 changed = dev-&gt;features ^ features;</div><div class='add'>+	netdev_features_t changed = dev-&gt;features ^ features;</div><div class='ctx'> 	struct adapter *adapter = dev-&gt;ml_priv;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; NETIF_F_HW_VLAN_RX)</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/sge.c b/drivers/net/ethernet/chelsio/cxgb/sge.c<br/>index f9b602300040..47a84359d4e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb/sge.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb/sge.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb/sge.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/chelsio/cxgb/sge.c</a></div><div class='hunk'>@@ -742,7 +742,7 @@ static inline void setup_ring_params(struct adapter *adapter, u64 addr,</div><div class='ctx'> /*</div><div class='ctx'>  * Enable/disable VLAN acceleration.</div><div class='ctx'>  */</div><div class='del'>-void t1_vlan_mode(struct adapter *adapter, u32 features)</div><div class='add'>+void t1_vlan_mode(struct adapter *adapter, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct sge *sge = adapter-&gt;sge;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/sge.h b/drivers/net/ethernet/chelsio/cxgb/sge.h<br/>index e03980bcdd65..b9bf16b385f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb/sge.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb/sge.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb/sge.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/chelsio/cxgb/sge.h</a></div><div class='hunk'>@@ -79,7 +79,7 @@ irqreturn_t t1_interrupt(int irq, void *cookie);</div><div class='ctx'> int t1_poll(struct napi_struct *, int);</div><div class='ctx'> </div><div class='ctx'> netdev_tx_t t1_start_xmit(struct sk_buff *skb, struct net_device *dev);</div><div class='del'>-void t1_vlan_mode(struct adapter *adapter, u32 features);</div><div class='add'>+void t1_vlan_mode(struct adapter *adapter, netdev_features_t features);</div><div class='ctx'> void t1_sge_start(struct sge *);</div><div class='ctx'> void t1_sge_stop(struct sge *);</div><div class='ctx'> int t1_sge_intr_error_handler(struct sge *);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c<br/>index 4d15c8f99c3b..857cc254cab8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c</a></div><div class='hunk'>@@ -1576,12 +1576,11 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> 	t3_get_tp_version(adapter, &amp;tp_vers);</div><div class='ctx'> 	spin_unlock(&amp;adapter-&gt;stats_lock);</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(adapter-&gt;pdev));</div><div class='del'>-	if (!fw_vers)</div><div class='del'>-		strcpy(info-&gt;fw_version, "N/A");</div><div class='del'>-	else {</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+		sizeof(info-&gt;bus_info));</div><div class='add'>+	if (fw_vers)</div><div class='ctx'> 		snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version),</div><div class='ctx'> 			 "%s %u.%u.%u TP %u.%u.%u",</div><div class='ctx'> 			 G_FW_VERSION_TYPE(fw_vers) ? "T" : "N",</div><div class='hunk'>@@ -1591,7 +1590,6 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> 			 G_TP_VERSION_MAJOR(tp_vers),</div><div class='ctx'> 			 G_TP_VERSION_MINOR(tp_vers),</div><div class='ctx'> 			 G_TP_VERSION_MICRO(tp_vers));</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void get_strings(struct net_device *dev, u32 stringset, u8 * data)</div><div class='hunk'>@@ -2531,7 +2529,7 @@ static void t3_synchronize_rx(struct adapter *adap, const struct port_info *p)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cxgb_vlan_mode(struct net_device *dev, u32 features)</div><div class='add'>+static void cxgb_vlan_mode(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	struct adapter *adapter = pi-&gt;adapter;</div><div class='hunk'>@@ -2552,7 +2550,8 @@ static void cxgb_vlan_mode(struct net_device *dev, u32 features)</div><div class='ctx'> 	t3_synchronize_rx(adapter, pi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 cxgb_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static netdev_features_t cxgb_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since there is no support for separate rx/tx vlan accel</div><div class='hunk'>@@ -2566,9 +2565,9 @@ static u32 cxgb_fix_features(struct net_device *dev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cxgb_set_features(struct net_device *dev, u32 features)</div><div class='add'>+static int cxgb_set_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='del'>-	u32 changed = dev-&gt;features ^ features;</div><div class='add'>+	netdev_features_t changed = dev-&gt;features ^ features;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; NETIF_F_HW_VLAN_RX)</div><div class='ctx'> 		cxgb_vlan_mode(dev, features);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c<br/>index 90ff1318cc05..65e4b280619a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c</a></div><div class='hunk'>@@ -969,7 +969,7 @@ static int nb_callback(struct notifier_block *self, unsigned long event,</div><div class='ctx'> 	case (NETEVENT_REDIRECT):{</div><div class='ctx'> 		struct netevent_redirect *nr = ctx;</div><div class='ctx'> 		cxgb_redirect(nr-&gt;old, nr-&gt;new);</div><div class='del'>-		cxgb_neigh_update(dst_get_neighbour(nr-&gt;new));</div><div class='add'>+		cxgb_neigh_update(dst_get_neighbour_noref(nr-&gt;new));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1072,8 +1072,11 @@ static int is_offloading(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static void cxgb_neigh_update(struct neighbour *neigh)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = neigh-&gt;dev;</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> </div><div class='add'>+	if (!neigh)</div><div class='add'>+		return;</div><div class='add'>+	dev = neigh-&gt;dev;</div><div class='ctx'> 	if (dev &amp;&amp; (is_offloading(dev))) {</div><div class='ctx'> 		struct t3cdev *tdev = dev2t3cdev(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1107,6 +1110,7 @@ static void set_l2t_ix(struct t3cdev *tdev, u32 tid, struct l2t_entry *e)</div><div class='ctx'> static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *olddev, *newdev;</div><div class='add'>+	struct neighbour *n;</div><div class='ctx'> 	struct tid_info *ti;</div><div class='ctx'> 	struct t3cdev *tdev;</div><div class='ctx'> 	u32 tid;</div><div class='hunk'>@@ -1114,8 +1118,16 @@ static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new)</div><div class='ctx'> 	struct l2t_entry *e;</div><div class='ctx'> 	struct t3c_tid_entry *te;</div><div class='ctx'> </div><div class='del'>-	olddev = dst_get_neighbour(old)-&gt;dev;</div><div class='del'>-	newdev = dst_get_neighbour(new)-&gt;dev;</div><div class='add'>+	n = dst_get_neighbour_noref(old);</div><div class='add'>+	if (!n)</div><div class='add'>+		return;</div><div class='add'>+	olddev = n-&gt;dev;</div><div class='add'>+</div><div class='add'>+	n = dst_get_neighbour_noref(new);</div><div class='add'>+	if (!n)</div><div class='add'>+		return;</div><div class='add'>+	newdev = n-&gt;dev;</div><div class='add'>+</div><div class='ctx'> 	if (!is_offloading(olddev))</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (!is_offloading(newdev)) {</div><div class='hunk'>@@ -1132,7 +1144,7 @@ static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Add new L2T entry */</div><div class='del'>-	e = t3_l2t_get(tdev, dst_get_neighbour(new), newdev);</div><div class='add'>+	e = t3_l2t_get(tdev, new, newdev);</div><div class='ctx'> 	if (!e) {</div><div class='ctx'> 		printk(KERN_ERR "%s: couldn't allocate new l2t entry!\n",</div><div class='ctx'> 		       __func__);</div><div class='hunk'>@@ -1301,7 +1313,7 @@ int cxgb3_offload_activate(struct adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> out_free_l2t:</div><div class='ctx'> 	t3_free_l2t(L2DATA(dev));</div><div class='del'>-	rcu_assign_pointer(dev-&gt;l2opt, NULL);</div><div class='add'>+	RCU_INIT_POINTER(dev-&gt;l2opt, NULL);</div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(t);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1329,7 +1341,7 @@ void cxgb3_offload_deactivate(struct adapter *adapter)</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	d = L2DATA(tdev);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='del'>-	rcu_assign_pointer(tdev-&gt;l2opt, NULL);</div><div class='add'>+	RCU_INIT_POINTER(tdev-&gt;l2opt, NULL);</div><div class='ctx'> 	call_rcu(&amp;d-&gt;rcu_head, clean_l2_data);</div><div class='ctx'> 	if (t-&gt;nofail_skb)</div><div class='ctx'> 		kfree_skb(t-&gt;nofail_skb);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.c b/drivers/net/ethernet/chelsio/cxgb3/l2t.c<br/>index 70fec8b1140f..3fa3c8833ed7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb3/l2t.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb3/l2t.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb3/l2t.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/chelsio/cxgb3/l2t.c</a></div><div class='hunk'>@@ -298,18 +298,31 @@ static inline void reuse_entry(struct l2t_entry *e, struct neighbour *neigh)</div><div class='ctx'> 	spin_unlock(&amp;e-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct neighbour *neigh,</div><div class='add'>+struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct dst_entry *dst,</div><div class='ctx'> 			     struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2t_entry *e = NULL;</div><div class='add'>+	struct neighbour *neigh;</div><div class='add'>+	struct port_info *p;</div><div class='ctx'> 	struct l2t_data *d;</div><div class='ctx'> 	int hash;</div><div class='del'>-	u32 addr = *(u32 *) neigh-&gt;primary_key;</div><div class='del'>-	int ifidx = neigh-&gt;dev-&gt;ifindex;</div><div class='del'>-	struct port_info *p = netdev_priv(dev);</div><div class='del'>-	int smt_idx = p-&gt;port_id;</div><div class='add'>+	u32 addr;</div><div class='add'>+	int ifidx;</div><div class='add'>+	int smt_idx;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='add'>+	neigh = dst_get_neighbour_noref(dst);</div><div class='add'>+	if (!neigh)</div><div class='add'>+		goto done_rcu;</div><div class='add'>+</div><div class='add'>+	addr = *(u32 *) neigh-&gt;primary_key;</div><div class='add'>+	ifidx = neigh-&gt;dev-&gt;ifindex;</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		dev = neigh-&gt;dev;</div><div class='add'>+	p = netdev_priv(dev);</div><div class='add'>+	smt_idx = p-&gt;port_id;</div><div class='add'>+</div><div class='ctx'> 	d = L2DATA(cdev);</div><div class='ctx'> 	if (!d)</div><div class='ctx'> 		goto done_rcu;</div><div class='hunk'>@@ -323,7 +336,7 @@ struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct neighbour *neigh,</div><div class='ctx'> 			l2t_hold(d, e);</div><div class='ctx'> 			if (atomic_read(&amp;e-&gt;refcnt) == 1)</div><div class='ctx'> 				reuse_entry(e, neigh);</div><div class='del'>-			goto done;</div><div class='add'>+			goto done_unlock;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	/* Need to allocate a new entry */</div><div class='hunk'>@@ -344,7 +357,7 @@ struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct neighbour *neigh,</div><div class='ctx'> 			e-&gt;vlan = VLAN_NONE;</div><div class='ctx'> 		spin_unlock(&amp;e-&gt;lock);</div><div class='ctx'> 	}</div><div class='del'>-done:</div><div class='add'>+done_unlock:</div><div class='ctx'> 	write_unlock_bh(&amp;d-&gt;lock);</div><div class='ctx'> done_rcu:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h<br/>index c5f54796e2cb..c4e864369751 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb3/l2t.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb3/l2t.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb3/l2t.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/chelsio/cxgb3/l2t.h</a></div><div class='hunk'>@@ -109,7 +109,7 @@ static inline void set_arp_failure_handler(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> void t3_l2e_free(struct l2t_data *d, struct l2t_entry *e);</div><div class='ctx'> void t3_l2t_update(struct t3cdev *dev, struct neighbour *neigh);</div><div class='del'>-struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct neighbour *neigh,</div><div class='add'>+struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct dst_entry *dst,</div><div class='ctx'> 			     struct net_device *dev);</div><div class='ctx'> int t3_l2t_send_slow(struct t3cdev *dev, struct sk_buff *skb,</div><div class='ctx'> 		     struct l2t_entry *e);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c<br/>index 4c8f42afa3c6..e83d12c7bf20 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c</a></div><div class='hunk'>@@ -243,7 +243,7 @@ module_param_array(intr_cnt, uint, NULL, 0644);</div><div class='ctx'> MODULE_PARM_DESC(intr_cnt,</div><div class='ctx'> 		 "thresholds 1..3 for queue interrupt packet counters");</div><div class='ctx'> </div><div class='del'>-static int vf_acls;</div><div class='add'>+static bool vf_acls;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI_IOV</div><div class='ctx'> module_param(vf_acls, bool, 0644);</div><div class='hunk'>@@ -1002,13 +1002,12 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = netdev2adap(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, KBUILD_MODNAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(adapter-&gt;pdev));</div><div class='add'>+	strlcpy(info-&gt;driver, KBUILD_MODNAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+		sizeof(info-&gt;bus_info));</div><div class='ctx'> </div><div class='del'>-	if (!adapter-&gt;params.fw_vers)</div><div class='del'>-		strcpy(info-&gt;fw_version, "N/A");</div><div class='del'>-	else</div><div class='add'>+	if (adapter-&gt;params.fw_vers)</div><div class='ctx'> 		snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version),</div><div class='ctx'> 			"%u.%u.%u.%u, TP %u.%u.%u.%u",</div><div class='ctx'> 			FW_HDR_FW_VER_MAJOR_GET(adapter-&gt;params.fw_vers),</div><div class='hunk'>@@ -1855,10 +1854,10 @@ static int set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cxgb_set_features(struct net_device *dev, u32 features)</div><div class='add'>+static int cxgb_set_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	const struct port_info *pi = netdev_priv(dev);</div><div class='del'>-	u32 changed = dev-&gt;features ^ features;</div><div class='add'>+	netdev_features_t changed = dev-&gt;features ^ features;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!(changed &amp; NETIF_F_HW_VLAN_RX))</div><div class='hunk'>@@ -1872,30 +1871,30 @@ static int cxgb_set_features(struct net_device *dev, u32 features)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_rss_table(struct net_device *dev, struct ethtool_rxfh_indir *p)</div><div class='add'>+static u32 get_rss_table_size(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	const struct port_info *pi = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	return pi-&gt;rss_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_rss_table(struct net_device *dev, u32 *p)</div><div class='ctx'> {</div><div class='ctx'> 	const struct port_info *pi = netdev_priv(dev);</div><div class='del'>-	unsigned int n = min_t(unsigned int, p-&gt;size, pi-&gt;rss_size);</div><div class='add'>+	unsigned int n = pi-&gt;rss_size;</div><div class='ctx'> </div><div class='del'>-	p-&gt;size = pi-&gt;rss_size;</div><div class='ctx'> 	while (n--)</div><div class='del'>-		p-&gt;ring_index[n] = pi-&gt;rss[n];</div><div class='add'>+		p[n] = pi-&gt;rss[n];</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_rss_table(struct net_device *dev,</div><div class='del'>-			 const struct ethtool_rxfh_indir *p)</div><div class='add'>+static int set_rss_table(struct net_device *dev, const u32 *p)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;size != pi-&gt;rss_size)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	for (i = 0; i &lt; p-&gt;size; i++)</div><div class='del'>-		if (p-&gt;ring_index[i] &gt;= pi-&gt;nqsets)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	for (i = 0; i &lt; p-&gt;size; i++)</div><div class='del'>-		pi-&gt;rss[i] = p-&gt;ring_index[i];</div><div class='add'>+	for (i = 0; i &lt; pi-&gt;rss_size; i++)</div><div class='add'>+		pi-&gt;rss[i] = p[i];</div><div class='ctx'> 	if (pi-&gt;adapter-&gt;flags &amp; FULL_INIT_DONE)</div><div class='ctx'> 		return write_rss(pi, pi-&gt;rss);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1964,7 +1963,7 @@ static int get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ethtool_ops cxgb_ethtool_ops = {</div><div class='add'>+static const struct ethtool_ops cxgb_ethtool_ops = {</div><div class='ctx'> 	.get_settings      = get_settings,</div><div class='ctx'> 	.set_settings      = set_settings,</div><div class='ctx'> 	.get_drvinfo       = get_drvinfo,</div><div class='hunk'>@@ -1990,6 +1989,7 @@ static struct ethtool_ops cxgb_ethtool_ops = {</div><div class='ctx'> 	.get_wol           = get_wol,</div><div class='ctx'> 	.set_wol           = set_wol,</div><div class='ctx'> 	.get_rxnfc         = get_rxnfc,</div><div class='add'>+	.get_rxfh_indir_size = get_rss_table_size,</div><div class='ctx'> 	.get_rxfh_indir    = get_rss_table,</div><div class='ctx'> 	.set_rxfh_indir    = set_rss_table,</div><div class='ctx'> 	.flash_device      = set_flash,</div><div class='hunk'>@@ -3449,7 +3449,7 @@ static int __devinit init_rss(struct adapter *adap)</div><div class='ctx'> 		if (!pi-&gt;rss)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		for (j = 0; j &lt; pi-&gt;rss_size; j++)</div><div class='del'>-			pi-&gt;rss[j] = j % pi-&gt;nqsets;</div><div class='add'>+			pi-&gt;rss[j] = ethtool_rxfh_indir_default(j, pi-&gt;nqsets);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3537,7 +3537,7 @@ static int __devinit init_one(struct pci_dev *pdev,</div><div class='ctx'> {</div><div class='ctx'> 	int func, i, err;</div><div class='ctx'> 	struct port_info *pi;</div><div class='del'>-	unsigned int highdma = 0;</div><div class='add'>+	bool highdma = false;</div><div class='ctx'> 	struct adapter *adapter = NULL;</div><div class='ctx'> </div><div class='ctx'> 	printk_once(KERN_INFO "%s - version %s\n", DRV_DESC, DRV_VERSION);</div><div class='hunk'>@@ -3563,7 +3563,7 @@ static int __devinit init_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {</div><div class='del'>-		highdma = NETIF_F_HIGHDMA;</div><div class='add'>+		highdma = true;</div><div class='ctx'> 		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "unable to obtain 64-bit DMA for "</div><div class='hunk'>@@ -3637,7 +3637,9 @@ static int __devinit init_one(struct pci_dev *pdev,</div><div class='ctx'> 			NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |</div><div class='ctx'> 			NETIF_F_RXCSUM | NETIF_F_RXHASH |</div><div class='ctx'> 			NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;</div><div class='del'>-		netdev-&gt;features |= netdev-&gt;hw_features | highdma;</div><div class='add'>+		if (highdma)</div><div class='add'>+			netdev-&gt;hw_features |= NETIF_F_HIGHDMA;</div><div class='add'>+		netdev-&gt;features |= netdev-&gt;hw_features;</div><div class='ctx'> 		netdev-&gt;vlan_features = netdev-&gt;features &amp; VLAN_FEAT;</div><div class='ctx'> </div><div class='ctx'> 		netdev-&gt;priv_flags |= IFF_UNICAST_FLT;</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c<br/>index 140254c7cba9..2dae7959f000 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/sge.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb4/sge.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb4/sge.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/chelsio/cxgb4/sge.c</a></div><div class='hunk'>@@ -491,7 +491,7 @@ static unsigned int refill_fl(struct adapter *adap, struct sge_fl *q, int n,</div><div class='ctx'> 	__be64 *d = &amp;q-&gt;desc[q-&gt;pidx];</div><div class='ctx'> 	struct rx_sw_desc *sd = &amp;q-&gt;sdesc[q-&gt;pidx];</div><div class='ctx'> </div><div class='del'>-	gfp |= __GFP_NOWARN;         /* failures are expected */</div><div class='add'>+	gfp |= __GFP_NOWARN | __GFP_COLD;</div><div class='ctx'> </div><div class='ctx'> #if FL_PG_ORDER &gt; 0</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -528,7 +528,7 @@ static unsigned int refill_fl(struct adapter *adap, struct sge_fl *q, int n,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	while (n--) {</div><div class='del'>-		pg = __netdev_alloc_page(adap-&gt;port[0], gfp);</div><div class='add'>+		pg = alloc_page(gfp);</div><div class='ctx'> 		if (unlikely(!pg)) {</div><div class='ctx'> 			q-&gt;alloc_failed++;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -537,7 +537,7 @@ static unsigned int refill_fl(struct adapter *adap, struct sge_fl *q, int n,</div><div class='ctx'> 		mapping = dma_map_page(adap-&gt;pdev_dev, pg, 0, PAGE_SIZE,</div><div class='ctx'> 				       PCI_DMA_FROMDEVICE);</div><div class='ctx'> 		if (unlikely(dma_mapping_error(adap-&gt;pdev_dev, mapping))) {</div><div class='del'>-			netdev_free_page(adap-&gt;port[0], pg);</div><div class='add'>+			put_page(pg);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		*d++ = cpu_to_be64(mapping);</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 da9072bfca8b..e53365a71484 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c</a></div><div class='hunk'>@@ -1092,7 +1092,8 @@ static int cxgb4vf_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 cxgb4vf_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static netdev_features_t cxgb4vf_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since there is no support for separate rx/tx vlan accel</div><div class='hunk'>@@ -1106,10 +1107,11 @@ static u32 cxgb4vf_fix_features(struct net_device *dev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cxgb4vf_set_features(struct net_device *dev, u32 features)</div><div class='add'>+static int cxgb4vf_set_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='del'>-	u32 changed = dev-&gt;features ^ features;</div><div class='add'>+	netdev_features_t changed = dev-&gt;features ^ features;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; NETIF_F_HW_VLAN_RX)</div><div class='ctx'> 		t4vf_set_rxmode(pi-&gt;adapter, pi-&gt;viid, -1, -1, -1, -1,</div><div class='hunk'>@@ -1203,9 +1205,10 @@ static void cxgb4vf_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = netdev2adap(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy(drvinfo-&gt;driver, KBUILD_MODNAME);</div><div class='del'>-	strcpy(drvinfo-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(drvinfo-&gt;bus_info, pci_name(to_pci_dev(dev-&gt;dev.parent)));</div><div class='add'>+	strlcpy(drvinfo-&gt;driver, KBUILD_MODNAME, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, DRV_VERSION, sizeof(drvinfo-&gt;version));</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(to_pci_dev(dev-&gt;dev.parent)),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	snprintf(drvinfo-&gt;fw_version, sizeof(drvinfo-&gt;fw_version),</div><div class='ctx'> 		 "%u.%u.%u.%u, TP %u.%u.%u.%u",</div><div class='ctx'> 		 FW_HDR_FW_VER_MAJOR_GET(adapter-&gt;params.dev.fwrev),</div><div class='hunk'>@@ -1561,7 +1564,7 @@ static void cxgb4vf_get_wol(struct net_device *dev,</div><div class='ctx'>  */</div><div class='ctx'> #define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN)</div><div class='ctx'> </div><div class='del'>-static struct ethtool_ops cxgb4vf_ethtool_ops = {</div><div class='add'>+static const struct ethtool_ops cxgb4vf_ethtool_ops = {</div><div class='ctx'> 	.get_settings		= cxgb4vf_get_settings,</div><div class='ctx'> 	.get_drvinfo		= cxgb4vf_get_drvinfo,</div><div class='ctx'> 	.get_msglevel		= cxgb4vf_get_msglevel,</div><div class='hunk'>@@ -2000,7 +2003,7 @@ static const struct file_operations interfaces_proc_fops = {</div><div class='ctx'>  */</div><div class='ctx'> struct cxgb4vf_debugfs_entry {</div><div class='ctx'> 	const char *name;		/* name of debugfs node */</div><div class='del'>-	mode_t mode;			/* file system mode */</div><div class='add'>+	umode_t mode;			/* file system mode */</div><div class='ctx'> 	const struct file_operations *fops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c<br/>index 8d5d55ad102d..0bd585bba39d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb4vf/sge.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/chelsio/cxgb4vf/sge.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/chelsio/cxgb4vf/sge.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/chelsio/cxgb4vf/sge.c</a></div><div class='hunk'>@@ -653,8 +653,7 @@ static unsigned int refill_fl(struct adapter *adapter, struct sge_fl *fl,</div><div class='ctx'> </div><div class='ctx'> alloc_small_pages:</div><div class='ctx'> 	while (n--) {</div><div class='del'>-		page = __netdev_alloc_page(adapter-&gt;port[0],</div><div class='del'>-					   gfp | __GFP_NOWARN);</div><div class='add'>+		page = alloc_page(gfp | __GFP_NOWARN | __GFP_COLD);</div><div class='ctx'> 		if (unlikely(!page)) {</div><div class='ctx'> 			fl-&gt;alloc_failed++;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -664,7 +663,7 @@ alloc_small_pages:</div><div class='ctx'> 		dma_addr = dma_map_page(adapter-&gt;pdev_dev, page, 0, PAGE_SIZE,</div><div class='ctx'> 				       PCI_DMA_FROMDEVICE);</div><div class='ctx'> 		if (unlikely(dma_mapping_error(adapter-&gt;pdev_dev, dma_addr))) {</div><div class='del'>-			netdev_free_page(adapter-&gt;port[0], page);</div><div class='add'>+			put_page(page);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		*d++ = cpu_to_be64(dma_addr);</div><div class='hunk'>@@ -684,7 +683,7 @@ out:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Update our accounting state to incorporate the new Free List</div><div class='ctx'> 	 * buffers, tell the hardware about them and return the number of</div><div class='del'>-	 * bufers which we were able to allocate.</div><div class='add'>+	 * buffers which we were able to allocate.</div><div class='ctx'> 	 */</div><div class='ctx'> 	cred = fl-&gt;avail - cred;</div><div class='ctx'> 	fl-&gt;pend_cred += cred;</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic_dev.c b/drivers/net/ethernet/cisco/enic/enic_dev.c<br/>index fd6247b3c0ee..bf0fc56dba19 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/cisco/enic/enic_dev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/cisco/enic/enic_dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/cisco/enic/enic_dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/cisco/enic/enic_dev.c</a></div><div class='hunk'>@@ -212,23 +212,29 @@ int enic_dev_deinit_done(struct enic *enic, int *status)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* rtnl lock is held */</div><div class='del'>-void enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='add'>+int enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;enic-&gt;devcmd_lock);</div><div class='del'>-	enic_add_vlan(enic, vid);</div><div class='add'>+	err = enic_add_vlan(enic, vid);</div><div class='ctx'> 	spin_unlock(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* rtnl lock is held */</div><div class='del'>-void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='add'>+int enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;enic-&gt;devcmd_lock);</div><div class='del'>-	enic_del_vlan(enic, vid);</div><div class='add'>+	err = enic_del_vlan(enic, vid);</div><div class='ctx'> 	spin_unlock(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int enic_dev_enable2(struct enic *enic, int active)</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic_dev.h b/drivers/net/ethernet/cisco/enic/enic_dev.h<br/>index 1f83a4747ba0..da1cba3c410e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/cisco/enic/enic_dev.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/cisco/enic/enic_dev.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/cisco/enic/enic_dev.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/cisco/enic/enic_dev.h</a></div><div class='hunk'>@@ -46,8 +46,8 @@ int enic_dev_packet_filter(struct enic *enic, int directed, int multicast,</div><div class='ctx'> 	int broadcast, int promisc, int allmulti);</div><div class='ctx'> int enic_dev_add_addr(struct enic *enic, u8 *addr);</div><div class='ctx'> int enic_dev_del_addr(struct enic *enic, u8 *addr);</div><div class='del'>-void enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid);</div><div class='del'>-void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);</div><div class='add'>+int enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid);</div><div class='add'>+int enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);</div><div class='ctx'> int enic_dev_notify_unset(struct enic *enic);</div><div class='ctx'> int enic_dev_hang_notify(struct enic *enic);</div><div class='ctx'> int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic);</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 c3786fda11db..2fd9db4b1be5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/cisco/enic/enic_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/cisco/enic/enic_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/cisco/enic/enic_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/cisco/enic/enic_main.c</a></div><div class='hunk'>@@ -217,11 +217,11 @@ static void enic_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> </div><div class='ctx'> 	enic_dev_fw_info(enic, &amp;fw_info);</div><div class='ctx'> </div><div class='del'>-	strncpy(drvinfo-&gt;driver, DRV_NAME, sizeof(drvinfo-&gt;driver));</div><div class='del'>-	strncpy(drvinfo-&gt;version, DRV_VERSION, sizeof(drvinfo-&gt;version));</div><div class='del'>-	strncpy(drvinfo-&gt;fw_version, fw_info-&gt;fw_version,</div><div class='add'>+	strlcpy(drvinfo-&gt;driver, DRV_NAME, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, DRV_VERSION, sizeof(drvinfo-&gt;version));</div><div class='add'>+	strlcpy(drvinfo-&gt;fw_version, fw_info-&gt;fw_version,</div><div class='ctx'> 		sizeof(drvinfo-&gt;fw_version));</div><div class='del'>-	strncpy(drvinfo-&gt;bus_info, pci_name(enic-&gt;pdev),</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(enic-&gt;pdev),</div><div class='ctx'> 		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2379,7 +2379,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> 	/* Allocate structure for port profiles */</div><div class='del'>-	enic-&gt;pp = kzalloc(num_pps * sizeof(*enic-&gt;pp), GFP_KERNEL);</div><div class='add'>+	enic-&gt;pp = kcalloc(num_pps, sizeof(*enic-&gt;pp), GFP_KERNEL);</div><div class='ctx'> 	if (!enic-&gt;pp) {</div><div class='ctx'> 		pr_err("port profile alloc failed, aborting\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='head'>diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c<br/>index 2a22f5256353..f801754c71a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/davicom/dm9000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/davicom/dm9000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/davicom/dm9000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/davicom/dm9000.c</a></div><div class='hunk'>@@ -474,10 +474,11 @@ static int dm9000_nway_reset(struct net_device *dev)</div><div class='ctx'> 	return mii_nway_restart(&amp;dm-&gt;mii);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dm9000_set_features(struct net_device *dev, u32 features)</div><div class='add'>+static int dm9000_set_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	board_info_t *dm = to_dm9000_board(dev);</div><div class='del'>-	u32 changed = dev-&gt;features ^ features;</div><div class='add'>+	netdev_features_t changed = dev-&gt;features ^ features;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!(changed &amp; NETIF_F_RXCSUM))</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c<br/>index 1427739d9a51..1eb46a0bb488 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/dec/tulip/de2104x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/dec/tulip/de2104x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/dec/tulip/de2104x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/dec/tulip/de2104x.c</a></div><div class='hunk'>@@ -1598,9 +1598,9 @@ static void de_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct de_private *de = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy (info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy (info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy (info-&gt;bus_info, pci_name(de-&gt;pdev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(de-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> 	info-&gt;eedump_len = DE_EEPROM_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c<br/>index 871bcaa7068d..4d71f5ae20c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/dec/tulip/de4x5.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/dec/tulip/de4x5.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/dec/tulip/de4x5.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/dec/tulip/de4x5.c</a></div><div class='hunk'>@@ -2127,14 +2127,9 @@ srom_search(struct net_device *dev, struct pci_dev *pdev)</div><div class='ctx'>     u_long iobase = 0;                     /* Clear upper 32 bits in Alphas */</div><div class='ctx'>     int i, j;</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    struct list_head *walk;</div><div class='del'>-</div><div class='del'>-    list_for_each(walk, &amp;pdev-&gt;bus_list) {</div><div class='del'>-	struct pci_dev *this_dev = pci_dev_b(walk);</div><div class='del'>-</div><div class='del'>-	/* Skip the pci_bus list entry */</div><div class='del'>-	if (list_entry(walk, struct pci_bus, devices) == pdev-&gt;bus) continue;</div><div class='add'>+    struct pci_dev *this_dev;</div><div class='ctx'> </div><div class='add'>+    list_for_each_entry(this_dev, &amp;pdev-&gt;bus-&gt;devices, bus_list) {</div><div class='ctx'> 	vendor = this_dev-&gt;vendor;</div><div class='ctx'> 	device = this_dev-&gt;device &lt;&lt; 8;</div><div class='ctx'> 	if (!(is_DC21040 || is_DC21041 || is_DC21140 || is_DC2114x)) continue;</div><div class='hunk'>@@ -5196,7 +5191,7 @@ de4x5_parse_params(struct net_device *dev)</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'>     char *p, *q, t;</div><div class='ctx'> </div><div class='del'>-    lp-&gt;params.fdx = 0;</div><div class='add'>+    lp-&gt;params.fdx = false;</div><div class='ctx'>     lp-&gt;params.autosense = AUTO;</div><div class='ctx'> </div><div class='ctx'>     if (args == NULL) return;</div><div class='hunk'>@@ -5206,7 +5201,7 @@ de4x5_parse_params(struct net_device *dev)</div><div class='ctx'> 	t = *q;</div><div class='ctx'> 	*q = '\0';</div><div class='ctx'> </div><div class='del'>-	if (strstr(p, "fdx") || strstr(p, "FDX")) lp-&gt;params.fdx = 1;</div><div class='add'>+	if (strstr(p, "fdx") || strstr(p, "FDX")) lp-&gt;params.fdx = true;</div><div class='ctx'> </div><div class='ctx'> 	if (strstr(p, "autosense") || strstr(p, "AUTOSENSE")) {</div><div class='ctx'> 	    if (strstr(p, "TP")) {</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c<br/>index 17b11ee1745a..51f7542eb451 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/dec/tulip/dmfe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/dec/tulip/dmfe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/dec/tulip/dmfe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/dec/tulip/dmfe.c</a></div><div class='hunk'>@@ -1085,10 +1085,11 @@ static void dmfe_ethtool_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct dmfe_board_info *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='ctx'> 	if (np-&gt;pdev)</div><div class='del'>-		strcpy(info-&gt;bus_info, pci_name(np-&gt;pdev));</div><div class='add'>+		strlcpy(info-&gt;bus_info, pci_name(np-&gt;pdev),</div><div class='add'>+			sizeof(info-&gt;bus_info));</div><div class='ctx'> 	else</div><div class='ctx'> 		sprintf(info-&gt;bus_info, "EISA 0x%lx %d",</div><div class='ctx'> 			dev-&gt;base_addr, dev-&gt;irq);</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c<br/>index 9656dd0647d9..4eb0d76145c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/dec/tulip/tulip_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/dec/tulip/tulip_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/dec/tulip/tulip_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/dec/tulip/tulip_core.c</a></div><div class='hunk'>@@ -871,9 +871,9 @@ static struct net_device_stats *tulip_get_stats(struct net_device *dev)</div><div class='ctx'> static void tulip_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct tulip_private *np = netdev_priv(dev);</div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(np-&gt;pdev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(np-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c<br/>index 7a44a7a6adc8..48b0b6566eef 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/dec/tulip/uli526x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/dec/tulip/uli526x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/dec/tulip/uli526x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/dec/tulip/uli526x.c</a></div><div class='hunk'>@@ -960,10 +960,11 @@ static void netdev_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct uli526x_board_info *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='ctx'> 	if (np-&gt;pdev)</div><div class='del'>-		strcpy(info-&gt;bus_info, pci_name(np-&gt;pdev));</div><div class='add'>+		strlcpy(info-&gt;bus_info, pci_name(np-&gt;pdev),</div><div class='add'>+			sizeof(info-&gt;bus_info));</div><div class='ctx'> 	else</div><div class='ctx'> 		sprintf(info-&gt;bus_info, "EISA 0x%lx %d",</div><div class='ctx'> 			dev-&gt;base_addr, dev-&gt;irq);</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c<br/>index 4d01219ba22f..52da7b2fe3b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/dec/tulip/winbond-840.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/dec/tulip/winbond-840.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/dec/tulip/winbond-840.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/dec/tulip/winbond-840.c</a></div><div class='hunk'>@@ -1390,9 +1390,9 @@ static void netdev_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy (info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy (info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy (info-&gt;bus_info, pci_name(np-&gt;pci_dev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='head'>diff --git a/drivers/net/ethernet/dlink/de600.c b/drivers/net/ethernet/dlink/de600.c<br/>index 23a65398d011..c24fab1e9cbe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/dlink/de600.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/dlink/de600.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/dlink/de600.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/dlink/de600.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@ static const char version[] = "de600.c: $Revision: 1.41-2.5 $,  Bjorn Ekwall (bj</div><div class='ctx'> </div><div class='ctx'> #include "de600.h"</div><div class='ctx'> </div><div class='del'>-static unsigned int check_lost = 1;</div><div class='add'>+static bool check_lost = true;</div><div class='ctx'> module_param(check_lost, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(check_lost, "If set then check for unplugged de600");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c<br/>index dcd7f7a71ad4..28a3a9b50b8b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/dlink/sundance.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/dlink/sundance.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/dlink/sundance.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/dlink/sundance.c</a></div><div class='hunk'>@@ -1634,9 +1634,9 @@ static int check_if_running(struct net_device *dev)</div><div class='ctx'> static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)</div><div class='head'>diff --git a/drivers/net/ethernet/dnet.c b/drivers/net/ethernet/dnet.c<br/>index c1063d1540c2..925c9bafc9b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/dnet.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/dnet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/dnet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/dnet.c</a></div><div class='hunk'>@@ -325,7 +325,8 @@ static int dnet_mii_init(struct dnet *bp)</div><div class='ctx'> 	bp-&gt;mii_bus-&gt;write = &amp;dnet_mdio_write;</div><div class='ctx'> 	bp-&gt;mii_bus-&gt;reset = &amp;dnet_mdio_reset;</div><div class='ctx'> </div><div class='del'>-	snprintf(bp-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%x", 0);</div><div class='add'>+	snprintf(bp-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%s-%x",</div><div class='add'>+		bp-&gt;pdev-&gt;name, bp-&gt;pdev-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;mii_bus-&gt;priv = bp;</div><div class='ctx'> </div><div class='hunk'>@@ -804,9 +805,9 @@ static int dnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> static void dnet_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 			     struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, "0");</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, "0", sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops dnet_ethtool_ops = {</div><div class='hunk'>@@ -977,18 +978,7 @@ static struct platform_driver dnet_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init dnet_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;dnet_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit dnet_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;dnet_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(dnet_init);</div><div class='del'>-module_exit(dnet_exit);</div><div class='add'>+module_platform_driver(dnet_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("Dave DNET Ethernet driver");</div><div class='head'>diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h<br/>index 644e8fed8364..cbdec2536da6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/emulex/benet/be.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/emulex/benet/be.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/emulex/benet/be.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/emulex/benet/be.h</a></div><div class='hunk'>@@ -40,6 +40,7 @@</div><div class='ctx'> #define OC_NAME			"Emulex OneConnect 10Gbps NIC"</div><div class='ctx'> #define OC_NAME_BE		OC_NAME	"(be3)"</div><div class='ctx'> #define OC_NAME_LANCER		OC_NAME "(Lancer)"</div><div class='add'>+#define OC_NAME_SH		OC_NAME "(Skyhawk)"</div><div class='ctx'> #define DRV_DESC		"ServerEngines BladeEngine 10Gbps NIC Driver"</div><div class='ctx'> </div><div class='ctx'> #define BE_VENDOR_ID 		0x19a2</div><div class='hunk'>@@ -50,6 +51,7 @@</div><div class='ctx'> #define OC_DEVICE_ID2		0x710	/* Device Id for BE3 cards */</div><div class='ctx'> #define OC_DEVICE_ID3		0xe220	/* Device id for Lancer cards */</div><div class='ctx'> #define OC_DEVICE_ID4           0xe228   /* Device id for VF in Lancer */</div><div class='add'>+#define OC_DEVICE_ID5		0x720	/* Device Id for Skyhawk cards */</div><div class='ctx'> </div><div class='ctx'> static inline char *nic_name(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -63,6 +65,8 @@ static inline char *nic_name(struct pci_dev *pdev)</div><div class='ctx'> 		return OC_NAME_LANCER;</div><div class='ctx'> 	case BE_DEVICE_ID2:</div><div class='ctx'> 		return BE3_NAME;</div><div class='add'>+	case OC_DEVICE_ID5:</div><div class='add'>+		return OC_NAME_SH;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return BE_NAME;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -288,14 +292,14 @@ struct be_drv_stats {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct be_vf_cfg {</div><div class='del'>-	unsigned char vf_mac_addr[ETH_ALEN];</div><div class='del'>-	u32 vf_if_handle;</div><div class='del'>-	u32 vf_pmac_id;</div><div class='del'>-	u16 vf_vlan_tag;</div><div class='del'>-	u32 vf_tx_rate;</div><div class='add'>+	unsigned char mac_addr[ETH_ALEN];</div><div class='add'>+	int if_handle;</div><div class='add'>+	int pmac_id;</div><div class='add'>+	u16 vlan_tag;</div><div class='add'>+	u32 tx_rate;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define BE_INVALID_PMAC_ID		0xffffffff</div><div class='add'>+#define BE_FLAGS_LINK_STATUS_INIT		1</div><div class='ctx'> </div><div class='ctx'> struct be_adapter {</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='hunk'>@@ -345,13 +349,16 @@ struct be_adapter {</div><div class='ctx'> 	struct delayed_work work;</div><div class='ctx'> 	u16 work_counter;</div><div class='ctx'> </div><div class='add'>+	u32 flags;</div><div class='ctx'> 	/* Ethtool knobs and info */</div><div class='ctx'> 	char fw_ver[FW_VER_LEN];</div><div class='del'>-	u32 if_handle;		/* Used to configure filtering */</div><div class='add'>+	int if_handle;		/* Used to configure filtering */</div><div class='ctx'> 	u32 pmac_id;		/* MAC addr handle used by BE card */</div><div class='ctx'> 	u32 beacon_state;	/* for set_phys_id */</div><div class='ctx'> </div><div class='ctx'> 	bool eeh_err;</div><div class='add'>+	bool ue_detected;</div><div class='add'>+	bool fw_timeout;</div><div class='ctx'> 	u32 port_num;</div><div class='ctx'> 	bool promiscuous;</div><div class='ctx'> 	bool wol;</div><div class='hunk'>@@ -359,7 +366,6 @@ struct be_adapter {</div><div class='ctx'> 	u32 function_caps;</div><div class='ctx'> 	u32 rx_fc;		/* Rx flow control */</div><div class='ctx'> 	u32 tx_fc;		/* Tx flow control */</div><div class='del'>-	bool ue_detected;</div><div class='ctx'> 	bool stats_cmd_sent;</div><div class='ctx'> 	int link_speed;</div><div class='ctx'> 	u8 port_type;</div><div class='hunk'>@@ -369,16 +375,20 @@ struct be_adapter {</div><div class='ctx'> 	u32 flash_status;</div><div class='ctx'> 	struct completion flash_compl;</div><div class='ctx'> </div><div class='del'>-	bool be3_native;</div><div class='del'>-	bool sriov_enabled;</div><div class='del'>-	struct be_vf_cfg *vf_cfg;</div><div class='add'>+	u32 num_vfs;</div><div class='ctx'> 	u8 is_virtfn;</div><div class='add'>+	struct be_vf_cfg *vf_cfg;</div><div class='add'>+	bool be3_native;</div><div class='ctx'> 	u32 sli_family;</div><div class='ctx'> 	u8 hba_port_num;</div><div class='ctx'> 	u16 pvid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define be_physfn(adapter) (!adapter-&gt;is_virtfn)</div><div class='add'>+#define	sriov_enabled(adapter)		(adapter-&gt;num_vfs &gt; 0)</div><div class='add'>+#define for_all_vfs(adapter, vf_cfg, i)					\</div><div class='add'>+	for (i = 0, vf_cfg = &amp;adapter-&gt;vf_cfg[i]; i &lt; adapter-&gt;num_vfs;	\</div><div class='add'>+		i++, vf_cfg++)</div><div class='ctx'> </div><div class='ctx'> /* BladeEngine Generation numbers */</div><div class='ctx'> #define BE_GEN2 2</div><div class='hunk'>@@ -524,9 +534,14 @@ static inline bool be_multi_rxq(const struct be_adapter *adapter)</div><div class='ctx'> 	return adapter-&gt;num_rx_qs &gt; 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool be_error(struct be_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	return adapter-&gt;eeh_err || adapter-&gt;ue_detected || adapter-&gt;fw_timeout;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern void be_cq_notify(struct be_adapter *adapter, u16 qid, bool arm,</div><div class='ctx'> 		u16 num_popped);</div><div class='del'>-extern void be_link_status_update(struct be_adapter *adapter, u32 link_status);</div><div class='add'>+extern void be_link_status_update(struct be_adapter *adapter, u8 link_status);</div><div class='ctx'> extern void be_parse_stats(struct be_adapter *adapter);</div><div class='ctx'> extern int be_load_fw(struct be_adapter *adapter, u8 *func);</div><div class='ctx'> #endif				/* BE_H */</div><div class='head'>diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c<br/>index 2c7b36673dfc..0fcb45624796 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/emulex/benet/be_cmds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/emulex/benet/be_cmds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/emulex/benet/be_cmds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/emulex/benet/be_cmds.c</a></div><div class='hunk'>@@ -31,11 +31,8 @@ static void be_mcc_notify(struct be_adapter *adapter)</div><div class='ctx'> 	struct be_queue_info *mccq = &amp;adapter-&gt;mcc_obj.q;</div><div class='ctx'> 	u32 val = 0;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;eeh_err) {</div><div class='del'>-		dev_info(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='del'>-			"Error in Card Detected! Cannot issue commands\n");</div><div class='add'>+	if (be_error(adapter))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	val |= mccq-&gt;id &amp; DB_MCCQ_RING_ID_MASK;</div><div class='ctx'> 	val |= 1 &lt;&lt; DB_MCCQ_NUM_POSTED_SHIFT;</div><div class='hunk'>@@ -128,7 +125,14 @@ done:</div><div class='ctx'> static void be_async_link_state_process(struct be_adapter *adapter,</div><div class='ctx'> 		struct be_async_event_link_state *evt)</div><div class='ctx'> {</div><div class='del'>-	be_link_status_update(adapter, evt-&gt;port_link_status);</div><div class='add'>+	/* When link status changes, link speed must be re-queried from FW */</div><div class='add'>+	adapter-&gt;link_speed = -1;</div><div class='add'>+</div><div class='add'>+	/* For the initial link status do not rely on the ASYNC event as</div><div class='add'>+	 * it may not be received in some cases.</div><div class='add'>+	 */</div><div class='add'>+	if (adapter-&gt;flags &amp; BE_FLAGS_LINK_STATUS_INIT)</div><div class='add'>+		be_link_status_update(adapter, evt-&gt;port_link_status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Grp5 CoS Priority evt */</div><div class='hunk'>@@ -266,10 +270,10 @@ static int be_mcc_wait_compl(struct be_adapter *adapter)</div><div class='ctx'> 	int i, num, status = 0;</div><div class='ctx'> 	struct be_mcc_obj *mcc_obj = &amp;adapter-&gt;mcc_obj;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;eeh_err)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; mcc_timeout; i++) {</div><div class='add'>+		if (be_error(adapter))</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='ctx'> 		num = be_process_mcc(adapter, &amp;status);</div><div class='ctx'> 		if (num)</div><div class='ctx'> 			be_cq_notify(adapter, mcc_obj-&gt;cq.id,</div><div class='hunk'>@@ -280,7 +284,8 @@ static int be_mcc_wait_compl(struct be_adapter *adapter)</div><div class='ctx'> 		udelay(100);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (i == mcc_timeout) {</div><div class='del'>-		dev_err(&amp;adapter-&gt;pdev-&gt;dev, "mccq poll timed out\n");</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev, "FW not responding\n");</div><div class='add'>+		adapter-&gt;fw_timeout = true;</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -298,26 +303,21 @@ static int be_mbox_db_ready_wait(struct be_adapter *adapter, void __iomem *db)</div><div class='ctx'> 	int msecs = 0;</div><div class='ctx'> 	u32 ready;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;eeh_err) {</div><div class='del'>-		dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='del'>-			"Error detected in card.Cannot issue commands\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	do {</div><div class='add'>+		if (be_error(adapter))</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='ctx'> 		ready = ioread32(db);</div><div class='del'>-		if (ready == 0xffffffff) {</div><div class='del'>-			dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='del'>-				"pci slot disconnected\n");</div><div class='add'>+		if (ready == 0xffffffff)</div><div class='ctx'> 			return -1;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		ready &amp;= MPU_MAILBOX_DB_RDY_MASK;</div><div class='ctx'> 		if (ready)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (msecs &gt; 4000) {</div><div class='del'>-			dev_err(&amp;adapter-&gt;pdev-&gt;dev, "mbox poll timed out\n");</div><div class='add'>+			dev_err(&amp;adapter-&gt;pdev-&gt;dev, "FW not responding\n");</div><div class='add'>+			adapter-&gt;fw_timeout = true;</div><div class='ctx'> 			be_detect_dump_ue(adapter);</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -555,9 +555,6 @@ int be_cmd_fw_clean(struct be_adapter *adapter)</div><div class='ctx'> 	u8 *wrb;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;eeh_err)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='ctx'> 	if (mutex_lock_interruptible(&amp;adapter-&gt;mbox_lock))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='hunk'>@@ -619,7 +616,7 @@ int be_cmd_eq_create(struct be_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> /* Use MCC */</div><div class='ctx'> int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,</div><div class='del'>-			u8 type, bool permanent, u32 if_handle)</div><div class='add'>+			u8 type, bool permanent, u32 if_handle, u32 pmac_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_mcc_wrb *wrb;</div><div class='ctx'> 	struct be_cmd_req_mac_query *req;</div><div class='hunk'>@@ -641,6 +638,7 @@ int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,</div><div class='ctx'> 		req-&gt;permanent = 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		req-&gt;if_id = cpu_to_le16((u16) if_handle);</div><div class='add'>+		req-&gt;pmac_id = cpu_to_le32(pmac_id);</div><div class='ctx'> 		req-&gt;permanent = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -695,12 +693,15 @@ err:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Uses synchronous MCCQ */</div><div class='del'>-int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, u32 pmac_id, u32 dom)</div><div class='add'>+int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, int pmac_id, u32 dom)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_mcc_wrb *wrb;</div><div class='ctx'> 	struct be_cmd_req_pmac_del *req;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='add'>+	if (pmac_id == -1)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='hunk'>@@ -923,10 +924,14 @@ int be_cmd_txq_create(struct be_adapter *adapter,</div><div class='ctx'> 	void *ctxt;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	if (mutex_lock_interruptible(&amp;adapter-&gt;mbox_lock))</div><div class='del'>-		return -1;</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+</div><div class='add'>+	wrb = wrb_from_mccq(adapter);</div><div class='add'>+	if (!wrb) {</div><div class='add'>+		status = -EBUSY;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	wrb = wrb_from_mbox(adapter);</div><div class='ctx'> 	req = embedded_payload(wrb);</div><div class='ctx'> 	ctxt = &amp;req-&gt;context;</div><div class='ctx'> </div><div class='hunk'>@@ -952,14 +957,15 @@ int be_cmd_txq_create(struct be_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	be_cmd_page_addrs_prepare(req-&gt;pages, ARRAY_SIZE(req-&gt;pages), q_mem);</div><div class='ctx'> </div><div class='del'>-	status = be_mbox_notify_wait(adapter);</div><div class='add'>+	status = be_mcc_notify_wait(adapter);</div><div class='ctx'> 	if (!status) {</div><div class='ctx'> 		struct be_cmd_resp_eth_tx_create *resp = embedded_payload(wrb);</div><div class='ctx'> 		txq-&gt;id = le16_to_cpu(resp-&gt;cid);</div><div class='ctx'> 		txq-&gt;created = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mbox_lock);</div><div class='add'>+err:</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -1018,9 +1024,6 @@ int be_cmd_q_destroy(struct be_adapter *adapter, struct be_queue_info *q,</div><div class='ctx'> 	u8 subsys = 0, opcode = 0;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;eeh_err)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='ctx'> 	if (mutex_lock_interruptible(&amp;adapter-&gt;mbox_lock))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='hunk'>@@ -1136,16 +1139,13 @@ err:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Uses MCCQ */</div><div class='del'>-int be_cmd_if_destroy(struct be_adapter *adapter, u32 interface_id, u32 domain)</div><div class='add'>+int be_cmd_if_destroy(struct be_adapter *adapter, int interface_id, u32 domain)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_mcc_wrb *wrb;</div><div class='ctx'> 	struct be_cmd_req_if_destroy *req;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;eeh_err)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	if (!interface_id)</div><div class='add'>+	if (interface_id == -1)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='hunk'>@@ -1239,7 +1239,7 @@ err:</div><div class='ctx'> </div><div class='ctx'> /* Uses synchronous mcc */</div><div class='ctx'> int be_cmd_link_status_query(struct be_adapter *adapter, u8 *mac_speed,</div><div class='del'>-			u16 *link_speed, u32 dom)</div><div class='add'>+			     u16 *link_speed, u8 *link_status, u32 dom)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_mcc_wrb *wrb;</div><div class='ctx'> 	struct be_cmd_req_link_status *req;</div><div class='hunk'>@@ -1247,6 +1247,9 @@ int be_cmd_link_status_query(struct be_adapter *adapter, u8 *mac_speed,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='add'>+	if (link_status)</div><div class='add'>+		*link_status = LINK_DOWN;</div><div class='add'>+</div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='ctx'> 		status = -EBUSY;</div><div class='hunk'>@@ -1254,6 +1257,9 @@ int be_cmd_link_status_query(struct be_adapter *adapter, u8 *mac_speed,</div><div class='ctx'> 	}</div><div class='ctx'> 	req = embedded_payload(wrb);</div><div class='ctx'> </div><div class='add'>+	if (adapter-&gt;generation == BE_GEN3 || lancer_chip(adapter))</div><div class='add'>+		req-&gt;hdr.version = 1;</div><div class='add'>+</div><div class='ctx'> 	be_wrb_cmd_hdr_prepare(&amp;req-&gt;hdr, CMD_SUBSYSTEM_COMMON,</div><div class='ctx'> 		OPCODE_COMMON_NTWK_LINK_STATUS_QUERY, sizeof(*req), wrb, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -1261,10 +1267,13 @@ int be_cmd_link_status_query(struct be_adapter *adapter, u8 *mac_speed,</div><div class='ctx'> 	if (!status) {</div><div class='ctx'> 		struct be_cmd_resp_link_status *resp = embedded_payload(wrb);</div><div class='ctx'> 		if (resp-&gt;mac_speed != PHY_LINK_SPEED_ZERO) {</div><div class='del'>-			*link_speed = le16_to_cpu(resp-&gt;link_speed);</div><div class='add'>+			if (link_speed)</div><div class='add'>+				*link_speed = le16_to_cpu(resp-&gt;link_speed);</div><div class='ctx'> 			if (mac_speed)</div><div class='ctx'> 				*mac_speed = resp-&gt;mac_speed;</div><div class='ctx'> 		}</div><div class='add'>+		if (link_status)</div><div class='add'>+			*link_status = resp-&gt;logical_link_status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='hunk'>@@ -1673,8 +1682,9 @@ int be_cmd_rss_config(struct be_adapter *adapter, u8 *rsstable, u16 table_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_mcc_wrb *wrb;</div><div class='ctx'> 	struct be_cmd_req_rss_config *req;</div><div class='del'>-	u32 myhash[10] = {0x0123, 0x4567, 0x89AB, 0xCDEF, 0x01EF,</div><div class='del'>-			0x0123, 0x4567, 0x89AB, 0xCDEF, 0x01EF};</div><div class='add'>+	u32 myhash[10] = {0x15d43fa5, 0x2534685a, 0x5f87693a, 0x5668494e,</div><div class='add'>+			0x33cf6a53, 0x383334c6, 0x76ac4257, 0x59b242b2,</div><div class='add'>+			0x3ea83c02, 0x4a110304};</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	if (mutex_lock_interruptible(&amp;adapter-&gt;mbox_lock))</div><div class='hunk'>@@ -1836,6 +1846,53 @@ err_unlock:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int lancer_cmd_read_object(struct be_adapter *adapter, struct be_dma_mem *cmd,</div><div class='add'>+		u32 data_size, u32 data_offset, const char *obj_name,</div><div class='add'>+		u32 *data_read, u32 *eof, u8 *addn_status)</div><div class='add'>+{</div><div class='add'>+	struct be_mcc_wrb *wrb;</div><div class='add'>+	struct lancer_cmd_req_read_object *req;</div><div class='add'>+	struct lancer_cmd_resp_read_object *resp;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+</div><div class='add'>+	wrb = wrb_from_mccq(adapter);</div><div class='add'>+	if (!wrb) {</div><div class='add'>+		status = -EBUSY;</div><div class='add'>+		goto err_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req = embedded_payload(wrb);</div><div class='add'>+</div><div class='add'>+	be_wrb_cmd_hdr_prepare(&amp;req-&gt;hdr, CMD_SUBSYSTEM_COMMON,</div><div class='add'>+			OPCODE_COMMON_READ_OBJECT,</div><div class='add'>+			sizeof(struct lancer_cmd_req_read_object), wrb,</div><div class='add'>+			NULL);</div><div class='add'>+</div><div class='add'>+	req-&gt;desired_read_len = cpu_to_le32(data_size);</div><div class='add'>+	req-&gt;read_offset = cpu_to_le32(data_offset);</div><div class='add'>+	strcpy(req-&gt;object_name, obj_name);</div><div class='add'>+	req-&gt;descriptor_count = cpu_to_le32(1);</div><div class='add'>+	req-&gt;buf_len = cpu_to_le32(data_size);</div><div class='add'>+	req-&gt;addr_low = cpu_to_le32((cmd-&gt;dma &amp; 0xFFFFFFFF));</div><div class='add'>+	req-&gt;addr_high = cpu_to_le32(upper_32_bits(cmd-&gt;dma));</div><div class='add'>+</div><div class='add'>+	status = be_mcc_notify_wait(adapter);</div><div class='add'>+</div><div class='add'>+	resp = embedded_payload(wrb);</div><div class='add'>+	if (!status) {</div><div class='add'>+		*data_read = le32_to_cpu(resp-&gt;actual_read_len);</div><div class='add'>+		*eof = le32_to_cpu(resp-&gt;eof);</div><div class='add'>+	} else {</div><div class='add'>+		*addn_status = resp-&gt;additional_status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err_unlock:</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int be_cmd_write_flashrom(struct be_adapter *adapter, struct be_dma_mem *cmd,</div><div class='ctx'> 			u32 flash_type, u32 flash_opcode, u32 buf_size)</div><div class='ctx'> {</div><div class='hunk'>@@ -2238,3 +2295,99 @@ err:</div><div class='ctx'> 	mutex_unlock(&amp;adapter-&gt;mbox_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* Uses synchronous MCCQ */</div><div class='add'>+int be_cmd_get_mac_from_list(struct be_adapter *adapter, u32 domain,</div><div class='add'>+							u32 *pmac_id)</div><div class='add'>+{</div><div class='add'>+	struct be_mcc_wrb *wrb;</div><div class='add'>+	struct be_cmd_req_get_mac_list *req;</div><div class='add'>+	int status;</div><div class='add'>+	int mac_count;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+</div><div class='add'>+	wrb = wrb_from_mccq(adapter);</div><div class='add'>+	if (!wrb) {</div><div class='add'>+		status = -EBUSY;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	req = embedded_payload(wrb);</div><div class='add'>+</div><div class='add'>+	be_wrb_cmd_hdr_prepare(&amp;req-&gt;hdr, CMD_SUBSYSTEM_COMMON,</div><div class='add'>+				OPCODE_COMMON_GET_MAC_LIST, sizeof(*req),</div><div class='add'>+				wrb, NULL);</div><div class='add'>+</div><div class='add'>+	req-&gt;hdr.domain = domain;</div><div class='add'>+</div><div class='add'>+	status = be_mcc_notify_wait(adapter);</div><div class='add'>+	if (!status) {</div><div class='add'>+		struct be_cmd_resp_get_mac_list *resp =</div><div class='add'>+						embedded_payload(wrb);</div><div class='add'>+		int i;</div><div class='add'>+		u8 *ctxt = &amp;resp-&gt;context[0][0];</div><div class='add'>+		status = -EIO;</div><div class='add'>+		mac_count = resp-&gt;mac_count;</div><div class='add'>+		be_dws_le_to_cpu(&amp;resp-&gt;context, sizeof(resp-&gt;context));</div><div class='add'>+		for (i = 0; i &lt; mac_count; i++) {</div><div class='add'>+			if (!AMAP_GET_BITS(struct amap_get_mac_list_context,</div><div class='add'>+					   act, ctxt)) {</div><div class='add'>+				*pmac_id = AMAP_GET_BITS</div><div class='add'>+					(struct amap_get_mac_list_context,</div><div class='add'>+					 macid, ctxt);</div><div class='add'>+				status = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			ctxt += sizeof(struct amap_get_mac_list_context) / 8;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Uses synchronous MCCQ */</div><div class='add'>+int be_cmd_set_mac_list(struct be_adapter *adapter, u8 *mac_array,</div><div class='add'>+			u8 mac_count, u32 domain)</div><div class='add'>+{</div><div class='add'>+	struct be_mcc_wrb *wrb;</div><div class='add'>+	struct be_cmd_req_set_mac_list *req;</div><div class='add'>+	int status;</div><div class='add'>+	struct be_dma_mem cmd;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cmd, 0, sizeof(struct be_dma_mem));</div><div class='add'>+	cmd.size = sizeof(struct be_cmd_req_set_mac_list);</div><div class='add'>+	cmd.va = dma_alloc_coherent(&amp;adapter-&gt;pdev-&gt;dev, cmd.size,</div><div class='add'>+			&amp;cmd.dma, GFP_KERNEL);</div><div class='add'>+	if (!cmd.va) {</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev, "Memory alloc failure\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+</div><div class='add'>+	wrb = wrb_from_mccq(adapter);</div><div class='add'>+	if (!wrb) {</div><div class='add'>+		status = -EBUSY;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req = cmd.va;</div><div class='add'>+	be_wrb_cmd_hdr_prepare(&amp;req-&gt;hdr, CMD_SUBSYSTEM_COMMON,</div><div class='add'>+				OPCODE_COMMON_SET_MAC_LIST, sizeof(*req),</div><div class='add'>+				wrb, &amp;cmd);</div><div class='add'>+</div><div class='add'>+	req-&gt;hdr.domain = domain;</div><div class='add'>+	req-&gt;mac_count = mac_count;</div><div class='add'>+	if (mac_count)</div><div class='add'>+		memcpy(req-&gt;mac, mac_array, ETH_ALEN*mac_count);</div><div class='add'>+</div><div class='add'>+	status = be_mcc_notify_wait(adapter);</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	dma_free_coherent(&amp;adapter-&gt;pdev-&gt;dev, cmd.size,</div><div class='add'>+				cmd.va, cmd.dma);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h<br/>index a35cd03fac4e..dca89249088f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/emulex/benet/be_cmds.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/emulex/benet/be_cmds.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/emulex/benet/be_cmds.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/emulex/benet/be_cmds.h</a></div><div class='hunk'>@@ -189,6 +189,9 @@ struct be_mcc_mailbox {</div><div class='ctx'> #define OPCODE_COMMON_GET_PHY_DETAILS			102</div><div class='ctx'> #define OPCODE_COMMON_SET_DRIVER_FUNCTION_CAP		103</div><div class='ctx'> #define OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES	121</div><div class='add'>+#define OPCODE_COMMON_GET_MAC_LIST			147</div><div class='add'>+#define OPCODE_COMMON_SET_MAC_LIST			148</div><div class='add'>+#define OPCODE_COMMON_READ_OBJECT			171</div><div class='ctx'> #define OPCODE_COMMON_WRITE_OBJECT			172</div><div class='ctx'> </div><div class='ctx'> #define OPCODE_ETH_RSS_CONFIG				1</div><div class='hunk'>@@ -294,6 +297,7 @@ struct be_cmd_req_mac_query {</div><div class='ctx'> 	u8 type;</div><div class='ctx'> 	u8 permanent;</div><div class='ctx'> 	u16 if_id;</div><div class='add'>+	u32 pmac_id;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct be_cmd_resp_mac_query {</div><div class='hunk'>@@ -956,7 +960,8 @@ struct be_cmd_resp_link_status {</div><div class='ctx'> 	u8 mgmt_mac_duplex;</div><div class='ctx'> 	u8 mgmt_mac_speed;</div><div class='ctx'> 	u16 link_speed;</div><div class='del'>-	u32 rsvd0;</div><div class='add'>+	u8 logical_link_status;</div><div class='add'>+	u8 rsvd1[3];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /******************** Port Identification ***************************/</div><div class='hunk'>@@ -1161,6 +1166,38 @@ struct lancer_cmd_resp_write_object {</div><div class='ctx'> 	u32 actual_write_len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/************************ Lancer Read FW info **************/</div><div class='add'>+#define LANCER_READ_FILE_CHUNK			(32*1024)</div><div class='add'>+#define LANCER_READ_FILE_EOF_MASK		0x80000000</div><div class='add'>+</div><div class='add'>+#define LANCER_FW_DUMP_FILE			"/dbg/dump.bin"</div><div class='add'>+#define LANCER_VPD_PF_FILE			"/vpd/ntr_pf.vpd"</div><div class='add'>+#define LANCER_VPD_VF_FILE			"/vpd/ntr_vf.vpd"</div><div class='add'>+</div><div class='add'>+struct lancer_cmd_req_read_object {</div><div class='add'>+	struct be_cmd_req_hdr hdr;</div><div class='add'>+	u32 desired_read_len;</div><div class='add'>+	u32 read_offset;</div><div class='add'>+	u8 object_name[104];</div><div class='add'>+	u32 descriptor_count;</div><div class='add'>+	u32 buf_len;</div><div class='add'>+	u32 addr_low;</div><div class='add'>+	u32 addr_high;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct lancer_cmd_resp_read_object {</div><div class='add'>+	u8 opcode;</div><div class='add'>+	u8 subsystem;</div><div class='add'>+	u8 rsvd1[2];</div><div class='add'>+	u8 status;</div><div class='add'>+	u8 additional_status;</div><div class='add'>+	u8 rsvd2[2];</div><div class='add'>+	u32 resp_len;</div><div class='add'>+	u32 actual_resp_len;</div><div class='add'>+	u32 actual_read_len;</div><div class='add'>+	u32 eof;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /************************ WOL *******************************/</div><div class='ctx'> struct be_cmd_req_acpi_wol_magic_config{</div><div class='ctx'> 	struct be_cmd_req_hdr hdr;</div><div class='hunk'>@@ -1307,6 +1344,34 @@ struct be_cmd_resp_set_func_cap {</div><div class='ctx'> 	u8 rsvd[212];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/******************** GET/SET_MACLIST  **************************/</div><div class='add'>+#define BE_MAX_MAC			64</div><div class='add'>+struct amap_get_mac_list_context {</div><div class='add'>+	u8 macid[31];</div><div class='add'>+	u8 act;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct be_cmd_req_get_mac_list {</div><div class='add'>+	struct be_cmd_req_hdr hdr;</div><div class='add'>+	u32 rsvd;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct be_cmd_resp_get_mac_list {</div><div class='add'>+	struct be_cmd_resp_hdr hdr;</div><div class='add'>+	u8 mac_count;</div><div class='add'>+	u8 rsvd1;</div><div class='add'>+	u16 rsvd2;</div><div class='add'>+	u8 context[sizeof(struct amap_get_mac_list_context) / 8][BE_MAX_MAC];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct be_cmd_req_set_mac_list {</div><div class='add'>+	struct be_cmd_req_hdr hdr;</div><div class='add'>+	u8 mac_count;</div><div class='add'>+	u8 rsvd1;</div><div class='add'>+	u16 rsvd2;</div><div class='add'>+	struct macaddr mac[BE_MAX_MAC];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> /*************** HW Stats Get v1 **********************************/</div><div class='ctx'> #define BE_TXP_SW_SZ			48</div><div class='ctx'> struct be_port_rxf_stats_v1 {</div><div class='hunk'>@@ -1413,15 +1478,15 @@ static inline void *be_erx_stats_from_cmd(struct be_adapter *adapter)</div><div class='ctx'> extern int be_pci_fnum_get(struct be_adapter *adapter);</div><div class='ctx'> extern int be_cmd_POST(struct be_adapter *adapter);</div><div class='ctx'> extern int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,</div><div class='del'>-			u8 type, bool permanent, u32 if_handle);</div><div class='add'>+			u8 type, bool permanent, u32 if_handle, u32 pmac_id);</div><div class='ctx'> extern int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr,</div><div class='ctx'> 			u32 if_id, u32 *pmac_id, u32 domain);</div><div class='ctx'> extern int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id,</div><div class='del'>-			u32 pmac_id, u32 domain);</div><div class='add'>+			int pmac_id, u32 domain);</div><div class='ctx'> extern int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags,</div><div class='ctx'> 			u32 en_flags, u8 *mac, u32 *if_handle, u32 *pmac_id,</div><div class='ctx'> 			u32 domain);</div><div class='del'>-extern int be_cmd_if_destroy(struct be_adapter *adapter, u32 if_handle,</div><div class='add'>+extern int be_cmd_if_destroy(struct be_adapter *adapter, int if_handle,</div><div class='ctx'> 			u32 domain);</div><div class='ctx'> extern int be_cmd_eq_create(struct be_adapter *adapter,</div><div class='ctx'> 			struct be_queue_info *eq, int eq_delay);</div><div class='hunk'>@@ -1443,8 +1508,8 @@ extern int be_cmd_q_destroy(struct be_adapter *adapter, struct be_queue_info *q,</div><div class='ctx'> 			int type);</div><div class='ctx'> extern int be_cmd_rxq_destroy(struct be_adapter *adapter,</div><div class='ctx'> 			struct be_queue_info *q);</div><div class='del'>-extern int be_cmd_link_status_query(struct be_adapter *adapter,</div><div class='del'>-			u8 *mac_speed, u16 *link_speed, u32 dom);</div><div class='add'>+extern int be_cmd_link_status_query(struct be_adapter *adapter, u8 *mac_speed,</div><div class='add'>+				    u16 *link_speed, u8 *link_status, u32 dom);</div><div class='ctx'> extern int be_cmd_reset(struct be_adapter *adapter);</div><div class='ctx'> extern int be_cmd_get_stats(struct be_adapter *adapter,</div><div class='ctx'> 			struct be_dma_mem *nonemb_cmd);</div><div class='hunk'>@@ -1480,6 +1545,9 @@ extern int lancer_cmd_write_object(struct be_adapter *adapter,</div><div class='ctx'> 				u32 data_size, u32 data_offset,</div><div class='ctx'> 				const char *obj_name,</div><div class='ctx'> 				u32 *data_written, u8 *addn_status);</div><div class='add'>+int lancer_cmd_read_object(struct be_adapter *adapter, struct be_dma_mem *cmd,</div><div class='add'>+		u32 data_size, u32 data_offset, const char *obj_name,</div><div class='add'>+		u32 *data_read, u32 *eof, u8 *addn_status);</div><div class='ctx'> int be_cmd_get_flash_crc(struct be_adapter *adapter, u8 *flashed_crc,</div><div class='ctx'> 				int offset);</div><div class='ctx'> extern int be_cmd_enable_magic_wol(struct be_adapter *adapter, u8 *mac,</div><div class='hunk'>@@ -1506,4 +1574,8 @@ extern int be_cmd_get_cntl_attributes(struct be_adapter *adapter);</div><div class='ctx'> extern int be_cmd_req_native_mode(struct be_adapter *adapter);</div><div class='ctx'> extern int be_cmd_get_reg_len(struct be_adapter *adapter, u32 *log_size);</div><div class='ctx'> extern void be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf);</div><div class='add'>+extern int be_cmd_get_mac_from_list(struct be_adapter *adapter, u32 domain,</div><div class='add'>+							u32 *pmac_id);</div><div class='add'>+extern int be_cmd_set_mac_list(struct be_adapter *adapter, u8 *mac_array,</div><div class='add'>+						u8 mac_count, u32 domain);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c<br/>index bf8153ea4ed8..6db6b6ae5e9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/emulex/benet/be_ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/emulex/benet/be_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/emulex/benet/be_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/emulex/benet/be_ethtool.c</a></div><div class='hunk'>@@ -127,8 +127,8 @@ static void be_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> 	memset(fw_on_flash, 0 , sizeof(fw_on_flash));</div><div class='ctx'> 	be_cmd_get_fw_ver(adapter, adapter-&gt;fw_ver, fw_on_flash);</div><div class='ctx'> </div><div class='del'>-	strcpy(drvinfo-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(drvinfo-&gt;version, DRV_VER);</div><div class='add'>+	strlcpy(drvinfo-&gt;driver, DRV_NAME, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, DRV_VER, sizeof(drvinfo-&gt;version));</div><div class='ctx'> 	strncpy(drvinfo-&gt;fw_version, adapter-&gt;fw_ver, FW_VER_LEN);</div><div class='ctx'> 	if (memcmp(adapter-&gt;fw_ver, fw_on_flash, FW_VER_LEN) != 0) {</div><div class='ctx'> 		strcat(drvinfo-&gt;fw_version, " [");</div><div class='hunk'>@@ -136,21 +136,84 @@ static void be_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> 		strcat(drvinfo-&gt;fw_version, "]");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev));</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	drvinfo-&gt;testinfo_len = 0;</div><div class='ctx'> 	drvinfo-&gt;regdump_len = 0;</div><div class='ctx'> 	drvinfo-&gt;eedump_len = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32</div><div class='add'>+lancer_cmd_get_file_len(struct be_adapter *adapter, u8 *file_name)</div><div class='add'>+{</div><div class='add'>+	u32 data_read = 0, eof;</div><div class='add'>+	u8 addn_status;</div><div class='add'>+	struct be_dma_mem data_len_cmd;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	memset(&amp;data_len_cmd, 0, sizeof(data_len_cmd));</div><div class='add'>+	/* data_offset and data_size should be 0 to get reg len */</div><div class='add'>+	status = lancer_cmd_read_object(adapter, &amp;data_len_cmd, 0, 0,</div><div class='add'>+				file_name, &amp;data_read, &amp;eof, &amp;addn_status);</div><div class='add'>+</div><div class='add'>+	return data_read;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+lancer_cmd_read_file(struct be_adapter *adapter, u8 *file_name,</div><div class='add'>+		u32 buf_len, void *buf)</div><div class='add'>+{</div><div class='add'>+	struct be_dma_mem read_cmd;</div><div class='add'>+	u32 read_len = 0, total_read_len = 0, chunk_size;</div><div class='add'>+	u32 eof = 0;</div><div class='add'>+	u8 addn_status;</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	read_cmd.size = LANCER_READ_FILE_CHUNK;</div><div class='add'>+	read_cmd.va = pci_alloc_consistent(adapter-&gt;pdev, read_cmd.size,</div><div class='add'>+			&amp;read_cmd.dma);</div><div class='add'>+</div><div class='add'>+	if (!read_cmd.va) {</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+				"Memory allocation failure while reading dump\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while ((total_read_len &lt; buf_len) &amp;&amp; !eof) {</div><div class='add'>+		chunk_size = min_t(u32, (buf_len - total_read_len),</div><div class='add'>+				LANCER_READ_FILE_CHUNK);</div><div class='add'>+		chunk_size = ALIGN(chunk_size, 4);</div><div class='add'>+		status = lancer_cmd_read_object(adapter, &amp;read_cmd, chunk_size,</div><div class='add'>+				total_read_len, file_name, &amp;read_len,</div><div class='add'>+				&amp;eof, &amp;addn_status);</div><div class='add'>+		if (!status) {</div><div class='add'>+			memcpy(buf + total_read_len, read_cmd.va, read_len);</div><div class='add'>+			total_read_len += read_len;</div><div class='add'>+			eof &amp;= LANCER_READ_FILE_EOF_MASK;</div><div class='add'>+		} else {</div><div class='add'>+			status = -EIO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	pci_free_consistent(adapter-&gt;pdev, read_cmd.size, read_cmd.va,</div><div class='add'>+			read_cmd.dma);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> be_get_reg_len(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	u32 log_size = 0;</div><div class='ctx'> </div><div class='del'>-	if (be_physfn(adapter))</div><div class='del'>-		be_cmd_get_reg_len(adapter, &amp;log_size);</div><div class='del'>-</div><div class='add'>+	if (be_physfn(adapter)) {</div><div class='add'>+		if (lancer_chip(adapter))</div><div class='add'>+			log_size = lancer_cmd_get_file_len(adapter,</div><div class='add'>+					LANCER_FW_DUMP_FILE);</div><div class='add'>+		else</div><div class='add'>+			be_cmd_get_reg_len(adapter, &amp;log_size);</div><div class='add'>+	}</div><div class='ctx'> 	return log_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -161,7 +224,11 @@ be_get_regs(struct net_device *netdev, struct ethtool_regs *regs, void *buf)</div><div class='ctx'> </div><div class='ctx'> 	if (be_physfn(adapter)) {</div><div class='ctx'> 		memset(buf, 0, regs-&gt;len);</div><div class='del'>-		be_cmd_get_regs(adapter, regs-&gt;len, buf);</div><div class='add'>+		if (lancer_chip(adapter))</div><div class='add'>+			lancer_cmd_read_file(adapter, LANCER_FW_DUMP_FILE,</div><div class='add'>+					regs-&gt;len, buf);</div><div class='add'>+		else</div><div class='add'>+			be_cmd_get_regs(adapter, regs-&gt;len, buf);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -362,11 +429,14 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)</div><div class='ctx'> 	struct be_phy_info phy_info;</div><div class='ctx'> 	u8 mac_speed = 0;</div><div class='ctx'> 	u16 link_speed = 0;</div><div class='add'>+	u8 link_status;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	if ((adapter-&gt;link_speed &lt; 0) || (!(netdev-&gt;flags &amp; IFF_UP))) {</div><div class='ctx'> 		status = be_cmd_link_status_query(adapter, &amp;mac_speed,</div><div class='del'>-						&amp;link_speed, 0);</div><div class='add'>+						  &amp;link_speed, &amp;link_status, 0);</div><div class='add'>+		if (!status)</div><div class='add'>+			be_link_status_update(adapter, link_status);</div><div class='ctx'> </div><div class='ctx'> 		/* link_speed is in units of 10 Mbps */</div><div class='ctx'> 		if (link_speed) {</div><div class='hunk'>@@ -453,16 +523,13 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-be_get_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring)</div><div class='add'>+static void be_get_ringparam(struct net_device *netdev,</div><div class='add'>+			     struct ethtool_ringparam *ring)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	ring-&gt;rx_max_pending = adapter-&gt;rx_obj[0].q.len;</div><div class='del'>-	ring-&gt;tx_max_pending = adapter-&gt;tx_obj[0].q.len;</div><div class='del'>-</div><div class='del'>-	ring-&gt;rx_pending = atomic_read(&amp;adapter-&gt;rx_obj[0].q.used);</div><div class='del'>-	ring-&gt;tx_pending = atomic_read(&amp;adapter-&gt;tx_obj[0].q.used);</div><div class='add'>+	ring-&gt;rx_max_pending = ring-&gt;rx_pending = adapter-&gt;rx_obj[0].q.len;</div><div class='add'>+	ring-&gt;tx_max_pending = ring-&gt;tx_pending = adapter-&gt;tx_obj[0].q.len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -636,7 +703,7 @@ be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (be_cmd_link_status_query(adapter, &amp;mac_speed,</div><div class='del'>-				&amp;qos_link_speed, 0) != 0) {</div><div class='add'>+				     &amp;qos_link_speed, NULL, 0) != 0) {</div><div class='ctx'> 		test-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='ctx'> 		data[4] = -1;</div><div class='ctx'> 	} else if (!mac_speed) {</div><div class='hunk'>@@ -660,7 +727,17 @@ be_do_flash(struct net_device *netdev, struct ethtool_flash *efl)</div><div class='ctx'> static int</div><div class='ctx'> be_get_eeprom_len(struct net_device *netdev)</div><div class='ctx'> {</div><div class='del'>-	return BE_READ_SEEPROM_LEN;</div><div class='add'>+	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	if (lancer_chip(adapter)) {</div><div class='add'>+		if (be_physfn(adapter))</div><div class='add'>+			return lancer_cmd_get_file_len(adapter,</div><div class='add'>+					LANCER_VPD_PF_FILE);</div><div class='add'>+		else</div><div class='add'>+			return lancer_cmd_get_file_len(adapter,</div><div class='add'>+					LANCER_VPD_VF_FILE);</div><div class='add'>+	} else {</div><div class='add'>+		return BE_READ_SEEPROM_LEN;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -675,6 +752,15 @@ be_read_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,</div><div class='ctx'> 	if (!eeprom-&gt;len)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (lancer_chip(adapter)) {</div><div class='add'>+		if (be_physfn(adapter))</div><div class='add'>+			return lancer_cmd_read_file(adapter, LANCER_VPD_PF_FILE,</div><div class='add'>+					eeprom-&gt;len, data);</div><div class='add'>+		else</div><div class='add'>+			return lancer_cmd_read_file(adapter, LANCER_VPD_VF_FILE,</div><div class='add'>+					eeprom-&gt;len, data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	eeprom-&gt;magic = BE_VENDOR_ID | (adapter-&gt;pdev-&gt;device&lt;&lt;16);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;eeprom_cmd, 0, sizeof(struct be_dma_mem));</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 bf266a00c774..a6bcdb5cd2be 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/emulex/benet/be_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/emulex/benet/be_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/emulex/benet/be_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/emulex/benet/be_main.c</a></div><div class='hunk'>@@ -27,13 +27,14 @@ MODULE_DESCRIPTION(DRV_DESC " " DRV_VER);</div><div class='ctx'> MODULE_AUTHOR("ServerEngines Corporation");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static ushort rx_frag_size = 2048;</div><div class='ctx'> static unsigned int num_vfs;</div><div class='del'>-module_param(rx_frag_size, ushort, S_IRUGO);</div><div class='ctx'> module_param(num_vfs, uint, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(rx_frag_size, "Size of a fragment that holds rcvd data.");</div><div class='ctx'> MODULE_PARM_DESC(num_vfs, "Number of PCI VFs to initialize");</div><div class='ctx'> </div><div class='add'>+static ushort rx_frag_size = 2048;</div><div class='add'>+module_param(rx_frag_size, ushort, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(rx_frag_size, "Size of a fragment that holds rcvd data.");</div><div class='add'>+</div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(be_dev_ids) = {</div><div class='ctx'> 	{ PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) },</div><div class='ctx'> 	{ PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) },</div><div class='hunk'>@@ -41,6 +42,7 @@ static DEFINE_PCI_DEVICE_TABLE(be_dev_ids) = {</div><div class='ctx'> 	{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) },</div><div class='ctx'> 	{ PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID3)},</div><div class='ctx'> 	{ PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID4)},</div><div class='add'>+	{ PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID5)},</div><div class='ctx'> 	{ 0 }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, be_dev_ids);</div><div class='hunk'>@@ -237,7 +239,8 @@ static int be_mac_addr_set(struct net_device *netdev, void *p)</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='ctx'> 	status = be_cmd_mac_addr_query(adapter, current_mac,</div><div class='del'>-			MAC_ADDRESS_TYPE_NETWORK, false, adapter-&gt;if_handle);</div><div class='add'>+				MAC_ADDRESS_TYPE_NETWORK, false,</div><div class='add'>+				adapter-&gt;if_handle, 0);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='hunk'>@@ -315,6 +318,8 @@ static void populate_be3_stats(struct be_adapter *adapter)</div><div class='ctx'> 	struct be_drv_stats *drvs = &amp;adapter-&gt;drv_stats;</div><div class='ctx'> </div><div class='ctx'> 	be_dws_le_to_cpu(hw_stats, sizeof(*hw_stats));</div><div class='add'>+	drvs-&gt;pmem_fifo_overflow_drop = port_stats-&gt;pmem_fifo_overflow_drop;</div><div class='add'>+	drvs-&gt;rx_priority_pause_frames = port_stats-&gt;rx_priority_pause_frames;</div><div class='ctx'> 	drvs-&gt;rx_pause_frames = port_stats-&gt;rx_pause_frames;</div><div class='ctx'> 	drvs-&gt;rx_crc_errors = port_stats-&gt;rx_crc_errors;</div><div class='ctx'> 	drvs-&gt;rx_control_frames = port_stats-&gt;rx_control_frames;</div><div class='hunk'>@@ -491,19 +496,19 @@ static struct rtnl_link_stats64 *be_get_stats64(struct net_device *netdev,</div><div class='ctx'> 	return stats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void be_link_status_update(struct be_adapter *adapter, u32 link_status)</div><div class='add'>+void be_link_status_update(struct be_adapter *adapter, u8 link_status)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> </div><div class='del'>-	/* when link status changes, link speed must be re-queried from card */</div><div class='del'>-	adapter-&gt;link_speed = -1;</div><div class='del'>-	if ((link_status &amp; LINK_STATUS_MASK) == LINK_UP) {</div><div class='del'>-		netif_carrier_on(netdev);</div><div class='del'>-		dev_info(&amp;adapter-&gt;pdev-&gt;dev, "%s: Link up\n", netdev-&gt;name);</div><div class='del'>-	} else {</div><div class='add'>+	if (!(adapter-&gt;flags &amp; BE_FLAGS_LINK_STATUS_INIT)) {</div><div class='ctx'> 		netif_carrier_off(netdev);</div><div class='del'>-		dev_info(&amp;adapter-&gt;pdev-&gt;dev, "%s: Link down\n", netdev-&gt;name);</div><div class='add'>+		adapter-&gt;flags |= BE_FLAGS_LINK_STATUS_INIT;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if ((link_status &amp; LINK_STATUS_MASK) == LINK_UP)</div><div class='add'>+		netif_carrier_on(netdev);</div><div class='add'>+	else</div><div class='add'>+		netif_carrier_off(netdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void be_tx_stats_update(struct be_tx_obj *txo,</div><div class='hunk'>@@ -549,11 +554,26 @@ static inline void wrb_fill(struct be_eth_wrb *wrb, u64 addr, int len)</div><div class='ctx'> 	wrb-&gt;frag_len = len &amp; ETH_WRB_FRAG_LEN_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u16 be_get_tx_vlan_tag(struct be_adapter *adapter,</div><div class='add'>+					struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	u8 vlan_prio;</div><div class='add'>+	u16 vlan_tag;</div><div class='add'>+</div><div class='add'>+	vlan_tag = vlan_tx_tag_get(skb);</div><div class='add'>+	vlan_prio = (vlan_tag &amp; VLAN_PRIO_MASK) &gt;&gt; VLAN_PRIO_SHIFT;</div><div class='add'>+	/* If vlan priority provided by OS is NOT in available bmap */</div><div class='add'>+	if (!(adapter-&gt;vlan_prio_bmap &amp; (1 &lt;&lt; vlan_prio)))</div><div class='add'>+		vlan_tag = (vlan_tag &amp; ~VLAN_PRIO_MASK) |</div><div class='add'>+				adapter-&gt;recommended_prio;</div><div class='add'>+</div><div class='add'>+	return vlan_tag;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void wrb_fill_hdr(struct be_adapter *adapter, struct be_eth_hdr_wrb *hdr,</div><div class='ctx'> 		struct sk_buff *skb, u32 wrb_cnt, u32 len)</div><div class='ctx'> {</div><div class='del'>-	u8 vlan_prio = 0;</div><div class='del'>-	u16 vlan_tag = 0;</div><div class='add'>+	u16 vlan_tag;</div><div class='ctx'> </div><div class='ctx'> 	memset(hdr, 0, sizeof(*hdr));</div><div class='ctx'> </div><div class='hunk'>@@ -584,12 +604,7 @@ static void wrb_fill_hdr(struct be_adapter *adapter, struct be_eth_hdr_wrb *hdr,</div><div class='ctx'> </div><div class='ctx'> 	if (vlan_tx_tag_present(skb)) {</div><div class='ctx'> 		AMAP_SET_BITS(struct amap_eth_hdr_wrb, vlan, hdr, 1);</div><div class='del'>-		vlan_tag = vlan_tx_tag_get(skb);</div><div class='del'>-		vlan_prio = (vlan_tag &amp; VLAN_PRIO_MASK) &gt;&gt; VLAN_PRIO_SHIFT;</div><div class='del'>-		/* If vlan priority provided by OS is NOT in available bmap */</div><div class='del'>-		if (!(adapter-&gt;vlan_prio_bmap &amp; (1 &lt;&lt; vlan_prio)))</div><div class='del'>-			vlan_tag = (vlan_tag &amp; ~VLAN_PRIO_MASK) |</div><div class='del'>-					adapter-&gt;recommended_prio;</div><div class='add'>+		vlan_tag = be_get_tx_vlan_tag(adapter, skb);</div><div class='ctx'> 		AMAP_SET_BITS(struct amap_eth_hdr_wrb, vlan_tag, hdr, vlan_tag);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -692,6 +707,25 @@ static netdev_tx_t be_xmit(struct sk_buff *skb,</div><div class='ctx'> 	u32 start = txq-&gt;head;</div><div class='ctx'> 	bool dummy_wrb, stopped = false;</div><div class='ctx'> </div><div class='add'>+	/* For vlan tagged pkts, BE</div><div class='add'>+	 * 1) calculates checksum even when CSO is not requested</div><div class='add'>+	 * 2) calculates checksum wrongly for padded pkt less than</div><div class='add'>+	 * 60 bytes long.</div><div class='add'>+	 * As a workaround disable TX vlan offloading in such cases.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(vlan_tx_tag_present(skb) &amp;&amp;</div><div class='add'>+		     (skb-&gt;ip_summed != CHECKSUM_PARTIAL || skb-&gt;len &lt;= 60))) {</div><div class='add'>+		skb = skb_share_check(skb, GFP_ATOMIC);</div><div class='add'>+		if (unlikely(!skb))</div><div class='add'>+			goto tx_drop;</div><div class='add'>+</div><div class='add'>+		skb = __vlan_put_tag(skb, be_get_tx_vlan_tag(adapter, skb));</div><div class='add'>+		if (unlikely(!skb))</div><div class='add'>+			goto tx_drop;</div><div class='add'>+</div><div class='add'>+		skb-&gt;vlan_tci = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	wrb_cnt = wrb_cnt_for_skb(adapter, skb, &amp;dummy_wrb);</div><div class='ctx'> </div><div class='ctx'> 	copied = make_tx_wrbs(adapter, txq, skb, wrb_cnt, dummy_wrb);</div><div class='hunk'>@@ -719,6 +753,7 @@ static netdev_tx_t be_xmit(struct sk_buff *skb,</div><div class='ctx'> 		txq-&gt;head = start;</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='ctx'> 	}</div><div class='add'>+tx_drop:</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -746,15 +781,15 @@ static int be_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'>  */</div><div class='ctx'> static int be_vid_config(struct be_adapter *adapter, bool vf, u32 vf_num)</div><div class='ctx'> {</div><div class='add'>+	struct be_vf_cfg *vf_cfg = &amp;adapter-&gt;vf_cfg[vf_num];</div><div class='ctx'> 	u16 vtag[BE_NUM_VLANS_SUPPORTED];</div><div class='ctx'> 	u16 ntags = 0, i;</div><div class='ctx'> 	int status = 0;</div><div class='del'>-	u32 if_handle;</div><div class='ctx'> </div><div class='ctx'> 	if (vf) {</div><div class='del'>-		if_handle = adapter-&gt;vf_cfg[vf_num].vf_if_handle;</div><div class='del'>-		vtag[0] = cpu_to_le16(adapter-&gt;vf_cfg[vf_num].vf_vlan_tag);</div><div class='del'>-		status = be_cmd_vlan_config(adapter, if_handle, vtag, 1, 1, 0);</div><div class='add'>+		vtag[0] = cpu_to_le16(vf_cfg-&gt;vlan_tag);</div><div class='add'>+		status = be_cmd_vlan_config(adapter, vf_cfg-&gt;if_handle, vtag,</div><div class='add'>+					    1, 1, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* No need to further configure vids if in promiscuous mode */</div><div class='hunk'>@@ -779,31 +814,48 @@ static int be_vid_config(struct be_adapter *adapter, bool vf, u32 vf_num)</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void be_vlan_add_vid(struct net_device *netdev, u16 vid)</div><div class='add'>+static int be_vlan_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	int status = 0;</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;vlans_added++;</div><div class='del'>-	if (!be_physfn(adapter))</div><div class='del'>-		return;</div><div class='add'>+	if (!be_physfn(adapter)) {</div><div class='add'>+		status = -EINVAL;</div><div class='add'>+		goto ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;vlan_tag[vid] = 1;</div><div class='ctx'> 	if (adapter-&gt;vlans_added &lt;= (adapter-&gt;max_vlans + 1))</div><div class='del'>-		be_vid_config(adapter, false, 0);</div><div class='add'>+		status = be_vid_config(adapter, false, 0);</div><div class='add'>+</div><div class='add'>+	if (!status)</div><div class='add'>+		adapter-&gt;vlans_added++;</div><div class='add'>+	else</div><div class='add'>+		adapter-&gt;vlan_tag[vid] = 0;</div><div class='add'>+ret:</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void be_vlan_rem_vid(struct net_device *netdev, u16 vid)</div><div class='add'>+static int be_vlan_rem_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	int status = 0;</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;vlans_added--;</div><div class='del'>-</div><div class='del'>-	if (!be_physfn(adapter))</div><div class='del'>-		return;</div><div class='add'>+	if (!be_physfn(adapter)) {</div><div class='add'>+		status = -EINVAL;</div><div class='add'>+		goto ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;vlan_tag[vid] = 0;</div><div class='ctx'> 	if (adapter-&gt;vlans_added &lt;= adapter-&gt;max_vlans)</div><div class='del'>-		be_vid_config(adapter, false, 0);</div><div class='add'>+		status = be_vid_config(adapter, false, 0);</div><div class='add'>+</div><div class='add'>+	if (!status)</div><div class='add'>+		adapter-&gt;vlans_added--;</div><div class='add'>+	else</div><div class='add'>+		adapter-&gt;vlan_tag[vid] = 1;</div><div class='add'>+ret:</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void be_set_rx_mode(struct net_device *netdev)</div><div class='hunk'>@@ -840,28 +892,30 @@ done:</div><div class='ctx'> static int be_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct be_vf_cfg *vf_cfg = &amp;adapter-&gt;vf_cfg[vf];</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	if (!adapter-&gt;sriov_enabled)</div><div class='add'>+	if (!sriov_enabled(adapter))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	if (!is_valid_ether_addr(mac) || (vf &gt;= num_vfs))</div><div class='add'>+	if (!is_valid_ether_addr(mac) || vf &gt;= adapter-&gt;num_vfs)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;vf_cfg[vf].vf_pmac_id != BE_INVALID_PMAC_ID)</div><div class='del'>-		status = be_cmd_pmac_del(adapter,</div><div class='del'>-					adapter-&gt;vf_cfg[vf].vf_if_handle,</div><div class='del'>-					adapter-&gt;vf_cfg[vf].vf_pmac_id, vf + 1);</div><div class='add'>+	if (lancer_chip(adapter)) {</div><div class='add'>+		status = be_cmd_set_mac_list(adapter,  mac, 1, vf + 1);</div><div class='add'>+	} else {</div><div class='add'>+		status = be_cmd_pmac_del(adapter, vf_cfg-&gt;if_handle,</div><div class='add'>+					 vf_cfg-&gt;pmac_id, vf + 1);</div><div class='ctx'> </div><div class='del'>-	status = be_cmd_pmac_add(adapter, mac,</div><div class='del'>-				adapter-&gt;vf_cfg[vf].vf_if_handle,</div><div class='del'>-				&amp;adapter-&gt;vf_cfg[vf].vf_pmac_id, vf + 1);</div><div class='add'>+		status = be_cmd_pmac_add(adapter, mac, vf_cfg-&gt;if_handle,</div><div class='add'>+					 &amp;vf_cfg-&gt;pmac_id, vf + 1);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (status)</div><div class='ctx'> 		dev_err(&amp;adapter-&gt;pdev-&gt;dev, "MAC %pM set on VF %d Failed\n",</div><div class='ctx'> 				mac, vf);</div><div class='ctx'> 	else</div><div class='del'>-		memcpy(adapter-&gt;vf_cfg[vf].vf_mac_addr, mac, ETH_ALEN);</div><div class='add'>+		memcpy(vf_cfg-&gt;mac_addr, mac, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -870,18 +924,19 @@ static int be_get_vf_config(struct net_device *netdev, int vf,</div><div class='ctx'> 			struct ifla_vf_info *vi)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct be_vf_cfg *vf_cfg = &amp;adapter-&gt;vf_cfg[vf];</div><div class='ctx'> </div><div class='del'>-	if (!adapter-&gt;sriov_enabled)</div><div class='add'>+	if (!sriov_enabled(adapter))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	if (vf &gt;= num_vfs)</div><div class='add'>+	if (vf &gt;= adapter-&gt;num_vfs)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	vi-&gt;vf = vf;</div><div class='del'>-	vi-&gt;tx_rate = adapter-&gt;vf_cfg[vf].vf_tx_rate;</div><div class='del'>-	vi-&gt;vlan = adapter-&gt;vf_cfg[vf].vf_vlan_tag;</div><div class='add'>+	vi-&gt;tx_rate = vf_cfg-&gt;tx_rate;</div><div class='add'>+	vi-&gt;vlan = vf_cfg-&gt;vlan_tag;</div><div class='ctx'> 	vi-&gt;qos = 0;</div><div class='del'>-	memcpy(&amp;vi-&gt;mac, adapter-&gt;vf_cfg[vf].vf_mac_addr, ETH_ALEN);</div><div class='add'>+	memcpy(&amp;vi-&gt;mac, vf_cfg-&gt;mac_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -892,17 +947,17 @@ static int be_set_vf_vlan(struct net_device *netdev,</div><div class='ctx'> 	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='del'>-	if (!adapter-&gt;sriov_enabled)</div><div class='add'>+	if (!sriov_enabled(adapter))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	if ((vf &gt;= num_vfs) || (vlan &gt; 4095))</div><div class='add'>+	if (vf &gt;= adapter-&gt;num_vfs || vlan &gt; 4095)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (vlan) {</div><div class='del'>-		adapter-&gt;vf_cfg[vf].vf_vlan_tag = vlan;</div><div class='add'>+		adapter-&gt;vf_cfg[vf].vlan_tag = vlan;</div><div class='ctx'> 		adapter-&gt;vlans_added++;</div><div class='ctx'> 	} else {</div><div class='del'>-		adapter-&gt;vf_cfg[vf].vf_vlan_tag = 0;</div><div class='add'>+		adapter-&gt;vf_cfg[vf].vlan_tag = 0;</div><div class='ctx'> 		adapter-&gt;vlans_added--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -920,21 +975,25 @@ static int be_set_vf_tx_rate(struct net_device *netdev,</div><div class='ctx'> 	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='del'>-	if (!adapter-&gt;sriov_enabled)</div><div class='add'>+	if (!sriov_enabled(adapter))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	if ((vf &gt;= num_vfs) || (rate &lt; 0))</div><div class='add'>+	if (vf &gt;= adapter-&gt;num_vfs)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (rate &gt; 10000)</div><div class='del'>-		rate = 10000;</div><div class='add'>+	if (rate &lt; 100 || rate &gt; 10000) {</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+			"tx rate must be between 100 and 10000 Mbps\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;vf_cfg[vf].vf_tx_rate = rate;</div><div class='ctx'> 	status = be_cmd_set_qos(adapter, rate / 10, vf + 1);</div><div class='ctx'> </div><div class='ctx'> 	if (status)</div><div class='del'>-		dev_info(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='ctx'> 				"tx rate %d on VF %d failed\n", rate, vf);</div><div class='add'>+	else</div><div class='add'>+		adapter-&gt;vf_cfg[vf].tx_rate = rate;</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1645,8 +1704,7 @@ static void be_tx_queues_destroy(struct be_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> static int be_num_txqs_want(struct be_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	if ((num_vfs &amp;&amp; adapter-&gt;sriov_enabled) ||</div><div class='del'>-		be_is_mc(adapter) ||</div><div class='add'>+	if (sriov_enabled(adapter) || be_is_mc(adapter) ||</div><div class='ctx'> 		lancer_chip(adapter) || !be_physfn(adapter) ||</div><div class='ctx'> 		adapter-&gt;generation == BE_GEN2)</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -1662,9 +1720,12 @@ static int be_tx_queues_create(struct be_adapter *adapter)</div><div class='ctx'> 	u8 i;</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;num_tx_qs = be_num_txqs_want(adapter);</div><div class='del'>-	if (adapter-&gt;num_tx_qs != MAX_TX_QS)</div><div class='add'>+	if (adapter-&gt;num_tx_qs != MAX_TX_QS) {</div><div class='add'>+		rtnl_lock();</div><div class='ctx'> 		netif_set_real_num_tx_queues(adapter-&gt;netdev,</div><div class='ctx'> 			adapter-&gt;num_tx_qs);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;tx_eq.max_eqd = 0;</div><div class='ctx'> 	adapter-&gt;tx_eq.min_eqd = 0;</div><div class='hunk'>@@ -1693,9 +1754,6 @@ static int be_tx_queues_create(struct be_adapter *adapter)</div><div class='ctx'> 		if (be_queue_alloc(adapter, q, TX_Q_LEN,</div><div class='ctx'> 			sizeof(struct be_eth_wrb)))</div><div class='ctx'> 			goto err;</div><div class='del'>-</div><div class='del'>-		if (be_cmd_txq_create(adapter, q, cq))</div><div class='del'>-			goto err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1728,8 +1786,8 @@ static void be_rx_queues_destroy(struct be_adapter *adapter)</div><div class='ctx'> static u32 be_num_rxqs_want(struct be_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	if ((adapter-&gt;function_caps &amp; BE_FUNCTION_CAPS_RSS) &amp;&amp;</div><div class='del'>-		!adapter-&gt;sriov_enabled &amp;&amp; be_physfn(adapter) &amp;&amp;</div><div class='del'>-		!be_is_mc(adapter)) {</div><div class='add'>+	     !sriov_enabled(adapter) &amp;&amp; be_physfn(adapter) &amp;&amp;</div><div class='add'>+	     !be_is_mc(adapter)) {</div><div class='ctx'> 		return 1 + MAX_RSS_QS; /* one default non-RSS queue */</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dev_warn(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='hunk'>@@ -1929,6 +1987,7 @@ static int be_poll_tx_mcc(struct napi_struct *napi, int budget)</div><div class='ctx'> 	struct be_eq_obj *tx_eq = container_of(napi, struct be_eq_obj, napi);</div><div class='ctx'> 	struct be_adapter *adapter =</div><div class='ctx'> 		container_of(tx_eq, struct be_adapter, tx_eq);</div><div class='add'>+	struct be_mcc_obj *mcc_obj = &amp;adapter-&gt;mcc_obj;</div><div class='ctx'> 	struct be_tx_obj *txo;</div><div class='ctx'> 	struct be_eth_tx_compl *txcp;</div><div class='ctx'> 	int tx_compl, mcc_compl, status = 0;</div><div class='hunk'>@@ -1965,12 +2024,19 @@ static int be_poll_tx_mcc(struct napi_struct *napi, int budget)</div><div class='ctx'> 	mcc_compl = be_process_mcc(adapter, &amp;status);</div><div class='ctx'> </div><div class='ctx'> 	if (mcc_compl) {</div><div class='del'>-		struct be_mcc_obj *mcc_obj = &amp;adapter-&gt;mcc_obj;</div><div class='ctx'> 		be_cq_notify(adapter, mcc_obj-&gt;cq.id, true, mcc_compl);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	napi_complete(napi);</div><div class='ctx'> </div><div class='add'>+	/* Arm CQ again to regenerate EQEs for Lancer in INTx mode */</div><div class='add'>+	if (lancer_chip(adapter) &amp;&amp; !msix_enabled(adapter)) {</div><div class='add'>+		for_all_tx_queues(adapter, txo, i)</div><div class='add'>+			be_cq_notify(adapter, txo-&gt;cq.id, true, 0);</div><div class='add'>+</div><div class='add'>+		be_cq_notify(adapter, mcc_obj-&gt;cq.id, true, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	be_eq_notify(adapter, tx_eq-&gt;q.id, true, false, 0);</div><div class='ctx'> 	adapter-&gt;drv_stats.tx_events++;</div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -1982,6 +2048,9 @@ void be_detect_dump_ue(struct be_adapter *adapter)</div><div class='ctx'> 	u32 sliport_status = 0, sliport_err1 = 0, sliport_err2 = 0;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='add'>+	if (adapter-&gt;eeh_err || adapter-&gt;ue_detected)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (lancer_chip(adapter)) {</div><div class='ctx'> 		sliport_status = ioread32(adapter-&gt;db + SLIPORT_STATUS_OFFSET);</div><div class='ctx'> 		if (sliport_status &amp; SLIPORT_STATUS_ERR_MASK) {</div><div class='hunk'>@@ -2008,7 +2077,8 @@ void be_detect_dump_ue(struct be_adapter *adapter)</div><div class='ctx'> 		sliport_status &amp; SLIPORT_STATUS_ERR_MASK) {</div><div class='ctx'> 		adapter-&gt;ue_detected = true;</div><div class='ctx'> 		adapter-&gt;eeh_err = true;</div><div class='del'>-		dev_err(&amp;adapter-&gt;pdev-&gt;dev, "UE Detected!!\n");</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+			"Unrecoverable error in the card\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ue_lo) {</div><div class='hunk'>@@ -2036,53 +2106,6 @@ void be_detect_dump_ue(struct be_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void be_worker(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct be_adapter *adapter =</div><div class='del'>-		container_of(work, struct be_adapter, work.work);</div><div class='del'>-	struct be_rx_obj *rxo;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!adapter-&gt;ue_detected)</div><div class='del'>-		be_detect_dump_ue(adapter);</div><div class='del'>-</div><div class='del'>-	/* when interrupts are not yet enabled, just reap any pending</div><div class='del'>-	* mcc completions */</div><div class='del'>-	if (!netif_running(adapter-&gt;netdev)) {</div><div class='del'>-		int mcc_compl, status = 0;</div><div class='del'>-</div><div class='del'>-		mcc_compl = be_process_mcc(adapter, &amp;status);</div><div class='del'>-</div><div class='del'>-		if (mcc_compl) {</div><div class='del'>-			struct be_mcc_obj *mcc_obj = &amp;adapter-&gt;mcc_obj;</div><div class='del'>-			be_cq_notify(adapter, mcc_obj-&gt;cq.id, false, mcc_compl);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		goto reschedule;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!adapter-&gt;stats_cmd_sent) {</div><div class='del'>-		if (lancer_chip(adapter))</div><div class='del'>-			lancer_cmd_get_pport_stats(adapter,</div><div class='del'>-						&amp;adapter-&gt;stats_cmd);</div><div class='del'>-		else</div><div class='del'>-			be_cmd_get_stats(adapter, &amp;adapter-&gt;stats_cmd);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_all_rx_queues(adapter, rxo, i) {</div><div class='del'>-		be_rx_eqd_update(adapter, rxo);</div><div class='del'>-</div><div class='del'>-		if (rxo-&gt;rx_post_starved) {</div><div class='del'>-			rxo-&gt;rx_post_starved = false;</div><div class='del'>-			be_post_rx_frags(rxo, GFP_KERNEL);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-reschedule:</div><div class='del'>-	adapter-&gt;work_counter++;</div><div class='del'>-	schedule_delayed_work(&amp;adapter-&gt;work, msecs_to_jiffies(1000));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void be_msix_disable(struct be_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	if (msix_enabled(adapter)) {</div><div class='hunk'>@@ -2119,27 +2142,28 @@ done:</div><div class='ctx'> static int be_sriov_enable(struct be_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	be_check_sriov_fn_type(adapter);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PCI_IOV</div><div class='ctx'> 	if (be_physfn(adapter) &amp;&amp; num_vfs) {</div><div class='ctx'> 		int status, pos;</div><div class='del'>-		u16 nvfs;</div><div class='add'>+		u16 dev_vfs;</div><div class='ctx'> </div><div class='ctx'> 		pos = pci_find_ext_capability(adapter-&gt;pdev,</div><div class='ctx'> 						PCI_EXT_CAP_ID_SRIOV);</div><div class='ctx'> 		pci_read_config_word(adapter-&gt;pdev,</div><div class='del'>-					pos + PCI_SRIOV_TOTAL_VF, &amp;nvfs);</div><div class='add'>+				     pos + PCI_SRIOV_TOTAL_VF, &amp;dev_vfs);</div><div class='ctx'> </div><div class='del'>-		if (num_vfs &gt; nvfs) {</div><div class='add'>+		adapter-&gt;num_vfs = min_t(u16, num_vfs, dev_vfs);</div><div class='add'>+		if (adapter-&gt;num_vfs != num_vfs)</div><div class='ctx'> 			dev_info(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='del'>-					"Device supports %d VFs and not %d\n",</div><div class='del'>-					nvfs, num_vfs);</div><div class='del'>-			num_vfs = nvfs;</div><div class='del'>-		}</div><div class='add'>+				 "Device supports %d VFs and not %d\n",</div><div class='add'>+				 adapter-&gt;num_vfs, num_vfs);</div><div class='ctx'> </div><div class='del'>-		status = pci_enable_sriov(adapter-&gt;pdev, num_vfs);</div><div class='del'>-		adapter-&gt;sriov_enabled = status ? false : true;</div><div class='add'>+		status = pci_enable_sriov(adapter-&gt;pdev, adapter-&gt;num_vfs);</div><div class='add'>+		if (status)</div><div class='add'>+			adapter-&gt;num_vfs = 0;</div><div class='ctx'> </div><div class='del'>-		if (adapter-&gt;sriov_enabled) {</div><div class='add'>+		if (adapter-&gt;num_vfs) {</div><div class='ctx'> 			adapter-&gt;vf_cfg = kcalloc(num_vfs,</div><div class='ctx'> 						sizeof(struct be_vf_cfg),</div><div class='ctx'> 						GFP_KERNEL);</div><div class='hunk'>@@ -2154,10 +2178,10 @@ static int be_sriov_enable(struct be_adapter *adapter)</div><div class='ctx'> static void be_sriov_disable(struct be_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PCI_IOV</div><div class='del'>-	if (adapter-&gt;sriov_enabled) {</div><div class='add'>+	if (sriov_enabled(adapter)) {</div><div class='ctx'> 		pci_disable_sriov(adapter-&gt;pdev);</div><div class='ctx'> 		kfree(adapter-&gt;vf_cfg);</div><div class='del'>-		adapter-&gt;sriov_enabled = false;</div><div class='add'>+		adapter-&gt;num_vfs = 0;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -2351,8 +2375,8 @@ static int be_close(struct net_device *netdev)</div><div class='ctx'> static int be_rx_queues_setup(struct be_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_rx_obj *rxo;</div><div class='del'>-	int rc, i;</div><div class='del'>-	u8 rsstable[MAX_RSS_QS];</div><div class='add'>+	int rc, i, j;</div><div class='add'>+	u8 rsstable[128];</div><div class='ctx'> </div><div class='ctx'> 	for_all_rx_queues(adapter, rxo, i) {</div><div class='ctx'> 		rc = be_cmd_rxq_create(adapter, &amp;rxo-&gt;q, rxo-&gt;cq.id,</div><div class='hunk'>@@ -2364,11 +2388,15 @@ static int be_rx_queues_setup(struct be_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (be_multi_rxq(adapter)) {</div><div class='del'>-		for_all_rss_queues(adapter, rxo, i)</div><div class='del'>-			rsstable[i] = rxo-&gt;rss_id;</div><div class='add'>+		for (j = 0; j &lt; 128; j += adapter-&gt;num_rx_qs - 1) {</div><div class='add'>+			for_all_rss_queues(adapter, rxo, i) {</div><div class='add'>+				if ((j + i) &gt;= 128)</div><div class='add'>+					break;</div><div class='add'>+				rsstable[j + i] = rxo-&gt;rss_id;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		rc = be_cmd_rss_config(adapter, rsstable, 128);</div><div class='ctx'> </div><div class='del'>-		rc = be_cmd_rss_config(adapter, rsstable,</div><div class='del'>-			adapter-&gt;num_rx_qs - 1);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2386,6 +2414,7 @@ static int be_open(struct net_device *netdev)</div><div class='ctx'> 	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct be_eq_obj *tx_eq = &amp;adapter-&gt;tx_eq;</div><div class='ctx'> 	struct be_rx_obj *rxo;</div><div class='add'>+	u8 link_status;</div><div class='ctx'> 	int status, i;</div><div class='ctx'> </div><div class='ctx'> 	status = be_rx_queues_setup(adapter);</div><div class='hunk'>@@ -2409,6 +2438,11 @@ static int be_open(struct net_device *netdev)</div><div class='ctx'> 	/* Now that interrupts are on we can process async mcc */</div><div class='ctx'> 	be_async_mcc_enable(adapter);</div><div class='ctx'> </div><div class='add'>+	status = be_cmd_link_status_query(adapter, NULL, NULL,</div><div class='add'>+					  &amp;link_status, 0);</div><div class='add'>+	if (!status)</div><div class='add'>+		be_link_status_update(adapter, link_status);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> err:</div><div class='ctx'> 	be_close(adapter-&gt;netdev);</div><div class='hunk'>@@ -2465,19 +2499,24 @@ static inline int be_vf_eth_addr_config(struct be_adapter *adapter)</div><div class='ctx'> 	u32 vf;</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> 	u8 mac[ETH_ALEN];</div><div class='add'>+	struct be_vf_cfg *vf_cfg;</div><div class='ctx'> </div><div class='ctx'> 	be_vf_eth_addr_generate(adapter, mac);</div><div class='ctx'> </div><div class='del'>-	for (vf = 0; vf &lt; num_vfs; vf++) {</div><div class='del'>-		status = be_cmd_pmac_add(adapter, mac,</div><div class='del'>-					adapter-&gt;vf_cfg[vf].vf_if_handle,</div><div class='del'>-					&amp;adapter-&gt;vf_cfg[vf].vf_pmac_id,</div><div class='del'>-					vf + 1);</div><div class='add'>+	for_all_vfs(adapter, vf_cfg, vf) {</div><div class='add'>+		if (lancer_chip(adapter)) {</div><div class='add'>+			status = be_cmd_set_mac_list(adapter,  mac, 1, vf + 1);</div><div class='add'>+		} else {</div><div class='add'>+			status = be_cmd_pmac_add(adapter, mac,</div><div class='add'>+						 vf_cfg-&gt;if_handle,</div><div class='add'>+						 &amp;vf_cfg-&gt;pmac_id, vf + 1);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='del'>-				"Mac address add failed for VF %d\n", vf);</div><div class='add'>+			"Mac address assignment failed for VF %d\n", vf);</div><div class='ctx'> 		else</div><div class='del'>-			memcpy(adapter-&gt;vf_cfg[vf].vf_mac_addr, mac, ETH_ALEN);</div><div class='add'>+			memcpy(vf_cfg-&gt;mac_addr, mac, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 		mac[5] += 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2486,24 +2525,23 @@ static inline int be_vf_eth_addr_config(struct be_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> static void be_vf_clear(struct be_adapter *adapter)</div><div class='ctx'> {</div><div class='add'>+	struct be_vf_cfg *vf_cfg;</div><div class='ctx'> 	u32 vf;</div><div class='ctx'> </div><div class='del'>-	for (vf = 0; vf &lt; num_vfs; vf++) {</div><div class='del'>-		if (adapter-&gt;vf_cfg[vf].vf_pmac_id != BE_INVALID_PMAC_ID)</div><div class='del'>-			be_cmd_pmac_del(adapter,</div><div class='del'>-					adapter-&gt;vf_cfg[vf].vf_if_handle,</div><div class='del'>-					adapter-&gt;vf_cfg[vf].vf_pmac_id, vf + 1);</div><div class='del'>-	}</div><div class='add'>+	for_all_vfs(adapter, vf_cfg, vf) {</div><div class='add'>+		if (lancer_chip(adapter))</div><div class='add'>+			be_cmd_set_mac_list(adapter, NULL, 0, vf + 1);</div><div class='add'>+		else</div><div class='add'>+			be_cmd_pmac_del(adapter, vf_cfg-&gt;if_handle,</div><div class='add'>+					vf_cfg-&gt;pmac_id, vf + 1);</div><div class='ctx'> </div><div class='del'>-	for (vf = 0; vf &lt; num_vfs; vf++)</div><div class='del'>-		if (adapter-&gt;vf_cfg[vf].vf_if_handle)</div><div class='del'>-			be_cmd_if_destroy(adapter,</div><div class='del'>-				adapter-&gt;vf_cfg[vf].vf_if_handle, vf + 1);</div><div class='add'>+		be_cmd_if_destroy(adapter, vf_cfg-&gt;if_handle, vf + 1);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int be_clear(struct be_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	if (be_physfn(adapter) &amp;&amp; adapter-&gt;sriov_enabled)</div><div class='add'>+	if (sriov_enabled(adapter))</div><div class='ctx'> 		be_vf_clear(adapter);</div><div class='ctx'> </div><div class='ctx'> 	be_cmd_if_destroy(adapter, adapter-&gt;if_handle,  0);</div><div class='hunk'>@@ -2511,61 +2549,94 @@ static int be_clear(struct be_adapter *adapter)</div><div class='ctx'> 	be_mcc_queues_destroy(adapter);</div><div class='ctx'> 	be_rx_queues_destroy(adapter);</div><div class='ctx'> 	be_tx_queues_destroy(adapter);</div><div class='del'>-	adapter-&gt;eq_next_idx = 0;</div><div class='del'>-</div><div class='del'>-	adapter-&gt;be3_native = false;</div><div class='del'>-	adapter-&gt;promiscuous = false;</div><div class='ctx'> </div><div class='ctx'> 	/* tell fw we're done with firing cmds */</div><div class='ctx'> 	be_cmd_fw_clean(adapter);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void be_vf_setup_init(struct be_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct be_vf_cfg *vf_cfg;</div><div class='add'>+	int vf;</div><div class='add'>+</div><div class='add'>+	for_all_vfs(adapter, vf_cfg, vf) {</div><div class='add'>+		vf_cfg-&gt;if_handle = -1;</div><div class='add'>+		vf_cfg-&gt;pmac_id = -1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int be_vf_setup(struct be_adapter *adapter)</div><div class='ctx'> {</div><div class='add'>+	struct be_vf_cfg *vf_cfg;</div><div class='ctx'> 	u32 cap_flags, en_flags, vf;</div><div class='ctx'> 	u16 lnk_speed;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	cap_flags = en_flags = BE_IF_FLAGS_UNTAGGED | BE_IF_FLAGS_BROADCAST;</div><div class='del'>-	for (vf = 0; vf &lt; num_vfs; vf++) {</div><div class='add'>+	be_vf_setup_init(adapter);</div><div class='add'>+</div><div class='add'>+	cap_flags = en_flags = BE_IF_FLAGS_UNTAGGED | BE_IF_FLAGS_BROADCAST |</div><div class='add'>+				BE_IF_FLAGS_MULTICAST;</div><div class='add'>+	for_all_vfs(adapter, vf_cfg, vf) {</div><div class='ctx'> 		status = be_cmd_if_create(adapter, cap_flags, en_flags, NULL,</div><div class='del'>-					&amp;adapter-&gt;vf_cfg[vf].vf_if_handle,</div><div class='del'>-					NULL, vf+1);</div><div class='add'>+					  &amp;vf_cfg-&gt;if_handle, NULL, vf + 1);</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			goto err;</div><div class='del'>-		adapter-&gt;vf_cfg[vf].vf_pmac_id = BE_INVALID_PMAC_ID;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!lancer_chip(adapter)) {</div><div class='del'>-		status = be_vf_eth_addr_config(adapter);</div><div class='del'>-		if (status)</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='add'>+	status = be_vf_eth_addr_config(adapter);</div><div class='add'>+	if (status)</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='del'>-	for (vf = 0; vf &lt; num_vfs; vf++) {</div><div class='add'>+	for_all_vfs(adapter, vf_cfg, vf) {</div><div class='ctx'> 		status = be_cmd_link_status_query(adapter, NULL, &amp;lnk_speed,</div><div class='del'>-				vf + 1);</div><div class='add'>+						  NULL, vf + 1);</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			goto err;</div><div class='del'>-		adapter-&gt;vf_cfg[vf].vf_tx_rate = lnk_speed * 10;</div><div class='add'>+		vf_cfg-&gt;tx_rate = lnk_speed * 10;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> err:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void be_setup_init(struct be_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	adapter-&gt;vlan_prio_bmap = 0xff;</div><div class='add'>+	adapter-&gt;link_speed = -1;</div><div class='add'>+	adapter-&gt;if_handle = -1;</div><div class='add'>+	adapter-&gt;be3_native = false;</div><div class='add'>+	adapter-&gt;promiscuous = false;</div><div class='add'>+	adapter-&gt;eq_next_idx = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int be_configure_mac_from_list(struct be_adapter *adapter, u8 *mac)</div><div class='add'>+{</div><div class='add'>+	u32 pmac_id;</div><div class='add'>+	int status = be_cmd_get_mac_from_list(adapter, 0, &amp;pmac_id);</div><div class='add'>+	if (status != 0)</div><div class='add'>+		goto do_none;</div><div class='add'>+	status = be_cmd_mac_addr_query(adapter, mac,</div><div class='add'>+			MAC_ADDRESS_TYPE_NETWORK,</div><div class='add'>+			false, adapter-&gt;if_handle, pmac_id);</div><div class='add'>+	if (status != 0)</div><div class='add'>+		goto do_none;</div><div class='add'>+	status = be_cmd_pmac_add(adapter, mac, adapter-&gt;if_handle,</div><div class='add'>+			&amp;adapter-&gt;pmac_id, 0);</div><div class='add'>+do_none:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int be_setup(struct be_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> 	u32 cap_flags, en_flags;</div><div class='ctx'> 	u32 tx_fc, rx_fc;</div><div class='del'>-	int status;</div><div class='add'>+	int status, i;</div><div class='ctx'> 	u8 mac[ETH_ALEN];</div><div class='add'>+	struct be_tx_obj *txo;</div><div class='ctx'> </div><div class='del'>-	/* Allow all priorities by default. A GRP5 evt may modify this */</div><div class='del'>-	adapter-&gt;vlan_prio_bmap = 0xff;</div><div class='del'>-	adapter-&gt;link_speed = -1;</div><div class='add'>+	be_setup_init(adapter);</div><div class='ctx'> </div><div class='ctx'> 	be_cmd_req_native_mode(adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -2583,7 +2654,7 @@ static int be_setup(struct be_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	memset(mac, 0, ETH_ALEN);</div><div class='ctx'> 	status = be_cmd_mac_addr_query(adapter, mac, MAC_ADDRESS_TYPE_NETWORK,</div><div class='del'>-			true /*permanent */, 0);</div><div class='add'>+			true /*permanent */, 0, 0);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return status;</div><div class='ctx'> 	memcpy(adapter-&gt;netdev-&gt;dev_addr, mac, ETH_ALEN);</div><div class='hunk'>@@ -2592,7 +2663,8 @@ static int be_setup(struct be_adapter *adapter)</div><div class='ctx'> 	en_flags = BE_IF_FLAGS_UNTAGGED | BE_IF_FLAGS_BROADCAST |</div><div class='ctx'> 			BE_IF_FLAGS_MULTICAST | BE_IF_FLAGS_PASS_L3L4_ERRORS;</div><div class='ctx'> 	cap_flags = en_flags | BE_IF_FLAGS_MCAST_PROMISCUOUS |</div><div class='del'>-			BE_IF_FLAGS_PROMISCUOUS;</div><div class='add'>+			BE_IF_FLAGS_VLAN_PROMISCUOUS | BE_IF_FLAGS_PROMISCUOUS;</div><div class='add'>+</div><div class='ctx'> 	if (adapter-&gt;function_caps &amp; BE_FUNCTION_CAPS_RSS) {</div><div class='ctx'> 		cap_flags |= BE_IF_FLAGS_RSS;</div><div class='ctx'> 		en_flags |= BE_IF_FLAGS_RSS;</div><div class='hunk'>@@ -2603,12 +2675,23 @@ static int be_setup(struct be_adapter *adapter)</div><div class='ctx'> 	if (status != 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	/* For BEx, the VF's permanent mac queried from card is incorrect.</div><div class='del'>-	 * Query the mac configued by the PF using if_handle</div><div class='del'>-	 */</div><div class='del'>-	if (!be_physfn(adapter) &amp;&amp; !lancer_chip(adapter)) {</div><div class='del'>-		status = be_cmd_mac_addr_query(adapter, mac,</div><div class='del'>-			MAC_ADDRESS_TYPE_NETWORK, false, adapter-&gt;if_handle);</div><div class='add'>+	 for_all_tx_queues(adapter, txo, i) {</div><div class='add'>+		status = be_cmd_txq_create(adapter, &amp;txo-&gt;q, &amp;txo-&gt;cq);</div><div class='add'>+		if (status)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	 /* The VF's permanent mac queried from card is incorrect.</div><div class='add'>+	  * For BEx: Query the mac configued by the PF using if_handle</div><div class='add'>+	  * For Lancer: Get and use mac_list to obtain mac address.</div><div class='add'>+	  */</div><div class='add'>+	if (!be_physfn(adapter)) {</div><div class='add'>+		if (lancer_chip(adapter))</div><div class='add'>+			status = be_configure_mac_from_list(adapter, mac);</div><div class='add'>+		else</div><div class='add'>+			status = be_cmd_mac_addr_query(adapter, mac,</div><div class='add'>+					MAC_ADDRESS_TYPE_NETWORK, false,</div><div class='add'>+					adapter-&gt;if_handle, 0);</div><div class='ctx'> 		if (!status) {</div><div class='ctx'> 			memcpy(adapter-&gt;netdev-&gt;dev_addr, mac, ETH_ALEN);</div><div class='ctx'> 			memcpy(adapter-&gt;netdev-&gt;perm_addr, mac, ETH_ALEN);</div><div class='hunk'>@@ -2624,18 +2707,21 @@ static int be_setup(struct be_adapter *adapter)</div><div class='ctx'> 	be_set_rx_mode(adapter-&gt;netdev);</div><div class='ctx'> </div><div class='ctx'> 	status = be_cmd_get_flow_control(adapter, &amp;tx_fc, &amp;rx_fc);</div><div class='del'>-	if (status)</div><div class='add'>+	/* For Lancer: It is legal for this cmd to fail on VF */</div><div class='add'>+	if (status &amp;&amp; (be_physfn(adapter) || !lancer_chip(adapter)))</div><div class='ctx'> 		goto err;</div><div class='add'>+</div><div class='ctx'> 	if (rx_fc != adapter-&gt;rx_fc || tx_fc != adapter-&gt;tx_fc) {</div><div class='ctx'> 		status = be_cmd_set_flow_control(adapter, adapter-&gt;tx_fc,</div><div class='ctx'> 					adapter-&gt;rx_fc);</div><div class='del'>-		if (status)</div><div class='add'>+		/* For Lancer: It is legal for this cmd to fail on VF */</div><div class='add'>+		if (status &amp;&amp; (be_physfn(adapter) || !lancer_chip(adapter)))</div><div class='ctx'> 			goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pcie_set_readrq(adapter-&gt;pdev, 4096);</div><div class='ctx'> </div><div class='del'>-	if (be_physfn(adapter) &amp;&amp; adapter-&gt;sriov_enabled) {</div><div class='add'>+	if (sriov_enabled(adapter)) {</div><div class='ctx'> 		status = be_vf_setup(adapter);</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -2647,6 +2733,19 @@ err:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='add'>+static void be_netpoll(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct be_rx_obj *rxo;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	event_handle(adapter, &amp;adapter-&gt;tx_eq, false);</div><div class='add'>+	for_all_rx_queues(adapter, rxo, i)</div><div class='add'>+		event_handle(adapter, &amp;rxo-&gt;rx_eq, true);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define FW_FILE_HDR_SIGN 	"ServerEngines Corp. "</div><div class='ctx'> static bool be_flash_redboot(struct be_adapter *adapter,</div><div class='ctx'> 			const u8 *p, u32 img_start, int image_size,</div><div class='hunk'>@@ -2981,7 +3080,7 @@ fw_exit:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct net_device_ops be_netdev_ops = {</div><div class='add'>+static const struct net_device_ops be_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= be_open,</div><div class='ctx'> 	.ndo_stop		= be_close,</div><div class='ctx'> 	.ndo_start_xmit		= be_xmit,</div><div class='hunk'>@@ -2995,7 +3094,10 @@ static struct net_device_ops be_netdev_ops = {</div><div class='ctx'> 	.ndo_set_vf_mac		= be_set_vf_mac,</div><div class='ctx'> 	.ndo_set_vf_vlan	= be_set_vf_vlan,</div><div class='ctx'> 	.ndo_set_vf_tx_rate	= be_set_vf_tx_rate,</div><div class='del'>-	.ndo_get_vf_config	= be_get_vf_config</div><div class='add'>+	.ndo_get_vf_config	= be_get_vf_config,</div><div class='add'>+#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='add'>+	.ndo_poll_controller	= be_netpoll,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void be_netdev_init(struct net_device *netdev)</div><div class='hunk'>@@ -3242,6 +3344,7 @@ static int be_dev_family_check(struct be_adapter *adapter)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BE_DEVICE_ID2:</div><div class='ctx'> 	case OC_DEVICE_ID2:</div><div class='add'>+	case OC_DEVICE_ID5:</div><div class='ctx'> 		adapter-&gt;generation = BE_GEN3;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case OC_DEVICE_ID3:</div><div class='hunk'>@@ -3267,7 +3370,7 @@ static int be_dev_family_check(struct be_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> static int lancer_wait_ready(struct be_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-#define SLIPORT_READY_TIMEOUT 500</div><div class='add'>+#define SLIPORT_READY_TIMEOUT 30</div><div class='ctx'> 	u32 sliport_status;</div><div class='ctx'> 	int status = 0, i;</div><div class='ctx'> </div><div class='hunk'>@@ -3276,7 +3379,7 @@ static int lancer_wait_ready(struct be_adapter *adapter)</div><div class='ctx'> 		if (sliport_status &amp; SLIPORT_STATUS_RDY_MASK)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		msleep(20);</div><div class='add'>+		msleep(1000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (i == SLIPORT_READY_TIMEOUT)</div><div class='hunk'>@@ -3313,6 +3416,104 @@ static int lancer_test_and_set_rdy_state(struct be_adapter *adapter)</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void lancer_test_and_recover_fn_err(struct be_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	u32 sliport_status;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;eeh_err || adapter-&gt;ue_detected)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sliport_status = ioread32(adapter-&gt;db + SLIPORT_STATUS_OFFSET);</div><div class='add'>+</div><div class='add'>+	if (sliport_status &amp; SLIPORT_STATUS_ERR_MASK) {</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+				"Adapter in error state."</div><div class='add'>+				"Trying to recover.\n");</div><div class='add'>+</div><div class='add'>+		status = lancer_test_and_set_rdy_state(adapter);</div><div class='add'>+		if (status)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		netif_device_detach(adapter-&gt;netdev);</div><div class='add'>+</div><div class='add'>+		if (netif_running(adapter-&gt;netdev))</div><div class='add'>+			be_close(adapter-&gt;netdev);</div><div class='add'>+</div><div class='add'>+		be_clear(adapter);</div><div class='add'>+</div><div class='add'>+		adapter-&gt;fw_timeout = false;</div><div class='add'>+</div><div class='add'>+		status = be_setup(adapter);</div><div class='add'>+		if (status)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		if (netif_running(adapter-&gt;netdev)) {</div><div class='add'>+			status = be_open(adapter-&gt;netdev);</div><div class='add'>+			if (status)</div><div class='add'>+				goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netif_device_attach(adapter-&gt;netdev);</div><div class='add'>+</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+				"Adapter error recovery succeeded\n");</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+err:</div><div class='add'>+	dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+			"Adapter error recovery failed\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void be_worker(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct be_adapter *adapter =</div><div class='add'>+		container_of(work, struct be_adapter, work.work);</div><div class='add'>+	struct be_rx_obj *rxo;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (lancer_chip(adapter))</div><div class='add'>+		lancer_test_and_recover_fn_err(adapter);</div><div class='add'>+</div><div class='add'>+	be_detect_dump_ue(adapter);</div><div class='add'>+</div><div class='add'>+	/* when interrupts are not yet enabled, just reap any pending</div><div class='add'>+	* mcc completions */</div><div class='add'>+	if (!netif_running(adapter-&gt;netdev)) {</div><div class='add'>+		int mcc_compl, status = 0;</div><div class='add'>+</div><div class='add'>+		mcc_compl = be_process_mcc(adapter, &amp;status);</div><div class='add'>+</div><div class='add'>+		if (mcc_compl) {</div><div class='add'>+			struct be_mcc_obj *mcc_obj = &amp;adapter-&gt;mcc_obj;</div><div class='add'>+			be_cq_notify(adapter, mcc_obj-&gt;cq.id, false, mcc_compl);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		goto reschedule;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!adapter-&gt;stats_cmd_sent) {</div><div class='add'>+		if (lancer_chip(adapter))</div><div class='add'>+			lancer_cmd_get_pport_stats(adapter,</div><div class='add'>+						&amp;adapter-&gt;stats_cmd);</div><div class='add'>+		else</div><div class='add'>+			be_cmd_get_stats(adapter, &amp;adapter-&gt;stats_cmd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_all_rx_queues(adapter, rxo, i) {</div><div class='add'>+		be_rx_eqd_update(adapter, rxo);</div><div class='add'>+</div><div class='add'>+		if (rxo-&gt;rx_post_starved) {</div><div class='add'>+			rxo-&gt;rx_post_starved = false;</div><div class='add'>+			be_post_rx_frags(rxo, GFP_KERNEL);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+reschedule:</div><div class='add'>+	adapter-&gt;work_counter++;</div><div class='add'>+	schedule_delayed_work(&amp;adapter-&gt;work, msecs_to_jiffies(1000));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __devinit be_probe(struct pci_dev *pdev,</div><div class='ctx'> 			const struct pci_device_id *pdev_id)</div><div class='ctx'> {</div><div class='hunk'>@@ -3365,7 +3566,12 @@ static int __devinit be_probe(struct pci_dev *pdev,</div><div class='ctx'> 		goto disable_sriov;</div><div class='ctx'> </div><div class='ctx'> 	if (lancer_chip(adapter)) {</div><div class='del'>-		status = lancer_test_and_set_rdy_state(adapter);</div><div class='add'>+		status = lancer_wait_ready(adapter);</div><div class='add'>+		if (!status) {</div><div class='add'>+			iowrite32(SLI_PORT_CONTROL_IP_MASK,</div><div class='add'>+					adapter-&gt;db + SLIPORT_CONTROL_OFFSET);</div><div class='add'>+			status = lancer_test_and_set_rdy_state(adapter);</div><div class='add'>+		}</div><div class='ctx'> 		if (status) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "Adapter in non recoverable error\n");</div><div class='ctx'> 			goto ctrl_clean;</div><div class='hunk'>@@ -3559,6 +3765,8 @@ static pci_ers_result_t be_eeh_reset(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;adapter-&gt;pdev-&gt;dev, "EEH reset\n");</div><div class='ctx'> 	adapter-&gt;eeh_err = false;</div><div class='add'>+	adapter-&gt;ue_detected = false;</div><div class='add'>+	adapter-&gt;fw_timeout = false;</div><div class='ctx'> </div><div class='ctx'> 	status = pci_enable_device(pdev);</div><div class='ctx'> 	if (status)</div><div class='head'>diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c<br/>index 251b635fe75a..60f0e788cc25 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/ethoc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/ethoc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/ethoc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/ethoc.c</a></div><div class='hunk'>@@ -1185,18 +1185,7 @@ static struct platform_driver ethoc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ethoc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ethoc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ethoc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ethoc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ethoc_init);</div><div class='del'>-module_exit(ethoc_exit);</div><div class='add'>+module_platform_driver(ethoc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Thierry Reding &lt;thierry.reding@avionic-design.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("OpenCores Ethernet MAC driver");</div><div class='head'>diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c<br/>index 61d2bddec1fa..c82d444b582d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/fealnx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/fealnx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/fealnx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/fealnx.c</a></div><div class='hunk'>@@ -1818,9 +1818,9 @@ static void netdev_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *i</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/Kconfig b/drivers/net/ethernet/freescale/Kconfig<br/>index 9de37642f09f..3574e1499dfc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/freescale/Kconfig</a></div><div class='hunk'>@@ -21,7 +21,7 @@ config NET_VENDOR_FREESCALE</div><div class='ctx'> if NET_VENDOR_FREESCALE</div><div class='ctx'> </div><div class='ctx'> config FEC</div><div class='del'>-	bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"</div><div class='add'>+	tristate "FEC ethernet controller (of ColdFire and some i.MX CPUs)"</div><div class='ctx'> 	depends on (M523x || M527x || M5272 || M528x || M520x || M532x || \</div><div class='ctx'> 		   ARCH_MXC || SOC_IMX28)</div><div class='ctx'> 	default ARCH_MXC || SOC_IMX28 if ARM</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c<br/>index c136230d50bb..7b25e9cf13f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/fec.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/fec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/fec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/freescale/fec.c</a></div><div class='hunk'>@@ -99,7 +99,7 @@ static struct platform_device_id fec_devtype[] = {</div><div class='ctx'> MODULE_DEVICE_TABLE(platform, fec_devtype);</div><div class='ctx'> </div><div class='ctx'> enum imx_fec_type {</div><div class='del'>-	IMX25_FEC = 1, 	/* runs on i.mx25/50/53 */</div><div class='add'>+	IMX25_FEC = 1,	/* runs on i.mx25/50/53 */</div><div class='ctx'> 	IMX27_FEC,	/* runs on i.mx27/35/51 */</div><div class='ctx'> 	IMX28_FEC,</div><div class='ctx'> 	IMX6Q_FEC,</div><div class='hunk'>@@ -132,7 +132,7 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address");</div><div class='ctx'> #elif defined (CONFIG_M5272C3)</div><div class='ctx'> #define	FEC_FLASHMAC	(0xffe04000 + 4)</div><div class='ctx'> #elif defined(CONFIG_MOD5272)</div><div class='del'>-#define FEC_FLASHMAC 	0xffc0406b</div><div class='add'>+#define FEC_FLASHMAC	0xffc0406b</div><div class='ctx'> #else</div><div class='ctx'> #define	FEC_FLASHMAC	0</div><div class='ctx'> #endif</div><div class='hunk'>@@ -255,11 +255,13 @@ struct fec_enet_private {</div><div class='ctx'> #define FEC_MMFR_TA		(2 &lt;&lt; 16)</div><div class='ctx'> #define FEC_MMFR_DATA(v)	(v &amp; 0xffff)</div><div class='ctx'> </div><div class='del'>-#define FEC_MII_TIMEOUT		1000 /* us */</div><div class='add'>+#define FEC_MII_TIMEOUT		30000 /* us */</div><div class='ctx'> </div><div class='ctx'> /* Transmitter timeout */</div><div class='ctx'> #define TX_TIMEOUT (2 * HZ)</div><div class='ctx'> </div><div class='add'>+static int mii_cnt;</div><div class='add'>+</div><div class='ctx'> static void *swap_buffer(void *bufaddr, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -474,6 +476,7 @@ fec_restart(struct net_device *ndev, int duplex)</div><div class='ctx'> 	} else {</div><div class='ctx'> #ifdef FEC_MIIGSK_ENR</div><div class='ctx'> 		if (id_entry-&gt;driver_data &amp; FEC_QUIRK_USE_GASKET) {</div><div class='add'>+			u32 cfgr;</div><div class='ctx'> 			/* disable the gasket and wait */</div><div class='ctx'> 			writel(0, fep-&gt;hwp + FEC_MIIGSK_ENR);</div><div class='ctx'> 			while (readl(fep-&gt;hwp + FEC_MIIGSK_ENR) &amp; 4)</div><div class='hunk'>@@ -484,9 +487,11 @@ fec_restart(struct net_device *ndev, int duplex)</div><div class='ctx'> 			 *   RMII, 50 MHz, no loopback, no echo</div><div class='ctx'> 			 *   MII, 25 MHz, no loopback, no echo</div><div class='ctx'> 			 */</div><div class='del'>-			writel((fep-&gt;phy_interface == PHY_INTERFACE_MODE_RMII) ?</div><div class='del'>-					1 : 0, fep-&gt;hwp + FEC_MIIGSK_CFGR);</div><div class='del'>-</div><div class='add'>+			cfgr = (fep-&gt;phy_interface == PHY_INTERFACE_MODE_RMII)</div><div class='add'>+				? BM_MIIGSK_CFGR_RMII : BM_MIIGSK_CFGR_MII;</div><div class='add'>+			if (fep-&gt;phy_dev &amp;&amp; fep-&gt;phy_dev-&gt;speed == SPEED_10)</div><div class='add'>+				cfgr |= BM_MIIGSK_CFGR_FRCONT_10M;</div><div class='add'>+			writel(cfgr, fep-&gt;hwp + FEC_MIIGSK_CFGR);</div><div class='ctx'> </div><div class='ctx'> 			/* re-enable the gasket */</div><div class='ctx'> 			writel(2, fep-&gt;hwp + FEC_MIIGSK_ENR);</div><div class='hunk'>@@ -516,6 +521,7 @@ fec_stop(struct net_device *ndev)</div><div class='ctx'> 	struct fec_enet_private *fep = netdev_priv(ndev);</div><div class='ctx'> 	const struct platform_device_id *id_entry =</div><div class='ctx'> 				platform_get_device_id(fep-&gt;pdev);</div><div class='add'>+	u32 rmii_mode = readl(fep-&gt;hwp + FEC_R_CNTRL) &amp; (1 &lt;&lt; 8);</div><div class='ctx'> </div><div class='ctx'> 	/* We cannot expect a graceful transmit stop without link !!! */</div><div class='ctx'> 	if (fep-&gt;link) {</div><div class='hunk'>@@ -532,8 +538,10 @@ fec_stop(struct net_device *ndev)</div><div class='ctx'> 	writel(FEC_DEFAULT_IMASK, fep-&gt;hwp + FEC_IMASK);</div><div class='ctx'> </div><div class='ctx'> 	/* We have to keep ENET enabled to have MII interrupt stay working */</div><div class='del'>-	if (id_entry-&gt;driver_data &amp; FEC_QUIRK_ENET_MAC)</div><div class='add'>+	if (id_entry-&gt;driver_data &amp; FEC_QUIRK_ENET_MAC) {</div><div class='ctx'> 		writel(2, fep-&gt;hwp + FEC_ECNTRL);</div><div class='add'>+		writel(rmii_mode, fep-&gt;hwp + FEC_R_CNTRL);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -819,7 +827,7 @@ static void __inline__ fec_get_mac(struct net_device *ndev)</div><div class='ctx'> 			iap = (unsigned char *)FEC_FLASHMAC;</div><div class='ctx'> #else</div><div class='ctx'> 		if (pdata)</div><div class='del'>-			memcpy(iap, pdata-&gt;mac, ETH_ALEN);</div><div class='add'>+			iap = (unsigned char *)&amp;pdata-&gt;mac;</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -866,6 +874,8 @@ static void fec_enet_adjust_link(struct net_device *ndev)</div><div class='ctx'> 	if (phy_dev-&gt;link) {</div><div class='ctx'> 		if (fep-&gt;full_duplex != phy_dev-&gt;duplex) {</div><div class='ctx'> 			fec_restart(ndev, phy_dev-&gt;duplex);</div><div class='add'>+			/* prevent unnecessary second fec_restart() below */</div><div class='add'>+			fep-&gt;link = phy_dev-&gt;link;</div><div class='ctx'> 			status_change = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -973,8 +983,9 @@ static int fec_enet_mii_probe(struct net_device *ndev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (phy_id &gt;= PHY_MAX_ADDR) {</div><div class='del'>-		printk(KERN_INFO "%s: no PHY, assuming direct connection "</div><div class='del'>-			"to switch\n", ndev-&gt;name);</div><div class='add'>+		printk(KERN_INFO</div><div class='add'>+			"%s: no PHY, assuming direct connection to switch\n",</div><div class='add'>+			ndev-&gt;name);</div><div class='ctx'> 		strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE);</div><div class='ctx'> 		phy_id = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -999,8 +1010,9 @@ static int fec_enet_mii_probe(struct net_device *ndev)</div><div class='ctx'> 	fep-&gt;link = 0;</div><div class='ctx'> 	fep-&gt;full_duplex = 0;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s: Freescale FEC PHY driver [%s] "</div><div class='del'>-		"(mii_bus:phy_addr=%s, irq=%d)\n", ndev-&gt;name,</div><div class='add'>+	printk(KERN_INFO</div><div class='add'>+		"%s: Freescale FEC PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",</div><div class='add'>+		ndev-&gt;name,</div><div class='ctx'> 		fep-&gt;phy_dev-&gt;drv-&gt;name, dev_name(&amp;fep-&gt;phy_dev-&gt;dev),</div><div class='ctx'> 		fep-&gt;phy_dev-&gt;irq);</div><div class='ctx'> </div><div class='hunk'>@@ -1034,8 +1046,12 @@ static int fec_enet_mii_init(struct platform_device *pdev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((id_entry-&gt;driver_data &amp; FEC_QUIRK_ENET_MAC) &amp;&amp; fep-&gt;dev_id &gt; 0) {</div><div class='ctx'> 		/* fec1 uses fec0 mii_bus */</div><div class='del'>-		fep-&gt;mii_bus = fec0_mii_bus;</div><div class='del'>-		return 0;</div><div class='add'>+		if (mii_cnt &amp;&amp; fec0_mii_bus) {</div><div class='add'>+			fep-&gt;mii_bus = fec0_mii_bus;</div><div class='add'>+			mii_cnt++;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fep-&gt;mii_timeout = 0;</div><div class='hunk'>@@ -1064,7 +1080,8 @@ static int fec_enet_mii_init(struct platform_device *pdev)</div><div class='ctx'> 	fep-&gt;mii_bus-&gt;read = fec_enet_mdio_read;</div><div class='ctx'> 	fep-&gt;mii_bus-&gt;write = fec_enet_mdio_write;</div><div class='ctx'> 	fep-&gt;mii_bus-&gt;reset = fec_enet_mdio_reset;</div><div class='del'>-	snprintf(fep-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%x", fep-&gt;dev_id + 1);</div><div class='add'>+	snprintf(fep-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%s-%x",</div><div class='add'>+		pdev-&gt;name, fep-&gt;dev_id + 1);</div><div class='ctx'> 	fep-&gt;mii_bus-&gt;priv = fep;</div><div class='ctx'> 	fep-&gt;mii_bus-&gt;parent = &amp;pdev-&gt;dev;</div><div class='ctx'> </div><div class='hunk'>@@ -1080,6 +1097,8 @@ static int fec_enet_mii_init(struct platform_device *pdev)</div><div class='ctx'> 	if (mdiobus_register(fep-&gt;mii_bus))</div><div class='ctx'> 		goto err_out_free_mdio_irq;</div><div class='ctx'> </div><div class='add'>+	mii_cnt++;</div><div class='add'>+</div><div class='ctx'> 	/* save fec0 mii_bus */</div><div class='ctx'> 	if (id_entry-&gt;driver_data &amp; FEC_QUIRK_ENET_MAC)</div><div class='ctx'> 		fec0_mii_bus = fep-&gt;mii_bus;</div><div class='hunk'>@@ -1096,11 +1115,11 @@ err_out:</div><div class='ctx'> </div><div class='ctx'> static void fec_enet_mii_remove(struct fec_enet_private *fep)</div><div class='ctx'> {</div><div class='del'>-	if (fep-&gt;phy_dev)</div><div class='del'>-		phy_disconnect(fep-&gt;phy_dev);</div><div class='del'>-	mdiobus_unregister(fep-&gt;mii_bus);</div><div class='del'>-	kfree(fep-&gt;mii_bus-&gt;irq);</div><div class='del'>-	mdiobus_free(fep-&gt;mii_bus);</div><div class='add'>+	if (--mii_cnt == 0) {</div><div class='add'>+		mdiobus_unregister(fep-&gt;mii_bus);</div><div class='add'>+		kfree(fep-&gt;mii_bus-&gt;irq);</div><div class='add'>+		mdiobus_free(fep-&gt;mii_bus);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fec_enet_get_settings(struct net_device *ndev,</div><div class='hunk'>@@ -1137,7 +1156,7 @@ static void fec_enet_get_drvinfo(struct net_device *ndev,</div><div class='ctx'> 	strcpy(info-&gt;bus_info, dev_name(&amp;ndev-&gt;dev));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ethtool_ops fec_enet_ethtool_ops = {</div><div class='add'>+static const struct ethtool_ops fec_enet_ethtool_ops = {</div><div class='ctx'> 	.get_settings		= fec_enet_get_settings,</div><div class='ctx'> 	.set_settings		= fec_enet_set_settings,</div><div class='ctx'> 	.get_drvinfo		= fec_enet_get_drvinfo,</div><div class='hunk'>@@ -1574,8 +1593,12 @@ fec_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; FEC_IRQ_NUM; i++) {</div><div class='ctx'> 		irq = platform_get_irq(pdev, i);</div><div class='del'>-		if (i &amp;&amp; irq &lt; 0)</div><div class='del'>-			break;</div><div class='add'>+		if (irq &lt; 0) {</div><div class='add'>+			if (i)</div><div class='add'>+				break;</div><div class='add'>+			ret = irq;</div><div class='add'>+			goto failed_irq;</div><div class='add'>+		}</div><div class='ctx'> 		ret = request_irq(irq, fec_enet_interrupt, IRQF_DISABLED, pdev-&gt;name, ndev);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			while (--i &gt;= 0) {</div><div class='hunk'>@@ -1586,12 +1609,12 @@ fec_probe(struct platform_device *pdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fep-&gt;clk = clk_get(&amp;pdev-&gt;dev, "fec_clk");</div><div class='add'>+	fep-&gt;clk = clk_get(&amp;pdev-&gt;dev, NULL);</div><div class='ctx'> 	if (IS_ERR(fep-&gt;clk)) {</div><div class='ctx'> 		ret = PTR_ERR(fep-&gt;clk);</div><div class='ctx'> 		goto failed_clk;</div><div class='ctx'> 	}</div><div class='del'>-	clk_enable(fep-&gt;clk);</div><div class='add'>+	clk_prepare_enable(fep-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	ret = fec_enet_init(ndev);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1614,7 +1637,7 @@ failed_register:</div><div class='ctx'> 	fec_enet_mii_remove(fep);</div><div class='ctx'> failed_mii_init:</div><div class='ctx'> failed_init:</div><div class='del'>-	clk_disable(fep-&gt;clk);</div><div class='add'>+	clk_disable_unprepare(fep-&gt;clk);</div><div class='ctx'> 	clk_put(fep-&gt;clk);</div><div class='ctx'> failed_clk:</div><div class='ctx'> 	for (i = 0; i &lt; FEC_IRQ_NUM; i++) {</div><div class='hunk'>@@ -1638,13 +1661,18 @@ fec_drv_remove(struct platform_device *pdev)</div><div class='ctx'> 	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct fec_enet_private *fep = netdev_priv(ndev);</div><div class='ctx'> 	struct resource *r;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	fec_stop(ndev);</div><div class='add'>+	unregister_netdev(ndev);</div><div class='ctx'> 	fec_enet_mii_remove(fep);</div><div class='del'>-	clk_disable(fep-&gt;clk);</div><div class='add'>+	for (i = 0; i &lt; FEC_IRQ_NUM; i++) {</div><div class='add'>+		int irq = platform_get_irq(pdev, i);</div><div class='add'>+		if (irq &gt; 0)</div><div class='add'>+			free_irq(irq, ndev);</div><div class='add'>+	}</div><div class='add'>+	clk_disable_unprepare(fep-&gt;clk);</div><div class='ctx'> 	clk_put(fep-&gt;clk);</div><div class='ctx'> 	iounmap(fep-&gt;hwp);</div><div class='del'>-	unregister_netdev(ndev);</div><div class='ctx'> 	free_netdev(ndev);</div><div class='ctx'> </div><div class='ctx'> 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='hunk'>@@ -1667,7 +1695,7 @@ fec_suspend(struct device *dev)</div><div class='ctx'> 		fec_stop(ndev);</div><div class='ctx'> 		netif_device_detach(ndev);</div><div class='ctx'> 	}</div><div class='del'>-	clk_disable(fep-&gt;clk);</div><div class='add'>+	clk_disable_unprepare(fep-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1678,7 +1706,7 @@ fec_resume(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='del'>-	clk_enable(fep-&gt;clk);</div><div class='add'>+	clk_prepare_enable(fep-&gt;clk);</div><div class='ctx'> 	if (netif_running(ndev)) {</div><div class='ctx'> 		fec_restart(ndev, fep-&gt;full_duplex);</div><div class='ctx'> 		netif_device_attach(ndev);</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h<br/>index 8b2c6d797e6d..8408c627b195 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/fec.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/fec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/fec.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/freescale/fec.h</a></div><div class='hunk'>@@ -47,6 +47,10 @@</div><div class='ctx'> #define FEC_MIIGSK_CFGR		0x300 /* MIIGSK Configuration reg */</div><div class='ctx'> #define FEC_MIIGSK_ENR		0x308 /* MIIGSK Enable reg */</div><div class='ctx'> </div><div class='add'>+#define BM_MIIGSK_CFGR_MII		0x00</div><div class='add'>+#define BM_MIIGSK_CFGR_RMII		0x01</div><div class='add'>+#define BM_MIIGSK_CFGR_FRCONT_10M	0x40</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> #define FEC_ECNTRL		0x000 /* Ethernet control reg */</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 5bf5471f06ff..910a8e18a9ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c</a></div><div class='hunk'>@@ -1171,16 +1171,6 @@ static struct platform_driver fs_enet_driver = {</div><div class='ctx'> 	.remove = fs_enet_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init fs_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;fs_enet_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit fs_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;fs_enet_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> static void fs_enet_netpoll(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1190,7 +1180,4 @@ static void fs_enet_netpoll(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/**************************************************************************************/</div><div class='del'>-</div><div class='del'>-module_init(fs_init);</div><div class='del'>-module_exit(fs_cleanup);</div><div class='add'>+module_platform_driver(fs_enet_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c<br/>index b09270b5d0a5..0f2d1a710909 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c</a></div><div class='hunk'>@@ -232,15 +232,4 @@ static struct platform_driver fs_enet_bb_mdio_driver = {</div><div class='ctx'> 	.remove = fs_enet_mdio_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int fs_enet_mdio_bb_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;fs_enet_bb_mdio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void fs_enet_mdio_bb_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;fs_enet_bb_mdio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(fs_enet_mdio_bb_init);</div><div class='del'>-module_exit(fs_enet_mdio_bb_exit);</div><div class='add'>+module_platform_driver(fs_enet_bb_mdio_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c<br/>index e0e9d6c35d83..55bb867258e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/fs_enet/mii-fec.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/fs_enet/mii-fec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/fs_enet/mii-fec.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/freescale/fs_enet/mii-fec.c</a></div><div class='hunk'>@@ -237,15 +237,4 @@ static struct platform_driver fs_enet_fec_mdio_driver = {</div><div class='ctx'> 	.remove = fs_enet_mdio_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int fs_enet_mdio_fec_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;fs_enet_fec_mdio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void fs_enet_mdio_fec_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;fs_enet_fec_mdio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(fs_enet_mdio_fec_init);</div><div class='del'>-module_exit(fs_enet_mdio_fec_exit);</div><div class='add'>+module_platform_driver(fs_enet_fec_mdio_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c<br/>index 4d9f84b8ab97..9eb815941df5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/fsl_pq_mdio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/fsl_pq_mdio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/fsl_pq_mdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/freescale/fsl_pq_mdio.c</a></div><div class='hunk'>@@ -360,12 +360,11 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev)</div><div class='ctx'> </div><div class='ctx'> 	if (tbiaddr == -1) {</div><div class='ctx'> 		err = -EBUSY;</div><div class='del'>-</div><div class='ctx'> 		goto err_free_irqs;</div><div class='add'>+	} else {</div><div class='add'>+		out_be32(tbipa, tbiaddr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	out_be32(tbipa, tbiaddr);</div><div class='del'>-</div><div class='ctx'> 	err = of_mdiobus_register(new_bus, np);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk (KERN_ERR "%s: Cannot register as MDIO bus\n",</div><div class='hunk'>@@ -443,15 +442,6 @@ static struct platform_driver fsl_pq_mdio_driver = {</div><div class='ctx'> 	.remove = fsl_pq_mdio_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __init fsl_pq_mdio_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;fsl_pq_mdio_driver);</div><div class='del'>-}</div><div class='del'>-module_init(fsl_pq_mdio_init);</div><div class='add'>+module_platform_driver(fsl_pq_mdio_driver);</div><div class='ctx'> </div><div class='del'>-void fsl_pq_mdio_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;fsl_pq_mdio_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(fsl_pq_mdio_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c<br/>index 83199fd0d62b..39d160d353a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/gianfar.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/gianfar.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/gianfar.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/freescale/gianfar.c</a></div><div class='hunk'>@@ -734,7 +734,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'> 	if (mac_addr)</div><div class='del'>-		memcpy(dev-&gt;dev_addr, mac_addr, MAC_ADDR_LEN);</div><div class='add'>+		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='ctx'> 		priv-&gt;device_flags =</div><div class='hunk'>@@ -1984,7 +1984,8 @@ static inline struct txfcb *gfar_add_fcb(struct sk_buff *skb)</div><div class='ctx'> 	return fcb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb)</div><div class='add'>+static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb,</div><div class='add'>+		int fcb_length)</div><div class='ctx'> {</div><div class='ctx'> 	u8 flags = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2006,7 +2007,7 @@ static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb)</div><div class='ctx'> 	 * frame (skb-&gt;data) and the start of the IP hdr.</div><div class='ctx'> 	 * l4os is the distance between the start of the</div><div class='ctx'> 	 * l3 hdr and the l4 hdr */</div><div class='del'>-	fcb-&gt;l3os = (u16)(skb_network_offset(skb) - GMAC_FCB_LEN);</div><div class='add'>+	fcb-&gt;l3os = (u16)(skb_network_offset(skb) - fcb_length);</div><div class='ctx'> 	fcb-&gt;l4os = skb_network_header_len(skb);</div><div class='ctx'> </div><div class='ctx'> 	fcb-&gt;flags = flags;</div><div class='hunk'>@@ -2046,7 +2047,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	int i, rq = 0, do_tstamp = 0;</div><div class='ctx'> 	u32 bufaddr;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	unsigned int nr_frags, nr_txbds, length;</div><div class='add'>+	unsigned int nr_frags, nr_txbds, length, fcb_length = GMAC_FCB_LEN;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * TOE=1 frames larger than 2500 bytes may see excess delays</div><div class='hunk'>@@ -2070,22 +2071,28 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* check if time stamp should be generated */</div><div class='ctx'> 	if (unlikely(skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP &amp;&amp;</div><div class='del'>-		     priv-&gt;hwts_tx_en))</div><div class='add'>+			priv-&gt;hwts_tx_en)) {</div><div class='ctx'> 		do_tstamp = 1;</div><div class='add'>+		fcb_length = GMAC_FCB_LEN + GMAC_TXPAL_LEN;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* make space for additional header when fcb is needed */</div><div class='ctx'> 	if (((skb-&gt;ip_summed == CHECKSUM_PARTIAL) ||</div><div class='ctx'> 			vlan_tx_tag_present(skb) ||</div><div class='ctx'> 			unlikely(do_tstamp)) &amp;&amp;</div><div class='del'>-			(skb_headroom(skb) &lt; GMAC_FCB_LEN)) {</div><div class='add'>+			(skb_headroom(skb) &lt; fcb_length)) {</div><div class='ctx'> 		struct sk_buff *skb_new;</div><div class='ctx'> </div><div class='del'>-		skb_new = skb_realloc_headroom(skb, GMAC_FCB_LEN);</div><div class='add'>+		skb_new = skb_realloc_headroom(skb, fcb_length);</div><div class='ctx'> 		if (!skb_new) {</div><div class='ctx'> 			dev-&gt;stats.tx_errors++;</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			return NETDEV_TX_OK;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/* Steal sock reference for processing TX time stamps */</div><div class='add'>+		swap(skb_new-&gt;sk, skb-&gt;sk);</div><div class='add'>+		swap(skb_new-&gt;destructor, skb-&gt;destructor);</div><div class='ctx'> 		kfree_skb(skb);</div><div class='ctx'> 		skb = skb_new;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2154,6 +2161,12 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		lstatus = txbdp_start-&gt;lstatus;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Add TxPAL between FCB and frame if required */</div><div class='add'>+	if (unlikely(do_tstamp)) {</div><div class='add'>+		skb_push(skb, GMAC_TXPAL_LEN);</div><div class='add'>+		memset(skb-&gt;data, 0, GMAC_TXPAL_LEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Set up checksumming */</div><div class='ctx'> 	if (CHECKSUM_PARTIAL == skb-&gt;ip_summed) {</div><div class='ctx'> 		fcb = gfar_add_fcb(skb);</div><div class='hunk'>@@ -2164,7 +2177,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			skb_checksum_help(skb);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			lstatus |= BD_LFLAG(TXBD_TOE);</div><div class='del'>-			gfar_tx_checksum(skb, fcb);</div><div class='add'>+			gfar_tx_checksum(skb, fcb, fcb_length);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2196,9 +2209,9 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	 * the full frame length.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (unlikely(do_tstamp)) {</div><div class='del'>-		txbdp_tstamp-&gt;bufPtr = txbdp_start-&gt;bufPtr + GMAC_FCB_LEN;</div><div class='add'>+		txbdp_tstamp-&gt;bufPtr = txbdp_start-&gt;bufPtr + fcb_length;</div><div class='ctx'> 		txbdp_tstamp-&gt;lstatus |= BD_LFLAG(TXBD_READY) |</div><div class='del'>-				(skb_headlen(skb) - GMAC_FCB_LEN);</div><div class='add'>+				(skb_headlen(skb) - fcb_length);</div><div class='ctx'> 		lstatus |= BD_LFLAG(TXBD_CRC | TXBD_READY) | GMAC_FCB_LEN;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		lstatus |= BD_LFLAG(TXBD_CRC | TXBD_READY) | skb_headlen(skb);</div><div class='hunk'>@@ -2306,7 +2319,7 @@ void gfar_check_rx_parser_mode(struct gfar_private *priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Enables and disables VLAN insertion/extraction */</div><div class='del'>-void gfar_vlan_mode(struct net_device *dev, u32 features)</div><div class='add'>+void gfar_vlan_mode(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfar_private *priv = netdev_priv(dev);</div><div class='ctx'> 	struct gfar __iomem *regs = NULL;</div><div class='hunk'>@@ -2490,7 +2503,7 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_IN_PROGRESS)) {</div><div class='ctx'> 			next = next_txbd(bdp, base, tx_ring_size);</div><div class='del'>-			buflen = next-&gt;length + GMAC_FCB_LEN;</div><div class='add'>+			buflen = next-&gt;length + GMAC_FCB_LEN + GMAC_TXPAL_LEN;</div><div class='ctx'> 		} else</div><div class='ctx'> 			buflen = bdp-&gt;length;</div><div class='ctx'> </div><div class='hunk'>@@ -2502,6 +2515,7 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)</div><div class='ctx'> 			u64 *ns = (u64*) (((u32)skb-&gt;data + 0x10) &amp; ~0x7);</div><div class='ctx'> 			memset(&amp;shhwtstamps, 0, sizeof(shhwtstamps));</div><div class='ctx'> 			shhwtstamps.hwtstamp = ns_to_ktime(*ns);</div><div class='add'>+			skb_pull(skb, GMAC_FCB_LEN + GMAC_TXPAL_LEN);</div><div class='ctx'> 			skb_tstamp_tx(skb, &amp;shhwtstamps);</div><div class='ctx'> 			bdp-&gt;lstatus &amp;= BD_LFLAG(TXBD_WRAP);</div><div class='ctx'> 			bdp = next;</div><div class='hunk'>@@ -3114,7 +3128,7 @@ static void gfar_set_multi(struct net_device *dev)</div><div class='ctx'> static void gfar_clear_exact_match(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int idx;</div><div class='del'>-	static const u8 zero_arr[MAC_ADDR_LEN] = {0, 0, 0, 0, 0, 0};</div><div class='add'>+	static const u8 zero_arr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};</div><div class='ctx'> </div><div class='ctx'> 	for(idx = 1;idx &lt; GFAR_EM_NUM + 1;idx++)</div><div class='ctx'> 		gfar_set_mac_for_addr(dev, idx, zero_arr);</div><div class='hunk'>@@ -3137,7 +3151,7 @@ static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tempval;</div><div class='ctx'> 	struct gfar_private *priv = netdev_priv(dev);</div><div class='del'>-	u32 result = ether_crc(MAC_ADDR_LEN, addr);</div><div class='add'>+	u32 result = ether_crc(ETH_ALEN, addr);</div><div class='ctx'> 	int width = priv-&gt;hash_width;</div><div class='ctx'> 	u8 whichbit = (result &gt;&gt; (32 - width)) &amp; 0x1f;</div><div class='ctx'> 	u8 whichreg = result &gt;&gt; (32 - width + 5);</div><div class='hunk'>@@ -3158,7 +3172,7 @@ static void gfar_set_mac_for_addr(struct net_device *dev, int num,</div><div class='ctx'> 	struct gfar_private *priv = netdev_priv(dev);</div><div class='ctx'> 	struct gfar __iomem *regs = priv-&gt;gfargrp[0].regs;</div><div class='ctx'> 	int idx;</div><div class='del'>-	char tmpbuf[MAC_ADDR_LEN];</div><div class='add'>+	char tmpbuf[ETH_ALEN];</div><div class='ctx'> 	u32 tempval;</div><div class='ctx'> 	u32 __iomem *macptr = &amp;regs-&gt;macstnaddr1;</div><div class='ctx'> </div><div class='hunk'>@@ -3166,8 +3180,8 @@ static void gfar_set_mac_for_addr(struct net_device *dev, int num,</div><div class='ctx'> </div><div class='ctx'> 	/* Now copy it into the mac registers backwards, cuz */</div><div class='ctx'> 	/* little endian is silly */</div><div class='del'>-	for (idx = 0; idx &lt; MAC_ADDR_LEN; idx++)</div><div class='del'>-		tmpbuf[MAC_ADDR_LEN - 1 - idx] = addr[idx];</div><div class='add'>+	for (idx = 0; idx &lt; ETH_ALEN; idx++)</div><div class='add'>+		tmpbuf[ETH_ALEN - 1 - idx] = addr[idx];</div><div class='ctx'> </div><div class='ctx'> 	gfar_write(macptr, *((u32 *) (tmpbuf)));</div><div class='ctx'> </div><div class='hunk'>@@ -3281,16 +3295,4 @@ static struct platform_driver gfar_driver = {</div><div class='ctx'> 	.remove = gfar_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init gfar_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;gfar_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit gfar_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;gfar_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(gfar_init);</div><div class='del'>-module_exit(gfar_exit);</div><div class='del'>-</div><div class='add'>+module_platform_driver(gfar_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h<br/>index 9aa43773e8e3..40c33a7554c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/gianfar.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/gianfar.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/gianfar.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/freescale/gianfar.h</a></div><div class='hunk'>@@ -63,6 +63,9 @@ struct ethtool_rx_list {</div><div class='ctx'> /* Length for FCB */</div><div class='ctx'> #define GMAC_FCB_LEN 8</div><div class='ctx'> </div><div class='add'>+/* Length for TxPAL */</div><div class='add'>+#define GMAC_TXPAL_LEN 16</div><div class='add'>+</div><div class='ctx'> /* Default padding amount */</div><div class='ctx'> #define DEFAULT_PADDING 2</div><div class='ctx'> </div><div class='hunk'>@@ -74,9 +77,6 @@ struct ethtool_rx_list {</div><div class='ctx'>  * will be the next highest multiple of 512 bytes. */</div><div class='ctx'> #define INCREMENTAL_BUFFER_SIZE 512</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define MAC_ADDR_LEN 6</div><div class='del'>-</div><div class='ctx'> #define PHY_INIT_TIMEOUT 100000</div><div class='ctx'> #define GFAR_PHY_CHANGE_TIME 2</div><div class='ctx'> </div><div class='hunk'>@@ -1179,9 +1179,9 @@ extern void gfar_phy_test(struct mii_bus *bus, struct phy_device *phydev,</div><div class='ctx'> extern void gfar_configure_coalescing(struct gfar_private *priv,</div><div class='ctx'> 		unsigned long tx_mask, unsigned long rx_mask);</div><div class='ctx'> void gfar_init_sysfs(struct net_device *dev);</div><div class='del'>-int gfar_set_features(struct net_device *dev, u32 features);</div><div class='add'>+int gfar_set_features(struct net_device *dev, netdev_features_t features);</div><div class='ctx'> extern void gfar_check_rx_parser_mode(struct gfar_private *priv);</div><div class='del'>-extern void gfar_vlan_mode(struct net_device *dev, u32 features);</div><div class='add'>+extern void gfar_vlan_mode(struct net_device *dev, netdev_features_t features);</div><div class='ctx'> </div><div class='ctx'> extern const struct ethtool_ops gfar_ethtool_ops;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c<br/>index 212736bab6bb..5a3b2e5b2880 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/gianfar_ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/gianfar_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/gianfar_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/freescale/gianfar_ethtool.c</a></div><div class='hunk'>@@ -519,12 +519,12 @@ static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rva</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int gfar_set_features(struct net_device *dev, u32 features)</div><div class='add'>+int gfar_set_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct gfar_private *priv = netdev_priv(dev);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int err = 0, i = 0;</div><div class='del'>-	u32 changed = dev-&gt;features ^ features;</div><div class='add'>+	netdev_features_t changed = dev-&gt;features ^ features;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; (NETIF_F_HW_VLAN_TX|NETIF_F_HW_VLAN_RX))</div><div class='ctx'> 		gfar_vlan_mode(dev, features);</div><div class='hunk'>@@ -1410,10 +1410,9 @@ static int gfar_optimize_filer_masks(struct filer_table *tab)</div><div class='ctx'> </div><div class='ctx'> 	/* We need a copy of the filer table because</div><div class='ctx'> 	 * we want to change its order */</div><div class='del'>-	temp_table = kmalloc(sizeof(*temp_table), GFP_KERNEL);</div><div class='add'>+	temp_table = kmemdup(tab, sizeof(*temp_table), GFP_KERNEL);</div><div class='ctx'> 	if (temp_table == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	memcpy(temp_table, tab, sizeof(*temp_table));</div><div class='ctx'> </div><div class='ctx'> 	mask_table = kcalloc(MAX_FILER_CACHE_IDX / 2 + 1,</div><div class='ctx'> 			sizeof(struct gfar_mask_entry), GFP_KERNEL);</div><div class='hunk'>@@ -1693,8 +1692,9 @@ static int gfar_set_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd)</div><div class='ctx'> 		ret = gfar_set_hash_opts(priv, cmd);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ETHTOOL_SRXCLSRLINS:</div><div class='del'>-		if (cmd-&gt;fs.ring_cookie != RX_CLS_FLOW_DISC &amp;&amp;</div><div class='del'>-			cmd-&gt;fs.ring_cookie &gt;= priv-&gt;num_rx_queues) {</div><div class='add'>+		if ((cmd-&gt;fs.ring_cookie != RX_CLS_FLOW_DISC &amp;&amp;</div><div class='add'>+		     cmd-&gt;fs.ring_cookie &gt;= priv-&gt;num_rx_queues) ||</div><div class='add'>+		    cmd-&gt;fs.location &gt;= MAX_FILER_IDX) {</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c<br/>index f67b8aebc89c..83e0ed757e33 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/gianfar_ptp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/gianfar_ptp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/gianfar_ptp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/freescale/gianfar_ptp.c</a></div><div class='hunk'>@@ -562,21 +562,7 @@ static struct platform_driver gianfar_ptp_driver = {</div><div class='ctx'> 	.remove      = gianfar_ptp_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* module operations */</div><div class='del'>-</div><div class='del'>-static int __init ptp_gianfar_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;gianfar_ptp_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ptp_gianfar_init);</div><div class='del'>-</div><div class='del'>-static void __exit ptp_gianfar_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;gianfar_ptp_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_exit(ptp_gianfar_exit);</div><div class='add'>+module_platform_driver(gianfar_ptp_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Richard Cochran &lt;richard.cochran@omicron.at&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("PTP clock using the eTSEC");</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c<br/>index b5dc0273a1d1..ba2dc083bfc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/ucc_geth.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/ucc_geth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/ucc_geth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/freescale/ucc_geth.c</a></div><div class='hunk'>@@ -443,7 +443,7 @@ static void hw_add_addr_in_hash(struct ucc_geth_private *ugeth,</div><div class='ctx'> </div><div class='ctx'> static inline int compare_addr(u8 **addr1, u8 **addr2)</div><div class='ctx'> {</div><div class='del'>-	return memcmp(addr1, addr2, ENET_NUM_OCTETS_PER_ADDRESS);</div><div class='add'>+	return memcmp(addr1, addr2, ETH_ALEN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/ucc_geth.h b/drivers/net/ethernet/freescale/ucc_geth.h<br/>index d12fcad145e9..2e395a2566b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/ucc_geth.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/freescale/ucc_geth.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/freescale/ucc_geth.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/freescale/ucc_geth.h</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/immap_qe.h&gt;</div><div class='ctx'> #include &lt;asm/qe.h&gt;</div><div class='hunk'>@@ -881,7 +882,6 @@ struct ucc_geth_hardware_statistics {</div><div class='ctx'> #define TX_RING_MOD_MASK(size)                  (size-1)</div><div class='ctx'> #define RX_RING_MOD_MASK(size)                  (size-1)</div><div class='ctx'> </div><div class='del'>-#define ENET_NUM_OCTETS_PER_ADDRESS             6</div><div class='ctx'> #define ENET_GROUP_ADDR                         0x01	/* Group address mask</div><div class='ctx'> 							   for ethernet</div><div class='ctx'> 							   addresses */</div><div class='hunk'>@@ -1051,7 +1051,7 @@ enum ucc_geth_num_of_station_addresses {</div><div class='ctx'> </div><div class='ctx'> /* UCC GETH 82xx Ethernet Address Container */</div><div class='ctx'> struct enet_addr_container {</div><div class='del'>-	u8 address[ENET_NUM_OCTETS_PER_ADDRESS];	/* ethernet address */</div><div class='add'>+	u8 address[ETH_ALEN];	/* ethernet address */</div><div class='ctx'> 	enum ucc_geth_enet_address_recognition_location location;	/* location in</div><div class='ctx'> 								   82xx address</div><div class='ctx'> 								   recognition</div><div class='hunk'>@@ -1194,7 +1194,7 @@ struct ucc_geth_private {</div><div class='ctx'> 	u16 cpucount[NUM_TX_QUEUES];</div><div class='ctx'> 	u16 __iomem *p_cpucount[NUM_TX_QUEUES];</div><div class='ctx'> 	int indAddrRegUsed[NUM_OF_PADDRS];</div><div class='del'>-	u8 paddr[NUM_OF_PADDRS][ENET_NUM_OCTETS_PER_ADDRESS];	/* ethernet address */</div><div class='add'>+	u8 paddr[NUM_OF_PADDRS][ETH_ALEN];	/* ethernet address */</div><div class='ctx'> 	u8 numGroupAddrInHash;</div><div class='ctx'> 	u8 numIndAddrInHash;</div><div class='ctx'> 	u8 numIndAddrInReg;</div><div class='head'>diff --git a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c<br/>index 15416752c13e..ee84b472cee6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/fujitsu/fmvj18x_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/fujitsu/fmvj18x_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/fujitsu/fmvj18x_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/fujitsu/fmvj18x_cs.c</a></div><div class='hunk'>@@ -1058,9 +1058,10 @@ static void fjn_rx(struct net_device *dev)</div><div class='ctx'> static void netdev_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 			       struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	sprintf(info-&gt;bus_info, "PCMCIA 0x%lx", dev-&gt;base_addr);</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	snprintf(info-&gt;bus_info, sizeof(info-&gt;bus_info),</div><div class='add'>+		"PCMCIA 0x%lx", dev-&gt;base_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops netdev_ethtool_ops = {</div><div class='head'>diff --git a/drivers/net/ethernet/i825xx/eepro.c b/drivers/net/ethernet/i825xx/eepro.c<br/>index 067c46069a11..114cda7721fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/i825xx/eepro.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/i825xx/eepro.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/i825xx/eepro.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/i825xx/eepro.c</a></div><div class='hunk'>@@ -1726,9 +1726,10 @@ static int eepro_ethtool_get_settings(struct net_device *dev,</div><div class='ctx'> static void eepro_ethtool_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 					struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> {</div><div class='del'>-	strcpy(drvinfo-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(drvinfo-&gt;version, DRV_VERSION);</div><div class='del'>-	sprintf(drvinfo-&gt;bus_info, "ISA 0x%lx", dev-&gt;base_addr);</div><div class='add'>+	strlcpy(drvinfo-&gt;driver, DRV_NAME, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, DRV_VERSION, sizeof(drvinfo-&gt;version));</div><div class='add'>+	snprintf(drvinfo-&gt;bus_info, sizeof(drvinfo-&gt;bus_info),</div><div class='add'>+		"ISA 0x%lx", dev-&gt;base_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops eepro_ethtool_ops = {</div><div class='head'>diff --git a/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c b/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c<br/>index 05b7359bde8d..6bdd8e36e564 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/ibm/ehea/ehea_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/ibm/ehea/ehea_ethtool.c</a></div><div class='hunk'>@@ -263,7 +263,7 @@ static void ehea_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'> 		data[i++] = atomic_read(&amp;port-&gt;port_res[k].swqe_avail);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct ethtool_ops ehea_ethtool_ops = {</div><div class='add'>+static const struct ethtool_ops ehea_ethtool_ops = {</div><div class='ctx'> 	.get_settings = ehea_get_settings,</div><div class='ctx'> 	.get_drvinfo = ehea_get_drvinfo,</div><div class='ctx'> 	.get_msglevel = ehea_get_msglevel,</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 bfeccbfde236..5d5fb2627184 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/ibm/ehea/ehea_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/ibm/ehea/ehea_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/ibm/ehea/ehea_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/ibm/ehea/ehea_main.c</a></div><div class='hunk'>@@ -94,8 +94,8 @@ static int port_name_cnt;</div><div class='ctx'> static LIST_HEAD(adapter_list);</div><div class='ctx'> static unsigned long ehea_driver_flags;</div><div class='ctx'> static DEFINE_MUTEX(dlpar_mem_lock);</div><div class='del'>-struct ehea_fw_handle_array ehea_fw_handles;</div><div class='del'>-struct ehea_bcmc_reg_array ehea_bcmc_regs;</div><div class='add'>+static struct ehea_fw_handle_array ehea_fw_handles;</div><div class='add'>+static struct ehea_bcmc_reg_array ehea_bcmc_regs;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int __devinit ehea_probe_adapter(struct platform_device *dev,</div><div class='hunk'>@@ -133,7 +133,7 @@ void ehea_dump(void *adr, int len, char *msg)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ehea_schedule_port_reset(struct ehea_port *port)</div><div class='add'>+static void ehea_schedule_port_reset(struct ehea_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	if (!test_bit(__EHEA_DISABLE_PORT_RESET, &amp;port-&gt;flags))</div><div class='ctx'> 		schedule_work(&amp;port-&gt;reset_task);</div><div class='hunk'>@@ -1404,7 +1404,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ehea_gen_smrs(struct ehea_port_res *pr)</div><div class='add'>+static int ehea_gen_smrs(struct ehea_port_res *pr)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct ehea_adapter *adapter = pr-&gt;port-&gt;adapter;</div><div class='hunk'>@@ -1426,7 +1426,7 @@ out:</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ehea_rem_smrs(struct ehea_port_res *pr)</div><div class='add'>+static int ehea_rem_smrs(struct ehea_port_res *pr)</div><div class='ctx'> {</div><div class='ctx'> 	if ((ehea_rem_mr(&amp;pr-&gt;send_mr)) ||</div><div class='ctx'> 	    (ehea_rem_mr(&amp;pr-&gt;recv_mr)))</div><div class='hunk'>@@ -2114,17 +2114,19 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ehea_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='add'>+static int ehea_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ehea_port *port = netdev_priv(dev);</div><div class='ctx'> 	struct ehea_adapter *adapter = port-&gt;adapter;</div><div class='ctx'> 	struct hcp_ehea_port_cb1 *cb1;</div><div class='ctx'> 	int index;</div><div class='ctx'> 	u64 hret;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	cb1 = (void *)get_zeroed_page(GFP_KERNEL);</div><div class='ctx'> 	if (!cb1) {</div><div class='ctx'> 		pr_err("no mem for cb1\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2132,6 +2134,7 @@ static void ehea_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> 				      H_PORT_CB1, H_PORT_CB1_ALL, cb1);</div><div class='ctx'> 	if (hret != H_SUCCESS) {</div><div class='ctx'> 		pr_err("query_ehea_port failed\n");</div><div class='add'>+		err = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2140,24 +2143,28 @@ static void ehea_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> </div><div class='ctx'> 	hret = ehea_h_modify_ehea_port(adapter-&gt;handle, port-&gt;logical_port_id,</div><div class='ctx'> 				       H_PORT_CB1, H_PORT_CB1_ALL, cb1);</div><div class='del'>-	if (hret != H_SUCCESS)</div><div class='add'>+	if (hret != H_SUCCESS) {</div><div class='ctx'> 		pr_err("modify_ehea_port failed\n");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='ctx'> 	free_page((unsigned long)cb1);</div><div class='del'>-	return;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ehea_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='add'>+static int ehea_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ehea_port *port = netdev_priv(dev);</div><div class='ctx'> 	struct ehea_adapter *adapter = port-&gt;adapter;</div><div class='ctx'> 	struct hcp_ehea_port_cb1 *cb1;</div><div class='ctx'> 	int index;</div><div class='ctx'> 	u64 hret;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	cb1 = (void *)get_zeroed_page(GFP_KERNEL);</div><div class='ctx'> 	if (!cb1) {</div><div class='ctx'> 		pr_err("no mem for cb1\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2165,6 +2172,7 @@ static void ehea_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> 				      H_PORT_CB1, H_PORT_CB1_ALL, cb1);</div><div class='ctx'> 	if (hret != H_SUCCESS) {</div><div class='ctx'> 		pr_err("query_ehea_port failed\n");</div><div class='add'>+		err = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2173,13 +2181,16 @@ static void ehea_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> </div><div class='ctx'> 	hret = ehea_h_modify_ehea_port(adapter-&gt;handle, port-&gt;logical_port_id,</div><div class='ctx'> 				       H_PORT_CB1, H_PORT_CB1_ALL, cb1);</div><div class='del'>-	if (hret != H_SUCCESS)</div><div class='add'>+	if (hret != H_SUCCESS) {</div><div class='ctx'> 		pr_err("modify_ehea_port failed\n");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='ctx'> 	free_page((unsigned long)cb1);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ehea_activate_qp(struct ehea_adapter *adapter, struct ehea_qp *qp)</div><div class='add'>+static int ehea_activate_qp(struct ehea_adapter *adapter, struct ehea_qp *qp)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -EIO;</div><div class='ctx'> 	u64 hret;</div><div class='hunk'>@@ -2520,7 +2531,7 @@ static void ehea_flush_sq(struct ehea_port *port)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ehea_stop_qps(struct net_device *dev)</div><div class='add'>+static int ehea_stop_qps(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ehea_port *port = netdev_priv(dev);</div><div class='ctx'> 	struct ehea_adapter *adapter = port-&gt;adapter;</div><div class='hunk'>@@ -2589,7 +2600,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ehea_update_rqs(struct ehea_qp *orig_qp, struct ehea_port_res *pr)</div><div class='add'>+static void ehea_update_rqs(struct ehea_qp *orig_qp, struct ehea_port_res *pr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ehea_qp qp = *orig_qp;</div><div class='ctx'> 	struct ehea_qp_init_attr *init_attr = &amp;qp.init_attr;</div><div class='hunk'>@@ -2622,7 +2633,7 @@ void ehea_update_rqs(struct ehea_qp *orig_qp, struct ehea_port_res *pr)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ehea_restart_qps(struct net_device *dev)</div><div class='add'>+static int ehea_restart_qps(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ehea_port *port = netdev_priv(dev);</div><div class='ctx'> 	struct ehea_adapter *adapter = port-&gt;adapter;</div><div class='hunk'>@@ -2813,7 +2824,7 @@ static void ehea_tx_watchdog(struct net_device *dev)</div><div class='ctx'> 		ehea_schedule_port_reset(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ehea_sense_adapter_attr(struct ehea_adapter *adapter)</div><div class='add'>+static int ehea_sense_adapter_attr(struct ehea_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct hcp_query_ehea *cb;</div><div class='ctx'> 	u64 hret;</div><div class='hunk'>@@ -2841,7 +2852,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ehea_get_jumboframe_status(struct ehea_port *port, int *jumbo)</div><div class='add'>+static int ehea_get_jumboframe_status(struct ehea_port *port, int *jumbo)</div><div class='ctx'> {</div><div class='ctx'> 	struct hcp_ehea_port_cb4 *cb4;</div><div class='ctx'> 	u64 hret;</div><div class='hunk'>@@ -2955,7 +2966,7 @@ static const struct net_device_ops ehea_netdev_ops = {</div><div class='ctx'> 	.ndo_tx_timeout		= ehea_tx_watchdog,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,</div><div class='add'>+static struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,</div><div class='ctx'> 					 u32 logical_port_id,</div><div class='ctx'> 					 struct device_node *dn)</div><div class='ctx'> {</div><div class='hunk'>@@ -3226,7 +3237,7 @@ static ssize_t ehea_remove_port(struct device *dev,</div><div class='ctx'> static DEVICE_ATTR(probe_port, S_IWUSR, NULL, ehea_probe_port);</div><div class='ctx'> static DEVICE_ATTR(remove_port, S_IWUSR, NULL, ehea_remove_port);</div><div class='ctx'> </div><div class='del'>-int ehea_create_device_sysfs(struct platform_device *dev)</div><div class='add'>+static int ehea_create_device_sysfs(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = device_create_file(&amp;dev-&gt;dev, &amp;dev_attr_probe_port);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -3237,7 +3248,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ehea_remove_device_sysfs(struct platform_device *dev)</div><div class='add'>+static void ehea_remove_device_sysfs(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	device_remove_file(&amp;dev-&gt;dev, &amp;dev_attr_probe_port);</div><div class='ctx'> 	device_remove_file(&amp;dev-&gt;dev, &amp;dev_attr_remove_port);</div><div class='hunk'>@@ -3368,7 +3379,7 @@ static int __devexit ehea_remove(struct platform_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ehea_crash_handler(void)</div><div class='add'>+static void ehea_crash_handler(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -3480,7 +3491,7 @@ static ssize_t ehea_show_capabilities(struct device_driver *drv,</div><div class='ctx'> static DRIVER_ATTR(capabilities, S_IRUSR | S_IRGRP | S_IROTH,</div><div class='ctx'> 		   ehea_show_capabilities, NULL);</div><div class='ctx'> </div><div class='del'>-int __init ehea_module_init(void)</div><div class='add'>+static int __init ehea_module_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</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 95b9f4fa811e..c25b05b94daa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/ibm/ehea/ehea_qmr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/ibm/ehea/ehea_qmr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/ibm/ehea/ehea_qmr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/ibm/ehea/ehea_qmr.c</a></div><div class='hunk'>@@ -34,9 +34,7 @@</div><div class='ctx'> #include "ehea_phyp.h"</div><div class='ctx'> #include "ehea_qmr.h"</div><div class='ctx'> </div><div class='del'>-struct ehea_bmap *ehea_bmap = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+static struct ehea_bmap *ehea_bmap;</div><div class='ctx'> </div><div class='ctx'> static void *hw_qpageit_get_inc(struct hw_queue *queue)</div><div class='ctx'> {</div><div class='hunk'>@@ -212,7 +210,7 @@ out_nomem:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u64 ehea_destroy_cq_res(struct ehea_cq *cq, u64 force)</div><div class='add'>+static u64 ehea_destroy_cq_res(struct ehea_cq *cq, u64 force)</div><div class='ctx'> {</div><div class='ctx'> 	u64 hret;</div><div class='ctx'> 	u64 adapter_handle = cq-&gt;adapter-&gt;handle;</div><div class='hunk'>@@ -337,7 +335,7 @@ struct ehea_eqe *ehea_poll_eq(struct ehea_eq *eq)</div><div class='ctx'> 	return eqe;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u64 ehea_destroy_eq_res(struct ehea_eq *eq, u64 force)</div><div class='add'>+static u64 ehea_destroy_eq_res(struct ehea_eq *eq, u64 force)</div><div class='ctx'> {</div><div class='ctx'> 	u64 hret;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -381,7 +379,7 @@ int ehea_destroy_eq(struct ehea_eq *eq)</div><div class='ctx'> /**</div><div class='ctx'>  * allocates memory for a queue and registers pages in phyp</div><div class='ctx'>  */</div><div class='del'>-int ehea_qp_alloc_register(struct ehea_qp *qp, struct hw_queue *hw_queue,</div><div class='add'>+static int ehea_qp_alloc_register(struct ehea_qp *qp, struct hw_queue *hw_queue,</div><div class='ctx'> 			   int nr_pages, int wqe_size, int act_nr_sges,</div><div class='ctx'> 			   struct ehea_adapter *adapter, int h_call_q_selector)</div><div class='ctx'> {</div><div class='hunk'>@@ -516,7 +514,7 @@ out_freemem:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u64 ehea_destroy_qp_res(struct ehea_qp *qp, u64 force)</div><div class='add'>+static u64 ehea_destroy_qp_res(struct ehea_qp *qp, u64 force)</div><div class='ctx'> {</div><div class='ctx'> 	u64 hret;</div><div class='ctx'> 	struct ehea_qp_init_attr *qp_attr = &amp;qp-&gt;init_attr;</div><div class='hunk'>@@ -976,7 +974,7 @@ int ehea_gen_smr(struct ehea_adapter *adapter, struct ehea_mr *old_mr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void print_error_data(u64 *data)</div><div class='add'>+static void print_error_data(u64 *data)</div><div class='ctx'> {</div><div class='ctx'> 	int length;</div><div class='ctx'> 	u64 type = EHEA_BMASK_GET(ERROR_DATA_TYPE, data[2]);</div><div class='head'>diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c<br/>index ed79b2d3ad3e..2abce965c7bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/ibm/emac/core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/ibm/emac/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/ibm/emac/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/ibm/emac/core.c</a></div><div class='hunk'>@@ -2924,6 +2924,9 @@ static int __devexit emac_remove(struct platform_device *ofdev)</div><div class='ctx'> 	if (emac_has_feature(dev, EMAC_FTR_HAS_ZMII))</div><div class='ctx'> 		zmii_detach(dev-&gt;zmii_dev, dev-&gt;zmii_port);</div><div class='ctx'> </div><div class='add'>+	busy_phy_map &amp;= ~(1 &lt;&lt; dev-&gt;phy.address);</div><div class='add'>+	DBG(dev, "busy_phy_map now %#x" NL, busy_phy_map);</div><div class='add'>+</div><div class='ctx'> 	mal_unregister_commac(dev-&gt;mal, &amp;dev-&gt;commac);</div><div class='ctx'> 	emac_put_deps(dev);</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 b1cd41b9c61c..e877371680a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/ibm/ibmveth.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/ibm/ibmveth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/ibm/ibmveth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/ibm/ibmveth.c</a></div><div class='hunk'>@@ -735,7 +735,8 @@ static void netdev_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 		sizeof(info-&gt;version) - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 ibmveth_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static netdev_features_t ibmveth_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since the ibmveth firmware interface does not have the</div><div class='hunk'>@@ -838,7 +839,8 @@ static int ibmveth_set_csum_offload(struct net_device *dev, u32 data)</div><div class='ctx'> 	return rc1 ? rc1 : rc2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ibmveth_set_features(struct net_device *dev, u32 features)</div><div class='add'>+static int ibmveth_set_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct ibmveth_adapter *adapter = netdev_priv(dev);</div><div class='ctx'> 	int rx_csum = !!(features &amp; NETIF_F_RXCSUM);</div><div class='head'>diff --git a/drivers/net/ethernet/icplus/ipg.c b/drivers/net/ethernet/icplus/ipg.c<br/>index 8fd80a00b898..075451d0207d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/icplus/ipg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/icplus/ipg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/icplus/ipg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/icplus/ipg.c</a></div><div class='hunk'>@@ -371,16 +371,9 @@ static void mdio_write(struct net_device *dev, int phy_id, int phy_reg, int val)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* The last cycle is a tri-state, so read from the PHY. */</div><div class='del'>-	for (j = 7; j &lt; 8; j++) {</div><div class='del'>-		for (i = 0; i &lt; p[j].len; i++) {</div><div class='del'>-			ipg_write_phy_ctl(ioaddr, IPG_PC_MGMTCLK_LO | polarity);</div><div class='del'>-</div><div class='del'>-			p[j].field |= ((ipg_r8(PHY_CTRL) &amp;</div><div class='del'>-				IPG_PC_MGMTDATA) &gt;&gt; 1) &lt;&lt; (p[j].len - 1 - i);</div><div class='del'>-</div><div class='del'>-			ipg_write_phy_ctl(ioaddr, IPG_PC_MGMTCLK_HI | polarity);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	ipg_write_phy_ctl(ioaddr, IPG_PC_MGMTCLK_LO | polarity);</div><div class='add'>+	ipg_r8(PHY_CTRL);</div><div class='add'>+	ipg_write_phy_ctl(ioaddr, IPG_PC_MGMTCLK_HI | polarity);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ipg_set_led_mode(struct net_device *dev)</div><div class='head'>diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c<br/>index 5a2fdf7a00c8..9436397e5725 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/e100.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/e100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/e100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/e100.c</a></div><div class='hunk'>@@ -2376,10 +2376,10 @@ static void e100_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> 	struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct nic *nic = netdev_priv(netdev);</div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;fw_version, "N/A");</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(nic-&gt;pdev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(nic-&gt;pdev),</div><div class='add'>+		sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define E100_PHY_REGS 0x1C</div><div class='head'>diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c<br/>index 2b223ac99c42..3103f0b6bf5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/e1000/e1000_ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/e1000/e1000_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/e1000/e1000_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/e1000/e1000_ethtool.c</a></div><div class='hunk'>@@ -515,14 +515,14 @@ static void e1000_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> 			      struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	char firmware_version[32];</div><div class='ctx'> </div><div class='del'>-	strncpy(drvinfo-&gt;driver,  e1000_driver_name, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;version, e1000_driver_version, 32);</div><div class='add'>+	strlcpy(drvinfo-&gt;driver,  e1000_driver_name,</div><div class='add'>+		sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, e1000_driver_version,</div><div class='add'>+		sizeof(drvinfo-&gt;version));</div><div class='ctx'> </div><div class='del'>-	sprintf(firmware_version, "N/A");</div><div class='del'>-	strncpy(drvinfo-&gt;fw_version, firmware_version, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev), 32);</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	drvinfo-&gt;regdump_len = e1000_get_regs_len(netdev);</div><div class='ctx'> 	drvinfo-&gt;eedump_len = e1000_get_eeprom_len(netdev);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/intel/e1000/e1000_hw.h b/drivers/net/ethernet/intel/e1000/e1000_hw.h<br/>index 5c9a8403668b..f6c4d7e2560c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/e1000/e1000_hw.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/e1000/e1000_hw.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/e1000/e1000_hw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/e1000/e1000_hw.h</a></div><div class='hunk'>@@ -448,7 +448,6 @@ void e1000_io_write(struct e1000_hw *hw, unsigned long port, u32 value);</div><div class='ctx'> #define E1000_DEV_ID_INTEL_CE4100_GBE    0x2E6E</div><div class='ctx'> </div><div class='ctx'> #define NODE_ADDRESS_SIZE 6</div><div class='del'>-#define ETH_LENGTH_OF_ADDRESS 6</div><div class='ctx'> </div><div class='ctx'> /* MAC decode size is 128K - This is the size of BAR0 */</div><div class='ctx'> #define MAC_DECODE_SIZE (128 * 1024)</div><div class='hunk'>@@ -813,8 +812,7 @@ struct e1000_ffvt_entry {</div><div class='ctx'> #define E1000_FLA      0x0001C	/* Flash Access - RW */</div><div class='ctx'> #define E1000_MDIC     0x00020	/* MDI Control - RW */</div><div class='ctx'> </div><div class='del'>-extern void __iomem *ce4100_gbe_mdio_base_virt;</div><div class='del'>-#define INTEL_CE_GBE_MDIO_RCOMP_BASE    (ce4100_gbe_mdio_base_virt)</div><div class='add'>+#define INTEL_CE_GBE_MDIO_RCOMP_BASE    (hw-&gt;ce4100_gbe_mdio_base_virt)</div><div class='ctx'> #define E1000_MDIO_STS  (INTEL_CE_GBE_MDIO_RCOMP_BASE + 0)</div><div class='ctx'> #define E1000_MDIO_CMD  (INTEL_CE_GBE_MDIO_RCOMP_BASE + 4)</div><div class='ctx'> #define E1000_MDIO_DRV  (INTEL_CE_GBE_MDIO_RCOMP_BASE + 8)</div><div class='hunk'>@@ -1344,6 +1342,7 @@ struct e1000_hw_stats {</div><div class='ctx'> struct e1000_hw {</div><div class='ctx'> 	u8 __iomem *hw_addr;</div><div class='ctx'> 	u8 __iomem *flash_address;</div><div class='add'>+	void __iomem *ce4100_gbe_mdio_base_virt;</div><div class='ctx'> 	e1000_mac_type mac_type;</div><div class='ctx'> 	e1000_phy_type phy_type;</div><div class='ctx'> 	u32 phy_init_script;</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 cf480b554622..669ca3800c01 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/e1000/e1000_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/e1000/e1000_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/e1000/e1000_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/e1000/e1000_main.c</a></div><div class='hunk'>@@ -33,11 +33,6 @@</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> </div><div class='del'>-/* Intel Media SOC GbE MDIO physical base address */</div><div class='del'>-static unsigned long ce4100_gbe_mdio_base_phy;</div><div class='del'>-/* Intel Media SOC GbE MDIO virtual base address */</div><div class='del'>-void __iomem *ce4100_gbe_mdio_base_virt;</div><div class='del'>-</div><div class='ctx'> char e1000_driver_name[] = "e1000";</div><div class='ctx'> static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";</div><div class='ctx'> #define DRV_VERSION "7.3.21-k8-NAPI"</div><div class='hunk'>@@ -167,9 +162,10 @@ static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,</div><div class='ctx'>                                        struct sk_buff *skb);</div><div class='ctx'> </div><div class='ctx'> static bool e1000_vlan_used(struct e1000_adapter *adapter);</div><div class='del'>-static void e1000_vlan_mode(struct net_device *netdev, u32 features);</div><div class='del'>-static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid);</div><div class='del'>-static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);</div><div class='add'>+static void e1000_vlan_mode(struct net_device *netdev,</div><div class='add'>+			    netdev_features_t features);</div><div class='add'>+static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid);</div><div class='add'>+static int e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);</div><div class='ctx'> static void e1000_restore_vlan(struct e1000_adapter *adapter);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -806,7 +802,8 @@ static int e1000_is_need_ioport(struct pci_dev *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 e1000_fix_features(struct net_device *netdev, u32 features)</div><div class='add'>+static netdev_features_t e1000_fix_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since there is no support for separate rx/tx vlan accel</div><div class='hunk'>@@ -820,10 +817,11 @@ static u32 e1000_fix_features(struct net_device *netdev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int e1000_set_features(struct net_device *netdev, u32 features)</div><div class='add'>+static int e1000_set_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	u32 changed = features ^ netdev-&gt;features;</div><div class='add'>+	netdev_features_t changed = features ^ netdev-&gt;features;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; NETIF_F_HW_VLAN_RX)</div><div class='ctx'> 		e1000_vlan_mode(netdev, features);</div><div class='hunk'>@@ -1051,11 +1049,11 @@ static int __devinit e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	err = -EIO;</div><div class='ctx'> 	if (hw-&gt;mac_type == e1000_ce4100) {</div><div class='del'>-		ce4100_gbe_mdio_base_phy = pci_resource_start(pdev, BAR_1);</div><div class='del'>-		ce4100_gbe_mdio_base_virt = ioremap(ce4100_gbe_mdio_base_phy,</div><div class='add'>+		hw-&gt;ce4100_gbe_mdio_base_virt =</div><div class='add'>+					ioremap(pci_resource_start(pdev, BAR_1),</div><div class='ctx'> 		                                pci_resource_len(pdev, BAR_1));</div><div class='ctx'> </div><div class='del'>-		if (!ce4100_gbe_mdio_base_virt)</div><div class='add'>+		if (!hw-&gt;ce4100_gbe_mdio_base_virt)</div><div class='ctx'> 			goto err_mdio_ioremap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1182,7 +1180,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> 		if (global_quad_port_a != 0)</div><div class='ctx'> 			adapter-&gt;eeprom_wol = 0;</div><div class='ctx'> 		else</div><div class='del'>-			adapter-&gt;quad_port_a = 1;</div><div class='add'>+			adapter-&gt;quad_port_a = true;</div><div class='ctx'> 		/* Reset for multiple quad port adapters */</div><div class='ctx'> 		if (++global_quad_port_a == 4)</div><div class='ctx'> 			global_quad_port_a = 0;</div><div class='hunk'>@@ -1246,7 +1244,7 @@ err_eeprom:</div><div class='ctx'> err_dma:</div><div class='ctx'> err_sw_init:</div><div class='ctx'> err_mdio_ioremap:</div><div class='del'>-	iounmap(ce4100_gbe_mdio_base_virt);</div><div class='add'>+	iounmap(hw-&gt;ce4100_gbe_mdio_base_virt);</div><div class='ctx'> 	iounmap(hw-&gt;hw_addr);</div><div class='ctx'> err_ioremap:</div><div class='ctx'> 	free_netdev(netdev);</div><div class='hunk'>@@ -1283,6 +1281,8 @@ static void __devexit e1000_remove(struct pci_dev *pdev)</div><div class='ctx'> 	kfree(adapter-&gt;tx_ring);</div><div class='ctx'> 	kfree(adapter-&gt;rx_ring);</div><div class='ctx'> </div><div class='add'>+	if (hw-&gt;mac_type == e1000_ce4100)</div><div class='add'>+		iounmap(hw-&gt;ce4100_gbe_mdio_base_virt);</div><div class='ctx'> 	iounmap(hw-&gt;hw_addr);</div><div class='ctx'> 	if (hw-&gt;flash_address)</div><div class='ctx'> 		iounmap(hw-&gt;flash_address);</div><div class='hunk'>@@ -1676,7 +1676,7 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)</div><div class='ctx'> 	 * need this to apply a workaround later in the send path. */</div><div class='ctx'> 	if (hw-&gt;mac_type == e1000_82544 &amp;&amp;</div><div class='ctx'> 	    hw-&gt;bus_type == e1000_bus_type_pcix)</div><div class='del'>-		adapter-&gt;pcix_82544 = 1;</div><div class='add'>+		adapter-&gt;pcix_82544 = true;</div><div class='ctx'> </div><div class='ctx'> 	ew32(TCTL, tctl);</div><div class='ctx'> </div><div class='hunk'>@@ -1999,7 +1999,7 @@ static void e1000_clean_tx_ring(struct e1000_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	tx_ring-&gt;next_to_use = 0;</div><div class='ctx'> 	tx_ring-&gt;next_to_clean = 0;</div><div class='del'>-	tx_ring-&gt;last_tx_tso = 0;</div><div class='add'>+	tx_ring-&gt;last_tx_tso = false;</div><div class='ctx'> </div><div class='ctx'> 	writel(0, hw-&gt;hw_addr + tx_ring-&gt;tdh);</div><div class='ctx'> 	writel(0, hw-&gt;hw_addr + tx_ring-&gt;tdt);</div><div class='hunk'>@@ -2848,7 +2848,7 @@ static int e1000_tx_map(struct e1000_adapter *adapter,</div><div class='ctx'> 		 * DMA'd to the controller */</div><div class='ctx'> 		if (!skb-&gt;data_len &amp;&amp; tx_ring-&gt;last_tx_tso &amp;&amp;</div><div class='ctx'> 		    !skb_is_gso(skb)) {</div><div class='del'>-			tx_ring-&gt;last_tx_tso = 0;</div><div class='add'>+			tx_ring-&gt;last_tx_tso = false;</div><div class='ctx'> 			size -= 4;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -3216,7 +3216,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	if (likely(tso)) {</div><div class='ctx'> 		if (likely(hw-&gt;mac_type != e1000_82544))</div><div class='del'>-			tx_ring-&gt;last_tx_tso = 1;</div><div class='add'>+			tx_ring-&gt;last_tx_tso = true;</div><div class='ctx'> 		tx_flags |= E1000_TX_FLAGS_TSO;</div><div class='ctx'> 	} else if (likely(e1000_tx_csum(adapter, tx_ring, skb)))</div><div class='ctx'> 		tx_flags |= E1000_TX_FLAGS_CSUM;</div><div class='hunk'>@@ -4577,7 +4577,8 @@ static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,</div><div class='ctx'> 		e1000_irq_enable(adapter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void e1000_vlan_mode(struct net_device *netdev, u32 features)</div><div class='add'>+static void e1000_vlan_mode(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -4600,7 +4601,7 @@ static void e1000_vlan_mode(struct net_device *netdev, u32 features)</div><div class='ctx'> 		e1000_irq_enable(adapter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='add'>+static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -4609,7 +4610,7 @@ static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> 	if ((hw-&gt;mng_cookie.status &amp;</div><div class='ctx'> 	     E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &amp;&amp;</div><div class='ctx'> 	    (vid == adapter-&gt;mng_vlan_id))</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!e1000_vlan_used(adapter))</div><div class='ctx'> 		e1000_vlan_filter_on_off(adapter, true);</div><div class='hunk'>@@ -4621,9 +4622,11 @@ static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> 	e1000_write_vfta(hw, index, vfta);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(vid, adapter-&gt;active_vlans);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='add'>+static int e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -4644,6 +4647,8 @@ static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> </div><div class='ctx'> 	if (!e1000_vlan_used(adapter))</div><div class='ctx'> 		e1000_vlan_filter_on_off(adapter, false);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void e1000_restore_vlan(struct e1000_adapter *adapter)</div><div class='hunk'>@@ -4716,8 +4721,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)</div><div class='ctx'> </div><div class='ctx'> 	netif_device_detach(netdev);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mutex);</div><div class='del'>-</div><div class='ctx'> 	if (netif_running(netdev)) {</div><div class='ctx'> 		WARN_ON(test_bit(__E1000_RESETTING, &amp;adapter-&gt;flags));</div><div class='ctx'> 		e1000_down(adapter);</div><div class='hunk'>@@ -4725,10 +4728,8 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	retval = pci_save_state(pdev);</div><div class='del'>-	if (retval) {</div><div class='del'>-		mutex_unlock(&amp;adapter-&gt;mutex);</div><div class='add'>+	if (retval)</div><div class='ctx'> 		return retval;</div><div class='del'>-	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	status = er32(STATUS);</div><div class='hunk'>@@ -4783,8 +4784,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)</div><div class='ctx'> 	if (netif_running(netdev))</div><div class='ctx'> 		e1000_free_irq(adapter);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mutex);</div><div class='del'>-</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h<br/>index 9fe18d1d53d8..f478a22ed577 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/e1000e/e1000.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/e1000e/e1000.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/e1000e/e1000.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/e1000e/e1000.h</a></div><div class='hunk'>@@ -309,6 +309,7 @@ struct e1000_adapter {</div><div class='ctx'> 	u32 txd_cmd;</div><div class='ctx'> </div><div class='ctx'> 	bool detect_tx_hung;</div><div class='add'>+	bool tx_hang_recheck;</div><div class='ctx'> 	u8 tx_timeout_factor;</div><div class='ctx'> </div><div class='ctx'> 	u32 tx_int_delay;</div><div class='head'>diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c<br/>index 69c9d2199140..fb2c28e799a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/e1000e/ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/e1000e/ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/e1000e/ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/e1000e/ethtool.c</a></div><div class='hunk'>@@ -579,26 +579,24 @@ static void e1000_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> 			      struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	char firmware_version[32];</div><div class='ctx'> </div><div class='del'>-	strncpy(drvinfo-&gt;driver,  e1000e_driver_name,</div><div class='del'>-		sizeof(drvinfo-&gt;driver) - 1);</div><div class='del'>-	strncpy(drvinfo-&gt;version, e1000e_driver_version,</div><div class='del'>-		sizeof(drvinfo-&gt;version) - 1);</div><div class='add'>+	strlcpy(drvinfo-&gt;driver,  e1000e_driver_name,</div><div class='add'>+		sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, e1000e_driver_version,</div><div class='add'>+		sizeof(drvinfo-&gt;version));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * EEPROM image version # is reported as firmware version # for</div><div class='ctx'> 	 * PCI-E controllers</div><div class='ctx'> 	 */</div><div class='del'>-	snprintf(firmware_version, sizeof(firmware_version), "%d.%d-%d",</div><div class='add'>+	snprintf(drvinfo-&gt;fw_version, sizeof(drvinfo-&gt;fw_version),</div><div class='add'>+		"%d.%d-%d",</div><div class='ctx'> 		(adapter-&gt;eeprom_vers &amp; 0xF000) &gt;&gt; 12,</div><div class='ctx'> 		(adapter-&gt;eeprom_vers &amp; 0x0FF0) &gt;&gt; 4,</div><div class='ctx'> 		(adapter-&gt;eeprom_vers &amp; 0x000F));</div><div class='ctx'> </div><div class='del'>-	strncpy(drvinfo-&gt;fw_version, firmware_version,</div><div class='del'>-		sizeof(drvinfo-&gt;fw_version) - 1);</div><div class='del'>-	strncpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='del'>-		sizeof(drvinfo-&gt;bus_info) - 1);</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	drvinfo-&gt;regdump_len = e1000_get_regs_len(netdev);</div><div class='ctx'> 	drvinfo-&gt;eedump_len = e1000_get_eeprom_len(netdev);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c<br/>index a855db1ad249..3911401ed65d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/e1000e/netdev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/e1000e/netdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/e1000e/netdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/e1000e/netdev.c</a></div><div class='hunk'>@@ -163,16 +163,13 @@ static void e1000_regdump(struct e1000_hw *hw, struct e1000_reg_info *reginfo)</div><div class='ctx'> 			regs[n] = __er32(hw, E1000_TARC(n));</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk(KERN_INFO "%-15s %08x\n",</div><div class='del'>-		       reginfo-&gt;name, __er32(hw, reginfo-&gt;ofs));</div><div class='add'>+		pr_info("%-15s %08x\n",</div><div class='add'>+			reginfo-&gt;name, __er32(hw, reginfo-&gt;ofs));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	snprintf(rname, 16, "%s%s", reginfo-&gt;name, "[0-1]");</div><div class='del'>-	printk(KERN_INFO "%-15s ", rname);</div><div class='del'>-	for (n = 0; n &lt; 2; n++)</div><div class='del'>-		printk(KERN_CONT "%08x ", regs[n]);</div><div class='del'>-	printk(KERN_CONT "\n");</div><div class='add'>+	pr_info("%-15s %08x %08x\n", rname, regs[0], regs[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -208,16 +205,15 @@ static void e1000e_dump(struct e1000_adapter *adapter)</div><div class='ctx'> 	/* Print netdevice Info */</div><div class='ctx'> 	if (netdev) {</div><div class='ctx'> 		dev_info(&amp;adapter-&gt;pdev-&gt;dev, "Net device Info\n");</div><div class='del'>-		printk(KERN_INFO "Device Name     state            "</div><div class='del'>-		       "trans_start      last_rx\n");</div><div class='del'>-		printk(KERN_INFO "%-15s %016lX %016lX %016lX\n",</div><div class='del'>-		       netdev-&gt;name, netdev-&gt;state, netdev-&gt;trans_start,</div><div class='del'>-		       netdev-&gt;last_rx);</div><div class='add'>+		pr_info("Device Name     state            trans_start      last_rx\n");</div><div class='add'>+		pr_info("%-15s %016lX %016lX %016lX\n",</div><div class='add'>+			netdev-&gt;name, netdev-&gt;state, netdev-&gt;trans_start,</div><div class='add'>+			netdev-&gt;last_rx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Print Registers */</div><div class='ctx'> 	dev_info(&amp;adapter-&gt;pdev-&gt;dev, "Register Dump\n");</div><div class='del'>-	printk(KERN_INFO " Register Name   Value\n");</div><div class='add'>+	pr_info(" Register Name   Value\n");</div><div class='ctx'> 	for (reginfo = (struct e1000_reg_info *)e1000_reg_info_tbl;</div><div class='ctx'> 	     reginfo-&gt;name; reginfo++) {</div><div class='ctx'> 		e1000_regdump(hw, reginfo);</div><div class='hunk'>@@ -228,15 +224,14 @@ static void e1000e_dump(struct e1000_adapter *adapter)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;adapter-&gt;pdev-&gt;dev, "Tx Ring Summary\n");</div><div class='del'>-	printk(KERN_INFO "Queue [NTU] [NTC] [bi(ntc)-&gt;dma  ]"</div><div class='del'>-	       " leng ntw timestamp\n");</div><div class='add'>+	pr_info("Queue [NTU] [NTC] [bi(ntc)-&gt;dma  ] leng ntw timestamp\n");</div><div class='ctx'> 	buffer_info = &amp;tx_ring-&gt;buffer_info[tx_ring-&gt;next_to_clean];</div><div class='del'>-	printk(KERN_INFO " %5d %5X %5X %016llX %04X %3X %016llX\n",</div><div class='del'>-	       0, tx_ring-&gt;next_to_use, tx_ring-&gt;next_to_clean,</div><div class='del'>-	       (unsigned long long)buffer_info-&gt;dma,</div><div class='del'>-	       buffer_info-&gt;length,</div><div class='del'>-	       buffer_info-&gt;next_to_watch,</div><div class='del'>-	       (unsigned long long)buffer_info-&gt;time_stamp);</div><div class='add'>+	pr_info(" %5d %5X %5X %016llX %04X %3X %016llX\n",</div><div class='add'>+		0, tx_ring-&gt;next_to_use, tx_ring-&gt;next_to_clean,</div><div class='add'>+		(unsigned long long)buffer_info-&gt;dma,</div><div class='add'>+		buffer_info-&gt;length,</div><div class='add'>+		buffer_info-&gt;next_to_watch,</div><div class='add'>+		(unsigned long long)buffer_info-&gt;time_stamp);</div><div class='ctx'> </div><div class='ctx'> 	/* Print Tx Ring */</div><div class='ctx'> 	if (!netif_msg_tx_done(adapter))</div><div class='hunk'>@@ -271,37 +266,32 @@ static void e1000e_dump(struct e1000_adapter *adapter)</div><div class='ctx'> 	 *   +----------------------------------------------------------------+</div><div class='ctx'> 	 *   63       48 47     40 39  36 35    32 31     24 23  20 19        0</div><div class='ctx'> 	 */</div><div class='del'>-	printk(KERN_INFO "Tl[desc]     [address 63:0  ] [SpeCssSCmCsLen]"</div><div class='del'>-	       " [bi-&gt;dma       ] leng  ntw timestamp        bi-&gt;skb "</div><div class='del'>-	       "&lt;-- Legacy format\n");</div><div class='del'>-	printk(KERN_INFO "Tc[desc]     [Ce CoCsIpceCoS] [MssHlRSCm0Plen]"</div><div class='del'>-	       " [bi-&gt;dma       ] leng  ntw timestamp        bi-&gt;skb "</div><div class='del'>-	       "&lt;-- Ext Context format\n");</div><div class='del'>-	printk(KERN_INFO "Td[desc]     [address 63:0  ] [VlaPoRSCm1Dlen]"</div><div class='del'>-	       " [bi-&gt;dma       ] leng  ntw timestamp        bi-&gt;skb "</div><div class='del'>-	       "&lt;-- Ext Data format\n");</div><div class='add'>+	pr_info("Tl[desc]     [address 63:0  ] [SpeCssSCmCsLen] [bi-&gt;dma       ] leng  ntw timestamp        bi-&gt;skb &lt;-- Legacy format\n");</div><div class='add'>+	pr_info("Tc[desc]     [Ce CoCsIpceCoS] [MssHlRSCm0Plen] [bi-&gt;dma       ] leng  ntw timestamp        bi-&gt;skb &lt;-- Ext Context format\n");</div><div class='add'>+	pr_info("Td[desc]     [address 63:0  ] [VlaPoRSCm1Dlen] [bi-&gt;dma       ] leng  ntw timestamp        bi-&gt;skb &lt;-- Ext Data format\n");</div><div class='ctx'> 	for (i = 0; tx_ring-&gt;desc &amp;&amp; (i &lt; tx_ring-&gt;count); i++) {</div><div class='add'>+		const char *next_desc;</div><div class='ctx'> 		tx_desc = E1000_TX_DESC(*tx_ring, i);</div><div class='ctx'> 		buffer_info = &amp;tx_ring-&gt;buffer_info[i];</div><div class='ctx'> 		u0 = (struct my_u0 *)tx_desc;</div><div class='del'>-		printk(KERN_INFO "T%c[0x%03X]    %016llX %016llX %016llX "</div><div class='del'>-		       "%04X  %3X %016llX %p",</div><div class='del'>-		       (!(le64_to_cpu(u0-&gt;b) &amp; (1 &lt;&lt; 29)) ? 'l' :</div><div class='del'>-			((le64_to_cpu(u0-&gt;b) &amp; (1 &lt;&lt; 20)) ? 'd' : 'c')), i,</div><div class='del'>-		       (unsigned long long)le64_to_cpu(u0-&gt;a),</div><div class='del'>-		       (unsigned long long)le64_to_cpu(u0-&gt;b),</div><div class='del'>-		       (unsigned long long)buffer_info-&gt;dma,</div><div class='del'>-		       buffer_info-&gt;length, buffer_info-&gt;next_to_watch,</div><div class='del'>-		       (unsigned long long)buffer_info-&gt;time_stamp,</div><div class='del'>-		       buffer_info-&gt;skb);</div><div class='ctx'> 		if (i == tx_ring-&gt;next_to_use &amp;&amp; i == tx_ring-&gt;next_to_clean)</div><div class='del'>-			printk(KERN_CONT " NTC/U\n");</div><div class='add'>+			next_desc = " NTC/U";</div><div class='ctx'> 		else if (i == tx_ring-&gt;next_to_use)</div><div class='del'>-			printk(KERN_CONT " NTU\n");</div><div class='add'>+			next_desc = " NTU";</div><div class='ctx'> 		else if (i == tx_ring-&gt;next_to_clean)</div><div class='del'>-			printk(KERN_CONT " NTC\n");</div><div class='add'>+			next_desc = " NTC";</div><div class='ctx'> 		else</div><div class='del'>-			printk(KERN_CONT "\n");</div><div class='add'>+			next_desc = "";</div><div class='add'>+		pr_info("T%c[0x%03X]    %016llX %016llX %016llX %04X  %3X %016llX %p%s\n",</div><div class='add'>+			(!(le64_to_cpu(u0-&gt;b) &amp; (1 &lt;&lt; 29)) ? 'l' :</div><div class='add'>+			 ((le64_to_cpu(u0-&gt;b) &amp; (1 &lt;&lt; 20)) ? 'd' : 'c')),</div><div class='add'>+			i,</div><div class='add'>+			(unsigned long long)le64_to_cpu(u0-&gt;a),</div><div class='add'>+			(unsigned long long)le64_to_cpu(u0-&gt;b),</div><div class='add'>+			(unsigned long long)buffer_info-&gt;dma,</div><div class='add'>+			buffer_info-&gt;length, buffer_info-&gt;next_to_watch,</div><div class='add'>+			(unsigned long long)buffer_info-&gt;time_stamp,</div><div class='add'>+			buffer_info-&gt;skb, next_desc);</div><div class='ctx'> </div><div class='ctx'> 		if (netif_msg_pktdata(adapter) &amp;&amp; buffer_info-&gt;dma != 0)</div><div class='ctx'> 			print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS,</div><div class='hunk'>@@ -312,9 +302,9 @@ static void e1000e_dump(struct e1000_adapter *adapter)</div><div class='ctx'> 	/* Print Rx Ring Summary */</div><div class='ctx'> rx_ring_summary:</div><div class='ctx'> 	dev_info(&amp;adapter-&gt;pdev-&gt;dev, "Rx Ring Summary\n");</div><div class='del'>-	printk(KERN_INFO "Queue [NTU] [NTC]\n");</div><div class='del'>-	printk(KERN_INFO " %5d %5X %5X\n", 0,</div><div class='del'>-	       rx_ring-&gt;next_to_use, rx_ring-&gt;next_to_clean);</div><div class='add'>+	pr_info("Queue [NTU] [NTC]\n");</div><div class='add'>+	pr_info(" %5d %5X %5X\n",</div><div class='add'>+		0, rx_ring-&gt;next_to_use, rx_ring-&gt;next_to_clean);</div><div class='ctx'> </div><div class='ctx'> 	/* Print Rx Ring */</div><div class='ctx'> 	if (!netif_msg_rx_status(adapter))</div><div class='hunk'>@@ -337,10 +327,7 @@ rx_ring_summary:</div><div class='ctx'> 		 * 24 |                Buffer Address 3 [63:0]              |</div><div class='ctx'> 		 *    +-----------------------------------------------------+</div><div class='ctx'> 		 */</div><div class='del'>-		printk(KERN_INFO "R  [desc]      [buffer 0 63:0 ] "</div><div class='del'>-		       "[buffer 1 63:0 ] "</div><div class='del'>-		       "[buffer 2 63:0 ] [buffer 3 63:0 ] [bi-&gt;dma       ] "</div><div class='del'>-		       "[bi-&gt;skb] &lt;-- Ext Pkt Split format\n");</div><div class='add'>+		pr_info("R  [desc]      [buffer 0 63:0 ] [buffer 1 63:0 ] [buffer 2 63:0 ] [buffer 3 63:0 ] [bi-&gt;dma       ] [bi-&gt;skb] &lt;-- Ext Pkt Split format\n");</div><div class='ctx'> 		/* [Extended] Receive Descriptor (Write-Back) Format</div><div class='ctx'> 		 *</div><div class='ctx'> 		 *   63       48 47    32 31     13 12    8 7    4 3        0</div><div class='hunk'>@@ -352,35 +339,40 @@ rx_ring_summary:</div><div class='ctx'> 		 *   +------------------------------------------------------+</div><div class='ctx'> 		 *   63       48 47    32 31            20 19               0</div><div class='ctx'> 		 */</div><div class='del'>-		printk(KERN_INFO "RWB[desc]      [ck ipid mrqhsh] "</div><div class='del'>-		       "[vl   l0 ee  es] "</div><div class='del'>-		       "[ l3  l2  l1 hs] [reserved      ] ---------------- "</div><div class='del'>-		       "[bi-&gt;skb] &lt;-- Ext Rx Write-Back format\n");</div><div class='add'>+		pr_info("RWB[desc]      [ck ipid mrqhsh] [vl   l0 ee  es] [ l3  l2  l1 hs] [reserved      ] ---------------- [bi-&gt;skb] &lt;-- Ext Rx Write-Back format\n");</div><div class='ctx'> 		for (i = 0; i &lt; rx_ring-&gt;count; i++) {</div><div class='add'>+			const char *next_desc;</div><div class='ctx'> 			buffer_info = &amp;rx_ring-&gt;buffer_info[i];</div><div class='ctx'> 			rx_desc_ps = E1000_RX_DESC_PS(*rx_ring, i);</div><div class='ctx'> 			u1 = (struct my_u1 *)rx_desc_ps;</div><div class='ctx'> 			staterr =</div><div class='ctx'> 			    le32_to_cpu(rx_desc_ps-&gt;wb.middle.status_error);</div><div class='add'>+</div><div class='add'>+			if (i == rx_ring-&gt;next_to_use)</div><div class='add'>+				next_desc = " NTU";</div><div class='add'>+			else if (i == rx_ring-&gt;next_to_clean)</div><div class='add'>+				next_desc = " NTC";</div><div class='add'>+			else</div><div class='add'>+				next_desc = "";</div><div class='add'>+</div><div class='ctx'> 			if (staterr &amp; E1000_RXD_STAT_DD) {</div><div class='ctx'> 				/* Descriptor Done */</div><div class='del'>-				printk(KERN_INFO "RWB[0x%03X]     %016llX "</div><div class='del'>-				       "%016llX %016llX %016llX "</div><div class='del'>-				       "---------------- %p", i,</div><div class='del'>-				       (unsigned long long)le64_to_cpu(u1-&gt;a),</div><div class='del'>-				       (unsigned long long)le64_to_cpu(u1-&gt;b),</div><div class='del'>-				       (unsigned long long)le64_to_cpu(u1-&gt;c),</div><div class='del'>-				       (unsigned long long)le64_to_cpu(u1-&gt;d),</div><div class='del'>-				       buffer_info-&gt;skb);</div><div class='add'>+				pr_info("%s[0x%03X]     %016llX %016llX %016llX %016llX ---------------- %p%s\n",</div><div class='add'>+					"RWB", i,</div><div class='add'>+					(unsigned long long)le64_to_cpu(u1-&gt;a),</div><div class='add'>+					(unsigned long long)le64_to_cpu(u1-&gt;b),</div><div class='add'>+					(unsigned long long)le64_to_cpu(u1-&gt;c),</div><div class='add'>+					(unsigned long long)le64_to_cpu(u1-&gt;d),</div><div class='add'>+					buffer_info-&gt;skb, next_desc);</div><div class='ctx'> 			} else {</div><div class='del'>-				printk(KERN_INFO "R  [0x%03X]     %016llX "</div><div class='del'>-				       "%016llX %016llX %016llX %016llX %p", i,</div><div class='del'>-				       (unsigned long long)le64_to_cpu(u1-&gt;a),</div><div class='del'>-				       (unsigned long long)le64_to_cpu(u1-&gt;b),</div><div class='del'>-				       (unsigned long long)le64_to_cpu(u1-&gt;c),</div><div class='del'>-				       (unsigned long long)le64_to_cpu(u1-&gt;d),</div><div class='del'>-				       (unsigned long long)buffer_info-&gt;dma,</div><div class='del'>-				       buffer_info-&gt;skb);</div><div class='add'>+				pr_info("%s[0x%03X]     %016llX %016llX %016llX %016llX %016llX %p%s\n",</div><div class='add'>+					"R  ", i,</div><div class='add'>+					(unsigned long long)le64_to_cpu(u1-&gt;a),</div><div class='add'>+					(unsigned long long)le64_to_cpu(u1-&gt;b),</div><div class='add'>+					(unsigned long long)le64_to_cpu(u1-&gt;c),</div><div class='add'>+					(unsigned long long)le64_to_cpu(u1-&gt;d),</div><div class='add'>+					(unsigned long long)buffer_info-&gt;dma,</div><div class='add'>+					buffer_info-&gt;skb, next_desc);</div><div class='ctx'> </div><div class='ctx'> 				if (netif_msg_pktdata(adapter))</div><div class='ctx'> 					print_hex_dump(KERN_INFO, "",</div><div class='hunk'>@@ -388,13 +380,6 @@ rx_ring_summary:</div><div class='ctx'> 						phys_to_virt(buffer_info-&gt;dma),</div><div class='ctx'> 						adapter-&gt;rx_ps_bsize0, true);</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='del'>-			if (i == rx_ring-&gt;next_to_use)</div><div class='del'>-				printk(KERN_CONT " NTU\n");</div><div class='del'>-			else if (i == rx_ring-&gt;next_to_clean)</div><div class='del'>-				printk(KERN_CONT " NTC\n");</div><div class='del'>-			else</div><div class='del'>-				printk(KERN_CONT "\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -407,9 +392,7 @@ rx_ring_summary:</div><div class='ctx'> 		 * 8 |                      Reserved                       |</div><div class='ctx'> 		 *   +-----------------------------------------------------+</div><div class='ctx'> 		 */</div><div class='del'>-		printk(KERN_INFO "R  [desc]      [buf addr 63:0 ] "</div><div class='del'>-		       "[reserved 63:0 ] [bi-&gt;dma       ] "</div><div class='del'>-		       "[bi-&gt;skb] &lt;-- Ext (Read) format\n");</div><div class='add'>+		pr_info("R  [desc]      [buf addr 63:0 ] [reserved 63:0 ] [bi-&gt;dma       ] [bi-&gt;skb] &lt;-- Ext (Read) format\n");</div><div class='ctx'> 		/* Extended Receive Descriptor (Write-Back) Format</div><div class='ctx'> 		 *</div><div class='ctx'> 		 *   63       48 47    32 31    24 23            4 3        0</div><div class='hunk'>@@ -423,29 +406,37 @@ rx_ring_summary:</div><div class='ctx'> 		 *   +------------------------------------------------------+</div><div class='ctx'> 		 *   63       48 47    32 31            20 19               0</div><div class='ctx'> 		 */</div><div class='del'>-		printk(KERN_INFO "RWB[desc]      [cs ipid    mrq] "</div><div class='del'>-		       "[vt   ln xe  xs] "</div><div class='del'>-		       "[bi-&gt;skb] &lt;-- Ext (Write-Back) format\n");</div><div class='add'>+		pr_info("RWB[desc]      [cs ipid    mrq] [vt   ln xe  xs] [bi-&gt;skb] &lt;-- Ext (Write-Back) format\n");</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; rx_ring-&gt;count; i++) {</div><div class='add'>+			const char *next_desc;</div><div class='add'>+</div><div class='ctx'> 			buffer_info = &amp;rx_ring-&gt;buffer_info[i];</div><div class='ctx'> 			rx_desc = E1000_RX_DESC_EXT(*rx_ring, i);</div><div class='ctx'> 			u1 = (struct my_u1 *)rx_desc;</div><div class='ctx'> 			staterr = le32_to_cpu(rx_desc-&gt;wb.upper.status_error);</div><div class='add'>+</div><div class='add'>+			if (i == rx_ring-&gt;next_to_use)</div><div class='add'>+				next_desc = " NTU";</div><div class='add'>+			else if (i == rx_ring-&gt;next_to_clean)</div><div class='add'>+				next_desc = " NTC";</div><div class='add'>+			else</div><div class='add'>+				next_desc = "";</div><div class='add'>+</div><div class='ctx'> 			if (staterr &amp; E1000_RXD_STAT_DD) {</div><div class='ctx'> 				/* Descriptor Done */</div><div class='del'>-				printk(KERN_INFO "RWB[0x%03X]     %016llX "</div><div class='del'>-				       "%016llX ---------------- %p", i,</div><div class='del'>-				       (unsigned long long)le64_to_cpu(u1-&gt;a),</div><div class='del'>-				       (unsigned long long)le64_to_cpu(u1-&gt;b),</div><div class='del'>-				       buffer_info-&gt;skb);</div><div class='add'>+				pr_info("%s[0x%03X]     %016llX %016llX ---------------- %p%s\n",</div><div class='add'>+					"RWB", i,</div><div class='add'>+					(unsigned long long)le64_to_cpu(u1-&gt;a),</div><div class='add'>+					(unsigned long long)le64_to_cpu(u1-&gt;b),</div><div class='add'>+					buffer_info-&gt;skb, next_desc);</div><div class='ctx'> 			} else {</div><div class='del'>-				printk(KERN_INFO "R  [0x%03X]     %016llX "</div><div class='del'>-				       "%016llX %016llX %p", i,</div><div class='del'>-				       (unsigned long long)le64_to_cpu(u1-&gt;a),</div><div class='del'>-				       (unsigned long long)le64_to_cpu(u1-&gt;b),</div><div class='del'>-				       (unsigned long long)buffer_info-&gt;dma,</div><div class='del'>-				       buffer_info-&gt;skb);</div><div class='add'>+				pr_info("%s[0x%03X]     %016llX %016llX %016llX %p%s\n",</div><div class='add'>+					"R  ", i,</div><div class='add'>+					(unsigned long long)le64_to_cpu(u1-&gt;a),</div><div class='add'>+					(unsigned long long)le64_to_cpu(u1-&gt;b),</div><div class='add'>+					(unsigned long long)buffer_info-&gt;dma,</div><div class='add'>+					buffer_info-&gt;skb, next_desc);</div><div class='ctx'> </div><div class='ctx'> 				if (netif_msg_pktdata(adapter))</div><div class='ctx'> 					print_hex_dump(KERN_INFO, "",</div><div class='hunk'>@@ -456,13 +447,6 @@ rx_ring_summary:</div><div class='ctx'> 						       adapter-&gt;rx_buffer_len,</div><div class='ctx'> 						       true);</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='del'>-			if (i == rx_ring-&gt;next_to_use)</div><div class='del'>-				printk(KERN_CONT " NTU\n");</div><div class='del'>-			else if (i == rx_ring-&gt;next_to_clean)</div><div class='del'>-				printk(KERN_CONT " NTC\n");</div><div class='del'>-			else</div><div class='del'>-				printk(KERN_CONT "\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -875,7 +859,7 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,</div><div class='ctx'> 	u32 length, staterr;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int cleaned_count = 0;</div><div class='del'>-	bool cleaned = 0;</div><div class='add'>+	bool cleaned = false;</div><div class='ctx'> 	unsigned int total_rx_bytes = 0, total_rx_packets = 0;</div><div class='ctx'> </div><div class='ctx'> 	i = rx_ring-&gt;next_to_clean;</div><div class='hunk'>@@ -904,7 +888,7 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 		next_buffer = &amp;rx_ring-&gt;buffer_info[i];</div><div class='ctx'> </div><div class='del'>-		cleaned = 1;</div><div class='add'>+		cleaned = true;</div><div class='ctx'> 		cleaned_count++;</div><div class='ctx'> 		dma_unmap_single(&amp;pdev-&gt;dev,</div><div class='ctx'> 				 buffer_info-&gt;dma,</div><div class='hunk'>@@ -1030,6 +1014,7 @@ static void e1000_print_hw_hang(struct work_struct *work)</div><div class='ctx'> 	struct e1000_adapter *adapter = container_of(work,</div><div class='ctx'> 	                                             struct e1000_adapter,</div><div class='ctx'> 	                                             print_hang_task);</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> 	struct e1000_ring *tx_ring = adapter-&gt;tx_ring;</div><div class='ctx'> 	unsigned int i = tx_ring-&gt;next_to_clean;</div><div class='ctx'> 	unsigned int eop = tx_ring-&gt;buffer_info[i].next_to_watch;</div><div class='hunk'>@@ -1041,6 +1026,21 @@ static void e1000_print_hw_hang(struct work_struct *work)</div><div class='ctx'> 	if (test_bit(__E1000_DOWN, &amp;adapter-&gt;state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (!adapter-&gt;tx_hang_recheck &amp;&amp;</div><div class='add'>+	    (adapter-&gt;flags2 &amp; FLAG2_DMA_BURST)) {</div><div class='add'>+		/* May be block on write-back, flush and detect again</div><div class='add'>+		 * flush pending descriptor writebacks to memory</div><div class='add'>+		 */</div><div class='add'>+		ew32(TIDV, adapter-&gt;tx_int_delay | E1000_TIDV_FPD);</div><div class='add'>+		/* execute the writes immediately */</div><div class='add'>+		e1e_flush();</div><div class='add'>+		adapter-&gt;tx_hang_recheck = true;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	/* Real hang detected */</div><div class='add'>+	adapter-&gt;tx_hang_recheck = false;</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+</div><div class='ctx'> 	e1e_rphy(hw, PHY_STATUS, &amp;phy_status);</div><div class='ctx'> 	e1e_rphy(hw, PHY_1000T_STATUS, &amp;phy_1000t_status);</div><div class='ctx'> 	e1e_rphy(hw, PHY_EXT_STATUS, &amp;phy_ext_status);</div><div class='hunk'>@@ -1095,6 +1095,7 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)</div><div class='ctx'> 	unsigned int i, eop;</div><div class='ctx'> 	unsigned int count = 0;</div><div class='ctx'> 	unsigned int total_tx_bytes = 0, total_tx_packets = 0;</div><div class='add'>+	unsigned int bytes_compl = 0, pkts_compl = 0;</div><div class='ctx'> </div><div class='ctx'> 	i = tx_ring-&gt;next_to_clean;</div><div class='ctx'> 	eop = tx_ring-&gt;buffer_info[i].next_to_watch;</div><div class='hunk'>@@ -1112,6 +1113,10 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)</div><div class='ctx'> 			if (cleaned) {</div><div class='ctx'> 				total_tx_packets += buffer_info-&gt;segs;</div><div class='ctx'> 				total_tx_bytes += buffer_info-&gt;bytecount;</div><div class='add'>+				if (buffer_info-&gt;skb) {</div><div class='add'>+					bytes_compl += buffer_info-&gt;skb-&gt;len;</div><div class='add'>+					pkts_compl++;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			e1000_put_txbuf(adapter, buffer_info);</div><div class='hunk'>@@ -1130,6 +1135,8 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	tx_ring-&gt;next_to_clean = i;</div><div class='ctx'> </div><div class='add'>+	netdev_completed_queue(netdev, pkts_compl, bytes_compl);</div><div class='add'>+</div><div class='ctx'> #define TX_WAKE_THRESHOLD 32</div><div class='ctx'> 	if (count &amp;&amp; netif_carrier_ok(netdev) &amp;&amp;</div><div class='ctx'> 	    e1000_desc_unused(tx_ring) &gt;= TX_WAKE_THRESHOLD) {</div><div class='hunk'>@@ -1150,14 +1157,14 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)</div><div class='ctx'> 		 * Detect a transmit hang in hardware, this serializes the</div><div class='ctx'> 		 * check with the clearing of time_stamp and movement of i</div><div class='ctx'> 		 */</div><div class='del'>-		adapter-&gt;detect_tx_hung = 0;</div><div class='add'>+		adapter-&gt;detect_tx_hung = false;</div><div class='ctx'> 		if (tx_ring-&gt;buffer_info[i].time_stamp &amp;&amp;</div><div class='ctx'> 		    time_after(jiffies, tx_ring-&gt;buffer_info[i].time_stamp</div><div class='ctx'> 			       + (adapter-&gt;tx_timeout_factor * HZ)) &amp;&amp;</div><div class='del'>-		    !(er32(STATUS) &amp; E1000_STATUS_TXOFF)) {</div><div class='add'>+		    !(er32(STATUS) &amp; E1000_STATUS_TXOFF))</div><div class='ctx'> 			schedule_work(&amp;adapter-&gt;print_hang_task);</div><div class='del'>-			netif_stop_queue(netdev);</div><div class='del'>-		}</div><div class='add'>+		else</div><div class='add'>+			adapter-&gt;tx_hang_recheck = false;</div><div class='ctx'> 	}</div><div class='ctx'> 	adapter-&gt;total_tx_bytes += total_tx_bytes;</div><div class='ctx'> 	adapter-&gt;total_tx_packets += total_tx_packets;</div><div class='hunk'>@@ -1185,7 +1192,7 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,</div><div class='ctx'> 	unsigned int i, j;</div><div class='ctx'> 	u32 length, staterr;</div><div class='ctx'> 	int cleaned_count = 0;</div><div class='del'>-	bool cleaned = 0;</div><div class='add'>+	bool cleaned = false;</div><div class='ctx'> 	unsigned int total_rx_bytes = 0, total_rx_packets = 0;</div><div class='ctx'> </div><div class='ctx'> 	i = rx_ring-&gt;next_to_clean;</div><div class='hunk'>@@ -1211,7 +1218,7 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 		next_buffer = &amp;rx_ring-&gt;buffer_info[i];</div><div class='ctx'> </div><div class='del'>-		cleaned = 1;</div><div class='add'>+		cleaned = true;</div><div class='ctx'> 		cleaned_count++;</div><div class='ctx'> 		dma_unmap_single(&amp;pdev-&gt;dev, buffer_info-&gt;dma,</div><div class='ctx'> 				 adapter-&gt;rx_ps_bsize0, DMA_FROM_DEVICE);</div><div class='hunk'>@@ -1222,8 +1229,7 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,</div><div class='ctx'> 			adapter-&gt;flags2 |= FLAG2_IS_DISCARDING;</div><div class='ctx'> </div><div class='ctx'> 		if (adapter-&gt;flags2 &amp; FLAG2_IS_DISCARDING) {</div><div class='del'>-			e_dbg("Packet Split buffers didn't pick up the full "</div><div class='del'>-			      "packet\n");</div><div class='add'>+			e_dbg("Packet Split buffers didn't pick up the full packet\n");</div><div class='ctx'> 			dev_kfree_skb_irq(skb);</div><div class='ctx'> 			if (staterr &amp; E1000_RXD_STAT_EOP)</div><div class='ctx'> 				adapter-&gt;flags2 &amp;= ~FLAG2_IS_DISCARDING;</div><div class='hunk'>@@ -1238,8 +1244,7 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,</div><div class='ctx'> 		length = le16_to_cpu(rx_desc-&gt;wb.middle.length0);</div><div class='ctx'> </div><div class='ctx'> 		if (!length) {</div><div class='del'>-			e_dbg("Last part of the packet spanning multiple "</div><div class='del'>-			      "descriptors\n");</div><div class='add'>+			e_dbg("Last part of the packet spanning multiple descriptors\n");</div><div class='ctx'> 			dev_kfree_skb_irq(skb);</div><div class='ctx'> 			goto next_desc;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1917,8 +1922,7 @@ void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)</div><div class='ctx'> 					return;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* MSI-X failed, so fall through and try MSI */</div><div class='del'>-			e_err("Failed to initialize MSI-X interrupts.  "</div><div class='del'>-			      "Falling back to MSI interrupts.\n");</div><div class='add'>+			e_err("Failed to initialize MSI-X interrupts.  Falling back to MSI interrupts.\n");</div><div class='ctx'> 			e1000e_reset_interrupt_capability(adapter);</div><div class='ctx'> 		}</div><div class='ctx'> 		adapter-&gt;int_mode = E1000E_INT_MODE_MSI;</div><div class='hunk'>@@ -1928,8 +1932,7 @@ void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)</div><div class='ctx'> 			adapter-&gt;flags |= FLAG_MSI_ENABLED;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			adapter-&gt;int_mode = E1000E_INT_MODE_LEGACY;</div><div class='del'>-			e_err("Failed to initialize MSI interrupts.  Falling "</div><div class='del'>-			      "back to legacy interrupts.\n");</div><div class='add'>+			e_err("Failed to initialize MSI interrupts.  Falling back to legacy interrupts.\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Fall through */</div><div class='ctx'> 	case E1000E_INT_MODE_LEGACY:</div><div class='hunk'>@@ -2260,6 +2263,7 @@ static void e1000_clean_tx_ring(struct e1000_adapter *adapter)</div><div class='ctx'> 		e1000_put_txbuf(adapter, buffer_info);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netdev_reset_queue(adapter-&gt;netdev);</div><div class='ctx'> 	size = sizeof(struct e1000_buffer) * tx_ring-&gt;count;</div><div class='ctx'> 	memset(tx_ring-&gt;buffer_info, 0, size);</div><div class='ctx'> </div><div class='hunk'>@@ -2518,7 +2522,7 @@ clean_rx:</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='add'>+static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -2528,7 +2532,7 @@ static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> 	if ((adapter-&gt;hw.mng_cookie.status &amp;</div><div class='ctx'> 	     E1000_MNG_DHCP_COOKIE_STATUS_VLAN) &amp;&amp;</div><div class='ctx'> 	    (vid == adapter-&gt;mng_vlan_id))</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* add VID to filter table */</div><div class='ctx'> 	if (adapter-&gt;flags &amp; FLAG_HAS_HW_VLAN_FILTER) {</div><div class='hunk'>@@ -2539,9 +2543,11 @@ static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	set_bit(vid, adapter-&gt;active_vlans);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='add'>+static int e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -2552,7 +2558,7 @@ static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> 	    (vid == adapter-&gt;mng_vlan_id)) {</div><div class='ctx'> 		/* release control to f/w */</div><div class='ctx'> 		e1000e_release_hw_control(adapter);</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* remove VID from filter table */</div><div class='hunk'>@@ -2564,6 +2570,8 @@ static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(vid, adapter-&gt;active_vlans);</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'>@@ -3113,79 +3121,147 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  e1000_update_mc_addr_list - Update Multicast addresses</div><div class='del'>- *  @hw: pointer to the HW structure</div><div class='del'>- *  @mc_addr_list: array of multicast addresses to program</div><div class='del'>- *  @mc_addr_count: number of multicast addresses to program</div><div class='add'>+ * e1000e_write_mc_addr_list - write multicast addresses to MTA</div><div class='add'>+ * @netdev: network interface device structure</div><div class='add'>+ *</div><div class='add'>+ * Writes multicast address list to the MTA hash table.</div><div class='add'>+ * Returns: -ENOMEM on failure</div><div class='add'>+ *                0 on no addresses written</div><div class='add'>+ *                X on writing X addresses to MTA</div><div class='add'>+ */</div><div class='add'>+static int e1000e_write_mc_addr_list(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	struct netdev_hw_addr *ha;</div><div class='add'>+	u8 *mta_list;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (netdev_mc_empty(netdev)) {</div><div class='add'>+		/* nothing to program, so clear mc list */</div><div class='add'>+		hw-&gt;mac.ops.update_mc_addr_list(hw, NULL, 0);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mta_list = kzalloc(netdev_mc_count(netdev) * ETH_ALEN, GFP_ATOMIC);</div><div class='add'>+	if (!mta_list)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* update_mc_addr_list expects a packed array of only addresses. */</div><div class='add'>+	i = 0;</div><div class='add'>+	netdev_for_each_mc_addr(ha, netdev)</div><div class='add'>+		memcpy(mta_list + (i++ * ETH_ALEN), ha-&gt;addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	hw-&gt;mac.ops.update_mc_addr_list(hw, mta_list, i);</div><div class='add'>+	kfree(mta_list);</div><div class='add'>+</div><div class='add'>+	return netdev_mc_count(netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * e1000e_write_uc_addr_list - write unicast addresses to RAR table</div><div class='add'>+ * @netdev: network interface device structure</div><div class='ctx'>  *</div><div class='del'>- *  Updates the Multicast Table Array.</div><div class='del'>- *  The caller must have a packed mc_addr_list of multicast addresses.</div><div class='add'>+ * Writes unicast address list to the RAR table.</div><div class='add'>+ * Returns: -ENOMEM on failure/insufficient address space</div><div class='add'>+ *                0 on no addresses written</div><div class='add'>+ *                X on writing X addresses to the RAR table</div><div class='ctx'>  **/</div><div class='del'>-static void e1000_update_mc_addr_list(struct e1000_hw *hw, u8 *mc_addr_list,</div><div class='del'>-				      u32 mc_addr_count)</div><div class='add'>+static int e1000e_write_uc_addr_list(struct net_device *netdev)</div><div class='ctx'> {</div><div class='del'>-	hw-&gt;mac.ops.update_mc_addr_list(hw, mc_addr_list, mc_addr_count);</div><div class='add'>+	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	unsigned int rar_entries = hw-&gt;mac.rar_entry_count;</div><div class='add'>+	int count = 0;</div><div class='add'>+</div><div class='add'>+	/* save a rar entry for our hardware address */</div><div class='add'>+	rar_entries--;</div><div class='add'>+</div><div class='add'>+	/* save a rar entry for the LAA workaround */</div><div class='add'>+	if (adapter-&gt;flags &amp; FLAG_RESET_OVERWRITES_LAA)</div><div class='add'>+		rar_entries--;</div><div class='add'>+</div><div class='add'>+	/* return ENOMEM indicating insufficient memory for addresses */</div><div class='add'>+	if (netdev_uc_count(netdev) &gt; rar_entries)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (!netdev_uc_empty(netdev) &amp;&amp; rar_entries) {</div><div class='add'>+		struct netdev_hw_addr *ha;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * write the addresses in reverse order to avoid write</div><div class='add'>+		 * combining</div><div class='add'>+		 */</div><div class='add'>+		netdev_for_each_uc_addr(ha, netdev) {</div><div class='add'>+			if (!rar_entries)</div><div class='add'>+				break;</div><div class='add'>+			e1000e_rar_set(hw, ha-&gt;addr, rar_entries--);</div><div class='add'>+			count++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* zero out the remaining RAR entries not used above */</div><div class='add'>+	for (; rar_entries &gt; 0; rar_entries--) {</div><div class='add'>+		ew32(RAH(rar_entries), 0);</div><div class='add'>+		ew32(RAL(rar_entries), 0);</div><div class='add'>+	}</div><div class='add'>+	e1e_flush();</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * e1000_set_multi - Multicast and Promiscuous mode set</div><div class='add'>+ * e1000e_set_rx_mode - secondary unicast, Multicast and Promiscuous mode set</div><div class='ctx'>  * @netdev: network interface device structure</div><div class='ctx'>  *</div><div class='del'>- * The set_multi entry point is called whenever the multicast address</div><div class='del'>- * list or the network interface flags are updated.  This routine is</div><div class='del'>- * responsible for configuring the hardware for proper multicast,</div><div class='add'>+ * The ndo_set_rx_mode entry point is called whenever the unicast or multicast</div><div class='add'>+ * address list or the network interface flags are updated.  This routine is</div><div class='add'>+ * responsible for configuring the hardware for proper unicast, multicast,</div><div class='ctx'>  * promiscuous mode, and all-multi behavior.</div><div class='ctx'>  **/</div><div class='del'>-static void e1000_set_multi(struct net_device *netdev)</div><div class='add'>+static void e1000e_set_rx_mode(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='del'>-	struct netdev_hw_addr *ha;</div><div class='del'>-	u8  *mta_list;</div><div class='ctx'> 	u32 rctl;</div><div class='ctx'> </div><div class='ctx'> 	/* Check for Promiscuous and All Multicast modes */</div><div class='del'>-</div><div class='ctx'> 	rctl = er32(RCTL);</div><div class='ctx'> </div><div class='add'>+	/* clear the affected bits */</div><div class='add'>+	rctl &amp;= ~(E1000_RCTL_UPE | E1000_RCTL_MPE);</div><div class='add'>+</div><div class='ctx'> 	if (netdev-&gt;flags &amp; IFF_PROMISC) {</div><div class='ctx'> 		rctl |= (E1000_RCTL_UPE | E1000_RCTL_MPE);</div><div class='del'>-		rctl &amp;= ~E1000_RCTL_VFE;</div><div class='ctx'> 		/* Do not hardware filter VLANs in promisc mode */</div><div class='ctx'> 		e1000e_vlan_filter_disable(adapter);</div><div class='ctx'> 	} else {</div><div class='add'>+		int count;</div><div class='ctx'> 		if (netdev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='ctx'> 			rctl |= E1000_RCTL_MPE;</div><div class='del'>-			rctl &amp;= ~E1000_RCTL_UPE;</div><div class='ctx'> 		} else {</div><div class='del'>-			rctl &amp;= ~(E1000_RCTL_UPE | E1000_RCTL_MPE);</div><div class='add'>+			/*</div><div class='add'>+			 * Write addresses to the MTA, if the attempt fails</div><div class='add'>+			 * then we should just turn on promiscuous mode so</div><div class='add'>+			 * that we can at least receive multicast traffic</div><div class='add'>+			 */</div><div class='add'>+			count = e1000e_write_mc_addr_list(netdev);</div><div class='add'>+			if (count &lt; 0)</div><div class='add'>+				rctl |= E1000_RCTL_MPE;</div><div class='ctx'> 		}</div><div class='ctx'> 		e1000e_vlan_filter_enable(adapter);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ew32(RCTL, rctl);</div><div class='del'>-</div><div class='del'>-	if (!netdev_mc_empty(netdev)) {</div><div class='del'>-		int i = 0;</div><div class='del'>-</div><div class='del'>-		mta_list = kmalloc(netdev_mc_count(netdev) * 6, GFP_ATOMIC);</div><div class='del'>-		if (!mta_list)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		/* prepare a packed array of only addresses. */</div><div class='del'>-		netdev_for_each_mc_addr(ha, netdev)</div><div class='del'>-			memcpy(mta_list + (i++ * ETH_ALEN), ha-&gt;addr, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-		e1000_update_mc_addr_list(hw, mta_list, i);</div><div class='del'>-		kfree(mta_list);</div><div class='del'>-	} else {</div><div class='ctx'> 		/*</div><div class='del'>-		 * if we're called from probe, we might not have</div><div class='del'>-		 * anything to do here, so clear out the list</div><div class='add'>+		 * Write addresses to available RAR registers, if there is not</div><div class='add'>+		 * sufficient space to store all the addresses then enable</div><div class='add'>+		 * unicast promiscuous mode</div><div class='ctx'> 		 */</div><div class='del'>-		e1000_update_mc_addr_list(hw, NULL, 0);</div><div class='add'>+		count = e1000e_write_uc_addr_list(netdev);</div><div class='add'>+		if (count &lt; 0)</div><div class='add'>+			rctl |= E1000_RCTL_UPE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ew32(RCTL, rctl);</div><div class='add'>+</div><div class='ctx'> 	if (netdev-&gt;features &amp; NETIF_F_HW_VLAN_RX)</div><div class='ctx'> 		e1000e_vlan_strip_enable(adapter);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -3198,7 +3274,7 @@ static void e1000_set_multi(struct net_device *netdev)</div><div class='ctx'>  **/</div><div class='ctx'> static void e1000_configure(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	e1000_set_multi(adapter-&gt;netdev);</div><div class='add'>+	e1000e_set_rx_mode(adapter-&gt;netdev);</div><div class='ctx'> </div><div class='ctx'> 	e1000_restore_vlan(adapter);</div><div class='ctx'> 	e1000_init_manageability_pt(adapter);</div><div class='hunk'>@@ -3444,7 +3520,6 @@ int e1000e_up(struct e1000_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(__E1000_DOWN, &amp;adapter-&gt;state);</div><div class='ctx'> </div><div class='del'>-	napi_enable(&amp;adapter-&gt;napi);</div><div class='ctx'> 	if (adapter-&gt;msix_entries)</div><div class='ctx'> 		e1000_configure_msix(adapter);</div><div class='ctx'> 	e1000_irq_enable(adapter);</div><div class='hunk'>@@ -3506,7 +3581,6 @@ void e1000e_down(struct e1000_adapter *adapter)</div><div class='ctx'> 	e1e_flush();</div><div class='ctx'> 	usleep_range(10000, 20000);</div><div class='ctx'> </div><div class='del'>-	napi_disable(&amp;adapter-&gt;napi);</div><div class='ctx'> 	e1000_irq_disable(adapter);</div><div class='ctx'> </div><div class='ctx'> 	del_timer_sync(&amp;adapter-&gt;watchdog_timer);</div><div class='hunk'>@@ -3782,6 +3856,7 @@ static int e1000_open(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	e1000_irq_enable(adapter);</div><div class='ctx'> </div><div class='add'>+	adapter-&gt;tx_hang_recheck = false;</div><div class='ctx'> 	netif_start_queue(netdev);</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;idle_check = true;</div><div class='hunk'>@@ -3828,6 +3903,8 @@ static int e1000_close(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	pm_runtime_get_sync(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='add'>+	napi_disable(&amp;adapter-&gt;napi);</div><div class='add'>+</div><div class='ctx'> 	if (!test_bit(__E1000_DOWN, &amp;adapter-&gt;state)) {</div><div class='ctx'> 		e1000e_down(adapter);</div><div class='ctx'> 		e1000_free_irq(adapter);</div><div class='hunk'>@@ -4168,22 +4245,19 @@ static void e1000_print_link_info(struct e1000_adapter *adapter)</div><div class='ctx'> 	u32 ctrl = er32(CTRL);</div><div class='ctx'> </div><div class='ctx'> 	/* Link status message must follow this format for user tools */</div><div class='del'>-	printk(KERN_INFO "e1000e: %s NIC Link is Up %d Mbps %s, "</div><div class='del'>-	       "Flow Control: %s\n",</div><div class='del'>-	       adapter-&gt;netdev-&gt;name,</div><div class='del'>-	       adapter-&gt;link_speed,</div><div class='del'>-	       (adapter-&gt;link_duplex == FULL_DUPLEX) ?</div><div class='del'>-	       "Full Duplex" : "Half Duplex",</div><div class='del'>-	       ((ctrl &amp; E1000_CTRL_TFCE) &amp;&amp; (ctrl &amp; E1000_CTRL_RFCE)) ?</div><div class='del'>-	       "Rx/Tx" :</div><div class='del'>-	       ((ctrl &amp; E1000_CTRL_RFCE) ? "Rx" :</div><div class='del'>-		((ctrl &amp; E1000_CTRL_TFCE) ? "Tx" : "None")));</div><div class='add'>+	printk(KERN_INFO "e1000e: %s NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n",</div><div class='add'>+		adapter-&gt;netdev-&gt;name,</div><div class='add'>+		adapter-&gt;link_speed,</div><div class='add'>+		adapter-&gt;link_duplex == FULL_DUPLEX ? "Full" : "Half",</div><div class='add'>+		(ctrl &amp; E1000_CTRL_TFCE) &amp;&amp; (ctrl &amp; E1000_CTRL_RFCE) ? "Rx/Tx" :</div><div class='add'>+		(ctrl &amp; E1000_CTRL_RFCE) ? "Rx" :</div><div class='add'>+		(ctrl &amp; E1000_CTRL_TFCE) ? "Tx" : "None");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool e1000e_has_link(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='del'>-	bool link_active = 0;</div><div class='add'>+	bool link_active = false;</div><div class='ctx'> 	s32 ret_val = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -4198,7 +4272,7 @@ static bool e1000e_has_link(struct e1000_adapter *adapter)</div><div class='ctx'> 			ret_val = hw-&gt;mac.ops.check_for_link(hw);</div><div class='ctx'> 			link_active = !hw-&gt;mac.get_link_status;</div><div class='ctx'> 		} else {</div><div class='del'>-			link_active = 1;</div><div class='add'>+			link_active = true;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case e1000_media_type_fiber:</div><div class='hunk'>@@ -4297,7 +4371,7 @@ static void e1000_watchdog_task(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	if (link) {</div><div class='ctx'> 		if (!netif_carrier_ok(netdev)) {</div><div class='del'>-			bool txb2b = 1;</div><div class='add'>+			bool txb2b = true;</div><div class='ctx'> </div><div class='ctx'> 			/* Cancel scheduled suspend requests. */</div><div class='ctx'> 			pm_runtime_resume(netdev-&gt;dev.parent);</div><div class='hunk'>@@ -4323,21 +4397,18 @@ static void e1000_watchdog_task(struct work_struct *work)</div><div class='ctx'> 				e1e_rphy(hw, PHY_AUTONEG_EXP, &amp;autoneg_exp);</div><div class='ctx'> </div><div class='ctx'> 				if (!(autoneg_exp &amp; NWAY_ER_LP_NWAY_CAPS))</div><div class='del'>-					e_info("Autonegotiated half duplex but"</div><div class='del'>-					       " link partner cannot autoneg. "</div><div class='del'>-					       " Try forcing full duplex if "</div><div class='del'>-					       "link gets many collisions.\n");</div><div class='add'>+					e_info("Autonegotiated half duplex but link partner cannot autoneg.  Try forcing full duplex if link gets many collisions.\n");</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* adjust timeout factor according to speed/duplex */</div><div class='ctx'> 			adapter-&gt;tx_timeout_factor = 1;</div><div class='ctx'> 			switch (adapter-&gt;link_speed) {</div><div class='ctx'> 			case SPEED_10:</div><div class='del'>-				txb2b = 0;</div><div class='add'>+				txb2b = false;</div><div class='ctx'> 				adapter-&gt;tx_timeout_factor = 16;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case SPEED_100:</div><div class='del'>-				txb2b = 0;</div><div class='add'>+				txb2b = false;</div><div class='ctx'> 				adapter-&gt;tx_timeout_factor = 10;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -4473,7 +4544,7 @@ link_up:</div><div class='ctx'> 	e1000e_flush_descriptors(adapter);</div><div class='ctx'> </div><div class='ctx'> 	/* Force detection of hung controller every watchdog period */</div><div class='del'>-	adapter-&gt;detect_tx_hung = 1;</div><div class='add'>+	adapter-&gt;detect_tx_hung = true;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * With 82571 controllers, LAA may be overwritten due to controller</div><div class='hunk'>@@ -4985,6 +5056,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,</div><div class='ctx'> 	/* if count is 0 then mapping error has occurred */</div><div class='ctx'> 	count = e1000_tx_map(adapter, skb, first, max_per_txd, nr_frags, mss);</div><div class='ctx'> 	if (count) {</div><div class='add'>+		netdev_sent_queue(netdev, skb-&gt;len);</div><div class='ctx'> 		e1000_tx_queue(adapter, tx_flags, count);</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, MAX_SKB_FRAGS + 2);</div><div class='hunk'>@@ -5110,8 +5182,7 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 	if ((adapter-&gt;hw.mac.type == e1000_pch2lan) &amp;&amp;</div><div class='ctx'> 	    !(adapter-&gt;flags2 &amp; FLAG2_CRC_STRIPPING) &amp;&amp;</div><div class='ctx'> 	    (new_mtu &gt; ETH_DATA_LEN)) {</div><div class='del'>-		e_err("Jumbo Frames not supported on 82579 when CRC "</div><div class='del'>-		      "stripping is disabled.\n");</div><div class='add'>+		e_err("Jumbo Frames not supported on 82579 when CRC stripping is disabled.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5331,7 +5402,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake,</div><div class='ctx'> </div><div class='ctx'> 	if (wufc) {</div><div class='ctx'> 		e1000_setup_rctl(adapter);</div><div class='del'>-		e1000_set_multi(netdev);</div><div class='add'>+		e1000e_set_rx_mode(netdev);</div><div class='ctx'> </div><div class='ctx'> 		/* turn on all-multi mode if wake on multicast is enabled */</div><div class='ctx'> 		if (wufc &amp; E1000_WUFC_MC) {</div><div class='hunk'>@@ -5527,8 +5598,8 @@ static int __e1000_resume(struct pci_dev *pdev)</div><div class='ctx'> 				phy_data &amp; E1000_WUS_MC ? "Multicast Packet" :</div><div class='ctx'> 				phy_data &amp; E1000_WUS_BC ? "Broadcast Packet" :</div><div class='ctx'> 				phy_data &amp; E1000_WUS_MAG ? "Magic Packet" :</div><div class='del'>-				phy_data &amp; E1000_WUS_LNKC ? "Link Status "</div><div class='del'>-				" Change" : "other");</div><div class='add'>+				phy_data &amp; E1000_WUS_LNKC ?</div><div class='add'>+				"Link Status Change" : "other");</div><div class='ctx'> 		}</div><div class='ctx'> 		e1e_wphy(&amp;adapter-&gt;hw, BM_WUS, ~0);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -5859,10 +5930,11 @@ static void e1000_eeprom_checks(struct e1000_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int e1000_set_features(struct net_device *netdev, u32 features)</div><div class='add'>+static int e1000_set_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	u32 changed = features ^ netdev-&gt;features;</div><div class='add'>+	netdev_features_t changed = features ^ netdev-&gt;features;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; (NETIF_F_TSO | NETIF_F_TSO6))</div><div class='ctx'> 		adapter-&gt;flags |= FLAG_TSO_FORCE;</div><div class='hunk'>@@ -5884,7 +5956,7 @@ static const struct net_device_ops e1000e_netdev_ops = {</div><div class='ctx'> 	.ndo_stop		= e1000_close,</div><div class='ctx'> 	.ndo_start_xmit		= e1000_xmit_frame,</div><div class='ctx'> 	.ndo_get_stats64	= e1000e_get_stats64,</div><div class='del'>-	.ndo_set_rx_mode	= e1000_set_multi,</div><div class='add'>+	.ndo_set_rx_mode	= e1000e_set_rx_mode,</div><div class='ctx'> 	.ndo_set_mac_address	= e1000_set_mac,</div><div class='ctx'> 	.ndo_change_mtu		= e1000_change_mtu,</div><div class='ctx'> 	.ndo_do_ioctl		= e1000_ioctl,</div><div class='hunk'>@@ -5949,8 +6021,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> 			err = dma_set_coherent_mask(&amp;pdev-&gt;dev,</div><div class='ctx'> 						    DMA_BIT_MASK(32));</div><div class='ctx'> 			if (err) {</div><div class='del'>-				dev_err(&amp;pdev-&gt;dev, "No usable DMA "</div><div class='del'>-					"configuration, aborting\n");</div><div class='add'>+				dev_err(&amp;pdev-&gt;dev, "No usable DMA configuration, aborting\n");</div><div class='ctx'> 				goto err_dma;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -6076,6 +6147,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> 				  NETIF_F_TSO6 |</div><div class='ctx'> 				  NETIF_F_HW_CSUM);</div><div class='ctx'> </div><div class='add'>+	netdev-&gt;priv_flags |= IFF_UNICAST_FLT;</div><div class='add'>+</div><div class='ctx'> 	if (pci_using_dac) {</div><div class='ctx'> 		netdev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='ctx'> 		netdev-&gt;vlan_features |= NETIF_F_HIGHDMA;</div><div class='hunk'>@@ -6135,7 +6208,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize link parameters. User can change them with ethtool */</div><div class='ctx'> 	adapter-&gt;hw.mac.autoneg = 1;</div><div class='del'>-	adapter-&gt;fc_autoneg = 1;</div><div class='add'>+	adapter-&gt;fc_autoneg = true;</div><div class='ctx'> 	adapter-&gt;hw.fc.requested_mode = e1000_fc_default;</div><div class='ctx'> 	adapter-&gt;hw.fc.current_mode = e1000_fc_default;</div><div class='ctx'> 	adapter-&gt;hw.phy.autoneg_advertised = 0x2f;</div><div class='head'>diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c<br/>index 7881fb95a25b..b8e20f037d0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/igb/e1000_82575.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/igb/e1000_82575.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/igb/e1000_82575.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/igb/e1000_82575.c</a></div><div class='hunk'>@@ -29,6 +29,8 @@</div><div class='ctx'>  * e1000_82576</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -244,8 +246,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)</div><div class='ctx'> 	 * Check for invalid size</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((hw-&gt;mac.type == e1000_82576) &amp;&amp; (size &gt; 15)) {</div><div class='del'>-		printk("igb: The NVM size is not valid, "</div><div class='del'>-			"defaulting to 32K.\n");</div><div class='add'>+		pr_notice("The NVM size is not valid, defaulting to 32K\n");</div><div class='ctx'> 		size = 15;</div><div class='ctx'> 	}</div><div class='ctx'> 	nvm-&gt;word_size = 1 &lt;&lt; size;</div><div class='head'>diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h<br/>index c69feebf2653..3d12e67eebb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/igb/igb.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/igb/igb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/igb/igb.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/igb/igb.h</a></div><div class='hunk'>@@ -447,4 +447,9 @@ static inline s32 igb_get_phy_info(struct e1000_hw *hw)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct netdev_queue *txring_txq(const struct igb_ring *tx_ring)</div><div class='add'>+{</div><div class='add'>+	return netdev_get_tx_queue(tx_ring-&gt;netdev, tx_ring-&gt;queue_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _IGB_H_ */</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 43873eba2f63..7998bf4d5946 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/igb/igb_ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/igb/igb_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/igb/igb_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/igb/igb_ethtool.c</a></div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'> #include &lt;linux/ethtool.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/pm_runtime.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "igb.h"</div><div class='ctx'> </div><div class='hunk'>@@ -148,7 +149,8 @@ static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)</div><div class='ctx'> 				   SUPPORTED_1000baseT_Full|</div><div class='ctx'> 				   SUPPORTED_Autoneg |</div><div class='ctx'> 				   SUPPORTED_TP);</div><div class='del'>-		ecmd-&gt;advertising = ADVERTISED_TP;</div><div class='add'>+		ecmd-&gt;advertising = (ADVERTISED_TP |</div><div class='add'>+				     ADVERTISED_Pause);</div><div class='ctx'> </div><div class='ctx'> 		if (hw-&gt;mac.autoneg == 1) {</div><div class='ctx'> 			ecmd-&gt;advertising |= ADVERTISED_Autoneg;</div><div class='hunk'>@@ -165,7 +167,8 @@ static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)</div><div class='ctx'> </div><div class='ctx'> 		ecmd-&gt;advertising = (ADVERTISED_1000baseT_Full |</div><div class='ctx'> 				     ADVERTISED_FIBRE |</div><div class='del'>-				     ADVERTISED_Autoneg);</div><div class='add'>+				     ADVERTISED_Autoneg |</div><div class='add'>+				     ADVERTISED_Pause);</div><div class='ctx'> </div><div class='ctx'> 		ecmd-&gt;port = PORT_FIBRE;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -673,25 +676,22 @@ static void igb_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> 			    struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> {</div><div class='ctx'> 	struct igb_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	char firmware_version[32];</div><div class='ctx'> 	u16 eeprom_data;</div><div class='ctx'> </div><div class='del'>-	strncpy(drvinfo-&gt;driver,  igb_driver_name, sizeof(drvinfo-&gt;driver) - 1);</div><div class='del'>-	strncpy(drvinfo-&gt;version, igb_driver_version,</div><div class='del'>-		sizeof(drvinfo-&gt;version) - 1);</div><div class='add'>+	strlcpy(drvinfo-&gt;driver,  igb_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, igb_driver_version, sizeof(drvinfo-&gt;version));</div><div class='ctx'> </div><div class='ctx'> 	/* EEPROM image version # is reported as firmware version # for</div><div class='ctx'> 	 * 82575 controllers */</div><div class='ctx'> 	adapter-&gt;hw.nvm.ops.read(&amp;adapter-&gt;hw, 5, 1, &amp;eeprom_data);</div><div class='del'>-	sprintf(firmware_version, "%d.%d-%d",</div><div class='add'>+	snprintf(drvinfo-&gt;fw_version, sizeof(drvinfo-&gt;fw_version),</div><div class='add'>+		"%d.%d-%d",</div><div class='ctx'> 		(eeprom_data &amp; 0xF000) &gt;&gt; 12,</div><div class='ctx'> 		(eeprom_data &amp; 0x0FF0) &gt;&gt; 4,</div><div class='ctx'> 		eeprom_data &amp; 0x000F);</div><div class='ctx'> </div><div class='del'>-	strncpy(drvinfo-&gt;fw_version, firmware_version,</div><div class='del'>-		sizeof(drvinfo-&gt;fw_version) - 1);</div><div class='del'>-	strncpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='del'>-		sizeof(drvinfo-&gt;bus_info) - 1);</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	drvinfo-&gt;n_stats = IGB_STATS_LEN;</div><div class='ctx'> 	drvinfo-&gt;testinfo_len = IGB_TEST_LEN;</div><div class='ctx'> 	drvinfo-&gt;regdump_len = igb_get_regs_len(netdev);</div><div class='hunk'>@@ -2162,6 +2162,19 @@ static void igb_get_strings(struct net_device *netdev, u32 stringset, u8 *data)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int igb_ethtool_begin(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct igb_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	pm_runtime_get_sync(&amp;adapter-&gt;pdev-&gt;dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void igb_ethtool_complete(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct igb_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	pm_runtime_put(&amp;adapter-&gt;pdev-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct ethtool_ops igb_ethtool_ops = {</div><div class='ctx'> 	.get_settings           = igb_get_settings,</div><div class='ctx'> 	.set_settings           = igb_set_settings,</div><div class='hunk'>@@ -2188,6 +2201,8 @@ static const struct ethtool_ops igb_ethtool_ops = {</div><div class='ctx'> 	.get_ethtool_stats      = igb_get_ethtool_stats,</div><div class='ctx'> 	.get_coalesce           = igb_get_coalesce,</div><div class='ctx'> 	.set_coalesce           = igb_set_coalesce,</div><div class='add'>+	.begin			= igb_ethtool_begin,</div><div class='add'>+	.complete		= igb_ethtool_complete,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void igb_set_ethtool_ops(struct net_device *netdev)</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 ced544499f1b..01e5e89ef959 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/igb/igb_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/igb/igb_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/igb/igb_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/igb/igb_main.c</a></div><div class='hunk'>@@ -25,6 +25,8 @@</div><div class='ctx'> </div><div class='ctx'> *******************************************************************************/</div><div class='ctx'> </div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/module.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='hunk'>@@ -51,6 +53,7 @@</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/aer.h&gt;</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> #ifdef CONFIG_IGB_DCA</div><div class='ctx'> #include &lt;linux/dca.h&gt;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -145,9 +148,9 @@ static bool igb_clean_rx_irq(struct igb_q_vector *, int);</div><div class='ctx'> static int igb_ioctl(struct net_device *, struct ifreq *, int cmd);</div><div class='ctx'> static void igb_tx_timeout(struct net_device *);</div><div class='ctx'> static void igb_reset_task(struct work_struct *);</div><div class='del'>-static void igb_vlan_mode(struct net_device *netdev, u32 features);</div><div class='del'>-static void igb_vlan_rx_add_vid(struct net_device *, u16);</div><div class='del'>-static void igb_vlan_rx_kill_vid(struct net_device *, u16);</div><div class='add'>+static void igb_vlan_mode(struct net_device *netdev, netdev_features_t features);</div><div class='add'>+static int igb_vlan_rx_add_vid(struct net_device *, u16);</div><div class='add'>+static int igb_vlan_rx_kill_vid(struct net_device *, u16);</div><div class='ctx'> static void igb_restore_vlan(struct igb_adapter *);</div><div class='ctx'> static void igb_rar_set_qsel(struct igb_adapter *, u8 *, u32 , u8);</div><div class='ctx'> static void igb_ping_all_vfs(struct igb_adapter *);</div><div class='hunk'>@@ -170,8 +173,18 @@ static int igb_check_vf_assignment(struct igb_adapter *adapter);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='del'>-static int igb_suspend(struct pci_dev *, pm_message_t);</div><div class='del'>-static int igb_resume(struct pci_dev *);</div><div class='add'>+static int igb_suspend(struct device *);</div><div class='add'>+static int igb_resume(struct device *);</div><div class='add'>+#ifdef CONFIG_PM_RUNTIME</div><div class='add'>+static int igb_runtime_suspend(struct device *dev);</div><div class='add'>+static int igb_runtime_resume(struct device *dev);</div><div class='add'>+static int igb_runtime_idle(struct device *dev);</div><div class='add'>+#endif</div><div class='add'>+static const struct dev_pm_ops igb_pm_ops = {</div><div class='add'>+	SET_SYSTEM_SLEEP_PM_OPS(igb_suspend, igb_resume)</div><div class='add'>+	SET_RUNTIME_PM_OPS(igb_runtime_suspend, igb_runtime_resume,</div><div class='add'>+			igb_runtime_idle)</div><div class='add'>+};</div><div class='ctx'> #endif</div><div class='ctx'> static void igb_shutdown(struct pci_dev *);</div><div class='ctx'> #ifdef CONFIG_IGB_DCA</div><div class='hunk'>@@ -212,9 +225,7 @@ static struct pci_driver igb_driver = {</div><div class='ctx'> 	.probe    = igb_probe,</div><div class='ctx'> 	.remove   = __devexit_p(igb_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='del'>-	/* Power Management Hooks */</div><div class='del'>-	.suspend  = igb_suspend,</div><div class='del'>-	.resume   = igb_resume,</div><div class='add'>+	.driver.pm = &amp;igb_pm_ops,</div><div class='ctx'> #endif</div><div class='ctx'> 	.shutdown = igb_shutdown,</div><div class='ctx'> 	.err_handler = &amp;igb_err_handler</div><div class='hunk'>@@ -325,16 +336,13 @@ static void igb_regdump(struct e1000_hw *hw, struct igb_reg_info *reginfo)</div><div class='ctx'> 			regs[n] = rd32(E1000_TXDCTL(n));</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk(KERN_INFO "%-15s %08x\n",</div><div class='del'>-			reginfo-&gt;name, rd32(reginfo-&gt;ofs));</div><div class='add'>+		pr_info("%-15s %08x\n", reginfo-&gt;name, rd32(reginfo-&gt;ofs));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	snprintf(rname, 16, "%s%s", reginfo-&gt;name, "[0-3]");</div><div class='del'>-	printk(KERN_INFO "%-15s ", rname);</div><div class='del'>-	for (n = 0; n &lt; 4; n++)</div><div class='del'>-		printk(KERN_CONT "%08x ", regs[n]);</div><div class='del'>-	printk(KERN_CONT "\n");</div><div class='add'>+	pr_info("%-15s %08x %08x %08x %08x\n", rname, regs[0], regs[1],</div><div class='add'>+		regs[2], regs[3]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -359,18 +367,15 @@ static void igb_dump(struct igb_adapter *adapter)</div><div class='ctx'> 	/* Print netdevice Info */</div><div class='ctx'> 	if (netdev) {</div><div class='ctx'> 		dev_info(&amp;adapter-&gt;pdev-&gt;dev, "Net device Info\n");</div><div class='del'>-		printk(KERN_INFO "Device Name     state            "</div><div class='del'>-			"trans_start      last_rx\n");</div><div class='del'>-		printk(KERN_INFO "%-15s %016lX %016lX %016lX\n",</div><div class='del'>-		netdev-&gt;name,</div><div class='del'>-		netdev-&gt;state,</div><div class='del'>-		netdev-&gt;trans_start,</div><div class='del'>-		netdev-&gt;last_rx);</div><div class='add'>+		pr_info("Device Name     state            trans_start      "</div><div class='add'>+			"last_rx\n");</div><div class='add'>+		pr_info("%-15s %016lX %016lX %016lX\n", netdev-&gt;name,</div><div class='add'>+			netdev-&gt;state, netdev-&gt;trans_start, netdev-&gt;last_rx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Print Registers */</div><div class='ctx'> 	dev_info(&amp;adapter-&gt;pdev-&gt;dev, "Register Dump\n");</div><div class='del'>-	printk(KERN_INFO " Register Name   Value\n");</div><div class='add'>+	pr_info(" Register Name   Value\n");</div><div class='ctx'> 	for (reginfo = (struct igb_reg_info *)igb_reg_info_tbl;</div><div class='ctx'> 	     reginfo-&gt;name; reginfo++) {</div><div class='ctx'> 		igb_regdump(hw, reginfo);</div><div class='hunk'>@@ -381,18 +386,17 @@ static void igb_dump(struct igb_adapter *adapter)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;adapter-&gt;pdev-&gt;dev, "TX Rings Summary\n");</div><div class='del'>-	printk(KERN_INFO "Queue [NTU] [NTC] [bi(ntc)-&gt;dma  ]"</div><div class='del'>-		" leng ntw timestamp\n");</div><div class='add'>+	pr_info("Queue [NTU] [NTC] [bi(ntc)-&gt;dma  ] leng ntw timestamp\n");</div><div class='ctx'> 	for (n = 0; n &lt; adapter-&gt;num_tx_queues; n++) {</div><div class='ctx'> 		struct igb_tx_buffer *buffer_info;</div><div class='ctx'> 		tx_ring = adapter-&gt;tx_ring[n];</div><div class='ctx'> 		buffer_info = &amp;tx_ring-&gt;tx_buffer_info[tx_ring-&gt;next_to_clean];</div><div class='del'>-		printk(KERN_INFO " %5d %5X %5X %016llX %04X %p %016llX\n",</div><div class='del'>-			   n, tx_ring-&gt;next_to_use, tx_ring-&gt;next_to_clean,</div><div class='del'>-			   (u64)buffer_info-&gt;dma,</div><div class='del'>-			   buffer_info-&gt;length,</div><div class='del'>-			   buffer_info-&gt;next_to_watch,</div><div class='del'>-			   (u64)buffer_info-&gt;time_stamp);</div><div class='add'>+		pr_info(" %5d %5X %5X %016llX %04X %p %016llX\n",</div><div class='add'>+			n, tx_ring-&gt;next_to_use, tx_ring-&gt;next_to_clean,</div><div class='add'>+			(u64)buffer_info-&gt;dma,</div><div class='add'>+			buffer_info-&gt;length,</div><div class='add'>+			buffer_info-&gt;next_to_watch,</div><div class='add'>+			(u64)buffer_info-&gt;time_stamp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Print TX Rings */</div><div class='hunk'>@@ -414,36 +418,38 @@ static void igb_dump(struct igb_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	for (n = 0; n &lt; adapter-&gt;num_tx_queues; n++) {</div><div class='ctx'> 		tx_ring = adapter-&gt;tx_ring[n];</div><div class='del'>-		printk(KERN_INFO "------------------------------------\n");</div><div class='del'>-		printk(KERN_INFO "TX QUEUE INDEX = %d\n", tx_ring-&gt;queue_index);</div><div class='del'>-		printk(KERN_INFO "------------------------------------\n");</div><div class='del'>-		printk(KERN_INFO "T [desc]     [address 63:0  ] "</div><div class='del'>-			"[PlPOCIStDDM Ln] [bi-&gt;dma       ] "</div><div class='del'>-			"leng  ntw timestamp        bi-&gt;skb\n");</div><div class='add'>+		pr_info("------------------------------------\n");</div><div class='add'>+		pr_info("TX QUEUE INDEX = %d\n", tx_ring-&gt;queue_index);</div><div class='add'>+		pr_info("------------------------------------\n");</div><div class='add'>+		pr_info("T [desc]     [address 63:0  ] [PlPOCIStDDM Ln] "</div><div class='add'>+			"[bi-&gt;dma       ] leng  ntw timestamp        "</div><div class='add'>+			"bi-&gt;skb\n");</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; tx_ring-&gt;desc &amp;&amp; (i &lt; tx_ring-&gt;count); i++) {</div><div class='add'>+			const char *next_desc;</div><div class='ctx'> 			struct igb_tx_buffer *buffer_info;</div><div class='ctx'> 			tx_desc = IGB_TX_DESC(tx_ring, i);</div><div class='ctx'> 			buffer_info = &amp;tx_ring-&gt;tx_buffer_info[i];</div><div class='ctx'> 			u0 = (struct my_u0 *)tx_desc;</div><div class='del'>-			printk(KERN_INFO "T [0x%03X]    %016llX %016llX %016llX"</div><div class='del'>-				" %04X  %p %016llX %p", i,</div><div class='add'>+			if (i == tx_ring-&gt;next_to_use &amp;&amp;</div><div class='add'>+			    i == tx_ring-&gt;next_to_clean)</div><div class='add'>+				next_desc = " NTC/U";</div><div class='add'>+			else if (i == tx_ring-&gt;next_to_use)</div><div class='add'>+				next_desc = " NTU";</div><div class='add'>+			else if (i == tx_ring-&gt;next_to_clean)</div><div class='add'>+				next_desc = " NTC";</div><div class='add'>+			else</div><div class='add'>+				next_desc = "";</div><div class='add'>+</div><div class='add'>+			pr_info("T [0x%03X]    %016llX %016llX %016llX"</div><div class='add'>+				" %04X  %p %016llX %p%s\n", i,</div><div class='ctx'> 				le64_to_cpu(u0-&gt;a),</div><div class='ctx'> 				le64_to_cpu(u0-&gt;b),</div><div class='ctx'> 				(u64)buffer_info-&gt;dma,</div><div class='ctx'> 				buffer_info-&gt;length,</div><div class='ctx'> 				buffer_info-&gt;next_to_watch,</div><div class='ctx'> 				(u64)buffer_info-&gt;time_stamp,</div><div class='del'>-				buffer_info-&gt;skb);</div><div class='del'>-			if (i == tx_ring-&gt;next_to_use &amp;&amp;</div><div class='del'>-				i == tx_ring-&gt;next_to_clean)</div><div class='del'>-				printk(KERN_CONT " NTC/U\n");</div><div class='del'>-			else if (i == tx_ring-&gt;next_to_use)</div><div class='del'>-				printk(KERN_CONT " NTU\n");</div><div class='del'>-			else if (i == tx_ring-&gt;next_to_clean)</div><div class='del'>-				printk(KERN_CONT " NTC\n");</div><div class='del'>-			else</div><div class='del'>-				printk(KERN_CONT "\n");</div><div class='add'>+				buffer_info-&gt;skb, next_desc);</div><div class='ctx'> </div><div class='ctx'> 			if (netif_msg_pktdata(adapter) &amp;&amp; buffer_info-&gt;dma != 0)</div><div class='ctx'> 				print_hex_dump(KERN_INFO, "",</div><div class='hunk'>@@ -456,11 +462,11 @@ static void igb_dump(struct igb_adapter *adapter)</div><div class='ctx'> 	/* Print RX Rings Summary */</div><div class='ctx'> rx_ring_summary:</div><div class='ctx'> 	dev_info(&amp;adapter-&gt;pdev-&gt;dev, "RX Rings Summary\n");</div><div class='del'>-	printk(KERN_INFO "Queue [NTU] [NTC]\n");</div><div class='add'>+	pr_info("Queue [NTU] [NTC]\n");</div><div class='ctx'> 	for (n = 0; n &lt; adapter-&gt;num_rx_queues; n++) {</div><div class='ctx'> 		rx_ring = adapter-&gt;rx_ring[n];</div><div class='del'>-		printk(KERN_INFO " %5d %5X %5X\n", n,</div><div class='del'>-			   rx_ring-&gt;next_to_use, rx_ring-&gt;next_to_clean);</div><div class='add'>+		pr_info(" %5d %5X %5X\n",</div><div class='add'>+			n, rx_ring-&gt;next_to_use, rx_ring-&gt;next_to_clean);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Print RX Rings */</div><div class='hunk'>@@ -492,36 +498,43 @@ rx_ring_summary:</div><div class='ctx'> </div><div class='ctx'> 	for (n = 0; n &lt; adapter-&gt;num_rx_queues; n++) {</div><div class='ctx'> 		rx_ring = adapter-&gt;rx_ring[n];</div><div class='del'>-		printk(KERN_INFO "------------------------------------\n");</div><div class='del'>-		printk(KERN_INFO "RX QUEUE INDEX = %d\n", rx_ring-&gt;queue_index);</div><div class='del'>-		printk(KERN_INFO "------------------------------------\n");</div><div class='del'>-		printk(KERN_INFO "R  [desc]      [ PktBuf     A0] "</div><div class='del'>-			"[  HeadBuf   DD] [bi-&gt;dma       ] [bi-&gt;skb] "</div><div class='del'>-			"&lt;-- Adv Rx Read format\n");</div><div class='del'>-		printk(KERN_INFO "RWB[desc]      [PcsmIpSHl PtRs] "</div><div class='del'>-			"[vl er S cks ln] ---------------- [bi-&gt;skb] "</div><div class='del'>-			"&lt;-- Adv Rx Write-Back format\n");</div><div class='add'>+		pr_info("------------------------------------\n");</div><div class='add'>+		pr_info("RX QUEUE INDEX = %d\n", rx_ring-&gt;queue_index);</div><div class='add'>+		pr_info("------------------------------------\n");</div><div class='add'>+		pr_info("R  [desc]      [ PktBuf     A0] [  HeadBuf   DD] "</div><div class='add'>+			"[bi-&gt;dma       ] [bi-&gt;skb] &lt;-- Adv Rx Read format\n");</div><div class='add'>+		pr_info("RWB[desc]      [PcsmIpSHl PtRs] [vl er S cks ln] -----"</div><div class='add'>+			"----------- [bi-&gt;skb] &lt;-- Adv Rx Write-Back format\n");</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; rx_ring-&gt;count; i++) {</div><div class='add'>+			const char *next_desc;</div><div class='ctx'> 			struct igb_rx_buffer *buffer_info;</div><div class='ctx'> 			buffer_info = &amp;rx_ring-&gt;rx_buffer_info[i];</div><div class='ctx'> 			rx_desc = IGB_RX_DESC(rx_ring, i);</div><div class='ctx'> 			u0 = (struct my_u0 *)rx_desc;</div><div class='ctx'> 			staterr = le32_to_cpu(rx_desc-&gt;wb.upper.status_error);</div><div class='add'>+</div><div class='add'>+			if (i == rx_ring-&gt;next_to_use)</div><div class='add'>+				next_desc = " NTU";</div><div class='add'>+			else if (i == rx_ring-&gt;next_to_clean)</div><div class='add'>+				next_desc = " NTC";</div><div class='add'>+			else</div><div class='add'>+				next_desc = "";</div><div class='add'>+</div><div class='ctx'> 			if (staterr &amp; E1000_RXD_STAT_DD) {</div><div class='ctx'> 				/* Descriptor Done */</div><div class='del'>-				printk(KERN_INFO "RWB[0x%03X]     %016llX "</div><div class='del'>-					"%016llX ---------------- %p", i,</div><div class='add'>+				pr_info("%s[0x%03X]     %016llX %016llX -------"</div><div class='add'>+					"--------- %p%s\n", "RWB", i,</div><div class='ctx'> 					le64_to_cpu(u0-&gt;a),</div><div class='ctx'> 					le64_to_cpu(u0-&gt;b),</div><div class='del'>-					buffer_info-&gt;skb);</div><div class='add'>+					buffer_info-&gt;skb, next_desc);</div><div class='ctx'> 			} else {</div><div class='del'>-				printk(KERN_INFO "R  [0x%03X]     %016llX "</div><div class='del'>-					"%016llX %016llX %p", i,</div><div class='add'>+				pr_info("%s[0x%03X]     %016llX %016llX %016llX"</div><div class='add'>+					" %p%s\n", "R  ", i,</div><div class='ctx'> 					le64_to_cpu(u0-&gt;a),</div><div class='ctx'> 					le64_to_cpu(u0-&gt;b),</div><div class='ctx'> 					(u64)buffer_info-&gt;dma,</div><div class='del'>-					buffer_info-&gt;skb);</div><div class='add'>+					buffer_info-&gt;skb, next_desc);</div><div class='ctx'> </div><div class='ctx'> 				if (netif_msg_pktdata(adapter)) {</div><div class='ctx'> 					print_hex_dump(KERN_INFO, "",</div><div class='hunk'>@@ -538,14 +551,6 @@ rx_ring_summary:</div><div class='ctx'> 					  PAGE_SIZE/2, true);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='del'>-			if (i == rx_ring-&gt;next_to_use)</div><div class='del'>-				printk(KERN_CONT " NTU\n");</div><div class='del'>-			else if (i == rx_ring-&gt;next_to_clean)</div><div class='del'>-				printk(KERN_CONT " NTC\n");</div><div class='del'>-			else</div><div class='del'>-				printk(KERN_CONT "\n");</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -599,10 +604,10 @@ struct net_device *igb_get_hw_dev(struct e1000_hw *hw)</div><div class='ctx'> static int __init igb_init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	printk(KERN_INFO "%s - version %s\n",</div><div class='add'>+	pr_info("%s - version %s\n",</div><div class='ctx'> 	       igb_driver_string, igb_driver_version);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s\n", igb_copyright);</div><div class='add'>+	pr_info("%s\n", igb_copyright);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IGB_DCA</div><div class='ctx'> 	dca_register_notify(&amp;dca_notifier);</div><div class='hunk'>@@ -1502,6 +1507,7 @@ void igb_power_up_link(struct igb_adapter *adapter)</div><div class='ctx'> 		igb_power_up_phy_copper(&amp;adapter-&gt;hw);</div><div class='ctx'> 	else</div><div class='ctx'> 		igb_power_up_serdes_link_82575(&amp;adapter-&gt;hw);</div><div class='add'>+	igb_reset_phy(&amp;adapter-&gt;hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1742,7 +1748,8 @@ void igb_reset(struct igb_adapter *adapter)</div><div class='ctx'> 	igb_get_phy_info(hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 igb_fix_features(struct net_device *netdev, u32 features)</div><div class='add'>+static netdev_features_t igb_fix_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since there is no support for separate rx/tx vlan accel</div><div class='hunk'>@@ -1756,9 +1763,10 @@ static u32 igb_fix_features(struct net_device *netdev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int igb_set_features(struct net_device *netdev, u32 features)</div><div class='add'>+static int igb_set_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='del'>-	u32 changed = netdev-&gt;features ^ features;</div><div class='add'>+	netdev_features_t changed = netdev-&gt;features ^ features;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; NETIF_F_HW_VLAN_RX)</div><div class='ctx'> 		igb_vlan_mode(netdev, features);</div><div class='hunk'>@@ -2113,6 +2121,8 @@ static int __devinit igb_probe(struct pci_dev *pdev,</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	pm_runtime_put_noidle(&amp;pdev-&gt;dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_register:</div><div class='hunk'>@@ -2152,6 +2162,8 @@ static void __devexit igb_remove(struct pci_dev *pdev)</div><div class='ctx'> 	struct igb_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> </div><div class='add'>+	pm_runtime_get_noresume(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The watchdog timer may be rescheduled, so explicitly</div><div class='ctx'> 	 * disable watchdog from being rescheduled.</div><div class='hunk'>@@ -2474,16 +2486,22 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter)</div><div class='ctx'>  * handler is registered with the OS, the watchdog timer is started,</div><div class='ctx'>  * and the stack is notified that the interface is ready.</div><div class='ctx'>  **/</div><div class='del'>-static int igb_open(struct net_device *netdev)</div><div class='add'>+static int __igb_open(struct net_device *netdev, bool resuming)</div><div class='ctx'> {</div><div class='ctx'> 	struct igb_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* disallow open during test */</div><div class='del'>-	if (test_bit(__IGB_TESTING, &amp;adapter-&gt;state))</div><div class='add'>+	if (test_bit(__IGB_TESTING, &amp;adapter-&gt;state)) {</div><div class='add'>+		WARN_ON(resuming);</div><div class='ctx'> 		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!resuming)</div><div class='add'>+		pm_runtime_get_sync(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2529,6 +2547,9 @@ static int igb_open(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	netif_tx_start_all_queues(netdev);</div><div class='ctx'> </div><div class='add'>+	if (!resuming)</div><div class='add'>+		pm_runtime_put(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	/* start the watchdog. */</div><div class='ctx'> 	hw-&gt;mac.get_link_status = 1;</div><div class='ctx'> 	schedule_work(&amp;adapter-&gt;watchdog_task);</div><div class='hunk'>@@ -2543,10 +2564,17 @@ err_setup_rx:</div><div class='ctx'> 	igb_free_all_tx_resources(adapter);</div><div class='ctx'> err_setup_tx:</div><div class='ctx'> 	igb_reset(adapter);</div><div class='add'>+	if (!resuming)</div><div class='add'>+		pm_runtime_put(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int igb_open(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	return __igb_open(netdev, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * igb_close - Disables a network interface</div><div class='ctx'>  * @netdev: network interface device structure</div><div class='hunk'>@@ -2558,21 +2586,32 @@ err_setup_tx:</div><div class='ctx'>  * needs to be disabled.  A global MAC reset is issued to stop the</div><div class='ctx'>  * hardware, and all transmit and receive resources are freed.</div><div class='ctx'>  **/</div><div class='del'>-static int igb_close(struct net_device *netdev)</div><div class='add'>+static int __igb_close(struct net_device *netdev, bool suspending)</div><div class='ctx'> {</div><div class='ctx'> 	struct igb_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(test_bit(__IGB_RESETTING, &amp;adapter-&gt;state));</div><div class='del'>-	igb_down(adapter);</div><div class='ctx'> </div><div class='add'>+	if (!suspending)</div><div class='add'>+		pm_runtime_get_sync(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	igb_down(adapter);</div><div class='ctx'> 	igb_free_irq(adapter);</div><div class='ctx'> </div><div class='ctx'> 	igb_free_all_tx_resources(adapter);</div><div class='ctx'> 	igb_free_all_rx_resources(adapter);</div><div class='ctx'> </div><div class='add'>+	if (!suspending)</div><div class='add'>+		pm_runtime_put_sync(&amp;pdev-&gt;dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int igb_close(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	return __igb_close(netdev, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * igb_setup_tx_resources - allocate Tx resources (Descriptors)</div><div class='ctx'>  * @tx_ring: tx descriptor ring (for a specific queue) to setup</div><div class='hunk'>@@ -3203,6 +3242,7 @@ static void igb_clean_tx_ring(struct igb_ring *tx_ring)</div><div class='ctx'> 		buffer_info = &amp;tx_ring-&gt;tx_buffer_info[i];</div><div class='ctx'> 		igb_unmap_and_free_tx_resource(tx_ring, buffer_info);</div><div class='ctx'> 	}</div><div class='add'>+	netdev_tx_reset_queue(txring_txq(tx_ring));</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(struct igb_tx_buffer) * tx_ring-&gt;count;</div><div class='ctx'> 	memset(tx_ring-&gt;tx_buffer_info, 0, size);</div><div class='hunk'>@@ -3632,6 +3672,9 @@ static void igb_watchdog_task(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	link = igb_has_link(adapter);</div><div class='ctx'> 	if (link) {</div><div class='add'>+		/* Cancel scheduled suspend requests. */</div><div class='add'>+		pm_runtime_resume(netdev-&gt;dev.parent);</div><div class='add'>+</div><div class='ctx'> 		if (!netif_carrier_ok(netdev)) {</div><div class='ctx'> 			u32 ctrl;</div><div class='ctx'> 			hw-&gt;mac.ops.get_speed_and_duplex(hw,</div><div class='hunk'>@@ -3640,23 +3683,23 @@ static void igb_watchdog_task(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 			ctrl = rd32(E1000_CTRL);</div><div class='ctx'> 			/* Links status message must follow this format */</div><div class='del'>-			printk(KERN_INFO "igb: %s NIC Link is Up %d Mbps %s, "</div><div class='del'>-				 "Flow Control: %s\n",</div><div class='add'>+			printk(KERN_INFO "igb: %s NIC Link is Up %d Mbps %s "</div><div class='add'>+			       "Duplex, Flow Control: %s\n",</div><div class='ctx'> 			       netdev-&gt;name,</div><div class='ctx'> 			       adapter-&gt;link_speed,</div><div class='ctx'> 			       adapter-&gt;link_duplex == FULL_DUPLEX ?</div><div class='del'>-				 "Full Duplex" : "Half Duplex",</div><div class='del'>-			       ((ctrl &amp; E1000_CTRL_TFCE) &amp;&amp;</div><div class='del'>-			        (ctrl &amp; E1000_CTRL_RFCE)) ? "RX/TX" :</div><div class='del'>-			       ((ctrl &amp; E1000_CTRL_RFCE) ?  "RX" :</div><div class='del'>-			       ((ctrl &amp; E1000_CTRL_TFCE) ?  "TX" : "None")));</div><div class='add'>+			       "Full" : "Half",</div><div class='add'>+			       (ctrl &amp; E1000_CTRL_TFCE) &amp;&amp;</div><div class='add'>+			       (ctrl &amp; E1000_CTRL_RFCE) ? "RX/TX" :</div><div class='add'>+			       (ctrl &amp; E1000_CTRL_RFCE) ?  "RX" :</div><div class='add'>+			       (ctrl &amp; E1000_CTRL_TFCE) ?  "TX" : "None");</div><div class='ctx'> </div><div class='ctx'> 			/* check for thermal sensor event */</div><div class='del'>-			if (igb_thermal_sensor_event(hw, E1000_THSTAT_LINK_THROTTLE)) {</div><div class='del'>-				printk(KERN_INFO "igb: %s The network adapter "</div><div class='del'>-						 "link speed was downshifted "</div><div class='del'>-						 "because it overheated.\n",</div><div class='del'>-						 netdev-&gt;name);</div><div class='add'>+			if (igb_thermal_sensor_event(hw,</div><div class='add'>+			    E1000_THSTAT_LINK_THROTTLE)) {</div><div class='add'>+				netdev_info(netdev, "The network adapter link "</div><div class='add'>+					    "speed was downshifted because it "</div><div class='add'>+					    "overheated\n");</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* adjust timeout factor according to speed/duplex */</div><div class='hunk'>@@ -3686,11 +3729,10 @@ static void igb_watchdog_task(struct work_struct *work)</div><div class='ctx'> 			adapter-&gt;link_duplex = 0;</div><div class='ctx'> </div><div class='ctx'> 			/* check for thermal sensor event */</div><div class='del'>-			if (igb_thermal_sensor_event(hw, E1000_THSTAT_PWR_DOWN)) {</div><div class='del'>-				printk(KERN_ERR "igb: %s The network adapter "</div><div class='del'>-						"was stopped because it "</div><div class='del'>-						"overheated.\n",</div><div class='del'>-						netdev-&gt;name);</div><div class='add'>+			if (igb_thermal_sensor_event(hw,</div><div class='add'>+			    E1000_THSTAT_PWR_DOWN)) {</div><div class='add'>+				netdev_err(netdev, "The network adapter was "</div><div class='add'>+					   "stopped because it overheated\n");</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* Links status message must follow this format */</div><div class='hunk'>@@ -3704,6 +3746,9 @@ static void igb_watchdog_task(struct work_struct *work)</div><div class='ctx'> 			if (!test_bit(__IGB_DOWN, &amp;adapter-&gt;state))</div><div class='ctx'> 				mod_timer(&amp;adapter-&gt;phy_info_timer,</div><div class='ctx'> 					  round_jiffies(jiffies + 2 * HZ));</div><div class='add'>+</div><div class='add'>+			pm_schedule_suspend(netdev-&gt;dev.parent,</div><div class='add'>+					    MSEC_PER_SEC * 5);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4241,6 +4286,8 @@ static void igb_tx_map(struct igb_ring *tx_ring,</div><div class='ctx'> 		frag++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netdev_tx_sent_queue(txring_txq(tx_ring), first-&gt;bytecount);</div><div class='add'>+</div><div class='ctx'> 	/* write last descriptor with RS and EOP bits */</div><div class='ctx'> 	cmd_type |= cpu_to_le32(size) | cpu_to_le32(IGB_TXD_DCMD);</div><div class='ctx'> 	tx_desc-&gt;read.cmd_type_len = cmd_type;</div><div class='hunk'>@@ -5780,6 +5827,8 @@ static bool igb_clean_tx_irq(struct igb_q_vector *q_vector)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netdev_tx_completed_queue(txring_txq(tx_ring),</div><div class='add'>+				  total_packets, total_bytes);</div><div class='ctx'> 	i += tx_ring-&gt;count;</div><div class='ctx'> 	tx_ring-&gt;next_to_clean = i;</div><div class='ctx'> 	u64_stats_update_begin(&amp;tx_ring-&gt;tx_syncp);</div><div class='hunk'>@@ -6138,7 +6187,7 @@ static bool igb_alloc_mapped_page(struct igb_ring *rx_ring,</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	if (!page) {</div><div class='del'>-		page = netdev_alloc_page(rx_ring-&gt;netdev);</div><div class='add'>+		page = alloc_page(GFP_ATOMIC | __GFP_COLD);</div><div class='ctx'> 		bi-&gt;page = page;</div><div class='ctx'> 		if (unlikely(!page)) {</div><div class='ctx'> 			rx_ring-&gt;rx_stats.alloc_failed++;</div><div class='hunk'>@@ -6467,7 +6516,7 @@ s32 igb_write_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void igb_vlan_mode(struct net_device *netdev, u32 features)</div><div class='add'>+static void igb_vlan_mode(struct net_device *netdev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct igb_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -6494,7 +6543,7 @@ static void igb_vlan_mode(struct net_device *netdev, u32 features)</div><div class='ctx'> 	igb_rlpml_set(adapter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void igb_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='add'>+static int igb_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct igb_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -6507,9 +6556,11 @@ static void igb_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> 	igb_vfta_set(hw, vid, true);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(vid, adapter-&gt;active_vlans);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void igb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='add'>+static int igb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct igb_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -6524,6 +6575,8 @@ static void igb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> 		igb_vfta_set(hw, vid, false);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(vid, adapter-&gt;active_vlans);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void igb_restore_vlan(struct igb_adapter *adapter)</div><div class='hunk'>@@ -6582,13 +6635,14 @@ err_inval:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake)</div><div class='add'>+static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake,</div><div class='add'>+			  bool runtime)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct igb_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	u32 ctrl, rctl, status;</div><div class='del'>-	u32 wufc = adapter-&gt;wol;</div><div class='add'>+	u32 wufc = runtime ? E1000_WUFC_LNKC : adapter-&gt;wol;</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -6596,7 +6650,7 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake)</div><div class='ctx'> 	netif_device_detach(netdev);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(netdev))</div><div class='del'>-		igb_close(netdev);</div><div class='add'>+		__igb_close(netdev, true);</div><div class='ctx'> </div><div class='ctx'> 	igb_clear_interrupt_scheme(adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -6655,12 +6709,13 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='del'>-static int igb_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+static int igb_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	bool wake;</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='ctx'> </div><div class='del'>-	retval = __igb_shutdown(pdev, &amp;wake);</div><div class='add'>+	retval = __igb_shutdown(pdev, &amp;wake, 0);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='hunk'>@@ -6674,8 +6729,9 @@ static int igb_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int igb_resume(struct pci_dev *pdev)</div><div class='add'>+static int igb_resume(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='ctx'> 	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct igb_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -6696,7 +6752,18 @@ static int igb_resume(struct pci_dev *pdev)</div><div class='ctx'> 	pci_enable_wake(pdev, PCI_D3hot, 0);</div><div class='ctx'> 	pci_enable_wake(pdev, PCI_D3cold, 0);</div><div class='ctx'> </div><div class='del'>-	if (igb_init_interrupt_scheme(adapter)) {</div><div class='add'>+	if (!rtnl_is_locked()) {</div><div class='add'>+		/*</div><div class='add'>+		 * shut up ASSERT_RTNL() warning in</div><div class='add'>+		 * netif_set_real_num_tx/rx_queues.</div><div class='add'>+		 */</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		err = igb_init_interrupt_scheme(adapter);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+	} else {</div><div class='add'>+		err = igb_init_interrupt_scheme(adapter);</div><div class='add'>+	}</div><div class='add'>+	if (err) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Unable to allocate memory for queues\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6709,23 +6776,61 @@ static int igb_resume(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	wr32(E1000_WUS, ~0);</div><div class='ctx'> </div><div class='del'>-	if (netif_running(netdev)) {</div><div class='del'>-		err = igb_open(netdev);</div><div class='add'>+	if (netdev-&gt;flags &amp; IFF_UP) {</div><div class='add'>+		err = __igb_open(netdev, true);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	netif_device_attach(netdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_RUNTIME</div><div class='add'>+static int igb_runtime_idle(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='add'>+	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct igb_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (!igb_has_link(adapter))</div><div class='add'>+		pm_schedule_suspend(dev, MSEC_PER_SEC * 5);</div><div class='add'>+</div><div class='add'>+	return -EBUSY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int igb_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='add'>+	int retval;</div><div class='add'>+	bool wake;</div><div class='add'>+</div><div class='add'>+	retval = __igb_shutdown(pdev, &amp;wake, 1);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	if (wake) {</div><div class='add'>+		pci_prepare_to_sleep(pdev);</div><div class='add'>+	} else {</div><div class='add'>+		pci_wake_from_d3(pdev, false);</div><div class='add'>+		pci_set_power_state(pdev, PCI_D3hot);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int igb_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return igb_resume(dev);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PM_RUNTIME */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void igb_shutdown(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	bool wake;</div><div class='ctx'> </div><div class='del'>-	__igb_shutdown(pdev, &amp;wake);</div><div class='add'>+	__igb_shutdown(pdev, &amp;wake, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (system_state == SYSTEM_POWER_OFF) {</div><div class='ctx'> 		pci_wake_from_d3(pdev, wake);</div><div class='hunk'>@@ -7064,15 +7169,28 @@ static void igb_init_dmac(struct igb_adapter *adapter, u32 pba)</div><div class='ctx'> 			wr32(E1000_DMCTXTH, 0);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='del'>-			 * DMA Coalescing high water mark needs to be higher</div><div class='del'>-			 * than the RX threshold. set hwm to PBA -  2 * max</div><div class='del'>-			 * frame size</div><div class='add'>+			 * DMA Coalescing high water mark needs to be greater</div><div class='add'>+			 * than the Rx threshold. Set hwm to PBA - max frame</div><div class='add'>+			 * size in 16B units, capping it at PBA - 6KB.</div><div class='ctx'> 			 */</div><div class='del'>-			hwm = pba - (2 * adapter-&gt;max_frame_size);</div><div class='add'>+			hwm = 64 * pba - adapter-&gt;max_frame_size / 16;</div><div class='add'>+			if (hwm &lt; 64 * (pba - 6))</div><div class='add'>+				hwm = 64 * (pba - 6);</div><div class='add'>+			reg = rd32(E1000_FCRTC);</div><div class='add'>+			reg &amp;= ~E1000_FCRTC_RTH_COAL_MASK;</div><div class='add'>+			reg |= ((hwm &lt;&lt; E1000_FCRTC_RTH_COAL_SHIFT)</div><div class='add'>+				&amp; E1000_FCRTC_RTH_COAL_MASK);</div><div class='add'>+			wr32(E1000_FCRTC, reg);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Set the DMA Coalescing Rx threshold to PBA - 2 * max</div><div class='add'>+			 * frame size, capping it at PBA - 10KB.</div><div class='add'>+			 */</div><div class='add'>+			dmac_thr = pba - adapter-&gt;max_frame_size / 512;</div><div class='add'>+			if (dmac_thr &lt; pba - 10)</div><div class='add'>+				dmac_thr = pba - 10;</div><div class='ctx'> 			reg = rd32(E1000_DMACR);</div><div class='ctx'> 			reg &amp;= ~E1000_DMACR_DMACTHR_MASK;</div><div class='del'>-			dmac_thr = pba - 4;</div><div class='del'>-</div><div class='ctx'> 			reg |= ((dmac_thr &lt;&lt; E1000_DMACR_DMACTHR_SHIFT)</div><div class='ctx'> 				&amp; E1000_DMACR_DMACTHR_MASK);</div><div class='ctx'> </div><div class='hunk'>@@ -7088,7 +7206,6 @@ static void igb_init_dmac(struct igb_adapter *adapter, u32 pba)</div><div class='ctx'> 			 * coalescing(smart fifb)-UTRESH=0</div><div class='ctx'> 			 */</div><div class='ctx'> 			wr32(E1000_DMCRTRH, 0);</div><div class='del'>-			wr32(E1000_FCRTC, hwm);</div><div class='ctx'> </div><div class='ctx'> 			reg = (IGB_DMCTLX_DCFLUSH_DIS | 0x4);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/intel/igbvf/ethtool.c b/drivers/net/ethernet/intel/igbvf/ethtool.c<br/>index 2c25858cc0ff..7b600a1f6366 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/igbvf/ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/igbvf/ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/igbvf/ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/igbvf/ethtool.c</a></div><div class='hunk'>@@ -191,12 +191,12 @@ static void igbvf_get_drvinfo(struct net_device *netdev,</div><div class='ctx'>                               struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> {</div><div class='ctx'> 	struct igbvf_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	char firmware_version[32] = "N/A";</div><div class='ctx'> </div><div class='del'>-	strncpy(drvinfo-&gt;driver,  igbvf_driver_name, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;version, igbvf_driver_version, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;fw_version, firmware_version, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev), 32);</div><div class='add'>+	strlcpy(drvinfo-&gt;driver,  igbvf_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, igbvf_driver_version,</div><div class='add'>+		sizeof(drvinfo-&gt;version));</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	drvinfo-&gt;regdump_len = igbvf_get_regs_len(netdev);</div><div class='ctx'> 	drvinfo-&gt;eedump_len = igbvf_get_eeprom_len(netdev);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c<br/>index cca78124be31..fd3da3076c2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/igbvf/netdev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/igbvf/netdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/igbvf/netdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/igbvf/netdev.c</a></div><div class='hunk'>@@ -25,6 +25,8 @@</div><div class='ctx'> </div><div class='ctx'> *******************************************************************************/</div><div class='ctx'> </div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/module.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='hunk'>@@ -1174,18 +1176,20 @@ static void igbvf_set_rlpml(struct igbvf_adapter *adapter)</div><div class='ctx'> 	e1000_rlpml_set_vf(hw, max_frame_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void igbvf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='add'>+static int igbvf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct igbvf_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> </div><div class='del'>-	if (hw-&gt;mac.ops.set_vfta(hw, vid, true))</div><div class='add'>+	if (hw-&gt;mac.ops.set_vfta(hw, vid, true)) {</div><div class='ctx'> 		dev_err(&amp;adapter-&gt;pdev-&gt;dev, "Failed to add vlan id %d\n", vid);</div><div class='del'>-	else</div><div class='del'>-		set_bit(vid, adapter-&gt;active_vlans);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	set_bit(vid, adapter-&gt;active_vlans);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void igbvf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='add'>+static int igbvf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct igbvf_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -1195,11 +1199,13 @@ static void igbvf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> 	if (!test_bit(__IGBVF_DOWN, &amp;adapter-&gt;state))</div><div class='ctx'> 		igbvf_irq_enable(adapter);</div><div class='ctx'> </div><div class='del'>-	if (hw-&gt;mac.ops.set_vfta(hw, vid, false))</div><div class='add'>+	if (hw-&gt;mac.ops.set_vfta(hw, vid, false)) {</div><div class='ctx'> 		dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='ctx'> 		        "Failed to remove vlan id %d\n", vid);</div><div class='del'>-	else</div><div class='del'>-		clear_bit(vid, adapter-&gt;active_vlans);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	clear_bit(vid, adapter-&gt;active_vlans);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void igbvf_restore_vlan(struct igbvf_adapter *adapter)</div><div class='hunk'>@@ -1746,10 +1752,9 @@ void igbvf_update_stats(struct igbvf_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> static void igbvf_print_link_info(struct igbvf_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	dev_info(&amp;adapter-&gt;pdev-&gt;dev, "Link is Up %d Mbps %s\n",</div><div class='del'>-	         adapter-&gt;link_speed,</div><div class='del'>-	         ((adapter-&gt;link_duplex == FULL_DUPLEX) ?</div><div class='del'>-	          "Full Duplex" : "Half Duplex"));</div><div class='add'>+	dev_info(&amp;adapter-&gt;pdev-&gt;dev, "Link is Up %d Mbps %s Duplex\n",</div><div class='add'>+		 adapter-&gt;link_speed,</div><div class='add'>+		 adapter-&gt;link_duplex == FULL_DUPLEX ? "Full" : "Half");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool igbvf_has_link(struct igbvf_adapter *adapter)</div><div class='hunk'>@@ -2532,7 +2537,8 @@ static void igbvf_print_device_info(struct igbvf_adapter *adapter)</div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "Address: %pM\n", netdev-&gt;dev_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int igbvf_set_features(struct net_device *netdev, u32 features)</div><div class='add'>+static int igbvf_set_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct igbvf_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2842,9 +2848,8 @@ static struct pci_driver igbvf_driver = {</div><div class='ctx'> static int __init igbvf_init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	printk(KERN_INFO "%s - version %s\n",</div><div class='del'>-	       igbvf_driver_string, igbvf_driver_version);</div><div class='del'>-	printk(KERN_INFO "%s\n", igbvf_copyright);</div><div class='add'>+	pr_info("%s - version %s\n", igbvf_driver_string, igbvf_driver_version);</div><div class='add'>+	pr_info("%s\n", igbvf_copyright);</div><div class='ctx'> </div><div class='ctx'> 	ret = pci_register_driver(&amp;igbvf_driver);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c b/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c<br/>index 9dfce7dff79b..dbb7dd2f8e36 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c</a></div><div class='hunk'>@@ -473,10 +473,12 @@ ixgb_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgb_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	strncpy(drvinfo-&gt;driver,  ixgb_driver_name, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;version, ixgb_driver_version, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;fw_version, "N/A", 32);</div><div class='del'>-	strncpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev), 32);</div><div class='add'>+	strlcpy(drvinfo-&gt;driver,  ixgb_driver_name,</div><div class='add'>+		sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, ixgb_driver_version,</div><div class='add'>+		sizeof(drvinfo-&gt;version));</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	drvinfo-&gt;n_stats = IXGB_STATS_LEN;</div><div class='ctx'> 	drvinfo-&gt;regdump_len = ixgb_get_regs_len(netdev);</div><div class='ctx'> 	drvinfo-&gt;eedump_len = ixgb_get_eeprom_len(netdev);</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c<br/>index e21148f8b160..9bd5faf64a85 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgb/ixgb_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgb/ixgb_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgb/ixgb_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgb/ixgb_main.c</a></div><div class='hunk'>@@ -101,8 +101,8 @@ static void ixgb_tx_timeout_task(struct work_struct *work);</div><div class='ctx'> </div><div class='ctx'> static void ixgb_vlan_strip_enable(struct ixgb_adapter *adapter);</div><div class='ctx'> static void ixgb_vlan_strip_disable(struct ixgb_adapter *adapter);</div><div class='del'>-static void ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid);</div><div class='del'>-static void ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);</div><div class='add'>+static int ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid);</div><div class='add'>+static int ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);</div><div class='ctx'> static void ixgb_restore_vlan(struct ixgb_adapter *adapter);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='hunk'>@@ -228,7 +228,7 @@ ixgb_up(struct ixgb_adapter *adapter)</div><div class='ctx'> 	if (IXGB_READ_REG(&amp;adapter-&gt;hw, STATUS) &amp; IXGB_STATUS_PCIX_MODE) {</div><div class='ctx'> 		err = pci_enable_msi(adapter-&gt;pdev);</div><div class='ctx'> 		if (!err) {</div><div class='del'>-			adapter-&gt;have_msi = 1;</div><div class='add'>+			adapter-&gt;have_msi = true;</div><div class='ctx'> 			irq_flags = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* proceed to try to request regular interrupt */</div><div class='hunk'>@@ -325,8 +325,8 @@ ixgb_reset(struct ixgb_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32</div><div class='del'>-ixgb_fix_features(struct net_device *netdev, u32 features)</div><div class='add'>+static netdev_features_t</div><div class='add'>+ixgb_fix_features(struct net_device *netdev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Tx VLAN insertion does not work per HW design when Rx stripping is</div><div class='hunk'>@@ -339,10 +339,10 @@ ixgb_fix_features(struct net_device *netdev, u32 features)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-ixgb_set_features(struct net_device *netdev, u32 features)</div><div class='add'>+ixgb_set_features(struct net_device *netdev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgb_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	u32 changed = features ^ netdev-&gt;features;</div><div class='add'>+	netdev_features_t changed = features ^ netdev-&gt;features;</div><div class='ctx'> </div><div class='ctx'> 	if (!(changed &amp; (NETIF_F_RXCSUM|NETIF_F_HW_VLAN_RX)))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -2217,7 +2217,7 @@ ixgb_vlan_strip_disable(struct ixgb_adapter *adapter)</div><div class='ctx'> 	IXGB_WRITE_REG(&amp;adapter-&gt;hw, CTRL0, ctrl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+static int</div><div class='ctx'> ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgb_adapter *adapter = netdev_priv(netdev);</div><div class='hunk'>@@ -2230,9 +2230,11 @@ ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> 	vfta |= (1 &lt;&lt; (vid &amp; 0x1F));</div><div class='ctx'> 	ixgb_write_vfta(&amp;adapter-&gt;hw, index, vfta);</div><div class='ctx'> 	set_bit(vid, adapter-&gt;active_vlans);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+static int</div><div class='ctx'> ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgb_adapter *adapter = netdev_priv(netdev);</div><div class='hunk'>@@ -2245,6 +2247,8 @@ ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> 	vfta &amp;= ~(1 &lt;&lt; (vid &amp; 0x1F));</div><div class='ctx'> 	ixgb_write_vfta(&amp;adapter-&gt;hw, index, vfta);</div><div class='ctx'> 	clear_bit(vid, adapter-&gt;active_vlans);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h<br/>index a8368d5cf686..258164d6d45a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgbe/ixgbe.h</a></div><div class='hunk'>@@ -560,6 +560,7 @@ extern int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,</div><div class='ctx'> </div><div class='ctx'> extern char ixgbe_driver_name[];</div><div class='ctx'> extern const char ixgbe_driver_version[];</div><div class='add'>+extern char ixgbe_default_device_descr[];</div><div class='ctx'> </div><div class='ctx'> extern void ixgbe_up(struct ixgbe_adapter *adapter);</div><div class='ctx'> extern void ixgbe_down(struct ixgbe_adapter *adapter);</div><div class='hunk'>@@ -627,6 +628,8 @@ extern u8 ixgbe_fcoe_getapp(struct ixgbe_adapter *adapter);</div><div class='ctx'> extern u8 ixgbe_fcoe_setapp(struct ixgbe_adapter *adapter, u8 up);</div><div class='ctx'> #endif /* CONFIG_IXGBE_DCB */</div><div class='ctx'> extern int ixgbe_fcoe_get_wwn(struct net_device *netdev, u64 *wwn, int type);</div><div class='add'>+extern int ixgbe_fcoe_get_hbainfo(struct net_device *netdev,</div><div class='add'>+				  struct netdev_fcoe_hbainfo *info);</div><div class='ctx'> #endif /* IXGBE_FCOE */</div><div class='ctx'> </div><div class='ctx'> #endif /* _IXGBE_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c<br/>index 4ae26a748da0..772072147bea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c</a></div><div class='hunk'>@@ -356,6 +356,7 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw)</div><div class='ctx'> 	case IXGBE_DEV_ID_82599_SFP_FCOE:</div><div class='ctx'> 	case IXGBE_DEV_ID_82599_SFP_EM:</div><div class='ctx'> 	case IXGBE_DEV_ID_82599_SFP_SF2:</div><div class='add'>+	case IXGBE_DEV_ID_82599_SFP_SF_QP:</div><div class='ctx'> 	case IXGBE_DEV_ID_82599EN_SFP:</div><div class='ctx'> 		media_type = ixgbe_media_type_fiber;</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c<br/>index f1365fef4ed2..a3aa6333073f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgbe/ixgbe_common.c</a></div><div class='hunk'>@@ -266,10 +266,10 @@ s32 ixgbe_clear_hw_cntrs_generic(struct ixgbe_hw *hw)</div><div class='ctx'> 	if (hw-&gt;mac.type == ixgbe_mac_X540) {</div><div class='ctx'> 		if (hw-&gt;phy.id == 0)</div><div class='ctx'> 			hw-&gt;phy.ops.identify(hw);</div><div class='del'>-		hw-&gt;phy.ops.read_reg(hw, 0x3, IXGBE_PCRC8ECL, &amp;i);</div><div class='del'>-		hw-&gt;phy.ops.read_reg(hw, 0x3, IXGBE_PCRC8ECH, &amp;i);</div><div class='del'>-		hw-&gt;phy.ops.read_reg(hw, 0x3, IXGBE_LDPCECL, &amp;i);</div><div class='del'>-		hw-&gt;phy.ops.read_reg(hw, 0x3, IXGBE_LDPCECH, &amp;i);</div><div class='add'>+		hw-&gt;phy.ops.read_reg(hw, IXGBE_PCRC8ECL, MDIO_MMD_PCS, &amp;i);</div><div class='add'>+		hw-&gt;phy.ops.read_reg(hw, IXGBE_PCRC8ECH, MDIO_MMD_PCS, &amp;i);</div><div class='add'>+		hw-&gt;phy.ops.read_reg(hw, IXGBE_LDPCECL, MDIO_MMD_PCS, &amp;i);</div><div class='add'>+		hw-&gt;phy.ops.read_reg(hw, IXGBE_LDPCECH, MDIO_MMD_PCS, &amp;i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2599,7 +2599,7 @@ s32 ixgbe_enable_rx_dma_generic(struct ixgbe_hw *hw, u32 regval)</div><div class='ctx'> s32 ixgbe_blink_led_start_generic(struct ixgbe_hw *hw, u32 index)</div><div class='ctx'> {</div><div class='ctx'> 	ixgbe_link_speed speed = 0;</div><div class='del'>-	bool link_up = 0;</div><div class='add'>+	bool link_up = false;</div><div class='ctx'> 	u32 autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);</div><div class='ctx'> 	u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c<br/>index 33b93ffb87cb..da31735311f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c</a></div><div class='hunk'>@@ -158,10 +158,6 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_tx(struct net_device *netdev, int tc,</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	/* Abort a bad configuration */</div><div class='del'>-	if (ffs(up_map) &gt; adapter-&gt;dcb_cfg.num_tcs.pg_tcs)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	if (prio != DCB_ATTR_VALUE_UNDEFINED)</div><div class='ctx'> 		adapter-&gt;temp_dcb_cfg.tc_config[tc].path[0].prio_type = prio;</div><div class='ctx'> 	if (bwg_id != DCB_ATTR_VALUE_UNDEFINED)</div><div class='hunk'>@@ -185,7 +181,7 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_tx(struct net_device *netdev, int tc,</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;temp_dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap !=</div><div class='ctx'> 	     adapter-&gt;dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap)</div><div class='del'>-		adapter-&gt;dcb_set_bitmap |= BIT_PFC;</div><div class='add'>+		adapter-&gt;dcb_set_bitmap |= BIT_PFC | BIT_APP_UPCHG;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ixgbe_dcbnl_set_pg_bwg_cfg_tx(struct net_device *netdev, int bwg_id,</div><div class='hunk'>@@ -206,10 +202,6 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_rx(struct net_device *netdev, int tc,</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	/* Abort bad configurations */</div><div class='del'>-	if (ffs(up_map) &gt; adapter-&gt;dcb_cfg.num_tcs.pg_tcs)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	if (prio != DCB_ATTR_VALUE_UNDEFINED)</div><div class='ctx'> 		adapter-&gt;temp_dcb_cfg.tc_config[tc].path[1].prio_type = prio;</div><div class='ctx'> 	if (bwg_id != DCB_ATTR_VALUE_UNDEFINED)</div><div class='hunk'>@@ -309,6 +301,27 @@ static void ixgbe_dcbnl_get_pfc_cfg(struct net_device *netdev, int priority,</div><div class='ctx'> 	*setting = adapter-&gt;dcb_cfg.tc_config[priority].dcb_pfc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef IXGBE_FCOE</div><div class='add'>+static void ixgbe_dcbnl_devreset(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ixgbe_adapter *adapter = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	while (test_and_set_bit(__IXGBE_RESETTING, &amp;adapter-&gt;state))</div><div class='add'>+		usleep_range(1000, 2000);</div><div class='add'>+</div><div class='add'>+	if (netif_running(dev))</div><div class='add'>+		dev-&gt;netdev_ops-&gt;ndo_stop(dev);</div><div class='add'>+</div><div class='add'>+	ixgbe_clear_interrupt_scheme(adapter);</div><div class='add'>+	ixgbe_init_interrupt_scheme(adapter);</div><div class='add'>+</div><div class='add'>+	if (netif_running(dev))</div><div class='add'>+		dev-&gt;netdev_ops-&gt;ndo_open(dev);</div><div class='add'>+</div><div class='add'>+	clear_bit(__IXGBE_RESETTING, &amp;adapter-&gt;state);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='hunk'>@@ -338,27 +351,6 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return DCB_NO_HW_CHG;</div><div class='ctx'> </div><div class='del'>-#ifdef IXGBE_FCOE</div><div class='del'>-	if (up &amp;&amp; !(up &amp; (1 &lt;&lt; adapter-&gt;fcoe.up)))</div><div class='del'>-		adapter-&gt;dcb_set_bitmap |= BIT_APP_UPCHG;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Only take down the adapter if an app change occurred. FCoE</div><div class='del'>-	 * may shuffle tx rings in this case and this can not be done</div><div class='del'>-	 * without a reset currently.</div><div class='del'>-	 */</div><div class='del'>-	if (adapter-&gt;dcb_set_bitmap &amp; BIT_APP_UPCHG) {</div><div class='del'>-		while (test_and_set_bit(__IXGBE_RESETTING, &amp;adapter-&gt;state))</div><div class='del'>-			usleep_range(1000, 2000);</div><div class='del'>-</div><div class='del'>-		adapter-&gt;fcoe.up = ffs(up) - 1;</div><div class='del'>-</div><div class='del'>-		if (netif_running(netdev))</div><div class='del'>-			netdev-&gt;netdev_ops-&gt;ndo_stop(netdev);</div><div class='del'>-		ixgbe_clear_interrupt_scheme(adapter);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (adapter-&gt;dcb_cfg.pfc_mode_enable) {</div><div class='ctx'> 		switch (adapter-&gt;hw.mac.type) {</div><div class='ctx'> 		case ixgbe_mac_82599EB:</div><div class='hunk'>@@ -385,15 +377,6 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef IXGBE_FCOE</div><div class='del'>-	if (adapter-&gt;dcb_set_bitmap &amp; BIT_APP_UPCHG) {</div><div class='del'>-		ixgbe_init_interrupt_scheme(adapter);</div><div class='del'>-		if (netif_running(netdev))</div><div class='del'>-			netdev-&gt;netdev_ops-&gt;ndo_open(netdev);</div><div class='del'>-		ret = DCB_HW_CHG_RST;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (adapter-&gt;dcb_set_bitmap &amp; (BIT_PG_TX|BIT_PG_RX)) {</div><div class='ctx'> 		u16 refill[MAX_TRAFFIC_CLASS], max[MAX_TRAFFIC_CLASS];</div><div class='ctx'> 		u8 bwg_id[MAX_TRAFFIC_CLASS], prio_type[MAX_TRAFFIC_CLASS];</div><div class='hunk'>@@ -442,8 +425,19 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)</div><div class='ctx'> 	if (adapter-&gt;dcb_cfg.pfc_mode_enable)</div><div class='ctx'> 		adapter-&gt;hw.fc.current_mode = ixgbe_fc_pfc;</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;dcb_set_bitmap &amp; BIT_APP_UPCHG)</div><div class='del'>-		clear_bit(__IXGBE_RESETTING, &amp;adapter-&gt;state);</div><div class='add'>+#ifdef IXGBE_FCOE</div><div class='add'>+	/* Reprogam FCoE hardware offloads when the traffic class</div><div class='add'>+	 * FCoE is using changes. This happens if the APP info</div><div class='add'>+	 * changes or the up2tc mapping is updated.</div><div class='add'>+	 */</div><div class='add'>+	if ((up &amp;&amp; !(up &amp; (1 &lt;&lt; adapter-&gt;fcoe.up))) ||</div><div class='add'>+	    (adapter-&gt;dcb_set_bitmap &amp; BIT_APP_UPCHG)) {</div><div class='add'>+		adapter-&gt;fcoe.up = ffs(up) - 1;</div><div class='add'>+		ixgbe_dcbnl_devreset(netdev);</div><div class='add'>+		ret = DCB_HW_CHG_RST;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	adapter-&gt;dcb_set_bitmap = 0x00;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -661,22 +655,6 @@ static int ixgbe_dcbnl_ieee_setpfc(struct net_device *dev,</div><div class='ctx'> 	return ixgbe_dcb_hw_pfc_config(&amp;adapter-&gt;hw, pfc-&gt;pfc_en, prio_tc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef IXGBE_FCOE</div><div class='del'>-static void ixgbe_dcbnl_devreset(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct ixgbe_adapter *adapter = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (netif_running(dev))</div><div class='del'>-		dev-&gt;netdev_ops-&gt;ndo_stop(dev);</div><div class='del'>-</div><div class='del'>-	ixgbe_clear_interrupt_scheme(adapter);</div><div class='del'>-	ixgbe_init_interrupt_scheme(adapter);</div><div class='del'>-</div><div class='del'>-	if (netif_running(dev))</div><div class='del'>-		dev-&gt;netdev_ops-&gt;ndo_open(dev);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static int ixgbe_dcbnl_ieee_setapp(struct net_device *dev,</div><div class='ctx'> 				   struct dcb_app *app)</div><div class='ctx'> {</div><div class='hunk'>@@ -761,7 +739,9 @@ static u8 ixgbe_dcbnl_setdcbx(struct net_device *dev, u8 mode)</div><div class='ctx'> 		ixgbe_dcbnl_ieee_setets(dev, &amp;ets);</div><div class='ctx'> 		ixgbe_dcbnl_ieee_setpfc(dev, &amp;pfc);</div><div class='ctx'> 	} else if (mode &amp; DCB_CAP_DCBX_VER_CEE) {</div><div class='del'>-		adapter-&gt;dcb_set_bitmap |= (BIT_PFC &amp; BIT_PG_TX &amp; BIT_PG_RX);</div><div class='add'>+		u8 mask = BIT_PFC | BIT_PG_TX | BIT_PG_RX | BIT_APP_UPCHG;</div><div class='add'>+</div><div class='add'>+		adapter-&gt;dcb_set_bitmap |= mask;</div><div class='ctx'> 		ixgbe_dcbnl_set_all(dev);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Drop into single TC mode strict priority as this</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c<br/>index 70d58c3849b0..da7e580f517a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c</a></div><div class='hunk'>@@ -888,23 +888,19 @@ static void ixgbe_get_drvinfo(struct net_device *netdev,</div><div class='ctx'>                               struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	char firmware_version[32];</div><div class='ctx'> 	u32 nvm_track_id;</div><div class='ctx'> </div><div class='del'>-	strncpy(drvinfo-&gt;driver, ixgbe_driver_name,</div><div class='del'>-	        sizeof(drvinfo-&gt;driver) - 1);</div><div class='del'>-	strncpy(drvinfo-&gt;version, ixgbe_driver_version,</div><div class='del'>-	        sizeof(drvinfo-&gt;version) - 1);</div><div class='add'>+	strlcpy(drvinfo-&gt;driver, ixgbe_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, ixgbe_driver_version,</div><div class='add'>+		sizeof(drvinfo-&gt;version));</div><div class='ctx'> </div><div class='ctx'> 	nvm_track_id = (adapter-&gt;eeprom_verh &lt;&lt; 16) |</div><div class='ctx'> 			adapter-&gt;eeprom_verl;</div><div class='del'>-	snprintf(firmware_version, sizeof(firmware_version), "0x%08x",</div><div class='add'>+	snprintf(drvinfo-&gt;fw_version, sizeof(drvinfo-&gt;fw_version), "0x%08x",</div><div class='ctx'> 		 nvm_track_id);</div><div class='ctx'> </div><div class='del'>-	strncpy(drvinfo-&gt;fw_version, firmware_version,</div><div class='del'>-		sizeof(drvinfo-&gt;fw_version) - 1);</div><div class='del'>-	strncpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='del'>-		sizeof(drvinfo-&gt;bus_info) - 1);</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	drvinfo-&gt;n_stats = IXGBE_STATS_LEN;</div><div class='ctx'> 	drvinfo-&gt;testinfo_len = IXGBE_TEST_LEN;</div><div class='ctx'> 	drvinfo-&gt;regdump_len = ixgbe_get_regs_len(netdev);</div><div class='hunk'>@@ -1959,12 +1955,21 @@ static int ixgbe_wol_exclusion(struct ixgbe_adapter *adapter,</div><div class='ctx'> 	/* WOL not supported except for the following */</div><div class='ctx'> 	switch(hw-&gt;device_id) {</div><div class='ctx'> 	case IXGBE_DEV_ID_82599_SFP:</div><div class='del'>-		/* Only this subdevice supports WOL */</div><div class='del'>-		if (hw-&gt;subsystem_device_id != IXGBE_SUBDEV_ID_82599_SFP) {</div><div class='add'>+		/* Only these subdevices could supports WOL */</div><div class='add'>+		switch (hw-&gt;subsystem_device_id) {</div><div class='add'>+		case IXGBE_SUBDEV_ID_82599_560FLR:</div><div class='add'>+			/* only support first port */</div><div class='add'>+			if (hw-&gt;bus.func != 0) {</div><div class='add'>+				wol-&gt;supported = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		case IXGBE_SUBDEV_ID_82599_SFP:</div><div class='add'>+			retval = 0;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='ctx'> 			wol-&gt;supported = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		retval = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IXGBE_DEV_ID_82599_COMBO_BACKPLANE:</div><div class='ctx'> 		/* All except this subdevice support WOL */</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c<br/>index df3b1be69d83..d18d6157dd2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c</a></div><div class='hunk'>@@ -855,3 +855,86 @@ int ixgbe_fcoe_get_wwn(struct net_device *netdev, u64 *wwn, int type)</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ixgbe_fcoe_get_hbainfo - get FCoE HBA information</div><div class='add'>+ * @netdev : ixgbe adapter</div><div class='add'>+ * @info : HBA information</div><div class='add'>+ *</div><div class='add'>+ * Returns ixgbe HBA information</div><div class='add'>+ *</div><div class='add'>+ * Returns : 0 on success</div><div class='add'>+ */</div><div class='add'>+int ixgbe_fcoe_get_hbainfo(struct net_device *netdev,</div><div class='add'>+			   struct netdev_fcoe_hbainfo *info)</div><div class='add'>+{</div><div class='add'>+	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	int i, pos;</div><div class='add'>+	u8 buf[8];</div><div class='add'>+</div><div class='add'>+	if (!info)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Don't return information on unsupported devices */</div><div class='add'>+	if (hw-&gt;mac.type != ixgbe_mac_82599EB &amp;&amp;</div><div class='add'>+	    hw-&gt;mac.type != ixgbe_mac_X540)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Manufacturer */</div><div class='add'>+	snprintf(info-&gt;manufacturer, sizeof(info-&gt;manufacturer),</div><div class='add'>+		 "Intel Corporation");</div><div class='add'>+</div><div class='add'>+	/* Serial Number */</div><div class='add'>+</div><div class='add'>+	/* Get the PCI-e Device Serial Number Capability */</div><div class='add'>+	pos = pci_find_ext_capability(adapter-&gt;pdev, PCI_EXT_CAP_ID_DSN);</div><div class='add'>+	if (pos) {</div><div class='add'>+		pos += 4;</div><div class='add'>+		for (i = 0; i &lt; 8; i++)</div><div class='add'>+			pci_read_config_byte(adapter-&gt;pdev, pos + i, &amp;buf[i]);</div><div class='add'>+</div><div class='add'>+		snprintf(info-&gt;serial_number, sizeof(info-&gt;serial_number),</div><div class='add'>+			 "%02X%02X%02X%02X%02X%02X%02X%02X",</div><div class='add'>+			 buf[7], buf[6], buf[5], buf[4],</div><div class='add'>+			 buf[3], buf[2], buf[1], buf[0]);</div><div class='add'>+	} else</div><div class='add'>+		snprintf(info-&gt;serial_number, sizeof(info-&gt;serial_number),</div><div class='add'>+			 "Unknown");</div><div class='add'>+</div><div class='add'>+	/* Hardware Version */</div><div class='add'>+	snprintf(info-&gt;hardware_version,</div><div class='add'>+		 sizeof(info-&gt;hardware_version),</div><div class='add'>+		 "Rev %d", hw-&gt;revision_id);</div><div class='add'>+	/* Driver Name/Version */</div><div class='add'>+	snprintf(info-&gt;driver_version,</div><div class='add'>+		 sizeof(info-&gt;driver_version),</div><div class='add'>+		 "%s v%s",</div><div class='add'>+		 ixgbe_driver_name,</div><div class='add'>+		 ixgbe_driver_version);</div><div class='add'>+	/* Firmware Version */</div><div class='add'>+	snprintf(info-&gt;firmware_version,</div><div class='add'>+		 sizeof(info-&gt;firmware_version),</div><div class='add'>+		 "0x%08x",</div><div class='add'>+		 (adapter-&gt;eeprom_verh &lt;&lt; 16) |</div><div class='add'>+		  adapter-&gt;eeprom_verl);</div><div class='add'>+</div><div class='add'>+	/* Model */</div><div class='add'>+	if (hw-&gt;mac.type == ixgbe_mac_82599EB) {</div><div class='add'>+		snprintf(info-&gt;model,</div><div class='add'>+			 sizeof(info-&gt;model),</div><div class='add'>+			 "Intel 82599");</div><div class='add'>+	} else {</div><div class='add'>+		snprintf(info-&gt;model,</div><div class='add'>+			 sizeof(info-&gt;model),</div><div class='add'>+			 "Intel X540");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Model Description */</div><div class='add'>+	snprintf(info-&gt;model_description,</div><div class='add'>+		 sizeof(info-&gt;model_description),</div><div class='add'>+		 "%s",</div><div class='add'>+		 ixgbe_default_device_descr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</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 8ef92d1a6aa1..1ee5d0fbb905 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgbe/ixgbe_main.c</a></div><div class='hunk'>@@ -55,6 +55,8 @@</div><div class='ctx'> char ixgbe_driver_name[] = "ixgbe";</div><div class='ctx'> static const char ixgbe_driver_string[] =</div><div class='ctx'> 			      "Intel(R) 10 Gigabit PCI Express Network Driver";</div><div class='add'>+char ixgbe_default_device_descr[] =</div><div class='add'>+			      "Intel(R) 10 Gigabit Network Connection";</div><div class='ctx'> #define MAJ 3</div><div class='ctx'> #define MIN 6</div><div class='ctx'> #define BUILD 7</div><div class='hunk'>@@ -106,6 +108,7 @@ static DEFINE_PCI_DEVICE_TABLE(ixgbe_pci_tbl) = {</div><div class='ctx'> 	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF2), board_82599 },</div><div class='ctx'> 	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_LS), board_82599 },</div><div class='ctx'> 	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599EN_SFP), board_82599 },</div><div class='add'>+	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF_QP), board_82599 },</div><div class='ctx'> 	/* required last entry */</div><div class='ctx'> 	{0, }</div><div class='ctx'> };</div><div class='hunk'>@@ -146,7 +149,7 @@ static void ixgbe_service_event_complete(struct ixgbe_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON(!test_bit(__IXGBE_SERVICE_SCHED, &amp;adapter-&gt;state));</div><div class='ctx'> </div><div class='del'>-	/* flush memory to make sure state is correct before next watchog */</div><div class='add'>+	/* flush memory to make sure state is correct before next watchdog */</div><div class='ctx'> 	smp_mb__before_clear_bit();</div><div class='ctx'> 	clear_bit(__IXGBE_SERVICE_SCHED, &amp;adapter-&gt;state);</div><div class='ctx'> }</div><div class='hunk'>@@ -1140,7 +1143,7 @@ void ixgbe_alloc_rx_buffers(struct ixgbe_ring *rx_ring, u16 cleaned_count)</div><div class='ctx'> </div><div class='ctx'> 		if (ring_is_ps_enabled(rx_ring)) {</div><div class='ctx'> 			if (!bi-&gt;page) {</div><div class='del'>-				bi-&gt;page = netdev_alloc_page(rx_ring-&gt;netdev);</div><div class='add'>+				bi-&gt;page = alloc_page(GFP_ATOMIC | __GFP_COLD);</div><div class='ctx'> 				if (!bi-&gt;page) {</div><div class='ctx'> 					rx_ring-&gt;rx_stats.alloc_rx_page_failed++;</div><div class='ctx'> 					goto no_buffers;</div><div class='hunk'>@@ -2156,7 +2159,7 @@ static irqreturn_t ixgbe_intr(int irq, void *data)</div><div class='ctx'> 	IXGBE_WRITE_REG(hw, IXGBE_EIMC, IXGBE_IRQ_CLEAR_MASK);</div><div class='ctx'> </div><div class='ctx'> 	/* for NAPI, using EIAM to auto-mask tx/rx interrupt bits on read</div><div class='del'>-	 * therefore no explict interrupt disable is necessary */</div><div class='add'>+	 * therefore no explicit interrupt disable is necessary */</div><div class='ctx'> 	eicr = IXGBE_READ_REG(hw, IXGBE_EICR);</div><div class='ctx'> 	if (!eicr) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -3044,7 +3047,7 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)</div><div class='ctx'> 	hw-&gt;mac.ops.enable_rx_dma(hw, rxctrl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ixgbe_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='add'>+static int ixgbe_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -3053,9 +3056,11 @@ static void ixgbe_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> 	/* add VID to filter table */</div><div class='ctx'> 	hw-&gt;mac.ops.set_vfta(&amp;adapter-&gt;hw, vid, pool_ndx, true);</div><div class='ctx'> 	set_bit(vid, adapter-&gt;active_vlans);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ixgbe_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='add'>+static int ixgbe_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -3064,6 +3069,8 @@ static void ixgbe_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> 	/* remove VID from filter table */</div><div class='ctx'> 	hw-&gt;mac.ops.set_vfta(&amp;adapter-&gt;hw, vid, pool_ndx, false);</div><div class='ctx'> 	clear_bit(vid, adapter-&gt;active_vlans);</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'>@@ -3602,7 +3609,7 @@ static inline bool ixgbe_is_sfp(struct ixgbe_hw *hw)</div><div class='ctx'> static void ixgbe_sfp_link_config(struct ixgbe_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='del'>-	 * We are assuming the worst case scenerio here, and that</div><div class='add'>+	 * We are assuming the worst case scenario here, and that</div><div class='ctx'> 	 * is that an SFP was inserted/removed after the reset</div><div class='ctx'> 	 * but before SFP detection was enabled.  As such the best</div><div class='ctx'> 	 * solution is to just start searching as soon as we start</div><div class='hunk'>@@ -3824,7 +3831,7 @@ void ixgbe_reset(struct ixgbe_adapter *adapter)</div><div class='ctx'> 	case IXGBE_ERR_EEPROM_VERSION:</div><div class='ctx'> 		/* We are running on a pre-production device, log a warning */</div><div class='ctx'> 		e_dev_warn("This device is a pre-production adapter/LOM. "</div><div class='del'>-			   "Please be aware there may be issuesassociated with "</div><div class='add'>+			   "Please be aware there may be issues associated with "</div><div class='ctx'> 			   "your hardware.  If you are experiencing problems "</div><div class='ctx'> 			   "please contact your Intel or hardware "</div><div class='ctx'> 			   "representative who provided you with this "</div><div class='hunk'>@@ -4019,7 +4026,7 @@ void ixgbe_down(struct ixgbe_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 		/* Mark all the VFs as inactive */</div><div class='ctx'> 		for (i = 0 ; i &lt; adapter-&gt;num_vfs; i++)</div><div class='del'>-			adapter-&gt;vfinfo[i].clear_to_send = 0;</div><div class='add'>+			adapter-&gt;vfinfo[i].clear_to_send = false;</div><div class='ctx'> </div><div class='ctx'> 		/* ping all the active vfs to let them know we are going down */</div><div class='ctx'> 		ixgbe_ping_all_vfs(adapter);</div><div class='hunk'>@@ -5788,9 +5795,9 @@ static void ixgbe_fdir_reinit_subtask(struct ixgbe_adapter *adapter)</div><div class='ctx'>  * @adapter - pointer to the device adapter structure</div><div class='ctx'>  *</div><div class='ctx'>  * This function serves two purposes.  First it strobes the interrupt lines</div><div class='del'>- * in order to make certain interrupts are occuring.  Secondly it sets the</div><div class='add'>+ * in order to make certain interrupts are occurring.  Secondly it sets the</div><div class='ctx'>  * bits needed to check for TX hangs.  As a result we should immediately</div><div class='del'>- * determine if a hang has occured.</div><div class='add'>+ * determine if a hang has occurred.</div><div class='ctx'>  */</div><div class='ctx'> static void ixgbe_check_hang_subtask(struct ixgbe_adapter *adapter)</div><div class='ctx'> {</div><div class='hunk'>@@ -7128,7 +7135,7 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Hardware has to reinitialize queues and interrupts to</div><div class='del'>-	 * match packet buffer alignment. Unfortunantly, the</div><div class='add'>+	 * match packet buffer alignment. Unfortunately, the</div><div class='ctx'> 	 * hardware is not flexible enough to do this dynamically.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (netif_running(dev))</div><div class='hunk'>@@ -7174,7 +7181,8 @@ void ixgbe_do_reset(struct net_device *netdev)</div><div class='ctx'> 		ixgbe_reset(adapter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 ixgbe_fix_features(struct net_device *netdev, u32 data)</div><div class='add'>+static netdev_features_t ixgbe_fix_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -7204,7 +7212,8 @@ static u32 ixgbe_fix_features(struct net_device *netdev, u32 data)</div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ixgbe_set_features(struct net_device *netdev, u32 data)</div><div class='add'>+static int ixgbe_set_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	bool need_reset = false;</div><div class='hunk'>@@ -7286,6 +7295,7 @@ static const struct net_device_ops ixgbe_netdev_ops = {</div><div class='ctx'> 	.ndo_fcoe_enable = ixgbe_fcoe_enable,</div><div class='ctx'> 	.ndo_fcoe_disable = ixgbe_fcoe_disable,</div><div class='ctx'> 	.ndo_fcoe_get_wwn = ixgbe_fcoe_get_wwn,</div><div class='add'>+	.ndo_fcoe_get_hbainfo = ixgbe_fcoe_get_hbainfo,</div><div class='ctx'> #endif /* IXGBE_FCOE */</div><div class='ctx'> 	.ndo_set_features = ixgbe_set_features,</div><div class='ctx'> 	.ndo_fix_features = ixgbe_fix_features,</div><div class='hunk'>@@ -7598,9 +7608,16 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,</div><div class='ctx'> 	adapter-&gt;wol = 0;</div><div class='ctx'> 	switch (pdev-&gt;device) {</div><div class='ctx'> 	case IXGBE_DEV_ID_82599_SFP:</div><div class='del'>-		/* Only this subdevice supports WOL */</div><div class='del'>-		if (pdev-&gt;subsystem_device == IXGBE_SUBDEV_ID_82599_SFP)</div><div class='add'>+		/* Only these subdevice supports WOL */</div><div class='add'>+		switch (pdev-&gt;subsystem_device) {</div><div class='add'>+		case IXGBE_SUBDEV_ID_82599_560FLR:</div><div class='add'>+			/* only support first port */</div><div class='add'>+			if (hw-&gt;bus.func != 0)</div><div class='add'>+				break;</div><div class='add'>+		case IXGBE_SUBDEV_ID_82599_SFP:</div><div class='ctx'> 			adapter-&gt;wol = IXGBE_WUFC_MAG;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IXGBE_DEV_ID_82599_COMBO_BACKPLANE:</div><div class='ctx'> 		/* All except this subdevice support WOL */</div><div class='hunk'>@@ -7708,7 +7725,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,</div><div class='ctx'> 	/* add san mac addr to netdev */</div><div class='ctx'> 	ixgbe_add_sanmac_netdev(netdev);</div><div class='ctx'> </div><div class='del'>-	e_dev_info("Intel(R) 10 Gigabit Network Connection\n");</div><div class='add'>+	e_dev_info("%s\n", ixgbe_default_device_descr);</div><div class='ctx'> 	cards_found++;</div><div class='ctx'> 	return 0;</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 9a56fd74e673..7cf1e1f56c69 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c</a></div><div class='hunk'>@@ -1214,7 +1214,7 @@ s32 ixgbe_read_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset,</div><div class='ctx'> 	u32 max_retry = 10;</div><div class='ctx'> 	u32 retry = 0;</div><div class='ctx'> 	u16 swfw_mask = 0;</div><div class='del'>-	bool nack = 1;</div><div class='add'>+	bool nack = true;</div><div class='ctx'> 	*data = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (IXGBE_READ_REG(hw, IXGBE_STATUS) &amp; IXGBE_STATUS_LAN_ID_1)</div><div class='hunk'>@@ -1421,7 +1421,7 @@ static void ixgbe_i2c_stop(struct ixgbe_hw *hw)</div><div class='ctx'> static s32 ixgbe_clock_in_i2c_byte(struct ixgbe_hw *hw, u8 *data)</div><div class='ctx'> {</div><div class='ctx'> 	s32 i;</div><div class='del'>-	bool bit = 0;</div><div class='add'>+	bool bit = false;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 7; i &gt;= 0; i--) {</div><div class='ctx'> 		ixgbe_clock_in_i2c_bit(hw, &amp;bit);</div><div class='hunk'>@@ -1443,7 +1443,7 @@ static s32 ixgbe_clock_out_i2c_byte(struct ixgbe_hw *hw, u8 data)</div><div class='ctx'> 	s32 status = 0;</div><div class='ctx'> 	s32 i;</div><div class='ctx'> 	u32 i2cctl;</div><div class='del'>-	bool bit = 0;</div><div class='add'>+	bool bit = false;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 7; i &gt;= 0; i--) {</div><div class='ctx'> 		bit = (data &gt;&gt; i) &amp; 0x1;</div><div class='hunk'>@@ -1457,6 +1457,7 @@ static s32 ixgbe_clock_out_i2c_byte(struct ixgbe_hw *hw, u8 data)</div><div class='ctx'> 	i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);</div><div class='ctx'> 	i2cctl |= IXGBE_I2C_DATA_OUT;</div><div class='ctx'> 	IXGBE_WRITE_REG(hw, IXGBE_I2CCTL, i2cctl);</div><div class='add'>+	IXGBE_WRITE_FLUSH(hw);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -1473,7 +1474,7 @@ static s32 ixgbe_get_i2c_ack(struct ixgbe_hw *hw)</div><div class='ctx'> 	u32 i = 0;</div><div class='ctx'> 	u32 i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);</div><div class='ctx'> 	u32 timeout = 10;</div><div class='del'>-	bool ack = 1;</div><div class='add'>+	bool ack = true;</div><div class='ctx'> </div><div class='ctx'> 	ixgbe_raise_i2c_clk(hw, &amp;i2cctl);</div><div class='ctx'> </div><div class='hunk'>@@ -1646,9 +1647,9 @@ static bool ixgbe_get_i2c_data(u32 *i2cctl)</div><div class='ctx'> 	bool data;</div><div class='ctx'> </div><div class='ctx'> 	if (*i2cctl &amp; IXGBE_I2C_DATA_IN)</div><div class='del'>-		data = 1;</div><div class='add'>+		data = true;</div><div class='ctx'> 	else</div><div class='del'>-		data = 0;</div><div class='add'>+		data = false;</div><div class='ctx'> </div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c<br/>index 00fcd39ad666..cf6812dd1436 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c</a></div><div class='hunk'>@@ -572,7 +572,7 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf)</div><div class='ctx'> </div><div class='ctx'> 		/* reply to reset with ack and vf mac address */</div><div class='ctx'> 		msgbuf[0] = IXGBE_VF_RESET | IXGBE_VT_MSGTYPE_ACK;</div><div class='del'>-		memcpy(new_mac, vf_mac, IXGBE_ETH_LENGTH_OF_ADDRESS);</div><div class='add'>+		memcpy(new_mac, vf_mac, ETH_ALEN);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Piggyback the multicast filter type so VF can compute the</div><div class='ctx'> 		 * correct vectors</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h<br/>index df04f1a3857c..e8badab03359 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h</a></div><div class='hunk'>@@ -33,7 +33,6 @@ void ixgbe_msg_task(struct ixgbe_adapter *adapter);</div><div class='ctx'> int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask);</div><div class='ctx'> void ixgbe_disable_tx_rx(struct ixgbe_adapter *adapter);</div><div class='ctx'> void ixgbe_ping_all_vfs(struct ixgbe_adapter *adapter);</div><div class='del'>-void ixgbe_dump_registers(struct ixgbe_adapter *adapter);</div><div class='ctx'> int ixgbe_ndo_set_vf_mac(struct net_device *netdev, int queue, u8 *mac);</div><div class='ctx'> int ixgbe_ndo_set_vf_vlan(struct net_device *netdev, int queue, u16 vlan,</div><div class='ctx'> 			   u8 qos);</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h<br/>index 6c5cca808bd7..802bfa0f62cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_type.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgbe/ixgbe_type.h</a></div><div class='hunk'>@@ -57,6 +57,7 @@</div><div class='ctx'> #define IXGBE_DEV_ID_82599_BACKPLANE_FCOE       0x152a</div><div class='ctx'> #define IXGBE_DEV_ID_82599_SFP_FCOE      0x1529</div><div class='ctx'> #define IXGBE_SUBDEV_ID_82599_SFP        0x11A9</div><div class='add'>+#define IXGBE_SUBDEV_ID_82599_560FLR     0x17D0</div><div class='ctx'> #define IXGBE_DEV_ID_82599_SFP_EM        0x1507</div><div class='ctx'> #define IXGBE_DEV_ID_82599_SFP_SF2       0x154D</div><div class='ctx'> #define IXGBE_DEV_ID_82599EN_SFP         0x1557</div><div class='hunk'>@@ -65,6 +66,7 @@</div><div class='ctx'> #define IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ  0x000C</div><div class='ctx'> #define IXGBE_DEV_ID_82599_LS            0x154F</div><div class='ctx'> #define IXGBE_DEV_ID_X540T               0x1528</div><div class='add'>+#define IXGBE_DEV_ID_82599_SFP_SF_QP     0x154A</div><div class='ctx'> </div><div class='ctx'> /* VF Device IDs */</div><div class='ctx'> #define IXGBE_DEV_ID_82599_VF           0x10ED</div><div class='hunk'>@@ -1710,8 +1712,6 @@ enum {</div><div class='ctx'> #define IXGBE_NVM_POLL_WRITE       1  /* Flag for polling for write complete */</div><div class='ctx'> #define IXGBE_NVM_POLL_READ        0  /* Flag for polling for read complete */</div><div class='ctx'> </div><div class='del'>-#define IXGBE_ETH_LENGTH_OF_ADDRESS   6</div><div class='del'>-</div><div class='ctx'> #define IXGBE_EEPROM_PAGE_SIZE_MAX       128</div><div class='ctx'> #define IXGBE_EEPROM_RD_BUFFER_MAX_COUNT 512 /* EEPROM words # read in burst */</div><div class='ctx'> #define IXGBE_EEPROM_WR_BUFFER_MAX_COUNT 256 /* EEPROM words # wr in burst */</div><div class='hunk'>@@ -2802,9 +2802,9 @@ struct ixgbe_eeprom_info {</div><div class='ctx'> struct ixgbe_mac_info {</div><div class='ctx'> 	struct ixgbe_mac_operations     ops;</div><div class='ctx'> 	enum ixgbe_mac_type             type;</div><div class='del'>-	u8                              addr[IXGBE_ETH_LENGTH_OF_ADDRESS];</div><div class='del'>-	u8                              perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];</div><div class='del'>-	u8                              san_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];</div><div class='add'>+	u8                              addr[ETH_ALEN];</div><div class='add'>+	u8                              perm_addr[ETH_ALEN];</div><div class='add'>+	u8                              san_addr[ETH_ALEN];</div><div class='ctx'> 	/* prefix for World Wide Node Name (WWNN) */</div><div class='ctx'> 	u16                             wwnn_prefix;</div><div class='ctx'> 	/* prefix for World Wide Port Name (WWPN) */</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c<br/>index e5101e91b6b5..8cc5eccfd651 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c</a></div><div class='hunk'>@@ -751,16 +751,20 @@ static s32 ixgbe_blink_led_start_X540(struct ixgbe_hw *hw, u32 index)</div><div class='ctx'> {</div><div class='ctx'> 	u32 macc_reg;</div><div class='ctx'> 	u32 ledctl_reg;</div><div class='add'>+	ixgbe_link_speed speed;</div><div class='add'>+	bool link_up;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * In order for the blink bit in the LED control register</div><div class='del'>-	 * to work, link and speed must be forced in the MAC. We</div><div class='del'>-	 * will reverse this when we stop the blinking.</div><div class='add'>+	 * Link should be up in order for the blink bit in the LED control</div><div class='add'>+	 * register to work. Force link and speed in the MAC if link is down.</div><div class='add'>+	 * This will be reversed when we stop the blinking.</div><div class='ctx'> 	 */</div><div class='del'>-	macc_reg = IXGBE_READ_REG(hw, IXGBE_MACC);</div><div class='del'>-	macc_reg |= IXGBE_MACC_FLU | IXGBE_MACC_FSV_10G | IXGBE_MACC_FS;</div><div class='del'>-	IXGBE_WRITE_REG(hw, IXGBE_MACC, macc_reg);</div><div class='del'>-</div><div class='add'>+	hw-&gt;mac.ops.check_link(hw, &amp;speed, &amp;link_up, false);</div><div class='add'>+	if (link_up == false) {</div><div class='add'>+		macc_reg = IXGBE_READ_REG(hw, IXGBE_MACC);</div><div class='add'>+		macc_reg |= IXGBE_MACC_FLU | IXGBE_MACC_FSV_10G | IXGBE_MACC_FS;</div><div class='add'>+		IXGBE_WRITE_REG(hw, IXGBE_MACC, macc_reg);</div><div class='add'>+	}</div><div class='ctx'> 	/* Set the LED to LINK_UP + BLINK. */</div><div class='ctx'> 	ledctl_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);</div><div class='ctx'> 	ledctl_reg &amp;= ~IXGBE_LED_MODE_MASK(index);</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgbevf/defines.h b/drivers/net/ethernet/intel/ixgbevf/defines.h<br/>index 78abb6f1a866..2eb89cb94a0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbevf/defines.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbevf/defines.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbevf/defines.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgbevf/defines.h</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'> #define IXGBE_VF_IRQ_CLEAR_MASK         7</div><div class='ctx'> #define IXGBE_VF_MAX_TX_QUEUES          1</div><div class='ctx'> #define IXGBE_VF_MAX_RX_QUEUES          1</div><div class='del'>-#define IXGBE_ETH_LENGTH_OF_ADDRESS     6</div><div class='ctx'> </div><div class='ctx'> /* Link speed */</div><div class='ctx'> typedef u32 ixgbe_link_speed;</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c<br/>index e29ba4506b74..dc8e6511c640 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbevf/ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbevf/ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbevf/ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgbevf/ethtool.c</a></div><div class='hunk'>@@ -27,6 +27,8 @@</div><div class='ctx'> </div><div class='ctx'> /* ethtool support for ixgbevf */</div><div class='ctx'> </div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/types.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='hunk'>@@ -265,11 +267,11 @@ static void ixgbevf_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbevf_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(drvinfo-&gt;driver, ixgbevf_driver_name, 32);</div><div class='del'>-	strlcpy(drvinfo-&gt;version, ixgbevf_driver_version, 32);</div><div class='del'>-</div><div class='del'>-	strlcpy(drvinfo-&gt;fw_version, "N/A", 4);</div><div class='del'>-	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev), 32);</div><div class='add'>+	strlcpy(drvinfo-&gt;driver, ixgbevf_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, ixgbevf_driver_version,</div><div class='add'>+		sizeof(drvinfo-&gt;version));</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ixgbevf_get_ringparam(struct net_device *netdev,</div><div class='hunk'>@@ -549,8 +551,8 @@ static const u32 register_test_patterns[] = {</div><div class='ctx'> 	writel((W &amp; M), (adapter-&gt;hw.hw_addr + R));                           \</div><div class='ctx'> 	val = readl(adapter-&gt;hw.hw_addr + R);                                 \</div><div class='ctx'> 	if ((W &amp; M) != (val &amp; M)) {                                           \</div><div class='del'>-		printk(KERN_ERR "set/check reg %04X test failed: got 0x%08X " \</div><div class='del'>-				 "expected 0x%08X\n", R, (val &amp; M), (W &amp; M)); \</div><div class='add'>+		pr_err("set/check reg %04X test failed: got 0x%08X expected " \</div><div class='add'>+		       "0x%08X\n", R, (val &amp; M), (W &amp; M));                    \</div><div class='ctx'> 		*data = R;                                                    \</div><div class='ctx'> 		writel(before, (adapter-&gt;hw.hw_addr + R));                    \</div><div class='ctx'> 		return 1;                                                     \</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 4c8e19951d57..891162d1610c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c</a></div><div class='hunk'>@@ -29,6 +29,9 @@</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  Copyright (c)2006 - 2007 Myricom, Inc. for some LRO specific code</div><div class='ctx'> ******************************************************************************/</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -363,7 +366,7 @@ static void ixgbevf_alloc_rx_buffers(struct ixgbevf_adapter *adapter,</div><div class='ctx'> 		if (!bi-&gt;page_dma &amp;&amp;</div><div class='ctx'> 		    (adapter-&gt;flags &amp; IXGBE_FLAG_RX_PS_ENABLED)) {</div><div class='ctx'> 			if (!bi-&gt;page) {</div><div class='del'>-				bi-&gt;page = netdev_alloc_page(adapter-&gt;netdev);</div><div class='add'>+				bi-&gt;page = alloc_page(GFP_ATOMIC | __GFP_COLD);</div><div class='ctx'> 				if (!bi-&gt;page) {</div><div class='ctx'> 					adapter-&gt;alloc_rx_page_failed++;</div><div class='ctx'> 					goto no_buffers;</div><div class='hunk'>@@ -1400,7 +1403,7 @@ static void ixgbevf_configure_rx(struct ixgbevf_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ixgbevf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='add'>+static int ixgbevf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbevf_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -1409,9 +1412,11 @@ static void ixgbevf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> 	if (hw-&gt;mac.ops.set_vfta)</div><div class='ctx'> 		hw-&gt;mac.ops.set_vfta(hw, vid, 0, true);</div><div class='ctx'> 	set_bit(vid, adapter-&gt;active_vlans);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ixgbevf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='add'>+static int ixgbevf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbevf_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct ixgbe_hw *hw = &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -1420,6 +1425,8 @@ static void ixgbevf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> 	if (hw-&gt;mac.ops.set_vfta)</div><div class='ctx'> 		hw-&gt;mac.ops.set_vfta(hw, vid, 0, false);</div><div class='ctx'> 	clear_bit(vid, adapter-&gt;active_vlans);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ixgbevf_restore_vlan(struct ixgbevf_adapter *adapter)</div><div class='hunk'>@@ -1437,7 +1444,7 @@ static int ixgbevf_write_uc_addr_list(struct net_device *netdev)</div><div class='ctx'> 	int count = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((netdev_uc_count(netdev)) &gt; 10) {</div><div class='del'>-		printk(KERN_ERR "Too many unicast filters - No Space\n");</div><div class='add'>+		pr_err("Too many unicast filters - No Space\n");</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2135,7 +2142,7 @@ static int ixgbevf_init_interrupt_scheme(struct ixgbevf_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	err = ixgbevf_alloc_queues(adapter);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR "Unable to allocate memory for queues\n");</div><div class='add'>+		pr_err("Unable to allocate memory for queues\n");</div><div class='ctx'> 		goto err_alloc_queues;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2189,7 +2196,7 @@ static int __devinit ixgbevf_sw_init(struct ixgbevf_adapter *adapter)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = hw-&gt;mac.ops.init_hw(hw);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			printk(KERN_ERR "init_shared_code failed: %d\n", err);</div><div class='add'>+			pr_err("init_shared_code failed: %d\n", err);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2630,8 +2637,8 @@ static int ixgbevf_open(struct net_device *netdev)</div><div class='ctx'> 		 * the vf can't start. */</div><div class='ctx'> 		if (hw-&gt;adapter_stopped) {</div><div class='ctx'> 			err = IXGBE_ERR_MBX;</div><div class='del'>-			printk(KERN_ERR "Unable to start - perhaps the PF"</div><div class='del'>-			       " Driver isn't up yet\n");</div><div class='add'>+			pr_err("Unable to start - perhaps the PF Driver isn't "</div><div class='add'>+			       "up yet\n");</div><div class='ctx'> 			goto err_setup_reset;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2842,10 +2849,8 @@ static bool ixgbevf_tx_csum(struct ixgbevf_adapter *adapter,</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='ctx'> 				if (unlikely(net_ratelimit())) {</div><div class='del'>-					printk(KERN_WARNING</div><div class='del'>-					       "partial checksum but "</div><div class='del'>-					       "proto=%x!\n",</div><div class='del'>-					       skb-&gt;protocol);</div><div class='add'>+					pr_warn("partial checksum but "</div><div class='add'>+						"proto=%x!\n", skb-&gt;protocol);</div><div class='ctx'> 				}</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -3249,7 +3254,8 @@ static struct rtnl_link_stats64 *ixgbevf_get_stats(struct net_device *netdev,</div><div class='ctx'> 	return stats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ixgbevf_set_features(struct net_device *netdev, u32 features)</div><div class='add'>+static int ixgbevf_set_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgbevf_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3414,7 +3420,7 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev,</div><div class='ctx'> 	memcpy(netdev-&gt;perm_addr, adapter-&gt;hw.mac.addr, netdev-&gt;addr_len);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(netdev-&gt;dev_addr)) {</div><div class='del'>-		printk(KERN_ERR "invalid MAC address\n");</div><div class='add'>+		pr_err("invalid MAC address\n");</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto err_sw_init;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3535,10 +3541,10 @@ static struct pci_driver ixgbevf_driver = {</div><div class='ctx'> static int __init ixgbevf_init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	printk(KERN_INFO "ixgbevf: %s - version %s\n", ixgbevf_driver_string,</div><div class='del'>-	       ixgbevf_driver_version);</div><div class='add'>+	pr_info("%s - version %s\n", ixgbevf_driver_string,</div><div class='add'>+		ixgbevf_driver_version);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s\n", ixgbevf_copyright);</div><div class='add'>+	pr_info("%s\n", ixgbevf_copyright);</div><div class='ctx'> </div><div class='ctx'> 	ret = pci_register_driver(&amp;ixgbevf_driver);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgbevf/mbx.h b/drivers/net/ethernet/intel/ixgbevf/mbx.h<br/>index ea393eb03f3a..9d38a94a348a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbevf/mbx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbevf/mbx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbevf/mbx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgbevf/mbx.h</a></div><div class='hunk'>@@ -47,8 +47,8 @@</div><div class='ctx'> #define IXGBE_VFMAILBOX_RSTD     0x00000080 /* PF has indicated reset done */</div><div class='ctx'> #define IXGBE_VFMAILBOX_R2C_BITS 0x000000B0 /* All read to clear bits */</div><div class='ctx'> </div><div class='del'>-#define IXGBE_PFMAILBOX(x)          (0x04B00 + (4 * x))</div><div class='del'>-#define IXGBE_PFMBMEM(vfn)          (0x13000 + (64 * vfn))</div><div class='add'>+#define IXGBE_PFMAILBOX(x)          (0x04B00 + (4 * (x)))</div><div class='add'>+#define IXGBE_PFMBMEM(vfn)          (0x13000 + (64 * (vfn)))</div><div class='ctx'> </div><div class='ctx'> #define IXGBE_PFMAILBOX_STS   0x00000001 /* Initiate message send to VF */</div><div class='ctx'> #define IXGBE_PFMAILBOX_ACK   0x00000002 /* Ack message recv'd from VF */</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgbevf/regs.h b/drivers/net/ethernet/intel/ixgbevf/regs.h<br/>index 189200eeca26..5e4d5e5cdf38 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbevf/regs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbevf/regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbevf/regs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgbevf/regs.h</a></div><div class='hunk'>@@ -39,29 +39,29 @@</div><div class='ctx'> #define IXGBE_VTEIMC           0x0010C</div><div class='ctx'> #define IXGBE_VTEIAC           0x00110</div><div class='ctx'> #define IXGBE_VTEIAM           0x00114</div><div class='del'>-#define IXGBE_VTEITR(x)        (0x00820 + (4 * x))</div><div class='del'>-#define IXGBE_VTIVAR(x)        (0x00120 + (4 * x))</div><div class='add'>+#define IXGBE_VTEITR(x)        (0x00820 + (4 * (x)))</div><div class='add'>+#define IXGBE_VTIVAR(x)        (0x00120 + (4 * (x)))</div><div class='ctx'> #define IXGBE_VTIVAR_MISC      0x00140</div><div class='del'>-#define IXGBE_VTRSCINT(x)      (0x00180 + (4 * x))</div><div class='del'>-#define IXGBE_VFRDBAL(x)       (0x01000 + (0x40 * x))</div><div class='del'>-#define IXGBE_VFRDBAH(x)       (0x01004 + (0x40 * x))</div><div class='del'>-#define IXGBE_VFRDLEN(x)       (0x01008 + (0x40 * x))</div><div class='del'>-#define IXGBE_VFRDH(x)         (0x01010 + (0x40 * x))</div><div class='del'>-#define IXGBE_VFRDT(x)         (0x01018 + (0x40 * x))</div><div class='del'>-#define IXGBE_VFRXDCTL(x)      (0x01028 + (0x40 * x))</div><div class='del'>-#define IXGBE_VFSRRCTL(x)      (0x01014 + (0x40 * x))</div><div class='del'>-#define IXGBE_VFRSCCTL(x)      (0x0102C + (0x40 * x))</div><div class='add'>+#define IXGBE_VTRSCINT(x)      (0x00180 + (4 * (x)))</div><div class='add'>+#define IXGBE_VFRDBAL(x)       (0x01000 + (0x40 * (x)))</div><div class='add'>+#define IXGBE_VFRDBAH(x)       (0x01004 + (0x40 * (x)))</div><div class='add'>+#define IXGBE_VFRDLEN(x)       (0x01008 + (0x40 * (x)))</div><div class='add'>+#define IXGBE_VFRDH(x)         (0x01010 + (0x40 * (x)))</div><div class='add'>+#define IXGBE_VFRDT(x)         (0x01018 + (0x40 * (x)))</div><div class='add'>+#define IXGBE_VFRXDCTL(x)      (0x01028 + (0x40 * (x)))</div><div class='add'>+#define IXGBE_VFSRRCTL(x)      (0x01014 + (0x40 * (x)))</div><div class='add'>+#define IXGBE_VFRSCCTL(x)      (0x0102C + (0x40 * (x)))</div><div class='ctx'> #define IXGBE_VFPSRTYPE        0x00300</div><div class='del'>-#define IXGBE_VFTDBAL(x)       (0x02000 + (0x40 * x))</div><div class='del'>-#define IXGBE_VFTDBAH(x)       (0x02004 + (0x40 * x))</div><div class='del'>-#define IXGBE_VFTDLEN(x)       (0x02008 + (0x40 * x))</div><div class='del'>-#define IXGBE_VFTDH(x)         (0x02010 + (0x40 * x))</div><div class='del'>-#define IXGBE_VFTDT(x)         (0x02018 + (0x40 * x))</div><div class='del'>-#define IXGBE_VFTXDCTL(x)      (0x02028 + (0x40 * x))</div><div class='del'>-#define IXGBE_VFTDWBAL(x)      (0x02038 + (0x40 * x))</div><div class='del'>-#define IXGBE_VFTDWBAH(x)      (0x0203C + (0x40 * x))</div><div class='del'>-#define IXGBE_VFDCA_RXCTRL(x)  (0x0100C + (0x40 * x))</div><div class='del'>-#define IXGBE_VFDCA_TXCTRL(x)  (0x0200c + (0x40 * x))</div><div class='add'>+#define IXGBE_VFTDBAL(x)       (0x02000 + (0x40 * (x)))</div><div class='add'>+#define IXGBE_VFTDBAH(x)       (0x02004 + (0x40 * (x)))</div><div class='add'>+#define IXGBE_VFTDLEN(x)       (0x02008 + (0x40 * (x)))</div><div class='add'>+#define IXGBE_VFTDH(x)         (0x02010 + (0x40 * (x)))</div><div class='add'>+#define IXGBE_VFTDT(x)         (0x02018 + (0x40 * (x)))</div><div class='add'>+#define IXGBE_VFTXDCTL(x)      (0x02028 + (0x40 * (x)))</div><div class='add'>+#define IXGBE_VFTDWBAL(x)      (0x02038 + (0x40 * (x)))</div><div class='add'>+#define IXGBE_VFTDWBAH(x)      (0x0203C + (0x40 * (x)))</div><div class='add'>+#define IXGBE_VFDCA_RXCTRL(x)  (0x0100C + (0x40 * (x)))</div><div class='add'>+#define IXGBE_VFDCA_TXCTRL(x)  (0x0200c + (0x40 * (x)))</div><div class='ctx'> #define IXGBE_VFGPRC           0x0101C</div><div class='ctx'> #define IXGBE_VFGPTC           0x0201C</div><div class='ctx'> #define IXGBE_VFGORC_LSB       0x01020</div><div class='head'>diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c<br/>index aa3682e8c473..21533e300367 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbevf/vf.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/intel/ixgbevf/vf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/intel/ixgbevf/vf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/intel/ixgbevf/vf.c</a></div><div class='hunk'>@@ -108,7 +108,7 @@ static s32 ixgbevf_reset_hw_vf(struct ixgbe_hw *hw)</div><div class='ctx'> 	if (msgbuf[0] != (IXGBE_VF_RESET | IXGBE_VT_MSGTYPE_ACK))</div><div class='ctx'> 		return IXGBE_ERR_INVALID_MAC_ADDR;</div><div class='ctx'> </div><div class='del'>-	memcpy(hw-&gt;mac.perm_addr, addr, IXGBE_ETH_LENGTH_OF_ADDRESS);</div><div class='add'>+	memcpy(hw-&gt;mac.perm_addr, addr, ETH_ALEN);</div><div class='ctx'> 	hw-&gt;mac.mc_filter_type = msgbuf[IXGBE_VF_MC_TYPE_WORD];</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -211,7 +211,7 @@ static s32 ixgbevf_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr)</div><div class='ctx'>  **/</div><div class='ctx'> static s32 ixgbevf_get_mac_addr_vf(struct ixgbe_hw *hw, u8 *mac_addr)</div><div class='ctx'> {</div><div class='del'>-	memcpy(mac_addr, hw-&gt;mac.perm_addr, IXGBE_ETH_LENGTH_OF_ADDRESS);</div><div class='add'>+	memcpy(mac_addr, hw-&gt;mac.perm_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c<br/>index 76b84573566b..27d651a80f3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/jme.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/jme.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/jme.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/jme.c</a></div><div class='hunk'>@@ -1990,7 +1990,7 @@ jme_fill_tx_map(struct pci_dev *pdev,</div><div class='ctx'> 		struct page *page,</div><div class='ctx'> 		u32 page_offset,</div><div class='ctx'> 		u32 len,</div><div class='del'>-		u8 hidma)</div><div class='add'>+		bool hidma)</div><div class='ctx'> {</div><div class='ctx'> 	dma_addr_t dmaaddr;</div><div class='ctx'> </div><div class='hunk'>@@ -2024,7 +2024,7 @@ jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx)</div><div class='ctx'> 	struct jme_ring *txring = &amp;(jme-&gt;txring[0]);</div><div class='ctx'> 	struct txdesc *txdesc = txring-&gt;desc, *ctxdesc;</div><div class='ctx'> 	struct jme_buffer_info *txbi = txring-&gt;bufinf, *ctxbi;</div><div class='del'>-	u8 hidma = jme-&gt;dev-&gt;features &amp; NETIF_F_HIGHDMA;</div><div class='add'>+	bool hidma = jme-&gt;dev-&gt;features &amp; NETIF_F_HIGHDMA;</div><div class='ctx'> 	int i, nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> 	int mask = jme-&gt;tx_ring_mask;</div><div class='ctx'> 	const struct skb_frag_struct *frag;</div><div class='hunk'>@@ -2399,9 +2399,9 @@ jme_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(jme-&gt;pdev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(jme-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -2727,8 +2727,8 @@ jme_set_msglevel(struct net_device *netdev, u32 value)</div><div class='ctx'> 	jme-&gt;msg_enable = value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32</div><div class='del'>-jme_fix_features(struct net_device *netdev, u32 features)</div><div class='add'>+static netdev_features_t</div><div class='add'>+jme_fix_features(struct net_device *netdev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	if (netdev-&gt;mtu &gt; 1900)</div><div class='ctx'> 		features &amp;= ~(NETIF_F_ALL_TSO | NETIF_F_ALL_CSUM);</div><div class='hunk'>@@ -2736,7 +2736,7 @@ jme_fix_features(struct net_device *netdev, u32 features)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-jme_set_features(struct net_device *netdev, u32 features)</div><div class='add'>+jme_set_features(struct net_device *netdev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct jme_adapter *jme = netdev_priv(netdev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c<br/>index d8430f487b84..6ad094f176f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/korina.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/korina.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/korina.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/korina.c</a></div><div class='hunk'>@@ -1230,18 +1230,7 @@ static struct platform_driver korina_driver = {</div><div class='ctx'> 	.remove = korina_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init korina_init_module(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;korina_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void korina_cleanup_module(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_unregister(&amp;korina_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(korina_init_module);</div><div class='del'>-module_exit(korina_cleanup_module);</div><div class='add'>+module_platform_driver(korina_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Philip Rischel &lt;rischelp@idt.com&gt;");</div><div class='ctx'> MODULE_AUTHOR("Felix Fietkau &lt;nbd@openwrt.org&gt;");</div><div class='head'>diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c<br/>index 0b3567ab8121..85e2c6cd9708 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/lantiq_etop.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/lantiq_etop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/lantiq_etop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/lantiq_etop.c</a></div><div class='hunk'>@@ -98,6 +98,7 @@ struct ltq_etop_chan {</div><div class='ctx'> </div><div class='ctx'> struct ltq_etop_priv {</div><div class='ctx'> 	struct net_device *netdev;</div><div class='add'>+	struct platform_device *pdev;</div><div class='ctx'> 	struct ltq_eth_data *pldata;</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> </div><div class='hunk'>@@ -436,7 +437,8 @@ ltq_etop_mdio_init(struct net_device *dev)</div><div class='ctx'> 	priv-&gt;mii_bus-&gt;read = ltq_etop_mdio_rd;</div><div class='ctx'> 	priv-&gt;mii_bus-&gt;write = ltq_etop_mdio_wr;</div><div class='ctx'> 	priv-&gt;mii_bus-&gt;name = "ltq_mii";</div><div class='del'>-	snprintf(priv-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%x", 0);</div><div class='add'>+	snprintf(priv-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%s-%x",</div><div class='add'>+		priv-&gt;pdev-&gt;name, priv-&gt;pdev-&gt;id);</div><div class='ctx'> 	priv-&gt;mii_bus-&gt;irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);</div><div class='ctx'> 	if (!priv-&gt;mii_bus-&gt;irq) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='hunk'>@@ -734,6 +736,7 @@ ltq_etop_probe(struct platform_device *pdev)</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;ltq_etop_ethtool_ops;</div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='ctx'> 	priv-&gt;res = res;</div><div class='add'>+	priv-&gt;pdev = pdev;</div><div class='ctx'> 	priv-&gt;pldata = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='ctx'> 	priv-&gt;netdev = dev;</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;lock);</div><div class='head'>diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c<br/>index 194a03113802..9c049d2cb97d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/marvell/mv643xx_eth.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/marvell/mv643xx_eth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/marvell/mv643xx_eth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/marvell/mv643xx_eth.c</a></div><div class='hunk'>@@ -1502,10 +1502,12 @@ mv643xx_eth_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> static void mv643xx_eth_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 				    struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> {</div><div class='del'>-	strncpy(drvinfo-&gt;driver,  mv643xx_eth_driver_name, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;version, mv643xx_eth_driver_version, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;fw_version, "N/A", 32);</div><div class='del'>-	strncpy(drvinfo-&gt;bus_info, "platform", 32);</div><div class='add'>+	strlcpy(drvinfo-&gt;driver, mv643xx_eth_driver_name,</div><div class='add'>+		sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, mv643xx_eth_driver_version,</div><div class='add'>+		sizeof(drvinfo-&gt;version));</div><div class='add'>+	strlcpy(drvinfo-&gt;fw_version, "N/A", sizeof(drvinfo-&gt;fw_version));</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, "platform", sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	drvinfo-&gt;n_stats = ARRAY_SIZE(mv643xx_eth_stats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1578,10 +1580,10 @@ mv643xx_eth_set_ringparam(struct net_device *dev, struct ethtool_ringparam *er)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mv643xx_eth_set_features(struct net_device *dev, u32 features)</div><div class='add'>+mv643xx_eth_set_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv643xx_eth_private *mp = netdev_priv(dev);</div><div class='del'>-	u32 rx_csum = features &amp; NETIF_F_RXCSUM;</div><div class='add'>+	bool rx_csum = features &amp; NETIF_F_RXCSUM;</div><div class='ctx'> </div><div class='ctx'> 	wrlp(mp, PORT_CONFIG, rx_csum ? 0x02000000 : 0x00000000);</div><div class='ctx'> </div><div class='hunk'>@@ -2509,7 +2511,7 @@ static void mv643xx_eth_netpoll(struct net_device *dev)</div><div class='ctx'> /* platform glue ************************************************************/</div><div class='ctx'> static void</div><div class='ctx'> mv643xx_eth_conf_mbus_windows(struct mv643xx_eth_shared_private *msp,</div><div class='del'>-			      struct mbus_dram_target_info *dram)</div><div class='add'>+			      const struct mbus_dram_target_info *dram)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *base = msp-&gt;base;</div><div class='ctx'> 	u32 win_enable;</div><div class='hunk'>@@ -2527,7 +2529,7 @@ mv643xx_eth_conf_mbus_windows(struct mv643xx_eth_shared_private *msp,</div><div class='ctx'> 	win_protect = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; dram-&gt;num_cs; i++) {</div><div class='del'>-		struct mbus_dram_window *cs = dram-&gt;cs + i;</div><div class='add'>+		const struct mbus_dram_window *cs = dram-&gt;cs + i;</div><div class='ctx'> </div><div class='ctx'> 		writel((cs-&gt;base &amp; 0xffff0000) |</div><div class='ctx'> 			(cs-&gt;mbus_attr &lt;&lt; 8) |</div><div class='hunk'>@@ -2577,6 +2579,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)</div><div class='ctx'> 	static int mv643xx_eth_version_printed;</div><div class='ctx'> 	struct mv643xx_eth_shared_platform_data *pd = pdev-&gt;dev.platform_data;</div><div class='ctx'> 	struct mv643xx_eth_shared_private *msp;</div><div class='add'>+	const struct mbus_dram_target_info *dram;</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -2610,7 +2613,8 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)</div><div class='ctx'> 		msp-&gt;smi_bus-&gt;name = "mv643xx_eth smi";</div><div class='ctx'> 		msp-&gt;smi_bus-&gt;read = smi_bus_read;</div><div class='ctx'> 		msp-&gt;smi_bus-&gt;write = smi_bus_write,</div><div class='del'>-		snprintf(msp-&gt;smi_bus-&gt;id, MII_BUS_ID_SIZE, "%d", pdev-&gt;id);</div><div class='add'>+		snprintf(msp-&gt;smi_bus-&gt;id, MII_BUS_ID_SIZE, "%s-%d",</div><div class='add'>+			pdev-&gt;name, pdev-&gt;id);</div><div class='ctx'> 		msp-&gt;smi_bus-&gt;parent = &amp;pdev-&gt;dev;</div><div class='ctx'> 		msp-&gt;smi_bus-&gt;phy_mask = 0xffffffff;</div><div class='ctx'> 		if (mdiobus_register(msp-&gt;smi_bus) &lt; 0)</div><div class='hunk'>@@ -2641,8 +2645,9 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * (Re-)program MBUS remapping windows if we are asked to.</div><div class='ctx'> 	 */</div><div class='del'>-	if (pd != NULL &amp;&amp; pd-&gt;dram != NULL)</div><div class='del'>-		mv643xx_eth_conf_mbus_windows(msp, pd-&gt;dram);</div><div class='add'>+	dram = mv_mbus_dram_info();</div><div class='add'>+	if (dram)</div><div class='add'>+		mv643xx_eth_conf_mbus_windows(msp, dram);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Detect hardware parameters.</div><div class='head'>diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c<br/>index d17d0624c5e6..953ba5851f7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/marvell/pxa168_eth.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/marvell/pxa168_eth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/marvell/pxa168_eth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/marvell/pxa168_eth.c</a></div><div class='hunk'>@@ -1552,7 +1552,8 @@ static int pxa168_eth_probe(struct platform_device *pdev)</div><div class='ctx'> 	pep-&gt;smi_bus-&gt;name = "pxa168_eth smi";</div><div class='ctx'> 	pep-&gt;smi_bus-&gt;read = pxa168_smi_read;</div><div class='ctx'> 	pep-&gt;smi_bus-&gt;write = pxa168_smi_write;</div><div class='del'>-	snprintf(pep-&gt;smi_bus-&gt;id, MII_BUS_ID_SIZE, "%d", pdev-&gt;id);</div><div class='add'>+	snprintf(pep-&gt;smi_bus-&gt;id, MII_BUS_ID_SIZE, "%s-%d",</div><div class='add'>+		pdev-&gt;name, pdev-&gt;id);</div><div class='ctx'> 	pep-&gt;smi_bus-&gt;parent = &amp;pdev-&gt;dev;</div><div class='ctx'> 	pep-&gt;smi_bus-&gt;phy_mask = 0xffffffff;</div><div class='ctx'> 	err = mdiobus_register(pep-&gt;smi_bus);</div><div class='hunk'>@@ -1645,18 +1646,7 @@ static struct platform_driver pxa168_eth_driver = {</div><div class='ctx'> 		   },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pxa168_init_module(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pxa168_eth_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit pxa168_cleanup_module(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pxa168_eth_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(pxa168_init_module);</div><div class='del'>-module_exit(pxa168_cleanup_module);</div><div class='add'>+module_platform_driver(pxa168_eth_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("Ethernet driver for Marvell PXA168");</div><div class='head'>diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c<br/>index dea0cb4400e2..18a87a57fc0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/marvell/skge.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/marvell/skge.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/marvell/skge.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/marvell/skge.c</a></div><div class='hunk'>@@ -394,10 +394,10 @@ static void skge_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct skge_port *skge = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;fw_version, "N/A");</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(skge-&gt;hw-&gt;pdev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(skge-&gt;hw-&gt;pdev),</div><div class='add'>+		sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct skge_stat {</div><div class='hunk'>@@ -4042,7 +4042,7 @@ static void __devexit skge_remove(struct pci_dev *pdev)</div><div class='ctx'> 	pci_set_drvdata(pdev, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> static int skge_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='hunk'>@@ -4104,7 +4104,7 @@ static SIMPLE_DEV_PM_OPS(skge_pm_ops, skge_suspend, skge_resume);</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> #define SKGE_PM_OPS NULL</div><div class='del'>-#endif</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='ctx'> </div><div class='ctx'> static void skge_shutdown(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c<br/>index 7803efa46eb2..760c2b17dfd3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/marvell/sky2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/marvell/sky2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/marvell/sky2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/marvell/sky2.c</a></div><div class='hunk'>@@ -1110,6 +1110,7 @@ static void tx_init(struct sky2_port *sky2)</div><div class='ctx'> 	sky2-&gt;tx_prod = sky2-&gt;tx_cons = 0;</div><div class='ctx'> 	sky2-&gt;tx_tcpsum = 0;</div><div class='ctx'> 	sky2-&gt;tx_last_mss = 0;</div><div class='add'>+	netdev_reset_queue(sky2-&gt;netdev);</div><div class='ctx'> </div><div class='ctx'> 	le = get_tx_le(sky2, &amp;sky2-&gt;tx_prod);</div><div class='ctx'> 	le-&gt;addr = 0;</div><div class='hunk'>@@ -1284,7 +1285,7 @@ static const uint32_t rss_init_key[10] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Enable/disable receive hash calculation (RSS) */</div><div class='del'>-static void rx_set_rss(struct net_device *dev, u32 features)</div><div class='add'>+static void rx_set_rss(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct sky2_port *sky2 = netdev_priv(dev);</div><div class='ctx'> 	struct sky2_hw *hw = sky2-&gt;hw;</div><div class='hunk'>@@ -1402,7 +1403,7 @@ static int sky2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> </div><div class='ctx'> #define SKY2_VLAN_OFFLOADS (NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_TSO)</div><div class='ctx'> </div><div class='del'>-static void sky2_vlan_mode(struct net_device *dev, u32 features)</div><div class='add'>+static void sky2_vlan_mode(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct sky2_port *sky2 = netdev_priv(dev);</div><div class='ctx'> 	struct sky2_hw *hw = sky2-&gt;hw;</div><div class='hunk'>@@ -1971,6 +1972,7 @@ static netdev_tx_t sky2_xmit_frame(struct sk_buff *skb,</div><div class='ctx'> 	if (tx_avail(sky2) &lt;= MAX_SKB_TX_LE)</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> </div><div class='add'>+	netdev_sent_queue(dev, skb-&gt;len);</div><div class='ctx'> 	sky2_put_idx(hw, txqaddr[sky2-&gt;port], sky2-&gt;tx_prod);</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='hunk'>@@ -2002,7 +2004,8 @@ mapping_error:</div><div class='ctx'> static void sky2_tx_complete(struct sky2_port *sky2, u16 done)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = sky2-&gt;netdev;</div><div class='del'>-	unsigned idx;</div><div class='add'>+	u16 idx;</div><div class='add'>+	unsigned int bytes_compl = 0, pkts_compl = 0;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(done &gt;= sky2-&gt;tx_ring_size);</div><div class='ctx'> </div><div class='hunk'>@@ -2017,10 +2020,8 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done)</div><div class='ctx'> 			netif_printk(sky2, tx_done, KERN_DEBUG, dev,</div><div class='ctx'> 				     "tx done %u\n", idx);</div><div class='ctx'> </div><div class='del'>-			u64_stats_update_begin(&amp;sky2-&gt;tx_stats.syncp);</div><div class='del'>-			++sky2-&gt;tx_stats.packets;</div><div class='del'>-			sky2-&gt;tx_stats.bytes += skb-&gt;len;</div><div class='del'>-			u64_stats_update_end(&amp;sky2-&gt;tx_stats.syncp);</div><div class='add'>+			pkts_compl++;</div><div class='add'>+			bytes_compl += skb-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 			re-&gt;skb = NULL;</div><div class='ctx'> 			dev_kfree_skb_any(skb);</div><div class='hunk'>@@ -2031,6 +2032,13 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done)</div><div class='ctx'> </div><div class='ctx'> 	sky2-&gt;tx_cons = idx;</div><div class='ctx'> 	smp_mb();</div><div class='add'>+</div><div class='add'>+	netdev_completed_queue(dev, pkts_compl, bytes_compl);</div><div class='add'>+</div><div class='add'>+	u64_stats_update_begin(&amp;sky2-&gt;tx_stats.syncp);</div><div class='add'>+	sky2-&gt;tx_stats.packets += pkts_compl;</div><div class='add'>+	sky2-&gt;tx_stats.bytes += bytes_compl;</div><div class='add'>+	u64_stats_update_end(&amp;sky2-&gt;tx_stats.syncp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sky2_tx_reset(struct sky2_hw *hw, unsigned port)</div><div class='hunk'>@@ -3643,10 +3651,10 @@ static void sky2_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct sky2_port *sky2 = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;fw_version, "N/A");</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(sky2-&gt;hw-&gt;pdev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(sky2-&gt;hw-&gt;pdev),</div><div class='add'>+		sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct sky2_stat {</div><div class='hunk'>@@ -4311,7 +4319,8 @@ static int sky2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom</div><div class='ctx'> 	return sky2_vpd_write(sky2-&gt;hw, cap, data, eeprom-&gt;offset, eeprom-&gt;len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 sky2_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static netdev_features_t sky2_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	const struct sky2_port *sky2 = netdev_priv(dev);</div><div class='ctx'> 	const struct sky2_hw *hw = sky2-&gt;hw;</div><div class='hunk'>@@ -4335,13 +4344,13 @@ static u32 sky2_fix_features(struct net_device *dev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sky2_set_features(struct net_device *dev, u32 features)</div><div class='add'>+static int sky2_set_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct sky2_port *sky2 = netdev_priv(dev);</div><div class='del'>-	u32 changed = dev-&gt;features ^ features;</div><div class='add'>+	netdev_features_t changed = dev-&gt;features ^ features;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; NETIF_F_RXCSUM) {</div><div class='del'>-		u32 on = features &amp; NETIF_F_RXCSUM;</div><div class='add'>+		bool on = features &amp; NETIF_F_RXCSUM;</div><div class='ctx'> 		sky2_write32(sky2-&gt;hw, Q_ADDR(rxqaddr[sky2-&gt;port], Q_CSR),</div><div class='ctx'> 			     on ? BMU_ENA_RX_CHKSUM : BMU_DIS_RX_CHKSUM);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/Makefile b/drivers/net/ethernet/mellanox/mlx4/Makefile<br/>index d1aa45a15854..4a40ab967eeb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/Makefile</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> obj-$(CONFIG_MLX4_CORE)		+= mlx4_core.o</div><div class='ctx'> </div><div class='ctx'> mlx4_core-y :=	alloc.o catas.o cmd.o cq.o eq.o fw.o icm.o intf.o main.o mcg.o \</div><div class='del'>-		mr.o pd.o port.o profile.o qp.o reset.o sense.o srq.o</div><div class='add'>+		mr.o pd.o port.o profile.o qp.o reset.o sense.o srq.o resource_tracker.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MLX4_EN)               += mlx4_en.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/catas.c b/drivers/net/ethernet/mellanox/mlx4/catas.c<br/>index 45aea9c3ae2c..915e947b422d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/catas.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/catas.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/catas.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/catas.c</a></div><div class='hunk'>@@ -48,7 +48,8 @@ static struct work_struct catas_work;</div><div class='ctx'> static int internal_err_reset = 1;</div><div class='ctx'> module_param(internal_err_reset, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(internal_err_reset,</div><div class='del'>-		 "Reset device on internal errors if non-zero (default 1)");</div><div class='add'>+		 "Reset device on internal errors if non-zero"</div><div class='add'>+		 " (default 1, in SRIOV mode default is 0)");</div><div class='ctx'> </div><div class='ctx'> static void dump_err_buf(struct mlx4_dev *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -116,6 +117,10 @@ void mlx4_start_catas_poll(struct mlx4_dev *dev)</div><div class='ctx'> 	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='ctx'> 	phys_addr_t addr;</div><div class='ctx'> </div><div class='add'>+	/*If we are in SRIOV the default of the module param must be 0*/</div><div class='add'>+	if (mlx4_is_mfunc(dev))</div><div class='add'>+		internal_err_reset = 0;</div><div class='add'>+</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;priv-&gt;catas_err.list);</div><div class='ctx'> 	init_timer(&amp;priv-&gt;catas_err.timer);</div><div class='ctx'> 	priv-&gt;catas_err.map = NULL;</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c<br/>index 78f5a1a0b8c8..978f593094c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/cmd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/cmd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/cmd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/cmd.c</a></div><div class='hunk'>@@ -39,12 +39,18 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mlx4/cmd.h&gt;</div><div class='add'>+#include &lt;linux/semaphore.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mlx4.h"</div><div class='add'>+#include "fw.h"</div><div class='ctx'> </div><div class='ctx'> #define CMD_POLL_TOKEN 0xffff</div><div class='add'>+#define INBOX_MASK	0xffffffffffffff00ULL</div><div class='add'>+</div><div class='add'>+#define CMD_CHAN_VER 1</div><div class='add'>+#define CMD_CHAN_IF_REV 1</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	/* command completed successfully: */</div><div class='hunk'>@@ -110,8 +116,12 @@ struct mlx4_cmd_context {</div><div class='ctx'> 	int			next;</div><div class='ctx'> 	u64			out_param;</div><div class='ctx'> 	u16			token;</div><div class='add'>+	u8			fw_status;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int mlx4_master_process_vhcr(struct mlx4_dev *dev, int slave,</div><div class='add'>+				    struct mlx4_vhcr_cmd *in_vhcr);</div><div class='add'>+</div><div class='ctx'> static int mlx4_status_to_errno(u8 status)</div><div class='ctx'> {</div><div class='ctx'> 	static const int trans_table[] = {</div><div class='hunk'>@@ -142,6 +152,139 @@ static int mlx4_status_to_errno(u8 status)</div><div class='ctx'> 	return trans_table[status];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u8 mlx4_errno_to_status(int errno)</div><div class='add'>+{</div><div class='add'>+	switch (errno) {</div><div class='add'>+	case -EPERM:</div><div class='add'>+		return CMD_STAT_BAD_OP;</div><div class='add'>+	case -EINVAL:</div><div class='add'>+		return CMD_STAT_BAD_PARAM;</div><div class='add'>+	case -ENXIO:</div><div class='add'>+		return CMD_STAT_BAD_SYS_STATE;</div><div class='add'>+	case -EBUSY:</div><div class='add'>+		return CMD_STAT_RESOURCE_BUSY;</div><div class='add'>+	case -ENOMEM:</div><div class='add'>+		return CMD_STAT_EXCEED_LIM;</div><div class='add'>+	case -ENFILE:</div><div class='add'>+		return CMD_STAT_ICM_ERROR;</div><div class='add'>+	default:</div><div class='add'>+		return CMD_STAT_INTERNAL_ERR;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int comm_pending(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	u32 status = readl(&amp;priv-&gt;mfunc.comm-&gt;slave_read);</div><div class='add'>+</div><div class='add'>+	return (swab32(status) &gt;&gt; 31) != priv-&gt;cmd.comm_toggle;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mlx4_comm_cmd_post(struct mlx4_dev *dev, u8 cmd, u16 param)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	priv-&gt;cmd.comm_toggle ^= 1;</div><div class='add'>+	val = param | (cmd &lt;&lt; 16) | (priv-&gt;cmd.comm_toggle &lt;&lt; 31);</div><div class='add'>+	__raw_writel((__force u32) cpu_to_be32(val),</div><div class='add'>+		     &amp;priv-&gt;mfunc.comm-&gt;slave_write);</div><div class='add'>+	mmiowb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mlx4_comm_cmd_poll(struct mlx4_dev *dev, u8 cmd, u16 param,</div><div class='add'>+		       unsigned long timeout)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	unsigned long end;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int ret_from_pending = 0;</div><div class='add'>+</div><div class='add'>+	/* First, verify that the master reports correct status */</div><div class='add'>+	if (comm_pending(dev)) {</div><div class='add'>+		mlx4_warn(dev, "Communication channel is not idle."</div><div class='add'>+			  "my toggle is %d (cmd:0x%x)\n",</div><div class='add'>+			  priv-&gt;cmd.comm_toggle, cmd);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Write command */</div><div class='add'>+	down(&amp;priv-&gt;cmd.poll_sem);</div><div class='add'>+	mlx4_comm_cmd_post(dev, cmd, param);</div><div class='add'>+</div><div class='add'>+	end = msecs_to_jiffies(timeout) + jiffies;</div><div class='add'>+	while (comm_pending(dev) &amp;&amp; time_before(jiffies, end))</div><div class='add'>+		cond_resched();</div><div class='add'>+	ret_from_pending = comm_pending(dev);</div><div class='add'>+	if (ret_from_pending) {</div><div class='add'>+		/* check if the slave is trying to boot in the middle of</div><div class='add'>+		 * FLR process. The only non-zero result in the RESET command</div><div class='add'>+		 * is MLX4_DELAY_RESET_SLAVE*/</div><div class='add'>+		if ((MLX4_COMM_CMD_RESET == cmd)) {</div><div class='add'>+			mlx4_warn(dev, "Got slave FLRed from Communication"</div><div class='add'>+				  " channel (ret:0x%x)\n", ret_from_pending);</div><div class='add'>+			err = MLX4_DELAY_RESET_SLAVE;</div><div class='add'>+		} else {</div><div class='add'>+			mlx4_warn(dev, "Communication channel timed out\n");</div><div class='add'>+			err = -ETIMEDOUT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	up(&amp;priv-&gt;cmd.poll_sem);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mlx4_comm_cmd_wait(struct mlx4_dev *dev, u8 op,</div><div class='add'>+			      u16 param, unsigned long timeout)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_cmd *cmd = &amp;mlx4_priv(dev)-&gt;cmd;</div><div class='add'>+	struct mlx4_cmd_context *context;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	down(&amp;cmd-&gt;event_sem);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;cmd-&gt;context_lock);</div><div class='add'>+	BUG_ON(cmd-&gt;free_head &lt; 0);</div><div class='add'>+	context = &amp;cmd-&gt;context[cmd-&gt;free_head];</div><div class='add'>+	context-&gt;token += cmd-&gt;token_mask + 1;</div><div class='add'>+	cmd-&gt;free_head = context-&gt;next;</div><div class='add'>+	spin_unlock(&amp;cmd-&gt;context_lock);</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;context-&gt;done);</div><div class='add'>+</div><div class='add'>+	mlx4_comm_cmd_post(dev, op, param);</div><div class='add'>+</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;context-&gt;done,</div><div class='add'>+					 msecs_to_jiffies(timeout))) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = context-&gt;result;</div><div class='add'>+	if (err &amp;&amp; context-&gt;fw_status != CMD_STAT_MULTI_FUNC_REQ) {</div><div class='add'>+		mlx4_err(dev, "command 0x%x failed: fw status = 0x%x\n",</div><div class='add'>+			 op, context-&gt;fw_status);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_lock(&amp;cmd-&gt;context_lock);</div><div class='add'>+	context-&gt;next = cmd-&gt;free_head;</div><div class='add'>+	cmd-&gt;free_head = context - cmd-&gt;context;</div><div class='add'>+	spin_unlock(&amp;cmd-&gt;context_lock);</div><div class='add'>+</div><div class='add'>+	up(&amp;cmd-&gt;event_sem);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_comm_cmd(struct mlx4_dev *dev, u8 cmd, u16 param,</div><div class='add'>+		  unsigned long timeout)</div><div class='add'>+{</div><div class='add'>+	if (mlx4_priv(dev)-&gt;cmd.use_events)</div><div class='add'>+		return mlx4_comm_cmd_wait(dev, cmd, param, timeout);</div><div class='add'>+	return mlx4_comm_cmd_poll(dev, cmd, param, timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cmd_pending(struct mlx4_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 status = readl(mlx4_priv(dev)-&gt;cmd.hcr + HCR_STATUS_OFFSET);</div><div class='hunk'>@@ -167,8 +310,10 @@ static int mlx4_cmd_post(struct mlx4_dev *dev, u64 in_param, u64 out_param,</div><div class='ctx'> 		end += msecs_to_jiffies(GO_BIT_TIMEOUT_MSECS);</div><div class='ctx'> </div><div class='ctx'> 	while (cmd_pending(dev)) {</div><div class='del'>-		if (time_after_eq(jiffies, end))</div><div class='add'>+		if (time_after_eq(jiffies, end)) {</div><div class='add'>+			mlx4_err(dev, "%s:cmd_pending failed\n", __func__);</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -192,7 +337,7 @@ static int mlx4_cmd_post(struct mlx4_dev *dev, u64 in_param, u64 out_param,</div><div class='ctx'> 					       (cmd-&gt;toggle &lt;&lt; HCR_T_BIT)	|</div><div class='ctx'> 					       (event ? (1 &lt;&lt; HCR_E_BIT) : 0)	|</div><div class='ctx'> 					       (op_modifier &lt;&lt; HCR_OPMOD_SHIFT) |</div><div class='del'>-					       op),			  hcr + 6);</div><div class='add'>+					       op), hcr + 6);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make sure that our HCR writes don't get mixed in with</div><div class='hunk'>@@ -209,6 +354,62 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mlx4_slave_cmd(struct mlx4_dev *dev, u64 in_param, u64 *out_param,</div><div class='add'>+			  int out_is_imm, u32 in_modifier, u8 op_modifier,</div><div class='add'>+			  u16 op, unsigned long timeout)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_vhcr_cmd *vhcr = priv-&gt;mfunc.vhcr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	down(&amp;priv-&gt;cmd.slave_sem);</div><div class='add'>+	vhcr-&gt;in_param = cpu_to_be64(in_param);</div><div class='add'>+	vhcr-&gt;out_param = out_param ? cpu_to_be64(*out_param) : 0;</div><div class='add'>+	vhcr-&gt;in_modifier = cpu_to_be32(in_modifier);</div><div class='add'>+	vhcr-&gt;opcode = cpu_to_be16((((u16) op_modifier) &lt;&lt; 12) | (op &amp; 0xfff));</div><div class='add'>+	vhcr-&gt;token = cpu_to_be16(CMD_POLL_TOKEN);</div><div class='add'>+	vhcr-&gt;status = 0;</div><div class='add'>+	vhcr-&gt;flags = !!(priv-&gt;cmd.use_events) &lt;&lt; 6;</div><div class='add'>+	if (mlx4_is_master(dev)) {</div><div class='add'>+		ret = mlx4_master_process_vhcr(dev, dev-&gt;caps.function, vhcr);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			if (out_is_imm) {</div><div class='add'>+				if (out_param)</div><div class='add'>+					*out_param =</div><div class='add'>+						be64_to_cpu(vhcr-&gt;out_param);</div><div class='add'>+				else {</div><div class='add'>+					mlx4_err(dev, "response expected while"</div><div class='add'>+						 "output mailbox is NULL for "</div><div class='add'>+						 "command 0x%x\n", op);</div><div class='add'>+					vhcr-&gt;status = CMD_STAT_BAD_PARAM;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			ret = mlx4_status_to_errno(vhcr-&gt;status);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ret = mlx4_comm_cmd(dev, MLX4_COMM_CMD_VHCR_POST, 0,</div><div class='add'>+				    MLX4_COMM_TIME + timeout);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			if (out_is_imm) {</div><div class='add'>+				if (out_param)</div><div class='add'>+					*out_param =</div><div class='add'>+						be64_to_cpu(vhcr-&gt;out_param);</div><div class='add'>+				else {</div><div class='add'>+					mlx4_err(dev, "response expected while"</div><div class='add'>+						 "output mailbox is NULL for "</div><div class='add'>+						 "command 0x%x\n", op);</div><div class='add'>+					vhcr-&gt;status = CMD_STAT_BAD_PARAM;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			ret = mlx4_status_to_errno(vhcr-&gt;status);</div><div class='add'>+		} else</div><div class='add'>+			mlx4_err(dev, "failed execution of VHCR_POST command"</div><div class='add'>+				 "opcode 0x%x\n", op);</div><div class='add'>+	}</div><div class='add'>+	up(&amp;priv-&gt;cmd.slave_sem);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mlx4_cmd_poll(struct mlx4_dev *dev, u64 in_param, u64 *out_param,</div><div class='ctx'> 			 int out_is_imm, u32 in_modifier, u8 op_modifier,</div><div class='ctx'> 			 u16 op, unsigned long timeout)</div><div class='hunk'>@@ -217,6 +418,7 @@ static int mlx4_cmd_poll(struct mlx4_dev *dev, u64 in_param, u64 *out_param,</div><div class='ctx'> 	void __iomem *hcr = priv-&gt;cmd.hcr;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	unsigned long end;</div><div class='add'>+	u32 stat;</div><div class='ctx'> </div><div class='ctx'> 	down(&amp;priv-&gt;cmd.poll_sem);</div><div class='ctx'> </div><div class='hunk'>@@ -240,9 +442,12 @@ static int mlx4_cmd_poll(struct mlx4_dev *dev, u64 in_param, u64 *out_param,</div><div class='ctx'> 					  __raw_readl(hcr + HCR_OUT_PARAM_OFFSET)) &lt;&lt; 32 |</div><div class='ctx'> 			(u64) be32_to_cpu((__force __be32)</div><div class='ctx'> 					  __raw_readl(hcr + HCR_OUT_PARAM_OFFSET + 4));</div><div class='del'>-</div><div class='del'>-	err = mlx4_status_to_errno(be32_to_cpu((__force __be32)</div><div class='del'>-					       __raw_readl(hcr + HCR_STATUS_OFFSET)) &gt;&gt; 24);</div><div class='add'>+	stat = be32_to_cpu((__force __be32)</div><div class='add'>+			   __raw_readl(hcr + HCR_STATUS_OFFSET)) &gt;&gt; 24;</div><div class='add'>+	err = mlx4_status_to_errno(stat);</div><div class='add'>+	if (err)</div><div class='add'>+		mlx4_err(dev, "command 0x%x failed: fw status = 0x%x\n",</div><div class='add'>+			 op, stat);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	up(&amp;priv-&gt;cmd.poll_sem);</div><div class='hunk'>@@ -259,6 +464,7 @@ void mlx4_cmd_event(struct mlx4_dev *dev, u16 token, u8 status, u64 out_param)</div><div class='ctx'> 	if (token != context-&gt;token)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	context-&gt;fw_status = status;</div><div class='ctx'> 	context-&gt;result    = mlx4_status_to_errno(status);</div><div class='ctx'> 	context-&gt;out_param = out_param;</div><div class='ctx'> </div><div class='hunk'>@@ -287,14 +493,18 @@ static int mlx4_cmd_wait(struct mlx4_dev *dev, u64 in_param, u64 *out_param,</div><div class='ctx'> 	mlx4_cmd_post(dev, in_param, out_param ? *out_param : 0,</div><div class='ctx'> 		      in_modifier, op_modifier, op, context-&gt;token, 1);</div><div class='ctx'> </div><div class='del'>-	if (!wait_for_completion_timeout(&amp;context-&gt;done, msecs_to_jiffies(timeout))) {</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;context-&gt;done,</div><div class='add'>+					 msecs_to_jiffies(timeout))) {</div><div class='ctx'> 		err = -EBUSY;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = context-&gt;result;</div><div class='del'>-	if (err)</div><div class='add'>+	if (err) {</div><div class='add'>+		mlx4_err(dev, "command 0x%x failed: fw status = 0x%x\n",</div><div class='add'>+			 op, context-&gt;fw_status);</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (out_is_imm)</div><div class='ctx'> 		*out_param = context-&gt;out_param;</div><div class='hunk'>@@ -311,17 +521,1046 @@ out:</div><div class='ctx'> </div><div class='ctx'> int __mlx4_cmd(struct mlx4_dev *dev, u64 in_param, u64 *out_param,</div><div class='ctx'> 	       int out_is_imm, u32 in_modifier, u8 op_modifier,</div><div class='del'>-	       u16 op, unsigned long timeout)</div><div class='add'>+	       u16 op, unsigned long timeout, int native)</div><div class='ctx'> {</div><div class='del'>-	if (mlx4_priv(dev)-&gt;cmd.use_events)</div><div class='del'>-		return mlx4_cmd_wait(dev, in_param, out_param, out_is_imm,</div><div class='del'>-				     in_modifier, op_modifier, op, timeout);</div><div class='del'>-	else</div><div class='del'>-		return mlx4_cmd_poll(dev, in_param, out_param, out_is_imm,</div><div class='del'>-				     in_modifier, op_modifier, op, timeout);</div><div class='add'>+	if (!mlx4_is_mfunc(dev) || (native &amp;&amp; mlx4_is_master(dev))) {</div><div class='add'>+		if (mlx4_priv(dev)-&gt;cmd.use_events)</div><div class='add'>+			return mlx4_cmd_wait(dev, in_param, out_param,</div><div class='add'>+					     out_is_imm, in_modifier,</div><div class='add'>+					     op_modifier, op, timeout);</div><div class='add'>+		else</div><div class='add'>+			return mlx4_cmd_poll(dev, in_param, out_param,</div><div class='add'>+					     out_is_imm, in_modifier,</div><div class='add'>+					     op_modifier, op, timeout);</div><div class='add'>+	}</div><div class='add'>+	return mlx4_slave_cmd(dev, in_param, out_param, out_is_imm,</div><div class='add'>+			      in_modifier, op_modifier, op, timeout);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__mlx4_cmd);</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static int mlx4_ARM_COMM_CHANNEL(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return mlx4_cmd(dev, 0, 0, 0, MLX4_CMD_ARM_COMM_CHANNEL,</div><div class='add'>+			MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mlx4_ACCESS_MEM(struct mlx4_dev *dev, u64 master_addr,</div><div class='add'>+			   int slave, u64 slave_addr,</div><div class='add'>+			   int size, int is_read)</div><div class='add'>+{</div><div class='add'>+	u64 in_param;</div><div class='add'>+	u64 out_param;</div><div class='add'>+</div><div class='add'>+	if ((slave_addr &amp; 0xfff) | (master_addr &amp; 0xfff) |</div><div class='add'>+	    (slave &amp; ~0x7f) | (size &amp; 0xff)) {</div><div class='add'>+		mlx4_err(dev, "Bad access mem params - slave_addr:0x%llx "</div><div class='add'>+			      "master_addr:0x%llx slave_id:%d size:%d\n",</div><div class='add'>+			      slave_addr, master_addr, slave, size);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_read) {</div><div class='add'>+		in_param = (u64) slave | slave_addr;</div><div class='add'>+		out_param = (u64) dev-&gt;caps.function | master_addr;</div><div class='add'>+	} else {</div><div class='add'>+		in_param = (u64) dev-&gt;caps.function | master_addr;</div><div class='add'>+		out_param = (u64) slave | slave_addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mlx4_cmd_imm(dev, in_param, &amp;out_param, size, 0,</div><div class='add'>+			    MLX4_CMD_ACCESS_MEM,</div><div class='add'>+			    MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_DMA_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+		     struct mlx4_vhcr *vhcr,</div><div class='add'>+		     struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+		     struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+		     struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	u64 in_param;</div><div class='add'>+	u64 out_param;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	in_param = cmd-&gt;has_inbox ? (u64) inbox-&gt;dma : vhcr-&gt;in_param;</div><div class='add'>+	out_param = cmd-&gt;has_outbox ? (u64) outbox-&gt;dma : vhcr-&gt;out_param;</div><div class='add'>+	if (cmd-&gt;encode_slave_id) {</div><div class='add'>+		in_param &amp;= 0xffffffffffffff00ll;</div><div class='add'>+		in_param |= slave;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = __mlx4_cmd(dev, in_param, &amp;out_param, cmd-&gt;out_is_imm,</div><div class='add'>+			 vhcr-&gt;in_modifier, vhcr-&gt;op_modifier, vhcr-&gt;op,</div><div class='add'>+			 MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;out_is_imm)</div><div class='add'>+		vhcr-&gt;out_param = out_param;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mlx4_cmd_info cmd_info[] = {</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_QUERY_FW,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = true,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = NULL</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_QUERY_HCA,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = true,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = NULL</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_QUERY_DEV_CAP,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = true,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = NULL</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_QUERY_FUNC_CAP,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = true,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_QUERY_FUNC_CAP_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_QUERY_ADAPTER,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = true,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = NULL</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_INIT_PORT,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_INIT_PORT_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_CLOSE_PORT,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm  = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_CLOSE_PORT_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_QUERY_PORT,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = true,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_QUERY_PORT_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_SET_PORT,</div><div class='add'>+		.has_inbox = true,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_SET_PORT_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_MAP_EQ,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_MAP_EQ_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_SW2HW_EQ,</div><div class='add'>+		.has_inbox = true,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = true,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_SW2HW_EQ_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_HW_HEALTH_CHECK,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = NULL</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_NOP,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = NULL</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_ALLOC_RES,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = true,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_ALLOC_RES_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_FREE_RES,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_FREE_RES_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_SW2HW_MPT,</div><div class='add'>+		.has_inbox = true,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = true,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_SW2HW_MPT_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_QUERY_MPT,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = true,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_QUERY_MPT_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_HW2SW_MPT,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_HW2SW_MPT_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_READ_MTT,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = true,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = NULL</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_WRITE_MTT,</div><div class='add'>+		.has_inbox = true,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_WRITE_MTT_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_SYNC_TPT,</div><div class='add'>+		.has_inbox = true,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = NULL</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_HW2SW_EQ,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = true,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = true,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_HW2SW_EQ_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_QUERY_EQ,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = true,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = true,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_QUERY_EQ_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_SW2HW_CQ,</div><div class='add'>+		.has_inbox = true,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = true,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_SW2HW_CQ_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_HW2SW_CQ,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_HW2SW_CQ_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_QUERY_CQ,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = true,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_QUERY_CQ_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_MODIFY_CQ,</div><div class='add'>+		.has_inbox = true,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = true,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_MODIFY_CQ_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_SW2HW_SRQ,</div><div class='add'>+		.has_inbox = true,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = true,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_SW2HW_SRQ_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_HW2SW_SRQ,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_HW2SW_SRQ_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_QUERY_SRQ,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = true,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_QUERY_SRQ_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_ARM_SRQ,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_ARM_SRQ_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_RST2INIT_QP,</div><div class='add'>+		.has_inbox = true,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = true,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_RST2INIT_QP_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_INIT2INIT_QP,</div><div class='add'>+		.has_inbox = true,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_GEN_QP_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_INIT2RTR_QP,</div><div class='add'>+		.has_inbox = true,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_INIT2RTR_QP_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_RTR2RTS_QP,</div><div class='add'>+		.has_inbox = true,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_GEN_QP_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_RTS2RTS_QP,</div><div class='add'>+		.has_inbox = true,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_GEN_QP_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_SQERR2RTS_QP,</div><div class='add'>+		.has_inbox = true,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_GEN_QP_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_2ERR_QP,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_GEN_QP_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_RTS2SQD_QP,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_GEN_QP_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_SQD2SQD_QP,</div><div class='add'>+		.has_inbox = true,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_GEN_QP_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_SQD2RTS_QP,</div><div class='add'>+		.has_inbox = true,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_GEN_QP_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_2RST_QP,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_2RST_QP_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_QUERY_QP,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = true,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_GEN_QP_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_SUSPEND_QP,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_GEN_QP_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_UNSUSPEND_QP,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_GEN_QP_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_QUERY_IF_STAT,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = true,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_QUERY_IF_STAT_wrapper</div><div class='add'>+	},</div><div class='add'>+	/* Native multicast commands are not available for guests */</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_QP_ATTACH,</div><div class='add'>+		.has_inbox = true,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_QP_ATTACH_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_PROMISC,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_PROMISC_wrapper</div><div class='add'>+	},</div><div class='add'>+	/* Ethernet specific commands */</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_SET_VLAN_FLTR,</div><div class='add'>+		.has_inbox = true,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_SET_VLAN_FLTR_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_SET_MCAST_FLTR,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_SET_MCAST_FLTR_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_DUMP_ETH_STATS,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = true,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = mlx4_DUMP_ETH_STATS_wrapper</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = MLX4_CMD_INFORM_FLR_DONE,</div><div class='add'>+		.has_inbox = false,</div><div class='add'>+		.has_outbox = false,</div><div class='add'>+		.out_is_imm = false,</div><div class='add'>+		.encode_slave_id = false,</div><div class='add'>+		.verify = NULL,</div><div class='add'>+		.wrapper = NULL</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mlx4_master_process_vhcr(struct mlx4_dev *dev, int slave,</div><div class='add'>+				    struct mlx4_vhcr_cmd *in_vhcr)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_cmd_info *cmd = NULL;</div><div class='add'>+	struct mlx4_vhcr_cmd *vhcr_cmd = in_vhcr ? in_vhcr : priv-&gt;mfunc.vhcr;</div><div class='add'>+	struct mlx4_vhcr *vhcr;</div><div class='add'>+	struct mlx4_cmd_mailbox *inbox = NULL;</div><div class='add'>+	struct mlx4_cmd_mailbox *outbox = NULL;</div><div class='add'>+	u64 in_param;</div><div class='add'>+	u64 out_param;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int i;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* Create sw representation of Virtual HCR */</div><div class='add'>+	vhcr = kzalloc(sizeof(struct mlx4_vhcr), GFP_KERNEL);</div><div class='add'>+	if (!vhcr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* DMA in the vHCR */</div><div class='add'>+	if (!in_vhcr) {</div><div class='add'>+		ret = mlx4_ACCESS_MEM(dev, priv-&gt;mfunc.vhcr_dma, slave,</div><div class='add'>+				      priv-&gt;mfunc.master.slave_state[slave].vhcr_dma,</div><div class='add'>+				      ALIGN(sizeof(struct mlx4_vhcr_cmd),</div><div class='add'>+					    MLX4_ACCESS_MEM_ALIGN), 1);</div><div class='add'>+		if (ret) {</div><div class='add'>+			mlx4_err(dev, "%s:Failed reading vhcr"</div><div class='add'>+				 "ret: 0x%x\n", __func__, ret);</div><div class='add'>+			kfree(vhcr);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fill SW VHCR fields */</div><div class='add'>+	vhcr-&gt;in_param = be64_to_cpu(vhcr_cmd-&gt;in_param);</div><div class='add'>+	vhcr-&gt;out_param = be64_to_cpu(vhcr_cmd-&gt;out_param);</div><div class='add'>+	vhcr-&gt;in_modifier = be32_to_cpu(vhcr_cmd-&gt;in_modifier);</div><div class='add'>+	vhcr-&gt;token = be16_to_cpu(vhcr_cmd-&gt;token);</div><div class='add'>+	vhcr-&gt;op = be16_to_cpu(vhcr_cmd-&gt;opcode) &amp; 0xfff;</div><div class='add'>+	vhcr-&gt;op_modifier = (u8) (be16_to_cpu(vhcr_cmd-&gt;opcode) &gt;&gt; 12);</div><div class='add'>+	vhcr-&gt;e_bit = vhcr_cmd-&gt;flags &amp; (1 &lt;&lt; 6);</div><div class='add'>+</div><div class='add'>+	/* Lookup command */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(cmd_info); ++i) {</div><div class='add'>+		if (vhcr-&gt;op == cmd_info[i].opcode) {</div><div class='add'>+			cmd = &amp;cmd_info[i];</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (!cmd) {</div><div class='add'>+		mlx4_err(dev, "Unknown command:0x%x accepted from slave:%d\n",</div><div class='add'>+			 vhcr-&gt;op, slave);</div><div class='add'>+		vhcr_cmd-&gt;status = CMD_STAT_BAD_PARAM;</div><div class='add'>+		goto out_status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Read inbox */</div><div class='add'>+	if (cmd-&gt;has_inbox) {</div><div class='add'>+		vhcr-&gt;in_param &amp;= INBOX_MASK;</div><div class='add'>+		inbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='add'>+		if (IS_ERR(inbox)) {</div><div class='add'>+			vhcr_cmd-&gt;status = CMD_STAT_BAD_SIZE;</div><div class='add'>+			inbox = NULL;</div><div class='add'>+			goto out_status;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (mlx4_ACCESS_MEM(dev, inbox-&gt;dma, slave,</div><div class='add'>+				    vhcr-&gt;in_param,</div><div class='add'>+				    MLX4_MAILBOX_SIZE, 1)) {</div><div class='add'>+			mlx4_err(dev, "%s: Failed reading inbox (cmd:0x%x)\n",</div><div class='add'>+				 __func__, cmd-&gt;opcode);</div><div class='add'>+			vhcr_cmd-&gt;status = CMD_STAT_INTERNAL_ERR;</div><div class='add'>+			goto out_status;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Apply permission and bound checks if applicable */</div><div class='add'>+	if (cmd-&gt;verify &amp;&amp; cmd-&gt;verify(dev, slave, vhcr, inbox)) {</div><div class='add'>+		mlx4_warn(dev, "Command:0x%x from slave: %d failed protection "</div><div class='add'>+			  "checks for resource_id:%d\n", vhcr-&gt;op, slave,</div><div class='add'>+			  vhcr-&gt;in_modifier);</div><div class='add'>+		vhcr_cmd-&gt;status = CMD_STAT_BAD_OP;</div><div class='add'>+		goto out_status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate outbox */</div><div class='add'>+	if (cmd-&gt;has_outbox) {</div><div class='add'>+		outbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='add'>+		if (IS_ERR(outbox)) {</div><div class='add'>+			vhcr_cmd-&gt;status = CMD_STAT_BAD_SIZE;</div><div class='add'>+			outbox = NULL;</div><div class='add'>+			goto out_status;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Execute the command! */</div><div class='add'>+	if (cmd-&gt;wrapper) {</div><div class='add'>+		err = cmd-&gt;wrapper(dev, slave, vhcr, inbox, outbox,</div><div class='add'>+				   cmd);</div><div class='add'>+		if (cmd-&gt;out_is_imm)</div><div class='add'>+			vhcr_cmd-&gt;out_param = cpu_to_be64(vhcr-&gt;out_param);</div><div class='add'>+	} else {</div><div class='add'>+		in_param = cmd-&gt;has_inbox ? (u64) inbox-&gt;dma :</div><div class='add'>+			vhcr-&gt;in_param;</div><div class='add'>+		out_param = cmd-&gt;has_outbox ? (u64) outbox-&gt;dma :</div><div class='add'>+			vhcr-&gt;out_param;</div><div class='add'>+		err = __mlx4_cmd(dev, in_param, &amp;out_param,</div><div class='add'>+				 cmd-&gt;out_is_imm, vhcr-&gt;in_modifier,</div><div class='add'>+				 vhcr-&gt;op_modifier, vhcr-&gt;op,</div><div class='add'>+				 MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+				 MLX4_CMD_NATIVE);</div><div class='add'>+</div><div class='add'>+		if (cmd-&gt;out_is_imm) {</div><div class='add'>+			vhcr-&gt;out_param = out_param;</div><div class='add'>+			vhcr_cmd-&gt;out_param = cpu_to_be64(vhcr-&gt;out_param);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		mlx4_warn(dev, "vhcr command:0x%x slave:%d failed with"</div><div class='add'>+			  " error:%d, status %d\n",</div><div class='add'>+			  vhcr-&gt;op, slave, vhcr-&gt;errno, err);</div><div class='add'>+		vhcr_cmd-&gt;status = mlx4_errno_to_status(err);</div><div class='add'>+		goto out_status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* Write outbox if command completed successfully */</div><div class='add'>+	if (cmd-&gt;has_outbox &amp;&amp; !vhcr_cmd-&gt;status) {</div><div class='add'>+		ret = mlx4_ACCESS_MEM(dev, outbox-&gt;dma, slave,</div><div class='add'>+				      vhcr-&gt;out_param,</div><div class='add'>+				      MLX4_MAILBOX_SIZE, MLX4_CMD_WRAPPED);</div><div class='add'>+		if (ret) {</div><div class='add'>+			/* If we failed to write back the outbox after the</div><div class='add'>+			 *command was successfully executed, we must fail this</div><div class='add'>+			 * slave, as it is now in undefined state */</div><div class='add'>+			mlx4_err(dev, "%s:Failed writing outbox\n", __func__);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_status:</div><div class='add'>+	/* DMA back vhcr result */</div><div class='add'>+	if (!in_vhcr) {</div><div class='add'>+		ret = mlx4_ACCESS_MEM(dev, priv-&gt;mfunc.vhcr_dma, slave,</div><div class='add'>+				      priv-&gt;mfunc.master.slave_state[slave].vhcr_dma,</div><div class='add'>+				      ALIGN(sizeof(struct mlx4_vhcr),</div><div class='add'>+					    MLX4_ACCESS_MEM_ALIGN),</div><div class='add'>+				      MLX4_CMD_WRAPPED);</div><div class='add'>+		if (ret)</div><div class='add'>+			mlx4_err(dev, "%s:Failed writing vhcr result\n",</div><div class='add'>+				 __func__);</div><div class='add'>+		else if (vhcr-&gt;e_bit &amp;&amp;</div><div class='add'>+			 mlx4_GEN_EQE(dev, slave, &amp;priv-&gt;mfunc.master.cmd_eqe))</div><div class='add'>+				mlx4_warn(dev, "Failed to generate command completion "</div><div class='add'>+					  "eqe for slave %d\n", slave);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(vhcr);</div><div class='add'>+	mlx4_free_cmd_mailbox(dev, inbox);</div><div class='add'>+	mlx4_free_cmd_mailbox(dev, outbox);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,</div><div class='add'>+			       u16 param, u8 toggle)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_slave_state *slave_state = priv-&gt;mfunc.master.slave_state;</div><div class='add'>+	u32 reply;</div><div class='add'>+	u32 slave_status = 0;</div><div class='add'>+	u8 is_going_down = 0;</div><div class='add'>+</div><div class='add'>+	slave_state[slave].comm_toggle ^= 1;</div><div class='add'>+	reply = (u32) slave_state[slave].comm_toggle &lt;&lt; 31;</div><div class='add'>+	if (toggle != slave_state[slave].comm_toggle) {</div><div class='add'>+		mlx4_warn(dev, "Incorrect toggle %d from slave %d. *** MASTER"</div><div class='add'>+			  "STATE COMPROMISIED ***\n", toggle, slave);</div><div class='add'>+		goto reset_slave;</div><div class='add'>+	}</div><div class='add'>+	if (cmd == MLX4_COMM_CMD_RESET) {</div><div class='add'>+		mlx4_warn(dev, "Received reset from slave:%d\n", slave);</div><div class='add'>+		slave_state[slave].active = false;</div><div class='add'>+		/*check if we are in the middle of FLR process,</div><div class='add'>+		if so return "retry" status to the slave*/</div><div class='add'>+		if (MLX4_COMM_CMD_FLR == slave_state[slave].last_cmd) {</div><div class='add'>+			slave_status = MLX4_DELAY_RESET_SLAVE;</div><div class='add'>+			goto inform_slave_state;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* write the version in the event field */</div><div class='add'>+		reply |= mlx4_comm_get_version();</div><div class='add'>+</div><div class='add'>+		goto reset_slave;</div><div class='add'>+	}</div><div class='add'>+	/*command from slave in the middle of FLR*/</div><div class='add'>+	if (cmd != MLX4_COMM_CMD_RESET &amp;&amp;</div><div class='add'>+	    MLX4_COMM_CMD_FLR == slave_state[slave].last_cmd) {</div><div class='add'>+		mlx4_warn(dev, "slave:%d is Trying to run cmd(0x%x) "</div><div class='add'>+			  "in the middle of FLR\n", slave, cmd);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case MLX4_COMM_CMD_VHCR0:</div><div class='add'>+		if (slave_state[slave].last_cmd != MLX4_COMM_CMD_RESET)</div><div class='add'>+			goto reset_slave;</div><div class='add'>+		slave_state[slave].vhcr_dma = ((u64) param) &lt;&lt; 48;</div><div class='add'>+		priv-&gt;mfunc.master.slave_state[slave].cookie = 0;</div><div class='add'>+		mutex_init(&amp;priv-&gt;mfunc.master.gen_eqe_mutex[slave]);</div><div class='add'>+		break;</div><div class='add'>+	case MLX4_COMM_CMD_VHCR1:</div><div class='add'>+		if (slave_state[slave].last_cmd != MLX4_COMM_CMD_VHCR0)</div><div class='add'>+			goto reset_slave;</div><div class='add'>+		slave_state[slave].vhcr_dma |= ((u64) param) &lt;&lt; 32;</div><div class='add'>+		break;</div><div class='add'>+	case MLX4_COMM_CMD_VHCR2:</div><div class='add'>+		if (slave_state[slave].last_cmd != MLX4_COMM_CMD_VHCR1)</div><div class='add'>+			goto reset_slave;</div><div class='add'>+		slave_state[slave].vhcr_dma |= ((u64) param) &lt;&lt; 16;</div><div class='add'>+		break;</div><div class='add'>+	case MLX4_COMM_CMD_VHCR_EN:</div><div class='add'>+		if (slave_state[slave].last_cmd != MLX4_COMM_CMD_VHCR2)</div><div class='add'>+			goto reset_slave;</div><div class='add'>+		slave_state[slave].vhcr_dma |= param;</div><div class='add'>+		slave_state[slave].active = true;</div><div class='add'>+		break;</div><div class='add'>+	case MLX4_COMM_CMD_VHCR_POST:</div><div class='add'>+		if ((slave_state[slave].last_cmd != MLX4_COMM_CMD_VHCR_EN) &amp;&amp;</div><div class='add'>+		    (slave_state[slave].last_cmd != MLX4_COMM_CMD_VHCR_POST))</div><div class='add'>+			goto reset_slave;</div><div class='add'>+		down(&amp;priv-&gt;cmd.slave_sem);</div><div class='add'>+		if (mlx4_master_process_vhcr(dev, slave, NULL)) {</div><div class='add'>+			mlx4_err(dev, "Failed processing vhcr for slave:%d,"</div><div class='add'>+				 " reseting slave.\n", slave);</div><div class='add'>+			up(&amp;priv-&gt;cmd.slave_sem);</div><div class='add'>+			goto reset_slave;</div><div class='add'>+		}</div><div class='add'>+		up(&amp;priv-&gt;cmd.slave_sem);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		mlx4_warn(dev, "Bad comm cmd:%d from slave:%d\n", cmd, slave);</div><div class='add'>+		goto reset_slave;</div><div class='add'>+	}</div><div class='add'>+	spin_lock(&amp;priv-&gt;mfunc.master.slave_state_lock);</div><div class='add'>+	if (!slave_state[slave].is_slave_going_down)</div><div class='add'>+		slave_state[slave].last_cmd = cmd;</div><div class='add'>+	else</div><div class='add'>+		is_going_down = 1;</div><div class='add'>+	spin_unlock(&amp;priv-&gt;mfunc.master.slave_state_lock);</div><div class='add'>+	if (is_going_down) {</div><div class='add'>+		mlx4_warn(dev, "Slave is going down aborting command(%d)"</div><div class='add'>+			  " executing from slave:%d\n",</div><div class='add'>+			  cmd, slave);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	__raw_writel((__force u32) cpu_to_be32(reply),</div><div class='add'>+		     &amp;priv-&gt;mfunc.comm[slave].slave_read);</div><div class='add'>+	mmiowb();</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+reset_slave:</div><div class='add'>+	/* cleanup any slave resources */</div><div class='add'>+	mlx4_delete_all_resources_for_slave(dev, slave);</div><div class='add'>+	spin_lock(&amp;priv-&gt;mfunc.master.slave_state_lock);</div><div class='add'>+	if (!slave_state[slave].is_slave_going_down)</div><div class='add'>+		slave_state[slave].last_cmd = MLX4_COMM_CMD_RESET;</div><div class='add'>+	spin_unlock(&amp;priv-&gt;mfunc.master.slave_state_lock);</div><div class='add'>+	/*with slave in the middle of flr, no need to clean resources again.*/</div><div class='add'>+inform_slave_state:</div><div class='add'>+	memset(&amp;slave_state[slave].event_eq, 0,</div><div class='add'>+	       sizeof(struct mlx4_slave_event_eq_info));</div><div class='add'>+	__raw_writel((__force u32) cpu_to_be32(reply),</div><div class='add'>+		     &amp;priv-&gt;mfunc.comm[slave].slave_read);</div><div class='add'>+	wmb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* master command processing */</div><div class='add'>+void mlx4_master_comm_channel(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_mfunc_master_ctx *master =</div><div class='add'>+		container_of(work,</div><div class='add'>+			     struct mlx4_mfunc_master_ctx,</div><div class='add'>+			     comm_work);</div><div class='add'>+	struct mlx4_mfunc *mfunc =</div><div class='add'>+		container_of(master, struct mlx4_mfunc, master);</div><div class='add'>+	struct mlx4_priv *priv =</div><div class='add'>+		container_of(mfunc, struct mlx4_priv, mfunc);</div><div class='add'>+	struct mlx4_dev *dev = &amp;priv-&gt;dev;</div><div class='add'>+	__be32 *bit_vec;</div><div class='add'>+	u32 comm_cmd;</div><div class='add'>+	u32 vec;</div><div class='add'>+	int i, j, slave;</div><div class='add'>+	int toggle;</div><div class='add'>+	int served = 0;</div><div class='add'>+	int reported = 0;</div><div class='add'>+	u32 slt;</div><div class='add'>+</div><div class='add'>+	bit_vec = master-&gt;comm_arm_bit_vector;</div><div class='add'>+	for (i = 0; i &lt; COMM_CHANNEL_BIT_ARRAY_SIZE; i++) {</div><div class='add'>+		vec = be32_to_cpu(bit_vec[i]);</div><div class='add'>+		for (j = 0; j &lt; 32; j++) {</div><div class='add'>+			if (!(vec &amp; (1 &lt;&lt; j)))</div><div class='add'>+				continue;</div><div class='add'>+			++reported;</div><div class='add'>+			slave = (i * 32) + j;</div><div class='add'>+			comm_cmd = swab32(readl(</div><div class='add'>+					  &amp;mfunc-&gt;comm[slave].slave_write));</div><div class='add'>+			slt = swab32(readl(&amp;mfunc-&gt;comm[slave].slave_read))</div><div class='add'>+				     &gt;&gt; 31;</div><div class='add'>+			toggle = comm_cmd &gt;&gt; 31;</div><div class='add'>+			if (toggle != slt) {</div><div class='add'>+				if (master-&gt;slave_state[slave].comm_toggle</div><div class='add'>+				    != slt) {</div><div class='add'>+					printk(KERN_INFO "slave %d out of sync."</div><div class='add'>+					       " read toggle %d, state toggle %d. "</div><div class='add'>+					       "Resynching.\n", slave, slt,</div><div class='add'>+					       master-&gt;slave_state[slave].comm_toggle);</div><div class='add'>+					master-&gt;slave_state[slave].comm_toggle =</div><div class='add'>+						slt;</div><div class='add'>+				}</div><div class='add'>+				mlx4_master_do_cmd(dev, slave,</div><div class='add'>+						   comm_cmd &gt;&gt; 16 &amp; 0xff,</div><div class='add'>+						   comm_cmd &amp; 0xffff, toggle);</div><div class='add'>+				++served;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (reported &amp;&amp; reported != served)</div><div class='add'>+		mlx4_warn(dev, "Got command event with bitmask from %d slaves"</div><div class='add'>+			  " but %d were served\n",</div><div class='add'>+			  reported, served);</div><div class='add'>+</div><div class='add'>+	if (mlx4_ARM_COMM_CHANNEL(dev))</div><div class='add'>+		mlx4_warn(dev, "Failed to arm comm channel events\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sync_toggles(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	int wr_toggle;</div><div class='add'>+	int rd_toggle;</div><div class='add'>+	unsigned long end;</div><div class='add'>+</div><div class='add'>+	wr_toggle = swab32(readl(&amp;priv-&gt;mfunc.comm-&gt;slave_write)) &gt;&gt; 31;</div><div class='add'>+	end = jiffies + msecs_to_jiffies(5000);</div><div class='add'>+</div><div class='add'>+	while (time_before(jiffies, end)) {</div><div class='add'>+		rd_toggle = swab32(readl(&amp;priv-&gt;mfunc.comm-&gt;slave_read)) &gt;&gt; 31;</div><div class='add'>+		if (rd_toggle == wr_toggle) {</div><div class='add'>+			priv-&gt;cmd.comm_toggle = rd_toggle;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * we could reach here if for example the previous VM using this</div><div class='add'>+	 * function misbehaved and left the channel with unsynced state. We</div><div class='add'>+	 * should fix this here and give this VM a chance to use a properly</div><div class='add'>+	 * synced channel</div><div class='add'>+	 */</div><div class='add'>+	mlx4_warn(dev, "recovering from previously mis-behaved VM\n");</div><div class='add'>+	__raw_writel((__force u32) 0, &amp;priv-&gt;mfunc.comm-&gt;slave_read);</div><div class='add'>+	__raw_writel((__force u32) 0, &amp;priv-&gt;mfunc.comm-&gt;slave_write);</div><div class='add'>+	priv-&gt;cmd.comm_toggle = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_multi_func_init(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_slave_state *s_state;</div><div class='add'>+	int i, err, port;</div><div class='add'>+</div><div class='add'>+	priv-&gt;mfunc.vhcr = dma_alloc_coherent(&amp;(dev-&gt;pdev-&gt;dev), PAGE_SIZE,</div><div class='add'>+					    &amp;priv-&gt;mfunc.vhcr_dma,</div><div class='add'>+					    GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;mfunc.vhcr) {</div><div class='add'>+		mlx4_err(dev, "Couldn't allocate vhcr.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_master(dev))</div><div class='add'>+		priv-&gt;mfunc.comm =</div><div class='add'>+		ioremap(pci_resource_start(dev-&gt;pdev, priv-&gt;fw.comm_bar) +</div><div class='add'>+			priv-&gt;fw.comm_base, MLX4_COMM_PAGESIZE);</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;mfunc.comm =</div><div class='add'>+		ioremap(pci_resource_start(dev-&gt;pdev, 2) +</div><div class='add'>+			MLX4_SLAVE_COMM_BASE, MLX4_COMM_PAGESIZE);</div><div class='add'>+	if (!priv-&gt;mfunc.comm) {</div><div class='add'>+		mlx4_err(dev, "Couldn't map communication vector.\n");</div><div class='add'>+		goto err_vhcr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_master(dev)) {</div><div class='add'>+		priv-&gt;mfunc.master.slave_state =</div><div class='add'>+			kzalloc(dev-&gt;num_slaves *</div><div class='add'>+				sizeof(struct mlx4_slave_state), GFP_KERNEL);</div><div class='add'>+		if (!priv-&gt;mfunc.master.slave_state)</div><div class='add'>+			goto err_comm;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; dev-&gt;num_slaves; ++i) {</div><div class='add'>+			s_state = &amp;priv-&gt;mfunc.master.slave_state[i];</div><div class='add'>+			s_state-&gt;last_cmd = MLX4_COMM_CMD_RESET;</div><div class='add'>+			__raw_writel((__force u32) 0,</div><div class='add'>+				     &amp;priv-&gt;mfunc.comm[i].slave_write);</div><div class='add'>+			__raw_writel((__force u32) 0,</div><div class='add'>+				     &amp;priv-&gt;mfunc.comm[i].slave_read);</div><div class='add'>+			mmiowb();</div><div class='add'>+			for (port = 1; port &lt;= MLX4_MAX_PORTS; port++) {</div><div class='add'>+				s_state-&gt;vlan_filter[port] =</div><div class='add'>+					kzalloc(sizeof(struct mlx4_vlan_fltr),</div><div class='add'>+						GFP_KERNEL);</div><div class='add'>+				if (!s_state-&gt;vlan_filter[port]) {</div><div class='add'>+					if (--port)</div><div class='add'>+						kfree(s_state-&gt;vlan_filter[port]);</div><div class='add'>+					goto err_slaves;</div><div class='add'>+				}</div><div class='add'>+				INIT_LIST_HEAD(&amp;s_state-&gt;mcast_filters[port]);</div><div class='add'>+			}</div><div class='add'>+			spin_lock_init(&amp;s_state-&gt;lock);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memset(&amp;priv-&gt;mfunc.master.cmd_eqe, 0, sizeof(struct mlx4_eqe));</div><div class='add'>+		priv-&gt;mfunc.master.cmd_eqe.type = MLX4_EVENT_TYPE_CMD;</div><div class='add'>+		INIT_WORK(&amp;priv-&gt;mfunc.master.comm_work,</div><div class='add'>+			  mlx4_master_comm_channel);</div><div class='add'>+		INIT_WORK(&amp;priv-&gt;mfunc.master.slave_event_work,</div><div class='add'>+			  mlx4_gen_slave_eqe);</div><div class='add'>+		INIT_WORK(&amp;priv-&gt;mfunc.master.slave_flr_event_work,</div><div class='add'>+			  mlx4_master_handle_slave_flr);</div><div class='add'>+		spin_lock_init(&amp;priv-&gt;mfunc.master.slave_state_lock);</div><div class='add'>+		priv-&gt;mfunc.master.comm_wq =</div><div class='add'>+			create_singlethread_workqueue("mlx4_comm");</div><div class='add'>+		if (!priv-&gt;mfunc.master.comm_wq)</div><div class='add'>+			goto err_slaves;</div><div class='add'>+</div><div class='add'>+		if (mlx4_init_resource_tracker(dev))</div><div class='add'>+			goto err_thread;</div><div class='add'>+</div><div class='add'>+		sema_init(&amp;priv-&gt;cmd.slave_sem, 1);</div><div class='add'>+		err = mlx4_ARM_COMM_CHANNEL(dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			mlx4_err(dev, " Failed to arm comm channel eq: %x\n",</div><div class='add'>+				 err);</div><div class='add'>+			goto err_resource;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		err = sync_toggles(dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			mlx4_err(dev, "Couldn't sync toggles\n");</div><div class='add'>+			goto err_comm;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sema_init(&amp;priv-&gt;cmd.slave_sem, 1);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_resource:</div><div class='add'>+	mlx4_free_resource_tracker(dev);</div><div class='add'>+err_thread:</div><div class='add'>+	flush_workqueue(priv-&gt;mfunc.master.comm_wq);</div><div class='add'>+	destroy_workqueue(priv-&gt;mfunc.master.comm_wq);</div><div class='add'>+err_slaves:</div><div class='add'>+	while (--i) {</div><div class='add'>+		for (port = 1; port &lt;= MLX4_MAX_PORTS; port++)</div><div class='add'>+			kfree(priv-&gt;mfunc.master.slave_state[i].vlan_filter[port]);</div><div class='add'>+	}</div><div class='add'>+	kfree(priv-&gt;mfunc.master.slave_state);</div><div class='add'>+err_comm:</div><div class='add'>+	iounmap(priv-&gt;mfunc.comm);</div><div class='add'>+err_vhcr:</div><div class='add'>+	dma_free_coherent(&amp;(dev-&gt;pdev-&gt;dev), PAGE_SIZE,</div><div class='add'>+					     priv-&gt;mfunc.vhcr,</div><div class='add'>+					     priv-&gt;mfunc.vhcr_dma);</div><div class='add'>+	priv-&gt;mfunc.vhcr = NULL;</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mlx4_cmd_init(struct mlx4_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='hunk'>@@ -331,22 +1570,51 @@ int mlx4_cmd_init(struct mlx4_dev *dev)</div><div class='ctx'> 	priv-&gt;cmd.use_events = 0;</div><div class='ctx'> 	priv-&gt;cmd.toggle     = 1;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;cmd.hcr = ioremap(pci_resource_start(dev-&gt;pdev, 0) + MLX4_HCR_BASE,</div><div class='del'>-				MLX4_HCR_SIZE);</div><div class='del'>-	if (!priv-&gt;cmd.hcr) {</div><div class='del'>-		mlx4_err(dev, "Couldn't map command register.");</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	priv-&gt;cmd.hcr = NULL;</div><div class='add'>+	priv-&gt;mfunc.vhcr = NULL;</div><div class='add'>+</div><div class='add'>+	if (!mlx4_is_slave(dev)) {</div><div class='add'>+		priv-&gt;cmd.hcr = ioremap(pci_resource_start(dev-&gt;pdev, 0) +</div><div class='add'>+					MLX4_HCR_BASE, MLX4_HCR_SIZE);</div><div class='add'>+		if (!priv-&gt;cmd.hcr) {</div><div class='add'>+			mlx4_err(dev, "Couldn't map command register.\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;cmd.pool = pci_pool_create("mlx4_cmd", dev-&gt;pdev,</div><div class='ctx'> 					 MLX4_MAILBOX_SIZE,</div><div class='ctx'> 					 MLX4_MAILBOX_SIZE, 0);</div><div class='del'>-	if (!priv-&gt;cmd.pool) {</div><div class='del'>-		iounmap(priv-&gt;cmd.hcr);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	if (!priv-&gt;cmd.pool)</div><div class='add'>+		goto err_hcr;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_hcr:</div><div class='add'>+	if (!mlx4_is_slave(dev))</div><div class='add'>+		iounmap(priv-&gt;cmd.hcr);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mlx4_multi_func_cleanup(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	int i, port;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_master(dev)) {</div><div class='add'>+		flush_workqueue(priv-&gt;mfunc.master.comm_wq);</div><div class='add'>+		destroy_workqueue(priv-&gt;mfunc.master.comm_wq);</div><div class='add'>+		for (i = 0; i &lt; dev-&gt;num_slaves; i++) {</div><div class='add'>+			for (port = 1; port &lt;= MLX4_MAX_PORTS; port++)</div><div class='add'>+				kfree(priv-&gt;mfunc.master.slave_state[i].vlan_filter[port]);</div><div class='add'>+		}</div><div class='add'>+		kfree(priv-&gt;mfunc.master.slave_state);</div><div class='add'>+		iounmap(priv-&gt;mfunc.comm);</div><div class='add'>+		dma_free_coherent(&amp;(dev-&gt;pdev-&gt;dev), PAGE_SIZE,</div><div class='add'>+						     priv-&gt;mfunc.vhcr,</div><div class='add'>+						     priv-&gt;mfunc.vhcr_dma);</div><div class='add'>+		priv-&gt;mfunc.vhcr = NULL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mlx4_cmd_cleanup(struct mlx4_dev *dev)</div><div class='hunk'>@@ -354,7 +1622,9 @@ void mlx4_cmd_cleanup(struct mlx4_dev *dev)</div><div class='ctx'> 	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	pci_pool_destroy(priv-&gt;cmd.pool);</div><div class='del'>-	iounmap(priv-&gt;cmd.hcr);</div><div class='add'>+</div><div class='add'>+	if (!mlx4_is_slave(dev))</div><div class='add'>+		iounmap(priv-&gt;cmd.hcr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -365,6 +1635,7 @@ int mlx4_cmd_use_events(struct mlx4_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='ctx'> 	int i;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;cmd.context = kmalloc(priv-&gt;cmd.max_cmds *</div><div class='ctx'> 				   sizeof (struct mlx4_cmd_context),</div><div class='hunk'>@@ -389,11 +1660,10 @@ int mlx4_cmd_use_events(struct mlx4_dev *dev)</div><div class='ctx'> 		; /* nothing */</div><div class='ctx'> 	--priv-&gt;cmd.token_mask;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;cmd.use_events = 1;</div><div class='del'>-</div><div class='ctx'> 	down(&amp;priv-&gt;cmd.poll_sem);</div><div class='add'>+	priv-&gt;cmd.use_events = 1;</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'> /*</div><div class='hunk'>@@ -433,7 +1703,8 @@ struct mlx4_cmd_mailbox *mlx4_alloc_cmd_mailbox(struct mlx4_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_alloc_cmd_mailbox);</div><div class='ctx'> </div><div class='del'>-void mlx4_free_cmd_mailbox(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox)</div><div class='add'>+void mlx4_free_cmd_mailbox(struct mlx4_dev *dev,</div><div class='add'>+			   struct mlx4_cmd_mailbox *mailbox)</div><div class='ctx'> {</div><div class='ctx'> 	if (!mailbox)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -442,3 +1713,8 @@ void mlx4_free_cmd_mailbox(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbo</div><div class='ctx'> 	kfree(mailbox);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_free_cmd_mailbox);</div><div class='add'>+</div><div class='add'>+u32 mlx4_comm_get_version(void)</div><div class='add'>+{</div><div class='add'>+	 return ((u32) CMD_CHAN_IF_REV &lt;&lt; 8) | (u32) CMD_CHAN_VER;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/cq.c b/drivers/net/ethernet/mellanox/mlx4/cq.c<br/>index 499a5168892a..475f9d6af955 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/cq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/cq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/cq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/cq.c</a></div><div class='hunk'>@@ -34,9 +34,9 @@</div><div class='ctx'>  * SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mlx4/cmd.h&gt;</div><div class='ctx'> #include &lt;linux/mlx4/cq.h&gt;</div><div class='hunk'>@@ -44,27 +44,6 @@</div><div class='ctx'> #include "mlx4.h"</div><div class='ctx'> #include "icm.h"</div><div class='ctx'> </div><div class='del'>-struct mlx4_cq_context {</div><div class='del'>-	__be32			flags;</div><div class='del'>-	u16			reserved1[3];</div><div class='del'>-	__be16			page_offset;</div><div class='del'>-	__be32			logsize_usrpage;</div><div class='del'>-	__be16			cq_period;</div><div class='del'>-	__be16			cq_max_count;</div><div class='del'>-	u8			reserved2[3];</div><div class='del'>-	u8			comp_eqn;</div><div class='del'>-	u8			log_page_size;</div><div class='del'>-	u8			reserved3[2];</div><div class='del'>-	u8			mtt_base_addr_h;</div><div class='del'>-	__be32			mtt_base_addr_l;</div><div class='del'>-	__be32			last_notified_index;</div><div class='del'>-	__be32			solicit_producer_index;</div><div class='del'>-	__be32			consumer_index;</div><div class='del'>-	__be32			producer_index;</div><div class='del'>-	u32			reserved4[2];</div><div class='del'>-	__be64			db_rec_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define MLX4_CQ_STATUS_OK		( 0 &lt;&lt; 28)</div><div class='ctx'> #define MLX4_CQ_STATUS_OVERFLOW		( 9 &lt;&lt; 28)</div><div class='ctx'> #define MLX4_CQ_STATUS_WRITE_FAIL	(10 &lt;&lt; 28)</div><div class='hunk'>@@ -81,7 +60,7 @@ void mlx4_cq_completion(struct mlx4_dev *dev, u32 cqn)</div><div class='ctx'> 	cq = radix_tree_lookup(&amp;mlx4_priv(dev)-&gt;cq_table.tree,</div><div class='ctx'> 			       cqn &amp; (dev-&gt;caps.num_cqs - 1));</div><div class='ctx'> 	if (!cq) {</div><div class='del'>-		mlx4_warn(dev, "Completion event for bogus CQ %08x\n", cqn);</div><div class='add'>+		mlx4_dbg(dev, "Completion event for bogus CQ %08x\n", cqn);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -117,23 +96,24 @@ void mlx4_cq_event(struct mlx4_dev *dev, u32 cqn, int event_type)</div><div class='ctx'> static int mlx4_SW2HW_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,</div><div class='ctx'> 			 int cq_num)</div><div class='ctx'> {</div><div class='del'>-	return mlx4_cmd(dev, mailbox-&gt;dma, cq_num, 0, MLX4_CMD_SW2HW_CQ,</div><div class='del'>-			MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+	return mlx4_cmd(dev, mailbox-&gt;dma | dev-&gt;caps.function, cq_num, 0,</div><div class='add'>+			MLX4_CMD_SW2HW_CQ, MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+			MLX4_CMD_WRAPPED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx4_MODIFY_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,</div><div class='ctx'> 			 int cq_num, u32 opmod)</div><div class='ctx'> {</div><div class='ctx'> 	return mlx4_cmd(dev, mailbox-&gt;dma, cq_num, opmod, MLX4_CMD_MODIFY_CQ,</div><div class='del'>-			MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+			MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx4_HW2SW_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,</div><div class='ctx'> 			 int cq_num)</div><div class='ctx'> {</div><div class='del'>-	return mlx4_cmd_box(dev, 0, mailbox ? mailbox-&gt;dma : 0, cq_num,</div><div class='del'>-			    mailbox ? 0 : 1, MLX4_CMD_HW2SW_CQ,</div><div class='del'>-			    MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+	return mlx4_cmd_box(dev, dev-&gt;caps.function, mailbox ? mailbox-&gt;dma : 0,</div><div class='add'>+			    cq_num, mailbox ? 0 : 1, MLX4_CMD_HW2SW_CQ,</div><div class='add'>+			    MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mlx4_cq_modify(struct mlx4_dev *dev, struct mlx4_cq *cq,</div><div class='hunk'>@@ -188,6 +168,78 @@ int mlx4_cq_resize(struct mlx4_dev *dev, struct mlx4_cq *cq,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_cq_resize);</div><div class='ctx'> </div><div class='add'>+int __mlx4_cq_alloc_icm(struct mlx4_dev *dev, int *cqn)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_cq_table *cq_table = &amp;priv-&gt;cq_table;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	*cqn = mlx4_bitmap_alloc(&amp;cq_table-&gt;bitmap);</div><div class='add'>+	if (*cqn == -1)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = mlx4_table_get(dev, &amp;cq_table-&gt;table, *cqn);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	err = mlx4_table_get(dev, &amp;cq_table-&gt;cmpt_table, *cqn);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_put;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_put:</div><div class='add'>+	mlx4_table_put(dev, &amp;cq_table-&gt;table, *cqn);</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	mlx4_bitmap_free(&amp;cq_table-&gt;bitmap, *cqn);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mlx4_cq_alloc_icm(struct mlx4_dev *dev, int *cqn)</div><div class='add'>+{</div><div class='add'>+	u64 out_param;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		err = mlx4_cmd_imm(dev, 0, &amp;out_param, RES_CQ,</div><div class='add'>+				   RES_OP_RESERVE_AND_MAP, MLX4_CMD_ALLOC_RES,</div><div class='add'>+				   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		else {</div><div class='add'>+			*cqn = get_param_l(&amp;out_param);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return __mlx4_cq_alloc_icm(dev, cqn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __mlx4_cq_free_icm(struct mlx4_dev *dev, int cqn)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_cq_table *cq_table = &amp;priv-&gt;cq_table;</div><div class='add'>+</div><div class='add'>+	mlx4_table_put(dev, &amp;cq_table-&gt;cmpt_table, cqn);</div><div class='add'>+	mlx4_table_put(dev, &amp;cq_table-&gt;table, cqn);</div><div class='add'>+	mlx4_bitmap_free(&amp;cq_table-&gt;bitmap, cqn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mlx4_cq_free_icm(struct mlx4_dev *dev, int cqn)</div><div class='add'>+{</div><div class='add'>+	u64 in_param;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		set_param_l(&amp;in_param, cqn);</div><div class='add'>+		err = mlx4_cmd(dev, in_param, RES_CQ, RES_OP_RESERVE_AND_MAP,</div><div class='add'>+			       MLX4_CMD_FREE_RES,</div><div class='add'>+			       MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);</div><div class='add'>+		if (err)</div><div class='add'>+			mlx4_warn(dev, "Failed freeing cq:%d\n", cqn);</div><div class='add'>+	} else</div><div class='add'>+		__mlx4_cq_free_icm(dev, cqn);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, struct mlx4_mtt *mtt,</div><div class='ctx'> 		  struct mlx4_uar *uar, u64 db_rec, struct mlx4_cq *cq,</div><div class='ctx'> 		  unsigned vector, int collapsed)</div><div class='hunk'>@@ -204,23 +256,15 @@ int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, struct mlx4_mtt *mtt,</div><div class='ctx'> </div><div class='ctx'> 	cq-&gt;vector = vector;</div><div class='ctx'> </div><div class='del'>-	cq-&gt;cqn = mlx4_bitmap_alloc(&amp;cq_table-&gt;bitmap);</div><div class='del'>-	if (cq-&gt;cqn == -1)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	err = mlx4_table_get(dev, &amp;cq_table-&gt;table, cq-&gt;cqn);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_out;</div><div class='del'>-</div><div class='del'>-	err = mlx4_table_get(dev, &amp;cq_table-&gt;cmpt_table, cq-&gt;cqn);</div><div class='add'>+	err = mlx4_cq_alloc_icm(dev, &amp;cq-&gt;cqn);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err_put;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;cq_table-&gt;lock);</div><div class='ctx'> 	err = radix_tree_insert(&amp;cq_table-&gt;tree, cq-&gt;cqn, cq);</div><div class='ctx'> 	spin_unlock_irq(&amp;cq_table-&gt;lock);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err_cmpt_put;</div><div class='add'>+		goto err_icm;</div><div class='ctx'> </div><div class='ctx'> 	mailbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='ctx'> 	if (IS_ERR(mailbox)) {</div><div class='hunk'>@@ -259,14 +303,8 @@ err_radix:</div><div class='ctx'> 	radix_tree_delete(&amp;cq_table-&gt;tree, cq-&gt;cqn);</div><div class='ctx'> 	spin_unlock_irq(&amp;cq_table-&gt;lock);</div><div class='ctx'> </div><div class='del'>-err_cmpt_put:</div><div class='del'>-	mlx4_table_put(dev, &amp;cq_table-&gt;cmpt_table, cq-&gt;cqn);</div><div class='del'>-</div><div class='del'>-err_put:</div><div class='del'>-	mlx4_table_put(dev, &amp;cq_table-&gt;table, cq-&gt;cqn);</div><div class='del'>-</div><div class='del'>-err_out:</div><div class='del'>-	mlx4_bitmap_free(&amp;cq_table-&gt;bitmap, cq-&gt;cqn);</div><div class='add'>+err_icm:</div><div class='add'>+	mlx4_cq_free_icm(dev, cq-&gt;cqn);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -292,8 +330,7 @@ void mlx4_cq_free(struct mlx4_dev *dev, struct mlx4_cq *cq)</div><div class='ctx'> 		complete(&amp;cq-&gt;free);</div><div class='ctx'> 	wait_for_completion(&amp;cq-&gt;free);</div><div class='ctx'> </div><div class='del'>-	mlx4_table_put(dev, &amp;cq_table-&gt;table, cq-&gt;cqn);</div><div class='del'>-	mlx4_bitmap_free(&amp;cq_table-&gt;bitmap, cq-&gt;cqn);</div><div class='add'>+	mlx4_cq_free_icm(dev, cq-&gt;cqn);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_cq_free);</div><div class='ctx'> </div><div class='hunk'>@@ -304,6 +341,8 @@ int mlx4_init_cq_table(struct mlx4_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;cq_table-&gt;lock);</div><div class='ctx'> 	INIT_RADIX_TREE(&amp;cq_table-&gt;tree, GFP_ATOMIC);</div><div class='add'>+	if (mlx4_is_slave(dev))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_bitmap_init(&amp;cq_table-&gt;bitmap, dev-&gt;caps.num_cqs,</div><div class='ctx'> 			       dev-&gt;caps.num_cqs - 1, dev-&gt;caps.reserved_cqs, 0);</div><div class='hunk'>@@ -315,6 +354,8 @@ int mlx4_init_cq_table(struct mlx4_dev *dev)</div><div class='ctx'> </div><div class='ctx'> void mlx4_cleanup_cq_table(struct mlx4_dev *dev)</div><div class='ctx'> {</div><div class='add'>+	if (mlx4_is_slave(dev))</div><div class='add'>+		return;</div><div class='ctx'> 	/* Nothing to do to clean up radix_tree */</div><div class='ctx'> 	mlx4_bitmap_cleanup(&amp;mlx4_priv(dev)-&gt;cq_table.bitmap);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/en_cq.c b/drivers/net/ethernet/mellanox/mlx4/en_cq.c<br/>index 5829e0b47e7e..00b81272e314 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_cq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/en_cq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_cq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/en_cq.c</a></div><div class='hunk'>@@ -51,10 +51,7 @@ int mlx4_en_create_cq(struct mlx4_en_priv *priv,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	cq-&gt;size = entries;</div><div class='del'>-	if (mode == RX)</div><div class='del'>-		cq-&gt;buf_size = cq-&gt;size * sizeof(struct mlx4_cqe);</div><div class='del'>-	else</div><div class='del'>-		cq-&gt;buf_size = sizeof(struct mlx4_cqe);</div><div class='add'>+	cq-&gt;buf_size = cq-&gt;size * sizeof(struct mlx4_cqe);</div><div class='ctx'> </div><div class='ctx'> 	cq-&gt;ring = ring;</div><div class='ctx'> 	cq-&gt;is_tx = mode;</div><div class='hunk'>@@ -120,7 +117,7 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq,</div><div class='ctx'> 		cq-&gt;size = priv-&gt;rx_ring[cq-&gt;ring].actual_size;</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_cq_alloc(mdev-&gt;dev, cq-&gt;size, &amp;cq-&gt;wqres.mtt, &amp;mdev-&gt;priv_uar,</div><div class='del'>-			    cq-&gt;wqres.db.dma, &amp;cq-&gt;mcq, cq-&gt;vector, cq-&gt;is_tx);</div><div class='add'>+			    cq-&gt;wqres.db.dma, &amp;cq-&gt;mcq, cq-&gt;vector, 0);</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/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c<br/>index 74e2a2a8a02b..7dbc6a230779 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/en_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/en_ethtool.c</a></div><div class='hunk'>@@ -45,13 +45,16 @@ mlx4_en_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> 	struct mlx4_en_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct mlx4_en_dev *mdev = priv-&gt;mdev;</div><div class='ctx'> </div><div class='del'>-	strncpy(drvinfo-&gt;driver, DRV_NAME, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;version, DRV_VERSION " (" DRV_RELDATE ")", 32);</div><div class='del'>-	sprintf(drvinfo-&gt;fw_version, "%d.%d.%d",</div><div class='add'>+	strlcpy(drvinfo-&gt;driver, DRV_NAME, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, DRV_VERSION " (" DRV_RELDATE ")",</div><div class='add'>+		sizeof(drvinfo-&gt;version));</div><div class='add'>+	snprintf(drvinfo-&gt;fw_version, sizeof(drvinfo-&gt;fw_version),</div><div class='add'>+		"%d.%d.%d",</div><div class='ctx'> 		(u16) (mdev-&gt;dev-&gt;caps.fw_ver &gt;&gt; 32),</div><div class='ctx'> 		(u16) ((mdev-&gt;dev-&gt;caps.fw_ver &gt;&gt; 16) &amp; 0xffff),</div><div class='ctx'> 		(u16) (mdev-&gt;dev-&gt;caps.fw_ver &amp; 0xffff));</div><div class='del'>-	strncpy(drvinfo-&gt;bus_info, pci_name(mdev-&gt;dev-&gt;pdev), 32);</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(mdev-&gt;dev-&gt;pdev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	drvinfo-&gt;n_stats = 0;</div><div class='ctx'> 	drvinfo-&gt;regdump_len = 0;</div><div class='ctx'> 	drvinfo-&gt;eedump_len = 0;</div><div class='hunk'>@@ -103,8 +106,17 @@ static void mlx4_en_get_wol(struct net_device *netdev,</div><div class='ctx'> 	struct mlx4_en_priv *priv = netdev_priv(netdev);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	u64 config = 0;</div><div class='add'>+	u64 mask;</div><div class='ctx'> </div><div class='del'>-	if (!(priv-&gt;mdev-&gt;dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_WOL)) {</div><div class='add'>+	if ((priv-&gt;port &lt; 1) || (priv-&gt;port &gt; 2)) {</div><div class='add'>+		en_err(priv, "Failed to get WoL information\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mask = (priv-&gt;port == 1) ? MLX4_DEV_CAP_FLAG_WOL_PORT1 :</div><div class='add'>+		MLX4_DEV_CAP_FLAG_WOL_PORT2;</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;mdev-&gt;dev-&gt;caps.flags &amp; mask)) {</div><div class='ctx'> 		wol-&gt;supported = 0;</div><div class='ctx'> 		wol-&gt;wolopts = 0;</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -133,8 +145,15 @@ static int mlx4_en_set_wol(struct net_device *netdev,</div><div class='ctx'> 	struct mlx4_en_priv *priv = netdev_priv(netdev);</div><div class='ctx'> 	u64 config = 0;</div><div class='ctx'> 	int err = 0;</div><div class='add'>+	u64 mask;</div><div class='add'>+</div><div class='add'>+	if ((priv-&gt;port &lt; 1) || (priv-&gt;port &gt; 2))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	mask = (priv-&gt;port == 1) ? MLX4_DEV_CAP_FLAG_WOL_PORT1 :</div><div class='add'>+		MLX4_DEV_CAP_FLAG_WOL_PORT2;</div><div class='ctx'> </div><div class='del'>-	if (!(priv-&gt;mdev-&gt;dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_WOL))</div><div class='add'>+	if (!(priv-&gt;mdev-&gt;dev-&gt;caps.flags &amp; mask))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (wol-&gt;supported &amp; ~WAKE_MAGIC)</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c<br/>index 78d776bc355c..72fa807b69ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_netdev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/en_netdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_netdev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/en_netdev.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'> #include "mlx4_en.h"</div><div class='ctx'> #include "en_port.h"</div><div class='ctx'> </div><div class='del'>-static void mlx4_en_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='add'>+static int mlx4_en_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_en_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct mlx4_en_dev *mdev = priv-&gt;mdev;</div><div class='hunk'>@@ -67,9 +67,10 @@ static void mlx4_en_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> 		en_err(priv, "failed adding vlan %d\n", vid);</div><div class='ctx'> 	mutex_unlock(&amp;mdev-&gt;state_lock);</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mlx4_en_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='add'>+static int mlx4_en_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_en_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct mlx4_en_dev *mdev = priv-&gt;mdev;</div><div class='hunk'>@@ -93,6 +94,8 @@ static void mlx4_en_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> 			en_err(priv, "Failed configuring VLAN filter\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;mdev-&gt;state_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u64 mlx4_en_mac_to_u64(u8 *addr)</div><div class='hunk'>@@ -133,7 +136,7 @@ static void mlx4_en_do_set_mac(struct work_struct *work)</div><div class='ctx'> 	if (priv-&gt;port_up) {</div><div class='ctx'> 		/* Remove old MAC and insert the new one */</div><div class='ctx'> 		err = mlx4_replace_mac(mdev-&gt;dev, priv-&gt;port,</div><div class='del'>-				       priv-&gt;base_qpn, priv-&gt;mac, 0);</div><div class='add'>+				       priv-&gt;base_qpn, priv-&gt;mac);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			en_err(priv, "Failed changing HW MAC address\n");</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -148,6 +151,7 @@ static void mlx4_en_clear_list(struct net_device *dev)</div><div class='ctx'> 	struct mlx4_en_priv *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	kfree(priv-&gt;mc_addrs);</div><div class='add'>+	priv-&gt;mc_addrs = NULL;</div><div class='ctx'> 	priv-&gt;mc_addrs_cnt = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -167,6 +171,7 @@ static void mlx4_en_cache_mclist(struct net_device *dev)</div><div class='ctx'> 	i = 0;</div><div class='ctx'> 	netdev_for_each_mc_addr(ha, dev)</div><div class='ctx'> 		memcpy(mc_addrs + i++ * ETH_ALEN, ha-&gt;addr, ETH_ALEN);</div><div class='add'>+	mlx4_en_clear_list(dev);</div><div class='ctx'> 	priv-&gt;mc_addrs = mc_addrs;</div><div class='ctx'> 	priv-&gt;mc_addrs_cnt = mc_addrs_cnt;</div><div class='ctx'> }</div><div class='hunk'>@@ -204,6 +209,16 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!netif_carrier_ok(dev)) {</div><div class='add'>+		if (!mlx4_en_QUERY_PORT(mdev, priv-&gt;port)) {</div><div class='add'>+			if (priv-&gt;port_state.link_state) {</div><div class='add'>+				priv-&gt;last_link_state = MLX4_DEV_EVENT_PORT_UP;</div><div class='add'>+				netif_carrier_on(dev);</div><div class='add'>+				en_dbg(LINK, priv, "Link Up\n");</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Promsicuous mode: disable all filters</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -599,12 +614,12 @@ int mlx4_en_start_port(struct net_device *dev)</div><div class='ctx'> 		++rx_index;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Set port mac number */</div><div class='del'>-	en_dbg(DRV, priv, "Setting mac for port %d\n", priv-&gt;port);</div><div class='del'>-	err = mlx4_register_mac(mdev-&gt;dev, priv-&gt;port,</div><div class='del'>-				priv-&gt;mac, &amp;priv-&gt;base_qpn, 0);</div><div class='add'>+	/* Set qp number */</div><div class='add'>+	en_dbg(DRV, priv, "Getting qp number for port %d\n", priv-&gt;port);</div><div class='add'>+	err = mlx4_get_eth_qp(mdev-&gt;dev, priv-&gt;port,</div><div class='add'>+				priv-&gt;mac, &amp;priv-&gt;base_qpn);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		en_err(priv, "Failed setting port mac\n");</div><div class='add'>+		en_err(priv, "Failed getting eth qp\n");</div><div class='ctx'> 		goto cq_err;</div><div class='ctx'> 	}</div><div class='ctx'> 	mdev-&gt;mac_removed[priv-&gt;port] = 0;</div><div class='hunk'>@@ -699,7 +714,7 @@ tx_err:</div><div class='ctx'> </div><div class='ctx'> 	mlx4_en_release_rss_steer(priv);</div><div class='ctx'> mac_err:</div><div class='del'>-	mlx4_unregister_mac(mdev-&gt;dev, priv-&gt;port, priv-&gt;base_qpn);</div><div class='add'>+	mlx4_put_eth_qp(mdev-&gt;dev, priv-&gt;port, priv-&gt;mac, priv-&gt;base_qpn);</div><div class='ctx'> cq_err:</div><div class='ctx'> 	while (rx_index--)</div><div class='ctx'> 		mlx4_en_deactivate_cq(priv, &amp;priv-&gt;rx_cq[rx_index]);</div><div class='hunk'>@@ -745,10 +760,6 @@ void mlx4_en_stop_port(struct net_device *dev)</div><div class='ctx'> 	/* Flush multicast filter */</div><div class='ctx'> 	mlx4_SET_MCAST_FLTR(mdev-&gt;dev, priv-&gt;port, 0, 1, MLX4_MCAST_CONFIG);</div><div class='ctx'> </div><div class='del'>-	/* Unregister Mac address for the port */</div><div class='del'>-	mlx4_unregister_mac(mdev-&gt;dev, priv-&gt;port, priv-&gt;base_qpn);</div><div class='del'>-	mdev-&gt;mac_removed[priv-&gt;port] = 1;</div><div class='del'>-</div><div class='ctx'> 	/* Free TX Rings */</div><div class='ctx'> 	for (i = 0; i &lt; priv-&gt;tx_ring_num; i++) {</div><div class='ctx'> 		mlx4_en_deactivate_tx_ring(priv, &amp;priv-&gt;tx_ring[i]);</div><div class='hunk'>@@ -762,6 +773,10 @@ void mlx4_en_stop_port(struct net_device *dev)</div><div class='ctx'> 	/* Free RSS qps */</div><div class='ctx'> 	mlx4_en_release_rss_steer(priv);</div><div class='ctx'> </div><div class='add'>+	/* Unregister Mac address for the port */</div><div class='add'>+	mlx4_put_eth_qp(mdev-&gt;dev, priv-&gt;port, priv-&gt;mac, priv-&gt;base_qpn);</div><div class='add'>+	mdev-&gt;mac_removed[priv-&gt;port] = 1;</div><div class='add'>+</div><div class='ctx'> 	/* Free RX Rings */</div><div class='ctx'> 	for (i = 0; i &lt; priv-&gt;rx_ring_num; i++) {</div><div class='ctx'> 		mlx4_en_deactivate_rx_ring(priv, &amp;priv-&gt;rx_ring[i]);</div><div class='hunk'>@@ -974,6 +989,21 @@ static int mlx4_en_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 mlx4_en_set_features(struct net_device *netdev,</div><div class='add'>+		netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_en_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (features &amp; NETIF_F_LOOPBACK)</div><div class='add'>+		priv-&gt;ctrl_flags |= cpu_to_be32(MLX4_WQE_CTRL_FORCE_LOOPBACK);</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;ctrl_flags &amp;=</div><div class='add'>+			cpu_to_be32(~MLX4_WQE_CTRL_FORCE_LOOPBACK);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops mlx4_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= mlx4_en_open,</div><div class='ctx'> 	.ndo_stop		= mlx4_en_close,</div><div class='hunk'>@@ -990,6 +1020,7 @@ static const struct net_device_ops mlx4_netdev_ops = {</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	.ndo_poll_controller	= mlx4_en_netpoll,</div><div class='ctx'> #endif</div><div class='add'>+	.ndo_set_features	= mlx4_en_set_features,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,</div><div class='hunk'>@@ -1022,6 +1053,8 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,</div><div class='ctx'> 	priv-&gt;port = port;</div><div class='ctx'> 	priv-&gt;port_up = false;</div><div class='ctx'> 	priv-&gt;flags = prof-&gt;flags;</div><div class='add'>+	priv-&gt;ctrl_flags = cpu_to_be32(MLX4_WQE_CTRL_CQ_UPDATE |</div><div class='add'>+			MLX4_WQE_CTRL_SOLICITED);</div><div class='ctx'> 	priv-&gt;tx_ring_num = prof-&gt;tx_ring_num;</div><div class='ctx'> 	priv-&gt;rx_ring_num = prof-&gt;rx_ring_num;</div><div class='ctx'> 	priv-&gt;mac_index = -1;</div><div class='hunk'>@@ -1088,6 +1121,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,</div><div class='ctx'> 	dev-&gt;features = dev-&gt;hw_features | NETIF_F_HIGHDMA |</div><div class='ctx'> 			NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX |</div><div class='ctx'> 			NETIF_F_HW_VLAN_FILTER;</div><div class='add'>+	dev-&gt;hw_features |= NETIF_F_LOOPBACK;</div><div class='ctx'> </div><div class='ctx'> 	mdev-&gt;pndev[port] = dev;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/en_port.c b/drivers/net/ethernet/mellanox/mlx4/en_port.c<br/>index 03c84cd78cde..331791467a22 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_port.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/en_port.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_port.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/en_port.c</a></div><div class='hunk'>@@ -41,13 +41,6 @@</div><div class='ctx'> #include "mlx4_en.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int mlx4_SET_MCAST_FLTR(struct mlx4_dev *dev, u8 port,</div><div class='del'>-			u64 mac, u64 clear, u8 mode)</div><div class='del'>-{</div><div class='del'>-	return mlx4_cmd(dev, (mac | (clear &lt;&lt; 63)), port, mode,</div><div class='del'>-			MLX4_CMD_SET_MCAST_FLTR, MLX4_CMD_TIME_CLASS_B);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int mlx4_SET_VLAN_FLTR(struct mlx4_dev *dev, struct mlx4_en_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_cmd_mailbox *mailbox;</div><div class='hunk'>@@ -72,76 +65,7 @@ int mlx4_SET_VLAN_FLTR(struct mlx4_dev *dev, struct mlx4_en_priv *priv)</div><div class='ctx'> 		filter-&gt;entry[i] = cpu_to_be32(entry);</div><div class='ctx'> 	}</div><div class='ctx'> 	err = mlx4_cmd(dev, mailbox-&gt;dma, priv-&gt;port, 0, MLX4_CMD_SET_VLAN_FLTR,</div><div class='del'>-		       MLX4_CMD_TIME_CLASS_B);</div><div class='del'>-	mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu,</div><div class='del'>-			  u8 pptx, u8 pfctx, u8 pprx, u8 pfcrx)</div><div class='del'>-{</div><div class='del'>-	struct mlx4_cmd_mailbox *mailbox;</div><div class='del'>-	struct mlx4_set_port_general_context *context;</div><div class='del'>-	int err;</div><div class='del'>-	u32 in_mod;</div><div class='del'>-</div><div class='del'>-	mailbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='del'>-	if (IS_ERR(mailbox))</div><div class='del'>-		return PTR_ERR(mailbox);</div><div class='del'>-	context = mailbox-&gt;buf;</div><div class='del'>-	memset(context, 0, sizeof *context);</div><div class='del'>-</div><div class='del'>-	context-&gt;flags = SET_PORT_GEN_ALL_VALID;</div><div class='del'>-	context-&gt;mtu = cpu_to_be16(mtu);</div><div class='del'>-	context-&gt;pptx = (pptx * (!pfctx)) &lt;&lt; 7;</div><div class='del'>-	context-&gt;pfctx = pfctx;</div><div class='del'>-	context-&gt;pprx = (pprx * (!pfcrx)) &lt;&lt; 7;</div><div class='del'>-	context-&gt;pfcrx = pfcrx;</div><div class='del'>-</div><div class='del'>-	in_mod = MLX4_SET_PORT_GENERAL &lt;&lt; 8 | port;</div><div class='del'>-	err = mlx4_cmd(dev, mailbox-&gt;dma, in_mod, 1, MLX4_CMD_SET_PORT,</div><div class='del'>-		       MLX4_CMD_TIME_CLASS_B);</div><div class='del'>-</div><div class='del'>-	mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,</div><div class='del'>-			   u8 promisc)</div><div class='del'>-{</div><div class='del'>-	struct mlx4_cmd_mailbox *mailbox;</div><div class='del'>-	struct mlx4_set_port_rqp_calc_context *context;</div><div class='del'>-	int err;</div><div class='del'>-	u32 in_mod;</div><div class='del'>-	u32 m_promisc = (dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_MC_STEER) ?</div><div class='del'>-						MCAST_DIRECT : MCAST_DEFAULT;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_MC_STEER  &amp;&amp;</div><div class='del'>-			dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_UC_STEER)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	mailbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='del'>-	if (IS_ERR(mailbox))</div><div class='del'>-		return PTR_ERR(mailbox);</div><div class='del'>-	context = mailbox-&gt;buf;</div><div class='del'>-	memset(context, 0, sizeof *context);</div><div class='del'>-</div><div class='del'>-	context-&gt;base_qpn = cpu_to_be32(base_qpn);</div><div class='del'>-	context-&gt;n_mac = dev-&gt;caps.log_num_macs;</div><div class='del'>-	context-&gt;promisc = cpu_to_be32(promisc &lt;&lt; SET_PORT_PROMISC_SHIFT |</div><div class='del'>-				       base_qpn);</div><div class='del'>-	context-&gt;mcast = cpu_to_be32(m_promisc &lt;&lt; SET_PORT_MC_PROMISC_SHIFT |</div><div class='del'>-				     base_qpn);</div><div class='del'>-	context-&gt;intra_no_vlan = 0;</div><div class='del'>-	context-&gt;no_vlan = MLX4_NO_VLAN_IDX;</div><div class='del'>-	context-&gt;intra_vlan_miss = 0;</div><div class='del'>-	context-&gt;vlan_miss = MLX4_VLAN_MISS_IDX;</div><div class='del'>-</div><div class='del'>-	in_mod = MLX4_SET_PORT_RQP_CALC &lt;&lt; 8 | port;</div><div class='del'>-	err = mlx4_cmd(dev, mailbox-&gt;dma, in_mod, 1, MLX4_CMD_SET_PORT,</div><div class='del'>-		       MLX4_CMD_TIME_CLASS_B);</div><div class='del'>-</div><div class='add'>+		       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_WRAPPED);</div><div class='ctx'> 	mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -159,7 +83,8 @@ int mlx4_en_QUERY_PORT(struct mlx4_en_dev *mdev, u8 port)</div><div class='ctx'> 		return PTR_ERR(mailbox);</div><div class='ctx'> 	memset(mailbox-&gt;buf, 0, sizeof(*qport_context));</div><div class='ctx'> 	err = mlx4_cmd_box(mdev-&gt;dev, 0, mailbox-&gt;dma, port, 0,</div><div class='del'>-			   MLX4_CMD_QUERY_PORT, MLX4_CMD_TIME_CLASS_B);</div><div class='add'>+			   MLX4_CMD_QUERY_PORT, MLX4_CMD_TIME_CLASS_B,</div><div class='add'>+			   MLX4_CMD_WRAPPED);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	qport_context = mailbox-&gt;buf;</div><div class='hunk'>@@ -204,7 +129,8 @@ int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset)</div><div class='ctx'> 		return PTR_ERR(mailbox);</div><div class='ctx'> 	memset(mailbox-&gt;buf, 0, sizeof(*mlx4_en_stats));</div><div class='ctx'> 	err = mlx4_cmd_box(mdev-&gt;dev, 0, mailbox-&gt;dma, in_mod, 0,</div><div class='del'>-			   MLX4_CMD_DUMP_ETH_STATS, MLX4_CMD_TIME_CLASS_B);</div><div class='add'>+			   MLX4_CMD_DUMP_ETH_STATS, MLX4_CMD_TIME_CLASS_B,</div><div class='add'>+			   MLX4_CMD_WRAPPED);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/en_port.h b/drivers/net/ethernet/mellanox/mlx4/en_port.h<br/>index 19eb244f5165..6934fd7e66ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_port.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/en_port.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_port.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/en_port.h</a></div><div class='hunk'>@@ -39,49 +39,6 @@</div><div class='ctx'> #define SET_PORT_PROMISC_SHIFT	31</div><div class='ctx'> #define SET_PORT_MC_PROMISC_SHIFT	30</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='del'>-	MLX4_CMD_SET_VLAN_FLTR  = 0x47,</div><div class='del'>-	MLX4_CMD_SET_MCAST_FLTR = 0x48,</div><div class='del'>-	MLX4_CMD_DUMP_ETH_STATS = 0x49,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	MCAST_DIRECT_ONLY       = 0,</div><div class='del'>-	MCAST_DIRECT            = 1,</div><div class='del'>-	MCAST_DEFAULT           = 2</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct mlx4_set_port_general_context {</div><div class='del'>-	u8 reserved[3];</div><div class='del'>-	u8 flags;</div><div class='del'>-	u16 reserved2;</div><div class='del'>-	__be16 mtu;</div><div class='del'>-	u8 pptx;</div><div class='del'>-	u8 pfctx;</div><div class='del'>-	u16 reserved3;</div><div class='del'>-	u8 pprx;</div><div class='del'>-	u8 pfcrx;</div><div class='del'>-	u16 reserved4;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct mlx4_set_port_rqp_calc_context {</div><div class='del'>-	__be32 base_qpn;</div><div class='del'>-	u8 rererved;</div><div class='del'>-	u8 n_mac;</div><div class='del'>-	u8 n_vlan;</div><div class='del'>-	u8 n_prio;</div><div class='del'>-	u8 reserved2[3];</div><div class='del'>-	u8 mac_miss;</div><div class='del'>-	u8 intra_no_vlan;</div><div class='del'>-	u8 no_vlan;</div><div class='del'>-	u8 intra_vlan_miss;</div><div class='del'>-	u8 vlan_miss;</div><div class='del'>-	u8 reserved3[3];</div><div class='del'>-	u8 no_vlan_prio;</div><div class='del'>-	__be32 promisc;</div><div class='del'>-	__be32 mcast;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define VLAN_FLTR_SIZE	128</div><div class='ctx'> struct mlx4_set_vlan_fltr_mbox {</div><div class='ctx'> 	__be32 entry[VLAN_FLTR_SIZE];</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/en_resources.c b/drivers/net/ethernet/mellanox/mlx4/en_resources.c<br/>index 0dfb4ec8a9dd..bcbc54c16947 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_resources.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/en_resources.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_resources.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/en_resources.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@ void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride,</div><div class='ctx'> 	struct mlx4_en_dev *mdev = priv-&gt;mdev;</div><div class='ctx'> </div><div class='ctx'> 	memset(context, 0, sizeof *context);</div><div class='del'>-	context-&gt;flags = cpu_to_be32(7 &lt;&lt; 16 | rss &lt;&lt; 13);</div><div class='add'>+	context-&gt;flags = cpu_to_be32(7 &lt;&lt; 16 | rss &lt;&lt; MLX4_RSS_QPC_FLAG_OFFSET);</div><div class='ctx'> 	context-&gt;pd = cpu_to_be32(mdev-&gt;priv_pdn);</div><div class='ctx'> 	context-&gt;mtu_msgmax = 0xff;</div><div class='ctx'> 	if (!is_tx &amp;&amp; !rss)</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c<br/>index c2df6c358603..e8d6ad2dce0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_rx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/en_rx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/en_rx.c</a></div><div class='hunk'>@@ -541,6 +541,8 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud</div><div class='ctx'> 	unsigned int length;</div><div class='ctx'> 	int polled = 0;</div><div class='ctx'> 	int ip_summed;</div><div class='add'>+	struct ethhdr *ethh;</div><div class='add'>+	u64 s_mac;</div><div class='ctx'> </div><div class='ctx'> 	if (!priv-&gt;port_up)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -577,6 +579,19 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* Get pointer to first fragment since we haven't skb yet and</div><div class='add'>+		 * cast it to ethhdr struct */</div><div class='add'>+		ethh = (struct ethhdr *)(page_address(skb_frags[0].page) +</div><div class='add'>+					 skb_frags[0].offset);</div><div class='add'>+		s_mac = mlx4_en_mac_to_u64(ethh-&gt;h_source);</div><div class='add'>+</div><div class='add'>+		/* If source MAC is equal to our own MAC and not performing</div><div class='add'>+		 * the selftest or flb disabled - drop the packet */</div><div class='add'>+		if (s_mac == priv-&gt;mac &amp;&amp;</div><div class='add'>+			(!(dev-&gt;features &amp; NETIF_F_LOOPBACK) ||</div><div class='add'>+			 !priv-&gt;validate_loopback))</div><div class='add'>+			goto next;</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Packet is OK - process it.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -837,9 +852,10 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)</div><div class='ctx'> 	struct mlx4_en_dev *mdev = priv-&gt;mdev;</div><div class='ctx'> 	struct mlx4_en_rss_map *rss_map = &amp;priv-&gt;rss_map;</div><div class='ctx'> 	struct mlx4_qp_context context;</div><div class='del'>-	struct mlx4_en_rss_context *rss_context;</div><div class='add'>+	struct mlx4_rss_context *rss_context;</div><div class='ctx'> 	void *ptr;</div><div class='del'>-	u8 rss_mask = 0x3f;</div><div class='add'>+	u8 rss_mask = (MLX4_RSS_IPV4 | MLX4_RSS_TCP_IPV4 | MLX4_RSS_IPV6 |</div><div class='add'>+			MLX4_RSS_TCP_IPV6);</div><div class='ctx'> 	int i, qpn;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int good_qps = 0;</div><div class='hunk'>@@ -877,18 +893,21 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)</div><div class='ctx'> 	mlx4_en_fill_qp_context(priv, 0, 0, 0, 1, priv-&gt;base_qpn,</div><div class='ctx'> 				priv-&gt;rx_ring[0].cqn, &amp;context);</div><div class='ctx'> </div><div class='del'>-	ptr = ((void *) &amp;context) + 0x3c;</div><div class='add'>+	ptr = ((void *) &amp;context) + offsetof(struct mlx4_qp_context, pri_path)</div><div class='add'>+					+ MLX4_RSS_OFFSET_IN_QPC_PRI_PATH;</div><div class='ctx'> 	rss_context = ptr;</div><div class='ctx'> 	rss_context-&gt;base_qpn = cpu_to_be32(ilog2(priv-&gt;rx_ring_num) &lt;&lt; 24 |</div><div class='ctx'> 					    (rss_map-&gt;base_qpn));</div><div class='ctx'> 	rss_context-&gt;default_qpn = cpu_to_be32(rss_map-&gt;base_qpn);</div><div class='add'>+	if (priv-&gt;mdev-&gt;profile.udp_rss) {</div><div class='add'>+		rss_mask |=  MLX4_RSS_UDP_IPV4 | MLX4_RSS_UDP_IPV6;</div><div class='add'>+		rss_context-&gt;base_qpn_udp = rss_context-&gt;default_qpn;</div><div class='add'>+	}</div><div class='ctx'> 	rss_context-&gt;flags = rss_mask;</div><div class='del'>-	rss_context-&gt;hash_fn = 1;</div><div class='add'>+	rss_context-&gt;hash_fn = MLX4_RSS_HASH_TOP;</div><div class='ctx'> 	for (i = 0; i &lt; 10; i++)</div><div class='ctx'> 		rss_context-&gt;rss_key[i] = rsskey[i];</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;mdev-&gt;profile.udp_rss)</div><div class='del'>-		rss_context-&gt;base_qpn_udp = rss_context-&gt;default_qpn;</div><div class='ctx'> 	err = mlx4_qp_to_ready(mdev-&gt;dev, &amp;priv-&gt;res.mtt, &amp;context,</div><div class='ctx'> 			       &amp;rss_map-&gt;indir_qp, &amp;rss_map-&gt;indir_state);</div><div class='ctx'> 	if (err)</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/en_selftest.c b/drivers/net/ethernet/mellanox/mlx4/en_selftest.c<br/>index 9fdbcecd499d..bf2e5d3f177c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_selftest.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/en_selftest.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_selftest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/en_selftest.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'> static int mlx4_en_test_registers(struct mlx4_en_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	return mlx4_cmd(priv-&gt;mdev-&gt;dev, 0, 0, 0, MLX4_CMD_HW_HEALTH_CHECK,</div><div class='del'>-			MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+			MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx4_en_test_loopback_xmit(struct mlx4_en_priv *priv)</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 d901b4267537..9ef9038d0629 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_tx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/en_tx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/en_tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/en_tx.c</a></div><div class='hunk'>@@ -307,59 +307,60 @@ int mlx4_en_free_tx_buf(struct net_device *dev, struct mlx4_en_tx_ring *ring)</div><div class='ctx'> 	return cnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static void mlx4_en_process_tx_cq(struct net_device *dev, struct mlx4_en_cq *cq)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_en_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct mlx4_cq *mcq = &amp;cq-&gt;mcq;</div><div class='ctx'> 	struct mlx4_en_tx_ring *ring = &amp;priv-&gt;tx_ring[cq-&gt;ring];</div><div class='del'>-	struct mlx4_cqe *cqe = cq-&gt;buf;</div><div class='add'>+	struct mlx4_cqe *cqe;</div><div class='ctx'> 	u16 index;</div><div class='del'>-	u16 new_index;</div><div class='add'>+	u16 new_index, ring_index;</div><div class='ctx'> 	u32 txbbs_skipped = 0;</div><div class='del'>-	u32 cq_last_sav;</div><div class='del'>-</div><div class='del'>-	/* index always points to the first TXBB of the last polled descriptor */</div><div class='del'>-	index = ring-&gt;cons &amp; ring-&gt;size_mask;</div><div class='del'>-	new_index = be16_to_cpu(cqe-&gt;wqe_index) &amp; ring-&gt;size_mask;</div><div class='del'>-	if (index == new_index)</div><div class='del'>-		return;</div><div class='add'>+	u32 cons_index = mcq-&gt;cons_index;</div><div class='add'>+	int size = cq-&gt;size;</div><div class='add'>+	u32 size_mask = ring-&gt;size_mask;</div><div class='add'>+	struct mlx4_cqe *buf = cq-&gt;buf;</div><div class='ctx'> </div><div class='ctx'> 	if (!priv-&gt;port_up)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We use a two-stage loop:</div><div class='del'>-	 * - the first samples the HW-updated CQE</div><div class='del'>-	 * - the second frees TXBBs until the last sample</div><div class='del'>-	 * This lets us amortize CQE cache misses, while still polling the CQ</div><div class='del'>-	 * until is quiescent.</div><div class='del'>-	 */</div><div class='del'>-	cq_last_sav = mcq-&gt;cons_index;</div><div class='del'>-	do {</div><div class='add'>+	index = cons_index &amp; size_mask;</div><div class='add'>+	cqe = &amp;buf[index];</div><div class='add'>+	ring_index = ring-&gt;cons &amp; size_mask;</div><div class='add'>+</div><div class='add'>+	/* Process all completed CQEs */</div><div class='add'>+	while (XNOR(cqe-&gt;owner_sr_opcode &amp; MLX4_CQE_OWNER_MASK,</div><div class='add'>+			cons_index &amp; size)) {</div><div class='add'>+		/*</div><div class='add'>+		 * make sure we read the CQE after we read the</div><div class='add'>+		 * ownership bit</div><div class='add'>+		 */</div><div class='add'>+		rmb();</div><div class='add'>+</div><div class='add'>+		/* Skip over last polled CQE */</div><div class='add'>+		new_index = be16_to_cpu(cqe-&gt;wqe_index) &amp; size_mask;</div><div class='add'>+</div><div class='ctx'> 		do {</div><div class='del'>-			/* Skip over last polled CQE */</div><div class='del'>-			index = (index + ring-&gt;last_nr_txbb) &amp; ring-&gt;size_mask;</div><div class='ctx'> 			txbbs_skipped += ring-&gt;last_nr_txbb;</div><div class='del'>-</div><div class='del'>-			/* Poll next CQE */</div><div class='add'>+			ring_index = (ring_index + ring-&gt;last_nr_txbb) &amp; size_mask;</div><div class='add'>+			/* free next descriptor */</div><div class='ctx'> 			ring-&gt;last_nr_txbb = mlx4_en_free_tx_desc(</div><div class='del'>-						priv, ring, index,</div><div class='del'>-						!!((ring-&gt;cons + txbbs_skipped) &amp;</div><div class='del'>-						   ring-&gt;size));</div><div class='del'>-			++mcq-&gt;cons_index;</div><div class='del'>-</div><div class='del'>-		} while (index != new_index);</div><div class='add'>+					priv, ring, ring_index,</div><div class='add'>+					!!((ring-&gt;cons + txbbs_skipped) &amp;</div><div class='add'>+							ring-&gt;size));</div><div class='add'>+		} while (ring_index != new_index);</div><div class='add'>+</div><div class='add'>+		++cons_index;</div><div class='add'>+		index = cons_index &amp; size_mask;</div><div class='add'>+		cqe = &amp;buf[index];</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		new_index = be16_to_cpu(cqe-&gt;wqe_index) &amp; ring-&gt;size_mask;</div><div class='del'>-	} while (index != new_index);</div><div class='del'>-	AVG_PERF_COUNTER(priv-&gt;pstats.tx_coal_avg,</div><div class='del'>-			 (u32) (mcq-&gt;cons_index - cq_last_sav));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * To prevent CQ overflow we first update CQ consumer and only then</div><div class='ctx'> 	 * the ring consumer.</div><div class='ctx'> 	 */</div><div class='add'>+	mcq-&gt;cons_index = cons_index;</div><div class='ctx'> 	mlx4_cq_set_ci(mcq);</div><div class='ctx'> 	wmb();</div><div class='ctx'> 	ring-&gt;cons += txbbs_skipped;</div><div class='hunk'>@@ -565,7 +566,8 @@ static void build_inline_wqe(struct mlx4_en_tx_desc *tx_desc, struct sk_buff *sk</div><div class='ctx'> 		inl-&gt;byte_count = cpu_to_be32(1 &lt;&lt; 31 | (skb-&gt;len - spc));</div><div class='ctx'> 	}</div><div class='ctx'> 	tx_desc-&gt;ctrl.vlan_tag = cpu_to_be16(*vlan_tag);</div><div class='del'>-	tx_desc-&gt;ctrl.ins_vlan = MLX4_WQE_CTRL_INS_VLAN * !!(*vlan_tag);</div><div class='add'>+	tx_desc-&gt;ctrl.ins_vlan = MLX4_WQE_CTRL_INS_VLAN *</div><div class='add'>+		(!!vlan_tx_tag_present(skb));</div><div class='ctx'> 	tx_desc-&gt;ctrl.fence_size = (real_size / 16) &amp; 0x3f;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -676,27 +678,25 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	/* Prepare ctrl segement apart opcode+ownership, which depends on</div><div class='ctx'> 	 * whether LSO is used */</div><div class='ctx'> 	tx_desc-&gt;ctrl.vlan_tag = cpu_to_be16(vlan_tag);</div><div class='del'>-	tx_desc-&gt;ctrl.ins_vlan = MLX4_WQE_CTRL_INS_VLAN * !!vlan_tag;</div><div class='add'>+	tx_desc-&gt;ctrl.ins_vlan = MLX4_WQE_CTRL_INS_VLAN *</div><div class='add'>+		!!vlan_tx_tag_present(skb);</div><div class='ctx'> 	tx_desc-&gt;ctrl.fence_size = (real_size / 16) &amp; 0x3f;</div><div class='del'>-	tx_desc-&gt;ctrl.srcrb_flags = cpu_to_be32(MLX4_WQE_CTRL_CQ_UPDATE |</div><div class='del'>-						MLX4_WQE_CTRL_SOLICITED);</div><div class='add'>+	tx_desc-&gt;ctrl.srcrb_flags = priv-&gt;ctrl_flags;</div><div class='ctx'> 	if (likely(skb-&gt;ip_summed == CHECKSUM_PARTIAL)) {</div><div class='ctx'> 		tx_desc-&gt;ctrl.srcrb_flags |= cpu_to_be32(MLX4_WQE_CTRL_IP_CSUM |</div><div class='ctx'> 							 MLX4_WQE_CTRL_TCP_UDP_CSUM);</div><div class='ctx'> 		ring-&gt;tx_csum++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(priv-&gt;validate_loopback)) {</div><div class='del'>-		/* Copy dst mac address to wqe */</div><div class='del'>-		skb_reset_mac_header(skb);</div><div class='del'>-		ethh = eth_hdr(skb);</div><div class='del'>-		if (ethh &amp;&amp; ethh-&gt;h_dest) {</div><div class='del'>-			mac = mlx4_en_mac_to_u64(ethh-&gt;h_dest);</div><div class='del'>-			mac_h = (u32) ((mac &amp; 0xffff00000000ULL) &gt;&gt; 16);</div><div class='del'>-			mac_l = (u32) (mac &amp; 0xffffffff);</div><div class='del'>-			tx_desc-&gt;ctrl.srcrb_flags |= cpu_to_be32(mac_h);</div><div class='del'>-			tx_desc-&gt;ctrl.imm = cpu_to_be32(mac_l);</div><div class='del'>-		}</div><div class='add'>+	/* Copy dst mac address to wqe */</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	ethh = eth_hdr(skb);</div><div class='add'>+	if (ethh &amp;&amp; ethh-&gt;h_dest) {</div><div class='add'>+		mac = mlx4_en_mac_to_u64(ethh-&gt;h_dest);</div><div class='add'>+		mac_h = (u32) ((mac &amp; 0xffff00000000ULL) &gt;&gt; 16);</div><div class='add'>+		mac_l = (u32) (mac &amp; 0xffffffff);</div><div class='add'>+		tx_desc-&gt;ctrl.srcrb_flags |= cpu_to_be32(mac_h);</div><div class='add'>+		tx_desc-&gt;ctrl.imm = cpu_to_be32(mac_l);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Handle LSO (TSO) packets */</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c<br/>index 24ee96775996..1e9b55eb7217 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/eq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/eq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/eq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/eq.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'>  * SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.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='hunk'>@@ -52,30 +53,6 @@ enum {</div><div class='ctx'> 	MLX4_EQ_ENTRY_SIZE	= 0x20</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Must be packed because start is 64 bits but only aligned to 32 bits.</div><div class='del'>- */</div><div class='del'>-struct mlx4_eq_context {</div><div class='del'>-	__be32			flags;</div><div class='del'>-	u16			reserved1[3];</div><div class='del'>-	__be16			page_offset;</div><div class='del'>-	u8			log_eq_size;</div><div class='del'>-	u8			reserved2[4];</div><div class='del'>-	u8			eq_period;</div><div class='del'>-	u8			reserved3;</div><div class='del'>-	u8			eq_max_count;</div><div class='del'>-	u8			reserved4[3];</div><div class='del'>-	u8			intr;</div><div class='del'>-	u8			log_page_size;</div><div class='del'>-	u8			reserved5[2];</div><div class='del'>-	u8			mtt_base_addr_h;</div><div class='del'>-	__be32			mtt_base_addr_l;</div><div class='del'>-	u32			reserved6[2];</div><div class='del'>-	__be32			consumer_index;</div><div class='del'>-	__be32			producer_index;</div><div class='del'>-	u32			reserved7[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define MLX4_EQ_STATUS_OK	   ( 0 &lt;&lt; 28)</div><div class='ctx'> #define MLX4_EQ_STATUS_WRITE_FAIL  (10 &lt;&lt; 28)</div><div class='ctx'> #define MLX4_EQ_OWNER_SW	   ( 0 &lt;&lt; 24)</div><div class='hunk'>@@ -100,46 +77,9 @@ struct mlx4_eq_context {</div><div class='ctx'> 			       (1ull &lt;&lt; MLX4_EVENT_TYPE_SRQ_CATAS_ERROR)    | \</div><div class='ctx'> 			       (1ull &lt;&lt; MLX4_EVENT_TYPE_SRQ_QP_LAST_WQE)    | \</div><div class='ctx'> 			       (1ull &lt;&lt; MLX4_EVENT_TYPE_SRQ_LIMIT)	    | \</div><div class='del'>-			       (1ull &lt;&lt; MLX4_EVENT_TYPE_CMD))</div><div class='del'>-</div><div class='del'>-struct mlx4_eqe {</div><div class='del'>-	u8			reserved1;</div><div class='del'>-	u8			type;</div><div class='del'>-	u8			reserved2;</div><div class='del'>-	u8			subtype;</div><div class='del'>-	union {</div><div class='del'>-		u32		raw[6];</div><div class='del'>-		struct {</div><div class='del'>-			__be32	cqn;</div><div class='del'>-		} __packed comp;</div><div class='del'>-		struct {</div><div class='del'>-			u16	reserved1;</div><div class='del'>-			__be16	token;</div><div class='del'>-			u32	reserved2;</div><div class='del'>-			u8	reserved3[3];</div><div class='del'>-			u8	status;</div><div class='del'>-			__be64	out_param;</div><div class='del'>-		} __packed cmd;</div><div class='del'>-		struct {</div><div class='del'>-			__be32	qpn;</div><div class='del'>-		} __packed qp;</div><div class='del'>-		struct {</div><div class='del'>-			__be32	srqn;</div><div class='del'>-		} __packed srq;</div><div class='del'>-		struct {</div><div class='del'>-			__be32	cqn;</div><div class='del'>-			u32	reserved1;</div><div class='del'>-			u8	reserved2[3];</div><div class='del'>-			u8	syndrome;</div><div class='del'>-		} __packed cq_err;</div><div class='del'>-		struct {</div><div class='del'>-			u32	reserved1[2];</div><div class='del'>-			__be32	port;</div><div class='del'>-		} __packed port_change;</div><div class='del'>-	}			event;</div><div class='del'>-	u8			reserved3[3];</div><div class='del'>-	u8			owner;</div><div class='del'>-} __packed;</div><div class='add'>+			       (1ull &lt;&lt; MLX4_EVENT_TYPE_CMD)		    | \</div><div class='add'>+			       (1ull &lt;&lt; MLX4_EVENT_TYPE_COMM_CHANNEL)       | \</div><div class='add'>+			       (1ull &lt;&lt; MLX4_EVENT_TYPE_FLR_EVENT))</div><div class='ctx'> </div><div class='ctx'> static void eq_set_ci(struct mlx4_eq *eq, int req_not)</div><div class='ctx'> {</div><div class='hunk'>@@ -162,13 +102,144 @@ static struct mlx4_eqe *next_eqe_sw(struct mlx4_eq *eq)</div><div class='ctx'> 	return !!(eqe-&gt;owner &amp; 0x80) ^ !!(eq-&gt;cons_index &amp; eq-&gt;nent) ? NULL : eqe;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct mlx4_eqe *next_slave_event_eqe(struct mlx4_slave_event_eq *slave_eq)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_eqe *eqe =</div><div class='add'>+		&amp;slave_eq-&gt;event_eqe[slave_eq-&gt;cons &amp; (SLAVE_EVENT_EQ_SIZE - 1)];</div><div class='add'>+	return (!!(eqe-&gt;owner &amp; 0x80) ^</div><div class='add'>+		!!(slave_eq-&gt;cons &amp; SLAVE_EVENT_EQ_SIZE)) ?</div><div class='add'>+		eqe : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mlx4_gen_slave_eqe(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_mfunc_master_ctx *master =</div><div class='add'>+		container_of(work, struct mlx4_mfunc_master_ctx,</div><div class='add'>+			     slave_event_work);</div><div class='add'>+	struct mlx4_mfunc *mfunc =</div><div class='add'>+		container_of(master, struct mlx4_mfunc, master);</div><div class='add'>+	struct mlx4_priv *priv = container_of(mfunc, struct mlx4_priv, mfunc);</div><div class='add'>+	struct mlx4_dev *dev = &amp;priv-&gt;dev;</div><div class='add'>+	struct mlx4_slave_event_eq *slave_eq = &amp;mfunc-&gt;master.slave_eq;</div><div class='add'>+	struct mlx4_eqe *eqe;</div><div class='add'>+	u8 slave;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (eqe = next_slave_event_eqe(slave_eq); eqe;</div><div class='add'>+	      eqe = next_slave_event_eqe(slave_eq)) {</div><div class='add'>+		slave = eqe-&gt;slave_id;</div><div class='add'>+</div><div class='add'>+		/* All active slaves need to receive the event */</div><div class='add'>+		if (slave == ALL_SLAVES) {</div><div class='add'>+			for (i = 0; i &lt; dev-&gt;num_slaves; i++) {</div><div class='add'>+				if (i != dev-&gt;caps.function &amp;&amp;</div><div class='add'>+				    master-&gt;slave_state[i].active)</div><div class='add'>+					if (mlx4_GEN_EQE(dev, i, eqe))</div><div class='add'>+						mlx4_warn(dev, "Failed to "</div><div class='add'>+							  " generate event "</div><div class='add'>+							  "for slave %d\n", i);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (mlx4_GEN_EQE(dev, slave, eqe))</div><div class='add'>+				mlx4_warn(dev, "Failed to generate event "</div><div class='add'>+					       "for slave %d\n", slave);</div><div class='add'>+		}</div><div class='add'>+		++slave_eq-&gt;cons;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void slave_event(struct mlx4_dev *dev, u8 slave, struct mlx4_eqe *eqe)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_slave_event_eq *slave_eq = &amp;priv-&gt;mfunc.master.slave_eq;</div><div class='add'>+	struct mlx4_eqe *s_eqe =</div><div class='add'>+		&amp;slave_eq-&gt;event_eqe[slave_eq-&gt;prod &amp; (SLAVE_EVENT_EQ_SIZE - 1)];</div><div class='add'>+</div><div class='add'>+	if ((!!(s_eqe-&gt;owner &amp; 0x80)) ^</div><div class='add'>+	    (!!(slave_eq-&gt;prod &amp; SLAVE_EVENT_EQ_SIZE))) {</div><div class='add'>+		mlx4_warn(dev, "Master failed to generate an EQE for slave: %d. "</div><div class='add'>+			  "No free EQE on slave events queue\n", slave);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(s_eqe, eqe, sizeof(struct mlx4_eqe) - 1);</div><div class='add'>+	s_eqe-&gt;slave_id = slave;</div><div class='add'>+	/* ensure all information is written before setting the ownersip bit */</div><div class='add'>+	wmb();</div><div class='add'>+	s_eqe-&gt;owner = !!(slave_eq-&gt;prod &amp; SLAVE_EVENT_EQ_SIZE) ? 0x0 : 0x80;</div><div class='add'>+	++slave_eq-&gt;prod;</div><div class='add'>+</div><div class='add'>+	queue_work(priv-&gt;mfunc.master.comm_wq,</div><div class='add'>+		   &amp;priv-&gt;mfunc.master.slave_event_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mlx4_slave_event(struct mlx4_dev *dev, int slave,</div><div class='add'>+			     struct mlx4_eqe *eqe)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_slave_state *s_slave =</div><div class='add'>+		&amp;priv-&gt;mfunc.master.slave_state[slave];</div><div class='add'>+</div><div class='add'>+	if (!s_slave-&gt;active) {</div><div class='add'>+		/*mlx4_warn(dev, "Trying to pass event to inactive slave\n");*/</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	slave_event(dev, slave, eqe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mlx4_master_handle_slave_flr(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_mfunc_master_ctx *master =</div><div class='add'>+		container_of(work, struct mlx4_mfunc_master_ctx,</div><div class='add'>+			     slave_flr_event_work);</div><div class='add'>+	struct mlx4_mfunc *mfunc =</div><div class='add'>+		container_of(master, struct mlx4_mfunc, master);</div><div class='add'>+	struct mlx4_priv *priv =</div><div class='add'>+		container_of(mfunc, struct mlx4_priv, mfunc);</div><div class='add'>+	struct mlx4_dev *dev = &amp;priv-&gt;dev;</div><div class='add'>+	struct mlx4_slave_state *slave_state = priv-&gt;mfunc.master.slave_state;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mlx4_dbg(dev, "mlx4_handle_slave_flr\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0 ; i &lt; dev-&gt;num_slaves; i++) {</div><div class='add'>+</div><div class='add'>+		if (MLX4_COMM_CMD_FLR == slave_state[i].last_cmd) {</div><div class='add'>+			mlx4_dbg(dev, "mlx4_handle_slave_flr: "</div><div class='add'>+				 "clean slave: %d\n", i);</div><div class='add'>+</div><div class='add'>+			mlx4_delete_all_resources_for_slave(dev, i);</div><div class='add'>+			/*return the slave to running mode*/</div><div class='add'>+			spin_lock(&amp;priv-&gt;mfunc.master.slave_state_lock);</div><div class='add'>+			slave_state[i].last_cmd = MLX4_COMM_CMD_RESET;</div><div class='add'>+			slave_state[i].is_slave_going_down = 0;</div><div class='add'>+			spin_unlock(&amp;priv-&gt;mfunc.master.slave_state_lock);</div><div class='add'>+			/*notify the FW:*/</div><div class='add'>+			err = mlx4_cmd(dev, 0, i, 0, MLX4_CMD_INFORM_FLR_DONE,</div><div class='add'>+				       MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);</div><div class='add'>+			if (err)</div><div class='add'>+				mlx4_warn(dev, "Failed to notify FW on "</div><div class='add'>+					  "FLR done (slave:%d)\n", i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)</div><div class='ctx'> {</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='ctx'> 	struct mlx4_eqe *eqe;</div><div class='ctx'> 	int cqn;</div><div class='ctx'> 	int eqes_found = 0;</div><div class='ctx'> 	int set_ci = 0;</div><div class='ctx'> 	int port;</div><div class='add'>+	int slave = 0;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 flr_slave;</div><div class='add'>+	u8 update_slave_state;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	while ((eqe = next_eqe_sw(eq))) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -191,14 +262,68 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)</div><div class='ctx'> 		case MLX4_EVENT_TYPE_PATH_MIG_FAILED:</div><div class='ctx'> 		case MLX4_EVENT_TYPE_WQ_INVAL_REQ_ERROR:</div><div class='ctx'> 		case MLX4_EVENT_TYPE_WQ_ACCESS_ERROR:</div><div class='del'>-			mlx4_qp_event(dev, be32_to_cpu(eqe-&gt;event.qp.qpn) &amp; 0xffffff,</div><div class='del'>-				      eqe-&gt;type);</div><div class='add'>+			mlx4_dbg(dev, "event %d arrived\n", eqe-&gt;type);</div><div class='add'>+			if (mlx4_is_master(dev)) {</div><div class='add'>+				/* forward only to slave owning the QP */</div><div class='add'>+				ret = mlx4_get_slave_from_resource_id(dev,</div><div class='add'>+						RES_QP,</div><div class='add'>+						be32_to_cpu(eqe-&gt;event.qp.qpn)</div><div class='add'>+						&amp; 0xffffff, &amp;slave);</div><div class='add'>+				if (ret &amp;&amp; ret != -ENOENT) {</div><div class='add'>+					mlx4_dbg(dev, "QP event %02x(%02x) on "</div><div class='add'>+						 "EQ %d at index %u: could "</div><div class='add'>+						 "not get slave id (%d)\n",</div><div class='add'>+						 eqe-&gt;type, eqe-&gt;subtype,</div><div class='add'>+						 eq-&gt;eqn, eq-&gt;cons_index, ret);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (!ret &amp;&amp; slave != dev-&gt;caps.function) {</div><div class='add'>+					mlx4_slave_event(dev, slave, eqe);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+			}</div><div class='add'>+			mlx4_qp_event(dev, be32_to_cpu(eqe-&gt;event.qp.qpn) &amp;</div><div class='add'>+				      0xffffff, eqe-&gt;type);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case MLX4_EVENT_TYPE_SRQ_LIMIT:</div><div class='add'>+			mlx4_warn(dev, "%s: MLX4_EVENT_TYPE_SRQ_LIMIT\n",</div><div class='add'>+				  __func__);</div><div class='ctx'> 		case MLX4_EVENT_TYPE_SRQ_CATAS_ERROR:</div><div class='del'>-			mlx4_srq_event(dev, be32_to_cpu(eqe-&gt;event.srq.srqn) &amp; 0xffffff,</div><div class='del'>-				      eqe-&gt;type);</div><div class='add'>+			if (mlx4_is_master(dev)) {</div><div class='add'>+				/* forward only to slave owning the SRQ */</div><div class='add'>+				ret = mlx4_get_slave_from_resource_id(dev,</div><div class='add'>+						RES_SRQ,</div><div class='add'>+						be32_to_cpu(eqe-&gt;event.srq.srqn)</div><div class='add'>+						&amp; 0xffffff,</div><div class='add'>+						&amp;slave);</div><div class='add'>+				if (ret &amp;&amp; ret != -ENOENT) {</div><div class='add'>+					mlx4_warn(dev, "SRQ event %02x(%02x) "</div><div class='add'>+						  "on EQ %d at index %u: could"</div><div class='add'>+						  " not get slave id (%d)\n",</div><div class='add'>+						  eqe-&gt;type, eqe-&gt;subtype,</div><div class='add'>+						  eq-&gt;eqn, eq-&gt;cons_index, ret);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				mlx4_warn(dev, "%s: slave:%d, srq_no:0x%x,"</div><div class='add'>+					  " event: %02x(%02x)\n", __func__,</div><div class='add'>+					  slave,</div><div class='add'>+					  be32_to_cpu(eqe-&gt;event.srq.srqn),</div><div class='add'>+					  eqe-&gt;type, eqe-&gt;subtype);</div><div class='add'>+</div><div class='add'>+				if (!ret &amp;&amp; slave != dev-&gt;caps.function) {</div><div class='add'>+					mlx4_warn(dev, "%s: sending event "</div><div class='add'>+						  "%02x(%02x) to slave:%d\n",</div><div class='add'>+						   __func__, eqe-&gt;type,</div><div class='add'>+						  eqe-&gt;subtype, slave);</div><div class='add'>+					mlx4_slave_event(dev, slave, eqe);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			mlx4_srq_event(dev, be32_to_cpu(eqe-&gt;event.srq.srqn) &amp;</div><div class='add'>+				       0xffffff, eqe-&gt;type);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case MLX4_EVENT_TYPE_CMD:</div><div class='hunk'>@@ -211,13 +336,35 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)</div><div class='ctx'> 		case MLX4_EVENT_TYPE_PORT_CHANGE:</div><div class='ctx'> 			port = be32_to_cpu(eqe-&gt;event.port_change.port) &gt;&gt; 28;</div><div class='ctx'> 			if (eqe-&gt;subtype == MLX4_PORT_CHANGE_SUBTYPE_DOWN) {</div><div class='del'>-				mlx4_dispatch_event(dev, MLX4_DEV_EVENT_PORT_DOWN,</div><div class='add'>+				mlx4_dispatch_event(dev,</div><div class='add'>+						    MLX4_DEV_EVENT_PORT_DOWN,</div><div class='ctx'> 						    port);</div><div class='ctx'> 				mlx4_priv(dev)-&gt;sense.do_sense_port[port] = 1;</div><div class='add'>+				if (mlx4_is_master(dev))</div><div class='add'>+					/*change the state of all slave's port</div><div class='add'>+					* to down:*/</div><div class='add'>+					for (i = 0; i &lt; dev-&gt;num_slaves; i++) {</div><div class='add'>+						mlx4_dbg(dev, "%s: Sending "</div><div class='add'>+							 "MLX4_PORT_CHANGE_SUBTYPE_DOWN"</div><div class='add'>+							 " to slave: %d, port:%d\n",</div><div class='add'>+							 __func__, i, port);</div><div class='add'>+						if (i == dev-&gt;caps.function)</div><div class='add'>+							continue;</div><div class='add'>+						mlx4_slave_event(dev, i, eqe);</div><div class='add'>+					}</div><div class='ctx'> 			} else {</div><div class='del'>-				mlx4_dispatch_event(dev, MLX4_DEV_EVENT_PORT_UP,</div><div class='add'>+				mlx4_dispatch_event(dev,</div><div class='add'>+						    MLX4_DEV_EVENT_PORT_UP,</div><div class='ctx'> 						    port);</div><div class='ctx'> 				mlx4_priv(dev)-&gt;sense.do_sense_port[port] = 0;</div><div class='add'>+</div><div class='add'>+				if (mlx4_is_master(dev)) {</div><div class='add'>+					for (i = 0; i &lt; dev-&gt;num_slaves; i++) {</div><div class='add'>+						if (i == dev-&gt;caps.function)</div><div class='add'>+							continue;</div><div class='add'>+						mlx4_slave_event(dev, i, eqe);</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -226,7 +373,28 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)</div><div class='ctx'> 				  eqe-&gt;event.cq_err.syndrome == 1 ?</div><div class='ctx'> 				  "overrun" : "access violation",</div><div class='ctx'> 				  be32_to_cpu(eqe-&gt;event.cq_err.cqn) &amp; 0xffffff);</div><div class='del'>-			mlx4_cq_event(dev, be32_to_cpu(eqe-&gt;event.cq_err.cqn),</div><div class='add'>+			if (mlx4_is_master(dev)) {</div><div class='add'>+				ret = mlx4_get_slave_from_resource_id(dev,</div><div class='add'>+					RES_CQ,</div><div class='add'>+					be32_to_cpu(eqe-&gt;event.cq_err.cqn)</div><div class='add'>+					&amp; 0xffffff, &amp;slave);</div><div class='add'>+				if (ret &amp;&amp; ret != -ENOENT) {</div><div class='add'>+					mlx4_dbg(dev, "CQ event %02x(%02x) on "</div><div class='add'>+						 "EQ %d at index %u: could "</div><div class='add'>+						  "not get slave id (%d)\n",</div><div class='add'>+						  eqe-&gt;type, eqe-&gt;subtype,</div><div class='add'>+						  eq-&gt;eqn, eq-&gt;cons_index, ret);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (!ret &amp;&amp; slave != dev-&gt;caps.function) {</div><div class='add'>+					mlx4_slave_event(dev, slave, eqe);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			mlx4_cq_event(dev,</div><div class='add'>+				      be32_to_cpu(eqe-&gt;event.cq_err.cqn)</div><div class='add'>+				      &amp; 0xffffff,</div><div class='ctx'> 				      eqe-&gt;type);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -234,13 +402,60 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)</div><div class='ctx'> 			mlx4_warn(dev, "EQ overrun on EQN %d\n", eq-&gt;eqn);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		case MLX4_EVENT_TYPE_COMM_CHANNEL:</div><div class='add'>+			if (!mlx4_is_master(dev)) {</div><div class='add'>+				mlx4_warn(dev, "Received comm channel event "</div><div class='add'>+					       "for non master device\n");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			memcpy(&amp;priv-&gt;mfunc.master.comm_arm_bit_vector,</div><div class='add'>+			       eqe-&gt;event.comm_channel_arm.bit_vec,</div><div class='add'>+			       sizeof eqe-&gt;event.comm_channel_arm.bit_vec);</div><div class='add'>+			queue_work(priv-&gt;mfunc.master.comm_wq,</div><div class='add'>+				   &amp;priv-&gt;mfunc.master.comm_work);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case MLX4_EVENT_TYPE_FLR_EVENT:</div><div class='add'>+			flr_slave = be32_to_cpu(eqe-&gt;event.flr_event.slave_id);</div><div class='add'>+			if (!mlx4_is_master(dev)) {</div><div class='add'>+				mlx4_warn(dev, "Non-master function received"</div><div class='add'>+					       "FLR event\n");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			mlx4_dbg(dev, "FLR event for slave: %d\n", flr_slave);</div><div class='add'>+</div><div class='add'>+			if (flr_slave &gt; dev-&gt;num_slaves) {</div><div class='add'>+				mlx4_warn(dev,</div><div class='add'>+					  "Got FLR for unknown function: %d\n",</div><div class='add'>+					  flr_slave);</div><div class='add'>+				update_slave_state = 0;</div><div class='add'>+			} else</div><div class='add'>+				update_slave_state = 1;</div><div class='add'>+</div><div class='add'>+			spin_lock(&amp;priv-&gt;mfunc.master.slave_state_lock);</div><div class='add'>+			if (update_slave_state) {</div><div class='add'>+				priv-&gt;mfunc.master.slave_state[flr_slave].active = false;</div><div class='add'>+				priv-&gt;mfunc.master.slave_state[flr_slave].last_cmd = MLX4_COMM_CMD_FLR;</div><div class='add'>+				priv-&gt;mfunc.master.slave_state[flr_slave].is_slave_going_down = 1;</div><div class='add'>+			}</div><div class='add'>+			spin_unlock(&amp;priv-&gt;mfunc.master.slave_state_lock);</div><div class='add'>+			queue_work(priv-&gt;mfunc.master.comm_wq,</div><div class='add'>+				   &amp;priv-&gt;mfunc.master.slave_flr_event_work);</div><div class='add'>+			break;</div><div class='ctx'> 		case MLX4_EVENT_TYPE_EEC_CATAS_ERROR:</div><div class='ctx'> 		case MLX4_EVENT_TYPE_ECC_DETECT:</div><div class='ctx'> 		default:</div><div class='del'>-			mlx4_warn(dev, "Unhandled event %02x(%02x) on EQ %d at index %u\n",</div><div class='del'>-				  eqe-&gt;type, eqe-&gt;subtype, eq-&gt;eqn, eq-&gt;cons_index);</div><div class='add'>+			mlx4_warn(dev, "Unhandled event %02x(%02x) on EQ %d at "</div><div class='add'>+				  "index %u. owner=%x, nent=0x%x, slave=%x, "</div><div class='add'>+				  "ownership=%s\n",</div><div class='add'>+				  eqe-&gt;type, eqe-&gt;subtype, eq-&gt;eqn,</div><div class='add'>+				  eq-&gt;cons_index, eqe-&gt;owner, eq-&gt;nent,</div><div class='add'>+				  eqe-&gt;slave_id,</div><div class='add'>+				  !!(eqe-&gt;owner &amp; 0x80) ^</div><div class='add'>+				  !!(eq-&gt;cons_index &amp; eq-&gt;nent) ? "HW" : "SW");</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='add'>+		};</div><div class='ctx'> </div><div class='ctx'> 		++eq-&gt;cons_index;</div><div class='ctx'> 		eqes_found = 1;</div><div class='hunk'>@@ -290,25 +505,58 @@ static irqreturn_t mlx4_msi_x_interrupt(int irq, void *eq_ptr)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mlx4_MAP_EQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			struct mlx4_vhcr *vhcr,</div><div class='add'>+			struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_slave_event_eq_info *event_eq =</div><div class='add'>+		&amp;priv-&gt;mfunc.master.slave_state[slave].event_eq;</div><div class='add'>+	u32 in_modifier = vhcr-&gt;in_modifier;</div><div class='add'>+	u32 eqn = in_modifier &amp; 0x1FF;</div><div class='add'>+	u64 in_param =  vhcr-&gt;in_param;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (slave == dev-&gt;caps.function)</div><div class='add'>+		err = mlx4_cmd(dev, in_param, (in_modifier &amp; 0x80000000) | eqn,</div><div class='add'>+			       0, MLX4_CMD_MAP_EQ, MLX4_CMD_TIME_CLASS_B,</div><div class='add'>+			       MLX4_CMD_NATIVE);</div><div class='add'>+	if (!err) {</div><div class='add'>+		if (in_modifier &gt;&gt; 31) {</div><div class='add'>+			/* unmap */</div><div class='add'>+			event_eq-&gt;event_type &amp;= ~in_param;</div><div class='add'>+		} else {</div><div class='add'>+			event_eq-&gt;eqn = eqn;</div><div class='add'>+			event_eq-&gt;event_type = in_param;</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 mlx4_MAP_EQ(struct mlx4_dev *dev, u64 event_mask, int unmap,</div><div class='ctx'> 			int eq_num)</div><div class='ctx'> {</div><div class='ctx'> 	return mlx4_cmd(dev, event_mask, (unmap &lt;&lt; 31) | eq_num,</div><div class='del'>-			0, MLX4_CMD_MAP_EQ, MLX4_CMD_TIME_CLASS_B);</div><div class='add'>+			0, MLX4_CMD_MAP_EQ, MLX4_CMD_TIME_CLASS_B,</div><div class='add'>+			MLX4_CMD_WRAPPED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx4_SW2HW_EQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,</div><div class='ctx'> 			 int eq_num)</div><div class='ctx'> {</div><div class='del'>-	return mlx4_cmd(dev, mailbox-&gt;dma, eq_num, 0, MLX4_CMD_SW2HW_EQ,</div><div class='del'>-			MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+	return mlx4_cmd(dev, mailbox-&gt;dma | dev-&gt;caps.function, eq_num, 0,</div><div class='add'>+			MLX4_CMD_SW2HW_EQ, MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+			MLX4_CMD_WRAPPED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx4_HW2SW_EQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,</div><div class='ctx'> 			 int eq_num)</div><div class='ctx'> {</div><div class='del'>-	return mlx4_cmd_box(dev, 0, mailbox-&gt;dma, eq_num, 0, MLX4_CMD_HW2SW_EQ,</div><div class='del'>-			    MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+	return mlx4_cmd_box(dev, dev-&gt;caps.function, mailbox-&gt;dma, eq_num,</div><div class='add'>+			    0, MLX4_CMD_HW2SW_EQ, MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+			    MLX4_CMD_WRAPPED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx4_num_eq_uar(struct mlx4_dev *dev)</div><div class='hunk'>@@ -585,14 +833,16 @@ int mlx4_init_eq_table(struct mlx4_dev *dev)</div><div class='ctx'> 	for (i = 0; i &lt; mlx4_num_eq_uar(dev); ++i)</div><div class='ctx'> 		priv-&gt;eq_table.uar_map[i] = NULL;</div><div class='ctx'> </div><div class='del'>-	err = mlx4_map_clr_int(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_out_bitmap;</div><div class='add'>+	if (!mlx4_is_slave(dev)) {</div><div class='add'>+		err = mlx4_map_clr_int(dev);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_out_bitmap;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;eq_table.clr_mask =</div><div class='del'>-		swab32(1 &lt;&lt; (priv-&gt;eq_table.inta_pin &amp; 31));</div><div class='del'>-	priv-&gt;eq_table.clr_int  = priv-&gt;clr_base +</div><div class='del'>-		(priv-&gt;eq_table.inta_pin &lt; 32 ? 4 : 0);</div><div class='add'>+		priv-&gt;eq_table.clr_mask =</div><div class='add'>+			swab32(1 &lt;&lt; (priv-&gt;eq_table.inta_pin &amp; 31));</div><div class='add'>+		priv-&gt;eq_table.clr_int  = priv-&gt;clr_base +</div><div class='add'>+			(priv-&gt;eq_table.inta_pin &lt; 32 ? 4 : 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;eq_table.irq_names =</div><div class='ctx'> 		kmalloc(MLX4_IRQNAME_SIZE * (dev-&gt;caps.num_comp_vectors + 1 +</div><div class='hunk'>@@ -700,7 +950,8 @@ err_out_unmap:</div><div class='ctx'> 		mlx4_free_eq(dev, &amp;priv-&gt;eq_table.eq[i]);</div><div class='ctx'> 		--i;</div><div class='ctx'> 	}</div><div class='del'>-	mlx4_unmap_clr_int(dev);</div><div class='add'>+	if (!mlx4_is_slave(dev))</div><div class='add'>+		mlx4_unmap_clr_int(dev);</div><div class='ctx'> 	mlx4_free_irqs(dev);</div><div class='ctx'> </div><div class='ctx'> err_out_bitmap:</div><div class='hunk'>@@ -725,7 +976,8 @@ void mlx4_cleanup_eq_table(struct mlx4_dev *dev)</div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;caps.num_comp_vectors + dev-&gt;caps.comp_pool + 1; ++i)</div><div class='ctx'> 		mlx4_free_eq(dev, &amp;priv-&gt;eq_table.eq[i]);</div><div class='ctx'> </div><div class='del'>-	mlx4_unmap_clr_int(dev);</div><div class='add'>+	if (!mlx4_is_slave(dev))</div><div class='add'>+		mlx4_unmap_clr_int(dev);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; mlx4_num_eq_uar(dev); ++i)</div><div class='ctx'> 		if (priv-&gt;eq_table.uar_map[i])</div><div class='hunk'>@@ -748,7 +1000,7 @@ int mlx4_test_interrupts(struct mlx4_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_NOP(dev);</div><div class='ctx'> 	/* When not in MSI_X, there is only one irq to check */</div><div class='del'>-	if (!(dev-&gt;flags &amp; MLX4_FLAG_MSI_X))</div><div class='add'>+	if (!(dev-&gt;flags &amp; MLX4_FLAG_MSI_X) || mlx4_is_slave(dev))</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* A loop over all completion vectors, for each vector we will check</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c<br/>index 435ca6e49734..a424a19280cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/fw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/fw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/fw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/fw.c</a></div><div class='hunk'>@@ -32,6 +32,7 @@</div><div class='ctx'>  * SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/mlx4/cmd.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='hunk'>@@ -48,7 +49,7 @@ enum {</div><div class='ctx'> extern void __buggy_use_of_MLX4_GET(void);</div><div class='ctx'> extern void __buggy_use_of_MLX4_PUT(void);</div><div class='ctx'> </div><div class='del'>-static int enable_qos;</div><div class='add'>+static bool enable_qos;</div><div class='ctx'> module_param(enable_qos, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable_qos, "Enable Quality of Service support in the HCA (default: off)");</div><div class='ctx'> </div><div class='hunk'>@@ -139,12 +140,185 @@ int mlx4_MOD_STAT_CFG(struct mlx4_dev *dev, struct mlx4_mod_stat_cfg *cfg)</div><div class='ctx'> 	MLX4_PUT(inbox, cfg-&gt;log_pg_sz_m, MOD_STAT_CFG_PG_SZ_M_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_cmd(dev, mailbox-&gt;dma, 0, 0, MLX4_CMD_MOD_STAT_CFG,</div><div class='del'>-			MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+			MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);</div><div class='ctx'> </div><div class='ctx'> 	mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+				struct mlx4_vhcr *vhcr,</div><div class='add'>+				struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+				struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+				struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	u8	field;</div><div class='add'>+	u32	size;</div><div class='add'>+	int	err = 0;</div><div class='add'>+</div><div class='add'>+#define QUERY_FUNC_CAP_FLAGS_OFFSET		0x0</div><div class='add'>+#define QUERY_FUNC_CAP_NUM_PORTS_OFFSET		0x1</div><div class='add'>+#define QUERY_FUNC_CAP_FUNCTION_OFFSET		0x3</div><div class='add'>+#define QUERY_FUNC_CAP_PF_BHVR_OFFSET		0x4</div><div class='add'>+#define QUERY_FUNC_CAP_QP_QUOTA_OFFSET		0x10</div><div class='add'>+#define QUERY_FUNC_CAP_CQ_QUOTA_OFFSET		0x14</div><div class='add'>+#define QUERY_FUNC_CAP_SRQ_QUOTA_OFFSET		0x18</div><div class='add'>+#define QUERY_FUNC_CAP_MPT_QUOTA_OFFSET		0x20</div><div class='add'>+#define QUERY_FUNC_CAP_MTT_QUOTA_OFFSET		0x24</div><div class='add'>+#define QUERY_FUNC_CAP_MCG_QUOTA_OFFSET		0x28</div><div class='add'>+#define QUERY_FUNC_CAP_MAX_EQ_OFFSET		0x2c</div><div class='add'>+#define QUERY_FUNC_CAP_RESERVED_EQ_OFFSET	0X30</div><div class='add'>+</div><div class='add'>+#define QUERY_FUNC_CAP_PHYS_PORT_OFFSET		0x3</div><div class='add'>+#define QUERY_FUNC_CAP_ETH_PROPS_OFFSET		0xc</div><div class='add'>+</div><div class='add'>+	if (vhcr-&gt;op_modifier == 1) {</div><div class='add'>+		field = vhcr-&gt;in_modifier;</div><div class='add'>+		MLX4_PUT(outbox-&gt;buf, field, QUERY_FUNC_CAP_PHYS_PORT_OFFSET);</div><div class='add'>+</div><div class='add'>+		field = 0; /* ensure fvl bit is not set */</div><div class='add'>+		MLX4_PUT(outbox-&gt;buf, field, QUERY_FUNC_CAP_ETH_PROPS_OFFSET);</div><div class='add'>+	} else if (vhcr-&gt;op_modifier == 0) {</div><div class='add'>+		field = 1 &lt;&lt; 7; /* enable only ethernet interface */</div><div class='add'>+		MLX4_PUT(outbox-&gt;buf, field, QUERY_FUNC_CAP_FLAGS_OFFSET);</div><div class='add'>+</div><div class='add'>+		field = slave;</div><div class='add'>+		MLX4_PUT(outbox-&gt;buf, field, QUERY_FUNC_CAP_FUNCTION_OFFSET);</div><div class='add'>+</div><div class='add'>+		field = dev-&gt;caps.num_ports;</div><div class='add'>+		MLX4_PUT(outbox-&gt;buf, field, QUERY_FUNC_CAP_NUM_PORTS_OFFSET);</div><div class='add'>+</div><div class='add'>+		size = 0; /* no PF behavious is set for now */</div><div class='add'>+		MLX4_PUT(outbox-&gt;buf, size, QUERY_FUNC_CAP_PF_BHVR_OFFSET);</div><div class='add'>+</div><div class='add'>+		size = dev-&gt;caps.num_qps;</div><div class='add'>+		MLX4_PUT(outbox-&gt;buf, size, QUERY_FUNC_CAP_QP_QUOTA_OFFSET);</div><div class='add'>+</div><div class='add'>+		size = dev-&gt;caps.num_srqs;</div><div class='add'>+		MLX4_PUT(outbox-&gt;buf, size, QUERY_FUNC_CAP_SRQ_QUOTA_OFFSET);</div><div class='add'>+</div><div class='add'>+		size = dev-&gt;caps.num_cqs;</div><div class='add'>+		MLX4_PUT(outbox-&gt;buf, size, QUERY_FUNC_CAP_CQ_QUOTA_OFFSET);</div><div class='add'>+</div><div class='add'>+		size = dev-&gt;caps.num_eqs;</div><div class='add'>+		MLX4_PUT(outbox-&gt;buf, size, QUERY_FUNC_CAP_MAX_EQ_OFFSET);</div><div class='add'>+</div><div class='add'>+		size = dev-&gt;caps.reserved_eqs;</div><div class='add'>+		MLX4_PUT(outbox-&gt;buf, size, QUERY_FUNC_CAP_RESERVED_EQ_OFFSET);</div><div class='add'>+</div><div class='add'>+		size = dev-&gt;caps.num_mpts;</div><div class='add'>+		MLX4_PUT(outbox-&gt;buf, size, QUERY_FUNC_CAP_MPT_QUOTA_OFFSET);</div><div class='add'>+</div><div class='add'>+		size = dev-&gt;caps.num_mtts;</div><div class='add'>+		MLX4_PUT(outbox-&gt;buf, size, QUERY_FUNC_CAP_MTT_QUOTA_OFFSET);</div><div class='add'>+</div><div class='add'>+		size = dev-&gt;caps.num_mgms + dev-&gt;caps.num_amgms;</div><div class='add'>+		MLX4_PUT(outbox-&gt;buf, size, QUERY_FUNC_CAP_MCG_QUOTA_OFFSET);</div><div class='add'>+</div><div class='add'>+	} else</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, struct mlx4_func_cap *func_cap)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_cmd_mailbox *mailbox;</div><div class='add'>+	u32			*outbox;</div><div class='add'>+	u8			field;</div><div class='add'>+	u32			size;</div><div class='add'>+	int			i;</div><div class='add'>+	int			err = 0;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	mailbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='add'>+	if (IS_ERR(mailbox))</div><div class='add'>+		return PTR_ERR(mailbox);</div><div class='add'>+</div><div class='add'>+	err = mlx4_cmd_box(dev, 0, mailbox-&gt;dma, 0, 0, MLX4_CMD_QUERY_FUNC_CAP,</div><div class='add'>+			   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	outbox = mailbox-&gt;buf;</div><div class='add'>+</div><div class='add'>+	MLX4_GET(field, outbox, QUERY_FUNC_CAP_FLAGS_OFFSET);</div><div class='add'>+	if (!(field &amp; (1 &lt;&lt; 7))) {</div><div class='add'>+		mlx4_err(dev, "The host doesn't support eth interface\n");</div><div class='add'>+		err = -EPROTONOSUPPORT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	MLX4_GET(field, outbox, QUERY_FUNC_CAP_FUNCTION_OFFSET);</div><div class='add'>+	func_cap-&gt;function = field;</div><div class='add'>+</div><div class='add'>+	MLX4_GET(field, outbox, QUERY_FUNC_CAP_NUM_PORTS_OFFSET);</div><div class='add'>+	func_cap-&gt;num_ports = field;</div><div class='add'>+</div><div class='add'>+	MLX4_GET(size, outbox, QUERY_FUNC_CAP_PF_BHVR_OFFSET);</div><div class='add'>+	func_cap-&gt;pf_context_behaviour = size;</div><div class='add'>+</div><div class='add'>+	MLX4_GET(size, outbox, QUERY_FUNC_CAP_QP_QUOTA_OFFSET);</div><div class='add'>+	func_cap-&gt;qp_quota = size &amp; 0xFFFFFF;</div><div class='add'>+</div><div class='add'>+	MLX4_GET(size, outbox, QUERY_FUNC_CAP_SRQ_QUOTA_OFFSET);</div><div class='add'>+	func_cap-&gt;srq_quota = size &amp; 0xFFFFFF;</div><div class='add'>+</div><div class='add'>+	MLX4_GET(size, outbox, QUERY_FUNC_CAP_CQ_QUOTA_OFFSET);</div><div class='add'>+	func_cap-&gt;cq_quota = size &amp; 0xFFFFFF;</div><div class='add'>+</div><div class='add'>+	MLX4_GET(size, outbox, QUERY_FUNC_CAP_MAX_EQ_OFFSET);</div><div class='add'>+	func_cap-&gt;max_eq = size &amp; 0xFFFFFF;</div><div class='add'>+</div><div class='add'>+	MLX4_GET(size, outbox, QUERY_FUNC_CAP_RESERVED_EQ_OFFSET);</div><div class='add'>+	func_cap-&gt;reserved_eq = size &amp; 0xFFFFFF;</div><div class='add'>+</div><div class='add'>+	MLX4_GET(size, outbox, QUERY_FUNC_CAP_MPT_QUOTA_OFFSET);</div><div class='add'>+	func_cap-&gt;mpt_quota = size &amp; 0xFFFFFF;</div><div class='add'>+</div><div class='add'>+	MLX4_GET(size, outbox, QUERY_FUNC_CAP_MTT_QUOTA_OFFSET);</div><div class='add'>+	func_cap-&gt;mtt_quota = size &amp; 0xFFFFFF;</div><div class='add'>+</div><div class='add'>+	MLX4_GET(size, outbox, QUERY_FUNC_CAP_MCG_QUOTA_OFFSET);</div><div class='add'>+	func_cap-&gt;mcg_quota = size &amp; 0xFFFFFF;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt;= func_cap-&gt;num_ports; ++i) {</div><div class='add'>+		err = mlx4_cmd_box(dev, 0, mailbox-&gt;dma, i, 1,</div><div class='add'>+				   MLX4_CMD_QUERY_FUNC_CAP,</div><div class='add'>+				   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		MLX4_GET(field, outbox, QUERY_FUNC_CAP_ETH_PROPS_OFFSET);</div><div class='add'>+		if (field &amp; (1 &lt;&lt; 7)) {</div><div class='add'>+			mlx4_err(dev, "VLAN is enforced on this port\n");</div><div class='add'>+			err = -EPROTONOSUPPORT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (field &amp; (1 &lt;&lt; 6)) {</div><div class='add'>+			mlx4_err(dev, "Force mac is enabled on this port\n");</div><div class='add'>+			err = -EPROTONOSUPPORT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		MLX4_GET(field, outbox, QUERY_FUNC_CAP_PHYS_PORT_OFFSET);</div><div class='add'>+		func_cap-&gt;physical_port[i] = field;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* All other resources are allocated by the master, but we still report</div><div class='add'>+	 * 'num' and 'reserved' capabilities as follows:</div><div class='add'>+	 * - num remains the maximum resource index</div><div class='add'>+	 * - 'num - reserved' is the total available objects of a resource, but</div><div class='add'>+	 *   resource indices may be less than 'reserved'</div><div class='add'>+	 * TODO: set per-resource quotas */</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_cmd_mailbox *mailbox;</div><div class='hunk'>@@ -229,7 +403,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)</div><div class='ctx'> 	outbox = mailbox-&gt;buf;</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_cmd_box(dev, 0, mailbox-&gt;dma, 0, 0, MLX4_CMD_QUERY_DEV_CAP,</div><div class='del'>-			   MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+			   MLX4_CMD_TIME_CLASS_A, !mlx4_is_slave(dev));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -396,12 +570,15 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)</div><div class='ctx'> </div><div class='ctx'> 		for (i = 1; i &lt;= dev_cap-&gt;num_ports; ++i) {</div><div class='ctx'> 			err = mlx4_cmd_box(dev, 0, mailbox-&gt;dma, i, 0, MLX4_CMD_QUERY_PORT,</div><div class='del'>-					   MLX4_CMD_TIME_CLASS_B);</div><div class='add'>+					   MLX4_CMD_TIME_CLASS_B,</div><div class='add'>+					   !mlx4_is_slave(dev));</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='ctx'> 			MLX4_GET(field, outbox, QUERY_PORT_SUPPORTED_TYPE_OFFSET);</div><div class='ctx'> 			dev_cap-&gt;supported_port_types[i] = field &amp; 3;</div><div class='add'>+			dev_cap-&gt;suggested_type[i] = (field &gt;&gt; 3) &amp; 1;</div><div class='add'>+			dev_cap-&gt;default_sense[i] = (field &gt;&gt; 4) &amp; 1;</div><div class='ctx'> 			MLX4_GET(field, outbox, QUERY_PORT_MTU_OFFSET);</div><div class='ctx'> 			dev_cap-&gt;ib_mtu[i]	   = field &amp; 0xf;</div><div class='ctx'> 			MLX4_GET(field, outbox, QUERY_PORT_WIDTH_OFFSET);</div><div class='hunk'>@@ -470,6 +647,61 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mlx4_QUERY_PORT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			    struct mlx4_vhcr *vhcr,</div><div class='add'>+			    struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			    struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			    struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	u64 def_mac;</div><div class='add'>+	u8 port_type;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+#define MLX4_PORT_SUPPORT_IB		(1 &lt;&lt; 0)</div><div class='add'>+#define MLX4_PORT_SUGGEST_TYPE		(1 &lt;&lt; 3)</div><div class='add'>+#define MLX4_PORT_DEFAULT_SENSE		(1 &lt;&lt; 4)</div><div class='add'>+#define MLX4_VF_PORT_ETH_ONLY_MASK	(0xff &amp; ~MLX4_PORT_SUPPORT_IB &amp; \</div><div class='add'>+					 ~MLX4_PORT_SUGGEST_TYPE &amp; \</div><div class='add'>+					 ~MLX4_PORT_DEFAULT_SENSE)</div><div class='add'>+</div><div class='add'>+	err = mlx4_cmd_box(dev, 0, outbox-&gt;dma, vhcr-&gt;in_modifier, 0,</div><div class='add'>+			   MLX4_CMD_QUERY_PORT, MLX4_CMD_TIME_CLASS_B,</div><div class='add'>+			   MLX4_CMD_NATIVE);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; dev-&gt;caps.function != slave) {</div><div class='add'>+		/* set slave default_mac address */</div><div class='add'>+		MLX4_GET(def_mac, outbox-&gt;buf, QUERY_PORT_MAC_OFFSET);</div><div class='add'>+		def_mac += slave &lt;&lt; 8;</div><div class='add'>+		MLX4_PUT(outbox-&gt;buf, def_mac, QUERY_PORT_MAC_OFFSET);</div><div class='add'>+</div><div class='add'>+		/* get port type - currently only eth is enabled */</div><div class='add'>+		MLX4_GET(port_type, outbox-&gt;buf,</div><div class='add'>+			 QUERY_PORT_SUPPORTED_TYPE_OFFSET);</div><div class='add'>+</div><div class='add'>+		/* Allow only Eth port, no link sensing allowed */</div><div class='add'>+		port_type &amp;= MLX4_VF_PORT_ETH_ONLY_MASK;</div><div class='add'>+</div><div class='add'>+		/* check eth is enabled for this port */</div><div class='add'>+		if (!(port_type &amp; 2))</div><div class='add'>+			mlx4_dbg(dev, "QUERY PORT: eth not supported by host");</div><div class='add'>+</div><div class='add'>+		MLX4_PUT(outbox-&gt;buf, port_type,</div><div class='add'>+			 QUERY_PORT_SUPPORTED_TYPE_OFFSET);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mlx4_QUERY_PORT(struct mlx4_dev *dev, void *ptr, u8 port)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_cmd_mailbox *outbox = ptr;</div><div class='add'>+</div><div class='add'>+	return mlx4_cmd_box(dev, 0, outbox-&gt;dma, port, 0,</div><div class='add'>+			    MLX4_CMD_QUERY_PORT, MLX4_CMD_TIME_CLASS_B,</div><div class='add'>+			    MLX4_CMD_WRAPPED);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mlx4_QUERY_PORT);</div><div class='add'>+</div><div class='ctx'> int mlx4_map_cmd(struct mlx4_dev *dev, u16 op, struct mlx4_icm *icm, u64 virt)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_cmd_mailbox *mailbox;</div><div class='hunk'>@@ -519,7 +751,8 @@ int mlx4_map_cmd(struct mlx4_dev *dev, u16 op, struct mlx4_icm *icm, u64 virt)</div><div class='ctx'> </div><div class='ctx'> 			if (++nent == MLX4_MAILBOX_SIZE / 16) {</div><div class='ctx'> 				err = mlx4_cmd(dev, mailbox-&gt;dma, nent, 0, op,</div><div class='del'>-						MLX4_CMD_TIME_CLASS_B);</div><div class='add'>+						MLX4_CMD_TIME_CLASS_B,</div><div class='add'>+						MLX4_CMD_NATIVE);</div><div class='ctx'> 				if (err)</div><div class='ctx'> 					goto out;</div><div class='ctx'> 				nent = 0;</div><div class='hunk'>@@ -528,7 +761,8 @@ int mlx4_map_cmd(struct mlx4_dev *dev, u16 op, struct mlx4_icm *icm, u64 virt)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (nent)</div><div class='del'>-		err = mlx4_cmd(dev, mailbox-&gt;dma, nent, 0, op, MLX4_CMD_TIME_CLASS_B);</div><div class='add'>+		err = mlx4_cmd(dev, mailbox-&gt;dma, nent, 0, op,</div><div class='add'>+			       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -557,13 +791,15 @@ int mlx4_MAP_FA(struct mlx4_dev *dev, struct mlx4_icm *icm)</div><div class='ctx'> </div><div class='ctx'> int mlx4_UNMAP_FA(struct mlx4_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	return mlx4_cmd(dev, 0, 0, 0, MLX4_CMD_UNMAP_FA, MLX4_CMD_TIME_CLASS_B);</div><div class='add'>+	return mlx4_cmd(dev, 0, 0, 0, MLX4_CMD_UNMAP_FA,</div><div class='add'>+			MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> int mlx4_RUN_FW(struct mlx4_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	return mlx4_cmd(dev, 0, 0, 0, MLX4_CMD_RUN_FW, MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+	return mlx4_cmd(dev, 0, 0, 0, MLX4_CMD_RUN_FW,</div><div class='add'>+			MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mlx4_QUERY_FW(struct mlx4_dev *dev)</div><div class='hunk'>@@ -579,6 +815,7 @@ int mlx4_QUERY_FW(struct mlx4_dev *dev)</div><div class='ctx'> </div><div class='ctx'> #define QUERY_FW_OUT_SIZE             0x100</div><div class='ctx'> #define QUERY_FW_VER_OFFSET            0x00</div><div class='add'>+#define QUERY_FW_PPF_ID		       0x09</div><div class='ctx'> #define QUERY_FW_CMD_IF_REV_OFFSET     0x0a</div><div class='ctx'> #define QUERY_FW_MAX_CMD_OFFSET        0x0f</div><div class='ctx'> #define QUERY_FW_ERR_START_OFFSET      0x30</div><div class='hunk'>@@ -589,13 +826,16 @@ int mlx4_QUERY_FW(struct mlx4_dev *dev)</div><div class='ctx'> #define QUERY_FW_CLR_INT_BASE_OFFSET   0x20</div><div class='ctx'> #define QUERY_FW_CLR_INT_BAR_OFFSET    0x28</div><div class='ctx'> </div><div class='add'>+#define QUERY_FW_COMM_BASE_OFFSET      0x40</div><div class='add'>+#define QUERY_FW_COMM_BAR_OFFSET       0x48</div><div class='add'>+</div><div class='ctx'> 	mailbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='ctx'> 	if (IS_ERR(mailbox))</div><div class='ctx'> 		return PTR_ERR(mailbox);</div><div class='ctx'> 	outbox = mailbox-&gt;buf;</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_cmd_box(dev, 0, mailbox-&gt;dma, 0, 0, MLX4_CMD_QUERY_FW,</div><div class='del'>-			    MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+			    MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -608,6 +848,9 @@ int mlx4_QUERY_FW(struct mlx4_dev *dev)</div><div class='ctx'> 		((fw_ver &amp; 0xffff0000ull) &gt;&gt; 16) |</div><div class='ctx'> 		((fw_ver &amp; 0x0000ffffull) &lt;&lt; 16);</div><div class='ctx'> </div><div class='add'>+	MLX4_GET(lg, outbox, QUERY_FW_PPF_ID);</div><div class='add'>+	dev-&gt;caps.function = lg;</div><div class='add'>+</div><div class='ctx'> 	MLX4_GET(cmd_if_rev, outbox, QUERY_FW_CMD_IF_REV_OFFSET);</div><div class='ctx'> 	if (cmd_if_rev &lt; MLX4_COMMAND_INTERFACE_MIN_REV ||</div><div class='ctx'> 	    cmd_if_rev &gt; MLX4_COMMAND_INTERFACE_MAX_REV) {</div><div class='hunk'>@@ -649,6 +892,11 @@ int mlx4_QUERY_FW(struct mlx4_dev *dev)</div><div class='ctx'> 	MLX4_GET(fw-&gt;clr_int_bar,  outbox, QUERY_FW_CLR_INT_BAR_OFFSET);</div><div class='ctx'> 	fw-&gt;clr_int_bar = (fw-&gt;clr_int_bar &gt;&gt; 6) * 2;</div><div class='ctx'> </div><div class='add'>+	MLX4_GET(fw-&gt;comm_base, outbox, QUERY_FW_COMM_BASE_OFFSET);</div><div class='add'>+	MLX4_GET(fw-&gt;comm_bar,  outbox, QUERY_FW_COMM_BAR_OFFSET);</div><div class='add'>+	fw-&gt;comm_bar = (fw-&gt;comm_bar &gt;&gt; 6) * 2;</div><div class='add'>+	mlx4_dbg(dev, "Communication vector bar:%d offset:0x%llx\n",</div><div class='add'>+		 fw-&gt;comm_bar, fw-&gt;comm_base);</div><div class='ctx'> 	mlx4_dbg(dev, "FW size %d KB\n", fw-&gt;fw_pages &gt;&gt; 2);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -711,7 +959,7 @@ int mlx4_QUERY_ADAPTER(struct mlx4_dev *dev, struct mlx4_adapter *adapter)</div><div class='ctx'> 	outbox = mailbox-&gt;buf;</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_cmd_box(dev, 0, mailbox-&gt;dma, 0, 0, MLX4_CMD_QUERY_ADAPTER,</div><div class='del'>-			   MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+			   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -743,6 +991,7 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param)</div><div class='ctx'> #define	 INIT_HCA_LOG_SRQ_OFFSET	 (INIT_HCA_QPC_OFFSET + 0x2f)</div><div class='ctx'> #define	 INIT_HCA_CQC_BASE_OFFSET	 (INIT_HCA_QPC_OFFSET + 0x30)</div><div class='ctx'> #define	 INIT_HCA_LOG_CQ_OFFSET		 (INIT_HCA_QPC_OFFSET + 0x37)</div><div class='add'>+#define	 INIT_HCA_EQE_CQE_OFFSETS	 (INIT_HCA_QPC_OFFSET + 0x38)</div><div class='ctx'> #define	 INIT_HCA_ALTC_BASE_OFFSET	 (INIT_HCA_QPC_OFFSET + 0x40)</div><div class='ctx'> #define	 INIT_HCA_AUXC_BASE_OFFSET	 (INIT_HCA_QPC_OFFSET + 0x50)</div><div class='ctx'> #define	 INIT_HCA_EQC_BASE_OFFSET	 (INIT_HCA_QPC_OFFSET + 0x60)</div><div class='hunk'>@@ -831,10 +1080,11 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param)</div><div class='ctx'> </div><div class='ctx'> 	/* UAR attributes */</div><div class='ctx'> </div><div class='del'>-	MLX4_PUT(inbox, (u8) (PAGE_SHIFT - 12), INIT_HCA_UAR_PAGE_SZ_OFFSET);</div><div class='add'>+	MLX4_PUT(inbox, param-&gt;uar_page_sz,	INIT_HCA_UAR_PAGE_SZ_OFFSET);</div><div class='ctx'> 	MLX4_PUT(inbox, param-&gt;log_uar_sz,      INIT_HCA_LOG_UAR_SZ_OFFSET);</div><div class='ctx'> </div><div class='del'>-	err = mlx4_cmd(dev, mailbox-&gt;dma, 0, 0, MLX4_CMD_INIT_HCA, 10000);</div><div class='add'>+	err = mlx4_cmd(dev, mailbox-&gt;dma, 0, 0, MLX4_CMD_INIT_HCA, 10000,</div><div class='add'>+		       MLX4_CMD_NATIVE);</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='ctx'> 		mlx4_err(dev, "INIT_HCA returns %d\n", err);</div><div class='hunk'>@@ -843,6 +1093,101 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mlx4_QUERY_HCA(struct mlx4_dev *dev,</div><div class='add'>+		   struct mlx4_init_hca_param *param)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_cmd_mailbox *mailbox;</div><div class='add'>+	__be32 *outbox;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+#define QUERY_HCA_GLOBAL_CAPS_OFFSET	0x04</div><div class='add'>+</div><div class='add'>+	mailbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='add'>+	if (IS_ERR(mailbox))</div><div class='add'>+		return PTR_ERR(mailbox);</div><div class='add'>+	outbox = mailbox-&gt;buf;</div><div class='add'>+</div><div class='add'>+	err = mlx4_cmd_box(dev, 0, mailbox-&gt;dma, 0, 0,</div><div class='add'>+			   MLX4_CMD_QUERY_HCA,</div><div class='add'>+			   MLX4_CMD_TIME_CLASS_B,</div><div class='add'>+			   !mlx4_is_slave(dev));</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	MLX4_GET(param-&gt;global_caps, outbox, QUERY_HCA_GLOBAL_CAPS_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* QPC/EEC/CQC/EQC/RDMARC attributes */</div><div class='add'>+</div><div class='add'>+	MLX4_GET(param-&gt;qpc_base,      outbox, INIT_HCA_QPC_BASE_OFFSET);</div><div class='add'>+	MLX4_GET(param-&gt;log_num_qps,   outbox, INIT_HCA_LOG_QP_OFFSET);</div><div class='add'>+	MLX4_GET(param-&gt;srqc_base,     outbox, INIT_HCA_SRQC_BASE_OFFSET);</div><div class='add'>+	MLX4_GET(param-&gt;log_num_srqs,  outbox, INIT_HCA_LOG_SRQ_OFFSET);</div><div class='add'>+	MLX4_GET(param-&gt;cqc_base,      outbox, INIT_HCA_CQC_BASE_OFFSET);</div><div class='add'>+	MLX4_GET(param-&gt;log_num_cqs,   outbox, INIT_HCA_LOG_CQ_OFFSET);</div><div class='add'>+	MLX4_GET(param-&gt;altc_base,     outbox, INIT_HCA_ALTC_BASE_OFFSET);</div><div class='add'>+	MLX4_GET(param-&gt;auxc_base,     outbox, INIT_HCA_AUXC_BASE_OFFSET);</div><div class='add'>+	MLX4_GET(param-&gt;eqc_base,      outbox, INIT_HCA_EQC_BASE_OFFSET);</div><div class='add'>+	MLX4_GET(param-&gt;log_num_eqs,   outbox, INIT_HCA_LOG_EQ_OFFSET);</div><div class='add'>+	MLX4_GET(param-&gt;rdmarc_base,   outbox, INIT_HCA_RDMARC_BASE_OFFSET);</div><div class='add'>+	MLX4_GET(param-&gt;log_rd_per_qp, outbox, INIT_HCA_LOG_RD_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* multicast attributes */</div><div class='add'>+</div><div class='add'>+	MLX4_GET(param-&gt;mc_base,         outbox, INIT_HCA_MC_BASE_OFFSET);</div><div class='add'>+	MLX4_GET(param-&gt;log_mc_entry_sz, outbox,</div><div class='add'>+		 INIT_HCA_LOG_MC_ENTRY_SZ_OFFSET);</div><div class='add'>+	MLX4_GET(param-&gt;log_mc_hash_sz,  outbox,</div><div class='add'>+		 INIT_HCA_LOG_MC_HASH_SZ_OFFSET);</div><div class='add'>+	MLX4_GET(param-&gt;log_mc_table_sz, outbox,</div><div class='add'>+		 INIT_HCA_LOG_MC_TABLE_SZ_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* TPT attributes */</div><div class='add'>+</div><div class='add'>+	MLX4_GET(param-&gt;dmpt_base,  outbox, INIT_HCA_DMPT_BASE_OFFSET);</div><div class='add'>+	MLX4_GET(param-&gt;log_mpt_sz, outbox, INIT_HCA_LOG_MPT_SZ_OFFSET);</div><div class='add'>+	MLX4_GET(param-&gt;mtt_base,   outbox, INIT_HCA_MTT_BASE_OFFSET);</div><div class='add'>+	MLX4_GET(param-&gt;cmpt_base,  outbox, INIT_HCA_CMPT_BASE_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* UAR attributes */</div><div class='add'>+</div><div class='add'>+	MLX4_GET(param-&gt;uar_page_sz, outbox, INIT_HCA_UAR_PAGE_SZ_OFFSET);</div><div class='add'>+	MLX4_GET(param-&gt;log_uar_sz, outbox, INIT_HCA_LOG_UAR_SZ_OFFSET);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_INIT_PORT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	int port = vhcr-&gt;in_modifier;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;mfunc.master.slave_state[slave].init_port_mask &amp; (1 &lt;&lt; port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;caps.port_mask[port] == MLX4_PORT_TYPE_IB)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* Enable port only if it was previously disabled */</div><div class='add'>+	if (!priv-&gt;mfunc.master.init_port_ref[port]) {</div><div class='add'>+		err = mlx4_cmd(dev, 0, port, 0, MLX4_CMD_INIT_PORT,</div><div class='add'>+			       MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		priv-&gt;mfunc.master.slave_state[slave].init_port_mask |=</div><div class='add'>+			(1 &lt;&lt; port);</div><div class='add'>+	}</div><div class='add'>+	++priv-&gt;mfunc.master.init_port_ref[port];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mlx4_INIT_PORT(struct mlx4_dev *dev, int port)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_cmd_mailbox *mailbox;</div><div class='hunk'>@@ -886,33 +1231,62 @@ int mlx4_INIT_PORT(struct mlx4_dev *dev, int port)</div><div class='ctx'> 		MLX4_PUT(inbox, field, INIT_PORT_MAX_PKEY_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 		err = mlx4_cmd(dev, mailbox-&gt;dma, port, 0, MLX4_CMD_INIT_PORT,</div><div class='del'>-			       MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+			       MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);</div><div class='ctx'> </div><div class='ctx'> 		mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='ctx'> 	} else</div><div class='ctx'> 		err = mlx4_cmd(dev, 0, port, 0, MLX4_CMD_INIT_PORT,</div><div class='del'>-			       MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+			       MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_INIT_PORT);</div><div class='ctx'> </div><div class='add'>+int mlx4_CLOSE_PORT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			    struct mlx4_vhcr *vhcr,</div><div class='add'>+			    struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			    struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			    struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	int port = vhcr-&gt;in_modifier;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;mfunc.master.slave_state[slave].init_port_mask &amp;</div><div class='add'>+	    (1 &lt;&lt; port)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;caps.port_mask[port] == MLX4_PORT_TYPE_IB)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (priv-&gt;mfunc.master.init_port_ref[port] == 1) {</div><div class='add'>+		err = mlx4_cmd(dev, 0, port, 0, MLX4_CMD_CLOSE_PORT, 1000,</div><div class='add'>+			       MLX4_CMD_NATIVE);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;mfunc.master.slave_state[slave].init_port_mask &amp;= ~(1 &lt;&lt; port);</div><div class='add'>+	--priv-&gt;mfunc.master.init_port_ref[port];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mlx4_CLOSE_PORT(struct mlx4_dev *dev, int port)</div><div class='ctx'> {</div><div class='del'>-	return mlx4_cmd(dev, 0, port, 0, MLX4_CMD_CLOSE_PORT, 1000);</div><div class='add'>+	return mlx4_cmd(dev, 0, port, 0, MLX4_CMD_CLOSE_PORT, 1000,</div><div class='add'>+			MLX4_CMD_WRAPPED);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_CLOSE_PORT);</div><div class='ctx'> </div><div class='ctx'> int mlx4_CLOSE_HCA(struct mlx4_dev *dev, int panic)</div><div class='ctx'> {</div><div class='del'>-	return mlx4_cmd(dev, 0, 0, panic, MLX4_CMD_CLOSE_HCA, 1000);</div><div class='add'>+	return mlx4_cmd(dev, 0, 0, panic, MLX4_CMD_CLOSE_HCA, 1000,</div><div class='add'>+			MLX4_CMD_NATIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mlx4_SET_ICM_SIZE(struct mlx4_dev *dev, u64 icm_size, u64 *aux_pages)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = mlx4_cmd_imm(dev, icm_size, aux_pages, 0, 0,</div><div class='ctx'> 			       MLX4_CMD_SET_ICM_SIZE,</div><div class='del'>-			       MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+			       MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -929,7 +1303,7 @@ int mlx4_SET_ICM_SIZE(struct mlx4_dev *dev, u64 icm_size, u64 *aux_pages)</div><div class='ctx'> int mlx4_NOP(struct mlx4_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* Input modifier of 0x1f means "finish as soon as possible." */</div><div class='del'>-	return mlx4_cmd(dev, 0, 0x1f, 0, MLX4_CMD_NOP, 100);</div><div class='add'>+	return mlx4_cmd(dev, 0, 0x1f, 0, MLX4_CMD_NOP, 100, MLX4_CMD_NATIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define MLX4_WOL_SETUP_MODE (5 &lt;&lt; 28)</div><div class='hunk'>@@ -938,7 +1312,8 @@ int mlx4_wol_read(struct mlx4_dev *dev, u64 *config, int port)</div><div class='ctx'> 	u32 in_mod = MLX4_WOL_SETUP_MODE | port &lt;&lt; 8;</div><div class='ctx'> </div><div class='ctx'> 	return mlx4_cmd_imm(dev, 0, config, in_mod, 0x3,</div><div class='del'>-			    MLX4_CMD_MOD_STAT_CFG, MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+			    MLX4_CMD_MOD_STAT_CFG, MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+			    MLX4_CMD_NATIVE);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_wol_read);</div><div class='ctx'> </div><div class='hunk'>@@ -947,6 +1322,6 @@ int mlx4_wol_write(struct mlx4_dev *dev, u64 config, int port)</div><div class='ctx'> 	u32 in_mod = MLX4_WOL_SETUP_MODE | port &lt;&lt; 8;</div><div class='ctx'> </div><div class='ctx'> 	return mlx4_cmd(dev, config, in_mod, 0x1, MLX4_CMD_MOD_STAT_CFG,</div><div class='del'>-					MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+			MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_wol_write);</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.h b/drivers/net/ethernet/mellanox/mlx4/fw.h<br/>index bf5ec2286528..119e0cc9fab3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/fw.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/fw.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/fw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/fw.h</a></div><div class='hunk'>@@ -111,11 +111,30 @@ struct mlx4_dev_cap {</div><div class='ctx'> 	u64 max_icm_sz;</div><div class='ctx'> 	int max_gso_sz;</div><div class='ctx'> 	u8  supported_port_types[MLX4_MAX_PORTS + 1];</div><div class='add'>+	u8  suggested_type[MLX4_MAX_PORTS + 1];</div><div class='add'>+	u8  default_sense[MLX4_MAX_PORTS + 1];</div><div class='ctx'> 	u8  log_max_macs[MLX4_MAX_PORTS + 1];</div><div class='ctx'> 	u8  log_max_vlans[MLX4_MAX_PORTS + 1];</div><div class='ctx'> 	u32 max_counters;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx4_func_cap {</div><div class='add'>+	u8	function;</div><div class='add'>+	u8	num_ports;</div><div class='add'>+	u8	flags;</div><div class='add'>+	u32	pf_context_behaviour;</div><div class='add'>+	int	qp_quota;</div><div class='add'>+	int	cq_quota;</div><div class='add'>+	int	srq_quota;</div><div class='add'>+	int	mpt_quota;</div><div class='add'>+	int	mtt_quota;</div><div class='add'>+	int	max_eq;</div><div class='add'>+	int	reserved_eq;</div><div class='add'>+	int	mcg_quota;</div><div class='add'>+	u8	physical_port[MLX4_MAX_PORTS + 1];</div><div class='add'>+	u8	port_flags[MLX4_MAX_PORTS + 1];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx4_adapter {</div><div class='ctx'> 	char board_id[MLX4_BOARD_ID_LEN];</div><div class='ctx'> 	u8   inta_pin;</div><div class='hunk'>@@ -133,6 +152,7 @@ struct mlx4_init_hca_param {</div><div class='ctx'> 	u64 dmpt_base;</div><div class='ctx'> 	u64 cmpt_base;</div><div class='ctx'> 	u64 mtt_base;</div><div class='add'>+	u64 global_caps;</div><div class='ctx'> 	u16 log_mc_entry_sz;</div><div class='ctx'> 	u16 log_mc_hash_sz;</div><div class='ctx'> 	u8  log_num_qps;</div><div class='hunk'>@@ -143,6 +163,7 @@ struct mlx4_init_hca_param {</div><div class='ctx'> 	u8  log_mc_table_sz;</div><div class='ctx'> 	u8  log_mpt_sz;</div><div class='ctx'> 	u8  log_uar_sz;</div><div class='add'>+	u8  uar_page_sz; /* log pg sz in 4k chunks */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx4_init_ib_param {</div><div class='hunk'>@@ -167,12 +188,19 @@ struct mlx4_set_ib_param {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap);</div><div class='add'>+int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, struct mlx4_func_cap *func_cap);</div><div class='add'>+int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+				struct mlx4_vhcr *vhcr,</div><div class='add'>+				struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+				struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+				struct mlx4_cmd_info *cmd);</div><div class='ctx'> int mlx4_MAP_FA(struct mlx4_dev *dev, struct mlx4_icm *icm);</div><div class='ctx'> int mlx4_UNMAP_FA(struct mlx4_dev *dev);</div><div class='ctx'> int mlx4_RUN_FW(struct mlx4_dev *dev);</div><div class='ctx'> int mlx4_QUERY_FW(struct mlx4_dev *dev);</div><div class='ctx'> int mlx4_QUERY_ADAPTER(struct mlx4_dev *dev, struct mlx4_adapter *adapter);</div><div class='ctx'> int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param);</div><div class='add'>+int mlx4_QUERY_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param);</div><div class='ctx'> int mlx4_CLOSE_HCA(struct mlx4_dev *dev, int panic);</div><div class='ctx'> int mlx4_map_cmd(struct mlx4_dev *dev, u16 op, struct mlx4_icm *icm, u64 virt);</div><div class='ctx'> int mlx4_SET_ICM_SIZE(struct mlx4_dev *dev, u64 icm_size, u64 *aux_pages);</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/icm.c b/drivers/net/ethernet/mellanox/mlx4/icm.c<br/>index 02393fdf44c1..a9ade1c3cad5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/icm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/icm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/icm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/icm.c</a></div><div class='hunk'>@@ -213,7 +213,7 @@ static int mlx4_MAP_ICM(struct mlx4_dev *dev, struct mlx4_icm *icm, u64 virt)</div><div class='ctx'> static int mlx4_UNMAP_ICM(struct mlx4_dev *dev, u64 virt, u32 page_count)</div><div class='ctx'> {</div><div class='ctx'> 	return mlx4_cmd(dev, virt, page_count, 0, MLX4_CMD_UNMAP_ICM,</div><div class='del'>-			MLX4_CMD_TIME_CLASS_B);</div><div class='add'>+			MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mlx4_MAP_ICM_AUX(struct mlx4_dev *dev, struct mlx4_icm *icm)</div><div class='hunk'>@@ -223,7 +223,8 @@ int mlx4_MAP_ICM_AUX(struct mlx4_dev *dev, struct mlx4_icm *icm)</div><div class='ctx'> </div><div class='ctx'> int mlx4_UNMAP_ICM_AUX(struct mlx4_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	return mlx4_cmd(dev, 0, 0, 0, MLX4_CMD_UNMAP_ICM_AUX, MLX4_CMD_TIME_CLASS_B);</div><div class='add'>+	return mlx4_cmd(dev, 0, 0, 0, MLX4_CMD_UNMAP_ICM_AUX,</div><div class='add'>+			MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mlx4_table_get(struct mlx4_dev *dev, struct mlx4_icm_table *table, int obj)</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/intf.c b/drivers/net/ethernet/mellanox/mlx4/intf.c<br/>index ca6feb55bd94..b4e9f6f5cc04 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/intf.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/intf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/intf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/intf.c</a></div><div class='hunk'>@@ -142,7 +142,8 @@ int mlx4_register_device(struct mlx4_dev *dev)</div><div class='ctx'> 		mlx4_add_device(intf, priv);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;intf_mutex);</div><div class='del'>-	mlx4_start_catas_poll(dev);</div><div class='add'>+	if (!mlx4_is_slave(dev))</div><div class='add'>+		mlx4_start_catas_poll(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -152,7 +153,8 @@ void mlx4_unregister_device(struct mlx4_dev *dev)</div><div class='ctx'> 	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='ctx'> 	struct mlx4_interface *intf;</div><div class='ctx'> </div><div class='del'>-	mlx4_stop_catas_poll(dev);</div><div class='add'>+	if (!mlx4_is_slave(dev))</div><div class='add'>+		mlx4_stop_catas_poll(dev);</div><div class='ctx'> 	mutex_lock(&amp;intf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(intf, &amp;intf_list, list)</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c<br/>index 94bbc85a532d..6bb62c580e2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/main.c</a></div><div class='hunk'>@@ -40,6 +40,7 @@</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/io-mapping.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mlx4/device.h&gt;</div><div class='ctx'> #include &lt;linux/mlx4/doorbell.h&gt;</div><div class='hunk'>@@ -75,21 +76,42 @@ MODULE_PARM_DESC(msi_x, "attempt to use MSI-X if nonzero");</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_PCI_MSI */</div><div class='ctx'> </div><div class='add'>+static int num_vfs;</div><div class='add'>+module_param(num_vfs, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(num_vfs, "enable #num_vfs functions if num_vfs &gt; 0");</div><div class='add'>+</div><div class='add'>+static int probe_vf;</div><div class='add'>+module_param(probe_vf, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(probe_vf, "number of vfs to probe by pf driver (num_vfs &gt; 0)");</div><div class='add'>+</div><div class='add'>+int mlx4_log_num_mgm_entry_size = 10;</div><div class='add'>+module_param_named(log_num_mgm_entry_size,</div><div class='add'>+			mlx4_log_num_mgm_entry_size, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(log_num_mgm_entry_size, "log mgm size, that defines the num"</div><div class='add'>+					 " of qp per mcg, for example:"</div><div class='add'>+					 " 10 gives 248.range: 9&lt;="</div><div class='add'>+					 " log_num_mgm_entry_size &lt;= 12");</div><div class='add'>+</div><div class='add'>+#define MLX4_VF                                        (1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define HCA_GLOBAL_CAP_MASK            0</div><div class='add'>+#define PF_CONTEXT_BEHAVIOUR_MASK      0</div><div class='add'>+</div><div class='ctx'> static char mlx4_version[] __devinitdata =</div><div class='ctx'> 	DRV_NAME ": Mellanox ConnectX core driver v"</div><div class='ctx'> 	DRV_VERSION " (" DRV_RELDATE ")\n";</div><div class='ctx'> </div><div class='ctx'> static struct mlx4_profile default_profile = {</div><div class='del'>-	.num_qp		= 1 &lt;&lt; 17,</div><div class='add'>+	.num_qp		= 1 &lt;&lt; 18,</div><div class='ctx'> 	.num_srq	= 1 &lt;&lt; 16,</div><div class='ctx'> 	.rdmarc_per_qp	= 1 &lt;&lt; 4,</div><div class='ctx'> 	.num_cq		= 1 &lt;&lt; 16,</div><div class='ctx'> 	.num_mcg	= 1 &lt;&lt; 13,</div><div class='del'>-	.num_mpt	= 1 &lt;&lt; 17,</div><div class='add'>+	.num_mpt	= 1 &lt;&lt; 19,</div><div class='ctx'> 	.num_mtt	= 1 &lt;&lt; 20,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int log_num_mac = 2;</div><div class='add'>+static int log_num_mac = 7;</div><div class='ctx'> module_param_named(log_num_mac, log_num_mac, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(log_num_mac, "Log2 max number of MACs per ETH port (1-7)");</div><div class='ctx'> </div><div class='hunk'>@@ -99,15 +121,33 @@ MODULE_PARM_DESC(log_num_vlan, "Log2 max number of VLANs per ETH port (0-7)");</div><div class='ctx'> /* Log2 max number of VLANs per ETH port (0-7) */</div><div class='ctx'> #define MLX4_LOG_NUM_VLANS 7</div><div class='ctx'> </div><div class='del'>-static int use_prio;</div><div class='add'>+static bool use_prio;</div><div class='ctx'> module_param_named(use_prio, use_prio, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(use_prio, "Enable steering by VLAN priority on ETH ports "</div><div class='ctx'> 		  "(0/1, default 0)");</div><div class='ctx'> </div><div class='del'>-static int log_mtts_per_seg = ilog2(MLX4_MTT_ENTRY_PER_SEG);</div><div class='add'>+int log_mtts_per_seg = ilog2(MLX4_MTT_ENTRY_PER_SEG);</div><div class='ctx'> module_param_named(log_mtts_per_seg, log_mtts_per_seg, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(log_mtts_per_seg, "Log2 number of MTT entries per segment (1-7)");</div><div class='ctx'> </div><div class='add'>+static int port_type_array[2] = {MLX4_PORT_TYPE_NONE, MLX4_PORT_TYPE_NONE};</div><div class='add'>+static int arr_argc = 2;</div><div class='add'>+module_param_array(port_type_array, int, &amp;arr_argc, 0444);</div><div class='add'>+MODULE_PARM_DESC(port_type_array, "Array of port types: HW_DEFAULT (0) is default "</div><div class='add'>+				"1 for IB, 2 for Ethernet");</div><div class='add'>+</div><div class='add'>+struct mlx4_port_config {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	enum mlx4_port_type port_type[MLX4_MAX_PORTS + 1];</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int mlx4_master_get_num_eqs(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;caps.reserved_eqs +</div><div class='add'>+		MLX4_MFUNC_EQ_NUM * (dev-&gt;num_slaves + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mlx4_check_port_params(struct mlx4_dev *dev,</div><div class='ctx'> 			   enum mlx4_port_type *port_type)</div><div class='ctx'> {</div><div class='hunk'>@@ -140,10 +180,8 @@ static void mlx4_set_port_mask(struct mlx4_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;caps.port_mask = 0;</div><div class='ctx'> 	for (i = 1; i &lt;= dev-&gt;caps.num_ports; ++i)</div><div class='del'>-		if (dev-&gt;caps.port_type[i] == MLX4_PORT_TYPE_IB)</div><div class='del'>-			dev-&gt;caps.port_mask |= 1 &lt;&lt; (i - 1);</div><div class='add'>+		dev-&gt;caps.port_mask[i] = dev-&gt;caps.port_type[i];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)</div><div class='hunk'>@@ -188,12 +226,15 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)</div><div class='ctx'> 		dev-&gt;caps.eth_mtu_cap[i]    = dev_cap-&gt;eth_mtu[i];</div><div class='ctx'> 		dev-&gt;caps.def_mac[i]        = dev_cap-&gt;def_mac[i];</div><div class='ctx'> 		dev-&gt;caps.supported_type[i] = dev_cap-&gt;supported_port_types[i];</div><div class='add'>+		dev-&gt;caps.suggested_type[i] = dev_cap-&gt;suggested_type[i];</div><div class='add'>+		dev-&gt;caps.default_sense[i] = dev_cap-&gt;default_sense[i];</div><div class='ctx'> 		dev-&gt;caps.trans_type[i]	    = dev_cap-&gt;trans_type[i];</div><div class='ctx'> 		dev-&gt;caps.vendor_oui[i]     = dev_cap-&gt;vendor_oui[i];</div><div class='ctx'> 		dev-&gt;caps.wavelength[i]     = dev_cap-&gt;wavelength[i];</div><div class='ctx'> 		dev-&gt;caps.trans_code[i]     = dev_cap-&gt;trans_code[i];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dev-&gt;caps.uar_page_size	     = PAGE_SIZE;</div><div class='ctx'> 	dev-&gt;caps.num_uars	     = dev_cap-&gt;uar_size / PAGE_SIZE;</div><div class='ctx'> 	dev-&gt;caps.local_ca_ack_delay = dev_cap-&gt;local_ca_ack_delay;</div><div class='ctx'> 	dev-&gt;caps.bf_reg_size	     = dev_cap-&gt;bf_reg_size;</div><div class='hunk'>@@ -207,7 +248,7 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)</div><div class='ctx'> 	dev-&gt;caps.reserved_srqs	     = dev_cap-&gt;reserved_srqs;</div><div class='ctx'> 	dev-&gt;caps.max_sq_desc_sz     = dev_cap-&gt;max_sq_desc_sz;</div><div class='ctx'> 	dev-&gt;caps.max_rq_desc_sz     = dev_cap-&gt;max_rq_desc_sz;</div><div class='del'>-	dev-&gt;caps.num_qp_per_mgm     = MLX4_QP_PER_MGM;</div><div class='add'>+	dev-&gt;caps.num_qp_per_mgm     = mlx4_get_qp_per_mgm(dev);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Subtract 1 from the limit because we need to allocate a</div><div class='ctx'> 	 * spare CQE so the HCA HW can tell the difference between an</div><div class='hunk'>@@ -216,17 +257,18 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)</div><div class='ctx'> 	dev-&gt;caps.max_cqes	     = dev_cap-&gt;max_cq_sz - 1;</div><div class='ctx'> 	dev-&gt;caps.reserved_cqs	     = dev_cap-&gt;reserved_cqs;</div><div class='ctx'> 	dev-&gt;caps.reserved_eqs	     = dev_cap-&gt;reserved_eqs;</div><div class='del'>-	dev-&gt;caps.mtts_per_seg	     = 1 &lt;&lt; log_mtts_per_seg;</div><div class='del'>-	dev-&gt;caps.reserved_mtts	     = DIV_ROUND_UP(dev_cap-&gt;reserved_mtts,</div><div class='del'>-						    dev-&gt;caps.mtts_per_seg);</div><div class='add'>+	dev-&gt;caps.reserved_mtts      = dev_cap-&gt;reserved_mtts;</div><div class='ctx'> 	dev-&gt;caps.reserved_mrws	     = dev_cap-&gt;reserved_mrws;</div><div class='del'>-	dev-&gt;caps.reserved_uars	     = dev_cap-&gt;reserved_uars;</div><div class='add'>+</div><div class='add'>+	/* The first 128 UARs are used for EQ doorbells */</div><div class='add'>+	dev-&gt;caps.reserved_uars	     = max_t(int, 128, dev_cap-&gt;reserved_uars);</div><div class='ctx'> 	dev-&gt;caps.reserved_pds	     = dev_cap-&gt;reserved_pds;</div><div class='ctx'> 	dev-&gt;caps.reserved_xrcds     = (dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_XRC) ?</div><div class='ctx'> 					dev_cap-&gt;reserved_xrcds : 0;</div><div class='ctx'> 	dev-&gt;caps.max_xrcds          = (dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_XRC) ?</div><div class='ctx'> 					dev_cap-&gt;max_xrcds : 0;</div><div class='del'>-	dev-&gt;caps.mtt_entry_sz	     = dev-&gt;caps.mtts_per_seg * dev_cap-&gt;mtt_entry_sz;</div><div class='add'>+	dev-&gt;caps.mtt_entry_sz       = dev_cap-&gt;mtt_entry_sz;</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;caps.max_msg_sz         = dev_cap-&gt;max_msg_sz;</div><div class='ctx'> 	dev-&gt;caps.page_size_cap	     = ~(u32) (dev_cap-&gt;min_page_sz - 1);</div><div class='ctx'> 	dev-&gt;caps.flags		     = dev_cap-&gt;flags;</div><div class='hunk'>@@ -235,18 +277,70 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)</div><div class='ctx'> 	dev-&gt;caps.stat_rate_support  = dev_cap-&gt;stat_rate_support;</div><div class='ctx'> 	dev-&gt;caps.max_gso_sz	     = dev_cap-&gt;max_gso_sz;</div><div class='ctx'> </div><div class='add'>+	/* Sense port always allowed on supported devices for ConnectX1 and 2 */</div><div class='add'>+	if (dev-&gt;pdev-&gt;device != 0x1003)</div><div class='add'>+		dev-&gt;caps.flags |= MLX4_DEV_CAP_FLAG_SENSE_SUPPORT;</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;caps.log_num_macs  = log_num_mac;</div><div class='ctx'> 	dev-&gt;caps.log_num_vlans = MLX4_LOG_NUM_VLANS;</div><div class='ctx'> 	dev-&gt;caps.log_num_prios = use_prio ? 3 : 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 1; i &lt;= dev-&gt;caps.num_ports; ++i) {</div><div class='del'>-		if (dev-&gt;caps.supported_type[i] != MLX4_PORT_TYPE_ETH)</div><div class='del'>-			dev-&gt;caps.port_type[i] = MLX4_PORT_TYPE_IB;</div><div class='del'>-		else</div><div class='del'>-			dev-&gt;caps.port_type[i] = MLX4_PORT_TYPE_ETH;</div><div class='del'>-		dev-&gt;caps.possible_type[i] = dev-&gt;caps.port_type[i];</div><div class='add'>+		dev-&gt;caps.port_type[i] = MLX4_PORT_TYPE_NONE;</div><div class='add'>+		if (dev-&gt;caps.supported_type[i]) {</div><div class='add'>+			/* if only ETH is supported - assign ETH */</div><div class='add'>+			if (dev-&gt;caps.supported_type[i] == MLX4_PORT_TYPE_ETH)</div><div class='add'>+				dev-&gt;caps.port_type[i] = MLX4_PORT_TYPE_ETH;</div><div class='add'>+			/* if only IB is supported,</div><div class='add'>+			 * assign IB only if SRIOV is off*/</div><div class='add'>+			else if (dev-&gt;caps.supported_type[i] ==</div><div class='add'>+				 MLX4_PORT_TYPE_IB) {</div><div class='add'>+				if (dev-&gt;flags &amp; MLX4_FLAG_SRIOV)</div><div class='add'>+					dev-&gt;caps.port_type[i] =</div><div class='add'>+						MLX4_PORT_TYPE_NONE;</div><div class='add'>+				else</div><div class='add'>+					dev-&gt;caps.port_type[i] =</div><div class='add'>+						MLX4_PORT_TYPE_IB;</div><div class='add'>+			/* if IB and ETH are supported,</div><div class='add'>+			 * first of all check if SRIOV is on */</div><div class='add'>+			} else if (dev-&gt;flags &amp; MLX4_FLAG_SRIOV)</div><div class='add'>+				dev-&gt;caps.port_type[i] = MLX4_PORT_TYPE_ETH;</div><div class='add'>+			else {</div><div class='add'>+				/* In non-SRIOV mode, we set the port type</div><div class='add'>+				 * according to user selection of port type,</div><div class='add'>+				 * if usere selected none, take the FW hint */</div><div class='add'>+				if (port_type_array[i-1] == MLX4_PORT_TYPE_NONE)</div><div class='add'>+					dev-&gt;caps.port_type[i] = dev-&gt;caps.suggested_type[i] ?</div><div class='add'>+						MLX4_PORT_TYPE_ETH : MLX4_PORT_TYPE_IB;</div><div class='add'>+				else</div><div class='add'>+					dev-&gt;caps.port_type[i] = port_type_array[i-1];</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * Link sensing is allowed on the port if 3 conditions are true:</div><div class='add'>+		 * 1. Both protocols are supported on the port.</div><div class='add'>+		 * 2. Different types are supported on the port</div><div class='add'>+		 * 3. FW declared that it supports link sensing</div><div class='add'>+		 */</div><div class='ctx'> 		mlx4_priv(dev)-&gt;sense.sense_allowed[i] =</div><div class='del'>-			dev-&gt;caps.supported_type[i] == MLX4_PORT_TYPE_AUTO;</div><div class='add'>+			((dev-&gt;caps.supported_type[i] == MLX4_PORT_TYPE_AUTO) &amp;&amp;</div><div class='add'>+			 (dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_DPDP) &amp;&amp;</div><div class='add'>+			 (dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_SENSE_SUPPORT));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If "default_sense" bit is set, we move the port to "AUTO" mode</div><div class='add'>+		 * and perform sense_port FW command to try and set the correct</div><div class='add'>+		 * port type from beginning</div><div class='add'>+		 */</div><div class='add'>+		if (mlx4_priv(dev)-&gt;sense.sense_allowed[i] &amp;&amp; dev-&gt;caps.default_sense[i]) {</div><div class='add'>+			enum mlx4_port_type sensed_port = MLX4_PORT_TYPE_NONE;</div><div class='add'>+			dev-&gt;caps.possible_type[i] = MLX4_PORT_TYPE_AUTO;</div><div class='add'>+			mlx4_SENSE_PORT(dev, i, &amp;sensed_port);</div><div class='add'>+			if (sensed_port != MLX4_PORT_TYPE_NONE)</div><div class='add'>+				dev-&gt;caps.port_type[i] = sensed_port;</div><div class='add'>+		} else {</div><div class='add'>+			dev-&gt;caps.possible_type[i] = dev-&gt;caps.port_type[i];</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (dev-&gt;caps.log_num_macs &gt; dev_cap-&gt;log_max_macs[i]) {</div><div class='ctx'> 			dev-&gt;caps.log_num_macs = dev_cap-&gt;log_max_macs[i];</div><div class='hunk'>@@ -262,8 +356,6 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mlx4_set_port_mask(dev);</div><div class='del'>-</div><div class='ctx'> 	dev-&gt;caps.max_counters = 1 &lt;&lt; ilog2(dev_cap-&gt;max_counters);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;caps.reserved_qps_cnt[MLX4_QP_REGION_FW] = dev_cap-&gt;reserved_qps;</div><div class='hunk'>@@ -282,6 +374,149 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+/*The function checks if there are live vf, return the num of them*/</div><div class='add'>+static int mlx4_how_many_lives_vf(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_slave_state *s_state;</div><div class='add'>+	int i;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 1/*the ppf is 0*/; i &lt; dev-&gt;num_slaves; ++i) {</div><div class='add'>+		s_state = &amp;priv-&gt;mfunc.master.slave_state[i];</div><div class='add'>+		if (s_state-&gt;active &amp;&amp; s_state-&gt;last_cmd !=</div><div class='add'>+		    MLX4_COMM_CMD_RESET) {</div><div class='add'>+			mlx4_warn(dev, "%s: slave: %d is still active\n",</div><div class='add'>+				  __func__, i);</div><div class='add'>+			ret++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mlx4_is_slave_active(struct mlx4_dev *dev, int slave)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_slave_state *s_slave;</div><div class='add'>+</div><div class='add'>+	if (!mlx4_is_master(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	s_slave = &amp;priv-&gt;mfunc.master.slave_state[slave];</div><div class='add'>+	return !!s_slave-&gt;active;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(mlx4_is_slave_active);</div><div class='add'>+</div><div class='add'>+static int mlx4_slave_cap(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int			   err;</div><div class='add'>+	u32			   page_size;</div><div class='add'>+	struct mlx4_dev_cap	   dev_cap;</div><div class='add'>+	struct mlx4_func_cap	   func_cap;</div><div class='add'>+	struct mlx4_init_hca_param hca_param;</div><div class='add'>+	int			   i;</div><div class='add'>+</div><div class='add'>+	memset(&amp;hca_param, 0, sizeof(hca_param));</div><div class='add'>+	err = mlx4_QUERY_HCA(dev, &amp;hca_param);</div><div class='add'>+	if (err) {</div><div class='add'>+		mlx4_err(dev, "QUERY_HCA command failed, aborting.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*fail if the hca has an unknown capability */</div><div class='add'>+	if ((hca_param.global_caps | HCA_GLOBAL_CAP_MASK) !=</div><div class='add'>+	    HCA_GLOBAL_CAP_MASK) {</div><div class='add'>+		mlx4_err(dev, "Unknown hca global capabilities\n");</div><div class='add'>+		return -ENOSYS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mlx4_log_num_mgm_entry_size = hca_param.log_mc_entry_sz;</div><div class='add'>+</div><div class='add'>+	memset(&amp;dev_cap, 0, sizeof(dev_cap));</div><div class='add'>+	err = mlx4_dev_cap(dev, &amp;dev_cap);</div><div class='add'>+	if (err) {</div><div class='add'>+		mlx4_err(dev, "QUERY_DEV_CAP command failed, aborting.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	page_size = ~dev-&gt;caps.page_size_cap + 1;</div><div class='add'>+	mlx4_warn(dev, "HCA minimum page size:%d\n", page_size);</div><div class='add'>+	if (page_size &gt; PAGE_SIZE) {</div><div class='add'>+		mlx4_err(dev, "HCA minimum page size of %d bigger than "</div><div class='add'>+			 "kernel PAGE_SIZE of %ld, aborting.\n",</div><div class='add'>+			 page_size, PAGE_SIZE);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* slave gets uar page size from QUERY_HCA fw command */</div><div class='add'>+	dev-&gt;caps.uar_page_size = 1 &lt;&lt; (hca_param.uar_page_sz + 12);</div><div class='add'>+</div><div class='add'>+	/* TODO: relax this assumption */</div><div class='add'>+	if (dev-&gt;caps.uar_page_size != PAGE_SIZE) {</div><div class='add'>+		mlx4_err(dev, "UAR size:%d != kernel PAGE_SIZE of %ld\n",</div><div class='add'>+			 dev-&gt;caps.uar_page_size, PAGE_SIZE);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;func_cap, 0, sizeof(func_cap));</div><div class='add'>+	err = mlx4_QUERY_FUNC_CAP(dev, &amp;func_cap);</div><div class='add'>+	if (err) {</div><div class='add'>+		mlx4_err(dev, "QUERY_FUNC_CAP command failed, aborting.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((func_cap.pf_context_behaviour | PF_CONTEXT_BEHAVIOUR_MASK) !=</div><div class='add'>+	    PF_CONTEXT_BEHAVIOUR_MASK) {</div><div class='add'>+		mlx4_err(dev, "Unknown pf context behaviour\n");</div><div class='add'>+		return -ENOSYS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;caps.function		= func_cap.function;</div><div class='add'>+	dev-&gt;caps.num_ports		= func_cap.num_ports;</div><div class='add'>+	dev-&gt;caps.num_qps		= func_cap.qp_quota;</div><div class='add'>+	dev-&gt;caps.num_srqs		= func_cap.srq_quota;</div><div class='add'>+	dev-&gt;caps.num_cqs		= func_cap.cq_quota;</div><div class='add'>+	dev-&gt;caps.num_eqs               = func_cap.max_eq;</div><div class='add'>+	dev-&gt;caps.reserved_eqs          = func_cap.reserved_eq;</div><div class='add'>+	dev-&gt;caps.num_mpts		= func_cap.mpt_quota;</div><div class='add'>+	dev-&gt;caps.num_mtts		= func_cap.mtt_quota;</div><div class='add'>+	dev-&gt;caps.num_pds               = MLX4_NUM_PDS;</div><div class='add'>+	dev-&gt;caps.num_mgms              = 0;</div><div class='add'>+	dev-&gt;caps.num_amgms             = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt;= dev-&gt;caps.num_ports; ++i)</div><div class='add'>+		dev-&gt;caps.port_mask[i] = dev-&gt;caps.port_type[i];</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;caps.num_ports &gt; MLX4_MAX_PORTS) {</div><div class='add'>+		mlx4_err(dev, "HCA has %d ports, but we only support %d, "</div><div class='add'>+			 "aborting.\n", dev-&gt;caps.num_ports, MLX4_MAX_PORTS);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;caps.uar_page_size * (dev-&gt;caps.num_uars -</div><div class='add'>+				       dev-&gt;caps.reserved_uars) &gt;</div><div class='add'>+				       pci_resource_len(dev-&gt;pdev, 2)) {</div><div class='add'>+		mlx4_err(dev, "HCA reported UAR region size of 0x%x bigger than "</div><div class='add'>+			 "PCI resource 2 size of 0x%llx, aborting.\n",</div><div class='add'>+			 dev-&gt;caps.uar_page_size * dev-&gt;caps.num_uars,</div><div class='add'>+			 (unsigned long long) pci_resource_len(dev-&gt;pdev, 2));</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+	mlx4_warn(dev, "sqp_demux:%d\n", dev-&gt;caps.sqp_demux);</div><div class='add'>+	mlx4_warn(dev, "num_uars:%d reserved_uars:%d uar region:0x%x bar2:0x%llx\n",</div><div class='add'>+		  dev-&gt;caps.num_uars, dev-&gt;caps.reserved_uars,</div><div class='add'>+		  dev-&gt;caps.uar_page_size * dev-&gt;caps.num_uars,</div><div class='add'>+		  pci_resource_len(dev-&gt;pdev, 2));</div><div class='add'>+	mlx4_warn(dev, "num_eqs:%d reserved_eqs:%d\n", dev-&gt;caps.num_eqs,</div><div class='add'>+		  dev-&gt;caps.reserved_eqs);</div><div class='add'>+	mlx4_warn(dev, "num_pds:%d reserved_pds:%d slave_pd_shift:%d pd_base:%d\n",</div><div class='add'>+		  dev-&gt;caps.num_pds, dev-&gt;caps.reserved_pds,</div><div class='add'>+		  dev-&gt;caps.slave_pd_shift, dev-&gt;caps.pd_base);</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Change the port configuration of the device.</div><div class='hunk'>@@ -377,7 +612,8 @@ static ssize_t set_port_type(struct device *dev,</div><div class='ctx'> 			types[i] = mdev-&gt;caps.port_type[i+1];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(mdev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_DPDP)) {</div><div class='add'>+	if (!(mdev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_DPDP) &amp;&amp;</div><div class='add'>+	    !(mdev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_SENSE_SUPPORT)) {</div><div class='ctx'> 		for (i = 1; i &lt;= mdev-&gt;caps.num_ports; i++) {</div><div class='ctx'> 			if (mdev-&gt;caps.possible_type[i] == MLX4_PORT_TYPE_AUTO) {</div><div class='ctx'> 				mdev-&gt;caps.possible_type[i] = mdev-&gt;caps.port_type[i];</div><div class='hunk'>@@ -451,6 +687,7 @@ static int mlx4_init_cmpt_table(struct mlx4_dev *dev, u64 cmpt_base,</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='ctx'> 	int err;</div><div class='add'>+	int num_eqs;</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_init_icm_table(dev, &amp;priv-&gt;qp_table.cmpt_table,</div><div class='ctx'> 				  cmpt_base +</div><div class='hunk'>@@ -480,12 +717,14 @@ static int mlx4_init_cmpt_table(struct mlx4_dev *dev, u64 cmpt_base,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_srq;</div><div class='ctx'> </div><div class='add'>+	num_eqs = (mlx4_is_master(dev)) ?</div><div class='add'>+		roundup_pow_of_two(mlx4_master_get_num_eqs(dev)) :</div><div class='add'>+		dev-&gt;caps.num_eqs;</div><div class='ctx'> 	err = mlx4_init_icm_table(dev, &amp;priv-&gt;eq_table.cmpt_table,</div><div class='ctx'> 				  cmpt_base +</div><div class='ctx'> 				  ((u64) (MLX4_CMPT_TYPE_EQ *</div><div class='ctx'> 					  cmpt_entry_sz) &lt;&lt; MLX4_CMPT_SHIFT),</div><div class='del'>-				  cmpt_entry_sz,</div><div class='del'>-				  dev-&gt;caps.num_eqs, dev-&gt;caps.num_eqs, 0, 0);</div><div class='add'>+				  cmpt_entry_sz, num_eqs, num_eqs, 0, 0);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_cq;</div><div class='ctx'> </div><div class='hunk'>@@ -509,6 +748,7 @@ static int mlx4_init_icm(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap,</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='ctx'> 	u64 aux_pages;</div><div class='add'>+	int num_eqs;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_SET_ICM_SIZE(dev, icm_size, &amp;aux_pages);</div><div class='hunk'>@@ -540,10 +780,13 @@ static int mlx4_init_icm(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap,</div><div class='ctx'> 		goto err_unmap_aux;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+	num_eqs = (mlx4_is_master(dev)) ?</div><div class='add'>+		roundup_pow_of_two(mlx4_master_get_num_eqs(dev)) :</div><div class='add'>+		dev-&gt;caps.num_eqs;</div><div class='ctx'> 	err = mlx4_init_icm_table(dev, &amp;priv-&gt;eq_table.table,</div><div class='ctx'> 				  init_hca-&gt;eqc_base, dev_cap-&gt;eqc_entry_sz,</div><div class='del'>-				  dev-&gt;caps.num_eqs, dev-&gt;caps.num_eqs,</div><div class='del'>-				  0, 0);</div><div class='add'>+				  num_eqs, num_eqs, 0, 0);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		mlx4_err(dev, "Failed to map EQ context memory, aborting.\n");</div><div class='ctx'> 		goto err_unmap_cmpt;</div><div class='hunk'>@@ -563,7 +806,7 @@ static int mlx4_init_icm(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap,</div><div class='ctx'> 	err = mlx4_init_icm_table(dev, &amp;priv-&gt;mr_table.mtt_table,</div><div class='ctx'> 				  init_hca-&gt;mtt_base,</div><div class='ctx'> 				  dev-&gt;caps.mtt_entry_sz,</div><div class='del'>-				  dev-&gt;caps.num_mtt_segs,</div><div class='add'>+				  dev-&gt;caps.num_mtts,</div><div class='ctx'> 				  dev-&gt;caps.reserved_mtts, 1, 0);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		mlx4_err(dev, "Failed to map MTT context memory, aborting.\n");</div><div class='hunk'>@@ -650,7 +893,8 @@ static int mlx4_init_icm(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap,</div><div class='ctx'> 	 * and it's a lot easier than trying to track ref counts.</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = mlx4_init_icm_table(dev, &amp;priv-&gt;mcg_table.table,</div><div class='del'>-				  init_hca-&gt;mc_base, MLX4_MGM_ENTRY_SIZE,</div><div class='add'>+				  init_hca-&gt;mc_base,</div><div class='add'>+				  mlx4_get_mgm_entry_size(dev),</div><div class='ctx'> 				  dev-&gt;caps.num_mgms + dev-&gt;caps.num_amgms,</div><div class='ctx'> 				  dev-&gt;caps.num_mgms + dev-&gt;caps.num_amgms,</div><div class='ctx'> 				  0, 0);</div><div class='hunk'>@@ -726,6 +970,16 @@ static void mlx4_free_icms(struct mlx4_dev *dev)</div><div class='ctx'> 	mlx4_free_icm(dev, priv-&gt;fw.aux_icm, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mlx4_slave_exit(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+</div><div class='add'>+	down(&amp;priv-&gt;cmd.slave_sem);</div><div class='add'>+	if (mlx4_comm_cmd(dev, MLX4_COMM_CMD_RESET, 0, MLX4_COMM_TIME))</div><div class='add'>+		mlx4_warn(dev, "Failed to close slave function.\n");</div><div class='add'>+	up(&amp;priv-&gt;cmd.slave_sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int map_bf_area(struct mlx4_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='hunk'>@@ -733,8 +987,10 @@ static int map_bf_area(struct mlx4_dev *dev)</div><div class='ctx'> 	resource_size_t bf_len;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	bf_start = pci_resource_start(dev-&gt;pdev, 2) + (dev-&gt;caps.num_uars &lt;&lt; PAGE_SHIFT);</div><div class='del'>-	bf_len = pci_resource_len(dev-&gt;pdev, 2) - (dev-&gt;caps.num_uars &lt;&lt; PAGE_SHIFT);</div><div class='add'>+	bf_start = pci_resource_start(dev-&gt;pdev, 2) +</div><div class='add'>+			(dev-&gt;caps.num_uars &lt;&lt; PAGE_SHIFT);</div><div class='add'>+	bf_len = pci_resource_len(dev-&gt;pdev, 2) -</div><div class='add'>+			(dev-&gt;caps.num_uars &lt;&lt; PAGE_SHIFT);</div><div class='ctx'> 	priv-&gt;bf_mapping = io_mapping_create_wc(bf_start, bf_len);</div><div class='ctx'> 	if (!priv-&gt;bf_mapping)</div><div class='ctx'> 		err = -ENOMEM;</div><div class='hunk'>@@ -751,10 +1007,81 @@ static void unmap_bf_area(struct mlx4_dev *dev)</div><div class='ctx'> static void mlx4_close_hca(struct mlx4_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unmap_bf_area(dev);</div><div class='del'>-	mlx4_CLOSE_HCA(dev, 0);</div><div class='del'>-	mlx4_free_icms(dev);</div><div class='del'>-	mlx4_UNMAP_FA(dev);</div><div class='del'>-	mlx4_free_icm(dev, mlx4_priv(dev)-&gt;fw.fw_icm, 0);</div><div class='add'>+	if (mlx4_is_slave(dev))</div><div class='add'>+		mlx4_slave_exit(dev);</div><div class='add'>+	else {</div><div class='add'>+		mlx4_CLOSE_HCA(dev, 0);</div><div class='add'>+		mlx4_free_icms(dev);</div><div class='add'>+		mlx4_UNMAP_FA(dev);</div><div class='add'>+		mlx4_free_icm(dev, mlx4_priv(dev)-&gt;fw.fw_icm, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mlx4_init_slave(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	u64 dma = (u64) priv-&gt;mfunc.vhcr_dma;</div><div class='add'>+	int num_of_reset_retries = NUM_OF_RESET_RETRIES;</div><div class='add'>+	int ret_from_reset = 0;</div><div class='add'>+	u32 slave_read;</div><div class='add'>+	u32 cmd_channel_ver;</div><div class='add'>+</div><div class='add'>+	down(&amp;priv-&gt;cmd.slave_sem);</div><div class='add'>+	priv-&gt;cmd.max_cmds = 1;</div><div class='add'>+	mlx4_warn(dev, "Sending reset\n");</div><div class='add'>+	ret_from_reset = mlx4_comm_cmd(dev, MLX4_COMM_CMD_RESET, 0,</div><div class='add'>+				       MLX4_COMM_TIME);</div><div class='add'>+	/* if we are in the middle of flr the slave will try</div><div class='add'>+	 * NUM_OF_RESET_RETRIES times before leaving.*/</div><div class='add'>+	if (ret_from_reset) {</div><div class='add'>+		if (MLX4_DELAY_RESET_SLAVE == ret_from_reset) {</div><div class='add'>+			msleep(SLEEP_TIME_IN_RESET);</div><div class='add'>+			while (ret_from_reset &amp;&amp; num_of_reset_retries) {</div><div class='add'>+				mlx4_warn(dev, "slave is currently in the"</div><div class='add'>+					  "middle of FLR. retrying..."</div><div class='add'>+					  "(try num:%d)\n",</div><div class='add'>+					  (NUM_OF_RESET_RETRIES -</div><div class='add'>+					   num_of_reset_retries  + 1));</div><div class='add'>+				ret_from_reset =</div><div class='add'>+					mlx4_comm_cmd(dev, MLX4_COMM_CMD_RESET,</div><div class='add'>+						      0, MLX4_COMM_TIME);</div><div class='add'>+				num_of_reset_retries = num_of_reset_retries - 1;</div><div class='add'>+			}</div><div class='add'>+		} else</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check the driver version - the slave I/F revision</div><div class='add'>+	 * must match the master's */</div><div class='add'>+	slave_read = swab32(readl(&amp;priv-&gt;mfunc.comm-&gt;slave_read));</div><div class='add'>+	cmd_channel_ver = mlx4_comm_get_version();</div><div class='add'>+</div><div class='add'>+	if (MLX4_COMM_GET_IF_REV(cmd_channel_ver) !=</div><div class='add'>+		MLX4_COMM_GET_IF_REV(slave_read)) {</div><div class='add'>+		mlx4_err(dev, "slave driver version is not supported"</div><div class='add'>+			 " by the master\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mlx4_warn(dev, "Sending vhcr0\n");</div><div class='add'>+	if (mlx4_comm_cmd(dev, MLX4_COMM_CMD_VHCR0, dma &gt;&gt; 48,</div><div class='add'>+						    MLX4_COMM_TIME))</div><div class='add'>+		goto err;</div><div class='add'>+	if (mlx4_comm_cmd(dev, MLX4_COMM_CMD_VHCR1, dma &gt;&gt; 32,</div><div class='add'>+						    MLX4_COMM_TIME))</div><div class='add'>+		goto err;</div><div class='add'>+	if (mlx4_comm_cmd(dev, MLX4_COMM_CMD_VHCR2, dma &gt;&gt; 16,</div><div class='add'>+						    MLX4_COMM_TIME))</div><div class='add'>+		goto err;</div><div class='add'>+	if (mlx4_comm_cmd(dev, MLX4_COMM_CMD_VHCR_EN, dma, MLX4_COMM_TIME))</div><div class='add'>+		goto err;</div><div class='add'>+	up(&amp;priv-&gt;cmd.slave_sem);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	mlx4_comm_cmd(dev, MLX4_COMM_CMD_RESET, 0, 0);</div><div class='add'>+	up(&amp;priv-&gt;cmd.slave_sem);</div><div class='add'>+	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx4_init_hca(struct mlx4_dev *dev)</div><div class='hunk'>@@ -768,56 +1095,76 @@ static int mlx4_init_hca(struct mlx4_dev *dev)</div><div class='ctx'> 	u64 icm_size;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = mlx4_QUERY_FW(dev);</div><div class='del'>-	if (err) {</div><div class='del'>-		if (err == -EACCES)</div><div class='del'>-			mlx4_info(dev, "non-primary physical function, skipping.\n");</div><div class='del'>-		else</div><div class='del'>-			mlx4_err(dev, "QUERY_FW command failed, aborting.\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (!mlx4_is_slave(dev)) {</div><div class='add'>+		err = mlx4_QUERY_FW(dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			if (err == -EACCES)</div><div class='add'>+				mlx4_info(dev, "non-primary physical function, skipping.\n");</div><div class='add'>+			else</div><div class='add'>+				mlx4_err(dev, "QUERY_FW command failed, aborting.\n");</div><div class='add'>+			goto unmap_bf;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	err = mlx4_load_fw(dev);</div><div class='del'>-	if (err) {</div><div class='del'>-		mlx4_err(dev, "Failed to start FW, aborting.\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+		err = mlx4_load_fw(dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			mlx4_err(dev, "Failed to start FW, aborting.\n");</div><div class='add'>+			goto unmap_bf;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	mlx4_cfg.log_pg_sz_m = 1;</div><div class='del'>-	mlx4_cfg.log_pg_sz = 0;</div><div class='del'>-	err = mlx4_MOD_STAT_CFG(dev, &amp;mlx4_cfg);</div><div class='del'>-	if (err)</div><div class='del'>-		mlx4_warn(dev, "Failed to override log_pg_sz parameter\n");</div><div class='add'>+		mlx4_cfg.log_pg_sz_m = 1;</div><div class='add'>+		mlx4_cfg.log_pg_sz = 0;</div><div class='add'>+		err = mlx4_MOD_STAT_CFG(dev, &amp;mlx4_cfg);</div><div class='add'>+		if (err)</div><div class='add'>+			mlx4_warn(dev, "Failed to override log_pg_sz parameter\n");</div><div class='ctx'> </div><div class='del'>-	err = mlx4_dev_cap(dev, &amp;dev_cap);</div><div class='del'>-	if (err) {</div><div class='del'>-		mlx4_err(dev, "QUERY_DEV_CAP command failed, aborting.\n");</div><div class='del'>-		goto err_stop_fw;</div><div class='del'>-	}</div><div class='add'>+		err = mlx4_dev_cap(dev, &amp;dev_cap);</div><div class='add'>+		if (err) {</div><div class='add'>+			mlx4_err(dev, "QUERY_DEV_CAP command failed, aborting.\n");</div><div class='add'>+			goto err_stop_fw;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	profile = default_profile;</div><div class='add'>+		profile = default_profile;</div><div class='ctx'> </div><div class='del'>-	icm_size = mlx4_make_profile(dev, &amp;profile, &amp;dev_cap, &amp;init_hca);</div><div class='del'>-	if ((long long) icm_size &lt; 0) {</div><div class='del'>-		err = icm_size;</div><div class='del'>-		goto err_stop_fw;</div><div class='del'>-	}</div><div class='add'>+		icm_size = mlx4_make_profile(dev, &amp;profile, &amp;dev_cap,</div><div class='add'>+					     &amp;init_hca);</div><div class='add'>+		if ((long long) icm_size &lt; 0) {</div><div class='add'>+			err = icm_size;</div><div class='add'>+			goto err_stop_fw;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (map_bf_area(dev))</div><div class='del'>-		mlx4_dbg(dev, "Failed to map blue flame area\n");</div><div class='add'>+		init_hca.log_uar_sz = ilog2(dev-&gt;caps.num_uars);</div><div class='add'>+		init_hca.uar_page_sz = PAGE_SHIFT - 12;</div><div class='ctx'> </div><div class='del'>-	init_hca.log_uar_sz = ilog2(dev-&gt;caps.num_uars);</div><div class='add'>+		err = mlx4_init_icm(dev, &amp;dev_cap, &amp;init_hca, icm_size);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_stop_fw;</div><div class='ctx'> </div><div class='del'>-	err = mlx4_init_icm(dev, &amp;dev_cap, &amp;init_hca, icm_size);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_stop_fw;</div><div class='add'>+		err = mlx4_INIT_HCA(dev, &amp;init_hca);</div><div class='add'>+		if (err) {</div><div class='add'>+			mlx4_err(dev, "INIT_HCA command failed, aborting.\n");</div><div class='add'>+			goto err_free_icm;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		err = mlx4_init_slave(dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			mlx4_err(dev, "Failed to initialize slave\n");</div><div class='add'>+			goto unmap_bf;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	err = mlx4_INIT_HCA(dev, &amp;init_hca);</div><div class='del'>-	if (err) {</div><div class='del'>-		mlx4_err(dev, "INIT_HCA command failed, aborting.\n");</div><div class='del'>-		goto err_free_icm;</div><div class='add'>+		err = mlx4_slave_cap(dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			mlx4_err(dev, "Failed to obtain slave caps\n");</div><div class='add'>+			goto err_close;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (map_bf_area(dev))</div><div class='add'>+		mlx4_dbg(dev, "Failed to map blue flame area\n");</div><div class='add'>+</div><div class='add'>+	/*Only the master set the ports, all the rest got it from it.*/</div><div class='add'>+	if (!mlx4_is_slave(dev))</div><div class='add'>+		mlx4_set_port_mask(dev);</div><div class='add'>+</div><div class='ctx'> 	err = mlx4_QUERY_ADAPTER(dev, &amp;adapter);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		mlx4_err(dev, "QUERY_ADAPTER command failed, aborting.\n");</div><div class='hunk'>@@ -830,16 +1177,19 @@ static int mlx4_init_hca(struct mlx4_dev *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_close:</div><div class='del'>-	mlx4_CLOSE_HCA(dev, 0);</div><div class='add'>+	mlx4_close_hca(dev);</div><div class='ctx'> </div><div class='ctx'> err_free_icm:</div><div class='del'>-	mlx4_free_icms(dev);</div><div class='add'>+	if (!mlx4_is_slave(dev))</div><div class='add'>+		mlx4_free_icms(dev);</div><div class='ctx'> </div><div class='ctx'> err_stop_fw:</div><div class='add'>+	if (!mlx4_is_slave(dev)) {</div><div class='add'>+		mlx4_UNMAP_FA(dev);</div><div class='add'>+		mlx4_free_icm(dev, priv-&gt;fw.fw_icm, 0);</div><div class='add'>+	}</div><div class='add'>+unmap_bf:</div><div class='ctx'> 	unmap_bf_area(dev);</div><div class='del'>-	mlx4_UNMAP_FA(dev);</div><div class='del'>-	mlx4_free_icm(dev, priv-&gt;fw.fw_icm, 0);</div><div class='del'>-</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -986,55 +1336,56 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)</div><div class='ctx'> 		goto err_srq_table_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = mlx4_init_mcg_table(dev);</div><div class='del'>-	if (err) {</div><div class='del'>-		mlx4_err(dev, "Failed to initialize "</div><div class='del'>-			 "multicast group table, aborting.\n");</div><div class='del'>-		goto err_qp_table_free;</div><div class='add'>+	if (!mlx4_is_slave(dev)) {</div><div class='add'>+		err = mlx4_init_mcg_table(dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			mlx4_err(dev, "Failed to initialize "</div><div class='add'>+				 "multicast group table, aborting.\n");</div><div class='add'>+			goto err_qp_table_free;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_init_counters_table(dev);</div><div class='ctx'> 	if (err &amp;&amp; err != -ENOENT) {</div><div class='ctx'> 		mlx4_err(dev, "Failed to initialize counters table, aborting.\n");</div><div class='del'>-		goto err_counters_table_free;</div><div class='add'>+		goto err_mcg_table_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (port = 1; port &lt;= dev-&gt;caps.num_ports; port++) {</div><div class='del'>-		enum mlx4_port_type port_type = 0;</div><div class='del'>-		mlx4_SENSE_PORT(dev, port, &amp;port_type);</div><div class='del'>-		if (port_type)</div><div class='del'>-			dev-&gt;caps.port_type[port] = port_type;</div><div class='del'>-		ib_port_default_caps = 0;</div><div class='del'>-		err = mlx4_get_port_ib_caps(dev, port, &amp;ib_port_default_caps);</div><div class='del'>-		if (err)</div><div class='del'>-			mlx4_warn(dev, "failed to get port %d default "</div><div class='del'>-				  "ib capabilities (%d). Continuing with "</div><div class='del'>-				  "caps = 0\n", port, err);</div><div class='del'>-		dev-&gt;caps.ib_port_def_cap[port] = ib_port_default_caps;</div><div class='del'>-</div><div class='del'>-		err = mlx4_check_ext_port_caps(dev, port);</div><div class='del'>-		if (err)</div><div class='del'>-			mlx4_warn(dev, "failed to get port %d extended "</div><div class='del'>-				  "port capabilities support info (%d)."</div><div class='del'>-				  " Assuming not supported\n", port, err);</div><div class='add'>+	if (!mlx4_is_slave(dev)) {</div><div class='add'>+		for (port = 1; port &lt;= dev-&gt;caps.num_ports; port++) {</div><div class='add'>+			ib_port_default_caps = 0;</div><div class='add'>+			err = mlx4_get_port_ib_caps(dev, port,</div><div class='add'>+						    &amp;ib_port_default_caps);</div><div class='add'>+			if (err)</div><div class='add'>+				mlx4_warn(dev, "failed to get port %d default "</div><div class='add'>+					  "ib capabilities (%d). Continuing "</div><div class='add'>+					  "with caps = 0\n", port, err);</div><div class='add'>+			dev-&gt;caps.ib_port_def_cap[port] = ib_port_default_caps;</div><div class='add'>+</div><div class='add'>+			err = mlx4_check_ext_port_caps(dev, port);</div><div class='add'>+			if (err)</div><div class='add'>+				mlx4_warn(dev, "failed to get port %d extended "</div><div class='add'>+					  "port capabilities support info (%d)."</div><div class='add'>+					  " Assuming not supported\n",</div><div class='add'>+					  port, err);</div><div class='ctx'> </div><div class='del'>-		err = mlx4_SET_PORT(dev, port);</div><div class='del'>-		if (err) {</div><div class='del'>-			mlx4_err(dev, "Failed to set port %d, aborting\n",</div><div class='del'>-				port);</div><div class='del'>-			goto err_mcg_table_free;</div><div class='add'>+			err = mlx4_SET_PORT(dev, port);</div><div class='add'>+			if (err) {</div><div class='add'>+				mlx4_err(dev, "Failed to set port %d, aborting\n",</div><div class='add'>+					port);</div><div class='add'>+				goto err_counters_table_free;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mlx4_set_port_mask(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err_mcg_table_free:</div><div class='del'>-	mlx4_cleanup_mcg_table(dev);</div><div class='del'>-</div><div class='ctx'> err_counters_table_free:</div><div class='ctx'> 	mlx4_cleanup_counters_table(dev);</div><div class='ctx'> </div><div class='add'>+err_mcg_table_free:</div><div class='add'>+	mlx4_cleanup_mcg_table(dev);</div><div class='add'>+</div><div class='ctx'> err_qp_table_free:</div><div class='ctx'> 	mlx4_cleanup_qp_table(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1081,8 +1432,16 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (msi_x) {</div><div class='del'>-		nreq = min_t(int, dev-&gt;caps.num_eqs - dev-&gt;caps.reserved_eqs,</div><div class='del'>-			     nreq);</div><div class='add'>+		/* In multifunction mode each function gets 2 msi-X vectors</div><div class='add'>+		 * one for data path completions anf the other for asynch events</div><div class='add'>+		 * or command completions */</div><div class='add'>+		if (mlx4_is_mfunc(dev)) {</div><div class='add'>+			nreq = 2;</div><div class='add'>+		} else {</div><div class='add'>+			nreq = min_t(int, dev-&gt;caps.num_eqs -</div><div class='add'>+				     dev-&gt;caps.reserved_eqs, nreq);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL);</div><div class='ctx'> 		if (!entries)</div><div class='ctx'> 			goto no_msi;</div><div class='hunk'>@@ -1138,16 +1497,24 @@ static int mlx4_init_port_info(struct mlx4_dev *dev, int port)</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;dev = dev;</div><div class='ctx'> 	info-&gt;port = port;</div><div class='del'>-	mlx4_init_mac_table(dev, &amp;info-&gt;mac_table);</div><div class='del'>-	mlx4_init_vlan_table(dev, &amp;info-&gt;vlan_table);</div><div class='del'>-	info-&gt;base_qpn = dev-&gt;caps.reserved_qps_base[MLX4_QP_REGION_ETH_ADDR] +</div><div class='add'>+	if (!mlx4_is_slave(dev)) {</div><div class='add'>+		INIT_RADIX_TREE(&amp;info-&gt;mac_tree, GFP_KERNEL);</div><div class='add'>+		mlx4_init_mac_table(dev, &amp;info-&gt;mac_table);</div><div class='add'>+		mlx4_init_vlan_table(dev, &amp;info-&gt;vlan_table);</div><div class='add'>+		info-&gt;base_qpn =</div><div class='add'>+			dev-&gt;caps.reserved_qps_base[MLX4_QP_REGION_ETH_ADDR] +</div><div class='ctx'> 			(port - 1) * (1 &lt;&lt; log_num_mac);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	sprintf(info-&gt;dev_name, "mlx4_port%d", port);</div><div class='ctx'> 	info-&gt;port_attr.attr.name = info-&gt;dev_name;</div><div class='del'>-	info-&gt;port_attr.attr.mode = S_IRUGO | S_IWUSR;</div><div class='add'>+	if (mlx4_is_mfunc(dev))</div><div class='add'>+		info-&gt;port_attr.attr.mode = S_IRUGO;</div><div class='add'>+	else {</div><div class='add'>+		info-&gt;port_attr.attr.mode = S_IRUGO | S_IWUSR;</div><div class='add'>+		info-&gt;port_attr.store     = set_port_type;</div><div class='add'>+	}</div><div class='ctx'> 	info-&gt;port_attr.show      = show_port_type;</div><div class='del'>-	info-&gt;port_attr.store     = set_port_type;</div><div class='ctx'> 	sysfs_attr_init(&amp;info-&gt;port_attr.attr);</div><div class='ctx'> </div><div class='ctx'> 	err = device_create_file(&amp;dev-&gt;pdev-&gt;dev, &amp;info-&gt;port_attr);</div><div class='hunk'>@@ -1220,6 +1587,46 @@ static void mlx4_clear_steering(struct mlx4_dev *dev)</div><div class='ctx'> 	kfree(priv-&gt;steer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int extended_func_num(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	return PCI_SLOT(pdev-&gt;devfn) * 8 + PCI_FUNC(pdev-&gt;devfn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MLX4_OWNER_BASE	0x8069c</div><div class='add'>+#define MLX4_OWNER_SIZE	4</div><div class='add'>+</div><div class='add'>+static int mlx4_get_ownership(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	void __iomem *owner;</div><div class='add'>+	u32 ret;</div><div class='add'>+</div><div class='add'>+	owner = ioremap(pci_resource_start(dev-&gt;pdev, 0) + MLX4_OWNER_BASE,</div><div class='add'>+			MLX4_OWNER_SIZE);</div><div class='add'>+	if (!owner) {</div><div class='add'>+		mlx4_err(dev, "Failed to obtain ownership bit\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = readl(owner);</div><div class='add'>+	iounmap(owner);</div><div class='add'>+	return (int) !!ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mlx4_free_ownership(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	void __iomem *owner;</div><div class='add'>+</div><div class='add'>+	owner = ioremap(pci_resource_start(dev-&gt;pdev, 0) + MLX4_OWNER_BASE,</div><div class='add'>+			MLX4_OWNER_SIZE);</div><div class='add'>+	if (!owner) {</div><div class='add'>+		mlx4_err(dev, "Failed to obtain ownership bit\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	writel(0, owner);</div><div class='add'>+	msleep(1000);</div><div class='add'>+	iounmap(owner);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_priv *priv;</div><div class='hunk'>@@ -1235,13 +1642,20 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 			"aborting.\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	if (num_vfs &gt; MLX4_MAX_NUM_VF) {</div><div class='add'>+		printk(KERN_ERR "There are more VF's (%d) than allowed(%d)\n",</div><div class='add'>+		       num_vfs, MLX4_MAX_NUM_VF);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	/*</div><div class='del'>-	 * Check for BARs.  We expect 0: 1MB</div><div class='add'>+	 * Check for BARs.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(pci_resource_flags(pdev, 0) &amp; IORESOURCE_MEM) ||</div><div class='del'>-	    pci_resource_len(pdev, 0) != 1 &lt;&lt; 20) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Missing DCS, aborting.\n");</div><div class='add'>+	if (((id == NULL) || !(id-&gt;driver_data &amp; MLX4_VF)) &amp;&amp;</div><div class='add'>+	    !(pci_resource_flags(pdev, 0) &amp; IORESOURCE_MEM)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Missing DCS, aborting."</div><div class='add'>+			"(id == 0X%p, id-&gt;driver_data: 0x%lx,"</div><div class='add'>+			" pci_resource_flags(pdev, 0):0x%lx)\n", id,</div><div class='add'>+			id ? id-&gt;driver_data : 0, pci_resource_flags(pdev, 0));</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto err_disable_pdev;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1305,42 +1719,132 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	mutex_init(&amp;priv-&gt;bf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;rev_id = pdev-&gt;revision;</div><div class='add'>+	/* Detect if this device is a virtual function */</div><div class='add'>+	if (id &amp;&amp; id-&gt;driver_data &amp; MLX4_VF) {</div><div class='add'>+		/* When acting as pf, we normally skip vfs unless explicitly</div><div class='add'>+		 * requested to probe them. */</div><div class='add'>+		if (num_vfs &amp;&amp; extended_func_num(pdev) &gt; probe_vf) {</div><div class='add'>+			mlx4_warn(dev, "Skipping virtual function:%d\n",</div><div class='add'>+						extended_func_num(pdev));</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			goto err_free_dev;</div><div class='add'>+		}</div><div class='add'>+		mlx4_warn(dev, "Detected virtual function - running in slave mode\n");</div><div class='add'>+		dev-&gt;flags |= MLX4_FLAG_SLAVE;</div><div class='add'>+	} else {</div><div class='add'>+		/* We reset the device and enable SRIOV only for physical</div><div class='add'>+		 * devices.  Try to claim ownership on the device;</div><div class='add'>+		 * if already taken, skip -- do not allow multiple PFs */</div><div class='add'>+		err = mlx4_get_ownership(dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto err_free_dev;</div><div class='add'>+			else {</div><div class='add'>+				mlx4_warn(dev, "Multiple PFs not yet supported."</div><div class='add'>+					  " Skipping PF.\n");</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto err_free_dev;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Now reset the HCA before we touch the PCI capabilities or</div><div class='del'>-	 * attempt a firmware command, since a boot ROM may have left</div><div class='del'>-	 * the HCA in an undefined state.</div><div class='del'>-	 */</div><div class='del'>-	err = mlx4_reset(dev);</div><div class='del'>-	if (err) {</div><div class='del'>-		mlx4_err(dev, "Failed to reset HCA, aborting.\n");</div><div class='del'>-		goto err_free_dev;</div><div class='add'>+		if (num_vfs) {</div><div class='add'>+			mlx4_warn(dev, "Enabling sriov with:%d vfs\n", num_vfs);</div><div class='add'>+			err = pci_enable_sriov(pdev, num_vfs);</div><div class='add'>+			if (err) {</div><div class='add'>+				mlx4_err(dev, "Failed to enable sriov,"</div><div class='add'>+					 "continuing without sriov enabled"</div><div class='add'>+					 " (err = %d).\n", err);</div><div class='add'>+				num_vfs = 0;</div><div class='add'>+				err = 0;</div><div class='add'>+			} else {</div><div class='add'>+				mlx4_warn(dev, "Running in master mode\n");</div><div class='add'>+				dev-&gt;flags |= MLX4_FLAG_SRIOV |</div><div class='add'>+					      MLX4_FLAG_MASTER;</div><div class='add'>+				dev-&gt;num_vfs = num_vfs;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Now reset the HCA before we touch the PCI capabilities or</div><div class='add'>+		 * attempt a firmware command, since a boot ROM may have left</div><div class='add'>+		 * the HCA in an undefined state.</div><div class='add'>+		 */</div><div class='add'>+		err = mlx4_reset(dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			mlx4_err(dev, "Failed to reset HCA, aborting.\n");</div><div class='add'>+			goto err_rel_own;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+slave_start:</div><div class='ctx'> 	if (mlx4_cmd_init(dev)) {</div><div class='ctx'> 		mlx4_err(dev, "Failed to init command interface, aborting.\n");</div><div class='del'>-		goto err_free_dev;</div><div class='add'>+		goto err_sriov;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In slave functions, the communication channel must be initialized</div><div class='add'>+	 * before posting commands. Also, init num_slaves before calling</div><div class='add'>+	 * mlx4_init_hca */</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		if (mlx4_is_master(dev))</div><div class='add'>+			dev-&gt;num_slaves = MLX4_MAX_NUM_SLAVES;</div><div class='add'>+		else {</div><div class='add'>+			dev-&gt;num_slaves = 0;</div><div class='add'>+			if (mlx4_multi_func_init(dev)) {</div><div class='add'>+				mlx4_err(dev, "Failed to init slave mfunc"</div><div class='add'>+					 " interface, aborting.\n");</div><div class='add'>+				goto err_cmd;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_init_hca(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_cmd;</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == -EACCES) {</div><div class='add'>+			/* Not primary Physical function</div><div class='add'>+			 * Running in slave mode */</div><div class='add'>+			mlx4_cmd_cleanup(dev);</div><div class='add'>+			dev-&gt;flags |= MLX4_FLAG_SLAVE;</div><div class='add'>+			dev-&gt;flags &amp;= ~MLX4_FLAG_MASTER;</div><div class='add'>+			goto slave_start;</div><div class='add'>+		} else</div><div class='add'>+			goto err_mfunc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In master functions, the communication channel must be initialized</div><div class='add'>+	 * after obtaining its address from fw */</div><div class='add'>+	if (mlx4_is_master(dev)) {</div><div class='add'>+		if (mlx4_multi_func_init(dev)) {</div><div class='add'>+			mlx4_err(dev, "Failed to init master mfunc"</div><div class='add'>+				 "interface, aborting.\n");</div><div class='add'>+			goto err_close;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_alloc_eq_table(dev);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err_close;</div><div class='add'>+		goto err_master_mfunc;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;msix_ctl.pool_bm = 0;</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;msix_ctl.pool_lock);</div><div class='ctx'> </div><div class='ctx'> 	mlx4_enable_msi_x(dev);</div><div class='del'>-</div><div class='del'>-	err = mlx4_init_steering(dev);</div><div class='del'>-	if (err)</div><div class='add'>+	if ((mlx4_is_mfunc(dev)) &amp;&amp;</div><div class='add'>+	    !(dev-&gt;flags &amp; MLX4_FLAG_MSI_X)) {</div><div class='add'>+		mlx4_err(dev, "INTx is not supported in multi-function mode."</div><div class='add'>+			 " aborting.\n");</div><div class='ctx'> 		goto err_free_eq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mlx4_is_slave(dev)) {</div><div class='add'>+		err = mlx4_init_steering(dev);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_free_eq;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_setup_hca(dev);</div><div class='del'>-	if (err == -EBUSY &amp;&amp; (dev-&gt;flags &amp; MLX4_FLAG_MSI_X)) {</div><div class='add'>+	if (err == -EBUSY &amp;&amp; (dev-&gt;flags &amp; MLX4_FLAG_MSI_X) &amp;&amp;</div><div class='add'>+	    !mlx4_is_mfunc(dev)) {</div><div class='ctx'> 		dev-&gt;flags &amp;= ~MLX4_FLAG_MSI_X;</div><div class='ctx'> 		pci_disable_msix(pdev);</div><div class='ctx'> 		err = mlx4_setup_hca(dev);</div><div class='hunk'>@@ -1383,20 +1887,37 @@ err_port:</div><div class='ctx'> 	mlx4_cleanup_uar_table(dev);</div><div class='ctx'> </div><div class='ctx'> err_steer:</div><div class='del'>-	mlx4_clear_steering(dev);</div><div class='add'>+	if (!mlx4_is_slave(dev))</div><div class='add'>+		mlx4_clear_steering(dev);</div><div class='ctx'> </div><div class='ctx'> err_free_eq:</div><div class='ctx'> 	mlx4_free_eq_table(dev);</div><div class='ctx'> </div><div class='add'>+err_master_mfunc:</div><div class='add'>+	if (mlx4_is_master(dev))</div><div class='add'>+		mlx4_multi_func_cleanup(dev);</div><div class='add'>+</div><div class='ctx'> err_close:</div><div class='ctx'> 	if (dev-&gt;flags &amp; MLX4_FLAG_MSI_X)</div><div class='ctx'> 		pci_disable_msix(pdev);</div><div class='ctx'> </div><div class='ctx'> 	mlx4_close_hca(dev);</div><div class='ctx'> </div><div class='add'>+err_mfunc:</div><div class='add'>+	if (mlx4_is_slave(dev))</div><div class='add'>+		mlx4_multi_func_cleanup(dev);</div><div class='add'>+</div><div class='ctx'> err_cmd:</div><div class='ctx'> 	mlx4_cmd_cleanup(dev);</div><div class='ctx'> </div><div class='add'>+err_sriov:</div><div class='add'>+	if (num_vfs &amp;&amp; (dev-&gt;flags &amp; MLX4_FLAG_SRIOV))</div><div class='add'>+		pci_disable_sriov(pdev);</div><div class='add'>+</div><div class='add'>+err_rel_own:</div><div class='add'>+	if (!mlx4_is_slave(dev))</div><div class='add'>+		mlx4_free_ownership(dev);</div><div class='add'>+</div><div class='ctx'> err_free_dev:</div><div class='ctx'> 	kfree(priv);</div><div class='ctx'> </div><div class='hunk'>@@ -1424,6 +1945,12 @@ static void mlx4_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 	int p;</div><div class='ctx'> </div><div class='ctx'> 	if (dev) {</div><div class='add'>+		/* in SRIOV it is not allowed to unload the pf's</div><div class='add'>+		 * driver while there are alive vf's */</div><div class='add'>+		if (mlx4_is_master(dev)) {</div><div class='add'>+			if (mlx4_how_many_lives_vf(dev))</div><div class='add'>+				printk(KERN_ERR "Removing PF when there are assigned VF's !!!\n");</div><div class='add'>+		}</div><div class='ctx'> 		mlx4_stop_sense(dev);</div><div class='ctx'> 		mlx4_unregister_device(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1443,17 +1970,31 @@ static void mlx4_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 		mlx4_cleanup_xrcd_table(dev);</div><div class='ctx'> 		mlx4_cleanup_pd_table(dev);</div><div class='ctx'> </div><div class='add'>+		if (mlx4_is_master(dev))</div><div class='add'>+			mlx4_free_resource_tracker(dev);</div><div class='add'>+</div><div class='ctx'> 		iounmap(priv-&gt;kar);</div><div class='ctx'> 		mlx4_uar_free(dev, &amp;priv-&gt;driver_uar);</div><div class='ctx'> 		mlx4_cleanup_uar_table(dev);</div><div class='del'>-		mlx4_clear_steering(dev);</div><div class='add'>+		if (!mlx4_is_slave(dev))</div><div class='add'>+			mlx4_clear_steering(dev);</div><div class='ctx'> 		mlx4_free_eq_table(dev);</div><div class='add'>+		if (mlx4_is_master(dev))</div><div class='add'>+			mlx4_multi_func_cleanup(dev);</div><div class='ctx'> 		mlx4_close_hca(dev);</div><div class='add'>+		if (mlx4_is_slave(dev))</div><div class='add'>+			mlx4_multi_func_cleanup(dev);</div><div class='ctx'> 		mlx4_cmd_cleanup(dev);</div><div class='ctx'> </div><div class='ctx'> 		if (dev-&gt;flags &amp; MLX4_FLAG_MSI_X)</div><div class='ctx'> 			pci_disable_msix(pdev);</div><div class='add'>+		if (num_vfs &amp;&amp; (dev-&gt;flags &amp; MLX4_FLAG_SRIOV)) {</div><div class='add'>+			mlx4_warn(dev, "Disabling sriov\n");</div><div class='add'>+			pci_disable_sriov(pdev);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		if (!mlx4_is_slave(dev))</div><div class='add'>+			mlx4_free_ownership(dev);</div><div class='ctx'> 		kfree(priv);</div><div class='ctx'> 		pci_release_regions(pdev);</div><div class='ctx'> 		pci_disable_device(pdev);</div><div class='hunk'>@@ -1468,33 +2009,48 @@ int mlx4_restart_one(struct pci_dev *pdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(mlx4_pci_table) = {</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x6340) }, /* MT25408 "Hermon" SDR */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x634a) }, /* MT25408 "Hermon" DDR */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x6354) }, /* MT25408 "Hermon" QDR */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x6732) }, /* MT25408 "Hermon" DDR PCIe gen2 */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x673c) }, /* MT25408 "Hermon" QDR PCIe gen2 */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x6368) }, /* MT25408 "Hermon" EN 10GigE */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x6750) }, /* MT25408 "Hermon" EN 10GigE PCIe gen2 */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x6372) }, /* MT25458 ConnectX EN 10GBASE-T 10GigE */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x675a) }, /* MT25458 ConnectX EN 10GBASE-T+Gen2 10GigE */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x6764) }, /* MT26468 ConnectX EN 10GigE PCIe gen2*/</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x6746) }, /* MT26438 ConnectX EN 40GigE PCIe gen2 5GT/s */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x676e) }, /* MT26478 ConnectX2 40GigE PCIe gen2 */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x1002) }, /* MT25400 Family [ConnectX-2 Virtual Function] */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x1003) }, /* MT27500 Family [ConnectX-3] */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x1004) }, /* MT27500 Family [ConnectX-3 Virtual Function] */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x1005) }, /* MT27510 Family */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x1006) }, /* MT27511 Family */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x1007) }, /* MT27520 Family */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x1008) }, /* MT27521 Family */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x1009) }, /* MT27530 Family */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x100a) }, /* MT27531 Family */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x100b) }, /* MT27540 Family */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x100c) }, /* MT27541 Family */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x100d) }, /* MT27550 Family */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x100e) }, /* MT27551 Family */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x100f) }, /* MT27560 Family */</div><div class='del'>-	{ PCI_VDEVICE(MELLANOX, 0x1010) }, /* MT27561 Family */</div><div class='add'>+	/* MT25408 "Hermon" SDR */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x6340), 0 },</div><div class='add'>+	/* MT25408 "Hermon" DDR */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x634a), 0 },</div><div class='add'>+	/* MT25408 "Hermon" QDR */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x6354), 0 },</div><div class='add'>+	/* MT25408 "Hermon" DDR PCIe gen2 */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x6732), 0 },</div><div class='add'>+	/* MT25408 "Hermon" QDR PCIe gen2 */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x673c), 0 },</div><div class='add'>+	/* MT25408 "Hermon" EN 10GigE */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x6368), 0 },</div><div class='add'>+	/* MT25408 "Hermon" EN 10GigE PCIe gen2 */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x6750), 0 },</div><div class='add'>+	/* MT25458 ConnectX EN 10GBASE-T 10GigE */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x6372), 0 },</div><div class='add'>+	/* MT25458 ConnectX EN 10GBASE-T+Gen2 10GigE */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x675a), 0 },</div><div class='add'>+	/* MT26468 ConnectX EN 10GigE PCIe gen2*/</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x6764), 0 },</div><div class='add'>+	/* MT26438 ConnectX EN 40GigE PCIe gen2 5GT/s */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x6746), 0 },</div><div class='add'>+	/* MT26478 ConnectX2 40GigE PCIe gen2 */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x676e), 0 },</div><div class='add'>+	/* MT25400 Family [ConnectX-2 Virtual Function] */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x1002), MLX4_VF },</div><div class='add'>+	/* MT27500 Family [ConnectX-3] */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x1003), 0 },</div><div class='add'>+	/* MT27500 Family [ConnectX-3 Virtual Function] */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x1004), MLX4_VF },</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x1005), 0 }, /* MT27510 Family */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x1006), 0 }, /* MT27511 Family */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x1007), 0 }, /* MT27520 Family */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x1008), 0 }, /* MT27521 Family */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x1009), 0 }, /* MT27530 Family */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x100a), 0 }, /* MT27531 Family */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x100b), 0 }, /* MT27540 Family */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x100c), 0 }, /* MT27541 Family */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x100d), 0 }, /* MT27550 Family */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x100e), 0 }, /* MT27551 Family */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x100f), 0 }, /* MT27560 Family */</div><div class='add'>+	{ PCI_VDEVICE(MELLANOX, 0x1010), 0 }, /* MT27561 Family */</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1523,6 +2079,12 @@ static int __init mlx4_verify_params(void)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Check if module param for ports type has legal combination */</div><div class='add'>+	if (port_type_array[0] == false &amp;&amp; port_type_array[1] == true) {</div><div class='add'>+		printk(KERN_WARNING "Module parameter configuration ETH/IB is not supported. Switching to default configuration IB/IB\n");</div><div class='add'>+		port_type_array[0] = true;</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/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c<br/>index 978688c31046..0785d9b2a265 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/mcg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/mcg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/mcg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/mcg.c</a></div><div class='hunk'>@@ -44,28 +44,47 @@</div><div class='ctx'> </div><div class='ctx'> static const u8 zero_gid[16];	/* automatically initialized to 0 */</div><div class='ctx'> </div><div class='add'>+struct mlx4_mgm {</div><div class='add'>+	__be32			next_gid_index;</div><div class='add'>+	__be32			members_count;</div><div class='add'>+	u32			reserved[2];</div><div class='add'>+	u8			gid[16];</div><div class='add'>+	__be32			qp[MLX4_MAX_QP_PER_MGM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int mlx4_get_mgm_entry_size(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return min((1 &lt;&lt; mlx4_log_num_mgm_entry_size), MLX4_MAX_MGM_ENTRY_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_get_qp_per_mgm(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return 4 * (mlx4_get_mgm_entry_size(dev) / 16 - 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mlx4_READ_ENTRY(struct mlx4_dev *dev, int index,</div><div class='ctx'> 			   struct mlx4_cmd_mailbox *mailbox)</div><div class='ctx'> {</div><div class='ctx'> 	return mlx4_cmd_box(dev, 0, mailbox-&gt;dma, index, 0, MLX4_CMD_READ_MCG,</div><div class='del'>-			    MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+			    MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx4_WRITE_ENTRY(struct mlx4_dev *dev, int index,</div><div class='ctx'> 			    struct mlx4_cmd_mailbox *mailbox)</div><div class='ctx'> {</div><div class='ctx'> 	return mlx4_cmd(dev, mailbox-&gt;dma, index, 0, MLX4_CMD_WRITE_MCG,</div><div class='del'>-			MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+			MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx4_WRITE_PROMISC(struct mlx4_dev *dev, u8 vep_num, u8 port, u8 steer,</div><div class='add'>+static int mlx4_WRITE_PROMISC(struct mlx4_dev *dev, u8 port, u8 steer,</div><div class='ctx'> 			      struct mlx4_cmd_mailbox *mailbox)</div><div class='ctx'> {</div><div class='ctx'> 	u32 in_mod;</div><div class='ctx'> </div><div class='del'>-	in_mod = (u32) vep_num &lt;&lt; 24 | (u32) port &lt;&lt; 16 | steer &lt;&lt; 1;</div><div class='add'>+	in_mod = (u32) port &lt;&lt; 16 | steer &lt;&lt; 1;</div><div class='ctx'> 	return mlx4_cmd(dev, mailbox-&gt;dma, in_mod, 0x1,</div><div class='del'>-			MLX4_CMD_WRITE_MCG, MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+			MLX4_CMD_WRITE_MCG, MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+			MLX4_CMD_NATIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx4_GID_HASH(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,</div><div class='hunk'>@@ -75,7 +94,8 @@ static int mlx4_GID_HASH(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_cmd_imm(dev, mailbox-&gt;dma, &amp;imm, 0, op_mod,</div><div class='del'>-			   MLX4_CMD_MGID_HASH, MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+			   MLX4_CMD_MGID_HASH, MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+			   MLX4_CMD_NATIVE);</div><div class='ctx'> </div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		*hash = imm;</div><div class='hunk'>@@ -102,7 +122,7 @@ static struct mlx4_promisc_qp *get_promisc_qp(struct mlx4_dev *dev, u8 pf_num,</div><div class='ctx'>  * Add new entry to steering data structure.</div><div class='ctx'>  * All promisc QPs should be added as well</div><div class='ctx'>  */</div><div class='del'>-static int new_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='add'>+static int new_steering_entry(struct mlx4_dev *dev, u8 port,</div><div class='ctx'> 			      enum mlx4_steer_type steer,</div><div class='ctx'> 			      unsigned int index, u32 qpn)</div><div class='ctx'> {</div><div class='hunk'>@@ -115,10 +135,8 @@ static int new_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='ctx'> 	struct mlx4_promisc_qp *dqp = NULL;</div><div class='ctx'> 	u32 prot;</div><div class='ctx'> 	int err;</div><div class='del'>-	u8 pf_num;</div><div class='ctx'> </div><div class='del'>-	pf_num = (dev-&gt;caps.num_ports == 1) ? vep_num : (vep_num &lt;&lt; 1) | (port - 1);</div><div class='del'>-	s_steer = &amp;mlx4_priv(dev)-&gt;steer[pf_num];</div><div class='add'>+	s_steer = &amp;mlx4_priv(dev)-&gt;steer[0];</div><div class='ctx'> 	new_entry = kzalloc(sizeof *new_entry, GFP_KERNEL);</div><div class='ctx'> 	if (!new_entry)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -130,7 +148,7 @@ static int new_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='ctx'> 	/* If the given qpn is also a promisc qp,</div><div class='ctx'> 	 * it should be inserted to duplicates list</div><div class='ctx'> 	 */</div><div class='del'>-	pqp = get_promisc_qp(dev, pf_num, steer, qpn);</div><div class='add'>+	pqp = get_promisc_qp(dev, 0, steer, qpn);</div><div class='ctx'> 	if (pqp) {</div><div class='ctx'> 		dqp = kmalloc(sizeof *dqp, GFP_KERNEL);</div><div class='ctx'> 		if (!dqp) {</div><div class='hunk'>@@ -165,7 +183,7 @@ static int new_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='ctx'> 		/* don't add already existing qpn */</div><div class='ctx'> 		if (pqp-&gt;qpn == qpn)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (members_count == MLX4_QP_PER_MGM) {</div><div class='add'>+		if (members_count == dev-&gt;caps.num_qp_per_mgm) {</div><div class='ctx'> 			/* out of space */</div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			goto out_mailbox;</div><div class='hunk'>@@ -193,7 +211,7 @@ out_alloc:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* update the data structures with existing steering entry */</div><div class='del'>-static int existing_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='add'>+static int existing_steering_entry(struct mlx4_dev *dev, u8 port,</div><div class='ctx'> 				   enum mlx4_steer_type steer,</div><div class='ctx'> 				   unsigned int index, u32 qpn)</div><div class='ctx'> {</div><div class='hunk'>@@ -201,12 +219,10 @@ static int existing_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='ctx'> 	struct mlx4_steer_index *tmp_entry, *entry = NULL;</div><div class='ctx'> 	struct mlx4_promisc_qp *pqp;</div><div class='ctx'> 	struct mlx4_promisc_qp *dqp;</div><div class='del'>-	u8 pf_num;</div><div class='ctx'> </div><div class='del'>-	pf_num = (dev-&gt;caps.num_ports == 1) ? vep_num : (vep_num &lt;&lt; 1) | (port - 1);</div><div class='del'>-	s_steer = &amp;mlx4_priv(dev)-&gt;steer[pf_num];</div><div class='add'>+	s_steer = &amp;mlx4_priv(dev)-&gt;steer[0];</div><div class='ctx'> </div><div class='del'>-	pqp = get_promisc_qp(dev, pf_num, steer, qpn);</div><div class='add'>+	pqp = get_promisc_qp(dev, 0, steer, qpn);</div><div class='ctx'> 	if (!pqp)</div><div class='ctx'> 		return 0; /* nothing to do */</div><div class='ctx'> </div><div class='hunk'>@@ -225,7 +241,7 @@ static int existing_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='ctx'> 	 * we need to add it as a duplicate to this entry</div><div class='ctx'> 	 * for future references */</div><div class='ctx'> 	list_for_each_entry(dqp, &amp;entry-&gt;duplicates, list) {</div><div class='del'>-		if (qpn == dqp-&gt;qpn)</div><div class='add'>+		if (qpn == pqp-&gt;qpn)</div><div class='ctx'> 			return 0; /* qp is already duplicated */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -241,20 +257,18 @@ static int existing_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='ctx'> </div><div class='ctx'> /* Check whether a qpn is a duplicate on steering entry</div><div class='ctx'>  * If so, it should not be removed from mgm */</div><div class='del'>-static bool check_duplicate_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='add'>+static bool check_duplicate_entry(struct mlx4_dev *dev, u8 port,</div><div class='ctx'> 				  enum mlx4_steer_type steer,</div><div class='ctx'> 				  unsigned int index, u32 qpn)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_steer *s_steer;</div><div class='ctx'> 	struct mlx4_steer_index *tmp_entry, *entry = NULL;</div><div class='ctx'> 	struct mlx4_promisc_qp *dqp, *tmp_dqp;</div><div class='del'>-	u8 pf_num;</div><div class='ctx'> </div><div class='del'>-	pf_num = (dev-&gt;caps.num_ports == 1) ? vep_num : (vep_num &lt;&lt; 1) | (port - 1);</div><div class='del'>-	s_steer = &amp;mlx4_priv(dev)-&gt;steer[pf_num];</div><div class='add'>+	s_steer = &amp;mlx4_priv(dev)-&gt;steer[0];</div><div class='ctx'> </div><div class='ctx'> 	/* if qp is not promisc, it cannot be duplicated */</div><div class='del'>-	if (!get_promisc_qp(dev, pf_num, steer, qpn))</div><div class='add'>+	if (!get_promisc_qp(dev, 0, steer, qpn))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* The qp is promisc qp so it is a duplicate on this index</div><div class='hunk'>@@ -279,7 +293,7 @@ static bool check_duplicate_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* I a steering entry contains only promisc QPs, it can be removed. */</div><div class='del'>-static bool can_remove_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='add'>+static bool can_remove_steering_entry(struct mlx4_dev *dev, u8 port,</div><div class='ctx'> 				      enum mlx4_steer_type steer,</div><div class='ctx'> 				      unsigned int index, u32 tqpn)</div><div class='ctx'> {</div><div class='hunk'>@@ -291,10 +305,8 @@ static bool can_remove_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='ctx'> 	u32 members_count;</div><div class='ctx'> 	bool ret = false;</div><div class='ctx'> 	int i;</div><div class='del'>-	u8 pf_num;</div><div class='ctx'> </div><div class='del'>-	pf_num = (dev-&gt;caps.num_ports == 1) ? vep_num : (vep_num &lt;&lt; 1) | (port - 1);</div><div class='del'>-	s_steer = &amp;mlx4_priv(dev)-&gt;steer[pf_num];</div><div class='add'>+	s_steer = &amp;mlx4_priv(dev)-&gt;steer[0];</div><div class='ctx'> </div><div class='ctx'> 	mailbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='ctx'> 	if (IS_ERR(mailbox))</div><div class='hunk'>@@ -306,7 +318,7 @@ static bool can_remove_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='ctx'> 	members_count = be32_to_cpu(mgm-&gt;members_count) &amp; 0xffffff;</div><div class='ctx'> 	for (i = 0;  i &lt; members_count; i++) {</div><div class='ctx'> 		qpn = be32_to_cpu(mgm-&gt;qp[i]) &amp; MGM_QPN_MASK;</div><div class='del'>-		if (!get_promisc_qp(dev, pf_num, steer, qpn) &amp;&amp; qpn != tqpn) {</div><div class='add'>+		if (!get_promisc_qp(dev, 0, steer, qpn) &amp;&amp; qpn != tqpn) {</div><div class='ctx'> 			/* the qp is not promisc, the entry can't be removed */</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -332,7 +344,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int add_promisc_qp(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='add'>+static int add_promisc_qp(struct mlx4_dev *dev, u8 port,</div><div class='ctx'> 			  enum mlx4_steer_type steer, u32 qpn)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_steer *s_steer;</div><div class='hunk'>@@ -347,14 +359,13 @@ static int add_promisc_qp(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='ctx'> 	bool found;</div><div class='ctx'> 	int last_index;</div><div class='ctx'> 	int err;</div><div class='del'>-	u8 pf_num;</div><div class='ctx'> 	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='del'>-	pf_num = (dev-&gt;caps.num_ports == 1) ? vep_num : (vep_num &lt;&lt; 1) | (port - 1);</div><div class='del'>-	s_steer = &amp;mlx4_priv(dev)-&gt;steer[pf_num];</div><div class='add'>+</div><div class='add'>+	s_steer = &amp;mlx4_priv(dev)-&gt;steer[0];</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mcg_table.mutex);</div><div class='ctx'> </div><div class='del'>-	if (get_promisc_qp(dev, pf_num, steer, qpn)) {</div><div class='add'>+	if (get_promisc_qp(dev, 0, steer, qpn)) {</div><div class='ctx'> 		err = 0;  /* Noting to do, already exists */</div><div class='ctx'> 		goto out_mutex;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -397,7 +408,7 @@ static int add_promisc_qp(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!found) {</div><div class='ctx'> 			/* Need to add the qpn to mgm */</div><div class='del'>-			if (members_count == MLX4_QP_PER_MGM) {</div><div class='add'>+			if (members_count == dev-&gt;caps.num_qp_per_mgm) {</div><div class='ctx'> 				/* entry is full */</div><div class='ctx'> 				err = -ENOMEM;</div><div class='ctx'> 				goto out_mailbox;</div><div class='hunk'>@@ -420,7 +431,7 @@ static int add_promisc_qp(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='ctx'> 		mgm-&gt;qp[members_count++] = cpu_to_be32(dqp-&gt;qpn &amp; MGM_QPN_MASK);</div><div class='ctx'> 	mgm-&gt;members_count = cpu_to_be32(members_count | MLX4_PROT_ETH &lt;&lt; 30);</div><div class='ctx'> </div><div class='del'>-	err = mlx4_WRITE_PROMISC(dev, vep_num, port, steer, mailbox);</div><div class='add'>+	err = mlx4_WRITE_PROMISC(dev, port, steer, mailbox);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_list;</div><div class='ctx'> </div><div class='hunk'>@@ -439,7 +450,7 @@ out_mutex:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int remove_promisc_qp(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='add'>+static int remove_promisc_qp(struct mlx4_dev *dev, u8 port,</div><div class='ctx'> 			     enum mlx4_steer_type steer, u32 qpn)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='hunk'>@@ -454,13 +465,11 @@ static int remove_promisc_qp(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='ctx'> 	bool back_to_list = false;</div><div class='ctx'> 	int loc, i;</div><div class='ctx'> 	int err;</div><div class='del'>-	u8 pf_num;</div><div class='ctx'> </div><div class='del'>-	pf_num = (dev-&gt;caps.num_ports == 1) ? vep_num : (vep_num &lt;&lt; 1) | (port - 1);</div><div class='del'>-	s_steer = &amp;mlx4_priv(dev)-&gt;steer[pf_num];</div><div class='add'>+	s_steer = &amp;mlx4_priv(dev)-&gt;steer[0];</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mcg_table.mutex);</div><div class='ctx'> </div><div class='del'>-	pqp = get_promisc_qp(dev, pf_num, steer, qpn);</div><div class='add'>+	pqp = get_promisc_qp(dev, 0, steer, qpn);</div><div class='ctx'> 	if (unlikely(!pqp)) {</div><div class='ctx'> 		mlx4_warn(dev, "QP %x is not promiscuous QP\n", qpn);</div><div class='ctx'> 		/* nothing to do */</div><div class='hunk'>@@ -479,12 +488,13 @@ static int remove_promisc_qp(struct mlx4_dev *dev, u8 vep_num, u8 port,</div><div class='ctx'> 		goto out_list;</div><div class='ctx'> 	}</div><div class='ctx'> 	mgm = mailbox-&gt;buf;</div><div class='add'>+	memset(mgm, 0, sizeof *mgm);</div><div class='ctx'> 	members_count = 0;</div><div class='ctx'> 	list_for_each_entry(dqp, &amp;s_steer-&gt;promisc_qps[steer], list)</div><div class='ctx'> 		mgm-&gt;qp[members_count++] = cpu_to_be32(dqp-&gt;qpn &amp; MGM_QPN_MASK);</div><div class='ctx'> 	mgm-&gt;members_count = cpu_to_be32(members_count | MLX4_PROT_ETH &lt;&lt; 30);</div><div class='ctx'> </div><div class='del'>-	err = mlx4_WRITE_PROMISC(dev, vep_num, port, steer, mailbox);</div><div class='add'>+	err = mlx4_WRITE_PROMISC(dev, port, steer, mailbox);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_mailbox;</div><div class='ctx'> </div><div class='hunk'>@@ -649,12 +659,13 @@ int mlx4_qp_attach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],</div><div class='ctx'> 		}</div><div class='ctx'> 		index += dev-&gt;caps.num_mgms;</div><div class='ctx'> </div><div class='add'>+		new_entry = 1;</div><div class='ctx'> 		memset(mgm, 0, sizeof *mgm);</div><div class='ctx'> 		memcpy(mgm-&gt;gid, gid, 16);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	members_count = be32_to_cpu(mgm-&gt;members_count) &amp; 0xffffff;</div><div class='del'>-	if (members_count == MLX4_QP_PER_MGM) {</div><div class='add'>+	if (members_count == dev-&gt;caps.num_qp_per_mgm) {</div><div class='ctx'> 		mlx4_err(dev, "MGM at index %x is full.\n", index);</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -696,9 +707,9 @@ out:</div><div class='ctx'> 	if (prot == MLX4_PROT_ETH) {</div><div class='ctx'> 		/* manage the steering entry for promisc mode */</div><div class='ctx'> 		if (new_entry)</div><div class='del'>-			new_steering_entry(dev, 0, port, steer, index, qp-&gt;qpn);</div><div class='add'>+			new_steering_entry(dev, port, steer, index, qp-&gt;qpn);</div><div class='ctx'> 		else</div><div class='del'>-			existing_steering_entry(dev, 0, port, steer,</div><div class='add'>+			existing_steering_entry(dev, port, steer,</div><div class='ctx'> 						index, qp-&gt;qpn);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (err &amp;&amp; link &amp;&amp; index != -1) {</div><div class='hunk'>@@ -749,7 +760,7 @@ int mlx4_qp_detach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],</div><div class='ctx'> </div><div class='ctx'> 	/* if this pq is also a promisc qp, it shouldn't be removed */</div><div class='ctx'> 	if (prot == MLX4_PROT_ETH &amp;&amp;</div><div class='del'>-	    check_duplicate_entry(dev, 0, port, steer, index, qp-&gt;qpn))</div><div class='add'>+	    check_duplicate_entry(dev, port, steer, index, qp-&gt;qpn))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	members_count = be32_to_cpu(mgm-&gt;members_count) &amp; 0xffffff;</div><div class='hunk'>@@ -769,7 +780,8 @@ int mlx4_qp_detach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],</div><div class='ctx'> 	mgm-&gt;qp[i - 1]     = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (prot == MLX4_PROT_ETH)</div><div class='del'>-		removed_entry = can_remove_steering_entry(dev, 0, port, steer, index, qp-&gt;qpn);</div><div class='add'>+		removed_entry = can_remove_steering_entry(dev, port, steer,</div><div class='add'>+								index, qp-&gt;qpn);</div><div class='ctx'> 	if (i != 1 &amp;&amp; (prot != MLX4_PROT_ETH || !removed_entry)) {</div><div class='ctx'> 		err = mlx4_WRITE_ENTRY(dev, index, mailbox);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -828,6 +840,34 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mlx4_QP_ATTACH(struct mlx4_dev *dev, struct mlx4_qp *qp,</div><div class='add'>+			  u8 gid[16], u8 attach, u8 block_loopback,</div><div class='add'>+			  enum mlx4_protocol prot)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_cmd_mailbox *mailbox;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int qpn;</div><div class='add'>+</div><div class='add'>+	if (!mlx4_is_mfunc(dev))</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	mailbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='add'>+	if (IS_ERR(mailbox))</div><div class='add'>+		return PTR_ERR(mailbox);</div><div class='add'>+</div><div class='add'>+	memcpy(mailbox-&gt;buf, gid, 16);</div><div class='add'>+	qpn = qp-&gt;qpn;</div><div class='add'>+	qpn |= (prot &lt;&lt; 28);</div><div class='add'>+	if (attach &amp;&amp; block_loopback)</div><div class='add'>+		qpn |= (1 &lt;&lt; 31);</div><div class='add'>+</div><div class='add'>+	err = mlx4_cmd(dev, mailbox-&gt;dma, qpn, attach,</div><div class='add'>+		       MLX4_CMD_QP_ATTACH, MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+		       MLX4_CMD_WRAPPED);</div><div class='add'>+</div><div class='add'>+	mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],</div><div class='ctx'> 			  int block_mcast_loopback, enum mlx4_protocol prot)</div><div class='hunk'>@@ -843,9 +883,12 @@ int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],</div><div class='ctx'> 	if (prot == MLX4_PROT_ETH)</div><div class='ctx'> 		gid[7] |= (steer &lt;&lt; 1);</div><div class='ctx'> </div><div class='del'>-	return mlx4_qp_attach_common(dev, qp, gid,</div><div class='del'>-				     block_mcast_loopback, prot,</div><div class='del'>-				     steer);</div><div class='add'>+	if (mlx4_is_mfunc(dev))</div><div class='add'>+		return mlx4_QP_ATTACH(dev, qp, gid, 1,</div><div class='add'>+					block_mcast_loopback, prot);</div><div class='add'>+</div><div class='add'>+	return mlx4_qp_attach_common(dev, qp, gid, block_mcast_loopback,</div><div class='add'>+					prot, steer);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_multicast_attach);</div><div class='ctx'> </div><div class='hunk'>@@ -860,22 +903,90 @@ int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],</div><div class='ctx'> 			!(dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_MC_STEER))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (prot == MLX4_PROT_ETH) {</div><div class='add'>+	if (prot == MLX4_PROT_ETH)</div><div class='ctx'> 		gid[7] |= (steer &lt;&lt; 1);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev))</div><div class='add'>+		return mlx4_QP_ATTACH(dev, qp, gid, 0, 0, prot);</div><div class='ctx'> </div><div class='ctx'> 	return mlx4_qp_detach_common(dev, qp, gid, prot, steer);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_multicast_detach);</div><div class='ctx'> </div><div class='add'>+int mlx4_unicast_attach(struct mlx4_dev *dev,</div><div class='add'>+			struct mlx4_qp *qp, u8 gid[16],</div><div class='add'>+			int block_mcast_loopback, enum mlx4_protocol prot)</div><div class='add'>+{</div><div class='add'>+	if (prot == MLX4_PROT_ETH &amp;&amp;</div><div class='add'>+			!(dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_UC_STEER))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (prot == MLX4_PROT_ETH)</div><div class='add'>+		gid[7] |= (MLX4_UC_STEER &lt;&lt; 1);</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev))</div><div class='add'>+		return mlx4_QP_ATTACH(dev, qp, gid, 1,</div><div class='add'>+					block_mcast_loopback, prot);</div><div class='add'>+</div><div class='add'>+	return mlx4_qp_attach_common(dev, qp, gid, block_mcast_loopback,</div><div class='add'>+					prot, MLX4_UC_STEER);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mlx4_unicast_attach);</div><div class='add'>+</div><div class='add'>+int mlx4_unicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp,</div><div class='add'>+			       u8 gid[16], enum mlx4_protocol prot)</div><div class='add'>+{</div><div class='add'>+	if (prot == MLX4_PROT_ETH &amp;&amp;</div><div class='add'>+			!(dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_UC_STEER))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (prot == MLX4_PROT_ETH)</div><div class='add'>+		gid[7] |= (MLX4_UC_STEER &lt;&lt; 1);</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev))</div><div class='add'>+		return mlx4_QP_ATTACH(dev, qp, gid, 0, 0, prot);</div><div class='add'>+</div><div class='add'>+	return mlx4_qp_detach_common(dev, qp, gid, prot, MLX4_UC_STEER);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mlx4_unicast_detach);</div><div class='add'>+</div><div class='add'>+int mlx4_PROMISC_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			 struct mlx4_vhcr *vhcr,</div><div class='add'>+			 struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			 struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			 struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	u32 qpn = (u32) vhcr-&gt;in_param &amp; 0xffffffff;</div><div class='add'>+	u8 port = vhcr-&gt;in_param &gt;&gt; 62;</div><div class='add'>+	enum mlx4_steer_type steer = vhcr-&gt;in_modifier;</div><div class='add'>+</div><div class='add'>+	/* Promiscuous unicast is not allowed in mfunc */</div><div class='add'>+	if (mlx4_is_mfunc(dev) &amp;&amp; steer == MLX4_UC_STEER)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (vhcr-&gt;op_modifier)</div><div class='add'>+		return add_promisc_qp(dev, port, steer, qpn);</div><div class='add'>+	else</div><div class='add'>+		return remove_promisc_qp(dev, port, steer, qpn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mlx4_PROMISC(struct mlx4_dev *dev, u32 qpn,</div><div class='add'>+			enum mlx4_steer_type steer, u8 add, u8 port)</div><div class='add'>+{</div><div class='add'>+	return mlx4_cmd(dev, (u64) qpn | (u64) port &lt;&lt; 62, (u32) steer, add,</div><div class='add'>+			MLX4_CMD_PROMISC, MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+			MLX4_CMD_WRAPPED);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> int mlx4_multicast_promisc_add(struct mlx4_dev *dev, u32 qpn, u8 port)</div><div class='ctx'> {</div><div class='ctx'> 	if (!(dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_MC_STEER))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (mlx4_is_mfunc(dev))</div><div class='add'>+		return mlx4_PROMISC(dev, qpn, MLX4_MC_STEER, 1, port);</div><div class='ctx'> </div><div class='del'>-	return add_promisc_qp(dev, 0, port, MLX4_MC_STEER, qpn);</div><div class='add'>+	return add_promisc_qp(dev, port, MLX4_MC_STEER, qpn);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_multicast_promisc_add);</div><div class='ctx'> </div><div class='hunk'>@@ -884,8 +995,10 @@ int mlx4_multicast_promisc_remove(struct mlx4_dev *dev, u32 qpn, u8 port)</div><div class='ctx'> 	if (!(dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_MC_STEER))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (mlx4_is_mfunc(dev))</div><div class='add'>+		return mlx4_PROMISC(dev, qpn, MLX4_MC_STEER, 0, port);</div><div class='ctx'> </div><div class='del'>-	return remove_promisc_qp(dev, 0, port, MLX4_MC_STEER, qpn);</div><div class='add'>+	return remove_promisc_qp(dev, port, MLX4_MC_STEER, qpn);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_multicast_promisc_remove);</div><div class='ctx'> </div><div class='hunk'>@@ -894,8 +1007,10 @@ int mlx4_unicast_promisc_add(struct mlx4_dev *dev, u32 qpn, u8 port)</div><div class='ctx'> 	if (!(dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_MC_STEER))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (mlx4_is_mfunc(dev))</div><div class='add'>+		return mlx4_PROMISC(dev, qpn, MLX4_UC_STEER, 1, port);</div><div class='ctx'> </div><div class='del'>-	return add_promisc_qp(dev, 0, port, MLX4_UC_STEER, qpn);</div><div class='add'>+	return add_promisc_qp(dev, port, MLX4_UC_STEER, qpn);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_unicast_promisc_add);</div><div class='ctx'> </div><div class='hunk'>@@ -904,7 +1019,10 @@ int mlx4_unicast_promisc_remove(struct mlx4_dev *dev, u32 qpn, u8 port)</div><div class='ctx'> 	if (!(dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_MC_STEER))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return remove_promisc_qp(dev, 0, port, MLX4_UC_STEER, qpn);</div><div class='add'>+	if (mlx4_is_mfunc(dev))</div><div class='add'>+		return mlx4_PROMISC(dev, qpn, MLX4_UC_STEER, 0, port);</div><div class='add'>+</div><div class='add'>+	return remove_promisc_qp(dev, port, MLX4_UC_STEER, qpn);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_unicast_promisc_remove);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h<br/>index 5dfa68ffc11c..a80121a2b519 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/mlx4.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/mlx4.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/mlx4.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/mlx4.h</a></div><div class='hunk'>@@ -46,21 +46,25 @@</div><div class='ctx'> #include &lt;linux/mlx4/device.h&gt;</div><div class='ctx'> #include &lt;linux/mlx4/driver.h&gt;</div><div class='ctx'> #include &lt;linux/mlx4/doorbell.h&gt;</div><div class='add'>+#include &lt;linux/mlx4/cmd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"mlx4_core"</div><div class='del'>-#define DRV_VERSION	"1.0"</div><div class='del'>-#define DRV_RELDATE	"July 14, 2011"</div><div class='add'>+#define PFX		DRV_NAME ": "</div><div class='add'>+#define DRV_VERSION	"1.1"</div><div class='add'>+#define DRV_RELDATE	"Dec, 2011"</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	MLX4_HCR_BASE		= 0x80680,</div><div class='ctx'> 	MLX4_HCR_SIZE		= 0x0001c,</div><div class='del'>-	MLX4_CLR_INT_SIZE	= 0x00008</div><div class='add'>+	MLX4_CLR_INT_SIZE	= 0x00008,</div><div class='add'>+	MLX4_SLAVE_COMM_BASE	= 0x0,</div><div class='add'>+	MLX4_COMM_PAGESIZE	= 0x1000</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	MLX4_MGM_ENTRY_SIZE	=  0x100,</div><div class='del'>-	MLX4_QP_PER_MGM		= 4 * (MLX4_MGM_ENTRY_SIZE / 16 - 2),</div><div class='del'>-	MLX4_MTT_ENTRY_PER_SEG	= 8</div><div class='add'>+	MLX4_MAX_MGM_ENTRY_SIZE = 0x1000,</div><div class='add'>+	MLX4_MAX_QP_PER_MGM	= 4 * (MLX4_MAX_MGM_ENTRY_SIZE / 16 - 2),</div><div class='add'>+	MLX4_MTT_ENTRY_PER_SEG	= 8,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -80,6 +84,94 @@ enum {</div><div class='ctx'> 	MLX4_NUM_CMPTS		= MLX4_CMPT_NUM_TYPE &lt;&lt; MLX4_CMPT_SHIFT</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum mlx4_mr_state {</div><div class='add'>+	MLX4_MR_DISABLED = 0,</div><div class='add'>+	MLX4_MR_EN_HW,</div><div class='add'>+	MLX4_MR_EN_SW</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MLX4_COMM_TIME		10000</div><div class='add'>+enum {</div><div class='add'>+	MLX4_COMM_CMD_RESET,</div><div class='add'>+	MLX4_COMM_CMD_VHCR0,</div><div class='add'>+	MLX4_COMM_CMD_VHCR1,</div><div class='add'>+	MLX4_COMM_CMD_VHCR2,</div><div class='add'>+	MLX4_COMM_CMD_VHCR_EN,</div><div class='add'>+	MLX4_COMM_CMD_VHCR_POST,</div><div class='add'>+	MLX4_COMM_CMD_FLR = 254</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*The flag indicates that the slave should delay the RESET cmd*/</div><div class='add'>+#define MLX4_DELAY_RESET_SLAVE 0xbbbbbbb</div><div class='add'>+/*indicates how many retries will be done if we are in the middle of FLR*/</div><div class='add'>+#define NUM_OF_RESET_RETRIES	10</div><div class='add'>+#define SLEEP_TIME_IN_RESET	(2 * 1000)</div><div class='add'>+enum mlx4_resource {</div><div class='add'>+	RES_QP,</div><div class='add'>+	RES_CQ,</div><div class='add'>+	RES_SRQ,</div><div class='add'>+	RES_XRCD,</div><div class='add'>+	RES_MPT,</div><div class='add'>+	RES_MTT,</div><div class='add'>+	RES_MAC,</div><div class='add'>+	RES_VLAN,</div><div class='add'>+	RES_EQ,</div><div class='add'>+	RES_COUNTER,</div><div class='add'>+	MLX4_NUM_OF_RESOURCE_TYPE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mlx4_alloc_mode {</div><div class='add'>+	RES_OP_RESERVE,</div><div class='add'>+	RES_OP_RESERVE_AND_MAP,</div><div class='add'>+	RES_OP_MAP_ICM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *Virtual HCR structures.</div><div class='add'>+ * mlx4_vhcr is the sw representation, in machine endianess</div><div class='add'>+ *</div><div class='add'>+ * mlx4_vhcr_cmd is the formalized structure, the one that is passed</div><div class='add'>+ * to FW to go through communication channel.</div><div class='add'>+ * It is big endian, and has the same structure as the physical HCR</div><div class='add'>+ * used by command interface</div><div class='add'>+ */</div><div class='add'>+struct mlx4_vhcr {</div><div class='add'>+	u64	in_param;</div><div class='add'>+	u64	out_param;</div><div class='add'>+	u32	in_modifier;</div><div class='add'>+	u32	errno;</div><div class='add'>+	u16	op;</div><div class='add'>+	u16	token;</div><div class='add'>+	u8	op_modifier;</div><div class='add'>+	u8	e_bit;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx4_vhcr_cmd {</div><div class='add'>+	__be64 in_param;</div><div class='add'>+	__be32 in_modifier;</div><div class='add'>+	__be64 out_param;</div><div class='add'>+	__be16 token;</div><div class='add'>+	u16 reserved;</div><div class='add'>+	u8 status;</div><div class='add'>+	u8 flags;</div><div class='add'>+	__be16 opcode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx4_cmd_info {</div><div class='add'>+	u16 opcode;</div><div class='add'>+	bool has_inbox;</div><div class='add'>+	bool has_outbox;</div><div class='add'>+	bool out_is_imm;</div><div class='add'>+	bool encode_slave_id;</div><div class='add'>+	int (*verify)(struct mlx4_dev *dev, int slave, struct mlx4_vhcr *vhcr,</div><div class='add'>+		      struct mlx4_cmd_mailbox *inbox);</div><div class='add'>+	int (*wrapper)(struct mlx4_dev *dev, int slave, struct mlx4_vhcr *vhcr,</div><div class='add'>+		       struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+		       struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+		       struct mlx4_cmd_info *cmd);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_MLX4_DEBUG</div><div class='ctx'> extern int mlx4_debug_level;</div><div class='ctx'> #else /* CONFIG_MLX4_DEBUG */</div><div class='hunk'>@@ -99,6 +191,12 @@ do {									\</div><div class='ctx'> #define mlx4_warn(mdev, format, arg...) \</div><div class='ctx'> 	dev_warn(&amp;mdev-&gt;pdev-&gt;dev, format, ##arg)</div><div class='ctx'> </div><div class='add'>+extern int mlx4_log_num_mgm_entry_size;</div><div class='add'>+extern int log_mtts_per_seg;</div><div class='add'>+</div><div class='add'>+#define MLX4_MAX_NUM_SLAVES	(MLX4_MAX_NUM_PF + MLX4_MAX_NUM_VF)</div><div class='add'>+#define ALL_SLAVES 0xff</div><div class='add'>+</div><div class='ctx'> struct mlx4_bitmap {</div><div class='ctx'> 	u32			last;</div><div class='ctx'> 	u32			top;</div><div class='hunk'>@@ -130,6 +228,147 @@ struct mlx4_icm_table {</div><div class='ctx'> 	struct mlx4_icm	      **icm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Must be packed because mtt_seg is 64 bits but only aligned to 32 bits.</div><div class='add'>+ */</div><div class='add'>+struct mlx4_mpt_entry {</div><div class='add'>+	__be32 flags;</div><div class='add'>+	__be32 qpn;</div><div class='add'>+	__be32 key;</div><div class='add'>+	__be32 pd_flags;</div><div class='add'>+	__be64 start;</div><div class='add'>+	__be64 length;</div><div class='add'>+	__be32 lkey;</div><div class='add'>+	__be32 win_cnt;</div><div class='add'>+	u8	reserved1[3];</div><div class='add'>+	u8	mtt_rep;</div><div class='add'>+	__be64 mtt_addr;</div><div class='add'>+	__be32 mtt_sz;</div><div class='add'>+	__be32 entity_size;</div><div class='add'>+	__be32 first_byte_offset;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Must be packed because start is 64 bits but only aligned to 32 bits.</div><div class='add'>+ */</div><div class='add'>+struct mlx4_eq_context {</div><div class='add'>+	__be32			flags;</div><div class='add'>+	u16			reserved1[3];</div><div class='add'>+	__be16			page_offset;</div><div class='add'>+	u8			log_eq_size;</div><div class='add'>+	u8			reserved2[4];</div><div class='add'>+	u8			eq_period;</div><div class='add'>+	u8			reserved3;</div><div class='add'>+	u8			eq_max_count;</div><div class='add'>+	u8			reserved4[3];</div><div class='add'>+	u8			intr;</div><div class='add'>+	u8			log_page_size;</div><div class='add'>+	u8			reserved5[2];</div><div class='add'>+	u8			mtt_base_addr_h;</div><div class='add'>+	__be32			mtt_base_addr_l;</div><div class='add'>+	u32			reserved6[2];</div><div class='add'>+	__be32			consumer_index;</div><div class='add'>+	__be32			producer_index;</div><div class='add'>+	u32			reserved7[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx4_cq_context {</div><div class='add'>+	__be32			flags;</div><div class='add'>+	u16			reserved1[3];</div><div class='add'>+	__be16			page_offset;</div><div class='add'>+	__be32			logsize_usrpage;</div><div class='add'>+	__be16			cq_period;</div><div class='add'>+	__be16			cq_max_count;</div><div class='add'>+	u8			reserved2[3];</div><div class='add'>+	u8			comp_eqn;</div><div class='add'>+	u8			log_page_size;</div><div class='add'>+	u8			reserved3[2];</div><div class='add'>+	u8			mtt_base_addr_h;</div><div class='add'>+	__be32			mtt_base_addr_l;</div><div class='add'>+	__be32			last_notified_index;</div><div class='add'>+	__be32			solicit_producer_index;</div><div class='add'>+	__be32			consumer_index;</div><div class='add'>+	__be32			producer_index;</div><div class='add'>+	u32			reserved4[2];</div><div class='add'>+	__be64			db_rec_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx4_srq_context {</div><div class='add'>+	__be32			state_logsize_srqn;</div><div class='add'>+	u8			logstride;</div><div class='add'>+	u8			reserved1;</div><div class='add'>+	__be16			xrcd;</div><div class='add'>+	__be32			pg_offset_cqn;</div><div class='add'>+	u32			reserved2;</div><div class='add'>+	u8			log_page_size;</div><div class='add'>+	u8			reserved3[2];</div><div class='add'>+	u8			mtt_base_addr_h;</div><div class='add'>+	__be32			mtt_base_addr_l;</div><div class='add'>+	__be32			pd;</div><div class='add'>+	__be16			limit_watermark;</div><div class='add'>+	__be16			wqe_cnt;</div><div class='add'>+	u16			reserved4;</div><div class='add'>+	__be16			wqe_counter;</div><div class='add'>+	u32			reserved5;</div><div class='add'>+	__be64			db_rec_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx4_eqe {</div><div class='add'>+	u8			reserved1;</div><div class='add'>+	u8			type;</div><div class='add'>+	u8			reserved2;</div><div class='add'>+	u8			subtype;</div><div class='add'>+	union {</div><div class='add'>+		u32		raw[6];</div><div class='add'>+		struct {</div><div class='add'>+			__be32	cqn;</div><div class='add'>+		} __packed comp;</div><div class='add'>+		struct {</div><div class='add'>+			u16	reserved1;</div><div class='add'>+			__be16	token;</div><div class='add'>+			u32	reserved2;</div><div class='add'>+			u8	reserved3[3];</div><div class='add'>+			u8	status;</div><div class='add'>+			__be64	out_param;</div><div class='add'>+		} __packed cmd;</div><div class='add'>+		struct {</div><div class='add'>+			__be32	qpn;</div><div class='add'>+		} __packed qp;</div><div class='add'>+		struct {</div><div class='add'>+			__be32	srqn;</div><div class='add'>+		} __packed srq;</div><div class='add'>+		struct {</div><div class='add'>+			__be32	cqn;</div><div class='add'>+			u32	reserved1;</div><div class='add'>+			u8	reserved2[3];</div><div class='add'>+			u8	syndrome;</div><div class='add'>+		} __packed cq_err;</div><div class='add'>+		struct {</div><div class='add'>+			u32	reserved1[2];</div><div class='add'>+			__be32	port;</div><div class='add'>+		} __packed port_change;</div><div class='add'>+		struct {</div><div class='add'>+			#define COMM_CHANNEL_BIT_ARRAY_SIZE	4</div><div class='add'>+			u32 reserved;</div><div class='add'>+			u32 bit_vec[COMM_CHANNEL_BIT_ARRAY_SIZE];</div><div class='add'>+		} __packed comm_channel_arm;</div><div class='add'>+		struct {</div><div class='add'>+			u8	port;</div><div class='add'>+			u8	reserved[3];</div><div class='add'>+			__be64	mac;</div><div class='add'>+		} __packed mac_update;</div><div class='add'>+		struct {</div><div class='add'>+			u8	port;</div><div class='add'>+		} __packed sw_event;</div><div class='add'>+		struct {</div><div class='add'>+			__be32	slave_id;</div><div class='add'>+		} __packed flr_event;</div><div class='add'>+	}			event;</div><div class='add'>+	u8			slave_id;</div><div class='add'>+	u8			reserved3[2];</div><div class='add'>+	u8			owner;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct mlx4_eq {</div><div class='ctx'> 	struct mlx4_dev	       *dev;</div><div class='ctx'> 	void __iomem	       *doorbell;</div><div class='hunk'>@@ -142,6 +381,18 @@ struct mlx4_eq {</div><div class='ctx'> 	struct mlx4_mtt		mtt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx4_slave_eqe {</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 port;</div><div class='add'>+	u32 param;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx4_slave_event_eq_info {</div><div class='add'>+	u32 eqn;</div><div class='add'>+	u16 token;</div><div class='add'>+	u64 event_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx4_profile {</div><div class='ctx'> 	int			num_qp;</div><div class='ctx'> 	int			rdmarc_per_qp;</div><div class='hunk'>@@ -155,16 +406,37 @@ struct mlx4_profile {</div><div class='ctx'> struct mlx4_fw {</div><div class='ctx'> 	u64			clr_int_base;</div><div class='ctx'> 	u64			catas_offset;</div><div class='add'>+	u64			comm_base;</div><div class='ctx'> 	struct mlx4_icm	       *fw_icm;</div><div class='ctx'> 	struct mlx4_icm	       *aux_icm;</div><div class='ctx'> 	u32			catas_size;</div><div class='ctx'> 	u16			fw_pages;</div><div class='ctx'> 	u8			clr_int_bar;</div><div class='ctx'> 	u8			catas_bar;</div><div class='add'>+	u8			comm_bar;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MGM_QPN_MASK       0x00FFFFFF</div><div class='del'>-#define MGM_BLCK_LB_BIT    30</div><div class='add'>+struct mlx4_comm {</div><div class='add'>+	u32			slave_write;</div><div class='add'>+	u32			slave_read;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MLX4_MCAST_CONFIG       = 0,</div><div class='add'>+	MLX4_MCAST_DISABLE      = 1,</div><div class='add'>+	MLX4_MCAST_ENABLE       = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define VLAN_FLTR_SIZE	128</div><div class='add'>+</div><div class='add'>+struct mlx4_vlan_fltr {</div><div class='add'>+	__be32 entry[VLAN_FLTR_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx4_mcast_entry {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	u64 addr;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct mlx4_promisc_qp {</div><div class='ctx'> 	struct list_head list;</div><div class='hunk'>@@ -177,19 +449,87 @@ struct mlx4_steer_index {</div><div class='ctx'> 	struct list_head duplicates;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mlx4_mgm {</div><div class='del'>-	__be32			next_gid_index;</div><div class='del'>-	__be32			members_count;</div><div class='del'>-	u32			reserved[2];</div><div class='del'>-	u8			gid[16];</div><div class='del'>-	__be32			qp[MLX4_QP_PER_MGM];</div><div class='add'>+struct mlx4_slave_state {</div><div class='add'>+	u8 comm_toggle;</div><div class='add'>+	u8 last_cmd;</div><div class='add'>+	u8 init_port_mask;</div><div class='add'>+	bool active;</div><div class='add'>+	u8 function;</div><div class='add'>+	dma_addr_t vhcr_dma;</div><div class='add'>+	u16 mtu[MLX4_MAX_PORTS + 1];</div><div class='add'>+	__be32 ib_cap_mask[MLX4_MAX_PORTS + 1];</div><div class='add'>+	struct mlx4_slave_eqe eq[MLX4_MFUNC_MAX_EQES];</div><div class='add'>+	struct list_head mcast_filters[MLX4_MAX_PORTS + 1];</div><div class='add'>+	struct mlx4_vlan_fltr *vlan_filter[MLX4_MAX_PORTS + 1];</div><div class='add'>+	struct mlx4_slave_event_eq_info event_eq;</div><div class='add'>+	u16 eq_pi;</div><div class='add'>+	u16 eq_ci;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	/*initialized via the kzalloc*/</div><div class='add'>+	u8 is_slave_going_down;</div><div class='add'>+	u32 cookie;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct slave_list {</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+	struct list_head res_list[MLX4_NUM_OF_RESOURCE_TYPE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx4_resource_tracker {</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	/* tree for each resources */</div><div class='add'>+	struct radix_tree_root res_tree[MLX4_NUM_OF_RESOURCE_TYPE];</div><div class='add'>+	/* num_of_slave's lists, one per slave */</div><div class='add'>+	struct slave_list *slave_list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SLAVE_EVENT_EQ_SIZE	128</div><div class='add'>+struct mlx4_slave_event_eq {</div><div class='add'>+	u32 eqn;</div><div class='add'>+	u32 cons;</div><div class='add'>+	u32 prod;</div><div class='add'>+	struct mlx4_eqe event_eqe[SLAVE_EVENT_EQ_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx4_master_qp0_state {</div><div class='add'>+	int proxy_qp0_active;</div><div class='add'>+	int qp0_active;</div><div class='add'>+	int port_active;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx4_mfunc_master_ctx {</div><div class='add'>+	struct mlx4_slave_state *slave_state;</div><div class='add'>+	struct mlx4_master_qp0_state qp0_state[MLX4_MAX_PORTS + 1];</div><div class='add'>+	int			init_port_ref[MLX4_MAX_PORTS + 1];</div><div class='add'>+	u16			max_mtu[MLX4_MAX_PORTS + 1];</div><div class='add'>+	int			disable_mcast_ref[MLX4_MAX_PORTS + 1];</div><div class='add'>+	struct mlx4_resource_tracker res_tracker;</div><div class='add'>+	struct workqueue_struct *comm_wq;</div><div class='add'>+	struct work_struct	comm_work;</div><div class='add'>+	struct work_struct	slave_event_work;</div><div class='add'>+	struct work_struct	slave_flr_event_work;</div><div class='add'>+	spinlock_t		slave_state_lock;</div><div class='add'>+	__be32			comm_arm_bit_vector[4];</div><div class='add'>+	struct mlx4_eqe		cmd_eqe;</div><div class='add'>+	struct mlx4_slave_event_eq slave_eq;</div><div class='add'>+	struct mutex		gen_eqe_mutex[MLX4_MFUNC_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx4_mfunc {</div><div class='add'>+	struct mlx4_comm __iomem       *comm;</div><div class='add'>+	struct mlx4_vhcr_cmd	       *vhcr;</div><div class='add'>+	dma_addr_t			vhcr_dma;</div><div class='add'>+</div><div class='add'>+	struct mlx4_mfunc_master_ctx	master;</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> struct mlx4_cmd {</div><div class='ctx'> 	struct pci_pool	       *pool;</div><div class='ctx'> 	void __iomem	       *hcr;</div><div class='ctx'> 	struct mutex		hcr_mutex;</div><div class='ctx'> 	struct semaphore	poll_sem;</div><div class='ctx'> 	struct semaphore	event_sem;</div><div class='add'>+	struct semaphore	slave_sem;</div><div class='ctx'> 	int			max_cmds;</div><div class='ctx'> 	spinlock_t		context_lock;</div><div class='ctx'> 	int			free_head;</div><div class='hunk'>@@ -197,6 +537,7 @@ struct mlx4_cmd {</div><div class='ctx'> 	u16			token_mask;</div><div class='ctx'> 	u8			use_events;</div><div class='ctx'> 	u8			toggle;</div><div class='add'>+	u8			comm_toggle;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx4_uar_table {</div><div class='hunk'>@@ -287,6 +628,48 @@ struct mlx4_vlan_table {</div><div class='ctx'> 	int			max;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define SET_PORT_GEN_ALL_VALID		0x7</div><div class='add'>+#define SET_PORT_PROMISC_SHIFT		31</div><div class='add'>+#define SET_PORT_MC_PROMISC_SHIFT	30</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MCAST_DIRECT_ONLY	= 0,</div><div class='add'>+	MCAST_DIRECT		= 1,</div><div class='add'>+	MCAST_DEFAULT		= 2</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct mlx4_set_port_general_context {</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+	u8 flags;</div><div class='add'>+	u16 reserved2;</div><div class='add'>+	__be16 mtu;</div><div class='add'>+	u8 pptx;</div><div class='add'>+	u8 pfctx;</div><div class='add'>+	u16 reserved3;</div><div class='add'>+	u8 pprx;</div><div class='add'>+	u8 pfcrx;</div><div class='add'>+	u16 reserved4;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx4_set_port_rqp_calc_context {</div><div class='add'>+	__be32 base_qpn;</div><div class='add'>+	u8 rererved;</div><div class='add'>+	u8 n_mac;</div><div class='add'>+	u8 n_vlan;</div><div class='add'>+	u8 n_prio;</div><div class='add'>+	u8 reserved2[3];</div><div class='add'>+	u8 mac_miss;</div><div class='add'>+	u8 intra_no_vlan;</div><div class='add'>+	u8 no_vlan;</div><div class='add'>+	u8 intra_vlan_miss;</div><div class='add'>+	u8 vlan_miss;</div><div class='add'>+	u8 reserved3[3];</div><div class='add'>+	u8 no_vlan_prio;</div><div class='add'>+	__be32 promisc;</div><div class='add'>+	__be32 mcast;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx4_mac_entry {</div><div class='ctx'> 	u64 mac;</div><div class='ctx'> };</div><div class='hunk'>@@ -333,6 +716,7 @@ struct mlx4_priv {</div><div class='ctx'> </div><div class='ctx'> 	struct mlx4_fw		fw;</div><div class='ctx'> 	struct mlx4_cmd		cmd;</div><div class='add'>+	struct mlx4_mfunc	mfunc;</div><div class='ctx'> </div><div class='ctx'> 	struct mlx4_bitmap	pd_bitmap;</div><div class='ctx'> 	struct mlx4_bitmap	xrcd_bitmap;</div><div class='hunk'>@@ -359,6 +743,7 @@ struct mlx4_priv {</div><div class='ctx'> 	struct list_head	bf_list;</div><div class='ctx'> 	struct mutex		bf_mutex;</div><div class='ctx'> 	struct io_mapping	*bf_mapping;</div><div class='add'>+	int			reserved_mtts;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct mlx4_priv *mlx4_priv(struct mlx4_dev *dev)</div><div class='hunk'>@@ -403,6 +788,62 @@ void mlx4_cleanup_cq_table(struct mlx4_dev *dev);</div><div class='ctx'> void mlx4_cleanup_qp_table(struct mlx4_dev *dev);</div><div class='ctx'> void mlx4_cleanup_srq_table(struct mlx4_dev *dev);</div><div class='ctx'> void mlx4_cleanup_mcg_table(struct mlx4_dev *dev);</div><div class='add'>+int __mlx4_qp_alloc_icm(struct mlx4_dev *dev, int qpn);</div><div class='add'>+void __mlx4_qp_free_icm(struct mlx4_dev *dev, int qpn);</div><div class='add'>+int __mlx4_cq_alloc_icm(struct mlx4_dev *dev, int *cqn);</div><div class='add'>+void __mlx4_cq_free_icm(struct mlx4_dev *dev, int cqn);</div><div class='add'>+int __mlx4_srq_alloc_icm(struct mlx4_dev *dev, int *srqn);</div><div class='add'>+void __mlx4_srq_free_icm(struct mlx4_dev *dev, int srqn);</div><div class='add'>+int __mlx4_mr_reserve(struct mlx4_dev *dev);</div><div class='add'>+void __mlx4_mr_release(struct mlx4_dev *dev, u32 index);</div><div class='add'>+int __mlx4_mr_alloc_icm(struct mlx4_dev *dev, u32 index);</div><div class='add'>+void __mlx4_mr_free_icm(struct mlx4_dev *dev, u32 index);</div><div class='add'>+u32 __mlx4_alloc_mtt_range(struct mlx4_dev *dev, int order);</div><div class='add'>+void __mlx4_free_mtt_range(struct mlx4_dev *dev, u32 first_seg, int order);</div><div class='add'>+</div><div class='add'>+int mlx4_WRITE_MTT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_SYNC_TPT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_SW2HW_MPT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_HW2SW_MPT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_QUERY_MPT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_SW2HW_EQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			  struct mlx4_vhcr *vhcr,</div><div class='add'>+			  struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			  struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			  struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_DMA_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+		     struct mlx4_vhcr *vhcr,</div><div class='add'>+		     struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+		     struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+		     struct mlx4_cmd_info *cmd);</div><div class='add'>+int __mlx4_qp_reserve_range(struct mlx4_dev *dev, int cnt, int align,</div><div class='add'>+			    int *base);</div><div class='add'>+void __mlx4_qp_release_range(struct mlx4_dev *dev, int base_qpn, int cnt);</div><div class='add'>+int __mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac);</div><div class='add'>+void __mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac);</div><div class='add'>+int __mlx4_replace_mac(struct mlx4_dev *dev, u8 port, int qpn, u64 new_mac);</div><div class='add'>+int __mlx4_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,</div><div class='add'>+		     int start_index, int npages, u64 *page_list);</div><div class='ctx'> </div><div class='ctx'> void mlx4_start_catas_poll(struct mlx4_dev *dev);</div><div class='ctx'> void mlx4_stop_catas_poll(struct mlx4_dev *dev);</div><div class='hunk'>@@ -419,13 +860,113 @@ u64 mlx4_make_profile(struct mlx4_dev *dev,</div><div class='ctx'> 		      struct mlx4_profile *request,</div><div class='ctx'> 		      struct mlx4_dev_cap *dev_cap,</div><div class='ctx'> 		      struct mlx4_init_hca_param *init_hca);</div><div class='add'>+void mlx4_master_comm_channel(struct work_struct *work);</div><div class='add'>+void mlx4_gen_slave_eqe(struct work_struct *work);</div><div class='add'>+void mlx4_master_handle_slave_flr(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+int mlx4_ALLOC_RES_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_FREE_RES_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			  struct mlx4_vhcr *vhcr,</div><div class='add'>+			  struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			  struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			  struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_MAP_EQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			struct mlx4_vhcr *vhcr, struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_COMM_INT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			  struct mlx4_vhcr *vhcr,</div><div class='add'>+			  struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			  struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			  struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_HW2SW_EQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			    struct mlx4_vhcr *vhcr,</div><div class='add'>+			    struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			    struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			  struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_QUERY_EQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			  struct mlx4_vhcr *vhcr,</div><div class='add'>+			  struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			  struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			  struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_SW2HW_CQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			  struct mlx4_vhcr *vhcr,</div><div class='add'>+			  struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			  struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			  struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_HW2SW_CQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			  struct mlx4_vhcr *vhcr,</div><div class='add'>+			  struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			  struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			  struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_QUERY_CQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			  struct mlx4_vhcr *vhcr,</div><div class='add'>+			  struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			  struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			  struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_MODIFY_CQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			  struct mlx4_vhcr *vhcr,</div><div class='add'>+			  struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			  struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_SW2HW_SRQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_HW2SW_SRQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_QUERY_SRQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_ARM_SRQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			 struct mlx4_vhcr *vhcr,</div><div class='add'>+			 struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			 struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			 struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_GEN_QP_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			struct mlx4_vhcr *vhcr,</div><div class='add'>+			struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_RST2INIT_QP_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			     struct mlx4_vhcr *vhcr,</div><div class='add'>+			     struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			     struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			     struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_INIT2RTR_QP_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			     struct mlx4_vhcr *vhcr,</div><div class='add'>+			     struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			     struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			     struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_2RST_QP_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			 struct mlx4_vhcr *vhcr,</div><div class='add'>+			 struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			 struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			 struct mlx4_cmd_info *cmd);</div><div class='add'>+</div><div class='add'>+int mlx4_GEN_EQE(struct mlx4_dev *dev, int slave, struct mlx4_eqe *eqe);</div><div class='ctx'> </div><div class='ctx'> int mlx4_cmd_init(struct mlx4_dev *dev);</div><div class='ctx'> void mlx4_cmd_cleanup(struct mlx4_dev *dev);</div><div class='add'>+int mlx4_multi_func_init(struct mlx4_dev *dev);</div><div class='add'>+void mlx4_multi_func_cleanup(struct mlx4_dev *dev);</div><div class='ctx'> void mlx4_cmd_event(struct mlx4_dev *dev, u16 token, u8 status, u64 out_param);</div><div class='ctx'> int mlx4_cmd_use_events(struct mlx4_dev *dev);</div><div class='ctx'> void mlx4_cmd_use_polling(struct mlx4_dev *dev);</div><div class='ctx'> </div><div class='add'>+int mlx4_comm_cmd(struct mlx4_dev *dev, u8 cmd, u16 param,</div><div class='add'>+		  unsigned long timeout);</div><div class='add'>+</div><div class='ctx'> void mlx4_cq_completion(struct mlx4_dev *dev, u32 cqn);</div><div class='ctx'> void mlx4_cq_event(struct mlx4_dev *dev, u32 cqn, int event_type);</div><div class='ctx'> </div><div class='hunk'>@@ -452,12 +993,113 @@ void mlx4_init_mac_table(struct mlx4_dev *dev, struct mlx4_mac_table *table);</div><div class='ctx'> void mlx4_init_vlan_table(struct mlx4_dev *dev, struct mlx4_vlan_table *table);</div><div class='ctx'> </div><div class='ctx'> int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port);</div><div class='add'>+/* resource tracker functions*/</div><div class='add'>+int mlx4_get_slave_from_resource_id(struct mlx4_dev *dev,</div><div class='add'>+				    enum mlx4_resource resource_type,</div><div class='add'>+				    int resource_id, int *slave);</div><div class='add'>+void mlx4_delete_all_resources_for_slave(struct mlx4_dev *dev, int slave_id);</div><div class='add'>+int mlx4_init_resource_tracker(struct mlx4_dev *dev);</div><div class='add'>+</div><div class='add'>+void mlx4_free_resource_tracker(struct mlx4_dev *dev);</div><div class='add'>+</div><div class='add'>+int mlx4_SET_PORT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			  struct mlx4_vhcr *vhcr,</div><div class='add'>+			  struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			  struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			  struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_INIT_PORT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_CLOSE_PORT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			    struct mlx4_vhcr *vhcr,</div><div class='add'>+			    struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			    struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			    struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_QUERY_PORT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			    struct mlx4_vhcr *vhcr,</div><div class='add'>+			    struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			    struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			    struct mlx4_cmd_info *cmd);</div><div class='ctx'> int mlx4_get_port_ib_caps(struct mlx4_dev *dev, u8 port, __be32 *caps);</div><div class='ctx'> int mlx4_check_ext_port_caps(struct mlx4_dev *dev, u8 port);</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd);</div><div class='add'>+</div><div class='add'>+int mlx4_PROMISC_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			 struct mlx4_vhcr *vhcr,</div><div class='add'>+			 struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			 struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			 struct mlx4_cmd_info *cmd);</div><div class='ctx'> int mlx4_qp_detach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],</div><div class='ctx'> 			  enum mlx4_protocol prot, enum mlx4_steer_type steer);</div><div class='ctx'> int mlx4_qp_attach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],</div><div class='ctx'> 			  int block_mcast_loopback, enum mlx4_protocol prot,</div><div class='ctx'> 			  enum mlx4_steer_type steer);</div><div class='add'>+int mlx4_SET_MCAST_FLTR_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+				struct mlx4_vhcr *vhcr,</div><div class='add'>+				struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+				struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+				struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_SET_VLAN_FLTR_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			       struct mlx4_vhcr *vhcr,</div><div class='add'>+			       struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			       struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			       struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_common_set_vlan_fltr(struct mlx4_dev *dev, int function,</div><div class='add'>+				     int port, void *buf);</div><div class='add'>+int mlx4_common_dump_eth_stats(struct mlx4_dev *dev, int slave, u32 in_mod,</div><div class='add'>+				struct mlx4_cmd_mailbox *outbox);</div><div class='add'>+int mlx4_DUMP_ETH_STATS_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+				   struct mlx4_vhcr *vhcr,</div><div class='add'>+				   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+				   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+				struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_PKEY_TABLE_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			    struct mlx4_vhcr *vhcr,</div><div class='add'>+			    struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			    struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			    struct mlx4_cmd_info *cmd);</div><div class='add'>+int mlx4_QUERY_IF_STAT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			       struct mlx4_vhcr *vhcr,</div><div class='add'>+			       struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			       struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			       struct mlx4_cmd_info *cmd);</div><div class='add'>+</div><div class='add'>+int mlx4_get_mgm_entry_size(struct mlx4_dev *dev);</div><div class='add'>+int mlx4_get_qp_per_mgm(struct mlx4_dev *dev);</div><div class='add'>+</div><div class='add'>+static inline void set_param_l(u64 *arg, u32 val)</div><div class='add'>+{</div><div class='add'>+	*((u32 *)arg) = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void set_param_h(u64 *arg, u32 val)</div><div class='add'>+{</div><div class='add'>+	*arg = (*arg &amp; 0xffffffff) | ((u64) val &lt;&lt; 32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 get_param_l(u64 *arg)</div><div class='add'>+{</div><div class='add'>+	return (u32) (*arg &amp; 0xffffffff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 get_param_h(u64 *arg)</div><div class='add'>+{</div><div class='add'>+	return (u32)(*arg &gt;&gt; 32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline spinlock_t *mlx4_tlock(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return &amp;mlx4_priv(dev)-&gt;mfunc.master.res_tracker.lock;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define NOT_MASKED_PD_BITS 17</div><div class='add'>+</div><div class='ctx'> #endif /* MLX4_H */</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 207b5add3ca8..f2a8e65f5f88 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/mlx4_en.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/mlx4_en.h</a></div><div class='hunk'>@@ -51,8 +51,8 @@</div><div class='ctx'> #include "en_port.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"mlx4_en"</div><div class='del'>-#define DRV_VERSION	"1.5.4.2"</div><div class='del'>-#define DRV_RELDATE	"October 2011"</div><div class='add'>+#define DRV_VERSION	"2.0"</div><div class='add'>+#define DRV_RELDATE	"Dec 2011"</div><div class='ctx'> </div><div class='ctx'> #define MLX4_EN_MSG_LEVEL	(NETIF_MSG_LINK | NETIF_MSG_IFDOWN)</div><div class='ctx'> </div><div class='hunk'>@@ -366,16 +366,6 @@ struct mlx4_en_rss_map {</div><div class='ctx'> 	enum mlx4_qp_state indir_state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mlx4_en_rss_context {</div><div class='del'>-	__be32 base_qpn;</div><div class='del'>-	__be32 default_qpn;</div><div class='del'>-	u16 reserved;</div><div class='del'>-	u8 hash_fn;</div><div class='del'>-	u8 flags;</div><div class='del'>-	__be32 rss_key[10];</div><div class='del'>-	__be32 base_qpn_udp;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct mlx4_en_port_state {</div><div class='ctx'> 	int link_state;</div><div class='ctx'> 	int link_speed;</div><div class='hunk'>@@ -463,6 +453,7 @@ struct mlx4_en_priv {</div><div class='ctx'> 	int base_qpn;</div><div class='ctx'> </div><div class='ctx'> 	struct mlx4_en_rss_map rss_map;</div><div class='add'>+	u32 ctrl_flags;</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> #define MLX4_EN_FLAG_PROMISC	0x1</div><div class='ctx'> #define MLX4_EN_FLAG_MC_PROMISC	0x2</div><div class='hunk'>@@ -495,9 +486,9 @@ struct mlx4_en_priv {</div><div class='ctx'> enum mlx4_en_wol {</div><div class='ctx'> 	MLX4_EN_WOL_MAGIC = (1ULL &lt;&lt; 61),</div><div class='ctx'> 	MLX4_EN_WOL_ENABLED = (1ULL &lt;&lt; 62),</div><div class='del'>-	MLX4_EN_WOL_DO_MODIFY = (1ULL &lt;&lt; 63),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define MLX4_EN_WOL_DO_MODIFY (1ULL &lt;&lt; 63)</div><div class='ctx'> </div><div class='ctx'> void mlx4_en_destroy_netdev(struct net_device *dev);</div><div class='ctx'> int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/mr.c b/drivers/net/ethernet/mellanox/mlx4/mr.c<br/>index efa3e77355e4..01df5567e16e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/mr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/mr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/mr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/mr.c</a></div><div class='hunk'>@@ -32,35 +32,17 @@</div><div class='ctx'>  * SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mlx4/cmd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mlx4.h"</div><div class='ctx'> #include "icm.h"</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Must be packed because mtt_seg is 64 bits but only aligned to 32 bits.</div><div class='del'>- */</div><div class='del'>-struct mlx4_mpt_entry {</div><div class='del'>-	__be32 flags;</div><div class='del'>-	__be32 qpn;</div><div class='del'>-	__be32 key;</div><div class='del'>-	__be32 pd_flags;</div><div class='del'>-	__be64 start;</div><div class='del'>-	__be64 length;</div><div class='del'>-	__be32 lkey;</div><div class='del'>-	__be32 win_cnt;</div><div class='del'>-	u8	reserved1[3];</div><div class='del'>-	u8	mtt_rep;</div><div class='del'>-	__be64 mtt_seg;</div><div class='del'>-	__be32 mtt_sz;</div><div class='del'>-	__be32 entity_size;</div><div class='del'>-	__be32 first_byte_offset;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> #define MLX4_MPT_FLAG_SW_OWNS	    (0xfUL &lt;&lt; 28)</div><div class='ctx'> #define MLX4_MPT_FLAG_FREE	    (0x3UL &lt;&lt; 28)</div><div class='ctx'> #define MLX4_MPT_FLAG_MIO	    (1 &lt;&lt; 17)</div><div class='hunk'>@@ -180,22 +162,48 @@ static void mlx4_buddy_cleanup(struct mlx4_buddy *buddy)</div><div class='ctx'> 	kfree(buddy-&gt;num_free);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 mlx4_alloc_mtt_range(struct mlx4_dev *dev, int order)</div><div class='add'>+u32 __mlx4_alloc_mtt_range(struct mlx4_dev *dev, int order)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_mr_table *mr_table = &amp;mlx4_priv(dev)-&gt;mr_table;</div><div class='ctx'> 	u32 seg;</div><div class='add'>+	int seg_order;</div><div class='add'>+	u32 offset;</div><div class='ctx'> </div><div class='del'>-	seg = mlx4_buddy_alloc(&amp;mr_table-&gt;mtt_buddy, order);</div><div class='add'>+	seg_order = max_t(int, order - log_mtts_per_seg, 0);</div><div class='add'>+</div><div class='add'>+	seg = mlx4_buddy_alloc(&amp;mr_table-&gt;mtt_buddy, seg_order);</div><div class='ctx'> 	if (seg == -1)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (mlx4_table_get_range(dev, &amp;mr_table-&gt;mtt_table, seg,</div><div class='del'>-				 seg + (1 &lt;&lt; order) - 1)) {</div><div class='del'>-		mlx4_buddy_free(&amp;mr_table-&gt;mtt_buddy, seg, order);</div><div class='add'>+	offset = seg * (1 &lt;&lt; log_mtts_per_seg);</div><div class='add'>+</div><div class='add'>+	if (mlx4_table_get_range(dev, &amp;mr_table-&gt;mtt_table, offset,</div><div class='add'>+				 offset + (1 &lt;&lt; order) - 1)) {</div><div class='add'>+		mlx4_buddy_free(&amp;mr_table-&gt;mtt_buddy, seg, seg_order);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return seg;</div><div class='add'>+	return offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 mlx4_alloc_mtt_range(struct mlx4_dev *dev, int order)</div><div class='add'>+{</div><div class='add'>+	u64 in_param;</div><div class='add'>+	u64 out_param;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		set_param_l(&amp;in_param, order);</div><div class='add'>+		err = mlx4_cmd_imm(dev, in_param, &amp;out_param, RES_MTT,</div><div class='add'>+						       RES_OP_RESERVE_AND_MAP,</div><div class='add'>+						       MLX4_CMD_ALLOC_RES,</div><div class='add'>+						       MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+						       MLX4_CMD_WRAPPED);</div><div class='add'>+		if (err)</div><div class='add'>+			return -1;</div><div class='add'>+		return get_param_l(&amp;out_param);</div><div class='add'>+	}</div><div class='add'>+	return __mlx4_alloc_mtt_range(dev, order);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mlx4_mtt_init(struct mlx4_dev *dev, int npages, int page_shift,</div><div class='hunk'>@@ -210,33 +218,63 @@ int mlx4_mtt_init(struct mlx4_dev *dev, int npages, int page_shift,</div><div class='ctx'> 	} else</div><div class='ctx'> 		mtt-&gt;page_shift = page_shift;</div><div class='ctx'> </div><div class='del'>-	for (mtt-&gt;order = 0, i = dev-&gt;caps.mtts_per_seg; i &lt; npages; i &lt;&lt;= 1)</div><div class='add'>+	for (mtt-&gt;order = 0, i = 1; i &lt; npages; i &lt;&lt;= 1)</div><div class='ctx'> 		++mtt-&gt;order;</div><div class='ctx'> </div><div class='del'>-	mtt-&gt;first_seg = mlx4_alloc_mtt_range(dev, mtt-&gt;order);</div><div class='del'>-	if (mtt-&gt;first_seg == -1)</div><div class='add'>+	mtt-&gt;offset = mlx4_alloc_mtt_range(dev, mtt-&gt;order);</div><div class='add'>+	if (mtt-&gt;offset == -1)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_mtt_init);</div><div class='ctx'> </div><div class='del'>-void mlx4_mtt_cleanup(struct mlx4_dev *dev, struct mlx4_mtt *mtt)</div><div class='add'>+void __mlx4_free_mtt_range(struct mlx4_dev *dev, u32 offset, int order)</div><div class='ctx'> {</div><div class='add'>+	u32 first_seg;</div><div class='add'>+	int seg_order;</div><div class='ctx'> 	struct mlx4_mr_table *mr_table = &amp;mlx4_priv(dev)-&gt;mr_table;</div><div class='ctx'> </div><div class='add'>+	seg_order = max_t(int, order - log_mtts_per_seg, 0);</div><div class='add'>+	first_seg = offset / (1 &lt;&lt; log_mtts_per_seg);</div><div class='add'>+</div><div class='add'>+	mlx4_buddy_free(&amp;mr_table-&gt;mtt_buddy, first_seg, seg_order);</div><div class='add'>+	mlx4_table_put_range(dev, &amp;mr_table-&gt;mtt_table, offset,</div><div class='add'>+			     offset + (1 &lt;&lt; order) - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mlx4_free_mtt_range(struct mlx4_dev *dev, u32 offset, int order)</div><div class='add'>+{</div><div class='add'>+	u64 in_param;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		set_param_l(&amp;in_param, offset);</div><div class='add'>+		set_param_h(&amp;in_param, order);</div><div class='add'>+		err = mlx4_cmd(dev, in_param, RES_MTT, RES_OP_RESERVE_AND_MAP,</div><div class='add'>+						       MLX4_CMD_FREE_RES,</div><div class='add'>+						       MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+						       MLX4_CMD_WRAPPED);</div><div class='add'>+		if (err)</div><div class='add'>+			mlx4_warn(dev, "Failed to free mtt range at:"</div><div class='add'>+				  "%d order:%d\n", offset, order);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	 __mlx4_free_mtt_range(dev, offset, order);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mlx4_mtt_cleanup(struct mlx4_dev *dev, struct mlx4_mtt *mtt)</div><div class='add'>+{</div><div class='ctx'> 	if (mtt-&gt;order &lt; 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mlx4_buddy_free(&amp;mr_table-&gt;mtt_buddy, mtt-&gt;first_seg, mtt-&gt;order);</div><div class='del'>-	mlx4_table_put_range(dev, &amp;mr_table-&gt;mtt_table, mtt-&gt;first_seg,</div><div class='del'>-			     mtt-&gt;first_seg + (1 &lt;&lt; mtt-&gt;order) - 1);</div><div class='add'>+	mlx4_free_mtt_range(dev, mtt-&gt;offset, mtt-&gt;order);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_mtt_cleanup);</div><div class='ctx'> </div><div class='ctx'> u64 mlx4_mtt_addr(struct mlx4_dev *dev, struct mlx4_mtt *mtt)</div><div class='ctx'> {</div><div class='del'>-	return (u64) mtt-&gt;first_seg * dev-&gt;caps.mtt_entry_sz;</div><div class='add'>+	return (u64) mtt-&gt;offset * dev-&gt;caps.mtt_entry_sz;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_mtt_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -253,69 +291,205 @@ static u32 key_to_hw_index(u32 key)</div><div class='ctx'> static int mlx4_SW2HW_MPT(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,</div><div class='ctx'> 			  int mpt_index)</div><div class='ctx'> {</div><div class='del'>-	return mlx4_cmd(dev, mailbox-&gt;dma, mpt_index, 0, MLX4_CMD_SW2HW_MPT,</div><div class='del'>-			MLX4_CMD_TIME_CLASS_B);</div><div class='add'>+	return mlx4_cmd(dev, mailbox-&gt;dma | dev-&gt;caps.function , mpt_index,</div><div class='add'>+			0, MLX4_CMD_SW2HW_MPT, MLX4_CMD_TIME_CLASS_B,</div><div class='add'>+			MLX4_CMD_WRAPPED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx4_HW2SW_MPT(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,</div><div class='ctx'> 			  int mpt_index)</div><div class='ctx'> {</div><div class='ctx'> 	return mlx4_cmd_box(dev, 0, mailbox ? mailbox-&gt;dma : 0, mpt_index,</div><div class='del'>-			    !mailbox, MLX4_CMD_HW2SW_MPT, MLX4_CMD_TIME_CLASS_B);</div><div class='add'>+			    !mailbox, MLX4_CMD_HW2SW_MPT,</div><div class='add'>+			    MLX4_CMD_TIME_CLASS_B, MLX4_CMD_WRAPPED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mlx4_mr_alloc(struct mlx4_dev *dev, u32 pd, u64 iova, u64 size, u32 access,</div><div class='del'>-		  int npages, int page_shift, struct mlx4_mr *mr)</div><div class='add'>+static int mlx4_mr_reserve_range(struct mlx4_dev *dev, int cnt, int align,</div><div class='add'>+			  u32 *base_mridx)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='del'>-	u32 index;</div><div class='del'>-	int err;</div><div class='add'>+	u32 mridx;</div><div class='ctx'> </div><div class='del'>-	index = mlx4_bitmap_alloc(&amp;priv-&gt;mr_table.mpt_bitmap);</div><div class='del'>-	if (index == -1)</div><div class='add'>+	mridx = mlx4_bitmap_alloc_range(&amp;priv-&gt;mr_table.mpt_bitmap, cnt, align);</div><div class='add'>+	if (mridx == -1)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	*base_mridx = mridx;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mlx4_mr_reserve_range);</div><div class='add'>+</div><div class='add'>+static void mlx4_mr_release_range(struct mlx4_dev *dev, u32 base_mridx, int cnt)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	mlx4_bitmap_free_range(&amp;priv-&gt;mr_table.mpt_bitmap, base_mridx, cnt);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mlx4_mr_release_range);</div><div class='add'>+</div><div class='add'>+static int mlx4_mr_alloc_reserved(struct mlx4_dev *dev, u32 mridx, u32 pd,</div><div class='add'>+			   u64 iova, u64 size, u32 access, int npages,</div><div class='add'>+			   int page_shift, struct mlx4_mr *mr)</div><div class='add'>+{</div><div class='ctx'> 	mr-&gt;iova       = iova;</div><div class='ctx'> 	mr-&gt;size       = size;</div><div class='ctx'> 	mr-&gt;pd	       = pd;</div><div class='ctx'> 	mr-&gt;access     = access;</div><div class='del'>-	mr-&gt;enabled    = 0;</div><div class='del'>-	mr-&gt;key	       = hw_index_to_key(index);</div><div class='add'>+	mr-&gt;enabled    = MLX4_MR_DISABLED;</div><div class='add'>+	mr-&gt;key	       = hw_index_to_key(mridx);</div><div class='add'>+</div><div class='add'>+	return mlx4_mtt_init(dev, npages, page_shift, &amp;mr-&gt;mtt);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mlx4_mr_alloc_reserved);</div><div class='add'>+</div><div class='add'>+static int mlx4_WRITE_MTT(struct mlx4_dev *dev,</div><div class='add'>+			  struct mlx4_cmd_mailbox *mailbox,</div><div class='add'>+			  int num_entries)</div><div class='add'>+{</div><div class='add'>+	return mlx4_cmd(dev, mailbox-&gt;dma, num_entries, 0, MLX4_CMD_WRITE_MTT,</div><div class='add'>+			MLX4_CMD_TIME_CLASS_A,  MLX4_CMD_WRAPPED);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	err = mlx4_mtt_init(dev, npages, page_shift, &amp;mr-&gt;mtt);</div><div class='add'>+int __mlx4_mr_reserve(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+</div><div class='add'>+	return mlx4_bitmap_alloc(&amp;priv-&gt;mr_table.mpt_bitmap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mlx4_mr_reserve(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u64 out_param;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		if (mlx4_cmd_imm(dev, 0, &amp;out_param, RES_MPT, RES_OP_RESERVE,</div><div class='add'>+				   MLX4_CMD_ALLOC_RES,</div><div class='add'>+				   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED))</div><div class='add'>+			return -1;</div><div class='add'>+		return get_param_l(&amp;out_param);</div><div class='add'>+	}</div><div class='add'>+	return  __mlx4_mr_reserve(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __mlx4_mr_release(struct mlx4_dev *dev, u32 index)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+</div><div class='add'>+	mlx4_bitmap_free(&amp;priv-&gt;mr_table.mpt_bitmap, index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mlx4_mr_release(struct mlx4_dev *dev, u32 index)</div><div class='add'>+{</div><div class='add'>+	u64 in_param;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		set_param_l(&amp;in_param, index);</div><div class='add'>+		if (mlx4_cmd(dev, in_param, RES_MPT, RES_OP_RESERVE,</div><div class='add'>+			       MLX4_CMD_FREE_RES,</div><div class='add'>+			       MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED))</div><div class='add'>+			mlx4_warn(dev, "Failed to release mr index:%d\n",</div><div class='add'>+				  index);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	__mlx4_mr_release(dev, index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __mlx4_mr_alloc_icm(struct mlx4_dev *dev, u32 index)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_mr_table *mr_table = &amp;mlx4_priv(dev)-&gt;mr_table;</div><div class='add'>+</div><div class='add'>+	return mlx4_table_get(dev, &amp;mr_table-&gt;dmpt_table, index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mlx4_mr_alloc_icm(struct mlx4_dev *dev, u32 index)</div><div class='add'>+{</div><div class='add'>+	u64 param;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		set_param_l(&amp;param, index);</div><div class='add'>+		return mlx4_cmd_imm(dev, param, &amp;param, RES_MPT, RES_OP_MAP_ICM,</div><div class='add'>+							MLX4_CMD_ALLOC_RES,</div><div class='add'>+							MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+							MLX4_CMD_WRAPPED);</div><div class='add'>+	}</div><div class='add'>+	return __mlx4_mr_alloc_icm(dev, index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __mlx4_mr_free_icm(struct mlx4_dev *dev, u32 index)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_mr_table *mr_table = &amp;mlx4_priv(dev)-&gt;mr_table;</div><div class='add'>+</div><div class='add'>+	mlx4_table_put(dev, &amp;mr_table-&gt;dmpt_table, index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mlx4_mr_free_icm(struct mlx4_dev *dev, u32 index)</div><div class='add'>+{</div><div class='add'>+	u64 in_param;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		set_param_l(&amp;in_param, index);</div><div class='add'>+		if (mlx4_cmd(dev, in_param, RES_MPT, RES_OP_MAP_ICM,</div><div class='add'>+			     MLX4_CMD_FREE_RES, MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+			     MLX4_CMD_WRAPPED))</div><div class='add'>+			mlx4_warn(dev, "Failed to free icm of mr index:%d\n",</div><div class='add'>+				  index);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	return __mlx4_mr_free_icm(dev, index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_mr_alloc(struct mlx4_dev *dev, u32 pd, u64 iova, u64 size, u32 access,</div><div class='add'>+		  int npages, int page_shift, struct mlx4_mr *mr)</div><div class='add'>+{</div><div class='add'>+	u32 index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	index = mlx4_mr_reserve(dev);</div><div class='add'>+	if (index == -1)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = mlx4_mr_alloc_reserved(dev, index, pd, iova, size,</div><div class='add'>+				     access, npages, page_shift, mr);</div><div class='ctx'> 	if (err)</div><div class='del'>-		mlx4_bitmap_free(&amp;priv-&gt;mr_table.mpt_bitmap, index);</div><div class='add'>+		mlx4_mr_release(dev, index);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_mr_alloc);</div><div class='ctx'> </div><div class='del'>-void mlx4_mr_free(struct mlx4_dev *dev, struct mlx4_mr *mr)</div><div class='add'>+static void mlx4_mr_free_reserved(struct mlx4_dev *dev, struct mlx4_mr *mr)</div><div class='ctx'> {</div><div class='del'>-	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (mr-&gt;enabled) {</div><div class='add'>+	if (mr-&gt;enabled == MLX4_MR_EN_HW) {</div><div class='ctx'> 		err = mlx4_HW2SW_MPT(dev, NULL,</div><div class='ctx'> 				     key_to_hw_index(mr-&gt;key) &amp;</div><div class='ctx'> 				     (dev-&gt;caps.num_mpts - 1));</div><div class='ctx'> 		if (err)</div><div class='del'>-			mlx4_warn(dev, "HW2SW_MPT failed (%d)\n", err);</div><div class='del'>-	}</div><div class='add'>+			mlx4_warn(dev, "xxx HW2SW_MPT failed (%d)\n", err);</div><div class='ctx'> </div><div class='add'>+		mr-&gt;enabled = MLX4_MR_EN_SW;</div><div class='add'>+	}</div><div class='ctx'> 	mlx4_mtt_cleanup(dev, &amp;mr-&gt;mtt);</div><div class='del'>-	mlx4_bitmap_free(&amp;priv-&gt;mr_table.mpt_bitmap, key_to_hw_index(mr-&gt;key));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mlx4_mr_free_reserved);</div><div class='add'>+</div><div class='add'>+void mlx4_mr_free(struct mlx4_dev *dev, struct mlx4_mr *mr)</div><div class='add'>+{</div><div class='add'>+	mlx4_mr_free_reserved(dev, mr);</div><div class='add'>+	if (mr-&gt;enabled)</div><div class='add'>+		mlx4_mr_free_icm(dev, key_to_hw_index(mr-&gt;key));</div><div class='add'>+	mlx4_mr_release(dev, key_to_hw_index(mr-&gt;key));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_mr_free);</div><div class='ctx'> </div><div class='ctx'> int mlx4_mr_enable(struct mlx4_dev *dev, struct mlx4_mr *mr)</div><div class='ctx'> {</div><div class='del'>-	struct mlx4_mr_table *mr_table = &amp;mlx4_priv(dev)-&gt;mr_table;</div><div class='ctx'> 	struct mlx4_cmd_mailbox *mailbox;</div><div class='ctx'> 	struct mlx4_mpt_entry *mpt_entry;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = mlx4_table_get(dev, &amp;mr_table-&gt;dmpt_table, key_to_hw_index(mr-&gt;key));</div><div class='add'>+	err = mlx4_mr_alloc_icm(dev, key_to_hw_index(mr-&gt;key));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -340,9 +514,10 @@ int mlx4_mr_enable(struct mlx4_dev *dev, struct mlx4_mr *mr)</div><div class='ctx'> </div><div class='ctx'> 	if (mr-&gt;mtt.order &lt; 0) {</div><div class='ctx'> 		mpt_entry-&gt;flags |= cpu_to_be32(MLX4_MPT_FLAG_PHYSICAL);</div><div class='del'>-		mpt_entry-&gt;mtt_seg = 0;</div><div class='add'>+		mpt_entry-&gt;mtt_addr = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		mpt_entry-&gt;mtt_seg = cpu_to_be64(mlx4_mtt_addr(dev, &amp;mr-&gt;mtt));</div><div class='add'>+		mpt_entry-&gt;mtt_addr = cpu_to_be64(mlx4_mtt_addr(dev,</div><div class='add'>+						  &amp;mr-&gt;mtt));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (mr-&gt;mtt.order &gt;= 0 &amp;&amp; mr-&gt;mtt.page_shift == 0) {</div><div class='hunk'>@@ -350,8 +525,7 @@ int mlx4_mr_enable(struct mlx4_dev *dev, struct mlx4_mr *mr)</div><div class='ctx'> 		mpt_entry-&gt;flags    |= cpu_to_be32(MLX4_MPT_FLAG_FREE);</div><div class='ctx'> 		mpt_entry-&gt;pd_flags |= cpu_to_be32(MLX4_MPT_PD_FLAG_FAST_REG |</div><div class='ctx'> 						   MLX4_MPT_PD_FLAG_RAE);</div><div class='del'>-		mpt_entry-&gt;mtt_sz    = cpu_to_be32((1 &lt;&lt; mr-&gt;mtt.order) *</div><div class='del'>-						   dev-&gt;caps.mtts_per_seg);</div><div class='add'>+		mpt_entry-&gt;mtt_sz    = cpu_to_be32(1 &lt;&lt; mr-&gt;mtt.order);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mpt_entry-&gt;flags    |= cpu_to_be32(MLX4_MPT_FLAG_SW_OWNS);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -362,8 +536,7 @@ int mlx4_mr_enable(struct mlx4_dev *dev, struct mlx4_mr *mr)</div><div class='ctx'> 		mlx4_warn(dev, "SW2HW_MPT failed (%d)\n", err);</div><div class='ctx'> 		goto err_cmd;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	mr-&gt;enabled = 1;</div><div class='add'>+	mr-&gt;enabled = MLX4_MR_EN_HW;</div><div class='ctx'> </div><div class='ctx'> 	mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='ctx'> </div><div class='hunk'>@@ -373,7 +546,7 @@ err_cmd:</div><div class='ctx'> 	mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='ctx'> </div><div class='ctx'> err_table:</div><div class='del'>-	mlx4_table_put(dev, &amp;mr_table-&gt;dmpt_table, key_to_hw_index(mr-&gt;key));</div><div class='add'>+	mlx4_mr_free_icm(dev, key_to_hw_index(mr-&gt;key));</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_mr_enable);</div><div class='hunk'>@@ -385,18 +558,10 @@ static int mlx4_write_mtt_chunk(struct mlx4_dev *dev, struct mlx4_mtt *mtt,</div><div class='ctx'> 	__be64 *mtts;</div><div class='ctx'> 	dma_addr_t dma_handle;</div><div class='ctx'> 	int i;</div><div class='del'>-	int s = start_index * sizeof (u64);</div><div class='ctx'> </div><div class='del'>-	/* All MTTs must fit in the same page */</div><div class='del'>-	if (start_index / (PAGE_SIZE / sizeof (u64)) !=</div><div class='del'>-	    (start_index + npages - 1) / (PAGE_SIZE / sizeof (u64)))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (start_index &amp; (dev-&gt;caps.mtts_per_seg - 1))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	mtts = mlx4_table_find(&amp;priv-&gt;mr_table.mtt_table, mtt-&gt;offset +</div><div class='add'>+			       start_index, &amp;dma_handle);</div><div class='ctx'> </div><div class='del'>-	mtts = mlx4_table_find(&amp;priv-&gt;mr_table.mtt_table, mtt-&gt;first_seg +</div><div class='del'>-				s / dev-&gt;caps.mtt_entry_sz, &amp;dma_handle);</div><div class='ctx'> 	if (!mtts)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -412,27 +577,75 @@ static int mlx4_write_mtt_chunk(struct mlx4_dev *dev, struct mlx4_mtt *mtt,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mlx4_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,</div><div class='del'>-		   int start_index, int npages, u64 *page_list)</div><div class='add'>+int __mlx4_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,</div><div class='add'>+		     int start_index, int npages, u64 *page_list)</div><div class='ctx'> {</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	int chunk;</div><div class='del'>-	int err;</div><div class='add'>+	int mtts_per_page;</div><div class='add'>+	int max_mtts_first_page;</div><div class='ctx'> </div><div class='del'>-	if (mtt-&gt;order &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	/* compute how may mtts fit in the first page */</div><div class='add'>+	mtts_per_page = PAGE_SIZE / sizeof(u64);</div><div class='add'>+	max_mtts_first_page = mtts_per_page - (mtt-&gt;offset + start_index)</div><div class='add'>+			      % mtts_per_page;</div><div class='add'>+</div><div class='add'>+	chunk = min_t(int, max_mtts_first_page, npages);</div><div class='ctx'> </div><div class='ctx'> 	while (npages &gt; 0) {</div><div class='del'>-		chunk = min_t(int, PAGE_SIZE / sizeof(u64), npages);</div><div class='ctx'> 		err = mlx4_write_mtt_chunk(dev, mtt, start_index, chunk, page_list);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='del'>-</div><div class='ctx'> 		npages      -= chunk;</div><div class='ctx'> 		start_index += chunk;</div><div class='ctx'> 		page_list   += chunk;</div><div class='add'>+</div><div class='add'>+		chunk = min_t(int, mtts_per_page, npages);</div><div class='ctx'> 	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+int mlx4_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,</div><div class='add'>+		   int start_index, int npages, u64 *page_list)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_cmd_mailbox *mailbox = NULL;</div><div class='add'>+	__be64 *inbox = NULL;</div><div class='add'>+	int chunk;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (mtt-&gt;order &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		mailbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='add'>+		if (IS_ERR(mailbox))</div><div class='add'>+			return PTR_ERR(mailbox);</div><div class='add'>+		inbox = mailbox-&gt;buf;</div><div class='add'>+</div><div class='add'>+		while (npages &gt; 0) {</div><div class='add'>+			chunk = min_t(int, MLX4_MAILBOX_SIZE / sizeof(u64) - 2,</div><div class='add'>+				      npages);</div><div class='add'>+			inbox[0] = cpu_to_be64(mtt-&gt;offset + start_index);</div><div class='add'>+			inbox[1] = 0;</div><div class='add'>+			for (i = 0; i &lt; chunk; ++i)</div><div class='add'>+				inbox[i + 2] = cpu_to_be64(page_list[i] |</div><div class='add'>+					       MLX4_MTT_FLAG_PRESENT);</div><div class='add'>+			err = mlx4_WRITE_MTT(dev, mailbox, chunk);</div><div class='add'>+			if (err) {</div><div class='add'>+				mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='add'>+				return err;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			npages      -= chunk;</div><div class='add'>+			start_index += chunk;</div><div class='add'>+			page_list   += chunk;</div><div class='add'>+		}</div><div class='add'>+		mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __mlx4_write_mtt(dev, mtt, start_index, npages, page_list);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_write_mtt);</div><div class='ctx'> </div><div class='hunk'>@@ -462,21 +675,34 @@ EXPORT_SYMBOL_GPL(mlx4_buf_write_mtt);</div><div class='ctx'> </div><div class='ctx'> int mlx4_init_mr_table(struct mlx4_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct mlx4_mr_table *mr_table = &amp;mlx4_priv(dev)-&gt;mr_table;</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_mr_table *mr_table = &amp;priv-&gt;mr_table;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	if (!is_power_of_2(dev-&gt;caps.num_mpts))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Nothing to do for slaves - all MR handling is forwarded</div><div class='add'>+	* to the master */</div><div class='add'>+	if (mlx4_is_slave(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	err = mlx4_bitmap_init(&amp;mr_table-&gt;mpt_bitmap, dev-&gt;caps.num_mpts,</div><div class='ctx'> 			       ~0, dev-&gt;caps.reserved_mrws, 0);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_buddy_init(&amp;mr_table-&gt;mtt_buddy,</div><div class='del'>-			      ilog2(dev-&gt;caps.num_mtt_segs));</div><div class='add'>+			      ilog2(dev-&gt;caps.num_mtts /</div><div class='add'>+			      (1 &lt;&lt; log_mtts_per_seg)));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_buddy;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;caps.reserved_mtts) {</div><div class='del'>-		if (mlx4_alloc_mtt_range(dev, fls(dev-&gt;caps.reserved_mtts - 1)) == -1) {</div><div class='add'>+		priv-&gt;reserved_mtts =</div><div class='add'>+			mlx4_alloc_mtt_range(dev,</div><div class='add'>+					     fls(dev-&gt;caps.reserved_mtts - 1));</div><div class='add'>+		if (priv-&gt;reserved_mtts &lt; 0) {</div><div class='ctx'> 			mlx4_warn(dev, "MTT table of order %d is too small.\n",</div><div class='ctx'> 				  mr_table-&gt;mtt_buddy.max_order);</div><div class='ctx'> 			err = -ENOMEM;</div><div class='hunk'>@@ -497,8 +723,14 @@ err_buddy:</div><div class='ctx'> </div><div class='ctx'> void mlx4_cleanup_mr_table(struct mlx4_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct mlx4_mr_table *mr_table = &amp;mlx4_priv(dev)-&gt;mr_table;</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_mr_table *mr_table = &amp;priv-&gt;mr_table;</div><div class='ctx'> </div><div class='add'>+	if (mlx4_is_slave(dev))</div><div class='add'>+		return;</div><div class='add'>+	if (priv-&gt;reserved_mtts &gt;= 0)</div><div class='add'>+		mlx4_free_mtt_range(dev, priv-&gt;reserved_mtts,</div><div class='add'>+				    fls(dev-&gt;caps.reserved_mtts - 1));</div><div class='ctx'> 	mlx4_buddy_cleanup(&amp;mr_table-&gt;mtt_buddy);</div><div class='ctx'> 	mlx4_bitmap_cleanup(&amp;mr_table-&gt;mpt_bitmap);</div><div class='ctx'> }</div><div class='hunk'>@@ -581,7 +813,7 @@ int mlx4_fmr_alloc(struct mlx4_dev *dev, u32 pd, u32 access, int max_pages,</div><div class='ctx'> 		   int max_maps, u8 page_shift, struct mlx4_fmr *fmr)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='del'>-	u64 mtt_seg;</div><div class='add'>+	u64 mtt_offset;</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (page_shift &lt; (ffs(dev-&gt;caps.page_size_cap) - 1) || page_shift &gt;= 32)</div><div class='hunk'>@@ -601,11 +833,12 @@ int mlx4_fmr_alloc(struct mlx4_dev *dev, u32 pd, u32 access, int max_pages,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	mtt_seg = fmr-&gt;mr.mtt.first_seg * dev-&gt;caps.mtt_entry_sz;</div><div class='add'>+	mtt_offset = fmr-&gt;mr.mtt.offset * dev-&gt;caps.mtt_entry_sz;</div><div class='ctx'> </div><div class='ctx'> 	fmr-&gt;mtts = mlx4_table_find(&amp;priv-&gt;mr_table.mtt_table,</div><div class='del'>-				    fmr-&gt;mr.mtt.first_seg,</div><div class='add'>+				    fmr-&gt;mr.mtt.offset,</div><div class='ctx'> 				    &amp;fmr-&gt;dma_handle);</div><div class='add'>+</div><div class='ctx'> 	if (!fmr-&gt;mtts) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_free;</div><div class='hunk'>@@ -619,6 +852,46 @@ err_free:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_fmr_alloc);</div><div class='ctx'> </div><div class='add'>+static int mlx4_fmr_alloc_reserved(struct mlx4_dev *dev, u32 mridx,</div><div class='add'>+			    u32 pd, u32 access, int max_pages,</div><div class='add'>+			    int max_maps, u8 page_shift, struct mlx4_fmr *fmr)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	int err = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (page_shift &lt; (ffs(dev-&gt;caps.page_size_cap) - 1) || page_shift &gt;= 32)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* All MTTs must fit in the same page */</div><div class='add'>+	if (max_pages * sizeof *fmr-&gt;mtts &gt; PAGE_SIZE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	fmr-&gt;page_shift = page_shift;</div><div class='add'>+	fmr-&gt;max_pages  = max_pages;</div><div class='add'>+	fmr-&gt;max_maps   = max_maps;</div><div class='add'>+	fmr-&gt;maps = 0;</div><div class='add'>+</div><div class='add'>+	err = mlx4_mr_alloc_reserved(dev, mridx, pd, 0, 0, access, max_pages,</div><div class='add'>+				     page_shift, &amp;fmr-&gt;mr);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	fmr-&gt;mtts = mlx4_table_find(&amp;priv-&gt;mr_table.mtt_table,</div><div class='add'>+				    fmr-&gt;mr.mtt.offset,</div><div class='add'>+				    &amp;fmr-&gt;dma_handle);</div><div class='add'>+	if (!fmr-&gt;mtts) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free:</div><div class='add'>+	mlx4_mr_free_reserved(dev, &amp;fmr-&gt;mr);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mlx4_fmr_alloc_reserved);</div><div class='add'>+</div><div class='ctx'> int mlx4_fmr_enable(struct mlx4_dev *dev, struct mlx4_fmr *fmr)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='hunk'>@@ -640,12 +913,32 @@ EXPORT_SYMBOL_GPL(mlx4_fmr_enable);</div><div class='ctx'> void mlx4_fmr_unmap(struct mlx4_dev *dev, struct mlx4_fmr *fmr,</div><div class='ctx'> 		    u32 *lkey, u32 *rkey)</div><div class='ctx'> {</div><div class='add'>+	struct mlx4_cmd_mailbox *mailbox;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	if (!fmr-&gt;maps)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	fmr-&gt;maps = 0;</div><div class='ctx'> </div><div class='del'>-	*(u8 *) fmr-&gt;mpt = MLX4_MPT_STATUS_SW;</div><div class='add'>+	mailbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='add'>+	if (IS_ERR(mailbox)) {</div><div class='add'>+		err = PTR_ERR(mailbox);</div><div class='add'>+		printk(KERN_WARNING "mlx4_ib: mlx4_alloc_cmd_mailbox"</div><div class='add'>+		       " failed (%d)\n", err);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mlx4_HW2SW_MPT(dev, NULL,</div><div class='add'>+			     key_to_hw_index(fmr-&gt;mr.key) &amp;</div><div class='add'>+			     (dev-&gt;caps.num_mpts - 1));</div><div class='add'>+	mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_WARNING "mlx4_ib: mlx4_HW2SW_MPT failed (%d)\n",</div><div class='add'>+		       err);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	fmr-&gt;mr.enabled = MLX4_MR_EN_SW;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_fmr_unmap);</div><div class='ctx'> </div><div class='hunk'>@@ -654,15 +947,28 @@ int mlx4_fmr_free(struct mlx4_dev *dev, struct mlx4_fmr *fmr)</div><div class='ctx'> 	if (fmr-&gt;maps)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	fmr-&gt;mr.enabled = 0;</div><div class='ctx'> 	mlx4_mr_free(dev, &amp;fmr-&gt;mr);</div><div class='add'>+	fmr-&gt;mr.enabled = MLX4_MR_DISABLED;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_fmr_free);</div><div class='ctx'> </div><div class='add'>+static int mlx4_fmr_free_reserved(struct mlx4_dev *dev, struct mlx4_fmr *fmr)</div><div class='add'>+{</div><div class='add'>+	if (fmr-&gt;maps)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	mlx4_mr_free_reserved(dev, &amp;fmr-&gt;mr);</div><div class='add'>+	fmr-&gt;mr.enabled = MLX4_MR_DISABLED;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mlx4_fmr_free_reserved);</div><div class='add'>+</div><div class='ctx'> int mlx4_SYNC_TPT(struct mlx4_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	return mlx4_cmd(dev, 0, 0, 0, MLX4_CMD_SYNC_TPT, 1000);</div><div class='add'>+	return mlx4_cmd(dev, 0, 0, 0, MLX4_CMD_SYNC_TPT, 1000,</div><div class='add'>+			MLX4_CMD_WRAPPED);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_SYNC_TPT);</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/pd.c b/drivers/net/ethernet/mellanox/mlx4/pd.c<br/>index 260ed259ce9b..5c9a54df17ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/pd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/pd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/pd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/pd.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'>  * SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/io-mapping.h&gt;</div><div class='hunk'>@@ -51,7 +52,8 @@ int mlx4_pd_alloc(struct mlx4_dev *dev, u32 *pdn)</div><div class='ctx'> 	*pdn = mlx4_bitmap_alloc(&amp;priv-&gt;pd_bitmap);</div><div class='ctx'> 	if (*pdn == -1)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-</div><div class='add'>+	if (mlx4_is_mfunc(dev))</div><div class='add'>+		*pdn |= (dev-&gt;caps.function + 1) &lt;&lt; NOT_MASKED_PD_BITS;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_pd_alloc);</div><div class='hunk'>@@ -85,7 +87,8 @@ int mlx4_init_pd_table(struct mlx4_dev *dev)</div><div class='ctx'> 	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	return mlx4_bitmap_init(&amp;priv-&gt;pd_bitmap, dev-&gt;caps.num_pds,</div><div class='del'>-				(1 &lt;&lt; 24) - 1, dev-&gt;caps.reserved_pds, 0);</div><div class='add'>+				(1 &lt;&lt; NOT_MASKED_PD_BITS) - 1,</div><div class='add'>+				 dev-&gt;caps.reserved_pds, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mlx4_cleanup_pd_table(struct mlx4_dev *dev)</div><div class='hunk'>@@ -108,13 +111,19 @@ void mlx4_cleanup_xrcd_table(struct mlx4_dev *dev)</div><div class='ctx'> </div><div class='ctx'> int mlx4_uar_alloc(struct mlx4_dev *dev, struct mlx4_uar *uar)</div><div class='ctx'> {</div><div class='add'>+	int offset;</div><div class='add'>+</div><div class='ctx'> 	uar-&gt;index = mlx4_bitmap_alloc(&amp;mlx4_priv(dev)-&gt;uar_table.bitmap);</div><div class='ctx'> 	if (uar-&gt;index == -1)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	uar-&gt;pfn = (pci_resource_start(dev-&gt;pdev, 2) &gt;&gt; PAGE_SHIFT) + uar-&gt;index;</div><div class='add'>+	if (mlx4_is_slave(dev))</div><div class='add'>+		offset = uar-&gt;index % ((int) pci_resource_len(dev-&gt;pdev, 2) /</div><div class='add'>+				       dev-&gt;caps.uar_page_size);</div><div class='add'>+	else</div><div class='add'>+		offset = uar-&gt;index;</div><div class='add'>+	uar-&gt;pfn = (pci_resource_start(dev-&gt;pdev, 2) &gt;&gt; PAGE_SHIFT) + offset;</div><div class='ctx'> 	uar-&gt;map = NULL;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_uar_alloc);</div><div class='hunk'>@@ -232,7 +241,7 @@ int mlx4_init_uar_table(struct mlx4_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	return mlx4_bitmap_init(&amp;mlx4_priv(dev)-&gt;uar_table.bitmap,</div><div class='ctx'> 				dev-&gt;caps.num_uars, dev-&gt;caps.num_uars - 1,</div><div class='del'>-				max(128, dev-&gt;caps.reserved_uars), 0);</div><div class='add'>+				dev-&gt;caps.reserved_uars, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mlx4_cleanup_uar_table(struct mlx4_dev *dev)</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c<br/>index d942aea4927b..88b52e547524 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/port.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/port.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/port.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/port.c</a></div><div class='hunk'>@@ -70,41 +70,12 @@ void mlx4_init_vlan_table(struct mlx4_dev *dev, struct mlx4_vlan_table *table)</div><div class='ctx'> 	table-&gt;total = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mlx4_set_port_mac_table(struct mlx4_dev *dev, u8 port,</div><div class='del'>-				   __be64 *entries)</div><div class='del'>-{</div><div class='del'>-	struct mlx4_cmd_mailbox *mailbox;</div><div class='del'>-	u32 in_mod;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mailbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='del'>-	if (IS_ERR(mailbox))</div><div class='del'>-		return PTR_ERR(mailbox);</div><div class='del'>-</div><div class='del'>-	memcpy(mailbox-&gt;buf, entries, MLX4_MAC_TABLE_SIZE);</div><div class='del'>-</div><div class='del'>-	in_mod = MLX4_SET_PORT_MAC_TABLE &lt;&lt; 8 | port;</div><div class='del'>-	err = mlx4_cmd(dev, mailbox-&gt;dma, in_mod, 1, MLX4_CMD_SET_PORT,</div><div class='del'>-		       MLX4_CMD_TIME_CLASS_B);</div><div class='del'>-</div><div class='del'>-	mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mlx4_uc_steer_add(struct mlx4_dev *dev, u8 port,</div><div class='del'>-			     u64 mac, int *qpn, u8 reserve)</div><div class='add'>+static int mlx4_uc_steer_add(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_qp qp;</div><div class='ctx'> 	u8 gid[16] = {0};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (reserve) {</div><div class='del'>-		err = mlx4_qp_reserve_range(dev, 1, 1, qpn);</div><div class='del'>-		if (err) {</div><div class='del'>-			mlx4_err(dev, "Failed to reserve qp for mac registration\n");</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 	qp.qpn = *qpn;</div><div class='ctx'> </div><div class='ctx'> 	mac &amp;= 0xffffffffffffULL;</div><div class='hunk'>@@ -113,16 +84,15 @@ static int mlx4_uc_steer_add(struct mlx4_dev *dev, u8 port,</div><div class='ctx'> 	gid[5] = port;</div><div class='ctx'> 	gid[7] = MLX4_UC_STEER &lt;&lt; 1;</div><div class='ctx'> </div><div class='del'>-	err = mlx4_qp_attach_common(dev, &amp;qp, gid, 0,</div><div class='del'>-				    MLX4_PROT_ETH, MLX4_UC_STEER);</div><div class='del'>-	if (err &amp;&amp; reserve)</div><div class='del'>-		mlx4_qp_release_range(dev, *qpn, 1);</div><div class='add'>+	err = mlx4_unicast_attach(dev, &amp;qp, gid, 0, MLX4_PROT_ETH);</div><div class='add'>+	if (err)</div><div class='add'>+		mlx4_warn(dev, "Failed Attaching Unicast\n");</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mlx4_uc_steer_release(struct mlx4_dev *dev, u8 port,</div><div class='del'>-				  u64 mac, int qpn, u8 free)</div><div class='add'>+				  u64 mac, int qpn)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_qp qp;</div><div class='ctx'> 	u8 gid[16] = {0};</div><div class='hunk'>@@ -134,60 +104,164 @@ static void mlx4_uc_steer_release(struct mlx4_dev *dev, u8 port,</div><div class='ctx'> 	gid[5] = port;</div><div class='ctx'> 	gid[7] = MLX4_UC_STEER &lt;&lt; 1;</div><div class='ctx'> </div><div class='del'>-	mlx4_qp_detach_common(dev, &amp;qp, gid, MLX4_PROT_ETH, MLX4_UC_STEER);</div><div class='del'>-	if (free)</div><div class='del'>-		mlx4_qp_release_range(dev, qpn, 1);</div><div class='add'>+	mlx4_unicast_detach(dev, &amp;qp, gid, MLX4_PROT_ETH);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int validate_index(struct mlx4_dev *dev,</div><div class='add'>+			  struct mlx4_mac_table *table, int index)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (index &lt; 0 || index &gt;= table-&gt;max || !table-&gt;entries[index]) {</div><div class='add'>+		mlx4_warn(dev, "No valid Mac entry for the given index\n");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int find_index(struct mlx4_dev *dev,</div><div class='add'>+		      struct mlx4_mac_table *table, u64 mac)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MLX4_MAX_MAC_NUM; i++) {</div><div class='add'>+		if ((mac &amp; MLX4_MAC_MASK) ==</div><div class='add'>+		    (MLX4_MAC_MASK &amp; be64_to_cpu(table-&gt;entries[i])))</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+	/* Mac not found */</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn, u8 wrap)</div><div class='add'>+int mlx4_get_eth_qp(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_port_info *info = &amp;mlx4_priv(dev)-&gt;port[port];</div><div class='del'>-	struct mlx4_mac_table *table = &amp;info-&gt;mac_table;</div><div class='ctx'> 	struct mlx4_mac_entry *entry;</div><div class='del'>-	int i, err = 0;</div><div class='del'>-	int free = -1;</div><div class='add'>+	int index = 0;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_UC_STEER) {</div><div class='del'>-		err = mlx4_uc_steer_add(dev, port, mac, qpn, 1);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+	mlx4_dbg(dev, "Registering MAC: 0x%llx for adding\n",</div><div class='add'>+			(unsigned long long) mac);</div><div class='add'>+	index = mlx4_register_mac(dev, port, mac);</div><div class='add'>+	if (index &lt; 0) {</div><div class='add'>+		err = index;</div><div class='add'>+		mlx4_err(dev, "Failed adding MAC: 0x%llx\n",</div><div class='add'>+			 (unsigned long long) mac);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		entry = kmalloc(sizeof *entry, GFP_KERNEL);</div><div class='del'>-		if (!entry) {</div><div class='del'>-			mlx4_uc_steer_release(dev, port, mac, *qpn, 1);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='add'>+	if (!(dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_UC_STEER)) {</div><div class='add'>+		*qpn = info-&gt;base_qpn + index;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mlx4_qp_reserve_range(dev, 1, 1, qpn);</div><div class='add'>+	mlx4_dbg(dev, "Reserved qp %d\n", *qpn);</div><div class='add'>+	if (err) {</div><div class='add'>+		mlx4_err(dev, "Failed to reserve qp for mac registration\n");</div><div class='add'>+		goto qp_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mlx4_uc_steer_add(dev, port, mac, qpn);</div><div class='add'>+	if (err)</div><div class='add'>+		goto steer_err;</div><div class='ctx'> </div><div class='del'>-		entry-&gt;mac = mac;</div><div class='del'>-		err = radix_tree_insert(&amp;info-&gt;mac_tree, *qpn, entry);</div><div class='del'>-		if (err) {</div><div class='add'>+	entry = kmalloc(sizeof *entry, GFP_KERNEL);</div><div class='add'>+	if (!entry) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto alloc_err;</div><div class='add'>+	}</div><div class='add'>+	entry-&gt;mac = mac;</div><div class='add'>+	err = radix_tree_insert(&amp;info-&gt;mac_tree, *qpn, entry);</div><div class='add'>+	if (err)</div><div class='add'>+		goto insert_err;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+insert_err:</div><div class='add'>+	kfree(entry);</div><div class='add'>+</div><div class='add'>+alloc_err:</div><div class='add'>+	mlx4_uc_steer_release(dev, port, mac, *qpn);</div><div class='add'>+</div><div class='add'>+steer_err:</div><div class='add'>+	mlx4_qp_release_range(dev, *qpn, 1);</div><div class='add'>+</div><div class='add'>+qp_err:</div><div class='add'>+	mlx4_unregister_mac(dev, port, mac);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mlx4_get_eth_qp);</div><div class='add'>+</div><div class='add'>+void mlx4_put_eth_qp(struct mlx4_dev *dev, u8 port, u64 mac, int qpn)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_port_info *info = &amp;mlx4_priv(dev)-&gt;port[port];</div><div class='add'>+	struct mlx4_mac_entry *entry;</div><div class='add'>+</div><div class='add'>+	mlx4_dbg(dev, "Registering MAC: 0x%llx for deleting\n",</div><div class='add'>+		 (unsigned long long) mac);</div><div class='add'>+	mlx4_unregister_mac(dev, port, mac);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_UC_STEER) {</div><div class='add'>+		entry = radix_tree_lookup(&amp;info-&gt;mac_tree, qpn);</div><div class='add'>+		if (entry) {</div><div class='add'>+			mlx4_dbg(dev, "Releasing qp: port %d, mac 0x%llx,"</div><div class='add'>+				 " qpn %d\n", port,</div><div class='add'>+				 (unsigned long long) mac, qpn);</div><div class='add'>+			mlx4_uc_steer_release(dev, port, entry-&gt;mac, qpn);</div><div class='add'>+			mlx4_qp_release_range(dev, qpn, 1);</div><div class='add'>+			radix_tree_delete(&amp;info-&gt;mac_tree, qpn);</div><div class='ctx'> 			kfree(entry);</div><div class='del'>-			mlx4_uc_steer_release(dev, port, mac, *qpn, 1);</div><div class='del'>-			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mlx4_put_eth_qp);</div><div class='add'>+</div><div class='add'>+static int mlx4_set_port_mac_table(struct mlx4_dev *dev, u8 port,</div><div class='add'>+				   __be64 *entries)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_cmd_mailbox *mailbox;</div><div class='add'>+	u32 in_mod;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	mlx4_dbg(dev, "Registering MAC: 0x%llx\n", (unsigned long long) mac);</div><div class='add'>+	mailbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='add'>+	if (IS_ERR(mailbox))</div><div class='add'>+		return PTR_ERR(mailbox);</div><div class='add'>+</div><div class='add'>+	memcpy(mailbox-&gt;buf, entries, MLX4_MAC_TABLE_SIZE);</div><div class='add'>+</div><div class='add'>+	in_mod = MLX4_SET_PORT_MAC_TABLE &lt;&lt; 8 | port;</div><div class='add'>+</div><div class='add'>+	err = mlx4_cmd(dev, mailbox-&gt;dma, in_mod, 1, MLX4_CMD_SET_PORT,</div><div class='add'>+		       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);</div><div class='add'>+</div><div class='add'>+	mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_port_info *info = &amp;mlx4_priv(dev)-&gt;port[port];</div><div class='add'>+	struct mlx4_mac_table *table = &amp;info-&gt;mac_table;</div><div class='add'>+	int i, err = 0;</div><div class='add'>+	int free = -1;</div><div class='add'>+</div><div class='add'>+	mlx4_dbg(dev, "Registering MAC: 0x%llx for port %d\n",</div><div class='add'>+		 (unsigned long long) mac, port);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;table-&gt;mutex);</div><div class='del'>-	for (i = 0; i &lt; MLX4_MAX_MAC_NUM - 1; i++) {</div><div class='del'>-		if (free &lt; 0 &amp;&amp; !table-&gt;refs[i]) {</div><div class='add'>+	for (i = 0; i &lt; MLX4_MAX_MAC_NUM; i++) {</div><div class='add'>+		if (free &lt; 0 &amp;&amp; !table-&gt;entries[i]) {</div><div class='ctx'> 			free = i;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (mac == (MLX4_MAC_MASK &amp; be64_to_cpu(table-&gt;entries[i]))) {</div><div class='del'>-			/* MAC already registered, increase references count */</div><div class='del'>-			++table-&gt;refs[i];</div><div class='add'>+			/* MAC already registered, Must not have duplicates */</div><div class='add'>+			err = -EEXIST;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (free &lt; 0) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	mlx4_dbg(dev, "Free MAC index is %d\n", free);</div><div class='ctx'> </div><div class='ctx'> 	if (table-&gt;total == table-&gt;max) {</div><div class='hunk'>@@ -197,103 +271,103 @@ int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn, u8 wrap)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Register new MAC */</div><div class='del'>-	table-&gt;refs[free] = 1;</div><div class='ctx'> 	table-&gt;entries[free] = cpu_to_be64(mac | MLX4_MAC_VALID);</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_set_port_mac_table(dev, port, table-&gt;entries);</div><div class='ctx'> 	if (unlikely(err)) {</div><div class='del'>-		mlx4_err(dev, "Failed adding MAC: 0x%llx\n", (unsigned long long) mac);</div><div class='del'>-		table-&gt;refs[free] = 0;</div><div class='add'>+		mlx4_err(dev, "Failed adding MAC: 0x%llx\n",</div><div class='add'>+			 (unsigned long long) mac);</div><div class='ctx'> 		table-&gt;entries[free] = 0;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_UC_STEER))</div><div class='del'>-		*qpn = info-&gt;base_qpn + free;</div><div class='add'>+	err = free;</div><div class='ctx'> 	++table-&gt;total;</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;table-&gt;mutex);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(mlx4_register_mac);</div><div class='add'>+EXPORT_SYMBOL_GPL(__mlx4_register_mac);</div><div class='ctx'> </div><div class='del'>-static int validate_index(struct mlx4_dev *dev,</div><div class='del'>-			  struct mlx4_mac_table *table, int index)</div><div class='add'>+int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	u64 out_param;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (index &lt; 0 || index &gt;= table-&gt;max || !table-&gt;entries[index]) {</div><div class='del'>-		mlx4_warn(dev, "No valid Mac entry for the given index\n");</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		set_param_l(&amp;out_param, port);</div><div class='add'>+		err = mlx4_cmd_imm(dev, mac, &amp;out_param, RES_MAC,</div><div class='add'>+				   RES_OP_RESERVE_AND_MAP, MLX4_CMD_ALLOC_RES,</div><div class='add'>+				   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='del'>-static int find_index(struct mlx4_dev *dev,</div><div class='del'>-		      struct mlx4_mac_table *table, u64 mac)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; MLX4_MAX_MAC_NUM; i++) {</div><div class='del'>-		if (mac == (MLX4_MAC_MASK &amp; be64_to_cpu(table-&gt;entries[i])))</div><div class='del'>-			return i;</div><div class='add'>+		return get_param_l(&amp;out_param);</div><div class='ctx'> 	}</div><div class='del'>-	/* Mac not found */</div><div class='del'>-	return -EINVAL;</div><div class='add'>+	return __mlx4_register_mac(dev, port, mac);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mlx4_register_mac);</div><div class='ctx'> </div><div class='del'>-void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, int qpn)</div><div class='add'>+</div><div class='add'>+void __mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_port_info *info = &amp;mlx4_priv(dev)-&gt;port[port];</div><div class='ctx'> 	struct mlx4_mac_table *table = &amp;info-&gt;mac_table;</div><div class='del'>-	int index = qpn - info-&gt;base_qpn;</div><div class='del'>-	struct mlx4_mac_entry *entry;</div><div class='add'>+	int index;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_UC_STEER) {</div><div class='del'>-		entry = radix_tree_lookup(&amp;info-&gt;mac_tree, qpn);</div><div class='del'>-		if (entry) {</div><div class='del'>-			mlx4_uc_steer_release(dev, port, entry-&gt;mac, qpn, 1);</div><div class='del'>-			radix_tree_delete(&amp;info-&gt;mac_tree, qpn);</div><div class='del'>-			index = find_index(dev, table, entry-&gt;mac);</div><div class='del'>-			kfree(entry);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	index = find_index(dev, table, mac);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;table-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (validate_index(dev, table, index))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* Check whether this address has reference count */</div><div class='del'>-	if (!(--table-&gt;refs[index])) {</div><div class='del'>-		table-&gt;entries[index] = 0;</div><div class='del'>-		mlx4_set_port_mac_table(dev, port, table-&gt;entries);</div><div class='del'>-		--table-&gt;total;</div><div class='del'>-	}</div><div class='add'>+	table-&gt;entries[index] = 0;</div><div class='add'>+	mlx4_set_port_mac_table(dev, port, table-&gt;entries);</div><div class='add'>+	--table-&gt;total;</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;table-&gt;mutex);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(__mlx4_unregister_mac);</div><div class='add'>+</div><div class='add'>+void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac)</div><div class='add'>+{</div><div class='add'>+	u64 out_param;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		set_param_l(&amp;out_param, port);</div><div class='add'>+		err = mlx4_cmd_imm(dev, mac, &amp;out_param, RES_MAC,</div><div class='add'>+				   RES_OP_RESERVE_AND_MAP, MLX4_CMD_FREE_RES,</div><div class='add'>+				   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	__mlx4_unregister_mac(dev, port, mac);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_unregister_mac);</div><div class='ctx'> </div><div class='del'>-int mlx4_replace_mac(struct mlx4_dev *dev, u8 port, int qpn, u64 new_mac, u8 wrap)</div><div class='add'>+int mlx4_replace_mac(struct mlx4_dev *dev, u8 port, int qpn, u64 new_mac)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_port_info *info = &amp;mlx4_priv(dev)-&gt;port[port];</div><div class='ctx'> 	struct mlx4_mac_table *table = &amp;info-&gt;mac_table;</div><div class='del'>-	int index = qpn - info-&gt;base_qpn;</div><div class='ctx'> 	struct mlx4_mac_entry *entry;</div><div class='del'>-	int err;</div><div class='add'>+	int index = qpn - info-&gt;base_qpn;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_UC_STEER) {</div><div class='ctx'> 		entry = radix_tree_lookup(&amp;info-&gt;mac_tree, qpn);</div><div class='ctx'> 		if (!entry)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		index = find_index(dev, table, entry-&gt;mac);</div><div class='del'>-		mlx4_uc_steer_release(dev, port, entry-&gt;mac, qpn, 0);</div><div class='add'>+		mlx4_uc_steer_release(dev, port, entry-&gt;mac, qpn);</div><div class='add'>+		mlx4_unregister_mac(dev, port, entry-&gt;mac);</div><div class='ctx'> 		entry-&gt;mac = new_mac;</div><div class='del'>-		err = mlx4_uc_steer_add(dev, port, entry-&gt;mac, &amp;qpn, 0);</div><div class='del'>-		if (err || index &lt; 0)</div><div class='del'>-			return err;</div><div class='add'>+		mlx4_register_mac(dev, port, new_mac);</div><div class='add'>+		err = mlx4_uc_steer_add(dev, port, entry-&gt;mac, &amp;qpn);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* CX1 doesn't support multi-functions */</div><div class='ctx'> 	mutex_lock(&amp;table-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	err = validate_index(dev, table, index);</div><div class='hunk'>@@ -304,7 +378,8 @@ int mlx4_replace_mac(struct mlx4_dev *dev, u8 port, int qpn, u64 new_mac, u8 wra</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_set_port_mac_table(dev, port, table-&gt;entries);</div><div class='ctx'> 	if (unlikely(err)) {</div><div class='del'>-		mlx4_err(dev, "Failed adding MAC: 0x%llx\n", (unsigned long long) new_mac);</div><div class='add'>+		mlx4_err(dev, "Failed adding MAC: 0x%llx\n",</div><div class='add'>+			 (unsigned long long) new_mac);</div><div class='ctx'> 		table-&gt;entries[index] = 0;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='hunk'>@@ -312,6 +387,7 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_replace_mac);</div><div class='add'>+</div><div class='ctx'> static int mlx4_set_port_vlan_table(struct mlx4_dev *dev, u8 port,</div><div class='ctx'> 				    __be32 *entries)</div><div class='ctx'> {</div><div class='hunk'>@@ -326,7 +402,7 @@ static int mlx4_set_port_vlan_table(struct mlx4_dev *dev, u8 port,</div><div class='ctx'> 	memcpy(mailbox-&gt;buf, entries, MLX4_VLAN_TABLE_SIZE);</div><div class='ctx'> 	in_mod = MLX4_SET_PORT_VLAN_TABLE &lt;&lt; 8 | port;</div><div class='ctx'> 	err = mlx4_cmd(dev, mailbox-&gt;dma, in_mod, 1, MLX4_CMD_SET_PORT,</div><div class='del'>-		       MLX4_CMD_TIME_CLASS_B);</div><div class='add'>+		       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_WRAPPED);</div><div class='ctx'> </div><div class='ctx'> 	mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='ctx'> </div><div class='hunk'>@@ -352,7 +428,8 @@ int mlx4_find_cached_vlan(struct mlx4_dev *dev, u8 port, u16 vid, int *idx)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_find_cached_vlan);</div><div class='ctx'> </div><div class='del'>-int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index)</div><div class='add'>+static int __mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan,</div><div class='add'>+				int *index)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_vlan_table *table = &amp;mlx4_priv(dev)-&gt;port[port].vlan_table;</div><div class='ctx'> 	int i, err = 0;</div><div class='hunk'>@@ -387,7 +464,7 @@ int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Register new MAC */</div><div class='add'>+	/* Register new VLAN */</div><div class='ctx'> 	table-&gt;refs[free] = 1;</div><div class='ctx'> 	table-&gt;entries[free] = cpu_to_be32(vlan | MLX4_VLAN_VALID);</div><div class='ctx'> </div><div class='hunk'>@@ -405,9 +482,27 @@ out:</div><div class='ctx'> 	mutex_unlock(&amp;table-&gt;mutex);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index)</div><div class='add'>+{</div><div class='add'>+	u64 out_param;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		set_param_l(&amp;out_param, port);</div><div class='add'>+		err = mlx4_cmd_imm(dev, vlan, &amp;out_param, RES_VLAN,</div><div class='add'>+				   RES_OP_RESERVE_AND_MAP, MLX4_CMD_ALLOC_RES,</div><div class='add'>+				   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);</div><div class='add'>+		if (!err)</div><div class='add'>+			*index = get_param_l(&amp;out_param);</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	return __mlx4_register_vlan(dev, port, vlan, index);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_register_vlan);</div><div class='ctx'> </div><div class='del'>-void mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, int index)</div><div class='add'>+static void __mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_vlan_table *table = &amp;mlx4_priv(dev)-&gt;port[port].vlan_table;</div><div class='ctx'> </div><div class='hunk'>@@ -432,6 +527,25 @@ void mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, int index)</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;table-&gt;mutex);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, int index)</div><div class='add'>+{</div><div class='add'>+	u64 in_param;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		set_param_l(&amp;in_param, port);</div><div class='add'>+		err = mlx4_cmd(dev, in_param, RES_VLAN, RES_OP_RESERVE_AND_MAP,</div><div class='add'>+			       MLX4_CMD_FREE_RES, MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+			       MLX4_CMD_WRAPPED);</div><div class='add'>+		if (!err)</div><div class='add'>+			mlx4_warn(dev, "Failed freeing vlan at index:%d\n",</div><div class='add'>+					index);</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	__mlx4_unregister_vlan(dev, port, index);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_unregister_vlan);</div><div class='ctx'> </div><div class='ctx'> int mlx4_get_port_ib_caps(struct mlx4_dev *dev, u8 port, __be32 *caps)</div><div class='hunk'>@@ -462,7 +576,8 @@ int mlx4_get_port_ib_caps(struct mlx4_dev *dev, u8 port, __be32 *caps)</div><div class='ctx'> 	*(__be32 *) (&amp;inbuf[20]) = cpu_to_be32(port);</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_cmd_box(dev, inmailbox-&gt;dma, outmailbox-&gt;dma, port, 3,</div><div class='del'>-			   MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C);</div><div class='add'>+			   MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C,</div><div class='add'>+			   MLX4_CMD_NATIVE);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		*caps = *(__be32 *) (outbuf + 84);</div><div class='ctx'> 	mlx4_free_cmd_mailbox(dev, inmailbox);</div><div class='hunk'>@@ -499,7 +614,8 @@ int mlx4_check_ext_port_caps(struct mlx4_dev *dev, u8 port)</div><div class='ctx'> 	*(__be32 *) (&amp;inbuf[20]) = cpu_to_be32(port);</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_cmd_box(dev, inmailbox-&gt;dma, outmailbox-&gt;dma, port, 3,</div><div class='del'>-			   MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C);</div><div class='add'>+			   MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C,</div><div class='add'>+			   MLX4_CMD_NATIVE);</div><div class='ctx'> </div><div class='ctx'> 	packet_error = be16_to_cpu(*(__be16 *) (outbuf + 4));</div><div class='ctx'> </div><div class='hunk'>@@ -512,6 +628,139 @@ int mlx4_check_ext_port_caps(struct mlx4_dev *dev, u8 port)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mlx4_common_set_port(struct mlx4_dev *dev, int slave, u32 in_mod,</div><div class='add'>+				u8 op_mod, struct mlx4_cmd_mailbox *inbox)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_port_info *port_info;</div><div class='add'>+	struct mlx4_mfunc_master_ctx *master = &amp;priv-&gt;mfunc.master;</div><div class='add'>+	struct mlx4_slave_state *slave_st = &amp;master-&gt;slave_state[slave];</div><div class='add'>+	struct mlx4_set_port_rqp_calc_context *qpn_context;</div><div class='add'>+	struct mlx4_set_port_general_context *gen_context;</div><div class='add'>+	int reset_qkey_viols;</div><div class='add'>+	int port;</div><div class='add'>+	int is_eth;</div><div class='add'>+	u32 in_modifier;</div><div class='add'>+	u32 promisc;</div><div class='add'>+	u16 mtu, prev_mtu;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+	__be32 agg_cap_mask;</div><div class='add'>+	__be32 slave_cap_mask;</div><div class='add'>+	__be32 new_cap_mask;</div><div class='add'>+</div><div class='add'>+	port = in_mod &amp; 0xff;</div><div class='add'>+	in_modifier = in_mod &gt;&gt; 8;</div><div class='add'>+	is_eth = op_mod;</div><div class='add'>+	port_info = &amp;priv-&gt;port[port];</div><div class='add'>+</div><div class='add'>+	/* Slaves cannot perform SET_PORT operations except changing MTU */</div><div class='add'>+	if (is_eth) {</div><div class='add'>+		if (slave != dev-&gt;caps.function &amp;&amp;</div><div class='add'>+		    in_modifier != MLX4_SET_PORT_GENERAL) {</div><div class='add'>+			mlx4_warn(dev, "denying SET_PORT for slave:%d\n",</div><div class='add'>+					slave);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		switch (in_modifier) {</div><div class='add'>+		case MLX4_SET_PORT_RQP_CALC:</div><div class='add'>+			qpn_context = inbox-&gt;buf;</div><div class='add'>+			qpn_context-&gt;base_qpn =</div><div class='add'>+				cpu_to_be32(port_info-&gt;base_qpn);</div><div class='add'>+			qpn_context-&gt;n_mac = 0x7;</div><div class='add'>+			promisc = be32_to_cpu(qpn_context-&gt;promisc) &gt;&gt;</div><div class='add'>+				SET_PORT_PROMISC_SHIFT;</div><div class='add'>+			qpn_context-&gt;promisc = cpu_to_be32(</div><div class='add'>+				promisc &lt;&lt; SET_PORT_PROMISC_SHIFT |</div><div class='add'>+				port_info-&gt;base_qpn);</div><div class='add'>+			promisc = be32_to_cpu(qpn_context-&gt;mcast) &gt;&gt;</div><div class='add'>+				SET_PORT_MC_PROMISC_SHIFT;</div><div class='add'>+			qpn_context-&gt;mcast = cpu_to_be32(</div><div class='add'>+				promisc &lt;&lt; SET_PORT_MC_PROMISC_SHIFT |</div><div class='add'>+				port_info-&gt;base_qpn);</div><div class='add'>+			break;</div><div class='add'>+		case MLX4_SET_PORT_GENERAL:</div><div class='add'>+			gen_context = inbox-&gt;buf;</div><div class='add'>+			/* Mtu is configured as the max MTU among all the</div><div class='add'>+			 * the functions on the port. */</div><div class='add'>+			mtu = be16_to_cpu(gen_context-&gt;mtu);</div><div class='add'>+			mtu = min_t(int, mtu, dev-&gt;caps.eth_mtu_cap[port]);</div><div class='add'>+			prev_mtu = slave_st-&gt;mtu[port];</div><div class='add'>+			slave_st-&gt;mtu[port] = mtu;</div><div class='add'>+			if (mtu &gt; master-&gt;max_mtu[port])</div><div class='add'>+				master-&gt;max_mtu[port] = mtu;</div><div class='add'>+			if (mtu &lt; prev_mtu &amp;&amp; prev_mtu ==</div><div class='add'>+						master-&gt;max_mtu[port]) {</div><div class='add'>+				slave_st-&gt;mtu[port] = mtu;</div><div class='add'>+				master-&gt;max_mtu[port] = mtu;</div><div class='add'>+				for (i = 0; i &lt; dev-&gt;num_slaves; i++) {</div><div class='add'>+					master-&gt;max_mtu[port] =</div><div class='add'>+					max(master-&gt;max_mtu[port],</div><div class='add'>+					    master-&gt;slave_state[i].mtu[port]);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			gen_context-&gt;mtu = cpu_to_be16(master-&gt;max_mtu[port]);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		return mlx4_cmd(dev, inbox-&gt;dma, in_mod, op_mod,</div><div class='add'>+				MLX4_CMD_SET_PORT, MLX4_CMD_TIME_CLASS_B,</div><div class='add'>+				MLX4_CMD_NATIVE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* For IB, we only consider:</div><div class='add'>+	 * - The capability mask, which is set to the aggregate of all</div><div class='add'>+	 *   slave function capabilities</div><div class='add'>+	 * - The QKey violatin counter - reset according to each request.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;flags &amp; MLX4_FLAG_OLD_PORT_CMDS) {</div><div class='add'>+		reset_qkey_viols = (*(u8 *) inbox-&gt;buf) &amp; 0x40;</div><div class='add'>+		new_cap_mask = ((__be32 *) inbox-&gt;buf)[2];</div><div class='add'>+	} else {</div><div class='add'>+		reset_qkey_viols = ((u8 *) inbox-&gt;buf)[3] &amp; 0x1;</div><div class='add'>+		new_cap_mask = ((__be32 *) inbox-&gt;buf)[1];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	agg_cap_mask = 0;</div><div class='add'>+	slave_cap_mask =</div><div class='add'>+		priv-&gt;mfunc.master.slave_state[slave].ib_cap_mask[port];</div><div class='add'>+	priv-&gt;mfunc.master.slave_state[slave].ib_cap_mask[port] = new_cap_mask;</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;num_slaves; i++)</div><div class='add'>+		agg_cap_mask |=</div><div class='add'>+			priv-&gt;mfunc.master.slave_state[i].ib_cap_mask[port];</div><div class='add'>+</div><div class='add'>+	/* only clear mailbox for guests.  Master may be setting</div><div class='add'>+	* MTU or PKEY table size</div><div class='add'>+	*/</div><div class='add'>+	if (slave != dev-&gt;caps.function)</div><div class='add'>+		memset(inbox-&gt;buf, 0, 256);</div><div class='add'>+	if (dev-&gt;flags &amp; MLX4_FLAG_OLD_PORT_CMDS) {</div><div class='add'>+		*(u8 *) inbox-&gt;buf	   = !!reset_qkey_viols &lt;&lt; 6;</div><div class='add'>+		((__be32 *) inbox-&gt;buf)[2] = agg_cap_mask;</div><div class='add'>+	} else {</div><div class='add'>+		((u8 *) inbox-&gt;buf)[3]     = !!reset_qkey_viols;</div><div class='add'>+		((__be32 *) inbox-&gt;buf)[1] = agg_cap_mask;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mlx4_cmd(dev, inbox-&gt;dma, port, is_eth, MLX4_CMD_SET_PORT,</div><div class='add'>+		       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);</div><div class='add'>+	if (err)</div><div class='add'>+		priv-&gt;mfunc.master.slave_state[slave].ib_cap_mask[port] =</div><div class='add'>+			slave_cap_mask;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_SET_PORT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			  struct mlx4_vhcr *vhcr,</div><div class='add'>+			  struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			  struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			  struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	return mlx4_common_set_port(dev, slave, vhcr-&gt;in_modifier,</div><div class='add'>+				    vhcr-&gt;op_modifier, inbox);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_cmd_mailbox *mailbox;</div><div class='hunk'>@@ -528,8 +777,127 @@ int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port)</div><div class='ctx'> </div><div class='ctx'> 	((__be32 *) mailbox-&gt;buf)[1] = dev-&gt;caps.ib_port_def_cap[port];</div><div class='ctx'> 	err = mlx4_cmd(dev, mailbox-&gt;dma, port, 0, MLX4_CMD_SET_PORT,</div><div class='del'>-		       MLX4_CMD_TIME_CLASS_B);</div><div class='add'>+		       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_WRAPPED);</div><div class='ctx'> </div><div class='ctx'> 	mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu,</div><div class='add'>+			  u8 pptx, u8 pfctx, u8 pprx, u8 pfcrx)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_cmd_mailbox *mailbox;</div><div class='add'>+	struct mlx4_set_port_general_context *context;</div><div class='add'>+	int err;</div><div class='add'>+	u32 in_mod;</div><div class='add'>+</div><div class='add'>+	mailbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='add'>+	if (IS_ERR(mailbox))</div><div class='add'>+		return PTR_ERR(mailbox);</div><div class='add'>+	context = mailbox-&gt;buf;</div><div class='add'>+	memset(context, 0, sizeof *context);</div><div class='add'>+</div><div class='add'>+	context-&gt;flags = SET_PORT_GEN_ALL_VALID;</div><div class='add'>+	context-&gt;mtu = cpu_to_be16(mtu);</div><div class='add'>+	context-&gt;pptx = (pptx * (!pfctx)) &lt;&lt; 7;</div><div class='add'>+	context-&gt;pfctx = pfctx;</div><div class='add'>+	context-&gt;pprx = (pprx * (!pfcrx)) &lt;&lt; 7;</div><div class='add'>+	context-&gt;pfcrx = pfcrx;</div><div class='add'>+</div><div class='add'>+	in_mod = MLX4_SET_PORT_GENERAL &lt;&lt; 8 | port;</div><div class='add'>+	err = mlx4_cmd(dev, mailbox-&gt;dma, in_mod, 1, MLX4_CMD_SET_PORT,</div><div class='add'>+		       MLX4_CMD_TIME_CLASS_B,  MLX4_CMD_WRAPPED);</div><div class='add'>+</div><div class='add'>+	mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(mlx4_SET_PORT_general);</div><div class='add'>+</div><div class='add'>+int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,</div><div class='add'>+			   u8 promisc)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_cmd_mailbox *mailbox;</div><div class='add'>+	struct mlx4_set_port_rqp_calc_context *context;</div><div class='add'>+	int err;</div><div class='add'>+	u32 in_mod;</div><div class='add'>+	u32 m_promisc = (dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_MC_STEER) ?</div><div class='add'>+		MCAST_DIRECT : MCAST_DEFAULT;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_MC_STEER  &amp;&amp;</div><div class='add'>+	    dev-&gt;caps.flags &amp; MLX4_DEV_CAP_FLAG_VEP_UC_STEER)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mailbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='add'>+	if (IS_ERR(mailbox))</div><div class='add'>+		return PTR_ERR(mailbox);</div><div class='add'>+	context = mailbox-&gt;buf;</div><div class='add'>+	memset(context, 0, sizeof *context);</div><div class='add'>+</div><div class='add'>+	context-&gt;base_qpn = cpu_to_be32(base_qpn);</div><div class='add'>+	context-&gt;n_mac = dev-&gt;caps.log_num_macs;</div><div class='add'>+	context-&gt;promisc = cpu_to_be32(promisc &lt;&lt; SET_PORT_PROMISC_SHIFT |</div><div class='add'>+				       base_qpn);</div><div class='add'>+	context-&gt;mcast = cpu_to_be32(m_promisc &lt;&lt; SET_PORT_MC_PROMISC_SHIFT |</div><div class='add'>+				     base_qpn);</div><div class='add'>+	context-&gt;intra_no_vlan = 0;</div><div class='add'>+	context-&gt;no_vlan = MLX4_NO_VLAN_IDX;</div><div class='add'>+	context-&gt;intra_vlan_miss = 0;</div><div class='add'>+	context-&gt;vlan_miss = MLX4_VLAN_MISS_IDX;</div><div class='add'>+</div><div class='add'>+	in_mod = MLX4_SET_PORT_RQP_CALC &lt;&lt; 8 | port;</div><div class='add'>+	err = mlx4_cmd(dev, mailbox-&gt;dma, in_mod, 1, MLX4_CMD_SET_PORT,</div><div class='add'>+		       MLX4_CMD_TIME_CLASS_B,  MLX4_CMD_WRAPPED);</div><div class='add'>+</div><div class='add'>+	mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(mlx4_SET_PORT_qpn_calc);</div><div class='add'>+</div><div class='add'>+int mlx4_SET_MCAST_FLTR_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+				struct mlx4_vhcr *vhcr,</div><div class='add'>+				struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+				struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+				struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_SET_MCAST_FLTR(struct mlx4_dev *dev, u8 port,</div><div class='add'>+			u64 mac, u64 clear, u8 mode)</div><div class='add'>+{</div><div class='add'>+	return mlx4_cmd(dev, (mac | (clear &lt;&lt; 63)), port, mode,</div><div class='add'>+			MLX4_CMD_SET_MCAST_FLTR, MLX4_CMD_TIME_CLASS_B,</div><div class='add'>+			MLX4_CMD_WRAPPED);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(mlx4_SET_MCAST_FLTR);</div><div class='add'>+</div><div class='add'>+int mlx4_SET_VLAN_FLTR_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			       struct mlx4_vhcr *vhcr,</div><div class='add'>+			       struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			       struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			       struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_common_dump_eth_stats(struct mlx4_dev *dev, int slave,</div><div class='add'>+			       u32 in_mod, struct mlx4_cmd_mailbox *outbox)</div><div class='add'>+{</div><div class='add'>+	return mlx4_cmd_box(dev, 0, outbox-&gt;dma, in_mod, 0,</div><div class='add'>+			    MLX4_CMD_DUMP_ETH_STATS, MLX4_CMD_TIME_CLASS_B,</div><div class='add'>+			    MLX4_CMD_NATIVE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_DUMP_ETH_STATS_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+				struct mlx4_vhcr *vhcr,</div><div class='add'>+				struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+				struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+				struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	return mlx4_common_dump_eth_stats(dev, slave,</div><div class='add'>+					  vhcr-&gt;in_modifier, outbox);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/profile.c b/drivers/net/ethernet/mellanox/mlx4/profile.c<br/>index b967647d0c76..66f91ca7a7c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/profile.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/profile.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/profile.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/profile.c</a></div><div class='hunk'>@@ -98,8 +98,8 @@ u64 mlx4_make_profile(struct mlx4_dev *dev,</div><div class='ctx'> 	profile[MLX4_RES_EQ].size     = dev_cap-&gt;eqc_entry_sz;</div><div class='ctx'> 	profile[MLX4_RES_DMPT].size   = dev_cap-&gt;dmpt_entry_sz;</div><div class='ctx'> 	profile[MLX4_RES_CMPT].size   = dev_cap-&gt;cmpt_entry_sz;</div><div class='del'>-	profile[MLX4_RES_MTT].size    = dev-&gt;caps.mtts_per_seg * dev_cap-&gt;mtt_entry_sz;</div><div class='del'>-	profile[MLX4_RES_MCG].size    = MLX4_MGM_ENTRY_SIZE;</div><div class='add'>+	profile[MLX4_RES_MTT].size    = dev_cap-&gt;mtt_entry_sz;</div><div class='add'>+	profile[MLX4_RES_MCG].size    = mlx4_get_mgm_entry_size(dev);</div><div class='ctx'> </div><div class='ctx'> 	profile[MLX4_RES_QP].num      = request-&gt;num_qp;</div><div class='ctx'> 	profile[MLX4_RES_RDMARC].num  = request-&gt;num_qp * request-&gt;rdmarc_per_qp;</div><div class='hunk'>@@ -210,7 +210,7 @@ u64 mlx4_make_profile(struct mlx4_dev *dev,</div><div class='ctx'> 			init_hca-&gt;cmpt_base	 = profile[i].start;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case MLX4_RES_MTT:</div><div class='del'>-			dev-&gt;caps.num_mtt_segs	 = profile[i].num;</div><div class='add'>+			dev-&gt;caps.num_mtts	 = profile[i].num;</div><div class='ctx'> 			priv-&gt;mr_table.mtt_base	 = profile[i].start;</div><div class='ctx'> 			init_hca-&gt;mtt_base	 = profile[i].start;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -218,7 +218,8 @@ u64 mlx4_make_profile(struct mlx4_dev *dev,</div><div class='ctx'> 			dev-&gt;caps.num_mgms	  = profile[i].num &gt;&gt; 1;</div><div class='ctx'> 			dev-&gt;caps.num_amgms	  = profile[i].num &gt;&gt; 1;</div><div class='ctx'> 			init_hca-&gt;mc_base	  = profile[i].start;</div><div class='del'>-			init_hca-&gt;log_mc_entry_sz = ilog2(MLX4_MGM_ENTRY_SIZE);</div><div class='add'>+			init_hca-&gt;log_mc_entry_sz =</div><div class='add'>+					ilog2(mlx4_get_mgm_entry_size(dev));</div><div class='ctx'> 			init_hca-&gt;log_mc_table_sz = profile[i].log_num;</div><div class='ctx'> 			init_hca-&gt;log_mc_hash_sz  = profile[i].log_num - 1;</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c<br/>index 15f870cb2590..6b03ac8b9002 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/qp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/qp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/qp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/qp.c</a></div><div class='hunk'>@@ -35,6 +35,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/mlx4/cmd.h&gt;</div><div class='ctx'> #include &lt;linux/mlx4/qp.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -55,7 +57,7 @@ void mlx4_qp_event(struct mlx4_dev *dev, u32 qpn, int event_type)</div><div class='ctx'> 	spin_unlock(&amp;qp_table-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!qp) {</div><div class='del'>-		mlx4_warn(dev, "Async event for bogus QP %08x\n", qpn);</div><div class='add'>+		mlx4_dbg(dev, "Async event for none existent QP %08x\n", qpn);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -65,10 +67,17 @@ void mlx4_qp_event(struct mlx4_dev *dev, u32 qpn, int event_type)</div><div class='ctx'> 		complete(&amp;qp-&gt;free);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mlx4_qp_modify(struct mlx4_dev *dev, struct mlx4_mtt *mtt,</div><div class='del'>-		   enum mlx4_qp_state cur_state, enum mlx4_qp_state new_state,</div><div class='del'>-		   struct mlx4_qp_context *context, enum mlx4_qp_optpar optpar,</div><div class='del'>-		   int sqd_event, struct mlx4_qp *qp)</div><div class='add'>+static int is_qp0(struct mlx4_dev *dev, struct mlx4_qp *qp)</div><div class='add'>+{</div><div class='add'>+	return qp-&gt;qpn &gt;= dev-&gt;caps.sqp_start &amp;&amp;</div><div class='add'>+		qp-&gt;qpn &lt;= dev-&gt;caps.sqp_start + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __mlx4_qp_modify(struct mlx4_dev *dev, struct mlx4_mtt *mtt,</div><div class='add'>+		     enum mlx4_qp_state cur_state, enum mlx4_qp_state new_state,</div><div class='add'>+		     struct mlx4_qp_context *context,</div><div class='add'>+		     enum mlx4_qp_optpar optpar,</div><div class='add'>+		     int sqd_event, struct mlx4_qp *qp, int native)</div><div class='ctx'> {</div><div class='ctx'> 	static const u16 op[MLX4_QP_NUM_STATE][MLX4_QP_NUM_STATE] = {</div><div class='ctx'> 		[MLX4_QP_STATE_RST] = {</div><div class='hunk'>@@ -110,16 +119,26 @@ int mlx4_qp_modify(struct mlx4_dev *dev, struct mlx4_mtt *mtt,</div><div class='ctx'> 		}</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='ctx'> 	struct mlx4_cmd_mailbox *mailbox;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	u8 port;</div><div class='ctx'> </div><div class='ctx'> 	if (cur_state &gt;= MLX4_QP_NUM_STATE || new_state &gt;= MLX4_QP_NUM_STATE ||</div><div class='ctx'> 	    !op[cur_state][new_state])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (op[cur_state][new_state] == MLX4_CMD_2RST_QP)</div><div class='del'>-		return mlx4_cmd(dev, 0, qp-&gt;qpn, 2,</div><div class='del'>-				MLX4_CMD_2RST_QP, MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+	if (op[cur_state][new_state] == MLX4_CMD_2RST_QP) {</div><div class='add'>+		ret = mlx4_cmd(dev, 0, qp-&gt;qpn, 2,</div><div class='add'>+			MLX4_CMD_2RST_QP, MLX4_CMD_TIME_CLASS_A, native);</div><div class='add'>+		if (mlx4_is_master(dev) &amp;&amp; cur_state != MLX4_QP_STATE_ERR &amp;&amp;</div><div class='add'>+		    cur_state != MLX4_QP_STATE_RST &amp;&amp;</div><div class='add'>+		    is_qp0(dev, qp)) {</div><div class='add'>+			port = (qp-&gt;qpn &amp; 1) + 1;</div><div class='add'>+			priv-&gt;mfunc.master.qp0_state[port].qp0_active = 0;</div><div class='add'>+		}</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mailbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='ctx'> 	if (IS_ERR(mailbox))</div><div class='hunk'>@@ -132,107 +151,218 @@ int mlx4_qp_modify(struct mlx4_dev *dev, struct mlx4_mtt *mtt,</div><div class='ctx'> 		context-&gt;log_page_size   = mtt-&gt;page_shift - MLX4_ICM_PAGE_SHIFT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	port = ((context-&gt;pri_path.sched_queue &gt;&gt; 6) &amp; 1) + 1;</div><div class='add'>+	if (dev-&gt;caps.port_type[port] == MLX4_PORT_TYPE_ETH)</div><div class='add'>+		context-&gt;pri_path.sched_queue = (context-&gt;pri_path.sched_queue &amp;</div><div class='add'>+						0xc3);</div><div class='add'>+</div><div class='ctx'> 	*(__be32 *) mailbox-&gt;buf = cpu_to_be32(optpar);</div><div class='ctx'> 	memcpy(mailbox-&gt;buf + 8, context, sizeof *context);</div><div class='ctx'> </div><div class='ctx'> 	((struct mlx4_qp_context *) (mailbox-&gt;buf + 8))-&gt;local_qpn =</div><div class='ctx'> 		cpu_to_be32(qp-&gt;qpn);</div><div class='ctx'> </div><div class='del'>-	ret = mlx4_cmd(dev, mailbox-&gt;dma, qp-&gt;qpn | (!!sqd_event &lt;&lt; 31),</div><div class='add'>+	ret = mlx4_cmd(dev, mailbox-&gt;dma | dev-&gt;caps.function,</div><div class='add'>+		       qp-&gt;qpn | (!!sqd_event &lt;&lt; 31),</div><div class='ctx'> 		       new_state == MLX4_QP_STATE_RST ? 2 : 0,</div><div class='del'>-		       op[cur_state][new_state], MLX4_CMD_TIME_CLASS_C);</div><div class='add'>+		       op[cur_state][new_state], MLX4_CMD_TIME_CLASS_C, native);</div><div class='ctx'> </div><div class='ctx'> 	mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int mlx4_qp_modify(struct mlx4_dev *dev, struct mlx4_mtt *mtt,</div><div class='add'>+		   enum mlx4_qp_state cur_state, enum mlx4_qp_state new_state,</div><div class='add'>+		   struct mlx4_qp_context *context,</div><div class='add'>+		   enum mlx4_qp_optpar optpar,</div><div class='add'>+		   int sqd_event, struct mlx4_qp *qp)</div><div class='add'>+{</div><div class='add'>+	return __mlx4_qp_modify(dev, mtt, cur_state, new_state, context,</div><div class='add'>+				optpar, sqd_event, qp, 0);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_qp_modify);</div><div class='ctx'> </div><div class='del'>-int mlx4_qp_reserve_range(struct mlx4_dev *dev, int cnt, int align, int *base)</div><div class='add'>+int __mlx4_qp_reserve_range(struct mlx4_dev *dev, int cnt, int align,</div><div class='add'>+				   int *base)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='ctx'> 	struct mlx4_qp_table *qp_table = &amp;priv-&gt;qp_table;</div><div class='del'>-	int qpn;</div><div class='ctx'> </div><div class='del'>-	qpn = mlx4_bitmap_alloc_range(&amp;qp_table-&gt;bitmap, cnt, align);</div><div class='del'>-	if (qpn == -1)</div><div class='add'>+	*base = mlx4_bitmap_alloc_range(&amp;qp_table-&gt;bitmap, cnt, align);</div><div class='add'>+	if (*base == -1)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	*base = qpn;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int mlx4_qp_reserve_range(struct mlx4_dev *dev, int cnt, int align, int *base)</div><div class='add'>+{</div><div class='add'>+	u64 in_param;</div><div class='add'>+	u64 out_param;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		set_param_l(&amp;in_param, cnt);</div><div class='add'>+		set_param_h(&amp;in_param, align);</div><div class='add'>+		err = mlx4_cmd_imm(dev, in_param, &amp;out_param,</div><div class='add'>+				   RES_QP, RES_OP_RESERVE,</div><div class='add'>+				   MLX4_CMD_ALLOC_RES,</div><div class='add'>+				   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		*base = get_param_l(&amp;out_param);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return __mlx4_qp_reserve_range(dev, cnt, align, base);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_qp_reserve_range);</div><div class='ctx'> </div><div class='del'>-void mlx4_qp_release_range(struct mlx4_dev *dev, int base_qpn, int cnt)</div><div class='add'>+void __mlx4_qp_release_range(struct mlx4_dev *dev, int base_qpn, int cnt)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='ctx'> 	struct mlx4_qp_table *qp_table = &amp;priv-&gt;qp_table;</div><div class='del'>-	if (base_qpn &lt; dev-&gt;caps.sqp_start + 8)</div><div class='del'>-		return;</div><div class='ctx'> </div><div class='add'>+	if (mlx4_is_qp_reserved(dev, (u32) base_qpn))</div><div class='add'>+		return;</div><div class='ctx'> 	mlx4_bitmap_free_range(&amp;qp_table-&gt;bitmap, base_qpn, cnt);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void mlx4_qp_release_range(struct mlx4_dev *dev, int base_qpn, int cnt)</div><div class='add'>+{</div><div class='add'>+	u64 in_param;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		set_param_l(&amp;in_param, base_qpn);</div><div class='add'>+		set_param_h(&amp;in_param, cnt);</div><div class='add'>+		err = mlx4_cmd(dev, in_param, RES_QP, RES_OP_RESERVE,</div><div class='add'>+			       MLX4_CMD_FREE_RES,</div><div class='add'>+			       MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);</div><div class='add'>+		if (err) {</div><div class='add'>+			mlx4_warn(dev, "Failed to release qp range"</div><div class='add'>+				  " base:%d cnt:%d\n", base_qpn, cnt);</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		 __mlx4_qp_release_range(dev, base_qpn, cnt);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_qp_release_range);</div><div class='ctx'> </div><div class='del'>-int mlx4_qp_alloc(struct mlx4_dev *dev, int qpn, struct mlx4_qp *qp)</div><div class='add'>+int __mlx4_qp_alloc_icm(struct mlx4_dev *dev, int qpn)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='ctx'> 	struct mlx4_qp_table *qp_table = &amp;priv-&gt;qp_table;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!qpn)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	qp-&gt;qpn = qpn;</div><div class='del'>-</div><div class='del'>-	err = mlx4_table_get(dev, &amp;qp_table-&gt;qp_table, qp-&gt;qpn);</div><div class='add'>+	err = mlx4_table_get(dev, &amp;qp_table-&gt;qp_table, qpn);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='del'>-	err = mlx4_table_get(dev, &amp;qp_table-&gt;auxc_table, qp-&gt;qpn);</div><div class='add'>+	err = mlx4_table_get(dev, &amp;qp_table-&gt;auxc_table, qpn);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_put_qp;</div><div class='ctx'> </div><div class='del'>-	err = mlx4_table_get(dev, &amp;qp_table-&gt;altc_table, qp-&gt;qpn);</div><div class='add'>+	err = mlx4_table_get(dev, &amp;qp_table-&gt;altc_table, qpn);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_put_auxc;</div><div class='ctx'> </div><div class='del'>-	err = mlx4_table_get(dev, &amp;qp_table-&gt;rdmarc_table, qp-&gt;qpn);</div><div class='add'>+	err = mlx4_table_get(dev, &amp;qp_table-&gt;rdmarc_table, qpn);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_put_altc;</div><div class='ctx'> </div><div class='del'>-	err = mlx4_table_get(dev, &amp;qp_table-&gt;cmpt_table, qp-&gt;qpn);</div><div class='add'>+	err = mlx4_table_get(dev, &amp;qp_table-&gt;cmpt_table, qpn);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_put_rdmarc;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;qp_table-&gt;lock);</div><div class='del'>-	err = radix_tree_insert(&amp;dev-&gt;qp_table_tree, qp-&gt;qpn &amp; (dev-&gt;caps.num_qps - 1), qp);</div><div class='del'>-	spin_unlock_irq(&amp;qp_table-&gt;lock);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_put_cmpt;</div><div class='del'>-</div><div class='del'>-	atomic_set(&amp;qp-&gt;refcount, 1);</div><div class='del'>-	init_completion(&amp;qp-&gt;free);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err_put_cmpt:</div><div class='del'>-	mlx4_table_put(dev, &amp;qp_table-&gt;cmpt_table, qp-&gt;qpn);</div><div class='del'>-</div><div class='ctx'> err_put_rdmarc:</div><div class='del'>-	mlx4_table_put(dev, &amp;qp_table-&gt;rdmarc_table, qp-&gt;qpn);</div><div class='add'>+	mlx4_table_put(dev, &amp;qp_table-&gt;rdmarc_table, qpn);</div><div class='ctx'> </div><div class='ctx'> err_put_altc:</div><div class='del'>-	mlx4_table_put(dev, &amp;qp_table-&gt;altc_table, qp-&gt;qpn);</div><div class='add'>+	mlx4_table_put(dev, &amp;qp_table-&gt;altc_table, qpn);</div><div class='ctx'> </div><div class='ctx'> err_put_auxc:</div><div class='del'>-	mlx4_table_put(dev, &amp;qp_table-&gt;auxc_table, qp-&gt;qpn);</div><div class='add'>+	mlx4_table_put(dev, &amp;qp_table-&gt;auxc_table, qpn);</div><div class='ctx'> </div><div class='ctx'> err_put_qp:</div><div class='del'>-	mlx4_table_put(dev, &amp;qp_table-&gt;qp_table, qp-&gt;qpn);</div><div class='add'>+	mlx4_table_put(dev, &amp;qp_table-&gt;qp_table, qpn);</div><div class='ctx'> </div><div class='ctx'> err_out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int mlx4_qp_alloc_icm(struct mlx4_dev *dev, int qpn)</div><div class='add'>+{</div><div class='add'>+	u64 param;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		set_param_l(&amp;param, qpn);</div><div class='add'>+		return mlx4_cmd_imm(dev, param, &amp;param, RES_QP, RES_OP_MAP_ICM,</div><div class='add'>+				    MLX4_CMD_ALLOC_RES, MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+				    MLX4_CMD_WRAPPED);</div><div class='add'>+	}</div><div class='add'>+	return __mlx4_qp_alloc_icm(dev, qpn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __mlx4_qp_free_icm(struct mlx4_dev *dev, int qpn)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_qp_table *qp_table = &amp;priv-&gt;qp_table;</div><div class='add'>+</div><div class='add'>+	mlx4_table_put(dev, &amp;qp_table-&gt;cmpt_table, qpn);</div><div class='add'>+	mlx4_table_put(dev, &amp;qp_table-&gt;rdmarc_table, qpn);</div><div class='add'>+	mlx4_table_put(dev, &amp;qp_table-&gt;altc_table, qpn);</div><div class='add'>+	mlx4_table_put(dev, &amp;qp_table-&gt;auxc_table, qpn);</div><div class='add'>+	mlx4_table_put(dev, &amp;qp_table-&gt;qp_table, qpn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mlx4_qp_free_icm(struct mlx4_dev *dev, int qpn)</div><div class='add'>+{</div><div class='add'>+	u64 in_param;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		set_param_l(&amp;in_param, qpn);</div><div class='add'>+		if (mlx4_cmd(dev, in_param, RES_QP, RES_OP_MAP_ICM,</div><div class='add'>+			     MLX4_CMD_FREE_RES, MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+			     MLX4_CMD_WRAPPED))</div><div class='add'>+			mlx4_warn(dev, "Failed to free icm of qp:%d\n", qpn);</div><div class='add'>+	} else</div><div class='add'>+		__mlx4_qp_free_icm(dev, qpn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_qp_alloc(struct mlx4_dev *dev, int qpn, struct mlx4_qp *qp)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_qp_table *qp_table = &amp;priv-&gt;qp_table;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!qpn)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	qp-&gt;qpn = qpn;</div><div class='add'>+</div><div class='add'>+	err = mlx4_qp_alloc_icm(dev, qpn);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;qp_table-&gt;lock);</div><div class='add'>+	err = radix_tree_insert(&amp;dev-&gt;qp_table_tree, qp-&gt;qpn &amp;</div><div class='add'>+				(dev-&gt;caps.num_qps - 1), qp);</div><div class='add'>+	spin_unlock_irq(&amp;qp_table-&gt;lock);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_icm;</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;qp-&gt;refcount, 1);</div><div class='add'>+	init_completion(&amp;qp-&gt;free);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_icm:</div><div class='add'>+	mlx4_qp_free_icm(dev, qpn);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_qp_alloc);</div><div class='ctx'> </div><div class='ctx'> void mlx4_qp_remove(struct mlx4_dev *dev, struct mlx4_qp *qp)</div><div class='hunk'>@@ -248,24 +378,18 @@ EXPORT_SYMBOL_GPL(mlx4_qp_remove);</div><div class='ctx'> </div><div class='ctx'> void mlx4_qp_free(struct mlx4_dev *dev, struct mlx4_qp *qp)</div><div class='ctx'> {</div><div class='del'>-	struct mlx4_qp_table *qp_table = &amp;mlx4_priv(dev)-&gt;qp_table;</div><div class='del'>-</div><div class='ctx'> 	if (atomic_dec_and_test(&amp;qp-&gt;refcount))</div><div class='ctx'> 		complete(&amp;qp-&gt;free);</div><div class='ctx'> 	wait_for_completion(&amp;qp-&gt;free);</div><div class='ctx'> </div><div class='del'>-	mlx4_table_put(dev, &amp;qp_table-&gt;cmpt_table, qp-&gt;qpn);</div><div class='del'>-	mlx4_table_put(dev, &amp;qp_table-&gt;rdmarc_table, qp-&gt;qpn);</div><div class='del'>-	mlx4_table_put(dev, &amp;qp_table-&gt;altc_table, qp-&gt;qpn);</div><div class='del'>-	mlx4_table_put(dev, &amp;qp_table-&gt;auxc_table, qp-&gt;qpn);</div><div class='del'>-	mlx4_table_put(dev, &amp;qp_table-&gt;qp_table, qp-&gt;qpn);</div><div class='add'>+	mlx4_qp_free_icm(dev, qp-&gt;qpn);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_qp_free);</div><div class='ctx'> </div><div class='ctx'> static int mlx4_CONF_SPECIAL_QP(struct mlx4_dev *dev, u32 base_qpn)</div><div class='ctx'> {</div><div class='ctx'> 	return mlx4_cmd(dev, 0, base_qpn, 0, MLX4_CMD_CONF_SPECIAL_QP,</div><div class='del'>-			MLX4_CMD_TIME_CLASS_B);</div><div class='add'>+			MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mlx4_init_qp_table(struct mlx4_dev *dev)</div><div class='hunk'>@@ -276,6 +400,8 @@ int mlx4_init_qp_table(struct mlx4_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;qp_table-&gt;lock);</div><div class='ctx'> 	INIT_RADIX_TREE(&amp;dev-&gt;qp_table_tree, GFP_ATOMIC);</div><div class='add'>+	if (mlx4_is_slave(dev))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We reserve 2 extra QPs per port for the special QPs.  The</div><div class='hunk'>@@ -327,6 +453,9 @@ int mlx4_init_qp_table(struct mlx4_dev *dev)</div><div class='ctx'> </div><div class='ctx'> void mlx4_cleanup_qp_table(struct mlx4_dev *dev)</div><div class='ctx'> {</div><div class='add'>+	if (mlx4_is_slave(dev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	mlx4_CONF_SPECIAL_QP(dev, 0);</div><div class='ctx'> 	mlx4_bitmap_cleanup(&amp;mlx4_priv(dev)-&gt;qp_table.bitmap);</div><div class='ctx'> }</div><div class='hunk'>@@ -342,7 +471,8 @@ int mlx4_qp_query(struct mlx4_dev *dev, struct mlx4_qp *qp,</div><div class='ctx'> 		return PTR_ERR(mailbox);</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_cmd_box(dev, 0, mailbox-&gt;dma, qp-&gt;qpn, 0,</div><div class='del'>-			   MLX4_CMD_QUERY_QP, MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+			   MLX4_CMD_QUERY_QP, MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+			   MLX4_CMD_WRAPPED);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		memcpy(context, mailbox-&gt;buf + 8, sizeof *context);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c<br/>new file mode 100644<br/>index 000000000000..ed20751a057d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/resource_tracker.c</a></div><div class='hunk'>@@ -0,0 +1,3104 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.</div><div class='add'>+ * Copyright (c) 2005, 2006, 2007, 2008 Mellanox Technologies.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ * Copyright (c) 2005, 2006, 2007 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the</div><div class='add'>+ * OpenIB.org BSD license below:</div><div class='add'>+ *</div><div class='add'>+ *     Redistribution and use in source and binary forms, with or</div><div class='add'>+ *     without modification, are permitted provided that the following</div><div class='add'>+ *     conditions are met:</div><div class='add'>+ *</div><div class='add'>+ *      - Redistributions of source code must retain the above</div><div class='add'>+ *        copyright notice, this list of conditions and the following</div><div class='add'>+ *        disclaimer.</div><div class='add'>+ *</div><div class='add'>+ *      - Redistributions in binary form must reproduce the above</div><div class='add'>+ *        copyright notice, this list of conditions and the following</div><div class='add'>+ *        disclaimer in the documentation and/or other materials</div><div class='add'>+ *        provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mlx4/cmd.h&gt;</div><div class='add'>+#include &lt;linux/mlx4/qp.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mlx4.h"</div><div class='add'>+#include "fw.h"</div><div class='add'>+</div><div class='add'>+#define MLX4_MAC_VALID		(1ull &lt;&lt; 63)</div><div class='add'>+#define MLX4_MAC_MASK		0x7fffffffffffffffULL</div><div class='add'>+#define ETH_ALEN		6</div><div class='add'>+</div><div class='add'>+struct mac_res {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	u64 mac;</div><div class='add'>+	u8 port;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct res_common {</div><div class='add'>+	struct list_head	list;</div><div class='add'>+	u32		        res_id;</div><div class='add'>+	int			owner;</div><div class='add'>+	int			state;</div><div class='add'>+	int			from_state;</div><div class='add'>+	int			to_state;</div><div class='add'>+	int			removing;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	RES_ANY_BUSY = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct res_gid {</div><div class='add'>+	struct list_head	list;</div><div class='add'>+	u8			gid[16];</div><div class='add'>+	enum mlx4_protocol	prot;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum res_qp_states {</div><div class='add'>+	RES_QP_BUSY = RES_ANY_BUSY,</div><div class='add'>+</div><div class='add'>+	/* QP number was allocated */</div><div class='add'>+	RES_QP_RESERVED,</div><div class='add'>+</div><div class='add'>+	/* ICM memory for QP context was mapped */</div><div class='add'>+	RES_QP_MAPPED,</div><div class='add'>+</div><div class='add'>+	/* QP is in hw ownership */</div><div class='add'>+	RES_QP_HW</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline const char *qp_states_str(enum res_qp_states state)</div><div class='add'>+{</div><div class='add'>+	switch (state) {</div><div class='add'>+	case RES_QP_BUSY: return "RES_QP_BUSY";</div><div class='add'>+	case RES_QP_RESERVED: return "RES_QP_RESERVED";</div><div class='add'>+	case RES_QP_MAPPED: return "RES_QP_MAPPED";</div><div class='add'>+	case RES_QP_HW: return "RES_QP_HW";</div><div class='add'>+	default: return "Unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct res_qp {</div><div class='add'>+	struct res_common	com;</div><div class='add'>+	struct res_mtt	       *mtt;</div><div class='add'>+	struct res_cq	       *rcq;</div><div class='add'>+	struct res_cq	       *scq;</div><div class='add'>+	struct res_srq	       *srq;</div><div class='add'>+	struct list_head	mcg_list;</div><div class='add'>+	spinlock_t		mcg_spl;</div><div class='add'>+	int			local_qpn;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum res_mtt_states {</div><div class='add'>+	RES_MTT_BUSY = RES_ANY_BUSY,</div><div class='add'>+	RES_MTT_ALLOCATED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline const char *mtt_states_str(enum res_mtt_states state)</div><div class='add'>+{</div><div class='add'>+	switch (state) {</div><div class='add'>+	case RES_MTT_BUSY: return "RES_MTT_BUSY";</div><div class='add'>+	case RES_MTT_ALLOCATED: return "RES_MTT_ALLOCATED";</div><div class='add'>+	default: return "Unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct res_mtt {</div><div class='add'>+	struct res_common	com;</div><div class='add'>+	int			order;</div><div class='add'>+	atomic_t		ref_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum res_mpt_states {</div><div class='add'>+	RES_MPT_BUSY = RES_ANY_BUSY,</div><div class='add'>+	RES_MPT_RESERVED,</div><div class='add'>+	RES_MPT_MAPPED,</div><div class='add'>+	RES_MPT_HW,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct res_mpt {</div><div class='add'>+	struct res_common	com;</div><div class='add'>+	struct res_mtt	       *mtt;</div><div class='add'>+	int			key;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum res_eq_states {</div><div class='add'>+	RES_EQ_BUSY = RES_ANY_BUSY,</div><div class='add'>+	RES_EQ_RESERVED,</div><div class='add'>+	RES_EQ_HW,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct res_eq {</div><div class='add'>+	struct res_common	com;</div><div class='add'>+	struct res_mtt	       *mtt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum res_cq_states {</div><div class='add'>+	RES_CQ_BUSY = RES_ANY_BUSY,</div><div class='add'>+	RES_CQ_ALLOCATED,</div><div class='add'>+	RES_CQ_HW,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct res_cq {</div><div class='add'>+	struct res_common	com;</div><div class='add'>+	struct res_mtt	       *mtt;</div><div class='add'>+	atomic_t		ref_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum res_srq_states {</div><div class='add'>+	RES_SRQ_BUSY = RES_ANY_BUSY,</div><div class='add'>+	RES_SRQ_ALLOCATED,</div><div class='add'>+	RES_SRQ_HW,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline const char *srq_states_str(enum res_srq_states state)</div><div class='add'>+{</div><div class='add'>+	switch (state) {</div><div class='add'>+	case RES_SRQ_BUSY: return "RES_SRQ_BUSY";</div><div class='add'>+	case RES_SRQ_ALLOCATED: return "RES_SRQ_ALLOCATED";</div><div class='add'>+	case RES_SRQ_HW: return "RES_SRQ_HW";</div><div class='add'>+	default: return "Unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct res_srq {</div><div class='add'>+	struct res_common	com;</div><div class='add'>+	struct res_mtt	       *mtt;</div><div class='add'>+	struct res_cq	       *cq;</div><div class='add'>+	atomic_t		ref_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum res_counter_states {</div><div class='add'>+	RES_COUNTER_BUSY = RES_ANY_BUSY,</div><div class='add'>+	RES_COUNTER_ALLOCATED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline const char *counter_states_str(enum res_counter_states state)</div><div class='add'>+{</div><div class='add'>+	switch (state) {</div><div class='add'>+	case RES_COUNTER_BUSY: return "RES_COUNTER_BUSY";</div><div class='add'>+	case RES_COUNTER_ALLOCATED: return "RES_COUNTER_ALLOCATED";</div><div class='add'>+	default: return "Unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct res_counter {</div><div class='add'>+	struct res_common	com;</div><div class='add'>+	int			port;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* For Debug uses */</div><div class='add'>+static const char *ResourceType(enum mlx4_resource rt)</div><div class='add'>+{</div><div class='add'>+	switch (rt) {</div><div class='add'>+	case RES_QP: return "RES_QP";</div><div class='add'>+	case RES_CQ: return "RES_CQ";</div><div class='add'>+	case RES_SRQ: return "RES_SRQ";</div><div class='add'>+	case RES_MPT: return "RES_MPT";</div><div class='add'>+	case RES_MTT: return "RES_MTT";</div><div class='add'>+	case RES_MAC: return  "RES_MAC";</div><div class='add'>+	case RES_EQ: return "RES_EQ";</div><div class='add'>+	case RES_COUNTER: return "RES_COUNTER";</div><div class='add'>+	default: return "Unknown resource type !!!";</div><div class='add'>+	};</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_init_resource_tracker(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	int i;</div><div class='add'>+	int t;</div><div class='add'>+</div><div class='add'>+	priv-&gt;mfunc.master.res_tracker.slave_list =</div><div class='add'>+		kzalloc(dev-&gt;num_slaves * sizeof(struct slave_list),</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;mfunc.master.res_tracker.slave_list)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0 ; i &lt; dev-&gt;num_slaves; i++) {</div><div class='add'>+		for (t = 0; t &lt; MLX4_NUM_OF_RESOURCE_TYPE; ++t)</div><div class='add'>+			INIT_LIST_HEAD(&amp;priv-&gt;mfunc.master.res_tracker.</div><div class='add'>+				       slave_list[i].res_list[t]);</div><div class='add'>+		mutex_init(&amp;priv-&gt;mfunc.master.res_tracker.slave_list[i].mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mlx4_dbg(dev, "Started init_resource_tracker: %ld slaves\n",</div><div class='add'>+		 dev-&gt;num_slaves);</div><div class='add'>+	for (i = 0 ; i &lt; MLX4_NUM_OF_RESOURCE_TYPE; i++)</div><div class='add'>+		INIT_RADIX_TREE(&amp;priv-&gt;mfunc.master.res_tracker.res_tree[i],</div><div class='add'>+				GFP_ATOMIC|__GFP_NOWARN);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;mfunc.master.res_tracker.lock);</div><div class='add'>+	return 0 ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mlx4_free_resource_tracker(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;mfunc.master.res_tracker.slave_list) {</div><div class='add'>+		for (i = 0 ; i &lt; dev-&gt;num_slaves; i++)</div><div class='add'>+			mlx4_delete_all_resources_for_slave(dev, i);</div><div class='add'>+</div><div class='add'>+		kfree(priv-&gt;mfunc.master.res_tracker.slave_list);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void update_ud_gid(struct mlx4_dev *dev,</div><div class='add'>+			  struct mlx4_qp_context *qp_ctx, u8 slave)</div><div class='add'>+{</div><div class='add'>+	u32 ts = (be32_to_cpu(qp_ctx-&gt;flags) &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	if (MLX4_QP_ST_UD == ts)</div><div class='add'>+		qp_ctx-&gt;pri_path.mgid_index = 0x80 | slave;</div><div class='add'>+</div><div class='add'>+	mlx4_dbg(dev, "slave %d, new gid index: 0x%x ",</div><div class='add'>+		slave, qp_ctx-&gt;pri_path.mgid_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mpt_mask(struct mlx4_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;caps.num_mpts - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *find_res(struct mlx4_dev *dev, int res_id,</div><div class='add'>+		      enum mlx4_resource type)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+</div><div class='add'>+	return radix_tree_lookup(&amp;priv-&gt;mfunc.master.res_tracker.res_tree[type],</div><div class='add'>+				 res_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_res(struct mlx4_dev *dev, int slave, int res_id,</div><div class='add'>+		   enum mlx4_resource type,</div><div class='add'>+		   void *res)</div><div class='add'>+{</div><div class='add'>+	struct res_common *r;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	r = find_res(dev, res_id, type);</div><div class='add'>+	if (!r) {</div><div class='add'>+		err = -ENONET;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (r-&gt;state == RES_ANY_BUSY) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (r-&gt;owner != slave) {</div><div class='add'>+		err = -EPERM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r-&gt;from_state = r-&gt;state;</div><div class='add'>+	r-&gt;state = RES_ANY_BUSY;</div><div class='add'>+	mlx4_dbg(dev, "res %s id 0x%x to busy\n",</div><div class='add'>+		 ResourceType(type), r-&gt;res_id);</div><div class='add'>+</div><div class='add'>+	if (res)</div><div class='add'>+		*((struct res_common **)res) = r;</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_get_slave_from_resource_id(struct mlx4_dev *dev,</div><div class='add'>+				    enum mlx4_resource type,</div><div class='add'>+				    int res_id, int *slave)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct res_common *r;</div><div class='add'>+	int err = -ENOENT;</div><div class='add'>+	int id = res_id;</div><div class='add'>+</div><div class='add'>+	if (type == RES_QP)</div><div class='add'>+		id &amp;= 0x7fffff;</div><div class='add'>+	spin_lock(mlx4_tlock(dev));</div><div class='add'>+</div><div class='add'>+	r = find_res(dev, id, type);</div><div class='add'>+	if (r) {</div><div class='add'>+		*slave = r-&gt;owner;</div><div class='add'>+		err = 0;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(mlx4_tlock(dev));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void put_res(struct mlx4_dev *dev, int slave, int res_id,</div><div class='add'>+		    enum mlx4_resource type)</div><div class='add'>+{</div><div class='add'>+	struct res_common *r;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	r = find_res(dev, res_id, type);</div><div class='add'>+	if (r)</div><div class='add'>+		r-&gt;state = r-&gt;from_state;</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct res_common *alloc_qp_tr(int id)</div><div class='add'>+{</div><div class='add'>+	struct res_qp *ret;</div><div class='add'>+</div><div class='add'>+	ret = kzalloc(sizeof *ret, GFP_KERNEL);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ret-&gt;com.res_id = id;</div><div class='add'>+	ret-&gt;com.state = RES_QP_RESERVED;</div><div class='add'>+	INIT_LIST_HEAD(&amp;ret-&gt;mcg_list);</div><div class='add'>+	spin_lock_init(&amp;ret-&gt;mcg_spl);</div><div class='add'>+</div><div class='add'>+	return &amp;ret-&gt;com;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct res_common *alloc_mtt_tr(int id, int order)</div><div class='add'>+{</div><div class='add'>+	struct res_mtt *ret;</div><div class='add'>+</div><div class='add'>+	ret = kzalloc(sizeof *ret, GFP_KERNEL);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ret-&gt;com.res_id = id;</div><div class='add'>+	ret-&gt;order = order;</div><div class='add'>+	ret-&gt;com.state = RES_MTT_ALLOCATED;</div><div class='add'>+	atomic_set(&amp;ret-&gt;ref_count, 0);</div><div class='add'>+</div><div class='add'>+	return &amp;ret-&gt;com;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct res_common *alloc_mpt_tr(int id, int key)</div><div class='add'>+{</div><div class='add'>+	struct res_mpt *ret;</div><div class='add'>+</div><div class='add'>+	ret = kzalloc(sizeof *ret, GFP_KERNEL);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ret-&gt;com.res_id = id;</div><div class='add'>+	ret-&gt;com.state = RES_MPT_RESERVED;</div><div class='add'>+	ret-&gt;key = key;</div><div class='add'>+</div><div class='add'>+	return &amp;ret-&gt;com;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct res_common *alloc_eq_tr(int id)</div><div class='add'>+{</div><div class='add'>+	struct res_eq *ret;</div><div class='add'>+</div><div class='add'>+	ret = kzalloc(sizeof *ret, GFP_KERNEL);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ret-&gt;com.res_id = id;</div><div class='add'>+	ret-&gt;com.state = RES_EQ_RESERVED;</div><div class='add'>+</div><div class='add'>+	return &amp;ret-&gt;com;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct res_common *alloc_cq_tr(int id)</div><div class='add'>+{</div><div class='add'>+	struct res_cq *ret;</div><div class='add'>+</div><div class='add'>+	ret = kzalloc(sizeof *ret, GFP_KERNEL);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ret-&gt;com.res_id = id;</div><div class='add'>+	ret-&gt;com.state = RES_CQ_ALLOCATED;</div><div class='add'>+	atomic_set(&amp;ret-&gt;ref_count, 0);</div><div class='add'>+</div><div class='add'>+	return &amp;ret-&gt;com;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct res_common *alloc_srq_tr(int id)</div><div class='add'>+{</div><div class='add'>+	struct res_srq *ret;</div><div class='add'>+</div><div class='add'>+	ret = kzalloc(sizeof *ret, GFP_KERNEL);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ret-&gt;com.res_id = id;</div><div class='add'>+	ret-&gt;com.state = RES_SRQ_ALLOCATED;</div><div class='add'>+	atomic_set(&amp;ret-&gt;ref_count, 0);</div><div class='add'>+</div><div class='add'>+	return &amp;ret-&gt;com;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct res_common *alloc_counter_tr(int id)</div><div class='add'>+{</div><div class='add'>+	struct res_counter *ret;</div><div class='add'>+</div><div class='add'>+	ret = kzalloc(sizeof *ret, GFP_KERNEL);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ret-&gt;com.res_id = id;</div><div class='add'>+	ret-&gt;com.state = RES_COUNTER_ALLOCATED;</div><div class='add'>+</div><div class='add'>+	return &amp;ret-&gt;com;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct res_common *alloc_tr(int id, enum mlx4_resource type, int slave,</div><div class='add'>+				   int extra)</div><div class='add'>+{</div><div class='add'>+	struct res_common *ret;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case RES_QP:</div><div class='add'>+		ret = alloc_qp_tr(id);</div><div class='add'>+		break;</div><div class='add'>+	case RES_MPT:</div><div class='add'>+		ret = alloc_mpt_tr(id, extra);</div><div class='add'>+		break;</div><div class='add'>+	case RES_MTT:</div><div class='add'>+		ret = alloc_mtt_tr(id, extra);</div><div class='add'>+		break;</div><div class='add'>+	case RES_EQ:</div><div class='add'>+		ret = alloc_eq_tr(id);</div><div class='add'>+		break;</div><div class='add'>+	case RES_CQ:</div><div class='add'>+		ret = alloc_cq_tr(id);</div><div class='add'>+		break;</div><div class='add'>+	case RES_SRQ:</div><div class='add'>+		ret = alloc_srq_tr(id);</div><div class='add'>+		break;</div><div class='add'>+	case RES_MAC:</div><div class='add'>+		printk(KERN_ERR "implementation missing\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	case RES_COUNTER:</div><div class='add'>+		ret = alloc_counter_tr(id);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	if (ret)</div><div class='add'>+		ret-&gt;owner = slave;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_res_range(struct mlx4_dev *dev, int slave, int base, int count,</div><div class='add'>+			 enum mlx4_resource type, int extra)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct res_common **res_arr;</div><div class='add'>+	struct mlx4_resource_tracker *tracker = &amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct radix_tree_root *root = &amp;tracker-&gt;res_tree[type];</div><div class='add'>+</div><div class='add'>+	res_arr = kzalloc(count * sizeof *res_arr, GFP_KERNEL);</div><div class='add'>+	if (!res_arr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		res_arr[i] = alloc_tr(base + i, type, slave, extra);</div><div class='add'>+		if (!res_arr[i]) {</div><div class='add'>+			for (--i; i &gt;= 0; --i)</div><div class='add'>+				kfree(res_arr[i]);</div><div class='add'>+</div><div class='add'>+			kfree(res_arr);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		if (find_res(dev, base + i, type)) {</div><div class='add'>+			err = -EEXIST;</div><div class='add'>+			goto undo;</div><div class='add'>+		}</div><div class='add'>+		err = radix_tree_insert(root, base + i, res_arr[i]);</div><div class='add'>+		if (err)</div><div class='add'>+			goto undo;</div><div class='add'>+		list_add_tail(&amp;res_arr[i]-&gt;list,</div><div class='add'>+			      &amp;tracker-&gt;slave_list[slave].res_list[type]);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+	kfree(res_arr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+undo:</div><div class='add'>+	for (--i; i &gt;= base; --i)</div><div class='add'>+		radix_tree_delete(&amp;tracker-&gt;res_tree[type], i);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; ++i)</div><div class='add'>+		kfree(res_arr[i]);</div><div class='add'>+</div><div class='add'>+	kfree(res_arr);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int remove_qp_ok(struct res_qp *res)</div><div class='add'>+{</div><div class='add'>+	if (res-&gt;com.state == RES_QP_BUSY)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	else if (res-&gt;com.state != RES_QP_RESERVED)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int remove_mtt_ok(struct res_mtt *res, int order)</div><div class='add'>+{</div><div class='add'>+	if (res-&gt;com.state == RES_MTT_BUSY ||</div><div class='add'>+	    atomic_read(&amp;res-&gt;ref_count)) {</div><div class='add'>+		printk(KERN_DEBUG "%s-%d: state %s, ref_count %d\n",</div><div class='add'>+		       __func__, __LINE__,</div><div class='add'>+		       mtt_states_str(res-&gt;com.state),</div><div class='add'>+		       atomic_read(&amp;res-&gt;ref_count));</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	} else if (res-&gt;com.state != RES_MTT_ALLOCATED)</div><div class='add'>+		return -EPERM;</div><div class='add'>+	else if (res-&gt;order != order)</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 remove_mpt_ok(struct res_mpt *res)</div><div class='add'>+{</div><div class='add'>+	if (res-&gt;com.state == RES_MPT_BUSY)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	else if (res-&gt;com.state != RES_MPT_RESERVED)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int remove_eq_ok(struct res_eq *res)</div><div class='add'>+{</div><div class='add'>+	if (res-&gt;com.state == RES_MPT_BUSY)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	else if (res-&gt;com.state != RES_MPT_RESERVED)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int remove_counter_ok(struct res_counter *res)</div><div class='add'>+{</div><div class='add'>+	if (res-&gt;com.state == RES_COUNTER_BUSY)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	else if (res-&gt;com.state != RES_COUNTER_ALLOCATED)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int remove_cq_ok(struct res_cq *res)</div><div class='add'>+{</div><div class='add'>+	if (res-&gt;com.state == RES_CQ_BUSY)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	else if (res-&gt;com.state != RES_CQ_ALLOCATED)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int remove_srq_ok(struct res_srq *res)</div><div class='add'>+{</div><div class='add'>+	if (res-&gt;com.state == RES_SRQ_BUSY)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	else if (res-&gt;com.state != RES_SRQ_ALLOCATED)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int remove_ok(struct res_common *res, enum mlx4_resource type, int extra)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case RES_QP:</div><div class='add'>+		return remove_qp_ok((struct res_qp *)res);</div><div class='add'>+	case RES_CQ:</div><div class='add'>+		return remove_cq_ok((struct res_cq *)res);</div><div class='add'>+	case RES_SRQ:</div><div class='add'>+		return remove_srq_ok((struct res_srq *)res);</div><div class='add'>+	case RES_MPT:</div><div class='add'>+		return remove_mpt_ok((struct res_mpt *)res);</div><div class='add'>+	case RES_MTT:</div><div class='add'>+		return remove_mtt_ok((struct res_mtt *)res, extra);</div><div class='add'>+	case RES_MAC:</div><div class='add'>+		return -ENOSYS;</div><div class='add'>+	case RES_EQ:</div><div class='add'>+		return remove_eq_ok((struct res_eq *)res);</div><div class='add'>+	case RES_COUNTER:</div><div class='add'>+		return remove_counter_ok((struct res_counter *)res);</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 rem_res_range(struct mlx4_dev *dev, int slave, int base, int count,</div><div class='add'>+			 enum mlx4_resource type, int extra)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker = &amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct res_common *r;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	for (i = base; i &lt; base + count; ++i) {</div><div class='add'>+		r = radix_tree_lookup(&amp;tracker-&gt;res_tree[type], i);</div><div class='add'>+		if (!r) {</div><div class='add'>+			err = -ENOENT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		if (r-&gt;owner != slave) {</div><div class='add'>+			err = -EPERM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		err = remove_ok(r, type, extra);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = base; i &lt; base + count; ++i) {</div><div class='add'>+		r = radix_tree_lookup(&amp;tracker-&gt;res_tree[type], i);</div><div class='add'>+		radix_tree_delete(&amp;tracker-&gt;res_tree[type], i);</div><div class='add'>+		list_del(&amp;r-&gt;list);</div><div class='add'>+		kfree(r);</div><div class='add'>+	}</div><div class='add'>+	err = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(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 qp_res_start_move_to(struct mlx4_dev *dev, int slave, int qpn,</div><div class='add'>+				enum res_qp_states state, struct res_qp **qp,</div><div class='add'>+				int alloc)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker = &amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct res_qp *r;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	r = radix_tree_lookup(&amp;tracker-&gt;res_tree[RES_QP], qpn);</div><div class='add'>+	if (!r)</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+	else if (r-&gt;com.owner != slave)</div><div class='add'>+		err = -EPERM;</div><div class='add'>+	else {</div><div class='add'>+		switch (state) {</div><div class='add'>+		case RES_QP_BUSY:</div><div class='add'>+			mlx4_dbg(dev, "%s: failed RES_QP, 0x%x\n",</div><div class='add'>+				 __func__, r-&gt;com.res_id);</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RES_QP_RESERVED:</div><div class='add'>+			if (r-&gt;com.state == RES_QP_MAPPED &amp;&amp; !alloc)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			mlx4_dbg(dev, "failed RES_QP, 0x%x\n", r-&gt;com.res_id);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RES_QP_MAPPED:</div><div class='add'>+			if ((r-&gt;com.state == RES_QP_RESERVED &amp;&amp; alloc) ||</div><div class='add'>+			    r-&gt;com.state == RES_QP_HW)</div><div class='add'>+				break;</div><div class='add'>+			else {</div><div class='add'>+				mlx4_dbg(dev, "failed RES_QP, 0x%x\n",</div><div class='add'>+					  r-&gt;com.res_id);</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RES_QP_HW:</div><div class='add'>+			if (r-&gt;com.state != RES_QP_MAPPED)</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!err) {</div><div class='add'>+			r-&gt;com.from_state = r-&gt;com.state;</div><div class='add'>+			r-&gt;com.to_state = state;</div><div class='add'>+			r-&gt;com.state = RES_QP_BUSY;</div><div class='add'>+			if (qp)</div><div class='add'>+				*qp = (struct res_qp *)r;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(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 mr_res_start_move_to(struct mlx4_dev *dev, int slave, int index,</div><div class='add'>+				enum res_mpt_states state, struct res_mpt **mpt)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker = &amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct res_mpt *r;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	r = radix_tree_lookup(&amp;tracker-&gt;res_tree[RES_MPT], index);</div><div class='add'>+	if (!r)</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+	else if (r-&gt;com.owner != slave)</div><div class='add'>+		err = -EPERM;</div><div class='add'>+	else {</div><div class='add'>+		switch (state) {</div><div class='add'>+		case RES_MPT_BUSY:</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RES_MPT_RESERVED:</div><div class='add'>+			if (r-&gt;com.state != RES_MPT_MAPPED)</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RES_MPT_MAPPED:</div><div class='add'>+			if (r-&gt;com.state != RES_MPT_RESERVED &amp;&amp;</div><div class='add'>+			    r-&gt;com.state != RES_MPT_HW)</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RES_MPT_HW:</div><div class='add'>+			if (r-&gt;com.state != RES_MPT_MAPPED)</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!err) {</div><div class='add'>+			r-&gt;com.from_state = r-&gt;com.state;</div><div class='add'>+			r-&gt;com.to_state = state;</div><div class='add'>+			r-&gt;com.state = RES_MPT_BUSY;</div><div class='add'>+			if (mpt)</div><div class='add'>+				*mpt = (struct res_mpt *)r;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(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 eq_res_start_move_to(struct mlx4_dev *dev, int slave, int index,</div><div class='add'>+				enum res_eq_states state, struct res_eq **eq)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker = &amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct res_eq *r;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	r = radix_tree_lookup(&amp;tracker-&gt;res_tree[RES_EQ], index);</div><div class='add'>+	if (!r)</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+	else if (r-&gt;com.owner != slave)</div><div class='add'>+		err = -EPERM;</div><div class='add'>+	else {</div><div class='add'>+		switch (state) {</div><div class='add'>+		case RES_EQ_BUSY:</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RES_EQ_RESERVED:</div><div class='add'>+			if (r-&gt;com.state != RES_EQ_HW)</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RES_EQ_HW:</div><div class='add'>+			if (r-&gt;com.state != RES_EQ_RESERVED)</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!err) {</div><div class='add'>+			r-&gt;com.from_state = r-&gt;com.state;</div><div class='add'>+			r-&gt;com.to_state = state;</div><div class='add'>+			r-&gt;com.state = RES_EQ_BUSY;</div><div class='add'>+			if (eq)</div><div class='add'>+				*eq = r;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(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 cq_res_start_move_to(struct mlx4_dev *dev, int slave, int cqn,</div><div class='add'>+				enum res_cq_states state, struct res_cq **cq)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker = &amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct res_cq *r;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	r = radix_tree_lookup(&amp;tracker-&gt;res_tree[RES_CQ], cqn);</div><div class='add'>+	if (!r)</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+	else if (r-&gt;com.owner != slave)</div><div class='add'>+		err = -EPERM;</div><div class='add'>+	else {</div><div class='add'>+		switch (state) {</div><div class='add'>+		case RES_CQ_BUSY:</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RES_CQ_ALLOCATED:</div><div class='add'>+			if (r-&gt;com.state != RES_CQ_HW)</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+			else if (atomic_read(&amp;r-&gt;ref_count))</div><div class='add'>+				err = -EBUSY;</div><div class='add'>+			else</div><div class='add'>+				err = 0;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RES_CQ_HW:</div><div class='add'>+			if (r-&gt;com.state != RES_CQ_ALLOCATED)</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+			else</div><div class='add'>+				err = 0;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!err) {</div><div class='add'>+			r-&gt;com.from_state = r-&gt;com.state;</div><div class='add'>+			r-&gt;com.to_state = state;</div><div class='add'>+			r-&gt;com.state = RES_CQ_BUSY;</div><div class='add'>+			if (cq)</div><div class='add'>+				*cq = r;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(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 srq_res_start_move_to(struct mlx4_dev *dev, int slave, int index,</div><div class='add'>+				 enum res_cq_states state, struct res_srq **srq)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker = &amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct res_srq *r;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	r = radix_tree_lookup(&amp;tracker-&gt;res_tree[RES_SRQ], index);</div><div class='add'>+	if (!r)</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+	else if (r-&gt;com.owner != slave)</div><div class='add'>+		err = -EPERM;</div><div class='add'>+	else {</div><div class='add'>+		switch (state) {</div><div class='add'>+		case RES_SRQ_BUSY:</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RES_SRQ_ALLOCATED:</div><div class='add'>+			if (r-&gt;com.state != RES_SRQ_HW)</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+			else if (atomic_read(&amp;r-&gt;ref_count))</div><div class='add'>+				err = -EBUSY;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case RES_SRQ_HW:</div><div class='add'>+			if (r-&gt;com.state != RES_SRQ_ALLOCATED)</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!err) {</div><div class='add'>+			r-&gt;com.from_state = r-&gt;com.state;</div><div class='add'>+			r-&gt;com.to_state = state;</div><div class='add'>+			r-&gt;com.state = RES_SRQ_BUSY;</div><div class='add'>+			if (srq)</div><div class='add'>+				*srq = r;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void res_abort_move(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   enum mlx4_resource type, int id)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker = &amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct res_common *r;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	r = radix_tree_lookup(&amp;tracker-&gt;res_tree[type], id);</div><div class='add'>+	if (r &amp;&amp; (r-&gt;owner == slave))</div><div class='add'>+		r-&gt;state = r-&gt;from_state;</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void res_end_move(struct mlx4_dev *dev, int slave,</div><div class='add'>+			 enum mlx4_resource type, int id)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker = &amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct res_common *r;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	r = radix_tree_lookup(&amp;tracker-&gt;res_tree[type], id);</div><div class='add'>+	if (r &amp;&amp; (r-&gt;owner == slave))</div><div class='add'>+		r-&gt;state = r-&gt;to_state;</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int valid_reserved(struct mlx4_dev *dev, int slave, int qpn)</div><div class='add'>+{</div><div class='add'>+	return mlx4_is_qp_reserved(dev, qpn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qp_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,</div><div class='add'>+			u64 in_param, u64 *out_param)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int count;</div><div class='add'>+	int align;</div><div class='add'>+	int base;</div><div class='add'>+	int qpn;</div><div class='add'>+</div><div class='add'>+	switch (op) {</div><div class='add'>+	case RES_OP_RESERVE:</div><div class='add'>+		count = get_param_l(&amp;in_param);</div><div class='add'>+		align = get_param_h(&amp;in_param);</div><div class='add'>+		err = __mlx4_qp_reserve_range(dev, count, align, &amp;base);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = add_res_range(dev, slave, base, count, RES_QP, 0);</div><div class='add'>+		if (err) {</div><div class='add'>+			__mlx4_qp_release_range(dev, base, count);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		set_param_l(out_param, base);</div><div class='add'>+		break;</div><div class='add'>+	case RES_OP_MAP_ICM:</div><div class='add'>+		qpn = get_param_l(&amp;in_param) &amp; 0x7fffff;</div><div class='add'>+		if (valid_reserved(dev, slave, qpn)) {</div><div class='add'>+			err = add_res_range(dev, slave, qpn, 1, RES_QP, 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'>+		err = qp_res_start_move_to(dev, slave, qpn, RES_QP_MAPPED,</div><div class='add'>+					   NULL, 1);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (!valid_reserved(dev, slave, qpn)) {</div><div class='add'>+			err = __mlx4_qp_alloc_icm(dev, qpn);</div><div class='add'>+			if (err) {</div><div class='add'>+				res_abort_move(dev, slave, RES_QP, qpn);</div><div class='add'>+				return err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		res_end_move(dev, slave, RES_QP, qpn);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtt_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,</div><div class='add'>+			 u64 in_param, u64 *out_param)</div><div class='add'>+{</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+	int base;</div><div class='add'>+	int order;</div><div class='add'>+</div><div class='add'>+	if (op != RES_OP_RESERVE_AND_MAP)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	order = get_param_l(&amp;in_param);</div><div class='add'>+	base = __mlx4_alloc_mtt_range(dev, order);</div><div class='add'>+	if (base == -1)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = add_res_range(dev, slave, base, 1, RES_MTT, order);</div><div class='add'>+	if (err)</div><div class='add'>+		__mlx4_free_mtt_range(dev, base, order);</div><div class='add'>+	else</div><div class='add'>+		set_param_l(out_param, base);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mpt_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,</div><div class='add'>+			 u64 in_param, u64 *out_param)</div><div class='add'>+{</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+	int index;</div><div class='add'>+	int id;</div><div class='add'>+	struct res_mpt *mpt;</div><div class='add'>+</div><div class='add'>+	switch (op) {</div><div class='add'>+	case RES_OP_RESERVE:</div><div class='add'>+		index = __mlx4_mr_reserve(dev);</div><div class='add'>+		if (index == -1)</div><div class='add'>+			break;</div><div class='add'>+		id = index &amp; mpt_mask(dev);</div><div class='add'>+</div><div class='add'>+		err = add_res_range(dev, slave, id, 1, RES_MPT, index);</div><div class='add'>+		if (err) {</div><div class='add'>+			__mlx4_mr_release(dev, index);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		set_param_l(out_param, index);</div><div class='add'>+		break;</div><div class='add'>+	case RES_OP_MAP_ICM:</div><div class='add'>+		index = get_param_l(&amp;in_param);</div><div class='add'>+		id = index &amp; mpt_mask(dev);</div><div class='add'>+		err = mr_res_start_move_to(dev, slave, id,</div><div class='add'>+					   RES_MPT_MAPPED, &amp;mpt);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = __mlx4_mr_alloc_icm(dev, mpt-&gt;key);</div><div class='add'>+		if (err) {</div><div class='add'>+			res_abort_move(dev, slave, RES_MPT, id);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		res_end_move(dev, slave, RES_MPT, id);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cq_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,</div><div class='add'>+			u64 in_param, u64 *out_param)</div><div class='add'>+{</div><div class='add'>+	int cqn;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (op) {</div><div class='add'>+	case RES_OP_RESERVE_AND_MAP:</div><div class='add'>+		err = __mlx4_cq_alloc_icm(dev, &amp;cqn);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		err = add_res_range(dev, slave, cqn, 1, RES_CQ, 0);</div><div class='add'>+		if (err) {</div><div class='add'>+			__mlx4_cq_free_icm(dev, cqn);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		set_param_l(out_param, cqn);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int srq_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,</div><div class='add'>+			 u64 in_param, u64 *out_param)</div><div class='add'>+{</div><div class='add'>+	int srqn;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (op) {</div><div class='add'>+	case RES_OP_RESERVE_AND_MAP:</div><div class='add'>+		err = __mlx4_srq_alloc_icm(dev, &amp;srqn);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		err = add_res_range(dev, slave, srqn, 1, RES_SRQ, 0);</div><div class='add'>+		if (err) {</div><div class='add'>+			__mlx4_srq_free_icm(dev, srqn);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		set_param_l(out_param, srqn);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mac_add_to_slave(struct mlx4_dev *dev, int slave, u64 mac, int port)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker = &amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct mac_res *res;</div><div class='add'>+</div><div class='add'>+	res = kzalloc(sizeof *res, GFP_KERNEL);</div><div class='add'>+	if (!res)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	res-&gt;mac = mac;</div><div class='add'>+	res-&gt;port = (u8) port;</div><div class='add'>+	list_add_tail(&amp;res-&gt;list,</div><div class='add'>+		      &amp;tracker-&gt;slave_list[slave].res_list[RES_MAC]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mac_del_from_slave(struct mlx4_dev *dev, int slave, u64 mac,</div><div class='add'>+			       int port)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker = &amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct list_head *mac_list =</div><div class='add'>+		&amp;tracker-&gt;slave_list[slave].res_list[RES_MAC];</div><div class='add'>+	struct mac_res *res, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(res, tmp, mac_list, list) {</div><div class='add'>+		if (res-&gt;mac == mac &amp;&amp; res-&gt;port == (u8) port) {</div><div class='add'>+			list_del(&amp;res-&gt;list);</div><div class='add'>+			kfree(res);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rem_slave_macs(struct mlx4_dev *dev, int slave)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker = &amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct list_head *mac_list =</div><div class='add'>+		&amp;tracker-&gt;slave_list[slave].res_list[RES_MAC];</div><div class='add'>+	struct mac_res *res, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(res, tmp, mac_list, list) {</div><div class='add'>+		list_del(&amp;res-&gt;list);</div><div class='add'>+		__mlx4_unregister_mac(dev, res-&gt;port, res-&gt;mac);</div><div class='add'>+		kfree(res);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mac_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,</div><div class='add'>+			 u64 in_param, u64 *out_param)</div><div class='add'>+{</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+	int port;</div><div class='add'>+	u64 mac;</div><div class='add'>+</div><div class='add'>+	if (op != RES_OP_RESERVE_AND_MAP)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	port = get_param_l(out_param);</div><div class='add'>+	mac = in_param;</div><div class='add'>+</div><div class='add'>+	err = __mlx4_register_mac(dev, port, mac);</div><div class='add'>+	if (err &gt;= 0) {</div><div class='add'>+		set_param_l(out_param, err);</div><div class='add'>+		err = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!err) {</div><div class='add'>+		err = mac_add_to_slave(dev, slave, mac, port);</div><div class='add'>+		if (err)</div><div class='add'>+			__mlx4_unregister_mac(dev, port, mac);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,</div><div class='add'>+			 u64 in_param, u64 *out_param)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_ALLOC_RES_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int alop = vhcr-&gt;op_modifier;</div><div class='add'>+</div><div class='add'>+	switch (vhcr-&gt;in_modifier) {</div><div class='add'>+	case RES_QP:</div><div class='add'>+		err = qp_alloc_res(dev, slave, vhcr-&gt;op_modifier, alop,</div><div class='add'>+				   vhcr-&gt;in_param, &amp;vhcr-&gt;out_param);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RES_MTT:</div><div class='add'>+		err = mtt_alloc_res(dev, slave, vhcr-&gt;op_modifier, alop,</div><div class='add'>+				    vhcr-&gt;in_param, &amp;vhcr-&gt;out_param);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RES_MPT:</div><div class='add'>+		err = mpt_alloc_res(dev, slave, vhcr-&gt;op_modifier, alop,</div><div class='add'>+				    vhcr-&gt;in_param, &amp;vhcr-&gt;out_param);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RES_CQ:</div><div class='add'>+		err = cq_alloc_res(dev, slave, vhcr-&gt;op_modifier, alop,</div><div class='add'>+				   vhcr-&gt;in_param, &amp;vhcr-&gt;out_param);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RES_SRQ:</div><div class='add'>+		err = srq_alloc_res(dev, slave, vhcr-&gt;op_modifier, alop,</div><div class='add'>+				    vhcr-&gt;in_param, &amp;vhcr-&gt;out_param);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RES_MAC:</div><div class='add'>+		err = mac_alloc_res(dev, slave, vhcr-&gt;op_modifier, alop,</div><div class='add'>+				    vhcr-&gt;in_param, &amp;vhcr-&gt;out_param);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RES_VLAN:</div><div class='add'>+		err = vlan_alloc_res(dev, slave, vhcr-&gt;op_modifier, alop,</div><div class='add'>+				    vhcr-&gt;in_param, &amp;vhcr-&gt;out_param);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qp_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,</div><div class='add'>+		       u64 in_param)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int count;</div><div class='add'>+	int base;</div><div class='add'>+	int qpn;</div><div class='add'>+</div><div class='add'>+	switch (op) {</div><div class='add'>+	case RES_OP_RESERVE:</div><div class='add'>+		base = get_param_l(&amp;in_param) &amp; 0x7fffff;</div><div class='add'>+		count = get_param_h(&amp;in_param);</div><div class='add'>+		err = rem_res_range(dev, slave, base, count, RES_QP, 0);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+		__mlx4_qp_release_range(dev, base, count);</div><div class='add'>+		break;</div><div class='add'>+	case RES_OP_MAP_ICM:</div><div class='add'>+		qpn = get_param_l(&amp;in_param) &amp; 0x7fffff;</div><div class='add'>+		err = qp_res_start_move_to(dev, slave, qpn, RES_QP_RESERVED,</div><div class='add'>+					   NULL, 0);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (!valid_reserved(dev, slave, qpn))</div><div class='add'>+			__mlx4_qp_free_icm(dev, qpn);</div><div class='add'>+</div><div class='add'>+		res_end_move(dev, slave, RES_QP, qpn);</div><div class='add'>+</div><div class='add'>+		if (valid_reserved(dev, slave, qpn))</div><div class='add'>+			err = rem_res_range(dev, slave, qpn, 1, RES_QP, 0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mtt_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,</div><div class='add'>+			u64 in_param, u64 *out_param)</div><div class='add'>+{</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+	int base;</div><div class='add'>+	int order;</div><div class='add'>+</div><div class='add'>+	if (op != RES_OP_RESERVE_AND_MAP)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	base = get_param_l(&amp;in_param);</div><div class='add'>+	order = get_param_h(&amp;in_param);</div><div class='add'>+	err = rem_res_range(dev, slave, base, 1, RES_MTT, order);</div><div class='add'>+	if (!err)</div><div class='add'>+		__mlx4_free_mtt_range(dev, base, order);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mpt_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,</div><div class='add'>+			u64 in_param)</div><div class='add'>+{</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+	int index;</div><div class='add'>+	int id;</div><div class='add'>+	struct res_mpt *mpt;</div><div class='add'>+</div><div class='add'>+	switch (op) {</div><div class='add'>+	case RES_OP_RESERVE:</div><div class='add'>+		index = get_param_l(&amp;in_param);</div><div class='add'>+		id = index &amp; mpt_mask(dev);</div><div class='add'>+		err = get_res(dev, slave, id, RES_MPT, &amp;mpt);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+		index = mpt-&gt;key;</div><div class='add'>+		put_res(dev, slave, id, RES_MPT);</div><div class='add'>+</div><div class='add'>+		err = rem_res_range(dev, slave, id, 1, RES_MPT, 0);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+		__mlx4_mr_release(dev, index);</div><div class='add'>+		break;</div><div class='add'>+	case RES_OP_MAP_ICM:</div><div class='add'>+			index = get_param_l(&amp;in_param);</div><div class='add'>+			id = index &amp; mpt_mask(dev);</div><div class='add'>+			err = mr_res_start_move_to(dev, slave, id,</div><div class='add'>+						   RES_MPT_RESERVED, &amp;mpt);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+</div><div class='add'>+			__mlx4_mr_free_icm(dev, mpt-&gt;key);</div><div class='add'>+			res_end_move(dev, slave, RES_MPT, id);</div><div class='add'>+			return err;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cq_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,</div><div class='add'>+		       u64 in_param, u64 *out_param)</div><div class='add'>+{</div><div class='add'>+	int cqn;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (op) {</div><div class='add'>+	case RES_OP_RESERVE_AND_MAP:</div><div class='add'>+		cqn = get_param_l(&amp;in_param);</div><div class='add'>+		err = rem_res_range(dev, slave, cqn, 1, RES_CQ, 0);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		__mlx4_cq_free_icm(dev, cqn);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int srq_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,</div><div class='add'>+			u64 in_param, u64 *out_param)</div><div class='add'>+{</div><div class='add'>+	int srqn;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (op) {</div><div class='add'>+	case RES_OP_RESERVE_AND_MAP:</div><div class='add'>+		srqn = get_param_l(&amp;in_param);</div><div class='add'>+		err = rem_res_range(dev, slave, srqn, 1, RES_SRQ, 0);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		__mlx4_srq_free_icm(dev, srqn);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mac_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,</div><div class='add'>+			    u64 in_param, u64 *out_param)</div><div class='add'>+{</div><div class='add'>+	int port;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	switch (op) {</div><div class='add'>+	case RES_OP_RESERVE_AND_MAP:</div><div class='add'>+		port = get_param_l(out_param);</div><div class='add'>+		mac_del_from_slave(dev, slave, in_param, port);</div><div class='add'>+		__mlx4_unregister_mac(dev, port, in_param);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vlan_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,</div><div class='add'>+			    u64 in_param, u64 *out_param)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_FREE_RES_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			  struct mlx4_vhcr *vhcr,</div><div class='add'>+			  struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			  struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			  struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+	int alop = vhcr-&gt;op_modifier;</div><div class='add'>+</div><div class='add'>+	switch (vhcr-&gt;in_modifier) {</div><div class='add'>+	case RES_QP:</div><div class='add'>+		err = qp_free_res(dev, slave, vhcr-&gt;op_modifier, alop,</div><div class='add'>+				  vhcr-&gt;in_param);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RES_MTT:</div><div class='add'>+		err = mtt_free_res(dev, slave, vhcr-&gt;op_modifier, alop,</div><div class='add'>+				   vhcr-&gt;in_param, &amp;vhcr-&gt;out_param);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RES_MPT:</div><div class='add'>+		err = mpt_free_res(dev, slave, vhcr-&gt;op_modifier, alop,</div><div class='add'>+				   vhcr-&gt;in_param);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RES_CQ:</div><div class='add'>+		err = cq_free_res(dev, slave, vhcr-&gt;op_modifier, alop,</div><div class='add'>+				  vhcr-&gt;in_param, &amp;vhcr-&gt;out_param);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RES_SRQ:</div><div class='add'>+		err = srq_free_res(dev, slave, vhcr-&gt;op_modifier, alop,</div><div class='add'>+				   vhcr-&gt;in_param, &amp;vhcr-&gt;out_param);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RES_MAC:</div><div class='add'>+		err = mac_free_res(dev, slave, vhcr-&gt;op_modifier, alop,</div><div class='add'>+				   vhcr-&gt;in_param, &amp;vhcr-&gt;out_param);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RES_VLAN:</div><div class='add'>+		err = vlan_free_res(dev, slave, vhcr-&gt;op_modifier, alop,</div><div class='add'>+				   vhcr-&gt;in_param, &amp;vhcr-&gt;out_param);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ugly but other choices are uglier */</div><div class='add'>+static int mr_phys_mpt(struct mlx4_mpt_entry *mpt)</div><div class='add'>+{</div><div class='add'>+	return (be32_to_cpu(mpt-&gt;flags) &gt;&gt; 9) &amp; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mr_get_mtt_addr(struct mlx4_mpt_entry *mpt)</div><div class='add'>+{</div><div class='add'>+	return (int)be64_to_cpu(mpt-&gt;mtt_addr) &amp; 0xfffffff8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mr_get_mtt_size(struct mlx4_mpt_entry *mpt)</div><div class='add'>+{</div><div class='add'>+	return be32_to_cpu(mpt-&gt;mtt_sz);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mr_get_pdn(struct mlx4_mpt_entry *mpt)</div><div class='add'>+{</div><div class='add'>+	return be32_to_cpu(mpt-&gt;pd_flags) &amp; 0xffffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qp_get_mtt_addr(struct mlx4_qp_context *qpc)</div><div class='add'>+{</div><div class='add'>+	return be32_to_cpu(qpc-&gt;mtt_base_addr_l) &amp; 0xfffffff8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int srq_get_mtt_addr(struct mlx4_srq_context *srqc)</div><div class='add'>+{</div><div class='add'>+	return be32_to_cpu(srqc-&gt;mtt_base_addr_l) &amp; 0xfffffff8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qp_get_mtt_size(struct mlx4_qp_context *qpc)</div><div class='add'>+{</div><div class='add'>+	int page_shift = (qpc-&gt;log_page_size &amp; 0x3f) + 12;</div><div class='add'>+	int log_sq_size = (qpc-&gt;sq_size_stride &gt;&gt; 3) &amp; 0xf;</div><div class='add'>+	int log_sq_sride = qpc-&gt;sq_size_stride &amp; 7;</div><div class='add'>+	int log_rq_size = (qpc-&gt;rq_size_stride &gt;&gt; 3) &amp; 0xf;</div><div class='add'>+	int log_rq_stride = qpc-&gt;rq_size_stride &amp; 7;</div><div class='add'>+	int srq = (be32_to_cpu(qpc-&gt;srqn) &gt;&gt; 24) &amp; 1;</div><div class='add'>+	int rss = (be32_to_cpu(qpc-&gt;flags) &gt;&gt; 13) &amp; 1;</div><div class='add'>+	int xrc = (be32_to_cpu(qpc-&gt;local_qpn) &gt;&gt; 23) &amp; 1;</div><div class='add'>+	int sq_size;</div><div class='add'>+	int rq_size;</div><div class='add'>+	int total_pages;</div><div class='add'>+	int total_mem;</div><div class='add'>+	int page_offset = (be32_to_cpu(qpc-&gt;params2) &gt;&gt; 6) &amp; 0x3f;</div><div class='add'>+</div><div class='add'>+	sq_size = 1 &lt;&lt; (log_sq_size + log_sq_sride + 4);</div><div class='add'>+	rq_size = (srq|rss|xrc) ? 0 : (1 &lt;&lt; (log_rq_size + log_rq_stride + 4));</div><div class='add'>+	total_mem = sq_size + rq_size;</div><div class='add'>+	total_pages =</div><div class='add'>+		roundup_pow_of_two((total_mem + (page_offset &lt;&lt; 6)) &gt;&gt;</div><div class='add'>+				   page_shift);</div><div class='add'>+</div><div class='add'>+	return total_pages;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qp_get_pdn(struct mlx4_qp_context *qpc)</div><div class='add'>+{</div><div class='add'>+	return be32_to_cpu(qpc-&gt;pd) &amp; 0xffffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pdn2slave(int pdn)</div><div class='add'>+{</div><div class='add'>+	return (pdn &gt;&gt; NOT_MASKED_PD_BITS) - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_mtt_range(struct mlx4_dev *dev, int slave, int start,</div><div class='add'>+			   int size, struct res_mtt *mtt)</div><div class='add'>+{</div><div class='add'>+	int res_start = mtt-&gt;com.res_id;</div><div class='add'>+	int res_size = (1 &lt;&lt; mtt-&gt;order);</div><div class='add'>+</div><div class='add'>+	if (start &lt; res_start || start + size &gt; res_start + res_size)</div><div class='add'>+		return -EPERM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_SW2HW_MPT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int index = vhcr-&gt;in_modifier;</div><div class='add'>+	struct res_mtt *mtt;</div><div class='add'>+	struct res_mpt *mpt;</div><div class='add'>+	int mtt_base = mr_get_mtt_addr(inbox-&gt;buf) / dev-&gt;caps.mtt_entry_sz;</div><div class='add'>+	int phys;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	id = index &amp; mpt_mask(dev);</div><div class='add'>+	err = mr_res_start_move_to(dev, slave, id, RES_MPT_HW, &amp;mpt);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	phys = mr_phys_mpt(inbox-&gt;buf);</div><div class='add'>+	if (!phys) {</div><div class='add'>+		err = get_res(dev, slave, mtt_base, RES_MTT, &amp;mtt);</div><div class='add'>+		if (err)</div><div class='add'>+			goto ex_abort;</div><div class='add'>+</div><div class='add'>+		err = check_mtt_range(dev, slave, mtt_base,</div><div class='add'>+				      mr_get_mtt_size(inbox-&gt;buf), mtt);</div><div class='add'>+		if (err)</div><div class='add'>+			goto ex_put;</div><div class='add'>+</div><div class='add'>+		mpt-&gt;mtt = mtt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pdn2slave(mr_get_pdn(inbox-&gt;buf)) != slave) {</div><div class='add'>+		err = -EPERM;</div><div class='add'>+		goto ex_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ex_put;</div><div class='add'>+</div><div class='add'>+	if (!phys) {</div><div class='add'>+		atomic_inc(&amp;mtt-&gt;ref_count);</div><div class='add'>+		put_res(dev, slave, mtt-&gt;com.res_id, RES_MTT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	res_end_move(dev, slave, RES_MPT, id);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ex_put:</div><div class='add'>+	if (!phys)</div><div class='add'>+		put_res(dev, slave, mtt-&gt;com.res_id, RES_MTT);</div><div class='add'>+ex_abort:</div><div class='add'>+	res_abort_move(dev, slave, RES_MPT, id);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_HW2SW_MPT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int index = vhcr-&gt;in_modifier;</div><div class='add'>+	struct res_mpt *mpt;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	id = index &amp; mpt_mask(dev);</div><div class='add'>+	err = mr_res_start_move_to(dev, slave, id, RES_MPT_MAPPED, &amp;mpt);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ex_abort;</div><div class='add'>+</div><div class='add'>+	if (mpt-&gt;mtt)</div><div class='add'>+		atomic_dec(&amp;mpt-&gt;mtt-&gt;ref_count);</div><div class='add'>+</div><div class='add'>+	res_end_move(dev, slave, RES_MPT, id);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ex_abort:</div><div class='add'>+	res_abort_move(dev, slave, RES_MPT, id);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_QUERY_MPT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int index = vhcr-&gt;in_modifier;</div><div class='add'>+	struct res_mpt *mpt;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	id = index &amp; mpt_mask(dev);</div><div class='add'>+	err = get_res(dev, slave, id, RES_MPT, &amp;mpt);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (mpt-&gt;com.from_state != RES_MPT_HW) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	put_res(dev, slave, id, RES_MPT);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qp_get_rcqn(struct mlx4_qp_context *qpc)</div><div class='add'>+{</div><div class='add'>+	return be32_to_cpu(qpc-&gt;cqn_recv) &amp; 0xffffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qp_get_scqn(struct mlx4_qp_context *qpc)</div><div class='add'>+{</div><div class='add'>+	return be32_to_cpu(qpc-&gt;cqn_send) &amp; 0xffffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 qp_get_srqn(struct mlx4_qp_context *qpc)</div><div class='add'>+{</div><div class='add'>+	return be32_to_cpu(qpc-&gt;srqn) &amp; 0x1ffffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_RST2INIT_QP_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			     struct mlx4_vhcr *vhcr,</div><div class='add'>+			     struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			     struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			     struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int qpn = vhcr-&gt;in_modifier &amp; 0x7fffff;</div><div class='add'>+	struct res_mtt *mtt;</div><div class='add'>+	struct res_qp *qp;</div><div class='add'>+	struct mlx4_qp_context *qpc = inbox-&gt;buf + 8;</div><div class='add'>+	int mtt_base = qp_get_mtt_addr(qpc) / dev-&gt;caps.mtt_entry_sz;</div><div class='add'>+	int mtt_size = qp_get_mtt_size(qpc);</div><div class='add'>+	struct res_cq *rcq;</div><div class='add'>+	struct res_cq *scq;</div><div class='add'>+	int rcqn = qp_get_rcqn(qpc);</div><div class='add'>+	int scqn = qp_get_scqn(qpc);</div><div class='add'>+	u32 srqn = qp_get_srqn(qpc) &amp; 0xffffff;</div><div class='add'>+	int use_srq = (qp_get_srqn(qpc) &gt;&gt; 24) &amp; 1;</div><div class='add'>+	struct res_srq *srq;</div><div class='add'>+	int local_qpn = be32_to_cpu(qpc-&gt;local_qpn) &amp; 0xffffff;</div><div class='add'>+</div><div class='add'>+	err = qp_res_start_move_to(dev, slave, qpn, RES_QP_HW, &amp;qp, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	qp-&gt;local_qpn = local_qpn;</div><div class='add'>+</div><div class='add'>+	err = get_res(dev, slave, mtt_base, RES_MTT, &amp;mtt);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ex_abort;</div><div class='add'>+</div><div class='add'>+	err = check_mtt_range(dev, slave, mtt_base, mtt_size, mtt);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ex_put_mtt;</div><div class='add'>+</div><div class='add'>+	if (pdn2slave(qp_get_pdn(qpc)) != slave) {</div><div class='add'>+		err = -EPERM;</div><div class='add'>+		goto ex_put_mtt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = get_res(dev, slave, rcqn, RES_CQ, &amp;rcq);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ex_put_mtt;</div><div class='add'>+</div><div class='add'>+	if (scqn != rcqn) {</div><div class='add'>+		err = get_res(dev, slave, scqn, RES_CQ, &amp;scq);</div><div class='add'>+		if (err)</div><div class='add'>+			goto ex_put_rcq;</div><div class='add'>+	} else</div><div class='add'>+		scq = rcq;</div><div class='add'>+</div><div class='add'>+	if (use_srq) {</div><div class='add'>+		err = get_res(dev, slave, srqn, RES_SRQ, &amp;srq);</div><div class='add'>+		if (err)</div><div class='add'>+			goto ex_put_scq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ex_put_srq;</div><div class='add'>+	atomic_inc(&amp;mtt-&gt;ref_count);</div><div class='add'>+	qp-&gt;mtt = mtt;</div><div class='add'>+	atomic_inc(&amp;rcq-&gt;ref_count);</div><div class='add'>+	qp-&gt;rcq = rcq;</div><div class='add'>+	atomic_inc(&amp;scq-&gt;ref_count);</div><div class='add'>+	qp-&gt;scq = scq;</div><div class='add'>+</div><div class='add'>+	if (scqn != rcqn)</div><div class='add'>+		put_res(dev, slave, scqn, RES_CQ);</div><div class='add'>+</div><div class='add'>+	if (use_srq) {</div><div class='add'>+		atomic_inc(&amp;srq-&gt;ref_count);</div><div class='add'>+		put_res(dev, slave, srqn, RES_SRQ);</div><div class='add'>+		qp-&gt;srq = srq;</div><div class='add'>+	}</div><div class='add'>+	put_res(dev, slave, rcqn, RES_CQ);</div><div class='add'>+	put_res(dev, slave, mtt_base, RES_MTT);</div><div class='add'>+	res_end_move(dev, slave, RES_QP, qpn);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ex_put_srq:</div><div class='add'>+	if (use_srq)</div><div class='add'>+		put_res(dev, slave, srqn, RES_SRQ);</div><div class='add'>+ex_put_scq:</div><div class='add'>+	if (scqn != rcqn)</div><div class='add'>+		put_res(dev, slave, scqn, RES_CQ);</div><div class='add'>+ex_put_rcq:</div><div class='add'>+	put_res(dev, slave, rcqn, RES_CQ);</div><div class='add'>+ex_put_mtt:</div><div class='add'>+	put_res(dev, slave, mtt_base, RES_MTT);</div><div class='add'>+ex_abort:</div><div class='add'>+	res_abort_move(dev, slave, RES_QP, qpn);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int eq_get_mtt_addr(struct mlx4_eq_context *eqc)</div><div class='add'>+{</div><div class='add'>+	return be32_to_cpu(eqc-&gt;mtt_base_addr_l) &amp; 0xfffffff8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int eq_get_mtt_size(struct mlx4_eq_context *eqc)</div><div class='add'>+{</div><div class='add'>+	int log_eq_size = eqc-&gt;log_eq_size &amp; 0x1f;</div><div class='add'>+	int page_shift = (eqc-&gt;log_page_size &amp; 0x3f) + 12;</div><div class='add'>+</div><div class='add'>+	if (log_eq_size + 5 &lt; page_shift)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 1 &lt;&lt; (log_eq_size + 5 - page_shift);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cq_get_mtt_addr(struct mlx4_cq_context *cqc)</div><div class='add'>+{</div><div class='add'>+	return be32_to_cpu(cqc-&gt;mtt_base_addr_l) &amp; 0xfffffff8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cq_get_mtt_size(struct mlx4_cq_context *cqc)</div><div class='add'>+{</div><div class='add'>+	int log_cq_size = (be32_to_cpu(cqc-&gt;logsize_usrpage) &gt;&gt; 24) &amp; 0x1f;</div><div class='add'>+	int page_shift = (cqc-&gt;log_page_size &amp; 0x3f) + 12;</div><div class='add'>+</div><div class='add'>+	if (log_cq_size + 5 &lt; page_shift)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 1 &lt;&lt; (log_cq_size + 5 - page_shift);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_SW2HW_EQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			  struct mlx4_vhcr *vhcr,</div><div class='add'>+			  struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			  struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			  struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int eqn = vhcr-&gt;in_modifier;</div><div class='add'>+	int res_id = (slave &lt;&lt; 8) | eqn;</div><div class='add'>+	struct mlx4_eq_context *eqc = inbox-&gt;buf;</div><div class='add'>+	int mtt_base = eq_get_mtt_addr(eqc) / dev-&gt;caps.mtt_entry_sz;</div><div class='add'>+	int mtt_size = eq_get_mtt_size(eqc);</div><div class='add'>+	struct res_eq *eq;</div><div class='add'>+	struct res_mtt *mtt;</div><div class='add'>+</div><div class='add'>+	err = add_res_range(dev, slave, res_id, 1, RES_EQ, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	err = eq_res_start_move_to(dev, slave, res_id, RES_EQ_HW, &amp;eq);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_add;</div><div class='add'>+</div><div class='add'>+	err = get_res(dev, slave, mtt_base, RES_MTT, &amp;mtt);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_move;</div><div class='add'>+</div><div class='add'>+	err = check_mtt_range(dev, slave, mtt_base, mtt_size, mtt);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_put;</div><div class='add'>+</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_put;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;mtt-&gt;ref_count);</div><div class='add'>+	eq-&gt;mtt = mtt;</div><div class='add'>+	put_res(dev, slave, mtt-&gt;com.res_id, RES_MTT);</div><div class='add'>+	res_end_move(dev, slave, RES_EQ, res_id);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_put:</div><div class='add'>+	put_res(dev, slave, mtt-&gt;com.res_id, RES_MTT);</div><div class='add'>+out_move:</div><div class='add'>+	res_abort_move(dev, slave, RES_EQ, res_id);</div><div class='add'>+out_add:</div><div class='add'>+	rem_res_range(dev, slave, res_id, 1, RES_EQ, 0);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_containing_mtt(struct mlx4_dev *dev, int slave, int start,</div><div class='add'>+			      int len, struct res_mtt **res)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker = &amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct res_mtt *mtt;</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	list_for_each_entry(mtt, &amp;tracker-&gt;slave_list[slave].res_list[RES_MTT],</div><div class='add'>+			    com.list) {</div><div class='add'>+		if (!check_mtt_range(dev, slave, start, len, mtt)) {</div><div class='add'>+			*res = mtt;</div><div class='add'>+			mtt-&gt;com.from_state = mtt-&gt;com.state;</div><div class='add'>+			mtt-&gt;com.state = RES_MTT_BUSY;</div><div class='add'>+			err = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_WRITE_MTT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_mtt mtt;</div><div class='add'>+	__be64 *page_list = inbox-&gt;buf;</div><div class='add'>+	u64 *pg_list = (u64 *)page_list;</div><div class='add'>+	int i;</div><div class='add'>+	struct res_mtt *rmtt = NULL;</div><div class='add'>+	int start = be64_to_cpu(page_list[0]);</div><div class='add'>+	int npages = vhcr-&gt;in_modifier;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = get_containing_mtt(dev, slave, start, npages, &amp;rmtt);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Call the SW implementation of write_mtt:</div><div class='add'>+	 * - Prepare a dummy mtt struct</div><div class='add'>+	 * - Translate inbox contents to simple addresses in host endianess */</div><div class='add'>+	mtt.offset = 0;  /* TBD this is broken but I don't handle it since</div><div class='add'>+			    we don't really use it */</div><div class='add'>+	mtt.order = 0;</div><div class='add'>+	mtt.page_shift = 0;</div><div class='add'>+	for (i = 0; i &lt; npages; ++i)</div><div class='add'>+		pg_list[i + 2] = (be64_to_cpu(page_list[i + 2]) &amp; ~1ULL);</div><div class='add'>+</div><div class='add'>+	err = __mlx4_write_mtt(dev, &amp;mtt, be64_to_cpu(page_list[0]), npages,</div><div class='add'>+			       ((u64 *)page_list + 2));</div><div class='add'>+</div><div class='add'>+	if (rmtt)</div><div class='add'>+		put_res(dev, slave, rmtt-&gt;com.res_id, RES_MTT);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_HW2SW_EQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			  struct mlx4_vhcr *vhcr,</div><div class='add'>+			  struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			  struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			  struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int eqn = vhcr-&gt;in_modifier;</div><div class='add'>+	int res_id = eqn | (slave &lt;&lt; 8);</div><div class='add'>+	struct res_eq *eq;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = eq_res_start_move_to(dev, slave, res_id, RES_EQ_RESERVED, &amp;eq);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = get_res(dev, slave, eq-&gt;mtt-&gt;com.res_id, RES_MTT, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ex_abort;</div><div class='add'>+</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ex_put;</div><div class='add'>+</div><div class='add'>+	atomic_dec(&amp;eq-&gt;mtt-&gt;ref_count);</div><div class='add'>+	put_res(dev, slave, eq-&gt;mtt-&gt;com.res_id, RES_MTT);</div><div class='add'>+	res_end_move(dev, slave, RES_EQ, res_id);</div><div class='add'>+	rem_res_range(dev, slave, res_id, 1, RES_EQ, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ex_put:</div><div class='add'>+	put_res(dev, slave, eq-&gt;mtt-&gt;com.res_id, RES_MTT);</div><div class='add'>+ex_abort:</div><div class='add'>+	res_abort_move(dev, slave, RES_EQ, res_id);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_GEN_EQE(struct mlx4_dev *dev, int slave, struct mlx4_eqe *eqe)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_slave_event_eq_info *event_eq;</div><div class='add'>+	struct mlx4_cmd_mailbox *mailbox;</div><div class='add'>+	u32 in_modifier = 0;</div><div class='add'>+	int err;</div><div class='add'>+	int res_id;</div><div class='add'>+	struct res_eq *req;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;mfunc.master.slave_state)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	event_eq = &amp;priv-&gt;mfunc.master.slave_state[slave].event_eq;</div><div class='add'>+</div><div class='add'>+	/* Create the event only if the slave is registered */</div><div class='add'>+	if ((event_eq-&gt;event_type &amp; (1 &lt;&lt; eqe-&gt;type)) == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mfunc.master.gen_eqe_mutex[slave]);</div><div class='add'>+	res_id = (slave &lt;&lt; 8) | event_eq-&gt;eqn;</div><div class='add'>+	err = get_res(dev, slave, res_id, RES_EQ, &amp;req);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;com.from_state != RES_EQ_HW) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mailbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='add'>+	if (IS_ERR(mailbox)) {</div><div class='add'>+		err = PTR_ERR(mailbox);</div><div class='add'>+		goto put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (eqe-&gt;type == MLX4_EVENT_TYPE_CMD) {</div><div class='add'>+		++event_eq-&gt;token;</div><div class='add'>+		eqe-&gt;event.cmd.token = cpu_to_be16(event_eq-&gt;token);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(mailbox-&gt;buf, (u8 *) eqe, 28);</div><div class='add'>+</div><div class='add'>+	in_modifier = (slave &amp; 0xff) | ((event_eq-&gt;eqn &amp; 0xff) &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	err = mlx4_cmd(dev, mailbox-&gt;dma, in_modifier, 0,</div><div class='add'>+		       MLX4_CMD_GEN_EQE, MLX4_CMD_TIME_CLASS_B,</div><div class='add'>+		       MLX4_CMD_NATIVE);</div><div class='add'>+</div><div class='add'>+	put_res(dev, slave, res_id, RES_EQ);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mfunc.master.gen_eqe_mutex[slave]);</div><div class='add'>+	mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+put:</div><div class='add'>+	put_res(dev, slave, res_id, RES_EQ);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mfunc.master.gen_eqe_mutex[slave]);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_QUERY_EQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			  struct mlx4_vhcr *vhcr,</div><div class='add'>+			  struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			  struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			  struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int eqn = vhcr-&gt;in_modifier;</div><div class='add'>+	int res_id = eqn | (slave &lt;&lt; 8);</div><div class='add'>+	struct res_eq *eq;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = get_res(dev, slave, res_id, RES_EQ, &amp;eq);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (eq-&gt;com.from_state != RES_EQ_HW) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto ex_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+</div><div class='add'>+ex_put:</div><div class='add'>+	put_res(dev, slave, res_id, RES_EQ);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_SW2HW_CQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			  struct mlx4_vhcr *vhcr,</div><div class='add'>+			  struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			  struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			  struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int cqn = vhcr-&gt;in_modifier;</div><div class='add'>+	struct mlx4_cq_context *cqc = inbox-&gt;buf;</div><div class='add'>+	int mtt_base = cq_get_mtt_addr(cqc) / dev-&gt;caps.mtt_entry_sz;</div><div class='add'>+	struct res_cq *cq;</div><div class='add'>+	struct res_mtt *mtt;</div><div class='add'>+</div><div class='add'>+	err = cq_res_start_move_to(dev, slave, cqn, RES_CQ_HW, &amp;cq);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	err = get_res(dev, slave, mtt_base, RES_MTT, &amp;mtt);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_move;</div><div class='add'>+	err = check_mtt_range(dev, slave, mtt_base, cq_get_mtt_size(cqc), mtt);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_put;</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_put;</div><div class='add'>+	atomic_inc(&amp;mtt-&gt;ref_count);</div><div class='add'>+	cq-&gt;mtt = mtt;</div><div class='add'>+	put_res(dev, slave, mtt-&gt;com.res_id, RES_MTT);</div><div class='add'>+	res_end_move(dev, slave, RES_CQ, cqn);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_put:</div><div class='add'>+	put_res(dev, slave, mtt-&gt;com.res_id, RES_MTT);</div><div class='add'>+out_move:</div><div class='add'>+	res_abort_move(dev, slave, RES_CQ, cqn);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_HW2SW_CQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			  struct mlx4_vhcr *vhcr,</div><div class='add'>+			  struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			  struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			  struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int cqn = vhcr-&gt;in_modifier;</div><div class='add'>+	struct res_cq *cq;</div><div class='add'>+</div><div class='add'>+	err = cq_res_start_move_to(dev, slave, cqn, RES_CQ_ALLOCATED, &amp;cq);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_move;</div><div class='add'>+	atomic_dec(&amp;cq-&gt;mtt-&gt;ref_count);</div><div class='add'>+	res_end_move(dev, slave, RES_CQ, cqn);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_move:</div><div class='add'>+	res_abort_move(dev, slave, RES_CQ, cqn);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_QUERY_CQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			  struct mlx4_vhcr *vhcr,</div><div class='add'>+			  struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			  struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			  struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int cqn = vhcr-&gt;in_modifier;</div><div class='add'>+	struct res_cq *cq;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = get_res(dev, slave, cqn, RES_CQ, &amp;cq);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (cq-&gt;com.from_state != RES_CQ_HW)</div><div class='add'>+		goto ex_put;</div><div class='add'>+</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+ex_put:</div><div class='add'>+	put_res(dev, slave, cqn, RES_CQ);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int handle_resize(struct mlx4_dev *dev, int slave,</div><div class='add'>+			 struct mlx4_vhcr *vhcr,</div><div class='add'>+			 struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			 struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			 struct mlx4_cmd_info *cmd,</div><div class='add'>+			 struct res_cq *cq)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct res_mtt *orig_mtt;</div><div class='add'>+	struct res_mtt *mtt;</div><div class='add'>+	struct mlx4_cq_context *cqc = inbox-&gt;buf;</div><div class='add'>+	int mtt_base = cq_get_mtt_addr(cqc) / dev-&gt;caps.mtt_entry_sz;</div><div class='add'>+</div><div class='add'>+	err = get_res(dev, slave, cq-&gt;mtt-&gt;com.res_id, RES_MTT, &amp;orig_mtt);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (orig_mtt != cq-&gt;mtt) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto ex_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = get_res(dev, slave, mtt_base, RES_MTT, &amp;mtt);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ex_put;</div><div class='add'>+</div><div class='add'>+	err = check_mtt_range(dev, slave, mtt_base, cq_get_mtt_size(cqc), mtt);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ex_put1;</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ex_put1;</div><div class='add'>+	atomic_dec(&amp;orig_mtt-&gt;ref_count);</div><div class='add'>+	put_res(dev, slave, orig_mtt-&gt;com.res_id, RES_MTT);</div><div class='add'>+	atomic_inc(&amp;mtt-&gt;ref_count);</div><div class='add'>+	cq-&gt;mtt = mtt;</div><div class='add'>+	put_res(dev, slave, mtt-&gt;com.res_id, RES_MTT);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ex_put1:</div><div class='add'>+	put_res(dev, slave, mtt-&gt;com.res_id, RES_MTT);</div><div class='add'>+ex_put:</div><div class='add'>+	put_res(dev, slave, orig_mtt-&gt;com.res_id, RES_MTT);</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'>+int mlx4_MODIFY_CQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int cqn = vhcr-&gt;in_modifier;</div><div class='add'>+	struct res_cq *cq;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = get_res(dev, slave, cqn, RES_CQ, &amp;cq);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (cq-&gt;com.from_state != RES_CQ_HW)</div><div class='add'>+		goto ex_put;</div><div class='add'>+</div><div class='add'>+	if (vhcr-&gt;op_modifier == 0) {</div><div class='add'>+		err = handle_resize(dev, slave, vhcr, inbox, outbox, cmd, cq);</div><div class='add'>+		if (err)</div><div class='add'>+			goto ex_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+ex_put:</div><div class='add'>+	put_res(dev, slave, cqn, RES_CQ);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int srq_get_pdn(struct mlx4_srq_context *srqc)</div><div class='add'>+{</div><div class='add'>+	return be32_to_cpu(srqc-&gt;pd) &amp; 0xffffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int srq_get_mtt_size(struct mlx4_srq_context *srqc)</div><div class='add'>+{</div><div class='add'>+	int log_srq_size = (be32_to_cpu(srqc-&gt;state_logsize_srqn) &gt;&gt; 24) &amp; 0xf;</div><div class='add'>+	int log_rq_stride = srqc-&gt;logstride &amp; 7;</div><div class='add'>+	int page_shift = (srqc-&gt;log_page_size &amp; 0x3f) + 12;</div><div class='add'>+</div><div class='add'>+	if (log_srq_size + log_rq_stride + 4 &lt; page_shift)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 1 &lt;&lt; (log_srq_size + log_rq_stride + 4 - page_shift);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_SW2HW_SRQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int srqn = vhcr-&gt;in_modifier;</div><div class='add'>+	struct res_mtt *mtt;</div><div class='add'>+	struct res_srq *srq;</div><div class='add'>+	struct mlx4_srq_context *srqc = inbox-&gt;buf;</div><div class='add'>+	int mtt_base = srq_get_mtt_addr(srqc) / dev-&gt;caps.mtt_entry_sz;</div><div class='add'>+</div><div class='add'>+	if (srqn != (be32_to_cpu(srqc-&gt;state_logsize_srqn) &amp; 0xffffff))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = srq_res_start_move_to(dev, slave, srqn, RES_SRQ_HW, &amp;srq);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	err = get_res(dev, slave, mtt_base, RES_MTT, &amp;mtt);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ex_abort;</div><div class='add'>+	err = check_mtt_range(dev, slave, mtt_base, srq_get_mtt_size(srqc),</div><div class='add'>+			      mtt);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ex_put_mtt;</div><div class='add'>+</div><div class='add'>+	if (pdn2slave(srq_get_pdn(srqc)) != slave) {</div><div class='add'>+		err = -EPERM;</div><div class='add'>+		goto ex_put_mtt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ex_put_mtt;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;mtt-&gt;ref_count);</div><div class='add'>+	srq-&gt;mtt = mtt;</div><div class='add'>+	put_res(dev, slave, mtt-&gt;com.res_id, RES_MTT);</div><div class='add'>+	res_end_move(dev, slave, RES_SRQ, srqn);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ex_put_mtt:</div><div class='add'>+	put_res(dev, slave, mtt-&gt;com.res_id, RES_MTT);</div><div class='add'>+ex_abort:</div><div class='add'>+	res_abort_move(dev, slave, RES_SRQ, srqn);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_HW2SW_SRQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int srqn = vhcr-&gt;in_modifier;</div><div class='add'>+	struct res_srq *srq;</div><div class='add'>+</div><div class='add'>+	err = srq_res_start_move_to(dev, slave, srqn, RES_SRQ_ALLOCATED, &amp;srq);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ex_abort;</div><div class='add'>+	atomic_dec(&amp;srq-&gt;mtt-&gt;ref_count);</div><div class='add'>+	if (srq-&gt;cq)</div><div class='add'>+		atomic_dec(&amp;srq-&gt;cq-&gt;ref_count);</div><div class='add'>+	res_end_move(dev, slave, RES_SRQ, srqn);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ex_abort:</div><div class='add'>+	res_abort_move(dev, slave, RES_SRQ, srqn);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_QUERY_SRQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			   struct mlx4_vhcr *vhcr,</div><div class='add'>+			   struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			   struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			   struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int srqn = vhcr-&gt;in_modifier;</div><div class='add'>+	struct res_srq *srq;</div><div class='add'>+</div><div class='add'>+	err = get_res(dev, slave, srqn, RES_SRQ, &amp;srq);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	if (srq-&gt;com.from_state != RES_SRQ_HW) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+out:</div><div class='add'>+	put_res(dev, slave, srqn, RES_SRQ);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_ARM_SRQ_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			 struct mlx4_vhcr *vhcr,</div><div class='add'>+			 struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			 struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			 struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int srqn = vhcr-&gt;in_modifier;</div><div class='add'>+	struct res_srq *srq;</div><div class='add'>+</div><div class='add'>+	err = get_res(dev, slave, srqn, RES_SRQ, &amp;srq);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (srq-&gt;com.from_state != RES_SRQ_HW) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+out:</div><div class='add'>+	put_res(dev, slave, srqn, RES_SRQ);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_GEN_QP_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			struct mlx4_vhcr *vhcr,</div><div class='add'>+			struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int qpn = vhcr-&gt;in_modifier &amp; 0x7fffff;</div><div class='add'>+	struct res_qp *qp;</div><div class='add'>+</div><div class='add'>+	err = get_res(dev, slave, qpn, RES_QP, &amp;qp);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	if (qp-&gt;com.from_state != RES_QP_HW) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+out:</div><div class='add'>+	put_res(dev, slave, qpn, RES_QP);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_INIT2RTR_QP_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			     struct mlx4_vhcr *vhcr,</div><div class='add'>+			     struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			     struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			     struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_qp_context *qpc = inbox-&gt;buf + 8;</div><div class='add'>+</div><div class='add'>+	update_ud_gid(dev, qpc, (u8)slave);</div><div class='add'>+</div><div class='add'>+	return mlx4_GEN_QP_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_2RST_QP_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			 struct mlx4_vhcr *vhcr,</div><div class='add'>+			 struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			 struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			 struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int qpn = vhcr-&gt;in_modifier &amp; 0x7fffff;</div><div class='add'>+	struct res_qp *qp;</div><div class='add'>+</div><div class='add'>+	err = qp_res_start_move_to(dev, slave, qpn, RES_QP_MAPPED, &amp;qp, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		goto ex_abort;</div><div class='add'>+</div><div class='add'>+	atomic_dec(&amp;qp-&gt;mtt-&gt;ref_count);</div><div class='add'>+	atomic_dec(&amp;qp-&gt;rcq-&gt;ref_count);</div><div class='add'>+	atomic_dec(&amp;qp-&gt;scq-&gt;ref_count);</div><div class='add'>+	if (qp-&gt;srq)</div><div class='add'>+		atomic_dec(&amp;qp-&gt;srq-&gt;ref_count);</div><div class='add'>+	res_end_move(dev, slave, RES_QP, qpn);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ex_abort:</div><div class='add'>+	res_abort_move(dev, slave, RES_QP, qpn);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct res_gid *find_gid(struct mlx4_dev *dev, int slave,</div><div class='add'>+				struct res_qp *rqp, u8 *gid)</div><div class='add'>+{</div><div class='add'>+	struct res_gid *res;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(res, &amp;rqp-&gt;mcg_list, list) {</div><div class='add'>+		if (!memcmp(res-&gt;gid, gid, 16))</div><div class='add'>+			return res;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,</div><div class='add'>+		       u8 *gid, enum mlx4_protocol prot)</div><div class='add'>+{</div><div class='add'>+	struct res_gid *res;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	res = kzalloc(sizeof *res, GFP_KERNEL);</div><div class='add'>+	if (!res)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;rqp-&gt;mcg_spl);</div><div class='add'>+	if (find_gid(dev, slave, rqp, gid)) {</div><div class='add'>+		kfree(res);</div><div class='add'>+		err = -EEXIST;</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(res-&gt;gid, gid, 16);</div><div class='add'>+		res-&gt;prot = prot;</div><div class='add'>+		list_add_tail(&amp;res-&gt;list, &amp;rqp-&gt;mcg_list);</div><div class='add'>+		err = 0;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;rqp-&gt;mcg_spl);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rem_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,</div><div class='add'>+		       u8 *gid, enum mlx4_protocol prot)</div><div class='add'>+{</div><div class='add'>+	struct res_gid *res;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;rqp-&gt;mcg_spl);</div><div class='add'>+	res = find_gid(dev, slave, rqp, gid);</div><div class='add'>+	if (!res || res-&gt;prot != prot)</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	else {</div><div class='add'>+		list_del(&amp;res-&gt;list);</div><div class='add'>+		kfree(res);</div><div class='add'>+		err = 0;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;rqp-&gt;mcg_spl);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			       struct mlx4_vhcr *vhcr,</div><div class='add'>+			       struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			       struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			       struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_qp qp; /* dummy for calling attach/detach */</div><div class='add'>+	u8 *gid = inbox-&gt;buf;</div><div class='add'>+	enum mlx4_protocol prot = (vhcr-&gt;in_modifier &gt;&gt; 28) &amp; 0x7;</div><div class='add'>+	int err, err1;</div><div class='add'>+	int qpn;</div><div class='add'>+	struct res_qp *rqp;</div><div class='add'>+	int attach = vhcr-&gt;op_modifier;</div><div class='add'>+	int block_loopback = vhcr-&gt;in_modifier &gt;&gt; 31;</div><div class='add'>+	u8 steer_type_mask = 2;</div><div class='add'>+	enum mlx4_steer_type type = gid[7] &amp; steer_type_mask;</div><div class='add'>+</div><div class='add'>+	qpn = vhcr-&gt;in_modifier &amp; 0xffffff;</div><div class='add'>+	err = get_res(dev, slave, qpn, RES_QP, &amp;rqp);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	qp.qpn = qpn;</div><div class='add'>+	if (attach) {</div><div class='add'>+		err = add_mcg_res(dev, slave, rqp, gid, prot);</div><div class='add'>+		if (err)</div><div class='add'>+			goto ex_put;</div><div class='add'>+</div><div class='add'>+		err = mlx4_qp_attach_common(dev, &amp;qp, gid,</div><div class='add'>+					    block_loopback, prot, type);</div><div class='add'>+		if (err)</div><div class='add'>+			goto ex_rem;</div><div class='add'>+	} else {</div><div class='add'>+		err = rem_mcg_res(dev, slave, rqp, gid, prot);</div><div class='add'>+		if (err)</div><div class='add'>+			goto ex_put;</div><div class='add'>+		err = mlx4_qp_detach_common(dev, &amp;qp, gid, prot, type);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	put_res(dev, slave, qpn, RES_QP);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ex_rem:</div><div class='add'>+	/* ignore error return below, already in error */</div><div class='add'>+	err1 = rem_mcg_res(dev, slave, rqp, gid, prot);</div><div class='add'>+ex_put:</div><div class='add'>+	put_res(dev, slave, qpn, RES_QP);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	BUSY_MAX_RETRIES = 10</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int mlx4_QUERY_IF_STAT_wrapper(struct mlx4_dev *dev, int slave,</div><div class='add'>+			       struct mlx4_vhcr *vhcr,</div><div class='add'>+			       struct mlx4_cmd_mailbox *inbox,</div><div class='add'>+			       struct mlx4_cmd_mailbox *outbox,</div><div class='add'>+			       struct mlx4_cmd_info *cmd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int index = vhcr-&gt;in_modifier &amp; 0xffff;</div><div class='add'>+</div><div class='add'>+	err = get_res(dev, slave, index, RES_COUNTER, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);</div><div class='add'>+	put_res(dev, slave, index, RES_COUNTER);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void detach_qp(struct mlx4_dev *dev, int slave, struct res_qp *rqp)</div><div class='add'>+{</div><div class='add'>+	struct res_gid *rgid;</div><div class='add'>+	struct res_gid *tmp;</div><div class='add'>+	int err;</div><div class='add'>+	struct mlx4_qp qp; /* dummy for calling attach/detach */</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(rgid, tmp, &amp;rqp-&gt;mcg_list, list) {</div><div class='add'>+		qp.qpn = rqp-&gt;local_qpn;</div><div class='add'>+		err = mlx4_qp_detach_common(dev, &amp;qp, rgid-&gt;gid, rgid-&gt;prot,</div><div class='add'>+					    MLX4_MC_STEER);</div><div class='add'>+		list_del(&amp;rgid-&gt;list);</div><div class='add'>+		kfree(rgid);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int _move_all_busy(struct mlx4_dev *dev, int slave,</div><div class='add'>+			  enum mlx4_resource type, int print)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker =</div><div class='add'>+		&amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct list_head *rlist = &amp;tracker-&gt;slave_list[slave].res_list[type];</div><div class='add'>+	struct res_common *r;</div><div class='add'>+	struct res_common *tmp;</div><div class='add'>+	int busy;</div><div class='add'>+</div><div class='add'>+	busy = 0;</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	list_for_each_entry_safe(r, tmp, rlist, list) {</div><div class='add'>+		if (r-&gt;owner == slave) {</div><div class='add'>+			if (!r-&gt;removing) {</div><div class='add'>+				if (r-&gt;state == RES_ANY_BUSY) {</div><div class='add'>+					if (print)</div><div class='add'>+						mlx4_dbg(dev,</div><div class='add'>+							 "%s id 0x%x is busy\n",</div><div class='add'>+							  ResourceType(type),</div><div class='add'>+							  r-&gt;res_id);</div><div class='add'>+					++busy;</div><div class='add'>+				} else {</div><div class='add'>+					r-&gt;from_state = r-&gt;state;</div><div class='add'>+					r-&gt;state = RES_ANY_BUSY;</div><div class='add'>+					r-&gt;removing = 1;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+</div><div class='add'>+	return busy;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int move_all_busy(struct mlx4_dev *dev, int slave,</div><div class='add'>+			 enum mlx4_resource type)</div><div class='add'>+{</div><div class='add'>+	unsigned long begin;</div><div class='add'>+	int busy;</div><div class='add'>+</div><div class='add'>+	begin = jiffies;</div><div class='add'>+	do {</div><div class='add'>+		busy = _move_all_busy(dev, slave, type, 0);</div><div class='add'>+		if (time_after(jiffies, begin + 5 * HZ))</div><div class='add'>+			break;</div><div class='add'>+		if (busy)</div><div class='add'>+			cond_resched();</div><div class='add'>+	} while (busy);</div><div class='add'>+</div><div class='add'>+	if (busy)</div><div class='add'>+		busy = _move_all_busy(dev, slave, type, 1);</div><div class='add'>+</div><div class='add'>+	return busy;</div><div class='add'>+}</div><div class='add'>+static void rem_slave_qps(struct mlx4_dev *dev, int slave)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker = &amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct list_head *qp_list =</div><div class='add'>+		&amp;tracker-&gt;slave_list[slave].res_list[RES_QP];</div><div class='add'>+	struct res_qp *qp;</div><div class='add'>+	struct res_qp *tmp;</div><div class='add'>+	int state;</div><div class='add'>+	u64 in_param;</div><div class='add'>+	int qpn;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = move_all_busy(dev, slave, RES_QP);</div><div class='add'>+	if (err)</div><div class='add'>+		mlx4_warn(dev, "rem_slave_qps: Could not move all qps to busy"</div><div class='add'>+			  "for slave %d\n", slave);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	list_for_each_entry_safe(qp, tmp, qp_list, com.list) {</div><div class='add'>+		spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+		if (qp-&gt;com.owner == slave) {</div><div class='add'>+			qpn = qp-&gt;com.res_id;</div><div class='add'>+			detach_qp(dev, slave, qp);</div><div class='add'>+			state = qp-&gt;com.from_state;</div><div class='add'>+			while (state != 0) {</div><div class='add'>+				switch (state) {</div><div class='add'>+				case RES_QP_RESERVED:</div><div class='add'>+					spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+					radix_tree_delete(&amp;tracker-&gt;res_tree[RES_QP],</div><div class='add'>+							  qp-&gt;com.res_id);</div><div class='add'>+					list_del(&amp;qp-&gt;com.list);</div><div class='add'>+					spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+					kfree(qp);</div><div class='add'>+					state = 0;</div><div class='add'>+					break;</div><div class='add'>+				case RES_QP_MAPPED:</div><div class='add'>+					if (!valid_reserved(dev, slave, qpn))</div><div class='add'>+						__mlx4_qp_free_icm(dev, qpn);</div><div class='add'>+					state = RES_QP_RESERVED;</div><div class='add'>+					break;</div><div class='add'>+				case RES_QP_HW:</div><div class='add'>+					in_param = slave;</div><div class='add'>+					err = mlx4_cmd(dev, in_param,</div><div class='add'>+						       qp-&gt;local_qpn, 2,</div><div class='add'>+						       MLX4_CMD_2RST_QP,</div><div class='add'>+						       MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+						       MLX4_CMD_NATIVE);</div><div class='add'>+					if (err)</div><div class='add'>+						mlx4_dbg(dev, "rem_slave_qps: failed"</div><div class='add'>+							 " to move slave %d qpn %d to"</div><div class='add'>+							 " reset\n", slave,</div><div class='add'>+							 qp-&gt;local_qpn);</div><div class='add'>+					atomic_dec(&amp;qp-&gt;rcq-&gt;ref_count);</div><div class='add'>+					atomic_dec(&amp;qp-&gt;scq-&gt;ref_count);</div><div class='add'>+					atomic_dec(&amp;qp-&gt;mtt-&gt;ref_count);</div><div class='add'>+					if (qp-&gt;srq)</div><div class='add'>+						atomic_dec(&amp;qp-&gt;srq-&gt;ref_count);</div><div class='add'>+					state = RES_QP_MAPPED;</div><div class='add'>+					break;</div><div class='add'>+				default:</div><div class='add'>+					state = 0;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rem_slave_srqs(struct mlx4_dev *dev, int slave)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker = &amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct list_head *srq_list =</div><div class='add'>+		&amp;tracker-&gt;slave_list[slave].res_list[RES_SRQ];</div><div class='add'>+	struct res_srq *srq;</div><div class='add'>+	struct res_srq *tmp;</div><div class='add'>+	int state;</div><div class='add'>+	u64 in_param;</div><div class='add'>+	LIST_HEAD(tlist);</div><div class='add'>+	int srqn;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = move_all_busy(dev, slave, RES_SRQ);</div><div class='add'>+	if (err)</div><div class='add'>+		mlx4_warn(dev, "rem_slave_srqs: Could not move all srqs to "</div><div class='add'>+			  "busy for slave %d\n", slave);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	list_for_each_entry_safe(srq, tmp, srq_list, com.list) {</div><div class='add'>+		spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+		if (srq-&gt;com.owner == slave) {</div><div class='add'>+			srqn = srq-&gt;com.res_id;</div><div class='add'>+			state = srq-&gt;com.from_state;</div><div class='add'>+			while (state != 0) {</div><div class='add'>+				switch (state) {</div><div class='add'>+				case RES_SRQ_ALLOCATED:</div><div class='add'>+					__mlx4_srq_free_icm(dev, srqn);</div><div class='add'>+					spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+					radix_tree_delete(&amp;tracker-&gt;res_tree[RES_SRQ],</div><div class='add'>+							  srqn);</div><div class='add'>+					list_del(&amp;srq-&gt;com.list);</div><div class='add'>+					spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+					kfree(srq);</div><div class='add'>+					state = 0;</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				case RES_SRQ_HW:</div><div class='add'>+					in_param = slave;</div><div class='add'>+					err = mlx4_cmd(dev, in_param, srqn, 1,</div><div class='add'>+						       MLX4_CMD_HW2SW_SRQ,</div><div class='add'>+						       MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+						       MLX4_CMD_NATIVE);</div><div class='add'>+					if (err)</div><div class='add'>+						mlx4_dbg(dev, "rem_slave_srqs: failed"</div><div class='add'>+							 " to move slave %d srq %d to"</div><div class='add'>+							 " SW ownership\n",</div><div class='add'>+							 slave, srqn);</div><div class='add'>+</div><div class='add'>+					atomic_dec(&amp;srq-&gt;mtt-&gt;ref_count);</div><div class='add'>+					if (srq-&gt;cq)</div><div class='add'>+						atomic_dec(&amp;srq-&gt;cq-&gt;ref_count);</div><div class='add'>+					state = RES_SRQ_ALLOCATED;</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				default:</div><div class='add'>+					state = 0;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rem_slave_cqs(struct mlx4_dev *dev, int slave)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker = &amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct list_head *cq_list =</div><div class='add'>+		&amp;tracker-&gt;slave_list[slave].res_list[RES_CQ];</div><div class='add'>+	struct res_cq *cq;</div><div class='add'>+	struct res_cq *tmp;</div><div class='add'>+	int state;</div><div class='add'>+	u64 in_param;</div><div class='add'>+	LIST_HEAD(tlist);</div><div class='add'>+	int cqn;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = move_all_busy(dev, slave, RES_CQ);</div><div class='add'>+	if (err)</div><div class='add'>+		mlx4_warn(dev, "rem_slave_cqs: Could not move all cqs to "</div><div class='add'>+			  "busy for slave %d\n", slave);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	list_for_each_entry_safe(cq, tmp, cq_list, com.list) {</div><div class='add'>+		spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+		if (cq-&gt;com.owner == slave &amp;&amp; !atomic_read(&amp;cq-&gt;ref_count)) {</div><div class='add'>+			cqn = cq-&gt;com.res_id;</div><div class='add'>+			state = cq-&gt;com.from_state;</div><div class='add'>+			while (state != 0) {</div><div class='add'>+				switch (state) {</div><div class='add'>+				case RES_CQ_ALLOCATED:</div><div class='add'>+					__mlx4_cq_free_icm(dev, cqn);</div><div class='add'>+					spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+					radix_tree_delete(&amp;tracker-&gt;res_tree[RES_CQ],</div><div class='add'>+							  cqn);</div><div class='add'>+					list_del(&amp;cq-&gt;com.list);</div><div class='add'>+					spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+					kfree(cq);</div><div class='add'>+					state = 0;</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				case RES_CQ_HW:</div><div class='add'>+					in_param = slave;</div><div class='add'>+					err = mlx4_cmd(dev, in_param, cqn, 1,</div><div class='add'>+						       MLX4_CMD_HW2SW_CQ,</div><div class='add'>+						       MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+						       MLX4_CMD_NATIVE);</div><div class='add'>+					if (err)</div><div class='add'>+						mlx4_dbg(dev, "rem_slave_cqs: failed"</div><div class='add'>+							 " to move slave %d cq %d to"</div><div class='add'>+							 " SW ownership\n",</div><div class='add'>+							 slave, cqn);</div><div class='add'>+					atomic_dec(&amp;cq-&gt;mtt-&gt;ref_count);</div><div class='add'>+					state = RES_CQ_ALLOCATED;</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				default:</div><div class='add'>+					state = 0;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rem_slave_mrs(struct mlx4_dev *dev, int slave)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker = &amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct list_head *mpt_list =</div><div class='add'>+		&amp;tracker-&gt;slave_list[slave].res_list[RES_MPT];</div><div class='add'>+	struct res_mpt *mpt;</div><div class='add'>+	struct res_mpt *tmp;</div><div class='add'>+	int state;</div><div class='add'>+	u64 in_param;</div><div class='add'>+	LIST_HEAD(tlist);</div><div class='add'>+	int mptn;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = move_all_busy(dev, slave, RES_MPT);</div><div class='add'>+	if (err)</div><div class='add'>+		mlx4_warn(dev, "rem_slave_mrs: Could not move all mpts to "</div><div class='add'>+			  "busy for slave %d\n", slave);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	list_for_each_entry_safe(mpt, tmp, mpt_list, com.list) {</div><div class='add'>+		spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+		if (mpt-&gt;com.owner == slave) {</div><div class='add'>+			mptn = mpt-&gt;com.res_id;</div><div class='add'>+			state = mpt-&gt;com.from_state;</div><div class='add'>+			while (state != 0) {</div><div class='add'>+				switch (state) {</div><div class='add'>+				case RES_MPT_RESERVED:</div><div class='add'>+					__mlx4_mr_release(dev, mpt-&gt;key);</div><div class='add'>+					spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+					radix_tree_delete(&amp;tracker-&gt;res_tree[RES_MPT],</div><div class='add'>+							  mptn);</div><div class='add'>+					list_del(&amp;mpt-&gt;com.list);</div><div class='add'>+					spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+					kfree(mpt);</div><div class='add'>+					state = 0;</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				case RES_MPT_MAPPED:</div><div class='add'>+					__mlx4_mr_free_icm(dev, mpt-&gt;key);</div><div class='add'>+					state = RES_MPT_RESERVED;</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				case RES_MPT_HW:</div><div class='add'>+					in_param = slave;</div><div class='add'>+					err = mlx4_cmd(dev, in_param, mptn, 0,</div><div class='add'>+						     MLX4_CMD_HW2SW_MPT,</div><div class='add'>+						     MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+						     MLX4_CMD_NATIVE);</div><div class='add'>+					if (err)</div><div class='add'>+						mlx4_dbg(dev, "rem_slave_mrs: failed"</div><div class='add'>+							 " to move slave %d mpt %d to"</div><div class='add'>+							 " SW ownership\n",</div><div class='add'>+							 slave, mptn);</div><div class='add'>+					if (mpt-&gt;mtt)</div><div class='add'>+						atomic_dec(&amp;mpt-&gt;mtt-&gt;ref_count);</div><div class='add'>+					state = RES_MPT_MAPPED;</div><div class='add'>+					break;</div><div class='add'>+				default:</div><div class='add'>+					state = 0;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rem_slave_mtts(struct mlx4_dev *dev, int slave)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker =</div><div class='add'>+		&amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct list_head *mtt_list =</div><div class='add'>+		&amp;tracker-&gt;slave_list[slave].res_list[RES_MTT];</div><div class='add'>+	struct res_mtt *mtt;</div><div class='add'>+	struct res_mtt *tmp;</div><div class='add'>+	int state;</div><div class='add'>+	LIST_HEAD(tlist);</div><div class='add'>+	int base;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = move_all_busy(dev, slave, RES_MTT);</div><div class='add'>+	if (err)</div><div class='add'>+		mlx4_warn(dev, "rem_slave_mtts: Could not move all mtts to "</div><div class='add'>+			  "busy for slave %d\n", slave);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	list_for_each_entry_safe(mtt, tmp, mtt_list, com.list) {</div><div class='add'>+		spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+		if (mtt-&gt;com.owner == slave) {</div><div class='add'>+			base = mtt-&gt;com.res_id;</div><div class='add'>+			state = mtt-&gt;com.from_state;</div><div class='add'>+			while (state != 0) {</div><div class='add'>+				switch (state) {</div><div class='add'>+				case RES_MTT_ALLOCATED:</div><div class='add'>+					__mlx4_free_mtt_range(dev, base,</div><div class='add'>+							      mtt-&gt;order);</div><div class='add'>+					spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+					radix_tree_delete(&amp;tracker-&gt;res_tree[RES_MTT],</div><div class='add'>+							  base);</div><div class='add'>+					list_del(&amp;mtt-&gt;com.list);</div><div class='add'>+					spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+					kfree(mtt);</div><div class='add'>+					state = 0;</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				default:</div><div class='add'>+					state = 0;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rem_slave_eqs(struct mlx4_dev *dev, int slave)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+	struct mlx4_resource_tracker *tracker = &amp;priv-&gt;mfunc.master.res_tracker;</div><div class='add'>+	struct list_head *eq_list =</div><div class='add'>+		&amp;tracker-&gt;slave_list[slave].res_list[RES_EQ];</div><div class='add'>+	struct res_eq *eq;</div><div class='add'>+	struct res_eq *tmp;</div><div class='add'>+	int err;</div><div class='add'>+	int state;</div><div class='add'>+	LIST_HEAD(tlist);</div><div class='add'>+	int eqn;</div><div class='add'>+	struct mlx4_cmd_mailbox *mailbox;</div><div class='add'>+</div><div class='add'>+	err = move_all_busy(dev, slave, RES_EQ);</div><div class='add'>+	if (err)</div><div class='add'>+		mlx4_warn(dev, "rem_slave_eqs: Could not move all eqs to "</div><div class='add'>+			  "busy for slave %d\n", slave);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	list_for_each_entry_safe(eq, tmp, eq_list, com.list) {</div><div class='add'>+		spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+		if (eq-&gt;com.owner == slave) {</div><div class='add'>+			eqn = eq-&gt;com.res_id;</div><div class='add'>+			state = eq-&gt;com.from_state;</div><div class='add'>+			while (state != 0) {</div><div class='add'>+				switch (state) {</div><div class='add'>+				case RES_EQ_RESERVED:</div><div class='add'>+					spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+					radix_tree_delete(&amp;tracker-&gt;res_tree[RES_EQ],</div><div class='add'>+							  eqn);</div><div class='add'>+					list_del(&amp;eq-&gt;com.list);</div><div class='add'>+					spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+					kfree(eq);</div><div class='add'>+					state = 0;</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				case RES_EQ_HW:</div><div class='add'>+					mailbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='add'>+					if (IS_ERR(mailbox)) {</div><div class='add'>+						cond_resched();</div><div class='add'>+						continue;</div><div class='add'>+					}</div><div class='add'>+					err = mlx4_cmd_box(dev, slave, 0,</div><div class='add'>+							   eqn &amp; 0xff, 0,</div><div class='add'>+							   MLX4_CMD_HW2SW_EQ,</div><div class='add'>+							   MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+							   MLX4_CMD_NATIVE);</div><div class='add'>+					mlx4_dbg(dev, "rem_slave_eqs: failed"</div><div class='add'>+						 " to move slave %d eqs %d to"</div><div class='add'>+						 " SW ownership\n", slave, eqn);</div><div class='add'>+					mlx4_free_cmd_mailbox(dev, mailbox);</div><div class='add'>+					if (!err) {</div><div class='add'>+						atomic_dec(&amp;eq-&gt;mtt-&gt;ref_count);</div><div class='add'>+						state = RES_EQ_RESERVED;</div><div class='add'>+					}</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				default:</div><div class='add'>+					state = 0;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		spin_lock_irq(mlx4_tlock(dev));</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(mlx4_tlock(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mlx4_delete_all_resources_for_slave(struct mlx4_dev *dev, int slave)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_priv *priv = mlx4_priv(dev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mfunc.master.res_tracker.slave_list[slave].mutex);</div><div class='add'>+	/*VLAN*/</div><div class='add'>+	rem_slave_macs(dev, slave);</div><div class='add'>+	rem_slave_qps(dev, slave);</div><div class='add'>+	rem_slave_srqs(dev, slave);</div><div class='add'>+	rem_slave_cqs(dev, slave);</div><div class='add'>+	rem_slave_mrs(dev, slave);</div><div class='add'>+	rem_slave_eqs(dev, slave);</div><div class='add'>+	rem_slave_mtts(dev, slave);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mfunc.master.res_tracker.slave_list[slave].mutex);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/sense.c b/drivers/net/ethernet/mellanox/mlx4/sense.c<br/>index e2337a7411d9..802498293528 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/sense.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/sense.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/sense.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/sense.c</a></div><div class='hunk'>@@ -45,7 +45,8 @@ int mlx4_SENSE_PORT(struct mlx4_dev *dev, int port,</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_cmd_imm(dev, 0, &amp;out_param, port, 0,</div><div class='del'>-			   MLX4_CMD_SENSE_PORT, MLX4_CMD_TIME_CLASS_B);</div><div class='add'>+			   MLX4_CMD_SENSE_PORT, MLX4_CMD_TIME_CLASS_B,</div><div class='add'>+			   MLX4_CMD_WRAPPED);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		mlx4_err(dev, "Sense command failed for port: %d\n", port);</div><div class='ctx'> 		return err;</div><div class='head'>diff --git a/drivers/net/ethernet/mellanox/mlx4/srq.c b/drivers/net/ethernet/mellanox/mlx4/srq.c<br/>index 9cbf3fce0145..2823fffc6383 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/srq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/mellanox/mlx4/srq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/mellanox/mlx4/srq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/mellanox/mlx4/srq.c</a></div><div class='hunk'>@@ -31,6 +31,8 @@</div><div class='ctx'>  * SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/mlx4/cmd.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='hunk'>@@ -38,26 +40,6 @@</div><div class='ctx'> #include "mlx4.h"</div><div class='ctx'> #include "icm.h"</div><div class='ctx'> </div><div class='del'>-struct mlx4_srq_context {</div><div class='del'>-	__be32			state_logsize_srqn;</div><div class='del'>-	u8			logstride;</div><div class='del'>-	u8			reserved1;</div><div class='del'>-	__be16			xrcd;</div><div class='del'>-	__be32			pg_offset_cqn;</div><div class='del'>-	u32			reserved2;</div><div class='del'>-	u8			log_page_size;</div><div class='del'>-	u8			reserved3[2];</div><div class='del'>-	u8			mtt_base_addr_h;</div><div class='del'>-	__be32			mtt_base_addr_l;</div><div class='del'>-	__be32			pd;</div><div class='del'>-	__be16			limit_watermark;</div><div class='del'>-	__be16			wqe_cnt;</div><div class='del'>-	u16			reserved4;</div><div class='del'>-	__be16			wqe_counter;</div><div class='del'>-	u32			reserved5;</div><div class='del'>-	__be64			db_rec_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> void mlx4_srq_event(struct mlx4_dev *dev, u32 srqn, int event_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_srq_table *srq_table = &amp;mlx4_priv(dev)-&gt;srq_table;</div><div class='hunk'>@@ -85,8 +67,9 @@ void mlx4_srq_event(struct mlx4_dev *dev, u32 srqn, int event_type)</div><div class='ctx'> static int mlx4_SW2HW_SRQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,</div><div class='ctx'> 			  int srq_num)</div><div class='ctx'> {</div><div class='del'>-	return mlx4_cmd(dev, mailbox-&gt;dma, srq_num, 0, MLX4_CMD_SW2HW_SRQ,</div><div class='del'>-			MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+	return mlx4_cmd(dev, mailbox-&gt;dma | dev-&gt;caps.function, srq_num, 0,</div><div class='add'>+			MLX4_CMD_SW2HW_SRQ, MLX4_CMD_TIME_CLASS_A,</div><div class='add'>+			MLX4_CMD_WRAPPED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx4_HW2SW_SRQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,</div><div class='hunk'>@@ -94,48 +77,109 @@ static int mlx4_HW2SW_SRQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox</div><div class='ctx'> {</div><div class='ctx'> 	return mlx4_cmd_box(dev, 0, mailbox ? mailbox-&gt;dma : 0, srq_num,</div><div class='ctx'> 			    mailbox ? 0 : 1, MLX4_CMD_HW2SW_SRQ,</div><div class='del'>-			    MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+			    MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx4_ARM_SRQ(struct mlx4_dev *dev, int srq_num, int limit_watermark)</div><div class='ctx'> {</div><div class='ctx'> 	return mlx4_cmd(dev, limit_watermark, srq_num, 0, MLX4_CMD_ARM_SRQ,</div><div class='del'>-			MLX4_CMD_TIME_CLASS_B);</div><div class='add'>+			MLX4_CMD_TIME_CLASS_B, MLX4_CMD_WRAPPED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mlx4_QUERY_SRQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,</div><div class='ctx'> 			  int srq_num)</div><div class='ctx'> {</div><div class='ctx'> 	return mlx4_cmd_box(dev, 0, mailbox-&gt;dma, srq_num, 0, MLX4_CMD_QUERY_SRQ,</div><div class='del'>-			    MLX4_CMD_TIME_CLASS_A);</div><div class='add'>+			    MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mlx4_srq_alloc(struct mlx4_dev *dev, u32 pdn, u32 cqn, u16 xrcd,</div><div class='del'>-		   struct mlx4_mtt *mtt, u64 db_rec, struct mlx4_srq *srq)</div><div class='add'>+int __mlx4_srq_alloc_icm(struct mlx4_dev *dev, int *srqn)</div><div class='ctx'> {</div><div class='ctx'> 	struct mlx4_srq_table *srq_table = &amp;mlx4_priv(dev)-&gt;srq_table;</div><div class='del'>-	struct mlx4_cmd_mailbox *mailbox;</div><div class='del'>-	struct mlx4_srq_context *srq_context;</div><div class='del'>-	u64 mtt_addr;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	srq-&gt;srqn = mlx4_bitmap_alloc(&amp;srq_table-&gt;bitmap);</div><div class='del'>-	if (srq-&gt;srqn == -1)</div><div class='add'>+</div><div class='add'>+	*srqn = mlx4_bitmap_alloc(&amp;srq_table-&gt;bitmap);</div><div class='add'>+	if (*srqn == -1)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	err = mlx4_table_get(dev, &amp;srq_table-&gt;table, srq-&gt;srqn);</div><div class='add'>+	err = mlx4_table_get(dev, &amp;srq_table-&gt;table, *srqn);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='del'>-	err = mlx4_table_get(dev, &amp;srq_table-&gt;cmpt_table, srq-&gt;srqn);</div><div class='add'>+	err = mlx4_table_get(dev, &amp;srq_table-&gt;cmpt_table, *srqn);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_put;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_put:</div><div class='add'>+	mlx4_table_put(dev, &amp;srq_table-&gt;table, *srqn);</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	mlx4_bitmap_free(&amp;srq_table-&gt;bitmap, *srqn);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mlx4_srq_alloc_icm(struct mlx4_dev *dev, int *srqn)</div><div class='add'>+{</div><div class='add'>+	u64 out_param;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		err = mlx4_cmd_imm(dev, 0, &amp;out_param, RES_SRQ,</div><div class='add'>+				   RES_OP_RESERVE_AND_MAP,</div><div class='add'>+				   MLX4_CMD_ALLOC_RES,</div><div class='add'>+				   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);</div><div class='add'>+		if (!err)</div><div class='add'>+			*srqn = get_param_l(&amp;out_param);</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	return __mlx4_srq_alloc_icm(dev, srqn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __mlx4_srq_free_icm(struct mlx4_dev *dev, int srqn)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_srq_table *srq_table = &amp;mlx4_priv(dev)-&gt;srq_table;</div><div class='add'>+</div><div class='add'>+	mlx4_table_put(dev, &amp;srq_table-&gt;cmpt_table, srqn);</div><div class='add'>+	mlx4_table_put(dev, &amp;srq_table-&gt;table, srqn);</div><div class='add'>+	mlx4_bitmap_free(&amp;srq_table-&gt;bitmap, srqn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mlx4_srq_free_icm(struct mlx4_dev *dev, int srqn)</div><div class='add'>+{</div><div class='add'>+	u64 in_param;</div><div class='add'>+</div><div class='add'>+	if (mlx4_is_mfunc(dev)) {</div><div class='add'>+		set_param_l(&amp;in_param, srqn);</div><div class='add'>+		if (mlx4_cmd(dev, in_param, RES_SRQ, RES_OP_RESERVE_AND_MAP,</div><div class='add'>+			     MLX4_CMD_FREE_RES,</div><div class='add'>+			     MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED))</div><div class='add'>+			mlx4_warn(dev, "Failed freeing cq:%d\n", srqn);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	__mlx4_srq_free_icm(dev, srqn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mlx4_srq_alloc(struct mlx4_dev *dev, u32 pdn, u32 cqn, u16 xrcd,</div><div class='add'>+		   struct mlx4_mtt *mtt, u64 db_rec, struct mlx4_srq *srq)</div><div class='add'>+{</div><div class='add'>+	struct mlx4_srq_table *srq_table = &amp;mlx4_priv(dev)-&gt;srq_table;</div><div class='add'>+	struct mlx4_cmd_mailbox *mailbox;</div><div class='add'>+	struct mlx4_srq_context *srq_context;</div><div class='add'>+	u64 mtt_addr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mlx4_srq_alloc_icm(dev, &amp;srq-&gt;srqn);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;srq_table-&gt;lock);</div><div class='ctx'> 	err = radix_tree_insert(&amp;srq_table-&gt;tree, srq-&gt;srqn, srq);</div><div class='ctx'> 	spin_unlock_irq(&amp;srq_table-&gt;lock);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err_cmpt_put;</div><div class='add'>+		goto err_icm;</div><div class='ctx'> </div><div class='ctx'> 	mailbox = mlx4_alloc_cmd_mailbox(dev);</div><div class='ctx'> 	if (IS_ERR(mailbox)) {</div><div class='hunk'>@@ -174,15 +218,8 @@ err_radix:</div><div class='ctx'> 	radix_tree_delete(&amp;srq_table-&gt;tree, srq-&gt;srqn);</div><div class='ctx'> 	spin_unlock_irq(&amp;srq_table-&gt;lock);</div><div class='ctx'> </div><div class='del'>-err_cmpt_put:</div><div class='del'>-	mlx4_table_put(dev, &amp;srq_table-&gt;cmpt_table, srq-&gt;srqn);</div><div class='del'>-</div><div class='del'>-err_put:</div><div class='del'>-	mlx4_table_put(dev, &amp;srq_table-&gt;table, srq-&gt;srqn);</div><div class='del'>-</div><div class='del'>-err_out:</div><div class='del'>-	mlx4_bitmap_free(&amp;srq_table-&gt;bitmap, srq-&gt;srqn);</div><div class='del'>-</div><div class='add'>+err_icm:</div><div class='add'>+	mlx4_srq_free_icm(dev, srq-&gt;srqn);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_srq_alloc);</div><div class='hunk'>@@ -204,8 +241,7 @@ void mlx4_srq_free(struct mlx4_dev *dev, struct mlx4_srq *srq)</div><div class='ctx'> 		complete(&amp;srq-&gt;free);</div><div class='ctx'> 	wait_for_completion(&amp;srq-&gt;free);</div><div class='ctx'> </div><div class='del'>-	mlx4_table_put(dev, &amp;srq_table-&gt;table, srq-&gt;srqn);</div><div class='del'>-	mlx4_bitmap_free(&amp;srq_table-&gt;bitmap, srq-&gt;srqn);</div><div class='add'>+	mlx4_srq_free_icm(dev, srq-&gt;srqn);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mlx4_srq_free);</div><div class='ctx'> </div><div class='hunk'>@@ -245,6 +281,8 @@ int mlx4_init_srq_table(struct mlx4_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;srq_table-&gt;lock);</div><div class='ctx'> 	INIT_RADIX_TREE(&amp;srq_table-&gt;tree, GFP_ATOMIC);</div><div class='add'>+	if (mlx4_is_slave(dev))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	err = mlx4_bitmap_init(&amp;srq_table-&gt;bitmap, dev-&gt;caps.num_srqs,</div><div class='ctx'> 			       dev-&gt;caps.num_srqs - 1, dev-&gt;caps.reserved_srqs, 0);</div><div class='hunk'>@@ -256,5 +294,7 @@ int mlx4_init_srq_table(struct mlx4_dev *dev)</div><div class='ctx'> </div><div class='ctx'> void mlx4_cleanup_srq_table(struct mlx4_dev *dev)</div><div class='ctx'> {</div><div class='add'>+	if (mlx4_is_slave(dev))</div><div class='add'>+		return;</div><div class='ctx'> 	mlx4_bitmap_cleanup(&amp;mlx4_priv(dev)-&gt;srq_table.bitmap);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/micrel/Kconfig b/drivers/net/ethernet/micrel/Kconfig<br/>index d10c2e15f4ed..1ea811cf515b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/micrel/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/micrel/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/micrel/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/micrel/Kconfig</a></div><div class='hunk'>@@ -42,6 +42,8 @@ config KS8851</div><div class='ctx'> 	select NET_CORE</div><div class='ctx'> 	select MII</div><div class='ctx'> 	select CRC32</div><div class='add'>+	select MISC_DEVICES</div><div class='add'>+	select EEPROM_93CX6</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  SPI driver for Micrel KS8851 SPI attached network chip.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c<br/>index 4a6ae057e3b1..0a85690a1321 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/micrel/ks8842.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/micrel/ks8842.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/micrel/ks8842.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/micrel/ks8842.c</a></div><div class='hunk'>@@ -459,7 +459,7 @@ static int ks8842_tx_frame_dma(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 		sg_dma_len(&amp;ctl-&gt;sg) += 4 - sg_dma_len(&amp;ctl-&gt;sg) % 4;</div><div class='ctx'> </div><div class='ctx'> 	ctl-&gt;adesc = ctl-&gt;chan-&gt;device-&gt;device_prep_slave_sg(ctl-&gt;chan,</div><div class='del'>-		&amp;ctl-&gt;sg, 1, DMA_TO_DEVICE,</div><div class='add'>+		&amp;ctl-&gt;sg, 1, DMA_MEM_TO_DEV,</div><div class='ctx'> 		DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);</div><div class='ctx'> 	if (!ctl-&gt;adesc)</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='hunk'>@@ -571,7 +571,7 @@ static int __ks8842_start_new_rx_dma(struct net_device *netdev)</div><div class='ctx'> 		sg_dma_len(sg) = DMA_BUFFER_SIZE;</div><div class='ctx'> </div><div class='ctx'> 		ctl-&gt;adesc = ctl-&gt;chan-&gt;device-&gt;device_prep_slave_sg(ctl-&gt;chan,</div><div class='del'>-			sg, 1, DMA_FROM_DEVICE,</div><div class='add'>+			sg, 1, DMA_DEV_TO_MEM,</div><div class='ctx'> 			DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);</div><div class='ctx'> </div><div class='ctx'> 		if (!ctl-&gt;adesc)</div><div class='hunk'>@@ -1264,18 +1264,7 @@ static struct platform_driver ks8842_platform_driver = {</div><div class='ctx'> 	.remove		= ks8842_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ks8842_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ks8842_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ks8842_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ks8842_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ks8842_init);</div><div class='del'>-module_exit(ks8842_exit);</div><div class='add'>+module_platform_driver(ks8842_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Timberdale KS8842 ethernet driver");</div><div class='ctx'> MODULE_AUTHOR("Mocean Laboratories &lt;info@mocean-labs.com&gt;");</div><div class='head'>diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c<br/>index f56743a28fc0..6b35e7da9a9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/micrel/ks8851.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/micrel/ks8851.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/micrel/ks8851.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/micrel/ks8851.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='add'>+#include &lt;linux/eeprom_93cx6.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -82,6 +83,7 @@ union ks8851_tx_hdr {</div><div class='ctx'>  * @rc_ccr: Cached copy of KS_CCR.</div><div class='ctx'>  * @rc_rxqcr: Cached copy of KS_RXQCR.</div><div class='ctx'>  * @eeprom_size: Companion eeprom size in Bytes, 0 if no eeprom</div><div class='add'>+ * @eeprom: 93CX6 EEPROM state for accessing on-board EEPROM.</div><div class='ctx'>  *</div><div class='ctx'>  * The @lock ensures that the chip is protected when certain operations are</div><div class='ctx'>  * in progress. When the read or write packet transfer is in progress, most</div><div class='hunk'>@@ -128,6 +130,8 @@ struct ks8851_net {</div><div class='ctx'> 	struct spi_message	spi_msg2;</div><div class='ctx'> 	struct spi_transfer	spi_xfer1;</div><div class='ctx'> 	struct spi_transfer	spi_xfer2[2];</div><div class='add'>+</div><div class='add'>+	struct eeprom_93cx6	eeprom;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int msg_enable;</div><div class='hunk'>@@ -343,6 +347,26 @@ static void ks8851_soft_reset(struct ks8851_net *ks, unsigned op)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ks8851_set_powermode - set power mode of the device</div><div class='add'>+ * @ks: The device state</div><div class='add'>+ * @pwrmode: The power mode value to write to KS_PMECR.</div><div class='add'>+ *</div><div class='add'>+ * Change the power mode of the chip.</div><div class='add'>+ */</div><div class='add'>+static void ks8851_set_powermode(struct ks8851_net *ks, unsigned pwrmode)</div><div class='add'>+{</div><div class='add'>+	unsigned pmecr;</div><div class='add'>+</div><div class='add'>+	netif_dbg(ks, hw, ks-&gt;netdev, "setting power mode %d\n", pwrmode);</div><div class='add'>+</div><div class='add'>+	pmecr = ks8851_rdreg16(ks, KS_PMECR);</div><div class='add'>+	pmecr &amp;= ~PMECR_PM_MASK;</div><div class='add'>+	pmecr |= pwrmode;</div><div class='add'>+</div><div class='add'>+	ks8851_wrreg16(ks, KS_PMECR, pmecr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ks8851_write_mac_addr - write mac address to device registers</div><div class='ctx'>  * @dev: The network device</div><div class='ctx'>  *</div><div class='hunk'>@@ -358,8 +382,15 @@ static int ks8851_write_mac_addr(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ks-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Wake up chip in case it was powered off when stopped; otherwise,</div><div class='add'>+	 * the first write to the MAC address does not take effect.</div><div class='add'>+	 */</div><div class='add'>+	ks8851_set_powermode(ks, PMECR_PM_NORMAL);</div><div class='ctx'> 	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 		ks8851_wrreg8(ks, KS_MAR(i), dev-&gt;dev_addr[i]);</div><div class='add'>+	if (!netif_running(dev))</div><div class='add'>+		ks8851_set_powermode(ks, PMECR_PM_SOFTDOWN);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;ks-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -367,21 +398,47 @@ static int ks8851_write_mac_addr(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ks8851_read_mac_addr - read mac address from device registers</div><div class='add'>+ * @dev: The network device</div><div class='add'>+ *</div><div class='add'>+ * Update our copy of the KS8851 MAC address from the registers of @dev.</div><div class='add'>+*/</div><div class='add'>+static void ks8851_read_mac_addr(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ks8851_net *ks = netdev_priv(dev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ks-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='add'>+		dev-&gt;dev_addr[i] = ks8851_rdreg8(ks, KS_MAR(i));</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ks-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ks8851_init_mac - initialise the mac address</div><div class='ctx'>  * @ks: The device structure</div><div class='ctx'>  *</div><div class='ctx'>  * Get or create the initial mac address for the device and then set that</div><div class='del'>- * into the station address register. Currently we assume that the device</div><div class='del'>- * does not have a valid mac address in it, and so we use random_ether_addr()</div><div class='add'>+ * into the station address register. If there is an EEPROM present, then</div><div class='add'>+ * we try that. If no valid mac address is found we use random_ether_addr()</div><div class='ctx'>  * to create a new one.</div><div class='del'>- *</div><div class='del'>- * In future, the driver should check to see if the device has an EEPROM</div><div class='del'>- * attached and whether that has a valid ethernet address in it.</div><div class='ctx'>  */</div><div class='ctx'> static void ks8851_init_mac(struct ks8851_net *ks)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = ks-&gt;netdev;</div><div class='ctx'> </div><div class='add'>+	/* first, try reading what we've got already */</div><div class='add'>+	if (ks-&gt;rc_ccr &amp; CCR_EEPROM) {</div><div class='add'>+		ks8851_read_mac_addr(dev);</div><div class='add'>+		if (is_valid_ether_addr(dev-&gt;dev_addr))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		netdev_err(ks-&gt;netdev, "invalid mac address read %pM\n",</div><div class='add'>+				dev-&gt;dev_addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	random_ether_addr(dev-&gt;dev_addr);</div><div class='ctx'> 	ks8851_write_mac_addr(dev);</div><div class='ctx'> }</div><div class='hunk'>@@ -739,26 +796,6 @@ static void ks8851_tx_work(struct work_struct *work)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ks8851_set_powermode - set power mode of the device</div><div class='del'>- * @ks: The device state</div><div class='del'>- * @pwrmode: The power mode value to write to KS_PMECR.</div><div class='del'>- *</div><div class='del'>- * Change the power mode of the chip.</div><div class='del'>- */</div><div class='del'>-static void ks8851_set_powermode(struct ks8851_net *ks, unsigned pwrmode)</div><div class='del'>-{</div><div class='del'>-	unsigned pmecr;</div><div class='del'>-</div><div class='del'>-	netif_dbg(ks, hw, ks-&gt;netdev, "setting power mode %d\n", pwrmode);</div><div class='del'>-</div><div class='del'>-	pmecr = ks8851_rdreg16(ks, KS_PMECR);</div><div class='del'>-	pmecr &amp;= ~PMECR_PM_MASK;</div><div class='del'>-	pmecr |= pwrmode;</div><div class='del'>-</div><div class='del'>-	ks8851_wrreg16(ks, KS_PMECR, pmecr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * ks8851_net_open - open network device</div><div class='ctx'>  * @dev: The network device being opened.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1038,234 +1075,6 @@ static const struct net_device_ops ks8851_netdev_ops = {</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Companion eeprom access */</div><div class='del'>-</div><div class='del'>-enum {	/* EEPROM programming states */</div><div class='del'>-	EEPROM_CONTROL,</div><div class='del'>-	EEPROM_ADDRESS,</div><div class='del'>-	EEPROM_DATA,</div><div class='del'>-	EEPROM_COMPLETE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ks8851_eeprom_read - read a 16bits word in ks8851 companion EEPROM</div><div class='del'>- * @dev: The network device the PHY is on.</div><div class='del'>- * @addr: EEPROM address to read</div><div class='del'>- *</div><div class='del'>- * eeprom_size: used to define the data coding length. Can be changed</div><div class='del'>- * through debug-fs.</div><div class='del'>- *</div><div class='del'>- * Programs a read on the EEPROM using ks8851 EEPROM SW access feature.</div><div class='del'>- * Warning: The READ feature is not supported on ks8851 revision 0.</div><div class='del'>- *</div><div class='del'>- * Rough programming model:</div><div class='del'>- *  - on period start: set clock high and read value on bus</div><div class='del'>- *  - on period / 2: set clock low and program value on bus</div><div class='del'>- *  - start on period / 2</div><div class='del'>- */</div><div class='del'>-unsigned int ks8851_eeprom_read(struct net_device *dev, unsigned int addr)</div><div class='del'>-{</div><div class='del'>-	struct ks8851_net *ks = netdev_priv(dev);</div><div class='del'>-	int eepcr;</div><div class='del'>-	int ctrl = EEPROM_OP_READ;</div><div class='del'>-	int state = EEPROM_CONTROL;</div><div class='del'>-	int bit_count = EEPROM_OP_LEN - 1;</div><div class='del'>-	unsigned int data = 0;</div><div class='del'>-	int dummy;</div><div class='del'>-	unsigned int addr_len;</div><div class='del'>-</div><div class='del'>-	addr_len = (ks-&gt;eeprom_size == 128) ? 6 : 8;</div><div class='del'>-</div><div class='del'>-	/* start transaction: chip select high, authorize write */</div><div class='del'>-	mutex_lock(&amp;ks-&gt;lock);</div><div class='del'>-	eepcr = EEPCR_EESA | EEPCR_EESRWA;</div><div class='del'>-	ks8851_wrreg16(ks, KS_EEPCR, eepcr);</div><div class='del'>-	eepcr |= EEPCR_EECS;</div><div class='del'>-	ks8851_wrreg16(ks, KS_EEPCR, eepcr);</div><div class='del'>-	mutex_unlock(&amp;ks-&gt;lock);</div><div class='del'>-</div><div class='del'>-	while (state != EEPROM_COMPLETE) {</div><div class='del'>-		/* falling clock period starts... */</div><div class='del'>-		/* set EED_IO pin for control and address */</div><div class='del'>-		eepcr &amp;= ~EEPCR_EEDO;</div><div class='del'>-		switch (state) {</div><div class='del'>-		case EEPROM_CONTROL:</div><div class='del'>-			eepcr |= ((ctrl &gt;&gt; bit_count) &amp; 1) &lt;&lt; 2;</div><div class='del'>-			if (bit_count-- &lt;= 0) {</div><div class='del'>-				bit_count = addr_len - 1;</div><div class='del'>-				state = EEPROM_ADDRESS;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case EEPROM_ADDRESS:</div><div class='del'>-			eepcr |= ((addr &gt;&gt; bit_count) &amp; 1) &lt;&lt; 2;</div><div class='del'>-			bit_count--;</div><div class='del'>-			break;</div><div class='del'>-		case EEPROM_DATA:</div><div class='del'>-			/* Change to receive mode */</div><div class='del'>-			eepcr &amp;= ~EEPCR_EESRWA;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* lower clock  */</div><div class='del'>-		eepcr &amp;= ~EEPCR_EESCK;</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;ks-&gt;lock);</div><div class='del'>-		ks8851_wrreg16(ks, KS_EEPCR, eepcr);</div><div class='del'>-		mutex_unlock(&amp;ks-&gt;lock);</div><div class='del'>-</div><div class='del'>-		/* waitread period / 2 */</div><div class='del'>-		udelay(EEPROM_SK_PERIOD / 2);</div><div class='del'>-</div><div class='del'>-		/* rising clock period starts... */</div><div class='del'>-</div><div class='del'>-		/* raise clock */</div><div class='del'>-		mutex_lock(&amp;ks-&gt;lock);</div><div class='del'>-		eepcr |= EEPCR_EESCK;</div><div class='del'>-		ks8851_wrreg16(ks, KS_EEPCR, eepcr);</div><div class='del'>-		mutex_unlock(&amp;ks-&gt;lock);</div><div class='del'>-</div><div class='del'>-		/* Manage read */</div><div class='del'>-		switch (state) {</div><div class='del'>-		case EEPROM_ADDRESS:</div><div class='del'>-			if (bit_count &lt; 0) {</div><div class='del'>-				bit_count = EEPROM_DATA_LEN - 1;</div><div class='del'>-				state = EEPROM_DATA;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case EEPROM_DATA:</div><div class='del'>-			mutex_lock(&amp;ks-&gt;lock);</div><div class='del'>-			dummy = ks8851_rdreg16(ks, KS_EEPCR);</div><div class='del'>-			mutex_unlock(&amp;ks-&gt;lock);</div><div class='del'>-			data |= ((dummy &gt;&gt; EEPCR_EESB_OFFSET) &amp; 1) &lt;&lt; bit_count;</div><div class='del'>-			if (bit_count-- &lt;= 0)</div><div class='del'>-				state = EEPROM_COMPLETE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* wait period / 2 */</div><div class='del'>-		udelay(EEPROM_SK_PERIOD / 2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* close transaction */</div><div class='del'>-	mutex_lock(&amp;ks-&gt;lock);</div><div class='del'>-	eepcr &amp;= ~EEPCR_EECS;</div><div class='del'>-	ks8851_wrreg16(ks, KS_EEPCR, eepcr);</div><div class='del'>-	eepcr = 0;</div><div class='del'>-	ks8851_wrreg16(ks, KS_EEPCR, eepcr);</div><div class='del'>-	mutex_unlock(&amp;ks-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ks8851_eeprom_write - write a 16bits word in ks8851 companion EEPROM</div><div class='del'>- * @dev: The network device the PHY is on.</div><div class='del'>- * @op: operand (can be WRITE, EWEN, EWDS)</div><div class='del'>- * @addr: EEPROM address to write</div><div class='del'>- * @data: data to write</div><div class='del'>- *</div><div class='del'>- * eeprom_size: used to define the data coding length. Can be changed</div><div class='del'>- * through debug-fs.</div><div class='del'>- *</div><div class='del'>- * Programs a write on the EEPROM using ks8851 EEPROM SW access feature.</div><div class='del'>- *</div><div class='del'>- * Note that a write enable is required before writing data.</div><div class='del'>- *</div><div class='del'>- * Rough programming model:</div><div class='del'>- *  - on period start: set clock high</div><div class='del'>- *  - on period / 2: set clock low and program value on bus</div><div class='del'>- *  - start on period / 2</div><div class='del'>- */</div><div class='del'>-void ks8851_eeprom_write(struct net_device *dev, unsigned int op,</div><div class='del'>-					unsigned int addr, unsigned int data)</div><div class='del'>-{</div><div class='del'>-	struct ks8851_net *ks = netdev_priv(dev);</div><div class='del'>-	int eepcr;</div><div class='del'>-	int state = EEPROM_CONTROL;</div><div class='del'>-	int bit_count = EEPROM_OP_LEN - 1;</div><div class='del'>-	unsigned int addr_len;</div><div class='del'>-</div><div class='del'>-	addr_len = (ks-&gt;eeprom_size == 128) ? 6 : 8;</div><div class='del'>-</div><div class='del'>-	switch (op) {</div><div class='del'>-	case EEPROM_OP_EWEN:</div><div class='del'>-		addr = 0x30;</div><div class='del'>-	break;</div><div class='del'>-	case EEPROM_OP_EWDS:</div><div class='del'>-		addr = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* start transaction: chip select high, authorize write */</div><div class='del'>-	mutex_lock(&amp;ks-&gt;lock);</div><div class='del'>-	eepcr = EEPCR_EESA | EEPCR_EESRWA;</div><div class='del'>-	ks8851_wrreg16(ks, KS_EEPCR, eepcr);</div><div class='del'>-	eepcr |= EEPCR_EECS;</div><div class='del'>-	ks8851_wrreg16(ks, KS_EEPCR, eepcr);</div><div class='del'>-	mutex_unlock(&amp;ks-&gt;lock);</div><div class='del'>-</div><div class='del'>-	while (state != EEPROM_COMPLETE) {</div><div class='del'>-		/* falling clock period starts... */</div><div class='del'>-		/* set EED_IO pin for control and address */</div><div class='del'>-		eepcr &amp;= ~EEPCR_EEDO;</div><div class='del'>-		switch (state) {</div><div class='del'>-		case EEPROM_CONTROL:</div><div class='del'>-			eepcr |= ((op &gt;&gt; bit_count) &amp; 1) &lt;&lt; 2;</div><div class='del'>-			if (bit_count-- &lt;= 0) {</div><div class='del'>-				bit_count = addr_len - 1;</div><div class='del'>-				state = EEPROM_ADDRESS;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case EEPROM_ADDRESS:</div><div class='del'>-			eepcr |= ((addr &gt;&gt; bit_count) &amp; 1) &lt;&lt; 2;</div><div class='del'>-			if (bit_count-- &lt;= 0) {</div><div class='del'>-				if (op == EEPROM_OP_WRITE) {</div><div class='del'>-					bit_count = EEPROM_DATA_LEN - 1;</div><div class='del'>-					state = EEPROM_DATA;</div><div class='del'>-				} else {</div><div class='del'>-					state = EEPROM_COMPLETE;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case EEPROM_DATA:</div><div class='del'>-			eepcr |= ((data &gt;&gt; bit_count) &amp; 1) &lt;&lt; 2;</div><div class='del'>-			if (bit_count-- &lt;= 0)</div><div class='del'>-				state = EEPROM_COMPLETE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* lower clock  */</div><div class='del'>-		eepcr &amp;= ~EEPCR_EESCK;</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;ks-&gt;lock);</div><div class='del'>-		ks8851_wrreg16(ks, KS_EEPCR, eepcr);</div><div class='del'>-		mutex_unlock(&amp;ks-&gt;lock);</div><div class='del'>-</div><div class='del'>-		/* wait period / 2 */</div><div class='del'>-		udelay(EEPROM_SK_PERIOD / 2);</div><div class='del'>-</div><div class='del'>-		/* rising clock period starts... */</div><div class='del'>-</div><div class='del'>-		/* raise clock */</div><div class='del'>-		eepcr |= EEPCR_EESCK;</div><div class='del'>-		mutex_lock(&amp;ks-&gt;lock);</div><div class='del'>-		ks8851_wrreg16(ks, KS_EEPCR, eepcr);</div><div class='del'>-		mutex_unlock(&amp;ks-&gt;lock);</div><div class='del'>-</div><div class='del'>-		/* wait period / 2 */</div><div class='del'>-		udelay(EEPROM_SK_PERIOD / 2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* close transaction */</div><div class='del'>-	mutex_lock(&amp;ks-&gt;lock);</div><div class='del'>-	eepcr &amp;= ~EEPCR_EECS;</div><div class='del'>-	ks8851_wrreg16(ks, KS_EEPCR, eepcr);</div><div class='del'>-	eepcr = 0;</div><div class='del'>-	ks8851_wrreg16(ks, KS_EEPCR, eepcr);</div><div class='del'>-	mutex_unlock(&amp;ks-&gt;lock);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* ethtool support */</div><div class='ctx'> </div><div class='ctx'> static void ks8851_get_drvinfo(struct net_device *dev,</div><div class='hunk'>@@ -1312,115 +1121,141 @@ static int ks8851_nway_reset(struct net_device *dev)</div><div class='ctx'> 	return mii_nway_restart(&amp;ks-&gt;mii);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ks8851_get_eeprom_len(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct ks8851_net *ks = netdev_priv(dev);</div><div class='del'>-	return ks-&gt;eeprom_size;</div><div class='del'>-}</div><div class='add'>+/* EEPROM support */</div><div class='ctx'> </div><div class='del'>-static int ks8851_get_eeprom(struct net_device *dev,</div><div class='del'>-			    struct ethtool_eeprom *eeprom, u8 *bytes)</div><div class='add'>+static void ks8851_eeprom_regread(struct eeprom_93cx6 *ee)</div><div class='ctx'> {</div><div class='del'>-	struct ks8851_net *ks = netdev_priv(dev);</div><div class='del'>-	u16 *eeprom_buff;</div><div class='del'>-	int first_word;</div><div class='del'>-	int last_word;</div><div class='del'>-	int ret_val = 0;</div><div class='del'>-	u16 i;</div><div class='del'>-</div><div class='del'>-	if (eeprom-&gt;len == 0)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	struct ks8851_net *ks = ee-&gt;data;</div><div class='add'>+	unsigned val;</div><div class='ctx'> </div><div class='del'>-	if (eeprom-&gt;len &gt; ks-&gt;eeprom_size)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	val = ks8851_rdreg16(ks, KS_EEPCR);</div><div class='ctx'> </div><div class='del'>-	eeprom-&gt;magic = ks8851_rdreg16(ks, KS_CIDER);</div><div class='add'>+	ee-&gt;reg_data_out = (val &amp; EEPCR_EESB) ? 1 : 0;</div><div class='add'>+	ee-&gt;reg_data_clock = (val &amp; EEPCR_EESCK) ? 1 : 0;</div><div class='add'>+	ee-&gt;reg_chip_select = (val &amp; EEPCR_EECS) ? 1 : 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	first_word = eeprom-&gt;offset &gt;&gt; 1;</div><div class='del'>-	last_word = (eeprom-&gt;offset + eeprom-&gt;len - 1) &gt;&gt; 1;</div><div class='add'>+static void ks8851_eeprom_regwrite(struct eeprom_93cx6 *ee)</div><div class='add'>+{</div><div class='add'>+	struct ks8851_net *ks = ee-&gt;data;</div><div class='add'>+	unsigned val = EEPCR_EESA;	/* default - eeprom access on */</div><div class='add'>+</div><div class='add'>+	if (ee-&gt;drive_data)</div><div class='add'>+		val |= EEPCR_EESRWA;</div><div class='add'>+	if (ee-&gt;reg_data_in)</div><div class='add'>+		val |= EEPCR_EEDO;</div><div class='add'>+	if (ee-&gt;reg_data_clock)</div><div class='add'>+		val |= EEPCR_EESCK;</div><div class='add'>+	if (ee-&gt;reg_chip_select)</div><div class='add'>+		val |= EEPCR_EECS;</div><div class='add'>+</div><div class='add'>+	ks8851_wrreg16(ks, KS_EEPCR, val);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	eeprom_buff = kmalloc(sizeof(u16) *</div><div class='del'>-			(last_word - first_word + 1), GFP_KERNEL);</div><div class='del'>-	if (!eeprom_buff)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+/**</div><div class='add'>+ * ks8851_eeprom_claim - claim device EEPROM and activate the interface</div><div class='add'>+ * @ks: The network device state.</div><div class='add'>+ *</div><div class='add'>+ * Check for the presence of an EEPROM, and then activate software access</div><div class='add'>+ * to the device.</div><div class='add'>+ */</div><div class='add'>+static int ks8851_eeprom_claim(struct ks8851_net *ks)</div><div class='add'>+{</div><div class='add'>+	if (!(ks-&gt;rc_ccr &amp; CCR_EEPROM))</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; last_word - first_word + 1; i++)</div><div class='del'>-		eeprom_buff[i] = ks8851_eeprom_read(dev, first_word + 1);</div><div class='add'>+	mutex_lock(&amp;ks-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	/* Device's eeprom is little-endian, word addressable */</div><div class='del'>-	for (i = 0; i &lt; last_word - first_word + 1; i++)</div><div class='del'>-		le16_to_cpus(&amp;eeprom_buff[i]);</div><div class='add'>+	/* start with clock low, cs high */</div><div class='add'>+	ks8851_wrreg16(ks, KS_EEPCR, EEPCR_EESA | EEPCR_EECS);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	memcpy(bytes, (u8 *)eeprom_buff + (eeprom-&gt;offset &amp; 1), eeprom-&gt;len);</div><div class='del'>-	kfree(eeprom_buff);</div><div class='add'>+/**</div><div class='add'>+ * ks8851_eeprom_release - release the EEPROM interface</div><div class='add'>+ * @ks: The device state</div><div class='add'>+ *</div><div class='add'>+ * Release the software access to the device EEPROM</div><div class='add'>+ */</div><div class='add'>+static void ks8851_eeprom_release(struct ks8851_net *ks)</div><div class='add'>+{</div><div class='add'>+	unsigned val = ks8851_rdreg16(ks, KS_EEPCR);</div><div class='ctx'> </div><div class='del'>-	return ret_val;</div><div class='add'>+	ks8851_wrreg16(ks, KS_EEPCR, val &amp; ~EEPCR_EESA);</div><div class='add'>+	mutex_unlock(&amp;ks-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define KS_EEPROM_MAGIC (0x00008851)</div><div class='add'>+</div><div class='ctx'> static int ks8851_set_eeprom(struct net_device *dev,</div><div class='del'>-			    struct ethtool_eeprom *eeprom, u8 *bytes)</div><div class='add'>+			     struct ethtool_eeprom *ee, u8 *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ks8851_net *ks = netdev_priv(dev);</div><div class='del'>-	u16 *eeprom_buff;</div><div class='del'>-	void *ptr;</div><div class='del'>-	int max_len;</div><div class='del'>-	int first_word;</div><div class='del'>-	int last_word;</div><div class='del'>-	int ret_val = 0;</div><div class='del'>-	u16 i;</div><div class='del'>-</div><div class='del'>-	if (eeprom-&gt;len == 0)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (eeprom-&gt;len &gt; ks-&gt;eeprom_size)</div><div class='add'>+	int offset = ee-&gt;offset;</div><div class='add'>+	int len = ee-&gt;len;</div><div class='add'>+	u16 tmp;</div><div class='add'>+</div><div class='add'>+	/* currently only support byte writing */</div><div class='add'>+	if (len != 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (eeprom-&gt;magic != ks8851_rdreg16(ks, KS_CIDER))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	if (ee-&gt;magic != KS_EEPROM_MAGIC)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	first_word = eeprom-&gt;offset &gt;&gt; 1;</div><div class='del'>-	last_word = (eeprom-&gt;offset + eeprom-&gt;len - 1) &gt;&gt; 1;</div><div class='del'>-	max_len = (last_word - first_word + 1) * 2;</div><div class='del'>-	eeprom_buff = kmalloc(max_len, GFP_KERNEL);</div><div class='del'>-	if (!eeprom_buff)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (ks8851_eeprom_claim(ks))</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	ptr = (void *)eeprom_buff;</div><div class='add'>+	eeprom_93cx6_wren(&amp;ks-&gt;eeprom, true);</div><div class='ctx'> </div><div class='del'>-	if (eeprom-&gt;offset &amp; 1) {</div><div class='del'>-		/* need read/modify/write of first changed EEPROM word */</div><div class='del'>-		/* only the second byte of the word is being modified */</div><div class='del'>-		eeprom_buff[0] = ks8851_eeprom_read(dev, first_word);</div><div class='del'>-		ptr++;</div><div class='add'>+	/* ethtool currently only supports writing bytes, which means</div><div class='add'>+	 * we have to read/modify/write our 16bit EEPROMs */</div><div class='add'>+</div><div class='add'>+	eeprom_93cx6_read(&amp;ks-&gt;eeprom, offset/2, &amp;tmp);</div><div class='add'>+</div><div class='add'>+	if (offset &amp; 1) {</div><div class='add'>+		tmp &amp;= 0xff;</div><div class='add'>+		tmp |= *data &lt;&lt; 8;</div><div class='add'>+	} else {</div><div class='add'>+		tmp &amp;= 0xff00;</div><div class='add'>+		tmp |= *data;</div><div class='ctx'> 	}</div><div class='del'>-	if ((eeprom-&gt;offset + eeprom-&gt;len) &amp; 1)</div><div class='del'>-		/* need read/modify/write of last changed EEPROM word */</div><div class='del'>-		/* only the first byte of the word is being modified */</div><div class='del'>-		eeprom_buff[last_word - first_word] =</div><div class='del'>-					ks8851_eeprom_read(dev, last_word);</div><div class='ctx'> </div><div class='add'>+	eeprom_93cx6_write(&amp;ks-&gt;eeprom, offset/2, tmp);</div><div class='add'>+	eeprom_93cx6_wren(&amp;ks-&gt;eeprom, false);</div><div class='ctx'> </div><div class='del'>-	/* Device's eeprom is little-endian, word addressable */</div><div class='del'>-	le16_to_cpus(&amp;eeprom_buff[0]);</div><div class='del'>-	le16_to_cpus(&amp;eeprom_buff[last_word - first_word]);</div><div class='add'>+	ks8851_eeprom_release(ks);</div><div class='ctx'> </div><div class='del'>-	memcpy(ptr, bytes, eeprom-&gt;len);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; last_word - first_word + 1; i++)</div><div class='del'>-		eeprom_buff[i] = cpu_to_le16(eeprom_buff[i]);</div><div class='add'>+static int ks8851_get_eeprom(struct net_device *dev,</div><div class='add'>+			     struct ethtool_eeprom *ee, u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct ks8851_net *ks = netdev_priv(dev);</div><div class='add'>+	int offset = ee-&gt;offset;</div><div class='add'>+	int len = ee-&gt;len;</div><div class='ctx'> </div><div class='del'>-	ks8851_eeprom_write(dev, EEPROM_OP_EWEN, 0, 0);</div><div class='add'>+	/* must be 2 byte aligned */</div><div class='add'>+	if (len &amp; 1 || offset &amp; 1)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; last_word - first_word + 1; i++) {</div><div class='del'>-		ks8851_eeprom_write(dev, EEPROM_OP_WRITE, first_word + i,</div><div class='del'>-							eeprom_buff[i]);</div><div class='del'>-		mdelay(EEPROM_WRITE_TIME);</div><div class='del'>-	}</div><div class='add'>+	if (ks8851_eeprom_claim(ks))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	ee-&gt;magic = KS_EEPROM_MAGIC;</div><div class='ctx'> </div><div class='del'>-	ks8851_eeprom_write(dev, EEPROM_OP_EWDS, 0, 0);</div><div class='add'>+	eeprom_93cx6_multiread(&amp;ks-&gt;eeprom, offset/2, (__le16 *)data, len/2);</div><div class='add'>+	ks8851_eeprom_release(ks);</div><div class='ctx'> </div><div class='del'>-	kfree(eeprom_buff);</div><div class='del'>-	return ret_val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ks8851_get_eeprom_len(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ks8851_net *ks = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	/* currently, we assume it is an 93C46 attached, so return 128 */</div><div class='add'>+	return ks-&gt;rc_ccr &amp; CCR_EEPROM ? 128 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops ks8851_ethtool_ops = {</div><div class='hunk'>@@ -1613,6 +1448,13 @@ static int __devinit ks8851_probe(struct spi_device *spi)</div><div class='ctx'> 	spi_message_add_tail(&amp;ks-&gt;spi_xfer2[0], &amp;ks-&gt;spi_msg2);</div><div class='ctx'> 	spi_message_add_tail(&amp;ks-&gt;spi_xfer2[1], &amp;ks-&gt;spi_msg2);</div><div class='ctx'> </div><div class='add'>+	/* setup EEPROM state */</div><div class='add'>+</div><div class='add'>+	ks-&gt;eeprom.data = ks;</div><div class='add'>+	ks-&gt;eeprom.width = PCI_EEPROM_WIDTH_93C46;</div><div class='add'>+	ks-&gt;eeprom.register_read = ks8851_eeprom_regread;</div><div class='add'>+	ks-&gt;eeprom.register_write = ks8851_eeprom_regwrite;</div><div class='add'>+</div><div class='ctx'> 	/* setup mii state */</div><div class='ctx'> 	ks-&gt;mii.dev		= ndev;</div><div class='ctx'> 	ks-&gt;mii.phy_id		= 1,</div><div class='hunk'>@@ -1674,9 +1516,10 @@ static int __devinit ks8851_probe(struct spi_device *spi)</div><div class='ctx'> 		goto err_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	netdev_info(ndev, "revision %d, MAC %pM, IRQ %d\n",</div><div class='add'>+	netdev_info(ndev, "revision %d, MAC %pM, IRQ %d, %s EEPROM\n",</div><div class='ctx'> 		    CIDER_REV_GET(ks8851_rdreg16(ks, KS_CIDER)),</div><div class='del'>-		    ndev-&gt;dev_addr, ndev-&gt;irq);</div><div class='add'>+		    ndev-&gt;dev_addr, ndev-&gt;irq,</div><div class='add'>+		    ks-&gt;rc_ccr &amp; CCR_EEPROM ? "has" : "no");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/micrel/ks8851.h b/drivers/net/ethernet/micrel/ks8851.h<br/>index 537fb06e5932..b0fae86aacad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/micrel/ks8851.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/micrel/ks8851.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/micrel/ks8851.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/micrel/ks8851.h</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #define CCR_32PIN				(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* MAC address registers */</div><div class='del'>-#define KS_MAR(_m)				0x15 - (_m)</div><div class='add'>+#define KS_MAR(_m)				(0x15 - (_m))</div><div class='ctx'> #define KS_MARL					0x10</div><div class='ctx'> #define KS_MARM					0x12</div><div class='ctx'> #define KS_MARH					0x14</div><div class='hunk'>@@ -27,22 +27,11 @@</div><div class='ctx'> #define KS_EEPCR				0x22</div><div class='ctx'> #define EEPCR_EESRWA				(1 &lt;&lt; 5)</div><div class='ctx'> #define EEPCR_EESA				(1 &lt;&lt; 4)</div><div class='del'>-#define EEPCR_EESB_OFFSET			3</div><div class='del'>-#define EEPCR_EESB				(1 &lt;&lt; EEPCR_EESB_OFFSET)</div><div class='add'>+#define EEPCR_EESB				(1 &lt;&lt; 3)</div><div class='ctx'> #define EEPCR_EEDO				(1 &lt;&lt; 2)</div><div class='ctx'> #define EEPCR_EESCK				(1 &lt;&lt; 1)</div><div class='ctx'> #define EEPCR_EECS				(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='del'>-#define EEPROM_OP_LEN				3	/* bits:*/</div><div class='del'>-#define EEPROM_OP_READ				0x06</div><div class='del'>-#define EEPROM_OP_EWEN				0x04</div><div class='del'>-#define EEPROM_OP_WRITE				0x05</div><div class='del'>-#define EEPROM_OP_EWDS				0x14</div><div class='del'>-</div><div class='del'>-#define EEPROM_DATA_LEN				16	/* 16 bits EEPROM */</div><div class='del'>-#define EEPROM_WRITE_TIME			4	/* wrt ack time in ms */</div><div class='del'>-#define EEPROM_SK_PERIOD			400	/* in us */</div><div class='del'>-</div><div class='ctx'> #define KS_MBIR					0x24</div><div class='ctx'> #define MBIR_TXMBF				(1 &lt;&lt; 12)</div><div class='ctx'> #define MBIR_TXMBFA				(1 &lt;&lt; 11)</div><div class='head'>diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c<br/>index d19c849059d8..e58e78e5c930 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/micrel/ks8851_mll.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/micrel/ks8851_mll.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/micrel/ks8851_mll.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/micrel/ks8851_mll.c</a></div><div class='hunk'>@@ -1500,8 +1500,7 @@ static int ks_hw_init(struct ks_net *ks)</div><div class='ctx'> 	ks-&gt;all_mcast = 0;</div><div class='ctx'> 	ks-&gt;mcast_lst_size = 0;</div><div class='ctx'> </div><div class='del'>-	ks-&gt;frame_head_info = (struct type_frame_head *) \</div><div class='del'>-		kmalloc(MHEADER_SIZE, GFP_KERNEL);</div><div class='add'>+	ks-&gt;frame_head_info = kmalloc(MHEADER_SIZE, GFP_KERNEL);</div><div class='ctx'> 	if (!ks-&gt;frame_head_info) {</div><div class='ctx'> 		pr_err("Error: Fail to allocate frame memory\n");</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -1659,18 +1658,7 @@ static struct platform_driver ks8851_platform_driver = {</div><div class='ctx'> 	.remove = __devexit_p(ks8851_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ks8851_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ks8851_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ks8851_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ks8851_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ks8851_init);</div><div class='del'>-module_exit(ks8851_exit);</div><div class='add'>+module_platform_driver(ks8851_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("KS8851 MLL Network driver");</div><div class='ctx'> MODULE_AUTHOR("David Choi &lt;david.choi@micrel.com&gt;");</div><div class='head'>diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c<br/>index 7ece990381c8..e52cd310ae76 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/micrel/ksz884x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/micrel/ksz884x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/micrel/ksz884x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/micrel/ksz884x.c</a></div><div class='hunk'>@@ -743,11 +743,10 @@</div><div class='ctx'> /* Change default LED mode. */</div><div class='ctx'> #define SET_DEFAULT_LED			LED_SPEED_DUPLEX_ACT</div><div class='ctx'> </div><div class='del'>-#define MAC_ADDR_LEN			6</div><div class='del'>-#define MAC_ADDR_ORDER(i)		(MAC_ADDR_LEN - 1 - (i))</div><div class='add'>+#define MAC_ADDR_ORDER(i)		(ETH_ALEN - 1 - (i))</div><div class='ctx'> </div><div class='ctx'> #define MAX_ETHERNET_BODY_SIZE		1500</div><div class='del'>-#define ETHERNET_HEADER_SIZE		14</div><div class='add'>+#define ETHERNET_HEADER_SIZE		(14 + VLAN_HLEN)</div><div class='ctx'> </div><div class='ctx'> #define MAX_ETHERNET_PACKET_SIZE	\</div><div class='ctx'> 	(MAX_ETHERNET_BODY_SIZE + ETHERNET_HEADER_SIZE)</div><div class='hunk'>@@ -1043,7 +1042,7 @@ enum {</div><div class='ctx'>  * @valid:	Valid setting indicating the entry is being used.</div><div class='ctx'>  */</div><div class='ctx'> struct ksz_mac_table {</div><div class='del'>-	u8 mac_addr[MAC_ADDR_LEN];</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='ctx'> 	u16 vid;</div><div class='ctx'> 	u8 fid;</div><div class='ctx'> 	u8 ports;</div><div class='hunk'>@@ -1187,8 +1186,8 @@ struct ksz_switch {</div><div class='ctx'> 	u8 diffserv[DIFFSERV_ENTRIES];</div><div class='ctx'> 	u8 p_802_1p[PRIO_802_1P_ENTRIES];</div><div class='ctx'> </div><div class='del'>-	u8 br_addr[MAC_ADDR_LEN];</div><div class='del'>-	u8 other_addr[MAC_ADDR_LEN];</div><div class='add'>+	u8 br_addr[ETH_ALEN];</div><div class='add'>+	u8 other_addr[ETH_ALEN];</div><div class='ctx'> </div><div class='ctx'> 	u8 broad_per;</div><div class='ctx'> 	u8 member;</div><div class='hunk'>@@ -1292,14 +1291,14 @@ struct ksz_hw {</div><div class='ctx'> 	int tx_int_mask;</div><div class='ctx'> 	int tx_size;</div><div class='ctx'> </div><div class='del'>-	u8 perm_addr[MAC_ADDR_LEN];</div><div class='del'>-	u8 override_addr[MAC_ADDR_LEN];</div><div class='del'>-	u8 address[ADDITIONAL_ENTRIES][MAC_ADDR_LEN];</div><div class='add'>+	u8 perm_addr[ETH_ALEN];</div><div class='add'>+	u8 override_addr[ETH_ALEN];</div><div class='add'>+	u8 address[ADDITIONAL_ENTRIES][ETH_ALEN];</div><div class='ctx'> 	u8 addr_list_size;</div><div class='ctx'> 	u8 mac_override;</div><div class='ctx'> 	u8 promiscuous;</div><div class='ctx'> 	u8 all_multi;</div><div class='del'>-	u8 multi_list[MAX_MULTICAST_LIST][MAC_ADDR_LEN];</div><div class='add'>+	u8 multi_list[MAX_MULTICAST_LIST][ETH_ALEN];</div><div class='ctx'> 	u8 multi_bits[HW_MULTICAST_SIZE];</div><div class='ctx'> 	u8 multi_list_size;</div><div class='ctx'> </div><div class='hunk'>@@ -3654,7 +3653,7 @@ static void hw_add_wol_bcast(struct ksz_hw *hw)</div><div class='ctx'> 	static const u8 mask[] = { 0x3F };</div><div class='ctx'> 	static const u8 pattern[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };</div><div class='ctx'> </div><div class='del'>-	hw_set_wol_frame(hw, 2, 1, mask, MAC_ADDR_LEN, pattern);</div><div class='add'>+	hw_set_wol_frame(hw, 2, 1, mask, ETH_ALEN, pattern);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3689,7 +3688,7 @@ static void hw_add_wol_ucast(struct ksz_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	static const u8 mask[] = { 0x3F };</div><div class='ctx'> </div><div class='del'>-	hw_set_wol_frame(hw, 0, 1, mask, MAC_ADDR_LEN, hw-&gt;override_addr);</div><div class='add'>+	hw_set_wol_frame(hw, 0, 1, mask, ETH_ALEN, hw-&gt;override_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -4055,7 +4054,7 @@ static void hw_set_addr(struct ksz_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAC_ADDR_LEN; i++)</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 		writeb(hw-&gt;override_addr[MAC_ADDR_ORDER(i)],</div><div class='ctx'> 			hw-&gt;io + KS884X_ADDR_0_OFFSET + i);</div><div class='ctx'> </div><div class='hunk'>@@ -4072,17 +4071,16 @@ static void hw_read_addr(struct ksz_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAC_ADDR_LEN; i++)</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 		hw-&gt;perm_addr[MAC_ADDR_ORDER(i)] = readb(hw-&gt;io +</div><div class='ctx'> 			KS884X_ADDR_0_OFFSET + i);</div><div class='ctx'> </div><div class='ctx'> 	if (!hw-&gt;mac_override) {</div><div class='del'>-		memcpy(hw-&gt;override_addr, hw-&gt;perm_addr, MAC_ADDR_LEN);</div><div class='add'>+		memcpy(hw-&gt;override_addr, hw-&gt;perm_addr, ETH_ALEN);</div><div class='ctx'> 		if (empty_addr(hw-&gt;override_addr)) {</div><div class='del'>-			memcpy(hw-&gt;perm_addr, DEFAULT_MAC_ADDRESS,</div><div class='del'>-				MAC_ADDR_LEN);</div><div class='add'>+			memcpy(hw-&gt;perm_addr, DEFAULT_MAC_ADDRESS, ETH_ALEN);</div><div class='ctx'> 			memcpy(hw-&gt;override_addr, DEFAULT_MAC_ADDRESS,</div><div class='del'>-				MAC_ADDR_LEN);</div><div class='add'>+			       ETH_ALEN);</div><div class='ctx'> 			hw-&gt;override_addr[5] += hw-&gt;id;</div><div class='ctx'> 			hw_set_addr(hw);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4130,16 +4128,16 @@ static int hw_add_addr(struct ksz_hw *hw, u8 *mac_addr)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int j = ADDITIONAL_ENTRIES;</div><div class='ctx'> </div><div class='del'>-	if (!memcmp(hw-&gt;override_addr, mac_addr, MAC_ADDR_LEN))</div><div class='add'>+	if (!memcmp(hw-&gt;override_addr, mac_addr, ETH_ALEN))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	for (i = 0; i &lt; hw-&gt;addr_list_size; i++) {</div><div class='del'>-		if (!memcmp(hw-&gt;address[i], mac_addr, MAC_ADDR_LEN))</div><div class='add'>+		if (!memcmp(hw-&gt;address[i], mac_addr, ETH_ALEN))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		if (ADDITIONAL_ENTRIES == j &amp;&amp; empty_addr(hw-&gt;address[i]))</div><div class='ctx'> 			j = i;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (j &lt; ADDITIONAL_ENTRIES) {</div><div class='del'>-		memcpy(hw-&gt;address[j], mac_addr, MAC_ADDR_LEN);</div><div class='add'>+		memcpy(hw-&gt;address[j], mac_addr, ETH_ALEN);</div><div class='ctx'> 		hw_ena_add_addr(hw, j, hw-&gt;address[j]);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4151,8 +4149,8 @@ static int hw_del_addr(struct ksz_hw *hw, u8 *mac_addr)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; hw-&gt;addr_list_size; i++) {</div><div class='del'>-		if (!memcmp(hw-&gt;address[i], mac_addr, MAC_ADDR_LEN)) {</div><div class='del'>-			memset(hw-&gt;address[i], 0, MAC_ADDR_LEN);</div><div class='add'>+		if (!memcmp(hw-&gt;address[i], mac_addr, ETH_ALEN)) {</div><div class='add'>+			memset(hw-&gt;address[i], 0, ETH_ALEN);</div><div class='ctx'> 			writel(0, hw-&gt;io + ADD_ADDR_INCR * i +</div><div class='ctx'> 				KS_ADD_ADDR_0_HI);</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -4382,12 +4380,10 @@ static void ksz_update_timer(struct ksz_timer_info *info)</div><div class='ctx'>  */</div><div class='ctx'> static int ksz_alloc_soft_desc(struct ksz_desc_info *desc_info, int transmit)</div><div class='ctx'> {</div><div class='del'>-	desc_info-&gt;ring = kmalloc(sizeof(struct ksz_desc) * desc_info-&gt;alloc,</div><div class='del'>-		GFP_KERNEL);</div><div class='add'>+	desc_info-&gt;ring = kzalloc(sizeof(struct ksz_desc) * desc_info-&gt;alloc,</div><div class='add'>+				  GFP_KERNEL);</div><div class='ctx'> 	if (!desc_info-&gt;ring)</div><div class='ctx'> 		return 1;</div><div class='del'>-	memset((void *) desc_info-&gt;ring, 0,</div><div class='del'>-		sizeof(struct ksz_desc) * desc_info-&gt;alloc);</div><div class='ctx'> 	hw_init_desc(desc_info, transmit);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -5676,7 +5672,7 @@ static int netdev_set_mac_address(struct net_device *dev, void *addr)</div><div class='ctx'> 		hw_del_addr(hw, dev-&gt;dev_addr);</div><div class='ctx'> 	else {</div><div class='ctx'> 		hw-&gt;mac_override = 1;</div><div class='del'>-		memcpy(hw-&gt;override_addr, mac-&gt;sa_data, MAC_ADDR_LEN);</div><div class='add'>+		memcpy(hw-&gt;override_addr, mac-&gt;sa_data, ETH_ALEN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy(dev-&gt;dev_addr, mac-&gt;sa_data, MAX_ADDR_LEN);</div><div class='hunk'>@@ -5786,7 +5782,7 @@ static void netdev_set_rx_mode(struct net_device *dev)</div><div class='ctx'> 		netdev_for_each_mc_addr(ha, dev) {</div><div class='ctx'> 			if (i &gt;= MAX_MULTICAST_LIST)</div><div class='ctx'> 				break;</div><div class='del'>-			memcpy(hw-&gt;multi_list[i++], ha-&gt;addr, MAC_ADDR_LEN);</div><div class='add'>+			memcpy(hw-&gt;multi_list[i++], ha-&gt;addr, ETH_ALEN);</div><div class='ctx'> 		}</div><div class='ctx'> 		hw-&gt;multi_list_size = (u8) i;</div><div class='ctx'> 		hw_set_grp_addr(hw);</div><div class='hunk'>@@ -6093,9 +6089,10 @@ static void netdev_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 	struct dev_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct dev_info *hw_priv = priv-&gt;adapter;</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(hw_priv-&gt;pdev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(hw_priv-&gt;pdev),</div><div class='add'>+		sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -6587,7 +6584,8 @@ static void netdev_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'>  *</div><div class='ctx'>  * Return 0 if successful; otherwise an error code.</div><div class='ctx'>  */</div><div class='del'>-static int netdev_set_features(struct net_device *dev, u32 features)</div><div class='add'>+static int netdev_set_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct dev_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct dev_info *hw_priv = priv-&gt;adapter;</div><div class='hunk'>@@ -6609,7 +6607,7 @@ static int netdev_set_features(struct net_device *dev, u32 features)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ethtool_ops netdev_ethtool_ops = {</div><div class='add'>+static const struct ethtool_ops netdev_ethtool_ops = {</div><div class='ctx'> 	.get_settings		= netdev_get_settings,</div><div class='ctx'> 	.set_settings		= netdev_set_settings,</div><div class='ctx'> 	.nway_reset		= netdev_nway_reset,</div><div class='hunk'>@@ -6860,7 +6858,7 @@ static void get_mac_addr(struct dev_info *hw_priv, u8 *macaddr, int port)</div><div class='ctx'> 	int num;</div><div class='ctx'> </div><div class='ctx'> 	i = j = num = got_num = 0;</div><div class='del'>-	while (j &lt; MAC_ADDR_LEN) {</div><div class='add'>+	while (j &lt; ETH_ALEN) {</div><div class='ctx'> 		if (macaddr[i]) {</div><div class='ctx'> 			int digit;</div><div class='ctx'> </div><div class='hunk'>@@ -6891,7 +6889,7 @@ static void get_mac_addr(struct dev_info *hw_priv, u8 *macaddr, int port)</div><div class='ctx'> 		}</div><div class='ctx'> 		i++;</div><div class='ctx'> 	}</div><div class='del'>-	if (MAC_ADDR_LEN == j) {</div><div class='add'>+	if (ETH_ALEN == j) {</div><div class='ctx'> 		if (MAIN_PORT == port)</div><div class='ctx'> 			hw_priv-&gt;hw.mac_override = 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -7058,7 +7056,7 @@ static int __devinit pcidev_init(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	/* Multiple device interfaces mode requires a second MAC address. */</div><div class='ctx'> 	if (hw-&gt;dev_count &gt; 1) {</div><div class='del'>-		memcpy(sw-&gt;other_addr, hw-&gt;override_addr, MAC_ADDR_LEN);</div><div class='add'>+		memcpy(sw-&gt;other_addr, hw-&gt;override_addr, ETH_ALEN);</div><div class='ctx'> 		read_other_addr(hw);</div><div class='ctx'> 		if (mac1addr[0] != ':')</div><div class='ctx'> 			get_mac_addr(hw_priv, mac1addr, OTHER_PORT);</div><div class='hunk'>@@ -7108,12 +7106,11 @@ static int __devinit pcidev_init(struct pci_dev *pdev,</div><div class='ctx'> 		dev-&gt;irq = pdev-&gt;irq;</div><div class='ctx'> 		if (MAIN_PORT == i)</div><div class='ctx'> 			memcpy(dev-&gt;dev_addr, hw_priv-&gt;hw.override_addr,</div><div class='del'>-				MAC_ADDR_LEN);</div><div class='add'>+			       ETH_ALEN);</div><div class='ctx'> 		else {</div><div class='del'>-			memcpy(dev-&gt;dev_addr, sw-&gt;other_addr,</div><div class='del'>-				MAC_ADDR_LEN);</div><div class='add'>+			memcpy(dev-&gt;dev_addr, sw-&gt;other_addr, ETH_ALEN);</div><div class='ctx'> 			if (!memcmp(sw-&gt;other_addr, hw-&gt;override_addr,</div><div class='del'>-					MAC_ADDR_LEN))</div><div class='add'>+				    ETH_ALEN))</div><div class='ctx'> 				dev-&gt;dev_addr[5] += port-&gt;first_port;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c<br/>index 0778edcf7b9a..20b72ecb020a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/myricom/myri10ge/myri10ge.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/myricom/myri10ge/myri10ge.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/myricom/myri10ge/myri10ge.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/myricom/myri10ge/myri10ge.c</a></div><div class='hunk'>@@ -1491,7 +1491,7 @@ myri10ge_clean_rx_done(struct myri10ge_slice_state *ss, int budget)</div><div class='ctx'> 	 * access to avoid theoretical race condition with functions that</div><div class='ctx'> 	 * change NETIF_F_LRO flag at runtime.</div><div class='ctx'> 	 */</div><div class='del'>-	bool lro_enabled = ACCESS_ONCE(mgp-&gt;dev-&gt;features) &amp; NETIF_F_LRO;</div><div class='add'>+	bool lro_enabled = !!(ACCESS_ONCE(mgp-&gt;dev-&gt;features) &amp; NETIF_F_LRO);</div><div class='ctx'> </div><div class='ctx'> 	while (rx_done-&gt;entry[idx].length != 0 &amp;&amp; work_done &lt; budget) {</div><div class='ctx'> 		length = ntohs(rx_done-&gt;entry[idx].length);</div><div class='hunk'>@@ -3149,7 +3149,8 @@ static int myri10ge_set_mac_address(struct net_device *dev, void *addr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 myri10ge_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static netdev_features_t myri10ge_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	if (!(features &amp; NETIF_F_RXCSUM))</div><div class='ctx'> 		features &amp;= ~NETIF_F_LRO;</div><div class='head'>diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h<br/>index 11be150e4d67..b7fc26c4f738 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h</a></div><div class='hunk'>@@ -356,7 +356,7 @@ enum myri10ge_mcp_cmd_type {</div><div class='ctx'> 	MXGEFW_CMD_GET_DCA_OFFSET = 56,</div><div class='ctx'> 	/* offset of dca control for WDMAs */</div><div class='ctx'> </div><div class='del'>-	/* VMWare NetQueue commands */</div><div class='add'>+	/* VMware NetQueue commands */</div><div class='ctx'> 	MXGEFW_CMD_NETQ_GET_FILTERS_PER_QUEUE = 57,</div><div class='ctx'> 	MXGEFW_CMD_NETQ_ADD_FILTER = 58,</div><div class='ctx'> 	/* data0 = filter_id &lt;&lt; 16 | queue &lt;&lt; 8 | type */</div><div class='head'>diff --git a/drivers/net/ethernet/natsemi/jazzsonic.c b/drivers/net/ethernet/natsemi/jazzsonic.c<br/>index fc7c6a932ad9..5b89fd377ae3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/natsemi/jazzsonic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/natsemi/jazzsonic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/natsemi/jazzsonic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/natsemi/jazzsonic.c</a></div><div class='hunk'>@@ -294,15 +294,4 @@ static struct platform_driver jazz_sonic_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init jazz_sonic_init_module(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;jazz_sonic_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit jazz_sonic_cleanup_module(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;jazz_sonic_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(jazz_sonic_init_module);</div><div class='del'>-module_exit(jazz_sonic_cleanup_module);</div><div class='add'>+module_platform_driver(jazz_sonic_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c<br/>index a2eacbfb4252..f1b85561c650 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/natsemi/macsonic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/natsemi/macsonic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/natsemi/macsonic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/natsemi/macsonic.c</a></div><div class='hunk'>@@ -142,8 +142,7 @@ static int macsonic_open(struct net_device* dev)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	retval = request_irq(dev-&gt;irq, sonic_interrupt, IRQ_FLG_FAST,</div><div class='del'>-				"sonic", dev);</div><div class='add'>+	retval = request_irq(dev-&gt;irq, sonic_interrupt, 0, "sonic", dev);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		printk(KERN_ERR "%s: unable to get IRQ %d.\n",</div><div class='ctx'> 				dev-&gt;name, dev-&gt;irq);</div><div class='hunk'>@@ -154,8 +153,8 @@ static int macsonic_open(struct net_device* dev)</div><div class='ctx'> 	 * rupt as well, which must prevent re-entrance of the sonic handler.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (dev-&gt;irq == IRQ_AUTO_3) {</div><div class='del'>-		retval = request_irq(IRQ_NUBUS_9, macsonic_interrupt,</div><div class='del'>-					IRQ_FLG_FAST, "sonic", dev);</div><div class='add'>+		retval = request_irq(IRQ_NUBUS_9, macsonic_interrupt, 0,</div><div class='add'>+				     "sonic", dev);</div><div class='ctx'> 		if (retval) {</div><div class='ctx'> 			printk(KERN_ERR "%s: unable to get IRQ %d.\n",</div><div class='ctx'> 					dev-&gt;name, IRQ_NUBUS_9);</div><div class='hunk'>@@ -643,15 +642,4 @@ static struct platform_driver mac_sonic_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init mac_sonic_init_module(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;mac_sonic_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit mac_sonic_cleanup_module(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;mac_sonic_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(mac_sonic_init_module);</div><div class='del'>-module_exit(mac_sonic_cleanup_module);</div><div class='add'>+module_platform_driver(mac_sonic_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/natsemi/natsemi.c b/drivers/net/ethernet/natsemi/natsemi.c<br/>index 6ca047aab793..ac7b16b6e7af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/natsemi/natsemi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/natsemi/natsemi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/natsemi/natsemi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/natsemi/natsemi.c</a></div><div class='hunk'>@@ -2555,9 +2555,9 @@ static void set_rx_mode(struct net_device *dev)</div><div class='ctx'> static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='del'>-	strncpy(info-&gt;driver, DRV_NAME, ETHTOOL_BUSINFO_LEN);</div><div class='del'>-	strncpy(info-&gt;version, DRV_VERSION, ETHTOOL_BUSINFO_LEN);</div><div class='del'>-	strncpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev), ETHTOOL_BUSINFO_LEN);</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_regs_len(struct net_device *dev)</div><div class='head'>diff --git a/drivers/net/ethernet/natsemi/ns83820.c b/drivers/net/ethernet/natsemi/ns83820.c<br/>index 2b8f64ddfb55..c24b46cbfe27 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/natsemi/ns83820.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/natsemi/ns83820.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/natsemi/ns83820.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/natsemi/ns83820.c</a></div><div class='hunk'>@@ -1364,9 +1364,9 @@ static int ns83820_set_settings(struct net_device *ndev,</div><div class='ctx'> static void ns83820_get_drvinfo(struct net_device *ndev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct ns83820 *dev = PRIV(ndev);</div><div class='del'>-	strcpy(info-&gt;driver, "ns83820");</div><div class='del'>-	strcpy(info-&gt;version, VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(dev-&gt;pci_dev));</div><div class='add'>+	strlcpy(info-&gt;driver, "ns83820", sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(dev-&gt;pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 ns83820_get_link(struct net_device *ndev)</div><div class='head'>diff --git a/drivers/net/ethernet/natsemi/xtsonic.c b/drivers/net/ethernet/natsemi/xtsonic.c<br/>index ccf61b9da8d1..e01c0a07a93a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/natsemi/xtsonic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/natsemi/xtsonic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/natsemi/xtsonic.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/natsemi/xtsonic.c</a></div><div class='hunk'>@@ -319,15 +319,4 @@ static struct platform_driver xtsonic_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init xtsonic_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;xtsonic_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit xtsonic_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;xtsonic_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(xtsonic_init);</div><div class='del'>-module_exit(xtsonic_cleanup);</div><div class='add'>+module_platform_driver(xtsonic_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c<br/>index c27fb3dda9f4..97f63e12d86e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/neterion/s2io.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/neterion/s2io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/neterion/s2io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/neterion/s2io.c</a></div><div class='hunk'>@@ -5391,10 +5391,9 @@ static void s2io_ethtool_gdrvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct s2io_nic *sp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strncpy(info-&gt;driver, s2io_driver_name, sizeof(info-&gt;driver));</div><div class='del'>-	strncpy(info-&gt;version, s2io_driver_version, sizeof(info-&gt;version));</div><div class='del'>-	strncpy(info-&gt;fw_version, "", sizeof(info-&gt;fw_version));</div><div class='del'>-	strncpy(info-&gt;bus_info, pci_name(sp-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strlcpy(info-&gt;driver, s2io_driver_name, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, s2io_driver_version, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(sp-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> 	info-&gt;regdump_len = XENA_REG_SPACE;</div><div class='ctx'> 	info-&gt;eedump_len = XENA_EEPROM_SPACE;</div><div class='ctx'> }</div><div class='hunk'>@@ -6616,10 +6615,10 @@ static void s2io_ethtool_get_strings(struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s2io_set_features(struct net_device *dev, u32 features)</div><div class='add'>+static int s2io_set_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct s2io_nic *sp = netdev_priv(dev);</div><div class='del'>-	u32 changed = (features ^ dev-&gt;features) &amp; NETIF_F_LRO;</div><div class='add'>+	netdev_features_t changed = (features ^ dev-&gt;features) &amp; NETIF_F_LRO;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp;&amp; netif_running(dev)) {</div><div class='ctx'> 		int rc;</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 a83197d757c1..ef76725454d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/neterion/vxge/vxge-main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/neterion/vxge/vxge-main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/neterion/vxge/vxge-main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/neterion/vxge/vxge-main.c</a></div><div class='hunk'>@@ -2662,9 +2662,10 @@ static void vxge_poll_vp_lockup(unsigned long data)</div><div class='ctx'> 	mod_timer(&amp;vdev-&gt;vp_lockup_timer, jiffies + HZ / 1000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 vxge_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static netdev_features_t vxge_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='del'>-	u32 changed = dev-&gt;features ^ features;</div><div class='add'>+	netdev_features_t changed = dev-&gt;features ^ features;</div><div class='ctx'> </div><div class='ctx'> 	/* Enabling RTH requires some of the logic in vxge_device_register and a</div><div class='ctx'> 	 * vpath reset.  Due to these restrictions, only allow modification</div><div class='hunk'>@@ -2676,10 +2677,10 @@ static u32 vxge_fix_features(struct net_device *dev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vxge_set_features(struct net_device *dev, u32 features)</div><div class='add'>+static int vxge_set_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct vxgedev *vdev = netdev_priv(dev);</div><div class='del'>-	u32 changed = dev-&gt;features ^ features;</div><div class='add'>+	netdev_features_t changed = dev-&gt;features ^ features;</div><div class='ctx'> </div><div class='ctx'> 	if (!(changed &amp; NETIF_F_RXHASH))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -3304,7 +3305,7 @@ static void vxge_tx_watchdog(struct net_device *dev)</div><div class='ctx'>  *</div><div class='ctx'>  * Add the vlan id to the devices vlan id table</div><div class='ctx'>  */</div><div class='del'>-static void</div><div class='add'>+static int</div><div class='ctx'> vxge_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct vxgedev *vdev = netdev_priv(dev);</div><div class='hunk'>@@ -3319,6 +3320,7 @@ vxge_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> 		vxge_hw_vpath_vid_add(vpath-&gt;handle, vid);</div><div class='ctx'> 	}</div><div class='ctx'> 	set_bit(vid, vdev-&gt;active_vlans);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3328,7 +3330,7 @@ vxge_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'>  *</div><div class='ctx'>  * Remove the vlan id from the device's vlan id table</div><div class='ctx'>  */</div><div class='del'>-static void</div><div class='add'>+static int</div><div class='ctx'> vxge_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct vxgedev *vdev = netdev_priv(dev);</div><div class='hunk'>@@ -3347,6 +3349,7 @@ vxge_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> 	vxge_debug_entryexit(VXGE_TRACE,</div><div class='ctx'> 		"%s:%d  Exiting...", __func__, __LINE__);</div><div class='ctx'> 	clear_bit(vid, vdev-&gt;active_vlans);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops vxge_netdev_ops = {</div><div class='head'>diff --git a/drivers/net/ethernet/nuvoton/w90p910_ether.c b/drivers/net/ethernet/nuvoton/w90p910_ether.c<br/>index f1bfb8f8fcf0..b75a0497d58d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/nuvoton/w90p910_ether.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/nuvoton/w90p910_ether.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/nuvoton/w90p910_ether.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/nuvoton/w90p910_ether.c</a></div><div class='hunk'>@@ -1103,18 +1103,7 @@ static struct platform_driver w90p910_ether_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init w90p910_ether_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;w90p910_ether_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit w90p910_ether_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;w90p910_ether_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(w90p910_ether_init);</div><div class='del'>-module_exit(w90p910_ether_exit);</div><div class='add'>+module_platform_driver(w90p910_ether_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Wan ZongShun &lt;mcuos.com@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("w90p910 MAC driver!");</div><div class='head'>diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c<br/>index 1c61d36e6570..4c4e7f458383 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/nvidia/forcedeth.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/nvidia/forcedeth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/nvidia/forcedeth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/nvidia/forcedeth.c</a></div><div class='hunk'>@@ -65,7 +65,8 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='del'>-#include  &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/u64_stats_sync.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='hunk'>@@ -736,6 +737,16 @@ struct nv_skb_map {</div><div class='ctx'>  * - tx setup is lockless: it relies on netif_tx_lock. Actual submission</div><div class='ctx'>  *	needs netdev_priv(dev)-&gt;lock :-(</div><div class='ctx'>  * - set_multicast_list: preparation lockless, relies on netif_tx_lock.</div><div class='add'>+ *</div><div class='add'>+ * Hardware stats updates are protected by hwstats_lock:</div><div class='add'>+ * - updated by nv_do_stats_poll (timer). This is meant to avoid</div><div class='add'>+ *   integer wraparound in the NIC stats registers, at low frequency</div><div class='add'>+ *   (0.1 Hz)</div><div class='add'>+ * - updated by nv_get_ethtool_stats + nv_get_stats64</div><div class='add'>+ *</div><div class='add'>+ * Software stats are accessed only through 64b synchronization points</div><div class='add'>+ * and are not subject to other synchronization techniques (single</div><div class='add'>+ * update thread on the TX or RX paths).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* in dev: base, irq */</div><div class='hunk'>@@ -745,9 +756,10 @@ struct fe_priv {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct napi_struct napi;</div><div class='ctx'> </div><div class='del'>-	/* General data:</div><div class='del'>-	 * Locking: spin_lock(&amp;np-&gt;lock); */</div><div class='add'>+	/* hardware stats are updated in syscall and timer */</div><div class='add'>+	spinlock_t hwstats_lock;</div><div class='ctx'> 	struct nv_ethtool_stats estats;</div><div class='add'>+</div><div class='ctx'> 	int in_shutdown;</div><div class='ctx'> 	u32 linkspeed;</div><div class='ctx'> 	int duplex;</div><div class='hunk'>@@ -798,6 +810,13 @@ struct fe_priv {</div><div class='ctx'> 	u32 nic_poll_irq;</div><div class='ctx'> 	int rx_ring_size;</div><div class='ctx'> </div><div class='add'>+	/* RX software stats */</div><div class='add'>+	struct u64_stats_sync swstats_rx_syncp;</div><div class='add'>+	u64 stat_rx_packets;</div><div class='add'>+	u64 stat_rx_bytes; /* not always available in HW */</div><div class='add'>+	u64 stat_rx_missed_errors;</div><div class='add'>+	u64 stat_rx_dropped;</div><div class='add'>+</div><div class='ctx'> 	/* media detection workaround.</div><div class='ctx'> 	 * Locking: Within irq hander or disable_irq+spin_lock(&amp;np-&gt;lock);</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -820,6 +839,12 @@ struct fe_priv {</div><div class='ctx'> 	struct nv_skb_map *tx_end_flip;</div><div class='ctx'> 	int tx_stop;</div><div class='ctx'> </div><div class='add'>+	/* TX software stats */</div><div class='add'>+	struct u64_stats_sync swstats_tx_syncp;</div><div class='add'>+	u64 stat_tx_packets; /* not always available in HW */</div><div class='add'>+	u64 stat_tx_bytes;</div><div class='add'>+	u64 stat_tx_dropped;</div><div class='add'>+</div><div class='ctx'> 	/* msi/msi-x fields */</div><div class='ctx'> 	u32 msi_flags;</div><div class='ctx'> 	struct msix_entry msi_x_entry[NV_MSI_X_MAX_VECTORS];</div><div class='hunk'>@@ -892,6 +917,11 @@ enum {</div><div class='ctx'> static int dma_64bit = NV_DMA_64BIT_ENABLED;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Debug output control for tx_timeout</div><div class='add'>+ */</div><div class='add'>+static bool debug_tx_timeout = false;</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Crossover Detection</div><div class='ctx'>  * Realtek 8201 phy + some OEM boards do not work properly.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1630,11 +1660,19 @@ static void nv_mac_reset(struct net_device *dev)</div><div class='ctx'> 	pci_push(base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nv_get_hw_stats(struct net_device *dev)</div><div class='add'>+/* Caller must appropriately lock netdev_priv(dev)-&gt;hwstats_lock */</div><div class='add'>+static void nv_update_stats(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fe_priv *np = netdev_priv(dev);</div><div class='ctx'> 	u8 __iomem *base = get_hwbase(dev);</div><div class='ctx'> </div><div class='add'>+	/* If it happens that this is run in top-half context, then</div><div class='add'>+	 * replace the spin_lock of hwstats_lock with</div><div class='add'>+	 * spin_lock_irqsave() in calling functions. */</div><div class='add'>+	WARN_ONCE(in_irq(), "forcedeth: estats spin_lock(_bh) from top-half");</div><div class='add'>+	assert_spin_locked(&amp;np-&gt;hwstats_lock);</div><div class='add'>+</div><div class='add'>+	/* query hardware */</div><div class='ctx'> 	np-&gt;estats.tx_bytes += readl(base + NvRegTxCnt);</div><div class='ctx'> 	np-&gt;estats.tx_zero_rexmt += readl(base + NvRegTxZeroReXmt);</div><div class='ctx'> 	np-&gt;estats.tx_one_rexmt += readl(base + NvRegTxOneReXmt);</div><div class='hunk'>@@ -1693,40 +1731,73 @@ static void nv_get_hw_stats(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * nv_get_stats: dev-&gt;get_stats function</div><div class='add'>+ * nv_get_stats64: dev-&gt;ndo_get_stats64 function</div><div class='ctx'>  * Get latest stats value from the nic.</div><div class='ctx'>  * Called with read_lock(&amp;dev_base_lock) held for read -</div><div class='ctx'>  * only synchronized against unregister_netdevice.</div><div class='ctx'>  */</div><div class='del'>-static struct net_device_stats *nv_get_stats(struct net_device *dev)</div><div class='add'>+static struct rtnl_link_stats64*</div><div class='add'>+nv_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *storage)</div><div class='add'>+	__acquires(&amp;netdev_priv(dev)-&gt;hwstats_lock)</div><div class='add'>+	__releases(&amp;netdev_priv(dev)-&gt;hwstats_lock)</div><div class='ctx'> {</div><div class='ctx'> 	struct fe_priv *np = netdev_priv(dev);</div><div class='add'>+	unsigned int syncp_start;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Note: because HW stats are not always available and for</div><div class='add'>+	 * consistency reasons, the following ifconfig stats are</div><div class='add'>+	 * managed by software: rx_bytes, tx_bytes, rx_packets and</div><div class='add'>+	 * tx_packets. The related hardware stats reported by ethtool</div><div class='add'>+	 * should be equivalent to these ifconfig stats, with 4</div><div class='add'>+	 * additional bytes per packet (Ethernet FCS CRC), except for</div><div class='add'>+	 * tx_packets when TSO kicks in.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* software stats */</div><div class='add'>+	do {</div><div class='add'>+		syncp_start = u64_stats_fetch_begin_bh(&amp;np-&gt;swstats_rx_syncp);</div><div class='add'>+		storage-&gt;rx_packets       = np-&gt;stat_rx_packets;</div><div class='add'>+		storage-&gt;rx_bytes         = np-&gt;stat_rx_bytes;</div><div class='add'>+		storage-&gt;rx_dropped       = np-&gt;stat_rx_dropped;</div><div class='add'>+		storage-&gt;rx_missed_errors = np-&gt;stat_rx_missed_errors;</div><div class='add'>+	} while (u64_stats_fetch_retry_bh(&amp;np-&gt;swstats_rx_syncp, syncp_start));</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		syncp_start = u64_stats_fetch_begin_bh(&amp;np-&gt;swstats_tx_syncp);</div><div class='add'>+		storage-&gt;tx_packets = np-&gt;stat_tx_packets;</div><div class='add'>+		storage-&gt;tx_bytes   = np-&gt;stat_tx_bytes;</div><div class='add'>+		storage-&gt;tx_dropped = np-&gt;stat_tx_dropped;</div><div class='add'>+	} while (u64_stats_fetch_retry_bh(&amp;np-&gt;swstats_tx_syncp, syncp_start));</div><div class='ctx'> </div><div class='ctx'> 	/* If the nic supports hw counters then retrieve latest values */</div><div class='del'>-	if (np-&gt;driver_data &amp; (DEV_HAS_STATISTICS_V1|DEV_HAS_STATISTICS_V2|DEV_HAS_STATISTICS_V3)) {</div><div class='del'>-		nv_get_hw_stats(dev);</div><div class='add'>+	if (np-&gt;driver_data &amp; DEV_HAS_STATISTICS_V123) {</div><div class='add'>+		spin_lock_bh(&amp;np-&gt;hwstats_lock);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Note: because HW stats are not always available and</div><div class='del'>-		 * for consistency reasons, the following ifconfig</div><div class='del'>-		 * stats are managed by software: rx_bytes, tx_bytes,</div><div class='del'>-		 * rx_packets and tx_packets. The related hardware</div><div class='del'>-		 * stats reported by ethtool should be equivalent to</div><div class='del'>-		 * these ifconfig stats, with 4 additional bytes per</div><div class='del'>-		 * packet (Ethernet FCS CRC).</div><div class='del'>-		 */</div><div class='add'>+		nv_update_stats(dev);</div><div class='add'>+</div><div class='add'>+		/* generic stats */</div><div class='add'>+		storage-&gt;rx_errors = np-&gt;estats.rx_errors_total;</div><div class='add'>+		storage-&gt;tx_errors = np-&gt;estats.tx_errors_total;</div><div class='ctx'> </div><div class='del'>-		/* copy to net_device stats */</div><div class='del'>-		dev-&gt;stats.tx_fifo_errors = np-&gt;estats.tx_fifo_errors;</div><div class='del'>-		dev-&gt;stats.tx_carrier_errors = np-&gt;estats.tx_carrier_errors;</div><div class='del'>-		dev-&gt;stats.rx_crc_errors = np-&gt;estats.rx_crc_errors;</div><div class='del'>-		dev-&gt;stats.rx_over_errors = np-&gt;estats.rx_over_errors;</div><div class='del'>-		dev-&gt;stats.rx_fifo_errors = np-&gt;estats.rx_drop_frame;</div><div class='del'>-		dev-&gt;stats.rx_errors = np-&gt;estats.rx_errors_total;</div><div class='del'>-		dev-&gt;stats.tx_errors = np-&gt;estats.tx_errors_total;</div><div class='add'>+		/* meaningful only when NIC supports stats v3 */</div><div class='add'>+		storage-&gt;multicast = np-&gt;estats.rx_multicast;</div><div class='add'>+</div><div class='add'>+		/* detailed rx_errors */</div><div class='add'>+		storage-&gt;rx_length_errors = np-&gt;estats.rx_length_error;</div><div class='add'>+		storage-&gt;rx_over_errors   = np-&gt;estats.rx_over_errors;</div><div class='add'>+		storage-&gt;rx_crc_errors    = np-&gt;estats.rx_crc_errors;</div><div class='add'>+		storage-&gt;rx_frame_errors  = np-&gt;estats.rx_frame_align_error;</div><div class='add'>+		storage-&gt;rx_fifo_errors   = np-&gt;estats.rx_drop_frame;</div><div class='add'>+</div><div class='add'>+		/* detailed tx_errors */</div><div class='add'>+		storage-&gt;tx_carrier_errors = np-&gt;estats.tx_carrier_errors;</div><div class='add'>+		storage-&gt;tx_fifo_errors    = np-&gt;estats.tx_fifo_errors;</div><div class='add'>+</div><div class='add'>+		spin_unlock_bh(&amp;np-&gt;hwstats_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return &amp;dev-&gt;stats;</div><div class='add'>+	return storage;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1759,8 +1830,12 @@ static int nv_alloc_rx(struct net_device *dev)</div><div class='ctx'> 				np-&gt;put_rx.orig = np-&gt;first_rx.orig;</div><div class='ctx'> 			if (unlikely(np-&gt;put_rx_ctx++ == np-&gt;last_rx_ctx))</div><div class='ctx'> 				np-&gt;put_rx_ctx = np-&gt;first_rx_ctx;</div><div class='del'>-		} else</div><div class='add'>+		} else {</div><div class='add'>+			u64_stats_update_begin(&amp;np-&gt;swstats_rx_syncp);</div><div class='add'>+			np-&gt;stat_rx_dropped++;</div><div class='add'>+			u64_stats_update_end(&amp;np-&gt;swstats_rx_syncp);</div><div class='ctx'> 			return 1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1791,8 +1866,12 @@ static int nv_alloc_rx_optimized(struct net_device *dev)</div><div class='ctx'> 				np-&gt;put_rx.ex = np-&gt;first_rx.ex;</div><div class='ctx'> 			if (unlikely(np-&gt;put_rx_ctx++ == np-&gt;last_rx_ctx))</div><div class='ctx'> 				np-&gt;put_rx_ctx = np-&gt;first_rx_ctx;</div><div class='del'>-		} else</div><div class='add'>+		} else {</div><div class='add'>+			u64_stats_update_begin(&amp;np-&gt;swstats_rx_syncp);</div><div class='add'>+			np-&gt;stat_rx_dropped++;</div><div class='add'>+			u64_stats_update_end(&amp;np-&gt;swstats_rx_syncp);</div><div class='ctx'> 			return 1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1849,6 +1928,7 @@ static void nv_init_tx(struct net_device *dev)</div><div class='ctx'> 		np-&gt;last_tx.ex = &amp;np-&gt;tx_ring.ex[np-&gt;tx_ring_size-1];</div><div class='ctx'> 	np-&gt;get_tx_ctx = np-&gt;put_tx_ctx = np-&gt;first_tx_ctx = np-&gt;tx_skb;</div><div class='ctx'> 	np-&gt;last_tx_ctx = &amp;np-&gt;tx_skb[np-&gt;tx_ring_size-1];</div><div class='add'>+	netdev_reset_queue(np-&gt;dev);</div><div class='ctx'> 	np-&gt;tx_pkts_in_progress = 0;</div><div class='ctx'> 	np-&gt;tx_change_owner = NULL;</div><div class='ctx'> 	np-&gt;tx_end_flip = NULL;</div><div class='hunk'>@@ -1927,8 +2007,11 @@ static void nv_drain_tx(struct net_device *dev)</div><div class='ctx'> 			np-&gt;tx_ring.ex[i].bufhigh = 0;</div><div class='ctx'> 			np-&gt;tx_ring.ex[i].buflow = 0;</div><div class='ctx'> 		}</div><div class='del'>-		if (nv_release_txskb(np, &amp;np-&gt;tx_skb[i]))</div><div class='del'>-			dev-&gt;stats.tx_dropped++;</div><div class='add'>+		if (nv_release_txskb(np, &amp;np-&gt;tx_skb[i])) {</div><div class='add'>+			u64_stats_update_begin(&amp;np-&gt;swstats_tx_syncp);</div><div class='add'>+			np-&gt;stat_tx_dropped++;</div><div class='add'>+			u64_stats_update_end(&amp;np-&gt;swstats_tx_syncp);</div><div class='add'>+		}</div><div class='ctx'> 		np-&gt;tx_skb[i].dma = 0;</div><div class='ctx'> 		np-&gt;tx_skb[i].dma_len = 0;</div><div class='ctx'> 		np-&gt;tx_skb[i].dma_single = 0;</div><div class='hunk'>@@ -2194,6 +2277,9 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* set tx flags */</div><div class='ctx'> 	start_tx-&gt;flaglen |= cpu_to_le32(tx_flags | tx_flags_extra);</div><div class='add'>+</div><div class='add'>+	netdev_sent_queue(np-&gt;dev, skb-&gt;len);</div><div class='add'>+</div><div class='ctx'> 	np-&gt;put_tx.orig = put_tx;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;np-&gt;lock, flags);</div><div class='hunk'>@@ -2338,6 +2424,9 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	/* set tx flags */</div><div class='ctx'> 	start_tx-&gt;flaglen |= cpu_to_le32(tx_flags | tx_flags_extra);</div><div class='add'>+</div><div class='add'>+	netdev_sent_queue(np-&gt;dev, skb-&gt;len);</div><div class='add'>+</div><div class='ctx'> 	np-&gt;put_tx.ex = put_tx;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;np-&gt;lock, flags);</div><div class='hunk'>@@ -2375,6 +2464,7 @@ static int nv_tx_done(struct net_device *dev, int limit)</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	int tx_work = 0;</div><div class='ctx'> 	struct ring_desc *orig_get_tx = np-&gt;get_tx.orig;</div><div class='add'>+	unsigned int bytes_compl = 0;</div><div class='ctx'> </div><div class='ctx'> 	while ((np-&gt;get_tx.orig != np-&gt;put_tx.orig) &amp;&amp;</div><div class='ctx'> 	       !((flags = le32_to_cpu(np-&gt;get_tx.orig-&gt;flaglen)) &amp; NV_TX_VALID) &amp;&amp;</div><div class='hunk'>@@ -2385,12 +2475,16 @@ static int nv_tx_done(struct net_device *dev, int limit)</div><div class='ctx'> 		if (np-&gt;desc_ver == DESC_VER_1) {</div><div class='ctx'> 			if (flags &amp; NV_TX_LASTPACKET) {</div><div class='ctx'> 				if (flags &amp; NV_TX_ERROR) {</div><div class='del'>-					if ((flags &amp; NV_TX_RETRYERROR) &amp;&amp; !(flags &amp; NV_TX_RETRYCOUNT_MASK))</div><div class='add'>+					if ((flags &amp; NV_TX_RETRYERROR)</div><div class='add'>+					    &amp;&amp; !(flags &amp; NV_TX_RETRYCOUNT_MASK))</div><div class='ctx'> 						nv_legacybackoff_reseed(dev);</div><div class='ctx'> 				} else {</div><div class='del'>-					dev-&gt;stats.tx_packets++;</div><div class='del'>-					dev-&gt;stats.tx_bytes += np-&gt;get_tx_ctx-&gt;skb-&gt;len;</div><div class='add'>+					u64_stats_update_begin(&amp;np-&gt;swstats_tx_syncp);</div><div class='add'>+					np-&gt;stat_tx_packets++;</div><div class='add'>+					np-&gt;stat_tx_bytes += np-&gt;get_tx_ctx-&gt;skb-&gt;len;</div><div class='add'>+					u64_stats_update_end(&amp;np-&gt;swstats_tx_syncp);</div><div class='ctx'> 				}</div><div class='add'>+				bytes_compl += np-&gt;get_tx_ctx-&gt;skb-&gt;len;</div><div class='ctx'> 				dev_kfree_skb_any(np-&gt;get_tx_ctx-&gt;skb);</div><div class='ctx'> 				np-&gt;get_tx_ctx-&gt;skb = NULL;</div><div class='ctx'> 				tx_work++;</div><div class='hunk'>@@ -2398,12 +2492,16 @@ static int nv_tx_done(struct net_device *dev, int limit)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (flags &amp; NV_TX2_LASTPACKET) {</div><div class='ctx'> 				if (flags &amp; NV_TX2_ERROR) {</div><div class='del'>-					if ((flags &amp; NV_TX2_RETRYERROR) &amp;&amp; !(flags &amp; NV_TX2_RETRYCOUNT_MASK))</div><div class='add'>+					if ((flags &amp; NV_TX2_RETRYERROR)</div><div class='add'>+					    &amp;&amp; !(flags &amp; NV_TX2_RETRYCOUNT_MASK))</div><div class='ctx'> 						nv_legacybackoff_reseed(dev);</div><div class='ctx'> 				} else {</div><div class='del'>-					dev-&gt;stats.tx_packets++;</div><div class='del'>-					dev-&gt;stats.tx_bytes += np-&gt;get_tx_ctx-&gt;skb-&gt;len;</div><div class='add'>+					u64_stats_update_begin(&amp;np-&gt;swstats_tx_syncp);</div><div class='add'>+					np-&gt;stat_tx_packets++;</div><div class='add'>+					np-&gt;stat_tx_bytes += np-&gt;get_tx_ctx-&gt;skb-&gt;len;</div><div class='add'>+					u64_stats_update_end(&amp;np-&gt;swstats_tx_syncp);</div><div class='ctx'> 				}</div><div class='add'>+				bytes_compl += np-&gt;get_tx_ctx-&gt;skb-&gt;len;</div><div class='ctx'> 				dev_kfree_skb_any(np-&gt;get_tx_ctx-&gt;skb);</div><div class='ctx'> 				np-&gt;get_tx_ctx-&gt;skb = NULL;</div><div class='ctx'> 				tx_work++;</div><div class='hunk'>@@ -2414,6 +2512,9 @@ static int nv_tx_done(struct net_device *dev, int limit)</div><div class='ctx'> 		if (unlikely(np-&gt;get_tx_ctx++ == np-&gt;last_tx_ctx))</div><div class='ctx'> 			np-&gt;get_tx_ctx = np-&gt;first_tx_ctx;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	netdev_completed_queue(np-&gt;dev, tx_work, bytes_compl);</div><div class='add'>+</div><div class='ctx'> 	if (unlikely((np-&gt;tx_stop == 1) &amp;&amp; (np-&gt;get_tx.orig != orig_get_tx))) {</div><div class='ctx'> 		np-&gt;tx_stop = 0;</div><div class='ctx'> 		netif_wake_queue(dev);</div><div class='hunk'>@@ -2427,6 +2528,7 @@ static int nv_tx_done_optimized(struct net_device *dev, int limit)</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	int tx_work = 0;</div><div class='ctx'> 	struct ring_desc_ex *orig_get_tx = np-&gt;get_tx.ex;</div><div class='add'>+	unsigned long bytes_cleaned = 0;</div><div class='ctx'> </div><div class='ctx'> 	while ((np-&gt;get_tx.ex != np-&gt;put_tx.ex) &amp;&amp;</div><div class='ctx'> 	       !((flags = le32_to_cpu(np-&gt;get_tx.ex-&gt;flaglen)) &amp; NV_TX2_VALID) &amp;&amp;</div><div class='hunk'>@@ -2436,17 +2538,21 @@ static int nv_tx_done_optimized(struct net_device *dev, int limit)</div><div class='ctx'> </div><div class='ctx'> 		if (flags &amp; NV_TX2_LASTPACKET) {</div><div class='ctx'> 			if (flags &amp; NV_TX2_ERROR) {</div><div class='del'>-				if ((flags &amp; NV_TX2_RETRYERROR) &amp;&amp; !(flags &amp; NV_TX2_RETRYCOUNT_MASK)) {</div><div class='add'>+				if ((flags &amp; NV_TX2_RETRYERROR)</div><div class='add'>+				    &amp;&amp; !(flags &amp; NV_TX2_RETRYCOUNT_MASK)) {</div><div class='ctx'> 					if (np-&gt;driver_data &amp; DEV_HAS_GEAR_MODE)</div><div class='ctx'> 						nv_gear_backoff_reseed(dev);</div><div class='ctx'> 					else</div><div class='ctx'> 						nv_legacybackoff_reseed(dev);</div><div class='ctx'> 				}</div><div class='ctx'> 			} else {</div><div class='del'>-				dev-&gt;stats.tx_packets++;</div><div class='del'>-				dev-&gt;stats.tx_bytes += np-&gt;get_tx_ctx-&gt;skb-&gt;len;</div><div class='add'>+				u64_stats_update_begin(&amp;np-&gt;swstats_tx_syncp);</div><div class='add'>+				np-&gt;stat_tx_packets++;</div><div class='add'>+				np-&gt;stat_tx_bytes += np-&gt;get_tx_ctx-&gt;skb-&gt;len;</div><div class='add'>+				u64_stats_update_end(&amp;np-&gt;swstats_tx_syncp);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='add'>+			bytes_cleaned += np-&gt;get_tx_ctx-&gt;skb-&gt;len;</div><div class='ctx'> 			dev_kfree_skb_any(np-&gt;get_tx_ctx-&gt;skb);</div><div class='ctx'> 			np-&gt;get_tx_ctx-&gt;skb = NULL;</div><div class='ctx'> 			tx_work++;</div><div class='hunk'>@@ -2454,11 +2560,15 @@ static int nv_tx_done_optimized(struct net_device *dev, int limit)</div><div class='ctx'> 			if (np-&gt;tx_limit)</div><div class='ctx'> 				nv_tx_flip_ownership(dev);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		if (unlikely(np-&gt;get_tx.ex++ == np-&gt;last_tx.ex))</div><div class='ctx'> 			np-&gt;get_tx.ex = np-&gt;first_tx.ex;</div><div class='ctx'> 		if (unlikely(np-&gt;get_tx_ctx++ == np-&gt;last_tx_ctx))</div><div class='ctx'> 			np-&gt;get_tx_ctx = np-&gt;first_tx_ctx;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	netdev_completed_queue(np-&gt;dev, tx_work, bytes_cleaned);</div><div class='add'>+</div><div class='ctx'> 	if (unlikely((np-&gt;tx_stop == 1) &amp;&amp; (np-&gt;get_tx.ex != orig_get_tx))) {</div><div class='ctx'> 		np-&gt;tx_stop = 0;</div><div class='ctx'> 		netif_wake_queue(dev);</div><div class='hunk'>@@ -2477,56 +2587,64 @@ static void nv_tx_timeout(struct net_device *dev)</div><div class='ctx'> 	u32 status;</div><div class='ctx'> 	union ring_type put_tx;</div><div class='ctx'> 	int saved_tx_limit;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (np-&gt;msi_flags &amp; NV_MSI_X_ENABLED)</div><div class='ctx'> 		status = readl(base + NvRegMSIXIrqStatus) &amp; NVREG_IRQSTAT_MASK;</div><div class='ctx'> 	else</div><div class='ctx'> 		status = readl(base + NvRegIrqStatus) &amp; NVREG_IRQSTAT_MASK;</div><div class='ctx'> </div><div class='del'>-	netdev_info(dev, "Got tx_timeout. irq: %08x\n", status);</div><div class='add'>+	netdev_warn(dev, "Got tx_timeout. irq status: %08x\n", status);</div><div class='ctx'> </div><div class='del'>-	netdev_info(dev, "Ring at %lx\n", (unsigned long)np-&gt;ring_addr);</div><div class='del'>-	netdev_info(dev, "Dumping tx registers\n");</div><div class='del'>-	for (i = 0; i &lt;= np-&gt;register_size; i += 32) {</div><div class='del'>-		netdev_info(dev,</div><div class='del'>-			    "%3x: %08x %08x %08x %08x %08x %08x %08x %08x\n",</div><div class='del'>-			    i,</div><div class='del'>-			    readl(base + i + 0), readl(base + i + 4),</div><div class='del'>-			    readl(base + i + 8), readl(base + i + 12),</div><div class='del'>-			    readl(base + i + 16), readl(base + i + 20),</div><div class='del'>-			    readl(base + i + 24), readl(base + i + 28));</div><div class='del'>-	}</div><div class='del'>-	netdev_info(dev, "Dumping tx ring\n");</div><div class='del'>-	for (i = 0; i &lt; np-&gt;tx_ring_size; i += 4) {</div><div class='del'>-		if (!nv_optimized(np)) {</div><div class='del'>-			netdev_info(dev,</div><div class='del'>-				    "%03x: %08x %08x // %08x %08x // %08x %08x // %08x %08x\n",</div><div class='del'>-				    i,</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.orig[i].buf),</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.orig[i].flaglen),</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.orig[i+1].buf),</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.orig[i+1].flaglen),</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.orig[i+2].buf),</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.orig[i+2].flaglen),</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.orig[i+3].buf),</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.orig[i+3].flaglen));</div><div class='del'>-		} else {</div><div class='add'>+	if (unlikely(debug_tx_timeout)) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		netdev_info(dev, "Ring at %lx\n", (unsigned long)np-&gt;ring_addr);</div><div class='add'>+		netdev_info(dev, "Dumping tx registers\n");</div><div class='add'>+		for (i = 0; i &lt;= np-&gt;register_size; i += 32) {</div><div class='ctx'> 			netdev_info(dev,</div><div class='del'>-				    "%03x: %08x %08x %08x // %08x %08x %08x // %08x %08x %08x // %08x %08x %08x\n",</div><div class='add'>+				    "%3x: %08x %08x %08x %08x "</div><div class='add'>+				    "%08x %08x %08x %08x\n",</div><div class='ctx'> 				    i,</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.ex[i].bufhigh),</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.ex[i].buflow),</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.ex[i].flaglen),</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.ex[i+1].bufhigh),</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.ex[i+1].buflow),</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.ex[i+1].flaglen),</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.ex[i+2].bufhigh),</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.ex[i+2].buflow),</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.ex[i+2].flaglen),</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.ex[i+3].bufhigh),</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.ex[i+3].buflow),</div><div class='del'>-				    le32_to_cpu(np-&gt;tx_ring.ex[i+3].flaglen));</div><div class='add'>+				    readl(base + i + 0), readl(base + i + 4),</div><div class='add'>+				    readl(base + i + 8), readl(base + i + 12),</div><div class='add'>+				    readl(base + i + 16), readl(base + i + 20),</div><div class='add'>+				    readl(base + i + 24), readl(base + i + 28));</div><div class='add'>+		}</div><div class='add'>+		netdev_info(dev, "Dumping tx ring\n");</div><div class='add'>+		for (i = 0; i &lt; np-&gt;tx_ring_size; i += 4) {</div><div class='add'>+			if (!nv_optimized(np)) {</div><div class='add'>+				netdev_info(dev,</div><div class='add'>+					    "%03x: %08x %08x // %08x %08x "</div><div class='add'>+					    "// %08x %08x // %08x %08x\n",</div><div class='add'>+					    i,</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.orig[i].buf),</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.orig[i].flaglen),</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.orig[i+1].buf),</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.orig[i+1].flaglen),</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.orig[i+2].buf),</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.orig[i+2].flaglen),</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.orig[i+3].buf),</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.orig[i+3].flaglen));</div><div class='add'>+			} else {</div><div class='add'>+				netdev_info(dev,</div><div class='add'>+					    "%03x: %08x %08x %08x "</div><div class='add'>+					    "// %08x %08x %08x "</div><div class='add'>+					    "// %08x %08x %08x "</div><div class='add'>+					    "// %08x %08x %08x\n",</div><div class='add'>+					    i,</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.ex[i].bufhigh),</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.ex[i].buflow),</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.ex[i].flaglen),</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.ex[i+1].bufhigh),</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.ex[i+1].buflow),</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.ex[i+1].flaglen),</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.ex[i+2].bufhigh),</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.ex[i+2].buflow),</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.ex[i+2].flaglen),</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.ex[i+3].bufhigh),</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.ex[i+3].buflow),</div><div class='add'>+					    le32_to_cpu(np-&gt;tx_ring.ex[i+3].flaglen));</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2649,8 +2767,11 @@ static int nv_rx_process(struct net_device *dev, int limit)</div><div class='ctx'> 					}</div><div class='ctx'> 					/* the rest are hard errors */</div><div class='ctx'> 					else {</div><div class='del'>-						if (flags &amp; NV_RX_MISSEDFRAME)</div><div class='del'>-							dev-&gt;stats.rx_missed_errors++;</div><div class='add'>+						if (flags &amp; NV_RX_MISSEDFRAME) {</div><div class='add'>+							u64_stats_update_begin(&amp;np-&gt;swstats_rx_syncp);</div><div class='add'>+							np-&gt;stat_rx_missed_errors++;</div><div class='add'>+							u64_stats_update_end(&amp;np-&gt;swstats_rx_syncp);</div><div class='add'>+						}</div><div class='ctx'> 						dev_kfree_skb(skb);</div><div class='ctx'> 						goto next_pkt;</div><div class='ctx'> 					}</div><div class='hunk'>@@ -2693,8 +2814,10 @@ static int nv_rx_process(struct net_device *dev, int limit)</div><div class='ctx'> 		skb_put(skb, len);</div><div class='ctx'> 		skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='ctx'> 		napi_gro_receive(&amp;np-&gt;napi, skb);</div><div class='del'>-		dev-&gt;stats.rx_packets++;</div><div class='del'>-		dev-&gt;stats.rx_bytes += len;</div><div class='add'>+		u64_stats_update_begin(&amp;np-&gt;swstats_rx_syncp);</div><div class='add'>+		np-&gt;stat_rx_packets++;</div><div class='add'>+		np-&gt;stat_rx_bytes += len;</div><div class='add'>+		u64_stats_update_end(&amp;np-&gt;swstats_rx_syncp);</div><div class='ctx'> next_pkt:</div><div class='ctx'> 		if (unlikely(np-&gt;get_rx.orig++ == np-&gt;last_rx.orig))</div><div class='ctx'> 			np-&gt;get_rx.orig = np-&gt;first_rx.orig;</div><div class='hunk'>@@ -2777,8 +2900,10 @@ static int nv_rx_process_optimized(struct net_device *dev, int limit)</div><div class='ctx'> 				__vlan_hwaccel_put_tag(skb, vid);</div><div class='ctx'> 			}</div><div class='ctx'> 			napi_gro_receive(&amp;np-&gt;napi, skb);</div><div class='del'>-			dev-&gt;stats.rx_packets++;</div><div class='del'>-			dev-&gt;stats.rx_bytes += len;</div><div class='add'>+			u64_stats_update_begin(&amp;np-&gt;swstats_rx_syncp);</div><div class='add'>+			np-&gt;stat_rx_packets++;</div><div class='add'>+			np-&gt;stat_rx_bytes += len;</div><div class='add'>+			u64_stats_update_end(&amp;np-&gt;swstats_rx_syncp);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3021,6 +3146,73 @@ static void nv_update_pause(struct net_device *dev, u32 pause_flags)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void nv_force_linkspeed(struct net_device *dev, int speed, int duplex)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='add'>+	u8 __iomem *base = get_hwbase(dev);</div><div class='add'>+	u32 phyreg, txreg;</div><div class='add'>+	int mii_status;</div><div class='add'>+</div><div class='add'>+	np-&gt;linkspeed = NVREG_LINKSPEED_FORCE|speed;</div><div class='add'>+	np-&gt;duplex = duplex;</div><div class='add'>+</div><div class='add'>+	/* see if gigabit phy */</div><div class='add'>+	mii_status = mii_rw(dev, np-&gt;phyaddr, MII_BMSR, MII_READ);</div><div class='add'>+	if (mii_status &amp; PHY_GIGABIT) {</div><div class='add'>+		np-&gt;gigabit = PHY_GIGABIT;</div><div class='add'>+		phyreg = readl(base + NvRegSlotTime);</div><div class='add'>+		phyreg &amp;= ~(0x3FF00);</div><div class='add'>+		if ((np-&gt;linkspeed &amp; 0xFFF) == NVREG_LINKSPEED_10)</div><div class='add'>+			phyreg |= NVREG_SLOTTIME_10_100_FULL;</div><div class='add'>+		else if ((np-&gt;linkspeed &amp; 0xFFF) == NVREG_LINKSPEED_100)</div><div class='add'>+			phyreg |= NVREG_SLOTTIME_10_100_FULL;</div><div class='add'>+		else if ((np-&gt;linkspeed &amp; 0xFFF) == NVREG_LINKSPEED_1000)</div><div class='add'>+			phyreg |= NVREG_SLOTTIME_1000_FULL;</div><div class='add'>+		writel(phyreg, base + NvRegSlotTime);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	phyreg = readl(base + NvRegPhyInterface);</div><div class='add'>+	phyreg &amp;= ~(PHY_HALF|PHY_100|PHY_1000);</div><div class='add'>+	if (np-&gt;duplex == 0)</div><div class='add'>+		phyreg |= PHY_HALF;</div><div class='add'>+	if ((np-&gt;linkspeed &amp; NVREG_LINKSPEED_MASK) == NVREG_LINKSPEED_100)</div><div class='add'>+		phyreg |= PHY_100;</div><div class='add'>+	else if ((np-&gt;linkspeed &amp; NVREG_LINKSPEED_MASK) ==</div><div class='add'>+							NVREG_LINKSPEED_1000)</div><div class='add'>+		phyreg |= PHY_1000;</div><div class='add'>+	writel(phyreg, base + NvRegPhyInterface);</div><div class='add'>+</div><div class='add'>+	if (phyreg &amp; PHY_RGMII) {</div><div class='add'>+		if ((np-&gt;linkspeed &amp; NVREG_LINKSPEED_MASK) ==</div><div class='add'>+							NVREG_LINKSPEED_1000)</div><div class='add'>+			txreg = NVREG_TX_DEFERRAL_RGMII_1000;</div><div class='add'>+		else</div><div class='add'>+			txreg = NVREG_TX_DEFERRAL_RGMII_10_100;</div><div class='add'>+	} else {</div><div class='add'>+		txreg = NVREG_TX_DEFERRAL_DEFAULT;</div><div class='add'>+	}</div><div class='add'>+	writel(txreg, base + NvRegTxDeferral);</div><div class='add'>+</div><div class='add'>+	if (np-&gt;desc_ver == DESC_VER_1) {</div><div class='add'>+		txreg = NVREG_TX_WM_DESC1_DEFAULT;</div><div class='add'>+	} else {</div><div class='add'>+		if ((np-&gt;linkspeed &amp; NVREG_LINKSPEED_MASK) ==</div><div class='add'>+					 NVREG_LINKSPEED_1000)</div><div class='add'>+			txreg = NVREG_TX_WM_DESC2_3_1000;</div><div class='add'>+		else</div><div class='add'>+			txreg = NVREG_TX_WM_DESC2_3_DEFAULT;</div><div class='add'>+	}</div><div class='add'>+	writel(txreg, base + NvRegTxWatermark);</div><div class='add'>+</div><div class='add'>+	writel(NVREG_MISC1_FORCE | (np-&gt;duplex ? 0 : NVREG_MISC1_HD),</div><div class='add'>+			base + NvRegMisc1);</div><div class='add'>+	pci_push(base);</div><div class='add'>+	writel(np-&gt;linkspeed, base + NvRegLinkSpeed);</div><div class='add'>+	pci_push(base);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * nv_update_linkspeed: Setup the MAC according to the link partner</div><div class='ctx'>  * @dev: Network device to be configured</div><div class='hunk'>@@ -3042,11 +3234,25 @@ static int nv_update_linkspeed(struct net_device *dev)</div><div class='ctx'> 	int newls = np-&gt;linkspeed;</div><div class='ctx'> 	int newdup = np-&gt;duplex;</div><div class='ctx'> 	int mii_status;</div><div class='add'>+	u32 bmcr;</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> 	u32 control_1000, status_1000, phyreg, pause_flags, txreg;</div><div class='ctx'> 	u32 txrxFlags = 0;</div><div class='ctx'> 	u32 phy_exp;</div><div class='ctx'> </div><div class='add'>+	/* If device loopback is enabled, set carrier on and enable max link</div><div class='add'>+	 * speed.</div><div class='add'>+	 */</div><div class='add'>+	bmcr = mii_rw(dev, np-&gt;phyaddr, MII_BMCR, MII_READ);</div><div class='add'>+	if (bmcr &amp; BMCR_LOOPBACK) {</div><div class='add'>+		if (netif_running(dev)) {</div><div class='add'>+			nv_force_linkspeed(dev, NVREG_LINKSPEED_1000, 1);</div><div class='add'>+			if (!netif_carrier_ok(dev))</div><div class='add'>+				netif_carrier_on(dev);</div><div class='add'>+		}</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* BMSR_LSTATUS is latched, read it twice:</div><div class='ctx'> 	 * we want the current value.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -3729,6 +3935,7 @@ static int nv_request_irq(struct net_device *dev, int intr_test)</div><div class='ctx'> 				writel(0, base + NvRegMSIXMap0);</div><div class='ctx'> 				writel(0, base + NvRegMSIXMap1);</div><div class='ctx'> 			}</div><div class='add'>+			netdev_info(dev, "MSI-X enabled\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret != 0 &amp;&amp; np-&gt;msi_flags &amp; NV_MSI_CAPABLE) {</div><div class='hunk'>@@ -3750,6 +3957,7 @@ static int nv_request_irq(struct net_device *dev, int intr_test)</div><div class='ctx'> 			writel(0, base + NvRegMSIMap1);</div><div class='ctx'> 			/* enable msi vector 0 */</div><div class='ctx'> 			writel(NVREG_MSI_VECTOR_0_ENABLED, base + NvRegMSIIrqMask);</div><div class='add'>+			netdev_info(dev, "MSI enabled\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret != 0) {</div><div class='hunk'>@@ -3904,11 +4112,18 @@ static void nv_poll_controller(struct net_device *dev)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void nv_do_stats_poll(unsigned long data)</div><div class='add'>+	__acquires(&amp;netdev_priv(dev)-&gt;hwstats_lock)</div><div class='add'>+	__releases(&amp;netdev_priv(dev)-&gt;hwstats_lock)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = (struct net_device *) data;</div><div class='ctx'> 	struct fe_priv *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	nv_get_hw_stats(dev);</div><div class='add'>+	/* If lock is currently taken, the stats are being refreshed</div><div class='add'>+	 * and hence fresh enough */</div><div class='add'>+	if (spin_trylock(&amp;np-&gt;hwstats_lock)) {</div><div class='add'>+		nv_update_stats(dev);</div><div class='add'>+		spin_unlock(&amp;np-&gt;hwstats_lock);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!np-&gt;in_shutdown)</div><div class='ctx'> 		mod_timer(&amp;np-&gt;stats_poll,</div><div class='hunk'>@@ -3918,9 +4133,9 @@ static void nv_do_stats_poll(unsigned long data)</div><div class='ctx'> static void nv_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct fe_priv *np = netdev_priv(dev);</div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, FORCEDETH_VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, FORCEDETH_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nv_get_wol(struct net_device *dev, struct ethtool_wolinfo *wolinfo)</div><div class='hunk'>@@ -4473,7 +4688,63 @@ static int nv_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam*</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 nv_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static int nv_set_loopback(struct net_device *dev, netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 miicontrol;</div><div class='add'>+	int err, retval = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;np-&gt;lock, flags);</div><div class='add'>+	miicontrol = mii_rw(dev, np-&gt;phyaddr, MII_BMCR, MII_READ);</div><div class='add'>+	if (features &amp; NETIF_F_LOOPBACK) {</div><div class='add'>+		if (miicontrol &amp; BMCR_LOOPBACK) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;np-&gt;lock, flags);</div><div class='add'>+			netdev_info(dev, "Loopback already enabled\n");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		nv_disable_irq(dev);</div><div class='add'>+		/* Turn on loopback mode */</div><div class='add'>+		miicontrol |= BMCR_LOOPBACK | BMCR_FULLDPLX | BMCR_SPEED1000;</div><div class='add'>+		err = mii_rw(dev, np-&gt;phyaddr, MII_BMCR, miicontrol);</div><div class='add'>+		if (err) {</div><div class='add'>+			retval = PHY_ERROR;</div><div class='add'>+			spin_unlock_irqrestore(&amp;np-&gt;lock, flags);</div><div class='add'>+			phy_init(dev);</div><div class='add'>+		} else {</div><div class='add'>+			if (netif_running(dev)) {</div><div class='add'>+				/* Force 1000 Mbps full-duplex */</div><div class='add'>+				nv_force_linkspeed(dev, NVREG_LINKSPEED_1000,</div><div class='add'>+									 1);</div><div class='add'>+				/* Force link up */</div><div class='add'>+				netif_carrier_on(dev);</div><div class='add'>+			}</div><div class='add'>+			spin_unlock_irqrestore(&amp;np-&gt;lock, flags);</div><div class='add'>+			netdev_info(dev,</div><div class='add'>+				"Internal PHY loopback mode enabled.\n");</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (!(miicontrol &amp; BMCR_LOOPBACK)) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;np-&gt;lock, flags);</div><div class='add'>+			netdev_info(dev, "Loopback already disabled\n");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		nv_disable_irq(dev);</div><div class='add'>+		/* Turn off loopback */</div><div class='add'>+		spin_unlock_irqrestore(&amp;np-&gt;lock, flags);</div><div class='add'>+		netdev_info(dev, "Internal PHY loopback mode disabled.\n");</div><div class='add'>+		phy_init(dev);</div><div class='add'>+	}</div><div class='add'>+	msleep(500);</div><div class='add'>+	spin_lock_irqsave(&amp;np-&gt;lock, flags);</div><div class='add'>+	nv_enable_irq(dev);</div><div class='add'>+	spin_unlock_irqrestore(&amp;np-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_features_t nv_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	/* vlan is dependent on rx checksum offload */</div><div class='ctx'> 	if (features &amp; (NETIF_F_HW_VLAN_TX|NETIF_F_HW_VLAN_RX))</div><div class='hunk'>@@ -4482,7 +4753,7 @@ static u32 nv_fix_features(struct net_device *dev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nv_vlan_mode(struct net_device *dev, u32 features)</div><div class='add'>+static void nv_vlan_mode(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct fe_priv *np = get_nvpriv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -4503,11 +4774,18 @@ static void nv_vlan_mode(struct net_device *dev, u32 features)</div><div class='ctx'> 	spin_unlock_irq(&amp;np-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nv_set_features(struct net_device *dev, u32 features)</div><div class='add'>+static int nv_set_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct fe_priv *np = netdev_priv(dev);</div><div class='ctx'> 	u8 __iomem *base = get_hwbase(dev);</div><div class='del'>-	u32 changed = dev-&gt;features ^ features;</div><div class='add'>+	netdev_features_t changed = dev-&gt;features ^ features;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if ((changed &amp; NETIF_F_LOOPBACK) &amp;&amp; netif_running(dev)) {</div><div class='add'>+		retval = nv_set_loopback(dev, features);</div><div class='add'>+		if (retval != 0)</div><div class='add'>+			return retval;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; NETIF_F_RXCSUM) {</div><div class='ctx'> 		spin_lock_irq(&amp;np-&gt;lock);</div><div class='hunk'>@@ -4553,14 +4831,18 @@ static int nv_get_sset_count(struct net_device *dev, int sset)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nv_get_ethtool_stats(struct net_device *dev, struct ethtool_stats *estats, u64 *buffer)</div><div class='add'>+static void nv_get_ethtool_stats(struct net_device *dev,</div><div class='add'>+				 struct ethtool_stats *estats, u64 *buffer)</div><div class='add'>+	__acquires(&amp;netdev_priv(dev)-&gt;hwstats_lock)</div><div class='add'>+	__releases(&amp;netdev_priv(dev)-&gt;hwstats_lock)</div><div class='ctx'> {</div><div class='ctx'> 	struct fe_priv *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	/* update stats */</div><div class='del'>-	nv_get_hw_stats(dev);</div><div class='del'>-</div><div class='del'>-	memcpy(buffer, &amp;np-&gt;estats, nv_get_sset_count(dev, ETH_SS_STATS)*sizeof(u64));</div><div class='add'>+	spin_lock_bh(&amp;np-&gt;hwstats_lock);</div><div class='add'>+	nv_update_stats(dev);</div><div class='add'>+	memcpy(buffer, &amp;np-&gt;estats,</div><div class='add'>+	       nv_get_sset_count(dev, ETH_SS_STATS)*sizeof(u64));</div><div class='add'>+	spin_unlock_bh(&amp;np-&gt;hwstats_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nv_link_test(struct net_device *dev)</div><div class='hunk'>@@ -5142,6 +5424,12 @@ static int nv_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(&amp;np-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	/* If the loopback feature was set while the device was down, make sure</div><div class='add'>+	 * that it's set correctly now.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;features &amp; NETIF_F_LOOPBACK)</div><div class='add'>+		nv_set_loopback(dev, dev-&gt;features);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> out_drain:</div><div class='ctx'> 	nv_drain_rxtx(dev);</div><div class='hunk'>@@ -5198,7 +5486,7 @@ static int nv_close(struct net_device *dev)</div><div class='ctx'> static const struct net_device_ops nv_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= nv_open,</div><div class='ctx'> 	.ndo_stop		= nv_close,</div><div class='del'>-	.ndo_get_stats		= nv_get_stats,</div><div class='add'>+	.ndo_get_stats64	= nv_get_stats64,</div><div class='ctx'> 	.ndo_start_xmit		= nv_start_xmit,</div><div class='ctx'> 	.ndo_tx_timeout		= nv_tx_timeout,</div><div class='ctx'> 	.ndo_change_mtu		= nv_change_mtu,</div><div class='hunk'>@@ -5215,7 +5503,7 @@ static const struct net_device_ops nv_netdev_ops = {</div><div class='ctx'> static const struct net_device_ops nv_netdev_ops_optimized = {</div><div class='ctx'> 	.ndo_open		= nv_open,</div><div class='ctx'> 	.ndo_stop		= nv_close,</div><div class='del'>-	.ndo_get_stats		= nv_get_stats,</div><div class='add'>+	.ndo_get_stats64	= nv_get_stats64,</div><div class='ctx'> 	.ndo_start_xmit		= nv_start_xmit_optimized,</div><div class='ctx'> 	.ndo_tx_timeout		= nv_tx_timeout,</div><div class='ctx'> 	.ndo_change_mtu		= nv_change_mtu,</div><div class='hunk'>@@ -5254,6 +5542,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i</div><div class='ctx'> 	np-&gt;dev = dev;</div><div class='ctx'> 	np-&gt;pci_dev = pci_dev;</div><div class='ctx'> 	spin_lock_init(&amp;np-&gt;lock);</div><div class='add'>+	spin_lock_init(&amp;np-&gt;hwstats_lock);</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pci_dev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	init_timer(&amp;np-&gt;oom_kick);</div><div class='hunk'>@@ -5262,7 +5551,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i</div><div class='ctx'> 	init_timer(&amp;np-&gt;nic_poll);</div><div class='ctx'> 	np-&gt;nic_poll.data = (unsigned long) dev;</div><div class='ctx'> 	np-&gt;nic_poll.function = nv_do_nic_poll;	/* timer handler */</div><div class='del'>-	init_timer(&amp;np-&gt;stats_poll);</div><div class='add'>+	init_timer_deferrable(&amp;np-&gt;stats_poll);</div><div class='ctx'> 	np-&gt;stats_poll.data = (unsigned long) dev;</div><div class='ctx'> 	np-&gt;stats_poll.function = nv_do_stats_poll;	/* timer handler */</div><div class='ctx'> </div><div class='hunk'>@@ -5346,6 +5635,9 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;features |= dev-&gt;hw_features;</div><div class='ctx'> </div><div class='add'>+	/* Add loopback capability to the device. */</div><div class='add'>+	dev-&gt;hw_features |= NETIF_F_LOOPBACK;</div><div class='add'>+</div><div class='ctx'> 	np-&gt;pause_flags = NV_PAUSEFRAME_RX_CAPABLE | NV_PAUSEFRAME_RX_REQ | NV_PAUSEFRAME_AUTONEG;</div><div class='ctx'> 	if ((id-&gt;driver_data &amp; DEV_HAS_PAUSEFRAME_TX_V1) ||</div><div class='ctx'> 	    (id-&gt;driver_data &amp; DEV_HAS_PAUSEFRAME_TX_V2) ||</div><div class='hunk'>@@ -5621,12 +5913,14 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i</div><div class='ctx'> 	dev_info(&amp;pci_dev-&gt;dev, "ifname %s, PHY OUI 0x%x @ %d, addr %pM\n",</div><div class='ctx'> 		 dev-&gt;name, np-&gt;phy_oui, np-&gt;phyaddr, dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;pci_dev-&gt;dev, "%s%s%s%s%s%s%s%s%s%sdesc-v%u\n",</div><div class='add'>+	dev_info(&amp;pci_dev-&gt;dev, "%s%s%s%s%s%s%s%s%s%s%sdesc-v%u\n",</div><div class='ctx'> 		 dev-&gt;features &amp; NETIF_F_HIGHDMA ? "highdma " : "",</div><div class='ctx'> 		 dev-&gt;features &amp; (NETIF_F_IP_CSUM | NETIF_F_SG) ?</div><div class='ctx'> 			"csum " : "",</div><div class='ctx'> 		 dev-&gt;features &amp; (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX) ?</div><div class='ctx'> 			"vlan " : "",</div><div class='add'>+		 dev-&gt;features &amp; (NETIF_F_LOOPBACK) ?</div><div class='add'>+			"loopback " : "",</div><div class='ctx'> 		 id-&gt;driver_data &amp; DEV_HAS_POWER_CNTRL ? "pwrctl " : "",</div><div class='ctx'> 		 id-&gt;driver_data &amp; DEV_HAS_MGMT_UNIT ? "mgmt " : "",</div><div class='ctx'> 		 id-&gt;driver_data &amp; DEV_NEED_TIMERIRQ ? "timirq " : "",</div><div class='hunk'>@@ -6000,6 +6294,9 @@ module_param(phy_cross, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(phy_cross, "Phy crossover detection for Realtek 8201 phy is enabled by setting to 1 and disabled by setting to 0.");</div><div class='ctx'> module_param(phy_power_down, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(phy_power_down, "Power down phy and disable link when interface is down (1), or leave phy powered up (0).");</div><div class='add'>+module_param(debug_tx_timeout, bool, 0);</div><div class='add'>+MODULE_PARM_DESC(debug_tx_timeout,</div><div class='add'>+		 "Dump tx related registers and ring when tx_timeout happens");</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Manfred Spraul &lt;manfred@colorfullife.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Reverse Engineered nForce ethernet driver");</div><div class='head'>diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c<br/>index 8c8027176bef..ac4e72d529e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c</a></div><div class='hunk'>@@ -161,10 +161,10 @@ static void pch_gbe_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct pch_gbe_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	strcpy(drvinfo-&gt;driver, KBUILD_MODNAME);</div><div class='del'>-	strcpy(drvinfo-&gt;version, pch_driver_version);</div><div class='del'>-	strcpy(drvinfo-&gt;fw_version, "N/A");</div><div class='del'>-	strcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev));</div><div class='add'>+	strlcpy(drvinfo-&gt;driver, KBUILD_MODNAME, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, pch_driver_version, sizeof(drvinfo-&gt;version));</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	drvinfo-&gt;regdump_len = pch_gbe_get_regs_len(netdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c<br/>index 48406ca382f1..964e9c0948bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c</a></div><div class='hunk'>@@ -2109,10 +2109,11 @@ static int pch_gbe_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'>  * Returns</div><div class='ctx'>  *	0:		HW state updated successfully</div><div class='ctx'>  */</div><div class='del'>-static int pch_gbe_set_features(struct net_device *netdev, u32 features)</div><div class='add'>+static int pch_gbe_set_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct pch_gbe_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	u32 changed = features ^ netdev-&gt;features;</div><div class='add'>+	netdev_features_t changed = features ^ netdev-&gt;features;</div><div class='ctx'> </div><div class='ctx'> 	if (!(changed &amp; NETIF_F_RXCSUM))</div><div class='ctx'> 		return 0;</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c<br/>index e09ea83b8c47..8a371985319f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c</a></div><div class='hunk'>@@ -83,14 +83,18 @@ netxen_nic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> 	u32 fw_minor = 0;</div><div class='ctx'> 	u32 fw_build = 0;</div><div class='ctx'> </div><div class='del'>-	strncpy(drvinfo-&gt;driver, netxen_nic_driver_name, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;version, NETXEN_NIC_LINUX_VERSIONID, 32);</div><div class='add'>+	strlcpy(drvinfo-&gt;driver, netxen_nic_driver_name,</div><div class='add'>+		sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, NETXEN_NIC_LINUX_VERSIONID,</div><div class='add'>+		sizeof(drvinfo-&gt;version));</div><div class='ctx'> 	fw_major = NXRD32(adapter, NETXEN_FW_VERSION_MAJOR);</div><div class='ctx'> 	fw_minor = NXRD32(adapter, NETXEN_FW_VERSION_MINOR);</div><div class='ctx'> 	fw_build = NXRD32(adapter, NETXEN_FW_VERSION_SUB);</div><div class='del'>-	sprintf(drvinfo-&gt;fw_version, "%d.%d.%d", fw_major, fw_minor, fw_build);</div><div class='add'>+	snprintf(drvinfo-&gt;fw_version, sizeof(drvinfo-&gt;fw_version),</div><div class='add'>+		"%d.%d.%d", fw_major, fw_minor, fw_build);</div><div class='ctx'> </div><div class='del'>-	strncpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev), 32);</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	drvinfo-&gt;regdump_len = NETXEN_NIC_REGS_LEN;</div><div class='ctx'> 	drvinfo-&gt;eedump_len = netxen_nic_get_eeprom_len(dev);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c<br/>index 8cf3173ba488..7dd9a4b107e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c</a></div><div class='hunk'>@@ -544,7 +544,8 @@ static void netxen_set_multicast_list(struct net_device *dev)</div><div class='ctx'> 	adapter-&gt;set_multi(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 netxen_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static netdev_features_t netxen_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	if (!(features &amp; NETIF_F_RXCSUM)) {</div><div class='ctx'> 		netdev_info(dev, "disabling LRO as RXCSUM is off\n");</div><div class='hunk'>@@ -555,7 +556,8 @@ static u32 netxen_fix_features(struct net_device *dev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int netxen_set_features(struct net_device *dev, u32 features)</div><div class='add'>+static int netxen_set_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct netxen_adapter *adapter = netdev_priv(dev);</div><div class='ctx'> 	int hw_lro;</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c<br/>index a4bdff438a5e..7931531c3a40 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/qlogic/qla3xxx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/qlogic/qla3xxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/qlogic/qla3xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/qlogic/qla3xxx.c</a></div><div class='hunk'>@@ -1735,10 +1735,11 @@ static void ql_get_drvinfo(struct net_device *ndev,</div><div class='ctx'> 			   struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> {</div><div class='ctx'> 	struct ql3_adapter *qdev = netdev_priv(ndev);</div><div class='del'>-	strncpy(drvinfo-&gt;driver, ql3xxx_driver_name, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;version, ql3xxx_driver_version, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;fw_version, "N/A", 32);</div><div class='del'>-	strncpy(drvinfo-&gt;bus_info, pci_name(qdev-&gt;pdev), 32);</div><div class='add'>+	strlcpy(drvinfo-&gt;driver, ql3xxx_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, ql3xxx_driver_version,</div><div class='add'>+		sizeof(drvinfo-&gt;version));</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(qdev-&gt;pdev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	drvinfo-&gt;regdump_len = 0;</div><div class='ctx'> 	drvinfo-&gt;eedump_len = 0;</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 7ed53dbb8646..60976fc4ccc6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/qlogic/qlcnic/qlcnic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/qlogic/qlcnic/qlcnic.h</a></div><div class='hunk'>@@ -1466,8 +1466,9 @@ void qlcnic_advert_link_change(struct qlcnic_adapter *adapter, int linkup);</div><div class='ctx'> </div><div class='ctx'> int qlcnic_fw_cmd_set_mtu(struct qlcnic_adapter *adapter, int mtu);</div><div class='ctx'> int qlcnic_change_mtu(struct net_device *netdev, int new_mtu);</div><div class='del'>-u32 qlcnic_fix_features(struct net_device *netdev, u32 features);</div><div class='del'>-int qlcnic_set_features(struct net_device *netdev, u32 features);</div><div class='add'>+netdev_features_t qlcnic_fix_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features);</div><div class='add'>+int qlcnic_set_features(struct net_device *netdev, netdev_features_t features);</div><div class='ctx'> int qlcnic_config_hw_lro(struct qlcnic_adapter *adapter, int enable);</div><div class='ctx'> int qlcnic_config_bridged_mode(struct qlcnic_adapter *adapter, u32 enable);</div><div class='ctx'> int qlcnic_send_lro_cleanup(struct qlcnic_adapter *adapter);</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 8aa1c6e8667b..cc228cf3d84b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c</a></div><div class='hunk'>@@ -140,11 +140,14 @@ qlcnic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> 	fw_major = QLCRD32(adapter, QLCNIC_FW_VERSION_MAJOR);</div><div class='ctx'> 	fw_minor = QLCRD32(adapter, QLCNIC_FW_VERSION_MINOR);</div><div class='ctx'> 	fw_build = QLCRD32(adapter, QLCNIC_FW_VERSION_SUB);</div><div class='del'>-	sprintf(drvinfo-&gt;fw_version, "%d.%d.%d", fw_major, fw_minor, fw_build);</div><div class='del'>-</div><div class='del'>-	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev), 32);</div><div class='del'>-	strlcpy(drvinfo-&gt;driver, qlcnic_driver_name, 32);</div><div class='del'>-	strlcpy(drvinfo-&gt;version, QLCNIC_LINUX_VERSIONID, 32);</div><div class='add'>+	snprintf(drvinfo-&gt;fw_version, sizeof(drvinfo-&gt;fw_version),</div><div class='add'>+		"%d.%d.%d", fw_major, fw_minor, fw_build);</div><div class='add'>+</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='add'>+	strlcpy(drvinfo-&gt;driver, qlcnic_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, QLCNIC_LINUX_VERSIONID,</div><div class='add'>+		sizeof(drvinfo-&gt;version));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c<br/>index bcb81e47543a..b528e52a8ee1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c</a></div><div class='hunk'>@@ -817,12 +817,13 @@ int qlcnic_change_mtu(struct net_device *netdev, int mtu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-u32 qlcnic_fix_features(struct net_device *netdev, u32 features)</div><div class='add'>+netdev_features_t qlcnic_fix_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct qlcnic_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='ctx'> 	if ((adapter-&gt;flags &amp; QLCNIC_ESWITCH_ENABLED)) {</div><div class='del'>-		u32 changed = features ^ netdev-&gt;features;</div><div class='add'>+		netdev_features_t changed = features ^ netdev-&gt;features;</div><div class='ctx'> 		features ^= changed &amp; (NETIF_F_ALL_CSUM | NETIF_F_RXCSUM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -833,10 +834,10 @@ u32 qlcnic_fix_features(struct net_device *netdev, u32 features)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int qlcnic_set_features(struct net_device *netdev, u32 features)</div><div class='add'>+int qlcnic_set_features(struct net_device *netdev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct qlcnic_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	u32 changed = netdev-&gt;features ^ features;</div><div class='add'>+	netdev_features_t changed = netdev-&gt;features ^ features;</div><div class='ctx'> 	int hw_lro = (features &amp; NETIF_F_LRO) ? QLCNIC_LRO_ENABLED : 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!(changed &amp; NETIF_F_LRO))</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c<br/>index 0bd163828e33..69b8e4ef14d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c</a></div><div class='hunk'>@@ -97,8 +97,8 @@ static int qlcnicvf_config_bridged_mode(struct qlcnic_adapter *, u32);</div><div class='ctx'> static int qlcnicvf_start_firmware(struct qlcnic_adapter *);</div><div class='ctx'> static void qlcnic_set_netdev_features(struct qlcnic_adapter *,</div><div class='ctx'> 				struct qlcnic_esw_func_cfg *);</div><div class='del'>-static void qlcnic_vlan_rx_add(struct net_device *, u16);</div><div class='del'>-static void qlcnic_vlan_rx_del(struct net_device *, u16);</div><div class='add'>+static int qlcnic_vlan_rx_add(struct net_device *, u16);</div><div class='add'>+static int qlcnic_vlan_rx_del(struct net_device *, u16);</div><div class='ctx'> </div><div class='ctx'> /*  PCI Device ID Table  */</div><div class='ctx'> #define ENTRY(device) \</div><div class='hunk'>@@ -735,20 +735,22 @@ qlcnic_set_vlan_config(struct qlcnic_adapter *adapter,</div><div class='ctx'> 		adapter-&gt;pvid = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+static int</div><div class='ctx'> qlcnic_vlan_rx_add(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct qlcnic_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	set_bit(vid, adapter-&gt;vlans);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+static int</div><div class='ctx'> qlcnic_vlan_rx_del(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct qlcnic_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='ctx'> 	qlcnic_restore_indev_addr(netdev, NETDEV_DOWN);</div><div class='ctx'> 	clear_bit(vid, adapter-&gt;vlans);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -792,7 +794,7 @@ qlcnic_set_netdev_features(struct qlcnic_adapter *adapter,</div><div class='ctx'> 		struct qlcnic_esw_func_cfg *esw_cfg)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='del'>-	unsigned long features, vlan_features;</div><div class='add'>+	netdev_features_t features, vlan_features;</div><div class='ctx'> </div><div class='ctx'> 	features = (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_RXCSUM |</div><div class='ctx'> 			NETIF_F_IPV6_CSUM | NETIF_F_GRO);</div><div class='head'>diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c<br/>index 9b67bfea035f..8e2c2a74f3a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c</a></div><div class='hunk'>@@ -366,13 +366,16 @@ static void ql_get_drvinfo(struct net_device *ndev,</div><div class='ctx'> 			   struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> {</div><div class='ctx'> 	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='del'>-	strncpy(drvinfo-&gt;driver, qlge_driver_name, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;version, qlge_driver_version, 32);</div><div class='del'>-	snprintf(drvinfo-&gt;fw_version, 32, "v%d.%d.%d",</div><div class='add'>+	strlcpy(drvinfo-&gt;driver, qlge_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, qlge_driver_version,</div><div class='add'>+		sizeof(drvinfo-&gt;version));</div><div class='add'>+	snprintf(drvinfo-&gt;fw_version, sizeof(drvinfo-&gt;fw_version),</div><div class='add'>+		 "v%d.%d.%d",</div><div class='ctx'> 		 (qdev-&gt;fw_rev_id &amp; 0x00ff0000) &gt;&gt; 16,</div><div class='ctx'> 		 (qdev-&gt;fw_rev_id &amp; 0x0000ff00) &gt;&gt; 8,</div><div class='ctx'> 		 (qdev-&gt;fw_rev_id &amp; 0x000000ff));</div><div class='del'>-	strncpy(drvinfo-&gt;bus_info, pci_name(qdev-&gt;pdev), 32);</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(qdev-&gt;pdev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	drvinfo-&gt;n_stats = 0;</div><div class='ctx'> 	drvinfo-&gt;testinfo_len = 0;</div><div class='ctx'> 	if (!test_bit(QL_FRC_COREDUMP, &amp;qdev-&gt;flags))</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 c92afcd912e2..b54898737284 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/qlogic/qlge/qlge_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/qlogic/qlge/qlge_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/qlogic/qlge/qlge_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/qlogic/qlge/qlge_main.c</a></div><div class='hunk'>@@ -2307,7 +2307,7 @@ static int ql_napi_poll_msix(struct napi_struct *napi, int budget)</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void qlge_vlan_mode(struct net_device *ndev, u32 features)</div><div class='add'>+static void qlge_vlan_mode(struct net_device *ndev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='ctx'> </div><div class='hunk'>@@ -2323,7 +2323,8 @@ static void qlge_vlan_mode(struct net_device *ndev, u32 features)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 qlge_fix_features(struct net_device *ndev, u32 features)</div><div class='add'>+static netdev_features_t qlge_fix_features(struct net_device *ndev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since there is no support for separate rx/tx vlan accel</div><div class='hunk'>@@ -2337,9 +2338,10 @@ static u32 qlge_fix_features(struct net_device *ndev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int qlge_set_features(struct net_device *ndev, u32 features)</div><div class='add'>+static int qlge_set_features(struct net_device *ndev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='del'>-	u32 changed = ndev-&gt;features ^ features;</div><div class='add'>+	netdev_features_t changed = ndev-&gt;features ^ features;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; NETIF_F_HW_VLAN_RX)</div><div class='ctx'> 		qlge_vlan_mode(ndev, features);</div><div class='hunk'>@@ -2347,56 +2349,66 @@ static int qlge_set_features(struct net_device *ndev, u32 features)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __qlge_vlan_rx_add_vid(struct ql_adapter *qdev, u16 vid)</div><div class='add'>+static int __qlge_vlan_rx_add_vid(struct ql_adapter *qdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	u32 enable_bit = MAC_ADDR_E;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (ql_set_mac_addr_reg</div><div class='del'>-	    (qdev, (u8 *) &amp;enable_bit, MAC_ADDR_TYPE_VLAN, vid)) {</div><div class='add'>+	err = ql_set_mac_addr_reg(qdev, (u8 *) &amp;enable_bit,</div><div class='add'>+				  MAC_ADDR_TYPE_VLAN, vid);</div><div class='add'>+	if (err)</div><div class='ctx'> 		netif_err(qdev, ifup, qdev-&gt;ndev,</div><div class='ctx'> 			  "Failed to init vlan address.\n");</div><div class='del'>-	}</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void qlge_vlan_rx_add_vid(struct net_device *ndev, u16 vid)</div><div class='add'>+static int qlge_vlan_rx_add_vid(struct net_device *ndev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='ctx'> 	int status;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	status = ql_sem_spinlock(qdev, SEM_MAC_ADDR_MASK);</div><div class='ctx'> 	if (status)</div><div class='del'>-		return;</div><div class='add'>+		return status;</div><div class='ctx'> </div><div class='del'>-	__qlge_vlan_rx_add_vid(qdev, vid);</div><div class='add'>+	err = __qlge_vlan_rx_add_vid(qdev, vid);</div><div class='ctx'> 	set_bit(vid, qdev-&gt;active_vlans);</div><div class='ctx'> </div><div class='ctx'> 	ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __qlge_vlan_rx_kill_vid(struct ql_adapter *qdev, u16 vid)</div><div class='add'>+static int __qlge_vlan_rx_kill_vid(struct ql_adapter *qdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	u32 enable_bit = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (ql_set_mac_addr_reg</div><div class='del'>-	    (qdev, (u8 *) &amp;enable_bit, MAC_ADDR_TYPE_VLAN, vid)) {</div><div class='add'>+	err = ql_set_mac_addr_reg(qdev, (u8 *) &amp;enable_bit,</div><div class='add'>+				  MAC_ADDR_TYPE_VLAN, vid);</div><div class='add'>+	if (err)</div><div class='ctx'> 		netif_err(qdev, ifup, qdev-&gt;ndev,</div><div class='ctx'> 			  "Failed to clear vlan address.\n");</div><div class='del'>-	}</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void qlge_vlan_rx_kill_vid(struct net_device *ndev, u16 vid)</div><div class='add'>+static int qlge_vlan_rx_kill_vid(struct net_device *ndev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ql_adapter *qdev = netdev_priv(ndev);</div><div class='ctx'> 	int status;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	status = ql_sem_spinlock(qdev, SEM_MAC_ADDR_MASK);</div><div class='ctx'> 	if (status)</div><div class='del'>-		return;</div><div class='add'>+		return status;</div><div class='ctx'> </div><div class='del'>-	__qlge_vlan_rx_kill_vid(qdev, vid);</div><div class='add'>+	err = __qlge_vlan_rx_kill_vid(qdev, vid);</div><div class='ctx'> 	clear_bit(vid, qdev-&gt;active_vlans);</div><div class='ctx'> </div><div class='ctx'> 	ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qlge_restore_vlan(struct ql_adapter *qdev)</div><div class='head'>diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c<br/>index 4bf68cfef390..cb0eca807852 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/rdc/r6040.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/rdc/r6040.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/rdc/r6040.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/rdc/r6040.c</a></div><div class='hunk'>@@ -52,12 +52,6 @@</div><div class='ctx'> #define DRV_VERSION	"0.28"</div><div class='ctx'> #define DRV_RELDATE	"07Oct2011"</div><div class='ctx'> </div><div class='del'>-/* PHY CHIP Address */</div><div class='del'>-#define PHY1_ADDR	1	/* For MAC1 */</div><div class='del'>-#define PHY2_ADDR	3	/* For MAC2 */</div><div class='del'>-#define PHY_MODE	0x3100	/* PHY CHIP Register 0 */</div><div class='del'>-#define PHY_CAP		0x01E1	/* PHY CHIP Register 4 */</div><div class='del'>-</div><div class='ctx'> /* Time in jiffies before concluding the transmitter is hung. */</div><div class='ctx'> #define TX_TIMEOUT	(6000 * HZ / 1000)</div><div class='ctx'> </div><div class='hunk'>@@ -69,8 +63,11 @@</div><div class='ctx'> </div><div class='ctx'> /* MAC registers */</div><div class='ctx'> #define MCR0		0x00	/* Control register 0 */</div><div class='add'>+#define  MCR0_RCVEN	0x0002	/* Receive enable */</div><div class='ctx'> #define  MCR0_PROMISC	0x0020	/* Promiscuous mode */</div><div class='ctx'> #define  MCR0_HASH_EN	0x0100	/* Enable multicast hash table function */</div><div class='add'>+#define  MCR0_XMTEN	0x1000	/* Transmission enable */</div><div class='add'>+#define  MCR0_FD	0x8000	/* Full/Half duplex */</div><div class='ctx'> #define MCR1		0x04	/* Control register 1 */</div><div class='ctx'> #define  MAC_RST	0x0001	/* Reset the MAC */</div><div class='ctx'> #define MBCR		0x08	/* Bus control */</div><div class='hunk'>@@ -129,6 +126,7 @@</div><div class='ctx'> #define PHY_CC		0x88	/* PHY status change configuration register */</div><div class='ctx'> #define PHY_ST		0x8A	/* PHY status register */</div><div class='ctx'> #define MAC_SM		0xAC	/* MAC status machine */</div><div class='add'>+#define  MAC_SM_RST	0x0002	/* MAC status machine reset */</div><div class='ctx'> #define MAC_ID		0xBE	/* Identifier register */</div><div class='ctx'> </div><div class='ctx'> #define TX_DCNT		0x80	/* TX descriptor count */</div><div class='hunk'>@@ -154,9 +152,6 @@</div><div class='ctx'> #define DSC_RX_MIDH_HIT	0x0004	/* RX MID table hit (no error) */</div><div class='ctx'> #define DSC_RX_IDX_MID_MASK 3	/* RX mask for the index of matched MIDx */</div><div class='ctx'> </div><div class='del'>-/* PHY settings */</div><div class='del'>-#define ICPLUS_PHY_ID	0x0243</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Sten Wang &lt;sten.wang@rdc.com.tw&gt;,"</div><div class='ctx'> 	"Daniel Gimpelevich &lt;daniel@gimpelevich.san-francisco.ca.us&gt;,"</div><div class='ctx'> 	"Florian Fainelli &lt;florian@openwrt.org&gt;");</div><div class='hunk'>@@ -178,7 +173,7 @@ struct r6040_descriptor {</div><div class='ctx'> 	struct r6040_descriptor *vndescp;	/* 14-17 */</div><div class='ctx'> 	struct sk_buff *skb_ptr;	/* 18-1B */</div><div class='ctx'> 	u32	rev2;			/* 1C-1F */</div><div class='del'>-} __attribute__((aligned(32)));</div><div class='add'>+} __aligned(32);</div><div class='ctx'> </div><div class='ctx'> struct r6040_private {</div><div class='ctx'> 	spinlock_t lock;		/* driver lock */</div><div class='hunk'>@@ -191,7 +186,7 @@ struct r6040_private {</div><div class='ctx'> 	struct r6040_descriptor *tx_ring;</div><div class='ctx'> 	dma_addr_t rx_ring_dma;</div><div class='ctx'> 	dma_addr_t tx_ring_dma;</div><div class='del'>-	u16	tx_free_desc, phy_addr;</div><div class='add'>+	u16	tx_free_desc;</div><div class='ctx'> 	u16	mcr0, mcr1;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct mii_bus *mii_bus;</div><div class='hunk'>@@ -206,8 +201,6 @@ static char version[] __devinitdata = DRV_NAME</div><div class='ctx'> 	": RDC R6040 NAPI net driver,"</div><div class='ctx'> 	"version "DRV_VERSION " (" DRV_RELDATE ")";</div><div class='ctx'> </div><div class='del'>-static int phy_table[] = { PHY1_ADDR, PHY2_ADDR };</div><div class='del'>-</div><div class='ctx'> /* Read a word data from PHY Chip */</div><div class='ctx'> static int r6040_phy_read(void __iomem *ioaddr, int phy_addr, int reg)</div><div class='ctx'> {</div><div class='hunk'>@@ -379,11 +372,11 @@ static void r6040_init_mac_regs(struct net_device *dev)</div><div class='ctx'> 	iowrite16(MAC_RST, ioaddr + MCR1);</div><div class='ctx'> 	while (limit--) {</div><div class='ctx'> 		cmd = ioread16(ioaddr + MCR1);</div><div class='del'>-		if (cmd &amp; 0x1)</div><div class='add'>+		if (cmd &amp; MAC_RST)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Reset internal state machine */</div><div class='del'>-	iowrite16(2, ioaddr + MAC_SM);</div><div class='add'>+	iowrite16(MAC_SM_RST, ioaddr + MAC_SM);</div><div class='ctx'> 	iowrite16(0, ioaddr + MAC_SM);</div><div class='ctx'> 	mdelay(5);</div><div class='ctx'> </div><div class='hunk'>@@ -409,7 +402,7 @@ static void r6040_init_mac_regs(struct net_device *dev)</div><div class='ctx'> 	iowrite16(INT_MASK, ioaddr + MIER);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable TX and RX */</div><div class='del'>-	iowrite16(lp-&gt;mcr0 | 0x0002, ioaddr);</div><div class='add'>+	iowrite16(lp-&gt;mcr0 | MCR0_RCVEN, ioaddr);</div><div class='ctx'> </div><div class='ctx'> 	/* Let TX poll the descriptors</div><div class='ctx'> 	 * we may got called by r6040_tx_timeout which has left</div><div class='hunk'>@@ -461,7 +454,7 @@ static void r6040_down(struct net_device *dev)</div><div class='ctx'> 	iowrite16(MAC_RST, ioaddr + MCR1);	/* Reset RDC MAC */</div><div class='ctx'> 	while (limit--) {</div><div class='ctx'> 		cmd = ioread16(ioaddr + MCR1);</div><div class='del'>-		if (cmd &amp; 0x1)</div><div class='add'>+		if (cmd &amp; MAC_RST)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -742,9 +735,10 @@ static void r6040_mac_address(struct net_device *dev)</div><div class='ctx'> 	void __iomem *ioaddr = lp-&gt;base;</div><div class='ctx'> 	u16 *adrp;</div><div class='ctx'> </div><div class='del'>-	/* MAC operation register */</div><div class='del'>-	iowrite16(0x01, ioaddr + MCR1); /* Reset MAC */</div><div class='del'>-	iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */</div><div class='add'>+	/* Reset MAC */</div><div class='add'>+	iowrite16(MAC_RST, ioaddr + MCR1);</div><div class='add'>+	/* Reset internal state machine */</div><div class='add'>+	iowrite16(MAC_SM_RST, ioaddr + MAC_SM);</div><div class='ctx'> 	iowrite16(0, ioaddr + MAC_SM);</div><div class='ctx'> 	mdelay(5);</div><div class='ctx'> </div><div class='hunk'>@@ -1013,7 +1007,7 @@ static void r6040_adjust_link(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* reflect duplex change */</div><div class='ctx'> 	if (phydev-&gt;link &amp;&amp; (lp-&gt;old_duplex != phydev-&gt;duplex)) {</div><div class='del'>-		lp-&gt;mcr0 |= (phydev-&gt;duplex == DUPLEX_FULL ? 0x8000 : 0);</div><div class='add'>+		lp-&gt;mcr0 |= (phydev-&gt;duplex == DUPLEX_FULL ? MCR0_FD : 0);</div><div class='ctx'> 		iowrite16(lp-&gt;mcr0, ioaddr);</div><div class='ctx'> </div><div class='ctx'> 		status_changed = 1;</div><div class='hunk'>@@ -1166,8 +1160,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	lp-&gt;dev = dev;</div><div class='ctx'> </div><div class='ctx'> 	/* Init RDC private data */</div><div class='del'>-	lp-&gt;mcr0 = 0x1002;</div><div class='del'>-	lp-&gt;phy_addr = phy_table[card_idx];</div><div class='add'>+	lp-&gt;mcr0 = MCR0_XMTEN | MCR0_RCVEN;</div><div class='ctx'> </div><div class='ctx'> 	/* The RDC-specific entries in the device structure. */</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;r6040_netdev_ops;</div><div class='hunk'>@@ -1188,7 +1181,8 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	lp-&gt;mii_bus-&gt;write = r6040_mdiobus_write;</div><div class='ctx'> 	lp-&gt;mii_bus-&gt;reset = r6040_mdiobus_reset;</div><div class='ctx'> 	lp-&gt;mii_bus-&gt;name = "r6040_eth_mii";</div><div class='del'>-	snprintf(lp-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%x", card_idx);</div><div class='add'>+	snprintf(lp-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%s-%x",</div><div class='add'>+		dev_name(&amp;pdev-&gt;dev), card_idx);</div><div class='ctx'> 	lp-&gt;mii_bus-&gt;irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);</div><div class='ctx'> 	if (!lp-&gt;mii_bus-&gt;irq) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "mii_bus irq allocation failed\n");</div><div class='head'>diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c<br/>index ee5da9293ce0..abc79076f867 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/realtek/8139cp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/realtek/8139cp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/realtek/8139cp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/realtek/8139cp.c</a></div><div class='hunk'>@@ -563,6 +563,7 @@ rx_next:</div><div class='ctx'> 		if (cpr16(IntrStatus) &amp; cp_rx_intr_mask)</div><div class='ctx'> 			goto rx_status_loop;</div><div class='ctx'> </div><div class='add'>+		napi_gro_flush(napi);</div><div class='ctx'> 		spin_lock_irqsave(&amp;cp-&gt;lock, flags);</div><div class='ctx'> 		__napi_complete(napi);</div><div class='ctx'> 		cpw16_f(IntrMask, cp_intr_mask);</div><div class='hunk'>@@ -859,7 +860,6 @@ static void __cp_set_rx_mode (struct net_device *dev)</div><div class='ctx'> 	struct cp_private *cp = netdev_priv(dev);</div><div class='ctx'> 	u32 mc_filter[2];	/* Multicast hash filter */</div><div class='ctx'> 	int rx_mode;</div><div class='del'>-	u32 tmp;</div><div class='ctx'> </div><div class='ctx'> 	/* Note: do not reorder, GCC is clever about common statements. */</div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='hunk'>@@ -886,11 +886,9 @@ static void __cp_set_rx_mode (struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We can safely update without stopping the chip. */</div><div class='del'>-	tmp = cp_rx_config | rx_mode;</div><div class='del'>-	if (cp-&gt;rx_config != tmp) {</div><div class='del'>-		cpw32_f (RxConfig, tmp);</div><div class='del'>-		cp-&gt;rx_config = tmp;</div><div class='del'>-	}</div><div class='add'>+	cp-&gt;rx_config = cp_rx_config | rx_mode;</div><div class='add'>+	cpw32_f(RxConfig, cp-&gt;rx_config);</div><div class='add'>+</div><div class='ctx'> 	cpw32_f (MAR0 + 0, mc_filter[0]);</div><div class='ctx'> 	cpw32_f (MAR0 + 4, mc_filter[1]);</div><div class='ctx'> }</div><div class='hunk'>@@ -1319,9 +1317,9 @@ static void cp_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *info</div><div class='ctx'> {</div><div class='ctx'> 	struct cp_private *cp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy (info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy (info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy (info-&gt;bus_info, pci_name(cp-&gt;pdev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(cp-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cp_get_ringparam(struct net_device *dev,</div><div class='hunk'>@@ -1392,7 +1390,7 @@ static void cp_set_msglevel(struct net_device *dev, u32 value)</div><div class='ctx'> 	cp-&gt;msg_enable = value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cp_set_features(struct net_device *dev, u32 features)</div><div class='add'>+static int cp_set_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct cp_private *cp = netdev_priv(dev);</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -1589,7 +1587,7 @@ static int cp_set_mac_address(struct net_device *dev, void *p)</div><div class='ctx'>    No extra delay is needed with 33Mhz PCI, but 66Mhz may change this.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define eeprom_delay()	readl(ee_addr)</div><div class='add'>+#define eeprom_delay()	readb(ee_addr)</div><div class='ctx'> </div><div class='ctx'> /* The EEPROM commands include the alway-set leading bit. */</div><div class='ctx'> #define EE_EXTEND_CMD	(4)</div><div class='head'>diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c<br/>index 4d6b254fc6c1..a8779bedb3d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/realtek/8139too.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/realtek/8139too.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/realtek/8139too.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/realtek/8139too.c</a></div><div class='hunk'>@@ -1122,7 +1122,7 @@ static void __devexit rtl8139_remove_one (struct pci_dev *pdev)</div><div class='ctx'>    No extra delay is needed with 33Mhz PCI, but 66Mhz may change this.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define eeprom_delay()	(void)RTL_R32(Cfg9346)</div><div class='add'>+#define eeprom_delay()	(void)RTL_R8(Cfg9346)</div><div class='ctx'> </div><div class='ctx'> /* The EEPROM commands include the alway-set leading bit. */</div><div class='ctx'> #define EE_WRITE_CMD	(5)</div><div class='hunk'>@@ -2330,9 +2330,9 @@ static int rtl8139_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='ctx'> static void rtl8139_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtl8139_private *tp = netdev_priv(dev);</div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(tp-&gt;pci_dev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(tp-&gt;pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> 	info-&gt;regdump_len = tp-&gt;regs_len;</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 c8f47f17186f..7a0c800b50ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/realtek/r8169.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/realtek/r8169.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/realtek/r8169.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/realtek/r8169.c</a></div><div class='hunk'>@@ -69,9 +69,6 @@</div><div class='ctx'>    The RTL chips use a 64 element hash table based on the Ethernet CRC. */</div><div class='ctx'> static const int multicast_filter_limit = 32;</div><div class='ctx'> </div><div class='del'>-/* MAC address length */</div><div class='del'>-#define MAC_ADDR_LEN	6</div><div class='del'>-</div><div class='ctx'> #define MAX_READ_REQUEST_SHIFT	12</div><div class='ctx'> #define TX_DMA_BURST	6	/* Maximum PCI burst, '6' is 1024 */</div><div class='ctx'> #define SafeMtu		0x1c20	/* ... actually life sucks beyond ~7k */</div><div class='hunk'>@@ -1406,12 +1403,13 @@ static void rtl8169_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 	struct rtl8169_private *tp = netdev_priv(dev);</div><div class='ctx'> 	struct rtl_fw *rtl_fw = tp-&gt;rtl_fw;</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, MODULENAME);</div><div class='del'>-	strcpy(info-&gt;version, RTL8169_VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(tp-&gt;pci_dev));</div><div class='add'>+	strlcpy(info-&gt;driver, MODULENAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, RTL8169_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(tp-&gt;pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(info-&gt;fw_version) &lt; sizeof(rtl_fw-&gt;version));</div><div class='del'>-	strcpy(info-&gt;fw_version, IS_ERR_OR_NULL(rtl_fw) ? "N/A" :</div><div class='del'>-	       rtl_fw-&gt;version);</div><div class='add'>+	if (!IS_ERR_OR_NULL(rtl_fw))</div><div class='add'>+		strlcpy(info-&gt;fw_version, rtl_fw-&gt;version,</div><div class='add'>+			sizeof(info-&gt;fw_version));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rtl8169_get_regs_len(struct net_device *dev)</div><div class='hunk'>@@ -1555,7 +1553,8 @@ static int rtl8169_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 rtl8169_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static netdev_features_t rtl8169_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtl8169_private *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1569,7 +1568,8 @@ static u32 rtl8169_fix_features(struct net_device *dev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rtl8169_set_features(struct net_device *dev, u32 features)</div><div class='add'>+static int rtl8169_set_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtl8169_private *tp = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = tp-&gt;mmio_addr;</div><div class='hunk'>@@ -4101,7 +4101,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	spin_lock_init(&amp;tp-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Get MAC address */</div><div class='del'>-	for (i = 0; i &lt; MAC_ADDR_LEN; i++)</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 		dev-&gt;dev_addr[i] = RTL_R8(MAC0 + i);</div><div class='ctx'> 	memcpy(dev-&gt;perm_addr, dev-&gt;dev_addr, dev-&gt;addr_len);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c<br/>index 9b230740c6ab..813d41c4a845 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/renesas/sh_eth.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/renesas/sh_eth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/renesas/sh_eth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/renesas/sh_eth.c</a></div><div class='hunk'>@@ -1369,13 +1369,13 @@ static void sh_eth_get_strings(struct net_device *ndev, u32 stringset, u8 *data)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ethtool_ops sh_eth_ethtool_ops = {</div><div class='add'>+static const struct ethtool_ops sh_eth_ethtool_ops = {</div><div class='ctx'> 	.get_settings	= sh_eth_get_settings,</div><div class='ctx'> 	.set_settings	= sh_eth_set_settings,</div><div class='del'>-	.nway_reset		= sh_eth_nway_reset,</div><div class='add'>+	.nway_reset	= sh_eth_nway_reset,</div><div class='ctx'> 	.get_msglevel	= sh_eth_get_msglevel,</div><div class='ctx'> 	.set_msglevel	= sh_eth_set_msglevel,</div><div class='del'>-	.get_link		= ethtool_op_get_link,</div><div class='add'>+	.get_link	= ethtool_op_get_link,</div><div class='ctx'> 	.get_strings	= sh_eth_get_strings,</div><div class='ctx'> 	.get_ethtool_stats  = sh_eth_get_ethtool_stats,</div><div class='ctx'> 	.get_sset_count     = sh_eth_get_sset_count,</div><div class='hunk'>@@ -1702,7 +1702,8 @@ static int sh_mdio_init(struct net_device *ndev, int id,</div><div class='ctx'> 	/* Hook up MII support for ethtool */</div><div class='ctx'> 	mdp-&gt;mii_bus-&gt;name = "sh_mii";</div><div class='ctx'> 	mdp-&gt;mii_bus-&gt;parent = &amp;ndev-&gt;dev;</div><div class='del'>-	snprintf(mdp-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%x", id);</div><div class='add'>+	snprintf(mdp-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%s-%x",</div><div class='add'>+		mdp-&gt;pdev-&gt;name, id);</div><div class='ctx'> </div><div class='ctx'> 	/* PHY IRQ */</div><div class='ctx'> 	mdp-&gt;mii_bus-&gt;irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);</div><div class='hunk'>@@ -1957,18 +1958,7 @@ static struct platform_driver sh_eth_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sh_eth_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sh_eth_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sh_eth_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sh_eth_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sh_eth_init);</div><div class='del'>-module_exit(sh_eth_cleanup);</div><div class='add'>+module_platform_driver(sh_eth_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Nobuhiro Iwamatsu, Yoshihiro Shimoda");</div><div class='ctx'> MODULE_DESCRIPTION("Renesas SuperH Ethernet driver");</div><div class='head'>diff --git a/drivers/net/ethernet/s6gmac.c b/drivers/net/ethernet/s6gmac.c<br/>index a7ff8ea342b4..22e9c0181ce8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/s6gmac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/s6gmac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/s6gmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/s6gmac.c</a></div><div class='hunk'>@@ -1004,7 +1004,7 @@ static int __devinit s6gmac_probe(struct platform_device *pdev)</div><div class='ctx'> 	mb-&gt;write = s6mii_write;</div><div class='ctx'> 	mb-&gt;reset = s6mii_reset;</div><div class='ctx'> 	mb-&gt;priv = pd;</div><div class='del'>-	snprintf(mb-&gt;id, MII_BUS_ID_SIZE, "0");</div><div class='add'>+	snprintf(mb-&gt;id, MII_BUS_ID_SIZE, "%s-%x", pdev-&gt;name, pdev-&gt;id);</div><div class='ctx'> 	mb-&gt;phy_mask = ~(1 &lt;&lt; 0);</div><div class='ctx'> 	mb-&gt;irq = &amp;pd-&gt;mii.irq[0];</div><div class='ctx'> 	for (i = 0; i &lt; PHY_MAX_ADDR; i++) {</div><div class='head'>diff --git a/drivers/net/ethernet/seeq/sgiseeq.c b/drivers/net/ethernet/seeq/sgiseeq.c<br/>index c3673f151a41..f955a19eb22f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/seeq/sgiseeq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/seeq/sgiseeq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/seeq/sgiseeq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/seeq/sgiseeq.c</a></div><div class='hunk'>@@ -834,23 +834,7 @@ static struct platform_driver sgiseeq_driver = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sgiseeq_module_init(void)</div><div class='del'>-{</div><div class='del'>-	if (platform_driver_register(&amp;sgiseeq_driver)) {</div><div class='del'>-		printk(KERN_ERR "Driver registration failed\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sgiseeq_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sgiseeq_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sgiseeq_module_init);</div><div class='del'>-module_exit(sgiseeq_module_exit);</div><div class='add'>+module_platform_driver(sgiseeq_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("SGI Seeq 8003 driver");</div><div class='ctx'> MODULE_AUTHOR("Linux/MIPS Mailing List &lt;linux-mips@linux-mips.org&gt;");</div><div class='head'>diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c<br/>index d5731f1fe6d6..e43702f33b62 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/efx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/efx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/efx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sfc/efx.c</a></div><div class='hunk'>@@ -1336,7 +1336,8 @@ static int efx_probe_nic(struct efx_nic *efx)</div><div class='ctx'> 	if (efx-&gt;n_channels &gt; 1)</div><div class='ctx'> 		get_random_bytes(&amp;efx-&gt;rx_hash_key, sizeof(efx-&gt;rx_hash_key));</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(efx-&gt;rx_indir_table); i++)</div><div class='del'>-		efx-&gt;rx_indir_table[i] = i % efx-&gt;n_rx_channels;</div><div class='add'>+		efx-&gt;rx_indir_table[i] =</div><div class='add'>+			ethtool_rxfh_indir_default(i, efx-&gt;n_rx_channels);</div><div class='ctx'> </div><div class='ctx'> 	efx_set_channels(efx);</div><div class='ctx'> 	netif_set_real_num_tx_queues(efx-&gt;net_dev, efx-&gt;n_tx_channels);</div><div class='hunk'>@@ -1900,7 +1901,7 @@ static void efx_set_multicast_list(struct net_device *net_dev)</div><div class='ctx'> 	/* Otherwise efx_start_port() will do this */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int efx_set_features(struct net_device *net_dev, u32 data)</div><div class='add'>+static int efx_set_features(struct net_device *net_dev, netdev_features_t data)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='hunk'>@@ -2235,9 +2236,9 @@ static DEFINE_PCI_DEVICE_TABLE(efx_pci_table) = {</div><div class='ctx'> 	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE,</div><div class='ctx'> 		    PCI_DEVICE_ID_SOLARFLARE_SFC4000B),</div><div class='ctx'> 	 .driver_data = (unsigned long) &amp;falcon_b0_nic_type},</div><div class='del'>-	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, BETHPAGE_A_P_DEVID),</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0803),	/* SFC9020 */</div><div class='ctx'> 	 .driver_data = (unsigned long) &amp;siena_a0_nic_type},</div><div class='del'>-	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, SIENA_A_P_DEVID),</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0813),	/* SFL9021 */</div><div class='ctx'> 	 .driver_data = (unsigned long) &amp;siena_a0_nic_type},</div><div class='ctx'> 	{0}			/* end of list */</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/ethernet/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h<br/>index 4764793ed234..a3541ac6ea01 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/efx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/efx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/efx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sfc/efx.h</a></div><div class='hunk'>@@ -14,10 +14,6 @@</div><div class='ctx'> #include "net_driver.h"</div><div class='ctx'> #include "filter.h"</div><div class='ctx'> </div><div class='del'>-/* PCI IDs */</div><div class='del'>-#define BETHPAGE_A_P_DEVID      0x0803</div><div class='del'>-#define SIENA_A_P_DEVID         0x0813</div><div class='del'>-</div><div class='ctx'> /* Solarstorm controllers use BAR 0 for I/O space and BAR 2(&amp;3) for memory */</div><div class='ctx'> #define EFX_MEM_BAR 2</div><div class='ctx'> </div><div class='hunk'>@@ -65,13 +61,23 @@ extern void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue);</div><div class='ctx'> extern int efx_probe_filters(struct efx_nic *efx);</div><div class='ctx'> extern void efx_restore_filters(struct efx_nic *efx);</div><div class='ctx'> extern void efx_remove_filters(struct efx_nic *efx);</div><div class='del'>-extern int efx_filter_insert_filter(struct efx_nic *efx,</div><div class='add'>+extern s32 efx_filter_insert_filter(struct efx_nic *efx,</div><div class='ctx'> 				    struct efx_filter_spec *spec,</div><div class='ctx'> 				    bool replace);</div><div class='del'>-extern int efx_filter_remove_filter(struct efx_nic *efx,</div><div class='del'>-				    struct efx_filter_spec *spec);</div><div class='add'>+extern int efx_filter_remove_id_safe(struct efx_nic *efx,</div><div class='add'>+				     enum efx_filter_priority priority,</div><div class='add'>+				     u32 filter_id);</div><div class='add'>+extern int efx_filter_get_filter_safe(struct efx_nic *efx,</div><div class='add'>+				      enum efx_filter_priority priority,</div><div class='add'>+				      u32 filter_id, struct efx_filter_spec *);</div><div class='ctx'> extern void efx_filter_clear_rx(struct efx_nic *efx,</div><div class='ctx'> 				enum efx_filter_priority priority);</div><div class='add'>+extern u32 efx_filter_count_rx_used(struct efx_nic *efx,</div><div class='add'>+				    enum efx_filter_priority priority);</div><div class='add'>+extern u32 efx_filter_get_rx_id_limit(struct efx_nic *efx);</div><div class='add'>+extern s32 efx_filter_get_rx_ids(struct efx_nic *efx,</div><div class='add'>+				 enum efx_filter_priority priority,</div><div class='add'>+				 u32 *buf, u32 size);</div><div class='ctx'> #ifdef CONFIG_RFS_ACCEL</div><div class='ctx'> extern int efx_filter_rfs(struct net_device *net_dev, const struct sk_buff *skb,</div><div class='ctx'> 			  u16 rxq_index, u32 flow_id);</div><div class='head'>diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c<br/>index f3cd96dfa398..29b2ebfef19f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sfc/ethtool.c</a></div><div class='hunk'>@@ -818,9 +818,58 @@ static int efx_ethtool_reset(struct net_device *net_dev, u32 *flags)</div><div class='ctx'> 	return efx_reset(efx, rc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int efx_ethtool_get_class_rule(struct efx_nic *efx,</div><div class='add'>+				      struct ethtool_rx_flow_spec *rule)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_tcpip4_spec *ip_entry = &amp;rule-&gt;h_u.tcp_ip4_spec;</div><div class='add'>+	struct ethtool_tcpip4_spec *ip_mask = &amp;rule-&gt;m_u.tcp_ip4_spec;</div><div class='add'>+	struct efx_filter_spec spec;</div><div class='add'>+	u16 vid;</div><div class='add'>+	u8 proto;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = efx_filter_get_filter_safe(efx, EFX_FILTER_PRI_MANUAL,</div><div class='add'>+					rule-&gt;location, &amp;spec);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (spec.dmaq_id == 0xfff)</div><div class='add'>+		rule-&gt;ring_cookie = RX_CLS_FLOW_DISC;</div><div class='add'>+	else</div><div class='add'>+		rule-&gt;ring_cookie = spec.dmaq_id;</div><div class='add'>+</div><div class='add'>+	rc = efx_filter_get_eth_local(&amp;spec, &amp;vid,</div><div class='add'>+				      rule-&gt;h_u.ether_spec.h_dest);</div><div class='add'>+	if (rc == 0) {</div><div class='add'>+		rule-&gt;flow_type = ETHER_FLOW;</div><div class='add'>+		memset(rule-&gt;m_u.ether_spec.h_dest, ~0, ETH_ALEN);</div><div class='add'>+		if (vid != EFX_FILTER_VID_UNSPEC) {</div><div class='add'>+			rule-&gt;flow_type |= FLOW_EXT;</div><div class='add'>+			rule-&gt;h_ext.vlan_tci = htons(vid);</div><div class='add'>+			rule-&gt;m_ext.vlan_tci = htons(0xfff);</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = efx_filter_get_ipv4_local(&amp;spec, &amp;proto,</div><div class='add'>+				       &amp;ip_entry-&gt;ip4dst, &amp;ip_entry-&gt;pdst);</div><div class='add'>+	if (rc != 0) {</div><div class='add'>+		rc = efx_filter_get_ipv4_full(</div><div class='add'>+			&amp;spec, &amp;proto, &amp;ip_entry-&gt;ip4src, &amp;ip_entry-&gt;psrc,</div><div class='add'>+			&amp;ip_entry-&gt;ip4dst, &amp;ip_entry-&gt;pdst);</div><div class='add'>+		EFX_WARN_ON_PARANOID(rc);</div><div class='add'>+		ip_mask-&gt;ip4src = ~0;</div><div class='add'>+		ip_mask-&gt;psrc = ~0;</div><div class='add'>+	}</div><div class='add'>+	rule-&gt;flow_type = (proto == IPPROTO_TCP) ? TCP_V4_FLOW : UDP_V4_FLOW;</div><div class='add'>+	ip_mask-&gt;ip4dst = ~0;</div><div class='add'>+	ip_mask-&gt;pdst = ~0;</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> efx_ethtool_get_rxnfc(struct net_device *net_dev,</div><div class='del'>-		      struct ethtool_rxnfc *info, u32 *rules __always_unused)</div><div class='add'>+		      struct ethtool_rxnfc *info, u32 *rule_locs)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='hunk'>@@ -862,42 +911,80 @@ efx_ethtool_get_rxnfc(struct net_device *net_dev,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	case ETHTOOL_GRXCLSRLCNT:</div><div class='add'>+		info-&gt;data = efx_filter_get_rx_id_limit(efx);</div><div class='add'>+		if (info-&gt;data == 0)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		info-&gt;data |= RX_CLS_LOC_SPECIAL;</div><div class='add'>+		info-&gt;rule_cnt =</div><div class='add'>+			efx_filter_count_rx_used(efx, EFX_FILTER_PRI_MANUAL);</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case ETHTOOL_GRXCLSRULE:</div><div class='add'>+		if (efx_filter_get_rx_id_limit(efx) == 0)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		return efx_ethtool_get_class_rule(efx, &amp;info-&gt;fs);</div><div class='add'>+</div><div class='add'>+	case ETHTOOL_GRXCLSRLALL: {</div><div class='add'>+		s32 rc;</div><div class='add'>+		info-&gt;data = efx_filter_get_rx_id_limit(efx);</div><div class='add'>+		if (info-&gt;data == 0)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		rc = efx_filter_get_rx_ids(efx, EFX_FILTER_PRI_MANUAL,</div><div class='add'>+					   rule_locs, info-&gt;rule_cnt);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return rc;</div><div class='add'>+		info-&gt;rule_cnt = rc;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int efx_ethtool_set_rx_ntuple(struct net_device *net_dev,</div><div class='del'>-				     struct ethtool_rx_ntuple *ntuple)</div><div class='add'>+static int efx_ethtool_set_class_rule(struct efx_nic *efx,</div><div class='add'>+				      struct ethtool_rx_flow_spec *rule)</div><div class='ctx'> {</div><div class='del'>-	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='del'>-	struct ethtool_tcpip4_spec *ip_entry = &amp;ntuple-&gt;fs.h_u.tcp_ip4_spec;</div><div class='del'>-	struct ethtool_tcpip4_spec *ip_mask = &amp;ntuple-&gt;fs.m_u.tcp_ip4_spec;</div><div class='del'>-	struct ethhdr *mac_entry = &amp;ntuple-&gt;fs.h_u.ether_spec;</div><div class='del'>-	struct ethhdr *mac_mask = &amp;ntuple-&gt;fs.m_u.ether_spec;</div><div class='del'>-	struct efx_filter_spec filter;</div><div class='add'>+	struct ethtool_tcpip4_spec *ip_entry = &amp;rule-&gt;h_u.tcp_ip4_spec;</div><div class='add'>+	struct ethtool_tcpip4_spec *ip_mask = &amp;rule-&gt;m_u.tcp_ip4_spec;</div><div class='add'>+	struct ethhdr *mac_entry = &amp;rule-&gt;h_u.ether_spec;</div><div class='add'>+	struct ethhdr *mac_mask = &amp;rule-&gt;m_u.ether_spec;</div><div class='add'>+	struct efx_filter_spec spec;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	/* Range-check action */</div><div class='del'>-	if (ntuple-&gt;fs.action &lt; ETHTOOL_RXNTUPLE_ACTION_CLEAR ||</div><div class='del'>-	    ntuple-&gt;fs.action &gt;= (s32)efx-&gt;n_rx_channels)</div><div class='add'>+	/* Check that user wants us to choose the location */</div><div class='add'>+	if (rule-&gt;location != RX_CLS_LOC_ANY &amp;&amp;</div><div class='add'>+	    rule-&gt;location != RX_CLS_LOC_FIRST &amp;&amp;</div><div class='add'>+	    rule-&gt;location != RX_CLS_LOC_LAST)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Range-check ring_cookie */</div><div class='add'>+	if (rule-&gt;ring_cookie &gt;= efx-&gt;n_rx_channels &amp;&amp;</div><div class='add'>+	    rule-&gt;ring_cookie != RX_CLS_FLOW_DISC)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (~ntuple-&gt;fs.data_mask)</div><div class='add'>+	/* Check for unsupported extensions */</div><div class='add'>+	if ((rule-&gt;flow_type &amp; FLOW_EXT) &amp;&amp;</div><div class='add'>+	    (rule-&gt;m_ext.vlan_etype | rule-&gt;m_ext.data[0] |</div><div class='add'>+	     rule-&gt;m_ext.data[1]))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	efx_filter_init_rx(&amp;filter, EFX_FILTER_PRI_MANUAL, 0,</div><div class='del'>-			   (ntuple-&gt;fs.action == ETHTOOL_RXNTUPLE_ACTION_DROP) ?</div><div class='del'>-			   0xfff : ntuple-&gt;fs.action);</div><div class='add'>+	efx_filter_init_rx(&amp;spec, EFX_FILTER_PRI_MANUAL,</div><div class='add'>+			   (rule-&gt;location == RX_CLS_LOC_FIRST) ?</div><div class='add'>+			   EFX_FILTER_FLAG_RX_OVERRIDE_IP : 0,</div><div class='add'>+			   (rule-&gt;ring_cookie == RX_CLS_FLOW_DISC) ?</div><div class='add'>+			   0xfff : rule-&gt;ring_cookie);</div><div class='ctx'> </div><div class='del'>-	switch (ntuple-&gt;fs.flow_type) {</div><div class='add'>+	switch (rule-&gt;flow_type) {</div><div class='ctx'> 	case TCP_V4_FLOW:</div><div class='ctx'> 	case UDP_V4_FLOW: {</div><div class='del'>-		u8 proto = (ntuple-&gt;fs.flow_type == TCP_V4_FLOW ?</div><div class='add'>+		u8 proto = (rule-&gt;flow_type == TCP_V4_FLOW ?</div><div class='ctx'> 			    IPPROTO_TCP : IPPROTO_UDP);</div><div class='ctx'> </div><div class='ctx'> 		/* Must match all of destination, */</div><div class='del'>-		if (ip_mask-&gt;ip4dst | ip_mask-&gt;pdst)</div><div class='add'>+		if ((__force u32)~ip_mask-&gt;ip4dst |</div><div class='add'>+		    (__force u16)~ip_mask-&gt;pdst)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		/* all or none of source, */</div><div class='ctx'> 		if ((ip_mask-&gt;ip4src | ip_mask-&gt;psrc) &amp;&amp;</div><div class='hunk'>@@ -905,17 +992,17 @@ static int efx_ethtool_set_rx_ntuple(struct net_device *net_dev,</div><div class='ctx'> 		     (__force u16)~ip_mask-&gt;psrc))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		/* and nothing else */</div><div class='del'>-		if ((u8)~ip_mask-&gt;tos | (u16)~ntuple-&gt;fs.vlan_tag_mask)</div><div class='add'>+		if (ip_mask-&gt;tos | rule-&gt;m_ext.vlan_tci)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (!ip_mask-&gt;ip4src)</div><div class='del'>-			rc = efx_filter_set_ipv4_full(&amp;filter, proto,</div><div class='add'>+		if (ip_mask-&gt;ip4src)</div><div class='add'>+			rc = efx_filter_set_ipv4_full(&amp;spec, proto,</div><div class='ctx'> 						      ip_entry-&gt;ip4dst,</div><div class='ctx'> 						      ip_entry-&gt;pdst,</div><div class='ctx'> 						      ip_entry-&gt;ip4src,</div><div class='ctx'> 						      ip_entry-&gt;psrc);</div><div class='ctx'> 		else</div><div class='del'>-			rc = efx_filter_set_ipv4_local(&amp;filter, proto,</div><div class='add'>+			rc = efx_filter_set_ipv4_local(&amp;spec, proto,</div><div class='ctx'> 						       ip_entry-&gt;ip4dst,</div><div class='ctx'> 						       ip_entry-&gt;pdst);</div><div class='ctx'> 		if (rc)</div><div class='hunk'>@@ -923,23 +1010,24 @@ static int efx_ethtool_set_rx_ntuple(struct net_device *net_dev,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	case ETHER_FLOW:</div><div class='del'>-		/* Must match all of destination, */</div><div class='del'>-		if (!is_zero_ether_addr(mac_mask-&gt;h_dest))</div><div class='add'>+	case ETHER_FLOW | FLOW_EXT:</div><div class='add'>+		/* Must match all or none of VID */</div><div class='add'>+		if (rule-&gt;m_ext.vlan_tci != htons(0xfff) &amp;&amp;</div><div class='add'>+		    rule-&gt;m_ext.vlan_tci != 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		/* all or none of VID, */</div><div class='del'>-		if (ntuple-&gt;fs.vlan_tag_mask != 0xf000 &amp;&amp;</div><div class='del'>-		    ntuple-&gt;fs.vlan_tag_mask != 0xffff)</div><div class='add'>+	case ETHER_FLOW:</div><div class='add'>+		/* Must match all of destination */</div><div class='add'>+		if (!is_broadcast_ether_addr(mac_mask-&gt;h_dest))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		/* and nothing else */</div><div class='del'>-		if (!is_broadcast_ether_addr(mac_mask-&gt;h_source) ||</div><div class='del'>-		    mac_mask-&gt;h_proto != htons(0xffff))</div><div class='add'>+		if (!is_zero_ether_addr(mac_mask-&gt;h_source) ||</div><div class='add'>+		    mac_mask-&gt;h_proto)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		rc = efx_filter_set_eth_local(</div><div class='del'>-			&amp;filter,</div><div class='del'>-			(ntuple-&gt;fs.vlan_tag_mask == 0xf000) ?</div><div class='del'>-			ntuple-&gt;fs.vlan_tag : EFX_FILTER_VID_UNSPEC,</div><div class='add'>+			&amp;spec,</div><div class='add'>+			(rule-&gt;flow_type &amp; FLOW_EXT &amp;&amp; rule-&gt;m_ext.vlan_tci) ?</div><div class='add'>+			ntohs(rule-&gt;h_ext.vlan_tci) : EFX_FILTER_VID_UNSPEC,</div><div class='ctx'> 			mac_entry-&gt;h_dest);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			return rc;</div><div class='hunk'>@@ -949,47 +1037,57 @@ static int efx_ethtool_set_rx_ntuple(struct net_device *net_dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ntuple-&gt;fs.action == ETHTOOL_RXNTUPLE_ACTION_CLEAR)</div><div class='del'>-		return efx_filter_remove_filter(efx, &amp;filter);</div><div class='add'>+	rc = efx_filter_insert_filter(efx, &amp;spec, true);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	rc = efx_filter_insert_filter(efx, &amp;filter, true);</div><div class='del'>-	return rc &lt; 0 ? rc : 0;</div><div class='add'>+	rule-&gt;location = rc;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int efx_ethtool_get_rxfh_indir(struct net_device *net_dev,</div><div class='del'>-				      struct ethtool_rxfh_indir *indir)</div><div class='add'>+static int efx_ethtool_set_rxnfc(struct net_device *net_dev,</div><div class='add'>+				 struct ethtool_rxnfc *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='del'>-	size_t copy_size =</div><div class='del'>-		min_t(size_t, indir-&gt;size, ARRAY_SIZE(efx-&gt;rx_indir_table));</div><div class='ctx'> </div><div class='del'>-	if (efx_nic_rev(efx) &lt; EFX_REV_FALCON_B0)</div><div class='add'>+	if (efx_filter_get_rx_id_limit(efx) == 0)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	indir-&gt;size = ARRAY_SIZE(efx-&gt;rx_indir_table);</div><div class='del'>-	memcpy(indir-&gt;ring_index, efx-&gt;rx_indir_table,</div><div class='del'>-	       copy_size * sizeof(indir-&gt;ring_index[0]));</div><div class='del'>-	return 0;</div><div class='add'>+	switch (info-&gt;cmd) {</div><div class='add'>+	case ETHTOOL_SRXCLSRLINS:</div><div class='add'>+		return efx_ethtool_set_class_rule(efx, &amp;info-&gt;fs);</div><div class='add'>+</div><div class='add'>+	case ETHTOOL_SRXCLSRLDEL:</div><div class='add'>+		return efx_filter_remove_id_safe(efx, EFX_FILTER_PRI_MANUAL,</div><div class='add'>+						 info-&gt;fs.location);</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int efx_ethtool_set_rxfh_indir(struct net_device *net_dev,</div><div class='del'>-				      const struct ethtool_rxfh_indir *indir)</div><div class='add'>+static u32 efx_ethtool_get_rxfh_indir_size(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='del'>-	size_t i;</div><div class='ctx'> </div><div class='del'>-	if (efx_nic_rev(efx) &lt; EFX_REV_FALCON_B0)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	return (efx_nic_rev(efx) &lt; EFX_REV_FALCON_B0 ?</div><div class='add'>+		0 : ARRAY_SIZE(efx-&gt;rx_indir_table));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Validate size and indices */</div><div class='del'>-	if (indir-&gt;size != ARRAY_SIZE(efx-&gt;rx_indir_table))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(efx-&gt;rx_indir_table); i++)</div><div class='del'>-		if (indir-&gt;ring_index[i] &gt;= efx-&gt;n_rx_channels)</div><div class='del'>-			return -EINVAL;</div><div class='add'>+static int efx_ethtool_get_rxfh_indir(struct net_device *net_dev, u32 *indir)</div><div class='add'>+{</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='add'>+</div><div class='add'>+	memcpy(indir, efx-&gt;rx_indir_table, sizeof(efx-&gt;rx_indir_table));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int efx_ethtool_set_rxfh_indir(struct net_device *net_dev,</div><div class='add'>+				      const u32 *indir)</div><div class='add'>+{</div><div class='add'>+	struct efx_nic *efx = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='del'>-	memcpy(efx-&gt;rx_indir_table, indir-&gt;ring_index,</div><div class='del'>-	       sizeof(efx-&gt;rx_indir_table));</div><div class='add'>+	memcpy(efx-&gt;rx_indir_table, indir, sizeof(efx-&gt;rx_indir_table));</div><div class='ctx'> 	efx_nic_push_rx_indir_table(efx);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1019,7 +1117,8 @@ const struct ethtool_ops efx_ethtool_ops = {</div><div class='ctx'> 	.set_wol                = efx_ethtool_set_wol,</div><div class='ctx'> 	.reset			= efx_ethtool_reset,</div><div class='ctx'> 	.get_rxnfc		= efx_ethtool_get_rxnfc,</div><div class='del'>-	.set_rx_ntuple		= efx_ethtool_set_rx_ntuple,</div><div class='add'>+	.set_rxnfc		= efx_ethtool_set_rxnfc,</div><div class='add'>+	.get_rxfh_indir_size	= efx_ethtool_get_rxfh_indir_size,</div><div class='ctx'> 	.get_rxfh_indir		= efx_ethtool_get_rxfh_indir,</div><div class='ctx'> 	.set_rxfh_indir		= efx_ethtool_set_rxfh_indir,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/ethernet/sfc/falcon.c b/drivers/net/ethernet/sfc/falcon.c<br/>index 97b606b92e88..8ae1ebd35397 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/falcon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/falcon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/falcon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sfc/falcon.c</a></div><div class='hunk'>@@ -610,7 +610,7 @@ static void falcon_stats_complete(struct efx_nic *efx)</div><div class='ctx'> 	if (!nic_data-&gt;stats_pending)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	nic_data-&gt;stats_pending = 0;</div><div class='add'>+	nic_data-&gt;stats_pending = false;</div><div class='ctx'> 	if (*nic_data-&gt;stats_dma_done == FALCON_STATS_DONE) {</div><div class='ctx'> 		rmb(); /* read the done flag before the stats */</div><div class='ctx'> 		efx-&gt;mac_op-&gt;update_stats(efx);</div><div class='head'>diff --git a/drivers/net/ethernet/sfc/filter.c b/drivers/net/ethernet/sfc/filter.c<br/>index 2b9636f96e05..1fbbbee7b1ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/filter.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/filter.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/filter.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sfc/filter.c</a></div><div class='hunk'>@@ -155,6 +155,16 @@ static inline void __efx_filter_set_ipv4(struct efx_filter_spec *spec,</div><div class='ctx'> 	spec-&gt;data[2] = ntohl(host2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void __efx_filter_get_ipv4(const struct efx_filter_spec *spec,</div><div class='add'>+					 __be32 *host1, __be16 *port1,</div><div class='add'>+					 __be32 *host2, __be16 *port2)</div><div class='add'>+{</div><div class='add'>+	*host1 = htonl(spec-&gt;data[0] &gt;&gt; 16 | spec-&gt;data[1] &lt;&lt; 16);</div><div class='add'>+	*port1 = htons(spec-&gt;data[0]);</div><div class='add'>+	*host2 = htonl(spec-&gt;data[2]);</div><div class='add'>+	*port2 = htons(spec-&gt;data[1] &gt;&gt; 16);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * efx_filter_set_ipv4_local - specify IPv4 host, transport protocol and port</div><div class='ctx'>  * @spec: Specification to initialise</div><div class='hunk'>@@ -205,6 +215,26 @@ int efx_filter_set_ipv4_local(struct efx_filter_spec *spec, u8 proto,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int efx_filter_get_ipv4_local(const struct efx_filter_spec *spec,</div><div class='add'>+			      u8 *proto, __be32 *host, __be16 *port)</div><div class='add'>+{</div><div class='add'>+	__be32 host1;</div><div class='add'>+	__be16 port1;</div><div class='add'>+</div><div class='add'>+	switch (spec-&gt;type) {</div><div class='add'>+	case EFX_FILTER_TCP_WILD:</div><div class='add'>+		*proto = IPPROTO_TCP;</div><div class='add'>+		__efx_filter_get_ipv4(spec, &amp;host1, &amp;port1, host, port);</div><div class='add'>+		return 0;</div><div class='add'>+	case EFX_FILTER_UDP_WILD:</div><div class='add'>+		*proto = IPPROTO_UDP;</div><div class='add'>+		__efx_filter_get_ipv4(spec, &amp;host1, port, host, &amp;port1);</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * efx_filter_set_ipv4_full - specify IPv4 hosts, transport protocol and ports</div><div class='ctx'>  * @spec: Specification to initialise</div><div class='hunk'>@@ -242,6 +272,25 @@ int efx_filter_set_ipv4_full(struct efx_filter_spec *spec, u8 proto,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int efx_filter_get_ipv4_full(const struct efx_filter_spec *spec,</div><div class='add'>+			     u8 *proto, __be32 *host, __be16 *port,</div><div class='add'>+			     __be32 *rhost, __be16 *rport)</div><div class='add'>+{</div><div class='add'>+	switch (spec-&gt;type) {</div><div class='add'>+	case EFX_FILTER_TCP_FULL:</div><div class='add'>+		*proto = IPPROTO_TCP;</div><div class='add'>+		break;</div><div class='add'>+	case EFX_FILTER_UDP_FULL:</div><div class='add'>+		*proto = IPPROTO_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'>+</div><div class='add'>+	__efx_filter_get_ipv4(spec, rhost, rport, host, port);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * efx_filter_set_eth_local - specify local Ethernet address and optional VID</div><div class='ctx'>  * @spec: Specification to initialise</div><div class='hunk'>@@ -270,6 +319,29 @@ int efx_filter_set_eth_local(struct efx_filter_spec *spec,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int efx_filter_get_eth_local(const struct efx_filter_spec *spec,</div><div class='add'>+			     u16 *vid, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	switch (spec-&gt;type) {</div><div class='add'>+	case EFX_FILTER_MAC_WILD:</div><div class='add'>+		*vid = EFX_FILTER_VID_UNSPEC;</div><div class='add'>+		break;</div><div class='add'>+	case EFX_FILTER_MAC_FULL:</div><div class='add'>+		*vid = spec-&gt;data[0];</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	addr[0] = spec-&gt;data[2] &gt;&gt; 8;</div><div class='add'>+	addr[1] = spec-&gt;data[2];</div><div class='add'>+	addr[2] = spec-&gt;data[1] &gt;&gt; 24;</div><div class='add'>+	addr[3] = spec-&gt;data[1] &gt;&gt; 16;</div><div class='add'>+	addr[4] = spec-&gt;data[1] &gt;&gt; 8;</div><div class='add'>+	addr[5] = spec-&gt;data[1];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Build a filter entry and return its n-tuple key. */</div><div class='ctx'> static u32 efx_filter_build(efx_oword_t *filter, struct efx_filter_spec *spec)</div><div class='ctx'> {</div><div class='hunk'>@@ -332,7 +404,7 @@ static bool efx_filter_equal(const struct efx_filter_spec *left,</div><div class='ctx'> </div><div class='ctx'> static int efx_filter_search(struct efx_filter_table *table,</div><div class='ctx'> 			     struct efx_filter_spec *spec, u32 key,</div><div class='del'>-			     bool for_insert, int *depth_required)</div><div class='add'>+			     bool for_insert, unsigned int *depth_required)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned hash, incr, filter_idx, depth, depth_max;</div><div class='ctx'> </div><div class='hunk'>@@ -366,12 +438,59 @@ static int efx_filter_search(struct efx_filter_table *table,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Construct/deconstruct external filter IDs */</div><div class='add'>+/*</div><div class='add'>+ * Construct/deconstruct external filter IDs.  These must be ordered</div><div class='add'>+ * by matching priority, for RX NFC semantics.</div><div class='add'>+ *</div><div class='add'>+ * Each RX MAC filter entry has a flag for whether it can override an</div><div class='add'>+ * RX IP filter that also matches.  So we assign locations for MAC</div><div class='add'>+ * filters with overriding behaviour, then for IP filters, then for</div><div class='add'>+ * MAC filters without overriding behaviour.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define EFX_FILTER_INDEX_WIDTH	13</div><div class='add'>+#define EFX_FILTER_INDEX_MASK	((1 &lt;&lt; EFX_FILTER_INDEX_WIDTH) - 1)</div><div class='add'>+</div><div class='add'>+static inline u32 efx_filter_make_id(enum efx_filter_table_id table_id,</div><div class='add'>+				     unsigned int index, u8 flags)</div><div class='add'>+{</div><div class='add'>+	return (table_id == EFX_FILTER_TABLE_RX_MAC &amp;&amp;</div><div class='add'>+		flags &amp; EFX_FILTER_FLAG_RX_OVERRIDE_IP) ?</div><div class='add'>+		index :</div><div class='add'>+		(table_id + 1) &lt;&lt; EFX_FILTER_INDEX_WIDTH | index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline enum efx_filter_table_id efx_filter_id_table_id(u32 id)</div><div class='add'>+{</div><div class='add'>+	return (id &lt;= EFX_FILTER_INDEX_MASK) ?</div><div class='add'>+		EFX_FILTER_TABLE_RX_MAC :</div><div class='add'>+		(id &gt;&gt; EFX_FILTER_INDEX_WIDTH) - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int efx_filter_id_index(u32 id)</div><div class='add'>+{</div><div class='add'>+	return id &amp; EFX_FILTER_INDEX_MASK;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-efx_filter_make_id(enum efx_filter_table_id table_id, unsigned index)</div><div class='add'>+static inline u8 efx_filter_id_flags(u32 id)</div><div class='ctx'> {</div><div class='del'>-	return table_id &lt;&lt; 16 | index;</div><div class='add'>+	return (id &lt;= EFX_FILTER_INDEX_MASK) ?</div><div class='add'>+		EFX_FILTER_FLAG_RX | EFX_FILTER_FLAG_RX_OVERRIDE_IP :</div><div class='add'>+		EFX_FILTER_FLAG_RX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 efx_filter_get_rx_id_limit(struct efx_nic *efx)</div><div class='add'>+{</div><div class='add'>+	struct efx_filter_state *state = efx-&gt;filter_state;</div><div class='add'>+</div><div class='add'>+	if (state-&gt;table[EFX_FILTER_TABLE_RX_MAC].size != 0)</div><div class='add'>+		return ((EFX_FILTER_TABLE_RX_MAC + 1) &lt;&lt; EFX_FILTER_INDEX_WIDTH)</div><div class='add'>+			+ state-&gt;table[EFX_FILTER_TABLE_RX_MAC].size;</div><div class='add'>+	else if (state-&gt;table[EFX_FILTER_TABLE_RX_IP].size != 0)</div><div class='add'>+		return ((EFX_FILTER_TABLE_RX_IP + 1) &lt;&lt; EFX_FILTER_INDEX_WIDTH)</div><div class='add'>+			+ state-&gt;table[EFX_FILTER_TABLE_RX_IP].size;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -384,14 +503,14 @@ efx_filter_make_id(enum efx_filter_table_id table_id, unsigned index)</div><div class='ctx'>  * On success, return the filter ID.</div><div class='ctx'>  * On failure, return a negative error code.</div><div class='ctx'>  */</div><div class='del'>-int efx_filter_insert_filter(struct efx_nic *efx, struct efx_filter_spec *spec,</div><div class='add'>+s32 efx_filter_insert_filter(struct efx_nic *efx, struct efx_filter_spec *spec,</div><div class='ctx'> 			     bool replace)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_filter_state *state = efx-&gt;filter_state;</div><div class='ctx'> 	struct efx_filter_table *table = efx_filter_spec_table(state, spec);</div><div class='ctx'> 	struct efx_filter_spec *saved_spec;</div><div class='ctx'> 	efx_oword_t filter;</div><div class='del'>-	int filter_idx, depth;</div><div class='add'>+	unsigned int filter_idx, depth;</div><div class='ctx'> 	u32 key;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -439,7 +558,7 @@ int efx_filter_insert_filter(struct efx_nic *efx, struct efx_filter_spec *spec,</div><div class='ctx'> 	netif_vdbg(efx, hw, efx-&gt;net_dev,</div><div class='ctx'> 		   "%s: filter type %d index %d rxq %u set",</div><div class='ctx'> 		   __func__, spec-&gt;type, filter_idx, spec-&gt;dmaq_id);</div><div class='del'>-	rc = efx_filter_make_id(table-&gt;id, filter_idx);</div><div class='add'>+	rc = efx_filter_make_id(table-&gt;id, filter_idx, spec-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_bh(&amp;state-&gt;lock);</div><div class='hunk'>@@ -448,7 +567,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> static void efx_filter_table_clear_entry(struct efx_nic *efx,</div><div class='ctx'> 					 struct efx_filter_table *table,</div><div class='del'>-					 int filter_idx)</div><div class='add'>+					 unsigned int filter_idx)</div><div class='ctx'> {</div><div class='ctx'> 	static efx_oword_t filter;</div><div class='ctx'> </div><div class='hunk'>@@ -463,48 +582,101 @@ static void efx_filter_table_clear_entry(struct efx_nic *efx,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * efx_filter_remove_filter - remove a filter by specification</div><div class='add'>+ * efx_filter_remove_id_safe - remove a filter by ID, carefully</div><div class='ctx'>  * @efx: NIC from which to remove the filter</div><div class='del'>- * @spec: Specification for the filter</div><div class='add'>+ * @priority: Priority of filter, as passed to @efx_filter_insert_filter</div><div class='add'>+ * @filter_id: ID of filter, as returned by @efx_filter_insert_filter</div><div class='ctx'>  *</div><div class='del'>- * On success, return zero.</div><div class='del'>- * On failure, return a negative error code.</div><div class='add'>+ * This function will range-check @filter_id, so it is safe to call</div><div class='add'>+ * with a value passed from userland.</div><div class='ctx'>  */</div><div class='del'>-int efx_filter_remove_filter(struct efx_nic *efx, struct efx_filter_spec *spec)</div><div class='add'>+int efx_filter_remove_id_safe(struct efx_nic *efx,</div><div class='add'>+			      enum efx_filter_priority priority,</div><div class='add'>+			      u32 filter_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_filter_state *state = efx-&gt;filter_state;</div><div class='del'>-	struct efx_filter_table *table = efx_filter_spec_table(state, spec);</div><div class='del'>-	struct efx_filter_spec *saved_spec;</div><div class='del'>-	efx_oword_t filter;</div><div class='del'>-	int filter_idx, depth;</div><div class='del'>-	u32 key;</div><div class='add'>+	enum efx_filter_table_id table_id;</div><div class='add'>+	struct efx_filter_table *table;</div><div class='add'>+	unsigned int filter_idx;</div><div class='add'>+	struct efx_filter_spec *spec;</div><div class='add'>+	u8 filter_flags;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (!table)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	table_id = efx_filter_id_table_id(filter_id);</div><div class='add'>+	if ((unsigned int)table_id &gt;= EFX_FILTER_TABLE_COUNT)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	table = &amp;state-&gt;table[table_id];</div><div class='ctx'> </div><div class='del'>-	key = efx_filter_build(&amp;filter, spec);</div><div class='add'>+	filter_idx = efx_filter_id_index(filter_id);</div><div class='add'>+	if (filter_idx &gt;= table-&gt;size)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	spec = &amp;table-&gt;spec[filter_idx];</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;state-&gt;lock);</div><div class='add'>+	filter_flags = efx_filter_id_flags(filter_id);</div><div class='ctx'> </div><div class='del'>-	rc = efx_filter_search(table, spec, key, false, &amp;depth);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	filter_idx = rc;</div><div class='del'>-	saved_spec = &amp;table-&gt;spec[filter_idx];</div><div class='add'>+	spin_lock_bh(&amp;state-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (spec-&gt;priority &lt; saved_spec-&gt;priority) {</div><div class='del'>-		rc = -EPERM;</div><div class='del'>-		goto out;</div><div class='add'>+	if (test_bit(filter_idx, table-&gt;used_bitmap) &amp;&amp;</div><div class='add'>+	    spec-&gt;priority == priority &amp;&amp; spec-&gt;flags == filter_flags) {</div><div class='add'>+		efx_filter_table_clear_entry(efx, table, filter_idx);</div><div class='add'>+		if (table-&gt;used == 0)</div><div class='add'>+			efx_filter_table_reset_search_depth(table);</div><div class='add'>+		rc = 0;</div><div class='add'>+	} else {</div><div class='add'>+		rc = -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	efx_filter_table_clear_entry(efx, table, filter_idx);</div><div class='del'>-	if (table-&gt;used == 0)</div><div class='del'>-		efx_filter_table_reset_search_depth(table);</div><div class='del'>-	rc = 0;</div><div class='add'>+	spin_unlock_bh(&amp;state-&gt;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'>+ * efx_filter_get_filter_safe - retrieve a filter by ID, carefully</div><div class='add'>+ * @efx: NIC from which to remove the filter</div><div class='add'>+ * @priority: Priority of filter, as passed to @efx_filter_insert_filter</div><div class='add'>+ * @filter_id: ID of filter, as returned by @efx_filter_insert_filter</div><div class='add'>+ * @spec: Buffer in which to store filter specification</div><div class='add'>+ *</div><div class='add'>+ * This function will range-check @filter_id, so it is safe to call</div><div class='add'>+ * with a value passed from userland.</div><div class='add'>+ */</div><div class='add'>+int efx_filter_get_filter_safe(struct efx_nic *efx,</div><div class='add'>+			       enum efx_filter_priority priority,</div><div class='add'>+			       u32 filter_id, struct efx_filter_spec *spec_buf)</div><div class='add'>+{</div><div class='add'>+	struct efx_filter_state *state = efx-&gt;filter_state;</div><div class='add'>+	enum efx_filter_table_id table_id;</div><div class='add'>+	struct efx_filter_table *table;</div><div class='add'>+	struct efx_filter_spec *spec;</div><div class='add'>+	unsigned int filter_idx;</div><div class='add'>+	u8 filter_flags;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	table_id = efx_filter_id_table_id(filter_id);</div><div class='add'>+	if ((unsigned int)table_id &gt;= EFX_FILTER_TABLE_COUNT)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	table = &amp;state-&gt;table[table_id];</div><div class='add'>+</div><div class='add'>+	filter_idx = efx_filter_id_index(filter_id);</div><div class='add'>+	if (filter_idx &gt;= table-&gt;size)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	spec = &amp;table-&gt;spec[filter_idx];</div><div class='add'>+</div><div class='add'>+	filter_flags = efx_filter_id_flags(filter_id);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;state-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (test_bit(filter_idx, table-&gt;used_bitmap) &amp;&amp;</div><div class='add'>+	    spec-&gt;priority == priority &amp;&amp; spec-&gt;flags == filter_flags) {</div><div class='add'>+		*spec_buf = *spec;</div><div class='add'>+		rc = 0;</div><div class='add'>+	} else {</div><div class='add'>+		rc = -ENOENT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	spin_unlock_bh(&amp;state-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -514,7 +686,7 @@ static void efx_filter_table_clear(struct efx_nic *efx,</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_filter_state *state = efx-&gt;filter_state;</div><div class='ctx'> 	struct efx_filter_table *table = &amp;state-&gt;table[table_id];</div><div class='del'>-	int filter_idx;</div><div class='add'>+	unsigned int filter_idx;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;state-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -538,6 +710,68 @@ void efx_filter_clear_rx(struct efx_nic *efx, enum efx_filter_priority priority)</div><div class='ctx'> 	efx_filter_table_clear(efx, EFX_FILTER_TABLE_RX_MAC, priority);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u32 efx_filter_count_rx_used(struct efx_nic *efx,</div><div class='add'>+			     enum efx_filter_priority priority)</div><div class='add'>+{</div><div class='add'>+	struct efx_filter_state *state = efx-&gt;filter_state;</div><div class='add'>+	enum efx_filter_table_id table_id;</div><div class='add'>+	struct efx_filter_table *table;</div><div class='add'>+	unsigned int filter_idx;</div><div class='add'>+	u32 count = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;state-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (table_id = EFX_FILTER_TABLE_RX_IP;</div><div class='add'>+	     table_id &lt;= EFX_FILTER_TABLE_RX_MAC;</div><div class='add'>+	     table_id++) {</div><div class='add'>+		table = &amp;state-&gt;table[table_id];</div><div class='add'>+		for (filter_idx = 0; filter_idx &lt; table-&gt;size; filter_idx++) {</div><div class='add'>+			if (test_bit(filter_idx, table-&gt;used_bitmap) &amp;&amp;</div><div class='add'>+			    table-&gt;spec[filter_idx].priority == priority)</div><div class='add'>+				++count;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;state-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+s32 efx_filter_get_rx_ids(struct efx_nic *efx,</div><div class='add'>+			  enum efx_filter_priority priority,</div><div class='add'>+			  u32 *buf, u32 size)</div><div class='add'>+{</div><div class='add'>+	struct efx_filter_state *state = efx-&gt;filter_state;</div><div class='add'>+	enum efx_filter_table_id table_id;</div><div class='add'>+	struct efx_filter_table *table;</div><div class='add'>+	unsigned int filter_idx;</div><div class='add'>+	s32 count = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;state-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (table_id = EFX_FILTER_TABLE_RX_IP;</div><div class='add'>+	     table_id &lt;= EFX_FILTER_TABLE_RX_MAC;</div><div class='add'>+	     table_id++) {</div><div class='add'>+		table = &amp;state-&gt;table[table_id];</div><div class='add'>+		for (filter_idx = 0; filter_idx &lt; table-&gt;size; filter_idx++) {</div><div class='add'>+			if (test_bit(filter_idx, table-&gt;used_bitmap) &amp;&amp;</div><div class='add'>+			    table-&gt;spec[filter_idx].priority == priority) {</div><div class='add'>+				if (count == size) {</div><div class='add'>+					count = -EMSGSIZE;</div><div class='add'>+					goto out;</div><div class='add'>+				}</div><div class='add'>+				buf[count++] = efx_filter_make_id(</div><div class='add'>+					table_id, filter_idx,</div><div class='add'>+					table-&gt;spec[filter_idx].flags);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_bh(&amp;state-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Restore filter stater after reset */</div><div class='ctx'> void efx_restore_filters(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='hunk'>@@ -545,7 +779,7 @@ void efx_restore_filters(struct efx_nic *efx)</div><div class='ctx'> 	enum efx_filter_table_id table_id;</div><div class='ctx'> 	struct efx_filter_table *table;</div><div class='ctx'> 	efx_oword_t filter;</div><div class='del'>-	int filter_idx;</div><div class='add'>+	unsigned int filter_idx;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;state-&gt;lock);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/sfc/filter.h b/drivers/net/ethernet/sfc/filter.h<br/>index 872f2132a496..3d4108cd90ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/filter.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/filter.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/filter.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sfc/filter.h</a></div><div class='hunk'>@@ -78,6 +78,11 @@ enum efx_filter_flags {</div><div class='ctx'>  *</div><div class='ctx'>  * Use the efx_filter_set_*() functions to initialise the @type and</div><div class='ctx'>  * @data fields.</div><div class='add'>+ *</div><div class='add'>+ * The @priority field is used by software to determine whether a new</div><div class='add'>+ * filter may replace an old one.  The hardware priority of a filter</div><div class='add'>+ * depends on the filter type and %EFX_FILTER_FLAG_RX_OVERRIDE_IP</div><div class='add'>+ * flag.</div><div class='ctx'>  */</div><div class='ctx'> struct efx_filter_spec {</div><div class='ctx'> 	u8	type:4;</div><div class='hunk'>@@ -100,11 +105,18 @@ static inline void efx_filter_init_rx(struct efx_filter_spec *spec,</div><div class='ctx'> </div><div class='ctx'> extern int efx_filter_set_ipv4_local(struct efx_filter_spec *spec, u8 proto,</div><div class='ctx'> 				     __be32 host, __be16 port);</div><div class='add'>+extern int efx_filter_get_ipv4_local(const struct efx_filter_spec *spec,</div><div class='add'>+				     u8 *proto, __be32 *host, __be16 *port);</div><div class='ctx'> extern int efx_filter_set_ipv4_full(struct efx_filter_spec *spec, u8 proto,</div><div class='ctx'> 				    __be32 host, __be16 port,</div><div class='ctx'> 				    __be32 rhost, __be16 rport);</div><div class='add'>+extern int efx_filter_get_ipv4_full(const struct efx_filter_spec *spec,</div><div class='add'>+				    u8 *proto, __be32 *host, __be16 *port,</div><div class='add'>+				    __be32 *rhost, __be16 *rport);</div><div class='ctx'> extern int efx_filter_set_eth_local(struct efx_filter_spec *spec,</div><div class='ctx'> 				    u16 vid, const u8 *addr);</div><div class='add'>+extern int efx_filter_get_eth_local(const struct efx_filter_spec *spec,</div><div class='add'>+				    u16 *vid, u8 *addr);</div><div class='ctx'> enum {</div><div class='ctx'> 	EFX_FILTER_VID_UNSPEC = 0xffff,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/ethernet/sfc/mtd.c b/drivers/net/ethernet/sfc/mtd.c<br/>index b6304486f244..bc9dcd6b30d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/mtd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/mtd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/mtd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sfc/mtd.c</a></div><div class='hunk'>@@ -496,7 +496,7 @@ static int siena_mtd_erase(struct mtd_info *mtd, loff_t start, size_t len)</div><div class='ctx'> 		rc = efx_mcdi_nvram_update_start(efx, part-&gt;mcdi.nvram_type);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto out;</div><div class='del'>-		part-&gt;mcdi.updating = 1;</div><div class='add'>+		part-&gt;mcdi.updating = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* The MCDI interface can in fact do multiple erase blocks at once;</div><div class='hunk'>@@ -528,7 +528,7 @@ static int siena_mtd_write(struct mtd_info *mtd, loff_t start,</div><div class='ctx'> 		rc = efx_mcdi_nvram_update_start(efx, part-&gt;mcdi.nvram_type);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto out;</div><div class='del'>-		part-&gt;mcdi.updating = 1;</div><div class='add'>+		part-&gt;mcdi.updating = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (offset &lt; end) {</div><div class='hunk'>@@ -553,7 +553,7 @@ static int siena_mtd_sync(struct mtd_info *mtd)</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (part-&gt;mcdi.updating) {</div><div class='del'>-		part-&gt;mcdi.updating = 0;</div><div class='add'>+		part-&gt;mcdi.updating = false;</div><div class='ctx'> 		rc = efx_mcdi_nvram_update_finish(efx, part-&gt;mcdi.nvram_type);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h<br/>index b8e251a1ee48..c49502bab6a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/net_driver.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/net_driver.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/net_driver.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sfc/net_driver.h</a></div><div class='hunk'>@@ -908,7 +908,7 @@ struct efx_nic_type {</div><div class='ctx'> 	unsigned int phys_addr_channels;</div><div class='ctx'> 	unsigned int tx_dc_base;</div><div class='ctx'> 	unsigned int rx_dc_base;</div><div class='del'>-	u32 offload_features;</div><div class='add'>+	netdev_features_t offload_features;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**************************************************************************</div><div class='head'>diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c<br/>index 752d521c09b1..aca349861767 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/rx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/rx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sfc/rx.c</a></div><div class='hunk'>@@ -479,11 +479,8 @@ static void efx_rx_packet_gro(struct efx_channel *channel,</div><div class='ctx'> 		if (efx-&gt;net_dev-&gt;features &amp; NETIF_F_RXHASH)</div><div class='ctx'> 			skb-&gt;rxhash = efx_rx_buf_hash(eh);</div><div class='ctx'> </div><div class='del'>-		skb_frag_set_page(skb, 0, page);</div><div class='del'>-		skb_shinfo(skb)-&gt;frags[0].page_offset =</div><div class='del'>-			efx_rx_buf_offset(efx, rx_buf);</div><div class='del'>-		skb_frag_size_set(&amp;skb_shinfo(skb)-&gt;frags[0], rx_buf-&gt;len);</div><div class='del'>-		skb_shinfo(skb)-&gt;nr_frags = 1;</div><div class='add'>+		skb_fill_page_desc(skb, 0, page,</div><div class='add'>+				   efx_rx_buf_offset(efx, rx_buf), rx_buf-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 		skb-&gt;len = rx_buf-&gt;len;</div><div class='ctx'> 		skb-&gt;data_len = rx_buf-&gt;len;</div><div class='hunk'>@@ -669,7 +666,7 @@ int efx_probe_rx_queue(struct efx_rx_queue *rx_queue)</div><div class='ctx'> 		  rx_queue-&gt;ptr_mask);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate RX buffers */</div><div class='del'>-	rx_queue-&gt;buffer = kzalloc(entries * sizeof(*rx_queue-&gt;buffer),</div><div class='add'>+	rx_queue-&gt;buffer = kcalloc(entries, sizeof(*rx_queue-&gt;buffer),</div><div class='ctx'> 				   GFP_KERNEL);</div><div class='ctx'> 	if (!rx_queue-&gt;buffer)</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/drivers/net/ethernet/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c<br/>index 822f6c2a6a7c..52edd24fcde3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/selftest.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/selftest.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/selftest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sfc/selftest.c</a></div><div class='hunk'>@@ -503,8 +503,8 @@ efx_test_loopback(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 		/* Determine how many packets to send */</div><div class='ctx'> 		state-&gt;packet_count = efx-&gt;txq_entries / 3;</div><div class='ctx'> 		state-&gt;packet_count = min(1 &lt;&lt; (i &lt;&lt; 2), state-&gt;packet_count);</div><div class='del'>-		state-&gt;skbs = kzalloc(sizeof(state-&gt;skbs[0]) *</div><div class='del'>-				      state-&gt;packet_count, GFP_KERNEL);</div><div class='add'>+		state-&gt;skbs = kcalloc(state-&gt;packet_count,</div><div class='add'>+				      sizeof(state-&gt;skbs[0]), GFP_KERNEL);</div><div class='ctx'> 		if (!state-&gt;skbs)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		state-&gt;flush = false;</div><div class='head'>diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c<br/>index cc2549cb7076..4d5d619feaa6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/siena.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/siena.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/siena.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sfc/siena.c</a></div><div class='hunk'>@@ -232,7 +232,7 @@ static int siena_probe_nvconfig(struct efx_nic *efx)</div><div class='ctx'> static int siena_probe_nic(struct efx_nic *efx)</div><div class='ctx'> {</div><div class='ctx'> 	struct siena_nic_data *nic_data;</div><div class='del'>-	bool already_attached = 0;</div><div class='add'>+	bool already_attached = false;</div><div class='ctx'> 	efx_oword_t reg;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c<br/>index df88c5430f95..72f0fbc73b1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/tx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sfc/tx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sfc/tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sfc/tx.c</a></div><div class='hunk'>@@ -31,7 +31,9 @@</div><div class='ctx'> #define EFX_TXQ_THRESHOLD(_efx) ((_efx)-&gt;txq_entries / 2u)</div><div class='ctx'> </div><div class='ctx'> static void efx_dequeue_buffer(struct efx_tx_queue *tx_queue,</div><div class='del'>-			       struct efx_tx_buffer *buffer)</div><div class='add'>+			       struct efx_tx_buffer *buffer,</div><div class='add'>+			       unsigned int *pkts_compl,</div><div class='add'>+			       unsigned int *bytes_compl)</div><div class='ctx'> {</div><div class='ctx'> 	if (buffer-&gt;unmap_len) {</div><div class='ctx'> 		struct pci_dev *pci_dev = tx_queue-&gt;efx-&gt;pci_dev;</div><div class='hunk'>@@ -48,6 +50,8 @@ static void efx_dequeue_buffer(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (buffer-&gt;skb) {</div><div class='add'>+		(*pkts_compl)++;</div><div class='add'>+		(*bytes_compl) += buffer-&gt;skb-&gt;len;</div><div class='ctx'> 		dev_kfree_skb_any((struct sk_buff *) buffer-&gt;skb);</div><div class='ctx'> 		buffer-&gt;skb = NULL;</div><div class='ctx'> 		netif_vdbg(tx_queue-&gt;efx, tx_done, tx_queue-&gt;efx-&gt;net_dev,</div><div class='hunk'>@@ -250,6 +254,8 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb)</div><div class='ctx'> 	buffer-&gt;skb = skb;</div><div class='ctx'> 	buffer-&gt;continuation = false;</div><div class='ctx'> </div><div class='add'>+	netdev_tx_sent_queue(tx_queue-&gt;core_txq, skb-&gt;len);</div><div class='add'>+</div><div class='ctx'> 	/* Pass off to hardware */</div><div class='ctx'> 	efx_nic_push_buffers(tx_queue);</div><div class='ctx'> </div><div class='hunk'>@@ -267,10 +273,11 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb)</div><div class='ctx'>  unwind:</div><div class='ctx'> 	/* Work backwards until we hit the original insert pointer value */</div><div class='ctx'> 	while (tx_queue-&gt;insert_count != tx_queue-&gt;write_count) {</div><div class='add'>+		unsigned int pkts_compl = 0, bytes_compl = 0;</div><div class='ctx'> 		--tx_queue-&gt;insert_count;</div><div class='ctx'> 		insert_ptr = tx_queue-&gt;insert_count &amp; tx_queue-&gt;ptr_mask;</div><div class='ctx'> 		buffer = &amp;tx_queue-&gt;buffer[insert_ptr];</div><div class='del'>-		efx_dequeue_buffer(tx_queue, buffer);</div><div class='add'>+		efx_dequeue_buffer(tx_queue, buffer, &amp;pkts_compl, &amp;bytes_compl);</div><div class='ctx'> 		buffer-&gt;len = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -293,7 +300,9 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb)</div><div class='ctx'>  * specified index.</div><div class='ctx'>  */</div><div class='ctx'> static void efx_dequeue_buffers(struct efx_tx_queue *tx_queue,</div><div class='del'>-				unsigned int index)</div><div class='add'>+				unsigned int index,</div><div class='add'>+				unsigned int *pkts_compl,</div><div class='add'>+				unsigned int *bytes_compl)</div><div class='ctx'> {</div><div class='ctx'> 	struct efx_nic *efx = tx_queue-&gt;efx;</div><div class='ctx'> 	unsigned int stop_index, read_ptr;</div><div class='hunk'>@@ -311,7 +320,7 @@ static void efx_dequeue_buffers(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		efx_dequeue_buffer(tx_queue, buffer);</div><div class='add'>+		efx_dequeue_buffer(tx_queue, buffer, pkts_compl, bytes_compl);</div><div class='ctx'> 		buffer-&gt;continuation = true;</div><div class='ctx'> 		buffer-&gt;len = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -422,10 +431,12 @@ void efx_xmit_done(struct efx_tx_queue *tx_queue, unsigned int index)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned fill_level;</div><div class='ctx'> 	struct efx_nic *efx = tx_queue-&gt;efx;</div><div class='add'>+	unsigned int pkts_compl = 0, bytes_compl = 0;</div><div class='ctx'> </div><div class='ctx'> 	EFX_BUG_ON_PARANOID(index &gt; tx_queue-&gt;ptr_mask);</div><div class='ctx'> </div><div class='del'>-	efx_dequeue_buffers(tx_queue, index);</div><div class='add'>+	efx_dequeue_buffers(tx_queue, index, &amp;pkts_compl, &amp;bytes_compl);</div><div class='add'>+	netdev_tx_completed_queue(tx_queue-&gt;core_txq, pkts_compl, bytes_compl);</div><div class='ctx'> </div><div class='ctx'> 	/* See if we need to restart the netif queue.  This barrier</div><div class='ctx'> 	 * separates the update of read_count from the test of the</div><div class='hunk'>@@ -468,7 +479,7 @@ int efx_probe_tx_queue(struct efx_tx_queue *tx_queue)</div><div class='ctx'> 		  tx_queue-&gt;queue, efx-&gt;txq_entries, tx_queue-&gt;ptr_mask);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate software ring */</div><div class='del'>-	tx_queue-&gt;buffer = kzalloc(entries * sizeof(*tx_queue-&gt;buffer),</div><div class='add'>+	tx_queue-&gt;buffer = kcalloc(entries, sizeof(*tx_queue-&gt;buffer),</div><div class='ctx'> 				   GFP_KERNEL);</div><div class='ctx'> 	if (!tx_queue-&gt;buffer)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -515,13 +526,15 @@ void efx_release_tx_buffers(struct efx_tx_queue *tx_queue)</div><div class='ctx'> </div><div class='ctx'> 	/* Free any buffers left in the ring */</div><div class='ctx'> 	while (tx_queue-&gt;read_count != tx_queue-&gt;write_count) {</div><div class='add'>+		unsigned int pkts_compl = 0, bytes_compl = 0;</div><div class='ctx'> 		buffer = &amp;tx_queue-&gt;buffer[tx_queue-&gt;read_count &amp; tx_queue-&gt;ptr_mask];</div><div class='del'>-		efx_dequeue_buffer(tx_queue, buffer);</div><div class='add'>+		efx_dequeue_buffer(tx_queue, buffer, &amp;pkts_compl, &amp;bytes_compl);</div><div class='ctx'> 		buffer-&gt;continuation = true;</div><div class='ctx'> 		buffer-&gt;len = 0;</div><div class='ctx'> </div><div class='ctx'> 		++tx_queue-&gt;read_count;</div><div class='ctx'> 	}</div><div class='add'>+	netdev_tx_reset_queue(tx_queue-&gt;core_txq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void efx_fini_tx_queue(struct efx_tx_queue *tx_queue)</div><div class='hunk'>@@ -1160,6 +1173,8 @@ static int efx_enqueue_skb_tso(struct efx_tx_queue *tx_queue,</div><div class='ctx'> 			goto mem_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netdev_tx_sent_queue(tx_queue-&gt;core_txq, skb-&gt;len);</div><div class='add'>+</div><div class='ctx'> 	/* Pass off to hardware */</div><div class='ctx'> 	efx_nic_push_buffers(tx_queue);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/sgi/meth.c b/drivers/net/ethernet/sgi/meth.c<br/>index 60135aa55802..53efe7c7b1c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sgi/meth.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sgi/meth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sgi/meth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sgi/meth.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;linux/tcp.h&gt;         /* struct tcphdr */</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/mii.h&gt;         /* MII definitions */</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ip32/mace.h&gt;</div><div class='ctx'> #include &lt;asm/ip32/ip32_ints.h&gt;</div><div class='hunk'>@@ -58,12 +59,19 @@ static int timeout = TX_TIMEOUT;</div><div class='ctx'> module_param(timeout, int, 0);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Maximum number of multicast addresses to filter (vs. Rx-all-multicast).</div><div class='add'>+ * MACE Ethernet uses a 64 element hash table based on the Ethernet CRC.</div><div class='add'>+ */</div><div class='add'>+#define METH_MCF_LIMIT 32</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * This structure is private to each device. It is used to pass</div><div class='ctx'>  * packets in and out, so there is place for a packet</div><div class='ctx'>  */</div><div class='ctx'> struct meth_private {</div><div class='ctx'> 	/* in-memory copy of MAC Control register */</div><div class='del'>-	unsigned long mac_ctrl;</div><div class='add'>+	u64 mac_ctrl;</div><div class='add'>+</div><div class='ctx'> 	/* in-memory copy of DMA Control register */</div><div class='ctx'> 	unsigned long dma_ctrl;</div><div class='ctx'> 	/* address of PHY, used by mdio_* functions, initialized in mdio_probe */</div><div class='hunk'>@@ -79,6 +87,9 @@ struct meth_private {</div><div class='ctx'> 	struct sk_buff *rx_skbs[RX_RING_ENTRIES];</div><div class='ctx'> 	unsigned long rx_write;</div><div class='ctx'> </div><div class='add'>+	/* Multicast filter. */</div><div class='add'>+	u64 mcast_filter;</div><div class='add'>+</div><div class='ctx'> 	spinlock_t meth_lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -765,6 +776,40 @@ static int meth_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void meth_set_rx_mode(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct meth_private *priv = netdev_priv(dev);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(dev);</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;meth_lock, flags);</div><div class='add'>+	priv-&gt;mac_ctrl &amp;= ~METH_PROMISC;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+		priv-&gt;mac_ctrl |= METH_PROMISC;</div><div class='add'>+		priv-&gt;mcast_filter = 0xffffffffffffffffUL;</div><div class='add'>+	} else if ((netdev_mc_count(dev) &gt; METH_MCF_LIMIT) ||</div><div class='add'>+		   (dev-&gt;flags &amp; IFF_ALLMULTI)) {</div><div class='add'>+		priv-&gt;mac_ctrl |= METH_ACCEPT_AMCAST;</div><div class='add'>+		priv-&gt;mcast_filter = 0xffffffffffffffffUL;</div><div class='add'>+	} else {</div><div class='add'>+		struct netdev_hw_addr *ha;</div><div class='add'>+		priv-&gt;mac_ctrl |= METH_ACCEPT_MCAST;</div><div class='add'>+</div><div class='add'>+		netdev_for_each_mc_addr(ha, dev)</div><div class='add'>+			set_bit((ether_crc(ETH_ALEN, ha-&gt;addr) &gt;&gt; 26),</div><div class='add'>+			        (volatile unsigned long *)&amp;priv-&gt;mcast_filter);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Write the changes to the chip registers. */</div><div class='add'>+	mace-&gt;eth.mac_ctrl = priv-&gt;mac_ctrl;</div><div class='add'>+	mace-&gt;eth.mcast_filter = priv-&gt;mcast_filter;</div><div class='add'>+</div><div class='add'>+	/* Done! */</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;meth_lock, flags);</div><div class='add'>+	netif_wake_queue(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops meth_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= meth_open,</div><div class='ctx'> 	.ndo_stop		= meth_release,</div><div class='hunk'>@@ -774,6 +819,7 @@ static const struct net_device_ops meth_netdev_ops = {</div><div class='ctx'> 	.ndo_change_mtu		= eth_change_mtu,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_set_mac_address	= eth_mac_addr,</div><div class='add'>+	.ndo_set_rx_mode    	= meth_set_rx_mode,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -830,24 +876,7 @@ static struct platform_driver meth_driver = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init meth_init_module(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = platform_driver_register(&amp;meth_driver);</div><div class='del'>-	if (err)</div><div class='del'>-		printk(KERN_ERR "Driver registration failed\n");</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit meth_exit_module(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;meth_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(meth_init_module);</div><div class='del'>-module_exit(meth_exit_module);</div><div class='add'>+module_platform_driver(meth_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Ilya Volynets &lt;ilya@theIlya.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("SGI O2 Builtin Fast Ethernet driver");</div><div class='head'>diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c<br/>index 1b4658c99391..5b118cd5bf94 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sis/sis190.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sis/sis190.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sis/sis190.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sis/sis190.c</a></div><div class='hunk'>@@ -47,8 +47,6 @@</div><div class='ctx'> #define sis190_rx_skb			netif_rx</div><div class='ctx'> #define sis190_rx_quota(count, quota)	count</div><div class='ctx'> </div><div class='del'>-#define MAC_ADDR_LEN		6</div><div class='del'>-</div><div class='ctx'> #define NUM_TX_DESC		64	/* [8..1024] */</div><div class='ctx'> #define NUM_RX_DESC		64	/* [8..8192] */</div><div class='ctx'> #define TX_RING_BYTES		(NUM_TX_DESC * sizeof(struct TxDesc))</div><div class='hunk'>@@ -1601,7 +1599,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get MAC address from EEPROM */</div><div class='del'>-	for (i = 0; i &lt; MAC_ADDR_LEN / 2; i++) {</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN / 2; i++) {</div><div class='ctx'> 		u16 w = sis190_read_eeprom(ioaddr, EEPROMMACAddr + i);</div><div class='ctx'> </div><div class='ctx'> 		((__le16 *)dev-&gt;dev_addr)[i] = cpu_to_le16(w);</div><div class='hunk'>@@ -1653,7 +1651,7 @@ static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,</div><div class='ctx'> 	udelay(50);</div><div class='ctx'> 	pci_read_config_byte(isa_bridge, 0x48, &amp;reg);</div><div class='ctx'> </div><div class='del'>-        for (i = 0; i &lt; MAC_ADDR_LEN; i++) {</div><div class='add'>+        for (i = 0; i &lt; ETH_ALEN; i++) {</div><div class='ctx'>                 outb(0x9 + i, 0x78);</div><div class='ctx'>                 dev-&gt;dev_addr[i] = inb(0x79);</div><div class='ctx'>         }</div><div class='hunk'>@@ -1692,7 +1690,7 @@ static inline void sis190_init_rxfilter(struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	SIS_W16(RxMacControl, ctl &amp; ~0x0f00);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAC_ADDR_LEN; i++)</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='ctx'> 		SIS_W8(RxMacAddr + i, dev-&gt;dev_addr[i]);</div><div class='ctx'> </div><div class='ctx'> 	SIS_W16(RxMacControl, ctl);</div><div class='hunk'>@@ -1760,9 +1758,10 @@ static void sis190_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct sis190_private *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(tp-&gt;pci_dev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(tp-&gt;pci_dev),</div><div class='add'>+		sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sis190_get_regs_len(struct net_device *dev)</div><div class='head'>diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c<br/>index a184abc5ef11..c8efc708c792 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sis/sis900.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sis/sis900.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sis/sis900.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sis/sis900.c</a></div><div class='hunk'>@@ -1991,9 +1991,10 @@ static void sis900_get_drvinfo(struct net_device *net_dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct sis900_private *sis_priv = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='del'>-	strcpy (info-&gt;driver, SIS900_MODULE_NAME);</div><div class='del'>-	strcpy (info-&gt;version, SIS900_DRV_VERSION);</div><div class='del'>-	strcpy (info-&gt;bus_info, pci_name(sis_priv-&gt;pci_dev));</div><div class='add'>+	strlcpy(info-&gt;driver, SIS900_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, SIS900_DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(sis_priv-&gt;pci_dev),</div><div class='add'>+		sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 sis900_get_msglevel(struct net_device *net_dev)</div><div class='head'>diff --git a/drivers/net/ethernet/sis/sis900.h b/drivers/net/ethernet/sis/sis900.h<br/>index 150511a922ef..1341f33e6084 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sis/sis900.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sis/sis900.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sis/sis900.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sis/sis900.h</a></div><div class='hunk'>@@ -205,7 +205,7 @@ enum sis900_tx_buffer_status {</div><div class='ctx'> 	EXCCOLL = 0x00100000, COLCNT   = 0x000F0000</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum sis900_rx_bufer_status {</div><div class='add'>+enum sis900_rx_buffer_status {</div><div class='ctx'> 	OVERRUN = 0x02000000, DEST = 0x00800000,     BCAST = 0x01800000,</div><div class='ctx'> 	MCAST   = 0x01000000, UNIMATCH = 0x00800000, TOOLONG = 0x00400000,</div><div class='ctx'> 	RUNT    = 0x00200000, RXISERR  = 0x00100000, CRCERR  = 0x00080000,</div><div class='head'>diff --git a/drivers/net/ethernet/smsc/epic100.c b/drivers/net/ethernet/smsc/epic100.c<br/>index 0a5dfb814157..2c077ce0b6d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/smsc/epic100.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/smsc/epic100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/smsc/epic100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/smsc/epic100.c</a></div><div class='hunk'>@@ -1414,9 +1414,9 @@ static void netdev_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *</div><div class='ctx'> {</div><div class='ctx'> 	struct epic_private *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy (info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy (info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy (info-&gt;bus_info, pci_name(np-&gt;pci_dev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='head'>diff --git a/drivers/net/ethernet/smsc/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c<br/>index 8f61fe9db1d0..313ba3b32ab4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/smsc/smc911x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/smsc/smc911x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/smsc/smc911x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/smsc/smc911x.c</a></div><div class='hunk'>@@ -2196,15 +2196,4 @@ static struct platform_driver smc911x_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init smc911x_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;smc911x_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit smc911x_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;smc911x_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(smc911x_init);</div><div class='del'>-module_exit(smc911x_cleanup);</div><div class='add'>+module_platform_driver(smc911x_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/smsc/smc91c92_cs.c b/drivers/net/ethernet/smsc/smc91c92_cs.c<br/>index cbfa98187131..ada927aba7a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/smsc/smc91c92_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/smsc/smc91c92_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/smsc/smc91c92_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/smsc/smc91c92_cs.c</a></div><div class='hunk'>@@ -1909,8 +1909,8 @@ static int check_if_running(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static void smc_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int smc_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)</div><div class='head'>diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c<br/>index f47f81e25322..64ad3ed74495 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/smsc/smc91x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/smsc/smc91x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/smsc/smc91x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/smsc/smc91x.c</a></div><div class='hunk'>@@ -2417,15 +2417,4 @@ static struct platform_driver smc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init smc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;smc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit smc_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;smc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(smc_init);</div><div class='del'>-module_exit(smc_cleanup);</div><div class='add'>+module_platform_driver(smc_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c<br/>index 8843071fe987..24d2df068d71 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/smsc/smsc911x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/smsc/smsc911x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/smsc/smsc911x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/smsc/smsc911x.c</a></div><div class='hunk'>@@ -44,6 +44,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/regulator/consumer.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='hunk'>@@ -88,6 +89,8 @@ struct smsc911x_ops {</div><div class='ctx'> 				unsigned int *buf, unsigned int wordcount);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define SMSC911X_NUM_SUPPLIES 2</div><div class='add'>+</div><div class='ctx'> struct smsc911x_data {</div><div class='ctx'> 	void __iomem *ioaddr;</div><div class='ctx'> </div><div class='hunk'>@@ -138,6 +141,9 @@ struct smsc911x_data {</div><div class='ctx'> </div><div class='ctx'> 	/* register access functions */</div><div class='ctx'> 	const struct smsc911x_ops *ops;</div><div class='add'>+</div><div class='add'>+	/* regulators */</div><div class='add'>+	struct regulator_bulk_data supplies[SMSC911X_NUM_SUPPLIES];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Easy access to information */</div><div class='hunk'>@@ -362,6 +368,76 @@ out:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;pdata-&gt;dev_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * enable resources, currently just regulators.</div><div class='add'>+ */</div><div class='add'>+static int smsc911x_enable_resources(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='add'>+	struct smsc911x_data *pdata = netdev_priv(ndev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	ret = regulator_bulk_enable(ARRAY_SIZE(pdata-&gt;supplies),</div><div class='add'>+			pdata-&gt;supplies);</div><div class='add'>+	if (ret)</div><div class='add'>+		netdev_err(ndev, "failed to enable regulators %d\n",</div><div class='add'>+				ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * disable resources, currently just regulators.</div><div class='add'>+ */</div><div class='add'>+static int smsc911x_disable_resources(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='add'>+	struct smsc911x_data *pdata = netdev_priv(ndev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	ret = regulator_bulk_disable(ARRAY_SIZE(pdata-&gt;supplies),</div><div class='add'>+			pdata-&gt;supplies);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Request resources, currently just regulators.</div><div class='add'>+ *</div><div class='add'>+ * The SMSC911x has two power pins: vddvario and vdd33a, in designs where</div><div class='add'>+ * these are not always-on we need to request regulators to be turned on</div><div class='add'>+ * before we can try to access the device registers.</div><div class='add'>+ */</div><div class='add'>+static int smsc911x_request_resources(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='add'>+	struct smsc911x_data *pdata = netdev_priv(ndev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Request regulators */</div><div class='add'>+	pdata-&gt;supplies[0].supply = "vdd33a";</div><div class='add'>+	pdata-&gt;supplies[1].supply = "vddvario";</div><div class='add'>+	ret = regulator_bulk_get(&amp;pdev-&gt;dev,</div><div class='add'>+			ARRAY_SIZE(pdata-&gt;supplies),</div><div class='add'>+			pdata-&gt;supplies);</div><div class='add'>+	if (ret)</div><div class='add'>+		netdev_err(ndev, "couldn't get regulators %d\n",</div><div class='add'>+				ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Free resources, currently just regulators.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void smsc911x_free_resources(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='add'>+	struct smsc911x_data *pdata = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	/* Free regulators */</div><div class='add'>+	regulator_bulk_free(ARRAY_SIZE(pdata-&gt;supplies),</div><div class='add'>+			pdata-&gt;supplies);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* waits for MAC not busy, with timeout.  Only called by smsc911x_mac_read</div><div class='ctx'>  * and smsc911x_mac_write, so assumes mac_lock is held */</div><div class='ctx'> static int smsc911x_mac_complete(struct smsc911x_data *pdata)</div><div class='hunk'>@@ -968,7 +1044,8 @@ static int __devinit smsc911x_mii_init(struct platform_device *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pdata-&gt;mii_bus-&gt;name = SMSC_MDIONAME;</div><div class='del'>-	snprintf(pdata-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%x", pdev-&gt;id);</div><div class='add'>+	snprintf(pdata-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%s-%x",</div><div class='add'>+		pdev-&gt;name, pdev-&gt;id);</div><div class='ctx'> 	pdata-&gt;mii_bus-&gt;priv = pdata;</div><div class='ctx'> 	pdata-&gt;mii_bus-&gt;read = smsc911x_mii_read;</div><div class='ctx'> 	pdata-&gt;mii_bus-&gt;write = smsc911x_mii_write;</div><div class='hunk'>@@ -1243,10 +1320,92 @@ static void smsc911x_rx_multicast_update_workaround(struct smsc911x_data *pdata)</div><div class='ctx'> 	spin_unlock(&amp;pdata-&gt;mac_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int smsc911x_phy_disable_energy_detect(struct smsc911x_data *pdata)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (!pdata-&gt;phy_dev)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = phy_read(pdata-&gt;phy_dev, MII_LAN83C185_CTRL_STATUS);</div><div class='add'>+</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		SMSC_WARN(pdata, drv, "Failed reading PHY control reg");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If energy is detected the PHY is already awake so is not necessary</div><div class='add'>+	 * to disable the energy detect power-down mode.</div><div class='add'>+	 */</div><div class='add'>+	if ((rc &amp; MII_LAN83C185_EDPWRDOWN) &amp;&amp;</div><div class='add'>+	    !(rc &amp; MII_LAN83C185_ENERGYON)) {</div><div class='add'>+		/* Disable energy detect mode for this SMSC Transceivers */</div><div class='add'>+		rc = phy_write(pdata-&gt;phy_dev, MII_LAN83C185_CTRL_STATUS,</div><div class='add'>+			       rc &amp; (~MII_LAN83C185_EDPWRDOWN));</div><div class='add'>+</div><div class='add'>+		if (rc &lt; 0) {</div><div class='add'>+			SMSC_WARN(pdata, drv, "Failed writing PHY control reg");</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mdelay(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc911x_phy_enable_energy_detect(struct smsc911x_data *pdata)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (!pdata-&gt;phy_dev)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = phy_read(pdata-&gt;phy_dev, MII_LAN83C185_CTRL_STATUS);</div><div class='add'>+</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		SMSC_WARN(pdata, drv, "Failed reading PHY control reg");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Only enable if energy detect mode is already disabled */</div><div class='add'>+	if (!(rc &amp; MII_LAN83C185_EDPWRDOWN)) {</div><div class='add'>+		mdelay(100);</div><div class='add'>+		/* Enable energy detect mode for this SMSC Transceivers */</div><div class='add'>+		rc = phy_write(pdata-&gt;phy_dev, MII_LAN83C185_CTRL_STATUS,</div><div class='add'>+			       rc | MII_LAN83C185_EDPWRDOWN);</div><div class='add'>+</div><div class='add'>+		if (rc &lt; 0) {</div><div class='add'>+			SMSC_WARN(pdata, drv, "Failed writing PHY control reg");</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mdelay(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 smsc911x_soft_reset(struct smsc911x_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int timeout;</div><div class='ctx'> 	unsigned int temp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * LAN9210/LAN9211/LAN9220/LAN9221 chips have an internal PHY that</div><div class='add'>+	 * are initialized in a Energy Detect Power-Down mode that prevents</div><div class='add'>+	 * the MAC chip to be software reseted. So we have to wakeup the PHY</div><div class='add'>+	 * before.</div><div class='add'>+	 */</div><div class='add'>+	if (pdata-&gt;generation == 4) {</div><div class='add'>+		ret = smsc911x_phy_disable_energy_detect(pdata);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			SMSC_WARN(pdata, drv, "Failed to wakeup the PHY chip");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Reset the LAN911x */</div><div class='ctx'> 	smsc911x_reg_write(pdata, HW_CFG, HW_CFG_SRST_);</div><div class='hunk'>@@ -1260,6 +1419,16 @@ static int smsc911x_soft_reset(struct smsc911x_data *pdata)</div><div class='ctx'> 		SMSC_WARN(pdata, drv, "Failed to complete reset");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;generation == 4) {</div><div class='add'>+		ret = smsc911x_phy_enable_energy_detect(pdata);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			SMSC_WARN(pdata, drv, "Failed to wakeup the PHY chip");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2092,6 +2261,9 @@ static int __devexit smsc911x_drv_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	iounmap(pdata-&gt;ioaddr);</div><div class='ctx'> </div><div class='add'>+	(void)smsc911x_disable_resources(pdev);</div><div class='add'>+	smsc911x_free_resources(pdev);</div><div class='add'>+</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2218,10 +2390,20 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)</div><div class='ctx'> 	pdata-&gt;dev = dev;</div><div class='ctx'> 	pdata-&gt;msg_enable = ((1 &lt;&lt; debug) - 1);</div><div class='ctx'> </div><div class='add'>+	platform_set_drvdata(pdev, dev);</div><div class='add'>+</div><div class='add'>+	retval = smsc911x_request_resources(pdev);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto out_return_resources;</div><div class='add'>+</div><div class='add'>+	retval = smsc911x_enable_resources(pdev);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto out_disable_resources;</div><div class='add'>+</div><div class='ctx'> 	if (pdata-&gt;ioaddr == NULL) {</div><div class='ctx'> 		SMSC_WARN(pdata, probe, "Error smsc911x base address invalid");</div><div class='ctx'> 		retval = -ENOMEM;</div><div class='del'>-		goto out_free_netdev_2;</div><div class='add'>+		goto out_disable_resources;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	retval = smsc911x_probe_config_dt(&amp;pdata-&gt;config, np);</div><div class='hunk'>@@ -2233,7 +2415,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		SMSC_WARN(pdata, probe, "Error smsc911x config not found");</div><div class='del'>-		goto out_unmap_io_3;</div><div class='add'>+		goto out_disable_resources;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* assume standard, non-shifted, access to HW registers */</div><div class='hunk'>@@ -2244,7 +2426,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	retval = smsc911x_init(dev);</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='del'>-		goto out_unmap_io_3;</div><div class='add'>+		goto out_disable_resources;</div><div class='ctx'> </div><div class='ctx'> 	/* configure irq polarity and type before connecting isr */</div><div class='ctx'> 	if (pdata-&gt;config.irq_polarity == SMSC911X_IRQ_POLARITY_ACTIVE_HIGH)</div><div class='hunk'>@@ -2264,15 +2446,13 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		SMSC_WARN(pdata, probe,</div><div class='ctx'> 			  "Unable to claim requested irq: %d", dev-&gt;irq);</div><div class='del'>-		goto out_unmap_io_3;</div><div class='add'>+		goto out_free_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	platform_set_drvdata(pdev, dev);</div><div class='del'>-</div><div class='ctx'> 	retval = register_netdev(dev);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		SMSC_WARN(pdata, probe, "Error %i registering device", retval);</div><div class='del'>-		goto out_unset_drvdata_4;</div><div class='add'>+		goto out_free_irq;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		SMSC_TRACE(pdata, probe,</div><div class='ctx'> 			   "Network interface: \"%s\"", dev-&gt;name);</div><div class='hunk'>@@ -2321,12 +2501,14 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> out_unregister_netdev_5:</div><div class='ctx'> 	unregister_netdev(dev);</div><div class='del'>-out_unset_drvdata_4:</div><div class='del'>-	platform_set_drvdata(pdev, NULL);</div><div class='add'>+out_free_irq:</div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='del'>-out_unmap_io_3:</div><div class='add'>+out_disable_resources:</div><div class='add'>+	(void)smsc911x_disable_resources(pdev);</div><div class='add'>+out_return_resources:</div><div class='add'>+	smsc911x_free_resources(pdev);</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> 	iounmap(pdata-&gt;ioaddr);</div><div class='del'>-out_free_netdev_2:</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> out_release_io_1:</div><div class='ctx'> 	release_mem_region(res-&gt;start, resource_size(res));</div><div class='head'>diff --git a/drivers/net/ethernet/smsc/smsc911x.h b/drivers/net/ethernet/smsc/smsc911x.h<br/>index 8d67aacf8867..9ad5e5d39a03 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/smsc/smsc911x.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/smsc/smsc911x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/smsc/smsc911x.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/smsc/smsc911x.h</a></div><div class='hunk'>@@ -401,4 +401,6 @@</div><div class='ctx'> #include &lt;asm/smsc911x.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/smscphy.h&gt;</div><div class='add'>+</div><div class='ctx'> #endif				/* __SMSC911X_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c<br/>index edb24b0e337b..a9efbdfe5302 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/smsc/smsc9420.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/smsc/smsc9420.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/smsc/smsc9420.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/smsc/smsc9420.c</a></div><div class='hunk'>@@ -279,9 +279,10 @@ static void smsc9420_ethtool_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct smsc9420_pdata *pd = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	strcpy(drvinfo-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(drvinfo-&gt;bus_info, pci_name(pd-&gt;pdev));</div><div class='del'>-	strcpy(drvinfo-&gt;version, DRV_VERSION);</div><div class='add'>+	strlcpy(drvinfo-&gt;driver, DRV_NAME, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strlcpy(drvinfo-&gt;bus_info, pci_name(pd-&gt;pdev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='add'>+	strlcpy(drvinfo-&gt;version, DRV_VERSION, sizeof(drvinfo-&gt;version));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 smsc9420_ethtool_get_msglevel(struct net_device *netdev)</div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig<br/>index 22745d7bf530..036428348faa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/stmicro/stmmac/Kconfig</a></div><div class='hunk'>@@ -12,11 +12,36 @@ config STMMAC_ETH</div><div class='ctx'> </div><div class='ctx'> if STMMAC_ETH</div><div class='ctx'> </div><div class='add'>+config STMMAC_PLATFORM</div><div class='add'>+	tristate "STMMAC platform bus support"</div><div class='add'>+	depends on STMMAC_ETH</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	  This selects the platform specific bus support for</div><div class='add'>+	  the stmmac device driver. This is the driver used</div><div class='add'>+	  on many embedded STM platforms based on ARM and SuperH</div><div class='add'>+	  processors.</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='add'>+</div><div class='add'>+config STMMAC_PCI</div><div class='add'>+	tristate "STMMAC support on PCI bus (EXPERIMENTAL)"</div><div class='add'>+	depends on STMMAC_ETH &amp;&amp; PCI &amp;&amp; EXPERIMENTAL</div><div class='add'>+	---help---</div><div class='add'>+	  This is to select the Synopsys DWMAC available on PCI devices,</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'>+	  This PCI support is tested on XLINX XC2V3000 FF1152AMT0221</div><div class='add'>+	  D1215994A VIRTEX FPGA board.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config STMMAC_DEBUG_FS</div><div class='ctx'> 	bool "Enable monitoring via sysFS "</div><div class='ctx'> 	default n</div><div class='ctx'> 	depends on STMMAC_ETH &amp;&amp; DEBUG_FS</div><div class='del'>-	-- help</div><div class='add'>+	---help---</div><div class='ctx'> 	  The stmmac entry in /sys reports DMA TX/RX rings</div><div class='ctx'> 	  or (if supported) the HW cap register.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile<br/>index d7c45164ea79..bc965ac9e025 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/stmicro/stmmac/Makefile</a></div><div class='hunk'>@@ -2,6 +2,8 @@ obj-$(CONFIG_STMMAC_ETH) += stmmac.o</div><div class='ctx'> stmmac-$(CONFIG_STMMAC_TIMER) += stmmac_timer.o</div><div class='ctx'> stmmac-$(CONFIG_STMMAC_RING) += ring_mode.o</div><div class='ctx'> stmmac-$(CONFIG_STMMAC_CHAINED) += chain_mode.o</div><div class='add'>+stmmac-$(CONFIG_STMMAC_PLATFORM) += stmmac_platform.o</div><div class='add'>+stmmac-$(CONFIG_STMMAC_PCI) += stmmac_pci.o</div><div class='ctx'> stmmac-objs:= stmmac_main.o stmmac_ethtool.o stmmac_mdio.o	\</div><div class='ctx'> 	      dwmac_lib.o dwmac1000_core.o  dwmac1000_dma.o	\</div><div class='ctx'> 	      dwmac100_core.o dwmac100_dma.o enh_desc.o  norm_desc.o \</div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h<br/>index 2cc119295821..d0b814ef0675 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/stmicro/stmmac/common.h</a></div><div class='hunk'>@@ -22,7 +22,11 @@</div><div class='ctx'>   Author: Giuseppe Cavallaro &lt;peppe.cavallaro@st.com&gt;</div><div class='ctx'> *******************************************************************************/</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/phy.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='ctx'> #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)</div><div class='ctx'> #define STMMAC_VLAN_TAG_USED</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='hunk'>@@ -315,5 +319,8 @@ extern void stmmac_set_mac_addr(void __iomem *ioaddr, u8 addr[6],</div><div class='ctx'> 				unsigned int high, unsigned int low);</div><div class='ctx'> extern void stmmac_get_mac_addr(void __iomem *ioaddr, unsigned char *addr,</div><div class='ctx'> 				unsigned int high, unsigned int low);</div><div class='add'>+</div><div class='add'>+extern void stmmac_set_mac(void __iomem *ioaddr, bool enable);</div><div class='add'>+</div><div class='ctx'> extern void dwmac_dma_flush_tx_fifo(void __iomem *ioaddr);</div><div class='ctx'> extern const struct stmmac_ring_mode_ops ring_mode_ops;</div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c<br/>index e25093510b0c..f20aa12931d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c</a></div><div class='hunk'>@@ -238,6 +238,19 @@ void stmmac_set_mac_addr(void __iomem *ioaddr, u8 addr[6],</div><div class='ctx'> 	writel(data, ioaddr + low);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Enable disable MAC RX/TX */</div><div class='add'>+void stmmac_set_mac(void __iomem *ioaddr, bool enable)</div><div class='add'>+{</div><div class='add'>+	u32 value = readl(ioaddr + MAC_CTRL_REG);</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		value |= MAC_RNABLE_RX | MAC_ENABLE_TX;</div><div class='add'>+	else</div><div class='add'>+		value &amp;= ~(MAC_ENABLE_TX | MAC_RNABLE_RX);</div><div class='add'>+</div><div class='add'>+	writel(value, ioaddr + MAC_CTRL_REG);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void stmmac_get_mac_addr(void __iomem *ioaddr, unsigned char *addr,</div><div class='ctx'> 			 unsigned int high, unsigned int low)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c<br/>index 41e6b33e1b08..c07cfe989f6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/mmc_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/mmc_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/mmc_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/stmicro/stmmac/mmc_core.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'>   Author: Giuseppe Cavallaro &lt;peppe.cavallaro@st.com&gt;</div><div class='ctx'> *******************************************************************************/</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include "mmc.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h<br/>index a140a8fbf051..120740020e2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/stmmac.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/stmmac.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/stmmac.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/stmicro/stmmac/stmmac.h</a></div><div class='hunk'>@@ -20,7 +20,8 @@</div><div class='ctx'>   Author: Giuseppe Cavallaro &lt;peppe.cavallaro@st.com&gt;</div><div class='ctx'> *******************************************************************************/</div><div class='ctx'> </div><div class='del'>-#define DRV_MODULE_VERSION	"Oct_2011"</div><div class='add'>+#define STMMAC_RESOURCE_NAME   "stmmaceth"</div><div class='add'>+#define DRV_MODULE_VERSION	"Dec_2011"</div><div class='ctx'> #include &lt;linux/stmmac.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='hunk'>@@ -82,8 +83,18 @@ struct stmmac_priv {</div><div class='ctx'> 	int hw_cap_support;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+extern int phyaddr;</div><div class='add'>+</div><div class='ctx'> extern int stmmac_mdio_unregister(struct net_device *ndev);</div><div class='ctx'> extern int stmmac_mdio_register(struct net_device *ndev);</div><div class='ctx'> extern void stmmac_set_ethtool_ops(struct net_device *netdev);</div><div class='ctx'> extern const struct stmmac_desc_ops enh_desc_ops;</div><div class='ctx'> extern const struct stmmac_desc_ops ndesc_ops;</div><div class='add'>+</div><div class='add'>+int stmmac_freeze(struct net_device *ndev);</div><div class='add'>+int stmmac_restore(struct net_device *ndev);</div><div class='add'>+int stmmac_resume(struct net_device *ndev);</div><div class='add'>+int stmmac_suspend(struct net_device *ndev);</div><div class='add'>+int stmmac_dvr_remove(struct net_device *ndev);</div><div class='add'>+struct stmmac_priv *stmmac_dvr_probe(struct device *device,</div><div class='add'>+				struct plat_stmmacenet_data *plat_dat);</div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c<br/>index 0395f9eba801..9573303a706b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c</a></div><div class='hunk'>@@ -185,9 +185,10 @@ static void stmmac_ethtool_getdrvinfo(struct net_device *dev,</div><div class='ctx'> 	struct stmmac_priv *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;plat-&gt;has_gmac)</div><div class='del'>-		strcpy(info-&gt;driver, GMAC_ETHTOOL_NAME);</div><div class='add'>+		strlcpy(info-&gt;driver, GMAC_ETHTOOL_NAME, sizeof(info-&gt;driver));</div><div class='ctx'> 	else</div><div class='del'>-		strcpy(info-&gt;driver, MAC100_ETHTOOL_NAME);</div><div class='add'>+		strlcpy(info-&gt;driver, MAC100_ETHTOOL_NAME,</div><div class='add'>+			sizeof(info-&gt;driver));</div><div class='ctx'> </div><div class='ctx'> 	strcpy(info-&gt;version, DRV_MODULE_VERSION);</div><div class='ctx'> 	info-&gt;fw_version[0] = '\0';</div><div class='hunk'>@@ -458,7 +459,7 @@ static int stmmac_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ethtool_ops stmmac_ethtool_ops = {</div><div class='add'>+static const struct ethtool_ops stmmac_ethtool_ops = {</div><div class='ctx'> 	.begin = stmmac_check_if_running,</div><div class='ctx'> 	.get_drvinfo = stmmac_ethtool_getdrvinfo,</div><div class='ctx'> 	.get_settings = stmmac_ethtool_getsettings,</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 72cd190b9c1a..96fa2da30763 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/stmmac_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/stmicro/stmmac/stmmac_main.c</a></div><div class='hunk'>@@ -28,12 +28,8 @@</div><div class='ctx'> 	https://bugzilla.stlinux.com/</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/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/tcp.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='hunk'>@@ -52,8 +48,6 @@</div><div class='ctx'> #endif</div><div class='ctx'> #include "stmmac.h"</div><div class='ctx'> </div><div class='del'>-#define STMMAC_RESOURCE_NAME	"stmmaceth"</div><div class='del'>-</div><div class='ctx'> #undef STMMAC_DEBUG</div><div class='ctx'> /*#define STMMAC_DEBUG*/</div><div class='ctx'> #ifdef STMMAC_DEBUG</div><div class='hunk'>@@ -93,7 +87,7 @@ static int debug = -1;		/* -1: default, 0: no output, 16:  all */</div><div class='ctx'> module_param(debug, int, S_IRUGO | S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC(debug, "Message Level (0: no output, 16: all)");</div><div class='ctx'> </div><div class='del'>-static int phyaddr = -1;</div><div class='add'>+int phyaddr = -1;</div><div class='ctx'> module_param(phyaddr, int, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(phyaddr, "Physical device address");</div><div class='ctx'> </div><div class='hunk'>@@ -141,6 +135,11 @@ static const u32 default_msg_level = (NETIF_MSG_DRV | NETIF_MSG_PROBE |</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t stmmac_interrupt(int irq, void *dev_id);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_STMMAC_DEBUG_FS</div><div class='add'>+static int stmmac_init_fs(struct net_device *dev);</div><div class='add'>+static void stmmac_exit_fs(void);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * stmmac_verify_args - verify the driver parameters.</div><div class='ctx'>  * Description: it verifies if some wrong parameter is passed to the driver.</div><div class='hunk'>@@ -308,7 +307,7 @@ static int stmmac_init_phy(struct net_device *dev)</div><div class='ctx'> 	priv-&gt;speed = 0;</div><div class='ctx'> 	priv-&gt;oldduplex = -1;</div><div class='ctx'> </div><div class='del'>-	snprintf(bus_id, MII_BUS_ID_SIZE, "%x", priv-&gt;plat-&gt;bus_id);</div><div class='add'>+	snprintf(bus_id, MII_BUS_ID_SIZE, "stmmac-%x", priv-&gt;plat-&gt;bus_id);</div><div class='ctx'> 	snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id,</div><div class='ctx'> 		 priv-&gt;plat-&gt;phy_addr);</div><div class='ctx'> 	pr_debug("stmmac_init_phy:  trying to attach to %s\n", phy_id);</div><div class='hunk'>@@ -345,22 +344,6 @@ static int stmmac_init_phy(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void stmmac_enable_mac(void __iomem *ioaddr)</div><div class='del'>-{</div><div class='del'>-	u32 value = readl(ioaddr + MAC_CTRL_REG);</div><div class='del'>-</div><div class='del'>-	value |= MAC_RNABLE_RX | MAC_ENABLE_TX;</div><div class='del'>-	writel(value, ioaddr + MAC_CTRL_REG);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void stmmac_disable_mac(void __iomem *ioaddr)</div><div class='del'>-{</div><div class='del'>-	u32 value = readl(ioaddr + MAC_CTRL_REG);</div><div class='del'>-</div><div class='del'>-	value &amp;= ~(MAC_ENABLE_TX | MAC_RNABLE_RX);</div><div class='del'>-	writel(value, ioaddr + MAC_CTRL_REG);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * display_ring</div><div class='ctx'>  * @p: pointer to the ring.</div><div class='hunk'>@@ -789,7 +772,7 @@ static void stmmac_mmc_setup(struct stmmac_priv *priv)</div><div class='ctx'> 		dwmac_mmc_ctrl(priv-&gt;ioaddr, mode);</div><div class='ctx'> 		memset(&amp;priv-&gt;mmc, 0, sizeof(struct stmmac_counters));</div><div class='ctx'> 	} else</div><div class='del'>-		pr_info(" No MAC Management Counters available");</div><div class='add'>+		pr_info(" No MAC Management Counters available\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 stmmac_get_synopsys_id(struct stmmac_priv *priv)</div><div class='hunk'>@@ -887,6 +870,53 @@ static int stmmac_get_hw_features(struct stmmac_priv *priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * stmmac_mac_device_setup</div><div class='add'>+ * @dev : device pointer</div><div class='add'>+ * Description: this is to attach the GMAC or MAC 10/100</div><div class='add'>+ * main core structures that will be completed during the</div><div class='add'>+ * open step.</div><div class='add'>+ */</div><div class='add'>+static int stmmac_mac_device_setup(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct stmmac_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	struct mac_device_info *device;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;plat-&gt;has_gmac)</div><div class='add'>+		device = dwmac1000_setup(priv-&gt;ioaddr);</div><div class='add'>+	else</div><div class='add'>+		device = dwmac100_setup(priv-&gt;ioaddr);</div><div class='add'>+</div><div class='add'>+	if (!device)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;hw = device;</div><div class='add'>+	priv-&gt;hw-&gt;ring = &amp;ring_mode_ops;</div><div class='add'>+</div><div class='add'>+	if (device_can_wakeup(priv-&gt;device)) {</div><div class='add'>+		priv-&gt;wolopts = WAKE_MAGIC; /* Magic Frame as default */</div><div class='add'>+		enable_irq_wake(priv-&gt;wol_irq);</div><div 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 stmmac_check_ether_addr(struct stmmac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	/* verify if the MAC address is valid, in case of failures it</div><div class='add'>+	 * generates a random MAC address */</div><div class='add'>+	if (!is_valid_ether_addr(priv-&gt;dev-&gt;dev_addr)) {</div><div class='add'>+		priv-&gt;hw-&gt;mac-&gt;get_umac_addr((void __iomem *)</div><div class='add'>+					     priv-&gt;dev-&gt;base_addr,</div><div class='add'>+					     priv-&gt;dev-&gt;dev_addr, 0);</div><div class='add'>+		if  (!is_valid_ether_addr(priv-&gt;dev-&gt;dev_addr))</div><div class='add'>+			random_ether_addr(priv-&gt;dev-&gt;dev_addr);</div><div class='add'>+	}</div><div class='add'>+	pr_warning("%s: device MAC address %pM\n", priv-&gt;dev-&gt;name,</div><div class='add'>+						   priv-&gt;dev-&gt;dev_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *  stmmac_open - open entry point of the driver</div><div class='ctx'>  *  @dev : pointer to the device structure.</div><div class='ctx'>  *  Description:</div><div class='hunk'>@@ -900,18 +930,28 @@ static int stmmac_open(struct net_device *dev)</div><div class='ctx'> 	struct stmmac_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* Check that the MAC address is valid.  If its not, refuse</div><div class='del'>-	 * to bring the device up. The user must specify an</div><div class='del'>-	 * address using the following linux command:</div><div class='del'>-	 *      ifconfig eth0 hw ether xx:xx:xx:xx:xx:xx  */</div><div class='del'>-	if (!is_valid_ether_addr(dev-&gt;dev_addr)) {</div><div class='del'>-		random_ether_addr(dev-&gt;dev_addr);</div><div class='del'>-		pr_warning("%s: generated random MAC address %pM\n", dev-&gt;name,</div><div class='del'>-			dev-&gt;dev_addr);</div><div class='del'>-	}</div><div class='add'>+	/* MAC HW device setup */</div><div class='add'>+	ret = stmmac_mac_device_setup(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	stmmac_check_ether_addr(priv);</div><div class='ctx'> </div><div class='ctx'> 	stmmac_verify_args();</div><div class='ctx'> </div><div class='add'>+	/* Override with kernel parameters if supplied XXX CRS XXX</div><div class='add'>+	 * this needs to have multiple instances */</div><div class='add'>+	if ((phyaddr &gt;= 0) &amp;&amp; (phyaddr &lt;= 31))</div><div class='add'>+		priv-&gt;plat-&gt;phy_addr = phyaddr;</div><div class='add'>+</div><div class='add'>+	/* MDIO bus Registration */</div><div class='add'>+	ret = stmmac_mdio_register(dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pr_debug("%s: MDIO bus (id: %d) registration failed",</div><div class='add'>+			 __func__, priv-&gt;plat-&gt;bus_id);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_STMMAC_TIMER</div><div class='ctx'> 	priv-&gt;tm = kzalloc(sizeof(struct stmmac_timer *), GFP_KERNEL);</div><div class='ctx'> 	if (unlikely(priv-&gt;tm == NULL)) {</div><div class='hunk'>@@ -1008,7 +1048,7 @@ static int stmmac_open(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Enable the MAC Rx/Tx */</div><div class='del'>-	stmmac_enable_mac(priv-&gt;ioaddr);</div><div class='add'>+	stmmac_set_mac(priv-&gt;ioaddr, true);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the HW DMA mode and the COE */</div><div class='ctx'> 	stmmac_dma_operation_mode(priv);</div><div class='hunk'>@@ -1019,6 +1059,11 @@ static int stmmac_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	stmmac_mmc_setup(priv);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_STMMAC_DEBUG_FS</div><div class='add'>+	ret = stmmac_init_fs(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		pr_warning("\tFailed debugFS registration");</div><div class='add'>+#endif</div><div class='ctx'> 	/* Start the ball rolling... */</div><div class='ctx'> 	DBG(probe, DEBUG, "%s: DMA RX/TX processes started...\n", dev-&gt;name);</div><div class='ctx'> 	priv-&gt;hw-&gt;dma-&gt;start_tx(priv-&gt;ioaddr);</div><div class='hunk'>@@ -1091,10 +1136,15 @@ static int stmmac_release(struct net_device *dev)</div><div class='ctx'> 	free_dma_desc_resources(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable the MAC Rx/Tx */</div><div class='del'>-	stmmac_disable_mac(priv-&gt;ioaddr);</div><div class='add'>+	stmmac_set_mac(priv-&gt;ioaddr, false);</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(dev);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_STMMAC_DEBUG_FS</div><div class='add'>+	stmmac_exit_fs();</div><div class='add'>+#endif</div><div class='add'>+	stmmac_mdio_unregister(dev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1470,7 +1520,8 @@ static int stmmac_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='del'>-static u32 stmmac_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static netdev_features_t stmmac_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct stmmac_priv *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1738,28 +1789,41 @@ static const struct net_device_ops stmmac_netdev_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * stmmac_probe - Initialization of the adapter .</div><div class='del'>- * @dev : device pointer</div><div class='del'>- * Description: The function initializes the network device structure for</div><div class='del'>- * the STMMAC driver. It also calls the low level routines</div><div class='del'>- * in order to init the HW (i.e. the DMA engine)</div><div class='add'>+ * stmmac_dvr_probe</div><div class='add'>+ * @device: device pointer</div><div class='add'>+ * Description: this is the main probe function used to</div><div class='add'>+ * call the alloc_etherdev, allocate the priv structure.</div><div class='ctx'>  */</div><div class='del'>-static int stmmac_probe(struct net_device *dev)</div><div class='add'>+struct stmmac_priv *stmmac_dvr_probe(struct device *device,</div><div class='add'>+					struct plat_stmmacenet_data *plat_dat)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct stmmac_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct net_device *ndev = NULL;</div><div class='add'>+	struct stmmac_priv *priv;</div><div class='add'>+</div><div class='add'>+	ndev = alloc_etherdev(sizeof(struct stmmac_priv));</div><div class='add'>+	if (!ndev) {</div><div class='add'>+		pr_err("%s: ERROR: allocating the device\n", __func__);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(ndev, device);</div><div class='ctx'> </div><div class='del'>-	ether_setup(dev);</div><div class='add'>+	priv = netdev_priv(ndev);</div><div class='add'>+	priv-&gt;device = device;</div><div class='add'>+	priv-&gt;dev = ndev;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;netdev_ops = &amp;stmmac_netdev_ops;</div><div class='del'>-	stmmac_set_ethtool_ops(dev);</div><div class='add'>+	ether_setup(ndev);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;</div><div class='del'>-	dev-&gt;features |= dev-&gt;hw_features | NETIF_F_HIGHDMA;</div><div class='del'>-	dev-&gt;watchdog_timeo = msecs_to_jiffies(watchdog);</div><div class='add'>+	ndev-&gt;netdev_ops = &amp;stmmac_netdev_ops;</div><div class='add'>+	stmmac_set_ethtool_ops(ndev);</div><div class='add'>+</div><div class='add'>+	ndev-&gt;hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;</div><div class='add'>+	ndev-&gt;features |= ndev-&gt;hw_features | NETIF_F_HIGHDMA;</div><div class='add'>+	ndev-&gt;watchdog_timeo = msecs_to_jiffies(watchdog);</div><div class='ctx'> #ifdef STMMAC_VLAN_TAG_USED</div><div class='ctx'> 	/* Both mac100 and gmac support receive VLAN tag detection */</div><div class='del'>-	dev-&gt;features |= NETIF_F_HW_VLAN_RX;</div><div class='add'>+	ndev-&gt;features |= NETIF_F_HW_VLAN_RX;</div><div class='ctx'> #endif</div><div class='ctx'> 	priv-&gt;msg_enable = netif_msg_init(debug, default_msg_level);</div><div class='ctx'> </div><div class='hunk'>@@ -1767,248 +1831,60 @@ static int stmmac_probe(struct net_device *dev)</div><div class='ctx'> 		priv-&gt;flow_ctrl = FLOW_AUTO;	/* RX/TX pause on */</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;pause = pause;</div><div class='del'>-	netif_napi_add(dev, &amp;priv-&gt;napi, stmmac_poll, 64);</div><div class='del'>-</div><div class='del'>-	/* Get the MAC address */</div><div class='del'>-	priv-&gt;hw-&gt;mac-&gt;get_umac_addr((void __iomem *) dev-&gt;base_addr,</div><div class='del'>-				     dev-&gt;dev_addr, 0);</div><div class='del'>-</div><div class='del'>-	if (!is_valid_ether_addr(dev-&gt;dev_addr))</div><div class='del'>-		pr_warning("\tno valid MAC address;"</div><div class='del'>-			"please, use ifconfig or nwhwconfig!\n");</div><div class='add'>+	priv-&gt;plat = plat_dat;</div><div class='add'>+	netif_napi_add(ndev, &amp;priv-&gt;napi, stmmac_poll, 64);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;lock);</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;tx_lock);</div><div class='ctx'> </div><div class='del'>-	ret = register_netdev(dev);</div><div class='add'>+	ret = register_netdev(ndev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("%s: ERROR %i registering the device\n",</div><div class='ctx'> 		       __func__, ret);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	DBG(probe, DEBUG, "%s: Scatter/Gather: %s - HW checksums: %s\n",</div><div class='del'>-	    dev-&gt;name, (dev-&gt;features &amp; NETIF_F_SG) ? "on" : "off",</div><div class='del'>-	    (dev-&gt;features &amp; NETIF_F_IP_CSUM) ? "on" : "off");</div><div class='add'>+	    ndev-&gt;name, (ndev-&gt;features &amp; NETIF_F_SG) ? "on" : "off",</div><div class='add'>+	    (ndev-&gt;features &amp; NETIF_F_IP_CSUM) ? "on" : "off");</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='add'>+	return priv;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * stmmac_mac_device_setup</div><div class='del'>- * @dev : device pointer</div><div class='del'>- * Description: select and initialise the mac device (mac100 or Gmac).</div><div class='del'>- */</div><div class='del'>-static int stmmac_mac_device_setup(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct stmmac_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	struct mac_device_info *device;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;plat-&gt;has_gmac) {</div><div class='del'>-		dev-&gt;priv_flags |= IFF_UNICAST_FLT;</div><div class='del'>-		device = dwmac1000_setup(priv-&gt;ioaddr);</div><div class='del'>-	} else {</div><div class='del'>-		device = dwmac100_setup(priv-&gt;ioaddr);</div><div class='del'>-	}</div><div class='add'>+error:</div><div class='add'>+	netif_napi_del(&amp;priv-&gt;napi);</div><div class='ctx'> </div><div class='del'>-	if (!device)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	priv-&gt;hw = device;</div><div class='del'>-	priv-&gt;hw-&gt;ring = &amp;ring_mode_ops;</div><div class='del'>-</div><div class='del'>-	if (device_can_wakeup(priv-&gt;device)) {</div><div class='del'>-		priv-&gt;wolopts = WAKE_MAGIC; /* Magic Frame as default */</div><div class='del'>-		enable_irq_wake(priv-&gt;wol_irq);</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'>- * stmmac_dvr_probe</div><div class='del'>- * @pdev: platform device pointer</div><div class='del'>- * Description: the driver is initialized through platform_device.</div><div class='del'>- */</div><div class='del'>-static int stmmac_dvr_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	struct resource *res;</div><div class='del'>-	void __iomem *addr = NULL;</div><div class='del'>-	struct net_device *ndev = NULL;</div><div class='del'>-	struct stmmac_priv *priv = NULL;</div><div class='del'>-	struct plat_stmmacenet_data *plat_dat;</div><div class='del'>-</div><div class='del'>-	pr_info("STMMAC driver:\n\tplatform registration... ");</div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	if (!res)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	pr_info("\tdone!\n");</div><div class='del'>-</div><div class='del'>-	if (!request_mem_region(res-&gt;start, resource_size(res),</div><div class='del'>-				pdev-&gt;name)) {</div><div class='del'>-		pr_err("%s: ERROR: memory allocation failed"</div><div class='del'>-		       "cannot get the I/O addr 0x%x\n",</div><div class='del'>-		       __func__, (unsigned int)res-&gt;start);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	addr = ioremap(res-&gt;start, resource_size(res));</div><div class='del'>-	if (!addr) {</div><div class='del'>-		pr_err("%s: ERROR: memory mapping failed\n", __func__);</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out_release_region;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ndev = alloc_etherdev(sizeof(struct stmmac_priv));</div><div class='del'>-	if (!ndev) {</div><div class='del'>-		pr_err("%s: ERROR: allocating the device\n", __func__);</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out_unmap;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	/* Get the MAC information */</div><div class='del'>-	ndev-&gt;irq = platform_get_irq_byname(pdev, "macirq");</div><div class='del'>-	if (ndev-&gt;irq == -ENXIO) {</div><div class='del'>-		pr_err("%s: ERROR: MAC IRQ configuration "</div><div class='del'>-		       "information not found\n", __func__);</div><div class='del'>-		ret = -ENXIO;</div><div class='del'>-		goto out_free_ndev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv = netdev_priv(ndev);</div><div class='del'>-	priv-&gt;device = &amp;(pdev-&gt;dev);</div><div class='del'>-	priv-&gt;dev = ndev;</div><div class='del'>-	plat_dat = pdev-&gt;dev.platform_data;</div><div class='del'>-</div><div class='del'>-	priv-&gt;plat = plat_dat;</div><div class='del'>-</div><div class='del'>-	priv-&gt;ioaddr = addr;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * On some platforms e.g. SPEAr the wake up irq differs from the mac irq</div><div class='del'>-	 * The external wake up irq can be passed through the platform code</div><div class='del'>-	 * named as "eth_wake_irq"</div><div class='del'>-	 *</div><div class='del'>-	 * In case the wake up interrupt is not passed from the platform</div><div class='del'>-	 * so the driver will continue to use the mac irq (ndev-&gt;irq)</div><div class='del'>-	 */</div><div class='del'>-	priv-&gt;wol_irq = platform_get_irq_byname(pdev, "eth_wake_irq");</div><div class='del'>-	if (priv-&gt;wol_irq == -ENXIO)</div><div class='del'>-		priv-&gt;wol_irq = ndev-&gt;irq;</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, ndev);</div><div class='del'>-</div><div class='del'>-	/* Set the I/O base addr */</div><div class='del'>-	ndev-&gt;base_addr = (unsigned long)addr;</div><div class='del'>-</div><div class='del'>-	/* Custom initialisation */</div><div class='del'>-	if (priv-&gt;plat-&gt;init) {</div><div class='del'>-		ret = priv-&gt;plat-&gt;init(pdev);</div><div class='del'>-		if (unlikely(ret))</div><div class='del'>-			goto out_free_ndev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* MAC HW device detection */</div><div class='del'>-	ret = stmmac_mac_device_setup(ndev);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_plat_exit;</div><div class='del'>-</div><div class='del'>-	/* Network Device Registration */</div><div class='del'>-	ret = stmmac_probe(ndev);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_plat_exit;</div><div class='del'>-</div><div class='del'>-	/* Override with kernel parameters if supplied XXX CRS XXX</div><div class='del'>-	 * this needs to have multiple instances */</div><div class='del'>-	if ((phyaddr &gt;= 0) &amp;&amp; (phyaddr &lt;= 31))</div><div class='del'>-		priv-&gt;plat-&gt;phy_addr = phyaddr;</div><div class='del'>-</div><div class='del'>-	pr_info("\t%s - (dev. name: %s - id: %d, IRQ #%d\n"</div><div class='del'>-	       "\tIO base addr: 0x%p)\n", ndev-&gt;name, pdev-&gt;name,</div><div class='del'>-	       pdev-&gt;id, ndev-&gt;irq, addr);</div><div class='del'>-</div><div class='del'>-	/* MDIO bus Registration */</div><div class='del'>-	pr_debug("\tMDIO bus (id: %d)...", priv-&gt;plat-&gt;bus_id);</div><div class='del'>-	ret = stmmac_mdio_register(ndev);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_unregister;</div><div class='del'>-	pr_debug("registered!\n");</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_STMMAC_DEBUG_FS</div><div class='del'>-	ret = stmmac_init_fs(ndev);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		pr_warning("\tFailed debugFS registration");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_unregister:</div><div class='ctx'> 	unregister_netdev(ndev);</div><div class='del'>-out_plat_exit:</div><div class='del'>-	if (priv-&gt;plat-&gt;exit)</div><div class='del'>-		priv-&gt;plat-&gt;exit(pdev);</div><div class='del'>-out_free_ndev:</div><div class='ctx'> 	free_netdev(ndev);</div><div class='del'>-	platform_set_drvdata(pdev, NULL);</div><div class='del'>-out_unmap:</div><div class='del'>-	iounmap(addr);</div><div class='del'>-out_release_region:</div><div class='del'>-	release_mem_region(res-&gt;start, resource_size(res));</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * stmmac_dvr_remove</div><div class='del'>- * @pdev: platform device pointer</div><div class='add'>+ * @ndev: net device pointer</div><div class='ctx'>  * Description: this function resets the TX/RX processes, disables the MAC RX/TX</div><div class='del'>- * changes the link status, releases the DMA descriptor rings,</div><div class='del'>- * unregisters the MDIO bus and unmaps the allocated memory.</div><div class='add'>+ * changes the link status, releases the DMA descriptor rings.</div><div class='ctx'>  */</div><div class='del'>-static int stmmac_dvr_remove(struct platform_device *pdev)</div><div class='add'>+int stmmac_dvr_remove(struct net_device *ndev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct stmmac_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct resource *res;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("%s:\n\tremoving driver", __func__);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;hw-&gt;dma-&gt;stop_rx(priv-&gt;ioaddr);</div><div class='ctx'> 	priv-&gt;hw-&gt;dma-&gt;stop_tx(priv-&gt;ioaddr);</div><div class='ctx'> </div><div class='del'>-	stmmac_disable_mac(priv-&gt;ioaddr);</div><div class='del'>-</div><div class='add'>+	stmmac_set_mac(priv-&gt;ioaddr, false);</div><div class='ctx'> 	netif_carrier_off(ndev);</div><div class='del'>-</div><div class='del'>-	stmmac_mdio_unregister(ndev);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;plat-&gt;exit)</div><div class='del'>-		priv-&gt;plat-&gt;exit(pdev);</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> 	unregister_netdev(ndev);</div><div class='del'>-</div><div class='del'>-	iounmap((void *)priv-&gt;ioaddr);</div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	release_mem_region(res-&gt;start, resource_size(res));</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_STMMAC_DEBUG_FS</div><div class='del'>-	stmmac_exit_fs();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	free_netdev(ndev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='del'>-static int stmmac_suspend(struct device *dev)</div><div class='add'>+int stmmac_suspend(struct net_device *ndev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='ctx'> 	struct stmmac_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	int dis_ic = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2042,15 +1918,14 @@ static int stmmac_suspend(struct device *dev)</div><div class='ctx'> 	if (device_may_wakeup(priv-&gt;device))</div><div class='ctx'> 		priv-&gt;hw-&gt;mac-&gt;pmt(priv-&gt;ioaddr, priv-&gt;wolopts);</div><div class='ctx'> 	else</div><div class='del'>-		stmmac_disable_mac(priv-&gt;ioaddr);</div><div class='add'>+		stmmac_set_mac(priv-&gt;ioaddr, false);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;priv-&gt;lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stmmac_resume(struct device *dev)</div><div class='add'>+int stmmac_resume(struct net_device *ndev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='ctx'> 	struct stmmac_priv *priv = netdev_priv(ndev);</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(ndev))</div><div class='hunk'>@@ -2069,7 +1944,7 @@ static int stmmac_resume(struct device *dev)</div><div class='ctx'> 	netif_device_attach(ndev);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable the MAC and DMA */</div><div class='del'>-	stmmac_enable_mac(priv-&gt;ioaddr);</div><div class='add'>+	stmmac_set_mac(priv-&gt;ioaddr, true);</div><div class='ctx'> 	priv-&gt;hw-&gt;dma-&gt;start_tx(priv-&gt;ioaddr);</div><div class='ctx'> 	priv-&gt;hw-&gt;dma-&gt;start_rx(priv-&gt;ioaddr);</div><div class='ctx'> </div><div class='hunk'>@@ -2089,68 +1964,23 @@ static int stmmac_resume(struct device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stmmac_freeze(struct device *dev)</div><div class='add'>+int stmmac_freeze(struct net_device *ndev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='del'>-</div><div class='ctx'> 	if (!ndev || !netif_running(ndev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return stmmac_release(ndev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int stmmac_restore(struct device *dev)</div><div class='add'>+int stmmac_restore(struct net_device *ndev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='del'>-</div><div class='ctx'> 	if (!ndev || !netif_running(ndev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return stmmac_open(ndev);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static const struct dev_pm_ops stmmac_pm_ops = {</div><div class='del'>-	.suspend = stmmac_suspend,</div><div class='del'>-	.resume = stmmac_resume,</div><div class='del'>-	.freeze = stmmac_freeze,</div><div class='del'>-	.thaw = stmmac_restore,</div><div class='del'>-	.restore = stmmac_restore,</div><div class='del'>-};</div><div class='del'>-#else</div><div class='del'>-static const struct dev_pm_ops stmmac_pm_ops;</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='del'>-static struct platform_driver stmmac_driver = {</div><div class='del'>-	.probe = stmmac_dvr_probe,</div><div class='del'>-	.remove = stmmac_dvr_remove,</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = STMMAC_RESOURCE_NAME,</div><div class='del'>-		.owner = THIS_MODULE,</div><div class='del'>-		.pm = &amp;stmmac_pm_ops,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * stmmac_init_module - Entry point for the driver</div><div class='del'>- * Description: This function is the entry point for the driver.</div><div class='del'>- */</div><div class='del'>-static int __init stmmac_init_module(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = platform_driver_register(&amp;stmmac_driver);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * stmmac_cleanup_module - Cleanup routine for the driver</div><div class='del'>- * Description: This function is the cleanup routine for the driver.</div><div class='del'>- */</div><div class='del'>-static void __exit stmmac_cleanup_module(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;stmmac_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifndef MODULE</div><div class='ctx'> static int __init stmmac_cmdline_opt(char *str)</div><div class='ctx'> {</div><div class='hunk'>@@ -2210,9 +2040,6 @@ err:</div><div class='ctx'> __setup("stmmaceth=", stmmac_cmdline_opt);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-module_init(stmmac_init_module);</div><div class='del'>-module_exit(stmmac_cleanup_module);</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("STMMAC 10/100/1000 Ethernet driver");</div><div class='add'>+MODULE_DESCRIPTION("STMMAC 10/100/1000 Ethernet device driver");</div><div class='ctx'> MODULE_AUTHOR("Giuseppe Cavallaro &lt;peppe.cavallaro@st.com&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c<br/>index 9c3b9d5c3411..da4a1042523a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c</a></div><div class='hunk'>@@ -109,6 +109,7 @@ static int stmmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg,</div><div class='ctx'>  */</div><div class='ctx'> static int stmmac_mdio_reset(struct mii_bus *bus)</div><div class='ctx'> {</div><div class='add'>+#if defined(CONFIG_STMMAC_PLATFORM)</div><div class='ctx'> 	struct net_device *ndev = bus-&gt;priv;</div><div class='ctx'> 	struct stmmac_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	unsigned int mii_address = priv-&gt;hw-&gt;mii.addr;</div><div class='hunk'>@@ -123,7 +124,7 @@ static int stmmac_mdio_reset(struct mii_bus *bus)</div><div class='ctx'> 	 * on MDC, so perform a dummy mdio read.</div><div class='ctx'> 	 */</div><div class='ctx'> 	writel(0, priv-&gt;ioaddr + mii_address);</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -157,7 +158,8 @@ int stmmac_mdio_register(struct net_device *ndev)</div><div class='ctx'> 	new_bus-&gt;read = &amp;stmmac_mdio_read;</div><div class='ctx'> 	new_bus-&gt;write = &amp;stmmac_mdio_write;</div><div class='ctx'> 	new_bus-&gt;reset = &amp;stmmac_mdio_reset;</div><div class='del'>-	snprintf(new_bus-&gt;id, MII_BUS_ID_SIZE, "%x", mdio_bus_data-&gt;bus_id);</div><div class='add'>+	snprintf(new_bus-&gt;id, MII_BUS_ID_SIZE, "%s-%x",</div><div class='add'>+		new_bus-&gt;name, mdio_bus_data-&gt;bus_id);</div><div class='ctx'> 	new_bus-&gt;priv = ndev;</div><div class='ctx'> 	new_bus-&gt;irq = irqlist;</div><div class='ctx'> 	new_bus-&gt;phy_mask = mdio_bus_data-&gt;phy_mask;</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/>new file mode 100644<br/>index 000000000000..54a819a36487<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c</a></div><div class='hunk'>@@ -0,0 +1,221 @@</div><div class='add'>+/*******************************************************************************</div><div class='add'>+  This contains the functions to handle the pci driver.</div><div class='add'>+</div><div class='add'>+  Copyright (C) 2011-2012  Vayavya Labs Pvt Ltd</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 and conditions of the GNU General Public License,</div><div class='add'>+  version 2, as published by the Free Software Foundation.</div><div class='add'>+</div><div class='add'>+  This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+  more details.</div><div class='add'>+</div><div class='add'>+  You should have received a copy of the GNU General Public License along with</div><div class='add'>+  this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+</div><div class='add'>+  The full GNU General Public License is included in this distribution in</div><div class='add'>+  the file called "COPYING".</div><div class='add'>+</div><div class='add'>+  Author: Rayagond Kokatanur &lt;rayagond@vayavyalabs.com&gt;</div><div class='add'>+  Author: Giuseppe Cavallaro &lt;peppe.cavallaro@st.com&gt;</div><div class='add'>+*******************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include "stmmac.h"</div><div class='add'>+</div><div class='add'>+struct plat_stmmacenet_data plat_dat;</div><div class='add'>+struct stmmac_mdio_bus_data mdio_data;</div><div class='add'>+</div><div class='add'>+static void stmmac_default_data(void)</div><div class='add'>+{</div><div class='add'>+	memset(&amp;plat_dat, 0, sizeof(struct plat_stmmacenet_data));</div><div class='add'>+	plat_dat.bus_id = 1;</div><div class='add'>+	plat_dat.phy_addr = 0;</div><div class='add'>+	plat_dat.interface = PHY_INTERFACE_MODE_GMII;</div><div class='add'>+	plat_dat.pbl = 32;</div><div class='add'>+	plat_dat.clk_csr = 2;	/* clk_csr_i = 20-35MHz &amp; MDC = clk_csr_i/16 */</div><div class='add'>+	plat_dat.has_gmac = 1;</div><div class='add'>+	plat_dat.force_sf_dma_mode = 1;</div><div class='add'>+</div><div class='add'>+	mdio_data.bus_id = 1;</div><div class='add'>+	mdio_data.phy_reset = NULL;</div><div class='add'>+	mdio_data.phy_mask = 0;</div><div class='add'>+	plat_dat.mdio_bus_data = &amp;mdio_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * stmmac_pci_probe</div><div class='add'>+ *</div><div class='add'>+ * @pdev: pci device pointer</div><div class='add'>+ * @id: pointer to table of device id/id's.</div><div class='add'>+ *</div><div class='add'>+ * Description: This probing function gets called for all PCI devices which</div><div class='add'>+ * match the ID table and are not "owned" by other driver yet. This function</div><div class='add'>+ * gets passed a "struct pci_dev *" for each device whose entry in the ID table</div><div class='add'>+ * matches the device. The probe functions returns zero when the driver choose</div><div class='add'>+ * to take "ownership" of the device or an error code(-ve no) otherwise.</div><div class='add'>+ */</div><div class='add'>+static int __devinit stmmac_pci_probe(struct pci_dev *pdev,</div><div class='add'>+				      const struct pci_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	void __iomem *addr = NULL;</div><div class='add'>+	struct stmmac_priv *priv = NULL;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Enable pci device */</div><div class='add'>+	ret = pci_enable_device(pdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("%s : ERROR: failed to enable %s device\n", __func__,</div><div class='add'>+		       pci_name(pdev));</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	if (pci_request_regions(pdev, STMMAC_RESOURCE_NAME)) {</div><div class='add'>+		pr_err("%s: ERROR: failed to get PCI region\n", __func__);</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err_out_req_reg_failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get the base address of device */</div><div class='add'>+	for (i = 0; i &lt;= 5; i++) {</div><div class='add'>+		if (pci_resource_len(pdev, i) == 0)</div><div class='add'>+			continue;</div><div class='add'>+		addr = pci_iomap(pdev, i, 0);</div><div class='add'>+		if (addr == NULL) {</div><div class='add'>+			pr_err("%s: ERROR: cannot map regiser memory, aborting",</div><div class='add'>+			       __func__);</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			goto err_out_map_failed;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	stmmac_default_data();</div><div class='add'>+</div><div class='add'>+	priv = stmmac_dvr_probe(&amp;(pdev-&gt;dev), &amp;plat_dat);</div><div class='add'>+	if (!priv) {</div><div class='add'>+		pr_err("%s: main drivr probe failed", __func__);</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;ioaddr = addr;</div><div class='add'>+	priv-&gt;dev-&gt;base_addr = (unsigned long)addr;</div><div class='add'>+	priv-&gt;dev-&gt;irq = pdev-&gt;irq;</div><div class='add'>+	priv-&gt;wol_irq = pdev-&gt;irq;</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, priv-&gt;dev);</div><div class='add'>+</div><div class='add'>+	pr_debug("STMMAC platform driver registration completed");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	pci_clear_master(pdev);</div><div class='add'>+err_out_map_failed:</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+err_out_req_reg_failed:</div><div class='add'>+	pci_disable_device(pdev);</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'>+ * stmmac_dvr_remove</div><div class='add'>+ *</div><div class='add'>+ * @pdev: platform device pointer</div><div class='add'>+ * Description: this function calls the main to free the net resources</div><div class='add'>+ * and releases the PCI resources.</div><div class='add'>+ */</div><div class='add'>+static void __devexit stmmac_pci_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = pci_get_drvdata(pdev);</div><div class='add'>+	struct stmmac_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	stmmac_dvr_remove(ndev);</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+	pci_iounmap(pdev, priv-&gt;ioaddr);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int stmmac_pci_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = pci_get_drvdata(pdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = stmmac_suspend(ndev);</div><div class='add'>+	pci_save_state(pdev);</div><div class='add'>+	pci_set_power_state(pdev, pci_choose_state(pdev, state));</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stmmac_pci_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	pci_set_power_state(pdev, PCI_D0);</div><div class='add'>+	pci_restore_state(pdev);</div><div class='add'>+</div><div class='add'>+	return stmmac_resume(ndev);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define STMMAC_VENDOR_ID 0x700</div><div class='add'>+#define STMMAC_DEVICE_ID 0x1108</div><div class='add'>+</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(stmmac_id_table) = {</div><div class='add'>+	{</div><div class='add'>+	PCI_DEVICE(STMMAC_VENDOR_ID, STMMAC_DEVICE_ID)}, {</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pci, stmmac_id_table);</div><div class='add'>+</div><div class='add'>+static struct pci_driver stmmac_driver = {</div><div class='add'>+	.name = STMMAC_RESOURCE_NAME,</div><div class='add'>+	.id_table = stmmac_id_table,</div><div class='add'>+	.probe = stmmac_pci_probe,</div><div class='add'>+	.remove = __devexit_p(stmmac_pci_remove),</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = stmmac_pci_suspend,</div><div class='add'>+	.resume = stmmac_pci_resume,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * stmmac_init_module - Entry point for the driver</div><div class='add'>+ * Description: This function is the entry point for the driver.</div><div class='add'>+ */</div><div class='add'>+static int __init stmmac_init_module(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pci_register_driver(&amp;stmmac_driver);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		pr_err("%s: ERROR: driver registration failed\n", __func__);</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'>+ * stmmac_cleanup_module - Cleanup routine for the driver</div><div class='add'>+ * Description: This function is the cleanup routine for the driver.</div><div class='add'>+ */</div><div class='add'>+static void __exit stmmac_cleanup_module(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;stmmac_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(stmmac_init_module);</div><div class='add'>+module_exit(stmmac_cleanup_module);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("STMMAC 10/100/1000 Ethernet PCI driver");</div><div class='add'>+MODULE_AUTHOR("Rayagond Kokatanur &lt;rayagond.kokatanur@vayavyalabs.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Giuseppe Cavallaro &lt;peppe.cavallaro@st.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c<br/>new file mode 100644<br/>index 000000000000..1ac83243649a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c</a></div><div class='hunk'>@@ -0,0 +1,198 @@</div><div class='add'>+/*******************************************************************************</div><div class='add'>+  This contains the functions to handle the platform driver.</div><div class='add'>+</div><div class='add'>+  Copyright (C) 2007-2011  STMicroelectronics Ltd</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 and conditions of the GNU General Public License,</div><div class='add'>+  version 2, as published by the Free Software Foundation.</div><div class='add'>+</div><div class='add'>+  This program is distributed in the hope it will be useful, but WITHOUT</div><div class='add'>+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+  more details.</div><div class='add'>+</div><div class='add'>+  You should have received a copy of the GNU General Public License along with</div><div class='add'>+  this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.</div><div class='add'>+</div><div class='add'>+  The full GNU General Public License is included in this distribution in</div><div class='add'>+  the file called "COPYING".</div><div class='add'>+</div><div class='add'>+  Author: Giuseppe Cavallaro &lt;peppe.cavallaro@st.com&gt;</div><div class='add'>+*******************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include "stmmac.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * stmmac_pltfr_probe</div><div class='add'>+ * @pdev: platform device pointer</div><div class='add'>+ * Description: platform_device probe function. It allocates</div><div class='add'>+ * the necessary resources and invokes the main to init</div><div class='add'>+ * the net device, register the mdio bus etc.</div><div class='add'>+ */</div><div class='add'>+static int stmmac_pltfr_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	void __iomem *addr = NULL;</div><div class='add'>+	struct stmmac_priv *priv = NULL;</div><div class='add'>+	struct plat_stmmacenet_data *plat_dat;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!res)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!request_mem_region(res-&gt;start, resource_size(res), pdev-&gt;name)) {</div><div class='add'>+		pr_err("%s: ERROR: memory allocation failed"</div><div class='add'>+		       "cannot get the I/O addr 0x%x\n",</div><div class='add'>+		       __func__, (unsigned int)res-&gt;start);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	addr = ioremap(res-&gt;start, resource_size(res));</div><div class='add'>+	if (!addr) {</div><div class='add'>+		pr_err("%s: ERROR: memory mapping failed", __func__);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_release_region;</div><div class='add'>+	}</div><div class='add'>+	plat_dat = pdev-&gt;dev.platform_data;</div><div class='add'>+	priv = stmmac_dvr_probe(&amp;(pdev-&gt;dev), plat_dat);</div><div class='add'>+	if (!priv) {</div><div class='add'>+		pr_err("%s: main drivr probe failed", __func__);</div><div class='add'>+		goto out_unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;ioaddr = addr;</div><div class='add'>+	/* Set the I/O base addr */</div><div class='add'>+	priv-&gt;dev-&gt;base_addr = (unsigned long)addr;</div><div class='add'>+</div><div class='add'>+	/* Get the MAC information */</div><div class='add'>+	priv-&gt;dev-&gt;irq = platform_get_irq_byname(pdev, "macirq");</div><div class='add'>+	if (priv-&gt;dev-&gt;irq == -ENXIO) {</div><div class='add'>+		pr_err("%s: ERROR: MAC IRQ configuration "</div><div class='add'>+		       "information not found\n", __func__);</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto out_unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * On some platforms e.g. SPEAr the wake up irq differs from the mac irq</div><div class='add'>+	 * The external wake up irq can be passed through the platform code</div><div class='add'>+	 * named as "eth_wake_irq"</div><div class='add'>+	 *</div><div class='add'>+	 * In case the wake up interrupt is not passed from the platform</div><div class='add'>+	 * so the driver will continue to use the mac irq (ndev-&gt;irq)</div><div class='add'>+	 */</div><div class='add'>+	priv-&gt;wol_irq = platform_get_irq_byname(pdev, "eth_wake_irq");</div><div class='add'>+	if (priv-&gt;wol_irq == -ENXIO)</div><div class='add'>+		priv-&gt;wol_irq = priv-&gt;dev-&gt;irq;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, priv-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/* Custom initialisation */</div><div class='add'>+	if (priv-&gt;plat-&gt;init) {</div><div class='add'>+		ret = priv-&gt;plat-&gt;init(pdev);</div><div class='add'>+		if (unlikely(ret))</div><div class='add'>+			goto out_unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("STMMAC platform driver registration completed");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_unmap:</div><div class='add'>+	iounmap(addr);</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+out_release_region:</div><div class='add'>+	release_mem_region(res-&gt;start, resource_size(res));</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'>+ * stmmac_pltfr_remove</div><div class='add'>+ * @pdev: platform device pointer</div><div class='add'>+ * Description: this function calls the main to free the net resources</div><div class='add'>+ * and calls the platforms hook and release the resources (e.g. mem).</div><div class='add'>+ */</div><div class='add'>+static int stmmac_pltfr_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='add'>+	struct stmmac_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct resource *res;</div><div class='add'>+	int ret = stmmac_dvr_remove(ndev);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;plat-&gt;exit)</div><div class='add'>+		priv-&gt;plat-&gt;exit(pdev);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;plat-&gt;exit)</div><div class='add'>+		priv-&gt;plat-&gt;exit(pdev);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	iounmap((void *)priv-&gt;ioaddr);</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	release_mem_region(res-&gt;start, resource_size(res));</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int stmmac_pltfr_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return stmmac_suspend(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stmmac_pltfr_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return stmmac_resume(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int stmmac_pltfr_freeze(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return stmmac_freeze(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int stmmac_pltfr_restore(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return stmmac_restore(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops stmmac_pltfr_pm_ops = {</div><div class='add'>+	.suspend = stmmac_pltfr_suspend,</div><div class='add'>+	.resume = stmmac_pltfr_resume,</div><div class='add'>+	.freeze = stmmac_pltfr_freeze,</div><div class='add'>+	.thaw = stmmac_pltfr_restore,</div><div class='add'>+	.restore = stmmac_pltfr_restore,</div><div class='add'>+};</div><div class='add'>+#else</div><div class='add'>+static const struct dev_pm_ops stmmac_pltfr_pm_ops;</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+static struct platform_driver stmmac_driver = {</div><div class='add'>+	.probe = stmmac_pltfr_probe,</div><div class='add'>+	.remove = stmmac_pltfr_remove,</div><div class='add'>+	.driver = {</div><div class='add'>+		   .name = STMMAC_RESOURCE_NAME,</div><div class='add'>+		   .owner = THIS_MODULE,</div><div class='add'>+		   .pm = &amp;stmmac_pltfr_pm_ops,</div><div class='add'>+		   },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(stmmac_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("STMMAC 10/100/1000 Ethernet PLATFORM driver");</div><div class='add'>+MODULE_AUTHOR("Giuseppe Cavallaro &lt;peppe.cavallaro@st.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c<br/>index fd40988c19a6..f10665f594c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sun/cassini.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sun/cassini.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sun/cassini.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sun/cassini.c</a></div><div class='hunk'>@@ -4532,10 +4532,9 @@ static void cas_set_multicast(struct net_device *dev)</div><div class='ctx'> static void cas_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct cas *cp = netdev_priv(dev);</div><div class='del'>-	strncpy(info-&gt;driver, DRV_MODULE_NAME, ETHTOOL_BUSINFO_LEN);</div><div class='del'>-	strncpy(info-&gt;version, DRV_MODULE_VERSION, ETHTOOL_BUSINFO_LEN);</div><div class='del'>-	info-&gt;fw_version[0] = '\0';</div><div class='del'>-	strncpy(info-&gt;bus_info, pci_name(cp-&gt;pdev), ETHTOOL_BUSINFO_LEN);</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_MODULE_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(cp-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> 	info-&gt;regdump_len = cp-&gt;casreg_len &lt; CAS_MAX_REGS ?</div><div class='ctx'> 		cp-&gt;casreg_len : CAS_MAX_REGS;</div><div class='ctx'> 	info-&gt;n_stats = CAS_NUM_STAT_KEYS;</div><div class='head'>diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c<br/>index 73c708107a37..cf433931304f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sun/niu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sun/niu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sun/niu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sun/niu.c</a></div><div class='hunk'>@@ -1151,19 +1151,8 @@ static int link_status_mii(struct niu *np, int *link_up_p)</div><div class='ctx'> 		supported |= SUPPORTED_1000baseT_Full;</div><div class='ctx'> 	lp-&gt;supported = supported;</div><div class='ctx'> </div><div class='del'>-	advertising = 0;</div><div class='del'>-	if (advert &amp; ADVERTISE_10HALF)</div><div class='del'>-		advertising |= ADVERTISED_10baseT_Half;</div><div class='del'>-	if (advert &amp; ADVERTISE_10FULL)</div><div class='del'>-		advertising |= ADVERTISED_10baseT_Full;</div><div class='del'>-	if (advert &amp; ADVERTISE_100HALF)</div><div class='del'>-		advertising |= ADVERTISED_100baseT_Half;</div><div class='del'>-	if (advert &amp; ADVERTISE_100FULL)</div><div class='del'>-		advertising |= ADVERTISED_100baseT_Full;</div><div class='del'>-	if (ctrl1000 &amp; ADVERTISE_1000HALF)</div><div class='del'>-		advertising |= ADVERTISED_1000baseT_Half;</div><div class='del'>-	if (ctrl1000 &amp; ADVERTISE_1000FULL)</div><div class='del'>-		advertising |= ADVERTISED_1000baseT_Full;</div><div class='add'>+	advertising = mii_adv_to_ethtool_adv_t(advert);</div><div class='add'>+	advertising |= mii_ctrl1000_to_ethtool_adv_t(ctrl1000);</div><div class='ctx'> </div><div class='ctx'> 	if (bmcr &amp; BMCR_ANENABLE) {</div><div class='ctx'> 		int neg, neg1000;</div><div class='hunk'>@@ -3609,6 +3598,7 @@ static int release_tx_packet(struct niu *np, struct tx_ring_info *rp, int idx)</div><div class='ctx'> static void niu_tx_work(struct niu *np, struct tx_ring_info *rp)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_queue *txq;</div><div class='add'>+	unsigned int tx_bytes;</div><div class='ctx'> 	u16 pkt_cnt, tmp;</div><div class='ctx'> 	int cons, index;</div><div class='ctx'> 	u64 cs;</div><div class='hunk'>@@ -3631,12 +3621,18 @@ static void niu_tx_work(struct niu *np, struct tx_ring_info *rp)</div><div class='ctx'> 	netif_printk(np, tx_done, KERN_DEBUG, np-&gt;dev,</div><div class='ctx'> 		     "%s() pkt_cnt[%u] cons[%d]\n", __func__, pkt_cnt, cons);</div><div class='ctx'> </div><div class='del'>-	while (pkt_cnt--)</div><div class='add'>+	tx_bytes = 0;</div><div class='add'>+	tmp = pkt_cnt;</div><div class='add'>+	while (tmp--) {</div><div class='add'>+		tx_bytes += rp-&gt;tx_buffs[cons].skb-&gt;len;</div><div class='ctx'> 		cons = release_tx_packet(np, rp, cons);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rp-&gt;cons = cons;</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> </div><div class='add'>+	netdev_tx_completed_queue(txq, pkt_cnt, tx_bytes);</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	if (unlikely(netif_tx_queue_stopped(txq) &amp;&amp;</div><div class='ctx'> 		     (niu_tx_avail(rp) &gt; NIU_TX_WAKEUP_THRESH(rp)))) {</div><div class='hunk'>@@ -4337,6 +4333,7 @@ static void niu_free_channels(struct niu *np)</div><div class='ctx'> 			struct tx_ring_info *rp = &amp;np-&gt;tx_rings[i];</div><div class='ctx'> </div><div class='ctx'> 			niu_free_tx_ring_info(np, rp);</div><div class='add'>+			netdev_tx_reset_queue(netdev_get_tx_queue(np-&gt;dev, i));</div><div class='ctx'> 		}</div><div class='ctx'> 		kfree(np-&gt;tx_rings);</div><div class='ctx'> 		np-&gt;tx_rings = NULL;</div><div class='hunk'>@@ -6742,6 +6739,8 @@ static netdev_tx_t niu_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 		prod = NEXT_TX(rp, prod);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netdev_tx_sent_queue(txq, skb-&gt;len);</div><div class='add'>+</div><div class='ctx'> 	if (prod &lt; rp-&gt;prod)</div><div class='ctx'> 		rp-&gt;wrap_bit ^= TX_RING_KICK_WRAP;</div><div class='ctx'> 	rp-&gt;prod = prod;</div><div class='hunk'>@@ -6823,12 +6822,13 @@ static void niu_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 	struct niu *np = netdev_priv(dev);</div><div class='ctx'> 	struct niu_vpd *vpd = &amp;np-&gt;vpd;</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_MODULE_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_MODULE_VERSION);</div><div class='del'>-	sprintf(info-&gt;fw_version, "%d.%d",</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_MODULE_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version), "%d.%d",</div><div class='ctx'> 		vpd-&gt;fcode_major, vpd-&gt;fcode_minor);</div><div class='ctx'> 	if (np-&gt;parent-&gt;plat_type != PLAT_TYPE_NIU)</div><div class='del'>-		strcpy(info-&gt;bus_info, pci_name(np-&gt;pdev));</div><div class='add'>+		strlcpy(info-&gt;bus_info, pci_name(np-&gt;pdev),</div><div class='add'>+			sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int niu_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='hunk'>@@ -8589,9 +8589,11 @@ static int __devinit phy_record(struct niu_parent *parent,</div><div class='ctx'> 	if (dev_id_1 &lt; 0 || dev_id_2 &lt; 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (type == PHY_TYPE_PMA_PMD || type == PHY_TYPE_PCS) {</div><div class='add'>+		/* Because of the NIU_PHY_ID_MASK being applied, the 8704</div><div class='add'>+		 * test covers the 8706 as well.</div><div class='add'>+		 */</div><div class='ctx'> 		if (((id &amp; NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM8704) &amp;&amp;</div><div class='del'>-		    ((id &amp; NIU_PHY_ID_MASK) != NIU_PHY_ID_MRVL88X2011) &amp;&amp;</div><div class='del'>-		    ((id &amp; NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM8706))</div><div class='add'>+		    ((id &amp; NIU_PHY_ID_MASK) != NIU_PHY_ID_MRVL88X2011))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if ((id &amp; NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM5464R)</div><div class='head'>diff --git a/drivers/net/ethernet/sun/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c<br/>index 0d8cfd9ea053..220f724c3377 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sun/sunbmac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sun/sunbmac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sun/sunbmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sun/sunbmac.c</a></div><div class='hunk'>@@ -1293,15 +1293,4 @@ static struct platform_driver bigmac_sbus_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(bigmac_sbus_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init bigmac_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;bigmac_sbus_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit bigmac_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;bigmac_sbus_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(bigmac_init);</div><div class='del'>-module_exit(bigmac_exit);</div><div class='add'>+module_platform_driver(bigmac_sbus_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c<br/>index ceab215bb4a3..31441a870b0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sun/sungem.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sun/sungem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sun/sungem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sun/sungem.c</a></div><div class='hunk'>@@ -2517,9 +2517,9 @@ static void gem_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info</div><div class='ctx'> {</div><div class='ctx'> 	struct gem *gp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(gp-&gt;pdev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(gp-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int gem_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='head'>diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c<br/>index cf14ab9db576..09c518655db2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sun/sunhme.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/sun/sunhme.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/sun/sunhme.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/sun/sunhme.c</a></div><div class='hunk'>@@ -2457,11 +2457,11 @@ static void hme_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info</div><div class='ctx'> {</div><div class='ctx'> 	struct happy_meal *hp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, "sunhme");</div><div class='del'>-	strcpy(info-&gt;version, "2.02");</div><div class='add'>+	strlcpy(info-&gt;driver, "sunhme", sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, "2.02", sizeof(info-&gt;version));</div><div class='ctx'> 	if (hp-&gt;happy_flags &amp; HFLAG_PCI) {</div><div class='ctx'> 		struct pci_dev *pdev = hp-&gt;happy_dev;</div><div class='del'>-		strcpy(info-&gt;bus_info, pci_name(pdev));</div><div class='add'>+		strlcpy(info-&gt;bus_info, pci_name(pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='ctx'> 	else {</div><div class='hunk'>@@ -2469,7 +2469,8 @@ static void hme_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info</div><div class='ctx'> 		struct platform_device *op = hp-&gt;happy_dev;</div><div class='ctx'> 		regs = of_get_property(op-&gt;dev.of_node, "regs", NULL);</div><div class='ctx'> 		if (regs)</div><div class='del'>-			sprintf(info-&gt;bus_info, "SBUS:%d",</div><div class='add'>+			snprintf(info-&gt;bus_info, sizeof(info-&gt;bus_info),</div><div class='add'>+				"SBUS:%d",</div><div class='ctx'> 				regs-&gt;which_io);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2849,7 +2850,7 @@ err_out:</div><div class='ctx'> static int is_quattro_p(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *busdev = pdev-&gt;bus-&gt;self;</div><div class='del'>-	struct list_head *tmp;</div><div class='add'>+	struct pci_dev *this_pdev;</div><div class='ctx'> 	int n_hmes;</div><div class='ctx'> </div><div class='ctx'> 	if (busdev == NULL ||</div><div class='hunk'>@@ -2858,15 +2859,10 @@ static int is_quattro_p(struct pci_dev *pdev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	n_hmes = 0;</div><div class='del'>-	tmp = pdev-&gt;bus-&gt;devices.next;</div><div class='del'>-	while (tmp != &amp;pdev-&gt;bus-&gt;devices) {</div><div class='del'>-		struct pci_dev *this_pdev = pci_dev_b(tmp);</div><div class='del'>-</div><div class='add'>+	list_for_each_entry(this_pdev, &amp;pdev-&gt;bus-&gt;devices, bus_list) {</div><div class='ctx'> 		if (this_pdev-&gt;vendor == PCI_VENDOR_ID_SUN &amp;&amp;</div><div class='ctx'> 		    this_pdev-&gt;device == PCI_DEVICE_ID_SUN_HAPPYMEAL)</div><div class='ctx'> 			n_hmes++;</div><div class='del'>-</div><div class='del'>-		tmp = tmp-&gt;next;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (n_hmes != 4)</div><div class='head'>diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c<br/>index 3a90af6d111c..4b19e9b0606b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/tehuti/tehuti.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/tehuti/tehuti.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/tehuti/tehuti.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/tehuti/tehuti.c</a></div><div class='hunk'>@@ -727,9 +727,10 @@ static void __bdx_vlan_rx_vid(struct net_device *ndev, uint16_t vid, int enable)</div><div class='ctx'>  * @ndev network device</div><div class='ctx'>  * @vid  VLAN vid to add</div><div class='ctx'>  */</div><div class='del'>-static void bdx_vlan_rx_add_vid(struct net_device *ndev, uint16_t vid)</div><div class='add'>+static int bdx_vlan_rx_add_vid(struct net_device *ndev, uint16_t vid)</div><div class='ctx'> {</div><div class='ctx'> 	__bdx_vlan_rx_vid(ndev, vid, 1);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -737,9 +738,10 @@ static void bdx_vlan_rx_add_vid(struct net_device *ndev, uint16_t vid)</div><div class='ctx'>  * @ndev network device</div><div class='ctx'>  * @vid  VLAN vid to kill</div><div class='ctx'>  */</div><div class='del'>-static void bdx_vlan_rx_kill_vid(struct net_device *ndev, unsigned short vid)</div><div class='add'>+static int bdx_vlan_rx_kill_vid(struct net_device *ndev, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	__bdx_vlan_rx_vid(ndev, vid, 0);</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/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c<br/>index aaac0c7ad111..4d9a28ffd3c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/ti/cpmac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/ti/cpmac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/ti/cpmac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/ti/cpmac.c</a></div><div class='hunk'>@@ -1269,7 +1269,7 @@ int __devinit cpmac_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cpmac_mii-&gt;phy_mask = ~(mask | 0x80000000);</div><div class='del'>-	snprintf(cpmac_mii-&gt;id, MII_BUS_ID_SIZE, "1");</div><div class='add'>+	snprintf(cpmac_mii-&gt;id, MII_BUS_ID_SIZE, "cpmac-1");</div><div class='ctx'> </div><div class='ctx'> 	res = mdiobus_register(cpmac_mii);</div><div class='ctx'> 	if (res)</div><div class='head'>diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c<br/>index 815c7970261b..794ac30a577b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/ti/davinci_emac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/ti/davinci_emac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/ti/davinci_emac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/ti/davinci_emac.c</a></div><div class='hunk'>@@ -115,6 +115,7 @@ static const char emac_version_string[] = "TI DaVinci EMAC Linux v6.1";</div><div class='ctx'> #define EMAC_DEF_TX_CH			(0) /* Default 0th channel */</div><div class='ctx'> #define EMAC_DEF_RX_CH			(0) /* Default 0th channel */</div><div class='ctx'> #define EMAC_DEF_RX_NUM_DESC		(128)</div><div class='add'>+#define EMAC_DEF_TX_NUM_DESC		(128)</div><div class='ctx'> #define EMAC_DEF_MAX_TX_CH		(1) /* Max TX channels configured */</div><div class='ctx'> #define EMAC_DEF_MAX_RX_CH		(1) /* Max RX channels configured */</div><div class='ctx'> #define EMAC_POLL_WEIGHT		(64) /* Default NAPI poll weight */</div><div class='hunk'>@@ -336,6 +337,7 @@ struct emac_priv {</div><div class='ctx'> 	u32 mac_hash2;</div><div class='ctx'> 	u32 multicast_hash_cnt[EMAC_NUM_MULTICAST_BITS];</div><div class='ctx'> 	u32 rx_addr_type;</div><div class='add'>+	atomic_t cur_tx;</div><div class='ctx'> 	const char *phy_id;</div><div class='ctx'> 	struct phy_device *phydev;</div><div class='ctx'> 	spinlock_t lock;</div><div class='hunk'>@@ -1044,6 +1046,9 @@ static void emac_tx_handler(void *token, int len, int status)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff		*skb = token;</div><div class='ctx'> 	struct net_device	*ndev = skb-&gt;dev;</div><div class='add'>+	struct emac_priv	*priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	atomic_dec(&amp;priv-&gt;cur_tx);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(netif_queue_stopped(ndev)))</div><div class='ctx'> 		netif_start_queue(ndev);</div><div class='hunk'>@@ -1092,6 +1097,9 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 		goto fail_tx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (atomic_inc_return(&amp;priv-&gt;cur_tx) &gt;= EMAC_DEF_TX_NUM_DESC)</div><div class='add'>+		netif_stop_queue(ndev);</div><div class='add'>+</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> fail_tx:</div><div class='head'>diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c<br/>index 7615040df756..ef7c9c17bfff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/ti/davinci_mdio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/ti/davinci_mdio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/ti/davinci_mdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/ti/davinci_mdio.c</a></div><div class='hunk'>@@ -313,7 +313,8 @@ static int __devinit davinci_mdio_probe(struct platform_device *pdev)</div><div class='ctx'> 	data-&gt;bus-&gt;reset	= davinci_mdio_reset,</div><div class='ctx'> 	data-&gt;bus-&gt;parent	= dev;</div><div class='ctx'> 	data-&gt;bus-&gt;priv		= data;</div><div class='del'>-	snprintf(data-&gt;bus-&gt;id, MII_BUS_ID_SIZE, "%x", pdev-&gt;id);</div><div class='add'>+	snprintf(data-&gt;bus-&gt;id, MII_BUS_ID_SIZE, "%s-%x",</div><div class='add'>+		pdev-&gt;name, pdev-&gt;id);</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;clk = clk_get(dev, NULL);</div><div class='ctx'> 	if (IS_ERR(data-&gt;clk)) {</div><div class='head'>diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c<br/>index 1187a1169eb2..d9951afb9269 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/tile/tilepro.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/tile/tilepro.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/tile/tilepro.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/tile/tilepro.c</a></div><div class='hunk'>@@ -1256,7 +1256,7 @@ static void tile_net_stop_aux(struct net_device *dev)</div><div class='ctx'> 			  sizeof(dummy), NETIO_IPP_STOP_SHIM_OFF) &lt; 0)</div><div class='ctx'> 		panic("Failed to stop LIPP/LEPP!\n");</div><div class='ctx'> </div><div class='del'>-	priv-&gt;partly_opened = 0;</div><div class='add'>+	priv-&gt;partly_opened = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1507,7 +1507,7 @@ static int tile_net_open(struct net_device *dev)</div><div class='ctx'> 		       priv-&gt;network_cpus_count, priv-&gt;network_cpus_credits);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-		priv-&gt;partly_opened = 1;</div><div class='add'>+		priv-&gt;partly_opened = true;</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* FIXME: Is this possible? */</div><div class='hunk'>@@ -2260,8 +2260,7 @@ static int tile_net_get_mac(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static struct net_device_ops tile_net_ops = {</div><div class='add'>+static const struct net_device_ops tile_net_ops = {</div><div class='ctx'> 	.ndo_open = tile_net_open,</div><div class='ctx'> 	.ndo_stop = tile_net_stop,</div><div class='ctx'> 	.ndo_start_xmit = tile_net_tx,</div><div class='head'>diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c<br/>index 7bf1e2015784..5ee82a77723b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/toshiba/ps3_gelic_net.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/toshiba/ps3_gelic_net.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/toshiba/ps3_gelic_net.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/toshiba/ps3_gelic_net.c</a></div><div class='hunk'>@@ -640,7 +640,7 @@ static inline void gelic_card_disable_rxdmac(struct gelic_card *card)</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	/* this hvc blocks until the DMA in progress really stopped */</div><div class='del'>-	status = lv1_net_stop_rx_dma(bus_id(card), dev_id(card), 0);</div><div class='add'>+	status = lv1_net_stop_rx_dma(bus_id(card), dev_id(card));</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		dev_err(ctodev(card),</div><div class='ctx'> 			"lv1_net_stop_rx_dma failed, %d\n", status);</div><div class='hunk'>@@ -658,7 +658,7 @@ static inline void gelic_card_disable_txdmac(struct gelic_card *card)</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	/* this hvc blocks until the DMA in progress really stopped */</div><div class='del'>-	status = lv1_net_stop_tx_dma(bus_id(card), dev_id(card), 0);</div><div class='add'>+	status = lv1_net_stop_tx_dma(bus_id(card), dev_id(card));</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		dev_err(ctodev(card),</div><div class='ctx'> 			"lv1_net_stop_tx_dma failed, status=%d\n", status);</div><div class='head'>diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c<br/>index a8df7eca0956..164fb775d7b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/tundra/tsi108_eth.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/tundra/tsi108_eth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/tundra/tsi108_eth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/tundra/tsi108_eth.c</a></div><div class='hunk'>@@ -1604,7 +1604,7 @@ tsi108_init_one(struct platform_device *pdev)</div><div class='ctx'> 	data-&gt;phyregs = ioremap(einfo-&gt;phyregs, 0x400);</div><div class='ctx'> 	if (NULL == data-&gt;phyregs) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto regs_fail;</div><div class='add'>+		goto phyregs_fail;</div><div class='ctx'> 	}</div><div class='ctx'> /* MII setup */</div><div class='ctx'> 	data-&gt;mii_if.dev = dev;</div><div class='hunk'>@@ -1663,9 +1663,11 @@ tsi108_init_one(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> register_fail:</div><div class='del'>-	iounmap(data-&gt;regs);</div><div class='ctx'> 	iounmap(data-&gt;phyregs);</div><div class='ctx'> </div><div class='add'>+phyregs_fail:</div><div class='add'>+	iounmap(data-&gt;regs);</div><div class='add'>+</div><div class='ctx'> regs_fail:</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1688,18 +1690,6 @@ static void tsi108_timed_checker(unsigned long dev_ptr)</div><div class='ctx'> 	mod_timer(&amp;data-&gt;timer, jiffies + CHECK_PHY_INTERVAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tsi108_ether_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	ret = platform_driver_register (&amp;tsi_eth_driver);</div><div class='del'>-	if (ret &lt; 0){</div><div class='del'>-		printk("tsi108_ether_init: error initializing ethernet "</div><div class='del'>-		       "device\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int tsi108_ether_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='hunk'>@@ -1714,13 +1704,7 @@ static int tsi108_ether_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-static void tsi108_ether_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;tsi_eth_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(tsi108_ether_init);</div><div class='del'>-module_exit(tsi108_ether_exit);</div><div class='add'>+module_platform_driver(tsi_eth_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Tundra Semiconductor Corporation");</div><div class='ctx'> MODULE_DESCRIPTION("Tsi108 Gigabit Ethernet driver");</div><div class='head'>diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c<br/>index f34dd99fe579..10b18eb63d25 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/via/via-rhine.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/via/via-rhine.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/via/via-rhine.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/via/via-rhine.c</a></div><div class='hunk'>@@ -35,13 +35,13 @@</div><div class='ctx'> #define DRV_VERSION	"1.5.0"</div><div class='ctx'> #define DRV_RELDATE	"2010-10-09"</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* A few user-configurable values.</div><div class='ctx'>    These may be modified when a driver module is loaded. */</div><div class='del'>-</div><div class='del'>-#define DEBUG</div><div class='del'>-static int debug = 1;	/* 1 normal messages, 0 quiet .. 7 verbose. */</div><div class='del'>-static int max_interrupt_work = 20;</div><div class='add'>+static int debug = 0;</div><div class='add'>+#define RHINE_MSG_DEFAULT \</div><div class='add'>+        (0x0000)</div><div class='ctx'> </div><div class='ctx'> /* Set the copy breakpoint for the copy-only-tiny-frames scheme.</div><div class='ctx'>    Setting to &gt; 1518 effectively disables this feature. */</div><div class='hunk'>@@ -55,7 +55,7 @@ static int rx_copybreak;</div><div class='ctx'> </div><div class='ctx'> /* Work-around for broken BIOSes: they are unable to get the chip back out of</div><div class='ctx'>    power state D3 so PXE booting fails. bootparam(7): via-rhine.avoid_D3=1 */</div><div class='del'>-static int avoid_D3;</div><div class='add'>+static bool avoid_D3;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * In case you are looking for 'options[]' or 'full_duplex[]', they</div><div class='hunk'>@@ -127,12 +127,10 @@ MODULE_AUTHOR("Donald Becker &lt;becker@scyld.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("VIA Rhine PCI Fast Ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-module_param(max_interrupt_work, int, 0);</div><div class='ctx'> module_param(debug, int, 0);</div><div class='ctx'> module_param(rx_copybreak, int, 0);</div><div class='ctx'> module_param(avoid_D3, bool, 0);</div><div class='del'>-MODULE_PARM_DESC(max_interrupt_work, "VIA Rhine maximum events handled per interrupt");</div><div class='del'>-MODULE_PARM_DESC(debug, "VIA Rhine debug level (0-7)");</div><div class='add'>+MODULE_PARM_DESC(debug, "VIA Rhine debug message flags");</div><div class='ctx'> MODULE_PARM_DESC(rx_copybreak, "VIA Rhine copy breakpoint for copy-only-tiny-frames");</div><div class='ctx'> MODULE_PARM_DESC(avoid_D3, "Avoid power state D3 (work-around for broken BIOSes)");</div><div class='ctx'> </div><div class='hunk'>@@ -350,16 +348,25 @@ static const int mmio_verify_registers[] = {</div><div class='ctx'> </div><div class='ctx'> /* Bits in the interrupt status/mask registers. */</div><div class='ctx'> enum intr_status_bits {</div><div class='del'>-	IntrRxDone=0x0001, IntrRxErr=0x0004, IntrRxEmpty=0x0020,</div><div class='del'>-	IntrTxDone=0x0002, IntrTxError=0x0008, IntrTxUnderrun=0x0210,</div><div class='del'>-	IntrPCIErr=0x0040,</div><div class='del'>-	IntrStatsMax=0x0080, IntrRxEarly=0x0100,</div><div class='del'>-	IntrRxOverflow=0x0400, IntrRxDropped=0x0800, IntrRxNoBuf=0x1000,</div><div class='del'>-	IntrTxAborted=0x2000, IntrLinkChange=0x4000,</div><div class='del'>-	IntrRxWakeUp=0x8000,</div><div class='del'>-	IntrNormalSummary=0x0003, IntrAbnormalSummary=0xC260,</div><div class='del'>-	IntrTxDescRace=0x080000,	/* mapped from IntrStatus2 */</div><div class='del'>-	IntrTxErrSummary=0x082218,</div><div class='add'>+	IntrRxDone	= 0x0001,</div><div class='add'>+	IntrTxDone	= 0x0002,</div><div class='add'>+	IntrRxErr	= 0x0004,</div><div class='add'>+	IntrTxError	= 0x0008,</div><div class='add'>+	IntrRxEmpty	= 0x0020,</div><div class='add'>+	IntrPCIErr	= 0x0040,</div><div class='add'>+	IntrStatsMax	= 0x0080,</div><div class='add'>+	IntrRxEarly	= 0x0100,</div><div class='add'>+	IntrTxUnderrun	= 0x0210,</div><div class='add'>+	IntrRxOverflow	= 0x0400,</div><div class='add'>+	IntrRxDropped	= 0x0800,</div><div class='add'>+	IntrRxNoBuf	= 0x1000,</div><div class='add'>+	IntrTxAborted	= 0x2000,</div><div class='add'>+	IntrLinkChange	= 0x4000,</div><div class='add'>+	IntrRxWakeUp	= 0x8000,</div><div class='add'>+	IntrTxDescRace		= 0x080000,	/* mapped from IntrStatus2 */</div><div class='add'>+	IntrNormalSummary	= IntrRxDone | IntrTxDone,</div><div class='add'>+	IntrTxErrSummary	= IntrTxDescRace | IntrTxAborted | IntrTxError |</div><div class='add'>+				  IntrTxUnderrun,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Bits in WOLcrSet/WOLcrClr and PwrcsrSet/PwrcsrClr */</div><div class='hunk'>@@ -438,8 +445,13 @@ struct rhine_private {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct napi_struct napi;</div><div class='ctx'> 	spinlock_t lock;</div><div class='add'>+	struct mutex task_lock;</div><div class='add'>+	bool task_enable;</div><div class='add'>+	struct work_struct slow_event_task;</div><div class='ctx'> 	struct work_struct reset_task;</div><div class='ctx'> </div><div class='add'>+	u32 msg_enable;</div><div class='add'>+</div><div class='ctx'> 	/* Frequently used values: keep some adjacent for cache effect. */</div><div class='ctx'> 	u32 quirks;</div><div class='ctx'> 	struct rx_desc *rx_head_desc;</div><div class='hunk'>@@ -475,41 +487,50 @@ static int  mdio_read(struct net_device *dev, int phy_id, int location);</div><div class='ctx'> static void mdio_write(struct net_device *dev, int phy_id, int location, int value);</div><div class='ctx'> static int  rhine_open(struct net_device *dev);</div><div class='ctx'> static void rhine_reset_task(struct work_struct *work);</div><div class='add'>+static void rhine_slow_event_task(struct work_struct *work);</div><div class='ctx'> static void rhine_tx_timeout(struct net_device *dev);</div><div class='ctx'> static netdev_tx_t rhine_start_tx(struct sk_buff *skb,</div><div class='ctx'> 				  struct net_device *dev);</div><div class='ctx'> static irqreturn_t rhine_interrupt(int irq, void *dev_instance);</div><div class='ctx'> static void rhine_tx(struct net_device *dev);</div><div class='ctx'> static int rhine_rx(struct net_device *dev, int limit);</div><div class='del'>-static void rhine_error(struct net_device *dev, int intr_status);</div><div class='ctx'> static void rhine_set_rx_mode(struct net_device *dev);</div><div class='ctx'> static struct net_device_stats *rhine_get_stats(struct net_device *dev);</div><div class='ctx'> static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);</div><div class='ctx'> static const struct ethtool_ops netdev_ethtool_ops;</div><div class='ctx'> static int  rhine_close(struct net_device *dev);</div><div class='del'>-static void rhine_shutdown (struct pci_dev *pdev);</div><div class='del'>-static void rhine_vlan_rx_add_vid(struct net_device *dev, unsigned short vid);</div><div class='del'>-static void rhine_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid);</div><div class='del'>-static void rhine_set_cam(void __iomem *ioaddr, int idx, u8 *addr);</div><div class='del'>-static void rhine_set_vlan_cam(void __iomem *ioaddr, int idx, u8 *addr);</div><div class='del'>-static void rhine_set_cam_mask(void __iomem *ioaddr, u32 mask);</div><div class='del'>-static void rhine_set_vlan_cam_mask(void __iomem *ioaddr, u32 mask);</div><div class='del'>-static void rhine_init_cam_filter(struct net_device *dev);</div><div class='del'>-static void rhine_update_vcam(struct net_device *dev);</div><div class='del'>-</div><div class='del'>-#define RHINE_WAIT_FOR(condition)				\</div><div class='del'>-do {								\</div><div class='del'>-	int i = 1024;						\</div><div class='del'>-	while (!(condition) &amp;&amp; --i)				\</div><div class='del'>-		;						\</div><div class='del'>-	if (debug &gt; 1 &amp;&amp; i &lt; 512)				\</div><div class='del'>-		pr_info("%4d cycles used @ %s:%d\n",		\</div><div class='del'>-			1024 - i, __func__, __LINE__);		\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-static inline u32 get_intr_status(struct net_device *dev)</div><div class='add'>+static int rhine_vlan_rx_add_vid(struct net_device *dev, unsigned short vid);</div><div class='add'>+static int rhine_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid);</div><div class='add'>+static void rhine_restart_tx(struct net_device *dev);</div><div class='add'>+</div><div class='add'>+static void rhine_wait_bit(struct rhine_private *rp, u8 reg, u8 mask, bool high)</div><div class='add'>+{</div><div class='add'>+	void __iomem *ioaddr = rp-&gt;base;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 1024; i++) {</div><div class='add'>+		if (high ^ !!(ioread8(ioaddr + reg) &amp; mask))</div><div class='add'>+			break;</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+	if (i &gt; 64) {</div><div class='add'>+		netif_dbg(rp, hw, rp-&gt;dev, "%s bit wait (%02x/%02x) cycle "</div><div class='add'>+			  "count: %04d\n", high ? "high" : "low", reg, mask, i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rhine_wait_bit_high(struct rhine_private *rp, u8 reg, u8 mask)</div><div class='add'>+{</div><div class='add'>+	rhine_wait_bit(rp, reg, mask, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rhine_wait_bit_low(struct rhine_private *rp, u8 reg, u8 mask)</div><div class='add'>+{</div><div class='add'>+	rhine_wait_bit(rp, reg, mask, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 rhine_get_events(struct rhine_private *rp)</div><div class='ctx'> {</div><div class='del'>-	struct rhine_private *rp = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = rp-&gt;base;</div><div class='ctx'> 	u32 intr_status;</div><div class='ctx'> </div><div class='hunk'>@@ -520,6 +541,16 @@ static inline u32 get_intr_status(struct net_device *dev)</div><div class='ctx'> 	return intr_status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void rhine_ack_events(struct rhine_private *rp, u32 mask)</div><div class='add'>+{</div><div class='add'>+	void __iomem *ioaddr = rp-&gt;base;</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;quirks &amp; rqStatusWBRace)</div><div class='add'>+		iowrite8(mask &gt;&gt; 16, ioaddr + IntrStatus2);</div><div class='add'>+	iowrite16(mask, ioaddr + IntrStatus);</div><div class='add'>+	mmiowb();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Get power related registers into sane state.</div><div class='ctx'>  * Notify user about past WOL event.</div><div class='hunk'>@@ -584,6 +615,7 @@ static void rhine_chip_reset(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct rhine_private *rp = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = rp-&gt;base;</div><div class='add'>+	u8 cmd1;</div><div class='ctx'> </div><div class='ctx'> 	iowrite8(Cmd1Reset, ioaddr + ChipCmd1);</div><div class='ctx'> 	IOSYNC;</div><div class='hunk'>@@ -596,13 +628,12 @@ static void rhine_chip_reset(struct net_device *dev)</div><div class='ctx'> 			iowrite8(0x40, ioaddr + MiscCmd);</div><div class='ctx'> </div><div class='ctx'> 		/* Reset can take somewhat longer (rare) */</div><div class='del'>-		RHINE_WAIT_FOR(!(ioread8(ioaddr + ChipCmd1) &amp; Cmd1Reset));</div><div class='add'>+		rhine_wait_bit_low(rp, ChipCmd1, Cmd1Reset);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (debug &gt; 1)</div><div class='del'>-		netdev_info(dev, "Reset %s\n",</div><div class='del'>-			    (ioread8(ioaddr + ChipCmd1) &amp; Cmd1Reset) ?</div><div class='del'>-			    "failed" : "succeeded");</div><div class='add'>+	cmd1 = ioread8(ioaddr + ChipCmd1);</div><div class='add'>+	netif_info(rp, hw, dev, "Reset %s\n", (cmd1 &amp; Cmd1Reset) ?</div><div class='add'>+		   "failed" : "succeeded");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef USE_MMIO</div><div class='hunk'>@@ -628,9 +659,15 @@ static void __devinit rhine_reload_eeprom(long pioaddr, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct rhine_private *rp = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = rp-&gt;base;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	outb(0x20, pioaddr + MACRegEEcsr);</div><div class='del'>-	RHINE_WAIT_FOR(!(inb(pioaddr + MACRegEEcsr) &amp; 0x20));</div><div class='add'>+	for (i = 0; i &lt; 1024; i++) {</div><div class='add'>+		if (!(inb(pioaddr + MACRegEEcsr) &amp; 0x20))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i &gt; 512)</div><div class='add'>+		pr_info("%4d cycles used @ %s:%d\n", i, __func__, __LINE__);</div><div class='ctx'> </div><div class='ctx'> #ifdef USE_MMIO</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -656,23 +693,127 @@ static void rhine_poll(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void rhine_kick_tx_threshold(struct rhine_private *rp)</div><div class='add'>+{</div><div class='add'>+	if (rp-&gt;tx_thresh &lt; 0xe0) {</div><div class='add'>+		void __iomem *ioaddr = rp-&gt;base;</div><div class='add'>+</div><div class='add'>+		rp-&gt;tx_thresh += 0x20;</div><div class='add'>+		BYTE_REG_BITS_SET(rp-&gt;tx_thresh, 0x80, ioaddr + TxConfig);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rhine_tx_err(struct rhine_private *rp, u32 status)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = rp-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (status &amp; IntrTxAborted) {</div><div class='add'>+		netif_info(rp, tx_err, dev,</div><div class='add'>+			   "Abort %08x, frame dropped\n", status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status &amp; IntrTxUnderrun) {</div><div class='add'>+		rhine_kick_tx_threshold(rp);</div><div class='add'>+		netif_info(rp, tx_err ,dev, "Transmitter underrun, "</div><div class='add'>+			   "Tx threshold now %02x\n", rp-&gt;tx_thresh);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status &amp; IntrTxDescRace)</div><div class='add'>+		netif_info(rp, tx_err, dev, "Tx descriptor write-back race\n");</div><div class='add'>+</div><div class='add'>+	if ((status &amp; IntrTxError) &amp;&amp;</div><div class='add'>+	    (status &amp; (IntrTxAborted | IntrTxUnderrun | IntrTxDescRace)) == 0) {</div><div class='add'>+		rhine_kick_tx_threshold(rp);</div><div class='add'>+		netif_info(rp, tx_err, dev, "Unspecified error. "</div><div class='add'>+			   "Tx threshold now %02x\n", rp-&gt;tx_thresh);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rhine_restart_tx(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rhine_update_rx_crc_and_missed_errord(struct rhine_private *rp)</div><div class='add'>+{</div><div class='add'>+	void __iomem *ioaddr = rp-&gt;base;</div><div class='add'>+	struct net_device_stats *stats = &amp;rp-&gt;dev-&gt;stats;</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_crc_errors    += ioread16(ioaddr + RxCRCErrs);</div><div class='add'>+	stats-&gt;rx_missed_errors += ioread16(ioaddr + RxMissed);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clears the "tally counters" for CRC errors and missed frames(?).</div><div class='add'>+	 * It has been reported that some chips need a write of 0 to clear</div><div class='add'>+	 * these, for others the counters are set to 1 when written to and</div><div class='add'>+	 * instead cleared when read. So we clear them both ways ...</div><div class='add'>+	 */</div><div class='add'>+	iowrite32(0, ioaddr + RxMissed);</div><div class='add'>+	ioread16(ioaddr + RxCRCErrs);</div><div class='add'>+	ioread16(ioaddr + RxMissed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define RHINE_EVENT_NAPI_RX	(IntrRxDone | \</div><div class='add'>+				 IntrRxErr | \</div><div class='add'>+				 IntrRxEmpty | \</div><div class='add'>+				 IntrRxOverflow	| \</div><div class='add'>+				 IntrRxDropped | \</div><div class='add'>+				 IntrRxNoBuf | \</div><div class='add'>+				 IntrRxWakeUp)</div><div class='add'>+</div><div class='add'>+#define RHINE_EVENT_NAPI_TX_ERR	(IntrTxError | \</div><div class='add'>+				 IntrTxAborted | \</div><div class='add'>+				 IntrTxUnderrun | \</div><div class='add'>+				 IntrTxDescRace)</div><div class='add'>+#define RHINE_EVENT_NAPI_TX	(IntrTxDone | RHINE_EVENT_NAPI_TX_ERR)</div><div class='add'>+</div><div class='add'>+#define RHINE_EVENT_NAPI	(RHINE_EVENT_NAPI_RX | \</div><div class='add'>+				 RHINE_EVENT_NAPI_TX | \</div><div class='add'>+				 IntrStatsMax)</div><div class='add'>+#define RHINE_EVENT_SLOW	(IntrPCIErr | IntrLinkChange)</div><div class='add'>+#define RHINE_EVENT		(RHINE_EVENT_NAPI | RHINE_EVENT_SLOW)</div><div class='add'>+</div><div class='ctx'> static int rhine_napipoll(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct rhine_private *rp = container_of(napi, struct rhine_private, napi);</div><div class='ctx'> 	struct net_device *dev = rp-&gt;dev;</div><div class='ctx'> 	void __iomem *ioaddr = rp-&gt;base;</div><div class='del'>-	int work_done;</div><div class='add'>+	u16 enable_mask = RHINE_EVENT &amp; 0xffff;</div><div class='add'>+	int work_done = 0;</div><div class='add'>+	u32 status;</div><div class='add'>+</div><div class='add'>+	status = rhine_get_events(rp);</div><div class='add'>+	rhine_ack_events(rp, status &amp; ~RHINE_EVENT_SLOW);</div><div class='add'>+</div><div class='add'>+	if (status &amp; RHINE_EVENT_NAPI_RX)</div><div class='add'>+		work_done += rhine_rx(dev, budget);</div><div class='add'>+</div><div class='add'>+	if (status &amp; RHINE_EVENT_NAPI_TX) {</div><div class='add'>+		if (status &amp; RHINE_EVENT_NAPI_TX_ERR) {</div><div class='add'>+			/* Avoid scavenging before Tx engine turned off */</div><div class='add'>+			rhine_wait_bit_low(rp, ChipCmd, CmdTxOn);</div><div class='add'>+			if (ioread8(ioaddr + ChipCmd) &amp; CmdTxOn)</div><div class='add'>+				netif_warn(rp, tx_err, dev, "Tx still on\n");</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	work_done = rhine_rx(dev, budget);</div><div class='add'>+		rhine_tx(dev);</div><div class='add'>+</div><div class='add'>+		if (status &amp; RHINE_EVENT_NAPI_TX_ERR)</div><div class='add'>+			rhine_tx_err(rp, status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status &amp; IntrStatsMax) {</div><div class='add'>+		spin_lock(&amp;rp-&gt;lock);</div><div class='add'>+		rhine_update_rx_crc_and_missed_errord(rp);</div><div class='add'>+		spin_unlock(&amp;rp-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status &amp; RHINE_EVENT_SLOW) {</div><div class='add'>+		enable_mask &amp;= ~RHINE_EVENT_SLOW;</div><div class='add'>+		schedule_work(&amp;rp-&gt;slow_event_task);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (work_done &lt; budget) {</div><div class='ctx'> 		napi_complete(napi);</div><div class='del'>-</div><div class='del'>-		iowrite16(IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow |</div><div class='del'>-			  IntrRxDropped | IntrRxNoBuf | IntrTxAborted |</div><div class='del'>-			  IntrTxDone | IntrTxError | IntrTxUnderrun |</div><div class='del'>-			  IntrPCIErr | IntrStatsMax | IntrLinkChange,</div><div class='del'>-			  ioaddr + IntrEnable);</div><div class='add'>+		iowrite16(enable_mask, ioaddr + IntrEnable);</div><div class='add'>+		mmiowb();</div><div class='ctx'> 	}</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='hunk'>@@ -796,6 +937,7 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	rp-&gt;quirks = quirks;</div><div class='ctx'> 	rp-&gt;pioaddr = pioaddr;</div><div class='ctx'> 	rp-&gt;pdev = pdev;</div><div class='add'>+	rp-&gt;msg_enable = netif_msg_init(debug, RHINE_MSG_DEFAULT);</div><div class='ctx'> </div><div class='ctx'> 	rc = pci_request_regions(pdev, DRV_NAME);</div><div class='ctx'> 	if (rc)</div><div class='hunk'>@@ -855,7 +997,9 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	dev-&gt;irq = pdev-&gt;irq;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;rp-&gt;lock);</div><div class='add'>+	mutex_init(&amp;rp-&gt;task_lock);</div><div class='ctx'> 	INIT_WORK(&amp;rp-&gt;reset_task, rhine_reset_task);</div><div class='add'>+	INIT_WORK(&amp;rp-&gt;slow_event_task, rhine_slow_event_task);</div><div class='ctx'> </div><div class='ctx'> 	rp-&gt;mii_if.dev = dev;</div><div class='ctx'> 	rp-&gt;mii_if.mdio_read = mdio_read;</div><div class='hunk'>@@ -915,8 +1059,8 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	rp-&gt;mii_if.phy_id = phy_id;</div><div class='del'>-	if (debug &gt; 1 &amp;&amp; avoid_D3)</div><div class='del'>-		netdev_info(dev, "No D3 power state at shutdown\n");</div><div class='add'>+	if (avoid_D3)</div><div class='add'>+		netif_info(rp, probe, dev, "No D3 power state at shutdown\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1092,7 +1236,7 @@ static void rhine_check_media(struct net_device *dev, unsigned int init_media)</div><div class='ctx'> 	struct rhine_private *rp = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = rp-&gt;base;</div><div class='ctx'> </div><div class='del'>-	mii_check_media(&amp;rp-&gt;mii_if, debug, init_media);</div><div class='add'>+	mii_check_media(&amp;rp-&gt;mii_if, netif_msg_link(rp), init_media);</div><div class='ctx'> </div><div class='ctx'> 	if (rp-&gt;mii_if.full_duplex)</div><div class='ctx'> 	    iowrite8(ioread8(ioaddr + ChipCmd1) | Cmd1FDuplex,</div><div class='hunk'>@@ -1100,24 +1244,26 @@ static void rhine_check_media(struct net_device *dev, unsigned int init_media)</div><div class='ctx'> 	else</div><div class='ctx'> 	    iowrite8(ioread8(ioaddr + ChipCmd1) &amp; ~Cmd1FDuplex,</div><div class='ctx'> 		   ioaddr + ChipCmd1);</div><div class='del'>-	if (debug &gt; 1)</div><div class='del'>-		netdev_info(dev, "force_media %d, carrier %d\n",</div><div class='del'>-			    rp-&gt;mii_if.force_media, netif_carrier_ok(dev));</div><div class='add'>+</div><div class='add'>+	netif_info(rp, link, dev, "force_media %d, carrier %d\n",</div><div class='add'>+		   rp-&gt;mii_if.force_media, netif_carrier_ok(dev));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Called after status of force_media possibly changed */</div><div class='ctx'> static void rhine_set_carrier(struct mii_if_info *mii)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *dev = mii-&gt;dev;</div><div class='add'>+	struct rhine_private *rp = netdev_priv(dev);</div><div class='add'>+</div><div class='ctx'> 	if (mii-&gt;force_media) {</div><div class='ctx'> 		/* autoneg is off: Link is always assumed to be up */</div><div class='del'>-		if (!netif_carrier_ok(mii-&gt;dev))</div><div class='del'>-			netif_carrier_on(mii-&gt;dev);</div><div class='del'>-	}</div><div class='del'>-	else	/* Let MMI library update carrier status */</div><div class='del'>-		rhine_check_media(mii-&gt;dev, 0);</div><div class='del'>-	if (debug &gt; 1)</div><div class='del'>-		netdev_info(mii-&gt;dev, "force_media %d, carrier %d\n",</div><div class='del'>-			    mii-&gt;force_media, netif_carrier_ok(mii-&gt;dev));</div><div class='add'>+		if (!netif_carrier_ok(dev))</div><div class='add'>+			netif_carrier_on(dev);</div><div class='add'>+	} else	/* Let MMI library update carrier status */</div><div class='add'>+		rhine_check_media(dev, 0);</div><div class='add'>+</div><div class='add'>+	netif_info(rp, link, dev, "force_media %d, carrier %d\n",</div><div class='add'>+		   mii-&gt;force_media, netif_carrier_ok(dev));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1261,24 +1407,26 @@ static void rhine_update_vcam(struct net_device *dev)</div><div class='ctx'> 	rhine_set_vlan_cam_mask(ioaddr, vCAMmask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rhine_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='add'>+static int rhine_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct rhine_private *rp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;rp-&gt;lock);</div><div class='add'>+	spin_lock_bh(&amp;rp-&gt;lock);</div><div class='ctx'> 	set_bit(vid, rp-&gt;active_vlans);</div><div class='ctx'> 	rhine_update_vcam(dev);</div><div class='del'>-	spin_unlock_irq(&amp;rp-&gt;lock);</div><div class='add'>+	spin_unlock_bh(&amp;rp-&gt;lock);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rhine_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='add'>+static int rhine_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct rhine_private *rp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;rp-&gt;lock);</div><div class='add'>+	spin_lock_bh(&amp;rp-&gt;lock);</div><div class='ctx'> 	clear_bit(vid, rp-&gt;active_vlans);</div><div class='ctx'> 	rhine_update_vcam(dev);</div><div class='del'>-	spin_unlock_irq(&amp;rp-&gt;lock);</div><div class='add'>+	spin_unlock_bh(&amp;rp-&gt;lock);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void init_registers(struct net_device *dev)</div><div class='hunk'>@@ -1307,12 +1455,7 @@ static void init_registers(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	napi_enable(&amp;rp-&gt;napi);</div><div class='ctx'> </div><div class='del'>-	/* Enable interrupts by setting the interrupt mask. */</div><div class='del'>-	iowrite16(IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow |</div><div class='del'>-	       IntrRxDropped | IntrRxNoBuf | IntrTxAborted |</div><div class='del'>-	       IntrTxDone | IntrTxError | IntrTxUnderrun |</div><div class='del'>-	       IntrPCIErr | IntrStatsMax | IntrLinkChange,</div><div class='del'>-	       ioaddr + IntrEnable);</div><div class='add'>+	iowrite16(RHINE_EVENT &amp; 0xffff, ioaddr + IntrEnable);</div><div class='ctx'> </div><div class='ctx'> 	iowrite16(CmdStart | CmdTxOn | CmdRxOn | (Cmd1NoTxPoll &lt;&lt; 8),</div><div class='ctx'> 	       ioaddr + ChipCmd);</div><div class='hunk'>@@ -1320,23 +1463,27 @@ static void init_registers(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Enable MII link status auto-polling (required for IntrLinkChange) */</div><div class='del'>-static void rhine_enable_linkmon(void __iomem *ioaddr)</div><div class='add'>+static void rhine_enable_linkmon(struct rhine_private *rp)</div><div class='ctx'> {</div><div class='add'>+	void __iomem *ioaddr = rp-&gt;base;</div><div class='add'>+</div><div class='ctx'> 	iowrite8(0, ioaddr + MIICmd);</div><div class='ctx'> 	iowrite8(MII_BMSR, ioaddr + MIIRegAddr);</div><div class='ctx'> 	iowrite8(0x80, ioaddr + MIICmd);</div><div class='ctx'> </div><div class='del'>-	RHINE_WAIT_FOR((ioread8(ioaddr + MIIRegAddr) &amp; 0x20));</div><div class='add'>+	rhine_wait_bit_high(rp, MIIRegAddr, 0x20);</div><div class='ctx'> </div><div class='ctx'> 	iowrite8(MII_BMSR | 0x40, ioaddr + MIIRegAddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Disable MII link status auto-polling (required for MDIO access) */</div><div class='del'>-static void rhine_disable_linkmon(void __iomem *ioaddr, u32 quirks)</div><div class='add'>+static void rhine_disable_linkmon(struct rhine_private *rp)</div><div class='ctx'> {</div><div class='add'>+	void __iomem *ioaddr = rp-&gt;base;</div><div class='add'>+</div><div class='ctx'> 	iowrite8(0, ioaddr + MIICmd);</div><div class='ctx'> </div><div class='del'>-	if (quirks &amp; rqRhineI) {</div><div class='add'>+	if (rp-&gt;quirks &amp; rqRhineI) {</div><div class='ctx'> 		iowrite8(0x01, ioaddr + MIIRegAddr);	// MII_BMSR</div><div class='ctx'> </div><div class='ctx'> 		/* Can be called from ISR. Evil. */</div><div class='hunk'>@@ -1345,13 +1492,13 @@ static void rhine_disable_linkmon(void __iomem *ioaddr, u32 quirks)</div><div class='ctx'> 		/* 0x80 must be set immediately before turning it off */</div><div class='ctx'> 		iowrite8(0x80, ioaddr + MIICmd);</div><div class='ctx'> </div><div class='del'>-		RHINE_WAIT_FOR(ioread8(ioaddr + MIIRegAddr) &amp; 0x20);</div><div class='add'>+		rhine_wait_bit_high(rp, MIIRegAddr, 0x20);</div><div class='ctx'> </div><div class='ctx'> 		/* Heh. Now clear 0x80 again. */</div><div class='ctx'> 		iowrite8(0, ioaddr + MIICmd);</div><div class='ctx'> 	}</div><div class='ctx'> 	else</div><div class='del'>-		RHINE_WAIT_FOR(ioread8(ioaddr + MIIRegAddr) &amp; 0x80);</div><div class='add'>+		rhine_wait_bit_high(rp, MIIRegAddr, 0x80);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Read and write over the MII Management Data I/O (MDIO) interface. */</div><div class='hunk'>@@ -1362,16 +1509,16 @@ static int mdio_read(struct net_device *dev, int phy_id, int regnum)</div><div class='ctx'> 	void __iomem *ioaddr = rp-&gt;base;</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='del'>-	rhine_disable_linkmon(ioaddr, rp-&gt;quirks);</div><div class='add'>+	rhine_disable_linkmon(rp);</div><div class='ctx'> </div><div class='ctx'> 	/* rhine_disable_linkmon already cleared MIICmd */</div><div class='ctx'> 	iowrite8(phy_id, ioaddr + MIIPhyAddr);</div><div class='ctx'> 	iowrite8(regnum, ioaddr + MIIRegAddr);</div><div class='ctx'> 	iowrite8(0x40, ioaddr + MIICmd);		/* Trigger read */</div><div class='del'>-	RHINE_WAIT_FOR(!(ioread8(ioaddr + MIICmd) &amp; 0x40));</div><div class='add'>+	rhine_wait_bit_low(rp, MIICmd, 0x40);</div><div class='ctx'> 	result = ioread16(ioaddr + MIIData);</div><div class='ctx'> </div><div class='del'>-	rhine_enable_linkmon(ioaddr);</div><div class='add'>+	rhine_enable_linkmon(rp);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1380,16 +1527,33 @@ static void mdio_write(struct net_device *dev, int phy_id, int regnum, int value</div><div class='ctx'> 	struct rhine_private *rp = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = rp-&gt;base;</div><div class='ctx'> </div><div class='del'>-	rhine_disable_linkmon(ioaddr, rp-&gt;quirks);</div><div class='add'>+	rhine_disable_linkmon(rp);</div><div class='ctx'> </div><div class='ctx'> 	/* rhine_disable_linkmon already cleared MIICmd */</div><div class='ctx'> 	iowrite8(phy_id, ioaddr + MIIPhyAddr);</div><div class='ctx'> 	iowrite8(regnum, ioaddr + MIIRegAddr);</div><div class='ctx'> 	iowrite16(value, ioaddr + MIIData);</div><div class='ctx'> 	iowrite8(0x20, ioaddr + MIICmd);		/* Trigger write */</div><div class='del'>-	RHINE_WAIT_FOR(!(ioread8(ioaddr + MIICmd) &amp; 0x20));</div><div class='add'>+	rhine_wait_bit_low(rp, MIICmd, 0x20);</div><div class='ctx'> </div><div class='del'>-	rhine_enable_linkmon(ioaddr);</div><div class='add'>+	rhine_enable_linkmon(rp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rhine_task_disable(struct rhine_private *rp)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;rp-&gt;task_lock);</div><div class='add'>+	rp-&gt;task_enable = false;</div><div class='add'>+	mutex_unlock(&amp;rp-&gt;task_lock);</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;rp-&gt;slow_event_task);</div><div class='add'>+	cancel_work_sync(&amp;rp-&gt;reset_task);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rhine_task_enable(struct rhine_private *rp)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;rp-&gt;task_lock);</div><div class='add'>+	rp-&gt;task_enable = true;</div><div class='add'>+	mutex_unlock(&amp;rp-&gt;task_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rhine_open(struct net_device *dev)</div><div class='hunk'>@@ -1403,8 +1567,7 @@ static int rhine_open(struct net_device *dev)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	if (debug &gt; 1)</div><div class='del'>-		netdev_dbg(dev, "%s() irq %d\n", __func__, rp-&gt;pdev-&gt;irq);</div><div class='add'>+	netif_dbg(rp, ifup, dev, "%s() irq %d\n", __func__, rp-&gt;pdev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	rc = alloc_ring(dev);</div><div class='ctx'> 	if (rc) {</div><div class='hunk'>@@ -1414,11 +1577,12 @@ static int rhine_open(struct net_device *dev)</div><div class='ctx'> 	alloc_rbufs(dev);</div><div class='ctx'> 	alloc_tbufs(dev);</div><div class='ctx'> 	rhine_chip_reset(dev);</div><div class='add'>+	rhine_task_enable(rp);</div><div class='ctx'> 	init_registers(dev);</div><div class='del'>-	if (debug &gt; 2)</div><div class='del'>-		netdev_dbg(dev, "%s() Done - status %04x MII status: %04x\n",</div><div class='del'>-			   __func__, ioread16(ioaddr + ChipCmd),</div><div class='del'>-			   mdio_read(dev, rp-&gt;mii_if.phy_id, MII_BMSR));</div><div class='add'>+</div><div class='add'>+	netif_dbg(rp, ifup, dev, "%s() Done - status %04x MII status: %04x\n",</div><div class='add'>+		  __func__, ioread16(ioaddr + ChipCmd),</div><div class='add'>+		  mdio_read(dev, rp-&gt;mii_if.phy_id, MII_BMSR));</div><div class='ctx'> </div><div class='ctx'> 	netif_start_queue(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1431,11 +1595,12 @@ static void rhine_reset_task(struct work_struct *work)</div><div class='ctx'> 						reset_task);</div><div class='ctx'> 	struct net_device *dev = rp-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	/* protect against concurrent rx interrupts */</div><div class='del'>-	disable_irq(rp-&gt;pdev-&gt;irq);</div><div class='add'>+	mutex_lock(&amp;rp-&gt;task_lock);</div><div class='ctx'> </div><div class='del'>-	napi_disable(&amp;rp-&gt;napi);</div><div class='add'>+	if (!rp-&gt;task_enable)</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='add'>+	napi_disable(&amp;rp-&gt;napi);</div><div class='ctx'> 	spin_lock_bh(&amp;rp-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* clear all descriptors */</div><div class='hunk'>@@ -1449,11 +1614,13 @@ static void rhine_reset_task(struct work_struct *work)</div><div class='ctx'> 	init_registers(dev);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;rp-&gt;lock);</div><div class='del'>-	enable_irq(rp-&gt;pdev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;trans_start = jiffies; /* prevent tx timeout */</div><div class='ctx'> 	dev-&gt;stats.tx_errors++;</div><div class='ctx'> 	netif_wake_queue(dev);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;rp-&gt;task_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rhine_tx_timeout(struct net_device *dev)</div><div class='hunk'>@@ -1474,7 +1641,6 @@ static netdev_tx_t rhine_start_tx(struct sk_buff *skb,</div><div class='ctx'> 	struct rhine_private *rp = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = rp-&gt;base;</div><div class='ctx'> 	unsigned entry;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* Caution: the write order is important here, set the field</div><div class='ctx'> 	   with the "ownership" bits last. */</div><div class='hunk'>@@ -1526,7 +1692,6 @@ static netdev_tx_t rhine_start_tx(struct sk_buff *skb,</div><div class='ctx'> 		rp-&gt;tx_ring[entry].tx_status = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* lock eth irq */</div><div class='del'>-	spin_lock_irqsave(&amp;rp-&gt;lock, flags);</div><div class='ctx'> 	wmb();</div><div class='ctx'> 	rp-&gt;tx_ring[entry].tx_status |= cpu_to_le32(DescOwn);</div><div class='ctx'> 	wmb();</div><div class='hunk'>@@ -1547,78 +1712,43 @@ static netdev_tx_t rhine_start_tx(struct sk_buff *skb,</div><div class='ctx'> 	if (rp-&gt;cur_tx == rp-&gt;dirty_tx + TX_QUEUE_LEN)</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;rp-&gt;lock, flags);</div><div class='add'>+	netif_dbg(rp, tx_queued, dev, "Transmit frame #%d queued in slot %d\n",</div><div class='add'>+		  rp-&gt;cur_tx - 1, entry);</div><div class='ctx'> </div><div class='del'>-	if (debug &gt; 4) {</div><div class='del'>-		netdev_dbg(dev, "Transmit frame #%d queued in slot %d\n",</div><div class='del'>-			   rp-&gt;cur_tx-1, entry);</div><div class='del'>-	}</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void rhine_irq_disable(struct rhine_private *rp)</div><div class='add'>+{</div><div class='add'>+	iowrite16(0x0000, rp-&gt;base + IntrEnable);</div><div class='add'>+	mmiowb();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* The interrupt handler does all of the Rx thread work and cleans up</div><div class='ctx'>    after the Tx thread. */</div><div class='ctx'> static irqreturn_t rhine_interrupt(int irq, void *dev_instance)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = dev_instance;</div><div class='ctx'> 	struct rhine_private *rp = netdev_priv(dev);</div><div class='del'>-	void __iomem *ioaddr = rp-&gt;base;</div><div class='del'>-	u32 intr_status;</div><div class='del'>-	int boguscnt = max_interrupt_work;</div><div class='add'>+	u32 status;</div><div class='ctx'> 	int handled = 0;</div><div class='ctx'> </div><div class='del'>-	while ((intr_status = get_intr_status(dev))) {</div><div class='del'>-		handled = 1;</div><div class='del'>-</div><div class='del'>-		/* Acknowledge all of the current interrupt sources ASAP. */</div><div class='del'>-		if (intr_status &amp; IntrTxDescRace)</div><div class='del'>-			iowrite8(0x08, ioaddr + IntrStatus2);</div><div class='del'>-		iowrite16(intr_status &amp; 0xffff, ioaddr + IntrStatus);</div><div class='del'>-		IOSYNC;</div><div class='del'>-</div><div class='del'>-		if (debug &gt; 4)</div><div class='del'>-			netdev_dbg(dev, "Interrupt, status %08x\n",</div><div class='del'>-				   intr_status);</div><div class='add'>+	status = rhine_get_events(rp);</div><div class='ctx'> </div><div class='del'>-		if (intr_status &amp; (IntrRxDone | IntrRxErr | IntrRxDropped |</div><div class='del'>-				   IntrRxWakeUp | IntrRxEmpty | IntrRxNoBuf)) {</div><div class='del'>-			iowrite16(IntrTxAborted |</div><div class='del'>-				  IntrTxDone | IntrTxError | IntrTxUnderrun |</div><div class='del'>-				  IntrPCIErr | IntrStatsMax | IntrLinkChange,</div><div class='del'>-				  ioaddr + IntrEnable);</div><div class='add'>+	netif_dbg(rp, intr, dev, "Interrupt, status %08x\n", status);</div><div class='ctx'> </div><div class='del'>-			napi_schedule(&amp;rp-&gt;napi);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (intr_status &amp; (IntrTxErrSummary | IntrTxDone)) {</div><div class='del'>-			if (intr_status &amp; IntrTxErrSummary) {</div><div class='del'>-				/* Avoid scavenging before Tx engine turned off */</div><div class='del'>-				RHINE_WAIT_FOR(!(ioread8(ioaddr+ChipCmd) &amp; CmdTxOn));</div><div class='del'>-				if (debug &gt; 2 &amp;&amp;</div><div class='del'>-				    ioread8(ioaddr+ChipCmd) &amp; CmdTxOn)</div><div class='del'>-					netdev_warn(dev,</div><div class='del'>-						    "%s: Tx engine still on\n",</div><div class='del'>-						    __func__);</div><div class='del'>-			}</div><div class='del'>-			rhine_tx(dev);</div><div class='del'>-		}</div><div class='add'>+	if (status &amp; RHINE_EVENT) {</div><div class='add'>+		handled = 1;</div><div class='ctx'> </div><div class='del'>-		/* Abnormal error summary/uncommon events handlers. */</div><div class='del'>-		if (intr_status &amp; (IntrPCIErr | IntrLinkChange |</div><div class='del'>-				   IntrStatsMax | IntrTxError | IntrTxAborted |</div><div class='del'>-				   IntrTxUnderrun | IntrTxDescRace))</div><div class='del'>-			rhine_error(dev, intr_status);</div><div class='add'>+		rhine_irq_disable(rp);</div><div class='add'>+		napi_schedule(&amp;rp-&gt;napi);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (--boguscnt &lt; 0) {</div><div class='del'>-			netdev_warn(dev, "Too much work at interrupt, status=%#08x\n",</div><div class='del'>-				    intr_status);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	if (status &amp; ~(IntrLinkChange | IntrStatsMax | RHINE_EVENT_NAPI)) {</div><div class='add'>+		netif_err(rp, intr, dev, "Something Wicked happened! %08x\n",</div><div class='add'>+			  status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (debug &gt; 3)</div><div class='del'>-		netdev_dbg(dev, "exiting interrupt, status=%08x\n",</div><div class='del'>-			   ioread16(ioaddr + IntrStatus));</div><div class='ctx'> 	return IRQ_RETVAL(handled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1629,20 +1759,16 @@ static void rhine_tx(struct net_device *dev)</div><div class='ctx'> 	struct rhine_private *rp = netdev_priv(dev);</div><div class='ctx'> 	int txstatus = 0, entry = rp-&gt;dirty_tx % TX_RING_SIZE;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;rp-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 	/* find and cleanup dirty tx descriptors */</div><div class='ctx'> 	while (rp-&gt;dirty_tx != rp-&gt;cur_tx) {</div><div class='ctx'> 		txstatus = le32_to_cpu(rp-&gt;tx_ring[entry].tx_status);</div><div class='del'>-		if (debug &gt; 6)</div><div class='del'>-			netdev_dbg(dev, "Tx scavenge %d status %08x\n",</div><div class='del'>-				   entry, txstatus);</div><div class='add'>+		netif_dbg(rp, tx_done, dev, "Tx scavenge %d status %08x\n",</div><div class='add'>+			  entry, txstatus);</div><div class='ctx'> 		if (txstatus &amp; DescOwn)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (txstatus &amp; 0x8000) {</div><div class='del'>-			if (debug &gt; 1)</div><div class='del'>-				netdev_dbg(dev, "Transmit error, Tx status %08x\n",</div><div class='del'>-					   txstatus);</div><div class='add'>+			netif_dbg(rp, tx_done, dev,</div><div class='add'>+				  "Transmit error, Tx status %08x\n", txstatus);</div><div class='ctx'> 			dev-&gt;stats.tx_errors++;</div><div class='ctx'> 			if (txstatus &amp; 0x0400)</div><div class='ctx'> 				dev-&gt;stats.tx_carrier_errors++;</div><div class='hunk'>@@ -1664,10 +1790,8 @@ static void rhine_tx(struct net_device *dev)</div><div class='ctx'> 				dev-&gt;stats.collisions += (txstatus &gt;&gt; 3) &amp; 0x0F;</div><div class='ctx'> 			else</div><div class='ctx'> 				dev-&gt;stats.collisions += txstatus &amp; 0x0F;</div><div class='del'>-			if (debug &gt; 6)</div><div class='del'>-				netdev_dbg(dev, "collisions: %1.1x:%1.1x\n",</div><div class='del'>-					   (txstatus &gt;&gt; 3) &amp; 0xF,</div><div class='del'>-					   txstatus &amp; 0xF);</div><div class='add'>+			netif_dbg(rp, tx_done, dev, "collisions: %1.1x:%1.1x\n",</div><div class='add'>+				  (txstatus &gt;&gt; 3) &amp; 0xF, txstatus &amp; 0xF);</div><div class='ctx'> 			dev-&gt;stats.tx_bytes += rp-&gt;tx_skbuff[entry]-&gt;len;</div><div class='ctx'> 			dev-&gt;stats.tx_packets++;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1684,8 +1808,6 @@ static void rhine_tx(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((rp-&gt;cur_tx - rp-&gt;dirty_tx) &lt; TX_QUEUE_LEN - 4)</div><div class='ctx'> 		netif_wake_queue(dev);</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;rp-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1710,11 +1832,8 @@ static int rhine_rx(struct net_device *dev, int limit)</div><div class='ctx'> 	int count;</div><div class='ctx'> 	int entry = rp-&gt;cur_rx % RX_RING_SIZE;</div><div class='ctx'> </div><div class='del'>-	if (debug &gt; 4) {</div><div class='del'>-		netdev_dbg(dev, "%s(), entry %d status %08x\n",</div><div class='del'>-			   __func__, entry,</div><div class='del'>-			   le32_to_cpu(rp-&gt;rx_head_desc-&gt;rx_status));</div><div class='del'>-	}</div><div class='add'>+	netif_dbg(rp, rx_status, dev, "%s(), entry %d status %08x\n", __func__,</div><div class='add'>+		  entry, le32_to_cpu(rp-&gt;rx_head_desc-&gt;rx_status));</div><div class='ctx'> </div><div class='ctx'> 	/* If EOP is set on the next entry, it's a new packet. Send it up. */</div><div class='ctx'> 	for (count = 0; count &lt; limit; ++count) {</div><div class='hunk'>@@ -1726,9 +1845,8 @@ static int rhine_rx(struct net_device *dev, int limit)</div><div class='ctx'> 		if (desc_status &amp; DescOwn)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (debug &gt; 4)</div><div class='del'>-			netdev_dbg(dev, "%s() status is %08x\n",</div><div class='del'>-				   __func__, desc_status);</div><div class='add'>+		netif_dbg(rp, rx_status, dev, "%s() status %08x\n", __func__,</div><div class='add'>+			  desc_status);</div><div class='ctx'> </div><div class='ctx'> 		if ((desc_status &amp; (RxWholePkt | RxErr)) != RxWholePkt) {</div><div class='ctx'> 			if ((desc_status &amp; RxWholePkt) != RxWholePkt) {</div><div class='hunk'>@@ -1744,9 +1862,9 @@ static int rhine_rx(struct net_device *dev, int limit)</div><div class='ctx'> 				dev-&gt;stats.rx_length_errors++;</div><div class='ctx'> 			} else if (desc_status &amp; RxErr) {</div><div class='ctx'> 				/* There was a error. */</div><div class='del'>-				if (debug &gt; 2)</div><div class='del'>-					netdev_dbg(dev, "%s() Rx error was %08x\n",</div><div class='del'>-						   __func__, desc_status);</div><div class='add'>+				netif_dbg(rp, rx_err, dev,</div><div class='add'>+					  "%s() Rx error %08x\n", __func__,</div><div class='add'>+					  desc_status);</div><div class='ctx'> 				dev-&gt;stats.rx_errors++;</div><div class='ctx'> 				if (desc_status &amp; 0x0030)</div><div class='ctx'> 					dev-&gt;stats.rx_length_errors++;</div><div class='hunk'>@@ -1836,19 +1954,6 @@ static int rhine_rx(struct net_device *dev, int limit)</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Clears the "tally counters" for CRC errors and missed frames(?).</div><div class='del'>- * It has been reported that some chips need a write of 0 to clear</div><div class='del'>- * these, for others the counters are set to 1 when written to and</div><div class='del'>- * instead cleared when read. So we clear them both ways ...</div><div class='del'>- */</div><div class='del'>-static inline void clear_tally_counters(void __iomem *ioaddr)</div><div class='del'>-{</div><div class='del'>-	iowrite32(0, ioaddr + RxMissed);</div><div class='del'>-	ioread16(ioaddr + RxCRCErrs);</div><div class='del'>-	ioread16(ioaddr + RxMissed);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void rhine_restart_tx(struct net_device *dev) {</div><div class='ctx'> 	struct rhine_private *rp = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = rp-&gt;base;</div><div class='hunk'>@@ -1859,7 +1964,7 @@ static void rhine_restart_tx(struct net_device *dev) {</div><div class='ctx'> 	 * If new errors occurred, we need to sort them out before doing Tx.</div><div class='ctx'> 	 * In that case the ISR will be back here RSN anyway.</div><div class='ctx'> 	 */</div><div class='del'>-	intr_status = get_intr_status(dev);</div><div class='add'>+	intr_status = rhine_get_events(rp);</div><div class='ctx'> </div><div class='ctx'> 	if ((intr_status &amp; IntrTxErrSummary) == 0) {</div><div class='ctx'> </div><div class='hunk'>@@ -1880,79 +1985,50 @@ static void rhine_restart_tx(struct net_device *dev) {</div><div class='ctx'> 	}</div><div class='ctx'> 	else {</div><div class='ctx'> 		/* This should never happen */</div><div class='del'>-		if (debug &gt; 1)</div><div class='del'>-			netdev_warn(dev, "%s() Another error occurred %08x\n",</div><div class='del'>-				   __func__, intr_status);</div><div class='add'>+		netif_warn(rp, tx_err, dev, "another error occurred %08x\n",</div><div class='add'>+			   intr_status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rhine_error(struct net_device *dev, int intr_status)</div><div class='add'>+static void rhine_slow_event_task(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct rhine_private *rp = netdev_priv(dev);</div><div class='del'>-	void __iomem *ioaddr = rp-&gt;base;</div><div class='add'>+	struct rhine_private *rp =</div><div class='add'>+		container_of(work, struct rhine_private, slow_event_task);</div><div class='add'>+	struct net_device *dev = rp-&gt;dev;</div><div class='add'>+	u32 intr_status;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;rp-&gt;lock);</div><div class='add'>+	mutex_lock(&amp;rp-&gt;task_lock);</div><div class='add'>+</div><div class='add'>+	if (!rp-&gt;task_enable)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	intr_status = rhine_get_events(rp);</div><div class='add'>+	rhine_ack_events(rp, intr_status &amp; RHINE_EVENT_SLOW);</div><div class='ctx'> </div><div class='ctx'> 	if (intr_status &amp; IntrLinkChange)</div><div class='ctx'> 		rhine_check_media(dev, 0);</div><div class='del'>-	if (intr_status &amp; IntrStatsMax) {</div><div class='del'>-		dev-&gt;stats.rx_crc_errors += ioread16(ioaddr + RxCRCErrs);</div><div class='del'>-		dev-&gt;stats.rx_missed_errors += ioread16(ioaddr + RxMissed);</div><div class='del'>-		clear_tally_counters(ioaddr);</div><div class='del'>-	}</div><div class='del'>-	if (intr_status &amp; IntrTxAborted) {</div><div class='del'>-		if (debug &gt; 1)</div><div class='del'>-			netdev_info(dev, "Abort %08x, frame dropped\n",</div><div class='del'>-				    intr_status);</div><div class='del'>-	}</div><div class='del'>-	if (intr_status &amp; IntrTxUnderrun) {</div><div class='del'>-		if (rp-&gt;tx_thresh &lt; 0xE0)</div><div class='del'>-			BYTE_REG_BITS_SET((rp-&gt;tx_thresh += 0x20), 0x80, ioaddr + TxConfig);</div><div class='del'>-		if (debug &gt; 1)</div><div class='del'>-			netdev_info(dev, "Transmitter underrun, Tx threshold now %02x\n",</div><div class='del'>-				    rp-&gt;tx_thresh);</div><div class='del'>-	}</div><div class='del'>-	if (intr_status &amp; IntrTxDescRace) {</div><div class='del'>-		if (debug &gt; 2)</div><div class='del'>-			netdev_info(dev, "Tx descriptor write-back race\n");</div><div class='del'>-	}</div><div class='del'>-	if ((intr_status &amp; IntrTxError) &amp;&amp;</div><div class='del'>-	    (intr_status &amp; (IntrTxAborted |</div><div class='del'>-	     IntrTxUnderrun | IntrTxDescRace)) == 0) {</div><div class='del'>-		if (rp-&gt;tx_thresh &lt; 0xE0) {</div><div class='del'>-			BYTE_REG_BITS_SET((rp-&gt;tx_thresh += 0x20), 0x80, ioaddr + TxConfig);</div><div class='del'>-		}</div><div class='del'>-		if (debug &gt; 1)</div><div class='del'>-			netdev_info(dev, "Unspecified error. Tx threshold now %02x\n",</div><div class='del'>-				    rp-&gt;tx_thresh);</div><div class='del'>-	}</div><div class='del'>-	if (intr_status &amp; (IntrTxAborted | IntrTxUnderrun | IntrTxDescRace |</div><div class='del'>-			   IntrTxError))</div><div class='del'>-		rhine_restart_tx(dev);</div><div class='del'>-</div><div class='del'>-	if (intr_status &amp; ~(IntrLinkChange | IntrStatsMax | IntrTxUnderrun |</div><div class='del'>-			    IntrTxError | IntrTxAborted | IntrNormalSummary |</div><div class='del'>-			    IntrTxDescRace)) {</div><div class='del'>-		if (debug &gt; 1)</div><div class='del'>-			netdev_err(dev, "Something Wicked happened! %08x\n",</div><div class='del'>-				   intr_status);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;rp-&gt;lock);</div><div class='add'>+	if (intr_status &amp; IntrPCIErr)</div><div class='add'>+		netif_warn(rp, hw, dev, "PCI error\n");</div><div class='add'>+</div><div class='add'>+	napi_disable(&amp;rp-&gt;napi);</div><div class='add'>+	rhine_irq_disable(rp);</div><div class='add'>+	/* Slow and safe. Consider __napi_schedule as a replacement ? */</div><div class='add'>+	napi_enable(&amp;rp-&gt;napi);</div><div class='add'>+	napi_schedule(&amp;rp-&gt;napi);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;rp-&gt;task_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct net_device_stats *rhine_get_stats(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct rhine_private *rp = netdev_priv(dev);</div><div class='del'>-	void __iomem *ioaddr = rp-&gt;base;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;rp-&gt;lock, flags);</div><div class='del'>-	dev-&gt;stats.rx_crc_errors += ioread16(ioaddr + RxCRCErrs);</div><div class='del'>-	dev-&gt;stats.rx_missed_errors += ioread16(ioaddr + RxMissed);</div><div class='del'>-	clear_tally_counters(ioaddr);</div><div class='del'>-	spin_unlock_irqrestore(&amp;rp-&gt;lock, flags);</div><div class='add'>+	spin_lock_bh(&amp;rp-&gt;lock);</div><div class='add'>+	rhine_update_rx_crc_and_missed_errord(rp);</div><div class='add'>+	spin_unlock_bh(&amp;rp-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return &amp;dev-&gt;stats;</div><div class='ctx'> }</div><div class='hunk'>@@ -2009,9 +2085,9 @@ static void netdev_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *i</div><div class='ctx'> {</div><div class='ctx'> 	struct rhine_private *rp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(rp-&gt;pdev));</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(rp-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='hunk'>@@ -2019,9 +2095,9 @@ static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> 	struct rhine_private *rp = netdev_priv(dev);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;rp-&gt;lock);</div><div class='add'>+	mutex_lock(&amp;rp-&gt;task_lock);</div><div class='ctx'> 	rc = mii_ethtool_gset(&amp;rp-&gt;mii_if, cmd);</div><div class='del'>-	spin_unlock_irq(&amp;rp-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;rp-&gt;task_lock);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -2031,10 +2107,10 @@ static int netdev_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> 	struct rhine_private *rp = netdev_priv(dev);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;rp-&gt;lock);</div><div class='add'>+	mutex_lock(&amp;rp-&gt;task_lock);</div><div class='ctx'> 	rc = mii_ethtool_sset(&amp;rp-&gt;mii_if, cmd);</div><div class='del'>-	spin_unlock_irq(&amp;rp-&gt;lock);</div><div class='ctx'> 	rhine_set_carrier(&amp;rp-&gt;mii_if);</div><div class='add'>+	mutex_unlock(&amp;rp-&gt;task_lock);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -2055,12 +2131,16 @@ static u32 netdev_get_link(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static u32 netdev_get_msglevel(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	return debug;</div><div class='add'>+	struct rhine_private *rp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	return rp-&gt;msg_enable;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void netdev_set_msglevel(struct net_device *dev, u32 value)</div><div class='ctx'> {</div><div class='del'>-	debug = value;</div><div class='add'>+	struct rhine_private *rp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	rp-&gt;msg_enable = value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rhine_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='hunk'>@@ -2116,10 +2196,10 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;rp-&gt;lock);</div><div class='add'>+	mutex_lock(&amp;rp-&gt;task_lock);</div><div class='ctx'> 	rc = generic_mii_ioctl(&amp;rp-&gt;mii_if, if_mii(rq), cmd, NULL);</div><div class='del'>-	spin_unlock_irq(&amp;rp-&gt;lock);</div><div class='ctx'> 	rhine_set_carrier(&amp;rp-&gt;mii_if);</div><div class='add'>+	mutex_unlock(&amp;rp-&gt;task_lock);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -2129,27 +2209,21 @@ static int rhine_close(struct net_device *dev)</div><div class='ctx'> 	struct rhine_private *rp = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = rp-&gt;base;</div><div class='ctx'> </div><div class='add'>+	rhine_task_disable(rp);</div><div class='ctx'> 	napi_disable(&amp;rp-&gt;napi);</div><div class='del'>-	cancel_work_sync(&amp;rp-&gt;reset_task);</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;rp-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (debug &gt; 1)</div><div class='del'>-		netdev_dbg(dev, "Shutting down ethercard, status was %04x\n",</div><div class='del'>-			   ioread16(ioaddr + ChipCmd));</div><div class='add'>+	netif_dbg(rp, ifdown, dev, "Shutting down ethercard, status was %04x\n",</div><div class='add'>+		  ioread16(ioaddr + ChipCmd));</div><div class='ctx'> </div><div class='ctx'> 	/* Switch to loopback mode to avoid hardware races. */</div><div class='ctx'> 	iowrite8(rp-&gt;tx_thresh | 0x02, ioaddr + TxConfig);</div><div class='ctx'> </div><div class='del'>-	/* Disable interrupts by clearing the interrupt mask. */</div><div class='del'>-	iowrite16(0x0000, ioaddr + IntrEnable);</div><div class='add'>+	rhine_irq_disable(rp);</div><div class='ctx'> </div><div class='ctx'> 	/* Stop the chip's Tx and Rx processes. */</div><div class='ctx'> 	iowrite16(CmdStop, ioaddr + ChipCmd);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;rp-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 	free_irq(rp-&gt;pdev-&gt;irq, dev);</div><div class='ctx'> 	free_rbufs(dev);</div><div class='ctx'> 	free_tbufs(dev);</div><div class='hunk'>@@ -2189,6 +2263,8 @@ static void rhine_shutdown (struct pci_dev *pdev)</div><div class='ctx'> 	if (rp-&gt;quirks &amp; rq6patterns)</div><div class='ctx'> 		iowrite8(0x04, ioaddr + WOLcgClr);</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;rp-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	if (rp-&gt;wolopts &amp; WAKE_MAGIC) {</div><div class='ctx'> 		iowrite8(WOLmagic, ioaddr + WOLcrSet);</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2213,58 +2289,46 @@ static void rhine_shutdown (struct pci_dev *pdev)</div><div class='ctx'> 		iowrite8(ioread8(ioaddr + StickyHW) | 0x04, ioaddr + StickyHW);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Hit power state D3 (sleep) */</div><div class='del'>-	if (!avoid_D3)</div><div class='del'>-		iowrite8(ioread8(ioaddr + StickyHW) | 0x03, ioaddr + StickyHW);</div><div class='add'>+	spin_unlock(&amp;rp-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	/* TODO: Check use of pci_enable_wake() */</div><div class='add'>+	if (system_state == SYSTEM_POWER_OFF &amp;&amp; !avoid_D3) {</div><div class='add'>+		iowrite8(ioread8(ioaddr + StickyHW) | 0x03, ioaddr + StickyHW);</div><div class='ctx'> </div><div class='add'>+		pci_wake_from_d3(pdev, true);</div><div class='add'>+		pci_set_power_state(pdev, PCI_D3hot);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int rhine_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int rhine_suspend(struct device *device)</div><div class='ctx'> {</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(device);</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct rhine_private *rp = netdev_priv(dev);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	rhine_task_disable(rp);</div><div class='add'>+	rhine_irq_disable(rp);</div><div class='ctx'> 	napi_disable(&amp;rp-&gt;napi);</div><div class='ctx'> </div><div class='ctx'> 	netif_device_detach(dev);</div><div class='del'>-	pci_save_state(pdev);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;rp-&gt;lock, flags);</div><div class='ctx'> 	rhine_shutdown(pdev);</div><div class='del'>-	spin_unlock_irqrestore(&amp;rp-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	free_irq(dev-&gt;irq, dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rhine_resume(struct pci_dev *pdev)</div><div class='add'>+static int rhine_resume(struct device *device)</div><div class='ctx'> {</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(device);</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct rhine_private *rp = netdev_priv(dev);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (request_irq(dev-&gt;irq, rhine_interrupt, IRQF_SHARED, dev-&gt;name, dev))</div><div class='del'>-		netdev_err(dev, "request_irq failed\n");</div><div class='del'>-</div><div class='del'>-	ret = pci_set_power_state(pdev, PCI_D0);</div><div class='del'>-	if (debug &gt; 1)</div><div class='del'>-		netdev_info(dev, "Entering power state D0 %s (%d)\n",</div><div class='del'>-			    ret ? "failed" : "succeeded", ret);</div><div class='del'>-</div><div class='del'>-	pci_restore_state(pdev);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;rp-&gt;lock, flags);</div><div class='ctx'> #ifdef USE_MMIO</div><div class='ctx'> 	enable_mmio(rp-&gt;pioaddr, rp-&gt;quirks);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2273,25 +2337,32 @@ static int rhine_resume(struct pci_dev *pdev)</div><div class='ctx'> 	free_rbufs(dev);</div><div class='ctx'> 	alloc_tbufs(dev);</div><div class='ctx'> 	alloc_rbufs(dev);</div><div class='add'>+	rhine_task_enable(rp);</div><div class='add'>+	spin_lock_bh(&amp;rp-&gt;lock);</div><div class='ctx'> 	init_registers(dev);</div><div class='del'>-	spin_unlock_irqrestore(&amp;rp-&gt;lock, flags);</div><div class='add'>+	spin_unlock_bh(&amp;rp-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	netif_device_attach(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(rhine_pm_ops, rhine_suspend, rhine_resume);</div><div class='add'>+#define RHINE_PM_OPS	(&amp;rhine_pm_ops)</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#define RHINE_PM_OPS	NULL</div><div class='add'>+</div><div class='add'>+#endif /* !CONFIG_PM_SLEEP */</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver rhine_driver = {</div><div class='ctx'> 	.name		= DRV_NAME,</div><div class='ctx'> 	.id_table	= rhine_pci_tbl,</div><div class='ctx'> 	.probe		= rhine_init_one,</div><div class='ctx'> 	.remove		= __devexit_p(rhine_remove_one),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend	= rhine_suspend,</div><div class='del'>-	.resume		= rhine_resume,</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='del'>-	.shutdown =	rhine_shutdown,</div><div class='add'>+	.shutdown	= rhine_shutdown,</div><div class='add'>+	.driver.pm	= RHINE_PM_OPS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dmi_system_id __initdata rhine_dmi_table[] = {</div><div class='hunk'>@@ -2320,7 +2391,7 @@ static int __init rhine_init(void)</div><div class='ctx'> #endif</div><div class='ctx'> 	if (dmi_check_system(rhine_dmi_table)) {</div><div class='ctx'> 		/* these BIOSes fail at PXE boot if chip is in D3 */</div><div class='del'>-		avoid_D3 = 1;</div><div class='add'>+		avoid_D3 = true;</div><div class='ctx'> 		pr_warn("Broken BIOS detected, avoid_D3 enabled\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	else if (avoid_D3)</div><div class='head'>diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c<br/>index 4535d7cc848e..4128d6b8cc28 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/via/via-velocity.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/via/via-velocity.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/via/via-velocity.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/via/via-velocity.c</a></div><div class='hunk'>@@ -522,7 +522,7 @@ static void velocity_init_cam_filter(struct velocity_info *vptr)</div><div class='ctx'> 	mac_set_vlan_cam_mask(regs, vptr-&gt;vCAMmask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void velocity_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='add'>+static int velocity_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -530,9 +530,10 @@ static void velocity_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> 	set_bit(vid, vptr-&gt;active_vlans);</div><div class='ctx'> 	velocity_init_cam_filter(vptr);</div><div class='ctx'> 	spin_unlock_irq(&amp;vptr-&gt;lock);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void velocity_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='add'>+static int velocity_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -540,6 +541,7 @@ static void velocity_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid</div><div class='ctx'> 	clear_bit(vid, vptr-&gt;active_vlans);</div><div class='ctx'> 	velocity_init_cam_filter(vptr);</div><div class='ctx'> 	spin_unlock_irq(&amp;vptr-&gt;lock);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void velocity_init_rx_ring_indexes(struct velocity_info *vptr)</div><div class='hunk'>@@ -3270,9 +3272,9 @@ static int velocity_set_settings(struct net_device *dev,</div><div class='ctx'> static void velocity_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct velocity_info *vptr = netdev_priv(dev);</div><div class='del'>-	strcpy(info-&gt;driver, VELOCITY_NAME);</div><div class='del'>-	strcpy(info-&gt;version, VELOCITY_VERSION);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(vptr-&gt;pdev));</div><div class='add'>+	strlcpy(info-&gt;driver, VELOCITY_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, VELOCITY_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(vptr-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void velocity_ethtool_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</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 2681b53820ee..f21addb1db95 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/xilinx/ll_temac_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/xilinx/ll_temac_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/xilinx/ll_temac_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/xilinx/ll_temac_main.c</a></div><div class='hunk'>@@ -237,7 +237,7 @@ static int temac_dma_bd_init(struct net_device *ndev)</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	lp-&gt;rx_skb = kzalloc(sizeof(*lp-&gt;rx_skb) * RX_BD_NUM, GFP_KERNEL);</div><div class='add'>+	lp-&gt;rx_skb = kcalloc(RX_BD_NUM, sizeof(*lp-&gt;rx_skb), GFP_KERNEL);</div><div class='ctx'> 	if (!lp-&gt;rx_skb) {</div><div class='ctx'> 		dev_err(&amp;ndev-&gt;dev,</div><div class='ctx'> 				"can't allocate memory for DMA RX buffer\n");</div><div class='hunk'>@@ -920,12 +920,26 @@ temac_poll_controller(struct net_device *ndev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static int temac_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct temac_local *lp = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	if (!netif_running(ndev))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!lp-&gt;phy_dev)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return phy_mii_ioctl(lp-&gt;phy_dev, rq, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops temac_netdev_ops = {</div><div class='ctx'> 	.ndo_open = temac_open,</div><div class='ctx'> 	.ndo_stop = temac_stop,</div><div class='ctx'> 	.ndo_start_xmit = temac_start_xmit,</div><div class='ctx'> 	.ndo_set_mac_address = netdev_set_mac_address,</div><div class='ctx'> 	.ndo_validate_addr = eth_validate_addr,</div><div class='add'>+	.ndo_do_ioctl = temac_ioctl,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	.ndo_poll_controller = temac_poll_controller,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1077,7 +1091,7 @@ static int __devinit temac_of_probe(struct platform_device *op)</div><div class='ctx'> </div><div class='ctx'> 	of_node_put(np); /* Finished with the DMA node; drop the reference */</div><div class='ctx'> </div><div class='del'>-	if ((lp-&gt;rx_irq == NO_IRQ) || (lp-&gt;tx_irq == NO_IRQ)) {</div><div class='add'>+	if (!lp-&gt;rx_irq || !lp-&gt;tx_irq) {</div><div class='ctx'> 		dev_err(&amp;op-&gt;dev, "could not determine irqs\n");</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto err_iounmap_2;</div><div class='hunk'>@@ -1167,17 +1181,7 @@ static struct platform_driver temac_of_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init temac_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;temac_of_driver);</div><div class='del'>-}</div><div class='del'>-module_init(temac_init);</div><div class='del'>-</div><div class='del'>-static void __exit temac_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;temac_of_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(temac_exit);</div><div class='add'>+module_platform_driver(temac_of_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/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c<br/>index 8018d7d045b0..79013e5731a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/xilinx/xilinx_emaclite.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/xilinx/xilinx_emaclite.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/xilinx/xilinx_emaclite.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/xilinx/xilinx_emaclite.c</a></div><div class='hunk'>@@ -662,7 +662,7 @@ static void xemaclite_rx_handler(struct net_device *dev)</div><div class='ctx'>  */</div><div class='ctx'> static irqreturn_t xemaclite_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	bool tx_complete = 0;</div><div class='add'>+	bool tx_complete = false;</div><div class='ctx'> 	struct net_device *dev = dev_id;</div><div class='ctx'> 	struct net_local *lp = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *base_addr = lp-&gt;base_addr;</div><div class='hunk'>@@ -683,7 +683,7 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		tx_status &amp;= ~XEL_TSR_XMIT_ACTIVE_MASK;</div><div class='ctx'> 		out_be32(base_addr + XEL_TSR_OFFSET, tx_status);</div><div class='ctx'> </div><div class='del'>-		tx_complete = 1;</div><div class='add'>+		tx_complete = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the Transmission for the second buffer is completed */</div><div class='hunk'>@@ -695,7 +695,7 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		out_be32(base_addr + XEL_BUFFER_OFFSET + XEL_TSR_OFFSET,</div><div class='ctx'> 			 tx_status);</div><div class='ctx'> </div><div class='del'>-		tx_complete = 1;</div><div class='add'>+		tx_complete = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If there was a Tx interrupt, call the Tx Handler */</div><div class='hunk'>@@ -1129,7 +1129,7 @@ static int __devinit xemaclite_of_probe(struct platform_device *ofdev)</div><div class='ctx'> </div><div class='ctx'> 	/* Get IRQ for the device */</div><div class='ctx'> 	rc = of_irq_to_resource(ofdev-&gt;dev.of_node, 0, &amp;r_irq);</div><div class='del'>-	if (rc == NO_IRQ) {</div><div class='add'>+	if (!rc) {</div><div class='ctx'> 		dev_err(dev, "no IRQ found\n");</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1303,27 +1303,7 @@ static struct platform_driver xemaclite_of_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(xemaclite_of_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * xgpiopss_init - Initial driver registration call</div><div class='del'>- *</div><div class='del'>- * Return:	0 upon success, or a negative error upon failure.</div><div class='del'>- */</div><div class='del'>-static int __init xemaclite_init(void)</div><div class='del'>-{</div><div class='del'>-	/* No kernel boot options used, we just need to register the driver */</div><div class='del'>-	return platform_driver_register(&amp;xemaclite_of_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * xemaclite_cleanup - Driver un-registration call</div><div class='del'>- */</div><div class='del'>-static void __exit xemaclite_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;xemaclite_of_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(xemaclite_init);</div><div class='del'>-module_exit(xemaclite_cleanup);</div><div class='add'>+module_platform_driver(xemaclite_of_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Xilinx, Inc.");</div><div class='ctx'> MODULE_DESCRIPTION("Xilinx Ethernet MAC Lite driver");</div><div class='head'>diff --git a/drivers/net/ethernet/xircom/xirc2ps_cs.c b/drivers/net/ethernet/xircom/xirc2ps_cs.c<br/>index bbe8b7dbf3f3..33979c3ac943 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/xircom/xirc2ps_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/xircom/xirc2ps_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/xircom/xirc2ps_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/xircom/xirc2ps_cs.c</a></div><div class='hunk'>@@ -1411,7 +1411,7 @@ do_open(struct net_device *dev)</div><div class='ctx'> static void netdev_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 			       struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strcpy(info-&gt;driver, "xirc2ps_cs");</div><div class='add'>+	strlcpy(info-&gt;driver, "xirc2ps_cs", sizeof(info-&gt;driver));</div><div class='ctx'> 	sprintf(info-&gt;bus_info, "PCMCIA 0x%lx", dev-&gt;base_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c<br/>index f45c85a84261..72a854f05bb8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ethernet/xscale/ixp4xx_eth.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ethernet/xscale/ixp4xx_eth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ethernet/xscale/ixp4xx_eth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ethernet/xscale/ixp4xx_eth.c</a></div><div class='hunk'>@@ -529,7 +529,7 @@ static int ixp4xx_mdio_register(void)</div><div class='ctx'> 	mdio_bus-&gt;name = "IXP4xx MII Bus";</div><div class='ctx'> 	mdio_bus-&gt;read = &amp;ixp4xx_mdio_read;</div><div class='ctx'> 	mdio_bus-&gt;write = &amp;ixp4xx_mdio_write;</div><div class='del'>-	strcpy(mdio_bus-&gt;id, "0");</div><div class='add'>+	snprintf(mdio_bus-&gt;id, MII_BUS_ID_SIZE, "ixp4xx-eth-0");</div><div class='ctx'> </div><div class='ctx'> 	if ((err = mdiobus_register(mdio_bus)))</div><div class='ctx'> 		mdiobus_free(mdio_bus);</div><div class='head'>diff --git a/drivers/net/hyperv/Kconfig b/drivers/net/hyperv/Kconfig<br/>new file mode 100644<br/>index 000000000000..936968d23559<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hyperv/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/hyperv/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+config HYPERV_NET</div><div class='add'>+	tristate "Microsoft Hyper-V virtual network driver"</div><div class='add'>+	depends on HYPERV</div><div class='add'>+	help</div><div class='add'>+	  Select this option to enable the Hyper-V virtual network driver.</div><div class='head'>diff --git a/drivers/net/hyperv/Makefile b/drivers/net/hyperv/Makefile<br/>new file mode 100644<br/>index 000000000000..c8a66827100c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hyperv/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/hyperv/Makefile</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o</div><div class='add'>+</div><div class='add'>+hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o</div><div class='head'>diff --git a/drivers/staging/hv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h<br/>index ac1ec8405124..dec5836ae075 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/hv/hyperv_net.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/hv/hyperv_net.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hyperv/hyperv_net.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/hyperv/hyperv_net.h</a></div><div class='hunk'>@@ -39,9 +39,6 @@ struct xferpage_packet {</div><div class='ctx'> 	u32 count;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* The number of pages which are enough to cover jumbo frame buffer. */</div><div class='del'>-#define NETVSC_PACKET_MAXPAGE		4</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Represent netvsc packet which contains 1 RNDIS and 1 ethernet frame</div><div class='ctx'>  * within the RNDIS</div><div class='hunk'>@@ -77,8 +74,9 @@ struct hv_netvsc_packet {</div><div class='ctx'> </div><div class='ctx'> 	u32 total_data_buflen;</div><div class='ctx'> 	/* Points to the send/receive buffer where the ethernet frame is */</div><div class='add'>+	void *data;</div><div class='ctx'> 	u32 page_buf_cnt;</div><div class='del'>-	struct hv_page_buffer page_buf[NETVSC_PACKET_MAXPAGE];</div><div class='add'>+	struct hv_page_buffer page_buf[0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct netvsc_device_info {</div><div class='hunk'>@@ -87,6 +85,27 @@ struct netvsc_device_info {</div><div class='ctx'> 	int  ring_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum rndis_device_state {</div><div class='add'>+	RNDIS_DEV_UNINITIALIZED = 0,</div><div class='add'>+	RNDIS_DEV_INITIALIZING,</div><div class='add'>+	RNDIS_DEV_INITIALIZED,</div><div class='add'>+	RNDIS_DEV_DATAINITIALIZED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rndis_device {</div><div class='add'>+	struct netvsc_device *net_dev;</div><div class='add'>+</div><div class='add'>+	enum rndis_device_state state;</div><div class='add'>+	bool link_state;</div><div class='add'>+	atomic_t new_req_id;</div><div class='add'>+</div><div class='add'>+	spinlock_t request_lock;</div><div class='add'>+	struct list_head req_list;</div><div class='add'>+</div><div class='add'>+	unsigned char hw_mac_adr[ETH_ALEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* Interface */</div><div class='ctx'> int netvsc_device_add(struct hv_device *device, void *additional_info);</div><div class='ctx'> int netvsc_device_remove(struct hv_device *device);</div><div class='hunk'>@@ -109,11 +128,13 @@ int rndis_filter_receive(struct hv_device *dev,</div><div class='ctx'> int rndis_filter_send(struct hv_device *dev,</div><div class='ctx'> 			struct hv_netvsc_packet *pkt);</div><div class='ctx'> </div><div class='add'>+int rndis_filter_set_packet_filter(struct rndis_device *dev, u32 new_filter);</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #define NVSP_INVALID_PROTOCOL_VERSION	((u32)0xFFFFFFFF)</div><div class='ctx'> </div><div class='ctx'> #define NVSP_PROTOCOL_VERSION_1		2</div><div class='del'>-#define NVSP_MIN_PROTOCOL_VERSION	NVSP_PROTOCOL_VERSION_1</div><div class='del'>-#define NVSP_MAX_PROTOCOL_VERSION	NVSP_PROTOCOL_VERSION_1</div><div class='add'>+#define NVSP_PROTOCOL_VERSION_2		0x30002</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	NVSP_MSG_TYPE_NONE = 0,</div><div class='hunk'>@@ -138,11 +159,36 @@ enum {</div><div class='ctx'> 	NVSP_MSG1_TYPE_SEND_RNDIS_PKT,</div><div class='ctx'> 	NVSP_MSG1_TYPE_SEND_RNDIS_PKT_COMPLETE,</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * This should be set to the number of messages for the version with</div><div class='del'>-	 * the maximum number of messages.</div><div class='del'>-	 */</div><div class='del'>-	NVSP_NUM_MSG_PER_VERSION		= 9,</div><div class='add'>+	/* Version 2 messages */</div><div class='add'>+	NVSP_MSG2_TYPE_SEND_CHIMNEY_DELEGATED_BUF,</div><div class='add'>+	NVSP_MSG2_TYPE_SEND_CHIMNEY_DELEGATED_BUF_COMP,</div><div class='add'>+	NVSP_MSG2_TYPE_REVOKE_CHIMNEY_DELEGATED_BUF,</div><div class='add'>+</div><div class='add'>+	NVSP_MSG2_TYPE_RESUME_CHIMNEY_RX_INDICATION,</div><div class='add'>+</div><div class='add'>+	NVSP_MSG2_TYPE_TERMINATE_CHIMNEY,</div><div class='add'>+	NVSP_MSG2_TYPE_TERMINATE_CHIMNEY_COMP,</div><div class='add'>+</div><div class='add'>+	NVSP_MSG2_TYPE_INDICATE_CHIMNEY_EVENT,</div><div class='add'>+</div><div class='add'>+	NVSP_MSG2_TYPE_SEND_CHIMNEY_PKT,</div><div class='add'>+	NVSP_MSG2_TYPE_SEND_CHIMNEY_PKT_COMP,</div><div class='add'>+</div><div class='add'>+	NVSP_MSG2_TYPE_POST_CHIMNEY_RECV_REQ,</div><div class='add'>+	NVSP_MSG2_TYPE_POST_CHIMNEY_RECV_REQ_COMP,</div><div class='add'>+</div><div class='add'>+	NVSP_MSG2_TYPE_ALLOC_RXBUF,</div><div class='add'>+	NVSP_MSG2_TYPE_ALLOC_RXBUF_COMP,</div><div class='add'>+</div><div class='add'>+	NVSP_MSG2_TYPE_FREE_RXBUF,</div><div class='add'>+</div><div class='add'>+	NVSP_MSG2_TYPE_SEND_VMQ_RNDIS_PKT,</div><div class='add'>+	NVSP_MSG2_TYPE_SEND_VMQ_RNDIS_PKT_COMP,</div><div class='add'>+</div><div class='add'>+	NVSP_MSG2_TYPE_SEND_NDIS_CONFIG,</div><div class='add'>+</div><div class='add'>+	NVSP_MSG2_TYPE_ALLOC_CHIMNEY_HANDLE,</div><div class='add'>+	NVSP_MSG2_TYPE_ALLOC_CHIMNEY_HANDLE_COMP,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -153,6 +199,7 @@ enum {</div><div class='ctx'> 	NVSP_STAT_PROTOCOL_TOO_OLD,</div><div class='ctx'> 	NVSP_STAT_INVALID_RNDIS_PKT,</div><div class='ctx'> 	NVSP_STAT_BUSY,</div><div class='add'>+	NVSP_STAT_PROTOCOL_UNSUPPORTED,</div><div class='ctx'> 	NVSP_STAT_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -337,9 +384,69 @@ union nvsp_1_message_uber {</div><div class='ctx'> 						send_rndis_pkt_complete;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Network VSP protocol version 2 messages:</div><div class='add'>+ */</div><div class='add'>+struct nvsp_2_vsc_capability {</div><div class='add'>+	union {</div><div class='add'>+		u64 data;</div><div class='add'>+		struct {</div><div class='add'>+			u64 vmq:1;</div><div class='add'>+			u64 chimney:1;</div><div class='add'>+			u64 sriov:1;</div><div class='add'>+			u64 ieee8021q:1;</div><div class='add'>+			u64 correlation_id:1;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct nvsp_2_send_ndis_config {</div><div class='add'>+	u32 mtu;</div><div class='add'>+	u32 reserved;</div><div class='add'>+	struct nvsp_2_vsc_capability capability;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* Allocate receive buffer */</div><div class='add'>+struct nvsp_2_alloc_rxbuf {</div><div class='add'>+	/* Allocation ID to match the allocation request and response */</div><div class='add'>+	u32 alloc_id;</div><div class='add'>+</div><div class='add'>+	/* Length of the VM shared memory receive buffer that needs to</div><div class='add'>+	 * be allocated</div><div class='add'>+	 */</div><div class='add'>+	u32 len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* Allocate receive buffer complete */</div><div class='add'>+struct nvsp_2_alloc_rxbuf_comp {</div><div class='add'>+	/* The NDIS_STATUS code for buffer allocation */</div><div class='add'>+	u32 status;</div><div class='add'>+</div><div class='add'>+	u32 alloc_id;</div><div class='add'>+</div><div class='add'>+	/* GPADL handle for the allocated receive buffer */</div><div class='add'>+	u32 gpadl_handle;</div><div class='add'>+</div><div class='add'>+	/* Receive buffer ID */</div><div class='add'>+	u64 recv_buf_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct nvsp_2_free_rxbuf {</div><div class='add'>+	u64 recv_buf_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union nvsp_2_message_uber {</div><div class='add'>+	struct nvsp_2_send_ndis_config send_ndis_config;</div><div class='add'>+	struct nvsp_2_alloc_rxbuf alloc_rxbuf;</div><div class='add'>+	struct nvsp_2_alloc_rxbuf_comp alloc_rxbuf_comp;</div><div class='add'>+	struct nvsp_2_free_rxbuf free_rxbuf;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> union nvsp_all_messages {</div><div class='ctx'> 	union nvsp_message_init_uber init_msg;</div><div class='ctx'> 	union nvsp_1_message_uber v1_msg;</div><div class='add'>+	union nvsp_2_message_uber v2_msg;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* ALL Messages */</div><div class='hunk'>@@ -349,12 +456,9 @@ struct nvsp_message {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+#define NETVSC_MTU 65536</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* #define NVSC_MIN_PROTOCOL_VERSION		1 */</div><div class='del'>-/* #define NVSC_MAX_PROTOCOL_VERSION		1 */</div><div class='del'>-</div><div class='del'>-#define NETVSC_RECEIVE_BUFFER_SIZE		(1024*1024)	/* 1MB */</div><div class='add'>+#define NETVSC_RECEIVE_BUFFER_SIZE		(1024*1024*2)	/* 2MB */</div><div class='ctx'> </div><div class='ctx'> #define NETVSC_RECEIVE_BUFFER_ID		0xcafe</div><div class='ctx'> </div><div class='hunk'>@@ -369,7 +473,10 @@ struct nvsp_message {</div><div class='ctx'> struct netvsc_device {</div><div class='ctx'> 	struct hv_device *dev;</div><div class='ctx'> </div><div class='add'>+	u32 nvsp_version;</div><div class='add'>+</div><div class='ctx'> 	atomic_t num_outstanding_sends;</div><div class='add'>+	bool start_remove;</div><div class='ctx'> 	bool destroy;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * List of free preallocated hv_netvsc_packet to represent receive</div><div class='head'>diff --git a/drivers/staging/hv/netvsc.c b/drivers/net/hyperv/netvsc.c<br/>index b902579c7fe6..8965b45ce5a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/hv/netvsc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/hv/netvsc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hyperv/netvsc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/hyperv/netvsc.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</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/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "hyperv_net.h"</div><div class='ctx'> </div><div class='hunk'>@@ -41,7 +42,7 @@ static struct netvsc_device *alloc_net_device(struct hv_device *device)</div><div class='ctx'> 	if (!net_device)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+	net_device-&gt;start_remove = false;</div><div class='ctx'> 	net_device-&gt;destroy = false;</div><div class='ctx'> 	net_device-&gt;dev = device;</div><div class='ctx'> 	net_device-&gt;ndev = ndev;</div><div class='hunk'>@@ -230,19 +231,16 @@ static int netvsc_init_recv_buf(struct hv_device *device)</div><div class='ctx'> 	net_device-&gt;recv_section_cnt = init_packet-&gt;msg.</div><div class='ctx'> 		v1_msg.send_recv_buf_complete.num_sections;</div><div class='ctx'> </div><div class='del'>-	net_device-&gt;recv_section = kmalloc(net_device-&gt;recv_section_cnt</div><div class='del'>-		* sizeof(struct nvsp_1_receive_buffer_section), GFP_KERNEL);</div><div class='add'>+	net_device-&gt;recv_section = kmemdup(</div><div class='add'>+		init_packet-&gt;msg.v1_msg.send_recv_buf_complete.sections,</div><div class='add'>+		net_device-&gt;recv_section_cnt *</div><div class='add'>+		sizeof(struct nvsp_1_receive_buffer_section),</div><div class='add'>+		GFP_KERNEL);</div><div class='ctx'> 	if (net_device-&gt;recv_section == NULL) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(net_device-&gt;recv_section,</div><div class='del'>-		init_packet-&gt;msg.v1_msg.</div><div class='del'>-	       send_recv_buf_complete.sections,</div><div class='del'>-		net_device-&gt;recv_section_cnt *</div><div class='del'>-	       sizeof(struct nvsp_1_receive_buffer_section));</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For 1st release, there should only be 1 section that represents the</div><div class='ctx'> 	 * entire receive buffer</div><div class='hunk'>@@ -263,27 +261,18 @@ exit:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int netvsc_connect_vsp(struct hv_device *device)</div><div class='add'>+/* Negotiate NVSP protocol version */</div><div class='add'>+static int negotiate_nvsp_ver(struct hv_device *device,</div><div class='add'>+			      struct netvsc_device *net_device,</div><div class='add'>+			      struct nvsp_message *init_packet,</div><div class='add'>+			      u32 nvsp_ver)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, t;</div><div class='del'>-	struct netvsc_device *net_device;</div><div class='del'>-	struct nvsp_message *init_packet;</div><div class='del'>-	int ndis_version;</div><div class='del'>-	struct net_device *ndev;</div><div class='del'>-</div><div class='del'>-	net_device = get_outbound_net_device(device);</div><div class='del'>-	if (!net_device)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	ndev = net_device-&gt;ndev;</div><div class='del'>-</div><div class='del'>-	init_packet = &amp;net_device-&gt;channel_init_pkt;</div><div class='ctx'> </div><div class='ctx'> 	memset(init_packet, 0, sizeof(struct nvsp_message));</div><div class='ctx'> 	init_packet-&gt;hdr.msg_type = NVSP_MSG_TYPE_INIT;</div><div class='del'>-	init_packet-&gt;msg.init_msg.init.min_protocol_ver =</div><div class='del'>-		NVSP_MIN_PROTOCOL_VERSION;</div><div class='del'>-	init_packet-&gt;msg.init_msg.init.max_protocol_ver =</div><div class='del'>-		NVSP_MAX_PROTOCOL_VERSION;</div><div class='add'>+	init_packet-&gt;msg.init_msg.init.min_protocol_ver = nvsp_ver;</div><div class='add'>+	init_packet-&gt;msg.init_msg.init.max_protocol_ver = nvsp_ver;</div><div class='ctx'> </div><div class='ctx'> 	/* Send the init request */</div><div class='ctx'> 	ret = vmbus_sendpacket(device-&gt;channel, init_packet,</div><div class='hunk'>@@ -293,26 +282,62 @@ static int netvsc_connect_vsp(struct hv_device *device)</div><div class='ctx'> 			       VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);</div><div class='ctx'> </div><div class='ctx'> 	if (ret != 0)</div><div class='del'>-		goto cleanup;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	t = wait_for_completion_timeout(&amp;net_device-&gt;channel_init_wait, 5*HZ);</div><div class='ctx'> </div><div class='del'>-	if (t == 0) {</div><div class='del'>-		ret = -ETIMEDOUT;</div><div class='del'>-		goto cleanup;</div><div class='del'>-	}</div><div class='add'>+	if (t == 0)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='ctx'> </div><div class='ctx'> 	if (init_packet-&gt;msg.init_msg.init_complete.status !=</div><div class='del'>-	    NVSP_STAT_SUCCESS) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto cleanup;</div><div class='del'>-	}</div><div class='add'>+	    NVSP_STAT_SUCCESS)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (init_packet-&gt;msg.init_msg.init_complete.</div><div class='del'>-	    negotiated_protocol_ver != NVSP_PROTOCOL_VERSION_1) {</div><div class='add'>+	if (nvsp_ver != NVSP_PROTOCOL_VERSION_2)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* NVSPv2 only: Send NDIS config */</div><div class='add'>+	memset(init_packet, 0, sizeof(struct nvsp_message));</div><div class='add'>+	init_packet-&gt;hdr.msg_type = NVSP_MSG2_TYPE_SEND_NDIS_CONFIG;</div><div class='add'>+	init_packet-&gt;msg.v2_msg.send_ndis_config.mtu = net_device-&gt;ndev-&gt;mtu;</div><div class='add'>+</div><div class='add'>+	ret = vmbus_sendpacket(device-&gt;channel, init_packet,</div><div class='add'>+				sizeof(struct nvsp_message),</div><div class='add'>+				(unsigned long)init_packet,</div><div class='add'>+				VM_PKT_DATA_INBAND, 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 netvsc_connect_vsp(struct hv_device *device)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct netvsc_device *net_device;</div><div class='add'>+	struct nvsp_message *init_packet;</div><div class='add'>+	int ndis_version;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+</div><div class='add'>+	net_device = get_outbound_net_device(device);</div><div class='add'>+	if (!net_device)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	ndev = net_device-&gt;ndev;</div><div class='add'>+</div><div class='add'>+	init_packet = &amp;net_device-&gt;channel_init_pkt;</div><div class='add'>+</div><div class='add'>+	/* Negotiate the latest NVSP protocol supported */</div><div class='add'>+	if (negotiate_nvsp_ver(device, net_device, init_packet,</div><div class='add'>+			       NVSP_PROTOCOL_VERSION_2) == 0) {</div><div class='add'>+		net_device-&gt;nvsp_version = NVSP_PROTOCOL_VERSION_2;</div><div class='add'>+	} else if (negotiate_nvsp_ver(device, net_device, init_packet,</div><div class='add'>+				    NVSP_PROTOCOL_VERSION_1) == 0) {</div><div class='add'>+		net_device-&gt;nvsp_version = NVSP_PROTOCOL_VERSION_1;</div><div class='add'>+	} else {</div><div class='ctx'> 		ret = -EPROTO;</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	pr_debug("Negotiated NVSP version:%x\n", net_device-&gt;nvsp_version);</div><div class='add'>+</div><div class='ctx'> 	/* Send the ndis version */</div><div class='ctx'> 	memset(init_packet, 0, sizeof(struct nvsp_message));</div><div class='ctx'> </div><div class='hunk'>@@ -438,6 +463,9 @@ static void netvsc_send_completion(struct hv_device *device,</div><div class='ctx'> 			nvsc_packet-&gt;completion.send.send_completion_ctx);</div><div class='ctx'> </div><div class='ctx'> 		atomic_dec(&amp;net_device-&gt;num_outstanding_sends);</div><div class='add'>+</div><div class='add'>+		if (netif_queue_stopped(ndev) &amp;&amp; !net_device-&gt;start_remove)</div><div class='add'>+			netif_wake_queue(ndev);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		netdev_err(ndev, "Unknown send completion packet type- "</div><div class='ctx'> 			   "%d received!!\n", nvsp_packet-&gt;hdr.msg_type);</div><div class='hunk'>@@ -488,11 +516,16 @@ int netvsc_send(struct hv_device *device,</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ret != 0)</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		atomic_inc(&amp;net_device-&gt;num_outstanding_sends);</div><div class='add'>+	} else if (ret == -EAGAIN) {</div><div class='add'>+		netif_stop_queue(ndev);</div><div class='add'>+		if (atomic_read(&amp;net_device-&gt;num_outstanding_sends) &lt; 1)</div><div class='add'>+			netif_wake_queue(ndev);</div><div class='add'>+	} else {</div><div class='ctx'> 		netdev_err(ndev, "Unable to send packet %p ret %d\n",</div><div class='ctx'> 			   packet, ret);</div><div class='del'>-	else</div><div class='del'>-		atomic_inc(&amp;net_device-&gt;num_outstanding_sends);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -598,12 +631,10 @@ static void netvsc_receive(struct hv_device *device,</div><div class='ctx'> 	struct vmtransfer_page_packet_header *vmxferpage_packet;</div><div class='ctx'> 	struct nvsp_message *nvsp_packet;</div><div class='ctx'> 	struct hv_netvsc_packet *netvsc_packet = NULL;</div><div class='del'>-	unsigned long start;</div><div class='del'>-	unsigned long end, end_virtual;</div><div class='ctx'> 	/* struct netvsc_driver *netvscDriver; */</div><div class='ctx'> 	struct xferpage_packet *xferpage_packet = NULL;</div><div class='del'>-	int i, j;</div><div class='del'>-	int count = 0, bytes_remain = 0;</div><div class='add'>+	int i;</div><div class='add'>+	int count = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> </div><div class='hunk'>@@ -712,53 +743,10 @@ static void netvsc_receive(struct hv_device *device,</div><div class='ctx'> 		netvsc_packet-&gt;completion.recv.recv_completion_tid =</div><div class='ctx'> 					vmxferpage_packet-&gt;d.trans_id;</div><div class='ctx'> </div><div class='add'>+		netvsc_packet-&gt;data = (void *)((unsigned long)net_device-&gt;</div><div class='add'>+			recv_buf + vmxferpage_packet-&gt;ranges[i].byte_offset);</div><div class='ctx'> 		netvsc_packet-&gt;total_data_buflen =</div><div class='ctx'> 					vmxferpage_packet-&gt;ranges[i].byte_count;</div><div class='del'>-		netvsc_packet-&gt;page_buf_cnt = 1;</div><div class='del'>-</div><div class='del'>-		netvsc_packet-&gt;page_buf[0].len =</div><div class='del'>-					vmxferpage_packet-&gt;ranges[i].byte_count;</div><div class='del'>-</div><div class='del'>-		start = virt_to_phys((void *)((unsigned long)net_device-&gt;</div><div class='del'>-		recv_buf + vmxferpage_packet-&gt;ranges[i].byte_offset));</div><div class='del'>-</div><div class='del'>-		netvsc_packet-&gt;page_buf[0].pfn = start &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		end_virtual = (unsigned long)net_device-&gt;recv_buf</div><div class='del'>-		    + vmxferpage_packet-&gt;ranges[i].byte_offset</div><div class='del'>-		    + vmxferpage_packet-&gt;ranges[i].byte_count - 1;</div><div class='del'>-		end = virt_to_phys((void *)end_virtual);</div><div class='del'>-</div><div class='del'>-		/* Calculate the page relative offset */</div><div class='del'>-		netvsc_packet-&gt;page_buf[0].offset =</div><div class='del'>-			vmxferpage_packet-&gt;ranges[i].byte_offset &amp;</div><div class='del'>-			(PAGE_SIZE - 1);</div><div class='del'>-		if ((end &gt;&gt; PAGE_SHIFT) != (start &gt;&gt; PAGE_SHIFT)) {</div><div class='del'>-			/* Handle frame across multiple pages: */</div><div class='del'>-			netvsc_packet-&gt;page_buf[0].len =</div><div class='del'>-				(netvsc_packet-&gt;page_buf[0].pfn &lt;&lt;</div><div class='del'>-				 PAGE_SHIFT)</div><div class='del'>-				+ PAGE_SIZE - start;</div><div class='del'>-			bytes_remain = netvsc_packet-&gt;total_data_buflen -</div><div class='del'>-					netvsc_packet-&gt;page_buf[0].len;</div><div class='del'>-			for (j = 1; j &lt; NETVSC_PACKET_MAXPAGE; j++) {</div><div class='del'>-				netvsc_packet-&gt;page_buf[j].offset = 0;</div><div class='del'>-				if (bytes_remain &lt;= PAGE_SIZE) {</div><div class='del'>-					netvsc_packet-&gt;page_buf[j].len =</div><div class='del'>-						bytes_remain;</div><div class='del'>-					bytes_remain = 0;</div><div class='del'>-				} else {</div><div class='del'>-					netvsc_packet-&gt;page_buf[j].len =</div><div class='del'>-						PAGE_SIZE;</div><div class='del'>-					bytes_remain -= PAGE_SIZE;</div><div class='del'>-				}</div><div class='del'>-				netvsc_packet-&gt;page_buf[j].pfn =</div><div class='del'>-				    virt_to_phys((void *)(end_virtual -</div><div class='del'>-						bytes_remain)) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-				netvsc_packet-&gt;page_buf_cnt++;</div><div class='del'>-				if (bytes_remain == 0)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		/* Pass it to the upper layer */</div><div class='ctx'> 		rndis_filter_receive(device, netvsc_packet);</div><div class='head'>diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c<br/>index 93b0e91cbf98..462d05f05e84 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/hv/netvsc_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/hv/netvsc_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hyperv/netvsc_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/hyperv/netvsc_drv.c</a></div><div class='hunk'>@@ -43,24 +43,59 @@</div><div class='ctx'> struct net_device_context {</div><div class='ctx'> 	/* point back to our device context */</div><div class='ctx'> 	struct hv_device *device_ctx;</div><div class='del'>-	atomic_t avail;</div><div class='ctx'> 	struct delayed_work dwork;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define PACKET_PAGES_LOWATER  8</div><div class='del'>-/* Need this many pages to handle worst case fragmented packet */</div><div class='del'>-#define PACKET_PAGES_HIWATER  (MAX_SKB_FRAGS + 2)</div><div class='del'>-</div><div class='ctx'> static int ring_size = 128;</div><div class='ctx'> module_param(ring_size, int, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(ring_size, "Ring buffer size (# of pages)");</div><div class='ctx'> </div><div class='del'>-/* no-op so the netdev core doesn't return -EINVAL when modifying the the</div><div class='del'>- * multicast address list in SIOCADDMULTI. hv is setup to get all multicast</div><div class='del'>- * when it calls RndisFilterOnOpen() */</div><div class='add'>+struct set_multicast_work {</div><div class='add'>+	struct work_struct work;</div><div class='add'>+	struct net_device *net;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void do_set_multicast(struct work_struct *w)</div><div class='add'>+{</div><div class='add'>+	struct set_multicast_work *swk =</div><div class='add'>+		container_of(w, struct set_multicast_work, work);</div><div class='add'>+	struct net_device *net = swk-&gt;net;</div><div class='add'>+</div><div class='add'>+	struct net_device_context *ndevctx = netdev_priv(net);</div><div class='add'>+	struct netvsc_device *nvdev;</div><div class='add'>+	struct rndis_device *rdev;</div><div class='add'>+</div><div class='add'>+	nvdev = hv_get_drvdata(ndevctx-&gt;device_ctx);</div><div class='add'>+	if (nvdev == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rdev = nvdev-&gt;extension;</div><div class='add'>+	if (rdev == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (net-&gt;flags &amp; IFF_PROMISC)</div><div class='add'>+		rndis_filter_set_packet_filter(rdev,</div><div class='add'>+			NDIS_PACKET_TYPE_PROMISCUOUS);</div><div class='add'>+	else</div><div class='add'>+		rndis_filter_set_packet_filter(rdev,</div><div class='add'>+			NDIS_PACKET_TYPE_BROADCAST |</div><div class='add'>+			NDIS_PACKET_TYPE_ALL_MULTICAST |</div><div class='add'>+			NDIS_PACKET_TYPE_DIRECTED);</div><div class='add'>+</div><div class='add'>+	kfree(w);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void netvsc_set_multicast_list(struct net_device *net)</div><div class='ctx'> {</div><div class='add'>+	struct set_multicast_work *swk =</div><div class='add'>+		kmalloc(sizeof(struct set_multicast_work), GFP_ATOMIC);</div><div class='add'>+	if (swk == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	swk-&gt;net = net;</div><div class='add'>+	INIT_WORK(&amp;swk-&gt;work, do_set_multicast);</div><div class='add'>+	schedule_work(&amp;swk-&gt;work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int netvsc_open(struct net_device *net)</div><div class='hunk'>@@ -104,18 +139,8 @@ static void netvsc_xmit_completion(void *context)</div><div class='ctx'> </div><div class='ctx'> 	kfree(packet);</div><div class='ctx'> </div><div class='del'>-	if (skb) {</div><div class='del'>-		struct net_device *net = skb-&gt;dev;</div><div class='del'>-		struct net_device_context *net_device_ctx = netdev_priv(net);</div><div class='del'>-		unsigned int num_pages = skb_shinfo(skb)-&gt;nr_frags + 2;</div><div class='del'>-</div><div class='add'>+	if (skb)</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='del'>-</div><div class='del'>-		atomic_add(num_pages, &amp;net_device_ctx-&gt;avail);</div><div class='del'>-		if (atomic_read(&amp;net_device_ctx-&gt;avail) &gt;=</div><div class='del'>-				PACKET_PAGES_HIWATER)</div><div class='del'>-			netif_wake_queue(net);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)</div><div class='hunk'>@@ -123,12 +148,12 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)</div><div class='ctx'> 	struct net_device_context *net_device_ctx = netdev_priv(net);</div><div class='ctx'> 	struct hv_netvsc_packet *packet;</div><div class='ctx'> 	int ret;</div><div class='del'>-	unsigned int i, num_pages;</div><div class='add'>+	unsigned int i, num_pages, npg_data;</div><div class='ctx'> </div><div class='del'>-	/* Add 1 for skb-&gt;data and additional one for RNDIS */</div><div class='del'>-	num_pages = skb_shinfo(skb)-&gt;nr_frags + 1 + 1;</div><div class='del'>-	if (num_pages &gt; atomic_read(&amp;net_device_ctx-&gt;avail))</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='add'>+	/* Add multipage for skb-&gt;data and additional one for RNDIS */</div><div class='add'>+	npg_data = (((unsigned long)skb-&gt;data + skb_headlen(skb) - 1)</div><div class='add'>+		&gt;&gt; PAGE_SHIFT) - ((unsigned long)skb-&gt;data &gt;&gt; PAGE_SHIFT) + 1;</div><div class='add'>+	num_pages = skb_shinfo(skb)-&gt;nr_frags + npg_data + 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate a netvsc packet based on # of frags. */</div><div class='ctx'> 	packet = kzalloc(sizeof(struct hv_netvsc_packet) +</div><div class='hunk'>@@ -151,21 +176,36 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)</div><div class='ctx'> 	packet-&gt;page_buf_cnt = num_pages;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize it from the skb */</div><div class='del'>-	packet-&gt;total_data_buflen	= skb-&gt;len;</div><div class='add'>+	packet-&gt;total_data_buflen = skb-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	/* Start filling in the page buffers starting after RNDIS buffer. */</div><div class='ctx'> 	packet-&gt;page_buf[1].pfn = virt_to_phys(skb-&gt;data) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	packet-&gt;page_buf[1].offset</div><div class='ctx'> 		= (unsigned long)skb-&gt;data &amp; (PAGE_SIZE - 1);</div><div class='del'>-	packet-&gt;page_buf[1].len = skb_headlen(skb);</div><div class='add'>+	if (npg_data == 1)</div><div class='add'>+		packet-&gt;page_buf[1].len = skb_headlen(skb);</div><div class='add'>+	else</div><div class='add'>+		packet-&gt;page_buf[1].len = PAGE_SIZE</div><div class='add'>+			- packet-&gt;page_buf[1].offset;</div><div class='add'>+</div><div class='add'>+	for (i = 2; i &lt;= npg_data; i++) {</div><div class='add'>+		packet-&gt;page_buf[i].pfn = virt_to_phys(skb-&gt;data</div><div class='add'>+			+ PAGE_SIZE * (i-1)) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		packet-&gt;page_buf[i].offset = 0;</div><div class='add'>+		packet-&gt;page_buf[i].len = PAGE_SIZE;</div><div class='add'>+	}</div><div class='add'>+	if (npg_data &gt; 1)</div><div class='add'>+		packet-&gt;page_buf[npg_data].len = (((unsigned long)skb-&gt;data</div><div class='add'>+			+ skb_headlen(skb) - 1) &amp; (PAGE_SIZE - 1)) + 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Additional fragments are after SKB data */</div><div class='ctx'> 	for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='ctx'> 		const skb_frag_t *f = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='ctx'> </div><div class='del'>-		packet-&gt;page_buf[i+2].pfn = page_to_pfn(skb_frag_page(f));</div><div class='del'>-		packet-&gt;page_buf[i+2].offset = f-&gt;page_offset;</div><div class='del'>-		packet-&gt;page_buf[i+2].len = skb_frag_size(f);</div><div class='add'>+		packet-&gt;page_buf[i+npg_data+1].pfn =</div><div class='add'>+			page_to_pfn(skb_frag_page(f));</div><div class='add'>+		packet-&gt;page_buf[i+npg_data+1].offset = f-&gt;page_offset;</div><div class='add'>+		packet-&gt;page_buf[i+npg_data+1].len = skb_frag_size(f);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set the completion routine */</div><div class='hunk'>@@ -178,10 +218,6 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)</div><div class='ctx'> 	if (ret == 0) {</div><div class='ctx'> 		net-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='ctx'> 		net-&gt;stats.tx_packets++;</div><div class='del'>-</div><div class='del'>-		atomic_sub(num_pages, &amp;net_device_ctx-&gt;avail);</div><div class='del'>-		if (atomic_read(&amp;net_device_ctx-&gt;avail) &lt; PACKET_PAGES_LOWATER)</div><div class='del'>-			netif_stop_queue(net);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* we are shutting down or bus overloaded, just drop packet */</div><div class='ctx'> 		net-&gt;stats.tx_dropped++;</div><div class='hunk'>@@ -232,9 +268,6 @@ int netvsc_recv_callback(struct hv_device *device_obj,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *net = dev_get_drvdata(&amp;device_obj-&gt;device);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	void *data;</div><div class='del'>-	int i;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct netvsc_device *net_device;</div><div class='ctx'> </div><div class='ctx'> 	net_device = hv_get_drvdata(device_obj);</div><div class='hunk'>@@ -253,27 +286,12 @@ int netvsc_recv_callback(struct hv_device *device_obj,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* for kmap_atomic */</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Copy to skb. This copy is needed here since the memory pointed by</div><div class='ctx'> 	 * hv_netvsc_packet cannot be deallocated</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; packet-&gt;page_buf_cnt; i++) {</div><div class='del'>-		data = kmap_atomic(pfn_to_page(packet-&gt;page_buf[i].pfn),</div><div class='del'>-					       KM_IRQ1);</div><div class='del'>-		data = (void *)(unsigned long)data +</div><div class='del'>-				packet-&gt;page_buf[i].offset;</div><div class='del'>-</div><div class='del'>-		memcpy(skb_put(skb, packet-&gt;page_buf[i].len), data,</div><div class='del'>-		       packet-&gt;page_buf[i].len);</div><div class='del'>-</div><div class='del'>-		kunmap_atomic((void *)((unsigned long)data -</div><div class='del'>-				       packet-&gt;page_buf[i].offset), KM_IRQ1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='add'>+	memcpy(skb_put(skb, packet-&gt;total_data_buflen), packet-&gt;data,</div><div class='add'>+		packet-&gt;total_data_buflen);</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;protocol = eth_type_trans(skb, net);</div><div class='ctx'> 	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='hunk'>@@ -299,6 +317,39 @@ static void netvsc_get_drvinfo(struct net_device *net,</div><div class='ctx'> 	strcpy(info-&gt;fw_version, "N/A");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int netvsc_change_mtu(struct net_device *ndev, int mtu)</div><div class='add'>+{</div><div class='add'>+	struct net_device_context *ndevctx = netdev_priv(ndev);</div><div class='add'>+	struct hv_device *hdev =  ndevctx-&gt;device_ctx;</div><div class='add'>+	struct netvsc_device *nvdev = hv_get_drvdata(hdev);</div><div class='add'>+	struct netvsc_device_info device_info;</div><div class='add'>+	int limit = ETH_DATA_LEN;</div><div class='add'>+</div><div class='add'>+	if (nvdev == NULL || nvdev-&gt;destroy)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (nvdev-&gt;nvsp_version == NVSP_PROTOCOL_VERSION_2)</div><div class='add'>+		limit = NETVSC_MTU;</div><div class='add'>+</div><div class='add'>+	if (mtu &lt; 68 || mtu &gt; limit)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	nvdev-&gt;start_remove = true;</div><div class='add'>+	cancel_delayed_work_sync(&amp;ndevctx-&gt;dwork);</div><div class='add'>+	netif_stop_queue(ndev);</div><div class='add'>+	rndis_filter_device_remove(hdev);</div><div class='add'>+</div><div class='add'>+	ndev-&gt;mtu = mtu;</div><div class='add'>+</div><div class='add'>+	ndevctx-&gt;device_ctx = hdev;</div><div class='add'>+	hv_set_drvdata(hdev, ndev);</div><div class='add'>+	device_info.ring_size = ring_size;</div><div class='add'>+	rndis_filter_device_add(hdev, &amp;device_info);</div><div class='add'>+	netif_wake_queue(ndev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct ethtool_ops ethtool_ops = {</div><div class='ctx'> 	.get_drvinfo	= netvsc_get_drvinfo,</div><div class='ctx'> 	.get_link	= ethtool_op_get_link,</div><div class='hunk'>@@ -309,7 +360,7 @@ static const struct net_device_ops device_ops = {</div><div class='ctx'> 	.ndo_stop =			netvsc_close,</div><div class='ctx'> 	.ndo_start_xmit =		netvsc_start_xmit,</div><div class='ctx'> 	.ndo_set_rx_mode =		netvsc_set_multicast_list,</div><div class='del'>-	.ndo_change_mtu =		eth_change_mtu,</div><div class='add'>+	.ndo_change_mtu =		netvsc_change_mtu,</div><div class='ctx'> 	.ndo_validate_addr =		eth_validate_addr,</div><div class='ctx'> 	.ndo_set_mac_address =		eth_mac_addr,</div><div class='ctx'> };</div><div class='hunk'>@@ -351,7 +402,6 @@ static int netvsc_probe(struct hv_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	net_device_ctx = netdev_priv(net);</div><div class='ctx'> 	net_device_ctx-&gt;device_ctx = dev;</div><div class='del'>-	atomic_set(&amp;net_device_ctx-&gt;avail, ring_size);</div><div class='ctx'> 	hv_set_drvdata(dev, net);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;net_device_ctx-&gt;dwork, netvsc_send_garp);</div><div class='ctx'> </div><div class='hunk'>@@ -403,6 +453,8 @@ static int netvsc_remove(struct hv_device *dev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	net_device-&gt;start_remove = true;</div><div class='add'>+</div><div class='ctx'> 	ndev_ctx = netdev_priv(net);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;ndev_ctx-&gt;dwork);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c<br/>index bafccb360041..da181f9a49d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/hv/rndis_filter.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/hv/rndis_filter.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hyperv/rndis_filter.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/hyperv/rndis_filter.c</a></div><div class='hunk'>@@ -30,26 +30,6 @@</div><div class='ctx'> #include "hyperv_net.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-enum rndis_device_state {</div><div class='del'>-	RNDIS_DEV_UNINITIALIZED = 0,</div><div class='del'>-	RNDIS_DEV_INITIALIZING,</div><div class='del'>-	RNDIS_DEV_INITIALIZED,</div><div class='del'>-	RNDIS_DEV_DATAINITIALIZED,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct rndis_device {</div><div class='del'>-	struct netvsc_device *net_dev;</div><div class='del'>-</div><div class='del'>-	enum rndis_device_state state;</div><div class='del'>-	bool link_state;</div><div class='del'>-	atomic_t new_req_id;</div><div class='del'>-</div><div class='del'>-	spinlock_t request_lock;</div><div class='del'>-	struct list_head req_list;</div><div class='del'>-</div><div class='del'>-	unsigned char hw_mac_adr[ETH_ALEN];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct rndis_request {</div><div class='ctx'> 	struct list_head list_ent;</div><div class='ctx'> 	struct completion  wait_event;</div><div class='hunk'>@@ -329,7 +309,6 @@ static void rndis_filter_receive_data(struct rndis_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct rndis_packet *rndis_pkt;</div><div class='ctx'> 	u32 data_offset;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	rndis_pkt = &amp;msg-&gt;msg.pkt;</div><div class='ctx'> </div><div class='hunk'>@@ -342,17 +321,7 @@ static void rndis_filter_receive_data(struct rndis_device *dev,</div><div class='ctx'> 	data_offset = RNDIS_HEADER_SIZE + rndis_pkt-&gt;data_offset;</div><div class='ctx'> </div><div class='ctx'> 	pkt-&gt;total_data_buflen -= data_offset;</div><div class='del'>-	pkt-&gt;page_buf[0].offset += data_offset;</div><div class='del'>-	pkt-&gt;page_buf[0].len -= data_offset;</div><div class='del'>-</div><div class='del'>-	/* Drop the 0th page, if rndis data go beyond page boundary */</div><div class='del'>-	if (pkt-&gt;page_buf[0].offset &gt;= PAGE_SIZE) {</div><div class='del'>-		pkt-&gt;page_buf[1].offset = pkt-&gt;page_buf[0].offset - PAGE_SIZE;</div><div class='del'>-		pkt-&gt;page_buf[1].len -= pkt-&gt;page_buf[1].offset;</div><div class='del'>-		pkt-&gt;page_buf_cnt--;</div><div class='del'>-		for (i = 0; i &lt; pkt-&gt;page_buf_cnt; i++)</div><div class='del'>-			pkt-&gt;page_buf[i] = pkt-&gt;page_buf[i+1];</div><div class='del'>-	}</div><div class='add'>+	pkt-&gt;data = (void *)((unsigned long)pkt-&gt;data + data_offset);</div><div class='ctx'> </div><div class='ctx'> 	pkt-&gt;is_data_pkt = true;</div><div class='ctx'> </div><div class='hunk'>@@ -387,11 +356,7 @@ int rndis_filter_receive(struct hv_device *dev,</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rndis_hdr = (struct rndis_message *)kmap_atomic(</div><div class='del'>-			pfn_to_page(pkt-&gt;page_buf[0].pfn), KM_IRQ0);</div><div class='del'>-</div><div class='del'>-	rndis_hdr = (void *)((unsigned long)rndis_hdr +</div><div class='del'>-			pkt-&gt;page_buf[0].offset);</div><div class='add'>+	rndis_hdr = pkt-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we got a valid rndis message */</div><div class='ctx'> 	if ((rndis_hdr-&gt;ndis_msg_type != REMOTE_NDIS_PACKET_MSG) &amp;&amp;</div><div class='hunk'>@@ -407,8 +372,6 @@ int rndis_filter_receive(struct hv_device *dev,</div><div class='ctx'> 			sizeof(struct rndis_message) :</div><div class='ctx'> 			rndis_hdr-&gt;msg_len);</div><div class='ctx'> </div><div class='del'>-	kunmap_atomic(rndis_hdr - pkt-&gt;page_buf[0].offset, KM_IRQ0);</div><div class='del'>-</div><div class='ctx'> 	dump_rndis_message(dev, &amp;rndis_msg);</div><div class='ctx'> </div><div class='ctx'> 	switch (rndis_msg.ndis_msg_type) {</div><div class='hunk'>@@ -522,8 +485,7 @@ static int rndis_filter_query_device_link_status(struct rndis_device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rndis_filter_set_packet_filter(struct rndis_device *dev,</div><div class='del'>-				      u32 new_filter)</div><div class='add'>+int rndis_filter_set_packet_filter(struct rndis_device *dev, u32 new_filter)</div><div class='ctx'> {</div><div class='ctx'> 	struct rndis_request *request;</div><div class='ctx'> 	struct rndis_set_request *set;</div><div class='head'>diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c<br/>index 46b5f5fd686b..e05b645bbc32 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ifb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ifb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ifb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ifb.c</a></div><div class='hunk'>@@ -164,7 +164,7 @@ static const struct net_device_ops ifb_netdev_ops = {</div><div class='ctx'> 	.ndo_validate_addr = eth_validate_addr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define IFB_FEATURES (NETIF_F_NO_CSUM | NETIF_F_SG  | NETIF_F_FRAGLIST	| \</div><div class='add'>+#define IFB_FEATURES (NETIF_F_HW_CSUM | NETIF_F_SG  | NETIF_F_FRAGLIST	| \</div><div class='ctx'> 		      NETIF_F_TSO_ECN | NETIF_F_TSO | NETIF_F_TSO6	| \</div><div class='ctx'> 		      NETIF_F_HIGHDMA | NETIF_F_HW_VLAN_TX)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig<br/>index d423d18b4ad6..e535137eb2d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/irda/Kconfig</a></div><div class='hunk'>@@ -313,8 +313,12 @@ config TOSHIBA_FIR</div><div class='ctx'> 	  donauboe.</div><div class='ctx'> </div><div class='ctx'> config AU1000_FIR</div><div class='del'>-	tristate "Alchemy Au1000 SIR/FIR"</div><div class='add'>+	tristate "Alchemy IrDA SIR/FIR"</div><div class='ctx'> 	depends on IRDA &amp;&amp; MIPS_ALCHEMY</div><div class='add'>+	help</div><div class='add'>+	  Say Y/M here to build suppor the the IrDA peripheral on the</div><div class='add'>+	  Alchemy Au1000 and Au1100 SoCs.</div><div class='add'>+	  Say M to build a module; it will be called au1k_ir.ko</div><div class='ctx'> </div><div class='ctx'> config SMC_IRCC_FIR</div><div class='ctx'> 	tristate "SMSC IrCC (EXPERIMENTAL)"</div><div class='head'>diff --git a/drivers/net/irda/au1000_ircc.h b/drivers/net/irda/au1000_ircc.h<br/>deleted file mode 100644<br/>index c072c09a8d91..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/au1000_ircc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/au1000_ircc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,125 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * BRIEF MODULE DESCRIPTION</div><div class='del'>- *	Au1000 IrDA driver.</div><div class='del'>- *</div><div class='del'>- * Copyright 2001 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc.</div><div class='del'>- *         	ppopov@mvista.com or source@mvista.com</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- *  under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- *  option) any later version.</div><div class='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef AU1000_IRCC_H</div><div class='del'>-#define AU1000_IRCC_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-#define NUM_IR_IFF          1</div><div class='del'>-#define NUM_IR_DESC        64</div><div class='del'>-#define RING_SIZE_4       0x0</div><div class='del'>-#define RING_SIZE_16      0x3</div><div class='del'>-#define RING_SIZE_64      0xF</div><div class='del'>-#define MAX_NUM_IR_DESC    64</div><div class='del'>-#define MAX_BUF_SIZE     2048</div><div class='del'>-</div><div class='del'>-#define BPS_115200          0</div><div class='del'>-#define BPS_57600           1</div><div class='del'>-#define BPS_38400           2</div><div class='del'>-#define BPS_19200           5</div><div class='del'>-#define BPS_9600           11</div><div class='del'>-#define BPS_2400           47</div><div class='del'>-</div><div class='del'>-/* Ring descriptor flags */</div><div class='del'>-#define AU_OWN           (1&lt;&lt;7) /* tx,rx */</div><div class='del'>-</div><div class='del'>-#define IR_DIS_CRC       (1&lt;&lt;6) /* tx */</div><div class='del'>-#define IR_BAD_CRC       (1&lt;&lt;5) /* tx */</div><div class='del'>-#define IR_NEED_PULSE    (1&lt;&lt;4) /* tx */</div><div class='del'>-#define IR_FORCE_UNDER   (1&lt;&lt;3) /* tx */</div><div class='del'>-#define IR_DISABLE_TX    (1&lt;&lt;2) /* tx */</div><div class='del'>-#define IR_HW_UNDER      (1&lt;&lt;0) /* tx */</div><div class='del'>-#define IR_TX_ERROR      (IR_DIS_CRC|IR_BAD_CRC|IR_HW_UNDER)</div><div class='del'>-</div><div class='del'>-#define IR_PHY_ERROR     (1&lt;&lt;6) /* rx */</div><div class='del'>-#define IR_CRC_ERROR     (1&lt;&lt;5) /* rx */</div><div class='del'>-#define IR_MAX_LEN       (1&lt;&lt;4) /* rx */</div><div class='del'>-#define IR_FIFO_OVER     (1&lt;&lt;3) /* rx */</div><div class='del'>-#define IR_SIR_ERROR     (1&lt;&lt;2) /* rx */</div><div class='del'>-#define IR_RX_ERROR      (IR_PHY_ERROR|IR_CRC_ERROR| \</div><div class='del'>-		IR_MAX_LEN|IR_FIFO_OVER|IR_SIR_ERROR)</div><div class='del'>-</div><div class='del'>-typedef struct db_dest {</div><div class='del'>-	struct db_dest *pnext;</div><div class='del'>-	volatile u32 *vaddr;</div><div class='del'>-	dma_addr_t dma_addr;</div><div class='del'>-} db_dest_t;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct ring_desc {</div><div class='del'>-	u8 count_0;               /* 7:0  */</div><div class='del'>-	u8 count_1;               /* 12:8 */</div><div class='del'>-	u8 reserved;</div><div class='del'>-	u8 flags;</div><div class='del'>-	u8 addr_0;                /* 7:0   */</div><div class='del'>-	u8 addr_1;                /* 15:8  */</div><div class='del'>-	u8 addr_2;                /* 23:16 */</div><div class='del'>-	u8 addr_3;                /* 31:24 */</div><div class='del'>-} ring_dest_t;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private data for each instance */</div><div class='del'>-struct au1k_private {</div><div class='del'>-</div><div class='del'>-	db_dest_t *pDBfree;</div><div class='del'>-	db_dest_t db[2*NUM_IR_DESC];</div><div class='del'>-	volatile ring_dest_t *rx_ring[NUM_IR_DESC];</div><div class='del'>-	volatile ring_dest_t *tx_ring[NUM_IR_DESC];</div><div class='del'>-	db_dest_t *rx_db_inuse[NUM_IR_DESC];</div><div class='del'>-	db_dest_t *tx_db_inuse[NUM_IR_DESC];</div><div class='del'>-	u32 rx_head;</div><div class='del'>-	u32 tx_head;</div><div class='del'>-	u32 tx_tail;</div><div class='del'>-	u32 tx_full;</div><div class='del'>-</div><div class='del'>-	iobuff_t rx_buff;</div><div class='del'>-</div><div class='del'>-	struct net_device *netdev;</div><div class='del'>-	</div><div class='del'>-	struct timeval stamp;</div><div class='del'>-	struct timeval now;</div><div class='del'>-	struct qos_info		qos;</div><div class='del'>-	struct irlap_cb		*irlap;</div><div class='del'>-	</div><div class='del'>-	u8 open;</div><div class='del'>-	u32 speed;</div><div class='del'>-	u32 newspeed;</div><div class='del'>-	</div><div class='del'>-	u32 intr_work_done; /* number of Rx and Tx pkts processed in the isr */</div><div class='del'>-	struct timer_list timer;</div><div class='del'>-</div><div class='del'>-	spinlock_t lock;           /* For serializing operations */</div><div class='del'>-};</div><div class='del'>-#endif /* AU1000_IRCC_H */</div><div class='head'>diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c<br/>index a3d696a9456a..fc503aa5288e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/au1k_ir.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/au1k_ir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/au1k_ir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/irda/au1k_ir.c</a></div><div class='hunk'>@@ -18,104 +18,220 @@</div><div class='ctx'>  *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/au1000.h&gt;</div><div class='del'>-#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100)</div><div class='del'>-#include &lt;asm/pb1000.h&gt;</div><div class='del'>-#elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100)</div><div class='del'>-#include &lt;asm/db1x00.h&gt;</div><div class='del'>-#include &lt;asm/mach-db1x00/bcsr.h&gt;</div><div class='del'>-#else </div><div class='del'>-#error au1k_ir: unsupported board</div><div class='del'>-#endif</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/irda/irda.h&gt;</div><div class='ctx'> #include &lt;net/irda/irmod.h&gt;</div><div class='ctx'> #include &lt;net/irda/wrapper.h&gt;</div><div class='ctx'> #include &lt;net/irda/irda_device.h&gt;</div><div class='del'>-#include "au1000_ircc.h"</div><div class='add'>+#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='add'>+</div><div class='add'>+/* registers */</div><div class='add'>+#define IR_RING_PTR_STATUS	0x00</div><div class='add'>+#define IR_RING_BASE_ADDR_H	0x04</div><div class='add'>+#define IR_RING_BASE_ADDR_L	0x08</div><div class='add'>+#define IR_RING_SIZE		0x0C</div><div class='add'>+#define IR_RING_PROMPT		0x10</div><div class='add'>+#define IR_RING_ADDR_CMPR	0x14</div><div class='add'>+#define IR_INT_CLEAR		0x18</div><div class='add'>+#define IR_CONFIG_1		0x20</div><div class='add'>+#define IR_SIR_FLAGS		0x24</div><div class='add'>+#define IR_STATUS		0x28</div><div class='add'>+#define IR_READ_PHY_CONFIG	0x2C</div><div class='add'>+#define IR_WRITE_PHY_CONFIG	0x30</div><div class='add'>+#define IR_MAX_PKT_LEN		0x34</div><div class='add'>+#define IR_RX_BYTE_CNT		0x38</div><div class='add'>+#define IR_CONFIG_2		0x3C</div><div class='add'>+#define IR_ENABLE		0x40</div><div class='add'>+</div><div class='add'>+/* Config1 */</div><div class='add'>+#define IR_RX_INVERT_LED	(1 &lt;&lt; 0)</div><div class='add'>+#define IR_TX_INVERT_LED	(1 &lt;&lt; 1)</div><div class='add'>+#define IR_ST			(1 &lt;&lt; 2)</div><div class='add'>+#define IR_SF			(1 &lt;&lt; 3)</div><div class='add'>+#define IR_SIR			(1 &lt;&lt; 4)</div><div class='add'>+#define IR_MIR			(1 &lt;&lt; 5)</div><div class='add'>+#define IR_FIR			(1 &lt;&lt; 6)</div><div class='add'>+#define IR_16CRC		(1 &lt;&lt; 7)</div><div class='add'>+#define IR_TD			(1 &lt;&lt; 8)</div><div class='add'>+#define IR_RX_ALL		(1 &lt;&lt; 9)</div><div class='add'>+#define IR_DMA_ENABLE		(1 &lt;&lt; 10)</div><div class='add'>+#define IR_RX_ENABLE		(1 &lt;&lt; 11)</div><div class='add'>+#define IR_TX_ENABLE		(1 &lt;&lt; 12)</div><div class='add'>+#define IR_LOOPBACK		(1 &lt;&lt; 14)</div><div class='add'>+#define IR_SIR_MODE		(IR_SIR | IR_DMA_ENABLE | \</div><div class='add'>+				 IR_RX_ALL | IR_RX_ENABLE | IR_SF | \</div><div class='add'>+				 IR_16CRC)</div><div class='add'>+</div><div class='add'>+/* ir_status */</div><div class='add'>+#define IR_RX_STATUS		(1 &lt;&lt; 9)</div><div class='add'>+#define IR_TX_STATUS		(1 &lt;&lt; 10)</div><div class='add'>+#define IR_PHYEN		(1 &lt;&lt; 15)</div><div class='add'>+</div><div class='add'>+/* ir_write_phy_config */</div><div class='add'>+#define IR_BR(x)		(((x) &amp; 0x3f) &lt;&lt; 10)	/* baud rate */</div><div class='add'>+#define IR_PW(x)		(((x) &amp; 0x1f) &lt;&lt; 5)	/* pulse width */</div><div class='add'>+#define IR_P(x)			((x) &amp; 0x1f)		/* preamble bits */</div><div class='add'>+</div><div class='add'>+/* Config2 */</div><div class='add'>+#define IR_MODE_INV		(1 &lt;&lt; 0)</div><div class='add'>+#define IR_ONE_PIN		(1 &lt;&lt; 1)</div><div class='add'>+#define IR_PHYCLK_40MHZ		(0 &lt;&lt; 2)</div><div class='add'>+#define IR_PHYCLK_48MHZ		(1 &lt;&lt; 2)</div><div class='add'>+#define IR_PHYCLK_56MHZ		(2 &lt;&lt; 2)</div><div class='add'>+#define IR_PHYCLK_64MHZ		(3 &lt;&lt; 2)</div><div class='add'>+#define IR_DP			(1 &lt;&lt; 4)</div><div class='add'>+#define IR_DA			(1 &lt;&lt; 5)</div><div class='add'>+#define IR_FLT_HIGH		(0 &lt;&lt; 6)</div><div class='add'>+#define IR_FLT_MEDHI		(1 &lt;&lt; 6)</div><div class='add'>+#define IR_FLT_MEDLO		(2 &lt;&lt; 6)</div><div class='add'>+#define IR_FLT_LO		(3 &lt;&lt; 6)</div><div class='add'>+#define IR_IEN			(1 &lt;&lt; 8)</div><div class='add'>+</div><div class='add'>+/* ir_enable */</div><div class='add'>+#define IR_HC			(1 &lt;&lt; 3)	/* divide SBUS clock by 2 */</div><div class='add'>+#define IR_CE			(1 &lt;&lt; 2)	/* clock enable */</div><div class='add'>+#define IR_C			(1 &lt;&lt; 1)	/* coherency bit */</div><div class='add'>+#define IR_BE			(1 &lt;&lt; 0)	/* set in big endian mode */</div><div class='add'>+</div><div class='add'>+#define NUM_IR_DESC	64</div><div class='add'>+#define RING_SIZE_4	0x0</div><div class='add'>+#define RING_SIZE_16	0x3</div><div class='add'>+#define RING_SIZE_64	0xF</div><div class='add'>+#define MAX_NUM_IR_DESC	64</div><div class='add'>+#define MAX_BUF_SIZE	2048</div><div class='add'>+</div><div class='add'>+/* Ring descriptor flags */</div><div class='add'>+#define AU_OWN		(1 &lt;&lt; 7) /* tx,rx */</div><div class='add'>+#define IR_DIS_CRC	(1 &lt;&lt; 6) /* tx */</div><div class='add'>+#define IR_BAD_CRC	(1 &lt;&lt; 5) /* tx */</div><div class='add'>+#define IR_NEED_PULSE	(1 &lt;&lt; 4) /* tx */</div><div class='add'>+#define IR_FORCE_UNDER	(1 &lt;&lt; 3) /* tx */</div><div class='add'>+#define IR_DISABLE_TX	(1 &lt;&lt; 2) /* tx */</div><div class='add'>+#define IR_HW_UNDER	(1 &lt;&lt; 0) /* tx */</div><div class='add'>+#define IR_TX_ERROR	(IR_DIS_CRC | IR_BAD_CRC | IR_HW_UNDER)</div><div class='add'>+</div><div class='add'>+#define IR_PHY_ERROR	(1 &lt;&lt; 6) /* rx */</div><div class='add'>+#define IR_CRC_ERROR	(1 &lt;&lt; 5) /* rx */</div><div class='add'>+#define IR_MAX_LEN	(1 &lt;&lt; 4) /* rx */</div><div class='add'>+#define IR_FIFO_OVER	(1 &lt;&lt; 3) /* rx */</div><div class='add'>+#define IR_SIR_ERROR	(1 &lt;&lt; 2) /* rx */</div><div class='add'>+#define IR_RX_ERROR	(IR_PHY_ERROR | IR_CRC_ERROR | \</div><div class='add'>+			 IR_MAX_LEN | IR_FIFO_OVER | IR_SIR_ERROR)</div><div class='add'>+</div><div class='add'>+struct db_dest {</div><div class='add'>+	struct db_dest *pnext;</div><div class='add'>+	volatile u32 *vaddr;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static int au1k_irda_net_init(struct net_device *);</div><div class='del'>-static int au1k_irda_start(struct net_device *);</div><div class='del'>-static int au1k_irda_stop(struct net_device *dev);</div><div class='del'>-static int au1k_irda_hard_xmit(struct sk_buff *, struct net_device *);</div><div class='del'>-static int au1k_irda_rx(struct net_device *);</div><div class='del'>-static void au1k_irda_interrupt(int, void *);</div><div class='del'>-static void au1k_tx_timeout(struct net_device *);</div><div class='del'>-static int au1k_irda_ioctl(struct net_device *, struct ifreq *, int);</div><div class='del'>-static int au1k_irda_set_speed(struct net_device *dev, int speed);</div><div class='add'>+struct ring_dest {</div><div class='add'>+	u8 count_0;	/* 7:0  */</div><div class='add'>+	u8 count_1;	/* 12:8 */</div><div class='add'>+	u8 reserved;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 addr_0;	/* 7:0   */</div><div class='add'>+	u8 addr_1;	/* 15:8  */</div><div class='add'>+	u8 addr_2;	/* 23:16 */</div><div class='add'>+	u8 addr_3;	/* 31:24 */</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static void *dma_alloc(size_t, dma_addr_t *);</div><div class='del'>-static void dma_free(void *, size_t);</div><div class='add'>+/* Private data for each instance */</div><div class='add'>+struct au1k_private {</div><div class='add'>+	void __iomem *iobase;</div><div class='add'>+	int irq_rx, irq_tx;</div><div class='add'>+</div><div class='add'>+	struct db_dest *pDBfree;</div><div class='add'>+	struct db_dest db[2 * NUM_IR_DESC];</div><div class='add'>+	volatile struct ring_dest *rx_ring[NUM_IR_DESC];</div><div class='add'>+	volatile struct ring_dest *tx_ring[NUM_IR_DESC];</div><div class='add'>+	struct db_dest *rx_db_inuse[NUM_IR_DESC];</div><div class='add'>+	struct db_dest *tx_db_inuse[NUM_IR_DESC];</div><div class='add'>+	u32 rx_head;</div><div class='add'>+	u32 tx_head;</div><div class='add'>+	u32 tx_tail;</div><div class='add'>+	u32 tx_full;</div><div class='add'>+</div><div class='add'>+	iobuff_t rx_buff;</div><div class='add'>+</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct timeval stamp;</div><div class='add'>+	struct timeval now;</div><div class='add'>+	struct qos_info qos;</div><div class='add'>+	struct irlap_cb *irlap;</div><div class='add'>+</div><div class='add'>+	u8 open;</div><div class='add'>+	u32 speed;</div><div class='add'>+	u32 newspeed;</div><div class='add'>+</div><div class='add'>+	struct timer_list timer;</div><div class='add'>+</div><div class='add'>+	struct resource *ioarea;</div><div class='add'>+	struct au1k_irda_platform_data *platdata;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int qos_mtt_bits = 0x07;  /* 1 ms or more */</div><div class='del'>-static struct net_device *ir_devs[NUM_IR_IFF];</div><div class='del'>-static char version[] __devinitdata =</div><div class='del'>-    "au1k_ircc:1.2 ppopov@mvista.com\n";</div><div class='ctx'> </div><div class='ctx'> #define RUN_AT(x) (jiffies + (x))</div><div class='ctx'> </div><div class='del'>-static DEFINE_SPINLOCK(ir_lock);</div><div class='add'>+static void au1k_irda_plat_set_phy_mode(struct au1k_private *p, int mode)</div><div class='add'>+{</div><div class='add'>+	if (p-&gt;platdata &amp;&amp; p-&gt;platdata-&gt;set_phy_mode)</div><div class='add'>+		p-&gt;platdata-&gt;set_phy_mode(mode);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * IrDA peripheral bug. You have to read the register</div><div class='del'>- * twice to get the right value.</div><div class='del'>- */</div><div class='del'>-u32 read_ir_reg(u32 addr) </div><div class='del'>-{ </div><div class='del'>-	readl(addr);</div><div class='del'>-	return readl(addr);</div><div class='add'>+static inline unsigned long irda_read(struct au1k_private *p,</div><div class='add'>+				      unsigned long ofs)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	* IrDA peripheral bug. You have to read the register</div><div class='add'>+	* twice to get the right value.</div><div class='add'>+	*/</div><div class='add'>+	(void)__raw_readl(p-&gt;iobase + ofs);</div><div class='add'>+	return __raw_readl(p-&gt;iobase + ofs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void irda_write(struct au1k_private *p, unsigned long ofs,</div><div class='add'>+			      unsigned long val)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(val, p-&gt;iobase + ofs);</div><div class='add'>+	wmb();</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Buffer allocation/deallocation routines. The buffer descriptor returned</div><div class='del'>- * has the virtual and dma address of a buffer suitable for </div><div class='add'>+ * has the virtual and dma address of a buffer suitable for</div><div class='ctx'>  * both, receive and transmit operations.</div><div class='ctx'>  */</div><div class='del'>-static db_dest_t *GetFreeDB(struct au1k_private *aup)</div><div class='add'>+static struct db_dest *GetFreeDB(struct au1k_private *aup)</div><div class='ctx'> {</div><div class='del'>-	db_dest_t *pDB;</div><div class='del'>-	pDB = aup-&gt;pDBfree;</div><div class='del'>-</div><div class='del'>-	if (pDB) {</div><div class='del'>-		aup-&gt;pDBfree = pDB-&gt;pnext;</div><div class='del'>-	}</div><div class='del'>-	return pDB;</div><div class='del'>-}</div><div class='add'>+	struct db_dest *db;</div><div class='add'>+	db = aup-&gt;pDBfree;</div><div class='ctx'> </div><div class='del'>-static void ReleaseDB(struct au1k_private *aup, db_dest_t *pDB)</div><div class='del'>-{</div><div class='del'>-	db_dest_t *pDBfree = aup-&gt;pDBfree;</div><div class='del'>-	if (pDBfree)</div><div class='del'>-		pDBfree-&gt;pnext = pDB;</div><div class='del'>-	aup-&gt;pDBfree = pDB;</div><div class='add'>+	if (db)</div><div class='add'>+		aup-&gt;pDBfree = db-&gt;pnext;</div><div class='add'>+	return db;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>   DMA memory allocation, derived from pci_alloc_consistent.</div><div class='ctx'>   However, the Au1000 data cache is coherent (when programmed</div><div class='ctx'>   so), therefore we return KSEG0 address, not KSEG1.</div><div class='ctx'> */</div><div class='del'>-static void *dma_alloc(size_t size, dma_addr_t * dma_handle)</div><div class='add'>+static void *dma_alloc(size_t size, dma_addr_t *dma_handle)</div><div class='ctx'> {</div><div class='ctx'> 	void *ret;</div><div class='ctx'> 	int gfp = GFP_ATOMIC | GFP_DMA;</div><div class='ctx'> </div><div class='del'>-	ret = (void *) __get_free_pages(gfp, get_order(size));</div><div class='add'>+	ret = (void *)__get_free_pages(gfp, get_order(size));</div><div class='ctx'> </div><div class='ctx'> 	if (ret != NULL) {</div><div class='ctx'> 		memset(ret, 0, size);</div><div class='hunk'>@@ -125,7 +241,6 @@ static void *dma_alloc(size_t size, dma_addr_t * dma_handle)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static void dma_free(void *vaddr, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	vaddr = (void *)KSEG0ADDR(vaddr);</div><div class='hunk'>@@ -133,206 +248,306 @@ static void dma_free(void *vaddr, size_t size)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void </div><div class='del'>-setup_hw_rings(struct au1k_private *aup, u32 rx_base, u32 tx_base)</div><div class='add'>+static void setup_hw_rings(struct au1k_private *aup, u32 rx_base, u32 tx_base)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	for (i=0; i&lt;NUM_IR_DESC; i++) {</div><div class='del'>-		aup-&gt;rx_ring[i] = (volatile ring_dest_t *) </div><div class='del'>-			(rx_base + sizeof(ring_dest_t)*i);</div><div class='add'>+	for (i = 0; i &lt; NUM_IR_DESC; i++) {</div><div class='add'>+		aup-&gt;rx_ring[i] = (volatile struct ring_dest *)</div><div class='add'>+			(rx_base + sizeof(struct ring_dest) * i);</div><div class='ctx'> 	}</div><div class='del'>-	for (i=0; i&lt;NUM_IR_DESC; i++) {</div><div class='del'>-		aup-&gt;tx_ring[i] = (volatile ring_dest_t *) </div><div class='del'>-			(tx_base + sizeof(ring_dest_t)*i);</div><div class='add'>+	for (i = 0; i &lt; NUM_IR_DESC; i++) {</div><div class='add'>+		aup-&gt;tx_ring[i] = (volatile struct ring_dest *)</div><div class='add'>+			(tx_base + sizeof(struct ring_dest) * i);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int au1k_irda_init(void)</div><div class='del'>-{</div><div class='del'>-	static unsigned version_printed = 0;</div><div class='del'>-	struct au1k_private *aup;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (version_printed++ == 0) printk(version);</div><div class='del'>-</div><div class='del'>-	dev = alloc_irdadev(sizeof(struct au1k_private));</div><div class='del'>-	if (!dev)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	dev-&gt;irq = AU1000_IRDA_RX_INT; /* TX has its own interrupt */</div><div class='del'>-	err = au1k_irda_net_init(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-	err = register_netdev(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out1;</div><div class='del'>-	ir_devs[0] = dev;</div><div class='del'>-	printk(KERN_INFO "IrDA: Registered device %s\n", dev-&gt;name);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out1:</div><div class='del'>-	aup = netdev_priv(dev);</div><div class='del'>-	dma_free((void *)aup-&gt;db[0].vaddr,</div><div class='del'>-		MAX_BUF_SIZE * 2*NUM_IR_DESC);</div><div class='del'>-	dma_free((void *)aup-&gt;rx_ring[0],</div><div class='del'>-		2 * MAX_NUM_IR_DESC*(sizeof(ring_dest_t)));</div><div class='del'>-	kfree(aup-&gt;rx_buff.head);</div><div class='del'>-out:</div><div class='del'>-	free_netdev(dev);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int au1k_irda_init_iobuf(iobuff_t *io, int size)</div><div class='ctx'> {</div><div class='ctx'> 	io-&gt;head = kmalloc(size, GFP_KERNEL);</div><div class='ctx'> 	if (io-&gt;head != NULL) {</div><div class='del'>-		io-&gt;truesize = size;</div><div class='del'>-		io-&gt;in_frame = FALSE;</div><div class='del'>-		io-&gt;state    = OUTSIDE_FRAME;</div><div class='del'>-		io-&gt;data     = io-&gt;head;</div><div class='add'>+		io-&gt;truesize	= size;</div><div class='add'>+		io-&gt;in_frame	= FALSE;</div><div class='add'>+		io-&gt;state	= OUTSIDE_FRAME;</div><div class='add'>+		io-&gt;data	= io-&gt;head;</div><div class='ctx'> 	}</div><div class='ctx'> 	return io-&gt;head ? 0 : -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct net_device_ops au1k_irda_netdev_ops = {</div><div class='del'>-	.ndo_open		= au1k_irda_start,</div><div class='del'>-	.ndo_stop		= au1k_irda_stop,</div><div class='del'>-	.ndo_start_xmit		= au1k_irda_hard_xmit,</div><div class='del'>-	.ndo_tx_timeout		= au1k_tx_timeout,</div><div class='del'>-	.ndo_do_ioctl		= au1k_irda_ioctl,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int au1k_irda_net_init(struct net_device *dev)</div><div class='add'>+/*</div><div class='add'>+ * Set the IrDA communications speed.</div><div class='add'>+ */</div><div class='add'>+static int au1k_irda_set_speed(struct net_device *dev, int speed)</div><div class='ctx'> {</div><div class='ctx'> 	struct au1k_private *aup = netdev_priv(dev);</div><div class='del'>-	int i, retval = 0, err;</div><div class='del'>-	db_dest_t *pDB, *pDBfree;</div><div class='del'>-	dma_addr_t temp;</div><div class='add'>+	volatile struct ring_dest *ptxd;</div><div class='add'>+	unsigned long control;</div><div class='add'>+	int ret = 0, timeout = 10, i;</div><div class='ctx'> </div><div class='del'>-	err = au1k_irda_init_iobuf(&amp;aup-&gt;rx_buff, 14384);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out1;</div><div class='add'>+	if (speed == aup-&gt;speed)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;netdev_ops = &amp;au1k_irda_netdev_ops;</div><div class='add'>+	/* disable PHY first */</div><div class='add'>+	au1k_irda_plat_set_phy_mode(aup, AU1000_IRDA_PHY_MODE_OFF);</div><div class='add'>+	irda_write(aup, IR_STATUS, irda_read(aup, IR_STATUS) &amp; ~IR_PHYEN);</div><div class='ctx'> </div><div class='del'>-	irda_init_max_qos_capabilies(&amp;aup-&gt;qos);</div><div class='add'>+	/* disable RX/TX */</div><div class='add'>+	irda_write(aup, IR_CONFIG_1,</div><div class='add'>+	    irda_read(aup, IR_CONFIG_1) &amp; ~(IR_RX_ENABLE | IR_TX_ENABLE));</div><div class='add'>+	msleep(20);</div><div class='add'>+	while (irda_read(aup, IR_STATUS) &amp; (IR_RX_STATUS | IR_TX_STATUS)) {</div><div class='add'>+		msleep(20);</div><div class='add'>+		if (!timeout--) {</div><div class='add'>+			printk(KERN_ERR "%s: rx/tx disable timeout\n",</div><div class='add'>+					dev-&gt;name);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* The only value we must override it the baudrate */</div><div class='del'>-	aup-&gt;qos.baud_rate.bits = IR_9600|IR_19200|IR_38400|IR_57600|</div><div class='del'>-		IR_115200|IR_576000 |(IR_4000000 &lt;&lt; 8);</div><div class='del'>-	</div><div class='del'>-	aup-&gt;qos.min_turn_time.bits = qos_mtt_bits;</div><div class='del'>-	irda_qos_bits_to_value(&amp;aup-&gt;qos);</div><div class='add'>+	/* disable DMA */</div><div class='add'>+	irda_write(aup, IR_CONFIG_1,</div><div class='add'>+		   irda_read(aup, IR_CONFIG_1) &amp; ~IR_DMA_ENABLE);</div><div class='add'>+	msleep(20);</div><div class='ctx'> </div><div class='del'>-	retval = -ENOMEM;</div><div class='add'>+	/* After we disable tx/rx. the index pointers go back to zero. */</div><div class='add'>+	aup-&gt;tx_head = aup-&gt;tx_tail = aup-&gt;rx_head = 0;</div><div class='add'>+	for (i = 0; i &lt; NUM_IR_DESC; i++) {</div><div class='add'>+		ptxd = aup-&gt;tx_ring[i];</div><div class='add'>+		ptxd-&gt;flags = 0;</div><div class='add'>+		ptxd-&gt;count_0 = 0;</div><div class='add'>+		ptxd-&gt;count_1 = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Tx ring follows rx ring + 512 bytes */</div><div class='del'>-	/* we need a 1k aligned buffer */</div><div class='del'>-	aup-&gt;rx_ring[0] = (ring_dest_t *)</div><div class='del'>-		dma_alloc(2*MAX_NUM_IR_DESC*(sizeof(ring_dest_t)), &amp;temp);</div><div class='del'>-	if (!aup-&gt;rx_ring[0])</div><div class='del'>-		goto out2;</div><div class='add'>+	for (i = 0; i &lt; NUM_IR_DESC; i++) {</div><div class='add'>+		ptxd = aup-&gt;rx_ring[i];</div><div class='add'>+		ptxd-&gt;count_0 = 0;</div><div class='add'>+		ptxd-&gt;count_1 = 0;</div><div class='add'>+		ptxd-&gt;flags = AU_OWN;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* allocate the data buffers */</div><div class='del'>-	aup-&gt;db[0].vaddr = </div><div class='del'>-		(void *)dma_alloc(MAX_BUF_SIZE * 2*NUM_IR_DESC, &amp;temp);</div><div class='del'>-	if (!aup-&gt;db[0].vaddr)</div><div class='del'>-		goto out3;</div><div class='add'>+	if (speed == 4000000)</div><div class='add'>+		au1k_irda_plat_set_phy_mode(aup, AU1000_IRDA_PHY_MODE_FIR);</div><div class='add'>+	else</div><div class='add'>+		au1k_irda_plat_set_phy_mode(aup, AU1000_IRDA_PHY_MODE_SIR);</div><div class='ctx'> </div><div class='del'>-	setup_hw_rings(aup, (u32)aup-&gt;rx_ring[0], (u32)aup-&gt;rx_ring[0] + 512);</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case 9600:</div><div class='add'>+		irda_write(aup, IR_WRITE_PHY_CONFIG, IR_BR(11) | IR_PW(12));</div><div class='add'>+		irda_write(aup, IR_CONFIG_1, IR_SIR_MODE);</div><div class='add'>+		break;</div><div class='add'>+	case 19200:</div><div class='add'>+		irda_write(aup, IR_WRITE_PHY_CONFIG, IR_BR(5) | IR_PW(12));</div><div class='add'>+		irda_write(aup, IR_CONFIG_1, IR_SIR_MODE);</div><div class='add'>+		break;</div><div class='add'>+	case 38400:</div><div class='add'>+		irda_write(aup, IR_WRITE_PHY_CONFIG, IR_BR(2) | IR_PW(12));</div><div class='add'>+		irda_write(aup, IR_CONFIG_1, IR_SIR_MODE);</div><div class='add'>+		break;</div><div class='add'>+	case 57600:</div><div class='add'>+		irda_write(aup, IR_WRITE_PHY_CONFIG, IR_BR(1) | IR_PW(12));</div><div class='add'>+		irda_write(aup, IR_CONFIG_1, IR_SIR_MODE);</div><div class='add'>+		break;</div><div class='add'>+	case 115200:</div><div class='add'>+		irda_write(aup, IR_WRITE_PHY_CONFIG, IR_PW(12));</div><div class='add'>+		irda_write(aup, IR_CONFIG_1, IR_SIR_MODE);</div><div class='add'>+		break;</div><div class='add'>+	case 4000000:</div><div class='add'>+		irda_write(aup, IR_WRITE_PHY_CONFIG, IR_P(15));</div><div class='add'>+		irda_write(aup, IR_CONFIG_1, IR_FIR | IR_DMA_ENABLE |</div><div class='add'>+				IR_RX_ENABLE);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "%s unsupported speed %x\n", dev-&gt;name, speed);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	pDBfree = NULL;</div><div class='del'>-	pDB = aup-&gt;db;</div><div class='del'>-	for (i=0; i&lt;(2*NUM_IR_DESC); i++) {</div><div class='del'>-		pDB-&gt;pnext = pDBfree;</div><div class='del'>-		pDBfree = pDB;</div><div class='del'>-		pDB-&gt;vaddr = </div><div class='del'>-			(u32 *)((unsigned)aup-&gt;db[0].vaddr + MAX_BUF_SIZE*i);</div><div class='del'>-		pDB-&gt;dma_addr = (dma_addr_t)virt_to_bus(pDB-&gt;vaddr);</div><div class='del'>-		pDB++;</div><div class='add'>+	aup-&gt;speed = speed;</div><div class='add'>+	irda_write(aup, IR_STATUS, irda_read(aup, IR_STATUS) | IR_PHYEN);</div><div class='add'>+</div><div class='add'>+	control = irda_read(aup, IR_STATUS);</div><div class='add'>+	irda_write(aup, IR_RING_PROMPT, 0);</div><div class='add'>+</div><div class='add'>+	if (control &amp; (1 &lt;&lt; 14)) {</div><div class='add'>+		printk(KERN_ERR "%s: configuration error\n", dev-&gt;name);</div><div class='add'>+	} else {</div><div class='add'>+		if (control &amp; (1 &lt;&lt; 11))</div><div class='add'>+			printk(KERN_DEBUG "%s Valid SIR config\n", dev-&gt;name);</div><div class='add'>+		if (control &amp; (1 &lt;&lt; 12))</div><div class='add'>+			printk(KERN_DEBUG "%s Valid MIR config\n", dev-&gt;name);</div><div class='add'>+		if (control &amp; (1 &lt;&lt; 13))</div><div class='add'>+			printk(KERN_DEBUG "%s Valid FIR config\n", dev-&gt;name);</div><div class='add'>+		if (control &amp; (1 &lt;&lt; 10))</div><div class='add'>+			printk(KERN_DEBUG "%s TX enabled\n", dev-&gt;name);</div><div class='add'>+		if (control &amp; (1 &lt;&lt; 9))</div><div class='add'>+			printk(KERN_DEBUG "%s RX enabled\n", dev-&gt;name);</div><div class='ctx'> 	}</div><div class='del'>-	aup-&gt;pDBfree = pDBfree;</div><div class='ctx'> </div><div class='del'>-	/* attach a data buffer to each descriptor */</div><div class='del'>-	for (i=0; i&lt;NUM_IR_DESC; i++) {</div><div class='del'>-		pDB = GetFreeDB(aup);</div><div class='del'>-		if (!pDB) goto out;</div><div class='del'>-		aup-&gt;rx_ring[i]-&gt;addr_0 = (u8)(pDB-&gt;dma_addr &amp; 0xff);</div><div class='del'>-		aup-&gt;rx_ring[i]-&gt;addr_1 = (u8)((pDB-&gt;dma_addr&gt;&gt;8) &amp; 0xff);</div><div class='del'>-		aup-&gt;rx_ring[i]-&gt;addr_2 = (u8)((pDB-&gt;dma_addr&gt;&gt;16) &amp; 0xff);</div><div class='del'>-		aup-&gt;rx_ring[i]-&gt;addr_3 = (u8)((pDB-&gt;dma_addr&gt;&gt;24) &amp; 0xff);</div><div class='del'>-		aup-&gt;rx_db_inuse[i] = pDB;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void update_rx_stats(struct net_device *dev, u32 status, u32 count)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *ps = &amp;dev-&gt;stats;</div><div class='add'>+</div><div class='add'>+	ps-&gt;rx_packets++;</div><div class='add'>+</div><div class='add'>+	if (status &amp; IR_RX_ERROR) {</div><div class='add'>+		ps-&gt;rx_errors++;</div><div class='add'>+		if (status &amp; (IR_PHY_ERROR | IR_FIFO_OVER))</div><div class='add'>+			ps-&gt;rx_missed_errors++;</div><div class='add'>+		if (status &amp; IR_MAX_LEN)</div><div class='add'>+			ps-&gt;rx_length_errors++;</div><div class='add'>+		if (status &amp; IR_CRC_ERROR)</div><div class='add'>+			ps-&gt;rx_crc_errors++;</div><div class='add'>+	} else</div><div class='add'>+		ps-&gt;rx_bytes += count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void update_tx_stats(struct net_device *dev, u32 status, u32 pkt_len)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *ps = &amp;dev-&gt;stats;</div><div class='add'>+</div><div class='add'>+	ps-&gt;tx_packets++;</div><div class='add'>+	ps-&gt;tx_bytes += pkt_len;</div><div class='add'>+</div><div class='add'>+	if (status &amp; IR_TX_ERROR) {</div><div class='add'>+		ps-&gt;tx_errors++;</div><div class='add'>+		ps-&gt;tx_aborted_errors++;</div><div class='ctx'> 	}</div><div class='del'>-	for (i=0; i&lt;NUM_IR_DESC; i++) {</div><div class='del'>-		pDB = GetFreeDB(aup);</div><div class='del'>-		if (!pDB) goto out;</div><div class='del'>-		aup-&gt;tx_ring[i]-&gt;addr_0 = (u8)(pDB-&gt;dma_addr &amp; 0xff);</div><div class='del'>-		aup-&gt;tx_ring[i]-&gt;addr_1 = (u8)((pDB-&gt;dma_addr&gt;&gt;8) &amp; 0xff);</div><div class='del'>-		aup-&gt;tx_ring[i]-&gt;addr_2 = (u8)((pDB-&gt;dma_addr&gt;&gt;16) &amp; 0xff);</div><div class='del'>-		aup-&gt;tx_ring[i]-&gt;addr_3 = (u8)((pDB-&gt;dma_addr&gt;&gt;24) &amp; 0xff);</div><div class='del'>-		aup-&gt;tx_ring[i]-&gt;count_0 = 0;</div><div class='del'>-		aup-&gt;tx_ring[i]-&gt;count_1 = 0;</div><div class='del'>-		aup-&gt;tx_ring[i]-&gt;flags = 0;</div><div class='del'>-		aup-&gt;tx_db_inuse[i] = pDB;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void au1k_tx_ack(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct au1k_private *aup = netdev_priv(dev);</div><div class='add'>+	volatile struct ring_dest *ptxd;</div><div class='add'>+</div><div class='add'>+	ptxd = aup-&gt;tx_ring[aup-&gt;tx_tail];</div><div class='add'>+	while (!(ptxd-&gt;flags &amp; AU_OWN) &amp;&amp; (aup-&gt;tx_tail != aup-&gt;tx_head)) {</div><div class='add'>+		update_tx_stats(dev, ptxd-&gt;flags,</div><div class='add'>+				(ptxd-&gt;count_1 &lt;&lt; 8) | ptxd-&gt;count_0);</div><div class='add'>+		ptxd-&gt;count_0 = 0;</div><div class='add'>+		ptxd-&gt;count_1 = 0;</div><div class='add'>+		wmb();</div><div class='add'>+		aup-&gt;tx_tail = (aup-&gt;tx_tail + 1) &amp; (NUM_IR_DESC - 1);</div><div class='add'>+		ptxd = aup-&gt;tx_ring[aup-&gt;tx_tail];</div><div class='add'>+</div><div class='add'>+		if (aup-&gt;tx_full) {</div><div class='add'>+			aup-&gt;tx_full = 0;</div><div class='add'>+			netif_wake_queue(dev);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100)</div><div class='del'>-	/* power on */</div><div class='del'>-	bcsr_mod(BCSR_RESETS, BCSR_RESETS_IRDA_MODE_MASK,</div><div class='del'>-			      BCSR_RESETS_IRDA_MODE_FULL);</div><div class='del'>-#endif</div><div class='add'>+	if (aup-&gt;tx_tail == aup-&gt;tx_head) {</div><div class='add'>+		if (aup-&gt;newspeed) {</div><div class='add'>+			au1k_irda_set_speed(dev, aup-&gt;newspeed);</div><div class='add'>+			aup-&gt;newspeed = 0;</div><div class='add'>+		} else {</div><div class='add'>+			irda_write(aup, IR_CONFIG_1,</div><div class='add'>+			    irda_read(aup, IR_CONFIG_1) &amp; ~IR_TX_ENABLE);</div><div class='add'>+			irda_write(aup, IR_CONFIG_1,</div><div class='add'>+			    irda_read(aup, IR_CONFIG_1) | IR_RX_ENABLE);</div><div class='add'>+			irda_write(aup, IR_RING_PROMPT, 0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+static int au1k_irda_rx(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct au1k_private *aup = netdev_priv(dev);</div><div class='add'>+	volatile struct ring_dest *prxd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct db_dest *pDB;</div><div class='add'>+	u32 flags, count;</div><div class='ctx'> </div><div class='del'>-out3:</div><div class='del'>-	dma_free((void *)aup-&gt;rx_ring[0],</div><div class='del'>-		2 * MAX_NUM_IR_DESC*(sizeof(ring_dest_t)));</div><div class='del'>-out2:</div><div class='del'>-	kfree(aup-&gt;rx_buff.head);</div><div class='del'>-out1:</div><div class='del'>-	printk(KERN_ERR "au1k_init_module failed.  Returns %d\n", retval);</div><div class='del'>-	return retval;</div><div class='add'>+	prxd = aup-&gt;rx_ring[aup-&gt;rx_head];</div><div class='add'>+	flags = prxd-&gt;flags;</div><div class='add'>+</div><div class='add'>+	while (!(flags &amp; AU_OWN))  {</div><div class='add'>+		pDB = aup-&gt;rx_db_inuse[aup-&gt;rx_head];</div><div class='add'>+		count = (prxd-&gt;count_1 &lt;&lt; 8) | prxd-&gt;count_0;</div><div class='add'>+		if (!(flags &amp; IR_RX_ERROR)) {</div><div class='add'>+			/* good frame */</div><div class='add'>+			update_rx_stats(dev, flags, count);</div><div class='add'>+			skb = alloc_skb(count + 1, GFP_ATOMIC);</div><div class='add'>+			if (skb == NULL) {</div><div class='add'>+				dev-&gt;stats.rx_dropped++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			skb_reserve(skb, 1);</div><div class='add'>+			if (aup-&gt;speed == 4000000)</div><div class='add'>+				skb_put(skb, count);</div><div class='add'>+			else</div><div class='add'>+				skb_put(skb, count - 2);</div><div class='add'>+			skb_copy_to_linear_data(skb, (void *)pDB-&gt;vaddr,</div><div class='add'>+						count - 2);</div><div class='add'>+			skb-&gt;dev = dev;</div><div class='add'>+			skb_reset_mac_header(skb);</div><div class='add'>+			skb-&gt;protocol = htons(ETH_P_IRDA);</div><div class='add'>+			netif_rx(skb);</div><div class='add'>+			prxd-&gt;count_0 = 0;</div><div class='add'>+			prxd-&gt;count_1 = 0;</div><div class='add'>+		}</div><div class='add'>+		prxd-&gt;flags |= AU_OWN;</div><div class='add'>+		aup-&gt;rx_head = (aup-&gt;rx_head + 1) &amp; (NUM_IR_DESC - 1);</div><div class='add'>+		irda_write(aup, IR_RING_PROMPT, 0);</div><div class='add'>+</div><div class='add'>+		/* next descriptor */</div><div class='add'>+		prxd = aup-&gt;rx_ring[aup-&gt;rx_head];</div><div class='add'>+		flags = prxd-&gt;flags;</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='add'>+static irqreturn_t au1k_irda_interrupt(int dummy, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = dev_id;</div><div class='add'>+	struct au1k_private *aup = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	irda_write(aup, IR_INT_CLEAR, 0); /* ack irda interrupts */</div><div class='add'>+</div><div class='add'>+	au1k_irda_rx(dev);</div><div class='add'>+	au1k_tx_ack(dev);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int au1k_init(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct au1k_private *aup = netdev_priv(dev);</div><div class='add'>+	u32 enable, ring_address;</div><div class='ctx'> 	int i;</div><div class='del'>-	u32 control;</div><div class='del'>-	u32 ring_address;</div><div class='ctx'> </div><div class='del'>-	/* bring the device out of reset */</div><div class='del'>-	control = 0xe; /* coherent, clock enable, one half system clock */</div><div class='del'>-			  </div><div class='add'>+	enable = IR_HC | IR_CE | IR_C;</div><div class='ctx'> #ifndef CONFIG_CPU_LITTLE_ENDIAN</div><div class='del'>-	control |= 1;</div><div class='add'>+	enable |= IR_BE;</div><div class='ctx'> #endif</div><div class='ctx'> 	aup-&gt;tx_head = 0;</div><div class='ctx'> 	aup-&gt;tx_tail = 0;</div><div class='ctx'> 	aup-&gt;rx_head = 0;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;NUM_IR_DESC; i++) {</div><div class='add'>+	for (i = 0; i &lt; NUM_IR_DESC; i++)</div><div class='ctx'> 		aup-&gt;rx_ring[i]-&gt;flags = AU_OWN;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	writel(control, IR_INTERFACE_CONFIG);</div><div class='del'>-	au_sync_delay(10);</div><div class='add'>+	irda_write(aup, IR_ENABLE, enable);</div><div class='add'>+	msleep(20);</div><div class='ctx'> </div><div class='del'>-	writel(read_ir_reg(IR_ENABLE) &amp; ~0x8000, IR_ENABLE); /* disable PHY */</div><div class='del'>-	au_sync_delay(1);</div><div class='add'>+	/* disable PHY */</div><div class='add'>+	au1k_irda_plat_set_phy_mode(aup, AU1000_IRDA_PHY_MODE_OFF);</div><div class='add'>+	irda_write(aup, IR_STATUS, irda_read(aup, IR_STATUS) &amp; ~IR_PHYEN);</div><div class='add'>+	msleep(20);</div><div class='ctx'> </div><div class='del'>-	writel(MAX_BUF_SIZE, IR_MAX_PKT_LEN);</div><div class='add'>+	irda_write(aup, IR_MAX_PKT_LEN, MAX_BUF_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	ring_address = (u32)virt_to_phys((void *)aup-&gt;rx_ring[0]);</div><div class='del'>-	writel(ring_address &gt;&gt; 26, IR_RING_BASE_ADDR_H);</div><div class='del'>-	writel((ring_address &gt;&gt; 10) &amp; 0xffff, IR_RING_BASE_ADDR_L);</div><div class='add'>+	irda_write(aup, IR_RING_BASE_ADDR_H, ring_address &gt;&gt; 26);</div><div class='add'>+	irda_write(aup, IR_RING_BASE_ADDR_L, (ring_address &gt;&gt; 10) &amp; 0xffff);</div><div class='ctx'> </div><div class='del'>-	writel(RING_SIZE_64&lt;&lt;8 | RING_SIZE_64&lt;&lt;12, IR_RING_SIZE);</div><div class='add'>+	irda_write(aup, IR_RING_SIZE,</div><div class='add'>+				(RING_SIZE_64 &lt;&lt; 8) | (RING_SIZE_64 &lt;&lt; 12));</div><div class='ctx'> </div><div class='del'>-	writel(1&lt;&lt;2 | IR_ONE_PIN, IR_CONFIG_2); /* 48MHz */</div><div class='del'>-	writel(0, IR_RING_ADDR_CMPR);</div><div class='add'>+	irda_write(aup, IR_CONFIG_2, IR_PHYCLK_48MHZ | IR_ONE_PIN);</div><div class='add'>+	irda_write(aup, IR_RING_ADDR_CMPR, 0);</div><div class='ctx'> </div><div class='ctx'> 	au1k_irda_set_speed(dev, 9600);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -340,25 +555,28 @@ static int au1k_init(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static int au1k_irda_start(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	int retval;</div><div class='del'>-	char hwname[32];</div><div class='ctx'> 	struct au1k_private *aup = netdev_priv(dev);</div><div class='add'>+	char hwname[32];</div><div class='add'>+	int retval;</div><div class='ctx'> </div><div class='del'>-	if ((retval = au1k_init(dev))) {</div><div class='add'>+	retval = au1k_init(dev);</div><div class='add'>+	if (retval) {</div><div class='ctx'> 		printk(KERN_ERR "%s: error in au1k_init\n", dev-&gt;name);</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((retval = request_irq(AU1000_IRDA_TX_INT, au1k_irda_interrupt, </div><div class='del'>-					0, dev-&gt;name, dev))) {</div><div class='del'>-		printk(KERN_ERR "%s: unable to get IRQ %d\n", </div><div class='add'>+	retval = request_irq(aup-&gt;irq_tx, &amp;au1k_irda_interrupt, 0,</div><div class='add'>+			     dev-&gt;name, dev);</div><div class='add'>+	if (retval) {</div><div class='add'>+		printk(KERN_ERR "%s: unable to get IRQ %d\n",</div><div class='ctx'> 				dev-&gt;name, dev-&gt;irq);</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='del'>-	if ((retval = request_irq(AU1000_IRDA_RX_INT, au1k_irda_interrupt, </div><div class='del'>-					0, dev-&gt;name, dev))) {</div><div class='del'>-		free_irq(AU1000_IRDA_TX_INT, dev);</div><div class='del'>-		printk(KERN_ERR "%s: unable to get IRQ %d\n", </div><div class='add'>+	retval = request_irq(aup-&gt;irq_rx, &amp;au1k_irda_interrupt, 0,</div><div class='add'>+			     dev-&gt;name, dev);</div><div class='add'>+	if (retval) {</div><div class='add'>+		free_irq(aup-&gt;irq_tx, dev);</div><div class='add'>+		printk(KERN_ERR "%s: unable to get IRQ %d\n",</div><div class='ctx'> 				dev-&gt;name, dev-&gt;irq);</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -368,9 +586,13 @@ static int au1k_irda_start(struct net_device *dev)</div><div class='ctx'> 	aup-&gt;irlap = irlap_open(dev, &amp;aup-&gt;qos, hwname);</div><div class='ctx'> 	netif_start_queue(dev);</div><div class='ctx'> </div><div class='del'>-	writel(read_ir_reg(IR_CONFIG_2) | 1&lt;&lt;8, IR_CONFIG_2); /* int enable */</div><div class='add'>+	/* int enable */</div><div class='add'>+	irda_write(aup, IR_CONFIG_2, irda_read(aup, IR_CONFIG_2) | IR_IEN);</div><div class='add'>+</div><div class='add'>+	/* power up */</div><div class='add'>+	au1k_irda_plat_set_phy_mode(aup, AU1000_IRDA_PHY_MODE_SIR);</div><div class='ctx'> </div><div class='del'>-	aup-&gt;timer.expires = RUN_AT((3*HZ)); </div><div class='add'>+	aup-&gt;timer.expires = RUN_AT((3 * HZ));</div><div class='ctx'> 	aup-&gt;timer.data = (unsigned long)dev;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -379,11 +601,12 @@ static int au1k_irda_stop(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct au1k_private *aup = netdev_priv(dev);</div><div class='ctx'> </div><div class='add'>+	au1k_irda_plat_set_phy_mode(aup, AU1000_IRDA_PHY_MODE_OFF);</div><div class='add'>+</div><div class='ctx'> 	/* disable interrupts */</div><div class='del'>-	writel(read_ir_reg(IR_CONFIG_2) &amp; ~(1&lt;&lt;8), IR_CONFIG_2);</div><div class='del'>-	writel(0, IR_CONFIG_1); </div><div class='del'>-	writel(0, IR_INTERFACE_CONFIG); /* disable clock */</div><div class='del'>-	au_sync();</div><div class='add'>+	irda_write(aup, IR_CONFIG_2, irda_read(aup, IR_CONFIG_2) &amp; ~IR_IEN);</div><div class='add'>+	irda_write(aup, IR_CONFIG_1, 0);</div><div class='add'>+	irda_write(aup, IR_ENABLE, 0); /* disable clock */</div><div class='ctx'> </div><div class='ctx'> 	if (aup-&gt;irlap) {</div><div class='ctx'> 		irlap_close(aup-&gt;irlap);</div><div class='hunk'>@@ -394,83 +617,12 @@ static int au1k_irda_stop(struct net_device *dev)</div><div class='ctx'> 	del_timer(&amp;aup-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	/* disable the interrupt */</div><div class='del'>-	free_irq(AU1000_IRDA_TX_INT, dev);</div><div class='del'>-	free_irq(AU1000_IRDA_RX_INT, dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit au1k_irda_exit(void)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = ir_devs[0];</div><div class='del'>-	struct au1k_private *aup = netdev_priv(dev);</div><div class='add'>+	free_irq(aup-&gt;irq_tx, dev);</div><div class='add'>+	free_irq(aup-&gt;irq_rx, dev);</div><div class='ctx'> </div><div class='del'>-	unregister_netdev(dev);</div><div class='del'>-</div><div class='del'>-	dma_free((void *)aup-&gt;db[0].vaddr,</div><div class='del'>-		MAX_BUF_SIZE * 2*NUM_IR_DESC);</div><div class='del'>-	dma_free((void *)aup-&gt;rx_ring[0],</div><div class='del'>-		2 * MAX_NUM_IR_DESC*(sizeof(ring_dest_t)));</div><div class='del'>-	kfree(aup-&gt;rx_buff.head);</div><div class='del'>-	free_netdev(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline void </div><div class='del'>-update_tx_stats(struct net_device *dev, u32 status, u32 pkt_len)</div><div class='del'>-{</div><div class='del'>-	struct au1k_private *aup = netdev_priv(dev);</div><div class='del'>-	struct net_device_stats *ps = &amp;aup-&gt;stats;</div><div class='del'>-</div><div class='del'>-	ps-&gt;tx_packets++;</div><div class='del'>-	ps-&gt;tx_bytes += pkt_len;</div><div class='del'>-</div><div class='del'>-	if (status &amp; IR_TX_ERROR) {</div><div class='del'>-		ps-&gt;tx_errors++;</div><div class='del'>-		ps-&gt;tx_aborted_errors++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void au1k_tx_ack(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct au1k_private *aup = netdev_priv(dev);</div><div class='del'>-	volatile ring_dest_t *ptxd;</div><div class='del'>-</div><div class='del'>-	ptxd = aup-&gt;tx_ring[aup-&gt;tx_tail];</div><div class='del'>-	while (!(ptxd-&gt;flags &amp; AU_OWN) &amp;&amp; (aup-&gt;tx_tail != aup-&gt;tx_head)) {</div><div class='del'>-		update_tx_stats(dev, ptxd-&gt;flags, </div><div class='del'>-				ptxd-&gt;count_1&lt;&lt;8 | ptxd-&gt;count_0);</div><div class='del'>-		ptxd-&gt;count_0 = 0;</div><div class='del'>-		ptxd-&gt;count_1 = 0;</div><div class='del'>-		au_sync();</div><div class='del'>-</div><div class='del'>-		aup-&gt;tx_tail = (aup-&gt;tx_tail + 1) &amp; (NUM_IR_DESC - 1);</div><div class='del'>-		ptxd = aup-&gt;tx_ring[aup-&gt;tx_tail];</div><div class='del'>-</div><div class='del'>-		if (aup-&gt;tx_full) {</div><div class='del'>-			aup-&gt;tx_full = 0;</div><div class='del'>-			netif_wake_queue(dev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (aup-&gt;tx_tail == aup-&gt;tx_head) {</div><div class='del'>-		if (aup-&gt;newspeed) {</div><div class='del'>-			au1k_irda_set_speed(dev, aup-&gt;newspeed);</div><div class='del'>-			aup-&gt;newspeed = 0;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			writel(read_ir_reg(IR_CONFIG_1) &amp; ~IR_TX_ENABLE, </div><div class='del'>-					IR_CONFIG_1); </div><div class='del'>-			au_sync();</div><div class='del'>-			writel(read_ir_reg(IR_CONFIG_1) | IR_RX_ENABLE, </div><div class='del'>-					IR_CONFIG_1); </div><div class='del'>-			writel(0, IR_RING_PROMPT);</div><div class='del'>-			au_sync();</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'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Au1000 transmit routine.</div><div class='ctx'>  */</div><div class='hunk'>@@ -478,15 +630,12 @@ static int au1k_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct au1k_private *aup = netdev_priv(dev);</div><div class='ctx'> 	int speed = irda_get_next_speed(skb);</div><div class='del'>-	volatile ring_dest_t *ptxd;</div><div class='del'>-	u32 len;</div><div class='del'>-</div><div class='del'>-	u32 flags;</div><div class='del'>-	db_dest_t *pDB;</div><div class='add'>+	volatile struct ring_dest *ptxd;</div><div class='add'>+	struct db_dest *pDB;</div><div class='add'>+	u32 len, flags;</div><div class='ctx'> </div><div class='del'>-	if (speed != aup-&gt;speed &amp;&amp; speed != -1) {</div><div class='add'>+	if (speed != aup-&gt;speed &amp;&amp; speed != -1)</div><div class='ctx'> 		aup-&gt;newspeed = speed;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if ((skb-&gt;len == 0) &amp;&amp; (aup-&gt;newspeed)) {</div><div class='ctx'> 		if (aup-&gt;tx_tail == aup-&gt;tx_head) {</div><div class='hunk'>@@ -504,138 +653,47 @@ static int au1k_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		printk(KERN_DEBUG "%s: tx_full\n", dev-&gt;name);</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> 		aup-&gt;tx_full = 1;</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='del'>-	}</div><div class='del'>-	else if (((aup-&gt;tx_head + 1) &amp; (NUM_IR_DESC - 1)) == aup-&gt;tx_tail) {</div><div class='add'>+		return 1;</div><div class='add'>+	} else if (((aup-&gt;tx_head + 1) &amp; (NUM_IR_DESC - 1)) == aup-&gt;tx_tail) {</div><div class='ctx'> 		printk(KERN_DEBUG "%s: tx_full\n", dev-&gt;name);</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> 		aup-&gt;tx_full = 1;</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pDB = aup-&gt;tx_db_inuse[aup-&gt;tx_head];</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='del'>-	if (read_ir_reg(IR_RX_BYTE_CNT) != 0) {</div><div class='del'>-		printk("tx warning: rx byte cnt %x\n", </div><div class='del'>-				read_ir_reg(IR_RX_BYTE_CNT));</div><div class='add'>+	if (irda_read(aup, IR_RX_BYTE_CNT) != 0) {</div><div class='add'>+		printk(KERN_DEBUG "tx warning: rx byte cnt %x\n",</div><div class='add'>+				irda_read(aup, IR_RX_BYTE_CNT));</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (aup-&gt;speed == 4000000) {</div><div class='ctx'> 		/* FIR */</div><div class='del'>-		skb_copy_from_linear_data(skb, pDB-&gt;vaddr, skb-&gt;len);</div><div class='add'>+		skb_copy_from_linear_data(skb, (void *)pDB-&gt;vaddr, skb-&gt;len);</div><div class='ctx'> 		ptxd-&gt;count_0 = skb-&gt;len &amp; 0xff;</div><div class='ctx'> 		ptxd-&gt;count_1 = (skb-&gt;len &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='add'>+	} else {</div><div class='ctx'> 		/* SIR */</div><div class='ctx'> 		len = async_wrap_skb(skb, (u8 *)pDB-&gt;vaddr, MAX_BUF_SIZE);</div><div class='ctx'> 		ptxd-&gt;count_0 = len &amp; 0xff;</div><div class='ctx'> 		ptxd-&gt;count_1 = (len &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 		ptxd-&gt;flags |= IR_DIS_CRC;</div><div class='del'>-		au_writel(au_readl(0xae00000c) &amp; ~(1&lt;&lt;13), 0xae00000c);</div><div class='ctx'> 	}</div><div class='ctx'> 	ptxd-&gt;flags |= AU_OWN;</div><div class='del'>-	au_sync();</div><div class='add'>+	wmb();</div><div class='ctx'> </div><div class='del'>-	writel(read_ir_reg(IR_CONFIG_1) | IR_TX_ENABLE, IR_CONFIG_1); </div><div class='del'>-	writel(0, IR_RING_PROMPT);</div><div class='del'>-	au_sync();</div><div class='add'>+	irda_write(aup, IR_CONFIG_1,</div><div class='add'>+		   irda_read(aup, IR_CONFIG_1) | IR_TX_ENABLE);</div><div class='add'>+	irda_write(aup, IR_RING_PROMPT, 0);</div><div class='ctx'> </div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> 	aup-&gt;tx_head = (aup-&gt;tx_head + 1) &amp; (NUM_IR_DESC - 1);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static inline void </div><div class='del'>-update_rx_stats(struct net_device *dev, u32 status, u32 count)</div><div class='del'>-{</div><div class='del'>-	struct au1k_private *aup = netdev_priv(dev);</div><div class='del'>-	struct net_device_stats *ps = &amp;aup-&gt;stats;</div><div class='del'>-</div><div class='del'>-	ps-&gt;rx_packets++;</div><div class='del'>-</div><div class='del'>-	if (status &amp; IR_RX_ERROR) {</div><div class='del'>-		ps-&gt;rx_errors++;</div><div class='del'>-		if (status &amp; (IR_PHY_ERROR|IR_FIFO_OVER))</div><div class='del'>-			ps-&gt;rx_missed_errors++;</div><div class='del'>-		if (status &amp; IR_MAX_LEN)</div><div class='del'>-			ps-&gt;rx_length_errors++;</div><div class='del'>-		if (status &amp; IR_CRC_ERROR)</div><div class='del'>-			ps-&gt;rx_crc_errors++;</div><div class='del'>-	}</div><div class='del'>-	else </div><div class='del'>-		ps-&gt;rx_bytes += count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Au1000 receive routine.</div><div class='del'>- */</div><div class='del'>-static int au1k_irda_rx(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct au1k_private *aup = netdev_priv(dev);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	volatile ring_dest_t *prxd;</div><div class='del'>-	u32 flags, count;</div><div class='del'>-	db_dest_t *pDB;</div><div class='del'>-</div><div class='del'>-	prxd = aup-&gt;rx_ring[aup-&gt;rx_head];</div><div class='del'>-	flags = prxd-&gt;flags;</div><div class='del'>-</div><div class='del'>-	while (!(flags &amp; AU_OWN))  {</div><div class='del'>-		pDB = aup-&gt;rx_db_inuse[aup-&gt;rx_head];</div><div class='del'>-		count = prxd-&gt;count_1&lt;&lt;8 | prxd-&gt;count_0;</div><div class='del'>-		if (!(flags &amp; IR_RX_ERROR))  {</div><div class='del'>-			/* good frame */</div><div class='del'>-			update_rx_stats(dev, flags, count);</div><div class='del'>-			skb=alloc_skb(count+1,GFP_ATOMIC);</div><div class='del'>-			if (skb == NULL) {</div><div class='del'>-				aup-&gt;netdev-&gt;stats.rx_dropped++;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			skb_reserve(skb, 1);</div><div class='del'>-			if (aup-&gt;speed == 4000000)</div><div class='del'>-				skb_put(skb, count);</div><div class='del'>-			else</div><div class='del'>-				skb_put(skb, count-2);</div><div class='del'>-			skb_copy_to_linear_data(skb, pDB-&gt;vaddr, count - 2);</div><div class='del'>-			skb-&gt;dev = dev;</div><div class='del'>-			skb_reset_mac_header(skb);</div><div class='del'>-			skb-&gt;protocol = htons(ETH_P_IRDA);</div><div class='del'>-			netif_rx(skb);</div><div class='del'>-			prxd-&gt;count_0 = 0;</div><div class='del'>-			prxd-&gt;count_1 = 0;</div><div class='del'>-		}</div><div class='del'>-		prxd-&gt;flags |= AU_OWN;</div><div class='del'>-		aup-&gt;rx_head = (aup-&gt;rx_head + 1) &amp; (NUM_IR_DESC - 1);</div><div class='del'>-		writel(0, IR_RING_PROMPT);</div><div class='del'>-		au_sync();</div><div class='del'>-</div><div class='del'>-		/* next descriptor */</div><div class='del'>-		prxd = aup-&gt;rx_ring[aup-&gt;rx_head];</div><div class='del'>-		flags = prxd-&gt;flags;</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'>-static irqreturn_t au1k_irda_interrupt(int dummy, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = dev_id;</div><div class='del'>-</div><div class='del'>-	writel(0, IR_INT_CLEAR); /* ack irda interrupts */</div><div class='del'>-</div><div class='del'>-	au1k_irda_rx(dev);</div><div class='del'>-	au1k_tx_ack(dev);</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='ctx'> /*</div><div class='ctx'>  * The Tx ring has been full longer than the watchdog timeout</div><div class='ctx'>  * value. The transmitter must be hung?</div><div class='hunk'>@@ -653,142 +711,7 @@ static void au1k_tx_timeout(struct net_device *dev)</div><div class='ctx'> 	netif_wake_queue(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set the IrDA communications speed.</div><div class='del'>- */</div><div class='del'>-static int </div><div class='del'>-au1k_irda_set_speed(struct net_device *dev, int speed)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct au1k_private *aup = netdev_priv(dev);</div><div class='del'>-	u32 control;</div><div class='del'>-	int ret = 0, timeout = 10, i;</div><div class='del'>-	volatile ring_dest_t *ptxd;</div><div class='del'>-#if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100)</div><div class='del'>-	unsigned long irda_resets;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (speed == aup-&gt;speed)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;ir_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* disable PHY first */</div><div class='del'>-	writel(read_ir_reg(IR_ENABLE) &amp; ~0x8000, IR_ENABLE);</div><div class='del'>-</div><div class='del'>-	/* disable RX/TX */</div><div class='del'>-	writel(read_ir_reg(IR_CONFIG_1) &amp; ~(IR_RX_ENABLE|IR_TX_ENABLE), </div><div class='del'>-			IR_CONFIG_1);</div><div class='del'>-	au_sync_delay(1);</div><div class='del'>-	while (read_ir_reg(IR_ENABLE) &amp; (IR_RX_STATUS | IR_TX_STATUS)) {</div><div class='del'>-		mdelay(1);</div><div class='del'>-		if (!timeout--) {</div><div class='del'>-			printk(KERN_ERR "%s: rx/tx disable timeout\n",</div><div class='del'>-					dev-&gt;name);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* disable DMA */</div><div class='del'>-	writel(read_ir_reg(IR_CONFIG_1) &amp; ~IR_DMA_ENABLE, IR_CONFIG_1);</div><div class='del'>-	au_sync_delay(1);</div><div class='del'>-</div><div class='del'>-	/* </div><div class='del'>-	 *  After we disable tx/rx. the index pointers</div><div class='del'>- 	 * go back to zero.</div><div class='del'>-	 */</div><div class='del'>-	aup-&gt;tx_head = aup-&gt;tx_tail = aup-&gt;rx_head = 0;</div><div class='del'>-	for (i=0; i&lt;NUM_IR_DESC; i++) {</div><div class='del'>-		ptxd = aup-&gt;tx_ring[i];</div><div class='del'>-		ptxd-&gt;flags = 0;</div><div class='del'>-		ptxd-&gt;count_0 = 0;</div><div class='del'>-		ptxd-&gt;count_1 = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;NUM_IR_DESC; i++) {</div><div class='del'>-		ptxd = aup-&gt;rx_ring[i];</div><div class='del'>-		ptxd-&gt;count_0 = 0;</div><div class='del'>-		ptxd-&gt;count_1 = 0;</div><div class='del'>-		ptxd-&gt;flags = AU_OWN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (speed == 4000000) {</div><div class='del'>-#if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100)</div><div class='del'>-		bcsr_mod(BCSR_RESETS, 0, BCSR_RESETS_FIR_SEL);</div><div class='del'>-#else /* Pb1000 and Pb1100 */</div><div class='del'>-		writel(1&lt;&lt;13, CPLD_AUX1);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-#if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100)</div><div class='del'>-		bcsr_mod(BCSR_RESETS, BCSR_RESETS_FIR_SEL, 0);</div><div class='del'>-#else /* Pb1000 and Pb1100 */</div><div class='del'>-		writel(readl(CPLD_AUX1) &amp; ~(1&lt;&lt;13), CPLD_AUX1);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (speed) {</div><div class='del'>-	case 9600:	</div><div class='del'>-		writel(11&lt;&lt;10 | 12&lt;&lt;5, IR_WRITE_PHY_CONFIG); </div><div class='del'>-		writel(IR_SIR_MODE, IR_CONFIG_1); </div><div class='del'>-		break;</div><div class='del'>-	case 19200:	</div><div class='del'>-		writel(5&lt;&lt;10 | 12&lt;&lt;5, IR_WRITE_PHY_CONFIG); </div><div class='del'>-		writel(IR_SIR_MODE, IR_CONFIG_1); </div><div class='del'>-		break;</div><div class='del'>-	case 38400:</div><div class='del'>-		writel(2&lt;&lt;10 | 12&lt;&lt;5, IR_WRITE_PHY_CONFIG); </div><div class='del'>-		writel(IR_SIR_MODE, IR_CONFIG_1); </div><div class='del'>-		break;</div><div class='del'>-	case 57600:	</div><div class='del'>-		writel(1&lt;&lt;10 | 12&lt;&lt;5, IR_WRITE_PHY_CONFIG); </div><div class='del'>-		writel(IR_SIR_MODE, IR_CONFIG_1); </div><div class='del'>-		break;</div><div class='del'>-	case 115200: </div><div class='del'>-		writel(12&lt;&lt;5, IR_WRITE_PHY_CONFIG); </div><div class='del'>-		writel(IR_SIR_MODE, IR_CONFIG_1); </div><div class='del'>-		break;</div><div class='del'>-	case 4000000:</div><div class='del'>-		writel(0xF, IR_WRITE_PHY_CONFIG);</div><div class='del'>-		writel(IR_FIR|IR_DMA_ENABLE|IR_RX_ENABLE, IR_CONFIG_1); </div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "%s unsupported speed %x\n", dev-&gt;name, speed);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	aup-&gt;speed = speed;</div><div class='del'>-	writel(read_ir_reg(IR_ENABLE) | 0x8000, IR_ENABLE);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	control = read_ir_reg(IR_ENABLE);</div><div class='del'>-	writel(0, IR_RING_PROMPT);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	if (control &amp; (1&lt;&lt;14)) {</div><div class='del'>-		printk(KERN_ERR "%s: configuration error\n", dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		if (control &amp; (1&lt;&lt;11))</div><div class='del'>-			printk(KERN_DEBUG "%s Valid SIR config\n", dev-&gt;name);</div><div class='del'>-		if (control &amp; (1&lt;&lt;12))</div><div class='del'>-			printk(KERN_DEBUG "%s Valid MIR config\n", dev-&gt;name);</div><div class='del'>-		if (control &amp; (1&lt;&lt;13))</div><div class='del'>-			printk(KERN_DEBUG "%s Valid FIR config\n", dev-&gt;name);</div><div class='del'>-		if (control &amp; (1&lt;&lt;10))</div><div class='del'>-			printk(KERN_DEBUG "%s TX enabled\n", dev-&gt;name);</div><div class='del'>-		if (control &amp; (1&lt;&lt;9))</div><div class='del'>-			printk(KERN_DEBUG "%s RX enabled\n", dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;ir_lock, flags);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int </div><div class='del'>-au1k_irda_ioctl(struct net_device *dev, struct ifreq *ifreq, int cmd)</div><div class='add'>+static int au1k_irda_ioctl(struct net_device *dev, struct ifreq *ifreq, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct if_irda_req *rq = (struct if_irda_req *)ifreq;</div><div class='ctx'> 	struct au1k_private *aup = netdev_priv(dev);</div><div class='hunk'>@@ -829,8 +752,218 @@ au1k_irda_ioctl(struct net_device *dev, struct ifreq *ifreq, int cmd)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct net_device_ops au1k_irda_netdev_ops = {</div><div class='add'>+	.ndo_open		= au1k_irda_start,</div><div class='add'>+	.ndo_stop		= au1k_irda_stop,</div><div class='add'>+	.ndo_start_xmit		= au1k_irda_hard_xmit,</div><div class='add'>+	.ndo_tx_timeout		= au1k_tx_timeout,</div><div class='add'>+	.ndo_do_ioctl		= au1k_irda_ioctl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit au1k_irda_net_init(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct au1k_private *aup = netdev_priv(dev);</div><div class='add'>+	struct db_dest *pDB, *pDBfree;</div><div class='add'>+	int i, err, retval = 0;</div><div class='add'>+	dma_addr_t temp;</div><div class='add'>+</div><div class='add'>+	err = au1k_irda_init_iobuf(&amp;aup-&gt;rx_buff, 14384);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out1;</div><div class='add'>+</div><div class='add'>+	dev-&gt;netdev_ops = &amp;au1k_irda_netdev_ops;</div><div class='add'>+</div><div class='add'>+	irda_init_max_qos_capabilies(&amp;aup-&gt;qos);</div><div class='add'>+</div><div class='add'>+	/* The only value we must override it the baudrate */</div><div class='add'>+	aup-&gt;qos.baud_rate.bits = IR_9600 | IR_19200 | IR_38400 |</div><div class='add'>+		IR_57600 | IR_115200 | IR_576000 | (IR_4000000 &lt;&lt; 8);</div><div class='add'>+</div><div class='add'>+	aup-&gt;qos.min_turn_time.bits = qos_mtt_bits;</div><div class='add'>+	irda_qos_bits_to_value(&amp;aup-&gt;qos);</div><div class='add'>+</div><div class='add'>+	retval = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Tx ring follows rx ring + 512 bytes */</div><div class='add'>+	/* we need a 1k aligned buffer */</div><div class='add'>+	aup-&gt;rx_ring[0] = (struct ring_dest *)</div><div class='add'>+		dma_alloc(2 * MAX_NUM_IR_DESC * (sizeof(struct ring_dest)),</div><div class='add'>+			  &amp;temp);</div><div class='add'>+	if (!aup-&gt;rx_ring[0])</div><div class='add'>+		goto out2;</div><div class='add'>+</div><div class='add'>+	/* allocate the data buffers */</div><div class='add'>+	aup-&gt;db[0].vaddr =</div><div class='add'>+		(void *)dma_alloc(MAX_BUF_SIZE * 2 * NUM_IR_DESC, &amp;temp);</div><div class='add'>+	if (!aup-&gt;db[0].vaddr)</div><div class='add'>+		goto out3;</div><div class='add'>+</div><div class='add'>+	setup_hw_rings(aup, (u32)aup-&gt;rx_ring[0], (u32)aup-&gt;rx_ring[0] + 512);</div><div class='add'>+</div><div class='add'>+	pDBfree = NULL;</div><div class='add'>+	pDB = aup-&gt;db;</div><div class='add'>+	for (i = 0; i &lt; (2 * NUM_IR_DESC); i++) {</div><div class='add'>+		pDB-&gt;pnext = pDBfree;</div><div class='add'>+		pDBfree = pDB;</div><div class='add'>+		pDB-&gt;vaddr =</div><div class='add'>+		       (u32 *)((unsigned)aup-&gt;db[0].vaddr + (MAX_BUF_SIZE * i));</div><div class='add'>+		pDB-&gt;dma_addr = (dma_addr_t)virt_to_bus(pDB-&gt;vaddr);</div><div class='add'>+		pDB++;</div><div class='add'>+	}</div><div class='add'>+	aup-&gt;pDBfree = pDBfree;</div><div class='add'>+</div><div class='add'>+	/* attach a data buffer to each descriptor */</div><div class='add'>+	for (i = 0; i &lt; NUM_IR_DESC; i++) {</div><div class='add'>+		pDB = GetFreeDB(aup);</div><div class='add'>+		if (!pDB)</div><div class='add'>+			goto out3;</div><div class='add'>+		aup-&gt;rx_ring[i]-&gt;addr_0 = (u8)(pDB-&gt;dma_addr &amp; 0xff);</div><div class='add'>+		aup-&gt;rx_ring[i]-&gt;addr_1 = (u8)((pDB-&gt;dma_addr &gt;&gt;  8) &amp; 0xff);</div><div class='add'>+		aup-&gt;rx_ring[i]-&gt;addr_2 = (u8)((pDB-&gt;dma_addr &gt;&gt; 16) &amp; 0xff);</div><div class='add'>+		aup-&gt;rx_ring[i]-&gt;addr_3 = (u8)((pDB-&gt;dma_addr &gt;&gt; 24) &amp; 0xff);</div><div class='add'>+		aup-&gt;rx_db_inuse[i] = pDB;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; NUM_IR_DESC; i++) {</div><div class='add'>+		pDB = GetFreeDB(aup);</div><div class='add'>+		if (!pDB)</div><div class='add'>+			goto out3;</div><div class='add'>+		aup-&gt;tx_ring[i]-&gt;addr_0 = (u8)(pDB-&gt;dma_addr &amp; 0xff);</div><div class='add'>+		aup-&gt;tx_ring[i]-&gt;addr_1 = (u8)((pDB-&gt;dma_addr &gt;&gt;  8) &amp; 0xff);</div><div class='add'>+		aup-&gt;tx_ring[i]-&gt;addr_2 = (u8)((pDB-&gt;dma_addr &gt;&gt; 16) &amp; 0xff);</div><div class='add'>+		aup-&gt;tx_ring[i]-&gt;addr_3 = (u8)((pDB-&gt;dma_addr &gt;&gt; 24) &amp; 0xff);</div><div class='add'>+		aup-&gt;tx_ring[i]-&gt;count_0 = 0;</div><div class='add'>+		aup-&gt;tx_ring[i]-&gt;count_1 = 0;</div><div class='add'>+		aup-&gt;tx_ring[i]-&gt;flags = 0;</div><div class='add'>+		aup-&gt;tx_db_inuse[i] = pDB;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out3:</div><div class='add'>+	dma_free((void *)aup-&gt;rx_ring[0],</div><div class='add'>+		2 * MAX_NUM_IR_DESC * (sizeof(struct ring_dest)));</div><div class='add'>+out2:</div><div class='add'>+	kfree(aup-&gt;rx_buff.head);</div><div class='add'>+out1:</div><div class='add'>+	printk(KERN_ERR "au1k_irda_net_init() failed.  Returns %d\n", retval);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit au1k_irda_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct au1k_private *aup;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct resource *r;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dev = alloc_irdadev(sizeof(struct au1k_private));</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	aup = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	aup-&gt;platdata = pdev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	r = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='add'>+	if (!r)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	aup-&gt;irq_tx = r-&gt;start;</div><div class='add'>+</div><div class='add'>+	r = platform_get_resource(pdev, IORESOURCE_IRQ, 1);</div><div class='add'>+	if (!r)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	aup-&gt;irq_rx = r-&gt;start;</div><div class='add'>+</div><div class='add'>+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!r)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = -EBUSY;</div><div class='add'>+	aup-&gt;ioarea = request_mem_region(r-&gt;start, r-&gt;end - r-&gt;start + 1,</div><div class='add'>+					 pdev-&gt;name);</div><div class='add'>+	if (!aup-&gt;ioarea)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	aup-&gt;iobase = ioremap_nocache(r-&gt;start, r-&gt;end - r-&gt;start + 1);</div><div class='add'>+	if (!aup-&gt;iobase)</div><div class='add'>+		goto out2;</div><div class='add'>+</div><div class='add'>+	dev-&gt;irq = aup-&gt;irq_rx;</div><div class='add'>+</div><div class='add'>+	err = au1k_irda_net_init(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out3;</div><div class='add'>+	err = register_netdev(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out4;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, dev);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "IrDA: Registered device %s\n", dev-&gt;name);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out4:</div><div class='add'>+	dma_free((void *)aup-&gt;db[0].vaddr,</div><div class='add'>+		MAX_BUF_SIZE * 2 * NUM_IR_DESC);</div><div class='add'>+	dma_free((void *)aup-&gt;rx_ring[0],</div><div class='add'>+		2 * MAX_NUM_IR_DESC * (sizeof(struct ring_dest)));</div><div class='add'>+	kfree(aup-&gt;rx_buff.head);</div><div class='add'>+out3:</div><div class='add'>+	iounmap(aup-&gt;iobase);</div><div class='add'>+out2:</div><div class='add'>+	release_resource(aup-&gt;ioarea);</div><div class='add'>+	kfree(aup-&gt;ioarea);</div><div class='add'>+out:</div><div class='add'>+	free_netdev(dev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit au1k_irda_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='add'>+	struct au1k_private *aup = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	unregister_netdev(dev);</div><div class='add'>+</div><div class='add'>+	dma_free((void *)aup-&gt;db[0].vaddr,</div><div class='add'>+		MAX_BUF_SIZE * 2 * NUM_IR_DESC);</div><div class='add'>+	dma_free((void *)aup-&gt;rx_ring[0],</div><div class='add'>+		2 * MAX_NUM_IR_DESC * (sizeof(struct ring_dest)));</div><div class='add'>+	kfree(aup-&gt;rx_buff.head);</div><div class='add'>+</div><div class='add'>+	iounmap(aup-&gt;iobase);</div><div class='add'>+	release_resource(aup-&gt;ioarea);</div><div class='add'>+	kfree(aup-&gt;ioarea);</div><div class='add'>+</div><div class='add'>+	free_netdev(dev);</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 au1k_irda_driver = {</div><div class='add'>+	.driver	= {</div><div class='add'>+		.name	= "au1000-irda",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe		= au1k_irda_probe,</div><div class='add'>+	.remove		= __devexit_p(au1k_irda_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init au1k_irda_load(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;au1k_irda_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit au1k_irda_unload(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_unregister(&amp;au1k_irda_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> MODULE_AUTHOR("Pete Popov &lt;ppopov@mvista.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Au1000 IrDA Device Driver");</div><div class='ctx'> </div><div class='del'>-module_init(au1k_irda_init);</div><div class='del'>-module_exit(au1k_irda_exit);</div><div class='add'>+module_init(au1k_irda_load);</div><div class='add'>+module_exit(au1k_irda_unload);</div><div class='head'>diff --git a/drivers/net/irda/bfin_sir.c b/drivers/net/irda/bfin_sir.c<br/>index 9d4ce1aba10c..a561ae44a9ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/bfin_sir.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/bfin_sir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/bfin_sir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/irda/bfin_sir.c</a></div><div class='hunk'>@@ -806,18 +806,7 @@ static struct platform_driver bfin_ir_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init bfin_sir_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;bfin_ir_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit bfin_sir_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;bfin_ir_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(bfin_sir_init);</div><div class='del'>-module_exit(bfin_sir_exit);</div><div class='add'>+module_platform_driver(bfin_ir_driver);</div><div class='ctx'> </div><div class='ctx'> module_param(max_rate, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(max_rate, "Maximum baud rate (115200, 57600, 38400, 19200, 9600)");</div><div class='head'>diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c<br/>index b45b2cc42804..64f403da101c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/donauboe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/donauboe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/donauboe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/irda/donauboe.c</a></div><div class='hunk'>@@ -197,7 +197,7 @@ static char *driver_name = DRIVER_NAME;</div><div class='ctx'> </div><div class='ctx'> static int max_baud = 4000000;</div><div class='ctx'> #ifdef USE_PROBE</div><div class='del'>-static int do_probe = 0;</div><div class='add'>+static bool do_probe = false;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c<br/>index d9267cb98a23..72f687b40d66 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/irda-usb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/irda-usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/irda-usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/irda/irda-usb.c</a></div><div class='hunk'>@@ -1914,41 +1914,8 @@ static struct usb_driver irda_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/************************* MODULE CALLBACKS *************************/</div><div class='del'>-/*</div><div class='del'>- * Deal with module insertion/removal</div><div class='del'>- * Mostly tell USB about our existence</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Module insertion</div><div class='del'>- */</div><div class='del'>-static int __init usb_irda_init(void)</div><div class='del'>-{</div><div class='del'>-	int	ret;</div><div class='del'>-</div><div class='del'>-	ret = usb_register(&amp;irda_driver);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	IRDA_MESSAGE("USB IrDA support registered\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-module_init(usb_irda_init);</div><div class='add'>+module_usb_driver(irda_driver);</div><div class='ctx'> </div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='del'>-/*</div><div class='del'>- * Module removal</div><div class='del'>- */</div><div class='del'>-static void __exit usb_irda_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	/* Deregister the driver and remove all pending instances */</div><div class='del'>-	usb_deregister(&amp;irda_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(usb_irda_cleanup);</div><div class='del'>-</div><div class='del'>-/*------------------------------------------------------------------*/</div><div class='ctx'> /*</div><div class='ctx'>  * Module parameters</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c<br/>index cb90d640007a..79aebeee928c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/kingsun-sir.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/kingsun-sir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/kingsun-sir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/irda/kingsun-sir.c</a></div><div class='hunk'>@@ -621,24 +621,7 @@ static struct usb_driver irda_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Module insertion</div><div class='del'>- */</div><div class='del'>-static int __init kingsun_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;irda_driver);</div><div class='del'>-}</div><div class='del'>-module_init(kingsun_init);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Module removal</div><div class='del'>- */</div><div class='del'>-static void __exit kingsun_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	/* Deregister the driver and remove all pending instances */</div><div class='del'>-	usb_deregister(&amp;irda_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(kingsun_cleanup);</div><div class='add'>+module_usb_driver(irda_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Alex Villacís Lasso &lt;a_villacis@palosanto.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("IrDA-USB Dongle Driver for KingSun/DonShine");</div><div class='head'>diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c<br/>index 1046014dd6c2..abe689dffc72 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/ks959-sir.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/ks959-sir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/ks959-sir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/irda/ks959-sir.c</a></div><div class='hunk'>@@ -901,26 +901,7 @@ static struct usb_driver irda_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Module insertion</div><div class='del'>- */</div><div class='del'>-static int __init ks959_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;irda_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ks959_init);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Module removal</div><div class='del'>- */</div><div class='del'>-static void __exit ks959_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	/* Deregister the driver and remove all pending instances */</div><div class='del'>-	usb_deregister(&amp;irda_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_exit(ks959_cleanup);</div><div class='add'>+module_usb_driver(irda_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Alex Villacís Lasso &lt;a_villacis@palosanto.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("IrDA-USB Dongle Driver for KingSun KS-959");</div><div class='head'>diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c<br/>index 9cc142fcc712..f8c01088eeb7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/ksdazzle-sir.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/ksdazzle-sir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/ksdazzle-sir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/irda/ksdazzle-sir.c</a></div><div class='hunk'>@@ -796,26 +796,7 @@ static struct usb_driver irda_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Module insertion</div><div class='del'>- */</div><div class='del'>-static int __init ksdazzle_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;irda_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ksdazzle_init);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Module removal</div><div class='del'>- */</div><div class='del'>-static void __exit ksdazzle_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	/* Deregister the driver and remove all pending instances */</div><div class='del'>-	usb_deregister(&amp;irda_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_exit(ksdazzle_cleanup);</div><div class='add'>+module_usb_driver(irda_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Alex Villacís Lasso &lt;a_villacis@palosanto.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("IrDA-USB Dongle Driver for KingSun Dazzle");</div><div class='head'>diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c<br/>index be52bfed66a9..1a00b5990cb8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/mcs7780.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/mcs7780.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/mcs7780.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/irda/mcs7780.c</a></div><div class='hunk'>@@ -968,25 +968,4 @@ static void mcs_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	IRDA_DEBUG(0, "MCS7780 now disconnected.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Module insertion */</div><div class='del'>-static int __init mcs_init(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	/* register this driver with the USB subsystem */</div><div class='del'>-	result = usb_register(&amp;mcs_driver);</div><div class='del'>-	if (result)</div><div class='del'>-		IRDA_ERROR("usb_register failed. Error number %d\n", result);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-module_init(mcs_init);</div><div class='del'>-</div><div class='del'>-/* Module removal */</div><div class='del'>-static void __exit mcs_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver with the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;mcs_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(mcs_exit);</div><div class='del'>-</div><div class='add'>+module_usb_driver(mcs_driver);</div><div class='head'>diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c<br/>index b56636da6cc3..2a4f2f153244 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/nsc-ircc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/nsc-ircc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/nsc-ircc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/irda/nsc-ircc.c</a></div><div class='hunk'>@@ -1664,7 +1664,7 @@ static int nsc_ircc_dma_xmit_complete(struct nsc_ircc_cb *self)</div><div class='ctx'> 	switch_bank(iobase, BANK0);</div><div class='ctx'>         outb(inb(iobase+MCR) &amp; ~MCR_DMA_EN, iobase+MCR);</div><div class='ctx'> 	</div><div class='del'>-	/* Check for underrrun! */</div><div class='add'>+	/* Check for underrun! */</div><div class='ctx'> 	if (inb(iobase+ASCR) &amp; ASCR_TXUR) {</div><div class='ctx'> 		self-&gt;netdev-&gt;stats.tx_errors++;</div><div class='ctx'> 		self-&gt;netdev-&gt;stats.tx_fifo_errors++;</div><div class='head'>diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c<br/>index d0851dfa0378..81d5275a15e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/pxaficp_ir.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/pxaficp_ir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/pxaficp_ir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/irda/pxaficp_ir.c</a></div><div class='hunk'>@@ -966,18 +966,7 @@ static struct platform_driver pxa_ir_driver = {</div><div class='ctx'> 	.resume		= pxa_irda_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pxa_irda_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pxa_ir_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit pxa_irda_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pxa_ir_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(pxa_irda_init);</div><div class='del'>-module_exit(pxa_irda_exit);</div><div class='add'>+module_platform_driver(pxa_ir_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS("platform:pxa2xx-ir");</div><div class='head'>diff --git a/drivers/net/irda/sh_irda.c b/drivers/net/irda/sh_irda.c<br/>index d275e276e742..725d6b367822 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/sh_irda.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/sh_irda.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/sh_irda.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/irda/sh_irda.c</a></div><div class='hunk'>@@ -873,18 +873,7 @@ static struct platform_driver sh_irda_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sh_irda_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sh_irda_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sh_irda_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sh_irda_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sh_irda_init);</div><div class='del'>-module_exit(sh_irda_exit);</div><div class='add'>+module_platform_driver(sh_irda_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Kuninori Morimoto &lt;kuninori.morimoto.gx@renesas.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("SuperH IrDA driver");</div><div class='head'>diff --git a/drivers/net/irda/sh_sir.c b/drivers/net/irda/sh_sir.c<br/>index ed7d7d62bf68..e6661b5c1f83 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/sh_sir.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/sh_sir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/sh_sir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/irda/sh_sir.c</a></div><div class='hunk'>@@ -808,18 +808,7 @@ static struct platform_driver sh_sir_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sh_sir_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sh_sir_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sh_sir_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sh_sir_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sh_sir_init);</div><div class='del'>-module_exit(sh_sir_exit);</div><div class='add'>+module_platform_driver(sh_sir_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Kuninori Morimoto &lt;morimoto.kuninori@renesas.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("SuperH IrDA driver");</div><div class='head'>diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c<br/>index 8b1c3484d271..6c95d4087b2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/smsc-ircc2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/smsc-ircc2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/smsc-ircc2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/irda/smsc-ircc2.c</a></div><div class='hunk'>@@ -79,7 +79,7 @@ MODULE_AUTHOR("Daniele Peri &lt;peri@csai.unipa.it&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("SMC IrCC SIR/FIR controller driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static int smsc_nopnp = 1;</div><div class='add'>+static bool smsc_nopnp = true;</div><div class='ctx'> module_param_named(nopnp, smsc_nopnp, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(nopnp, "Do not use PNP to detect controller settings, defaults to true");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c<br/>index 41c96b3d8152..e6e59a078ef4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/stir4200.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/stir4200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/stir4200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/irda/stir4200.c</a></div><div class='hunk'>@@ -750,7 +750,7 @@ static int stir_transmit_thread(void *arg)</div><div class='ctx'> </div><div class='ctx'> 			write_reg(stir, REG_CTRL1, CTRL1_TXPWD|CTRL1_RXPWD);</div><div class='ctx'> </div><div class='del'>-			refrigerator();</div><div class='add'>+			try_to_freeze();</div><div class='ctx'> </div><div class='ctx'> 			if (change_speed(stir, stir-&gt;speed))</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1133,21 +1133,4 @@ static struct usb_driver irda_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Module insertion</div><div class='del'>- */</div><div class='del'>-static int __init stir_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;irda_driver);</div><div class='del'>-}</div><div class='del'>-module_init(stir_init);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Module removal</div><div class='del'>- */</div><div class='del'>-static void __exit stir_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	/* Deregister the driver and remove all pending instances */</div><div class='del'>-	usb_deregister(&amp;irda_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(stir_cleanup);</div><div class='add'>+module_usb_driver(irda_driver);</div><div class='head'>diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c<br/>index 6d6479049aa1..2d456dd164fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/via-ircc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/via-ircc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/via-ircc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/irda/via-ircc.c</a></div><div class='hunk'>@@ -942,14 +942,14 @@ static int via_ircc_dma_xmit_complete(struct via_ircc_cb *self)</div><div class='ctx'> 	iobase = self-&gt;io.fir_base;</div><div class='ctx'> 	/* Disable DMA */</div><div class='ctx'> //      DisableDmaChannel(self-&gt;io.dma);</div><div class='del'>-	/* Check for underrrun! */</div><div class='add'>+	/* Check for underrun! */</div><div class='ctx'> 	/* Clear bit, by writing 1 into it */</div><div class='ctx'> 	Tx_status = GetTXStatus(iobase);</div><div class='ctx'> 	if (Tx_status &amp; 0x08) {</div><div class='ctx'> 		self-&gt;netdev-&gt;stats.tx_errors++;</div><div class='ctx'> 		self-&gt;netdev-&gt;stats.tx_fifo_errors++;</div><div class='ctx'> 		hwreset(self);</div><div class='del'>-// how to clear underrrun ?</div><div class='add'>+	/* how to clear underrun? */</div><div class='ctx'> 	} else {</div><div class='ctx'> 		self-&gt;netdev-&gt;stats.tx_packets++;</div><div class='ctx'> 		ResetChip(iobase, 3);</div><div class='head'>diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c<br/>index c4366601b067..7d43506c7032 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/w83977af_ir.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/irda/w83977af_ir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/w83977af_ir.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/irda/w83977af_ir.c</a></div><div class='hunk'>@@ -677,7 +677,7 @@ static void w83977af_dma_xmit_complete(struct w83977af_ir *self)</div><div class='ctx'> 	switch_bank(iobase, SET0);</div><div class='ctx'> 	outb(inb(iobase+HCR) &amp; ~HCR_EN_DMA, iobase+HCR);</div><div class='ctx'> 	</div><div class='del'>-	/* Check for underrrun! */</div><div class='add'>+	/* Check for underrun! */</div><div class='ctx'> 	if (inb(iobase+AUDR) &amp; AUDR_UNDR) {</div><div class='ctx'> 		IRDA_DEBUG(0, "%s(), Transmit underrun!\n", __func__ );</div><div class='ctx'> 		</div><div class='head'>diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c<br/>index 4ce9e5f2c069..b71998d0b5b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/loopback.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/loopback.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/loopback.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/loopback.c</a></div><div class='hunk'>@@ -169,7 +169,7 @@ static void loopback_setup(struct net_device *dev)</div><div class='ctx'> 	dev-&gt;features 		= NETIF_F_SG | NETIF_F_FRAGLIST</div><div class='ctx'> 		| NETIF_F_ALL_TSO</div><div class='ctx'> 		| NETIF_F_UFO</div><div class='del'>-		| NETIF_F_NO_CSUM</div><div class='add'>+		| NETIF_F_HW_CSUM</div><div class='ctx'> 		| NETIF_F_RXCSUM</div><div class='ctx'> 		| NETIF_F_HIGHDMA</div><div class='ctx'> 		| NETIF_F_LLTX</div><div class='head'>diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c<br/>index 74134970b709..f2f820c4b40a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/macvlan.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/macvlan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/macvlan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/macvlan.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/if_link.h&gt;</div><div class='ctx'> #include &lt;linux/if_macvlan.h&gt;</div><div class='ctx'> #include &lt;net/rtnetlink.h&gt;</div><div class='hunk'>@@ -520,26 +521,23 @@ static struct rtnl_link_stats64 *macvlan_dev_get_stats64(struct net_device *dev,</div><div class='ctx'> 	return stats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void macvlan_vlan_rx_add_vid(struct net_device *dev,</div><div class='add'>+static int macvlan_vlan_rx_add_vid(struct net_device *dev,</div><div class='ctx'> 				    unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct macvlan_dev *vlan = netdev_priv(dev);</div><div class='ctx'> 	struct net_device *lowerdev = vlan-&gt;lowerdev;</div><div class='del'>-	const struct net_device_ops *ops = lowerdev-&gt;netdev_ops;</div><div class='ctx'> </div><div class='del'>-	if (ops-&gt;ndo_vlan_rx_add_vid)</div><div class='del'>-		ops-&gt;ndo_vlan_rx_add_vid(lowerdev, vid);</div><div class='add'>+	return vlan_vid_add(lowerdev, vid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void macvlan_vlan_rx_kill_vid(struct net_device *dev,</div><div class='add'>+static int macvlan_vlan_rx_kill_vid(struct net_device *dev,</div><div class='ctx'> 				     unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct macvlan_dev *vlan = netdev_priv(dev);</div><div class='ctx'> 	struct net_device *lowerdev = vlan-&gt;lowerdev;</div><div class='del'>-	const struct net_device_ops *ops = lowerdev-&gt;netdev_ops;</div><div class='ctx'> </div><div class='del'>-	if (ops-&gt;ndo_vlan_rx_kill_vid)</div><div class='del'>-		ops-&gt;ndo_vlan_rx_kill_vid(lowerdev, vid);</div><div class='add'>+	vlan_vid_del(lowerdev, vid);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void macvlan_ethtool_get_drvinfo(struct net_device *dev,</div><div class='head'>diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c<br/>index 1b7082d08f33..58dc117a8d78 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/macvtap.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/macvtap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/macvtap.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/macvtap.c</a></div><div class='hunk'>@@ -145,8 +145,8 @@ static void macvtap_put_queue(struct macvtap_queue *q)</div><div class='ctx'> 	if (vlan) {</div><div class='ctx'> 		int index = get_slot(vlan, q);</div><div class='ctx'> </div><div class='del'>-		rcu_assign_pointer(vlan-&gt;taps[index], NULL);</div><div class='del'>-		rcu_assign_pointer(q-&gt;vlan, NULL);</div><div class='add'>+		RCU_INIT_POINTER(vlan-&gt;taps[index], NULL);</div><div class='add'>+		RCU_INIT_POINTER(q-&gt;vlan, NULL);</div><div class='ctx'> 		sock_put(&amp;q-&gt;sk);</div><div class='ctx'> 		--vlan-&gt;numvtaps;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -175,6 +175,14 @@ static struct macvtap_queue *macvtap_get_queue(struct net_device *dev,</div><div class='ctx'> 	if (!numvtaps)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	/* Check if we can use flow to select a queue */</div><div class='add'>+	rxq = skb_get_rxhash(skb);</div><div class='add'>+	if (rxq) {</div><div class='add'>+		tap = rcu_dereference(vlan-&gt;taps[rxq % numvtaps]);</div><div class='add'>+		if (tap)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (likely(skb_rx_queue_recorded(skb))) {</div><div class='ctx'> 		rxq = skb_get_rx_queue(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -186,14 +194,6 @@ static struct macvtap_queue *macvtap_get_queue(struct net_device *dev,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Check if we can use flow to select a queue */</div><div class='del'>-	rxq = skb_get_rxhash(skb);</div><div class='del'>-	if (rxq) {</div><div class='del'>-		tap = rcu_dereference(vlan-&gt;taps[rxq % numvtaps]);</div><div class='del'>-		if (tap)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Everything failed - find first available queue */</div><div class='ctx'> 	for (rxq = 0; rxq &lt; MAX_MACVTAP_QUEUES; rxq++) {</div><div class='ctx'> 		tap = rcu_dereference(vlan-&gt;taps[rxq]);</div><div class='hunk'>@@ -223,8 +223,8 @@ static void macvtap_del_queues(struct net_device *dev)</div><div class='ctx'> 					      lockdep_is_held(&amp;macvtap_lock));</div><div class='ctx'> 		if (q) {</div><div class='ctx'> 			qlist[j++] = q;</div><div class='del'>-			rcu_assign_pointer(vlan-&gt;taps[i], NULL);</div><div class='del'>-			rcu_assign_pointer(q-&gt;vlan, NULL);</div><div class='add'>+			RCU_INIT_POINTER(vlan-&gt;taps[i], NULL);</div><div class='add'>+			RCU_INIT_POINTER(q-&gt;vlan, NULL);</div><div class='ctx'> 			vlan-&gt;numvtaps--;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/mii.c b/drivers/net/mii.c<br/>index c62e7816d548..c70c2332d15e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/mii.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/mii.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/mii.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/mii.c</a></div><div class='hunk'>@@ -35,26 +35,11 @@</div><div class='ctx'> </div><div class='ctx'> static u32 mii_get_an(struct mii_if_info *mii, u16 addr)</div><div class='ctx'> {</div><div class='del'>-	u32 result = 0;</div><div class='ctx'> 	int advert;</div><div class='ctx'> </div><div class='ctx'> 	advert = mii-&gt;mdio_read(mii-&gt;dev, mii-&gt;phy_id, addr);</div><div class='del'>-	if (advert &amp; LPA_LPACK)</div><div class='del'>-		result |= ADVERTISED_Autoneg;</div><div class='del'>-	if (advert &amp; ADVERTISE_10HALF)</div><div class='del'>-		result |= ADVERTISED_10baseT_Half;</div><div class='del'>-	if (advert &amp; ADVERTISE_10FULL)</div><div class='del'>-		result |= ADVERTISED_10baseT_Full;</div><div class='del'>-	if (advert &amp; ADVERTISE_100HALF)</div><div class='del'>-		result |= ADVERTISED_100baseT_Half;</div><div class='del'>-	if (advert &amp; ADVERTISE_100FULL)</div><div class='del'>-		result |= ADVERTISED_100baseT_Full;</div><div class='del'>-	if (advert &amp; ADVERTISE_PAUSE_CAP)</div><div class='del'>-		result |= ADVERTISED_Pause;</div><div class='del'>-	if (advert &amp; ADVERTISE_PAUSE_ASYM)</div><div class='del'>-		result |= ADVERTISED_Asym_Pause;</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='add'>+</div><div class='add'>+	return mii_lpa_to_ethtool_lpa_t(advert);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -104,19 +89,14 @@ int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd)</div><div class='ctx'> 		ecmd-&gt;autoneg = AUTONEG_ENABLE;</div><div class='ctx'> </div><div class='ctx'> 		ecmd-&gt;advertising |= mii_get_an(mii, MII_ADVERTISE);</div><div class='del'>-		if (ctrl1000 &amp; ADVERTISE_1000HALF)</div><div class='del'>-			ecmd-&gt;advertising |= ADVERTISED_1000baseT_Half;</div><div class='del'>-		if (ctrl1000 &amp; ADVERTISE_1000FULL)</div><div class='del'>-			ecmd-&gt;advertising |= ADVERTISED_1000baseT_Full;</div><div class='add'>+		if (mii-&gt;supports_gmii)</div><div class='add'>+			ecmd-&gt;advertising |=</div><div class='add'>+					mii_ctrl1000_to_ethtool_adv_t(ctrl1000);</div><div class='ctx'> </div><div class='ctx'> 		if (bmsr &amp; BMSR_ANEGCOMPLETE) {</div><div class='ctx'> 			ecmd-&gt;lp_advertising = mii_get_an(mii, MII_LPA);</div><div class='del'>-			if (stat1000 &amp; LPA_1000HALF)</div><div class='del'>-				ecmd-&gt;lp_advertising |=</div><div class='del'>-					ADVERTISED_1000baseT_Half;</div><div class='del'>-			if (stat1000 &amp; LPA_1000FULL)</div><div class='del'>-				ecmd-&gt;lp_advertising |=</div><div class='del'>-					ADVERTISED_1000baseT_Full;</div><div class='add'>+			ecmd-&gt;lp_advertising |=</div><div class='add'>+					mii_stat1000_to_ethtool_lpa_t(stat1000);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ecmd-&gt;lp_advertising = 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -204,20 +184,11 @@ int mii_ethtool_sset(struct mii_if_info *mii, struct ethtool_cmd *ecmd)</div><div class='ctx'> 			advert2 = mii-&gt;mdio_read(dev, mii-&gt;phy_id, MII_CTRL1000);</div><div class='ctx'> 			tmp2 = advert2 &amp; ~(ADVERTISE_1000HALF | ADVERTISE_1000FULL);</div><div class='ctx'> 		}</div><div class='del'>-		if (ecmd-&gt;advertising &amp; ADVERTISED_10baseT_Half)</div><div class='del'>-			tmp |= ADVERTISE_10HALF;</div><div class='del'>-		if (ecmd-&gt;advertising &amp; ADVERTISED_10baseT_Full)</div><div class='del'>-			tmp |= ADVERTISE_10FULL;</div><div class='del'>-		if (ecmd-&gt;advertising &amp; ADVERTISED_100baseT_Half)</div><div class='del'>-			tmp |= ADVERTISE_100HALF;</div><div class='del'>-		if (ecmd-&gt;advertising &amp; ADVERTISED_100baseT_Full)</div><div class='del'>-			tmp |= ADVERTISE_100FULL;</div><div class='del'>-		if (mii-&gt;supports_gmii) {</div><div class='del'>-			if (ecmd-&gt;advertising &amp; ADVERTISED_1000baseT_Half)</div><div class='del'>-				tmp2 |= ADVERTISE_1000HALF;</div><div class='del'>-			if (ecmd-&gt;advertising &amp; ADVERTISED_1000baseT_Full)</div><div class='del'>-				tmp2 |= ADVERTISE_1000FULL;</div><div class='del'>-		}</div><div class='add'>+		tmp |= ethtool_adv_to_mii_adv_t(ecmd-&gt;advertising);</div><div class='add'>+</div><div class='add'>+		if (mii-&gt;supports_gmii)</div><div class='add'>+			tmp2 |=</div><div class='add'>+			      ethtool_adv_to_mii_ctrl1000_t(ecmd-&gt;advertising);</div><div class='ctx'> 		if (advert != tmp) {</div><div class='ctx'> 			mii-&gt;mdio_write(dev, mii-&gt;phy_id, MII_ADVERTISE, tmp);</div><div class='ctx'> 			mii-&gt;advertising = tmp;</div><div class='head'>diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig<br/>index a70244306c94..fbdcdf83cbfd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/phy/Kconfig</a></div><div class='hunk'>@@ -131,3 +131,7 @@ config MDIO_OCTEON</div><div class='ctx'> 	  If in doubt, say Y.</div><div class='ctx'> </div><div class='ctx'> endif # PHYLIB</div><div class='add'>+</div><div class='add'>+config MICREL_KS8995MA</div><div class='add'>+	tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch"</div><div class='add'>+	depends on SPI</div><div class='head'>diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile<br/>index 2333215bbb32..e15c83fecbe0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/phy/Makefile</a></div><div class='hunk'>@@ -23,3 +23,4 @@ obj-$(CONFIG_DP83640_PHY)	+= dp83640.o</div><div class='ctx'> obj-$(CONFIG_STE10XP)		+= ste10Xp.o</div><div class='ctx'> obj-$(CONFIG_MICREL_PHY)	+= micrel.o</div><div class='ctx'> obj-$(CONFIG_MDIO_OCTEON)	+= mdio-octeon.o</div><div class='add'>+obj-$(CONFIG_MICREL_KS8995MA)	+= spi_ks8995.o</div><div class='head'>diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c<br/>index 9663e0ba6003..ba3c59147aa7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/dp83640.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/dp83640.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/dp83640.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/phy/dp83640.c</a></div><div class='hunk'>@@ -1159,7 +1159,7 @@ static void rx_timestamp_work(struct work_struct *work)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;dp83640-&gt;rx_lock, flags);</div><div class='del'>-		netif_rx(skb);</div><div class='add'>+		netif_rx_ni(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Clear out expired time stamps. */</div><div class='head'>diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c<br/>index 1fa4d73c3cca..633680d0828e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/fixed.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/fixed.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/fixed.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/phy/fixed.c</a></div><div class='hunk'>@@ -220,7 +220,7 @@ static int __init fixed_mdio_bus_init(void)</div><div class='ctx'> 		goto err_mdiobus_reg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snprintf(fmb-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "0");</div><div class='add'>+	snprintf(fmb-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "fixed-0");</div><div class='ctx'> 	fmb-&gt;mii_bus-&gt;name = "Fixed MDIO Bus";</div><div class='ctx'> 	fmb-&gt;mii_bus-&gt;priv = fmb;</div><div class='ctx'> 	fmb-&gt;mii_bus-&gt;parent = &amp;pdev-&gt;dev;</div><div class='head'>diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c<br/>index 65391891d8c4..daec9b05d168 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/mdio-bitbang.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/mdio-bitbang.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/mdio-bitbang.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/phy/mdio-bitbang.c</a></div><div class='hunk'>@@ -202,6 +202,14 @@ static int mdiobb_write(struct mii_bus *bus, int phy, int reg, u16 val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mdiobb_reset(struct mii_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct mdiobb_ctrl *ctrl = bus-&gt;priv;</div><div class='add'>+	if (ctrl-&gt;reset)</div><div class='add'>+		ctrl-&gt;reset(bus);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct mii_bus *alloc_mdio_bitbang(struct mdiobb_ctrl *ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	struct mii_bus *bus;</div><div class='hunk'>@@ -214,6 +222,7 @@ struct mii_bus *alloc_mdio_bitbang(struct mdiobb_ctrl *ctrl)</div><div class='ctx'> </div><div class='ctx'> 	bus-&gt;read = mdiobb_read;</div><div class='ctx'> 	bus-&gt;write = mdiobb_write;</div><div class='add'>+	bus-&gt;reset = mdiobb_reset;</div><div class='ctx'> 	bus-&gt;priv = ctrl;</div><div class='ctx'> </div><div class='ctx'> 	return bus;</div><div class='head'>diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c<br/>index 2843c90f712f..50e8e5e74465 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/mdio-gpio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/mdio-gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/mdio-gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/phy/mdio-gpio.c</a></div><div class='hunk'>@@ -95,6 +95,7 @@ static struct mii_bus * __devinit mdio_gpio_bus_init(struct device *dev,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	bitbang-&gt;ctrl.ops = &amp;mdio_gpio_ops;</div><div class='add'>+	bitbang-&gt;ctrl.reset = pdata-&gt;reset;</div><div class='ctx'> 	bitbang-&gt;mdc = pdata-&gt;mdc;</div><div class='ctx'> 	bitbang-&gt;mdio = pdata-&gt;mdio;</div><div class='ctx'> </div><div class='hunk'>@@ -115,7 +116,7 @@ static struct mii_bus * __devinit mdio_gpio_bus_init(struct device *dev,</div><div class='ctx'> 		if (!new_bus-&gt;irq[i])</div><div class='ctx'> 			new_bus-&gt;irq[i] = PHY_POLL;</div><div class='ctx'> </div><div class='del'>-	snprintf(new_bus-&gt;id, MII_BUS_ID_SIZE, "%x", bus_id);</div><div class='add'>+	snprintf(new_bus-&gt;id, MII_BUS_ID_SIZE, "gpio-%x", bus_id);</div><div class='ctx'> </div><div class='ctx'> 	if (gpio_request(bitbang-&gt;mdc, "mdc"))</div><div class='ctx'> 		goto out_free_bus;</div><div class='head'>diff --git a/drivers/net/phy/mdio-octeon.c b/drivers/net/phy/mdio-octeon.c<br/>index bd12ba941be5..826d961f39f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/mdio-octeon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/mdio-octeon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/mdio-octeon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/phy/mdio-octeon.c</a></div><div class='hunk'>@@ -118,7 +118,8 @@ static int __devinit octeon_mdiobus_probe(struct platform_device *pdev)</div><div class='ctx'> 	bus-&gt;mii_bus-&gt;priv = bus;</div><div class='ctx'> 	bus-&gt;mii_bus-&gt;irq = bus-&gt;phy_irq;</div><div class='ctx'> 	bus-&gt;mii_bus-&gt;name = "mdio-octeon";</div><div class='del'>-	snprintf(bus-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%x", bus-&gt;unit);</div><div class='add'>+	snprintf(bus-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%s-%x",</div><div class='add'>+		bus-&gt;mii_bus-&gt;name, bus-&gt;unit);</div><div class='ctx'> 	bus-&gt;mii_bus-&gt;parent = &amp;pdev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	bus-&gt;mii_bus-&gt;read = octeon_mdiobus_read;</div><div class='head'>diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c<br/>index 6c58da2b882c..88cc5db9affd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/mdio_bus.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/mdio_bus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/mdio_bus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/phy/mdio_bus.c</a></div><div class='hunk'>@@ -37,22 +37,36 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * mdiobus_alloc - allocate a mii_bus structure</div><div class='add'>+ * mdiobus_alloc_size - allocate a mii_bus structure</div><div class='ctx'>  *</div><div class='ctx'>  * Description: called by a bus driver to allocate an mii_bus</div><div class='ctx'>  * structure to fill in.</div><div class='add'>+ *</div><div class='add'>+ * 'size' is an an extra amount of memory to allocate for private storage.</div><div class='add'>+ * If non-zero, then bus-&gt;priv is points to that memory.</div><div class='ctx'>  */</div><div class='del'>-struct mii_bus *mdiobus_alloc(void)</div><div class='add'>+struct mii_bus *mdiobus_alloc_size(size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	struct mii_bus *bus;</div><div class='add'>+	size_t aligned_size = ALIGN(sizeof(*bus), NETDEV_ALIGN);</div><div class='add'>+	size_t alloc_size;</div><div class='add'>+</div><div class='add'>+	/* If we alloc extra space, it should be aligned */</div><div class='add'>+	if (size)</div><div class='add'>+		alloc_size = aligned_size + size;</div><div class='add'>+	else</div><div class='add'>+		alloc_size = sizeof(*bus);</div><div class='ctx'> </div><div class='del'>-	bus = kzalloc(sizeof(*bus), GFP_KERNEL);</div><div class='del'>-	if (bus != NULL)</div><div class='add'>+	bus = kzalloc(alloc_size, GFP_KERNEL);</div><div class='add'>+	if (bus) {</div><div class='ctx'> 		bus-&gt;state = MDIOBUS_ALLOCATED;</div><div class='add'>+		if (size)</div><div class='add'>+			bus-&gt;priv = (void *)bus + aligned_size;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return bus;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(mdiobus_alloc);</div><div class='add'>+EXPORT_SYMBOL(mdiobus_alloc_size);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * mdiobus_release - mii_bus device release callback</div><div class='head'>diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c<br/>index 83a5a5afec67..f320f466f03b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/phy_device.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/phy_device.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/phy_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/phy/phy_device.c</a></div><div class='hunk'>@@ -563,20 +563,9 @@ static int genphy_config_advert(struct phy_device *phydev)</div><div class='ctx'> 	if (adv &lt; 0)</div><div class='ctx'> 		return adv;</div><div class='ctx'> </div><div class='del'>-	adv &amp;= ~(ADVERTISE_ALL | ADVERTISE_100BASE4 | ADVERTISE_PAUSE_CAP | </div><div class='add'>+	adv &amp;= ~(ADVERTISE_ALL | ADVERTISE_100BASE4 | ADVERTISE_PAUSE_CAP |</div><div class='ctx'> 		 ADVERTISE_PAUSE_ASYM);</div><div class='del'>-	if (advertise &amp; ADVERTISED_10baseT_Half)</div><div class='del'>-		adv |= ADVERTISE_10HALF;</div><div class='del'>-	if (advertise &amp; ADVERTISED_10baseT_Full)</div><div class='del'>-		adv |= ADVERTISE_10FULL;</div><div class='del'>-	if (advertise &amp; ADVERTISED_100baseT_Half)</div><div class='del'>-		adv |= ADVERTISE_100HALF;</div><div class='del'>-	if (advertise &amp; ADVERTISED_100baseT_Full)</div><div class='del'>-		adv |= ADVERTISE_100FULL;</div><div class='del'>-	if (advertise &amp; ADVERTISED_Pause)</div><div class='del'>-		adv |= ADVERTISE_PAUSE_CAP;</div><div class='del'>-	if (advertise &amp; ADVERTISED_Asym_Pause)</div><div class='del'>-		adv |= ADVERTISE_PAUSE_ASYM;</div><div class='add'>+	adv |= ethtool_adv_to_mii_adv_t(advertise);</div><div class='ctx'> </div><div class='ctx'> 	if (adv != oldadv) {</div><div class='ctx'> 		err = phy_write(phydev, MII_ADVERTISE, adv);</div><div class='hunk'>@@ -595,10 +584,7 @@ static int genphy_config_advert(struct phy_device *phydev)</div><div class='ctx'> 			return adv;</div><div class='ctx'> </div><div class='ctx'> 		adv &amp;= ~(ADVERTISE_1000FULL | ADVERTISE_1000HALF);</div><div class='del'>-		if (advertise &amp; SUPPORTED_1000baseT_Half)</div><div class='del'>-			adv |= ADVERTISE_1000HALF;</div><div class='del'>-		if (advertise &amp; SUPPORTED_1000baseT_Full)</div><div class='del'>-			adv |= ADVERTISE_1000FULL;</div><div class='add'>+		adv |= ethtool_adv_to_mii_ctrl1000_t(advertise);</div><div class='ctx'> </div><div class='ctx'> 		if (adv != oldadv) {</div><div class='ctx'> 			err = phy_write(phydev, MII_CTRL1000, adv);</div><div class='head'>diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c<br/>index 342505c976d6..fc3e7e96c88c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/smsc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/phy/smsc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/smsc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/phy/smsc.c</a></div><div class='hunk'>@@ -22,26 +22,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/netdevice.h&gt;</div><div class='del'>-</div><div class='del'>-#define MII_LAN83C185_ISF 29 /* Interrupt Source Flags */</div><div class='del'>-#define MII_LAN83C185_IM  30 /* Interrupt Mask */</div><div class='del'>-#define MII_LAN83C185_CTRL_STATUS 17 /* Mode/Status Register */</div><div class='del'>-</div><div class='del'>-#define MII_LAN83C185_ISF_INT1 (1&lt;&lt;1) /* Auto-Negotiation Page Received */</div><div class='del'>-#define MII_LAN83C185_ISF_INT2 (1&lt;&lt;2) /* Parallel Detection Fault */</div><div class='del'>-#define MII_LAN83C185_ISF_INT3 (1&lt;&lt;3) /* Auto-Negotiation LP Ack */</div><div class='del'>-#define MII_LAN83C185_ISF_INT4 (1&lt;&lt;4) /* Link Down */</div><div class='del'>-#define MII_LAN83C185_ISF_INT5 (1&lt;&lt;5) /* Remote Fault Detected */</div><div class='del'>-#define MII_LAN83C185_ISF_INT6 (1&lt;&lt;6) /* Auto-Negotiation complete */</div><div class='del'>-#define MII_LAN83C185_ISF_INT7 (1&lt;&lt;7) /* ENERGYON */</div><div class='del'>-</div><div class='del'>-#define MII_LAN83C185_ISF_INT_ALL (0x0e)</div><div class='del'>-</div><div class='del'>-#define MII_LAN83C185_ISF_INT_PHYLIB_EVENTS \</div><div class='del'>-	(MII_LAN83C185_ISF_INT6 | MII_LAN83C185_ISF_INT4 | \</div><div class='del'>-	 MII_LAN83C185_ISF_INT7)</div><div class='del'>-</div><div class='del'>-#define MII_LAN83C185_EDPWRDOWN	(1 &lt;&lt; 13) /* EDPWRDOWN */</div><div class='add'>+#include &lt;linux/smscphy.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int smsc_phy_config_intr(struct phy_device *phydev)</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/>new file mode 100644<br/>index 000000000000..116a2dd7c879<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/spi_ks8995.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/phy/spi_ks8995.c</a></div><div class='hunk'>@@ -0,0 +1,375 @@</div><div class='add'>+/*</div><div class='add'>+ * SPI driver for Micrel/Kendin KS8995M ethernet switch</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Gabor Juhos &lt;juhosg at openwrt.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file was based on: drivers/spi/at25.c</div><div class='add'>+ *     Copyright (C) 2006 David Brownell</div><div class='add'>+ *</div><div class='add'>+ * 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 version 2 as published</div><div class='add'>+ * by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRV_VERSION		"0.1.1"</div><div class='add'>+#define DRV_DESC		"Micrel KS8995 Ethernet switch SPI driver"</div><div class='add'>+</div><div class='add'>+/* ------------------------------------------------------------------------ */</div><div class='add'>+</div><div class='add'>+#define KS8995_REG_ID0		0x00    /* Chip ID0 */</div><div class='add'>+#define KS8995_REG_ID1		0x01    /* Chip ID1 */</div><div class='add'>+</div><div class='add'>+#define KS8995_REG_GC0		0x02    /* Global Control 0 */</div><div class='add'>+#define KS8995_REG_GC1		0x03    /* Global Control 1 */</div><div class='add'>+#define KS8995_REG_GC2		0x04    /* Global Control 2 */</div><div class='add'>+#define KS8995_REG_GC3		0x05    /* Global Control 3 */</div><div class='add'>+#define KS8995_REG_GC4		0x06    /* Global Control 4 */</div><div class='add'>+#define KS8995_REG_GC5		0x07    /* Global Control 5 */</div><div class='add'>+#define KS8995_REG_GC6		0x08    /* Global Control 6 */</div><div class='add'>+#define KS8995_REG_GC7		0x09    /* Global Control 7 */</div><div class='add'>+#define KS8995_REG_GC8		0x0a    /* Global Control 8 */</div><div class='add'>+#define KS8995_REG_GC9		0x0b    /* Global Control 9 */</div><div class='add'>+</div><div class='add'>+#define KS8995_REG_PC(p, r)	((0x10 * p) + r)	 /* Port Control */</div><div class='add'>+#define KS8995_REG_PS(p, r)	((0x10 * p) + r + 0xe)  /* Port Status */</div><div class='add'>+</div><div class='add'>+#define KS8995_REG_TPC0		0x60    /* TOS Priority Control 0 */</div><div class='add'>+#define KS8995_REG_TPC1		0x61    /* TOS Priority Control 1 */</div><div class='add'>+#define KS8995_REG_TPC2		0x62    /* TOS Priority Control 2 */</div><div class='add'>+#define KS8995_REG_TPC3		0x63    /* TOS Priority Control 3 */</div><div class='add'>+#define KS8995_REG_TPC4		0x64    /* TOS Priority Control 4 */</div><div class='add'>+#define KS8995_REG_TPC5		0x65    /* TOS Priority Control 5 */</div><div class='add'>+#define KS8995_REG_TPC6		0x66    /* TOS Priority Control 6 */</div><div class='add'>+#define KS8995_REG_TPC7		0x67    /* TOS Priority Control 7 */</div><div class='add'>+</div><div class='add'>+#define KS8995_REG_MAC0		0x68    /* MAC address 0 */</div><div class='add'>+#define KS8995_REG_MAC1		0x69    /* MAC address 1 */</div><div class='add'>+#define KS8995_REG_MAC2		0x6a    /* MAC address 2 */</div><div class='add'>+#define KS8995_REG_MAC3		0x6b    /* MAC address 3 */</div><div class='add'>+#define KS8995_REG_MAC4		0x6c    /* MAC address 4 */</div><div class='add'>+#define KS8995_REG_MAC5		0x6d    /* MAC address 5 */</div><div class='add'>+</div><div class='add'>+#define KS8995_REG_IAC0		0x6e    /* Indirect Access Control 0 */</div><div class='add'>+#define KS8995_REG_IAC1		0x6f    /* Indirect Access Control 0 */</div><div class='add'>+#define KS8995_REG_IAD7		0x70    /* Indirect Access Data 7 */</div><div class='add'>+#define KS8995_REG_IAD6		0x71    /* Indirect Access Data 6 */</div><div class='add'>+#define KS8995_REG_IAD5		0x72    /* Indirect Access Data 5 */</div><div class='add'>+#define KS8995_REG_IAD4		0x73    /* Indirect Access Data 4 */</div><div class='add'>+#define KS8995_REG_IAD3		0x74    /* Indirect Access Data 3 */</div><div class='add'>+#define KS8995_REG_IAD2		0x75    /* Indirect Access Data 2 */</div><div class='add'>+#define KS8995_REG_IAD1		0x76    /* Indirect Access Data 1 */</div><div class='add'>+#define KS8995_REG_IAD0		0x77    /* Indirect Access Data 0 */</div><div class='add'>+</div><div class='add'>+#define KS8995_REGS_SIZE	0x80</div><div class='add'>+</div><div class='add'>+#define ID1_CHIPID_M		0xf</div><div class='add'>+#define ID1_CHIPID_S		4</div><div class='add'>+#define ID1_REVISION_M		0x7</div><div class='add'>+#define ID1_REVISION_S		1</div><div class='add'>+#define ID1_START_SW		1	/* start the switch */</div><div class='add'>+</div><div class='add'>+#define FAMILY_KS8995		0x95</div><div class='add'>+#define CHIPID_M		0</div><div class='add'>+</div><div class='add'>+#define KS8995_CMD_WRITE	0x02U</div><div class='add'>+#define KS8995_CMD_READ		0x03U</div><div class='add'>+</div><div class='add'>+#define KS8995_RESET_DELAY	10 /* usec */</div><div class='add'>+</div><div class='add'>+struct ks8995_pdata {</div><div class='add'>+	/* not yet implemented */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ks8995_switch {</div><div class='add'>+	struct spi_device	*spi;</div><div class='add'>+	struct mutex		lock;</div><div class='add'>+	struct ks8995_pdata	*pdata;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u8 get_chip_id(u8 val)</div><div class='add'>+{</div><div class='add'>+	return (val &gt;&gt; ID1_CHIPID_S) &amp; ID1_CHIPID_M;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 get_chip_rev(u8 val)</div><div class='add'>+{</div><div class='add'>+	return (val &gt;&gt; ID1_REVISION_S) &amp; ID1_REVISION_M;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ------------------------------------------------------------------------ */</div><div class='add'>+static int ks8995_read(struct ks8995_switch *ks, char *buf,</div><div class='add'>+		 unsigned offset, size_t count)</div><div class='add'>+{</div><div class='add'>+	u8 cmd[2];</div><div class='add'>+	struct spi_transfer t[2];</div><div class='add'>+	struct spi_message m;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spi_message_init(&amp;m);</div><div class='add'>+</div><div class='add'>+	memset(&amp;t, 0, sizeof(t));</div><div class='add'>+</div><div class='add'>+	t[0].tx_buf = cmd;</div><div class='add'>+	t[0].len = sizeof(cmd);</div><div class='add'>+	spi_message_add_tail(&amp;t[0], &amp;m);</div><div class='add'>+</div><div class='add'>+	t[1].rx_buf = buf;</div><div class='add'>+	t[1].len = count;</div><div class='add'>+	spi_message_add_tail(&amp;t[1], &amp;m);</div><div class='add'>+</div><div class='add'>+	cmd[0] = KS8995_CMD_READ;</div><div class='add'>+	cmd[1] = offset;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ks-&gt;lock);</div><div class='add'>+	err = spi_sync(ks-&gt;spi, &amp;m);</div><div class='add'>+	mutex_unlock(&amp;ks-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return err ? err : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int ks8995_write(struct ks8995_switch *ks, char *buf,</div><div class='add'>+		 unsigned offset, size_t count)</div><div class='add'>+{</div><div class='add'>+	u8 cmd[2];</div><div class='add'>+	struct spi_transfer t[2];</div><div class='add'>+	struct spi_message m;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spi_message_init(&amp;m);</div><div class='add'>+</div><div class='add'>+	memset(&amp;t, 0, sizeof(t));</div><div class='add'>+</div><div class='add'>+	t[0].tx_buf = cmd;</div><div class='add'>+	t[0].len = sizeof(cmd);</div><div class='add'>+	spi_message_add_tail(&amp;t[0], &amp;m);</div><div class='add'>+</div><div class='add'>+	t[1].tx_buf = buf;</div><div class='add'>+	t[1].len = count;</div><div class='add'>+	spi_message_add_tail(&amp;t[1], &amp;m);</div><div class='add'>+</div><div class='add'>+	cmd[0] = KS8995_CMD_WRITE;</div><div class='add'>+	cmd[1] = offset;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ks-&gt;lock);</div><div class='add'>+	err = spi_sync(ks-&gt;spi, &amp;m);</div><div class='add'>+	mutex_unlock(&amp;ks-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return err ? err : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ks8995_read_reg(struct ks8995_switch *ks, u8 addr, u8 *buf)</div><div class='add'>+{</div><div class='add'>+	return (ks8995_read(ks, buf, addr, 1) != 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ks8995_write_reg(struct ks8995_switch *ks, u8 addr, u8 val)</div><div class='add'>+{</div><div class='add'>+	char buf = val;</div><div class='add'>+</div><div class='add'>+	return (ks8995_write(ks, &amp;buf, addr, 1) != 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ------------------------------------------------------------------------ */</div><div class='add'>+</div><div class='add'>+static int ks8995_stop(struct ks8995_switch *ks)</div><div class='add'>+{</div><div class='add'>+	return ks8995_write_reg(ks, KS8995_REG_ID1, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ks8995_start(struct ks8995_switch *ks)</div><div class='add'>+{</div><div class='add'>+	return ks8995_write_reg(ks, KS8995_REG_ID1, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ks8995_reset(struct ks8995_switch *ks)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ks8995_stop(ks);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	udelay(KS8995_RESET_DELAY);</div><div class='add'>+</div><div class='add'>+	return ks8995_start(ks);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ------------------------------------------------------------------------ */</div><div class='add'>+</div><div class='add'>+static ssize_t ks8995_registers_read(struct file *filp, struct kobject *kobj,</div><div class='add'>+	struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct ks8995_switch *ks8995;</div><div class='add'>+</div><div class='add'>+	dev = container_of(kobj, struct device, kobj);</div><div class='add'>+	ks8995 = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (unlikely(off &gt; KS8995_REGS_SIZE))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if ((off + count) &gt; KS8995_REGS_SIZE)</div><div class='add'>+		count = KS8995_REGS_SIZE - off;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!count))</div><div class='add'>+		return count;</div><div class='add'>+</div><div class='add'>+	return ks8995_read(ks8995, buf, off, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static ssize_t ks8995_registers_write(struct file *filp, struct kobject *kobj,</div><div class='add'>+	struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct ks8995_switch *ks8995;</div><div class='add'>+</div><div class='add'>+	dev = container_of(kobj, struct device, kobj);</div><div class='add'>+	ks8995 = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (unlikely(off &gt;= KS8995_REGS_SIZE))</div><div class='add'>+		return -EFBIG;</div><div class='add'>+</div><div class='add'>+	if ((off + count) &gt; KS8995_REGS_SIZE)</div><div class='add'>+		count = KS8995_REGS_SIZE - off;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!count))</div><div class='add'>+		return count;</div><div class='add'>+</div><div class='add'>+	return ks8995_write(ks8995, buf, off, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct bin_attribute ks8995_registers_attr = {</div><div class='add'>+	.attr = {</div><div class='add'>+		.name   = "registers",</div><div class='add'>+		.mode   = S_IRUSR | S_IWUSR,</div><div class='add'>+	},</div><div class='add'>+	.size   = KS8995_REGS_SIZE,</div><div class='add'>+	.read   = ks8995_registers_read,</div><div class='add'>+	.write  = ks8995_registers_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ------------------------------------------------------------------------ */</div><div class='add'>+</div><div class='add'>+static int __devinit ks8995_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct ks8995_switch    *ks;</div><div class='add'>+	struct ks8995_pdata     *pdata;</div><div class='add'>+	u8      ids[2];</div><div class='add'>+	int     err;</div><div class='add'>+</div><div class='add'>+	/* Chip description */</div><div class='add'>+	pdata = spi-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	ks = kzalloc(sizeof(*ks), GFP_KERNEL);</div><div class='add'>+	if (!ks) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "no memory for private data\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;ks-&gt;lock);</div><div class='add'>+	ks-&gt;pdata = pdata;</div><div class='add'>+	ks-&gt;spi = spi_dev_get(spi);</div><div class='add'>+	dev_set_drvdata(&amp;spi-&gt;dev, ks);</div><div class='add'>+</div><div class='add'>+	spi-&gt;mode = SPI_MODE_0;</div><div class='add'>+	spi-&gt;bits_per_word = 8;</div><div class='add'>+	err = spi_setup(spi);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "spi_setup failed, err=%d\n", err);</div><div class='add'>+		goto err_drvdata;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ks8995_read(ks, ids, KS8995_REG_ID0, sizeof(ids));</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "unable to read id registers, err=%d\n",</div><div class='add'>+				err);</div><div class='add'>+		goto err_drvdata;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ids[0]) {</div><div class='add'>+	case FAMILY_KS8995:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "unknown family id:%02x\n", ids[0]);</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto err_drvdata;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ks8995_reset(ks);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_drvdata;</div><div class='add'>+</div><div class='add'>+	err = sysfs_create_bin_file(&amp;spi-&gt;dev.kobj, &amp;ks8995_registers_attr);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "unable to create sysfs file, err=%d\n",</div><div class='add'>+				    err);</div><div class='add'>+		goto err_drvdata;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;spi-&gt;dev, "KS89%02X device found, Chip ID:%01x, "</div><div class='add'>+			"Revision:%01x\n", ids[0],</div><div class='add'>+			get_chip_id(ids[1]), get_chip_rev(ids[1]));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_drvdata:</div><div class='add'>+	dev_set_drvdata(&amp;spi-&gt;dev, NULL);</div><div class='add'>+	kfree(ks);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit ks8995_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct ks8995_data      *ks8995;</div><div class='add'>+</div><div class='add'>+	ks8995 = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+	sysfs_remove_bin_file(&amp;spi-&gt;dev.kobj, &amp;ks8995_registers_attr);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;spi-&gt;dev, NULL);</div><div class='add'>+	kfree(ks8995);</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 struct spi_driver ks8995_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	    = "spi-ks8995",</div><div class='add'>+		.bus	     = &amp;spi_bus_type,</div><div class='add'>+		.owner	   = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe	  = ks8995_probe,</div><div class='add'>+	.remove	  = __devexit_p(ks8995_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ks8995_init(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO DRV_DESC " version " DRV_VERSION"\n");</div><div class='add'>+</div><div class='add'>+	return spi_register_driver(&amp;ks8995_driver);</div><div class='add'>+}</div><div class='add'>+module_init(ks8995_init);</div><div class='add'>+</div><div class='add'>+static void __exit ks8995_exit(void)</div><div class='add'>+{</div><div class='add'>+	spi_unregister_driver(&amp;ks8995_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(ks8995_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION(DRV_DESC);</div><div class='add'>+MODULE_VERSION(DRV_VERSION);</div><div class='add'>+MODULE_AUTHOR("Gabor Juhos &lt;juhosg at openwrt.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c<br/>index f8a6853b692e..df884dde2a51 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ppp/pptp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/ppp/pptp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ppp/pptp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/ppp/pptp.c</a></div><div class='hunk'>@@ -162,7 +162,7 @@ static void del_chan(struct pppox_sock *sock)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;chan_lock);</div><div class='ctx'> 	clear_bit(sock-&gt;proto.pptp.src_addr.call_id, callid_bitmap);</div><div class='del'>-	rcu_assign_pointer(callid_sock[sock-&gt;proto.pptp.src_addr.call_id], NULL);</div><div class='add'>+	RCU_INIT_POINTER(callid_sock[sock-&gt;proto.pptp.src_addr.call_id], NULL);</div><div class='ctx'> 	spin_unlock(&amp;chan_lock);</div><div class='ctx'> 	synchronize_rcu();</div><div class='ctx'> }</div><div class='hunk'>@@ -585,8 +585,8 @@ static int pptp_create(struct net *net, struct socket *sock)</div><div class='ctx'> 	po = pppox_sk(sk);</div><div class='ctx'> 	opt = &amp;po-&gt;proto.pptp;</div><div class='ctx'> </div><div class='del'>-	opt-&gt;seq_sent = 0; opt-&gt;seq_recv = 0;</div><div class='del'>-	opt-&gt;ack_recv = 0; opt-&gt;ack_sent = 0;</div><div class='add'>+	opt-&gt;seq_sent = 0; opt-&gt;seq_recv = 0xffffffff;</div><div class='add'>+	opt-&gt;ack_recv = 0; opt-&gt;ack_sent = 0xffffffff;</div><div class='ctx'> </div><div class='ctx'> 	error = 0;</div><div class='ctx'> out:</div><div class='head'>diff --git a/drivers/net/team/Kconfig b/drivers/net/team/Kconfig<br/>new file mode 100644<br/>index 000000000000..248a144033ca<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/team/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/team/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+menuconfig NET_TEAM</div><div class='add'>+	tristate "Ethernet team driver support (EXPERIMENTAL)"</div><div class='add'>+	depends on EXPERIMENTAL</div><div class='add'>+	---help---</div><div class='add'>+	  This allows one to create virtual interfaces that teams together</div><div class='add'>+	  multiple ethernet devices.</div><div class='add'>+</div><div class='add'>+	  Team devices can be added using the "ip" command from the</div><div class='add'>+	  iproute2 package:</div><div class='add'>+</div><div class='add'>+	  "ip link add link [ address MAC ] [ NAME ] type team"</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 team.</div><div class='add'>+</div><div class='add'>+if NET_TEAM</div><div class='add'>+</div><div class='add'>+config NET_TEAM_MODE_ROUNDROBIN</div><div class='add'>+	tristate "Round-robin mode support"</div><div class='add'>+	depends on NET_TEAM</div><div class='add'>+	---help---</div><div class='add'>+	  Basic mode where port used for transmitting packets is selected in</div><div class='add'>+	  round-robin fashion using packet counter.</div><div class='add'>+</div><div class='add'>+	  All added ports are setup to have bond's mac address.</div><div class='add'>+</div><div class='add'>+	  To compile this team mode as a module, choose M here: the module</div><div class='add'>+	  will be called team_mode_roundrobin.</div><div class='add'>+</div><div class='add'>+config NET_TEAM_MODE_ACTIVEBACKUP</div><div class='add'>+	tristate "Active-backup mode support"</div><div class='add'>+	depends on NET_TEAM</div><div class='add'>+	---help---</div><div class='add'>+	  Only one port is active at a time and the rest of ports are used</div><div class='add'>+	  for backup.</div><div class='add'>+</div><div class='add'>+	  Mac addresses of ports are not modified. Userspace is responsible</div><div class='add'>+	  to do so.</div><div class='add'>+</div><div class='add'>+	  To compile this team mode as a module, choose M here: the module</div><div class='add'>+	  will be called team_mode_activebackup.</div><div class='add'>+</div><div class='add'>+endif # NET_TEAM</div><div class='head'>diff --git a/drivers/net/team/Makefile b/drivers/net/team/Makefile<br/>new file mode 100644<br/>index 000000000000..85f2028a87af<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/team/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/team/Makefile</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for the network team driver</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_NET_TEAM) += team.o</div><div class='add'>+obj-$(CONFIG_NET_TEAM_MODE_ROUNDROBIN) += team_mode_roundrobin.o</div><div class='add'>+obj-$(CONFIG_NET_TEAM_MODE_ACTIVEBACKUP) += team_mode_activebackup.o</div><div class='head'>diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c<br/>new file mode 100644<br/>index 000000000000..ed2a862b835d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/team/team.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/team/team.c</a></div><div class='hunk'>@@ -0,0 +1,1684 @@</div><div class='add'>+/*</div><div class='add'>+ * net/drivers/team/team.c - Network team device driver</div><div class='add'>+ * Copyright (c) 2011 Jiri Pirko &lt;jpirko@redhat.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 &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.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/rcupdate.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/socket.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;net/rtnetlink.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;linux/if_team.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRV_NAME "team"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**********</div><div class='add'>+ * Helpers</div><div class='add'>+ **********/</div><div class='add'>+</div><div class='add'>+#define team_port_exists(dev) (dev-&gt;priv_flags &amp; IFF_TEAM_PORT)</div><div class='add'>+</div><div class='add'>+static struct team_port *team_port_get_rcu(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct team_port *port = rcu_dereference(dev-&gt;rx_handler_data);</div><div class='add'>+</div><div class='add'>+	return team_port_exists(dev) ? port : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct team_port *team_port_get_rtnl(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct team_port *port = rtnl_dereference(dev-&gt;rx_handler_data);</div><div class='add'>+</div><div class='add'>+	return team_port_exists(dev) ? port : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Since the ability to change mac address for open port device is tested in</div><div class='add'>+ * team_port_add, this function can be called without control of return value</div><div class='add'>+ */</div><div class='add'>+static int __set_port_mac(struct net_device *port_dev,</div><div class='add'>+			  const unsigned char *dev_addr)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr addr;</div><div class='add'>+</div><div class='add'>+	memcpy(addr.sa_data, dev_addr, ETH_ALEN);</div><div class='add'>+	addr.sa_family = ARPHRD_ETHER;</div><div class='add'>+	return dev_set_mac_address(port_dev, &amp;addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int team_port_set_orig_mac(struct team_port *port)</div><div class='add'>+{</div><div class='add'>+	return __set_port_mac(port-&gt;dev, port-&gt;orig.dev_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int team_port_set_team_mac(struct team_port *port)</div><div class='add'>+{</div><div class='add'>+	return __set_port_mac(port-&gt;dev, port-&gt;team-&gt;dev-&gt;dev_addr);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(team_port_set_team_mac);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*******************</div><div class='add'>+ * Options handling</div><div class='add'>+ *******************/</div><div class='add'>+</div><div class='add'>+struct team_option *__team_find_option(struct team *team, const char *opt_name)</div><div class='add'>+{</div><div class='add'>+	struct team_option *option;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(option, &amp;team-&gt;option_list, list) {</div><div class='add'>+		if (strcmp(option-&gt;name, opt_name) == 0)</div><div class='add'>+			return option;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int team_options_register(struct team *team,</div><div class='add'>+			  const struct team_option *option,</div><div class='add'>+			  size_t option_count)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct team_option **dst_opts;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dst_opts = kzalloc(sizeof(struct team_option *) * option_count,</div><div class='add'>+			   GFP_KERNEL);</div><div class='add'>+	if (!dst_opts)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	for (i = 0; i &lt; option_count; i++, option++) {</div><div class='add'>+		if (__team_find_option(team, option-&gt;name)) {</div><div class='add'>+			err = -EEXIST;</div><div class='add'>+			goto rollback;</div><div class='add'>+		}</div><div class='add'>+		dst_opts[i] = kmemdup(option, sizeof(*option), GFP_KERNEL);</div><div class='add'>+		if (!dst_opts[i]) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto rollback;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; option_count; i++)</div><div class='add'>+		list_add_tail(&amp;dst_opts[i]-&gt;list, &amp;team-&gt;option_list);</div><div class='add'>+</div><div class='add'>+	kfree(dst_opts);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+rollback:</div><div class='add'>+	for (i = 0; i &lt; option_count; i++)</div><div class='add'>+		kfree(dst_opts[i]);</div><div class='add'>+</div><div class='add'>+	kfree(dst_opts);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(team_options_register);</div><div class='add'>+</div><div class='add'>+static void __team_options_change_check(struct team *team,</div><div class='add'>+					struct team_option *changed_option);</div><div class='add'>+</div><div class='add'>+static void __team_options_unregister(struct team *team,</div><div class='add'>+				      const struct team_option *option,</div><div class='add'>+				      size_t option_count)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; option_count; i++, option++) {</div><div class='add'>+		struct team_option *del_opt;</div><div class='add'>+</div><div class='add'>+		del_opt = __team_find_option(team, option-&gt;name);</div><div class='add'>+		if (del_opt) {</div><div class='add'>+			list_del(&amp;del_opt-&gt;list);</div><div class='add'>+			kfree(del_opt);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void team_options_unregister(struct team *team,</div><div class='add'>+			     const struct team_option *option,</div><div class='add'>+			     size_t option_count)</div><div class='add'>+{</div><div class='add'>+	__team_options_unregister(team, option, option_count);</div><div class='add'>+	__team_options_change_check(team, NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(team_options_unregister);</div><div class='add'>+</div><div class='add'>+static int team_option_get(struct team *team, struct team_option *option,</div><div class='add'>+			   void *arg)</div><div class='add'>+{</div><div class='add'>+	return option-&gt;getter(team, arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_option_set(struct team *team, struct team_option *option,</div><div class='add'>+			   void *arg)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = option-&gt;setter(team, arg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	__team_options_change_check(team, option);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/****************</div><div class='add'>+ * Mode handling</div><div class='add'>+ ****************/</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(mode_list);</div><div class='add'>+static DEFINE_SPINLOCK(mode_list_lock);</div><div class='add'>+</div><div class='add'>+static struct team_mode *__find_mode(const char *kind)</div><div class='add'>+{</div><div class='add'>+	struct team_mode *mode;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(mode, &amp;mode_list, list) {</div><div class='add'>+		if (strcmp(mode-&gt;kind, kind) == 0)</div><div class='add'>+			return mode;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_good_mode_name(const char *name)</div><div class='add'>+{</div><div class='add'>+	while (*name != '\0') {</div><div class='add'>+		if (!isalpha(*name) &amp;&amp; !isdigit(*name) &amp;&amp; *name != '_')</div><div class='add'>+			return false;</div><div class='add'>+		name++;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int team_mode_register(struct team_mode *mode)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!is_good_mode_name(mode-&gt;kind) ||</div><div class='add'>+	    mode-&gt;priv_size &gt; TEAM_MODE_PRIV_SIZE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	spin_lock(&amp;mode_list_lock);</div><div class='add'>+	if (__find_mode(mode-&gt;kind)) {</div><div class='add'>+		err = -EEXIST;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+	list_add_tail(&amp;mode-&gt;list, &amp;mode_list);</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock(&amp;mode_list_lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(team_mode_register);</div><div class='add'>+</div><div class='add'>+int team_mode_unregister(struct team_mode *mode)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;mode_list_lock);</div><div class='add'>+	list_del_init(&amp;mode-&gt;list);</div><div class='add'>+	spin_unlock(&amp;mode_list_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(team_mode_unregister);</div><div class='add'>+</div><div class='add'>+static struct team_mode *team_mode_get(const char *kind)</div><div class='add'>+{</div><div class='add'>+	struct team_mode *mode;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;mode_list_lock);</div><div class='add'>+	mode = __find_mode(kind);</div><div class='add'>+	if (!mode) {</div><div class='add'>+		spin_unlock(&amp;mode_list_lock);</div><div class='add'>+		request_module("team-mode-%s", kind);</div><div class='add'>+		spin_lock(&amp;mode_list_lock);</div><div class='add'>+		mode = __find_mode(kind);</div><div class='add'>+	}</div><div class='add'>+	if (mode)</div><div class='add'>+		if (!try_module_get(mode-&gt;owner))</div><div class='add'>+			mode = NULL;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;mode_list_lock);</div><div class='add'>+	return mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void team_mode_put(const struct team_mode *mode)</div><div class='add'>+{</div><div class='add'>+	module_put(mode-&gt;owner);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool team_dummy_transmit(struct team *team, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+rx_handler_result_t team_dummy_receive(struct team *team,</div><div class='add'>+				       struct team_port *port,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return RX_HANDLER_ANOTHER;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void team_adjust_ops(struct team *team)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * To avoid checks in rx/tx skb paths, ensure here that non-null and</div><div class='add'>+	 * correct ops are always set.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;team-&gt;port_list) ||</div><div class='add'>+	    !team-&gt;mode || !team-&gt;mode-&gt;ops-&gt;transmit)</div><div class='add'>+		team-&gt;ops.transmit = team_dummy_transmit;</div><div class='add'>+	else</div><div class='add'>+		team-&gt;ops.transmit = team-&gt;mode-&gt;ops-&gt;transmit;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;team-&gt;port_list) ||</div><div class='add'>+	    !team-&gt;mode || !team-&gt;mode-&gt;ops-&gt;receive)</div><div class='add'>+		team-&gt;ops.receive = team_dummy_receive;</div><div class='add'>+	else</div><div class='add'>+		team-&gt;ops.receive = team-&gt;mode-&gt;ops-&gt;receive;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We can benefit from the fact that it's ensured no port is present</div><div class='add'>+ * at the time of mode change. Therefore no packets are in fly so there's no</div><div class='add'>+ * need to set mode operations in any special way.</div><div class='add'>+ */</div><div class='add'>+static int __team_change_mode(struct team *team,</div><div class='add'>+			      const struct team_mode *new_mode)</div><div class='add'>+{</div><div class='add'>+	/* Check if mode was previously set and do cleanup if so */</div><div class='add'>+	if (team-&gt;mode) {</div><div class='add'>+		void (*exit_op)(struct team *team) = team-&gt;ops.exit;</div><div class='add'>+</div><div class='add'>+		/* Clear ops area so no callback is called any longer */</div><div class='add'>+		memset(&amp;team-&gt;ops, 0, sizeof(struct team_mode_ops));</div><div class='add'>+		team_adjust_ops(team);</div><div class='add'>+</div><div class='add'>+		if (exit_op)</div><div class='add'>+			exit_op(team);</div><div class='add'>+		team_mode_put(team-&gt;mode);</div><div class='add'>+		team-&gt;mode = NULL;</div><div class='add'>+		/* zero private data area */</div><div class='add'>+		memset(&amp;team-&gt;mode_priv, 0,</div><div class='add'>+		       sizeof(struct team) - offsetof(struct team, mode_priv));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!new_mode)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (new_mode-&gt;ops-&gt;init) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = new_mode-&gt;ops-&gt;init(team);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	team-&gt;mode = new_mode;</div><div class='add'>+	memcpy(&amp;team-&gt;ops, new_mode-&gt;ops, sizeof(struct team_mode_ops));</div><div class='add'>+	team_adjust_ops(team);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_change_mode(struct team *team, const char *kind)</div><div class='add'>+{</div><div class='add'>+	struct team_mode *new_mode;</div><div class='add'>+	struct net_device *dev = team-&gt;dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;team-&gt;port_list)) {</div><div class='add'>+		netdev_err(dev, "No ports can be present during mode change\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (team-&gt;mode &amp;&amp; strcmp(team-&gt;mode-&gt;kind, kind) == 0) {</div><div class='add'>+		netdev_err(dev, "Unable to change to the same mode the team is in\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new_mode = team_mode_get(kind);</div><div class='add'>+	if (!new_mode) {</div><div class='add'>+		netdev_err(dev, "Mode \"%s\" not found\n", kind);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = __team_change_mode(team, new_mode);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(dev, "Failed to change to mode \"%s\"\n", kind);</div><div class='add'>+		team_mode_put(new_mode);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_info(dev, "Mode changed to \"%s\"\n", kind);</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'>+ * Rx path frame handler</div><div class='add'>+ ************************/</div><div class='add'>+</div><div class='add'>+/* note: already called with rcu_read_lock */</div><div class='add'>+static rx_handler_result_t team_handle_frame(struct sk_buff **pskb)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = *pskb;</div><div class='add'>+	struct team_port *port;</div><div class='add'>+	struct team *team;</div><div class='add'>+	rx_handler_result_t res;</div><div class='add'>+</div><div class='add'>+	skb = skb_share_check(skb, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return RX_HANDLER_CONSUMED;</div><div class='add'>+</div><div class='add'>+	*pskb = skb;</div><div class='add'>+</div><div class='add'>+	port = team_port_get_rcu(skb-&gt;dev);</div><div class='add'>+	team = port-&gt;team;</div><div class='add'>+</div><div class='add'>+	res = team-&gt;ops.receive(team, port, skb);</div><div class='add'>+	if (res == RX_HANDLER_ANOTHER) {</div><div class='add'>+		struct team_pcpu_stats *pcpu_stats;</div><div class='add'>+</div><div class='add'>+		pcpu_stats = this_cpu_ptr(team-&gt;pcpu_stats);</div><div class='add'>+		u64_stats_update_begin(&amp;pcpu_stats-&gt;syncp);</div><div class='add'>+		pcpu_stats-&gt;rx_packets++;</div><div class='add'>+		pcpu_stats-&gt;rx_bytes += skb-&gt;len;</div><div class='add'>+		if (skb-&gt;pkt_type == PACKET_MULTICAST)</div><div class='add'>+			pcpu_stats-&gt;rx_multicast++;</div><div class='add'>+		u64_stats_update_end(&amp;pcpu_stats-&gt;syncp);</div><div class='add'>+</div><div class='add'>+		skb-&gt;dev = team-&gt;dev;</div><div class='add'>+	} else {</div><div class='add'>+		this_cpu_inc(team-&gt;pcpu_stats-&gt;rx_dropped);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/****************</div><div class='add'>+ * Port handling</div><div class='add'>+ ****************/</div><div class='add'>+</div><div class='add'>+static bool team_port_find(const struct team *team,</div><div class='add'>+			   const struct team_port *port)</div><div class='add'>+{</div><div class='add'>+	struct team_port *cur;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(cur, &amp;team-&gt;port_list, list)</div><div class='add'>+		if (cur == port)</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'>+ * Add/delete port to the team port list. Write guarded by rtnl_lock.</div><div class='add'>+ * Takes care of correct port-&gt;index setup (might be racy).</div><div class='add'>+ */</div><div class='add'>+static void team_port_list_add_port(struct team *team,</div><div class='add'>+				    struct team_port *port)</div><div class='add'>+{</div><div class='add'>+	port-&gt;index = team-&gt;port_count++;</div><div class='add'>+	hlist_add_head_rcu(&amp;port-&gt;hlist,</div><div class='add'>+			   team_port_index_hash(team, port-&gt;index));</div><div class='add'>+	list_add_tail_rcu(&amp;port-&gt;list, &amp;team-&gt;port_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __reconstruct_port_hlist(struct team *team, int rm_index)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct team_port *port;</div><div class='add'>+</div><div class='add'>+	for (i = rm_index + 1; i &lt; team-&gt;port_count; i++) {</div><div class='add'>+		port = team_get_port_by_index(team, i);</div><div class='add'>+		hlist_del_rcu(&amp;port-&gt;hlist);</div><div class='add'>+		port-&gt;index--;</div><div class='add'>+		hlist_add_head_rcu(&amp;port-&gt;hlist,</div><div class='add'>+				   team_port_index_hash(team, port-&gt;index));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void team_port_list_del_port(struct team *team,</div><div class='add'>+				   struct team_port *port)</div><div class='add'>+{</div><div class='add'>+	int rm_index = port-&gt;index;</div><div class='add'>+</div><div class='add'>+	hlist_del_rcu(&amp;port-&gt;hlist);</div><div class='add'>+	list_del_rcu(&amp;port-&gt;list);</div><div class='add'>+	__reconstruct_port_hlist(team, rm_index);</div><div class='add'>+	team-&gt;port_count--;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define TEAM_VLAN_FEATURES (NETIF_F_ALL_CSUM | NETIF_F_SG | \</div><div class='add'>+			    NETIF_F_FRAGLIST | NETIF_F_ALL_TSO | \</div><div class='add'>+			    NETIF_F_HIGHDMA | NETIF_F_LRO)</div><div class='add'>+</div><div class='add'>+static void __team_compute_features(struct team *team)</div><div class='add'>+{</div><div class='add'>+	struct team_port *port;</div><div class='add'>+	u32 vlan_features = TEAM_VLAN_FEATURES;</div><div class='add'>+	unsigned short max_hard_header_len = ETH_HLEN;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(port, &amp;team-&gt;port_list, list) {</div><div class='add'>+		vlan_features = netdev_increment_features(vlan_features,</div><div class='add'>+					port-&gt;dev-&gt;vlan_features,</div><div class='add'>+					TEAM_VLAN_FEATURES);</div><div class='add'>+</div><div class='add'>+		if (port-&gt;dev-&gt;hard_header_len &gt; max_hard_header_len)</div><div class='add'>+			max_hard_header_len = port-&gt;dev-&gt;hard_header_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	team-&gt;dev-&gt;vlan_features = vlan_features;</div><div class='add'>+	team-&gt;dev-&gt;hard_header_len = max_hard_header_len;</div><div class='add'>+</div><div class='add'>+	netdev_change_features(team-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void team_compute_features(struct team *team)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;team-&gt;lock);</div><div class='add'>+	__team_compute_features(team);</div><div class='add'>+	mutex_unlock(&amp;team-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_port_enter(struct team *team, struct team_port *port)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	dev_hold(team-&gt;dev);</div><div class='add'>+	port-&gt;dev-&gt;priv_flags |= IFF_TEAM_PORT;</div><div class='add'>+	if (team-&gt;ops.port_enter) {</div><div class='add'>+		err = team-&gt;ops.port_enter(team, port);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err(team-&gt;dev, "Device %s failed to enter team mode\n",</div><div class='add'>+				   port-&gt;dev-&gt;name);</div><div class='add'>+			goto err_port_enter;</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_port_enter:</div><div class='add'>+	port-&gt;dev-&gt;priv_flags &amp;= ~IFF_TEAM_PORT;</div><div class='add'>+	dev_put(team-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void team_port_leave(struct team *team, struct team_port *port)</div><div class='add'>+{</div><div class='add'>+	if (team-&gt;ops.port_leave)</div><div class='add'>+		team-&gt;ops.port_leave(team, port);</div><div class='add'>+	port-&gt;dev-&gt;priv_flags &amp;= ~IFF_TEAM_PORT;</div><div class='add'>+	dev_put(team-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __team_port_change_check(struct team_port *port, bool linkup);</div><div class='add'>+</div><div class='add'>+static int team_port_add(struct team *team, struct net_device *port_dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = team-&gt;dev;</div><div class='add'>+	struct team_port *port;</div><div class='add'>+	char *portname = port_dev-&gt;name;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (port_dev-&gt;flags &amp; IFF_LOOPBACK ||</div><div class='add'>+	    port_dev-&gt;type != ARPHRD_ETHER) {</div><div class='add'>+		netdev_err(dev, "Device %s is of an unsupported type\n",</div><div class='add'>+			   portname);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (team_port_exists(port_dev)) {</div><div class='add'>+		netdev_err(dev, "Device %s is already a port "</div><div class='add'>+				"of a team device\n", portname);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (port_dev-&gt;flags &amp; IFF_UP) {</div><div class='add'>+		netdev_err(dev, "Device %s is up. Set it down before adding it as a team port\n",</div><div class='add'>+			   portname);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	port = kzalloc(sizeof(struct team_port), GFP_KERNEL);</div><div class='add'>+	if (!port)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	port-&gt;dev = port_dev;</div><div class='add'>+	port-&gt;team = team;</div><div class='add'>+</div><div class='add'>+	port-&gt;orig.mtu = port_dev-&gt;mtu;</div><div class='add'>+	err = dev_set_mtu(port_dev, dev-&gt;mtu);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_dbg(dev, "Error %d calling dev_set_mtu\n", err);</div><div class='add'>+		goto err_set_mtu;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(port-&gt;orig.dev_addr, port_dev-&gt;dev_addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	err = team_port_enter(team, port);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(dev, "Device %s failed to enter team mode\n",</div><div class='add'>+			   portname);</div><div class='add'>+		goto err_port_enter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dev_open(port_dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_dbg(dev, "Device %s opening failed\n",</div><div class='add'>+			   portname);</div><div class='add'>+		goto err_dev_open;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = vlan_vids_add_by_dev(port_dev, dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(dev, "Failed to add vlan ids to device %s\n",</div><div class='add'>+				portname);</div><div class='add'>+		goto err_vids_add;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = netdev_set_master(port_dev, dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(dev, "Device %s failed to set master\n", portname);</div><div class='add'>+		goto err_set_master;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = netdev_rx_handler_register(port_dev, team_handle_frame,</div><div class='add'>+					 port);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(dev, "Device %s failed to register rx_handler\n",</div><div class='add'>+			   portname);</div><div class='add'>+		goto err_handler_register;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	team_port_list_add_port(team, port);</div><div class='add'>+	team_adjust_ops(team);</div><div class='add'>+	__team_compute_features(team);</div><div class='add'>+	__team_port_change_check(port, !!netif_carrier_ok(port_dev));</div><div class='add'>+</div><div class='add'>+	netdev_info(dev, "Port device %s added\n", portname);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_handler_register:</div><div class='add'>+	netdev_set_master(port_dev, NULL);</div><div class='add'>+</div><div class='add'>+err_set_master:</div><div class='add'>+	vlan_vids_del_by_dev(port_dev, dev);</div><div class='add'>+</div><div class='add'>+err_vids_add:</div><div class='add'>+	dev_close(port_dev);</div><div class='add'>+</div><div class='add'>+err_dev_open:</div><div class='add'>+	team_port_leave(team, port);</div><div class='add'>+	team_port_set_orig_mac(port);</div><div class='add'>+</div><div class='add'>+err_port_enter:</div><div class='add'>+	dev_set_mtu(port_dev, port-&gt;orig.mtu);</div><div class='add'>+</div><div class='add'>+err_set_mtu:</div><div class='add'>+	kfree(port);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_port_del(struct team *team, struct net_device *port_dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = team-&gt;dev;</div><div class='add'>+	struct team_port *port;</div><div class='add'>+	char *portname = port_dev-&gt;name;</div><div class='add'>+</div><div class='add'>+	port = team_port_get_rtnl(port_dev);</div><div class='add'>+	if (!port || !team_port_find(team, port)) {</div><div class='add'>+		netdev_err(dev, "Device %s does not act as a port of this team\n",</div><div class='add'>+			   portname);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__team_port_change_check(port, false);</div><div class='add'>+	team_port_list_del_port(team, port);</div><div class='add'>+	team_adjust_ops(team);</div><div class='add'>+	netdev_rx_handler_unregister(port_dev);</div><div class='add'>+	netdev_set_master(port_dev, NULL);</div><div class='add'>+	vlan_vids_del_by_dev(port_dev, dev);</div><div class='add'>+	dev_close(port_dev);</div><div class='add'>+	team_port_leave(team, port);</div><div class='add'>+	team_port_set_orig_mac(port);</div><div class='add'>+	dev_set_mtu(port_dev, port-&gt;orig.mtu);</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+	kfree(port);</div><div class='add'>+	netdev_info(dev, "Port device %s removed\n", portname);</div><div class='add'>+	__team_compute_features(team);</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'>+ * Net device ops</div><div class='add'>+ *****************/</div><div class='add'>+</div><div class='add'>+static const char team_no_mode_kind[] = "*NOMODE*";</div><div class='add'>+</div><div class='add'>+static int team_mode_option_get(struct team *team, void *arg)</div><div class='add'>+{</div><div class='add'>+	const char **str = arg;</div><div class='add'>+</div><div class='add'>+	*str = team-&gt;mode ? team-&gt;mode-&gt;kind : team_no_mode_kind;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_mode_option_set(struct team *team, void *arg)</div><div class='add'>+{</div><div class='add'>+	const char **str = arg;</div><div class='add'>+</div><div class='add'>+	return team_change_mode(team, *str);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct team_option team_options[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "mode",</div><div class='add'>+		.type = TEAM_OPTION_TYPE_STRING,</div><div class='add'>+		.getter = team_mode_option_get,</div><div class='add'>+		.setter = team_mode_option_set,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int team_init(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct team *team = netdev_priv(dev);</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	team-&gt;dev = dev;</div><div class='add'>+	mutex_init(&amp;team-&gt;lock);</div><div class='add'>+</div><div class='add'>+	team-&gt;pcpu_stats = alloc_percpu(struct team_pcpu_stats);</div><div class='add'>+	if (!team-&gt;pcpu_stats)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TEAM_PORT_HASHENTRIES; i++)</div><div class='add'>+		INIT_HLIST_HEAD(&amp;team-&gt;port_hlist[i]);</div><div class='add'>+	INIT_LIST_HEAD(&amp;team-&gt;port_list);</div><div class='add'>+</div><div class='add'>+	team_adjust_ops(team);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;team-&gt;option_list);</div><div class='add'>+	err = team_options_register(team, team_options, ARRAY_SIZE(team_options));</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_options_register;</div><div class='add'>+	netif_carrier_off(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_options_register:</div><div class='add'>+	free_percpu(team-&gt;pcpu_stats);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void team_uninit(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct team *team = netdev_priv(dev);</div><div class='add'>+	struct team_port *port;</div><div class='add'>+	struct team_port *tmp;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;team-&gt;lock);</div><div class='add'>+	list_for_each_entry_safe(port, tmp, &amp;team-&gt;port_list, list)</div><div class='add'>+		team_port_del(team, port-&gt;dev);</div><div class='add'>+</div><div class='add'>+	__team_change_mode(team, NULL); /* cleanup */</div><div class='add'>+	__team_options_unregister(team, team_options, ARRAY_SIZE(team_options));</div><div class='add'>+	mutex_unlock(&amp;team-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void team_destructor(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct team *team = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	free_percpu(team-&gt;pcpu_stats);</div><div class='add'>+	free_netdev(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_open(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	netif_carrier_on(dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_close(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	netif_carrier_off(dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * note: already called with rcu_read_lock</div><div class='add'>+ */</div><div class='add'>+static netdev_tx_t team_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct team *team = netdev_priv(dev);</div><div class='add'>+	bool tx_success = false;</div><div class='add'>+	unsigned int len = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	tx_success = team-&gt;ops.transmit(team, skb);</div><div class='add'>+	if (tx_success) {</div><div class='add'>+		struct team_pcpu_stats *pcpu_stats;</div><div class='add'>+</div><div class='add'>+		pcpu_stats = this_cpu_ptr(team-&gt;pcpu_stats);</div><div class='add'>+		u64_stats_update_begin(&amp;pcpu_stats-&gt;syncp);</div><div class='add'>+		pcpu_stats-&gt;tx_packets++;</div><div class='add'>+		pcpu_stats-&gt;tx_bytes += len;</div><div class='add'>+		u64_stats_update_end(&amp;pcpu_stats-&gt;syncp);</div><div class='add'>+	} else {</div><div class='add'>+		this_cpu_inc(team-&gt;pcpu_stats-&gt;tx_dropped);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void team_change_rx_flags(struct net_device *dev, int change)</div><div class='add'>+{</div><div class='add'>+	struct team *team = netdev_priv(dev);</div><div class='add'>+	struct team_port *port;</div><div class='add'>+	int inc;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(port, &amp;team-&gt;port_list, list) {</div><div class='add'>+		if (change &amp; IFF_PROMISC) {</div><div class='add'>+			inc = dev-&gt;flags &amp; IFF_PROMISC ? 1 : -1;</div><div class='add'>+			dev_set_promiscuity(port-&gt;dev, inc);</div><div class='add'>+		}</div><div class='add'>+		if (change &amp; IFF_ALLMULTI) {</div><div class='add'>+			inc = dev-&gt;flags &amp; IFF_ALLMULTI ? 1 : -1;</div><div class='add'>+			dev_set_allmulti(port-&gt;dev, inc);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void team_set_rx_mode(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct team *team = netdev_priv(dev);</div><div class='add'>+	struct team_port *port;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(port, &amp;team-&gt;port_list, list) {</div><div class='add'>+		dev_uc_sync(port-&gt;dev, dev);</div><div class='add'>+		dev_mc_sync(port-&gt;dev, dev);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_set_mac_address(struct net_device *dev, void *p)</div><div class='add'>+{</div><div class='add'>+	struct team *team = netdev_priv(dev);</div><div class='add'>+	struct team_port *port;</div><div class='add'>+	struct sockaddr *addr = p;</div><div class='add'>+</div><div class='add'>+	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, ETH_ALEN);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(port, &amp;team-&gt;port_list, list)</div><div class='add'>+		if (team-&gt;ops.port_change_mac)</div><div class='add'>+			team-&gt;ops.port_change_mac(team, port);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_change_mtu(struct net_device *dev, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct team *team = netdev_priv(dev);</div><div class='add'>+	struct team_port *port;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Alhough this is reader, it's guarded by team lock. It's not possible</div><div class='add'>+	 * to traverse list in reverse under rcu_read_lock</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;team-&gt;lock);</div><div class='add'>+	list_for_each_entry(port, &amp;team-&gt;port_list, list) {</div><div class='add'>+		err = dev_set_mtu(port-&gt;dev, new_mtu);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err(dev, "Device %s failed to change mtu",</div><div class='add'>+				   port-&gt;dev-&gt;name);</div><div class='add'>+			goto unwind;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;team-&gt;lock);</div><div class='add'>+</div><div class='add'>+	dev-&gt;mtu = new_mtu;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unwind:</div><div class='add'>+	list_for_each_entry_continue_reverse(port, &amp;team-&gt;port_list, list)</div><div class='add'>+		dev_set_mtu(port-&gt;dev, dev-&gt;mtu);</div><div class='add'>+	mutex_unlock(&amp;team-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtnl_link_stats64 *</div><div class='add'>+team_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)</div><div class='add'>+{</div><div class='add'>+	struct team *team = netdev_priv(dev);</div><div class='add'>+	struct team_pcpu_stats *p;</div><div class='add'>+	u64 rx_packets, rx_bytes, rx_multicast, tx_packets, tx_bytes;</div><div class='add'>+	u32 rx_dropped = 0, tx_dropped = 0;</div><div class='add'>+	unsigned int start;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		p = per_cpu_ptr(team-&gt;pcpu_stats, i);</div><div class='add'>+		do {</div><div class='add'>+			start = u64_stats_fetch_begin_bh(&amp;p-&gt;syncp);</div><div class='add'>+			rx_packets	= p-&gt;rx_packets;</div><div class='add'>+			rx_bytes	= p-&gt;rx_bytes;</div><div class='add'>+			rx_multicast	= p-&gt;rx_multicast;</div><div class='add'>+			tx_packets	= p-&gt;tx_packets;</div><div class='add'>+			tx_bytes	= p-&gt;tx_bytes;</div><div class='add'>+		} while (u64_stats_fetch_retry_bh(&amp;p-&gt;syncp, start));</div><div class='add'>+</div><div class='add'>+		stats-&gt;rx_packets	+= rx_packets;</div><div class='add'>+		stats-&gt;rx_bytes		+= rx_bytes;</div><div class='add'>+		stats-&gt;multicast	+= rx_multicast;</div><div class='add'>+		stats-&gt;tx_packets	+= tx_packets;</div><div class='add'>+		stats-&gt;tx_bytes		+= tx_bytes;</div><div class='add'>+		/*</div><div class='add'>+		 * rx_dropped &amp; tx_dropped are u32, updated</div><div class='add'>+		 * without syncp protection.</div><div class='add'>+		 */</div><div class='add'>+		rx_dropped	+= p-&gt;rx_dropped;</div><div class='add'>+		tx_dropped	+= p-&gt;tx_dropped;</div><div class='add'>+	}</div><div class='add'>+	stats-&gt;rx_dropped	= rx_dropped;</div><div class='add'>+	stats-&gt;tx_dropped	= tx_dropped;</div><div class='add'>+	return stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_vlan_rx_add_vid(struct net_device *dev, uint16_t vid)</div><div class='add'>+{</div><div class='add'>+	struct team *team = netdev_priv(dev);</div><div class='add'>+	struct team_port *port;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Alhough this is reader, it's guarded by team lock. It's not possible</div><div class='add'>+	 * to traverse list in reverse under rcu_read_lock</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;team-&gt;lock);</div><div class='add'>+	list_for_each_entry(port, &amp;team-&gt;port_list, list) {</div><div class='add'>+		err = vlan_vid_add(port-&gt;dev, vid);</div><div class='add'>+		if (err)</div><div class='add'>+			goto unwind;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;team-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unwind:</div><div class='add'>+	list_for_each_entry_continue_reverse(port, &amp;team-&gt;port_list, list)</div><div class='add'>+		vlan_vid_del(port-&gt;dev, vid);</div><div class='add'>+	mutex_unlock(&amp;team-&gt;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 team_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid)</div><div class='add'>+{</div><div class='add'>+	struct team *team = netdev_priv(dev);</div><div class='add'>+	struct team_port *port;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(port, &amp;team-&gt;port_list, list)</div><div class='add'>+		vlan_vid_del(port-&gt;dev, vid);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_add_slave(struct net_device *dev, struct net_device *port_dev)</div><div class='add'>+{</div><div class='add'>+	struct team *team = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;team-&gt;lock);</div><div class='add'>+	err = team_port_add(team, port_dev);</div><div class='add'>+	mutex_unlock(&amp;team-&gt;lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_del_slave(struct net_device *dev, struct net_device *port_dev)</div><div class='add'>+{</div><div class='add'>+	struct team *team = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;team-&gt;lock);</div><div class='add'>+	err = team_port_del(team, port_dev);</div><div class='add'>+	mutex_unlock(&amp;team-&gt;lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_features_t team_fix_features(struct net_device *dev,</div><div class='add'>+					   netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	struct team_port *port;</div><div class='add'>+	struct team *team = netdev_priv(dev);</div><div class='add'>+	netdev_features_t mask;</div><div class='add'>+</div><div class='add'>+	mask = features;</div><div class='add'>+	features &amp;= ~NETIF_F_ONE_FOR_ALL;</div><div class='add'>+	features |= NETIF_F_ALL_FOR_ALL;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(port, &amp;team-&gt;port_list, list) {</div><div class='add'>+		features = netdev_increment_features(features,</div><div class='add'>+						     port-&gt;dev-&gt;features,</div><div class='add'>+						     mask);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return features;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops team_netdev_ops = {</div><div class='add'>+	.ndo_init		= team_init,</div><div class='add'>+	.ndo_uninit		= team_uninit,</div><div class='add'>+	.ndo_open		= team_open,</div><div class='add'>+	.ndo_stop		= team_close,</div><div class='add'>+	.ndo_start_xmit		= team_xmit,</div><div class='add'>+	.ndo_change_rx_flags	= team_change_rx_flags,</div><div class='add'>+	.ndo_set_rx_mode	= team_set_rx_mode,</div><div class='add'>+	.ndo_set_mac_address	= team_set_mac_address,</div><div class='add'>+	.ndo_change_mtu		= team_change_mtu,</div><div class='add'>+	.ndo_get_stats64	= team_get_stats64,</div><div class='add'>+	.ndo_vlan_rx_add_vid	= team_vlan_rx_add_vid,</div><div class='add'>+	.ndo_vlan_rx_kill_vid	= team_vlan_rx_kill_vid,</div><div class='add'>+	.ndo_add_slave		= team_add_slave,</div><div class='add'>+	.ndo_del_slave		= team_del_slave,</div><div class='add'>+	.ndo_fix_features	= team_fix_features,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/***********************</div><div class='add'>+ * rt netlink interface</div><div class='add'>+ ***********************/</div><div class='add'>+</div><div class='add'>+static void team_setup(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	ether_setup(dev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;netdev_ops = &amp;team_netdev_ops;</div><div class='add'>+	dev-&gt;destructor	= team_destructor;</div><div class='add'>+	dev-&gt;tx_queue_len = 0;</div><div class='add'>+	dev-&gt;flags |= IFF_MULTICAST;</div><div class='add'>+	dev-&gt;priv_flags &amp;= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Indicate we support unicast address filtering. That way core won't</div><div class='add'>+	 * bring us to promisc mode in case a unicast addr is added.</div><div class='add'>+	 * Let this up to underlay drivers.</div><div class='add'>+	 */</div><div class='add'>+	dev-&gt;priv_flags |= IFF_UNICAST_FLT;</div><div class='add'>+</div><div class='add'>+	dev-&gt;features |= NETIF_F_LLTX;</div><div class='add'>+	dev-&gt;features |= NETIF_F_GRO;</div><div class='add'>+	dev-&gt;hw_features = NETIF_F_HW_VLAN_TX |</div><div class='add'>+			   NETIF_F_HW_VLAN_RX |</div><div class='add'>+			   NETIF_F_HW_VLAN_FILTER;</div><div class='add'>+</div><div class='add'>+	dev-&gt;features |= dev-&gt;hw_features;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_newlink(struct net *src_net, struct net_device *dev,</div><div class='add'>+			struct nlattr *tb[], struct nlattr *data[])</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_ADDRESS] == NULL)</div><div class='add'>+		random_ether_addr(dev-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+	err = register_netdevice(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_validate(struct nlattr *tb[], struct nlattr *data[])</div><div class='add'>+{</div><div class='add'>+	if (tb[IFLA_ADDRESS]) {</div><div class='add'>+		if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS])))</div><div class='add'>+			return -EADDRNOTAVAIL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtnl_link_ops team_link_ops __read_mostly = {</div><div class='add'>+	.kind		= DRV_NAME,</div><div class='add'>+	.priv_size	= sizeof(struct team),</div><div class='add'>+	.setup		= team_setup,</div><div class='add'>+	.newlink	= team_newlink,</div><div class='add'>+	.validate	= team_validate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/***********************************</div><div class='add'>+ * Generic netlink custom interface</div><div class='add'>+ ***********************************/</div><div class='add'>+</div><div class='add'>+static struct genl_family team_nl_family = {</div><div class='add'>+	.id		= GENL_ID_GENERATE,</div><div class='add'>+	.name		= TEAM_GENL_NAME,</div><div class='add'>+	.version	= TEAM_GENL_VERSION,</div><div class='add'>+	.maxattr	= TEAM_ATTR_MAX,</div><div class='add'>+	.netnsok	= true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy team_nl_policy[TEAM_ATTR_MAX + 1] = {</div><div class='add'>+	[TEAM_ATTR_UNSPEC]			= { .type = NLA_UNSPEC, },</div><div class='add'>+	[TEAM_ATTR_TEAM_IFINDEX]		= { .type = NLA_U32 },</div><div class='add'>+	[TEAM_ATTR_LIST_OPTION]			= { .type = NLA_NESTED },</div><div class='add'>+	[TEAM_ATTR_LIST_PORT]			= { .type = NLA_NESTED },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy</div><div class='add'>+team_nl_option_policy[TEAM_ATTR_OPTION_MAX + 1] = {</div><div class='add'>+	[TEAM_ATTR_OPTION_UNSPEC]		= { .type = NLA_UNSPEC, },</div><div class='add'>+	[TEAM_ATTR_OPTION_NAME] = {</div><div class='add'>+		.type = NLA_STRING,</div><div class='add'>+		.len = TEAM_STRING_MAX_LEN,</div><div class='add'>+	},</div><div class='add'>+	[TEAM_ATTR_OPTION_CHANGED]		= { .type = NLA_FLAG },</div><div class='add'>+	[TEAM_ATTR_OPTION_TYPE]			= { .type = NLA_U8 },</div><div class='add'>+	[TEAM_ATTR_OPTION_DATA] = {</div><div class='add'>+		.type = NLA_BINARY,</div><div class='add'>+		.len = TEAM_STRING_MAX_LEN,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int team_nl_cmd_noop(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *msg;</div><div class='add'>+	void *hdr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(msg, info-&gt;snd_pid, info-&gt;snd_seq,</div><div class='add'>+			  &amp;team_nl_family, 0, TEAM_CMD_NOOP);</div><div class='add'>+	if (IS_ERR(hdr)) {</div><div class='add'>+		err = PTR_ERR(hdr);</div><div class='add'>+		goto err_msg_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	genlmsg_end(msg, hdr);</div><div class='add'>+</div><div class='add'>+	return genlmsg_unicast(genl_info_net(info), msg, info-&gt;snd_pid);</div><div class='add'>+</div><div class='add'>+err_msg_put:</div><div class='add'>+	nlmsg_free(msg);</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'>+ * Netlink cmd functions should be locked by following two functions.</div><div class='add'>+ * Since dev gets held here, that ensures dev won't disappear in between.</div><div class='add'>+ */</div><div class='add'>+static struct team *team_nl_team_get(struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net *net = genl_info_net(info);</div><div class='add'>+	int ifindex;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct team *team;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;attrs[TEAM_ATTR_TEAM_IFINDEX])</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ifindex = nla_get_u32(info-&gt;attrs[TEAM_ATTR_TEAM_IFINDEX]);</div><div class='add'>+	dev = dev_get_by_index(net, ifindex);</div><div class='add'>+	if (!dev || dev-&gt;netdev_ops != &amp;team_netdev_ops) {</div><div class='add'>+		if (dev)</div><div class='add'>+			dev_put(dev);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	team = netdev_priv(dev);</div><div class='add'>+	mutex_lock(&amp;team-&gt;lock);</div><div class='add'>+	return team;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void team_nl_team_put(struct team *team)</div><div class='add'>+{</div><div class='add'>+	mutex_unlock(&amp;team-&gt;lock);</div><div class='add'>+	dev_put(team-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_nl_send_generic(struct genl_info *info, struct team *team,</div><div class='add'>+				int (*fill_func)(struct sk_buff *skb,</div><div class='add'>+						 struct genl_info *info,</div><div class='add'>+						 int flags, struct team *team))</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = fill_func(skb, info, NLM_F_ACK, team);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_fill;</div><div class='add'>+</div><div class='add'>+	err = genlmsg_unicast(genl_info_net(info), skb, info-&gt;snd_pid);</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+err_fill:</div><div class='add'>+	nlmsg_free(skb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_nl_fill_options_get_changed(struct sk_buff *skb,</div><div class='add'>+					    u32 pid, u32 seq, int flags,</div><div class='add'>+					    struct team *team,</div><div class='add'>+					    struct team_option *changed_option)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *option_list;</div><div class='add'>+	void *hdr;</div><div class='add'>+	struct team_option *option;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(skb, pid, seq, &amp;team_nl_family, flags,</div><div class='add'>+			  TEAM_CMD_OPTIONS_GET);</div><div class='add'>+	if (IS_ERR(hdr))</div><div class='add'>+		return PTR_ERR(hdr);</div><div class='add'>+</div><div class='add'>+	NLA_PUT_U32(skb, TEAM_ATTR_TEAM_IFINDEX, team-&gt;dev-&gt;ifindex);</div><div class='add'>+	option_list = nla_nest_start(skb, TEAM_ATTR_LIST_OPTION);</div><div class='add'>+	if (!option_list)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(option, &amp;team-&gt;option_list, list) {</div><div class='add'>+		struct nlattr *option_item;</div><div class='add'>+		long arg;</div><div class='add'>+</div><div class='add'>+		option_item = nla_nest_start(skb, TEAM_ATTR_ITEM_OPTION);</div><div class='add'>+		if (!option_item)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		NLA_PUT_STRING(skb, TEAM_ATTR_OPTION_NAME, option-&gt;name);</div><div class='add'>+		if (option == changed_option)</div><div class='add'>+			NLA_PUT_FLAG(skb, TEAM_ATTR_OPTION_CHANGED);</div><div class='add'>+		switch (option-&gt;type) {</div><div class='add'>+		case TEAM_OPTION_TYPE_U32:</div><div class='add'>+			NLA_PUT_U8(skb, TEAM_ATTR_OPTION_TYPE, NLA_U32);</div><div class='add'>+			team_option_get(team, option, &amp;arg);</div><div class='add'>+			NLA_PUT_U32(skb, TEAM_ATTR_OPTION_DATA, arg);</div><div class='add'>+			break;</div><div class='add'>+		case TEAM_OPTION_TYPE_STRING:</div><div class='add'>+			NLA_PUT_U8(skb, TEAM_ATTR_OPTION_TYPE, NLA_STRING);</div><div class='add'>+			team_option_get(team, option, &amp;arg);</div><div class='add'>+			NLA_PUT_STRING(skb, TEAM_ATTR_OPTION_DATA,</div><div class='add'>+				       (char *) arg);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			BUG();</div><div class='add'>+		}</div><div class='add'>+		nla_nest_end(skb, option_item);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, option_list);</div><div class='add'>+	return genlmsg_end(skb, hdr);</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(skb, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_nl_fill_options_get(struct sk_buff *skb,</div><div class='add'>+				    struct genl_info *info, int flags,</div><div class='add'>+				    struct team *team)</div><div class='add'>+{</div><div class='add'>+	return team_nl_fill_options_get_changed(skb, info-&gt;snd_pid,</div><div class='add'>+						info-&gt;snd_seq, NLM_F_ACK,</div><div class='add'>+						team, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_nl_cmd_options_get(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct team *team;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	team = team_nl_team_get(info);</div><div class='add'>+	if (!team)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = team_nl_send_generic(info, team, team_nl_fill_options_get);</div><div class='add'>+</div><div class='add'>+	team_nl_team_put(team);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct team *team;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int i;</div><div class='add'>+	struct nlattr *nl_option;</div><div class='add'>+</div><div class='add'>+	team = team_nl_team_get(info);</div><div class='add'>+	if (!team)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+	if (!info-&gt;attrs[TEAM_ATTR_LIST_OPTION]) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto team_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_for_each_nested(nl_option, info-&gt;attrs[TEAM_ATTR_LIST_OPTION], i) {</div><div class='add'>+		struct nlattr *mode_attrs[TEAM_ATTR_OPTION_MAX + 1];</div><div class='add'>+		enum team_option_type opt_type;</div><div class='add'>+		struct team_option *option;</div><div class='add'>+		char *opt_name;</div><div class='add'>+		bool opt_found = false;</div><div class='add'>+</div><div class='add'>+		if (nla_type(nl_option) != TEAM_ATTR_ITEM_OPTION) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto team_put;</div><div class='add'>+		}</div><div class='add'>+		err = nla_parse_nested(mode_attrs, TEAM_ATTR_OPTION_MAX,</div><div class='add'>+				       nl_option, team_nl_option_policy);</div><div class='add'>+		if (err)</div><div class='add'>+			goto team_put;</div><div class='add'>+		if (!mode_attrs[TEAM_ATTR_OPTION_NAME] ||</div><div class='add'>+		    !mode_attrs[TEAM_ATTR_OPTION_TYPE] ||</div><div class='add'>+		    !mode_attrs[TEAM_ATTR_OPTION_DATA]) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto team_put;</div><div class='add'>+		}</div><div class='add'>+		switch (nla_get_u8(mode_attrs[TEAM_ATTR_OPTION_TYPE])) {</div><div class='add'>+		case NLA_U32:</div><div class='add'>+			opt_type = TEAM_OPTION_TYPE_U32;</div><div class='add'>+			break;</div><div class='add'>+		case NLA_STRING:</div><div class='add'>+			opt_type = TEAM_OPTION_TYPE_STRING;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			goto team_put;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		opt_name = nla_data(mode_attrs[TEAM_ATTR_OPTION_NAME]);</div><div class='add'>+		list_for_each_entry(option, &amp;team-&gt;option_list, list) {</div><div class='add'>+			long arg;</div><div class='add'>+			struct nlattr *opt_data_attr;</div><div class='add'>+</div><div class='add'>+			if (option-&gt;type != opt_type ||</div><div class='add'>+			    strcmp(option-&gt;name, opt_name))</div><div class='add'>+				continue;</div><div class='add'>+			opt_found = true;</div><div class='add'>+			opt_data_attr = mode_attrs[TEAM_ATTR_OPTION_DATA];</div><div class='add'>+			switch (opt_type) {</div><div class='add'>+			case TEAM_OPTION_TYPE_U32:</div><div class='add'>+				arg = nla_get_u32(opt_data_attr);</div><div class='add'>+				break;</div><div class='add'>+			case TEAM_OPTION_TYPE_STRING:</div><div class='add'>+				arg = (long) nla_data(opt_data_attr);</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				BUG();</div><div class='add'>+			}</div><div class='add'>+			err = team_option_set(team, option, &amp;arg);</div><div class='add'>+			if (err)</div><div class='add'>+				goto team_put;</div><div class='add'>+		}</div><div class='add'>+		if (!opt_found) {</div><div class='add'>+			err = -ENOENT;</div><div class='add'>+			goto team_put;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+team_put:</div><div class='add'>+	team_nl_team_put(team);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_nl_fill_port_list_get_changed(struct sk_buff *skb,</div><div class='add'>+					      u32 pid, u32 seq, int flags,</div><div class='add'>+					      struct team *team,</div><div class='add'>+					      struct team_port *changed_port)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *port_list;</div><div class='add'>+	void *hdr;</div><div class='add'>+	struct team_port *port;</div><div class='add'>+</div><div class='add'>+	hdr = genlmsg_put(skb, pid, seq, &amp;team_nl_family, flags,</div><div class='add'>+			  TEAM_CMD_PORT_LIST_GET);</div><div class='add'>+	if (IS_ERR(hdr))</div><div class='add'>+		return PTR_ERR(hdr);</div><div class='add'>+</div><div class='add'>+	NLA_PUT_U32(skb, TEAM_ATTR_TEAM_IFINDEX, team-&gt;dev-&gt;ifindex);</div><div class='add'>+	port_list = nla_nest_start(skb, TEAM_ATTR_LIST_PORT);</div><div class='add'>+	if (!port_list)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(port, &amp;team-&gt;port_list, list) {</div><div class='add'>+		struct nlattr *port_item;</div><div class='add'>+</div><div class='add'>+		port_item = nla_nest_start(skb, TEAM_ATTR_ITEM_PORT);</div><div class='add'>+		if (!port_item)</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+		NLA_PUT_U32(skb, TEAM_ATTR_PORT_IFINDEX, port-&gt;dev-&gt;ifindex);</div><div class='add'>+		if (port == changed_port)</div><div class='add'>+			NLA_PUT_FLAG(skb, TEAM_ATTR_PORT_CHANGED);</div><div class='add'>+		if (port-&gt;linkup)</div><div class='add'>+			NLA_PUT_FLAG(skb, TEAM_ATTR_PORT_LINKUP);</div><div class='add'>+		NLA_PUT_U32(skb, TEAM_ATTR_PORT_SPEED, port-&gt;speed);</div><div class='add'>+		NLA_PUT_U8(skb, TEAM_ATTR_PORT_DUPLEX, port-&gt;duplex);</div><div class='add'>+		nla_nest_end(skb, port_item);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, port_list);</div><div class='add'>+	return genlmsg_end(skb, hdr);</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	genlmsg_cancel(skb, hdr);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_nl_fill_port_list_get(struct sk_buff *skb,</div><div class='add'>+				      struct genl_info *info, int flags,</div><div class='add'>+				      struct team *team)</div><div class='add'>+{</div><div class='add'>+	return team_nl_fill_port_list_get_changed(skb, info-&gt;snd_pid,</div><div class='add'>+						  info-&gt;snd_seq, NLM_F_ACK,</div><div class='add'>+						  team, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_nl_cmd_port_list_get(struct sk_buff *skb,</div><div class='add'>+				     struct genl_info *info)</div><div class='add'>+{</div><div class='add'>+	struct team *team;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	team = team_nl_team_get(info);</div><div class='add'>+	if (!team)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = team_nl_send_generic(info, team, team_nl_fill_port_list_get);</div><div class='add'>+</div><div class='add'>+	team_nl_team_put(team);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct genl_ops team_nl_ops[] = {</div><div class='add'>+	{</div><div class='add'>+		.cmd = TEAM_CMD_NOOP,</div><div class='add'>+		.doit = team_nl_cmd_noop,</div><div class='add'>+		.policy = team_nl_policy,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd = TEAM_CMD_OPTIONS_SET,</div><div class='add'>+		.doit = team_nl_cmd_options_set,</div><div class='add'>+		.policy = team_nl_policy,</div><div class='add'>+		.flags = GENL_ADMIN_PERM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd = TEAM_CMD_OPTIONS_GET,</div><div class='add'>+		.doit = team_nl_cmd_options_get,</div><div class='add'>+		.policy = team_nl_policy,</div><div class='add'>+		.flags = GENL_ADMIN_PERM,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd = TEAM_CMD_PORT_LIST_GET,</div><div class='add'>+		.doit = team_nl_cmd_port_list_get,</div><div class='add'>+		.policy = team_nl_policy,</div><div class='add'>+		.flags = GENL_ADMIN_PERM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct genl_multicast_group team_change_event_mcgrp = {</div><div class='add'>+	.name = TEAM_GENL_CHANGE_EVENT_MC_GRP_NAME,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int team_nl_send_event_options_get(struct team *team,</div><div class='add'>+					  struct team_option *changed_option)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err;</div><div class='add'>+	struct net *net = dev_net(team-&gt;dev);</div><div class='add'>+</div><div class='add'>+	skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = team_nl_fill_options_get_changed(skb, 0, 0, 0, team,</div><div class='add'>+					       changed_option);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_fill;</div><div class='add'>+</div><div class='add'>+	err = genlmsg_multicast_netns(net, skb, 0, team_change_event_mcgrp.id,</div><div class='add'>+				      GFP_KERNEL);</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+err_fill:</div><div class='add'>+	nlmsg_free(skb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_nl_send_event_port_list_get(struct team_port *port)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err;</div><div class='add'>+	struct net *net = dev_net(port-&gt;team-&gt;dev);</div><div class='add'>+</div><div class='add'>+	skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = team_nl_fill_port_list_get_changed(skb, 0, 0, 0,</div><div class='add'>+						 port-&gt;team, port);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_fill;</div><div class='add'>+</div><div class='add'>+	err = genlmsg_multicast_netns(net, skb, 0, team_change_event_mcgrp.id,</div><div class='add'>+				      GFP_KERNEL);</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+err_fill:</div><div class='add'>+	nlmsg_free(skb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int team_nl_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = genl_register_family_with_ops(&amp;team_nl_family, team_nl_ops,</div><div class='add'>+					    ARRAY_SIZE(team_nl_ops));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = genl_register_mc_group(&amp;team_nl_family, &amp;team_change_event_mcgrp);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_change_event_grp_reg;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_change_event_grp_reg:</div><div class='add'>+	genl_unregister_family(&amp;team_nl_family);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void team_nl_fini(void)</div><div class='add'>+{</div><div class='add'>+	genl_unregister_family(&amp;team_nl_family);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/******************</div><div class='add'>+ * Change checkers</div><div class='add'>+ ******************/</div><div class='add'>+</div><div class='add'>+static void __team_options_change_check(struct team *team,</div><div class='add'>+					struct team_option *changed_option)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = team_nl_send_event_options_get(team, changed_option);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_warn(team-&gt;dev, "Failed to send options change via netlink\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rtnl lock is held */</div><div class='add'>+static void __team_port_change_check(struct team_port *port, bool linkup)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (port-&gt;linkup == linkup)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	port-&gt;linkup = linkup;</div><div class='add'>+	if (linkup) {</div><div class='add'>+		struct ethtool_cmd ecmd;</div><div class='add'>+</div><div class='add'>+		err = __ethtool_get_settings(port-&gt;dev, &amp;ecmd);</div><div class='add'>+		if (!err) {</div><div class='add'>+			port-&gt;speed = ethtool_cmd_speed(&amp;ecmd);</div><div class='add'>+			port-&gt;duplex = ecmd.duplex;</div><div class='add'>+			goto send_event;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	port-&gt;speed = 0;</div><div class='add'>+	port-&gt;duplex = 0;</div><div class='add'>+</div><div class='add'>+send_event:</div><div class='add'>+	err = team_nl_send_event_port_list_get(port);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_warn(port-&gt;team-&gt;dev, "Failed to send port change of device %s via netlink\n",</div><div class='add'>+			    port-&gt;dev-&gt;name);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void team_port_change_check(struct team_port *port, bool linkup)</div><div class='add'>+{</div><div class='add'>+	struct team *team = port-&gt;team;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;team-&gt;lock);</div><div class='add'>+	__team_port_change_check(port, linkup);</div><div class='add'>+	mutex_unlock(&amp;team-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/************************************</div><div class='add'>+ * Net device notifier event handler</div><div class='add'>+ ************************************/</div><div class='add'>+</div><div class='add'>+static int team_device_event(struct notifier_block *unused,</div><div class='add'>+			     unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = (struct net_device *) ptr;</div><div class='add'>+	struct team_port *port;</div><div class='add'>+</div><div class='add'>+	port = team_port_get_rtnl(dev);</div><div class='add'>+	if (!port)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case NETDEV_UP:</div><div class='add'>+		if (netif_carrier_ok(dev))</div><div class='add'>+			team_port_change_check(port, true);</div><div class='add'>+	case NETDEV_DOWN:</div><div class='add'>+		team_port_change_check(port, false);</div><div class='add'>+	case NETDEV_CHANGE:</div><div class='add'>+		if (netif_running(port-&gt;dev))</div><div class='add'>+			team_port_change_check(port,</div><div class='add'>+					       !!netif_carrier_ok(port-&gt;dev));</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_UNREGISTER:</div><div class='add'>+		team_del_slave(port-&gt;team-&gt;dev, dev);</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_FEAT_CHANGE:</div><div class='add'>+		team_compute_features(port-&gt;team);</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_CHANGEMTU:</div><div class='add'>+		/* Forbid to change mtu of underlaying device */</div><div class='add'>+		return NOTIFY_BAD;</div><div class='add'>+	case NETDEV_PRE_TYPE_CHANGE:</div><div class='add'>+		/* Forbid to change type of underlaying device */</div><div class='add'>+		return NOTIFY_BAD;</div><div class='add'>+	}</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block team_notifier_block __read_mostly = {</div><div class='add'>+	.notifier_call = team_device_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/***********************</div><div class='add'>+ * Module init and exit</div><div class='add'>+ ***********************/</div><div class='add'>+</div><div class='add'>+static int __init team_module_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	register_netdevice_notifier(&amp;team_notifier_block);</div><div class='add'>+</div><div class='add'>+	err = rtnl_link_register(&amp;team_link_ops);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_rtnl_reg;</div><div class='add'>+</div><div class='add'>+	err = team_nl_init();</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_nl_init;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_nl_init:</div><div class='add'>+	rtnl_link_unregister(&amp;team_link_ops);</div><div class='add'>+</div><div class='add'>+err_rtnl_reg:</div><div class='add'>+	unregister_netdevice_notifier(&amp;team_notifier_block);</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 team_module_exit(void)</div><div class='add'>+{</div><div class='add'>+	team_nl_fini();</div><div class='add'>+	rtnl_link_unregister(&amp;team_link_ops);</div><div class='add'>+	unregister_netdevice_notifier(&amp;team_notifier_block);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(team_module_init);</div><div class='add'>+module_exit(team_module_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_AUTHOR("Jiri Pirko &lt;jpirko@redhat.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Ethernet team device driver");</div><div class='add'>+MODULE_ALIAS_RTNL_LINK(DRV_NAME);</div><div class='head'>diff --git a/drivers/net/team/team_mode_activebackup.c b/drivers/net/team/team_mode_activebackup.c<br/>new file mode 100644<br/>index 000000000000..f4d960e82e29<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/team/team_mode_activebackup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/team/team_mode_activebackup.c</a></div><div class='hunk'>@@ -0,0 +1,136 @@</div><div class='add'>+/*</div><div class='add'>+ * net/drivers/team/team_mode_activebackup.c - Active-backup mode for team</div><div class='add'>+ * Copyright (c) 2011 Jiri Pirko &lt;jpirko@redhat.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 &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.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/errno.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;net/rtnetlink.h&gt;</div><div class='add'>+#include &lt;linux/if_team.h&gt;</div><div class='add'>+</div><div class='add'>+struct ab_priv {</div><div class='add'>+	struct team_port __rcu *active_port;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ab_priv *ab_priv(struct team *team)</div><div class='add'>+{</div><div class='add'>+	return (struct ab_priv *) &amp;team-&gt;mode_priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static rx_handler_result_t ab_receive(struct team *team, struct team_port *port,</div><div class='add'>+				      struct sk_buff *skb) {</div><div class='add'>+	struct team_port *active_port;</div><div class='add'>+</div><div class='add'>+	active_port = rcu_dereference(ab_priv(team)-&gt;active_port);</div><div class='add'>+	if (active_port != port)</div><div class='add'>+		return RX_HANDLER_EXACT;</div><div class='add'>+	return RX_HANDLER_ANOTHER;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ab_transmit(struct team *team, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct team_port *active_port;</div><div class='add'>+</div><div class='add'>+	active_port = rcu_dereference(ab_priv(team)-&gt;active_port);</div><div class='add'>+	if (unlikely(!active_port))</div><div class='add'>+		goto drop;</div><div class='add'>+	skb-&gt;dev = active_port-&gt;dev;</div><div class='add'>+	if (dev_queue_xmit(skb))</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+drop:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ab_port_leave(struct team *team, struct team_port *port)</div><div class='add'>+{</div><div class='add'>+	if (ab_priv(team)-&gt;active_port == port)</div><div class='add'>+		RCU_INIT_POINTER(ab_priv(team)-&gt;active_port, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ab_active_port_get(struct team *team, void *arg)</div><div class='add'>+{</div><div class='add'>+	u32 *ifindex = arg;</div><div class='add'>+</div><div class='add'>+	*ifindex = 0;</div><div class='add'>+	if (ab_priv(team)-&gt;active_port)</div><div class='add'>+		*ifindex = ab_priv(team)-&gt;active_port-&gt;dev-&gt;ifindex;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ab_active_port_set(struct team *team, void *arg)</div><div class='add'>+{</div><div class='add'>+	u32 *ifindex = arg;</div><div class='add'>+	struct team_port *port;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(port, &amp;team-&gt;port_list, list) {</div><div class='add'>+		if (port-&gt;dev-&gt;ifindex == *ifindex) {</div><div class='add'>+			rcu_assign_pointer(ab_priv(team)-&gt;active_port, port);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct team_option ab_options[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "activeport",</div><div class='add'>+		.type = TEAM_OPTION_TYPE_U32,</div><div class='add'>+		.getter = ab_active_port_get,</div><div class='add'>+		.setter = ab_active_port_set,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ab_init(struct team *team)</div><div class='add'>+{</div><div class='add'>+	return team_options_register(team, ab_options, ARRAY_SIZE(ab_options));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ab_exit(struct team *team)</div><div class='add'>+{</div><div class='add'>+	team_options_unregister(team, ab_options, ARRAY_SIZE(ab_options));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct team_mode_ops ab_mode_ops = {</div><div class='add'>+	.init			= ab_init,</div><div class='add'>+	.exit			= ab_exit,</div><div class='add'>+	.receive		= ab_receive,</div><div class='add'>+	.transmit		= ab_transmit,</div><div class='add'>+	.port_leave		= ab_port_leave,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct team_mode ab_mode = {</div><div class='add'>+	.kind		= "activebackup",</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.priv_size	= sizeof(struct ab_priv),</div><div class='add'>+	.ops		= &amp;ab_mode_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ab_init_module(void)</div><div class='add'>+{</div><div class='add'>+	return team_mode_register(&amp;ab_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit ab_cleanup_module(void)</div><div class='add'>+{</div><div class='add'>+	team_mode_unregister(&amp;ab_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ab_init_module);</div><div class='add'>+module_exit(ab_cleanup_module);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_AUTHOR("Jiri Pirko &lt;jpirko@redhat.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Active-backup mode for team");</div><div class='add'>+MODULE_ALIAS("team-mode-activebackup");</div><div class='head'>diff --git a/drivers/net/team/team_mode_roundrobin.c b/drivers/net/team/team_mode_roundrobin.c<br/>new file mode 100644<br/>index 000000000000..a0e8f806331a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/team/team_mode_roundrobin.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/team/team_mode_roundrobin.c</a></div><div class='hunk'>@@ -0,0 +1,107 @@</div><div class='add'>+/*</div><div class='add'>+ * net/drivers/team/team_mode_roundrobin.c - Round-robin mode for team</div><div class='add'>+ * Copyright (c) 2011 Jiri Pirko &lt;jpirko@redhat.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 &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.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/errno.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_team.h&gt;</div><div class='add'>+</div><div class='add'>+struct rr_priv {</div><div class='add'>+	unsigned int sent_packets;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rr_priv *rr_priv(struct team *team)</div><div class='add'>+{</div><div class='add'>+	return (struct rr_priv *) &amp;team-&gt;mode_priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct team_port *__get_first_port_up(struct team *team,</div><div class='add'>+					     struct team_port *port)</div><div class='add'>+{</div><div class='add'>+	struct team_port *cur;</div><div class='add'>+</div><div class='add'>+	if (port-&gt;linkup)</div><div class='add'>+		return port;</div><div class='add'>+	cur = port;</div><div class='add'>+	list_for_each_entry_continue_rcu(cur, &amp;team-&gt;port_list, list)</div><div class='add'>+		if (cur-&gt;linkup)</div><div class='add'>+			return cur;</div><div class='add'>+	list_for_each_entry_rcu(cur, &amp;team-&gt;port_list, list) {</div><div class='add'>+		if (cur == port)</div><div class='add'>+			break;</div><div class='add'>+		if (cur-&gt;linkup)</div><div class='add'>+			return cur;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool rr_transmit(struct team *team, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct team_port *port;</div><div class='add'>+	int port_index;</div><div class='add'>+</div><div class='add'>+	port_index = rr_priv(team)-&gt;sent_packets++ % team-&gt;port_count;</div><div class='add'>+	port = team_get_port_by_index_rcu(team, port_index);</div><div class='add'>+	port = __get_first_port_up(team, port);</div><div class='add'>+	if (unlikely(!port))</div><div class='add'>+		goto drop;</div><div class='add'>+	skb-&gt;dev = port-&gt;dev;</div><div class='add'>+	if (dev_queue_xmit(skb))</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+drop:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rr_port_enter(struct team *team, struct team_port *port)</div><div class='add'>+{</div><div class='add'>+	return team_port_set_team_mac(port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rr_port_change_mac(struct team *team, struct team_port *port)</div><div class='add'>+{</div><div class='add'>+	team_port_set_team_mac(port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct team_mode_ops rr_mode_ops = {</div><div class='add'>+	.transmit		= rr_transmit,</div><div class='add'>+	.port_enter		= rr_port_enter,</div><div class='add'>+	.port_change_mac	= rr_port_change_mac,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct team_mode rr_mode = {</div><div class='add'>+	.kind		= "roundrobin",</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.priv_size	= sizeof(struct rr_priv),</div><div class='add'>+	.ops		= &amp;rr_mode_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init rr_init_module(void)</div><div class='add'>+{</div><div class='add'>+	return team_mode_register(&amp;rr_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit rr_cleanup_module(void)</div><div class='add'>+{</div><div class='add'>+	team_mode_unregister(&amp;rr_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(rr_init_module);</div><div class='add'>+module_exit(rr_cleanup_module);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_AUTHOR("Jiri Pirko &lt;jpirko@redhat.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Round-robin mode for team");</div><div class='add'>+MODULE_ALIAS("team-mode-roundrobin");</div><div class='head'>diff --git a/drivers/net/tun.c b/drivers/net/tun.c<br/>index 7bea9c65119e..93c5d72711b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tun.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/tun.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tun.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/tun.c</a></div><div class='hunk'>@@ -123,7 +123,7 @@ struct tun_struct {</div><div class='ctx'> 	gid_t			group;</div><div class='ctx'> </div><div class='ctx'> 	struct net_device	*dev;</div><div class='del'>-	u32			set_features;</div><div class='add'>+	netdev_features_t	set_features;</div><div class='ctx'> #define TUN_USER_FEATURES (NETIF_F_HW_CSUM|NETIF_F_TSO_ECN|NETIF_F_TSO| \</div><div class='ctx'> 			  NETIF_F_TSO6|NETIF_F_UFO)</div><div class='ctx'> 	struct fasync_struct	*fasync;</div><div class='hunk'>@@ -454,7 +454,8 @@ tun_net_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='del'>-static u32 tun_net_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static netdev_features_t tun_net_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct tun_struct *tun = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1196,7 +1197,7 @@ static int tun_get_iff(struct net *net, struct tun_struct *tun,</div><div class='ctx'>  * privs required. */</div><div class='ctx'> static int set_offload(struct tun_struct *tun, unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	u32 features = 0;</div><div class='add'>+	netdev_features_t features = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (arg &amp; TUN_F_CSUM) {</div><div class='ctx'> 		features |= NETIF_F_HW_CSUM;</div><div class='hunk'>@@ -1589,16 +1590,15 @@ static void tun_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info</div><div class='ctx'> {</div><div class='ctx'> 	struct tun_struct *tun = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;fw_version, "N/A");</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='ctx'> </div><div class='ctx'> 	switch (tun-&gt;flags &amp; TUN_TYPE_MASK) {</div><div class='ctx'> 	case TUN_TUN_DEV:</div><div class='del'>-		strcpy(info-&gt;bus_info, "tun");</div><div class='add'>+		strlcpy(info-&gt;bus_info, "tun", sizeof(info-&gt;bus_info));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TUN_TAP_DEV:</div><div class='del'>-		strcpy(info-&gt;bus_info, "tap");</div><div class='add'>+		strlcpy(info-&gt;bus_info, "tap", sizeof(info-&gt;bus_info));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c<br/>index e95f0e60a9bc..8e84f5bdd6ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/asix.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/asix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/asix.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/asix.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> #include &lt;linux/usb/usbnet.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#define DRIVER_VERSION "08-Nov-2011"</div><div class='add'>+#define DRIVER_VERSION "22-Dec-2011"</div><div class='ctx'> #define DRIVER_NAME "asix"</div><div class='ctx'> </div><div class='ctx'> /* ASIX AX8817X based USB 2.0 Ethernet Devices */</div><div class='hunk'>@@ -376,7 +376,7 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 		skb_pull(skb, (size + 1) &amp; 0xfffe);</div><div class='ctx'> </div><div class='del'>-		if (skb-&gt;len == 0)</div><div class='add'>+		if (skb-&gt;len &lt; sizeof(header))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		head = (u8 *) skb-&gt;data;</div><div class='hunk'>@@ -689,6 +689,10 @@ asix_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)</div><div class='ctx'> 	}</div><div class='ctx'> 	wolinfo-&gt;supported = WAKE_PHY | WAKE_MAGIC;</div><div class='ctx'> 	wolinfo-&gt;wolopts = 0;</div><div class='add'>+	if (opt &amp; AX_MONITOR_LINK)</div><div class='add'>+		wolinfo-&gt;wolopts |= WAKE_PHY;</div><div class='add'>+	if (opt &amp; AX_MONITOR_MAGIC)</div><div class='add'>+		wolinfo-&gt;wolopts |= WAKE_MAGIC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -974,6 +978,7 @@ static int ax88772_link_reset(struct usbnet *dev)</div><div class='ctx'> </div><div class='ctx'> static int ax88772_reset(struct usbnet *dev)</div><div class='ctx'> {</div><div class='add'>+	struct asix_data *data = (struct asix_data *)&amp;dev-&gt;data;</div><div class='ctx'> 	int ret, embd_phy;</div><div class='ctx'> 	u16 rx_ctl;</div><div class='ctx'> </div><div class='hunk'>@@ -1051,6 +1056,13 @@ static int ax88772_reset(struct usbnet *dev)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Rewrite MAC address */</div><div class='add'>+	memcpy(data-&gt;mac_addr, dev-&gt;net-&gt;dev_addr, ETH_ALEN);</div><div class='add'>+	ret = asix_write_cmd(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,</div><div class='add'>+							data-&gt;mac_addr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	/* Set RX_CTL to default values with 2k buffer, and enable cactus */</div><div class='ctx'> 	ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -1148,7 +1160,7 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ethtool_ops ax88178_ethtool_ops = {</div><div class='add'>+static const struct ethtool_ops ax88178_ethtool_ops = {</div><div class='ctx'> 	.get_drvinfo		= asix_get_drvinfo,</div><div class='ctx'> 	.get_link		= asix_get_link,</div><div class='ctx'> 	.get_msglevel		= usbnet_get_msglevel,</div><div class='hunk'>@@ -1316,6 +1328,13 @@ static int ax88178_reset(struct usbnet *dev)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	/* Rewrite MAC address */</div><div class='add'>+	memcpy(data-&gt;mac_addr, dev-&gt;net-&gt;dev_addr, ETH_ALEN);</div><div class='add'>+	ret = asix_write_cmd(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,</div><div class='add'>+							data-&gt;mac_addr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -1674,17 +1693,7 @@ static struct usb_driver asix_driver = {</div><div class='ctx'> 	.supports_autosuspend = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init asix_init(void)</div><div class='del'>-{</div><div class='del'>- 	return usb_register(&amp;asix_driver);</div><div class='del'>-}</div><div class='del'>-module_init(asix_init);</div><div class='del'>-</div><div class='del'>-static void __exit asix_exit(void)</div><div class='del'>-{</div><div class='del'>- 	usb_deregister(&amp;asix_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(asix_exit);</div><div class='add'>+module_usb_driver(asix_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("David Hollis");</div><div class='ctx'> MODULE_VERSION(DRIVER_VERSION);</div><div class='head'>diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c<br/>index a68272c93381..182cfb4aeb1d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/catc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/catc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/catc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/catc.c</a></div><div class='hunk'>@@ -949,19 +949,4 @@ static struct usb_driver catc_driver = {</div><div class='ctx'> 	.id_table =	catc_id_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init catc_init(void)</div><div class='del'>-{</div><div class='del'>-	int result = usb_register(&amp;catc_driver);</div><div class='del'>-	if (result == 0)</div><div class='del'>-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='del'>-		       DRIVER_DESC "\n");</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit catc_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;catc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(catc_init);</div><div class='del'>-module_exit(catc_exit);</div><div class='add'>+module_usb_driver(catc_driver);</div><div class='head'>diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c<br/>index a60d0069cc45..790cbdea7392 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/cdc-phonet.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/cdc-phonet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/cdc-phonet.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/cdc-phonet.c</a></div><div class='hunk'>@@ -130,7 +130,7 @@ static int rx_submit(struct usbpn_dev *pnd, struct urb *req, gfp_t gfp_flags)</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	page = __netdev_alloc_page(dev, gfp_flags);</div><div class='add'>+	page = alloc_page(gfp_flags);</div><div class='ctx'> 	if (!page)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -140,7 +140,7 @@ static int rx_submit(struct usbpn_dev *pnd, struct urb *req, gfp_t gfp_flags)</div><div class='ctx'> 	err = usb_submit_urb(req, gfp_flags);</div><div class='ctx'> 	if (unlikely(err)) {</div><div class='ctx'> 		dev_dbg(&amp;dev-&gt;dev, "RX submit error (%d)\n", err);</div><div class='del'>-		netdev_free_page(dev, page);</div><div class='add'>+		put_page(page);</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -208,9 +208,9 @@ static void rx_complete(struct urb *req)</div><div class='ctx'> 	dev-&gt;stats.rx_errors++;</div><div class='ctx'> resubmit:</div><div class='ctx'> 	if (page)</div><div class='del'>-		netdev_free_page(dev, page);</div><div class='add'>+		put_page(page);</div><div class='ctx'> 	if (req)</div><div class='del'>-		rx_submit(pnd, req, GFP_ATOMIC);</div><div class='add'>+		rx_submit(pnd, req, GFP_ATOMIC | __GFP_COLD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int usbpn_close(struct net_device *dev);</div><div class='hunk'>@@ -229,7 +229,7 @@ static int usbpn_open(struct net_device *dev)</div><div class='ctx'> 	for (i = 0; i &lt; rxq_size; i++) {</div><div class='ctx'> 		struct urb *req = usb_alloc_urb(0, GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-		if (!req || rx_submit(pnd, req, GFP_KERNEL)) {</div><div class='add'>+		if (!req || rx_submit(pnd, req, GFP_KERNEL | __GFP_COLD)) {</div><div class='ctx'> 			usbpn_close(dev);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -457,18 +457,7 @@ static struct usb_driver usbpn_driver = {</div><div class='ctx'> 	.id_table =	usbpn_ids,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init usbpn_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;usbpn_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit usbpn_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;usbpn_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(usbpn_init);</div><div class='del'>-module_exit(usbpn_exit);</div><div class='add'>+module_usb_driver(usbpn_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Remi Denis-Courmont");</div><div class='ctx'> MODULE_DESCRIPTION("USB CDC Phonet host interface");</div><div class='head'>diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c<br/>index 882f53f708df..439690be519f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/cdc_eem.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/cdc_eem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/cdc_eem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/cdc_eem.c</a></div><div class='hunk'>@@ -369,18 +369,7 @@ static struct usb_driver eem_driver = {</div><div class='ctx'> 	.resume =	usbnet_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init eem_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;eem_driver);</div><div class='del'>-}</div><div class='del'>-module_init(eem_init);</div><div class='del'>-</div><div class='del'>-static void __exit eem_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;eem_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(eem_exit);</div><div class='add'>+module_usb_driver(eem_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Omar Laazimani &lt;omar.oberthur@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("USB CDC EEM");</div><div class='head'>diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c<br/>index 99ed6eb4dfaf..41a61efc331e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/cdc_ether.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/cdc_ether.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/cdc_ether.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/cdc_ether.c</a></div><div class='hunk'>@@ -425,6 +425,9 @@ int usbnet_cdc_bind(struct usbnet *dev, struct usb_interface *intf)</div><div class='ctx'> 	int				status;</div><div class='ctx'> 	struct cdc_state		*info = (void *) &amp;dev-&gt;data;</div><div class='ctx'> </div><div class='add'>+	BUILD_BUG_ON((sizeof(((struct usbnet *)0)-&gt;data)</div><div class='add'>+			&lt; sizeof(struct cdc_state)));</div><div class='add'>+</div><div class='ctx'> 	status = usbnet_generic_cdc_bind(dev, intf);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		return status;</div><div class='hunk'>@@ -615,21 +618,7 @@ static struct usb_driver cdc_driver = {</div><div class='ctx'> 	.supports_autosuspend = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init cdc_init(void)</div><div class='del'>-{</div><div class='del'>-	BUILD_BUG_ON((sizeof(((struct usbnet *)0)-&gt;data)</div><div class='del'>-			&lt; sizeof(struct cdc_state)));</div><div class='del'>-</div><div class='del'>- 	return usb_register(&amp;cdc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(cdc_init);</div><div class='del'>-</div><div class='del'>-static void __exit cdc_exit(void)</div><div class='del'>-{</div><div class='del'>- 	usb_deregister(&amp;cdc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(cdc_exit);</div><div class='add'>+module_usb_driver(cdc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("David Brownell");</div><div class='ctx'> MODULE_DESCRIPTION("USB CDC Ethernet devices");</div><div class='head'>diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c<br/>index f06fb78383a1..3a539a9cac54 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/cdc_ncm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/cdc_ncm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/cdc_ncm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/cdc_ncm.c</a></div><div class='hunk'>@@ -138,7 +138,7 @@ struct cdc_ncm_ctx {</div><div class='ctx'> static void cdc_ncm_tx_timeout(unsigned long arg);</div><div class='ctx'> static const struct driver_info cdc_ncm_info;</div><div class='ctx'> static struct usb_driver cdc_ncm_driver;</div><div class='del'>-static struct ethtool_ops cdc_ncm_ethtool_ops;</div><div class='add'>+static const struct ethtool_ops cdc_ncm_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> static const struct usb_device_id cdc_devs[] = {</div><div class='ctx'> 	{ USB_INTERFACE_INFO(USB_CLASS_COMM,</div><div class='hunk'>@@ -465,12 +465,10 @@ static int cdc_ncm_bind(struct usbnet *dev, struct usb_interface *intf)</div><div class='ctx'> 	int temp;</div><div class='ctx'> 	u8 iface_no;</div><div class='ctx'> </div><div class='del'>-	ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='ctx'> 	if (ctx == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	memset(ctx, 0, sizeof(*ctx));</div><div class='del'>-</div><div class='ctx'> 	init_timer(&amp;ctx-&gt;tx_timer);</div><div class='ctx'> 	spin_lock_init(&amp;ctx-&gt;mtx);</div><div class='ctx'> 	ctx-&gt;netdev = dev-&gt;net;</div><div class='hunk'>@@ -1222,7 +1220,7 @@ static struct usb_driver cdc_ncm_driver = {</div><div class='ctx'> 	.supports_autosuspend = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ethtool_ops cdc_ncm_ethtool_ops = {</div><div class='add'>+static const struct ethtool_ops cdc_ncm_ethtool_ops = {</div><div class='ctx'> 	.get_drvinfo = cdc_ncm_get_drvinfo,</div><div class='ctx'> 	.get_link = usbnet_get_link,</div><div class='ctx'> 	.get_msglevel = usbnet_get_msglevel,</div><div class='hunk'>@@ -1232,20 +1230,7 @@ static struct ethtool_ops cdc_ncm_ethtool_ops = {</div><div class='ctx'> 	.nway_reset = usbnet_nway_reset,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init cdc_ncm_init(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION "\n");</div><div class='del'>-	return usb_register(&amp;cdc_ncm_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(cdc_ncm_init);</div><div class='del'>-</div><div class='del'>-static void __exit cdc_ncm_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;cdc_ncm_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_exit(cdc_ncm_exit);</div><div class='add'>+module_usb_driver(cdc_ncm_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Hans Petter Selasky");</div><div class='ctx'> MODULE_DESCRIPTION("USB CDC NCM host driver");</div><div class='head'>diff --git a/drivers/net/usb/cdc_subset.c b/drivers/net/usb/cdc_subset.c<br/>index fc5f13d47ad9..b403d934e4e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/cdc_subset.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/cdc_subset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/cdc_subset.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/cdc_subset.c</a></div><div class='hunk'>@@ -338,17 +338,7 @@ static struct usb_driver cdc_subset_driver = {</div><div class='ctx'> 	.id_table =	products,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init cdc_subset_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;cdc_subset_driver);</div><div class='del'>-}</div><div class='del'>-module_init(cdc_subset_init);</div><div class='del'>-</div><div class='del'>-static void __exit cdc_subset_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;cdc_subset_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(cdc_subset_exit);</div><div class='add'>+module_usb_driver(cdc_subset_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("David Brownell");</div><div class='ctx'> MODULE_DESCRIPTION("Simple 'CDC Subset' USB networking links");</div><div class='head'>diff --git a/drivers/net/usb/cx82310_eth.c b/drivers/net/usb/cx82310_eth.c<br/>index 8969f124c18c..0e0531356e62 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/cx82310_eth.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/cx82310_eth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/cx82310_eth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/cx82310_eth.c</a></div><div class='hunk'>@@ -329,17 +329,7 @@ static struct usb_driver cx82310_driver = {</div><div class='ctx'> 	.resume		= usbnet_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init cx82310_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;cx82310_driver);</div><div class='del'>-}</div><div class='del'>-module_init(cx82310_init);</div><div class='del'>-</div><div class='del'>-static void __exit cx82310_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;cx82310_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(cx82310_exit);</div><div class='add'>+module_usb_driver(cx82310_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Ondrej Zary");</div><div class='ctx'> MODULE_DESCRIPTION("Conexant CX82310-based ADSL router USB ethernet driver");</div><div class='head'>diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c<br/>index fbc0e4def767..b97226318ea5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/dm9601.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/dm9601.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/dm9601.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/dm9601.c</a></div><div class='hunk'>@@ -672,18 +672,7 @@ static struct usb_driver dm9601_driver = {</div><div class='ctx'> 	.resume = usbnet_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init dm9601_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;dm9601_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit dm9601_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;dm9601_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(dm9601_init);</div><div class='del'>-module_exit(dm9601_exit);</div><div class='add'>+module_usb_driver(dm9601_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Peter Korsgaard &lt;jacmet@sunsite.dk&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Davicom DM9601 USB 1.1 ethernet devices");</div><div class='head'>diff --git a/drivers/net/usb/gl620a.c b/drivers/net/usb/gl620a.c<br/>index c4cfd1dea881..38266bdae26b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/gl620a.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/gl620a.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/gl620a.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/gl620a.c</a></div><div class='hunk'>@@ -227,17 +227,7 @@ static struct usb_driver gl620a_driver = {</div><div class='ctx'> 	.resume =	usbnet_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init usbnet_init(void)</div><div class='del'>-{</div><div class='del'>- 	return usb_register(&amp;gl620a_driver);</div><div class='del'>-}</div><div class='del'>-module_init(usbnet_init);</div><div class='del'>-</div><div class='del'>-static void __exit usbnet_exit(void)</div><div class='del'>-{</div><div class='del'>- 	usb_deregister(&amp;gl620a_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(usbnet_exit);</div><div class='add'>+module_usb_driver(gl620a_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jiun-Jie Huang");</div><div class='ctx'> MODULE_DESCRIPTION("GL620-USB-A Host-to-Host Link cables");</div><div class='head'>diff --git a/drivers/net/usb/int51x1.c b/drivers/net/usb/int51x1.c<br/>index 131ac6c172f6..12a22a453ff1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/int51x1.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/int51x1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/int51x1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/int51x1.c</a></div><div class='hunk'>@@ -238,17 +238,7 @@ static struct usb_driver int51x1_driver = {</div><div class='ctx'> 	.resume     = usbnet_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init int51x1_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;int51x1_driver);</div><div class='del'>-}</div><div class='del'>-module_init(int51x1_init);</div><div class='del'>-</div><div class='del'>-static void __exit int51x1_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;int51x1_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(int51x1_exit);</div><div class='add'>+module_usb_driver(int51x1_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Peter Holik");</div><div class='ctx'> MODULE_DESCRIPTION("Intellon usb powerline adapter");</div><div class='head'>diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c<br/>index 13c1f044b40d..e84662db51cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/ipheth.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/ipheth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/ipheth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/ipheth.c</a></div><div class='hunk'>@@ -420,7 +420,7 @@ static u32 ipheth_ethtool_op_get_link(struct net_device *net)</div><div class='ctx'> 	return netif_carrier_ok(dev-&gt;net);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ethtool_ops ops = {</div><div class='add'>+static const struct ethtool_ops ops = {</div><div class='ctx'> 	.get_link = ipheth_ethtool_op_get_link</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -543,25 +543,7 @@ static struct usb_driver ipheth_driver = {</div><div class='ctx'> 	.id_table =	ipheth_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ipheth_init(void)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	retval = usb_register(&amp;ipheth_driver);</div><div class='del'>-	if (retval) {</div><div class='del'>-		err("usb_register failed: %d", retval);</div><div class='del'>-		return retval;</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 ipheth_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;ipheth_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ipheth_init);</div><div class='del'>-module_exit(ipheth_exit);</div><div class='add'>+module_usb_driver(ipheth_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Diego Giagio &lt;diego@giagio.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Apple iPhone USB Ethernet driver");</div><div class='head'>diff --git a/drivers/net/usb/kalmia.c b/drivers/net/usb/kalmia.c<br/>index 5a6d0f88f43b..7562649b3d6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/kalmia.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/kalmia.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/kalmia.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/kalmia.c</a></div><div class='hunk'>@@ -375,17 +375,7 @@ static struct usb_driver kalmia_driver = {</div><div class='ctx'> 	.resume = usbnet_resume</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init kalmia_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;kalmia_driver);</div><div class='del'>-}</div><div class='del'>-module_init( kalmia_init);</div><div class='del'>-</div><div class='del'>-static void __exit kalmia_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;kalmia_driver);</div><div class='del'>-}</div><div class='del'>-module_exit( kalmia_exit);</div><div class='add'>+module_usb_driver(kalmia_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Marius Bjoernstad Kotsbak &lt;marius@kotsbak.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Samsung Kalmia USB network driver");</div><div class='head'>diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c<br/>index 582ca2dfa5f9..d034d9c42548 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/kaweth.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/kaweth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/kaweth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/kaweth.c</a></div><div class='hunk'>@@ -1324,32 +1324,4 @@ static int kaweth_internal_control_msg(struct usb_device *usb_dev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/****************************************************************</div><div class='del'>- *     kaweth_init</div><div class='del'>- ****************************************************************/</div><div class='del'>-static int __init kaweth_init(void)</div><div class='del'>-{</div><div class='del'>-	dbg("Driver loading");</div><div class='del'>-	return usb_register(&amp;kaweth_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/****************************************************************</div><div class='del'>- *     kaweth_exit</div><div class='del'>- ****************************************************************/</div><div class='del'>-static void __exit kaweth_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;kaweth_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(kaweth_init);</div><div class='del'>-module_exit(kaweth_exit);</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='add'>+module_usb_driver(kaweth_driver);</div><div class='head'>diff --git a/drivers/net/usb/lg-vl600.c b/drivers/net/usb/lg-vl600.c<br/>index 9c26c6390d69..45a981fde43f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/lg-vl600.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/lg-vl600.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/lg-vl600.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/lg-vl600.c</a></div><div class='hunk'>@@ -346,17 +346,7 @@ static struct usb_driver lg_vl600_driver = {</div><div class='ctx'> 	.resume		= usbnet_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init vl600_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;lg_vl600_driver);</div><div class='del'>-}</div><div class='del'>-module_init(vl600_init);</div><div class='del'>-</div><div class='del'>-static void __exit vl600_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;lg_vl600_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(vl600_exit);</div><div class='add'>+module_usb_driver(lg_vl600_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Anrzej Zaborowski");</div><div class='ctx'> MODULE_DESCRIPTION("LG-VL600 modem's ethernet link");</div><div class='head'>diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c<br/>index db2cb74bf854..a29aa9cf9f6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/mcs7830.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/mcs7830.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/mcs7830.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/mcs7830.c</a></div><div class='hunk'>@@ -692,17 +692,7 @@ static struct usb_driver mcs7830_driver = {</div><div class='ctx'> 	.reset_resume = mcs7830_reset_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init mcs7830_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;mcs7830_driver);</div><div class='del'>-}</div><div class='del'>-module_init(mcs7830_init);</div><div class='del'>-</div><div class='del'>-static void __exit mcs7830_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;mcs7830_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(mcs7830_exit);</div><div class='add'>+module_usb_driver(mcs7830_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("USB to network adapter MCS7830)");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/usb/net1080.c b/drivers/net/usb/net1080.c<br/>index 01db4602a39e..83f965cb69e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/net1080.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/net1080.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/net1080.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/net1080.c</a></div><div class='hunk'>@@ -589,17 +589,7 @@ static struct usb_driver net1080_driver = {</div><div class='ctx'> 	.resume =	usbnet_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init net1080_init(void)</div><div class='del'>-{</div><div class='del'>- 	return usb_register(&amp;net1080_driver);</div><div class='del'>-}</div><div class='del'>-module_init(net1080_init);</div><div class='del'>-</div><div class='del'>-static void __exit net1080_exit(void)</div><div class='del'>-{</div><div class='del'>- 	usb_deregister(&amp;net1080_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(net1080_exit);</div><div class='add'>+module_usb_driver(net1080_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("David Brownell");</div><div class='ctx'> MODULE_DESCRIPTION("NetChip 1080 based USB Host-to-Host Links");</div><div class='head'>diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c<br/>index 769f5090bda1..5d99b8cacd7d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/pegasus.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/pegasus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/pegasus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/pegasus.c</a></div><div class='hunk'>@@ -55,8 +55,8 @@ static const char driver_name[] = "pegasus";</div><div class='ctx'> #define	BMSR_MEDIA	(BMSR_10HALF | BMSR_10FULL | BMSR_100HALF | \</div><div class='ctx'> 			BMSR_100FULL | BMSR_ANEGCAPABLE)</div><div class='ctx'> </div><div class='del'>-static int loopback;</div><div class='del'>-static int mii_mode;</div><div class='add'>+static bool loopback;</div><div class='add'>+static bool mii_mode;</div><div class='ctx'> static char *devid;</div><div class='ctx'> </div><div class='ctx'> static struct usb_eth_dev usb_dev_id[] = {</div><div class='hunk'>@@ -517,7 +517,7 @@ static inline int reset_mac(pegasus_t *pegasus)</div><div class='ctx'> 	for (i = 0; i &lt; REG_TIMEOUT; i++) {</div><div class='ctx'> 		get_registers(pegasus, EthCtrl1, 1, &amp;data);</div><div class='ctx'> 		if (~data &amp; 0x08) {</div><div class='del'>-			if (loopback &amp; 1)</div><div class='add'>+			if (loopback)</div><div class='ctx'> 				break;</div><div class='ctx'> 			if (mii_mode &amp;&amp; (pegasus-&gt;features &amp; HAS_HOME_PNA))</div><div class='ctx'> 				set_register(pegasus, Gpio1, 0x34);</div><div class='hunk'>@@ -561,7 +561,7 @@ static int enable_net_traffic(struct net_device *dev, struct usb_device *usb)</div><div class='ctx'> 		data[1] |= 0x10;	/* set 100 Mbps */</div><div class='ctx'> 	if (mii_mode)</div><div class='ctx'> 		data[1] = 0;</div><div class='del'>-	data[2] = (loopback &amp; 1) ? 0x09 : 0x01;</div><div class='add'>+	data[2] = loopback ? 0x09 : 0x01;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(pegasus-&gt;eth_regs, data, sizeof(data));</div><div class='ctx'> 	ret = set_registers(pegasus, EthCtrl0, 3, data);</div><div class='head'>diff --git a/drivers/net/usb/plusb.c b/drivers/net/usb/plusb.c<br/>index 217aec8a768f..b2b035e29978 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/plusb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/plusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/plusb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/plusb.c</a></div><div class='hunk'>@@ -154,17 +154,7 @@ static struct usb_driver plusb_driver = {</div><div class='ctx'> 	.resume =	usbnet_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init plusb_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;plusb_driver);</div><div class='del'>-}</div><div class='del'>-module_init(plusb_init);</div><div class='del'>-</div><div class='del'>-static void __exit plusb_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;plusb_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(plusb_exit);</div><div class='add'>+module_usb_driver(plusb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("David Brownell");</div><div class='ctx'> MODULE_DESCRIPTION("Prolific PL-2301/2302/25A1 USB Host to Host Link Driver");</div><div class='head'>diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c<br/>index 255d6a424a6b..c8f1b5b3aff3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/rndis_host.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/rndis_host.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/rndis_host.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/rndis_host.c</a></div><div class='hunk'>@@ -635,17 +635,7 @@ static struct usb_driver rndis_driver = {</div><div class='ctx'> 	.resume =	usbnet_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init rndis_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;rndis_driver);</div><div class='del'>-}</div><div class='del'>-module_init(rndis_init);</div><div class='del'>-</div><div class='del'>-static void __exit rndis_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;rndis_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(rndis_exit);</div><div class='add'>+module_usb_driver(rndis_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("David Brownell");</div><div class='ctx'> MODULE_DESCRIPTION("USB Host side RNDIS driver");</div><div class='head'>diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c<br/>index bf8c84d0adf2..0710b4ca9252 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/rtl8150.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/rtl8150.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/rtl8150.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/rtl8150.c</a></div><div class='hunk'>@@ -978,20 +978,7 @@ static struct usb_driver rtl8150_driver = {</div><div class='ctx'> 	.resume		= rtl8150_resume</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init usb_rtl8150_init(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"</div><div class='del'>-	       DRIVER_DESC "\n");</div><div class='del'>-	return usb_register(&amp;rtl8150_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit usb_rtl8150_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;rtl8150_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(usb_rtl8150_init);</div><div class='del'>-module_exit(usb_rtl8150_exit);</div><div class='add'>+module_usb_driver(rtl8150_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='head'>diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c<br/>index ed1b43210584..b59cf20c7817 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/sierra_net.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/sierra_net.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/sierra_net.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/sierra_net.c</a></div><div class='hunk'>@@ -618,7 +618,7 @@ static u32 sierra_net_get_link(struct net_device *net)</div><div class='ctx'> 	return sierra_net_get_private(dev)-&gt;link_up &amp;&amp; netif_running(net);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ethtool_ops sierra_net_ethtool_ops = {</div><div class='add'>+static const struct ethtool_ops sierra_net_ethtool_ops = {</div><div class='ctx'> 	.get_drvinfo = sierra_net_get_drvinfo,</div><div class='ctx'> 	.get_link = sierra_net_get_link,</div><div class='ctx'> 	.get_msglevel = usbnet_get_msglevel,</div><div class='hunk'>@@ -900,6 +900,9 @@ struct sk_buff *sierra_net_tx_fixup(struct usbnet *dev, struct sk_buff *skb,</div><div class='ctx'> 	u16 len;</div><div class='ctx'> 	bool need_tail;</div><div class='ctx'> </div><div class='add'>+	BUILD_BUG_ON(FIELD_SIZEOF(struct usbnet, data)</div><div class='add'>+				&lt; sizeof(struct cdc_state));</div><div class='add'>+</div><div class='ctx'> 	dev_dbg(&amp;dev-&gt;udev-&gt;dev, "%s", __func__);</div><div class='ctx'> 	if (priv-&gt;link_up &amp;&amp; check_ethip_packet(skb, dev) &amp;&amp; is_ip(skb)) {</div><div class='ctx'> 		/* enough head room as is? */</div><div class='hunk'>@@ -981,21 +984,7 @@ static struct usb_driver sierra_net_driver = {</div><div class='ctx'> 	.no_dynamic_id = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sierra_net_init(void)</div><div class='del'>-{</div><div class='del'>-	BUILD_BUG_ON(FIELD_SIZEOF(struct usbnet, data)</div><div class='del'>-				&lt; sizeof(struct cdc_state));</div><div class='del'>-</div><div class='del'>-	return usb_register(&amp;sierra_net_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sierra_net_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;sierra_net_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_exit(sierra_net_exit);</div><div class='del'>-module_init(sierra_net_init);</div><div class='add'>+module_usb_driver(sierra_net_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='head'>diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c<br/>index a5b9b12ef268..3b017bbd2a22 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/smsc75xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/smsc75xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/smsc75xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/smsc75xx.c</a></div><div class='hunk'>@@ -76,7 +76,7 @@ struct usb_context {</div><div class='ctx'> 	struct usbnet *dev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int turbo_mode = true;</div><div class='add'>+static bool turbo_mode = true;</div><div class='ctx'> module_param(turbo_mode, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");</div><div class='ctx'> </div><div class='hunk'>@@ -728,7 +728,8 @@ static int smsc75xx_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Enable or disable Rx checksum offload engine */</div><div class='del'>-static int smsc75xx_set_features(struct net_device *netdev, u32 features)</div><div class='add'>+static int smsc75xx_set_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct usbnet *dev = netdev_priv(netdev);</div><div class='ctx'> 	struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev-&gt;data[0]);</div><div class='hunk'>@@ -1237,17 +1238,7 @@ static struct usb_driver smsc75xx_driver = {</div><div class='ctx'> 	.disconnect	= usbnet_disconnect,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init smsc75xx_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;smsc75xx_driver);</div><div class='del'>-}</div><div class='del'>-module_init(smsc75xx_init);</div><div class='del'>-</div><div class='del'>-static void __exit smsc75xx_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;smsc75xx_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(smsc75xx_exit);</div><div class='add'>+module_usb_driver(smsc75xx_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Nancy Lin");</div><div class='ctx'> MODULE_AUTHOR("Steve Glendinning &lt;steve.glendinning@smsc.com&gt;");</div><div class='head'>diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c<br/>index eff67678c5a6..d45520e6dd48 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/smsc95xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/smsc95xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/smsc95xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/smsc95xx.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@ struct usb_context {</div><div class='ctx'> 	struct usbnet *dev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int turbo_mode = true;</div><div class='add'>+static bool turbo_mode = true;</div><div class='ctx'> module_param(turbo_mode, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");</div><div class='ctx'> </div><div class='hunk'>@@ -516,7 +516,8 @@ static void smsc95xx_status(struct usbnet *dev, struct urb *urb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Enable or disable Tx &amp; Rx checksum offload engines */</div><div class='del'>-static int smsc95xx_set_features(struct net_device *netdev, u32 features)</div><div class='add'>+static int smsc95xx_set_features(struct net_device *netdev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct usbnet *dev = netdev_priv(netdev);</div><div class='ctx'> 	u32 read_buf;</div><div class='hunk'>@@ -1297,17 +1298,7 @@ static struct usb_driver smsc95xx_driver = {</div><div class='ctx'> 	.disconnect	= usbnet_disconnect,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init smsc95xx_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;smsc95xx_driver);</div><div class='del'>-}</div><div class='del'>-module_init(smsc95xx_init);</div><div class='del'>-</div><div class='del'>-static void __exit smsc95xx_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;smsc95xx_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(smsc95xx_exit);</div><div class='add'>+module_usb_driver(smsc95xx_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Nancy Lin");</div><div class='ctx'> MODULE_AUTHOR("Steve Glendinning &lt;steve.glendinning@smsc.com&gt;");</div><div class='head'>diff --git a/drivers/net/usb/zaurus.c b/drivers/net/usb/zaurus.c<br/>index 1a2234c20514..f701d4127087 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/usb/zaurus.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/usb/zaurus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/usb/zaurus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/usb/zaurus.c</a></div><div class='hunk'>@@ -362,17 +362,7 @@ static struct usb_driver zaurus_driver = {</div><div class='ctx'> 	.resume =	usbnet_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init zaurus_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;zaurus_driver);</div><div class='del'>-}</div><div class='del'>-module_init(zaurus_init);</div><div class='del'>-</div><div class='del'>-static void __exit zaurus_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;zaurus_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(zaurus_exit);</div><div class='add'>+module_usb_driver(zaurus_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Pavel Machek, David Brownell");</div><div class='ctx'> MODULE_DESCRIPTION("Sharp Zaurus PDA, and compatible products");</div><div class='head'>diff --git a/drivers/net/veth.c b/drivers/net/veth.c<br/>index ef883e97cee0..49f4667e1fa3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/veth.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/veth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/veth.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/veth.c</a></div><div class='hunk'>@@ -27,8 +27,8 @@</div><div class='ctx'> </div><div class='ctx'> struct veth_net_stats {</div><div class='ctx'> 	u64			rx_packets;</div><div class='del'>-	u64			tx_packets;</div><div class='ctx'> 	u64			rx_bytes;</div><div class='add'>+	u64			tx_packets;</div><div class='ctx'> 	u64			tx_bytes;</div><div class='ctx'> 	u64			rx_dropped;</div><div class='ctx'> 	struct u64_stats_sync	syncp;</div><div class='hunk'>@@ -66,9 +66,8 @@ static int veth_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> </div><div class='ctx'> static void veth_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='del'>-	strcpy(info-&gt;fw_version, "N/A");</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void veth_get_strings(struct net_device *dev, u32 stringset, u8 *buf)</div><div class='hunk'>@@ -271,7 +270,7 @@ static void veth_setup(struct net_device *dev)</div><div class='ctx'> 	dev-&gt;features |= NETIF_F_LLTX;</div><div class='ctx'> 	dev-&gt;destructor = veth_dev_free;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;hw_features = NETIF_F_NO_CSUM | NETIF_F_SG | NETIF_F_RXCSUM;</div><div class='add'>+	dev-&gt;hw_features = NETIF_F_HW_CSUM | NETIF_F_SG | NETIF_F_RXCSUM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c<br/>index 6ee8410443c4..4880aa8b4c28 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/virtio_net.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/virtio_net.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/virtio_net.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/virtio_net.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> static int napi_weight = 128;</div><div class='ctx'> module_param(napi_weight, int, 0444);</div><div class='ctx'> </div><div class='del'>-static int csum = 1, gso = 1;</div><div class='add'>+static bool csum = true, gso = true;</div><div class='ctx'> module_param(csum, bool, 0444);</div><div class='ctx'> module_param(gso, bool, 0444);</div><div class='ctx'> </div><div class='hunk'>@@ -39,6 +39,7 @@ module_param(gso, bool, 0444);</div><div class='ctx'> #define GOOD_COPY_LEN	128</div><div class='ctx'> </div><div class='ctx'> #define VIRTNET_SEND_COMMAND_SG_MAX    2</div><div class='add'>+#define VIRTNET_DRIVER_VERSION "1.0.0"</div><div class='ctx'> </div><div class='ctx'> struct virtnet_stats {</div><div class='ctx'> 	struct u64_stats_sync syncp;</div><div class='hunk'>@@ -155,6 +156,7 @@ static void set_skb_frag(struct sk_buff *skb, struct page *page,</div><div class='ctx'> 	*len -= size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Called from bottom half context */</div><div class='ctx'> static struct sk_buff *page_to_skb(struct virtnet_info *vi,</div><div class='ctx'> 				   struct page *page, unsigned int len)</div><div class='ctx'> {</div><div class='hunk'>@@ -357,7 +359,7 @@ static int add_recvbuf_small(struct virtnet_info *vi, gfp_t gfp)</div><div class='ctx'> 	struct skb_vnet_hdr *hdr;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	skb = netdev_alloc_skb_ip_align(vi-&gt;dev, MAX_PACKET_LEN);</div><div class='add'>+	skb = __netdev_alloc_skb_ip_align(vi-&gt;dev, MAX_PACKET_LEN, gfp);</div><div class='ctx'> 	if (unlikely(!skb))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -368,7 +370,7 @@ static int add_recvbuf_small(struct virtnet_info *vi, gfp_t gfp)</div><div class='ctx'> </div><div class='ctx'> 	skb_to_sgvec(skb, vi-&gt;rx_sg + 1, 0, skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	err = virtqueue_add_buf_gfp(vi-&gt;rvq, vi-&gt;rx_sg, 0, 2, skb, gfp);</div><div class='add'>+	err = virtqueue_add_buf(vi-&gt;rvq, vi-&gt;rx_sg, 0, 2, skb, gfp);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -413,8 +415,8 @@ static int add_recvbuf_big(struct virtnet_info *vi, gfp_t gfp)</div><div class='ctx'> </div><div class='ctx'> 	/* chain first in list head */</div><div class='ctx'> 	first-&gt;private = (unsigned long)list;</div><div class='del'>-	err = virtqueue_add_buf_gfp(vi-&gt;rvq, vi-&gt;rx_sg, 0, MAX_SKB_FRAGS + 2,</div><div class='del'>-				    first, gfp);</div><div class='add'>+	err = virtqueue_add_buf(vi-&gt;rvq, vi-&gt;rx_sg, 0, MAX_SKB_FRAGS + 2,</div><div class='add'>+				first, gfp);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		give_pages(vi, first);</div><div class='ctx'> </div><div class='hunk'>@@ -432,14 +434,20 @@ static int add_recvbuf_mergeable(struct virtnet_info *vi, gfp_t gfp)</div><div class='ctx'> </div><div class='ctx'> 	sg_init_one(vi-&gt;rx_sg, page_address(page), PAGE_SIZE);</div><div class='ctx'> </div><div class='del'>-	err = virtqueue_add_buf_gfp(vi-&gt;rvq, vi-&gt;rx_sg, 0, 1, page, gfp);</div><div class='add'>+	err = virtqueue_add_buf(vi-&gt;rvq, vi-&gt;rx_sg, 0, 1, page, gfp);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		give_pages(vi, page);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Returns false if we couldn't fill entirely (OOM). */</div><div class='add'>+/*</div><div class='add'>+ * Returns false if we couldn't fill entirely (OOM).</div><div class='add'>+ *</div><div class='add'>+ * Normally run in the receive path, but can also be run from ndo_open</div><div class='add'>+ * before we're receiving packets, or from refill_work which is</div><div class='add'>+ * careful to disable receiving (using napi_disable).</div><div class='add'>+ */</div><div class='ctx'> static bool try_fill_recv(struct virtnet_info *vi, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -501,7 +509,7 @@ static void refill_work(struct work_struct *work)</div><div class='ctx'> 	/* In theory, this can happen: if we don't get any buffers in</div><div class='ctx'> 	 * we will *never* try to fill again. */</div><div class='ctx'> 	if (still_empty)</div><div class='del'>-		schedule_delayed_work(&amp;vi-&gt;refill, HZ/2);</div><div class='add'>+		queue_delayed_work(system_nrt_wq, &amp;vi-&gt;refill, HZ/2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int virtnet_poll(struct napi_struct *napi, int budget)</div><div class='hunk'>@@ -520,7 +528,7 @@ again:</div><div class='ctx'> </div><div class='ctx'> 	if (vi-&gt;num &lt; vi-&gt;max / 2) {</div><div class='ctx'> 		if (!try_fill_recv(vi, GFP_ATOMIC))</div><div class='del'>-			schedule_delayed_work(&amp;vi-&gt;refill, 0);</div><div class='add'>+			queue_delayed_work(system_nrt_wq, &amp;vi-&gt;refill, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Out of packets? */</div><div class='hunk'>@@ -601,7 +609,7 @@ static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	hdr-&gt;num_sg = skb_to_sgvec(skb, vi-&gt;tx_sg + 1, 0, skb-&gt;len) + 1;</div><div class='ctx'> 	return virtqueue_add_buf(vi-&gt;svq, vi-&gt;tx_sg, hdr-&gt;num_sg,</div><div class='del'>-					0, skb);</div><div class='add'>+				 0, skb, GFP_ATOMIC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='hunk'>@@ -699,6 +707,7 @@ static struct rtnl_link_stats64 *virtnet_stats(struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tot-&gt;tx_dropped = dev-&gt;stats.tx_dropped;</div><div class='add'>+	tot-&gt;tx_fifo_errors = dev-&gt;stats.tx_fifo_errors;</div><div class='ctx'> 	tot-&gt;rx_dropped = dev-&gt;stats.rx_dropped;</div><div class='ctx'> 	tot-&gt;rx_length_errors = dev-&gt;stats.rx_length_errors;</div><div class='ctx'> 	tot-&gt;rx_frame_errors = dev-&gt;stats.rx_frame_errors;</div><div class='hunk'>@@ -719,6 +728,10 @@ static int virtnet_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct virtnet_info *vi = netdev_priv(dev);</div><div class='ctx'> </div><div class='add'>+	/* Make sure we have some buffers: if oom use wq. */</div><div class='add'>+	if (!try_fill_recv(vi, GFP_KERNEL))</div><div class='add'>+		queue_delayed_work(system_nrt_wq, &amp;vi-&gt;refill, 0);</div><div class='add'>+</div><div class='ctx'> 	virtnet_napi_enable(vi);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -754,7 +767,7 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,</div><div class='ctx'> 		sg_set_buf(&amp;sg[i + 1], sg_virt(s), s-&gt;length);</div><div class='ctx'> 	sg_set_buf(&amp;sg[out + in - 1], &amp;status, sizeof(status));</div><div class='ctx'> </div><div class='del'>-	BUG_ON(virtqueue_add_buf(vi-&gt;cvq, sg, out, in, vi) &lt; 0);</div><div class='add'>+	BUG_ON(virtqueue_add_buf(vi-&gt;cvq, sg, out, in, vi, GFP_ATOMIC) &lt; 0);</div><div class='ctx'> </div><div class='ctx'> 	virtqueue_kick(vi-&gt;cvq);</div><div class='ctx'> </div><div class='hunk'>@@ -772,6 +785,8 @@ static int virtnet_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct virtnet_info *vi = netdev_priv(dev);</div><div class='ctx'> </div><div class='add'>+	/* Make sure refill_work doesn't re-enable napi! */</div><div class='add'>+	cancel_delayed_work_sync(&amp;vi-&gt;refill);</div><div class='ctx'> 	napi_disable(&amp;vi-&gt;napi);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -853,7 +868,7 @@ static void virtnet_set_rx_mode(struct net_device *dev)</div><div class='ctx'> 	kfree(buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void virtnet_vlan_rx_add_vid(struct net_device *dev, u16 vid)</div><div class='add'>+static int virtnet_vlan_rx_add_vid(struct net_device *dev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct virtnet_info *vi = netdev_priv(dev);</div><div class='ctx'> 	struct scatterlist sg;</div><div class='hunk'>@@ -863,9 +878,10 @@ static void virtnet_vlan_rx_add_vid(struct net_device *dev, u16 vid)</div><div class='ctx'> 	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN,</div><div class='ctx'> 				  VIRTIO_NET_CTRL_VLAN_ADD, &amp;sg, 1, 0))</div><div class='ctx'> 		dev_warn(&amp;dev-&gt;dev, "Failed to add VLAN ID %d.\n", vid);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void virtnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid)</div><div class='add'>+static int virtnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct virtnet_info *vi = netdev_priv(dev);</div><div class='ctx'> 	struct scatterlist sg;</div><div class='hunk'>@@ -875,6 +891,7 @@ static void virtnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid)</div><div class='ctx'> 	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN,</div><div class='ctx'> 				  VIRTIO_NET_CTRL_VLAN_DEL, &amp;sg, 1, 0))</div><div class='ctx'> 		dev_warn(&amp;dev-&gt;dev, "Failed to kill VLAN ID %d.\n", vid);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void virtnet_get_ringparam(struct net_device *dev,</div><div class='hunk'>@@ -889,7 +906,21 @@ static void virtnet_get_ringparam(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static void virtnet_get_drvinfo(struct net_device *dev,</div><div class='add'>+				struct ethtool_drvinfo *info)</div><div class='add'>+{</div><div class='add'>+	struct virtnet_info *vi = netdev_priv(dev);</div><div class='add'>+	struct virtio_device *vdev = vi-&gt;vdev;</div><div class='add'>+</div><div class='add'>+	strlcpy(info-&gt;driver, KBUILD_MODNAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, VIRTNET_DRIVER_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, virtio_bus_name(vdev), sizeof(info-&gt;bus_info));</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct ethtool_ops virtnet_ethtool_ops = {</div><div class='add'>+	.get_drvinfo = virtnet_get_drvinfo,</div><div class='ctx'> 	.get_link = ethtool_op_get_link,</div><div class='ctx'> 	.get_ringparam = virtnet_get_ringparam,</div><div class='ctx'> };</div><div class='hunk'>@@ -954,15 +985,38 @@ static void virtnet_config_changed(struct virtio_device *vdev)</div><div class='ctx'> 	virtnet_update_status(vi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int init_vqs(struct virtnet_info *vi)</div><div class='add'>+{</div><div class='add'>+	struct virtqueue *vqs[3];</div><div class='add'>+	vq_callback_t *callbacks[] = { skb_recv_done, skb_xmit_done, NULL};</div><div class='add'>+	const char *names[] = { "input", "output", "control" };</div><div class='add'>+	int nvqs, err;</div><div class='add'>+</div><div class='add'>+	/* We expect two virtqueues, receive then send,</div><div class='add'>+	 * and optionally control. */</div><div class='add'>+	nvqs = virtio_has_feature(vi-&gt;vdev, VIRTIO_NET_F_CTRL_VQ) ? 3 : 2;</div><div class='add'>+</div><div class='add'>+	err = vi-&gt;vdev-&gt;config-&gt;find_vqs(vi-&gt;vdev, nvqs, vqs, callbacks, names);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	vi-&gt;rvq = vqs[0];</div><div class='add'>+	vi-&gt;svq = vqs[1];</div><div class='add'>+</div><div class='add'>+	if (virtio_has_feature(vi-&gt;vdev, VIRTIO_NET_F_CTRL_VQ)) {</div><div class='add'>+		vi-&gt;cvq = vqs[2];</div><div class='add'>+</div><div class='add'>+		if (virtio_has_feature(vi-&gt;vdev, VIRTIO_NET_F_CTRL_VLAN))</div><div class='add'>+			vi-&gt;dev-&gt;features |= NETIF_F_HW_VLAN_FILTER;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int virtnet_probe(struct virtio_device *vdev)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct virtnet_info *vi;</div><div class='del'>-	struct virtqueue *vqs[3];</div><div class='del'>-	vq_callback_t *callbacks[] = { skb_recv_done, skb_xmit_done, NULL};</div><div class='del'>-	const char *names[] = { "input", "output", "control" };</div><div class='del'>-	int nvqs;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate ourselves a network device with room for our info */</div><div class='ctx'> 	dev = alloc_etherdev(sizeof(struct virtnet_info));</div><div class='hunk'>@@ -1034,24 +1088,10 @@ static int virtnet_probe(struct virtio_device *vdev)</div><div class='ctx'> 	if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF))</div><div class='ctx'> 		vi-&gt;mergeable_rx_bufs = true;</div><div class='ctx'> </div><div class='del'>-	/* We expect two virtqueues, receive then send,</div><div class='del'>-	 * and optionally control. */</div><div class='del'>-	nvqs = virtio_has_feature(vi-&gt;vdev, VIRTIO_NET_F_CTRL_VQ) ? 3 : 2;</div><div class='del'>-</div><div class='del'>-	err = vdev-&gt;config-&gt;find_vqs(vdev, nvqs, vqs, callbacks, names);</div><div class='add'>+	err = init_vqs(vi);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto free_stats;</div><div class='ctx'> </div><div class='del'>-	vi-&gt;rvq = vqs[0];</div><div class='del'>-	vi-&gt;svq = vqs[1];</div><div class='del'>-</div><div class='del'>-	if (virtio_has_feature(vi-&gt;vdev, VIRTIO_NET_F_CTRL_VQ)) {</div><div class='del'>-		vi-&gt;cvq = vqs[2];</div><div class='del'>-</div><div class='del'>-		if (virtio_has_feature(vi-&gt;vdev, VIRTIO_NET_F_CTRL_VLAN))</div><div class='del'>-			dev-&gt;features |= NETIF_F_HW_VLAN_FILTER;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	err = register_netdev(dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		pr_debug("virtio_net: registering device failed\n");</div><div class='hunk'>@@ -1082,7 +1122,6 @@ static int virtnet_probe(struct virtio_device *vdev)</div><div class='ctx'> </div><div class='ctx'> unregister:</div><div class='ctx'> 	unregister_netdev(dev);</div><div class='del'>-	cancel_delayed_work_sync(&amp;vi-&gt;refill);</div><div class='ctx'> free_vqs:</div><div class='ctx'> 	vdev-&gt;config-&gt;del_vqs(vdev);</div><div class='ctx'> free_stats:</div><div class='hunk'>@@ -1114,29 +1153,73 @@ static void free_unused_bufs(struct virtnet_info *vi)</div><div class='ctx'> 	BUG_ON(vi-&gt;num != 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit virtnet_remove(struct virtio_device *vdev)</div><div class='add'>+static void remove_vq_common(struct virtnet_info *vi)</div><div class='ctx'> {</div><div class='del'>-	struct virtnet_info *vi = vdev-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Stop all the virtqueues. */</div><div class='del'>-	vdev-&gt;config-&gt;reset(vdev);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	unregister_netdev(vi-&gt;dev);</div><div class='del'>-	cancel_delayed_work_sync(&amp;vi-&gt;refill);</div><div class='add'>+	vi-&gt;vdev-&gt;config-&gt;reset(vi-&gt;vdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Free unused buffers in both send and recv, if any. */</div><div class='ctx'> 	free_unused_bufs(vi);</div><div class='ctx'> </div><div class='del'>-	vdev-&gt;config-&gt;del_vqs(vi-&gt;vdev);</div><div class='add'>+	vi-&gt;vdev-&gt;config-&gt;del_vqs(vi-&gt;vdev);</div><div class='ctx'> </div><div class='ctx'> 	while (vi-&gt;pages)</div><div class='ctx'> 		__free_pages(get_a_page(vi, GFP_KERNEL), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit virtnet_remove(struct virtio_device *vdev)</div><div class='add'>+{</div><div class='add'>+	struct virtnet_info *vi = vdev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	unregister_netdev(vi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	remove_vq_common(vi);</div><div class='ctx'> </div><div class='ctx'> 	free_percpu(vi-&gt;stats);</div><div class='ctx'> 	free_netdev(vi-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int virtnet_freeze(struct virtio_device *vdev)</div><div class='add'>+{</div><div class='add'>+	struct virtnet_info *vi = vdev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	virtqueue_disable_cb(vi-&gt;rvq);</div><div class='add'>+	virtqueue_disable_cb(vi-&gt;svq);</div><div class='add'>+	if (virtio_has_feature(vi-&gt;vdev, VIRTIO_NET_F_CTRL_VQ))</div><div class='add'>+		virtqueue_disable_cb(vi-&gt;cvq);</div><div class='add'>+</div><div class='add'>+	netif_device_detach(vi-&gt;dev);</div><div class='add'>+	cancel_delayed_work_sync(&amp;vi-&gt;refill);</div><div class='add'>+</div><div class='add'>+	if (netif_running(vi-&gt;dev))</div><div class='add'>+		napi_disable(&amp;vi-&gt;napi);</div><div class='add'>+</div><div class='add'>+	remove_vq_common(vi);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int virtnet_restore(struct virtio_device *vdev)</div><div class='add'>+{</div><div class='add'>+	struct virtnet_info *vi = vdev-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = init_vqs(vi);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (netif_running(vi-&gt;dev))</div><div class='add'>+		virtnet_napi_enable(vi);</div><div class='add'>+</div><div class='add'>+	netif_device_attach(vi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!try_fill_recv(vi, GFP_KERNEL))</div><div class='add'>+		queue_delayed_work(system_nrt_wq, &amp;vi-&gt;refill, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct virtio_device_id id_table[] = {</div><div class='ctx'> 	{ VIRTIO_ID_NET, VIRTIO_DEV_ANY_ID },</div><div class='ctx'> 	{ 0 },</div><div class='hunk'>@@ -1161,6 +1244,10 @@ static struct virtio_driver virtio_net_driver = {</div><div class='ctx'> 	.probe =	virtnet_probe,</div><div class='ctx'> 	.remove =	__devexit_p(virtnet_remove),</div><div class='ctx'> 	.config_changed = virtnet_config_changed,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.freeze =	virtnet_freeze,</div><div class='add'>+	.restore =	virtnet_restore,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init init(void)</div><div class='head'>diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c<br/>index d96bfb1ac20b..de7fc345148a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/vmxnet3/vmxnet3_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/vmxnet3/vmxnet3_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/vmxnet3/vmxnet3_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/vmxnet3/vmxnet3_drv.c</a></div><div class='hunk'>@@ -1926,7 +1926,7 @@ vmxnet3_restore_vlan(struct vmxnet3_adapter *adapter)</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'> vmxnet3_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct vmxnet3_adapter *adapter = netdev_priv(netdev);</div><div class='hunk'>@@ -1943,10 +1943,12 @@ vmxnet3_vlan_rx_add_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	set_bit(vid, adapter-&gt;active_vlans);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+static int</div><div class='ctx'> vmxnet3_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct vmxnet3_adapter *adapter = netdev_priv(netdev);</div><div class='hunk'>@@ -1963,6 +1965,8 @@ vmxnet3_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(vid, adapter-&gt;active_vlans);</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'>@@ -2163,7 +2167,8 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)</div><div class='ctx'> 		rssConf-&gt;indTableSize = VMXNET3_RSS_IND_TABLE_SIZE;</div><div class='ctx'> 		get_random_bytes(&amp;rssConf-&gt;hashKey[0], rssConf-&gt;hashKeySize);</div><div class='ctx'> 		for (i = 0; i &lt; rssConf-&gt;indTableSize; i++)</div><div class='del'>-			rssConf-&gt;indTable[i] = i % adapter-&gt;num_rx_queues;</div><div class='add'>+			rssConf-&gt;indTable[i] = ethtool_rxfh_indir_default(</div><div class='add'>+				i, adapter-&gt;num_rx_queues);</div><div class='ctx'> </div><div class='ctx'> 		devRead-&gt;rssConfDesc.confVer = 1;</div><div class='ctx'> 		devRead-&gt;rssConfDesc.confLen = sizeof(*rssConf);</div><div class='head'>diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c<br/>index e662cbc8bfbd..587a218b2345 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/vmxnet3/vmxnet3_ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/vmxnet3/vmxnet3_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/vmxnet3/vmxnet3_ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/vmxnet3/vmxnet3_ethtool.c</a></div><div class='hunk'>@@ -202,14 +202,9 @@ vmxnet3_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> 	struct vmxnet3_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='ctx'> 	strlcpy(drvinfo-&gt;driver, vmxnet3_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='del'>-	drvinfo-&gt;driver[sizeof(drvinfo-&gt;driver) - 1] = '\0';</div><div class='ctx'> </div><div class='ctx'> 	strlcpy(drvinfo-&gt;version, VMXNET3_DRIVER_VERSION_REPORT,</div><div class='ctx'> 		sizeof(drvinfo-&gt;version));</div><div class='del'>-	drvinfo-&gt;driver[sizeof(drvinfo-&gt;version) - 1] = '\0';</div><div class='del'>-</div><div class='del'>-	strlcpy(drvinfo-&gt;fw_version, "N/A", sizeof(drvinfo-&gt;fw_version));</div><div class='del'>-	drvinfo-&gt;fw_version[sizeof(drvinfo-&gt;fw_version) - 1] = '\0';</div><div class='ctx'> </div><div class='ctx'> 	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='ctx'> 		ETHTOOL_BUSINFO_LEN);</div><div class='hunk'>@@ -262,11 +257,11 @@ vmxnet3_get_strings(struct net_device *netdev, u32 stringset, u8 *buf)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int vmxnet3_set_features(struct net_device *netdev, u32 features)</div><div class='add'>+int vmxnet3_set_features(struct net_device *netdev, netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct vmxnet3_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	u32 changed = features ^ netdev-&gt;features;</div><div class='add'>+	netdev_features_t changed = features ^ netdev-&gt;features;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; (NETIF_F_RXCSUM | NETIF_F_LRO | NETIF_F_HW_VLAN_RX)) {</div><div class='ctx'> 		if (features &amp; NETIF_F_RXCSUM)</div><div class='hunk'>@@ -570,44 +565,38 @@ vmxnet3_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *info,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef VMXNET3_RSS</div><div class='add'>+static u32</div><div class='add'>+vmxnet3_get_rss_indir_size(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct vmxnet3_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct UPT1_RSSConf *rssConf = adapter-&gt;rss_conf;</div><div class='add'>+</div><div class='add'>+	return rssConf-&gt;indTableSize;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='del'>-vmxnet3_get_rss_indir(struct net_device *netdev,</div><div class='del'>-		      struct ethtool_rxfh_indir *p)</div><div class='add'>+vmxnet3_get_rss_indir(struct net_device *netdev, u32 *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct vmxnet3_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct UPT1_RSSConf *rssConf = adapter-&gt;rss_conf;</div><div class='del'>-	unsigned int n = min_t(unsigned int, p-&gt;size, rssConf-&gt;indTableSize);</div><div class='add'>+	unsigned int n = rssConf-&gt;indTableSize;</div><div class='ctx'> </div><div class='del'>-	p-&gt;size = rssConf-&gt;indTableSize;</div><div class='ctx'> 	while (n--)</div><div class='del'>-		p-&gt;ring_index[n] = rssConf-&gt;indTable[n];</div><div class='add'>+		p[n] = rssConf-&gt;indTable[n];</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-vmxnet3_set_rss_indir(struct net_device *netdev,</div><div class='del'>-		      const struct ethtool_rxfh_indir *p)</div><div class='add'>+vmxnet3_set_rss_indir(struct net_device *netdev, const u32 *p)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct vmxnet3_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct UPT1_RSSConf *rssConf = adapter-&gt;rss_conf;</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;size != rssConf-&gt;indTableSize)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	for (i = 0; i &lt; rssConf-&gt;indTableSize; i++) {</div><div class='del'>-		/*</div><div class='del'>-		 * Return with error code if any of the queue indices</div><div class='del'>-		 * is out of range</div><div class='del'>-		 */</div><div class='del'>-		if (p-&gt;ring_index[i] &lt; 0 ||</div><div class='del'>-		    p-&gt;ring_index[i] &gt;= adapter-&gt;num_rx_queues)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; rssConf-&gt;indTableSize; i++)</div><div class='del'>-		rssConf-&gt;indTable[i] = p-&gt;ring_index[i];</div><div class='add'>+		rssConf-&gt;indTable[i] = p[i];</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;adapter-&gt;cmd_lock, flags);</div><div class='ctx'> 	VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,</div><div class='hunk'>@@ -619,7 +608,7 @@ vmxnet3_set_rss_indir(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct ethtool_ops vmxnet3_ethtool_ops = {</div><div class='add'>+static const struct ethtool_ops vmxnet3_ethtool_ops = {</div><div class='ctx'> 	.get_settings      = vmxnet3_get_settings,</div><div class='ctx'> 	.get_drvinfo       = vmxnet3_get_drvinfo,</div><div class='ctx'> 	.get_regs_len      = vmxnet3_get_regs_len,</div><div class='hunk'>@@ -634,6 +623,7 @@ static struct ethtool_ops vmxnet3_ethtool_ops = {</div><div class='ctx'> 	.set_ringparam     = vmxnet3_set_ringparam,</div><div class='ctx'> 	.get_rxnfc         = vmxnet3_get_rxnfc,</div><div class='ctx'> #ifdef VMXNET3_RSS</div><div class='add'>+	.get_rxfh_indir_size = vmxnet3_get_rss_indir_size,</div><div class='ctx'> 	.get_rxfh_indir    = vmxnet3_get_rss_indir,</div><div class='ctx'> 	.set_rxfh_indir    = vmxnet3_set_rss_indir,</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h<br/>index b18eac1dccaa..ed54797db191 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/vmxnet3/vmxnet3_int.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/vmxnet3/vmxnet3_int.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/vmxnet3/vmxnet3_int.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/vmxnet3/vmxnet3_int.h</a></div><div class='hunk'>@@ -401,7 +401,7 @@ void</div><div class='ctx'> vmxnet3_rq_destroy_all(struct vmxnet3_adapter *adapter);</div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-vmxnet3_set_features(struct net_device *netdev, u32 features);</div><div class='add'>+vmxnet3_set_features(struct net_device *netdev, netdev_features_t features);</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> vmxnet3_create_queues(struct vmxnet3_adapter *adapter,</div><div class='head'>diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c<br/>index 783168cce077..d43f4efd3e07 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/sbni.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wan/sbni.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/sbni.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wan/sbni.c</a></div><div class='hunk'>@@ -155,7 +155,7 @@ static int  emancipate( struct net_device * );</div><div class='ctx'> static const char  version[] =</div><div class='ctx'> 	"Granch SBNI12 driver ver 5.0.1  Jun 22 2001  Denis I.Timofeev.\n";</div><div class='ctx'> </div><div class='del'>-static int  skip_pci_probe	__initdata = 0;</div><div class='add'>+static bool skip_pci_probe	__initdata = false;</div><div class='ctx'> static int  scandone	__initdata = 0;</div><div class='ctx'> static int  num		__initdata = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c<br/>index 0b4fd05e1508..4f7748478984 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/sealevel.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wan/sealevel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/sealevel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wan/sealevel.c</a></div><div class='hunk'>@@ -362,7 +362,7 @@ static int io=0x238;</div><div class='ctx'> static int txdma=1;</div><div class='ctx'> static int rxdma=3;</div><div class='ctx'> static int irq=5;</div><div class='del'>-static int slow=0;</div><div class='add'>+static bool slow=false;</div><div class='ctx'> </div><div class='ctx'> module_param(io, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(io, "The I/O base of the Sealevel card");</div><div class='head'>diff --git a/drivers/net/wimax/i2400m/i2400m.h b/drivers/net/wimax/i2400m/i2400m.h<br/>index c421a6141854..c806d4550212 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wimax/i2400m/i2400m.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wimax/i2400m/i2400m.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wimax/i2400m/i2400m.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wimax/i2400m/i2400m.h</a></div><div class='hunk'>@@ -75,7 +75,7 @@</div><div class='ctx'>  *        device is up and running or shutdown (through ifconfig up /</div><div class='ctx'>  *        down). Bus-generic only.</div><div class='ctx'>  *</div><div class='del'>- *  - control ops: control.c - implements various commmands for</div><div class='add'>+ *  - control ops: control.c - implements various commands for</div><div class='ctx'>  *        controlling the device. bus-generic only.</div><div class='ctx'>  *</div><div class='ctx'>  *  - device model glue: driver.c - implements helpers for the</div><div class='head'>diff --git a/drivers/net/wimax/i2400m/tx.c b/drivers/net/wimax/i2400m/tx.c<br/>index 4b9ecb20deec..f20886ade1cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wimax/i2400m/tx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wimax/i2400m/tx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wimax/i2400m/tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wimax/i2400m/tx.c</a></div><div class='hunk'>@@ -562,7 +562,7 @@ void i2400m_tx_new(struct i2400m *i2400m)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = i2400m_dev(i2400m);</div><div class='ctx'> 	struct i2400m_msg_hdr *tx_msg;</div><div class='del'>-	bool try_head = 0;</div><div class='add'>+	bool try_head = false;</div><div class='ctx'> 	BUG_ON(i2400m-&gt;tx_msg != NULL);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In certain situations, TX queue might have enough space to</div><div class='hunk'>@@ -580,7 +580,7 @@ try_head:</div><div class='ctx'> 	else if (tx_msg == TAIL_FULL) {</div><div class='ctx'> 		i2400m_tx_skip_tail(i2400m);</div><div class='ctx'> 		d_printf(2, dev, "new TX message: tail full, trying head\n");</div><div class='del'>-		try_head = 1;</div><div class='add'>+		try_head = true;</div><div class='ctx'> 		goto try_head;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(tx_msg, 0, I2400M_TX_PLD_SIZE);</div><div class='hunk'>@@ -720,7 +720,7 @@ int i2400m_tx(struct i2400m *i2400m, const void *buf, size_t buf_len,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	size_t padded_len;</div><div class='ctx'> 	void *ptr;</div><div class='del'>-	bool try_head = 0;</div><div class='add'>+	bool try_head = false;</div><div class='ctx'> 	unsigned is_singleton = pl_type == I2400M_PT_RESET_WARM</div><div class='ctx'> 		|| pl_type == I2400M_PT_RESET_COLD;</div><div class='ctx'> </div><div class='hunk'>@@ -771,7 +771,7 @@ try_new:</div><div class='ctx'> 		d_printf(2, dev, "pl append: tail full\n");</div><div class='ctx'> 		i2400m_tx_close(i2400m);</div><div class='ctx'> 		i2400m_tx_skip_tail(i2400m);</div><div class='del'>-		try_head = 1;</div><div class='add'>+		try_head = true;</div><div class='ctx'> 		goto try_new;</div><div class='ctx'> 	} else if (ptr == NULL) {	/* All full */</div><div class='ctx'> 		result = -ENOSPC;</div><div class='head'>diff --git a/drivers/net/wimax/i2400m/usb-tx.c b/drivers/net/wimax/i2400m/usb-tx.c<br/>index ac357acfb3e9..99ef81b3d5a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wimax/i2400m/usb-tx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wimax/i2400m/usb-tx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wimax/i2400m/usb-tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wimax/i2400m/usb-tx.c</a></div><div class='hunk'>@@ -177,7 +177,6 @@ retry:</div><div class='ctx'> static</div><div class='ctx'> int i2400mu_txd(void *_i2400mu)</div><div class='ctx'> {</div><div class='del'>-	int result = 0;</div><div class='ctx'> 	struct i2400mu *i2400mu = _i2400mu;</div><div class='ctx'> 	struct i2400m *i2400m = &amp;i2400mu-&gt;i2400m;</div><div class='ctx'> 	struct device *dev = &amp;i2400mu-&gt;usb_iface-&gt;dev;</div><div class='hunk'>@@ -208,16 +207,14 @@ int i2400mu_txd(void *_i2400mu)</div><div class='ctx'> 		/* Yeah, we ignore errors ... not much we can do */</div><div class='ctx'> 		i2400mu_tx(i2400mu, tx_msg, tx_msg_size);</div><div class='ctx'> 		i2400m_tx_msg_sent(i2400m);	/* ack it, advance the FIFO */</div><div class='del'>-		if (result &lt; 0)</div><div class='del'>-			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;i2400m-&gt;tx_lock, flags);</div><div class='ctx'> 	i2400mu-&gt;tx_kthread = NULL;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;i2400m-&gt;tx_lock, flags);</div><div class='ctx'> </div><div class='del'>-	d_fnend(4, dev, "(i2400mu %p) = %d\n", i2400mu, result);</div><div class='del'>-	return result;</div><div class='add'>+	d_fnend(4, dev, "(i2400mu %p)\n", i2400mu);</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/wireless/Makefile b/drivers/net/wireless/Makefile<br/>index 0a304b060b6c..98db76196b59 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/Makefile</a></div><div class='hunk'>@@ -42,7 +42,7 @@ obj-$(CONFIG_ADM8211)	+= adm8211.o</div><div class='ctx'> obj-$(CONFIG_MWL8K)	+= mwl8k.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_IWLWIFI)	+= iwlwifi/</div><div class='del'>-obj-$(CONFIG_IWLWIFI_LEGACY)	+= iwlegacy/</div><div class='add'>+obj-$(CONFIG_IWLEGACY)	+= iwlegacy/</div><div class='ctx'> obj-$(CONFIG_RT2X00)	+= rt2x00/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_P54_COMMON)	+= p54/</div><div class='hunk'>@@ -58,6 +58,6 @@ obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wl12xx/</div><div class='ctx'> obj-$(CONFIG_IWM)	+= iwmc3200wifi/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MWIFIEX)	+= mwifiex/</div><div class='del'>-obj-$(CONFIG_BRCMFMAC) += brcm80211/</div><div class='del'>-obj-$(CONFIG_BRCMUMAC) += brcm80211/</div><div class='del'>-obj-$(CONFIG_BRCMSMAC) += brcm80211/</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_BRCMFMAC)	+= brcm80211/</div><div class='add'>+obj-$(CONFIG_BRCMSMAC)	+= brcm80211/</div><div class='head'>diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c<br/>index ac1176a4f465..1c008c61b95c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/airo.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/airo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/airo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/airo.c</a></div><div class='hunk'>@@ -1418,7 +1418,7 @@ static int encapsulate(struct airo_info *ai ,etherHead *frame, MICBuffer *mic, i</div><div class='ctx'> 	emmh32_update(&amp;context-&gt;seed,frame-&gt;da,ETH_ALEN * 2); // DA,SA</div><div class='ctx'> 	emmh32_update(&amp;context-&gt;seed,(u8*)&amp;mic-&gt;typelen,10); // Type/Length and Snap</div><div class='ctx'> 	emmh32_update(&amp;context-&gt;seed,(u8*)&amp;mic-&gt;seq,sizeof(mic-&gt;seq)); //SEQ</div><div class='del'>-	emmh32_update(&amp;context-&gt;seed,frame-&gt;da + ETH_ALEN * 2,payLen); //payload</div><div class='add'>+	emmh32_update(&amp;context-&gt;seed,(u8*)(frame + 1),payLen); //payload</div><div class='ctx'> 	emmh32_final(&amp;context-&gt;seed, (u8*)&amp;mic-&gt;mic);</div><div class='ctx'> </div><div class='ctx'> 	/*    New Type/length ?????????? */</div><div class='hunk'>@@ -1506,7 +1506,7 @@ static int decapsulate(struct airo_info *ai, MICBuffer *mic, etherHead *eth, u16</div><div class='ctx'> 		emmh32_update(&amp;context-&gt;seed, eth-&gt;da, ETH_ALEN*2); </div><div class='ctx'> 		emmh32_update(&amp;context-&gt;seed, (u8 *)&amp;mic-&gt;typelen, sizeof(mic-&gt;typelen)+sizeof(mic-&gt;u.snap)); </div><div class='ctx'> 		emmh32_update(&amp;context-&gt;seed, (u8 *)&amp;mic-&gt;seq,sizeof(mic-&gt;seq));	</div><div class='del'>-		emmh32_update(&amp;context-&gt;seed, eth-&gt;da + ETH_ALEN*2,payLen);	</div><div class='add'>+		emmh32_update(&amp;context-&gt;seed, (u8 *)(eth + 1),payLen);	</div><div class='ctx'> 		//Calculate MIC</div><div class='ctx'> 		emmh32_final(&amp;context-&gt;seed, digest);</div><div class='ctx'> 	</div><div class='head'>diff --git a/drivers/net/wireless/ath/Makefile b/drivers/net/wireless/ath/Makefile<br/>index d1214696a35b..d716b748e574 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/Makefile</a></div><div class='hunk'>@@ -11,3 +11,4 @@ ath-objs :=	main.o \</div><div class='ctx'> 		key.o</div><div class='ctx'> </div><div class='ctx'> ath-$(CONFIG_ATH_DEBUG) += debug.o</div><div class='add'>+ccflags-y += -D__CHECK_ENDIAN__</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h<br/>index 0f9ee46cfc97..efc01110dc34 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath.h</a></div><div class='hunk'>@@ -152,6 +152,7 @@ struct ath_common {</div><div class='ctx'> 	struct ath_cycle_counters cc_survey;</div><div class='ctx'> </div><div class='ctx'> 	struct ath_regulatory regulatory;</div><div class='add'>+	struct ath_regulatory reg_world_copy;</div><div class='ctx'> 	const struct ath_ops *ops;</div><div class='ctx'> 	const struct ath_bus_ops *bus_ops;</div><div class='ctx'> </div><div class='hunk'>@@ -214,6 +215,10 @@ do {								\</div><div class='ctx'>  * @ATH_DBG_HWTIMER: hardware timer handling</div><div class='ctx'>  * @ATH_DBG_BTCOEX: bluetooth coexistance</div><div class='ctx'>  * @ATH_DBG_BSTUCK: stuck beacons</div><div class='add'>+ * @ATH_DBG_MCI: Message Coexistence Interface, a private protocol</div><div class='add'>+ *	used exclusively for WLAN-BT coexistence starting from</div><div class='add'>+ *	AR9462.</div><div class='add'>+ * @ATH_DBG_DFS: radar datection</div><div class='ctx'>  * @ATH_DBG_ANY: enable all debugging</div><div class='ctx'>  *</div><div class='ctx'>  * The debug level is used to control the amount and type of debugging output</div><div class='hunk'>@@ -239,6 +244,8 @@ enum ATH_DEBUG {</div><div class='ctx'> 	ATH_DBG_BTCOEX		= 0x00002000,</div><div class='ctx'> 	ATH_DBG_WMI		= 0x00004000,</div><div class='ctx'> 	ATH_DBG_BSTUCK		= 0x00008000,</div><div class='add'>+	ATH_DBG_MCI		= 0x00010000,</div><div class='add'>+	ATH_DBG_DFS		= 0x00020000,</div><div class='ctx'> 	ATH_DBG_ANY		= 0xffffffff</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -248,7 +255,7 @@ enum ATH_DEBUG {</div><div class='ctx'> </div><div class='ctx'> #define ath_dbg(common, dbg_mask, fmt, ...)				\</div><div class='ctx'> do {									\</div><div class='del'>-	if ((common)-&gt;debug_mask &amp; dbg_mask)				\</div><div class='add'>+	if ((common)-&gt;debug_mask &amp; ATH_DBG_##dbg_mask)			\</div><div class='ctx'> 		_ath_printk(KERN_DEBUG, common, fmt, ##__VA_ARGS__);	\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='hunk'>@@ -258,10 +265,13 @@ do {									\</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> static inline  __attribute__ ((format (printf, 3, 4)))</div><div class='del'>-void ath_dbg(struct ath_common *common, enum ATH_DEBUG dbg_mask,</div><div class='add'>+void _ath_dbg(struct ath_common *common, enum ATH_DEBUG dbg_mask,</div><div class='ctx'> 	     const char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+#define ath_dbg(common, dbg_mask, fmt, ...)				\</div><div class='add'>+	_ath_dbg(common, ATH_DBG_##dbg_mask, fmt, ##__VA_ARGS__)</div><div class='add'>+</div><div class='ctx'> #define ATH_DBG_WARN(foo, arg...) do {} while (0)</div><div class='ctx'> #define ATH_DBG_WARN_ON_ONCE(foo) ({				\</div><div class='ctx'> 	int __ret_warn_once = !!(foo);				\</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/ahb.c b/drivers/net/wireless/ath/ath5k/ahb.c<br/>index e5be7e701816..ee7ea572b065 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/ahb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/ahb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/ahb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/ahb.c</a></div><div class='hunk'>@@ -166,7 +166,9 @@ static int ath_ahb_probe(struct platform_device *pdev)</div><div class='ctx'> 		if (to_platform_device(ah-&gt;dev)-&gt;id == 0 &amp;&amp;</div><div class='ctx'> 		    (bcfg-&gt;config-&gt;flags &amp; (BD_WLAN0 | BD_WLAN1)) ==</div><div class='ctx'> 		     (BD_WLAN1 | BD_WLAN0))</div><div class='del'>-			__set_bit(ATH_STAT_2G_DISABLED, ah-&gt;status);</div><div class='add'>+			ah-&gt;ah_capabilities.cap_needs_2GHz_ovr = true;</div><div class='add'>+		else</div><div class='add'>+			ah-&gt;ah_capabilities.cap_needs_2GHz_ovr = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ath5k_init_ah(ah, &amp;ath_ahb_bus_ops);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/ani.c b/drivers/net/wireless/ath/ath5k/ani.c<br/>index bea90e6be70e..bf674161a217 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/ani.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/ani.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/ani.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/ani.c</a></div><div class='hunk'>@@ -27,15 +27,21 @@</div><div class='ctx'>  * or reducing sensitivity as necessary.</div><div class='ctx'>  *</div><div class='ctx'>  * The parameters are:</div><div class='add'>+ *</div><div class='ctx'>  *   - "noise immunity"</div><div class='add'>+ *</div><div class='ctx'>  *   - "spur immunity"</div><div class='add'>+ *</div><div class='ctx'>  *   - "firstep level"</div><div class='add'>+ *</div><div class='ctx'>  *   - "OFDM weak signal detection"</div><div class='add'>+ *</div><div class='ctx'>  *   - "CCK weak signal detection"</div><div class='ctx'>  *</div><div class='ctx'>  * Basically we look at the amount of ODFM and CCK timing errors we get and then</div><div class='ctx'>  * raise or lower immunity accordingly by setting one or more of these</div><div class='ctx'>  * parameters.</div><div class='add'>+ *</div><div class='ctx'>  * Newer chipsets have PHY error counters in hardware which will generate a MIB</div><div class='ctx'>  * interrupt when they overflow. Older hardware has too enable PHY error frames</div><div class='ctx'>  * by setting a RX flag and then count every single PHY error. When a specified</div><div class='hunk'>@@ -45,11 +51,13 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*** ANI parameter control ***/</div><div class='add'>+/***********************\</div><div class='add'>+* ANI parameter control *</div><div class='add'>+\***********************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ath5k_ani_set_noise_immunity_level() - Set noise immunity level</div><div class='del'>- *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @level: level between 0 and @ATH5K_ANI_MAX_NOISE_IMM_LVL</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='hunk'>@@ -91,12 +99,11 @@ ath5k_ani_set_noise_immunity_level(struct ath5k_hw *ah, int level)</div><div class='ctx'> 	ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_ANI, "new level %d", level);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * ath5k_ani_set_spur_immunity_level() - Set spur immunity level</div><div class='del'>- *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @level: level between 0 and @max_spur_level (the maximum level is dependent</div><div class='del'>- *	on the chip revision).</div><div class='add'>+ * on the chip revision).</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='ctx'> ath5k_ani_set_spur_immunity_level(struct ath5k_hw *ah, int level)</div><div class='hunk'>@@ -117,10 +124,9 @@ ath5k_ani_set_spur_immunity_level(struct ath5k_hw *ah, int level)</div><div class='ctx'> 	ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_ANI, "new level %d", level);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * ath5k_ani_set_firstep_level() - Set "firstep" level</div><div class='del'>- *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @level: level between 0 and @ATH5K_ANI_MAX_FIRSTEP_LVL</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='hunk'>@@ -140,11 +146,9 @@ ath5k_ani_set_firstep_level(struct ath5k_hw *ah, int level)</div><div class='ctx'> 	ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_ANI, "new level %d", level);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * ath5k_ani_set_ofdm_weak_signal_detection() - Control OFDM weak signal</div><div class='del'>- *						detection</div><div class='del'>- *</div><div class='add'>+ * ath5k_ani_set_ofdm_weak_signal_detection() - Set OFDM weak signal detection</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @on: turn on or off</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='hunk'>@@ -182,10 +186,9 @@ ath5k_ani_set_ofdm_weak_signal_detection(struct ath5k_hw *ah, bool on)</div><div class='ctx'> 			  on ? "on" : "off");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * ath5k_ani_set_cck_weak_signal_detection() - control CCK weak signal detection</div><div class='del'>- *</div><div class='add'>+ * ath5k_ani_set_cck_weak_signal_detection() - Set CCK weak signal detection</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @on: turn on or off</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='hunk'>@@ -200,13 +203,16 @@ ath5k_ani_set_cck_weak_signal_detection(struct ath5k_hw *ah, bool on)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*** ANI algorithm ***/</div><div class='add'>+/***************\</div><div class='add'>+* ANI algorithm *</div><div class='add'>+\***************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ath5k_ani_raise_immunity() - Increase noise immunity</div><div class='del'>- *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @as: The &amp;struct ath5k_ani_state</div><div class='ctx'>  * @ofdm_trigger: If this is true we are called because of too many OFDM errors,</div><div class='del'>- *	the algorithm will tune more parameters then.</div><div class='add'>+ * the algorithm will tune more parameters then.</div><div class='ctx'>  *</div><div class='ctx'>  * Try to raise noise immunity (=decrease sensitivity) in several steps</div><div class='ctx'>  * depending on the average RSSI of the beacons we received.</div><div class='hunk'>@@ -290,9 +296,10 @@ ath5k_ani_raise_immunity(struct ath5k_hw *ah, struct ath5k_ani_state *as,</div><div class='ctx'> 	*/</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * ath5k_ani_lower_immunity() - Decrease noise immunity</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @as: The &amp;struct ath5k_ani_state</div><div class='ctx'>  *</div><div class='ctx'>  * Try to lower noise immunity (=increase sensitivity) in several steps</div><div class='ctx'>  * depending on the average RSSI of the beacons we received.</div><div class='hunk'>@@ -352,9 +359,10 @@ ath5k_ani_lower_immunity(struct ath5k_hw *ah, struct ath5k_ani_state *as)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * ath5k_hw_ani_get_listen_time() - Update counters and return listening time</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @as: The &amp;struct ath5k_ani_state</div><div class='ctx'>  *</div><div class='ctx'>  * Return an approximation of the time spent "listening" in milliseconds (ms)</div><div class='ctx'>  * since the last call of this function.</div><div class='hunk'>@@ -379,9 +387,10 @@ ath5k_hw_ani_get_listen_time(struct ath5k_hw *ah, struct ath5k_ani_state *as)</div><div class='ctx'> 	return listen;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * ath5k_ani_save_and_clear_phy_errors() - Clear and save PHY error counters</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @as: The &amp;struct ath5k_ani_state</div><div class='ctx'>  *</div><div class='ctx'>  * Clear the PHY error counters as soon as possible, since this might be called</div><div class='ctx'>  * from a MIB interrupt and we want to make sure we don't get interrupted again.</div><div class='hunk'>@@ -429,14 +438,14 @@ ath5k_ani_save_and_clear_phy_errors(struct ath5k_hw *ah,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * ath5k_ani_period_restart() - Restart ANI period</div><div class='add'>+ * @as: The &amp;struct ath5k_ani_state</div><div class='ctx'>  *</div><div class='ctx'>  * Just reset counters, so they are clear for the next "ani period".</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-ath5k_ani_period_restart(struct ath5k_hw *ah, struct ath5k_ani_state *as)</div><div class='add'>+ath5k_ani_period_restart(struct ath5k_ani_state *as)</div><div class='ctx'> {</div><div class='ctx'> 	/* keep last values for debugging */</div><div class='ctx'> 	as-&gt;last_ofdm_errors = as-&gt;ofdm_errors;</div><div class='hunk'>@@ -448,9 +457,9 @@ ath5k_ani_period_restart(struct ath5k_hw *ah, struct ath5k_ani_state *as)</div><div class='ctx'> 	as-&gt;listen_time = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * ath5k_ani_calibration() - The main ANI calibration function</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='ctx'>  * We count OFDM and CCK errors relative to the time where we did not send or</div><div class='ctx'>  * receive ("listen" time) and raise or lower immunity accordingly.</div><div class='hunk'>@@ -492,7 +501,7 @@ ath5k_ani_calibration(struct ath5k_hw *ah)</div><div class='ctx'> 		/* too many PHY errors - we have to raise immunity */</div><div class='ctx'> 		bool ofdm_flag = as-&gt;ofdm_errors &gt; ofdm_high ? true : false;</div><div class='ctx'> 		ath5k_ani_raise_immunity(ah, as, ofdm_flag);</div><div class='del'>-		ath5k_ani_period_restart(ah, as);</div><div class='add'>+		ath5k_ani_period_restart(as);</div><div class='ctx'> </div><div class='ctx'> 	} else if (as-&gt;listen_time &gt; 5 * ATH5K_ANI_LISTEN_PERIOD) {</div><div class='ctx'> 		/* If more than 5 (TODO: why 5?) periods have passed and we got</div><div class='hunk'>@@ -504,15 +513,18 @@ ath5k_ani_calibration(struct ath5k_hw *ah)</div><div class='ctx'> 		if (as-&gt;ofdm_errors &lt;= ofdm_low &amp;&amp; as-&gt;cck_errors &lt;= cck_low)</div><div class='ctx'> 			ath5k_ani_lower_immunity(ah, as);</div><div class='ctx'> </div><div class='del'>-		ath5k_ani_period_restart(ah, as);</div><div class='add'>+		ath5k_ani_period_restart(as);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*** INTERRUPT HANDLER ***/</div><div class='add'>+/*******************\</div><div class='add'>+* Interrupt handler *</div><div class='add'>+\*******************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ath5k_ani_mib_intr() - Interrupt handler for ANI MIB counters</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='ctx'>  * Just read &amp; reset the registers quickly, so they don't generate more</div><div class='ctx'>  * interrupts, save the counters and schedule the tasklet to decide whether</div><div class='hunk'>@@ -549,9 +561,11 @@ ath5k_ani_mib_intr(struct ath5k_hw *ah)</div><div class='ctx'> 		tasklet_schedule(&amp;ah-&gt;ani_tasklet);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * ath5k_ani_phy_error_report() - Used by older HW to report PHY errors</div><div class='add'>+ * ath5k_ani_phy_error_report - Used by older HW to report PHY errors</div><div class='add'>+ *</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @phyerr: One of enum ath5k_phy_error_code</div><div class='ctx'>  *</div><div class='ctx'>  * This is used by hardware without PHY error counters to report PHY errors</div><div class='ctx'>  * on a frame-by-frame basis, instead of the interrupt.</div><div class='hunk'>@@ -574,10 +588,13 @@ ath5k_ani_phy_error_report(struct ath5k_hw *ah,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*** INIT ***/</div><div class='add'>+/****************\</div><div class='add'>+* Initialization *</div><div class='add'>+\****************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ath5k_enable_phy_err_counters() - Enable PHY error counters</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='ctx'>  * Enable PHY error counters for OFDM and CCK timing errors.</div><div class='ctx'>  */</div><div class='hunk'>@@ -596,9 +613,9 @@ ath5k_enable_phy_err_counters(struct ath5k_hw *ah)</div><div class='ctx'> 	ath5k_hw_reg_write(ah, 0, AR5K_CCK_FIL_CNT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * ath5k_disable_phy_err_counters() - Disable PHY error counters</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='ctx'>  * Disable PHY error counters for OFDM and CCK timing errors.</div><div class='ctx'>  */</div><div class='hunk'>@@ -615,10 +632,10 @@ ath5k_disable_phy_err_counters(struct ath5k_hw *ah)</div><div class='ctx'> 	ath5k_hw_reg_write(ah, 0, AR5K_CCK_FIL_CNT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * ath5k_ani_init() - Initialize ANI</div><div class='del'>- * @mode: Which mode to use (auto, manual high, manual low, off)</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @mode: One of enum ath5k_ani_mode</div><div class='ctx'>  *</div><div class='ctx'>  * Initialize ANI according to mode.</div><div class='ctx'>  */</div><div class='hunk'>@@ -695,10 +712,18 @@ ath5k_ani_init(struct ath5k_hw *ah, enum ath5k_ani_mode mode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*** DEBUG ***/</div><div class='add'>+/**************\</div><div class='add'>+* Debug output *</div><div class='add'>+\**************/</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ATH5K_DEBUG</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ath5k_ani_print_counters() - Print ANI counters</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ *</div><div class='add'>+ * Used for debugging ANI</div><div class='add'>+ */</div><div class='ctx'> void</div><div class='ctx'> ath5k_ani_print_counters(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/ani.h b/drivers/net/wireless/ath/ath5k/ani.h<br/>index 7358b6c83c6c..21aa355460bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/ani.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/ani.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/ani.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/ani.h</a></div><div class='hunk'>@@ -40,13 +40,13 @@ enum ath5k_phy_error_code;</div><div class='ctx'>  * enum ath5k_ani_mode - mode for ANI / noise sensitivity</div><div class='ctx'>  *</div><div class='ctx'>  * @ATH5K_ANI_MODE_OFF: Turn ANI off. This can be useful to just stop the ANI</div><div class='del'>- *	algorithm after it has been on auto mode.</div><div class='del'>- * ATH5K_ANI_MODE_MANUAL_LOW: Manually set all immunity parameters to low,</div><div class='del'>- *	maximizing sensitivity. ANI will not run.</div><div class='del'>- * ATH5K_ANI_MODE_MANUAL_HIGH: Manually set all immunity parameters to high,</div><div class='del'>- *	minimizing sensitivity. ANI will not run.</div><div class='del'>- * ATH5K_ANI_MODE_AUTO: Automatically control immunity parameters based on the</div><div class='del'>- *	amount of OFDM and CCK frame errors (default).</div><div class='add'>+ *			algorithm after it has been on auto mode.</div><div class='add'>+ * @ATH5K_ANI_MODE_MANUAL_LOW: Manually set all immunity parameters to low,</div><div class='add'>+ *			maximizing sensitivity. ANI will not run.</div><div class='add'>+ * @ATH5K_ANI_MODE_MANUAL_HIGH: Manually set all immunity parameters to high,</div><div class='add'>+ *			minimizing sensitivity. ANI will not run.</div><div class='add'>+ * @ATH5K_ANI_MODE_AUTO: Automatically control immunity parameters based on the</div><div class='add'>+ *			amount of OFDM and CCK frame errors (default).</div><div class='ctx'>  */</div><div class='ctx'> enum ath5k_ani_mode {</div><div class='ctx'> 	ATH5K_ANI_MODE_OFF		= 0,</div><div class='hunk'>@@ -58,8 +58,22 @@ enum ath5k_ani_mode {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct ath5k_ani_state - ANI state and associated counters</div><div class='del'>- *</div><div class='del'>- * @max_spur_level: the maximum spur level is chip dependent</div><div class='add'>+ * @ani_mode: One of enum ath5k_ani_mode</div><div class='add'>+ * @noise_imm_level: Noise immunity level</div><div class='add'>+ * @spur_level: Spur immunity level</div><div class='add'>+ * @firstep_level: FIRstep level</div><div class='add'>+ * @ofdm_weak_sig: OFDM weak signal detection state (on/off)</div><div class='add'>+ * @cck_weak_sig: CCK weak signal detection state (on/off)</div><div class='add'>+ * @max_spur_level: Max spur immunity level (chip specific)</div><div class='add'>+ * @listen_time: Listen time</div><div class='add'>+ * @ofdm_errors: OFDM timing error count</div><div class='add'>+ * @cck_errors: CCK timing error count</div><div class='add'>+ * @last_cc: The &amp;struct ath_cycle_counters (for stats)</div><div class='add'>+ * @last_listen: Listen time from previous run (for stats)</div><div class='add'>+ * @last_ofdm_errors: OFDM timing error count from previous run (for tats)</div><div class='add'>+ * @last_cck_errors: CCK timing error count from previous run (for stats)</div><div class='add'>+ * @sum_ofdm_errors: Sum of OFDM timing errors (for stats)</div><div class='add'>+ * @sum_cck_errors: Sum of all CCK timing errors (for stats)</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_ani_state {</div><div class='ctx'> 	enum ath5k_ani_mode	ani_mode;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h<br/>index fecbcd9a4259..c2b2518c2ecd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/ath5k.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/ath5k.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/ath5k.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/ath5k.h</a></div><div class='hunk'>@@ -187,10 +187,9 @@</div><div class='ctx'> #define AR5K_TUNE_MAX_TXPOWER			63</div><div class='ctx'> #define AR5K_TUNE_DEFAULT_TXPOWER		25</div><div class='ctx'> #define AR5K_TUNE_TPC_TXPOWER			false</div><div class='del'>-#define ATH5K_TUNE_CALIBRATION_INTERVAL_FULL    10000   /* 10 sec */</div><div class='add'>+#define ATH5K_TUNE_CALIBRATION_INTERVAL_FULL    60000   /* 60 sec */</div><div class='add'>+#define	ATH5K_TUNE_CALIBRATION_INTERVAL_SHORT	10000	/* 10 sec */</div><div class='ctx'> #define ATH5K_TUNE_CALIBRATION_INTERVAL_ANI	1000	/* 1 sec */</div><div class='del'>-#define ATH5K_TUNE_CALIBRATION_INTERVAL_NF	60000	/* 60 sec */</div><div class='del'>-</div><div class='ctx'> #define ATH5K_TX_COMPLETE_POLL_INT		3000	/* 3 sec */</div><div class='ctx'> </div><div class='ctx'> #define AR5K_INIT_CARR_SENSE_EN			1</div><div class='hunk'>@@ -262,16 +261,34 @@</div><div class='ctx'> #define	AR5K_AGC_SETTLING_TURBO			37</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* GENERIC CHIPSET DEFINITIONS */</div><div class='ctx'> </div><div class='del'>-/* MAC Chips */</div><div class='add'>+/*****************************\</div><div class='add'>+* GENERIC CHIPSET DEFINITIONS *</div><div class='add'>+\*****************************/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum ath5k_version - MAC Chips</div><div class='add'>+ * @AR5K_AR5210: AR5210 (Crete)</div><div class='add'>+ * @AR5K_AR5211: AR5211 (Oahu/Maui)</div><div class='add'>+ * @AR5K_AR5212: AR5212 (Venice) and newer</div><div class='add'>+ */</div><div class='ctx'> enum ath5k_version {</div><div class='ctx'> 	AR5K_AR5210	= 0,</div><div class='ctx'> 	AR5K_AR5211	= 1,</div><div class='ctx'> 	AR5K_AR5212	= 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* PHY Chips */</div><div class='add'>+/**</div><div class='add'>+ * enum ath5k_radio - PHY Chips</div><div class='add'>+ * @AR5K_RF5110: RF5110 (Fez)</div><div class='add'>+ * @AR5K_RF5111: RF5111 (Sombrero)</div><div class='add'>+ * @AR5K_RF5112: RF2112/5112(A) (Derby/Derby2)</div><div class='add'>+ * @AR5K_RF2413: RF2413/2414 (Griffin/Griffin-Lite)</div><div class='add'>+ * @AR5K_RF5413: RF5413/5414/5424 (Eagle/Condor)</div><div class='add'>+ * @AR5K_RF2316: RF2315/2316 (Cobra SoC)</div><div class='add'>+ * @AR5K_RF2317: RF2317 (Spider SoC)</div><div class='add'>+ * @AR5K_RF2425: RF2425/2417 (Swan/Nalla)</div><div class='add'>+ */</div><div class='ctx'> enum ath5k_radio {</div><div class='ctx'> 	AR5K_RF5110	= 0,</div><div class='ctx'> 	AR5K_RF5111	= 1,</div><div class='hunk'>@@ -303,11 +320,11 @@ enum ath5k_radio {</div><div class='ctx'> #define AR5K_SREV_AR5213A	0x59 /* Hainan */</div><div class='ctx'> #define AR5K_SREV_AR2413	0x78 /* Griffin lite */</div><div class='ctx'> #define AR5K_SREV_AR2414	0x70 /* Griffin */</div><div class='del'>-#define AR5K_SREV_AR2315_R6 0x86 /* AP51-Light */</div><div class='del'>-#define AR5K_SREV_AR2315_R7 0x87 /* AP51-Full */</div><div class='add'>+#define AR5K_SREV_AR2315_R6	0x86 /* AP51-Light */</div><div class='add'>+#define AR5K_SREV_AR2315_R7	0x87 /* AP51-Full */</div><div class='ctx'> #define AR5K_SREV_AR5424	0x90 /* Condor */</div><div class='del'>-#define AR5K_SREV_AR2317_R1 0x90 /* AP61-Light */</div><div class='del'>-#define AR5K_SREV_AR2317_R2 0x91 /* AP61-Full */</div><div class='add'>+#define AR5K_SREV_AR2317_R1	0x90 /* AP61-Light */</div><div class='add'>+#define AR5K_SREV_AR2317_R2	0x91 /* AP61-Full */</div><div class='ctx'> #define AR5K_SREV_AR5413	0xa4 /* Eagle lite */</div><div class='ctx'> #define AR5K_SREV_AR5414	0xa0 /* Eagle */</div><div class='ctx'> #define AR5K_SREV_AR2415	0xb0 /* Talon */</div><div class='hunk'>@@ -344,32 +361,40 @@ enum ath5k_radio {</div><div class='ctx'> </div><div class='ctx'> /* TODO add support to mac80211 for vendor-specific rates and modes */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * DOC: Atheros XR</div><div class='add'>+ *</div><div class='ctx'>  * Some of this information is based on Documentation from:</div><div class='ctx'>  *</div><div class='ctx'>  * http://madwifi-project.org/wiki/ChipsetFeatures/SuperAG</div><div class='ctx'>  *</div><div class='del'>- * Modulation for Atheros' eXtended Range - range enhancing extension that is</div><div class='del'>- * supposed to double the distance an Atheros client device can keep a</div><div class='del'>- * connection with an Atheros access point. This is achieved by increasing</div><div class='del'>- * the receiver sensitivity up to, -105dBm, which is about 20dB above what</div><div class='del'>- * the 802.11 specifications demand. In addition, new (proprietary) data rates</div><div class='del'>- * are introduced: 3, 2, 1, 0.5 and 0.25 MBit/s.</div><div class='add'>+ * Atheros' eXtended Range - range enhancing extension is a modulation scheme</div><div class='add'>+ * that is supposed to double the link distance between an Atheros XR-enabled</div><div class='add'>+ * client device with an Atheros XR-enabled access point. This is achieved</div><div class='add'>+ * by increasing the receiver sensitivity up to, -105dBm, which is about 20dB</div><div class='add'>+ * above what the 802.11 specifications demand. In addition, new (proprietary)</div><div class='add'>+ * data rates are introduced: 3, 2, 1, 0.5 and 0.25 MBit/s.</div><div class='ctx'>  *</div><div class='ctx'>  * Please note that can you either use XR or TURBO but you cannot use both,</div><div class='ctx'>  * they are exclusive.</div><div class='ctx'>  *</div><div class='add'>+ * Also note that we do not plan to support XR mode at least for now. You can</div><div class='add'>+ * get a mode similar to XR by using 5MHz bwmode.</div><div class='ctx'>  */</div><div class='del'>-#define MODULATION_XR		0x00000200</div><div class='del'>-/*</div><div class='del'>- * Modulation for Atheros' Turbo G and Turbo A, its supposed to provide a</div><div class='del'>- * throughput transmission speed up to 40Mbit/s-60Mbit/s at a 108Mbit/s</div><div class='del'>- * signaling rate achieved through the bonding of two 54Mbit/s 802.11g</div><div class='del'>- * channels. To use this feature your Access Point must also support it.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Atheros SuperAG</div><div class='add'>+ *</div><div class='add'>+ * In addition to XR we have another modulation scheme called TURBO mode</div><div class='add'>+ * that is supposed to provide a throughput transmission speed up to 40Mbit/s</div><div class='add'>+ * -60Mbit/s at a 108Mbit/s signaling rate achieved through the bonding of two</div><div class='add'>+ * 54Mbit/s 802.11g channels. To use this feature both ends must support it.</div><div class='ctx'>  * There is also a distinction between "static" and "dynamic" turbo modes:</div><div class='ctx'>  *</div><div class='ctx'>  * - Static: is the dumb version: devices set to this mode stick to it until</div><div class='ctx'>  *     the mode is turned off.</div><div class='add'>+ *</div><div class='ctx'>  * - Dynamic: is the intelligent version, the network decides itself if it</div><div class='ctx'>  *     is ok to use turbo. As soon as traffic is detected on adjacent channels</div><div class='ctx'>  *     (which would get used in turbo mode), or when a non-turbo station joins</div><div class='hunk'>@@ -383,24 +408,39 @@ enum ath5k_radio {</div><div class='ctx'>  *</div><div class='ctx'>  * http://www.pcworld.com/article/id,113428-page,1/article.html</div><div class='ctx'>  *</div><div class='del'>- * The channel bonding seems to be driver specific though. In addition to</div><div class='del'>- * deciding what channels will be used, these "Turbo" modes are accomplished</div><div class='del'>- * by also enabling the following features:</div><div class='add'>+ * The channel bonding seems to be driver specific though.</div><div class='add'>+ *</div><div class='add'>+ * In addition to TURBO modes we also have the following features for even</div><div class='add'>+ * greater speed-up:</div><div class='ctx'>  *</div><div class='ctx'>  * - Bursting: allows multiple frames to be sent at once, rather than pausing</div><div class='ctx'>  *     after each frame. Bursting is a standards-compliant feature that can be</div><div class='ctx'>  *     used with any Access Point.</div><div class='add'>+ *</div><div class='ctx'>  * - Fast frames: increases the amount of information that can be sent per</div><div class='ctx'>  *     frame, also resulting in a reduction of transmission overhead. It is a</div><div class='ctx'>  *     proprietary feature that needs to be supported by the Access Point.</div><div class='add'>+ *</div><div class='ctx'>  * - Compression: data frames are compressed in real time using a Lempel Ziv</div><div class='ctx'>  *     algorithm. This is done transparently. Once this feature is enabled,</div><div class='ctx'>  *     compression and decompression takes place inside the chipset, without</div><div class='ctx'>  *     putting additional load on the host CPU.</div><div class='ctx'>  *</div><div class='add'>+ * As with XR we also don't plan to support SuperAG features for now. You can</div><div class='add'>+ * get a mode similar to TURBO by using 40MHz bwmode.</div><div class='ctx'>  */</div><div class='del'>-#define MODULATION_TURBO	0x00000080</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum ath5k_driver_mode - PHY operation mode</div><div class='add'>+ * @AR5K_MODE_11A: 802.11a</div><div class='add'>+ * @AR5K_MODE_11B: 802.11b</div><div class='add'>+ * @AR5K_MODE_11G: 801.11g</div><div class='add'>+ * @AR5K_MODE_MAX: Used for boundary checks</div><div class='add'>+ *</div><div class='add'>+ * Do not change the order here, we use these as</div><div class='add'>+ * array indices and it also maps EEPROM structures.</div><div class='add'>+ */</div><div class='ctx'> enum ath5k_driver_mode {</div><div class='ctx'> 	AR5K_MODE_11A		=	0,</div><div class='ctx'> 	AR5K_MODE_11B		=	1,</div><div class='hunk'>@@ -408,30 +448,64 @@ enum ath5k_driver_mode {</div><div class='ctx'> 	AR5K_MODE_MAX		=	3</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * enum ath5k_ant_mode - Antenna operation mode</div><div class='add'>+ * @AR5K_ANTMODE_DEFAULT: Default antenna setup</div><div class='add'>+ * @AR5K_ANTMODE_FIXED_A: Only antenna A is present</div><div class='add'>+ * @AR5K_ANTMODE_FIXED_B: Only antenna B is present</div><div class='add'>+ * @AR5K_ANTMODE_SINGLE_AP: STA locked on a single ap</div><div class='add'>+ * @AR5K_ANTMODE_SECTOR_AP: AP with tx antenna set on tx desc</div><div class='add'>+ * @AR5K_ANTMODE_SECTOR_STA: STA with tx antenna set on tx desc</div><div class='add'>+ * @AR5K_ANTMODE_DEBUG: Debug mode -A -&gt; Rx, B-&gt; Tx-</div><div class='add'>+ * @AR5K_ANTMODE_MAX: Used for boundary checks</div><div class='add'>+ *</div><div class='add'>+ * For more infos on antenna control check out phy.c</div><div class='add'>+ */</div><div class='ctx'> enum ath5k_ant_mode {</div><div class='del'>-	AR5K_ANTMODE_DEFAULT	= 0,	/* default antenna setup */</div><div class='del'>-	AR5K_ANTMODE_FIXED_A	= 1,	/* only antenna A is present */</div><div class='del'>-	AR5K_ANTMODE_FIXED_B	= 2,	/* only antenna B is present */</div><div class='del'>-	AR5K_ANTMODE_SINGLE_AP	= 3,	/* sta locked on a single ap */</div><div class='del'>-	AR5K_ANTMODE_SECTOR_AP	= 4,	/* AP with tx antenna set on tx desc */</div><div class='del'>-	AR5K_ANTMODE_SECTOR_STA	= 5,	/* STA with tx antenna set on tx desc */</div><div class='del'>-	AR5K_ANTMODE_DEBUG	= 6,	/* Debug mode -A -&gt; Rx, B-&gt; Tx- */</div><div class='add'>+	AR5K_ANTMODE_DEFAULT	= 0,</div><div class='add'>+	AR5K_ANTMODE_FIXED_A	= 1,</div><div class='add'>+	AR5K_ANTMODE_FIXED_B	= 2,</div><div class='add'>+	AR5K_ANTMODE_SINGLE_AP	= 3,</div><div class='add'>+	AR5K_ANTMODE_SECTOR_AP	= 4,</div><div class='add'>+	AR5K_ANTMODE_SECTOR_STA	= 5,</div><div class='add'>+	AR5K_ANTMODE_DEBUG	= 6,</div><div class='ctx'> 	AR5K_ANTMODE_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * enum ath5k_bw_mode - Bandwidth operation mode</div><div class='add'>+ * @AR5K_BWMODE_DEFAULT: 20MHz, default operation</div><div class='add'>+ * @AR5K_BWMODE_5MHZ: Quarter rate</div><div class='add'>+ * @AR5K_BWMODE_10MHZ: Half rate</div><div class='add'>+ * @AR5K_BWMODE_40MHZ: Turbo</div><div class='add'>+ */</div><div class='ctx'> enum ath5k_bw_mode {</div><div class='del'>-	AR5K_BWMODE_DEFAULT	= 0,	/* 20MHz, default operation */</div><div class='del'>-	AR5K_BWMODE_5MHZ	= 1,	/* Quarter rate */</div><div class='del'>-	AR5K_BWMODE_10MHZ	= 2,	/* Half rate */</div><div class='del'>-	AR5K_BWMODE_40MHZ	= 3	/* Turbo */</div><div class='add'>+	AR5K_BWMODE_DEFAULT	= 0,</div><div class='add'>+	AR5K_BWMODE_5MHZ	= 1,</div><div class='add'>+	AR5K_BWMODE_10MHZ	= 2,</div><div class='add'>+	AR5K_BWMODE_40MHZ	= 3</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /****************\</div><div class='ctx'>   TX DEFINITIONS</div><div class='ctx'> \****************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * TX Status descriptor</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_tx_status - TX Status descriptor</div><div class='add'>+ * @ts_seqnum: Sequence number</div><div class='add'>+ * @ts_tstamp: Timestamp</div><div class='add'>+ * @ts_status: Status code</div><div class='add'>+ * @ts_final_idx: Final transmission series index</div><div class='add'>+ * @ts_final_retry: Final retry count</div><div class='add'>+ * @ts_rssi: RSSI for received ACK</div><div class='add'>+ * @ts_shortretry: Short retry count</div><div class='add'>+ * @ts_virtcol: Virtual collision count</div><div class='add'>+ * @ts_antenna: Antenna used</div><div class='add'>+ *</div><div class='add'>+ * TX status descriptor gets filled by the hw</div><div class='add'>+ * on each transmission attempt.</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_tx_status {</div><div class='ctx'> 	u16	ts_seqnum;</div><div class='hunk'>@@ -454,7 +528,6 @@ struct ath5k_tx_status {</div><div class='ctx'>  * enum ath5k_tx_queue - Queue types used to classify tx queues.</div><div class='ctx'>  * @AR5K_TX_QUEUE_INACTIVE: q is unused -- see ath5k_hw_release_tx_queue</div><div class='ctx'>  * @AR5K_TX_QUEUE_DATA: A normal data queue</div><div class='del'>- * @AR5K_TX_QUEUE_XR_DATA: An XR-data queue</div><div class='ctx'>  * @AR5K_TX_QUEUE_BEACON: The beacon queue</div><div class='ctx'>  * @AR5K_TX_QUEUE_CAB: The after-beacon queue</div><div class='ctx'>  * @AR5K_TX_QUEUE_UAPSD: Unscheduled Automatic Power Save Delivery queue</div><div class='hunk'>@@ -462,7 +535,6 @@ struct ath5k_tx_status {</div><div class='ctx'> enum ath5k_tx_queue {</div><div class='ctx'> 	AR5K_TX_QUEUE_INACTIVE = 0,</div><div class='ctx'> 	AR5K_TX_QUEUE_DATA,</div><div class='del'>-	AR5K_TX_QUEUE_XR_DATA,</div><div class='ctx'> 	AR5K_TX_QUEUE_BEACON,</div><div class='ctx'> 	AR5K_TX_QUEUE_CAB,</div><div class='ctx'> 	AR5K_TX_QUEUE_UAPSD,</div><div class='hunk'>@@ -471,36 +543,46 @@ enum ath5k_tx_queue {</div><div class='ctx'> #define	AR5K_NUM_TX_QUEUES		10</div><div class='ctx'> #define	AR5K_NUM_TX_QUEUES_NOQCU	2</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Queue syb-types to classify normal data queues.</div><div class='add'>+/**</div><div class='add'>+ * enum ath5k_tx_queue_subtype - Queue sub-types to classify normal data queues</div><div class='add'>+ * @AR5K_WME_AC_BK: Background traffic</div><div class='add'>+ * @AR5K_WME_AC_BE: Best-effort (normal) traffic</div><div class='add'>+ * @AR5K_WME_AC_VI: Video traffic</div><div class='add'>+ * @AR5K_WME_AC_VO: Voice traffic</div><div class='add'>+ *</div><div class='ctx'>  * These are the 4 Access Categories as defined in</div><div class='ctx'>  * WME spec. 0 is the lowest priority and 4 is the</div><div class='ctx'>  * highest. Normal data that hasn't been classified</div><div class='ctx'>  * goes to the Best Effort AC.</div><div class='ctx'>  */</div><div class='ctx'> enum ath5k_tx_queue_subtype {</div><div class='del'>-	AR5K_WME_AC_BK = 0,	/*Background traffic*/</div><div class='del'>-	AR5K_WME_AC_BE,		/*Best-effort (normal) traffic*/</div><div class='del'>-	AR5K_WME_AC_VI,		/*Video traffic*/</div><div class='del'>-	AR5K_WME_AC_VO,		/*Voice traffic*/</div><div class='add'>+	AR5K_WME_AC_BK = 0,</div><div class='add'>+	AR5K_WME_AC_BE,</div><div class='add'>+	AR5K_WME_AC_VI,</div><div class='add'>+	AR5K_WME_AC_VO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Queue ID numbers as returned by the hw functions, each number</div><div class='del'>- * represents a hw queue. If hw does not support hw queues</div><div class='del'>- * (eg 5210) all data goes in one queue. These match</div><div class='del'>- * d80211 definitions (net80211/MadWiFi don't use them).</div><div class='add'>+/**</div><div class='add'>+ * enum ath5k_tx_queue_id - Queue ID numbers as returned by the hw functions</div><div class='add'>+ * @AR5K_TX_QUEUE_ID_NOQCU_DATA: Data queue on AR5210 (no QCU available)</div><div class='add'>+ * @AR5K_TX_QUEUE_ID_NOQCU_BEACON: Beacon queue on AR5210 (no QCU available)</div><div class='add'>+ * @AR5K_TX_QUEUE_ID_DATA_MIN: Data queue min index</div><div class='add'>+ * @AR5K_TX_QUEUE_ID_DATA_MAX: Data queue max index</div><div class='add'>+ * @AR5K_TX_QUEUE_ID_CAB: Content after beacon queue</div><div class='add'>+ * @AR5K_TX_QUEUE_ID_BEACON: Beacon queue</div><div class='add'>+ * @AR5K_TX_QUEUE_ID_UAPSD: Urgent Automatic Power Save Delivery,</div><div class='add'>+ *</div><div class='add'>+ * Each number represents a hw queue. If hw does not support hw queues</div><div class='add'>+ * (eg 5210) all data goes in one queue.</div><div class='ctx'>  */</div><div class='ctx'> enum ath5k_tx_queue_id {</div><div class='ctx'> 	AR5K_TX_QUEUE_ID_NOQCU_DATA	= 0,</div><div class='ctx'> 	AR5K_TX_QUEUE_ID_NOQCU_BEACON	= 1,</div><div class='del'>-	AR5K_TX_QUEUE_ID_DATA_MIN	= 0, /*IEEE80211_TX_QUEUE_DATA0*/</div><div class='del'>-	AR5K_TX_QUEUE_ID_DATA_MAX	= 3, /*IEEE80211_TX_QUEUE_DATA3*/</div><div class='del'>-	AR5K_TX_QUEUE_ID_DATA_SVP	= 5, /*IEEE80211_TX_QUEUE_SVP - Spectralink Voice Protocol*/</div><div class='del'>-	AR5K_TX_QUEUE_ID_CAB		= 6, /*IEEE80211_TX_QUEUE_AFTER_BEACON*/</div><div class='del'>-	AR5K_TX_QUEUE_ID_BEACON		= 7, /*IEEE80211_TX_QUEUE_BEACON*/</div><div class='del'>-	AR5K_TX_QUEUE_ID_UAPSD		= 8,</div><div class='del'>-	AR5K_TX_QUEUE_ID_XR_DATA	= 9,</div><div class='add'>+	AR5K_TX_QUEUE_ID_DATA_MIN	= 0,</div><div class='add'>+	AR5K_TX_QUEUE_ID_DATA_MAX	= 3,</div><div class='add'>+	AR5K_TX_QUEUE_ID_UAPSD		= 7,</div><div class='add'>+	AR5K_TX_QUEUE_ID_CAB		= 8,</div><div class='add'>+	AR5K_TX_QUEUE_ID_BEACON		= 9,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -521,46 +603,70 @@ enum ath5k_tx_queue_id {</div><div class='ctx'> #define AR5K_TXQ_FLAG_POST_FR_BKOFF_DIS		0x1000	/* Disable backoff while bursting */</div><div class='ctx'> #define AR5K_TXQ_FLAG_COMPRESSION_ENABLE	0x2000	/* Enable hw compression -not implemented-*/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Data transmit queue state.  One of these exists for each</div><div class='del'>- * hardware transmit queue.  Packets sent to us from above</div><div class='del'>- * are assigned to queues based on their priority.  Not all</div><div class='del'>- * devices support a complete set of hardware transmit queues.</div><div class='del'>- * For those devices the array sc_ac2q will map multiple</div><div class='del'>- * priorities to fewer hardware queues (typically all to one</div><div class='del'>- * hardware queue).</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_txq - Transmit queue state</div><div class='add'>+ * @qnum: Hardware q number</div><div class='add'>+ * @link: Link ptr in last TX desc</div><div class='add'>+ * @q: Transmit queue (&amp;struct list_head)</div><div class='add'>+ * @lock: Lock on q and link</div><div class='add'>+ * @setup: Is the queue configured</div><div class='add'>+ * @txq_len:Number of queued buffers</div><div class='add'>+ * @txq_max: Max allowed num of queued buffers</div><div class='add'>+ * @txq_poll_mark: Used to check if queue got stuck</div><div class='add'>+ * @txq_stuck: Queue stuck counter</div><div class='add'>+ *</div><div class='add'>+ * One of these exists for each hardware transmit queue.</div><div class='add'>+ * Packets sent to us from above are assigned to queues based</div><div class='add'>+ * on their priority.  Not all devices support a complete set</div><div class='add'>+ * of hardware transmit queues. For those devices the array</div><div class='add'>+ * sc_ac2q will map multiple priorities to fewer hardware queues</div><div class='add'>+ * (typically all to one hardware queue).</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_txq {</div><div class='del'>-	unsigned int		qnum;	/* hardware q number */</div><div class='del'>-	u32			*link;	/* link ptr in last TX desc */</div><div class='del'>-	struct list_head	q;	/* transmit queue */</div><div class='del'>-	spinlock_t		lock;	/* lock on q and link */</div><div class='add'>+	unsigned int		qnum;</div><div class='add'>+	u32			*link;</div><div class='add'>+	struct list_head	q;</div><div class='add'>+	spinlock_t		lock;</div><div class='ctx'> 	bool			setup;</div><div class='del'>-	int			txq_len; /* number of queued buffers */</div><div class='del'>-	int			txq_max; /* max allowed num of queued buffers */</div><div class='add'>+	int			txq_len;</div><div class='add'>+	int			txq_max;</div><div class='ctx'> 	bool			txq_poll_mark;</div><div class='del'>-	unsigned int		txq_stuck;	/* informational counter */</div><div class='add'>+	unsigned int		txq_stuck;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * A struct to hold tx queue's parameters</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_txq_info - A struct to hold TX queue's parameters</div><div class='add'>+ * @tqi_type: One of enum ath5k_tx_queue</div><div class='add'>+ * @tqi_subtype: One of enum ath5k_tx_queue_subtype</div><div class='add'>+ * @tqi_flags: TX queue flags (see above)</div><div class='add'>+ * @tqi_aifs: Arbitrated Inter-frame Space</div><div class='add'>+ * @tqi_cw_min: Minimum Contention Window</div><div class='add'>+ * @tqi_cw_max: Maximum Contention Window</div><div class='add'>+ * @tqi_cbr_period: Constant bit rate period</div><div class='add'>+ * @tqi_ready_time: Time queue waits after an event when RDYTIME is enabled</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_txq_info {</div><div class='ctx'> 	enum ath5k_tx_queue tqi_type;</div><div class='ctx'> 	enum ath5k_tx_queue_subtype tqi_subtype;</div><div class='del'>-	u16	tqi_flags;	/* Tx queue flags (see above) */</div><div class='del'>-	u8	tqi_aifs;	/* Arbitrated Interframe Space */</div><div class='del'>-	u16	tqi_cw_min;	/* Minimum Contention Window */</div><div class='del'>-	u16	tqi_cw_max;	/* Maximum Contention Window */</div><div class='del'>-	u32	tqi_cbr_period; /* Constant bit rate period */</div><div class='add'>+	u16	tqi_flags;</div><div class='add'>+	u8	tqi_aifs;</div><div class='add'>+	u16	tqi_cw_min;</div><div class='add'>+	u16	tqi_cw_max;</div><div class='add'>+	u32	tqi_cbr_period;</div><div class='ctx'> 	u32	tqi_cbr_overflow_limit;</div><div class='ctx'> 	u32	tqi_burst_time;</div><div class='del'>-	u32	tqi_ready_time; /* Time queue waits after an event */</div><div class='add'>+	u32	tqi_ready_time;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Transmit packet types.</div><div class='del'>- * used on tx control descriptor</div><div class='add'>+/**</div><div class='add'>+ * enum ath5k_pkt_type - Transmit packet types</div><div class='add'>+ * @AR5K_PKT_TYPE_NORMAL: Normal data</div><div class='add'>+ * @AR5K_PKT_TYPE_ATIM: ATIM</div><div class='add'>+ * @AR5K_PKT_TYPE_PSPOLL: PS-Poll</div><div class='add'>+ * @AR5K_PKT_TYPE_BEACON: Beacon</div><div class='add'>+ * @AR5K_PKT_TYPE_PROBE_RESP: Probe response</div><div class='add'>+ * @AR5K_PKT_TYPE_PIFS: PIFS</div><div class='add'>+ * Used on tx control descriptor</div><div class='ctx'>  */</div><div class='ctx'> enum ath5k_pkt_type {</div><div class='ctx'> 	AR5K_PKT_TYPE_NORMAL		= 0,</div><div class='hunk'>@@ -583,27 +689,23 @@ enum ath5k_pkt_type {</div><div class='ctx'> 	(ah-&gt;ah_txpower.txp_rates_power_table[(_r)] &amp; 0x3f) &lt;&lt; (_v)	\</div><div class='ctx'> )</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * DMA size definitions (2^(n+2))</div><div class='del'>- */</div><div class='del'>-enum ath5k_dmasize {</div><div class='del'>-	AR5K_DMASIZE_4B	= 0,</div><div class='del'>-	AR5K_DMASIZE_8B,</div><div class='del'>-	AR5K_DMASIZE_16B,</div><div class='del'>-	AR5K_DMASIZE_32B,</div><div class='del'>-	AR5K_DMASIZE_64B,</div><div class='del'>-	AR5K_DMASIZE_128B,</div><div class='del'>-	AR5K_DMASIZE_256B,</div><div class='del'>-	AR5K_DMASIZE_512B</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /****************\</div><div class='ctx'>   RX DEFINITIONS</div><div class='ctx'> \****************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * RX Status descriptor</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_rx_status - RX Status descriptor</div><div class='add'>+ * @rs_datalen: Data length</div><div class='add'>+ * @rs_tstamp: Timestamp</div><div class='add'>+ * @rs_status: Status code</div><div class='add'>+ * @rs_phyerr: PHY error mask</div><div class='add'>+ * @rs_rssi: RSSI in 0.5dbm units</div><div class='add'>+ * @rs_keyix: Index to the key used for decrypting</div><div class='add'>+ * @rs_rate: Rate used to decode the frame</div><div class='add'>+ * @rs_antenna: Antenna used to receive the frame</div><div class='add'>+ * @rs_more: Indicates this is a frame fragment (Fast frames)</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_rx_status {</div><div class='ctx'> 	u16	rs_datalen;</div><div class='hunk'>@@ -645,10 +747,18 @@ struct ath5k_rx_status {</div><div class='ctx'> #define TSF_TO_TU(_tsf) (u32)((_tsf) &gt;&gt; 10)</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /*******************************\</div><div class='ctx'>   GAIN OPTIMIZATION DEFINITIONS</div><div class='ctx'> \*******************************/</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * enum ath5k_rfgain - RF Gain optimization engine state</div><div class='add'>+ * @AR5K_RFGAIN_INACTIVE: Engine disabled</div><div class='add'>+ * @AR5K_RFGAIN_ACTIVE: Probe active</div><div class='add'>+ * @AR5K_RFGAIN_READ_REQUESTED: Probe requested</div><div class='add'>+ * @AR5K_RFGAIN_NEED_CHANGE: Gain_F needs change</div><div class='add'>+ */</div><div class='ctx'> enum ath5k_rfgain {</div><div class='ctx'> 	AR5K_RFGAIN_INACTIVE = 0,</div><div class='ctx'> 	AR5K_RFGAIN_ACTIVE,</div><div class='hunk'>@@ -656,6 +766,16 @@ enum ath5k_rfgain {</div><div class='ctx'> 	AR5K_RFGAIN_NEED_CHANGE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_gain - RF Gain optimization engine state data</div><div class='add'>+ * @g_step_idx: Current step index</div><div class='add'>+ * @g_current: Current gain</div><div class='add'>+ * @g_target: Target gain</div><div class='add'>+ * @g_low: Low gain boundary</div><div class='add'>+ * @g_high: High gain boundary</div><div class='add'>+ * @g_f_corr: Gain_F correction</div><div class='add'>+ * @g_state: One of enum ath5k_rfgain</div><div class='add'>+ */</div><div class='ctx'> struct ath5k_gain {</div><div class='ctx'> 	u8			g_step_idx;</div><div class='ctx'> 	u8			g_current;</div><div class='hunk'>@@ -666,6 +786,8 @@ struct ath5k_gain {</div><div class='ctx'> 	u8			g_state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /********************\</div><div class='ctx'>   COMMON DEFINITIONS</div><div class='ctx'> \********************/</div><div class='hunk'>@@ -674,9 +796,14 @@ struct ath5k_gain {</div><div class='ctx'> #define AR5K_SLOT_TIME_20	880</div><div class='ctx'> #define AR5K_SLOT_TIME_MAX	0xffff</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The following structure is used to map 2GHz channels to</div><div class='del'>- * 5GHz Atheros channels.</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_athchan_2ghz - 2GHz to 5GHZ map for RF5111</div><div class='add'>+ * @a2_flags: Channel flags (internal)</div><div class='add'>+ * @a2_athchan: HW channel number (internal)</div><div class='add'>+ *</div><div class='add'>+ * This structure is used to map 2GHz channels to</div><div class='add'>+ * 5GHz Atheros channels on 2111 frequency converter</div><div class='add'>+ * that comes together with RF5111</div><div class='ctx'>  * TODO: Clean up</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_athchan_2ghz {</div><div class='hunk'>@@ -684,36 +811,80 @@ struct ath5k_athchan_2ghz {</div><div class='ctx'> 	u16	a2_athchan;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * enum ath5k_dmasize -  DMA size definitions (2^(n+2))</div><div class='add'>+ * @AR5K_DMASIZE_4B: 4Bytes</div><div class='add'>+ * @AR5K_DMASIZE_8B: 8Bytes</div><div class='add'>+ * @AR5K_DMASIZE_16B: 16Bytes</div><div class='add'>+ * @AR5K_DMASIZE_32B: 32Bytes</div><div class='add'>+ * @AR5K_DMASIZE_64B: 64Bytes (Default)</div><div class='add'>+ * @AR5K_DMASIZE_128B: 128Bytes</div><div class='add'>+ * @AR5K_DMASIZE_256B: 256Bytes</div><div class='add'>+ * @AR5K_DMASIZE_512B: 512Bytes</div><div class='add'>+ *</div><div class='add'>+ * These are used to set DMA burst size on hw</div><div class='add'>+ *</div><div class='add'>+ * Note: Some platforms can't handle more than 4Bytes</div><div class='add'>+ * be careful on embedded boards.</div><div class='add'>+ */</div><div class='add'>+enum ath5k_dmasize {</div><div class='add'>+	AR5K_DMASIZE_4B	= 0,</div><div class='add'>+	AR5K_DMASIZE_8B,</div><div class='add'>+	AR5K_DMASIZE_16B,</div><div class='add'>+	AR5K_DMASIZE_32B,</div><div class='add'>+	AR5K_DMASIZE_64B,</div><div class='add'>+	AR5K_DMASIZE_128B,</div><div class='add'>+	AR5K_DMASIZE_256B,</div><div class='add'>+	AR5K_DMASIZE_512B</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /******************\</div><div class='ctx'>   RATE DEFINITIONS</div><div class='ctx'> \******************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * DOC: Rate codes</div><div class='add'>+ *</div><div class='ctx'>  * Seems the ar5xxx hardware supports up to 32 rates, indexed by 1-32.</div><div class='ctx'>  *</div><div class='ctx'>  * The rate code is used to get the RX rate or set the TX rate on the</div><div class='ctx'>  * hardware descriptors. It is also used for internal modulation control</div><div class='ctx'>  * and settings.</div><div class='ctx'>  *</div><div class='del'>- * This is the hardware rate map we are aware of:</div><div class='del'>- *</div><div class='del'>- * rate_code   0x01    0x02    0x03    0x04    0x05    0x06    0x07    0x08</div><div class='del'>- * rate_kbps   3000    1000    ?       ?       ?       2000    500     48000</div><div class='del'>- *</div><div class='del'>- * rate_code   0x09    0x0A    0x0B    0x0C    0x0D    0x0E    0x0F    0x10</div><div class='del'>- * rate_kbps   24000   12000   6000    54000   36000   18000   9000    ?</div><div class='add'>+ * This is the hardware rate map we are aware of (html unfriendly):</div><div class='ctx'>  *</div><div class='del'>- * rate_code   17      18      19      20      21      22      23      24</div><div class='del'>- * rate_kbps   ?       ?       ?       ?       ?       ?       ?       11000</div><div class='add'>+ * Rate code	Rate (Kbps)</div><div class='add'>+ * ---------	-----------</div><div class='add'>+ * 0x01		 3000 (XR)</div><div class='add'>+ * 0x02		 1000 (XR)</div><div class='add'>+ * 0x03		  250 (XR)</div><div class='add'>+ * 0x04 - 05	-Reserved-</div><div class='add'>+ * 0x06		 2000 (XR)</div><div class='add'>+ * 0x07		  500 (XR)</div><div class='add'>+ * 0x08		48000 (OFDM)</div><div class='add'>+ * 0x09		24000 (OFDM)</div><div class='add'>+ * 0x0A		12000 (OFDM)</div><div class='add'>+ * 0x0B		 6000 (OFDM)</div><div class='add'>+ * 0x0C		54000 (OFDM)</div><div class='add'>+ * 0x0D		36000 (OFDM)</div><div class='add'>+ * 0x0E		18000 (OFDM)</div><div class='add'>+ * 0x0F		 9000 (OFDM)</div><div class='add'>+ * 0x10 - 17	-Reserved-</div><div class='add'>+ * 0x18		11000L (CCK)</div><div class='add'>+ * 0x19		 5500L (CCK)</div><div class='add'>+ * 0x1A		 2000L (CCK)</div><div class='add'>+ * 0x1B		 1000L (CCK)</div><div class='add'>+ * 0x1C		11000S (CCK)</div><div class='add'>+ * 0x1D		 5500S (CCK)</div><div class='add'>+ * 0x1E		 2000S (CCK)</div><div class='add'>+ * 0x1F		-Reserved-</div><div class='ctx'>  *</div><div class='del'>- * rate_code   25      26      27      28      29      30      31      32</div><div class='del'>- * rate_kbps   5500    2000    1000    11000S  5500S   2000S   ?       ?</div><div class='del'>- *</div><div class='del'>- * "S" indicates CCK rates with short preamble.</div><div class='add'>+ * "S" indicates CCK rates with short preamble and "L" with long preamble.</div><div class='ctx'>  *</div><div class='ctx'>  * AR5211 has different rate codes for CCK (802.11B) rates. It only uses the</div><div class='del'>- * lowest 4 bits, so they are the same as below with a 0xF mask.</div><div class='add'>+ * lowest 4 bits, so they are the same as above with a 0xF mask.</div><div class='ctx'>  * (0xB, 0xA, 0x9 and 0x8 for 1M, 2M, 5.5M and 11M).</div><div class='ctx'>  * We handle this in ath5k_setup_bands().</div><div class='ctx'>  */</div><div class='hunk'>@@ -733,13 +904,9 @@ struct ath5k_athchan_2ghz {</div><div class='ctx'> #define ATH5K_RATE_CODE_36M	0x0D</div><div class='ctx'> #define ATH5K_RATE_CODE_48M	0x08</div><div class='ctx'> #define ATH5K_RATE_CODE_54M	0x0C</div><div class='del'>-/* XR */</div><div class='del'>-#define ATH5K_RATE_CODE_XR_500K	0x07</div><div class='del'>-#define ATH5K_RATE_CODE_XR_1M	0x02</div><div class='del'>-#define ATH5K_RATE_CODE_XR_2M	0x06</div><div class='del'>-#define ATH5K_RATE_CODE_XR_3M	0x01</div><div class='ctx'> </div><div class='del'>-/* adding this flag to rate_code enables short preamble */</div><div class='add'>+/* Adding this flag to rate_code on B rates</div><div class='add'>+ * enables short preamble */</div><div class='ctx'> #define AR5K_SET_SHORT_PREAMBLE 0x04</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -747,7 +914,7 @@ struct ath5k_athchan_2ghz {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define AR5K_KEYCACHE_SIZE	8</div><div class='del'>-extern int ath5k_modparam_nohwcrypt;</div><div class='add'>+extern bool ath5k_modparam_nohwcrypt;</div><div class='ctx'> </div><div class='ctx'> /***********************\</div><div class='ctx'>  HW RELATED DEFINITIONS</div><div class='hunk'>@@ -769,49 +936,65 @@ extern int ath5k_modparam_nohwcrypt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum ath5k_int - Hardware interrupt masks helpers</div><div class='add'>+ * @AR5K_INT_RXOK: Frame successfully received</div><div class='add'>+ * @AR5K_INT_RXDESC: Request RX descriptor/Read RX descriptor</div><div class='add'>+ * @AR5K_INT_RXERR: Frame reception failed</div><div class='add'>+ * @AR5K_INT_RXNOFRM: No frame received within a specified time period</div><div class='add'>+ * @AR5K_INT_RXEOL: Reached "End Of List", means we need more RX descriptors</div><div class='add'>+ * @AR5K_INT_RXORN: Indicates we got RX FIFO overrun. Note that Rx overrun is</div><div class='add'>+ *		not always fatal, on some chips we can continue operation</div><div class='add'>+ *		without resetting the card, that's why %AR5K_INT_FATAL is not</div><div class='add'>+ *		common for all chips.</div><div class='add'>+ * @AR5K_INT_RX_ALL: Mask to identify all RX related interrupts</div><div class='add'>+ *</div><div class='add'>+ * @AR5K_INT_TXOK: Frame transmission success</div><div class='add'>+ * @AR5K_INT_TXDESC: Request TX descriptor/Read TX status descriptor</div><div class='add'>+ * @AR5K_INT_TXERR: Frame transmission failure</div><div class='add'>+ * @AR5K_INT_TXEOL: Received End Of List for VEOL (Virtual End Of List). The</div><div class='add'>+ *		Queue Control Unit (QCU) signals an EOL interrupt only if a</div><div class='add'>+ *		descriptor's LinkPtr is NULL. For more details, refer to:</div><div class='add'>+ *		"http://www.freepatentsonline.com/20030225739.html"</div><div class='add'>+ * @AR5K_INT_TXNOFRM: No frame was transmitted within a specified time period</div><div class='add'>+ * @AR5K_INT_TXURN: Indicates we got TX FIFO underrun. In such case we should</div><div class='add'>+ *		increase the TX trigger threshold.</div><div class='add'>+ * @AR5K_INT_TX_ALL: Mask to identify all TX related interrupts</div><div class='ctx'>  *</div><div class='del'>- * @AR5K_INT_RX: mask to identify received frame interrupts, of type</div><div class='del'>- *	AR5K_ISR_RXOK or AR5K_ISR_RXERR</div><div class='del'>- * @AR5K_INT_RXDESC: Request RX descriptor/Read RX descriptor (?)</div><div class='del'>- * @AR5K_INT_RXNOFRM: No frame received (?)</div><div class='del'>- * @AR5K_INT_RXEOL: received End Of List for VEOL (Virtual End Of List). The</div><div class='del'>- *	Queue Control Unit (QCU) signals an EOL interrupt only if a descriptor's</div><div class='del'>- *	LinkPtr is NULL. For more details, refer to:</div><div class='del'>- *	http://www.freepatentsonline.com/20030225739.html</div><div class='del'>- * @AR5K_INT_RXORN: Indicates we got RX overrun (eg. no more descriptors).</div><div class='del'>- *	Note that Rx overrun is not always fatal, on some chips we can continue</div><div class='del'>- *	operation without resetting the card, that's why int_fatal is not</div><div class='del'>- *	common for all chips.</div><div class='del'>- * @AR5K_INT_TX: mask to identify received frame interrupts, of type</div><div class='del'>- *	AR5K_ISR_TXOK or AR5K_ISR_TXERR</div><div class='del'>- * @AR5K_INT_TXDESC: Request TX descriptor/Read TX status descriptor (?)</div><div class='del'>- * @AR5K_INT_TXURN: received when we should increase the TX trigger threshold</div><div class='del'>- *	We currently do increments on interrupt by</div><div class='del'>- *	(AR5K_TUNE_MAX_TX_FIFO_THRES - current_trigger_level) / 2</div><div class='ctx'>  * @AR5K_INT_MIB: Indicates the either Management Information Base counters or</div><div class='del'>- *	one of the PHY error counters reached the maximum value and should be</div><div class='del'>- *	read and cleared.</div><div class='add'>+ *		one of the PHY error counters reached the maximum value and</div><div class='add'>+ *		should be read and cleared.</div><div class='add'>+ * @AR5K_INT_SWI: Software triggered interrupt.</div><div class='ctx'>  * @AR5K_INT_RXPHY: RX PHY Error</div><div class='ctx'>  * @AR5K_INT_RXKCM: RX Key cache miss</div><div class='ctx'>  * @AR5K_INT_SWBA: SoftWare Beacon Alert - indicates its time to send a</div><div class='del'>- *	beacon that must be handled in software. The alternative is if you</div><div class='del'>- *	have VEOL support, in that case you let the hardware deal with things.</div><div class='add'>+ *		beacon that must be handled in software. The alternative is if</div><div class='add'>+ *		you have VEOL support, in that case you let the hardware deal</div><div class='add'>+ *		with things.</div><div class='add'>+ * @AR5K_INT_BRSSI: Beacon received with an RSSI value below our threshold</div><div class='ctx'>  * @AR5K_INT_BMISS: If in STA mode this indicates we have stopped seeing</div><div class='del'>- *	beacons from the AP have associated with, we should probably try to</div><div class='del'>- *	reassociate. When in IBSS mode this might mean we have not received</div><div class='del'>- *	any beacons from any local stations. Note that every station in an</div><div class='del'>- *	IBSS schedules to send beacons at the Target Beacon Transmission Time</div><div class='del'>- *	(TBTT) with a random backoff.</div><div class='del'>- * @AR5K_INT_BNR: Beacon Not Ready interrupt - ??</div><div class='del'>- * @AR5K_INT_GPIO: GPIO interrupt is used for RF Kill, disabled for now</div><div class='del'>- *	until properly handled</div><div class='del'>- * @AR5K_INT_FATAL: Fatal errors were encountered, typically caused by DMA</div><div class='del'>- *	errors. These types of errors we can enable seem to be of type</div><div class='del'>- *	AR5K_SIMR2_MCABT, AR5K_SIMR2_SSERR and AR5K_SIMR2_DPERR.</div><div class='add'>+ *		beacons from the AP have associated with, we should probably</div><div class='add'>+ *		try to reassociate. When in IBSS mode this might mean we have</div><div class='add'>+ *		not received any beacons from any local stations. Note that</div><div class='add'>+ *		every station in an IBSS schedules to send beacons at the</div><div class='add'>+ *		Target Beacon Transmission Time (TBTT) with a random backoff.</div><div class='add'>+ * @AR5K_INT_BNR: Beacon queue got triggered (DMA beacon alert) while empty.</div><div class='add'>+ * @AR5K_INT_TIM: Beacon with local station's TIM bit set</div><div class='add'>+ * @AR5K_INT_DTIM: Beacon with DTIM bit and zero DTIM count received</div><div class='add'>+ * @AR5K_INT_DTIM_SYNC: DTIM sync lost</div><div class='add'>+ * @AR5K_INT_GPIO: GPIO interrupt is used for RF Kill switches connected to</div><div class='add'>+ *		our GPIO pins.</div><div class='add'>+ * @AR5K_INT_BCN_TIMEOUT: Beacon timeout, we waited after TBTT but got noting</div><div class='add'>+ * @AR5K_INT_CAB_TIMEOUT: We waited for CAB traffic after the beacon but got</div><div class='add'>+ *		nothing or an incomplete CAB frame sequence.</div><div class='add'>+ * @AR5K_INT_QCBRORN: A queue got it's CBR counter expired</div><div class='add'>+ * @AR5K_INT_QCBRURN: A queue got triggered wile empty</div><div class='add'>+ * @AR5K_INT_QTRIG: A queue got triggered</div><div class='add'>+ *</div><div class='add'>+ * @AR5K_INT_FATAL: Fatal errors were encountered, typically caused by bus/DMA</div><div class='add'>+ *		errors. Indicates we need to reset the card.</div><div class='ctx'>  * @AR5K_INT_GLOBAL: Used to clear and set the IER</div><div class='del'>- * @AR5K_INT_NOCARD: signals the card has been removed</div><div class='del'>- * @AR5K_INT_COMMON: common interrupts shared among MACs with the same</div><div class='del'>- *	bit value</div><div class='add'>+ * @AR5K_INT_NOCARD: Signals the card has been removed</div><div class='add'>+ * @AR5K_INT_COMMON: Common interrupts shared among MACs with the same</div><div class='add'>+ *		bit value</div><div class='ctx'>  *</div><div class='ctx'>  * These are mapped to take advantage of some common bits</div><div class='ctx'>  * between the MACs, to be able to set intr properties</div><div class='hunk'>@@ -847,15 +1030,15 @@ enum ath5k_int {</div><div class='ctx'> 	AR5K_INT_GPIO	=	0x01000000,</div><div class='ctx'> 	AR5K_INT_BCN_TIMEOUT =	0x02000000, /* Non common */</div><div class='ctx'> 	AR5K_INT_CAB_TIMEOUT =	0x04000000, /* Non common */</div><div class='del'>-	AR5K_INT_RX_DOPPLER =	0x08000000, /* Non common */</div><div class='del'>-	AR5K_INT_QCBRORN =	0x10000000, /* Non common */</div><div class='del'>-	AR5K_INT_QCBRURN =	0x20000000, /* Non common */</div><div class='del'>-	AR5K_INT_QTRIG	=	0x40000000, /* Non common */</div><div class='add'>+	AR5K_INT_QCBRORN =	0x08000000, /* Non common */</div><div class='add'>+	AR5K_INT_QCBRURN =	0x10000000, /* Non common */</div><div class='add'>+	AR5K_INT_QTRIG	=	0x20000000, /* Non common */</div><div class='ctx'> 	AR5K_INT_GLOBAL =	0x80000000,</div><div class='ctx'> </div><div class='ctx'> 	AR5K_INT_TX_ALL = AR5K_INT_TXOK</div><div class='ctx'> 		| AR5K_INT_TXDESC</div><div class='ctx'> 		| AR5K_INT_TXERR</div><div class='add'>+		| AR5K_INT_TXNOFRM</div><div class='ctx'> 		| AR5K_INT_TXEOL</div><div class='ctx'> 		| AR5K_INT_TXURN,</div><div class='ctx'> </div><div class='hunk'>@@ -891,15 +1074,32 @@ enum ath5k_int {</div><div class='ctx'> 	AR5K_INT_NOCARD	= 0xffffffff</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* mask which calibration is active at the moment */</div><div class='add'>+/**</div><div class='add'>+ * enum ath5k_calibration_mask - Mask which calibration is active at the moment</div><div class='add'>+ * @AR5K_CALIBRATION_FULL: Full calibration (AGC + SHORT)</div><div class='add'>+ * @AR5K_CALIBRATION_SHORT: Short calibration (NF + I/Q)</div><div class='add'>+ * @AR5K_CALIBRATION_NF: Noise Floor calibration</div><div class='add'>+ * @AR5K_CALIBRATION_ANI: Adaptive Noise Immunity</div><div class='add'>+ */</div><div class='ctx'> enum ath5k_calibration_mask {</div><div class='ctx'> 	AR5K_CALIBRATION_FULL = 0x01,</div><div class='ctx'> 	AR5K_CALIBRATION_SHORT = 0x02,</div><div class='del'>-	AR5K_CALIBRATION_ANI = 0x04,</div><div class='add'>+	AR5K_CALIBRATION_NF = 0x04,</div><div class='add'>+	AR5K_CALIBRATION_ANI = 0x08,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Power management</div><div class='add'>+/**</div><div class='add'>+ * enum ath5k_power_mode - Power management modes</div><div class='add'>+ * @AR5K_PM_UNDEFINED: Undefined</div><div class='add'>+ * @AR5K_PM_AUTO: Allow card to sleep if possible</div><div class='add'>+ * @AR5K_PM_AWAKE: Force card to wake up</div><div class='add'>+ * @AR5K_PM_FULL_SLEEP: Force card to full sleep (DANGEROUS)</div><div class='add'>+ * @AR5K_PM_NETWORK_SLEEP: Allow to sleep for a specified duration</div><div class='add'>+ *</div><div class='add'>+ * Currently only PM_AWAKE is used, FULL_SLEEP and NETWORK_SLEEP/AUTO</div><div class='add'>+ * are also known to have problems on some cards. This is not a big</div><div class='add'>+ * problem though because we can have almost the same effect as</div><div class='add'>+ * FULL_SLEEP by putting card on warm reset (it's almost powered down).</div><div class='ctx'>  */</div><div class='ctx'> enum ath5k_power_mode {</div><div class='ctx'> 	AR5K_PM_UNDEFINED = 0,</div><div class='hunk'>@@ -957,6 +1157,8 @@ struct ath5k_capabilities {</div><div class='ctx'> 	} cap_queues;</div><div class='ctx'> </div><div class='ctx'> 	bool cap_has_phyerr_counters;</div><div class='add'>+	bool cap_has_mrr_support;</div><div class='add'>+	bool cap_needs_2GHz_ovr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* size of noise floor history (keep it a power of two) */</div><div class='hunk'>@@ -1072,13 +1274,11 @@ struct ath5k_hw {</div><div class='ctx'> 	dma_addr_t		desc_daddr;	/* DMA (physical) address */</div><div class='ctx'> 	size_t			desc_len;	/* size of TX/RX descriptors */</div><div class='ctx'> </div><div class='del'>-	DECLARE_BITMAP(status, 6);</div><div class='add'>+	DECLARE_BITMAP(status, 4);</div><div class='ctx'> #define ATH_STAT_INVALID	0		/* disable hardware accesses */</div><div class='del'>-#define ATH_STAT_MRRETRY	1		/* multi-rate retry support */</div><div class='del'>-#define ATH_STAT_PROMISC	2</div><div class='del'>-#define ATH_STAT_LEDSOFT	3		/* enable LED gpio status */</div><div class='del'>-#define ATH_STAT_STARTED	4		/* opened &amp; irqs enabled */</div><div class='del'>-#define ATH_STAT_2G_DISABLED	5		/* multiband radio without 2G */</div><div class='add'>+#define ATH_STAT_PROMISC	1</div><div class='add'>+#define ATH_STAT_LEDSOFT	2		/* enable LED gpio status */</div><div class='add'>+#define ATH_STAT_STARTED	3		/* opened &amp; irqs enabled */</div><div class='ctx'> </div><div class='ctx'> 	unsigned int		filter_flags;	/* HW flags, AR5K_RX_FILTER_* */</div><div class='ctx'> 	struct ieee80211_channel *curchan;	/* current h/w channel */</div><div class='hunk'>@@ -1097,6 +1297,7 @@ struct ath5k_hw {</div><div class='ctx'> 				led_on;		/* pin setting for LED on */</div><div class='ctx'> </div><div class='ctx'> 	struct work_struct	reset_work;	/* deferred chip reset */</div><div class='add'>+	struct work_struct	calib_work;	/* deferred phy calibration */</div><div class='ctx'> </div><div class='ctx'> 	struct list_head	rxbuf;		/* receive buffer */</div><div class='ctx'> 	spinlock_t		rxbuflock;</div><div class='hunk'>@@ -1113,8 +1314,6 @@ struct ath5k_hw {</div><div class='ctx'> </div><div class='ctx'> 	struct ath5k_rfkill	rf_kill;</div><div class='ctx'> </div><div class='del'>-	struct tasklet_struct	calib;		/* calibration tasklet */</div><div class='del'>-</div><div class='ctx'> 	spinlock_t		block;		/* protects beacon */</div><div class='ctx'> 	struct tasklet_struct	beacontq;	/* beacon intr tasklet */</div><div class='ctx'> 	struct list_head	bcbuf;		/* beacon buffer */</div><div class='hunk'>@@ -1144,7 +1343,7 @@ struct ath5k_hw {</div><div class='ctx'> 	enum ath5k_int		ah_imr;</div><div class='ctx'> </div><div class='ctx'> 	struct ieee80211_channel *ah_current_channel;</div><div class='del'>-	bool			ah_calibration;</div><div class='add'>+	bool			ah_iq_cal_needed;</div><div class='ctx'> 	bool			ah_single_chip;</div><div class='ctx'> </div><div class='ctx'> 	enum ath5k_version	ah_version;</div><div class='hunk'>@@ -1187,7 +1386,13 @@ struct ath5k_hw {</div><div class='ctx'> 	u32			ah_txq_imr_cbrurn;</div><div class='ctx'> 	u32			ah_txq_imr_qtrig;</div><div class='ctx'> 	u32			ah_txq_imr_nofrm;</div><div class='del'>-	u32			ah_txq_isr;</div><div class='add'>+</div><div class='add'>+	u32			ah_txq_isr_txok_all;</div><div class='add'>+	u32			ah_txq_isr_txurn;</div><div class='add'>+	u32			ah_txq_isr_qcborn;</div><div class='add'>+	u32			ah_txq_isr_qcburn;</div><div class='add'>+	u32			ah_txq_isr_qtrig;</div><div class='add'>+</div><div class='ctx'> 	u32			*ah_rf_banks;</div><div class='ctx'> 	size_t			ah_rf_banks_size;</div><div class='ctx'> 	size_t			ah_rf_regs_count;</div><div class='hunk'>@@ -1228,8 +1433,8 @@ struct ath5k_hw {</div><div class='ctx'> </div><div class='ctx'> 	/* Calibration timestamp */</div><div class='ctx'> 	unsigned long		ah_cal_next_full;</div><div class='add'>+	unsigned long		ah_cal_next_short;</div><div class='ctx'> 	unsigned long		ah_cal_next_ani;</div><div class='del'>-	unsigned long		ah_cal_next_nf;</div><div class='ctx'> </div><div class='ctx'> 	/* Calibration mask */</div><div class='ctx'> 	u8			ah_cal_mask;</div><div class='hunk'>@@ -1338,11 +1543,11 @@ void ath5k_hw_stop_rx_pcu(struct ath5k_hw *ah);</div><div class='ctx'> u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah);</div><div class='ctx'> void ath5k_hw_set_tsf64(struct ath5k_hw *ah, u64 tsf64);</div><div class='ctx'> void ath5k_hw_reset_tsf(struct ath5k_hw *ah);</div><div class='del'>-void ath5k_hw_init_beacon(struct ath5k_hw *ah, u32 next_beacon, u32 interval);</div><div class='add'>+void ath5k_hw_init_beacon_timers(struct ath5k_hw *ah, u32 next_beacon,</div><div class='add'>+							u32 interval);</div><div class='ctx'> bool ath5k_hw_check_beacon_timers(struct ath5k_hw *ah, int intval);</div><div class='ctx'> /* Init function */</div><div class='del'>-void ath5k_hw_pcu_init(struct ath5k_hw *ah, enum nl80211_iftype op_mode,</div><div class='del'>-								u8 mode);</div><div class='add'>+void ath5k_hw_pcu_init(struct ath5k_hw *ah, enum nl80211_iftype op_mode);</div><div class='ctx'> </div><div class='ctx'> /* Queue Control Unit, DFS Control Unit Functions */</div><div class='ctx'> int ath5k_hw_get_tx_queueprops(struct ath5k_hw *ah, int queue,</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/attach.c b/drivers/net/wireless/ath/ath5k/attach.c<br/>index 91627dd2c26a..d7114c75fe9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/attach.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/attach.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/attach.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/attach.c</a></div><div class='hunk'>@@ -27,8 +27,7 @@</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_post - Power On Self Test helper function</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_post() - Power On Self Test helper function</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  */</div><div class='ctx'> static int ath5k_hw_post(struct ath5k_hw *ah)</div><div class='hunk'>@@ -92,8 +91,7 @@ static int ath5k_hw_post(struct ath5k_hw *ah)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_init - Check if hw is supported and init the needed structs</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_init() - Check if hw is supported and init the needed structs</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw associated with the device</div><div class='ctx'>  *</div><div class='ctx'>  * Check if the device is supported, perform a POST and initialize the needed</div><div class='hunk'>@@ -298,7 +296,7 @@ int ath5k_hw_init(struct ath5k_hw *ah)</div><div class='ctx'> </div><div class='ctx'> 		/* Reset SERDES to load new settings */</div><div class='ctx'> 		ath5k_hw_reg_write(ah, 0x00000000, AR5K_PCIE_SERDES_RESET);</div><div class='del'>-		mdelay(1);</div><div class='add'>+		usleep_range(1000, 1500);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get misc capabilities */</div><div class='hunk'>@@ -308,11 +306,6 @@ int ath5k_hw_init(struct ath5k_hw *ah)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (test_bit(ATH_STAT_2G_DISABLED, ah-&gt;status)) {</div><div class='del'>-		__clear_bit(AR5K_MODE_11B, ah-&gt;ah_capabilities.cap_mode);</div><div class='del'>-		__clear_bit(AR5K_MODE_11G, ah-&gt;ah_capabilities.cap_mode);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Crypto settings */</div><div class='ctx'> 	common-&gt;keymax = (ah-&gt;ah_version == AR5K_AR5210 ?</div><div class='ctx'> 			  AR5K_KEYTABLE_SIZE_5210 : AR5K_KEYTABLE_SIZE_5211);</div><div class='hunk'>@@ -349,8 +342,7 @@ err:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_deinit - Free the ath5k_hw struct</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_deinit() - Free the &amp;struct ath5k_hw</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  */</div><div class='ctx'> void ath5k_hw_deinit(struct ath5k_hw *ah)</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c<br/>index b346d0492001..d366dadcf86e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/base.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/base.c</a></div><div class='hunk'>@@ -68,18 +68,23 @@</div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='ctx'> #include "trace.h"</div><div class='ctx'> </div><div class='del'>-int ath5k_modparam_nohwcrypt;</div><div class='add'>+bool ath5k_modparam_nohwcrypt;</div><div class='ctx'> module_param_named(nohwcrypt, ath5k_modparam_nohwcrypt, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");</div><div class='ctx'> </div><div class='del'>-static int modparam_all_channels;</div><div class='add'>+static bool modparam_all_channels;</div><div class='ctx'> module_param_named(all_channels, modparam_all_channels, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(all_channels, "Expose all channels the device can use.");</div><div class='ctx'> </div><div class='del'>-static int modparam_fastchanswitch;</div><div class='add'>+static bool modparam_fastchanswitch;</div><div class='ctx'> module_param_named(fastchanswitch, modparam_fastchanswitch, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(fastchanswitch, "Enable fast channel switching for AR2413/AR5413 radios.");</div><div class='ctx'> </div><div class='add'>+static int ath5k_modparam_no_hw_rfkill_switch;</div><div class='add'>+module_param_named(no_hw_rfkill_switch, ath5k_modparam_no_hw_rfkill_switch,</div><div class='add'>+								bool, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(no_hw_rfkill_switch, "Ignore the GPIO RFKill switch state");</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* Module info */</div><div class='ctx'> MODULE_AUTHOR("Jiri Slaby");</div><div class='hunk'>@@ -183,7 +188,6 @@ static const struct ieee80211_rate ath5k_rates[] = {</div><div class='ctx'> 	{ .bitrate = 540,</div><div class='ctx'> 	  .hw_value = ATH5K_RATE_CODE_54M,</div><div class='ctx'> 	  .flags = 0 },</div><div class='del'>-	/* XR missing */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline u64 ath5k_extend_tsf(struct ath5k_hw *ah, u32 rstamp)</div><div class='hunk'>@@ -721,21 +725,24 @@ ath5k_txbuf_setup(struct ath5k_hw *ah, struct ath5k_buf *bf,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_unmap;</div><div class='ctx'> </div><div class='del'>-	memset(mrr_rate, 0, sizeof(mrr_rate));</div><div class='del'>-	memset(mrr_tries, 0, sizeof(mrr_tries));</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		rate = ieee80211_get_alt_retry_rate(ah-&gt;hw, info, i);</div><div class='del'>-		if (!rate)</div><div class='del'>-			break;</div><div class='add'>+	/* Set up MRR descriptor */</div><div class='add'>+	if (ah-&gt;ah_capabilities.cap_has_mrr_support) {</div><div class='add'>+		memset(mrr_rate, 0, sizeof(mrr_rate));</div><div class='add'>+		memset(mrr_tries, 0, sizeof(mrr_tries));</div><div class='add'>+		for (i = 0; i &lt; 3; i++) {</div><div class='add'>+			rate = ieee80211_get_alt_retry_rate(ah-&gt;hw, info, i);</div><div class='add'>+			if (!rate)</div><div class='add'>+				break;</div><div class='ctx'> </div><div class='del'>-		mrr_rate[i] = rate-&gt;hw_value;</div><div class='del'>-		mrr_tries[i] = info-&gt;control.rates[i + 1].count;</div><div class='del'>-	}</div><div class='add'>+			mrr_rate[i] = rate-&gt;hw_value;</div><div class='add'>+			mrr_tries[i] = info-&gt;control.rates[i + 1].count;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	ath5k_hw_setup_mrr_tx_desc(ah, ds,</div><div class='del'>-		mrr_rate[0], mrr_tries[0],</div><div class='del'>-		mrr_rate[1], mrr_tries[1],</div><div class='del'>-		mrr_rate[2], mrr_tries[2]);</div><div class='add'>+		ath5k_hw_setup_mrr_tx_desc(ah, ds,</div><div class='add'>+			mrr_rate[0], mrr_tries[0],</div><div class='add'>+			mrr_rate[1], mrr_tries[1],</div><div class='add'>+			mrr_rate[2], mrr_tries[2]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ds-&gt;ds_link = 0;</div><div class='ctx'> 	ds-&gt;ds_data = bf-&gt;skbaddr;</div><div class='hunk'>@@ -1689,7 +1696,7 @@ ath5k_tasklet_tx(unsigned long data)</div><div class='ctx'> 	struct ath5k_hw *ah = (void *)data;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; AR5K_NUM_TX_QUEUES; i++)</div><div class='del'>-		if (ah-&gt;txqs[i].setup &amp;&amp; (ah-&gt;ah_txq_isr &amp; BIT(i)))</div><div class='add'>+		if (ah-&gt;txqs[i].setup &amp;&amp; (ah-&gt;ah_txq_isr_txok_all &amp; BIT(i)))</div><div class='ctx'> 			ath5k_tx_processq(ah, &amp;ah-&gt;txqs[i]);</div><div class='ctx'> </div><div class='ctx'> 	ah-&gt;tx_pending = false;</div><div class='hunk'>@@ -2005,7 +2012,7 @@ ath5k_beacon_update_timers(struct ath5k_hw *ah, u64 bc_tsf)</div><div class='ctx'> 	ah-&gt;nexttbtt = nexttbtt;</div><div class='ctx'> </div><div class='ctx'> 	intval |= AR5K_BEACON_ENA;</div><div class='del'>-	ath5k_hw_init_beacon(ah, nexttbtt, intval);</div><div class='add'>+	ath5k_hw_init_beacon_timers(ah, nexttbtt, intval);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * debugging output last in order to preserve the time critical aspect</div><div class='hunk'>@@ -2112,16 +2119,29 @@ static void</div><div class='ctx'> ath5k_intr_calibration_poll(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	if (time_is_before_eq_jiffies(ah-&gt;ah_cal_next_ani) &amp;&amp;</div><div class='del'>-	    !(ah-&gt;ah_cal_mask &amp; AR5K_CALIBRATION_FULL)) {</div><div class='del'>-		/* run ANI only when full calibration is not active */</div><div class='add'>+	   !(ah-&gt;ah_cal_mask &amp; AR5K_CALIBRATION_FULL) &amp;&amp;</div><div class='add'>+	   !(ah-&gt;ah_cal_mask &amp; AR5K_CALIBRATION_SHORT)) {</div><div class='add'>+</div><div class='add'>+		/* Run ANI only when calibration is not active */</div><div class='add'>+</div><div class='ctx'> 		ah-&gt;ah_cal_next_ani = jiffies +</div><div class='ctx'> 			msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_ANI);</div><div class='ctx'> 		tasklet_schedule(&amp;ah-&gt;ani_tasklet);</div><div class='ctx'> </div><div class='del'>-	} else if (time_is_before_eq_jiffies(ah-&gt;ah_cal_next_full)) {</div><div class='del'>-		ah-&gt;ah_cal_next_full = jiffies +</div><div class='del'>-			msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_FULL);</div><div class='del'>-		tasklet_schedule(&amp;ah-&gt;calib);</div><div class='add'>+	} else if (time_is_before_eq_jiffies(ah-&gt;ah_cal_next_short) &amp;&amp;</div><div class='add'>+		!(ah-&gt;ah_cal_mask &amp; AR5K_CALIBRATION_FULL) &amp;&amp;</div><div class='add'>+		!(ah-&gt;ah_cal_mask &amp; AR5K_CALIBRATION_SHORT)) {</div><div class='add'>+</div><div class='add'>+		/* Run calibration only when another calibration</div><div class='add'>+		 * is not running.</div><div class='add'>+		 *</div><div class='add'>+		 * Note: This is for both full/short calibration,</div><div class='add'>+		 * if it's time for a full one, ath5k_calibrate_work will deal</div><div class='add'>+		 * with it. */</div><div class='add'>+</div><div class='add'>+		ah-&gt;ah_cal_next_short = jiffies +</div><div class='add'>+			msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_SHORT);</div><div class='add'>+		ieee80211_queue_work(ah-&gt;hw, &amp;ah-&gt;calib_work);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* we could use SWI to generate enough interrupts to meet our</div><div class='ctx'> 	 * calibration interval requirements, if necessary:</div><div class='hunk'>@@ -2149,69 +2169,110 @@ ath5k_intr(int irq, void *dev_id)</div><div class='ctx'> 	enum ath5k_int status;</div><div class='ctx'> 	unsigned int counter = 1000;</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If hw is not ready (or detached) and we get an</div><div class='add'>+	 * interrupt, or if we have no interrupts pending</div><div class='add'>+	 * (that means it's not for us) skip it.</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE: Group 0/1 PCI interface registers are not</div><div class='add'>+	 * supported on WiSOCs, so we can't check for pending</div><div class='add'>+	 * interrupts (ISR belongs to another register group</div><div class='add'>+	 * so we are ok).</div><div class='add'>+	 */</div><div class='ctx'> 	if (unlikely(test_bit(ATH_STAT_INVALID, ah-&gt;status) ||</div><div class='del'>-		((ath5k_get_bus_type(ah) != ATH_AHB) &amp;&amp;</div><div class='del'>-				!ath5k_hw_is_intr_pending(ah))))</div><div class='add'>+			((ath5k_get_bus_type(ah) != ATH_AHB) &amp;&amp;</div><div class='add'>+			!ath5k_hw_is_intr_pending(ah))))</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='add'>+	/** Main loop **/</div><div class='ctx'> 	do {</div><div class='del'>-		ath5k_hw_get_isr(ah, &amp;status);		/* NB: clears IRQ too */</div><div class='add'>+		ath5k_hw_get_isr(ah, &amp;status);	/* NB: clears IRQ too */</div><div class='add'>+</div><div class='ctx'> 		ATH5K_DBG(ah, ATH5K_DEBUG_INTR, "status 0x%x/0x%x\n",</div><div class='ctx'> 				status, ah-&gt;imask);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Fatal hw error -&gt; Log and reset</div><div class='add'>+		 *</div><div class='add'>+		 * Fatal errors are unrecoverable so we have to</div><div class='add'>+		 * reset the card. These errors include bus and</div><div class='add'>+		 * dma errors.</div><div class='add'>+		 */</div><div class='ctx'> 		if (unlikely(status &amp; AR5K_INT_FATAL)) {</div><div class='del'>-			/*</div><div class='del'>-			 * Fatal errors are unrecoverable.</div><div class='del'>-			 * Typically these are caused by DMA errors.</div><div class='del'>-			 */</div><div class='add'>+</div><div class='ctx'> 			ATH5K_DBG(ah, ATH5K_DEBUG_RESET,</div><div class='ctx'> 				  "fatal int, resetting\n");</div><div class='ctx'> 			ieee80211_queue_work(ah-&gt;hw, &amp;ah-&gt;reset_work);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * RX Overrun -&gt; Count and reset if needed</div><div class='add'>+		 *</div><div class='add'>+		 * Receive buffers are full. Either the bus is busy or</div><div class='add'>+		 * the CPU is not fast enough to process all received</div><div class='add'>+		 * frames.</div><div class='add'>+		 */</div><div class='ctx'> 		} else if (unlikely(status &amp; AR5K_INT_RXORN)) {</div><div class='add'>+</div><div class='ctx'> 			/*</div><div class='del'>-			 * Receive buffers are full. Either the bus is busy or</div><div class='del'>-			 * the CPU is not fast enough to process all received</div><div class='del'>-			 * frames.</div><div class='ctx'> 			 * Older chipsets need a reset to come out of this</div><div class='ctx'> 			 * condition, but we treat it as RX for newer chips.</div><div class='del'>-			 * We don't know exactly which versions need a reset -</div><div class='add'>+			 * We don't know exactly which versions need a reset</div><div class='ctx'> 			 * this guess is copied from the HAL.</div><div class='ctx'> 			 */</div><div class='ctx'> 			ah-&gt;stats.rxorn_intr++;</div><div class='add'>+</div><div class='ctx'> 			if (ah-&gt;ah_mac_srev &lt; AR5K_SREV_AR5212) {</div><div class='ctx'> 				ATH5K_DBG(ah, ATH5K_DEBUG_RESET,</div><div class='ctx'> 					  "rx overrun, resetting\n");</div><div class='ctx'> 				ieee80211_queue_work(ah-&gt;hw, &amp;ah-&gt;reset_work);</div><div class='ctx'> 			} else</div><div class='ctx'> 				ath5k_schedule_rx(ah);</div><div class='add'>+</div><div class='ctx'> 		} else {</div><div class='add'>+</div><div class='add'>+			/* Software Beacon Alert -&gt; Schedule beacon tasklet */</div><div class='ctx'> 			if (status &amp; AR5K_INT_SWBA)</div><div class='ctx'> 				tasklet_hi_schedule(&amp;ah-&gt;beacontq);</div><div class='ctx'> </div><div class='del'>-			if (status &amp; AR5K_INT_RXEOL) {</div><div class='del'>-				/*</div><div class='del'>-				* NB: the hardware should re-read the link when</div><div class='del'>-				*     RXE bit is written, but it doesn't work at</div><div class='del'>-				*     least on older hardware revs.</div><div class='del'>-				*/</div><div class='add'>+			/*</div><div class='add'>+			 * No more RX descriptors -&gt; Just count</div><div class='add'>+			 *</div><div class='add'>+			 * NB: the hardware should re-read the link when</div><div class='add'>+			 *     RXE bit is written, but it doesn't work at</div><div class='add'>+			 *     least on older hardware revs.</div><div class='add'>+			 */</div><div class='add'>+			if (status &amp; AR5K_INT_RXEOL)</div><div class='ctx'> 				ah-&gt;stats.rxeol_intr++;</div><div class='del'>-			}</div><div class='del'>-			if (status &amp; AR5K_INT_TXURN) {</div><div class='del'>-				/* bump tx trigger level */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+			/* TX Underrun -&gt; Bump tx trigger level */</div><div class='add'>+			if (status &amp; AR5K_INT_TXURN)</div><div class='ctx'> 				ath5k_hw_update_tx_triglevel(ah, true);</div><div class='del'>-			}</div><div class='add'>+</div><div class='add'>+			/* RX -&gt; Schedule rx tasklet */</div><div class='ctx'> 			if (status &amp; (AR5K_INT_RXOK | AR5K_INT_RXERR))</div><div class='ctx'> 				ath5k_schedule_rx(ah);</div><div class='del'>-			if (status &amp; (AR5K_INT_TXOK | AR5K_INT_TXDESC</div><div class='del'>-					| AR5K_INT_TXERR | AR5K_INT_TXEOL))</div><div class='add'>+</div><div class='add'>+			/* TX -&gt; Schedule tx tasklet */</div><div class='add'>+			if (status &amp; (AR5K_INT_TXOK</div><div class='add'>+					| AR5K_INT_TXDESC</div><div class='add'>+					| AR5K_INT_TXERR</div><div class='add'>+					| AR5K_INT_TXEOL))</div><div class='ctx'> 				ath5k_schedule_tx(ah);</div><div class='del'>-			if (status &amp; AR5K_INT_BMISS) {</div><div class='del'>-				/* TODO */</div><div class='del'>-			}</div><div class='add'>+</div><div class='add'>+			/* Missed beacon -&gt; TODO</div><div class='add'>+			if (status &amp; AR5K_INT_BMISS)</div><div class='add'>+			*/</div><div class='add'>+</div><div class='add'>+			/* MIB event -&gt; Update counters and notify ANI */</div><div class='ctx'> 			if (status &amp; AR5K_INT_MIB) {</div><div class='ctx'> 				ah-&gt;stats.mib_intr++;</div><div class='ctx'> 				ath5k_hw_update_mib_counters(ah);</div><div class='ctx'> 				ath5k_ani_mib_intr(ah);</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			/* GPIO -&gt; Notify RFKill layer */</div><div class='ctx'> 			if (status &amp; AR5K_INT_GPIO)</div><div class='ctx'> 				tasklet_schedule(&amp;ah-&gt;rf_kill.toggleq);</div><div class='ctx'> </div><div class='hunk'>@@ -2222,12 +2283,19 @@ ath5k_intr(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	} while (ath5k_hw_is_intr_pending(ah) &amp;&amp; --counter &gt; 0);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Until we handle rx/tx interrupts mask them on IMR</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE: ah-&gt;(rx/tx)_pending are set when scheduling the tasklets</div><div class='add'>+	 * and unset after we 've handled the interrupts.</div><div class='add'>+	 */</div><div class='ctx'> 	if (ah-&gt;rx_pending || ah-&gt;tx_pending)</div><div class='ctx'> 		ath5k_set_current_imask(ah);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!counter))</div><div class='ctx'> 		ATH5K_WARN(ah, "too many interrupts, giving up for now\n");</div><div class='ctx'> </div><div class='add'>+	/* Fire up calibration poll */</div><div class='ctx'> 	ath5k_intr_calibration_poll(ah);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -2238,41 +2306,58 @@ ath5k_intr(int irq, void *dev_id)</div><div class='ctx'>  * for temperature/environment changes.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-ath5k_tasklet_calibrate(unsigned long data)</div><div class='add'>+ath5k_calibrate_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct ath5k_hw *ah = (void *)data;</div><div class='add'>+	struct ath5k_hw *ah = container_of(work, struct ath5k_hw,</div><div class='add'>+		calib_work);</div><div class='add'>+</div><div class='add'>+	/* Should we run a full calibration ? */</div><div class='add'>+	if (time_is_before_eq_jiffies(ah-&gt;ah_cal_next_full)) {</div><div class='add'>+</div><div class='add'>+		ah-&gt;ah_cal_next_full = jiffies +</div><div class='add'>+			msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_FULL);</div><div class='add'>+		ah-&gt;ah_cal_mask |= AR5K_CALIBRATION_FULL;</div><div class='add'>+</div><div class='add'>+		ATH5K_DBG(ah, ATH5K_DEBUG_CALIBRATE,</div><div class='add'>+				"running full calibration\n");</div><div class='add'>+</div><div class='add'>+		if (ath5k_hw_gainf_calibrate(ah) == AR5K_RFGAIN_NEED_CHANGE) {</div><div class='add'>+			/*</div><div class='add'>+			 * Rfgain is out of bounds, reset the chip</div><div class='add'>+			 * to load new gain values.</div><div class='add'>+			 */</div><div class='add'>+			ATH5K_DBG(ah, ATH5K_DEBUG_RESET,</div><div class='add'>+					"got new rfgain, resetting\n");</div><div class='add'>+			ieee80211_queue_work(ah-&gt;hw, &amp;ah-&gt;reset_work);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* TODO: On full calibration we should stop TX here,</div><div class='add'>+		 * so that it doesn't interfere (mostly due to gain_f</div><div class='add'>+		 * calibration that messes with tx packets -see phy.c).</div><div class='add'>+		 *</div><div class='add'>+		 * NOTE: Stopping the queues from above is not enough</div><div class='add'>+		 * to stop TX but saves us from disconecting (at least</div><div class='add'>+		 * we don't lose packets). */</div><div class='add'>+		ieee80211_stop_queues(ah-&gt;hw);</div><div class='add'>+	} else</div><div class='add'>+		ah-&gt;ah_cal_mask |= AR5K_CALIBRATION_SHORT;</div><div class='ctx'> </div><div class='del'>-	/* Only full calibration for now */</div><div class='del'>-	ah-&gt;ah_cal_mask |= AR5K_CALIBRATION_FULL;</div><div class='ctx'> </div><div class='ctx'> 	ATH5K_DBG(ah, ATH5K_DEBUG_CALIBRATE, "channel %u/%x\n",</div><div class='ctx'> 		ieee80211_frequency_to_channel(ah-&gt;curchan-&gt;center_freq),</div><div class='ctx'> 		ah-&gt;curchan-&gt;hw_value);</div><div class='ctx'> </div><div class='del'>-	if (ath5k_hw_gainf_calibrate(ah) == AR5K_RFGAIN_NEED_CHANGE) {</div><div class='del'>-		/*</div><div class='del'>-		 * Rfgain is out of bounds, reset the chip</div><div class='del'>-		 * to load new gain values.</div><div class='del'>-		 */</div><div class='del'>-		ATH5K_DBG(ah, ATH5K_DEBUG_RESET, "calibration, resetting\n");</div><div class='del'>-		ieee80211_queue_work(ah-&gt;hw, &amp;ah-&gt;reset_work);</div><div class='del'>-	}</div><div class='ctx'> 	if (ath5k_hw_phy_calibrate(ah, ah-&gt;curchan))</div><div class='ctx'> 		ATH5K_ERR(ah, "calibration of channel %u failed\n",</div><div class='ctx'> 			ieee80211_frequency_to_channel(</div><div class='ctx'> 				ah-&gt;curchan-&gt;center_freq));</div><div class='ctx'> </div><div class='del'>-	/* Noise floor calibration interrupts rx/tx path while I/Q calibration</div><div class='del'>-	 * doesn't.</div><div class='del'>-	 * TODO: We should stop TX here, so that it doesn't interfere.</div><div class='del'>-	 * Note that stopping the queues is not enough to stop TX! */</div><div class='del'>-	if (time_is_before_eq_jiffies(ah-&gt;ah_cal_next_nf)) {</div><div class='del'>-		ah-&gt;ah_cal_next_nf = jiffies +</div><div class='del'>-			msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_NF);</div><div class='del'>-		ath5k_hw_update_noise_floor(ah);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ah-&gt;ah_cal_mask &amp;= ~AR5K_CALIBRATION_FULL;</div><div class='add'>+	/* Clear calibration flags */</div><div class='add'>+	if (ah-&gt;ah_cal_mask &amp; AR5K_CALIBRATION_FULL) {</div><div class='add'>+		ieee80211_wake_queues(ah-&gt;hw);</div><div class='add'>+		ah-&gt;ah_cal_mask &amp;= ~AR5K_CALIBRATION_FULL;</div><div class='add'>+	} else if (ah-&gt;ah_cal_mask &amp; AR5K_CALIBRATION_SHORT)</div><div class='add'>+		ah-&gt;ah_cal_mask &amp;= ~AR5K_CALIBRATION_SHORT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2407,8 +2492,8 @@ ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_irq;</div><div class='ctx'> </div><div class='del'>-	/* set up multi-rate retry capabilities */</div><div class='del'>-	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='add'>+	/* Set up multi-rate retry capabilities */</div><div class='add'>+	if (ah-&gt;ah_capabilities.cap_has_mrr_support) {</div><div class='ctx'> 		hw-&gt;max_rates = 4;</div><div class='ctx'> 		hw-&gt;max_rate_tries = max(AR5K_INIT_RETRY_SHORT,</div><div class='ctx'> 					 AR5K_INIT_RETRY_LONG);</div><div class='hunk'>@@ -2544,15 +2629,22 @@ int ath5k_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	 * and then setup of the interrupt mask.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ah-&gt;curchan = ah-&gt;hw-&gt;conf.channel;</div><div class='del'>-	ah-&gt;imask = AR5K_INT_RXOK | AR5K_INT_RXERR | AR5K_INT_RXEOL |</div><div class='del'>-		AR5K_INT_RXORN | AR5K_INT_TXDESC | AR5K_INT_TXEOL |</div><div class='del'>-		AR5K_INT_FATAL | AR5K_INT_GLOBAL | AR5K_INT_MIB;</div><div class='add'>+	ah-&gt;imask = AR5K_INT_RXOK</div><div class='add'>+		| AR5K_INT_RXERR</div><div class='add'>+		| AR5K_INT_RXEOL</div><div class='add'>+		| AR5K_INT_RXORN</div><div class='add'>+		| AR5K_INT_TXDESC</div><div class='add'>+		| AR5K_INT_TXEOL</div><div class='add'>+		| AR5K_INT_FATAL</div><div class='add'>+		| AR5K_INT_GLOBAL</div><div class='add'>+		| AR5K_INT_MIB;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath5k_reset(ah, NULL, false);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	ath5k_rfkill_hw_start(ah);</div><div class='add'>+	if (!ath5k_modparam_no_hw_rfkill_switch)</div><div class='add'>+		ath5k_rfkill_hw_start(ah);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Reset the key cache since some parts do not reset the</div><div class='hunk'>@@ -2585,7 +2677,6 @@ static void ath5k_stop_tasklets(struct ath5k_hw *ah)</div><div class='ctx'> 	ah-&gt;tx_pending = false;</div><div class='ctx'> 	tasklet_kill(&amp;ah-&gt;rxtq);</div><div class='ctx'> 	tasklet_kill(&amp;ah-&gt;txtq);</div><div class='del'>-	tasklet_kill(&amp;ah-&gt;calib);</div><div class='ctx'> 	tasklet_kill(&amp;ah-&gt;beacontq);</div><div class='ctx'> 	tasklet_kill(&amp;ah-&gt;ani_tasklet);</div><div class='ctx'> }</div><div class='hunk'>@@ -2637,7 +2728,8 @@ void ath5k_stop(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	cancel_delayed_work_sync(&amp;ah-&gt;tx_complete_work);</div><div class='ctx'> </div><div class='del'>-	ath5k_rfkill_hw_stop(ah);</div><div class='add'>+	if (!ath5k_modparam_no_hw_rfkill_switch)</div><div class='add'>+		ath5k_rfkill_hw_stop(ah);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2689,9 +2781,24 @@ ath5k_reset(struct ath5k_hw *ah, struct ieee80211_channel *chan,</div><div class='ctx'> </div><div class='ctx'> 	ath5k_ani_init(ah, ani_mode);</div><div class='ctx'> </div><div class='del'>-	ah-&gt;ah_cal_next_full = jiffies + msecs_to_jiffies(100);</div><div class='del'>-	ah-&gt;ah_cal_next_ani = jiffies;</div><div class='del'>-	ah-&gt;ah_cal_next_nf = jiffies;</div><div class='add'>+	/*</div><div class='add'>+	 * Set calibration intervals</div><div class='add'>+	 *</div><div class='add'>+	 * Note: We don't need to run calibration imediately</div><div class='add'>+	 * since some initial calibration is done on reset</div><div class='add'>+	 * even for fast channel switching. Also on scanning</div><div class='add'>+	 * this will get set again and again and it won't get</div><div class='add'>+	 * executed unless we connect somewhere and spend some</div><div class='add'>+	 * time on the channel (that's what calibration needs</div><div class='add'>+	 * anyway to be accurate).</div><div class='add'>+	 */</div><div class='add'>+	ah-&gt;ah_cal_next_full = jiffies +</div><div class='add'>+		msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_FULL);</div><div class='add'>+	ah-&gt;ah_cal_next_ani = jiffies +</div><div class='add'>+		msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_ANI);</div><div class='add'>+	ah-&gt;ah_cal_next_short = jiffies +</div><div class='add'>+		msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_SHORT);</div><div class='add'>+</div><div class='ctx'> 	ewma_init(&amp;ah-&gt;ah_beacon_rssi_avg, 1024, 8);</div><div class='ctx'> </div><div class='ctx'> 	/* clear survey data and cycle counters */</div><div class='hunk'>@@ -2745,20 +2852,6 @@ ath5k_init(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Check if the MAC has multi-rate retry support.</div><div class='del'>-	 * We do this by trying to setup a fake extended</div><div class='del'>-	 * descriptor.  MACs that don't have support will</div><div class='del'>-	 * return false w/o doing anything.  MACs that do</div><div class='del'>-	 * support it will return true w/o doing anything.</div><div class='del'>-	 */</div><div class='del'>-	ret = ath5k_hw_setup_mrr_tx_desc(ah, NULL, 0, 0, 0, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-	if (ret &gt; 0)</div><div class='del'>-		__set_bit(ATH_STAT_MRRETRY, ah-&gt;status);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Collect the channel list.  The 802.11 layer</div><div class='ctx'> 	 * is responsible for filtering this list based</div><div class='ctx'> 	 * on settings like the phy mode and regulatory</div><div class='hunk'>@@ -2841,11 +2934,11 @@ ath5k_init(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	tasklet_init(&amp;ah-&gt;rxtq, ath5k_tasklet_rx, (unsigned long)ah);</div><div class='ctx'> 	tasklet_init(&amp;ah-&gt;txtq, ath5k_tasklet_tx, (unsigned long)ah);</div><div class='del'>-	tasklet_init(&amp;ah-&gt;calib, ath5k_tasklet_calibrate, (unsigned long)ah);</div><div class='ctx'> 	tasklet_init(&amp;ah-&gt;beacontq, ath5k_tasklet_beacon, (unsigned long)ah);</div><div class='ctx'> 	tasklet_init(&amp;ah-&gt;ani_tasklet, ath5k_tasklet_ani, (unsigned long)ah);</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;ah-&gt;reset_work, ath5k_reset_work);</div><div class='add'>+	INIT_WORK(&amp;ah-&gt;calib_work, ath5k_calibrate_work);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;ah-&gt;tx_complete_work, ath5k_tx_complete_poll_work);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath5k_hw_common(ah)-&gt;bus_ops-&gt;eeprom_read_mac(ah, mac);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/caps.c b/drivers/net/wireless/ath/ath5k/caps.c<br/>index 810fba96702b..994169ad39cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/caps.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/caps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/caps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/caps.c</a></div><div class='hunk'>@@ -85,12 +85,19 @@ int ath5k_hw_set_capabilities(struct ath5k_hw *ah)</div><div class='ctx'> 			caps-&gt;cap_range.range_2ghz_min = 2412;</div><div class='ctx'> 			caps-&gt;cap_range.range_2ghz_max = 2732;</div><div class='ctx'> </div><div class='del'>-			if (AR5K_EEPROM_HDR_11B(ee_header))</div><div class='del'>-				__set_bit(AR5K_MODE_11B, caps-&gt;cap_mode);</div><div class='del'>-</div><div class='del'>-			if (AR5K_EEPROM_HDR_11G(ee_header) &amp;&amp;</div><div class='del'>-			    ah-&gt;ah_version != AR5K_AR5211)</div><div class='del'>-				__set_bit(AR5K_MODE_11G, caps-&gt;cap_mode);</div><div class='add'>+			/* Override 2GHz modes on SoCs that need it</div><div class='add'>+			 * NOTE: cap_needs_2GHz_ovr gets set from</div><div class='add'>+			 * ath_ahb_probe */</div><div class='add'>+			if (!caps-&gt;cap_needs_2GHz_ovr) {</div><div class='add'>+				if (AR5K_EEPROM_HDR_11B(ee_header))</div><div class='add'>+					__set_bit(AR5K_MODE_11B,</div><div class='add'>+							caps-&gt;cap_mode);</div><div class='add'>+</div><div class='add'>+				if (AR5K_EEPROM_HDR_11G(ee_header) &amp;&amp;</div><div class='add'>+				ah-&gt;ah_version != AR5K_AR5211)</div><div class='add'>+					__set_bit(AR5K_MODE_11G,</div><div class='add'>+							caps-&gt;cap_mode);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -103,12 +110,18 @@ int ath5k_hw_set_capabilities(struct ath5k_hw *ah)</div><div class='ctx'> 	else</div><div class='ctx'> 		caps-&gt;cap_queues.q_tx_num = AR5K_NUM_TX_QUEUES;</div><div class='ctx'> </div><div class='del'>-	/* newer hardware has PHY error counters */</div><div class='add'>+	/* Newer hardware has PHY error counters */</div><div class='ctx'> 	if (ah-&gt;ah_mac_srev &gt;= AR5K_SREV_AR5213A)</div><div class='ctx'> 		caps-&gt;cap_has_phyerr_counters = true;</div><div class='ctx'> 	else</div><div class='ctx'> 		caps-&gt;cap_has_phyerr_counters = false;</div><div class='ctx'> </div><div class='add'>+	/* MACs since AR5212 have MRR support */</div><div class='add'>+	if (ah-&gt;ah_version == AR5K_AR5212)</div><div class='add'>+		caps-&gt;cap_has_mrr_support = true;</div><div class='add'>+	else</div><div class='add'>+		caps-&gt;cap_has_mrr_support = false;</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/net/wireless/ath/ath5k/desc.c b/drivers/net/wireless/ath/ath5k/desc.c<br/>index 7e88dda82221..f8bfa3ac2af0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/desc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/desc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/desc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/desc.c</a></div><div class='hunk'>@@ -26,20 +26,61 @@</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * DOC: Hardware descriptor functions</div><div class='add'>+ *</div><div class='add'>+ * Here we handle the processing of the low-level hw descriptors</div><div class='add'>+ * that hw reads and writes via DMA for each TX and RX attempt (that means</div><div class='add'>+ * we can also have descriptors for failed TX/RX tries). We have two kind of</div><div class='add'>+ * descriptors for RX and TX, control descriptors tell the hw how to send or</div><div class='add'>+ * receive a packet where to read/write it from/to etc and status descriptors</div><div class='add'>+ * that contain information about how the packet was sent or received (errors</div><div class='add'>+ * included).</div><div class='add'>+ *</div><div class='add'>+ * Descriptor format is not exactly the same for each MAC chip version so we</div><div class='add'>+ * have function pointers on &amp;struct ath5k_hw we initialize at runtime based on</div><div class='add'>+ * the chip used.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /************************\</div><div class='ctx'> * TX Control descriptors *</div><div class='ctx'> \************************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Initialize the 2-word tx control descriptor on 5210/5211</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_setup_2word_tx_desc() - Initialize a 2-word tx control descriptor</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @desc: The &amp;struct ath5k_desc</div><div class='add'>+ * @pkt_len: Frame length in bytes</div><div class='add'>+ * @hdr_len: Header length in bytes (only used on AR5210)</div><div class='add'>+ * @padsize: Any padding we've added to the frame length</div><div class='add'>+ * @type: One of enum ath5k_pkt_type</div><div class='add'>+ * @tx_power: Tx power in 0.5dB steps</div><div class='add'>+ * @tx_rate0: HW idx for transmission rate</div><div class='add'>+ * @tx_tries0: Max number of retransmissions</div><div class='add'>+ * @key_index: Index on key table to use for encryption</div><div class='add'>+ * @antenna_mode: Which antenna to use (0 for auto)</div><div class='add'>+ * @flags: One of AR5K_TXDESC_* flags (desc.h)</div><div class='add'>+ * @rtscts_rate: HW idx for RTS/CTS transmission rate</div><div class='add'>+ * @rtscts_duration: What to put on duration field on the header of RTS/CTS</div><div class='add'>+ *</div><div class='add'>+ * Internal function to initialize a 2-Word TX control descriptor</div><div class='add'>+ * found on AR5210 and AR5211 MACs chips.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success or -EINVAL on false input</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,</div><div class='del'>-	unsigned int pkt_len, unsigned int hdr_len, int padsize,</div><div class='del'>-	enum ath5k_pkt_type type,</div><div class='del'>-	unsigned int tx_power, unsigned int tx_rate0, unsigned int tx_tries0,</div><div class='del'>-	unsigned int key_index, unsigned int antenna_mode, unsigned int flags,</div><div class='del'>-	unsigned int rtscts_rate, unsigned int rtscts_duration)</div><div class='add'>+ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah,</div><div class='add'>+			struct ath5k_desc *desc,</div><div class='add'>+			unsigned int pkt_len, unsigned int hdr_len,</div><div class='add'>+			int padsize,</div><div class='add'>+			enum ath5k_pkt_type type,</div><div class='add'>+			unsigned int tx_power,</div><div class='add'>+			unsigned int tx_rate0, unsigned int tx_tries0,</div><div class='add'>+			unsigned int key_index,</div><div class='add'>+			unsigned int antenna_mode,</div><div class='add'>+			unsigned int flags,</div><div class='add'>+			unsigned int rtscts_rate, unsigned int rtscts_duration)</div><div class='ctx'> {</div><div class='ctx'> 	u32 frame_type;</div><div class='ctx'> 	struct ath5k_hw_2w_tx_ctl *tx_ctl;</div><div class='hunk'>@@ -172,17 +213,40 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Initialize the 4-word tx control descriptor on 5212</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_setup_4word_tx_desc() - Initialize a 4-word tx control descriptor</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @desc: The &amp;struct ath5k_desc</div><div class='add'>+ * @pkt_len: Frame length in bytes</div><div class='add'>+ * @hdr_len: Header length in bytes (only used on AR5210)</div><div class='add'>+ * @padsize: Any padding we've added to the frame length</div><div class='add'>+ * @type: One of enum ath5k_pkt_type</div><div class='add'>+ * @tx_power: Tx power in 0.5dB steps</div><div class='add'>+ * @tx_rate0: HW idx for transmission rate</div><div class='add'>+ * @tx_tries0: Max number of retransmissions</div><div class='add'>+ * @key_index: Index on key table to use for encryption</div><div class='add'>+ * @antenna_mode: Which antenna to use (0 for auto)</div><div class='add'>+ * @flags: One of AR5K_TXDESC_* flags (desc.h)</div><div class='add'>+ * @rtscts_rate: HW idx for RTS/CTS transmission rate</div><div class='add'>+ * @rtscts_duration: What to put on duration field on the header of RTS/CTS</div><div class='add'>+ *</div><div class='add'>+ * Internal function to initialize a 4-Word TX control descriptor</div><div class='add'>+ * found on AR5212 and later MACs chips.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success or -EINVAL on false input</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,</div><div class='del'>-	struct ath5k_desc *desc, unsigned int pkt_len, unsigned int hdr_len,</div><div class='del'>-	int padsize,</div><div class='del'>-	enum ath5k_pkt_type type, unsigned int tx_power, unsigned int tx_rate0,</div><div class='del'>-	unsigned int tx_tries0, unsigned int key_index,</div><div class='del'>-	unsigned int antenna_mode, unsigned int flags,</div><div class='del'>-	unsigned int rtscts_rate,</div><div class='del'>-	unsigned int rtscts_duration)</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,</div><div class='add'>+			struct ath5k_desc *desc,</div><div class='add'>+			unsigned int pkt_len, unsigned int hdr_len,</div><div class='add'>+			int padsize,</div><div class='add'>+			enum ath5k_pkt_type type,</div><div class='add'>+			unsigned int tx_power,</div><div class='add'>+			unsigned int tx_rate0, unsigned int tx_tries0,</div><div class='add'>+			unsigned int key_index,</div><div class='add'>+			unsigned int antenna_mode,</div><div class='add'>+			unsigned int flags,</div><div class='add'>+			unsigned int rtscts_rate, unsigned int rtscts_duration)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_hw_4w_tx_ctl *tx_ctl;</div><div class='ctx'> 	unsigned int frame_len;</div><div class='hunk'>@@ -292,13 +356,29 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Initialize a 4-word multi rate retry tx control descriptor on 5212</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_setup_mrr_tx_desc() - Initialize an MRR tx control descriptor</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @desc: The &amp;struct ath5k_desc</div><div class='add'>+ * @tx_rate1: HW idx for rate used on transmission series 1</div><div class='add'>+ * @tx_tries1: Max number of retransmissions for transmission series 1</div><div class='add'>+ * @tx_rate2: HW idx for rate used on transmission series 2</div><div class='add'>+ * @tx_tries2: Max number of retransmissions for transmission series 2</div><div class='add'>+ * @tx_rate3: HW idx for rate used on transmission series 3</div><div class='add'>+ * @tx_tries3: Max number of retransmissions for transmission series 3</div><div class='add'>+ *</div><div class='add'>+ * Multi rate retry (MRR) tx control descriptors are available only on AR5212</div><div class='add'>+ * MACs, they are part of the normal 4-word tx control descriptor (see above)</div><div class='add'>+ * but we handle them through a separate function for better abstraction.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success or -EINVAL on invalid input</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='del'>-ath5k_hw_setup_mrr_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,</div><div class='del'>-	unsigned int tx_rate1, u_int tx_tries1, u_int tx_rate2,</div><div class='del'>-	u_int tx_tries2, unsigned int tx_rate3, u_int tx_tries3)</div><div class='add'>+ath5k_hw_setup_mrr_tx_desc(struct ath5k_hw *ah,</div><div class='add'>+			struct ath5k_desc *desc,</div><div class='add'>+			u_int tx_rate1, u_int tx_tries1,</div><div class='add'>+			u_int tx_rate2, u_int tx_tries2,</div><div class='add'>+			u_int tx_rate3, u_int tx_tries3)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_hw_4w_tx_ctl *tx_ctl;</div><div class='ctx'> </div><div class='hunk'>@@ -350,11 +430,16 @@ ath5k_hw_setup_mrr_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,</div><div class='ctx'> * TX Status descriptors *</div><div class='ctx'> \***********************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Process the tx status descriptor on 5210/5211</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_proc_2word_tx_status() - Process a tx status descriptor on 5210/1</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @desc: The &amp;struct ath5k_desc</div><div class='add'>+ * @ts: The &amp;struct ath5k_tx_status</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_proc_2word_tx_status(struct ath5k_hw *ah,</div><div class='del'>-		struct ath5k_desc *desc, struct ath5k_tx_status *ts)</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_proc_2word_tx_status(struct ath5k_hw *ah,</div><div class='add'>+				struct ath5k_desc *desc,</div><div class='add'>+				struct ath5k_tx_status *ts)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_hw_2w_tx_ctl *tx_ctl;</div><div class='ctx'> 	struct ath5k_hw_tx_status *tx_status;</div><div class='hunk'>@@ -399,11 +484,16 @@ static int ath5k_hw_proc_2word_tx_status(struct ath5k_hw *ah,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Process a tx status descriptor on 5212</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_proc_4word_tx_status() - Process a tx status descriptor on 5212</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @desc: The &amp;struct ath5k_desc</div><div class='add'>+ * @ts: The &amp;struct ath5k_tx_status</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,</div><div class='del'>-		struct ath5k_desc *desc, struct ath5k_tx_status *ts)</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,</div><div class='add'>+				struct ath5k_desc *desc,</div><div class='add'>+				struct ath5k_tx_status *ts)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_hw_4w_tx_ctl *tx_ctl;</div><div class='ctx'> 	struct ath5k_hw_tx_status *tx_status;</div><div class='hunk'>@@ -460,11 +550,17 @@ static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,</div><div class='ctx'> * RX Descriptors *</div><div class='ctx'> \****************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Initialize an rx control descriptor</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_setup_rx_desc() - Initialize an rx control descriptor</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @desc: The &amp;struct ath5k_desc</div><div class='add'>+ * @size: RX buffer length in bytes</div><div class='add'>+ * @flags: One of AR5K_RXDESC_* flags</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_setup_rx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,</div><div class='del'>-			   u32 size, unsigned int flags)</div><div class='add'>+int</div><div class='add'>+ath5k_hw_setup_rx_desc(struct ath5k_hw *ah,</div><div class='add'>+			struct ath5k_desc *desc,</div><div class='add'>+			u32 size, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_hw_rx_ctl *rx_ctl;</div><div class='ctx'> </div><div class='hunk'>@@ -491,11 +587,22 @@ int ath5k_hw_setup_rx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Process the rx status descriptor on 5210/5211</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_proc_5210_rx_status() - Process the rx status descriptor on 5210/1</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @desc: The &amp;struct ath5k_desc</div><div class='add'>+ * @rs: The &amp;struct ath5k_rx_status</div><div class='add'>+ *</div><div class='add'>+ * Internal function used to process an RX status descriptor</div><div class='add'>+ * on AR5210/5211 MAC.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success or -EINPROGRESS in case we haven't received the who;e</div><div class='add'>+ * frame yet.</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,</div><div class='del'>-		struct ath5k_desc *desc, struct ath5k_rx_status *rs)</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,</div><div class='add'>+				struct ath5k_desc *desc,</div><div class='add'>+				struct ath5k_rx_status *rs)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_hw_rx_status *rx_status;</div><div class='ctx'> </div><div class='hunk'>@@ -574,12 +681,22 @@ static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Process the rx status descriptor on 5212</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_proc_5212_rx_status() - Process the rx status descriptor on 5212</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @desc: The &amp;struct ath5k_desc</div><div class='add'>+ * @rs: The &amp;struct ath5k_rx_status</div><div class='add'>+ *</div><div class='add'>+ * Internal function used to process an RX status descriptor</div><div class='add'>+ * on AR5212 and later MAC.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success or -EINPROGRESS in case we haven't received the who;e</div><div class='add'>+ * frame yet.</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,</div><div class='del'>-					struct ath5k_desc *desc,</div><div class='del'>-					struct ath5k_rx_status *rs)</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,</div><div class='add'>+				struct ath5k_desc *desc,</div><div class='add'>+				struct ath5k_rx_status *rs)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_hw_rx_status *rx_status;</div><div class='ctx'> 	u32 rxstat0, rxstat1;</div><div class='hunk'>@@ -646,10 +763,16 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,</div><div class='ctx'> * Attach *</div><div class='ctx'> \********/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Init function pointers inside ath5k_hw struct</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_init_desc_functions() - Init function pointers inside ah</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ *</div><div class='add'>+ * Maps the internal descriptor functions to the function pointers on ah, used</div><div class='add'>+ * from above. This is used as an abstraction layer to handle the various chips</div><div class='add'>+ * the same way.</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_init_desc_functions(struct ath5k_hw *ah)</div><div class='add'>+int</div><div class='add'>+ath5k_hw_init_desc_functions(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	if (ah-&gt;ah_version == AR5K_AR5212) {</div><div class='ctx'> 		ah-&gt;ah_setup_tx_desc = ath5k_hw_setup_4word_tx_desc;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/desc.h b/drivers/net/wireless/ath/ath5k/desc.h<br/>index cfd529b548f3..8d6c01a49ea3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/desc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/desc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/desc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/desc.h</a></div><div class='hunk'>@@ -20,25 +20,30 @@</div><div class='ctx'>  * RX/TX descriptor structures</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Common hardware RX control descriptor</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_hw_rx_ctl - Common hardware RX control descriptor</div><div class='add'>+ * @rx_control_0: RX control word 0</div><div class='add'>+ * @rx_control_1: RX control word 1</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_hw_rx_ctl {</div><div class='del'>-	u32	rx_control_0; /* RX control word 0 */</div><div class='del'>-	u32	rx_control_1; /* RX control word 1 */</div><div class='add'>+	u32	rx_control_0;</div><div class='add'>+	u32	rx_control_1;</div><div class='ctx'> } __packed __aligned(4);</div><div class='ctx'> </div><div class='ctx'> /* RX control word 1 fields/flags */</div><div class='ctx'> #define AR5K_DESC_RX_CTL1_BUF_LEN		0x00000fff /* data buffer length */</div><div class='ctx'> #define AR5K_DESC_RX_CTL1_INTREQ		0x00002000 /* RX interrupt request */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Common hardware RX status descriptor</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_hw_rx_status - Common hardware RX status descriptor</div><div class='add'>+ * @rx_status_0: RX status word 0</div><div class='add'>+ * @rx_status_1: RX status word 1</div><div class='add'>+ *</div><div class='ctx'>  * 5210, 5211 and 5212 differ only in the fields and flags defined below</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_hw_rx_status {</div><div class='del'>-	u32	rx_status_0; /* RX status word 0 */</div><div class='del'>-	u32	rx_status_1; /* RX status word 1 */</div><div class='add'>+	u32	rx_status_0;</div><div class='add'>+	u32	rx_status_1;</div><div class='ctx'> } __packed __aligned(4);</div><div class='ctx'> </div><div class='ctx'> /* 5210/5211 */</div><div class='hunk'>@@ -98,17 +103,36 @@ struct ath5k_hw_rx_status {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum ath5k_phy_error_code - PHY Error codes</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_UNDERRUN: Transmit underrun, [5210] No error</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_TIMING: Timing error</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_PARITY: Illegal parity</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_RATE: Illegal rate</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_LENGTH: Illegal length</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_RADAR: Radar detect, [5210] 64 QAM rate</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_SERVICE: Illegal service</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_TOR: Transmit override receive</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_OFDM_TIMING: OFDM Timing error [5212+]</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_OFDM_SIGNAL_PARITY: OFDM Signal parity error [5212+]</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_OFDM_RATE_ILLEGAL: OFDM Illegal rate [5212+]</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_OFDM_LENGTH_ILLEGAL: OFDM Illegal length [5212+]</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_OFDM_POWER_DROP: OFDM Power drop [5212+]</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_OFDM_SERVICE: OFDM Service (?) [5212+]</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_OFDM_RESTART: OFDM Restart (?) [5212+]</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_CCK_TIMING: CCK Timing error [5212+]</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_CCK_HEADER_CRC: Header CRC error [5212+]</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_CCK_RATE_ILLEGAL: Illegal rate [5212+]</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_CCK_SERVICE: CCK Service (?) [5212+]</div><div class='add'>+ * @AR5K_RX_PHY_ERROR_CCK_RESTART: CCK Restart (?) [5212+]</div><div class='ctx'>  */</div><div class='ctx'> enum ath5k_phy_error_code {</div><div class='del'>-	AR5K_RX_PHY_ERROR_UNDERRUN		= 0,	/* Transmit underrun, [5210] No error */</div><div class='del'>-	AR5K_RX_PHY_ERROR_TIMING		= 1,	/* Timing error */</div><div class='del'>-	AR5K_RX_PHY_ERROR_PARITY		= 2,	/* Illegal parity */</div><div class='del'>-	AR5K_RX_PHY_ERROR_RATE			= 3,	/* Illegal rate */</div><div class='del'>-	AR5K_RX_PHY_ERROR_LENGTH		= 4,	/* Illegal length */</div><div class='del'>-	AR5K_RX_PHY_ERROR_RADAR			= 5,	/* Radar detect, [5210] 64 QAM rate */</div><div class='del'>-	AR5K_RX_PHY_ERROR_SERVICE		= 6,	/* Illegal service */</div><div class='del'>-	AR5K_RX_PHY_ERROR_TOR			= 7,	/* Transmit override receive */</div><div class='del'>-	/* these are specific to the 5212 */</div><div class='add'>+	AR5K_RX_PHY_ERROR_UNDERRUN		= 0,</div><div class='add'>+	AR5K_RX_PHY_ERROR_TIMING		= 1,</div><div class='add'>+	AR5K_RX_PHY_ERROR_PARITY		= 2,</div><div class='add'>+	AR5K_RX_PHY_ERROR_RATE			= 3,</div><div class='add'>+	AR5K_RX_PHY_ERROR_LENGTH		= 4,</div><div class='add'>+	AR5K_RX_PHY_ERROR_RADAR			= 5,</div><div class='add'>+	AR5K_RX_PHY_ERROR_SERVICE		= 6,</div><div class='add'>+	AR5K_RX_PHY_ERROR_TOR			= 7,</div><div class='ctx'> 	AR5K_RX_PHY_ERROR_OFDM_TIMING		= 17,</div><div class='ctx'> 	AR5K_RX_PHY_ERROR_OFDM_SIGNAL_PARITY	= 18,</div><div class='ctx'> 	AR5K_RX_PHY_ERROR_OFDM_RATE_ILLEGAL	= 19,</div><div class='hunk'>@@ -123,12 +147,14 @@ enum ath5k_phy_error_code {</div><div class='ctx'> 	AR5K_RX_PHY_ERROR_CCK_RESTART		= 31,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * 5210/5211 hardware 2-word TX control descriptor</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_hw_2w_tx_ctl  - 5210/5211 hardware 2-word TX control descriptor</div><div class='add'>+ * @tx_control_0: TX control word 0</div><div class='add'>+ * @tx_control_1: TX control word 1</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_hw_2w_tx_ctl {</div><div class='del'>-	u32	tx_control_0; /* TX control word 0 */</div><div class='del'>-	u32	tx_control_1; /* TX control word 1 */</div><div class='add'>+	u32	tx_control_0;</div><div class='add'>+	u32	tx_control_1;</div><div class='ctx'> } __packed __aligned(4);</div><div class='ctx'> </div><div class='ctx'> /* TX control word 0 fields/flags */</div><div class='hunk'>@@ -177,14 +203,18 @@ struct ath5k_hw_2w_tx_ctl {</div><div class='ctx'> #define AR5K_AR5210_TX_DESC_FRAME_TYPE_PIFS	4</div><div class='ctx'> #define AR5K_AR5211_TX_DESC_FRAME_TYPE_PRESP	4</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * 5212 hardware 4-word TX control descriptor</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_hw_4w_tx_ctl - 5212 hardware 4-word TX control descriptor</div><div class='add'>+ * @tx_control_0: TX control word 0</div><div class='add'>+ * @tx_control_1: TX control word 1</div><div class='add'>+ * @tx_control_2: TX control word 2</div><div class='add'>+ * @tx_control_3: TX control word 3</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_hw_4w_tx_ctl {</div><div class='del'>-	u32	tx_control_0; /* TX control word 0 */</div><div class='del'>-	u32	tx_control_1; /* TX control word 1 */</div><div class='del'>-	u32	tx_control_2; /* TX control word 2 */</div><div class='del'>-	u32	tx_control_3; /* TX control word 3 */</div><div class='add'>+	u32	tx_control_0;</div><div class='add'>+	u32	tx_control_1;</div><div class='add'>+	u32	tx_control_2;</div><div class='add'>+	u32	tx_control_3;</div><div class='ctx'> } __packed __aligned(4);</div><div class='ctx'> </div><div class='ctx'> /* TX control word 0 fields/flags */</div><div class='hunk'>@@ -238,12 +268,14 @@ struct ath5k_hw_4w_tx_ctl {</div><div class='ctx'> #define AR5K_4W_TX_DESC_CTL3_RTS_CTS_RATE	0x01f00000 /* RTS or CTS rate */</div><div class='ctx'> #define AR5K_4W_TX_DESC_CTL3_RTS_CTS_RATE_S	20</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Common TX status descriptor</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_hw_tx_status - Common TX status descriptor</div><div class='add'>+ * @tx_status_0: TX status word 0</div><div class='add'>+ * @tx_status_1: TX status word 1</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_hw_tx_status {</div><div class='del'>-	u32	tx_status_0; /* TX status word 0 */</div><div class='del'>-	u32	tx_status_1; /* TX status word 1 */</div><div class='add'>+	u32	tx_status_0;</div><div class='add'>+	u32	tx_status_1;</div><div class='ctx'> } __packed __aligned(4);</div><div class='ctx'> </div><div class='ctx'> /* TX status word 0 fields/flags */</div><div class='hunk'>@@ -276,37 +308,47 @@ struct ath5k_hw_tx_status {</div><div class='ctx'> #define AR5K_DESC_TX_STATUS1_COMP_SUCCESS_5212	0x00800000 /* [5212] compression status */</div><div class='ctx'> #define AR5K_DESC_TX_STATUS1_XMIT_ANTENNA_5212	0x01000000 /* [5212] transmit antenna */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * 5210/5211 hardware TX descriptor</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_hw_5210_tx_desc - 5210/5211 hardware TX descriptor</div><div class='add'>+ * @tx_ctl: The &amp;struct ath5k_hw_2w_tx_ctl</div><div class='add'>+ * @tx_stat: The &amp;struct ath5k_hw_tx_status</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_hw_5210_tx_desc {</div><div class='ctx'> 	struct ath5k_hw_2w_tx_ctl	tx_ctl;</div><div class='ctx'> 	struct ath5k_hw_tx_status	tx_stat;</div><div class='ctx'> } __packed __aligned(4);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * 5212 hardware TX descriptor</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_hw_5212_tx_desc - 5212 hardware TX descriptor</div><div class='add'>+ * @tx_ctl: The &amp;struct ath5k_hw_4w_tx_ctl</div><div class='add'>+ * @tx_stat: The &amp;struct ath5k_hw_tx_status</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_hw_5212_tx_desc {</div><div class='ctx'> 	struct ath5k_hw_4w_tx_ctl	tx_ctl;</div><div class='ctx'> 	struct ath5k_hw_tx_status	tx_stat;</div><div class='ctx'> } __packed __aligned(4);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Common hardware RX descriptor</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_hw_all_rx_desc - Common hardware RX descriptor</div><div class='add'>+ * @rx_ctl: The &amp;struct ath5k_hw_rx_ctl</div><div class='add'>+ * @rx_stat: The &amp;struct ath5k_hw_rx_status</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_hw_all_rx_desc {</div><div class='ctx'> 	struct ath5k_hw_rx_ctl		rx_ctl;</div><div class='ctx'> 	struct ath5k_hw_rx_status	rx_stat;</div><div class='ctx'> } __packed __aligned(4);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Atheros hardware DMA descriptor</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_desc - Atheros hardware DMA descriptor</div><div class='add'>+ * @ds_link: Physical address of the next descriptor</div><div class='add'>+ * @ds_data: Physical address of data buffer (skb)</div><div class='add'>+ * @ud: Union containing hw_5xxx_tx_desc structs and hw_all_rx_desc</div><div class='add'>+ *</div><div class='ctx'>  * This is read and written to by the hardware</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_desc {</div><div class='del'>-	u32	ds_link;	/* physical address of the next descriptor */</div><div class='del'>-	u32	ds_data;	/* physical address of data buffer (skb) */</div><div class='add'>+	u32	ds_link;</div><div class='add'>+	u32	ds_data;</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='ctx'> 		struct ath5k_hw_5210_tx_desc	ds_tx5210;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/dma.c b/drivers/net/wireless/ath/ath5k/dma.c<br/>index 2481f9c7f4b6..5cc9aa814697 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/dma.c</a></div><div class='hunk'>@@ -20,16 +20,13 @@</div><div class='ctx'> * DMA and interrupt masking functions *</div><div class='ctx'> \*************************************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * dma.c - DMA and interrupt masking functions</div><div class='add'>+/**</div><div class='add'>+ * DOC: DMA and interrupt masking functions</div><div class='ctx'>  *</div><div class='ctx'>  * Here we setup descriptor pointers (rxdp/txdp) start/stop dma engine and</div><div class='ctx'>  * handle queue setup for 5210 chipset (rest are handled on qcu.c).</div><div class='ctx'>  * Also we setup interrupt mask register (IMR) and read the various interrupt</div><div class='ctx'>  * status registers (ISR).</div><div class='del'>- *</div><div class='del'>- * TODO: Handle SISR on 5211+ and introduce a function to return the queue</div><div class='del'>- * number that resulted the interrupt.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "ath5k.h"</div><div class='hunk'>@@ -42,22 +39,22 @@</div><div class='ctx'> \*********/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_start_rx_dma - Start DMA receive</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_start_rx_dma() - Start DMA receive</div><div class='ctx'>  * @ah:	The &amp;struct ath5k_hw</div><div class='ctx'>  */</div><div class='del'>-void ath5k_hw_start_rx_dma(struct ath5k_hw *ah)</div><div class='add'>+void</div><div class='add'>+ath5k_hw_start_rx_dma(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	ath5k_hw_reg_write(ah, AR5K_CR_RXE, AR5K_CR);</div><div class='ctx'> 	ath5k_hw_reg_read(ah, AR5K_CR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_stop_rx_dma - Stop DMA receive</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_stop_rx_dma() - Stop DMA receive</div><div class='ctx'>  * @ah:	The &amp;struct ath5k_hw</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_stop_rx_dma(struct ath5k_hw *ah)</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_stop_rx_dma(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='hunk'>@@ -79,24 +76,24 @@ static int ath5k_hw_stop_rx_dma(struct ath5k_hw *ah)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_get_rxdp - Get RX Descriptor's address</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_get_rxdp() - Get RX Descriptor's address</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  */</div><div class='del'>-u32 ath5k_hw_get_rxdp(struct ath5k_hw *ah)</div><div class='add'>+u32</div><div class='add'>+ath5k_hw_get_rxdp(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	return ath5k_hw_reg_read(ah, AR5K_RXDP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_set_rxdp - Set RX Descriptor's address</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_set_rxdp() - Set RX Descriptor's address</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @phys_addr: RX descriptor address</div><div class='ctx'>  *</div><div class='ctx'>  * Returns -EIO if rx is active</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_set_rxdp(struct ath5k_hw *ah, u32 phys_addr)</div><div class='add'>+int</div><div class='add'>+ath5k_hw_set_rxdp(struct ath5k_hw *ah, u32 phys_addr)</div><div class='ctx'> {</div><div class='ctx'> 	if (ath5k_hw_reg_read(ah, AR5K_CR) &amp; AR5K_CR_RXE) {</div><div class='ctx'> 		ATH5K_DBG(ah, ATH5K_DEBUG_DMA,</div><div class='hunk'>@@ -114,8 +111,7 @@ int ath5k_hw_set_rxdp(struct ath5k_hw *ah, u32 phys_addr)</div><div class='ctx'> \**********/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_start_tx_dma - Start DMA transmit for a specific queue</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_start_tx_dma() - Start DMA transmit for a specific queue</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @queue: The hw queue number</div><div class='ctx'>  *</div><div class='hunk'>@@ -128,7 +124,8 @@ int ath5k_hw_set_rxdp(struct ath5k_hw *ah, u32 phys_addr)</div><div class='ctx'>  * NOTE: Must be called after setting up tx control descriptor for that</div><div class='ctx'>  * queue (see below).</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_start_tx_dma(struct ath5k_hw *ah, unsigned int queue)</div><div class='add'>+int</div><div class='add'>+ath5k_hw_start_tx_dma(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tx_queue;</div><div class='ctx'> </div><div class='hunk'>@@ -177,17 +174,16 @@ int ath5k_hw_start_tx_dma(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_stop_tx_dma - Stop DMA transmit on a specific queue</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_stop_tx_dma() - Stop DMA transmit on a specific queue</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @queue: The hw queue number</div><div class='ctx'>  *</div><div class='ctx'>  * Stop DMA transmit on a specific hw queue and drain queue so we don't</div><div class='ctx'>  * have any pending frames. Returns -EBUSY if we still have pending frames,</div><div class='ctx'>  * -EINVAL if queue number is out of range or inactive.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue)</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i = 40;</div><div class='ctx'> 	u32 tx_queue, pending;</div><div class='hunk'>@@ -320,14 +316,14 @@ static int ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_stop_beacon_queue - Stop beacon queue</div><div class='del'>- *</div><div class='del'>- * @ah The &amp;struct ath5k_hw</div><div class='del'>- * @queue The queue number</div><div class='add'>+ * ath5k_hw_stop_beacon_queue() - Stop beacon queue</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @queue: The queue number</div><div class='ctx'>  *</div><div class='ctx'>  * Returns -EIO if queue didn't stop</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_stop_beacon_queue(struct ath5k_hw *ah, unsigned int queue)</div><div class='add'>+int</div><div class='add'>+ath5k_hw_stop_beacon_queue(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	ret = ath5k_hw_stop_tx_dma(ah, queue);</div><div class='hunk'>@@ -340,8 +336,7 @@ int ath5k_hw_stop_beacon_queue(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_get_txdp - Get TX Descriptor's address for a specific queue</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_get_txdp() - Get TX Descriptor's address for a specific queue</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @queue: The hw queue number</div><div class='ctx'>  *</div><div class='hunk'>@@ -352,7 +347,8 @@ int ath5k_hw_stop_beacon_queue(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'>  *</div><div class='ctx'>  * XXX: Is TXDP read and clear ?</div><div class='ctx'>  */</div><div class='del'>-u32 ath5k_hw_get_txdp(struct ath5k_hw *ah, unsigned int queue)</div><div class='add'>+u32</div><div class='add'>+ath5k_hw_get_txdp(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> {</div><div class='ctx'> 	u16 tx_reg;</div><div class='ctx'> </div><div class='hunk'>@@ -382,10 +378,10 @@ u32 ath5k_hw_get_txdp(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_set_txdp - Set TX Descriptor's address for a specific queue</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_set_txdp() - Set TX Descriptor's address for a specific queue</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @queue: The hw queue number</div><div class='add'>+ * @phys_addr: The physical address</div><div class='ctx'>  *</div><div class='ctx'>  * Set TX descriptor's address for a specific queue. For 5210 we ignore</div><div class='ctx'>  * the queue number and we use tx queue type since we only have 2 queues</div><div class='hunk'>@@ -394,7 +390,8 @@ u32 ath5k_hw_get_txdp(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'>  * Returns -EINVAL if queue type is invalid for 5210 and -EIO if queue is still</div><div class='ctx'>  * active.</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_set_txdp(struct ath5k_hw *ah, unsigned int queue, u32 phys_addr)</div><div class='add'>+int</div><div class='add'>+ath5k_hw_set_txdp(struct ath5k_hw *ah, unsigned int queue, u32 phys_addr)</div><div class='ctx'> {</div><div class='ctx'> 	u16 tx_reg;</div><div class='ctx'> </div><div class='hunk'>@@ -435,8 +432,7 @@ int ath5k_hw_set_txdp(struct ath5k_hw *ah, unsigned int queue, u32 phys_addr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_update_tx_triglevel - Update tx trigger level</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_update_tx_triglevel() - Update tx trigger level</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @increase: Flag to force increase of trigger level</div><div class='ctx'>  *</div><div class='hunk'>@@ -444,15 +440,15 @@ int ath5k_hw_set_txdp(struct ath5k_hw *ah, unsigned int queue, u32 phys_addr)</div><div class='ctx'>  * buffer (aka FIFO threshold) that is used to indicate when PCU flushes</div><div class='ctx'>  * the buffer and transmits its data. Lowering this results sending small</div><div class='ctx'>  * frames more quickly but can lead to tx underruns, raising it a lot can</div><div class='del'>- * result other problems (i think bmiss is related). Right now we start with</div><div class='del'>- * the lowest possible (64Bytes) and if we get tx underrun we increase it using</div><div class='del'>- * the increase flag. Returns -EIO if we have reached maximum/minimum.</div><div class='add'>+ * result other problems. Right now we start with the lowest possible</div><div class='add'>+ * (64Bytes) and if we get tx underrun we increase it using the increase</div><div class='add'>+ * flag. Returns -EIO if we have reached maximum/minimum.</div><div class='ctx'>  *</div><div class='ctx'>  * XXX: Link this with tx DMA size ?</div><div class='del'>- * XXX: Use it to save interrupts ?</div><div class='del'>- * TODO: Needs testing, i think it's related to bmiss...</div><div class='add'>+ * XXX2: Use it to save interrupts ?</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_update_tx_triglevel(struct ath5k_hw *ah, bool increase)</div><div class='add'>+int</div><div class='add'>+ath5k_hw_update_tx_triglevel(struct ath5k_hw *ah, bool increase)</div><div class='ctx'> {</div><div class='ctx'> 	u32 trigger_level, imr;</div><div class='ctx'> 	int ret = -EIO;</div><div class='hunk'>@@ -498,21 +494,20 @@ done:</div><div class='ctx'> \*******************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_is_intr_pending - Check if we have pending interrupts</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_is_intr_pending() - Check if we have pending interrupts</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='ctx'>  * Check if we have pending interrupts to process. Returns 1 if we</div><div class='ctx'>  * have pending interrupts and 0 if we haven't.</div><div class='ctx'>  */</div><div class='del'>-bool ath5k_hw_is_intr_pending(struct ath5k_hw *ah)</div><div class='add'>+bool</div><div class='add'>+ath5k_hw_is_intr_pending(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	return ath5k_hw_reg_read(ah, AR5K_INTPEND) == 1 ? 1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_get_isr - Get interrupt status</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_get_isr() - Get interrupt status</div><div class='ctx'>  * @ah: The @struct ath5k_hw</div><div class='ctx'>  * @interrupt_mask: Driver's interrupt mask used to filter out</div><div class='ctx'>  * interrupts in sw.</div><div class='hunk'>@@ -523,62 +518,162 @@ bool ath5k_hw_is_intr_pending(struct ath5k_hw *ah)</div><div class='ctx'>  * being mapped on some standard non hw-specific positions</div><div class='ctx'>  * (check out &amp;ath5k_int).</div><div class='ctx'>  *</div><div class='del'>- * NOTE: We use read-and-clear register, so after this function is called ISR</div><div class='del'>- * is zeroed.</div><div class='add'>+ * NOTE: We do write-to-clear, so the active PISR/SISR bits at the time this</div><div class='add'>+ * function gets called are cleared on return.</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask)</div><div class='add'>+int</div><div class='add'>+ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask)</div><div class='ctx'> {</div><div class='del'>-	u32 data;</div><div class='add'>+	u32 data = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Read interrupt status from the Interrupt Status register</div><div class='del'>-	 * on 5210</div><div class='add'>+	 * Read interrupt status from Primary Interrupt</div><div class='add'>+	 * Register.</div><div class='add'>+	 *</div><div class='add'>+	 * Note: PISR/SISR Not available on 5210</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		data = ath5k_hw_reg_read(ah, AR5K_ISR);</div><div class='del'>-		if (unlikely(data == AR5K_INT_NOCARD)) {</div><div class='del'>-			*interrupt_mask = data;</div><div class='add'>+		u32 isr = 0;</div><div class='add'>+		isr = ath5k_hw_reg_read(ah, AR5K_ISR);</div><div class='add'>+		if (unlikely(isr == AR5K_INT_NOCARD)) {</div><div class='add'>+			*interrupt_mask = isr;</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='del'>-		 * Read interrupt status from Interrupt</div><div class='del'>-		 * Status Register shadow copy (Read And Clear)</div><div class='del'>-		 *</div><div class='del'>-		 * Note: PISR/SISR Not available on 5210</div><div class='add'>+		 * Filter out the non-common bits from the interrupt</div><div class='add'>+		 * status.</div><div class='ctx'> 		 */</div><div class='del'>-		data = ath5k_hw_reg_read(ah, AR5K_RAC_PISR);</div><div class='del'>-		if (unlikely(data == AR5K_INT_NOCARD)) {</div><div class='del'>-			*interrupt_mask = data;</div><div class='add'>+		*interrupt_mask = (isr &amp; AR5K_INT_COMMON) &amp; ah-&gt;ah_imr;</div><div class='add'>+</div><div class='add'>+		/* Hanlde INT_FATAL */</div><div class='add'>+		if (unlikely(isr &amp; (AR5K_ISR_SSERR | AR5K_ISR_MCABT</div><div class='add'>+						| AR5K_ISR_DPERR)))</div><div class='add'>+			*interrupt_mask |= AR5K_INT_FATAL;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * XXX: BMISS interrupts may occur after association.</div><div class='add'>+		 * I found this on 5210 code but it needs testing. If this is</div><div class='add'>+		 * true we should disable them before assoc and re-enable them</div><div class='add'>+		 * after a successful assoc + some jiffies.</div><div class='add'>+			interrupt_mask &amp;= ~AR5K_INT_BMISS;</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		data = isr;</div><div class='add'>+	} else {</div><div class='add'>+		u32 pisr = 0;</div><div class='add'>+		u32 pisr_clear = 0;</div><div class='add'>+		u32 sisr0 = 0;</div><div class='add'>+		u32 sisr1 = 0;</div><div class='add'>+		u32 sisr2 = 0;</div><div class='add'>+		u32 sisr3 = 0;</div><div class='add'>+		u32 sisr4 = 0;</div><div class='add'>+</div><div class='add'>+		/* Read PISR and SISRs... */</div><div class='add'>+		pisr = ath5k_hw_reg_read(ah, AR5K_PISR);</div><div class='add'>+		if (unlikely(pisr == AR5K_INT_NOCARD)) {</div><div class='add'>+			*interrupt_mask = pisr;</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Get abstract interrupt mask (driver-compatible)</div><div class='del'>-	 */</div><div class='del'>-	*interrupt_mask = (data &amp; AR5K_INT_COMMON) &amp; ah-&gt;ah_imr;</div><div class='add'>+		sisr0 = ath5k_hw_reg_read(ah, AR5K_SISR0);</div><div class='add'>+		sisr1 = ath5k_hw_reg_read(ah, AR5K_SISR1);</div><div class='add'>+		sisr2 = ath5k_hw_reg_read(ah, AR5K_SISR2);</div><div class='add'>+		sisr3 = ath5k_hw_reg_read(ah, AR5K_SISR3);</div><div class='add'>+		sisr4 = ath5k_hw_reg_read(ah, AR5K_SISR4);</div><div class='ctx'> </div><div class='del'>-	if (ah-&gt;ah_version != AR5K_AR5210) {</div><div class='del'>-		u32 sisr2 = ath5k_hw_reg_read(ah, AR5K_RAC_SISR2);</div><div class='add'>+		/*</div><div class='add'>+		 * PISR holds the logical OR of interrupt bits</div><div class='add'>+		 * from SISR registers:</div><div class='add'>+		 *</div><div class='add'>+		 * TXOK and TXDESC  -&gt; Logical OR of TXOK and TXDESC</div><div class='add'>+		 *			per-queue bits on SISR0</div><div class='add'>+		 *</div><div class='add'>+		 * TXERR and TXEOL -&gt; Logical OR of TXERR and TXEOL</div><div class='add'>+		 *			per-queue bits on SISR1</div><div class='add'>+		 *</div><div class='add'>+		 * TXURN -&gt; Logical OR of TXURN per-queue bits on SISR2</div><div class='add'>+		 *</div><div class='add'>+		 * HIUERR -&gt; Logical OR of MCABT, SSERR and DPER bits on SISR2</div><div class='add'>+		 *</div><div class='add'>+		 * BCNMISC -&gt; Logical OR of TIM, CAB_END, DTIM_SYNC</div><div class='add'>+		 *		BCN_TIMEOUT, CAB_TIMEOUT and DTIM</div><div class='add'>+		 *		(and TSFOOR ?) bits on SISR2</div><div class='add'>+		 *</div><div class='add'>+		 * QCBRORN and QCBRURN -&gt; Logical OR of QCBRORN and</div><div class='add'>+		 *			QCBRURN per-queue bits on SISR3</div><div class='add'>+		 * QTRIG -&gt; Logical OR of QTRIG per-queue bits on SISR4</div><div class='add'>+		 *</div><div class='add'>+		 * If we clean these bits on PISR we 'll also clear all</div><div class='add'>+		 * related bits from SISRs, e.g. if we write the TXOK bit on</div><div class='add'>+		 * PISR we 'll clean all TXOK bits from SISR0 so if a new TXOK</div><div class='add'>+		 * interrupt got fired for another queue while we were reading</div><div class='add'>+		 * the interrupt registers and we write back the TXOK bit on</div><div class='add'>+		 * PISR we 'll lose it. So make sure that we don't write back</div><div class='add'>+		 * on PISR any bits that come from SISRs. Clearing them from</div><div class='add'>+		 * SISRs will also clear PISR so no need to worry here.</div><div class='add'>+		 */</div><div class='ctx'> </div><div class='del'>-		/*HIU = Host Interface Unit (PCI etc)*/</div><div class='del'>-		if (unlikely(data &amp; (AR5K_ISR_HIUERR)))</div><div class='del'>-			*interrupt_mask |= AR5K_INT_FATAL;</div><div class='add'>+		pisr_clear = pisr &amp; ~AR5K_ISR_BITS_FROM_SISRS;</div><div class='ctx'> </div><div class='del'>-		/*Beacon Not Ready*/</div><div class='del'>-		if (unlikely(data &amp; (AR5K_ISR_BNR)))</div><div class='del'>-			*interrupt_mask |= AR5K_INT_BNR;</div><div class='add'>+		/*</div><div class='add'>+		 * Write to clear them...</div><div class='add'>+		 * Note: This means that each bit we write back</div><div class='add'>+		 * to the registers will get cleared, leaving the</div><div class='add'>+		 * rest unaffected. So this won't affect new interrupts</div><div class='add'>+		 * we didn't catch while reading/processing, we 'll get</div><div class='add'>+		 * them next time get_isr gets called.</div><div class='add'>+		 */</div><div class='add'>+		ath5k_hw_reg_write(ah, sisr0, AR5K_SISR0);</div><div class='add'>+		ath5k_hw_reg_write(ah, sisr1, AR5K_SISR1);</div><div class='add'>+		ath5k_hw_reg_write(ah, sisr2, AR5K_SISR2);</div><div class='add'>+		ath5k_hw_reg_write(ah, sisr3, AR5K_SISR3);</div><div class='add'>+		ath5k_hw_reg_write(ah, sisr4, AR5K_SISR4);</div><div class='add'>+		ath5k_hw_reg_write(ah, pisr_clear, AR5K_PISR);</div><div class='add'>+		/* Flush previous write */</div><div class='add'>+		ath5k_hw_reg_read(ah, AR5K_PISR);</div><div class='ctx'> </div><div class='del'>-		if (unlikely(sisr2 &amp; (AR5K_SISR2_SSERR |</div><div class='del'>-					AR5K_SISR2_DPERR |</div><div class='del'>-					AR5K_SISR2_MCABT)))</div><div class='del'>-			*interrupt_mask |= AR5K_INT_FATAL;</div><div class='add'>+		/*</div><div class='add'>+		 * Filter out the non-common bits from the interrupt</div><div class='add'>+		 * status.</div><div class='add'>+		 */</div><div class='add'>+		*interrupt_mask = (pisr &amp; AR5K_INT_COMMON) &amp; ah-&gt;ah_imr;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		/* We treat TXOK,TXDESC, TXERR and TXEOL</div><div class='add'>+		 * the same way (schedule the tx tasklet)</div><div class='add'>+		 * so we track them all together per queue */</div><div class='add'>+		if (pisr &amp; AR5K_ISR_TXOK)</div><div class='add'>+			ah-&gt;ah_txq_isr_txok_all |= AR5K_REG_MS(sisr0,</div><div class='add'>+						AR5K_SISR0_QCU_TXOK);</div><div class='ctx'> </div><div class='del'>-		if (data &amp; AR5K_ISR_TIM)</div><div class='add'>+		if (pisr &amp; AR5K_ISR_TXDESC)</div><div class='add'>+			ah-&gt;ah_txq_isr_txok_all |= AR5K_REG_MS(sisr0,</div><div class='add'>+						AR5K_SISR0_QCU_TXDESC);</div><div class='add'>+</div><div class='add'>+		if (pisr &amp; AR5K_ISR_TXERR)</div><div class='add'>+			ah-&gt;ah_txq_isr_txok_all |= AR5K_REG_MS(sisr1,</div><div class='add'>+						AR5K_SISR1_QCU_TXERR);</div><div class='add'>+</div><div class='add'>+		if (pisr &amp; AR5K_ISR_TXEOL)</div><div class='add'>+			ah-&gt;ah_txq_isr_txok_all |= AR5K_REG_MS(sisr1,</div><div class='add'>+						AR5K_SISR1_QCU_TXEOL);</div><div class='add'>+</div><div class='add'>+		/* Currently this is not much usefull since we treat</div><div class='add'>+		 * all queues the same way if we get a TXURN (update</div><div class='add'>+		 * tx trigger level) but we might need it later on*/</div><div class='add'>+		if (pisr &amp; AR5K_ISR_TXURN)</div><div class='add'>+			ah-&gt;ah_txq_isr_txurn |= AR5K_REG_MS(sisr2,</div><div class='add'>+						AR5K_SISR2_QCU_TXURN);</div><div class='add'>+</div><div class='add'>+		/* Misc Beacon related interrupts */</div><div class='add'>+</div><div class='add'>+		/* For AR5211 */</div><div class='add'>+		if (pisr &amp; AR5K_ISR_TIM)</div><div class='ctx'> 			*interrupt_mask |= AR5K_INT_TIM;</div><div class='ctx'> </div><div class='del'>-		if (data &amp; AR5K_ISR_BCNMISC) {</div><div class='add'>+		/* For AR5212+ */</div><div class='add'>+		if (pisr &amp; AR5K_ISR_BCNMISC) {</div><div class='ctx'> 			if (sisr2 &amp; AR5K_SISR2_TIM)</div><div class='ctx'> 				*interrupt_mask |= AR5K_INT_TIM;</div><div class='ctx'> 			if (sisr2 &amp; AR5K_SISR2_DTIM)</div><div class='hunk'>@@ -591,63 +686,39 @@ int ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask)</div><div class='ctx'> 				*interrupt_mask |= AR5K_INT_CAB_TIMEOUT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (data &amp; AR5K_ISR_RXDOPPLER)</div><div class='del'>-			*interrupt_mask |= AR5K_INT_RX_DOPPLER;</div><div class='del'>-		if (data &amp; AR5K_ISR_QCBRORN) {</div><div class='add'>+		/* Below interrupts are unlikely to happen */</div><div class='add'>+</div><div class='add'>+		/* HIU = Host Interface Unit (PCI etc)</div><div class='add'>+		 * Can be one of MCABT, SSERR, DPERR from SISR2 */</div><div class='add'>+		if (unlikely(pisr &amp; (AR5K_ISR_HIUERR)))</div><div class='add'>+			*interrupt_mask |= AR5K_INT_FATAL;</div><div class='add'>+</div><div class='add'>+		/*Beacon Not Ready*/</div><div class='add'>+		if (unlikely(pisr &amp; (AR5K_ISR_BNR)))</div><div class='add'>+			*interrupt_mask |= AR5K_INT_BNR;</div><div class='add'>+</div><div class='add'>+		/* A queue got CBR overrun */</div><div class='add'>+		if (unlikely(pisr &amp; (AR5K_ISR_QCBRORN))) {</div><div class='ctx'> 			*interrupt_mask |= AR5K_INT_QCBRORN;</div><div class='del'>-			ah-&gt;ah_txq_isr |= AR5K_REG_MS(</div><div class='del'>-					ath5k_hw_reg_read(ah, AR5K_RAC_SISR3),</div><div class='del'>-					AR5K_SISR3_QCBRORN);</div><div class='add'>+			ah-&gt;ah_txq_isr_qcborn |= AR5K_REG_MS(sisr3,</div><div class='add'>+						AR5K_SISR3_QCBRORN);</div><div class='ctx'> 		}</div><div class='del'>-		if (data &amp; AR5K_ISR_QCBRURN) {</div><div class='add'>+</div><div class='add'>+		/* A queue got CBR underrun */</div><div class='add'>+		if (unlikely(pisr &amp; (AR5K_ISR_QCBRURN))) {</div><div class='ctx'> 			*interrupt_mask |= AR5K_INT_QCBRURN;</div><div class='del'>-			ah-&gt;ah_txq_isr |= AR5K_REG_MS(</div><div class='del'>-					ath5k_hw_reg_read(ah, AR5K_RAC_SISR3),</div><div class='del'>-					AR5K_SISR3_QCBRURN);</div><div class='add'>+			ah-&gt;ah_txq_isr_qcburn |= AR5K_REG_MS(sisr3,</div><div class='add'>+						AR5K_SISR3_QCBRURN);</div><div class='ctx'> 		}</div><div class='del'>-		if (data &amp; AR5K_ISR_QTRIG) {</div><div class='add'>+</div><div class='add'>+		/* A queue got triggered */</div><div class='add'>+		if (unlikely(pisr &amp; (AR5K_ISR_QTRIG))) {</div><div class='ctx'> 			*interrupt_mask |= AR5K_INT_QTRIG;</div><div class='del'>-			ah-&gt;ah_txq_isr |= AR5K_REG_MS(</div><div class='del'>-					ath5k_hw_reg_read(ah, AR5K_RAC_SISR4),</div><div class='del'>-					AR5K_SISR4_QTRIG);</div><div class='add'>+			ah-&gt;ah_txq_isr_qtrig |= AR5K_REG_MS(sisr4,</div><div class='add'>+						AR5K_SISR4_QTRIG);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (data &amp; AR5K_ISR_TXOK)</div><div class='del'>-			ah-&gt;ah_txq_isr |= AR5K_REG_MS(</div><div class='del'>-					ath5k_hw_reg_read(ah, AR5K_RAC_SISR0),</div><div class='del'>-					AR5K_SISR0_QCU_TXOK);</div><div class='del'>-</div><div class='del'>-		if (data &amp; AR5K_ISR_TXDESC)</div><div class='del'>-			ah-&gt;ah_txq_isr |= AR5K_REG_MS(</div><div class='del'>-					ath5k_hw_reg_read(ah, AR5K_RAC_SISR0),</div><div class='del'>-					AR5K_SISR0_QCU_TXDESC);</div><div class='del'>-</div><div class='del'>-		if (data &amp; AR5K_ISR_TXERR)</div><div class='del'>-			ah-&gt;ah_txq_isr |= AR5K_REG_MS(</div><div class='del'>-					ath5k_hw_reg_read(ah, AR5K_RAC_SISR1),</div><div class='del'>-					AR5K_SISR1_QCU_TXERR);</div><div class='del'>-</div><div class='del'>-		if (data &amp; AR5K_ISR_TXEOL)</div><div class='del'>-			ah-&gt;ah_txq_isr |= AR5K_REG_MS(</div><div class='del'>-					ath5k_hw_reg_read(ah, AR5K_RAC_SISR1),</div><div class='del'>-					AR5K_SISR1_QCU_TXEOL);</div><div class='del'>-</div><div class='del'>-		if (data &amp; AR5K_ISR_TXURN)</div><div class='del'>-			ah-&gt;ah_txq_isr |= AR5K_REG_MS(</div><div class='del'>-					ath5k_hw_reg_read(ah, AR5K_RAC_SISR2),</div><div class='del'>-					AR5K_SISR2_QCU_TXURN);</div><div class='del'>-	} else {</div><div class='del'>-		if (unlikely(data &amp; (AR5K_ISR_SSERR | AR5K_ISR_MCABT</div><div class='del'>-				| AR5K_ISR_HIUERR | AR5K_ISR_DPERR)))</div><div class='del'>-			*interrupt_mask |= AR5K_INT_FATAL;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * XXX: BMISS interrupts may occur after association.</div><div class='del'>-		 * I found this on 5210 code but it needs testing. If this is</div><div class='del'>-		 * true we should disable them before assoc and re-enable them</div><div class='del'>-		 * after a successful assoc + some jiffies.</div><div class='del'>-			interrupt_mask &amp;= ~AR5K_INT_BMISS;</div><div class='del'>-		 */</div><div class='add'>+		data = pisr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -661,8 +732,7 @@ int ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_set_imr - Set interrupt mask</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_set_imr() - Set interrupt mask</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @new_mask: The new interrupt mask to be set</div><div class='ctx'>  *</div><div class='hunk'>@@ -670,7 +740,8 @@ int ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask)</div><div class='ctx'>  * ath5k_int bits to hw-specific bits to remove abstraction and writing</div><div class='ctx'>  * Interrupt Mask Register.</div><div class='ctx'>  */</div><div class='del'>-enum ath5k_int ath5k_hw_set_imr(struct ath5k_hw *ah, enum ath5k_int new_mask)</div><div class='add'>+enum ath5k_int</div><div class='add'>+ath5k_hw_set_imr(struct ath5k_hw *ah, enum ath5k_int new_mask)</div><div class='ctx'> {</div><div class='ctx'> 	enum ath5k_int old_mask, int_mask;</div><div class='ctx'> </div><div class='hunk'>@@ -697,16 +768,14 @@ enum ath5k_int ath5k_hw_set_imr(struct ath5k_hw *ah, enum ath5k_int new_mask)</div><div class='ctx'> 		u32 simr2 = ath5k_hw_reg_read(ah, AR5K_SIMR2)</div><div class='ctx'> 				&amp; AR5K_SIMR2_QCU_TXURN;</div><div class='ctx'> </div><div class='add'>+		/* Fatal interrupt abstraction for 5211+ */</div><div class='ctx'> 		if (new_mask &amp; AR5K_INT_FATAL) {</div><div class='ctx'> 			int_mask |= AR5K_IMR_HIUERR;</div><div class='ctx'> 			simr2 |= (AR5K_SIMR2_MCABT | AR5K_SIMR2_SSERR</div><div class='ctx'> 				| AR5K_SIMR2_DPERR);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/*Beacon Not Ready*/</div><div class='del'>-		if (new_mask &amp; AR5K_INT_BNR)</div><div class='del'>-			int_mask |= AR5K_INT_BNR;</div><div class='del'>-</div><div class='add'>+		/* Misc beacon related interrupts */</div><div class='ctx'> 		if (new_mask &amp; AR5K_INT_TIM)</div><div class='ctx'> 			int_mask |= AR5K_IMR_TIM;</div><div class='ctx'> </div><div class='hunk'>@@ -721,8 +790,9 @@ enum ath5k_int ath5k_hw_set_imr(struct ath5k_hw *ah, enum ath5k_int new_mask)</div><div class='ctx'> 		if (new_mask &amp; AR5K_INT_CAB_TIMEOUT)</div><div class='ctx'> 			simr2 |= AR5K_SISR2_CAB_TIMEOUT;</div><div class='ctx'> </div><div class='del'>-		if (new_mask &amp; AR5K_INT_RX_DOPPLER)</div><div class='del'>-			int_mask |= AR5K_IMR_RXDOPPLER;</div><div class='add'>+		/*Beacon Not Ready*/</div><div class='add'>+		if (new_mask &amp; AR5K_INT_BNR)</div><div class='add'>+			int_mask |= AR5K_INT_BNR;</div><div class='ctx'> </div><div class='ctx'> 		/* Note: Per queue interrupt masks</div><div class='ctx'> 		 * are set via ath5k_hw_reset_tx_queue() (qcu.c) */</div><div class='hunk'>@@ -730,10 +800,12 @@ enum ath5k_int ath5k_hw_set_imr(struct ath5k_hw *ah, enum ath5k_int new_mask)</div><div class='ctx'> 		ath5k_hw_reg_write(ah, simr2, AR5K_SIMR2);</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='add'>+		/* Fatal interrupt abstraction for 5210 */</div><div class='ctx'> 		if (new_mask &amp; AR5K_INT_FATAL)</div><div class='ctx'> 			int_mask |= (AR5K_IMR_SSERR | AR5K_IMR_MCABT</div><div class='ctx'> 				| AR5K_IMR_HIUERR | AR5K_IMR_DPERR);</div><div class='ctx'> </div><div class='add'>+		/* Only common interrupts left for 5210 (no SIMRs) */</div><div class='ctx'> 		ath5k_hw_reg_write(ah, int_mask, AR5K_IMR);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -760,8 +832,7 @@ enum ath5k_int ath5k_hw_set_imr(struct ath5k_hw *ah, enum ath5k_int new_mask)</div><div class='ctx'> \********************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_dma_init - Initialize DMA unit</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_dma_init() - Initialize DMA unit</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='ctx'>  * Set DMA size and pre-enable interrupts</div><div class='hunk'>@@ -770,7 +841,8 @@ enum ath5k_int ath5k_hw_set_imr(struct ath5k_hw *ah, enum ath5k_int new_mask)</div><div class='ctx'>  *</div><div class='ctx'>  * XXX: Save/restore RXDP/TXDP registers ?</div><div class='ctx'>  */</div><div class='del'>-void ath5k_hw_dma_init(struct ath5k_hw *ah)</div><div class='add'>+void</div><div class='add'>+ath5k_hw_dma_init(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set Rx/Tx DMA Configuration</div><div class='hunk'>@@ -799,8 +871,7 @@ void ath5k_hw_dma_init(struct ath5k_hw *ah)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_dma_stop - stop DMA unit</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_dma_stop() - stop DMA unit</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='ctx'>  * Stop tx/rx DMA and interrupts. Returns</div><div class='hunk'>@@ -810,7 +881,8 @@ void ath5k_hw_dma_init(struct ath5k_hw *ah)</div><div class='ctx'>  * stuck frames on tx queues, only a reset</div><div class='ctx'>  * can fix that.</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_dma_stop(struct ath5k_hw *ah)</div><div class='add'>+int</div><div class='add'>+ath5k_hw_dma_stop(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	int i, qmax, err;</div><div class='ctx'> 	err = 0;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/gpio.c b/drivers/net/wireless/ath/ath5k/gpio.c<br/>index 859297811914..73d3dd8a306a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/gpio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/gpio.c</a></div><div class='hunk'>@@ -24,10 +24,33 @@</div><div class='ctx'> #include "reg.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set led state</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: GPIO/LED functions</div><div class='add'>+ *</div><div class='add'>+ * Here we control the 6 bidirectional GPIO pins provided by the hw.</div><div class='add'>+ * We can set a GPIO pin to be an input or an output pin on GPIO control</div><div class='add'>+ * register and then read or set its status from GPIO data input/output</div><div class='add'>+ * registers.</div><div class='add'>+ *</div><div class='add'>+ * We also control the two LED pins provided by the hw, LED_0 is our</div><div class='add'>+ * "power" LED and LED_1 is our "network activity" LED but many scenarios</div><div class='add'>+ * are available from hw. Vendors might also provide LEDs connected to the</div><div class='add'>+ * GPIO pins, we handle them through the LED subsystem on led.c</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_ledstate() - Set led state</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @state: One of AR5K_LED_*</div><div class='add'>+ *</div><div class='add'>+ * Used to set the LED blinking state. This only</div><div class='add'>+ * works for the LED connected to the LED_0, LED_1 pins,</div><div class='add'>+ * not the GPIO based.</div><div class='ctx'>  */</div><div class='del'>-void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state)</div><div class='add'>+void</div><div class='add'>+ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state)</div><div class='ctx'> {</div><div class='ctx'> 	u32 led;</div><div class='ctx'> 	/*5210 has different led mode handling*/</div><div class='hunk'>@@ -74,10 +97,13 @@ void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state)</div><div class='ctx'> 		AR5K_REG_ENABLE_BITS(ah, AR5K_PCICFG, led_5210);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set GPIO inputs</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_gpio_input() - Set GPIO inputs</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @gpio: GPIO pin to set as input</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_set_gpio_input(struct ath5k_hw *ah, u32 gpio)</div><div class='add'>+int</div><div class='add'>+ath5k_hw_set_gpio_input(struct ath5k_hw *ah, u32 gpio)</div><div class='ctx'> {</div><div class='ctx'> 	if (gpio &gt;= AR5K_NUM_GPIO)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -89,10 +115,13 @@ int ath5k_hw_set_gpio_input(struct ath5k_hw *ah, u32 gpio)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set GPIO outputs</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_gpio_output() - Set GPIO outputs</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @gpio: The GPIO pin to set as output</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_set_gpio_output(struct ath5k_hw *ah, u32 gpio)</div><div class='add'>+int</div><div class='add'>+ath5k_hw_set_gpio_output(struct ath5k_hw *ah, u32 gpio)</div><div class='ctx'> {</div><div class='ctx'> 	if (gpio &gt;= AR5K_NUM_GPIO)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -104,10 +133,13 @@ int ath5k_hw_set_gpio_output(struct ath5k_hw *ah, u32 gpio)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Get GPIO state</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_get_gpio() - Get GPIO state</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @gpio: The GPIO pin to read</div><div class='ctx'>  */</div><div class='del'>-u32 ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio)</div><div class='add'>+u32</div><div class='add'>+ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio)</div><div class='ctx'> {</div><div class='ctx'> 	if (gpio &gt;= AR5K_NUM_GPIO)</div><div class='ctx'> 		return 0xffffffff;</div><div class='hunk'>@@ -117,10 +149,14 @@ u32 ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio)</div><div class='ctx'> 		0x1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set GPIO state</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_gpio() - Set GPIO state</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @gpio: The GPIO pin to set</div><div class='add'>+ * @val: Value to set (boolean)</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_set_gpio(struct ath5k_hw *ah, u32 gpio, u32 val)</div><div class='add'>+int</div><div class='add'>+ath5k_hw_set_gpio(struct ath5k_hw *ah, u32 gpio, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	u32 data;</div><div class='ctx'> </div><div class='hunk'>@@ -138,10 +174,19 @@ int ath5k_hw_set_gpio(struct ath5k_hw *ah, u32 gpio, u32 val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Initialize the GPIO interrupt (RFKill switch)</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_gpio_intr() - Initialize the GPIO interrupt (RFKill switch)</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @gpio: The GPIO pin to use</div><div class='add'>+ * @interrupt_level: True to generate interrupt on active pin (high)</div><div class='add'>+ *</div><div class='add'>+ * This function is used to set up the GPIO interrupt for the hw RFKill switch.</div><div class='add'>+ * That switch is connected to a GPIO pin and it's number is stored on EEPROM.</div><div class='add'>+ * It can either open or close the circuit to indicate that we should disable</div><div class='add'>+ * RF/Wireless to save power (we also get that from EEPROM).</div><div class='ctx'>  */</div><div class='del'>-void ath5k_hw_set_gpio_intr(struct ath5k_hw *ah, unsigned int gpio,</div><div class='add'>+void</div><div class='add'>+ath5k_hw_set_gpio_intr(struct ath5k_hw *ah, unsigned int gpio,</div><div class='ctx'> 		u32 interrupt_level)</div><div class='ctx'> {</div><div class='ctx'> 	u32 data;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/initvals.c b/drivers/net/wireless/ath/ath5k/initvals.c<br/>index 1ffecc0fd3ed..a1ea78e05b47 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/initvals.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/initvals.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/initvals.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/initvals.c</a></div><div class='hunk'>@@ -23,24 +23,27 @@</div><div class='ctx'> #include "reg.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Mode-independent initial register writes</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_ini - Mode-independent initial register writes</div><div class='add'>+ * @ini_register: Register address</div><div class='add'>+ * @ini_value: Default value</div><div class='add'>+ * @ini_mode: 0 to write 1 to read (and clear)</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> struct ath5k_ini {</div><div class='ctx'> 	u16	ini_register;</div><div class='ctx'> 	u32	ini_value;</div><div class='ctx'> </div><div class='ctx'> 	enum {</div><div class='ctx'> 		AR5K_INI_WRITE = 0,	/* Default */</div><div class='del'>-		AR5K_INI_READ = 1,	/* Cleared on read */</div><div class='add'>+		AR5K_INI_READ = 1,</div><div class='ctx'> 	} ini_mode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Mode specific initial register values</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_ini_mode - Mode specific initial register values</div><div class='add'>+ * @mode_register: Register address</div><div class='add'>+ * @mode_value: Set of values for each enum ath5k_driver_mode</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> struct ath5k_ini_mode {</div><div class='ctx'> 	u16	mode_register;</div><div class='ctx'> 	u32	mode_value[3];</div><div class='hunk'>@@ -386,11 +389,10 @@ static const struct ath5k_ini ar5211_ini[] = {</div><div class='ctx'> </div><div class='ctx'> /* Initial mode-specific settings for AR5211</div><div class='ctx'>  * 5211 supports OFDM-only g (draft g) but we</div><div class='del'>- * need to test it !</div><div class='del'>- */</div><div class='add'>+ * need to test it ! */</div><div class='ctx'> static const struct ath5k_ini_mode ar5211_ini_mode[] = {</div><div class='ctx'> 	{ AR5K_TXCFG,</div><div class='del'>-	/*	A/XR          B           G       */</div><div class='add'>+	/*	A          B           G       */</div><div class='ctx'> 	   { 0x00000015, 0x0000001d, 0x00000015 } },</div><div class='ctx'> 	{ AR5K_QUEUE_DFS_LOCAL_IFS(0),</div><div class='ctx'> 	   { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },</div><div class='hunk'>@@ -460,7 +462,7 @@ static const struct ath5k_ini_mode ar5211_ini_mode[] = {</div><div class='ctx'> 	   { 0x00000010, 0x00000010, 0x00000010 } },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Initial register settings for AR5212 */</div><div class='add'>+/* Initial register settings for AR5212 and newer chips */</div><div class='ctx'> static const struct ath5k_ini ar5212_ini_common_start[] = {</div><div class='ctx'> 	{ AR5K_RXDP,		0x00000000 },</div><div class='ctx'> 	{ AR5K_RXCFG,		0x00000005 },</div><div class='hunk'>@@ -724,7 +726,8 @@ static const struct ath5k_ini_mode ar5212_ini_mode_start[] = {</div><div class='ctx'> 	   { 0x00000000, 0x00000000, 0x00000108 } },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Initial mode-specific settings for AR5212 + RF5111 (Written after ar5212_ini) */</div><div class='add'>+/* Initial mode-specific settings for AR5212 + RF5111</div><div class='add'>+ * (Written after ar5212_ini) */</div><div class='ctx'> static const struct ath5k_ini_mode rf5111_ini_mode_end[] = {</div><div class='ctx'> 	{ AR5K_TXCFG,</div><div class='ctx'> 	/*	A/XR          B           G       */</div><div class='hunk'>@@ -757,6 +760,7 @@ static const struct ath5k_ini_mode rf5111_ini_mode_end[] = {</div><div class='ctx'> 	   { 0x1883800a, 0x1873800a, 0x1883800a } },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Common for all modes */</div><div class='ctx'> static const struct ath5k_ini rf5111_ini_common_end[] = {</div><div class='ctx'> 	{ AR5K_DCU_FP,		0x00000000 },</div><div class='ctx'> 	{ AR5K_PHY_AGC,		0x00000000 },</div><div class='hunk'>@@ -774,7 +778,9 @@ static const struct ath5k_ini rf5111_ini_common_end[] = {</div><div class='ctx'> 	{ 0xa23c,		0x13c889af },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Initial mode-specific settings for AR5212 + RF5112 (Written after ar5212_ini) */</div><div class='add'>+</div><div class='add'>+/* Initial mode-specific settings for AR5212 + RF5112</div><div class='add'>+ * (Written after ar5212_ini) */</div><div class='ctx'> static const struct ath5k_ini_mode rf5112_ini_mode_end[] = {</div><div class='ctx'> 	{ AR5K_TXCFG,</div><div class='ctx'> 	/*	A/XR          B           G       */</div><div class='hunk'>@@ -825,7 +831,9 @@ static const struct ath5k_ini rf5112_ini_common_end[] = {</div><div class='ctx'> 	{ 0xa23c,		0x13c889af },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Initial mode-specific settings for RF5413/5414 (Written after ar5212_ini) */</div><div class='add'>+</div><div class='add'>+/* Initial mode-specific settings for RF5413/5414</div><div class='add'>+ * (Written after ar5212_ini) */</div><div class='ctx'> static const struct ath5k_ini_mode rf5413_ini_mode_end[] = {</div><div class='ctx'> 	{ AR5K_TXCFG,</div><div class='ctx'> 	/*	A/XR          B           G       */</div><div class='hunk'>@@ -963,7 +971,8 @@ static const struct ath5k_ini rf5413_ini_common_end[] = {</div><div class='ctx'> 	{ 0xa384, 0xf3307ff0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Initial mode-specific settings for RF2413/2414 (Written after ar5212_ini) */</div><div class='add'>+/* Initial mode-specific settings for RF2413/2414</div><div class='add'>+ * (Written after ar5212_ini) */</div><div class='ctx'> /* XXX: a mode ? */</div><div class='ctx'> static const struct ath5k_ini_mode rf2413_ini_mode_end[] = {</div><div class='ctx'> 	{ AR5K_TXCFG,</div><div class='hunk'>@@ -1085,7 +1094,8 @@ static const struct ath5k_ini rf2413_ini_common_end[] = {</div><div class='ctx'> 	{ 0xa384, 0xf3307ff0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Initial mode-specific settings for RF2425 (Written after ar5212_ini) */</div><div class='add'>+/* Initial mode-specific settings for RF2425</div><div class='add'>+ * (Written after ar5212_ini) */</div><div class='ctx'> /* XXX: a mode ? */</div><div class='ctx'> static const struct ath5k_ini_mode rf2425_ini_mode_end[] = {</div><div class='ctx'> 	{ AR5K_TXCFG,</div><div class='hunk'>@@ -1357,10 +1367,15 @@ static const struct ath5k_ini rf5112_ini_bbgain[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Write initial register dump</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_ini_registers() - Write initial register dump common for all modes</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @size: Dump size</div><div class='add'>+ * @ini_regs: The array of &amp;struct ath5k_ini</div><div class='add'>+ * @skip_pcu: Skip PCU registers</div><div class='ctx'>  */</div><div class='del'>-static void ath5k_hw_ini_registers(struct ath5k_hw *ah, unsigned int size,</div><div class='add'>+static void</div><div class='add'>+ath5k_hw_ini_registers(struct ath5k_hw *ah, unsigned int size,</div><div class='ctx'> 		const struct ath5k_ini *ini_regs, bool skip_pcu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -1388,7 +1403,15 @@ static void ath5k_hw_ini_registers(struct ath5k_hw *ah, unsigned int size,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath5k_hw_ini_mode_registers(struct ath5k_hw *ah,</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_ini_mode_registers() - Write initial mode-specific register dump</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @size: Dump size</div><div class='add'>+ * @ini_mode: The array of &amp;struct ath5k_ini_mode</div><div class='add'>+ * @mode: One of enum ath5k_driver_mode</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ath5k_hw_ini_mode_registers(struct ath5k_hw *ah,</div><div class='ctx'> 		unsigned int size, const struct ath5k_ini_mode *ini_mode,</div><div class='ctx'> 		u8 mode)</div><div class='ctx'> {</div><div class='hunk'>@@ -1402,7 +1425,17 @@ static void ath5k_hw_ini_mode_registers(struct ath5k_hw *ah,</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool skip_pcu)</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_write_initvals() - Write initial chip-specific register dump</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @mode: One of enum ath5k_driver_mode</div><div class='add'>+ * @skip_pcu: Skip PCU registers</div><div class='add'>+ *</div><div class='add'>+ * Write initial chip-specific register dump, to get the chipset on a</div><div class='add'>+ * clean and ready-to-work state after warm reset.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool skip_pcu)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Write initial register settings</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/pci.c b/drivers/net/wireless/ath/ath5k/pci.c<br/>index dfa48eb7d953..849fa060ebc4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/pci.c</a></div><div class='hunk'>@@ -98,7 +98,7 @@ ath5k_pci_eeprom_read(struct ath_common *common, u32 offset, u16 *data)</div><div class='ctx'> 					0xffff);</div><div class='ctx'> 			return true;</div><div class='ctx'> 		}</div><div class='del'>-		udelay(15);</div><div class='add'>+		usleep_range(15, 20);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c<br/>index a7eafa3edc21..cebfd6fd31d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/pcu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/pcu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/pcu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/pcu.c</a></div><div class='hunk'>@@ -30,11 +30,47 @@</div><div class='ctx'> #include "reg.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * DOC: Protocol Control Unit (PCU) functions</div><div class='add'>+ *</div><div class='add'>+ * Protocol control unit is responsible to maintain various protocol</div><div class='add'>+ * properties before a frame is send and after a frame is received to/from</div><div class='add'>+ * baseband. To be more specific, PCU handles:</div><div class='add'>+ *</div><div class='add'>+ * - Buffering of RX and TX frames (after QCU/DCUs)</div><div class='add'>+ *</div><div class='add'>+ * - Encrypting and decrypting (using the built-in engine)</div><div class='add'>+ *</div><div class='add'>+ * - Generating ACKs, RTS/CTS frames</div><div class='add'>+ *</div><div class='add'>+ * - Maintaining TSF</div><div class='add'>+ *</div><div class='add'>+ * - FCS</div><div class='add'>+ *</div><div class='add'>+ * - Updating beacon data (with TSF etc)</div><div class='add'>+ *</div><div class='add'>+ * - Generating virtual CCA</div><div class='add'>+ *</div><div class='add'>+ * - RX/Multicast filtering</div><div class='add'>+ *</div><div class='add'>+ * - BSSID filtering</div><div class='add'>+ *</div><div class='add'>+ * - Various statistics</div><div class='add'>+ *</div><div class='add'>+ * -Different operating modes: AP, STA, IBSS</div><div class='add'>+ *</div><div class='add'>+ * Note: Most of these functions can be tweaked/bypassed so you can do</div><div class='add'>+ * them on sw above for debugging or research. For more infos check out PCU</div><div class='add'>+ * registers on reg.h.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: ACK rates</div><div class='add'>+ *</div><div class='ctx'>  * AR5212+ can use higher rates for ack transmission</div><div class='ctx'>  * based on current tx rate instead of the base rate.</div><div class='ctx'>  * It does this to better utilize channel usage.</div><div class='del'>- * This is a mapping between G rates (that cover both</div><div class='add'>+ * There is a mapping between G rates (that cover both</div><div class='ctx'>  * CCK and OFDM) and ack rates that we use when setting</div><div class='ctx'>  * rate -&gt; duration table. This mapping is hw-based so</div><div class='ctx'>  * don't change anything.</div><div class='hunk'>@@ -63,17 +99,18 @@ static const unsigned int ack_rates_high[] =</div><div class='ctx'> \*******************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_get_frame_duration - Get tx time of a frame</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_get_frame_duration() - Get tx time of a frame</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @len: Frame's length in bytes</div><div class='ctx'>  * @rate: The @struct ieee80211_rate</div><div class='add'>+ * @shortpre: Indicate short preample</div><div class='ctx'>  *</div><div class='ctx'>  * Calculate tx duration of a frame given it's rate and length</div><div class='ctx'>  * It extends ieee80211_generic_frame_duration for non standard</div><div class='ctx'>  * bwmodes.</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_get_frame_duration(struct ath5k_hw *ah,</div><div class='add'>+int</div><div class='add'>+ath5k_hw_get_frame_duration(struct ath5k_hw *ah,</div><div class='ctx'> 		int len, struct ieee80211_rate *rate, bool shortpre)</div><div class='ctx'> {</div><div class='ctx'> 	int sifs, preamble, plcp_bits, sym_time;</div><div class='hunk'>@@ -129,11 +166,11 @@ int ath5k_hw_get_frame_duration(struct ath5k_hw *ah,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_get_default_slottime - Get the default slot time for current mode</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_get_default_slottime() - Get the default slot time for current mode</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  */</div><div class='del'>-unsigned int ath5k_hw_get_default_slottime(struct ath5k_hw *ah)</div><div class='add'>+unsigned int</div><div class='add'>+ath5k_hw_get_default_slottime(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_channel *channel = ah-&gt;ah_current_channel;</div><div class='ctx'> 	unsigned int slot_time;</div><div class='hunk'>@@ -160,11 +197,11 @@ unsigned int ath5k_hw_get_default_slottime(struct ath5k_hw *ah)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_get_default_sifs - Get the default SIFS for current mode</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_get_default_sifs() - Get the default SIFS for current mode</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  */</div><div class='del'>-unsigned int ath5k_hw_get_default_sifs(struct ath5k_hw *ah)</div><div class='add'>+unsigned int</div><div class='add'>+ath5k_hw_get_default_sifs(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_channel *channel = ah-&gt;ah_current_channel;</div><div class='ctx'> 	unsigned int sifs;</div><div class='hunk'>@@ -191,17 +228,17 @@ unsigned int ath5k_hw_get_default_sifs(struct ath5k_hw *ah)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_update_mib_counters - Update MIB counters (mac layer statistics)</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_update_mib_counters() - Update MIB counters (mac layer statistics)</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='ctx'>  * Reads MIB counters from PCU and updates sw statistics. Is called after a</div><div class='ctx'>  * MIB interrupt, because one of these counters might have reached their maximum</div><div class='ctx'>  * and triggered the MIB interrupt, to let us read and clear the counter.</div><div class='ctx'>  *</div><div class='del'>- * Is called in interrupt context!</div><div class='add'>+ * NOTE: Is called in interrupt context!</div><div class='ctx'>  */</div><div class='del'>-void ath5k_hw_update_mib_counters(struct ath5k_hw *ah)</div><div class='add'>+void</div><div class='add'>+ath5k_hw_update_mib_counters(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_statistics *stats = &amp;ah-&gt;stats;</div><div class='ctx'> </div><div class='hunk'>@@ -219,10 +256,8 @@ void ath5k_hw_update_mib_counters(struct ath5k_hw *ah)</div><div class='ctx'> \******************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_write_rate_duration - fill rate code to duration table</div><div class='del'>- *</div><div class='del'>- * @ah: the &amp;struct ath5k_hw</div><div class='del'>- * @mode: one of enum ath5k_driver_mode</div><div class='add'>+ * ath5k_hw_write_rate_duration() - Fill rate code to duration table</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='ctx'>  * Write the rate code to duration table upon hw reset. This is a helper for</div><div class='ctx'>  * ath5k_hw_pcu_init(). It seems all this is doing is setting an ACK timeout on</div><div class='hunk'>@@ -236,7 +271,8 @@ void ath5k_hw_update_mib_counters(struct ath5k_hw *ah)</div><div class='ctx'>  * that include all OFDM and CCK rates.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-static inline void ath5k_hw_write_rate_duration(struct ath5k_hw *ah)</div><div class='add'>+static inline void</div><div class='add'>+ath5k_hw_write_rate_duration(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_rate *rate;</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -280,12 +316,12 @@ static inline void ath5k_hw_write_rate_duration(struct ath5k_hw *ah)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_set_ack_timeout - Set ACK timeout on PCU</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_set_ack_timeout() - Set ACK timeout on PCU</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @timeout: Timeout in usec</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_set_ack_timeout(struct ath5k_hw *ah, unsigned int timeout)</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_set_ack_timeout(struct ath5k_hw *ah, unsigned int timeout)</div><div class='ctx'> {</div><div class='ctx'> 	if (ath5k_hw_clocktoh(ah, AR5K_REG_MS(0xffffffff, AR5K_TIME_OUT_ACK))</div><div class='ctx'> 			&lt;= timeout)</div><div class='hunk'>@@ -298,12 +334,12 @@ static int ath5k_hw_set_ack_timeout(struct ath5k_hw *ah, unsigned int timeout)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_set_cts_timeout - Set CTS timeout on PCU</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_set_cts_timeout() - Set CTS timeout on PCU</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @timeout: Timeout in usec</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_set_cts_timeout(struct ath5k_hw *ah, unsigned int timeout)</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_set_cts_timeout(struct ath5k_hw *ah, unsigned int timeout)</div><div class='ctx'> {</div><div class='ctx'> 	if (ath5k_hw_clocktoh(ah, AR5K_REG_MS(0xffffffff, AR5K_TIME_OUT_CTS))</div><div class='ctx'> 			&lt;= timeout)</div><div class='hunk'>@@ -321,14 +357,14 @@ static int ath5k_hw_set_cts_timeout(struct ath5k_hw *ah, unsigned int timeout)</div><div class='ctx'> \*******************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_set_lladdr - Set station id</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_set_lladdr() - Set station id</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='del'>- * @mac: The card's mac address</div><div class='add'>+ * @mac: The card's mac address (array of octets)</div><div class='ctx'>  *</div><div class='ctx'>  * Set station id on hw using the provided mac address</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_set_lladdr(struct ath5k_hw *ah, const u8 *mac)</div><div class='add'>+int</div><div class='add'>+ath5k_hw_set_lladdr(struct ath5k_hw *ah, const u8 *mac)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath5k_hw_common(ah);</div><div class='ctx'> 	u32 low_id, high_id;</div><div class='hunk'>@@ -349,14 +385,14 @@ int ath5k_hw_set_lladdr(struct ath5k_hw *ah, const u8 *mac)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_set_bssid - Set current BSSID on hw</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_set_bssid() - Set current BSSID on hw</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='ctx'>  * Sets the current BSSID and BSSID mask we have from the</div><div class='ctx'>  * common struct into the hardware</div><div class='ctx'>  */</div><div class='del'>-void ath5k_hw_set_bssid(struct ath5k_hw *ah)</div><div class='add'>+void</div><div class='add'>+ath5k_hw_set_bssid(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath5k_hw_common(ah);</div><div class='ctx'> 	u16 tim_offset = 0;</div><div class='hunk'>@@ -389,7 +425,23 @@ void ath5k_hw_set_bssid(struct ath5k_hw *ah)</div><div class='ctx'> 	ath5k_hw_enable_pspoll(ah, NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath5k_hw_set_bssid_mask(struct ath5k_hw *ah, const u8 *mask)</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_bssid_mask() - Filter out bssids we listen</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @mask: The BSSID mask to set (array of octets)</div><div class='add'>+ *</div><div class='add'>+ * BSSID masking is a method used by AR5212 and newer hardware to inform PCU</div><div class='add'>+ * which bits of the interface's MAC address should be looked at when trying</div><div class='add'>+ * to decide which packets to ACK. In station mode and AP mode with a single</div><div class='add'>+ * BSS every bit matters since we lock to only one BSS. In AP mode with</div><div class='add'>+ * multiple BSSes (virtual interfaces) not every bit matters because hw must</div><div class='add'>+ * accept frames for all BSSes and so we tweak some bits of our mac address</div><div class='add'>+ * in order to have multiple BSSes.</div><div class='add'>+ *</div><div class='add'>+ * For more information check out ../hw.c of the common ath module.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+ath5k_hw_set_bssid_mask(struct ath5k_hw *ah, const u8 *mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath5k_hw_common(ah);</div><div class='ctx'> </div><div class='hunk'>@@ -400,18 +452,21 @@ void ath5k_hw_set_bssid_mask(struct ath5k_hw *ah, const u8 *mask)</div><div class='ctx'> 		ath_hw_setbssidmask(common);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set multicast filter</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_mcast_filter() - Set multicast filter</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @filter0: Lower 32bits of muticast filter</div><div class='add'>+ * @filter1: Higher 16bits of multicast filter</div><div class='ctx'>  */</div><div class='del'>-void ath5k_hw_set_mcast_filter(struct ath5k_hw *ah, u32 filter0, u32 filter1)</div><div class='add'>+void</div><div class='add'>+ath5k_hw_set_mcast_filter(struct ath5k_hw *ah, u32 filter0, u32 filter1)</div><div class='ctx'> {</div><div class='ctx'> 	ath5k_hw_reg_write(ah, filter0, AR5K_MCAST_FILTER0);</div><div class='ctx'> 	ath5k_hw_reg_write(ah, filter1, AR5K_MCAST_FILTER1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_get_rx_filter - Get current rx filter</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_get_rx_filter() - Get current rx filter</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the RX filter by reading rx filter and</div><div class='hunk'>@@ -420,7 +475,8 @@ void ath5k_hw_set_mcast_filter(struct ath5k_hw *ah, u32 filter0, u32 filter1)</div><div class='ctx'>  * and pass to the driver. For a list of frame types</div><div class='ctx'>  * check out reg.h.</div><div class='ctx'>  */</div><div class='del'>-u32 ath5k_hw_get_rx_filter(struct ath5k_hw *ah)</div><div class='add'>+u32</div><div class='add'>+ath5k_hw_get_rx_filter(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	u32 data, filter = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -440,8 +496,7 @@ u32 ath5k_hw_get_rx_filter(struct ath5k_hw *ah)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_set_rx_filter - Set rx filter</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_set_rx_filter() - Set rx filter</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @filter: RX filter mask (see reg.h)</div><div class='ctx'>  *</div><div class='hunk'>@@ -449,7 +504,8 @@ u32 ath5k_hw_get_rx_filter(struct ath5k_hw *ah)</div><div class='ctx'>  * register on 5212 and newer chips so that we have proper PHY</div><div class='ctx'>  * error reporting.</div><div class='ctx'>  */</div><div class='del'>-void ath5k_hw_set_rx_filter(struct ath5k_hw *ah, u32 filter)</div><div class='add'>+void</div><div class='add'>+ath5k_hw_set_rx_filter(struct ath5k_hw *ah, u32 filter)</div><div class='ctx'> {</div><div class='ctx'> 	u32 data = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -493,13 +549,13 @@ void ath5k_hw_set_rx_filter(struct ath5k_hw *ah, u32 filter)</div><div class='ctx'> #define ATH5K_MAX_TSF_READ 10</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_get_tsf64 - Get the full 64bit TSF</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_get_tsf64() - Get the full 64bit TSF</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the current TSF</div><div class='ctx'>  */</div><div class='del'>-u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah)</div><div class='add'>+u64</div><div class='add'>+ath5k_hw_get_tsf64(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tsf_lower, tsf_upper1, tsf_upper2;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -536,28 +592,30 @@ u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah)</div><div class='ctx'> 	return ((u64)tsf_upper1 &lt;&lt; 32) | tsf_lower;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#undef ATH5K_MAX_TSF_READ</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_set_tsf64 - Set a new 64bit TSF</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_set_tsf64() - Set a new 64bit TSF</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @tsf64: The new 64bit TSF</div><div class='ctx'>  *</div><div class='ctx'>  * Sets the new TSF</div><div class='ctx'>  */</div><div class='del'>-void ath5k_hw_set_tsf64(struct ath5k_hw *ah, u64 tsf64)</div><div class='add'>+void</div><div class='add'>+ath5k_hw_set_tsf64(struct ath5k_hw *ah, u64 tsf64)</div><div class='ctx'> {</div><div class='ctx'> 	ath5k_hw_reg_write(ah, tsf64 &amp; 0xffffffff, AR5K_TSF_L32);</div><div class='ctx'> 	ath5k_hw_reg_write(ah, (tsf64 &gt;&gt; 32) &amp; 0xffffffff, AR5K_TSF_U32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_reset_tsf - Force a TSF reset</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_reset_tsf() - Force a TSF reset</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='ctx'>  * Forces a TSF reset on PCU</div><div class='ctx'>  */</div><div class='del'>-void ath5k_hw_reset_tsf(struct ath5k_hw *ah)</div><div class='add'>+void</div><div class='add'>+ath5k_hw_reset_tsf(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='hunk'>@@ -573,10 +631,17 @@ void ath5k_hw_reset_tsf(struct ath5k_hw *ah)</div><div class='ctx'> 	ath5k_hw_reg_write(ah, val, AR5K_BEACON);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Initialize beacon timers</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_init_beacon_timers() - Initialize beacon timers</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @next_beacon: Next TBTT</div><div class='add'>+ * @interval: Current beacon interval</div><div class='add'>+ *</div><div class='add'>+ * This function is used to initialize beacon timers based on current</div><div class='add'>+ * operation mode and settings.</div><div class='ctx'>  */</div><div class='del'>-void ath5k_hw_init_beacon(struct ath5k_hw *ah, u32 next_beacon, u32 interval)</div><div class='add'>+void</div><div class='add'>+ath5k_hw_init_beacon_timers(struct ath5k_hw *ah, u32 next_beacon, u32 interval)</div><div class='ctx'> {</div><div class='ctx'> 	u32 timer1, timer2, timer3;</div><div class='ctx'> </div><div class='hunk'>@@ -655,8 +720,7 @@ void ath5k_hw_init_beacon(struct ath5k_hw *ah, u32 next_beacon, u32 interval)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_check_timer_win - Check if timer B is timer A + window</div><div class='del'>- *</div><div class='add'>+ * ath5k_check_timer_win() - Check if timer B is timer A + window</div><div class='ctx'>  * @a: timer a (before b)</div><div class='ctx'>  * @b: timer b (after a)</div><div class='ctx'>  * @window: difference between a and b</div><div class='hunk'>@@ -686,12 +750,11 @@ ath5k_check_timer_win(int a, int b, int window, int intval)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_check_beacon_timers - Check if the beacon timers are correct</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_check_beacon_timers() - Check if the beacon timers are correct</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @intval: beacon interval</div><div class='ctx'>  *</div><div class='del'>- * This is a workaround for IBSS mode:</div><div class='add'>+ * This is a workaround for IBSS mode</div><div class='ctx'>  *</div><div class='ctx'>  * The need for this function arises from the fact that we have 4 separate</div><div class='ctx'>  * HW timer registers (TIMER0 - TIMER3), which are closely related to the</div><div class='hunk'>@@ -746,14 +809,14 @@ ath5k_hw_check_beacon_timers(struct ath5k_hw *ah, int intval)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_set_coverage_class - Set IEEE 802.11 coverage class</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_set_coverage_class() - Set IEEE 802.11 coverage class</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @coverage_class: IEEE 802.11 coverage class number</div><div class='ctx'>  *</div><div class='ctx'>  * Sets IFS intervals and ACK/CTS timeouts for given coverage class.</div><div class='ctx'>  */</div><div class='del'>-void ath5k_hw_set_coverage_class(struct ath5k_hw *ah, u8 coverage_class)</div><div class='add'>+void</div><div class='add'>+ath5k_hw_set_coverage_class(struct ath5k_hw *ah, u8 coverage_class)</div><div class='ctx'> {</div><div class='ctx'> 	/* As defined by IEEE 802.11-2007 17.3.8.6 */</div><div class='ctx'> 	int slot_time = ath5k_hw_get_default_slottime(ah) + 3 * coverage_class;</div><div class='hunk'>@@ -772,8 +835,7 @@ void ath5k_hw_set_coverage_class(struct ath5k_hw *ah, u8 coverage_class)</div><div class='ctx'> \***************************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_start_rx_pcu - Start RX engine</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_start_rx_pcu() - Start RX engine</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='ctx'>  * Starts RX engine on PCU so that hw can process RXed frames</div><div class='hunk'>@@ -781,32 +843,33 @@ void ath5k_hw_set_coverage_class(struct ath5k_hw *ah, u8 coverage_class)</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE: RX DMA should be already enabled using ath5k_hw_start_rx_dma</div><div class='ctx'>  */</div><div class='del'>-void ath5k_hw_start_rx_pcu(struct ath5k_hw *ah)</div><div class='add'>+void</div><div class='add'>+ath5k_hw_start_rx_pcu(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	AR5K_REG_DISABLE_BITS(ah, AR5K_DIAG_SW, AR5K_DIAG_SW_DIS_RX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * at5k_hw_stop_rx_pcu - Stop RX engine</div><div class='del'>- *</div><div class='add'>+ * at5k_hw_stop_rx_pcu() - Stop RX engine</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='ctx'>  * Stops RX engine on PCU</div><div class='ctx'>  */</div><div class='del'>-void ath5k_hw_stop_rx_pcu(struct ath5k_hw *ah)</div><div class='add'>+void</div><div class='add'>+ath5k_hw_stop_rx_pcu(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	AR5K_REG_ENABLE_BITS(ah, AR5K_DIAG_SW, AR5K_DIAG_SW_DIS_RX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_set_opmode - Set PCU operating mode</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_set_opmode() - Set PCU operating mode</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='del'>- * @op_mode: &amp;enum nl80211_iftype operating mode</div><div class='add'>+ * @op_mode: One of enum nl80211_iftype</div><div class='ctx'>  *</div><div class='ctx'>  * Configure PCU for the various operating modes (AP/STA etc)</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_set_opmode(struct ath5k_hw *ah, enum nl80211_iftype op_mode)</div><div class='add'>+int</div><div class='add'>+ath5k_hw_set_opmode(struct ath5k_hw *ah, enum nl80211_iftype op_mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath5k_hw_common(ah);</div><div class='ctx'> 	u32 pcu_reg, beacon_reg, low_id, high_id;</div><div class='hunk'>@@ -873,8 +936,17 @@ int ath5k_hw_set_opmode(struct ath5k_hw *ah, enum nl80211_iftype op_mode)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath5k_hw_pcu_init(struct ath5k_hw *ah, enum nl80211_iftype op_mode,</div><div class='del'>-								u8 mode)</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_pcu_init() - Initialize PCU</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @op_mode: One of enum nl80211_iftype</div><div class='add'>+ * @mode: One of enum ath5k_driver_mode</div><div class='add'>+ *</div><div class='add'>+ * This function is used to initialize PCU by setting current</div><div class='add'>+ * operation mode and various other settings.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+ath5k_hw_pcu_init(struct ath5k_hw *ah, enum nl80211_iftype op_mode)</div><div class='ctx'> {</div><div class='ctx'> 	/* Set bssid and bssid mask */</div><div class='ctx'> 	ath5k_hw_set_bssid(ah);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c<br/>index 01cb72de44cb..e1f8613426a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/phy.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/phy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/phy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/phy.c</a></div><div class='hunk'>@@ -1,6 +1,4 @@</div><div class='ctx'> /*</div><div class='del'>- * PHY functions</div><div class='del'>- *</div><div class='ctx'>  * Copyright (c) 2004-2007 Reyk Floeter &lt;reyk@openbsd.org&gt;</div><div class='ctx'>  * Copyright (c) 2006-2009 Nick Kossifidis &lt;mickflemm@gmail.com&gt;</div><div class='ctx'>  * Copyright (c) 2007-2008 Jiri Slaby &lt;jirislaby@gmail.com&gt;</div><div class='hunk'>@@ -20,6 +18,10 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/***********************\</div><div class='add'>+* PHY related functions *</div><div class='add'>+\***********************/</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='hunk'>@@ -31,14 +33,53 @@</div><div class='ctx'> #include "../regd.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * DOC: PHY related functions</div><div class='add'>+ *</div><div class='add'>+ * Here we handle the low-level functions related to baseband</div><div class='add'>+ * and analog frontend (RF) parts. This is by far the most complex</div><div class='add'>+ * part of the hw code so make sure you know what you are doing.</div><div class='add'>+ *</div><div class='add'>+ * Here is a list of what this is all about:</div><div class='add'>+ *</div><div class='add'>+ * - Channel setting/switching</div><div class='add'>+ *</div><div class='add'>+ * - Automatic Gain Control (AGC) calibration</div><div class='add'>+ *</div><div class='add'>+ * - Noise Floor calibration</div><div class='add'>+ *</div><div class='add'>+ * - I/Q imbalance calibration (QAM correction)</div><div class='add'>+ *</div><div class='add'>+ * - Calibration due to thermal changes (gain_F)</div><div class='add'>+ *</div><div class='add'>+ * - Spur noise mitigation</div><div class='add'>+ *</div><div class='add'>+ * - RF/PHY initialization for the various operating modes and bwmodes</div><div class='add'>+ *</div><div class='add'>+ * - Antenna control</div><div class='add'>+ *</div><div class='add'>+ * - TX power control per channel/rate/packet type</div><div class='add'>+ *</div><div class='add'>+ * Also have in mind we never got documentation for most of these</div><div class='add'>+ * functions, what we have comes mostly from Atheros's code, reverse</div><div class='add'>+ * engineering and patent docs/presentations etc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /******************\</div><div class='ctx'> * Helper functions *</div><div class='ctx'> \******************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Get the PHY Chip revision</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_radio_revision() - Get the PHY Chip revision</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @band: One of enum ieee80211_band</div><div class='add'>+ *</div><div class='add'>+ * Returns the revision number of a 2GHz, 5GHz or single chip</div><div class='add'>+ * radio.</div><div class='ctx'>  */</div><div class='del'>-u16 ath5k_hw_radio_revision(struct ath5k_hw *ah, enum ieee80211_band band)</div><div class='add'>+u16</div><div class='add'>+ath5k_hw_radio_revision(struct ath5k_hw *ah, enum ieee80211_band band)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	u32 srev;</div><div class='hunk'>@@ -58,7 +99,7 @@ u16 ath5k_hw_radio_revision(struct ath5k_hw *ah, enum ieee80211_band band)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mdelay(2);</div><div class='add'>+	usleep_range(2000, 2500);</div><div class='ctx'> </div><div class='ctx'> 	/* ...wait until PHY is ready and read the selected radio revision */</div><div class='ctx'> 	ath5k_hw_reg_write(ah, 0x00001c16, AR5K_PHY(0x34));</div><div class='hunk'>@@ -81,10 +122,16 @@ u16 ath5k_hw_radio_revision(struct ath5k_hw *ah, enum ieee80211_band band)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Check if a channel is supported</div><div class='add'>+/**</div><div class='add'>+ * ath5k_channel_ok() - Check if a channel is supported by the hw</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ *</div><div class='add'>+ * Note: We don't do any regulatory domain checks here, it's just</div><div class='add'>+ * a sanity check.</div><div class='ctx'>  */</div><div class='del'>-bool ath5k_channel_ok(struct ath5k_hw *ah, struct ieee80211_channel *channel)</div><div class='add'>+bool</div><div class='add'>+ath5k_channel_ok(struct ath5k_hw *ah, struct ieee80211_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	u16 freq = channel-&gt;center_freq;</div><div class='ctx'> </div><div class='hunk'>@@ -101,7 +148,13 @@ bool ath5k_channel_ok(struct ath5k_hw *ah, struct ieee80211_channel *channel)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool ath5k_hw_chan_has_spur_noise(struct ath5k_hw *ah,</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_chan_has_spur_noise() - Check if channel is sensitive to spur noise</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ */</div><div class='add'>+bool</div><div class='add'>+ath5k_hw_chan_has_spur_noise(struct ath5k_hw *ah,</div><div class='ctx'> 				struct ieee80211_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	u8 refclk_freq;</div><div class='hunk'>@@ -122,11 +175,20 @@ bool ath5k_hw_chan_has_spur_noise(struct ath5k_hw *ah,</div><div class='ctx'> 		return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Used to modify RF Banks before writing them to AR5K_RF_BUFFER</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_rfb_op() - Perform an operation on the given RF Buffer</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @rf_regs: The struct ath5k_rf_reg</div><div class='add'>+ * @val: New value</div><div class='add'>+ * @reg_id: RF register ID</div><div class='add'>+ * @set: Indicate we need to swap data</div><div class='add'>+ *</div><div class='add'>+ * This is an internal function used to modify RF Banks before</div><div class='add'>+ * writing them to AR5K_RF_BUFFER. Check out rfbuffer.h for more</div><div class='add'>+ * infos.</div><div class='ctx'>  */</div><div class='del'>-static unsigned int ath5k_hw_rfb_op(struct ath5k_hw *ah,</div><div class='del'>-					const struct ath5k_rf_reg *rf_regs,</div><div class='add'>+static unsigned int</div><div class='add'>+ath5k_hw_rfb_op(struct ath5k_hw *ah, const struct ath5k_rf_reg *rf_regs,</div><div class='ctx'> 					u32 val, u8 reg_id, bool set)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ath5k_rf_reg *rfreg = NULL;</div><div class='hunk'>@@ -204,8 +266,7 @@ static unsigned int ath5k_hw_rfb_op(struct ath5k_hw *ah,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_write_ofdm_timings - set OFDM timings on AR5212</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_write_ofdm_timings() - set OFDM timings on AR5212</div><div class='ctx'>  * @ah: the &amp;struct ath5k_hw</div><div class='ctx'>  * @channel: the currently set channel upon reset</div><div class='ctx'>  *</div><div class='hunk'>@@ -216,10 +277,11 @@ static unsigned int ath5k_hw_rfb_op(struct ath5k_hw *ah,</div><div class='ctx'>  * mantissa and provide these values on hw.</div><div class='ctx'>  *</div><div class='ctx'>  * For more infos i think this patent is related</div><div class='del'>- * http://www.freepatentsonline.com/7184495.html</div><div class='add'>+ * "http://www.freepatentsonline.com/7184495.html"</div><div class='ctx'>  */</div><div class='del'>-static inline int ath5k_hw_write_ofdm_timings(struct ath5k_hw *ah,</div><div class='del'>-	struct ieee80211_channel *channel)</div><div class='add'>+static inline int</div><div class='add'>+ath5k_hw_write_ofdm_timings(struct ath5k_hw *ah,</div><div class='add'>+				struct ieee80211_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	/* Get exponent and mantissa and set it */</div><div class='ctx'> 	u32 coef_scaled, coef_exp, coef_man,</div><div class='hunk'>@@ -278,6 +340,10 @@ static inline int ath5k_hw_write_ofdm_timings(struct ath5k_hw *ah,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_phy_disable() - Disable PHY</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ */</div><div class='ctx'> int ath5k_hw_phy_disable(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	/*Just a try M.F.*/</div><div class='hunk'>@@ -286,10 +352,13 @@ int ath5k_hw_phy_disable(struct ath5k_hw *ah)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Wait for synth to settle</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_wait_for_synth() - Wait for synth to settle</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='ctx'>  */</div><div class='del'>-static void ath5k_hw_wait_for_synth(struct ath5k_hw *ah,</div><div class='add'>+static void</div><div class='add'>+ath5k_hw_wait_for_synth(struct ath5k_hw *ah,</div><div class='ctx'> 			struct ieee80211_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -308,9 +377,9 @@ static void ath5k_hw_wait_for_synth(struct ath5k_hw *ah,</div><div class='ctx'> 			delay = delay &lt;&lt; 2;</div><div class='ctx'> 		/* XXX: /2 on turbo ? Let's be safe</div><div class='ctx'> 		 * for now */</div><div class='del'>-		udelay(100 + delay);</div><div class='add'>+		usleep_range(100 + delay, 100 + (2 * delay));</div><div class='ctx'> 	} else {</div><div class='del'>-		mdelay(1);</div><div class='add'>+		usleep_range(1000, 1500);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -319,7 +388,9 @@ static void ath5k_hw_wait_for_synth(struct ath5k_hw *ah,</div><div class='ctx'> * RF Gain optimization *</div><div class='ctx'> \**********************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * DOC: RF Gain optimization</div><div class='add'>+ *</div><div class='ctx'>  * This code is used to optimize RF gain on different environments</div><div class='ctx'>  * (temperature mostly) based on feedback from a power detector.</div><div class='ctx'>  *</div><div class='hunk'>@@ -328,22 +399,22 @@ static void ath5k_hw_wait_for_synth(struct ath5k_hw *ah,</div><div class='ctx'>  * no gain optimization ladder-.</div><div class='ctx'>  *</div><div class='ctx'>  * For more infos check out this patent doc</div><div class='del'>- * http://www.freepatentsonline.com/7400691.html</div><div class='add'>+ * "http://www.freepatentsonline.com/7400691.html"</div><div class='ctx'>  *</div><div class='ctx'>  * This paper describes power drops as seen on the receiver due to</div><div class='ctx'>  * probe packets</div><div class='del'>- * http://www.cnri.dit.ie/publications/ICT08%20-%20Practical%20Issues</div><div class='del'>- * %20of%20Power%20Control.pdf</div><div class='add'>+ * "http://www.cnri.dit.ie/publications/ICT08%20-%20Practical%20Issues</div><div class='add'>+ * %20of%20Power%20Control.pdf"</div><div class='ctx'>  *</div><div class='ctx'>  * And this is the MadWiFi bug entry related to the above</div><div class='del'>- * http://madwifi-project.org/ticket/1659</div><div class='add'>+ * "http://madwifi-project.org/ticket/1659"</div><div class='ctx'>  * with various measurements and diagrams</div><div class='del'>- *</div><div class='del'>- * TODO: Deal with power drops due to probes by setting an appropriate</div><div class='del'>- * tx power on the probe packets ! Make this part of the calibration process.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* Initialize ah_gain during attach */</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_rfgain_opt_init() - Initialize ah_gain during attach</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ */</div><div class='ctx'> int ath5k_hw_rfgain_opt_init(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	/* Initialize the gain optimization values */</div><div class='hunk'>@@ -367,17 +438,21 @@ int ath5k_hw_rfgain_opt_init(struct ath5k_hw *ah)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Schedule a gain probe check on the next transmitted packet.</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_request_rfgain_probe() - Request a PAPD probe packet</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ *</div><div class='add'>+ * Schedules a gain probe check on the next transmitted packet.</div><div class='ctx'>  * That means our next packet is going to be sent with lower</div><div class='ctx'>  * tx power and a Peak to Average Power Detector (PAPD) will try</div><div class='ctx'>  * to measure the gain.</div><div class='ctx'>  *</div><div class='del'>- * XXX:  How about forcing a tx packet (bypassing PCU arbitrator etc)</div><div class='add'>+ * TODO: Force a tx packet (bypassing PCU arbitrator etc)</div><div class='ctx'>  * just after we enable the probe so that we don't mess with</div><div class='del'>- * standard traffic ? Maybe it's time to use sw interrupts and</div><div class='del'>- * a probe tasklet !!!</div><div class='add'>+ * standard traffic.</div><div class='ctx'>  */</div><div class='del'>-static void ath5k_hw_request_rfgain_probe(struct ath5k_hw *ah)</div><div class='add'>+static void</div><div class='add'>+ath5k_hw_request_rfgain_probe(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	/* Skip if gain calibration is inactive or</div><div class='hunk'>@@ -395,9 +470,15 @@ static void ath5k_hw_request_rfgain_probe(struct ath5k_hw *ah)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Calculate gain_F measurement correction</div><div class='del'>- * based on the current step for RF5112 rev. 2 */</div><div class='del'>-static u32 ath5k_hw_rf_gainf_corr(struct ath5k_hw *ah)</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_rf_gainf_corr() - Calculate Gain_F measurement correction</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ *</div><div class='add'>+ * Calculate Gain_F measurement correction</div><div class='add'>+ * based on the current step for RF5112 rev. 2</div><div class='add'>+ */</div><div class='add'>+static u32</div><div class='add'>+ath5k_hw_rf_gainf_corr(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mix, step;</div><div class='ctx'> 	u32 *rf;</div><div class='hunk'>@@ -450,11 +531,19 @@ static u32 ath5k_hw_rf_gainf_corr(struct ath5k_hw *ah)</div><div class='ctx'> 	return ah-&gt;ah_gain.g_f_corr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Check if current gain_F measurement is in the range of our</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_rf_check_gainf_readback() - Validate Gain_F feedback from detector</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ *</div><div class='add'>+ * Check if current gain_F measurement is in the range of our</div><div class='ctx'>  * power detector windows. If we get a measurement outside range</div><div class='ctx'>  * we know it's not accurate (detectors can't measure anything outside</div><div class='del'>- * their detection window) so we must ignore it */</div><div class='del'>-static bool ath5k_hw_rf_check_gainf_readback(struct ath5k_hw *ah)</div><div class='add'>+ * their detection window) so we must ignore it.</div><div class='add'>+ *</div><div class='add'>+ * Returns true if readback was O.K. or false on failure</div><div class='add'>+ */</div><div class='add'>+static bool</div><div class='add'>+ath5k_hw_rf_check_gainf_readback(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ath5k_rf_reg *rf_regs;</div><div class='ctx'> 	u32 step, mix_ovr, level[4];</div><div class='hunk'>@@ -506,9 +595,15 @@ static bool ath5k_hw_rf_check_gainf_readback(struct ath5k_hw *ah)</div><div class='ctx'> 			ah-&gt;ah_gain.g_current &lt;= level[3]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Perform gain_F adjustment by choosing the right set</div><div class='del'>- * of parameters from RF gain optimization ladder */</div><div class='del'>-static s8 ath5k_hw_rf_gainf_adjust(struct ath5k_hw *ah)</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_rf_gainf_adjust() - Perform Gain_F adjustment</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ *</div><div class='add'>+ * Choose the right target gain based on current gain</div><div class='add'>+ * and RF gain optimization ladder</div><div class='add'>+ */</div><div class='add'>+static s8</div><div class='add'>+ath5k_hw_rf_gainf_adjust(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ath5k_gain_opt *go;</div><div class='ctx'> 	const struct ath5k_gain_opt_step *g_step;</div><div class='hunk'>@@ -572,13 +667,18 @@ done:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Main callback for thermal RF gain calibration engine</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_gainf_calibrate() - Do a gain_F calibration</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ *</div><div class='add'>+ * Main callback for thermal RF gain calibration engine</div><div class='ctx'>  * Check for a new gain reading and schedule an adjustment</div><div class='ctx'>  * if needed.</div><div class='ctx'>  *</div><div class='del'>- * TODO: Use sw interrupt to schedule reset if gain_F needs</div><div class='del'>- * adjustment */</div><div class='del'>-enum ath5k_rfgain ath5k_hw_gainf_calibrate(struct ath5k_hw *ah)</div><div class='add'>+ * Returns one of enum ath5k_rfgain codes</div><div class='add'>+ */</div><div class='add'>+enum ath5k_rfgain</div><div class='add'>+ath5k_hw_gainf_calibrate(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	u32 data, type;</div><div class='ctx'> 	struct ath5k_eeprom_info *ee = &amp;ah-&gt;ah_capabilities.cap_eeprom;</div><div class='hunk'>@@ -638,10 +738,18 @@ done:</div><div class='ctx'> 	return ah-&gt;ah_gain.g_state;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Write initial RF gain table to set the RF sensitivity</div><div class='del'>- * this one works on all RF chips and has nothing to do</div><div class='del'>- * with gain_F calibration */</div><div class='del'>-static int ath5k_hw_rfgain_init(struct ath5k_hw *ah, enum ieee80211_band band)</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_rfgain_init() - Write initial RF gain settings to hw</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @band: One of enum ieee80211_band</div><div class='add'>+ *</div><div class='add'>+ * Write initial RF gain table to set the RF sensitivity.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: This one works on all RF chips and has nothing to do</div><div class='add'>+ * with Gain_F calibration</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_rfgain_init(struct ath5k_hw *ah, enum ieee80211_band band)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ath5k_ini_rfgain *ath5k_rfg;</div><div class='ctx'> 	unsigned int i, size, index;</div><div class='hunk'>@@ -688,16 +796,23 @@ static int ath5k_hw_rfgain_init(struct ath5k_hw *ah, enum ieee80211_band band)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /********************\</div><div class='ctx'> * RF Registers setup *</div><div class='ctx'> \********************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Setup RF registers by writing RF buffer on hw</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_rfregs_init() - Initialize RF register settings</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ * @mode: One of enum ath5k_driver_mode</div><div class='add'>+ *</div><div class='add'>+ * Setup RF registers by writing RF buffer on hw. For</div><div class='add'>+ * more infos on this, check out rfbuffer.h</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_rfregs_init(struct ath5k_hw *ah,</div><div class='del'>-	struct ieee80211_channel *channel, unsigned int mode)</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_rfregs_init(struct ath5k_hw *ah,</div><div class='add'>+			struct ieee80211_channel *channel,</div><div class='add'>+			unsigned int mode)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ath5k_rf_reg *rf_regs;</div><div class='ctx'> 	const struct ath5k_ini_rfbuffer *ini_rfb;</div><div class='hunk'>@@ -1055,19 +1170,18 @@ static int ath5k_hw_rfregs_init(struct ath5k_hw *ah,</div><div class='ctx'>   PHY/RF channel functions</div><div class='ctx'> \**************************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Conversion needed for RF5110</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_rf5110_chan2athchan() - Convert channel freq on RF5110</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ *</div><div class='add'>+ * Map channel frequency to IEEE channel number and convert it</div><div class='add'>+ * to an internal channel value used by the RF5110 chipset.</div><div class='ctx'>  */</div><div class='del'>-static u32 ath5k_hw_rf5110_chan2athchan(struct ieee80211_channel *channel)</div><div class='add'>+static u32</div><div class='add'>+ath5k_hw_rf5110_chan2athchan(struct ieee80211_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	u32 athchan;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Convert IEEE channel/MHz to an internal channel value used</div><div class='del'>-	 * by the AR5210 chipset. This has not been verified with</div><div class='del'>-	 * newer chipsets like the AR5212A who have a completely</div><div class='del'>-	 * different RF/PHY part.</div><div class='del'>-	 */</div><div class='ctx'> 	athchan = (ath5k_hw_bitswap(</div><div class='ctx'> 			(ieee80211_frequency_to_channel(</div><div class='ctx'> 				channel-&gt;center_freq) - 24) / 2, 5)</div><div class='hunk'>@@ -1075,10 +1189,13 @@ static u32 ath5k_hw_rf5110_chan2athchan(struct ieee80211_channel *channel)</div><div class='ctx'> 	return athchan;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set channel on RF5110</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_rf5110_channel() - Set channel frequency on RF5110</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_rf5110_channel(struct ath5k_hw *ah,</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_rf5110_channel(struct ath5k_hw *ah,</div><div class='ctx'> 		struct ieee80211_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	u32 data;</div><div class='hunk'>@@ -1089,15 +1206,23 @@ static int ath5k_hw_rf5110_channel(struct ath5k_hw *ah,</div><div class='ctx'> 	data = ath5k_hw_rf5110_chan2athchan(channel);</div><div class='ctx'> 	ath5k_hw_reg_write(ah, data, AR5K_RF_BUFFER);</div><div class='ctx'> 	ath5k_hw_reg_write(ah, 0, AR5K_RF_BUFFER_CONTROL_0);</div><div class='del'>-	mdelay(1);</div><div class='add'>+	usleep_range(1000, 1500);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Conversion needed for 5111</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_rf5111_chan2athchan() - Handle 2GHz channels on RF5111/2111</div><div class='add'>+ * @ieee: IEEE channel number</div><div class='add'>+ * @athchan: The &amp;struct ath5k_athchan_2ghz</div><div class='add'>+ *</div><div class='add'>+ * In order to enable the RF2111 frequency converter on RF5111/2111 setups</div><div class='add'>+ * we need to add some offsets and extra flags to the data values we pass</div><div class='add'>+ * on to the PHY. So for every 2GHz channel this function gets called</div><div class='add'>+ * to do the conversion.</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_rf5111_chan2athchan(unsigned int ieee,</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_rf5111_chan2athchan(unsigned int ieee,</div><div class='ctx'> 		struct ath5k_athchan_2ghz *athchan)</div><div class='ctx'> {</div><div class='ctx'> 	int channel;</div><div class='hunk'>@@ -1123,10 +1248,13 @@ static int ath5k_hw_rf5111_chan2athchan(unsigned int ieee,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set channel on 5111</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_rf5111_channel() - Set channel frequency on RF5111/2111</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_rf5111_channel(struct ath5k_hw *ah,</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_rf5111_channel(struct ath5k_hw *ah,</div><div class='ctx'> 		struct ieee80211_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_athchan_2ghz ath5k_channel_2ghz;</div><div class='hunk'>@@ -1171,10 +1299,20 @@ static int ath5k_hw_rf5111_channel(struct ath5k_hw *ah,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set channel on 5112 and newer</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_rf5112_channel() - Set channel frequency on 5112 and newer</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ *</div><div class='add'>+ * On RF5112/2112 and newer we don't need to do any conversion.</div><div class='add'>+ * We pass the frequency value after a few modifications to the</div><div class='add'>+ * chip directly.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: Make sure channel frequency given is within our range or else</div><div class='add'>+ * we might damage the chip ! Use ath5k_channel_ok before calling this one.</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_rf5112_channel(struct ath5k_hw *ah,</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_rf5112_channel(struct ath5k_hw *ah,</div><div class='ctx'> 		struct ieee80211_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	u32 data, data0, data1, data2;</div><div class='hunk'>@@ -1183,17 +1321,37 @@ static int ath5k_hw_rf5112_channel(struct ath5k_hw *ah,</div><div class='ctx'> 	data = data0 = data1 = data2 = 0;</div><div class='ctx'> 	c = channel-&gt;center_freq;</div><div class='ctx'> </div><div class='add'>+	/* My guess based on code:</div><div class='add'>+	 * 2GHz RF has 2 synth modes, one with a Local Oscillator</div><div class='add'>+	 * at 2224Hz and one with a LO at 2192Hz. IF is 1520Hz</div><div class='add'>+	 * (3040/2). data0 is used to set the PLL divider and data1</div><div class='add'>+	 * selects synth mode. */</div><div class='ctx'> 	if (c &lt; 4800) {</div><div class='add'>+		/* Channel 14 and all frequencies with 2Hz spacing</div><div class='add'>+		 * below/above (non-standard channels) */</div><div class='ctx'> 		if (!((c - 2224) % 5)) {</div><div class='add'>+			/* Same as (c - 2224) / 5 */</div><div class='ctx'> 			data0 = ((2 * (c - 704)) - 3040) / 10;</div><div class='ctx'> 			data1 = 1;</div><div class='add'>+		/* Channel 1 and all frequencies with 5Hz spacing</div><div class='add'>+		 * below/above (standard channels without channel 14) */</div><div class='ctx'> 		} else if (!((c - 2192) % 5)) {</div><div class='add'>+			/* Same as (c - 2192) / 5 */</div><div class='ctx'> 			data0 = ((2 * (c - 672)) - 3040) / 10;</div><div class='ctx'> 			data1 = 0;</div><div class='ctx'> 		} else</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		data0 = ath5k_hw_bitswap((data0 &lt;&lt; 2) &amp; 0xff, 8);</div><div class='add'>+	/* This is more complex, we have a single synthesizer with</div><div class='add'>+	 * 4 reference clock settings (?) based on frequency spacing</div><div class='add'>+	 * and set using data2. LO is at 4800Hz and data0 is again used</div><div class='add'>+	 * to set some divider.</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE: There is an old atheros presentation at Stanford</div><div class='add'>+	 * that mentions a method called dual direct conversion</div><div class='add'>+	 * with 1GHz sliding IF for RF5110. Maybe that's what we</div><div class='add'>+	 * have here, or an updated version. */</div><div class='ctx'> 	} else if ((c % 5) != 2 || c &gt; 5435) {</div><div class='ctx'> 		if (!(c % 20) &amp;&amp; c &gt;= 5120) {</div><div class='ctx'> 			data0 = ath5k_hw_bitswap(((c - 4800) / 20 &lt;&lt; 2), 8);</div><div class='hunk'>@@ -1219,10 +1377,16 @@ static int ath5k_hw_rf5112_channel(struct ath5k_hw *ah,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set the channel on the RF2425</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_rf2425_channel() - Set channel frequency on RF2425</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ *</div><div class='add'>+ * AR2425/2417 have a different 2GHz RF so code changes</div><div class='add'>+ * a little bit from RF5112.</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_rf2425_channel(struct ath5k_hw *ah,</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_rf2425_channel(struct ath5k_hw *ah,</div><div class='ctx'> 		struct ieee80211_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	u32 data, data0, data2;</div><div class='hunk'>@@ -1258,10 +1422,16 @@ static int ath5k_hw_rf2425_channel(struct ath5k_hw *ah,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set a channel on the radio chip</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_channel() - Set a channel on the radio chip</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ *</div><div class='add'>+ * This is the main function called to set a channel on the</div><div class='add'>+ * radio chip based on the radio chip version.</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_channel(struct ath5k_hw *ah,</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_channel(struct ath5k_hw *ah,</div><div class='ctx'> 		struct ieee80211_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1313,11 +1483,46 @@ static int ath5k_hw_channel(struct ath5k_hw *ah,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /*****************\</div><div class='ctx'>   PHY calibration</div><div class='ctx'> \*****************/</div><div class='ctx'> </div><div class='del'>-static s32 ath5k_hw_read_measured_noise_floor(struct ath5k_hw *ah)</div><div class='add'>+/**</div><div class='add'>+ * DOC: PHY Calibration routines</div><div class='add'>+ *</div><div class='add'>+ * Noise floor calibration: When we tell the hardware to</div><div class='add'>+ * perform a noise floor calibration by setting the</div><div class='add'>+ * AR5K_PHY_AGCCTL_NF bit on AR5K_PHY_AGCCTL, it will periodically</div><div class='add'>+ * sample-and-hold the minimum noise level seen at the antennas.</div><div class='add'>+ * This value is then stored in a ring buffer of recently measured</div><div class='add'>+ * noise floor values so we have a moving window of the last few</div><div class='add'>+ * samples. The median of the values in the history is then loaded</div><div class='add'>+ * into the hardware for its own use for RSSI and CCA measurements.</div><div class='add'>+ * This type of calibration doesn't interfere with traffic.</div><div class='add'>+ *</div><div class='add'>+ * AGC calibration: When we tell the hardware to perform</div><div class='add'>+ * an AGC (Automatic Gain Control) calibration by setting the</div><div class='add'>+ * AR5K_PHY_AGCCTL_CAL, hw disconnects the antennas and does</div><div class='add'>+ * a calibration on the DC offsets of ADCs. During this period</div><div class='add'>+ * rx/tx gets disabled so we have to deal with it on the driver</div><div class='add'>+ * part.</div><div class='add'>+ *</div><div class='add'>+ * I/Q calibration: When we tell the hardware to perform</div><div class='add'>+ * an I/Q calibration, it tries to correct I/Q imbalance and</div><div class='add'>+ * fix QAM constellation by sampling data from rxed frames.</div><div class='add'>+ * It doesn't interfere with traffic.</div><div class='add'>+ *</div><div class='add'>+ * For more infos on AGC and I/Q calibration check out patent doc</div><div class='add'>+ * #03/094463.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_read_measured_noise_floor() - Read measured NF from hw</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ */</div><div class='add'>+static s32</div><div class='add'>+ath5k_hw_read_measured_noise_floor(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	s32 val;</div><div class='ctx'> </div><div class='hunk'>@@ -1325,7 +1530,12 @@ static s32 ath5k_hw_read_measured_noise_floor(struct ath5k_hw *ah)</div><div class='ctx'> 	return sign_extend32(AR5K_REG_MS(val, AR5K_PHY_NF_MINCCA_PWR), 8);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath5k_hw_init_nfcal_hist(struct ath5k_hw *ah)</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_init_nfcal_hist() - Initialize NF calibration history buffer</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+ath5k_hw_init_nfcal_hist(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1334,6 +1544,11 @@ void ath5k_hw_init_nfcal_hist(struct ath5k_hw *ah)</div><div class='ctx'> 		ah-&gt;ah_nfcal_hist.nfval[i] = AR5K_TUNE_CCA_MAX_GOOD_VALUE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_update_nfcal_hist() - Update NF calibration history buffer</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @noise_floor: The NF we got from hw</div><div class='add'>+ */</div><div class='ctx'> static void ath5k_hw_update_nfcal_hist(struct ath5k_hw *ah, s16 noise_floor)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_nfcal_hist *hist = &amp;ah-&gt;ah_nfcal_hist;</div><div class='hunk'>@@ -1341,7 +1556,12 @@ static void ath5k_hw_update_nfcal_hist(struct ath5k_hw *ah, s16 noise_floor)</div><div class='ctx'> 	hist-&gt;nfval[hist-&gt;index] = noise_floor;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static s16 ath5k_hw_get_median_noise_floor(struct ath5k_hw *ah)</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_get_median_noise_floor() - Get median NF from history buffer</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ */</div><div class='add'>+static s16</div><div class='add'>+ath5k_hw_get_median_noise_floor(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	s16 sort[ATH5K_NF_CAL_HIST_MAX];</div><div class='ctx'> 	s16 tmp;</div><div class='hunk'>@@ -1364,18 +1584,16 @@ static s16 ath5k_hw_get_median_noise_floor(struct ath5k_hw *ah)</div><div class='ctx'> 	return sort[(ATH5K_NF_CAL_HIST_MAX - 1) / 2];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * When we tell the hardware to perform a noise floor calibration</div><div class='del'>- * by setting the AR5K_PHY_AGCCTL_NF bit, it will periodically</div><div class='del'>- * sample-and-hold the minimum noise level seen at the antennas.</div><div class='del'>- * This value is then stored in a ring buffer of recently measured</div><div class='del'>- * noise floor values so we have a moving window of the last few</div><div class='del'>- * samples.</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_update_noise_floor() - Update NF on hardware</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='del'>- * The median of the values in the history is then loaded into the</div><div class='del'>- * hardware for its own use for RSSI and CCA measurements.</div><div class='add'>+ * This is the main function we call to perform a NF calibration,</div><div class='add'>+ * it reads NF from hardware, calculates the median and updates</div><div class='add'>+ * NF on hw.</div><div class='ctx'>  */</div><div class='del'>-void ath5k_hw_update_noise_floor(struct ath5k_hw *ah)</div><div class='add'>+void</div><div class='add'>+ath5k_hw_update_noise_floor(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_eeprom_info *ee = &amp;ah-&gt;ah_capabilities.cap_eeprom;</div><div class='ctx'> 	u32 val;</div><div class='hunk'>@@ -1390,6 +1608,8 @@ void ath5k_hw_update_noise_floor(struct ath5k_hw *ah)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ah-&gt;ah_cal_mask |= AR5K_CALIBRATION_NF;</div><div class='add'>+</div><div class='ctx'> 	ee_mode = ath5k_eeprom_mode_from_channel(ah-&gt;ah_current_channel);</div><div class='ctx'> </div><div class='ctx'> 	/* completed NF calibration, test threshold */</div><div class='hunk'>@@ -1434,20 +1654,29 @@ void ath5k_hw_update_noise_floor(struct ath5k_hw *ah)</div><div class='ctx'> </div><div class='ctx'> 	ah-&gt;ah_noise_floor = nf;</div><div class='ctx'> </div><div class='add'>+	ah-&gt;ah_cal_mask &amp;= ~AR5K_CALIBRATION_NF;</div><div class='add'>+</div><div class='ctx'> 	ATH5K_DBG(ah, ATH5K_DEBUG_CALIBRATE,</div><div class='ctx'> 		"noise floor calibrated: %d\n", nf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Perform a PHY calibration on RF5110</div><div class='del'>- * -Fix BPSK/QAM Constellation (I/Q correction)</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_rf5110_calibrate() - Perform a PHY calibration on RF5110</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ *</div><div class='add'>+ * Do a complete PHY calibration (AGC + NF + I/Q) on RF5110</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,</div><div class='ctx'> 		struct ieee80211_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	u32 phy_sig, phy_agc, phy_sat, beacon;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (!(ah-&gt;ah_cal_mask &amp; AR5K_CALIBRATION_FULL))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Disable beacons and RX/TX queues, wait</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1456,7 +1685,7 @@ static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,</div><div class='ctx'> 	beacon = ath5k_hw_reg_read(ah, AR5K_BEACON_5210);</div><div class='ctx'> 	ath5k_hw_reg_write(ah, beacon &amp; ~AR5K_BEACON_ENABLE, AR5K_BEACON_5210);</div><div class='ctx'> </div><div class='del'>-	mdelay(2);</div><div class='add'>+	usleep_range(2000, 2500);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set the channel (with AGC turned off)</div><div class='hunk'>@@ -1469,7 +1698,7 @@ static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,</div><div class='ctx'> 	 * Activate PHY and wait</div><div class='ctx'> 	 */</div><div class='ctx'> 	ath5k_hw_reg_write(ah, AR5K_PHY_ACT_ENABLE, AR5K_PHY_ACT);</div><div class='del'>-	mdelay(1);</div><div class='add'>+	usleep_range(1000, 1500);</div><div class='ctx'> </div><div class='ctx'> 	AR5K_REG_DISABLE_BITS(ah, AR5K_PHY_AGC, AR5K_PHY_AGC_DISABLE);</div><div class='ctx'> </div><div class='hunk'>@@ -1506,7 +1735,7 @@ static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,</div><div class='ctx'> 	ath5k_hw_reg_write(ah, AR5K_PHY_RFSTG_DISABLE, AR5K_PHY_RFSTG);</div><div class='ctx'> 	AR5K_REG_DISABLE_BITS(ah, AR5K_PHY_AGC, AR5K_PHY_AGC_DISABLE);</div><div class='ctx'> </div><div class='del'>-	mdelay(1);</div><div class='add'>+	usleep_range(1000, 1500);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Enable calibration and wait until completion</div><div class='hunk'>@@ -1537,8 +1766,9 @@ static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Perform I/Q calibration on RF5111/5112 and newer chips</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_rf511x_iq_calibrate() - Perform I/Q calibration on RF5111 and newer</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> ath5k_hw_rf511x_iq_calibrate(struct ath5k_hw *ah)</div><div class='hunk'>@@ -1547,12 +1777,19 @@ ath5k_hw_rf511x_iq_calibrate(struct ath5k_hw *ah)</div><div class='ctx'> 	s32 iq_corr, i_coff, i_coffd, q_coff, q_coffd;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!ah-&gt;ah_calibration ||</div><div class='del'>-		ath5k_hw_reg_read(ah, AR5K_PHY_IQ) &amp; AR5K_PHY_IQ_RUN)</div><div class='del'>-		return 0;</div><div class='add'>+	/* Skip if I/Q calibration is not needed or if it's still running */</div><div class='add'>+	if (!ah-&gt;ah_iq_cal_needed)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	else if (ath5k_hw_reg_read(ah, AR5K_PHY_IQ) &amp; AR5K_PHY_IQ_RUN) {</div><div class='add'>+		ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_CALIBRATE,</div><div class='add'>+				"I/Q calibration still running");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Calibration has finished, get the results and re-run */</div><div class='del'>-	/* work around empty results which can apparently happen on 5212 */</div><div class='add'>+</div><div class='add'>+	/* Work around for empty results which can apparently happen on 5212:</div><div class='add'>+	 * Read registers up to 10 times until we get both i_pr and q_pwr */</div><div class='ctx'> 	for (i = 0; i &lt;= 10; i++) {</div><div class='ctx'> 		iq_corr = ath5k_hw_reg_read(ah, AR5K_PHY_IQRES_CAL_CORR);</div><div class='ctx'> 		i_pwr = ath5k_hw_reg_read(ah, AR5K_PHY_IQRES_CAL_PWR_I);</div><div class='hunk'>@@ -1570,9 +1807,13 @@ ath5k_hw_rf511x_iq_calibrate(struct ath5k_hw *ah)</div><div class='ctx'> 	else</div><div class='ctx'> 		q_coffd = q_pwr &gt;&gt; 7;</div><div class='ctx'> </div><div class='del'>-	/* protect against divide by 0 and loss of sign bits */</div><div class='add'>+	/* In case i_coffd became zero, cancel calibration</div><div class='add'>+	 * not only it's too small, it'll also result a divide</div><div class='add'>+	 * by zero later on. */</div><div class='ctx'> 	if (i_coffd == 0 || q_coffd &lt; 2)</div><div class='del'>-		return 0;</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+</div><div class='add'>+	/* Protect against loss of sign bits */</div><div class='ctx'> </div><div class='ctx'> 	i_coff = (-iq_corr) / i_coffd;</div><div class='ctx'> 	i_coff = clamp(i_coff, -32, 31); /* signed 6 bit */</div><div class='hunk'>@@ -1601,10 +1842,17 @@ ath5k_hw_rf511x_iq_calibrate(struct ath5k_hw *ah)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Perform a PHY calibration</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_phy_calibrate() - Perform a PHY calibration</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ *</div><div class='add'>+ * The main function we call from above to perform</div><div class='add'>+ * a short or full PHY calibration based on RF chip</div><div class='add'>+ * and current channel</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_phy_calibrate(struct ath5k_hw *ah,</div><div class='add'>+int</div><div class='add'>+ath5k_hw_phy_calibrate(struct ath5k_hw *ah,</div><div class='ctx'> 		struct ieee80211_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1613,10 +1861,43 @@ int ath5k_hw_phy_calibrate(struct ath5k_hw *ah,</div><div class='ctx'> 		return ath5k_hw_rf5110_calibrate(ah, channel);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath5k_hw_rf511x_iq_calibrate(ah);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_CALIBRATE,</div><div class='add'>+			"No I/Q correction performed (%uMHz)\n",</div><div class='add'>+			channel-&gt;center_freq);</div><div class='add'>+</div><div class='add'>+		/* Happens all the time if there is not much</div><div class='add'>+		 * traffic, consider it normal behaviour. */</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* On full calibration do an AGC calibration and</div><div class='add'>+	 * request a PAPD probe for gainf calibration if</div><div class='add'>+	 * needed */</div><div class='add'>+	if (ah-&gt;ah_cal_mask &amp; AR5K_CALIBRATION_FULL) {</div><div class='ctx'> </div><div class='del'>-	if ((ah-&gt;ah_radio == AR5K_RF5111 || ah-&gt;ah_radio == AR5K_RF5112) &amp;&amp;</div><div class='del'>-	    (channel-&gt;hw_value != AR5K_MODE_11B))</div><div class='del'>-		ath5k_hw_request_rfgain_probe(ah);</div><div class='add'>+		AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_AGCCTL,</div><div class='add'>+					AR5K_PHY_AGCCTL_CAL);</div><div class='add'>+</div><div class='add'>+		ret = ath5k_hw_register_timeout(ah, AR5K_PHY_AGCCTL,</div><div class='add'>+			AR5K_PHY_AGCCTL_CAL | AR5K_PHY_AGCCTL_NF,</div><div class='add'>+			0, false);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ATH5K_ERR(ah,</div><div class='add'>+				"gain calibration timeout (%uMHz)\n",</div><div class='add'>+				channel-&gt;center_freq);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((ah-&gt;ah_radio == AR5K_RF5111 ||</div><div class='add'>+			ah-&gt;ah_radio == AR5K_RF5112)</div><div class='add'>+			&amp;&amp; (channel-&gt;hw_value != AR5K_MODE_11B))</div><div class='add'>+			ath5k_hw_request_rfgain_probe(ah);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update noise floor</div><div class='add'>+	 * XXX: Only do this after AGC calibration */</div><div class='add'>+	if (!(ah-&gt;ah_cal_mask &amp; AR5K_CALIBRATION_NF))</div><div class='add'>+		ath5k_hw_update_noise_floor(ah);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1626,6 +1907,16 @@ int ath5k_hw_phy_calibrate(struct ath5k_hw *ah,</div><div class='ctx'> * Spur mitigation functions *</div><div class='ctx'> \***************************/</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_spur_mitigation_filter() - Configure SPUR filter</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ *</div><div class='add'>+ * This function gets called during PHY initialization to</div><div class='add'>+ * configure the spur filter for the given channel. Spur is noise</div><div class='add'>+ * generated due to "reflection" effects, for more information on this</div><div class='add'>+ * method check out patent US7643810</div><div class='add'>+ */</div><div class='ctx'> static void</div><div class='ctx'> ath5k_hw_set_spur_mitigation_filter(struct ath5k_hw *ah,</div><div class='ctx'> 				struct ieee80211_channel *channel)</div><div class='hunk'>@@ -1865,15 +2156,73 @@ ath5k_hw_set_spur_mitigation_filter(struct ath5k_hw *ah,</div><div class='ctx'> * Antenna control *</div><div class='ctx'> \*****************/</div><div class='ctx'> </div><div class='del'>-static void /*TODO:Boundary check*/</div><div class='add'>+/**</div><div class='add'>+ * DOC: Antenna control</div><div class='add'>+ *</div><div class='add'>+ * Hw supports up to 14 antennas ! I haven't found any card that implements</div><div class='add'>+ * that. The maximum number of antennas I've seen is up to 4 (2 for 2GHz and 2</div><div class='add'>+ * for 5GHz). Antenna 1 (MAIN) should be omnidirectional, 2 (AUX)</div><div class='add'>+ * omnidirectional or sectorial and antennas 3-14 sectorial (or directional).</div><div class='add'>+ *</div><div class='add'>+ * We can have a single antenna for RX and multiple antennas for TX.</div><div class='add'>+ * RX antenna is our "default" antenna (usually antenna 1) set on</div><div class='add'>+ * DEFAULT_ANTENNA register and TX antenna is set on each TX control descriptor</div><div class='add'>+ * (0 for automatic selection, 1 - 14 antenna number).</div><div class='add'>+ *</div><div class='add'>+ * We can let hw do all the work doing fast antenna diversity for both</div><div class='add'>+ * tx and rx or we can do things manually. Here are the options we have</div><div class='add'>+ * (all are bits of STA_ID1 register):</div><div class='add'>+ *</div><div class='add'>+ * AR5K_STA_ID1_DEFAULT_ANTENNA -&gt; When 0 is set as the TX antenna on TX</div><div class='add'>+ * control descriptor, use the default antenna to transmit or else use the last</div><div class='add'>+ * antenna on which we received an ACK.</div><div class='add'>+ *</div><div class='add'>+ * AR5K_STA_ID1_DESC_ANTENNA -&gt; Update default antenna after each TX frame to</div><div class='add'>+ * the antenna on which we got the ACK for that frame.</div><div class='add'>+ *</div><div class='add'>+ * AR5K_STA_ID1_RTS_DEF_ANTENNA -&gt; Use default antenna for RTS or else use the</div><div class='add'>+ * one on the TX descriptor.</div><div class='add'>+ *</div><div class='add'>+ * AR5K_STA_ID1_SELFGEN_DEF_ANT -&gt; Use default antenna for self generated frames</div><div class='add'>+ * (ACKs etc), or else use current antenna (the one we just used for TX).</div><div class='add'>+ *</div><div class='add'>+ * Using the above we support the following scenarios:</div><div class='add'>+ *</div><div class='add'>+ * AR5K_ANTMODE_DEFAULT -&gt; Hw handles antenna diversity etc automatically</div><div class='add'>+ *</div><div class='add'>+ * AR5K_ANTMODE_FIXED_A	-&gt; Only antenna A (MAIN) is present</div><div class='add'>+ *</div><div class='add'>+ * AR5K_ANTMODE_FIXED_B	-&gt; Only antenna B (AUX) is present</div><div class='add'>+ *</div><div class='add'>+ * AR5K_ANTMODE_SINGLE_AP -&gt; Sta locked on a single ap</div><div class='add'>+ *</div><div class='add'>+ * AR5K_ANTMODE_SECTOR_AP -&gt; AP with tx antenna set on tx desc</div><div class='add'>+ *</div><div class='add'>+ * AR5K_ANTMODE_SECTOR_STA -&gt; STA with tx antenna set on tx desc</div><div class='add'>+ *</div><div class='add'>+ * AR5K_ANTMODE_DEBUG Debug mode -A -&gt; Rx, B-&gt; Tx-</div><div class='add'>+ *</div><div class='add'>+ * Also note that when setting antenna to F on tx descriptor card inverts</div><div class='add'>+ * current tx antenna.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_def_antenna() - Set default rx antenna on AR5211/5212 and newer</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @ant: Antenna number</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='ctx'> ath5k_hw_set_def_antenna(struct ath5k_hw *ah, u8 ant)</div><div class='ctx'> {</div><div class='ctx'> 	if (ah-&gt;ah_version != AR5K_AR5210)</div><div class='ctx'> 		ath5k_hw_reg_write(ah, ant &amp; 0x7, AR5K_DEFAULT_ANTENNA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Enable/disable fast rx antenna diversity</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_fast_div() -  Enable/disable fast rx antenna diversity</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @ee_mode: One of enum ath5k_driver_mode</div><div class='add'>+ * @enable: True to enable, false to disable</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='ctx'> ath5k_hw_set_fast_div(struct ath5k_hw *ah, u8 ee_mode, bool enable)</div><div class='hunk'>@@ -1913,6 +2262,14 @@ ath5k_hw_set_fast_div(struct ath5k_hw *ah, u8 ee_mode, bool enable)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_antenna_switch() - Set up antenna switch table</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @ee_mode: One of enum ath5k_driver_mode</div><div class='add'>+ *</div><div class='add'>+ * Switch table comes from EEPROM and includes information on controlling</div><div class='add'>+ * the 2 antenna RX attenuators</div><div class='add'>+ */</div><div class='ctx'> void</div><div class='ctx'> ath5k_hw_set_antenna_switch(struct ath5k_hw *ah, u8 ee_mode)</div><div class='ctx'> {</div><div class='hunk'>@@ -1944,8 +2301,10 @@ ath5k_hw_set_antenna_switch(struct ath5k_hw *ah, u8 ee_mode)</div><div class='ctx'> 		AR5K_PHY_ANT_SWITCH_TABLE_1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set antenna operating mode</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_antenna_mode() -  Set antenna operating mode</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @ant_mode: One of enum ath5k_ant_mode</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='ctx'> ath5k_hw_set_antenna_mode(struct ath5k_hw *ah, u8 ant_mode)</div><div class='hunk'>@@ -2068,8 +2427,13 @@ ath5k_hw_set_antenna_mode(struct ath5k_hw *ah, u8 ant_mode)</div><div class='ctx'>  * Helper functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Do linear interpolation between two given (x, y) points</div><div class='add'>+/**</div><div class='add'>+ * ath5k_get_interpolated_value() - Get interpolated Y val between two points</div><div class='add'>+ * @target: X value of the middle point</div><div class='add'>+ * @x_left: X value of the left point</div><div class='add'>+ * @x_right: X value of the right point</div><div class='add'>+ * @y_left: Y value of the left point</div><div class='add'>+ * @y_right: Y value of the right point</div><div class='ctx'>  */</div><div class='ctx'> static s16</div><div class='ctx'> ath5k_get_interpolated_value(s16 target, s16 x_left, s16 x_right,</div><div class='hunk'>@@ -2096,13 +2460,18 @@ ath5k_get_interpolated_value(s16 target, s16 x_left, s16 x_right,</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Find vertical boundary (min pwr) for the linear PCDAC curve.</div><div class='add'>+/**</div><div class='add'>+ * ath5k_get_linear_pcdac_min() - Find vertical boundary (min pwr) for the</div><div class='add'>+ * linear PCDAC curve</div><div class='add'>+ * @stepL: Left array with y values (pcdac steps)</div><div class='add'>+ * @stepR: Right array with y values (pcdac steps)</div><div class='add'>+ * @pwrL: Left array with x values (power steps)</div><div class='add'>+ * @pwrR: Right array with x values (power steps)</div><div class='ctx'>  *</div><div class='ctx'>  * Since we have the top of the curve and we draw the line below</div><div class='ctx'>  * until we reach 1 (1 pcdac step) we need to know which point</div><div class='del'>- * (x value) that is so that we don't go below y axis and have negative</div><div class='del'>- * pcdac values when creating the curve, or fill the table with zeroes.</div><div class='add'>+ * (x value) that is so that we don't go below x axis and have negative</div><div class='add'>+ * pcdac values when creating the curve, or fill the table with zeros.</div><div class='ctx'>  */</div><div class='ctx'> static s16</div><div class='ctx'> ath5k_get_linear_pcdac_min(const u8 *stepL, const u8 *stepR,</div><div class='hunk'>@@ -2148,7 +2517,16 @@ ath5k_get_linear_pcdac_min(const u8 *stepL, const u8 *stepR,</div><div class='ctx'> 	return max(min_pwrL, min_pwrR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * ath5k_create_power_curve() - Create a Power to PDADC or PCDAC curve</div><div class='add'>+ * @pmin: Minimum power value (xmin)</div><div class='add'>+ * @pmax: Maximum power value (xmax)</div><div class='add'>+ * @pwr: Array of power steps (x values)</div><div class='add'>+ * @vpd: Array of matching PCDAC/PDADC steps (y values)</div><div class='add'>+ * @num_points: Number of provided points</div><div class='add'>+ * @vpd_table: Array to fill with the full PCDAC/PDADC values (y values)</div><div class='add'>+ * @type: One of enum ath5k_powertable_type (eeprom.h)</div><div class='add'>+ *</div><div class='ctx'>  * Interpolate (pwr,vpd) points to create a Power to PDADC or a</div><div class='ctx'>  * Power to PCDAC curve.</div><div class='ctx'>  *</div><div class='hunk'>@@ -2206,7 +2584,14 @@ ath5k_create_power_curve(s16 pmin, s16 pmax,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * ath5k_get_chan_pcal_surrounding_piers() - Get surrounding calibration piers</div><div class='add'>+ * for a given channel.</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ * @pcinfo_l: The &amp;struct ath5k_chan_pcal_info to put the left cal. pier</div><div class='add'>+ * @pcinfo_r: The &amp;struct ath5k_chan_pcal_info to put the right cal. pier</div><div class='add'>+ *</div><div class='ctx'>  * Get the surrounding per-channel power calibration piers</div><div class='ctx'>  * for a given frequency so that we can interpolate between</div><div class='ctx'>  * them and come up with an appropriate dataset for our current</div><div class='hunk'>@@ -2289,11 +2674,17 @@ done:</div><div class='ctx'> 	*pcinfo_r = &amp;pcinfo[idx_r];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * ath5k_get_rate_pcal_data() - Get the interpolated per-rate power</div><div class='add'>+ * calibration data</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw *ah,</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ * @rates: The &amp;struct ath5k_rate_pcal_info to fill</div><div class='add'>+ *</div><div class='ctx'>  * Get the surrounding per-rate power calibration data</div><div class='ctx'>  * for a given frequency and interpolate between power</div><div class='ctx'>  * values to set max target power supported by hw for</div><div class='del'>- * each rate.</div><div class='add'>+ * each rate on this frequency.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='ctx'> ath5k_get_rate_pcal_data(struct ath5k_hw *ah,</div><div class='hunk'>@@ -2381,7 +2772,11 @@ done:</div><div class='ctx'> 					rpinfo[idx_r].target_power_54);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * ath5k_get_max_ctl_power() - Get max edge power for a given frequency</div><div class='add'>+ * @ah: the &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ *</div><div class='ctx'>  * Get the max edge power for this channel if</div><div class='ctx'>  * we have such data from EEPROM's Conformance Test</div><div class='ctx'>  * Limits (CTL), and limit max power if needed.</div><div class='hunk'>@@ -2461,8 +2856,39 @@ ath5k_get_max_ctl_power(struct ath5k_hw *ah,</div><div class='ctx'>  * Power to PCDAC table functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Fill Power to PCDAC table on RF5111</div><div class='add'>+/**</div><div class='add'>+ * DOC: Power to PCDAC table functions</div><div class='add'>+ *</div><div class='add'>+ * For RF5111 we have an XPD -eXternal Power Detector- curve</div><div class='add'>+ * for each calibrated channel. Each curve has 0,5dB Power steps</div><div class='add'>+ * on x axis and PCDAC steps (offsets) on y axis and looks like an</div><div class='add'>+ * exponential function. To recreate the curve we read 11 points</div><div class='add'>+ * from eeprom (eeprom.c) and interpolate here.</div><div class='add'>+ *</div><div class='add'>+ * For RF5112 we have 4 XPD -eXternal Power Detector- curves</div><div class='add'>+ * for each calibrated channel on 0, -6, -12 and -18dBm but we only</div><div class='add'>+ * use the higher (3) and the lower (0) curves. Each curve again has 0.5dB</div><div class='add'>+ * power steps on x axis and PCDAC steps on y axis and looks like a</div><div class='add'>+ * linear function. To recreate the curve and pass the power values</div><div class='add'>+ * on hw, we get 4 points for xpd 0 (lower gain -&gt; max power)</div><div class='add'>+ * and 3 points for xpd 3 (higher gain -&gt; lower power) from eeprom (eeprom.c)</div><div class='add'>+ * and interpolate here.</div><div class='add'>+ *</div><div class='add'>+ * For a given channel we get the calibrated points (piers) for it or</div><div class='add'>+ * -if we don't have calibration data for this specific channel- from the</div><div class='add'>+ * available surrounding channels we have calibration data for, after we do a</div><div class='add'>+ * linear interpolation between them. Then since we have our calibrated points</div><div class='add'>+ * for this channel, we do again a linear interpolation between them to get the</div><div class='add'>+ * whole curve.</div><div class='add'>+ *</div><div class='add'>+ * We finally write the Y values of the curve(s) (the PCDAC values) on hw</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_fill_pwr_to_pcdac_table() - Fill Power to PCDAC table on RF5111</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @table_min: Minimum power (x min)</div><div class='add'>+ * @table_max: Maximum power (x max)</div><div class='ctx'>  *</div><div class='ctx'>  * No further processing is needed for RF5111, the only thing we have to</div><div class='ctx'>  * do is fill the values below and above calibration range since eeprom data</div><div class='hunk'>@@ -2503,10 +2929,14 @@ ath5k_fill_pwr_to_pcdac_table(struct ath5k_hw *ah, s16* table_min,</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Combine available XPD Curves and fill Linear Power to PCDAC table</div><div class='del'>- * on RF5112</div><div class='add'>+/**</div><div class='add'>+ * ath5k_combine_linear_pcdac_curves() - Combine available PCDAC Curves</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @table_min: Minimum power (x min)</div><div class='add'>+ * @table_max: Maximum power (x max)</div><div class='add'>+ * @pdcurves: Number of pd curves</div><div class='ctx'>  *</div><div class='add'>+ * Combine available XPD Curves and fill Linear Power to PCDAC table on RF5112</div><div class='ctx'>  * RFX112 can have up to 2 curves (one for low txpower range and one for</div><div class='ctx'>  * higher txpower range). We need to put them both on pcdac_out and place</div><div class='ctx'>  * them in the correct location. In case we only have one curve available</div><div class='hunk'>@@ -2608,7 +3038,10 @@ ath5k_combine_linear_pcdac_curves(struct ath5k_hw *ah, s16* table_min,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Write PCDAC values on hw */</div><div class='add'>+/**</div><div class='add'>+ * ath5k_write_pcdac_table() - Write the PCDAC values on hw</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ */</div><div class='ctx'> static void</div><div class='ctx'> ath5k_write_pcdac_table(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='hunk'>@@ -2631,9 +3064,32 @@ ath5k_write_pcdac_table(struct ath5k_hw *ah)</div><div class='ctx'>  * Power to PDADC table functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set the gain boundaries and create final Power to PDADC table</div><div class='add'>+/**</div><div class='add'>+ * DOC: Power to PDADC table functions</div><div class='add'>+ *</div><div class='add'>+ * For RF2413 and later we have a Power to PDADC table (Power Detector)</div><div class='add'>+ * instead of a PCDAC (Power Control) and 4 pd gain curves for each</div><div class='add'>+ * calibrated channel. Each curve has power on x axis in 0.5 db steps and</div><div class='add'>+ * PDADC steps on y axis and looks like an exponential function like the</div><div class='add'>+ * RF5111 curve.</div><div class='add'>+ *</div><div class='add'>+ * To recreate the curves we read the points from eeprom (eeprom.c)</div><div class='add'>+ * and interpolate here. Note that in most cases only 2 (higher and lower)</div><div class='add'>+ * curves are used (like RF5112) but vendors have the opportunity to include</div><div class='add'>+ * all 4 curves on eeprom. The final curve (higher power) has an extra</div><div class='add'>+ * point for better accuracy like RF5112.</div><div class='ctx'>  *</div><div class='add'>+ * The process is similar to what we do above for RF5111/5112</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_combine_pwr_to_pdadc_curves() - Combine the various PDADC curves</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @pwr_min: Minimum power (x min)</div><div class='add'>+ * @pwr_max: Maximum power (x max)</div><div class='add'>+ * @pdcurves: Number of available curves</div><div class='add'>+ *</div><div class='add'>+ * Combine the various pd curves and create the final Power to PDADC table</div><div class='ctx'>  * We can have up to 4 pd curves, we need to do a similar process</div><div class='ctx'>  * as we do for RF5112. This time we don't have an edge_flag but we</div><div class='ctx'>  * set the gain boundaries on a separate register.</div><div class='hunk'>@@ -2757,7 +3213,11 @@ ath5k_combine_pwr_to_pdadc_curves(struct ath5k_hw *ah,</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Write PDADC values on hw */</div><div class='add'>+/**</div><div class='add'>+ * ath5k_write_pwr_to_pdadc_table() - Write the PDADC values on hw</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @ee_mode: One of enum ath5k_driver_mode</div><div class='add'>+ */</div><div class='ctx'> static void</div><div class='ctx'> ath5k_write_pwr_to_pdadc_table(struct ath5k_hw *ah, u8 ee_mode)</div><div class='ctx'> {</div><div class='hunk'>@@ -2814,7 +3274,13 @@ ath5k_write_pwr_to_pdadc_table(struct ath5k_hw *ah, u8 ee_mode)</div><div class='ctx'>  * Common code for PCDAC/PDADC tables</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * ath5k_setup_channel_powertable() - Set up power table for this channel</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ * @ee_mode: One of enum ath5k_driver_mode</div><div class='add'>+ * @type: One of enum ath5k_powertable_type (eeprom.h)</div><div class='add'>+ *</div><div class='ctx'>  * This is the main function that uses all of the above</div><div class='ctx'>  * to set PCDAC/PDADC table on hw for the current channel.</div><div class='ctx'>  * This table is used for tx power calibration on the baseband,</div><div class='hunk'>@@ -3012,7 +3478,12 @@ ath5k_setup_channel_powertable(struct ath5k_hw *ah,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Write power table for current channel to hw */</div><div class='add'>+/**</div><div class='add'>+ * ath5k_write_channel_powertable() - Set power table for current channel on hw</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @ee_mode: One of enum ath5k_driver_mode</div><div class='add'>+ * @type: One of enum ath5k_powertable_type (eeprom.h)</div><div class='add'>+ */</div><div class='ctx'> static void</div><div class='ctx'> ath5k_write_channel_powertable(struct ath5k_hw *ah, u8 ee_mode, u8 type)</div><div class='ctx'> {</div><div class='hunk'>@@ -3022,28 +3493,36 @@ ath5k_write_channel_powertable(struct ath5k_hw *ah, u8 ee_mode, u8 type)</div><div class='ctx'> 		ath5k_write_pcdac_table(ah);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Per-rate tx power setting</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Per-rate tx power setting</div><div class='ctx'>  *</div><div class='del'>- * This is the code that sets the desired tx power (below</div><div class='add'>+ * This is the code that sets the desired tx power limit (below</div><div class='ctx'>  * maximum) on hw for each rate (we also have TPC that sets</div><div class='del'>- * power per packet). We do that by providing an index on the</div><div class='del'>- * PCDAC/PDADC table we set up.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set rate power table</div><div class='add'>+ * power per packet type). We do that by providing an index on the</div><div class='add'>+ * PCDAC/PDADC table we set up above, for each rate.</div><div class='ctx'>  *</div><div class='ctx'>  * For now we only limit txpower based on maximum tx power</div><div class='del'>- * supported by hw (what's inside rate_info). We need to limit</div><div class='del'>- * this even more, based on regulatory domain etc.</div><div class='add'>+ * supported by hw (what's inside rate_info) + conformance test</div><div class='add'>+ * limits. We need to limit this even more, based on regulatory domain</div><div class='add'>+ * etc to be safe. Normally this is done from above so we don't care</div><div class='add'>+ * here, all we care is that the tx power we set will be O.K.</div><div class='add'>+ * for the hw (e.g. won't create noise on PA etc).</div><div class='ctx'>  *</div><div class='del'>- * Rate power table contains indices to PCDAC/PDADC table (0.5dB steps)</div><div class='del'>- * and is indexed as follows:</div><div class='add'>+ * Rate power table contains indices to PCDAC/PDADC table (0.5dB steps -</div><div class='add'>+ * x values) and is indexed as follows:</div><div class='ctx'>  * rates[0] - rates[7] -&gt; OFDM rates</div><div class='ctx'>  * rates[8] - rates[14] -&gt; CCK rates</div><div class='ctx'>  * rates[15] -&gt; XR rates (they all have the same power)</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ath5k_setup_rate_powertable() - Set up rate power table for a given tx power</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @max_pwr: The maximum tx power requested in 0.5dB steps</div><div class='add'>+ * @rate_info: The &amp;struct ath5k_rate_pcal_info to fill</div><div class='add'>+ * @ee_mode: One of enum ath5k_driver_mode</div><div class='add'>+ */</div><div class='ctx'> static void</div><div class='ctx'> ath5k_setup_rate_powertable(struct ath5k_hw *ah, u16 max_pwr,</div><div class='ctx'> 			struct ath5k_rate_pcal_info *rate_info,</div><div class='hunk'>@@ -3114,8 +3593,14 @@ ath5k_setup_rate_powertable(struct ath5k_hw *ah, u16 max_pwr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set transmission power</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_txpower() - Set transmission power limit for a given channel</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ * @txpower: Requested tx power in 0.5dB steps</div><div class='add'>+ *</div><div class='add'>+ * Combines all of the above to set the requested tx power limit</div><div class='add'>+ * on hw.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel,</div><div class='hunk'>@@ -3233,7 +3718,16 @@ ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath5k_hw_set_txpower_limit(struct ath5k_hw *ah, u8 txpower)</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_txpower_limit() - Set txpower limit for the current channel</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @txpower: The requested tx power limit in 0.5dB steps</div><div class='add'>+ *</div><div class='add'>+ * This function provides access to ath5k_hw_txpower to the driver in</div><div class='add'>+ * case user or an application changes it while PHY is running.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+ath5k_hw_set_txpower_limit(struct ath5k_hw *ah, u8 txpower)</div><div class='ctx'> {</div><div class='ctx'> 	ATH5K_DBG(ah, ATH5K_DEBUG_TXPOWER,</div><div class='ctx'> 		"changing txpower to %d\n", txpower);</div><div class='hunk'>@@ -3241,11 +3735,26 @@ int ath5k_hw_set_txpower_limit(struct ath5k_hw *ah, u8 txpower)</div><div class='ctx'> 	return ath5k_hw_txpower(ah, ah-&gt;ah_current_channel, txpower);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /*************\</div><div class='ctx'>  Init function</div><div class='ctx'> \*************/</div><div class='ctx'> </div><div class='del'>-int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel,</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_phy_init() - Initialize PHY</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The @struct ieee80211_channel</div><div class='add'>+ * @mode: One of enum ath5k_driver_mode</div><div class='add'>+ * @fast: Try a fast channel switch instead</div><div class='add'>+ *</div><div class='add'>+ * This is the main function used during reset to initialize PHY</div><div class='add'>+ * or do a fast channel change if possible.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: Do not call this one from the driver, it assumes PHY is in a</div><div class='add'>+ * warm reset state !</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel,</div><div class='ctx'> 		      u8 mode, bool fast)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_channel *curr_channel;</div><div class='hunk'>@@ -3355,7 +3864,7 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel,</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		mdelay(1);</div><div class='add'>+		usleep_range(1000, 1500);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Write RF buffer</div><div class='hunk'>@@ -3376,10 +3885,10 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	} else if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='del'>-		mdelay(1);</div><div class='add'>+		usleep_range(1000, 1500);</div><div class='ctx'> 		/* Disable phy and wait */</div><div class='ctx'> 		ath5k_hw_reg_write(ah, AR5K_PHY_ACT_DISABLE, AR5K_PHY_ACT);</div><div class='del'>-		mdelay(1);</div><div class='add'>+		usleep_range(1000, 1500);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set channel on PHY */</div><div class='hunk'>@@ -3405,7 +3914,7 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel,</div><div class='ctx'> 	for (i = 0; i &lt;= 20; i++) {</div><div class='ctx'> 		if (!(ath5k_hw_reg_read(ah, AR5K_PHY_ADC_TEST) &amp; 0x10))</div><div class='ctx'> 			break;</div><div class='del'>-		udelay(200);</div><div class='add'>+		usleep_range(200, 250);</div><div class='ctx'> 	}</div><div class='ctx'> 	ath5k_hw_reg_write(ah, phy_tst1, AR5K_PHY_TST1);</div><div class='ctx'> </div><div class='hunk'>@@ -3433,9 +3942,9 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel,</div><div class='ctx'> </div><div class='ctx'> 	/* At the same time start I/Q calibration for QAM constellation</div><div class='ctx'> 	 * -no need for CCK- */</div><div class='del'>-	ah-&gt;ah_calibration = false;</div><div class='add'>+	ah-&gt;ah_iq_cal_needed = false;</div><div class='ctx'> 	if (!(mode == AR5K_MODE_11B)) {</div><div class='del'>-		ah-&gt;ah_calibration = true;</div><div class='add'>+		ah-&gt;ah_iq_cal_needed = true;</div><div class='ctx'> 		AR5K_REG_WRITE_BITS(ah, AR5K_PHY_IQ,</div><div class='ctx'> 				AR5K_PHY_IQ_CAL_NUM_LOG_MAX, 15);</div><div class='ctx'> 		AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_IQ,</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/qcu.c b/drivers/net/wireless/ath/ath5k/qcu.c<br/>index 776654228eaa..30b50f934172 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/qcu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/qcu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/qcu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/qcu.c</a></div><div class='hunk'>@@ -17,23 +17,48 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /********************************************\</div><div class='del'>-Queue Control Unit, DFS Control Unit Functions</div><div class='add'>+Queue Control Unit, DCF Control Unit Functions</div><div class='ctx'> \********************************************/</div><div class='ctx'> </div><div class='ctx'> #include "ath5k.h"</div><div class='ctx'> #include "reg.h"</div><div class='ctx'> #include "debug.h"</div><div class='add'>+#include &lt;linux/log2.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Queue Control Unit (QCU)/DCF Control Unit (DCU) functions</div><div class='add'>+ *</div><div class='add'>+ * Here we setup parameters for the 12 available TX queues. Note that</div><div class='add'>+ * on the various registers we can usually only map the first 10 of them so</div><div class='add'>+ * basically we have 10 queues to play with. Each queue has a matching</div><div class='add'>+ * QCU that controls when the queue will get triggered and multiple QCUs</div><div class='add'>+ * can be mapped to a single DCU that controls the various DFS parameters</div><div class='add'>+ * for the various queues. In our setup we have a 1:1 mapping between QCUs</div><div class='add'>+ * and DCUs allowing us to have different DFS settings for each queue.</div><div class='add'>+ *</div><div class='add'>+ * When a frame goes into a TX queue, QCU decides when it'll trigger a</div><div class='add'>+ * transmission based on various criteria (such as how many data we have inside</div><div class='add'>+ * it's buffer or -if it's a beacon queue- if it's time to fire up the queue</div><div class='add'>+ * based on TSF etc), DCU adds backoff, IFSes etc and then a scheduler</div><div class='add'>+ * (arbitrator) decides the priority of each QCU based on it's configuration</div><div class='add'>+ * (e.g. beacons are always transmitted when they leave DCU bypassing all other</div><div class='add'>+ * frames from other queues waiting to be transmitted). After a frame leaves</div><div class='add'>+ * the DCU it goes to PCU for further processing and then to PHY for</div><div class='add'>+ * the actual transmission.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /******************\</div><div class='ctx'> * Helper functions *</div><div class='ctx'> \******************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Get number of pending frames</div><div class='del'>- * for a specific queue [5211+]</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_num_tx_pending() - Get number of pending frames for a  given queue</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @queue: One of enum ath5k_tx_queue_id</div><div class='ctx'>  */</div><div class='del'>-u32 ath5k_hw_num_tx_pending(struct ath5k_hw *ah, unsigned int queue)</div><div class='add'>+u32</div><div class='add'>+ath5k_hw_num_tx_pending(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> {</div><div class='ctx'> 	u32 pending;</div><div class='ctx'> 	AR5K_ASSERT_ENTRY(queue, ah-&gt;ah_capabilities.cap_queues.q_tx_num);</div><div class='hunk'>@@ -58,10 +83,13 @@ u32 ath5k_hw_num_tx_pending(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> 	return pending;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set a transmit queue inactive</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_release_tx_queue() - Set a transmit queue inactive</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @queue: One of enum ath5k_tx_queue_id</div><div class='ctx'>  */</div><div class='del'>-void ath5k_hw_release_tx_queue(struct ath5k_hw *ah, unsigned int queue)</div><div class='add'>+void</div><div class='add'>+ath5k_hw_release_tx_queue(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> {</div><div class='ctx'> 	if (WARN_ON(queue &gt;= ah-&gt;ah_capabilities.cap_queues.q_tx_num))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -72,34 +100,56 @@ void ath5k_hw_release_tx_queue(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> 	AR5K_Q_DISABLE_BITS(ah-&gt;ah_txq_status, queue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * ath5k_cw_validate() - Make sure the given cw is valid</div><div class='add'>+ * @cw_req: The contention window value to check</div><div class='add'>+ *</div><div class='ctx'>  * Make sure cw is a power of 2 minus 1 and smaller than 1024</div><div class='ctx'>  */</div><div class='del'>-static u16 ath5k_cw_validate(u16 cw_req)</div><div class='add'>+static u16</div><div class='add'>+ath5k_cw_validate(u16 cw_req)</div><div class='ctx'> {</div><div class='del'>-	u32 cw = 1;</div><div class='ctx'> 	cw_req = min(cw_req, (u16)1023);</div><div class='ctx'> </div><div class='del'>-	while (cw &lt; cw_req)</div><div class='del'>-		cw = (cw &lt;&lt; 1) | 1;</div><div class='add'>+	/* Check if cw_req + 1 a power of 2 */</div><div class='add'>+	if (is_power_of_2(cw_req + 1))</div><div class='add'>+		return cw_req;</div><div class='ctx'> </div><div class='del'>-	return cw;</div><div class='add'>+	/* Check if cw_req is a power of 2 */</div><div class='add'>+	if (is_power_of_2(cw_req))</div><div class='add'>+		return cw_req - 1;</div><div class='add'>+</div><div class='add'>+	/* If none of the above is correct</div><div class='add'>+	 * find the closest power of 2 */</div><div class='add'>+	cw_req = (u16) roundup_pow_of_two(cw_req) - 1;</div><div class='add'>+</div><div class='add'>+	return cw_req;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Get properties for a transmit queue</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_get_tx_queueprops() - Get properties for a transmit queue</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @queue: One of enum ath5k_tx_queue_id</div><div class='add'>+ * @queue_info: The &amp;struct ath5k_txq_info to fill</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_get_tx_queueprops(struct ath5k_hw *ah, int queue,</div><div class='add'>+int</div><div class='add'>+ath5k_hw_get_tx_queueprops(struct ath5k_hw *ah, int queue,</div><div class='ctx'> 		struct ath5k_txq_info *queue_info)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(queue_info, &amp;ah-&gt;ah_txq[queue], sizeof(struct ath5k_txq_info));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set properties for a transmit queue</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_tx_queueprops() - Set properties for a transmit queue</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @queue: One of enum ath5k_tx_queue_id</div><div class='add'>+ * @qinfo: The &amp;struct ath5k_txq_info to use</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success or -EIO if queue is inactive</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_set_tx_queueprops(struct ath5k_hw *ah, int queue,</div><div class='add'>+int</div><div class='add'>+ath5k_hw_set_tx_queueprops(struct ath5k_hw *ah, int queue,</div><div class='ctx'> 				const struct ath5k_txq_info *qinfo)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_txq_info *qi;</div><div class='hunk'>@@ -139,10 +189,16 @@ int ath5k_hw_set_tx_queueprops(struct ath5k_hw *ah, int queue,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Initialize a transmit queue</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_setup_tx_queue() - Initialize a transmit queue</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @queue_type: One of enum ath5k_tx_queue</div><div class='add'>+ * @queue_info: The &amp;struct ath5k_txq_info to use</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, -EINVAL on invalid arguments</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_setup_tx_queue(struct ath5k_hw *ah, enum ath5k_tx_queue queue_type,</div><div class='add'>+int</div><div class='add'>+ath5k_hw_setup_tx_queue(struct ath5k_hw *ah, enum ath5k_tx_queue queue_type,</div><div class='ctx'> 		struct ath5k_txq_info *queue_info)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int queue;</div><div class='hunk'>@@ -217,10 +273,16 @@ int ath5k_hw_setup_tx_queue(struct ath5k_hw *ah, enum ath5k_tx_queue queue_type,</div><div class='ctx'> * Single QCU/DCU initialization *</div><div class='ctx'> \*******************************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set tx retry limits on DCU</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_tx_retry_limits() - Set tx retry limits on DCU</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @queue: One of enum ath5k_tx_queue_id</div><div class='add'>+ *</div><div class='add'>+ * This function is used when initializing a queue, to set</div><div class='add'>+ * retry limits based on ah-&gt;ah_retry_* and the chipset used.</div><div class='ctx'>  */</div><div class='del'>-void ath5k_hw_set_tx_retry_limits(struct ath5k_hw *ah,</div><div class='add'>+void</div><div class='add'>+ath5k_hw_set_tx_retry_limits(struct ath5k_hw *ah,</div><div class='ctx'> 				  unsigned int queue)</div><div class='ctx'> {</div><div class='ctx'> 	/* Single data queue on AR5210 */</div><div class='hunk'>@@ -255,15 +317,15 @@ void ath5k_hw_set_tx_retry_limits(struct ath5k_hw *ah,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_reset_tx_queue - Initialize a single hw queue</div><div class='add'>+ * ath5k_hw_reset_tx_queue() - Initialize a single hw queue</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @queue: One of enum ath5k_tx_queue_id</div><div class='ctx'>  *</div><div class='del'>- * @ah The &amp;struct ath5k_hw</div><div class='del'>- * @queue The hw queue number</div><div class='del'>- *</div><div class='del'>- * Set DFS properties for the given transmit queue on DCU</div><div class='add'>+ * Set DCF properties for the given transmit queue on DCU</div><div class='ctx'>  * and configures all queue-specific parameters.</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)</div><div class='add'>+int</div><div class='add'>+ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_txq_info *tq = &amp;ah-&gt;ah_txq[queue];</div><div class='ctx'> </div><div class='hunk'>@@ -491,10 +553,9 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)</div><div class='ctx'> \**************************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_set_ifs_intervals  - Set global inter-frame spaces on DCU</div><div class='del'>- *</div><div class='del'>- * @ah The &amp;struct ath5k_hw</div><div class='del'>- * @slot_time Slot time in us</div><div class='add'>+ * ath5k_hw_set_ifs_intervals()  - Set global inter-frame spaces on DCU</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @slot_time: Slot time in us</div><div class='ctx'>  *</div><div class='ctx'>  * Sets the global IFS intervals on DCU (also works on AR5210) for</div><div class='ctx'>  * the given slot time and the current bwmode.</div><div class='hunk'>@@ -597,7 +658,15 @@ int ath5k_hw_set_ifs_intervals(struct ath5k_hw *ah, unsigned int slot_time)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int ath5k_hw_init_queues(struct ath5k_hw *ah)</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_init_queues() - Initialize tx queues</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ *</div><div class='add'>+ * Initializes all tx queues based on information on</div><div class='add'>+ * ah-&gt;ah_txq* set by the driver</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+ath5k_hw_init_queues(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/reg.h b/drivers/net/wireless/ath/ath5k/reg.h<br/>index f5c1000045d3..0ea1608b47fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/reg.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/reg.h</a></div><div class='hunk'>@@ -280,6 +280,10 @@</div><div class='ctx'>  * 5211/5212 we have one primary and 4 secondary registers.</div><div class='ctx'>  * So we have AR5K_ISR for 5210 and AR5K_PISR /SISRx for 5211/5212.</div><div class='ctx'>  * Most of these bits are common for all chipsets.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: On 5211+ TXOK, TXDESC, TXERR, TXEOL and TXURN contain</div><div class='add'>+ * the logical OR from per-queue interrupt bits found on SISR registers</div><div class='add'>+ * (see below).</div><div class='ctx'>  */</div><div class='ctx'> #define AR5K_ISR		0x001c			/* Register Address [5210] */</div><div class='ctx'> #define AR5K_PISR		0x0080			/* Register Address [5211+] */</div><div class='hunk'>@@ -292,7 +296,10 @@</div><div class='ctx'> #define AR5K_ISR_TXOK		0x00000040	/* Frame successfully transmitted */</div><div class='ctx'> #define AR5K_ISR_TXDESC		0x00000080	/* TX descriptor request */</div><div class='ctx'> #define AR5K_ISR_TXERR		0x00000100	/* Transmit error */</div><div class='del'>-#define AR5K_ISR_TXNOFRM	0x00000200	/* No frame transmitted (transmit timeout) */</div><div class='add'>+#define AR5K_ISR_TXNOFRM	0x00000200	/* No frame transmitted (transmit timeout)</div><div class='add'>+						 * NOTE: We don't have per-queue info for this</div><div class='add'>+						 * one, but we can enable it per-queue through</div><div class='add'>+						 * TXNOFRM_QCU field on TXNOFRM register */</div><div class='ctx'> #define AR5K_ISR_TXEOL		0x00000400	/* Empty TX descriptor */</div><div class='ctx'> #define AR5K_ISR_TXURN		0x00000800	/* Transmit FIFO underrun */</div><div class='ctx'> #define AR5K_ISR_MIB		0x00001000	/* Update MIB counters */</div><div class='hunk'>@@ -302,21 +309,29 @@</div><div class='ctx'> #define AR5K_ISR_SWBA		0x00010000	/* Software beacon alert */</div><div class='ctx'> #define AR5K_ISR_BRSSI		0x00020000	/* Beacon rssi below threshold (?) */</div><div class='ctx'> #define AR5K_ISR_BMISS		0x00040000	/* Beacon missed */</div><div class='del'>-#define AR5K_ISR_HIUERR		0x00080000	/* Host Interface Unit error [5211+] */</div><div class='add'>+#define AR5K_ISR_HIUERR		0x00080000	/* Host Interface Unit error [5211+]</div><div class='add'>+						 * 'or' of MCABT, SSERR, DPERR from SISR2 */</div><div class='ctx'> #define AR5K_ISR_BNR		0x00100000	/* Beacon not ready [5211+] */</div><div class='ctx'> #define AR5K_ISR_MCABT		0x00100000	/* Master Cycle Abort [5210] */</div><div class='ctx'> #define AR5K_ISR_RXCHIRP	0x00200000	/* CHIRP Received [5212+] */</div><div class='ctx'> #define AR5K_ISR_SSERR		0x00200000	/* Signaled System Error [5210] */</div><div class='del'>-#define AR5K_ISR_DPERR		0x00400000	/* Det par Error (?) [5210] */</div><div class='add'>+#define AR5K_ISR_DPERR		0x00400000	/* Bus parity error [5210] */</div><div class='ctx'> #define AR5K_ISR_RXDOPPLER	0x00400000	/* Doppler chirp received [5212+] */</div><div class='ctx'> #define AR5K_ISR_TIM		0x00800000	/* [5211+] */</div><div class='del'>-#define AR5K_ISR_BCNMISC	0x00800000	/* 'or' of TIM, CAB_END, DTIM_SYNC, BCN_TIMEOUT,</div><div class='del'>-						CAB_TIMEOUT and DTIM bits from SISR2 [5212+] */</div><div class='add'>+#define AR5K_ISR_BCNMISC	0x00800000	/* Misc beacon related interrupt</div><div class='add'>+						 * 'or' of TIM, CAB_END, DTIM_SYNC, BCN_TIMEOUT,</div><div class='add'>+						 * CAB_TIMEOUT and DTIM bits from SISR2 [5212+] */</div><div class='ctx'> #define AR5K_ISR_GPIO		0x01000000	/* GPIO (rf kill) */</div><div class='ctx'> #define AR5K_ISR_QCBRORN	0x02000000	/* QCU CBR overrun [5211+] */</div><div class='ctx'> #define AR5K_ISR_QCBRURN	0x04000000	/* QCU CBR underrun [5211+] */</div><div class='ctx'> #define AR5K_ISR_QTRIG		0x08000000	/* QCU scheduling trigger [5211+] */</div><div class='ctx'> </div><div class='add'>+#define	AR5K_ISR_BITS_FROM_SISRS	(AR5K_ISR_TXOK | AR5K_ISR_TXDESC |\</div><div class='add'>+					AR5K_ISR_TXERR | AR5K_ISR_TXEOL |\</div><div class='add'>+					AR5K_ISR_TXURN | AR5K_ISR_HIUERR |\</div><div class='add'>+					AR5K_ISR_BCNMISC | AR5K_ISR_QCBRORN |\</div><div class='add'>+					AR5K_ISR_QCBRURN | AR5K_ISR_QTRIG)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Secondary status registers [5211+] (0 - 4)</div><div class='ctx'>  *</div><div class='hunk'>@@ -347,7 +362,7 @@</div><div class='ctx'> #define	AR5K_SISR2_BCN_TIMEOUT	0x08000000	/* Beacon Timeout [5212+] */</div><div class='ctx'> #define	AR5K_SISR2_CAB_TIMEOUT	0x10000000	/* CAB Timeout [5212+] */</div><div class='ctx'> #define	AR5K_SISR2_DTIM		0x20000000	/* [5212+] */</div><div class='del'>-#define	AR5K_SISR2_TSFOOR	0x80000000	/* TSF OOR (?) */</div><div class='add'>+#define	AR5K_SISR2_TSFOOR	0x80000000	/* TSF Out of range */</div><div class='ctx'> </div><div class='ctx'> #define AR5K_SISR3		0x0090			/* Register Address [5211+] */</div><div class='ctx'> #define AR5K_SISR3_QCBRORN	0x000003ff	/* Mask for QCBRORN */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c<br/>index 2abac257b4b4..250db40b751d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/reset.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/reset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/reset.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/reset.c</a></div><div class='hunk'>@@ -19,9 +19,9 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/*****************************\</div><div class='del'>-  Reset functions and helpers</div><div class='del'>-\*****************************/</div><div class='add'>+/****************************\</div><div class='add'>+  Reset function and helpers</div><div class='add'>+\****************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -33,14 +33,36 @@</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * DOC: Reset function and helpers</div><div class='add'>+ *</div><div class='add'>+ * Here we implement the main reset routine, used to bring the card</div><div class='add'>+ * to a working state and ready to receive. We also handle routines</div><div class='add'>+ * that don't fit on other places such as clock, sleep and power control</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /******************\</div><div class='ctx'> * Helper functions *</div><div class='ctx'> \******************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Check if a register write has been completed</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_register_timeout() - Poll a register for a flag/field change</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @reg: The register to read</div><div class='add'>+ * @flag: The flag/field to check on the register</div><div class='add'>+ * @val: The field value we expect (if we check a field)</div><div class='add'>+ * @is_set: Instead of checking if the flag got cleared, check if it got set</div><div class='add'>+ *</div><div class='add'>+ * Some registers contain flags that indicate that an operation is</div><div class='add'>+ * running. We use this function to poll these registers and check</div><div class='add'>+ * if these flags get cleared. We also use it to poll a register</div><div class='add'>+ * field (containing multiple flags) until it gets a specific value.</div><div class='add'>+ *</div><div class='add'>+ * Returns -EAGAIN if we exceeded AR5K_TUNE_REGISTER_TIMEOUT * 15us or 0</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_register_timeout(struct ath5k_hw *ah, u32 reg, u32 flag, u32 val,</div><div class='add'>+int</div><div class='add'>+ath5k_hw_register_timeout(struct ath5k_hw *ah, u32 reg, u32 flag, u32 val,</div><div class='ctx'> 			      bool is_set)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -64,35 +86,48 @@ int ath5k_hw_register_timeout(struct ath5k_hw *ah, u32 reg, u32 flag, u32 val,</div><div class='ctx'> \*************************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_htoclock - Translate usec to hw clock units</div><div class='del'>- *</div><div class='add'>+ * ath5k_hw_htoclock() - Translate usec to hw clock units</div><div class='ctx'>  * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @usec: value in microseconds</div><div class='add'>+ *</div><div class='add'>+ * Translate usecs to hw clock units based on the current</div><div class='add'>+ * hw clock rate.</div><div class='add'>+ *</div><div class='add'>+ * Returns number of clock units</div><div class='ctx'>  */</div><div class='del'>-unsigned int ath5k_hw_htoclock(struct ath5k_hw *ah, unsigned int usec)</div><div class='add'>+unsigned int</div><div class='add'>+ath5k_hw_htoclock(struct ath5k_hw *ah, unsigned int usec)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath5k_hw_common(ah);</div><div class='ctx'> 	return usec * common-&gt;clockrate;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_clocktoh - Translate hw clock units to usec</div><div class='add'>+ * ath5k_hw_clocktoh() - Translate hw clock units to usec</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  * @clock: value in hw clock units</div><div class='add'>+ *</div><div class='add'>+ * Translate hw clock units to usecs based on the current</div><div class='add'>+ * hw clock rate.</div><div class='add'>+ *</div><div class='add'>+ * Returns number of usecs</div><div class='ctx'>  */</div><div class='del'>-unsigned int ath5k_hw_clocktoh(struct ath5k_hw *ah, unsigned int clock)</div><div class='add'>+unsigned int</div><div class='add'>+ath5k_hw_clocktoh(struct ath5k_hw *ah, unsigned int clock)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath5k_hw_common(ah);</div><div class='ctx'> 	return clock / common-&gt;clockrate;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ath5k_hw_init_core_clock - Initialize core clock</div><div class='del'>- *</div><div class='del'>- * @ah The &amp;struct ath5k_hw</div><div class='add'>+ * ath5k_hw_init_core_clock() - Initialize core clock</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='del'>- * Initialize core clock parameters (usec, usec32, latencies etc).</div><div class='add'>+ * Initialize core clock parameters (usec, usec32, latencies etc),</div><div class='add'>+ * based on current bwmode and chipset properties.</div><div class='ctx'>  */</div><div class='del'>-static void ath5k_hw_init_core_clock(struct ath5k_hw *ah)</div><div class='add'>+static void</div><div class='add'>+ath5k_hw_init_core_clock(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_channel *channel = ah-&gt;ah_current_channel;</div><div class='ctx'> 	struct ath_common *common = ath5k_hw_common(ah);</div><div class='hunk'>@@ -227,16 +262,21 @@ static void ath5k_hw_init_core_clock(struct ath5k_hw *ah)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_sleep_clock() - Setup sleep clock operation</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @enable: Enable sleep clock operation (false to disable)</div><div class='add'>+ *</div><div class='ctx'>  * If there is an external 32KHz crystal available, use it</div><div class='ctx'>  * as ref. clock instead of 32/40MHz clock and baseband clocks</div><div class='ctx'>  * to save power during sleep or restore normal 32/40MHz</div><div class='ctx'>  * operation.</div><div class='ctx'>  *</div><div class='del'>- * XXX: When operating on 32KHz certain PHY registers (27 - 31,</div><div class='del'>- *	123 - 127) require delay on access.</div><div class='add'>+ * NOTE: When operating on 32KHz certain PHY registers (27 - 31,</div><div class='add'>+ * 123 - 127) require delay on access.</div><div class='ctx'>  */</div><div class='del'>-static void ath5k_hw_set_sleep_clock(struct ath5k_hw *ah, bool enable)</div><div class='add'>+static void</div><div class='add'>+ath5k_hw_set_sleep_clock(struct ath5k_hw *ah, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_eeprom_info *ee = &amp;ah-&gt;ah_capabilities.cap_eeprom;</div><div class='ctx'> 	u32 scal, spending, sclock;</div><div class='hunk'>@@ -340,10 +380,19 @@ static void ath5k_hw_set_sleep_clock(struct ath5k_hw *ah, bool enable)</div><div class='ctx'> * Reset/Sleep control *</div><div class='ctx'> \*********************/</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Reset chipset</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_nic_reset() - Reset the various chipset units</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @val: Mask to indicate what units to reset</div><div class='add'>+ *</div><div class='add'>+ * To reset the various chipset units we need to write</div><div class='add'>+ * the mask to AR5K_RESET_CTL and poll the register until</div><div class='add'>+ * all flags are cleared.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if we are O.K. or -EAGAIN (from athk5_hw_register_timeout)</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_nic_reset(struct ath5k_hw *ah, u32 val)</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_nic_reset(struct ath5k_hw *ah, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 mask = val ? val : ~0U;</div><div class='hunk'>@@ -357,7 +406,7 @@ static int ath5k_hw_nic_reset(struct ath5k_hw *ah, u32 val)</div><div class='ctx'> 	ath5k_hw_reg_write(ah, val, AR5K_RESET_CTL);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait at least 128 PCI clocks */</div><div class='del'>-	udelay(15);</div><div class='add'>+	usleep_range(15, 20);</div><div class='ctx'> </div><div class='ctx'> 	if (ah-&gt;ah_version == AR5K_AR5210) {</div><div class='ctx'> 		val &amp;= AR5K_RESET_CTL_PCU | AR5K_RESET_CTL_DMA</div><div class='hunk'>@@ -382,12 +431,17 @@ static int ath5k_hw_nic_reset(struct ath5k_hw *ah, u32 val)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Reset AHB chipset</div><div class='del'>- * AR5K_RESET_CTL_PCU flag resets WMAC</div><div class='del'>- * AR5K_RESET_CTL_BASEBAND flag resets WBB</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_wisoc_reset() -  Reset AHB chipset</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @flags: Mask to indicate what units to reset</div><div class='add'>+ *</div><div class='add'>+ * Same as ath5k_hw_nic_reset but for AHB based devices</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if we are O.K. or -EAGAIN (from athk5_hw_register_timeout)</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_wisoc_reset(struct ath5k_hw *ah, u32 flags)</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_wisoc_reset(struct ath5k_hw *ah, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mask = flags ? flags : ~0U;</div><div class='ctx'> 	u32 __iomem *reg;</div><div class='hunk'>@@ -422,7 +476,7 @@ static int ath5k_hw_wisoc_reset(struct ath5k_hw *ah, u32 flags)</div><div class='ctx'> 	regval = __raw_readl(reg);</div><div class='ctx'> 	__raw_writel(regval | val, reg);</div><div class='ctx'> 	regval = __raw_readl(reg);</div><div class='del'>-	udelay(100);</div><div class='add'>+	usleep_range(100, 150);</div><div class='ctx'> </div><div class='ctx'> 	/* Bring BB/MAC out of reset */</div><div class='ctx'> 	__raw_writel(regval &amp; ~val, reg);</div><div class='hunk'>@@ -439,11 +493,23 @@ static int ath5k_hw_wisoc_reset(struct ath5k_hw *ah, u32 flags)</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'>- * Sleep control</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_set_power_mode() - Set power mode</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @mode: One of enum ath5k_power_mode</div><div class='add'>+ * @set_chip: Set to true to write sleep control register</div><div class='add'>+ * @sleep_duration: How much time the device is allowed to sleep</div><div class='add'>+ * when sleep logic is enabled (in 128 microsecond increments).</div><div class='add'>+ *</div><div class='add'>+ * This function is used to configure sleep policy and allowed</div><div class='add'>+ * sleep modes. For more information check out the sleep control</div><div class='add'>+ * register on reg.h and STA_ID1.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, -EIO if chip didn't wake up or -EINVAL if an invalid</div><div class='add'>+ * mode is requested.</div><div class='ctx'>  */</div><div class='del'>-static int ath5k_hw_set_power(struct ath5k_hw *ah, enum ath5k_power_mode mode,</div><div class='add'>+static int</div><div class='add'>+ath5k_hw_set_power_mode(struct ath5k_hw *ah, enum ath5k_power_mode mode,</div><div class='ctx'> 			      bool set_chip, u16 sleep_duration)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -493,7 +559,7 @@ static int ath5k_hw_set_power(struct ath5k_hw *ah, enum ath5k_power_mode mode,</div><div class='ctx'> </div><div class='ctx'> 		ath5k_hw_reg_write(ah, data | AR5K_SLEEP_CTL_SLE_WAKE,</div><div class='ctx'> 							AR5K_SLEEP_CTL);</div><div class='del'>-		udelay(15);</div><div class='add'>+		usleep_range(15, 20);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 200; i &gt; 0; i--) {</div><div class='ctx'> 			/* Check if the chip did wake up */</div><div class='hunk'>@@ -502,7 +568,7 @@ static int ath5k_hw_set_power(struct ath5k_hw *ah, enum ath5k_power_mode mode,</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			/* Wait a bit and retry */</div><div class='del'>-			udelay(50);</div><div class='add'>+			usleep_range(50, 75);</div><div class='ctx'> 			ath5k_hw_reg_write(ah, data | AR5K_SLEEP_CTL_SLE_WAKE,</div><div class='ctx'> 							AR5K_SLEEP_CTL);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -523,17 +589,20 @@ commit:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Put device on hold</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_on_hold() - Put device on hold</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='ctx'>  *</div><div class='del'>- * Put MAC and Baseband on warm reset and</div><div class='del'>- * keep that state (don't clean sleep control</div><div class='del'>- * register). After this MAC and Baseband are</div><div class='del'>- * disabled and a full reset is needed to come</div><div class='del'>- * back. This way we save as much power as possible</div><div class='add'>+ * Put MAC and Baseband on warm reset and keep that state</div><div class='add'>+ * (don't clean sleep control register). After this MAC</div><div class='add'>+ * and Baseband are disabled and a full reset is needed</div><div class='add'>+ * to come back. This way we save as much power as possible</div><div class='ctx'>  * without putting the card on full sleep.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success or -EIO on error</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_on_hold(struct ath5k_hw *ah)</div><div class='add'>+int</div><div class='add'>+ath5k_hw_on_hold(struct ath5k_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = ah-&gt;pdev;</div><div class='ctx'> 	u32 bus_flags;</div><div class='hunk'>@@ -543,7 +612,7 @@ int ath5k_hw_on_hold(struct ath5k_hw *ah)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure device is awake */</div><div class='del'>-	ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);</div><div class='add'>+	ret = ath5k_hw_set_power_mode(ah, AR5K_PM_AWAKE, true, 0);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ATH5K_ERR(ah, "failed to wakeup the MAC Chip\n");</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -563,7 +632,7 @@ int ath5k_hw_on_hold(struct ath5k_hw *ah)</div><div class='ctx'> 		ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU |</div><div class='ctx'> 			AR5K_RESET_CTL_MAC | AR5K_RESET_CTL_DMA |</div><div class='ctx'> 			AR5K_RESET_CTL_PHY | AR5K_RESET_CTL_PCI);</div><div class='del'>-			mdelay(2);</div><div class='add'>+			usleep_range(2000, 2500);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU |</div><div class='ctx'> 			AR5K_RESET_CTL_BASEBAND | bus_flags);</div><div class='hunk'>@@ -575,7 +644,7 @@ int ath5k_hw_on_hold(struct ath5k_hw *ah)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* ...wakeup again!*/</div><div class='del'>-	ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);</div><div class='add'>+	ret = ath5k_hw_set_power_mode(ah, AR5K_PM_AWAKE, true, 0);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ATH5K_ERR(ah, "failed to put device on hold\n");</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -584,11 +653,18 @@ int ath5k_hw_on_hold(struct ath5k_hw *ah)</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='add'>+ * ath5k_hw_nic_wakeup() - Force card out of sleep</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ *</div><div class='ctx'>  * Bring up MAC + PHY Chips and program PLL</div><div class='del'>- * Channel is NULL for the initial wakeup.</div><div class='add'>+ * NOTE: Channel is NULL for the initial wakeup.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, -EIO on hw failure or -EINVAL for false channel infos</div><div class='ctx'>  */</div><div class='del'>-int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, struct ieee80211_channel *channel)</div><div class='add'>+int</div><div class='add'>+ath5k_hw_nic_wakeup(struct ath5k_hw *ah, struct ieee80211_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = ah-&gt;pdev;</div><div class='ctx'> 	u32 turbo, mode, clock, bus_flags;</div><div class='hunk'>@@ -600,7 +676,7 @@ int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, struct ieee80211_channel *channel)</div><div class='ctx'> </div><div class='ctx'> 	if ((ath5k_get_bus_type(ah) != ATH_AHB) || channel) {</div><div class='ctx'> 		/* Wakeup the device */</div><div class='del'>-		ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);</div><div class='add'>+		ret = ath5k_hw_set_power_mode(ah, AR5K_PM_AWAKE, true, 0);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ATH5K_ERR(ah, "failed to wakeup the MAC Chip\n");</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -621,7 +697,7 @@ int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, struct ieee80211_channel *channel)</div><div class='ctx'> 		ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU |</div><div class='ctx'> 			AR5K_RESET_CTL_MAC | AR5K_RESET_CTL_DMA |</div><div class='ctx'> 			AR5K_RESET_CTL_PHY | AR5K_RESET_CTL_PCI);</div><div class='del'>-			mdelay(2);</div><div class='add'>+			usleep_range(2000, 2500);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (ath5k_get_bus_type(ah) == ATH_AHB)</div><div class='ctx'> 			ret = ath5k_hw_wisoc_reset(ah, AR5K_RESET_CTL_PCU |</div><div class='hunk'>@@ -637,7 +713,7 @@ int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, struct ieee80211_channel *channel)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* ...wakeup again!...*/</div><div class='del'>-	ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);</div><div class='add'>+	ret = ath5k_hw_set_power_mode(ah, AR5K_PM_AWAKE, true, 0);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ATH5K_ERR(ah, "failed to resume the MAC Chip\n");</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -739,7 +815,7 @@ int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, struct ieee80211_channel *channel)</div><div class='ctx'> 		/* ...update PLL if needed */</div><div class='ctx'> 		if (ath5k_hw_reg_read(ah, AR5K_PHY_PLL) != clock) {</div><div class='ctx'> 			ath5k_hw_reg_write(ah, clock, AR5K_PHY_PLL);</div><div class='del'>-			udelay(300);</div><div class='add'>+			usleep_range(300, 350);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* ...set the PHY operating mode */</div><div class='hunk'>@@ -755,8 +831,19 @@ int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, struct ieee80211_channel *channel)</div><div class='ctx'> * Post-initvals register modifications *</div><div class='ctx'> \**************************************/</div><div class='ctx'> </div><div class='del'>-/* TODO: Half/Quarter rate */</div><div class='del'>-static void ath5k_hw_tweak_initval_settings(struct ath5k_hw *ah,</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_tweak_initval_settings() - Tweak initial settings</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ *</div><div class='add'>+ * Some settings are not handled on initvals, e.g. bwmode</div><div class='add'>+ * settings, some phy settings, workarounds etc that in general</div><div class='add'>+ * don't fit anywhere else or are too small to introduce a separate</div><div class='add'>+ * function for each one. So we have this function to handle</div><div class='add'>+ * them all during reset and complete card's initialization.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ath5k_hw_tweak_initval_settings(struct ath5k_hw *ah,</div><div class='ctx'> 				struct ieee80211_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	if (ah-&gt;ah_version == AR5K_AR5212 &amp;&amp;</div><div class='hunk'>@@ -875,7 +962,16 @@ static void ath5k_hw_tweak_initval_settings(struct ath5k_hw *ah,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath5k_hw_commit_eeprom_settings(struct ath5k_hw *ah,</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_commit_eeprom_settings() - Commit settings from EEPROM</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ *</div><div class='add'>+ * Use settings stored on EEPROM to properly initialize the card</div><div class='add'>+ * based on various infos and per-mode calibration data.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+ath5k_hw_commit_eeprom_settings(struct ath5k_hw *ah,</div><div class='ctx'> 		struct ieee80211_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath5k_eeprom_info *ee = &amp;ah-&gt;ah_capabilities.cap_eeprom;</div><div class='hunk'>@@ -1029,7 +1125,23 @@ static void ath5k_hw_commit_eeprom_settings(struct ath5k_hw *ah,</div><div class='ctx'> * Main reset function *</div><div class='ctx'> \*********************/</div><div class='ctx'> </div><div class='del'>-int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,</div><div class='add'>+/**</div><div class='add'>+ * ath5k_hw_reset() - The main reset function</div><div class='add'>+ * @ah: The &amp;struct ath5k_hw</div><div class='add'>+ * @op_mode: One of enum nl80211_iftype</div><div class='add'>+ * @channel: The &amp;struct ieee80211_channel</div><div class='add'>+ * @fast: Enable fast channel switching</div><div class='add'>+ * @skip_pcu: Skip pcu initialization</div><div class='add'>+ *</div><div class='add'>+ * This is the function we call each time we want to (re)initialize the</div><div class='add'>+ * card and pass new settings to hw. We also call it when hw runs into</div><div class='add'>+ * trouble to make it come back to a working state.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, -EINVAL on false op_mode or channel infos, or -EIO</div><div class='add'>+ * on failure.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,</div><div class='ctx'> 		struct ieee80211_channel *channel, bool fast, bool skip_pcu)</div><div class='ctx'> {</div><div class='ctx'> 	u32 s_seq[10], s_led[3], tsf_up, tsf_lo;</div><div class='hunk'>@@ -1047,7 +1159,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (fast &amp;&amp; (ah-&gt;ah_radio != AR5K_RF2413) &amp;&amp;</div><div class='ctx'> 	(ah-&gt;ah_radio != AR5K_RF5413))</div><div class='del'>-		fast = 0;</div><div class='add'>+		fast = false;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable sleep clock operation</div><div class='ctx'> 	 * to avoid register access delay on certain</div><div class='hunk'>@@ -1073,7 +1185,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,</div><div class='ctx'> 	if (ret &amp;&amp; fast) {</div><div class='ctx'> 		ATH5K_DBG(ah, ATH5K_DEBUG_RESET,</div><div class='ctx'> 			"DMA didn't stop, falling back to normal reset\n");</div><div class='del'>-		fast = 0;</div><div class='add'>+		fast = false;</div><div class='ctx'> 		/* Non fatal, just continue with</div><div class='ctx'> 		 * normal reset */</div><div class='ctx'> 		ret = 0;</div><div class='hunk'>@@ -1242,7 +1354,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize PCU</div><div class='ctx'> 	 */</div><div class='del'>-	ath5k_hw_pcu_init(ah, op_mode, mode);</div><div class='add'>+	ath5k_hw_pcu_init(ah, op_mode);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize PHY</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/rfbuffer.h b/drivers/net/wireless/ath/ath5k/rfbuffer.h<br/>index 5d11c23b4297..aed34d9954c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/rfbuffer.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/rfbuffer.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/rfbuffer.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/rfbuffer.h</a></div><div class='hunk'>@@ -18,7 +18,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * DOC: RF Buffer registers</div><div class='add'>+ *</div><div class='ctx'>  * There are some special registers on the RF chip</div><div class='ctx'>  * that control various operation settings related mostly to</div><div class='ctx'>  * the analog parts (channel, gain adjustment etc).</div><div class='hunk'>@@ -44,40 +46,63 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_ini_rfbuffer - Initial RF Buffer settings</div><div class='add'>+ * @rfb_bank: RF Bank number</div><div class='add'>+ * @rfb_ctrl_register: RF Buffer control register</div><div class='add'>+ * @rfb_mode_data: RF Buffer data for each mode</div><div class='add'>+ *</div><div class='ctx'>  * Struct to hold default mode specific RF</div><div class='del'>- * register values (RF Banks)</div><div class='add'>+ * register values (RF Banks) for each chip.</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_ini_rfbuffer {</div><div class='del'>-	u8	rfb_bank;		/* RF Bank number */</div><div class='del'>-	u16	rfb_ctrl_register;	/* RF Buffer control register */</div><div class='del'>-	u32	rfb_mode_data[3];	/* RF Buffer data for each mode */</div><div class='add'>+	u8	rfb_bank;</div><div class='add'>+	u16	rfb_ctrl_register;</div><div class='add'>+	u32	rfb_mode_data[3];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_rfb_field - An RF Buffer field (register/value)</div><div class='add'>+ * @len: Field length</div><div class='add'>+ * @pos: Offset on the raw packet</div><div class='add'>+ * @col: Used for shifting</div><div class='add'>+ *</div><div class='ctx'>  * Struct to hold RF Buffer field</div><div class='ctx'>  * infos used to access certain RF</div><div class='ctx'>  * analog registers</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_rfb_field {</div><div class='del'>-	u8	len;	/* Field length */</div><div class='del'>-	u16	pos;	/* Offset on the raw packet */</div><div class='del'>-	u8	col;	/* Column -used for shifting */</div><div class='add'>+	u8	len;</div><div class='add'>+	u16	pos;</div><div class='add'>+	u8	col;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * RF analog register definition</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_rf_reg - RF analog register definition</div><div class='add'>+ * @bank: RF Buffer Bank number</div><div class='add'>+ * @index: Register's index on ath5k_rf_regx_idx</div><div class='add'>+ * @field: The &amp;struct ath5k_rfb_field</div><div class='add'>+ *</div><div class='add'>+ * We use this struct to define the set of RF registers</div><div class='add'>+ * on each chip that we want to tweak. Some RF registers</div><div class='add'>+ * are common between different chip versions so this saves</div><div class='add'>+ * us space and complexity because we can refer to an rf</div><div class='add'>+ * register by it's index no matter what chip we work with</div><div class='add'>+ * as long as it has that register.</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_rf_reg {</div><div class='del'>-	u8			bank;	/* RF Buffer Bank number */</div><div class='del'>-	u8			index;	/* Register's index on rf_regs_idx */</div><div class='del'>-	struct ath5k_rfb_field	field;	/* RF Buffer field for this register */</div><div class='add'>+	u8			bank;</div><div class='add'>+	u8			index;</div><div class='add'>+	struct ath5k_rfb_field	field;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Map RF registers to indexes</div><div class='add'>+/**</div><div class='add'>+ * enum ath5k_rf_regs_idx - Map RF registers to indexes</div><div class='add'>+ *</div><div class='ctx'>  * We do this to handle common bits and make our</div><div class='ctx'>  * life easier by using an index for each register</div><div class='del'>- * instead of a full rfb_field */</div><div class='add'>+ * instead of a full rfb_field</div><div class='add'>+ */</div><div class='ctx'> enum ath5k_rf_regs_idx {</div><div class='ctx'> 	/* BANK 2 */</div><div class='ctx'> 	AR5K_RF_TURBO = 0,</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/rfgain.h b/drivers/net/wireless/ath/ath5k/rfgain.h<br/>index ebfae052d89e..4d21df0e5975 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/rfgain.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/rfgain.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/rfgain.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/rfgain.h</a></div><div class='hunk'>@@ -18,13 +18,17 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_ini_rfgain - RF Gain table</div><div class='add'>+ * @rfg_register: RF Gain register address</div><div class='add'>+ * @rfg_value: Register value for 5 and 2GHz</div><div class='add'>+ *</div><div class='ctx'>  * Mode-specific RF Gain table (64bytes) for RF5111/5112</div><div class='ctx'>  * (RF5110 only comes with AR5210 and only supports a/turbo a mode so initial</div><div class='ctx'>  * RF Gain values are included in AR5K_AR5210_INI)</div><div class='ctx'>  */</div><div class='ctx'> struct ath5k_ini_rfgain {</div><div class='del'>-	u16	rfg_register;	/* RF Gain register address */</div><div class='add'>+	u16	rfg_register;</div><div class='ctx'> 	u32	rfg_value[2];	/* [freq (see below)] */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -455,18 +459,31 @@ static const struct ath5k_ini_rfgain rfgain_2425[] = {</div><div class='ctx'> #define AR5K_GAIN_CHECK_ADJUST(_g)		\</div><div class='ctx'> 	((_g)-&gt;g_current &lt;= (_g)-&gt;g_low || (_g)-&gt;g_current &gt;= (_g)-&gt;g_high)</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_gain_opt_step - An RF gain optimization step</div><div class='add'>+ * @gos_param: Set of parameters</div><div class='add'>+ * @gos_gain: Gain</div><div class='add'>+ */</div><div class='ctx'> struct ath5k_gain_opt_step {</div><div class='ctx'> 	s8				gos_param[AR5K_GAIN_CRN_MAX_FIX_BITS];</div><div class='ctx'> 	s8				gos_gain;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct ath5k_gain_opt - RF Gain optimization ladder</div><div class='add'>+ * @go_default: The default step</div><div class='add'>+ * @go_steps_count: How many optimization steps</div><div class='add'>+ * @go_step: Array of &amp;struct ath5k_gain_opt_step</div><div class='add'>+ */</div><div class='ctx'> struct ath5k_gain_opt {</div><div class='ctx'> 	u8				go_default;</div><div class='ctx'> 	u8				go_steps_count;</div><div class='ctx'> 	const struct ath5k_gain_opt_step	go_step[AR5K_GAIN_STEP_COUNT];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /*</div><div class='add'>+ * RF5111</div><div class='ctx'>  * Parameters on gos_param:</div><div class='ctx'>  * 1) Tx clip PHY register</div><div class='ctx'>  * 2) PWD 90 RF register</div><div class='hunk'>@@ -490,6 +507,7 @@ static const struct ath5k_gain_opt rfgain_opt_5111 = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * RF5112</div><div class='ctx'>  * Parameters on gos_param:</div><div class='ctx'>  * 1) Mixgain ovr RF register</div><div class='ctx'>  * 2) PWD 138 RF register</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath5k/trace.h b/drivers/net/wireless/ath/ath5k/trace.h<br/>index 39f002ed4a88..00f015819344 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/trace.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath5k/trace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath5k/trace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath5k/trace.h</a></div><div class='hunk'>@@ -3,7 +3,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/tracepoint.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_ATH5K_TRACER</div><div class='add'>+</div><div class='add'>+#if !defined(CONFIG_ATH5K_TRACER) || defined(__CHECKER__)</div><div class='ctx'> #undef TRACE_EVENT</div><div class='ctx'> #define TRACE_EVENT(name, proto, ...) \</div><div class='ctx'> static inline void trace_ ## name(proto) {}</div><div class='hunk'>@@ -93,7 +94,7 @@ TRACE_EVENT(ath5k_tx_complete,</div><div class='ctx'> </div><div class='ctx'> #endif /* __TRACE_ATH5K_H */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ATH5K_TRACER</div><div class='add'>+#if defined(CONFIG_ATH5K_TRACER) &amp;&amp; !defined(__CHECKER__)</div><div class='ctx'> </div><div class='ctx'> #undef TRACE_INCLUDE_PATH</div><div class='ctx'> #define TRACE_INCLUDE_PATH ../../drivers/net/wireless/ath/ath5k</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/Makefile b/drivers/net/wireless/ath/ath6kl/Makefile<br/>index 8f7a0d1c290c..707069303550 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/Makefile</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ATH6KL) := ath6kl.o</div><div class='ctx'> ath6kl-y += debug.o</div><div class='del'>-ath6kl-y += htc_hif.o</div><div class='add'>+ath6kl-y += hif.o</div><div class='ctx'> ath6kl-y += htc.o</div><div class='ctx'> ath6kl-y += bmi.o</div><div class='ctx'> ath6kl-y += cfg80211.o</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/bmi.c b/drivers/net/wireless/ath/ath6kl/bmi.c<br/>index c5d11cc536e0..bce3575c310a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/bmi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/bmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/bmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/bmi.c</a></div><div class='hunk'>@@ -19,165 +19,6 @@</div><div class='ctx'> #include "target.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> </div><div class='del'>-static int ath6kl_get_bmi_cmd_credits(struct ath6kl *ar)</div><div class='del'>-{</div><div class='del'>-	u32 addr;</div><div class='del'>-	unsigned long timeout;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ar-&gt;bmi.cmd_credits = 0;</div><div class='del'>-</div><div class='del'>-	/* Read the counter register to get the command credits */</div><div class='del'>-	addr = COUNT_DEC_ADDRESS + (HTC_MAILBOX_NUM_MAX + ENDPOINT1) * 4;</div><div class='del'>-</div><div class='del'>-	timeout = jiffies + msecs_to_jiffies(BMI_COMMUNICATION_TIMEOUT);</div><div class='del'>-	while (time_before(jiffies, timeout) &amp;&amp; !ar-&gt;bmi.cmd_credits) {</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Hit the credit counter with a 4-byte access, the first byte</div><div class='del'>-		 * read will hit the counter and cause a decrement, while the</div><div class='del'>-		 * remaining 3 bytes has no effect. The rationale behind this</div><div class='del'>-		 * is to make all HIF accesses 4-byte aligned.</div><div class='del'>-		 */</div><div class='del'>-		ret = hif_read_write_sync(ar, addr,</div><div class='del'>-					 (u8 *)&amp;ar-&gt;bmi.cmd_credits, 4,</div><div class='del'>-					 HIF_RD_SYNC_BYTE_INC);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ath6kl_err("Unable to decrement the command credit count register: %d\n",</div><div class='del'>-				   ret);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* The counter is only 8 bits.</div><div class='del'>-		 * Ignore anything in the upper 3 bytes</div><div class='del'>-		 */</div><div class='del'>-		ar-&gt;bmi.cmd_credits &amp;= 0xFF;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ar-&gt;bmi.cmd_credits) {</div><div class='del'>-		ath6kl_err("bmi communication timeout\n");</div><div class='del'>-		return -ETIMEDOUT;</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 ath6kl_bmi_get_rx_lkahd(struct ath6kl *ar)</div><div class='del'>-{</div><div class='del'>-	unsigned long timeout;</div><div class='del'>-	u32 rx_word = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	timeout = jiffies + msecs_to_jiffies(BMI_COMMUNICATION_TIMEOUT);</div><div class='del'>-	while (time_before(jiffies, timeout) &amp;&amp; !rx_word) {</div><div class='del'>-		ret = hif_read_write_sync(ar, RX_LOOKAHEAD_VALID_ADDRESS,</div><div class='del'>-					  (u8 *)&amp;rx_word, sizeof(rx_word),</div><div class='del'>-					  HIF_RD_SYNC_BYTE_INC);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ath6kl_err("unable to read RX_LOOKAHEAD_VALID\n");</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		 /* all we really want is one bit */</div><div class='del'>-		rx_word &amp;= (1 &lt;&lt; ENDPOINT1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!rx_word) {</div><div class='del'>-		ath6kl_err("bmi_recv_buf FIFO empty\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ath6kl_bmi_send_buf(struct ath6kl *ar, u8 *buf, u32 len)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	u32 addr;</div><div class='del'>-</div><div class='del'>-	ret = ath6kl_get_bmi_cmd_credits(ar);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	addr = ar-&gt;mbox_info.htc_addr;</div><div class='del'>-</div><div class='del'>-	ret = hif_read_write_sync(ar, addr, buf, len,</div><div class='del'>-				  HIF_WR_SYNC_BYTE_INC);</div><div class='del'>-	if (ret)</div><div class='del'>-		ath6kl_err("unable to send the bmi data to the device\n");</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ath6kl_bmi_recv_buf(struct ath6kl *ar, u8 *buf, u32 len)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	u32 addr;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * During normal bootup, small reads may be required.</div><div class='del'>-	 * Rather than issue an HIF Read and then wait as the Target</div><div class='del'>-	 * adds successive bytes to the FIFO, we wait here until</div><div class='del'>-	 * we know that response data is available.</div><div class='del'>-	 *</div><div class='del'>-	 * This allows us to cleanly timeout on an unexpected</div><div class='del'>-	 * Target failure rather than risk problems at the HIF level.</div><div class='del'>-	 * In particular, this avoids SDIO timeouts and possibly garbage</div><div class='del'>-	 * data on some host controllers.  And on an interconnect</div><div class='del'>-	 * such as Compact Flash (as well as some SDIO masters) which</div><div class='del'>-	 * does not provide any indication on data timeout, it avoids</div><div class='del'>-	 * a potential hang or garbage response.</div><div class='del'>-	 *</div><div class='del'>-	 * Synchronization is more difficult for reads larger than the</div><div class='del'>-	 * size of the MBOX FIFO (128B), because the Target is unable</div><div class='del'>-	 * to push the 129th byte of data until AFTER the Host posts an</div><div class='del'>-	 * HIF Read and removes some FIFO data.  So for large reads the</div><div class='del'>-	 * Host proceeds to post an HIF Read BEFORE all the data is</div><div class='del'>-	 * actually available to read.  Fortunately, large BMI reads do</div><div class='del'>-	 * not occur in practice -- they're supported for debug/development.</div><div class='del'>-	 *</div><div class='del'>-	 * So Host/Target BMI synchronization is divided into these cases:</div><div class='del'>-	 *  CASE 1: length &lt; 4</div><div class='del'>-	 *        Should not happen</div><div class='del'>-	 *</div><div class='del'>-	 *  CASE 2: 4 &lt;= length &lt;= 128</div><div class='del'>-	 *        Wait for first 4 bytes to be in FIFO</div><div class='del'>-	 *        If CONSERVATIVE_BMI_READ is enabled, also wait for</div><div class='del'>-	 *        a BMI command credit, which indicates that the ENTIRE</div><div class='del'>-	 *        response is available in the the FIFO</div><div class='del'>-	 *</div><div class='del'>-	 *  CASE 3: length &gt; 128</div><div class='del'>-	 *        Wait for the first 4 bytes to be in FIFO</div><div class='del'>-	 *</div><div class='del'>-	 * For most uses, a small timeout should be sufficient and we will</div><div class='del'>-	 * usually see a response quickly; but there may be some unusual</div><div class='del'>-	 * (debug) cases of BMI_EXECUTE where we want an larger timeout.</div><div class='del'>-	 * For now, we use an unbounded busy loop while waiting for</div><div class='del'>-	 * BMI_EXECUTE.</div><div class='del'>-	 *</div><div class='del'>-	 * If BMI_EXECUTE ever needs to support longer-latency execution,</div><div class='del'>-	 * especially in production, this code needs to be enhanced to sleep</div><div class='del'>-	 * and yield.  Also note that BMI_COMMUNICATION_TIMEOUT is currently</div><div class='del'>-	 * a function of Host processor speed.</div><div class='del'>-	 */</div><div class='del'>-	if (len &gt;= 4) { /* NB: Currently, always true */</div><div class='del'>-		ret = ath6kl_bmi_get_rx_lkahd(ar);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	addr = ar-&gt;mbox_info.htc_addr;</div><div class='del'>-	ret = hif_read_write_sync(ar, addr, buf, len,</div><div class='del'>-				  HIF_RD_SYNC_BYTE_INC);</div><div class='del'>-	if (ret) {</div><div class='del'>-		ath6kl_err("Unable to read the bmi data from the device: %d\n",</div><div class='del'>-			   ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int ath6kl_bmi_done(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -190,14 +31,12 @@ int ath6kl_bmi_done(struct ath6kl *ar)</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;bmi.done_sent = true;</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_bmi_send_buf(ar, (u8 *)&amp;cid, sizeof(cid));</div><div class='add'>+	ret = ath6kl_hif_bmi_write(ar, (u8 *)&amp;cid, sizeof(cid));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath6kl_err("Unable to send bmi done: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath6kl_bmi_cleanup(ar);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -212,13 +51,13 @@ int ath6kl_bmi_get_target_info(struct ath6kl *ar,</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_bmi_send_buf(ar, (u8 *)&amp;cid, sizeof(cid));</div><div class='add'>+	ret = ath6kl_hif_bmi_write(ar, (u8 *)&amp;cid, sizeof(cid));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath6kl_err("Unable to send get target info: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_bmi_recv_buf(ar, (u8 *)&amp;targ_info-&gt;version,</div><div class='add'>+	ret = ath6kl_hif_bmi_read(ar, (u8 *)&amp;targ_info-&gt;version,</div><div class='ctx'> 				  sizeof(targ_info-&gt;version));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath6kl_err("Unable to recv target info: %d\n", ret);</div><div class='hunk'>@@ -227,7 +66,7 @@ int ath6kl_bmi_get_target_info(struct ath6kl *ar,</div><div class='ctx'> </div><div class='ctx'> 	if (le32_to_cpu(targ_info-&gt;version) == TARGET_VERSION_SENTINAL) {</div><div class='ctx'> 		/* Determine how many bytes are in the Target's targ_info */</div><div class='del'>-		ret = ath6kl_bmi_recv_buf(ar,</div><div class='add'>+		ret = ath6kl_hif_bmi_read(ar,</div><div class='ctx'> 				   (u8 *)&amp;targ_info-&gt;byte_count,</div><div class='ctx'> 				   sizeof(targ_info-&gt;byte_count));</div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -246,7 +85,7 @@ int ath6kl_bmi_get_target_info(struct ath6kl *ar,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Read the remainder of the targ_info */</div><div class='del'>-		ret = ath6kl_bmi_recv_buf(ar,</div><div class='add'>+		ret = ath6kl_hif_bmi_read(ar,</div><div class='ctx'> 				   ((u8 *)targ_info) +</div><div class='ctx'> 				   sizeof(targ_info-&gt;byte_count),</div><div class='ctx'> 				   sizeof(*targ_info) -</div><div class='hunk'>@@ -278,8 +117,8 @@ int ath6kl_bmi_read(struct ath6kl *ar, u32 addr, u8 *buf, u32 len)</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	size = BMI_DATASZ_MAX + sizeof(cid) + sizeof(addr) + sizeof(len);</div><div class='del'>-	if (size &gt; MAX_BMI_CMDBUF_SZ) {</div><div class='add'>+	size = ar-&gt;bmi.max_data_size + sizeof(cid) + sizeof(addr) + sizeof(len);</div><div class='add'>+	if (size &gt; ar-&gt;bmi.max_cmd_size) {</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -292,8 +131,8 @@ int ath6kl_bmi_read(struct ath6kl *ar, u32 addr, u8 *buf, u32 len)</div><div class='ctx'> 	len_remain = len;</div><div class='ctx'> </div><div class='ctx'> 	while (len_remain) {</div><div class='del'>-		rx_len = (len_remain &lt; BMI_DATASZ_MAX) ?</div><div class='del'>-					len_remain : BMI_DATASZ_MAX;</div><div class='add'>+		rx_len = (len_remain &lt; ar-&gt;bmi.max_data_size) ?</div><div class='add'>+					len_remain : ar-&gt;bmi.max_data_size;</div><div class='ctx'> 		offset = 0;</div><div class='ctx'> 		memcpy(&amp;(ar-&gt;bmi.cmd_buf[offset]), &amp;cid, sizeof(cid));</div><div class='ctx'> 		offset += sizeof(cid);</div><div class='hunk'>@@ -302,13 +141,13 @@ int ath6kl_bmi_read(struct ath6kl *ar, u32 addr, u8 *buf, u32 len)</div><div class='ctx'> 		memcpy(&amp;(ar-&gt;bmi.cmd_buf[offset]), &amp;rx_len, sizeof(rx_len));</div><div class='ctx'> 		offset += sizeof(len);</div><div class='ctx'> </div><div class='del'>-		ret = ath6kl_bmi_send_buf(ar, ar-&gt;bmi.cmd_buf, offset);</div><div class='add'>+		ret = ath6kl_hif_bmi_write(ar, ar-&gt;bmi.cmd_buf, offset);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath6kl_err("Unable to write to the device: %d\n",</div><div class='ctx'> 				   ret);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='del'>-		ret = ath6kl_bmi_recv_buf(ar, ar-&gt;bmi.cmd_buf, rx_len);</div><div class='add'>+		ret = ath6kl_hif_bmi_read(ar, ar-&gt;bmi.cmd_buf, rx_len);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath6kl_err("Unable to read from the device: %d\n",</div><div class='ctx'> 				   ret);</div><div class='hunk'>@@ -328,7 +167,7 @@ int ath6kl_bmi_write(struct ath6kl *ar, u32 addr, u8 *buf, u32 len)</div><div class='ctx'> 	u32 offset;</div><div class='ctx'> 	u32 len_remain, tx_len;</div><div class='ctx'> 	const u32 header = sizeof(cid) + sizeof(addr) + sizeof(len);</div><div class='del'>-	u8 aligned_buf[BMI_DATASZ_MAX];</div><div class='add'>+	u8 aligned_buf[400];</div><div class='ctx'> 	u8 *src;</div><div class='ctx'> </div><div class='ctx'> 	if (ar-&gt;bmi.done_sent) {</div><div class='hunk'>@@ -336,12 +175,15 @@ int ath6kl_bmi_write(struct ath6kl *ar, u32 addr, u8 *buf, u32 len)</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((BMI_DATASZ_MAX + header) &gt; MAX_BMI_CMDBUF_SZ) {</div><div class='add'>+	if ((ar-&gt;bmi.max_data_size + header) &gt; ar-&gt;bmi.max_cmd_size) {</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(ar-&gt;bmi.cmd_buf, 0, BMI_DATASZ_MAX + header);</div><div class='add'>+	if (WARN_ON(ar-&gt;bmi.max_data_size &gt; sizeof(aligned_buf)))</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	memset(ar-&gt;bmi.cmd_buf, 0, ar-&gt;bmi.max_data_size + header);</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_BMI,</div><div class='ctx'> 		  "bmi write memory: addr: 0x%x, len: %d\n", addr, len);</div><div class='hunk'>@@ -350,7 +192,7 @@ int ath6kl_bmi_write(struct ath6kl *ar, u32 addr, u8 *buf, u32 len)</div><div class='ctx'> 	while (len_remain) {</div><div class='ctx'> 		src = &amp;buf[len - len_remain];</div><div class='ctx'> </div><div class='del'>-		if (len_remain &lt; (BMI_DATASZ_MAX - header)) {</div><div class='add'>+		if (len_remain &lt; (ar-&gt;bmi.max_data_size - header)) {</div><div class='ctx'> 			if (len_remain &amp; 3) {</div><div class='ctx'> 				/* align it with 4 bytes */</div><div class='ctx'> 				len_remain = len_remain +</div><div class='hunk'>@@ -360,7 +202,7 @@ int ath6kl_bmi_write(struct ath6kl *ar, u32 addr, u8 *buf, u32 len)</div><div class='ctx'> 			}</div><div class='ctx'> 			tx_len = len_remain;</div><div class='ctx'> 		} else {</div><div class='del'>-			tx_len = (BMI_DATASZ_MAX - header);</div><div class='add'>+			tx_len = (ar-&gt;bmi.max_data_size - header);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		offset = 0;</div><div class='hunk'>@@ -373,7 +215,7 @@ int ath6kl_bmi_write(struct ath6kl *ar, u32 addr, u8 *buf, u32 len)</div><div class='ctx'> 		memcpy(&amp;(ar-&gt;bmi.cmd_buf[offset]), src, tx_len);</div><div class='ctx'> 		offset += tx_len;</div><div class='ctx'> </div><div class='del'>-		ret = ath6kl_bmi_send_buf(ar, ar-&gt;bmi.cmd_buf, offset);</div><div class='add'>+		ret = ath6kl_hif_bmi_write(ar, ar-&gt;bmi.cmd_buf, offset);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath6kl_err("Unable to write to the device: %d\n",</div><div class='ctx'> 				   ret);</div><div class='hunk'>@@ -398,7 +240,7 @@ int ath6kl_bmi_execute(struct ath6kl *ar, u32 addr, u32 *param)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(cid) + sizeof(addr) + sizeof(param);</div><div class='del'>-	if (size &gt; MAX_BMI_CMDBUF_SZ) {</div><div class='add'>+	if (size &gt; ar-&gt;bmi.max_cmd_size) {</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -415,13 +257,13 @@ int ath6kl_bmi_execute(struct ath6kl *ar, u32 addr, u32 *param)</div><div class='ctx'> 	memcpy(&amp;(ar-&gt;bmi.cmd_buf[offset]), param, sizeof(*param));</div><div class='ctx'> 	offset += sizeof(*param);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_bmi_send_buf(ar, ar-&gt;bmi.cmd_buf, offset);</div><div class='add'>+	ret = ath6kl_hif_bmi_write(ar, ar-&gt;bmi.cmd_buf, offset);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath6kl_err("Unable to write to the device: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_bmi_recv_buf(ar, ar-&gt;bmi.cmd_buf, sizeof(*param));</div><div class='add'>+	ret = ath6kl_hif_bmi_read(ar, ar-&gt;bmi.cmd_buf, sizeof(*param));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath6kl_err("Unable to read from the device: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -445,7 +287,7 @@ int ath6kl_bmi_set_app_start(struct ath6kl *ar, u32 addr)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(cid) + sizeof(addr);</div><div class='del'>-	if (size &gt; MAX_BMI_CMDBUF_SZ) {</div><div class='add'>+	if (size &gt; ar-&gt;bmi.max_cmd_size) {</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -459,7 +301,7 @@ int ath6kl_bmi_set_app_start(struct ath6kl *ar, u32 addr)</div><div class='ctx'> 	memcpy(&amp;(ar-&gt;bmi.cmd_buf[offset]), &amp;addr, sizeof(addr));</div><div class='ctx'> 	offset += sizeof(addr);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_bmi_send_buf(ar, ar-&gt;bmi.cmd_buf, offset);</div><div class='add'>+	ret = ath6kl_hif_bmi_write(ar, ar-&gt;bmi.cmd_buf, offset);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath6kl_err("Unable to write to the device: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -481,7 +323,7 @@ int ath6kl_bmi_reg_read(struct ath6kl *ar, u32 addr, u32 *param)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(cid) + sizeof(addr);</div><div class='del'>-	if (size &gt; MAX_BMI_CMDBUF_SZ) {</div><div class='add'>+	if (size &gt; ar-&gt;bmi.max_cmd_size) {</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -495,13 +337,13 @@ int ath6kl_bmi_reg_read(struct ath6kl *ar, u32 addr, u32 *param)</div><div class='ctx'> 	memcpy(&amp;(ar-&gt;bmi.cmd_buf[offset]), &amp;addr, sizeof(addr));</div><div class='ctx'> 	offset += sizeof(addr);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_bmi_send_buf(ar, ar-&gt;bmi.cmd_buf, offset);</div><div class='add'>+	ret = ath6kl_hif_bmi_write(ar, ar-&gt;bmi.cmd_buf, offset);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath6kl_err("Unable to write to the device: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_bmi_recv_buf(ar, ar-&gt;bmi.cmd_buf, sizeof(*param));</div><div class='add'>+	ret = ath6kl_hif_bmi_read(ar, ar-&gt;bmi.cmd_buf, sizeof(*param));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath6kl_err("Unable to read from the device: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -524,7 +366,7 @@ int ath6kl_bmi_reg_write(struct ath6kl *ar, u32 addr, u32 param)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(cid) + sizeof(addr) + sizeof(param);</div><div class='del'>-	if (size &gt; MAX_BMI_CMDBUF_SZ) {</div><div class='add'>+	if (size &gt; ar-&gt;bmi.max_cmd_size) {</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -542,7 +384,7 @@ int ath6kl_bmi_reg_write(struct ath6kl *ar, u32 addr, u32 param)</div><div class='ctx'> 	memcpy(&amp;(ar-&gt;bmi.cmd_buf[offset]), &amp;param, sizeof(param));</div><div class='ctx'> 	offset += sizeof(param);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_bmi_send_buf(ar, ar-&gt;bmi.cmd_buf, offset);</div><div class='add'>+	ret = ath6kl_hif_bmi_write(ar, ar-&gt;bmi.cmd_buf, offset);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath6kl_err("Unable to write to the device: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -565,8 +407,8 @@ int ath6kl_bmi_lz_data(struct ath6kl *ar, u8 *buf, u32 len)</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	size = BMI_DATASZ_MAX + header;</div><div class='del'>-	if (size &gt; MAX_BMI_CMDBUF_SZ) {</div><div class='add'>+	size = ar-&gt;bmi.max_data_size + header;</div><div class='add'>+	if (size &gt; ar-&gt;bmi.max_cmd_size) {</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -577,8 +419,8 @@ int ath6kl_bmi_lz_data(struct ath6kl *ar, u8 *buf, u32 len)</div><div class='ctx'> </div><div class='ctx'> 	len_remain = len;</div><div class='ctx'> 	while (len_remain) {</div><div class='del'>-		tx_len = (len_remain &lt; (BMI_DATASZ_MAX - header)) ?</div><div class='del'>-			  len_remain : (BMI_DATASZ_MAX - header);</div><div class='add'>+		tx_len = (len_remain &lt; (ar-&gt;bmi.max_data_size - header)) ?</div><div class='add'>+			  len_remain : (ar-&gt;bmi.max_data_size - header);</div><div class='ctx'> </div><div class='ctx'> 		offset = 0;</div><div class='ctx'> 		memcpy(&amp;(ar-&gt;bmi.cmd_buf[offset]), &amp;cid, sizeof(cid));</div><div class='hunk'>@@ -589,7 +431,7 @@ int ath6kl_bmi_lz_data(struct ath6kl *ar, u8 *buf, u32 len)</div><div class='ctx'> 			tx_len);</div><div class='ctx'> 		offset += tx_len;</div><div class='ctx'> </div><div class='del'>-		ret = ath6kl_bmi_send_buf(ar, ar-&gt;bmi.cmd_buf, offset);</div><div class='add'>+		ret = ath6kl_hif_bmi_write(ar, ar-&gt;bmi.cmd_buf, offset);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath6kl_err("Unable to write to the device: %d\n",</div><div class='ctx'> 				   ret);</div><div class='hunk'>@@ -615,7 +457,7 @@ int ath6kl_bmi_lz_stream_start(struct ath6kl *ar, u32 addr)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(cid) + sizeof(addr);</div><div class='del'>-	if (size &gt; MAX_BMI_CMDBUF_SZ) {</div><div class='add'>+	if (size &gt; ar-&gt;bmi.max_cmd_size) {</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -631,7 +473,7 @@ int ath6kl_bmi_lz_stream_start(struct ath6kl *ar, u32 addr)</div><div class='ctx'> 	memcpy(&amp;(ar-&gt;bmi.cmd_buf[offset]), &amp;addr, sizeof(addr));</div><div class='ctx'> 	offset += sizeof(addr);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_bmi_send_buf(ar, ar-&gt;bmi.cmd_buf, offset);</div><div class='add'>+	ret = ath6kl_hif_bmi_write(ar, ar-&gt;bmi.cmd_buf, offset);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath6kl_err("Unable to start LZ stream to the device: %d\n",</div><div class='ctx'> 			   ret);</div><div class='hunk'>@@ -672,10 +514,20 @@ int ath6kl_bmi_fast_download(struct ath6kl *ar, u32 addr, u8 *buf, u32 len)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ath6kl_bmi_reset(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	ar-&gt;bmi.done_sent = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ath6kl_bmi_init(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='del'>-	ar-&gt;bmi.cmd_buf = kzalloc(MAX_BMI_CMDBUF_SZ, GFP_ATOMIC);</div><div class='add'>+	if (WARN_ON(ar-&gt;bmi.max_data_size == 0))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* cmd + addr + len + data_size */</div><div class='add'>+	ar-&gt;bmi.max_cmd_size = ar-&gt;bmi.max_data_size + (sizeof(u32) * 3);</div><div class='ctx'> </div><div class='add'>+	ar-&gt;bmi.cmd_buf = kzalloc(ar-&gt;bmi.max_cmd_size, GFP_ATOMIC);</div><div class='ctx'> 	if (!ar-&gt;bmi.cmd_buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/bmi.h b/drivers/net/wireless/ath/ath6kl/bmi.h<br/>index 96851d5df24b..f1ca6812456d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/bmi.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/bmi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/bmi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/bmi.h</a></div><div class='hunk'>@@ -44,12 +44,6 @@</div><div class='ctx'>  * BMI handles all required Target-side cache flushing.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define MAX_BMI_CMDBUF_SZ (BMI_DATASZ_MAX + \</div><div class='del'>-			   (sizeof(u32) * 3 /* cmd + addr + len */))</div><div class='del'>-</div><div class='del'>-/* Maximum data size used for BMI transfers */</div><div class='del'>-#define BMI_DATASZ_MAX                      256</div><div class='del'>-</div><div class='ctx'> /* BMI Commands */</div><div class='ctx'> </div><div class='ctx'> #define BMI_NO_COMMAND                      0</div><div class='hunk'>@@ -230,6 +224,8 @@ struct ath6kl_bmi_target_info {</div><div class='ctx'> </div><div class='ctx'> int ath6kl_bmi_init(struct ath6kl *ar);</div><div class='ctx'> void ath6kl_bmi_cleanup(struct ath6kl *ar);</div><div class='add'>+void ath6kl_bmi_reset(struct ath6kl *ar);</div><div class='add'>+</div><div class='ctx'> int ath6kl_bmi_done(struct ath6kl *ar);</div><div class='ctx'> int ath6kl_bmi_get_target_info(struct ath6kl *ar,</div><div class='ctx'> 			       struct ath6kl_bmi_target_info *targ_info);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c<br/>index f517eb8f7b44..6c59a217b1a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/cfg80211.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/cfg80211.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/cfg80211.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/cfg80211.c</a></div><div class='hunk'>@@ -123,17 +123,50 @@ static struct ieee80211_supported_band ath6kl_band_5ghz = {</div><div class='ctx'> 	.bitrates = ath6kl_a_rates,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ath6kl_set_wpa_version(struct ath6kl *ar,</div><div class='add'>+#define CCKM_KRK_CIPHER_SUITE 0x004096ff /* use for KRK */</div><div class='add'>+</div><div class='add'>+/* returns true if scheduled scan was stopped */</div><div class='add'>+static bool __ath6kl_cfg80211_sscan_stop(struct ath6kl_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;state != ATH6KL_STATE_SCHED_SCAN)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	del_timer_sync(&amp;vif-&gt;sched_scan_timer);</div><div class='add'>+</div><div class='add'>+	ath6kl_wmi_set_host_sleep_mode_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+					   ATH6KL_HOST_MODE_AWAKE);</div><div class='add'>+</div><div class='add'>+	ar-&gt;state = ATH6KL_STATE_ON;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath6kl_cfg80211_sscan_disable(struct ath6kl_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='add'>+	bool stopped;</div><div class='add'>+</div><div class='add'>+	stopped = __ath6kl_cfg80211_sscan_stop(vif);</div><div class='add'>+</div><div class='add'>+	if (!stopped)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cfg80211_sched_scan_stopped(ar-&gt;wiphy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath6kl_set_wpa_version(struct ath6kl_vif *vif,</div><div class='ctx'> 				  enum nl80211_wpa_versions wpa_version)</div><div class='ctx'> {</div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: %u\n", __func__, wpa_version);</div><div class='ctx'> </div><div class='ctx'> 	if (!wpa_version) {</div><div class='del'>-		ar-&gt;auth_mode = NONE_AUTH;</div><div class='add'>+		vif-&gt;auth_mode = NONE_AUTH;</div><div class='ctx'> 	} else if (wpa_version &amp; NL80211_WPA_VERSION_2) {</div><div class='del'>-		ar-&gt;auth_mode = WPA2_AUTH;</div><div class='add'>+		vif-&gt;auth_mode = WPA2_AUTH;</div><div class='ctx'> 	} else if (wpa_version &amp; NL80211_WPA_VERSION_1) {</div><div class='del'>-		ar-&gt;auth_mode = WPA_AUTH;</div><div class='add'>+		vif-&gt;auth_mode = WPA_AUTH;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ath6kl_err("%s: %u not supported\n", __func__, wpa_version);</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='hunk'>@@ -142,25 +175,24 @@ static int ath6kl_set_wpa_version(struct ath6kl *ar,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_set_auth_type(struct ath6kl *ar,</div><div class='add'>+static int ath6kl_set_auth_type(struct ath6kl_vif *vif,</div><div class='ctx'> 				enum nl80211_auth_type auth_type)</div><div class='ctx'> {</div><div class='del'>-</div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: 0x%x\n", __func__, auth_type);</div><div class='ctx'> </div><div class='ctx'> 	switch (auth_type) {</div><div class='ctx'> 	case NL80211_AUTHTYPE_OPEN_SYSTEM:</div><div class='del'>-		ar-&gt;dot11_auth_mode = OPEN_AUTH;</div><div class='add'>+		vif-&gt;dot11_auth_mode = OPEN_AUTH;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_AUTHTYPE_SHARED_KEY:</div><div class='del'>-		ar-&gt;dot11_auth_mode = SHARED_AUTH;</div><div class='add'>+		vif-&gt;dot11_auth_mode = SHARED_AUTH;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_AUTHTYPE_NETWORK_EAP:</div><div class='del'>-		ar-&gt;dot11_auth_mode = LEAP_AUTH;</div><div class='add'>+		vif-&gt;dot11_auth_mode = LEAP_AUTH;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case NL80211_AUTHTYPE_AUTOMATIC:</div><div class='del'>-		ar-&gt;dot11_auth_mode = OPEN_AUTH | SHARED_AUTH;</div><div class='add'>+		vif-&gt;dot11_auth_mode = OPEN_AUTH | SHARED_AUTH;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -171,11 +203,11 @@ static int ath6kl_set_auth_type(struct ath6kl *ar,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_set_cipher(struct ath6kl *ar, u32 cipher, bool ucast)</div><div class='add'>+static int ath6kl_set_cipher(struct ath6kl_vif *vif, u32 cipher, bool ucast)</div><div class='ctx'> {</div><div class='del'>-	u8 *ar_cipher = ucast ? &amp;ar-&gt;prwise_crypto : &amp;ar-&gt;grp_crypto;</div><div class='del'>-	u8 *ar_cipher_len = ucast ? &amp;ar-&gt;prwise_crypto_len :</div><div class='del'>-		&amp;ar-&gt;grp_crypto_len;</div><div class='add'>+	u8 *ar_cipher = ucast ? &amp;vif-&gt;prwise_crypto : &amp;vif-&gt;grp_crypto;</div><div class='add'>+	u8 *ar_cipher_len = ucast ? &amp;vif-&gt;prwise_crypto_len :</div><div class='add'>+		&amp;vif-&gt;grp_crypto_len;</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: cipher 0x%x, ucast %u\n",</div><div class='ctx'> 		   __func__, cipher, ucast);</div><div class='hunk'>@@ -202,6 +234,10 @@ static int ath6kl_set_cipher(struct ath6kl *ar, u32 cipher, bool ucast)</div><div class='ctx'> 		*ar_cipher = AES_CRYPT;</div><div class='ctx'> 		*ar_cipher_len = 0;</div><div class='ctx'> 		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_SMS4:</div><div class='add'>+		*ar_cipher = WAPI_CRYPT;</div><div class='add'>+		*ar_cipher_len = 0;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ath6kl_err("cipher 0x%x not supported\n", cipher);</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='hunk'>@@ -210,28 +246,35 @@ static int ath6kl_set_cipher(struct ath6kl *ar, u32 cipher, bool ucast)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath6kl_set_key_mgmt(struct ath6kl *ar, u32 key_mgmt)</div><div class='add'>+static void ath6kl_set_key_mgmt(struct ath6kl_vif *vif, u32 key_mgmt)</div><div class='ctx'> {</div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: 0x%x\n", __func__, key_mgmt);</div><div class='ctx'> </div><div class='ctx'> 	if (key_mgmt == WLAN_AKM_SUITE_PSK) {</div><div class='del'>-		if (ar-&gt;auth_mode == WPA_AUTH)</div><div class='del'>-			ar-&gt;auth_mode = WPA_PSK_AUTH;</div><div class='del'>-		else if (ar-&gt;auth_mode == WPA2_AUTH)</div><div class='del'>-			ar-&gt;auth_mode = WPA2_PSK_AUTH;</div><div class='add'>+		if (vif-&gt;auth_mode == WPA_AUTH)</div><div class='add'>+			vif-&gt;auth_mode = WPA_PSK_AUTH;</div><div class='add'>+		else if (vif-&gt;auth_mode == WPA2_AUTH)</div><div class='add'>+			vif-&gt;auth_mode = WPA2_PSK_AUTH;</div><div class='add'>+	} else if (key_mgmt == 0x00409600) {</div><div class='add'>+		if (vif-&gt;auth_mode == WPA_AUTH)</div><div class='add'>+			vif-&gt;auth_mode = WPA_AUTH_CCKM;</div><div class='add'>+		else if (vif-&gt;auth_mode == WPA2_AUTH)</div><div class='add'>+			vif-&gt;auth_mode = WPA2_AUTH_CCKM;</div><div class='ctx'> 	} else if (key_mgmt != WLAN_AKM_SUITE_8021X) {</div><div class='del'>-		ar-&gt;auth_mode = NONE_AUTH;</div><div class='add'>+		vif-&gt;auth_mode = NONE_AUTH;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ath6kl_cfg80211_ready(struct ath6kl *ar)</div><div class='add'>+static bool ath6kl_cfg80211_ready(struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='add'>+</div><div class='ctx'> 	if (!test_bit(WMI_READY, &amp;ar-&gt;flag)) {</div><div class='ctx'> 		ath6kl_err("wmi is not ready\n");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(WLAN_ENABLED, &amp;ar-&gt;flag)) {</div><div class='add'>+	if (!test_bit(WLAN_ENABLED, &amp;vif-&gt;flags)) {</div><div class='ctx'> 		ath6kl_err("wlan disabled\n");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -239,15 +282,146 @@ static bool ath6kl_cfg80211_ready(struct ath6kl *ar)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ath6kl_is_wpa_ie(const u8 *pos)</div><div class='add'>+{</div><div class='add'>+	return pos[0] == WLAN_EID_WPA &amp;&amp; pos[1] &gt;= 4 &amp;&amp;</div><div class='add'>+		pos[2] == 0x00 &amp;&amp; pos[3] == 0x50 &amp;&amp;</div><div class='add'>+		pos[4] == 0xf2 &amp;&amp; pos[5] == 0x01;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath6kl_is_rsn_ie(const u8 *pos)</div><div class='add'>+{</div><div class='add'>+	return pos[0] == WLAN_EID_RSN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath6kl_is_wps_ie(const u8 *pos)</div><div class='add'>+{</div><div class='add'>+	return (pos[0] == WLAN_EID_VENDOR_SPECIFIC &amp;&amp;</div><div class='add'>+		pos[1] &gt;= 4 &amp;&amp;</div><div class='add'>+		pos[2] == 0x00 &amp;&amp; pos[3] == 0x50 &amp;&amp; pos[4] == 0xf2 &amp;&amp;</div><div class='add'>+		pos[5] == 0x04);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath6kl_set_assoc_req_ies(struct ath6kl_vif *vif, const u8 *ies,</div><div class='add'>+				    size_t ies_len)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='add'>+	const u8 *pos;</div><div class='add'>+	u8 *buf = NULL;</div><div class='add'>+	size_t len = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clear previously set flag</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ar-&gt;connect_ctrl_flags &amp;= ~CONNECT_WPS_FLAG;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Filter out RSN/WPA IE(s)</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (ies &amp;&amp; ies_len) {</div><div class='add'>+		buf = kmalloc(ies_len, GFP_KERNEL);</div><div class='add'>+		if (buf == NULL)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		pos = ies;</div><div class='add'>+</div><div class='add'>+		while (pos + 1 &lt; ies + ies_len) {</div><div class='add'>+			if (pos + 2 + pos[1] &gt; ies + ies_len)</div><div class='add'>+				break;</div><div class='add'>+			if (!(ath6kl_is_wpa_ie(pos) || ath6kl_is_rsn_ie(pos))) {</div><div class='add'>+				memcpy(buf + len, pos, 2 + pos[1]);</div><div class='add'>+				len += 2 + pos[1];</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (ath6kl_is_wps_ie(pos))</div><div class='add'>+				ar-&gt;connect_ctrl_flags |= CONNECT_WPS_FLAG;</div><div class='add'>+</div><div class='add'>+			pos += 2 + pos[1];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_wmi_set_appie_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+				       WMI_FRAME_ASSOC_REQ, 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'>+static int ath6kl_nliftype_to_drv_iftype(enum nl80211_iftype type, u8 *nw_type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		*nw_type = INFRA_NETWORK;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		*nw_type = ADHOC_NETWORK;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_AP:</div><div class='add'>+		*nw_type = AP_NETWORK;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_P2P_CLIENT:</div><div class='add'>+		*nw_type = INFRA_NETWORK;</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_P2P_GO:</div><div class='add'>+		*nw_type = AP_NETWORK;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ath6kl_err("invalid interface type %u\n", type);</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 bool ath6kl_is_valid_iftype(struct ath6kl *ar, enum nl80211_iftype type,</div><div class='add'>+				   u8 *if_idx, u8 *nw_type)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (ath6kl_nliftype_to_drv_iftype(type, nw_type))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;ibss_if_active || ((type == NL80211_IFTYPE_ADHOC) &amp;&amp;</div><div class='add'>+	    ar-&gt;num_vif))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (type == NL80211_IFTYPE_STATION ||</div><div class='add'>+	    type == NL80211_IFTYPE_AP || type == NL80211_IFTYPE_ADHOC) {</div><div class='add'>+		for (i = 0; i &lt; ar-&gt;vif_max; i++) {</div><div class='add'>+			if ((ar-&gt;avail_idx_map &gt;&gt; i) &amp; BIT(0)) {</div><div class='add'>+				*if_idx = i;</div><div class='add'>+				return true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (type == NL80211_IFTYPE_P2P_CLIENT ||</div><div class='add'>+	    type == NL80211_IFTYPE_P2P_GO) {</div><div class='add'>+		for (i = ar-&gt;max_norm_iface; i &lt; ar-&gt;vif_max; i++) {</div><div class='add'>+			if ((ar-&gt;avail_idx_map &gt;&gt; i) &amp; BIT(0)) {</div><div class='add'>+				*if_idx = i;</div><div class='add'>+				return true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 				   struct cfg80211_connect_params *sme)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='ctx'> 	int status;</div><div class='add'>+	u8 nw_subtype = (ar-&gt;p2p) ? SUBTYPE_P2PDEV : SUBTYPE_NONE;</div><div class='ctx'> </div><div class='del'>-	ar-&gt;sme_state = SME_CONNECTING;</div><div class='add'>+	ath6kl_cfg80211_sscan_disable(vif);</div><div class='ctx'> </div><div class='del'>-	if (!ath6kl_cfg80211_ready(ar))</div><div class='add'>+	vif-&gt;sme_state = SME_CONNECTING;</div><div class='add'>+</div><div class='add'>+	if (!ath6kl_cfg80211_ready(vif))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(DESTROY_IN_PROGRESS, &amp;ar-&gt;flag)) {</div><div class='hunk'>@@ -287,12 +461,22 @@ static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (test_bit(CONNECTED, &amp;ar-&gt;flag) &amp;&amp;</div><div class='del'>-	    ar-&gt;ssid_len == sme-&gt;ssid_len &amp;&amp;</div><div class='del'>-	    !memcmp(ar-&gt;ssid, sme-&gt;ssid, ar-&gt;ssid_len)) {</div><div class='del'>-		ar-&gt;reconnect_flag = true;</div><div class='del'>-		status = ath6kl_wmi_reconnect_cmd(ar-&gt;wmi, ar-&gt;req_bssid,</div><div class='del'>-						  ar-&gt;ch_hint);</div><div class='add'>+	if (sme-&gt;ie &amp;&amp; (sme-&gt;ie_len &gt; 0)) {</div><div class='add'>+		status = ath6kl_set_assoc_req_ies(vif, sme-&gt;ie, sme-&gt;ie_len);</div><div class='add'>+		if (status) {</div><div class='add'>+			up(&amp;ar-&gt;sem);</div><div class='add'>+			return status;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		ar-&gt;connect_ctrl_flags &amp;= ~CONNECT_WPS_FLAG;</div><div class='add'>+</div><div class='add'>+	if (test_bit(CONNECTED, &amp;vif-&gt;flags) &amp;&amp;</div><div class='add'>+	    vif-&gt;ssid_len == sme-&gt;ssid_len &amp;&amp;</div><div class='add'>+	    !memcmp(vif-&gt;ssid, sme-&gt;ssid, vif-&gt;ssid_len)) {</div><div class='add'>+		vif-&gt;reconnect_flag = true;</div><div class='add'>+		status = ath6kl_wmi_reconnect_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+						  vif-&gt;req_bssid,</div><div class='add'>+						  vif-&gt;ch_hint);</div><div class='ctx'> </div><div class='ctx'> 		up(&amp;ar-&gt;sem);</div><div class='ctx'> 		if (status) {</div><div class='hunk'>@@ -300,42 +484,43 @@ static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='del'>-	} else if (ar-&gt;ssid_len == sme-&gt;ssid_len &amp;&amp;</div><div class='del'>-		   !memcmp(ar-&gt;ssid, sme-&gt;ssid, ar-&gt;ssid_len)) {</div><div class='del'>-		ath6kl_disconnect(ar);</div><div class='add'>+	} else if (vif-&gt;ssid_len == sme-&gt;ssid_len &amp;&amp;</div><div class='add'>+		   !memcmp(vif-&gt;ssid, sme-&gt;ssid, vif-&gt;ssid_len)) {</div><div class='add'>+		ath6kl_disconnect(vif);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(ar-&gt;ssid, 0, sizeof(ar-&gt;ssid));</div><div class='del'>-	ar-&gt;ssid_len = sme-&gt;ssid_len;</div><div class='del'>-	memcpy(ar-&gt;ssid, sme-&gt;ssid, sme-&gt;ssid_len);</div><div class='add'>+	memset(vif-&gt;ssid, 0, sizeof(vif-&gt;ssid));</div><div class='add'>+	vif-&gt;ssid_len = sme-&gt;ssid_len;</div><div class='add'>+	memcpy(vif-&gt;ssid, sme-&gt;ssid, sme-&gt;ssid_len);</div><div class='ctx'> </div><div class='ctx'> 	if (sme-&gt;channel)</div><div class='del'>-		ar-&gt;ch_hint = sme-&gt;channel-&gt;center_freq;</div><div class='add'>+		vif-&gt;ch_hint = sme-&gt;channel-&gt;center_freq;</div><div class='ctx'> </div><div class='del'>-	memset(ar-&gt;req_bssid, 0, sizeof(ar-&gt;req_bssid));</div><div class='add'>+	memset(vif-&gt;req_bssid, 0, sizeof(vif-&gt;req_bssid));</div><div class='ctx'> 	if (sme-&gt;bssid &amp;&amp; !is_broadcast_ether_addr(sme-&gt;bssid))</div><div class='del'>-		memcpy(ar-&gt;req_bssid, sme-&gt;bssid, sizeof(ar-&gt;req_bssid));</div><div class='add'>+		memcpy(vif-&gt;req_bssid, sme-&gt;bssid, sizeof(vif-&gt;req_bssid));</div><div class='ctx'> </div><div class='del'>-	ath6kl_set_wpa_version(ar, sme-&gt;crypto.wpa_versions);</div><div class='add'>+	ath6kl_set_wpa_version(vif, sme-&gt;crypto.wpa_versions);</div><div class='ctx'> </div><div class='del'>-	status = ath6kl_set_auth_type(ar, sme-&gt;auth_type);</div><div class='add'>+	status = ath6kl_set_auth_type(vif, sme-&gt;auth_type);</div><div class='ctx'> 	if (status) {</div><div class='ctx'> 		up(&amp;ar-&gt;sem);</div><div class='ctx'> 		return status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sme-&gt;crypto.n_ciphers_pairwise)</div><div class='del'>-		ath6kl_set_cipher(ar, sme-&gt;crypto.ciphers_pairwise[0], true);</div><div class='add'>+		ath6kl_set_cipher(vif, sme-&gt;crypto.ciphers_pairwise[0], true);</div><div class='ctx'> 	else</div><div class='del'>-		ath6kl_set_cipher(ar, 0, true);</div><div class='add'>+		ath6kl_set_cipher(vif, 0, true);</div><div class='ctx'> </div><div class='del'>-	ath6kl_set_cipher(ar, sme-&gt;crypto.cipher_group, false);</div><div class='add'>+	ath6kl_set_cipher(vif, sme-&gt;crypto.cipher_group, false);</div><div class='ctx'> </div><div class='ctx'> 	if (sme-&gt;crypto.n_akm_suites)</div><div class='del'>-		ath6kl_set_key_mgmt(ar, sme-&gt;crypto.akm_suites[0]);</div><div class='add'>+		ath6kl_set_key_mgmt(vif, sme-&gt;crypto.akm_suites[0]);</div><div class='ctx'> </div><div class='ctx'> 	if ((sme-&gt;key_len) &amp;&amp;</div><div class='del'>-	    (ar-&gt;auth_mode == NONE_AUTH) &amp;&amp; (ar-&gt;prwise_crypto == WEP_CRYPT)) {</div><div class='add'>+	    (vif-&gt;auth_mode == NONE_AUTH) &amp;&amp;</div><div class='add'>+	    (vif-&gt;prwise_crypto == WEP_CRYPT)) {</div><div class='ctx'> 		struct ath6kl_key *key = NULL;</div><div class='ctx'> </div><div class='ctx'> 		if (sme-&gt;key_idx &lt; WMI_MIN_KEY_INDEX ||</div><div class='hunk'>@@ -346,56 +531,60 @@ static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 			return -ENOENT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		key = &amp;ar-&gt;keys[sme-&gt;key_idx];</div><div class='add'>+		key = &amp;vif-&gt;keys[sme-&gt;key_idx];</div><div class='ctx'> 		key-&gt;key_len = sme-&gt;key_len;</div><div class='ctx'> 		memcpy(key-&gt;key, sme-&gt;key, key-&gt;key_len);</div><div class='del'>-		key-&gt;cipher = ar-&gt;prwise_crypto;</div><div class='del'>-		ar-&gt;def_txkey_index = sme-&gt;key_idx;</div><div class='add'>+		key-&gt;cipher = vif-&gt;prwise_crypto;</div><div class='add'>+		vif-&gt;def_txkey_index = sme-&gt;key_idx;</div><div class='ctx'> </div><div class='del'>-		ath6kl_wmi_addkey_cmd(ar-&gt;wmi, sme-&gt;key_idx,</div><div class='del'>-				      ar-&gt;prwise_crypto,</div><div class='add'>+		ath6kl_wmi_addkey_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx, sme-&gt;key_idx,</div><div class='add'>+				      vif-&gt;prwise_crypto,</div><div class='ctx'> 				      GROUP_USAGE | TX_USAGE,</div><div class='ctx'> 				      key-&gt;key_len,</div><div class='del'>-				      NULL,</div><div class='add'>+				      NULL, 0,</div><div class='ctx'> 				      key-&gt;key, KEY_OP_INIT_VAL, NULL,</div><div class='ctx'> 				      NO_SYNC_WMIFLAG);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ar-&gt;usr_bss_filter) {</div><div class='del'>-		clear_bit(CLEAR_BSSFILTER_ON_BEACON, &amp;ar-&gt;flag);</div><div class='del'>-		if (ath6kl_wmi_bssfilter_cmd(ar-&gt;wmi, ALL_BSS_FILTER, 0) != 0) {</div><div class='add'>+		clear_bit(CLEAR_BSSFILTER_ON_BEACON, &amp;vif-&gt;flags);</div><div class='add'>+		if (ath6kl_wmi_bssfilter_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+		    ALL_BSS_FILTER, 0) != 0) {</div><div class='ctx'> 			ath6kl_err("couldn't set bss filtering\n");</div><div class='ctx'> 			up(&amp;ar-&gt;sem);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ar-&gt;nw_type = ar-&gt;next_mode;</div><div class='add'>+	vif-&gt;nw_type = vif-&gt;next_mode;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;wdev.iftype == NL80211_IFTYPE_P2P_CLIENT)</div><div class='add'>+		nw_subtype = SUBTYPE_P2PCLIENT;</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,</div><div class='ctx'> 		   "%s: connect called with authmode %d dot11 auth %d"</div><div class='ctx'> 		   " PW crypto %d PW crypto len %d GRP crypto %d"</div><div class='ctx'> 		   " GRP crypto len %d channel hint %u\n",</div><div class='ctx'> 		   __func__,</div><div class='del'>-		   ar-&gt;auth_mode, ar-&gt;dot11_auth_mode, ar-&gt;prwise_crypto,</div><div class='del'>-		   ar-&gt;prwise_crypto_len, ar-&gt;grp_crypto,</div><div class='del'>-		   ar-&gt;grp_crypto_len, ar-&gt;ch_hint);</div><div class='del'>-</div><div class='del'>-	ar-&gt;reconnect_flag = 0;</div><div class='del'>-	status = ath6kl_wmi_connect_cmd(ar-&gt;wmi, ar-&gt;nw_type,</div><div class='del'>-					ar-&gt;dot11_auth_mode, ar-&gt;auth_mode,</div><div class='del'>-					ar-&gt;prwise_crypto,</div><div class='del'>-					ar-&gt;prwise_crypto_len,</div><div class='del'>-					ar-&gt;grp_crypto, ar-&gt;grp_crypto_len,</div><div class='del'>-					ar-&gt;ssid_len, ar-&gt;ssid,</div><div class='del'>-					ar-&gt;req_bssid, ar-&gt;ch_hint,</div><div class='del'>-					ar-&gt;connect_ctrl_flags);</div><div class='add'>+		   vif-&gt;auth_mode, vif-&gt;dot11_auth_mode, vif-&gt;prwise_crypto,</div><div class='add'>+		   vif-&gt;prwise_crypto_len, vif-&gt;grp_crypto,</div><div class='add'>+		   vif-&gt;grp_crypto_len, vif-&gt;ch_hint);</div><div class='add'>+</div><div class='add'>+	vif-&gt;reconnect_flag = 0;</div><div class='add'>+	status = ath6kl_wmi_connect_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx, vif-&gt;nw_type,</div><div class='add'>+					vif-&gt;dot11_auth_mode, vif-&gt;auth_mode,</div><div class='add'>+					vif-&gt;prwise_crypto,</div><div class='add'>+					vif-&gt;prwise_crypto_len,</div><div class='add'>+					vif-&gt;grp_crypto, vif-&gt;grp_crypto_len,</div><div class='add'>+					vif-&gt;ssid_len, vif-&gt;ssid,</div><div class='add'>+					vif-&gt;req_bssid, vif-&gt;ch_hint,</div><div class='add'>+					ar-&gt;connect_ctrl_flags, nw_subtype);</div><div class='ctx'> </div><div class='ctx'> 	up(&amp;ar-&gt;sem);</div><div class='ctx'> </div><div class='ctx'> 	if (status == -EINVAL) {</div><div class='del'>-		memset(ar-&gt;ssid, 0, sizeof(ar-&gt;ssid));</div><div class='del'>-		ar-&gt;ssid_len = 0;</div><div class='add'>+		memset(vif-&gt;ssid, 0, sizeof(vif-&gt;ssid));</div><div class='add'>+		vif-&gt;ssid_len = 0;</div><div class='ctx'> 		ath6kl_err("invalid request\n");</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	} else if (status) {</div><div class='hunk'>@@ -404,28 +593,40 @@ static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((!(ar-&gt;connect_ctrl_flags &amp; CONNECT_DO_WPA_OFFLOAD)) &amp;&amp;</div><div class='del'>-	    ((ar-&gt;auth_mode == WPA_PSK_AUTH)</div><div class='del'>-	     || (ar-&gt;auth_mode == WPA2_PSK_AUTH))) {</div><div class='del'>-		mod_timer(&amp;ar-&gt;disconnect_timer,</div><div class='add'>+	    ((vif-&gt;auth_mode == WPA_PSK_AUTH)</div><div class='add'>+	     || (vif-&gt;auth_mode == WPA2_PSK_AUTH))) {</div><div class='add'>+		mod_timer(&amp;vif-&gt;disconnect_timer,</div><div class='ctx'> 			  jiffies + msecs_to_jiffies(DISCON_TIMER_INTVAL));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;connect_ctrl_flags &amp;= ~CONNECT_DO_WPA_OFFLOAD;</div><div class='del'>-	set_bit(CONNECT_PEND, &amp;ar-&gt;flag);</div><div class='add'>+	set_bit(CONNECT_PEND, &amp;vif-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_add_bss_if_needed(struct ath6kl *ar, const u8 *bssid,</div><div class='add'>+static int ath6kl_add_bss_if_needed(struct ath6kl_vif *vif,</div><div class='add'>+				    enum network_type nw_type,</div><div class='add'>+				    const u8 *bssid,</div><div class='ctx'> 				    struct ieee80211_channel *chan,</div><div class='ctx'> 				    const u8 *beacon_ie, size_t beacon_ie_len)</div><div class='ctx'> {</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='ctx'> 	struct cfg80211_bss *bss;</div><div class='add'>+	u16 cap_mask, cap_val;</div><div class='ctx'> 	u8 *ie;</div><div class='ctx'> </div><div class='del'>-	bss = cfg80211_get_bss(ar-&gt;wdev-&gt;wiphy, chan, bssid,</div><div class='del'>-			       ar-&gt;ssid, ar-&gt;ssid_len, WLAN_CAPABILITY_ESS,</div><div class='del'>-			       WLAN_CAPABILITY_ESS);</div><div class='add'>+	if (nw_type &amp; ADHOC_NETWORK) {</div><div class='add'>+		cap_mask = WLAN_CAPABILITY_IBSS;</div><div class='add'>+		cap_val = WLAN_CAPABILITY_IBSS;</div><div class='add'>+	} else {</div><div class='add'>+		cap_mask = WLAN_CAPABILITY_ESS;</div><div class='add'>+		cap_val = WLAN_CAPABILITY_ESS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bss = cfg80211_get_bss(ar-&gt;wiphy, chan, bssid,</div><div class='add'>+			       vif-&gt;ssid, vif-&gt;ssid_len,</div><div class='add'>+			       cap_mask, cap_val);</div><div class='ctx'> 	if (bss == NULL) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Since cfg80211 may not yet know about the BSS,</div><div class='hunk'>@@ -435,21 +636,20 @@ static int ath6kl_add_bss_if_needed(struct ath6kl *ar, const u8 *bssid,</div><div class='ctx'> 		 * Prepend SSID element since it is not included in the Beacon</div><div class='ctx'> 		 * IEs from the target.</div><div class='ctx'> 		 */</div><div class='del'>-		ie = kmalloc(2 + ar-&gt;ssid_len + beacon_ie_len, GFP_KERNEL);</div><div class='add'>+		ie = kmalloc(2 + vif-&gt;ssid_len + beacon_ie_len, GFP_KERNEL);</div><div class='ctx'> 		if (ie == NULL)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		ie[0] = WLAN_EID_SSID;</div><div class='del'>-		ie[1] = ar-&gt;ssid_len;</div><div class='del'>-		memcpy(ie + 2, ar-&gt;ssid, ar-&gt;ssid_len);</div><div class='del'>-		memcpy(ie + 2 + ar-&gt;ssid_len, beacon_ie, beacon_ie_len);</div><div class='del'>-		bss = cfg80211_inform_bss(ar-&gt;wdev-&gt;wiphy, chan,</div><div class='del'>-					  bssid, 0, WLAN_CAPABILITY_ESS, 100,</div><div class='del'>-					  ie, 2 + ar-&gt;ssid_len + beacon_ie_len,</div><div class='add'>+		ie[1] = vif-&gt;ssid_len;</div><div class='add'>+		memcpy(ie + 2, vif-&gt;ssid, vif-&gt;ssid_len);</div><div class='add'>+		memcpy(ie + 2 + vif-&gt;ssid_len, beacon_ie, beacon_ie_len);</div><div class='add'>+		bss = cfg80211_inform_bss(ar-&gt;wiphy, chan,</div><div class='add'>+					  bssid, 0, cap_val, 100,</div><div class='add'>+					  ie, 2 + vif-&gt;ssid_len + beacon_ie_len,</div><div class='ctx'> 					  0, GFP_KERNEL);</div><div class='ctx'> 		if (bss)</div><div class='del'>-			ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "added dummy bss for "</div><div class='del'>-				   "%pM prior to indicating connect/roamed "</div><div class='del'>-				   "event\n", bssid);</div><div class='add'>+			ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "added bss %pM to "</div><div class='add'>+				   "cfg80211\n", bssid);</div><div class='ctx'> 		kfree(ie);</div><div class='ctx'> 	} else</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "cfg80211 already has a bss "</div><div class='hunk'>@@ -463,7 +663,7 @@ static int ath6kl_add_bss_if_needed(struct ath6kl *ar, const u8 *bssid,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_cfg80211_connect_event(struct ath6kl *ar, u16 channel,</div><div class='add'>+void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel,</div><div class='ctx'> 				   u8 *bssid, u16 listen_intvl,</div><div class='ctx'> 				   u16 beacon_intvl,</div><div class='ctx'> 				   enum network_type nw_type,</div><div class='hunk'>@@ -471,6 +671,7 @@ void ath6kl_cfg80211_connect_event(struct ath6kl *ar, u16 channel,</div><div class='ctx'> 				   u8 assoc_resp_len, u8 *assoc_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_channel *chan;</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='ctx'> </div><div class='ctx'> 	/* capinfo + listen interval */</div><div class='ctx'> 	u8 assoc_req_ie_offset = sizeof(u16) + sizeof(u16);</div><div class='hunk'>@@ -489,11 +690,11 @@ void ath6kl_cfg80211_connect_event(struct ath6kl *ar, u16 channel,</div><div class='ctx'> 	 * Store Beacon interval here; DTIM period will be available only once</div><div class='ctx'> 	 * a Beacon frame from the AP is seen.</div><div class='ctx'> 	 */</div><div class='del'>-	ar-&gt;assoc_bss_beacon_int = beacon_intvl;</div><div class='del'>-	clear_bit(DTIM_PERIOD_AVAIL, &amp;ar-&gt;flag);</div><div class='add'>+	vif-&gt;assoc_bss_beacon_int = beacon_intvl;</div><div class='add'>+	clear_bit(DTIM_PERIOD_AVAIL, &amp;vif-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	if (nw_type &amp; ADHOC_NETWORK) {</div><div class='del'>-		if (ar-&gt;wdev-&gt;iftype != NL80211_IFTYPE_ADHOC) {</div><div class='add'>+		if (vif-&gt;wdev.iftype != NL80211_IFTYPE_ADHOC) {</div><div class='ctx'> 			ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,</div><div class='ctx'> 				   "%s: ath6k not in ibss mode\n", __func__);</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -501,39 +702,39 @@ void ath6kl_cfg80211_connect_event(struct ath6kl *ar, u16 channel,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (nw_type &amp; INFRA_NETWORK) {</div><div class='del'>-		if (ar-&gt;wdev-&gt;iftype != NL80211_IFTYPE_STATION &amp;&amp;</div><div class='del'>-		    ar-&gt;wdev-&gt;iftype != NL80211_IFTYPE_P2P_CLIENT) {</div><div class='add'>+		if (vif-&gt;wdev.iftype != NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+		    vif-&gt;wdev.iftype != NL80211_IFTYPE_P2P_CLIENT) {</div><div class='ctx'> 			ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,</div><div class='ctx'> 				   "%s: ath6k not in station mode\n", __func__);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	chan = ieee80211_get_channel(ar-&gt;wdev-&gt;wiphy, (int) channel);</div><div class='del'>-</div><div class='add'>+	chan = ieee80211_get_channel(ar-&gt;wiphy, (int) channel);</div><div class='ctx'> </div><div class='del'>-	if (nw_type &amp; ADHOC_NETWORK) {</div><div class='del'>-		cfg80211_ibss_joined(ar-&gt;net_dev, bssid, GFP_KERNEL);</div><div class='add'>+	if (ath6kl_add_bss_if_needed(vif, nw_type, bssid, chan, assoc_info,</div><div class='add'>+				     beacon_ie_len) &lt; 0) {</div><div class='add'>+		ath6kl_err("could not add cfg80211 bss entry\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ath6kl_add_bss_if_needed(ar, bssid, chan, assoc_info,</div><div class='del'>-				     beacon_ie_len) &lt; 0) {</div><div class='del'>-		ath6kl_err("could not add cfg80211 bss entry for "</div><div class='del'>-			   "connect/roamed notification\n");</div><div class='add'>+	if (nw_type &amp; ADHOC_NETWORK) {</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "ad-hoc %s selected\n",</div><div class='add'>+			   nw_type &amp; ADHOC_CREATOR ? "creator" : "joiner");</div><div class='add'>+		cfg80211_ibss_joined(vif-&gt;ndev, bssid, GFP_KERNEL);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;sme_state == SME_CONNECTING) {</div><div class='add'>+	if (vif-&gt;sme_state == SME_CONNECTING) {</div><div class='ctx'> 		/* inform connect result to cfg80211 */</div><div class='del'>-		ar-&gt;sme_state = SME_CONNECTED;</div><div class='del'>-		cfg80211_connect_result(ar-&gt;net_dev, bssid,</div><div class='add'>+		vif-&gt;sme_state = SME_CONNECTED;</div><div class='add'>+		cfg80211_connect_result(vif-&gt;ndev, bssid,</div><div class='ctx'> 					assoc_req_ie, assoc_req_len,</div><div class='ctx'> 					assoc_resp_ie, assoc_resp_len,</div><div class='ctx'> 					WLAN_STATUS_SUCCESS, GFP_KERNEL);</div><div class='del'>-	} else if (ar-&gt;sme_state == SME_CONNECTED) {</div><div class='add'>+	} else if (vif-&gt;sme_state == SME_CONNECTED) {</div><div class='ctx'> 		/* inform roam event to cfg80211 */</div><div class='del'>-		cfg80211_roamed(ar-&gt;net_dev, chan, bssid,</div><div class='add'>+		cfg80211_roamed(vif-&gt;ndev, chan, bssid,</div><div class='ctx'> 				assoc_req_ie, assoc_req_len,</div><div class='ctx'> 				assoc_resp_ie, assoc_resp_len, GFP_KERNEL);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -542,12 +743,15 @@ void ath6kl_cfg80211_connect_event(struct ath6kl *ar, u16 channel,</div><div class='ctx'> static int ath6kl_cfg80211_disconnect(struct wiphy *wiphy,</div><div class='ctx'> 				      struct net_device *dev, u16 reason_code)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl *ar = (struct ath6kl *)ath6kl_priv(dev);</div><div class='add'>+	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: reason=%u\n", __func__,</div><div class='ctx'> 		   reason_code);</div><div class='ctx'> </div><div class='del'>-	if (!ath6kl_cfg80211_ready(ar))</div><div class='add'>+	ath6kl_cfg80211_sscan_disable(vif);</div><div class='add'>+</div><div class='add'>+	if (!ath6kl_cfg80211_ready(vif))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(DESTROY_IN_PROGRESS, &amp;ar-&gt;flag)) {</div><div class='hunk'>@@ -560,44 +764,46 @@ static int ath6kl_cfg80211_disconnect(struct wiphy *wiphy,</div><div class='ctx'> 		return -ERESTARTSYS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ar-&gt;reconnect_flag = 0;</div><div class='del'>-	ath6kl_disconnect(ar);</div><div class='del'>-	memset(ar-&gt;ssid, 0, sizeof(ar-&gt;ssid));</div><div class='del'>-	ar-&gt;ssid_len = 0;</div><div class='add'>+	vif-&gt;reconnect_flag = 0;</div><div class='add'>+	ath6kl_disconnect(vif);</div><div class='add'>+	memset(vif-&gt;ssid, 0, sizeof(vif-&gt;ssid));</div><div class='add'>+	vif-&gt;ssid_len = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(SKIP_SCAN, &amp;ar-&gt;flag))</div><div class='del'>-		memset(ar-&gt;req_bssid, 0, sizeof(ar-&gt;req_bssid));</div><div class='add'>+		memset(vif-&gt;req_bssid, 0, sizeof(vif-&gt;req_bssid));</div><div class='ctx'> </div><div class='ctx'> 	up(&amp;ar-&gt;sem);</div><div class='ctx'> </div><div class='del'>-	ar-&gt;sme_state = SME_DISCONNECTED;</div><div class='add'>+	vif-&gt;sme_state = SME_DISCONNECTED;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_cfg80211_disconnect_event(struct ath6kl *ar, u8 reason,</div><div class='add'>+void ath6kl_cfg80211_disconnect_event(struct ath6kl_vif *vif, u8 reason,</div><div class='ctx'> 				      u8 *bssid, u8 assoc_resp_len,</div><div class='ctx'> 				      u8 *assoc_info, u16 proto_reason)</div><div class='ctx'> {</div><div class='del'>-	if (ar-&gt;scan_req) {</div><div class='del'>-		cfg80211_scan_done(ar-&gt;scan_req, true);</div><div class='del'>-		ar-&gt;scan_req = NULL;</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;scan_req) {</div><div class='add'>+		cfg80211_scan_done(vif-&gt;scan_req, true);</div><div class='add'>+		vif-&gt;scan_req = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;nw_type &amp; ADHOC_NETWORK) {</div><div class='del'>-		if (ar-&gt;wdev-&gt;iftype != NL80211_IFTYPE_ADHOC) {</div><div class='add'>+	if (vif-&gt;nw_type &amp; ADHOC_NETWORK) {</div><div class='add'>+		if (vif-&gt;wdev.iftype != NL80211_IFTYPE_ADHOC) {</div><div class='ctx'> 			ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,</div><div class='ctx'> 				   "%s: ath6k not in ibss mode\n", __func__);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		memset(bssid, 0, ETH_ALEN);</div><div class='del'>-		cfg80211_ibss_joined(ar-&gt;net_dev, bssid, GFP_KERNEL);</div><div class='add'>+		cfg80211_ibss_joined(vif-&gt;ndev, bssid, GFP_KERNEL);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;nw_type &amp; INFRA_NETWORK) {</div><div class='del'>-		if (ar-&gt;wdev-&gt;iftype != NL80211_IFTYPE_STATION &amp;&amp;</div><div class='del'>-		    ar-&gt;wdev-&gt;iftype != NL80211_IFTYPE_P2P_CLIENT) {</div><div class='add'>+	if (vif-&gt;nw_type &amp; INFRA_NETWORK) {</div><div class='add'>+		if (vif-&gt;wdev.iftype != NL80211_IFTYPE_STATION &amp;&amp;</div><div class='add'>+		    vif-&gt;wdev.iftype != NL80211_IFTYPE_P2P_CLIENT) {</div><div class='ctx'> 			ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,</div><div class='ctx'> 				   "%s: ath6k not in station mode\n", __func__);</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -614,42 +820,46 @@ void ath6kl_cfg80211_disconnect_event(struct ath6kl *ar, u8 reason,</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (reason != DISCONNECT_CMD) {</div><div class='del'>-		ath6kl_wmi_disconnect_cmd(ar-&gt;wmi);</div><div class='add'>+		ath6kl_wmi_disconnect_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	clear_bit(CONNECT_PEND, &amp;ar-&gt;flag);</div><div class='add'>+	clear_bit(CONNECT_PEND, &amp;vif-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;sme_state == SME_CONNECTING) {</div><div class='del'>-		cfg80211_connect_result(ar-&gt;net_dev,</div><div class='add'>+	if (vif-&gt;sme_state == SME_CONNECTING) {</div><div class='add'>+		cfg80211_connect_result(vif-&gt;ndev,</div><div class='ctx'> 				bssid, NULL, 0,</div><div class='ctx'> 				NULL, 0,</div><div class='ctx'> 				WLAN_STATUS_UNSPECIFIED_FAILURE,</div><div class='ctx'> 				GFP_KERNEL);</div><div class='del'>-	} else if (ar-&gt;sme_state == SME_CONNECTED) {</div><div class='del'>-		cfg80211_disconnected(ar-&gt;net_dev, reason,</div><div class='add'>+	} else if (vif-&gt;sme_state == SME_CONNECTED) {</div><div class='add'>+		cfg80211_disconnected(vif-&gt;ndev, reason,</div><div class='ctx'> 				NULL, 0, GFP_KERNEL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ar-&gt;sme_state = SME_DISCONNECTED;</div><div class='add'>+	vif-&gt;sme_state = SME_DISCONNECTED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 				struct cfg80211_scan_request *request)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl *ar = (struct ath6kl *)ath6kl_priv(ndev);</div><div class='add'>+	struct ath6kl *ar = ath6kl_priv(ndev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(ndev);</div><div class='ctx'> 	s8 n_channels = 0;</div><div class='ctx'> 	u16 *channels = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	u32 force_fg_scan = 0;</div><div class='ctx'> </div><div class='del'>-	if (!ath6kl_cfg80211_ready(ar))</div><div class='add'>+	if (!ath6kl_cfg80211_ready(vif))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='add'>+	ath6kl_cfg80211_sscan_disable(vif);</div><div class='add'>+</div><div class='ctx'> 	if (!ar-&gt;usr_bss_filter) {</div><div class='del'>-		clear_bit(CLEAR_BSSFILTER_ON_BEACON, &amp;ar-&gt;flag);</div><div class='add'>+		clear_bit(CLEAR_BSSFILTER_ON_BEACON, &amp;vif-&gt;flags);</div><div class='ctx'> 		ret = ath6kl_wmi_bssfilter_cmd(</div><div class='del'>-			ar-&gt;wmi,</div><div class='del'>-			(test_bit(CONNECTED, &amp;ar-&gt;flag) ?</div><div class='add'>+			ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+			(test_bit(CONNECTED, &amp;vif-&gt;flags) ?</div><div class='ctx'> 			 ALL_BUT_BSS_FILTER : ALL_BSS_FILTER), 0);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath6kl_err("couldn't set bss filtering\n");</div><div class='hunk'>@@ -664,14 +874,19 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 			request-&gt;n_ssids = MAX_PROBED_SSID_INDEX - 1;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; request-&gt;n_ssids; i++)</div><div class='del'>-			ath6kl_wmi_probedssid_cmd(ar-&gt;wmi, i + 1,</div><div class='del'>-						  SPECIFIC_SSID_FLAG,</div><div class='add'>+			ath6kl_wmi_probedssid_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+						  i + 1, SPECIFIC_SSID_FLAG,</div><div class='ctx'> 						  request-&gt;ssids[i].ssid_len,</div><div class='ctx'> 						  request-&gt;ssids[i].ssid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * FIXME: we should clear the IE in fw if it's not set so just</div><div class='add'>+	 * remove the check altogether</div><div class='add'>+	 */</div><div class='ctx'> 	if (request-&gt;ie) {</div><div class='del'>-		ret = ath6kl_wmi_set_appie_cmd(ar-&gt;wmi, WMI_FRAME_PROBE_REQ,</div><div class='add'>+		ret = ath6kl_wmi_set_appie_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+					       WMI_FRAME_PROBE_REQ,</div><div class='ctx'> 					       request-&gt;ie, request-&gt;ie_len);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath6kl_err("failed to set Probe Request appie for "</div><div class='hunk'>@@ -702,44 +917,63 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 			channels[i] = request-&gt;channels[i]-&gt;center_freq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_startscan_cmd(ar-&gt;wmi, WMI_LONG_SCAN, 0,</div><div class='del'>-				       false, 0, 0, n_channels, channels);</div><div class='add'>+	if (test_bit(CONNECTED, &amp;vif-&gt;flags))</div><div class='add'>+		force_fg_scan = 1;</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH6KL_FW_CAPABILITY_STA_P2PDEV_DUPLEX,</div><div class='add'>+		    ar-&gt;fw_capabilities)) {</div><div class='add'>+		/*</div><div class='add'>+		 * If capable of doing P2P mgmt operations using</div><div class='add'>+		 * station interface, send additional information like</div><div class='add'>+		 * supported rates to advertise and xmit rates for</div><div class='add'>+		 * probe requests</div><div class='add'>+		 */</div><div class='add'>+		ret = ath6kl_wmi_beginscan_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+						WMI_LONG_SCAN, force_fg_scan,</div><div class='add'>+						false, 0, 0, n_channels,</div><div class='add'>+						channels, request-&gt;no_cck,</div><div class='add'>+						request-&gt;rates);</div><div class='add'>+	} else {</div><div class='add'>+		ret = ath6kl_wmi_startscan_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+						WMI_LONG_SCAN, force_fg_scan,</div><div class='add'>+						false, 0, 0, n_channels,</div><div class='add'>+						channels);</div><div class='add'>+	}</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		ath6kl_err("wmi_startscan_cmd failed\n");</div><div class='ctx'> 	else</div><div class='del'>-		ar-&gt;scan_req = request;</div><div class='add'>+		vif-&gt;scan_req = request;</div><div class='ctx'> </div><div class='ctx'> 	kfree(channels);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_cfg80211_scan_complete_event(struct ath6kl *ar, int status)</div><div class='add'>+void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, bool aborted)</div><div class='ctx'> {</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: status %d\n", __func__, status);</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: status%s\n", __func__,</div><div class='add'>+		   aborted ? " aborted" : "");</div><div class='ctx'> </div><div class='del'>-	if (!ar-&gt;scan_req)</div><div class='add'>+	if (!vif-&gt;scan_req)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if ((status == -ECANCELED) || (status == -EBUSY)) {</div><div class='del'>-		cfg80211_scan_done(ar-&gt;scan_req, true);</div><div class='add'>+	if (aborted)</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	cfg80211_scan_done(ar-&gt;scan_req, false);</div><div class='del'>-</div><div class='del'>-	if (ar-&gt;scan_req-&gt;n_ssids &amp;&amp; ar-&gt;scan_req-&gt;ssids[0].ssid_len) {</div><div class='del'>-		for (i = 0; i &lt; ar-&gt;scan_req-&gt;n_ssids; i++) {</div><div class='del'>-			ath6kl_wmi_probedssid_cmd(ar-&gt;wmi, i + 1,</div><div class='del'>-						  DISABLE_SSID_FLAG,</div><div class='add'>+	if (vif-&gt;scan_req-&gt;n_ssids &amp;&amp; vif-&gt;scan_req-&gt;ssids[0].ssid_len) {</div><div class='add'>+		for (i = 0; i &lt; vif-&gt;scan_req-&gt;n_ssids; i++) {</div><div class='add'>+			ath6kl_wmi_probedssid_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+						  i + 1, DISABLE_SSID_FLAG,</div><div class='ctx'> 						  0, NULL);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	ar-&gt;scan_req = NULL;</div><div class='add'>+	cfg80211_scan_done(vif-&gt;scan_req, aborted);</div><div class='add'>+	vif-&gt;scan_req = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='hunk'>@@ -747,15 +981,22 @@ static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 				   const u8 *mac_addr,</div><div class='ctx'> 				   struct key_params *params)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl *ar = (struct ath6kl *)ath6kl_priv(ndev);</div><div class='add'>+	struct ath6kl *ar = ath6kl_priv(ndev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(ndev);</div><div class='ctx'> 	struct ath6kl_key *key = NULL;</div><div class='ctx'> 	u8 key_usage;</div><div class='ctx'> 	u8 key_type;</div><div class='del'>-	int status = 0;</div><div class='ctx'> </div><div class='del'>-	if (!ath6kl_cfg80211_ready(ar))</div><div class='add'>+	if (!ath6kl_cfg80211_ready(vif))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='add'>+	if (params-&gt;cipher == CCKM_KRK_CIPHER_SUITE) {</div><div class='add'>+		if (params-&gt;key_len != WMI_KRK_LEN)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return ath6kl_wmi_add_krk_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+					      params-&gt;key);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (key_index &lt; WMI_MIN_KEY_INDEX || key_index &gt; WMI_MAX_KEY_INDEX) {</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,</div><div class='ctx'> 			   "%s: key index %d out of bounds\n", __func__,</div><div class='hunk'>@@ -763,7 +1004,7 @@ static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	key = &amp;ar-&gt;keys[key_index];</div><div class='add'>+	key = &amp;vif-&gt;keys[key_index];</div><div class='ctx'> 	memset(key, 0, sizeof(struct ath6kl_key));</div><div class='ctx'> </div><div class='ctx'> 	if (pairwise)</div><div class='hunk'>@@ -772,13 +1013,19 @@ static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 		key_usage = GROUP_USAGE;</div><div class='ctx'> </div><div class='ctx'> 	if (params) {</div><div class='add'>+		int seq_len = params-&gt;seq_len;</div><div class='add'>+		if (params-&gt;cipher == WLAN_CIPHER_SUITE_SMS4 &amp;&amp;</div><div class='add'>+		    seq_len &gt; ATH6KL_KEY_SEQ_LEN) {</div><div class='add'>+			/* Only first half of the WPI PN is configured */</div><div class='add'>+			seq_len = ATH6KL_KEY_SEQ_LEN;</div><div class='add'>+		}</div><div class='ctx'> 		if (params-&gt;key_len &gt; WLAN_MAX_KEY_LEN ||</div><div class='del'>-		    params-&gt;seq_len &gt; sizeof(key-&gt;seq))</div><div class='add'>+		    seq_len &gt; sizeof(key-&gt;seq))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		key-&gt;key_len = params-&gt;key_len;</div><div class='ctx'> 		memcpy(key-&gt;key, params-&gt;key, key-&gt;key_len);</div><div class='del'>-		key-&gt;seq_len = params-&gt;seq_len;</div><div class='add'>+		key-&gt;seq_len = seq_len;</div><div class='ctx'> 		memcpy(key-&gt;seq, params-&gt;seq, key-&gt;seq_len);</div><div class='ctx'> 		key-&gt;cipher = params-&gt;cipher;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -796,31 +1043,33 @@ static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_CCMP:</div><div class='ctx'> 		key_type = AES_CRYPT;</div><div class='ctx'> 		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_SMS4:</div><div class='add'>+		key_type = WAPI_CRYPT;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (((ar-&gt;auth_mode == WPA_PSK_AUTH)</div><div class='del'>-	     || (ar-&gt;auth_mode == WPA2_PSK_AUTH))</div><div class='add'>+	if (((vif-&gt;auth_mode == WPA_PSK_AUTH)</div><div class='add'>+	     || (vif-&gt;auth_mode == WPA2_PSK_AUTH))</div><div class='ctx'> 	    &amp;&amp; (key_usage &amp; GROUP_USAGE))</div><div class='del'>-		del_timer(&amp;ar-&gt;disconnect_timer);</div><div class='add'>+		del_timer(&amp;vif-&gt;disconnect_timer);</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,</div><div class='ctx'> 		   "%s: index %d, key_len %d, key_type 0x%x, key_usage 0x%x, seq_len %d\n",</div><div class='ctx'> 		   __func__, key_index, key-&gt;key_len, key_type,</div><div class='ctx'> 		   key_usage, key-&gt;seq_len);</div><div class='ctx'> </div><div class='del'>-	ar-&gt;def_txkey_index = key_index;</div><div class='del'>-</div><div class='del'>-	if (ar-&gt;nw_type == AP_NETWORK &amp;&amp; !pairwise &amp;&amp;</div><div class='del'>-	    (key_type == TKIP_CRYPT || key_type == AES_CRYPT) &amp;&amp; params) {</div><div class='add'>+	if (vif-&gt;nw_type == AP_NETWORK &amp;&amp; !pairwise &amp;&amp;</div><div class='add'>+	    (key_type == TKIP_CRYPT || key_type == AES_CRYPT ||</div><div class='add'>+	     key_type == WAPI_CRYPT) &amp;&amp; params) {</div><div class='ctx'> 		ar-&gt;ap_mode_bkey.valid = true;</div><div class='ctx'> 		ar-&gt;ap_mode_bkey.key_index = key_index;</div><div class='ctx'> 		ar-&gt;ap_mode_bkey.key_type = key_type;</div><div class='ctx'> 		ar-&gt;ap_mode_bkey.key_len = key-&gt;key_len;</div><div class='ctx'> 		memcpy(ar-&gt;ap_mode_bkey.key, key-&gt;key, key-&gt;key_len);</div><div class='del'>-		if (!test_bit(CONNECTED, &amp;ar-&gt;flag)) {</div><div class='add'>+		if (!test_bit(CONNECTED, &amp;vif-&gt;flags)) {</div><div class='ctx'> 			ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "Delay initial group "</div><div class='ctx'> 				   "key configuration until AP mode has been "</div><div class='ctx'> 				   "started\n");</div><div class='hunk'>@@ -832,8 +1081,8 @@ static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;next_mode == AP_NETWORK &amp;&amp; key_type == WEP_CRYPT &amp;&amp;</div><div class='del'>-	    !test_bit(CONNECTED, &amp;ar-&gt;flag)) {</div><div class='add'>+	if (vif-&gt;next_mode == AP_NETWORK &amp;&amp; key_type == WEP_CRYPT &amp;&amp;</div><div class='add'>+	    !test_bit(CONNECTED, &amp;vif-&gt;flags)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Store the key locally so that it can be re-configured after</div><div class='ctx'> 		 * the AP mode has properly started</div><div class='hunk'>@@ -841,31 +1090,29 @@ static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 		 */</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "Delay WEP key configuration "</div><div class='ctx'> 			   "until AP mode has been started\n");</div><div class='del'>-		ar-&gt;wep_key_list[key_index].key_len = key-&gt;key_len;</div><div class='del'>-		memcpy(ar-&gt;wep_key_list[key_index].key, key-&gt;key, key-&gt;key_len);</div><div class='add'>+		vif-&gt;wep_key_list[key_index].key_len = key-&gt;key_len;</div><div class='add'>+		memcpy(vif-&gt;wep_key_list[key_index].key, key-&gt;key,</div><div class='add'>+		       key-&gt;key_len);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = ath6kl_wmi_addkey_cmd(ar-&gt;wmi, ar-&gt;def_txkey_index,</div><div class='del'>-				       key_type, key_usage, key-&gt;key_len,</div><div class='del'>-				       key-&gt;seq, key-&gt;key, KEY_OP_INIT_VAL,</div><div class='del'>-				       (u8 *) mac_addr, SYNC_BOTH_WMIFLAG);</div><div class='del'>-</div><div class='del'>-	if (status)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return ath6kl_wmi_addkey_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx, key_index,</div><div class='add'>+				     key_type, key_usage, key-&gt;key_len,</div><div class='add'>+				     key-&gt;seq, key-&gt;seq_len, key-&gt;key,</div><div class='add'>+				     KEY_OP_INIT_VAL,</div><div class='add'>+				     (u8 *) mac_addr, SYNC_BOTH_WMIFLAG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 				   u8 key_index, bool pairwise,</div><div class='ctx'> 				   const u8 *mac_addr)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl *ar = (struct ath6kl *)ath6kl_priv(ndev);</div><div class='add'>+	struct ath6kl *ar = ath6kl_priv(ndev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(ndev);</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: index %d\n", __func__, key_index);</div><div class='ctx'> </div><div class='del'>-	if (!ath6kl_cfg80211_ready(ar))</div><div class='add'>+	if (!ath6kl_cfg80211_ready(vif))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (key_index &lt; WMI_MIN_KEY_INDEX || key_index &gt; WMI_MAX_KEY_INDEX) {</div><div class='hunk'>@@ -875,15 +1122,15 @@ static int ath6kl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ar-&gt;keys[key_index].key_len) {</div><div class='add'>+	if (!vif-&gt;keys[key_index].key_len) {</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,</div><div class='ctx'> 			   "%s: index %d is empty\n", __func__, key_index);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ar-&gt;keys[key_index].key_len = 0;</div><div class='add'>+	vif-&gt;keys[key_index].key_len = 0;</div><div class='ctx'> </div><div class='del'>-	return ath6kl_wmi_deletekey_cmd(ar-&gt;wmi, key_index);</div><div class='add'>+	return ath6kl_wmi_deletekey_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx, key_index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='hunk'>@@ -892,13 +1139,13 @@ static int ath6kl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 				   void (*callback) (void *cookie,</div><div class='ctx'> 						     struct key_params *))</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl *ar = (struct ath6kl *)ath6kl_priv(ndev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(ndev);</div><div class='ctx'> 	struct ath6kl_key *key = NULL;</div><div class='ctx'> 	struct key_params params;</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: index %d\n", __func__, key_index);</div><div class='ctx'> </div><div class='del'>-	if (!ath6kl_cfg80211_ready(ar))</div><div class='add'>+	if (!ath6kl_cfg80211_ready(vif))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (key_index &lt; WMI_MIN_KEY_INDEX || key_index &gt; WMI_MAX_KEY_INDEX) {</div><div class='hunk'>@@ -908,7 +1155,7 @@ static int ath6kl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	key = &amp;ar-&gt;keys[key_index];</div><div class='add'>+	key = &amp;vif-&gt;keys[key_index];</div><div class='ctx'> 	memset(&amp;params, 0, sizeof(params));</div><div class='ctx'> 	params.cipher = key-&gt;cipher;</div><div class='ctx'> 	params.key_len = key-&gt;key_len;</div><div class='hunk'>@@ -926,15 +1173,15 @@ static int ath6kl_cfg80211_set_default_key(struct wiphy *wiphy,</div><div class='ctx'> 					   u8 key_index, bool unicast,</div><div class='ctx'> 					   bool multicast)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl *ar = (struct ath6kl *)ath6kl_priv(ndev);</div><div class='add'>+	struct ath6kl *ar = ath6kl_priv(ndev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(ndev);</div><div class='ctx'> 	struct ath6kl_key *key = NULL;</div><div class='del'>-	int status = 0;</div><div class='ctx'> 	u8 key_usage;</div><div class='ctx'> 	enum crypto_type key_type = NONE_CRYPT;</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: index %d\n", __func__, key_index);</div><div class='ctx'> </div><div class='del'>-	if (!ath6kl_cfg80211_ready(ar))</div><div class='add'>+	if (!ath6kl_cfg80211_ready(vif))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (key_index &lt; WMI_MIN_KEY_INDEX || key_index &gt; WMI_MAX_KEY_INDEX) {</div><div class='hunk'>@@ -944,43 +1191,41 @@ static int ath6kl_cfg80211_set_default_key(struct wiphy *wiphy,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ar-&gt;keys[key_index].key_len) {</div><div class='add'>+	if (!vif-&gt;keys[key_index].key_len) {</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: invalid key index %d\n",</div><div class='ctx'> 			   __func__, key_index);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ar-&gt;def_txkey_index = key_index;</div><div class='del'>-	key = &amp;ar-&gt;keys[ar-&gt;def_txkey_index];</div><div class='add'>+	vif-&gt;def_txkey_index = key_index;</div><div class='add'>+	key = &amp;vif-&gt;keys[vif-&gt;def_txkey_index];</div><div class='ctx'> 	key_usage = GROUP_USAGE;</div><div class='del'>-	if (ar-&gt;prwise_crypto == WEP_CRYPT)</div><div class='add'>+	if (vif-&gt;prwise_crypto == WEP_CRYPT)</div><div class='ctx'> 		key_usage |= TX_USAGE;</div><div class='ctx'> 	if (unicast)</div><div class='del'>-		key_type = ar-&gt;prwise_crypto;</div><div class='add'>+		key_type = vif-&gt;prwise_crypto;</div><div class='ctx'> 	if (multicast)</div><div class='del'>-		key_type = ar-&gt;grp_crypto;</div><div class='add'>+		key_type = vif-&gt;grp_crypto;</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;next_mode == AP_NETWORK &amp;&amp; !test_bit(CONNECTED, &amp;ar-&gt;flag))</div><div class='add'>+	if (vif-&gt;next_mode == AP_NETWORK &amp;&amp; !test_bit(CONNECTED, &amp;vif-&gt;flags))</div><div class='ctx'> 		return 0; /* Delay until AP mode has been started */</div><div class='ctx'> </div><div class='del'>-	status = ath6kl_wmi_addkey_cmd(ar-&gt;wmi, ar-&gt;def_txkey_index,</div><div class='del'>-				       key_type, key_usage,</div><div class='del'>-				       key-&gt;key_len, key-&gt;seq, key-&gt;key,</div><div class='del'>-				       KEY_OP_INIT_VAL, NULL,</div><div class='del'>-				       SYNC_BOTH_WMIFLAG);</div><div class='del'>-	if (status)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return ath6kl_wmi_addkey_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+				     vif-&gt;def_txkey_index,</div><div class='add'>+				     key_type, key_usage,</div><div class='add'>+				     key-&gt;key_len, key-&gt;seq, key-&gt;seq_len,</div><div class='add'>+				     key-&gt;key,</div><div class='add'>+				     KEY_OP_INIT_VAL, NULL,</div><div class='add'>+				     SYNC_BOTH_WMIFLAG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_cfg80211_tkip_micerr_event(struct ath6kl *ar, u8 keyid,</div><div class='add'>+void ath6kl_cfg80211_tkip_micerr_event(struct ath6kl_vif *vif, u8 keyid,</div><div class='ctx'> 				       bool ismcast)</div><div class='ctx'> {</div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,</div><div class='ctx'> 		   "%s: keyid %d, ismcast %d\n", __func__, keyid, ismcast);</div><div class='ctx'> </div><div class='del'>-	cfg80211_michael_mic_failure(ar-&gt;net_dev, ar-&gt;bssid,</div><div class='add'>+	cfg80211_michael_mic_failure(vif-&gt;ndev, vif-&gt;bssid,</div><div class='ctx'> 				     (ismcast ? NL80211_KEYTYPE_GROUP :</div><div class='ctx'> 				      NL80211_KEYTYPE_PAIRWISE), keyid, NULL,</div><div class='ctx'> 				     GFP_KERNEL);</div><div class='hunk'>@@ -989,12 +1234,17 @@ void ath6kl_cfg80211_tkip_micerr_event(struct ath6kl *ar, u8 keyid,</div><div class='ctx'> static int ath6kl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = (struct ath6kl *)wiphy_priv(wiphy);</div><div class='add'>+	struct ath6kl_vif *vif;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: changed 0x%x\n", __func__,</div><div class='ctx'> 		   changed);</div><div class='ctx'> </div><div class='del'>-	if (!ath6kl_cfg80211_ready(ar))</div><div class='add'>+	vif = ath6kl_vif_first(ar);</div><div class='add'>+	if (!vif)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (!ath6kl_cfg80211_ready(vif))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; WIPHY_PARAM_RTS_THRESHOLD) {</div><div class='hunk'>@@ -1014,15 +1264,21 @@ static int ath6kl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)</div><div class='ctx'> */</div><div class='ctx'> static int ath6kl_cfg80211_set_txpower(struct wiphy *wiphy,</div><div class='ctx'> 				       enum nl80211_tx_power_setting type,</div><div class='del'>-				       int dbm)</div><div class='add'>+				       int mbm)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = (struct ath6kl *)wiphy_priv(wiphy);</div><div class='add'>+	struct ath6kl_vif *vif;</div><div class='ctx'> 	u8 ath6kl_dbm;</div><div class='add'>+	int dbm = MBM_TO_DBM(mbm);</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: type 0x%x, dbm %d\n", __func__,</div><div class='ctx'> 		   type, dbm);</div><div class='ctx'> </div><div class='del'>-	if (!ath6kl_cfg80211_ready(ar))</div><div class='add'>+	vif = ath6kl_vif_first(ar);</div><div class='add'>+	if (!vif)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (!ath6kl_cfg80211_ready(vif))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='hunk'>@@ -1037,7 +1293,7 @@ static int ath6kl_cfg80211_set_txpower(struct wiphy *wiphy,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath6kl_wmi_set_tx_pwr_cmd(ar-&gt;wmi, ath6kl_dbm);</div><div class='add'>+	ath6kl_wmi_set_tx_pwr_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx, ath6kl_dbm);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1045,14 +1301,19 @@ static int ath6kl_cfg80211_set_txpower(struct wiphy *wiphy,</div><div class='ctx'> static int ath6kl_cfg80211_get_txpower(struct wiphy *wiphy, int *dbm)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = (struct ath6kl *)wiphy_priv(wiphy);</div><div class='add'>+	struct ath6kl_vif *vif;</div><div class='add'>+</div><div class='add'>+	vif = ath6kl_vif_first(ar);</div><div class='add'>+	if (!vif)</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (!ath6kl_cfg80211_ready(ar))</div><div class='add'>+	if (!ath6kl_cfg80211_ready(vif))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(CONNECTED, &amp;ar-&gt;flag)) {</div><div class='add'>+	if (test_bit(CONNECTED, &amp;vif-&gt;flags)) {</div><div class='ctx'> 		ar-&gt;tx_pwr = 0;</div><div class='ctx'> </div><div class='del'>-		if (ath6kl_wmi_get_tx_pwr_cmd(ar-&gt;wmi) != 0) {</div><div class='add'>+		if (ath6kl_wmi_get_tx_pwr_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx) != 0) {</div><div class='ctx'> 			ath6kl_err("ath6kl_wmi_get_tx_pwr_cmd failed\n");</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1076,11 +1337,12 @@ static int ath6kl_cfg80211_set_power_mgmt(struct wiphy *wiphy,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='ctx'> 	struct wmi_power_mode_cmd mode;</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: pmgmt %d, timeout %d\n",</div><div class='ctx'> 		   __func__, pmgmt, timeout);</div><div class='ctx'> </div><div class='del'>-	if (!ath6kl_cfg80211_ready(ar))</div><div class='add'>+	if (!ath6kl_cfg80211_ready(vif))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (pmgmt) {</div><div class='hunk'>@@ -1091,7 +1353,8 @@ static int ath6kl_cfg80211_set_power_mgmt(struct wiphy *wiphy,</div><div class='ctx'> 		mode.pwr_mode = MAX_PERF_POWER;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ath6kl_wmi_powermode_cmd(ar-&gt;wmi, mode.pwr_mode) != 0) {</div><div class='add'>+	if (ath6kl_wmi_powermode_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+	     mode.pwr_mode) != 0) {</div><div class='ctx'> 		ath6kl_err("wmi_powermode_cmd failed\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1099,41 +1362,83 @@ static int ath6kl_cfg80211_set_power_mgmt(struct wiphy *wiphy,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct net_device *ath6kl_cfg80211_add_iface(struct wiphy *wiphy,</div><div class='add'>+						    char *name,</div><div class='add'>+						    enum nl80211_iftype type,</div><div class='add'>+						    u32 *flags,</div><div class='add'>+						    struct vif_params *params)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = wiphy_priv(wiphy);</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	u8 if_idx, nw_type;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;num_vif == ar-&gt;vif_max) {</div><div class='add'>+		ath6kl_err("Reached maximum number of supported vif\n");</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ath6kl_is_valid_iftype(ar, type, &amp;if_idx, &amp;nw_type)) {</div><div class='add'>+		ath6kl_err("Not a supported interface type\n");</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ndev = ath6kl_interface_add(ar, name, type, if_idx, nw_type);</div><div class='add'>+	if (!ndev)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	ar-&gt;num_vif++;</div><div class='add'>+</div><div class='add'>+	return ndev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath6kl_cfg80211_del_iface(struct wiphy *wiphy,</div><div class='add'>+				     struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = wiphy_priv(wiphy);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;list_lock);</div><div class='add'>+	list_del(&amp;vif-&gt;list);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;list_lock);</div><div class='add'>+</div><div class='add'>+	ath6kl_cleanup_vif(vif, test_bit(WMI_READY, &amp;ar-&gt;flag));</div><div class='add'>+</div><div class='add'>+	ath6kl_deinit_if_data(vif);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ath6kl_cfg80211_change_iface(struct wiphy *wiphy,</div><div class='ctx'> 					struct net_device *ndev,</div><div class='ctx'> 					enum nl80211_iftype type, u32 *flags,</div><div class='ctx'> 					struct vif_params *params)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl *ar = ath6kl_priv(ndev);</div><div class='del'>-	struct wireless_dev *wdev = ar-&gt;wdev;</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(ndev);</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: type %u\n", __func__, type);</div><div class='ctx'> </div><div class='del'>-	if (!ath6kl_cfg80211_ready(ar))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='del'>-		ar-&gt;next_mode = INFRA_NETWORK;</div><div class='add'>+		vif-&gt;next_mode = INFRA_NETWORK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		ar-&gt;next_mode = ADHOC_NETWORK;</div><div class='add'>+		vif-&gt;next_mode = ADHOC_NETWORK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='del'>-		ar-&gt;next_mode = AP_NETWORK;</div><div class='add'>+		vif-&gt;next_mode = AP_NETWORK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_P2P_CLIENT:</div><div class='del'>-		ar-&gt;next_mode = INFRA_NETWORK;</div><div class='add'>+		vif-&gt;next_mode = INFRA_NETWORK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_P2P_GO:</div><div class='del'>-		ar-&gt;next_mode = AP_NETWORK;</div><div class='add'>+		vif-&gt;next_mode = AP_NETWORK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ath6kl_err("invalid interface type %u\n", type);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wdev-&gt;iftype = type;</div><div class='add'>+	vif-&gt;wdev.iftype = type;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1143,16 +1448,17 @@ static int ath6kl_cfg80211_join_ibss(struct wiphy *wiphy,</div><div class='ctx'> 				     struct cfg80211_ibss_params *ibss_param)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	if (!ath6kl_cfg80211_ready(ar))</div><div class='add'>+	if (!ath6kl_cfg80211_ready(vif))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	ar-&gt;ssid_len = ibss_param-&gt;ssid_len;</div><div class='del'>-	memcpy(ar-&gt;ssid, ibss_param-&gt;ssid, ar-&gt;ssid_len);</div><div class='add'>+	vif-&gt;ssid_len = ibss_param-&gt;ssid_len;</div><div class='add'>+	memcpy(vif-&gt;ssid, ibss_param-&gt;ssid, vif-&gt;ssid_len);</div><div class='ctx'> </div><div class='ctx'> 	if (ibss_param-&gt;channel)</div><div class='del'>-		ar-&gt;ch_hint = ibss_param-&gt;channel-&gt;center_freq;</div><div class='add'>+		vif-&gt;ch_hint = ibss_param-&gt;channel-&gt;center_freq;</div><div class='ctx'> </div><div class='ctx'> 	if (ibss_param-&gt;channel_fixed) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1164,44 +1470,45 @@ static int ath6kl_cfg80211_join_ibss(struct wiphy *wiphy,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(ar-&gt;req_bssid, 0, sizeof(ar-&gt;req_bssid));</div><div class='add'>+	memset(vif-&gt;req_bssid, 0, sizeof(vif-&gt;req_bssid));</div><div class='ctx'> 	if (ibss_param-&gt;bssid &amp;&amp; !is_broadcast_ether_addr(ibss_param-&gt;bssid))</div><div class='del'>-		memcpy(ar-&gt;req_bssid, ibss_param-&gt;bssid, sizeof(ar-&gt;req_bssid));</div><div class='add'>+		memcpy(vif-&gt;req_bssid, ibss_param-&gt;bssid,</div><div class='add'>+		       sizeof(vif-&gt;req_bssid));</div><div class='ctx'> </div><div class='del'>-	ath6kl_set_wpa_version(ar, 0);</div><div class='add'>+	ath6kl_set_wpa_version(vif, 0);</div><div class='ctx'> </div><div class='del'>-	status = ath6kl_set_auth_type(ar, NL80211_AUTHTYPE_OPEN_SYSTEM);</div><div class='add'>+	status = ath6kl_set_auth_type(vif, NL80211_AUTHTYPE_OPEN_SYSTEM);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='ctx'> 	if (ibss_param-&gt;privacy) {</div><div class='del'>-		ath6kl_set_cipher(ar, WLAN_CIPHER_SUITE_WEP40, true);</div><div class='del'>-		ath6kl_set_cipher(ar, WLAN_CIPHER_SUITE_WEP40, false);</div><div class='add'>+		ath6kl_set_cipher(vif, WLAN_CIPHER_SUITE_WEP40, true);</div><div class='add'>+		ath6kl_set_cipher(vif, WLAN_CIPHER_SUITE_WEP40, false);</div><div class='ctx'> 	} else {</div><div class='del'>-		ath6kl_set_cipher(ar, 0, true);</div><div class='del'>-		ath6kl_set_cipher(ar, 0, false);</div><div class='add'>+		ath6kl_set_cipher(vif, 0, true);</div><div class='add'>+		ath6kl_set_cipher(vif, 0, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ar-&gt;nw_type = ar-&gt;next_mode;</div><div class='add'>+	vif-&gt;nw_type = vif-&gt;next_mode;</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,</div><div class='ctx'> 		   "%s: connect called with authmode %d dot11 auth %d"</div><div class='ctx'> 		   " PW crypto %d PW crypto len %d GRP crypto %d"</div><div class='ctx'> 		   " GRP crypto len %d channel hint %u\n",</div><div class='ctx'> 		   __func__,</div><div class='del'>-		   ar-&gt;auth_mode, ar-&gt;dot11_auth_mode, ar-&gt;prwise_crypto,</div><div class='del'>-		   ar-&gt;prwise_crypto_len, ar-&gt;grp_crypto,</div><div class='del'>-		   ar-&gt;grp_crypto_len, ar-&gt;ch_hint);</div><div class='del'>-</div><div class='del'>-	status = ath6kl_wmi_connect_cmd(ar-&gt;wmi, ar-&gt;nw_type,</div><div class='del'>-					ar-&gt;dot11_auth_mode, ar-&gt;auth_mode,</div><div class='del'>-					ar-&gt;prwise_crypto,</div><div class='del'>-					ar-&gt;prwise_crypto_len,</div><div class='del'>-					ar-&gt;grp_crypto, ar-&gt;grp_crypto_len,</div><div class='del'>-					ar-&gt;ssid_len, ar-&gt;ssid,</div><div class='del'>-					ar-&gt;req_bssid, ar-&gt;ch_hint,</div><div class='del'>-					ar-&gt;connect_ctrl_flags);</div><div class='del'>-	set_bit(CONNECT_PEND, &amp;ar-&gt;flag);</div><div class='add'>+		   vif-&gt;auth_mode, vif-&gt;dot11_auth_mode, vif-&gt;prwise_crypto,</div><div class='add'>+		   vif-&gt;prwise_crypto_len, vif-&gt;grp_crypto,</div><div class='add'>+		   vif-&gt;grp_crypto_len, vif-&gt;ch_hint);</div><div class='add'>+</div><div class='add'>+	status = ath6kl_wmi_connect_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx, vif-&gt;nw_type,</div><div class='add'>+					vif-&gt;dot11_auth_mode, vif-&gt;auth_mode,</div><div class='add'>+					vif-&gt;prwise_crypto,</div><div class='add'>+					vif-&gt;prwise_crypto_len,</div><div class='add'>+					vif-&gt;grp_crypto, vif-&gt;grp_crypto_len,</div><div class='add'>+					vif-&gt;ssid_len, vif-&gt;ssid,</div><div class='add'>+					vif-&gt;req_bssid, vif-&gt;ch_hint,</div><div class='add'>+					ar-&gt;connect_ctrl_flags, SUBTYPE_NONE);</div><div class='add'>+	set_bit(CONNECT_PEND, &amp;vif-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1209,14 +1516,14 @@ static int ath6kl_cfg80211_join_ibss(struct wiphy *wiphy,</div><div class='ctx'> static int ath6kl_cfg80211_leave_ibss(struct wiphy *wiphy,</div><div class='ctx'> 				      struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl *ar = (struct ath6kl *)ath6kl_priv(dev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (!ath6kl_cfg80211_ready(ar))</div><div class='add'>+	if (!ath6kl_cfg80211_ready(vif))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	ath6kl_disconnect(ar);</div><div class='del'>-	memset(ar-&gt;ssid, 0, sizeof(ar-&gt;ssid));</div><div class='del'>-	ar-&gt;ssid_len = 0;</div><div class='add'>+	ath6kl_disconnect(vif);</div><div class='add'>+	memset(vif-&gt;ssid, 0, sizeof(vif-&gt;ssid));</div><div class='add'>+	vif-&gt;ssid_len = 0;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1226,6 +1533,8 @@ static const u32 cipher_suites[] = {</div><div class='ctx'> 	WLAN_CIPHER_SUITE_WEP104,</div><div class='ctx'> 	WLAN_CIPHER_SUITE_TKIP,</div><div class='ctx'> 	WLAN_CIPHER_SUITE_CCMP,</div><div class='add'>+	CCKM_KRK_CIPHER_SUITE,</div><div class='add'>+	WLAN_CIPHER_SUITE_SMS4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static bool is_rate_legacy(s32 rate)</div><div class='hunk'>@@ -1293,21 +1602,22 @@ static int ath6kl_get_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 			      u8 *mac, struct station_info *sinfo)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='ctx'> 	long left;</div><div class='ctx'> 	bool sgi;</div><div class='ctx'> 	s32 rate;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 mcs;</div><div class='ctx'> </div><div class='del'>-	if (memcmp(mac, ar-&gt;bssid, ETH_ALEN) != 0)</div><div class='add'>+	if (memcmp(mac, vif-&gt;bssid, ETH_ALEN) != 0)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	if (down_interruptible(&amp;ar-&gt;sem))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	set_bit(STATS_UPDATE_PEND, &amp;ar-&gt;flag);</div><div class='add'>+	set_bit(STATS_UPDATE_PEND, &amp;vif-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_get_stats_cmd(ar-&gt;wmi);</div><div class='add'>+	ret = ath6kl_wmi_get_stats_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx);</div><div class='ctx'> </div><div class='ctx'> 	if (ret != 0) {</div><div class='ctx'> 		up(&amp;ar-&gt;sem);</div><div class='hunk'>@@ -1316,7 +1626,7 @@ static int ath6kl_get_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	left = wait_event_interruptible_timeout(ar-&gt;event_wq,</div><div class='ctx'> 						!test_bit(STATS_UPDATE_PEND,</div><div class='del'>-							  &amp;ar-&gt;flag),</div><div class='add'>+							  &amp;vif-&gt;flags),</div><div class='ctx'> 						WMI_TIMEOUT);</div><div class='ctx'> </div><div class='ctx'> 	up(&amp;ar-&gt;sem);</div><div class='hunk'>@@ -1326,24 +1636,24 @@ static int ath6kl_get_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	else if (left &lt; 0)</div><div class='ctx'> 		return left;</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;target_stats.rx_byte) {</div><div class='del'>-		sinfo-&gt;rx_bytes = ar-&gt;target_stats.rx_byte;</div><div class='add'>+	if (vif-&gt;target_stats.rx_byte) {</div><div class='add'>+		sinfo-&gt;rx_bytes = vif-&gt;target_stats.rx_byte;</div><div class='ctx'> 		sinfo-&gt;filled |= STATION_INFO_RX_BYTES;</div><div class='del'>-		sinfo-&gt;rx_packets = ar-&gt;target_stats.rx_pkt;</div><div class='add'>+		sinfo-&gt;rx_packets = vif-&gt;target_stats.rx_pkt;</div><div class='ctx'> 		sinfo-&gt;filled |= STATION_INFO_RX_PACKETS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;target_stats.tx_byte) {</div><div class='del'>-		sinfo-&gt;tx_bytes = ar-&gt;target_stats.tx_byte;</div><div class='add'>+	if (vif-&gt;target_stats.tx_byte) {</div><div class='add'>+		sinfo-&gt;tx_bytes = vif-&gt;target_stats.tx_byte;</div><div class='ctx'> 		sinfo-&gt;filled |= STATION_INFO_TX_BYTES;</div><div class='del'>-		sinfo-&gt;tx_packets = ar-&gt;target_stats.tx_pkt;</div><div class='add'>+		sinfo-&gt;tx_packets = vif-&gt;target_stats.tx_pkt;</div><div class='ctx'> 		sinfo-&gt;filled |= STATION_INFO_TX_PACKETS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sinfo-&gt;signal = ar-&gt;target_stats.cs_rssi;</div><div class='add'>+	sinfo-&gt;signal = vif-&gt;target_stats.cs_rssi;</div><div class='ctx'> 	sinfo-&gt;filled |= STATION_INFO_SIGNAL;</div><div class='ctx'> </div><div class='del'>-	rate = ar-&gt;target_stats.tx_ucast_rate;</div><div class='add'>+	rate = vif-&gt;target_stats.tx_ucast_rate;</div><div class='ctx'> </div><div class='ctx'> 	if (is_rate_legacy(rate)) {</div><div class='ctx'> 		sinfo-&gt;txrate.legacy = rate / 100;</div><div class='hunk'>@@ -1375,13 +1685,13 @@ static int ath6kl_get_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	sinfo-&gt;filled |= STATION_INFO_TX_BITRATE;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(CONNECTED, &amp;ar-&gt;flag) &amp;&amp;</div><div class='del'>-	    test_bit(DTIM_PERIOD_AVAIL, &amp;ar-&gt;flag) &amp;&amp;</div><div class='del'>-	    ar-&gt;nw_type == INFRA_NETWORK) {</div><div class='add'>+	if (test_bit(CONNECTED, &amp;vif-&gt;flags) &amp;&amp;</div><div class='add'>+	    test_bit(DTIM_PERIOD_AVAIL, &amp;vif-&gt;flags) &amp;&amp;</div><div class='add'>+	    vif-&gt;nw_type == INFRA_NETWORK) {</div><div class='ctx'> 		sinfo-&gt;filled |= STATION_INFO_BSS_PARAM;</div><div class='ctx'> 		sinfo-&gt;bss_param.flags = 0;</div><div class='del'>-		sinfo-&gt;bss_param.dtim_period = ar-&gt;assoc_bss_dtim_period;</div><div class='del'>-		sinfo-&gt;bss_param.beacon_interval = ar-&gt;assoc_bss_beacon_int;</div><div class='add'>+		sinfo-&gt;bss_param.dtim_period = vif-&gt;assoc_bss_dtim_period;</div><div class='add'>+		sinfo-&gt;bss_param.beacon_interval = vif-&gt;assoc_bss_beacon_int;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1391,7 +1701,9 @@ static int ath6kl_set_pmksa(struct wiphy *wiphy, struct net_device *netdev,</div><div class='ctx'> 			    struct cfg80211_pmksa *pmksa)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = ath6kl_priv(netdev);</div><div class='del'>-	return ath6kl_wmi_setpmkid_cmd(ar-&gt;wmi, pmksa-&gt;bssid,</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	return ath6kl_wmi_setpmkid_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx, pmksa-&gt;bssid,</div><div class='ctx'> 				       pmksa-&gt;pmkid, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1399,25 +1711,302 @@ static int ath6kl_del_pmksa(struct wiphy *wiphy, struct net_device *netdev,</div><div class='ctx'> 			    struct cfg80211_pmksa *pmksa)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = ath6kl_priv(netdev);</div><div class='del'>-	return ath6kl_wmi_setpmkid_cmd(ar-&gt;wmi, pmksa-&gt;bssid,</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	return ath6kl_wmi_setpmkid_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx, pmksa-&gt;bssid,</div><div class='ctx'> 				       pmksa-&gt;pmkid, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_flush_pmksa(struct wiphy *wiphy, struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = ath6kl_priv(netdev);</div><div class='del'>-	if (test_bit(CONNECTED, &amp;ar-&gt;flag))</div><div class='del'>-		return ath6kl_wmi_setpmkid_cmd(ar-&gt;wmi, ar-&gt;bssid, NULL, false);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (test_bit(CONNECTED, &amp;vif-&gt;flags))</div><div class='add'>+		return ath6kl_wmi_setpmkid_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+					       vif-&gt;bssid, NULL, false);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath6kl_wow_suspend(struct ath6kl *ar, struct cfg80211_wowlan *wow)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl_vif *vif;</div><div class='add'>+	int ret, pos, left;</div><div class='add'>+	u32 filter = 0;</div><div class='add'>+	u16 i;</div><div class='add'>+	u8 mask[WOW_MASK_SIZE];</div><div class='add'>+</div><div class='add'>+	vif = ath6kl_vif_first(ar);</div><div class='add'>+	if (!vif)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (!ath6kl_cfg80211_ready(vif))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(CONNECTED, &amp;vif-&gt;flags))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Clear existing WOW patterns */</div><div class='add'>+	for (i = 0; i &lt; WOW_MAX_FILTERS_PER_LIST; i++)</div><div class='add'>+		ath6kl_wmi_del_wow_pattern_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+					       WOW_LIST_ID, i);</div><div class='add'>+	/* Configure new WOW patterns */</div><div class='add'>+	for (i = 0; i &lt; wow-&gt;n_patterns; i++) {</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Convert given nl80211 specific mask value to equivalent</div><div class='add'>+		 * driver specific mask value and send it to the chip along</div><div class='add'>+		 * with patterns. For example, If the mask value defined in</div><div class='add'>+		 * struct cfg80211_wowlan is 0xA (equivalent binary is 1010),</div><div class='add'>+		 * then equivalent driver specific mask value is</div><div class='add'>+		 * "0xFF 0x00 0xFF 0x00".</div><div class='add'>+		 */</div><div class='add'>+		memset(&amp;mask, 0, sizeof(mask));</div><div class='add'>+		for (pos = 0; pos &lt; wow-&gt;patterns[i].pattern_len; pos++) {</div><div class='add'>+			if (wow-&gt;patterns[i].mask[pos / 8] &amp; (0x1 &lt;&lt; (pos % 8)))</div><div class='add'>+				mask[pos] = 0xFF;</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * Note: Pattern's offset is not passed as part of wowlan</div><div class='add'>+		 * parameter from CFG layer. So it's always passed as ZERO</div><div class='add'>+		 * to the firmware. It means, given WOW patterns are always</div><div class='add'>+		 * matched from the first byte of received pkt in the firmware.</div><div class='add'>+		 */</div><div class='add'>+		ret = ath6kl_wmi_add_wow_pattern_cmd(ar-&gt;wmi,</div><div class='add'>+					vif-&gt;fw_vif_idx, WOW_LIST_ID,</div><div class='add'>+					wow-&gt;patterns[i].pattern_len,</div><div class='add'>+					0 /* pattern offset */,</div><div class='add'>+					wow-&gt;patterns[i].pattern, mask);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wow-&gt;disconnect)</div><div class='add'>+		filter |= WOW_FILTER_OPTION_NWK_DISASSOC;</div><div class='add'>+</div><div class='add'>+	if (wow-&gt;magic_pkt)</div><div class='add'>+		filter |= WOW_FILTER_OPTION_MAGIC_PACKET;</div><div class='add'>+</div><div class='add'>+	if (wow-&gt;gtk_rekey_failure)</div><div class='add'>+		filter |= WOW_FILTER_OPTION_GTK_ERROR;</div><div class='add'>+</div><div class='add'>+	if (wow-&gt;eap_identity_req)</div><div class='add'>+		filter |= WOW_FILTER_OPTION_EAP_REQ;</div><div class='add'>+</div><div class='add'>+	if (wow-&gt;four_way_handshake)</div><div class='add'>+		filter |= WOW_FILTER_OPTION_8021X_4WAYHS;</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_wmi_set_wow_mode_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+					  ATH6KL_WOW_MODE_ENABLE,</div><div class='add'>+					  filter,</div><div class='add'>+					  WOW_HOST_REQ_DELAY);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_wmi_set_host_sleep_mode_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+						 ATH6KL_HOST_MODE_ASLEEP);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;tx_pending[ar-&gt;ctrl_ep]) {</div><div class='add'>+		left = wait_event_interruptible_timeout(ar-&gt;event_wq,</div><div class='add'>+				ar-&gt;tx_pending[ar-&gt;ctrl_ep] == 0, WMI_TIMEOUT);</div><div class='add'>+		if (left == 0) {</div><div class='add'>+			ath6kl_warn("clear wmi ctrl data timeout\n");</div><div class='add'>+			ret = -ETIMEDOUT;</div><div class='add'>+		} else if (left &lt; 0) {</div><div class='add'>+			ath6kl_warn("clear wmi ctrl data failed: %d\n", left);</div><div class='add'>+			ret = left;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath6kl_wow_resume(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl_vif *vif;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	vif = ath6kl_vif_first(ar);</div><div class='add'>+	if (!vif)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_wmi_set_host_sleep_mode_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+						 ATH6KL_HOST_MODE_AWAKE);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath6kl_cfg80211_suspend(struct ath6kl *ar,</div><div class='add'>+			    enum ath6kl_cfg_suspend_mode mode,</div><div class='add'>+			    struct cfg80211_wowlan *wow)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case ATH6KL_CFG_SUSPEND_WOW:</div><div class='add'>+</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_SUSPEND, "wow mode suspend\n");</div><div class='add'>+</div><div class='add'>+		/* Flush all non control pkts in TX path */</div><div class='add'>+		ath6kl_tx_data_cleanup(ar);</div><div class='add'>+</div><div class='add'>+		ret = ath6kl_wow_suspend(ar, wow);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath6kl_err("wow suspend failed: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		ar-&gt;state = ATH6KL_STATE_WOW;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ATH6KL_CFG_SUSPEND_DEEPSLEEP:</div><div class='add'>+</div><div class='add'>+		ath6kl_cfg80211_stop_all(ar);</div><div class='add'>+</div><div class='add'>+		/* save the current power mode before enabling power save */</div><div class='add'>+		ar-&gt;wmi-&gt;saved_pwr_mode = ar-&gt;wmi-&gt;pwr_mode;</div><div class='add'>+</div><div class='add'>+		ret = ath6kl_wmi_powermode_cmd(ar-&gt;wmi, 0, REC_POWER);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath6kl_warn("wmi powermode command failed during suspend: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ar-&gt;state = ATH6KL_STATE_DEEPSLEEP;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ATH6KL_CFG_SUSPEND_CUTPOWER:</div><div class='add'>+</div><div class='add'>+		ath6kl_cfg80211_stop_all(ar);</div><div class='add'>+</div><div class='add'>+		if (ar-&gt;state == ATH6KL_STATE_OFF) {</div><div class='add'>+			ath6kl_dbg(ATH6KL_DBG_SUSPEND,</div><div class='add'>+				   "suspend hw off, no action for cutpower\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_SUSPEND, "suspend cutting power\n");</div><div class='add'>+</div><div class='add'>+		ret = ath6kl_init_hw_stop(ar);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath6kl_warn("failed to stop hw during suspend: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ar-&gt;state = ATH6KL_STATE_CUTPOWER;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ATH6KL_CFG_SUSPEND_SCHED_SCAN:</div><div class='add'>+		/*</div><div class='add'>+		 * Nothing needed for schedule scan, firmware is already in</div><div class='add'>+		 * wow mode and sleeping most of the time.</div><div class='add'>+		 */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath6kl_cfg80211_resume(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (ar-&gt;state) {</div><div class='add'>+	case  ATH6KL_STATE_WOW:</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_SUSPEND, "wow mode resume\n");</div><div class='add'>+</div><div class='add'>+		ret = ath6kl_wow_resume(ar);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath6kl_warn("wow mode resume failed: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ar-&gt;state = ATH6KL_STATE_ON;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ATH6KL_STATE_DEEPSLEEP:</div><div class='add'>+		if (ar-&gt;wmi-&gt;pwr_mode != ar-&gt;wmi-&gt;saved_pwr_mode) {</div><div class='add'>+			ret = ath6kl_wmi_powermode_cmd(ar-&gt;wmi, 0,</div><div class='add'>+						       ar-&gt;wmi-&gt;saved_pwr_mode);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ath6kl_warn("wmi powermode command failed during resume: %d\n",</div><div class='add'>+					    ret);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ar-&gt;state = ATH6KL_STATE_ON;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ATH6KL_STATE_CUTPOWER:</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_SUSPEND, "resume restoring power\n");</div><div class='add'>+</div><div class='add'>+		ret = ath6kl_init_hw_start(ar);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath6kl_warn("Failed to boot hw in resume: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ATH6KL_STATE_SCHED_SCAN:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='del'>-static int ar6k_cfg80211_suspend(struct wiphy *wiphy,</div><div class='add'>+</div><div class='add'>+/* hif layer decides what suspend mode to use */</div><div class='add'>+static int __ath6kl_cfg80211_suspend(struct wiphy *wiphy,</div><div class='ctx'> 				 struct cfg80211_wowlan *wow)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = wiphy_priv(wiphy);</div><div class='ctx'> </div><div class='del'>-	return ath6kl_hif_suspend(ar);</div><div class='add'>+	return ath6kl_hif_suspend(ar, wow);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __ath6kl_cfg80211_resume(struct wiphy *wiphy)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = wiphy_priv(wiphy);</div><div class='add'>+</div><div class='add'>+	return ath6kl_hif_resume(ar);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FIXME: WOW suspend mode is selected if the host sdio controller supports</div><div class='add'>+ * both sdio irq wake up and keep power. The target pulls sdio data line to</div><div class='add'>+ * wake up the host when WOW pattern matches. This causes sdio irq handler</div><div class='add'>+ * is being called in the host side which internally hits ath6kl's RX path.</div><div class='add'>+ *</div><div class='add'>+ * Since sdio interrupt is not disabled, RX path executes even before</div><div class='add'>+ * the host executes the actual resume operation from PM module.</div><div class='add'>+ *</div><div class='add'>+ * In the current scenario, WOW resume should happen before start processing</div><div class='add'>+ * any data from the target. So It's required to perform WOW resume in RX path.</div><div class='add'>+ * Ideally we should perform WOW resume only in the actual platform</div><div class='add'>+ * resume path. This area needs bit rework to avoid WOW resume in RX path.</div><div class='add'>+ *</div><div class='add'>+ * ath6kl_check_wow_status() is called from ath6kl_rx().</div><div class='add'>+ */</div><div class='add'>+void ath6kl_check_wow_status(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	if (ar-&gt;state == ATH6KL_STATE_WOW)</div><div class='add'>+		ath6kl_cfg80211_resume(ar);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+void ath6kl_check_wow_status(struct ath6kl *ar)</div><div class='add'>+{</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1425,14 +2014,14 @@ static int ath6kl_set_channel(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 			      struct ieee80211_channel *chan,</div><div class='ctx'> 			      enum nl80211_channel_type channel_type)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (!ath6kl_cfg80211_ready(ar))</div><div class='add'>+	if (!ath6kl_cfg80211_ready(vif))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: center_freq=%u hw_value=%u\n",</div><div class='ctx'> 		   __func__, chan-&gt;center_freq, chan-&gt;hw_value);</div><div class='del'>-	ar-&gt;next_chan = chan-&gt;center_freq;</div><div class='add'>+	vif-&gt;next_chan = chan-&gt;center_freq;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1444,9 +2033,10 @@ static bool ath6kl_is_p2p_ie(const u8 *pos)</div><div class='ctx'> 		pos[4] == 0x9a &amp;&amp; pos[5] == 0x09;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_set_ap_probe_resp_ies(struct ath6kl *ar, const u8 *ies,</div><div class='del'>-					size_t ies_len)</div><div class='add'>+static int ath6kl_set_ap_probe_resp_ies(struct ath6kl_vif *vif,</div><div class='add'>+					const u8 *ies, size_t ies_len)</div><div class='ctx'> {</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='ctx'> 	const u8 *pos;</div><div class='ctx'> 	u8 *buf = NULL;</div><div class='ctx'> 	size_t len = 0;</div><div class='hunk'>@@ -1473,8 +2063,8 @@ static int ath6kl_set_ap_probe_resp_ies(struct ath6kl *ar, const u8 *ies,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_set_appie_cmd(ar-&gt;wmi, WMI_FRAME_PROBE_RESP,</div><div class='del'>-				       buf, len);</div><div class='add'>+	ret = ath6kl_wmi_set_appie_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+				       WMI_FRAME_PROBE_RESP, buf, len);</div><div class='ctx'> 	kfree(buf);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1483,36 +2073,39 @@ static int ath6kl_ap_beacon(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 			    struct beacon_parameters *info, bool add)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='ctx'> 	struct ieee80211_mgmt *mgmt;</div><div class='ctx'> 	u8 *ies;</div><div class='ctx'> 	int ies_len;</div><div class='ctx'> 	struct wmi_connect_cmd p;</div><div class='ctx'> 	int res;</div><div class='del'>-	int i;</div><div class='add'>+	int i, ret;</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: add=%d\n", __func__, add);</div><div class='ctx'> </div><div class='del'>-	if (!ath6kl_cfg80211_ready(ar))</div><div class='add'>+	if (!ath6kl_cfg80211_ready(vif))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;next_mode != AP_NETWORK)</div><div class='add'>+	if (vif-&gt;next_mode != AP_NETWORK)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;beacon_ies) {</div><div class='del'>-		res = ath6kl_wmi_set_appie_cmd(ar-&gt;wmi, WMI_FRAME_BEACON,</div><div class='add'>+		res = ath6kl_wmi_set_appie_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+					       WMI_FRAME_BEACON,</div><div class='ctx'> 					       info-&gt;beacon_ies,</div><div class='ctx'> 					       info-&gt;beacon_ies_len);</div><div class='ctx'> 		if (res)</div><div class='ctx'> 			return res;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (info-&gt;proberesp_ies) {</div><div class='del'>-		res = ath6kl_set_ap_probe_resp_ies(ar, info-&gt;proberesp_ies,</div><div class='add'>+		res = ath6kl_set_ap_probe_resp_ies(vif, info-&gt;proberesp_ies,</div><div class='ctx'> 						   info-&gt;proberesp_ies_len);</div><div class='ctx'> 		if (res)</div><div class='ctx'> 			return res;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (info-&gt;assocresp_ies) {</div><div class='del'>-		res = ath6kl_wmi_set_appie_cmd(ar-&gt;wmi, WMI_FRAME_ASSOC_RESP,</div><div class='add'>+		res = ath6kl_wmi_set_appie_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+					       WMI_FRAME_ASSOC_RESP,</div><div class='ctx'> 					       info-&gt;assocresp_ies,</div><div class='ctx'> 					       info-&gt;assocresp_ies_len);</div><div class='ctx'> 		if (res)</div><div class='hunk'>@@ -1539,12 +2132,14 @@ static int ath6kl_ap_beacon(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;ssid == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	memcpy(ar-&gt;ssid, info-&gt;ssid, info-&gt;ssid_len);</div><div class='del'>-	ar-&gt;ssid_len = info-&gt;ssid_len;</div><div class='add'>+	memcpy(vif-&gt;ssid, info-&gt;ssid, info-&gt;ssid_len);</div><div class='add'>+	vif-&gt;ssid_len = info-&gt;ssid_len;</div><div class='ctx'> 	if (info-&gt;hidden_ssid != NL80211_HIDDEN_SSID_NOT_IN_USE)</div><div class='ctx'> 		return -EOPNOTSUPP; /* TODO */</div><div class='ctx'> </div><div class='del'>-	ar-&gt;dot11_auth_mode = OPEN_AUTH;</div><div class='add'>+	ret = ath6kl_set_auth_type(vif, info-&gt;auth_type);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;p, 0, sizeof(p));</div><div class='ctx'> </div><div class='hunk'>@@ -1566,7 +2161,7 @@ static int ath6kl_ap_beacon(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (p.auth_mode == 0)</div><div class='ctx'> 		p.auth_mode = NONE_AUTH;</div><div class='del'>-	ar-&gt;auth_mode = p.auth_mode;</div><div class='add'>+	vif-&gt;auth_mode = p.auth_mode;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; info-&gt;crypto.n_ciphers_pairwise; i++) {</div><div class='ctx'> 		switch (info-&gt;crypto.ciphers_pairwise[i]) {</div><div class='hunk'>@@ -1580,13 +2175,16 @@ static int ath6kl_ap_beacon(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 		case WLAN_CIPHER_SUITE_CCMP:</div><div class='ctx'> 			p.prwise_crypto_type |= AES_CRYPT;</div><div class='ctx'> 			break;</div><div class='add'>+		case WLAN_CIPHER_SUITE_SMS4:</div><div class='add'>+			p.prwise_crypto_type |= WAPI_CRYPT;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (p.prwise_crypto_type == 0) {</div><div class='ctx'> 		p.prwise_crypto_type = NONE_CRYPT;</div><div class='del'>-		ath6kl_set_cipher(ar, 0, true);</div><div class='add'>+		ath6kl_set_cipher(vif, 0, true);</div><div class='ctx'> 	} else if (info-&gt;crypto.n_ciphers_pairwise == 1)</div><div class='del'>-		ath6kl_set_cipher(ar, info-&gt;crypto.ciphers_pairwise[0], true);</div><div class='add'>+		ath6kl_set_cipher(vif, info-&gt;crypto.ciphers_pairwise[0], true);</div><div class='ctx'> </div><div class='ctx'> 	switch (info-&gt;crypto.cipher_group) {</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_WEP40:</div><div class='hunk'>@@ -1599,21 +2197,34 @@ static int ath6kl_ap_beacon(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_CCMP:</div><div class='ctx'> 		p.grp_crypto_type = AES_CRYPT;</div><div class='ctx'> 		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_SMS4:</div><div class='add'>+		p.grp_crypto_type = WAPI_CRYPT;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		p.grp_crypto_type = NONE_CRYPT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	ath6kl_set_cipher(ar, info-&gt;crypto.cipher_group, false);</div><div class='add'>+	ath6kl_set_cipher(vif, info-&gt;crypto.cipher_group, false);</div><div class='ctx'> </div><div class='ctx'> 	p.nw_type = AP_NETWORK;</div><div class='del'>-	ar-&gt;nw_type = ar-&gt;next_mode;</div><div class='add'>+	vif-&gt;nw_type = vif-&gt;next_mode;</div><div class='ctx'> </div><div class='del'>-	p.ssid_len = ar-&gt;ssid_len;</div><div class='del'>-	memcpy(p.ssid, ar-&gt;ssid, ar-&gt;ssid_len);</div><div class='del'>-	p.dot11_auth_mode = ar-&gt;dot11_auth_mode;</div><div class='del'>-	p.ch = cpu_to_le16(ar-&gt;next_chan);</div><div class='add'>+	p.ssid_len = vif-&gt;ssid_len;</div><div class='add'>+	memcpy(p.ssid, vif-&gt;ssid, vif-&gt;ssid_len);</div><div class='add'>+	p.dot11_auth_mode = vif-&gt;dot11_auth_mode;</div><div class='add'>+	p.ch = cpu_to_le16(vif-&gt;next_chan);</div><div class='ctx'> </div><div class='del'>-	res = ath6kl_wmi_ap_profile_commit(ar-&gt;wmi, &amp;p);</div><div class='add'>+	if (vif-&gt;wdev.iftype == NL80211_IFTYPE_P2P_GO) {</div><div class='add'>+		p.nw_subtype = SUBTYPE_P2PGO;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Due to firmware limitation, it is not possible to</div><div class='add'>+		 * do P2P mgmt operations in AP mode</div><div class='add'>+		 */</div><div class='add'>+		p.nw_subtype = SUBTYPE_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	res = ath6kl_wmi_ap_profile_commit(ar-&gt;wmi, vif-&gt;fw_vif_idx, &amp;p);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='hunk'>@@ -1635,14 +2246,15 @@ static int ath6kl_set_beacon(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> static int ath6kl_del_beacon(struct wiphy *wiphy, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;nw_type != AP_NETWORK)</div><div class='add'>+	if (vif-&gt;nw_type != AP_NETWORK)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='del'>-	if (!test_bit(CONNECTED, &amp;ar-&gt;flag))</div><div class='add'>+	if (!test_bit(CONNECTED, &amp;vif-&gt;flags))</div><div class='ctx'> 		return -ENOTCONN;</div><div class='ctx'> </div><div class='del'>-	ath6kl_wmi_disconnect_cmd(ar-&gt;wmi);</div><div class='del'>-	clear_bit(CONNECTED, &amp;ar-&gt;flag);</div><div class='add'>+	ath6kl_wmi_disconnect_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx);</div><div class='add'>+	clear_bit(CONNECTED, &amp;vif-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1651,8 +2263,9 @@ static int ath6kl_change_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 				 u8 *mac, struct station_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;nw_type != AP_NETWORK)</div><div class='add'>+	if (vif-&gt;nw_type != AP_NETWORK)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	/* Use this only for authorizing/unauthorizing a station */</div><div class='hunk'>@@ -1660,10 +2273,10 @@ static int ath6kl_change_station(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;sta_flags_set &amp; BIT(NL80211_STA_FLAG_AUTHORIZED))</div><div class='del'>-		return ath6kl_wmi_ap_set_mlme(ar-&gt;wmi, WMI_AP_MLME_AUTHORIZE,</div><div class='del'>-					      mac, 0);</div><div class='del'>-	return ath6kl_wmi_ap_set_mlme(ar-&gt;wmi, WMI_AP_MLME_UNAUTHORIZE, mac,</div><div class='del'>-				      0);</div><div class='add'>+		return ath6kl_wmi_ap_set_mlme(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+					      WMI_AP_MLME_AUTHORIZE, mac, 0);</div><div class='add'>+	return ath6kl_wmi_ap_set_mlme(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+				      WMI_AP_MLME_UNAUTHORIZE, mac, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_remain_on_channel(struct wiphy *wiphy,</div><div class='hunk'>@@ -1674,13 +2287,20 @@ static int ath6kl_remain_on_channel(struct wiphy *wiphy,</div><div class='ctx'> 				    u64 *cookie)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='add'>+	u32 id;</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: if already pending or ongoing remain-on-channel,</div><div class='ctx'> 	 * return -EBUSY */</div><div class='del'>-	*cookie = 1; /* only a single pending request is supported */</div><div class='add'>+	id = ++vif-&gt;last_roc_id;</div><div class='add'>+	if (id == 0) {</div><div class='add'>+		/* Do not use 0 as the cookie value */</div><div class='add'>+		id = ++vif-&gt;last_roc_id;</div><div class='add'>+	}</div><div class='add'>+	*cookie = id;</div><div class='ctx'> </div><div class='del'>-	return ath6kl_wmi_remain_on_chnl_cmd(ar-&gt;wmi, chan-&gt;center_freq,</div><div class='del'>-					     duration);</div><div class='add'>+	return ath6kl_wmi_remain_on_chnl_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+					     chan-&gt;center_freq, duration);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_cancel_remain_on_channel(struct wiphy *wiphy,</div><div class='hunk'>@@ -1688,16 +2308,20 @@ static int ath6kl_cancel_remain_on_channel(struct wiphy *wiphy,</div><div class='ctx'> 					   u64 cookie)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (cookie != 1)</div><div class='add'>+	if (cookie != vif-&gt;last_roc_id)</div><div class='ctx'> 		return -ENOENT;</div><div class='add'>+	vif-&gt;last_cancel_roc_id = cookie;</div><div class='ctx'> </div><div class='del'>-	return ath6kl_wmi_cancel_remain_on_chnl_cmd(ar-&gt;wmi);</div><div class='add'>+	return ath6kl_wmi_cancel_remain_on_chnl_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_send_go_probe_resp(struct ath6kl *ar, const u8 *buf,</div><div class='del'>-				     size_t len, unsigned int freq)</div><div class='add'>+static int ath6kl_send_go_probe_resp(struct ath6kl_vif *vif,</div><div class='add'>+				     const u8 *buf, size_t len,</div><div class='add'>+				     unsigned int freq)</div><div class='ctx'> {</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='ctx'> 	const u8 *pos;</div><div class='ctx'> 	u8 *p2p;</div><div class='ctx'> 	int p2p_len;</div><div class='hunk'>@@ -1724,8 +2348,8 @@ static int ath6kl_send_go_probe_resp(struct ath6kl *ar, const u8 *buf,</div><div class='ctx'> 		pos += 2 + pos[1];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_send_probe_response_cmd(ar-&gt;wmi, freq, mgmt-&gt;da,</div><div class='del'>-						 p2p, p2p_len);</div><div class='add'>+	ret = ath6kl_wmi_send_probe_response_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx, freq,</div><div class='add'>+						 mgmt-&gt;da, p2p, p2p_len);</div><div class='ctx'> 	kfree(p2p);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1734,44 +2358,61 @@ static int ath6kl_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 			  struct ieee80211_channel *chan, bool offchan,</div><div class='ctx'> 			  enum nl80211_channel_type channel_type,</div><div class='ctx'> 			  bool channel_type_valid, unsigned int wait,</div><div class='del'>-			  const u8 *buf, size_t len, bool no_cck, u64 *cookie)</div><div class='add'>+			  const u8 *buf, size_t len, bool no_cck,</div><div class='add'>+			  bool dont_wait_for_ack, u64 *cookie)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='ctx'> 	u32 id;</div><div class='ctx'> 	const struct ieee80211_mgmt *mgmt;</div><div class='ctx'> </div><div class='ctx'> 	mgmt = (const struct ieee80211_mgmt *) buf;</div><div class='ctx'> 	if (buf + len &gt;= mgmt-&gt;u.probe_resp.variable &amp;&amp;</div><div class='del'>-	    ar-&gt;nw_type == AP_NETWORK &amp;&amp; test_bit(CONNECTED, &amp;ar-&gt;flag) &amp;&amp;</div><div class='add'>+	    vif-&gt;nw_type == AP_NETWORK &amp;&amp; test_bit(CONNECTED, &amp;vif-&gt;flags) &amp;&amp;</div><div class='ctx'> 	    ieee80211_is_probe_resp(mgmt-&gt;frame_control)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Send Probe Response frame in AP mode using a separate WMI</div><div class='ctx'> 		 * command to allow the target to fill in the generic IEs.</div><div class='ctx'> 		 */</div><div class='ctx'> 		*cookie = 0; /* TX status not supported */</div><div class='del'>-		return ath6kl_send_go_probe_resp(ar, buf, len,</div><div class='add'>+		return ath6kl_send_go_probe_resp(vif, buf, len,</div><div class='ctx'> 						 chan-&gt;center_freq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	id = ar-&gt;send_action_id++;</div><div class='add'>+	id = vif-&gt;send_action_id++;</div><div class='ctx'> 	if (id == 0) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * 0 is a reserved value in the WMI command and shall not be</div><div class='ctx'> 		 * used for the command.</div><div class='ctx'> 		 */</div><div class='del'>-		id = ar-&gt;send_action_id++;</div><div class='add'>+		id = vif-&gt;send_action_id++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*cookie = id;</div><div class='del'>-	return ath6kl_wmi_send_action_cmd(ar-&gt;wmi, id, chan-&gt;center_freq, wait,</div><div class='del'>-					  buf, len);</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH6KL_FW_CAPABILITY_STA_P2PDEV_DUPLEX,</div><div class='add'>+		    ar-&gt;fw_capabilities)) {</div><div class='add'>+		/*</div><div class='add'>+		 * If capable of doing P2P mgmt operations using</div><div class='add'>+		 * station interface, send additional information like</div><div class='add'>+		 * supported rates to advertise and xmit rates for</div><div class='add'>+		 * probe requests</div><div class='add'>+		 */</div><div class='add'>+		return ath6kl_wmi_send_mgmt_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx, id,</div><div class='add'>+						chan-&gt;center_freq, wait,</div><div class='add'>+						buf, len, no_cck);</div><div class='add'>+	} else {</div><div class='add'>+		return ath6kl_wmi_send_action_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx, id,</div><div class='add'>+						  chan-&gt;center_freq, wait,</div><div class='add'>+						  buf, len);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath6kl_mgmt_frame_register(struct wiphy *wiphy,</div><div class='ctx'> 				       struct net_device *dev,</div><div class='ctx'> 				       u16 frame_type, bool reg)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: frame_type=0x%x reg=%d\n",</div><div class='ctx'> 		   __func__, frame_type, reg);</div><div class='hunk'>@@ -1781,8 +2422,92 @@ static void ath6kl_mgmt_frame_register(struct wiphy *wiphy,</div><div class='ctx'> 		 * we cannot send WMI_PROBE_REQ_REPORT_CMD here. Instead, we</div><div class='ctx'> 		 * hardcode target to report Probe Request frames all the time.</div><div class='ctx'> 		 */</div><div class='del'>-		ar-&gt;probe_req_report = reg;</div><div class='add'>+		vif-&gt;probe_req_report = reg;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy,</div><div class='add'>+			struct net_device *dev,</div><div class='add'>+			struct cfg80211_sched_scan_request *request)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='add'>+	u16 interval;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;state != ATH6KL_STATE_ON)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;sme_state != SME_DISCONNECTED)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ar-&gt;wiphy-&gt;max_sched_scan_ssids; i++) {</div><div class='add'>+		ath6kl_wmi_probedssid_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+					  i, DISABLE_SSID_FLAG,</div><div class='add'>+					  0, NULL);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* fw uses seconds, also make sure that it's &gt;0 */</div><div class='add'>+	interval = max_t(u16, 1, request-&gt;interval / 1000);</div><div class='add'>+</div><div class='add'>+	ath6kl_wmi_scanparams_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+				  interval, interval,</div><div class='add'>+				  10, 0, 0, 0, 3, 0, 0, 0);</div><div class='add'>+</div><div class='add'>+	if (request-&gt;n_ssids &amp;&amp; request-&gt;ssids[0].ssid_len) {</div><div class='add'>+		for (i = 0; i &lt; request-&gt;n_ssids; i++) {</div><div class='add'>+			ath6kl_wmi_probedssid_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+						  i, SPECIFIC_SSID_FLAG,</div><div class='add'>+						  request-&gt;ssids[i].ssid_len,</div><div class='add'>+						  request-&gt;ssids[i].ssid);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_wmi_set_wow_mode_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+					  ATH6KL_WOW_MODE_ENABLE,</div><div class='add'>+					  WOW_FILTER_SSID,</div><div class='add'>+					  WOW_HOST_REQ_DELAY);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath6kl_warn("Failed to enable wow with ssid filter: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* this also clears IE in fw if it's not set */</div><div class='add'>+	ret = ath6kl_wmi_set_appie_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+				       WMI_FRAME_PROBE_REQ,</div><div class='add'>+				       request-&gt;ie, request-&gt;ie_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath6kl_warn("Failed to set probe request IE for scheduled scan: %d",</div><div class='add'>+			    ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_wmi_set_host_sleep_mode_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+						 ATH6KL_HOST_MODE_ASLEEP);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath6kl_warn("Failed to enable host sleep mode for sched scan: %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'>+	ar-&gt;state = ATH6KL_STATE_SCHED_SCAN;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath6kl_cfg80211_sscan_stop(struct wiphy *wiphy,</div><div class='add'>+				      struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='add'>+	bool stopped;</div><div class='add'>+</div><div class='add'>+	stopped = __ath6kl_cfg80211_sscan_stop(vif);</div><div class='add'>+</div><div class='add'>+	if (!stopped)</div><div class='add'>+		return -EIO;</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 ieee80211_txrx_stypes</div><div class='hunk'>@@ -1808,6 +2533,8 @@ ath6kl_mgmt_stypes[NUM_NL80211_IFTYPES] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct cfg80211_ops ath6kl_cfg80211_ops = {</div><div class='add'>+	.add_virtual_intf = ath6kl_cfg80211_add_iface,</div><div class='add'>+	.del_virtual_intf = ath6kl_cfg80211_del_iface,</div><div class='ctx'> 	.change_virtual_intf = ath6kl_cfg80211_change_iface,</div><div class='ctx'> 	.scan = ath6kl_cfg80211_scan,</div><div class='ctx'> 	.connect = ath6kl_cfg80211_connect,</div><div class='hunk'>@@ -1828,7 +2555,8 @@ static struct cfg80211_ops ath6kl_cfg80211_ops = {</div><div class='ctx'> 	.flush_pmksa = ath6kl_flush_pmksa,</div><div class='ctx'> 	CFG80211_TESTMODE_CMD(ath6kl_tm_cmd)</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='del'>-	.suspend = ar6k_cfg80211_suspend,</div><div class='add'>+	.suspend = __ath6kl_cfg80211_suspend,</div><div class='add'>+	.resume = __ath6kl_cfg80211_resume,</div><div class='ctx'> #endif</div><div class='ctx'> 	.set_channel = ath6kl_set_channel,</div><div class='ctx'> 	.add_beacon = ath6kl_add_beacon,</div><div class='hunk'>@@ -1839,78 +2567,277 @@ static struct cfg80211_ops ath6kl_cfg80211_ops = {</div><div class='ctx'> 	.cancel_remain_on_channel = ath6kl_cancel_remain_on_channel,</div><div class='ctx'> 	.mgmt_tx = ath6kl_mgmt_tx,</div><div class='ctx'> 	.mgmt_frame_register = ath6kl_mgmt_frame_register,</div><div class='add'>+	.sched_scan_start = ath6kl_cfg80211_sscan_start,</div><div class='add'>+	.sched_scan_stop = ath6kl_cfg80211_sscan_stop,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct wireless_dev *ath6kl_cfg80211_init(struct device *dev)</div><div class='add'>+void ath6kl_cfg80211_stop(struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-	struct wireless_dev *wdev;</div><div class='del'>-	struct ath6kl *ar;</div><div class='add'>+	ath6kl_cfg80211_sscan_disable(vif);</div><div class='ctx'> </div><div class='del'>-	wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL);</div><div class='del'>-	if (!wdev) {</div><div class='del'>-		ath6kl_err("couldn't allocate wireless device\n");</div><div class='del'>-		return NULL;</div><div class='add'>+	switch (vif-&gt;sme_state) {</div><div class='add'>+	case SME_DISCONNECTED:</div><div class='add'>+		break;</div><div class='add'>+	case SME_CONNECTING:</div><div class='add'>+		cfg80211_connect_result(vif-&gt;ndev, vif-&gt;bssid, NULL, 0,</div><div class='add'>+					NULL, 0,</div><div class='add'>+					WLAN_STATUS_UNSPECIFIED_FAILURE,</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+		break;</div><div class='add'>+	case SME_CONNECTED:</div><div class='add'>+		cfg80211_disconnected(vif-&gt;ndev, 0, NULL, 0, GFP_KERNEL);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(CONNECTED, &amp;vif-&gt;flags) ||</div><div class='add'>+	    test_bit(CONNECT_PEND, &amp;vif-&gt;flags))</div><div class='add'>+		ath6kl_wmi_disconnect_cmd(vif-&gt;ar-&gt;wmi, vif-&gt;fw_vif_idx);</div><div class='add'>+</div><div class='add'>+	vif-&gt;sme_state = SME_DISCONNECTED;</div><div class='add'>+	clear_bit(CONNECTED, &amp;vif-&gt;flags);</div><div class='add'>+	clear_bit(CONNECT_PEND, &amp;vif-&gt;flags);</div><div class='add'>+</div><div class='add'>+	/* disable scanning */</div><div class='add'>+	if (ath6kl_wmi_scanparams_cmd(vif-&gt;ar-&gt;wmi, vif-&gt;fw_vif_idx, 0xFFFF,</div><div class='add'>+				      0, 0, 0, 0, 0, 0, 0, 0, 0) != 0)</div><div class='add'>+		ath6kl_warn("failed to disable scan during stop\n");</div><div class='add'>+</div><div class='add'>+	ath6kl_cfg80211_scan_complete_event(vif, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath6kl_cfg80211_stop_all(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl_vif *vif;</div><div class='add'>+</div><div class='add'>+	vif = ath6kl_vif_first(ar);</div><div class='add'>+	if (!vif) {</div><div class='add'>+		/* save the current power mode before enabling power save */</div><div class='add'>+		ar-&gt;wmi-&gt;saved_pwr_mode = ar-&gt;wmi-&gt;pwr_mode;</div><div class='add'>+</div><div class='add'>+		if (ath6kl_wmi_powermode_cmd(ar-&gt;wmi, 0, REC_POWER) != 0)</div><div class='add'>+			ath6kl_warn("ath6kl_deep_sleep_enable: "</div><div class='add'>+				    "wmi_powermode_cmd failed\n");</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * FIXME: we should take ar-&gt;list_lock to protect changes in the</div><div class='add'>+	 * vif_list, but that's not trivial to do as ath6kl_cfg80211_stop()</div><div class='add'>+	 * sleeps.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry(vif, &amp;ar-&gt;vif_list, list)</div><div class='add'>+		ath6kl_cfg80211_stop(vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ath6kl *ath6kl_core_alloc(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar;</div><div class='add'>+	struct wiphy *wiphy;</div><div class='add'>+	u8 ctr;</div><div class='add'>+</div><div class='ctx'> 	/* create a new wiphy for use with cfg80211 */</div><div class='del'>-	wdev-&gt;wiphy = wiphy_new(&amp;ath6kl_cfg80211_ops, sizeof(struct ath6kl));</div><div class='del'>-	if (!wdev-&gt;wiphy) {</div><div class='add'>+	wiphy = wiphy_new(&amp;ath6kl_cfg80211_ops, sizeof(struct ath6kl));</div><div class='add'>+</div><div class='add'>+	if (!wiphy) {</div><div class='ctx'> 		ath6kl_err("couldn't allocate wiphy device\n");</div><div class='del'>-		kfree(wdev);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ar = wiphy_priv(wdev-&gt;wiphy);</div><div class='add'>+	ar = wiphy_priv(wiphy);</div><div class='ctx'> 	ar-&gt;p2p = !!ath6kl_p2p;</div><div class='add'>+	ar-&gt;wiphy = wiphy;</div><div class='add'>+	ar-&gt;dev = dev;</div><div class='ctx'> </div><div class='del'>-	wdev-&gt;wiphy-&gt;mgmt_stypes = ath6kl_mgmt_stypes;</div><div class='add'>+	ar-&gt;vif_max = 1;</div><div class='ctx'> </div><div class='del'>-	wdev-&gt;wiphy-&gt;max_remain_on_channel_duration = 5000;</div><div class='add'>+	ar-&gt;max_norm_iface = 1;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;ar-&gt;lock);</div><div class='add'>+	spin_lock_init(&amp;ar-&gt;mcastpsq_lock);</div><div class='add'>+	spin_lock_init(&amp;ar-&gt;list_lock);</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;ar-&gt;event_wq);</div><div class='add'>+	sema_init(&amp;ar-&gt;sem, 1);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;ar-&gt;amsdu_rx_buffer_queue);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ar-&gt;vif_list);</div><div class='add'>+</div><div class='add'>+	clear_bit(WMI_ENABLED, &amp;ar-&gt;flag);</div><div class='add'>+	clear_bit(SKIP_SCAN, &amp;ar-&gt;flag);</div><div class='add'>+	clear_bit(DESTROY_IN_PROGRESS, &amp;ar-&gt;flag);</div><div class='add'>+</div><div class='add'>+	ar-&gt;listen_intvl_t = A_DEFAULT_LISTEN_INTERVAL;</div><div class='add'>+	ar-&gt;listen_intvl_b = 0;</div><div class='add'>+	ar-&gt;tx_pwr = 0;</div><div class='add'>+</div><div class='add'>+	ar-&gt;intra_bss = 1;</div><div class='add'>+	ar-&gt;lrssi_roam_threshold = DEF_LRSSI_ROAM_THRESHOLD;</div><div class='add'>+</div><div class='add'>+	ar-&gt;state = ATH6KL_STATE_OFF;</div><div class='add'>+</div><div class='add'>+	memset((u8 *)ar-&gt;sta_list, 0,</div><div class='add'>+	       AP_MAX_NUM_STA * sizeof(struct ath6kl_sta));</div><div class='add'>+</div><div class='add'>+	/* Init the PS queues */</div><div class='add'>+	for (ctr = 0; ctr &lt; AP_MAX_NUM_STA; ctr++) {</div><div class='add'>+		spin_lock_init(&amp;ar-&gt;sta_list[ctr].psq_lock);</div><div class='add'>+		skb_queue_head_init(&amp;ar-&gt;sta_list[ctr].psq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_queue_head_init(&amp;ar-&gt;mcastpsq);</div><div class='add'>+</div><div class='add'>+	memcpy(ar-&gt;ap_country_code, DEF_AP_COUNTRY_CODE, 3);</div><div class='add'>+</div><div class='add'>+	return ar;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath6kl_register_ieee80211_hw(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	struct wiphy *wiphy = ar-&gt;wiphy;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;mgmt_stypes = ath6kl_mgmt_stypes;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;max_remain_on_channel_duration = 5000;</div><div class='ctx'> </div><div class='ctx'> 	/* set device pointer for wiphy */</div><div class='del'>-	set_wiphy_dev(wdev-&gt;wiphy, dev);</div><div class='add'>+	set_wiphy_dev(wiphy, ar-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	wdev-&gt;wiphy-&gt;interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='del'>-		BIT(NL80211_IFTYPE_ADHOC) | BIT(NL80211_IFTYPE_AP);</div><div class='add'>+	wiphy-&gt;interface_modes = BIT(NL80211_IFTYPE_STATION) |</div><div class='add'>+				 BIT(NL80211_IFTYPE_ADHOC) |</div><div class='add'>+				 BIT(NL80211_IFTYPE_AP);</div><div class='ctx'> 	if (ar-&gt;p2p) {</div><div class='del'>-		wdev-&gt;wiphy-&gt;interface_modes |= BIT(NL80211_IFTYPE_P2P_GO) |</div><div class='del'>-			BIT(NL80211_IFTYPE_P2P_CLIENT);</div><div class='add'>+		wiphy-&gt;interface_modes |= BIT(NL80211_IFTYPE_P2P_GO) |</div><div class='add'>+					  BIT(NL80211_IFTYPE_P2P_CLIENT);</div><div class='ctx'> 	}</div><div class='del'>-	/* max num of ssids that can be probed during scanning */</div><div class='del'>-	wdev-&gt;wiphy-&gt;max_scan_ssids = MAX_PROBED_SSID_INDEX;</div><div class='del'>-	wdev-&gt;wiphy-&gt;max_scan_ie_len = 1000; /* FIX: what is correct limit? */</div><div class='del'>-	wdev-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] = &amp;ath6kl_band_2ghz;</div><div class='del'>-	wdev-&gt;wiphy-&gt;bands[IEEE80211_BAND_5GHZ] = &amp;ath6kl_band_5ghz;</div><div class='del'>-	wdev-&gt;wiphy-&gt;signal_type = CFG80211_SIGNAL_TYPE_MBM;</div><div class='del'>-</div><div class='del'>-	wdev-&gt;wiphy-&gt;cipher_suites = cipher_suites;</div><div class='del'>-	wdev-&gt;wiphy-&gt;n_cipher_suites = ARRAY_SIZE(cipher_suites);</div><div class='ctx'> </div><div class='del'>-	ret = wiphy_register(wdev-&gt;wiphy);</div><div class='add'>+	/* max num of ssids that can be probed during scanning */</div><div class='add'>+	wiphy-&gt;max_scan_ssids = MAX_PROBED_SSID_INDEX;</div><div class='add'>+	wiphy-&gt;max_scan_ie_len = 1000; /* FIX: what is correct limit? */</div><div class='add'>+	wiphy-&gt;bands[IEEE80211_BAND_2GHZ] = &amp;ath6kl_band_2ghz;</div><div class='add'>+	wiphy-&gt;bands[IEEE80211_BAND_5GHZ] = &amp;ath6kl_band_5ghz;</div><div class='add'>+	wiphy-&gt;signal_type = CFG80211_SIGNAL_TYPE_MBM;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;cipher_suites = cipher_suites;</div><div class='add'>+	wiphy-&gt;n_cipher_suites = ARRAY_SIZE(cipher_suites);</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT |</div><div class='add'>+			      WIPHY_WOWLAN_DISCONNECT |</div><div class='add'>+			      WIPHY_WOWLAN_GTK_REKEY_FAILURE  |</div><div class='add'>+			      WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |</div><div class='add'>+			      WIPHY_WOWLAN_EAP_IDENTITY_REQ   |</div><div class='add'>+			      WIPHY_WOWLAN_4WAY_HANDSHAKE;</div><div class='add'>+	wiphy-&gt;wowlan.n_patterns = WOW_MAX_FILTERS_PER_LIST;</div><div class='add'>+	wiphy-&gt;wowlan.pattern_min_len = 1;</div><div class='add'>+	wiphy-&gt;wowlan.pattern_max_len = WOW_PATTERN_SIZE;</div><div class='add'>+</div><div class='add'>+	wiphy-&gt;max_sched_scan_ssids = 10;</div><div class='add'>+</div><div class='add'>+	ret = wiphy_register(wiphy);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		ath6kl_err("couldn't register wiphy device\n");</div><div class='del'>-		wiphy_free(wdev-&gt;wiphy);</div><div class='del'>-		kfree(wdev);</div><div class='del'>-		return NULL;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return wdev;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_cfg80211_deinit(struct ath6kl *ar)</div><div class='add'>+static int ath6kl_init_if_data(struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct wireless_dev *wdev = ar-&gt;wdev;</div><div class='del'>-</div><div class='del'>-	if (ar-&gt;scan_req) {</div><div class='del'>-		cfg80211_scan_done(ar-&gt;scan_req, true);</div><div class='del'>-		ar-&gt;scan_req = NULL;</div><div class='add'>+	vif-&gt;aggr_cntxt = aggr_init(vif-&gt;ndev);</div><div class='add'>+	if (!vif-&gt;aggr_cntxt) {</div><div class='add'>+		ath6kl_err("failed to initialize aggr\n");</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!wdev)</div><div class='del'>-		return;</div><div class='add'>+	setup_timer(&amp;vif-&gt;disconnect_timer, disconnect_timer_handler,</div><div class='add'>+		    (unsigned long) vif-&gt;ndev);</div><div class='add'>+	setup_timer(&amp;vif-&gt;sched_scan_timer, ath6kl_wmi_sscan_timer,</div><div class='add'>+		    (unsigned long) vif);</div><div class='add'>+</div><div class='add'>+	set_bit(WMM_ENABLED, &amp;vif-&gt;flags);</div><div class='add'>+	spin_lock_init(&amp;vif-&gt;if_lock);</div><div class='ctx'> </div><div class='del'>-	wiphy_unregister(wdev-&gt;wiphy);</div><div class='del'>-	wiphy_free(wdev-&gt;wiphy);</div><div class='del'>-	kfree(wdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath6kl_deinit_if_data(struct ath6kl_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='add'>+</div><div class='add'>+	aggr_module_destroy(vif-&gt;aggr_cntxt);</div><div class='add'>+</div><div class='add'>+	ar-&gt;avail_idx_map |= BIT(vif-&gt;fw_vif_idx);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;nw_type == ADHOC_NETWORK)</div><div class='add'>+		ar-&gt;ibss_if_active = false;</div><div class='add'>+</div><div class='add'>+	unregister_netdevice(vif-&gt;ndev);</div><div class='add'>+</div><div class='add'>+	ar-&gt;num_vif--;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name,</div><div class='add'>+					enum nl80211_iftype type, u8 fw_vif_idx,</div><div class='add'>+					u8 nw_type)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	struct ath6kl_vif *vif;</div><div class='add'>+</div><div class='add'>+	ndev = alloc_netdev(sizeof(*vif), name, ether_setup);</div><div class='add'>+	if (!ndev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	vif = netdev_priv(ndev);</div><div class='add'>+	ndev-&gt;ieee80211_ptr = &amp;vif-&gt;wdev;</div><div class='add'>+	vif-&gt;wdev.wiphy = ar-&gt;wiphy;</div><div class='add'>+	vif-&gt;ar = ar;</div><div class='add'>+	vif-&gt;ndev = ndev;</div><div class='add'>+	SET_NETDEV_DEV(ndev, wiphy_dev(vif-&gt;wdev.wiphy));</div><div class='add'>+	vif-&gt;wdev.netdev = ndev;</div><div class='add'>+	vif-&gt;wdev.iftype = type;</div><div class='add'>+	vif-&gt;fw_vif_idx = fw_vif_idx;</div><div class='add'>+	vif-&gt;nw_type = vif-&gt;next_mode = nw_type;</div><div class='add'>+</div><div class='add'>+	memcpy(ndev-&gt;dev_addr, ar-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	if (fw_vif_idx != 0)</div><div class='add'>+		ndev-&gt;dev_addr[0] = (ndev-&gt;dev_addr[0] ^ (1 &lt;&lt; fw_vif_idx)) |</div><div class='add'>+				     0x2;</div><div class='add'>+</div><div class='add'>+	init_netdev(ndev);</div><div class='add'>+</div><div class='add'>+	ath6kl_init_control_info(vif);</div><div class='add'>+</div><div class='add'>+	/* TODO: Pass interface specific pointer instead of ar */</div><div class='add'>+	if (ath6kl_init_if_data(vif))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (register_netdevice(ndev))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ar-&gt;avail_idx_map &amp;= ~BIT(fw_vif_idx);</div><div class='add'>+	vif-&gt;sme_state = SME_DISCONNECTED;</div><div class='add'>+	set_bit(WLAN_ENABLED, &amp;vif-&gt;flags);</div><div class='add'>+	ar-&gt;wlan_pwr_state = WLAN_POWER_STATE_ON;</div><div class='add'>+	set_bit(NETDEV_REGISTERED, &amp;vif-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if (type == NL80211_IFTYPE_ADHOC)</div><div class='add'>+		ar-&gt;ibss_if_active = true;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;list_lock);</div><div class='add'>+	list_add_tail(&amp;vif-&gt;list, &amp;ar-&gt;vif_list);</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;list_lock);</div><div class='add'>+</div><div class='add'>+	return ndev;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	aggr_module_destroy(vif-&gt;aggr_cntxt);</div><div class='add'>+	free_netdev(ndev);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath6kl_deinit_ieee80211_hw(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	wiphy_unregister(ar-&gt;wiphy);</div><div class='add'>+	wiphy_free(ar-&gt;wiphy);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.h b/drivers/net/wireless/ath/ath6kl/cfg80211.h<br/>index a84adc249c61..81f20a572315 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/cfg80211.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/cfg80211.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/cfg80211.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/cfg80211.h</a></div><div class='hunk'>@@ -17,23 +17,43 @@</div><div class='ctx'> #ifndef ATH6KL_CFG80211_H</div><div class='ctx'> #define ATH6KL_CFG80211_H</div><div class='ctx'> </div><div class='del'>-struct wireless_dev *ath6kl_cfg80211_init(struct device *dev);</div><div class='del'>-void ath6kl_cfg80211_deinit(struct ath6kl *ar);</div><div class='add'>+enum ath6kl_cfg_suspend_mode {</div><div class='add'>+	ATH6KL_CFG_SUSPEND_DEEPSLEEP,</div><div class='add'>+	ATH6KL_CFG_SUSPEND_CUTPOWER,</div><div class='add'>+	ATH6KL_CFG_SUSPEND_WOW,</div><div class='add'>+	ATH6KL_CFG_SUSPEND_SCHED_SCAN,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-void ath6kl_cfg80211_scan_complete_event(struct ath6kl *ar, int status);</div><div class='add'>+struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name,</div><div class='add'>+					enum nl80211_iftype type,</div><div class='add'>+					u8 fw_vif_idx, u8 nw_type);</div><div class='add'>+int ath6kl_register_ieee80211_hw(struct ath6kl *ar);</div><div class='add'>+struct ath6kl *ath6kl_core_alloc(struct device *dev);</div><div class='add'>+void ath6kl_deinit_ieee80211_hw(struct ath6kl *ar);</div><div class='ctx'> </div><div class='del'>-void ath6kl_cfg80211_connect_event(struct ath6kl *ar, u16 channel,</div><div class='add'>+void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, bool aborted);</div><div class='add'>+</div><div class='add'>+void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel,</div><div class='ctx'> 				   u8 *bssid, u16 listen_intvl,</div><div class='ctx'> 				   u16 beacon_intvl,</div><div class='ctx'> 				   enum network_type nw_type,</div><div class='ctx'> 				   u8 beacon_ie_len, u8 assoc_req_len,</div><div class='ctx'> 				   u8 assoc_resp_len, u8 *assoc_info);</div><div class='ctx'> </div><div class='del'>-void ath6kl_cfg80211_disconnect_event(struct ath6kl *ar, u8 reason,</div><div class='add'>+void ath6kl_cfg80211_disconnect_event(struct ath6kl_vif *vif, u8 reason,</div><div class='ctx'> 				      u8 *bssid, u8 assoc_resp_len,</div><div class='ctx'> 				      u8 *assoc_info, u16 proto_reason);</div><div class='ctx'> </div><div class='del'>-void ath6kl_cfg80211_tkip_micerr_event(struct ath6kl *ar, u8 keyid,</div><div class='add'>+void ath6kl_cfg80211_tkip_micerr_event(struct ath6kl_vif *vif, u8 keyid,</div><div class='ctx'> 				     bool ismcast);</div><div class='ctx'> </div><div class='add'>+int ath6kl_cfg80211_suspend(struct ath6kl *ar,</div><div class='add'>+			    enum ath6kl_cfg_suspend_mode mode,</div><div class='add'>+			    struct cfg80211_wowlan *wow);</div><div class='add'>+</div><div class='add'>+int ath6kl_cfg80211_resume(struct ath6kl *ar);</div><div class='add'>+</div><div class='add'>+void ath6kl_cfg80211_stop(struct ath6kl_vif *vif);</div><div class='add'>+void ath6kl_cfg80211_stop_all(struct ath6kl *ar);</div><div class='add'>+</div><div class='ctx'> #endif /* ATH6KL_CFG80211_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/common.h b/drivers/net/wireless/ath/ath6kl/common.h<br/>index b92f0e5d2336..bfd6597763da 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/common.h</a></div><div class='hunk'>@@ -23,8 +23,6 @@</div><div class='ctx'> </div><div class='ctx'> extern int ath6kl_printk(const char *level, const char *fmt, ...);</div><div class='ctx'> </div><div class='del'>-#define A_CACHE_LINE_PAD            128</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Reflects the version of binary interface exposed by ATH6KL target</div><div class='ctx'>  * firmware. Needs to be incremented by 1 for any change in the firmware</div><div class='hunk'>@@ -73,25 +71,16 @@ enum crypto_type {</div><div class='ctx'> 	WEP_CRYPT           = 0x02,</div><div class='ctx'> 	TKIP_CRYPT          = 0x04,</div><div class='ctx'> 	AES_CRYPT           = 0x08,</div><div class='add'>+	WAPI_CRYPT          = 0x10,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct htc_endpoint_credit_dist;</div><div class='ctx'> struct ath6kl;</div><div class='ctx'> enum htc_credit_dist_reason;</div><div class='del'>-struct htc_credit_state_info;</div><div class='add'>+struct ath6kl_htc_credit_info;</div><div class='ctx'> </div><div class='del'>-int ath6k_setup_credit_dist(void *htc_handle,</div><div class='del'>-			    struct htc_credit_state_info *cred_info);</div><div class='del'>-void ath6k_credit_distribute(struct htc_credit_state_info *cred_inf,</div><div class='del'>-			     struct list_head *epdist_list,</div><div class='del'>-			     enum htc_credit_dist_reason reason);</div><div class='del'>-void ath6k_credit_init(struct htc_credit_state_info *cred_inf,</div><div class='del'>-		       struct list_head *ep_list,</div><div class='del'>-		       int tot_credits);</div><div class='del'>-void ath6k_seek_credits(struct htc_credit_state_info *cred_inf,</div><div class='del'>-			struct htc_endpoint_credit_dist *ep_dist);</div><div class='ctx'> struct ath6kl *ath6kl_core_alloc(struct device *sdev);</div><div class='ctx'> int ath6kl_core_init(struct ath6kl *ar);</div><div class='del'>-int ath6kl_unavail_ev(struct ath6kl *ar);</div><div class='add'>+void ath6kl_core_cleanup(struct ath6kl *ar);</div><div class='ctx'> struct sk_buff *ath6kl_buf_alloc(int size);</div><div class='ctx'> #endif /* COMMON_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/core.h b/drivers/net/wireless/ath/ath6kl/core.h<br/>index 6d8a4845baaf..c863a28f2e0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/core.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/core.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/core.h</a></div><div class='hunk'>@@ -70,10 +70,20 @@ enum ath6kl_fw_ie_type {</div><div class='ctx'> 	ATH6KL_FW_IE_RESERVED_RAM_SIZE = 5,</div><div class='ctx'> 	ATH6KL_FW_IE_CAPABILITIES = 6,</div><div class='ctx'> 	ATH6KL_FW_IE_PATCH_ADDR = 7,</div><div class='add'>+	ATH6KL_FW_IE_BOARD_ADDR = 8,</div><div class='add'>+	ATH6KL_FW_IE_VIF_MAX = 9,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ath6kl_fw_capability {</div><div class='ctx'> 	ATH6KL_FW_CAPABILITY_HOST_P2P = 0,</div><div class='add'>+	ATH6KL_FW_CAPABILITY_SCHED_SCAN = 1,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Firmware is capable of supporting P2P mgmt operations on a</div><div class='add'>+	 * station interface. After group formation, the station</div><div class='add'>+	 * interface will become a P2P client/GO interface as the case may be</div><div class='add'>+	 */</div><div class='add'>+	ATH6KL_FW_CAPABILITY_STA_P2PDEV_DUPLEX,</div><div class='ctx'> </div><div class='ctx'> 	/* this needs to be last */</div><div class='ctx'> 	ATH6KL_FW_CAPABILITY_MAX,</div><div class='hunk'>@@ -88,37 +98,47 @@ struct ath6kl_fw_ie {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* AR6003 1.0 definitions */</div><div class='del'>-#define AR6003_REV1_VERSION                 0x300002ba</div><div class='add'>+#define AR6003_HW_1_0_VERSION                 0x300002ba</div><div class='ctx'> </div><div class='ctx'> /* AR6003 2.0 definitions */</div><div class='del'>-#define AR6003_REV2_VERSION                 0x30000384</div><div class='del'>-#define AR6003_REV2_PATCH_DOWNLOAD_ADDRESS  0x57e910</div><div class='del'>-#define AR6003_REV2_OTP_FILE                "ath6k/AR6003/hw2.0/otp.bin.z77"</div><div class='del'>-#define AR6003_REV2_FIRMWARE_FILE           "ath6k/AR6003/hw2.0/athwlan.bin.z77"</div><div class='del'>-#define AR6003_REV2_TCMD_FIRMWARE_FILE      "ath6k/AR6003/hw2.0/athtcmd_ram.bin"</div><div class='del'>-#define AR6003_REV2_PATCH_FILE              "ath6k/AR6003/hw2.0/data.patch.bin"</div><div class='del'>-#define AR6003_REV2_FIRMWARE_2_FILE         "ath6k/AR6003/hw2.0/fw-2.bin"</div><div class='del'>-#define AR6003_REV2_BOARD_DATA_FILE         "ath6k/AR6003/hw2.0/bdata.bin"</div><div class='del'>-#define AR6003_REV2_DEFAULT_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.SD31.bin"</div><div class='add'>+#define AR6003_HW_2_0_VERSION                 0x30000384</div><div class='add'>+#define AR6003_HW_2_0_PATCH_DOWNLOAD_ADDRESS  0x57e910</div><div class='add'>+#define AR6003_HW_2_0_OTP_FILE "ath6k/AR6003/hw2.0/otp.bin.z77"</div><div class='add'>+#define AR6003_HW_2_0_FIRMWARE_FILE "ath6k/AR6003/hw2.0/athwlan.bin.z77"</div><div class='add'>+#define AR6003_HW_2_0_TCMD_FIRMWARE_FILE "ath6k/AR6003/hw2.0/athtcmd_ram.bin"</div><div class='add'>+#define AR6003_HW_2_0_PATCH_FILE "ath6k/AR6003/hw2.0/data.patch.bin"</div><div class='add'>+#define AR6003_HW_2_0_FIRMWARE_2_FILE "ath6k/AR6003/hw2.0/fw-2.bin"</div><div class='add'>+#define AR6003_HW_2_0_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.bin"</div><div class='add'>+#define AR6003_HW_2_0_DEFAULT_BOARD_DATA_FILE \</div><div class='add'>+			"ath6k/AR6003/hw2.0/bdata.SD31.bin"</div><div class='ctx'> </div><div class='ctx'> /* AR6003 3.0 definitions */</div><div class='del'>-#define AR6003_REV3_VERSION                 0x30000582</div><div class='del'>-#define AR6003_REV3_OTP_FILE                "ath6k/AR6003/hw2.1.1/otp.bin"</div><div class='del'>-#define AR6003_REV3_FIRMWARE_FILE           "ath6k/AR6003/hw2.1.1/athwlan.bin"</div><div class='del'>-#define AR6003_REV3_TCMD_FIRMWARE_FILE    "ath6k/AR6003/hw2.1.1/athtcmd_ram.bin"</div><div class='del'>-#define AR6003_REV3_PATCH_FILE            "ath6k/AR6003/hw2.1.1/data.patch.bin"</div><div class='del'>-#define AR6003_REV3_FIRMWARE_2_FILE           "ath6k/AR6003/hw2.1.1/fw-2.bin"</div><div class='del'>-#define AR6003_REV3_BOARD_DATA_FILE       "ath6k/AR6003/hw2.1.1/bdata.bin"</div><div class='del'>-#define AR6003_REV3_DEFAULT_BOARD_DATA_FILE	\</div><div class='del'>-	"ath6k/AR6003/hw2.1.1/bdata.SD31.bin"</div><div class='add'>+#define AR6003_HW_2_1_1_VERSION                 0x30000582</div><div class='add'>+#define AR6003_HW_2_1_1_OTP_FILE "ath6k/AR6003/hw2.1.1/otp.bin"</div><div class='add'>+#define AR6003_HW_2_1_1_FIRMWARE_FILE "ath6k/AR6003/hw2.1.1/athwlan.bin"</div><div class='add'>+#define AR6003_HW_2_1_1_TCMD_FIRMWARE_FILE \</div><div class='add'>+			"ath6k/AR6003/hw2.1.1/athtcmd_ram.bin"</div><div class='add'>+#define AR6003_HW_2_1_1_PATCH_FILE "ath6k/AR6003/hw2.1.1/data.patch.bin"</div><div class='add'>+#define AR6003_HW_2_1_1_FIRMWARE_2_FILE "ath6k/AR6003/hw2.1.1/fw-2.bin"</div><div class='add'>+#define AR6003_HW_2_1_1_BOARD_DATA_FILE "ath6k/AR6003/hw2.1.1/bdata.bin"</div><div class='add'>+#define AR6003_HW_2_1_1_DEFAULT_BOARD_DATA_FILE	\</div><div class='add'>+			"ath6k/AR6003/hw2.1.1/bdata.SD31.bin"</div><div class='ctx'> </div><div class='ctx'> /* AR6004 1.0 definitions */</div><div class='del'>-#define AR6004_REV1_VERSION                 0x30000623</div><div class='del'>-#define AR6004_REV1_FIRMWARE_FILE           "ath6k/AR6004/hw6.1/fw.ram.bin"</div><div class='del'>-#define AR6004_REV1_FIRMWARE_2_FILE         "ath6k/AR6004/hw6.1/fw-2.bin"</div><div class='del'>-#define AR6004_REV1_BOARD_DATA_FILE         "ath6k/AR6004/hw6.1/bdata.bin"</div><div class='del'>-#define AR6004_REV1_DEFAULT_BOARD_DATA_FILE "ath6k/AR6004/hw6.1/bdata.DB132.bin"</div><div class='del'>-#define AR6004_REV1_EPPING_FIRMWARE_FILE "ath6k/AR6004/hw6.1/endpointping.bin"</div><div class='add'>+#define AR6004_HW_1_0_VERSION                 0x30000623</div><div class='add'>+#define AR6004_HW_1_0_FIRMWARE_2_FILE         "ath6k/AR6004/hw1.0/fw-2.bin"</div><div class='add'>+#define AR6004_HW_1_0_FIRMWARE_FILE           "ath6k/AR6004/hw1.0/fw.ram.bin"</div><div class='add'>+#define AR6004_HW_1_0_BOARD_DATA_FILE         "ath6k/AR6004/hw1.0/bdata.bin"</div><div class='add'>+#define AR6004_HW_1_0_DEFAULT_BOARD_DATA_FILE \</div><div class='add'>+	"ath6k/AR6004/hw1.0/bdata.DB132.bin"</div><div class='add'>+</div><div class='add'>+/* AR6004 1.1 definitions */</div><div class='add'>+#define AR6004_HW_1_1_VERSION                 0x30000001</div><div class='add'>+#define AR6004_HW_1_1_FIRMWARE_2_FILE         "ath6k/AR6004/hw1.1/fw-2.bin"</div><div class='add'>+#define AR6004_HW_1_1_FIRMWARE_FILE           "ath6k/AR6004/hw1.1/fw.ram.bin"</div><div class='add'>+#define AR6004_HW_1_1_BOARD_DATA_FILE         "ath6k/AR6004/hw1.1/bdata.bin"</div><div class='add'>+#define AR6004_HW_1_1_DEFAULT_BOARD_DATA_FILE \</div><div class='add'>+	"ath6k/AR6004/hw1.1/bdata.DB132.bin"</div><div class='ctx'> </div><div class='ctx'> /* Per STA data, used in AP mode */</div><div class='ctx'> #define STA_PS_AWAKE		BIT(0)</div><div class='hunk'>@@ -166,6 +186,7 @@ struct ath6kl_fw_ie {</div><div class='ctx'> #define ATH6KL_CONF_IGNORE_PS_FAIL_EVT_IN_SCAN  BIT(1)</div><div class='ctx'> #define ATH6KL_CONF_ENABLE_11N			BIT(2)</div><div class='ctx'> #define ATH6KL_CONF_ENABLE_TX_BURST		BIT(3)</div><div class='add'>+#define ATH6KL_CONF_SUSPEND_CUTPOWER		BIT(4)</div><div class='ctx'> </div><div class='ctx'> enum wlan_low_pwr_state {</div><div class='ctx'> 	WLAN_POWER_STATE_ON,</div><div class='hunk'>@@ -271,6 +292,8 @@ struct ath6kl_bmi {</div><div class='ctx'> 	u32 cmd_credits;</div><div class='ctx'> 	bool done_sent;</div><div class='ctx'> 	u8 *cmd_buf;</div><div class='add'>+	u32 max_data_size;</div><div class='add'>+	u32 max_cmd_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct target_stats {</div><div class='hunk'>@@ -380,40 +403,42 @@ struct ath6kl_req_key {</div><div class='ctx'> 	u8 key_len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Flag info */</div><div class='del'>-#define WMI_ENABLED	0</div><div class='del'>-#define WMI_READY	1</div><div class='del'>-#define CONNECTED	2</div><div class='del'>-#define STATS_UPDATE_PEND 3</div><div class='del'>-#define CONNECT_PEND	  4</div><div class='del'>-#define WMM_ENABLED	  5</div><div class='del'>-#define NETQ_STOPPED	  6</div><div class='del'>-#define WMI_CTRL_EP_FULL  7</div><div class='del'>-#define DTIM_EXPIRED	  8</div><div class='del'>-#define DESTROY_IN_PROGRESS  9</div><div class='del'>-#define NETDEV_REGISTERED    10</div><div class='del'>-#define SKIP_SCAN	     11</div><div class='del'>-#define WLAN_ENABLED	     12</div><div class='del'>-#define TESTMODE	     13</div><div class='del'>-#define CLEAR_BSSFILTER_ON_BEACON 14</div><div class='del'>-#define DTIM_PERIOD_AVAIL    15</div><div class='add'>+enum ath6kl_hif_type {</div><div class='add'>+	ATH6KL_HIF_TYPE_SDIO,</div><div class='add'>+	ATH6KL_HIF_TYPE_USB,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-struct ath6kl {</div><div class='del'>-	struct device *dev;</div><div class='del'>-	struct net_device *net_dev;</div><div class='del'>-	struct ath6kl_bmi bmi;</div><div class='del'>-	const struct ath6kl_hif_ops *hif_ops;</div><div class='del'>-	struct wmi *wmi;</div><div class='del'>-	int tx_pending[ENDPOINT_MAX];</div><div class='del'>-	int total_tx_data_pend;</div><div class='del'>-	struct htc_target *htc_target;</div><div class='del'>-	void *hif_priv;</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-	struct semaphore sem;</div><div class='add'>+/*</div><div class='add'>+ * Driver's maximum limit, note that some firmwares support only one vif</div><div class='add'>+ * and the runtime (current) limit must be checked from ar-&gt;vif_max.</div><div class='add'>+ */</div><div class='add'>+#define ATH6KL_VIF_MAX	3</div><div class='add'>+</div><div class='add'>+/* vif flags info */</div><div class='add'>+enum ath6kl_vif_state {</div><div class='add'>+	CONNECTED,</div><div class='add'>+	CONNECT_PEND,</div><div class='add'>+	WMM_ENABLED,</div><div class='add'>+	NETQ_STOPPED,</div><div class='add'>+	DTIM_EXPIRED,</div><div class='add'>+	NETDEV_REGISTERED,</div><div class='add'>+	CLEAR_BSSFILTER_ON_BEACON,</div><div class='add'>+	DTIM_PERIOD_AVAIL,</div><div class='add'>+	WLAN_ENABLED,</div><div class='add'>+	STATS_UPDATE_PEND,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath6kl_vif {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct wireless_dev wdev;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	struct ath6kl *ar;</div><div class='add'>+	/* Lock to protect vif specific net_stats and flags */</div><div class='add'>+	spinlock_t if_lock;</div><div class='add'>+	u8 fw_vif_idx;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int ssid_len;</div><div class='ctx'> 	u8 ssid[IEEE80211_MAX_SSID_LEN];</div><div class='del'>-	u8 next_mode;</div><div class='del'>-	u8 nw_type;</div><div class='ctx'> 	u8 dot11_auth_mode;</div><div class='ctx'> 	u8 auth_mode;</div><div class='ctx'> 	u8 prwise_crypto;</div><div class='hunk'>@@ -421,21 +446,91 @@ struct ath6kl {</div><div class='ctx'> 	u8 grp_crypto;</div><div class='ctx'> 	u8 grp_crypto_len;</div><div class='ctx'> 	u8 def_txkey_index;</div><div class='del'>-	struct ath6kl_wep_key wep_key_list[WMI_MAX_KEY_INDEX + 1];</div><div class='add'>+	u8 next_mode;</div><div class='add'>+	u8 nw_type;</div><div class='ctx'> 	u8 bssid[ETH_ALEN];</div><div class='ctx'> 	u8 req_bssid[ETH_ALEN];</div><div class='ctx'> 	u16 ch_hint;</div><div class='ctx'> 	u16 bss_ch;</div><div class='add'>+	struct ath6kl_wep_key wep_key_list[WMI_MAX_KEY_INDEX + 1];</div><div class='add'>+	struct ath6kl_key keys[WMI_MAX_KEY_INDEX + 1];</div><div class='add'>+	struct aggr_info *aggr_cntxt;</div><div class='add'>+</div><div class='add'>+	struct timer_list disconnect_timer;</div><div class='add'>+	struct timer_list sched_scan_timer;</div><div class='add'>+</div><div class='add'>+	struct cfg80211_scan_request *scan_req;</div><div class='add'>+	enum sme_state sme_state;</div><div class='add'>+	int reconnect_flag;</div><div class='add'>+	u32 last_roc_id;</div><div class='add'>+	u32 last_cancel_roc_id;</div><div class='add'>+	u32 send_action_id;</div><div class='add'>+	bool probe_req_report;</div><div class='add'>+	u16 next_chan;</div><div class='add'>+	u16 assoc_bss_beacon_int;</div><div class='add'>+	u8 assoc_bss_dtim_period;</div><div class='add'>+	struct net_device_stats net_stats;</div><div class='add'>+	struct target_stats target_stats;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WOW_LIST_ID		0</div><div class='add'>+#define WOW_HOST_REQ_DELAY	500 /* ms */</div><div class='add'>+</div><div class='add'>+#define ATH6KL_SCHED_SCAN_RESULT_DELAY 5000 /* ms */</div><div class='add'>+</div><div class='add'>+/* Flag info */</div><div class='add'>+enum ath6kl_dev_state {</div><div class='add'>+	WMI_ENABLED,</div><div class='add'>+	WMI_READY,</div><div class='add'>+	WMI_CTRL_EP_FULL,</div><div class='add'>+	TESTMODE,</div><div class='add'>+	DESTROY_IN_PROGRESS,</div><div class='add'>+	SKIP_SCAN,</div><div class='add'>+	ROAM_TBL_PEND,</div><div class='add'>+	FIRST_BOOT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath6kl_state {</div><div class='add'>+	ATH6KL_STATE_OFF,</div><div class='add'>+	ATH6KL_STATE_ON,</div><div class='add'>+	ATH6KL_STATE_DEEPSLEEP,</div><div class='add'>+	ATH6KL_STATE_CUTPOWER,</div><div class='add'>+	ATH6KL_STATE_WOW,</div><div class='add'>+	ATH6KL_STATE_SCHED_SCAN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath6kl {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct wiphy *wiphy;</div><div class='add'>+</div><div class='add'>+	enum ath6kl_state state;</div><div class='add'>+</div><div class='add'>+	struct ath6kl_bmi bmi;</div><div class='add'>+	const struct ath6kl_hif_ops *hif_ops;</div><div class='add'>+	struct wmi *wmi;</div><div class='add'>+	int tx_pending[ENDPOINT_MAX];</div><div class='add'>+	int total_tx_data_pend;</div><div class='add'>+	struct htc_target *htc_target;</div><div class='add'>+	enum ath6kl_hif_type hif_type;</div><div class='add'>+	void *hif_priv;</div><div class='add'>+	struct list_head vif_list;</div><div class='add'>+	/* Lock to avoid race in vif_list entries among add/del/traverse */</div><div class='add'>+	spinlock_t list_lock;</div><div class='add'>+	u8 num_vif;</div><div class='add'>+	unsigned int vif_max;</div><div class='add'>+	u8 max_norm_iface;</div><div class='add'>+	u8 avail_idx_map;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	struct semaphore sem;</div><div class='ctx'> 	u16 listen_intvl_b;</div><div class='ctx'> 	u16 listen_intvl_t;</div><div class='ctx'> 	u8 lrssi_roam_threshold;</div><div class='ctx'> 	struct ath6kl_version version;</div><div class='ctx'> 	u32 target_type;</div><div class='ctx'> 	u8 tx_pwr;</div><div class='del'>-	struct net_device_stats net_stats;</div><div class='del'>-	struct target_stats target_stats;</div><div class='ctx'> 	struct ath6kl_node_mapping node_map[MAX_NODE_NUM];</div><div class='ctx'> 	u8 ibss_ps_enable;</div><div class='add'>+	bool ibss_if_active;</div><div class='ctx'> 	u8 node_num;</div><div class='ctx'> 	u8 next_ep_id;</div><div class='ctx'> 	struct ath6kl_cookie *cookie_list;</div><div class='hunk'>@@ -446,7 +541,7 @@ struct ath6kl {</div><div class='ctx'> 	u8 hiac_stream_active_pri;</div><div class='ctx'> 	u8 ep2ac_map[ENDPOINT_MAX];</div><div class='ctx'> 	enum htc_endpoint_id ctrl_ep;</div><div class='del'>-	struct htc_credit_state_info credit_state_info;</div><div class='add'>+	struct ath6kl_htc_credit_info credit_state_info;</div><div class='ctx'> 	u32 connect_ctrl_flags;</div><div class='ctx'> 	u32 user_key_ctrl;</div><div class='ctx'> 	u8 usr_bss_filter;</div><div class='hunk'>@@ -456,30 +551,37 @@ struct ath6kl {</div><div class='ctx'> 	struct sk_buff_head mcastpsq;</div><div class='ctx'> 	spinlock_t mcastpsq_lock;</div><div class='ctx'> 	u8 intra_bss;</div><div class='del'>-	struct aggr_info *aggr_cntxt;</div><div class='ctx'> 	struct wmi_ap_mode_stat ap_stats;</div><div class='ctx'> 	u8 ap_country_code[3];</div><div class='ctx'> 	struct list_head amsdu_rx_buffer_queue;</div><div class='del'>-	struct timer_list disconnect_timer;</div><div class='ctx'> 	u8 rx_meta_ver;</div><div class='del'>-	struct wireless_dev *wdev;</div><div class='del'>-	struct cfg80211_scan_request *scan_req;</div><div class='del'>-	struct ath6kl_key keys[WMI_MAX_KEY_INDEX + 1];</div><div class='del'>-	enum sme_state sme_state;</div><div class='ctx'> 	enum wlan_low_pwr_state wlan_pwr_state;</div><div class='del'>-	struct wmi_scan_params_cmd sc_params;</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='ctx'> #define AR_MCAST_FILTER_MAC_ADDR_SIZE  4</div><div class='ctx'> 	struct {</div><div class='ctx'> 		void *rx_report;</div><div class='ctx'> 		size_t rx_report_len;</div><div class='ctx'> 	} tm;</div><div class='ctx'> </div><div class='del'>-	struct {</div><div class='add'>+	struct ath6kl_hw {</div><div class='add'>+		u32 id;</div><div class='add'>+		const char *name;</div><div class='ctx'> 		u32 dataset_patch_addr;</div><div class='ctx'> 		u32 app_load_addr;</div><div class='ctx'> 		u32 app_start_override_addr;</div><div class='ctx'> 		u32 board_ext_data_addr;</div><div class='ctx'> 		u32 reserved_ram_size;</div><div class='add'>+		u32 board_addr;</div><div class='add'>+		u32 refclk_hz;</div><div class='add'>+		u32 uarttx_pin;</div><div class='add'>+</div><div class='add'>+		const char *fw_otp;</div><div class='add'>+		const char *fw;</div><div class='add'>+		const char *fw_tcmd;</div><div class='add'>+		const char *fw_patch;</div><div class='add'>+		const char *fw_api2;</div><div class='add'>+		const char *fw_board;</div><div class='add'>+		const char *fw_default_board;</div><div class='ctx'> 	} hw;</div><div class='ctx'> </div><div class='ctx'> 	u16 conf_flags;</div><div class='hunk'>@@ -487,7 +589,6 @@ struct ath6kl {</div><div class='ctx'> 	struct ath6kl_mbox_info mbox_info;</div><div class='ctx'> </div><div class='ctx'> 	struct ath6kl_cookie cookie_mem[MAX_COOKIE_NUM];</div><div class='del'>-	int reconnect_flag;</div><div class='ctx'> 	unsigned long flag;</div><div class='ctx'> </div><div class='ctx'> 	u8 *fw_board;</div><div class='hunk'>@@ -508,13 +609,7 @@ struct ath6kl {</div><div class='ctx'> </div><div class='ctx'> 	struct dentry *debugfs_phy;</div><div class='ctx'> </div><div class='del'>-	u32 send_action_id;</div><div class='del'>-	bool probe_req_report;</div><div class='del'>-	u16 next_chan;</div><div class='del'>-</div><div class='ctx'> 	bool p2p;</div><div class='del'>-	u16 assoc_bss_beacon_int;</div><div class='del'>-	u8 assoc_bss_dtim_period;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ATH6KL_DEBUG</div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -529,23 +624,19 @@ struct ath6kl {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			unsigned int invalid_rate;</div><div class='ctx'> 		} war_stats;</div><div class='add'>+</div><div class='add'>+		u8 *roam_tbl;</div><div class='add'>+		unsigned int roam_tbl_len;</div><div class='add'>+</div><div class='add'>+		u8 keepalive;</div><div class='add'>+		u8 disc_timeout;</div><div class='ctx'> 	} debug;</div><div class='ctx'> #endif /* CONFIG_ATH6KL_DEBUG */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline void *ath6kl_priv(struct net_device *dev)</div><div class='add'>+static inline struct ath6kl *ath6kl_priv(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	return wdev_priv(dev-&gt;ieee80211_ptr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ath6kl_deposit_credit_to_ep(struct htc_credit_state_info</div><div class='del'>-					       *cred_info,</div><div class='del'>-					       struct htc_endpoint_credit_dist</div><div class='del'>-					       *ep_dist, int credits)</div><div class='del'>-{</div><div class='del'>-	ep_dist-&gt;credits += credits;</div><div class='del'>-	ep_dist-&gt;cred_assngd += credits;</div><div class='del'>-	cred_info-&gt;cur_free_credits -= credits;</div><div class='add'>+	return ((struct ath6kl_vif *) netdev_priv(dev))-&gt;ar;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32 ath6kl_get_hi_item_addr(struct ath6kl *ar,</div><div class='hunk'>@@ -561,7 +652,6 @@ static inline u32 ath6kl_get_hi_item_addr(struct ath6kl *ar,</div><div class='ctx'> 	return addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_destroy(struct net_device *dev, unsigned int unregister);</div><div class='ctx'> int ath6kl_configure_target(struct ath6kl *ar);</div><div class='ctx'> void ath6kl_detect_error(unsigned long ptr);</div><div class='ctx'> void disconnect_timer_handler(unsigned long ptr);</div><div class='hunk'>@@ -579,10 +669,8 @@ int ath6kl_diag_write(struct ath6kl *ar, u32 address, void *data, u32 length);</div><div class='ctx'> int ath6kl_diag_read32(struct ath6kl *ar, u32 address, u32 *value);</div><div class='ctx'> int ath6kl_diag_read(struct ath6kl *ar, u32 address, void *data, u32 length);</div><div class='ctx'> int ath6kl_read_fwlogs(struct ath6kl *ar);</div><div class='del'>-void ath6kl_init_profile_info(struct ath6kl *ar);</div><div class='add'>+void ath6kl_init_profile_info(struct ath6kl_vif *vif);</div><div class='ctx'> void ath6kl_tx_data_cleanup(struct ath6kl *ar);</div><div class='del'>-void ath6kl_stop_endpoint(struct net_device *dev, bool keep_profile,</div><div class='del'>-			  bool get_dbglogs);</div><div class='ctx'> </div><div class='ctx'> struct ath6kl_cookie *ath6kl_alloc_cookie(struct ath6kl *ar);</div><div class='ctx'> void ath6kl_free_cookie(struct ath6kl *ar, struct ath6kl_cookie *cookie);</div><div class='hunk'>@@ -598,40 +686,49 @@ struct htc_packet *ath6kl_alloc_amsdu_rxbuf(struct htc_target *target,</div><div class='ctx'> void aggr_module_destroy(struct aggr_info *aggr_info);</div><div class='ctx'> void aggr_reset_state(struct aggr_info *aggr_info);</div><div class='ctx'> </div><div class='del'>-struct ath6kl_sta *ath6kl_find_sta(struct ath6kl *ar, u8 * node_addr);</div><div class='add'>+struct ath6kl_sta *ath6kl_find_sta(struct ath6kl_vif *vif, u8 * node_addr);</div><div class='ctx'> struct ath6kl_sta *ath6kl_find_sta_by_aid(struct ath6kl *ar, u8 aid);</div><div class='ctx'> </div><div class='ctx'> void ath6kl_ready_event(void *devt, u8 * datap, u32 sw_ver, u32 abi_ver);</div><div class='ctx'> int ath6kl_control_tx(void *devt, struct sk_buff *skb,</div><div class='ctx'> 		      enum htc_endpoint_id eid);</div><div class='del'>-void ath6kl_connect_event(struct ath6kl *ar, u16 channel,</div><div class='add'>+void ath6kl_connect_event(struct ath6kl_vif *vif, u16 channel,</div><div class='ctx'> 			  u8 *bssid, u16 listen_int,</div><div class='ctx'> 			  u16 beacon_int, enum network_type net_type,</div><div class='ctx'> 			  u8 beacon_ie_len, u8 assoc_req_len,</div><div class='ctx'> 			  u8 assoc_resp_len, u8 *assoc_info);</div><div class='del'>-void ath6kl_connect_ap_mode_bss(struct ath6kl *ar, u16 channel);</div><div class='del'>-void ath6kl_connect_ap_mode_sta(struct ath6kl *ar, u16 aid, u8 *mac_addr,</div><div class='add'>+void ath6kl_connect_ap_mode_bss(struct ath6kl_vif *vif, u16 channel);</div><div class='add'>+void ath6kl_connect_ap_mode_sta(struct ath6kl_vif *vif, u16 aid, u8 *mac_addr,</div><div class='ctx'> 				u8 keymgmt, u8 ucipher, u8 auth,</div><div class='ctx'> 				u8 assoc_req_len, u8 *assoc_info);</div><div class='del'>-void ath6kl_disconnect_event(struct ath6kl *ar, u8 reason,</div><div class='add'>+void ath6kl_disconnect_event(struct ath6kl_vif *vif, u8 reason,</div><div class='ctx'> 			     u8 *bssid, u8 assoc_resp_len,</div><div class='ctx'> 			     u8 *assoc_info, u16 prot_reason_status);</div><div class='del'>-void ath6kl_tkip_micerr_event(struct ath6kl *ar, u8 keyid, bool ismcast);</div><div class='add'>+void ath6kl_tkip_micerr_event(struct ath6kl_vif *vif, u8 keyid, bool ismcast);</div><div class='ctx'> void ath6kl_txpwr_rx_evt(void *devt, u8 tx_pwr);</div><div class='del'>-void ath6kl_scan_complete_evt(struct ath6kl *ar, int status);</div><div class='del'>-void ath6kl_tgt_stats_event(struct ath6kl *ar, u8 *ptr, u32 len);</div><div class='add'>+void ath6kl_scan_complete_evt(struct ath6kl_vif *vif, int status);</div><div class='add'>+void ath6kl_tgt_stats_event(struct ath6kl_vif *vif, u8 *ptr, u32 len);</div><div class='ctx'> void ath6kl_indicate_tx_activity(void *devt, u8 traffic_class, bool active);</div><div class='ctx'> enum htc_endpoint_id ath6kl_ac2_endpoint_id(void *devt, u8 ac);</div><div class='ctx'> </div><div class='del'>-void ath6kl_pspoll_event(struct ath6kl *ar, u8 aid);</div><div class='add'>+void ath6kl_pspoll_event(struct ath6kl_vif *vif, u8 aid);</div><div class='ctx'> </div><div class='del'>-void ath6kl_dtimexpiry_event(struct ath6kl *ar);</div><div class='del'>-void ath6kl_disconnect(struct ath6kl *ar);</div><div class='del'>-void ath6kl_deep_sleep_enable(struct ath6kl *ar);</div><div class='del'>-void aggr_recv_delba_req_evt(struct ath6kl *ar, u8 tid);</div><div class='del'>-void aggr_recv_addba_req_evt(struct ath6kl *ar, u8 tid, u16 seq_no,</div><div class='add'>+void ath6kl_dtimexpiry_event(struct ath6kl_vif *vif);</div><div class='add'>+void ath6kl_disconnect(struct ath6kl_vif *vif);</div><div class='add'>+void aggr_recv_delba_req_evt(struct ath6kl_vif *vif, u8 tid);</div><div class='add'>+void aggr_recv_addba_req_evt(struct ath6kl_vif *vif, u8 tid, u16 seq_no,</div><div class='ctx'> 			     u8 win_sz);</div><div class='ctx'> void ath6kl_wakeup_event(void *dev);</div><div class='del'>-void ath6kl_target_failure(struct ath6kl *ar);</div><div class='add'>+</div><div class='add'>+void ath6kl_reset_device(struct ath6kl *ar, u32 target_type,</div><div class='add'>+			 bool wait_fot_compltn, bool cold_reset);</div><div class='add'>+void ath6kl_init_control_info(struct ath6kl_vif *vif);</div><div class='add'>+void ath6kl_deinit_if_data(struct ath6kl_vif *vif);</div><div class='add'>+void ath6kl_core_free(struct ath6kl *ar);</div><div class='add'>+struct ath6kl_vif *ath6kl_vif_first(struct ath6kl *ar);</div><div class='add'>+void ath6kl_cleanup_vif(struct ath6kl_vif *vif, bool wmi_ready);</div><div class='add'>+int ath6kl_init_hw_start(struct ath6kl *ar);</div><div class='add'>+int ath6kl_init_hw_stop(struct ath6kl *ar);</div><div class='add'>+void ath6kl_check_wow_status(struct ath6kl *ar);</div><div class='ctx'> </div><div class='ctx'> #endif /* CORE_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c<br/>index 7879b5314285..eb808b46f94c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/debug.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/debug.c</a></div><div class='hunk'>@@ -143,49 +143,48 @@ void ath6kl_dump_registers(struct ath6kl_device *dev,</div><div class='ctx'> </div><div class='ctx'> static void dump_cred_dist(struct htc_endpoint_credit_dist *ep_dist)</div><div class='ctx'> {</div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_ANY,</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_CREDIT,</div><div class='ctx'> 		   "--- endpoint: %d  svc_id: 0x%X ---\n",</div><div class='ctx'> 		   ep_dist-&gt;endpoint, ep_dist-&gt;svc_id);</div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_ANY, " dist_flags     : 0x%X\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_CREDIT, " dist_flags     : 0x%X\n",</div><div class='ctx'> 		   ep_dist-&gt;dist_flags);</div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_ANY, " cred_norm      : %d\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_CREDIT, " cred_norm      : %d\n",</div><div class='ctx'> 		   ep_dist-&gt;cred_norm);</div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_ANY, " cred_min       : %d\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_CREDIT, " cred_min       : %d\n",</div><div class='ctx'> 		   ep_dist-&gt;cred_min);</div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_ANY, " credits        : %d\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_CREDIT, " credits        : %d\n",</div><div class='ctx'> 		   ep_dist-&gt;credits);</div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_ANY, " cred_assngd    : %d\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_CREDIT, " cred_assngd    : %d\n",</div><div class='ctx'> 		   ep_dist-&gt;cred_assngd);</div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_ANY, " seek_cred      : %d\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_CREDIT, " seek_cred      : %d\n",</div><div class='ctx'> 		   ep_dist-&gt;seek_cred);</div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_ANY, " cred_sz        : %d\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_CREDIT, " cred_sz        : %d\n",</div><div class='ctx'> 		   ep_dist-&gt;cred_sz);</div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_ANY, " cred_per_msg   : %d\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_CREDIT, " cred_per_msg   : %d\n",</div><div class='ctx'> 		   ep_dist-&gt;cred_per_msg);</div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_ANY, " cred_to_dist   : %d\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_CREDIT, " cred_to_dist   : %d\n",</div><div class='ctx'> 		   ep_dist-&gt;cred_to_dist);</div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_ANY, " txq_depth      : %d\n",</div><div class='del'>-		   get_queue_depth(&amp;((struct htc_endpoint *)</div><div class='del'>-				     ep_dist-&gt;htc_rsvd)-&gt;txq));</div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_ANY,</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_CREDIT, " txq_depth      : %d\n",</div><div class='add'>+		   get_queue_depth(&amp;ep_dist-&gt;htc_ep-&gt;txq));</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_CREDIT,</div><div class='ctx'> 		   "----------------------------------\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* FIXME: move to htc.c */</div><div class='ctx'> void dump_cred_dist_stats(struct htc_target *target)</div><div class='ctx'> {</div><div class='ctx'> 	struct htc_endpoint_credit_dist *ep_list;</div><div class='ctx'> </div><div class='del'>-	if (!AR_DBG_LVL_CHECK(ATH6KL_DBG_TRC))</div><div class='add'>+	if (!AR_DBG_LVL_CHECK(ATH6KL_DBG_CREDIT))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(ep_list, &amp;target-&gt;cred_dist_list, list)</div><div class='ctx'> 		dump_cred_dist(ep_list);</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "ctxt:%p dist:%p\n",</div><div class='del'>-		   target-&gt;cred_dist_cntxt, NULL);</div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_TRC, "credit distribution, total : %d, free : %d\n",</div><div class='del'>-		   target-&gt;cred_dist_cntxt-&gt;total_avail_credits,</div><div class='del'>-		   target-&gt;cred_dist_cntxt-&gt;cur_free_credits);</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_CREDIT,</div><div class='add'>+		   "credit distribution total %d free %d\n",</div><div class='add'>+		   target-&gt;credit_info-&gt;total_avail_credits,</div><div class='add'>+		   target-&gt;credit_info-&gt;cur_free_credits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_debugfs_open(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -397,13 +396,20 @@ static ssize_t read_file_tgt_stats(struct file *file, char __user *user_buf,</div><div class='ctx'> 				   size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = file-&gt;private_data;</div><div class='del'>-	struct target_stats *tgt_stats = &amp;ar-&gt;target_stats;</div><div class='add'>+	struct ath6kl_vif *vif;</div><div class='add'>+	struct target_stats *tgt_stats;</div><div class='ctx'> 	char *buf;</div><div class='ctx'> 	unsigned int len = 0, buf_len = 1500;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	long left;</div><div class='ctx'> 	ssize_t ret_cnt;</div><div class='ctx'> </div><div class='add'>+	vif = ath6kl_vif_first(ar);</div><div class='add'>+	if (!vif)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	tgt_stats = &amp;vif-&gt;target_stats;</div><div class='add'>+</div><div class='ctx'> 	buf = kzalloc(buf_len, GFP_KERNEL);</div><div class='ctx'> 	if (!buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -413,9 +419,9 @@ static ssize_t read_file_tgt_stats(struct file *file, char __user *user_buf,</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_bit(STATS_UPDATE_PEND, &amp;ar-&gt;flag);</div><div class='add'>+	set_bit(STATS_UPDATE_PEND, &amp;vif-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	if (ath6kl_wmi_get_stats_cmd(ar-&gt;wmi)) {</div><div class='add'>+	if (ath6kl_wmi_get_stats_cmd(ar-&gt;wmi, 0)) {</div><div class='ctx'> 		up(&amp;ar-&gt;sem);</div><div class='ctx'> 		kfree(buf);</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -423,7 +429,7 @@ static ssize_t read_file_tgt_stats(struct file *file, char __user *user_buf,</div><div class='ctx'> </div><div class='ctx'> 	left = wait_event_interruptible_timeout(ar-&gt;event_wq,</div><div class='ctx'> 						!test_bit(STATS_UPDATE_PEND,</div><div class='del'>-						&amp;ar-&gt;flag), WMI_TIMEOUT);</div><div class='add'>+						&amp;vif-&gt;flags), WMI_TIMEOUT);</div><div class='ctx'> </div><div class='ctx'> 	up(&amp;ar-&gt;sem);</div><div class='ctx'> </div><div class='hunk'>@@ -555,10 +561,10 @@ static ssize_t read_file_credit_dist_stats(struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	len += scnprintf(buf + len, buf_len - len, "%25s%5d\n",</div><div class='ctx'> 			 "Total Avail Credits: ",</div><div class='del'>-			 target-&gt;cred_dist_cntxt-&gt;total_avail_credits);</div><div class='add'>+			 target-&gt;credit_info-&gt;total_avail_credits);</div><div class='ctx'> 	len += scnprintf(buf + len, buf_len - len, "%25s%5d\n",</div><div class='ctx'> 			 "Free credits :",</div><div class='del'>-			 target-&gt;cred_dist_cntxt-&gt;cur_free_credits);</div><div class='add'>+			 target-&gt;credit_info-&gt;cur_free_credits);</div><div class='ctx'> </div><div class='ctx'> 	len += scnprintf(buf + len, buf_len - len,</div><div class='ctx'> 			 " Epid  Flags    Cred_norm  Cred_min  Credits  Cred_assngd"</div><div class='hunk'>@@ -577,8 +583,7 @@ static ssize_t read_file_credit_dist_stats(struct file *file,</div><div class='ctx'> 		print_credit_info("%9d", cred_per_msg);</div><div class='ctx'> 		print_credit_info("%14d", cred_to_dist);</div><div class='ctx'> 		len += scnprintf(buf + len, buf_len - len, "%12d\n",</div><div class='del'>-				 get_queue_depth(&amp;((struct htc_endpoint *)</div><div class='del'>-						 ep_list-&gt;htc_rsvd)-&gt;txq));</div><div class='add'>+				 get_queue_depth(&amp;ep_list-&gt;htc_ep-&gt;txq));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (len &gt; buf_len)</div><div class='hunk'>@@ -596,6 +601,107 @@ static const struct file_operations fops_credit_dist_stats = {</div><div class='ctx'> 	.llseek = default_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static unsigned int print_endpoint_stat(struct htc_target *target, char *buf,</div><div class='add'>+					unsigned int buf_len, unsigned int len,</div><div class='add'>+					int offset, const char *name)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct htc_endpoint_stats *ep_st;</div><div class='add'>+	u32 *counter;</div><div class='add'>+</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "%s:", name);</div><div class='add'>+	for (i = 0; i &lt; ENDPOINT_MAX; i++) {</div><div class='add'>+		ep_st = &amp;target-&gt;endpoint[i].ep_st;</div><div class='add'>+		counter = ((u32 *) ep_st) + (offset / 4);</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len, " %u", *counter);</div><div class='add'>+	}</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len, "\n");</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 ath6kl_endpoint_stats_read(struct file *file,</div><div class='add'>+					  char __user *user_buf,</div><div class='add'>+					  size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = file-&gt;private_data;</div><div class='add'>+	struct htc_target *target = ar-&gt;htc_target;</div><div class='add'>+	char *buf;</div><div class='add'>+	unsigned int buf_len, len = 0;</div><div class='add'>+	ssize_t ret_cnt;</div><div class='add'>+</div><div class='add'>+	buf_len = sizeof(struct htc_endpoint_stats) / sizeof(u32) *</div><div class='add'>+		(25 + ENDPOINT_MAX * 11);</div><div class='add'>+	buf = kmalloc(buf_len, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+#define EPSTAT(name)							\</div><div class='add'>+	len = print_endpoint_stat(target, buf, buf_len, len,		\</div><div class='add'>+				  offsetof(struct htc_endpoint_stats, name), \</div><div class='add'>+				  #name)</div><div class='add'>+	EPSTAT(cred_low_indicate);</div><div class='add'>+	EPSTAT(tx_issued);</div><div class='add'>+	EPSTAT(tx_pkt_bundled);</div><div class='add'>+	EPSTAT(tx_bundles);</div><div class='add'>+	EPSTAT(tx_dropped);</div><div class='add'>+	EPSTAT(tx_cred_rpt);</div><div class='add'>+	EPSTAT(cred_rpt_from_rx);</div><div class='add'>+	EPSTAT(cred_rpt_from_other);</div><div class='add'>+	EPSTAT(cred_rpt_ep0);</div><div class='add'>+	EPSTAT(cred_from_rx);</div><div class='add'>+	EPSTAT(cred_from_other);</div><div class='add'>+	EPSTAT(cred_from_ep0);</div><div class='add'>+	EPSTAT(cred_cosumd);</div><div class='add'>+	EPSTAT(cred_retnd);</div><div class='add'>+	EPSTAT(rx_pkts);</div><div class='add'>+	EPSTAT(rx_lkahds);</div><div class='add'>+	EPSTAT(rx_bundl);</div><div class='add'>+	EPSTAT(rx_bundle_lkahd);</div><div class='add'>+	EPSTAT(rx_bundle_from_hdr);</div><div class='add'>+	EPSTAT(rx_alloc_thresh_hit);</div><div class='add'>+	EPSTAT(rxalloc_thresh_byte);</div><div class='add'>+#undef EPSTAT</div><div class='add'>+</div><div class='add'>+	if (len &gt; buf_len)</div><div class='add'>+		len = buf_len;</div><div class='add'>+</div><div class='add'>+	ret_cnt = simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return ret_cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath6kl_endpoint_stats_write(struct file *file,</div><div class='add'>+					   const char __user *user_buf,</div><div class='add'>+					   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = file-&gt;private_data;</div><div class='add'>+	struct htc_target *target = ar-&gt;htc_target;</div><div class='add'>+	int ret, i;</div><div class='add'>+	u32 val;</div><div class='add'>+	struct htc_endpoint_stats *ep_st;</div><div class='add'>+</div><div class='add'>+	ret = kstrtou32_from_user(user_buf, count, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (val == 0) {</div><div class='add'>+		for (i = 0; i &lt; ENDPOINT_MAX; i++) {</div><div class='add'>+			ep_st = &amp;target-&gt;endpoint[i].ep_st;</div><div class='add'>+			memset(ep_st, 0, sizeof(*ep_st));</div><div class='add'>+		}</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 const struct file_operations fops_endpoint_stats = {</div><div class='add'>+	.open = ath6kl_debugfs_open,</div><div class='add'>+	.read = ath6kl_endpoint_stats_read,</div><div class='add'>+	.write = ath6kl_endpoint_stats_write,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static unsigned long ath6kl_get_num_reg(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -868,6 +974,660 @@ static const struct file_operations fops_diag_reg_write = {</div><div class='ctx'> 	.llseek = default_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+int ath6kl_debug_roam_tbl_event(struct ath6kl *ar, const void *buf,</div><div class='add'>+				size_t len)</div><div class='add'>+{</div><div class='add'>+	const struct wmi_target_roam_tbl *tbl;</div><div class='add'>+	u16 num_entries;</div><div class='add'>+</div><div class='add'>+	if (len &lt; sizeof(*tbl))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	tbl = (const struct wmi_target_roam_tbl *) buf;</div><div class='add'>+	num_entries = le16_to_cpu(tbl-&gt;num_entries);</div><div class='add'>+	if (sizeof(*tbl) + num_entries * sizeof(struct wmi_bss_roam_info) &gt;</div><div class='add'>+	    len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;debug.roam_tbl == NULL ||</div><div class='add'>+	    ar-&gt;debug.roam_tbl_len &lt; (unsigned int) len) {</div><div class='add'>+		kfree(ar-&gt;debug.roam_tbl);</div><div class='add'>+		ar-&gt;debug.roam_tbl = kmalloc(len, GFP_ATOMIC);</div><div class='add'>+		if (ar-&gt;debug.roam_tbl == NULL)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(ar-&gt;debug.roam_tbl, buf, len);</div><div class='add'>+	ar-&gt;debug.roam_tbl_len = len;</div><div class='add'>+</div><div class='add'>+	if (test_bit(ROAM_TBL_PEND, &amp;ar-&gt;flag)) {</div><div class='add'>+		clear_bit(ROAM_TBL_PEND, &amp;ar-&gt;flag);</div><div class='add'>+		wake_up(&amp;ar-&gt;event_wq);</div><div 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 ssize_t ath6kl_roam_table_read(struct file *file, char __user *user_buf,</div><div class='add'>+				      size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = file-&gt;private_data;</div><div class='add'>+	int ret;</div><div class='add'>+	long left;</div><div class='add'>+	struct wmi_target_roam_tbl *tbl;</div><div class='add'>+	u16 num_entries, i;</div><div class='add'>+	char *buf;</div><div class='add'>+	unsigned int len, buf_len;</div><div class='add'>+	ssize_t ret_cnt;</div><div class='add'>+</div><div class='add'>+	if (down_interruptible(&amp;ar-&gt;sem))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	set_bit(ROAM_TBL_PEND, &amp;ar-&gt;flag);</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_wmi_get_roam_tbl_cmd(ar-&gt;wmi);</div><div class='add'>+	if (ret) {</div><div class='add'>+		up(&amp;ar-&gt;sem);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	left = wait_event_interruptible_timeout(</div><div class='add'>+		ar-&gt;event_wq, !test_bit(ROAM_TBL_PEND, &amp;ar-&gt;flag), WMI_TIMEOUT);</div><div class='add'>+	up(&amp;ar-&gt;sem);</div><div class='add'>+</div><div class='add'>+	if (left &lt;= 0)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;debug.roam_tbl == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	tbl = (struct wmi_target_roam_tbl *) ar-&gt;debug.roam_tbl;</div><div class='add'>+	num_entries = le16_to_cpu(tbl-&gt;num_entries);</div><div class='add'>+</div><div class='add'>+	buf_len = 100 + num_entries * 100;</div><div class='add'>+	buf = kzalloc(buf_len, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	len = 0;</div><div class='add'>+	len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+			 "roam_mode=%u\n\n"</div><div class='add'>+			 "# roam_util bssid rssi rssidt last_rssi util bias\n",</div><div class='add'>+			 le16_to_cpu(tbl-&gt;roam_mode));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_entries; i++) {</div><div class='add'>+		struct wmi_bss_roam_info *info = &amp;tbl-&gt;info[i];</div><div class='add'>+		len += scnprintf(buf + len, buf_len - len,</div><div class='add'>+				 "%d %pM %d %d %d %d %d\n",</div><div class='add'>+				 a_sle32_to_cpu(info-&gt;roam_util), info-&gt;bssid,</div><div class='add'>+				 info-&gt;rssi, info-&gt;rssidt, info-&gt;last_rssi,</div><div class='add'>+				 info-&gt;util, info-&gt;bias);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len &gt; buf_len)</div><div class='add'>+		len = buf_len;</div><div class='add'>+</div><div class='add'>+	ret_cnt = simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return ret_cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_roam_table = {</div><div class='add'>+	.read = ath6kl_roam_table_read,</div><div class='add'>+	.open = ath6kl_debugfs_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ath6kl_force_roam_write(struct file *file,</div><div class='add'>+				       const char __user *user_buf,</div><div class='add'>+				       size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = file-&gt;private_data;</div><div class='add'>+	int ret;</div><div class='add'>+	char buf[20];</div><div class='add'>+	size_t len;</div><div class='add'>+	u8 bssid[ETH_ALEN];</div><div class='add'>+	int i;</div><div class='add'>+	int addr[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	len = min(count, sizeof(buf) - 1);</div><div class='add'>+	if (copy_from_user(buf, user_buf, len))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	buf[len] = '\0';</div><div class='add'>+</div><div class='add'>+	if (sscanf(buf, "%02x:%02x:%02x:%02x:%02x:%02x",</div><div class='add'>+		   &amp;addr[0], &amp;addr[1], &amp;addr[2], &amp;addr[3], &amp;addr[4], &amp;addr[5])</div><div class='add'>+	    != ETH_ALEN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='add'>+		bssid[i] = addr[i];</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_wmi_force_roam_cmd(ar-&gt;wmi, bssid);</div><div class='add'>+	if (ret)</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 const struct file_operations fops_force_roam = {</div><div class='add'>+	.write = ath6kl_force_roam_write,</div><div class='add'>+	.open = ath6kl_debugfs_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ath6kl_roam_mode_write(struct file *file,</div><div class='add'>+				      const char __user *user_buf,</div><div class='add'>+				      size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = file-&gt;private_data;</div><div class='add'>+	int ret;</div><div class='add'>+	char buf[20];</div><div class='add'>+	size_t len;</div><div class='add'>+	enum wmi_roam_mode mode;</div><div class='add'>+</div><div class='add'>+	len = min(count, sizeof(buf) - 1);</div><div class='add'>+	if (copy_from_user(buf, user_buf, len))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	buf[len] = '\0';</div><div class='add'>+	if (len &gt; 0 &amp;&amp; buf[len - 1] == '\n')</div><div class='add'>+		buf[len - 1] = '\0';</div><div class='add'>+</div><div class='add'>+	if (strcasecmp(buf, "default") == 0)</div><div class='add'>+		mode = WMI_DEFAULT_ROAM_MODE;</div><div class='add'>+	else if (strcasecmp(buf, "bssbias") == 0)</div><div class='add'>+		mode = WMI_HOST_BIAS_ROAM_MODE;</div><div class='add'>+	else if (strcasecmp(buf, "lock") == 0)</div><div class='add'>+		mode = WMI_LOCK_BSS_MODE;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_wmi_set_roam_mode_cmd(ar-&gt;wmi, mode);</div><div class='add'>+	if (ret)</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 const struct file_operations fops_roam_mode = {</div><div class='add'>+	.write = ath6kl_roam_mode_write,</div><div class='add'>+	.open = ath6kl_debugfs_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath6kl_debug_set_keepalive(struct ath6kl *ar, u8 keepalive)</div><div class='add'>+{</div><div class='add'>+	ar-&gt;debug.keepalive = keepalive;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath6kl_keepalive_read(struct file *file, char __user *user_buf,</div><div class='add'>+				     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = file-&gt;private_data;</div><div class='add'>+	char buf[16];</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = snprintf(buf, sizeof(buf), "%u\n", ar-&gt;debug.keepalive);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath6kl_keepalive_write(struct file *file,</div><div class='add'>+				      const char __user *user_buf,</div><div class='add'>+				      size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = file-&gt;private_data;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	ret = kstrtou8_from_user(user_buf, count, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_wmi_set_keepalive_cmd(ar-&gt;wmi, 0, val);</div><div class='add'>+	if (ret)</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 const struct file_operations fops_keepalive = {</div><div class='add'>+	.open = ath6kl_debugfs_open,</div><div class='add'>+	.read = ath6kl_keepalive_read,</div><div class='add'>+	.write = ath6kl_keepalive_write,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath6kl_debug_set_disconnect_timeout(struct ath6kl *ar, u8 timeout)</div><div class='add'>+{</div><div class='add'>+	ar-&gt;debug.disc_timeout = timeout;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath6kl_disconnect_timeout_read(struct file *file,</div><div class='add'>+					      char __user *user_buf,</div><div class='add'>+					      size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = file-&gt;private_data;</div><div class='add'>+	char buf[16];</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = snprintf(buf, sizeof(buf), "%u\n", ar-&gt;debug.disc_timeout);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ath6kl_disconnect_timeout_write(struct file *file,</div><div class='add'>+					       const char __user *user_buf,</div><div class='add'>+					       size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = file-&gt;private_data;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	ret = kstrtou8_from_user(user_buf, count, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_wmi_disctimeout_cmd(ar-&gt;wmi, 0, val);</div><div class='add'>+	if (ret)</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 const struct file_operations fops_disconnect_timeout = {</div><div class='add'>+	.open = ath6kl_debugfs_open,</div><div class='add'>+	.read = ath6kl_disconnect_timeout_read,</div><div class='add'>+	.write = ath6kl_disconnect_timeout_write,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ath6kl_create_qos_write(struct file *file,</div><div class='add'>+						const char __user *user_buf,</div><div class='add'>+						size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct ath6kl *ar = file-&gt;private_data;</div><div class='add'>+	struct ath6kl_vif *vif;</div><div class='add'>+	char buf[200];</div><div class='add'>+	ssize_t len;</div><div class='add'>+	char *sptr, *token;</div><div class='add'>+	struct wmi_create_pstream_cmd pstream;</div><div class='add'>+	u32 val32;</div><div class='add'>+	u16 val16;</div><div class='add'>+</div><div class='add'>+	vif = ath6kl_vif_first(ar);</div><div class='add'>+	if (!vif)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	len = min(count, sizeof(buf) - 1);</div><div class='add'>+	if (copy_from_user(buf, user_buf, len))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	buf[len] = '\0';</div><div class='add'>+	sptr = buf;</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou8(token, 0, &amp;pstream.user_pri))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou8(token, 0, &amp;pstream.traffic_direc))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou8(token, 0, &amp;pstream.traffic_class))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou8(token, 0, &amp;pstream.traffic_type))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou8(token, 0, &amp;pstream.voice_psc_cap))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou32(token, 0, &amp;val32))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pstream.min_service_int = cpu_to_le32(val32);</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou32(token, 0, &amp;val32))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pstream.max_service_int = cpu_to_le32(val32);</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou32(token, 0, &amp;val32))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pstream.inactivity_int = cpu_to_le32(val32);</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou32(token, 0, &amp;val32))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pstream.suspension_int = cpu_to_le32(val32);</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou32(token, 0, &amp;val32))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pstream.service_start_time = cpu_to_le32(val32);</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou8(token, 0, &amp;pstream.tsid))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou16(token, 0, &amp;val16))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pstream.nominal_msdu = cpu_to_le16(val16);</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou16(token, 0, &amp;val16))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pstream.max_msdu = cpu_to_le16(val16);</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou32(token, 0, &amp;val32))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pstream.min_data_rate = cpu_to_le32(val32);</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou32(token, 0, &amp;val32))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pstream.mean_data_rate = cpu_to_le32(val32);</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou32(token, 0, &amp;val32))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pstream.peak_data_rate = cpu_to_le32(val32);</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou32(token, 0, &amp;val32))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pstream.max_burst_size = cpu_to_le32(val32);</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou32(token, 0, &amp;val32))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pstream.delay_bound = cpu_to_le32(val32);</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou32(token, 0, &amp;val32))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pstream.min_phy_rate = cpu_to_le32(val32);</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou32(token, 0, &amp;val32))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pstream.sba = cpu_to_le32(val32);</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou32(token, 0, &amp;val32))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pstream.medium_time = cpu_to_le32(val32);</div><div class='add'>+</div><div class='add'>+	ath6kl_wmi_create_pstream_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx, &amp;pstream);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_create_qos = {</div><div class='add'>+	.write = ath6kl_create_qos_write,</div><div class='add'>+	.open = ath6kl_debugfs_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ath6kl_delete_qos_write(struct file *file,</div><div class='add'>+				const char __user *user_buf,</div><div class='add'>+				size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct ath6kl *ar = file-&gt;private_data;</div><div class='add'>+	struct ath6kl_vif *vif;</div><div class='add'>+	char buf[100];</div><div class='add'>+	ssize_t len;</div><div class='add'>+	char *sptr, *token;</div><div class='add'>+	u8 traffic_class;</div><div class='add'>+	u8 tsid;</div><div class='add'>+</div><div class='add'>+	vif = ath6kl_vif_first(ar);</div><div class='add'>+	if (!vif)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	len = min(count, sizeof(buf) - 1);</div><div class='add'>+	if (copy_from_user(buf, user_buf, len))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	buf[len] = '\0';</div><div class='add'>+	sptr = buf;</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou8(token, 0, &amp;traffic_class))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou8(token, 0, &amp;tsid))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ath6kl_wmi_delete_pstream_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+				      traffic_class, tsid);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_delete_qos = {</div><div class='add'>+	.write = ath6kl_delete_qos_write,</div><div class='add'>+	.open = ath6kl_debugfs_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ath6kl_bgscan_int_write(struct file *file,</div><div class='add'>+				const char __user *user_buf,</div><div class='add'>+				size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = file-&gt;private_data;</div><div class='add'>+	u16 bgscan_int;</div><div class='add'>+	char buf[32];</div><div class='add'>+	ssize_t len;</div><div class='add'>+</div><div class='add'>+	len = min(count, sizeof(buf) - 1);</div><div class='add'>+	if (copy_from_user(buf, user_buf, len))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	buf[len] = '\0';</div><div class='add'>+	if (kstrtou16(buf, 0, &amp;bgscan_int))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (bgscan_int == 0)</div><div class='add'>+		bgscan_int = 0xffff;</div><div class='add'>+</div><div class='add'>+	ath6kl_wmi_scanparams_cmd(ar-&gt;wmi, 0, 0, 0, bgscan_int, 0, 0, 0, 3,</div><div class='add'>+				  0, 0, 0);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_bgscan_int = {</div><div class='add'>+	.write = ath6kl_bgscan_int_write,</div><div class='add'>+	.open = ath6kl_debugfs_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ath6kl_listen_int_write(struct file *file,</div><div class='add'>+						const char __user *user_buf,</div><div class='add'>+						size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = file-&gt;private_data;</div><div class='add'>+	u16 listen_int_t, listen_int_b;</div><div class='add'>+	char buf[32];</div><div class='add'>+	char *sptr, *token;</div><div class='add'>+	ssize_t len;</div><div class='add'>+</div><div class='add'>+	len = min(count, sizeof(buf) - 1);</div><div class='add'>+	if (copy_from_user(buf, user_buf, len))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	buf[len] = '\0';</div><div class='add'>+	sptr = buf;</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (kstrtou16(token, 0, &amp;listen_int_t))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (kstrtou16(sptr, 0, &amp;listen_int_b))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((listen_int_t &lt; 15) || (listen_int_t &gt; 5000))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((listen_int_b &lt; 1) || (listen_int_b &gt; 50))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ar-&gt;listen_intvl_t = listen_int_t;</div><div class='add'>+	ar-&gt;listen_intvl_b = listen_int_b;</div><div class='add'>+</div><div class='add'>+	ath6kl_wmi_listeninterval_cmd(ar-&gt;wmi, 0, ar-&gt;listen_intvl_t,</div><div class='add'>+				      ar-&gt;listen_intvl_b);</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 ath6kl_listen_int_read(struct file *file,</div><div class='add'>+						char __user *user_buf,</div><div class='add'>+						size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = file-&gt;private_data;</div><div class='add'>+	char buf[32];</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = scnprintf(buf, sizeof(buf), "%u %u\n", ar-&gt;listen_intvl_t,</div><div class='add'>+					ar-&gt;listen_intvl_b);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_listen_int = {</div><div class='add'>+	.read = ath6kl_listen_int_read,</div><div class='add'>+	.write = ath6kl_listen_int_write,</div><div class='add'>+	.open = ath6kl_debugfs_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ath6kl_power_params_write(struct file *file,</div><div class='add'>+						const char __user *user_buf,</div><div class='add'>+						size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl *ar = file-&gt;private_data;</div><div class='add'>+	u8 buf[100];</div><div class='add'>+	unsigned int len = 0;</div><div class='add'>+	char *sptr, *token;</div><div class='add'>+	u16 idle_period, ps_poll_num, dtim,</div><div class='add'>+		tx_wakeup, num_tx;</div><div class='add'>+</div><div class='add'>+	len = min(count, sizeof(buf) - 1);</div><div class='add'>+	if (copy_from_user(buf, user_buf, len))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	buf[len] = '\0';</div><div class='add'>+	sptr = buf;</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou16(token, 0, &amp;idle_period))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou16(token, 0, &amp;ps_poll_num))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou16(token, 0, &amp;dtim))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou16(token, 0, &amp;tx_wakeup))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	token = strsep(&amp;sptr, " ");</div><div class='add'>+	if (!token)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (kstrtou16(token, 0, &amp;num_tx))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ath6kl_wmi_pmparams_cmd(ar-&gt;wmi, 0, idle_period, ps_poll_num,</div><div class='add'>+				dtim, tx_wakeup, num_tx, 0);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fops_power_params = {</div><div class='add'>+	.write = ath6kl_power_params_write,</div><div class='add'>+	.open = ath6kl_debugfs_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int ath6kl_debug_init(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='ctx'> 	ar-&gt;debug.fwlog_buf.buf = vmalloc(ATH6KL_FWLOG_SIZE);</div><div class='hunk'>@@ -889,7 +1649,7 @@ int ath6kl_debug_init(struct ath6kl *ar)</div><div class='ctx'> 	ar-&gt;debug.fwlog_mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;debugfs_phy = debugfs_create_dir("ath6kl",</div><div class='del'>-					     ar-&gt;wdev-&gt;wiphy-&gt;debugfsdir);</div><div class='add'>+					     ar-&gt;wiphy-&gt;debugfsdir);</div><div class='ctx'> 	if (!ar-&gt;debugfs_phy) {</div><div class='ctx'> 		vfree(ar-&gt;debug.fwlog_buf.buf);</div><div class='ctx'> 		kfree(ar-&gt;debug.fwlog_tmp);</div><div class='hunk'>@@ -902,6 +1662,9 @@ int ath6kl_debug_init(struct ath6kl *ar)</div><div class='ctx'> 	debugfs_create_file("credit_dist_stats", S_IRUSR, ar-&gt;debugfs_phy, ar,</div><div class='ctx'> 			    &amp;fops_credit_dist_stats);</div><div class='ctx'> </div><div class='add'>+	debugfs_create_file("endpoint_stats", S_IRUSR | S_IWUSR,</div><div class='add'>+			    ar-&gt;debugfs_phy, ar, &amp;fops_endpoint_stats);</div><div class='add'>+</div><div class='ctx'> 	debugfs_create_file("fwlog", S_IRUSR, ar-&gt;debugfs_phy, ar,</div><div class='ctx'> 			    &amp;fops_fwlog);</div><div class='ctx'> </div><div class='hunk'>@@ -923,6 +1686,33 @@ int ath6kl_debug_init(struct ath6kl *ar)</div><div class='ctx'> 	debugfs_create_file("war_stats", S_IRUSR, ar-&gt;debugfs_phy, ar,</div><div class='ctx'> 			    &amp;fops_war_stats);</div><div class='ctx'> </div><div class='add'>+	debugfs_create_file("roam_table", S_IRUSR, ar-&gt;debugfs_phy, ar,</div><div class='add'>+			    &amp;fops_roam_table);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("force_roam", S_IWUSR, ar-&gt;debugfs_phy, ar,</div><div class='add'>+			    &amp;fops_force_roam);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("roam_mode", S_IWUSR, ar-&gt;debugfs_phy, ar,</div><div class='add'>+			    &amp;fops_roam_mode);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("keepalive", S_IRUSR | S_IWUSR, ar-&gt;debugfs_phy, ar,</div><div class='add'>+			    &amp;fops_keepalive);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("disconnect_timeout", S_IRUSR | S_IWUSR,</div><div class='add'>+			    ar-&gt;debugfs_phy, ar, &amp;fops_disconnect_timeout);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("create_qos", S_IWUSR, ar-&gt;debugfs_phy, ar,</div><div class='add'>+				&amp;fops_create_qos);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("delete_qos", S_IWUSR, ar-&gt;debugfs_phy, ar,</div><div class='add'>+				&amp;fops_delete_qos);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("bgscan_interval", S_IWUSR,</div><div class='add'>+				ar-&gt;debugfs_phy, ar, &amp;fops_bgscan_int);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("power_params", S_IWUSR, ar-&gt;debugfs_phy, ar,</div><div class='add'>+						&amp;fops_power_params);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -930,6 +1720,7 @@ void ath6kl_debug_cleanup(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='ctx'> 	vfree(ar-&gt;debug.fwlog_buf.buf);</div><div class='ctx'> 	kfree(ar-&gt;debug.fwlog_tmp);</div><div class='add'>+	kfree(ar-&gt;debug.roam_tbl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/debug.h b/drivers/net/wireless/ath/ath6kl/debug.h<br/>index 7b7675f70a10..9853c9c125c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/debug.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/debug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/debug.h</a></div><div class='hunk'>@@ -17,19 +17,19 @@</div><div class='ctx'> #ifndef DEBUG_H</div><div class='ctx'> #define DEBUG_H</div><div class='ctx'> </div><div class='del'>-#include "htc_hif.h"</div><div class='add'>+#include "hif.h"</div><div class='ctx'> </div><div class='ctx'> enum ATH6K_DEBUG_MASK {</div><div class='del'>-	ATH6KL_DBG_WLAN_CONNECT = BIT(0),     /* wlan connect */</div><div class='del'>-	ATH6KL_DBG_WLAN_SCAN    = BIT(1),     /* wlan scan */</div><div class='add'>+	ATH6KL_DBG_CREDIT	= BIT(0),</div><div class='add'>+	/* hole */</div><div class='ctx'> 	ATH6KL_DBG_WLAN_TX      = BIT(2),     /* wlan tx */</div><div class='ctx'> 	ATH6KL_DBG_WLAN_RX      = BIT(3),     /* wlan rx */</div><div class='ctx'> 	ATH6KL_DBG_BMI		= BIT(4),     /* bmi tracing */</div><div class='del'>-	ATH6KL_DBG_HTC_SEND     = BIT(5),     /* htc send */</div><div class='del'>-	ATH6KL_DBG_HTC_RECV     = BIT(6),     /* htc recv */</div><div class='add'>+	ATH6KL_DBG_HTC		= BIT(5),</div><div class='add'>+	ATH6KL_DBG_HIF		= BIT(6),</div><div class='ctx'> 	ATH6KL_DBG_IRQ		= BIT(7),     /* interrupt processing */</div><div class='del'>-	ATH6KL_DBG_PM           = BIT(8),     /* power management */</div><div class='del'>-	ATH6KL_DBG_WLAN_NODE    = BIT(9),     /* general wlan node tracing */</div><div class='add'>+	/* hole */</div><div class='add'>+	/* hole */</div><div class='ctx'> 	ATH6KL_DBG_WMI          = BIT(10),    /* wmi tracing */</div><div class='ctx'> 	ATH6KL_DBG_TRC	        = BIT(11),    /* generic func tracing */</div><div class='ctx'> 	ATH6KL_DBG_SCATTER	= BIT(12),    /* hif scatter tracing */</div><div class='hunk'>@@ -40,6 +40,7 @@ enum ATH6K_DEBUG_MASK {</div><div class='ctx'> 	ATH6KL_DBG_SDIO_DUMP	= BIT(17),</div><div class='ctx'> 	ATH6KL_DBG_BOOT		= BIT(18),    /* driver init and fw boot */</div><div class='ctx'> 	ATH6KL_DBG_WMI_DUMP	= BIT(19),</div><div class='add'>+	ATH6KL_DBG_SUSPEND	= BIT(20),</div><div class='ctx'> 	ATH6KL_DBG_ANY	        = 0xffffffff  /* enable all logs */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -90,6 +91,10 @@ void ath6kl_dump_registers(struct ath6kl_device *dev,</div><div class='ctx'> void dump_cred_dist_stats(struct htc_target *target);</div><div class='ctx'> void ath6kl_debug_fwlog_event(struct ath6kl *ar, const void *buf, size_t len);</div><div class='ctx'> void ath6kl_debug_war(struct ath6kl *ar, enum ath6kl_war war);</div><div class='add'>+int ath6kl_debug_roam_tbl_event(struct ath6kl *ar, const void *buf,</div><div class='add'>+				size_t len);</div><div class='add'>+void ath6kl_debug_set_keepalive(struct ath6kl *ar, u8 keepalive);</div><div class='add'>+void ath6kl_debug_set_disconnect_timeout(struct ath6kl *ar, u8 timeout);</div><div class='ctx'> int ath6kl_debug_init(struct ath6kl *ar);</div><div class='ctx'> void ath6kl_debug_cleanup(struct ath6kl *ar);</div><div class='ctx'> </div><div class='hunk'>@@ -125,6 +130,21 @@ static inline void ath6kl_debug_war(struct ath6kl *ar, enum ath6kl_war war)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int ath6kl_debug_roam_tbl_event(struct ath6kl *ar,</div><div class='add'>+					      const void *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath6kl_debug_set_keepalive(struct ath6kl *ar, u8 keepalive)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath6kl_debug_set_disconnect_timeout(struct ath6kl *ar,</div><div class='add'>+						       u8 timeout)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int ath6kl_debug_init(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/hif-ops.h b/drivers/net/wireless/ath/ath6kl/hif-ops.h<br/>index d6c898f3d0b3..2fe1dadfc77a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/hif-ops.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/hif-ops.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/hif-ops.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/hif-ops.h</a></div><div class='hunk'>@@ -18,10 +18,16 @@</div><div class='ctx'> #define HIF_OPS_H</div><div class='ctx'> </div><div class='ctx'> #include "hif.h"</div><div class='add'>+#include "debug.h"</div><div class='ctx'> </div><div class='ctx'> static inline int hif_read_write_sync(struct ath6kl *ar, u32 addr, u8 *buf,</div><div class='ctx'> 				      u32 len, u32 request)</div><div class='ctx'> {</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HIF,</div><div class='add'>+		   "hif %s sync addr 0x%x buf 0x%p len %d request 0x%x\n",</div><div class='add'>+		   (request &amp; HIF_WRITE) ? "write" : "read",</div><div class='add'>+		   addr, buf, len, request);</div><div class='add'>+</div><div class='ctx'> 	return ar-&gt;hif_ops-&gt;read_write_sync(ar, addr, buf, len, request);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -29,16 +35,24 @@ static inline int hif_write_async(struct ath6kl *ar, u32 address, u8 *buffer,</div><div class='ctx'> 				  u32 length, u32 request,</div><div class='ctx'> 				  struct htc_packet *packet)</div><div class='ctx'> {</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HIF,</div><div class='add'>+		   "hif write async addr 0x%x buf 0x%p len %d request 0x%x\n",</div><div class='add'>+		   address, buffer, length, request);</div><div class='add'>+</div><div class='ctx'> 	return ar-&gt;hif_ops-&gt;write_async(ar, address, buffer, length,</div><div class='ctx'> 					request, packet);</div><div class='ctx'> }</div><div class='ctx'> static inline void ath6kl_hif_irq_enable(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HIF, "hif irq enable\n");</div><div class='add'>+</div><div class='ctx'> 	return ar-&gt;hif_ops-&gt;irq_enable(ar);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void ath6kl_hif_irq_disable(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HIF, "hif irq disable\n");</div><div class='add'>+</div><div class='ctx'> 	return ar-&gt;hif_ops-&gt;irq_disable(ar);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -69,9 +83,70 @@ static inline void ath6kl_hif_cleanup_scatter(struct ath6kl *ar)</div><div class='ctx'> 	return ar-&gt;hif_ops-&gt;cleanup_scatter(ar);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ath6kl_hif_suspend(struct ath6kl *ar)</div><div class='add'>+static inline int ath6kl_hif_suspend(struct ath6kl *ar,</div><div class='add'>+				     struct cfg80211_wowlan *wow)</div><div class='add'>+{</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HIF, "hif suspend\n");</div><div class='add'>+</div><div class='add'>+	return ar-&gt;hif_ops-&gt;suspend(ar, wow);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read from the ATH6KL through its diagnostic window. No cooperation from</div><div class='add'>+ * the Target is required for this.</div><div class='add'>+ */</div><div class='add'>+static inline int ath6kl_hif_diag_read32(struct ath6kl *ar, u32 address,</div><div class='add'>+					 u32 *value)</div><div class='ctx'> {</div><div class='del'>-	return ar-&gt;hif_ops-&gt;suspend(ar);</div><div class='add'>+	return ar-&gt;hif_ops-&gt;diag_read32(ar, address, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write to the ATH6KL through its diagnostic window. No cooperation from</div><div class='add'>+ * the Target is required for this.</div><div class='add'>+ */</div><div class='add'>+static inline int ath6kl_hif_diag_write32(struct ath6kl *ar, u32 address,</div><div class='add'>+					  __le32 value)</div><div class='add'>+{</div><div class='add'>+	return ar-&gt;hif_ops-&gt;diag_write32(ar, address, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath6kl_hif_bmi_read(struct ath6kl *ar, u8 *buf, u32 len)</div><div class='add'>+{</div><div class='add'>+	return ar-&gt;hif_ops-&gt;bmi_read(ar, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath6kl_hif_bmi_write(struct ath6kl *ar, u8 *buf, u32 len)</div><div class='add'>+{</div><div class='add'>+	return ar-&gt;hif_ops-&gt;bmi_write(ar, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath6kl_hif_resume(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HIF, "hif resume\n");</div><div class='add'>+</div><div class='add'>+	return ar-&gt;hif_ops-&gt;resume(ar);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath6kl_hif_power_on(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HIF, "hif power on\n");</div><div class='add'>+</div><div class='add'>+	return ar-&gt;hif_ops-&gt;power_on(ar);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ath6kl_hif_power_off(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HIF, "hif power off\n");</div><div class='add'>+</div><div class='add'>+	return ar-&gt;hif_ops-&gt;power_off(ar);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ath6kl_hif_stop(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HIF, "hif stop\n");</div><div class='add'>+</div><div class='add'>+	ar-&gt;hif_ops-&gt;stop(ar);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/htc_hif.c b/drivers/net/wireless/ath/ath6kl/hif.c<br/>index 86b1cc7409c2..e57da35e59fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/htc_hif.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/htc_hif.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/hif.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/hif.c</a></div><div class='hunk'>@@ -13,18 +13,19 @@</div><div class='ctx'>  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='ctx'>  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='ctx'>  */</div><div class='add'>+#include "hif.h"</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "target.h"</div><div class='ctx'> #include "hif-ops.h"</div><div class='del'>-#include "htc_hif.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> </div><div class='ctx'> #define MAILBOX_FOR_BLOCK_SIZE          1</div><div class='ctx'> </div><div class='ctx'> #define ATH6KL_TIME_QUANTUM	10  /* in ms */</div><div class='ctx'> </div><div class='del'>-static int ath6kldev_cp_scat_dma_buf(struct hif_scatter_req *req, bool from_dma)</div><div class='add'>+static int ath6kl_hif_cp_scat_dma_buf(struct hif_scatter_req *req,</div><div class='add'>+				      bool from_dma)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *buf;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -46,12 +47,11 @@ static int ath6kldev_cp_scat_dma_buf(struct hif_scatter_req *req, bool from_dma)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kldev_rw_comp_handler(void *context, int status)</div><div class='add'>+int ath6kl_hif_rw_comp_handler(void *context, int status)</div><div class='ctx'> {</div><div class='ctx'> 	struct htc_packet *packet = context;</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_HTC_RECV,</div><div class='del'>-		   "ath6kldev_rw_comp_handler (pkt:0x%p , status: %d\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HIF, "hif rw completion pkt 0x%p status %d\n",</div><div class='ctx'> 		   packet, status);</div><div class='ctx'> </div><div class='ctx'> 	packet-&gt;status = status;</div><div class='hunk'>@@ -59,30 +59,83 @@ int ath6kldev_rw_comp_handler(void *context, int status)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+#define REG_DUMP_COUNT_AR6003   60</div><div class='add'>+#define REGISTER_DUMP_LEN_MAX   60</div><div class='ctx'> </div><div class='del'>-static int ath6kldev_proc_dbg_intr(struct ath6kl_device *dev)</div><div class='add'>+static void ath6kl_hif_dump_fw_crash(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='del'>-	u32 dummy;</div><div class='del'>-	int status;</div><div class='add'>+	__le32 regdump_val[REGISTER_DUMP_LEN_MAX];</div><div class='add'>+	u32 i, address, regdump_addr = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;target_type != TARGET_TYPE_AR6003)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* the reg dump pointer is copied to the host interest area */</div><div class='add'>+	address = ath6kl_get_hi_item_addr(ar, HI_ITEM(hi_failure_state));</div><div class='add'>+	address = TARG_VTOP(ar-&gt;target_type, address);</div><div class='add'>+</div><div class='add'>+	/* read RAM location through diagnostic window */</div><div class='add'>+	ret = ath6kl_diag_read32(ar, address, &amp;regdump_addr);</div><div class='add'>+</div><div class='add'>+	if (ret || !regdump_addr) {</div><div class='add'>+		ath6kl_warn("failed to get ptr to register dump area: %d\n",</div><div class='add'>+			    ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_IRQ, "register dump data address 0x%x\n",</div><div class='add'>+		regdump_addr);</div><div class='add'>+	regdump_addr = TARG_VTOP(ar-&gt;target_type, regdump_addr);</div><div class='add'>+</div><div class='add'>+	/* fetch register dump data */</div><div class='add'>+	ret = ath6kl_diag_read(ar, regdump_addr, (u8 *)&amp;regdump_val[0],</div><div class='add'>+				  REG_DUMP_COUNT_AR6003 * (sizeof(u32)));</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath6kl_warn("failed to get register dump: %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath6kl_info("crash dump:\n");</div><div class='add'>+	ath6kl_info("hw 0x%x fw %s\n", ar-&gt;wiphy-&gt;hw_version,</div><div class='add'>+		    ar-&gt;wiphy-&gt;fw_version);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(REG_DUMP_COUNT_AR6003 % 4);</div><div class='ctx'> </div><div class='del'>-	ath6kl_err("target debug interrupt\n");</div><div class='add'>+	for (i = 0; i &lt; REG_DUMP_COUNT_AR6003 / 4; i++) {</div><div class='add'>+		ath6kl_info("%d: 0x%8.8x 0x%8.8x 0x%8.8x 0x%8.8x\n",</div><div class='add'>+			    4 * i,</div><div class='add'>+			    le32_to_cpu(regdump_val[i]),</div><div class='add'>+			    le32_to_cpu(regdump_val[i + 1]),</div><div class='add'>+			    le32_to_cpu(regdump_val[i + 2]),</div><div class='add'>+			    le32_to_cpu(regdump_val[i + 3]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath6kl_hif_proc_dbg_intr(struct ath6kl_device *dev)</div><div class='add'>+{</div><div class='add'>+	u32 dummy;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	ath6kl_target_failure(dev-&gt;ar);</div><div class='add'>+	ath6kl_warn("firmware crashed\n");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * read counter to clear the interrupt, the debug error interrupt is</div><div class='ctx'> 	 * counter 0.</div><div class='ctx'> 	 */</div><div class='del'>-	status = hif_read_write_sync(dev-&gt;ar, COUNT_DEC_ADDRESS,</div><div class='add'>+	ret = hif_read_write_sync(dev-&gt;ar, COUNT_DEC_ADDRESS,</div><div class='ctx'> 				     (u8 *)&amp;dummy, 4, HIF_RD_SYNC_BYTE_INC);</div><div class='del'>-	if (status)</div><div class='del'>-		WARN_ON(1);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath6kl_warn("Failed to clear debug interrupt: %d\n", ret);</div><div class='ctx'> </div><div class='del'>-	return status;</div><div class='add'>+	ath6kl_hif_dump_fw_crash(dev-&gt;ar);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* mailbox recv message polling */</div><div class='del'>-int ath6kldev_poll_mboxmsg_rx(struct ath6kl_device *dev, u32 *lk_ahd,</div><div class='add'>+int ath6kl_hif_poll_mboxmsg_rx(struct ath6kl_device *dev, u32 *lk_ahd,</div><div class='ctx'> 			      int timeout)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl_irq_proc_registers *rg;</div><div class='hunk'>@@ -118,7 +171,7 @@ int ath6kldev_poll_mboxmsg_rx(struct ath6kl_device *dev, u32 *lk_ahd,</div><div class='ctx'> </div><div class='ctx'> 		/* delay a little  */</div><div class='ctx'> 		mdelay(ATH6KL_TIME_QUANTUM);</div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_HTC_RECV, "retry mbox poll : %d\n", i);</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_HIF, "hif retry mbox poll try %d\n", i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (i == 0) {</div><div class='hunk'>@@ -131,7 +184,7 @@ int ath6kldev_poll_mboxmsg_rx(struct ath6kl_device *dev, u32 *lk_ahd,</div><div class='ctx'> 			 * Target failure handler will be called in case of</div><div class='ctx'> 			 * an assert.</div><div class='ctx'> 			 */</div><div class='del'>-			ath6kldev_proc_dbg_intr(dev);</div><div class='add'>+			ath6kl_hif_proc_dbg_intr(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -141,11 +194,14 @@ int ath6kldev_poll_mboxmsg_rx(struct ath6kl_device *dev, u32 *lk_ahd,</div><div class='ctx'>  * Disable packet reception (used in case the host runs out of buffers)</div><div class='ctx'>  * using the interrupt enable registers through the host I/F</div><div class='ctx'>  */</div><div class='del'>-int ath6kldev_rx_control(struct ath6kl_device *dev, bool enable_rx)</div><div class='add'>+int ath6kl_hif_rx_control(struct ath6kl_device *dev, bool enable_rx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl_irq_enable_reg regs;</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HIF, "hif rx %s\n",</div><div class='add'>+		   enable_rx ? "enable" : "disable");</div><div class='add'>+</div><div class='ctx'> 	/* take the lock to protect interrupt enable shadows */</div><div class='ctx'> 	spin_lock_bh(&amp;dev-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -168,7 +224,7 @@ int ath6kldev_rx_control(struct ath6kl_device *dev, bool enable_rx)</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kldev_submit_scat_req(struct ath6kl_device *dev,</div><div class='add'>+int ath6kl_hif_submit_scat_req(struct ath6kl_device *dev,</div><div class='ctx'> 			      struct hif_scatter_req *scat_req, bool read)</div><div class='ctx'> {</div><div class='ctx'> 	int status = 0;</div><div class='hunk'>@@ -185,14 +241,14 @@ int ath6kldev_submit_scat_req(struct ath6kl_device *dev,</div><div class='ctx'> 			dev-&gt;ar-&gt;mbox_info.htc_addr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg((ATH6KL_DBG_HTC_RECV | ATH6KL_DBG_HTC_SEND),</div><div class='del'>-		   "ath6kldev_submit_scat_req, entries: %d, total len: %d mbox:0x%X (mode: %s : %s)\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HIF,</div><div class='add'>+		   "hif submit scatter request entries %d len %d mbox 0x%x %s %s\n",</div><div class='ctx'> 		   scat_req-&gt;scat_entries, scat_req-&gt;len,</div><div class='ctx'> 		   scat_req-&gt;addr, !read ? "async" : "sync",</div><div class='ctx'> 		   (read) ? "rd" : "wr");</div><div class='ctx'> </div><div class='ctx'> 	if (!read &amp;&amp; scat_req-&gt;virt_scat) {</div><div class='del'>-		status = ath6kldev_cp_scat_dma_buf(scat_req, false);</div><div class='add'>+		status = ath6kl_hif_cp_scat_dma_buf(scat_req, false);</div><div class='ctx'> 		if (status) {</div><div class='ctx'> 			scat_req-&gt;status = status;</div><div class='ctx'> 			scat_req-&gt;complete(dev-&gt;ar-&gt;htc_target, scat_req);</div><div class='hunk'>@@ -207,13 +263,13 @@ int ath6kldev_submit_scat_req(struct ath6kl_device *dev,</div><div class='ctx'> 		scat_req-&gt;status = status;</div><div class='ctx'> 		if (!status &amp;&amp; scat_req-&gt;virt_scat)</div><div class='ctx'> 			scat_req-&gt;status =</div><div class='del'>-				ath6kldev_cp_scat_dma_buf(scat_req, true);</div><div class='add'>+				ath6kl_hif_cp_scat_dma_buf(scat_req, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kldev_proc_counter_intr(struct ath6kl_device *dev)</div><div class='add'>+static int ath6kl_hif_proc_counter_intr(struct ath6kl_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u8 counter_int_status;</div><div class='ctx'> </div><div class='hunk'>@@ -232,12 +288,12 @@ static int ath6kldev_proc_counter_intr(struct ath6kl_device *dev)</div><div class='ctx'> 	 * the debug assertion counter interrupt.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (counter_int_status &amp; ATH6KL_TARGET_DEBUG_INTR_MASK)</div><div class='del'>-		return ath6kldev_proc_dbg_intr(dev);</div><div class='add'>+		return ath6kl_hif_proc_dbg_intr(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kldev_proc_err_intr(struct ath6kl_device *dev)</div><div class='add'>+static int ath6kl_hif_proc_err_intr(struct ath6kl_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='ctx'> 	u8 error_int_status;</div><div class='hunk'>@@ -282,7 +338,7 @@ static int ath6kldev_proc_err_intr(struct ath6kl_device *dev)</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kldev_proc_cpu_intr(struct ath6kl_device *dev)</div><div class='add'>+static int ath6kl_hif_proc_cpu_intr(struct ath6kl_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='ctx'> 	u8 cpu_int_status;</div><div class='hunk'>@@ -417,7 +473,7 @@ static int proc_pending_irqs(struct ath6kl_device *dev, bool *done)</div><div class='ctx'> 		 * we rapidly pull packets.</div><div class='ctx'> 		 */</div><div class='ctx'> 		status = ath6kl_htc_rxmsg_pending_handler(dev-&gt;htc_cnxt,</div><div class='del'>-							  &amp;lk_ahd, &amp;fetched);</div><div class='add'>+							  lk_ahd, &amp;fetched);</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -436,21 +492,21 @@ static int proc_pending_irqs(struct ath6kl_device *dev, bool *done)</div><div class='ctx'> </div><div class='ctx'> 	if (MS(HOST_INT_STATUS_CPU, host_int_status)) {</div><div class='ctx'> 		/* CPU Interrupt */</div><div class='del'>-		status = ath6kldev_proc_cpu_intr(dev);</div><div class='add'>+		status = ath6kl_hif_proc_cpu_intr(dev);</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (MS(HOST_INT_STATUS_ERROR, host_int_status)) {</div><div class='ctx'> 		/* Error Interrupt */</div><div class='del'>-		status = ath6kldev_proc_err_intr(dev);</div><div class='add'>+		status = ath6kl_hif_proc_err_intr(dev);</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (MS(HOST_INT_STATUS_COUNTER, host_int_status))</div><div class='ctx'> 		/* Counter Interrupt */</div><div class='del'>-		status = ath6kldev_proc_counter_intr(dev);</div><div class='add'>+		status = ath6kl_hif_proc_counter_intr(dev);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -479,9 +535,10 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* interrupt handler, kicks off all interrupt processing */</div><div class='del'>-int ath6kldev_intr_bh_handler(struct ath6kl *ar)</div><div class='add'>+int ath6kl_hif_intr_bh_handler(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl_device *dev = ar-&gt;htc_target-&gt;dev;</div><div class='add'>+	unsigned long timeout;</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> 	bool done = false;</div><div class='ctx'> </div><div class='hunk'>@@ -495,7 +552,8 @@ int ath6kldev_intr_bh_handler(struct ath6kl *ar)</div><div class='ctx'> 	 * IRQ processing is synchronous, interrupt status registers can be</div><div class='ctx'> 	 * re-read.</div><div class='ctx'> 	 */</div><div class='del'>-	while (!done) {</div><div class='add'>+	timeout = jiffies + msecs_to_jiffies(ATH6KL_HIF_COMMUNICATION_TIMEOUT);</div><div class='add'>+	while (time_before(jiffies, timeout) &amp;&amp; !done) {</div><div class='ctx'> 		status = proc_pending_irqs(dev, &amp;done);</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -504,7 +562,7 @@ int ath6kldev_intr_bh_handler(struct ath6kl *ar)</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kldev_enable_intrs(struct ath6kl_device *dev)</div><div class='add'>+static int ath6kl_hif_enable_intrs(struct ath6kl_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl_irq_enable_reg regs;</div><div class='ctx'> 	int status;</div><div class='hunk'>@@ -552,7 +610,7 @@ static int ath6kldev_enable_intrs(struct ath6kl_device *dev)</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kldev_disable_intrs(struct ath6kl_device *dev)</div><div class='add'>+int ath6kl_hif_disable_intrs(struct ath6kl_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl_irq_enable_reg regs;</div><div class='ctx'> </div><div class='hunk'>@@ -571,7 +629,7 @@ int ath6kldev_disable_intrs(struct ath6kl_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* enable device interrupts */</div><div class='del'>-int ath6kldev_unmask_intrs(struct ath6kl_device *dev)</div><div class='add'>+int ath6kl_hif_unmask_intrs(struct ath6kl_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -583,29 +641,29 @@ int ath6kldev_unmask_intrs(struct ath6kl_device *dev)</div><div class='ctx'> 	 * target "soft" resets. The ATH6KL interrupt enables reset back to an</div><div class='ctx'> 	 * "enabled" state when this happens.</div><div class='ctx'> 	 */</div><div class='del'>-	ath6kldev_disable_intrs(dev);</div><div class='add'>+	ath6kl_hif_disable_intrs(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* unmask the host controller interrupts */</div><div class='ctx'> 	ath6kl_hif_irq_enable(dev-&gt;ar);</div><div class='del'>-	status = ath6kldev_enable_intrs(dev);</div><div class='add'>+	status = ath6kl_hif_enable_intrs(dev);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* disable all device interrupts */</div><div class='del'>-int ath6kldev_mask_intrs(struct ath6kl_device *dev)</div><div class='add'>+int ath6kl_hif_mask_intrs(struct ath6kl_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Mask the interrupt at the HIF layer to avoid any stray interrupt</div><div class='ctx'> 	 * taken while we zero out our shadow registers in</div><div class='del'>-	 * ath6kldev_disable_intrs().</div><div class='add'>+	 * ath6kl_hif_disable_intrs().</div><div class='ctx'> 	 */</div><div class='ctx'> 	ath6kl_hif_irq_disable(dev-&gt;ar);</div><div class='ctx'> </div><div class='del'>-	return ath6kldev_disable_intrs(dev);</div><div class='add'>+	return ath6kl_hif_disable_intrs(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kldev_setup(struct ath6kl_device *dev)</div><div class='add'>+int ath6kl_hif_setup(struct ath6kl_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -621,19 +679,17 @@ int ath6kldev_setup(struct ath6kl_device *dev)</div><div class='ctx'> 	/* must be a power of 2 */</div><div class='ctx'> 	if ((dev-&gt;htc_cnxt-&gt;block_sz &amp; (dev-&gt;htc_cnxt-&gt;block_sz - 1)) != 0) {</div><div class='ctx'> 		WARN_ON(1);</div><div class='add'>+		status = -EINVAL;</div><div class='ctx'> 		goto fail_setup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* assemble mask, used for padding to a block */</div><div class='ctx'> 	dev-&gt;htc_cnxt-&gt;block_mask = dev-&gt;htc_cnxt-&gt;block_sz - 1;</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_TRC, "block size: %d, mbox addr:0x%X\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HIF, "hif block size %d mbox addr 0x%x\n",</div><div class='ctx'> 		   dev-&gt;htc_cnxt-&gt;block_sz, dev-&gt;ar-&gt;mbox_info.htc_addr);</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_TRC,</div><div class='del'>-		   "hif interrupt processing is sync only\n");</div><div class='del'>-</div><div class='del'>-	status = ath6kldev_disable_intrs(dev);</div><div class='add'>+	status = ath6kl_hif_disable_intrs(dev);</div><div class='ctx'> </div><div class='ctx'> fail_setup:</div><div class='ctx'> 	return status;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/hif.h b/drivers/net/wireless/ath/ath6kl/hif.h<br/>index 797e2d1d9bf9..699a036f3a44 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/hif.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/hif.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/hif.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/hif.h</a></div><div class='hunk'>@@ -35,6 +35,7 @@</div><div class='ctx'> #define MAX_SCATTER_REQ_TRANSFER_SIZE    (32 * 1024)</div><div class='ctx'> </div><div class='ctx'> #define MANUFACTURER_ID_AR6003_BASE        0x300</div><div class='add'>+#define MANUFACTURER_ID_AR6004_BASE        0x400</div><div class='ctx'>     /* SDIO manufacturer ID and Codes */</div><div class='ctx'> #define MANUFACTURER_ID_ATH6KL_BASE_MASK     0xFF00</div><div class='ctx'> #define MANUFACTURER_CODE                  0x271	/* Atheros */</div><div class='hunk'>@@ -59,6 +60,18 @@</div><div class='ctx'> /* mode to enable special 4-bit interrupt assertion without clock */</div><div class='ctx'> #define SDIO_IRQ_MODE_ASYNC_4BIT_IRQ   (1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='add'>+/* HTC runs over mailbox 0 */</div><div class='add'>+#define HTC_MAILBOX	0</div><div class='add'>+</div><div class='add'>+#define ATH6KL_TARGET_DEBUG_INTR_MASK     0x01</div><div class='add'>+</div><div class='add'>+/* FIXME: are these duplicates with MAX_SCATTER_ values in hif.h? */</div><div class='add'>+#define ATH6KL_SCATTER_ENTRIES_PER_REQ            16</div><div class='add'>+#define ATH6KL_MAX_TRANSFER_SIZE_PER_SCATTER      (16 * 1024)</div><div class='add'>+#define ATH6KL_SCATTER_REQS                       4</div><div class='add'>+</div><div class='add'>+#define ATH6KL_HIF_COMMUNICATION_TIMEOUT	1000</div><div class='add'>+</div><div class='ctx'> struct bus_request {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> </div><div class='hunk'>@@ -186,6 +199,34 @@ struct hif_scatter_req {</div><div class='ctx'> 	struct hif_scatter_item scat_list[1];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct ath6kl_irq_proc_registers {</div><div class='add'>+	u8 host_int_status;</div><div class='add'>+	u8 cpu_int_status;</div><div class='add'>+	u8 error_int_status;</div><div class='add'>+	u8 counter_int_status;</div><div class='add'>+	u8 mbox_frame;</div><div class='add'>+	u8 rx_lkahd_valid;</div><div class='add'>+	u8 host_int_status2;</div><div class='add'>+	u8 gmbox_rx_avail;</div><div class='add'>+	__le32 rx_lkahd[2];</div><div class='add'>+	__le32 rx_gmbox_lkahd_alias[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath6kl_irq_enable_reg {</div><div class='add'>+	u8 int_status_en;</div><div class='add'>+	u8 cpu_int_status_en;</div><div class='add'>+	u8 err_int_status_en;</div><div class='add'>+	u8 cntr_int_status_en;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ath6kl_device {</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	struct ath6kl_irq_proc_registers irq_proc_reg;</div><div class='add'>+	struct ath6kl_irq_enable_reg irq_en_reg;</div><div class='add'>+	struct htc_target *htc_cnxt;</div><div class='add'>+	struct ath6kl *ar;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ath6kl_hif_ops {</div><div class='ctx'> 	int (*read_write_sync)(struct ath6kl *ar, u32 addr, u8 *buf,</div><div class='ctx'> 			       u32 len, u32 request);</div><div class='hunk'>@@ -202,7 +243,30 @@ struct ath6kl_hif_ops {</div><div class='ctx'> 	int (*scat_req_rw) (struct ath6kl *ar,</div><div class='ctx'> 			    struct hif_scatter_req *scat_req);</div><div class='ctx'> 	void (*cleanup_scatter)(struct ath6kl *ar);</div><div class='del'>-	int (*suspend)(struct ath6kl *ar);</div><div class='add'>+	int (*suspend)(struct ath6kl *ar, struct cfg80211_wowlan *wow);</div><div class='add'>+	int (*resume)(struct ath6kl *ar);</div><div class='add'>+	int (*diag_read32)(struct ath6kl *ar, u32 address, u32 *value);</div><div class='add'>+	int (*diag_write32)(struct ath6kl *ar, u32 address, __le32 value);</div><div class='add'>+	int (*bmi_read)(struct ath6kl *ar, u8 *buf, u32 len);</div><div class='add'>+	int (*bmi_write)(struct ath6kl *ar, u8 *buf, u32 len);</div><div class='add'>+	int (*power_on)(struct ath6kl *ar);</div><div class='add'>+	int (*power_off)(struct ath6kl *ar);</div><div class='add'>+	void (*stop)(struct ath6kl *ar);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+int ath6kl_hif_setup(struct ath6kl_device *dev);</div><div class='add'>+int ath6kl_hif_unmask_intrs(struct ath6kl_device *dev);</div><div class='add'>+int ath6kl_hif_mask_intrs(struct ath6kl_device *dev);</div><div class='add'>+int ath6kl_hif_poll_mboxmsg_rx(struct ath6kl_device *dev,</div><div class='add'>+			       u32 *lk_ahd, int timeout);</div><div class='add'>+int ath6kl_hif_rx_control(struct ath6kl_device *dev, bool enable_rx);</div><div class='add'>+int ath6kl_hif_disable_intrs(struct ath6kl_device *dev);</div><div class='add'>+</div><div class='add'>+int ath6kl_hif_rw_comp_handler(void *context, int status);</div><div class='add'>+int ath6kl_hif_intr_bh_handler(struct ath6kl *ar);</div><div class='add'>+</div><div class='add'>+/* Scatter Function and Definitions */</div><div class='add'>+int ath6kl_hif_submit_scat_req(struct ath6kl_device *dev,</div><div class='add'>+			       struct hif_scatter_req *scat_req, bool read);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/htc.c b/drivers/net/wireless/ath/ath6kl/htc.c<br/>index f88a7c9e4148..f3b63ca25c7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/htc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/htc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/htc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/htc.c</a></div><div class='hunk'>@@ -15,13 +15,321 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "core.h"</div><div class='del'>-#include "htc_hif.h"</div><div class='add'>+#include "hif.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> #include "hif-ops.h"</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CALC_TXRX_PADDED_LEN(dev, len)  (__ALIGN_MASK((len), (dev)-&gt;block_mask))</div><div class='ctx'> </div><div class='add'>+/* Functions for Tx credit handling */</div><div class='add'>+static void ath6kl_credit_deposit(struct ath6kl_htc_credit_info *cred_info,</div><div class='add'>+				  struct htc_endpoint_credit_dist *ep_dist,</div><div class='add'>+				  int credits)</div><div class='add'>+{</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_CREDIT, "credit deposit ep %d credits %d\n",</div><div class='add'>+		   ep_dist-&gt;endpoint, credits);</div><div class='add'>+</div><div class='add'>+	ep_dist-&gt;credits += credits;</div><div class='add'>+	ep_dist-&gt;cred_assngd += credits;</div><div class='add'>+	cred_info-&gt;cur_free_credits -= credits;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath6kl_credit_init(struct ath6kl_htc_credit_info *cred_info,</div><div class='add'>+			       struct list_head *ep_list,</div><div class='add'>+			       int tot_credits)</div><div class='add'>+{</div><div class='add'>+	struct htc_endpoint_credit_dist *cur_ep_dist;</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_CREDIT, "credit init total %d\n", tot_credits);</div><div class='add'>+</div><div class='add'>+	cred_info-&gt;cur_free_credits = tot_credits;</div><div class='add'>+	cred_info-&gt;total_avail_credits = tot_credits;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(cur_ep_dist, ep_list, list) {</div><div class='add'>+		if (cur_ep_dist-&gt;endpoint == ENDPOINT_0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		cur_ep_dist-&gt;cred_min = cur_ep_dist-&gt;cred_per_msg;</div><div class='add'>+</div><div class='add'>+		if (tot_credits &gt; 4) {</div><div class='add'>+			if ((cur_ep_dist-&gt;svc_id == WMI_DATA_BK_SVC) ||</div><div class='add'>+			    (cur_ep_dist-&gt;svc_id == WMI_DATA_BE_SVC)) {</div><div class='add'>+				ath6kl_credit_deposit(cred_info,</div><div class='add'>+						      cur_ep_dist,</div><div class='add'>+						      cur_ep_dist-&gt;cred_min);</div><div class='add'>+				cur_ep_dist-&gt;dist_flags |= HTC_EP_ACTIVE;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (cur_ep_dist-&gt;svc_id == WMI_CONTROL_SVC) {</div><div class='add'>+			ath6kl_credit_deposit(cred_info, cur_ep_dist,</div><div class='add'>+					      cur_ep_dist-&gt;cred_min);</div><div class='add'>+			/*</div><div class='add'>+			 * Control service is always marked active, it</div><div class='add'>+			 * never goes inactive EVER.</div><div class='add'>+			 */</div><div class='add'>+			cur_ep_dist-&gt;dist_flags |= HTC_EP_ACTIVE;</div><div class='add'>+		} else if (cur_ep_dist-&gt;svc_id == WMI_DATA_BK_SVC)</div><div class='add'>+			/* this is the lowest priority data endpoint */</div><div class='add'>+			/* FIXME: this looks fishy, check */</div><div class='add'>+			cred_info-&gt;lowestpri_ep_dist = cur_ep_dist-&gt;list;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Streams have to be created (explicit | implicit) for all</div><div class='add'>+		 * kinds of traffic. BE endpoints are also inactive in the</div><div class='add'>+		 * beginning. When BE traffic starts it creates implicit</div><div class='add'>+		 * streams that redistributes credits.</div><div class='add'>+		 *</div><div class='add'>+		 * Note: all other endpoints have minimums set but are</div><div class='add'>+		 * initially given NO credits. credits will be distributed</div><div class='add'>+		 * as traffic activity demands</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(cred_info-&gt;cur_free_credits &lt;= 0);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(cur_ep_dist, ep_list, list) {</div><div class='add'>+		if (cur_ep_dist-&gt;endpoint == ENDPOINT_0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (cur_ep_dist-&gt;svc_id == WMI_CONTROL_SVC)</div><div class='add'>+			cur_ep_dist-&gt;cred_norm = cur_ep_dist-&gt;cred_per_msg;</div><div class='add'>+		else {</div><div class='add'>+			/*</div><div class='add'>+			 * For the remaining data endpoints, we assume that</div><div class='add'>+			 * each cred_per_msg are the same. We use a simple</div><div class='add'>+			 * calculation here, we take the remaining credits</div><div class='add'>+			 * and determine how many max messages this can</div><div class='add'>+			 * cover and then set each endpoint's normal value</div><div class='add'>+			 * equal to 3/4 this amount.</div><div class='add'>+			 */</div><div class='add'>+			count = (cred_info-&gt;cur_free_credits /</div><div class='add'>+				 cur_ep_dist-&gt;cred_per_msg)</div><div class='add'>+				* cur_ep_dist-&gt;cred_per_msg;</div><div class='add'>+			count = (count * 3) &gt;&gt; 2;</div><div class='add'>+			count = max(count, cur_ep_dist-&gt;cred_per_msg);</div><div class='add'>+			cur_ep_dist-&gt;cred_norm = count;</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_CREDIT,</div><div class='add'>+			   "credit ep %d svc_id %d credits %d per_msg %d norm %d min %d\n",</div><div class='add'>+			   cur_ep_dist-&gt;endpoint,</div><div class='add'>+			   cur_ep_dist-&gt;svc_id,</div><div class='add'>+			   cur_ep_dist-&gt;credits,</div><div class='add'>+			   cur_ep_dist-&gt;cred_per_msg,</div><div class='add'>+			   cur_ep_dist-&gt;cred_norm,</div><div class='add'>+			   cur_ep_dist-&gt;cred_min);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* initialize and setup credit distribution */</div><div class='add'>+int ath6kl_credit_setup(void *htc_handle,</div><div class='add'>+			struct ath6kl_htc_credit_info *cred_info)</div><div class='add'>+{</div><div class='add'>+	u16 servicepriority[5];</div><div class='add'>+</div><div class='add'>+	memset(cred_info, 0, sizeof(struct ath6kl_htc_credit_info));</div><div class='add'>+</div><div class='add'>+	servicepriority[0] = WMI_CONTROL_SVC;  /* highest */</div><div class='add'>+	servicepriority[1] = WMI_DATA_VO_SVC;</div><div class='add'>+	servicepriority[2] = WMI_DATA_VI_SVC;</div><div class='add'>+	servicepriority[3] = WMI_DATA_BE_SVC;</div><div class='add'>+	servicepriority[4] = WMI_DATA_BK_SVC; /* lowest */</div><div class='add'>+</div><div class='add'>+	/* set priority list */</div><div class='add'>+	ath6kl_htc_set_credit_dist(htc_handle, cred_info, servicepriority, 5);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* reduce an ep's credits back to a set limit */</div><div class='add'>+static void ath6kl_credit_reduce(struct ath6kl_htc_credit_info *cred_info,</div><div class='add'>+				 struct htc_endpoint_credit_dist *ep_dist,</div><div class='add'>+				 int limit)</div><div class='add'>+{</div><div class='add'>+	int credits;</div><div class='add'>+</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_CREDIT, "credit reduce ep %d limit %d\n",</div><div class='add'>+		   ep_dist-&gt;endpoint, limit);</div><div class='add'>+</div><div class='add'>+	ep_dist-&gt;cred_assngd = limit;</div><div class='add'>+</div><div class='add'>+	if (ep_dist-&gt;credits &lt;= limit)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	credits = ep_dist-&gt;credits - limit;</div><div class='add'>+	ep_dist-&gt;credits -= credits;</div><div class='add'>+	cred_info-&gt;cur_free_credits += credits;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath6kl_credit_update(struct ath6kl_htc_credit_info *cred_info,</div><div class='add'>+				 struct list_head *epdist_list)</div><div class='add'>+{</div><div class='add'>+	struct htc_endpoint_credit_dist *cur_dist_list;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(cur_dist_list, epdist_list, list) {</div><div class='add'>+		if (cur_dist_list-&gt;endpoint == ENDPOINT_0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (cur_dist_list-&gt;cred_to_dist &gt; 0) {</div><div class='add'>+			cur_dist_list-&gt;credits +=</div><div class='add'>+					cur_dist_list-&gt;cred_to_dist;</div><div class='add'>+			cur_dist_list-&gt;cred_to_dist = 0;</div><div class='add'>+			if (cur_dist_list-&gt;credits &gt;</div><div class='add'>+			    cur_dist_list-&gt;cred_assngd)</div><div class='add'>+				ath6kl_credit_reduce(cred_info,</div><div class='add'>+						cur_dist_list,</div><div class='add'>+						cur_dist_list-&gt;cred_assngd);</div><div class='add'>+</div><div class='add'>+			if (cur_dist_list-&gt;credits &gt;</div><div class='add'>+			    cur_dist_list-&gt;cred_norm)</div><div class='add'>+				ath6kl_credit_reduce(cred_info, cur_dist_list,</div><div class='add'>+						     cur_dist_list-&gt;cred_norm);</div><div class='add'>+</div><div class='add'>+			if (!(cur_dist_list-&gt;dist_flags &amp; HTC_EP_ACTIVE)) {</div><div class='add'>+				if (cur_dist_list-&gt;txq_depth == 0)</div><div class='add'>+					ath6kl_credit_reduce(cred_info,</div><div class='add'>+							     cur_dist_list, 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'>+ * HTC has an endpoint that needs credits, ep_dist is the endpoint in</div><div class='add'>+ * question.</div><div class='add'>+ */</div><div class='add'>+static void ath6kl_credit_seek(struct ath6kl_htc_credit_info *cred_info,</div><div class='add'>+				struct htc_endpoint_credit_dist *ep_dist)</div><div class='add'>+{</div><div class='add'>+	struct htc_endpoint_credit_dist *curdist_list;</div><div class='add'>+	int credits = 0;</div><div class='add'>+	int need;</div><div class='add'>+</div><div class='add'>+	if (ep_dist-&gt;svc_id == WMI_CONTROL_SVC)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if ((ep_dist-&gt;svc_id == WMI_DATA_VI_SVC) ||</div><div class='add'>+	    (ep_dist-&gt;svc_id == WMI_DATA_VO_SVC))</div><div class='add'>+		if ((ep_dist-&gt;cred_assngd &gt;= ep_dist-&gt;cred_norm))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For all other services, we follow a simple algorithm of:</div><div class='add'>+	 *</div><div class='add'>+	 * 1. checking the free pool for credits</div><div class='add'>+	 * 2. checking lower priority endpoints for credits to take</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	credits = min(cred_info-&gt;cur_free_credits, ep_dist-&gt;seek_cred);</div><div class='add'>+</div><div class='add'>+	if (credits &gt;= ep_dist-&gt;seek_cred)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We don't have enough in the free pool, try taking away from</div><div class='add'>+	 * lower priority services The rule for taking away credits:</div><div class='add'>+	 *</div><div class='add'>+	 *   1. Only take from lower priority endpoints</div><div class='add'>+	 *   2. Only take what is allocated above the minimum (never</div><div class='add'>+	 *      starve an endpoint completely)</div><div class='add'>+	 *   3. Only take what you need.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_reverse(curdist_list,</div><div class='add'>+				    &amp;cred_info-&gt;lowestpri_ep_dist,</div><div class='add'>+				    list) {</div><div class='add'>+		if (curdist_list == ep_dist)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		need = ep_dist-&gt;seek_cred - cred_info-&gt;cur_free_credits;</div><div class='add'>+</div><div class='add'>+		if ((curdist_list-&gt;cred_assngd - need) &gt;=</div><div class='add'>+		     curdist_list-&gt;cred_min) {</div><div class='add'>+			/*</div><div class='add'>+			 * The current one has been allocated more than</div><div class='add'>+			 * it's minimum and it has enough credits assigned</div><div class='add'>+			 * above it's minimum to fulfill our need try to</div><div class='add'>+			 * take away just enough to fulfill our need.</div><div class='add'>+			 */</div><div class='add'>+			ath6kl_credit_reduce(cred_info, curdist_list,</div><div class='add'>+					     curdist_list-&gt;cred_assngd - need);</div><div class='add'>+</div><div class='add'>+			if (cred_info-&gt;cur_free_credits &gt;=</div><div class='add'>+			    ep_dist-&gt;seek_cred)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (curdist_list-&gt;endpoint == ENDPOINT_0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	credits = min(cred_info-&gt;cur_free_credits, ep_dist-&gt;seek_cred);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	/* did we find some credits? */</div><div class='add'>+	if (credits)</div><div class='add'>+		ath6kl_credit_deposit(cred_info, ep_dist, credits);</div><div class='add'>+</div><div class='add'>+	ep_dist-&gt;seek_cred = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* redistribute credits based on activity change */</div><div class='add'>+static void ath6kl_credit_redistribute(struct ath6kl_htc_credit_info *info,</div><div class='add'>+				       struct list_head *ep_dist_list)</div><div class='add'>+{</div><div class='add'>+	struct htc_endpoint_credit_dist *curdist_list;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(curdist_list, ep_dist_list, list) {</div><div class='add'>+		if (curdist_list-&gt;endpoint == ENDPOINT_0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if ((curdist_list-&gt;svc_id == WMI_DATA_BK_SVC)  ||</div><div class='add'>+		    (curdist_list-&gt;svc_id == WMI_DATA_BE_SVC))</div><div class='add'>+			curdist_list-&gt;dist_flags |= HTC_EP_ACTIVE;</div><div class='add'>+</div><div class='add'>+		if ((curdist_list-&gt;svc_id != WMI_CONTROL_SVC) &amp;&amp;</div><div class='add'>+		    !(curdist_list-&gt;dist_flags &amp; HTC_EP_ACTIVE)) {</div><div class='add'>+			if (curdist_list-&gt;txq_depth == 0)</div><div class='add'>+				ath6kl_credit_reduce(info, curdist_list, 0);</div><div class='add'>+			else</div><div class='add'>+				ath6kl_credit_reduce(info,</div><div class='add'>+						     curdist_list,</div><div class='add'>+						     curdist_list-&gt;cred_min);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * This function is invoked whenever endpoints require credit</div><div class='add'>+ * distributions. A lock is held while this function is invoked, this</div><div class='add'>+ * function shall NOT block. The ep_dist_list is a list of distribution</div><div class='add'>+ * structures in prioritized order as defined by the call to the</div><div class='add'>+ * htc_set_credit_dist() api.</div><div class='add'>+ */</div><div class='add'>+static void ath6kl_credit_distribute(struct ath6kl_htc_credit_info *cred_info,</div><div class='add'>+				     struct list_head *ep_dist_list,</div><div class='add'>+			      enum htc_credit_dist_reason reason)</div><div class='add'>+{</div><div class='add'>+	switch (reason) {</div><div class='add'>+	case HTC_CREDIT_DIST_SEND_COMPLETE:</div><div class='add'>+		ath6kl_credit_update(cred_info, ep_dist_list);</div><div class='add'>+		break;</div><div class='add'>+	case HTC_CREDIT_DIST_ACTIVITY_CHANGE:</div><div class='add'>+		ath6kl_credit_redistribute(cred_info, ep_dist_list);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(cred_info-&gt;cur_free_credits &gt; cred_info-&gt;total_avail_credits);</div><div class='add'>+	WARN_ON(cred_info-&gt;cur_free_credits &lt; 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath6kl_htc_tx_buf_align(u8 **buf, unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *align_addr;</div><div class='hunk'>@@ -102,12 +410,12 @@ static void htc_tx_comp_update(struct htc_target *target,</div><div class='ctx'> 				packet-&gt;info.tx.cred_used;</div><div class='ctx'> 	endpoint-&gt;cred_dist.txq_depth = get_queue_depth(&amp;endpoint-&gt;txq);</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "ctxt:0x%p dist:0x%p\n",</div><div class='del'>-		   target-&gt;cred_dist_cntxt, &amp;target-&gt;cred_dist_list);</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HTC, "htc tx ctxt 0x%p dist 0x%p\n",</div><div class='add'>+		   target-&gt;credit_info, &amp;target-&gt;cred_dist_list);</div><div class='ctx'> </div><div class='del'>-	ath6k_credit_distribute(target-&gt;cred_dist_cntxt,</div><div class='del'>-				&amp;target-&gt;cred_dist_list,</div><div class='del'>-				HTC_CREDIT_DIST_SEND_COMPLETE);</div><div class='add'>+	ath6kl_credit_distribute(target-&gt;credit_info,</div><div class='add'>+				 &amp;target-&gt;cred_dist_list,</div><div class='add'>+				 HTC_CREDIT_DIST_SEND_COMPLETE);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;target-&gt;tx_lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -118,8 +426,8 @@ static void htc_tx_complete(struct htc_endpoint *endpoint,</div><div class='ctx'> 	if (list_empty(txq))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_HTC_SEND,</div><div class='del'>-		   "send complete ep %d, (%d pkts)\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+		   "htc tx complete ep %d pkts %d\n",</div><div class='ctx'> 		   endpoint-&gt;eid, get_queue_depth(txq));</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_tx_complete(endpoint-&gt;target-&gt;dev-&gt;ar, txq);</div><div class='hunk'>@@ -131,6 +439,9 @@ static void htc_tx_comp_handler(struct htc_target *target,</div><div class='ctx'> 	struct htc_endpoint *endpoint = &amp;target-&gt;endpoint[packet-&gt;endpoint];</div><div class='ctx'> 	struct list_head container;</div><div class='ctx'> </div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HTC, "htc tx complete seqno %d\n",</div><div class='add'>+		   packet-&gt;info.tx.seqno);</div><div class='add'>+</div><div class='ctx'> 	htc_tx_comp_update(target, endpoint, packet);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;container);</div><div class='ctx'> 	list_add_tail(&amp;packet-&gt;list, &amp;container);</div><div class='hunk'>@@ -148,8 +459,8 @@ static void htc_async_tx_scat_complete(struct htc_target *target,</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;tx_compq);</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_HTC_SEND,</div><div class='del'>-		"htc_async_tx_scat_complete  total len: %d  entries: %d\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+		"htc tx scat complete len %d entries %d\n",</div><div class='ctx'> 		scat_req-&gt;len, scat_req-&gt;scat_entries);</div><div class='ctx'> </div><div class='ctx'> 	if (scat_req-&gt;status)</div><div class='hunk'>@@ -190,16 +501,13 @@ static int ath6kl_htc_tx_issue(struct htc_target *target,</div><div class='ctx'> </div><div class='ctx'> 	send_len = packet-&gt;act_len + HTC_HDR_LENGTH;</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "%s: transmit len : %d (%s)\n",</div><div class='del'>-		   __func__, send_len, sync ? "sync" : "async");</div><div class='del'>-</div><div class='ctx'> 	padded_len = CALC_TXRX_PADDED_LEN(target, send_len);</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_HTC_SEND,</div><div class='del'>-		"DevSendPacket, padded len: %d mbox:0x%X (mode:%s)\n",</div><div class='del'>-		padded_len,</div><div class='del'>-		target-&gt;dev-&gt;ar-&gt;mbox_info.htc_addr,</div><div class='del'>-		sync ? "sync" : "async");</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+		   "htc tx issue len %d seqno %d padded_len %d mbox 0x%X %s\n",</div><div class='add'>+		   send_len, packet-&gt;info.tx.seqno, padded_len,</div><div class='add'>+		   target-&gt;dev-&gt;ar-&gt;mbox_info.htc_addr,</div><div class='add'>+		   sync ? "sync" : "async");</div><div class='ctx'> </div><div class='ctx'> 	if (sync) {</div><div class='ctx'> 		status = hif_read_write_sync(target-&gt;dev-&gt;ar,</div><div class='hunk'>@@ -227,7 +535,7 @@ static int htc_check_credits(struct htc_target *target,</div><div class='ctx'> 	*req_cred = (len &gt; target-&gt;tgt_cred_sz) ?</div><div class='ctx'> 		     DIV_ROUND_UP(len, target-&gt;tgt_cred_sz) : 1;</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "creds required:%d got:%d\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_CREDIT, "credit check need %d got %d\n",</div><div class='ctx'> 		   *req_cred, ep-&gt;cred_dist.credits);</div><div class='ctx'> </div><div class='ctx'> 	if (ep-&gt;cred_dist.credits &lt; *req_cred) {</div><div class='hunk'>@@ -237,16 +545,13 @@ static int htc_check_credits(struct htc_target *target,</div><div class='ctx'> 		/* Seek more credits */</div><div class='ctx'> 		ep-&gt;cred_dist.seek_cred = *req_cred - ep-&gt;cred_dist.credits;</div><div class='ctx'> </div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "ctxt:0x%p dist:0x%p\n",</div><div class='del'>-			   target-&gt;cred_dist_cntxt, &amp;ep-&gt;cred_dist);</div><div class='del'>-</div><div class='del'>-		ath6k_seek_credits(target-&gt;cred_dist_cntxt, &amp;ep-&gt;cred_dist);</div><div class='add'>+		ath6kl_credit_seek(target-&gt;credit_info, &amp;ep-&gt;cred_dist);</div><div class='ctx'> </div><div class='ctx'> 		ep-&gt;cred_dist.seek_cred = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (ep-&gt;cred_dist.credits &lt; *req_cred) {</div><div class='del'>-			ath6kl_dbg(ATH6KL_DBG_HTC_SEND,</div><div class='del'>-				   "not enough credits for ep %d - leaving packet in queue\n",</div><div class='add'>+			ath6kl_dbg(ATH6KL_DBG_CREDIT,</div><div class='add'>+				   "credit not found for ep %d\n",</div><div class='ctx'> 				   eid);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -260,17 +565,15 @@ static int htc_check_credits(struct htc_target *target,</div><div class='ctx'> 		ep-&gt;cred_dist.seek_cred =</div><div class='ctx'> 		ep-&gt;cred_dist.cred_per_msg - ep-&gt;cred_dist.credits;</div><div class='ctx'> </div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "ctxt:0x%p dist:0x%p\n",</div><div class='del'>-			   target-&gt;cred_dist_cntxt, &amp;ep-&gt;cred_dist);</div><div class='del'>-</div><div class='del'>-		ath6k_seek_credits(target-&gt;cred_dist_cntxt, &amp;ep-&gt;cred_dist);</div><div class='add'>+		ath6kl_credit_seek(target-&gt;credit_info, &amp;ep-&gt;cred_dist);</div><div class='ctx'> </div><div class='ctx'> 		/* see if we were successful in getting more */</div><div class='ctx'> 		if (ep-&gt;cred_dist.credits &lt; ep-&gt;cred_dist.cred_per_msg) {</div><div class='ctx'> 			/* tell the target we need credits ASAP! */</div><div class='ctx'> 			*flags |= HTC_FLAGS_NEED_CREDIT_UPDATE;</div><div class='ctx'> 			ep-&gt;ep_st.cred_low_indicate += 1;</div><div class='del'>-			ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "host needs credits\n");</div><div class='add'>+			ath6kl_dbg(ATH6KL_DBG_CREDIT,</div><div class='add'>+				   "credit we need credits asap\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -295,8 +598,8 @@ static void ath6kl_htc_tx_pkts_get(struct htc_target *target,</div><div class='ctx'> 		packet = list_first_entry(&amp;endpoint-&gt;txq, struct htc_packet,</div><div class='ctx'> 					  list);</div><div class='ctx'> </div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_HTC_SEND,</div><div class='del'>-			"got head pkt:0x%p , queue depth: %d\n",</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+			"htc tx got packet 0x%p queue depth %d\n",</div><div class='ctx'> 			packet, get_queue_depth(&amp;endpoint-&gt;txq));</div><div class='ctx'> </div><div class='ctx'> 		len = CALC_TXRX_PADDED_LEN(target,</div><div class='hunk'>@@ -404,9 +707,9 @@ static int ath6kl_htc_tx_setup_scat_list(struct htc_target *target,</div><div class='ctx'> </div><div class='ctx'> 		scat_req-&gt;len += len;</div><div class='ctx'> 		scat_req-&gt;scat_entries++;</div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_HTC_SEND,</div><div class='del'>-			   "%d, adding pkt : 0x%p len:%d (remaining space:%d)\n",</div><div class='del'>-			   i, packet, len, rem_scat);</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+			   "htc tx adding (%d) pkt 0x%p seqno %d len %d remaining %d\n",</div><div class='add'>+			   i, packet, packet-&gt;info.tx.seqno, len, rem_scat);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Roll back scatter setup in case of any failure */</div><div class='hunk'>@@ -455,12 +758,12 @@ static void ath6kl_htc_tx_bundle(struct htc_endpoint *endpoint,</div><div class='ctx'> </div><div class='ctx'> 		if (!scat_req) {</div><div class='ctx'> 			/* no scatter resources  */</div><div class='del'>-			ath6kl_dbg(ATH6KL_DBG_HTC_SEND,</div><div class='del'>-				"no more scatter resources\n");</div><div class='add'>+			ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+				"htc tx no more scatter resources\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "pkts to scatter: %d\n",</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_HTC, "htc tx pkts to scatter: %d\n",</div><div class='ctx'> 			   n_scat);</div><div class='ctx'> </div><div class='ctx'> 		scat_req-&gt;len = 0;</div><div class='hunk'>@@ -479,10 +782,10 @@ static void ath6kl_htc_tx_bundle(struct htc_endpoint *endpoint,</div><div class='ctx'> 		n_sent_bundle++;</div><div class='ctx'> 		tot_pkts_bundle += scat_req-&gt;scat_entries;</div><div class='ctx'> </div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_HTC_SEND,</div><div class='del'>-			   "send scatter total bytes: %d , entries: %d\n",</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+			   "htc tx scatter bytes %d entries %d\n",</div><div class='ctx'> 			   scat_req-&gt;len, scat_req-&gt;scat_entries);</div><div class='del'>-		ath6kldev_submit_scat_req(target-&gt;dev, scat_req, false);</div><div class='add'>+		ath6kl_hif_submit_scat_req(target-&gt;dev, scat_req, false);</div><div class='ctx'> </div><div class='ctx'> 		if (status)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -490,8 +793,8 @@ static void ath6kl_htc_tx_bundle(struct htc_endpoint *endpoint,</div><div class='ctx'> </div><div class='ctx'> 	*sent_bundle = n_sent_bundle;</div><div class='ctx'> 	*n_bundle_pkts = tot_pkts_bundle;</div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "%s (sent:%d)\n",</div><div class='del'>-		   __func__, n_sent_bundle);</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HTC, "htc tx bundle sent %d pkts\n",</div><div class='add'>+		   n_sent_bundle);</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='hunk'>@@ -510,7 +813,7 @@ static void ath6kl_htc_tx_from_queue(struct htc_target *target,</div><div class='ctx'> 	if (endpoint-&gt;tx_proc_cnt &gt; 1) {</div><div class='ctx'> 		endpoint-&gt;tx_proc_cnt--;</div><div class='ctx'> 		spin_unlock_bh(&amp;target-&gt;tx_lock);</div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "htc_try_send (busy)\n");</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_HTC, "htc tx busy\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -588,15 +891,12 @@ static bool ath6kl_htc_tx_try(struct htc_target *target,</div><div class='ctx'> 		overflow = true;</div><div class='ctx'> </div><div class='ctx'> 	if (overflow)</div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_HTC_SEND,</div><div class='del'>-			   "ep %d, tx queue will overflow :%d , tx depth:%d, max:%d\n",</div><div class='del'>-			   endpoint-&gt;eid, overflow, txq_depth,</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+			   "htc tx overflow ep %d depth %d max %d\n",</div><div class='add'>+			   endpoint-&gt;eid, txq_depth,</div><div class='ctx'> 			   endpoint-&gt;max_txq_depth);</div><div class='ctx'> </div><div class='ctx'> 	if (overflow &amp;&amp; ep_cb.tx_full) {</div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_HTC_SEND,</div><div class='del'>-			   "indicating overflowed tx packet: 0x%p\n", tx_pkt);</div><div class='del'>-</div><div class='ctx'> 		if (ep_cb.tx_full(endpoint-&gt;target, tx_pkt) ==</div><div class='ctx'> 		    HTC_SEND_FULL_DROP) {</div><div class='ctx'> 			endpoint-&gt;ep_st.tx_dropped += 1;</div><div class='hunk'>@@ -625,12 +925,12 @@ static void htc_chk_ep_txq(struct htc_target *target)</div><div class='ctx'> 	 * are not modifying any state.</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_for_each_entry(cred_dist, &amp;target-&gt;cred_dist_list, list) {</div><div class='del'>-		endpoint = (struct htc_endpoint *)cred_dist-&gt;htc_rsvd;</div><div class='add'>+		endpoint = cred_dist-&gt;htc_ep;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;target-&gt;tx_lock);</div><div class='ctx'> 		if (!list_empty(&amp;endpoint-&gt;txq)) {</div><div class='del'>-			ath6kl_dbg(ATH6KL_DBG_HTC_SEND,</div><div class='del'>-				   "ep %d has %d credits and %d packets in tx queue\n",</div><div class='add'>+			ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+				   "htc creds ep %d credits %d pkts %d\n",</div><div class='ctx'> 				   cred_dist-&gt;endpoint,</div><div class='ctx'> 				   endpoint-&gt;cred_dist.credits,</div><div class='ctx'> 				   get_queue_depth(&amp;endpoint-&gt;txq));</div><div class='hunk'>@@ -704,13 +1004,13 @@ static int htc_setup_tx_complete(struct htc_target *target)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath6kl_htc_set_credit_dist(struct htc_target *target,</div><div class='del'>-				struct htc_credit_state_info *cred_dist_cntxt,</div><div class='add'>+				struct ath6kl_htc_credit_info *credit_info,</div><div class='ctx'> 				u16 srvc_pri_order[], int list_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct htc_endpoint *endpoint;</div><div class='ctx'> 	int i, ep;</div><div class='ctx'> </div><div class='del'>-	target-&gt;cred_dist_cntxt = cred_dist_cntxt;</div><div class='add'>+	target-&gt;credit_info = credit_info;</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail(&amp;target-&gt;endpoint[ENDPOINT_0].cred_dist.list,</div><div class='ctx'> 		      &amp;target-&gt;cred_dist_list);</div><div class='hunk'>@@ -736,8 +1036,8 @@ int ath6kl_htc_tx(struct htc_target *target, struct htc_packet *packet)</div><div class='ctx'> 	struct htc_endpoint *endpoint;</div><div class='ctx'> 	struct list_head queue;</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_HTC_SEND,</div><div class='del'>-		   "htc_tx: ep id: %d, buf: 0x%p, len: %d\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+		   "htc tx ep id %d buf 0x%p len %d\n",</div><div class='ctx'> 		   packet-&gt;endpoint, packet-&gt;buf, packet-&gt;act_len);</div><div class='ctx'> </div><div class='ctx'> 	if (packet-&gt;endpoint &gt;= ENDPOINT_MAX) {</div><div class='hunk'>@@ -787,8 +1087,8 @@ void ath6kl_htc_flush_txep(struct htc_target *target,</div><div class='ctx'> 	list_for_each_entry_safe(packet, tmp_pkt, &amp;discard_q, list) {</div><div class='ctx'> 		packet-&gt;status = -ECANCELED;</div><div class='ctx'> 		list_del(&amp;packet-&gt;list);</div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_TRC,</div><div class='del'>-			"flushing tx pkt:0x%p, len:%d, ep:%d tag:0x%X\n",</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+			"htc tx flushing pkt 0x%p len %d  ep %d tag 0x%x\n",</div><div class='ctx'> 			packet, packet-&gt;act_len,</div><div class='ctx'> 			packet-&gt;endpoint, packet-&gt;info.tx.tag);</div><div class='ctx'> </div><div class='hunk'>@@ -844,12 +1144,13 @@ void ath6kl_htc_indicate_activity_change(struct htc_target *target,</div><div class='ctx'> 		endpoint-&gt;cred_dist.txq_depth =</div><div class='ctx'> 			get_queue_depth(&amp;endpoint-&gt;txq);</div><div class='ctx'> </div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "ctxt:0x%p dist:0x%p\n",</div><div class='del'>-			   target-&gt;cred_dist_cntxt, &amp;target-&gt;cred_dist_list);</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+			   "htc tx activity ctxt 0x%p dist 0x%p\n",</div><div class='add'>+			   target-&gt;credit_info, &amp;target-&gt;cred_dist_list);</div><div class='ctx'> </div><div class='del'>-		ath6k_credit_distribute(target-&gt;cred_dist_cntxt,</div><div class='del'>-					&amp;target-&gt;cred_dist_list,</div><div class='del'>-					HTC_CREDIT_DIST_ACTIVITY_CHANGE);</div><div class='add'>+		ath6kl_credit_distribute(target-&gt;credit_info,</div><div class='add'>+					 &amp;target-&gt;cred_dist_list,</div><div class='add'>+					 HTC_CREDIT_DIST_ACTIVITY_CHANGE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;target-&gt;tx_lock);</div><div class='hunk'>@@ -919,15 +1220,15 @@ static int ath6kl_htc_rx_packet(struct htc_target *target,</div><div class='ctx'> 	padded_len = CALC_TXRX_PADDED_LEN(target, rx_len);</div><div class='ctx'> </div><div class='ctx'> 	if (padded_len &gt; packet-&gt;buf_len) {</div><div class='del'>-		ath6kl_err("not enough receive space for packet - padlen:%d recvlen:%d bufferlen:%d\n",</div><div class='add'>+		ath6kl_err("not enough receive space for packet - padlen %d recvlen %d bufferlen %d\n",</div><div class='ctx'> 			   padded_len, rx_len, packet-&gt;buf_len);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_HTC_RECV,</div><div class='del'>-		   "dev_rx_pkt (0x%p : hdr:0x%X) padded len: %d mbox:0x%X (mode:%s)\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+		   "htc rx 0x%p hdr x%x len %d mbox 0x%x\n",</div><div class='ctx'> 		   packet, packet-&gt;info.rx.exp_hdr,</div><div class='del'>-		   padded_len, dev-&gt;ar-&gt;mbox_info.htc_addr, "sync");</div><div class='add'>+		   padded_len, dev-&gt;ar-&gt;mbox_info.htc_addr);</div><div class='ctx'> </div><div class='ctx'> 	status = hif_read_write_sync(dev-&gt;ar,</div><div class='ctx'> 				     dev-&gt;ar-&gt;mbox_info.htc_addr,</div><div class='hunk'>@@ -1137,8 +1438,8 @@ static int ath6kl_htc_rx_alloc(struct htc_target *target,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			endpoint-&gt;ep_st.rx_bundle_from_hdr += 1;</div><div class='del'>-			ath6kl_dbg(ATH6KL_DBG_HTC_RECV,</div><div class='del'>-				   "htc hdr indicates :%d msg can be fetched as a bundle\n",</div><div class='add'>+			ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+				   "htc rx bundle pkts %d\n",</div><div class='ctx'> 				   n_msg);</div><div class='ctx'> 		} else</div><div class='ctx'> 			/* HTC header only indicates 1 message to fetch */</div><div class='hunk'>@@ -1191,8 +1492,8 @@ static void htc_ctrl_rx(struct htc_target *context, struct htc_packet *packets)</div><div class='ctx'> 		ath6kl_err("htc_ctrl_rx, got message with len:%zu\n",</div><div class='ctx'> 			packets-&gt;act_len + HTC_HDR_LENGTH);</div><div class='ctx'> </div><div class='del'>-		ath6kl_dbg_dump(ATH6KL_DBG_RAW_BYTES,</div><div class='del'>-				"Unexpected ENDPOINT 0 Message", "",</div><div class='add'>+		ath6kl_dbg_dump(ATH6KL_DBG_HTC,</div><div class='add'>+				"htc rx unexpected endpoint 0 message", "",</div><div class='ctx'> 				packets-&gt;buf - HTC_HDR_LENGTH,</div><div class='ctx'> 				packets-&gt;act_len + HTC_HDR_LENGTH);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1209,9 +1510,6 @@ static void htc_proc_cred_rpt(struct htc_target *target,</div><div class='ctx'> 	int tot_credits = 0, i;</div><div class='ctx'> 	bool dist = false;</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_HTC_SEND,</div><div class='del'>-		   "htc_proc_cred_rpt, credit report entries:%d\n", n_entries);</div><div class='del'>-</div><div class='ctx'> 	spin_lock_bh(&amp;target-&gt;tx_lock);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; n_entries; i++, rpt++) {</div><div class='hunk'>@@ -1223,8 +1521,9 @@ static void htc_proc_cred_rpt(struct htc_target *target,</div><div class='ctx'> </div><div class='ctx'> 		endpoint = &amp;target-&gt;endpoint[rpt-&gt;eid];</div><div class='ctx'> </div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_HTC_SEND, " ep %d got %d credits\n",</div><div class='del'>-			rpt-&gt;eid, rpt-&gt;credits);</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_CREDIT,</div><div class='add'>+			   "credit report ep %d credits %d\n",</div><div class='add'>+			   rpt-&gt;eid, rpt-&gt;credits);</div><div class='ctx'> </div><div class='ctx'> 		endpoint-&gt;ep_st.tx_cred_rpt += 1;</div><div class='ctx'> 		endpoint-&gt;ep_st.cred_retnd += rpt-&gt;credits;</div><div class='hunk'>@@ -1264,21 +1563,14 @@ static void htc_proc_cred_rpt(struct htc_target *target,</div><div class='ctx'> 		tot_credits += rpt-&gt;credits;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_HTC_SEND,</div><div class='del'>-		   "report indicated %d credits to distribute\n",</div><div class='del'>-		   tot_credits);</div><div class='del'>-</div><div class='ctx'> 	if (dist) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This was a credit return based on a completed send</div><div class='ctx'> 		 * operations note, this is done with the lock held</div><div class='ctx'> 		 */</div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "ctxt:0x%p dist:0x%p\n",</div><div class='del'>-			   target-&gt;cred_dist_cntxt, &amp;target-&gt;cred_dist_list);</div><div class='del'>-</div><div class='del'>-		ath6k_credit_distribute(target-&gt;cred_dist_cntxt,</div><div class='del'>-					&amp;target-&gt;cred_dist_list,</div><div class='del'>-					HTC_CREDIT_DIST_SEND_COMPLETE);</div><div class='add'>+		ath6kl_credit_distribute(target-&gt;credit_info,</div><div class='add'>+					 &amp;target-&gt;cred_dist_list,</div><div class='add'>+					 HTC_CREDIT_DIST_SEND_COMPLETE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;target-&gt;tx_lock);</div><div class='hunk'>@@ -1320,14 +1612,15 @@ static int htc_parse_trailer(struct htc_target *target,</div><div class='ctx'> 		if ((lk_ahd-&gt;pre_valid == ((~lk_ahd-&gt;post_valid) &amp; 0xFF))</div><div class='ctx'> 		    &amp;&amp; next_lk_ahds) {</div><div class='ctx'> </div><div class='del'>-			ath6kl_dbg(ATH6KL_DBG_HTC_RECV,</div><div class='del'>-				   "lk_ahd report found (pre valid:0x%X, post valid:0x%X)\n",</div><div class='add'>+			ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+				   "htc rx lk_ahd found pre_valid 0x%x post_valid 0x%x\n",</div><div class='ctx'> 				   lk_ahd-&gt;pre_valid, lk_ahd-&gt;post_valid);</div><div class='ctx'> </div><div class='ctx'> 			/* look ahead bytes are valid, copy them over */</div><div class='ctx'> 			memcpy((u8 *)&amp;next_lk_ahds[0], lk_ahd-&gt;lk_ahd, 4);</div><div class='ctx'> </div><div class='del'>-			ath6kl_dbg_dump(ATH6KL_DBG_RAW_BYTES, "Next Look Ahead",</div><div class='add'>+			ath6kl_dbg_dump(ATH6KL_DBG_HTC,</div><div class='add'>+					"htc rx next look ahead",</div><div class='ctx'> 					"", next_lk_ahds, 4);</div><div class='ctx'> </div><div class='ctx'> 			*n_lk_ahds = 1;</div><div class='hunk'>@@ -1346,7 +1639,7 @@ static int htc_parse_trailer(struct htc_target *target,</div><div class='ctx'> 			bundle_lkahd_rpt =</div><div class='ctx'> 				(struct htc_bundle_lkahd_rpt *) record_buf;</div><div class='ctx'> </div><div class='del'>-			ath6kl_dbg_dump(ATH6KL_DBG_RAW_BYTES, "Bundle lk_ahd",</div><div class='add'>+			ath6kl_dbg_dump(ATH6KL_DBG_HTC, "htc rx bundle lk_ahd",</div><div class='ctx'> 					"", record_buf, record-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 			for (i = 0; i &lt; len; i++) {</div><div class='hunk'>@@ -1378,10 +1671,8 @@ static int htc_proc_trailer(struct htc_target *target,</div><div class='ctx'> 	u8 *record_buf;</div><div class='ctx'> 	u8 *orig_buf;</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_HTC_RECV, "+htc_proc_trailer (len:%d)\n", len);</div><div class='del'>-</div><div class='del'>-	ath6kl_dbg_dump(ATH6KL_DBG_RAW_BYTES, "Recv Trailer", "",</div><div class='del'>-			buf, len);</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HTC, "htc rx trailer len %d\n", len);</div><div class='add'>+	ath6kl_dbg_dump(ATH6KL_DBG_HTC, NULL, "", buf, len);</div><div class='ctx'> </div><div class='ctx'> 	orig_buf = buf;</div><div class='ctx'> 	orig_len = len;</div><div class='hunk'>@@ -1418,7 +1709,7 @@ static int htc_proc_trailer(struct htc_target *target,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (status)</div><div class='del'>-		ath6kl_dbg_dump(ATH6KL_DBG_RAW_BYTES, "BAD Recv Trailer",</div><div class='add'>+		ath6kl_dbg_dump(ATH6KL_DBG_HTC, "htc rx bad trailer",</div><div class='ctx'> 				"", orig_buf, orig_len);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -1436,9 +1727,6 @@ static int ath6kl_htc_rx_process_hdr(struct htc_target *target,</div><div class='ctx'> 	if (n_lkahds != NULL)</div><div class='ctx'> 		*n_lkahds = 0;</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg_dump(ATH6KL_DBG_RAW_BYTES, "HTC Recv PKT", "htc ",</div><div class='del'>-			packet-&gt;buf, packet-&gt;act_len);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * NOTE: we cannot assume the alignment of buf, so we use the safe</div><div class='ctx'> 	 * macros to retrieve 16 bit fields.</div><div class='hunk'>@@ -1480,9 +1768,9 @@ static int ath6kl_htc_rx_process_hdr(struct htc_target *target,</div><div class='ctx'> 	if (lk_ahd != packet-&gt;info.rx.exp_hdr) {</div><div class='ctx'> 		ath6kl_err("%s(): lk_ahd mismatch! (pPkt:0x%p flags:0x%X)\n",</div><div class='ctx'> 			   __func__, packet, packet-&gt;info.rx.rx_flags);</div><div class='del'>-		ath6kl_dbg_dump(ATH6KL_DBG_RAW_BYTES, "Expected Message lk_ahd",</div><div class='add'>+		ath6kl_dbg_dump(ATH6KL_DBG_HTC, "htc rx expected lk_ahd",</div><div class='ctx'> 				"", &amp;packet-&gt;info.rx.exp_hdr, 4);</div><div class='del'>-		ath6kl_dbg_dump(ATH6KL_DBG_RAW_BYTES, "Current Frame Header",</div><div class='add'>+		ath6kl_dbg_dump(ATH6KL_DBG_HTC, "htc rx current header",</div><div class='ctx'> 				"", (u8 *)&amp;lk_ahd, sizeof(lk_ahd));</div><div class='ctx'> 		status = -ENOMEM;</div><div class='ctx'> 		goto fail_rx;</div><div class='hunk'>@@ -1518,15 +1806,8 @@ static int ath6kl_htc_rx_process_hdr(struct htc_target *target,</div><div class='ctx'> </div><div class='ctx'> fail_rx:</div><div class='ctx'> 	if (status)</div><div class='del'>-		ath6kl_dbg_dump(ATH6KL_DBG_RAW_BYTES, "BAD HTC Recv PKT",</div><div class='del'>-				"", packet-&gt;buf,</div><div class='del'>-				packet-&gt;act_len &lt; 256 ? packet-&gt;act_len : 256);</div><div class='del'>-	else {</div><div class='del'>-		if (packet-&gt;act_len &gt; 0)</div><div class='del'>-			ath6kl_dbg_dump(ATH6KL_DBG_RAW_BYTES,</div><div class='del'>-					"HTC - Application Msg", "",</div><div class='del'>-					packet-&gt;buf, packet-&gt;act_len);</div><div class='del'>-	}</div><div class='add'>+		ath6kl_dbg_dump(ATH6KL_DBG_HTC, "htc rx bad packet",</div><div class='add'>+				"", packet-&gt;buf, packet-&gt;act_len);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -1534,8 +1815,8 @@ fail_rx:</div><div class='ctx'> static void ath6kl_htc_rx_complete(struct htc_endpoint *endpoint,</div><div class='ctx'> 				   struct htc_packet *packet)</div><div class='ctx'> {</div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_HTC_RECV,</div><div class='del'>-			   "htc calling ep %d recv callback on packet 0x%p\n",</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+			   "htc rx complete ep %d packet 0x%p\n",</div><div class='ctx'> 			   endpoint-&gt;eid, packet);</div><div class='ctx'> 		endpoint-&gt;ep_cb.rx(endpoint-&gt;target, packet);</div><div class='ctx'> }</div><div class='hunk'>@@ -1571,9 +1852,9 @@ static int ath6kl_htc_rx_bundle(struct htc_target *target,</div><div class='ctx'> </div><div class='ctx'> 	len = 0;</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_HTC_RECV,</div><div class='del'>-		   "%s(): (numpackets: %d , actual : %d)\n",</div><div class='del'>-		   __func__, get_queue_depth(rxq), n_scat_pkt);</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+		   "htc rx bundle depth %d pkts %d\n",</div><div class='add'>+		   get_queue_depth(rxq), n_scat_pkt);</div><div class='ctx'> </div><div class='ctx'> 	scat_req = hif_scatter_req_get(target-&gt;dev-&gt;ar);</div><div class='ctx'> </div><div class='hunk'>@@ -1620,7 +1901,7 @@ static int ath6kl_htc_rx_bundle(struct htc_target *target,</div><div class='ctx'> 	scat_req-&gt;len = len;</div><div class='ctx'> 	scat_req-&gt;scat_entries = i;</div><div class='ctx'> </div><div class='del'>-	status = ath6kldev_submit_scat_req(target-&gt;dev, scat_req, true);</div><div class='add'>+	status = ath6kl_hif_submit_scat_req(target-&gt;dev, scat_req, true);</div><div class='ctx'> </div><div class='ctx'> 	if (!status)</div><div class='ctx'> 		*n_pkt_fetched = i;</div><div class='hunk'>@@ -1643,7 +1924,6 @@ static int ath6kl_htc_rx_process_packets(struct htc_target *target,</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(packet, tmp_pkt, comp_pktq, list) {</div><div class='del'>-		list_del(&amp;packet-&gt;list);</div><div class='ctx'> 		ep = &amp;target-&gt;endpoint[packet-&gt;endpoint];</div><div class='ctx'> </div><div class='ctx'> 		/* process header for each of the recv packet */</div><div class='hunk'>@@ -1652,6 +1932,8 @@ static int ath6kl_htc_rx_process_packets(struct htc_target *target,</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			return status;</div><div class='ctx'> </div><div class='add'>+		list_del(&amp;packet-&gt;list);</div><div class='add'>+</div><div class='ctx'> 		if (list_empty(comp_pktq)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Last packet's more packet flag is set</div><div class='hunk'>@@ -1686,11 +1968,15 @@ static int ath6kl_htc_rx_fetch(struct htc_target *target,</div><div class='ctx'> 	int fetched_pkts;</div><div class='ctx'> 	bool part_bundle = false;</div><div class='ctx'> 	int status = 0;</div><div class='add'>+	struct list_head tmp_rxq;</div><div class='add'>+	struct htc_packet *packet, *tmp_pkt;</div><div class='ctx'> </div><div class='ctx'> 	/* now go fetch the list of HTC packets */</div><div class='ctx'> 	while (!list_empty(rx_pktq)) {</div><div class='ctx'> 		fetched_pkts = 0;</div><div class='ctx'> </div><div class='add'>+		INIT_LIST_HEAD(&amp;tmp_rxq);</div><div class='add'>+</div><div class='ctx'> 		if (target-&gt;rx_bndl_enable &amp;&amp; (get_queue_depth(rx_pktq) &gt; 1)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * There are enough packets to attempt a</div><div class='hunk'>@@ -1698,28 +1984,27 @@ static int ath6kl_htc_rx_fetch(struct htc_target *target,</div><div class='ctx'> 			 * allowed.</div><div class='ctx'> 			 */</div><div class='ctx'> 			status = ath6kl_htc_rx_bundle(target, rx_pktq,</div><div class='del'>-						      comp_pktq,</div><div class='add'>+						      &amp;tmp_rxq,</div><div class='ctx'> 						      &amp;fetched_pkts,</div><div class='ctx'> 						      part_bundle);</div><div class='ctx'> 			if (status)</div><div class='del'>-				return status;</div><div class='add'>+				goto fail_rx;</div><div class='ctx'> </div><div class='ctx'> 			if (!list_empty(rx_pktq))</div><div class='ctx'> 				part_bundle = true;</div><div class='add'>+</div><div class='add'>+			list_splice_tail_init(&amp;tmp_rxq, comp_pktq);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!fetched_pkts) {</div><div class='del'>-			struct htc_packet *packet;</div><div class='ctx'> </div><div class='ctx'> 			packet = list_first_entry(rx_pktq, struct htc_packet,</div><div class='ctx'> 						   list);</div><div class='ctx'> </div><div class='del'>-			list_del(&amp;packet-&gt;list);</div><div class='del'>-</div><div class='ctx'> 			/* fully synchronous */</div><div class='ctx'> 			packet-&gt;completion = NULL;</div><div class='ctx'> </div><div class='del'>-			if (!list_empty(rx_pktq))</div><div class='add'>+			if (!list_is_singular(rx_pktq))</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * look_aheads in all packet</div><div class='ctx'> 				 * except the last one in the</div><div class='hunk'>@@ -1731,18 +2016,42 @@ static int ath6kl_htc_rx_fetch(struct htc_target *target,</div><div class='ctx'> 			/* go fetch the packet */</div><div class='ctx'> 			status = ath6kl_htc_rx_packet(target, packet,</div><div class='ctx'> 						      packet-&gt;act_len);</div><div class='add'>+</div><div class='add'>+			list_move_tail(&amp;packet-&gt;list, &amp;tmp_rxq);</div><div class='add'>+</div><div class='ctx'> 			if (status)</div><div class='del'>-				return status;</div><div class='add'>+				goto fail_rx;</div><div class='ctx'> </div><div class='del'>-			list_add_tail(&amp;packet-&gt;list, comp_pktq);</div><div class='add'>+			list_splice_tail_init(&amp;tmp_rxq, comp_pktq);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_rx:</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Cleanup any packets we allocated but didn't use to</div><div class='add'>+	 * actually fetch any packets.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(packet, tmp_pkt, rx_pktq, list) {</div><div class='add'>+		list_del(&amp;packet-&gt;list);</div><div class='add'>+		htc_reclaim_rxbuf(target, packet,</div><div class='add'>+				&amp;target-&gt;endpoint[packet-&gt;endpoint]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(packet, tmp_pkt, &amp;tmp_rxq, list) {</div><div class='add'>+		list_del(&amp;packet-&gt;list);</div><div class='add'>+		htc_reclaim_rxbuf(target, packet,</div><div class='add'>+				&amp;target-&gt;endpoint[packet-&gt;endpoint]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath6kl_htc_rxmsg_pending_handler(struct htc_target *target,</div><div class='del'>-				     u32 msg_look_ahead[], int *num_pkts)</div><div class='add'>+				     u32 msg_look_ahead, int *num_pkts)</div><div class='ctx'> {</div><div class='ctx'> 	struct htc_packet *packets, *tmp_pkt;</div><div class='ctx'> 	struct htc_endpoint *endpoint;</div><div class='hunk'>@@ -1759,7 +2068,7 @@ int ath6kl_htc_rxmsg_pending_handler(struct htc_target *target,</div><div class='ctx'> 	 * On first entry copy the look_aheads into our temp array for</div><div class='ctx'> 	 * processing</div><div class='ctx'> 	 */</div><div class='del'>-	memcpy(look_aheads, msg_look_ahead, sizeof(look_aheads));</div><div class='add'>+	look_aheads[0] = msg_look_ahead;</div><div class='ctx'> </div><div class='ctx'> 	while (true) {</div><div class='ctx'> </div><div class='hunk'>@@ -1827,15 +2136,6 @@ int ath6kl_htc_rxmsg_pending_handler(struct htc_target *target,</div><div class='ctx'> 	if (status) {</div><div class='ctx'> 		ath6kl_err("failed to get pending recv messages: %d\n",</div><div class='ctx'> 			   status);</div><div class='del'>-		/*</div><div class='del'>-		 * Cleanup any packets we allocated but didn't use to</div><div class='del'>-		 * actually fetch any packets.</div><div class='del'>-		 */</div><div class='del'>-		list_for_each_entry_safe(packets, tmp_pkt, &amp;rx_pktq, list) {</div><div class='del'>-			list_del(&amp;packets-&gt;list);</div><div class='del'>-			htc_reclaim_rxbuf(target, packets,</div><div class='del'>-					&amp;target-&gt;endpoint[packets-&gt;endpoint]);</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		/* cleanup any packets in sync completion queue */</div><div class='ctx'> 		list_for_each_entry_safe(packets, tmp_pkt, &amp;comp_pktq, list) {</div><div class='hunk'>@@ -1846,7 +2146,7 @@ int ath6kl_htc_rxmsg_pending_handler(struct htc_target *target,</div><div class='ctx'> </div><div class='ctx'> 		if (target-&gt;htc_flags &amp; HTC_OP_STATE_STOPPING) {</div><div class='ctx'> 			ath6kl_warn("host is going to stop blocking receiver for htc_stop\n");</div><div class='del'>-			ath6kldev_rx_control(target-&gt;dev, false);</div><div class='add'>+			ath6kl_hif_rx_control(target-&gt;dev, false);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1856,7 +2156,7 @@ int ath6kl_htc_rxmsg_pending_handler(struct htc_target *target,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (target-&gt;rx_st_flags &amp; HTC_RECV_WAIT_BUFFERS) {</div><div class='ctx'> 		ath6kl_warn("host has no rx buffers blocking receiver to prevent overrun\n");</div><div class='del'>-		ath6kldev_rx_control(target-&gt;dev, false);</div><div class='add'>+		ath6kl_hif_rx_control(target-&gt;dev, false);</div><div class='ctx'> 	}</div><div class='ctx'> 	*num_pkts = n_fetched;</div><div class='ctx'> </div><div class='hunk'>@@ -1874,12 +2174,12 @@ static struct htc_packet *htc_wait_for_ctrl_msg(struct htc_target *target)</div><div class='ctx'> 	struct htc_frame_hdr *htc_hdr;</div><div class='ctx'> 	u32 look_ahead;</div><div class='ctx'> </div><div class='del'>-	if (ath6kldev_poll_mboxmsg_rx(target-&gt;dev, &amp;look_ahead,</div><div class='add'>+	if (ath6kl_hif_poll_mboxmsg_rx(target-&gt;dev, &amp;look_ahead,</div><div class='ctx'> 			       HTC_TARGET_RESPONSE_TIMEOUT))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_HTC_RECV,</div><div class='del'>-		"htc_wait_for_ctrl_msg: look_ahead : 0x%X\n", look_ahead);</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+		"htc rx wait ctrl look_ahead 0x%X\n", look_ahead);</div><div class='ctx'> </div><div class='ctx'> 	htc_hdr = (struct htc_frame_hdr *)&amp;look_ahead;</div><div class='ctx'> </div><div class='hunk'>@@ -1943,8 +2243,8 @@ int ath6kl_htc_add_rxbuf_multiple(struct htc_target *target,</div><div class='ctx'> </div><div class='ctx'> 	depth = get_queue_depth(pkt_queue);</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_HTC_RECV,</div><div class='del'>-		"htc_add_rxbuf_multiple: ep id: %d, cnt:%d, len: %d\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+		"htc rx add multiple ep id %d cnt %d len %d\n",</div><div class='ctx'> 		first_pkt-&gt;endpoint, depth, first_pkt-&gt;buf_len);</div><div class='ctx'> </div><div class='ctx'> 	endpoint = &amp;target-&gt;endpoint[first_pkt-&gt;endpoint];</div><div class='hunk'>@@ -1969,8 +2269,8 @@ int ath6kl_htc_add_rxbuf_multiple(struct htc_target *target,</div><div class='ctx'> 	/* check if we are blocked waiting for a new buffer */</div><div class='ctx'> 	if (target-&gt;rx_st_flags &amp; HTC_RECV_WAIT_BUFFERS) {</div><div class='ctx'> 		if (target-&gt;ep_waiting == first_pkt-&gt;endpoint) {</div><div class='del'>-			ath6kl_dbg(ATH6KL_DBG_HTC_RECV,</div><div class='del'>-				"receiver was blocked on ep:%d, unblocking.\n",</div><div class='add'>+			ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+				"htc rx blocked on ep %d, unblocking\n",</div><div class='ctx'> 				target-&gt;ep_waiting);</div><div class='ctx'> 			target-&gt;rx_st_flags &amp;= ~HTC_RECV_WAIT_BUFFERS;</div><div class='ctx'> 			target-&gt;ep_waiting = ENDPOINT_MAX;</div><div class='hunk'>@@ -1982,7 +2282,7 @@ int ath6kl_htc_add_rxbuf_multiple(struct htc_target *target,</div><div class='ctx'> </div><div class='ctx'> 	if (rx_unblock &amp;&amp; !(target-&gt;htc_flags &amp; HTC_OP_STATE_STOPPING))</div><div class='ctx'> 		/* TODO : implement a buffer threshold count? */</div><div class='del'>-		ath6kldev_rx_control(target-&gt;dev, true);</div><div class='add'>+		ath6kl_hif_rx_control(target-&gt;dev, true);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -2004,8 +2304,8 @@ void ath6kl_htc_flush_rx_buf(struct htc_target *target)</div><div class='ctx'> 					 &amp;endpoint-&gt;rx_bufq, list) {</div><div class='ctx'> 			list_del(&amp;packet-&gt;list);</div><div class='ctx'> 			spin_unlock_bh(&amp;target-&gt;rx_lock);</div><div class='del'>-			ath6kl_dbg(ATH6KL_DBG_HTC_RECV,</div><div class='del'>-				   "flushing rx pkt:0x%p, len:%d, ep:%d\n",</div><div class='add'>+			ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+				   "htc rx flush pkt 0x%p  len %d  ep %d\n",</div><div class='ctx'> 				   packet, packet-&gt;buf_len,</div><div class='ctx'> 				   packet-&gt;endpoint);</div><div class='ctx'> 			dev_kfree_skb(packet-&gt;pkt_cntxt);</div><div class='hunk'>@@ -2028,8 +2328,8 @@ int ath6kl_htc_conn_service(struct htc_target *target,</div><div class='ctx'> 	unsigned int max_msg_sz = 0;</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_TRC,</div><div class='del'>-		   "htc_conn_service, target:0x%p service id:0x%X\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_HTC,</div><div class='add'>+		   "htc connect service target 0x%p service id 0x%x\n",</div><div class='ctx'> 		   target, conn_req-&gt;svc_id);</div><div class='ctx'> </div><div class='ctx'> 	if (conn_req-&gt;svc_id == HTC_CTRL_RSVD_SVC) {</div><div class='hunk'>@@ -2115,7 +2415,7 @@ int ath6kl_htc_conn_service(struct htc_target *target,</div><div class='ctx'> 	endpoint-&gt;len_max = max_msg_sz;</div><div class='ctx'> 	endpoint-&gt;ep_cb = conn_req-&gt;ep_cb;</div><div class='ctx'> 	endpoint-&gt;cred_dist.svc_id = conn_req-&gt;svc_id;</div><div class='del'>-	endpoint-&gt;cred_dist.htc_rsvd = endpoint;</div><div class='add'>+	endpoint-&gt;cred_dist.htc_ep = endpoint;</div><div class='ctx'> 	endpoint-&gt;cred_dist.endpoint = assigned_ep;</div><div class='ctx'> 	endpoint-&gt;cred_dist.cred_sz = target-&gt;tgt_cred_sz;</div><div class='ctx'> </div><div class='hunk'>@@ -2172,6 +2472,7 @@ static void reset_ep_state(struct htc_target *target)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* reset distribution list */</div><div class='add'>+	/* FIXME: free existing entries */</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;target-&gt;cred_dist_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2201,8 +2502,8 @@ static void htc_setup_msg_bndl(struct htc_target *target)</div><div class='ctx'> 	target-&gt;msg_per_bndl_max = min(target-&gt;max_scat_entries,</div><div class='ctx'> 				       target-&gt;msg_per_bndl_max);</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_TRC,</div><div class='del'>-		   "htc bundling allowed. max msg per htc bundle: %d\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_BOOT,</div><div class='add'>+		   "htc bundling allowed msg_per_bndl_max %d\n",</div><div class='ctx'> 		   target-&gt;msg_per_bndl_max);</div><div class='ctx'> </div><div class='ctx'> 	/* Max rx bundle size is limited by the max tx bundle size */</div><div class='hunk'>@@ -2211,7 +2512,7 @@ static void htc_setup_msg_bndl(struct htc_target *target)</div><div class='ctx'> 	target-&gt;max_tx_bndl_sz = min(HIF_MBOX0_EXT_WIDTH,</div><div class='ctx'> 				     target-&gt;max_xfer_szper_scatreq);</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_ANY, "max recv: %d max send: %d\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_BOOT, "htc max_rx_bndl_sz %d max_tx_bndl_sz %d\n",</div><div class='ctx'> 		   target-&gt;max_rx_bndl_sz, target-&gt;max_tx_bndl_sz);</div><div class='ctx'> </div><div class='ctx'> 	if (target-&gt;max_tx_bndl_sz)</div><div class='hunk'>@@ -2265,8 +2566,8 @@ int ath6kl_htc_wait_target(struct htc_target *target)</div><div class='ctx'> 	target-&gt;tgt_creds = le16_to_cpu(rdy_msg-&gt;ver2_0_info.cred_cnt);</div><div class='ctx'> 	target-&gt;tgt_cred_sz = le16_to_cpu(rdy_msg-&gt;ver2_0_info.cred_sz);</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_HTC_RECV,</div><div class='del'>-		   "target ready: credits: %d credit size: %d\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_BOOT,</div><div class='add'>+		   "htc target ready credits %d size %d\n",</div><div class='ctx'> 		   target-&gt;tgt_creds, target-&gt;tgt_cred_sz);</div><div class='ctx'> </div><div class='ctx'> 	/* check if this is an extended ready message */</div><div class='hunk'>@@ -2280,7 +2581,7 @@ int ath6kl_htc_wait_target(struct htc_target *target)</div><div class='ctx'> 		target-&gt;msg_per_bndl_max = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_TRC, "using htc protocol version : %s (%d)\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_BOOT, "htc using protocol %s (%d)\n",</div><div class='ctx'> 		  (target-&gt;htc_tgt_ver == HTC_VERSION_2P0) ? "2.0" : "&gt;= 2.1",</div><div class='ctx'> 		  target-&gt;htc_tgt_ver);</div><div class='ctx'> </div><div class='hunk'>@@ -2300,6 +2601,10 @@ int ath6kl_htc_wait_target(struct htc_target *target)</div><div class='ctx'> 	status = ath6kl_htc_conn_service((void *)target, &amp;connect, &amp;resp);</div><div class='ctx'> </div><div class='ctx'> 	if (status)</div><div class='add'>+		/*</div><div class='add'>+		 * FIXME: this call doesn't make sense, the caller should</div><div class='add'>+		 * call ath6kl_htc_cleanup() when it wants remove htc</div><div class='add'>+		 */</div><div class='ctx'> 		ath6kl_hif_cleanup_scatter(target-&gt;dev-&gt;ar);</div><div class='ctx'> </div><div class='ctx'> fail_wait_target:</div><div class='hunk'>@@ -2320,8 +2625,11 @@ int ath6kl_htc_start(struct htc_target *target)</div><div class='ctx'> 	struct htc_packet *packet;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;target-&gt;dev-&gt;irq_proc_reg, 0,</div><div class='add'>+	       sizeof(target-&gt;dev-&gt;irq_proc_reg));</div><div class='add'>+</div><div class='ctx'> 	/* Disable interrupts at the chip level */</div><div class='del'>-	ath6kldev_disable_intrs(target-&gt;dev);</div><div class='add'>+	ath6kl_hif_disable_intrs(target-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	target-&gt;htc_flags = 0;</div><div class='ctx'> 	target-&gt;rx_st_flags = 0;</div><div class='hunk'>@@ -2334,8 +2642,8 @@ int ath6kl_htc_start(struct htc_target *target)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* NOTE: the first entry in the distribution list is ENDPOINT_0 */</div><div class='del'>-	ath6k_credit_init(target-&gt;cred_dist_cntxt, &amp;target-&gt;cred_dist_list,</div><div class='del'>-			  target-&gt;tgt_creds);</div><div class='add'>+	ath6kl_credit_init(target-&gt;credit_info, &amp;target-&gt;cred_dist_list,</div><div class='add'>+			   target-&gt;tgt_creds);</div><div class='ctx'> </div><div class='ctx'> 	dump_cred_dist_stats(target);</div><div class='ctx'> </div><div class='hunk'>@@ -2346,7 +2654,7 @@ int ath6kl_htc_start(struct htc_target *target)</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='ctx'> 	/* unmask interrupts */</div><div class='del'>-	status = ath6kldev_unmask_intrs(target-&gt;dev);</div><div class='add'>+	status = ath6kl_hif_unmask_intrs(target-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (status)</div><div class='ctx'> 		ath6kl_htc_stop(target);</div><div class='hunk'>@@ -2354,6 +2662,44 @@ int ath6kl_htc_start(struct htc_target *target)</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath6kl_htc_reset(struct htc_target *target)</div><div class='add'>+{</div><div class='add'>+	u32 block_size, ctrl_bufsz;</div><div class='add'>+	struct htc_packet *packet;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	reset_ep_state(target);</div><div class='add'>+</div><div class='add'>+	block_size = target-&gt;dev-&gt;ar-&gt;mbox_info.block_size;</div><div class='add'>+</div><div class='add'>+	ctrl_bufsz = (block_size &gt; HTC_MAX_CTRL_MSG_LEN) ?</div><div class='add'>+		      (block_size + HTC_HDR_LENGTH) :</div><div class='add'>+		      (HTC_MAX_CTRL_MSG_LEN + HTC_HDR_LENGTH);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_CONTROL_BUFFERS; i++) {</div><div class='add'>+		packet = kzalloc(sizeof(*packet), GFP_KERNEL);</div><div class='add'>+		if (!packet)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		packet-&gt;buf_start = kzalloc(ctrl_bufsz, GFP_KERNEL);</div><div class='add'>+		if (!packet-&gt;buf_start) {</div><div class='add'>+			kfree(packet);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		packet-&gt;buf_len = ctrl_bufsz;</div><div class='add'>+		if (i &lt; NUM_CONTROL_RX_BUFFERS) {</div><div class='add'>+			packet-&gt;act_len = 0;</div><div class='add'>+			packet-&gt;buf = packet-&gt;buf_start;</div><div class='add'>+			packet-&gt;endpoint = ENDPOINT_0;</div><div class='add'>+			list_add_tail(&amp;packet-&gt;list, &amp;target-&gt;free_ctrl_rxbuf);</div><div class='add'>+		} else</div><div class='add'>+			list_add_tail(&amp;packet-&gt;list, &amp;target-&gt;free_ctrl_txbuf);</div><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'> /* htc_stop: stop interrupt reception, and flush all queued buffers */</div><div class='ctx'> void ath6kl_htc_stop(struct htc_target *target)</div><div class='ctx'> {</div><div class='hunk'>@@ -2366,21 +2712,19 @@ void ath6kl_htc_stop(struct htc_target *target)</div><div class='ctx'> 	 * function returns all pending HIF I/O has completed, we can</div><div class='ctx'> 	 * safely flush the queues.</div><div class='ctx'> 	 */</div><div class='del'>-	ath6kldev_mask_intrs(target-&gt;dev);</div><div class='add'>+	ath6kl_hif_mask_intrs(target-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_htc_flush_txep_all(target);</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_htc_flush_rx_buf(target);</div><div class='ctx'> </div><div class='del'>-	reset_ep_state(target);</div><div class='add'>+	ath6kl_htc_reset(target);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void *ath6kl_htc_create(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='ctx'> 	struct htc_target *target = NULL;</div><div class='del'>-	struct htc_packet *packet;</div><div class='del'>-	int status = 0, i = 0;</div><div class='del'>-	u32 block_size, ctrl_bufsz;</div><div class='add'>+	int status = 0;</div><div class='ctx'> </div><div class='ctx'> 	target = kzalloc(sizeof(*target), GFP_KERNEL);</div><div class='ctx'> 	if (!target) {</div><div class='hunk'>@@ -2392,7 +2736,7 @@ void *ath6kl_htc_create(struct ath6kl *ar)</div><div class='ctx'> 	if (!target-&gt;dev) {</div><div class='ctx'> 		ath6kl_err("unable to allocate memory\n");</div><div class='ctx'> 		status = -ENOMEM;</div><div class='del'>-		goto fail_create_htc;</div><div class='add'>+		goto err_htc_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;target-&gt;htc_lock);</div><div class='hunk'>@@ -2407,49 +2751,20 @@ void *ath6kl_htc_create(struct ath6kl *ar)</div><div class='ctx'> 	target-&gt;dev-&gt;htc_cnxt = target;</div><div class='ctx'> 	target-&gt;ep_waiting = ENDPOINT_MAX;</div><div class='ctx'> </div><div class='del'>-	reset_ep_state(target);</div><div class='del'>-</div><div class='del'>-	status = ath6kldev_setup(target-&gt;dev);</div><div class='del'>-</div><div class='add'>+	status = ath6kl_hif_setup(target-&gt;dev);</div><div class='ctx'> 	if (status)</div><div class='del'>-		goto fail_create_htc;</div><div class='del'>-</div><div class='del'>-	block_size = ar-&gt;mbox_info.block_size;</div><div class='del'>-</div><div class='del'>-	ctrl_bufsz = (block_size &gt; HTC_MAX_CTRL_MSG_LEN) ?</div><div class='del'>-		      (block_size + HTC_HDR_LENGTH) :</div><div class='del'>-		      (HTC_MAX_CTRL_MSG_LEN + HTC_HDR_LENGTH);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_CONTROL_BUFFERS; i++) {</div><div class='del'>-		packet = kzalloc(sizeof(*packet), GFP_KERNEL);</div><div class='del'>-		if (!packet)</div><div class='del'>-			break;</div><div class='add'>+		goto err_htc_cleanup;</div><div class='ctx'> </div><div class='del'>-		packet-&gt;buf_start = kzalloc(ctrl_bufsz, GFP_KERNEL);</div><div class='del'>-		if (!packet-&gt;buf_start) {</div><div class='del'>-			kfree(packet);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	status = ath6kl_htc_reset(target);</div><div class='add'>+	if (status)</div><div class='add'>+		goto err_htc_cleanup;</div><div class='ctx'> </div><div class='del'>-		packet-&gt;buf_len = ctrl_bufsz;</div><div class='del'>-		if (i &lt; NUM_CONTROL_RX_BUFFERS) {</div><div class='del'>-			packet-&gt;act_len = 0;</div><div class='del'>-			packet-&gt;buf = packet-&gt;buf_start;</div><div class='del'>-			packet-&gt;endpoint = ENDPOINT_0;</div><div class='del'>-			list_add_tail(&amp;packet-&gt;list, &amp;target-&gt;free_ctrl_rxbuf);</div><div class='del'>-		} else</div><div class='del'>-			list_add_tail(&amp;packet-&gt;list, &amp;target-&gt;free_ctrl_txbuf);</div><div class='del'>-	}</div><div class='add'>+	return target;</div><div class='ctx'> </div><div class='del'>-fail_create_htc:</div><div class='del'>-	if (i != NUM_CONTROL_BUFFERS || status) {</div><div class='del'>-		if (target) {</div><div class='del'>-			ath6kl_htc_cleanup(target);</div><div class='del'>-			target = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+err_htc_cleanup:</div><div class='add'>+	ath6kl_htc_cleanup(target);</div><div class='ctx'> </div><div class='del'>-	return target;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* cleanup the HTC instance */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/htc.h b/drivers/net/wireless/ath/ath6kl/htc.h<br/>index 8ce0c2c07ded..57672e1ed1a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/htc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/htc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/htc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/htc.h</a></div><div class='hunk'>@@ -393,7 +393,7 @@ struct htc_endpoint_credit_dist {</div><div class='ctx'> 	int cred_per_msg;</div><div class='ctx'> </div><div class='ctx'> 	/* reserved for HTC use */</div><div class='del'>-	void *htc_rsvd;</div><div class='add'>+	struct htc_endpoint *htc_ep;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * current depth of TX queue , i.e. messages waiting for credits</div><div class='hunk'>@@ -414,9 +414,11 @@ enum htc_credit_dist_reason {</div><div class='ctx'> 	HTC_CREDIT_DIST_SEEK_CREDITS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct htc_credit_state_info {</div><div class='add'>+struct ath6kl_htc_credit_info {</div><div class='ctx'> 	int total_avail_credits;</div><div class='ctx'> 	int cur_free_credits;</div><div class='add'>+</div><div class='add'>+	/* list of lowest priority endpoints */</div><div class='ctx'> 	struct list_head lowestpri_ep_dist;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -508,10 +510,13 @@ struct ath6kl_device;</div><div class='ctx'> /* our HTC target state */</div><div class='ctx'> struct htc_target {</div><div class='ctx'> 	struct htc_endpoint endpoint[ENDPOINT_MAX];</div><div class='add'>+</div><div class='add'>+	/* contains struct htc_endpoint_credit_dist */</div><div class='ctx'> 	struct list_head cred_dist_list;</div><div class='add'>+</div><div class='ctx'> 	struct list_head free_ctrl_txbuf;</div><div class='ctx'> 	struct list_head free_ctrl_rxbuf;</div><div class='del'>-	struct htc_credit_state_info *cred_dist_cntxt;</div><div class='add'>+	struct ath6kl_htc_credit_info *credit_info;</div><div class='ctx'> 	int tgt_creds;</div><div class='ctx'> 	unsigned int tgt_cred_sz;</div><div class='ctx'> 	spinlock_t htc_lock;</div><div class='hunk'>@@ -542,7 +547,7 @@ struct htc_target {</div><div class='ctx'> </div><div class='ctx'> void *ath6kl_htc_create(struct ath6kl *ar);</div><div class='ctx'> void ath6kl_htc_set_credit_dist(struct htc_target *target,</div><div class='del'>-				struct htc_credit_state_info *cred_info,</div><div class='add'>+				struct ath6kl_htc_credit_info *cred_info,</div><div class='ctx'> 				u16 svc_pri_order[], int len);</div><div class='ctx'> int ath6kl_htc_wait_target(struct htc_target *target);</div><div class='ctx'> int ath6kl_htc_start(struct htc_target *target);</div><div class='hunk'>@@ -563,7 +568,10 @@ int ath6kl_htc_get_rxbuf_num(struct htc_target *target,</div><div class='ctx'> int ath6kl_htc_add_rxbuf_multiple(struct htc_target *target,</div><div class='ctx'> 				  struct list_head *pktq);</div><div class='ctx'> int ath6kl_htc_rxmsg_pending_handler(struct htc_target *target,</div><div class='del'>-				     u32 msg_look_ahead[], int *n_pkts);</div><div class='add'>+				     u32 msg_look_ahead, int *n_pkts);</div><div class='add'>+</div><div class='add'>+int ath6kl_credit_setup(void *htc_handle,</div><div class='add'>+			struct ath6kl_htc_credit_info *cred_info);</div><div class='ctx'> </div><div class='ctx'> static inline void set_htc_pkt_info(struct htc_packet *packet, void *context,</div><div class='ctx'> 				    u8 *buf, unsigned int len,</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/htc_hif.h b/drivers/net/wireless/ath/ath6kl/htc_hif.h<br/>deleted file mode 100644<br/>index 171ad63d89b0..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/htc_hif.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/htc_hif.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,92 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2007-2011 Atheros Communications Inc.</div><div class='del'>- *</div><div class='del'>- * Permission to use, copy, modify, and/or distribute this software for any</div><div class='del'>- * purpose with or without fee is hereby granted, provided that the above</div><div class='del'>- * copyright notice and this permission notice appear in all copies.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='del'>- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='del'>- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='del'>- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='del'>- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef HTC_HIF_H</div><div class='del'>-#define HTC_HIF_H</div><div class='del'>-</div><div class='del'>-#include "htc.h"</div><div class='del'>-#include "hif.h"</div><div class='del'>-</div><div class='del'>-#define ATH6KL_MAILBOXES	4</div><div class='del'>-</div><div class='del'>-/* HTC runs over mailbox 0 */</div><div class='del'>-#define HTC_MAILBOX	0</div><div class='del'>-</div><div class='del'>-#define ATH6KL_TARGET_DEBUG_INTR_MASK     0x01</div><div class='del'>-</div><div class='del'>-#define OTHER_INTS_ENABLED		(INT_STATUS_ENABLE_ERROR_MASK |	\</div><div class='del'>-					INT_STATUS_ENABLE_CPU_MASK   |	\</div><div class='del'>-					INT_STATUS_ENABLE_COUNTER_MASK)</div><div class='del'>-</div><div class='del'>-#define ATH6KL_REG_IO_BUFFER_SIZE			32</div><div class='del'>-#define ATH6KL_MAX_REG_IO_BUFFERS			8</div><div class='del'>-#define ATH6KL_SCATTER_ENTRIES_PER_REQ            16</div><div class='del'>-#define ATH6KL_MAX_TRANSFER_SIZE_PER_SCATTER      (16 * 1024)</div><div class='del'>-#define ATH6KL_SCATTER_REQS                       4</div><div class='del'>-</div><div class='del'>-#ifndef A_CACHE_LINE_PAD</div><div class='del'>-#define A_CACHE_LINE_PAD                        128</div><div class='del'>-#endif</div><div class='del'>-#define ATH6KL_MIN_SCATTER_ENTRIES_PER_REQ        2</div><div class='del'>-#define ATH6KL_MIN_TRANSFER_SIZE_PER_SCATTER      (4 * 1024)</div><div class='del'>-</div><div class='del'>-struct ath6kl_irq_proc_registers {</div><div class='del'>-	u8 host_int_status;</div><div class='del'>-	u8 cpu_int_status;</div><div class='del'>-	u8 error_int_status;</div><div class='del'>-	u8 counter_int_status;</div><div class='del'>-	u8 mbox_frame;</div><div class='del'>-	u8 rx_lkahd_valid;</div><div class='del'>-	u8 host_int_status2;</div><div class='del'>-	u8 gmbox_rx_avail;</div><div class='del'>-	__le32 rx_lkahd[2];</div><div class='del'>-	__le32 rx_gmbox_lkahd_alias[2];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct ath6kl_irq_enable_reg {</div><div class='del'>-	u8 int_status_en;</div><div class='del'>-	u8 cpu_int_status_en;</div><div class='del'>-	u8 err_int_status_en;</div><div class='del'>-	u8 cntr_int_status_en;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct ath6kl_device {</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-	u8 pad1[A_CACHE_LINE_PAD];</div><div class='del'>-	struct ath6kl_irq_proc_registers irq_proc_reg;</div><div class='del'>-	u8 pad2[A_CACHE_LINE_PAD];</div><div class='del'>-	struct ath6kl_irq_enable_reg irq_en_reg;</div><div class='del'>-	u8 pad3[A_CACHE_LINE_PAD];</div><div class='del'>-	struct htc_target *htc_cnxt;</div><div class='del'>-	struct ath6kl *ar;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int ath6kldev_setup(struct ath6kl_device *dev);</div><div class='del'>-int ath6kldev_unmask_intrs(struct ath6kl_device *dev);</div><div class='del'>-int ath6kldev_mask_intrs(struct ath6kl_device *dev);</div><div class='del'>-int ath6kldev_poll_mboxmsg_rx(struct ath6kl_device *dev,</div><div class='del'>-			      u32 *lk_ahd, int timeout);</div><div class='del'>-int ath6kldev_rx_control(struct ath6kl_device *dev, bool enable_rx);</div><div class='del'>-int ath6kldev_disable_intrs(struct ath6kl_device *dev);</div><div class='del'>-</div><div class='del'>-int ath6kldev_rw_comp_handler(void *context, int status);</div><div class='del'>-int ath6kldev_intr_bh_handler(struct ath6kl *ar);</div><div class='del'>-</div><div class='del'>-/* Scatter Function and Definitions */</div><div class='del'>-int ath6kldev_submit_scat_req(struct ath6kl_device *dev,</div><div class='del'>-			    struct hif_scatter_req *scat_req, bool read);</div><div class='del'>-</div><div class='del'>-#endif /*ATH6KL_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c<br/>index c1d2366704b5..7f55be3092d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/init.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/sdio_func.h&gt;</div><div class='ctx'> #include "core.h"</div><div class='hunk'>@@ -26,9 +27,85 @@</div><div class='ctx'> </div><div class='ctx'> unsigned int debug_mask;</div><div class='ctx'> static unsigned int testmode;</div><div class='add'>+static bool suspend_cutpower;</div><div class='ctx'> </div><div class='ctx'> module_param(debug_mask, uint, 0644);</div><div class='ctx'> module_param(testmode, uint, 0644);</div><div class='add'>+module_param(suspend_cutpower, bool, 0444);</div><div class='add'>+</div><div class='add'>+static const struct ath6kl_hw hw_list[] = {</div><div class='add'>+	{</div><div class='add'>+		.id				= AR6003_HW_2_0_VERSION,</div><div class='add'>+		.name				= "ar6003 hw 2.0",</div><div class='add'>+		.dataset_patch_addr		= 0x57e884,</div><div class='add'>+		.app_load_addr			= 0x543180,</div><div class='add'>+		.board_ext_data_addr		= 0x57e500,</div><div class='add'>+		.reserved_ram_size		= 6912,</div><div class='add'>+		.refclk_hz			= 26000000,</div><div class='add'>+		.uarttx_pin			= 8,</div><div class='add'>+</div><div class='add'>+		/* hw2.0 needs override address hardcoded */</div><div class='add'>+		.app_start_override_addr	= 0x944C00,</div><div class='add'>+</div><div class='add'>+		.fw_otp			= AR6003_HW_2_0_OTP_FILE,</div><div class='add'>+		.fw			= AR6003_HW_2_0_FIRMWARE_FILE,</div><div class='add'>+		.fw_tcmd		= AR6003_HW_2_0_TCMD_FIRMWARE_FILE,</div><div class='add'>+		.fw_patch		= AR6003_HW_2_0_PATCH_FILE,</div><div class='add'>+		.fw_api2		= AR6003_HW_2_0_FIRMWARE_2_FILE,</div><div class='add'>+		.fw_board		= AR6003_HW_2_0_BOARD_DATA_FILE,</div><div class='add'>+		.fw_default_board	= AR6003_HW_2_0_DEFAULT_BOARD_DATA_FILE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id				= AR6003_HW_2_1_1_VERSION,</div><div class='add'>+		.name				= "ar6003 hw 2.1.1",</div><div class='add'>+		.dataset_patch_addr		= 0x57ff74,</div><div class='add'>+		.app_load_addr			= 0x1234,</div><div class='add'>+		.board_ext_data_addr		= 0x542330,</div><div class='add'>+		.reserved_ram_size		= 512,</div><div class='add'>+		.refclk_hz			= 26000000,</div><div class='add'>+		.uarttx_pin			= 8,</div><div class='add'>+</div><div class='add'>+		.fw_otp			= AR6003_HW_2_1_1_OTP_FILE,</div><div class='add'>+		.fw			= AR6003_HW_2_1_1_FIRMWARE_FILE,</div><div class='add'>+		.fw_tcmd		= AR6003_HW_2_1_1_TCMD_FIRMWARE_FILE,</div><div class='add'>+		.fw_patch		= AR6003_HW_2_1_1_PATCH_FILE,</div><div class='add'>+		.fw_api2		= AR6003_HW_2_1_1_FIRMWARE_2_FILE,</div><div class='add'>+		.fw_board		= AR6003_HW_2_1_1_BOARD_DATA_FILE,</div><div class='add'>+		.fw_default_board	= AR6003_HW_2_1_1_DEFAULT_BOARD_DATA_FILE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id				= AR6004_HW_1_0_VERSION,</div><div class='add'>+		.name				= "ar6004 hw 1.0",</div><div class='add'>+		.dataset_patch_addr		= 0x57e884,</div><div class='add'>+		.app_load_addr			= 0x1234,</div><div class='add'>+		.board_ext_data_addr		= 0x437000,</div><div class='add'>+		.reserved_ram_size		= 19456,</div><div class='add'>+		.board_addr			= 0x433900,</div><div class='add'>+		.refclk_hz			= 26000000,</div><div class='add'>+		.uarttx_pin			= 11,</div><div class='add'>+</div><div class='add'>+		.fw			= AR6004_HW_1_0_FIRMWARE_FILE,</div><div class='add'>+		.fw_api2		= AR6004_HW_1_0_FIRMWARE_2_FILE,</div><div class='add'>+		.fw_board		= AR6004_HW_1_0_BOARD_DATA_FILE,</div><div class='add'>+		.fw_default_board	= AR6004_HW_1_0_DEFAULT_BOARD_DATA_FILE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id				= AR6004_HW_1_1_VERSION,</div><div class='add'>+		.name				= "ar6004 hw 1.1",</div><div class='add'>+		.dataset_patch_addr		= 0x57e884,</div><div class='add'>+		.app_load_addr			= 0x1234,</div><div class='add'>+		.board_ext_data_addr		= 0x437000,</div><div class='add'>+		.reserved_ram_size		= 11264,</div><div class='add'>+		.board_addr			= 0x43d400,</div><div class='add'>+		.refclk_hz			= 40000000,</div><div class='add'>+		.uarttx_pin			= 11,</div><div class='add'>+</div><div class='add'>+		.fw			= AR6004_HW_1_1_FIRMWARE_FILE,</div><div class='add'>+		.fw_api2		= AR6004_HW_1_1_FIRMWARE_2_FILE,</div><div class='add'>+		.fw_board		= AR6004_HW_1_1_BOARD_DATA_FILE,</div><div class='add'>+		.fw_default_board	= AR6004_HW_1_1_DEFAULT_BOARD_DATA_FILE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Include definitions here that can be used to tune the WLAN module</div><div class='hunk'>@@ -55,7 +132,6 @@ module_param(testmode, uint, 0644);</div><div class='ctx'>  */</div><div class='ctx'> #define WLAN_CONFIG_DISCONNECT_TIMEOUT 10</div><div class='ctx'> </div><div class='del'>-#define CONFIG_AR600x_DEBUG_UART_TX_PIN 8</div><div class='ctx'> </div><div class='ctx'> #define ATH6KL_DATA_OFFSET    64</div><div class='ctx'> struct sk_buff *ath6kl_buf_alloc(int size)</div><div class='hunk'>@@ -73,37 +149,21 @@ struct sk_buff *ath6kl_buf_alloc(int size)</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_init_profile_info(struct ath6kl *ar)</div><div class='add'>+void ath6kl_init_profile_info(struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	ar-&gt;ssid_len = 0;</div><div class='del'>-	memset(ar-&gt;ssid, 0, sizeof(ar-&gt;ssid));</div><div class='del'>-</div><div class='del'>-	ar-&gt;dot11_auth_mode = OPEN_AUTH;</div><div class='del'>-	ar-&gt;auth_mode = NONE_AUTH;</div><div class='del'>-	ar-&gt;prwise_crypto = NONE_CRYPT;</div><div class='del'>-	ar-&gt;prwise_crypto_len = 0;</div><div class='del'>-	ar-&gt;grp_crypto = NONE_CRYPT;</div><div class='del'>-	ar-&gt;grp_crypto_len = 0;</div><div class='del'>-	memset(ar-&gt;wep_key_list, 0, sizeof(ar-&gt;wep_key_list));</div><div class='del'>-	memset(ar-&gt;req_bssid, 0, sizeof(ar-&gt;req_bssid));</div><div class='del'>-	memset(ar-&gt;bssid, 0, sizeof(ar-&gt;bssid));</div><div class='del'>-	ar-&gt;bss_ch = 0;</div><div class='del'>-	ar-&gt;nw_type = ar-&gt;next_mode = INFRA_NETWORK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 ath6kl_get_fw_iftype(struct ath6kl *ar)</div><div class='del'>-{</div><div class='del'>-	switch (ar-&gt;nw_type) {</div><div class='del'>-	case INFRA_NETWORK:</div><div class='del'>-		return HI_OPTION_FW_MODE_BSS_STA;</div><div class='del'>-	case ADHOC_NETWORK:</div><div class='del'>-		return HI_OPTION_FW_MODE_IBSS;</div><div class='del'>-	case AP_NETWORK:</div><div class='del'>-		return HI_OPTION_FW_MODE_AP;</div><div class='del'>-	default:</div><div class='del'>-		ath6kl_err("Unsupported interface type :%d\n", ar-&gt;nw_type);</div><div class='del'>-		return 0xff;</div><div class='del'>-	}</div><div class='add'>+	vif-&gt;ssid_len = 0;</div><div class='add'>+	memset(vif-&gt;ssid, 0, sizeof(vif-&gt;ssid));</div><div class='add'>+</div><div class='add'>+	vif-&gt;dot11_auth_mode = OPEN_AUTH;</div><div class='add'>+	vif-&gt;auth_mode = NONE_AUTH;</div><div class='add'>+	vif-&gt;prwise_crypto = NONE_CRYPT;</div><div class='add'>+	vif-&gt;prwise_crypto_len = 0;</div><div class='add'>+	vif-&gt;grp_crypto = NONE_CRYPT;</div><div class='add'>+	vif-&gt;grp_crypto_len = 0;</div><div class='add'>+	memset(vif-&gt;wep_key_list, 0, sizeof(vif-&gt;wep_key_list));</div><div class='add'>+	memset(vif-&gt;req_bssid, 0, sizeof(vif-&gt;req_bssid));</div><div class='add'>+	memset(vif-&gt;bssid, 0, sizeof(vif-&gt;bssid));</div><div class='add'>+	vif-&gt;bss_ch = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_set_host_app_area(struct ath6kl *ar)</div><div class='hunk'>@@ -120,7 +180,7 @@ static int ath6kl_set_host_app_area(struct ath6kl *ar)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	address = TARG_VTOP(ar-&gt;target_type, data);</div><div class='del'>-	host_app_area.wmi_protocol_ver = WMI_PROTOCOL_VERSION;</div><div class='add'>+	host_app_area.wmi_protocol_ver = cpu_to_le32(WMI_PROTOCOL_VERSION);</div><div class='ctx'> 	if (ath6kl_diag_write(ar, address, (u8 *) &amp;host_app_area,</div><div class='ctx'> 			      sizeof(struct host_app_area)))</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -258,40 +318,12 @@ static int ath6kl_init_service_ep(struct ath6kl *ar)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath6kl_init_control_info(struct ath6kl *ar)</div><div class='add'>+void ath6kl_init_control_info(struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	u8 ctr;</div><div class='del'>-</div><div class='del'>-	clear_bit(WMI_ENABLED, &amp;ar-&gt;flag);</div><div class='del'>-	ath6kl_init_profile_info(ar);</div><div class='del'>-	ar-&gt;def_txkey_index = 0;</div><div class='del'>-	memset(ar-&gt;wep_key_list, 0, sizeof(ar-&gt;wep_key_list));</div><div class='del'>-	ar-&gt;ch_hint = 0;</div><div class='del'>-	ar-&gt;listen_intvl_t = A_DEFAULT_LISTEN_INTERVAL;</div><div class='del'>-	ar-&gt;listen_intvl_b = 0;</div><div class='del'>-	ar-&gt;tx_pwr = 0;</div><div class='del'>-	clear_bit(SKIP_SCAN, &amp;ar-&gt;flag);</div><div class='del'>-	set_bit(WMM_ENABLED, &amp;ar-&gt;flag);</div><div class='del'>-	ar-&gt;intra_bss = 1;</div><div class='del'>-	memset(&amp;ar-&gt;sc_params, 0, sizeof(ar-&gt;sc_params));</div><div class='del'>-	ar-&gt;sc_params.short_scan_ratio = WMI_SHORTSCANRATIO_DEFAULT;</div><div class='del'>-	ar-&gt;sc_params.scan_ctrl_flags = DEFAULT_SCAN_CTRL_FLAGS;</div><div class='del'>-	ar-&gt;lrssi_roam_threshold = DEF_LRSSI_ROAM_THRESHOLD;</div><div class='del'>-</div><div class='del'>-	memset((u8 *)ar-&gt;sta_list, 0,</div><div class='del'>-	       AP_MAX_NUM_STA * sizeof(struct ath6kl_sta));</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;ar-&gt;mcastpsq_lock);</div><div class='del'>-</div><div class='del'>-	/* Init the PS queues */</div><div class='del'>-	for (ctr = 0; ctr &lt; AP_MAX_NUM_STA; ctr++) {</div><div class='del'>-		spin_lock_init(&amp;ar-&gt;sta_list[ctr].psq_lock);</div><div class='del'>-		skb_queue_head_init(&amp;ar-&gt;sta_list[ctr].psq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_queue_head_init(&amp;ar-&gt;mcastpsq);</div><div class='del'>-</div><div class='del'>-	memcpy(ar-&gt;ap_country_code, DEF_AP_COUNTRY_CODE, 3);</div><div class='add'>+	ath6kl_init_profile_info(vif);</div><div class='add'>+	vif-&gt;def_txkey_index = 0;</div><div class='add'>+	memset(vif-&gt;wep_key_list, 0, sizeof(vif-&gt;wep_key_list));</div><div class='add'>+	vif-&gt;ch_hint = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -341,62 +373,7 @@ out:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define REG_DUMP_COUNT_AR6003   60</div><div class='del'>-#define REGISTER_DUMP_LEN_MAX   60</div><div class='del'>-</div><div class='del'>-static void ath6kl_dump_target_assert_info(struct ath6kl *ar)</div><div class='del'>-{</div><div class='del'>-	u32 address;</div><div class='del'>-	u32 regdump_loc = 0;</div><div class='del'>-	int status;</div><div class='del'>-	u32 regdump_val[REGISTER_DUMP_LEN_MAX];</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	if (ar-&gt;target_type != TARGET_TYPE_AR6003)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* the reg dump pointer is copied to the host interest area */</div><div class='del'>-	address = ath6kl_get_hi_item_addr(ar, HI_ITEM(hi_failure_state));</div><div class='del'>-	address = TARG_VTOP(ar-&gt;target_type, address);</div><div class='del'>-</div><div class='del'>-	/* read RAM location through diagnostic window */</div><div class='del'>-	status = ath6kl_diag_read32(ar, address, &amp;regdump_loc);</div><div class='del'>-</div><div class='del'>-	if (status || !regdump_loc) {</div><div class='del'>-		ath6kl_err("failed to get ptr to register dump area\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_TRC, "location of register dump data: 0x%X\n",</div><div class='del'>-		regdump_loc);</div><div class='del'>-	regdump_loc = TARG_VTOP(ar-&gt;target_type, regdump_loc);</div><div class='del'>-</div><div class='del'>-	/* fetch register dump data */</div><div class='del'>-	status = ath6kl_diag_read(ar, regdump_loc, (u8 *)&amp;regdump_val[0],</div><div class='del'>-				  REG_DUMP_COUNT_AR6003 * (sizeof(u32)));</div><div class='del'>-</div><div class='del'>-	if (status) {</div><div class='del'>-		ath6kl_err("failed to get register dump\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_TRC, "Register Dump:\n");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; REG_DUMP_COUNT_AR6003; i++)</div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_TRC, " %d :  0x%8.8X\n",</div><div class='del'>-			   i, regdump_val[i]);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ath6kl_target_failure(struct ath6kl *ar)</div><div class='del'>-{</div><div class='del'>-	ath6kl_err("target asserted\n");</div><div class='del'>-</div><div class='del'>-	/* try dumping target assertion information (if any) */</div><div class='del'>-	ath6kl_dump_target_assert_info(ar);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ath6kl_target_config_wlan_params(struct ath6kl *ar)</div><div class='add'>+static int ath6kl_target_config_wlan_params(struct ath6kl *ar, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -406,46 +383,46 @@ static int ath6kl_target_config_wlan_params(struct ath6kl *ar)</div><div class='ctx'> 	 * default values. Required if checksum offload is needed. Set</div><div class='ctx'> 	 * RxMetaVersion to 2.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ath6kl_wmi_set_rx_frame_format_cmd(ar-&gt;wmi,</div><div class='add'>+	if (ath6kl_wmi_set_rx_frame_format_cmd(ar-&gt;wmi, idx,</div><div class='ctx'> 					       ar-&gt;rx_meta_ver, 0, 0)) {</div><div class='ctx'> 		ath6kl_err("unable to set the rx frame format\n");</div><div class='ctx'> 		status = -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ar-&gt;conf_flags &amp; ATH6KL_CONF_IGNORE_PS_FAIL_EVT_IN_SCAN)</div><div class='del'>-		if ((ath6kl_wmi_pmparams_cmd(ar-&gt;wmi, 0, 1, 0, 0, 1,</div><div class='add'>+		if ((ath6kl_wmi_pmparams_cmd(ar-&gt;wmi, idx, 0, 1, 0, 0, 1,</div><div class='ctx'> 		     IGNORE_POWER_SAVE_FAIL_EVENT_DURING_SCAN)) != 0) {</div><div class='ctx'> 			ath6kl_err("unable to set power save fail event policy\n");</div><div class='ctx'> 			status = -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	if (!(ar-&gt;conf_flags &amp; ATH6KL_CONF_IGNORE_ERP_BARKER))</div><div class='del'>-		if ((ath6kl_wmi_set_lpreamble_cmd(ar-&gt;wmi, 0,</div><div class='add'>+		if ((ath6kl_wmi_set_lpreamble_cmd(ar-&gt;wmi, idx, 0,</div><div class='ctx'> 		     WMI_DONOT_IGNORE_BARKER_IN_ERP)) != 0) {</div><div class='ctx'> 			ath6kl_err("unable to set barker preamble policy\n");</div><div class='ctx'> 			status = -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	if (ath6kl_wmi_set_keepalive_cmd(ar-&gt;wmi,</div><div class='add'>+	if (ath6kl_wmi_set_keepalive_cmd(ar-&gt;wmi, idx,</div><div class='ctx'> 			WLAN_CONFIG_KEEP_ALIVE_INTERVAL)) {</div><div class='ctx'> 		ath6kl_err("unable to set keep alive interval\n");</div><div class='ctx'> 		status = -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ath6kl_wmi_disctimeout_cmd(ar-&gt;wmi,</div><div class='add'>+	if (ath6kl_wmi_disctimeout_cmd(ar-&gt;wmi, idx,</div><div class='ctx'> 			WLAN_CONFIG_DISCONNECT_TIMEOUT)) {</div><div class='ctx'> 		ath6kl_err("unable to set disconnect timeout\n");</div><div class='ctx'> 		status = -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(ar-&gt;conf_flags &amp; ATH6KL_CONF_ENABLE_TX_BURST))</div><div class='del'>-		if (ath6kl_wmi_set_wmm_txop(ar-&gt;wmi, WMI_TXOP_DISABLED)) {</div><div class='add'>+		if (ath6kl_wmi_set_wmm_txop(ar-&gt;wmi, idx, WMI_TXOP_DISABLED)) {</div><div class='ctx'> 			ath6kl_err("unable to set txop bursting\n");</div><div class='ctx'> 			status = -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;p2p) {</div><div class='del'>-		ret = ath6kl_wmi_info_req_cmd(ar-&gt;wmi,</div><div class='add'>+	if (ar-&gt;p2p &amp;&amp; (ar-&gt;vif_max == 1 || idx)) {</div><div class='add'>+		ret = ath6kl_wmi_info_req_cmd(ar-&gt;wmi, idx,</div><div class='ctx'> 					      P2P_FLAG_CAPABILITIES_REQ |</div><div class='ctx'> 					      P2P_FLAG_MACADDR_REQ |</div><div class='ctx'> 					      P2P_FLAG_HMODEL_REQ);</div><div class='hunk'>@@ -453,13 +430,13 @@ static int ath6kl_target_config_wlan_params(struct ath6kl *ar)</div><div class='ctx'> 			ath6kl_dbg(ATH6KL_DBG_TRC, "failed to request P2P "</div><div class='ctx'> 				   "capabilities (%d) - assuming P2P not "</div><div class='ctx'> 				   "supported\n", ret);</div><div class='del'>-			ar-&gt;p2p = 0;</div><div class='add'>+			ar-&gt;p2p = false;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;p2p) {</div><div class='add'>+	if (ar-&gt;p2p &amp;&amp; (ar-&gt;vif_max == 1 || idx)) {</div><div class='ctx'> 		/* Enable Probe Request reporting for P2P */</div><div class='del'>-		ret = ath6kl_wmi_probe_report_req_cmd(ar-&gt;wmi, true);</div><div class='add'>+		ret = ath6kl_wmi_probe_report_req_cmd(ar-&gt;wmi, idx, true);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ath6kl_dbg(ATH6KL_DBG_TRC, "failed to enable Probe "</div><div class='ctx'> 				   "Request reporting (%d)\n", ret);</div><div class='hunk'>@@ -472,13 +449,40 @@ static int ath6kl_target_config_wlan_params(struct ath6kl *ar)</div><div class='ctx'> int ath6kl_configure_target(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='ctx'> 	u32 param, ram_reserved_size;</div><div class='del'>-	u8 fw_iftype;</div><div class='add'>+	u8 fw_iftype, fw_mode = 0, fw_submode = 0;</div><div class='add'>+	int i, status;</div><div class='ctx'> </div><div class='del'>-	fw_iftype = ath6kl_get_fw_iftype(ar);</div><div class='del'>-	if (fw_iftype == 0xff)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	/*</div><div class='add'>+	 * Note: Even though the firmware interface type is</div><div class='add'>+	 * chosen as BSS_STA for all three interfaces, can</div><div class='add'>+	 * be configured to IBSS/AP as long as the fw submode</div><div class='add'>+	 * remains normal mode (0 - AP, STA and IBSS). But</div><div class='add'>+	 * due to an target assert in firmware only one interface is</div><div class='add'>+	 * configured for now.</div><div class='add'>+	 */</div><div class='add'>+	fw_iftype = HI_OPTION_FW_MODE_BSS_STA;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ar-&gt;vif_max; i++)</div><div class='add'>+		fw_mode |= fw_iftype &lt;&lt; (i * HI_OPTION_FW_MODE_BITS);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * By default, submodes :</div><div class='add'>+	 *		vif[0] - AP/STA/IBSS</div><div class='add'>+	 *		vif[1] - "P2P dev"/"P2P GO"/"P2P Client"</div><div class='add'>+	 *		vif[2] - "P2P dev"/"P2P GO"/"P2P Client"</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ar-&gt;max_norm_iface; i++)</div><div class='add'>+		fw_submode |= HI_OPTION_FW_SUBMODE_NONE &lt;&lt;</div><div class='add'>+			      (i * HI_OPTION_FW_SUBMODE_BITS);</div><div class='add'>+</div><div class='add'>+	for (i = ar-&gt;max_norm_iface; i &lt; ar-&gt;vif_max; i++)</div><div class='add'>+		fw_submode |= HI_OPTION_FW_SUBMODE_P2PDEV &lt;&lt;</div><div class='add'>+			      (i * HI_OPTION_FW_SUBMODE_BITS);</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;p2p &amp;&amp; ar-&gt;vif_max == 1)</div><div class='add'>+		fw_submode = HI_OPTION_FW_SUBMODE_P2PDEV;</div><div class='ctx'> </div><div class='del'>-	/* Tell target which HTC version it is used*/</div><div class='ctx'> 	param = HTC_PROTOCOL_VERSION;</div><div class='ctx'> 	if (ath6kl_bmi_write(ar,</div><div class='ctx'> 			     ath6kl_get_hi_item_addr(ar,</div><div class='hunk'>@@ -499,12 +503,10 @@ int ath6kl_configure_target(struct ath6kl *ar)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	param |= (1 &lt;&lt; HI_OPTION_NUM_DEV_SHIFT);</div><div class='del'>-	param |= (fw_iftype &lt;&lt; HI_OPTION_FW_MODE_SHIFT);</div><div class='del'>-	if (ar-&gt;p2p &amp;&amp; fw_iftype == HI_OPTION_FW_MODE_BSS_STA) {</div><div class='del'>-		param |= HI_OPTION_FW_SUBMODE_P2PDEV &lt;&lt;</div><div class='del'>-			HI_OPTION_FW_SUBMODE_SHIFT;</div><div class='del'>-	}</div><div class='add'>+	param |= (ar-&gt;vif_max &lt;&lt; HI_OPTION_NUM_DEV_SHIFT);</div><div class='add'>+	param |= fw_mode &lt;&lt; HI_OPTION_FW_MODE_SHIFT;</div><div class='add'>+	param |= fw_submode &lt;&lt; HI_OPTION_FW_SUBMODE_SHIFT;</div><div class='add'>+</div><div class='ctx'> 	param |= (0 &lt;&lt; HI_OPTION_MAC_ADDR_METHOD_SHIFT);</div><div class='ctx'> 	param |= (0 &lt;&lt; HI_OPTION_FW_BRIDGE_SHIFT);</div><div class='ctx'> </div><div class='hunk'>@@ -550,71 +552,55 @@ int ath6kl_configure_target(struct ath6kl *ar)</div><div class='ctx'> 		/* use default number of control buffers */</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='add'>+	/* Configure GPIO AR600x UART */</div><div class='add'>+	param = ar-&gt;hw.uarttx_pin;</div><div class='add'>+	status = ath6kl_bmi_write(ar,</div><div class='add'>+				ath6kl_get_hi_item_addr(ar,</div><div class='add'>+				HI_ITEM(hi_dbg_uart_txpin)),</div><div class='add'>+				(u8 *)&amp;param, 4);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	/* Configure target refclk_hz */</div><div class='add'>+	param =  ar-&gt;hw.refclk_hz;</div><div class='add'>+	status = ath6kl_bmi_write(ar,</div><div class='add'>+				ath6kl_get_hi_item_addr(ar,</div><div class='add'>+				HI_ITEM(hi_refclk_hz)),</div><div class='add'>+				(u8 *)&amp;param, 4);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct ath6kl *ath6kl_core_alloc(struct device *sdev)</div><div class='add'>+void ath6kl_core_free(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct ath6kl *ar;</div><div class='del'>-	struct wireless_dev *wdev;</div><div class='del'>-</div><div class='del'>-	wdev = ath6kl_cfg80211_init(sdev);</div><div class='del'>-	if (!wdev) {</div><div class='del'>-		ath6kl_err("ath6kl_cfg80211_init failed\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ar = wdev_priv(wdev);</div><div class='del'>-	ar-&gt;dev = sdev;</div><div class='del'>-	ar-&gt;wdev = wdev;</div><div class='del'>-	wdev-&gt;iftype = NL80211_IFTYPE_STATION;</div><div class='del'>-</div><div class='del'>-	if (ath6kl_debug_init(ar)) {</div><div class='del'>-		ath6kl_err("Failed to initialize debugfs\n");</div><div class='del'>-		ath6kl_cfg80211_deinit(ar);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev = alloc_netdev(0, "wlan%d", ether_setup);</div><div class='del'>-	if (!dev) {</div><div class='del'>-		ath6kl_err("no memory for network device instance\n");</div><div class='del'>-		ath6kl_cfg80211_deinit(ar);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev-&gt;ieee80211_ptr = wdev;</div><div class='del'>-	SET_NETDEV_DEV(dev, wiphy_dev(wdev-&gt;wiphy));</div><div class='del'>-	wdev-&gt;netdev = dev;</div><div class='del'>-	ar-&gt;sme_state = SME_DISCONNECTED;</div><div class='del'>-</div><div class='del'>-	init_netdev(dev);</div><div class='add'>+	wiphy_free(ar-&gt;wiphy);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ar-&gt;net_dev = dev;</div><div class='del'>-	set_bit(WLAN_ENABLED, &amp;ar-&gt;flag);</div><div class='add'>+void ath6kl_core_cleanup(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	ath6kl_hif_power_off(ar);</div><div class='ctx'> </div><div class='del'>-	ar-&gt;wlan_pwr_state = WLAN_POWER_STATE_ON;</div><div class='add'>+	destroy_workqueue(ar-&gt;ath6kl_wq);</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;ar-&gt;lock);</div><div class='add'>+	if (ar-&gt;htc_target)</div><div class='add'>+		ath6kl_htc_cleanup(ar-&gt;htc_target);</div><div class='ctx'> </div><div class='del'>-	ath6kl_init_control_info(ar);</div><div class='del'>-	init_waitqueue_head(&amp;ar-&gt;event_wq);</div><div class='del'>-	sema_init(&amp;ar-&gt;sem, 1);</div><div class='del'>-	clear_bit(DESTROY_IN_PROGRESS, &amp;ar-&gt;flag);</div><div class='add'>+	ath6kl_cookie_cleanup(ar);</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;ar-&gt;amsdu_rx_buffer_queue);</div><div class='add'>+	ath6kl_cleanup_amsdu_rxbufs(ar);</div><div class='ctx'> </div><div class='del'>-	setup_timer(&amp;ar-&gt;disconnect_timer, disconnect_timer_handler,</div><div class='del'>-		    (unsigned long) dev);</div><div class='add'>+	ath6kl_bmi_cleanup(ar);</div><div class='ctx'> </div><div class='del'>-	return ar;</div><div class='del'>-}</div><div class='add'>+	ath6kl_debug_cleanup(ar);</div><div class='ctx'> </div><div class='del'>-int ath6kl_unavail_ev(struct ath6kl *ar)</div><div class='del'>-{</div><div class='del'>-	ath6kl_destroy(ar-&gt;net_dev, 1);</div><div class='add'>+	kfree(ar-&gt;fw_board);</div><div class='add'>+	kfree(ar-&gt;fw_otp);</div><div class='add'>+	kfree(ar-&gt;fw);</div><div class='add'>+	kfree(ar-&gt;fw_patch);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	ath6kl_deinit_ieee80211_hw(ar);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* firmware upload */</div><div class='hunk'>@@ -643,11 +629,11 @@ static int ath6kl_get_fw(struct ath6kl *ar, const char *filename,</div><div class='ctx'> static const char *get_target_ver_dir(const struct ath6kl *ar)</div><div class='ctx'> {</div><div class='ctx'> 	switch (ar-&gt;version.target_ver) {</div><div class='del'>-	case AR6003_REV1_VERSION:</div><div class='add'>+	case AR6003_HW_1_0_VERSION:</div><div class='ctx'> 		return "ath6k/AR6003/hw1.0";</div><div class='del'>-	case AR6003_REV2_VERSION:</div><div class='add'>+	case AR6003_HW_2_0_VERSION:</div><div class='ctx'> 		return "ath6k/AR6003/hw2.0";</div><div class='del'>-	case AR6003_REV3_VERSION:</div><div class='add'>+	case AR6003_HW_2_1_1_VERSION:</div><div class='ctx'> 		return "ath6k/AR6003/hw2.1.1";</div><div class='ctx'> 	}</div><div class='ctx'> 	ath6kl_warn("%s: unsupported target version 0x%x.\n", __func__,</div><div class='hunk'>@@ -705,17 +691,10 @@ static int ath6kl_fetch_board_file(struct ath6kl *ar)</div><div class='ctx'> 	if (ar-&gt;fw_board != NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	switch (ar-&gt;version.target_ver) {</div><div class='del'>-	case AR6003_REV2_VERSION:</div><div class='del'>-		filename = AR6003_REV2_BOARD_DATA_FILE;</div><div class='del'>-		break;</div><div class='del'>-	case AR6004_REV1_VERSION:</div><div class='del'>-		filename = AR6004_REV1_BOARD_DATA_FILE;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		filename = AR6003_REV3_BOARD_DATA_FILE;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	if (WARN_ON(ar-&gt;hw.fw_board == NULL))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	filename = ar-&gt;hw.fw_board;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath6kl_get_fw(ar, filename, &amp;ar-&gt;fw_board,</div><div class='ctx'> 			    &amp;ar-&gt;fw_board_len);</div><div class='hunk'>@@ -733,17 +712,7 @@ static int ath6kl_fetch_board_file(struct ath6kl *ar)</div><div class='ctx'> 	ath6kl_warn("Failed to get board file %s (%d), trying to find default board file.\n",</div><div class='ctx'> 		    filename, ret);</div><div class='ctx'> </div><div class='del'>-	switch (ar-&gt;version.target_ver) {</div><div class='del'>-	case AR6003_REV2_VERSION:</div><div class='del'>-		filename = AR6003_REV2_DEFAULT_BOARD_DATA_FILE;</div><div class='del'>-		break;</div><div class='del'>-	case AR6004_REV1_VERSION:</div><div class='del'>-		filename = AR6004_REV1_DEFAULT_BOARD_DATA_FILE;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		filename = AR6003_REV3_DEFAULT_BOARD_DATA_FILE;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	filename = ar-&gt;hw.fw_default_board;</div><div class='ctx'> </div><div class='ctx'> 	ret = ath6kl_get_fw(ar, filename, &amp;ar-&gt;fw_board,</div><div class='ctx'> 			    &amp;ar-&gt;fw_board_len);</div><div class='hunk'>@@ -767,19 +736,14 @@ static int ath6kl_fetch_otp_file(struct ath6kl *ar)</div><div class='ctx'> 	if (ar-&gt;fw_otp != NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	switch (ar-&gt;version.target_ver) {</div><div class='del'>-	case AR6003_REV2_VERSION:</div><div class='del'>-		filename = AR6003_REV2_OTP_FILE;</div><div class='del'>-		break;</div><div class='del'>-	case AR6004_REV1_VERSION:</div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_TRC, "AR6004 doesn't need OTP file\n");</div><div class='add'>+	if (ar-&gt;hw.fw_otp == NULL) {</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_BOOT,</div><div class='add'>+			   "no OTP file configured for this hw\n");</div><div class='ctx'> 		return 0;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		filename = AR6003_REV3_OTP_FILE;</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	filename = ar-&gt;hw.fw_otp;</div><div class='add'>+</div><div class='ctx'> 	ret = ath6kl_get_fw(ar, filename, &amp;ar-&gt;fw_otp,</div><div class='ctx'> 			    &amp;ar-&gt;fw_otp_len);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -800,38 +764,22 @@ static int ath6kl_fetch_fw_file(struct ath6kl *ar)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (testmode) {</div><div class='del'>-		switch (ar-&gt;version.target_ver) {</div><div class='del'>-		case AR6003_REV2_VERSION:</div><div class='del'>-			filename = AR6003_REV2_TCMD_FIRMWARE_FILE;</div><div class='del'>-			break;</div><div class='del'>-		case AR6003_REV3_VERSION:</div><div class='del'>-			filename = AR6003_REV3_TCMD_FIRMWARE_FILE;</div><div class='del'>-			break;</div><div class='del'>-		case AR6004_REV1_VERSION:</div><div class='del'>-			ath6kl_warn("testmode not supported with ar6004\n");</div><div class='add'>+		if (ar-&gt;hw.fw_tcmd == NULL) {</div><div class='add'>+			ath6kl_warn("testmode not supported\n");</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='del'>-		default:</div><div class='del'>-			ath6kl_warn("unknown target version: 0x%x\n",</div><div class='del'>-				       ar-&gt;version.target_ver);</div><div class='del'>-			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		filename = ar-&gt;hw.fw_tcmd;</div><div class='add'>+</div><div class='ctx'> 		set_bit(TESTMODE, &amp;ar-&gt;flag);</div><div class='ctx'> </div><div class='ctx'> 		goto get_fw;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (ar-&gt;version.target_ver) {</div><div class='del'>-	case AR6003_REV2_VERSION:</div><div class='del'>-		filename = AR6003_REV2_FIRMWARE_FILE;</div><div class='del'>-		break;</div><div class='del'>-	case AR6004_REV1_VERSION:</div><div class='del'>-		filename = AR6004_REV1_FIRMWARE_FILE;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		filename = AR6003_REV3_FIRMWARE_FILE;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	if (WARN_ON(ar-&gt;hw.fw == NULL))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	filename = ar-&gt;hw.fw;</div><div class='ctx'> </div><div class='ctx'> get_fw:</div><div class='ctx'> 	ret = ath6kl_get_fw(ar, filename, &amp;ar-&gt;fw, &amp;ar-&gt;fw_len);</div><div class='hunk'>@@ -849,27 +797,20 @@ static int ath6kl_fetch_patch_file(struct ath6kl *ar)</div><div class='ctx'> 	const char *filename;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	switch (ar-&gt;version.target_ver) {</div><div class='del'>-	case AR6003_REV2_VERSION:</div><div class='del'>-		filename = AR6003_REV2_PATCH_FILE;</div><div class='del'>-		break;</div><div class='del'>-	case AR6004_REV1_VERSION:</div><div class='del'>-		/* FIXME: implement for AR6004 */</div><div class='add'>+	if (ar-&gt;fw_patch != NULL)</div><div class='ctx'> 		return 0;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		filename = AR6003_REV3_PATCH_FILE;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;fw_patch == NULL) {</div><div class='del'>-		ret = ath6kl_get_fw(ar, filename, &amp;ar-&gt;fw_patch,</div><div class='del'>-				    &amp;ar-&gt;fw_patch_len);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ath6kl_err("Failed to get patch file %s: %d\n",</div><div class='del'>-				   filename, ret);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='add'>+	if (ar-&gt;hw.fw_patch == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	filename = ar-&gt;hw.fw_patch;</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_get_fw(ar, filename, &amp;ar-&gt;fw_patch,</div><div class='add'>+			    &amp;ar-&gt;fw_patch_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath6kl_err("Failed to get patch file %s: %d\n",</div><div class='add'>+			   filename, ret);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -904,19 +845,10 @@ static int ath6kl_fetch_fw_api2(struct ath6kl *ar)</div><div class='ctx'> 	int ret, ie_id, i, index, bit;</div><div class='ctx'> 	__le32 *val;</div><div class='ctx'> </div><div class='del'>-	switch (ar-&gt;version.target_ver) {</div><div class='del'>-	case AR6003_REV2_VERSION:</div><div class='del'>-		filename = AR6003_REV2_FIRMWARE_2_FILE;</div><div class='del'>-		break;</div><div class='del'>-	case AR6003_REV3_VERSION:</div><div class='del'>-		filename = AR6003_REV3_FIRMWARE_2_FILE;</div><div class='del'>-		break;</div><div class='del'>-	case AR6004_REV1_VERSION:</div><div class='del'>-		filename = AR6004_REV1_FIRMWARE_2_FILE;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='add'>+	if (ar-&gt;hw.fw_api2 == NULL)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	filename = ar-&gt;hw.fw_api2;</div><div class='ctx'> </div><div class='ctx'> 	ret = request_firmware(&amp;fw, filename, ar-&gt;dev);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1006,12 +938,15 @@ static int ath6kl_fetch_fw_api2(struct ath6kl *ar)</div><div class='ctx'> 				   ar-&gt;hw.reserved_ram_size);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ATH6KL_FW_IE_CAPABILITIES:</div><div class='add'>+			if (ie_len &lt; DIV_ROUND_UP(ATH6KL_FW_CAPABILITY_MAX, 8))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='ctx'> 			ath6kl_dbg(ATH6KL_DBG_BOOT,</div><div class='ctx'> 				   "found firmware capabilities ie (%zd B)\n",</div><div class='ctx'> 				   ie_len);</div><div class='ctx'> </div><div class='ctx'> 			for (i = 0; i &lt; ATH6KL_FW_CAPABILITY_MAX; i++) {</div><div class='del'>-				index = ALIGN(i, 8) / 8;</div><div class='add'>+				index = i / 8;</div><div class='ctx'> 				bit = i % 8;</div><div class='ctx'> </div><div class='ctx'> 				if (data[index] &amp; (1 &lt;&lt; bit))</div><div class='hunk'>@@ -1030,9 +965,34 @@ static int ath6kl_fetch_fw_api2(struct ath6kl *ar)</div><div class='ctx'> 			ar-&gt;hw.dataset_patch_addr = le32_to_cpup(val);</div><div class='ctx'> </div><div class='ctx'> 			ath6kl_dbg(ATH6KL_DBG_BOOT,</div><div class='del'>-				   "found patch address ie 0x%d\n",</div><div class='add'>+				   "found patch address ie 0x%x\n",</div><div class='ctx'> 				   ar-&gt;hw.dataset_patch_addr);</div><div class='ctx'> 			break;</div><div class='add'>+		case ATH6KL_FW_IE_BOARD_ADDR:</div><div class='add'>+			if (ie_len != sizeof(*val))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			val = (__le32 *) data;</div><div class='add'>+			ar-&gt;hw.board_addr = le32_to_cpup(val);</div><div class='add'>+</div><div class='add'>+			ath6kl_dbg(ATH6KL_DBG_BOOT,</div><div class='add'>+				   "found board address ie 0x%x\n",</div><div class='add'>+				   ar-&gt;hw.board_addr);</div><div class='add'>+			break;</div><div class='add'>+		case ATH6KL_FW_IE_VIF_MAX:</div><div class='add'>+			if (ie_len != sizeof(*val))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			val = (__le32 *) data;</div><div class='add'>+			ar-&gt;vif_max = min_t(unsigned int, le32_to_cpup(val),</div><div class='add'>+					    ATH6KL_VIF_MAX);</div><div class='add'>+</div><div class='add'>+			if (ar-&gt;vif_max &gt; 1 &amp;&amp; !ar-&gt;p2p)</div><div class='add'>+				ar-&gt;max_norm_iface = 2;</div><div class='add'>+</div><div class='add'>+			ath6kl_dbg(ATH6KL_DBG_BOOT,</div><div class='add'>+				   "found vif max ie %d\n", ar-&gt;vif_max);</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			ath6kl_dbg(ATH6KL_DBG_BOOT, "Unknown fw ie: %u\n",</div><div class='ctx'> 				   le32_to_cpup(&amp;hdr-&gt;id));</div><div class='hunk'>@@ -1087,8 +1047,8 @@ static int ath6kl_upload_board_file(struct ath6kl *ar)</div><div class='ctx'> 	 * For AR6004, host determine Target RAM address for</div><div class='ctx'> 	 * writing board data.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ar-&gt;target_type == TARGET_TYPE_AR6004) {</div><div class='del'>-		board_address = AR6004_REV1_BOARD_DATA_ADDRESS;</div><div class='add'>+	if (ar-&gt;hw.board_addr != 0) {</div><div class='add'>+		board_address = ar-&gt;hw.board_addr;</div><div class='ctx'> 		ath6kl_bmi_write(ar,</div><div class='ctx'> 				ath6kl_get_hi_item_addr(ar,</div><div class='ctx'> 				HI_ITEM(hi_board_data)),</div><div class='hunk'>@@ -1106,7 +1066,8 @@ static int ath6kl_upload_board_file(struct ath6kl *ar)</div><div class='ctx'> 			HI_ITEM(hi_board_ext_data)),</div><div class='ctx'> 			(u8 *) &amp;board_ext_address, 4);</div><div class='ctx'> </div><div class='del'>-	if (board_ext_address == 0) {</div><div class='add'>+	if (ar-&gt;target_type == TARGET_TYPE_AR6003 &amp;&amp;</div><div class='add'>+	    board_ext_address == 0) {</div><div class='ctx'> 		ath6kl_err("Failed to get board file target address.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1126,8 +1087,8 @@ static int ath6kl_upload_board_file(struct ath6kl *ar)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;fw_board_len == (board_data_size +</div><div class='del'>-				 board_ext_data_size)) {</div><div class='add'>+	if (board_ext_address &amp;&amp;</div><div class='add'>+	    ar-&gt;fw_board_len == (board_data_size + board_ext_data_size)) {</div><div class='ctx'> </div><div class='ctx'> 		/* write extended board data */</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_BOOT,</div><div class='hunk'>@@ -1182,10 +1143,11 @@ static int ath6kl_upload_board_file(struct ath6kl *ar)</div><div class='ctx'> static int ath6kl_upload_otp(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='ctx'> 	u32 address, param;</div><div class='add'>+	bool from_hw = false;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(ar-&gt;fw_otp == NULL))</div><div class='del'>-		return -ENOENT;</div><div class='add'>+	if (ar-&gt;fw_otp == NULL)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	address = ar-&gt;hw.app_load_addr;</div><div class='ctx'> </div><div class='hunk'>@@ -1210,15 +1172,20 @@ static int ath6kl_upload_otp(struct ath6kl *ar)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ar-&gt;hw.app_start_override_addr = address;</div><div class='add'>+	if (ar-&gt;hw.app_start_override_addr == 0) {</div><div class='add'>+		ar-&gt;hw.app_start_override_addr = address;</div><div class='add'>+		from_hw = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_BOOT, "app_start_override_addr 0x%x\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_BOOT, "app_start_override_addr%s 0x%x\n",</div><div class='add'>+		   from_hw ? " (from hw)" : "",</div><div class='ctx'> 		   ar-&gt;hw.app_start_override_addr);</div><div class='ctx'> </div><div class='ctx'> 	/* execute the OTP code */</div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_BOOT, "executing OTP at 0x%x\n", address);</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_BOOT, "executing OTP at 0x%x\n",</div><div class='add'>+		   ar-&gt;hw.app_start_override_addr);</div><div class='ctx'> 	param = 0;</div><div class='del'>-	ath6kl_bmi_execute(ar, address, &amp;param);</div><div class='add'>+	ath6kl_bmi_execute(ar, ar-&gt;hw.app_start_override_addr, &amp;param);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1229,7 +1196,7 @@ static int ath6kl_upload_firmware(struct ath6kl *ar)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(ar-&gt;fw == NULL))</div><div class='del'>-		return -ENOENT;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	address = ar-&gt;hw.app_load_addr;</div><div class='ctx'> </div><div class='hunk'>@@ -1259,8 +1226,8 @@ static int ath6kl_upload_patch(struct ath6kl *ar)</div><div class='ctx'> 	u32 address, param;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(ar-&gt;fw_patch == NULL))</div><div class='del'>-		return -ENOENT;</div><div class='add'>+	if (ar-&gt;fw_patch == NULL)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	address = ar-&gt;hw.dataset_patch_addr;</div><div class='ctx'> </div><div class='hunk'>@@ -1345,7 +1312,7 @@ static int ath6kl_init_upload(struct ath6kl *ar)</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='ctx'> 	/* WAR to avoid SDIO CRC err */</div><div class='del'>-	if (ar-&gt;version.target_ver == AR6003_REV2_VERSION) {</div><div class='add'>+	if (ar-&gt;version.target_ver == AR6003_HW_2_0_VERSION) {</div><div class='ctx'> 		ath6kl_err("temporary war to avoid sdio crc error\n");</div><div class='ctx'> </div><div class='ctx'> 		param = 0x20;</div><div class='hunk'>@@ -1402,43 +1369,29 @@ static int ath6kl_init_upload(struct ath6kl *ar)</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='del'>-	/* Configure GPIO AR6003 UART */</div><div class='del'>-	param = CONFIG_AR600x_DEBUG_UART_TX_PIN;</div><div class='del'>-	status = ath6kl_bmi_write(ar,</div><div class='del'>-				  ath6kl_get_hi_item_addr(ar,</div><div class='del'>-				  HI_ITEM(hi_dbg_uart_txpin)),</div><div class='del'>-				  (u8 *)&amp;param, 4);</div><div class='del'>-</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_init_hw_params(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='del'>-	switch (ar-&gt;version.target_ver) {</div><div class='del'>-	case AR6003_REV2_VERSION:</div><div class='del'>-		ar-&gt;hw.dataset_patch_addr = AR6003_REV2_DATASET_PATCH_ADDRESS;</div><div class='del'>-		ar-&gt;hw.app_load_addr = AR6003_REV2_APP_LOAD_ADDRESS;</div><div class='del'>-		ar-&gt;hw.board_ext_data_addr = AR6003_REV2_BOARD_EXT_DATA_ADDRESS;</div><div class='del'>-		ar-&gt;hw.reserved_ram_size = AR6003_REV2_RAM_RESERVE_SIZE;</div><div class='del'>-		break;</div><div class='del'>-	case AR6003_REV3_VERSION:</div><div class='del'>-		ar-&gt;hw.dataset_patch_addr = AR6003_REV3_DATASET_PATCH_ADDRESS;</div><div class='del'>-		ar-&gt;hw.app_load_addr = 0x1234;</div><div class='del'>-		ar-&gt;hw.board_ext_data_addr = AR6003_REV3_BOARD_EXT_DATA_ADDRESS;</div><div class='del'>-		ar-&gt;hw.reserved_ram_size = AR6003_REV3_RAM_RESERVE_SIZE;</div><div class='del'>-		break;</div><div class='del'>-	case AR6004_REV1_VERSION:</div><div class='del'>-		ar-&gt;hw.dataset_patch_addr = AR6003_REV2_DATASET_PATCH_ADDRESS;</div><div class='del'>-		ar-&gt;hw.app_load_addr = AR6003_REV3_APP_LOAD_ADDRESS;</div><div class='del'>-		ar-&gt;hw.board_ext_data_addr = AR6004_REV1_BOARD_EXT_DATA_ADDRESS;</div><div class='del'>-		ar-&gt;hw.reserved_ram_size = AR6004_REV1_RAM_RESERVE_SIZE;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='add'>+	const struct ath6kl_hw *hw;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(hw_list); i++) {</div><div class='add'>+		hw = &amp;hw_list[i];</div><div class='add'>+</div><div class='add'>+		if (hw-&gt;id == ar-&gt;version.target_ver)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i == ARRAY_SIZE(hw_list)) {</div><div class='ctx'> 		ath6kl_err("Unsupported hardware version: 0x%x\n",</div><div class='ctx'> 			   ar-&gt;version.target_ver);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ar-&gt;hw = *hw;</div><div class='add'>+</div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_BOOT,</div><div class='ctx'> 		   "target_ver 0x%x target_type 0x%x dataset_patch 0x%x app_load_addr 0x%x\n",</div><div class='ctx'> 		   ar-&gt;version.target_ver, ar-&gt;target_type,</div><div class='hunk'>@@ -1447,75 +1400,75 @@ static int ath6kl_init_hw_params(struct ath6kl *ar)</div><div class='ctx'> 		   "app_start_override_addr 0x%x board_ext_data_addr 0x%x reserved_ram_size 0x%x",</div><div class='ctx'> 		   ar-&gt;hw.app_start_override_addr, ar-&gt;hw.board_ext_data_addr,</div><div class='ctx'> 		   ar-&gt;hw.reserved_ram_size);</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_BOOT,</div><div class='add'>+		   "refclk_hz %d uarttx_pin %d",</div><div class='add'>+		   ar-&gt;hw.refclk_hz, ar-&gt;hw.uarttx_pin);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_init(struct net_device *dev)</div><div class='add'>+static const char *ath6kl_init_get_hif_name(enum ath6kl_hif_type type)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='del'>-	int status = 0;</div><div class='del'>-	s32 timeleft;</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ATH6KL_HIF_TYPE_SDIO:</div><div class='add'>+		return "sdio";</div><div class='add'>+	case ATH6KL_HIF_TYPE_USB:</div><div class='add'>+		return "usb";</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!ar)</div><div class='del'>-		return -EIO;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath6kl_init_hw_start(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	long timeleft;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_BOOT, "hw start\n");</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_hif_power_on(ar);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_configure_target(ar);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_power_off;</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_init_upload(ar);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_power_off;</div><div class='ctx'> </div><div class='ctx'> 	/* Do we need to finish the BMI phase */</div><div class='add'>+	/* FIXME: return error from ath6kl_bmi_done() */</div><div class='ctx'> 	if (ath6kl_bmi_done(ar)) {</div><div class='del'>-		status = -EIO;</div><div class='del'>-		goto ath6kl_init_done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Indicate that WMI is enabled (although not ready yet) */</div><div class='del'>-	set_bit(WMI_ENABLED, &amp;ar-&gt;flag);</div><div class='del'>-	ar-&gt;wmi = ath6kl_wmi_init(ar);</div><div class='del'>-	if (!ar-&gt;wmi) {</div><div class='del'>-		ath6kl_err("failed to initialize wmi\n");</div><div class='del'>-		status = -EIO;</div><div class='del'>-		goto ath6kl_init_done;</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto err_power_off;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_TRC, "%s: got wmi @ 0x%p.\n", __func__, ar-&gt;wmi);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The reason we have to wait for the target here is that the</div><div class='ctx'> 	 * driver layer has to init BMI in order to set the host block</div><div class='ctx'> 	 * size.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ath6kl_htc_wait_target(ar-&gt;htc_target)) {</div><div class='del'>-		status = -EIO;</div><div class='del'>-		goto err_node_cleanup;</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto err_power_off;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ath6kl_init_service_ep(ar)) {</div><div class='del'>-		status = -EIO;</div><div class='add'>+		ret = -EIO;</div><div class='ctx'> 		goto err_cleanup_scatter;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* setup access class priority mappings */</div><div class='del'>-	ar-&gt;ac_stream_pri_map[WMM_AC_BK] = 0; /* lowest  */</div><div class='del'>-	ar-&gt;ac_stream_pri_map[WMM_AC_BE] = 1;</div><div class='del'>-	ar-&gt;ac_stream_pri_map[WMM_AC_VI] = 2;</div><div class='del'>-	ar-&gt;ac_stream_pri_map[WMM_AC_VO] = 3; /* highest */</div><div class='del'>-</div><div class='del'>-	/* give our connected endpoints some buffers */</div><div class='del'>-	ath6kl_rx_refill(ar-&gt;htc_target, ar-&gt;ctrl_ep);</div><div class='del'>-	ath6kl_rx_refill(ar-&gt;htc_target, ar-&gt;ac2ep_map[WMM_AC_BE]);</div><div class='del'>-</div><div class='del'>-	/* allocate some buffers that handle larger AMSDU frames */</div><div class='del'>-	ath6kl_refill_amsdu_rxbufs(ar, ATH6KL_MAX_AMSDU_RX_BUFFERS);</div><div class='del'>-</div><div class='ctx'> 	/* setup credit distribution */</div><div class='del'>-	ath6k_setup_credit_dist(ar-&gt;htc_target, &amp;ar-&gt;credit_state_info);</div><div class='del'>-</div><div class='del'>-	ath6kl_cookie_init(ar);</div><div class='add'>+	ath6kl_credit_setup(ar-&gt;htc_target, &amp;ar-&gt;credit_state_info);</div><div class='ctx'> </div><div class='ctx'> 	/* start HTC */</div><div class='del'>-	status = ath6kl_htc_start(ar-&gt;htc_target);</div><div class='del'>-</div><div class='del'>-	if (status) {</div><div class='add'>+	ret = ath6kl_htc_start(ar-&gt;htc_target);</div><div class='add'>+	if (ret) {</div><div class='add'>+		/* FIXME: call this */</div><div class='ctx'> 		ath6kl_cookie_cleanup(ar);</div><div class='del'>-		goto err_rxbuf_cleanup;</div><div class='add'>+		goto err_cleanup_scatter;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for Wmi event to be ready */</div><div class='hunk'>@@ -1526,54 +1479,81 @@ static int ath6kl_init(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_BOOT, "firmware booted\n");</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(FIRST_BOOT, &amp;ar-&gt;flag)) {</div><div class='add'>+		ath6kl_info("%s %s fw %s%s\n",</div><div class='add'>+			    ar-&gt;hw.name,</div><div class='add'>+			    ath6kl_init_get_hif_name(ar-&gt;hif_type),</div><div class='add'>+			    ar-&gt;wiphy-&gt;fw_version,</div><div class='add'>+			    test_bit(TESTMODE, &amp;ar-&gt;flag) ? " testmode" : "");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (ar-&gt;version.abi_ver != ATH6KL_ABI_VERSION) {</div><div class='ctx'> 		ath6kl_err("abi version mismatch: host(0x%x), target(0x%x)\n",</div><div class='ctx'> 			   ATH6KL_ABI_VERSION, ar-&gt;version.abi_ver);</div><div class='del'>-		status = -EIO;</div><div class='add'>+		ret = -EIO;</div><div class='ctx'> 		goto err_htc_stop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!timeleft || signal_pending(current)) {</div><div class='ctx'> 		ath6kl_err("wmi is not ready or wait was interrupted\n");</div><div class='del'>-		status = -EIO;</div><div class='add'>+		ret = -EIO;</div><div class='ctx'> 		goto err_htc_stop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_TRC, "%s: wmi is ready\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* communicate the wmi protocol verision to the target */</div><div class='add'>+	/* FIXME: return error */</div><div class='ctx'> 	if ((ath6kl_set_host_app_area(ar)) != 0)</div><div class='ctx'> 		ath6kl_err("unable to set the host app area\n");</div><div class='ctx'> </div><div class='del'>-	ar-&gt;conf_flags = ATH6KL_CONF_IGNORE_ERP_BARKER |</div><div class='del'>-			 ATH6KL_CONF_ENABLE_11N | ATH6KL_CONF_ENABLE_TX_BURST;</div><div class='add'>+	for (i = 0; i &lt; ar-&gt;vif_max; i++) {</div><div class='add'>+		ret = ath6kl_target_config_wlan_params(ar, i);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_htc_stop;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ar-&gt;wdev-&gt;wiphy-&gt;flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM;</div><div class='add'>+	ar-&gt;state = ATH6KL_STATE_ON;</div><div class='ctx'> </div><div class='del'>-	status = ath6kl_target_config_wlan_params(ar);</div><div class='del'>-	if (!status)</div><div class='del'>-		goto ath6kl_init_done;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> err_htc_stop:</div><div class='ctx'> 	ath6kl_htc_stop(ar-&gt;htc_target);</div><div class='del'>-err_rxbuf_cleanup:</div><div class='del'>-	ath6kl_htc_flush_rx_buf(ar-&gt;htc_target);</div><div class='del'>-	ath6kl_cleanup_amsdu_rxbufs(ar);</div><div class='ctx'> err_cleanup_scatter:</div><div class='ctx'> 	ath6kl_hif_cleanup_scatter(ar);</div><div class='del'>-err_node_cleanup:</div><div class='del'>-	ath6kl_wmi_shutdown(ar-&gt;wmi);</div><div class='del'>-	clear_bit(WMI_ENABLED, &amp;ar-&gt;flag);</div><div class='del'>-	ar-&gt;wmi = NULL;</div><div class='add'>+err_power_off:</div><div class='add'>+	ath6kl_hif_power_off(ar);</div><div class='ctx'> </div><div class='del'>-ath6kl_init_done:</div><div class='del'>-	return status;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath6kl_init_hw_stop(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_BOOT, "hw stop\n");</div><div class='add'>+</div><div class='add'>+	ath6kl_htc_stop(ar-&gt;htc_target);</div><div class='add'>+</div><div class='add'>+	ath6kl_hif_stop(ar);</div><div class='add'>+</div><div class='add'>+	ath6kl_bmi_reset(ar);</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_hif_power_off(ar);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath6kl_warn("failed to power off hif: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	ar-&gt;state = ATH6KL_STATE_OFF;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath6kl_core_init(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	struct ath6kl_bmi_target_info targ_info;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	int ret = 0, i;</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;ath6kl_wq = create_singlethread_workqueue("ath6kl");</div><div class='ctx'> 	if (!ar-&gt;ath6kl_wq)</div><div class='hunk'>@@ -1583,145 +1563,236 @@ int ath6kl_core_init(struct ath6kl *ar)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_wq;</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_bmi_get_target_info(ar, &amp;targ_info);</div><div class='add'>+	/*</div><div class='add'>+	 * Turn on power to get hardware (target) version and leave power</div><div class='add'>+	 * on delibrately as we will boot the hardware anyway within few</div><div class='add'>+	 * seconds.</div><div class='add'>+	 */</div><div class='add'>+	ret = ath6kl_hif_power_on(ar);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_bmi_cleanup;</div><div class='ctx'> </div><div class='add'>+	ret = ath6kl_bmi_get_target_info(ar, &amp;targ_info);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_power_off;</div><div class='add'>+</div><div class='ctx'> 	ar-&gt;version.target_ver = le32_to_cpu(targ_info.version);</div><div class='ctx'> 	ar-&gt;target_type = le32_to_cpu(targ_info.type);</div><div class='del'>-	ar-&gt;wdev-&gt;wiphy-&gt;hw_version = le32_to_cpu(targ_info.version);</div><div class='add'>+	ar-&gt;wiphy-&gt;hw_version = le32_to_cpu(targ_info.version);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath6kl_init_hw_params(ar);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto err_bmi_cleanup;</div><div class='del'>-</div><div class='del'>-	ret = ath6kl_configure_target(ar);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_bmi_cleanup;</div><div class='add'>+		goto err_power_off;</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;htc_target = ath6kl_htc_create(ar);</div><div class='ctx'> </div><div class='ctx'> 	if (!ar-&gt;htc_target) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='del'>-		goto err_bmi_cleanup;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ar-&gt;aggr_cntxt = aggr_init(ar-&gt;net_dev);</div><div class='del'>-	if (!ar-&gt;aggr_cntxt) {</div><div class='del'>-		ath6kl_err("failed to initialize aggr\n");</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_htc_cleanup;</div><div class='add'>+		goto err_power_off;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ath6kl_fetch_firmwares(ar);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_htc_cleanup;</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_init_upload(ar);</div><div class='del'>-	if (ret)</div><div class='add'>+	/* FIXME: we should free all firmwares in the error cases below */</div><div class='add'>+</div><div class='add'>+	/* Indicate that WMI is enabled (although not ready yet) */</div><div class='add'>+	set_bit(WMI_ENABLED, &amp;ar-&gt;flag);</div><div class='add'>+	ar-&gt;wmi = ath6kl_wmi_init(ar);</div><div class='add'>+	if (!ar-&gt;wmi) {</div><div class='add'>+		ath6kl_err("failed to initialize wmi\n");</div><div class='add'>+		ret = -EIO;</div><div class='ctx'> 		goto err_htc_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_TRC, "%s: got wmi @ 0x%p.\n", __func__, ar-&gt;wmi);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_init(ar-&gt;net_dev);</div><div class='add'>+	ret = ath6kl_register_ieee80211_hw(ar);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto err_htc_cleanup;</div><div class='add'>+		goto err_node_cleanup;</div><div class='ctx'> </div><div class='del'>-	/* This runs the init function if registered */</div><div class='del'>-	ret = register_netdev(ar-&gt;net_dev);</div><div class='add'>+	ret = ath6kl_debug_init(ar);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ath6kl_err("register_netdev failed\n");</div><div class='del'>-		ath6kl_destroy(ar-&gt;net_dev, 0);</div><div class='del'>-		return ret;</div><div class='add'>+		wiphy_unregister(ar-&gt;wiphy);</div><div class='add'>+		goto err_node_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ar-&gt;vif_max; i++)</div><div class='add'>+		ar-&gt;avail_idx_map |= BIT(i);</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+</div><div class='add'>+	/* Add an initial station interface */</div><div class='add'>+	ndev = ath6kl_interface_add(ar, "wlan%d", NL80211_IFTYPE_STATION, 0,</div><div class='add'>+				    INFRA_NETWORK);</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	if (!ndev) {</div><div class='add'>+		ath6kl_err("Failed to instantiate a network device\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		wiphy_unregister(ar-&gt;wiphy);</div><div class='add'>+		goto err_debug_init;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_bit(NETDEV_REGISTERED, &amp;ar-&gt;flag);</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_TRC, "%s: name=%s dev=0x%p, ar=0x%p\n",</div><div class='del'>-			__func__, ar-&gt;net_dev-&gt;name, ar-&gt;net_dev, ar);</div><div class='add'>+			__func__, ndev-&gt;name, ndev, ar);</div><div class='add'>+</div><div class='add'>+	/* setup access class priority mappings */</div><div class='add'>+	ar-&gt;ac_stream_pri_map[WMM_AC_BK] = 0; /* lowest  */</div><div class='add'>+	ar-&gt;ac_stream_pri_map[WMM_AC_BE] = 1;</div><div class='add'>+	ar-&gt;ac_stream_pri_map[WMM_AC_VI] = 2;</div><div class='add'>+	ar-&gt;ac_stream_pri_map[WMM_AC_VO] = 3; /* highest */</div><div class='add'>+</div><div class='add'>+	/* give our connected endpoints some buffers */</div><div class='add'>+	ath6kl_rx_refill(ar-&gt;htc_target, ar-&gt;ctrl_ep);</div><div class='add'>+	ath6kl_rx_refill(ar-&gt;htc_target, ar-&gt;ac2ep_map[WMM_AC_BE]);</div><div class='add'>+</div><div class='add'>+	/* allocate some buffers that handle larger AMSDU frames */</div><div class='add'>+	ath6kl_refill_amsdu_rxbufs(ar, ATH6KL_MAX_AMSDU_RX_BUFFERS);</div><div class='add'>+</div><div class='add'>+	ath6kl_cookie_init(ar);</div><div class='add'>+</div><div class='add'>+	ar-&gt;conf_flags = ATH6KL_CONF_IGNORE_ERP_BARKER |</div><div class='add'>+			 ATH6KL_CONF_ENABLE_11N | ATH6KL_CONF_ENABLE_TX_BURST;</div><div class='add'>+</div><div class='add'>+	if (suspend_cutpower)</div><div class='add'>+		ar-&gt;conf_flags |= ATH6KL_CONF_SUSPEND_CUTPOWER;</div><div class='add'>+</div><div class='add'>+	ar-&gt;wiphy-&gt;flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM |</div><div class='add'>+			    WIPHY_FLAG_HAVE_AP_SME |</div><div class='add'>+			    WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |</div><div class='add'>+			    WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD;</div><div class='add'>+</div><div class='add'>+	if (test_bit(ATH6KL_FW_CAPABILITY_SCHED_SCAN, ar-&gt;fw_capabilities))</div><div class='add'>+		ar-&gt;wiphy-&gt;flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;</div><div class='add'>+</div><div class='add'>+	ar-&gt;wiphy-&gt;probe_resp_offload =</div><div class='add'>+		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS |</div><div class='add'>+		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2 |</div><div class='add'>+		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P |</div><div class='add'>+		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U;</div><div class='add'>+</div><div class='add'>+	set_bit(FIRST_BOOT, &amp;ar-&gt;flag);</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_init_hw_start(ar);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath6kl_err("Failed to start hardware: %d\n", ret);</div><div class='add'>+		goto err_rxbuf_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set mac address which is received in ready event</div><div class='add'>+	 * FIXME: Move to ath6kl_interface_add()</div><div class='add'>+	 */</div><div class='add'>+	memcpy(ndev-&gt;dev_addr, ar-&gt;mac_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='add'>+err_rxbuf_cleanup:</div><div class='add'>+	ath6kl_htc_flush_rx_buf(ar-&gt;htc_target);</div><div class='add'>+	ath6kl_cleanup_amsdu_rxbufs(ar);</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	ath6kl_deinit_if_data(netdev_priv(ndev));</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	wiphy_unregister(ar-&gt;wiphy);</div><div class='add'>+err_debug_init:</div><div class='add'>+	ath6kl_debug_cleanup(ar);</div><div class='add'>+err_node_cleanup:</div><div class='add'>+	ath6kl_wmi_shutdown(ar-&gt;wmi);</div><div class='add'>+	clear_bit(WMI_ENABLED, &amp;ar-&gt;flag);</div><div class='add'>+	ar-&gt;wmi = NULL;</div><div class='ctx'> err_htc_cleanup:</div><div class='ctx'> 	ath6kl_htc_cleanup(ar-&gt;htc_target);</div><div class='add'>+err_power_off:</div><div class='add'>+	ath6kl_hif_power_off(ar);</div><div class='ctx'> err_bmi_cleanup:</div><div class='ctx'> 	ath6kl_bmi_cleanup(ar);</div><div class='ctx'> err_wq:</div><div class='ctx'> 	destroy_workqueue(ar-&gt;ath6kl_wq);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_stop_txrx(struct ath6kl *ar)</div><div class='add'>+void ath6kl_cleanup_vif(struct ath6kl_vif *vif, bool wmi_ready)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *ndev = ar-&gt;net_dev;</div><div class='add'>+	static u8 bcast_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};</div><div class='add'>+	bool discon_issued;</div><div class='ctx'> </div><div class='del'>-	if (!ndev)</div><div class='del'>-		return;</div><div class='add'>+	netif_stop_queue(vif-&gt;ndev);</div><div class='ctx'> </div><div class='del'>-	set_bit(DESTROY_IN_PROGRESS, &amp;ar-&gt;flag);</div><div class='add'>+	clear_bit(WLAN_ENABLED, &amp;vif-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	if (down_interruptible(&amp;ar-&gt;sem)) {</div><div class='del'>-		ath6kl_err("down_interruptible failed\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	if (wmi_ready) {</div><div class='add'>+		discon_issued = test_bit(CONNECTED, &amp;vif-&gt;flags) ||</div><div class='add'>+				test_bit(CONNECT_PEND, &amp;vif-&gt;flags);</div><div class='add'>+		ath6kl_disconnect(vif);</div><div class='add'>+		del_timer(&amp;vif-&gt;disconnect_timer);</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;wlan_pwr_state != WLAN_POWER_STATE_CUT_PWR)</div><div class='del'>-		ath6kl_stop_endpoint(ndev, false, true);</div><div class='add'>+		if (discon_issued)</div><div class='add'>+			ath6kl_disconnect_event(vif, DISCONNECT_CMD,</div><div class='add'>+						(vif-&gt;nw_type &amp; AP_NETWORK) ?</div><div class='add'>+						bcast_mac : vif-&gt;bssid,</div><div class='add'>+						0, NULL, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	clear_bit(WLAN_ENABLED, &amp;ar-&gt;flag);</div><div class='add'>+	if (vif-&gt;scan_req) {</div><div class='add'>+		cfg80211_scan_done(vif-&gt;scan_req, true);</div><div class='add'>+		vif-&gt;scan_req = NULL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * We need to differentiate between the surprise and planned removal of the</div><div class='del'>- * device because of the following consideration:</div><div class='del'>- *</div><div class='del'>- * - In case of surprise removal, the hcd already frees up the pending</div><div class='del'>- *   for the device and hence there is no need to unregister the function</div><div class='del'>- *   driver inorder to get these requests. For planned removal, the function</div><div class='del'>- *   driver has to explicitly unregister itself to have the hcd return all the</div><div class='del'>- *   pending requests before the data structures for the devices are freed up.</div><div class='del'>- *   Note that as per the current implementation, the function driver will</div><div class='del'>- *   end up releasing all the devices since there is no API to selectively</div><div class='del'>- *   release a particular device.</div><div class='del'>- *</div><div class='del'>- * - Certain commands issued to the target can be skipped for surprise</div><div class='del'>- *   removal since they will anyway not go through.</div><div class='del'>- */</div><div class='del'>-void ath6kl_destroy(struct net_device *dev, unsigned int unregister)</div><div class='add'>+void ath6kl_stop_txrx(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl *ar;</div><div class='add'>+	struct ath6kl_vif *vif, *tmp_vif;</div><div class='ctx'> </div><div class='del'>-	if (!dev || !ath6kl_priv(dev)) {</div><div class='del'>-		ath6kl_err("failed to get device structure\n");</div><div class='add'>+	set_bit(DESTROY_IN_PROGRESS, &amp;ar-&gt;flag);</div><div class='add'>+</div><div class='add'>+	if (down_interruptible(&amp;ar-&gt;sem)) {</div><div class='add'>+		ath6kl_err("down_interruptible failed\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ar = ath6kl_priv(dev);</div><div class='del'>-</div><div class='del'>-	destroy_workqueue(ar-&gt;ath6kl_wq);</div><div class='del'>-</div><div class='del'>-	if (ar-&gt;htc_target)</div><div class='del'>-		ath6kl_htc_cleanup(ar-&gt;htc_target);</div><div class='del'>-</div><div class='del'>-	aggr_module_destroy(ar-&gt;aggr_cntxt);</div><div class='del'>-</div><div class='del'>-	ath6kl_cookie_cleanup(ar);</div><div class='del'>-</div><div class='del'>-	ath6kl_cleanup_amsdu_rxbufs(ar);</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;list_lock);</div><div class='add'>+	list_for_each_entry_safe(vif, tmp_vif, &amp;ar-&gt;vif_list, list) {</div><div class='add'>+		list_del(&amp;vif-&gt;list);</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;list_lock);</div><div class='add'>+		ath6kl_cleanup_vif(vif, test_bit(WMI_READY, &amp;ar-&gt;flag));</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		ath6kl_deinit_if_data(vif);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+		spin_lock_bh(&amp;ar-&gt;list_lock);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;list_lock);</div><div class='ctx'> </div><div class='del'>-	ath6kl_bmi_cleanup(ar);</div><div class='add'>+	clear_bit(WMI_READY, &amp;ar-&gt;flag);</div><div class='ctx'> </div><div class='del'>-	ath6kl_debug_cleanup(ar);</div><div class='add'>+	/*</div><div class='add'>+	 * After wmi_shudown all WMI events will be dropped. We</div><div class='add'>+	 * need to cleanup the buffers allocated in AP mode and</div><div class='add'>+	 * give disconnect notification to stack, which usually</div><div class='add'>+	 * happens in the disconnect_event. Simulate the disconnect</div><div class='add'>+	 * event by calling the function directly. Sometimes</div><div class='add'>+	 * disconnect_event will be received when the debug logs</div><div class='add'>+	 * are collected.</div><div class='add'>+	 */</div><div class='add'>+	ath6kl_wmi_shutdown(ar-&gt;wmi);</div><div class='ctx'> </div><div class='del'>-	if (unregister &amp;&amp; test_bit(NETDEV_REGISTERED, &amp;ar-&gt;flag)) {</div><div class='del'>-		unregister_netdev(dev);</div><div class='del'>-		clear_bit(NETDEV_REGISTERED, &amp;ar-&gt;flag);</div><div class='add'>+	clear_bit(WMI_ENABLED, &amp;ar-&gt;flag);</div><div class='add'>+	if (ar-&gt;htc_target) {</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_TRC, "%s: shut down htc\n", __func__);</div><div class='add'>+		ath6kl_htc_stop(ar-&gt;htc_target);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	free_netdev(dev);</div><div class='del'>-</div><div class='del'>-	kfree(ar-&gt;fw_board);</div><div class='del'>-	kfree(ar-&gt;fw_otp);</div><div class='del'>-	kfree(ar-&gt;fw);</div><div class='del'>-	kfree(ar-&gt;fw_patch);</div><div class='add'>+	/*</div><div class='add'>+	 * Try to reset the device if we can. The driver may have been</div><div class='add'>+	 * configure NOT to reset the target during a debug session.</div><div class='add'>+	 */</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_TRC,</div><div class='add'>+			"attempting to reset target on instance destroy\n");</div><div class='add'>+	ath6kl_reset_device(ar, ar-&gt;target_type, true, true);</div><div class='ctx'> </div><div class='del'>-	ath6kl_cfg80211_deinit(ar);</div><div class='add'>+	clear_bit(WLAN_ENABLED, &amp;ar-&gt;flag);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c<br/>index 30b5a53db9ed..eea3c747653e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/main.c</a></div><div class='hunk'>@@ -20,12 +20,13 @@</div><div class='ctx'> #include "target.h"</div><div class='ctx'> #include "debug.h"</div><div class='ctx'> </div><div class='del'>-struct ath6kl_sta *ath6kl_find_sta(struct ath6kl *ar, u8 *node_addr)</div><div class='add'>+struct ath6kl_sta *ath6kl_find_sta(struct ath6kl_vif *vif, u8 *node_addr)</div><div class='ctx'> {</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='ctx'> 	struct ath6kl_sta *conn = NULL;</div><div class='ctx'> 	u8 i, max_conn;</div><div class='ctx'> </div><div class='del'>-	max_conn = (ar-&gt;nw_type == AP_NETWORK) ? AP_MAX_NUM_STA : 0;</div><div class='add'>+	max_conn = (vif-&gt;nw_type == AP_NETWORK) ? AP_MAX_NUM_STA : 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; max_conn; i++) {</div><div class='ctx'> 		if (memcmp(node_addr, ar-&gt;sta_list[i].mac, ETH_ALEN) == 0) {</div><div class='hunk'>@@ -174,64 +175,6 @@ void ath6kl_free_cookie(struct ath6kl *ar, struct ath6kl_cookie *cookie)</div><div class='ctx'> 	ar-&gt;cookie_count++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* set the window address register (using 4-byte register access ). */</div><div class='del'>-static int ath6kl_set_addrwin_reg(struct ath6kl *ar, u32 reg_addr, u32 addr)</div><div class='del'>-{</div><div class='del'>-	int status;</div><div class='del'>-	s32 i;</div><div class='del'>-	__le32 addr_val;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Write bytes 1,2,3 of the register to set the upper address bytes,</div><div class='del'>-	 * the LSB is written last to initiate the access cycle</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for (i = 1; i &lt;= 3; i++) {</div><div class='del'>-		/*</div><div class='del'>-		 * Fill the buffer with the address byte value we want to</div><div class='del'>-		 * hit 4 times. No need to worry about endianness as the</div><div class='del'>-		 * same byte is copied to all four bytes of addr_val at</div><div class='del'>-		 * any time.</div><div class='del'>-		 */</div><div class='del'>-		memset((u8 *)&amp;addr_val, ((u8 *)&amp;addr)[i], 4);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Hit each byte of the register address with a 4-byte</div><div class='del'>-		 * write operation to the same address, this is a harmless</div><div class='del'>-		 * operation.</div><div class='del'>-		 */</div><div class='del'>-		status = hif_read_write_sync(ar, reg_addr + i, (u8 *)&amp;addr_val,</div><div class='del'>-					     4, HIF_WR_SYNC_BYTE_FIX);</div><div class='del'>-		if (status)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (status) {</div><div class='del'>-		ath6kl_err("failed to write initial bytes of 0x%x to window reg: 0x%X\n",</div><div class='del'>-			   addr, reg_addr);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Write the address register again, this time write the whole</div><div class='del'>-	 * 4-byte value. The effect here is that the LSB write causes the</div><div class='del'>-	 * cycle to start, the extra 3 byte write to bytes 1,2,3 has no</div><div class='del'>-	 * effect since we are writing the same values again</div><div class='del'>-	 */</div><div class='del'>-	addr_val = cpu_to_le32(addr);</div><div class='del'>-	status = hif_read_write_sync(ar, reg_addr,</div><div class='del'>-				     (u8 *)&amp;(addr_val),</div><div class='del'>-				     4, HIF_WR_SYNC_BYTE_INC);</div><div class='del'>-</div><div class='del'>-	if (status) {</div><div class='del'>-		ath6kl_err("failed to write 0x%x to window reg: 0x%X\n",</div><div class='del'>-			   addr, reg_addr);</div><div class='del'>-		return status;</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'> /*</div><div class='ctx'>  * Read from the hardware through its diagnostic window. No cooperation</div><div class='ctx'>  * from the firmware is required for this.</div><div class='hunk'>@@ -240,14 +183,7 @@ int ath6kl_diag_read32(struct ath6kl *ar, u32 address, u32 *value)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* set window register to start read cycle */</div><div class='del'>-	ret = ath6kl_set_addrwin_reg(ar, WINDOW_READ_ADDR_ADDRESS, address);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* read the data */</div><div class='del'>-	ret = hif_read_write_sync(ar, WINDOW_DATA_ADDRESS, (u8 *) value,</div><div class='del'>-				  sizeof(*value), HIF_RD_SYNC_BYTE_INC);</div><div class='add'>+	ret = ath6kl_hif_diag_read32(ar, address, value);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath6kl_warn("failed to read32 through diagnose window: %d\n",</div><div class='ctx'> 			    ret);</div><div class='hunk'>@@ -265,18 +201,15 @@ int ath6kl_diag_write32(struct ath6kl *ar, u32 address, __le32 value)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* set write data */</div><div class='del'>-	ret = hif_read_write_sync(ar, WINDOW_DATA_ADDRESS, (u8 *) &amp;value,</div><div class='del'>-				  sizeof(value), HIF_WR_SYNC_BYTE_INC);</div><div class='add'>+	ret = ath6kl_hif_diag_write32(ar, address, value);</div><div class='add'>+</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath6kl_err("failed to write 0x%x during diagnose window to 0x%d\n",</div><div class='ctx'> 			   address, value);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* set window register, which starts the write cycle */</div><div class='del'>-	return ath6kl_set_addrwin_reg(ar, WINDOW_WRITE_ADDR_ADDRESS,</div><div class='del'>-				      address);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath6kl_diag_read(struct ath6kl *ar, u32 address, void *data, u32 length)</div><div class='hunk'>@@ -393,8 +326,8 @@ out:</div><div class='ctx'> #define AR6003_RESET_CONTROL_ADDRESS 0x00004000</div><div class='ctx'> #define AR6004_RESET_CONTROL_ADDRESS 0x00004000</div><div class='ctx'> </div><div class='del'>-static void ath6kl_reset_device(struct ath6kl *ar, u32 target_type,</div><div class='del'>-				bool wait_fot_compltn, bool cold_reset)</div><div class='add'>+void ath6kl_reset_device(struct ath6kl *ar, u32 target_type,</div><div class='add'>+			 bool wait_fot_compltn, bool cold_reset)</div><div class='ctx'> {</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> 	u32 address;</div><div class='hunk'>@@ -425,102 +358,33 @@ static void ath6kl_reset_device(struct ath6kl *ar, u32 target_type,</div><div class='ctx'> 		ath6kl_err("failed to reset target\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_stop_endpoint(struct net_device *dev, bool keep_profile,</div><div class='del'>-			  bool get_dbglogs)</div><div class='del'>-{</div><div class='del'>-	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='del'>-	static u8 bcast_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};</div><div class='del'>-	bool discon_issued;</div><div class='del'>-</div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-</div><div class='del'>-	/* disable the target and the interrupts associated with it */</div><div class='del'>-	if (test_bit(WMI_READY, &amp;ar-&gt;flag)) {</div><div class='del'>-		discon_issued = (test_bit(CONNECTED, &amp;ar-&gt;flag) ||</div><div class='del'>-				 test_bit(CONNECT_PEND, &amp;ar-&gt;flag));</div><div class='del'>-		ath6kl_disconnect(ar);</div><div class='del'>-		if (!keep_profile)</div><div class='del'>-			ath6kl_init_profile_info(ar);</div><div class='del'>-</div><div class='del'>-		del_timer(&amp;ar-&gt;disconnect_timer);</div><div class='del'>-</div><div class='del'>-		clear_bit(WMI_READY, &amp;ar-&gt;flag);</div><div class='del'>-		ath6kl_wmi_shutdown(ar-&gt;wmi);</div><div class='del'>-		clear_bit(WMI_ENABLED, &amp;ar-&gt;flag);</div><div class='del'>-		ar-&gt;wmi = NULL;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * After wmi_shudown all WMI events will be dropped. We</div><div class='del'>-		 * need to cleanup the buffers allocated in AP mode and</div><div class='del'>-		 * give disconnect notification to stack, which usually</div><div class='del'>-		 * happens in the disconnect_event. Simulate the disconnect</div><div class='del'>-		 * event by calling the function directly. Sometimes</div><div class='del'>-		 * disconnect_event will be received when the debug logs</div><div class='del'>-		 * are collected.</div><div class='del'>-		 */</div><div class='del'>-		if (discon_issued)</div><div class='del'>-			ath6kl_disconnect_event(ar, DISCONNECT_CMD,</div><div class='del'>-						(ar-&gt;nw_type &amp; AP_NETWORK) ?</div><div class='del'>-						bcast_mac : ar-&gt;bssid,</div><div class='del'>-						0, NULL, 0);</div><div class='del'>-</div><div class='del'>-		ar-&gt;user_key_ctrl = 0;</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_TRC,</div><div class='del'>-			   "%s: wmi is not ready 0x%p 0x%p\n",</div><div class='del'>-			   __func__, ar, ar-&gt;wmi);</div><div class='del'>-</div><div class='del'>-		/* Shut down WMI if we have started it */</div><div class='del'>-		if (test_bit(WMI_ENABLED, &amp;ar-&gt;flag)) {</div><div class='del'>-			ath6kl_dbg(ATH6KL_DBG_TRC,</div><div class='del'>-				   "%s: shut down wmi\n", __func__);</div><div class='del'>-			ath6kl_wmi_shutdown(ar-&gt;wmi);</div><div class='del'>-			clear_bit(WMI_ENABLED, &amp;ar-&gt;flag);</div><div class='del'>-			ar-&gt;wmi = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ar-&gt;htc_target) {</div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_TRC, "%s: shut down htc\n", __func__);</div><div class='del'>-		ath6kl_htc_stop(ar-&gt;htc_target);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Try to reset the device if we can. The driver may have been</div><div class='del'>-	 * configure NOT to reset the target during a debug session.</div><div class='del'>-	 */</div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_TRC,</div><div class='del'>-		   "attempting to reset target on instance destroy\n");</div><div class='del'>-	ath6kl_reset_device(ar, ar-&gt;target_type, true, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath6kl_install_static_wep_keys(struct ath6kl *ar)</div><div class='add'>+static void ath6kl_install_static_wep_keys(struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	u8 index;</div><div class='ctx'> 	u8 keyusage;</div><div class='ctx'> </div><div class='ctx'> 	for (index = WMI_MIN_KEY_INDEX; index &lt;= WMI_MAX_KEY_INDEX; index++) {</div><div class='del'>-		if (ar-&gt;wep_key_list[index].key_len) {</div><div class='add'>+		if (vif-&gt;wep_key_list[index].key_len) {</div><div class='ctx'> 			keyusage = GROUP_USAGE;</div><div class='del'>-			if (index == ar-&gt;def_txkey_index)</div><div class='add'>+			if (index == vif-&gt;def_txkey_index)</div><div class='ctx'> 				keyusage |= TX_USAGE;</div><div class='ctx'> </div><div class='del'>-			ath6kl_wmi_addkey_cmd(ar-&gt;wmi,</div><div class='add'>+			ath6kl_wmi_addkey_cmd(vif-&gt;ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='ctx'> 					      index,</div><div class='ctx'> 					      WEP_CRYPT,</div><div class='ctx'> 					      keyusage,</div><div class='del'>-					      ar-&gt;wep_key_list[index].key_len,</div><div class='del'>-					      NULL,</div><div class='del'>-					      ar-&gt;wep_key_list[index].key,</div><div class='add'>+					      vif-&gt;wep_key_list[index].key_len,</div><div class='add'>+					      NULL, 0,</div><div class='add'>+					      vif-&gt;wep_key_list[index].key,</div><div class='ctx'> 					      KEY_OP_INIT_VAL, NULL,</div><div class='ctx'> 					      NO_SYNC_WMIFLAG);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_connect_ap_mode_bss(struct ath6kl *ar, u16 channel)</div><div class='add'>+void ath6kl_connect_ap_mode_bss(struct ath6kl_vif *vif, u16 channel)</div><div class='ctx'> {</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='ctx'> 	struct ath6kl_req_key *ik;</div><div class='ctx'> 	int res;</div><div class='ctx'> 	u8 key_rsc[ATH6KL_KEY_SEQ_LEN];</div><div class='hunk'>@@ -529,11 +393,13 @@ void ath6kl_connect_ap_mode_bss(struct ath6kl *ar, u16 channel)</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "AP mode started on %u MHz\n", channel);</div><div class='ctx'> </div><div class='del'>-	switch (ar-&gt;auth_mode) {</div><div class='add'>+	switch (vif-&gt;auth_mode) {</div><div class='ctx'> 	case NONE_AUTH:</div><div class='del'>-		if (ar-&gt;prwise_crypto == WEP_CRYPT)</div><div class='del'>-			ath6kl_install_static_wep_keys(ar);</div><div class='del'>-		break;</div><div class='add'>+		if (vif-&gt;prwise_crypto == WEP_CRYPT)</div><div class='add'>+			ath6kl_install_static_wep_keys(vif);</div><div class='add'>+		if (!ik-&gt;valid || ik-&gt;key_type != WAPI_CRYPT)</div><div class='add'>+			break;</div><div class='add'>+		/* for WAPI, we need to set the delayed group key, continue: */</div><div class='ctx'> 	case WPA_PSK_AUTH:</div><div class='ctx'> 	case WPA2_PSK_AUTH:</div><div class='ctx'> 	case (WPA_PSK_AUTH | WPA2_PSK_AUTH):</div><div class='hunk'>@@ -544,8 +410,9 @@ void ath6kl_connect_ap_mode_bss(struct ath6kl *ar, u16 channel)</div><div class='ctx'> 			   "the initial group key for AP mode\n");</div><div class='ctx'> 		memset(key_rsc, 0, sizeof(key_rsc));</div><div class='ctx'> 		res = ath6kl_wmi_addkey_cmd(</div><div class='del'>-			ar-&gt;wmi, ik-&gt;key_index, ik-&gt;key_type,</div><div class='del'>-			GROUP_USAGE, ik-&gt;key_len, key_rsc, ik-&gt;key,</div><div class='add'>+			ar-&gt;wmi, vif-&gt;fw_vif_idx, ik-&gt;key_index, ik-&gt;key_type,</div><div class='add'>+			GROUP_USAGE, ik-&gt;key_len, key_rsc, ATH6KL_KEY_SEQ_LEN,</div><div class='add'>+			ik-&gt;key,</div><div class='ctx'> 			KEY_OP_INIT_VAL, NULL, SYNC_BOTH_WMIFLAG);</div><div class='ctx'> 		if (res) {</div><div class='ctx'> 			ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "Delayed "</div><div class='hunk'>@@ -554,15 +421,16 @@ void ath6kl_connect_ap_mode_bss(struct ath6kl *ar, u16 channel)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath6kl_wmi_bssfilter_cmd(ar-&gt;wmi, NONE_BSS_FILTER, 0);</div><div class='del'>-	set_bit(CONNECTED, &amp;ar-&gt;flag);</div><div class='del'>-	netif_carrier_on(ar-&gt;net_dev);</div><div class='add'>+	ath6kl_wmi_bssfilter_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx, NONE_BSS_FILTER, 0);</div><div class='add'>+	set_bit(CONNECTED, &amp;vif-&gt;flags);</div><div class='add'>+	netif_carrier_on(vif-&gt;ndev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_connect_ap_mode_sta(struct ath6kl *ar, u16 aid, u8 *mac_addr,</div><div class='add'>+void ath6kl_connect_ap_mode_sta(struct ath6kl_vif *vif, u16 aid, u8 *mac_addr,</div><div class='ctx'> 				u8 keymgmt, u8 ucipher, u8 auth,</div><div class='ctx'> 				u8 assoc_req_len, u8 *assoc_info)</div><div class='ctx'> {</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='ctx'> 	u8 *ies = NULL, *wpa_ie = NULL, *pos;</div><div class='ctx'> 	size_t ies_len = 0;</div><div class='ctx'> 	struct station_info sinfo;</div><div class='hunk'>@@ -600,6 +468,18 @@ void ath6kl_connect_ap_mode_sta(struct ath6kl *ar, u16 aid, u8 *mac_addr,</div><div class='ctx'> 				wpa_ie = pos; /* WPS IE */</div><div class='ctx'> 				break; /* overrides WPA/RSN IE */</div><div class='ctx'> 			}</div><div class='add'>+		} else if (pos[0] == 0x44 &amp;&amp; wpa_ie == NULL) {</div><div class='add'>+			/*</div><div class='add'>+			 * Note: WAPI Parameter Set IE re-uses Element ID that</div><div class='add'>+			 * was officially allocated for BSS AC Access Delay. As</div><div class='add'>+			 * such, we need to be a bit more careful on when</div><div class='add'>+			 * parsing the frame. However, BSS AC Access Delay</div><div class='add'>+			 * element is not supposed to be included in</div><div class='add'>+			 * (Re)Association Request frames, so this should not</div><div class='add'>+			 * cause problems.</div><div class='add'>+			 */</div><div class='add'>+			wpa_ie = pos; /* WAPI IE */</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		pos += 2 + pos[1];</div><div class='ctx'> 	}</div><div class='hunk'>@@ -617,380 +497,49 @@ void ath6kl_connect_ap_mode_sta(struct ath6kl *ar, u16 aid, u8 *mac_addr,</div><div class='ctx'> 	sinfo.assoc_req_ies_len = ies_len;</div><div class='ctx'> 	sinfo.filled |= STATION_INFO_ASSOC_REQ_IES;</div><div class='ctx'> </div><div class='del'>-	cfg80211_new_sta(ar-&gt;net_dev, mac_addr, &amp;sinfo, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	netif_wake_queue(ar-&gt;net_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Functions for Tx credit handling */</div><div class='del'>-void ath6k_credit_init(struct htc_credit_state_info *cred_info,</div><div class='del'>-		       struct list_head *ep_list,</div><div class='del'>-		       int tot_credits)</div><div class='del'>-{</div><div class='del'>-	struct htc_endpoint_credit_dist *cur_ep_dist;</div><div class='del'>-	int count;</div><div class='del'>-</div><div class='del'>-	cred_info-&gt;cur_free_credits = tot_credits;</div><div class='del'>-	cred_info-&gt;total_avail_credits = tot_credits;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(cur_ep_dist, ep_list, list) {</div><div class='del'>-		if (cur_ep_dist-&gt;endpoint == ENDPOINT_0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		cur_ep_dist-&gt;cred_min = cur_ep_dist-&gt;cred_per_msg;</div><div class='del'>-</div><div class='del'>-		if (tot_credits &gt; 4)</div><div class='del'>-			if ((cur_ep_dist-&gt;svc_id == WMI_DATA_BK_SVC) ||</div><div class='del'>-			    (cur_ep_dist-&gt;svc_id == WMI_DATA_BE_SVC)) {</div><div class='del'>-				ath6kl_deposit_credit_to_ep(cred_info,</div><div class='del'>-						cur_ep_dist,</div><div class='del'>-						cur_ep_dist-&gt;cred_min);</div><div class='del'>-				cur_ep_dist-&gt;dist_flags |= HTC_EP_ACTIVE;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		if (cur_ep_dist-&gt;svc_id == WMI_CONTROL_SVC) {</div><div class='del'>-			ath6kl_deposit_credit_to_ep(cred_info, cur_ep_dist,</div><div class='del'>-						    cur_ep_dist-&gt;cred_min);</div><div class='del'>-			/*</div><div class='del'>-			 * Control service is always marked active, it</div><div class='del'>-			 * never goes inactive EVER.</div><div class='del'>-			 */</div><div class='del'>-			cur_ep_dist-&gt;dist_flags |= HTC_EP_ACTIVE;</div><div class='del'>-		} else if (cur_ep_dist-&gt;svc_id == WMI_DATA_BK_SVC)</div><div class='del'>-			/* this is the lowest priority data endpoint */</div><div class='del'>-			cred_info-&gt;lowestpri_ep_dist = cur_ep_dist-&gt;list;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Streams have to be created (explicit | implicit) for all</div><div class='del'>-		 * kinds of traffic. BE endpoints are also inactive in the</div><div class='del'>-		 * beginning. When BE traffic starts it creates implicit</div><div class='del'>-		 * streams that redistributes credits.</div><div class='del'>-		 *</div><div class='del'>-		 * Note: all other endpoints have minimums set but are</div><div class='del'>-		 * initially given NO credits. credits will be distributed</div><div class='del'>-		 * as traffic activity demands</div><div class='del'>-		 */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	WARN_ON(cred_info-&gt;cur_free_credits &lt;= 0);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(cur_ep_dist, ep_list, list) {</div><div class='del'>-		if (cur_ep_dist-&gt;endpoint == ENDPOINT_0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (cur_ep_dist-&gt;svc_id == WMI_CONTROL_SVC)</div><div class='del'>-			cur_ep_dist-&gt;cred_norm = cur_ep_dist-&gt;cred_per_msg;</div><div class='del'>-		else {</div><div class='del'>-			/*</div><div class='del'>-			 * For the remaining data endpoints, we assume that</div><div class='del'>-			 * each cred_per_msg are the same. We use a simple</div><div class='del'>-			 * calculation here, we take the remaining credits</div><div class='del'>-			 * and determine how many max messages this can</div><div class='del'>-			 * cover and then set each endpoint's normal value</div><div class='del'>-			 * equal to 3/4 this amount.</div><div class='del'>-			 */</div><div class='del'>-			count = (cred_info-&gt;cur_free_credits /</div><div class='del'>-				 cur_ep_dist-&gt;cred_per_msg)</div><div class='del'>-				* cur_ep_dist-&gt;cred_per_msg;</div><div class='del'>-			count = (count * 3) &gt;&gt; 2;</div><div class='del'>-			count = max(count, cur_ep_dist-&gt;cred_per_msg);</div><div class='del'>-			cur_ep_dist-&gt;cred_norm = count;</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* initialize and setup credit distribution */</div><div class='del'>-int ath6k_setup_credit_dist(void *htc_handle,</div><div class='del'>-			    struct htc_credit_state_info *cred_info)</div><div class='del'>-{</div><div class='del'>-	u16 servicepriority[5];</div><div class='del'>-</div><div class='del'>-	memset(cred_info, 0, sizeof(struct htc_credit_state_info));</div><div class='del'>-</div><div class='del'>-	servicepriority[0] = WMI_CONTROL_SVC;  /* highest */</div><div class='del'>-	servicepriority[1] = WMI_DATA_VO_SVC;</div><div class='del'>-	servicepriority[2] = WMI_DATA_VI_SVC;</div><div class='del'>-	servicepriority[3] = WMI_DATA_BE_SVC;</div><div class='del'>-	servicepriority[4] = WMI_DATA_BK_SVC; /* lowest */</div><div class='del'>-</div><div class='del'>-	/* set priority list */</div><div class='del'>-	ath6kl_htc_set_credit_dist(htc_handle, cred_info, servicepriority, 5);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* reduce an ep's credits back to a set limit */</div><div class='del'>-static void ath6k_reduce_credits(struct htc_credit_state_info *cred_info,</div><div class='del'>-				 struct htc_endpoint_credit_dist  *ep_dist,</div><div class='del'>-				 int limit)</div><div class='del'>-{</div><div class='del'>-	int credits;</div><div class='del'>-</div><div class='del'>-	ep_dist-&gt;cred_assngd = limit;</div><div class='del'>-</div><div class='del'>-	if (ep_dist-&gt;credits &lt;= limit)</div><div class='del'>-		return;</div><div class='add'>+	cfg80211_new_sta(vif-&gt;ndev, mac_addr, &amp;sinfo, GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	credits = ep_dist-&gt;credits - limit;</div><div class='del'>-	ep_dist-&gt;credits -= credits;</div><div class='del'>-	cred_info-&gt;cur_free_credits += credits;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ath6k_credit_update(struct htc_credit_state_info *cred_info,</div><div class='del'>-				struct list_head *epdist_list)</div><div class='del'>-{</div><div class='del'>-	struct htc_endpoint_credit_dist *cur_dist_list;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(cur_dist_list, epdist_list, list) {</div><div class='del'>-		if (cur_dist_list-&gt;endpoint == ENDPOINT_0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (cur_dist_list-&gt;cred_to_dist &gt; 0) {</div><div class='del'>-			cur_dist_list-&gt;credits +=</div><div class='del'>-					cur_dist_list-&gt;cred_to_dist;</div><div class='del'>-			cur_dist_list-&gt;cred_to_dist = 0;</div><div class='del'>-			if (cur_dist_list-&gt;credits &gt;</div><div class='del'>-			    cur_dist_list-&gt;cred_assngd)</div><div class='del'>-				ath6k_reduce_credits(cred_info,</div><div class='del'>-						cur_dist_list,</div><div class='del'>-						cur_dist_list-&gt;cred_assngd);</div><div class='del'>-</div><div class='del'>-			if (cur_dist_list-&gt;credits &gt;</div><div class='del'>-			    cur_dist_list-&gt;cred_norm)</div><div class='del'>-				ath6k_reduce_credits(cred_info, cur_dist_list,</div><div class='del'>-						     cur_dist_list-&gt;cred_norm);</div><div class='del'>-</div><div class='del'>-			if (!(cur_dist_list-&gt;dist_flags &amp; HTC_EP_ACTIVE)) {</div><div class='del'>-				if (cur_dist_list-&gt;txq_depth == 0)</div><div class='del'>-					ath6k_reduce_credits(cred_info,</div><div class='del'>-							     cur_dist_list, 0);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * HTC has an endpoint that needs credits, ep_dist is the endpoint in</div><div class='del'>- * question.</div><div class='del'>- */</div><div class='del'>-void ath6k_seek_credits(struct htc_credit_state_info *cred_info,</div><div class='del'>-			struct htc_endpoint_credit_dist *ep_dist)</div><div class='del'>-{</div><div class='del'>-	struct htc_endpoint_credit_dist *curdist_list;</div><div class='del'>-	int credits = 0;</div><div class='del'>-	int need;</div><div class='del'>-</div><div class='del'>-	if (ep_dist-&gt;svc_id == WMI_CONTROL_SVC)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if ((ep_dist-&gt;svc_id == WMI_DATA_VI_SVC) ||</div><div class='del'>-	    (ep_dist-&gt;svc_id == WMI_DATA_VO_SVC))</div><div class='del'>-		if ((ep_dist-&gt;cred_assngd &gt;= ep_dist-&gt;cred_norm))</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For all other services, we follow a simple algorithm of:</div><div class='del'>-	 *</div><div class='del'>-	 * 1. checking the free pool for credits</div><div class='del'>-	 * 2. checking lower priority endpoints for credits to take</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	credits = min(cred_info-&gt;cur_free_credits, ep_dist-&gt;seek_cred);</div><div class='del'>-</div><div class='del'>-	if (credits &gt;= ep_dist-&gt;seek_cred)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We don't have enough in the free pool, try taking away from</div><div class='del'>-	 * lower priority services The rule for taking away credits:</div><div class='del'>-	 *</div><div class='del'>-	 *   1. Only take from lower priority endpoints</div><div class='del'>-	 *   2. Only take what is allocated above the minimum (never</div><div class='del'>-	 *      starve an endpoint completely)</div><div class='del'>-	 *   3. Only take what you need.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_reverse(curdist_list,</div><div class='del'>-				    &amp;cred_info-&gt;lowestpri_ep_dist,</div><div class='del'>-				    list) {</div><div class='del'>-		if (curdist_list == ep_dist)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		need = ep_dist-&gt;seek_cred - cred_info-&gt;cur_free_credits;</div><div class='del'>-</div><div class='del'>-		if ((curdist_list-&gt;cred_assngd - need) &gt;=</div><div class='del'>-		     curdist_list-&gt;cred_min) {</div><div class='del'>-			/*</div><div class='del'>-			 * The current one has been allocated more than</div><div class='del'>-			 * it's minimum and it has enough credits assigned</div><div class='del'>-			 * above it's minimum to fulfill our need try to</div><div class='del'>-			 * take away just enough to fulfill our need.</div><div class='del'>-			 */</div><div class='del'>-			ath6k_reduce_credits(cred_info, curdist_list,</div><div class='del'>-					curdist_list-&gt;cred_assngd - need);</div><div class='del'>-</div><div class='del'>-			if (cred_info-&gt;cur_free_credits &gt;=</div><div class='del'>-			    ep_dist-&gt;seek_cred)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (curdist_list-&gt;endpoint == ENDPOINT_0)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	credits = min(cred_info-&gt;cur_free_credits, ep_dist-&gt;seek_cred);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	/* did we find some credits? */</div><div class='del'>-	if (credits)</div><div class='del'>-		ath6kl_deposit_credit_to_ep(cred_info, ep_dist, credits);</div><div class='del'>-</div><div class='del'>-	ep_dist-&gt;seek_cred = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* redistribute credits based on activity change */</div><div class='del'>-static void ath6k_redistribute_credits(struct htc_credit_state_info *info,</div><div class='del'>-				       struct list_head *ep_dist_list)</div><div class='del'>-{</div><div class='del'>-	struct htc_endpoint_credit_dist *curdist_list;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(curdist_list, ep_dist_list, list) {</div><div class='del'>-		if (curdist_list-&gt;endpoint == ENDPOINT_0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if ((curdist_list-&gt;svc_id == WMI_DATA_BK_SVC)  ||</div><div class='del'>-		    (curdist_list-&gt;svc_id == WMI_DATA_BE_SVC))</div><div class='del'>-			curdist_list-&gt;dist_flags |= HTC_EP_ACTIVE;</div><div class='del'>-</div><div class='del'>-		if ((curdist_list-&gt;svc_id != WMI_CONTROL_SVC) &amp;&amp;</div><div class='del'>-		    !(curdist_list-&gt;dist_flags &amp; HTC_EP_ACTIVE)) {</div><div class='del'>-			if (curdist_list-&gt;txq_depth == 0)</div><div class='del'>-				ath6k_reduce_credits(info,</div><div class='del'>-						curdist_list, 0);</div><div class='del'>-			else</div><div class='del'>-				ath6k_reduce_credits(info,</div><div class='del'>-						curdist_list,</div><div class='del'>-						curdist_list-&gt;cred_min);</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'>- * This function is invoked whenever endpoints require credit</div><div class='del'>- * distributions. A lock is held while this function is invoked, this</div><div class='del'>- * function shall NOT block. The ep_dist_list is a list of distribution</div><div class='del'>- * structures in prioritized order as defined by the call to the</div><div class='del'>- * htc_set_credit_dist() api.</div><div class='del'>- */</div><div class='del'>-void ath6k_credit_distribute(struct htc_credit_state_info *cred_info,</div><div class='del'>-			     struct list_head *ep_dist_list,</div><div class='del'>-			     enum htc_credit_dist_reason reason)</div><div class='del'>-{</div><div class='del'>-	switch (reason) {</div><div class='del'>-	case HTC_CREDIT_DIST_SEND_COMPLETE:</div><div class='del'>-		ath6k_credit_update(cred_info, ep_dist_list);</div><div class='del'>-		break;</div><div class='del'>-	case HTC_CREDIT_DIST_ACTIVITY_CHANGE:</div><div class='del'>-		ath6k_redistribute_credits(cred_info, ep_dist_list);</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'>-	WARN_ON(cred_info-&gt;cur_free_credits &gt; cred_info-&gt;total_avail_credits);</div><div class='del'>-	WARN_ON(cred_info-&gt;cur_free_credits &lt; 0);</div><div class='add'>+	netif_wake_queue(vif-&gt;ndev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void disconnect_timer_handler(unsigned long ptr)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = (struct net_device *)ptr;</div><div class='del'>-	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	ath6kl_init_profile_info(ar);</div><div class='del'>-	ath6kl_disconnect(ar);</div><div class='add'>+	ath6kl_init_profile_info(vif);</div><div class='add'>+	ath6kl_disconnect(vif);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_disconnect(struct ath6kl *ar)</div><div class='add'>+void ath6kl_disconnect(struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	if (test_bit(CONNECTED, &amp;ar-&gt;flag) ||</div><div class='del'>-	    test_bit(CONNECT_PEND, &amp;ar-&gt;flag)) {</div><div class='del'>-		ath6kl_wmi_disconnect_cmd(ar-&gt;wmi);</div><div class='add'>+	if (test_bit(CONNECTED, &amp;vif-&gt;flags) ||</div><div class='add'>+	    test_bit(CONNECT_PEND, &amp;vif-&gt;flags)) {</div><div class='add'>+		ath6kl_wmi_disconnect_cmd(vif-&gt;ar-&gt;wmi, vif-&gt;fw_vif_idx);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Disconnect command is issued, clear the connect pending</div><div class='ctx'> 		 * flag. The connected flag will be cleared in</div><div class='ctx'> 		 * disconnect event notification.</div><div class='ctx'> 		 */</div><div class='del'>-		clear_bit(CONNECT_PEND, &amp;ar-&gt;flag);</div><div class='add'>+		clear_bit(CONNECT_PEND, &amp;vif-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_deep_sleep_enable(struct ath6kl *ar)</div><div class='del'>-{</div><div class='del'>-	switch (ar-&gt;sme_state) {</div><div class='del'>-	case SME_CONNECTING:</div><div class='del'>-		cfg80211_connect_result(ar-&gt;net_dev, ar-&gt;bssid, NULL, 0,</div><div class='del'>-					NULL, 0,</div><div class='del'>-					WLAN_STATUS_UNSPECIFIED_FAILURE,</div><div class='del'>-					GFP_KERNEL);</div><div class='del'>-		break;</div><div class='del'>-	case SME_CONNECTED:</div><div class='del'>-	default:</div><div class='del'>-		/*</div><div class='del'>-		 * FIXME: oddly enough smeState is in DISCONNECTED during</div><div class='del'>-		 * suspend, why? Need to send disconnected event in that</div><div class='del'>-		 * state.</div><div class='del'>-		 */</div><div class='del'>-		cfg80211_disconnected(ar-&gt;net_dev, 0, NULL, 0, GFP_KERNEL);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (test_bit(CONNECTED, &amp;ar-&gt;flag) ||</div><div class='del'>-	    test_bit(CONNECT_PEND, &amp;ar-&gt;flag))</div><div class='del'>-		ath6kl_wmi_disconnect_cmd(ar-&gt;wmi);</div><div class='del'>-</div><div class='del'>-	ar-&gt;sme_state = SME_DISCONNECTED;</div><div class='del'>-</div><div class='del'>-	/* disable scanning */</div><div class='del'>-	if (ath6kl_wmi_scanparams_cmd(ar-&gt;wmi, 0xFFFF, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-				      0, 0) != 0)</div><div class='del'>-		printk(KERN_WARNING "ath6kl: failed to disable scan "</div><div class='del'>-		       "during suspend\n");</div><div class='del'>-</div><div class='del'>-	ath6kl_cfg80211_scan_complete_event(ar, -ECANCELED);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* WMI Event handlers */</div><div class='ctx'> </div><div class='del'>-static const char *get_hw_id_string(u32 id)</div><div class='del'>-{</div><div class='del'>-	switch (id) {</div><div class='del'>-	case AR6003_REV1_VERSION:</div><div class='del'>-		return "1.0";</div><div class='del'>-	case AR6003_REV2_VERSION:</div><div class='del'>-		return "2.0";</div><div class='del'>-	case AR6003_REV3_VERSION:</div><div class='del'>-		return "2.1.1";</div><div class='del'>-	default:</div><div class='del'>-		return "unknown";</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void ath6kl_ready_event(void *devt, u8 *datap, u32 sw_ver, u32 abi_ver)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = devt;</div><div class='del'>-	struct net_device *dev = ar-&gt;net_dev;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, datap, ETH_ALEN);</div><div class='add'>+	memcpy(ar-&gt;mac_addr, datap, ETH_ALEN);</div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_TRC, "%s: mac addr = %pM\n",</div><div class='del'>-		   __func__, dev-&gt;dev_addr);</div><div class='add'>+		   __func__, ar-&gt;mac_addr);</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;version.wlan_ver = sw_ver;</div><div class='ctx'> 	ar-&gt;version.abi_ver = abi_ver;</div><div class='ctx'> </div><div class='del'>-	snprintf(ar-&gt;wdev-&gt;wiphy-&gt;fw_version,</div><div class='del'>-		 sizeof(ar-&gt;wdev-&gt;wiphy-&gt;fw_version),</div><div class='add'>+	snprintf(ar-&gt;wiphy-&gt;fw_version,</div><div class='add'>+		 sizeof(ar-&gt;wiphy-&gt;fw_version),</div><div class='ctx'> 		 "%u.%u.%u.%u",</div><div class='ctx'> 		 (ar-&gt;version.wlan_ver &amp; 0xf0000000) &gt;&gt; 28,</div><div class='ctx'> 		 (ar-&gt;version.wlan_ver &amp; 0x0f000000) &gt;&gt; 24,</div><div class='hunk'>@@ -1000,79 +549,85 @@ void ath6kl_ready_event(void *devt, u8 *datap, u32 sw_ver, u32 abi_ver)</div><div class='ctx'> 	/* indicate to the waiting thread that the ready event was received */</div><div class='ctx'> 	set_bit(WMI_READY, &amp;ar-&gt;flag);</div><div class='ctx'> 	wake_up(&amp;ar-&gt;event_wq);</div><div class='del'>-</div><div class='del'>-	ath6kl_info("hw %s fw %s%s\n",</div><div class='del'>-		    get_hw_id_string(ar-&gt;wdev-&gt;wiphy-&gt;hw_version),</div><div class='del'>-		    ar-&gt;wdev-&gt;wiphy-&gt;fw_version,</div><div class='del'>-		    test_bit(TESTMODE, &amp;ar-&gt;flag) ? " testmode" : "");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_scan_complete_evt(struct ath6kl *ar, int status)</div><div class='add'>+void ath6kl_scan_complete_evt(struct ath6kl_vif *vif, int status)</div><div class='ctx'> {</div><div class='del'>-	ath6kl_cfg80211_scan_complete_event(ar, status);</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='add'>+	bool aborted = false;</div><div class='add'>+</div><div class='add'>+	if (status != WMI_SCAN_STATUS_SUCCESS)</div><div class='add'>+		aborted = true;</div><div class='add'>+</div><div class='add'>+	ath6kl_cfg80211_scan_complete_event(vif, aborted);</div><div class='ctx'> </div><div class='ctx'> 	if (!ar-&gt;usr_bss_filter) {</div><div class='del'>-		clear_bit(CLEAR_BSSFILTER_ON_BEACON, &amp;ar-&gt;flag);</div><div class='del'>-		ath6kl_wmi_bssfilter_cmd(ar-&gt;wmi, NONE_BSS_FILTER, 0);</div><div class='add'>+		clear_bit(CLEAR_BSSFILTER_ON_BEACON, &amp;vif-&gt;flags);</div><div class='add'>+		ath6kl_wmi_bssfilter_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+					 NONE_BSS_FILTER, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_WLAN_SCAN, "scan complete: %d\n", status);</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "scan complete: %d\n", status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_connect_event(struct ath6kl *ar, u16 channel, u8 *bssid,</div><div class='add'>+void ath6kl_connect_event(struct ath6kl_vif *vif, u16 channel, u8 *bssid,</div><div class='ctx'> 			  u16 listen_int, u16 beacon_int,</div><div class='ctx'> 			  enum network_type net_type, u8 beacon_ie_len,</div><div class='ctx'> 			  u8 assoc_req_len, u8 assoc_resp_len,</div><div class='ctx'> 			  u8 *assoc_info)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='ctx'> </div><div class='del'>-	ath6kl_cfg80211_connect_event(ar, channel, bssid,</div><div class='add'>+	ath6kl_cfg80211_connect_event(vif, channel, bssid,</div><div class='ctx'> 				      listen_int, beacon_int,</div><div class='ctx'> 				      net_type, beacon_ie_len,</div><div class='ctx'> 				      assoc_req_len, assoc_resp_len,</div><div class='ctx'> 				      assoc_info);</div><div class='ctx'> </div><div class='del'>-	memcpy(ar-&gt;bssid, bssid, sizeof(ar-&gt;bssid));</div><div class='del'>-	ar-&gt;bss_ch = channel;</div><div class='add'>+	memcpy(vif-&gt;bssid, bssid, sizeof(vif-&gt;bssid));</div><div class='add'>+	vif-&gt;bss_ch = channel;</div><div class='ctx'> </div><div class='del'>-	if ((ar-&gt;nw_type == INFRA_NETWORK))</div><div class='del'>-		ath6kl_wmi_listeninterval_cmd(ar-&gt;wmi, ar-&gt;listen_intvl_t,</div><div class='add'>+	if ((vif-&gt;nw_type == INFRA_NETWORK))</div><div class='add'>+		ath6kl_wmi_listeninterval_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+					      ar-&gt;listen_intvl_t,</div><div class='ctx'> 					      ar-&gt;listen_intvl_b);</div><div class='ctx'> </div><div class='del'>-	netif_wake_queue(ar-&gt;net_dev);</div><div class='add'>+	netif_wake_queue(vif-&gt;ndev);</div><div class='ctx'> </div><div class='ctx'> 	/* Update connect &amp; link status atomically */</div><div class='del'>-	spin_lock_irqsave(&amp;ar-&gt;lock, flags);</div><div class='del'>-	set_bit(CONNECTED, &amp;ar-&gt;flag);</div><div class='del'>-	clear_bit(CONNECT_PEND, &amp;ar-&gt;flag);</div><div class='del'>-	netif_carrier_on(ar-&gt;net_dev);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ar-&gt;lock, flags);</div><div class='add'>+	spin_lock_bh(&amp;vif-&gt;if_lock);</div><div class='add'>+	set_bit(CONNECTED, &amp;vif-&gt;flags);</div><div class='add'>+	clear_bit(CONNECT_PEND, &amp;vif-&gt;flags);</div><div class='add'>+	netif_carrier_on(vif-&gt;ndev);</div><div class='add'>+	spin_unlock_bh(&amp;vif-&gt;if_lock);</div><div class='ctx'> </div><div class='del'>-	aggr_reset_state(ar-&gt;aggr_cntxt);</div><div class='del'>-	ar-&gt;reconnect_flag = 0;</div><div class='add'>+	aggr_reset_state(vif-&gt;aggr_cntxt);</div><div class='add'>+	vif-&gt;reconnect_flag = 0;</div><div class='ctx'> </div><div class='del'>-	if ((ar-&gt;nw_type == ADHOC_NETWORK) &amp;&amp; ar-&gt;ibss_ps_enable) {</div><div class='add'>+	if ((vif-&gt;nw_type == ADHOC_NETWORK) &amp;&amp; ar-&gt;ibss_ps_enable) {</div><div class='ctx'> 		memset(ar-&gt;node_map, 0, sizeof(ar-&gt;node_map));</div><div class='ctx'> 		ar-&gt;node_num = 0;</div><div class='ctx'> 		ar-&gt;next_ep_id = ENDPOINT_2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ar-&gt;usr_bss_filter) {</div><div class='del'>-		set_bit(CLEAR_BSSFILTER_ON_BEACON, &amp;ar-&gt;flag);</div><div class='del'>-		ath6kl_wmi_bssfilter_cmd(ar-&gt;wmi, CURRENT_BSS_FILTER, 0);</div><div class='add'>+		set_bit(CLEAR_BSSFILTER_ON_BEACON, &amp;vif-&gt;flags);</div><div class='add'>+		ath6kl_wmi_bssfilter_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+					 CURRENT_BSS_FILTER, 0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_tkip_micerr_event(struct ath6kl *ar, u8 keyid, bool ismcast)</div><div class='add'>+void ath6kl_tkip_micerr_event(struct ath6kl_vif *vif, u8 keyid, bool ismcast)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl_sta *sta;</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='ctx'> 	u8 tsc[6];</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For AP case, keyid will have aid of STA which sent pkt with</div><div class='ctx'> 	 * MIC error. Use this aid to get MAC &amp; send it to hostapd.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ar-&gt;nw_type == AP_NETWORK) {</div><div class='add'>+	if (vif-&gt;nw_type == AP_NETWORK) {</div><div class='ctx'> 		sta = ath6kl_find_sta_by_aid(ar, (keyid &gt;&gt; 2));</div><div class='ctx'> 		if (!sta)</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -1081,19 +636,20 @@ void ath6kl_tkip_micerr_event(struct ath6kl *ar, u8 keyid, bool ismcast)</div><div class='ctx'> 			   "ap tkip mic error received from aid=%d\n", keyid);</div><div class='ctx'> </div><div class='ctx'> 		memset(tsc, 0, sizeof(tsc)); /* FIX: get correct TSC */</div><div class='del'>-		cfg80211_michael_mic_failure(ar-&gt;net_dev, sta-&gt;mac,</div><div class='add'>+		cfg80211_michael_mic_failure(vif-&gt;ndev, sta-&gt;mac,</div><div class='ctx'> 					     NL80211_KEYTYPE_PAIRWISE, keyid,</div><div class='ctx'> 					     tsc, GFP_KERNEL);</div><div class='ctx'> 	} else</div><div class='del'>-		ath6kl_cfg80211_tkip_micerr_event(ar, keyid, ismcast);</div><div class='add'>+		ath6kl_cfg80211_tkip_micerr_event(vif, keyid, ismcast);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath6kl_update_target_stats(struct ath6kl *ar, u8 *ptr, u32 len)</div><div class='add'>+static void ath6kl_update_target_stats(struct ath6kl_vif *vif, u8 *ptr, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_target_stats *tgt_stats =</div><div class='ctx'> 		(struct wmi_target_stats *) ptr;</div><div class='del'>-	struct target_stats *stats = &amp;ar-&gt;target_stats;</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='add'>+	struct target_stats *stats = &amp;vif-&gt;target_stats;</div><div class='ctx'> 	struct tkip_ccmp_stats *ccmp_stats;</div><div class='ctx'> 	u8 ac;</div><div class='ctx'> </div><div class='hunk'>@@ -1189,8 +745,8 @@ static void ath6kl_update_target_stats(struct ath6kl *ar, u8 *ptr, u32 len)</div><div class='ctx'> 	stats-&gt;wow_evt_discarded +=</div><div class='ctx'> 		le16_to_cpu(tgt_stats-&gt;wow_stats.wow_evt_discarded);</div><div class='ctx'> </div><div class='del'>-	if (test_bit(STATS_UPDATE_PEND, &amp;ar-&gt;flag)) {</div><div class='del'>-		clear_bit(STATS_UPDATE_PEND, &amp;ar-&gt;flag);</div><div class='add'>+	if (test_bit(STATS_UPDATE_PEND, &amp;vif-&gt;flags)) {</div><div class='add'>+		clear_bit(STATS_UPDATE_PEND, &amp;vif-&gt;flags);</div><div class='ctx'> 		wake_up(&amp;ar-&gt;event_wq);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1200,14 +756,15 @@ static void ath6kl_add_le32(__le32 *var, __le32 val)</div><div class='ctx'> 	*var = cpu_to_le32(le32_to_cpu(*var) + le32_to_cpu(val));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_tgt_stats_event(struct ath6kl *ar, u8 *ptr, u32 len)</div><div class='add'>+void ath6kl_tgt_stats_event(struct ath6kl_vif *vif, u8 *ptr, u32 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_ap_mode_stat *p = (struct wmi_ap_mode_stat *) ptr;</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='ctx'> 	struct wmi_ap_mode_stat *ap = &amp;ar-&gt;ap_stats;</div><div class='ctx'> 	struct wmi_per_sta_stat *st_ap, *st_p;</div><div class='ctx'> 	u8 ac;</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;nw_type == AP_NETWORK) {</div><div class='add'>+	if (vif-&gt;nw_type == AP_NETWORK) {</div><div class='ctx'> 		if (len &lt; sizeof(*p))</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='hunk'>@@ -1226,7 +783,7 @@ void ath6kl_tgt_stats_event(struct ath6kl *ar, u8 *ptr, u32 len)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='del'>-		ath6kl_update_target_stats(ar, ptr, len);</div><div class='add'>+		ath6kl_update_target_stats(vif, ptr, len);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1245,11 +802,12 @@ void ath6kl_txpwr_rx_evt(void *devt, u8 tx_pwr)</div><div class='ctx'> 	wake_up(&amp;ar-&gt;event_wq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_pspoll_event(struct ath6kl *ar, u8 aid)</div><div class='add'>+void ath6kl_pspoll_event(struct ath6kl_vif *vif, u8 aid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl_sta *conn;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	bool psq_empty = false;</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='ctx'> </div><div class='ctx'> 	conn = ath6kl_find_sta_by_aid(ar, aid);</div><div class='ctx'> </div><div class='hunk'>@@ -1272,7 +830,7 @@ void ath6kl_pspoll_event(struct ath6kl *ar, u8 aid)</div><div class='ctx'> 	spin_unlock_bh(&amp;conn-&gt;psq_lock);</div><div class='ctx'> </div><div class='ctx'> 	conn-&gt;sta_flags |= STA_PS_POLLED;</div><div class='del'>-	ath6kl_data_tx(skb, ar-&gt;net_dev);</div><div class='add'>+	ath6kl_data_tx(skb, vif-&gt;ndev);</div><div class='ctx'> 	conn-&gt;sta_flags &amp;= ~STA_PS_POLLED;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;conn-&gt;psq_lock);</div><div class='hunk'>@@ -1280,13 +838,14 @@ void ath6kl_pspoll_event(struct ath6kl *ar, u8 aid)</div><div class='ctx'> 	spin_unlock_bh(&amp;conn-&gt;psq_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (psq_empty)</div><div class='del'>-		ath6kl_wmi_set_pvb_cmd(ar-&gt;wmi, conn-&gt;aid, 0);</div><div class='add'>+		ath6kl_wmi_set_pvb_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx, conn-&gt;aid, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_dtimexpiry_event(struct ath6kl *ar)</div><div class='add'>+void ath6kl_dtimexpiry_event(struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	bool mcastq_empty = false;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If there are no associated STAs, ignore the DTIM expiry event.</div><div class='hunk'>@@ -1308,31 +867,31 @@ void ath6kl_dtimexpiry_event(struct ath6kl *ar)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* set the STA flag to dtim_expired for the frame to go out */</div><div class='del'>-	set_bit(DTIM_EXPIRED, &amp;ar-&gt;flag);</div><div class='add'>+	set_bit(DTIM_EXPIRED, &amp;vif-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ar-&gt;mcastpsq_lock);</div><div class='ctx'> 	while ((skb = skb_dequeue(&amp;ar-&gt;mcastpsq)) != NULL) {</div><div class='ctx'> 		spin_unlock_bh(&amp;ar-&gt;mcastpsq_lock);</div><div class='ctx'> </div><div class='del'>-		ath6kl_data_tx(skb, ar-&gt;net_dev);</div><div class='add'>+		ath6kl_data_tx(skb, vif-&gt;ndev);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_bh(&amp;ar-&gt;mcastpsq_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;mcastpsq_lock);</div><div class='ctx'> </div><div class='del'>-	clear_bit(DTIM_EXPIRED, &amp;ar-&gt;flag);</div><div class='add'>+	clear_bit(DTIM_EXPIRED, &amp;vif-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	/* clear the LSB of the BitMapCtl field of the TIM IE */</div><div class='del'>-	ath6kl_wmi_set_pvb_cmd(ar-&gt;wmi, MCAST_AID, 0);</div><div class='add'>+	ath6kl_wmi_set_pvb_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx, MCAST_AID, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ath6kl_disconnect_event(struct ath6kl *ar, u8 reason, u8 *bssid,</div><div class='add'>+void ath6kl_disconnect_event(struct ath6kl_vif *vif, u8 reason, u8 *bssid,</div><div class='ctx'> 			     u8 assoc_resp_len, u8 *assoc_info,</div><div class='ctx'> 			     u16 prot_reason_status)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;nw_type == AP_NETWORK) {</div><div class='add'>+	if (vif-&gt;nw_type == AP_NETWORK) {</div><div class='ctx'> 		if (!ath6kl_remove_sta(ar, bssid, prot_reason_status))</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='hunk'>@@ -1344,31 +903,31 @@ void ath6kl_disconnect_event(struct ath6kl *ar, u8 reason, u8 *bssid,</div><div class='ctx'> </div><div class='ctx'> 			/* clear the LSB of the TIM IE's BitMapCtl field */</div><div class='ctx'> 			if (test_bit(WMI_READY, &amp;ar-&gt;flag))</div><div class='del'>-				ath6kl_wmi_set_pvb_cmd(ar-&gt;wmi, MCAST_AID, 0);</div><div class='add'>+				ath6kl_wmi_set_pvb_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+						       MCAST_AID, 0);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!is_broadcast_ether_addr(bssid)) {</div><div class='ctx'> 			/* send event to application */</div><div class='del'>-			cfg80211_del_sta(ar-&gt;net_dev, bssid, GFP_KERNEL);</div><div class='add'>+			cfg80211_del_sta(vif-&gt;ndev, bssid, GFP_KERNEL);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (memcmp(ar-&gt;net_dev-&gt;dev_addr, bssid, ETH_ALEN) == 0) {</div><div class='del'>-			memset(ar-&gt;wep_key_list, 0, sizeof(ar-&gt;wep_key_list));</div><div class='del'>-			clear_bit(CONNECTED, &amp;ar-&gt;flag);</div><div class='add'>+		if (memcmp(vif-&gt;ndev-&gt;dev_addr, bssid, ETH_ALEN) == 0) {</div><div class='add'>+			memset(vif-&gt;wep_key_list, 0, sizeof(vif-&gt;wep_key_list));</div><div class='add'>+			clear_bit(CONNECTED, &amp;vif-&gt;flags);</div><div class='ctx'> 		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath6kl_cfg80211_disconnect_event(ar, reason, bssid,</div><div class='add'>+	ath6kl_cfg80211_disconnect_event(vif, reason, bssid,</div><div class='ctx'> 				       assoc_resp_len, assoc_info,</div><div class='ctx'> 				       prot_reason_status);</div><div class='ctx'> </div><div class='del'>-	aggr_reset_state(ar-&gt;aggr_cntxt);</div><div class='add'>+	aggr_reset_state(vif-&gt;aggr_cntxt);</div><div class='ctx'> </div><div class='del'>-	del_timer(&amp;ar-&gt;disconnect_timer);</div><div class='add'>+	del_timer(&amp;vif-&gt;disconnect_timer);</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_WLAN_CONNECT,</div><div class='del'>-		   "disconnect reason is %d\n", reason);</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "disconnect reason is %d\n", reason);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the event is due to disconnect cmd from the host, only they</div><div class='hunk'>@@ -1377,83 +936,88 @@ void ath6kl_disconnect_event(struct ath6kl *ar, u8 reason, u8 *bssid,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (reason == DISCONNECT_CMD) {</div><div class='ctx'> 		if (!ar-&gt;usr_bss_filter &amp;&amp; test_bit(WMI_READY, &amp;ar-&gt;flag))</div><div class='del'>-			ath6kl_wmi_bssfilter_cmd(ar-&gt;wmi, NONE_BSS_FILTER, 0);</div><div class='add'>+			ath6kl_wmi_bssfilter_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+						 NONE_BSS_FILTER, 0);</div><div class='ctx'> 	} else {</div><div class='del'>-		set_bit(CONNECT_PEND, &amp;ar-&gt;flag);</div><div class='add'>+		set_bit(CONNECT_PEND, &amp;vif-&gt;flags);</div><div class='ctx'> 		if (((reason == ASSOC_FAILED) &amp;&amp;</div><div class='ctx'> 		    (prot_reason_status == 0x11)) ||</div><div class='ctx'> 		    ((reason == ASSOC_FAILED) &amp;&amp; (prot_reason_status == 0x0)</div><div class='del'>-		     &amp;&amp; (ar-&gt;reconnect_flag == 1))) {</div><div class='del'>-			set_bit(CONNECTED, &amp;ar-&gt;flag);</div><div class='add'>+		     &amp;&amp; (vif-&gt;reconnect_flag == 1))) {</div><div class='add'>+			set_bit(CONNECTED, &amp;vif-&gt;flags);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* update connect &amp; link status atomically */</div><div class='del'>-	spin_lock_irqsave(&amp;ar-&gt;lock, flags);</div><div class='del'>-	clear_bit(CONNECTED, &amp;ar-&gt;flag);</div><div class='del'>-	netif_carrier_off(ar-&gt;net_dev);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ar-&gt;lock, flags);</div><div class='add'>+	spin_lock_bh(&amp;vif-&gt;if_lock);</div><div class='add'>+	clear_bit(CONNECTED, &amp;vif-&gt;flags);</div><div class='add'>+	netif_carrier_off(vif-&gt;ndev);</div><div class='add'>+	spin_unlock_bh(&amp;vif-&gt;if_lock);</div><div class='ctx'> </div><div class='del'>-	if ((reason != CSERV_DISCONNECT) || (ar-&gt;reconnect_flag != 1))</div><div class='del'>-		ar-&gt;reconnect_flag = 0;</div><div class='add'>+	if ((reason != CSERV_DISCONNECT) || (vif-&gt;reconnect_flag != 1))</div><div class='add'>+		vif-&gt;reconnect_flag = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (reason != CSERV_DISCONNECT)</div><div class='ctx'> 		ar-&gt;user_key_ctrl = 0;</div><div class='ctx'> </div><div class='del'>-	netif_stop_queue(ar-&gt;net_dev);</div><div class='del'>-	memset(ar-&gt;bssid, 0, sizeof(ar-&gt;bssid));</div><div class='del'>-	ar-&gt;bss_ch = 0;</div><div class='add'>+	netif_stop_queue(vif-&gt;ndev);</div><div class='add'>+	memset(vif-&gt;bssid, 0, sizeof(vif-&gt;bssid));</div><div class='add'>+	vif-&gt;bss_ch = 0;</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_tx_data_cleanup(ar);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_open(struct net_device *dev)</div><div class='add'>+struct ath6kl_vif *ath6kl_vif_first(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct ath6kl_vif *vif;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ar-&gt;lock, flags);</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;list_lock);</div><div class='add'>+	if (list_empty(&amp;ar-&gt;vif_list)) {</div><div class='add'>+		spin_unlock_bh(&amp;ar-&gt;list_lock);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	set_bit(WLAN_ENABLED, &amp;ar-&gt;flag);</div><div class='add'>+	vif = list_first_entry(&amp;ar-&gt;vif_list, struct ath6kl_vif, list);</div><div class='ctx'> </div><div class='del'>-	if (test_bit(CONNECTED, &amp;ar-&gt;flag)) {</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;list_lock);</div><div class='add'>+</div><div class='add'>+	return vif;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath6kl_open(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	set_bit(WLAN_ENABLED, &amp;vif-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if (test_bit(CONNECTED, &amp;vif-&gt;flags)) {</div><div class='ctx'> 		netif_carrier_on(dev);</div><div class='ctx'> 		netif_wake_queue(dev);</div><div class='ctx'> 	} else</div><div class='ctx'> 		netif_carrier_off(dev);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;ar-&gt;lock, flags);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> </div><div class='del'>-	ath6kl_disconnect(ar);</div><div class='del'>-</div><div class='del'>-	if (test_bit(WMI_READY, &amp;ar-&gt;flag)) {</div><div class='del'>-		if (ath6kl_wmi_scanparams_cmd(ar-&gt;wmi, 0xFFFF, 0, 0, 0, 0, 0, 0,</div><div class='del'>-					      0, 0, 0))</div><div class='del'>-			return -EIO;</div><div class='del'>-</div><div class='del'>-		clear_bit(WLAN_ENABLED, &amp;ar-&gt;flag);</div><div class='del'>-	}</div><div class='add'>+	ath6kl_cfg80211_stop(vif);</div><div class='ctx'> </div><div class='del'>-	ath6kl_cfg80211_scan_complete_event(ar, -ECANCELED);</div><div class='add'>+	clear_bit(WLAN_ENABLED, &amp;vif-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct net_device_stats *ath6kl_get_stats(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	return &amp;ar-&gt;net_stats;</div><div class='add'>+	return &amp;vif-&gt;net_stats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct net_device_ops ath6kl_netdev_ops = {</div><div class='hunk'>@@ -1466,6 +1030,7 @@ static struct net_device_ops ath6kl_netdev_ops = {</div><div class='ctx'> void init_netdev(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;ath6kl_netdev_ops;</div><div class='add'>+	dev-&gt;destructor = free_netdev;</div><div class='ctx'> 	dev-&gt;watchdog_timeo = ATH6KL_TX_TIMEOUT;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;needed_headroom = ETH_HLEN;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c<br/>index 066d4f88807f..9475e2d0d0b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/sdio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/sdio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/sdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/sdio.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #include &lt;linux/mmc/sdio_ids.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/sdio.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/sd.h&gt;</div><div class='del'>-#include "htc_hif.h"</div><div class='add'>+#include "hif.h"</div><div class='ctx'> #include "hif-ops.h"</div><div class='ctx'> #include "target.h"</div><div class='ctx'> #include "debug.h"</div><div class='hunk'>@@ -40,12 +40,18 @@ struct ath6kl_sdio {</div><div class='ctx'> 	struct bus_request bus_req[BUS_REQUEST_MAX_NUM];</div><div class='ctx'> </div><div class='ctx'> 	struct ath6kl *ar;</div><div class='add'>+</div><div class='ctx'> 	u8 *dma_buffer;</div><div class='ctx'> </div><div class='add'>+	/* protects access to dma_buffer */</div><div class='add'>+	struct mutex dma_buffer_mutex;</div><div class='add'>+</div><div class='ctx'> 	/* scatter request list head */</div><div class='ctx'> 	struct list_head scat_req;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t scat_lock;</div><div class='add'>+	bool scatter_enabled;</div><div class='add'>+</div><div class='ctx'> 	bool is_disabled;</div><div class='ctx'> 	atomic_t irq_handling;</div><div class='ctx'> 	const struct sdio_device_id *id;</div><div class='hunk'>@@ -135,6 +141,8 @@ static int ath6kl_sdio_io(struct sdio_func *func, u32 request, u32 addr,</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	sdio_claim_host(func);</div><div class='add'>+</div><div class='ctx'> 	if (request &amp; HIF_WRITE) {</div><div class='ctx'> 		/* FIXME: looks like ugly workaround for something */</div><div class='ctx'> 		if (addr &gt;= HIF_MBOX_BASE_ADDR &amp;&amp;</div><div class='hunk'>@@ -156,6 +164,8 @@ static int ath6kl_sdio_io(struct sdio_func *func, u32 request, u32 addr,</div><div class='ctx'> 			ret = sdio_memcpy_fromio(func, buf, addr, len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	sdio_release_host(func);</div><div class='add'>+</div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_SDIO, "%s addr 0x%x%s buf 0x%p len %d\n",</div><div class='ctx'> 		   request &amp; HIF_WRITE ? "wr" : "rd", addr,</div><div class='ctx'> 		   request &amp; HIF_FIXED_ADDRESS ? " (fixed)" : "", buf, len);</div><div class='hunk'>@@ -167,12 +177,11 @@ static int ath6kl_sdio_io(struct sdio_func *func, u32 request, u32 addr,</div><div class='ctx'> static struct bus_request *ath6kl_sdio_alloc_busreq(struct ath6kl_sdio *ar_sdio)</div><div class='ctx'> {</div><div class='ctx'> 	struct bus_request *bus_req;</div><div class='del'>-	unsigned long flag;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ar_sdio-&gt;lock, flag);</div><div class='add'>+	spin_lock_bh(&amp;ar_sdio-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(&amp;ar_sdio-&gt;bus_req_freeq)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;ar_sdio-&gt;lock, flag);</div><div class='add'>+		spin_unlock_bh(&amp;ar_sdio-&gt;lock);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -180,7 +189,7 @@ static struct bus_request *ath6kl_sdio_alloc_busreq(struct ath6kl_sdio *ar_sdio)</div><div class='ctx'> 				   struct bus_request, list);</div><div class='ctx'> 	list_del(&amp;bus_req-&gt;list);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;ar_sdio-&gt;lock, flag);</div><div class='add'>+	spin_unlock_bh(&amp;ar_sdio-&gt;lock);</div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_SCATTER, "%s: bus request 0x%p\n",</div><div class='ctx'> 		   __func__, bus_req);</div><div class='ctx'> </div><div class='hunk'>@@ -190,14 +199,12 @@ static struct bus_request *ath6kl_sdio_alloc_busreq(struct ath6kl_sdio *ar_sdio)</div><div class='ctx'> static void ath6kl_sdio_free_bus_req(struct ath6kl_sdio *ar_sdio,</div><div class='ctx'> 				     struct bus_request *bus_req)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flag;</div><div class='del'>-</div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_SCATTER, "%s: bus request 0x%p\n",</div><div class='ctx'> 		   __func__, bus_req);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ar_sdio-&gt;lock, flag);</div><div class='add'>+	spin_lock_bh(&amp;ar_sdio-&gt;lock);</div><div class='ctx'> 	list_add_tail(&amp;bus_req-&gt;list, &amp;ar_sdio-&gt;bus_req_freeq);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ar_sdio-&gt;lock, flag);</div><div class='add'>+	spin_unlock_bh(&amp;ar_sdio-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath6kl_sdio_setup_scat_data(struct hif_scatter_req *scat_req,</div><div class='hunk'>@@ -291,10 +298,14 @@ static int ath6kl_sdio_scat_rw(struct ath6kl_sdio *ar_sdio,</div><div class='ctx'> 	mmc_req.cmd = &amp;cmd;</div><div class='ctx'> 	mmc_req.data = &amp;data;</div><div class='ctx'> </div><div class='add'>+	sdio_claim_host(ar_sdio-&gt;func);</div><div class='add'>+</div><div class='ctx'> 	mmc_set_data_timeout(&amp;data, ar_sdio-&gt;func-&gt;card);</div><div class='ctx'> 	/* synchronous call to process request */</div><div class='ctx'> 	mmc_wait_for_req(ar_sdio-&gt;func-&gt;card-&gt;host, &amp;mmc_req);</div><div class='ctx'> </div><div class='add'>+	sdio_release_host(ar_sdio-&gt;func);</div><div class='add'>+</div><div class='ctx'> 	status = cmd.error ? cmd.error : data.error;</div><div class='ctx'> </div><div class='ctx'> scat_complete:</div><div class='hunk'>@@ -389,17 +400,19 @@ static int ath6kl_sdio_read_write_sync(struct ath6kl *ar, u32 addr, u8 *buf,</div><div class='ctx'> 	if (buf_needs_bounce(buf)) {</div><div class='ctx'> 		if (!ar_sdio-&gt;dma_buffer)</div><div class='ctx'> 			return -ENOMEM;</div><div class='add'>+		mutex_lock(&amp;ar_sdio-&gt;dma_buffer_mutex);</div><div class='ctx'> 		tbuf = ar_sdio-&gt;dma_buffer;</div><div class='ctx'> 		memcpy(tbuf, buf, len);</div><div class='ctx'> 		bounced = true;</div><div class='ctx'> 	} else</div><div class='ctx'> 		tbuf = buf;</div><div class='ctx'> </div><div class='del'>-	sdio_claim_host(ar_sdio-&gt;func);</div><div class='ctx'> 	ret = ath6kl_sdio_io(ar_sdio-&gt;func, request, addr, tbuf, len);</div><div class='ctx'> 	if ((request &amp; HIF_READ) &amp;&amp; bounced)</div><div class='ctx'> 		memcpy(buf, tbuf, len);</div><div class='del'>-	sdio_release_host(ar_sdio-&gt;func);</div><div class='add'>+</div><div class='add'>+	if (bounced)</div><div class='add'>+		mutex_unlock(&amp;ar_sdio-&gt;dma_buffer_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -418,29 +431,25 @@ static void __ath6kl_sdio_write_async(struct ath6kl_sdio *ar_sdio,</div><div class='ctx'> 						     req-&gt;request);</div><div class='ctx'> 		context = req-&gt;packet;</div><div class='ctx'> 		ath6kl_sdio_free_bus_req(ar_sdio, req);</div><div class='del'>-		ath6kldev_rw_comp_handler(context, status);</div><div class='add'>+		ath6kl_hif_rw_comp_handler(context, status);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath6kl_sdio_write_async_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl_sdio *ar_sdio;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct bus_request *req, *tmp_req;</div><div class='ctx'> </div><div class='ctx'> 	ar_sdio = container_of(work, struct ath6kl_sdio, wr_async_work);</div><div class='del'>-	sdio_claim_host(ar_sdio-&gt;func);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ar_sdio-&gt;wr_async_lock, flags);</div><div class='add'>+	spin_lock_bh(&amp;ar_sdio-&gt;wr_async_lock);</div><div class='ctx'> 	list_for_each_entry_safe(req, tmp_req, &amp;ar_sdio-&gt;wr_asyncq, list) {</div><div class='ctx'> 		list_del(&amp;req-&gt;list);</div><div class='del'>-		spin_unlock_irqrestore(&amp;ar_sdio-&gt;wr_async_lock, flags);</div><div class='add'>+		spin_unlock_bh(&amp;ar_sdio-&gt;wr_async_lock);</div><div class='ctx'> 		__ath6kl_sdio_write_async(ar_sdio, req);</div><div class='del'>-		spin_lock_irqsave(&amp;ar_sdio-&gt;wr_async_lock, flags);</div><div class='add'>+		spin_lock_bh(&amp;ar_sdio-&gt;wr_async_lock);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;ar_sdio-&gt;wr_async_lock, flags);</div><div class='del'>-</div><div class='del'>-	sdio_release_host(ar_sdio-&gt;func);</div><div class='add'>+	spin_unlock_bh(&amp;ar_sdio-&gt;wr_async_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath6kl_sdio_irq_handler(struct sdio_func *func)</div><div class='hunk'>@@ -459,20 +468,23 @@ static void ath6kl_sdio_irq_handler(struct sdio_func *func)</div><div class='ctx'> 	 */</div><div class='ctx'> 	sdio_release_host(ar_sdio-&gt;func);</div><div class='ctx'> </div><div class='del'>-	status = ath6kldev_intr_bh_handler(ar_sdio-&gt;ar);</div><div class='add'>+	status = ath6kl_hif_intr_bh_handler(ar_sdio-&gt;ar);</div><div class='ctx'> 	sdio_claim_host(ar_sdio-&gt;func);</div><div class='ctx'> 	atomic_set(&amp;ar_sdio-&gt;irq_handling, 0);</div><div class='ctx'> 	WARN_ON(status &amp;&amp; status != -ECANCELED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_sdio_power_on(struct ath6kl_sdio *ar_sdio)</div><div class='add'>+static int ath6kl_sdio_power_on(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='add'>+	struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar);</div><div class='ctx'> 	struct sdio_func *func = ar_sdio-&gt;func;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!ar_sdio-&gt;is_disabled)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_BOOT, "sdio power on\n");</div><div class='add'>+</div><div class='ctx'> 	sdio_claim_host(func);</div><div class='ctx'> </div><div class='ctx'> 	ret = sdio_enable_func(func);</div><div class='hunk'>@@ -495,13 +507,16 @@ static int ath6kl_sdio_power_on(struct ath6kl_sdio *ar_sdio)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_sdio_power_off(struct ath6kl_sdio *ar_sdio)</div><div class='add'>+static int ath6kl_sdio_power_off(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='add'>+	struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (ar_sdio-&gt;is_disabled)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_BOOT, "sdio power off\n");</div><div class='add'>+</div><div class='ctx'> 	/* Disable the card */</div><div class='ctx'> 	sdio_claim_host(ar_sdio-&gt;func);</div><div class='ctx'> 	ret = sdio_disable_func(ar_sdio-&gt;func);</div><div class='hunk'>@@ -521,7 +536,6 @@ static int ath6kl_sdio_write_async(struct ath6kl *ar, u32 address, u8 *buffer,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar);</div><div class='ctx'> 	struct bus_request *bus_req;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	bus_req = ath6kl_sdio_alloc_busreq(ar_sdio);</div><div class='ctx'> </div><div class='hunk'>@@ -534,9 +548,9 @@ static int ath6kl_sdio_write_async(struct ath6kl *ar, u32 address, u8 *buffer,</div><div class='ctx'> 	bus_req-&gt;request = request;</div><div class='ctx'> 	bus_req-&gt;packet = packet;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ar_sdio-&gt;wr_async_lock, flags);</div><div class='add'>+	spin_lock_bh(&amp;ar_sdio-&gt;wr_async_lock);</div><div class='ctx'> 	list_add_tail(&amp;bus_req-&gt;list, &amp;ar_sdio-&gt;wr_asyncq);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ar_sdio-&gt;wr_async_lock, flags);</div><div class='add'>+	spin_unlock_bh(&amp;ar_sdio-&gt;wr_async_lock);</div><div class='ctx'> 	queue_work(ar-&gt;ath6kl_wq, &amp;ar_sdio-&gt;wr_async_work);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -582,9 +596,8 @@ static struct hif_scatter_req *ath6kl_sdio_scatter_req_get(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar);</div><div class='ctx'> 	struct hif_scatter_req *node = NULL;</div><div class='del'>-	unsigned long flag;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ar_sdio-&gt;scat_lock, flag);</div><div class='add'>+	spin_lock_bh(&amp;ar_sdio-&gt;scat_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!list_empty(&amp;ar_sdio-&gt;scat_req)) {</div><div class='ctx'> 		node = list_first_entry(&amp;ar_sdio-&gt;scat_req,</div><div class='hunk'>@@ -592,7 +605,7 @@ static struct hif_scatter_req *ath6kl_sdio_scatter_req_get(struct ath6kl *ar)</div><div class='ctx'> 		list_del(&amp;node-&gt;list);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;ar_sdio-&gt;scat_lock, flag);</div><div class='add'>+	spin_unlock_bh(&amp;ar_sdio-&gt;scat_lock);</div><div class='ctx'> </div><div class='ctx'> 	return node;</div><div class='ctx'> }</div><div class='hunk'>@@ -601,13 +614,12 @@ static void ath6kl_sdio_scatter_req_add(struct ath6kl *ar,</div><div class='ctx'> 					struct hif_scatter_req *s_req)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar);</div><div class='del'>-	unsigned long flag;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ar_sdio-&gt;scat_lock, flag);</div><div class='add'>+	spin_lock_bh(&amp;ar_sdio-&gt;scat_lock);</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail(&amp;s_req-&gt;list, &amp;ar_sdio-&gt;scat_req);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;ar_sdio-&gt;scat_lock, flag);</div><div class='add'>+	spin_unlock_bh(&amp;ar_sdio-&gt;scat_lock);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -618,7 +630,6 @@ static int ath6kl_sdio_async_rw_scatter(struct ath6kl *ar,</div><div class='ctx'> 	struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar);</div><div class='ctx'> 	u32 request = scat_req-&gt;req;</div><div class='ctx'> 	int status = 0;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!scat_req-&gt;len)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -627,14 +638,12 @@ static int ath6kl_sdio_async_rw_scatter(struct ath6kl *ar,</div><div class='ctx'> 		"hif-scatter: total len: %d scatter entries: %d\n",</div><div class='ctx'> 		scat_req-&gt;len, scat_req-&gt;scat_entries);</div><div class='ctx'> </div><div class='del'>-	if (request &amp; HIF_SYNCHRONOUS) {</div><div class='del'>-		sdio_claim_host(ar_sdio-&gt;func);</div><div class='add'>+	if (request &amp; HIF_SYNCHRONOUS)</div><div class='ctx'> 		status = ath6kl_sdio_scat_rw(ar_sdio, scat_req-&gt;busrequest);</div><div class='del'>-		sdio_release_host(ar_sdio-&gt;func);</div><div class='del'>-	} else {</div><div class='del'>-		spin_lock_irqsave(&amp;ar_sdio-&gt;wr_async_lock, flags);</div><div class='add'>+	else {</div><div class='add'>+		spin_lock_bh(&amp;ar_sdio-&gt;wr_async_lock);</div><div class='ctx'> 		list_add_tail(&amp;scat_req-&gt;busrequest-&gt;list, &amp;ar_sdio-&gt;wr_asyncq);</div><div class='del'>-		spin_unlock_irqrestore(&amp;ar_sdio-&gt;wr_async_lock, flags);</div><div class='add'>+		spin_unlock_bh(&amp;ar_sdio-&gt;wr_async_lock);</div><div class='ctx'> 		queue_work(ar-&gt;ath6kl_wq, &amp;ar_sdio-&gt;wr_async_work);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -646,23 +655,27 @@ static void ath6kl_sdio_cleanup_scatter(struct ath6kl *ar)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar);</div><div class='ctx'> 	struct hif_scatter_req *s_req, *tmp_req;</div><div class='del'>-	unsigned long flag;</div><div class='ctx'> </div><div class='ctx'> 	/* empty the free list */</div><div class='del'>-	spin_lock_irqsave(&amp;ar_sdio-&gt;scat_lock, flag);</div><div class='add'>+	spin_lock_bh(&amp;ar_sdio-&gt;scat_lock);</div><div class='ctx'> 	list_for_each_entry_safe(s_req, tmp_req, &amp;ar_sdio-&gt;scat_req, list) {</div><div class='ctx'> 		list_del(&amp;s_req-&gt;list);</div><div class='del'>-		spin_unlock_irqrestore(&amp;ar_sdio-&gt;scat_lock, flag);</div><div class='add'>+		spin_unlock_bh(&amp;ar_sdio-&gt;scat_lock);</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * FIXME: should we also call completion handler with</div><div class='add'>+		 * ath6kl_hif_rw_comp_handler() with status -ECANCELED so</div><div class='add'>+		 * that the packet is properly freed?</div><div class='add'>+		 */</div><div class='ctx'> 		if (s_req-&gt;busrequest)</div><div class='ctx'> 			ath6kl_sdio_free_bus_req(ar_sdio, s_req-&gt;busrequest);</div><div class='ctx'> 		kfree(s_req-&gt;virt_dma_buf);</div><div class='ctx'> 		kfree(s_req-&gt;sgentries);</div><div class='ctx'> 		kfree(s_req);</div><div class='ctx'> </div><div class='del'>-		spin_lock_irqsave(&amp;ar_sdio-&gt;scat_lock, flag);</div><div class='add'>+		spin_lock_bh(&amp;ar_sdio-&gt;scat_lock);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;ar_sdio-&gt;scat_lock, flag);</div><div class='add'>+	spin_unlock_bh(&amp;ar_sdio-&gt;scat_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* setup of HIF scatter resources */</div><div class='hunk'>@@ -673,6 +686,11 @@ static int ath6kl_sdio_enable_scatter(struct ath6kl *ar)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	bool virt_scat = false;</div><div class='ctx'> </div><div class='add'>+	if (ar_sdio-&gt;scatter_enabled)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ar_sdio-&gt;scatter_enabled = true;</div><div class='add'>+</div><div class='ctx'> 	/* check if host supports scatter and it meets our requirements */</div><div class='ctx'> 	if (ar_sdio-&gt;func-&gt;card-&gt;host-&gt;max_segs &lt; MAX_SCATTER_ENTRIES_PER_REQ) {</div><div class='ctx'> 		ath6kl_err("host only supports scatter of :%d entries, need: %d\n",</div><div class='hunk'>@@ -687,8 +705,8 @@ static int ath6kl_sdio_enable_scatter(struct ath6kl *ar)</div><div class='ctx'> 				MAX_SCATTER_REQUESTS, virt_scat);</div><div class='ctx'> </div><div class='ctx'> 		if (!ret) {</div><div class='del'>-			ath6kl_dbg(ATH6KL_DBG_SCATTER,</div><div class='del'>-				   "hif-scatter enabled: max scatter req : %d entries: %d\n",</div><div class='add'>+			ath6kl_dbg(ATH6KL_DBG_BOOT,</div><div class='add'>+				   "hif-scatter enabled requests %d entries %d\n",</div><div class='ctx'> 				   MAX_SCATTER_REQUESTS,</div><div class='ctx'> 				   MAX_SCATTER_ENTRIES_PER_REQ);</div><div class='ctx'> </div><div class='hunk'>@@ -712,8 +730,8 @@ static int ath6kl_sdio_enable_scatter(struct ath6kl *ar)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_SCATTER,</div><div class='del'>-			   "Vitual scatter enabled, max_scat_req:%d, entries:%d\n",</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_BOOT,</div><div class='add'>+			   "virtual scatter enabled requests %d entries %d\n",</div><div class='ctx'> 			   ATH6KL_SCATTER_REQS, ATH6KL_SCATTER_ENTRIES_PER_REQ);</div><div class='ctx'> </div><div class='ctx'> 		target-&gt;max_scat_entries = ATH6KL_SCATTER_ENTRIES_PER_REQ;</div><div class='hunk'>@@ -724,7 +742,47 @@ static int ath6kl_sdio_enable_scatter(struct ath6kl *ar)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_sdio_suspend(struct ath6kl *ar)</div><div class='add'>+static int ath6kl_sdio_config(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar);</div><div class='add'>+	struct sdio_func *func = ar_sdio-&gt;func;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	sdio_claim_host(func);</div><div class='add'>+</div><div class='add'>+	if ((ar_sdio-&gt;id-&gt;device &amp; MANUFACTURER_ID_ATH6KL_BASE_MASK) &gt;=</div><div class='add'>+	    MANUFACTURER_ID_AR6003_BASE) {</div><div class='add'>+		/* enable 4-bit ASYNC interrupt on AR6003 or later */</div><div class='add'>+		ret = ath6kl_sdio_func0_cmd52_wr_byte(func-&gt;card,</div><div class='add'>+						CCCR_SDIO_IRQ_MODE_REG,</div><div class='add'>+						SDIO_IRQ_MODE_ASYNC_4BIT_IRQ);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath6kl_err("Failed to enable 4-bit async irq mode %d\n",</div><div class='add'>+				   ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_BOOT, "4-bit async irq mode enabled\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* give us some time to enable, in ms */</div><div class='add'>+	func-&gt;enable_timeout = 100;</div><div class='add'>+</div><div class='add'>+	ret = sdio_set_block_size(func, HIF_MBOX_BLOCK_SIZE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath6kl_err("Set sdio block size %d failed: %d)\n",</div><div class='add'>+			   HIF_MBOX_BLOCK_SIZE, ret);</div><div class='add'>+		sdio_release_host(func);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	sdio_release_host(func);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath6kl_sdio_suspend(struct ath6kl *ar, struct cfg80211_wowlan *wow)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar);</div><div class='ctx'> 	struct sdio_func *func = ar_sdio-&gt;func;</div><div class='hunk'>@@ -733,12 +791,14 @@ static int ath6kl_sdio_suspend(struct ath6kl *ar)</div><div class='ctx'> </div><div class='ctx'> 	flags = sdio_get_host_pm_caps(func);</div><div class='ctx'> </div><div class='del'>-	if (!(flags &amp; MMC_PM_KEEP_POWER))</div><div class='del'>-		/* as host doesn't support keep power we need to bail out */</div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_SDIO,</div><div class='del'>-			   "func %d doesn't support MMC_PM_KEEP_POWER\n",</div><div class='del'>-			   func-&gt;num);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_SUSPEND, "sdio suspend pm_caps 0x%x\n", flags);</div><div class='add'>+</div><div class='add'>+	if (!(flags &amp; MMC_PM_KEEP_POWER) ||</div><div class='add'>+	    (ar-&gt;conf_flags &amp; ATH6KL_CONF_SUSPEND_CUTPOWER)) {</div><div class='add'>+		/* as host doesn't support keep power we need to cut power */</div><div class='add'>+		return ath6kl_cfg80211_suspend(ar, ATH6KL_CFG_SUSPEND_CUTPOWER,</div><div class='add'>+					       NULL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -747,11 +807,367 @@ static int ath6kl_sdio_suspend(struct ath6kl *ar)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath6kl_deep_sleep_enable(ar);</div><div class='add'>+	if (!(flags &amp; MMC_PM_WAKE_SDIO_IRQ))</div><div class='add'>+		goto deepsleep;</div><div class='add'>+</div><div class='add'>+	/* sdio irq wakes up host */</div><div class='add'>+</div><div class='add'>+	if (ar-&gt;state == ATH6KL_STATE_SCHED_SCAN) {</div><div class='add'>+		ret =  ath6kl_cfg80211_suspend(ar,</div><div class='add'>+					       ATH6KL_CFG_SUSPEND_SCHED_SCAN,</div><div class='add'>+					       NULL);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath6kl_warn("Schedule scan suspend failed: %d", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = sdio_set_host_pm_flags(func, MMC_PM_WAKE_SDIO_IRQ);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath6kl_warn("set sdio wake irq flag 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'>+	if (wow) {</div><div class='add'>+		/*</div><div class='add'>+		 * The host sdio controller is capable of keep power and</div><div class='add'>+		 * sdio irq wake up at this point. It's fine to continue</div><div class='add'>+		 * wow suspend operation.</div><div class='add'>+		 */</div><div class='add'>+		ret = ath6kl_cfg80211_suspend(ar, ATH6KL_CFG_SUSPEND_WOW, wow);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = sdio_set_host_pm_flags(func, MMC_PM_WAKE_SDIO_IRQ);</div><div class='add'>+		if (ret)</div><div class='add'>+			ath6kl_err("set sdio wake irq flag 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'>+deepsleep:</div><div class='add'>+	return ath6kl_cfg80211_suspend(ar, ATH6KL_CFG_SUSPEND_DEEPSLEEP, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath6kl_sdio_resume(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	switch (ar-&gt;state) {</div><div class='add'>+	case ATH6KL_STATE_OFF:</div><div class='add'>+	case ATH6KL_STATE_CUTPOWER:</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_SUSPEND,</div><div class='add'>+			   "sdio resume configuring sdio\n");</div><div class='add'>+</div><div class='add'>+		/* need to set sdio settings after power is cut from sdio */</div><div class='add'>+		ath6kl_sdio_config(ar);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ATH6KL_STATE_ON:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ATH6KL_STATE_DEEPSLEEP:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ATH6KL_STATE_WOW:</div><div class='add'>+		break;</div><div class='add'>+	case ATH6KL_STATE_SCHED_SCAN:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath6kl_cfg80211_resume(ar);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set the window address register (using 4-byte register access ). */</div><div class='add'>+static int ath6kl_set_addrwin_reg(struct ath6kl *ar, u32 reg_addr, u32 addr)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	u8 addr_val[4];</div><div class='add'>+	s32 i;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Write bytes 1,2,3 of the register to set the upper address bytes,</div><div class='add'>+	 * the LSB is written last to initiate the access cycle</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt;= 3; i++) {</div><div class='add'>+		/*</div><div class='add'>+		 * Fill the buffer with the address byte value we want to</div><div class='add'>+		 * hit 4 times.</div><div class='add'>+		 */</div><div class='add'>+		memset(addr_val, ((u8 *)&amp;addr)[i], 4);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Hit each byte of the register address with a 4-byte</div><div class='add'>+		 * write operation to the same address, this is a harmless</div><div class='add'>+		 * operation.</div><div class='add'>+		 */</div><div class='add'>+		status = ath6kl_sdio_read_write_sync(ar, reg_addr + i, addr_val,</div><div class='add'>+					     4, HIF_WR_SYNC_BYTE_FIX);</div><div class='add'>+		if (status)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status) {</div><div class='add'>+		ath6kl_err("%s: failed to write initial bytes of 0x%x "</div><div class='add'>+			   "to window reg: 0x%X\n", __func__,</div><div class='add'>+			   addr, reg_addr);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Write the address register again, this time write the whole</div><div class='add'>+	 * 4-byte value. The effect here is that the LSB write causes the</div><div class='add'>+	 * cycle to start, the extra 3 byte write to bytes 1,2,3 has no</div><div class='add'>+	 * effect since we are writing the same values again</div><div class='add'>+	 */</div><div class='add'>+	status = ath6kl_sdio_read_write_sync(ar, reg_addr, (u8 *)(&amp;addr),</div><div class='add'>+				     4, HIF_WR_SYNC_BYTE_INC);</div><div class='add'>+</div><div class='add'>+	if (status) {</div><div class='add'>+		ath6kl_err("%s: failed to write 0x%x to window reg: 0x%X\n",</div><div class='add'>+			   __func__, addr, reg_addr);</div><div class='add'>+		return status;</div><div 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 ath6kl_sdio_diag_read32(struct ath6kl *ar, u32 address, u32 *data)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	/* set window register to start read cycle */</div><div class='add'>+	status = ath6kl_set_addrwin_reg(ar, WINDOW_READ_ADDR_ADDRESS,</div><div class='add'>+					address);</div><div class='add'>+</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	/* read the data */</div><div class='add'>+	status = ath6kl_sdio_read_write_sync(ar, WINDOW_DATA_ADDRESS,</div><div class='add'>+				(u8 *)data, sizeof(u32), HIF_RD_SYNC_BYTE_INC);</div><div class='add'>+	if (status) {</div><div class='add'>+		ath6kl_err("%s: failed to read from window data addr\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return status;</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 ath6kl_sdio_diag_write32(struct ath6kl *ar, u32 address,</div><div class='add'>+				    __le32 data)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	u32 val = (__force u32) data;</div><div class='add'>+</div><div class='add'>+	/* set write data */</div><div class='add'>+	status = ath6kl_sdio_read_write_sync(ar, WINDOW_DATA_ADDRESS,</div><div class='add'>+				(u8 *) &amp;val, sizeof(u32), HIF_WR_SYNC_BYTE_INC);</div><div class='add'>+	if (status) {</div><div class='add'>+		ath6kl_err("%s: failed to write 0x%x to window data addr\n",</div><div class='add'>+			   __func__, data);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set window register, which starts the write cycle */</div><div class='add'>+	return ath6kl_set_addrwin_reg(ar, WINDOW_WRITE_ADDR_ADDRESS,</div><div class='add'>+				      address);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath6kl_sdio_bmi_credits(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	u32 addr;</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ar-&gt;bmi.cmd_credits = 0;</div><div class='add'>+</div><div class='add'>+	/* Read the counter register to get the command credits */</div><div class='add'>+	addr = COUNT_DEC_ADDRESS + (HTC_MAILBOX_NUM_MAX + ENDPOINT1) * 4;</div><div class='add'>+</div><div class='add'>+	timeout = jiffies + msecs_to_jiffies(BMI_COMMUNICATION_TIMEOUT);</div><div class='add'>+	while (time_before(jiffies, timeout) &amp;&amp; !ar-&gt;bmi.cmd_credits) {</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Hit the credit counter with a 4-byte access, the first byte</div><div class='add'>+		 * read will hit the counter and cause a decrement, while the</div><div class='add'>+		 * remaining 3 bytes has no effect. The rationale behind this</div><div class='add'>+		 * is to make all HIF accesses 4-byte aligned.</div><div class='add'>+		 */</div><div class='add'>+		ret = ath6kl_sdio_read_write_sync(ar, addr,</div><div class='add'>+					 (u8 *)&amp;ar-&gt;bmi.cmd_credits, 4,</div><div class='add'>+					 HIF_RD_SYNC_BYTE_INC);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath6kl_err("Unable to decrement the command credit "</div><div class='add'>+						"count register: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* The counter is only 8 bits.</div><div class='add'>+		 * Ignore anything in the upper 3 bytes</div><div class='add'>+		 */</div><div class='add'>+		ar-&gt;bmi.cmd_credits &amp;= 0xFF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ar-&gt;bmi.cmd_credits) {</div><div class='add'>+		ath6kl_err("bmi communication timeout\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='add'>+</div><div class='add'>+static int ath6kl_bmi_get_rx_lkahd(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	u32 rx_word = 0;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	timeout = jiffies + msecs_to_jiffies(BMI_COMMUNICATION_TIMEOUT);</div><div class='add'>+	while ((time_before(jiffies, timeout)) &amp;&amp; !rx_word) {</div><div class='add'>+		ret = ath6kl_sdio_read_write_sync(ar,</div><div class='add'>+					RX_LOOKAHEAD_VALID_ADDRESS,</div><div class='add'>+					(u8 *)&amp;rx_word, sizeof(rx_word),</div><div class='add'>+					HIF_RD_SYNC_BYTE_INC);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ath6kl_err("unable to read RX_LOOKAHEAD_VALID\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		 /* all we really want is one bit */</div><div class='add'>+		rx_word &amp;= (1 &lt;&lt; ENDPOINT1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!rx_word) {</div><div class='add'>+		ath6kl_err("bmi_recv_buf FIFO empty\n");</div><div class='add'>+		return -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 ath6kl_sdio_bmi_write(struct ath6kl *ar, u8 *buf, u32 len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 addr;</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_sdio_bmi_credits(ar);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	addr = ar-&gt;mbox_info.htc_addr;</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_sdio_read_write_sync(ar, addr, buf, len,</div><div class='add'>+					  HIF_WR_SYNC_BYTE_INC);</div><div class='add'>+	if (ret)</div><div class='add'>+		ath6kl_err("unable to send the bmi data to the device\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath6kl_sdio_bmi_read(struct ath6kl *ar, u8 *buf, u32 len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 addr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * During normal bootup, small reads may be required.</div><div class='add'>+	 * Rather than issue an HIF Read and then wait as the Target</div><div class='add'>+	 * adds successive bytes to the FIFO, we wait here until</div><div class='add'>+	 * we know that response data is available.</div><div class='add'>+	 *</div><div class='add'>+	 * This allows us to cleanly timeout on an unexpected</div><div class='add'>+	 * Target failure rather than risk problems at the HIF level.</div><div class='add'>+	 * In particular, this avoids SDIO timeouts and possibly garbage</div><div class='add'>+	 * data on some host controllers.  And on an interconnect</div><div class='add'>+	 * such as Compact Flash (as well as some SDIO masters) which</div><div class='add'>+	 * does not provide any indication on data timeout, it avoids</div><div class='add'>+	 * a potential hang or garbage response.</div><div class='add'>+	 *</div><div class='add'>+	 * Synchronization is more difficult for reads larger than the</div><div class='add'>+	 * size of the MBOX FIFO (128B), because the Target is unable</div><div class='add'>+	 * to push the 129th byte of data until AFTER the Host posts an</div><div class='add'>+	 * HIF Read and removes some FIFO data.  So for large reads the</div><div class='add'>+	 * Host proceeds to post an HIF Read BEFORE all the data is</div><div class='add'>+	 * actually available to read.  Fortunately, large BMI reads do</div><div class='add'>+	 * not occur in practice -- they're supported for debug/development.</div><div class='add'>+	 *</div><div class='add'>+	 * So Host/Target BMI synchronization is divided into these cases:</div><div class='add'>+	 *  CASE 1: length &lt; 4</div><div class='add'>+	 *        Should not happen</div><div class='add'>+	 *</div><div class='add'>+	 *  CASE 2: 4 &lt;= length &lt;= 128</div><div class='add'>+	 *        Wait for first 4 bytes to be in FIFO</div><div class='add'>+	 *        If CONSERVATIVE_BMI_READ is enabled, also wait for</div><div class='add'>+	 *        a BMI command credit, which indicates that the ENTIRE</div><div class='add'>+	 *        response is available in the the FIFO</div><div class='add'>+	 *</div><div class='add'>+	 *  CASE 3: length &gt; 128</div><div class='add'>+	 *        Wait for the first 4 bytes to be in FIFO</div><div class='add'>+	 *</div><div class='add'>+	 * For most uses, a small timeout should be sufficient and we will</div><div class='add'>+	 * usually see a response quickly; but there may be some unusual</div><div class='add'>+	 * (debug) cases of BMI_EXECUTE where we want an larger timeout.</div><div class='add'>+	 * For now, we use an unbounded busy loop while waiting for</div><div class='add'>+	 * BMI_EXECUTE.</div><div class='add'>+	 *</div><div class='add'>+	 * If BMI_EXECUTE ever needs to support longer-latency execution,</div><div class='add'>+	 * especially in production, this code needs to be enhanced to sleep</div><div class='add'>+	 * and yield.  Also note that BMI_COMMUNICATION_TIMEOUT is currently</div><div class='add'>+	 * a function of Host processor speed.</div><div class='add'>+	 */</div><div class='add'>+	if (len &gt;= 4) { /* NB: Currently, always true */</div><div class='add'>+		ret = ath6kl_bmi_get_rx_lkahd(ar);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	addr = ar-&gt;mbox_info.htc_addr;</div><div class='add'>+	ret = ath6kl_sdio_read_write_sync(ar, addr, buf, len,</div><div class='add'>+				  HIF_RD_SYNC_BYTE_INC);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ath6kl_err("Unable to read the bmi data from the device: %d\n",</div><div class='add'>+			   ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath6kl_sdio_stop(struct ath6kl *ar)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar);</div><div class='add'>+	struct bus_request *req, *tmp_req;</div><div class='add'>+	void *context;</div><div class='add'>+</div><div class='add'>+	/* FIXME: make sure that wq is not queued again */</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;ar_sdio-&gt;wr_async_work);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ar_sdio-&gt;wr_async_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(req, tmp_req, &amp;ar_sdio-&gt;wr_asyncq, list) {</div><div class='add'>+		list_del(&amp;req-&gt;list);</div><div class='add'>+</div><div class='add'>+		if (req-&gt;scat_req) {</div><div class='add'>+			/* this is a scatter gather request */</div><div class='add'>+			req-&gt;scat_req-&gt;status = -ECANCELED;</div><div class='add'>+			req-&gt;scat_req-&gt;complete(ar_sdio-&gt;ar-&gt;htc_target,</div><div class='add'>+						req-&gt;scat_req);</div><div class='add'>+		} else {</div><div class='add'>+			context = req-&gt;packet;</div><div class='add'>+			ath6kl_sdio_free_bus_req(ar_sdio, req);</div><div class='add'>+			ath6kl_hif_rw_comp_handler(context, -ECANCELED);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ar_sdio-&gt;wr_async_lock);</div><div class='add'>+</div><div class='add'>+	WARN_ON(get_queue_depth(&amp;ar_sdio-&gt;scat_req) != 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct ath6kl_hif_ops ath6kl_sdio_ops = {</div><div class='ctx'> 	.read_write_sync = ath6kl_sdio_read_write_sync,</div><div class='ctx'> 	.write_async = ath6kl_sdio_write_async,</div><div class='hunk'>@@ -763,8 +1179,47 @@ static const struct ath6kl_hif_ops ath6kl_sdio_ops = {</div><div class='ctx'> 	.scat_req_rw = ath6kl_sdio_async_rw_scatter,</div><div class='ctx'> 	.cleanup_scatter = ath6kl_sdio_cleanup_scatter,</div><div class='ctx'> 	.suspend = ath6kl_sdio_suspend,</div><div class='add'>+	.resume = ath6kl_sdio_resume,</div><div class='add'>+	.diag_read32 = ath6kl_sdio_diag_read32,</div><div class='add'>+	.diag_write32 = ath6kl_sdio_diag_write32,</div><div class='add'>+	.bmi_read = ath6kl_sdio_bmi_read,</div><div class='add'>+	.bmi_write = ath6kl_sdio_bmi_write,</div><div class='add'>+	.power_on = ath6kl_sdio_power_on,</div><div class='add'>+	.power_off = ath6kl_sdio_power_off,</div><div class='add'>+	.stop = ath6kl_sdio_stop,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Empty handlers so that mmc subsystem doesn't remove us entirely during</div><div class='add'>+ * suspend. We instead follow cfg80211 suspend/resume handlers.</div><div class='add'>+ */</div><div class='add'>+static int ath6kl_sdio_pm_suspend(struct device *device)</div><div class='add'>+{</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_SUSPEND, "sdio pm suspend\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath6kl_sdio_pm_resume(struct device *device)</div><div class='add'>+{</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_SUSPEND, "sdio pm resume\n");</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(ath6kl_sdio_pm_ops, ath6kl_sdio_pm_suspend,</div><div class='add'>+			 ath6kl_sdio_pm_resume);</div><div class='add'>+</div><div class='add'>+#define ATH6KL_SDIO_PM_OPS (&amp;ath6kl_sdio_pm_ops)</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#define ATH6KL_SDIO_PM_OPS NULL</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='add'>+</div><div class='ctx'> static int ath6kl_sdio_probe(struct sdio_func *func,</div><div class='ctx'> 			     const struct sdio_device_id *id)</div><div class='ctx'> {</div><div class='hunk'>@@ -773,8 +1228,8 @@ static int ath6kl_sdio_probe(struct sdio_func *func,</div><div class='ctx'> 	struct ath6kl *ar;</div><div class='ctx'> 	int count;</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_SDIO,</div><div class='del'>-		   "new func %d vendor 0x%x device 0x%x block 0x%x/0x%x\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_BOOT,</div><div class='add'>+		   "sdio new func %d vendor 0x%x device 0x%x block 0x%x/0x%x\n",</div><div class='ctx'> 		   func-&gt;num, func-&gt;vendor, func-&gt;device,</div><div class='ctx'> 		   func-&gt;max_blksize, func-&gt;cur_blksize);</div><div class='ctx'> </div><div class='hunk'>@@ -797,6 +1252,7 @@ static int ath6kl_sdio_probe(struct sdio_func *func,</div><div class='ctx'> 	spin_lock_init(&amp;ar_sdio-&gt;lock);</div><div class='ctx'> 	spin_lock_init(&amp;ar_sdio-&gt;scat_lock);</div><div class='ctx'> 	spin_lock_init(&amp;ar_sdio-&gt;wr_async_lock);</div><div class='add'>+	mutex_init(&amp;ar_sdio-&gt;dma_buffer_mutex);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ar_sdio-&gt;scat_req);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ar_sdio-&gt;bus_req_freeq);</div><div class='hunk'>@@ -815,62 +1271,29 @@ static int ath6kl_sdio_probe(struct sdio_func *func,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ar_sdio-&gt;ar = ar;</div><div class='add'>+	ar-&gt;hif_type = ATH6KL_HIF_TYPE_SDIO;</div><div class='ctx'> 	ar-&gt;hif_priv = ar_sdio;</div><div class='ctx'> 	ar-&gt;hif_ops = &amp;ath6kl_sdio_ops;</div><div class='add'>+	ar-&gt;bmi.max_data_size = 256;</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_sdio_set_mbox_info(ar);</div><div class='ctx'> </div><div class='del'>-	sdio_claim_host(func);</div><div class='del'>-</div><div class='del'>-	if ((ar_sdio-&gt;id-&gt;device &amp; MANUFACTURER_ID_ATH6KL_BASE_MASK) &gt;=</div><div class='del'>-	    MANUFACTURER_ID_AR6003_BASE) {</div><div class='del'>-		/* enable 4-bit ASYNC interrupt on AR6003 or later */</div><div class='del'>-		ret = ath6kl_sdio_func0_cmd52_wr_byte(func-&gt;card,</div><div class='del'>-						CCCR_SDIO_IRQ_MODE_REG,</div><div class='del'>-						SDIO_IRQ_MODE_ASYNC_4BIT_IRQ);</div><div class='del'>-		if (ret) {</div><div class='del'>-			ath6kl_err("Failed to enable 4-bit async irq mode %d\n",</div><div class='del'>-				   ret);</div><div class='del'>-			sdio_release_host(func);</div><div class='del'>-			goto err_cfg80211;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ath6kl_dbg(ATH6KL_DBG_SDIO, "4-bit async irq mode enabled\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* give us some time to enable, in ms */</div><div class='del'>-	func-&gt;enable_timeout = 100;</div><div class='del'>-</div><div class='del'>-	sdio_release_host(func);</div><div class='del'>-</div><div class='del'>-	ret = ath6kl_sdio_power_on(ar_sdio);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_cfg80211;</div><div class='del'>-</div><div class='del'>-	sdio_claim_host(func);</div><div class='del'>-</div><div class='del'>-	ret = sdio_set_block_size(func, HIF_MBOX_BLOCK_SIZE);</div><div class='add'>+	ret = ath6kl_sdio_config(ar);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ath6kl_err("Set sdio block size %d failed: %d)\n",</div><div class='del'>-			   HIF_MBOX_BLOCK_SIZE, ret);</div><div class='del'>-		sdio_release_host(func);</div><div class='del'>-		goto err_off;</div><div class='add'>+		ath6kl_err("Failed to config sdio: %d\n", ret);</div><div class='add'>+		goto err_core_alloc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sdio_release_host(func);</div><div class='del'>-</div><div class='ctx'> 	ret = ath6kl_core_init(ar);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		ath6kl_err("Failed to init ath6kl core\n");</div><div class='del'>-		goto err_off;</div><div class='add'>+		goto err_core_alloc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='del'>-err_off:</div><div class='del'>-	ath6kl_sdio_power_off(ar_sdio);</div><div class='del'>-err_cfg80211:</div><div class='del'>-	ath6kl_cfg80211_deinit(ar_sdio-&gt;ar);</div><div class='add'>+err_core_alloc:</div><div class='add'>+	ath6kl_core_free(ar_sdio-&gt;ar);</div><div class='ctx'> err_dma:</div><div class='ctx'> 	kfree(ar_sdio-&gt;dma_buffer);</div><div class='ctx'> err_hif:</div><div class='hunk'>@@ -883,8 +1306,8 @@ static void ath6kl_sdio_remove(struct sdio_func *func)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl_sdio *ar_sdio;</div><div class='ctx'> </div><div class='del'>-	ath6kl_dbg(ATH6KL_DBG_SDIO,</div><div class='del'>-		   "removed func %d vendor 0x%x device 0x%x\n",</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_BOOT,</div><div class='add'>+		   "sdio removed func %d vendor 0x%x device 0x%x\n",</div><div class='ctx'> 		   func-&gt;num, func-&gt;vendor, func-&gt;device);</div><div class='ctx'> </div><div class='ctx'> 	ar_sdio = sdio_get_drvdata(func);</div><div class='hunk'>@@ -892,9 +1315,7 @@ static void ath6kl_sdio_remove(struct sdio_func *func)</div><div class='ctx'> 	ath6kl_stop_txrx(ar_sdio-&gt;ar);</div><div class='ctx'> 	cancel_work_sync(&amp;ar_sdio-&gt;wr_async_work);</div><div class='ctx'> </div><div class='del'>-	ath6kl_unavail_ev(ar_sdio-&gt;ar);</div><div class='del'>-</div><div class='del'>-	ath6kl_sdio_power_off(ar_sdio);</div><div class='add'>+	ath6kl_core_cleanup(ar_sdio-&gt;ar);</div><div class='ctx'> </div><div class='ctx'> 	kfree(ar_sdio-&gt;dma_buffer);</div><div class='ctx'> 	kfree(ar_sdio);</div><div class='hunk'>@@ -903,16 +1324,19 @@ static void ath6kl_sdio_remove(struct sdio_func *func)</div><div class='ctx'> static const struct sdio_device_id ath6kl_sdio_devices[] = {</div><div class='ctx'> 	{SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6003_BASE | 0x0))},</div><div class='ctx'> 	{SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6003_BASE | 0x1))},</div><div class='add'>+	{SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6004_BASE | 0x0))},</div><div class='add'>+	{SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6004_BASE | 0x1))},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(sdio, ath6kl_sdio_devices);</div><div class='ctx'> </div><div class='ctx'> static struct sdio_driver ath6kl_sdio_driver = {</div><div class='del'>-	.name = "ath6kl_sdio",</div><div class='add'>+	.name = "ath6kl",</div><div class='ctx'> 	.id_table = ath6kl_sdio_devices,</div><div class='ctx'> 	.probe = ath6kl_sdio_probe,</div><div class='ctx'> 	.remove = ath6kl_sdio_remove,</div><div class='add'>+	.drv.pm = ATH6KL_SDIO_PM_OPS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ath6kl_sdio_init(void)</div><div class='hunk'>@@ -938,13 +1362,19 @@ MODULE_AUTHOR("Atheros Communications, Inc.");</div><div class='ctx'> MODULE_DESCRIPTION("Driver support for Atheros AR600x SDIO devices");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> </div><div class='del'>-MODULE_FIRMWARE(AR6003_REV2_OTP_FILE);</div><div class='del'>-MODULE_FIRMWARE(AR6003_REV2_FIRMWARE_FILE);</div><div class='del'>-MODULE_FIRMWARE(AR6003_REV2_PATCH_FILE);</div><div class='del'>-MODULE_FIRMWARE(AR6003_REV2_BOARD_DATA_FILE);</div><div class='del'>-MODULE_FIRMWARE(AR6003_REV2_DEFAULT_BOARD_DATA_FILE);</div><div class='del'>-MODULE_FIRMWARE(AR6003_REV3_OTP_FILE);</div><div class='del'>-MODULE_FIRMWARE(AR6003_REV3_FIRMWARE_FILE);</div><div class='del'>-MODULE_FIRMWARE(AR6003_REV3_PATCH_FILE);</div><div class='del'>-MODULE_FIRMWARE(AR6003_REV3_BOARD_DATA_FILE);</div><div class='del'>-MODULE_FIRMWARE(AR6003_REV3_DEFAULT_BOARD_DATA_FILE);</div><div class='add'>+MODULE_FIRMWARE(AR6003_HW_2_0_OTP_FILE);</div><div class='add'>+MODULE_FIRMWARE(AR6003_HW_2_0_FIRMWARE_FILE);</div><div class='add'>+MODULE_FIRMWARE(AR6003_HW_2_0_PATCH_FILE);</div><div class='add'>+MODULE_FIRMWARE(AR6003_HW_2_0_BOARD_DATA_FILE);</div><div class='add'>+MODULE_FIRMWARE(AR6003_HW_2_0_DEFAULT_BOARD_DATA_FILE);</div><div class='add'>+MODULE_FIRMWARE(AR6003_HW_2_1_1_OTP_FILE);</div><div class='add'>+MODULE_FIRMWARE(AR6003_HW_2_1_1_FIRMWARE_FILE);</div><div class='add'>+MODULE_FIRMWARE(AR6003_HW_2_1_1_PATCH_FILE);</div><div class='add'>+MODULE_FIRMWARE(AR6003_HW_2_1_1_BOARD_DATA_FILE);</div><div class='add'>+MODULE_FIRMWARE(AR6003_HW_2_1_1_DEFAULT_BOARD_DATA_FILE);</div><div class='add'>+MODULE_FIRMWARE(AR6004_HW_1_0_FIRMWARE_FILE);</div><div class='add'>+MODULE_FIRMWARE(AR6004_HW_1_0_BOARD_DATA_FILE);</div><div class='add'>+MODULE_FIRMWARE(AR6004_HW_1_0_DEFAULT_BOARD_DATA_FILE);</div><div class='add'>+MODULE_FIRMWARE(AR6004_HW_1_1_FIRMWARE_FILE);</div><div class='add'>+MODULE_FIRMWARE(AR6004_HW_1_1_BOARD_DATA_FILE);</div><div class='add'>+MODULE_FIRMWARE(AR6004_HW_1_1_DEFAULT_BOARD_DATA_FILE);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/target.h b/drivers/net/wireless/ath/ath6kl/target.h<br/>index c9a76051f042..108a723a1085 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/target.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/target.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/target.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/target.h</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #define AR6003_BOARD_DATA_SZ		1024</div><div class='ctx'> #define AR6003_BOARD_EXT_DATA_SZ	768</div><div class='ctx'> </div><div class='del'>-#define AR6004_BOARD_DATA_SZ     7168</div><div class='add'>+#define AR6004_BOARD_DATA_SZ     6144</div><div class='ctx'> #define AR6004_BOARD_EXT_DATA_SZ 0</div><div class='ctx'> </div><div class='ctx'> #define RESET_CONTROL_ADDRESS		0x00000000</div><div class='hunk'>@@ -320,7 +320,10 @@ struct host_interest {</div><div class='ctx'> |   (2)   |   (2)   |   (2)   |   (2)   |   (2)   |   (2)   |   (2)   |   (2)</div><div class='ctx'> |------------------------------------------------------------------------------|</div><div class='ctx'> */</div><div class='add'>+#define HI_OPTION_FW_MODE_BITS	       0x2</div><div class='ctx'> #define HI_OPTION_FW_MODE_SHIFT        0xC</div><div class='add'>+</div><div class='add'>+#define HI_OPTION_FW_SUBMODE_BITS      0x2</div><div class='ctx'> #define HI_OPTION_FW_SUBMODE_SHIFT     0x14</div><div class='ctx'> </div><div class='ctx'> /* Convert a Target virtual address into a Target physical address */</div><div class='hunk'>@@ -331,20 +334,6 @@ struct host_interest {</div><div class='ctx'> 	(((target_type) == TARGET_TYPE_AR6003) ? AR6003_VTOP(vaddr) : \</div><div class='ctx'> 	(((target_type) == TARGET_TYPE_AR6004) ? AR6004_VTOP(vaddr) : 0))</div><div class='ctx'> </div><div class='del'>-#define AR6003_REV2_APP_LOAD_ADDRESS            0x543180</div><div class='del'>-#define AR6003_REV2_BOARD_EXT_DATA_ADDRESS      0x57E500</div><div class='del'>-#define AR6003_REV2_DATASET_PATCH_ADDRESS       0x57e884</div><div class='del'>-#define AR6003_REV2_RAM_RESERVE_SIZE            6912</div><div class='del'>-</div><div class='del'>-#define AR6003_REV3_APP_LOAD_ADDRESS            0x545000</div><div class='del'>-#define AR6003_REV3_BOARD_EXT_DATA_ADDRESS      0x542330</div><div class='del'>-#define AR6003_REV3_DATASET_PATCH_ADDRESS       0x57FF74</div><div class='del'>-#define AR6003_REV3_RAM_RESERVE_SIZE            512</div><div class='del'>-</div><div class='del'>-#define AR6004_REV1_BOARD_DATA_ADDRESS          0x435400</div><div class='del'>-#define AR6004_REV1_BOARD_EXT_DATA_ADDRESS      0x437000</div><div class='del'>-#define AR6004_REV1_RAM_RESERVE_SIZE            11264</div><div class='del'>-</div><div class='ctx'> #define ATH6KL_FWLOG_PAYLOAD_SIZE		1500</div><div class='ctx'> </div><div class='ctx'> struct ath6kl_dbglog_buf {</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c<br/>index a7117074f81c..506a3031a885 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/txrx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/txrx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/txrx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/txrx.c</a></div><div class='hunk'>@@ -77,12 +77,13 @@ static u8 ath6kl_ibss_map_epid(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	return ar-&gt;node_map[ep_map].ep_id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ath6kl_powersave_ap(struct ath6kl *ar, struct sk_buff *skb,</div><div class='add'>+static bool ath6kl_powersave_ap(struct ath6kl_vif *vif, struct sk_buff *skb,</div><div class='ctx'> 				bool *more_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethhdr *datap = (struct ethhdr *) skb-&gt;data;</div><div class='ctx'> 	struct ath6kl_sta *conn = NULL;</div><div class='ctx'> 	bool ps_queued = false, is_psq_empty = false;</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='ctx'> </div><div class='ctx'> 	if (is_multicast_ether_addr(datap-&gt;h_dest)) {</div><div class='ctx'> 		u8 ctr = 0;</div><div class='hunk'>@@ -100,7 +101,7 @@ static bool ath6kl_powersave_ap(struct ath6kl *ar, struct sk_buff *skb,</div><div class='ctx'> 			 * If this transmit is not because of a Dtim Expiry</div><div class='ctx'> 			 * q it.</div><div class='ctx'> 			 */</div><div class='del'>-			if (!test_bit(DTIM_EXPIRED, &amp;ar-&gt;flag)) {</div><div class='add'>+			if (!test_bit(DTIM_EXPIRED, &amp;vif-&gt;flags)) {</div><div class='ctx'> 				bool is_mcastq_empty = false;</div><div class='ctx'> </div><div class='ctx'> 				spin_lock_bh(&amp;ar-&gt;mcastpsq_lock);</div><div class='hunk'>@@ -116,6 +117,7 @@ static bool ath6kl_powersave_ap(struct ath6kl *ar, struct sk_buff *skb,</div><div class='ctx'> 				 */</div><div class='ctx'> 				if (is_mcastq_empty)</div><div class='ctx'> 					ath6kl_wmi_set_pvb_cmd(ar-&gt;wmi,</div><div class='add'>+							       vif-&gt;fw_vif_idx,</div><div class='ctx'> 							       MCAST_AID, 1);</div><div class='ctx'> </div><div class='ctx'> 				ps_queued = true;</div><div class='hunk'>@@ -131,7 +133,7 @@ static bool ath6kl_powersave_ap(struct ath6kl *ar, struct sk_buff *skb,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		conn = ath6kl_find_sta(ar, datap-&gt;h_dest);</div><div class='add'>+		conn = ath6kl_find_sta(vif, datap-&gt;h_dest);</div><div class='ctx'> 		if (!conn) {</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -154,6 +156,7 @@ static bool ath6kl_powersave_ap(struct ath6kl *ar, struct sk_buff *skb,</div><div class='ctx'> 				 */</div><div class='ctx'> 				if (is_psq_empty)</div><div class='ctx'> 					ath6kl_wmi_set_pvb_cmd(ar-&gt;wmi,</div><div class='add'>+							       vif-&gt;fw_vif_idx,</div><div class='ctx'> 							       conn-&gt;aid, 1);</div><div class='ctx'> </div><div class='ctx'> 				ps_queued = true;</div><div class='hunk'>@@ -235,6 +238,7 @@ int ath6kl_data_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	struct ath6kl *ar = ath6kl_priv(dev);</div><div class='ctx'> 	struct ath6kl_cookie *cookie = NULL;</div><div class='ctx'> 	enum htc_endpoint_id eid = ENDPOINT_UNUSED;</div><div class='add'>+	struct ath6kl_vif *vif = netdev_priv(dev);</div><div class='ctx'> 	u32 map_no = 0;</div><div class='ctx'> 	u16 htc_tag = ATH6KL_DATA_PKT_TAG;</div><div class='ctx'> 	u8 ac = 99 ; /* initialize to unmapped ac */</div><div class='hunk'>@@ -246,7 +250,7 @@ int ath6kl_data_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		   skb, skb-&gt;data, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* If target is not associated */</div><div class='del'>-	if (!test_bit(CONNECTED, &amp;ar-&gt;flag)) {</div><div class='add'>+	if (!test_bit(CONNECTED, &amp;vif-&gt;flags)) {</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -255,15 +259,21 @@ int ath6kl_data_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		goto fail_tx;</div><div class='ctx'> </div><div class='ctx'> 	/* AP mode Power saving processing */</div><div class='del'>-	if (ar-&gt;nw_type == AP_NETWORK) {</div><div class='del'>-		if (ath6kl_powersave_ap(ar, skb, &amp;more_data))</div><div class='add'>+	if (vif-&gt;nw_type == AP_NETWORK) {</div><div class='add'>+		if (ath6kl_powersave_ap(vif, skb, &amp;more_data))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(WMI_ENABLED, &amp;ar-&gt;flag)) {</div><div class='ctx'> 		if (skb_headroom(skb) &lt; dev-&gt;needed_headroom) {</div><div class='del'>-			WARN_ON(1);</div><div class='del'>-			goto fail_tx;</div><div class='add'>+			struct sk_buff *tmp_skb = skb;</div><div class='add'>+</div><div class='add'>+			skb = skb_realloc_headroom(skb, dev-&gt;needed_headroom);</div><div class='add'>+			kfree_skb(tmp_skb);</div><div class='add'>+			if (skb == NULL) {</div><div class='add'>+				vif-&gt;net_stats.tx_dropped++;</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ath6kl_wmi_dix_2_dot3(ar-&gt;wmi, skb)) {</div><div class='hunk'>@@ -272,18 +282,20 @@ int ath6kl_data_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ath6kl_wmi_data_hdr_add(ar-&gt;wmi, skb, DATA_MSGTYPE,</div><div class='del'>-					    more_data, 0, 0, NULL)) {</div><div class='add'>+					    more_data, 0, 0, NULL,</div><div class='add'>+					    vif-&gt;fw_vif_idx)) {</div><div class='ctx'> 			ath6kl_err("wmi_data_hdr_add failed\n");</div><div class='ctx'> 			goto fail_tx;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if ((ar-&gt;nw_type == ADHOC_NETWORK) &amp;&amp;</div><div class='del'>-		     ar-&gt;ibss_ps_enable &amp;&amp; test_bit(CONNECTED, &amp;ar-&gt;flag))</div><div class='add'>+		if ((vif-&gt;nw_type == ADHOC_NETWORK) &amp;&amp;</div><div class='add'>+		     ar-&gt;ibss_ps_enable &amp;&amp; test_bit(CONNECTED, &amp;vif-&gt;flags))</div><div class='ctx'> 			chk_adhoc_ps_mapping = true;</div><div class='ctx'> 		else {</div><div class='ctx'> 			/* get the stream mapping */</div><div class='del'>-			ret = ath6kl_wmi_implicit_create_pstream(ar-&gt;wmi, skb,</div><div class='del'>-				    0, test_bit(WMM_ENABLED, &amp;ar-&gt;flag), &amp;ac);</div><div class='add'>+			ret = ath6kl_wmi_implicit_create_pstream(ar-&gt;wmi,</div><div class='add'>+				    vif-&gt;fw_vif_idx, skb,</div><div class='add'>+				    0, test_bit(WMM_ENABLED, &amp;vif-&gt;flags), &amp;ac);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto fail_tx;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -354,8 +366,8 @@ int ath6kl_data_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> fail_tx:</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='del'>-	ar-&gt;net_stats.tx_dropped++;</div><div class='del'>-	ar-&gt;net_stats.tx_aborted_errors++;</div><div class='add'>+	vif-&gt;net_stats.tx_dropped++;</div><div class='add'>+	vif-&gt;net_stats.tx_aborted_errors++;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -426,7 +438,9 @@ enum htc_send_full_action ath6kl_tx_queue_full(struct htc_target *target,</div><div class='ctx'> 					       struct htc_packet *packet)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath6kl *ar = target-&gt;dev-&gt;ar;</div><div class='add'>+	struct ath6kl_vif *vif;</div><div class='ctx'> 	enum htc_endpoint_id endpoint = packet-&gt;endpoint;</div><div class='add'>+	enum htc_send_full_action action = HTC_SEND_FULL_KEEP;</div><div class='ctx'> </div><div class='ctx'> 	if (endpoint == ar-&gt;ctrl_ep) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -439,19 +453,11 @@ enum htc_send_full_action ath6kl_tx_queue_full(struct htc_target *target,</div><div class='ctx'> 		set_bit(WMI_CTRL_EP_FULL, &amp;ar-&gt;flag);</div><div class='ctx'> 		spin_unlock_bh(&amp;ar-&gt;lock);</div><div class='ctx'> 		ath6kl_err("wmi ctrl ep is full\n");</div><div class='del'>-		return HTC_SEND_FULL_KEEP;</div><div class='add'>+		return action;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (packet-&gt;info.tx.tag == ATH6KL_CONTROL_PKT_TAG)</div><div class='del'>-		return HTC_SEND_FULL_KEEP;</div><div class='del'>-</div><div class='del'>-	if (ar-&gt;nw_type == ADHOC_NETWORK)</div><div class='del'>-		/*</div><div class='del'>-		 * In adhoc mode, we cannot differentiate traffic</div><div class='del'>-		 * priorities so there is no need to continue, however we</div><div class='del'>-		 * should stop the network.</div><div class='del'>-		 */</div><div class='del'>-		goto stop_net_queues;</div><div class='add'>+		return action;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The last MAX_HI_COOKIE_NUM "batch" of cookies are reserved for</div><div class='hunk'>@@ -464,24 +470,36 @@ enum htc_send_full_action ath6kl_tx_queue_full(struct htc_target *target,</div><div class='ctx'> 		 * Give preference to the highest priority stream by</div><div class='ctx'> 		 * dropping the packets which overflowed.</div><div class='ctx'> 		 */</div><div class='del'>-		return HTC_SEND_FULL_DROP;</div><div class='add'>+		action = HTC_SEND_FULL_DROP;</div><div class='ctx'> </div><div class='del'>-stop_net_queues:</div><div class='del'>-	spin_lock_bh(&amp;ar-&gt;lock);</div><div class='del'>-	set_bit(NETQ_STOPPED, &amp;ar-&gt;flag);</div><div class='del'>-	spin_unlock_bh(&amp;ar-&gt;lock);</div><div class='del'>-	netif_stop_queue(ar-&gt;net_dev);</div><div class='add'>+	/* FIXME: Locking */</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;list_lock);</div><div class='add'>+	list_for_each_entry(vif, &amp;ar-&gt;vif_list, list) {</div><div class='add'>+		if (vif-&gt;nw_type == ADHOC_NETWORK ||</div><div class='add'>+		    action != HTC_SEND_FULL_DROP) {</div><div class='add'>+			spin_unlock_bh(&amp;ar-&gt;list_lock);</div><div class='add'>+</div><div class='add'>+			spin_lock_bh(&amp;vif-&gt;if_lock);</div><div class='add'>+			set_bit(NETQ_STOPPED, &amp;vif-&gt;flags);</div><div class='add'>+			spin_unlock_bh(&amp;vif-&gt;if_lock);</div><div class='add'>+			netif_stop_queue(vif-&gt;ndev);</div><div class='ctx'> </div><div class='del'>-	return HTC_SEND_FULL_KEEP;</div><div class='add'>+			return action;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;list_lock);</div><div class='add'>+</div><div class='add'>+	return action;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* TODO this needs to be looked at */</div><div class='del'>-static void ath6kl_tx_clear_node_map(struct ath6kl *ar,</div><div class='add'>+static void ath6kl_tx_clear_node_map(struct ath6kl_vif *vif,</div><div class='ctx'> 				     enum htc_endpoint_id eid, u32 map_no)</div><div class='ctx'> {</div><div class='add'>+	struct ath6kl *ar = vif-&gt;ar;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;nw_type != ADHOC_NETWORK)</div><div class='add'>+	if (vif-&gt;nw_type != ADHOC_NETWORK)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!ar-&gt;ibss_ps_enable)</div><div class='hunk'>@@ -523,7 +541,9 @@ void ath6kl_tx_complete(void *context, struct list_head *packet_queue)</div><div class='ctx'> 	int status;</div><div class='ctx'> 	enum htc_endpoint_id eid;</div><div class='ctx'> 	bool wake_event = false;</div><div class='del'>-	bool flushing = false;</div><div class='add'>+	bool flushing[ATH6KL_VIF_MAX] = {false};</div><div class='add'>+	u8 if_idx;</div><div class='add'>+	struct ath6kl_vif *vif;</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_head_init(&amp;skb_queue);</div><div class='ctx'> </div><div class='hunk'>@@ -549,8 +569,6 @@ void ath6kl_tx_complete(void *context, struct list_head *packet_queue)</div><div class='ctx'> 		if (!skb || !skb-&gt;data)</div><div class='ctx'> 			goto fatal;</div><div class='ctx'> </div><div class='del'>-		packet-&gt;buf = skb-&gt;data;</div><div class='del'>-</div><div class='ctx'> 		__skb_queue_tail(&amp;skb_queue, skb);</div><div class='ctx'> </div><div class='ctx'> 		if (!status &amp;&amp; (packet-&gt;act_len != skb-&gt;len))</div><div class='hunk'>@@ -569,15 +587,30 @@ void ath6kl_tx_complete(void *context, struct list_head *packet_queue)</div><div class='ctx'> 				wake_event = true;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (eid == ar-&gt;ctrl_ep) {</div><div class='add'>+			if_idx = wmi_cmd_hdr_get_if_idx(</div><div class='add'>+				(struct wmi_cmd_hdr *) packet-&gt;buf);</div><div class='add'>+		} else {</div><div class='add'>+			if_idx = wmi_data_hdr_get_if_idx(</div><div class='add'>+				(struct wmi_data_hdr *) packet-&gt;buf);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		vif = ath6kl_get_vif_by_index(ar, if_idx);</div><div class='add'>+		if (!vif) {</div><div class='add'>+			ath6kl_free_cookie(ar, ath6kl_cookie);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (status) {</div><div class='ctx'> 			if (status == -ECANCELED)</div><div class='ctx'> 				/* a packet was flushed  */</div><div class='del'>-				flushing = true;</div><div class='add'>+				flushing[if_idx] = true;</div><div class='add'>+</div><div class='add'>+			vif-&gt;net_stats.tx_errors++;</div><div class='ctx'> </div><div class='del'>-			ar-&gt;net_stats.tx_errors++;</div><div class='add'>+			if (status != -ENOSPC &amp;&amp; status != -ECANCELED)</div><div class='add'>+				ath6kl_warn("tx complete error: %d\n", status);</div><div class='ctx'> </div><div class='del'>-			if (status != -ENOSPC)</div><div class='del'>-				ath6kl_err("tx error, status: 0x%x\n", status);</div><div class='ctx'> 			ath6kl_dbg(ATH6KL_DBG_WLAN_TX,</div><div class='ctx'> 				   "%s: skb=0x%p data=0x%p len=0x%x eid=%d %s\n",</div><div class='ctx'> 				   __func__, skb, packet-&gt;buf, packet-&gt;act_len,</div><div class='hunk'>@@ -588,27 +621,34 @@ void ath6kl_tx_complete(void *context, struct list_head *packet_queue)</div><div class='ctx'> 				   __func__, skb, packet-&gt;buf, packet-&gt;act_len,</div><div class='ctx'> 				   eid, "OK");</div><div class='ctx'> </div><div class='del'>-			flushing = false;</div><div class='del'>-			ar-&gt;net_stats.tx_packets++;</div><div class='del'>-			ar-&gt;net_stats.tx_bytes += skb-&gt;len;</div><div class='add'>+			flushing[if_idx] = false;</div><div class='add'>+			vif-&gt;net_stats.tx_packets++;</div><div class='add'>+			vif-&gt;net_stats.tx_bytes += skb-&gt;len;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ath6kl_tx_clear_node_map(ar, eid, map_no);</div><div class='add'>+		ath6kl_tx_clear_node_map(vif, eid, map_no);</div><div class='ctx'> </div><div class='ctx'> 		ath6kl_free_cookie(ar, ath6kl_cookie);</div><div class='ctx'> </div><div class='del'>-		if (test_bit(NETQ_STOPPED, &amp;ar-&gt;flag))</div><div class='del'>-			clear_bit(NETQ_STOPPED, &amp;ar-&gt;flag);</div><div class='add'>+		if (test_bit(NETQ_STOPPED, &amp;vif-&gt;flags))</div><div class='add'>+			clear_bit(NETQ_STOPPED, &amp;vif-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;ar-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	__skb_queue_purge(&amp;skb_queue);</div><div class='ctx'> </div><div class='del'>-	if (test_bit(CONNECTED, &amp;ar-&gt;flag)) {</div><div class='del'>-		if (!flushing)</div><div class='del'>-			netif_wake_queue(ar-&gt;net_dev);</div><div class='add'>+	/* FIXME: Locking */</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;list_lock);</div><div class='add'>+	list_for_each_entry(vif, &amp;ar-&gt;vif_list, list) {</div><div class='add'>+		if (test_bit(CONNECTED, &amp;vif-&gt;flags) &amp;&amp;</div><div class='add'>+		    !flushing[vif-&gt;fw_vif_idx]) {</div><div class='add'>+			spin_unlock_bh(&amp;ar-&gt;list_lock);</div><div class='add'>+			netif_wake_queue(vif-&gt;ndev);</div><div class='add'>+			spin_lock_bh(&amp;ar-&gt;list_lock);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;list_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (wake_event)</div><div class='ctx'> 		wake_up(&amp;ar-&gt;event_wq);</div><div class='hunk'>@@ -1041,8 +1081,9 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)</div><div class='ctx'> 	struct ath6kl_sta *conn = NULL;</div><div class='ctx'> 	struct sk_buff *skb1 = NULL;</div><div class='ctx'> 	struct ethhdr *datap = NULL;</div><div class='add'>+	struct ath6kl_vif *vif;</div><div class='ctx'> 	u16 seq_no, offset;</div><div class='del'>-	u8 tid;</div><div class='add'>+	u8 tid, if_idx;</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WLAN_RX,</div><div class='ctx'> 		   "%s: ar=0x%p eid=%d, skb=0x%p, data=0x%p, len=0x%x status:%d",</div><div class='hunk'>@@ -1050,7 +1091,23 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)</div><div class='ctx'> 		   packet-&gt;act_len, status);</div><div class='ctx'> </div><div class='ctx'> 	if (status || !(skb-&gt;data + HTC_HDR_LENGTH)) {</div><div class='del'>-		ar-&gt;net_stats.rx_errors++;</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_put(skb, packet-&gt;act_len + HTC_HDR_LENGTH);</div><div class='add'>+	skb_pull(skb, HTC_HDR_LENGTH);</div><div class='add'>+</div><div class='add'>+	if (ept == ar-&gt;ctrl_ep) {</div><div class='add'>+		if_idx =</div><div class='add'>+		wmi_cmd_hdr_get_if_idx((struct wmi_cmd_hdr *) skb-&gt;data);</div><div class='add'>+	} else {</div><div class='add'>+		if_idx =</div><div class='add'>+		wmi_data_hdr_get_if_idx((struct wmi_data_hdr *) skb-&gt;data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vif = ath6kl_get_vif_by_index(ar, if_idx);</div><div class='add'>+	if (!vif) {</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1059,28 +1116,28 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)</div><div class='ctx'> 	 * Take lock to protect buffer counts and adaptive power throughput</div><div class='ctx'> 	 * state.</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock_bh(&amp;ar-&gt;lock);</div><div class='add'>+	spin_lock_bh(&amp;vif-&gt;if_lock);</div><div class='ctx'> </div><div class='del'>-	ar-&gt;net_stats.rx_packets++;</div><div class='del'>-	ar-&gt;net_stats.rx_bytes += packet-&gt;act_len;</div><div class='add'>+	vif-&gt;net_stats.rx_packets++;</div><div class='add'>+	vif-&gt;net_stats.rx_bytes += packet-&gt;act_len;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;ar-&gt;lock);</div><div class='add'>+	spin_unlock_bh(&amp;vif-&gt;if_lock);</div><div class='ctx'> </div><div class='del'>-	skb_put(skb, packet-&gt;act_len + HTC_HDR_LENGTH);</div><div class='del'>-	skb_pull(skb, HTC_HDR_LENGTH);</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg_dump(ATH6KL_DBG_RAW_BYTES, __func__, "rx ",</div><div class='ctx'> 			skb-&gt;data, skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	skb-&gt;dev = ar-&gt;net_dev;</div><div class='add'>+	skb-&gt;dev = vif-&gt;ndev;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(WMI_ENABLED, &amp;ar-&gt;flag)) {</div><div class='ctx'> 		if (EPPING_ALIGNMENT_PAD &gt; 0)</div><div class='ctx'> 			skb_pull(skb, EPPING_ALIGNMENT_PAD);</div><div class='del'>-		ath6kl_deliver_frames_to_nw_stack(ar-&gt;net_dev, skb);</div><div class='add'>+		ath6kl_deliver_frames_to_nw_stack(vif-&gt;ndev, skb);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath6kl_check_wow_status(ar);</div><div class='add'>+</div><div class='ctx'> 	if (ept == ar-&gt;ctrl_ep) {</div><div class='ctx'> 		ath6kl_wmi_control_rx(ar-&gt;wmi, skb);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1096,18 +1153,18 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)</div><div class='ctx'> 	 * that do not have LLC hdr. They are 16 bytes in size.</div><div class='ctx'> 	 * Allow these frames in the AP mode.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ar-&gt;nw_type != AP_NETWORK &amp;&amp;</div><div class='add'>+	if (vif-&gt;nw_type != AP_NETWORK &amp;&amp;</div><div class='ctx'> 	    ((packet-&gt;act_len &lt; min_hdr_len) ||</div><div class='ctx'> 	     (packet-&gt;act_len &gt; WMI_MAX_AMSDU_RX_DATA_FRAME_LENGTH))) {</div><div class='ctx'> 		ath6kl_info("frame len is too short or too long\n");</div><div class='del'>-		ar-&gt;net_stats.rx_errors++;</div><div class='del'>-		ar-&gt;net_stats.rx_length_errors++;</div><div class='add'>+		vif-&gt;net_stats.rx_errors++;</div><div class='add'>+		vif-&gt;net_stats.rx_length_errors++;</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get the Power save state of the STA */</div><div class='del'>-	if (ar-&gt;nw_type == AP_NETWORK) {</div><div class='add'>+	if (vif-&gt;nw_type == AP_NETWORK) {</div><div class='ctx'> 		meta_type = wmi_data_hdr_get_meta(dhdr);</div><div class='ctx'> </div><div class='ctx'> 		ps_state = !!((dhdr-&gt;info &gt;&gt; WMI_DATA_HDR_PS_SHIFT) &amp;</div><div class='hunk'>@@ -1129,7 +1186,7 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		datap = (struct ethhdr *) (skb-&gt;data + offset);</div><div class='del'>-		conn = ath6kl_find_sta(ar, datap-&gt;h_source);</div><div class='add'>+		conn = ath6kl_find_sta(vif, datap-&gt;h_source);</div><div class='ctx'> </div><div class='ctx'> 		if (!conn) {</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='hunk'>@@ -1160,12 +1217,13 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)</div><div class='ctx'> 				while ((skbuff = skb_dequeue(&amp;conn-&gt;psq))</div><div class='ctx'> 				       != NULL) {</div><div class='ctx'> 					spin_unlock_bh(&amp;conn-&gt;psq_lock);</div><div class='del'>-					ath6kl_data_tx(skbuff, ar-&gt;net_dev);</div><div class='add'>+					ath6kl_data_tx(skbuff, vif-&gt;ndev);</div><div class='ctx'> 					spin_lock_bh(&amp;conn-&gt;psq_lock);</div><div class='ctx'> 				}</div><div class='ctx'> 				spin_unlock_bh(&amp;conn-&gt;psq_lock);</div><div class='ctx'> 				/* Clear the PVB for this STA */</div><div class='del'>-				ath6kl_wmi_set_pvb_cmd(ar-&gt;wmi, conn-&gt;aid, 0);</div><div class='add'>+				ath6kl_wmi_set_pvb_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+						       conn-&gt;aid, 0);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1215,12 +1273,12 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(ar-&gt;net_dev-&gt;flags &amp; IFF_UP)) {</div><div class='add'>+	if (!(vif-&gt;ndev-&gt;flags &amp; IFF_UP)) {</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;nw_type == AP_NETWORK) {</div><div class='add'>+	if (vif-&gt;nw_type == AP_NETWORK) {</div><div class='ctx'> 		datap = (struct ethhdr *) skb-&gt;data;</div><div class='ctx'> 		if (is_multicast_ether_addr(datap-&gt;h_dest))</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -1235,8 +1293,7 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)</div><div class='ctx'> 			 * frame to it on the air else send the</div><div class='ctx'> 			 * frame up the stack.</div><div class='ctx'> 			 */</div><div class='del'>-			struct ath6kl_sta *conn = NULL;</div><div class='del'>-			conn = ath6kl_find_sta(ar, datap-&gt;h_dest);</div><div class='add'>+			conn = ath6kl_find_sta(vif, datap-&gt;h_dest);</div><div class='ctx'> </div><div class='ctx'> 			if (conn &amp;&amp; ar-&gt;intra_bss) {</div><div class='ctx'> 				skb1 = skb;</div><div class='hunk'>@@ -1247,18 +1304,23 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		if (skb1)</div><div class='del'>-			ath6kl_data_tx(skb1, ar-&gt;net_dev);</div><div class='add'>+			ath6kl_data_tx(skb1, vif-&gt;ndev);</div><div class='add'>+</div><div class='add'>+		if (skb == NULL) {</div><div class='add'>+			/* nothing to deliver up the stack */</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	datap = (struct ethhdr *) skb-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	if (is_unicast_ether_addr(datap-&gt;h_dest) &amp;&amp;</div><div class='del'>-	    aggr_process_recv_frm(ar-&gt;aggr_cntxt, tid, seq_no,</div><div class='add'>+	    aggr_process_recv_frm(vif-&gt;aggr_cntxt, tid, seq_no,</div><div class='ctx'> 				  is_amsdu, skb))</div><div class='ctx'> 		/* aggregation code will handle the skb */</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ath6kl_deliver_frames_to_nw_stack(ar-&gt;net_dev, skb);</div><div class='add'>+	ath6kl_deliver_frames_to_nw_stack(vif-&gt;ndev, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void aggr_timeout(unsigned long arg)</div><div class='hunk'>@@ -1336,9 +1398,10 @@ static void aggr_delete_tid_state(struct aggr_info *p_aggr, u8 tid)</div><div class='ctx'> 	memset(stats, 0, sizeof(struct rxtid_stats));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void aggr_recv_addba_req_evt(struct ath6kl *ar, u8 tid, u16 seq_no, u8 win_sz)</div><div class='add'>+void aggr_recv_addba_req_evt(struct ath6kl_vif *vif, u8 tid, u16 seq_no,</div><div class='add'>+			     u8 win_sz)</div><div class='ctx'> {</div><div class='del'>-	struct aggr_info *p_aggr = ar-&gt;aggr_cntxt;</div><div class='add'>+	struct aggr_info *p_aggr = vif-&gt;aggr_cntxt;</div><div class='ctx'> 	struct rxtid *rxtid;</div><div class='ctx'> 	struct rxtid_stats *stats;</div><div class='ctx'> 	u16 hold_q_size;</div><div class='hunk'>@@ -1405,9 +1468,9 @@ struct aggr_info *aggr_init(struct net_device *dev)</div><div class='ctx'> 	return p_aggr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void aggr_recv_delba_req_evt(struct ath6kl *ar, u8 tid)</div><div class='add'>+void aggr_recv_delba_req_evt(struct ath6kl_vif *vif, u8 tid)</div><div class='ctx'> {</div><div class='del'>-	struct aggr_info *p_aggr = ar-&gt;aggr_cntxt;</div><div class='add'>+	struct aggr_info *p_aggr = vif-&gt;aggr_cntxt;</div><div class='ctx'> 	struct rxtid *rxtid;</div><div class='ctx'> </div><div class='ctx'> 	if (!p_aggr)</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c<br/>index a7de23cbd2c7..f6f2aa27fc20 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/wmi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/wmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/wmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/wmi.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include "../regd.h"</div><div class='ctx'> #include "../regd_common.h"</div><div class='ctx'> </div><div class='del'>-static int ath6kl_wmi_sync_point(struct wmi *wmi);</div><div class='add'>+static int ath6kl_wmi_sync_point(struct wmi *wmi, u8 if_idx);</div><div class='ctx'> </div><div class='ctx'> static const s32 wmi_rate_tbl[][2] = {</div><div class='ctx'> 	/* {W/O SGI, with SGI} */</div><div class='hunk'>@@ -81,6 +81,26 @@ enum htc_endpoint_id ath6kl_wmi_get_control_ep(struct wmi *wmi)</div><div class='ctx'> 	return wmi-&gt;ep_id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct ath6kl_vif *ath6kl_get_vif_by_index(struct ath6kl *ar, u8 if_idx)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl_vif *vif, *found = NULL;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(if_idx &gt; (ar-&gt;vif_max - 1)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* FIXME: Locking */</div><div class='add'>+	spin_lock_bh(&amp;ar-&gt;list_lock);</div><div class='add'>+	list_for_each_entry(vif, &amp;ar-&gt;vif_list, list) {</div><div class='add'>+		if (vif-&gt;fw_vif_idx == if_idx) {</div><div class='add'>+			found = vif;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;ar-&gt;list_lock);</div><div class='add'>+</div><div class='add'>+	return found;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*  Performs DIX to 802.3 encapsulation for transmit packets.</div><div class='ctx'>  *  Assumes the entire DIX header is contigous and that there is</div><div class='ctx'>  *  enough room in the buffer for a 802.3 mac header and LLC+SNAP headers.</div><div class='hunk'>@@ -162,12 +182,12 @@ static int ath6kl_wmi_meta_add(struct wmi *wmi, struct sk_buff *skb,</div><div class='ctx'> int ath6kl_wmi_data_hdr_add(struct wmi *wmi, struct sk_buff *skb,</div><div class='ctx'> 			    u8 msg_type, bool more_data,</div><div class='ctx'> 			    enum wmi_data_hdr_data_type data_type,</div><div class='del'>-			    u8 meta_ver, void *tx_meta_info)</div><div class='add'>+			    u8 meta_ver, void *tx_meta_info, u8 if_idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_data_hdr *data_hdr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(skb == NULL))</div><div class='add'>+	if (WARN_ON(skb == NULL || (if_idx &gt; wmi-&gt;parent_dev-&gt;vif_max - 1)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (tx_meta_info) {</div><div class='hunk'>@@ -189,7 +209,7 @@ int ath6kl_wmi_data_hdr_add(struct wmi *wmi, struct sk_buff *skb,</div><div class='ctx'> 		    WMI_DATA_HDR_MORE_MASK &lt;&lt; WMI_DATA_HDR_MORE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	data_hdr-&gt;info2 = cpu_to_le16(meta_ver &lt;&lt; WMI_DATA_HDR_META_SHIFT);</div><div class='del'>-	data_hdr-&gt;info3 = 0;</div><div class='add'>+	data_hdr-&gt;info3 = cpu_to_le16(if_idx &amp; WMI_DATA_HDR_IF_IDX_MASK);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -216,7 +236,8 @@ static u8 ath6kl_wmi_determine_user_priority(u8 *pkt, u32 layer2_pri)</div><div class='ctx'> 		return ip_pri;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_implicit_create_pstream(struct wmi *wmi, struct sk_buff *skb,</div><div class='add'>+int ath6kl_wmi_implicit_create_pstream(struct wmi *wmi, u8 if_idx,</div><div class='add'>+				       struct sk_buff *skb,</div><div class='ctx'> 				       u32 layer2_priority, bool wmm_enabled,</div><div class='ctx'> 				       u8 *ac)</div><div class='ctx'> {</div><div class='hunk'>@@ -262,7 +283,12 @@ int ath6kl_wmi_implicit_create_pstream(struct wmi *wmi, struct sk_buff *skb,</div><div class='ctx'> 			usr_pri = layer2_priority &amp; 0x7;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* workaround for WMM S5 */</div><div class='add'>+	/*</div><div class='add'>+	 * workaround for WMM S5</div><div class='add'>+	 *</div><div class='add'>+	 * FIXME: wmi-&gt;traffic_class is always 100 so this test doesn't</div><div class='add'>+	 * make sense</div><div class='add'>+	 */</div><div class='ctx'> 	if ((wmi-&gt;traffic_class == WMM_AC_VI) &amp;&amp;</div><div class='ctx'> 	    ((usr_pri == 5) || (usr_pri == 4)))</div><div class='ctx'> 		usr_pri = 1;</div><div class='hunk'>@@ -284,7 +310,7 @@ int ath6kl_wmi_implicit_create_pstream(struct wmi *wmi, struct sk_buff *skb,</div><div class='ctx'> 			cpu_to_le32(WMI_IMPLICIT_PSTREAM_INACTIVITY_INT);</div><div class='ctx'> 		/* Implicit streams are created with TSID 0xFF */</div><div class='ctx'> 		cmd.tsid = WMI_IMPLICIT_PSTREAM;</div><div class='del'>-		ath6kl_wmi_create_pstream_cmd(wmi, &amp;cmd);</div><div class='add'>+		ath6kl_wmi_create_pstream_cmd(wmi, if_idx, &amp;cmd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*ac = traffic_class;</div><div class='hunk'>@@ -410,13 +436,14 @@ static int ath6kl_wmi_tx_complete_event_rx(u8 *datap, int len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_wmi_remain_on_chnl_event_rx(struct wmi *wmi, u8 *datap,</div><div class='del'>-					      int len)</div><div class='add'>+					      int len, struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_remain_on_chnl_event *ev;</div><div class='ctx'> 	u32 freq;</div><div class='ctx'> 	u32 dur;</div><div class='ctx'> 	struct ieee80211_channel *chan;</div><div class='ctx'> 	struct ath6kl *ar = wmi-&gt;parent_dev;</div><div class='add'>+	u32 id;</div><div class='ctx'> </div><div class='ctx'> 	if (len &lt; sizeof(*ev))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -426,26 +453,29 @@ static int ath6kl_wmi_remain_on_chnl_event_rx(struct wmi *wmi, u8 *datap,</div><div class='ctx'> 	dur = le32_to_cpu(ev-&gt;duration);</div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WMI, "remain_on_chnl: freq=%u dur=%u\n",</div><div class='ctx'> 		   freq, dur);</div><div class='del'>-	chan = ieee80211_get_channel(ar-&gt;wdev-&gt;wiphy, freq);</div><div class='add'>+	chan = ieee80211_get_channel(ar-&gt;wiphy, freq);</div><div class='ctx'> 	if (!chan) {</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "remain_on_chnl: Unknown channel "</div><div class='ctx'> 			   "(freq=%u)\n", freq);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	cfg80211_ready_on_channel(ar-&gt;net_dev, 1, chan, NL80211_CHAN_NO_HT,</div><div class='add'>+	id = vif-&gt;last_roc_id;</div><div class='add'>+	cfg80211_ready_on_channel(vif-&gt;ndev, id, chan, NL80211_CHAN_NO_HT,</div><div class='ctx'> 				  dur, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_wmi_cancel_remain_on_chnl_event_rx(struct wmi *wmi,</div><div class='del'>-						     u8 *datap, int len)</div><div class='add'>+						     u8 *datap, int len,</div><div class='add'>+						     struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_cancel_remain_on_chnl_event *ev;</div><div class='ctx'> 	u32 freq;</div><div class='ctx'> 	u32 dur;</div><div class='ctx'> 	struct ieee80211_channel *chan;</div><div class='ctx'> 	struct ath6kl *ar = wmi-&gt;parent_dev;</div><div class='add'>+	u32 id;</div><div class='ctx'> </div><div class='ctx'> 	if (len &lt; sizeof(*ev))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -455,23 +485,29 @@ static int ath6kl_wmi_cancel_remain_on_chnl_event_rx(struct wmi *wmi,</div><div class='ctx'> 	dur = le32_to_cpu(ev-&gt;duration);</div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WMI, "cancel_remain_on_chnl: freq=%u dur=%u "</div><div class='ctx'> 		   "status=%u\n", freq, dur, ev-&gt;status);</div><div class='del'>-	chan = ieee80211_get_channel(ar-&gt;wdev-&gt;wiphy, freq);</div><div class='add'>+	chan = ieee80211_get_channel(ar-&gt;wiphy, freq);</div><div class='ctx'> 	if (!chan) {</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "cancel_remain_on_chnl: Unknown "</div><div class='ctx'> 			   "channel (freq=%u)\n", freq);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	cfg80211_remain_on_channel_expired(ar-&gt;net_dev, 1, chan,</div><div class='add'>+	if (vif-&gt;last_cancel_roc_id &amp;&amp;</div><div class='add'>+	    vif-&gt;last_cancel_roc_id + 1 == vif-&gt;last_roc_id)</div><div class='add'>+		id = vif-&gt;last_cancel_roc_id; /* event for cancel command */</div><div class='add'>+	else</div><div class='add'>+		id = vif-&gt;last_roc_id; /* timeout on uncanceled r-o-c */</div><div class='add'>+	vif-&gt;last_cancel_roc_id = 0;</div><div class='add'>+	cfg80211_remain_on_channel_expired(vif-&gt;ndev, id, chan,</div><div class='ctx'> 					   NL80211_CHAN_NO_HT, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_wmi_tx_status_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='add'>+static int ath6kl_wmi_tx_status_event_rx(struct wmi *wmi, u8 *datap, int len,</div><div class='add'>+					 struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_tx_status_event *ev;</div><div class='ctx'> 	u32 id;</div><div class='del'>-	struct ath6kl *ar = wmi-&gt;parent_dev;</div><div class='ctx'> </div><div class='ctx'> 	if (len &lt; sizeof(*ev))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -481,7 +517,7 @@ static int ath6kl_wmi_tx_status_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WMI, "tx_status: id=%x ack_status=%u\n",</div><div class='ctx'> 		   id, ev-&gt;ack_status);</div><div class='ctx'> 	if (wmi-&gt;last_mgmt_tx_frame) {</div><div class='del'>-		cfg80211_mgmt_tx_status(ar-&gt;net_dev, id,</div><div class='add'>+		cfg80211_mgmt_tx_status(vif-&gt;ndev, id,</div><div class='ctx'> 					wmi-&gt;last_mgmt_tx_frame,</div><div class='ctx'> 					wmi-&gt;last_mgmt_tx_frame_len,</div><div class='ctx'> 					!!ev-&gt;ack_status, GFP_ATOMIC);</div><div class='hunk'>@@ -493,12 +529,12 @@ static int ath6kl_wmi_tx_status_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_wmi_rx_probe_req_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='add'>+static int ath6kl_wmi_rx_probe_req_event_rx(struct wmi *wmi, u8 *datap, int len,</div><div class='add'>+					    struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_p2p_rx_probe_req_event *ev;</div><div class='ctx'> 	u32 freq;</div><div class='ctx'> 	u16 dlen;</div><div class='del'>-	struct ath6kl *ar = wmi-&gt;parent_dev;</div><div class='ctx'> </div><div class='ctx'> 	if (len &lt; sizeof(*ev))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -513,10 +549,10 @@ static int ath6kl_wmi_rx_probe_req_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 	}</div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WMI, "rx_probe_req: len=%u freq=%u "</div><div class='ctx'> 		   "probe_req_report=%d\n",</div><div class='del'>-		   dlen, freq, ar-&gt;probe_req_report);</div><div class='add'>+		   dlen, freq, vif-&gt;probe_req_report);</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;probe_req_report || ar-&gt;nw_type == AP_NETWORK)</div><div class='del'>-		cfg80211_rx_mgmt(ar-&gt;net_dev, freq, ev-&gt;data, dlen, GFP_ATOMIC);</div><div class='add'>+	if (vif-&gt;probe_req_report || vif-&gt;nw_type == AP_NETWORK)</div><div class='add'>+		cfg80211_rx_mgmt(vif-&gt;ndev, freq, ev-&gt;data, dlen, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -536,12 +572,12 @@ static int ath6kl_wmi_p2p_capabilities_event_rx(u8 *datap, int len)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_wmi_rx_action_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='add'>+static int ath6kl_wmi_rx_action_event_rx(struct wmi *wmi, u8 *datap, int len,</div><div class='add'>+					 struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_rx_action_event *ev;</div><div class='ctx'> 	u32 freq;</div><div class='ctx'> 	u16 dlen;</div><div class='del'>-	struct ath6kl *ar = wmi-&gt;parent_dev;</div><div class='ctx'> </div><div class='ctx'> 	if (len &lt; sizeof(*ev))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -555,7 +591,7 @@ static int ath6kl_wmi_rx_action_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WMI, "rx_action: len=%u freq=%u\n", dlen, freq);</div><div class='del'>-	cfg80211_rx_mgmt(ar-&gt;net_dev, freq, ev-&gt;data, dlen, GFP_ATOMIC);</div><div class='add'>+	cfg80211_rx_mgmt(vif-&gt;ndev, freq, ev-&gt;data, dlen, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -620,7 +656,8 @@ static inline struct sk_buff *ath6kl_wmi_get_new_buf(u32 size)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Send a "simple" wmi command -- one with no arguments */</div><div class='del'>-static int ath6kl_wmi_simple_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id)</div><div class='add'>+static int ath6kl_wmi_simple_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+				 enum wmi_cmd_id cmd_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -629,7 +666,7 @@ static int ath6kl_wmi_simple_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id)</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, cmd_id, NO_SYNC_WMIFLAG);</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, cmd_id, NO_SYNC_WMIFLAG);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -641,7 +678,6 @@ static int ath6kl_wmi_ready_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 	if (len &lt; sizeof(struct wmi_ready_event_2))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	wmi-&gt;ready = true;</div><div class='ctx'> 	ath6kl_ready_event(wmi-&gt;parent_dev, ev-&gt;mac_addr,</div><div class='ctx'> 			   le32_to_cpu(ev-&gt;sw_version),</div><div class='ctx'> 			   le32_to_cpu(ev-&gt;abi_version));</div><div class='hunk'>@@ -673,32 +709,73 @@ int ath6kl_wmi_set_roam_lrssi_cmd(struct wmi *wmi, u8 lrssi)</div><div class='ctx'> 	cmd-&gt;info.params.roam_rssi_floor = DEF_LRSSI_ROAM_FLOOR;</div><div class='ctx'> 	cmd-&gt;roam_ctrl = WMI_SET_LRSSI_SCAN_PARAMS;</div><div class='ctx'> </div><div class='del'>-	ath6kl_wmi_cmd_send(wmi, skb, WMI_SET_ROAM_CTRL_CMDID, NO_SYNC_WMIFLAG);</div><div class='add'>+	ath6kl_wmi_cmd_send(wmi, 0, skb, WMI_SET_ROAM_CTRL_CMDID,</div><div class='add'>+			    NO_SYNC_WMIFLAG);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_wmi_connect_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='add'>+int ath6kl_wmi_force_roam_cmd(struct wmi *wmi, const u8 *bssid)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct roam_ctrl_cmd *cmd;</div><div class='add'>+</div><div class='add'>+	skb = ath6kl_wmi_get_new_buf(sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct roam_ctrl_cmd *) skb-&gt;data;</div><div class='add'>+	memset(cmd, 0, sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	memcpy(cmd-&gt;info.bssid, bssid, ETH_ALEN);</div><div class='add'>+	cmd-&gt;roam_ctrl = WMI_FORCE_ROAM;</div><div class='add'>+</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_WMI, "force roam to %pM\n", bssid);</div><div class='add'>+	return ath6kl_wmi_cmd_send(wmi, 0, skb, WMI_SET_ROAM_CTRL_CMDID,</div><div class='add'>+				   NO_SYNC_WMIFLAG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath6kl_wmi_set_roam_mode_cmd(struct wmi *wmi, enum wmi_roam_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct roam_ctrl_cmd *cmd;</div><div class='add'>+</div><div class='add'>+	skb = ath6kl_wmi_get_new_buf(sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct roam_ctrl_cmd *) skb-&gt;data;</div><div class='add'>+	memset(cmd, 0, sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;info.roam_mode = mode;</div><div class='add'>+	cmd-&gt;roam_ctrl = WMI_SET_ROAM_MODE;</div><div class='add'>+</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_WMI, "set roam mode %d\n", mode);</div><div class='add'>+	return ath6kl_wmi_cmd_send(wmi, 0, skb, WMI_SET_ROAM_CTRL_CMDID,</div><div class='add'>+				   NO_SYNC_WMIFLAG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath6kl_wmi_connect_event_rx(struct wmi *wmi, u8 *datap, int len,</div><div class='add'>+				       struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_connect_event *ev;</div><div class='ctx'> 	u8 *pie, *peie;</div><div class='del'>-	struct ath6kl *ar = wmi-&gt;parent_dev;</div><div class='ctx'> </div><div class='ctx'> 	if (len &lt; sizeof(struct wmi_connect_event))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ev = (struct wmi_connect_event *) datap;</div><div class='ctx'> </div><div class='del'>-	if (ar-&gt;nw_type == AP_NETWORK) {</div><div class='add'>+	if (vif-&gt;nw_type == AP_NETWORK) {</div><div class='ctx'> 		/* AP mode start/STA connected event */</div><div class='del'>-		struct net_device *dev = ar-&gt;net_dev;</div><div class='add'>+		struct net_device *dev = vif-&gt;ndev;</div><div class='ctx'> 		if (memcmp(dev-&gt;dev_addr, ev-&gt;u.ap_bss.bssid, ETH_ALEN) == 0) {</div><div class='ctx'> 			ath6kl_dbg(ATH6KL_DBG_WMI, "%s: freq %d bssid %pM "</div><div class='ctx'> 				   "(AP started)\n",</div><div class='ctx'> 				   __func__, le16_to_cpu(ev-&gt;u.ap_bss.ch),</div><div class='ctx'> 				   ev-&gt;u.ap_bss.bssid);</div><div class='ctx'> 			ath6kl_connect_ap_mode_bss(</div><div class='del'>-				ar, le16_to_cpu(ev-&gt;u.ap_bss.ch));</div><div class='add'>+				vif, le16_to_cpu(ev-&gt;u.ap_bss.ch));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ath6kl_dbg(ATH6KL_DBG_WMI, "%s: aid %u mac_addr %pM "</div><div class='ctx'> 				   "auth=%u keymgmt=%u cipher=%u apsd_info=%u "</div><div class='hunk'>@@ -710,7 +787,7 @@ static int ath6kl_wmi_connect_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 				   le16_to_cpu(ev-&gt;u.ap_sta.cipher),</div><div class='ctx'> 				   ev-&gt;u.ap_sta.apsd_info);</div><div class='ctx'> 			ath6kl_connect_ap_mode_sta(</div><div class='del'>-				ar, ev-&gt;u.ap_sta.aid, ev-&gt;u.ap_sta.mac_addr,</div><div class='add'>+				vif, ev-&gt;u.ap_sta.aid, ev-&gt;u.ap_sta.mac_addr,</div><div class='ctx'> 				ev-&gt;u.ap_sta.keymgmt,</div><div class='ctx'> 				le16_to_cpu(ev-&gt;u.ap_sta.cipher),</div><div class='ctx'> 				ev-&gt;u.ap_sta.auth, ev-&gt;assoc_req_len,</div><div class='hunk'>@@ -755,7 +832,7 @@ static int ath6kl_wmi_connect_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 		pie += pie[1] + 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath6kl_connect_event(wmi-&gt;parent_dev, le16_to_cpu(ev-&gt;u.sta.ch),</div><div class='add'>+	ath6kl_connect_event(vif, le16_to_cpu(ev-&gt;u.sta.ch),</div><div class='ctx'> 			     ev-&gt;u.sta.bssid,</div><div class='ctx'> 			     le16_to_cpu(ev-&gt;u.sta.listen_intvl),</div><div class='ctx'> 			     le16_to_cpu(ev-&gt;u.sta.beacon_intvl),</div><div class='hunk'>@@ -834,14 +911,15 @@ static void ath6kl_wmi_regdomain_event(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 		alpha2[0] = country-&gt;isoName[0];</div><div class='ctx'> 		alpha2[1] = country-&gt;isoName[1];</div><div class='ctx'> </div><div class='del'>-		regulatory_hint(wmi-&gt;parent_dev-&gt;wdev-&gt;wiphy, alpha2);</div><div class='add'>+		regulatory_hint(wmi-&gt;parent_dev-&gt;wiphy, alpha2);</div><div class='ctx'> </div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "Country alpha2 being used: %c%c\n",</div><div class='ctx'> 				alpha2[0], alpha2[1]);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_wmi_disconnect_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='add'>+static int ath6kl_wmi_disconnect_event_rx(struct wmi *wmi, u8 *datap, int len,</div><div class='add'>+					  struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_disconnect_event *ev;</div><div class='ctx'> 	wmi-&gt;traffic_class = 100;</div><div class='hunk'>@@ -857,10 +935,8 @@ static int ath6kl_wmi_disconnect_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 		   ev-&gt;disconn_reason, ev-&gt;assoc_resp_len);</div><div class='ctx'> </div><div class='ctx'> 	wmi-&gt;is_wmm_enabled = false;</div><div class='del'>-	wmi-&gt;pair_crypto_type = NONE_CRYPT;</div><div class='del'>-	wmi-&gt;grp_crypto_type = NONE_CRYPT;</div><div class='ctx'> </div><div class='del'>-	ath6kl_disconnect_event(wmi-&gt;parent_dev, ev-&gt;disconn_reason,</div><div class='add'>+	ath6kl_disconnect_event(vif, ev-&gt;disconn_reason,</div><div class='ctx'> 				ev-&gt;bssid, ev-&gt;assoc_resp_len, ev-&gt;assoc_info,</div><div class='ctx'> 				le16_to_cpu(ev-&gt;proto_reason_status));</div><div class='ctx'> </div><div class='hunk'>@@ -886,7 +962,8 @@ static int ath6kl_wmi_peer_node_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_wmi_tkip_micerr_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='add'>+static int ath6kl_wmi_tkip_micerr_event_rx(struct wmi *wmi, u8 *datap, int len,</div><div class='add'>+					   struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_tkip_micerr_event *ev;</div><div class='ctx'> </div><div class='hunk'>@@ -895,12 +972,20 @@ static int ath6kl_wmi_tkip_micerr_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> </div><div class='ctx'> 	ev = (struct wmi_tkip_micerr_event *) datap;</div><div class='ctx'> </div><div class='del'>-	ath6kl_tkip_micerr_event(wmi-&gt;parent_dev, ev-&gt;key_id, ev-&gt;is_mcast);</div><div class='add'>+	ath6kl_tkip_micerr_event(vif, ev-&gt;key_id, ev-&gt;is_mcast);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='add'>+void ath6kl_wmi_sscan_timer(unsigned long ptr)</div><div class='add'>+{</div><div class='add'>+	struct ath6kl_vif *vif = (struct ath6kl_vif *) ptr;</div><div class='add'>+</div><div class='add'>+	cfg80211_sched_scan_results(vif-&gt;ar-&gt;wiphy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len,</div><div class='add'>+				       struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_bss_info_hdr2 *bih;</div><div class='ctx'> 	u8 *buf;</div><div class='hunk'>@@ -927,26 +1012,27 @@ static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 		return 0; /* Only update BSS table for now */</div><div class='ctx'> </div><div class='ctx'> 	if (bih-&gt;frame_type == BEACON_FTYPE &amp;&amp;</div><div class='del'>-	    test_bit(CLEAR_BSSFILTER_ON_BEACON, &amp;ar-&gt;flag)) {</div><div class='del'>-		clear_bit(CLEAR_BSSFILTER_ON_BEACON, &amp;ar-&gt;flag);</div><div class='del'>-		ath6kl_wmi_bssfilter_cmd(ar-&gt;wmi, NONE_BSS_FILTER, 0);</div><div class='add'>+	    test_bit(CLEAR_BSSFILTER_ON_BEACON, &amp;vif-&gt;flags)) {</div><div class='add'>+		clear_bit(CLEAR_BSSFILTER_ON_BEACON, &amp;vif-&gt;flags);</div><div class='add'>+		ath6kl_wmi_bssfilter_cmd(ar-&gt;wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+					 NONE_BSS_FILTER, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	channel = ieee80211_get_channel(ar-&gt;wdev-&gt;wiphy, le16_to_cpu(bih-&gt;ch));</div><div class='add'>+	channel = ieee80211_get_channel(ar-&gt;wiphy, le16_to_cpu(bih-&gt;ch));</div><div class='ctx'> 	if (channel == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (len &lt; 8 + 2 + 2)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (bih-&gt;frame_type == BEACON_FTYPE &amp;&amp; test_bit(CONNECTED, &amp;ar-&gt;flag) &amp;&amp;</div><div class='del'>-	    memcmp(bih-&gt;bssid, ar-&gt;bssid, ETH_ALEN) == 0) {</div><div class='add'>+	if (bih-&gt;frame_type == BEACON_FTYPE &amp;&amp; test_bit(CONNECTED, &amp;vif-&gt;flags)</div><div class='add'>+	    &amp;&amp; memcmp(bih-&gt;bssid, vif-&gt;bssid, ETH_ALEN) == 0) {</div><div class='ctx'> 		const u8 *tim;</div><div class='ctx'> 		tim = cfg80211_find_ie(WLAN_EID_TIM, buf + 8 + 2 + 2,</div><div class='ctx'> 				       len - 8 - 2 - 2);</div><div class='ctx'> 		if (tim &amp;&amp; tim[1] &gt;= 2) {</div><div class='del'>-			ar-&gt;assoc_bss_dtim_period = tim[3];</div><div class='del'>-			set_bit(DTIM_PERIOD_AVAIL, &amp;ar-&gt;flag);</div><div class='add'>+			vif-&gt;assoc_bss_dtim_period = tim[3];</div><div class='add'>+			set_bit(DTIM_PERIOD_AVAIL, &amp;vif-&gt;flags);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -966,7 +1052,7 @@ static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 						  IEEE80211_STYPE_BEACON);</div><div class='ctx'> 		memset(mgmt-&gt;da, 0xff, ETH_ALEN);</div><div class='ctx'> 	} else {</div><div class='del'>-		struct net_device *dev = ar-&gt;net_dev;</div><div class='add'>+		struct net_device *dev = vif-&gt;ndev;</div><div class='ctx'> </div><div class='ctx'> 		mgmt-&gt;frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |</div><div class='ctx'> 						  IEEE80211_STYPE_PROBE_RESP);</div><div class='hunk'>@@ -979,7 +1065,7 @@ static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;mgmt-&gt;u.beacon, buf, len);</div><div class='ctx'> </div><div class='del'>-	bss = cfg80211_inform_bss_frame(ar-&gt;wdev-&gt;wiphy, channel, mgmt,</div><div class='add'>+	bss = cfg80211_inform_bss_frame(ar-&gt;wiphy, channel, mgmt,</div><div class='ctx'> 					24 + len, (bih-&gt;snr - 95) * 100,</div><div class='ctx'> 					GFP_ATOMIC);</div><div class='ctx'> 	kfree(mgmt);</div><div class='hunk'>@@ -987,6 +1073,21 @@ static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	cfg80211_put_bss(bss);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Firmware doesn't return any event when scheduled scan has</div><div class='add'>+	 * finished, so we need to use a timer to find out when there are</div><div class='add'>+	 * no more results.</div><div class='add'>+	 *</div><div class='add'>+	 * The timer is started from the first bss info received, otherwise</div><div class='add'>+	 * the timer would not ever fire if the scan interval is short</div><div class='add'>+	 * enough.</div><div class='add'>+	 */</div><div class='add'>+	if (ar-&gt;state == ATH6KL_STATE_SCHED_SCAN &amp;&amp;</div><div class='add'>+	    !timer_pending(&amp;vif-&gt;sched_scan_timer)) {</div><div class='add'>+		mod_timer(&amp;vif-&gt;sched_scan_timer, jiffies +</div><div class='add'>+			  msecs_to_jiffies(ATH6KL_SCHED_SCAN_RESULT_DELAY));</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'>@@ -1094,20 +1195,21 @@ static int ath6kl_wmi_keepalive_reply_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_wmi_scan_complete_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='add'>+static int ath6kl_wmi_scan_complete_rx(struct wmi *wmi, u8 *datap, int len,</div><div class='add'>+				       struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_scan_complete_event *ev;</div><div class='ctx'> </div><div class='ctx'> 	ev = (struct wmi_scan_complete_event *) datap;</div><div class='ctx'> </div><div class='del'>-	ath6kl_scan_complete_evt(wmi-&gt;parent_dev, a_sle32_to_cpu(ev-&gt;status));</div><div class='add'>+	ath6kl_scan_complete_evt(vif, a_sle32_to_cpu(ev-&gt;status));</div><div class='ctx'> 	wmi-&gt;is_probe_ssid = false;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_wmi_neighbor_report_event_rx(struct wmi *wmi, u8 *datap,</div><div class='del'>-					       int len)</div><div class='add'>+					       int len, struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_neighbor_report_event *ev;</div><div class='ctx'> 	u8 i;</div><div class='hunk'>@@ -1125,7 +1227,7 @@ static int ath6kl_wmi_neighbor_report_event_rx(struct wmi *wmi, u8 *datap,</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "neighbor %d/%d - %pM 0x%x\n",</div><div class='ctx'> 			   i + 1, ev-&gt;num_neighbors, ev-&gt;neighbor[i].bssid,</div><div class='ctx'> 			   ev-&gt;neighbor[i].bss_flags);</div><div class='del'>-		cfg80211_pmksa_candidate_notify(wmi-&gt;parent_dev-&gt;net_dev, i,</div><div class='add'>+		cfg80211_pmksa_candidate_notify(vif-&gt;ndev, i,</div><div class='ctx'> 						ev-&gt;neighbor[i].bssid,</div><div class='ctx'> 						!!(ev-&gt;neighbor[i].bss_flags &amp;</div><div class='ctx'> 						   WMI_PREAUTH_CAPABLE_BSS),</div><div class='hunk'>@@ -1166,9 +1268,10 @@ static int ath6kl_wmi_error_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_wmi_stats_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='add'>+static int ath6kl_wmi_stats_event_rx(struct wmi *wmi, u8 *datap, int len,</div><div class='add'>+				     struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	ath6kl_tgt_stats_event(wmi-&gt;parent_dev, datap, len);</div><div class='add'>+	ath6kl_tgt_stats_event(vif, datap, len);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1222,7 +1325,7 @@ static int ath6kl_wmi_send_rssi_threshold_params(struct wmi *wmi,</div><div class='ctx'> 	cmd = (struct wmi_rssi_threshold_params_cmd *) skb-&gt;data;</div><div class='ctx'> 	memcpy(cmd, rssi_cmd, sizeof(struct wmi_rssi_threshold_params_cmd));</div><div class='ctx'> </div><div class='del'>-	return ath6kl_wmi_cmd_send(wmi, skb, WMI_RSSI_THRESHOLD_PARAMS_CMDID,</div><div class='add'>+	return ath6kl_wmi_cmd_send(wmi, 0, skb, WMI_RSSI_THRESHOLD_PARAMS_CMDID,</div><div class='ctx'> 				   NO_SYNC_WMIFLAG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1322,7 +1425,8 @@ static int ath6kl_wmi_rssi_threshold_event_rx(struct wmi *wmi, u8 *datap,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_wmi_cac_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='add'>+static int ath6kl_wmi_cac_event_rx(struct wmi *wmi, u8 *datap, int len,</div><div class='add'>+				   struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_cac_event *reply;</div><div class='ctx'> 	struct ieee80211_tspec_ie *ts;</div><div class='hunk'>@@ -1343,7 +1447,8 @@ static int ath6kl_wmi_cac_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 		tsid = (tsinfo &gt;&gt; IEEE80211_WMM_IE_TSPEC_TID_SHIFT) &amp;</div><div class='ctx'> 			IEEE80211_WMM_IE_TSPEC_TID_MASK;</div><div class='ctx'> </div><div class='del'>-		ath6kl_wmi_delete_pstream_cmd(wmi, reply-&gt;ac, tsid);</div><div class='add'>+		ath6kl_wmi_delete_pstream_cmd(wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+					      reply-&gt;ac, tsid);</div><div class='ctx'> 	} else if (reply-&gt;cac_indication == CAC_INDICATION_NO_RESP) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Following assumes that there is only one outstanding</div><div class='hunk'>@@ -1358,7 +1463,8 @@ static int ath6kl_wmi_cac_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (index &lt; (sizeof(active_tsids) * 8))</div><div class='del'>-			ath6kl_wmi_delete_pstream_cmd(wmi, reply-&gt;ac, index);</div><div class='add'>+			ath6kl_wmi_delete_pstream_cmd(wmi, vif-&gt;fw_vif_idx,</div><div class='add'>+						      reply-&gt;ac, index);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1403,7 +1509,7 @@ static int ath6kl_wmi_send_snr_threshold_params(struct wmi *wmi,</div><div class='ctx'> 	cmd = (struct wmi_snr_threshold_params_cmd *) skb-&gt;data;</div><div class='ctx'> 	memcpy(cmd, snr_cmd, sizeof(struct wmi_snr_threshold_params_cmd));</div><div class='ctx'> </div><div class='del'>-	return ath6kl_wmi_cmd_send(wmi, skb, WMI_SNR_THRESHOLD_PARAMS_CMDID,</div><div class='add'>+	return ath6kl_wmi_cmd_send(wmi, 0, skb, WMI_SNR_THRESHOLD_PARAMS_CMDID,</div><div class='ctx'> 				   NO_SYNC_WMIFLAG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1528,14 +1634,15 @@ static int ath6kl_wmi_aplist_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_cmd_send(struct wmi *wmi, struct sk_buff *skb,</div><div class='add'>+int ath6kl_wmi_cmd_send(struct wmi *wmi, u8 if_idx, struct sk_buff *skb,</div><div class='ctx'> 			enum wmi_cmd_id cmd_id, enum wmi_sync_flag sync_flag)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_cmd_hdr *cmd_hdr;</div><div class='ctx'> 	enum htc_endpoint_id ep_id = wmi-&gt;ep_id;</div><div class='ctx'> 	int ret;</div><div class='add'>+	u16 info1;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(skb == NULL))</div><div class='add'>+	if (WARN_ON(skb == NULL || (if_idx &gt; (wmi-&gt;parent_dev-&gt;vif_max - 1))))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WMI, "wmi tx id %d len %d flag %d\n",</div><div class='hunk'>@@ -1554,19 +1661,20 @@ int ath6kl_wmi_cmd_send(struct wmi *wmi, struct sk_buff *skb,</div><div class='ctx'> 		 * Make sure all data currently queued is transmitted before</div><div class='ctx'> 		 * the cmd execution.  Establish a new sync point.</div><div class='ctx'> 		 */</div><div class='del'>-		ath6kl_wmi_sync_point(wmi);</div><div class='add'>+		ath6kl_wmi_sync_point(wmi, if_idx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_push(skb, sizeof(struct wmi_cmd_hdr));</div><div class='ctx'> </div><div class='ctx'> 	cmd_hdr = (struct wmi_cmd_hdr *) skb-&gt;data;</div><div class='ctx'> 	cmd_hdr-&gt;cmd_id = cpu_to_le16(cmd_id);</div><div class='del'>-	cmd_hdr-&gt;info1 = 0;	/* added for virtual interface */</div><div class='add'>+	info1 = if_idx &amp; WMI_CMD_HDR_IF_ID_MASK;</div><div class='add'>+	cmd_hdr-&gt;info1 = cpu_to_le16(info1);</div><div class='ctx'> </div><div class='ctx'> 	/* Only for OPT_TX_CMD, use BE endpoint. */</div><div class='ctx'> 	if (cmd_id == WMI_OPT_TX_FRAME_CMDID) {</div><div class='ctx'> 		ret = ath6kl_wmi_data_hdr_add(wmi, skb, OPT_MSGTYPE,</div><div class='del'>-					      false, false, 0, NULL);</div><div class='add'>+					      false, false, 0, NULL, if_idx);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -1582,20 +1690,22 @@ int ath6kl_wmi_cmd_send(struct wmi *wmi, struct sk_buff *skb,</div><div class='ctx'> 		 * Make sure all new data queued waits for the command to</div><div class='ctx'> 		 * execute. Establish a new sync point.</div><div class='ctx'> 		 */</div><div class='del'>-		ath6kl_wmi_sync_point(wmi);</div><div class='add'>+		ath6kl_wmi_sync_point(wmi, if_idx);</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'>-int ath6kl_wmi_connect_cmd(struct wmi *wmi, enum network_type nw_type,</div><div class='add'>+int ath6kl_wmi_connect_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+			   enum network_type nw_type,</div><div class='ctx'> 			   enum dot11_auth_mode dot11_auth_mode,</div><div class='ctx'> 			   enum auth_mode auth_mode,</div><div class='ctx'> 			   enum crypto_type pairwise_crypto,</div><div class='ctx'> 			   u8 pairwise_crypto_len,</div><div class='ctx'> 			   enum crypto_type group_crypto,</div><div class='ctx'> 			   u8 group_crypto_len, int ssid_len, u8 *ssid,</div><div class='del'>-			   u8 *bssid, u16 channel, u32 ctrl_flags)</div><div class='add'>+			   u8 *bssid, u16 channel, u32 ctrl_flags,</div><div class='add'>+			   u8 nw_subtype)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_connect_cmd *cc;</div><div class='hunk'>@@ -1635,19 +1745,19 @@ int ath6kl_wmi_connect_cmd(struct wmi *wmi, enum network_type nw_type,</div><div class='ctx'> 	cc-&gt;grp_crypto_len = group_crypto_len;</div><div class='ctx'> 	cc-&gt;ch = cpu_to_le16(channel);</div><div class='ctx'> 	cc-&gt;ctrl_flags = cpu_to_le32(ctrl_flags);</div><div class='add'>+	cc-&gt;nw_subtype = nw_subtype;</div><div class='ctx'> </div><div class='ctx'> 	if (bssid != NULL)</div><div class='ctx'> 		memcpy(cc-&gt;bssid, bssid, ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-	wmi-&gt;pair_crypto_type = pairwise_crypto;</div><div class='del'>-	wmi-&gt;grp_crypto_type = group_crypto;</div><div class='del'>-</div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_CONNECT_CMDID, NO_SYNC_WMIFLAG);</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_CONNECT_CMDID,</div><div class='add'>+				  NO_SYNC_WMIFLAG);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_reconnect_cmd(struct wmi *wmi, u8 *bssid, u16 channel)</div><div class='add'>+int ath6kl_wmi_reconnect_cmd(struct wmi *wmi, u8 if_idx, u8 *bssid,</div><div class='add'>+			     u16 channel)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_reconnect_cmd *cc;</div><div class='hunk'>@@ -1668,13 +1778,13 @@ int ath6kl_wmi_reconnect_cmd(struct wmi *wmi, u8 *bssid, u16 channel)</div><div class='ctx'> 	if (bssid != NULL)</div><div class='ctx'> 		memcpy(cc-&gt;bssid, bssid, ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_RECONNECT_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_RECONNECT_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_disconnect_cmd(struct wmi *wmi)</div><div class='add'>+int ath6kl_wmi_disconnect_cmd(struct wmi *wmi, u8 if_idx)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1683,12 +1793,79 @@ int ath6kl_wmi_disconnect_cmd(struct wmi *wmi)</div><div class='ctx'> 	wmi-&gt;traffic_class = 100;</div><div class='ctx'> </div><div class='ctx'> 	/* Disconnect command does not need to do a SYNC before. */</div><div class='del'>-	ret = ath6kl_wmi_simple_cmd(wmi, WMI_DISCONNECT_CMDID);</div><div class='add'>+	ret = ath6kl_wmi_simple_cmd(wmi, if_idx, WMI_DISCONNECT_CMDID);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath6kl_wmi_beginscan_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+			     enum wmi_scan_type scan_type,</div><div class='add'>+			     u32 force_fgscan, u32 is_legacy,</div><div class='add'>+			     u32 home_dwell_time, u32 force_scan_interval,</div><div class='add'>+			     s8 num_chan, u16 *ch_list, u32 no_cck, u32 *rates)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct wmi_begin_scan_cmd *sc;</div><div class='add'>+	s8 size;</div><div class='add'>+	int i, band, ret;</div><div class='add'>+	struct ath6kl *ar = wmi-&gt;parent_dev;</div><div class='add'>+	int num_rates;</div><div class='add'>+</div><div class='add'>+	size = sizeof(struct wmi_begin_scan_cmd);</div><div class='add'>+</div><div class='add'>+	if ((scan_type != WMI_LONG_SCAN) &amp;&amp; (scan_type != WMI_SHORT_SCAN))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (num_chan &gt; WMI_MAX_CHANNELS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (num_chan)</div><div class='add'>+		size += sizeof(u16) * (num_chan - 1);</div><div class='add'>+</div><div class='add'>+	skb = ath6kl_wmi_get_new_buf(size);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	sc = (struct wmi_begin_scan_cmd *) skb-&gt;data;</div><div class='add'>+	sc-&gt;scan_type = scan_type;</div><div class='add'>+	sc-&gt;force_fg_scan = cpu_to_le32(force_fgscan);</div><div class='add'>+	sc-&gt;is_legacy = cpu_to_le32(is_legacy);</div><div class='add'>+	sc-&gt;home_dwell_time = cpu_to_le32(home_dwell_time);</div><div class='add'>+	sc-&gt;force_scan_intvl = cpu_to_le32(force_scan_interval);</div><div class='add'>+	sc-&gt;no_cck = cpu_to_le32(no_cck);</div><div class='add'>+	sc-&gt;num_ch = num_chan;</div><div class='add'>+</div><div class='add'>+	for (band = 0; band &lt; IEEE80211_NUM_BANDS; band++) {</div><div class='add'>+		struct ieee80211_supported_band *sband =</div><div class='add'>+		    ar-&gt;wiphy-&gt;bands[band];</div><div class='add'>+		u32 ratemask = rates[band];</div><div class='add'>+		u8 *supp_rates = sc-&gt;supp_rates[band].rates;</div><div class='add'>+		num_rates = 0;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; sband-&gt;n_bitrates; i++) {</div><div class='add'>+			if ((BIT(i) &amp; ratemask) == 0)</div><div class='add'>+				continue; /* skip rate */</div><div class='add'>+			supp_rates[num_rates++] =</div><div class='add'>+			    (u8) (sband-&gt;bitrates[i].bitrate / 5);</div><div class='add'>+		}</div><div class='add'>+		sc-&gt;supp_rates[band].nrates = num_rates;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_chan; i++)</div><div class='add'>+		sc-&gt;ch_list[i] = cpu_to_le16(ch_list[i]);</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_BEGIN_SCAN_CMDID,</div><div class='add'>+				  NO_SYNC_WMIFLAG);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_startscan_cmd(struct wmi *wmi, enum wmi_scan_type scan_type,</div><div class='add'>+/* ath6kl_wmi_start_scan_cmd is to be deprecated. Use</div><div class='add'>+ * ath6kl_wmi_begin_scan_cmd instead. The new function supports P2P</div><div class='add'>+ * mgmt operations using station interface.</div><div class='add'>+ */</div><div class='add'>+int ath6kl_wmi_startscan_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+			     enum wmi_scan_type scan_type,</div><div class='ctx'> 			     u32 force_fgscan, u32 is_legacy,</div><div class='ctx'> 			     u32 home_dwell_time, u32 force_scan_interval,</div><div class='ctx'> 			     s8 num_chan, u16 *ch_list)</div><div class='hunk'>@@ -1724,13 +1901,14 @@ int ath6kl_wmi_startscan_cmd(struct wmi *wmi, enum wmi_scan_type scan_type,</div><div class='ctx'> 	for (i = 0; i &lt; num_chan; i++)</div><div class='ctx'> 		sc-&gt;ch_list[i] = cpu_to_le16(ch_list[i]);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_START_SCAN_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_START_SCAN_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_scanparams_cmd(struct wmi *wmi, u16 fg_start_sec,</div><div class='add'>+int ath6kl_wmi_scanparams_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+			      u16 fg_start_sec,</div><div class='ctx'> 			      u16 fg_end_sec, u16 bg_sec,</div><div class='ctx'> 			      u16 minact_chdw_msec, u16 maxact_chdw_msec,</div><div class='ctx'> 			      u16 pas_chdw_msec, u8 short_scan_ratio,</div><div class='hunk'>@@ -1757,12 +1935,12 @@ int ath6kl_wmi_scanparams_cmd(struct wmi *wmi, u16 fg_start_sec,</div><div class='ctx'> 	sc-&gt;max_dfsch_act_time = cpu_to_le32(max_dfsch_act_time);</div><div class='ctx'> 	sc-&gt;maxact_scan_per_ssid = cpu_to_le16(maxact_scan_per_ssid);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_SET_SCAN_PARAMS_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SET_SCAN_PARAMS_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_bssfilter_cmd(struct wmi *wmi, u8 filter, u32 ie_mask)</div><div class='add'>+int ath6kl_wmi_bssfilter_cmd(struct wmi *wmi, u8 if_idx, u8 filter, u32 ie_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_bss_filter_cmd *cmd;</div><div class='hunk'>@@ -1779,12 +1957,12 @@ int ath6kl_wmi_bssfilter_cmd(struct wmi *wmi, u8 filter, u32 ie_mask)</div><div class='ctx'> 	cmd-&gt;bss_filter = filter;</div><div class='ctx'> 	cmd-&gt;ie_mask = cpu_to_le32(ie_mask);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_SET_BSS_FILTER_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SET_BSS_FILTER_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_probedssid_cmd(struct wmi *wmi, u8 index, u8 flag,</div><div class='add'>+int ath6kl_wmi_probedssid_cmd(struct wmi *wmi, u8 if_idx, u8 index, u8 flag,</div><div class='ctx'> 			      u8 ssid_len, u8 *ssid)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -1816,12 +1994,13 @@ int ath6kl_wmi_probedssid_cmd(struct wmi *wmi, u8 index, u8 flag,</div><div class='ctx'> 	cmd-&gt;ssid_len = ssid_len;</div><div class='ctx'> 	memcpy(cmd-&gt;ssid, ssid, ssid_len);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_SET_PROBED_SSID_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SET_PROBED_SSID_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_listeninterval_cmd(struct wmi *wmi, u16 listen_interval,</div><div class='add'>+int ath6kl_wmi_listeninterval_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+				  u16 listen_interval,</div><div class='ctx'> 				  u16 listen_beacons)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -1836,12 +2015,12 @@ int ath6kl_wmi_listeninterval_cmd(struct wmi *wmi, u16 listen_interval,</div><div class='ctx'> 	cmd-&gt;listen_intvl = cpu_to_le16(listen_interval);</div><div class='ctx'> 	cmd-&gt;num_beacons = cpu_to_le16(listen_beacons);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_SET_LISTEN_INT_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SET_LISTEN_INT_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_powermode_cmd(struct wmi *wmi, u8 pwr_mode)</div><div class='add'>+int ath6kl_wmi_powermode_cmd(struct wmi *wmi, u8 if_idx, u8 pwr_mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_power_mode_cmd *cmd;</div><div class='hunk'>@@ -1855,12 +2034,12 @@ int ath6kl_wmi_powermode_cmd(struct wmi *wmi, u8 pwr_mode)</div><div class='ctx'> 	cmd-&gt;pwr_mode = pwr_mode;</div><div class='ctx'> 	wmi-&gt;pwr_mode = pwr_mode;</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_SET_POWER_MODE_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SET_POWER_MODE_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_pmparams_cmd(struct wmi *wmi, u16 idle_period,</div><div class='add'>+int ath6kl_wmi_pmparams_cmd(struct wmi *wmi, u8 if_idx, u16 idle_period,</div><div class='ctx'> 			    u16 ps_poll_num, u16 dtim_policy,</div><div class='ctx'> 			    u16 tx_wakeup_policy, u16 num_tx_to_wakeup,</div><div class='ctx'> 			    u16 ps_fail_event_policy)</div><div class='hunk'>@@ -1881,12 +2060,12 @@ int ath6kl_wmi_pmparams_cmd(struct wmi *wmi, u16 idle_period,</div><div class='ctx'> 	pm-&gt;num_tx_to_wakeup = cpu_to_le16(num_tx_to_wakeup);</div><div class='ctx'> 	pm-&gt;ps_fail_event_policy = cpu_to_le16(ps_fail_event_policy);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_SET_POWER_PARAMS_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SET_POWER_PARAMS_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_disctimeout_cmd(struct wmi *wmi, u8 timeout)</div><div class='add'>+int ath6kl_wmi_disctimeout_cmd(struct wmi *wmi, u8 if_idx, u8 timeout)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_disc_timeout_cmd *cmd;</div><div class='hunk'>@@ -1899,15 +2078,20 @@ int ath6kl_wmi_disctimeout_cmd(struct wmi *wmi, u8 timeout)</div><div class='ctx'> 	cmd = (struct wmi_disc_timeout_cmd *) skb-&gt;data;</div><div class='ctx'> 	cmd-&gt;discon_timeout = timeout;</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_SET_DISC_TIMEOUT_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SET_DISC_TIMEOUT_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='add'>+</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ath6kl_debug_set_disconnect_timeout(wmi-&gt;parent_dev, timeout);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_addkey_cmd(struct wmi *wmi, u8 key_index,</div><div class='add'>+int ath6kl_wmi_addkey_cmd(struct wmi *wmi, u8 if_idx, u8 key_index,</div><div class='ctx'> 			  enum crypto_type key_type,</div><div class='ctx'> 			  u8 key_usage, u8 key_len,</div><div class='del'>-			  u8 *key_rsc, u8 *key_material,</div><div class='add'>+			  u8 *key_rsc, unsigned int key_rsc_len,</div><div class='add'>+			  u8 *key_material,</div><div class='ctx'> 			  u8 key_op_ctrl, u8 *mac_addr,</div><div class='ctx'> 			  enum wmi_sync_flag sync_flag)</div><div class='ctx'> {</div><div class='hunk'>@@ -1920,7 +2104,7 @@ int ath6kl_wmi_addkey_cmd(struct wmi *wmi, u8 key_index,</div><div class='ctx'> 		   key_index, key_type, key_usage, key_len, key_op_ctrl);</div><div class='ctx'> </div><div class='ctx'> 	if ((key_index &gt; WMI_MAX_KEY_INDEX) || (key_len &gt; WMI_MAX_KEY_LEN) ||</div><div class='del'>-	    (key_material == NULL))</div><div class='add'>+	    (key_material == NULL) || key_rsc_len &gt; 8)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if ((WEP_CRYPT != key_type) &amp;&amp; (NULL == key_rsc))</div><div class='hunk'>@@ -1938,20 +2122,20 @@ int ath6kl_wmi_addkey_cmd(struct wmi *wmi, u8 key_index,</div><div class='ctx'> 	memcpy(cmd-&gt;key, key_material, key_len);</div><div class='ctx'> </div><div class='ctx'> 	if (key_rsc != NULL)</div><div class='del'>-		memcpy(cmd-&gt;key_rsc, key_rsc, sizeof(cmd-&gt;key_rsc));</div><div class='add'>+		memcpy(cmd-&gt;key_rsc, key_rsc, key_rsc_len);</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;key_op_ctrl = key_op_ctrl;</div><div class='ctx'> </div><div class='ctx'> 	if (mac_addr)</div><div class='ctx'> 		memcpy(cmd-&gt;key_mac_addr, mac_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_ADD_CIPHER_KEY_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_ADD_CIPHER_KEY_CMDID,</div><div class='ctx'> 				  sync_flag);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_add_krk_cmd(struct wmi *wmi, u8 *krk)</div><div class='add'>+int ath6kl_wmi_add_krk_cmd(struct wmi *wmi, u8 if_idx, u8 *krk)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_add_krk_cmd *cmd;</div><div class='hunk'>@@ -1964,12 +2148,13 @@ int ath6kl_wmi_add_krk_cmd(struct wmi *wmi, u8 *krk)</div><div class='ctx'> 	cmd = (struct wmi_add_krk_cmd *) skb-&gt;data;</div><div class='ctx'> 	memcpy(cmd-&gt;krk, krk, WMI_KRK_LEN);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_ADD_KRK_CMDID, NO_SYNC_WMIFLAG);</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_ADD_KRK_CMDID,</div><div class='add'>+				  NO_SYNC_WMIFLAG);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_deletekey_cmd(struct wmi *wmi, u8 key_index)</div><div class='add'>+int ath6kl_wmi_deletekey_cmd(struct wmi *wmi, u8 if_idx, u8 key_index)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_delete_cipher_key_cmd *cmd;</div><div class='hunk'>@@ -1985,13 +2170,13 @@ int ath6kl_wmi_deletekey_cmd(struct wmi *wmi, u8 key_index)</div><div class='ctx'> 	cmd = (struct wmi_delete_cipher_key_cmd *) skb-&gt;data;</div><div class='ctx'> 	cmd-&gt;key_index = key_index;</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_DELETE_CIPHER_KEY_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_DELETE_CIPHER_KEY_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_setpmkid_cmd(struct wmi *wmi, const u8 *bssid,</div><div class='add'>+int ath6kl_wmi_setpmkid_cmd(struct wmi *wmi, u8 if_idx, const u8 *bssid,</div><div class='ctx'> 			    const u8 *pmkid, bool set)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -2018,14 +2203,14 @@ int ath6kl_wmi_setpmkid_cmd(struct wmi *wmi, const u8 *bssid,</div><div class='ctx'> 		cmd-&gt;enable = PMKID_DISABLE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_SET_PMKID_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SET_PMKID_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_wmi_data_sync_send(struct wmi *wmi, struct sk_buff *skb,</div><div class='del'>-			      enum htc_endpoint_id ep_id)</div><div class='add'>+			      enum htc_endpoint_id ep_id, u8 if_idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_data_hdr *data_hdr;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -2037,14 +2222,14 @@ static int ath6kl_wmi_data_sync_send(struct wmi *wmi, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	data_hdr = (struct wmi_data_hdr *) skb-&gt;data;</div><div class='ctx'> 	data_hdr-&gt;info = SYNC_MSGTYPE &lt;&lt; WMI_DATA_HDR_MSG_TYPE_SHIFT;</div><div class='del'>-	data_hdr-&gt;info3 = 0;</div><div class='add'>+	data_hdr-&gt;info3 = cpu_to_le16(if_idx &amp; WMI_DATA_HDR_IF_IDX_MASK);</div><div class='ctx'> </div><div class='ctx'> 	ret = ath6kl_control_tx(wmi-&gt;parent_dev, skb, ep_id);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_wmi_sync_point(struct wmi *wmi)</div><div class='add'>+static int ath6kl_wmi_sync_point(struct wmi *wmi, u8 if_idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_sync_cmd *cmd;</div><div class='hunk'>@@ -2100,7 +2285,7 @@ static int ath6kl_wmi_sync_point(struct wmi *wmi)</div><div class='ctx'> 	 * Send sync cmd followed by sync data messages on all</div><div class='ctx'> 	 * endpoints being used</div><div class='ctx'> 	 */</div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_SYNCHRONIZE_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SYNCHRONIZE_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -2119,7 +2304,7 @@ static int ath6kl_wmi_sync_point(struct wmi *wmi)</div><div class='ctx'> 					       traffic_class);</div><div class='ctx'> 		ret =</div><div class='ctx'> 		    ath6kl_wmi_data_sync_send(wmi, data_sync_bufs[index].skb,</div><div class='del'>-					      ep_id);</div><div class='add'>+					      ep_id, if_idx);</div><div class='ctx'> </div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2142,7 +2327,7 @@ free_skb:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_create_pstream_cmd(struct wmi *wmi,</div><div class='add'>+int ath6kl_wmi_create_pstream_cmd(struct wmi *wmi, u8 if_idx,</div><div class='ctx'> 				  struct wmi_create_pstream_cmd *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -2231,12 +2416,13 @@ int ath6kl_wmi_create_pstream_cmd(struct wmi *wmi,</div><div class='ctx'> 		ath6kl_indicate_tx_activity(wmi-&gt;parent_dev,</div><div class='ctx'> 					    params-&gt;traffic_class, true);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_CREATE_PSTREAM_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_CREATE_PSTREAM_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_delete_pstream_cmd(struct wmi *wmi, u8 traffic_class, u8 tsid)</div><div class='add'>+int ath6kl_wmi_delete_pstream_cmd(struct wmi *wmi, u8 if_idx, u8 traffic_class,</div><div class='add'>+				  u8 tsid)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_delete_pstream_cmd *cmd;</div><div class='hunk'>@@ -2272,7 +2458,7 @@ int ath6kl_wmi_delete_pstream_cmd(struct wmi *wmi, u8 traffic_class, u8 tsid)</div><div class='ctx'> 		   "sending delete_pstream_cmd: traffic class: %d tsid=%d\n",</div><div class='ctx'> 		   traffic_class, tsid);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_DELETE_PSTREAM_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_DELETE_PSTREAM_CMDID,</div><div class='ctx'> 				  SYNC_BEFORE_WMIFLAG);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;wmi-&gt;lock);</div><div class='hunk'>@@ -2311,17 +2497,173 @@ int ath6kl_wmi_set_ip_cmd(struct wmi *wmi, struct wmi_set_ip_cmd *ip_cmd)</div><div class='ctx'> 	cmd = (struct wmi_set_ip_cmd *) skb-&gt;data;</div><div class='ctx'> 	memcpy(cmd, ip_cmd, sizeof(struct wmi_set_ip_cmd));</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_SET_IP_CMDID, NO_SYNC_WMIFLAG);</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, 0, skb, WMI_SET_IP_CMDID,</div><div class='add'>+				  NO_SYNC_WMIFLAG);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_wmi_get_wow_list_event_rx(struct wmi *wmi, u8 * datap,</div><div class='del'>-					    int len)</div><div class='add'>+static void ath6kl_wmi_relinquish_implicit_pstream_credits(struct wmi *wmi)</div><div class='ctx'> {</div><div class='del'>-	if (len &lt; sizeof(struct wmi_get_wow_list_reply))</div><div class='add'>+	u16 active_tsids;</div><div class='add'>+	u8 stream_exist;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Relinquish credits from all implicitly created pstreams</div><div class='add'>+	 * since when we go to sleep. If user created explicit</div><div class='add'>+	 * thinstreams exists with in a fatpipe leave them intact</div><div class='add'>+	 * for the user to delete.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_bh(&amp;wmi-&gt;lock);</div><div class='add'>+	stream_exist = wmi-&gt;fat_pipe_exist;</div><div class='add'>+	spin_unlock_bh(&amp;wmi-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WMM_NUM_AC; i++) {</div><div class='add'>+		if (stream_exist &amp; (1 &lt;&lt; i)) {</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * FIXME: Is this lock &amp; unlock inside</div><div class='add'>+			 * for loop correct? may need rework.</div><div class='add'>+			 */</div><div class='add'>+			spin_lock_bh(&amp;wmi-&gt;lock);</div><div class='add'>+			active_tsids = wmi-&gt;stream_exist_for_ac[i];</div><div class='add'>+			spin_unlock_bh(&amp;wmi-&gt;lock);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * If there are no user created thin streams</div><div class='add'>+			 * delete the fatpipe</div><div class='add'>+			 */</div><div class='add'>+			if (!active_tsids) {</div><div class='add'>+				stream_exist &amp;= ~(1 &lt;&lt; i);</div><div class='add'>+				/*</div><div class='add'>+				 * Indicate inactivity to driver layer for</div><div class='add'>+				 * this fatpipe (pstream)</div><div class='add'>+				 */</div><div class='add'>+				ath6kl_indicate_tx_activity(wmi-&gt;parent_dev,</div><div class='add'>+							    i, false);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FIXME: Can we do this assignment without locking ? */</div><div class='add'>+	spin_lock_bh(&amp;wmi-&gt;lock);</div><div class='add'>+	wmi-&gt;fat_pipe_exist = stream_exist;</div><div class='add'>+	spin_unlock_bh(&amp;wmi-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath6kl_wmi_set_host_sleep_mode_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+				       enum ath6kl_host_mode host_mode)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct wmi_set_host_sleep_mode_cmd *cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if ((host_mode != ATH6KL_HOST_MODE_ASLEEP) &amp;&amp;</div><div class='add'>+	    (host_mode != ATH6KL_HOST_MODE_AWAKE)) {</div><div class='add'>+		ath6kl_err("invalid host sleep mode: %d\n", host_mode);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	skb = ath6kl_wmi_get_new_buf(sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_set_host_sleep_mode_cmd *) skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (host_mode == ATH6KL_HOST_MODE_ASLEEP) {</div><div class='add'>+		ath6kl_wmi_relinquish_implicit_pstream_credits(wmi);</div><div class='add'>+		cmd-&gt;asleep = cpu_to_le32(1);</div><div class='add'>+	} else</div><div class='add'>+		cmd-&gt;awake = cpu_to_le32(1);</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb,</div><div class='add'>+				  WMI_SET_HOST_SLEEP_MODE_CMDID,</div><div class='add'>+				  NO_SYNC_WMIFLAG);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath6kl_wmi_set_wow_mode_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+				enum ath6kl_wow_mode wow_mode,</div><div class='add'>+				u32 filter, u16 host_req_delay)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct wmi_set_wow_mode_cmd *cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if ((wow_mode != ATH6KL_WOW_MODE_ENABLE) &amp;&amp;</div><div class='add'>+	     wow_mode != ATH6KL_WOW_MODE_DISABLE) {</div><div class='add'>+		ath6kl_err("invalid wow mode: %d\n", wow_mode);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = ath6kl_wmi_get_new_buf(sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_set_wow_mode_cmd *) skb-&gt;data;</div><div class='add'>+	cmd-&gt;enable_wow = cpu_to_le32(wow_mode);</div><div class='add'>+	cmd-&gt;filter = cpu_to_le32(filter);</div><div class='add'>+	cmd-&gt;host_req_delay = cpu_to_le16(host_req_delay);</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SET_WOW_MODE_CMDID,</div><div class='add'>+				  NO_SYNC_WMIFLAG);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath6kl_wmi_add_wow_pattern_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+				   u8 list_id, u8 filter_size,</div><div class='add'>+				   u8 filter_offset, u8 *filter, u8 *mask)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct wmi_add_wow_pattern_cmd *cmd;</div><div class='add'>+	u16 size;</div><div class='add'>+	u8 *filter_mask;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Allocate additional memory in the buffer to hold</div><div class='add'>+	 * filter and mask value, which is twice of filter_size.</div><div class='add'>+	 */</div><div class='add'>+	size = sizeof(*cmd) + (2 * filter_size);</div><div class='add'>+</div><div class='add'>+	skb = ath6kl_wmi_get_new_buf(size);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_add_wow_pattern_cmd *) skb-&gt;data;</div><div class='add'>+	cmd-&gt;filter_list_id = list_id;</div><div class='add'>+	cmd-&gt;filter_size = filter_size;</div><div class='add'>+	cmd-&gt;filter_offset = filter_offset;</div><div class='add'>+</div><div class='add'>+	memcpy(cmd-&gt;filter, filter, filter_size);</div><div class='add'>+</div><div class='add'>+	filter_mask = (u8 *) (cmd-&gt;filter + filter_size);</div><div class='add'>+	memcpy(filter_mask, mask, filter_size);</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_ADD_WOW_PATTERN_CMDID,</div><div class='add'>+				  NO_SYNC_WMIFLAG);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath6kl_wmi_del_wow_pattern_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+				   u16 list_id, u16 filter_id)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct wmi_del_wow_pattern_cmd *cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ath6kl_wmi_get_new_buf(sizeof(*cmd));</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd = (struct wmi_del_wow_pattern_cmd *) skb-&gt;data;</div><div class='add'>+	cmd-&gt;filter_list_id = cpu_to_le16(list_id);</div><div class='add'>+	cmd-&gt;filter_id = cpu_to_le16(filter_id);</div><div class='add'>+</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_DEL_WOW_PATTERN_CMDID,</div><div class='add'>+				  NO_SYNC_WMIFLAG);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_wmi_cmd_send_xtnd(struct wmi *wmi, struct sk_buff *skb,</div><div class='hunk'>@@ -2336,7 +2678,7 @@ static int ath6kl_wmi_cmd_send_xtnd(struct wmi *wmi, struct sk_buff *skb,</div><div class='ctx'> 	cmd_hdr = (struct wmix_cmd_hdr *) skb-&gt;data;</div><div class='ctx'> 	cmd_hdr-&gt;cmd_id = cpu_to_le32(cmd_id);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_EXTENSION_CMDID, sync_flag);</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, 0, skb, WMI_EXTENSION_CMDID, sync_flag);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2379,12 +2721,12 @@ int ath6kl_wmi_config_debug_module_cmd(struct wmi *wmi, u32 valid, u32 config)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_get_stats_cmd(struct wmi *wmi)</div><div class='add'>+int ath6kl_wmi_get_stats_cmd(struct wmi *wmi, u8 if_idx)</div><div class='ctx'> {</div><div class='del'>-	return ath6kl_wmi_simple_cmd(wmi, WMI_GET_STATISTICS_CMDID);</div><div class='add'>+	return ath6kl_wmi_simple_cmd(wmi, if_idx, WMI_GET_STATISTICS_CMDID);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_set_tx_pwr_cmd(struct wmi *wmi, u8 dbM)</div><div class='add'>+int ath6kl_wmi_set_tx_pwr_cmd(struct wmi *wmi, u8 if_idx, u8 dbM)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_set_tx_pwr_cmd *cmd;</div><div class='hunk'>@@ -2397,18 +2739,24 @@ int ath6kl_wmi_set_tx_pwr_cmd(struct wmi *wmi, u8 dbM)</div><div class='ctx'> 	cmd = (struct wmi_set_tx_pwr_cmd *) skb-&gt;data;</div><div class='ctx'> 	cmd-&gt;dbM = dbM;</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_SET_TX_PWR_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SET_TX_PWR_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_get_tx_pwr_cmd(struct wmi *wmi)</div><div class='add'>+int ath6kl_wmi_get_tx_pwr_cmd(struct wmi *wmi, u8 if_idx)</div><div class='add'>+{</div><div class='add'>+	return ath6kl_wmi_simple_cmd(wmi, if_idx, WMI_GET_TX_PWR_CMDID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath6kl_wmi_get_roam_tbl_cmd(struct wmi *wmi)</div><div class='ctx'> {</div><div class='del'>-	return ath6kl_wmi_simple_cmd(wmi, WMI_GET_TX_PWR_CMDID);</div><div class='add'>+	return ath6kl_wmi_simple_cmd(wmi, 0, WMI_GET_ROAM_TBL_CMDID);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_set_lpreamble_cmd(struct wmi *wmi, u8 status, u8 preamble_policy)</div><div class='add'>+int ath6kl_wmi_set_lpreamble_cmd(struct wmi *wmi, u8 if_idx, u8 status,</div><div class='add'>+				 u8 preamble_policy)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_set_lpreamble_cmd *cmd;</div><div class='hunk'>@@ -2422,7 +2770,7 @@ int ath6kl_wmi_set_lpreamble_cmd(struct wmi *wmi, u8 status, u8 preamble_policy)</div><div class='ctx'> 	cmd-&gt;status = status;</div><div class='ctx'> 	cmd-&gt;preamble_policy = preamble_policy;</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_SET_LPREAMBLE_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SET_LPREAMBLE_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2440,11 +2788,12 @@ int ath6kl_wmi_set_rts_cmd(struct wmi *wmi, u16 threshold)</div><div class='ctx'> 	cmd = (struct wmi_set_rts_cmd *) skb-&gt;data;</div><div class='ctx'> 	cmd-&gt;threshold = cpu_to_le16(threshold);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_SET_RTS_CMDID, NO_SYNC_WMIFLAG);</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, 0, skb, WMI_SET_RTS_CMDID,</div><div class='add'>+				  NO_SYNC_WMIFLAG);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_set_wmm_txop(struct wmi *wmi, enum wmi_txop_cfg cfg)</div><div class='add'>+int ath6kl_wmi_set_wmm_txop(struct wmi *wmi, u8 if_idx, enum wmi_txop_cfg cfg)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_set_wmm_txop_cmd *cmd;</div><div class='hunk'>@@ -2460,12 +2809,13 @@ int ath6kl_wmi_set_wmm_txop(struct wmi *wmi, enum wmi_txop_cfg cfg)</div><div class='ctx'> 	cmd = (struct wmi_set_wmm_txop_cmd *) skb-&gt;data;</div><div class='ctx'> 	cmd-&gt;txop_enable = cfg;</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_SET_WMM_TXOP_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SET_WMM_TXOP_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_set_keepalive_cmd(struct wmi *wmi, u8 keep_alive_intvl)</div><div class='add'>+int ath6kl_wmi_set_keepalive_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+				 u8 keep_alive_intvl)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_set_keepalive_cmd *cmd;</div><div class='hunk'>@@ -2477,10 +2827,13 @@ int ath6kl_wmi_set_keepalive_cmd(struct wmi *wmi, u8 keep_alive_intvl)</div><div class='ctx'> </div><div class='ctx'> 	cmd = (struct wmi_set_keepalive_cmd *) skb-&gt;data;</div><div class='ctx'> 	cmd-&gt;keep_alive_intvl = keep_alive_intvl;</div><div class='del'>-	wmi-&gt;keep_alive_intvl = keep_alive_intvl;</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_SET_KEEPALIVE_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SET_KEEPALIVE_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='add'>+</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ath6kl_debug_set_keepalive(wmi-&gt;parent_dev, keep_alive_intvl);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2495,7 +2848,7 @@ int ath6kl_wmi_test_cmd(struct wmi *wmi, void *buf, size_t len)</div><div class='ctx'> </div><div class='ctx'> 	memcpy(skb-&gt;data, buf, len);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_TEST_CMDID, NO_SYNC_WMIFLAG);</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, 0, skb, WMI_TEST_CMDID, NO_SYNC_WMIFLAG);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2528,28 +2881,31 @@ static int ath6kl_wmi_get_pmkid_list_event_rx(struct wmi *wmi, u8 *datap,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_wmi_addba_req_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='add'>+static int ath6kl_wmi_addba_req_event_rx(struct wmi *wmi, u8 *datap, int len,</div><div class='add'>+					 struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_addba_req_event *cmd = (struct wmi_addba_req_event *) datap;</div><div class='ctx'> </div><div class='del'>-	aggr_recv_addba_req_evt(wmi-&gt;parent_dev, cmd-&gt;tid,</div><div class='add'>+	aggr_recv_addba_req_evt(vif, cmd-&gt;tid,</div><div class='ctx'> 				le16_to_cpu(cmd-&gt;st_seq_no), cmd-&gt;win_sz);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_wmi_delba_req_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='add'>+static int ath6kl_wmi_delba_req_event_rx(struct wmi *wmi, u8 *datap, int len,</div><div class='add'>+					 struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_delba_event *cmd = (struct wmi_delba_event *) datap;</div><div class='ctx'> </div><div class='del'>-	aggr_recv_delba_req_evt(wmi-&gt;parent_dev, cmd-&gt;tid);</div><div class='add'>+	aggr_recv_delba_req_evt(vif, cmd-&gt;tid);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*  AP mode functions */</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_ap_profile_commit(struct wmi *wmip, struct wmi_connect_cmd *p)</div><div class='add'>+int ath6kl_wmi_ap_profile_commit(struct wmi *wmip, u8 if_idx,</div><div class='add'>+				 struct wmi_connect_cmd *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_connect_cmd *cm;</div><div class='hunk'>@@ -2562,7 +2918,7 @@ int ath6kl_wmi_ap_profile_commit(struct wmi *wmip, struct wmi_connect_cmd *p)</div><div class='ctx'> 	cm = (struct wmi_connect_cmd *) skb-&gt;data;</div><div class='ctx'> 	memcpy(cm, p, sizeof(*cm));</div><div class='ctx'> </div><div class='del'>-	res = ath6kl_wmi_cmd_send(wmip, skb, WMI_AP_CONFIG_COMMIT_CMDID,</div><div class='add'>+	res = ath6kl_wmi_cmd_send(wmip, if_idx, skb, WMI_AP_CONFIG_COMMIT_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WMI, "%s: nw_type=%u auth_mode=%u ch=%u "</div><div class='ctx'> 		   "ctrl_flags=0x%x-&gt; res=%d\n",</div><div class='hunk'>@@ -2571,7 +2927,8 @@ int ath6kl_wmi_ap_profile_commit(struct wmi *wmip, struct wmi_connect_cmd *p)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_ap_set_mlme(struct wmi *wmip, u8 cmd, const u8 *mac, u16 reason)</div><div class='add'>+int ath6kl_wmi_ap_set_mlme(struct wmi *wmip, u8 if_idx, u8 cmd, const u8 *mac,</div><div class='add'>+			   u16 reason)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_ap_set_mlme_cmd *cm;</div><div class='hunk'>@@ -2585,11 +2942,12 @@ int ath6kl_wmi_ap_set_mlme(struct wmi *wmip, u8 cmd, const u8 *mac, u16 reason)</div><div class='ctx'> 	cm-&gt;reason = cpu_to_le16(reason);</div><div class='ctx'> 	cm-&gt;cmd = cmd;</div><div class='ctx'> </div><div class='del'>-	return ath6kl_wmi_cmd_send(wmip, skb, WMI_AP_SET_MLME_CMDID,</div><div class='add'>+	return ath6kl_wmi_cmd_send(wmip, if_idx, skb, WMI_AP_SET_MLME_CMDID,</div><div class='ctx'> 				   NO_SYNC_WMIFLAG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_wmi_pspoll_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='add'>+static int ath6kl_wmi_pspoll_event_rx(struct wmi *wmi, u8 *datap, int len,</div><div class='add'>+				      struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_pspoll_event *ev;</div><div class='ctx'> </div><div class='hunk'>@@ -2598,19 +2956,21 @@ static int ath6kl_wmi_pspoll_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='ctx'> </div><div class='ctx'> 	ev = (struct wmi_pspoll_event *) datap;</div><div class='ctx'> </div><div class='del'>-	ath6kl_pspoll_event(wmi-&gt;parent_dev, le16_to_cpu(ev-&gt;aid));</div><div class='add'>+	ath6kl_pspoll_event(vif, le16_to_cpu(ev-&gt;aid));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ath6kl_wmi_dtimexpiry_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='add'>+static int ath6kl_wmi_dtimexpiry_event_rx(struct wmi *wmi, u8 *datap, int len,</div><div class='add'>+					  struct ath6kl_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	ath6kl_dtimexpiry_event(wmi-&gt;parent_dev);</div><div class='add'>+	ath6kl_dtimexpiry_event(vif);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_set_pvb_cmd(struct wmi *wmi, u16 aid, bool flag)</div><div class='add'>+int ath6kl_wmi_set_pvb_cmd(struct wmi *wmi, u8 if_idx, u16 aid,</div><div class='add'>+			   bool flag)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_ap_set_pvb_cmd *cmd;</div><div class='hunk'>@@ -2625,13 +2985,14 @@ int ath6kl_wmi_set_pvb_cmd(struct wmi *wmi, u16 aid, bool flag)</div><div class='ctx'> 	cmd-&gt;rsvd = cpu_to_le16(0);</div><div class='ctx'> 	cmd-&gt;flag = cpu_to_le32(flag);</div><div class='ctx'> </div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_AP_SET_PVB_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_AP_SET_PVB_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_set_rx_frame_format_cmd(struct wmi *wmi, u8 rx_meta_ver,</div><div class='add'>+int ath6kl_wmi_set_rx_frame_format_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+				       u8 rx_meta_ver,</div><div class='ctx'> 				       bool rx_dot11_hdr, bool defrag_on_host)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -2648,14 +3009,14 @@ int ath6kl_wmi_set_rx_frame_format_cmd(struct wmi *wmi, u8 rx_meta_ver,</div><div class='ctx'> 	cmd-&gt;meta_ver = rx_meta_ver;</div><div class='ctx'> </div><div class='ctx'> 	/* Delete the local aggr state, on host */</div><div class='del'>-	ret = ath6kl_wmi_cmd_send(wmi, skb, WMI_RX_FRAME_FORMAT_CMDID,</div><div class='add'>+	ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_RX_FRAME_FORMAT_CMDID,</div><div class='ctx'> 				  NO_SYNC_WMIFLAG);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_set_appie_cmd(struct wmi *wmi, u8 mgmt_frm_type, const u8 *ie,</div><div class='del'>-			     u8 ie_len)</div><div class='add'>+int ath6kl_wmi_set_appie_cmd(struct wmi *wmi, u8 if_idx, u8 mgmt_frm_type,</div><div class='add'>+			     const u8 *ie, u8 ie_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_set_appie_cmd *p;</div><div class='hunk'>@@ -2669,8 +3030,11 @@ int ath6kl_wmi_set_appie_cmd(struct wmi *wmi, u8 mgmt_frm_type, const u8 *ie,</div><div class='ctx'> 	p = (struct wmi_set_appie_cmd *) skb-&gt;data;</div><div class='ctx'> 	p-&gt;mgmt_frm_type = mgmt_frm_type;</div><div class='ctx'> 	p-&gt;ie_len = ie_len;</div><div class='del'>-	memcpy(p-&gt;ie_info, ie, ie_len);</div><div class='del'>-	return ath6kl_wmi_cmd_send(wmi, skb, WMI_SET_APPIE_CMDID,</div><div class='add'>+</div><div class='add'>+	if (ie != NULL &amp;&amp; ie_len &gt; 0)</div><div class='add'>+		memcpy(p-&gt;ie_info, ie, ie_len);</div><div class='add'>+</div><div class='add'>+	return ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SET_APPIE_CMDID,</div><div class='ctx'> 				   NO_SYNC_WMIFLAG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2688,11 +3052,11 @@ int ath6kl_wmi_disable_11b_rates_cmd(struct wmi *wmi, bool disable)</div><div class='ctx'> 	cmd = (struct wmi_disable_11b_rates_cmd *) skb-&gt;data;</div><div class='ctx'> 	cmd-&gt;disable = disable ? 1 : 0;</div><div class='ctx'> </div><div class='del'>-	return ath6kl_wmi_cmd_send(wmi, skb, WMI_DISABLE_11B_RATES_CMDID,</div><div class='add'>+	return ath6kl_wmi_cmd_send(wmi, 0, skb, WMI_DISABLE_11B_RATES_CMDID,</div><div class='ctx'> 				   NO_SYNC_WMIFLAG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_remain_on_chnl_cmd(struct wmi *wmi, u32 freq, u32 dur)</div><div class='add'>+int ath6kl_wmi_remain_on_chnl_cmd(struct wmi *wmi, u8 if_idx, u32 freq, u32 dur)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_remain_on_chnl_cmd *p;</div><div class='hunk'>@@ -2706,12 +3070,16 @@ int ath6kl_wmi_remain_on_chnl_cmd(struct wmi *wmi, u32 freq, u32 dur)</div><div class='ctx'> 	p = (struct wmi_remain_on_chnl_cmd *) skb-&gt;data;</div><div class='ctx'> 	p-&gt;freq = cpu_to_le32(freq);</div><div class='ctx'> 	p-&gt;duration = cpu_to_le32(dur);</div><div class='del'>-	return ath6kl_wmi_cmd_send(wmi, skb, WMI_REMAIN_ON_CHNL_CMDID,</div><div class='add'>+	return ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_REMAIN_ON_CHNL_CMDID,</div><div class='ctx'> 				   NO_SYNC_WMIFLAG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_send_action_cmd(struct wmi *wmi, u32 id, u32 freq, u32 wait,</div><div class='del'>-			       const u8 *data, u16 data_len)</div><div class='add'>+/* ath6kl_wmi_send_action_cmd is to be deprecated. Use</div><div class='add'>+ * ath6kl_wmi_send_mgmt_cmd instead. The new function supports P2P</div><div class='add'>+ * mgmt operations using station interface.</div><div class='add'>+ */</div><div class='add'>+int ath6kl_wmi_send_action_cmd(struct wmi *wmi, u8 if_idx, u32 id, u32 freq,</div><div class='add'>+			       u32 wait, const u8 *data, u16 data_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_send_action_cmd *p;</div><div class='hunk'>@@ -2731,6 +3099,7 @@ int ath6kl_wmi_send_action_cmd(struct wmi *wmi, u32 id, u32 freq, u32 wait,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(wmi-&gt;last_mgmt_tx_frame);</div><div class='add'>+	memcpy(buf, data, data_len);</div><div class='ctx'> 	wmi-&gt;last_mgmt_tx_frame = buf;</div><div class='ctx'> 	wmi-&gt;last_mgmt_tx_frame_len = data_len;</div><div class='ctx'> </div><div class='hunk'>@@ -2742,18 +3111,61 @@ int ath6kl_wmi_send_action_cmd(struct wmi *wmi, u32 id, u32 freq, u32 wait,</div><div class='ctx'> 	p-&gt;wait = cpu_to_le32(wait);</div><div class='ctx'> 	p-&gt;len = cpu_to_le16(data_len);</div><div class='ctx'> 	memcpy(p-&gt;data, data, data_len);</div><div class='del'>-	return ath6kl_wmi_cmd_send(wmi, skb, WMI_SEND_ACTION_CMDID,</div><div class='add'>+	return ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SEND_ACTION_CMDID,</div><div class='ctx'> 				   NO_SYNC_WMIFLAG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_send_probe_response_cmd(struct wmi *wmi, u32 freq,</div><div class='del'>-				       const u8 *dst,</div><div class='del'>-				       const u8 *data, u16 data_len)</div><div class='add'>+int ath6kl_wmi_send_mgmt_cmd(struct wmi *wmi, u8 if_idx, u32 id, u32 freq,</div><div class='add'>+			       u32 wait, const u8 *data, u16 data_len,</div><div class='add'>+			       u32 no_cck)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	struct wmi_p2p_probe_response_cmd *p;</div><div class='add'>+	struct wmi_send_mgmt_cmd *p;</div><div class='add'>+	u8 *buf;</div><div class='add'>+</div><div class='add'>+	if (wait)</div><div class='add'>+		return -EINVAL; /* Offload for wait not supported */</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(data_len, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	skb = ath6kl_wmi_get_new_buf(sizeof(*p) + data_len);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		kfree(buf);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(wmi-&gt;last_mgmt_tx_frame);</div><div class='add'>+	memcpy(buf, data, data_len);</div><div class='add'>+	wmi-&gt;last_mgmt_tx_frame = buf;</div><div class='add'>+	wmi-&gt;last_mgmt_tx_frame_len = data_len;</div><div class='add'>+</div><div class='add'>+	ath6kl_dbg(ATH6KL_DBG_WMI, "send_action_cmd: id=%u freq=%u wait=%u "</div><div class='add'>+		   "len=%u\n", id, freq, wait, data_len);</div><div class='add'>+	p = (struct wmi_send_mgmt_cmd *) skb-&gt;data;</div><div class='add'>+	p-&gt;id = cpu_to_le32(id);</div><div class='add'>+	p-&gt;freq = cpu_to_le32(freq);</div><div class='add'>+	p-&gt;wait = cpu_to_le32(wait);</div><div class='add'>+	p-&gt;no_cck = cpu_to_le32(no_cck);</div><div class='add'>+	p-&gt;len = cpu_to_le16(data_len);</div><div class='add'>+	memcpy(p-&gt;data, data, data_len);</div><div class='add'>+	return ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_SEND_MGMT_CMDID,</div><div class='add'>+				   NO_SYNC_WMIFLAG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath6kl_wmi_send_probe_response_cmd(struct wmi *wmi, u8 if_idx, u32 freq,</div><div class='add'>+				       const u8 *dst, const u8 *data,</div><div class='add'>+				       u16 data_len)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct wmi_p2p_probe_response_cmd *p;</div><div class='add'>+	size_t cmd_len = sizeof(*p) + data_len;</div><div class='add'>+</div><div class='add'>+	if (data_len == 0)</div><div class='add'>+		cmd_len++; /* work around target minimum length requirement */</div><div class='add'>+</div><div class='add'>+	skb = ath6kl_wmi_get_new_buf(cmd_len);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -2764,11 +3176,12 @@ int ath6kl_wmi_send_probe_response_cmd(struct wmi *wmi, u32 freq,</div><div class='ctx'> 	memcpy(p-&gt;destination_addr, dst, ETH_ALEN);</div><div class='ctx'> 	p-&gt;len = cpu_to_le16(data_len);</div><div class='ctx'> 	memcpy(p-&gt;data, data, data_len);</div><div class='del'>-	return ath6kl_wmi_cmd_send(wmi, skb, WMI_SEND_PROBE_RESPONSE_CMDID,</div><div class='add'>+	return ath6kl_wmi_cmd_send(wmi, if_idx, skb,</div><div class='add'>+				   WMI_SEND_PROBE_RESPONSE_CMDID,</div><div class='ctx'> 				   NO_SYNC_WMIFLAG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_probe_report_req_cmd(struct wmi *wmi, bool enable)</div><div class='add'>+int ath6kl_wmi_probe_report_req_cmd(struct wmi *wmi, u8 if_idx, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_probe_req_report_cmd *p;</div><div class='hunk'>@@ -2781,11 +3194,11 @@ int ath6kl_wmi_probe_report_req_cmd(struct wmi *wmi, bool enable)</div><div class='ctx'> 		   enable);</div><div class='ctx'> 	p = (struct wmi_probe_req_report_cmd *) skb-&gt;data;</div><div class='ctx'> 	p-&gt;enable = enable ? 1 : 0;</div><div class='del'>-	return ath6kl_wmi_cmd_send(wmi, skb, WMI_PROBE_REQ_REPORT_CMDID,</div><div class='add'>+	return ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_PROBE_REQ_REPORT_CMDID,</div><div class='ctx'> 				   NO_SYNC_WMIFLAG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_info_req_cmd(struct wmi *wmi, u32 info_req_flags)</div><div class='add'>+int ath6kl_wmi_info_req_cmd(struct wmi *wmi, u8 if_idx, u32 info_req_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct wmi_get_p2p_info *p;</div><div class='hunk'>@@ -2798,14 +3211,15 @@ int ath6kl_wmi_info_req_cmd(struct wmi *wmi, u32 info_req_flags)</div><div class='ctx'> 		   info_req_flags);</div><div class='ctx'> 	p = (struct wmi_get_p2p_info *) skb-&gt;data;</div><div class='ctx'> 	p-&gt;info_req_flags = cpu_to_le32(info_req_flags);</div><div class='del'>-	return ath6kl_wmi_cmd_send(wmi, skb, WMI_GET_P2P_INFO_CMDID,</div><div class='add'>+	return ath6kl_wmi_cmd_send(wmi, if_idx, skb, WMI_GET_P2P_INFO_CMDID,</div><div class='ctx'> 				   NO_SYNC_WMIFLAG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_cancel_remain_on_chnl_cmd(struct wmi *wmi)</div><div class='add'>+int ath6kl_wmi_cancel_remain_on_chnl_cmd(struct wmi *wmi, u8 if_idx)</div><div class='ctx'> {</div><div class='ctx'> 	ath6kl_dbg(ATH6KL_DBG_WMI, "cancel_remain_on_chnl_cmd\n");</div><div class='del'>-	return ath6kl_wmi_simple_cmd(wmi, WMI_CANCEL_REMAIN_ON_CHNL_CMDID);</div><div class='add'>+	return ath6kl_wmi_simple_cmd(wmi, if_idx,</div><div class='add'>+				     WMI_CANCEL_REMAIN_ON_CHNL_CMDID);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath6kl_wmi_control_rx_xtnd(struct wmi *wmi, struct sk_buff *skb)</div><div class='hunk'>@@ -2818,7 +3232,6 @@ static int ath6kl_wmi_control_rx_xtnd(struct wmi *wmi, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; sizeof(struct wmix_cmd_hdr)) {</div><div class='ctx'> 		ath6kl_err("bad packet 1\n");</div><div class='del'>-		wmi-&gt;stat.cmd_len_err++;</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2840,7 +3253,6 @@ static int ath6kl_wmi_control_rx_xtnd(struct wmi *wmi, struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ath6kl_warn("unknown cmd id 0x%x\n", id);</div><div class='del'>-		wmi-&gt;stat.cmd_id_err++;</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2848,12 +3260,19 @@ static int ath6kl_wmi_control_rx_xtnd(struct wmi *wmi, struct sk_buff *skb)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ath6kl_wmi_roam_tbl_event_rx(struct wmi *wmi, u8 *datap, int len)</div><div class='add'>+{</div><div class='add'>+	return ath6kl_debug_roam_tbl_event(wmi-&gt;parent_dev, datap, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Control Path */</div><div class='ctx'> int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct wmi_cmd_hdr *cmd;</div><div class='add'>+	struct ath6kl_vif *vif;</div><div class='ctx'> 	u32 len;</div><div class='ctx'> 	u16 id;</div><div class='add'>+	u8 if_idx;</div><div class='ctx'> 	u8 *datap;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2863,12 +3282,12 @@ int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)</div><div class='ctx'> 	if (skb-&gt;len &lt; sizeof(struct wmi_cmd_hdr)) {</div><div class='ctx'> 		ath6kl_err("bad packet 1\n");</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='del'>-		wmi-&gt;stat.cmd_len_err++;</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cmd = (struct wmi_cmd_hdr *) skb-&gt;data;</div><div class='ctx'> 	id = le16_to_cpu(cmd-&gt;cmd_id);</div><div class='add'>+	if_idx = le16_to_cpu(cmd-&gt;info1) &amp; WMI_CMD_HDR_IF_ID_MASK;</div><div class='ctx'> </div><div class='ctx'> 	skb_pull(skb, sizeof(struct wmi_cmd_hdr));</div><div class='ctx'> </div><div class='hunk'>@@ -2879,6 +3298,15 @@ int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)</div><div class='ctx'> 	ath6kl_dbg_dump(ATH6KL_DBG_WMI_DUMP, NULL, "wmi rx ",</div><div class='ctx'> 			datap, len);</div><div class='ctx'> </div><div class='add'>+	vif = ath6kl_get_vif_by_index(wmi-&gt;parent_dev, if_idx);</div><div class='add'>+	if (!vif) {</div><div class='add'>+		ath6kl_dbg(ATH6KL_DBG_WMI,</div><div class='add'>+			   "Wmi event for unavailable vif, vif_index:%d\n",</div><div class='add'>+			    if_idx);</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='ctx'> 	switch (id) {</div><div class='ctx'> 	case WMI_GET_BITRATE_CMDID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_GET_BITRATE_CMDID\n");</div><div class='hunk'>@@ -2898,11 +3326,11 @@ int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_CONNECT_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_CONNECT_EVENTID\n");</div><div class='del'>-		ret = ath6kl_wmi_connect_event_rx(wmi, datap, len);</div><div class='add'>+		ret = ath6kl_wmi_connect_event_rx(wmi, datap, len, vif);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_DISCONNECT_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_DISCONNECT_EVENTID\n");</div><div class='del'>-		ret = ath6kl_wmi_disconnect_event_rx(wmi, datap, len);</div><div class='add'>+		ret = ath6kl_wmi_disconnect_event_rx(wmi, datap, len, vif);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_PEER_NODE_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_PEER_NODE_EVENTID\n");</div><div class='hunk'>@@ -2910,11 +3338,11 @@ int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_TKIP_MICERR_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_TKIP_MICERR_EVENTID\n");</div><div class='del'>-		ret = ath6kl_wmi_tkip_micerr_event_rx(wmi, datap, len);</div><div class='add'>+		ret = ath6kl_wmi_tkip_micerr_event_rx(wmi, datap, len, vif);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_BSSINFO_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_BSSINFO_EVENTID\n");</div><div class='del'>-		ret = ath6kl_wmi_bssinfo_event_rx(wmi, datap, len);</div><div class='add'>+		ret = ath6kl_wmi_bssinfo_event_rx(wmi, datap, len, vif);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_REGDOMAIN_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_REGDOMAIN_EVENTID\n");</div><div class='hunk'>@@ -2926,11 +3354,12 @@ int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_NEIGHBOR_REPORT_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_NEIGHBOR_REPORT_EVENTID\n");</div><div class='del'>-		ret = ath6kl_wmi_neighbor_report_event_rx(wmi, datap, len);</div><div class='add'>+		ret = ath6kl_wmi_neighbor_report_event_rx(wmi, datap, len,</div><div class='add'>+							  vif);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_SCAN_COMPLETE_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_SCAN_COMPLETE_EVENTID\n");</div><div class='del'>-		ret = ath6kl_wmi_scan_complete_rx(wmi, datap, len);</div><div class='add'>+		ret = ath6kl_wmi_scan_complete_rx(wmi, datap, len, vif);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_CMDERROR_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_CMDERROR_EVENTID\n");</div><div class='hunk'>@@ -2938,7 +3367,7 @@ int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_REPORT_STATISTICS_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_REPORT_STATISTICS_EVENTID\n");</div><div class='del'>-		ret = ath6kl_wmi_stats_event_rx(wmi, datap, len);</div><div class='add'>+		ret = ath6kl_wmi_stats_event_rx(wmi, datap, len, vif);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_RSSI_THRESHOLD_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_RSSI_THRESHOLD_EVENTID\n");</div><div class='hunk'>@@ -2953,6 +3382,7 @@ int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_REPORT_ROAM_TBL_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_REPORT_ROAM_TBL_EVENTID\n");</div><div class='add'>+		ret = ath6kl_wmi_roam_tbl_event_rx(wmi, datap, len);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_EXTENSION_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_EXTENSION_EVENTID\n");</div><div class='hunk'>@@ -2960,7 +3390,7 @@ int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_CAC_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_CAC_EVENTID\n");</div><div class='del'>-		ret = ath6kl_wmi_cac_event_rx(wmi, datap, len);</div><div class='add'>+		ret = ath6kl_wmi_cac_event_rx(wmi, datap, len, vif);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_CHANNEL_CHANGE_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_CHANNEL_CHANGE_EVENTID\n");</div><div class='hunk'>@@ -2996,7 +3426,6 @@ int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_GET_WOW_LIST_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_GET_WOW_LIST_EVENTID\n");</div><div class='del'>-		ret = ath6kl_wmi_get_wow_list_event_rx(wmi, datap, len);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_GET_PMKID_LIST_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_GET_PMKID_LIST_EVENTID\n");</div><div class='hunk'>@@ -3004,25 +3433,25 @@ int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_PSPOLL_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_PSPOLL_EVENTID\n");</div><div class='del'>-		ret = ath6kl_wmi_pspoll_event_rx(wmi, datap, len);</div><div class='add'>+		ret = ath6kl_wmi_pspoll_event_rx(wmi, datap, len, vif);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_DTIMEXPIRY_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_DTIMEXPIRY_EVENTID\n");</div><div class='del'>-		ret = ath6kl_wmi_dtimexpiry_event_rx(wmi, datap, len);</div><div class='add'>+		ret = ath6kl_wmi_dtimexpiry_event_rx(wmi, datap, len, vif);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_SET_PARAMS_REPLY_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_SET_PARAMS_REPLY_EVENTID\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_ADDBA_REQ_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_ADDBA_REQ_EVENTID\n");</div><div class='del'>-		ret = ath6kl_wmi_addba_req_event_rx(wmi, datap, len);</div><div class='add'>+		ret = ath6kl_wmi_addba_req_event_rx(wmi, datap, len, vif);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_ADDBA_RESP_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_ADDBA_RESP_EVENTID\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_DELBA_REQ_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_DELBA_REQ_EVENTID\n");</div><div class='del'>-		ret = ath6kl_wmi_delba_req_event_rx(wmi, datap, len);</div><div class='add'>+		ret = ath6kl_wmi_delba_req_event_rx(wmi, datap, len, vif);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_REPORT_BTCOEX_CONFIG_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI,</div><div class='hunk'>@@ -3038,21 +3467,21 @@ int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_REMAIN_ON_CHNL_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_REMAIN_ON_CHNL_EVENTID\n");</div><div class='del'>-		ret = ath6kl_wmi_remain_on_chnl_event_rx(wmi, datap, len);</div><div class='add'>+		ret = ath6kl_wmi_remain_on_chnl_event_rx(wmi, datap, len, vif);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_CANCEL_REMAIN_ON_CHNL_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI,</div><div class='ctx'> 			   "WMI_CANCEL_REMAIN_ON_CHNL_EVENTID\n");</div><div class='ctx'> 		ret = ath6kl_wmi_cancel_remain_on_chnl_event_rx(wmi, datap,</div><div class='del'>-								len);</div><div class='add'>+								len, vif);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_TX_STATUS_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_TX_STATUS_EVENTID\n");</div><div class='del'>-		ret = ath6kl_wmi_tx_status_event_rx(wmi, datap, len);</div><div class='add'>+		ret = ath6kl_wmi_tx_status_event_rx(wmi, datap, len, vif);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_RX_PROBE_REQ_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_RX_PROBE_REQ_EVENTID\n");</div><div class='del'>-		ret = ath6kl_wmi_rx_probe_req_event_rx(wmi, datap, len);</div><div class='add'>+		ret = ath6kl_wmi_rx_probe_req_event_rx(wmi, datap, len, vif);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_P2P_CAPABILITIES_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_P2P_CAPABILITIES_EVENTID\n");</div><div class='hunk'>@@ -3060,7 +3489,7 @@ int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_RX_ACTION_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_RX_ACTION_EVENTID\n");</div><div class='del'>-		ret = ath6kl_wmi_rx_action_event_rx(wmi, datap, len);</div><div class='add'>+		ret = ath6kl_wmi_rx_action_event_rx(wmi, datap, len, vif);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WMI_P2P_INFO_EVENTID:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_P2P_INFO_EVENTID\n");</div><div class='hunk'>@@ -3068,7 +3497,6 @@ int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ath6kl_dbg(ATH6KL_DBG_WMI, "unknown cmd id 0x%x\n", id);</div><div class='del'>-		wmi-&gt;stat.cmd_id_err++;</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3078,11 +3506,8 @@ int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath6kl_wmi_qos_state_init(struct wmi *wmi)</div><div class='add'>+void ath6kl_wmi_reset(struct wmi *wmi)</div><div class='ctx'> {</div><div class='del'>-	if (!wmi)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	spin_lock_bh(&amp;wmi-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	wmi-&gt;fat_pipe_exist = 0;</div><div class='hunk'>@@ -3103,16 +3528,9 @@ void *ath6kl_wmi_init(struct ath6kl *dev)</div><div class='ctx'> </div><div class='ctx'> 	wmi-&gt;parent_dev = dev;</div><div class='ctx'> </div><div class='del'>-	ath6kl_wmi_qos_state_init(wmi);</div><div class='del'>-</div><div class='ctx'> 	wmi-&gt;pwr_mode = REC_POWER;</div><div class='del'>-	wmi-&gt;phy_mode = WMI_11G_MODE;</div><div class='del'>-</div><div class='del'>-	wmi-&gt;pair_crypto_type = NONE_CRYPT;</div><div class='del'>-	wmi-&gt;grp_crypto_type = NONE_CRYPT;</div><div class='ctx'> </div><div class='del'>-	wmi-&gt;ht_allowed[A_BAND_24GHZ] = 1;</div><div class='del'>-	wmi-&gt;ht_allowed[A_BAND_5GHZ] = 1;</div><div class='add'>+	ath6kl_wmi_reset(wmi);</div><div class='ctx'> </div><div class='ctx'> 	return wmi;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h<br/>index f8e644d54aa7..42ac311eda4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/wmi.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath6kl/wmi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath6kl/wmi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath6kl/wmi.h</a></div><div class='hunk'>@@ -93,11 +93,6 @@ struct sq_threshold_params {</div><div class='ctx'> 	u8 last_rssi_poll_event;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct wmi_stats {</div><div class='del'>-	u32 cmd_len_err;</div><div class='del'>-	u32 cmd_id_err;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct wmi_data_sync_bufs {</div><div class='ctx'> 	u8 traffic_class;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -111,32 +106,26 @@ struct wmi_data_sync_bufs {</div><div class='ctx'> #define WMM_AC_VO   3		/* voice */</div><div class='ctx'> </div><div class='ctx'> struct wmi {</div><div class='del'>-	bool ready;</div><div class='ctx'> 	u16 stream_exist_for_ac[WMM_NUM_AC];</div><div class='ctx'> 	u8 fat_pipe_exist;</div><div class='ctx'> 	struct ath6kl *parent_dev;</div><div class='del'>-	struct wmi_stats stat;</div><div class='ctx'> 	u8 pwr_mode;</div><div class='del'>-	u8 phy_mode;</div><div class='del'>-	u8 keep_alive_intvl;</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	enum htc_endpoint_id ep_id;</div><div class='ctx'> 	struct sq_threshold_params</div><div class='ctx'> 	    sq_threshld[SIGNAL_QUALITY_METRICS_NUM_MAX];</div><div class='del'>-	enum crypto_type pair_crypto_type;</div><div class='del'>-	enum crypto_type grp_crypto_type;</div><div class='ctx'> 	bool is_wmm_enabled;</div><div class='del'>-	u8 ht_allowed[A_NUM_BANDS];</div><div class='ctx'> 	u8 traffic_class;</div><div class='ctx'> 	bool is_probe_ssid;</div><div class='ctx'> </div><div class='ctx'> 	u8 *last_mgmt_tx_frame;</div><div class='ctx'> 	size_t last_mgmt_tx_frame_len;</div><div class='add'>+	u8 saved_pwr_mode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct host_app_area {</div><div class='del'>-	u32 wmi_protocol_ver;</div><div class='del'>-};</div><div class='add'>+	__le32 wmi_protocol_ver;</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> enum wmi_msg_type {</div><div class='ctx'> 	DATA_MSGTYPE = 0x0,</div><div class='hunk'>@@ -184,6 +173,8 @@ enum wmi_data_hdr_data_type {</div><div class='ctx'> #define WMI_DATA_HDR_META_MASK      0x7</div><div class='ctx'> #define WMI_DATA_HDR_META_SHIFT     13</div><div class='ctx'> </div><div class='add'>+#define WMI_DATA_HDR_IF_IDX_MASK    0xF</div><div class='add'>+</div><div class='ctx'> struct wmi_data_hdr {</div><div class='ctx'> 	s8 rssi;</div><div class='ctx'> </div><div class='hunk'>@@ -208,6 +199,12 @@ struct wmi_data_hdr {</div><div class='ctx'> 	 * b15:b13      - META_DATA_VERSION 0 - 7</div><div class='ctx'> 	 */</div><div class='ctx'> 	__le16 info2;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * usage of info3, 16-bit:</div><div class='add'>+	 * b3:b0	- Interface index</div><div class='add'>+	 * b15:b4	- Reserved</div><div class='add'>+	 */</div><div class='ctx'> 	__le16 info3;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -250,6 +247,11 @@ static inline u8 wmi_data_hdr_get_meta(struct wmi_data_hdr *dhdr)</div><div class='ctx'> 			       WMI_DATA_HDR_META_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u8 wmi_data_hdr_get_if_idx(struct wmi_data_hdr *dhdr)</div><div class='add'>+{</div><div class='add'>+	return le16_to_cpu(dhdr-&gt;info3) &amp; WMI_DATA_HDR_IF_IDX_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Tx meta version definitions */</div><div class='ctx'> #define WMI_MAX_TX_META_SZ	12</div><div class='ctx'> #define WMI_META_VERSION_1	0x01</div><div class='hunk'>@@ -299,6 +301,8 @@ struct wmi_rx_meta_v2 {</div><div class='ctx'> 	u8 csum_flags;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+#define WMI_CMD_HDR_IF_ID_MASK 0xF</div><div class='add'>+</div><div class='ctx'> /* Control Path */</div><div class='ctx'> struct wmi_cmd_hdr {</div><div class='ctx'> 	__le16 cmd_id;</div><div class='hunk'>@@ -312,6 +316,11 @@ struct wmi_cmd_hdr {</div><div class='ctx'> 	__le16 reserved;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+static inline u8 wmi_cmd_hdr_get_if_idx(struct wmi_cmd_hdr *chdr)</div><div class='add'>+{</div><div class='add'>+	return le16_to_cpu(chdr-&gt;info1) &amp; WMI_CMD_HDR_IF_ID_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* List of WMI commands */</div><div class='ctx'> enum wmi_cmd_id {</div><div class='ctx'> 	WMI_CONNECT_CMDID = 0x0001,</div><div class='hunk'>@@ -320,6 +329,10 @@ enum wmi_cmd_id {</div><div class='ctx'> 	WMI_SYNCHRONIZE_CMDID,</div><div class='ctx'> 	WMI_CREATE_PSTREAM_CMDID,</div><div class='ctx'> 	WMI_DELETE_PSTREAM_CMDID,</div><div class='add'>+	/* WMI_START_SCAN_CMDID is to be deprecated. Use</div><div class='add'>+	 * WMI_BEGIN_SCAN_CMDID instead. The new cmd supports P2P mgmt</div><div class='add'>+	 * operations using station interface.</div><div class='add'>+	 */</div><div class='ctx'> 	WMI_START_SCAN_CMDID,</div><div class='ctx'> 	WMI_SET_SCAN_PARAMS_CMDID,</div><div class='ctx'> 	WMI_SET_BSS_FILTER_CMDID,</div><div class='hunk'>@@ -533,12 +546,61 @@ enum wmi_cmd_id {</div><div class='ctx'> 	WMI_GTK_OFFLOAD_OP_CMDID,</div><div class='ctx'> 	WMI_REMAIN_ON_CHNL_CMDID,</div><div class='ctx'> 	WMI_CANCEL_REMAIN_ON_CHNL_CMDID,</div><div class='add'>+	/* WMI_SEND_ACTION_CMDID is to be deprecated. Use</div><div class='add'>+	 * WMI_SEND_MGMT_CMDID instead. The new cmd supports P2P mgmt</div><div class='add'>+	 * operations using station interface.</div><div class='add'>+	 */</div><div class='ctx'> 	WMI_SEND_ACTION_CMDID,</div><div class='ctx'> 	WMI_PROBE_REQ_REPORT_CMDID,</div><div class='ctx'> 	WMI_DISABLE_11B_RATES_CMDID,</div><div class='ctx'> 	WMI_SEND_PROBE_RESPONSE_CMDID,</div><div class='ctx'> 	WMI_GET_P2P_INFO_CMDID,</div><div class='ctx'> 	WMI_AP_JOIN_BSS_CMDID,</div><div class='add'>+</div><div class='add'>+	WMI_SMPS_ENABLE_CMDID,</div><div class='add'>+	WMI_SMPS_CONFIG_CMDID,</div><div class='add'>+	WMI_SET_RATECTRL_PARM_CMDID,</div><div class='add'>+	/*  LPL specific commands*/</div><div class='add'>+	WMI_LPL_FORCE_ENABLE_CMDID,</div><div class='add'>+	WMI_LPL_SET_POLICY_CMDID,</div><div class='add'>+	WMI_LPL_GET_POLICY_CMDID,</div><div class='add'>+	WMI_LPL_GET_HWSTATE_CMDID,</div><div class='add'>+	WMI_LPL_SET_PARAMS_CMDID,</div><div class='add'>+	WMI_LPL_GET_PARAMS_CMDID,</div><div class='add'>+</div><div class='add'>+	WMI_SET_BUNDLE_PARAM_CMDID,</div><div class='add'>+</div><div class='add'>+	/*GreenTx specific commands*/</div><div class='add'>+</div><div class='add'>+	WMI_GREENTX_PARAMS_CMDID,</div><div class='add'>+</div><div class='add'>+	WMI_RTT_MEASREQ_CMDID,</div><div class='add'>+	WMI_RTT_CAPREQ_CMDID,</div><div class='add'>+	WMI_RTT_STATUSREQ_CMDID,</div><div class='add'>+</div><div class='add'>+	/* WPS Commands */</div><div class='add'>+	WMI_WPS_START_CMDID,</div><div class='add'>+	WMI_GET_WPS_STATUS_CMDID,</div><div class='add'>+</div><div class='add'>+	/* More P2P commands */</div><div class='add'>+	WMI_SET_NOA_CMDID,</div><div class='add'>+	WMI_GET_NOA_CMDID,</div><div class='add'>+	WMI_SET_OPPPS_CMDID,</div><div class='add'>+	WMI_GET_OPPPS_CMDID,</div><div class='add'>+	WMI_ADD_PORT_CMDID,</div><div class='add'>+	WMI_DEL_PORT_CMDID,</div><div class='add'>+</div><div class='add'>+	/* 802.11w cmd */</div><div class='add'>+	WMI_SET_RSN_CAP_CMDID,</div><div class='add'>+	WMI_GET_RSN_CAP_CMDID,</div><div class='add'>+	WMI_SET_IGTK_CMDID,</div><div class='add'>+</div><div class='add'>+	WMI_RX_FILTER_COALESCE_FILTER_OP_CMDID,</div><div class='add'>+	WMI_RX_FILTER_SET_FRAME_TEST_LIST_CMDID,</div><div class='add'>+</div><div class='add'>+	WMI_SEND_MGMT_CMDID,</div><div class='add'>+	WMI_BEGIN_SCAN_CMDID,</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum wmi_mgmt_frame_type {</div><div class='hunk'>@@ -558,6 +620,14 @@ enum network_type {</div><div class='ctx'> 	AP_NETWORK = 0x10,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum network_subtype {</div><div class='add'>+	SUBTYPE_NONE,</div><div class='add'>+	SUBTYPE_BT,</div><div class='add'>+	SUBTYPE_P2PDEV,</div><div class='add'>+	SUBTYPE_P2PCLIENT,</div><div class='add'>+	SUBTYPE_P2PGO,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum dot11_auth_mode {</div><div class='ctx'> 	OPEN_AUTH = 0x01,</div><div class='ctx'> 	SHARED_AUTH = 0x02,</div><div class='hunk'>@@ -576,9 +646,6 @@ enum auth_mode {</div><div class='ctx'> 	WPA2_AUTH_CCKM = 0x40,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define WMI_MIN_CRYPTO_TYPE NONE_CRYPT</div><div class='del'>-#define WMI_MAX_CRYPTO_TYPE (AES_CRYPT + 1)</div><div class='del'>-</div><div class='ctx'> #define WMI_MIN_KEY_INDEX   0</div><div class='ctx'> #define WMI_MAX_KEY_INDEX   3</div><div class='ctx'> </div><div class='hunk'>@@ -617,6 +684,7 @@ enum wmi_connect_ctrl_flags_bits {</div><div class='ctx'> 	CONNECT_CSA_FOLLOW_BSS = 0x0020,</div><div class='ctx'> 	CONNECT_DO_WPA_OFFLOAD = 0x0040,</div><div class='ctx'> 	CONNECT_DO_NOT_DEAUTH = 0x0080,</div><div class='add'>+	CONNECT_WPS_FLAG = 0x0100,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct wmi_connect_cmd {</div><div class='hunk'>@@ -632,6 +700,7 @@ struct wmi_connect_cmd {</div><div class='ctx'> 	__le16 ch;</div><div class='ctx'> 	u8 bssid[ETH_ALEN];</div><div class='ctx'> 	__le32 ctrl_flags;</div><div class='add'>+	u8 nw_subtype;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* WMI_RECONNECT_CMDID */</div><div class='hunk'>@@ -719,7 +788,12 @@ enum wmi_scan_type {</div><div class='ctx'> 	WMI_SHORT_SCAN = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct wmi_start_scan_cmd {</div><div class='add'>+struct wmi_supp_rates {</div><div class='add'>+	u8 nrates;</div><div class='add'>+	u8 rates[ATH6KL_RATE_MAXSIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_begin_scan_cmd {</div><div class='ctx'> 	__le32 force_fg_scan;</div><div class='ctx'> </div><div class='ctx'> 	/* for legacy cisco AP compatibility */</div><div class='hunk'>@@ -731,9 +805,15 @@ struct wmi_start_scan_cmd {</div><div class='ctx'> 	/* time interval between scans (msec) */</div><div class='ctx'> 	__le32 force_scan_intvl;</div><div class='ctx'> </div><div class='add'>+	/* no CCK rates */</div><div class='add'>+	__le32 no_cck;</div><div class='add'>+</div><div class='ctx'> 	/* enum wmi_scan_type */</div><div class='ctx'> 	u8 scan_type;</div><div class='ctx'> </div><div class='add'>+	/* Supported rates to advertise in the probe request frames */</div><div class='add'>+	struct wmi_supp_rates supp_rates[IEEE80211_NUM_BANDS];</div><div class='add'>+</div><div class='ctx'> 	/* how many channels follow */</div><div class='ctx'> 	u8 num_ch;</div><div class='ctx'> </div><div class='hunk'>@@ -741,8 +821,31 @@ struct wmi_start_scan_cmd {</div><div class='ctx'> 	__le16 ch_list[1];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/* WMI_SET_SCAN_PARAMS_CMDID */</div><div class='del'>-#define WMI_SHORTSCANRATIO_DEFAULT      3</div><div class='add'>+/* wmi_start_scan_cmd is to be deprecated. Use</div><div class='add'>+ * wmi_begin_scan_cmd instead. The new structure supports P2P mgmt</div><div class='add'>+ * operations using station interface.</div><div class='add'>+ */</div><div class='add'>+struct wmi_start_scan_cmd {</div><div class='add'>+	__le32 force_fg_scan;</div><div class='add'>+</div><div class='add'>+	/* for legacy cisco AP compatibility */</div><div class='add'>+	__le32 is_legacy;</div><div class='add'>+</div><div class='add'>+	/* max duration in the home channel(msec) */</div><div class='add'>+	__le32 home_dwell_time;</div><div class='add'>+</div><div class='add'>+	/* time interval between scans (msec) */</div><div class='add'>+	__le32 force_scan_intvl;</div><div class='add'>+</div><div class='add'>+	/* enum wmi_scan_type */</div><div class='add'>+	u8 scan_type;</div><div class='add'>+</div><div class='add'>+	/* how many channels follow */</div><div class='add'>+	u8 num_ch;</div><div class='add'>+</div><div class='add'>+	/* channels in Mhz */</div><div class='add'>+	__le16 ch_list[1];</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Warning: scan control flag value of 0xFF is used to disable</div><div class='hunk'>@@ -776,13 +879,6 @@ enum wmi_scan_ctrl_flags_bits {</div><div class='ctx'> 	ENABLE_SCAN_ABORT_EVENT = 0x40</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define DEFAULT_SCAN_CTRL_FLAGS			\</div><div class='del'>-	(CONNECT_SCAN_CTRL_FLAGS |		\</div><div class='del'>-	 SCAN_CONNECTED_CTRL_FLAGS |		\</div><div class='del'>-	 ACTIVE_SCAN_CTRL_FLAGS |		\</div><div class='del'>-	 ROAM_SCAN_CTRL_FLAGS |			\</div><div class='del'>-	 ENABLE_AUTO_CTRL_FLAGS)</div><div class='del'>-</div><div class='ctx'> struct wmi_scan_params_cmd {</div><div class='ctx'> 	  /* sec */</div><div class='ctx'> 	__le16 fg_start_period;</div><div class='hunk'>@@ -1365,14 +1461,20 @@ enum wmi_roam_ctrl {</div><div class='ctx'> 	WMI_SET_LRSSI_SCAN_PARAMS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum wmi_roam_mode {</div><div class='add'>+	WMI_DEFAULT_ROAM_MODE = 1, /* RSSI based roam */</div><div class='add'>+	WMI_HOST_BIAS_ROAM_MODE = 2, /* Host bias based roam */</div><div class='add'>+	WMI_LOCK_BSS_MODE = 3, /* Lock to the current BSS */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct bss_bias {</div><div class='ctx'> 	u8 bssid[ETH_ALEN];</div><div class='del'>-	u8  bias;</div><div class='add'>+	s8 bias;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct bss_bias_info {</div><div class='ctx'> 	u8 num_bss;</div><div class='del'>-	struct bss_bias bss_bias[1];</div><div class='add'>+	struct bss_bias bss_bias[0];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct low_rssi_scan_params {</div><div class='hunk'>@@ -1385,10 +1487,11 @@ struct low_rssi_scan_params {</div><div class='ctx'> </div><div class='ctx'> struct roam_ctrl_cmd {</div><div class='ctx'> 	union {</div><div class='del'>-		u8 bssid[ETH_ALEN];</div><div class='del'>-		u8 roam_mode;</div><div class='del'>-		struct bss_bias_info bss;</div><div class='del'>-		struct low_rssi_scan_params params;</div><div class='add'>+		u8 bssid[ETH_ALEN]; /* WMI_FORCE_ROAM */</div><div class='add'>+		u8 roam_mode; /* WMI_SET_ROAM_MODE */</div><div class='add'>+		struct bss_bias_info bss; /* WMI_SET_HOST_BIAS */</div><div class='add'>+		struct low_rssi_scan_params params; /* WMI_SET_LRSSI_SCAN_PARAMS</div><div class='add'>+						     */</div><div class='ctx'> 	} __packed info;</div><div class='ctx'> 	u8 roam_ctrl;</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -1455,6 +1558,10 @@ struct wmi_tkip_micerr_event {</div><div class='ctx'> 	u8 is_mcast;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+enum wmi_scan_status {</div><div class='add'>+	WMI_SCAN_STATUS_SUCCESS = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* WMI_SCAN_COMPLETE_EVENTID */</div><div class='ctx'> struct wmi_scan_complete_event {</div><div class='ctx'> 	a_sle32 status;</div><div class='hunk'>@@ -1635,6 +1742,12 @@ struct wmi_bss_roam_info {</div><div class='ctx'> 	u8 reserved;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct wmi_target_roam_tbl {</div><div class='add'>+	__le16 roam_mode;</div><div class='add'>+	__le16 num_entries;</div><div class='add'>+	struct wmi_bss_roam_info info[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> /* WMI_CAC_EVENTID */</div><div class='ctx'> enum cac_indication {</div><div class='ctx'> 	CAC_INDICATION_ADMISSION = 0x00,</div><div class='hunk'>@@ -1771,7 +1884,6 @@ struct wmi_set_appie_cmd {</div><div class='ctx'> #define WSC_REG_ACTIVE     1</div><div class='ctx'> #define WSC_REG_INACTIVE   0</div><div class='ctx'> </div><div class='del'>-#define WOW_MAX_FILTER_LISTS	 1</div><div class='ctx'> #define WOW_MAX_FILTERS_PER_LIST 4</div><div class='ctx'> #define WOW_PATTERN_SIZE	 64</div><div class='ctx'> #define WOW_MASK_SIZE		 64</div><div class='hunk'>@@ -1794,17 +1906,52 @@ struct wmi_set_ip_cmd {</div><div class='ctx'> 	__le32 ips[MAX_IP_ADDRS];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/* WMI_GET_WOW_LIST_CMD reply  */</div><div class='del'>-struct wmi_get_wow_list_reply {</div><div class='del'>-	/* number of patterns in reply */</div><div class='del'>-	u8 num_filters;</div><div class='add'>+enum ath6kl_wow_filters {</div><div class='add'>+	WOW_FILTER_SSID			= BIT(1),</div><div class='add'>+	WOW_FILTER_OPTION_MAGIC_PACKET  = BIT(2),</div><div class='add'>+	WOW_FILTER_OPTION_EAP_REQ	= BIT(3),</div><div class='add'>+	WOW_FILTER_OPTION_PATTERNS	= BIT(4),</div><div class='add'>+	WOW_FILTER_OPTION_OFFLOAD_ARP	= BIT(5),</div><div class='add'>+	WOW_FILTER_OPTION_OFFLOAD_NS	= BIT(6),</div><div class='add'>+	WOW_FILTER_OPTION_OFFLOAD_GTK	= BIT(7),</div><div class='add'>+	WOW_FILTER_OPTION_8021X_4WAYHS	= BIT(8),</div><div class='add'>+	WOW_FILTER_OPTION_NLO_DISCVRY	= BIT(9),</div><div class='add'>+	WOW_FILTER_OPTION_NWK_DISASSOC	= BIT(10),</div><div class='add'>+	WOW_FILTER_OPTION_GTK_ERROR	= BIT(11),</div><div class='add'>+	WOW_FILTER_OPTION_TEST_MODE	= BIT(15),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath6kl_host_mode {</div><div class='add'>+	ATH6KL_HOST_MODE_AWAKE,</div><div class='add'>+	ATH6KL_HOST_MODE_ASLEEP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_set_host_sleep_mode_cmd {</div><div class='add'>+	__le32 awake;</div><div class='add'>+	__le32 asleep;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum ath6kl_wow_mode {</div><div class='add'>+	ATH6KL_WOW_MODE_DISABLE,</div><div class='add'>+	ATH6KL_WOW_MODE_ENABLE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wmi_set_wow_mode_cmd {</div><div class='add'>+	__le32 enable_wow;</div><div class='add'>+	__le32 filter;</div><div class='add'>+	__le16 host_req_delay;</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='del'>-	/* this is filter # x of total num_filters */</div><div class='del'>-	u8 this_filter_num;</div><div class='add'>+struct wmi_add_wow_pattern_cmd {</div><div class='add'>+	u8 filter_list_id;</div><div class='add'>+	u8 filter_size;</div><div class='add'>+	u8 filter_offset;</div><div class='add'>+	u8 filter[0];</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='del'>-	u8 wow_mode;</div><div class='del'>-	u8 host_mode;</div><div class='del'>-	struct wow_filter wow_filters[1];</div><div class='add'>+struct wmi_del_wow_pattern_cmd {</div><div class='add'>+	__le16 filter_list_id;</div><div class='add'>+	__le16 filter_id;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* WMI_SET_AKMP_PARAMS_CMD */</div><div class='hunk'>@@ -1905,7 +2052,7 @@ struct wmi_tx_complete_event {</div><div class='ctx'>  * !!! Warning !!!</div><div class='ctx'>  * -Changing the following values needs compilation of both driver and firmware</div><div class='ctx'>  */</div><div class='del'>-#define AP_MAX_NUM_STA          8</div><div class='add'>+#define AP_MAX_NUM_STA          10</div><div class='ctx'> </div><div class='ctx'> /* Spl. AID used to set DTIM flag in the beacons */</div><div class='ctx'> #define MCAST_AID               0xFF</div><div class='hunk'>@@ -1988,6 +2135,10 @@ struct wmi_remain_on_chnl_cmd {</div><div class='ctx'> 	__le32 duration;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/* wmi_send_action_cmd is to be deprecated. Use</div><div class='add'>+ * wmi_send_mgmt_cmd instead. The new structure supports P2P mgmt</div><div class='add'>+ * operations using station interface.</div><div class='add'>+ */</div><div class='ctx'> struct wmi_send_action_cmd {</div><div class='ctx'> 	__le32 id;</div><div class='ctx'> 	__le32 freq;</div><div class='hunk'>@@ -1996,6 +2147,15 @@ struct wmi_send_action_cmd {</div><div class='ctx'> 	u8 data[0];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct wmi_send_mgmt_cmd {</div><div class='add'>+	__le32 id;</div><div class='add'>+	__le32 freq;</div><div class='add'>+	__le32 wait;</div><div class='add'>+	__le32 no_cck;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 data[0];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct wmi_tx_status_event {</div><div class='ctx'> 	__le32 id;</div><div class='ctx'> 	u8 ack_status;</div><div class='hunk'>@@ -2163,120 +2323,162 @@ int ath6kl_wmi_dix_2_dot3(struct wmi *wmi, struct sk_buff *skb);</div><div class='ctx'> int ath6kl_wmi_data_hdr_add(struct wmi *wmi, struct sk_buff *skb,</div><div class='ctx'> 			    u8 msg_type, bool more_data,</div><div class='ctx'> 			    enum wmi_data_hdr_data_type data_type,</div><div class='del'>-			    u8 meta_ver, void *tx_meta_info);</div><div class='add'>+			    u8 meta_ver, void *tx_meta_info, u8 if_idx);</div><div class='ctx'> </div><div class='ctx'> int ath6kl_wmi_dot11_hdr_remove(struct wmi *wmi, struct sk_buff *skb);</div><div class='ctx'> int ath6kl_wmi_dot3_2_dix(struct sk_buff *skb);</div><div class='del'>-int ath6kl_wmi_implicit_create_pstream(struct wmi *wmi, struct sk_buff *skb,</div><div class='del'>-				       u32 layer2_priority, bool wmm_enabled,</div><div class='del'>-				       u8 *ac);</div><div class='add'>+int ath6kl_wmi_implicit_create_pstream(struct wmi *wmi, u8 if_idx,</div><div class='add'>+				       struct sk_buff *skb, u32 layer2_priority,</div><div class='add'>+				       bool wmm_enabled, u8 *ac);</div><div class='ctx'> </div><div class='ctx'> int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb);</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_cmd_send(struct wmi *wmi, struct sk_buff *skb,</div><div class='add'>+int ath6kl_wmi_cmd_send(struct wmi *wmi, u8 if_idx, struct sk_buff *skb,</div><div class='ctx'> 			enum wmi_cmd_id cmd_id, enum wmi_sync_flag sync_flag);</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_connect_cmd(struct wmi *wmi, enum network_type nw_type,</div><div class='add'>+int ath6kl_wmi_connect_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+			   enum network_type nw_type,</div><div class='ctx'> 			   enum dot11_auth_mode dot11_auth_mode,</div><div class='ctx'> 			   enum auth_mode auth_mode,</div><div class='ctx'> 			   enum crypto_type pairwise_crypto,</div><div class='ctx'> 			   u8 pairwise_crypto_len,</div><div class='ctx'> 			   enum crypto_type group_crypto,</div><div class='ctx'> 			   u8 group_crypto_len, int ssid_len, u8 *ssid,</div><div class='del'>-			   u8 *bssid, u16 channel, u32 ctrl_flags);</div><div class='del'>-</div><div class='del'>-int ath6kl_wmi_reconnect_cmd(struct wmi *wmi, u8 *bssid, u16 channel);</div><div class='del'>-int ath6kl_wmi_disconnect_cmd(struct wmi *wmi);</div><div class='del'>-int ath6kl_wmi_startscan_cmd(struct wmi *wmi, enum wmi_scan_type scan_type,</div><div class='add'>+			   u8 *bssid, u16 channel, u32 ctrl_flags,</div><div class='add'>+			   u8 nw_subtype);</div><div class='add'>+</div><div class='add'>+int ath6kl_wmi_reconnect_cmd(struct wmi *wmi, u8 if_idx, u8 *bssid,</div><div class='add'>+			     u16 channel);</div><div class='add'>+int ath6kl_wmi_disconnect_cmd(struct wmi *wmi, u8 if_idx);</div><div class='add'>+int ath6kl_wmi_startscan_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+			     enum wmi_scan_type scan_type,</div><div class='ctx'> 			     u32 force_fgscan, u32 is_legacy,</div><div class='ctx'> 			     u32 home_dwell_time, u32 force_scan_interval,</div><div class='ctx'> 			     s8 num_chan, u16 *ch_list);</div><div class='del'>-int ath6kl_wmi_scanparams_cmd(struct wmi *wmi, u16 fg_start_sec,</div><div class='add'>+</div><div class='add'>+int ath6kl_wmi_beginscan_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+			     enum wmi_scan_type scan_type,</div><div class='add'>+			     u32 force_fgscan, u32 is_legacy,</div><div class='add'>+			     u32 home_dwell_time, u32 force_scan_interval,</div><div class='add'>+			     s8 num_chan, u16 *ch_list, u32 no_cck,</div><div class='add'>+			     u32 *rates);</div><div class='add'>+</div><div class='add'>+int ath6kl_wmi_scanparams_cmd(struct wmi *wmi, u8 if_idx, u16 fg_start_sec,</div><div class='ctx'> 			      u16 fg_end_sec, u16 bg_sec,</div><div class='ctx'> 			      u16 minact_chdw_msec, u16 maxact_chdw_msec,</div><div class='ctx'> 			      u16 pas_chdw_msec, u8 short_scan_ratio,</div><div class='ctx'> 			      u8 scan_ctrl_flag, u32 max_dfsch_act_time,</div><div class='ctx'> 			      u16 maxact_scan_per_ssid);</div><div class='del'>-int ath6kl_wmi_bssfilter_cmd(struct wmi *wmi, u8 filter, u32 ie_mask);</div><div class='del'>-int ath6kl_wmi_probedssid_cmd(struct wmi *wmi, u8 index, u8 flag,</div><div class='add'>+int ath6kl_wmi_bssfilter_cmd(struct wmi *wmi, u8 if_idx, u8 filter,</div><div class='add'>+			     u32 ie_mask);</div><div class='add'>+int ath6kl_wmi_probedssid_cmd(struct wmi *wmi, u8 if_idx, u8 index, u8 flag,</div><div class='ctx'> 			      u8 ssid_len, u8 *ssid);</div><div class='del'>-int ath6kl_wmi_listeninterval_cmd(struct wmi *wmi, u16 listen_interval,</div><div class='add'>+int ath6kl_wmi_listeninterval_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+				  u16 listen_interval,</div><div class='ctx'> 				  u16 listen_beacons);</div><div class='del'>-int ath6kl_wmi_powermode_cmd(struct wmi *wmi, u8 pwr_mode);</div><div class='del'>-int ath6kl_wmi_pmparams_cmd(struct wmi *wmi, u16 idle_period,</div><div class='add'>+int ath6kl_wmi_powermode_cmd(struct wmi *wmi, u8 if_idx, u8 pwr_mode);</div><div class='add'>+int ath6kl_wmi_pmparams_cmd(struct wmi *wmi, u8 if_idx, u16 idle_period,</div><div class='ctx'> 			    u16 ps_poll_num, u16 dtim_policy,</div><div class='ctx'> 			    u16 tx_wakup_policy, u16 num_tx_to_wakeup,</div><div class='ctx'> 			    u16 ps_fail_event_policy);</div><div class='del'>-int ath6kl_wmi_disctimeout_cmd(struct wmi *wmi, u8 timeout);</div><div class='del'>-int ath6kl_wmi_create_pstream_cmd(struct wmi *wmi,</div><div class='add'>+int ath6kl_wmi_create_pstream_cmd(struct wmi *wmi, u8 if_idx,</div><div class='ctx'> 				  struct wmi_create_pstream_cmd *pstream);</div><div class='del'>-int ath6kl_wmi_delete_pstream_cmd(struct wmi *wmi, u8 traffic_class, u8 tsid);</div><div class='add'>+int ath6kl_wmi_delete_pstream_cmd(struct wmi *wmi, u8 if_idx, u8 traffic_class,</div><div class='add'>+				  u8 tsid);</div><div class='add'>+int ath6kl_wmi_disctimeout_cmd(struct wmi *wmi, u8 if_idx, u8 timeout);</div><div class='ctx'> </div><div class='ctx'> int ath6kl_wmi_set_rts_cmd(struct wmi *wmi, u16 threshold);</div><div class='del'>-int ath6kl_wmi_set_lpreamble_cmd(struct wmi *wmi, u8 status,</div><div class='add'>+int ath6kl_wmi_set_lpreamble_cmd(struct wmi *wmi, u8 if_idx, u8 status,</div><div class='ctx'> 				 u8 preamble_policy);</div><div class='ctx'> </div><div class='ctx'> int ath6kl_wmi_get_challenge_resp_cmd(struct wmi *wmi, u32 cookie, u32 source);</div><div class='ctx'> int ath6kl_wmi_config_debug_module_cmd(struct wmi *wmi, u32 valid, u32 config);</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_get_stats_cmd(struct wmi *wmi);</div><div class='del'>-int ath6kl_wmi_addkey_cmd(struct wmi *wmi, u8 key_index,</div><div class='add'>+int ath6kl_wmi_get_stats_cmd(struct wmi *wmi, u8 if_idx);</div><div class='add'>+int ath6kl_wmi_addkey_cmd(struct wmi *wmi, u8 if_idx, u8 key_index,</div><div class='ctx'> 			  enum crypto_type key_type,</div><div class='ctx'> 			  u8 key_usage, u8 key_len,</div><div class='del'>-			  u8 *key_rsc, u8 *key_material,</div><div class='add'>+			  u8 *key_rsc, unsigned int key_rsc_len,</div><div class='add'>+			  u8 *key_material,</div><div class='ctx'> 			  u8 key_op_ctrl, u8 *mac_addr,</div><div class='ctx'> 			  enum wmi_sync_flag sync_flag);</div><div class='del'>-int ath6kl_wmi_add_krk_cmd(struct wmi *wmi, u8 *krk);</div><div class='del'>-int ath6kl_wmi_deletekey_cmd(struct wmi *wmi, u8 key_index);</div><div class='del'>-int ath6kl_wmi_setpmkid_cmd(struct wmi *wmi, const u8 *bssid,</div><div class='add'>+int ath6kl_wmi_add_krk_cmd(struct wmi *wmi, u8 if_idx, u8 *krk);</div><div class='add'>+int ath6kl_wmi_deletekey_cmd(struct wmi *wmi, u8 if_idx, u8 key_index);</div><div class='add'>+int ath6kl_wmi_setpmkid_cmd(struct wmi *wmi, u8 if_idx, const u8 *bssid,</div><div class='ctx'> 			    const u8 *pmkid, bool set);</div><div class='del'>-int ath6kl_wmi_set_tx_pwr_cmd(struct wmi *wmi, u8 dbM);</div><div class='del'>-int ath6kl_wmi_get_tx_pwr_cmd(struct wmi *wmi);</div><div class='add'>+int ath6kl_wmi_set_tx_pwr_cmd(struct wmi *wmi, u8 if_idx, u8 dbM);</div><div class='add'>+int ath6kl_wmi_get_tx_pwr_cmd(struct wmi *wmi, u8 if_idx);</div><div class='add'>+int ath6kl_wmi_get_roam_tbl_cmd(struct wmi *wmi);</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_set_wmm_txop(struct wmi *wmi, enum wmi_txop_cfg cfg);</div><div class='del'>-int ath6kl_wmi_set_keepalive_cmd(struct wmi *wmi, u8 keep_alive_intvl);</div><div class='add'>+int ath6kl_wmi_set_wmm_txop(struct wmi *wmi, u8 if_idx, enum wmi_txop_cfg cfg);</div><div class='add'>+int ath6kl_wmi_set_keepalive_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+				 u8 keep_alive_intvl);</div><div class='ctx'> int ath6kl_wmi_test_cmd(struct wmi *wmi, void *buf, size_t len);</div><div class='ctx'> </div><div class='ctx'> s32 ath6kl_wmi_get_rate(s8 rate_index);</div><div class='ctx'> </div><div class='ctx'> int ath6kl_wmi_set_ip_cmd(struct wmi *wmi, struct wmi_set_ip_cmd *ip_cmd);</div><div class='add'>+int ath6kl_wmi_set_host_sleep_mode_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+				       enum ath6kl_host_mode host_mode);</div><div class='add'>+int ath6kl_wmi_set_wow_mode_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+				enum ath6kl_wow_mode wow_mode,</div><div class='add'>+				u32 filter, u16 host_req_delay);</div><div class='add'>+int ath6kl_wmi_add_wow_pattern_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+				   u8 list_id, u8 filter_size,</div><div class='add'>+				   u8 filter_offset, u8 *filter, u8 *mask);</div><div class='add'>+int ath6kl_wmi_del_wow_pattern_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+				   u16 list_id, u16 filter_id);</div><div class='ctx'> int ath6kl_wmi_set_roam_lrssi_cmd(struct wmi *wmi, u8 lrssi);</div><div class='add'>+int ath6kl_wmi_force_roam_cmd(struct wmi *wmi, const u8 *bssid);</div><div class='add'>+int ath6kl_wmi_set_roam_mode_cmd(struct wmi *wmi, enum wmi_roam_mode mode);</div><div class='ctx'> </div><div class='ctx'> /* AP mode */</div><div class='del'>-int ath6kl_wmi_ap_profile_commit(struct wmi *wmip, struct wmi_connect_cmd *p);</div><div class='add'>+int ath6kl_wmi_ap_profile_commit(struct wmi *wmip, u8 if_idx,</div><div class='add'>+				 struct wmi_connect_cmd *p);</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_ap_set_mlme(struct wmi *wmip, u8 cmd, const u8 *mac, u16 reason);</div><div class='add'>+int ath6kl_wmi_ap_set_mlme(struct wmi *wmip, u8 if_idx, u8 cmd,</div><div class='add'>+			   const u8 *mac, u16 reason);</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_set_pvb_cmd(struct wmi *wmi, u16 aid, bool flag);</div><div class='add'>+int ath6kl_wmi_set_pvb_cmd(struct wmi *wmi, u8 if_idx, u16 aid, bool flag);</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_set_rx_frame_format_cmd(struct wmi *wmi, u8 rx_meta_version,</div><div class='add'>+int ath6kl_wmi_set_rx_frame_format_cmd(struct wmi *wmi, u8 if_idx,</div><div class='add'>+				       u8 rx_meta_version,</div><div class='ctx'> 				       bool rx_dot11_hdr, bool defrag_on_host);</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_set_appie_cmd(struct wmi *wmi, u8 mgmt_frm_type, const u8 *ie,</div><div class='del'>-			     u8 ie_len);</div><div class='add'>+int ath6kl_wmi_set_appie_cmd(struct wmi *wmi, u8 if_idx, u8 mgmt_frm_type,</div><div class='add'>+			     const u8 *ie, u8 ie_len);</div><div class='ctx'> </div><div class='ctx'> /* P2P */</div><div class='ctx'> int ath6kl_wmi_disable_11b_rates_cmd(struct wmi *wmi, bool disable);</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_remain_on_chnl_cmd(struct wmi *wmi, u32 freq, u32 dur);</div><div class='add'>+int ath6kl_wmi_remain_on_chnl_cmd(struct wmi *wmi, u8 if_idx, u32 freq,</div><div class='add'>+				  u32 dur);</div><div class='add'>+</div><div class='add'>+int ath6kl_wmi_send_action_cmd(struct wmi *wmi, u8 if_idx, u32 id, u32 freq,</div><div class='add'>+			       u32 wait, const u8 *data, u16 data_len);</div><div class='add'>+</div><div class='add'>+int ath6kl_wmi_send_mgmt_cmd(struct wmi *wmi, u8 if_idx, u32 id, u32 freq,</div><div class='add'>+			       u32 wait, const u8 *data, u16 data_len,</div><div class='add'>+			       u32 no_cck);</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_send_action_cmd(struct wmi *wmi, u32 id, u32 freq, u32 wait,</div><div class='del'>-			       const u8 *data, u16 data_len);</div><div class='add'>+int ath6kl_wmi_send_probe_response_cmd(struct wmi *wmi, u8 if_idx, u32 freq,</div><div class='add'>+				       const u8 *dst, const u8 *data,</div><div class='add'>+				       u16 data_len);</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_send_probe_response_cmd(struct wmi *wmi, u32 freq,</div><div class='del'>-				       const u8 *dst,</div><div class='del'>-				       const u8 *data, u16 data_len);</div><div class='add'>+int ath6kl_wmi_probe_report_req_cmd(struct wmi *wmi, u8 if_idx, bool enable);</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_probe_report_req_cmd(struct wmi *wmi, bool enable);</div><div class='add'>+int ath6kl_wmi_info_req_cmd(struct wmi *wmi, u8 if_idx, u32 info_req_flags);</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_info_req_cmd(struct wmi *wmi, u32 info_req_flags);</div><div class='add'>+int ath6kl_wmi_cancel_remain_on_chnl_cmd(struct wmi *wmi, u8 if_idx);</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_cancel_remain_on_chnl_cmd(struct wmi *wmi);</div><div class='add'>+int ath6kl_wmi_set_appie_cmd(struct wmi *wmi, u8 if_idx, u8 mgmt_frm_type,</div><div class='add'>+			     const u8 *ie, u8 ie_len);</div><div class='ctx'> </div><div class='del'>-int ath6kl_wmi_set_appie_cmd(struct wmi *wmi, u8 mgmt_frm_type, const u8 *ie,</div><div class='del'>-			     u8 ie_len);</div><div class='add'>+void ath6kl_wmi_sscan_timer(unsigned long ptr);</div><div class='ctx'> </div><div class='add'>+struct ath6kl_vif *ath6kl_get_vif_by_index(struct ath6kl *ar, u8 if_idx);</div><div class='ctx'> void *ath6kl_wmi_init(struct ath6kl *devt);</div><div class='ctx'> void ath6kl_wmi_shutdown(struct wmi *wmi);</div><div class='add'>+void ath6kl_wmi_reset(struct wmi *wmi);</div><div class='ctx'> </div><div class='ctx'> #endif /* WMI_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/Kconfig b/drivers/net/wireless/ath/ath9k/Kconfig<br/>index d9c08c619a3a..dc6be4afe8eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/Kconfig</a></div><div class='hunk'>@@ -2,6 +2,9 @@ config ATH9K_HW</div><div class='ctx'> 	tristate</div><div class='ctx'> config ATH9K_COMMON</div><div class='ctx'> 	tristate</div><div class='add'>+config ATH9K_DFS_DEBUGFS</div><div class='add'>+	def_bool y</div><div class='add'>+	depends on ATH9K_DEBUGFS &amp;&amp; ATH9K_DFS_CERTIFIED</div><div class='ctx'> </div><div class='ctx'> config ATH9K</div><div class='ctx'> 	tristate "Atheros 802.11n wireless cards support"</div><div class='hunk'>@@ -25,6 +28,7 @@ config ATH9K</div><div class='ctx'> </div><div class='ctx'> config ATH9K_PCI</div><div class='ctx'> 	bool "Atheros ath9k PCI/PCIe bus support"</div><div class='add'>+	default y</div><div class='ctx'> 	depends on ATH9K &amp;&amp; PCI</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This option enables the PCI bus support in ath9k.</div><div class='hunk'>@@ -50,6 +54,25 @@ config ATH9K_DEBUGFS</div><div class='ctx'> </div><div class='ctx'> 	  Also required for changing debug message flags at run time.</div><div class='ctx'> </div><div class='add'>+config ATH9K_DFS_CERTIFIED</div><div class='add'>+	bool "Atheros DFS support for certified platforms"</div><div class='add'>+	depends on ATH9K &amp;&amp; EXPERT</div><div class='add'>+	default n</div><div class='add'>+	---help---</div><div class='add'>+	  This option enables DFS support for initiating radiation on</div><div class='add'>+	  ath9k. There is no way to dynamically detect if a card was DFS</div><div class='add'>+	  certified and as such this is left as a build time option. This</div><div class='add'>+	  option should only be enabled by system integrators that can</div><div class='add'>+	  guarantee that all the platforms that their kernel will run on</div><div class='add'>+	  have obtained appropriate regulatory body certification for a</div><div class='add'>+	  respective Atheros card by using ath9k on the target shipping</div><div class='add'>+	  platforms.</div><div class='add'>+</div><div class='add'>+	  This is currently only a placeholder for future DFS support,</div><div class='add'>+	  as DFS support requires more components that still need to be</div><div class='add'>+	  developed. At this point enabling this option won't do anything</div><div class='add'>+	  except increase code size.</div><div class='add'>+</div><div class='ctx'> config ATH9K_RATE_CONTROL</div><div class='ctx'> 	bool "Atheros ath9k rate control"</div><div class='ctx'> 	depends on ATH9K</div><div class='hunk'>@@ -58,6 +81,14 @@ config ATH9K_RATE_CONTROL</div><div class='ctx'> 	  Say Y, if you want to use the ath9k specific rate control</div><div class='ctx'> 	  module instead of minstrel_ht.</div><div class='ctx'> </div><div class='add'>+config ATH9K_BTCOEX_SUPPORT</div><div class='add'>+	bool "Atheros ath9k bluetooth coexistence support"</div><div class='add'>+	depends on ATH9K</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y, if you want to use the ath9k radios together with</div><div class='add'>+	  Bluetooth modules in the same system.</div><div class='add'>+</div><div class='ctx'> config ATH9K_HTC</div><div class='ctx'>        tristate "Atheros HTC based wireless cards support"</div><div class='ctx'>        depends on USB &amp;&amp; MAC80211</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile<br/>index 36ed3c46fec6..da02242499af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/Makefile</a></div><div class='hunk'>@@ -4,11 +4,14 @@ ath9k-y +=	beacon.o \</div><div class='ctx'> 		main.o \</div><div class='ctx'> 		recv.o \</div><div class='ctx'> 		xmit.o \</div><div class='add'>+		mci.o \</div><div class='ctx'> </div><div class='ctx'> ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc.o</div><div class='ctx'> ath9k-$(CONFIG_ATH9K_PCI) += pci.o</div><div class='ctx'> ath9k-$(CONFIG_ATH9K_AHB) += ahb.o</div><div class='ctx'> ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o</div><div class='add'>+ath9k-$(CONFIG_ATH9K_DFS_DEBUGFS) += dfs_debug.o</div><div class='add'>+ath9k-$(CONFIG_ATH9K_DFS_CERTIFIED) += dfs.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ATH9K) += ath9k.o</div><div class='ctx'> </div><div class='hunk'>@@ -33,7 +36,8 @@ ath9k_hw-y:=	\</div><div class='ctx'> 		ar9002_mac.o \</div><div class='ctx'> 		ar9003_mac.o \</div><div class='ctx'> 		ar9003_eeprom.o \</div><div class='del'>-		ar9003_paprd.o</div><div class='add'>+		ar9003_paprd.o \</div><div class='add'>+		ar9003_mci.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ATH9K_HW) += ath9k_hw.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c<br/>index a639b94f7643..bc56f57b393b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ani.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ani.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ani.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/ani.c</a></div><div class='hunk'>@@ -136,8 +136,8 @@ static void ath9k_ani_restart(struct ath_hw *ah)</div><div class='ctx'> 		cck_base = AR_PHY_COUNTMAX - ah-&gt;config.cck_trig_high;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_ANI,</div><div class='del'>-		"Writing ofdmbase=%u   cckbase=%u\n", ofdm_base, cck_base);</div><div class='add'>+	ath_dbg(common, ANI, "Writing ofdmbase=%u   cckbase=%u\n",</div><div class='add'>+		ofdm_base, cck_base);</div><div class='ctx'> </div><div class='ctx'> 	ENABLE_REGWRITE_BUFFER(ah);</div><div class='ctx'> </div><div class='hunk'>@@ -268,8 +268,7 @@ static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel)</div><div class='ctx'> </div><div class='ctx'> 	aniState-&gt;noiseFloor = BEACON_RSSI(ah);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_ANI,</div><div class='del'>-		"**** ofdmlevel %d=&gt;%d, rssi=%d[lo=%d hi=%d]\n",</div><div class='add'>+	ath_dbg(common, ANI, "**** ofdmlevel %d=&gt;%d, rssi=%d[lo=%d hi=%d]\n",</div><div class='ctx'> 		aniState-&gt;ofdmNoiseImmunityLevel,</div><div class='ctx'> 		immunityLevel, aniState-&gt;noiseFloor,</div><div class='ctx'> 		aniState-&gt;rssiThrLow, aniState-&gt;rssiThrHigh);</div><div class='hunk'>@@ -336,8 +335,7 @@ static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel)</div><div class='ctx'> 	const struct ani_cck_level_entry *entry_cck;</div><div class='ctx'> </div><div class='ctx'> 	aniState-&gt;noiseFloor = BEACON_RSSI(ah);</div><div class='del'>-	ath_dbg(common, ATH_DBG_ANI,</div><div class='del'>-		"**** ccklevel %d=&gt;%d, rssi=%d[lo=%d hi=%d]\n",</div><div class='add'>+	ath_dbg(common, ANI, "**** ccklevel %d=&gt;%d, rssi=%d[lo=%d hi=%d]\n",</div><div class='ctx'> 		aniState-&gt;cckNoiseImmunityLevel, immunityLevel,</div><div class='ctx'> 		aniState-&gt;noiseFloor, aniState-&gt;rssiThrLow,</div><div class='ctx'> 		aniState-&gt;rssiThrHigh);</div><div class='hunk'>@@ -481,8 +479,7 @@ static void ath9k_ani_reset_old(struct ath_hw *ah, bool is_scanning)</div><div class='ctx'> </div><div class='ctx'> 	if (ah-&gt;opmode != NL80211_IFTYPE_STATION</div><div class='ctx'> 	    &amp;&amp; ah-&gt;opmode != NL80211_IFTYPE_ADHOC) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_ANI,</div><div class='del'>-			"Reset ANI state opmode %u\n", ah-&gt;opmode);</div><div class='add'>+		ath_dbg(common, ANI, "Reset ANI state opmode %u\n", ah-&gt;opmode);</div><div class='ctx'> 		ah-&gt;stats.ast_ani_reset++;</div><div class='ctx'> </div><div class='ctx'> 		if (ah-&gt;opmode == NL80211_IFTYPE_AP) {</div><div class='hunk'>@@ -582,7 +579,7 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning)</div><div class='ctx'> 		    ATH9K_ANI_OFDM_DEF_LEVEL ||</div><div class='ctx'> 		    aniState-&gt;cckNoiseImmunityLevel !=</div><div class='ctx'> 		    ATH9K_ANI_CCK_DEF_LEVEL) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+			ath_dbg(common, ANI,</div><div class='ctx'> 				"Restore defaults: opmode %u chan %d Mhz/0x%x is_scanning=%d ofdm:%d cck:%d\n",</div><div class='ctx'> 				ah-&gt;opmode,</div><div class='ctx'> 				chan-&gt;channel,</div><div class='hunk'>@@ -599,7 +596,7 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * restore historical levels for this channel</div><div class='ctx'> 		 */</div><div class='del'>-		ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+		ath_dbg(common, ANI,</div><div class='ctx'> 			"Restore history: opmode %u chan %d Mhz/0x%x is_scanning=%d ofdm:%d cck:%d\n",</div><div class='ctx'> 			ah-&gt;opmode,</div><div class='ctx'> 			chan-&gt;channel,</div><div class='hunk'>@@ -662,7 +659,7 @@ static bool ath9k_hw_ani_read_counters(struct ath_hw *ah)</div><div class='ctx'> </div><div class='ctx'> 	if (!use_new_ani(ah) &amp;&amp; (phyCnt1 &lt; ofdm_base || phyCnt2 &lt; cck_base)) {</div><div class='ctx'> 		if (phyCnt1 &lt; ofdm_base) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+			ath_dbg(common, ANI,</div><div class='ctx'> 				"phyCnt1 0x%x, resetting counter value to 0x%x\n",</div><div class='ctx'> 				phyCnt1, ofdm_base);</div><div class='ctx'> 			REG_WRITE(ah, AR_PHY_ERR_1, ofdm_base);</div><div class='hunk'>@@ -670,7 +667,7 @@ static bool ath9k_hw_ani_read_counters(struct ath_hw *ah)</div><div class='ctx'> 				  AR_PHY_ERR_OFDM_TIMING);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (phyCnt2 &lt; cck_base) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+			ath_dbg(common, ANI,</div><div class='ctx'> 				"phyCnt2 0x%x, resetting counter value to 0x%x\n",</div><div class='ctx'> 				phyCnt2, cck_base);</div><div class='ctx'> 			REG_WRITE(ah, AR_PHY_ERR_2, cck_base);</div><div class='hunk'>@@ -713,7 +710,7 @@ void ath9k_hw_ani_monitor(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 	cckPhyErrRate =  aniState-&gt;cckPhyErrCount * 1000 /</div><div class='ctx'> 			 aniState-&gt;listenTime;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+	ath_dbg(common, ANI,</div><div class='ctx'> 		"listenTime=%d OFDM:%d errs=%d/s CCK:%d errs=%d/s ofdm_turn=%d\n",</div><div class='ctx'> 		aniState-&gt;listenTime,</div><div class='ctx'> 		aniState-&gt;ofdmNoiseImmunityLevel,</div><div class='hunk'>@@ -748,7 +745,7 @@ void ath9k_enable_mib_counters(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_ANI, "Enable MIB counters\n");</div><div class='add'>+	ath_dbg(common, ANI, "Enable MIB counters\n");</div><div class='ctx'> </div><div class='ctx'> 	ath9k_hw_update_mibstats(ah, &amp;ah-&gt;ah_mibStats);</div><div class='ctx'> </div><div class='hunk'>@@ -770,7 +767,7 @@ void ath9k_hw_disable_mib_counters(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_ANI, "Disable MIB counters\n");</div><div class='add'>+	ath_dbg(common, ANI, "Disable MIB counters\n");</div><div class='ctx'> </div><div class='ctx'> 	REG_WRITE(ah, AR_MIBC, AR_MIBC_FMC);</div><div class='ctx'> 	ath9k_hw_update_mibstats(ah, &amp;ah-&gt;ah_mibStats);</div><div class='hunk'>@@ -845,7 +842,7 @@ void ath9k_hw_ani_init(struct ath_hw *ah)</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_ANI, "Initialize ANI\n");</div><div class='add'>+	ath_dbg(common, ANI, "Initialize ANI\n");</div><div class='ctx'> </div><div class='ctx'> 	if (use_new_ani(ah)) {</div><div class='ctx'> 		ah-&gt;config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH_NEW;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c<br/>index f199e9e25149..f901a17f76ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar5008_phy.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar5008_phy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar5008_phy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/ar5008_phy.c</a></div><div class='hunk'>@@ -158,7 +158,7 @@ static void ar5008_hw_force_bias(struct ath_hw *ah, u16 synth_freq)</div><div class='ctx'> 	/* pre-reverse this field */</div><div class='ctx'> 	tmp_reg = ath9k_hw_reverse_bits(new_bias, 3);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG, "Force rf_pwd_icsyndiv to %1d on %4d\n",</div><div class='add'>+	ath_dbg(common, CONFIG, "Force rf_pwd_icsyndiv to %1d on %4d\n",</div><div class='ctx'> 		new_bias, synth_freq);</div><div class='ctx'> </div><div class='ctx'> 	/* swizzle rf_pwd_icsyndiv */</div><div class='hunk'>@@ -1053,8 +1053,7 @@ static bool ar5008_hw_ani_control_old(struct ath_hw *ah,</div><div class='ctx'> 		u32 level = param;</div><div class='ctx'> </div><div class='ctx'> 		if (level &gt;= ARRAY_SIZE(ah-&gt;totalSizeDesired)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='del'>-				"level out of range (%u &gt; %zu)\n",</div><div class='add'>+			ath_dbg(common, ANI, "level out of range (%u &gt; %zu)\n",</div><div class='ctx'> 				level, ARRAY_SIZE(ah-&gt;totalSizeDesired));</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1157,8 +1156,7 @@ static bool ar5008_hw_ani_control_old(struct ath_hw *ah,</div><div class='ctx'> 		u32 level = param;</div><div class='ctx'> </div><div class='ctx'> 		if (level &gt;= ARRAY_SIZE(firstep)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='del'>-				"level out of range (%u &gt; %zu)\n",</div><div class='add'>+			ath_dbg(common, ANI, "level out of range (%u &gt; %zu)\n",</div><div class='ctx'> 				level, ARRAY_SIZE(firstep));</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1177,8 +1175,7 @@ static bool ar5008_hw_ani_control_old(struct ath_hw *ah,</div><div class='ctx'> 		u32 level = param;</div><div class='ctx'> </div><div class='ctx'> 		if (level &gt;= ARRAY_SIZE(cycpwrThr1)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='del'>-				"level out of range (%u &gt; %zu)\n",</div><div class='add'>+			ath_dbg(common, ANI, "level out of range (%u &gt; %zu)\n",</div><div class='ctx'> 				level, ARRAY_SIZE(cycpwrThr1));</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1195,23 +1192,22 @@ static bool ar5008_hw_ani_control_old(struct ath_hw *ah,</div><div class='ctx'> 	case ATH9K_ANI_PRESENT:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ath_dbg(common, ATH_DBG_ANI, "invalid cmd %u\n", cmd);</div><div class='add'>+		ath_dbg(common, ANI, "invalid cmd %u\n", cmd);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_ANI, "ANI parameters:\n");</div><div class='del'>-	ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+	ath_dbg(common, ANI, "ANI parameters:\n");</div><div class='add'>+	ath_dbg(common, ANI,</div><div class='ctx'> 		"noiseImmunityLevel=%d, spurImmunityLevel=%d, ofdmWeakSigDetectOff=%d\n",</div><div class='ctx'> 		aniState-&gt;noiseImmunityLevel,</div><div class='ctx'> 		aniState-&gt;spurImmunityLevel,</div><div class='ctx'> 		!aniState-&gt;ofdmWeakSigDetectOff);</div><div class='del'>-	ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+	ath_dbg(common, ANI,</div><div class='ctx'> 		"cckWeakSigThreshold=%d, firstepLevel=%d, listenTime=%d\n",</div><div class='ctx'> 		aniState-&gt;cckWeakSigThreshold,</div><div class='ctx'> 		aniState-&gt;firstepLevel,</div><div class='ctx'> 		aniState-&gt;listenTime);</div><div class='del'>-	ath_dbg(common, ATH_DBG_ANI,</div><div class='del'>-		"ofdmPhyErrCount=%d, cckPhyErrCount=%d\n\n",</div><div class='add'>+	ath_dbg(common, ANI, "ofdmPhyErrCount=%d, cckPhyErrCount=%d\n\n",</div><div class='ctx'> 		aniState-&gt;ofdmPhyErrCount,</div><div class='ctx'> 		aniState-&gt;cckPhyErrCount);</div><div class='ctx'> </div><div class='hunk'>@@ -1295,7 +1291,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,</div><div class='ctx'> 				    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);</div><div class='ctx'> </div><div class='ctx'> 		if (!on != aniState-&gt;ofdmWeakSigDetectOff) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+			ath_dbg(common, ANI,</div><div class='ctx'> 				"** ch %d: ofdm weak signal: %s=&gt;%s\n",</div><div class='ctx'> 				chan-&gt;channel,</div><div class='ctx'> 				!aniState-&gt;ofdmWeakSigDetectOff ?</div><div class='hunk'>@@ -1313,7 +1309,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,</div><div class='ctx'> 		u32 level = param;</div><div class='ctx'> </div><div class='ctx'> 		if (level &gt;= ARRAY_SIZE(firstep_table)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+			ath_dbg(common, ANI,</div><div class='ctx'> 				"ATH9K_ANI_FIRSTEP_LEVEL: level out of range (%u &gt; %zu)\n",</div><div class='ctx'> 				level, ARRAY_SIZE(firstep_table));</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -1350,7 +1346,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,</div><div class='ctx'> 			      AR_PHY_FIND_SIG_FIRSTEP_LOW, value2);</div><div class='ctx'> </div><div class='ctx'> 		if (level != aniState-&gt;firstepLevel) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+			ath_dbg(common, ANI,</div><div class='ctx'> 				"** ch %d: level %d=&gt;%d[def:%d] firstep[level]=%d ini=%d\n",</div><div class='ctx'> 				chan-&gt;channel,</div><div class='ctx'> 				aniState-&gt;firstepLevel,</div><div class='hunk'>@@ -1358,7 +1354,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,</div><div class='ctx'> 				ATH9K_ANI_FIRSTEP_LVL_NEW,</div><div class='ctx'> 				value,</div><div class='ctx'> 				aniState-&gt;iniDef.firstep);</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+			ath_dbg(common, ANI,</div><div class='ctx'> 				"** ch %d: level %d=&gt;%d[def:%d] firstep_low[level]=%d ini=%d\n",</div><div class='ctx'> 				chan-&gt;channel,</div><div class='ctx'> 				aniState-&gt;firstepLevel,</div><div class='hunk'>@@ -1378,7 +1374,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,</div><div class='ctx'> 		u32 level = param;</div><div class='ctx'> </div><div class='ctx'> 		if (level &gt;= ARRAY_SIZE(cycpwrThr1_table)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+			ath_dbg(common, ANI,</div><div class='ctx'> 				"ATH9K_ANI_SPUR_IMMUNITY_LEVEL: level out of range (%u &gt; %zu)\n",</div><div class='ctx'> 				level, ARRAY_SIZE(cycpwrThr1_table));</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -1414,7 +1410,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,</div><div class='ctx'> 			      AR_PHY_EXT_TIMING5_CYCPWR_THR1, value2);</div><div class='ctx'> </div><div class='ctx'> 		if (level != aniState-&gt;spurImmunityLevel) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+			ath_dbg(common, ANI,</div><div class='ctx'> 				"** ch %d: level %d=&gt;%d[def:%d] cycpwrThr1[level]=%d ini=%d\n",</div><div class='ctx'> 				chan-&gt;channel,</div><div class='ctx'> 				aniState-&gt;spurImmunityLevel,</div><div class='hunk'>@@ -1422,7 +1418,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,</div><div class='ctx'> 				ATH9K_ANI_SPUR_IMMUNE_LVL_NEW,</div><div class='ctx'> 				value,</div><div class='ctx'> 				aniState-&gt;iniDef.cycpwrThr1);</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+			ath_dbg(common, ANI,</div><div class='ctx'> 				"** ch %d: level %d=&gt;%d[def:%d] cycpwrThr1Ext[level]=%d ini=%d\n",</div><div class='ctx'> 				chan-&gt;channel,</div><div class='ctx'> 				aniState-&gt;spurImmunityLevel,</div><div class='hunk'>@@ -1448,11 +1444,11 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,</div><div class='ctx'> 	case ATH9K_ANI_PRESENT:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ath_dbg(common, ATH_DBG_ANI, "invalid cmd %u\n", cmd);</div><div class='add'>+		ath_dbg(common, ANI, "invalid cmd %u\n", cmd);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+	ath_dbg(common, ANI,</div><div class='ctx'> 		"ANI parameters: SI=%d, ofdmWS=%s FS=%d MRCcck=%s listenTime=%d ofdmErrs=%d cckErrs=%d\n",</div><div class='ctx'> 		aniState-&gt;spurImmunityLevel,</div><div class='ctx'> 		!aniState-&gt;ofdmWeakSigDetectOff ? "on" : "off",</div><div class='hunk'>@@ -1506,7 +1502,7 @@ static void ar5008_hw_ani_cache_ini_regs(struct ath_hw *ah)</div><div class='ctx'> </div><div class='ctx'> 	iniDef = &amp;aniState-&gt;iniDef;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_ANI, "ver %d.%d opmode %u chan %d Mhz/0x%x\n",</div><div class='add'>+	ath_dbg(common, ANI, "ver %d.%d opmode %u chan %d Mhz/0x%x\n",</div><div class='ctx'> 		ah-&gt;hw_version.macVersion,</div><div class='ctx'> 		ah-&gt;hw_version.macRev,</div><div class='ctx'> 		ah-&gt;opmode,</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c<br/>index 88279e325dca..c55e5bbafc46 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9002_calib.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9002_calib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9002_calib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/ar9002_calib.c</a></div><div class='hunk'>@@ -61,18 +61,16 @@ static void ar9002_hw_setup_calibration(struct ath_hw *ah,</div><div class='ctx'> 	switch (currCal-&gt;calData-&gt;calType) {</div><div class='ctx'> 	case IQ_MISMATCH_CAL:</div><div class='ctx'> 		REG_WRITE(ah, AR_PHY_CALMODE, AR_PHY_CALMODE_IQ);</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='ctx'> 			"starting IQ Mismatch Calibration\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ADC_GAIN_CAL:</div><div class='ctx'> 		REG_WRITE(ah, AR_PHY_CALMODE, AR_PHY_CALMODE_ADC_GAIN);</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"starting ADC Gain Calibration\n");</div><div class='add'>+		ath_dbg(common, CALIBRATE, "starting ADC Gain Calibration\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ADC_DC_CAL:</div><div class='ctx'> 		REG_WRITE(ah, AR_PHY_CALMODE, AR_PHY_CALMODE_ADC_DC_PER);</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"starting ADC DC Calibration\n");</div><div class='add'>+		ath_dbg(common, CALIBRATE, "starting ADC DC Calibration\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -129,7 +127,7 @@ static void ar9002_hw_iqcal_collect(struct ath_hw *ah)</div><div class='ctx'> 			REG_READ(ah, AR_PHY_CAL_MEAS_1(i));</div><div class='ctx'> 		ah-&gt;totalIqCorrMeas[i] +=</div><div class='ctx'> 			(int32_t) REG_READ(ah, AR_PHY_CAL_MEAS_2(i));</div><div class='del'>-		ath_dbg(ath9k_hw_common(ah), ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(ath9k_hw_common(ah), CALIBRATE,</div><div class='ctx'> 			"%d: Chn %d pmi=0x%08x;pmq=0x%08x;iqcm=0x%08x;\n",</div><div class='ctx'> 			ah-&gt;cal_samples, i, ah-&gt;totalPowerMeasI[i],</div><div class='ctx'> 			ah-&gt;totalPowerMeasQ[i],</div><div class='hunk'>@@ -151,7 +149,7 @@ static void ar9002_hw_adc_gaincal_collect(struct ath_hw *ah)</div><div class='ctx'> 		ah-&gt;totalAdcQEvenPhase[i] +=</div><div class='ctx'> 			REG_READ(ah, AR_PHY_CAL_MEAS_3(i));</div><div class='ctx'> </div><div class='del'>-		ath_dbg(ath9k_hw_common(ah), ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(ath9k_hw_common(ah), CALIBRATE,</div><div class='ctx'> 			"%d: Chn %d oddi=0x%08x; eveni=0x%08x; oddq=0x%08x; evenq=0x%08x;\n",</div><div class='ctx'> 			ah-&gt;cal_samples, i,</div><div class='ctx'> 			ah-&gt;totalAdcIOddPhase[i],</div><div class='hunk'>@@ -175,7 +173,7 @@ static void ar9002_hw_adc_dccal_collect(struct ath_hw *ah)</div><div class='ctx'> 		ah-&gt;totalAdcDcOffsetQEvenPhase[i] +=</div><div class='ctx'> 			(int32_t) REG_READ(ah, AR_PHY_CAL_MEAS_3(i));</div><div class='ctx'> </div><div class='del'>-		ath_dbg(ath9k_hw_common(ah), ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(ath9k_hw_common(ah), CALIBRATE,</div><div class='ctx'> 			"%d: Chn %d oddi=0x%08x; eveni=0x%08x; oddq=0x%08x; evenq=0x%08x;\n",</div><div class='ctx'> 			ah-&gt;cal_samples, i,</div><div class='ctx'> 			ah-&gt;totalAdcDcOffsetIOddPhase[i],</div><div class='hunk'>@@ -198,12 +196,12 @@ static void ar9002_hw_iqcalibrate(struct ath_hw *ah, u8 numChains)</div><div class='ctx'> 		powerMeasQ = ah-&gt;totalPowerMeasQ[i];</div><div class='ctx'> 		iqCorrMeas = ah-&gt;totalIqCorrMeas[i];</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='ctx'> 			"Starting IQ Cal and Correction for Chain %d\n",</div><div class='ctx'> 			i);</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Orignal: Chn %diq_corr_meas = 0x%08x\n",</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='add'>+			"Original: Chn %d iq_corr_meas = 0x%08x\n",</div><div class='ctx'> 			i, ah-&gt;totalIqCorrMeas[i]);</div><div class='ctx'> </div><div class='ctx'> 		iqCorrNeg = 0;</div><div class='hunk'>@@ -213,12 +211,11 @@ static void ar9002_hw_iqcalibrate(struct ath_hw *ah, u8 numChains)</div><div class='ctx'> 			iqCorrNeg = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Chn %d pwr_meas_i = 0x%08x\n", i, powerMeasI);</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Chn %d pwr_meas_q = 0x%08x\n", i, powerMeasQ);</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE, "iqCorrNeg is 0x%08x\n",</div><div class='del'>-			iqCorrNeg);</div><div class='add'>+		ath_dbg(common, CALIBRATE, "Chn %d pwr_meas_i = 0x%08x\n",</div><div class='add'>+			i, powerMeasI);</div><div class='add'>+		ath_dbg(common, CALIBRATE, "Chn %d pwr_meas_q = 0x%08x\n",</div><div class='add'>+			i, powerMeasQ);</div><div class='add'>+		ath_dbg(common, CALIBRATE, "iqCorrNeg is 0x%08x\n", iqCorrNeg);</div><div class='ctx'> </div><div class='ctx'> 		iCoffDenom = (powerMeasI / 2 + powerMeasQ / 2) / 128;</div><div class='ctx'> 		qCoffDenom = powerMeasQ / 64;</div><div class='hunk'>@@ -227,13 +224,13 @@ static void ar9002_hw_iqcalibrate(struct ath_hw *ah, u8 numChains)</div><div class='ctx'> 		    (qCoffDenom != 0)) {</div><div class='ctx'> 			iCoff = iqCorrMeas / iCoffDenom;</div><div class='ctx'> 			qCoff = powerMeasI / qCoffDenom - 64;</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-				"Chn %d iCoff = 0x%08x\n", i, iCoff);</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-				"Chn %d qCoff = 0x%08x\n", i, qCoff);</div><div class='add'>+			ath_dbg(common, CALIBRATE, "Chn %d iCoff = 0x%08x\n",</div><div class='add'>+				i, iCoff);</div><div class='add'>+			ath_dbg(common, CALIBRATE, "Chn %d qCoff = 0x%08x\n",</div><div class='add'>+				i, qCoff);</div><div class='ctx'> </div><div class='ctx'> 			iCoff = iCoff &amp; 0x3f;</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='ctx'> 				"New: Chn %d iCoff = 0x%08x\n", i, iCoff);</div><div class='ctx'> 			if (iqCorrNeg == 0x0)</div><div class='ctx'> 				iCoff = 0x40 - iCoff;</div><div class='hunk'>@@ -243,7 +240,7 @@ static void ar9002_hw_iqcalibrate(struct ath_hw *ah, u8 numChains)</div><div class='ctx'> 			else if (qCoff &lt;= -16)</div><div class='ctx'> 				qCoff = -16;</div><div class='ctx'> </div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='ctx'> 				"Chn %d : iCoff = 0x%x  qCoff = 0x%x\n",</div><div class='ctx'> 				i, iCoff, qCoff);</div><div class='ctx'> </div><div class='hunk'>@@ -253,7 +250,7 @@ static void ar9002_hw_iqcalibrate(struct ath_hw *ah, u8 numChains)</div><div class='ctx'> 			REG_RMW_FIELD(ah, AR_PHY_TIMING_CTRL4(i),</div><div class='ctx'> 				      AR_PHY_TIMING_CTRL4_IQCORR_Q_Q_COFF,</div><div class='ctx'> 				      qCoff);</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='ctx'> 				"IQ Cal and Correction done for Chain %d\n",</div><div class='ctx'> 				i);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -275,21 +272,17 @@ static void ar9002_hw_adc_gaincal_calibrate(struct ath_hw *ah, u8 numChains)</div><div class='ctx'> 		qOddMeasOffset = ah-&gt;totalAdcQOddPhase[i];</div><div class='ctx'> 		qEvenMeasOffset = ah-&gt;totalAdcQEvenPhase[i];</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='ctx'> 			"Starting ADC Gain Cal for Chain %d\n", i);</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Chn %d pwr_meas_odd_i = 0x%08x\n", i,</div><div class='del'>-			iOddMeasOffset);</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Chn %d pwr_meas_even_i = 0x%08x\n", i,</div><div class='del'>-			iEvenMeasOffset);</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Chn %d pwr_meas_odd_q = 0x%08x\n", i,</div><div class='del'>-			qOddMeasOffset);</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Chn %d pwr_meas_even_q = 0x%08x\n", i,</div><div class='del'>-			qEvenMeasOffset);</div><div class='add'>+		ath_dbg(common, CALIBRATE, "Chn %d pwr_meas_odd_i = 0x%08x\n",</div><div class='add'>+			i, iOddMeasOffset);</div><div class='add'>+		ath_dbg(common, CALIBRATE, "Chn %d pwr_meas_even_i = 0x%08x\n",</div><div class='add'>+			i, iEvenMeasOffset);</div><div class='add'>+		ath_dbg(common, CALIBRATE, "Chn %d pwr_meas_odd_q = 0x%08x\n",</div><div class='add'>+			i, qOddMeasOffset);</div><div class='add'>+		ath_dbg(common, CALIBRATE, "Chn %d pwr_meas_even_q = 0x%08x\n",</div><div class='add'>+			i, qEvenMeasOffset);</div><div class='ctx'> </div><div class='ctx'> 		if (iOddMeasOffset != 0 &amp;&amp; qEvenMeasOffset != 0) {</div><div class='ctx'> 			iGainMismatch =</div><div class='hunk'>@@ -299,19 +292,19 @@ static void ar9002_hw_adc_gaincal_calibrate(struct ath_hw *ah, u8 numChains)</div><div class='ctx'> 				((qOddMeasOffset * 32) /</div><div class='ctx'> 				 qEvenMeasOffset) &amp; 0x3f;</div><div class='ctx'> </div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-				"Chn %d gain_mismatch_i = 0x%08x\n", i,</div><div class='del'>-				iGainMismatch);</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-				"Chn %d gain_mismatch_q = 0x%08x\n", i,</div><div class='del'>-				qGainMismatch);</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='add'>+				"Chn %d gain_mismatch_i = 0x%08x\n",</div><div class='add'>+				i, iGainMismatch);</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='add'>+				"Chn %d gain_mismatch_q = 0x%08x\n",</div><div class='add'>+				i, qGainMismatch);</div><div class='ctx'> </div><div class='ctx'> 			val = REG_READ(ah, AR_PHY_NEW_ADC_DC_GAIN_CORR(i));</div><div class='ctx'> 			val &amp;= 0xfffff000;</div><div class='ctx'> 			val |= (qGainMismatch) | (iGainMismatch &lt;&lt; 6);</div><div class='ctx'> 			REG_WRITE(ah, AR_PHY_NEW_ADC_DC_GAIN_CORR(i), val);</div><div class='ctx'> </div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='ctx'> 				"ADC Gain Cal done for Chain %d\n", i);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -337,40 +330,36 @@ static void ar9002_hw_adc_dccal_calibrate(struct ath_hw *ah, u8 numChains)</div><div class='ctx'> 		qOddMeasOffset = ah-&gt;totalAdcDcOffsetQOddPhase[i];</div><div class='ctx'> 		qEvenMeasOffset = ah-&gt;totalAdcDcOffsetQEvenPhase[i];</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='ctx'> 			"Starting ADC DC Offset Cal for Chain %d\n", i);</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Chn %d pwr_meas_odd_i = %d\n", i,</div><div class='del'>-			iOddMeasOffset);</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Chn %d pwr_meas_even_i = %d\n", i,</div><div class='del'>-			iEvenMeasOffset);</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Chn %d pwr_meas_odd_q = %d\n", i,</div><div class='del'>-			qOddMeasOffset);</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Chn %d pwr_meas_even_q = %d\n", i,</div><div class='del'>-			qEvenMeasOffset);</div><div class='add'>+		ath_dbg(common, CALIBRATE, "Chn %d pwr_meas_odd_i = %d\n",</div><div class='add'>+			i, iOddMeasOffset);</div><div class='add'>+		ath_dbg(common, CALIBRATE, "Chn %d pwr_meas_even_i = %d\n",</div><div class='add'>+			i, iEvenMeasOffset);</div><div class='add'>+		ath_dbg(common, CALIBRATE, "Chn %d pwr_meas_odd_q = %d\n",</div><div class='add'>+			i, qOddMeasOffset);</div><div class='add'>+		ath_dbg(common, CALIBRATE, "Chn %d pwr_meas_even_q = %d\n",</div><div class='add'>+			i, qEvenMeasOffset);</div><div class='ctx'> </div><div class='ctx'> 		iDcMismatch = (((iEvenMeasOffset - iOddMeasOffset) * 2) /</div><div class='ctx'> 			       numSamples) &amp; 0x1ff;</div><div class='ctx'> 		qDcMismatch = (((qOddMeasOffset - qEvenMeasOffset) * 2) /</div><div class='ctx'> 			       numSamples) &amp; 0x1ff;</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Chn %d dc_offset_mismatch_i = 0x%08x\n", i,</div><div class='del'>-			iDcMismatch);</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Chn %d dc_offset_mismatch_q = 0x%08x\n", i,</div><div class='del'>-			qDcMismatch);</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='add'>+			"Chn %d dc_offset_mismatch_i = 0x%08x\n",</div><div class='add'>+			i, iDcMismatch);</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='add'>+			"Chn %d dc_offset_mismatch_q = 0x%08x\n",</div><div class='add'>+			i, qDcMismatch);</div><div class='ctx'> </div><div class='ctx'> 		val = REG_READ(ah, AR_PHY_NEW_ADC_DC_GAIN_CORR(i));</div><div class='ctx'> 		val &amp;= 0xc0000fff;</div><div class='ctx'> 		val |= (qDcMismatch &lt;&lt; 12) | (iDcMismatch &lt;&lt; 21);</div><div class='ctx'> 		REG_WRITE(ah, AR_PHY_NEW_ADC_DC_GAIN_CORR(i), val);</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='ctx'> 			"ADC DC Offset Cal done for Chain %d\n", i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -560,7 +549,7 @@ static inline void ar9285_hw_pa_cal(struct ath_hw *ah, bool is_reset)</div><div class='ctx'> 		{ 0x7838, 0 },</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CALIBRATE, "Running PA Calibration\n");</div><div class='add'>+	ath_dbg(common, CALIBRATE, "Running PA Calibration\n");</div><div class='ctx'> </div><div class='ctx'> 	/* PA CAL is not needed for high power solution */</div><div class='ctx'> 	if (ah-&gt;eep_ops-&gt;get_eeprom(ah, EEP_TXGAIN_TYPE) ==</div><div class='hunk'>@@ -741,7 +730,7 @@ static bool ar9285_hw_cl_cal(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 		REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_CAL);</div><div class='ctx'> 		if (!ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,</div><div class='ctx'> 				  AR_PHY_AGC_CONTROL_CAL, 0, AH_WAIT_TIMEOUT)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='ctx'> 				"offset calibration failed to complete in 1ms; noisy environment?\n");</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -755,7 +744,7 @@ static bool ar9285_hw_cl_cal(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_CAL);</div><div class='ctx'> 	if (!ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_CAL,</div><div class='ctx'> 			  0, AH_WAIT_TIMEOUT)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='ctx'> 			"offset calibration failed to complete in 1ms; noisy environment?\n");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -851,7 +840,7 @@ static bool ar9002_hw_init_cal(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 		if (!ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,</div><div class='ctx'> 				   AR_PHY_AGC_CONTROL_CAL,</div><div class='ctx'> 				   0, AH_WAIT_TIMEOUT)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='ctx'> 				"offset calibration failed to complete in 1ms; noisy environment?\n");</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -886,22 +875,21 @@ static bool ar9002_hw_init_cal(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 		if (ar9002_hw_is_cal_supported(ah, chan, ADC_GAIN_CAL)) {</div><div class='ctx'> 			INIT_CAL(&amp;ah-&gt;adcgain_caldata);</div><div class='ctx'> 			INSERT_CAL(ah, &amp;ah-&gt;adcgain_caldata);</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-					"enabling ADC Gain Calibration.\n");</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='add'>+					"enabling ADC Gain Calibration\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ar9002_hw_is_cal_supported(ah, chan, ADC_DC_CAL)) {</div><div class='ctx'> 			INIT_CAL(&amp;ah-&gt;adcdc_caldata);</div><div class='ctx'> 			INSERT_CAL(ah, &amp;ah-&gt;adcdc_caldata);</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-					"enabling ADC DC Calibration.\n");</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='add'>+					"enabling ADC DC Calibration\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ar9002_hw_is_cal_supported(ah, chan, IQ_MISMATCH_CAL)) {</div><div class='ctx'> 			INIT_CAL(&amp;ah-&gt;iq_caldata);</div><div class='ctx'> 			INSERT_CAL(ah, &amp;ah-&gt;iq_caldata);</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-					"enabling IQ Calibration.\n");</div><div class='add'>+			ath_dbg(common, CALIBRATE, "enabling IQ Calibration\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ah-&gt;cal_list_curr = ah-&gt;cal_list;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c<br/>index b5920168606d..7b6417b5212e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9002_mac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9002_mac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9002_mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/ar9002_mac.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ static bool ar9002_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (isr &amp; AR_ISR_RXORN) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_INTERRUPT,</div><div class='add'>+			ath_dbg(common, INTERRUPT,</div><div class='ctx'> 				"receive FIFO overrun interrupt\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -143,24 +143,24 @@ static bool ar9002_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked)</div><div class='ctx'> </div><div class='ctx'> 		if (fatal_int) {</div><div class='ctx'> 			if (sync_cause &amp; AR_INTR_SYNC_HOST1_FATAL) {</div><div class='del'>-				ath_dbg(common, ATH_DBG_ANY,</div><div class='add'>+				ath_dbg(common, ANY,</div><div class='ctx'> 					"received PCI FATAL interrupt\n");</div><div class='ctx'> 			}</div><div class='ctx'> 			if (sync_cause &amp; AR_INTR_SYNC_HOST1_PERR) {</div><div class='del'>-				ath_dbg(common, ATH_DBG_ANY,</div><div class='add'>+				ath_dbg(common, ANY,</div><div class='ctx'> 					"received PCI PERR interrupt\n");</div><div class='ctx'> 			}</div><div class='ctx'> 			*masked |= ATH9K_INT_FATAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (sync_cause &amp; AR_INTR_SYNC_RADM_CPL_TIMEOUT) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_INTERRUPT,</div><div class='add'>+			ath_dbg(common, INTERRUPT,</div><div class='ctx'> 				"AR_INTR_SYNC_RADM_CPL_TIMEOUT\n");</div><div class='ctx'> 			REG_WRITE(ah, AR_RC, AR_RC_HOSTIF);</div><div class='ctx'> 			REG_WRITE(ah, AR_RC, 0);</div><div class='ctx'> 			*masked |= ATH9K_INT_FATAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (sync_cause &amp; AR_INTR_SYNC_LOCAL_TIMEOUT) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_INTERRUPT,</div><div class='add'>+			ath_dbg(common, INTERRUPT,</div><div class='ctx'> 				"AR_INTR_SYNC_LOCAL_TIMEOUT\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c<br/>index 12a730dcb500..8e70f0bc073e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_calib.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_calib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_calib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/ar9003_calib.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include "hw-ops.h"</div><div class='ctx'> #include "ar9003_phy.h"</div><div class='ctx'> #include "ar9003_rtt.h"</div><div class='add'>+#include "ar9003_mci.h"</div><div class='ctx'> </div><div class='ctx'> #define MAX_MEASUREMENT	MAX_IQCAL_MEASUREMENT</div><div class='ctx'> #define MAX_MAG_DELTA	11</div><div class='hunk'>@@ -51,7 +52,7 @@ static void ar9003_hw_setup_calibration(struct ath_hw *ah,</div><div class='ctx'> 		currCal-&gt;calData-&gt;calCountMax);</div><div class='ctx'> 		REG_WRITE(ah, AR_PHY_CALMODE, AR_PHY_CALMODE_IQ);</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='ctx'> 			"starting IQ Mismatch Calibration\n");</div><div class='ctx'> </div><div class='ctx'> 		/* Kick-off cal */</div><div class='hunk'>@@ -63,7 +64,7 @@ static void ar9003_hw_setup_calibration(struct ath_hw *ah,</div><div class='ctx'> 		REG_RMW_FIELD(ah, AR_PHY_65NM_CH0_THERM,</div><div class='ctx'> 			      AR_PHY_65NM_CH0_THERM_START, 1);</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='ctx'> 			"starting Temperature Compensation Calibration\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -193,7 +194,7 @@ static void ar9003_hw_iqcal_collect(struct ath_hw *ah)</div><div class='ctx'> 				REG_READ(ah, AR_PHY_CAL_MEAS_1(i));</div><div class='ctx'> 			ah-&gt;totalIqCorrMeas[i] +=</div><div class='ctx'> 				(int32_t) REG_READ(ah, AR_PHY_CAL_MEAS_2(i));</div><div class='del'>-			ath_dbg(ath9k_hw_common(ah), ATH_DBG_CALIBRATE,</div><div class='add'>+			ath_dbg(ath9k_hw_common(ah), CALIBRATE,</div><div class='ctx'> 				"%d: Chn %d pmi=0x%08x;pmq=0x%08x;iqcm=0x%08x;\n",</div><div class='ctx'> 				ah-&gt;cal_samples, i, ah-&gt;totalPowerMeasI[i],</div><div class='ctx'> 				ah-&gt;totalPowerMeasQ[i],</div><div class='hunk'>@@ -220,12 +221,11 @@ static void ar9003_hw_iqcalibrate(struct ath_hw *ah, u8 numChains)</div><div class='ctx'> 		powerMeasQ = ah-&gt;totalPowerMeasQ[i];</div><div class='ctx'> 		iqCorrMeas = ah-&gt;totalIqCorrMeas[i];</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Starting IQ Cal and Correction for Chain %d\n",</div><div class='del'>-			i);</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='add'>+			"Starting IQ Cal and Correction for Chain %d\n", i);</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Orignal: Chn %diq_corr_meas = 0x%08x\n",</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='add'>+			"Original: Chn %d iq_corr_meas = 0x%08x\n",</div><div class='ctx'> 			i, ah-&gt;totalIqCorrMeas[i]);</div><div class='ctx'> </div><div class='ctx'> 		iqCorrNeg = 0;</div><div class='hunk'>@@ -235,12 +235,11 @@ static void ar9003_hw_iqcalibrate(struct ath_hw *ah, u8 numChains)</div><div class='ctx'> 			iqCorrNeg = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Chn %d pwr_meas_i = 0x%08x\n", i, powerMeasI);</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Chn %d pwr_meas_q = 0x%08x\n", i, powerMeasQ);</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE, "iqCorrNeg is 0x%08x\n",</div><div class='del'>-			iqCorrNeg);</div><div class='add'>+		ath_dbg(common, CALIBRATE, "Chn %d pwr_meas_i = 0x%08x\n",</div><div class='add'>+			i, powerMeasI);</div><div class='add'>+		ath_dbg(common, CALIBRATE, "Chn %d pwr_meas_q = 0x%08x\n",</div><div class='add'>+			i, powerMeasQ);</div><div class='add'>+		ath_dbg(common, CALIBRATE, "iqCorrNeg is 0x%08x\n", iqCorrNeg);</div><div class='ctx'> </div><div class='ctx'> 		iCoffDenom = (powerMeasI / 2 + powerMeasQ / 2) / 256;</div><div class='ctx'> 		qCoffDenom = powerMeasQ / 64;</div><div class='hunk'>@@ -248,10 +247,10 @@ static void ar9003_hw_iqcalibrate(struct ath_hw *ah, u8 numChains)</div><div class='ctx'> 		if ((iCoffDenom != 0) &amp;&amp; (qCoffDenom != 0)) {</div><div class='ctx'> 			iCoff = iqCorrMeas / iCoffDenom;</div><div class='ctx'> 			qCoff = powerMeasI / qCoffDenom - 64;</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-				"Chn %d iCoff = 0x%08x\n", i, iCoff);</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-				"Chn %d qCoff = 0x%08x\n", i, qCoff);</div><div class='add'>+			ath_dbg(common, CALIBRATE, "Chn %d iCoff = 0x%08x\n",</div><div class='add'>+				i, iCoff);</div><div class='add'>+			ath_dbg(common, CALIBRATE, "Chn %d qCoff = 0x%08x\n",</div><div class='add'>+				i, qCoff);</div><div class='ctx'> </div><div class='ctx'> 			/* Force bounds on iCoff */</div><div class='ctx'> 			if (iCoff &gt;= 63)</div><div class='hunk'>@@ -272,10 +271,10 @@ static void ar9003_hw_iqcalibrate(struct ath_hw *ah, u8 numChains)</div><div class='ctx'> 			iCoff = iCoff &amp; 0x7f;</div><div class='ctx'> 			qCoff = qCoff &amp; 0x7f;</div><div class='ctx'> </div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='ctx'> 				"Chn %d : iCoff = 0x%x  qCoff = 0x%x\n",</div><div class='ctx'> 				i, iCoff, qCoff);</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='ctx'> 				"Register offset (0x%04x) before update = 0x%x\n",</div><div class='ctx'> 				offset_array[i],</div><div class='ctx'> 				REG_READ(ah, offset_array[i]));</div><div class='hunk'>@@ -286,25 +285,25 @@ static void ar9003_hw_iqcalibrate(struct ath_hw *ah, u8 numChains)</div><div class='ctx'> 			REG_RMW_FIELD(ah, offset_array[i],</div><div class='ctx'> 				      AR_PHY_RX_IQCAL_CORR_IQCORR_Q_Q_COFF,</div><div class='ctx'> 				      qCoff);</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='ctx'> 				"Register offset (0x%04x) QI COFF (bitfields 0x%08x) after update = 0x%x\n",</div><div class='ctx'> 				offset_array[i],</div><div class='ctx'> 				AR_PHY_RX_IQCAL_CORR_IQCORR_Q_I_COFF,</div><div class='ctx'> 				REG_READ(ah, offset_array[i]));</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='ctx'> 				"Register offset (0x%04x) QQ COFF (bitfields 0x%08x) after update = 0x%x\n",</div><div class='ctx'> 				offset_array[i],</div><div class='ctx'> 				AR_PHY_RX_IQCAL_CORR_IQCORR_Q_Q_COFF,</div><div class='ctx'> 				REG_READ(ah, offset_array[i]));</div><div class='ctx'> </div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='ctx'> 				"IQ Cal and Correction done for Chain %d\n", i);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	REG_SET_BIT(ah, AR_PHY_RX_IQCAL_CORR_B0,</div><div class='ctx'> 		    AR_PHY_RX_IQCAL_CORR_IQCORR_ENABLE);</div><div class='del'>-	ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+	ath_dbg(common, CALIBRATE,</div><div class='ctx'> 		"IQ Cal and Correction (offset 0x%04x) enabled (bit position 0x%08x). New Value 0x%08x\n",</div><div class='ctx'> 		(unsigned) (AR_PHY_RX_IQCAL_CORR_B0),</div><div class='ctx'> 		AR_PHY_RX_IQCAL_CORR_IQCORR_ENABLE,</div><div class='hunk'>@@ -348,7 +347,7 @@ static bool ar9003_hw_solve_iq_cal(struct ath_hw *ah,</div><div class='ctx'> 	f2 = (f1 * f1 + f3 * f3) / result_shift;</div><div class='ctx'> </div><div class='ctx'> 	if (!f2) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE, "Divide by 0\n");</div><div class='add'>+		ath_dbg(common, CALIBRATE, "Divide by 0\n");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -469,7 +468,7 @@ static bool ar9003_hw_calc_iq_corr(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> 	if ((i2_p_q2_a0_d0 == 0) || (i2_p_q2_a0_d1 == 0) ||</div><div class='ctx'> 	    (i2_p_q2_a1_d0 == 0) || (i2_p_q2_a1_d1 == 0)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='ctx'> 			"Divide by 0:\n"</div><div class='ctx'> 			"a0_d0=%d\n"</div><div class='ctx'> 			"a0_d1=%d\n"</div><div class='hunk'>@@ -509,8 +508,7 @@ static bool ar9003_hw_calc_iq_corr(struct ath_hw *ah,</div><div class='ctx'> 	mag2 = ar9003_hw_find_mag_approx(ah, cos_2phi_2, sin_2phi_2);</div><div class='ctx'> </div><div class='ctx'> 	if ((mag1 == 0) || (mag2 == 0)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Divide by 0: mag1=%d, mag2=%d\n",</div><div class='add'>+		ath_dbg(common, CALIBRATE, "Divide by 0: mag1=%d, mag2=%d\n",</div><div class='ctx'> 			mag1, mag2);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -528,8 +526,8 @@ static bool ar9003_hw_calc_iq_corr(struct ath_hw *ah,</div><div class='ctx'> 			     mag_a0_d0, phs_a0_d0,</div><div class='ctx'> 			     mag_a1_d0,</div><div class='ctx'> 			     phs_a1_d0, solved_eq)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Call to ar9003_hw_solve_iq_cal() failed.\n");</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='add'>+			"Call to ar9003_hw_solve_iq_cal() failed\n");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -538,12 +536,12 @@ static bool ar9003_hw_calc_iq_corr(struct ath_hw *ah,</div><div class='ctx'> 	mag_rx = solved_eq[2];</div><div class='ctx'> 	phs_rx = solved_eq[3];</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+	ath_dbg(common, CALIBRATE,</div><div class='ctx'> 		"chain %d: mag mismatch=%d phase mismatch=%d\n",</div><div class='ctx'> 		chain_idx, mag_tx/res_scale, phs_tx/res_scale);</div><div class='ctx'> </div><div class='ctx'> 	if (res_scale == mag_tx) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='ctx'> 			"Divide by 0: mag_tx=%d, res_scale=%d\n",</div><div class='ctx'> 			mag_tx, res_scale);</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -556,8 +554,7 @@ static bool ar9003_hw_calc_iq_corr(struct ath_hw *ah,</div><div class='ctx'> 	q_q_coff = (mag_corr_tx * 128 / res_scale);</div><div class='ctx'> 	q_i_coff = (phs_corr_tx * 256 / res_scale);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-		"tx chain %d: mag corr=%d  phase corr=%d\n",</div><div class='add'>+	ath_dbg(common, CALIBRATE, "tx chain %d: mag corr=%d  phase corr=%d\n",</div><div class='ctx'> 		chain_idx, q_q_coff, q_i_coff);</div><div class='ctx'> </div><div class='ctx'> 	if (q_i_coff &lt; -63)</div><div class='hunk'>@@ -571,12 +568,11 @@ static bool ar9003_hw_calc_iq_corr(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> 	iqc_coeff[0] = (q_q_coff * 128) + q_i_coff;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-		"tx chain %d: iq corr coeff=%x\n",</div><div class='add'>+	ath_dbg(common, CALIBRATE, "tx chain %d: iq corr coeff=%x\n",</div><div class='ctx'> 		chain_idx, iqc_coeff[0]);</div><div class='ctx'> </div><div class='ctx'> 	if (-mag_rx == res_scale) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='ctx'> 			"Divide by 0: mag_rx=%d, res_scale=%d\n",</div><div class='ctx'> 			mag_rx, res_scale);</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -589,8 +585,7 @@ static bool ar9003_hw_calc_iq_corr(struct ath_hw *ah,</div><div class='ctx'> 	q_q_coff = (mag_corr_rx * 128 / res_scale);</div><div class='ctx'> 	q_i_coff = (phs_corr_rx * 256 / res_scale);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-		"rx chain %d: mag corr=%d  phase corr=%d\n",</div><div class='add'>+	ath_dbg(common, CALIBRATE, "rx chain %d: mag corr=%d  phase corr=%d\n",</div><div class='ctx'> 		chain_idx, q_q_coff, q_i_coff);</div><div class='ctx'> </div><div class='ctx'> 	if (q_i_coff &lt; -63)</div><div class='hunk'>@@ -604,8 +599,7 @@ static bool ar9003_hw_calc_iq_corr(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> 	iqc_coeff[1] = (q_q_coff * 128) + q_i_coff;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-		"rx chain %d: iq corr coeff=%x\n",</div><div class='add'>+	ath_dbg(common, CALIBRATE, "rx chain %d: iq corr coeff=%x\n",</div><div class='ctx'> 		chain_idx, iqc_coeff[1]);</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -752,8 +746,7 @@ static bool ar9003_hw_tx_iq_cal_run(struct ath_hw *ah)</div><div class='ctx'> 	if (!ath9k_hw_wait(ah, AR_PHY_TX_IQCAL_START,</div><div class='ctx'> 			AR_PHY_TX_IQCAL_START_DO_CAL, 0,</div><div class='ctx'> 			AH_WAIT_TIMEOUT)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Tx IQ Cal is not completed.\n");</div><div class='add'>+		ath_dbg(common, CALIBRATE, "Tx IQ Cal is not completed\n");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -791,13 +784,13 @@ static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah, bool is_reusable)</div><div class='ctx'> 			nmeasurement = MAX_MEASUREMENT;</div><div class='ctx'> </div><div class='ctx'> 		for (im = 0; im &lt; nmeasurement; im++) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-				"Doing Tx IQ Cal for chain %d.\n", i);</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='add'>+				"Doing Tx IQ Cal for chain %d\n", i);</div><div class='ctx'> </div><div class='ctx'> 			if (REG_READ(ah, txiqcal_status[i]) &amp;</div><div class='ctx'> 					AR_PHY_TX_IQCAL_STATUS_FAILED) {</div><div class='del'>-				ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-					"Tx IQ Cal failed for chain %d.\n", i);</div><div class='add'>+				ath_dbg(common, CALIBRATE,</div><div class='add'>+					"Tx IQ Cal failed for chain %d\n", i);</div><div class='ctx'> 				goto tx_iqcal_fail;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -823,18 +816,16 @@ static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah, bool is_reusable)</div><div class='ctx'> 				iq_res[idx + 1] = 0xffff &amp; REG_READ(ah,</div><div class='ctx'> 						chan_info_tab[i] + offset);</div><div class='ctx'> </div><div class='del'>-				ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-					"IQ RES[%d]=0x%x"</div><div class='del'>-					"IQ_RES[%d]=0x%x\n",</div><div class='add'>+				ath_dbg(common, CALIBRATE,</div><div class='add'>+					"IQ_RES[%d]=0x%x IQ_RES[%d]=0x%x\n",</div><div class='ctx'> 					idx, iq_res[idx], idx + 1,</div><div class='ctx'> 					iq_res[idx + 1]);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (!ar9003_hw_calc_iq_corr(ah, i, iq_res,</div><div class='ctx'> 						coeff.iqc_coeff)) {</div><div class='del'>-				ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-					"Failed in calculation of \</div><div class='del'>-					IQ correction.\n");</div><div class='add'>+				ath_dbg(common, CALIBRATE,</div><div class='add'>+					"Failed in calculation of IQ correction\n");</div><div class='ctx'> 				goto tx_iqcal_fail;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -854,7 +845,7 @@ static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah, bool is_reusable)</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> tx_iqcal_fail:</div><div class='del'>-	ath_dbg(common, ATH_DBG_CALIBRATE, "Tx IQ Cal failed\n");</div><div class='add'>+	ath_dbg(common, CALIBRATE, "Tx IQ Cal failed\n");</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -934,10 +925,12 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> 	struct ath9k_hw_cal_data *caldata = ah-&gt;caldata;</div><div class='add'>+	struct ath9k_hw_mci *mci_hw = &amp;ah-&gt;btcoex_hw.mci;</div><div class='ctx'> 	bool txiqcal_done = false, txclcal_done = false;</div><div class='ctx'> 	bool is_reusable = true, status = true;</div><div class='ctx'> 	bool run_rtt_cal = false, run_agc_cal;</div><div class='ctx'> 	bool rtt = !!(ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_RTT);</div><div class='add'>+	bool mci = !!(ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_MCI);</div><div class='ctx'> 	u32 agc_ctrl = 0, agc_supp_cals = AR_PHY_AGC_CONTROL_OFFSET_CAL |</div><div class='ctx'> 					  AR_PHY_AGC_CONTROL_FLTR_CAL   |</div><div class='ctx'> 					  AR_PHY_AGC_CONTROL_PKDET_CAL;</div><div class='hunk'>@@ -950,7 +943,7 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,</div><div class='ctx'> 		if (!ar9003_hw_rtt_restore(ah, chan))</div><div class='ctx'> 			run_rtt_cal = true;</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE, "RTT restore %s\n",</div><div class='add'>+		ath_dbg(common, CALIBRATE, "RTT restore %s\n",</div><div class='ctx'> 			run_rtt_cal ? "failed" : "succeed");</div><div class='ctx'> 	}</div><div class='ctx'> 	run_agc_cal = run_rtt_cal;</div><div class='hunk'>@@ -1005,6 +998,31 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,</div><div class='ctx'> 	} else if (caldata &amp;&amp; !caldata-&gt;done_txiqcal_once)</div><div class='ctx'> 		run_agc_cal = true;</div><div class='ctx'> </div><div class='add'>+	if (mci &amp;&amp; IS_CHAN_2GHZ(chan) &amp;&amp;</div><div class='add'>+	    (mci_hw-&gt;bt_state  == MCI_BT_AWAKE) &amp;&amp;</div><div class='add'>+	    run_agc_cal &amp;&amp;</div><div class='add'>+	    !(mci_hw-&gt;config &amp; ATH_MCI_CONFIG_DISABLE_MCI_CAL)) {</div><div class='add'>+</div><div class='add'>+		u32 pld[4] = {0, 0, 0, 0};</div><div class='add'>+</div><div class='add'>+		/* send CAL_REQ only when BT is AWAKE. */</div><div class='add'>+		ath_dbg(common, MCI, "MCI send WLAN_CAL_REQ 0x%x\n",</div><div class='add'>+			mci_hw-&gt;wlan_cal_seq);</div><div class='add'>+		MCI_GPM_SET_CAL_TYPE(pld, MCI_GPM_WLAN_CAL_REQ);</div><div class='add'>+		pld[MCI_GPM_WLAN_CAL_W_SEQUENCE] = mci_hw-&gt;wlan_cal_seq++;</div><div class='add'>+		ar9003_mci_send_message(ah, MCI_GPM, 0, pld, 16, true, false);</div><div class='add'>+</div><div class='add'>+		/* Wait BT_CAL_GRANT for 50ms */</div><div class='add'>+		ath_dbg(common, MCI, "MCI wait for BT_CAL_GRANT\n");</div><div class='add'>+</div><div class='add'>+		if (ar9003_mci_wait_for_gpm(ah, MCI_GPM_BT_CAL_GRANT, 0, 50000))</div><div class='add'>+			ath_dbg(common, MCI, "MCI got BT_CAL_GRANT\n");</div><div class='add'>+		else {</div><div class='add'>+			is_reusable = false;</div><div class='add'>+			ath_dbg(common, MCI, "\nMCI BT is not responding\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	txiqcal_done = ar9003_hw_tx_iq_cal_run(ah);</div><div class='ctx'> 	REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);</div><div class='ctx'> 	udelay(5);</div><div class='hunk'>@@ -1022,6 +1040,21 @@ skip_tx_iqcal:</div><div class='ctx'> 				       AR_PHY_AGC_CONTROL_CAL,</div><div class='ctx'> 				       0, AH_WAIT_TIMEOUT);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (mci &amp;&amp; IS_CHAN_2GHZ(chan) &amp;&amp;</div><div class='add'>+	    (mci_hw-&gt;bt_state  == MCI_BT_AWAKE)	&amp;&amp;</div><div class='add'>+	    run_agc_cal	&amp;&amp;</div><div class='add'>+	    !(mci_hw-&gt;config &amp; ATH_MCI_CONFIG_DISABLE_MCI_CAL)) {</div><div class='add'>+</div><div class='add'>+		u32 pld[4] = {0, 0, 0, 0};</div><div class='add'>+</div><div class='add'>+		ath_dbg(common, MCI, "MCI Send WLAN_CAL_DONE 0x%x\n",</div><div class='add'>+			mci_hw-&gt;wlan_cal_done);</div><div class='add'>+		MCI_GPM_SET_CAL_TYPE(pld, MCI_GPM_WLAN_CAL_DONE);</div><div class='add'>+		pld[MCI_GPM_WLAN_CAL_W_SEQUENCE] = mci_hw-&gt;wlan_cal_done++;</div><div class='add'>+		ar9003_mci_send_message(ah, MCI_GPM, 0, pld, 16, true, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (rtt &amp;&amp; !run_rtt_cal) {</div><div class='ctx'> 		agc_ctrl |= agc_supp_cals;</div><div class='ctx'> 		REG_WRITE(ah, AR_PHY_AGC_CONTROL, agc_ctrl);</div><div class='hunk'>@@ -1031,9 +1064,8 @@ skip_tx_iqcal:</div><div class='ctx'> 		if (run_rtt_cal)</div><div class='ctx'> 			ar9003_hw_rtt_disable(ah);</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"offset calibration failed to complete in 1ms;"</div><div class='del'>-			"noisy environment?\n");</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='add'>+			"offset calibration failed to complete in 1ms; noisy environment?\n");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1092,15 +1124,14 @@ skip_tx_iqcal:</div><div class='ctx'> 	if (ah-&gt;supp_cals &amp; IQ_MISMATCH_CAL) {</div><div class='ctx'> 		INIT_CAL(&amp;ah-&gt;iq_caldata);</div><div class='ctx'> 		INSERT_CAL(ah, &amp;ah-&gt;iq_caldata);</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"enabling IQ Calibration.\n");</div><div class='add'>+		ath_dbg(common, CALIBRATE, "enabling IQ Calibration\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ah-&gt;supp_cals &amp; TEMP_COMP_CAL) {</div><div class='ctx'> 		INIT_CAL(&amp;ah-&gt;tempCompCalData);</div><div class='ctx'> 		INSERT_CAL(ah, &amp;ah-&gt;tempCompCalData);</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"enabling Temperature Compensation Calibration.\n");</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='add'>+			"enabling Temperature Compensation Calibration\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize current pointer to first element in list */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c<br/>index 3b262ba6b172..9fbcbddea165 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_eeprom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/ar9003_eeprom.c</a></div><div class='hunk'>@@ -121,10 +121,8 @@ static const struct ar9300_eeprom ar9300_default = {</div><div class='ctx'> 		 * if the register is per chain</div><div class='ctx'> 		 */</div><div class='ctx'> 		.noiseFloorThreshCh = {-1, 0, 0},</div><div class='del'>-		.ob = {1, 1, 1},/* 3 chain */</div><div class='del'>-		.db_stage2 = {1, 1, 1}, /* 3 chain  */</div><div class='del'>-		.db_stage3 = {0, 0, 0},</div><div class='del'>-		.db_stage4 = {0, 0, 0},</div><div class='add'>+		.reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},</div><div class='add'>+		.quick_drop = 0,</div><div class='ctx'> 		.xpaBiasLvl = 0,</div><div class='ctx'> 		.txFrameToDataStart = 0x0e,</div><div class='ctx'> 		.txFrameToPaOn = 0x0e,</div><div class='hunk'>@@ -144,7 +142,7 @@ static const struct ar9300_eeprom ar9300_default = {</div><div class='ctx'> 	 },</div><div class='ctx'> 	.base_ext1 = {</div><div class='ctx'> 		.ant_div_control = 0,</div><div class='del'>-		.future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}</div><div class='add'>+		.future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}</div><div class='ctx'> 	},</div><div class='ctx'> 	.calFreqPier2G = {</div><div class='ctx'> 		FREQ2FBIN(2412, 1),</div><div class='hunk'>@@ -323,10 +321,8 @@ static const struct ar9300_eeprom ar9300_default = {</div><div class='ctx'> 		.spurChans = {0, 0, 0, 0, 0},</div><div class='ctx'> 		/* noiseFloorThreshCh Check if the register is per chain */</div><div class='ctx'> 		.noiseFloorThreshCh = {-1, 0, 0},</div><div class='del'>-		.ob = {3, 3, 3}, /* 3 chain */</div><div class='del'>-		.db_stage2 = {3, 3, 3}, /* 3 chain */</div><div class='del'>-		.db_stage3 = {3, 3, 3}, /* doesn't exist for 2G */</div><div class='del'>-		.db_stage4 = {3, 3, 3},	 /* don't exist for 2G */</div><div class='add'>+		.reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},</div><div class='add'>+		.quick_drop = 0,</div><div class='ctx'> 		.xpaBiasLvl = 0,</div><div class='ctx'> 		.txFrameToDataStart = 0x0e,</div><div class='ctx'> 		.txFrameToPaOn = 0x0e,</div><div class='hunk'>@@ -698,10 +694,8 @@ static const struct ar9300_eeprom ar9300_x113 = {</div><div class='ctx'> 		 * if the register is per chain</div><div class='ctx'> 		 */</div><div class='ctx'> 		.noiseFloorThreshCh = {-1, 0, 0},</div><div class='del'>-		.ob = {1, 1, 1},/* 3 chain */</div><div class='del'>-		.db_stage2 = {1, 1, 1}, /* 3 chain  */</div><div class='del'>-		.db_stage3 = {0, 0, 0},</div><div class='del'>-		.db_stage4 = {0, 0, 0},</div><div class='add'>+		.reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},</div><div class='add'>+		.quick_drop = 0,</div><div class='ctx'> 		.xpaBiasLvl = 0,</div><div class='ctx'> 		.txFrameToDataStart = 0x0e,</div><div class='ctx'> 		.txFrameToPaOn = 0x0e,</div><div class='hunk'>@@ -721,7 +715,7 @@ static const struct ar9300_eeprom ar9300_x113 = {</div><div class='ctx'> 	 },</div><div class='ctx'> 	 .base_ext1 = {</div><div class='ctx'> 		.ant_div_control = 0,</div><div class='del'>-		.future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}</div><div class='add'>+		.future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}</div><div class='ctx'> 	 },</div><div class='ctx'> 	.calFreqPier2G = {</div><div class='ctx'> 		FREQ2FBIN(2412, 1),</div><div class='hunk'>@@ -900,10 +894,8 @@ static const struct ar9300_eeprom ar9300_x113 = {</div><div class='ctx'> 		.spurChans = {FREQ2FBIN(5500, 0), 0, 0, 0, 0},</div><div class='ctx'> 		/* noiseFloorThreshCh Check if the register is per chain */</div><div class='ctx'> 		.noiseFloorThreshCh = {-1, 0, 0},</div><div class='del'>-		.ob = {3, 3, 3}, /* 3 chain */</div><div class='del'>-		.db_stage2 = {3, 3, 3}, /* 3 chain */</div><div class='del'>-		.db_stage3 = {3, 3, 3}, /* doesn't exist for 2G */</div><div class='del'>-		.db_stage4 = {3, 3, 3},	 /* don't exist for 2G */</div><div class='add'>+		.reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},</div><div class='add'>+		.quick_drop = 0,</div><div class='ctx'> 		.xpaBiasLvl = 0xf,</div><div class='ctx'> 		.txFrameToDataStart = 0x0e,</div><div class='ctx'> 		.txFrameToPaOn = 0x0e,</div><div class='hunk'>@@ -1276,10 +1268,8 @@ static const struct ar9300_eeprom ar9300_h112 = {</div><div class='ctx'> 		 * if the register is per chain</div><div class='ctx'> 		 */</div><div class='ctx'> 		.noiseFloorThreshCh = {-1, 0, 0},</div><div class='del'>-		.ob = {1, 1, 1},/* 3 chain */</div><div class='del'>-		.db_stage2 = {1, 1, 1}, /* 3 chain  */</div><div class='del'>-		.db_stage3 = {0, 0, 0},</div><div class='del'>-		.db_stage4 = {0, 0, 0},</div><div class='add'>+		.reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},</div><div class='add'>+		.quick_drop = 0,</div><div class='ctx'> 		.xpaBiasLvl = 0,</div><div class='ctx'> 		.txFrameToDataStart = 0x0e,</div><div class='ctx'> 		.txFrameToPaOn = 0x0e,</div><div class='hunk'>@@ -1291,20 +1281,20 @@ static const struct ar9300_eeprom ar9300_h112 = {</div><div class='ctx'> 		.txEndToRxOn = 0x2,</div><div class='ctx'> 		.txFrameToXpaOn = 0xe,</div><div class='ctx'> 		.thresh62 = 28,</div><div class='del'>-		.papdRateMaskHt20 = LE32(0x80c080),</div><div class='del'>-		.papdRateMaskHt40 = LE32(0x80c080),</div><div class='add'>+		.papdRateMaskHt20 = LE32(0x0c80c080),</div><div class='add'>+		.papdRateMaskHt40 = LE32(0x0080c080),</div><div class='ctx'> 		.futureModal = {</div><div class='ctx'> 			0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.base_ext1 = {</div><div class='ctx'> 		.ant_div_control = 0,</div><div class='del'>-		.future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}</div><div class='add'>+		.future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}</div><div class='ctx'> 	},</div><div class='ctx'> 	.calFreqPier2G = {</div><div class='ctx'> 		FREQ2FBIN(2412, 1),</div><div class='ctx'> 		FREQ2FBIN(2437, 1),</div><div class='del'>-		FREQ2FBIN(2472, 1),</div><div class='add'>+		FREQ2FBIN(2462, 1),</div><div class='ctx'> 	},</div><div class='ctx'> 	/* ar9300_cal_data_per_freq_op_loop 2g */</div><div class='ctx'> 	.calPierData2G = {</div><div class='hunk'>@@ -1314,7 +1304,7 @@ static const struct ar9300_eeprom ar9300_h112 = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.calTarget_freqbin_Cck = {</div><div class='ctx'> 		FREQ2FBIN(2412, 1),</div><div class='del'>-		FREQ2FBIN(2484, 1),</div><div class='add'>+		FREQ2FBIN(2472, 1),</div><div class='ctx'> 	},</div><div class='ctx'> 	.calTarget_freqbin_2G = {</div><div class='ctx'> 		FREQ2FBIN(2412, 1),</div><div class='hunk'>@@ -1478,10 +1468,8 @@ static const struct ar9300_eeprom ar9300_h112 = {</div><div class='ctx'> 		.spurChans = {0, 0, 0, 0, 0},</div><div class='ctx'> 		/* noiseFloorThreshCh Check if the register is per chain */</div><div class='ctx'> 		.noiseFloorThreshCh = {-1, 0, 0},</div><div class='del'>-		.ob = {3, 3, 3}, /* 3 chain */</div><div class='del'>-		.db_stage2 = {3, 3, 3}, /* 3 chain */</div><div class='del'>-		.db_stage3 = {3, 3, 3}, /* doesn't exist for 2G */</div><div class='del'>-		.db_stage4 = {3, 3, 3},	 /* don't exist for 2G */</div><div class='add'>+		.reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},</div><div class='add'>+		.quick_drop = 0,</div><div class='ctx'> 		.xpaBiasLvl = 0,</div><div class='ctx'> 		.txFrameToDataStart = 0x0e,</div><div class='ctx'> 		.txFrameToPaOn = 0x0e,</div><div class='hunk'>@@ -1515,7 +1503,7 @@ static const struct ar9300_eeprom ar9300_h112 = {</div><div class='ctx'> 		FREQ2FBIN(5500, 0),</div><div class='ctx'> 		FREQ2FBIN(5600, 0),</div><div class='ctx'> 		FREQ2FBIN(5700, 0),</div><div class='del'>-		FREQ2FBIN(5825, 0)</div><div class='add'>+		FREQ2FBIN(5785, 0)</div><div class='ctx'> 	},</div><div class='ctx'> 	.calPierData5G = {</div><div class='ctx'> 		{</div><div class='hunk'>@@ -1854,10 +1842,8 @@ static const struct ar9300_eeprom ar9300_x112 = {</div><div class='ctx'> 		 * if the register is per chain</div><div class='ctx'> 		 */</div><div class='ctx'> 		.noiseFloorThreshCh = {-1, 0, 0},</div><div class='del'>-		.ob = {1, 1, 1},/* 3 chain */</div><div class='del'>-		.db_stage2 = {1, 1, 1}, /* 3 chain  */</div><div class='del'>-		.db_stage3 = {0, 0, 0},</div><div class='del'>-		.db_stage4 = {0, 0, 0},</div><div class='add'>+		.reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},</div><div class='add'>+		.quick_drop = 0,</div><div class='ctx'> 		.xpaBiasLvl = 0,</div><div class='ctx'> 		.txFrameToDataStart = 0x0e,</div><div class='ctx'> 		.txFrameToPaOn = 0x0e,</div><div class='hunk'>@@ -1877,7 +1863,7 @@ static const struct ar9300_eeprom ar9300_x112 = {</div><div class='ctx'> 	},</div><div class='ctx'> 	.base_ext1 = {</div><div class='ctx'> 		.ant_div_control = 0,</div><div class='del'>-		.future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}</div><div class='add'>+		.future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}</div><div class='ctx'> 	},</div><div class='ctx'> 	.calFreqPier2G = {</div><div class='ctx'> 		FREQ2FBIN(2412, 1),</div><div class='hunk'>@@ -2056,10 +2042,8 @@ static const struct ar9300_eeprom ar9300_x112 = {</div><div class='ctx'> 		.spurChans = {0, 0, 0, 0, 0},</div><div class='ctx'> 		/* noiseFloorThreshch check if the register is per chain */</div><div class='ctx'> 		.noiseFloorThreshCh = {-1, 0, 0},</div><div class='del'>-		.ob = {3, 3, 3}, /* 3 chain */</div><div class='del'>-		.db_stage2 = {3, 3, 3}, /* 3 chain */</div><div class='del'>-		.db_stage3 = {3, 3, 3}, /* doesn't exist for 2G */</div><div class='del'>-		.db_stage4 = {3, 3, 3},	 /* don't exist for 2G */</div><div class='add'>+		.reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},</div><div class='add'>+		.quick_drop = 0,</div><div class='ctx'> 		.xpaBiasLvl = 0,</div><div class='ctx'> 		.txFrameToDataStart = 0x0e,</div><div class='ctx'> 		.txFrameToPaOn = 0x0e,</div><div class='hunk'>@@ -2431,10 +2415,8 @@ static const struct ar9300_eeprom ar9300_h116 = {</div><div class='ctx'> 		 * if the register is per chain</div><div class='ctx'> 		 */</div><div class='ctx'> 		.noiseFloorThreshCh = {-1, 0, 0},</div><div class='del'>-		.ob = {1, 1, 1},/* 3 chain */</div><div class='del'>-		.db_stage2 = {1, 1, 1}, /* 3 chain  */</div><div class='del'>-		.db_stage3 = {0, 0, 0},</div><div class='del'>-		.db_stage4 = {0, 0, 0},</div><div class='add'>+		.reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},</div><div class='add'>+		.quick_drop = 0,</div><div class='ctx'> 		.xpaBiasLvl = 0,</div><div class='ctx'> 		.txFrameToDataStart = 0x0e,</div><div class='ctx'> 		.txFrameToPaOn = 0x0e,</div><div class='hunk'>@@ -2454,12 +2436,12 @@ static const struct ar9300_eeprom ar9300_h116 = {</div><div class='ctx'> 	 },</div><div class='ctx'> 	 .base_ext1 = {</div><div class='ctx'> 		.ant_div_control = 0,</div><div class='del'>-		.future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}</div><div class='add'>+		.future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}</div><div class='ctx'> 	 },</div><div class='ctx'> 	.calFreqPier2G = {</div><div class='ctx'> 		FREQ2FBIN(2412, 1),</div><div class='ctx'> 		FREQ2FBIN(2437, 1),</div><div class='del'>-		FREQ2FBIN(2472, 1),</div><div class='add'>+		FREQ2FBIN(2462, 1),</div><div class='ctx'> 	 },</div><div class='ctx'> 	/* ar9300_cal_data_per_freq_op_loop 2g */</div><div class='ctx'> 	.calPierData2G = {</div><div class='hunk'>@@ -2633,10 +2615,8 @@ static const struct ar9300_eeprom ar9300_h116 = {</div><div class='ctx'> 		.spurChans = {0, 0, 0, 0, 0},</div><div class='ctx'> 		/* noiseFloorThreshCh Check if the register is per chain */</div><div class='ctx'> 		.noiseFloorThreshCh = {-1, 0, 0},</div><div class='del'>-		.ob = {3, 3, 3}, /* 3 chain */</div><div class='del'>-		.db_stage2 = {3, 3, 3}, /* 3 chain */</div><div class='del'>-		.db_stage3 = {3, 3, 3}, /* doesn't exist for 2G */</div><div class='del'>-		.db_stage4 = {3, 3, 3},	 /* don't exist for 2G */</div><div class='add'>+		.reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},</div><div class='add'>+		.quick_drop = 0,</div><div class='ctx'> 		.xpaBiasLvl = 0,</div><div class='ctx'> 		.txFrameToDataStart = 0x0e,</div><div class='ctx'> 		.txFrameToPaOn = 0x0e,</div><div class='hunk'>@@ -2663,7 +2643,7 @@ static const struct ar9300_eeprom ar9300_h116 = {</div><div class='ctx'> 		.xatten1MarginHigh = {0, 0, 0}</div><div class='ctx'> 	 },</div><div class='ctx'> 	.calFreqPier5G = {</div><div class='del'>-		FREQ2FBIN(5180, 0),</div><div class='add'>+		FREQ2FBIN(5160, 0),</div><div class='ctx'> 		FREQ2FBIN(5220, 0),</div><div class='ctx'> 		FREQ2FBIN(5320, 0),</div><div class='ctx'> 		FREQ2FBIN(5400, 0),</div><div class='hunk'>@@ -3023,6 +3003,8 @@ static u32 ath9k_hw_ar9300_get_eeprom(struct ath_hw *ah,</div><div class='ctx'> 		return eep-&gt;modalHeader5G.antennaGain;</div><div class='ctx'> 	case EEP_ANTENNA_GAIN_2G:</div><div class='ctx'> 		return eep-&gt;modalHeader2G.antennaGain;</div><div class='add'>+	case EEP_QUICK_DROP:</div><div class='add'>+		return pBase-&gt;miscConfiguration &amp; BIT(1);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3061,8 +3043,7 @@ static bool ar9300_read_eeprom(struct ath_hw *ah, int address, u8 *buffer,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if ((address &lt; 0) || ((address + count) / 2 &gt; AR9300_EEPROM_SIZE - 1)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-			"eeprom address not in range\n");</div><div class='add'>+		ath_dbg(common, EEPROM, "eeprom address not in range\n");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3093,8 +3074,8 @@ static bool ar9300_read_eeprom(struct ath_hw *ah, int address, u8 *buffer,</div><div class='ctx'> 	return true;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='del'>-	ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-		"unable to read eeprom region at offset %d\n", address);</div><div class='add'>+	ath_dbg(common, EEPROM, "unable to read eeprom region at offset %d\n",</div><div class='add'>+		address);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3178,13 +3159,13 @@ static bool ar9300_uncompress_block(struct ath_hw *ah,</div><div class='ctx'> 		length &amp;= 0xff;</div><div class='ctx'> </div><div class='ctx'> 		if (length &gt; 0 &amp;&amp; spot &gt;= 0 &amp;&amp; spot+length &lt;= mdataSize) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+			ath_dbg(common, EEPROM,</div><div class='ctx'> 				"Restore at %d: spot=%d offset=%d length=%d\n",</div><div class='ctx'> 				it, spot, offset, length);</div><div class='ctx'> 			memcpy(&amp;mptr[spot], &amp;block[it+2], length);</div><div class='ctx'> 			spot += length;</div><div class='ctx'> 		} else if (length &gt; 0) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+			ath_dbg(common, EEPROM,</div><div class='ctx'> 				"Bad restore at %d: spot=%d offset=%d length=%d\n",</div><div class='ctx'> 				it, spot, offset, length);</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -3206,13 +3187,13 @@ static int ar9300_compress_decision(struct ath_hw *ah,</div><div class='ctx'> 	switch (code) {</div><div class='ctx'> 	case _CompressNone:</div><div class='ctx'> 		if (length != mdata_size) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+			ath_dbg(common, EEPROM,</div><div class='ctx'> 				"EEPROM structure size mismatch memory=%d eeprom=%d\n",</div><div class='ctx'> 				mdata_size, length);</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 		memcpy(mptr, (u8 *) (word + COMP_HDR_LEN), length);</div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+		ath_dbg(common, EEPROM,</div><div class='ctx'> 			"restored eeprom %d: uncompressed, length %d\n",</div><div class='ctx'> 			it, length);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -3221,22 +3202,21 @@ static int ar9300_compress_decision(struct ath_hw *ah,</div><div class='ctx'> 		} else {</div><div class='ctx'> 			eep = ar9003_eeprom_struct_find_by_id(reference);</div><div class='ctx'> 			if (eep == NULL) {</div><div class='del'>-				ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+				ath_dbg(common, EEPROM,</div><div class='ctx'> 					"can't find reference eeprom struct %d\n",</div><div class='ctx'> 					reference);</div><div class='ctx'> 				return -1;</div><div class='ctx'> 			}</div><div class='ctx'> 			memcpy(mptr, eep, mdata_size);</div><div class='ctx'> 		}</div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+		ath_dbg(common, EEPROM,</div><div class='ctx'> 			"restore eeprom %d: block, reference %d, length %d\n",</div><div class='ctx'> 			it, reference, length);</div><div class='ctx'> 		ar9300_uncompress_block(ah, mptr, mdata_size,</div><div class='ctx'> 					(u8 *) (word + COMP_HDR_LEN), length);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-			"unknown compression code %d\n", code);</div><div class='add'>+		ath_dbg(common, EEPROM, "unknown compression code %d\n", code);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3312,34 +3292,32 @@ static int ar9300_eeprom_restore_internal(struct ath_hw *ah,</div><div class='ctx'> 		cptr = AR9300_BASE_ADDR_512;</div><div class='ctx'> 	else</div><div class='ctx'> 		cptr = AR9300_BASE_ADDR;</div><div class='del'>-	ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-		"Trying EEPROM access at Address 0x%04x\n", cptr);</div><div class='add'>+	ath_dbg(common, EEPROM, "Trying EEPROM access at Address 0x%04x\n",</div><div class='add'>+		cptr);</div><div class='ctx'> 	if (ar9300_check_eeprom_header(ah, read, cptr))</div><div class='ctx'> 		goto found;</div><div class='ctx'> </div><div class='ctx'> 	cptr = AR9300_BASE_ADDR_512;</div><div class='del'>-	ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-		"Trying EEPROM access at Address 0x%04x\n", cptr);</div><div class='add'>+	ath_dbg(common, EEPROM, "Trying EEPROM access at Address 0x%04x\n",</div><div class='add'>+		cptr);</div><div class='ctx'> 	if (ar9300_check_eeprom_header(ah, read, cptr))</div><div class='ctx'> 		goto found;</div><div class='ctx'> </div><div class='ctx'> 	read = ar9300_read_otp;</div><div class='ctx'> 	cptr = AR9300_BASE_ADDR;</div><div class='del'>-	ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-		"Trying OTP access at Address 0x%04x\n", cptr);</div><div class='add'>+	ath_dbg(common, EEPROM, "Trying OTP access at Address 0x%04x\n", cptr);</div><div class='ctx'> 	if (ar9300_check_eeprom_header(ah, read, cptr))</div><div class='ctx'> 		goto found;</div><div class='ctx'> </div><div class='ctx'> 	cptr = AR9300_BASE_ADDR_512;</div><div class='del'>-	ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-		"Trying OTP access at Address 0x%04x\n", cptr);</div><div class='add'>+	ath_dbg(common, EEPROM, "Trying OTP access at Address 0x%04x\n", cptr);</div><div class='ctx'> 	if (ar9300_check_eeprom_header(ah, read, cptr))</div><div class='ctx'> 		goto found;</div><div class='ctx'> </div><div class='ctx'> 	goto fail;</div><div class='ctx'> </div><div class='ctx'> found:</div><div class='del'>-	ath_dbg(common, ATH_DBG_EEPROM, "Found valid EEPROM data\n");</div><div class='add'>+	ath_dbg(common, EEPROM, "Found valid EEPROM data\n");</div><div class='ctx'> </div><div class='ctx'> 	for (it = 0; it &lt; MSTATE; it++) {</div><div class='ctx'> 		if (!read(ah, cptr, word, COMP_HDR_LEN))</div><div class='hunk'>@@ -3350,13 +3328,12 @@ found:</div><div class='ctx'> </div><div class='ctx'> 		ar9300_comp_hdr_unpack(word, &amp;code, &amp;reference,</div><div class='ctx'> 				       &amp;length, &amp;major, &amp;minor);</div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+		ath_dbg(common, EEPROM,</div><div class='ctx'> 			"Found block at %x: code=%d ref=%d length=%d major=%d minor=%d\n",</div><div class='ctx'> 			cptr, code, reference, length, major, minor);</div><div class='ctx'> 		if ((!AR_SREV_9485(ah) &amp;&amp; length &gt;= 1024) ||</div><div class='ctx'> 		    (AR_SREV_9485(ah) &amp;&amp; length &gt; EEPROM_DATA_LEN_9485)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-				"Skipping bad header\n");</div><div class='add'>+			ath_dbg(common, EEPROM, "Skipping bad header\n");</div><div class='ctx'> 			cptr -= COMP_HDR_LEN;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3365,13 +3342,13 @@ found:</div><div class='ctx'> 		read(ah, cptr, word, COMP_HDR_LEN + osize + COMP_CKSUM_LEN);</div><div class='ctx'> 		checksum = ar9300_comp_cksum(&amp;word[COMP_HDR_LEN], length);</div><div class='ctx'> 		mchecksum = get_unaligned_le16(&amp;word[COMP_HDR_LEN + osize]);</div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-			"checksum %x %x\n", checksum, mchecksum);</div><div class='add'>+		ath_dbg(common, EEPROM, "checksum %x %x\n",</div><div class='add'>+			checksum, mchecksum);</div><div class='ctx'> 		if (checksum == mchecksum) {</div><div class='ctx'> 			ar9300_compress_decision(ah, it, code, reference, mptr,</div><div class='ctx'> 						 word, length, mdata_size);</div><div class='ctx'> 		} else {</div><div class='del'>-			ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+			ath_dbg(common, EEPROM,</div><div class='ctx'> 				"skipping block with bad checksum\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		cptr -= (COMP_HDR_LEN + osize + COMP_CKSUM_LEN);</div><div class='hunk'>@@ -3428,25 +3405,14 @@ static u32 ar9003_dump_modal_eeprom(char *buf, u32 len, u32 size,</div><div class='ctx'> 	PR_EEP("Chain0 NF Threshold", modal_hdr-&gt;noiseFloorThreshCh[0]);</div><div class='ctx'> 	PR_EEP("Chain1 NF Threshold", modal_hdr-&gt;noiseFloorThreshCh[1]);</div><div class='ctx'> 	PR_EEP("Chain2 NF Threshold", modal_hdr-&gt;noiseFloorThreshCh[2]);</div><div class='add'>+	PR_EEP("Quick Drop", modal_hdr-&gt;quick_drop);</div><div class='add'>+	PR_EEP("txEndToXpaOff", modal_hdr-&gt;txEndToXpaOff);</div><div class='ctx'> 	PR_EEP("xPA Bias Level", modal_hdr-&gt;xpaBiasLvl);</div><div class='ctx'> 	PR_EEP("txFrameToDataStart", modal_hdr-&gt;txFrameToDataStart);</div><div class='ctx'> 	PR_EEP("txFrameToPaOn", modal_hdr-&gt;txFrameToPaOn);</div><div class='ctx'> 	PR_EEP("txFrameToXpaOn", modal_hdr-&gt;txFrameToXpaOn);</div><div class='ctx'> 	PR_EEP("txClip", modal_hdr-&gt;txClip);</div><div class='ctx'> 	PR_EEP("ADC Desired size", modal_hdr-&gt;adcDesiredSize);</div><div class='del'>-	PR_EEP("Chain0 ob", modal_hdr-&gt;ob[0]);</div><div class='del'>-	PR_EEP("Chain1 ob", modal_hdr-&gt;ob[1]);</div><div class='del'>-	PR_EEP("Chain2 ob", modal_hdr-&gt;ob[2]);</div><div class='del'>-</div><div class='del'>-	PR_EEP("Chain0 db_stage2", modal_hdr-&gt;db_stage2[0]);</div><div class='del'>-	PR_EEP("Chain1 db_stage2", modal_hdr-&gt;db_stage2[1]);</div><div class='del'>-	PR_EEP("Chain2 db_stage2", modal_hdr-&gt;db_stage2[2]);</div><div class='del'>-	PR_EEP("Chain0 db_stage3", modal_hdr-&gt;db_stage3[0]);</div><div class='del'>-	PR_EEP("Chain1 db_stage3", modal_hdr-&gt;db_stage3[1]);</div><div class='del'>-	PR_EEP("Chain2 db_stage3", modal_hdr-&gt;db_stage3[2]);</div><div class='del'>-	PR_EEP("Chain0 db_stage4", modal_hdr-&gt;db_stage4[0]);</div><div class='del'>-	PR_EEP("Chain1 db_stage4", modal_hdr-&gt;db_stage4[1]);</div><div class='del'>-	PR_EEP("Chain2 db_stage4", modal_hdr-&gt;db_stage4[2]);</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='hunk'>@@ -3503,6 +3469,7 @@ static u32 ath9k_hw_ar9003_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,</div><div class='ctx'> 	PR_EEP("Internal regulator", !!(pBase-&gt;featureEnable &amp; BIT(4)));</div><div class='ctx'> 	PR_EEP("Enable Paprd", !!(pBase-&gt;featureEnable &amp; BIT(5)));</div><div class='ctx'> 	PR_EEP("Driver Strength", !!(pBase-&gt;miscConfiguration &amp; BIT(0)));</div><div class='add'>+	PR_EEP("Quick Drop", !!(pBase-&gt;miscConfiguration &amp; BIT(1)));</div><div class='ctx'> 	PR_EEP("Chain mask Reduce", (pBase-&gt;miscConfiguration &gt;&gt; 0x3) &amp; 0x1);</div><div class='ctx'> 	PR_EEP("Write enable Gpio", pBase-&gt;eepromWriteEnableGpio);</div><div class='ctx'> 	PR_EEP("WLAN Disable Gpio", pBase-&gt;wlanDisableGpio);</div><div class='hunk'>@@ -3571,13 +3538,13 @@ static void ar9003_hw_xpa_bias_level_apply(struct ath_hw *ah, bool is2ghz)</div><div class='ctx'> static u16 ar9003_switch_com_spdt_get(struct ath_hw *ah, bool is_2ghz)</div><div class='ctx'> {</div><div class='ctx'> 	struct ar9300_eeprom *eep = &amp;ah-&gt;eeprom.ar9300_eep;</div><div class='del'>-	__le32 val;</div><div class='add'>+	__le16 val;</div><div class='ctx'> </div><div class='ctx'> 	if (is_2ghz)</div><div class='ctx'> 		val = eep-&gt;modalHeader2G.switchcomspdt;</div><div class='ctx'> 	else</div><div class='ctx'> 		val = eep-&gt;modalHeader5G.switchcomspdt;</div><div class='del'>-	return le32_to_cpu(val);</div><div class='add'>+	return le16_to_cpu(val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -3965,6 +3932,40 @@ static void ar9003_hw_apply_tuning_caps(struct ath_hw *ah)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ar9003_hw_quick_drop_apply(struct ath_hw *ah, u16 freq)</div><div class='add'>+{</div><div class='add'>+	struct ar9300_eeprom *eep = &amp;ah-&gt;eeprom.ar9300_eep;</div><div class='add'>+	int quick_drop = ath9k_hw_ar9300_get_eeprom(ah, EEP_QUICK_DROP);</div><div class='add'>+	s32 t[3], f[3] = {5180, 5500, 5785};</div><div class='add'>+</div><div class='add'>+	if (!quick_drop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (freq &lt; 4000)</div><div class='add'>+		quick_drop = eep-&gt;modalHeader2G.quick_drop;</div><div class='add'>+	else {</div><div class='add'>+		t[0] = eep-&gt;base_ext1.quick_drop_low;</div><div class='add'>+		t[1] = eep-&gt;modalHeader5G.quick_drop;</div><div class='add'>+		t[2] = eep-&gt;base_ext1.quick_drop_high;</div><div class='add'>+		quick_drop = ar9003_hw_power_interpolate(freq, f, t, 3);</div><div class='add'>+	}</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_AGC, AR_PHY_AGC_QUICK_DROP, quick_drop);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9003_hw_txend_to_xpa_off_apply(struct ath_hw *ah, u16 freq)</div><div class='add'>+{</div><div class='add'>+	struct ar9300_eeprom *eep = &amp;ah-&gt;eeprom.ar9300_eep;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	value = (freq &lt; 4000) ? eep-&gt;modalHeader2G.txEndToXpaOff :</div><div class='add'>+				eep-&gt;modalHeader5G.txEndToXpaOff;</div><div class='add'>+</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_XPA_TIMING_CTL,</div><div class='add'>+		      AR_PHY_XPA_TIMING_CTL_TX_END_XPAB_OFF, value);</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_XPA_TIMING_CTL,</div><div class='add'>+		      AR_PHY_XPA_TIMING_CTL_TX_END_XPAA_OFF, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath9k_hw_ar9300_set_board_values(struct ath_hw *ah,</div><div class='ctx'> 					     struct ath9k_channel *chan)</div><div class='ctx'> {</div><div class='hunk'>@@ -3972,10 +3973,12 @@ static void ath9k_hw_ar9300_set_board_values(struct ath_hw *ah,</div><div class='ctx'> 	ar9003_hw_ant_ctrl_apply(ah, IS_CHAN_2GHZ(chan));</div><div class='ctx'> 	ar9003_hw_drive_strength_apply(ah);</div><div class='ctx'> 	ar9003_hw_atten_apply(ah, chan);</div><div class='add'>+	ar9003_hw_quick_drop_apply(ah, chan-&gt;channel);</div><div class='ctx'> 	if (!AR_SREV_9330(ah) &amp;&amp; !AR_SREV_9340(ah))</div><div class='ctx'> 		ar9003_hw_internal_regulator_apply(ah);</div><div class='ctx'> 	if (AR_SREV_9485(ah) || AR_SREV_9330(ah) || AR_SREV_9340(ah))</div><div class='ctx'> 		ar9003_hw_apply_tuning_caps(ah);</div><div class='add'>+	ar9003_hw_txend_to_xpa_off_apply(ah, chan-&gt;channel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath9k_hw_ar9300_set_addac(struct ath_hw *ah,</div><div class='hunk'>@@ -4416,8 +4419,8 @@ static void ar9003_hw_set_target_power_eeprom(struct ath_hw *ah, u16 freq,</div><div class='ctx'> 					      is2GHz) + ht40PowerIncForPdadc;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ar9300RateSize; i++) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-			"TPC[%02d] 0x%08x\n", i, targetPowerValT2[i]);</div><div class='add'>+		ath_dbg(common, EEPROM, "TPC[%02d] 0x%08x\n",</div><div class='add'>+			i, targetPowerValT2[i]);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4436,7 +4439,7 @@ static int ar9003_hw_cal_pier_get(struct ath_hw *ah,</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> </div><div class='ctx'> 	if (ichain &gt;= AR9300_MAX_CHAINS) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+		ath_dbg(common, EEPROM,</div><div class='ctx'> 			"Invalid chain index, must be less than %d\n",</div><div class='ctx'> 			AR9300_MAX_CHAINS);</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -4444,7 +4447,7 @@ static int ar9003_hw_cal_pier_get(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> 	if (mode) {		/* 5GHz */</div><div class='ctx'> 		if (ipier &gt;= AR9300_NUM_5G_CAL_PIERS) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+			ath_dbg(common, EEPROM,</div><div class='ctx'> 				"Invalid 5GHz cal pier index, must be less than %d\n",</div><div class='ctx'> 				AR9300_NUM_5G_CAL_PIERS);</div><div class='ctx'> 			return -1;</div><div class='hunk'>@@ -4454,7 +4457,7 @@ static int ar9003_hw_cal_pier_get(struct ath_hw *ah,</div><div class='ctx'> 		is2GHz = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (ipier &gt;= AR9300_NUM_2G_CAL_PIERS) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+			ath_dbg(common, EEPROM,</div><div class='ctx'> 				"Invalid 2GHz cal pier index, must be less than %d\n",</div><div class='ctx'> 				AR9300_NUM_2G_CAL_PIERS);</div><div class='ctx'> 			return -1;</div><div class='hunk'>@@ -4616,8 +4619,7 @@ static int ar9003_hw_calibration_apply(struct ath_hw *ah, int frequency)</div><div class='ctx'> </div><div class='ctx'> 	/* interpolate  */</div><div class='ctx'> 	for (ichain = 0; ichain &lt; AR9300_MAX_CHAINS; ichain++) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-			"ch=%d f=%d low=%d %d h=%d %d\n",</div><div class='add'>+		ath_dbg(common, EEPROM, "ch=%d f=%d low=%d %d h=%d %d\n",</div><div class='ctx'> 			ichain, frequency, lfrequency[ichain],</div><div class='ctx'> 			lcorrection[ichain], hfrequency[ichain],</div><div class='ctx'> 			hcorrection[ichain]);</div><div class='hunk'>@@ -4672,7 +4674,7 @@ static int ar9003_hw_calibration_apply(struct ath_hw *ah, int frequency)</div><div class='ctx'> 	ar9003_hw_power_control_override(ah, frequency, correction, voltage,</div><div class='ctx'> 					 temperature);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+	ath_dbg(common, EEPROM,</div><div class='ctx'> 		"for frequency=%d, calibration correction = %d %d %d\n",</div><div class='ctx'> 		frequency, correction[0], correction[1], correction[2]);</div><div class='ctx'> </div><div class='hunk'>@@ -4771,7 +4773,7 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> 	struct ar9300_eeprom *pEepData = &amp;ah-&gt;eeprom.ar9300_eep;</div><div class='del'>-	u16 twiceMaxEdgePower = MAX_RATE_POWER;</div><div class='add'>+	u16 twiceMaxEdgePower;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u16 scaledPower = 0, minCtlPower;</div><div class='ctx'> 	static const u16 ctlModesFor11a[] = {</div><div class='hunk'>@@ -4858,7 +4860,7 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah,</div><div class='ctx'> 		else</div><div class='ctx'> 			freq = centers.ctl_center;</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_REGULATORY,</div><div class='add'>+		ath_dbg(common, REGULATORY,</div><div class='ctx'> 			"LOOP-Mode ctlMode %d &lt; %d, isHt40CtlMode %d, EXT_ADDITIVE %d\n",</div><div class='ctx'> 			ctlMode, numCtlModes, isHt40CtlMode,</div><div class='ctx'> 			(pCtlMode[ctlMode] &amp; EXT_ADDITIVE));</div><div class='hunk'>@@ -4872,8 +4874,9 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah,</div><div class='ctx'> 			ctlNum = AR9300_NUM_CTLS_5G;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		twiceMaxEdgePower = MAX_RATE_POWER;</div><div class='ctx'> 		for (i = 0; (i &lt; ctlNum) &amp;&amp; ctlIndex[i]; i++) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_REGULATORY,</div><div class='add'>+			ath_dbg(common, REGULATORY,</div><div class='ctx'> 				"LOOP-Ctlidx %d: cfgCtl 0x%2.2x pCtlMode 0x%2.2x ctlIndex 0x%2.2x chan %d\n",</div><div class='ctx'> 				i, cfgCtl, pCtlMode[ctlMode], ctlIndex[i],</div><div class='ctx'> 				chan-&gt;channel);</div><div class='hunk'>@@ -4915,7 +4918,7 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> 			minCtlPower = (u8)min(twiceMaxEdgePower, scaledPower);</div><div class='ctx'> </div><div class='del'>-			ath_dbg(common, ATH_DBG_REGULATORY,</div><div class='add'>+			ath_dbg(common, REGULATORY,</div><div class='ctx'> 				"SEL-Min ctlMode %d pCtlMode %d 2xMaxEdge %d sP %d minCtlPwr %d\n",</div><div class='ctx'> 				ctlMode, pCtlMode[ctlMode], twiceMaxEdgePower,</div><div class='ctx'> 				scaledPower, minCtlPower);</div><div class='hunk'>@@ -5039,7 +5042,7 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah,</div><div class='ctx'> 				target_power_val_t2_eep[i]) &gt;</div><div class='ctx'> 			    paprd_scale_factor)) {</div><div class='ctx'> 				ah-&gt;paprd_ratemask &amp;= ~(1 &lt;&lt; i);</div><div class='del'>-				ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+				ath_dbg(common, EEPROM,</div><div class='ctx'> 					"paprd disabled for mcs %d\n", i);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -5051,12 +5054,14 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah,</div><div class='ctx'> 			regulatory-&gt;max_power_level = targetPowerValT2[i];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath9k_hw_update_regulatory_maxpower(ah);</div><div class='add'>+</div><div class='ctx'> 	if (test)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ar9300RateSize; i++) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-			"TPC[%02d] 0x%08x\n", i, targetPowerValT2[i]);</div><div class='add'>+		ath_dbg(common, EEPROM, "TPC[%02d] 0x%08x\n",</div><div class='add'>+			i, targetPowerValT2[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ah-&gt;txpower_limit = regulatory-&gt;max_power_level;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h<br/>index 6335a867527e..bb223fe82816 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_eeprom.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/ar9003_eeprom.h</a></div><div class='hunk'>@@ -216,10 +216,8 @@ struct ar9300_modal_eep_header {</div><div class='ctx'> 	u8 spurChans[AR_EEPROM_MODAL_SPURS];</div><div class='ctx'> 	/* 3  Check if the register is per chain */</div><div class='ctx'> 	int8_t noiseFloorThreshCh[AR9300_MAX_CHAINS];</div><div class='del'>-	u8 ob[AR9300_MAX_CHAINS];</div><div class='del'>-	u8 db_stage2[AR9300_MAX_CHAINS];</div><div class='del'>-	u8 db_stage3[AR9300_MAX_CHAINS];</div><div class='del'>-	u8 db_stage4[AR9300_MAX_CHAINS];</div><div class='add'>+	u8 reserved[11];</div><div class='add'>+	int8_t quick_drop;</div><div class='ctx'> 	u8 xpaBiasLvl;</div><div class='ctx'> 	u8 txFrameToDataStart;</div><div class='ctx'> 	u8 txFrameToPaOn;</div><div class='hunk'>@@ -269,7 +267,9 @@ struct cal_ctl_data_5g {</div><div class='ctx'> </div><div class='ctx'> struct ar9300_BaseExtension_1 {</div><div class='ctx'> 	u8 ant_div_control;</div><div class='del'>-	u8 future[13];</div><div class='add'>+	u8 future[11];</div><div class='add'>+	int8_t quick_drop_low;</div><div class='add'>+	int8_t quick_drop_high;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct ar9300_BaseExtension_2 {</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c<br/>index ccde784a842f..09b8c9dbf78f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_mac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_mac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/ar9003_mac.c</a></div><div class='hunk'>@@ -175,20 +175,24 @@ static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked)</div><div class='ctx'> 	u32 isr = 0;</div><div class='ctx'> 	u32 mask2 = 0;</div><div class='ctx'> 	struct ath9k_hw_capabilities *pCap = &amp;ah-&gt;caps;</div><div class='del'>-	u32 sync_cause = 0;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+	u32 sync_cause = 0, async_cause;</div><div class='ctx'> </div><div class='del'>-	if (REG_READ(ah, AR_INTR_ASYNC_CAUSE) &amp; AR_INTR_MAC_IRQ) {</div><div class='add'>+	async_cause = REG_READ(ah, AR_INTR_ASYNC_CAUSE);</div><div class='add'>+</div><div class='add'>+	if (async_cause &amp; (AR_INTR_MAC_IRQ | AR_INTR_ASYNC_MASK_MCI)) {</div><div class='ctx'> 		if ((REG_READ(ah, AR_RTC_STATUS) &amp; AR_RTC_STATUS_M)</div><div class='ctx'> 				== AR_RTC_STATUS_ON)</div><div class='ctx'> 			isr = REG_READ(ah, AR_ISR);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> 	sync_cause = REG_READ(ah, AR_INTR_SYNC_CAUSE) &amp; AR_INTR_SYNC_DEFAULT;</div><div class='ctx'> </div><div class='ctx'> 	*masked = 0;</div><div class='ctx'> </div><div class='del'>-	if (!isr &amp;&amp; !sync_cause)</div><div class='add'>+	if (!isr &amp;&amp; !sync_cause &amp;&amp; !async_cause)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (isr) {</div><div class='hunk'>@@ -294,6 +298,33 @@ static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked)</div><div class='ctx'> 			ar9003_hw_bb_watchdog_read(ah);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (async_cause &amp; AR_INTR_ASYNC_MASK_MCI) {</div><div class='add'>+		u32 raw_intr, rx_msg_intr;</div><div class='add'>+</div><div class='add'>+		rx_msg_intr = REG_READ(ah, AR_MCI_INTERRUPT_RX_MSG_RAW);</div><div class='add'>+		raw_intr = REG_READ(ah, AR_MCI_INTERRUPT_RAW);</div><div class='add'>+</div><div class='add'>+		if ((raw_intr == 0xdeadbeef) || (rx_msg_intr == 0xdeadbeef))</div><div class='add'>+			ath_dbg(common, MCI,</div><div class='add'>+				"MCI gets 0xdeadbeef during MCI int processing new raw_intr=0x%08x, new rx_msg_raw=0x%08x, raw_intr=0x%08x, rx_msg_raw=0x%08x\n",</div><div class='add'>+				raw_intr, rx_msg_intr, mci-&gt;raw_intr,</div><div class='add'>+				mci-&gt;rx_msg_intr);</div><div class='add'>+		else {</div><div class='add'>+			mci-&gt;rx_msg_intr |= rx_msg_intr;</div><div class='add'>+			mci-&gt;raw_intr |= raw_intr;</div><div class='add'>+			*masked |= ATH9K_INT_MCI;</div><div class='add'>+</div><div class='add'>+			if (rx_msg_intr &amp; AR_MCI_INTERRUPT_RX_MSG_CONT_INFO)</div><div class='add'>+				mci-&gt;cont_status =</div><div class='add'>+					REG_READ(ah, AR_MCI_CONT_STATUS);</div><div class='add'>+</div><div class='add'>+			REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW, rx_msg_intr);</div><div class='add'>+			REG_WRITE(ah, AR_MCI_INTERRUPT_RAW, raw_intr);</div><div class='add'>+			ath_dbg(common, MCI, "AR_INTR_SYNC_MCI\n");</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (sync_cause) {</div><div class='ctx'> 		if (sync_cause &amp; AR_INTR_SYNC_RADM_CPL_TIMEOUT) {</div><div class='ctx'> 			REG_WRITE(ah, AR_RC, AR_RC_HOSTIF);</div><div class='hunk'>@@ -302,7 +333,7 @@ static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (sync_cause &amp; AR_INTR_SYNC_LOCAL_TIMEOUT)</div><div class='del'>-			ath_dbg(common, ATH_DBG_INTERRUPT,</div><div class='add'>+			ath_dbg(common, INTERRUPT,</div><div class='ctx'> 				"AR_INTR_SYNC_LOCAL_TIMEOUT\n");</div><div class='ctx'> </div><div class='ctx'> 		REG_WRITE(ah, AR_INTR_SYNC_CAUSE_CLR, sync_cause);</div><div class='hunk'>@@ -333,7 +364,7 @@ static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds,</div><div class='ctx'> </div><div class='ctx'> 	if ((MS(ads-&gt;ds_info, AR_DescId) != ATHEROS_VENDOR_ID) ||</div><div class='ctx'> 	    (MS(ads-&gt;ds_info, AR_TxRxDesc) != 1)) {</div><div class='del'>-		ath_dbg(ath9k_hw_common(ah), ATH_DBG_XMIT,</div><div class='add'>+		ath_dbg(ath9k_hw_common(ah), XMIT,</div><div class='ctx'> 			"Tx Descriptor error %x\n", ads-&gt;ds_info);</div><div class='ctx'> 		memset(ads, 0, sizeof(*ads));</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -526,10 +557,11 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs,</div><div class='ctx'> 			rxs-&gt;rs_status |= ATH9K_RXERR_DECRYPT;</div><div class='ctx'> 		else if (rxsp-&gt;status11 &amp; AR_MichaelErr)</div><div class='ctx'> 			rxs-&gt;rs_status |= ATH9K_RXERR_MIC;</div><div class='del'>-		if (rxsp-&gt;status11 &amp; AR_KeyMiss)</div><div class='del'>-			rxs-&gt;rs_status |= ATH9K_RXERR_KEYMISS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (rxsp-&gt;status11 &amp; AR_KeyMiss)</div><div class='add'>+		rxs-&gt;rs_status |= ATH9K_RXERR_KEYMISS;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath9k_hw_process_rxdesc_edma);</div><div class='hunk'>@@ -541,7 +573,7 @@ void ath9k_hw_reset_txstatus_ring(struct ath_hw *ah)</div><div class='ctx'> 	memset((void *) ah-&gt;ts_ring, 0,</div><div class='ctx'> 		ah-&gt;ts_size * sizeof(struct ar9003_txs));</div><div class='ctx'> </div><div class='del'>-	ath_dbg(ath9k_hw_common(ah), ATH_DBG_XMIT,</div><div class='add'>+	ath_dbg(ath9k_hw_common(ah), XMIT,</div><div class='ctx'> 		"TS Start 0x%x End 0x%x Virt %p, Size %d\n",</div><div class='ctx'> 		ah-&gt;ts_paddr_start, ah-&gt;ts_paddr_end,</div><div class='ctx'> 		ah-&gt;ts_ring, ah-&gt;ts_size);</div><div class='hunk'>@@ -552,7 +584,7 @@ void ath9k_hw_reset_txstatus_ring(struct ath_hw *ah)</div><div class='ctx'> </div><div class='ctx'> void ath9k_hw_setup_statusring(struct ath_hw *ah, void *ts_start,</div><div class='ctx'> 			       u32 ts_paddr_start,</div><div class='del'>-			       u8 size)</div><div class='add'>+			       u16 size)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	ah-&gt;ts_paddr_start = ts_paddr_start;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.h b/drivers/net/wireless/ath/ath9k/ar9003_mac.h<br/>index c50449387bf1..e203b51e968b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_mac.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_mac.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_mac.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/ar9003_mac.h</a></div><div class='hunk'>@@ -118,5 +118,5 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah,</div><div class='ctx'> void ath9k_hw_reset_txstatus_ring(struct ath_hw *ah);</div><div class='ctx'> void ath9k_hw_setup_statusring(struct ath_hw *ah, void *ts_start,</div><div class='ctx'> 			       u32 ts_paddr_start,</div><div class='del'>-			       u8 size);</div><div class='add'>+			       u16 size);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.c b/drivers/net/wireless/ath/ath9k/ar9003_mci.c<br/>new file mode 100644<br/>index 000000000000..709520c6835b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_mci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/ar9003_mci.c</a></div><div class='hunk'>@@ -0,0 +1,1493 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2008-2011 Atheros Communications Inc.</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 &lt;linux/export.h&gt;</div><div class='add'>+#include "hw.h"</div><div class='add'>+#include "ar9003_phy.h"</div><div class='add'>+#include "ar9003_mci.h"</div><div class='add'>+</div><div class='add'>+static void ar9003_mci_reset_req_wakeup(struct ath_hw *ah)</div><div class='add'>+{</div><div class='add'>+	if (!AR_SREV_9462_20(ah))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	REG_RMW_FIELD(ah, AR_MCI_COMMAND2,</div><div class='add'>+		      AR_MCI_COMMAND2_RESET_REQ_WAKEUP, 1);</div><div class='add'>+	udelay(1);</div><div class='add'>+	REG_RMW_FIELD(ah, AR_MCI_COMMAND2,</div><div class='add'>+		      AR_MCI_COMMAND2_RESET_REQ_WAKEUP, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ar9003_mci_wait_for_interrupt(struct ath_hw *ah, u32 address,</div><div class='add'>+					u32 bit_position, int time_out)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+</div><div class='add'>+	while (time_out) {</div><div class='add'>+</div><div class='add'>+		if (REG_READ(ah, address) &amp; bit_position) {</div><div class='add'>+</div><div class='add'>+			REG_WRITE(ah, address, bit_position);</div><div class='add'>+</div><div class='add'>+			if (address == AR_MCI_INTERRUPT_RX_MSG_RAW) {</div><div class='add'>+</div><div class='add'>+				if (bit_position &amp;</div><div class='add'>+				    AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE)</div><div class='add'>+					ar9003_mci_reset_req_wakeup(ah);</div><div class='add'>+</div><div class='add'>+				if (bit_position &amp;</div><div class='add'>+				    (AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING |</div><div class='add'>+				     AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING))</div><div class='add'>+					REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,</div><div class='add'>+					AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE);</div><div class='add'>+</div><div class='add'>+				REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,</div><div class='add'>+					  AR_MCI_INTERRUPT_RX_MSG);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		udelay(10);</div><div class='add'>+		time_out -= 10;</div><div class='add'>+</div><div class='add'>+		if (time_out &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (time_out &lt;= 0) {</div><div class='add'>+		ath_dbg(common, MCI,</div><div class='add'>+			"MCI Wait for Reg 0x%08x = 0x%08x timeout\n",</div><div class='add'>+			address, bit_position);</div><div class='add'>+		ath_dbg(common, MCI,</div><div class='add'>+			"MCI INT_RAW = 0x%08x, RX_MSG_RAW = 0x%08x\n",</div><div class='add'>+			REG_READ(ah, AR_MCI_INTERRUPT_RAW),</div><div class='add'>+			REG_READ(ah, AR_MCI_INTERRUPT_RX_MSG_RAW));</div><div class='add'>+		time_out = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return time_out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ar9003_mci_remote_reset(struct ath_hw *ah, bool wait_done)</div><div class='add'>+{</div><div class='add'>+	u32 payload[4] = { 0xffffffff, 0xffffffff, 0xffffffff, 0xffffff00};</div><div class='add'>+</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ar9003_mci_send_message(ah, MCI_REMOTE_RESET, 0, payload, 16,</div><div class='add'>+				wait_done, false);</div><div class='add'>+	udelay(5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ar9003_mci_send_lna_transfer(struct ath_hw *ah, bool wait_done)</div><div class='add'>+{</div><div class='add'>+	u32 payload = 0x00000000;</div><div class='add'>+</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ar9003_mci_send_message(ah, MCI_LNA_TRANS, 0, &amp;payload, 1,</div><div class='add'>+				wait_done, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9003_mci_send_req_wake(struct ath_hw *ah, bool wait_done)</div><div class='add'>+{</div><div class='add'>+	ar9003_mci_send_message(ah, MCI_REQ_WAKE, MCI_FLAG_DISABLE_TIMESTAMP,</div><div class='add'>+				NULL, 0, wait_done, false);</div><div class='add'>+	udelay(5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ar9003_mci_send_sys_waking(struct ath_hw *ah, bool wait_done)</div><div class='add'>+{</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ar9003_mci_send_message(ah, MCI_SYS_WAKING, MCI_FLAG_DISABLE_TIMESTAMP,</div><div class='add'>+				NULL, 0, wait_done, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9003_mci_send_lna_take(struct ath_hw *ah, bool wait_done)</div><div class='add'>+{</div><div class='add'>+	u32 payload = 0x70000000;</div><div class='add'>+</div><div class='add'>+	ar9003_mci_send_message(ah, MCI_LNA_TAKE, 0, &amp;payload, 1,</div><div class='add'>+				wait_done, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9003_mci_send_sys_sleeping(struct ath_hw *ah, bool wait_done)</div><div class='add'>+{</div><div class='add'>+	ar9003_mci_send_message(ah, MCI_SYS_SLEEPING,</div><div class='add'>+				MCI_FLAG_DISABLE_TIMESTAMP,</div><div class='add'>+				NULL, 0, wait_done, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9003_mci_send_coex_version_query(struct ath_hw *ah,</div><div class='add'>+					       bool wait_done)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+	u32 payload[4] = {0, 0, 0, 0};</div><div class='add'>+</div><div class='add'>+	if (!mci-&gt;bt_version_known &amp;&amp;</div><div class='add'>+			(mci-&gt;bt_state != MCI_BT_SLEEP)) {</div><div class='add'>+		ath_dbg(common, MCI, "MCI Send Coex version query\n");</div><div class='add'>+		MCI_GPM_SET_TYPE_OPCODE(payload,</div><div class='add'>+				MCI_GPM_COEX_AGENT, MCI_GPM_COEX_VERSION_QUERY);</div><div class='add'>+		ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16,</div><div class='add'>+				wait_done, true);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9003_mci_send_coex_version_response(struct ath_hw *ah,</div><div class='add'>+						     bool wait_done)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+	u32 payload[4] = {0, 0, 0, 0};</div><div class='add'>+</div><div class='add'>+	ath_dbg(common, MCI, "MCI Send Coex version response\n");</div><div class='add'>+	MCI_GPM_SET_TYPE_OPCODE(payload, MCI_GPM_COEX_AGENT,</div><div class='add'>+			MCI_GPM_COEX_VERSION_RESPONSE);</div><div class='add'>+	*(((u8 *)payload) + MCI_GPM_COEX_B_MAJOR_VERSION) =</div><div class='add'>+		mci-&gt;wlan_ver_major;</div><div class='add'>+	*(((u8 *)payload) + MCI_GPM_COEX_B_MINOR_VERSION) =</div><div class='add'>+		mci-&gt;wlan_ver_minor;</div><div class='add'>+	ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16, wait_done, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9003_mci_send_coex_wlan_channels(struct ath_hw *ah,</div><div class='add'>+						  bool wait_done)</div><div class='add'>+{</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+	u32 *payload = &amp;mci-&gt;wlan_channels[0];</div><div class='add'>+</div><div class='add'>+	if ((mci-&gt;wlan_channels_update == true) &amp;&amp;</div><div class='add'>+			(mci-&gt;bt_state != MCI_BT_SLEEP)) {</div><div class='add'>+		MCI_GPM_SET_TYPE_OPCODE(payload,</div><div class='add'>+		MCI_GPM_COEX_AGENT, MCI_GPM_COEX_WLAN_CHANNELS);</div><div class='add'>+		ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16,</div><div class='add'>+					wait_done, true);</div><div class='add'>+		MCI_GPM_SET_TYPE_OPCODE(payload, 0xff, 0xff);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9003_mci_send_coex_bt_status_query(struct ath_hw *ah,</div><div class='add'>+						bool wait_done, u8 query_type)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+	u32 payload[4] = {0, 0, 0, 0};</div><div class='add'>+	bool query_btinfo = !!(query_type &amp; (MCI_GPM_COEX_QUERY_BT_ALL_INFO |</div><div class='add'>+					     MCI_GPM_COEX_QUERY_BT_TOPOLOGY));</div><div class='add'>+</div><div class='add'>+	if (mci-&gt;bt_state != MCI_BT_SLEEP) {</div><div class='add'>+</div><div class='add'>+		ath_dbg(common, MCI, "MCI Send Coex BT Status Query 0x%02X\n",</div><div class='add'>+			query_type);</div><div class='add'>+</div><div class='add'>+		MCI_GPM_SET_TYPE_OPCODE(payload,</div><div class='add'>+				MCI_GPM_COEX_AGENT, MCI_GPM_COEX_STATUS_QUERY);</div><div class='add'>+</div><div class='add'>+		*(((u8 *)payload) + MCI_GPM_COEX_B_BT_BITMAP) = query_type;</div><div class='add'>+		/*</div><div class='add'>+		 * If bt_status_query message is  not sent successfully,</div><div class='add'>+		 * then need_flush_btinfo should be set again.</div><div class='add'>+		 */</div><div class='add'>+		if (!ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16,</div><div class='add'>+					     wait_done, true)) {</div><div class='add'>+			if (query_btinfo) {</div><div class='add'>+				mci-&gt;need_flush_btinfo = true;</div><div class='add'>+</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI send bt_status_query fail, set flush flag again\n");</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (query_btinfo)</div><div class='add'>+			mci-&gt;query_bt = false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ar9003_mci_send_coex_halt_bt_gpm(struct ath_hw *ah, bool halt,</div><div class='add'>+				      bool wait_done)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+	u32 payload[4] = {0, 0, 0, 0};</div><div class='add'>+</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath_dbg(common, MCI, "MCI Send Coex %s BT GPM\n",</div><div class='add'>+		(halt) ? "halt" : "unhalt");</div><div class='add'>+</div><div class='add'>+	MCI_GPM_SET_TYPE_OPCODE(payload,</div><div class='add'>+				MCI_GPM_COEX_AGENT, MCI_GPM_COEX_HALT_BT_GPM);</div><div class='add'>+</div><div class='add'>+	if (halt) {</div><div class='add'>+		mci-&gt;query_bt = true;</div><div class='add'>+		/* Send next unhalt no matter halt sent or not */</div><div class='add'>+		mci-&gt;unhalt_bt_gpm = true;</div><div class='add'>+		mci-&gt;need_flush_btinfo = true;</div><div class='add'>+		*(((u8 *)payload) + MCI_GPM_COEX_B_HALT_STATE) =</div><div class='add'>+			MCI_GPM_COEX_BT_GPM_HALT;</div><div class='add'>+	} else</div><div class='add'>+		*(((u8 *)payload) + MCI_GPM_COEX_B_HALT_STATE) =</div><div class='add'>+			MCI_GPM_COEX_BT_GPM_UNHALT;</div><div class='add'>+</div><div class='add'>+	ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16, wait_done, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void ar9003_mci_prep_interface(struct ath_hw *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+	u32 saved_mci_int_en;</div><div class='add'>+	u32 mci_timeout = 150;</div><div class='add'>+</div><div class='add'>+	mci-&gt;bt_state = MCI_BT_SLEEP;</div><div class='add'>+	saved_mci_int_en = REG_READ(ah, AR_MCI_INTERRUPT_EN);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_MCI_INTERRUPT_EN, 0);</div><div class='add'>+	REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,</div><div class='add'>+		  REG_READ(ah, AR_MCI_INTERRUPT_RX_MSG_RAW));</div><div class='add'>+	REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,</div><div class='add'>+		  REG_READ(ah, AR_MCI_INTERRUPT_RAW));</div><div class='add'>+</div><div class='add'>+	/* Remote Reset */</div><div class='add'>+	ath_dbg(common, MCI, "MCI Reset sequence start\n");</div><div class='add'>+	ath_dbg(common, MCI, "MCI send REMOTE_RESET\n");</div><div class='add'>+	ar9003_mci_remote_reset(ah, true);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This delay is required for the reset delay worst case value 255 in</div><div class='add'>+	 * MCI_COMMAND2 register</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9462_10(ah))</div><div class='add'>+		udelay(252);</div><div class='add'>+</div><div class='add'>+	ath_dbg(common, MCI, "MCI Send REQ_WAKE to remoter(BT)\n");</div><div class='add'>+	ar9003_mci_send_req_wake(ah, true);</div><div class='add'>+</div><div class='add'>+	if (ar9003_mci_wait_for_interrupt(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,</div><div class='add'>+				AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING, 500)) {</div><div class='add'>+</div><div class='add'>+		ath_dbg(common, MCI, "MCI SYS_WAKING from remote(BT)\n");</div><div class='add'>+		mci-&gt;bt_state = MCI_BT_AWAKE;</div><div class='add'>+</div><div class='add'>+		if (AR_SREV_9462_10(ah))</div><div class='add'>+			udelay(10);</div><div class='add'>+		/*</div><div class='add'>+		 * we don't need to send more remote_reset at this moment.</div><div class='add'>+		 * If BT receive first remote_reset, then BT HW will</div><div class='add'>+		 * be cleaned up and will be able to receive req_wake</div><div class='add'>+		 * and BT HW will respond sys_waking.</div><div class='add'>+		 * In this case, WLAN will receive BT's HW sys_waking.</div><div class='add'>+		 * Otherwise, if BT SW missed initial remote_reset,</div><div class='add'>+		 * that remote_reset will still clean up BT MCI RX,</div><div class='add'>+		 * and the req_wake will wake BT up,</div><div class='add'>+		 * and BT SW will respond this req_wake with a remote_reset and</div><div class='add'>+		 * sys_waking. In this case, WLAN will receive BT's SW</div><div class='add'>+		 * sys_waking. In either case, BT's RX is cleaned up. So we</div><div class='add'>+		 * don't need to reply BT's remote_reset now, if any.</div><div class='add'>+		 * Similarly, if in any case, WLAN can receive BT's sys_waking,</div><div class='add'>+		 * that means WLAN's RX is also fine.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		/* Send SYS_WAKING to BT */</div><div class='add'>+</div><div class='add'>+		ath_dbg(common, MCI, "MCI send SW SYS_WAKING to remote BT\n");</div><div class='add'>+</div><div class='add'>+		ar9003_mci_send_sys_waking(ah, true);</div><div class='add'>+		udelay(10);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Set BT priority interrupt value to be 0xff to</div><div class='add'>+		 * avoid having too many BT PRIORITY interrupts.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		REG_WRITE(ah, AR_MCI_BT_PRI0, 0xFFFFFFFF);</div><div class='add'>+		REG_WRITE(ah, AR_MCI_BT_PRI1, 0xFFFFFFFF);</div><div class='add'>+		REG_WRITE(ah, AR_MCI_BT_PRI2, 0xFFFFFFFF);</div><div class='add'>+		REG_WRITE(ah, AR_MCI_BT_PRI3, 0xFFFFFFFF);</div><div class='add'>+		REG_WRITE(ah, AR_MCI_BT_PRI, 0X000000FF);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * A contention reset will be received after send out</div><div class='add'>+		 * sys_waking. Also BT priority interrupt bits will be set.</div><div class='add'>+		 * Clear those bits before the next step.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,</div><div class='add'>+			  AR_MCI_INTERRUPT_RX_MSG_CONT_RST);</div><div class='add'>+		REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,</div><div class='add'>+			  AR_MCI_INTERRUPT_BT_PRI);</div><div class='add'>+</div><div class='add'>+		if (AR_SREV_9462_10(ah) || mci-&gt;is_2g) {</div><div class='add'>+			/* Send LNA_TRANS */</div><div class='add'>+			ath_dbg(common, MCI, "MCI send LNA_TRANS to BT\n");</div><div class='add'>+			ar9003_mci_send_lna_transfer(ah, true);</div><div class='add'>+			udelay(5);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (AR_SREV_9462_10(ah) || (mci-&gt;is_2g &amp;&amp;</div><div class='add'>+					    !mci-&gt;update_2g5g)) {</div><div class='add'>+			if (ar9003_mci_wait_for_interrupt(ah,</div><div class='add'>+				AR_MCI_INTERRUPT_RX_MSG_RAW,</div><div class='add'>+				AR_MCI_INTERRUPT_RX_MSG_LNA_INFO,</div><div class='add'>+				mci_timeout))</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI WLAN has control over the LNA &amp; BT obeys it\n");</div><div class='add'>+			else</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI BT didn't respond to LNA_TRANS\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (AR_SREV_9462_10(ah)) {</div><div class='add'>+			/* Send another remote_reset to deassert BT clk_req. */</div><div class='add'>+			ath_dbg(common, MCI,</div><div class='add'>+				"MCI another remote_reset to deassert clk_req\n");</div><div class='add'>+			ar9003_mci_remote_reset(ah, true);</div><div class='add'>+			udelay(252);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear the extra redundant SYS_WAKING from BT */</div><div class='add'>+	if ((mci-&gt;bt_state == MCI_BT_AWAKE) &amp;&amp;</div><div class='add'>+		(REG_READ_FIELD(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,</div><div class='add'>+				AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING)) &amp;&amp;</div><div class='add'>+		(REG_READ_FIELD(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,</div><div class='add'>+				AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING) == 0)) {</div><div class='add'>+</div><div class='add'>+			REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,</div><div class='add'>+				  AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING);</div><div class='add'>+			REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,</div><div class='add'>+				  AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_MCI_INTERRUPT_EN, saved_mci_int_en);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ar9003_mci_disable_interrupt(struct ath_hw *ah)</div><div class='add'>+{</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_MCI_INTERRUPT_EN, 0);</div><div class='add'>+	REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_EN, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ar9003_mci_enable_interrupt(struct ath_hw *ah)</div><div class='add'>+{</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_MCI_INTERRUPT_EN, AR_MCI_INTERRUPT_DEFAULT);</div><div class='add'>+	REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_EN,</div><div class='add'>+		  AR_MCI_INTERRUPT_RX_MSG_DEFAULT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ar9003_mci_check_int(struct ath_hw *ah, u32 ints)</div><div class='add'>+{</div><div class='add'>+	u32 intr;</div><div class='add'>+</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	intr = REG_READ(ah, AR_MCI_INTERRUPT_RX_MSG_RAW);</div><div class='add'>+	return ((intr &amp; ints) == ints);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ar9003_mci_get_interrupt(struct ath_hw *ah, u32 *raw_intr,</div><div class='add'>+			      u32 *rx_msg_intr)</div><div class='add'>+{</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	*raw_intr = mci-&gt;raw_intr;</div><div class='add'>+	*rx_msg_intr = mci-&gt;rx_msg_intr;</div><div class='add'>+</div><div class='add'>+	/* Clean int bits after the values are read. */</div><div class='add'>+	mci-&gt;raw_intr = 0;</div><div class='add'>+	mci-&gt;rx_msg_intr = 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ar9003_mci_get_interrupt);</div><div class='add'>+</div><div class='add'>+void ar9003_mci_2g5g_changed(struct ath_hw *ah, bool is_2g)</div><div class='add'>+{</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!mci-&gt;update_2g5g &amp;&amp;</div><div class='add'>+	    (mci-&gt;is_2g != is_2g))</div><div class='add'>+		mci-&gt;update_2g5g = true;</div><div class='add'>+</div><div class='add'>+	mci-&gt;is_2g = is_2g;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ar9003_mci_is_gpm_valid(struct ath_hw *ah, u32 msg_index)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+	u32 *payload;</div><div class='add'>+	u32 recv_type, offset;</div><div class='add'>+</div><div class='add'>+	if (msg_index == MCI_GPM_INVALID)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	offset = msg_index &lt;&lt; 4;</div><div class='add'>+</div><div class='add'>+	payload = (u32 *)(mci-&gt;gpm_buf + offset);</div><div class='add'>+	recv_type = MCI_GPM_TYPE(payload);</div><div class='add'>+</div><div class='add'>+	if (recv_type == MCI_GPM_RSVD_PATTERN) {</div><div class='add'>+		ath_dbg(common, MCI, "MCI Skip RSVD GPM\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9003_mci_observation_set_up(struct ath_hw *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+	if (mci-&gt;config &amp; ATH_MCI_CONFIG_MCI_OBS_MCI) {</div><div class='add'>+</div><div class='add'>+		ath9k_hw_cfg_output(ah, 3,</div><div class='add'>+					AR_GPIO_OUTPUT_MUX_AS_MCI_WLAN_DATA);</div><div class='add'>+		ath9k_hw_cfg_output(ah, 2, AR_GPIO_OUTPUT_MUX_AS_MCI_WLAN_CLK);</div><div class='add'>+		ath9k_hw_cfg_output(ah, 1, AR_GPIO_OUTPUT_MUX_AS_MCI_BT_DATA);</div><div class='add'>+		ath9k_hw_cfg_output(ah, 0, AR_GPIO_OUTPUT_MUX_AS_MCI_BT_CLK);</div><div class='add'>+</div><div class='add'>+	} else if (mci-&gt;config &amp; ATH_MCI_CONFIG_MCI_OBS_TXRX) {</div><div class='add'>+</div><div class='add'>+		ath9k_hw_cfg_output(ah, 3, AR_GPIO_OUTPUT_MUX_AS_WL_IN_TX);</div><div class='add'>+		ath9k_hw_cfg_output(ah, 2, AR_GPIO_OUTPUT_MUX_AS_WL_IN_RX);</div><div class='add'>+		ath9k_hw_cfg_output(ah, 1, AR_GPIO_OUTPUT_MUX_AS_BT_IN_TX);</div><div class='add'>+		ath9k_hw_cfg_output(ah, 0, AR_GPIO_OUTPUT_MUX_AS_BT_IN_RX);</div><div class='add'>+		ath9k_hw_cfg_output(ah, 5, AR_GPIO_OUTPUT_MUX_AS_OUTPUT);</div><div class='add'>+</div><div class='add'>+	} else if (mci-&gt;config &amp; ATH_MCI_CONFIG_MCI_OBS_BT) {</div><div class='add'>+</div><div class='add'>+		ath9k_hw_cfg_output(ah, 3, AR_GPIO_OUTPUT_MUX_AS_BT_IN_TX);</div><div class='add'>+		ath9k_hw_cfg_output(ah, 2, AR_GPIO_OUTPUT_MUX_AS_BT_IN_RX);</div><div class='add'>+		ath9k_hw_cfg_output(ah, 1, AR_GPIO_OUTPUT_MUX_AS_MCI_BT_DATA);</div><div class='add'>+		ath9k_hw_cfg_output(ah, 0, AR_GPIO_OUTPUT_MUX_AS_MCI_BT_CLK);</div><div class='add'>+</div><div class='add'>+	} else</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL, AR_GPIO_JTAG_DISABLE);</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9462_20_OR_LATER(ah)) {</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_GLB_CONTROL,</div><div class='add'>+			      AR_GLB_DS_JTAG_DISABLE, 1);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_PHY_GLB_CONTROL,</div><div class='add'>+			      AR_GLB_WLAN_UART_INTF_EN, 0);</div><div class='add'>+		REG_SET_BIT(ah, AR_GLB_GPIO_CONTROL,</div><div class='add'>+			    ATH_MCI_CONFIG_MCI_OBS_GPIO);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_RMW_FIELD(ah, AR_BTCOEX_CTRL2, AR_BTCOEX_CTRL2_GPIO_OBS_SEL, 0);</div><div class='add'>+	REG_RMW_FIELD(ah, AR_BTCOEX_CTRL2, AR_BTCOEX_CTRL2_MAC_BB_OBS_SEL, 1);</div><div class='add'>+	REG_WRITE(ah, AR_OBS, 0x4b);</div><div class='add'>+	REG_RMW_FIELD(ah, AR_DIAG_SW, AR_DIAG_OBS_PT_SEL1, 0x03);</div><div class='add'>+	REG_RMW_FIELD(ah, AR_DIAG_SW, AR_DIAG_OBS_PT_SEL2, 0x01);</div><div class='add'>+	REG_RMW_FIELD(ah, AR_MACMISC, AR_MACMISC_MISC_OBS_BUS_LSB, 0x02);</div><div class='add'>+	REG_RMW_FIELD(ah, AR_MACMISC, AR_MACMISC_MISC_OBS_BUS_MSB, 0x03);</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PHY_TEST_CTL_STATUS,</div><div class='add'>+		      AR_PHY_TEST_CTL_DEBUGPORT_SEL, 0x07);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ar9003_mci_send_coex_bt_flags(struct ath_hw *ah, bool wait_done,</div><div class='add'>+						u8 opcode, u32 bt_flags)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	u32 pld[4] = {0, 0, 0, 0};</div><div class='add'>+</div><div class='add'>+	MCI_GPM_SET_TYPE_OPCODE(pld,</div><div class='add'>+			MCI_GPM_COEX_AGENT, MCI_GPM_COEX_BT_UPDATE_FLAGS);</div><div class='add'>+</div><div class='add'>+	*(((u8 *)pld) + MCI_GPM_COEX_B_BT_FLAGS_OP)  = opcode;</div><div class='add'>+	*(((u8 *)pld) + MCI_GPM_COEX_W_BT_FLAGS + 0) = bt_flags &amp; 0xFF;</div><div class='add'>+	*(((u8 *)pld) + MCI_GPM_COEX_W_BT_FLAGS + 1) = (bt_flags &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+	*(((u8 *)pld) + MCI_GPM_COEX_W_BT_FLAGS + 2) = (bt_flags &gt;&gt; 16) &amp; 0xFF;</div><div class='add'>+	*(((u8 *)pld) + MCI_GPM_COEX_W_BT_FLAGS + 3) = (bt_flags &gt;&gt; 24) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	ath_dbg(common, MCI,</div><div class='add'>+		"MCI BT_MCI_FLAGS: Send Coex BT Update Flags %s 0x%08x\n",</div><div class='add'>+		opcode == MCI_GPM_COEX_BT_FLAGS_READ ? "READ" :</div><div class='add'>+		opcode == MCI_GPM_COEX_BT_FLAGS_SET ? "SET" : "CLEAR",</div><div class='add'>+		bt_flags);</div><div class='add'>+</div><div class='add'>+	return ar9003_mci_send_message(ah, MCI_GPM, 0, pld, 16,</div><div class='add'>+							wait_done, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ar9003_mci_reset(struct ath_hw *ah, bool en_int, bool is_2g,</div><div class='add'>+		      bool is_full_sleep)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+	u32 regval, thresh;</div><div class='add'>+</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath_dbg(common, MCI, "MCI full_sleep = %d, is_2g = %d\n",</div><div class='add'>+		is_full_sleep, is_2g);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * GPM buffer and scheduling message buffer are not allocated</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (!mci-&gt;gpm_addr &amp;&amp; !mci-&gt;sched_addr) {</div><div class='add'>+		ath_dbg(common, MCI,</div><div class='add'>+			"MCI GPM and schedule buffers are not allocated\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (REG_READ(ah, AR_BTCOEX_CTRL) == 0xdeadbeef) {</div><div class='add'>+		ath_dbg(common, MCI, "MCI it's deadbeef, quit mci_reset\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Program MCI DMA related registers */</div><div class='add'>+	REG_WRITE(ah, AR_MCI_GPM_0, mci-&gt;gpm_addr);</div><div class='add'>+	REG_WRITE(ah, AR_MCI_GPM_1, mci-&gt;gpm_len);</div><div class='add'>+	REG_WRITE(ah, AR_MCI_SCHD_TABLE_0, mci-&gt;sched_addr);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	* To avoid MCI state machine be affected by incoming remote MCI msgs,</div><div class='add'>+	* MCI mode will be enabled later, right before reset the MCI TX and RX.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	regval = SM(1, AR_BTCOEX_CTRL_AR9462_MODE) |</div><div class='add'>+		 SM(1, AR_BTCOEX_CTRL_WBTIMER_EN) |</div><div class='add'>+		 SM(1, AR_BTCOEX_CTRL_PA_SHARED) |</div><div class='add'>+		 SM(1, AR_BTCOEX_CTRL_LNA_SHARED) |</div><div class='add'>+		 SM(2, AR_BTCOEX_CTRL_NUM_ANTENNAS) |</div><div class='add'>+		 SM(3, AR_BTCOEX_CTRL_RX_CHAIN_MASK) |</div><div class='add'>+		 SM(0, AR_BTCOEX_CTRL_1_CHAIN_ACK) |</div><div class='add'>+		 SM(0, AR_BTCOEX_CTRL_1_CHAIN_BCN) |</div><div class='add'>+		 SM(0, AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);</div><div class='add'>+</div><div class='add'>+	if (is_2g &amp;&amp; (AR_SREV_9462_20(ah)) &amp;&amp;</div><div class='add'>+		!(mci-&gt;config &amp; ATH_MCI_CONFIG_DISABLE_OSLA)) {</div><div class='add'>+</div><div class='add'>+		regval |= SM(1, AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);</div><div class='add'>+		ath_dbg(common, MCI, "MCI sched one step look ahead\n");</div><div class='add'>+</div><div class='add'>+		if (!(mci-&gt;config &amp;</div><div class='add'>+		      ATH_MCI_CONFIG_DISABLE_AGGR_THRESH)) {</div><div class='add'>+</div><div class='add'>+			thresh = MS(mci-&gt;config,</div><div class='add'>+				    ATH_MCI_CONFIG_AGGR_THRESH);</div><div class='add'>+			thresh &amp;= 7;</div><div class='add'>+			regval |= SM(1,</div><div class='add'>+				     AR_BTCOEX_CTRL_TIME_TO_NEXT_BT_THRESH_EN);</div><div class='add'>+			regval |= SM(thresh, AR_BTCOEX_CTRL_AGGR_THRESH);</div><div class='add'>+</div><div class='add'>+			REG_RMW_FIELD(ah, AR_MCI_SCHD_TABLE_2,</div><div class='add'>+				      AR_MCI_SCHD_TABLE_2_HW_BASED, 1);</div><div class='add'>+			REG_RMW_FIELD(ah, AR_MCI_SCHD_TABLE_2,</div><div class='add'>+				      AR_MCI_SCHD_TABLE_2_MEM_BASED, 1);</div><div class='add'>+</div><div class='add'>+		} else</div><div class='add'>+			ath_dbg(common, MCI, "MCI sched aggr thresh: off\n");</div><div class='add'>+	} else</div><div class='add'>+		ath_dbg(common, MCI, "MCI SCHED one step look ahead off\n");</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9462_10(ah))</div><div class='add'>+		regval |= SM(1, AR_BTCOEX_CTRL_SPDT_ENABLE_10);</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_BTCOEX_CTRL, regval);</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9462_20(ah)) {</div><div class='add'>+		REG_SET_BIT(ah, AR_PHY_GLB_CONTROL,</div><div class='add'>+			    AR_BTCOEX_CTRL_SPDT_ENABLE);</div><div class='add'>+		REG_RMW_FIELD(ah, AR_BTCOEX_CTRL3,</div><div class='add'>+			      AR_BTCOEX_CTRL3_CONT_INFO_TIMEOUT, 20);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_RMW_FIELD(ah, AR_BTCOEX_CTRL2, AR_BTCOEX_CTRL2_RX_DEWEIGHT, 1);</div><div class='add'>+	REG_RMW_FIELD(ah, AR_PCU_MISC, AR_PCU_BT_ANT_PREVENT_RX, 0);</div><div class='add'>+</div><div class='add'>+	thresh = MS(mci-&gt;config, ATH_MCI_CONFIG_CLK_DIV);</div><div class='add'>+	REG_RMW_FIELD(ah, AR_MCI_TX_CTRL, AR_MCI_TX_CTRL_CLK_DIV, thresh);</div><div class='add'>+	REG_SET_BIT(ah, AR_BTCOEX_CTRL, AR_BTCOEX_CTRL_MCI_MODE_EN);</div><div class='add'>+</div><div class='add'>+	/* Resetting the Rx and Tx paths of MCI */</div><div class='add'>+	regval = REG_READ(ah, AR_MCI_COMMAND2);</div><div class='add'>+	regval |= SM(1, AR_MCI_COMMAND2_RESET_TX);</div><div class='add'>+	REG_WRITE(ah, AR_MCI_COMMAND2, regval);</div><div class='add'>+</div><div class='add'>+	udelay(1);</div><div class='add'>+</div><div class='add'>+	regval &amp;= ~SM(1, AR_MCI_COMMAND2_RESET_TX);</div><div class='add'>+	REG_WRITE(ah, AR_MCI_COMMAND2, regval);</div><div class='add'>+</div><div class='add'>+	if (is_full_sleep) {</div><div class='add'>+		ar9003_mci_mute_bt(ah);</div><div class='add'>+		udelay(100);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regval |= SM(1, AR_MCI_COMMAND2_RESET_RX);</div><div class='add'>+	REG_WRITE(ah, AR_MCI_COMMAND2, regval);</div><div class='add'>+	udelay(1);</div><div class='add'>+	regval &amp;= ~SM(1, AR_MCI_COMMAND2_RESET_RX);</div><div class='add'>+	REG_WRITE(ah, AR_MCI_COMMAND2, regval);</div><div class='add'>+</div><div class='add'>+	ar9003_mci_state(ah, MCI_STATE_INIT_GPM_OFFSET, NULL);</div><div class='add'>+	REG_WRITE(ah, AR_MCI_MSG_ATTRIBUTES_TABLE,</div><div class='add'>+		  (SM(0xe801, AR_MCI_MSG_ATTRIBUTES_TABLE_INVALID_HDR) |</div><div class='add'>+		   SM(0x0000, AR_MCI_MSG_ATTRIBUTES_TABLE_CHECKSUM)));</div><div class='add'>+</div><div class='add'>+	REG_CLR_BIT(ah, AR_MCI_TX_CTRL,</div><div class='add'>+			AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9462_20_OR_LATER(ah))</div><div class='add'>+		ar9003_mci_observation_set_up(ah);</div><div class='add'>+</div><div class='add'>+	mci-&gt;ready = true;</div><div class='add'>+	ar9003_mci_prep_interface(ah);</div><div class='add'>+</div><div class='add'>+	if (en_int)</div><div class='add'>+		ar9003_mci_enable_interrupt(ah);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ar9003_mci_mute_bt(struct ath_hw *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* disable all MCI messages */</div><div class='add'>+	REG_WRITE(ah, AR_MCI_MSG_ATTRIBUTES_TABLE, 0xffff0000);</div><div class='add'>+	REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS0, 0xffffffff);</div><div class='add'>+	REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS1, 0xffffffff);</div><div class='add'>+	REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS2, 0xffffffff);</div><div class='add'>+	REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS3, 0xffffffff);</div><div class='add'>+	REG_SET_BIT(ah, AR_MCI_TX_CTRL, AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);</div><div class='add'>+</div><div class='add'>+	/* wait pending HW messages to flush out */</div><div class='add'>+	udelay(10);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Send LNA_TAKE and SYS_SLEEPING when</div><div class='add'>+	 * 1. reset not after resuming from full sleep</div><div class='add'>+	 * 2. before reset MCI RX, to quiet BT and avoid MCI RX misalignment</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ath_dbg(common, MCI, "MCI Send LNA take\n");</div><div class='add'>+	ar9003_mci_send_lna_take(ah, true);</div><div class='add'>+</div><div class='add'>+	udelay(5);</div><div class='add'>+</div><div class='add'>+	ath_dbg(common, MCI, "MCI Send sys sleeping\n");</div><div class='add'>+	ar9003_mci_send_sys_sleeping(ah, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ar9003_mci_sync_bt_state(struct ath_hw *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+	u32 cur_bt_state;</div><div class='add'>+</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cur_bt_state = ar9003_mci_state(ah, MCI_STATE_REMOTE_SLEEP, NULL);</div><div class='add'>+</div><div class='add'>+	if (mci-&gt;bt_state != cur_bt_state) {</div><div class='add'>+		ath_dbg(common, MCI,</div><div class='add'>+			"MCI BT state mismatches. old: %d, new: %d\n",</div><div class='add'>+			mci-&gt;bt_state, cur_bt_state);</div><div class='add'>+		mci-&gt;bt_state = cur_bt_state;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mci-&gt;bt_state != MCI_BT_SLEEP) {</div><div class='add'>+</div><div class='add'>+		ar9003_mci_send_coex_version_query(ah, true);</div><div class='add'>+		ar9003_mci_send_coex_wlan_channels(ah, true);</div><div class='add'>+</div><div class='add'>+		if (mci-&gt;unhalt_bt_gpm == true) {</div><div class='add'>+			ath_dbg(common, MCI, "MCI unhalt BT GPM\n");</div><div class='add'>+			ar9003_mci_send_coex_halt_bt_gpm(ah, false, true);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9003_mci_send_2g5g_status(struct ath_hw *ah, bool wait_done)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+	u32 new_flags, to_set, to_clear;</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9462_20(ah) &amp;&amp;</div><div class='add'>+	    mci-&gt;update_2g5g &amp;&amp;</div><div class='add'>+	    (mci-&gt;bt_state != MCI_BT_SLEEP)) {</div><div class='add'>+</div><div class='add'>+		if (mci-&gt;is_2g) {</div><div class='add'>+			new_flags = MCI_2G_FLAGS;</div><div class='add'>+			to_clear = MCI_2G_FLAGS_CLEAR_MASK;</div><div class='add'>+			to_set = MCI_2G_FLAGS_SET_MASK;</div><div class='add'>+		} else {</div><div class='add'>+			new_flags = MCI_5G_FLAGS;</div><div class='add'>+			to_clear = MCI_5G_FLAGS_CLEAR_MASK;</div><div class='add'>+			to_set = MCI_5G_FLAGS_SET_MASK;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath_dbg(common, MCI,</div><div class='add'>+			"MCI BT_MCI_FLAGS: %s 0x%08x clr=0x%08x, set=0x%08x\n",</div><div class='add'>+		mci-&gt;is_2g ? "2G" : "5G", new_flags, to_clear, to_set);</div><div class='add'>+</div><div class='add'>+		if (to_clear)</div><div class='add'>+			ar9003_mci_send_coex_bt_flags(ah, wait_done,</div><div class='add'>+					MCI_GPM_COEX_BT_FLAGS_CLEAR, to_clear);</div><div class='add'>+</div><div class='add'>+		if (to_set)</div><div class='add'>+			ar9003_mci_send_coex_bt_flags(ah, wait_done,</div><div class='add'>+					MCI_GPM_COEX_BT_FLAGS_SET, to_set);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (AR_SREV_9462_10(ah) &amp;&amp; (mci-&gt;bt_state != MCI_BT_SLEEP))</div><div class='add'>+		mci-&gt;update_2g5g = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9003_mci_queue_unsent_gpm(struct ath_hw *ah, u8 header,</div><div class='add'>+					u32 *payload, bool queue)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+	u8 type, opcode;</div><div class='add'>+</div><div class='add'>+	if (queue) {</div><div class='add'>+</div><div class='add'>+		if (payload)</div><div class='add'>+			ath_dbg(common, MCI,</div><div class='add'>+				"MCI ERROR: Send fail: %02x: %02x %02x %02x\n",</div><div class='add'>+				header,</div><div class='add'>+				*(((u8 *)payload) + 4),</div><div class='add'>+				*(((u8 *)payload) + 5),</div><div class='add'>+				*(((u8 *)payload) + 6));</div><div class='add'>+		else</div><div class='add'>+			ath_dbg(common, MCI, "MCI ERROR: Send fail: %02x\n",</div><div class='add'>+				header);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check if the message is to be queued */</div><div class='add'>+	if (header != MCI_GPM)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	type = MCI_GPM_TYPE(payload);</div><div class='add'>+	opcode = MCI_GPM_OPCODE(payload);</div><div class='add'>+</div><div class='add'>+	if (type != MCI_GPM_COEX_AGENT)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (opcode) {</div><div class='add'>+	case MCI_GPM_COEX_BT_UPDATE_FLAGS:</div><div class='add'>+</div><div class='add'>+		if (AR_SREV_9462_10(ah))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (*(((u8 *)payload) + MCI_GPM_COEX_B_BT_FLAGS_OP) ==</div><div class='add'>+				MCI_GPM_COEX_BT_FLAGS_READ)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		mci-&gt;update_2g5g = queue;</div><div class='add'>+</div><div class='add'>+		if (queue)</div><div class='add'>+			ath_dbg(common, MCI,</div><div class='add'>+				"MCI BT_MCI_FLAGS: 2G5G status &lt;queued&gt; %s\n",</div><div class='add'>+				mci-&gt;is_2g ? "2G" : "5G");</div><div class='add'>+		else</div><div class='add'>+			ath_dbg(common, MCI,</div><div class='add'>+				"MCI BT_MCI_FLAGS: 2G5G status &lt;sent&gt; %s\n",</div><div class='add'>+				mci-&gt;is_2g ? "2G" : "5G");</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_GPM_COEX_WLAN_CHANNELS:</div><div class='add'>+</div><div class='add'>+		mci-&gt;wlan_channels_update = queue;</div><div class='add'>+		if (queue)</div><div class='add'>+			ath_dbg(common, MCI, "MCI WLAN channel map &lt;queued&gt;\n");</div><div class='add'>+		else</div><div class='add'>+			ath_dbg(common, MCI, "MCI WLAN channel map &lt;sent&gt;\n");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_GPM_COEX_HALT_BT_GPM:</div><div class='add'>+</div><div class='add'>+		if (*(((u8 *)payload) + MCI_GPM_COEX_B_HALT_STATE) ==</div><div class='add'>+				MCI_GPM_COEX_BT_GPM_UNHALT) {</div><div class='add'>+</div><div class='add'>+			mci-&gt;unhalt_bt_gpm = queue;</div><div class='add'>+</div><div class='add'>+			if (queue)</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI UNHALT BT GPM &lt;queued&gt;\n");</div><div class='add'>+			else {</div><div class='add'>+				mci-&gt;halted_bt_gpm = false;</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI UNHALT BT GPM &lt;sent&gt;\n");</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (*(((u8 *)payload) + MCI_GPM_COEX_B_HALT_STATE) ==</div><div class='add'>+				MCI_GPM_COEX_BT_GPM_HALT) {</div><div class='add'>+</div><div class='add'>+			mci-&gt;halted_bt_gpm = !queue;</div><div class='add'>+</div><div class='add'>+			if (queue)</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI HALT BT GPM &lt;not sent&gt;\n");</div><div class='add'>+			else</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI UNHALT BT GPM &lt;sent&gt;\n");</div><div class='add'>+		}</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'>+</div><div class='add'>+void ar9003_mci_2g5g_switch(struct ath_hw *ah, bool wait_done)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (mci-&gt;update_2g5g) {</div><div class='add'>+		if (mci-&gt;is_2g) {</div><div class='add'>+</div><div class='add'>+			ar9003_mci_send_2g5g_status(ah, true);</div><div class='add'>+			ath_dbg(common, MCI, "MCI Send LNA trans\n");</div><div class='add'>+			ar9003_mci_send_lna_transfer(ah, true);</div><div class='add'>+			udelay(5);</div><div class='add'>+</div><div class='add'>+			REG_CLR_BIT(ah, AR_MCI_TX_CTRL,</div><div class='add'>+				    AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);</div><div class='add'>+</div><div class='add'>+			if (AR_SREV_9462_20(ah)) {</div><div class='add'>+				REG_CLR_BIT(ah, AR_PHY_GLB_CONTROL,</div><div class='add'>+					    AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL);</div><div class='add'>+				if (!(mci-&gt;config &amp;</div><div class='add'>+				      ATH_MCI_CONFIG_DISABLE_OSLA)) {</div><div class='add'>+					REG_SET_BIT(ah, AR_BTCOEX_CTRL,</div><div class='add'>+					AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			ath_dbg(common, MCI, "MCI Send LNA take\n");</div><div class='add'>+			ar9003_mci_send_lna_take(ah, true);</div><div class='add'>+			udelay(5);</div><div class='add'>+</div><div class='add'>+			REG_SET_BIT(ah, AR_MCI_TX_CTRL,</div><div class='add'>+				    AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);</div><div class='add'>+</div><div class='add'>+			if (AR_SREV_9462_20(ah)) {</div><div class='add'>+				REG_SET_BIT(ah, AR_PHY_GLB_CONTROL,</div><div class='add'>+					    AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL);</div><div class='add'>+				REG_CLR_BIT(ah, AR_BTCOEX_CTRL,</div><div class='add'>+					AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ar9003_mci_send_2g5g_status(ah, true);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ar9003_mci_send_message(struct ath_hw *ah, u8 header, u32 flag,</div><div class='add'>+			     u32 *payload, u8 len, bool wait_done,</div><div class='add'>+			     bool check_bt)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+	bool msg_sent = false;</div><div class='add'>+	u32 regval;</div><div class='add'>+	u32 saved_mci_int_en;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	saved_mci_int_en = REG_READ(ah, AR_MCI_INTERRUPT_EN);</div><div class='add'>+	regval = REG_READ(ah, AR_BTCOEX_CTRL);</div><div class='add'>+</div><div class='add'>+	if ((regval == 0xdeadbeef) || !(regval &amp; AR_BTCOEX_CTRL_MCI_MODE_EN)) {</div><div class='add'>+</div><div class='add'>+		ath_dbg(common, MCI,</div><div class='add'>+			"MCI Not sending 0x%x. MCI is not enabled. full_sleep = %d\n",</div><div class='add'>+			header,</div><div class='add'>+			(ah-&gt;power_mode == ATH9K_PM_FULL_SLEEP) ? 1 : 0);</div><div class='add'>+</div><div class='add'>+		ar9003_mci_queue_unsent_gpm(ah, header, payload, true);</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	} else if (check_bt &amp;&amp; (mci-&gt;bt_state == MCI_BT_SLEEP)) {</div><div class='add'>+</div><div class='add'>+		ath_dbg(common, MCI,</div><div class='add'>+			"MCI Don't send message 0x%x. BT is in sleep state\n",</div><div class='add'>+			header);</div><div class='add'>+</div><div class='add'>+		ar9003_mci_queue_unsent_gpm(ah, header, payload, true);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wait_done)</div><div class='add'>+		REG_WRITE(ah, AR_MCI_INTERRUPT_EN, 0);</div><div class='add'>+</div><div class='add'>+	/* Need to clear SW_MSG_DONE raw bit before wait */</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,</div><div class='add'>+		  (AR_MCI_INTERRUPT_SW_MSG_DONE |</div><div class='add'>+		   AR_MCI_INTERRUPT_MSG_FAIL_MASK));</div><div class='add'>+</div><div class='add'>+	if (payload) {</div><div class='add'>+		for (i = 0; (i * 4) &lt; len; i++)</div><div class='add'>+			REG_WRITE(ah, (AR_MCI_TX_PAYLOAD0 + i * 4),</div><div class='add'>+				  *(payload + i));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	REG_WRITE(ah, AR_MCI_COMMAND0,</div><div class='add'>+		  (SM((flag &amp; MCI_FLAG_DISABLE_TIMESTAMP),</div><div class='add'>+		      AR_MCI_COMMAND0_DISABLE_TIMESTAMP) |</div><div class='add'>+		   SM(len, AR_MCI_COMMAND0_LEN) |</div><div class='add'>+		   SM(header, AR_MCI_COMMAND0_HEADER)));</div><div class='add'>+</div><div class='add'>+	if (wait_done &amp;&amp;</div><div class='add'>+	    !(ar9003_mci_wait_for_interrupt(ah, AR_MCI_INTERRUPT_RAW,</div><div class='add'>+					AR_MCI_INTERRUPT_SW_MSG_DONE, 500)))</div><div class='add'>+		ar9003_mci_queue_unsent_gpm(ah, header, payload, true);</div><div class='add'>+	else {</div><div class='add'>+		ar9003_mci_queue_unsent_gpm(ah, header, payload, false);</div><div class='add'>+		msg_sent = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wait_done)</div><div class='add'>+		REG_WRITE(ah, AR_MCI_INTERRUPT_EN, saved_mci_int_en);</div><div class='add'>+</div><div class='add'>+	return msg_sent;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ar9003_mci_send_message);</div><div class='add'>+</div><div class='add'>+void ar9003_mci_setup(struct ath_hw *ah, u32 gpm_addr, void *gpm_buf,</div><div class='add'>+		      u16 len, u32 sched_addr)</div><div class='add'>+{</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+	void *sched_buf = (void *)((char *) gpm_buf + (sched_addr - gpm_addr));</div><div class='add'>+</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mci-&gt;gpm_addr = gpm_addr;</div><div class='add'>+	mci-&gt;gpm_buf = gpm_buf;</div><div class='add'>+	mci-&gt;gpm_len = len;</div><div class='add'>+	mci-&gt;sched_addr = sched_addr;</div><div class='add'>+	mci-&gt;sched_buf = sched_buf;</div><div class='add'>+</div><div class='add'>+	ar9003_mci_reset(ah, true, true, true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ar9003_mci_setup);</div><div class='add'>+</div><div class='add'>+void ar9003_mci_cleanup(struct ath_hw *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Turn off MCI and Jupiter mode. */</div><div class='add'>+	REG_WRITE(ah, AR_BTCOEX_CTRL, 0x00);</div><div class='add'>+	ath_dbg(common, MCI, "MCI ar9003_mci_cleanup\n");</div><div class='add'>+	ar9003_mci_disable_interrupt(ah);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ar9003_mci_cleanup);</div><div class='add'>+</div><div class='add'>+static void ar9003_mci_process_gpm_extra(struct ath_hw *ah, u8 gpm_type,</div><div class='add'>+					 u8 gpm_opcode, u32 *p_gpm)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+	u8 *p_data = (u8 *) p_gpm;</div><div class='add'>+</div><div class='add'>+	if (gpm_type != MCI_GPM_COEX_AGENT)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (gpm_opcode) {</div><div class='add'>+	case MCI_GPM_COEX_VERSION_QUERY:</div><div class='add'>+		ath_dbg(common, MCI, "MCI Recv GPM COEX Version Query\n");</div><div class='add'>+		ar9003_mci_send_coex_version_response(ah, true);</div><div class='add'>+		break;</div><div class='add'>+	case MCI_GPM_COEX_VERSION_RESPONSE:</div><div class='add'>+		ath_dbg(common, MCI, "MCI Recv GPM COEX Version Response\n");</div><div class='add'>+		mci-&gt;bt_ver_major =</div><div class='add'>+			*(p_data + MCI_GPM_COEX_B_MAJOR_VERSION);</div><div class='add'>+		mci-&gt;bt_ver_minor =</div><div class='add'>+			*(p_data + MCI_GPM_COEX_B_MINOR_VERSION);</div><div class='add'>+		mci-&gt;bt_version_known = true;</div><div class='add'>+		ath_dbg(common, MCI, "MCI BT Coex version: %d.%d\n",</div><div class='add'>+			mci-&gt;bt_ver_major, mci-&gt;bt_ver_minor);</div><div class='add'>+		break;</div><div class='add'>+	case MCI_GPM_COEX_STATUS_QUERY:</div><div class='add'>+		ath_dbg(common, MCI,</div><div class='add'>+			"MCI Recv GPM COEX Status Query = 0x%02X\n",</div><div class='add'>+			*(p_data + MCI_GPM_COEX_B_WLAN_BITMAP));</div><div class='add'>+		mci-&gt;wlan_channels_update = true;</div><div class='add'>+		ar9003_mci_send_coex_wlan_channels(ah, true);</div><div class='add'>+		break;</div><div class='add'>+	case MCI_GPM_COEX_BT_PROFILE_INFO:</div><div class='add'>+		mci-&gt;query_bt = true;</div><div class='add'>+		ath_dbg(common, MCI, "MCI Recv GPM COEX BT_Profile_Info\n");</div><div class='add'>+		break;</div><div class='add'>+	case MCI_GPM_COEX_BT_STATUS_UPDATE:</div><div class='add'>+		mci-&gt;query_bt = true;</div><div class='add'>+		ath_dbg(common, MCI,</div><div class='add'>+			"MCI Recv GPM COEX BT_Status_Update SEQ=%d (drop&amp;query)\n",</div><div class='add'>+			*(p_gpm + 3));</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'>+u32 ar9003_mci_wait_for_gpm(struct ath_hw *ah, u8 gpm_type,</div><div class='add'>+			    u8 gpm_opcode, int time_out)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+	u32 *p_gpm = NULL, mismatch = 0, more_data;</div><div class='add'>+	u32 offset;</div><div class='add'>+	u8 recv_type = 0, recv_opcode = 0;</div><div class='add'>+	bool b_is_bt_cal_done = (gpm_type == MCI_GPM_BT_CAL_DONE);</div><div class='add'>+</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	more_data = time_out ? MCI_GPM_NOMORE : MCI_GPM_MORE;</div><div class='add'>+</div><div class='add'>+	while (time_out &gt; 0) {</div><div class='add'>+		if (p_gpm) {</div><div class='add'>+			MCI_GPM_RECYCLE(p_gpm);</div><div class='add'>+			p_gpm = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (more_data != MCI_GPM_MORE)</div><div class='add'>+			time_out = ar9003_mci_wait_for_interrupt(ah,</div><div class='add'>+					AR_MCI_INTERRUPT_RX_MSG_RAW,</div><div class='add'>+					AR_MCI_INTERRUPT_RX_MSG_GPM,</div><div class='add'>+					time_out);</div><div class='add'>+</div><div class='add'>+		if (!time_out)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		offset = ar9003_mci_state(ah,</div><div class='add'>+				MCI_STATE_NEXT_GPM_OFFSET, &amp;more_data);</div><div class='add'>+</div><div class='add'>+		if (offset == MCI_GPM_INVALID)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		p_gpm = (u32 *) (mci-&gt;gpm_buf + offset);</div><div class='add'>+		recv_type = MCI_GPM_TYPE(p_gpm);</div><div class='add'>+		recv_opcode = MCI_GPM_OPCODE(p_gpm);</div><div class='add'>+</div><div class='add'>+		if (MCI_GPM_IS_CAL_TYPE(recv_type)) {</div><div class='add'>+</div><div class='add'>+			if (recv_type == gpm_type) {</div><div class='add'>+</div><div class='add'>+				if ((gpm_type == MCI_GPM_BT_CAL_DONE) &amp;&amp;</div><div class='add'>+				    !b_is_bt_cal_done) {</div><div class='add'>+					gpm_type = MCI_GPM_BT_CAL_GRANT;</div><div class='add'>+					ath_dbg(common, MCI,</div><div class='add'>+						"MCI Recv BT_CAL_DONE wait BT_CAL_GRANT\n");</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else if ((recv_type == gpm_type) &amp;&amp;</div><div class='add'>+			   (recv_opcode == gpm_opcode))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* not expected message */</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * check if it's cal_grant</div><div class='add'>+		 *</div><div class='add'>+		 * When we're waiting for cal_grant in reset routine,</div><div class='add'>+		 * it's possible that BT sends out cal_request at the</div><div class='add'>+		 * same time. Since BT's calibration doesn't happen</div><div class='add'>+		 * that often, we'll let BT completes calibration then</div><div class='add'>+		 * we continue to wait for cal_grant from BT.</div><div class='add'>+		 * Orginal: Wait BT_CAL_GRANT.</div><div class='add'>+		 * New: Receive BT_CAL_REQ -&gt; send WLAN_CAL_GRANT-&gt;wait</div><div class='add'>+		 * BT_CAL_DONE -&gt; Wait BT_CAL_GRANT.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		if ((gpm_type == MCI_GPM_BT_CAL_GRANT) &amp;&amp;</div><div class='add'>+		    (recv_type == MCI_GPM_BT_CAL_REQ)) {</div><div class='add'>+</div><div class='add'>+			u32 payload[4] = {0, 0, 0, 0};</div><div class='add'>+</div><div class='add'>+			gpm_type = MCI_GPM_BT_CAL_DONE;</div><div class='add'>+			ath_dbg(common, MCI,</div><div class='add'>+				"MCI Rcv BT_CAL_REQ, send WLAN_CAL_GRANT\n");</div><div class='add'>+</div><div class='add'>+			MCI_GPM_SET_CAL_TYPE(payload,</div><div class='add'>+					MCI_GPM_WLAN_CAL_GRANT);</div><div class='add'>+</div><div class='add'>+			ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16,</div><div class='add'>+						false, false);</div><div class='add'>+</div><div class='add'>+			ath_dbg(common, MCI, "MCI now wait for BT_CAL_DONE\n");</div><div class='add'>+</div><div class='add'>+			continue;</div><div class='add'>+		} else {</div><div class='add'>+			ath_dbg(common, MCI, "MCI GPM subtype not match 0x%x\n",</div><div class='add'>+				*(p_gpm + 1));</div><div class='add'>+			mismatch++;</div><div class='add'>+			ar9003_mci_process_gpm_extra(ah, recv_type,</div><div class='add'>+					recv_opcode, p_gpm);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (p_gpm) {</div><div class='add'>+		MCI_GPM_RECYCLE(p_gpm);</div><div class='add'>+		p_gpm = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (time_out &lt;= 0) {</div><div class='add'>+		time_out = 0;</div><div class='add'>+		ath_dbg(common, MCI,</div><div class='add'>+			"MCI GPM received timeout, mismatch = %d\n", mismatch);</div><div class='add'>+	} else</div><div class='add'>+		ath_dbg(common, MCI, "MCI Receive GPM type=0x%x, code=0x%x\n",</div><div class='add'>+			gpm_type, gpm_opcode);</div><div class='add'>+</div><div class='add'>+	while (more_data == MCI_GPM_MORE) {</div><div class='add'>+</div><div class='add'>+		ath_dbg(common, MCI, "MCI discard remaining GPM\n");</div><div class='add'>+		offset = ar9003_mci_state(ah, MCI_STATE_NEXT_GPM_OFFSET,</div><div class='add'>+					  &amp;more_data);</div><div class='add'>+</div><div class='add'>+		if (offset == MCI_GPM_INVALID)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		p_gpm = (u32 *) (mci-&gt;gpm_buf + offset);</div><div class='add'>+		recv_type = MCI_GPM_TYPE(p_gpm);</div><div class='add'>+		recv_opcode = MCI_GPM_OPCODE(p_gpm);</div><div class='add'>+</div><div class='add'>+		if (!MCI_GPM_IS_CAL_TYPE(recv_type))</div><div class='add'>+			ar9003_mci_process_gpm_extra(ah, recv_type,</div><div class='add'>+						     recv_opcode, p_gpm);</div><div class='add'>+</div><div class='add'>+		MCI_GPM_RECYCLE(p_gpm);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return time_out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type, u32 *p_data)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='add'>+	u32 value = 0, more_gpm = 0, gpm_ptr;</div><div class='add'>+	u8 query_type;</div><div class='add'>+</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (state_type) {</div><div class='add'>+	case MCI_STATE_ENABLE:</div><div class='add'>+		if (mci-&gt;ready) {</div><div class='add'>+</div><div class='add'>+			value = REG_READ(ah, AR_BTCOEX_CTRL);</div><div class='add'>+</div><div class='add'>+			if ((value == 0xdeadbeef) || (value == 0xffffffff))</div><div class='add'>+				value = 0;</div><div class='add'>+		}</div><div class='add'>+		value &amp;= AR_BTCOEX_CTRL_MCI_MODE_EN;</div><div class='add'>+		break;</div><div class='add'>+	case MCI_STATE_INIT_GPM_OFFSET:</div><div class='add'>+		value = MS(REG_READ(ah, AR_MCI_GPM_1), AR_MCI_GPM_WRITE_PTR);</div><div class='add'>+		ath_dbg(common, MCI, "MCI GPM initial WRITE_PTR=%d\n", value);</div><div class='add'>+		mci-&gt;gpm_idx = value;</div><div class='add'>+		break;</div><div class='add'>+	case MCI_STATE_NEXT_GPM_OFFSET:</div><div class='add'>+	case MCI_STATE_LAST_GPM_OFFSET:</div><div class='add'>+		/*</div><div class='add'>+		* This could be useful to avoid new GPM message interrupt which</div><div class='add'>+		* may lead to spurious interrupt after power sleep, or multiple</div><div class='add'>+		* entry of ath_mci_intr().</div><div class='add'>+		* Adding empty GPM check by returning HAL_MCI_GPM_INVALID can</div><div class='add'>+		* alleviate this effect, but clearing GPM RX interrupt bit is</div><div class='add'>+		* safe, because whether this is called from hw or driver code</div><div class='add'>+		* there must be an interrupt bit set/triggered initially</div><div class='add'>+		*/</div><div class='add'>+		REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,</div><div class='add'>+			  AR_MCI_INTERRUPT_RX_MSG_GPM);</div><div class='add'>+</div><div class='add'>+		gpm_ptr = MS(REG_READ(ah, AR_MCI_GPM_1), AR_MCI_GPM_WRITE_PTR);</div><div class='add'>+		value = gpm_ptr;</div><div class='add'>+</div><div class='add'>+		if (value == 0)</div><div class='add'>+			value = mci-&gt;gpm_len - 1;</div><div class='add'>+		else if (value &gt;= mci-&gt;gpm_len) {</div><div class='add'>+			if (value != 0xFFFF) {</div><div class='add'>+				value = 0;</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI GPM offset out of range\n");</div><div class='add'>+			}</div><div class='add'>+		} else</div><div class='add'>+			value--;</div><div class='add'>+</div><div class='add'>+		if (value == 0xFFFF) {</div><div class='add'>+			value = MCI_GPM_INVALID;</div><div class='add'>+			more_gpm = MCI_GPM_NOMORE;</div><div class='add'>+			ath_dbg(common, MCI,</div><div class='add'>+				"MCI GPM ptr invalid @ptr=%d, offset=%d, more=GPM_NOMORE\n",</div><div class='add'>+				gpm_ptr, value);</div><div class='add'>+		} else if (state_type == MCI_STATE_NEXT_GPM_OFFSET) {</div><div class='add'>+</div><div class='add'>+			if (gpm_ptr == mci-&gt;gpm_idx) {</div><div class='add'>+				value = MCI_GPM_INVALID;</div><div class='add'>+				more_gpm = MCI_GPM_NOMORE;</div><div class='add'>+</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI GPM message not available @ptr=%d, @offset=%d, more=GPM_NOMORE\n",</div><div class='add'>+					gpm_ptr, value);</div><div class='add'>+			} else {</div><div class='add'>+				for (;;) {</div><div class='add'>+</div><div class='add'>+					u32 temp_index;</div><div class='add'>+</div><div class='add'>+					/* skip reserved GPM if any */</div><div class='add'>+</div><div class='add'>+					if (value != mci-&gt;gpm_idx)</div><div class='add'>+						more_gpm = MCI_GPM_MORE;</div><div class='add'>+					else</div><div class='add'>+						more_gpm = MCI_GPM_NOMORE;</div><div class='add'>+</div><div class='add'>+					temp_index = mci-&gt;gpm_idx;</div><div class='add'>+					mci-&gt;gpm_idx++;</div><div class='add'>+</div><div class='add'>+					if (mci-&gt;gpm_idx &gt;=</div><div class='add'>+					    mci-&gt;gpm_len)</div><div class='add'>+						mci-&gt;gpm_idx = 0;</div><div class='add'>+</div><div class='add'>+					ath_dbg(common, MCI,</div><div class='add'>+						"MCI GPM message got ptr=%d, @offset=%d, more=%d\n",</div><div class='add'>+						gpm_ptr, temp_index,</div><div class='add'>+						(more_gpm == MCI_GPM_MORE));</div><div class='add'>+</div><div class='add'>+					if (ar9003_mci_is_gpm_valid(ah,</div><div class='add'>+								temp_index)) {</div><div class='add'>+						value = temp_index;</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+</div><div class='add'>+					if (more_gpm == MCI_GPM_NOMORE) {</div><div class='add'>+						value = MCI_GPM_INVALID;</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if (p_data)</div><div class='add'>+				*p_data = more_gpm;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (value != MCI_GPM_INVALID)</div><div class='add'>+				value &lt;&lt;= 4;</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+	case MCI_STATE_LAST_SCHD_MSG_OFFSET:</div><div class='add'>+		value = MS(REG_READ(ah, AR_MCI_RX_STATUS),</div><div class='add'>+				    AR_MCI_RX_LAST_SCHD_MSG_INDEX);</div><div class='add'>+		/* Make it in bytes */</div><div class='add'>+		value &lt;&lt;= 4;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_REMOTE_SLEEP:</div><div class='add'>+		value = MS(REG_READ(ah, AR_MCI_RX_STATUS),</div><div class='add'>+			   AR_MCI_RX_REMOTE_SLEEP) ?</div><div class='add'>+			MCI_BT_SLEEP : MCI_BT_AWAKE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_CONT_RSSI_POWER:</div><div class='add'>+		value = MS(mci-&gt;cont_status, AR_MCI_CONT_RSSI_POWER);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_CONT_PRIORITY:</div><div class='add'>+		value = MS(mci-&gt;cont_status, AR_MCI_CONT_RRIORITY);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_CONT_TXRX:</div><div class='add'>+		value = MS(mci-&gt;cont_status, AR_MCI_CONT_TXRX);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_BT:</div><div class='add'>+		value = mci-&gt;bt_state;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_SET_BT_SLEEP:</div><div class='add'>+		mci-&gt;bt_state = MCI_BT_SLEEP;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_SET_BT_AWAKE:</div><div class='add'>+		mci-&gt;bt_state = MCI_BT_AWAKE;</div><div class='add'>+		ar9003_mci_send_coex_version_query(ah, true);</div><div class='add'>+		ar9003_mci_send_coex_wlan_channels(ah, true);</div><div class='add'>+</div><div class='add'>+		if (mci-&gt;unhalt_bt_gpm) {</div><div class='add'>+</div><div class='add'>+			ath_dbg(common, MCI, "MCI unhalt BT GPM\n");</div><div class='add'>+			ar9003_mci_send_coex_halt_bt_gpm(ah, false, true);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ar9003_mci_2g5g_switch(ah, true);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_SET_BT_CAL_START:</div><div class='add'>+		mci-&gt;bt_state = MCI_BT_CAL_START;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_SET_BT_CAL:</div><div class='add'>+		mci-&gt;bt_state = MCI_BT_CAL;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_RESET_REQ_WAKE:</div><div class='add'>+		ar9003_mci_reset_req_wakeup(ah);</div><div class='add'>+		mci-&gt;update_2g5g = true;</div><div class='add'>+</div><div class='add'>+		if ((AR_SREV_9462_20_OR_LATER(ah)) &amp;&amp;</div><div class='add'>+		    (mci-&gt;config &amp; ATH_MCI_CONFIG_MCI_OBS_MASK)) {</div><div class='add'>+			/* Check if we still have control of the GPIOs */</div><div class='add'>+			if ((REG_READ(ah, AR_GLB_GPIO_CONTROL) &amp;</div><div class='add'>+				      ATH_MCI_CONFIG_MCI_OBS_GPIO) !=</div><div class='add'>+					ATH_MCI_CONFIG_MCI_OBS_GPIO) {</div><div class='add'>+</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI reconfigure observation\n");</div><div class='add'>+				ar9003_mci_observation_set_up(ah);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_SEND_WLAN_COEX_VERSION:</div><div class='add'>+		ar9003_mci_send_coex_version_response(ah, true);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_SET_BT_COEX_VERSION:</div><div class='add'>+</div><div class='add'>+		if (!p_data)</div><div class='add'>+			ath_dbg(common, MCI,</div><div class='add'>+				"MCI Set BT Coex version with NULL data!!\n");</div><div class='add'>+		else {</div><div class='add'>+			mci-&gt;bt_ver_major = (*p_data &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+			mci-&gt;bt_ver_minor = (*p_data) &amp; 0xff;</div><div class='add'>+			mci-&gt;bt_version_known = true;</div><div class='add'>+			ath_dbg(common, MCI, "MCI BT version set: %d.%d\n",</div><div class='add'>+				mci-&gt;bt_ver_major, mci-&gt;bt_ver_minor);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_SEND_WLAN_CHANNELS:</div><div class='add'>+		if (p_data) {</div><div class='add'>+			if (((mci-&gt;wlan_channels[1] &amp; 0xffff0000) ==</div><div class='add'>+			     (*(p_data + 1) &amp; 0xffff0000)) &amp;&amp;</div><div class='add'>+			    (mci-&gt;wlan_channels[2] == *(p_data + 2)) &amp;&amp;</div><div class='add'>+			    (mci-&gt;wlan_channels[3] == *(p_data + 3)))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			mci-&gt;wlan_channels[0] = *p_data++;</div><div class='add'>+			mci-&gt;wlan_channels[1] = *p_data++;</div><div class='add'>+			mci-&gt;wlan_channels[2] = *p_data++;</div><div class='add'>+			mci-&gt;wlan_channels[3] = *p_data++;</div><div class='add'>+		}</div><div class='add'>+		mci-&gt;wlan_channels_update = true;</div><div class='add'>+		ar9003_mci_send_coex_wlan_channels(ah, true);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_SEND_VERSION_QUERY:</div><div class='add'>+		ar9003_mci_send_coex_version_query(ah, true);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_SEND_STATUS_QUERY:</div><div class='add'>+		query_type = (AR_SREV_9462_10(ah)) ?</div><div class='add'>+				MCI_GPM_COEX_QUERY_BT_ALL_INFO :</div><div class='add'>+				MCI_GPM_COEX_QUERY_BT_TOPOLOGY;</div><div class='add'>+</div><div class='add'>+		ar9003_mci_send_coex_bt_status_query(ah, true, query_type);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_NEED_FLUSH_BT_INFO:</div><div class='add'>+			/*</div><div class='add'>+			 * btcoex_hw.mci.unhalt_bt_gpm means whether it's</div><div class='add'>+			 * needed to send UNHALT message. It's set whenever</div><div class='add'>+			 * there's a request to send HALT message.</div><div class='add'>+			 * mci_halted_bt_gpm means whether HALT message is sent</div><div class='add'>+			 * out successfully.</div><div class='add'>+			 *</div><div class='add'>+			 * Checking (mci_unhalt_bt_gpm == false) instead of</div><div class='add'>+			 * checking (ah-&gt;mci_halted_bt_gpm == false) will make</div><div class='add'>+			 * sure currently is in UNHALT-ed mode and BT can</div><div class='add'>+			 * respond to status query.</div><div class='add'>+			 */</div><div class='add'>+			value = (!mci-&gt;unhalt_bt_gpm &amp;&amp;</div><div class='add'>+				 mci-&gt;need_flush_btinfo) ? 1 : 0;</div><div class='add'>+			if (p_data)</div><div class='add'>+				mci-&gt;need_flush_btinfo =</div><div class='add'>+					(*p_data != 0) ? true : false;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_RECOVER_RX:</div><div class='add'>+</div><div class='add'>+		ath_dbg(common, MCI, "MCI hw RECOVER_RX\n");</div><div class='add'>+		ar9003_mci_prep_interface(ah);</div><div class='add'>+		mci-&gt;query_bt = true;</div><div class='add'>+		mci-&gt;need_flush_btinfo = true;</div><div class='add'>+		ar9003_mci_send_coex_wlan_channels(ah, true);</div><div class='add'>+		ar9003_mci_2g5g_switch(ah, true);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_NEED_FTP_STOMP:</div><div class='add'>+		value = !(mci-&gt;config &amp; ATH_MCI_CONFIG_DISABLE_FTP_STOMP);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_STATE_NEED_TUNING:</div><div class='add'>+		value = !(mci-&gt;config &amp; ATH_MCI_CONFIG_DISABLE_TUNING);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ar9003_mci_state);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.h b/drivers/net/wireless/ath/ath9k/ar9003_mci.h<br/>new file mode 100644<br/>index 000000000000..798da116a44c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_mci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/ar9003_mci.h</a></div><div class='hunk'>@@ -0,0 +1,102 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2010-2011 Atheros Communications Inc.</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'>+#ifndef AR9003_MCI_H</div><div class='add'>+#define AR9003_MCI_H</div><div class='add'>+</div><div class='add'>+#define MCI_FLAG_DISABLE_TIMESTAMP      0x00000001      /* Disable time stamp */</div><div class='add'>+</div><div class='add'>+/* Default remote BT device MCI COEX version */</div><div class='add'>+#define MCI_GPM_COEX_MAJOR_VERSION_DEFAULT  3</div><div class='add'>+#define MCI_GPM_COEX_MINOR_VERSION_DEFAULT  0</div><div class='add'>+</div><div class='add'>+/* Local WLAN MCI COEX version */</div><div class='add'>+#define MCI_GPM_COEX_MAJOR_VERSION_WLAN     3</div><div class='add'>+#define MCI_GPM_COEX_MINOR_VERSION_WLAN     0</div><div class='add'>+</div><div class='add'>+enum mci_gpm_coex_query_type {</div><div class='add'>+	MCI_GPM_COEX_QUERY_BT_ALL_INFO      = BIT(0),</div><div class='add'>+	MCI_GPM_COEX_QUERY_BT_TOPOLOGY      = BIT(1),</div><div class='add'>+	MCI_GPM_COEX_QUERY_BT_DEBUG         = BIT(2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mci_gpm_coex_halt_bt_gpm {</div><div class='add'>+	MCI_GPM_COEX_BT_GPM_UNHALT,</div><div class='add'>+	MCI_GPM_COEX_BT_GPM_HALT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mci_gpm_coex_bt_update_flags_op {</div><div class='add'>+	MCI_GPM_COEX_BT_FLAGS_READ,</div><div class='add'>+	MCI_GPM_COEX_BT_FLAGS_SET,</div><div class='add'>+	MCI_GPM_COEX_BT_FLAGS_CLEAR</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MCI_NUM_BT_CHANNELS     79</div><div class='add'>+</div><div class='add'>+#define MCI_BT_MCI_FLAGS_UPDATE_CORR          0x00000002</div><div class='add'>+#define MCI_BT_MCI_FLAGS_UPDATE_HDR           0x00000004</div><div class='add'>+#define MCI_BT_MCI_FLAGS_UPDATE_PLD           0x00000008</div><div class='add'>+#define MCI_BT_MCI_FLAGS_LNA_CTRL             0x00000010</div><div class='add'>+#define MCI_BT_MCI_FLAGS_DEBUG                0x00000020</div><div class='add'>+#define MCI_BT_MCI_FLAGS_SCHED_MSG            0x00000040</div><div class='add'>+#define MCI_BT_MCI_FLAGS_CONT_MSG             0x00000080</div><div class='add'>+#define MCI_BT_MCI_FLAGS_COEX_GPM             0x00000100</div><div class='add'>+#define MCI_BT_MCI_FLAGS_CPU_INT_MSG          0x00000200</div><div class='add'>+#define MCI_BT_MCI_FLAGS_MCI_MODE             0x00000400</div><div class='add'>+#define MCI_BT_MCI_FLAGS_AR9462_MODE          0x00001000</div><div class='add'>+#define MCI_BT_MCI_FLAGS_OTHER                0x00010000</div><div class='add'>+</div><div class='add'>+#define MCI_DEFAULT_BT_MCI_FLAGS              0x00011dde</div><div class='add'>+</div><div class='add'>+#define MCI_TOGGLE_BT_MCI_FLAGS  (MCI_BT_MCI_FLAGS_UPDATE_CORR | \</div><div class='add'>+				  MCI_BT_MCI_FLAGS_UPDATE_HDR  | \</div><div class='add'>+				  MCI_BT_MCI_FLAGS_UPDATE_PLD  | \</div><div class='add'>+				  MCI_BT_MCI_FLAGS_MCI_MODE)</div><div class='add'>+</div><div class='add'>+#define MCI_2G_FLAGS_CLEAR_MASK   0x00000000</div><div class='add'>+#define MCI_2G_FLAGS_SET_MASK     MCI_TOGGLE_BT_MCI_FLAGS</div><div class='add'>+#define MCI_2G_FLAGS              MCI_DEFAULT_BT_MCI_FLAGS</div><div class='add'>+</div><div class='add'>+#define MCI_5G_FLAGS_CLEAR_MASK   MCI_TOGGLE_BT_MCI_FLAGS</div><div class='add'>+#define MCI_5G_FLAGS_SET_MASK     0x00000000</div><div class='add'>+#define MCI_5G_FLAGS              (MCI_DEFAULT_BT_MCI_FLAGS &amp; \</div><div class='add'>+				   ~MCI_TOGGLE_BT_MCI_FLAGS)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Default value for AR9462 is 0x00002201</div><div class='add'>+ */</div><div class='add'>+#define ATH_MCI_CONFIG_CONCUR_TX            0x00000003</div><div class='add'>+#define ATH_MCI_CONFIG_MCI_OBS_MCI          0x00000004</div><div class='add'>+#define ATH_MCI_CONFIG_MCI_OBS_TXRX         0x00000008</div><div class='add'>+#define ATH_MCI_CONFIG_MCI_OBS_BT           0x00000010</div><div class='add'>+#define ATH_MCI_CONFIG_DISABLE_MCI_CAL      0x00000020</div><div class='add'>+#define ATH_MCI_CONFIG_DISABLE_OSLA         0x00000040</div><div class='add'>+#define ATH_MCI_CONFIG_DISABLE_FTP_STOMP    0x00000080</div><div class='add'>+#define ATH_MCI_CONFIG_AGGR_THRESH          0x00000700</div><div class='add'>+#define ATH_MCI_CONFIG_AGGR_THRESH_S        8</div><div class='add'>+#define ATH_MCI_CONFIG_DISABLE_AGGR_THRESH  0x00000800</div><div class='add'>+#define ATH_MCI_CONFIG_CLK_DIV              0x00003000</div><div class='add'>+#define ATH_MCI_CONFIG_CLK_DIV_S            12</div><div class='add'>+#define ATH_MCI_CONFIG_DISABLE_TUNING       0x00004000</div><div class='add'>+#define ATH_MCI_CONFIG_MCI_WEIGHT_DBG       0x40000000</div><div class='add'>+#define ATH_MCI_CONFIG_DISABLE_MCI          0x80000000</div><div class='add'>+</div><div class='add'>+#define ATH_MCI_CONFIG_MCI_OBS_MASK     (ATH_MCI_CONFIG_MCI_OBS_MCI  | \</div><div class='add'>+					 ATH_MCI_CONFIG_MCI_OBS_TXRX | \</div><div class='add'>+					 ATH_MCI_CONFIG_MCI_OBS_BT)</div><div class='add'>+#define ATH_MCI_CONFIG_MCI_OBS_GPIO     0x0000002F</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c<br/>index a4450cba0653..59647a3ceb7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_paprd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_paprd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_paprd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/ar9003_paprd.c</a></div><div class='hunk'>@@ -119,8 +119,8 @@ static int ar9003_get_training_power_5g(struct ath_hw *ah)</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		delta = 0;</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-		"Invalid tx-chainmask: %u\n", ah-&gt;txchainmask);</div><div class='add'>+		ath_dbg(common, CALIBRATE, "Invalid tx-chainmask: %u\n",</div><div class='add'>+			ah-&gt;txchainmask);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	power += delta;</div><div class='hunk'>@@ -148,13 +148,12 @@ static int ar9003_paprd_setup_single_table(struct ath_hw *ah)</div><div class='ctx'> 	else</div><div class='ctx'> 		training_power = ar9003_get_training_power_5g(ah);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-		"Training power: %d, Target power: %d\n",</div><div class='add'>+	ath_dbg(common, CALIBRATE, "Training power: %d, Target power: %d\n",</div><div class='ctx'> 		training_power, ah-&gt;paprd_target_power);</div><div class='ctx'> </div><div class='ctx'> 	if (training_power &lt; 0) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"PAPRD target power delta out of range");</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='add'>+			"PAPRD target power delta out of range\n");</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='ctx'> 	ah-&gt;paprd_training_power = training_power;</div><div class='hunk'>@@ -311,8 +310,8 @@ static unsigned int ar9003_get_desired_gain(struct ath_hw *ah, int chain,</div><div class='ctx'> 		reg_cl_gain = AR_PHY_CL_TAB_2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ath_dbg(ath9k_hw_common(ah), ATH_DBG_CALIBRATE,</div><div class='del'>-		"Invalid chainmask: %d\n", chain);</div><div class='add'>+		ath_dbg(ath9k_hw_common(ah), CALIBRATE,</div><div class='add'>+			"Invalid chainmask: %d\n", chain);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -850,7 +849,7 @@ bool ar9003_paprd_is_done(struct ath_hw *ah)</div><div class='ctx'> 		agc2_pwr = REG_READ_FIELD(ah, AR_PHY_PAPRD_TRAINER_STAT1,</div><div class='ctx'> 				AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_AGC2_PWR);</div><div class='ctx'> </div><div class='del'>-		ath_dbg(ath9k_hw_common(ah), ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(ath9k_hw_common(ah), CALIBRATE,</div><div class='ctx'> 			"AGC2_PWR = 0x%x training done = 0x%x\n",</div><div class='ctx'> 			agc2_pwr, paprd_done);</div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c<br/>index 2330e7ede199..2b0bfb8cca02 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_phy.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_phy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_phy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/ar9003_phy.c</a></div><div class='hunk'>@@ -46,7 +46,7 @@ static const int m2ThreshExt_off = 127;</div><div class='ctx'>  * @chan:</div><div class='ctx'>  *</div><div class='ctx'>  * This is the function to change channel on single-chip devices, that is</div><div class='del'>- * all devices after ar9280.</div><div class='add'>+ * for AR9300 family of chipsets.</div><div class='ctx'>  *</div><div class='ctx'>  * This function takes the channel value in MHz and sets</div><div class='ctx'>  * hardware channel value. Assumes writes have been enabled to analog bus.</div><div class='hunk'>@@ -199,12 +199,14 @@ static void ar9003_hw_spur_mitigate_mrc_cck(struct ath_hw *ah,</div><div class='ctx'> 			synth_freq = chan-&gt;channel;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		range = 10;</div><div class='add'>+		range = AR_SREV_9462(ah) ? 5 : 10;</div><div class='ctx'> 		max_spur_cnts = 4;</div><div class='ctx'> 		synth_freq = chan-&gt;channel;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; max_spur_cnts; i++) {</div><div class='add'>+		if (AR_SREV_9462(ah) &amp;&amp; (i == 0 || i == 3))</div><div class='add'>+			continue;</div><div class='ctx'> 		negative = 0;</div><div class='ctx'> 		if (AR_SREV_9485(ah) || AR_SREV_9340(ah) || AR_SREV_9330(ah))</div><div class='ctx'> 			cur_bb_spur = FBIN2FREQ(spur_fbin_ptr[i],</div><div class='hunk'>@@ -880,7 +882,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,</div><div class='ctx'> 				    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);</div><div class='ctx'> </div><div class='ctx'> 		if (!on != aniState-&gt;ofdmWeakSigDetectOff) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+			ath_dbg(common, ANI,</div><div class='ctx'> 				"** ch %d: ofdm weak signal: %s=&gt;%s\n",</div><div class='ctx'> 				chan-&gt;channel,</div><div class='ctx'> 				!aniState-&gt;ofdmWeakSigDetectOff ?</div><div class='hunk'>@@ -898,7 +900,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,</div><div class='ctx'> 		u32 level = param;</div><div class='ctx'> </div><div class='ctx'> 		if (level &gt;= ARRAY_SIZE(firstep_table)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+			ath_dbg(common, ANI,</div><div class='ctx'> 				"ATH9K_ANI_FIRSTEP_LEVEL: level out of range (%u &gt; %zu)\n",</div><div class='ctx'> 				level, ARRAY_SIZE(firstep_table));</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -935,7 +937,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,</div><div class='ctx'> 			      AR_PHY_FIND_SIG_LOW_FIRSTEP_LOW, value2);</div><div class='ctx'> </div><div class='ctx'> 		if (level != aniState-&gt;firstepLevel) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+			ath_dbg(common, ANI,</div><div class='ctx'> 				"** ch %d: level %d=&gt;%d[def:%d] firstep[level]=%d ini=%d\n",</div><div class='ctx'> 				chan-&gt;channel,</div><div class='ctx'> 				aniState-&gt;firstepLevel,</div><div class='hunk'>@@ -943,7 +945,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,</div><div class='ctx'> 				ATH9K_ANI_FIRSTEP_LVL_NEW,</div><div class='ctx'> 				value,</div><div class='ctx'> 				aniState-&gt;iniDef.firstep);</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+			ath_dbg(common, ANI,</div><div class='ctx'> 				"** ch %d: level %d=&gt;%d[def:%d] firstep_low[level]=%d ini=%d\n",</div><div class='ctx'> 				chan-&gt;channel,</div><div class='ctx'> 				aniState-&gt;firstepLevel,</div><div class='hunk'>@@ -963,7 +965,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,</div><div class='ctx'> 		u32 level = param;</div><div class='ctx'> </div><div class='ctx'> 		if (level &gt;= ARRAY_SIZE(cycpwrThr1_table)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+			ath_dbg(common, ANI,</div><div class='ctx'> 				"ATH9K_ANI_SPUR_IMMUNITY_LEVEL: level out of range (%u &gt; %zu)\n",</div><div class='ctx'> 				level, ARRAY_SIZE(cycpwrThr1_table));</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -999,7 +1001,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,</div><div class='ctx'> 			      AR_PHY_EXT_CYCPWR_THR1, value2);</div><div class='ctx'> </div><div class='ctx'> 		if (level != aniState-&gt;spurImmunityLevel) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+			ath_dbg(common, ANI,</div><div class='ctx'> 				"** ch %d: level %d=&gt;%d[def:%d] cycpwrThr1[level]=%d ini=%d\n",</div><div class='ctx'> 				chan-&gt;channel,</div><div class='ctx'> 				aniState-&gt;spurImmunityLevel,</div><div class='hunk'>@@ -1007,7 +1009,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,</div><div class='ctx'> 				ATH9K_ANI_SPUR_IMMUNE_LVL_NEW,</div><div class='ctx'> 				value,</div><div class='ctx'> 				aniState-&gt;iniDef.cycpwrThr1);</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+			ath_dbg(common, ANI,</div><div class='ctx'> 				"** ch %d: level %d=&gt;%d[def:%d] cycpwrThr1Ext[level]=%d ini=%d\n",</div><div class='ctx'> 				chan-&gt;channel,</div><div class='ctx'> 				aniState-&gt;spurImmunityLevel,</div><div class='hunk'>@@ -1034,8 +1036,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,</div><div class='ctx'> 		REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,</div><div class='ctx'> 			      AR_PHY_MRC_CCK_MUX_REG, is_on);</div><div class='ctx'> 		if (!is_on != aniState-&gt;mrcCCKOff) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='del'>-				"** ch %d: MRC CCK: %s=&gt;%s\n",</div><div class='add'>+			ath_dbg(common, ANI, "** ch %d: MRC CCK: %s=&gt;%s\n",</div><div class='ctx'> 				chan-&gt;channel,</div><div class='ctx'> 				!aniState-&gt;mrcCCKOff ? "on" : "off",</div><div class='ctx'> 				is_on ? "on" : "off");</div><div class='hunk'>@@ -1050,11 +1051,11 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,</div><div class='ctx'> 	case ATH9K_ANI_PRESENT:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ath_dbg(common, ATH_DBG_ANI, "invalid cmd %u\n", cmd);</div><div class='add'>+		ath_dbg(common, ANI, "invalid cmd %u\n", cmd);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_ANI,</div><div class='add'>+	ath_dbg(common, ANI,</div><div class='ctx'> 		"ANI parameters: SI=%d, ofdmWS=%s FS=%d MRCcck=%s listenTime=%d ofdmErrs=%d cckErrs=%d\n",</div><div class='ctx'> 		aniState-&gt;spurImmunityLevel,</div><div class='ctx'> 		!aniState-&gt;ofdmWeakSigDetectOff ? "on" : "off",</div><div class='hunk'>@@ -1123,8 +1124,7 @@ static void ar9003_hw_ani_cache_ini_regs(struct ath_hw *ah)</div><div class='ctx'> 	aniState = &amp;ah-&gt;curchan-&gt;ani;</div><div class='ctx'> 	iniDef = &amp;aniState-&gt;iniDef;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_ANI,</div><div class='del'>-		"ver %d.%d opmode %u chan %d Mhz/0x%x\n",</div><div class='add'>+	ath_dbg(common, ANI, "ver %d.%d opmode %u chan %d Mhz/0x%x\n",</div><div class='ctx'> 		ah-&gt;hw_version.macVersion,</div><div class='ctx'> 		ah-&gt;hw_version.macRev,</div><div class='ctx'> 		ah-&gt;opmode,</div><div class='hunk'>@@ -1386,7 +1386,7 @@ void ar9003_hw_bb_watchdog_config(struct ath_hw *ah)</div><div class='ctx'> 			  ~(AR_PHY_WATCHDOG_NON_IDLE_ENABLE |</div><div class='ctx'> 			    AR_PHY_WATCHDOG_IDLE_ENABLE));</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_RESET, "Disabled BB Watchdog\n");</div><div class='add'>+		ath_dbg(common, RESET, "Disabled BB Watchdog\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1422,8 +1422,7 @@ void ar9003_hw_bb_watchdog_config(struct ath_hw *ah)</div><div class='ctx'> 		  AR_PHY_WATCHDOG_IDLE_MASK |</div><div class='ctx'> 		  (AR_PHY_WATCHDOG_NON_IDLE_MASK &amp; (idle_count &lt;&lt; 2)));</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_RESET,</div><div class='del'>-		"Enabled BB Watchdog timeout (%u ms)\n",</div><div class='add'>+	ath_dbg(common, RESET, "Enabled BB Watchdog timeout (%u ms)\n",</div><div class='ctx'> 		idle_tmo_ms);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1452,9 +1451,9 @@ void ar9003_hw_bb_watchdog_dbg_info(struct ath_hw *ah)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	status = ah-&gt;bb_watchdog_last_status;</div><div class='del'>-	ath_dbg(common, ATH_DBG_RESET,</div><div class='add'>+	ath_dbg(common, RESET,</div><div class='ctx'> 		"\n==== BB update: BB status=0x%08x ====\n", status);</div><div class='del'>-	ath_dbg(common, ATH_DBG_RESET,</div><div class='add'>+	ath_dbg(common, RESET,</div><div class='ctx'> 		"** BB state: wd=%u det=%u rdar=%u rOFDM=%d rCCK=%u tOFDM=%u tCCK=%u agc=%u src=%u **\n",</div><div class='ctx'> 		MS(status, AR_PHY_WATCHDOG_INFO),</div><div class='ctx'> 		MS(status, AR_PHY_WATCHDOG_DET_HANG),</div><div class='hunk'>@@ -1466,22 +1465,19 @@ void ar9003_hw_bb_watchdog_dbg_info(struct ath_hw *ah)</div><div class='ctx'> 		MS(status, AR_PHY_WATCHDOG_AGC_SM),</div><div class='ctx'> 		MS(status, AR_PHY_WATCHDOG_SRCH_SM));</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_RESET,</div><div class='del'>-		"** BB WD cntl: cntl1=0x%08x cntl2=0x%08x **\n",</div><div class='add'>+	ath_dbg(common, RESET, "** BB WD cntl: cntl1=0x%08x cntl2=0x%08x **\n",</div><div class='ctx'> 		REG_READ(ah, AR_PHY_WATCHDOG_CTL_1),</div><div class='ctx'> 		REG_READ(ah, AR_PHY_WATCHDOG_CTL_2));</div><div class='del'>-	ath_dbg(common, ATH_DBG_RESET,</div><div class='del'>-		"** BB mode: BB_gen_controls=0x%08x **\n",</div><div class='add'>+	ath_dbg(common, RESET, "** BB mode: BB_gen_controls=0x%08x **\n",</div><div class='ctx'> 		REG_READ(ah, AR_PHY_GEN_CTRL));</div><div class='ctx'> </div><div class='ctx'> #define PCT(_field) (common-&gt;cc_survey._field * 100 / common-&gt;cc_survey.cycles)</div><div class='ctx'> 	if (common-&gt;cc_survey.cycles)</div><div class='del'>-		ath_dbg(common, ATH_DBG_RESET,</div><div class='add'>+		ath_dbg(common, RESET,</div><div class='ctx'> 			"** BB busy times: rx_clear=%d%%, rx_frame=%d%%, tx_frame=%d%% **\n",</div><div class='ctx'> 			PCT(rx_busy), PCT(rx_frame), PCT(tx_frame));</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_RESET,</div><div class='del'>-		"==== BB update: done ====\n\n");</div><div class='add'>+	ath_dbg(common, RESET, "==== BB update: done ====\n\n");</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ar9003_hw_bb_watchdog_dbg_info);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h<br/>index 4114fe752c6b..ed64114571fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_phy.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_phy.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_phy.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/ar9003_phy.h</a></div><div class='hunk'>@@ -389,6 +389,8 @@</div><div class='ctx'> #define AR_PHY_DAG_CTRLCCK_RSSI_THR_S   10</div><div class='ctx'> </div><div class='ctx'> #define AR_PHY_RIFS_INIT_DELAY         0x3ff0000</div><div class='add'>+#define AR_PHY_AGC_QUICK_DROP       0x03c00000</div><div class='add'>+#define AR_PHY_AGC_QUICK_DROP_S     22</div><div class='ctx'> #define AR_PHY_AGC_COARSE_LOW       0x00007F80</div><div class='ctx'> #define AR_PHY_AGC_COARSE_LOW_S     7</div><div class='ctx'> #define AR_PHY_AGC_COARSE_HIGH      0x003F8000</div><div class='hunk'>@@ -488,6 +490,8 @@</div><div class='ctx'> #define AR_PHY_TEST_CTL_TSTADC_EN_S       8</div><div class='ctx'> #define AR_PHY_TEST_CTL_RX_OBS_SEL        0x3C00</div><div class='ctx'> #define AR_PHY_TEST_CTL_RX_OBS_SEL_S      10</div><div class='add'>+#define AR_PHY_TEST_CTL_DEBUGPORT_SEL	  0xe0000000</div><div class='add'>+#define AR_PHY_TEST_CTL_DEBUGPORT_SEL_S	  29</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define AR_PHY_TSTDAC            (AR_SM_BASE + 0x168)</div><div class='hunk'>@@ -999,6 +1003,7 @@</div><div class='ctx'> </div><div class='ctx'> /* GLB Registers */</div><div class='ctx'> #define AR_GLB_BASE	0x20000</div><div class='add'>+#define AR_GLB_GPIO_CONTROL	(AR_GLB_BASE)</div><div class='ctx'> #define AR_PHY_GLB_CONTROL	(AR_GLB_BASE + 0x44)</div><div class='ctx'> #define AR_GLB_SCRATCH(_ah)	(AR_GLB_BASE + \</div><div class='ctx'> 					(AR_SREV_9462_20(_ah) ? 0x4c : 0x50))</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9003_rtt.c b/drivers/net/wireless/ath/ath9k/ar9003_rtt.c<br/>index 48803ee9c0d6..458bedf0b0ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_rtt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9003_rtt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9003_rtt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/ar9003_rtt.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "hw.h"</div><div class='ctx'> #include "ar9003_phy.h"</div><div class='add'>+#include "ar9003_rtt.h"</div><div class='ctx'> </div><div class='ctx'> #define RTT_RESTORE_TIMEOUT          1000</div><div class='ctx'> #define RTT_ACCESS_TIMEOUT           100</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h<br/>index 9c51b395b4ff..dc2054f0378e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h</a></div><div class='hunk'>@@ -41,24 +41,24 @@ static const u32 ar9462_pciephy_clkreq_enable_L1_2p0[][2] = {</div><div class='ctx'> </div><div class='ctx'> static const u32 ar9462_2p0_baseband_postamble[][5] = {</div><div class='ctx'> 	/* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */</div><div class='del'>-	{0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a8011},</div><div class='del'>-	{0x00009820, 0x206a022e, 0x206a022e, 0x206a012e, 0x206a012e},</div><div class='del'>-	{0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},</div><div class='del'>-	{0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},</div><div class='add'>+	{0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a800d},</div><div class='add'>+	{0x00009820, 0x206a022e, 0x206a022e, 0x206a012e, 0x206a01ae},</div><div class='add'>+	{0x00009824, 0x5ac640de, 0x5ac640d0, 0x5ac640d0, 0x63c640da},</div><div class='add'>+	{0x00009828, 0x0796be89, 0x0696b081, 0x0696b881, 0x09143e81},</div><div class='ctx'> 	{0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},</div><div class='ctx'> 	{0x00009830, 0x0000059c, 0x0000059c, 0x0000119c, 0x0000119c},</div><div class='ctx'> 	{0x00009c00, 0x000000c4, 0x000000c4, 0x000000c4, 0x000000c4},</div><div class='ctx'> 	{0x00009e00, 0x0372111a, 0x0372111a, 0x037216a0, 0x037216a0},</div><div class='ctx'> 	{0x00009e04, 0x001c2020, 0x001c2020, 0x001c2020, 0x001c2020},</div><div class='del'>-	{0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},</div><div class='del'>-	{0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec84d2e, 0x7ec84d2e},</div><div class='del'>-	{0x00009e14, 0x37b95d5e, 0x37b9605e, 0x3039605e, 0x33795d5e},</div><div class='add'>+	{0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000d8},</div><div class='add'>+	{0x00009e10, 0x92c88d2e, 0x7ec88d2e, 0x7ec84d2e, 0x7ec86d2e},</div><div class='add'>+	{0x00009e14, 0x37b95d5e, 0x37b9605e, 0x3376605e, 0x33795d5e},</div><div class='ctx'> 	{0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},</div><div class='ctx'> 	{0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},</div><div class='ctx'> 	{0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},</div><div class='ctx'> 	{0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},</div><div class='del'>-	{0x00009e3c, 0xcf946220, 0xcf946220, 0xcfd5c782, 0xcfd5c782},</div><div class='del'>-	{0x00009e44, 0xfe321e27, 0xfe321e27, 0xfe291e27, 0xfe291e27},</div><div class='add'>+	{0x00009e3c, 0xcf946220, 0xcf946220, 0xcfd5c782, 0xcfd5c282},</div><div class='add'>+	{0x00009e44, 0x62321e27, 0x62321e27, 0xfe291e27, 0xfe291e27},</div><div class='ctx'> 	{0x00009e48, 0x5030201a, 0x5030201a, 0x50302012, 0x50302012},</div><div class='ctx'> 	{0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},</div><div class='ctx'> 	{0x0000a204, 0x013187c0, 0x013187c4, 0x013187c4, 0x013187c0},</div><div class='hunk'>@@ -81,6 +81,15 @@ static const u32 ar9462_2p0_baseband_postamble[][5] = {</div><div class='ctx'> 	{0x0000a2d0, 0x00041981, 0x00041981, 0x00041981, 0x00041982},</div><div class='ctx'> 	{0x0000a2d8, 0x7999a83b, 0x7999a83b, 0x7999a83b, 0x7999a83b},</div><div class='ctx'> 	{0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},</div><div class='add'>+	{0x0000a3a4, 0x00000010, 0x00000010, 0x00000000, 0x00000000},</div><div class='add'>+	{0x0000a3a8, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa},</div><div class='add'>+	{0x0000a3ac, 0xaaaaaa00, 0xaaaaaa30, 0xaaaaaa00, 0xaaaaaa00},</div><div class='add'>+	{0x0000a41c, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce},</div><div class='add'>+	{0x0000a420, 0x000001ce, 0x000001ce, 0x000001ce, 0x000001ce},</div><div class='add'>+	{0x0000a424, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce},</div><div class='add'>+	{0x0000a428, 0x000001ce, 0x000001ce, 0x000001ce, 0x000001ce},</div><div class='add'>+	{0x0000a42c, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce},</div><div class='add'>+	{0x0000a430, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce},</div><div class='ctx'> 	{0x0000a830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},</div><div class='ctx'> 	{0x0000ae04, 0x001c0000, 0x001c0000, 0x001c0000, 0x00100000},</div><div class='ctx'> 	{0x0000ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},</div><div class='hunk'>@@ -688,8 +697,8 @@ static const u32 ar9462_2p0_mac_postamble_emulation[][5] = {</div><div class='ctx'> static const u32 ar9462_2p0_radio_postamble_sys3ant[][5] = {</div><div class='ctx'> 	/* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */</div><div class='ctx'> 	{0x000160ac, 0xa4646c08, 0xa4646c08, 0x24645808, 0x24645808},</div><div class='del'>-	{0x00016140, 0x10804008, 0x10804008, 0x90804008, 0x90804008},</div><div class='del'>-	{0x00016540, 0x10804008, 0x10804008, 0x90804008, 0x90804008},</div><div class='add'>+	{0x00016140, 0x10804008, 0x10804008, 0x50804008, 0x50804008},</div><div class='add'>+	{0x00016540, 0x10804008, 0x10804008, 0x50804008, 0x50804008},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const u32 ar9462_2p0_baseband_postamble_emulation[][5] = {</div><div class='hunk'>@@ -717,8 +726,8 @@ static const u32 ar9462_2p0_baseband_postamble_emulation[][5] = {</div><div class='ctx'> static const u32 ar9462_2p0_radio_postamble_sys2ant[][5] = {</div><div class='ctx'> 	/* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */</div><div class='ctx'> 	{0x000160ac, 0xa4646c08, 0xa4646c08, 0x24645808, 0x24645808},</div><div class='del'>-	{0x00016140, 0x10804008, 0x10804008, 0x90804008, 0x90804008},</div><div class='del'>-	{0x00016540, 0x10804008, 0x10804008, 0x90804008, 0x90804008},</div><div class='add'>+	{0x00016140, 0x10804008, 0x10804008, 0x50804008, 0x50804008},</div><div class='add'>+	{0x00016540, 0x10804008, 0x10804008, 0x50804008, 0x50804008},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const u32 ar9462_common_wo_xlna_rx_gain_table_2p0[][2] = {</div><div class='hunk'>@@ -1059,7 +1068,7 @@ static const u32 ar9462_modes_low_ob_db_tx_gain_table_2p0[][5] = {</div><div class='ctx'> </div><div class='ctx'> static const u32 ar9462_2p0_soc_postamble[][5] = {</div><div class='ctx'> 	/* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */</div><div class='del'>-	{0x00007010, 0x00002233, 0x00002233, 0x00002233, 0x00002233},</div><div class='add'>+	{0x00007010, 0x00000033, 0x00000033, 0x00000033, 0x00000033},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const u32 ar9462_2p0_baseband_core[][2] = {</div><div class='hunk'>@@ -1107,11 +1116,11 @@ static const u32 ar9462_2p0_baseband_core[][2] = {</div><div class='ctx'> 	{0x00009e30, 0x06336f77},</div><div class='ctx'> 	{0x00009e34, 0x6af6532f},</div><div class='ctx'> 	{0x00009e38, 0x0cc80c00},</div><div class='del'>-	{0x00009e40, 0x0d261820},</div><div class='add'>+	{0x00009e40, 0x15262820},</div><div class='ctx'> 	{0x00009e4c, 0x00001004},</div><div class='ctx'> 	{0x00009e50, 0x00ff03f1},</div><div class='del'>-	{0x00009e54, 0xe4c355c7},</div><div class='del'>-	{0x00009e58, 0xfd897735},</div><div class='add'>+	{0x00009e54, 0xe4c555c2},</div><div class='add'>+	{0x00009e58, 0xfd857722},</div><div class='ctx'> 	{0x00009e5c, 0xe9198724},</div><div class='ctx'> 	{0x00009fc0, 0x803e4788},</div><div class='ctx'> 	{0x00009fc4, 0x0001efb5},</div><div class='hunk'>@@ -1142,9 +1151,6 @@ static const u32 ar9462_2p0_baseband_core[][2] = {</div><div class='ctx'> 	{0x0000a398, 0x001f0e0f},</div><div class='ctx'> 	{0x0000a39c, 0x0075393f},</div><div class='ctx'> 	{0x0000a3a0, 0xb79f6427},</div><div class='del'>-	{0x0000a3a4, 0x00000000},</div><div class='del'>-	{0x0000a3a8, 0xaaaaaaaa},</div><div class='del'>-	{0x0000a3ac, 0x3c466478},</div><div class='ctx'> 	{0x0000a3c0, 0x20202020},</div><div class='ctx'> 	{0x0000a3c4, 0x22222220},</div><div class='ctx'> 	{0x0000a3c8, 0x20200020},</div><div class='hunk'>@@ -1167,12 +1173,6 @@ static const u32 ar9462_2p0_baseband_core[][2] = {</div><div class='ctx'> 	{0x0000a40c, 0x00820820},</div><div class='ctx'> 	{0x0000a414, 0x1ce739ce},</div><div class='ctx'> 	{0x0000a418, 0x2d001dce},</div><div class='del'>-	{0x0000a41c, 0x1ce739ce},</div><div class='del'>-	{0x0000a420, 0x000001ce},</div><div class='del'>-	{0x0000a424, 0x1ce739ce},</div><div class='del'>-	{0x0000a428, 0x000001ce},</div><div class='del'>-	{0x0000a42c, 0x1ce739ce},</div><div class='del'>-	{0x0000a430, 0x1ce739ce},</div><div class='ctx'> 	{0x0000a434, 0x00000000},</div><div class='ctx'> 	{0x0000a438, 0x00001801},</div><div class='ctx'> 	{0x0000a43c, 0x00100000},</div><div class='hunk'>@@ -1257,8 +1257,8 @@ static const u32 ar9462_modes_high_ob_db_tx_gain_table_2p0[][5] = {</div><div class='ctx'> 	{0x0000a540, 0x48025e6c, 0x48025e6c, 0x38001660, 0x38001660},</div><div class='ctx'> 	{0x0000a544, 0x4e025e8e, 0x4e025e8e, 0x3b001861, 0x3b001861},</div><div class='ctx'> 	{0x0000a548, 0x53025eb2, 0x53025eb2, 0x3e001a81, 0x3e001a81},</div><div class='del'>-	{0x0000a54c, 0x59025eb2, 0x59025eb2, 0x42001a83, 0x42001a83},</div><div class='del'>-	{0x0000a550, 0x5f025ef6, 0x5f025ef6, 0x44001c84, 0x44001c84},</div><div class='add'>+	{0x0000a54c, 0x59025eb6, 0x59025eb6, 0x42001a83, 0x42001a83},</div><div class='add'>+	{0x0000a550, 0x5d025ef6, 0x5d025ef6, 0x44001c84, 0x44001c84},</div><div class='ctx'> 	{0x0000a554, 0x62025f56, 0x62025f56, 0x48001ce3, 0x48001ce3},</div><div class='ctx'> 	{0x0000a558, 0x66027f56, 0x66027f56, 0x4c001ce5, 0x4c001ce5},</div><div class='ctx'> 	{0x0000a55c, 0x6a029f56, 0x6a029f56, 0x50001ce9, 0x50001ce9},</div><div class='hunk'>@@ -1850,8 +1850,8 @@ static const u32 ar9462_modes_green_ob_db_tx_gain_table_2p0[][5] = {</div><div class='ctx'> 	{0x0000a540, 0x48025e6c, 0x48025e6c, 0x38001660, 0x38001660},</div><div class='ctx'> 	{0x0000a544, 0x4e025e8e, 0x4e025e8e, 0x3b001861, 0x3b001861},</div><div class='ctx'> 	{0x0000a548, 0x53025eb2, 0x53025eb2, 0x3e001a81, 0x3e001a81},</div><div class='del'>-	{0x0000a54c, 0x59025eb2, 0x59025eb2, 0x42001a83, 0x42001a83},</div><div class='del'>-	{0x0000a550, 0x5f025ef6, 0x5f025ef6, 0x44001c84, 0x44001c84},</div><div class='add'>+	{0x0000a54c, 0x59025eb6, 0x59025eb6, 0x42001a83, 0x42001a83},</div><div class='add'>+	{0x0000a550, 0x5d025ef6, 0x5d025ef6, 0x44001c84, 0x44001c84},</div><div class='ctx'> 	{0x0000a554, 0x62025f56, 0x62025f56, 0x48001ce3, 0x48001ce3},</div><div class='ctx'> 	{0x0000a558, 0x66027f56, 0x66027f56, 0x4c001ce5, 0x4c001ce5},</div><div class='ctx'> 	{0x0000a55c, 0x6a029f56, 0x6a029f56, 0x50001ce9, 0x50001ce9},</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h<br/>index 1c269f50822b..171ccf7c972f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ath9k.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/ath9k.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/ath9k.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/ath9k.h</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "debug.h"</div><div class='ctx'> #include "common.h"</div><div class='add'>+#include "mci.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Header for the ath9k.ko driver core *only* -- hw code nor any other driver</div><div class='hunk'>@@ -96,7 +97,7 @@ enum buffer_type {</div><div class='ctx'> #define bf_isampdu(bf)		(bf-&gt;bf_state.bf_type &amp; BUF_AMPDU)</div><div class='ctx'> #define bf_isaggr(bf)		(bf-&gt;bf_state.bf_type &amp; BUF_AGGR)</div><div class='ctx'> </div><div class='del'>-#define ATH_TXSTATUS_RING_SIZE 64</div><div class='add'>+#define ATH_TXSTATUS_RING_SIZE 512</div><div class='ctx'> </div><div class='ctx'> #define	DS2PHYS(_dd, _ds)						\</div><div class='ctx'> 	((_dd)-&gt;dd_desc_paddr + ((caddr_t)(_ds) - (caddr_t)(_dd)-&gt;dd_desc))</div><div class='hunk'>@@ -158,6 +159,9 @@ void ath_descdma_cleanup(struct ath_softc *sc, struct ath_descdma *dd,</div><div class='ctx'> /* return block-ack bitmap index given sequence and starting sequence */</div><div class='ctx'> #define ATH_BA_INDEX(_st, _seq) (((_seq) - (_st)) &amp; (IEEE80211_SEQ_MAX - 1))</div><div class='ctx'> </div><div class='add'>+/* return the seqno for _start + _offset */</div><div class='add'>+#define ATH_BA_INDEX2SEQ(_seq, _offset) (((_seq) + (_offset)) &amp; (IEEE80211_SEQ_MAX - 1))</div><div class='add'>+</div><div class='ctx'> /* returns delimiter padding required given the packet length */</div><div class='ctx'> #define ATH_AGGR_GET_NDELIM(_len)					\</div><div class='ctx'>        (((_len) &gt;= ATH_AGGR_MINPLEN) ? 0 :                             \</div><div class='hunk'>@@ -192,6 +196,7 @@ struct ath_txq {</div><div class='ctx'> 	u8 txq_headidx;</div><div class='ctx'> 	u8 txq_tailidx;</div><div class='ctx'> 	int pending_frames;</div><div class='add'>+	struct sk_buff_head complete_q;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath_atx_ac {</div><div class='hunk'>@@ -237,6 +242,7 @@ struct ath_atx_tid {</div><div class='ctx'> 	struct ath_node *an;</div><div class='ctx'> 	struct ath_atx_ac *ac;</div><div class='ctx'> 	unsigned long tx_buf[BITS_TO_LONGS(ATH_TID_MAX_BUFS)];</div><div class='add'>+	int bar_index;</div><div class='ctx'> 	u16 seq_start;</div><div class='ctx'> 	u16 seq_next;</div><div class='ctx'> 	u16 baw_size;</div><div class='hunk'>@@ -251,8 +257,9 @@ struct ath_atx_tid {</div><div class='ctx'> struct ath_node {</div><div class='ctx'> #ifdef CONFIG_ATH9K_DEBUGFS</div><div class='ctx'> 	struct list_head list; /* for sc-&gt;nodes */</div><div class='del'>-	struct ieee80211_sta *sta; /* station struct we're part of */</div><div class='ctx'> #endif</div><div class='add'>+	struct ieee80211_sta *sta; /* station struct we're part of */</div><div class='add'>+	struct ieee80211_vif *vif; /* interface with which we're associated */</div><div class='ctx'> 	struct ath_atx_tid tid[WME_NUM_TID];</div><div class='ctx'> 	struct ath_atx_ac ac[WME_NUM_AC];</div><div class='ctx'> 	int ps_key;</div><div class='hunk'>@@ -274,7 +281,6 @@ struct ath_tx_control {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define ATH_TX_ERROR        0x01</div><div class='del'>-#define ATH_TX_BAR          0x02</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * @txq_map:  Index is mac80211 queue number.  This is</div><div class='hunk'>@@ -443,7 +449,9 @@ struct ath_btcoex {</div><div class='ctx'> 	u32 btcoex_no_stomp; /* in usec */</div><div class='ctx'> 	u32 btcoex_period; /* in usec */</div><div class='ctx'> 	u32 btscan_no_stomp; /* in usec */</div><div class='add'>+	u32 duty_cycle;</div><div class='ctx'> 	struct ath_gen_timer *no_stomp_timer; /* Timer for no BT stomping */</div><div class='add'>+	struct ath_mci_profile mci;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int ath_init_btcoex_timer(struct ath_softc *sc);</div><div class='hunk'>@@ -458,7 +466,7 @@ void ath9k_btcoex_timer_pause(struct ath_softc *sc);</div><div class='ctx'> #define ATH_LED_PIN_9287		8</div><div class='ctx'> #define ATH_LED_PIN_9300		10</div><div class='ctx'> #define ATH_LED_PIN_9485		6</div><div class='del'>-#define ATH_LED_PIN_9462		0</div><div class='add'>+#define ATH_LED_PIN_9462		4</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MAC80211_LEDS</div><div class='ctx'> void ath_init_leds(struct ath_softc *sc);</div><div class='hunk'>@@ -538,7 +546,7 @@ struct ath_ant_comb {</div><div class='ctx'> #define DEFAULT_CACHELINE       32</div><div class='ctx'> #define ATH_REGCLASSIDS_MAX     10</div><div class='ctx'> #define ATH_CABQ_READY_TIME     80      /* % of beacon interval */</div><div class='del'>-#define ATH_MAX_SW_RETRIES      10</div><div class='add'>+#define ATH_MAX_SW_RETRIES      30</div><div class='ctx'> #define ATH_CHAN_MAX            255</div><div class='ctx'> </div><div class='ctx'> #define ATH_TXPOWER_MAX         100     /* .5 dBm units */</div><div class='hunk'>@@ -643,6 +651,7 @@ struct ath_softc {</div><div class='ctx'> 	struct delayed_work tx_complete_work;</div><div class='ctx'> 	struct delayed_work hw_pll_work;</div><div class='ctx'> 	struct ath_btcoex btcoex;</div><div class='add'>+	struct ath_mci_coex mci_coex;</div><div class='ctx'> </div><div class='ctx'> 	struct ath_descdma txsdma;</div><div class='ctx'> </div><div class='hunk'>@@ -670,7 +679,6 @@ void ath9k_deinit_device(struct ath_softc *sc);</div><div class='ctx'> void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw);</div><div class='ctx'> void ath9k_reload_chainmask_settings(struct ath_softc *sc);</div><div class='ctx'> </div><div class='del'>-void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw);</div><div class='ctx'> bool ath9k_uses_beacons(int type);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ATH9K_PCI</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c<br/>index a13cabb95435..b8967e482e6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/beacon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/beacon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/beacon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/beacon.c</a></div><div class='hunk'>@@ -117,11 +117,10 @@ static void ath_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> 	memset(&amp;txctl, 0, sizeof(struct ath_tx_control));</div><div class='ctx'> 	txctl.txq = sc-&gt;beacon.cabq;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_XMIT,</div><div class='del'>-		"transmitting CABQ packet, skb: %p\n", skb);</div><div class='add'>+	ath_dbg(common, XMIT, "transmitting CABQ packet, skb: %p\n", skb);</div><div class='ctx'> </div><div class='ctx'> 	if (ath_tx_start(hw, skb, &amp;txctl) != 0) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_XMIT, "CABQ TX failed\n");</div><div class='add'>+		ath_dbg(common, XMIT, "CABQ TX failed\n");</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -204,7 +203,7 @@ static struct ath_buf *ath_beacon_generate(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	if (skb &amp;&amp; cabq_depth) {</div><div class='ctx'> 		if (sc-&gt;nvifs &gt; 1) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_BEACON,</div><div class='add'>+			ath_dbg(common, BEACON,</div><div class='ctx'> 				"Flushing previous cabq traffic\n");</div><div class='ctx'> 			ath_draintxq(sc, cabq, false);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -297,7 +296,7 @@ int ath_beacon_alloc(struct ath_softc *sc, struct ieee80211_vif *vif)</div><div class='ctx'> 		tsfadjust = TU_TO_USEC(intval * avp-&gt;av_bslot) / ATH_BCBUF;</div><div class='ctx'> 		avp-&gt;tsf_adjust = cpu_to_le64(tsfadjust);</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_BEACON,</div><div class='add'>+		ath_dbg(common, BEACON,</div><div class='ctx'> 			"stagger beacons, bslot %d intval %u tsfadjust %llu\n",</div><div class='ctx'> 			avp-&gt;av_bslot, intval, (unsigned long long)tsfadjust);</div><div class='ctx'> </div><div class='hunk'>@@ -357,6 +356,7 @@ void ath_beacon_tasklet(unsigned long data)</div><div class='ctx'> 	struct ath_buf *bf = NULL;</div><div class='ctx'> 	struct ieee80211_vif *vif;</div><div class='ctx'> 	struct ath_tx_status ts;</div><div class='add'>+	bool edma = !!(ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_EDMA);</div><div class='ctx'> 	int slot;</div><div class='ctx'> 	u32 bfaddr, bc = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -371,15 +371,14 @@ void ath_beacon_tasklet(unsigned long data)</div><div class='ctx'> 		sc-&gt;beacon.bmisscnt++;</div><div class='ctx'> </div><div class='ctx'> 		if (sc-&gt;beacon.bmisscnt &lt; BSTUCK_THRESH * sc-&gt;nbcnvifs) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_BSTUCK,</div><div class='add'>+			ath_dbg(common, BSTUCK,</div><div class='ctx'> 				"missed %u consecutive beacons\n",</div><div class='ctx'> 				sc-&gt;beacon.bmisscnt);</div><div class='ctx'> 			ath9k_hw_stop_dma_queue(ah, sc-&gt;beacon.beaconq);</div><div class='ctx'> 			if (sc-&gt;beacon.bmisscnt &gt; 3)</div><div class='ctx'> 				ath9k_hw_bstuck_nfcal(ah);</div><div class='ctx'> 		} else if (sc-&gt;beacon.bmisscnt &gt;= BSTUCK_THRESH) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_BSTUCK,</div><div class='del'>-				"beacon is officially stuck\n");</div><div class='add'>+			ath_dbg(common, BSTUCK, "beacon is officially stuck\n");</div><div class='ctx'> 			sc-&gt;sc_flags |= SC_OP_TSF_RESET;</div><div class='ctx'> 			ieee80211_queue_work(sc-&gt;hw, &amp;sc-&gt;hw_reset_work);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -406,7 +405,7 @@ void ath_beacon_tasklet(unsigned long data)</div><div class='ctx'> 		slot = (tsftu % (intval * ATH_BCBUF)) / intval;</div><div class='ctx'> 		vif = sc-&gt;beacon.bslot[slot];</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_BEACON,</div><div class='add'>+		ath_dbg(common, BEACON,</div><div class='ctx'> 			"slot %d [tsf %llu tsftu %u intval %u] vif %p\n",</div><div class='ctx'> 			slot, tsf, tsftu / ATH_BCBUF, intval, vif);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -424,7 +423,7 @@ void ath_beacon_tasklet(unsigned long data)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (sc-&gt;beacon.bmisscnt != 0) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_BSTUCK,</div><div class='add'>+			ath_dbg(common, BSTUCK,</div><div class='ctx'> 				"resume beacon xmit after %u misses\n",</div><div class='ctx'> 				sc-&gt;beacon.bmisscnt);</div><div class='ctx'> 			sc-&gt;beacon.bmisscnt = 0;</div><div class='hunk'>@@ -458,10 +457,12 @@ void ath_beacon_tasklet(unsigned long data)</div><div class='ctx'> 	if (bfaddr != 0) {</div><div class='ctx'> 		/* NB: cabq traffic should already be queued and primed */</div><div class='ctx'> 		ath9k_hw_puttxbuf(ah, sc-&gt;beacon.beaconq, bfaddr);</div><div class='del'>-		ath9k_hw_txstart(ah, sc-&gt;beacon.beaconq);</div><div class='add'>+</div><div class='add'>+		if (!edma)</div><div class='add'>+			ath9k_hw_txstart(ah, sc-&gt;beacon.beaconq);</div><div class='ctx'> </div><div class='ctx'> 		sc-&gt;beacon.ast_be_xmit += bc;     /* XXX per-vif? */</div><div class='del'>-		if (ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_EDMA) {</div><div class='add'>+		if (edma) {</div><div class='ctx'> 			spin_lock_bh(&amp;sc-&gt;sc_pcu_lock);</div><div class='ctx'> 			ath9k_hw_txprocdesc(ah, bf-&gt;bf_desc, (void *)&amp;ts);</div><div class='ctx'> 			spin_unlock_bh(&amp;sc-&gt;sc_pcu_lock);</div><div class='hunk'>@@ -541,7 +542,7 @@ static void ath_beacon_config_sta(struct ath_softc *sc,</div><div class='ctx'> </div><div class='ctx'> 	/* No need to configure beacon if we are not associated */</div><div class='ctx'> 	if (!common-&gt;curaid) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_BEACON,</div><div class='add'>+		ath_dbg(common, BEACON,</div><div class='ctx'> 			"STA is not yet associated..skipping beacon config\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -631,8 +632,8 @@ static void ath_beacon_config_sta(struct ath_softc *sc,</div><div class='ctx'> 	/* TSF out of range threshold fixed at 1 second */</div><div class='ctx'> 	bs.bs_tsfoor_threshold = ATH9K_TSFOOR_THRESHOLD;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_BEACON, "tsf: %llu tsftu: %u\n", tsf, tsftu);</div><div class='del'>-	ath_dbg(common, ATH_DBG_BEACON,</div><div class='add'>+	ath_dbg(common, BEACON, "tsf: %llu tsftu: %u\n", tsf, tsftu);</div><div class='add'>+	ath_dbg(common, BEACON,</div><div class='ctx'> 		"bmiss: %u sleep: %u cfp-period: %u maxdur: %u next: %u\n",</div><div class='ctx'> 		bs.bs_bmissthreshold, bs.bs_sleepduration,</div><div class='ctx'> 		bs.bs_cfpperiod, bs.bs_cfpmaxduration, bs.bs_cfpnext);</div><div class='hunk'>@@ -660,8 +661,7 @@ static void ath_beacon_config_adhoc(struct ath_softc *sc,</div><div class='ctx'> 	tsf = roundup(ath9k_hw_gettsf32(ah) + TU_TO_USEC(FUDGE), intval);</div><div class='ctx'> 	nexttbtt = tsf + intval;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_BEACON,</div><div class='del'>-		"IBSS nexttbtt %u intval %u (%u)\n",</div><div class='add'>+	ath_dbg(common, BEACON, "IBSS nexttbtt %u intval %u (%u)\n",</div><div class='ctx'> 		nexttbtt, intval, conf-&gt;beacon_interval);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -699,9 +699,8 @@ static bool ath9k_allow_beacon_config(struct ath_softc *sc,</div><div class='ctx'> 	    (sc-&gt;nbcnvifs &gt; 1) &amp;&amp;</div><div class='ctx'> 	    (vif-&gt;type == NL80211_IFTYPE_AP) &amp;&amp;</div><div class='ctx'> 	    (cur_conf-&gt;beacon_interval != bss_conf-&gt;beacon_int)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-			"Changing beacon interval of multiple \</div><div class='del'>-			AP interfaces !\n");</div><div class='add'>+		ath_dbg(common, CONFIG,</div><div class='add'>+			"Changing beacon interval of multiple AP interfaces !\n");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -710,7 +709,7 @@ static bool ath9k_allow_beacon_config(struct ath_softc *sc,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((sc-&gt;sc_ah-&gt;opmode == NL80211_IFTYPE_AP) &amp;&amp;</div><div class='ctx'> 	    (vif-&gt;type != NL80211_IFTYPE_AP)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+		ath_dbg(common, CONFIG,</div><div class='ctx'> 			"STA vif's beacon not allowed on AP mode\n");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -722,7 +721,7 @@ static bool ath9k_allow_beacon_config(struct ath_softc *sc,</div><div class='ctx'> 	    (vif-&gt;type == NL80211_IFTYPE_STATION) &amp;&amp;</div><div class='ctx'> 	    (sc-&gt;sc_flags &amp; SC_OP_BEACONS) &amp;&amp;</div><div class='ctx'> 	    !avp-&gt;primary_sta_vif) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+		ath_dbg(common, CONFIG,</div><div class='ctx'> 			"Beacon already configured for a station interface\n");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -802,8 +801,7 @@ void ath_set_beacon(struct ath_softc *sc)</div><div class='ctx'> 		ath_beacon_config_sta(sc, cur_conf);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-			"Unsupported beaconing mode\n");</div><div class='add'>+		ath_dbg(common, CONFIG, "Unsupported beaconing mode\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/btcoex.c b/drivers/net/wireless/ath/ath9k/btcoex.c<br/>index 012263968d64..a6712a95d76a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/btcoex.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/btcoex.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/btcoex.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/btcoex.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@ enum ath_bt_mode {</div><div class='ctx'> 	ATH_BT_COEX_MODE_LEGACY,        /* legacy rx_clear mode */</div><div class='ctx'> 	ATH_BT_COEX_MODE_UNSLOTTED,     /* untimed/unslotted mode */</div><div class='ctx'> 	ATH_BT_COEX_MODE_SLOTTED,       /* slotted mode */</div><div class='del'>-	ATH_BT_COEX_MODE_DISALBED,      /* coexistence disabled */</div><div class='add'>+	ATH_BT_COEX_MODE_DISABLED,      /* coexistence disabled */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath_btcoex_config {</div><div class='hunk'>@@ -36,6 +36,20 @@ struct ath_btcoex_config {</div><div class='ctx'> 	bool bt_hold_rx_clear;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const u32 ar9003_wlan_weights[ATH_BTCOEX_STOMP_MAX]</div><div class='add'>+				    [AR9300_NUM_WLAN_WEIGHTS] = {</div><div class='add'>+	{ 0xfffffff0, 0xfffffff0, 0xfffffff0, 0xfffffff0 }, /* STOMP_ALL */</div><div class='add'>+	{ 0x88888880, 0x88888880, 0x88888880, 0x88888880 }, /* STOMP_LOW */</div><div class='add'>+	{ 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* STOMP_NONE */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 ar9462_wlan_weights[ATH_BTCOEX_STOMP_MAX]</div><div class='add'>+				    [AR9300_NUM_WLAN_WEIGHTS] = {</div><div class='add'>+	{ 0x01017d01, 0x41414101, 0x41414101, 0x41414141 }, /* STOMP_ALL */</div><div class='add'>+	{ 0x01017d01, 0x3b3b3b01, 0x3b3b3b01, 0x3b3b3b3b }, /* STOMP_LOW */</div><div class='add'>+	{ 0x01017d01, 0x01010101, 0x01010101, 0x01010101 }, /* STOMP_NONE */</div><div class='add'>+	{ 0x01017d01, 0x013b0101, 0x3b3b0101, 0x3b3b013b }, /* STOMP_LOW_FTP */</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> void ath9k_hw_init_btcoex_hw(struct ath_hw *ah, int qnum)</div><div class='ctx'> {</div><div class='hunk'>@@ -54,6 +68,9 @@ void ath9k_hw_init_btcoex_hw(struct ath_hw *ah, int qnum)</div><div class='ctx'> 	u32 i, idx;</div><div class='ctx'> 	bool rxclear_polarity = ath_bt_config.bt_rxclear_polarity;</div><div class='ctx'> </div><div class='add'>+	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (AR_SREV_9300_20_OR_LATER(ah))</div><div class='ctx'> 		rxclear_polarity = !ath_bt_config.bt_rxclear_polarity;</div><div class='ctx'> </div><div class='hunk'>@@ -85,6 +102,9 @@ void ath9k_hw_btcoex_init_2wire(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_btcoex_hw *btcoex_hw = &amp;ah-&gt;btcoex_hw;</div><div class='ctx'> </div><div class='add'>+	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/* connect bt_active to baseband */</div><div class='ctx'> 	REG_CLR_BIT(ah, AR_GPIO_INPUT_EN_VAL,</div><div class='ctx'> 		    (AR_GPIO_INPUT_EN_VAL_BT_PRIORITY_DEF |</div><div class='hunk'>@@ -107,6 +127,9 @@ void ath9k_hw_btcoex_init_3wire(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_btcoex_hw *btcoex_hw = &amp;ah-&gt;btcoex_hw;</div><div class='ctx'> </div><div class='add'>+	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/* btcoex 3-wire */</div><div class='ctx'> 	REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL,</div><div class='ctx'> 			(AR_GPIO_INPUT_EN_VAL_BT_PRIORITY_BB |</div><div class='hunk'>@@ -133,6 +156,9 @@ static void ath9k_hw_btcoex_enable_2wire(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_btcoex_hw *btcoex_hw = &amp;ah-&gt;btcoex_hw;</div><div class='ctx'> </div><div class='add'>+	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/* Configure the desired GPIO port for TX_FRAME output */</div><div class='ctx'> 	ath9k_hw_cfg_output(ah, btcoex_hw-&gt;wlanactive_gpio,</div><div class='ctx'> 			    AR_GPIO_OUTPUT_MUX_AS_TX_FRAME);</div><div class='hunk'>@@ -144,6 +170,9 @@ void ath9k_hw_btcoex_set_weight(struct ath_hw *ah,</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_btcoex_hw *btcoex_hw = &amp;ah-&gt;btcoex_hw;</div><div class='ctx'> </div><div class='add'>+	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	btcoex_hw-&gt;bt_coex_weights = SM(bt_weight, AR_BTCOEX_BT_WGHT) |</div><div class='ctx'> 				     SM(wlan_weight, AR_BTCOEX_WL_WGHT);</div><div class='ctx'> }</div><div class='hunk'>@@ -152,27 +181,26 @@ EXPORT_SYMBOL(ath9k_hw_btcoex_set_weight);</div><div class='ctx'> </div><div class='ctx'> static void ath9k_hw_btcoex_enable_3wire(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='del'>-	struct ath_btcoex_hw *btcoex_hw = &amp;ah-&gt;btcoex_hw;</div><div class='add'>+	struct ath_btcoex_hw *btcoex = &amp;ah-&gt;btcoex_hw;</div><div class='ctx'> 	u32  val;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Program coex mode and weight registers to</div><div class='ctx'> 	 * enable coex 3-wire</div><div class='ctx'> 	 */</div><div class='del'>-	REG_WRITE(ah, AR_BT_COEX_MODE, btcoex_hw-&gt;bt_coex_mode);</div><div class='del'>-	REG_WRITE(ah, AR_BT_COEX_MODE2, btcoex_hw-&gt;bt_coex_mode2);</div><div class='add'>+	REG_WRITE(ah, AR_BT_COEX_MODE, btcoex-&gt;bt_coex_mode);</div><div class='add'>+	REG_WRITE(ah, AR_BT_COEX_MODE2, btcoex-&gt;bt_coex_mode2);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9300_20_OR_LATER(ah)) {</div><div class='del'>-		REG_WRITE(ah, AR_BT_COEX_WL_WEIGHTS0, ah-&gt;bt_coex_wlan_weight[0]);</div><div class='del'>-		REG_WRITE(ah, AR_BT_COEX_WL_WEIGHTS1, ah-&gt;bt_coex_wlan_weight[1]);</div><div class='del'>-		REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS0, ah-&gt;bt_coex_bt_weight[0]);</div><div class='del'>-		REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS1, ah-&gt;bt_coex_bt_weight[1]);</div><div class='del'>-		REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS2, ah-&gt;bt_coex_bt_weight[2]);</div><div class='del'>-		REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS3, ah-&gt;bt_coex_bt_weight[3]);</div><div class='del'>-</div><div class='add'>+		REG_WRITE(ah, AR_BT_COEX_WL_WEIGHTS0, btcoex-&gt;wlan_weight[0]);</div><div class='add'>+		REG_WRITE(ah, AR_BT_COEX_WL_WEIGHTS1, btcoex-&gt;wlan_weight[1]);</div><div class='add'>+		for (i = 0; i &lt; AR9300_NUM_BT_WEIGHTS; i++)</div><div class='add'>+			REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS(i),</div><div class='add'>+				  btcoex-&gt;bt_weight[i]);</div><div class='ctx'> 	} else</div><div class='del'>-		REG_WRITE(ah, AR_BT_COEX_WEIGHT, btcoex_hw-&gt;bt_coex_weights);</div><div class='add'>+		REG_WRITE(ah, AR_BT_COEX_WEIGHT, btcoex-&gt;bt_coex_weights);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -185,23 +213,39 @@ static void ath9k_hw_btcoex_enable_3wire(struct ath_hw *ah)</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_QUIET1, AR_QUIET1_QUIET_ACK_CTS_ENABLE, 1);</div><div class='ctx'> 	REG_RMW_FIELD(ah, AR_PCU_MISC, AR_PCU_BT_ANT_PREVENT_RX, 0);</div><div class='ctx'> </div><div class='del'>-	ath9k_hw_cfg_output(ah, btcoex_hw-&gt;wlanactive_gpio,</div><div class='add'>+	ath9k_hw_cfg_output(ah, btcoex-&gt;wlanactive_gpio,</div><div class='ctx'> 			    AR_GPIO_OUTPUT_MUX_AS_RX_CLEAR_EXTERNAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath9k_hw_btcoex_enable_mci(struct ath_hw *ah)</div><div class='add'>+{</div><div class='add'>+	struct ath_btcoex_hw *btcoex = &amp;ah-&gt;btcoex_hw;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AR9300_NUM_BT_WEIGHTS; i++)</div><div class='add'>+		REG_WRITE(ah, AR_MCI_COEX_WL_WEIGHTS(i),</div><div class='add'>+			  btcoex-&gt;wlan_weight[i]);</div><div class='add'>+</div><div class='add'>+	REG_RMW_FIELD(ah, AR_QUIET1, AR_QUIET1_QUIET_ACK_CTS_ENABLE, 1);</div><div class='add'>+	btcoex-&gt;enabled = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void ath9k_hw_btcoex_enable(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_btcoex_hw *btcoex_hw = &amp;ah-&gt;btcoex_hw;</div><div class='ctx'> </div><div class='del'>-	switch (btcoex_hw-&gt;scheme) {</div><div class='add'>+	switch (ath9k_hw_get_btcoex_scheme(ah)) {</div><div class='ctx'> 	case ATH_BTCOEX_CFG_NONE:</div><div class='del'>-		break;</div><div class='add'>+		return;</div><div class='ctx'> 	case ATH_BTCOEX_CFG_2WIRE:</div><div class='ctx'> 		ath9k_hw_btcoex_enable_2wire(ah);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATH_BTCOEX_CFG_3WIRE:</div><div class='ctx'> 		ath9k_hw_btcoex_enable_3wire(ah);</div><div class='ctx'> 		break;</div><div class='add'>+	case ATH_BTCOEX_CFG_MCI:</div><div class='add'>+		ath9k_hw_btcoex_enable_mci(ah);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	REG_RMW(ah, AR_GPIO_PDPU,</div><div class='hunk'>@@ -215,7 +259,18 @@ EXPORT_SYMBOL(ath9k_hw_btcoex_enable);</div><div class='ctx'> void ath9k_hw_btcoex_disable(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_btcoex_hw *btcoex_hw = &amp;ah-&gt;btcoex_hw;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='add'>+	btcoex_hw-&gt;enabled = false;</div><div class='add'>+	if (btcoex_hw-&gt;scheme == ATH_BTCOEX_CFG_MCI) {</div><div class='add'>+		ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_NONE);</div><div class='add'>+		for (i = 0; i &lt; AR9300_NUM_BT_WEIGHTS; i++)</div><div class='add'>+			REG_WRITE(ah, AR_MCI_COEX_WL_WEIGHTS(i),</div><div class='add'>+				  btcoex_hw-&gt;wlan_weight[i]);</div><div class='add'>+	}</div><div class='ctx'> 	ath9k_hw_set_gpio(ah, btcoex_hw-&gt;wlanactive_gpio, 0);</div><div class='ctx'> </div><div class='ctx'> 	ath9k_hw_cfg_output(ah, btcoex_hw-&gt;wlanactive_gpio,</div><div class='hunk'>@@ -228,49 +283,27 @@ void ath9k_hw_btcoex_disable(struct ath_hw *ah)</div><div class='ctx'> 		if (AR_SREV_9300_20_OR_LATER(ah)) {</div><div class='ctx'> 			REG_WRITE(ah, AR_BT_COEX_WL_WEIGHTS0, 0);</div><div class='ctx'> 			REG_WRITE(ah, AR_BT_COEX_WL_WEIGHTS1, 0);</div><div class='del'>-			REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS0, 0);</div><div class='del'>-			REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS1, 0);</div><div class='del'>-			REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS2, 0);</div><div class='del'>-			REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS3, 0);</div><div class='add'>+			for (i = 0; i &lt; AR9300_NUM_BT_WEIGHTS; i++)</div><div class='add'>+				REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS(i), 0);</div><div class='ctx'> 		} else</div><div class='ctx'> 			REG_WRITE(ah, AR_BT_COEX_WEIGHT, 0);</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ah-&gt;btcoex_hw.enabled = false;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath9k_hw_btcoex_disable);</div><div class='ctx'> </div><div class='ctx'> static void ar9003_btcoex_bt_stomp(struct ath_hw *ah,</div><div class='ctx'> 			 enum ath_stomp_type stomp_type)</div><div class='ctx'> {</div><div class='del'>-	ah-&gt;bt_coex_bt_weight[0] = AR9300_BT_WGHT;</div><div class='del'>-	ah-&gt;bt_coex_bt_weight[1] = AR9300_BT_WGHT;</div><div class='del'>-	ah-&gt;bt_coex_bt_weight[2] = AR9300_BT_WGHT;</div><div class='del'>-	ah-&gt;bt_coex_bt_weight[3] = AR9300_BT_WGHT;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	switch (stomp_type) {</div><div class='del'>-	case ATH_BTCOEX_STOMP_ALL:</div><div class='del'>-		ah-&gt;bt_coex_wlan_weight[0] = AR9300_STOMP_ALL_WLAN_WGHT0;</div><div class='del'>-		ah-&gt;bt_coex_wlan_weight[1] = AR9300_STOMP_ALL_WLAN_WGHT1;</div><div class='del'>-		break;</div><div class='del'>-	case ATH_BTCOEX_STOMP_LOW:</div><div class='del'>-		ah-&gt;bt_coex_wlan_weight[0] = AR9300_STOMP_LOW_WLAN_WGHT0;</div><div class='del'>-		ah-&gt;bt_coex_wlan_weight[1] = AR9300_STOMP_LOW_WLAN_WGHT1;</div><div class='del'>-		break;</div><div class='del'>-	case ATH_BTCOEX_STOMP_NONE:</div><div class='del'>-		ah-&gt;bt_coex_wlan_weight[0] = AR9300_STOMP_NONE_WLAN_WGHT0;</div><div class='del'>-		ah-&gt;bt_coex_wlan_weight[1] = AR9300_STOMP_NONE_WLAN_WGHT1;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		ath_dbg(ath9k_hw_common(ah), ATH_DBG_BTCOEX,</div><div class='del'>-				"Invalid Stomptype\n");</div><div class='del'>-		break;</div><div class='add'>+	struct ath_btcoex_hw *btcoex = &amp;ah-&gt;btcoex_hw;</div><div class='add'>+	const u32 *weight = AR_SREV_9462(ah) ? ar9003_wlan_weights[stomp_type] :</div><div class='add'>+					       ar9462_wlan_weights[stomp_type];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AR9300_NUM_WLAN_WEIGHTS; i++) {</div><div class='add'>+		btcoex-&gt;bt_weight[i] = AR9300_BT_WGHT;</div><div class='add'>+		btcoex-&gt;wlan_weight[i] = weight[i];</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ath9k_hw_btcoex_enable(ah);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -279,6 +312,9 @@ static void ar9003_btcoex_bt_stomp(struct ath_hw *ah,</div><div class='ctx'> void ath9k_hw_btcoex_bt_stomp(struct ath_hw *ah,</div><div class='ctx'> 			      enum ath_stomp_type stomp_type)</div><div class='ctx'> {</div><div class='add'>+	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (AR_SREV_9300_20_OR_LATER(ah)) {</div><div class='ctx'> 		ar9003_btcoex_bt_stomp(ah, stomp_type);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -298,11 +334,8 @@ void ath9k_hw_btcoex_bt_stomp(struct ath_hw *ah,</div><div class='ctx'> 				AR_STOMP_NONE_WLAN_WGHT);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ath_dbg(ath9k_hw_common(ah), ATH_DBG_BTCOEX,</div><div class='del'>-				"Invalid Stomptype\n");</div><div class='add'>+		ath_dbg(ath9k_hw_common(ah), BTCOEX, "Invalid Stomptype\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ath9k_hw_btcoex_enable(ah);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath9k_hw_btcoex_bt_stomp);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/btcoex.h b/drivers/net/wireless/ath/ath9k/btcoex.h<br/>index 234f77689b14..278361c867ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/btcoex.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/btcoex.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/btcoex.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/btcoex.h</a></div><div class='hunk'>@@ -36,22 +36,57 @@</div><div class='ctx'> #define ATH_BT_CNT_THRESHOLD	       3</div><div class='ctx'> #define ATH_BT_CNT_SCAN_THRESHOLD      15</div><div class='ctx'> </div><div class='add'>+#define AR9300_NUM_BT_WEIGHTS   4</div><div class='add'>+#define AR9300_NUM_WLAN_WEIGHTS 4</div><div class='ctx'> /* Defines the BT AR_BT_COEX_WGHT used */</div><div class='ctx'> enum ath_stomp_type {</div><div class='del'>-	ATH_BTCOEX_NO_STOMP,</div><div class='ctx'> 	ATH_BTCOEX_STOMP_ALL,</div><div class='ctx'> 	ATH_BTCOEX_STOMP_LOW,</div><div class='del'>-	ATH_BTCOEX_STOMP_NONE</div><div class='add'>+	ATH_BTCOEX_STOMP_NONE,</div><div class='add'>+	ATH_BTCOEX_STOMP_LOW_FTP,</div><div class='add'>+	ATH_BTCOEX_STOMP_MAX</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ath_btcoex_scheme {</div><div class='ctx'> 	ATH_BTCOEX_CFG_NONE,</div><div class='ctx'> 	ATH_BTCOEX_CFG_2WIRE,</div><div class='ctx'> 	ATH_BTCOEX_CFG_3WIRE,</div><div class='add'>+	ATH_BTCOEX_CFG_MCI,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath9k_hw_mci {</div><div class='add'>+	u32 raw_intr;</div><div class='add'>+	u32 rx_msg_intr;</div><div class='add'>+	u32 cont_status;</div><div class='add'>+	u32 gpm_addr;</div><div class='add'>+	u32 gpm_len;</div><div class='add'>+	u32 gpm_idx;</div><div class='add'>+	u32 sched_addr;</div><div class='add'>+	u32 wlan_channels[4];</div><div class='add'>+	u32 wlan_cal_seq;</div><div class='add'>+	u32 wlan_cal_done;</div><div class='add'>+	u32 config;</div><div class='add'>+	u8 *gpm_buf;</div><div class='add'>+	u8 *sched_buf;</div><div class='add'>+	bool ready;</div><div class='add'>+	bool update_2g5g;</div><div class='add'>+	bool is_2g;</div><div class='add'>+	bool query_bt;</div><div class='add'>+	bool unhalt_bt_gpm; /* need send UNHALT */</div><div class='add'>+	bool halted_bt_gpm; /* HALT sent */</div><div class='add'>+	bool need_flush_btinfo;</div><div class='add'>+	bool bt_version_known;</div><div class='add'>+	bool wlan_channels_update;</div><div class='add'>+	u8 wlan_ver_major;</div><div class='add'>+	u8 wlan_ver_minor;</div><div class='add'>+	u8 bt_ver_major;</div><div class='add'>+	u8 bt_ver_minor;</div><div class='add'>+	u8 bt_state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath_btcoex_hw {</div><div class='ctx'> 	enum ath_btcoex_scheme scheme;</div><div class='add'>+	struct ath9k_hw_mci mci;</div><div class='ctx'> 	bool enabled;</div><div class='ctx'> 	u8 wlanactive_gpio;</div><div class='ctx'> 	u8 btactive_gpio;</div><div class='hunk'>@@ -59,6 +94,8 @@ struct ath_btcoex_hw {</div><div class='ctx'> 	u32 bt_coex_mode; 	/* Register setting for AR_BT_COEX_MODE */</div><div class='ctx'> 	u32 bt_coex_weights; 	/* Register setting for AR_BT_COEX_WEIGHT */</div><div class='ctx'> 	u32 bt_coex_mode2; 	/* Register setting for AR_BT_COEX_MODE2 */</div><div class='add'>+	u32 bt_weight[AR9300_NUM_BT_WEIGHTS];</div><div class='add'>+	u32 wlan_weight[AR9300_NUM_WLAN_WEIGHTS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void ath9k_hw_btcoex_init_2wire(struct ath_hw *ah);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c<br/>index 99538810a312..2f4b48e6fb03 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/calib.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/calib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/calib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/calib.c</a></div><div class='hunk'>@@ -116,7 +116,7 @@ static void ath9k_hw_update_nfcal_hist_buffer(struct ath_hw *ah,</div><div class='ctx'> 		if (h[i].privNF &gt; limit-&gt;max) {</div><div class='ctx'> 			high_nf_mid = true;</div><div class='ctx'> </div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='ctx'> 				"NFmid[%d] (%d) &gt; MAX (%d), %s\n",</div><div class='ctx'> 				i, h[i].privNF, limit-&gt;max,</div><div class='ctx'> 				(cal-&gt;nfcal_interference ?</div><div class='hunk'>@@ -199,8 +199,7 @@ bool ath9k_hw_reset_calvalid(struct ath_hw *ah)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	if (currCal-&gt;calState != CAL_DONE) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Calibration state incorrect, %d\n",</div><div class='add'>+		ath_dbg(common, CALIBRATE, "Calibration state incorrect, %d\n",</div><div class='ctx'> 			currCal-&gt;calState);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -208,8 +207,7 @@ bool ath9k_hw_reset_calvalid(struct ath_hw *ah)</div><div class='ctx'> 	if (!(ah-&gt;supp_cals &amp; currCal-&gt;calData-&gt;calType))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-		"Resetting Cal %d state for channel %u\n",</div><div class='add'>+	ath_dbg(common, CALIBRATE, "Resetting Cal %d state for channel %u\n",</div><div class='ctx'> 		currCal-&gt;calData-&gt;calType, conf-&gt;channel-&gt;center_freq);</div><div class='ctx'> </div><div class='ctx'> 	ah-&gt;caldata-&gt;CalValid &amp;= ~currCal-&gt;calData-&gt;calType;</div><div class='hunk'>@@ -302,7 +300,7 @@ void ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 	 * noisefloor until the next calibration timer.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (j == 10000) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_ANY,</div><div class='add'>+		ath_dbg(common, ANY,</div><div class='ctx'> 			"Timeout while waiting for nf to load: AR_PHY_AGC_CONTROL=0x%x\n",</div><div class='ctx'> 			REG_READ(ah, AR_PHY_AGC_CONTROL));</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -344,17 +342,17 @@ static void ath9k_hw_nf_sanitize(struct ath_hw *ah, s16 *nf)</div><div class='ctx'> 		if (!nf[i])</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='ctx'> 			"NF calibrated [%s] [chain %d] is %d\n",</div><div class='ctx'> 			(i &gt;= 3 ? "ext" : "ctl"), i % 3, nf[i]);</div><div class='ctx'> </div><div class='ctx'> 		if (nf[i] &gt; ATH9K_NF_TOO_HIGH) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='ctx'> 				"NF[%d] (%d) &gt; MAX (%d), correcting to MAX\n",</div><div class='ctx'> 				i, nf[i], ATH9K_NF_TOO_HIGH);</div><div class='ctx'> 			nf[i] = limit-&gt;max;</div><div class='ctx'> 		} else if (nf[i] &lt; limit-&gt;min) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='ctx'> 				"NF[%d] (%d) &lt; MIN (%d), correcting to NOM\n",</div><div class='ctx'> 				i, nf[i], limit-&gt;min);</div><div class='ctx'> 			nf[i] = limit-&gt;nominal;</div><div class='hunk'>@@ -373,7 +371,7 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> </div><div class='ctx'> 	chan-&gt;channelFlags &amp;= (~CHANNEL_CW_INT);</div><div class='ctx'> 	if (REG_READ(ah, AR_PHY_AGC_CONTROL) &amp; AR_PHY_AGC_CONTROL_NF) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='ctx'> 			"NF did not complete in calibration window\n");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -383,7 +381,7 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 	nf = nfarray[0];</div><div class='ctx'> 	if (ath9k_hw_get_nf_thresh(ah, c-&gt;band, &amp;nfThresh)</div><div class='ctx'> 	    &amp;&amp; nf &gt; nfThresh) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='ctx'> 			"noise floor failed detected; detected %d, threshold %d\n",</div><div class='ctx'> 			nf, nfThresh);</div><div class='ctx'> 		chan-&gt;channelFlags |= CHANNEL_CW_INT;</div><div class='hunk'>@@ -402,6 +400,7 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan)</div><div class='ctx'> 	ah-&gt;noise = ath9k_hw_getchan_noise(ah, chan);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ath9k_hw_getnf);</div><div class='ctx'> </div><div class='ctx'> void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah,</div><div class='ctx'> 				  struct ath9k_channel *chan)</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/calib.h b/drivers/net/wireless/ath/ath9k/calib.h<br/>index 05b9dbf81850..3b33996d97df 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/calib.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/calib.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/calib.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/calib.h</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "hw.h"</div><div class='ctx'> </div><div class='del'>-#define AR_PHY_CCA_FILTERWINDOW_LENGTH_INIT     3</div><div class='ctx'> #define AR_PHY_CCA_FILTERWINDOW_LENGTH          5</div><div class='ctx'> </div><div class='ctx'> #define NUM_NF_READINGS       6</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c<br/>index 2741203e803f..68d972bf232d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/debug.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/debug.c</a></div><div class='hunk'>@@ -709,24 +709,29 @@ static ssize_t read_file_stations(struct file *file, char __user *user_buf,</div><div class='ctx'> </div><div class='ctx'> 	len += snprintf(buf + len, size - len,</div><div class='ctx'> 			"Stations:\n"</div><div class='del'>-			" tid: addr sched paused buf_q-empty an ac\n"</div><div class='add'>+			" tid: addr sched paused buf_q-empty an ac baw\n"</div><div class='ctx'> 			" ac: addr sched tid_q-empty txq\n");</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;sc-&gt;nodes_lock);</div><div class='ctx'> 	list_for_each_entry(an, &amp;sc-&gt;nodes, list) {</div><div class='add'>+		unsigned short ma = an-&gt;maxampdu;</div><div class='add'>+		if (ma == 0)</div><div class='add'>+			ma = 65535; /* see ath_lookup_rate */</div><div class='ctx'> 		len += snprintf(buf + len, size - len,</div><div class='del'>-				"%pM\n", an-&gt;sta-&gt;addr);</div><div class='add'>+				"iface: %pM  sta: %pM max-ampdu: %hu mpdu-density: %uus\n",</div><div class='add'>+				an-&gt;vif-&gt;addr, an-&gt;sta-&gt;addr, ma,</div><div class='add'>+				(unsigned int)(an-&gt;mpdudensity));</div><div class='ctx'> 		if (len &gt;= size)</div><div class='ctx'> 			goto done;</div><div class='ctx'> </div><div class='ctx'> 		for (q = 0; q &lt; WME_NUM_TID; q++) {</div><div class='ctx'> 			struct ath_atx_tid *tid = &amp;(an-&gt;tid[q]);</div><div class='ctx'> 			len += snprintf(buf + len, size - len,</div><div class='del'>-					" tid: %p %s %s %i %p %p\n",</div><div class='add'>+					" tid: %p %s %s %i %p %p %hu\n",</div><div class='ctx'> 					tid, tid-&gt;sched ? "sched" : "idle",</div><div class='ctx'> 					tid-&gt;paused ? "paused" : "running",</div><div class='ctx'> 					skb_queue_empty(&amp;tid-&gt;buf_q),</div><div class='del'>-					tid-&gt;an, tid-&gt;ac);</div><div class='add'>+					tid-&gt;an, tid-&gt;ac, tid-&gt;baw_size);</div><div class='ctx'> 			if (len &gt;= size)</div><div class='ctx'> 				goto done;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -851,7 +856,7 @@ void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 	sc-&gt;debug.stats.txstats[qnum].tx_bytes_all += bf-&gt;bf_mpdu-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	if (bf_isampdu(bf)) {</div><div class='del'>-		if (flags &amp; ATH_TX_BAR)</div><div class='add'>+		if (flags &amp; ATH_TX_ERROR)</div><div class='ctx'> 			TX_STAT_INC(qnum, a_xretries);</div><div class='ctx'> 		else</div><div class='ctx'> 			TX_STAT_INC(qnum, a_completed);</div><div class='hunk'>@@ -1625,6 +1630,9 @@ int ath9k_init_debug(struct ath_hw *ah)</div><div class='ctx'> 	debugfs_create_file("debug", S_IRUSR | S_IWUSR, sc-&gt;debug.debugfs_phy,</div><div class='ctx'> 			    sc, &amp;fops_debug);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	ath9k_dfs_init_debug(sc);</div><div class='add'>+</div><div class='ctx'> 	debugfs_create_file("dma", S_IRUSR, sc-&gt;debug.debugfs_phy, sc,</div><div class='ctx'> 			    &amp;fops_dma);</div><div class='ctx'> 	debugfs_create_file("interrupt", S_IRUSR, sc-&gt;debug.debugfs_phy, sc,</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h<br/>index 356352ac2d6e..776a24ada600 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/debug.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/debug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/debug.h</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "hw.h"</div><div class='ctx'> #include "rc.h"</div><div class='add'>+#include "dfs_debug.h"</div><div class='ctx'> </div><div class='ctx'> struct ath_txq;</div><div class='ctx'> struct ath_buf;</div><div class='hunk'>@@ -187,6 +188,7 @@ struct ath_stats {</div><div class='ctx'> 	struct ath_interrupt_stats istats;</div><div class='ctx'> 	struct ath_tx_stats txstats[ATH9K_NUM_TX_QUEUES];</div><div class='ctx'> 	struct ath_rx_stats rxstats;</div><div class='add'>+	struct ath_dfs_stats dfs_stats;</div><div class='ctx'> 	u32 reset[__RESET_TYPE_MAX];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/dfs.c b/drivers/net/wireless/ath/ath9k/dfs.c<br/>new file mode 100644<br/>index 000000000000..f4f56aff1e9d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/dfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/dfs.c</a></div><div class='hunk'>@@ -0,0 +1,215 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2008-2011 Atheros Communications Inc.</div><div class='add'>+ * Copyright (c) 2011 Neratec Solutions AG</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 "hw.h"</div><div class='add'>+#include "hw-ops.h"</div><div class='add'>+#include "ath9k.h"</div><div class='add'>+#include "dfs.h"</div><div class='add'>+#include "dfs_debug.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TODO: move into or synchronize this with generic header</div><div class='add'>+ *	 as soon as IF is defined</div><div class='add'>+ */</div><div class='add'>+struct dfs_radar_pulse {</div><div class='add'>+	u16 freq;</div><div class='add'>+	u64 ts;</div><div class='add'>+	u32 width;</div><div class='add'>+	u8 rssi;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* internal struct to pass radar data */</div><div class='add'>+struct ath_radar_data {</div><div class='add'>+	u8 pulse_bw_info;</div><div class='add'>+	u8 rssi;</div><div class='add'>+	u8 ext_rssi;</div><div class='add'>+	u8 pulse_length_ext;</div><div class='add'>+	u8 pulse_length_pri;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* convert pulse duration to usecs, considering clock mode */</div><div class='add'>+static u32 dur_to_usecs(struct ath_hw *ah, u32 dur)</div><div class='add'>+{</div><div class='add'>+	const u32 AR93X_NSECS_PER_DUR = 800;</div><div class='add'>+	const u32 AR93X_NSECS_PER_DUR_FAST = (8000 / 11);</div><div class='add'>+	u32 nsecs;</div><div class='add'>+</div><div class='add'>+	if (IS_CHAN_A_FAST_CLOCK(ah, ah-&gt;curchan))</div><div class='add'>+		nsecs = dur * AR93X_NSECS_PER_DUR_FAST;</div><div class='add'>+	else</div><div class='add'>+		nsecs = dur * AR93X_NSECS_PER_DUR;</div><div class='add'>+</div><div class='add'>+	return (nsecs + 500) / 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define PRI_CH_RADAR_FOUND 0x01</div><div class='add'>+#define EXT_CH_RADAR_FOUND 0x02</div><div class='add'>+static bool</div><div class='add'>+ath9k_postprocess_radar_event(struct ath_softc *sc,</div><div class='add'>+			      struct ath_radar_data *are,</div><div class='add'>+			      struct dfs_radar_pulse *drp)</div><div class='add'>+{</div><div class='add'>+	u8 rssi;</div><div class='add'>+	u16 dur;</div><div class='add'>+</div><div class='add'>+	ath_dbg(ath9k_hw_common(sc-&gt;sc_ah), DFS,</div><div class='add'>+		"pulse_bw_info=0x%x, pri,ext len/rssi=(%u/%u, %u/%u)\n",</div><div class='add'>+		are-&gt;pulse_bw_info,</div><div class='add'>+		are-&gt;pulse_length_pri, are-&gt;rssi,</div><div class='add'>+		are-&gt;pulse_length_ext, are-&gt;ext_rssi);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only the last 2 bits of the BW info are relevant, they indicate</div><div class='add'>+	 * which channel the radar was detected in.</div><div class='add'>+	 */</div><div class='add'>+	are-&gt;pulse_bw_info &amp;= 0x03;</div><div class='add'>+</div><div class='add'>+	switch (are-&gt;pulse_bw_info) {</div><div class='add'>+	case PRI_CH_RADAR_FOUND:</div><div class='add'>+		/* radar in ctrl channel */</div><div class='add'>+		dur = are-&gt;pulse_length_pri;</div><div class='add'>+		DFS_STAT_INC(sc, pri_phy_errors);</div><div class='add'>+		/*</div><div class='add'>+		 * cannot use ctrl channel RSSI</div><div class='add'>+		 * if extension channel is stronger</div><div class='add'>+		 */</div><div class='add'>+		rssi = (are-&gt;ext_rssi &gt;= (are-&gt;rssi + 3)) ? 0 : are-&gt;rssi;</div><div class='add'>+		break;</div><div class='add'>+	case EXT_CH_RADAR_FOUND:</div><div class='add'>+		/* radar in extension channel */</div><div class='add'>+		dur = are-&gt;pulse_length_ext;</div><div class='add'>+		DFS_STAT_INC(sc, ext_phy_errors);</div><div class='add'>+		/*</div><div class='add'>+		 * cannot use extension channel RSSI</div><div class='add'>+		 * if control channel is stronger</div><div class='add'>+		 */</div><div class='add'>+		rssi = (are-&gt;rssi &gt;= (are-&gt;ext_rssi + 12)) ? 0 : are-&gt;ext_rssi;</div><div class='add'>+		break;</div><div class='add'>+	case (PRI_CH_RADAR_FOUND | EXT_CH_RADAR_FOUND):</div><div class='add'>+		/*</div><div class='add'>+		 * Conducted testing, when pulse is on DC, both pri and ext</div><div class='add'>+		 * durations are reported to be same</div><div class='add'>+		 *</div><div class='add'>+		 * Radiated testing, when pulse is on DC, different pri and</div><div class='add'>+		 * ext durations are reported, so take the larger of the two</div><div class='add'>+		 */</div><div class='add'>+		if (are-&gt;pulse_length_ext &gt;= are-&gt;pulse_length_pri)</div><div class='add'>+			dur = are-&gt;pulse_length_ext;</div><div class='add'>+		else</div><div class='add'>+			dur = are-&gt;pulse_length_pri;</div><div class='add'>+		DFS_STAT_INC(sc, dc_phy_errors);</div><div class='add'>+</div><div class='add'>+		/* when both are present use stronger one */</div><div class='add'>+		rssi = (are-&gt;rssi &lt; are-&gt;ext_rssi) ? are-&gt;ext_rssi : are-&gt;rssi;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/*</div><div class='add'>+		 * Bogus bandwidth info was received in descriptor,</div><div class='add'>+		 * so ignore this PHY error</div><div class='add'>+		 */</div><div class='add'>+		DFS_STAT_INC(sc, bwinfo_discards);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rssi == 0) {</div><div class='add'>+		DFS_STAT_INC(sc, rssi_discards);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * TODO: check chirping pulses</div><div class='add'>+	 *	 checks for chirping are dependent on the DFS regulatory domain</div><div class='add'>+	 *	 used, which is yet TBD</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* convert duration to usecs */</div><div class='add'>+	drp-&gt;width = dur_to_usecs(sc-&gt;sc_ah, dur);</div><div class='add'>+	drp-&gt;rssi = rssi;</div><div class='add'>+</div><div class='add'>+	DFS_STAT_INC(sc, pulses_detected);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+#undef PRI_CH_RADAR_FOUND</div><div class='add'>+#undef EXT_CH_RADAR_FOUND</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * DFS: check PHY-error for radar pulse and feed the detector</div><div class='add'>+ */</div><div class='add'>+void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data,</div><div class='add'>+			      struct ath_rx_status *rs, u64 mactime)</div><div class='add'>+{</div><div class='add'>+	struct ath_radar_data ard;</div><div class='add'>+	u16 datalen;</div><div class='add'>+	char *vdata_end;</div><div class='add'>+	struct dfs_radar_pulse drp;</div><div class='add'>+	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+</div><div class='add'>+	if ((!(rs-&gt;rs_phyerr != ATH9K_PHYERR_RADAR)) &amp;&amp;</div><div class='add'>+	    (!(rs-&gt;rs_phyerr != ATH9K_PHYERR_FALSE_RADAR_EXT))) {</div><div class='add'>+		ath_dbg(common, DFS,</div><div class='add'>+			"Error: rs_phyer=0x%x not a radar error\n",</div><div class='add'>+			rs-&gt;rs_phyerr);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	datalen = rs-&gt;rs_datalen;</div><div class='add'>+	if (datalen == 0) {</div><div class='add'>+		DFS_STAT_INC(sc, datalen_discards);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ard.rssi = rs-&gt;rs_rssi_ctl0;</div><div class='add'>+	ard.ext_rssi = rs-&gt;rs_rssi_ext0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * hardware stores this as 8 bit signed value.</div><div class='add'>+	 * we will cap it at 0 if it is a negative number</div><div class='add'>+	 */</div><div class='add'>+	if (ard.rssi &amp; 0x80)</div><div class='add'>+		ard.rssi = 0;</div><div class='add'>+	if (ard.ext_rssi &amp; 0x80)</div><div class='add'>+		ard.ext_rssi = 0;</div><div class='add'>+</div><div class='add'>+	vdata_end = (char *)data + datalen;</div><div class='add'>+	ard.pulse_bw_info = vdata_end[-1];</div><div class='add'>+	ard.pulse_length_ext = vdata_end[-2];</div><div class='add'>+	ard.pulse_length_pri = vdata_end[-3];</div><div class='add'>+</div><div class='add'>+	ath_dbg(common, DFS,</div><div class='add'>+		"bw_info=%d, length_pri=%d, length_ext=%d, "</div><div class='add'>+		"rssi_pri=%d, rssi_ext=%d\n",</div><div class='add'>+		ard.pulse_bw_info, ard.pulse_length_pri, ard.pulse_length_ext,</div><div class='add'>+		ard.rssi, ard.ext_rssi);</div><div class='add'>+</div><div class='add'>+	drp.freq = ah-&gt;curchan-&gt;channel;</div><div class='add'>+	drp.ts = mactime;</div><div class='add'>+	if (ath9k_postprocess_radar_event(sc, &amp;ard, &amp;drp)) {</div><div class='add'>+		static u64 last_ts;</div><div class='add'>+		ath_dbg(common, DFS,</div><div class='add'>+			"ath9k_dfs_process_phyerr: channel=%d, ts=%llu, "</div><div class='add'>+			"width=%d, rssi=%d, delta_ts=%llu\n",</div><div class='add'>+			drp.freq, drp.ts, drp.width, drp.rssi, drp.ts-last_ts);</div><div class='add'>+		last_ts = drp.ts;</div><div class='add'>+		/*</div><div class='add'>+		 * TODO: forward pulse to pattern detector</div><div class='add'>+		 *</div><div class='add'>+		 * ieee80211_add_radar_pulse(drp.freq, drp.ts,</div><div class='add'>+		 *                           drp.width, drp.rssi);</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/dfs.h b/drivers/net/wireless/ath/ath9k/dfs.h<br/>new file mode 100644<br/>index 000000000000..c2412857f122<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/dfs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/dfs.h</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2008-2011 Atheros Communications Inc.</div><div class='add'>+ * Copyright (c) 2011 Neratec Solutions AG</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'>+#ifndef ATH9K_DFS_H</div><div class='add'>+#define ATH9K_DFS_H</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ATH9K_DFS_CERTIFIED)</div><div class='add'>+/**</div><div class='add'>+ * ath9k_dfs_process_phyerr - process radar PHY error</div><div class='add'>+ * @sc: ath_softc</div><div class='add'>+ * @data: RX payload data</div><div class='add'>+ * @rs: RX status after processing descriptor</div><div class='add'>+ * @mactime: receive time</div><div class='add'>+ *</div><div class='add'>+ * This function is called whenever the HW DFS module detects a radar</div><div class='add'>+ * pulse and reports it as a PHY error.</div><div class='add'>+ *</div><div class='add'>+ * The radar information provided as raw payload data is validated and</div><div class='add'>+ * filtered for false pulses. Events passing all tests are forwarded to</div><div class='add'>+ * the upper layer for pattern detection.</div><div class='add'>+ */</div><div class='add'>+void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data,</div><div class='add'>+			      struct ath_rx_status *rs, u64 mactime);</div><div class='add'>+#else</div><div class='add'>+static inline void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data,</div><div class='add'>+					    struct ath_rx_status *rs, u64 mactime) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* ATH9K_DFS_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.c b/drivers/net/wireless/ath/ath9k/dfs_debug.c<br/>new file mode 100644<br/>index 000000000000..106d031d834a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/dfs_debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/dfs_debug.c</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2008-2011 Atheros Communications Inc.</div><div class='add'>+ * Copyright (c) 2011 Neratec Solutions AG</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 &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ath9k.h"</div><div class='add'>+#include "dfs_debug.h"</div><div class='add'>+</div><div class='add'>+#define ATH9K_DFS_STAT(s, p) \</div><div class='add'>+	len += snprintf(buf + len, size - len, "%28s : %10u\n", s, \</div><div class='add'>+			sc-&gt;debug.stats.dfs_stats.p);</div><div class='add'>+</div><div class='add'>+static ssize_t read_file_dfs(struct file *file, char __user *user_buf,</div><div class='add'>+			     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct ath_softc *sc = file-&gt;private_data;</div><div class='add'>+	struct ath9k_hw_version *hw_ver = &amp;sc-&gt;sc_ah-&gt;hw_version;</div><div class='add'>+	char *buf;</div><div class='add'>+	unsigned int len = 0, size = 8000;</div><div class='add'>+	ssize_t retval = 0;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	len += snprintf(buf + len, size - len, "DFS support for "</div><div class='add'>+			"macVersion = 0x%x, macRev = 0x%x: %s\n",</div><div class='add'>+			hw_ver-&gt;macVersion, hw_ver-&gt;macRev,</div><div class='add'>+			(sc-&gt;sc_ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_DFS) ?</div><div class='add'>+					"enabled" : "disabled");</div><div class='add'>+	ATH9K_DFS_STAT("DFS pulses detected     ", pulses_detected);</div><div class='add'>+	ATH9K_DFS_STAT("Datalen discards        ", datalen_discards);</div><div class='add'>+	ATH9K_DFS_STAT("RSSI discards           ", rssi_discards);</div><div class='add'>+	ATH9K_DFS_STAT("BW info discards        ", bwinfo_discards);</div><div class='add'>+	ATH9K_DFS_STAT("Primary channel pulses  ", pri_phy_errors);</div><div class='add'>+	ATH9K_DFS_STAT("Secondary channel pulses", ext_phy_errors);</div><div class='add'>+	ATH9K_DFS_STAT("Dual channel pulses     ", dc_phy_errors);</div><div class='add'>+</div><div class='add'>+	if (len &gt; size)</div><div class='add'>+		len = size;</div><div class='add'>+</div><div class='add'>+	retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+	kfree(buf);</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath9k_dfs_debugfs_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	file-&gt;private_data = inode-&gt;i_private;</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 fops_dfs_stats = {</div><div class='add'>+	.read = read_file_dfs,</div><div class='add'>+	.open = ath9k_dfs_debugfs_open,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath9k_dfs_init_debug(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	debugfs_create_file("dfs_stats", S_IRUSR,</div><div class='add'>+			    sc-&gt;debug.debugfs_phy, sc, &amp;fops_dfs_stats);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.h b/drivers/net/wireless/ath/ath9k/dfs_debug.h<br/>new file mode 100644<br/>index 000000000000..4911724cb445<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/dfs_debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/dfs_debug.h</a></div><div class='hunk'>@@ -0,0 +1,57 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2008-2011 Atheros Communications Inc.</div><div class='add'>+ * Copyright (c) 2011 Neratec Solutions AG</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'>+</div><div class='add'>+#ifndef ATH9K_DFS_DEBUG_H</div><div class='add'>+#define ATH9K_DFS_DEBUG_H</div><div class='add'>+</div><div class='add'>+#include "hw.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ath_dfs_stats - DFS Statistics</div><div class='add'>+ *</div><div class='add'>+ * @pulses_detected:  No. of pulses detected so far</div><div class='add'>+ * @datalen_discards: No. of pulses discarded due to invalid datalen</div><div class='add'>+ * @rssi_discards:    No. of pulses discarded due to invalid RSSI</div><div class='add'>+ * @bwinfo_discards:  No. of pulses discarded due to invalid BW info</div><div class='add'>+ * @pri_phy_errors:   No. of pulses reported for primary channel</div><div class='add'>+ * @ext_phy_errors:   No. of pulses reported for extension channel</div><div class='add'>+ * @dc_phy_errors:    No. of pulses reported for primary + extension channel</div><div class='add'>+ */</div><div class='add'>+struct ath_dfs_stats {</div><div class='add'>+	u32 pulses_detected;</div><div class='add'>+	u32 datalen_discards;</div><div class='add'>+	u32 rssi_discards;</div><div class='add'>+	u32 bwinfo_discards;</div><div class='add'>+	u32 pri_phy_errors;</div><div class='add'>+	u32 ext_phy_errors;</div><div class='add'>+	u32 dc_phy_errors;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ATH9K_DFS_DEBUGFS)</div><div class='add'>+</div><div class='add'>+#define DFS_STAT_INC(sc, c) (sc-&gt;debug.stats.dfs_stats.c++)</div><div class='add'>+void ath9k_dfs_init_debug(struct ath_softc *sc);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#define DFS_STAT_INC(sc, c) do { } while (0)</div><div class='add'>+static inline void ath9k_dfs_init_debug(struct ath_softc *sc) { }</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_ATH9K_DFS_DEBUGFS */</div><div class='add'>+</div><div class='add'>+#endif /* ATH9K_DFS_DEBUG_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c<br/>index e46f751ab508..c43523233319 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/eeprom.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/eeprom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/eeprom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/eeprom.c</a></div><div class='hunk'>@@ -305,8 +305,7 @@ void ath9k_hw_update_regulatory_maxpower(struct ath_hw *ah)</div><div class='ctx'> 		regulatory-&gt;max_power_level += INCREASE_MAXPOW_BY_THREE_CHAIN;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-			"Invalid chainmask configuration\n");</div><div class='add'>+		ath_dbg(common, EEPROM, "Invalid chainmask configuration\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/eeprom.h b/drivers/net/wireless/ath/ath9k/eeprom.h<br/>index 49abd34be741..5ff7ab965120 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/eeprom.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/eeprom.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/eeprom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/eeprom.h</a></div><div class='hunk'>@@ -249,7 +249,8 @@ enum eeprom_param {</div><div class='ctx'> 	EEP_ANT_DIV_CTL1,</div><div class='ctx'> 	EEP_CHAIN_MASK_REDUCE,</div><div class='ctx'> 	EEP_ANTENNA_GAIN_2G,</div><div class='del'>-	EEP_ANTENNA_GAIN_5G</div><div class='add'>+	EEP_ANTENNA_GAIN_5G,</div><div class='add'>+	EEP_QUICK_DROP</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ar5416_rates {</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/eeprom_4k.c b/drivers/net/wireless/ath/ath9k/eeprom_4k.c<br/>index 9a7520f987f0..4322ac80c203 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/eeprom_4k.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/eeprom_4k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/eeprom_4k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/eeprom_4k.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@ static bool __ath9k_hw_4k_fill_eeprom(struct ath_hw *ah)</div><div class='ctx'> </div><div class='ctx'> 	for (addr = 0; addr &lt; SIZE_EEPROM_4K; addr++) {</div><div class='ctx'> 		if (!ath9k_hw_nvram_read(common, addr + eep_start_loc, eep_data)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+			ath_dbg(common, EEPROM,</div><div class='ctx'> 				"Unable to read eeprom region\n");</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -62,8 +62,7 @@ static bool ath9k_hw_4k_fill_eeprom(struct ath_hw *ah)</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> </div><div class='ctx'> 	if (!ath9k_hw_use_flash(ah)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-			"Reading from EEPROM, not flash\n");</div><div class='add'>+		ath_dbg(common, EEPROM, "Reading from EEPROM, not flash\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (common-&gt;bus_ops-&gt;ath_bus_type == ATH_USB)</div><div class='hunk'>@@ -204,8 +203,7 @@ static int ath9k_hw_4k_check_eeprom(struct ath_hw *ah)</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-			"Read Magic = 0x%04X\n", magic);</div><div class='add'>+		ath_dbg(common, EEPROM, "Read Magic = 0x%04X\n", magic);</div><div class='ctx'> </div><div class='ctx'> 		if (magic != AR5416_EEPROM_MAGIC) {</div><div class='ctx'> 			magic2 = swab16(magic);</div><div class='hunk'>@@ -227,7 +225,7 @@ static int ath9k_hw_4k_check_eeprom(struct ath_hw *ah)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_EEPROM, "need_swap = %s.\n",</div><div class='add'>+	ath_dbg(common, EEPROM, "need_swap = %s\n",</div><div class='ctx'> 		need_swap ? "True" : "False");</div><div class='ctx'> </div><div class='ctx'> 	if (need_swap)</div><div class='hunk'>@@ -249,7 +247,7 @@ static int ath9k_hw_4k_check_eeprom(struct ath_hw *ah)</div><div class='ctx'> 		u32 integer;</div><div class='ctx'> 		u16 word;</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+		ath_dbg(common, EEPROM,</div><div class='ctx'> 			"EEPROM Endianness is not native.. Changing\n");</div><div class='ctx'> </div><div class='ctx'> 		word = swab16(eep-&gt;baseEepHeader.length);</div><div class='hunk'>@@ -435,11 +433,11 @@ static void ath9k_hw_set_4k_power_cal_table(struct ath_hw *ah,</div><div class='ctx'> 				reg32 = get_unaligned_le32(&amp;pdadcValues[4 * j]);</div><div class='ctx'> 				REG_WRITE(ah, regOffset, reg32);</div><div class='ctx'> </div><div class='del'>-				ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+				ath_dbg(common, EEPROM,</div><div class='ctx'> 					"PDADC (%d,%4x): %4.4x %8.8x\n",</div><div class='ctx'> 					i, regChainOffset, regOffset,</div><div class='ctx'> 					reg32);</div><div class='del'>-				ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+				ath_dbg(common, EEPROM,</div><div class='ctx'> 					"PDADC: Chain %d | "</div><div class='ctx'> 					"PDADC %3d Value %3d | "</div><div class='ctx'> 					"PDADC %3d Value %3d | "</div><div class='hunk'>@@ -473,7 +471,7 @@ static void ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> 	int i;</div><div class='ctx'> 	u16 twiceMinEdgePower;</div><div class='del'>-	u16 twiceMaxEdgePower = MAX_RATE_POWER;</div><div class='add'>+	u16 twiceMaxEdgePower;</div><div class='ctx'> 	u16 scaledPower = 0, minCtlPower;</div><div class='ctx'> 	u16 numCtlModes;</div><div class='ctx'> 	const u16 *pCtlMode;</div><div class='hunk'>@@ -542,9 +540,7 @@ static void ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah,</div><div class='ctx'> 		else</div><div class='ctx'> 			freq = centers.ctl_center;</div><div class='ctx'> </div><div class='del'>-		if (ah-&gt;eep_ops-&gt;get_eeprom_ver(ah) == 14 &amp;&amp;</div><div class='del'>-		    ah-&gt;eep_ops-&gt;get_eeprom_rev(ah) &lt;= 2)</div><div class='del'>-			twiceMaxEdgePower = MAX_RATE_POWER;</div><div class='add'>+		twiceMaxEdgePower = MAX_RATE_POWER;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; (i &lt; AR5416_EEP4K_NUM_CTLS) &amp;&amp;</div><div class='ctx'> 			     pEepData-&gt;ctlIndex[i]; i++) {</div><div class='hunk'>@@ -1081,8 +1077,7 @@ static u16 ath9k_hw_4k_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz)</div><div class='ctx'> </div><div class='ctx'> 	u16 spur_val = AR_NO_SPUR;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_ANI,</div><div class='del'>-		"Getting spur idx:%d is2Ghz:%d val:%x\n",</div><div class='add'>+	ath_dbg(common, ANI, "Getting spur idx:%d is2Ghz:%d val:%x\n",</div><div class='ctx'> 		i, is2GHz, ah-&gt;config.spurchans[i][is2GHz]);</div><div class='ctx'> </div><div class='ctx'> 	switch (ah-&gt;config.spurmode) {</div><div class='hunk'>@@ -1090,8 +1085,8 @@ static u16 ath9k_hw_4k_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SPUR_ENABLE_IOCTL:</div><div class='ctx'> 		spur_val = ah-&gt;config.spurchans[i][is2GHz];</div><div class='del'>-		ath_dbg(common, ATH_DBG_ANI,</div><div class='del'>-			"Getting spur val from new loc. %d\n", spur_val);</div><div class='add'>+		ath_dbg(common, ANI, "Getting spur val from new loc. %d\n",</div><div class='add'>+			spur_val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SPUR_ENABLE_EEPROM:</div><div class='ctx'> 		spur_val = EEP_MAP4K_SPURCHAN;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c<br/>index 4f5c50a87ce3..f272236d8053 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/eeprom_9287.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/eeprom_9287.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/eeprom_9287.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/eeprom_9287.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@ static bool __ath9k_hw_ar9287_fill_eeprom(struct ath_hw *ah)</div><div class='ctx'> 	for (addr = 0; addr &lt; SIZE_EEPROM_AR9287; addr++) {</div><div class='ctx'> 		if (!ath9k_hw_nvram_read(common, addr + eep_start_loc,</div><div class='ctx'> 					 eep_data)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+			ath_dbg(common, EEPROM,</div><div class='ctx'> 				"Unable to read eeprom region\n");</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -66,8 +66,7 @@ static bool ath9k_hw_ar9287_fill_eeprom(struct ath_hw *ah)</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> </div><div class='ctx'> 	if (!ath9k_hw_use_flash(ah)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-			"Reading from EEPROM, not flash\n");</div><div class='add'>+		ath_dbg(common, EEPROM, "Reading from EEPROM, not flash\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (common-&gt;bus_ops-&gt;ath_bus_type == ATH_USB)</div><div class='hunk'>@@ -197,8 +196,7 @@ static int ath9k_hw_ar9287_check_eeprom(struct ath_hw *ah)</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-			"Read Magic = 0x%04X\n", magic);</div><div class='add'>+		ath_dbg(common, EEPROM, "Read Magic = 0x%04X\n", magic);</div><div class='ctx'> </div><div class='ctx'> 		if (magic != AR5416_EEPROM_MAGIC) {</div><div class='ctx'> 			magic2 = swab16(magic);</div><div class='hunk'>@@ -220,7 +218,7 @@ static int ath9k_hw_ar9287_check_eeprom(struct ath_hw *ah)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_EEPROM, "need_swap = %s.\n",</div><div class='add'>+	ath_dbg(common, EEPROM, "need_swap = %s\n",</div><div class='ctx'> 		need_swap ? "True" : "False");</div><div class='ctx'> </div><div class='ctx'> 	if (need_swap)</div><div class='hunk'>@@ -569,7 +567,7 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah,</div><div class='ctx'> #define REDUCE_SCALED_POWER_BY_TWO_CHAIN     6</div><div class='ctx'> #define REDUCE_SCALED_POWER_BY_THREE_CHAIN   10</div><div class='ctx'> </div><div class='del'>-	u16 twiceMaxEdgePower = MAX_RATE_POWER;</div><div class='add'>+	u16 twiceMaxEdgePower;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct cal_ctl_data_ar9287 *rep;</div><div class='ctx'> 	struct cal_target_power_leg targetPowerOfdm = {0, {0, 0, 0, 0} },</div><div class='hunk'>@@ -669,6 +667,7 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah,</div><div class='ctx'> 		else</div><div class='ctx'> 			freq = centers.ctl_center;</div><div class='ctx'> </div><div class='add'>+		twiceMaxEdgePower = MAX_RATE_POWER;</div><div class='ctx'> 		/* Walk through the CTL indices stored in EEPROM */</div><div class='ctx'> 		for (i = 0; (i &lt; AR9287_NUM_CTLS) &amp;&amp; pEepData-&gt;ctlIndex[i]; i++) {</div><div class='ctx'> 			struct cal_ctl_edges *pRdEdgesPower;</div><div class='hunk'>@@ -1040,8 +1039,7 @@ static u16 ath9k_hw_ar9287_get_spur_channel(struct ath_hw *ah,</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> 	u16 spur_val = AR_NO_SPUR;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_ANI,</div><div class='del'>-		"Getting spur idx:%d is2Ghz:%d val:%x\n",</div><div class='add'>+	ath_dbg(common, ANI, "Getting spur idx:%d is2Ghz:%d val:%x\n",</div><div class='ctx'> 		i, is2GHz, ah-&gt;config.spurchans[i][is2GHz]);</div><div class='ctx'> </div><div class='ctx'> 	switch (ah-&gt;config.spurmode) {</div><div class='hunk'>@@ -1049,8 +1047,8 @@ static u16 ath9k_hw_ar9287_get_spur_channel(struct ath_hw *ah,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SPUR_ENABLE_IOCTL:</div><div class='ctx'> 		spur_val = ah-&gt;config.spurchans[i][is2GHz];</div><div class='del'>-		ath_dbg(common, ATH_DBG_ANI,</div><div class='del'>-			"Getting spur val from new loc. %d\n", spur_val);</div><div class='add'>+		ath_dbg(common, ANI, "Getting spur val from new loc. %d\n",</div><div class='add'>+			spur_val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SPUR_ENABLE_EEPROM:</div><div class='ctx'> 		spur_val = EEP_MAP9287_SPURCHAN;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c<br/>index 81e629671679..619b95d764ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/eeprom_def.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/eeprom_def.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/eeprom_def.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/eeprom_def.c</a></div><div class='hunk'>@@ -121,8 +121,7 @@ static bool ath9k_hw_def_fill_eeprom(struct ath_hw *ah)</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> </div><div class='ctx'> 	if (!ath9k_hw_use_flash(ah)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-			"Reading from EEPROM, not flash\n");</div><div class='add'>+		ath_dbg(common, EEPROM, "Reading from EEPROM, not flash\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (common-&gt;bus_ops-&gt;ath_bus_type == ATH_USB)</div><div class='hunk'>@@ -279,8 +278,7 @@ static int ath9k_hw_def_check_eeprom(struct ath_hw *ah)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ath9k_hw_use_flash(ah)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-			"Read Magic = 0x%04X\n", magic);</div><div class='add'>+		ath_dbg(common, EEPROM, "Read Magic = 0x%04X\n", magic);</div><div class='ctx'> </div><div class='ctx'> 		if (magic != AR5416_EEPROM_MAGIC) {</div><div class='ctx'> 			magic2 = swab16(magic);</div><div class='hunk'>@@ -303,7 +301,7 @@ static int ath9k_hw_def_check_eeprom(struct ath_hw *ah)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_EEPROM, "need_swap = %s.\n",</div><div class='add'>+	ath_dbg(common, EEPROM, "need_swap = %s\n",</div><div class='ctx'> 		need_swap ? "True" : "False");</div><div class='ctx'> </div><div class='ctx'> 	if (need_swap)</div><div class='hunk'>@@ -325,7 +323,7 @@ static int ath9k_hw_def_check_eeprom(struct ath_hw *ah)</div><div class='ctx'> 		u32 integer, j;</div><div class='ctx'> 		u16 word;</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+		ath_dbg(common, EEPROM,</div><div class='ctx'> 			"EEPROM Endianness is not native.. Changing.\n");</div><div class='ctx'> </div><div class='ctx'> 		word = swab16(eep-&gt;baseEepHeader.length);</div><div class='hunk'>@@ -385,7 +383,7 @@ static int ath9k_hw_def_check_eeprom(struct ath_hw *ah)</div><div class='ctx'> 	if ((ah-&gt;hw_version.devid == AR9280_DEVID_PCI) &amp;&amp;</div><div class='ctx'> 	    ((eep-&gt;baseEepHeader.version &amp; 0xff) &gt; 0x0a) &amp;&amp;</div><div class='ctx'> 	    (eep-&gt;baseEepHeader.pwdclkind == 0))</div><div class='del'>-		ah-&gt;need_an_top2_fixup = 1;</div><div class='add'>+		ah-&gt;need_an_top2_fixup = true;</div><div class='ctx'> </div><div class='ctx'> 	if ((common-&gt;bus_ops-&gt;ath_bus_type == ATH_USB) &amp;&amp;</div><div class='ctx'> 	    (AR_SREV_9280(ah)))</div><div class='hunk'>@@ -965,15 +963,12 @@ static void ath9k_hw_set_def_power_cal_table(struct ath_hw *ah,</div><div class='ctx'> 				reg32 = get_unaligned_le32(&amp;pdadcValues[4 * j]);</div><div class='ctx'> 				REG_WRITE(ah, regOffset, reg32);</div><div class='ctx'> </div><div class='del'>-				ath_dbg(common, ATH_DBG_EEPROM,</div><div class='add'>+				ath_dbg(common, EEPROM,</div><div class='ctx'> 					"PDADC (%d,%4x): %4.4x %8.8x\n",</div><div class='ctx'> 					i, regChainOffset, regOffset,</div><div class='ctx'> 					reg32);</div><div class='del'>-				ath_dbg(common, ATH_DBG_EEPROM,</div><div class='del'>-					"PDADC: Chain %d | PDADC %3d "</div><div class='del'>-					"Value %3d | PDADC %3d Value %3d | "</div><div class='del'>-					"PDADC %3d Value %3d | PDADC %3d "</div><div class='del'>-					"Value %3d |\n",</div><div class='add'>+				ath_dbg(common, EEPROM,</div><div class='add'>+					"PDADC: Chain %d | PDADC %3d Value %3d | PDADC %3d Value %3d | PDADC %3d Value %3d | PDADC %3d Value %3d |\n",</div><div class='ctx'> 					i, 4 * j, pdadcValues[4 * j],</div><div class='ctx'> 					4 * j + 1, pdadcValues[4 * j + 1],</div><div class='ctx'> 					4 * j + 2, pdadcValues[4 * j + 2],</div><div class='hunk'>@@ -1000,7 +995,7 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah,</div><div class='ctx'> #define REDUCE_SCALED_POWER_BY_THREE_CHAIN   9 /* 10*log10(3)*2 */</div><div class='ctx'> </div><div class='ctx'> 	struct ar5416_eeprom_def *pEepData = &amp;ah-&gt;eeprom.def;</div><div class='del'>-	u16 twiceMaxEdgePower = MAX_RATE_POWER;</div><div class='add'>+	u16 twiceMaxEdgePower;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct cal_ctl_data *rep;</div><div class='ctx'> 	struct cal_target_power_leg targetPowerOfdm, targetPowerCck = {</div><div class='hunk'>@@ -1121,9 +1116,7 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah,</div><div class='ctx'> 		else</div><div class='ctx'> 			freq = centers.ctl_center;</div><div class='ctx'> </div><div class='del'>-		if (ah-&gt;eep_ops-&gt;get_eeprom_ver(ah) == 14 &amp;&amp;</div><div class='del'>-		    ah-&gt;eep_ops-&gt;get_eeprom_rev(ah) &lt;= 2)</div><div class='del'>-			twiceMaxEdgePower = MAX_RATE_POWER;</div><div class='add'>+		twiceMaxEdgePower = MAX_RATE_POWER;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; (i &lt; AR5416_NUM_CTLS) &amp;&amp; pEepData-&gt;ctlIndex[i]; i++) {</div><div class='ctx'> 			if ((((cfgCtl &amp; ~CTL_MODE_M) |</div><div class='hunk'>@@ -1280,7 +1273,7 @@ static void ath9k_hw_def_set_txpower(struct ath_hw *ah,</div><div class='ctx'> 		regulatory-&gt;max_power_level += INCREASE_MAXPOW_BY_THREE_CHAIN;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ath_dbg(ath9k_hw_common(ah), ATH_DBG_EEPROM,</div><div class='add'>+		ath_dbg(ath9k_hw_common(ah), EEPROM,</div><div class='ctx'> 			"Invalid chainmask configuration\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1398,8 +1391,7 @@ static u16 ath9k_hw_def_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz)</div><div class='ctx'> </div><div class='ctx'> 	u16 spur_val = AR_NO_SPUR;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_ANI,</div><div class='del'>-		"Getting spur idx:%d is2Ghz:%d val:%x\n",</div><div class='add'>+	ath_dbg(common, ANI, "Getting spur idx:%d is2Ghz:%d val:%x\n",</div><div class='ctx'> 		i, is2GHz, ah-&gt;config.spurchans[i][is2GHz]);</div><div class='ctx'> </div><div class='ctx'> 	switch (ah-&gt;config.spurmode) {</div><div class='hunk'>@@ -1407,8 +1399,8 @@ static u16 ath9k_hw_def_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SPUR_ENABLE_IOCTL:</div><div class='ctx'> 		spur_val = ah-&gt;config.spurchans[i][is2GHz];</div><div class='del'>-		ath_dbg(common, ATH_DBG_ANI,</div><div class='del'>-			"Getting spur val from new loc. %d\n", spur_val);</div><div class='add'>+		ath_dbg(common, ANI, "Getting spur val from new loc. %d\n",</div><div class='add'>+			spur_val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SPUR_ENABLE_EEPROM:</div><div class='ctx'> 		spur_val = EEP_DEF_SPURCHAN;</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c<br/>index 655576c8fdab..597c84e31adb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/gpio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/gpio.c</a></div><div class='hunk'>@@ -130,12 +130,12 @@ static void ath_detect_bt_priority(struct ath_softc *sc)</div><div class='ctx'> 		sc-&gt;sc_flags &amp;= ~(SC_OP_BT_PRIORITY_DETECTED | SC_OP_BT_SCAN);</div><div class='ctx'> 		/* Detect if colocated bt started scanning */</div><div class='ctx'> 		if (btcoex-&gt;bt_priority_cnt &gt;= ATH_BT_CNT_SCAN_THRESHOLD) {</div><div class='del'>-			ath_dbg(ath9k_hw_common(sc-&gt;sc_ah), ATH_DBG_BTCOEX,</div><div class='add'>+			ath_dbg(ath9k_hw_common(sc-&gt;sc_ah), BTCOEX,</div><div class='ctx'> 				"BT scan detected\n");</div><div class='ctx'> 			sc-&gt;sc_flags |= (SC_OP_BT_SCAN |</div><div class='ctx'> 					 SC_OP_BT_PRIORITY_DETECTED);</div><div class='ctx'> 		} else if (btcoex-&gt;bt_priority_cnt &gt;= ATH_BT_CNT_THRESHOLD) {</div><div class='del'>-			ath_dbg(ath9k_hw_common(sc-&gt;sc_ah), ATH_DBG_BTCOEX,</div><div class='add'>+			ath_dbg(ath9k_hw_common(sc-&gt;sc_ah), BTCOEX,</div><div class='ctx'> 				"BT priority traffic detected\n");</div><div class='ctx'> 			sc-&gt;sc_flags |= SC_OP_BT_PRIORITY_DETECTED;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -189,8 +189,8 @@ static void ath_btcoex_period_timer(unsigned long data)</div><div class='ctx'> 	bool is_btscan;</div><div class='ctx'> </div><div class='ctx'> 	ath9k_ps_wakeup(sc);</div><div class='del'>-	ath_detect_bt_priority(sc);</div><div class='del'>-</div><div class='add'>+	if (!(ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_MCI))</div><div class='add'>+		ath_detect_bt_priority(sc);</div><div class='ctx'> 	is_btscan = sc-&gt;sc_flags &amp; SC_OP_BT_SCAN;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;btcoex-&gt;btcoex_lock);</div><div class='hunk'>@@ -198,6 +198,7 @@ static void ath_btcoex_period_timer(unsigned long data)</div><div class='ctx'> 	ath9k_hw_btcoex_bt_stomp(ah, is_btscan ? ATH_BTCOEX_STOMP_ALL :</div><div class='ctx'> 			      btcoex-&gt;bt_stomp_type);</div><div class='ctx'> </div><div class='add'>+	ath9k_hw_btcoex_enable(ah);</div><div class='ctx'> 	spin_unlock_bh(&amp;btcoex-&gt;btcoex_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (btcoex-&gt;btcoex_period != btcoex-&gt;btcoex_no_stomp) {</div><div class='hunk'>@@ -212,8 +213,9 @@ static void ath_btcoex_period_timer(unsigned long data)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ath9k_ps_restore(sc);</div><div class='add'>+	timer_period = btcoex-&gt;btcoex_period / 1000;</div><div class='ctx'> 	mod_timer(&amp;btcoex-&gt;period_timer, jiffies +</div><div class='del'>-				  msecs_to_jiffies(ATH_BTCOEX_DEF_BT_PERIOD));</div><div class='add'>+				  msecs_to_jiffies(timer_period));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -228,8 +230,7 @@ static void ath_btcoex_no_stomp_timer(void *arg)</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> 	bool is_btscan = sc-&gt;sc_flags &amp; SC_OP_BT_SCAN;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_BTCOEX,</div><div class='del'>-		"no stomp timer running\n");</div><div class='add'>+	ath_dbg(common, BTCOEX, "no stomp timer running\n");</div><div class='ctx'> </div><div class='ctx'> 	ath9k_ps_wakeup(sc);</div><div class='ctx'> 	spin_lock_bh(&amp;btcoex-&gt;btcoex_lock);</div><div class='hunk'>@@ -239,6 +240,7 @@ static void ath_btcoex_no_stomp_timer(void *arg)</div><div class='ctx'> 	 else if (btcoex-&gt;bt_stomp_type == ATH_BTCOEX_STOMP_ALL)</div><div class='ctx'> 		ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_LOW);</div><div class='ctx'> </div><div class='add'>+	ath9k_hw_btcoex_enable(ah);</div><div class='ctx'> 	spin_unlock_bh(&amp;btcoex-&gt;btcoex_lock);</div><div class='ctx'> 	ath9k_ps_restore(sc);</div><div class='ctx'> }</div><div class='hunk'>@@ -247,6 +249,9 @@ int ath_init_btcoex_timer(struct ath_softc *sc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_btcoex *btcoex = &amp;sc-&gt;btcoex;</div><div class='ctx'> </div><div class='add'>+	if (ath9k_hw_get_btcoex_scheme(sc-&gt;sc_ah) == ATH_BTCOEX_CFG_NONE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	btcoex-&gt;btcoex_period = ATH_BTCOEX_DEF_BT_PERIOD * 1000;</div><div class='ctx'> 	btcoex-&gt;btcoex_no_stomp = (100 - ATH_BTCOEX_DEF_DUTY_CYCLE) *</div><div class='ctx'> 		btcoex-&gt;btcoex_period / 100;</div><div class='hunk'>@@ -277,8 +282,10 @@ void ath9k_btcoex_timer_resume(struct ath_softc *sc)</div><div class='ctx'> 	struct ath_btcoex *btcoex = &amp;sc-&gt;btcoex;</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(ath9k_hw_common(ah), ATH_DBG_BTCOEX,</div><div class='del'>-		"Starting btcoex timers\n");</div><div class='add'>+	ath_dbg(ath9k_hw_common(ah), BTCOEX, "Starting btcoex timers\n");</div><div class='add'>+</div><div class='add'>+	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* make sure duty cycle timer is also stopped when resuming */</div><div class='ctx'> 	if (btcoex-&gt;hw_timer_enabled)</div><div class='hunk'>@@ -300,6 +307,9 @@ void ath9k_btcoex_timer_pause(struct ath_softc *sc)</div><div class='ctx'> 	struct ath_btcoex *btcoex = &amp;sc-&gt;btcoex;</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='ctx'> </div><div class='add'>+	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	del_timer_sync(&amp;btcoex-&gt;period_timer);</div><div class='ctx'> </div><div class='ctx'> 	if (btcoex-&gt;hw_timer_enabled)</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c<br/>index 57fe22b24247..2eadffb7971c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/htc_drv_beacon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/htc_drv_beacon.c</a></div><div class='hunk'>@@ -167,9 +167,9 @@ static void ath9k_htc_beacon_config_sta(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	/* TSF out of range threshold fixed at 1 second */</div><div class='ctx'> 	bs.bs_tsfoor_threshold = ATH9K_TSFOOR_THRESHOLD;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG, "intval: %u tsf: %llu tsftu: %u\n",</div><div class='add'>+	ath_dbg(common, CONFIG, "intval: %u tsf: %llu tsftu: %u\n",</div><div class='ctx'> 		intval, tsf, tsftu);</div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+	ath_dbg(common, CONFIG,</div><div class='ctx'> 		"bmiss: %u sleep: %u cfp-period: %u maxdur: %u next: %u\n",</div><div class='ctx'> 		bs.bs_bmissthreshold, bs.bs_sleepduration,</div><div class='ctx'> 		bs.bs_cfpperiod, bs.bs_cfpmaxduration, bs.bs_cfpnext);</div><div class='hunk'>@@ -224,9 +224,8 @@ static void ath9k_htc_beacon_config_ap(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	if (priv-&gt;op_flags &amp; OP_ENABLE_BEACON)</div><div class='ctx'> 		imask |= ATH9K_INT_SWBA;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-		"AP Beacon config, intval: %d, nexttbtt: %u, resp_time: %d "</div><div class='del'>-		"imask: 0x%x\n",</div><div class='add'>+	ath_dbg(common, CONFIG,</div><div class='add'>+		"AP Beacon config, intval: %d, nexttbtt: %u, resp_time: %d imask: 0x%x\n",</div><div class='ctx'> 		bss_conf-&gt;beacon_interval, nexttbtt,</div><div class='ctx'> 		priv-&gt;ah-&gt;config.sw_beacon_response_time, imask);</div><div class='ctx'> </div><div class='hunk'>@@ -273,9 +272,8 @@ static void ath9k_htc_beacon_config_adhoc(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	if (priv-&gt;op_flags &amp; OP_ENABLE_BEACON)</div><div class='ctx'> 		imask |= ATH9K_INT_SWBA;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-		"IBSS Beacon config, intval: %d, nexttbtt: %u, "</div><div class='del'>-		"resp_time: %d, imask: 0x%x\n",</div><div class='add'>+	ath_dbg(common, CONFIG,</div><div class='add'>+		"IBSS Beacon config, intval: %d, nexttbtt: %u, resp_time: %d, imask: 0x%x\n",</div><div class='ctx'> 		bss_conf-&gt;beacon_interval, nexttbtt,</div><div class='ctx'> 		priv-&gt;ah-&gt;config.sw_beacon_response_time, imask);</div><div class='ctx'> </div><div class='hunk'>@@ -323,7 +321,7 @@ static void ath9k_htc_send_buffered(struct ath9k_htc_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 		tx_slot = ath9k_htc_tx_get_slot(priv);</div><div class='ctx'> 		if (tx_slot &lt; 0) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_XMIT, "No free CAB slot\n");</div><div class='add'>+			ath_dbg(common, XMIT, "No free CAB slot\n");</div><div class='ctx'> 			dev_kfree_skb_any(skb);</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -333,8 +331,7 @@ static void ath9k_htc_send_buffered(struct ath9k_htc_priv *priv,</div><div class='ctx'> 			ath9k_htc_tx_clear_slot(priv, tx_slot);</div><div class='ctx'> 			dev_kfree_skb_any(skb);</div><div class='ctx'> </div><div class='del'>-			ath_dbg(common, ATH_DBG_XMIT,</div><div class='del'>-				"Failed to send CAB frame\n");</div><div class='add'>+			ath_dbg(common, XMIT, "Failed to send CAB frame\n");</div><div class='ctx'> 		} else {</div><div class='ctx'> 			spin_lock_bh(&amp;priv-&gt;tx.tx_lock);</div><div class='ctx'> 			priv-&gt;tx.queued_cnt++;</div><div class='hunk'>@@ -409,7 +406,7 @@ static void ath9k_htc_send_beacon(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	ret = htc_send(priv-&gt;htc, beacon);</div><div class='ctx'> 	if (ret != 0) {</div><div class='ctx'> 		if (ret == -ENOMEM) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_BSTUCK,</div><div class='add'>+			ath_dbg(common, BSTUCK,</div><div class='ctx'> 				"Failed to send beacon, no free TX buffer\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		dev_kfree_skb_any(beacon);</div><div class='hunk'>@@ -434,7 +431,7 @@ static int ath9k_htc_choose_bslot(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	slot = ((tsftu % intval) * ATH9K_HTC_MAX_BCN_VIF) / intval;</div><div class='ctx'> 	slot = ATH9K_HTC_MAX_BCN_VIF - slot - 1;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_BEACON,</div><div class='add'>+	ath_dbg(common, BEACON,</div><div class='ctx'> 		"Choose slot: %d, tsf: %llu, tsftu: %u, intval: %u\n",</div><div class='ctx'> 		slot, tsf, tsftu, intval);</div><div class='ctx'> </div><div class='hunk'>@@ -450,8 +447,7 @@ void ath9k_htc_swba(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	if (swba-&gt;beacon_pending != 0) {</div><div class='ctx'> 		priv-&gt;cur_beacon_conf.bmiss_cnt++;</div><div class='ctx'> 		if (priv-&gt;cur_beacon_conf.bmiss_cnt &gt; BSTUCK_THRESHOLD) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_BSTUCK,</div><div class='del'>-				"Beacon stuck, HW reset\n");</div><div class='add'>+			ath_dbg(common, BSTUCK, "Beacon stuck, HW reset\n");</div><div class='ctx'> 			ieee80211_queue_work(priv-&gt;hw,</div><div class='ctx'> 					     &amp;priv-&gt;fatal_work);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -459,7 +455,7 @@ void ath9k_htc_swba(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;cur_beacon_conf.bmiss_cnt) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_BSTUCK,</div><div class='add'>+		ath_dbg(common, BSTUCK,</div><div class='ctx'> 			"Resuming beacon xmit after %u misses\n",</div><div class='ctx'> 			priv-&gt;cur_beacon_conf.bmiss_cnt);</div><div class='ctx'> 		priv-&gt;cur_beacon_conf.bmiss_cnt = 0;</div><div class='hunk'>@@ -495,8 +491,8 @@ void ath9k_htc_assign_bslot(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	priv-&gt;cur_beacon_conf.bslot[avp-&gt;bslot] = vif;</div><div class='ctx'> 	spin_unlock_bh(&amp;priv-&gt;beacon_lock);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-		"Added interface at beacon slot: %d\n", avp-&gt;bslot);</div><div class='add'>+	ath_dbg(common, CONFIG, "Added interface at beacon slot: %d\n",</div><div class='add'>+		avp-&gt;bslot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath9k_htc_remove_bslot(struct ath9k_htc_priv *priv,</div><div class='hunk'>@@ -509,8 +505,8 @@ void ath9k_htc_remove_bslot(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	priv-&gt;cur_beacon_conf.bslot[avp-&gt;bslot] = NULL;</div><div class='ctx'> 	spin_unlock_bh(&amp;priv-&gt;beacon_lock);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-		"Removed interface at beacon slot: %d\n", avp-&gt;bslot);</div><div class='add'>+	ath_dbg(common, CONFIG, "Removed interface at beacon slot: %d\n",</div><div class='add'>+		avp-&gt;bslot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -536,8 +532,7 @@ void ath9k_htc_set_tsfadjust(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	tsfadjust = cur_conf-&gt;beacon_interval * avp-&gt;bslot / ATH9K_HTC_MAX_BCN_VIF;</div><div class='ctx'> 	avp-&gt;tsfadjust = cpu_to_le64(TU_TO_USEC(tsfadjust));</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-		"tsfadjust is: %llu for bslot: %d\n",</div><div class='add'>+	ath_dbg(common, CONFIG, "tsfadjust is: %llu for bslot: %d\n",</div><div class='ctx'> 		(unsigned long long)tsfadjust, avp-&gt;bslot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -568,7 +563,7 @@ static bool ath9k_htc_check_beacon_config(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	    (priv-&gt;num_ap_vif &gt; 1) &amp;&amp;</div><div class='ctx'> 	    (vif-&gt;type == NL80211_IFTYPE_AP) &amp;&amp;</div><div class='ctx'> 	    (cur_conf-&gt;beacon_interval != bss_conf-&gt;beacon_int)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+		ath_dbg(common, CONFIG,</div><div class='ctx'> 			"Changing beacon interval of multiple AP interfaces !\n");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -579,7 +574,7 @@ static bool ath9k_htc_check_beacon_config(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (priv-&gt;num_ap_vif &amp;&amp;</div><div class='ctx'> 	    (vif-&gt;type != NL80211_IFTYPE_AP)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+		ath_dbg(common, CONFIG,</div><div class='ctx'> 			"HW in AP mode, cannot set STA beacon parameters\n");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -597,7 +592,7 @@ static bool ath9k_htc_check_beacon_config(struct ath9k_htc_priv *priv,</div><div class='ctx'> 							   &amp;beacon_configured);</div><div class='ctx'> </div><div class='ctx'> 		if (beacon_configured) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+			ath_dbg(common, CONFIG,</div><div class='ctx'> 				"Beacon already configured for a station interface\n");</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -637,8 +632,7 @@ void ath9k_htc_beacon_config(struct ath9k_htc_priv *priv,</div><div class='ctx'> 		ath9k_htc_beacon_config_ap(priv, cur_conf);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-			"Unsupported beaconing mode\n");</div><div class='add'>+		ath_dbg(common, CONFIG, "Unsupported beaconing mode\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -659,8 +653,7 @@ void ath9k_htc_beacon_reconfig(struct ath9k_htc_priv *priv)</div><div class='ctx'> 		ath9k_htc_beacon_config_ap(priv, cur_conf);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-			"Unsupported beaconing mode\n");</div><div class='add'>+		ath_dbg(common, CONFIG, "Unsupported beaconing mode\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c b/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c<br/>index e3a02eb8e0cc..6506e1fd5036 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/htc_drv_gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/htc_drv_gpio.c</a></div><div class='hunk'>@@ -36,12 +36,12 @@ static void ath_detect_bt_priority(struct ath9k_htc_priv *priv)</div><div class='ctx'> 		priv-&gt;op_flags &amp;= ~(OP_BT_PRIORITY_DETECTED | OP_BT_SCAN);</div><div class='ctx'> 		/* Detect if colocated bt started scanning */</div><div class='ctx'> 		if (btcoex-&gt;bt_priority_cnt &gt;= ATH_BT_CNT_SCAN_THRESHOLD) {</div><div class='del'>-			ath_dbg(ath9k_hw_common(ah), ATH_DBG_BTCOEX,</div><div class='add'>+			ath_dbg(ath9k_hw_common(ah), BTCOEX,</div><div class='ctx'> 				"BT scan detected\n");</div><div class='ctx'> 			priv-&gt;op_flags |= (OP_BT_SCAN |</div><div class='ctx'> 					 OP_BT_PRIORITY_DETECTED);</div><div class='ctx'> 		} else if (btcoex-&gt;bt_priority_cnt &gt;= ATH_BT_CNT_THRESHOLD) {</div><div class='del'>-			ath_dbg(ath9k_hw_common(ah), ATH_DBG_BTCOEX,</div><div class='add'>+			ath_dbg(ath9k_hw_common(ah), BTCOEX,</div><div class='ctx'> 				"BT priority traffic detected\n");</div><div class='ctx'> 			priv-&gt;op_flags |= OP_BT_PRIORITY_DETECTED;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -80,6 +80,7 @@ static void ath_btcoex_period_work(struct work_struct *work)</div><div class='ctx'> 	ath9k_hw_btcoex_bt_stomp(priv-&gt;ah, is_btscan ? ATH_BTCOEX_STOMP_ALL :</div><div class='ctx'> 			btcoex-&gt;bt_stomp_type);</div><div class='ctx'> </div><div class='add'>+	ath9k_hw_btcoex_enable(priv-&gt;ah);</div><div class='ctx'> 	timer_period = is_btscan ? btcoex-&gt;btscan_no_stomp :</div><div class='ctx'> 		btcoex-&gt;btcoex_no_stomp;</div><div class='ctx'> 	ieee80211_queue_delayed_work(priv-&gt;hw, &amp;priv-&gt;duty_cycle_work,</div><div class='hunk'>@@ -101,19 +102,22 @@ static void ath_btcoex_duty_cycle_work(struct work_struct *work)</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> 	bool is_btscan = priv-&gt;op_flags &amp; OP_BT_SCAN;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_BTCOEX,</div><div class='del'>-		"time slice work for bt and wlan\n");</div><div class='add'>+	ath_dbg(common, BTCOEX, "time slice work for bt and wlan\n");</div><div class='ctx'> </div><div class='ctx'> 	if (btcoex-&gt;bt_stomp_type == ATH_BTCOEX_STOMP_LOW || is_btscan)</div><div class='ctx'> 		ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_NONE);</div><div class='ctx'> 	else if (btcoex-&gt;bt_stomp_type == ATH_BTCOEX_STOMP_ALL)</div><div class='ctx'> 		ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_LOW);</div><div class='add'>+	ath9k_hw_btcoex_enable(priv-&gt;ah);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath_htc_init_btcoex_work(struct ath9k_htc_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_btcoex *btcoex = &amp;priv-&gt;btcoex;</div><div class='ctx'> </div><div class='add'>+	if (ath9k_hw_get_btcoex_scheme(priv-&gt;ah) == ATH_BTCOEX_CFG_NONE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	btcoex-&gt;btcoex_period = ATH_BTCOEX_DEF_BT_PERIOD;</div><div class='ctx'> 	btcoex-&gt;btcoex_no_stomp = (100 - ATH_BTCOEX_DEF_DUTY_CYCLE) *</div><div class='ctx'> 		btcoex-&gt;btcoex_period / 100;</div><div class='hunk'>@@ -132,7 +136,10 @@ void ath_htc_resume_btcoex_work(struct ath9k_htc_priv *priv)</div><div class='ctx'> 	struct ath_btcoex *btcoex = &amp;priv-&gt;btcoex;</div><div class='ctx'> 	struct ath_hw *ah = priv-&gt;ah;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(ath9k_hw_common(ah), ATH_DBG_BTCOEX, "Starting btcoex work\n");</div><div class='add'>+	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath_dbg(ath9k_hw_common(ah), BTCOEX, "Starting btcoex work\n");</div><div class='ctx'> </div><div class='ctx'> 	btcoex-&gt;bt_priority_cnt = 0;</div><div class='ctx'> 	btcoex-&gt;bt_priority_time = jiffies;</div><div class='hunk'>@@ -146,6 +153,9 @@ void ath_htc_resume_btcoex_work(struct ath9k_htc_priv *priv)</div><div class='ctx'>  */</div><div class='ctx'> void ath_htc_cancel_btcoex_work(struct ath9k_htc_priv *priv)</div><div class='ctx'> {</div><div class='add'>+	if (ath9k_hw_get_btcoex_scheme(priv-&gt;ah) == ATH_BTCOEX_CFG_NONE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;priv-&gt;coex_period_work);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;priv-&gt;duty_cycle_work);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c<br/>index 966661c9e586..9be10a2da1c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/htc_drv_init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/htc_drv_init.c</a></div><div class='hunk'>@@ -299,8 +299,7 @@ static unsigned int ath9k_regread(void *hw_priv, u32 reg_offset)</div><div class='ctx'> 			  (u8 *) &amp;val, sizeof(val),</div><div class='ctx'> 			  100);</div><div class='ctx'> 	if (unlikely(r)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_WMI,</div><div class='del'>-			"REGISTER READ FAILED: (0x%04x, %d)\n",</div><div class='add'>+		ath_dbg(common, WMI, "REGISTER READ FAILED: (0x%04x, %d)\n",</div><div class='ctx'> 			reg_offset, r);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -327,7 +326,7 @@ static void ath9k_multi_regread(void *hw_priv, u32 *addr,</div><div class='ctx'> 			   (u8 *)tmpval, sizeof(u32) * count,</div><div class='ctx'> 			   100);</div><div class='ctx'> 	if (unlikely(ret)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_WMI,</div><div class='add'>+		ath_dbg(common, WMI,</div><div class='ctx'> 			"Multiple REGISTER READ FAILED (count: %d)\n", count);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -352,8 +351,7 @@ static void ath9k_regwrite_single(void *hw_priv, u32 val, u32 reg_offset)</div><div class='ctx'> 			  (u8 *) &amp;val, sizeof(val),</div><div class='ctx'> 			  100);</div><div class='ctx'> 	if (unlikely(r)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_WMI,</div><div class='del'>-			"REGISTER WRITE FAILED:(0x%04x, %d)\n",</div><div class='add'>+		ath_dbg(common, WMI, "REGISTER WRITE FAILED:(0x%04x, %d)\n",</div><div class='ctx'> 			reg_offset, r);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -384,7 +382,7 @@ static void ath9k_regwrite_buffer(void *hw_priv, u32 val, u32 reg_offset)</div><div class='ctx'> 			  (u8 *) &amp;rsp_status, sizeof(rsp_status),</div><div class='ctx'> 			  100);</div><div class='ctx'> 		if (unlikely(r)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_WMI,</div><div class='add'>+			ath_dbg(common, WMI,</div><div class='ctx'> 				"REGISTER WRITE FAILED, multi len: %d\n",</div><div class='ctx'> 				priv-&gt;wmi-&gt;multi_write_idx);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -434,7 +432,7 @@ static void ath9k_regwrite_flush(void *hw_priv)</div><div class='ctx'> 			  (u8 *) &amp;rsp_status, sizeof(rsp_status),</div><div class='ctx'> 			  100);</div><div class='ctx'> 		if (unlikely(r)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_WMI,</div><div class='add'>+			ath_dbg(common, WMI,</div><div class='ctx'> 				"REGISTER WRITE FAILED, multi len: %d\n",</div><div class='ctx'> 				priv-&gt;wmi-&gt;multi_write_idx);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -512,8 +510,7 @@ static void setup_ht_cap(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	tx_streams = ath9k_cmn_count_streams(priv-&gt;ah-&gt;txchainmask, 2);</div><div class='ctx'> 	rx_streams = ath9k_cmn_count_streams(priv-&gt;ah-&gt;rxchainmask, 2);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-		"TX streams %d, RX streams: %d\n",</div><div class='add'>+	ath_dbg(common, CONFIG, "TX streams %d, RX streams: %d\n",</div><div class='ctx'> 		tx_streams, rx_streams);</div><div class='ctx'> </div><div class='ctx'> 	if (tx_streams != rx_streams) {</div><div class='hunk'>@@ -610,7 +607,7 @@ static void ath9k_init_btcoex(struct ath9k_htc_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int qnum;</div><div class='ctx'> </div><div class='del'>-	switch (priv-&gt;ah-&gt;btcoex_hw.scheme) {</div><div class='add'>+	switch (ath9k_hw_get_btcoex_scheme(priv-&gt;ah)) {</div><div class='ctx'> 	case ATH_BTCOEX_CFG_NONE:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATH_BTCOEX_CFG_3WIRE:</div><div class='hunk'>@@ -704,7 +701,8 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	if (product &amp;&amp; strncmp(product, ATH_HTC_BTCOEX_PRODUCT_ID, 5) == 0) {</div><div class='ctx'> 		ah-&gt;btcoex_hw.scheme = ATH_BTCOEX_CFG_3WIRE;</div><div class='del'>-		ath9k_init_btcoex(priv);</div><div class='add'>+		if (ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_NONE)</div><div class='add'>+			ath9k_init_btcoex(priv);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -876,9 +874,8 @@ static int ath9k_init_device(struct ath9k_htc_priv *priv,</div><div class='ctx'> 		goto err_world;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-		"WMI:%d, BCN:%d, CAB:%d, UAPSD:%d, MGMT:%d, "</div><div class='del'>-		"BE:%d, BK:%d, VI:%d, VO:%d\n",</div><div class='add'>+	ath_dbg(common, CONFIG,</div><div class='add'>+		"WMI:%d, BCN:%d, CAB:%d, UAPSD:%d, MGMT:%d, BE:%d, BK:%d, VI:%d, VO:%d\n",</div><div class='ctx'> 		priv-&gt;wmi_cmd_ep,</div><div class='ctx'> 		priv-&gt;beacon_ep,</div><div class='ctx'> 		priv-&gt;cab_ep,</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c<br/>index 0b9a0e8a4958..ef4c60661290 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/htc_drv_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/htc_drv_main.c</a></div><div class='hunk'>@@ -266,7 +266,7 @@ static int ath9k_htc_set_channel(struct ath9k_htc_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	ath9k_wmi_event_drain(priv);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+	ath_dbg(common, CONFIG,</div><div class='ctx'> 		"(%u MHz) -&gt; (%u MHz), HT: %d, HT40: %d fastcc: %d\n",</div><div class='ctx'> 		priv-&gt;ah-&gt;curchan-&gt;channel,</div><div class='ctx'> 		channel-&gt;center_freq, conf_is_ht(conf), conf_is_ht40(conf),</div><div class='hunk'>@@ -415,7 +415,7 @@ static int ath9k_htc_add_monitor_interface(struct ath9k_htc_priv *priv)</div><div class='ctx'> 	priv-&gt;vif_sta_pos[priv-&gt;mon_vif_idx] = sta_idx;</div><div class='ctx'> 	priv-&gt;ah-&gt;is_monitoring = true;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+	ath_dbg(common, CONFIG,</div><div class='ctx'> 		"Attached a monitor interface at idx: %d, sta idx: %d\n",</div><div class='ctx'> 		priv-&gt;mon_vif_idx, sta_idx);</div><div class='ctx'> </div><div class='hunk'>@@ -427,7 +427,7 @@ err_sta:</div><div class='ctx'> 	 */</div><div class='ctx'> 	__ath9k_htc_remove_monitor_interface(priv);</div><div class='ctx'> err_vif:</div><div class='del'>-	ath_dbg(common, ATH_DBG_FATAL, "Unable to attach a monitor interface\n");</div><div class='add'>+	ath_dbg(common, FATAL, "Unable to attach a monitor interface\n");</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -452,7 +452,7 @@ static int ath9k_htc_remove_monitor_interface(struct ath9k_htc_priv *priv)</div><div class='ctx'> 	priv-&gt;nstations--;</div><div class='ctx'> 	priv-&gt;ah-&gt;is_monitoring = false;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+	ath_dbg(common, CONFIG,</div><div class='ctx'> 		"Removed a monitor interface at idx: %d, sta idx: %d\n",</div><div class='ctx'> 		priv-&gt;mon_vif_idx, sta_idx);</div><div class='ctx'> </div><div class='hunk'>@@ -512,11 +512,11 @@ static int ath9k_htc_add_station(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sta) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+		ath_dbg(common, CONFIG,</div><div class='ctx'> 			"Added a station entry for: %pM (idx: %d)\n",</div><div class='ctx'> 			sta-&gt;addr, tsta.sta_index);</div><div class='ctx'> 	} else {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+		ath_dbg(common, CONFIG,</div><div class='ctx'> 			"Added a station entry for VIF %d (idx: %d)\n",</div><div class='ctx'> 			avp-&gt;index, tsta.sta_index);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -556,11 +556,11 @@ static int ath9k_htc_remove_station(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sta) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+		ath_dbg(common, CONFIG,</div><div class='ctx'> 			"Removed a station entry for: %pM (idx: %d)\n",</div><div class='ctx'> 			sta-&gt;addr, sta_idx);</div><div class='ctx'> 	} else {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+		ath_dbg(common, CONFIG,</div><div class='ctx'> 			"Removed a station entry for VIF %d (idx: %d)\n",</div><div class='ctx'> 			avp-&gt;index, sta_idx);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -665,7 +665,7 @@ static void ath9k_htc_init_rate(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	ath9k_htc_setup_rate(priv, sta, &amp;trate);</div><div class='ctx'> 	ret = ath9k_htc_send_rate_cmd(priv, &amp;trate);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+		ath_dbg(common, CONFIG,</div><div class='ctx'> 			"Updated target sta: %pM, rate caps: 0x%X\n",</div><div class='ctx'> 			sta-&gt;addr, be32_to_cpu(trate.capflags));</div><div class='ctx'> }</div><div class='hunk'>@@ -692,7 +692,7 @@ static void ath9k_htc_update_rate(struct ath9k_htc_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	ret = ath9k_htc_send_rate_cmd(priv, &amp;trate);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+		ath_dbg(common, CONFIG,</div><div class='ctx'> 			"Updated target sta: %pM, rate caps: 0x%X\n",</div><div class='ctx'> 			bss_conf-&gt;bssid, be32_to_cpu(trate.capflags));</div><div class='ctx'> }</div><div class='hunk'>@@ -721,11 +721,11 @@ static int ath9k_htc_tx_aggr_oper(struct ath9k_htc_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	WMI_CMD_BUF(WMI_TX_AGGR_ENABLE_CMDID, &amp;aggr);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+		ath_dbg(common, CONFIG,</div><div class='ctx'> 			"Unable to %s TX aggregation for (%pM, %d)\n",</div><div class='ctx'> 			(aggr.aggr_enable) ? "start" : "stop", sta-&gt;addr, tid);</div><div class='ctx'> 	else</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+		ath_dbg(common, CONFIG,</div><div class='ctx'> 			"%s TX aggregation for (%pM, %d)\n",</div><div class='ctx'> 			(aggr.aggr_enable) ? "Starting" : "Stopping",</div><div class='ctx'> 			sta-&gt;addr, tid);</div><div class='hunk'>@@ -784,7 +784,7 @@ void ath9k_htc_ani_work(struct work_struct *work)</div><div class='ctx'> 	/* Long calibration runs independently of short calibration. */</div><div class='ctx'> 	if ((timestamp - common-&gt;ani.longcal_timer) &gt;= ATH_LONG_CALINTERVAL) {</div><div class='ctx'> 		longcal = true;</div><div class='del'>-		ath_dbg(common, ATH_DBG_ANI, "longcal @%lu\n", jiffies);</div><div class='add'>+		ath_dbg(common, ANI, "longcal @%lu\n", jiffies);</div><div class='ctx'> 		common-&gt;ani.longcal_timer = timestamp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -793,8 +793,7 @@ void ath9k_htc_ani_work(struct work_struct *work)</div><div class='ctx'> 		if ((timestamp - common-&gt;ani.shortcal_timer) &gt;=</div><div class='ctx'> 		    short_cal_interval) {</div><div class='ctx'> 			shortcal = true;</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='del'>-				"shortcal @%lu\n", jiffies);</div><div class='add'>+			ath_dbg(common, ANI, "shortcal @%lu\n", jiffies);</div><div class='ctx'> 			common-&gt;ani.shortcal_timer = timestamp;</div><div class='ctx'> 			common-&gt;ani.resetcal_timer = timestamp;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -808,7 +807,8 @@ void ath9k_htc_ani_work(struct work_struct *work)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Verify whether we must check ANI */</div><div class='del'>-	if ((timestamp - common-&gt;ani.checkani_timer) &gt;= ATH_ANI_POLLINTERVAL) {</div><div class='add'>+	if (ah-&gt;config.enable_ani &amp;&amp;</div><div class='add'>+	    (timestamp - common-&gt;ani.checkani_timer) &gt;= ATH_ANI_POLLINTERVAL) {</div><div class='ctx'> 		aniflag = true;</div><div class='ctx'> 		common-&gt;ani.checkani_timer = timestamp;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -838,7 +838,7 @@ set_timer:</div><div class='ctx'> 	* short calibration and long calibration.</div><div class='ctx'> 	*/</div><div class='ctx'> 	cal_interval = ATH_LONG_CALINTERVAL;</div><div class='del'>-	if (priv-&gt;ah-&gt;config.enable_ani)</div><div class='add'>+	if (ah-&gt;config.enable_ani)</div><div class='ctx'> 		cal_interval = min(cal_interval, (u32)ATH_ANI_POLLINTERVAL);</div><div class='ctx'> 	if (!common-&gt;ani.caldone)</div><div class='ctx'> 		cal_interval = min(cal_interval, (u32)short_cal_interval);</div><div class='hunk'>@@ -865,7 +865,7 @@ static void ath9k_htc_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> 	padsize = padpos &amp; 3;</div><div class='ctx'> 	if (padsize &amp;&amp; skb-&gt;len &gt; padpos) {</div><div class='ctx'> 		if (skb_headroom(skb) &lt; padsize) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_XMIT, "No room for padding\n");</div><div class='add'>+			ath_dbg(common, XMIT, "No room for padding\n");</div><div class='ctx'> 			goto fail_tx;</div><div class='ctx'> 		}</div><div class='ctx'> 		skb_push(skb, padsize);</div><div class='hunk'>@@ -874,13 +874,13 @@ static void ath9k_htc_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	slot = ath9k_htc_tx_get_slot(priv);</div><div class='ctx'> 	if (slot &lt; 0) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_XMIT, "No free TX slot\n");</div><div class='add'>+		ath_dbg(common, XMIT, "No free TX slot\n");</div><div class='ctx'> 		goto fail_tx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ath9k_htc_tx_start(priv, skb, slot, false);</div><div class='ctx'> 	if (ret != 0) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_XMIT, "Tx failed\n");</div><div class='add'>+		ath_dbg(common, XMIT, "Tx failed\n");</div><div class='ctx'> 		goto clear_slot;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -908,7 +908,7 @@ static int ath9k_htc_start(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+	ath_dbg(common, CONFIG,</div><div class='ctx'> 		"Starting driver with initial channel: %d MHz\n",</div><div class='ctx'> 		curchan-&gt;center_freq);</div><div class='ctx'> </div><div class='hunk'>@@ -942,7 +942,7 @@ static int ath9k_htc_start(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	ret = ath9k_htc_update_cap_target(priv, 0);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+		ath_dbg(common, CONFIG,</div><div class='ctx'> 			"Failed to update capability in target\n");</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;op_flags &amp;= ~OP_INVALID;</div><div class='hunk'>@@ -957,7 +957,7 @@ static int ath9k_htc_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	mod_timer(&amp;priv-&gt;tx.cleanup_timer,</div><div class='ctx'> 		  jiffies + msecs_to_jiffies(ATH9K_HTC_TX_CLEANUP_INTERVAL));</div><div class='ctx'> </div><div class='del'>-	if (ah-&gt;btcoex_hw.scheme == ATH_BTCOEX_CFG_3WIRE) {</div><div class='add'>+	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_3WIRE) {</div><div class='ctx'> 		ath9k_hw_btcoex_set_weight(ah, AR_BT_COEX_WGHT,</div><div class='ctx'> 					   AR_STOMP_LOW_WLAN_WGHT);</div><div class='ctx'> 		ath9k_hw_btcoex_enable(ah);</div><div class='hunk'>@@ -979,7 +979,7 @@ static void ath9k_htc_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;op_flags &amp; OP_INVALID) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_ANY, "Device not present\n");</div><div class='add'>+		ath_dbg(common, ANY, "Device not present\n");</div><div class='ctx'> 		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1009,7 +1009,8 @@ static void ath9k_htc_stop(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (ah-&gt;btcoex_hw.enabled) {</div><div class='add'>+	if (ah-&gt;btcoex_hw.enabled &amp;&amp;</div><div class='add'>+	    ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_NONE) {</div><div class='ctx'> 		ath9k_hw_btcoex_disable(ah);</div><div class='ctx'> 		if (ah-&gt;btcoex_hw.scheme == ATH_BTCOEX_CFG_3WIRE)</div><div class='ctx'> 			ath_htc_cancel_btcoex_work(priv);</div><div class='hunk'>@@ -1026,7 +1027,7 @@ static void ath9k_htc_stop(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;op_flags |= OP_INVALID;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG, "Driver halt\n");</div><div class='add'>+	ath_dbg(common, CONFIG, "Driver halt\n");</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1119,8 +1120,8 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 		ath9k_htc_start_ani(priv);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-		"Attach a VIF of type: %d at idx: %d\n", vif-&gt;type, avp-&gt;index);</div><div class='add'>+	ath_dbg(common, CONFIG, "Attach a VIF of type: %d at idx: %d\n",</div><div class='add'>+		vif-&gt;type, avp-&gt;index);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	ath9k_htc_ps_restore(priv);</div><div class='hunk'>@@ -1176,7 +1177,7 @@ static void ath9k_htc_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 			ath9k_htc_stop_ani(priv);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG, "Detach Interface at idx: %d\n", avp-&gt;index);</div><div class='add'>+	ath_dbg(common, CONFIG, "Detach Interface at idx: %d\n", avp-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	ath9k_htc_ps_restore(priv);</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='hunk'>@@ -1201,8 +1202,7 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 		mutex_unlock(&amp;priv-&gt;htc_pm_lock);</div><div class='ctx'> </div><div class='ctx'> 		if (enable_radio) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-				"not-idle: enabling radio\n");</div><div class='add'>+			ath_dbg(common, CONFIG, "not-idle: enabling radio\n");</div><div class='ctx'> 			ath9k_htc_setpower(priv, ATH9K_PM_AWAKE);</div><div class='ctx'> 			ath9k_htc_radio_enable(hw);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1224,7 +1224,7 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 		struct ieee80211_channel *curchan = hw-&gt;conf.channel;</div><div class='ctx'> 		int pos = curchan-&gt;hw_value;</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG, "Set channel: %d MHz\n",</div><div class='add'>+		ath_dbg(common, CONFIG, "Set channel: %d MHz\n",</div><div class='ctx'> 			curchan-&gt;center_freq);</div><div class='ctx'> </div><div class='ctx'> 		ath9k_cmn_update_ichannel(&amp;priv-&gt;ah-&gt;channels[pos],</div><div class='hunk'>@@ -1264,8 +1264,7 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 		}</div><div class='ctx'> 		mutex_unlock(&amp;priv-&gt;htc_pm_lock);</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-			"idle: disabling radio\n");</div><div class='add'>+		ath_dbg(common, CONFIG, "idle: disabling radio\n");</div><div class='ctx'> 		ath9k_htc_radio_disable(hw);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1297,7 +1296,7 @@ static void ath9k_htc_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> 	*total_flags &amp;= SUPPORTED_FILTERS;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;op_flags &amp; OP_INVALID) {</div><div class='del'>-		ath_dbg(ath9k_hw_common(priv-&gt;ah), ATH_DBG_ANY,</div><div class='add'>+		ath_dbg(ath9k_hw_common(priv-&gt;ah), ANY,</div><div class='ctx'> 			"Unable to configure filter on invalid state\n");</div><div class='ctx'> 		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1308,8 +1307,8 @@ static void ath9k_htc_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> 	rfilt = ath9k_htc_calcrxfilter(priv);</div><div class='ctx'> 	ath9k_hw_setrxfilter(priv-&gt;ah, rfilt);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(ath9k_hw_common(priv-&gt;ah), ATH_DBG_CONFIG,</div><div class='del'>-		"Set HW RX filter: 0x%x\n", rfilt);</div><div class='add'>+	ath_dbg(ath9k_hw_common(priv-&gt;ah), CONFIG, "Set HW RX filter: 0x%x\n",</div><div class='add'>+		rfilt);</div><div class='ctx'> </div><div class='ctx'> 	ath9k_htc_ps_restore(priv);</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='hunk'>@@ -1376,7 +1375,7 @@ static int ath9k_htc_conf_tx(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	qnum = get_hw_qnum(queue, priv-&gt;hwq_map);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+	ath_dbg(common, CONFIG,</div><div class='ctx'> 		"Configure tx [queue/hwq] [%d/%d],  aifs: %d, cw_min: %d, cw_max: %d, txop: %d\n",</div><div class='ctx'> 		queue, qnum, params-&gt;aifs, params-&gt;cw_min,</div><div class='ctx'> 		params-&gt;cw_max, params-&gt;txop);</div><div class='hunk'>@@ -1411,7 +1410,7 @@ static int ath9k_htc_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG, "Set HW Key\n");</div><div class='add'>+	ath_dbg(common, CONFIG, "Set HW Key\n");</div><div class='ctx'> 	ath9k_htc_ps_wakeup(priv);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='hunk'>@@ -1447,8 +1446,7 @@ static void ath9k_htc_set_bssid(struct ath9k_htc_priv *priv)</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(priv-&gt;ah);</div><div class='ctx'> </div><div class='ctx'> 	ath9k_hw_write_associd(priv-&gt;ah);</div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-		"BSSID: %pM aid: 0x%x\n",</div><div class='add'>+	ath_dbg(common, CONFIG, "BSSID: %pM aid: 0x%x\n",</div><div class='ctx'> 		common-&gt;curbssid, common-&gt;curaid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1486,7 +1484,7 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	ath9k_htc_ps_wakeup(priv);</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ASSOC) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG, "BSS Changed ASSOC %d\n",</div><div class='add'>+		ath_dbg(common, CONFIG, "BSS Changed ASSOC %d\n",</div><div class='ctx'> 			bss_conf-&gt;assoc);</div><div class='ctx'> </div><div class='ctx'> 		bss_conf-&gt;assoc ?</div><div class='hunk'>@@ -1511,8 +1509,8 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((changed &amp; BSS_CHANGED_BEACON_ENABLED) &amp;&amp; bss_conf-&gt;enable_beacon) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-			"Beacon enabled for BSS: %pM\n", bss_conf-&gt;bssid);</div><div class='add'>+		ath_dbg(common, CONFIG, "Beacon enabled for BSS: %pM\n",</div><div class='add'>+			bss_conf-&gt;bssid);</div><div class='ctx'> 		ath9k_htc_set_tsfadjust(priv, vif);</div><div class='ctx'> 		priv-&gt;op_flags |= OP_ENABLE_BEACON;</div><div class='ctx'> 		ath9k_htc_beacon_config(priv, vif);</div><div class='hunk'>@@ -1524,7 +1522,7 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 		 * AP/IBSS interfaces.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ((priv-&gt;num_ap_vif &lt;= 1) || priv-&gt;num_ibss_vif) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+			ath_dbg(common, CONFIG,</div><div class='ctx'> 				"Beacon disabled for BSS: %pM\n",</div><div class='ctx'> 				bss_conf-&gt;bssid);</div><div class='ctx'> 			priv-&gt;op_flags &amp;= ~OP_ENABLE_BEACON;</div><div class='hunk'>@@ -1542,7 +1540,7 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 		    (vif-&gt;type == NL80211_IFTYPE_AP)) {</div><div class='ctx'> 			priv-&gt;op_flags |= OP_TSF_RESET;</div><div class='ctx'> 		}</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+		ath_dbg(common, CONFIG,</div><div class='ctx'> 			"Beacon interval changed for BSS: %pM\n",</div><div class='ctx'> 			bss_conf-&gt;bssid);</div><div class='ctx'> 		ath9k_htc_beacon_config(priv, vif);</div><div class='hunk'>@@ -1732,8 +1730,7 @@ static int ath9k_htc_set_bitrate_mask(struct ieee80211_hw *hw,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-		"Set bitrate masks: 0x%x, 0x%x\n",</div><div class='add'>+	ath_dbg(common, CONFIG, "Set bitrate masks: 0x%x, 0x%x\n",</div><div class='ctx'> 		mask-&gt;control[IEEE80211_BAND_2GHZ].legacy,</div><div class='ctx'> 		mask-&gt;control[IEEE80211_BAND_5GHZ].legacy);</div><div class='ctx'> out:</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c<br/>index 2d81c700e201..3e40a6461512 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/htc_drv_txrx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/htc_drv_txrx.c</a></div><div class='hunk'>@@ -355,7 +355,7 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv,</div><div class='ctx'> 		vif_idx = avp-&gt;index;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!priv-&gt;ah-&gt;is_monitoring) {</div><div class='del'>-			ath_dbg(ath9k_hw_common(priv-&gt;ah), ATH_DBG_XMIT,</div><div class='add'>+			ath_dbg(ath9k_hw_common(priv-&gt;ah), XMIT,</div><div class='ctx'> 				"VIF is null, but no monitor interface !\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -620,8 +620,7 @@ static struct sk_buff* ath9k_htc_tx_get_packet(struct ath9k_htc_priv *priv,</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;epid_queue-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_XMIT,</div><div class='del'>-		"No matching packet for cookie: %d, epid: %d\n",</div><div class='add'>+	ath_dbg(common, XMIT, "No matching packet for cookie: %d, epid: %d\n",</div><div class='ctx'> 		txs-&gt;cookie, epid);</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -705,8 +704,7 @@ static inline bool check_packet(struct ath9k_htc_priv *priv, struct sk_buff *skb</div><div class='ctx'> 	if (time_after(jiffies,</div><div class='ctx'> 		       tx_ctl-&gt;timestamp +</div><div class='ctx'> 		       msecs_to_jiffies(ATH9K_HTC_TX_TIMEOUT_INTERVAL))) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_XMIT,</div><div class='del'>-			"Dropping a packet due to TX timeout\n");</div><div class='add'>+		ath_dbg(common, XMIT, "Dropping a packet due to TX timeout\n");</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -753,7 +751,7 @@ void ath9k_htc_tx_cleanup_timer(unsigned long data)</div><div class='ctx'> </div><div class='ctx'> 		skb = ath9k_htc_tx_get_packet(priv, &amp;event-&gt;txs);</div><div class='ctx'> 		if (skb) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_XMIT,</div><div class='add'>+			ath_dbg(common, XMIT,</div><div class='ctx'> 				"Found packet for cookie: %d, epid: %d\n",</div><div class='ctx'> 				event-&gt;txs.cookie,</div><div class='ctx'> 				MS(event-&gt;txs.ts_rate, ATH9K_HTC_TXSTAT_EPID));</div><div class='hunk'>@@ -1167,8 +1165,7 @@ void ath9k_htc_rxep(void *drv_priv, struct sk_buff *skb,</div><div class='ctx'> 	spin_unlock(&amp;priv-&gt;rx.rxbuflock);</div><div class='ctx'> </div><div class='ctx'> 	if (rxbuf == NULL) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_ANY,</div><div class='del'>-			"No free RX buffer\n");</div><div class='add'>+		ath_dbg(common, ANY, "No free RX buffer\n");</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/hw-ops.h b/drivers/net/wireless/ath/ath9k/hw-ops.h<br/>index e74c233757a2..c4ad0b06bdbc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/hw-ops.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/hw-ops.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/hw-ops.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/hw-ops.h</a></div><div class='hunk'>@@ -212,4 +212,13 @@ static inline int ath9k_hw_fast_chan_change(struct ath_hw *ah,</div><div class='ctx'> 	return ath9k_hw_private_ops(ah)-&gt;fast_chan_change(ah, chan,</div><div class='ctx'> 							  ini_reloaded);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline void ath9k_hw_set_radar_params(struct ath_hw *ah)</div><div class='add'>+{</div><div class='add'>+	if (!ath9k_hw_private_ops(ah)-&gt;set_radar_params)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ath9k_hw_private_ops(ah)-&gt;set_radar_params(ah, &amp;ah-&gt;radar_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* ATH9K_HW_OPS_H */</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c<br/>index 8873c6e6fb96..ee7759575050 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/hw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/hw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/hw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/hw.c</a></div><div class='hunk'>@@ -133,7 +133,7 @@ bool ath9k_hw_wait(struct ath_hw *ah, u32 reg, u32 mask, u32 val, u32 timeout)</div><div class='ctx'> 		udelay(AH_TIME_QUANTUM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(ath9k_hw_common(ah), ATH_DBG_ANY,</div><div class='add'>+	ath_dbg(ath9k_hw_common(ah), ANY,</div><div class='ctx'> 		"timeout (%d us) on reg 0x%x: 0x%08x &amp; 0x%08x != 0x%08x\n",</div><div class='ctx'> 		timeout, reg, REG_READ(ah, reg), mask, val);</div><div class='ctx'> </div><div class='hunk'>@@ -491,8 +491,7 @@ static int ath9k_hw_post_init(struct ath_hw *ah)</div><div class='ctx'> 	if (ecode != 0)</div><div class='ctx'> 		return ecode;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(ath9k_hw_common(ah), ATH_DBG_CONFIG,</div><div class='del'>-		"Eeprom VER: %d, REV: %d\n",</div><div class='add'>+	ath_dbg(ath9k_hw_common(ah), CONFIG, "Eeprom VER: %d, REV: %d\n",</div><div class='ctx'> 		ah-&gt;eep_ops-&gt;get_eeprom_ver(ah),</div><div class='ctx'> 		ah-&gt;eep_ops-&gt;get_eeprom_rev(ah));</div><div class='ctx'> </div><div class='hunk'>@@ -504,7 +503,7 @@ static int ath9k_hw_post_init(struct ath_hw *ah)</div><div class='ctx'> 		return ecode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!AR_SREV_9100(ah) &amp;&amp; !AR_SREV_9340(ah)) {</div><div class='add'>+	if (ah-&gt;config.enable_ani) {</div><div class='ctx'> 		ath9k_hw_ani_setup(ah);</div><div class='ctx'> 		ath9k_hw_ani_init(ah);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -567,7 +566,7 @@ static int __ath9k_hw_init(struct ath_hw *ah)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_RESET, "serialize_regmode is %d\n",</div><div class='add'>+	ath_dbg(common, RESET, "serialize_regmode is %d\n",</div><div class='ctx'> 		ah-&gt;config.serialize_regmode);</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9285(ah) || AR_SREV_9271(ah))</div><div class='hunk'>@@ -610,6 +609,10 @@ static int __ath9k_hw_init(struct ath_hw *ah)</div><div class='ctx'> 	if (!AR_SREV_9300_20_OR_LATER(ah))</div><div class='ctx'> 		ah-&gt;ani_function &amp;= ~ATH9K_ANI_MRC_CCK;</div><div class='ctx'> </div><div class='add'>+	/* disable ANI for 9340 */</div><div class='add'>+	if (AR_SREV_9340(ah))</div><div class='add'>+		ah-&gt;config.enable_ani = false;</div><div class='add'>+</div><div class='ctx'> 	ath9k_hw_init_mode_regs(ah);</div><div class='ctx'> </div><div class='ctx'> 	if (!ah-&gt;is_pciexpress)</div><div class='hunk'>@@ -954,8 +957,8 @@ static void ath9k_hw_set_cts_timeout(struct ath_hw *ah, u32 us)</div><div class='ctx'> static bool ath9k_hw_set_global_txtimeout(struct ath_hw *ah, u32 tu)</div><div class='ctx'> {</div><div class='ctx'> 	if (tu &gt; 0xFFFF) {</div><div class='del'>-		ath_dbg(ath9k_hw_common(ah), ATH_DBG_XMIT,</div><div class='del'>-			"bad global tx timeout %u\n", tu);</div><div class='add'>+		ath_dbg(ath9k_hw_common(ah), XMIT, "bad global tx timeout %u\n",</div><div class='add'>+			tu);</div><div class='ctx'> 		ah-&gt;globaltxtimeout = (u32) -1;</div><div class='ctx'> 		return false;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -976,7 +979,7 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah)</div><div class='ctx'> 	int rx_lat = 0, tx_lat = 0, eifs = 0;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(ath9k_hw_common(ah), ATH_DBG_RESET, "ah-&gt;misc_mode 0x%x\n",</div><div class='add'>+	ath_dbg(ath9k_hw_common(ah), RESET, "ah-&gt;misc_mode 0x%x\n",</div><div class='ctx'> 		ah-&gt;misc_mode);</div><div class='ctx'> </div><div class='ctx'> 	if (!chan)</div><div class='hunk'>@@ -1271,7 +1274,7 @@ static bool ath9k_hw_set_reset(struct ath_hw *ah, int type)</div><div class='ctx'> 		    (npend || type == ATH9K_RESET_COLD)) {</div><div class='ctx'> 			int reset_err = 0;</div><div class='ctx'> </div><div class='del'>-			ath_dbg(ath9k_hw_common(ah), ATH_DBG_RESET,</div><div class='add'>+			ath_dbg(ath9k_hw_common(ah), RESET,</div><div class='ctx'> 				"reset MAC via external reset\n");</div><div class='ctx'> </div><div class='ctx'> 			reset_err = ah-&gt;external_reset();</div><div class='hunk'>@@ -1294,8 +1297,7 @@ static bool ath9k_hw_set_reset(struct ath_hw *ah, int type)</div><div class='ctx'> </div><div class='ctx'> 	REG_WRITE(ah, AR_RTC_RC, 0);</div><div class='ctx'> 	if (!ath9k_hw_wait(ah, AR_RTC_RC, AR_RTC_RC_M, 0, AH_WAIT_TIMEOUT)) {</div><div class='del'>-		ath_dbg(ath9k_hw_common(ah), ATH_DBG_RESET,</div><div class='del'>-			"RTC stuck in MAC reset\n");</div><div class='add'>+		ath_dbg(ath9k_hw_common(ah), RESET, "RTC stuck in MAC reset\n");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1340,8 +1342,7 @@ static bool ath9k_hw_set_reset_power_on(struct ath_hw *ah)</div><div class='ctx'> 			   AR_RTC_STATUS_M,</div><div class='ctx'> 			   AR_RTC_STATUS_ON,</div><div class='ctx'> 			   AH_WAIT_TIMEOUT)) {</div><div class='del'>-		ath_dbg(ath9k_hw_common(ah), ATH_DBG_RESET,</div><div class='del'>-			"RTC not waking up\n");</div><div class='add'>+		ath_dbg(ath9k_hw_common(ah), RESET, "RTC not waking up\n");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1350,6 +1351,7 @@ static bool ath9k_hw_set_reset_power_on(struct ath_hw *ah)</div><div class='ctx'> </div><div class='ctx'> static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type)</div><div class='ctx'> {</div><div class='add'>+	bool ret = false;</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9300_20_OR_LATER(ah)) {</div><div class='ctx'> 		REG_WRITE(ah, AR_WA, ah-&gt;WARegVal);</div><div class='hunk'>@@ -1361,13 +1363,20 @@ static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type)</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case ATH9K_RESET_POWER_ON:</div><div class='del'>-		return ath9k_hw_set_reset_power_on(ah);</div><div class='add'>+		ret = ath9k_hw_set_reset_power_on(ah);</div><div class='add'>+		break;</div><div class='ctx'> 	case ATH9K_RESET_WARM:</div><div class='ctx'> 	case ATH9K_RESET_COLD:</div><div class='del'>-		return ath9k_hw_set_reset(ah, type);</div><div class='add'>+		ret = ath9k_hw_set_reset(ah, type);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='del'>-		return false;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_MCI)</div><div class='add'>+		REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool ath9k_hw_chip_reset(struct ath_hw *ah,</div><div class='hunk'>@@ -1406,7 +1415,7 @@ static bool ath9k_hw_channel_change(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> 	for (qnum = 0; qnum &lt; AR_NUM_QCU; qnum++) {</div><div class='ctx'> 		if (ath9k_hw_numtxpending(ah, qnum)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_QUEUE,</div><div class='add'>+			ath_dbg(common, QUEUE,</div><div class='ctx'> 				"Transmit frames pending on queue %d\n", qnum);</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1506,6 +1515,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,</div><div class='ctx'> 		   struct ath9k_hw_cal_data *caldata, bool bChannelChange)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	struct ath9k_hw_mci *mci_hw = &amp;ah-&gt;btcoex_hw.mci;</div><div class='ctx'> 	u32 saveLedState;</div><div class='ctx'> 	struct ath9k_channel *curchan = ah-&gt;curchan;</div><div class='ctx'> 	u32 saveDefAntenna;</div><div class='hunk'>@@ -1513,6 +1523,52 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,</div><div class='ctx'> 	u64 tsf = 0;</div><div class='ctx'> 	int i, r;</div><div class='ctx'> 	bool allow_fbs = false;</div><div class='add'>+	bool mci = !!(ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_MCI);</div><div class='add'>+	bool save_fullsleep = ah-&gt;chip_fullsleep;</div><div class='add'>+</div><div class='add'>+	if (mci) {</div><div class='add'>+</div><div class='add'>+		ar9003_mci_2g5g_changed(ah, IS_CHAN_2GHZ(chan));</div><div class='add'>+</div><div class='add'>+		if (mci_hw-&gt;bt_state == MCI_BT_CAL_START) {</div><div class='add'>+			u32 payload[4] = {0, 0, 0, 0};</div><div class='add'>+</div><div class='add'>+			ath_dbg(common, MCI, "MCI stop rx for BT CAL\n");</div><div class='add'>+</div><div class='add'>+			mci_hw-&gt;bt_state = MCI_BT_CAL;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * MCI FIX: disable mci interrupt here. This is to avoid</div><div class='add'>+			 * SW_MSG_DONE or RX_MSG bits to trigger MCI_INT and</div><div class='add'>+			 * lead to mci_intr reentry.</div><div class='add'>+			 */</div><div class='add'>+</div><div class='add'>+			ar9003_mci_disable_interrupt(ah);</div><div class='add'>+</div><div class='add'>+			ath_dbg(common, MCI, "send WLAN_CAL_GRANT\n");</div><div class='add'>+			MCI_GPM_SET_CAL_TYPE(payload, MCI_GPM_WLAN_CAL_GRANT);</div><div class='add'>+			ar9003_mci_send_message(ah, MCI_GPM, 0, payload,</div><div class='add'>+						16, true, false);</div><div class='add'>+</div><div class='add'>+			ath_dbg(common, MCI, "\nMCI BT is calibrating\n");</div><div class='add'>+</div><div class='add'>+			/* Wait BT calibration to be completed for 25ms */</div><div class='add'>+</div><div class='add'>+			if (ar9003_mci_wait_for_gpm(ah, MCI_GPM_BT_CAL_DONE,</div><div class='add'>+								  0, 25000))</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI got BT_CAL_DONE\n");</div><div class='add'>+			else</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI ### BT cal takes to long, force bt_state to be bt_awake\n");</div><div class='add'>+			mci_hw-&gt;bt_state = MCI_BT_AWAKE;</div><div class='add'>+			/* MCI FIX: enable mci interrupt here */</div><div class='add'>+			ar9003_mci_enable_interrupt(ah);</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='ctx'> </div><div class='ctx'> 	if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -1550,12 +1606,29 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,</div><div class='ctx'> 		if (ath9k_hw_channel_change(ah, chan)) {</div><div class='ctx'> 			ath9k_hw_loadnf(ah, ah-&gt;curchan);</div><div class='ctx'> 			ath9k_hw_start_nfcal(ah, true);</div><div class='add'>+			if (mci &amp;&amp; mci_hw-&gt;ready)</div><div class='add'>+				ar9003_mci_2g5g_switch(ah, true);</div><div class='add'>+</div><div class='ctx'> 			if (AR_SREV_9271(ah))</div><div class='ctx'> 				ar9002_hw_load_ani_reg(ah, chan);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (mci) {</div><div class='add'>+		ar9003_mci_disable_interrupt(ah);</div><div class='add'>+</div><div class='add'>+		if (mci_hw-&gt;ready &amp;&amp; !save_fullsleep) {</div><div class='add'>+			ar9003_mci_mute_bt(ah);</div><div class='add'>+			udelay(20);</div><div class='add'>+			REG_WRITE(ah, AR_BTCOEX_CTRL, 0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mci_hw-&gt;bt_state = MCI_BT_SLEEP;</div><div class='add'>+		mci_hw-&gt;ready = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	saveDefAntenna = REG_READ(ah, AR_DEF_ANTENNA);</div><div class='ctx'> 	if (saveDefAntenna == 0)</div><div class='ctx'> 		saveDefAntenna = 1;</div><div class='hunk'>@@ -1611,6 +1684,9 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='add'>+	if (mci)</div><div class='add'>+		ar9003_mci_reset(ah, false, IS_CHAN_2GHZ(chan), save_fullsleep);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Some AR91xx SoC devices frequently fail to accept TSF writes</div><div class='ctx'> 	 * right after the chip reset. When that happens, write a new</div><div class='hunk'>@@ -1728,6 +1804,54 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,</div><div class='ctx'> 	ath9k_hw_loadnf(ah, chan);</div><div class='ctx'> 	ath9k_hw_start_nfcal(ah, true);</div><div class='ctx'> </div><div class='add'>+	if (mci &amp;&amp; mci_hw-&gt;ready) {</div><div class='add'>+</div><div class='add'>+		if (IS_CHAN_2GHZ(chan) &amp;&amp;</div><div class='add'>+		    (mci_hw-&gt;bt_state == MCI_BT_SLEEP)) {</div><div class='add'>+</div><div class='add'>+			if (ar9003_mci_check_int(ah,</div><div class='add'>+			    AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET) ||</div><div class='add'>+			    ar9003_mci_check_int(ah,</div><div class='add'>+			    AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE)) {</div><div class='add'>+</div><div class='add'>+				/*</div><div class='add'>+				 * BT is sleeping. Check if BT wakes up during</div><div class='add'>+				 * WLAN calibration. If BT wakes up during</div><div class='add'>+				 * WLAN calibration, need to go through all</div><div class='add'>+				 * message exchanges again and recal.</div><div class='add'>+				 */</div><div class='add'>+</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI BT wakes up during WLAN calibration\n");</div><div class='add'>+</div><div class='add'>+				REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,</div><div class='add'>+					  AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET |</div><div class='add'>+					  AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE);</div><div class='add'>+				ath_dbg(common, MCI, "MCI send REMOTE_RESET\n");</div><div class='add'>+				ar9003_mci_remote_reset(ah, true);</div><div class='add'>+				ar9003_mci_send_sys_waking(ah, true);</div><div class='add'>+				udelay(1);</div><div class='add'>+				if (IS_CHAN_2GHZ(chan))</div><div class='add'>+					ar9003_mci_send_lna_transfer(ah, true);</div><div class='add'>+</div><div class='add'>+				mci_hw-&gt;bt_state = MCI_BT_AWAKE;</div><div class='add'>+</div><div class='add'>+				ath_dbg(common, MCI, "MCI re-cal\n");</div><div class='add'>+</div><div class='add'>+				if (caldata) {</div><div class='add'>+					caldata-&gt;done_txiqcal_once = false;</div><div class='add'>+					caldata-&gt;done_txclcal_once = false;</div><div class='add'>+					caldata-&gt;rtt_hist.num_readings = 0;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (!ath9k_hw_init_cal(ah, chan))</div><div class='add'>+					return -EIO;</div><div class='add'>+</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		ar9003_mci_enable_interrupt(ah);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ENABLE_REGWRITE_BUFFER(ah);</div><div class='ctx'> </div><div class='ctx'> 	ath9k_hw_restore_chainmask(ah);</div><div class='hunk'>@@ -1742,14 +1866,14 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,</div><div class='ctx'> 		u32 mask;</div><div class='ctx'> 		mask = REG_READ(ah, AR_CFG);</div><div class='ctx'> 		if (mask &amp; (AR_CFG_SWRB | AR_CFG_SWTB | AR_CFG_SWRG)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_RESET,</div><div class='del'>-				"CFG Byte Swap Set 0x%x\n", mask);</div><div class='add'>+			ath_dbg(common, RESET, "CFG Byte Swap Set 0x%x\n",</div><div class='add'>+				mask);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			mask =</div><div class='ctx'> 				INIT_CONFIG_STATUS | AR_CFG_SWRB | AR_CFG_SWTB;</div><div class='ctx'> 			REG_WRITE(ah, AR_CFG, mask);</div><div class='del'>-			ath_dbg(common, ATH_DBG_RESET,</div><div class='del'>-				"Setting CFG 0x%x\n", REG_READ(ah, AR_CFG));</div><div class='add'>+			ath_dbg(common, RESET, "Setting CFG 0x%x\n",</div><div class='add'>+				REG_READ(ah, AR_CFG));</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (common-&gt;bus_ops-&gt;ath_bus_type == ATH_USB) {</div><div class='hunk'>@@ -1767,9 +1891,25 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ah-&gt;btcoex_hw.enabled)</div><div class='add'>+	if (ah-&gt;btcoex_hw.enabled &amp;&amp;</div><div class='add'>+	    ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_NONE)</div><div class='ctx'> 		ath9k_hw_btcoex_enable(ah);</div><div class='ctx'> </div><div class='add'>+	if (mci &amp;&amp; mci_hw-&gt;ready) {</div><div class='add'>+		/*</div><div class='add'>+		 * check BT state again to make</div><div class='add'>+		 * sure it's not changed.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		ar9003_mci_sync_bt_state(ah);</div><div class='add'>+		ar9003_mci_2g5g_switch(ah, true);</div><div class='add'>+</div><div class='add'>+		if ((mci_hw-&gt;bt_state == MCI_BT_AWAKE) &amp;&amp;</div><div class='add'>+				(mci_hw-&gt;query_bt == true)) {</div><div class='add'>+			mci_hw-&gt;need_flush_btinfo = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (AR_SREV_9300_20_OR_LATER(ah)) {</div><div class='ctx'> 		ar9003_hw_bb_watchdog_config(ah);</div><div class='ctx'> </div><div class='hunk'>@@ -1934,6 +2074,7 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah, int setChip)</div><div class='ctx'> bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	struct ath9k_hw_mci *mci = &amp;ah-&gt;btcoex_hw.mci;</div><div class='ctx'> 	int status = true, setChip = true;</div><div class='ctx'> 	static const char *modes[] = {</div><div class='ctx'> 		"AWAKE",</div><div class='hunk'>@@ -1945,18 +2086,41 @@ bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode)</div><div class='ctx'> 	if (ah-&gt;power_mode == mode)</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_RESET, "%s -&gt; %s\n",</div><div class='add'>+	ath_dbg(common, RESET, "%s -&gt; %s\n",</div><div class='ctx'> 		modes[ah-&gt;power_mode], modes[mode]);</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case ATH9K_PM_AWAKE:</div><div class='ctx'> 		status = ath9k_hw_set_power_awake(ah, setChip);</div><div class='add'>+</div><div class='add'>+		if (ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_MCI)</div><div class='add'>+			REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATH9K_PM_FULL_SLEEP:</div><div class='add'>+</div><div class='add'>+		if (ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_MCI) {</div><div class='add'>+			if (ar9003_mci_state(ah, MCI_STATE_ENABLE, NULL) &amp;&amp;</div><div class='add'>+				(mci-&gt;bt_state != MCI_BT_SLEEP) &amp;&amp;</div><div class='add'>+				!mci-&gt;halted_bt_gpm) {</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI halt BT GPM (full_sleep)\n");</div><div class='add'>+				ar9003_mci_send_coex_halt_bt_gpm(ah,</div><div class='add'>+								 true, true);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			mci-&gt;ready = false;</div><div class='add'>+			REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		ath9k_set_power_sleep(ah, setChip);</div><div class='ctx'> 		ah-&gt;chip_fullsleep = true;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATH9K_PM_NETWORK_SLEEP:</div><div class='add'>+</div><div class='add'>+		if (ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_MCI)</div><div class='add'>+			REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);</div><div class='add'>+</div><div class='ctx'> 		ath9k_set_power_network_sleep(ah, setChip);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -2006,9 +2170,8 @@ void ath9k_hw_beaconinit(struct ath_hw *ah, u32 next_beacon, u32 beacon_period)</div><div class='ctx'> 			AR_TBTT_TIMER_EN | AR_DBA_TIMER_EN | AR_SWBA_TIMER_EN;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ath_dbg(ath9k_hw_common(ah), ATH_DBG_BEACON,</div><div class='del'>-			"%s: unsupported opmode: %d\n",</div><div class='del'>-			__func__, ah-&gt;opmode);</div><div class='add'>+		ath_dbg(ath9k_hw_common(ah), BEACON,</div><div class='add'>+			"%s: unsupported opmode: %d\n", __func__, ah-&gt;opmode);</div><div class='ctx'> 		return;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2059,10 +2222,10 @@ void ath9k_hw_set_sta_beacon_timers(struct ath_hw *ah,</div><div class='ctx'> 	else</div><div class='ctx'> 		nextTbtt = bs-&gt;bs_nexttbtt;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_BEACON, "next DTIM %d\n", bs-&gt;bs_nextdtim);</div><div class='del'>-	ath_dbg(common, ATH_DBG_BEACON, "next beacon %d\n", nextTbtt);</div><div class='del'>-	ath_dbg(common, ATH_DBG_BEACON, "beacon period %d\n", beaconintval);</div><div class='del'>-	ath_dbg(common, ATH_DBG_BEACON, "DTIM period %d\n", dtimperiod);</div><div class='add'>+	ath_dbg(common, BEACON, "next DTIM %d\n", bs-&gt;bs_nextdtim);</div><div class='add'>+	ath_dbg(common, BEACON, "next beacon %d\n", nextTbtt);</div><div class='add'>+	ath_dbg(common, BEACON, "beacon period %d\n", beaconintval);</div><div class='add'>+	ath_dbg(common, BEACON, "DTIM period %d\n", dtimperiod);</div><div class='ctx'> </div><div class='ctx'> 	ENABLE_REGWRITE_BUFFER(ah);</div><div class='ctx'> </div><div class='hunk'>@@ -2109,6 +2272,30 @@ static u8 fixup_chainmask(u8 chip_chainmask, u8 eeprom_chainmask)</div><div class='ctx'> 		return chip_chainmask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ath9k_hw_dfs_tested - checks if DFS has been tested with used chipset</div><div class='add'>+ * @ah: the atheros hardware data structure</div><div class='add'>+ *</div><div class='add'>+ * We enable DFS support upstream on chipsets which have passed a series</div><div class='add'>+ * of tests. The testing requirements are going to be documented. Desired</div><div class='add'>+ * test requirements are documented at:</div><div class='add'>+ *</div><div class='add'>+ * http://wireless.kernel.org/en/users/Drivers/ath9k/dfs</div><div class='add'>+ *</div><div class='add'>+ * Once a new chipset gets properly tested an individual commit can be used</div><div class='add'>+ * to document the testing for DFS for that chipset.</div><div class='add'>+ */</div><div class='add'>+static bool ath9k_hw_dfs_tested(struct ath_hw *ah)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	switch (ah-&gt;hw_version.macVersion) {</div><div class='add'>+	/* AR9580 will likely be our first target to get testing on */</div><div class='add'>+	case AR_SREV_VERSION_9580:</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='ctx'> int ath9k_hw_fill_cap_info(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath9k_hw_capabilities *pCap = &amp;ah-&gt;caps;</div><div class='hunk'>@@ -2130,8 +2317,8 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)</div><div class='ctx'> 			regulatory-&gt;current_rd += 5;</div><div class='ctx'> 		else if (regulatory-&gt;current_rd == 0x41)</div><div class='ctx'> 			regulatory-&gt;current_rd = 0x43;</div><div class='del'>-		ath_dbg(common, ATH_DBG_REGULATORY,</div><div class='del'>-			"regdomain mapped to 0x%x\n", regulatory-&gt;current_rd);</div><div class='add'>+		ath_dbg(common, REGULATORY, "regdomain mapped to 0x%x\n",</div><div class='add'>+			regulatory-&gt;current_rd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	eeval = ah-&gt;eep_ops-&gt;get_eeprom(ah, EEP_OP_MODE);</div><div class='hunk'>@@ -2149,6 +2336,8 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9485(ah) || AR_SREV_9285(ah) || AR_SREV_9330(ah))</div><div class='ctx'> 		chip_chainmask = 1;</div><div class='add'>+	else if (AR_SREV_9462(ah))</div><div class='add'>+		chip_chainmask = 3;</div><div class='ctx'> 	else if (!AR_SREV_9280_20_OR_LATER(ah))</div><div class='ctx'> 		chip_chainmask = 7;</div><div class='ctx'> 	else if (!AR_SREV_9300_20_OR_LATER(ah) || AR_SREV_9340(ah))</div><div class='hunk'>@@ -2205,12 +2394,10 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)</div><div class='ctx'> 	else</div><div class='ctx'> 		pCap-&gt;num_gpio_pins = AR_NUM_GPIO;</div><div class='ctx'> </div><div class='del'>-	if (AR_SREV_9160_10_OR_LATER(ah) || AR_SREV_9100(ah)) {</div><div class='del'>-		pCap-&gt;hw_caps |= ATH9K_HW_CAP_CST;</div><div class='add'>+	if (AR_SREV_9160_10_OR_LATER(ah) || AR_SREV_9100(ah))</div><div class='ctx'> 		pCap-&gt;rts_aggr_limit = ATH_AMPDU_LIMIT_MAX;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		pCap-&gt;rts_aggr_limit = (8 * 1024);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)</div><div class='ctx'> 	ah-&gt;rfsilent = ah-&gt;eep_ops-&gt;get_eeprom(ah, EEP_RF_SILENT);</div><div class='hunk'>@@ -2234,7 +2421,9 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)</div><div class='ctx'> 		pCap-&gt;hw_caps |= ATH9K_HW_CAP_4KB_SPLITTRANS;</div><div class='ctx'> </div><div class='ctx'> 	if (common-&gt;btcoex_enabled) {</div><div class='del'>-		if (AR_SREV_9300_20_OR_LATER(ah)) {</div><div class='add'>+		if (AR_SREV_9462(ah))</div><div class='add'>+			btcoex_hw-&gt;scheme = ATH_BTCOEX_CFG_MCI;</div><div class='add'>+		else if (AR_SREV_9300_20_OR_LATER(ah)) {</div><div class='ctx'> 			btcoex_hw-&gt;scheme = ATH_BTCOEX_CFG_3WIRE;</div><div class='ctx'> 			btcoex_hw-&gt;btactive_gpio = ATH_BTACTIVE_GPIO_9300;</div><div class='ctx'> 			btcoex_hw-&gt;wlanactive_gpio = ATH_WLANACTIVE_GPIO_9300;</div><div class='hunk'>@@ -2318,6 +2507,9 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)</div><div class='ctx'> 		pCap-&gt;pcie_lcr_offset = 0x80;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (ath9k_hw_dfs_tested(ah))</div><div class='add'>+		pCap-&gt;hw_caps |= ATH9K_HW_CAP_DFS;</div><div class='add'>+</div><div class='ctx'> 	tx_chainmask = pCap-&gt;tx_chainmask;</div><div class='ctx'> 	rx_chainmask = pCap-&gt;rx_chainmask;</div><div class='ctx'> 	while (tx_chainmask || rx_chainmask) {</div><div class='hunk'>@@ -2332,11 +2524,11 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9300_20_OR_LATER(ah)) {</div><div class='ctx'> 		ah-&gt;enabled_cals |= TX_IQ_CAL;</div><div class='del'>-		if (!AR_SREV_9330(ah))</div><div class='add'>+		if (AR_SREV_9485_OR_LATER(ah))</div><div class='ctx'> 			ah-&gt;enabled_cals |= TX_IQ_ON_AGC_CAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (AR_SREV_9462(ah))</div><div class='del'>-		pCap-&gt;hw_caps |= ATH9K_HW_CAP_RTT;</div><div class='add'>+		pCap-&gt;hw_caps |= ATH9K_HW_CAP_RTT | ATH9K_HW_CAP_MCI;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2584,7 +2776,7 @@ void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit, bool test)</div><div class='ctx'> 	struct ath9k_channel *chan = ah-&gt;curchan;</div><div class='ctx'> 	struct ieee80211_channel *channel = chan-&gt;chan;</div><div class='ctx'> </div><div class='del'>-	reg-&gt;power_limit = min_t(int, limit, MAX_RATE_POWER);</div><div class='add'>+	reg-&gt;power_limit = min_t(u32, limit, MAX_RATE_POWER);</div><div class='ctx'> 	if (test)</div><div class='ctx'> 		channel-&gt;max_power = MAX_RATE_POWER / 2;</div><div class='ctx'> </div><div class='hunk'>@@ -2651,7 +2843,7 @@ void ath9k_hw_reset_tsf(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	if (!ath9k_hw_wait(ah, AR_SLP32_MODE, AR_SLP32_TSF_WRITE_STATUS, 0,</div><div class='ctx'> 			   AH_TSF_WRITE_TIMEOUT))</div><div class='del'>-		ath_dbg(ath9k_hw_common(ah), ATH_DBG_RESET,</div><div class='add'>+		ath_dbg(ath9k_hw_common(ah), RESET,</div><div class='ctx'> 			"AR_SLP32_TSF_WRITE_STATUS limit exceeded\n");</div><div class='ctx'> </div><div class='ctx'> 	REG_WRITE(ah, AR_RESET_TSF, AR_RESET_TSF_ONCE);</div><div class='hunk'>@@ -2776,7 +2968,7 @@ void ath9k_hw_gen_timer_start(struct ath_hw *ah,</div><div class='ctx'> </div><div class='ctx'> 	timer_next = tsf + trig_timeout;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(ath9k_hw_common(ah), ATH_DBG_HWTIMER,</div><div class='add'>+	ath_dbg(ath9k_hw_common(ah), HWTIMER,</div><div class='ctx'> 		"current tsf %x period %x timer_next %x\n",</div><div class='ctx'> 		tsf, timer_period, timer_next);</div><div class='ctx'> </div><div class='hunk'>@@ -2865,8 +3057,8 @@ void ath_gen_timer_isr(struct ath_hw *ah)</div><div class='ctx'> 		index = rightmost_index(timer_table, &amp;thresh_mask);</div><div class='ctx'> 		timer = timer_table-&gt;timers[index];</div><div class='ctx'> 		BUG_ON(!timer);</div><div class='del'>-		ath_dbg(common, ATH_DBG_HWTIMER,</div><div class='del'>-			"TSF overflow for Gen timer %d\n", index);</div><div class='add'>+		ath_dbg(common, HWTIMER, "TSF overflow for Gen timer %d\n",</div><div class='add'>+			index);</div><div class='ctx'> 		timer-&gt;overflow(timer-&gt;arg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2874,7 +3066,7 @@ void ath_gen_timer_isr(struct ath_hw *ah)</div><div class='ctx'> 		index = rightmost_index(timer_table, &amp;trigger_mask);</div><div class='ctx'> 		timer = timer_table-&gt;timers[index];</div><div class='ctx'> 		BUG_ON(!timer);</div><div class='del'>-		ath_dbg(common, ATH_DBG_HWTIMER,</div><div class='add'>+		ath_dbg(common, HWTIMER,</div><div class='ctx'> 			"Gen timer[%d] trigger\n", index);</div><div class='ctx'> 		timer-&gt;trigger(timer-&gt;arg);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h<br/>index f389b3c93cf3..6a29004a71b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/hw.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/hw.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/hw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/hw.h</a></div><div class='hunk'>@@ -59,9 +59,6 @@</div><div class='ctx'> #define AT9285_COEX3WIRE_SA_SUBSYSID	0x30aa</div><div class='ctx'> #define AT9285_COEX3WIRE_DA_SUBSYSID	0x30ab</div><div class='ctx'> </div><div class='del'>-#define AR9300_NUM_BT_WEIGHTS   4</div><div class='del'>-#define AR9300_NUM_WLAN_WEIGHTS 4</div><div class='del'>-</div><div class='ctx'> #define ATH_AMPDU_LIMIT_MAX        (64 * 1024 - 1)</div><div class='ctx'> </div><div class='ctx'> #define	ATH_DEFAULT_NOISE_FLOOR -95</div><div class='hunk'>@@ -129,6 +126,16 @@</div><div class='ctx'> #define AR_GPIO_OUTPUT_MUX_AS_RX_CLEAR_EXTERNAL  4</div><div class='ctx'> #define AR_GPIO_OUTPUT_MUX_AS_MAC_NETWORK_LED    5</div><div class='ctx'> #define AR_GPIO_OUTPUT_MUX_AS_MAC_POWER_LED      6</div><div class='add'>+#define AR_GPIO_OUTPUT_MUX_AS_MCI_WLAN_DATA      0x16</div><div class='add'>+#define AR_GPIO_OUTPUT_MUX_AS_MCI_WLAN_CLK       0x17</div><div class='add'>+#define AR_GPIO_OUTPUT_MUX_AS_MCI_BT_DATA        0x18</div><div class='add'>+#define AR_GPIO_OUTPUT_MUX_AS_MCI_BT_CLK         0x19</div><div class='add'>+#define AR_GPIO_OUTPUT_MUX_AS_WL_IN_TX           0x14</div><div class='add'>+#define AR_GPIO_OUTPUT_MUX_AS_WL_IN_RX           0x13</div><div class='add'>+#define AR_GPIO_OUTPUT_MUX_AS_BT_IN_TX           9</div><div class='add'>+#define AR_GPIO_OUTPUT_MUX_AS_BT_IN_RX           8</div><div class='add'>+#define AR_GPIO_OUTPUT_MUX_AS_RUCKUS_STROBE      0x1d</div><div class='add'>+#define AR_GPIO_OUTPUT_MUX_AS_RUCKUS_DATA        0x1e</div><div class='ctx'> </div><div class='ctx'> #define AR_GPIOD_MASK               0x00001FFF</div><div class='ctx'> #define AR_GPIO_BIT(_gpio)          (1 &lt;&lt; (_gpio))</div><div class='hunk'>@@ -189,20 +196,25 @@ enum ath_ini_subsys {</div><div class='ctx'> enum ath9k_hw_caps {</div><div class='ctx'> 	ATH9K_HW_CAP_HT                         = BIT(0),</div><div class='ctx'> 	ATH9K_HW_CAP_RFSILENT                   = BIT(1),</div><div class='del'>-	ATH9K_HW_CAP_CST                        = BIT(2),</div><div class='del'>-	ATH9K_HW_CAP_AUTOSLEEP                  = BIT(4),</div><div class='del'>-	ATH9K_HW_CAP_4KB_SPLITTRANS             = BIT(5),</div><div class='del'>-	ATH9K_HW_CAP_EDMA			= BIT(6),</div><div class='del'>-	ATH9K_HW_CAP_RAC_SUPPORTED		= BIT(7),</div><div class='del'>-	ATH9K_HW_CAP_LDPC			= BIT(8),</div><div class='del'>-	ATH9K_HW_CAP_FASTCLOCK			= BIT(9),</div><div class='del'>-	ATH9K_HW_CAP_SGI_20			= BIT(10),</div><div class='del'>-	ATH9K_HW_CAP_PAPRD			= BIT(11),</div><div class='del'>-	ATH9K_HW_CAP_ANT_DIV_COMB		= BIT(12),</div><div class='del'>-	ATH9K_HW_CAP_2GHZ			= BIT(13),</div><div class='del'>-	ATH9K_HW_CAP_5GHZ			= BIT(14),</div><div class='del'>-	ATH9K_HW_CAP_APM			= BIT(15),</div><div class='del'>-	ATH9K_HW_CAP_RTT			= BIT(16),</div><div class='add'>+	ATH9K_HW_CAP_AUTOSLEEP                  = BIT(2),</div><div class='add'>+	ATH9K_HW_CAP_4KB_SPLITTRANS             = BIT(3),</div><div class='add'>+	ATH9K_HW_CAP_EDMA			= BIT(4),</div><div class='add'>+	ATH9K_HW_CAP_RAC_SUPPORTED		= BIT(5),</div><div class='add'>+	ATH9K_HW_CAP_LDPC			= BIT(6),</div><div class='add'>+	ATH9K_HW_CAP_FASTCLOCK			= BIT(7),</div><div class='add'>+	ATH9K_HW_CAP_SGI_20			= BIT(8),</div><div class='add'>+	ATH9K_HW_CAP_PAPRD			= BIT(9),</div><div class='add'>+	ATH9K_HW_CAP_ANT_DIV_COMB		= BIT(10),</div><div class='add'>+	ATH9K_HW_CAP_2GHZ			= BIT(11),</div><div class='add'>+	ATH9K_HW_CAP_5GHZ			= BIT(12),</div><div class='add'>+	ATH9K_HW_CAP_APM			= BIT(13),</div><div class='add'>+	ATH9K_HW_CAP_RTT			= BIT(14),</div><div class='add'>+#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT</div><div class='add'>+	ATH9K_HW_CAP_MCI			= BIT(15),</div><div class='add'>+#else</div><div class='add'>+	ATH9K_HW_CAP_MCI			= 0,</div><div class='add'>+#endif</div><div class='add'>+	ATH9K_HW_CAP_DFS			= BIT(16),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ath9k_hw_capabilities {</div><div class='hunk'>@@ -268,6 +280,7 @@ enum ath9k_int {</div><div class='ctx'> 	ATH9K_INT_TX = 0x00000040,</div><div class='ctx'> 	ATH9K_INT_TXDESC = 0x00000080,</div><div class='ctx'> 	ATH9K_INT_TIM_TIMER = 0x00000100,</div><div class='add'>+	ATH9K_INT_MCI = 0x00000200,</div><div class='ctx'> 	ATH9K_INT_BB_WATCHDOG = 0x00000400,</div><div class='ctx'> 	ATH9K_INT_TXURN = 0x00000800,</div><div class='ctx'> 	ATH9K_INT_MIB = 0x00001000,</div><div class='hunk'>@@ -419,6 +432,161 @@ enum ath9k_rx_qtype {</div><div class='ctx'> 	ATH9K_RX_QUEUE_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum mci_message_header {		/* length of payload */</div><div class='add'>+	MCI_LNA_CTRL     = 0x10,        /* len = 0 */</div><div class='add'>+	MCI_CONT_NACK    = 0x20,        /* len = 0 */</div><div class='add'>+	MCI_CONT_INFO    = 0x30,        /* len = 4 */</div><div class='add'>+	MCI_CONT_RST     = 0x40,        /* len = 0 */</div><div class='add'>+	MCI_SCHD_INFO    = 0x50,        /* len = 16 */</div><div class='add'>+	MCI_CPU_INT      = 0x60,        /* len = 4 */</div><div class='add'>+	MCI_SYS_WAKING   = 0x70,        /* len = 0 */</div><div class='add'>+	MCI_GPM          = 0x80,        /* len = 16 */</div><div class='add'>+	MCI_LNA_INFO     = 0x90,        /* len = 1 */</div><div class='add'>+	MCI_LNA_STATE    = 0x94,</div><div class='add'>+	MCI_LNA_TAKE     = 0x98,</div><div class='add'>+	MCI_LNA_TRANS    = 0x9c,</div><div class='add'>+	MCI_SYS_SLEEPING = 0xa0,        /* len = 0 */</div><div class='add'>+	MCI_REQ_WAKE     = 0xc0,        /* len = 0 */</div><div class='add'>+	MCI_DEBUG_16     = 0xfe,        /* len = 2 */</div><div class='add'>+	MCI_REMOTE_RESET = 0xff         /* len = 16 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ath_mci_gpm_coex_profile_type {</div><div class='add'>+	MCI_GPM_COEX_PROFILE_UNKNOWN,</div><div class='add'>+	MCI_GPM_COEX_PROFILE_RFCOMM,</div><div class='add'>+	MCI_GPM_COEX_PROFILE_A2DP,</div><div class='add'>+	MCI_GPM_COEX_PROFILE_HID,</div><div class='add'>+	MCI_GPM_COEX_PROFILE_BNEP,</div><div class='add'>+	MCI_GPM_COEX_PROFILE_VOICE,</div><div class='add'>+	MCI_GPM_COEX_PROFILE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* MCI GPM/Coex opcode/type definitions */</div><div class='add'>+enum {</div><div class='add'>+	MCI_GPM_COEX_W_GPM_PAYLOAD      = 1,</div><div class='add'>+	MCI_GPM_COEX_B_GPM_TYPE         = 4,</div><div class='add'>+	MCI_GPM_COEX_B_GPM_OPCODE       = 5,</div><div class='add'>+	/* MCI_GPM_WLAN_CAL_REQ, MCI_GPM_WLAN_CAL_DONE */</div><div class='add'>+	MCI_GPM_WLAN_CAL_W_SEQUENCE     = 2,</div><div class='add'>+</div><div class='add'>+	/* MCI_GPM_COEX_VERSION_QUERY */</div><div class='add'>+	/* MCI_GPM_COEX_VERSION_RESPONSE */</div><div class='add'>+	MCI_GPM_COEX_B_MAJOR_VERSION    = 6,</div><div class='add'>+	MCI_GPM_COEX_B_MINOR_VERSION    = 7,</div><div class='add'>+	/* MCI_GPM_COEX_STATUS_QUERY */</div><div class='add'>+	MCI_GPM_COEX_B_BT_BITMAP        = 6,</div><div class='add'>+	MCI_GPM_COEX_B_WLAN_BITMAP      = 7,</div><div class='add'>+	/* MCI_GPM_COEX_HALT_BT_GPM */</div><div class='add'>+	MCI_GPM_COEX_B_HALT_STATE       = 6,</div><div class='add'>+	/* MCI_GPM_COEX_WLAN_CHANNELS */</div><div class='add'>+	MCI_GPM_COEX_B_CHANNEL_MAP      = 6,</div><div class='add'>+	/* MCI_GPM_COEX_BT_PROFILE_INFO */</div><div class='add'>+	MCI_GPM_COEX_B_PROFILE_TYPE     = 6,</div><div class='add'>+	MCI_GPM_COEX_B_PROFILE_LINKID   = 7,</div><div class='add'>+	MCI_GPM_COEX_B_PROFILE_STATE    = 8,</div><div class='add'>+	MCI_GPM_COEX_B_PROFILE_ROLE     = 9,</div><div class='add'>+	MCI_GPM_COEX_B_PROFILE_RATE     = 10,</div><div class='add'>+	MCI_GPM_COEX_B_PROFILE_VOTYPE   = 11,</div><div class='add'>+	MCI_GPM_COEX_H_PROFILE_T        = 12,</div><div class='add'>+	MCI_GPM_COEX_B_PROFILE_W        = 14,</div><div class='add'>+	MCI_GPM_COEX_B_PROFILE_A        = 15,</div><div class='add'>+	/* MCI_GPM_COEX_BT_STATUS_UPDATE */</div><div class='add'>+	MCI_GPM_COEX_B_STATUS_TYPE      = 6,</div><div class='add'>+	MCI_GPM_COEX_B_STATUS_LINKID    = 7,</div><div class='add'>+	MCI_GPM_COEX_B_STATUS_STATE     = 8,</div><div class='add'>+	/* MCI_GPM_COEX_BT_UPDATE_FLAGS */</div><div class='add'>+	MCI_GPM_COEX_W_BT_FLAGS         = 6,</div><div class='add'>+	MCI_GPM_COEX_B_BT_FLAGS_OP      = 10</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mci_gpm_subtype {</div><div class='add'>+	MCI_GPM_BT_CAL_REQ      = 0,</div><div class='add'>+	MCI_GPM_BT_CAL_GRANT    = 1,</div><div class='add'>+	MCI_GPM_BT_CAL_DONE     = 2,</div><div class='add'>+	MCI_GPM_WLAN_CAL_REQ    = 3,</div><div class='add'>+	MCI_GPM_WLAN_CAL_GRANT  = 4,</div><div class='add'>+	MCI_GPM_WLAN_CAL_DONE   = 5,</div><div class='add'>+	MCI_GPM_COEX_AGENT      = 0x0c,</div><div class='add'>+	MCI_GPM_RSVD_PATTERN    = 0xfe,</div><div class='add'>+	MCI_GPM_RSVD_PATTERN32  = 0xfefefefe,</div><div class='add'>+	MCI_GPM_BT_DEBUG        = 0xff</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mci_bt_state {</div><div class='add'>+	MCI_BT_SLEEP,</div><div class='add'>+	MCI_BT_AWAKE,</div><div class='add'>+	MCI_BT_CAL_START,</div><div class='add'>+	MCI_BT_CAL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Type of state query */</div><div class='add'>+enum mci_state_type {</div><div class='add'>+	MCI_STATE_ENABLE,</div><div class='add'>+	MCI_STATE_INIT_GPM_OFFSET,</div><div class='add'>+	MCI_STATE_NEXT_GPM_OFFSET,</div><div class='add'>+	MCI_STATE_LAST_GPM_OFFSET,</div><div class='add'>+	MCI_STATE_BT,</div><div class='add'>+	MCI_STATE_SET_BT_SLEEP,</div><div class='add'>+	MCI_STATE_SET_BT_AWAKE,</div><div class='add'>+	MCI_STATE_SET_BT_CAL_START,</div><div class='add'>+	MCI_STATE_SET_BT_CAL,</div><div class='add'>+	MCI_STATE_LAST_SCHD_MSG_OFFSET,</div><div class='add'>+	MCI_STATE_REMOTE_SLEEP,</div><div class='add'>+	MCI_STATE_CONT_RSSI_POWER,</div><div class='add'>+	MCI_STATE_CONT_PRIORITY,</div><div class='add'>+	MCI_STATE_CONT_TXRX,</div><div class='add'>+	MCI_STATE_RESET_REQ_WAKE,</div><div class='add'>+	MCI_STATE_SEND_WLAN_COEX_VERSION,</div><div class='add'>+	MCI_STATE_SET_BT_COEX_VERSION,</div><div class='add'>+	MCI_STATE_SEND_WLAN_CHANNELS,</div><div class='add'>+	MCI_STATE_SEND_VERSION_QUERY,</div><div class='add'>+	MCI_STATE_SEND_STATUS_QUERY,</div><div class='add'>+	MCI_STATE_NEED_FLUSH_BT_INFO,</div><div class='add'>+	MCI_STATE_SET_CONCUR_TX_PRI,</div><div class='add'>+	MCI_STATE_RECOVER_RX,</div><div class='add'>+	MCI_STATE_NEED_FTP_STOMP,</div><div class='add'>+	MCI_STATE_NEED_TUNING,</div><div class='add'>+	MCI_STATE_DEBUG,</div><div class='add'>+	MCI_STATE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mci_gpm_coex_opcode {</div><div class='add'>+	MCI_GPM_COEX_VERSION_QUERY,</div><div class='add'>+	MCI_GPM_COEX_VERSION_RESPONSE,</div><div class='add'>+	MCI_GPM_COEX_STATUS_QUERY,</div><div class='add'>+	MCI_GPM_COEX_HALT_BT_GPM,</div><div class='add'>+	MCI_GPM_COEX_WLAN_CHANNELS,</div><div class='add'>+	MCI_GPM_COEX_BT_PROFILE_INFO,</div><div class='add'>+	MCI_GPM_COEX_BT_STATUS_UPDATE,</div><div class='add'>+	MCI_GPM_COEX_BT_UPDATE_FLAGS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MCI_GPM_NOMORE  0</div><div class='add'>+#define MCI_GPM_MORE    1</div><div class='add'>+#define MCI_GPM_INVALID 0xffffffff</div><div class='add'>+</div><div class='add'>+#define MCI_GPM_RECYCLE(_p_gpm)	do {			  \</div><div class='add'>+	*(((u32 *)_p_gpm) + MCI_GPM_COEX_W_GPM_PAYLOAD) = \</div><div class='add'>+				MCI_GPM_RSVD_PATTERN32;   \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define MCI_GPM_TYPE(_p_gpm)	\</div><div class='add'>+	(*(((u8 *)(_p_gpm)) + MCI_GPM_COEX_B_GPM_TYPE) &amp; 0xff)</div><div class='add'>+</div><div class='add'>+#define MCI_GPM_OPCODE(_p_gpm)	\</div><div class='add'>+	(*(((u8 *)(_p_gpm)) + MCI_GPM_COEX_B_GPM_OPCODE) &amp; 0xff)</div><div class='add'>+</div><div class='add'>+#define MCI_GPM_SET_CAL_TYPE(_p_gpm, _cal_type)	do {			   \</div><div class='add'>+	*(((u8 *)(_p_gpm)) + MCI_GPM_COEX_B_GPM_TYPE) = (_cal_type) &amp; 0xff;\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define MCI_GPM_SET_TYPE_OPCODE(_p_gpm, _type, _opcode) do {		   \</div><div class='add'>+	*(((u8 *)(_p_gpm)) + MCI_GPM_COEX_B_GPM_TYPE) = (_type) &amp; 0xff;	   \</div><div class='add'>+	*(((u8 *)(_p_gpm)) + MCI_GPM_COEX_B_GPM_OPCODE) = (_opcode) &amp; 0xff;\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define MCI_GPM_IS_CAL_TYPE(_type) ((_type) &lt;= MCI_GPM_WLAN_CAL_DONE)</div><div class='add'>+</div><div class='ctx'> struct ath9k_beacon_state {</div><div class='ctx'> 	u32 bs_nexttbtt;</div><div class='ctx'> 	u32 bs_nextdtim;</div><div class='hunk'>@@ -791,8 +959,6 @@ struct ath_hw {</div><div class='ctx'> </div><div class='ctx'> 	/* Bluetooth coexistance */</div><div class='ctx'> 	struct ath_btcoex_hw btcoex_hw;</div><div class='del'>-	u32 bt_coex_bt_weight[AR9300_NUM_BT_WEIGHTS];</div><div class='del'>-	u32 bt_coex_wlan_weight[AR9300_NUM_WLAN_WEIGHTS];</div><div class='ctx'> </div><div class='ctx'> 	u32 intr_txqs;</div><div class='ctx'> 	u8 txchainmask;</div><div class='hunk'>@@ -850,7 +1016,7 @@ struct ath_hw {</div><div class='ctx'> 	u32 ts_paddr_start;</div><div class='ctx'> 	u32 ts_paddr_end;</div><div class='ctx'> 	u16 ts_tail;</div><div class='del'>-	u8 ts_size;</div><div class='add'>+	u16 ts_size;</div><div class='ctx'> </div><div class='ctx'> 	u32 bb_watchdog_last_status;</div><div class='ctx'> 	u32 bb_watchdog_timeout_ms; /* in ms, 0 to disable */</div><div class='hunk'>@@ -948,7 +1114,6 @@ bool ath9k_hw_disable(struct ath_hw *ah);</div><div class='ctx'> void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit, bool test);</div><div class='ctx'> void ath9k_hw_setopmode(struct ath_hw *ah);</div><div class='ctx'> void ath9k_hw_setmcastfilter(struct ath_hw *ah, u32 filter0, u32 filter1);</div><div class='del'>-void ath9k_hw_setbssidmask(struct ath_hw *ah);</div><div class='ctx'> void ath9k_hw_write_associd(struct ath_hw *ah);</div><div class='ctx'> u32 ath9k_hw_gettsf32(struct ath_hw *ah);</div><div class='ctx'> u64 ath9k_hw_gettsf64(struct ath_hw *ah);</div><div class='hunk'>@@ -1041,6 +1206,42 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning);</div><div class='ctx'> void ath9k_hw_proc_mib_event(struct ath_hw *ah);</div><div class='ctx'> void ath9k_hw_ani_monitor(struct ath_hw *ah, struct ath9k_channel *chan);</div><div class='ctx'> </div><div class='add'>+bool ar9003_mci_send_message(struct ath_hw *ah, u8 header, u32 flag,</div><div class='add'>+			     u32 *payload, u8 len, bool wait_done,</div><div class='add'>+			     bool check_bt);</div><div class='add'>+void ar9003_mci_mute_bt(struct ath_hw *ah);</div><div class='add'>+u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type, u32 *p_data);</div><div class='add'>+void ar9003_mci_setup(struct ath_hw *ah, u32 gpm_addr, void *gpm_buf,</div><div class='add'>+		      u16 len, u32 sched_addr);</div><div class='add'>+void ar9003_mci_cleanup(struct ath_hw *ah);</div><div class='add'>+void ar9003_mci_send_coex_halt_bt_gpm(struct ath_hw *ah, bool halt,</div><div class='add'>+				      bool wait_done);</div><div class='add'>+u32 ar9003_mci_wait_for_gpm(struct ath_hw *ah, u8 gpm_type,</div><div class='add'>+			    u8 gpm_opcode, int time_out);</div><div class='add'>+void ar9003_mci_2g5g_changed(struct ath_hw *ah, bool is_2g);</div><div class='add'>+void ar9003_mci_disable_interrupt(struct ath_hw *ah);</div><div class='add'>+void ar9003_mci_enable_interrupt(struct ath_hw *ah);</div><div class='add'>+void ar9003_mci_2g5g_switch(struct ath_hw *ah, bool wait_done);</div><div class='add'>+void ar9003_mci_reset(struct ath_hw *ah, bool en_int, bool is_2g,</div><div class='add'>+		      bool is_full_sleep);</div><div class='add'>+bool ar9003_mci_check_int(struct ath_hw *ah, u32 ints);</div><div class='add'>+void ar9003_mci_remote_reset(struct ath_hw *ah, bool wait_done);</div><div class='add'>+void ar9003_mci_send_sys_waking(struct ath_hw *ah, bool wait_done);</div><div class='add'>+void ar9003_mci_send_lna_transfer(struct ath_hw *ah, bool wait_done);</div><div class='add'>+void ar9003_mci_sync_bt_state(struct ath_hw *ah);</div><div class='add'>+void ar9003_mci_get_interrupt(struct ath_hw *ah, u32 *raw_intr,</div><div class='add'>+			      u32 *rx_msg_intr);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT</div><div class='add'>+static inline enum ath_btcoex_scheme</div><div class='add'>+ath9k_hw_get_btcoex_scheme(struct ath_hw *ah)</div><div class='add'>+{</div><div class='add'>+	return ah-&gt;btcoex_hw.scheme;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define ath9k_hw_get_btcoex_scheme(...) ATH_BTCOEX_CFG_NONE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define ATH9K_CLOCK_RATE_CCK		22</div><div class='ctx'> #define ATH9K_CLOCK_RATE_5GHZ_OFDM	40</div><div class='ctx'> #define ATH9K_CLOCK_RATE_2GHZ_OFDM	44</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c<br/>index d4c909f8e474..abf943557dee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/init.c</a></div><div class='hunk'>@@ -258,6 +258,8 @@ static void setup_ht_cap(struct ath_softc *sc,</div><div class='ctx'> </div><div class='ctx'> 	if (AR_SREV_9330(ah) || AR_SREV_9485(ah))</div><div class='ctx'> 		max_streams = 1;</div><div class='add'>+	else if (AR_SREV_9462(ah))</div><div class='add'>+		max_streams = 2;</div><div class='ctx'> 	else if (AR_SREV_9300_20_OR_LATER(ah))</div><div class='ctx'> 		max_streams = 3;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -274,8 +276,7 @@ static void setup_ht_cap(struct ath_softc *sc,</div><div class='ctx'> 	tx_streams = ath9k_cmn_count_streams(ah-&gt;txchainmask, max_streams);</div><div class='ctx'> 	rx_streams = ath9k_cmn_count_streams(ah-&gt;rxchainmask, max_streams);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-		"TX streams %d, RX streams: %d\n",</div><div class='add'>+	ath_dbg(common, CONFIG, "TX streams %d, RX streams: %d\n",</div><div class='ctx'> 		tx_streams, rx_streams);</div><div class='ctx'> </div><div class='ctx'> 	if (tx_streams != rx_streams) {</div><div class='hunk'>@@ -295,9 +296,22 @@ static int ath9k_reg_notifier(struct wiphy *wiphy,</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='del'>-	struct ath_regulatory *reg = ath9k_hw_regulatory(sc-&gt;sc_ah);</div><div class='add'>+	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='add'>+	struct ath_regulatory *reg = ath9k_hw_regulatory(ah);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ath_reg_notifier_apply(wiphy, request, reg);</div><div class='add'>+</div><div class='add'>+	/* Set tx power */</div><div class='add'>+	if (ah-&gt;curchan) {</div><div class='add'>+		sc-&gt;config.txpowlimit = 2 * ah-&gt;curchan-&gt;chan-&gt;max_power;</div><div class='add'>+		ath9k_ps_wakeup(sc);</div><div class='add'>+		ath9k_hw_set_txpowerlimit(ah, sc-&gt;config.txpowlimit, false);</div><div class='add'>+		sc-&gt;curtxpow = ath9k_hw_regulatory(ah)-&gt;power_limit;</div><div class='add'>+		ath9k_ps_restore(sc);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return ath_reg_notifier_apply(wiphy, request, reg);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -314,7 +328,7 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,</div><div class='ctx'> 	struct ath_buf *bf;</div><div class='ctx'> 	int i, bsize, error, desc_len;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG, "%s DMA: %u buffers %u desc/buf\n",</div><div class='add'>+	ath_dbg(common, CONFIG, "%s DMA: %u buffers %u desc/buf\n",</div><div class='ctx'> 		name, nbuf, ndesc);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(head);</div><div class='hunk'>@@ -360,7 +374,7 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> 	ds = (u8 *) dd-&gt;dd_desc;</div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG, "%s DMA map: %p (%u) -&gt; %llx (%u)\n",</div><div class='add'>+	ath_dbg(common, CONFIG, "%s DMA map: %p (%u) -&gt; %llx (%u)\n",</div><div class='ctx'> 		name, ds, (u32) dd-&gt;dd_desc_len,</div><div class='ctx'> 		ito64(dd-&gt;dd_desc_paddr), /*XXX*/(u32) dd-&gt;dd_desc_len);</div><div class='ctx'> </div><div class='hunk'>@@ -408,9 +422,10 @@ fail:</div><div class='ctx'> static int ath9k_init_btcoex(struct ath_softc *sc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_txq *txq;</div><div class='add'>+	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	switch (sc-&gt;sc_ah-&gt;btcoex_hw.scheme) {</div><div class='add'>+	switch (ath9k_hw_get_btcoex_scheme(sc-&gt;sc_ah)) {</div><div class='ctx'> 	case ATH_BTCOEX_CFG_NONE:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATH_BTCOEX_CFG_2WIRE:</div><div class='hunk'>@@ -425,6 +440,37 @@ static int ath9k_init_btcoex(struct ath_softc *sc)</div><div class='ctx'> 		ath9k_hw_init_btcoex_hw(sc-&gt;sc_ah, txq-&gt;axq_qnum);</div><div class='ctx'> 		sc-&gt;btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;</div><div class='ctx'> 		break;</div><div class='add'>+	case ATH_BTCOEX_CFG_MCI:</div><div class='add'>+		sc-&gt;btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;</div><div class='add'>+		sc-&gt;btcoex.duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE;</div><div class='add'>+		INIT_LIST_HEAD(&amp;sc-&gt;btcoex.mci.info);</div><div class='add'>+</div><div class='add'>+		r = ath_mci_setup(sc);</div><div class='add'>+		if (r)</div><div class='add'>+			return r;</div><div class='add'>+</div><div class='add'>+		if (sc-&gt;sc_ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_MCI) {</div><div class='add'>+			ah-&gt;btcoex_hw.mci.ready = false;</div><div class='add'>+			ah-&gt;btcoex_hw.mci.bt_state = 0;</div><div class='add'>+			ah-&gt;btcoex_hw.mci.bt_ver_major = 3;</div><div class='add'>+			ah-&gt;btcoex_hw.mci.bt_ver_minor = 0;</div><div class='add'>+			ah-&gt;btcoex_hw.mci.bt_version_known = false;</div><div class='add'>+			ah-&gt;btcoex_hw.mci.update_2g5g = true;</div><div class='add'>+			ah-&gt;btcoex_hw.mci.is_2g = true;</div><div class='add'>+			ah-&gt;btcoex_hw.mci.wlan_channels_update = false;</div><div class='add'>+			ah-&gt;btcoex_hw.mci.wlan_channels[0] = 0x00000000;</div><div class='add'>+			ah-&gt;btcoex_hw.mci.wlan_channels[1] = 0xffffffff;</div><div class='add'>+			ah-&gt;btcoex_hw.mci.wlan_channels[2] = 0xffffffff;</div><div class='add'>+			ah-&gt;btcoex_hw.mci.wlan_channels[3] = 0x7fffffff;</div><div class='add'>+			ah-&gt;btcoex_hw.mci.query_bt = true;</div><div class='add'>+			ah-&gt;btcoex_hw.mci.unhalt_bt_gpm = true;</div><div class='add'>+			ah-&gt;btcoex_hw.mci.halted_bt_gpm = false;</div><div class='add'>+			ah-&gt;btcoex_hw.mci.need_flush_btinfo = false;</div><div class='add'>+			ah-&gt;btcoex_hw.mci.wlan_cal_seq = 0;</div><div class='add'>+			ah-&gt;btcoex_hw.mci.wlan_cal_done = 0;</div><div class='add'>+			ah-&gt;btcoex_hw.mci.config = 0x2201;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -695,6 +741,7 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)</div><div class='ctx'> 		hw-&gt;wiphy-&gt;flags &amp;= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_IBSS_RSN;</div><div class='add'>+	hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_SUPPORTS_TDLS;</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;queues = 4;</div><div class='ctx'> 	hw-&gt;max_rates = 4;</div><div class='hunk'>@@ -833,9 +880,12 @@ static void ath9k_deinit_softc(struct ath_softc *sc)</div><div class='ctx'> 		kfree(sc-&gt;sbands[IEEE80211_BAND_5GHZ].channels);</div><div class='ctx'> </div><div class='ctx'>         if ((sc-&gt;btcoex.no_stomp_timer) &amp;&amp;</div><div class='del'>-	    sc-&gt;sc_ah-&gt;btcoex_hw.scheme == ATH_BTCOEX_CFG_3WIRE)</div><div class='add'>+	    ath9k_hw_get_btcoex_scheme(sc-&gt;sc_ah) == ATH_BTCOEX_CFG_3WIRE)</div><div class='ctx'> 		ath_gen_timer_free(sc-&gt;sc_ah, sc-&gt;btcoex.no_stomp_timer);</div><div class='ctx'> </div><div class='add'>+	if (ath9k_hw_get_btcoex_scheme(sc-&gt;sc_ah) == ATH_BTCOEX_CFG_MCI)</div><div class='add'>+		ath_mci_cleanup(sc);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ATH9K_NUM_TX_QUEUES; i++)</div><div class='ctx'> 		if (ATH_TXQ_SETUP(sc, i))</div><div class='ctx'> 			ath_tx_cleanupq(sc, &amp;sc-&gt;tx.txq[i]);</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c<br/>index ecdb6fd29079..e196aba77acf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/mac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/mac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/mac.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> static void ath9k_hw_set_txq_interrupts(struct ath_hw *ah,</div><div class='ctx'> 					struct ath9k_tx_queue_info *qi)</div><div class='ctx'> {</div><div class='del'>-	ath_dbg(ath9k_hw_common(ah), ATH_DBG_INTERRUPT,</div><div class='add'>+	ath_dbg(ath9k_hw_common(ah), INTERRUPT,</div><div class='ctx'> 		"tx ok 0x%x err 0x%x desc 0x%x eol 0x%x urn 0x%x\n",</div><div class='ctx'> 		ah-&gt;txok_interrupt_mask, ah-&gt;txerr_interrupt_mask,</div><div class='ctx'> 		ah-&gt;txdesc_interrupt_mask, ah-&gt;txeol_interrupt_mask,</div><div class='hunk'>@@ -57,8 +57,7 @@ EXPORT_SYMBOL(ath9k_hw_puttxbuf);</div><div class='ctx'> </div><div class='ctx'> void ath9k_hw_txstart(struct ath_hw *ah, u32 q)</div><div class='ctx'> {</div><div class='del'>-	ath_dbg(ath9k_hw_common(ah), ATH_DBG_QUEUE,</div><div class='del'>-		"Enable TXE on queue: %u\n", q);</div><div class='add'>+	ath_dbg(ath9k_hw_common(ah), QUEUE, "Enable TXE on queue: %u\n", q);</div><div class='ctx'> 	REG_WRITE(ah, AR_Q_TXE, 1 &lt;&lt; q);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath9k_hw_txstart);</div><div class='hunk'>@@ -202,12 +201,12 @@ bool ath9k_hw_set_txq_props(struct ath_hw *ah, int q,</div><div class='ctx'> </div><div class='ctx'> 	qi = &amp;ah-&gt;txq[q];</div><div class='ctx'> 	if (qi-&gt;tqi_type == ATH9K_TX_QUEUE_INACTIVE) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_QUEUE,</div><div class='add'>+		ath_dbg(common, QUEUE,</div><div class='ctx'> 			"Set TXQ properties, inactive queue: %u\n", q);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_QUEUE, "Set queue properties for: %u\n", q);</div><div class='add'>+	ath_dbg(common, QUEUE, "Set queue properties for: %u\n", q);</div><div class='ctx'> </div><div class='ctx'> 	qi-&gt;tqi_ver = qinfo-&gt;tqi_ver;</div><div class='ctx'> 	qi-&gt;tqi_subtype = qinfo-&gt;tqi_subtype;</div><div class='hunk'>@@ -266,7 +265,7 @@ bool ath9k_hw_get_txq_props(struct ath_hw *ah, int q,</div><div class='ctx'> </div><div class='ctx'> 	qi = &amp;ah-&gt;txq[q];</div><div class='ctx'> 	if (qi-&gt;tqi_type == ATH9K_TX_QUEUE_INACTIVE) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_QUEUE,</div><div class='add'>+		ath_dbg(common, QUEUE,</div><div class='ctx'> 			"Get TXQ properties, inactive queue: %u\n", q);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -325,7 +324,7 @@ int ath9k_hw_setuptxqueue(struct ath_hw *ah, enum ath9k_tx_queue type,</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_QUEUE, "Setup TX queue: %u\n", q);</div><div class='add'>+	ath_dbg(common, QUEUE, "Setup TX queue: %u\n", q);</div><div class='ctx'> </div><div class='ctx'> 	qi = &amp;ah-&gt;txq[q];</div><div class='ctx'> 	if (qi-&gt;tqi_type != ATH9K_TX_QUEUE_INACTIVE) {</div><div class='hunk'>@@ -348,12 +347,11 @@ bool ath9k_hw_releasetxqueue(struct ath_hw *ah, u32 q)</div><div class='ctx'> </div><div class='ctx'> 	qi = &amp;ah-&gt;txq[q];</div><div class='ctx'> 	if (qi-&gt;tqi_type == ATH9K_TX_QUEUE_INACTIVE) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_QUEUE,</div><div class='del'>-			"Release TXQ, inactive queue: %u\n", q);</div><div class='add'>+		ath_dbg(common, QUEUE, "Release TXQ, inactive queue: %u\n", q);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_QUEUE, "Release TX queue: %u\n", q);</div><div class='add'>+	ath_dbg(common, QUEUE, "Release TX queue: %u\n", q);</div><div class='ctx'> </div><div class='ctx'> 	qi-&gt;tqi_type = ATH9K_TX_QUEUE_INACTIVE;</div><div class='ctx'> 	ah-&gt;txok_interrupt_mask &amp;= ~(1 &lt;&lt; q);</div><div class='hunk'>@@ -376,12 +374,11 @@ bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q)</div><div class='ctx'> </div><div class='ctx'> 	qi = &amp;ah-&gt;txq[q];</div><div class='ctx'> 	if (qi-&gt;tqi_type == ATH9K_TX_QUEUE_INACTIVE) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_QUEUE,</div><div class='del'>-			"Reset TXQ, inactive queue: %u\n", q);</div><div class='add'>+		ath_dbg(common, QUEUE, "Reset TXQ, inactive queue: %u\n", q);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_QUEUE, "Reset TX queue: %u\n", q);</div><div class='add'>+	ath_dbg(common, QUEUE, "Reset TX queue: %u\n", q);</div><div class='ctx'> </div><div class='ctx'> 	if (qi-&gt;tqi_cwmin == ATH9K_TXQ_USEDEFAULT) {</div><div class='ctx'> 		if (chan &amp;&amp; IS_CHAN_B(chan))</div><div class='hunk'>@@ -621,10 +618,11 @@ int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds,</div><div class='ctx'> 			rs-&gt;rs_status |= ATH9K_RXERR_DECRYPT;</div><div class='ctx'> 		else if (ads.ds_rxstatus8 &amp; AR_MichaelErr)</div><div class='ctx'> 			rs-&gt;rs_status |= ATH9K_RXERR_MIC;</div><div class='del'>-		if (ads.ds_rxstatus8 &amp; AR_KeyMiss)</div><div class='del'>-			rs-&gt;rs_status |= ATH9K_RXERR_KEYMISS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (ads.ds_rxstatus8 &amp; AR_KeyMiss)</div><div class='add'>+		rs-&gt;rs_status |= ATH9K_RXERR_KEYMISS;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath9k_hw_rxprocdesc);</div><div class='hunk'>@@ -760,7 +758,10 @@ bool ath9k_hw_intrpend(struct ath_hw *ah)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	host_isr = REG_READ(ah, AR_INTR_ASYNC_CAUSE);</div><div class='del'>-	if ((host_isr &amp; AR_INTR_MAC_IRQ) &amp;&amp; (host_isr != AR_INTR_SPURIOUS))</div><div class='add'>+</div><div class='add'>+	if (((host_isr &amp; AR_INTR_MAC_IRQ) ||</div><div class='add'>+	     (host_isr &amp; AR_INTR_ASYNC_MASK_MCI)) &amp;&amp;</div><div class='add'>+	    (host_isr != AR_INTR_SPURIOUS))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	host_isr = REG_READ(ah, AR_INTR_SYNC_CAUSE);</div><div class='hunk'>@@ -781,7 +782,7 @@ void ath9k_hw_disable_interrupts(struct ath_hw *ah)</div><div class='ctx'> 	else</div><div class='ctx'> 		atomic_dec(&amp;ah-&gt;intr_ref_cnt);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_INTERRUPT, "disable IER\n");</div><div class='add'>+	ath_dbg(common, INTERRUPT, "disable IER\n");</div><div class='ctx'> 	REG_WRITE(ah, AR_IER, AR_IER_DISABLE);</div><div class='ctx'> 	(void) REG_READ(ah, AR_IER);</div><div class='ctx'> 	if (!AR_SREV_9100(ah)) {</div><div class='hunk'>@@ -798,13 +799,13 @@ void ath9k_hw_enable_interrupts(struct ath_hw *ah)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> 	u32 sync_default = AR_INTR_SYNC_DEFAULT;</div><div class='add'>+	u32 async_mask;</div><div class='ctx'> </div><div class='ctx'> 	if (!(ah-&gt;imask &amp; ATH9K_INT_GLOBAL))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!atomic_inc_and_test(&amp;ah-&gt;intr_ref_cnt)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_INTERRUPT,</div><div class='del'>-			"Do not enable IER ref count %d\n",</div><div class='add'>+		ath_dbg(common, INTERRUPT, "Do not enable IER ref count %d\n",</div><div class='ctx'> 			atomic_read(&amp;ah-&gt;intr_ref_cnt));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -812,18 +813,21 @@ void ath9k_hw_enable_interrupts(struct ath_hw *ah)</div><div class='ctx'> 	if (AR_SREV_9340(ah))</div><div class='ctx'> 		sync_default &amp;= ~AR_INTR_SYNC_HOST1_FATAL;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_INTERRUPT, "enable IER\n");</div><div class='add'>+	async_mask = AR_INTR_MAC_IRQ;</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;imask &amp; ATH9K_INT_MCI)</div><div class='add'>+		async_mask |= AR_INTR_ASYNC_MASK_MCI;</div><div class='add'>+</div><div class='add'>+	ath_dbg(common, INTERRUPT, "enable IER\n");</div><div class='ctx'> 	REG_WRITE(ah, AR_IER, AR_IER_ENABLE);</div><div class='ctx'> 	if (!AR_SREV_9100(ah)) {</div><div class='del'>-		REG_WRITE(ah, AR_INTR_ASYNC_ENABLE,</div><div class='del'>-			  AR_INTR_MAC_IRQ);</div><div class='del'>-		REG_WRITE(ah, AR_INTR_ASYNC_MASK, AR_INTR_MAC_IRQ);</div><div class='del'>-</div><div class='add'>+		REG_WRITE(ah, AR_INTR_ASYNC_ENABLE, async_mask);</div><div class='add'>+		REG_WRITE(ah, AR_INTR_ASYNC_MASK, async_mask);</div><div class='ctx'> </div><div class='ctx'> 		REG_WRITE(ah, AR_INTR_SYNC_ENABLE, sync_default);</div><div class='ctx'> 		REG_WRITE(ah, AR_INTR_SYNC_MASK, sync_default);</div><div class='ctx'> 	}</div><div class='del'>-	ath_dbg(common, ATH_DBG_INTERRUPT, "AR_IMR 0x%x IER 0x%x\n",</div><div class='add'>+	ath_dbg(common, INTERRUPT, "AR_IMR 0x%x IER 0x%x\n",</div><div class='ctx'> 		REG_READ(ah, AR_IMR), REG_READ(ah, AR_IER));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath9k_hw_enable_interrupts);</div><div class='hunk'>@@ -838,7 +842,7 @@ void ath9k_hw_set_interrupts(struct ath_hw *ah)</div><div class='ctx'> 	if (!(ints &amp; ATH9K_INT_GLOBAL))</div><div class='ctx'> 		ath9k_hw_disable_interrupts(ah);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_INTERRUPT, "New interrupt mask 0x%x\n", ints);</div><div class='add'>+	ath_dbg(common, INTERRUPT, "New interrupt mask 0x%x\n", ints);</div><div class='ctx'> </div><div class='ctx'> 	mask = ints &amp; ATH9K_INT_COMMON;</div><div class='ctx'> 	mask2 = 0;</div><div class='hunk'>@@ -901,7 +905,7 @@ void ath9k_hw_set_interrupts(struct ath_hw *ah)</div><div class='ctx'> 			mask2 |= AR_IMR_S2_CST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_INTERRUPT, "new IMR 0x%x\n", mask);</div><div class='add'>+	ath_dbg(common, INTERRUPT, "new IMR 0x%x\n", mask);</div><div class='ctx'> 	REG_WRITE(ah, AR_IMR, mask);</div><div class='ctx'> 	ah-&gt;imrs2_reg &amp;= ~(AR_IMR_S2_TIM | AR_IMR_S2_DTIM | AR_IMR_S2_DTIMSYNC |</div><div class='ctx'> 			   AR_IMR_S2_CABEND | AR_IMR_S2_CABTO |</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c<br/>index a9c5ae75277e..4a00806e2852 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/main.c</a></div><div class='hunk'>@@ -118,7 +118,7 @@ void ath9k_ps_restore(struct ath_softc *sc)</div><div class='ctx'> 	if (--sc-&gt;ps_usecount != 0)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='del'>-	if (sc-&gt;ps_idle)</div><div class='add'>+	if (sc-&gt;ps_idle &amp;&amp; (sc-&gt;ps_flags &amp; PS_WAIT_FOR_TX_ACK))</div><div class='ctx'> 		mode = ATH9K_PM_FULL_SLEEP;</div><div class='ctx'> 	else if (sc-&gt;ps_enabled &amp;&amp;</div><div class='ctx'> 		 !(sc-&gt;ps_flags &amp; (PS_WAIT_FOR_BEACON |</div><div class='hunk'>@@ -332,14 +332,14 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,</div><div class='ctx'> 		hchan = ah-&gt;curchan;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (fastcc &amp;&amp; !ath9k_hw_check_alive(ah))</div><div class='add'>+	if (fastcc &amp;&amp; (ah-&gt;chip_fullsleep ||</div><div class='add'>+	    !ath9k_hw_check_alive(ah)))</div><div class='ctx'> 		fastcc = false;</div><div class='ctx'> </div><div class='ctx'> 	if (!ath_prepare_reset(sc, retry_tx, flush))</div><div class='ctx'> 		fastcc = false;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-		"Reset to %u MHz, HT40: %d fastcc: %d\n",</div><div class='add'>+	ath_dbg(common, CONFIG, "Reset to %u MHz, HT40: %d fastcc: %d\n",</div><div class='ctx'> 		hchan-&gt;channel, !!(hchan-&gt;channelFlags &amp; (CHANNEL_HT40MINUS |</div><div class='ctx'> 							  CHANNEL_HT40PLUS)),</div><div class='ctx'> 		fastcc);</div><div class='hunk'>@@ -428,7 +428,7 @@ static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int</div><div class='ctx'> 	txctl.paprd = BIT(chain);</div><div class='ctx'> </div><div class='ctx'> 	if (ath_tx_start(hw, skb, &amp;txctl) != 0) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE, "PAPRD TX failed\n");</div><div class='add'>+		ath_dbg(common, CALIBRATE, "PAPRD TX failed\n");</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -437,7 +437,7 @@ static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int</div><div class='ctx'> 			msecs_to_jiffies(ATH_PAPRD_TIMEOUT));</div><div class='ctx'> </div><div class='ctx'> 	if (!time_left)</div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='ctx'> 			"Timeout waiting for paprd training on TX chain %d\n",</div><div class='ctx'> 			chain);</div><div class='ctx'> </div><div class='hunk'>@@ -486,27 +486,27 @@ void ath_paprd_calibrate(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 		chain_ok = 0;</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='del'>-			"Sending PAPRD frame for thermal measurement "</div><div class='del'>-			"on chain %d\n", chain);</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='add'>+			"Sending PAPRD frame for thermal measurement on chain %d\n",</div><div class='add'>+			chain);</div><div class='ctx'> 		if (!ath_paprd_send_frame(sc, skb, chain))</div><div class='ctx'> 			goto fail_paprd;</div><div class='ctx'> </div><div class='ctx'> 		ar9003_paprd_setup_gain_table(ah, chain);</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+		ath_dbg(common, CALIBRATE,</div><div class='ctx'> 			"Sending PAPRD training frame on chain %d\n", chain);</div><div class='ctx'> 		if (!ath_paprd_send_frame(sc, skb, chain))</div><div class='ctx'> 			goto fail_paprd;</div><div class='ctx'> </div><div class='ctx'> 		if (!ar9003_paprd_is_done(ah)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='ctx'> 				"PAPRD not yet done on chain %d\n", chain);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ar9003_paprd_create_curve(ah, caldata, chain)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_CALIBRATE,</div><div class='add'>+			ath_dbg(common, CALIBRATE,</div><div class='ctx'> 				"PAPRD create curve failed on chain %d\n",</div><div class='ctx'> 								   chain);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -561,7 +561,6 @@ void ath_ani_calibrate(unsigned long data)</div><div class='ctx'> 	/* Long calibration runs independently of short calibration. */</div><div class='ctx'> 	if ((timestamp - common-&gt;ani.longcal_timer) &gt;= long_cal_interval) {</div><div class='ctx'> 		longcal = true;</div><div class='del'>-		ath_dbg(common, ATH_DBG_ANI, "longcal @%lu\n", jiffies);</div><div class='ctx'> 		common-&gt;ani.longcal_timer = timestamp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -569,8 +568,6 @@ void ath_ani_calibrate(unsigned long data)</div><div class='ctx'> 	if (!common-&gt;ani.caldone) {</div><div class='ctx'> 		if ((timestamp - common-&gt;ani.shortcal_timer) &gt;= short_cal_interval) {</div><div class='ctx'> 			shortcal = true;</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANI,</div><div class='del'>-				"shortcal @%lu\n", jiffies);</div><div class='ctx'> 			common-&gt;ani.shortcal_timer = timestamp;</div><div class='ctx'> 			common-&gt;ani.resetcal_timer = timestamp;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -584,8 +581,9 @@ void ath_ani_calibrate(unsigned long data)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Verify whether we must check ANI */</div><div class='del'>-	if ((timestamp - common-&gt;ani.checkani_timer) &gt;=</div><div class='del'>-	     ah-&gt;config.ani_poll_interval) {</div><div class='add'>+	if (sc-&gt;sc_ah-&gt;config.enable_ani</div><div class='add'>+	    &amp;&amp; (timestamp - common-&gt;ani.checkani_timer) &gt;=</div><div class='add'>+	    ah-&gt;config.ani_poll_interval) {</div><div class='ctx'> 		aniflag = true;</div><div class='ctx'> 		common-&gt;ani.checkani_timer = timestamp;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -605,6 +603,12 @@ void ath_ani_calibrate(unsigned long data)</div><div class='ctx'> 						ah-&gt;rxchainmask, longcal);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ath_dbg(common, ANI,</div><div class='add'>+		"Calibration @%lu finished: %s %s %s, caldone: %s\n",</div><div class='add'>+		jiffies,</div><div class='add'>+		longcal ? "long" : "", shortcal ? "short" : "",</div><div class='add'>+		aniflag ? "ani" : "", common-&gt;ani.caldone ? "true" : "false");</div><div class='add'>+</div><div class='ctx'> 	ath9k_ps_restore(sc);</div><div class='ctx'> </div><div class='ctx'> set_timer:</div><div class='hunk'>@@ -630,7 +634,8 @@ set_timer:</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta)</div><div class='add'>+static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta,</div><div class='add'>+			    struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_node *an;</div><div class='ctx'> 	an = (struct ath_node *)sta-&gt;drv_priv;</div><div class='hunk'>@@ -639,8 +644,9 @@ static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta)</div><div class='ctx'> 	spin_lock(&amp;sc-&gt;nodes_lock);</div><div class='ctx'> 	list_add(&amp;an-&gt;list, &amp;sc-&gt;nodes);</div><div class='ctx'> 	spin_unlock(&amp;sc-&gt;nodes_lock);</div><div class='del'>-	an-&gt;sta = sta;</div><div class='ctx'> #endif</div><div class='add'>+	an-&gt;sta = sta;</div><div class='add'>+	an-&gt;vif = vif;</div><div class='ctx'> 	if (sc-&gt;sc_flags &amp; SC_OP_TXAGGR) {</div><div class='ctx'> 		ath_tx_node_init(sc, an);</div><div class='ctx'> 		an-&gt;maxampdu = 1 &lt;&lt; (IEEE80211_HT_MAX_AMPDU_FACTOR +</div><div class='hunk'>@@ -709,8 +715,7 @@ void ath9k_tasklet(unsigned long data)</div><div class='ctx'> 		 * TSF sync does not look correct; remain awake to sync with</div><div class='ctx'> 		 * the next Beacon.</div><div class='ctx'> 		 */</div><div class='del'>-		ath_dbg(common, ATH_DBG_PS,</div><div class='del'>-			"TSFOOR - Sync with next Beacon\n");</div><div class='add'>+		ath_dbg(common, PS, "TSFOOR - Sync with next Beacon\n");</div><div class='ctx'> 		sc-&gt;ps_flags |= PS_WAIT_FOR_BEACON | PS_BEACON_SYNC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -736,10 +741,13 @@ void ath9k_tasklet(unsigned long data)</div><div class='ctx'> 			ath_tx_tasklet(sc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ah-&gt;btcoex_hw.scheme == ATH_BTCOEX_CFG_3WIRE)</div><div class='add'>+	if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_3WIRE)</div><div class='ctx'> 		if (status &amp; ATH9K_INT_GENTIMER)</div><div class='ctx'> 			ath_gen_timer_isr(sc-&gt;sc_ah);</div><div class='ctx'> </div><div class='add'>+	if ((status &amp; ATH9K_INT_MCI) &amp;&amp; ATH9K_HW_CAP_MCI)</div><div class='add'>+		ath_mci_intr(sc);</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	/* re-enable hardware interrupt */</div><div class='ctx'> 	ath9k_hw_enable_interrupts(ah);</div><div class='hunk'>@@ -762,7 +770,8 @@ irqreturn_t ath_isr(int irq, void *dev)</div><div class='ctx'> 		ATH9K_INT_BMISS |		\</div><div class='ctx'> 		ATH9K_INT_CST |			\</div><div class='ctx'> 		ATH9K_INT_TSFOOR |		\</div><div class='del'>-		ATH9K_INT_GENTIMER)</div><div class='add'>+		ATH9K_INT_GENTIMER |		\</div><div class='add'>+		ATH9K_INT_MCI)</div><div class='ctx'> </div><div class='ctx'> 	struct ath_softc *sc = dev;</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='hunk'>@@ -880,82 +889,6 @@ chip_reset:</div><div class='ctx'> #undef SCHED_INTR</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ath_radio_enable(struct ath_softc *sc, struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='del'>-	struct ath_common *common = ath9k_hw_common(ah);</div><div class='del'>-	struct ieee80211_channel *channel = hw-&gt;conf.channel;</div><div class='del'>-	int r;</div><div class='del'>-</div><div class='del'>-	ath9k_ps_wakeup(sc);</div><div class='del'>-	spin_lock_bh(&amp;sc-&gt;sc_pcu_lock);</div><div class='del'>-	atomic_set(&amp;ah-&gt;intr_ref_cnt, -1);</div><div class='del'>-</div><div class='del'>-	ath9k_hw_configpcipowersave(ah, false);</div><div class='del'>-</div><div class='del'>-	if (!ah-&gt;curchan)</div><div class='del'>-		ah-&gt;curchan = ath9k_cmn_get_curchannel(sc-&gt;hw, ah);</div><div class='del'>-</div><div class='del'>-	r = ath9k_hw_reset(ah, ah-&gt;curchan, ah-&gt;caldata, false);</div><div class='del'>-	if (r) {</div><div class='del'>-		ath_err(common,</div><div class='del'>-			"Unable to reset channel (%u MHz), reset status %d\n",</div><div class='del'>-			channel-&gt;center_freq, r);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ath_complete_reset(sc, true);</div><div class='del'>-</div><div class='del'>-	/* Enable LED */</div><div class='del'>-	ath9k_hw_cfg_output(ah, ah-&gt;led_pin,</div><div class='del'>-			    AR_GPIO_OUTPUT_MUX_AS_OUTPUT);</div><div class='del'>-	ath9k_hw_set_gpio(ah, ah-&gt;led_pin, 0);</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;sc-&gt;sc_pcu_lock);</div><div class='del'>-</div><div class='del'>-	ath9k_ps_restore(sc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='del'>-	struct ieee80211_channel *channel = hw-&gt;conf.channel;</div><div class='del'>-	int r;</div><div class='del'>-</div><div class='del'>-	ath9k_ps_wakeup(sc);</div><div class='del'>-</div><div class='del'>-	ath_cancel_work(sc);</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;sc-&gt;sc_pcu_lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Keep the LED on when the radio is disabled</div><div class='del'>-	 * during idle unassociated state.</div><div class='del'>-	 */</div><div class='del'>-	if (!sc-&gt;ps_idle) {</div><div class='del'>-		ath9k_hw_set_gpio(ah, ah-&gt;led_pin, 1);</div><div class='del'>-		ath9k_hw_cfg_gpio_input(ah, ah-&gt;led_pin);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ath_prepare_reset(sc, false, true);</div><div class='del'>-</div><div class='del'>-	if (!ah-&gt;curchan)</div><div class='del'>-		ah-&gt;curchan = ath9k_cmn_get_curchannel(hw, ah);</div><div class='del'>-</div><div class='del'>-	r = ath9k_hw_reset(ah, ah-&gt;curchan, ah-&gt;caldata, false);</div><div class='del'>-	if (r) {</div><div class='del'>-		ath_err(ath9k_hw_common(sc-&gt;sc_ah),</div><div class='del'>-			"Unable to reset channel (%u MHz), reset status %d\n",</div><div class='del'>-			channel-&gt;center_freq, r);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ath9k_hw_phy_disable(ah);</div><div class='del'>-</div><div class='del'>-	ath9k_hw_configpcipowersave(ah, true);</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;sc-&gt;sc_pcu_lock);</div><div class='del'>-	ath9k_ps_restore(sc);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ath_reset(struct ath_softc *sc, bool retry_tx)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='hunk'>@@ -1002,8 +935,8 @@ void ath_hw_check(struct work_struct *work)</div><div class='ctx'> 	busy = ath_update_survey_stats(sc);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;common-&gt;cc_lock, flags);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_RESET, "Possible baseband hang, "</div><div class='del'>-		"busy=%d (try %d)\n", busy, sc-&gt;hw_busy_count + 1);</div><div class='add'>+	ath_dbg(common, RESET, "Possible baseband hang, busy=%d (try %d)\n",</div><div class='add'>+		busy, sc-&gt;hw_busy_count + 1);</div><div class='ctx'> 	if (busy &gt;= 99) {</div><div class='ctx'> 		if (++sc-&gt;hw_busy_count &gt;= 3) {</div><div class='ctx'> 			RESET_STAT_INC(sc, RESET_TYPE_BB_HANG);</div><div class='hunk'>@@ -1026,8 +959,7 @@ static void ath_hw_pll_rx_hang_check(struct ath_softc *sc, u32 pll_sqsum)</div><div class='ctx'> 		count++;</div><div class='ctx'> 		if (count == 3) {</div><div class='ctx'> 			/* Rx is hung for more than 500ms. Reset it */</div><div class='del'>-			ath_dbg(common, ATH_DBG_RESET,</div><div class='del'>-				"Possible RX hang, resetting");</div><div class='add'>+			ath_dbg(common, RESET, "Possible RX hang, resetting\n");</div><div class='ctx'> 			RESET_STAT_INC(sc, RESET_TYPE_PLL_HANG);</div><div class='ctx'> 			ieee80211_queue_work(sc-&gt;hw, &amp;sc-&gt;hw_reset_work);</div><div class='ctx'> 			count = 0;</div><div class='hunk'>@@ -1067,7 +999,7 @@ static int ath9k_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	struct ath9k_channel *init_channel;</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+	ath_dbg(common, CONFIG,</div><div class='ctx'> 		"Starting driver with initial channel: %d MHz\n",</div><div class='ctx'> 		curchan-&gt;center_freq);</div><div class='ctx'> </div><div class='hunk'>@@ -1091,6 +1023,9 @@ static int ath9k_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	 * and then setup of the interrupt mask.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock_bh(&amp;sc-&gt;sc_pcu_lock);</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;ah-&gt;intr_ref_cnt, -1);</div><div class='add'>+</div><div class='ctx'> 	r = ath9k_hw_reset(ah, init_channel, ah-&gt;caldata, false);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		ath_err(common,</div><div class='hunk'>@@ -1117,6 +1052,9 @@ static int ath9k_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	if (ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_HT)</div><div class='ctx'> 		ah-&gt;imask |= ATH9K_INT_CST;</div><div class='ctx'> </div><div class='add'>+	if (ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_MCI)</div><div class='add'>+		ah-&gt;imask |= ATH9K_INT_MCI;</div><div class='add'>+</div><div class='ctx'> 	sc-&gt;sc_flags &amp;= ~SC_OP_INVALID;</div><div class='ctx'> 	sc-&gt;sc_ah-&gt;is_monitoring = false;</div><div class='ctx'> </div><div class='hunk'>@@ -1129,15 +1067,28 @@ static int ath9k_start(struct ieee80211_hw *hw)</div><div class='ctx'> 		goto mutex_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (ah-&gt;led_pin &gt;= 0) {</div><div class='add'>+		ath9k_hw_cfg_output(ah, ah-&gt;led_pin,</div><div class='add'>+				    AR_GPIO_OUTPUT_MUX_AS_OUTPUT);</div><div class='add'>+		ath9k_hw_set_gpio(ah, ah-&gt;led_pin, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reset key cache to sane defaults (all entries cleared) instead of</div><div class='add'>+	 * semi-random values after suspend/resume.</div><div class='add'>+	 */</div><div class='add'>+	ath9k_cmn_init_crypto(sc-&gt;sc_ah);</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_bh(&amp;sc-&gt;sc_pcu_lock);</div><div class='ctx'> </div><div class='del'>-	if ((ah-&gt;btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE) &amp;&amp;</div><div class='add'>+	if ((ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_NONE) &amp;&amp;</div><div class='ctx'> 	    !ah-&gt;btcoex_hw.enabled) {</div><div class='del'>-		ath9k_hw_btcoex_set_weight(ah, AR_BT_COEX_WGHT,</div><div class='del'>-					   AR_STOMP_LOW_WLAN_WGHT);</div><div class='add'>+		if (!(sc-&gt;sc_ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_MCI))</div><div class='add'>+			ath9k_hw_btcoex_set_weight(ah, AR_BT_COEX_WGHT,</div><div class='add'>+						   AR_STOMP_LOW_WLAN_WGHT);</div><div class='ctx'> 		ath9k_hw_btcoex_enable(ah);</div><div class='ctx'> </div><div class='del'>-		if (ah-&gt;btcoex_hw.scheme == ATH_BTCOEX_CFG_3WIRE)</div><div class='add'>+		if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_3WIRE)</div><div class='ctx'> 			ath9k_btcoex_timer_resume(sc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1167,12 +1118,19 @@ static void ath9k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> 		if (ieee80211_is_data(hdr-&gt;frame_control) &amp;&amp;</div><div class='ctx'> 		    !ieee80211_is_nullfunc(hdr-&gt;frame_control) &amp;&amp;</div><div class='ctx'> 		    !ieee80211_has_pm(hdr-&gt;frame_control)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_PS,</div><div class='add'>+			ath_dbg(common, PS,</div><div class='ctx'> 				"Add PM=1 for a TX frame while in PS mode\n");</div><div class='ctx'> 			hdr-&gt;frame_control |= cpu_to_le16(IEEE80211_FCTL_PM);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Cannot tx while the hardware is in full sleep, it first needs a full</div><div class='add'>+	 * chip reset to recover from that</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(sc-&gt;sc_ah-&gt;power_mode == ATH9K_PM_FULL_SLEEP))</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(sc-&gt;sc_ah-&gt;power_mode != ATH9K_PM_AWAKE)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We are using PS-Poll and mac80211 can request TX while in</div><div class='hunk'>@@ -1183,12 +1141,11 @@ static void ath9k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> 		if (!(sc-&gt;sc_ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_AUTOSLEEP))</div><div class='ctx'> 			ath9k_hw_setrxabort(sc-&gt;sc_ah, 0);</div><div class='ctx'> 		if (ieee80211_is_pspoll(hdr-&gt;frame_control)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_PS,</div><div class='add'>+			ath_dbg(common, PS,</div><div class='ctx'> 				"Sending PS-Poll to pick a buffered frame\n");</div><div class='ctx'> 			sc-&gt;ps_flags |= PS_WAIT_FOR_PSPOLL_DATA;</div><div class='ctx'> 		} else {</div><div class='del'>-			ath_dbg(common, ATH_DBG_PS,</div><div class='del'>-				"Wake up to complete TX\n");</div><div class='add'>+			ath_dbg(common, PS, "Wake up to complete TX\n");</div><div class='ctx'> 			sc-&gt;ps_flags |= PS_WAIT_FOR_TX_ACK;</div><div class='ctx'> 		}</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1202,10 +1159,10 @@ static void ath9k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> 	memset(&amp;txctl, 0, sizeof(struct ath_tx_control));</div><div class='ctx'> 	txctl.txq = sc-&gt;tx.txq_map[skb_get_queue_mapping(skb)];</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_XMIT, "transmitting packet, skb: %p\n", skb);</div><div class='add'>+	ath_dbg(common, XMIT, "transmitting packet, skb: %p\n", skb);</div><div class='ctx'> </div><div class='ctx'> 	if (ath_tx_start(hw, skb, &amp;txctl) != 0) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_XMIT, "TX failed\n");</div><div class='add'>+		ath_dbg(common, XMIT, "TX failed\n");</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1219,13 +1176,14 @@ static void ath9k_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	bool prev_idle;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;sc-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	ath_cancel_work(sc);</div><div class='ctx'> </div><div class='ctx'> 	if (sc-&gt;sc_flags &amp; SC_OP_INVALID) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_ANY, "Device not present\n");</div><div class='add'>+		ath_dbg(common, ANY, "Device not present\n");</div><div class='ctx'> 		mutex_unlock(&amp;sc-&gt;mutex);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1233,10 +1191,12 @@ static void ath9k_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 	/* Ensure HW is awake when we try to shut it down. */</div><div class='ctx'> 	ath9k_ps_wakeup(sc);</div><div class='ctx'> </div><div class='del'>-	if (ah-&gt;btcoex_hw.enabled) {</div><div class='add'>+	if (ah-&gt;btcoex_hw.enabled &amp;&amp;</div><div class='add'>+	    ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_NONE) {</div><div class='ctx'> 		ath9k_hw_btcoex_disable(ah);</div><div class='del'>-		if (ah-&gt;btcoex_hw.scheme == ATH_BTCOEX_CFG_3WIRE)</div><div class='add'>+		if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_3WIRE)</div><div class='ctx'> 			ath9k_btcoex_timer_pause(sc);</div><div class='add'>+		ath_mci_flush_profile(&amp;sc-&gt;btcoex.mci);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;sc-&gt;sc_pcu_lock);</div><div class='hunk'>@@ -1248,39 +1208,49 @@ static void ath9k_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 	 * before setting the invalid flag. */</div><div class='ctx'> 	ath9k_hw_disable_interrupts(ah);</div><div class='ctx'> </div><div class='del'>-	if (!(sc-&gt;sc_flags &amp; SC_OP_INVALID)) {</div><div class='del'>-		ath_drain_all_txq(sc, false);</div><div class='del'>-		ath_stoprecv(sc);</div><div class='del'>-		ath9k_hw_phy_disable(ah);</div><div class='del'>-	} else</div><div class='del'>-		sc-&gt;rx.rxlink = NULL;</div><div class='add'>+	spin_unlock_bh(&amp;sc-&gt;sc_pcu_lock);</div><div class='add'>+</div><div class='add'>+	/* we can now sync irq and kill any running tasklets, since we already</div><div class='add'>+	 * disabled interrupts and not holding a spin lock */</div><div class='add'>+	synchronize_irq(sc-&gt;irq);</div><div class='add'>+	tasklet_kill(&amp;sc-&gt;intr_tq);</div><div class='add'>+	tasklet_kill(&amp;sc-&gt;bcon_tasklet);</div><div class='add'>+</div><div class='add'>+	prev_idle = sc-&gt;ps_idle;</div><div class='add'>+	sc-&gt;ps_idle = true;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;sc-&gt;sc_pcu_lock);</div><div class='add'>+</div><div class='add'>+	if (ah-&gt;led_pin &gt;= 0) {</div><div class='add'>+		ath9k_hw_set_gpio(ah, ah-&gt;led_pin, 1);</div><div class='add'>+		ath9k_hw_cfg_gpio_input(ah, ah-&gt;led_pin);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath_prepare_reset(sc, false, true);</div><div class='ctx'> </div><div class='ctx'> 	if (sc-&gt;rx.frag) {</div><div class='ctx'> 		dev_kfree_skb_any(sc-&gt;rx.frag);</div><div class='ctx'> 		sc-&gt;rx.frag = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* disable HAL and put h/w to sleep */</div><div class='del'>-	ath9k_hw_disable(ah);</div><div class='add'>+	if (!ah-&gt;curchan)</div><div class='add'>+		ah-&gt;curchan = ath9k_cmn_get_curchannel(hw, ah);</div><div class='add'>+</div><div class='add'>+	ath9k_hw_reset(ah, ah-&gt;curchan, ah-&gt;caldata, false);</div><div class='add'>+	ath9k_hw_phy_disable(ah);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;sc-&gt;sc_pcu_lock);</div><div class='add'>+	ath9k_hw_configpcipowersave(ah, true);</div><div class='ctx'> </div><div class='del'>-	/* we can now sync irq and kill any running tasklets, since we already</div><div class='del'>-	 * disabled interrupts and not holding a spin lock */</div><div class='del'>-	synchronize_irq(sc-&gt;irq);</div><div class='del'>-	tasklet_kill(&amp;sc-&gt;intr_tq);</div><div class='del'>-	tasklet_kill(&amp;sc-&gt;bcon_tasklet);</div><div class='add'>+	spin_unlock_bh(&amp;sc-&gt;sc_pcu_lock);</div><div class='ctx'> </div><div class='ctx'> 	ath9k_ps_restore(sc);</div><div class='ctx'> </div><div class='del'>-	sc-&gt;ps_idle = true;</div><div class='del'>-	ath_radio_disable(sc, hw);</div><div class='del'>-</div><div class='ctx'> 	sc-&gt;sc_flags |= SC_OP_INVALID;</div><div class='add'>+	sc-&gt;ps_idle = prev_idle;</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;sc-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG, "Driver halt\n");</div><div class='add'>+	ath_dbg(common, CONFIG, "Driver halt\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool ath9k_uses_beacons(int type)</div><div class='hunk'>@@ -1495,8 +1465,7 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-		"Attach a VIF of type: %d\n", vif-&gt;type);</div><div class='add'>+	ath_dbg(common, CONFIG, "Attach a VIF of type: %d\n", vif-&gt;type);</div><div class='ctx'> </div><div class='ctx'> 	sc-&gt;nvifs++;</div><div class='ctx'> </div><div class='hunk'>@@ -1516,7 +1485,7 @@ static int ath9k_change_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG, "Change Interface\n");</div><div class='add'>+	ath_dbg(common, CONFIG, "Change Interface\n");</div><div class='ctx'> 	mutex_lock(&amp;sc-&gt;mutex);</div><div class='ctx'> 	ath9k_ps_wakeup(sc);</div><div class='ctx'> </div><div class='hunk'>@@ -1559,7 +1528,7 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG, "Detach Interface\n");</div><div class='add'>+	ath_dbg(common, CONFIG, "Detach Interface\n");</div><div class='ctx'> </div><div class='ctx'> 	ath9k_ps_wakeup(sc);</div><div class='ctx'> 	mutex_lock(&amp;sc-&gt;mutex);</div><div class='hunk'>@@ -1616,8 +1585,8 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(ah);</div><div class='ctx'> 	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</div><div class='del'>-	bool disable_radio = false;</div><div class='ctx'> </div><div class='add'>+	ath9k_ps_wakeup(sc);</div><div class='ctx'> 	mutex_lock(&amp;sc-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1628,13 +1597,8 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (changed &amp; IEEE80211_CONF_CHANGE_IDLE) {</div><div class='ctx'> 		sc-&gt;ps_idle = !!(conf-&gt;flags &amp; IEEE80211_CONF_IDLE);</div><div class='del'>-		if (!sc-&gt;ps_idle) {</div><div class='del'>-			ath_radio_enable(sc, hw);</div><div class='del'>-			ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-				"not-idle: enabling radio\n");</div><div class='del'>-		} else {</div><div class='del'>-			disable_radio = true;</div><div class='del'>-		}</div><div class='add'>+		if (sc-&gt;ps_idle)</div><div class='add'>+			ath_cancel_work(sc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1655,19 +1619,16 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_CONF_CHANGE_MONITOR) {</div><div class='ctx'> 		if (conf-&gt;flags &amp; IEEE80211_CONF_MONITOR) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-				"Monitor mode is enabled\n");</div><div class='add'>+			ath_dbg(common, CONFIG, "Monitor mode is enabled\n");</div><div class='ctx'> 			sc-&gt;sc_ah-&gt;is_monitoring = true;</div><div class='ctx'> 		} else {</div><div class='del'>-			ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-				"Monitor mode is disabled\n");</div><div class='add'>+			ath_dbg(common, CONFIG, "Monitor mode is disabled\n");</div><div class='ctx'> 			sc-&gt;sc_ah-&gt;is_monitoring = false;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_CONF_CHANGE_CHANNEL) {</div><div class='ctx'> 		struct ieee80211_channel *curchan = hw-&gt;conf.channel;</div><div class='del'>-		struct ath9k_channel old_chan;</div><div class='ctx'> 		int pos = curchan-&gt;hw_value;</div><div class='ctx'> 		int old_pos = -1;</div><div class='ctx'> 		unsigned long flags;</div><div class='hunk'>@@ -1680,8 +1641,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 		else</div><div class='ctx'> 			sc-&gt;sc_flags &amp;= ~SC_OP_OFFCHANNEL;</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-			"Set channel: %d MHz type: %d\n",</div><div class='add'>+		ath_dbg(common, CONFIG, "Set channel: %d MHz type: %d\n",</div><div class='ctx'> 			curchan-&gt;center_freq, conf-&gt;channel_type);</div><div class='ctx'> </div><div class='ctx'> 		/* update survey stats for the old channel before switching */</div><div class='hunk'>@@ -1693,11 +1653,8 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 		 * Preserve the current channel values, before updating</div><div class='ctx'> 		 * the same channel</div><div class='ctx'> 		 */</div><div class='del'>-		if (old_pos == pos) {</div><div class='del'>-			memcpy(&amp;old_chan, &amp;sc-&gt;sc_ah-&gt;channels[pos],</div><div class='del'>-				sizeof(struct ath9k_channel));</div><div class='del'>-			ah-&gt;curchan = &amp;old_chan;</div><div class='del'>-		}</div><div class='add'>+		if (ah-&gt;curchan &amp;&amp; (old_pos == pos))</div><div class='add'>+			ath9k_hw_getnf(ah, ah-&gt;curchan);</div><div class='ctx'> </div><div class='ctx'> 		ath9k_cmn_update_ichannel(&amp;sc-&gt;sc_ah-&gt;channels[pos],</div><div class='ctx'> 					  curchan, conf-&gt;channel_type);</div><div class='hunk'>@@ -1738,21 +1695,14 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; IEEE80211_CONF_CHANGE_POWER) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-			"Set power: %d\n", conf-&gt;power_level);</div><div class='add'>+		ath_dbg(common, CONFIG, "Set power: %d\n", conf-&gt;power_level);</div><div class='ctx'> 		sc-&gt;config.txpowlimit = 2 * conf-&gt;power_level;</div><div class='del'>-		ath9k_ps_wakeup(sc);</div><div class='ctx'> 		ath9k_cmn_update_txpow(ah, sc-&gt;curtxpow,</div><div class='ctx'> 				       sc-&gt;config.txpowlimit, &amp;sc-&gt;curtxpow);</div><div class='del'>-		ath9k_ps_restore(sc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (disable_radio) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG, "idle: disabling radio\n");</div><div class='del'>-		ath_radio_disable(sc, hw);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;sc-&gt;mutex);</div><div class='add'>+	ath9k_ps_restore(sc);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1785,8 +1735,8 @@ static void ath9k_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> 	ath9k_hw_setrxfilter(sc-&gt;sc_ah, rfilt);</div><div class='ctx'> 	ath9k_ps_restore(sc);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(ath9k_hw_common(sc-&gt;sc_ah), ATH_DBG_CONFIG,</div><div class='del'>-		"Set HW RX filter: 0x%x\n", rfilt);</div><div class='add'>+	ath_dbg(ath9k_hw_common(sc-&gt;sc_ah), CONFIG, "Set HW RX filter: 0x%x\n",</div><div class='add'>+		rfilt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ath9k_sta_add(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -1798,7 +1748,7 @@ static int ath9k_sta_add(struct ieee80211_hw *hw,</div><div class='ctx'> 	struct ath_node *an = (struct ath_node *) sta-&gt;drv_priv;</div><div class='ctx'> 	struct ieee80211_key_conf ps_key = { };</div><div class='ctx'> </div><div class='del'>-	ath_node_attach(sc, sta);</div><div class='add'>+	ath_node_attach(sc, sta, vif);</div><div class='ctx'> </div><div class='ctx'> 	if (vif-&gt;type != NL80211_IFTYPE_AP &amp;&amp;</div><div class='ctx'> 	    vif-&gt;type != NL80211_IFTYPE_AP_VLAN)</div><div class='hunk'>@@ -1883,7 +1833,7 @@ static int ath9k_conf_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 	qi.tqi_cwmax = params-&gt;cw_max;</div><div class='ctx'> 	qi.tqi_burstTime = params-&gt;txop;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='add'>+	ath_dbg(common, CONFIG,</div><div class='ctx'> 		"Configure tx [queue/halq] [%d/%d], aifs: %d, cw_min: %d, cw_max: %d, txop: %d\n",</div><div class='ctx'> 		queue, txq-&gt;axq_qnum, params-&gt;aifs, params-&gt;cw_min,</div><div class='ctx'> 		params-&gt;cw_max, params-&gt;txop);</div><div class='hunk'>@@ -1915,7 +1865,8 @@ static int ath9k_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (ath9k_modparam_nohwcrypt)</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_ADHOC &amp;&amp;</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='ctx'> 	    (key-&gt;cipher == WLAN_CIPHER_SUITE_TKIP ||</div><div class='ctx'> 	     key-&gt;cipher == WLAN_CIPHER_SUITE_CCMP) &amp;&amp;</div><div class='ctx'> 	    !(key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE)) {</div><div class='hunk'>@@ -1931,7 +1882,7 @@ static int ath9k_set_key(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;sc-&gt;mutex);</div><div class='ctx'> 	ath9k_ps_wakeup(sc);</div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG, "Set HW Key\n");</div><div class='add'>+	ath_dbg(common, CONFIG, "Set HW Key\n");</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SET_KEY:</div><div class='hunk'>@@ -1983,9 +1934,8 @@ static void ath9k_bss_iter(void *data, u8 *mac, 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 = bss_conf-&gt;aid;</div><div class='ctx'> 		ath9k_hw_write_associd(sc-&gt;sc_ah);</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-				"Bss Info ASSOC %d, bssid: %pM\n",</div><div class='del'>-				bss_conf-&gt;aid, common-&gt;curbssid);</div><div class='add'>+		ath_dbg(common, CONFIG, "Bss Info ASSOC %d, bssid: %pM\n",</div><div class='add'>+			bss_conf-&gt;aid, common-&gt;curbssid);</div><div class='ctx'> 		ath_beacon_config(sc, vif);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Request a re-configuration of Beacon related timers</div><div class='hunk'>@@ -2016,8 +1966,7 @@ static void ath9k_config_bss(struct ath_softc *sc, struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> 	/* Reconfigure bss info */</div><div class='ctx'> 	if (avp-&gt;primary_sta_vif &amp;&amp; !bss_conf-&gt;assoc) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-			"Bss Info DISASSOC %d, bssid %pM\n",</div><div class='add'>+		ath_dbg(common, CONFIG, "Bss Info DISASSOC %d, bssid %pM\n",</div><div class='ctx'> 			common-&gt;curaid, common-&gt;curbssid);</div><div class='ctx'> 		sc-&gt;sc_flags &amp;= ~(SC_OP_PRIM_STA_VIF | SC_OP_BEACONS);</div><div class='ctx'> 		avp-&gt;primary_sta_vif = false;</div><div class='hunk'>@@ -2059,7 +2008,7 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_BSSID) {</div><div class='ctx'> 		ath9k_config_bss(sc, vif);</div><div class='ctx'> </div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG, "BSSID: %pM aid: 0x%x\n",</div><div class='add'>+		ath_dbg(common, CONFIG, "BSSID: %pM aid: 0x%x\n",</div><div class='ctx'> 			common-&gt;curbssid, common-&gt;curaid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2137,7 +2086,7 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ERP_PREAMBLE) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG, "BSS Changed PREAMBLE %d\n",</div><div class='add'>+		ath_dbg(common, CONFIG, "BSS Changed PREAMBLE %d\n",</div><div class='ctx'> 			bss_conf-&gt;use_short_preamble);</div><div class='ctx'> 		if (bss_conf-&gt;use_short_preamble)</div><div class='ctx'> 			sc-&gt;sc_flags |= SC_OP_PREAMBLE_SHORT;</div><div class='hunk'>@@ -2146,7 +2095,7 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ERP_CTS_PROT) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG, "BSS Changed CTS PROT %d\n",</div><div class='add'>+		ath_dbg(common, CONFIG, "BSS Changed CTS PROT %d\n",</div><div class='ctx'> 			bss_conf-&gt;use_cts_prot);</div><div class='ctx'> 		if (bss_conf-&gt;use_cts_prot &amp;&amp;</div><div class='ctx'> 		    hw-&gt;conf.channel-&gt;band != IEEE80211_BAND_5GHZ)</div><div class='hunk'>@@ -2312,20 +2261,17 @@ static void ath9k_flush(struct ieee80211_hw *hw, bool drop)</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;sc-&gt;tx_complete_work);</div><div class='ctx'> </div><div class='ctx'> 	if (ah-&gt;ah_flags &amp; AH_UNPLUGGED) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_ANY, "Device has been unplugged!\n");</div><div class='add'>+		ath_dbg(common, ANY, "Device has been unplugged!\n");</div><div class='ctx'> 		mutex_unlock(&amp;sc-&gt;mutex);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sc-&gt;sc_flags &amp; SC_OP_INVALID) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_ANY, "Device not present\n");</div><div class='add'>+		ath_dbg(common, ANY, "Device not present\n");</div><div class='ctx'> 		mutex_unlock(&amp;sc-&gt;mutex);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (drop)</div><div class='del'>-		timeout = 1;</div><div class='del'>-</div><div class='ctx'> 	for (j = 0; j &lt; timeout; j++) {</div><div class='ctx'> 		bool npend = false;</div><div class='ctx'> </div><div class='hunk'>@@ -2343,21 +2289,22 @@ static void ath9k_flush(struct ieee80211_hw *hw, bool drop)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!npend)</div><div class='del'>-		    goto out;</div><div class='add'>+		    break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ath9k_ps_wakeup(sc);</div><div class='del'>-	spin_lock_bh(&amp;sc-&gt;sc_pcu_lock);</div><div class='del'>-	drain_txq = ath_drain_all_txq(sc, false);</div><div class='del'>-	spin_unlock_bh(&amp;sc-&gt;sc_pcu_lock);</div><div class='add'>+	if (drop) {</div><div class='add'>+		ath9k_ps_wakeup(sc);</div><div class='add'>+		spin_lock_bh(&amp;sc-&gt;sc_pcu_lock);</div><div class='add'>+		drain_txq = ath_drain_all_txq(sc, false);</div><div class='add'>+		spin_unlock_bh(&amp;sc-&gt;sc_pcu_lock);</div><div class='ctx'> </div><div class='del'>-	if (!drain_txq)</div><div class='del'>-		ath_reset(sc, false);</div><div class='add'>+		if (!drain_txq)</div><div class='add'>+			ath_reset(sc, false);</div><div class='ctx'> </div><div class='del'>-	ath9k_ps_restore(sc);</div><div class='del'>-	ieee80211_wake_queues(hw);</div><div class='add'>+		ath9k_ps_restore(sc);</div><div class='add'>+		ieee80211_wake_queues(hw);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	ieee80211_queue_delayed_work(hw, &amp;sc-&gt;tx_complete_work, 0);</div><div class='ctx'> 	mutex_unlock(&amp;sc-&gt;mutex);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c<br/>new file mode 100644<br/>index 000000000000..05c23ea4c633<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/mci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/mci.c</a></div><div class='hunk'>@@ -0,0 +1,668 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2010-2011 Atheros Communications Inc.</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 &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ath9k.h"</div><div class='add'>+#include "mci.h"</div><div class='add'>+</div><div class='add'>+static const u8 ath_mci_duty_cycle[] = { 0, 50, 60, 70, 80, 85, 90, 95, 98 };</div><div class='add'>+</div><div class='add'>+static struct ath_mci_profile_info*</div><div class='add'>+ath_mci_find_profile(struct ath_mci_profile *mci,</div><div class='add'>+		     struct ath_mci_profile_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ath_mci_profile_info *entry;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(entry, &amp;mci-&gt;info, list) {</div><div class='add'>+		if (entry-&gt;conn_handle == info-&gt;conn_handle)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return entry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ath_mci_add_profile(struct ath_common *common,</div><div class='add'>+				struct ath_mci_profile *mci,</div><div class='add'>+				struct ath_mci_profile_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ath_mci_profile_info *entry;</div><div class='add'>+</div><div class='add'>+	if ((mci-&gt;num_sco == ATH_MCI_MAX_SCO_PROFILE) &amp;&amp;</div><div class='add'>+	    (info-&gt;type == MCI_GPM_COEX_PROFILE_VOICE)) {</div><div class='add'>+		ath_dbg(common, MCI,</div><div class='add'>+			"Too many SCO profile, failed to add new profile\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (((NUM_PROF(mci) - mci-&gt;num_sco) == ATH_MCI_MAX_ACL_PROFILE) &amp;&amp;</div><div class='add'>+	    (info-&gt;type != MCI_GPM_COEX_PROFILE_VOICE)) {</div><div class='add'>+		ath_dbg(common, MCI,</div><div class='add'>+			"Too many ACL profile, failed to add new profile\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	entry = ath_mci_find_profile(mci, info);</div><div class='add'>+</div><div class='add'>+	if (entry)</div><div class='add'>+		memcpy(entry, info, 10);</div><div class='add'>+	else {</div><div class='add'>+		entry = kzalloc(sizeof(*entry), GFP_KERNEL);</div><div class='add'>+		if (!entry)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		memcpy(entry, info, 10);</div><div class='add'>+		INC_PROF(mci, info);</div><div class='add'>+		list_add_tail(&amp;info-&gt;list, &amp;mci-&gt;info);</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath_mci_del_profile(struct ath_common *common,</div><div class='add'>+				struct ath_mci_profile *mci,</div><div class='add'>+				struct ath_mci_profile_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ath_mci_profile_info *entry;</div><div class='add'>+</div><div class='add'>+	entry = ath_mci_find_profile(mci, info);</div><div class='add'>+</div><div class='add'>+	if (!entry) {</div><div class='add'>+		ath_dbg(common, MCI, "Profile to be deleted not found\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	DEC_PROF(mci, entry);</div><div class='add'>+	list_del(&amp;entry-&gt;list);</div><div class='add'>+	kfree(entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath_mci_flush_profile(struct ath_mci_profile *mci)</div><div class='add'>+{</div><div class='add'>+	struct ath_mci_profile_info *info, *tinfo;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(info, tinfo, &amp;mci-&gt;info, list) {</div><div class='add'>+		list_del(&amp;info-&gt;list);</div><div class='add'>+		DEC_PROF(mci, info);</div><div class='add'>+		kfree(info);</div><div class='add'>+	}</div><div class='add'>+	mci-&gt;aggr_limit = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath_mci_adjust_aggr_limit(struct ath_btcoex *btcoex)</div><div class='add'>+{</div><div class='add'>+	struct ath_mci_profile *mci = &amp;btcoex-&gt;mci;</div><div class='add'>+	u32 wlan_airtime = btcoex-&gt;btcoex_period *</div><div class='add'>+				(100 - btcoex-&gt;duty_cycle) / 100;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Scale: wlan_airtime is in ms, aggr_limit is in 0.25 ms.</div><div class='add'>+	 * When wlan_airtime is less than 4ms, aggregation limit has to be</div><div class='add'>+	 * adjusted half of wlan_airtime to ensure that the aggregation can fit</div><div class='add'>+	 * without collision with BT traffic.</div><div class='add'>+	 */</div><div class='add'>+	if ((wlan_airtime &lt;= 4) &amp;&amp;</div><div class='add'>+	    (!mci-&gt;aggr_limit || (mci-&gt;aggr_limit &gt; (2 * wlan_airtime))))</div><div class='add'>+		mci-&gt;aggr_limit = 2 * wlan_airtime;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath_mci_update_scheme(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='add'>+	struct ath_btcoex *btcoex = &amp;sc-&gt;btcoex;</div><div class='add'>+	struct ath_mci_profile *mci = &amp;btcoex-&gt;mci;</div><div class='add'>+	struct ath_mci_profile_info *info;</div><div class='add'>+	u32 num_profile = NUM_PROF(mci);</div><div class='add'>+</div><div class='add'>+	if (num_profile == 1) {</div><div class='add'>+		info = list_first_entry(&amp;mci-&gt;info,</div><div class='add'>+					struct ath_mci_profile_info,</div><div class='add'>+					list);</div><div class='add'>+		if (mci-&gt;num_sco &amp;&amp; info-&gt;T == 12) {</div><div class='add'>+			mci-&gt;aggr_limit = 8;</div><div class='add'>+			ath_dbg(common, MCI,</div><div class='add'>+				"Single SCO, aggregation limit 2 ms\n");</div><div class='add'>+		} else if ((info-&gt;type == MCI_GPM_COEX_PROFILE_BNEP) &amp;&amp;</div><div class='add'>+			   !info-&gt;master) {</div><div class='add'>+			btcoex-&gt;btcoex_period = 60;</div><div class='add'>+			ath_dbg(common, MCI,</div><div class='add'>+				"Single slave PAN/FTP, bt period 60 ms\n");</div><div class='add'>+		} else if ((info-&gt;type == MCI_GPM_COEX_PROFILE_HID) &amp;&amp;</div><div class='add'>+			 (info-&gt;T &gt; 0 &amp;&amp; info-&gt;T &lt; 50) &amp;&amp;</div><div class='add'>+			 (info-&gt;A &gt; 1 || info-&gt;W &gt; 1)) {</div><div class='add'>+			btcoex-&gt;duty_cycle = 30;</div><div class='add'>+			mci-&gt;aggr_limit = 8;</div><div class='add'>+			ath_dbg(common, MCI,</div><div class='add'>+				"Multiple attempt/timeout single HID "</div><div class='add'>+				"aggregation limit 2 ms dutycycle 30%%\n");</div><div class='add'>+		}</div><div class='add'>+	} else if ((num_profile == 2) &amp;&amp; (mci-&gt;num_hid == 2)) {</div><div class='add'>+		btcoex-&gt;duty_cycle = 30;</div><div class='add'>+		mci-&gt;aggr_limit = 8;</div><div class='add'>+		ath_dbg(common, MCI,</div><div class='add'>+			"Two HIDs aggregation limit 2 ms dutycycle 30%%\n");</div><div class='add'>+	} else if (num_profile &gt; 3) {</div><div class='add'>+		mci-&gt;aggr_limit = 6;</div><div class='add'>+		ath_dbg(common, MCI,</div><div class='add'>+			"Three or more profiles aggregation limit 1.5 ms\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IS_CHAN_2GHZ(sc-&gt;sc_ah-&gt;curchan)) {</div><div class='add'>+		if (IS_CHAN_HT(sc-&gt;sc_ah-&gt;curchan))</div><div class='add'>+			ath_mci_adjust_aggr_limit(btcoex);</div><div class='add'>+		else</div><div class='add'>+			btcoex-&gt;btcoex_period &gt;&gt;= 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath9k_hw_btcoex_disable(sc-&gt;sc_ah);</div><div class='add'>+	ath9k_btcoex_timer_pause(sc);</div><div class='add'>+</div><div class='add'>+	if (IS_CHAN_5GHZ(sc-&gt;sc_ah-&gt;curchan))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	btcoex-&gt;duty_cycle += (mci-&gt;num_bdr ? ATH_MCI_MAX_DUTY_CYCLE : 0);</div><div class='add'>+	if (btcoex-&gt;duty_cycle &gt; ATH_MCI_MAX_DUTY_CYCLE)</div><div class='add'>+		btcoex-&gt;duty_cycle = ATH_MCI_MAX_DUTY_CYCLE;</div><div class='add'>+</div><div class='add'>+	btcoex-&gt;btcoex_period *= 1000;</div><div class='add'>+	btcoex-&gt;btcoex_no_stomp =  btcoex-&gt;btcoex_period *</div><div class='add'>+					(100 - btcoex-&gt;duty_cycle) / 100;</div><div class='add'>+</div><div class='add'>+	ath9k_hw_btcoex_enable(sc-&gt;sc_ah);</div><div class='add'>+	ath9k_btcoex_timer_resume(sc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void ath_mci_cal_msg(struct ath_softc *sc, u8 opcode, u8 *rx_payload)</div><div class='add'>+{</div><div class='add'>+	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	u32 payload[4] = {0, 0, 0, 0};</div><div class='add'>+</div><div class='add'>+	switch (opcode) {</div><div class='add'>+	case MCI_GPM_BT_CAL_REQ:</div><div class='add'>+</div><div class='add'>+		ath_dbg(common, MCI, "MCI received BT_CAL_REQ\n");</div><div class='add'>+</div><div class='add'>+		if (ar9003_mci_state(ah, MCI_STATE_BT, NULL) == MCI_BT_AWAKE) {</div><div class='add'>+			ar9003_mci_state(ah, MCI_STATE_SET_BT_CAL_START, NULL);</div><div class='add'>+			ieee80211_queue_work(sc-&gt;hw, &amp;sc-&gt;hw_reset_work);</div><div class='add'>+		} else</div><div class='add'>+			ath_dbg(common, MCI, "MCI State mismatches: %d\n",</div><div class='add'>+				ar9003_mci_state(ah, MCI_STATE_BT, NULL));</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_GPM_BT_CAL_DONE:</div><div class='add'>+</div><div class='add'>+		ath_dbg(common, MCI, "MCI received BT_CAL_DONE\n");</div><div class='add'>+</div><div class='add'>+		if (ar9003_mci_state(ah, MCI_STATE_BT, NULL) == MCI_BT_CAL)</div><div class='add'>+			ath_dbg(common, MCI, "MCI error illegal!\n");</div><div class='add'>+		else</div><div class='add'>+			ath_dbg(common, MCI, "MCI BT not in CAL state\n");</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_GPM_BT_CAL_GRANT:</div><div class='add'>+</div><div class='add'>+		ath_dbg(common, MCI, "MCI received BT_CAL_GRANT\n");</div><div class='add'>+</div><div class='add'>+		/* Send WLAN_CAL_DONE for now */</div><div class='add'>+		ath_dbg(common, MCI, "MCI send WLAN_CAL_DONE\n");</div><div class='add'>+		MCI_GPM_SET_CAL_TYPE(payload, MCI_GPM_WLAN_CAL_DONE);</div><div class='add'>+		ar9003_mci_send_message(sc-&gt;sc_ah, MCI_GPM, 0, payload,</div><div class='add'>+					16, false, true);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		ath_dbg(common, MCI, "MCI Unknown GPM CAL message\n");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath_mci_process_profile(struct ath_softc *sc,</div><div class='add'>+				    struct ath_mci_profile_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='add'>+	struct ath_btcoex *btcoex = &amp;sc-&gt;btcoex;</div><div class='add'>+	struct ath_mci_profile *mci = &amp;btcoex-&gt;mci;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;start) {</div><div class='add'>+		if (!ath_mci_add_profile(common, mci, info))</div><div class='add'>+			return;</div><div class='add'>+	} else</div><div class='add'>+		ath_mci_del_profile(common, mci, info);</div><div class='add'>+</div><div class='add'>+	btcoex-&gt;btcoex_period = ATH_MCI_DEF_BT_PERIOD;</div><div class='add'>+	mci-&gt;aggr_limit = mci-&gt;num_sco ? 6 : 0;</div><div class='add'>+	if (NUM_PROF(mci)) {</div><div class='add'>+		btcoex-&gt;bt_stomp_type = ATH_BTCOEX_STOMP_LOW;</div><div class='add'>+		btcoex-&gt;duty_cycle = ath_mci_duty_cycle[NUM_PROF(mci)];</div><div class='add'>+	} else {</div><div class='add'>+		btcoex-&gt;bt_stomp_type = mci-&gt;num_mgmt ? ATH_BTCOEX_STOMP_ALL :</div><div class='add'>+							ATH_BTCOEX_STOMP_LOW;</div><div class='add'>+		btcoex-&gt;duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ath_mci_update_scheme(sc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath_mci_process_status(struct ath_softc *sc,</div><div class='add'>+				   struct ath_mci_profile_status *status)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='add'>+	struct ath_btcoex *btcoex = &amp;sc-&gt;btcoex;</div><div class='add'>+	struct ath_mci_profile *mci = &amp;btcoex-&gt;mci;</div><div class='add'>+	struct ath_mci_profile_info info;</div><div class='add'>+	int i = 0, old_num_mgmt = mci-&gt;num_mgmt;</div><div class='add'>+</div><div class='add'>+	/* Link status type are not handled */</div><div class='add'>+	if (status-&gt;is_link) {</div><div class='add'>+		ath_dbg(common, MCI, "Skip link type status update\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;info, 0, sizeof(struct ath_mci_profile_info));</div><div class='add'>+</div><div class='add'>+	info.conn_handle = status-&gt;conn_handle;</div><div class='add'>+	if (ath_mci_find_profile(mci, &amp;info)) {</div><div class='add'>+		ath_dbg(common, MCI,</div><div class='add'>+			"Skip non link state update for existing profile %d\n",</div><div class='add'>+			status-&gt;conn_handle);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (status-&gt;conn_handle &gt;= ATH_MCI_MAX_PROFILE) {</div><div class='add'>+		ath_dbg(common, MCI, "Ignore too many non-link update\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (status-&gt;is_critical)</div><div class='add'>+		__set_bit(status-&gt;conn_handle, mci-&gt;status);</div><div class='add'>+	else</div><div class='add'>+		__clear_bit(status-&gt;conn_handle, mci-&gt;status);</div><div class='add'>+</div><div class='add'>+	mci-&gt;num_mgmt = 0;</div><div class='add'>+	do {</div><div class='add'>+		if (test_bit(i, mci-&gt;status))</div><div class='add'>+			mci-&gt;num_mgmt++;</div><div class='add'>+	} while (++i &lt; ATH_MCI_MAX_PROFILE);</div><div class='add'>+</div><div class='add'>+	if (old_num_mgmt != mci-&gt;num_mgmt)</div><div class='add'>+		ath_mci_update_scheme(sc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath_mci_msg(struct ath_softc *sc, u8 opcode, u8 *rx_payload)</div><div class='add'>+{</div><div class='add'>+	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='add'>+	struct ath_mci_profile_info profile_info;</div><div class='add'>+	struct ath_mci_profile_status profile_status;</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='add'>+	u32 version;</div><div class='add'>+	u8 major;</div><div class='add'>+	u8 minor;</div><div class='add'>+	u32 seq_num;</div><div class='add'>+</div><div class='add'>+	switch (opcode) {</div><div class='add'>+</div><div class='add'>+	case MCI_GPM_COEX_VERSION_QUERY:</div><div class='add'>+		ath_dbg(common, MCI, "MCI Recv GPM COEX Version Query\n");</div><div class='add'>+		version = ar9003_mci_state(ah,</div><div class='add'>+				MCI_STATE_SEND_WLAN_COEX_VERSION, NULL);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_GPM_COEX_VERSION_RESPONSE:</div><div class='add'>+		ath_dbg(common, MCI, "MCI Recv GPM COEX Version Response\n");</div><div class='add'>+		major = *(rx_payload + MCI_GPM_COEX_B_MAJOR_VERSION);</div><div class='add'>+		minor = *(rx_payload + MCI_GPM_COEX_B_MINOR_VERSION);</div><div class='add'>+		ath_dbg(common, MCI, "MCI BT Coex version: %d.%d\n",</div><div class='add'>+			major, minor);</div><div class='add'>+		version = (major &lt;&lt; 8) + minor;</div><div class='add'>+		version = ar9003_mci_state(ah,</div><div class='add'>+			  MCI_STATE_SET_BT_COEX_VERSION, &amp;version);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_GPM_COEX_STATUS_QUERY:</div><div class='add'>+		ath_dbg(common, MCI,</div><div class='add'>+			"MCI Recv GPM COEX Status Query = 0x%02x\n",</div><div class='add'>+			*(rx_payload + MCI_GPM_COEX_B_WLAN_BITMAP));</div><div class='add'>+		ar9003_mci_state(ah,</div><div class='add'>+		MCI_STATE_SEND_WLAN_CHANNELS, NULL);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_GPM_COEX_BT_PROFILE_INFO:</div><div class='add'>+		ath_dbg(common, MCI, "MCI Recv GPM Coex BT profile info\n");</div><div class='add'>+		memcpy(&amp;profile_info,</div><div class='add'>+		       (rx_payload + MCI_GPM_COEX_B_PROFILE_TYPE), 10);</div><div class='add'>+</div><div class='add'>+		if ((profile_info.type == MCI_GPM_COEX_PROFILE_UNKNOWN)</div><div class='add'>+		    || (profile_info.type &gt;=</div><div class='add'>+					    MCI_GPM_COEX_PROFILE_MAX)) {</div><div class='add'>+</div><div class='add'>+			ath_dbg(common, MCI,</div><div class='add'>+				"illegal profile type = %d, state = %d\n",</div><div class='add'>+				profile_info.type,</div><div class='add'>+				profile_info.start);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ath_mci_process_profile(sc, &amp;profile_info);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCI_GPM_COEX_BT_STATUS_UPDATE:</div><div class='add'>+		profile_status.is_link = *(rx_payload +</div><div class='add'>+					   MCI_GPM_COEX_B_STATUS_TYPE);</div><div class='add'>+		profile_status.conn_handle = *(rx_payload +</div><div class='add'>+					       MCI_GPM_COEX_B_STATUS_LINKID);</div><div class='add'>+		profile_status.is_critical = *(rx_payload +</div><div class='add'>+					       MCI_GPM_COEX_B_STATUS_STATE);</div><div class='add'>+</div><div class='add'>+		seq_num = *((u32 *)(rx_payload + 12));</div><div class='add'>+		ath_dbg(common, MCI,</div><div class='add'>+			"MCI Recv GPM COEX BT_Status_Update: is_link=%d, linkId=%d, state=%d, SEQ=%d\n",</div><div class='add'>+			profile_status.is_link, profile_status.conn_handle,</div><div class='add'>+			profile_status.is_critical, seq_num);</div><div class='add'>+</div><div class='add'>+		ath_mci_process_status(sc, &amp;profile_status);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		ath_dbg(common, MCI, "MCI Unknown GPM COEX message = 0x%02x\n",</div><div class='add'>+			opcode);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ath_mci_buf_alloc(struct ath_softc *sc, struct ath_mci_buf *buf)</div><div class='add'>+{</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	buf-&gt;bf_addr = dma_alloc_coherent(sc-&gt;dev, buf-&gt;bf_len,</div><div class='add'>+					  &amp;buf-&gt;bf_paddr, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (buf-&gt;bf_addr == NULL) {</div><div class='add'>+		error = -ENOMEM;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	memset(buf, 0, sizeof(*buf));</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath_mci_buf_free(struct ath_softc *sc, struct ath_mci_buf *buf)</div><div class='add'>+{</div><div class='add'>+	if (buf-&gt;bf_addr) {</div><div class='add'>+		dma_free_coherent(sc-&gt;dev, buf-&gt;bf_len, buf-&gt;bf_addr,</div><div class='add'>+							buf-&gt;bf_paddr);</div><div class='add'>+		memset(buf, 0, sizeof(*buf));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ath_mci_setup(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='add'>+	struct ath_mci_coex *mci = &amp;sc-&gt;mci_coex;</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mci-&gt;sched_buf.bf_len = ATH_MCI_SCHED_BUF_SIZE + ATH_MCI_GPM_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	if (ath_mci_buf_alloc(sc, &amp;mci-&gt;sched_buf)) {</div><div class='add'>+		ath_dbg(common, FATAL, "MCI buffer alloc failed\n");</div><div class='add'>+		error = -ENOMEM;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mci-&gt;sched_buf.bf_len = ATH_MCI_SCHED_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	memset(mci-&gt;sched_buf.bf_addr, MCI_GPM_RSVD_PATTERN,</div><div class='add'>+						mci-&gt;sched_buf.bf_len);</div><div class='add'>+</div><div class='add'>+	mci-&gt;gpm_buf.bf_len = ATH_MCI_GPM_BUF_SIZE;</div><div class='add'>+	mci-&gt;gpm_buf.bf_addr = (u8 *)mci-&gt;sched_buf.bf_addr +</div><div class='add'>+							mci-&gt;sched_buf.bf_len;</div><div class='add'>+	mci-&gt;gpm_buf.bf_paddr = mci-&gt;sched_buf.bf_paddr + mci-&gt;sched_buf.bf_len;</div><div class='add'>+</div><div class='add'>+	/* initialize the buffer */</div><div class='add'>+	memset(mci-&gt;gpm_buf.bf_addr, MCI_GPM_RSVD_PATTERN, mci-&gt;gpm_buf.bf_len);</div><div class='add'>+</div><div class='add'>+	ar9003_mci_setup(sc-&gt;sc_ah, mci-&gt;gpm_buf.bf_paddr,</div><div class='add'>+			 mci-&gt;gpm_buf.bf_addr, (mci-&gt;gpm_buf.bf_len &gt;&gt; 4),</div><div class='add'>+			 mci-&gt;sched_buf.bf_paddr);</div><div class='add'>+fail:</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath_mci_cleanup(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='add'>+	struct ath_mci_coex *mci = &amp;sc-&gt;mci_coex;</div><div class='add'>+</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * both schedule and gpm buffers will be released</div><div class='add'>+	 */</div><div class='add'>+	ath_mci_buf_free(sc, &amp;mci-&gt;sched_buf);</div><div class='add'>+	ar9003_mci_cleanup(ah);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ath_mci_intr(struct ath_softc *sc)</div><div class='add'>+{</div><div class='add'>+	struct ath_mci_coex *mci = &amp;sc-&gt;mci_coex;</div><div class='add'>+	struct ath_hw *ah = sc-&gt;sc_ah;</div><div class='add'>+	struct ath_common *common = ath9k_hw_common(ah);</div><div class='add'>+	u32 mci_int, mci_int_rxmsg;</div><div class='add'>+	u32 offset, subtype, opcode;</div><div class='add'>+	u32 *pgpm;</div><div class='add'>+	u32 more_data = MCI_GPM_MORE;</div><div class='add'>+	bool skip_gpm = false;</div><div class='add'>+</div><div class='add'>+	if (!ATH9K_HW_CAP_MCI)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ar9003_mci_get_interrupt(sc-&gt;sc_ah, &amp;mci_int, &amp;mci_int_rxmsg);</div><div class='add'>+</div><div class='add'>+	if (ar9003_mci_state(ah, MCI_STATE_ENABLE, NULL) == 0) {</div><div class='add'>+</div><div class='add'>+		ar9003_mci_state(sc-&gt;sc_ah, MCI_STATE_INIT_GPM_OFFSET, NULL);</div><div class='add'>+		ath_dbg(common, MCI, "MCI interrupt but MCI disabled\n");</div><div class='add'>+</div><div class='add'>+		ath_dbg(common, MCI,</div><div class='add'>+			"MCI interrupt: intr = 0x%x, intr_rxmsg = 0x%x\n",</div><div class='add'>+			mci_int, mci_int_rxmsg);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mci_int_rxmsg &amp; AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE) {</div><div class='add'>+		u32 payload[4] = { 0xffffffff, 0xffffffff,</div><div class='add'>+				   0xffffffff, 0xffffff00};</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The following REMOTE_RESET and SYS_WAKING used to sent</div><div class='add'>+		 * only when BT wake up. Now they are always sent, as a</div><div class='add'>+		 * recovery method to reset BT MCI's RX alignment.</div><div class='add'>+		 */</div><div class='add'>+		ath_dbg(common, MCI, "MCI interrupt send REMOTE_RESET\n");</div><div class='add'>+</div><div class='add'>+		ar9003_mci_send_message(ah, MCI_REMOTE_RESET, 0,</div><div class='add'>+					payload, 16, true, false);</div><div class='add'>+		ath_dbg(common, MCI, "MCI interrupt send SYS_WAKING\n");</div><div class='add'>+		ar9003_mci_send_message(ah, MCI_SYS_WAKING, 0,</div><div class='add'>+					NULL, 0, true, false);</div><div class='add'>+</div><div class='add'>+		mci_int_rxmsg &amp;= ~AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE;</div><div class='add'>+		ar9003_mci_state(ah, MCI_STATE_RESET_REQ_WAKE, NULL);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * always do this for recovery and 2G/5G toggling and LNA_TRANS</div><div class='add'>+		 */</div><div class='add'>+		ath_dbg(common, MCI, "MCI Set BT state to AWAKE\n");</div><div class='add'>+		ar9003_mci_state(ah, MCI_STATE_SET_BT_AWAKE, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Processing SYS_WAKING/SYS_SLEEPING */</div><div class='add'>+	if (mci_int_rxmsg &amp; AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING) {</div><div class='add'>+		mci_int_rxmsg &amp;= ~AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING;</div><div class='add'>+</div><div class='add'>+		if (ar9003_mci_state(ah, MCI_STATE_BT, NULL) == MCI_BT_SLEEP) {</div><div class='add'>+</div><div class='add'>+			if (ar9003_mci_state(ah, MCI_STATE_REMOTE_SLEEP, NULL)</div><div class='add'>+					== MCI_BT_SLEEP)</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI BT stays in sleep mode\n");</div><div class='add'>+			else {</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI Set BT state to AWAKE\n");</div><div class='add'>+				ar9003_mci_state(ah,</div><div class='add'>+						 MCI_STATE_SET_BT_AWAKE, NULL);</div><div class='add'>+			}</div><div class='add'>+		} else</div><div class='add'>+			ath_dbg(common, MCI, "MCI BT stays in AWAKE mode\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mci_int_rxmsg &amp; AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING) {</div><div class='add'>+</div><div class='add'>+		mci_int_rxmsg &amp;= ~AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING;</div><div class='add'>+</div><div class='add'>+		if (ar9003_mci_state(ah, MCI_STATE_BT, NULL) == MCI_BT_AWAKE) {</div><div class='add'>+</div><div class='add'>+			if (ar9003_mci_state(ah, MCI_STATE_REMOTE_SLEEP, NULL)</div><div class='add'>+					== MCI_BT_AWAKE)</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI BT stays in AWAKE mode\n");</div><div class='add'>+			else {</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI SetBT state to SLEEP\n");</div><div class='add'>+				ar9003_mci_state(ah, MCI_STATE_SET_BT_SLEEP,</div><div class='add'>+						 NULL);</div><div class='add'>+			}</div><div class='add'>+		} else</div><div class='add'>+			ath_dbg(common, MCI, "MCI BT stays in SLEEP mode\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((mci_int &amp; AR_MCI_INTERRUPT_RX_INVALID_HDR) ||</div><div class='add'>+	    (mci_int &amp; AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT)) {</div><div class='add'>+</div><div class='add'>+		ath_dbg(common, MCI, "MCI RX broken, skip GPM msgs\n");</div><div class='add'>+		ar9003_mci_state(ah, MCI_STATE_RECOVER_RX, NULL);</div><div class='add'>+		skip_gpm = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mci_int_rxmsg &amp; AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO) {</div><div class='add'>+</div><div class='add'>+		mci_int_rxmsg &amp;= ~AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO;</div><div class='add'>+		offset = ar9003_mci_state(ah, MCI_STATE_LAST_SCHD_MSG_OFFSET,</div><div class='add'>+					  NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mci_int_rxmsg &amp; AR_MCI_INTERRUPT_RX_MSG_GPM) {</div><div class='add'>+</div><div class='add'>+		mci_int_rxmsg &amp;= ~AR_MCI_INTERRUPT_RX_MSG_GPM;</div><div class='add'>+</div><div class='add'>+		while (more_data == MCI_GPM_MORE) {</div><div class='add'>+</div><div class='add'>+			pgpm = mci-&gt;gpm_buf.bf_addr;</div><div class='add'>+			offset = ar9003_mci_state(ah,</div><div class='add'>+					MCI_STATE_NEXT_GPM_OFFSET, &amp;more_data);</div><div class='add'>+</div><div class='add'>+			if (offset == MCI_GPM_INVALID)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			pgpm += (offset &gt;&gt; 2);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * The first dword is timer.</div><div class='add'>+			 * The real data starts from 2nd dword.</div><div class='add'>+			 */</div><div class='add'>+</div><div class='add'>+			subtype = MCI_GPM_TYPE(pgpm);</div><div class='add'>+			opcode = MCI_GPM_OPCODE(pgpm);</div><div class='add'>+</div><div class='add'>+			if (!skip_gpm) {</div><div class='add'>+</div><div class='add'>+				if (MCI_GPM_IS_CAL_TYPE(subtype))</div><div class='add'>+					ath_mci_cal_msg(sc, subtype,</div><div class='add'>+							(u8 *) pgpm);</div><div class='add'>+				else {</div><div class='add'>+					switch (subtype) {</div><div class='add'>+					case MCI_GPM_COEX_AGENT:</div><div class='add'>+						ath_mci_msg(sc, opcode,</div><div class='add'>+							    (u8 *) pgpm);</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'>+			MCI_GPM_RECYCLE(pgpm);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mci_int_rxmsg &amp; AR_MCI_INTERRUPT_RX_HW_MSG_MASK) {</div><div class='add'>+</div><div class='add'>+		if (mci_int_rxmsg &amp; AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL)</div><div class='add'>+			mci_int_rxmsg &amp;= ~AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL;</div><div class='add'>+</div><div class='add'>+		if (mci_int_rxmsg &amp; AR_MCI_INTERRUPT_RX_MSG_LNA_INFO) {</div><div class='add'>+			mci_int_rxmsg &amp;= ~AR_MCI_INTERRUPT_RX_MSG_LNA_INFO;</div><div class='add'>+			ath_dbg(common, MCI, "MCI LNA_INFO\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (mci_int_rxmsg &amp; AR_MCI_INTERRUPT_RX_MSG_CONT_INFO) {</div><div class='add'>+</div><div class='add'>+			int value_dbm = ar9003_mci_state(ah,</div><div class='add'>+					MCI_STATE_CONT_RSSI_POWER, NULL);</div><div class='add'>+</div><div class='add'>+			mci_int_rxmsg &amp;= ~AR_MCI_INTERRUPT_RX_MSG_CONT_INFO;</div><div class='add'>+</div><div class='add'>+			if (ar9003_mci_state(ah, MCI_STATE_CONT_TXRX, NULL))</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI CONT_INFO: (tx) pri = %d, pwr = %d dBm\n",</div><div class='add'>+					ar9003_mci_state(ah,</div><div class='add'>+						MCI_STATE_CONT_PRIORITY, NULL),</div><div class='add'>+					value_dbm);</div><div class='add'>+			else</div><div class='add'>+				ath_dbg(common, MCI,</div><div class='add'>+					"MCI CONT_INFO: (rx) pri = %d,pwr = %d dBm\n",</div><div class='add'>+					ar9003_mci_state(ah,</div><div class='add'>+						MCI_STATE_CONT_PRIORITY, NULL),</div><div class='add'>+					value_dbm);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (mci_int_rxmsg &amp; AR_MCI_INTERRUPT_RX_MSG_CONT_NACK) {</div><div class='add'>+			mci_int_rxmsg &amp;= ~AR_MCI_INTERRUPT_RX_MSG_CONT_NACK;</div><div class='add'>+			ath_dbg(common, MCI, "MCI CONT_NACK\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (mci_int_rxmsg &amp; AR_MCI_INTERRUPT_RX_MSG_CONT_RST) {</div><div class='add'>+			mci_int_rxmsg &amp;= ~AR_MCI_INTERRUPT_RX_MSG_CONT_RST;</div><div class='add'>+			ath_dbg(common, MCI, "MCI CONT_RST\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((mci_int &amp; AR_MCI_INTERRUPT_RX_INVALID_HDR) ||</div><div class='add'>+	    (mci_int &amp; AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT))</div><div class='add'>+		mci_int &amp;= ~(AR_MCI_INTERRUPT_RX_INVALID_HDR |</div><div class='add'>+			     AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (mci_int_rxmsg &amp; 0xfffffffe)</div><div class='add'>+		ath_dbg(common, MCI, "MCI not processed mci_int_rxmsg = 0x%x\n",</div><div class='add'>+			mci_int_rxmsg);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/mci.h b/drivers/net/wireless/ath/ath9k/mci.h<br/>new file mode 100644<br/>index 000000000000..29e3e51d078f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/mci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/mci.h</a></div><div class='hunk'>@@ -0,0 +1,134 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2010-2011 Atheros Communications Inc.</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'>+#ifndef MCI_H</div><div class='add'>+#define MCI_H</div><div class='add'>+</div><div class='add'>+#define ATH_MCI_SCHED_BUF_SIZE		(16 * 16) /* 16 entries, 4 dword each */</div><div class='add'>+#define ATH_MCI_GPM_MAX_ENTRY		16</div><div class='add'>+#define ATH_MCI_GPM_BUF_SIZE		(ATH_MCI_GPM_MAX_ENTRY * 16)</div><div class='add'>+#define ATH_MCI_DEF_BT_PERIOD		40</div><div class='add'>+#define ATH_MCI_BDR_DUTY_CYCLE		20</div><div class='add'>+#define ATH_MCI_MAX_DUTY_CYCLE		90</div><div class='add'>+</div><div class='add'>+#define ATH_MCI_DEF_AGGR_LIMIT		6 /* in 0.24 ms */</div><div class='add'>+#define ATH_MCI_MAX_ACL_PROFILE		7</div><div class='add'>+#define ATH_MCI_MAX_SCO_PROFILE		1</div><div class='add'>+#define ATH_MCI_MAX_PROFILE		(ATH_MCI_MAX_ACL_PROFILE +\</div><div class='add'>+					 ATH_MCI_MAX_SCO_PROFILE)</div><div class='add'>+</div><div class='add'>+#define INC_PROF(_mci, _info) do {		 \</div><div class='add'>+		switch (_info-&gt;type) {		 \</div><div class='add'>+		case MCI_GPM_COEX_PROFILE_RFCOMM:\</div><div class='add'>+			_mci-&gt;num_other_acl++;	 \</div><div class='add'>+			break;			 \</div><div class='add'>+		case MCI_GPM_COEX_PROFILE_A2DP:	 \</div><div class='add'>+			_mci-&gt;num_a2dp++;	 \</div><div class='add'>+			if (!_info-&gt;edr)	 \</div><div class='add'>+				_mci-&gt;num_bdr++; \</div><div class='add'>+			break;			 \</div><div class='add'>+		case MCI_GPM_COEX_PROFILE_HID:	 \</div><div class='add'>+			_mci-&gt;num_hid++;	 \</div><div class='add'>+			break;			 \</div><div class='add'>+		case MCI_GPM_COEX_PROFILE_BNEP:	 \</div><div class='add'>+			_mci-&gt;num_pan++;	 \</div><div class='add'>+			break;			 \</div><div class='add'>+		case MCI_GPM_COEX_PROFILE_VOICE: \</div><div class='add'>+			_mci-&gt;num_sco++;	 \</div><div class='add'>+			break;			 \</div><div class='add'>+		default:			 \</div><div class='add'>+			break;			 \</div><div class='add'>+		}				 \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define DEC_PROF(_mci, _info) do {		 \</div><div class='add'>+		switch (_info-&gt;type) {		 \</div><div class='add'>+		case MCI_GPM_COEX_PROFILE_RFCOMM:\</div><div class='add'>+			_mci-&gt;num_other_acl--;	 \</div><div class='add'>+			break;			 \</div><div class='add'>+		case MCI_GPM_COEX_PROFILE_A2DP:	 \</div><div class='add'>+			_mci-&gt;num_a2dp--;	 \</div><div class='add'>+			if (!_info-&gt;edr)	 \</div><div class='add'>+				_mci-&gt;num_bdr--; \</div><div class='add'>+			break;			 \</div><div class='add'>+		case MCI_GPM_COEX_PROFILE_HID:	 \</div><div class='add'>+			_mci-&gt;num_hid--;	 \</div><div class='add'>+			break;			 \</div><div class='add'>+		case MCI_GPM_COEX_PROFILE_BNEP:	 \</div><div class='add'>+			_mci-&gt;num_pan--;	 \</div><div class='add'>+			break;			 \</div><div class='add'>+		case MCI_GPM_COEX_PROFILE_VOICE: \</div><div class='add'>+			_mci-&gt;num_sco--;	 \</div><div class='add'>+			break;			 \</div><div class='add'>+		default:			 \</div><div class='add'>+			break;			 \</div><div class='add'>+		}				 \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define NUM_PROF(_mci)	(_mci-&gt;num_other_acl + _mci-&gt;num_a2dp + \</div><div class='add'>+			 _mci-&gt;num_hid + _mci-&gt;num_pan + _mci-&gt;num_sco)</div><div class='add'>+</div><div class='add'>+struct ath_mci_profile_info {</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 conn_handle;</div><div class='add'>+	bool start;</div><div class='add'>+	bool master;</div><div class='add'>+	bool edr;</div><div class='add'>+	u8 voice_type;</div><div class='add'>+	u16 T;		/* Voice: Tvoice, HID: Tsniff,        in slots */</div><div class='add'>+	u8 W;		/* Voice: Wvoice, HID: Sniff timeout, in slots */</div><div class='add'>+	u8 A;		/*		  HID: Sniff attempt, in slots */</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath_mci_profile_status {</div><div class='add'>+	bool is_critical;</div><div class='add'>+	bool is_link;</div><div class='add'>+	u8 conn_handle;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath_mci_profile {</div><div class='add'>+	struct list_head info;</div><div class='add'>+	DECLARE_BITMAP(status, ATH_MCI_MAX_PROFILE);</div><div class='add'>+	u16 aggr_limit;</div><div class='add'>+	u8 num_mgmt;</div><div class='add'>+	u8 num_sco;</div><div class='add'>+	u8 num_a2dp;</div><div class='add'>+	u8 num_hid;</div><div class='add'>+	u8 num_pan;</div><div class='add'>+	u8 num_other_acl;</div><div class='add'>+	u8 num_bdr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct ath_mci_buf {</div><div class='add'>+	void *bf_addr;		/* virtual addr of desc */</div><div class='add'>+	dma_addr_t bf_paddr;    /* physical addr of buffer */</div><div class='add'>+	u32 bf_len;		/* len of data */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ath_mci_coex {</div><div class='add'>+	atomic_t mci_cal_flag;</div><div class='add'>+	struct ath_mci_buf sched_buf;</div><div class='add'>+	struct ath_mci_buf gpm_buf;</div><div class='add'>+	u32 bt_cal_start;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ath_mci_flush_profile(struct ath_mci_profile *mci);</div><div class='add'>+int ath_mci_setup(struct ath_softc *sc);</div><div class='add'>+void ath_mci_cleanup(struct ath_softc *sc);</div><div class='add'>+void ath_mci_intr(struct ath_softc *sc);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c<br/>index 2dcdf63cb390..77dc327def8d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/pci.c</a></div><div class='hunk'>@@ -121,7 +121,7 @@ static void ath_pci_aspm_init(struct ath_common *common)</div><div class='ctx'> 	if (!parent)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (ah-&gt;btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE) {</div><div class='add'>+	if (ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_NONE) {</div><div class='ctx'> 		/* Bluetooth coexistance requires disabling ASPM. */</div><div class='ctx'> 		pci_read_config_byte(pdev, pos + PCI_EXP_LNKCTL, &amp;aspm);</div><div class='ctx'> 		aspm &amp;= ~(PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1);</div><div class='hunk'>@@ -307,12 +307,11 @@ static int ath_pci_suspend(struct device *device)</div><div class='ctx'> 	struct ieee80211_hw *hw = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct ath_softc *sc = hw-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	ath9k_hw_set_gpio(sc-&gt;sc_ah, sc-&gt;sc_ah-&gt;led_pin, 1);</div><div class='del'>-</div><div class='ctx'> 	/* The device has to be moved to FULLSLEEP forcibly.</div><div class='ctx'> 	 * Otherwise the chip never moved to full sleep,</div><div class='ctx'> 	 * when no interface is up.</div><div class='ctx'> 	 */</div><div class='add'>+	ath9k_hw_disable(sc-&gt;sc_ah);</div><div class='ctx'> 	ath9k_hw_setpower(sc-&gt;sc_ah, ATH9K_PM_FULL_SLEEP);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -321,8 +320,6 @@ static int ath_pci_suspend(struct device *device)</div><div class='ctx'> static int ath_pci_resume(struct device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = to_pci_dev(device);</div><div class='del'>-	struct ieee80211_hw *hw = pci_get_drvdata(pdev);</div><div class='del'>-	struct ath_softc *sc = hw-&gt;priv;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -334,22 +331,6 @@ static int ath_pci_resume(struct device *device)</div><div class='ctx'> 	if ((val &amp; 0x0000ff00) != 0)</div><div class='ctx'> 		pci_write_config_dword(pdev, 0x40, val &amp; 0xffff00ff);</div><div class='ctx'> </div><div class='del'>-	ath9k_ps_wakeup(sc);</div><div class='del'>-	/* Enable LED */</div><div class='del'>-	ath9k_hw_cfg_output(sc-&gt;sc_ah, sc-&gt;sc_ah-&gt;led_pin,</div><div class='del'>-			    AR_GPIO_OUTPUT_MUX_AS_OUTPUT);</div><div class='del'>-	ath9k_hw_set_gpio(sc-&gt;sc_ah, sc-&gt;sc_ah-&gt;led_pin, 0);</div><div class='del'>-</div><div class='del'>-	  /*</div><div class='del'>-	   * Reset key cache to sane defaults (all entries cleared) instead of</div><div class='del'>-	   * semi-random values after suspend/resume.</div><div class='del'>-	   */</div><div class='del'>-	ath9k_cmn_init_crypto(sc-&gt;sc_ah);</div><div class='del'>-	ath9k_ps_restore(sc);</div><div class='del'>-</div><div class='del'>-	sc-&gt;ps_idle = true;</div><div class='del'>-	ath_radio_disable(sc, hw);</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/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c<br/>index 528d5f3e868c..b3c3798fe513 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/rc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/rc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/rc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/rc.c</a></div><div class='hunk'>@@ -1199,7 +1199,7 @@ struct ath_rate_table *ath_choose_rate_table(struct ath_softc *sc,</div><div class='ctx'> 			return &amp;ar5416_11na_ratetable;</div><div class='ctx'> 		return &amp;ar5416_11a_ratetable;</div><div class='ctx'> 	default:</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG, "Invalid band\n");</div><div class='add'>+		ath_dbg(common, CONFIG, "Invalid band\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1276,8 +1276,7 @@ static void ath_rc_init(struct ath_softc *sc,</div><div class='ctx'> 					ath_rc_priv-&gt;valid_rate_index[k-1];</div><div class='ctx'> 	ath_rc_priv-&gt;rate_table = rate_table;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_CONFIG,</div><div class='del'>-		"RC Initialized with capabilities: 0x%x\n",</div><div class='add'>+	ath_dbg(common, CONFIG, "RC Initialized with capabilities: 0x%x\n",</div><div class='ctx'> 		ath_rc_priv-&gt;ht_cap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1474,7 +1473,7 @@ static void ath_rate_update(void *priv, struct ieee80211_supported_band *sband,</div><div class='ctx'> 						   oper_cw40, oper_sgi);</div><div class='ctx'> 			ath_rc_init(sc, priv_sta, sband, sta, rate_table);</div><div class='ctx'> </div><div class='del'>-			ath_dbg(ath9k_hw_common(sc-&gt;sc_ah), ATH_DBG_CONFIG,</div><div class='add'>+			ath_dbg(ath9k_hw_common(sc-&gt;sc_ah), CONFIG,</div><div class='ctx'> 				"Operating HT Bandwidth changed to: %d\n",</div><div class='ctx'> 				sc-&gt;hw-&gt;conf.channel_type);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c<br/>index 67b862cdae6d..0e666fbe0842 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/recv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/recv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/recv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/recv.c</a></div><div class='hunk'>@@ -172,7 +172,7 @@ static void ath_rx_addbuffer_edma(struct ath_softc *sc,</div><div class='ctx'> 	u32 nbuf = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(&amp;sc-&gt;rx.rxbuf)) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_QUEUE, "No free rx buf available\n");</div><div class='add'>+		ath_dbg(common, QUEUE, "No free rx buf available\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -337,7 +337,7 @@ int ath_rx_init(struct ath_softc *sc, int nbufs)</div><div class='ctx'> 	if (sc-&gt;sc_ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_EDMA) {</div><div class='ctx'> 		return ath_rx_edma_init(sc, nbufs);</div><div class='ctx'> 	} else {</div><div class='del'>-		ath_dbg(common, ATH_DBG_CONFIG, "cachelsz %u rxbufsize %u\n",</div><div class='add'>+		ath_dbg(common, CONFIG, "cachelsz %u rxbufsize %u\n",</div><div class='ctx'> 			common-&gt;cachelsz, common-&gt;rx_bufsize);</div><div class='ctx'> </div><div class='ctx'> 		/* Initialize rx descriptors */</div><div class='hunk'>@@ -475,7 +475,6 @@ u32 ath_calcrxfilter(struct ath_softc *sc)</div><div class='ctx'> </div><div class='ctx'> 	return rfilt;</div><div class='ctx'> </div><div class='del'>-#undef RX_FILTER_PRESERVE</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ath_startrecv(struct ath_softc *sc)</div><div class='hunk'>@@ -592,7 +591,7 @@ static void ath_rx_ps_beacon(struct ath_softc *sc, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	if (sc-&gt;ps_flags &amp; PS_BEACON_SYNC) {</div><div class='ctx'> 		sc-&gt;ps_flags &amp;= ~PS_BEACON_SYNC;</div><div class='del'>-		ath_dbg(common, ATH_DBG_PS,</div><div class='add'>+		ath_dbg(common, PS,</div><div class='ctx'> 			"Reconfigure Beacon timers based on timestamp from the AP\n");</div><div class='ctx'> 		ath_set_beacon(sc);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -605,7 +604,7 @@ static void ath_rx_ps_beacon(struct ath_softc *sc, struct sk_buff *skb)</div><div class='ctx'> 		 * a backup trigger for returning into NETWORK SLEEP state,</div><div class='ctx'> 		 * so we are waiting for it as well.</div><div class='ctx'> 		 */</div><div class='del'>-		ath_dbg(common, ATH_DBG_PS,</div><div class='add'>+		ath_dbg(common, PS,</div><div class='ctx'> 			"Received DTIM beacon indicating buffered broadcast/multicast frame(s)\n");</div><div class='ctx'> 		sc-&gt;ps_flags |= PS_WAIT_FOR_CAB | PS_WAIT_FOR_BEACON;</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -618,8 +617,7 @@ static void ath_rx_ps_beacon(struct ath_softc *sc, struct sk_buff *skb)</div><div class='ctx'> 		 * been delivered.</div><div class='ctx'> 		 */</div><div class='ctx'> 		sc-&gt;ps_flags &amp;= ~PS_WAIT_FOR_CAB;</div><div class='del'>-		ath_dbg(common, ATH_DBG_PS,</div><div class='del'>-			"PS wait for CAB frames timed out\n");</div><div class='add'>+		ath_dbg(common, PS, "PS wait for CAB frames timed out\n");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -644,13 +642,13 @@ static void ath_rx_ps(struct ath_softc *sc, struct sk_buff *skb, bool mybeacon)</div><div class='ctx'> 		 * point.</div><div class='ctx'> 		 */</div><div class='ctx'> 		sc-&gt;ps_flags &amp;= ~(PS_WAIT_FOR_CAB | PS_WAIT_FOR_BEACON);</div><div class='del'>-		ath_dbg(common, ATH_DBG_PS,</div><div class='add'>+		ath_dbg(common, PS,</div><div class='ctx'> 			"All PS CAB frames received, back to sleep\n");</div><div class='ctx'> 	} else if ((sc-&gt;ps_flags &amp; PS_WAIT_FOR_PSPOLL_DATA) &amp;&amp;</div><div class='ctx'> 		   !is_multicast_ether_addr(hdr-&gt;addr1) &amp;&amp;</div><div class='ctx'> 		   !ieee80211_has_morefrags(hdr-&gt;frame_control)) {</div><div class='ctx'> 		sc-&gt;ps_flags &amp;= ~PS_WAIT_FOR_PSPOLL_DATA;</div><div class='del'>-		ath_dbg(common, ATH_DBG_PS,</div><div class='add'>+		ath_dbg(common, PS,</div><div class='ctx'> 			"Going back to sleep after having received PS-Poll data (0x%lx)\n",</div><div class='ctx'> 			sc-&gt;ps_flags &amp; (PS_WAIT_FOR_BEACON |</div><div class='ctx'> 					PS_WAIT_FOR_CAB |</div><div class='hunk'>@@ -933,7 +931,7 @@ static int ath9k_process_rate(struct ath_common *common,</div><div class='ctx'> 	 * No valid hardware bitrate found -- we should not get here</div><div class='ctx'> 	 * because hardware has already validated this frame as OK.</div><div class='ctx'> 	 */</div><div class='del'>-	ath_dbg(common, ATH_DBG_ANY,</div><div class='add'>+	ath_dbg(common, ANY,</div><div class='ctx'> 		"unsupported hw bitrate detected 0x%02x using 1 Mbit\n",</div><div class='ctx'> 		rx_stats-&gt;rs_rate);</div><div class='ctx'> </div><div class='hunk'>@@ -1824,6 +1822,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)</div><div class='ctx'> 		hdr = (struct ieee80211_hdr *) (hdr_skb-&gt;data + rx_status_len);</div><div class='ctx'> 		rxs = IEEE80211_SKB_RXCB(hdr_skb);</div><div class='ctx'> 		if (ieee80211_is_beacon(hdr-&gt;frame_control) &amp;&amp;</div><div class='add'>+		    !is_zero_ether_addr(common-&gt;curbssid) &amp;&amp;</div><div class='ctx'> 		    !compare_ether_addr(hdr-&gt;addr3, common-&gt;curbssid))</div><div class='ctx'> 			rs.is_mybeacon = true;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1838,11 +1837,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)</div><div class='ctx'> 		if (sc-&gt;sc_flags &amp; SC_OP_RXFLUSH)</div><div class='ctx'> 			goto requeue_drop_frag;</div><div class='ctx'> </div><div class='del'>-		retval = ath9k_rx_skb_preprocess(common, hw, hdr, &amp;rs,</div><div class='del'>-						 rxs, &amp;decrypt_error);</div><div class='del'>-		if (retval)</div><div class='del'>-			goto requeue_drop_frag;</div><div class='del'>-</div><div class='ctx'> 		rxs-&gt;mactime = (tsf &amp; ~0xffffffffULL) | rs.rs_tstamp;</div><div class='ctx'> 		if (rs.rs_tstamp &gt; tsf_lower &amp;&amp;</div><div class='ctx'> 		    unlikely(rs.rs_tstamp - tsf_lower &gt; 0x10000000))</div><div class='hunk'>@@ -1852,6 +1846,11 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)</div><div class='ctx'> 		    unlikely(tsf_lower - rs.rs_tstamp &gt; 0x10000000))</div><div class='ctx'> 			rxs-&gt;mactime += 0x100000000ULL;</div><div class='ctx'> </div><div class='add'>+		retval = ath9k_rx_skb_preprocess(common, hw, hdr, &amp;rs,</div><div class='add'>+						 rxs, &amp;decrypt_error);</div><div class='add'>+		if (retval)</div><div class='add'>+			goto requeue_drop_frag;</div><div class='add'>+</div><div class='ctx'> 		/* Ensure we always have an skb to requeue once we are done</div><div class='ctx'> 		 * processing the current buffer's skb */</div><div class='ctx'> 		requeue_skb = ath_rxbuf_alloc(common, common-&gt;rx_bufsize, GFP_ATOMIC);</div><div class='hunk'>@@ -1923,15 +1922,20 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)</div><div class='ctx'> 			skb = hdr_skb;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * change the default rx antenna if rx diversity chooses the</div><div class='del'>-		 * other antenna 3 times in a row.</div><div class='del'>-		 */</div><div class='del'>-		if (sc-&gt;rx.defant != rs.rs_antenna) {</div><div class='del'>-			if (++sc-&gt;rx.rxotherant &gt;= 3)</div><div class='del'>-				ath_setdefantenna(sc, rs.rs_antenna);</div><div class='del'>-		} else {</div><div class='del'>-			sc-&gt;rx.rxotherant = 0;</div><div class='add'>+</div><div class='add'>+		if (ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_ANT_DIV_COMB) {</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * change the default rx antenna if rx diversity</div><div class='add'>+			 * chooses the other antenna 3 times in a row.</div><div class='add'>+			 */</div><div class='add'>+			if (sc-&gt;rx.defant != rs.rs_antenna) {</div><div class='add'>+				if (++sc-&gt;rx.rxotherant &gt;= 3)</div><div class='add'>+					ath_setdefantenna(sc, rs.rs_antenna);</div><div class='add'>+			} else {</div><div class='add'>+				sc-&gt;rx.rxotherant = 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (rxs-&gt;flag &amp; RX_FLAG_MMIC_STRIPPED)</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h<br/>index 8fcb7e9e8399..6e2f18861f5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/reg.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/reg.h</a></div><div class='hunk'>@@ -1006,6 +1006,8 @@ enum {</div><div class='ctx'> #define AR_INTR_ASYNC_MASK                       (AR_SREV_9340(ah) ? 0x4018 : 0x4030)</div><div class='ctx'> #define AR_INTR_ASYNC_MASK_GPIO                  0xFFFC0000</div><div class='ctx'> #define AR_INTR_ASYNC_MASK_GPIO_S                18</div><div class='add'>+#define AR_INTR_ASYNC_MASK_MCI                   0x00000080</div><div class='add'>+#define AR_INTR_ASYNC_MASK_MCI_S                 7</div><div class='ctx'> </div><div class='ctx'> #define AR_INTR_SYNC_MASK                        (AR_SREV_9340(ah) ? 0x401c : 0x4034)</div><div class='ctx'> #define AR_INTR_SYNC_MASK_GPIO                   0xFFFC0000</div><div class='hunk'>@@ -1013,6 +1015,14 @@ enum {</div><div class='ctx'> </div><div class='ctx'> #define AR_INTR_ASYNC_CAUSE_CLR                  (AR_SREV_9340(ah) ? 0x4020 : 0x4038)</div><div class='ctx'> #define AR_INTR_ASYNC_CAUSE                      (AR_SREV_9340(ah) ? 0x4020 : 0x4038)</div><div class='add'>+#define AR_INTR_ASYNC_CAUSE_MCI			 0x00000080</div><div class='add'>+#define AR_INTR_ASYNC_USED			 (AR_INTR_MAC_IRQ | \</div><div class='add'>+						  AR_INTR_ASYNC_CAUSE_MCI)</div><div class='add'>+</div><div class='add'>+/* Asynchronous Interrupt Enable Register */</div><div class='add'>+#define AR_INTR_ASYNC_ENABLE_MCI         0x00000080</div><div class='add'>+#define AR_INTR_ASYNC_ENABLE_MCI_S       7</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #define AR_INTR_ASYNC_ENABLE                     (AR_SREV_9340(ah) ? 0x4024 : 0x403c)</div><div class='ctx'> #define AR_INTR_ASYNC_ENABLE_GPIO                0xFFFC0000</div><div class='hunk'>@@ -1269,6 +1279,8 @@ enum {</div><div class='ctx'> #define AR_RTC_INTR_MASK \</div><div class='ctx'> 	((AR_SREV_9100(ah)) ? (AR_RTC_BASE + 0x0058) : 0x7058)</div><div class='ctx'> </div><div class='add'>+#define AR_RTC_KEEP_AWAKE	0x7034</div><div class='add'>+</div><div class='ctx'> /* RTC_DERIVED_* - only for AR9100 */</div><div class='ctx'> </div><div class='ctx'> #define AR_RTC_DERIVED_CLK \</div><div class='hunk'>@@ -1555,6 +1567,8 @@ enum {</div><div class='ctx'> #define AR_DIAG_FRAME_NV0           0x00020000</div><div class='ctx'> #define AR_DIAG_OBS_PT_SEL1         0x000C0000</div><div class='ctx'> #define AR_DIAG_OBS_PT_SEL1_S       18</div><div class='add'>+#define AR_DIAG_OBS_PT_SEL2         0x08000000</div><div class='add'>+#define AR_DIAG_OBS_PT_SEL2_S       27</div><div class='ctx'> #define AR_DIAG_FORCE_RX_CLEAR      0x00100000 /* force rx_clear high */</div><div class='ctx'> #define AR_DIAG_IGNORE_VIRT_CS      0x00200000</div><div class='ctx'> #define AR_DIAG_FORCE_CH_IDLE_HIGH  0x00400000</div><div class='hunk'>@@ -1752,19 +1766,10 @@ enum {</div><div class='ctx'> </div><div class='ctx'> #define AR_BT_COEX_WL_WEIGHTS0     0x8174</div><div class='ctx'> #define AR_BT_COEX_WL_WEIGHTS1     0x81c4</div><div class='add'>+#define AR_MCI_COEX_WL_WEIGHTS(_i) (0x18b0 + (_i &lt;&lt; 2))</div><div class='add'>+#define AR_BT_COEX_BT_WEIGHTS(_i)  (0x83ac + (_i &lt;&lt; 2))</div><div class='ctx'> </div><div class='del'>-#define AR_BT_COEX_BT_WEIGHTS0     0x83ac</div><div class='del'>-#define AR_BT_COEX_BT_WEIGHTS1     0x83b0</div><div class='del'>-#define AR_BT_COEX_BT_WEIGHTS2     0x83b4</div><div class='del'>-#define AR_BT_COEX_BT_WEIGHTS3     0x83b8</div><div class='del'>-</div><div class='del'>-#define AR9300_BT_WGHT                     0xcccc4444</div><div class='del'>-#define AR9300_STOMP_ALL_WLAN_WGHT0        0xfffffff0</div><div class='del'>-#define AR9300_STOMP_ALL_WLAN_WGHT1        0xfffffff0</div><div class='del'>-#define AR9300_STOMP_LOW_WLAN_WGHT0        0x88888880</div><div class='del'>-#define AR9300_STOMP_LOW_WLAN_WGHT1        0x88888880</div><div class='del'>-#define AR9300_STOMP_NONE_WLAN_WGHT0       0x00000000</div><div class='del'>-#define AR9300_STOMP_NONE_WLAN_WGHT1       0x00000000</div><div class='add'>+#define AR9300_BT_WGHT             0xcccc4444</div><div class='ctx'> </div><div class='ctx'> #define AR_BT_COEX_MODE2           0x817c</div><div class='ctx'> #define AR_BT_BCN_MISS_THRESH      0x000000ff</div><div class='hunk'>@@ -1938,37 +1943,277 @@ enum {</div><div class='ctx'> #define AR_PHY_AGC_CONTROL_YCOK_MAX_S		6</div><div class='ctx'> </div><div class='ctx'> /* MCI Registers */</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_EN		0x183c</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET    0x00000001</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET_S  0</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL     0x00000002</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL_S   1</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_CONT_NACK       0x00000004</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_CONT_NACK_S     2</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_CONT_INFO       0x00000008</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_CONT_INFO_S     3</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_CONT_RST        0x00000010</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_CONT_RST_S      4</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO       0x00000020</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO_S     5</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_CPU_INT         0x00000040</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_CPU_INT_S       6</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_GPM             0x00000100</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_GPM_S           8</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_LNA_INFO        0x00000200</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_LNA_INFO_S      9</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING    0x00000400</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING_S  10</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING      0x00000800</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING_S    11</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE        0x00001000</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE_S      12</div><div class='del'>-#define AR_MCI_INTERRUPT_RX_HW_MSG_MASK	(AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO  | \</div><div class='add'>+</div><div class='add'>+#define AR_MCI_COMMAND0				0x1800</div><div class='add'>+#define AR_MCI_COMMAND0_HEADER			0xFF</div><div class='add'>+#define AR_MCI_COMMAND0_HEADER_S		0</div><div class='add'>+#define AR_MCI_COMMAND0_LEN			0x1f00</div><div class='add'>+#define AR_MCI_COMMAND0_LEN_S			8</div><div class='add'>+#define AR_MCI_COMMAND0_DISABLE_TIMESTAMP	0x2000</div><div class='add'>+#define AR_MCI_COMMAND0_DISABLE_TIMESTAMP_S	13</div><div class='add'>+</div><div class='add'>+#define AR_MCI_COMMAND1				0x1804</div><div class='add'>+</div><div class='add'>+#define AR_MCI_COMMAND2				0x1808</div><div class='add'>+#define AR_MCI_COMMAND2_RESET_TX		0x01</div><div class='add'>+#define AR_MCI_COMMAND2_RESET_TX_S		0</div><div class='add'>+#define AR_MCI_COMMAND2_RESET_RX		0x02</div><div class='add'>+#define AR_MCI_COMMAND2_RESET_RX_S		1</div><div class='add'>+#define AR_MCI_COMMAND2_RESET_RX_NUM_CYCLES     0x3FC</div><div class='add'>+#define AR_MCI_COMMAND2_RESET_RX_NUM_CYCLES_S   2</div><div class='add'>+#define AR_MCI_COMMAND2_RESET_REQ_WAKEUP        0x400</div><div class='add'>+#define AR_MCI_COMMAND2_RESET_REQ_WAKEUP_S      10</div><div class='add'>+</div><div class='add'>+#define AR_MCI_RX_CTRL				0x180c</div><div class='add'>+</div><div class='add'>+#define AR_MCI_TX_CTRL				0x1810</div><div class='add'>+/* 0 = no division, 1 = divide by 2, 2 = divide by 4, 3 = divide by 8 */</div><div class='add'>+#define AR_MCI_TX_CTRL_CLK_DIV			0x03</div><div class='add'>+#define AR_MCI_TX_CTRL_CLK_DIV_S		0</div><div class='add'>+#define AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE	0x04</div><div class='add'>+#define AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE_S	2</div><div class='add'>+#define AR_MCI_TX_CTRL_GAIN_UPDATE_FREQ		0xFFFFF8</div><div class='add'>+#define AR_MCI_TX_CTRL_GAIN_UPDATE_FREQ_S	3</div><div class='add'>+#define AR_MCI_TX_CTRL_GAIN_UPDATE_NUM		0xF000000</div><div class='add'>+#define AR_MCI_TX_CTRL_GAIN_UPDATE_NUM_S	24</div><div class='add'>+</div><div class='add'>+#define AR_MCI_MSG_ATTRIBUTES_TABLE			0x1814</div><div class='add'>+#define AR_MCI_MSG_ATTRIBUTES_TABLE_CHECKSUM		0xFFFF</div><div class='add'>+#define AR_MCI_MSG_ATTRIBUTES_TABLE_CHECKSUM_S		0</div><div class='add'>+#define AR_MCI_MSG_ATTRIBUTES_TABLE_INVALID_HDR		0xFFFF0000</div><div class='add'>+#define AR_MCI_MSG_ATTRIBUTES_TABLE_INVALID_HDR_S	16</div><div class='add'>+</div><div class='add'>+#define AR_MCI_SCHD_TABLE_0				0x1818</div><div class='add'>+#define AR_MCI_SCHD_TABLE_1				0x181c</div><div class='add'>+#define AR_MCI_GPM_0					0x1820</div><div class='add'>+#define AR_MCI_GPM_1					0x1824</div><div class='add'>+#define AR_MCI_GPM_WRITE_PTR				0xFFFF0000</div><div class='add'>+#define AR_MCI_GPM_WRITE_PTR_S				16</div><div class='add'>+#define AR_MCI_GPM_BUF_LEN				0x0000FFFF</div><div class='add'>+#define AR_MCI_GPM_BUF_LEN_S				0</div><div class='add'>+</div><div class='add'>+#define AR_MCI_INTERRUPT_RAW				0x1828</div><div class='add'>+#define AR_MCI_INTERRUPT_EN				0x182c</div><div class='add'>+#define AR_MCI_INTERRUPT_SW_MSG_DONE			0x00000001</div><div class='add'>+#define AR_MCI_INTERRUPT_SW_MSG_DONE_S			0</div><div class='add'>+#define AR_MCI_INTERRUPT_CPU_INT_MSG			0x00000002</div><div class='add'>+#define AR_MCI_INTERRUPT_CPU_INT_MSG_S			1</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_CKSUM_FAIL			0x00000004</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_CKSUM_FAIL_S		2</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_INVALID_HDR			0x00000008</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_INVALID_HDR_S		3</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_HW_MSG_FAIL			0x00000010</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_HW_MSG_FAIL_S		4</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_SW_MSG_FAIL			0x00000020</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_SW_MSG_FAIL_S		5</div><div class='add'>+#define AR_MCI_INTERRUPT_TX_HW_MSG_FAIL			0x00000080</div><div class='add'>+#define AR_MCI_INTERRUPT_TX_HW_MSG_FAIL_S		7</div><div class='add'>+#define AR_MCI_INTERRUPT_TX_SW_MSG_FAIL			0x00000100</div><div class='add'>+#define AR_MCI_INTERRUPT_TX_SW_MSG_FAIL_S		8</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG				0x00000200</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_S			9</div><div class='add'>+#define AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE		0x00000400</div><div class='add'>+#define AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE_S		10</div><div class='add'>+#define AR_MCI_INTERRUPT_BT_PRI				0x07fff800</div><div class='add'>+#define AR_MCI_INTERRUPT_BT_PRI_S			11</div><div class='add'>+#define AR_MCI_INTERRUPT_BT_PRI_THRESH			0x08000000</div><div class='add'>+#define AR_MCI_INTERRUPT_BT_PRI_THRESH_S		27</div><div class='add'>+#define AR_MCI_INTERRUPT_BT_FREQ			0x10000000</div><div class='add'>+#define AR_MCI_INTERRUPT_BT_FREQ_S			28</div><div class='add'>+#define AR_MCI_INTERRUPT_BT_STOMP			0x20000000</div><div class='add'>+#define AR_MCI_INTERRUPT_BT_STOMP_S			29</div><div class='add'>+#define AR_MCI_INTERRUPT_BB_AIC_IRQ			0x40000000</div><div class='add'>+#define AR_MCI_INTERRUPT_BB_AIC_IRQ_S			30</div><div class='add'>+#define AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT		0x80000000</div><div class='add'>+#define AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT_S		31</div><div class='add'>+</div><div class='add'>+#define AR_MCI_INTERRUPT_DEFAULT    (AR_MCI_INTERRUPT_SW_MSG_DONE	  | \</div><div class='add'>+				     AR_MCI_INTERRUPT_RX_INVALID_HDR	  | \</div><div class='add'>+				     AR_MCI_INTERRUPT_RX_HW_MSG_FAIL	  | \</div><div class='add'>+				     AR_MCI_INTERRUPT_RX_SW_MSG_FAIL	  | \</div><div class='add'>+				     AR_MCI_INTERRUPT_TX_HW_MSG_FAIL	  | \</div><div class='add'>+				     AR_MCI_INTERRUPT_TX_SW_MSG_FAIL	  | \</div><div class='add'>+				     AR_MCI_INTERRUPT_RX_MSG		  | \</div><div class='add'>+				     AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE | \</div><div class='add'>+				     AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT)</div><div class='add'>+</div><div class='add'>+#define AR_MCI_INTERRUPT_MSG_FAIL_MASK (AR_MCI_INTERRUPT_RX_HW_MSG_FAIL | \</div><div class='add'>+					AR_MCI_INTERRUPT_RX_SW_MSG_FAIL | \</div><div class='add'>+					AR_MCI_INTERRUPT_TX_HW_MSG_FAIL | \</div><div class='add'>+					AR_MCI_INTERRUPT_TX_SW_MSG_FAIL)</div><div class='add'>+</div><div class='add'>+#define AR_MCI_REMOTE_CPU_INT				0x1830</div><div class='add'>+#define AR_MCI_REMOTE_CPU_INT_EN			0x1834</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_RAW			0x1838</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_EN			0x183c</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET		0x00000001</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET_S		0</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL		0x00000002</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL_S		1</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_CONT_NACK		0x00000004</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_CONT_NACK_S		2</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_CONT_INFO		0x00000008</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_CONT_INFO_S		3</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_CONT_RST		0x00000010</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_CONT_RST_S		4</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO		0x00000020</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO_S		5</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_CPU_INT			0x00000040</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_CPU_INT_S		6</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_GPM			0x00000100</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_GPM_S			8</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_LNA_INFO		0x00000200</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_LNA_INFO_S		9</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING		0x00000400</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING_S		10</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING		0x00000800</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING_S		11</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE		0x00001000</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE_S		12</div><div class='add'>+#define AR_MCI_INTERRUPT_RX_HW_MSG_MASK	 (AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO  | \</div><div class='ctx'> 					  AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL| \</div><div class='ctx'> 					  AR_MCI_INTERRUPT_RX_MSG_LNA_INFO   | \</div><div class='ctx'> 					  AR_MCI_INTERRUPT_RX_MSG_CONT_NACK  | \</div><div class='ctx'> 					  AR_MCI_INTERRUPT_RX_MSG_CONT_INFO  | \</div><div class='ctx'> 					  AR_MCI_INTERRUPT_RX_MSG_CONT_RST)</div><div class='ctx'> </div><div class='add'>+#define AR_MCI_INTERRUPT_RX_MSG_DEFAULT (AR_MCI_INTERRUPT_RX_MSG_GPM	 | \</div><div class='add'>+					 AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET| \</div><div class='add'>+					 AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING  | \</div><div class='add'>+					 AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING| \</div><div class='add'>+					 AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO   | \</div><div class='add'>+					 AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL | \</div><div class='add'>+					 AR_MCI_INTERRUPT_RX_MSG_LNA_INFO    | \</div><div class='add'>+					 AR_MCI_INTERRUPT_RX_MSG_CONT_NACK   | \</div><div class='add'>+					 AR_MCI_INTERRUPT_RX_MSG_CONT_INFO   | \</div><div class='add'>+					 AR_MCI_INTERRUPT_RX_MSG_CONT_RST    | \</div><div class='add'>+					 AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE)</div><div class='add'>+</div><div class='add'>+#define AR_MCI_CPU_INT					0x1840</div><div class='add'>+</div><div class='add'>+#define AR_MCI_RX_STATUS			0x1844</div><div class='add'>+#define AR_MCI_RX_LAST_SCHD_MSG_INDEX		0x00000F00</div><div class='add'>+#define AR_MCI_RX_LAST_SCHD_MSG_INDEX_S		8</div><div class='add'>+#define AR_MCI_RX_REMOTE_SLEEP			0x00001000</div><div class='add'>+#define AR_MCI_RX_REMOTE_SLEEP_S		12</div><div class='add'>+#define AR_MCI_RX_MCI_CLK_REQ			0x00002000</div><div class='add'>+#define AR_MCI_RX_MCI_CLK_REQ_S			13</div><div class='add'>+</div><div class='add'>+#define AR_MCI_CONT_STATUS			0x1848</div><div class='add'>+#define AR_MCI_CONT_RSSI_POWER			0x000000FF</div><div class='add'>+#define AR_MCI_CONT_RSSI_POWER_S		0</div><div class='add'>+#define AR_MCI_CONT_RRIORITY			0x0000FF00</div><div class='add'>+#define AR_MCI_CONT_RRIORITY_S			8</div><div class='add'>+#define AR_MCI_CONT_TXRX			0x00010000</div><div class='add'>+#define AR_MCI_CONT_TXRX_S			16</div><div class='add'>+</div><div class='add'>+#define AR_MCI_BT_PRI0				0x184c</div><div class='add'>+#define AR_MCI_BT_PRI1				0x1850</div><div class='add'>+#define AR_MCI_BT_PRI2				0x1854</div><div class='add'>+#define AR_MCI_BT_PRI3				0x1858</div><div class='add'>+#define AR_MCI_BT_PRI				0x185c</div><div class='add'>+#define AR_MCI_WL_FREQ0				0x1860</div><div class='add'>+#define AR_MCI_WL_FREQ1				0x1864</div><div class='add'>+#define AR_MCI_WL_FREQ2				0x1868</div><div class='add'>+#define AR_MCI_GAIN				0x186c</div><div class='add'>+#define AR_MCI_WBTIMER1				0x1870</div><div class='add'>+#define AR_MCI_WBTIMER2				0x1874</div><div class='add'>+#define AR_MCI_WBTIMER3				0x1878</div><div class='add'>+#define AR_MCI_WBTIMER4				0x187c</div><div class='add'>+#define AR_MCI_MAXGAIN				0x1880</div><div class='add'>+#define AR_MCI_HW_SCHD_TBL_CTL			0x1884</div><div class='add'>+#define AR_MCI_HW_SCHD_TBL_D0			0x1888</div><div class='add'>+#define AR_MCI_HW_SCHD_TBL_D1			0x188c</div><div class='add'>+#define AR_MCI_HW_SCHD_TBL_D2			0x1890</div><div class='add'>+#define AR_MCI_HW_SCHD_TBL_D3			0x1894</div><div class='add'>+#define AR_MCI_TX_PAYLOAD0			0x1898</div><div class='add'>+#define AR_MCI_TX_PAYLOAD1			0x189c</div><div class='add'>+#define AR_MCI_TX_PAYLOAD2			0x18a0</div><div class='add'>+#define AR_MCI_TX_PAYLOAD3			0x18a4</div><div class='add'>+#define AR_BTCOEX_WBTIMER			0x18a8</div><div class='add'>+</div><div class='add'>+#define AR_BTCOEX_CTRL					0x18ac</div><div class='add'>+#define AR_BTCOEX_CTRL_AR9462_MODE			0x00000001</div><div class='add'>+#define AR_BTCOEX_CTRL_AR9462_MODE_S			0</div><div class='add'>+#define AR_BTCOEX_CTRL_WBTIMER_EN			0x00000002</div><div class='add'>+#define AR_BTCOEX_CTRL_WBTIMER_EN_S			1</div><div class='add'>+#define AR_BTCOEX_CTRL_MCI_MODE_EN			0x00000004</div><div class='add'>+#define AR_BTCOEX_CTRL_MCI_MODE_EN_S			2</div><div class='add'>+#define AR_BTCOEX_CTRL_LNA_SHARED			0x00000008</div><div class='add'>+#define AR_BTCOEX_CTRL_LNA_SHARED_S			3</div><div class='add'>+#define AR_BTCOEX_CTRL_PA_SHARED			0x00000010</div><div class='add'>+#define AR_BTCOEX_CTRL_PA_SHARED_S			4</div><div class='add'>+#define AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN		0x00000020</div><div class='add'>+#define AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN_S		5</div><div class='add'>+#define AR_BTCOEX_CTRL_TIME_TO_NEXT_BT_THRESH_EN	0x00000040</div><div class='add'>+#define AR_BTCOEX_CTRL_TIME_TO_NEXT_BT_THRESH_EN_S	6</div><div class='add'>+#define AR_BTCOEX_CTRL_NUM_ANTENNAS			0x00000180</div><div class='add'>+#define AR_BTCOEX_CTRL_NUM_ANTENNAS_S			7</div><div class='add'>+#define AR_BTCOEX_CTRL_RX_CHAIN_MASK			0x00000E00</div><div class='add'>+#define AR_BTCOEX_CTRL_RX_CHAIN_MASK_S			9</div><div class='add'>+#define AR_BTCOEX_CTRL_AGGR_THRESH			0x00007000</div><div class='add'>+#define AR_BTCOEX_CTRL_AGGR_THRESH_S			12</div><div class='add'>+#define AR_BTCOEX_CTRL_1_CHAIN_BCN			0x00080000</div><div class='add'>+#define AR_BTCOEX_CTRL_1_CHAIN_BCN_S			19</div><div class='add'>+#define AR_BTCOEX_CTRL_1_CHAIN_ACK			0x00100000</div><div class='add'>+#define AR_BTCOEX_CTRL_1_CHAIN_ACK_S			20</div><div class='add'>+#define AR_BTCOEX_CTRL_WAIT_BA_MARGIN			0x1FE00000</div><div class='add'>+#define AR_BTCOEX_CTRL_WAIT_BA_MARGIN_S			28</div><div class='add'>+#define AR_BTCOEX_CTRL_REDUCE_TXPWR			0x20000000</div><div class='add'>+#define AR_BTCOEX_CTRL_REDUCE_TXPWR_S			29</div><div class='add'>+#define AR_BTCOEX_CTRL_SPDT_ENABLE_10			0x40000000</div><div class='add'>+#define AR_BTCOEX_CTRL_SPDT_ENABLE_10_S			30</div><div class='add'>+#define AR_BTCOEX_CTRL_SPDT_POLARITY			0x80000000</div><div class='add'>+#define AR_BTCOEX_CTRL_SPDT_POLARITY_S			31</div><div class='add'>+</div><div class='add'>+#define AR_BTCOEX_WL_WEIGHTS0				0x18b0</div><div class='add'>+#define AR_BTCOEX_WL_WEIGHTS1				0x18b4</div><div class='add'>+#define AR_BTCOEX_WL_WEIGHTS2				0x18b8</div><div class='add'>+#define AR_BTCOEX_WL_WEIGHTS3				0x18bc</div><div class='add'>+#define AR_BTCOEX_MAX_TXPWR(_x)				(0x18c0 + ((_x) &lt;&lt; 2))</div><div class='add'>+#define AR_BTCOEX_WL_LNA				0x1940</div><div class='add'>+#define AR_BTCOEX_RFGAIN_CTRL				0x1944</div><div class='add'>+</div><div class='add'>+#define AR_BTCOEX_CTRL2					0x1948</div><div class='add'>+#define AR_BTCOEX_CTRL2_TXPWR_THRESH			0x0007F800</div><div class='add'>+#define AR_BTCOEX_CTRL2_TXPWR_THRESH_S			11</div><div class='add'>+#define AR_BTCOEX_CTRL2_TX_CHAIN_MASK			0x00380000</div><div class='add'>+#define AR_BTCOEX_CTRL2_TX_CHAIN_MASK_S			19</div><div class='add'>+#define AR_BTCOEX_CTRL2_RX_DEWEIGHT			0x00400000</div><div class='add'>+#define AR_BTCOEX_CTRL2_RX_DEWEIGHT_S			22</div><div class='add'>+#define AR_BTCOEX_CTRL2_GPIO_OBS_SEL			0x00800000</div><div class='add'>+#define AR_BTCOEX_CTRL2_GPIO_OBS_SEL_S			23</div><div class='add'>+#define AR_BTCOEX_CTRL2_MAC_BB_OBS_SEL			0x01000000</div><div class='add'>+#define AR_BTCOEX_CTRL2_MAC_BB_OBS_SEL_S		24</div><div class='add'>+#define AR_BTCOEX_CTRL2_DESC_BASED_TXPWR_ENABLE		0x02000000</div><div class='add'>+#define AR_BTCOEX_CTRL2_DESC_BASED_TXPWR_ENABLE_S	25</div><div class='add'>+</div><div class='add'>+#define AR_BTCOEX_CTRL_SPDT_ENABLE          0x00000001</div><div class='add'>+#define AR_BTCOEX_CTRL_SPDT_ENABLE_S        0</div><div class='add'>+#define AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL     0x00000002</div><div class='add'>+#define AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL_S   1</div><div class='add'>+#define AR_BTCOEX_CTRL_USE_LATCHED_BT_ANT   0x00000004</div><div class='add'>+#define AR_BTCOEX_CTRL_USE_LATCHED_BT_ANT_S 2</div><div class='add'>+#define AR_GLB_WLAN_UART_INTF_EN            0x00020000</div><div class='add'>+#define AR_GLB_WLAN_UART_INTF_EN_S          17</div><div class='add'>+#define AR_GLB_DS_JTAG_DISABLE              0x00040000</div><div class='add'>+#define AR_GLB_DS_JTAG_DISABLE_S            18</div><div class='add'>+</div><div class='add'>+#define AR_BTCOEX_RC                    0x194c</div><div class='add'>+#define AR_BTCOEX_MAX_RFGAIN(_x)        (0x1950 + ((_x) &lt;&lt; 2))</div><div class='add'>+#define AR_BTCOEX_DBG                   0x1a50</div><div class='add'>+#define AR_MCI_LAST_HW_MSG_HDR          0x1a54</div><div class='add'>+#define AR_MCI_LAST_HW_MSG_BDY          0x1a58</div><div class='add'>+</div><div class='add'>+#define AR_MCI_SCHD_TABLE_2             0x1a5c</div><div class='add'>+#define AR_MCI_SCHD_TABLE_2_MEM_BASED   0x00000001</div><div class='add'>+#define AR_MCI_SCHD_TABLE_2_MEM_BASED_S 0</div><div class='add'>+#define AR_MCI_SCHD_TABLE_2_HW_BASED    0x00000002</div><div class='add'>+#define AR_MCI_SCHD_TABLE_2_HW_BASED_S  1</div><div class='add'>+</div><div class='add'>+#define AR_BTCOEX_CTRL3               0x1a60</div><div class='add'>+#define AR_BTCOEX_CTRL3_CONT_INFO_TIMEOUT	0x00000fff</div><div class='add'>+#define AR_BTCOEX_CTRL3_CONT_INFO_TIMEOUT_S	0</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c<br/>index 35422fc1f2ce..65c8894c5f81 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/wmi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/wmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/wmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/wmi.c</a></div><div class='hunk'>@@ -187,7 +187,7 @@ void ath9k_fatal_work(struct work_struct *work)</div><div class='ctx'> 						   fatal_work);</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(priv-&gt;ah);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_FATAL, "FATAL Event received, resetting device\n");</div><div class='add'>+	ath_dbg(common, FATAL, "FATAL Event received, resetting device\n");</div><div class='ctx'> 	ath9k_htc_reset(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -330,8 +330,7 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id,</div><div class='ctx'> </div><div class='ctx'> 	time_left = wait_for_completion_timeout(&amp;wmi-&gt;cmd_wait, timeout);</div><div class='ctx'> 	if (!time_left) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_WMI,</div><div class='del'>-			"Timeout waiting for WMI command: %s\n",</div><div class='add'>+		ath_dbg(common, WMI, "Timeout waiting for WMI command: %s\n",</div><div class='ctx'> 			wmi_cmd_to_name(cmd_id));</div><div class='ctx'> 		mutex_unlock(&amp;wmi-&gt;op_mutex);</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='hunk'>@@ -342,8 +341,7 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	ath_dbg(common, ATH_DBG_WMI,</div><div class='del'>-		"WMI failure for: %s\n", wmi_cmd_to_name(cmd_id));</div><div class='add'>+	ath_dbg(common, WMI, "WMI failure for: %s\n", wmi_cmd_to_name(cmd_id));</div><div class='ctx'> 	mutex_unlock(&amp;wmi-&gt;op_mutex);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c<br/>index 03b0a651a591..3182408ffe35 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/xmit.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/ath9k/xmit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/ath9k/xmit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/ath9k/xmit.c</a></div><div class='hunk'>@@ -53,7 +53,7 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,</div><div class='ctx'> 			    int tx_flags, struct ath_txq *txq);</div><div class='ctx'> static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 				struct ath_txq *txq, struct list_head *bf_q,</div><div class='del'>-				struct ath_tx_status *ts, int txok, int sendbar);</div><div class='add'>+				struct ath_tx_status *ts, int txok);</div><div class='ctx'> static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 			     struct list_head *head, bool internal);</div><div class='ctx'> static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf,</div><div class='hunk'>@@ -104,6 +104,32 @@ static int ath_max_4ms_framelen[4][32] = {</div><div class='ctx'> /* Aggregation logic */</div><div class='ctx'> /*********************/</div><div class='ctx'> </div><div class='add'>+static void ath_txq_lock(struct ath_softc *sc, struct ath_txq *txq)</div><div class='add'>+	__acquires(&amp;txq-&gt;axq_lock)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath_txq_unlock(struct ath_softc *sc, struct ath_txq *txq)</div><div class='add'>+	__releases(&amp;txq-&gt;axq_lock)</div><div class='add'>+{</div><div class='add'>+	spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ath_txq_unlock_complete(struct ath_softc *sc, struct ath_txq *txq)</div><div class='add'>+	__releases(&amp;txq-&gt;axq_lock)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff_head q;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	__skb_queue_head_init(&amp;q);</div><div class='add'>+	skb_queue_splice_init(&amp;txq-&gt;complete_q, &amp;q);</div><div class='add'>+	spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;q)))</div><div class='add'>+		ieee80211_tx_status(sc-&gt;hw, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath_tx_queue_tid(struct ath_txq *txq, struct ath_atx_tid *tid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_atx_ac *ac = tid-&gt;ac;</div><div class='hunk'>@@ -130,7 +156,7 @@ static void ath_tx_resume_tid(struct ath_softc *sc, struct ath_atx_tid *tid)</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(!tid-&gt;paused);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+	ath_txq_lock(sc, txq);</div><div class='ctx'> 	tid-&gt;paused = false;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_queue_empty(&amp;tid-&gt;buf_q))</div><div class='hunk'>@@ -139,7 +165,7 @@ static void ath_tx_resume_tid(struct ath_softc *sc, struct ath_atx_tid *tid)</div><div class='ctx'> 	ath_tx_queue_tid(txq, tid);</div><div class='ctx'> 	ath_txq_schedule(sc, txq);</div><div class='ctx'> unlock:</div><div class='del'>-	spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+	ath_txq_unlock_complete(sc, txq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ath_frame_info *get_frame_info(struct sk_buff *skb)</div><div class='hunk'>@@ -150,6 +176,12 @@ static struct ath_frame_info *get_frame_info(struct sk_buff *skb)</div><div class='ctx'> 	return (struct ath_frame_info *) &amp;tx_info-&gt;rate_driver_data[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ath_send_bar(struct ath_atx_tid *tid, u16 seqno)</div><div class='add'>+{</div><div class='add'>+	ieee80211_send_bar(tid-&gt;an-&gt;vif, tid-&gt;an-&gt;sta-&gt;addr, tid-&gt;tidno,</div><div class='add'>+			   seqno &lt;&lt; IEEE80211_SEQ_SEQ_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_txq *txq = tid-&gt;ac-&gt;txq;</div><div class='hunk'>@@ -158,28 +190,36 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)</div><div class='ctx'> 	struct list_head bf_head;</div><div class='ctx'> 	struct ath_tx_status ts;</div><div class='ctx'> 	struct ath_frame_info *fi;</div><div class='add'>+	bool sendbar = false;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;bf_head);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;ts, 0, sizeof(ts));</div><div class='del'>-	spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> </div><div class='ctx'> 	while ((skb = __skb_dequeue(&amp;tid-&gt;buf_q))) {</div><div class='ctx'> 		fi = get_frame_info(skb);</div><div class='ctx'> 		bf = fi-&gt;bf;</div><div class='ctx'> </div><div class='del'>-		spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> 		if (bf &amp;&amp; fi-&gt;retries) {</div><div class='ctx'> 			list_add_tail(&amp;bf-&gt;list, &amp;bf_head);</div><div class='ctx'> 			ath_tx_update_baw(sc, tid, bf-&gt;bf_state.seqno);</div><div class='del'>-			ath_tx_complete_buf(sc, bf, txq, &amp;bf_head, &amp;ts, 0, 1);</div><div class='add'>+			ath_tx_complete_buf(sc, bf, txq, &amp;bf_head, &amp;ts, 0);</div><div class='add'>+			sendbar = true;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ath_tx_send_normal(sc, txq, NULL, skb);</div><div class='ctx'> 		}</div><div class='del'>-		spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+	if (tid-&gt;baw_head == tid-&gt;baw_tail) {</div><div class='add'>+		tid-&gt;state &amp;= ~AGGR_ADDBA_COMPLETE;</div><div class='add'>+		tid-&gt;state &amp;= ~AGGR_CLEANUP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sendbar) {</div><div class='add'>+		ath_txq_unlock(sc, txq);</div><div class='add'>+		ath_send_bar(tid, tid-&gt;seq_start);</div><div class='add'>+		ath_txq_lock(sc, txq);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid,</div><div class='hunk'>@@ -195,6 +235,8 @@ static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid,</div><div class='ctx'> 	while (tid-&gt;baw_head != tid-&gt;baw_tail &amp;&amp; !test_bit(tid-&gt;baw_head, tid-&gt;tx_buf)) {</div><div class='ctx'> 		INCR(tid-&gt;seq_start, IEEE80211_SEQ_MAX);</div><div class='ctx'> 		INCR(tid-&gt;baw_head, ATH_TID_MAX_BUFS);</div><div class='add'>+		if (tid-&gt;bar_index &gt;= 0)</div><div class='add'>+			tid-&gt;bar_index--;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -238,9 +280,7 @@ static void ath_tid_drain(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 		bf = fi-&gt;bf;</div><div class='ctx'> </div><div class='ctx'> 		if (!bf) {</div><div class='del'>-			spin_unlock(&amp;txq-&gt;axq_lock);</div><div class='ctx'> 			ath_tx_complete(sc, skb, ATH_TX_ERROR, txq);</div><div class='del'>-			spin_lock(&amp;txq-&gt;axq_lock);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -249,24 +289,26 @@ static void ath_tid_drain(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 		if (fi-&gt;retries)</div><div class='ctx'> 			ath_tx_update_baw(sc, tid, bf-&gt;bf_state.seqno);</div><div class='ctx'> </div><div class='del'>-		spin_unlock(&amp;txq-&gt;axq_lock);</div><div class='del'>-		ath_tx_complete_buf(sc, bf, txq, &amp;bf_head, &amp;ts, 0, 0);</div><div class='del'>-		spin_lock(&amp;txq-&gt;axq_lock);</div><div class='add'>+		ath_tx_complete_buf(sc, bf, txq, &amp;bf_head, &amp;ts, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tid-&gt;seq_next = tid-&gt;seq_start;</div><div class='ctx'> 	tid-&gt;baw_tail = tid-&gt;baw_head;</div><div class='add'>+	tid-&gt;bar_index = -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath_tx_set_retry(struct ath_softc *sc, struct ath_txq *txq,</div><div class='del'>-			     struct sk_buff *skb)</div><div class='add'>+			     struct sk_buff *skb, int count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_frame_info *fi = get_frame_info(skb);</div><div class='ctx'> 	struct ath_buf *bf = fi-&gt;bf;</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='add'>+	int prev = fi-&gt;retries;</div><div class='ctx'> </div><div class='ctx'> 	TX_STAT_INC(txq-&gt;axq_qnum, a_retries);</div><div class='del'>-	if (fi-&gt;retries++ &gt; 0)</div><div class='add'>+	fi-&gt;retries += count;</div><div class='add'>+</div><div class='add'>+	if (prev &gt; 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='hunk'>@@ -365,7 +407,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 	struct ath_buf *bf_next, *bf_last = bf-&gt;bf_lastbf;</div><div class='ctx'> 	struct list_head bf_head;</div><div class='ctx'> 	struct sk_buff_head bf_pending;</div><div class='del'>-	u16 seq_st = 0, acked_cnt = 0, txfail_cnt = 0;</div><div class='add'>+	u16 seq_st = 0, acked_cnt = 0, txfail_cnt = 0, seq_first;</div><div class='ctx'> 	u32 ba[WME_BA_BMP_SIZE &gt;&gt; 5];</div><div class='ctx'> 	int isaggr, txfail, txpending, sendbar = 0, needreset = 0, nbad = 0;</div><div class='ctx'> 	bool rc_update = true;</div><div class='hunk'>@@ -374,6 +416,8 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 	int nframes;</div><div class='ctx'> 	u8 tidno;</div><div class='ctx'> 	bool flush = !!(ts-&gt;ts_status &amp; ATH9K_TX_FLUSH);</div><div class='add'>+	int i, retries;</div><div class='add'>+	int bar_index = -1;</div><div class='ctx'> </div><div class='ctx'> 	skb = bf-&gt;bf_mpdu;</div><div class='ctx'> 	hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='hunk'>@@ -382,6 +426,10 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> </div><div class='ctx'> 	memcpy(rates, tx_info-&gt;control.rates, sizeof(rates));</div><div class='ctx'> </div><div class='add'>+	retries = ts-&gt;ts_longretry + 1;</div><div class='add'>+	for (i = 0; i &lt; ts-&gt;ts_rateindex; i++)</div><div class='add'>+		retries += rates[i].count;</div><div class='add'>+</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	sta = ieee80211_find_sta_by_ifaddr(hw, hdr-&gt;addr1, hdr-&gt;addr2);</div><div class='hunk'>@@ -395,8 +443,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 			if (!bf-&gt;bf_stale || bf_next != NULL)</div><div class='ctx'> 				list_move_tail(&amp;bf-&gt;list, &amp;bf_head);</div><div class='ctx'> </div><div class='del'>-			ath_tx_complete_buf(sc, bf, txq, &amp;bf_head, ts,</div><div class='del'>-				0, 0);</div><div class='add'>+			ath_tx_complete_buf(sc, bf, txq, &amp;bf_head, ts, 0);</div><div class='ctx'> </div><div class='ctx'> 			bf = bf_next;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -406,6 +453,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 	an = (struct ath_node *)sta-&gt;drv_priv;</div><div class='ctx'> 	tidno = ieee80211_get_qos_ctl(hdr)[0] &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='ctx'> 	tid = ATH_AN_2_TID(an, tidno);</div><div class='add'>+	seq_first = tid-&gt;seq_start;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The hardware occasionally sends a tx status for the wrong TID.</div><div class='hunk'>@@ -455,25 +503,25 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 		} else if (!isaggr &amp;&amp; txok) {</div><div class='ctx'> 			/* transmit completion */</div><div class='ctx'> 			acked_cnt++;</div><div class='add'>+		} else if ((tid-&gt;state &amp; AGGR_CLEANUP) || !retry) {</div><div class='add'>+			/*</div><div class='add'>+			 * cleanup in progress, just fail</div><div class='add'>+			 * the un-acked sub-frames</div><div class='add'>+			 */</div><div class='add'>+			txfail = 1;</div><div class='add'>+		} else if (flush) {</div><div class='add'>+			txpending = 1;</div><div class='add'>+		} else if (fi-&gt;retries &lt; ATH_MAX_SW_RETRIES) {</div><div class='add'>+			if (txok || !an-&gt;sleeping)</div><div class='add'>+				ath_tx_set_retry(sc, txq, bf-&gt;bf_mpdu,</div><div class='add'>+						 retries);</div><div class='add'>+</div><div class='add'>+			txpending = 1;</div><div class='ctx'> 		} else {</div><div class='del'>-			if ((tid-&gt;state &amp; AGGR_CLEANUP) || !retry) {</div><div class='del'>-				/*</div><div class='del'>-				 * cleanup in progress, just fail</div><div class='del'>-				 * the un-acked sub-frames</div><div class='del'>-				 */</div><div class='del'>-				txfail = 1;</div><div class='del'>-			} else if (flush) {</div><div class='del'>-				txpending = 1;</div><div class='del'>-			} else if (fi-&gt;retries &lt; ATH_MAX_SW_RETRIES) {</div><div class='del'>-				if (txok || !an-&gt;sleeping)</div><div class='del'>-					ath_tx_set_retry(sc, txq, bf-&gt;bf_mpdu);</div><div class='del'>-</div><div class='del'>-				txpending = 1;</div><div class='del'>-			} else {</div><div class='del'>-				txfail = 1;</div><div class='del'>-				sendbar = 1;</div><div class='del'>-				txfail_cnt++;</div><div class='del'>-			}</div><div class='add'>+			txfail = 1;</div><div class='add'>+			txfail_cnt++;</div><div class='add'>+			bar_index = max_t(int, bar_index,</div><div class='add'>+				ATH_BA_INDEX(seq_first, seqno));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -490,9 +538,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 			 * complete the acked-ones/xretried ones; update</div><div class='ctx'> 			 * block-ack window</div><div class='ctx'> 			 */</div><div class='del'>-			spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> 			ath_tx_update_baw(sc, tid, seqno);</div><div class='del'>-			spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> </div><div class='ctx'> 			if (rc_update &amp;&amp; (acked_cnt == 1 || txfail_cnt == 1)) {</div><div class='ctx'> 				memcpy(tx_info-&gt;control.rates, rates, sizeof(rates));</div><div class='hunk'>@@ -501,33 +547,30 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			ath_tx_complete_buf(sc, bf, txq, &amp;bf_head, ts,</div><div class='del'>-				!txfail, sendbar);</div><div class='add'>+				!txfail);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* retry the un-acked ones */</div><div class='del'>-			if (!(sc-&gt;sc_ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_EDMA)) {</div><div class='del'>-				if (bf-&gt;bf_next == NULL &amp;&amp; bf_last-&gt;bf_stale) {</div><div class='del'>-					struct ath_buf *tbf;</div><div class='del'>-</div><div class='del'>-					tbf = ath_clone_txbuf(sc, bf_last);</div><div class='del'>-					/*</div><div class='del'>-					 * Update tx baw and complete the</div><div class='del'>-					 * frame with failed status if we</div><div class='del'>-					 * run out of tx buf.</div><div class='del'>-					 */</div><div class='del'>-					if (!tbf) {</div><div class='del'>-						spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='del'>-						ath_tx_update_baw(sc, tid, seqno);</div><div class='del'>-						spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='del'>-</div><div class='del'>-						ath_tx_complete_buf(sc, bf, txq,</div><div class='del'>-								    &amp;bf_head,</div><div class='del'>-								    ts, 0,</div><div class='del'>-								    !flush);</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-					fi-&gt;bf = tbf;</div><div class='add'>+			if (!(sc-&gt;sc_ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_EDMA) &amp;&amp;</div><div class='add'>+			    bf-&gt;bf_next == NULL &amp;&amp; bf_last-&gt;bf_stale) {</div><div class='add'>+				struct ath_buf *tbf;</div><div class='add'>+</div><div class='add'>+				tbf = ath_clone_txbuf(sc, bf_last);</div><div class='add'>+				/*</div><div class='add'>+				 * Update tx baw and complete the</div><div class='add'>+				 * frame with failed status if we</div><div class='add'>+				 * run out of tx buf.</div><div class='add'>+				 */</div><div class='add'>+				if (!tbf) {</div><div class='add'>+					ath_tx_update_baw(sc, tid, seqno);</div><div class='add'>+</div><div class='add'>+					ath_tx_complete_buf(sc, bf, txq,</div><div class='add'>+							    &amp;bf_head, ts, 0);</div><div class='add'>+					bar_index = max_t(int, bar_index,</div><div class='add'>+						ATH_BA_INDEX(seq_first, seqno));</div><div class='add'>+					break;</div><div class='ctx'> 				}</div><div class='add'>+</div><div class='add'>+				fi-&gt;bf = tbf;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='hunk'>@@ -545,7 +588,6 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 		if (an-&gt;sleeping)</div><div class='ctx'> 			ieee80211_sta_set_buffered(sta, tid-&gt;tidno, true);</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> 		skb_queue_splice(&amp;bf_pending, &amp;tid-&gt;buf_q);</div><div class='ctx'> 		if (!an-&gt;sleeping) {</div><div class='ctx'> 			ath_tx_queue_tid(txq, tid);</div><div class='hunk'>@@ -553,18 +595,22 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 			if (ts-&gt;ts_status &amp; ATH9K_TXERR_FILT)</div><div class='ctx'> 				tid-&gt;ac-&gt;clear_ps_filter = true;</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tid-&gt;state &amp; AGGR_CLEANUP) {</div><div class='del'>-		ath_tx_flush_tid(sc, tid);</div><div class='add'>+	if (bar_index &gt;= 0) {</div><div class='add'>+		u16 bar_seq = ATH_BA_INDEX2SEQ(seq_first, bar_index);</div><div class='ctx'> </div><div class='del'>-		if (tid-&gt;baw_head == tid-&gt;baw_tail) {</div><div class='del'>-			tid-&gt;state &amp;= ~AGGR_ADDBA_COMPLETE;</div><div class='del'>-			tid-&gt;state &amp;= ~AGGR_CLEANUP;</div><div class='del'>-		}</div><div class='add'>+		if (BAW_WITHIN(tid-&gt;seq_start, tid-&gt;baw_size, bar_seq))</div><div class='add'>+			tid-&gt;bar_index = ATH_BA_INDEX(tid-&gt;seq_start, bar_seq);</div><div class='add'>+</div><div class='add'>+		ath_txq_unlock(sc, txq);</div><div class='add'>+		ath_send_bar(tid, ATH_BA_INDEX2SEQ(seq_first, bar_index + 1));</div><div class='add'>+		ath_txq_lock(sc, txq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (tid-&gt;state &amp; AGGR_CLEANUP)</div><div class='add'>+		ath_tx_flush_tid(sc, tid);</div><div class='add'>+</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (needreset) {</div><div class='hunk'>@@ -601,6 +647,7 @@ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct ieee80211_tx_info *tx_info;</div><div class='ctx'> 	struct ieee80211_tx_rate *rates;</div><div class='add'>+	struct ath_mci_profile *mci = &amp;sc-&gt;btcoex.mci;</div><div class='ctx'> 	u32 max_4ms_framelen, frmlen;</div><div class='ctx'> 	u16 aggr_limit, legacy = 0;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -617,24 +664,26 @@ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 	max_4ms_framelen = ATH_AMPDU_LIMIT_MAX;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		if (rates[i].count) {</div><div class='del'>-			int modeidx;</div><div class='del'>-			if (!(rates[i].flags &amp; IEEE80211_TX_RC_MCS)) {</div><div class='del'>-				legacy = 1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (rates[i].flags &amp; IEEE80211_TX_RC_40_MHZ_WIDTH)</div><div class='del'>-				modeidx = MCS_HT40;</div><div class='del'>-			else</div><div class='del'>-				modeidx = MCS_HT20;</div><div class='add'>+		int modeidx;</div><div class='ctx'> </div><div class='del'>-			if (rates[i].flags &amp; IEEE80211_TX_RC_SHORT_GI)</div><div class='del'>-				modeidx++;</div><div class='add'>+		if (!rates[i].count)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-			frmlen = ath_max_4ms_framelen[modeidx][rates[i].idx];</div><div class='del'>-			max_4ms_framelen = min(max_4ms_framelen, frmlen);</div><div class='add'>+		if (!(rates[i].flags &amp; IEEE80211_TX_RC_MCS)) {</div><div class='add'>+			legacy = 1;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (rates[i].flags &amp; IEEE80211_TX_RC_40_MHZ_WIDTH)</div><div class='add'>+			modeidx = MCS_HT40;</div><div class='add'>+		else</div><div class='add'>+			modeidx = MCS_HT20;</div><div class='add'>+</div><div class='add'>+		if (rates[i].flags &amp; IEEE80211_TX_RC_SHORT_GI)</div><div class='add'>+			modeidx++;</div><div class='add'>+</div><div class='add'>+		frmlen = ath_max_4ms_framelen[modeidx][rates[i].idx];</div><div class='add'>+		max_4ms_framelen = min(max_4ms_framelen, frmlen);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -645,7 +694,9 @@ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 	if (tx_info-&gt;flags &amp; IEEE80211_TX_CTL_RATE_CTRL_PROBE || legacy)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (sc-&gt;sc_flags &amp; SC_OP_BT_PRIORITY_DETECTED)</div><div class='add'>+	if ((sc-&gt;sc_ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_MCI) &amp;&amp; mci-&gt;aggr_limit)</div><div class='add'>+		aggr_limit = (max_4ms_framelen * mci-&gt;aggr_limit) &gt;&gt; 4;</div><div class='add'>+	else if (sc-&gt;sc_flags &amp; SC_OP_BT_PRIORITY_DETECTED)</div><div class='ctx'> 		aggr_limit = min((max_4ms_framelen * 3) / 8,</div><div class='ctx'> 				 (u32)ATH_AMPDU_LIMIT_MAX);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -768,8 +819,6 @@ static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,</div><div class='ctx'> </div><div class='ctx'> 		bf-&gt;bf_state.bf_type = BUF_AMPDU | BUF_AGGR;</div><div class='ctx'> 		seqno = bf-&gt;bf_state.seqno;</div><div class='del'>-		if (!bf_first)</div><div class='del'>-			bf_first = bf;</div><div class='ctx'> </div><div class='ctx'> 		/* do not step over block-ack window */</div><div class='ctx'> 		if (!BAW_WITHIN(tid-&gt;seq_start, tid-&gt;baw_size, seqno)) {</div><div class='hunk'>@@ -777,6 +826,21 @@ static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (tid-&gt;bar_index &gt; ATH_BA_INDEX(tid-&gt;seq_start, seqno)) {</div><div class='add'>+			struct ath_tx_status ts = {};</div><div class='add'>+			struct list_head bf_head;</div><div class='add'>+</div><div class='add'>+			INIT_LIST_HEAD(&amp;bf_head);</div><div class='add'>+			list_add(&amp;bf-&gt;list, &amp;bf_head);</div><div class='add'>+			__skb_unlink(skb, &amp;tid-&gt;buf_q);</div><div class='add'>+			ath_tx_update_baw(sc, tid, seqno);</div><div class='add'>+			ath_tx_complete_buf(sc, bf, txq, &amp;bf_head, &amp;ts, 0);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!bf_first)</div><div class='add'>+			bf_first = bf;</div><div class='add'>+</div><div class='ctx'> 		if (!rl) {</div><div class='ctx'> 			aggr_limit = ath_lookup_rate(sc, bf, tid);</div><div class='ctx'> 			rl = 1;</div><div class='hunk'>@@ -1119,6 +1183,7 @@ int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,</div><div class='ctx'> 	txtid-&gt;state |= AGGR_ADDBA_PROGRESS;</div><div class='ctx'> 	txtid-&gt;paused = true;</div><div class='ctx'> 	*ssn = txtid-&gt;seq_start = txtid-&gt;seq_next;</div><div class='add'>+	txtid-&gt;bar_index = -1;</div><div class='ctx'> </div><div class='ctx'> 	memset(txtid-&gt;tx_buf, 0, sizeof(txtid-&gt;tx_buf));</div><div class='ctx'> 	txtid-&gt;baw_head = txtid-&gt;baw_tail = 0;</div><div class='hunk'>@@ -1140,7 +1205,7 @@ void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+	ath_txq_lock(sc, txq);</div><div class='ctx'> 	txtid-&gt;paused = true;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1153,9 +1218,9 @@ void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid)</div><div class='ctx'> 		txtid-&gt;state |= AGGR_CLEANUP;</div><div class='ctx'> 	else</div><div class='ctx'> 		txtid-&gt;state &amp;= ~AGGR_ADDBA_COMPLETE;</div><div class='del'>-	spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> </div><div class='ctx'> 	ath_tx_flush_tid(sc, txtid);</div><div class='add'>+	ath_txq_unlock_complete(sc, txq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ath_tx_aggr_sleep(struct ieee80211_sta *sta, struct ath_softc *sc,</div><div class='hunk'>@@ -1176,7 +1241,7 @@ void ath_tx_aggr_sleep(struct ieee80211_sta *sta, struct ath_softc *sc,</div><div class='ctx'> 		ac = tid-&gt;ac;</div><div class='ctx'> 		txq = ac-&gt;txq;</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+		ath_txq_lock(sc, txq);</div><div class='ctx'> </div><div class='ctx'> 		buffered = !skb_queue_empty(&amp;tid-&gt;buf_q);</div><div class='ctx'> </div><div class='hunk'>@@ -1188,7 +1253,7 @@ void ath_tx_aggr_sleep(struct ieee80211_sta *sta, struct ath_softc *sc,</div><div class='ctx'> 			list_del(&amp;ac-&gt;list);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+		ath_txq_unlock(sc, txq);</div><div class='ctx'> </div><div class='ctx'> 		ieee80211_sta_set_buffered(sta, tidno, buffered);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1207,7 +1272,7 @@ void ath_tx_aggr_wakeup(struct ath_softc *sc, struct ath_node *an)</div><div class='ctx'> 		ac = tid-&gt;ac;</div><div class='ctx'> 		txq = ac-&gt;txq;</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+		ath_txq_lock(sc, txq);</div><div class='ctx'> 		ac-&gt;clear_ps_filter = true;</div><div class='ctx'> </div><div class='ctx'> 		if (!skb_queue_empty(&amp;tid-&gt;buf_q) &amp;&amp; !tid-&gt;paused) {</div><div class='hunk'>@@ -1215,7 +1280,7 @@ void ath_tx_aggr_wakeup(struct ath_softc *sc, struct ath_node *an)</div><div class='ctx'> 			ath_txq_schedule(sc, txq);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+		ath_txq_unlock_complete(sc, txq);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1315,6 +1380,7 @@ struct ath_txq *ath_txq_setup(struct ath_softc *sc, int qtype, int subtype)</div><div class='ctx'> 		txq-&gt;axq_qnum = axq_qnum;</div><div class='ctx'> 		txq-&gt;mac80211_qnum = -1;</div><div class='ctx'> 		txq-&gt;axq_link = NULL;</div><div class='add'>+		__skb_queue_head_init(&amp;txq-&gt;complete_q);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;txq-&gt;axq_q);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;txq-&gt;axq_acq);</div><div class='ctx'> 		spin_lock_init(&amp;txq-&gt;axq_lock);</div><div class='hunk'>@@ -1397,8 +1463,6 @@ static bool bf_is_ampdu_not_probing(struct ath_buf *bf)</div><div class='ctx'> </div><div class='ctx'> static void ath_drain_txq_list(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 			       struct list_head *list, bool retry_tx)</div><div class='del'>-	__releases(txq-&gt;axq_lock)</div><div class='del'>-	__acquires(txq-&gt;axq_lock)</div><div class='ctx'> {</div><div class='ctx'> 	struct ath_buf *bf, *lastbf;</div><div class='ctx'> 	struct list_head bf_head;</div><div class='hunk'>@@ -1425,13 +1489,11 @@ static void ath_drain_txq_list(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 		if (bf_is_ampdu_not_probing(bf))</div><div class='ctx'> 			txq-&gt;axq_ampdu_depth--;</div><div class='ctx'> </div><div class='del'>-		spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> 		if (bf_isampdu(bf))</div><div class='ctx'> 			ath_tx_complete_aggr(sc, txq, bf, &amp;bf_head, &amp;ts, 0,</div><div class='ctx'> 					     retry_tx);</div><div class='ctx'> 		else</div><div class='del'>-			ath_tx_complete_buf(sc, bf, txq, &amp;bf_head, &amp;ts, 0, 0);</div><div class='del'>-		spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+			ath_tx_complete_buf(sc, bf, txq, &amp;bf_head, &amp;ts, 0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1443,7 +1505,8 @@ static void ath_drain_txq_list(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'>  */</div><div class='ctx'> void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq, bool retry_tx)</div><div class='ctx'> {</div><div class='del'>-	spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+	ath_txq_lock(sc, txq);</div><div class='add'>+</div><div class='ctx'> 	if (sc-&gt;sc_ah-&gt;caps.hw_caps &amp; ATH9K_HW_CAP_EDMA) {</div><div class='ctx'> 		int idx = txq-&gt;txq_tailidx;</div><div class='ctx'> </div><div class='hunk'>@@ -1464,7 +1527,7 @@ void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq, bool retry_tx)</div><div class='ctx'> 	if ((sc-&gt;sc_flags &amp; SC_OP_TXAGGR) &amp;&amp; !retry_tx)</div><div class='ctx'> 		ath_txq_drain_pending_buffers(sc, txq);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+	ath_txq_unlock_complete(sc, txq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)</div><div class='hunk'>@@ -1558,11 +1621,9 @@ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!list_empty(&amp;ac-&gt;tid_q)) {</div><div class='del'>-			if (!ac-&gt;sched) {</div><div class='del'>-				ac-&gt;sched = true;</div><div class='del'>-				list_add_tail(&amp;ac-&gt;list, &amp;txq-&gt;axq_acq);</div><div class='del'>-			}</div><div class='add'>+		if (!list_empty(&amp;ac-&gt;tid_q) &amp;&amp; !ac-&gt;sched) {</div><div class='add'>+			ac-&gt;sched = true;</div><div class='add'>+			list_add_tail(&amp;ac-&gt;list, &amp;txq-&gt;axq_acq);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ac == last_ac ||</div><div class='hunk'>@@ -1600,8 +1661,8 @@ static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 	bf = list_first_entry(head, struct ath_buf, list);</div><div class='ctx'> 	bf_last = list_entry(head-&gt;prev, struct ath_buf, list);</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_QUEUE,</div><div class='del'>-		"qnum: %d, txq depth: %d\n", txq-&gt;axq_qnum, txq-&gt;axq_depth);</div><div class='add'>+	ath_dbg(common, QUEUE, "qnum: %d, txq depth: %d\n",</div><div class='add'>+		txq-&gt;axq_qnum, txq-&gt;axq_depth);</div><div class='ctx'> </div><div class='ctx'> 	if (edma &amp;&amp; list_empty(&amp;txq-&gt;txq_fifo[txq-&gt;txq_headidx])) {</div><div class='ctx'> 		list_splice_tail_init(head, &amp;txq-&gt;txq_fifo[txq-&gt;txq_headidx]);</div><div class='hunk'>@@ -1612,8 +1673,7 @@ static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> </div><div class='ctx'> 		if (txq-&gt;axq_link) {</div><div class='ctx'> 			ath9k_hw_set_desc_link(ah, txq-&gt;axq_link, bf-&gt;bf_daddr);</div><div class='del'>-			ath_dbg(common, ATH_DBG_XMIT,</div><div class='del'>-				"link[%u] (%p)=%llx (%p)\n",</div><div class='add'>+			ath_dbg(common, XMIT, "link[%u] (%p)=%llx (%p)\n",</div><div class='ctx'> 				txq-&gt;axq_qnum, txq-&gt;axq_link,</div><div class='ctx'> 				ito64(bf-&gt;bf_daddr), bf-&gt;bf_desc);</div><div class='ctx'> 		} else if (!edma)</div><div class='hunk'>@@ -1625,7 +1685,7 @@ static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 	if (puttxbuf) {</div><div class='ctx'> 		TX_STAT_INC(txq-&gt;axq_qnum, puttxbuf);</div><div class='ctx'> 		ath9k_hw_puttxbuf(ah, txq-&gt;axq_qnum, bf-&gt;bf_daddr);</div><div class='del'>-		ath_dbg(common, ATH_DBG_XMIT, "TXDP[%u] = %llx (%p)\n",</div><div class='add'>+		ath_dbg(common, XMIT, "TXDP[%u] = %llx (%p)\n",</div><div class='ctx'> 			txq-&gt;axq_qnum, ito64(bf-&gt;bf_daddr), bf-&gt;bf_desc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1705,10 +1765,6 @@ static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 	list_add_tail(&amp;bf-&gt;list, &amp;bf_head);</div><div class='ctx'> 	bf-&gt;bf_state.bf_type = 0;</div><div class='ctx'> </div><div class='del'>-	/* update starting sequence number for subsequent ADDBA request */</div><div class='del'>-	if (tid)</div><div class='del'>-		INCR(tid-&gt;seq_start, IEEE80211_SEQ_MAX);</div><div class='del'>-</div><div class='ctx'> 	bf-&gt;bf_lastbf = bf;</div><div class='ctx'> 	ath_tx_fill_desc(sc, bf, txq, fi-&gt;framelen);</div><div class='ctx'> 	ath_tx_txqaddbuf(sc, txq, &amp;bf_head, false);</div><div class='hunk'>@@ -1771,7 +1827,7 @@ static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc,</div><div class='ctx'> </div><div class='ctx'> 	bf = ath_tx_get_buffer(sc);</div><div class='ctx'> 	if (!bf) {</div><div class='del'>-		ath_dbg(common, ATH_DBG_XMIT, "TX buffers are full\n");</div><div class='add'>+		ath_dbg(common, XMIT, "TX buffers are full\n");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1816,7 +1872,6 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct sk_buff *skb,</div><div class='ctx'> 	struct ath_buf *bf;</div><div class='ctx'> 	u8 tidno;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;txctl-&gt;txq-&gt;axq_lock);</div><div class='ctx'> 	if ((sc-&gt;sc_flags &amp; SC_OP_TXAGGR) &amp;&amp; txctl-&gt;an &amp;&amp;</div><div class='ctx'> 		ieee80211_is_data_qos(hdr-&gt;frame_control)) {</div><div class='ctx'> 		tidno = ieee80211_get_qos_ctl(hdr)[0] &amp;</div><div class='hunk'>@@ -1835,7 +1890,7 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct sk_buff *skb,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bf = ath_tx_setup_buffer(sc, txctl-&gt;txq, tid, skb);</div><div class='ctx'> 		if (!bf)</div><div class='del'>-			goto out;</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='ctx'> 		bf-&gt;bf_state.bfs_paprd = txctl-&gt;paprd;</div><div class='ctx'> </div><div class='hunk'>@@ -1844,9 +1899,6 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 		ath_tx_send_normal(sc, txctl-&gt;txq, tid, skb);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	spin_unlock_bh(&amp;txctl-&gt;txq-&gt;axq_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Upon failure caller should free skb */</div><div class='hunk'>@@ -1907,15 +1959,18 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	q = skb_get_queue_mapping(skb);</div><div class='del'>-	spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+</div><div class='add'>+	ath_txq_lock(sc, txq);</div><div class='ctx'> 	if (txq == sc-&gt;tx.txq_map[q] &amp;&amp;</div><div class='ctx'> 	    ++txq-&gt;pending_frames &gt; ATH_MAX_QDEPTH &amp;&amp; !txq-&gt;stopped) {</div><div class='ctx'> 		ieee80211_stop_queue(sc-&gt;hw, q);</div><div class='del'>-		txq-&gt;stopped = 1;</div><div class='add'>+		txq-&gt;stopped = true;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> </div><div class='ctx'> 	ath_tx_start_dma(sc, skb, txctl);</div><div class='add'>+</div><div class='add'>+	ath_txq_unlock(sc, txq);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1926,16 +1981,12 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,</div><div class='ctx'> static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,</div><div class='ctx'> 			    int tx_flags, struct ath_txq *txq)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_hw *hw = sc-&gt;hw;</div><div class='ctx'> 	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> 	struct ath_common *common = ath9k_hw_common(sc-&gt;sc_ah);</div><div class='ctx'> 	struct ieee80211_hdr * hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='ctx'> 	int q, padpos, padsize;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_XMIT, "TX complete: skb: %p\n", skb);</div><div class='del'>-</div><div class='del'>-	if (tx_flags &amp; ATH_TX_BAR)</div><div class='del'>-		tx_info-&gt;flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;</div><div class='add'>+	ath_dbg(common, XMIT, "TX complete: skb: %p\n", skb);</div><div class='ctx'> </div><div class='ctx'> 	if (!(tx_flags &amp; ATH_TX_ERROR))</div><div class='ctx'> 		/* Frame was ACKed */</div><div class='hunk'>@@ -1952,9 +2003,9 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,</div><div class='ctx'> 		skb_pull(skb, padsize);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sc-&gt;ps_flags &amp; PS_WAIT_FOR_TX_ACK) {</div><div class='add'>+	if ((sc-&gt;ps_flags &amp; PS_WAIT_FOR_TX_ACK) &amp;&amp; !txq-&gt;axq_depth) {</div><div class='ctx'> 		sc-&gt;ps_flags &amp;= ~PS_WAIT_FOR_TX_ACK;</div><div class='del'>-		ath_dbg(common, ATH_DBG_PS,</div><div class='add'>+		ath_dbg(common, PS,</div><div class='ctx'> 			"Going back to sleep after having received TX status (0x%lx)\n",</div><div class='ctx'> 			sc-&gt;ps_flags &amp; (PS_WAIT_FOR_BEACON |</div><div class='ctx'> 					PS_WAIT_FOR_CAB |</div><div class='hunk'>@@ -1964,32 +2015,27 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	q = skb_get_queue_mapping(skb);</div><div class='ctx'> 	if (txq == sc-&gt;tx.txq_map[q]) {</div><div class='del'>-		spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> 		if (WARN_ON(--txq-&gt;pending_frames &lt; 0))</div><div class='ctx'> 			txq-&gt;pending_frames = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (txq-&gt;stopped &amp;&amp; txq-&gt;pending_frames &lt; ATH_MAX_QDEPTH) {</div><div class='ctx'> 			ieee80211_wake_queue(sc-&gt;hw, q);</div><div class='del'>-			txq-&gt;stopped = 0;</div><div class='add'>+			txq-&gt;stopped = false;</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ieee80211_tx_status(hw, skb);</div><div class='add'>+	__skb_queue_tail(&amp;txq-&gt;complete_q, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> 				struct ath_txq *txq, struct list_head *bf_q,</div><div class='del'>-				struct ath_tx_status *ts, int txok, int sendbar)</div><div class='add'>+				struct ath_tx_status *ts, int txok)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = bf-&gt;bf_mpdu;</div><div class='ctx'> 	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int tx_flags = 0;</div><div class='ctx'> </div><div class='del'>-	if (sendbar)</div><div class='del'>-		tx_flags = ATH_TX_BAR;</div><div class='del'>-</div><div class='ctx'> 	if (!txok)</div><div class='ctx'> 		tx_flags |= ATH_TX_ERROR;</div><div class='ctx'> </div><div class='hunk'>@@ -2081,8 +2127,6 @@ static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf,</div><div class='ctx'> static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 				  struct ath_tx_status *ts, struct ath_buf *bf,</div><div class='ctx'> 				  struct list_head *bf_head)</div><div class='del'>-	__releases(txq-&gt;axq_lock)</div><div class='del'>-	__acquires(txq-&gt;axq_lock)</div><div class='ctx'> {</div><div class='ctx'> 	int txok;</div><div class='ctx'> </div><div class='hunk'>@@ -2092,16 +2136,12 @@ static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq,</div><div class='ctx'> 	if (bf_is_ampdu_not_probing(bf))</div><div class='ctx'> 		txq-&gt;axq_ampdu_depth--;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='del'>-</div><div class='ctx'> 	if (!bf_isampdu(bf)) {</div><div class='ctx'> 		ath_tx_rc_status(sc, bf, ts, 1, txok ? 0 : 1, txok);</div><div class='del'>-		ath_tx_complete_buf(sc, bf, txq, bf_head, ts, txok, 0);</div><div class='add'>+		ath_tx_complete_buf(sc, bf, txq, bf_head, ts, txok);</div><div class='ctx'> 	} else</div><div class='ctx'> 		ath_tx_complete_aggr(sc, txq, bf, bf_head, ts, txok, true);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='del'>-</div><div class='ctx'> 	if (sc-&gt;sc_flags &amp; SC_OP_TXAGGR)</div><div class='ctx'> 		ath_txq_schedule(sc, txq);</div><div class='ctx'> }</div><div class='hunk'>@@ -2116,11 +2156,11 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)</div><div class='ctx'> 	struct ath_tx_status ts;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	ath_dbg(common, ATH_DBG_QUEUE, "tx queue %d (%x), link %p\n",</div><div class='add'>+	ath_dbg(common, QUEUE, "tx queue %d (%x), link %p\n",</div><div class='ctx'> 		txq-&gt;axq_qnum, ath9k_hw_gettxbuf(sc-&gt;sc_ah, txq-&gt;axq_qnum),</div><div class='ctx'> 		txq-&gt;axq_link);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+	ath_txq_lock(sc, txq);</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		if (work_pending(&amp;sc-&gt;hw_reset_work))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2179,7 +2219,7 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)</div><div class='ctx'> </div><div class='ctx'> 		ath_tx_process_buffer(sc, txq, &amp;ts, bf, &amp;bf_head);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+	ath_txq_unlock_complete(sc, txq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ath_tx_complete_poll_work(struct work_struct *work)</div><div class='hunk'>@@ -2196,21 +2236,21 @@ static void ath_tx_complete_poll_work(struct work_struct *work)</div><div class='ctx'> 	for (i = 0; i &lt; ATH9K_NUM_TX_QUEUES; i++)</div><div class='ctx'> 		if (ATH_TXQ_SETUP(sc, i)) {</div><div class='ctx'> 			txq = &amp;sc-&gt;tx.txq[i];</div><div class='del'>-			spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+			ath_txq_lock(sc, txq);</div><div class='ctx'> 			if (txq-&gt;axq_depth) {</div><div class='ctx'> 				if (txq-&gt;axq_tx_inprogress) {</div><div class='ctx'> 					needreset = true;</div><div class='del'>-					spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+					ath_txq_unlock(sc, txq);</div><div class='ctx'> 					break;</div><div class='ctx'> 				} else {</div><div class='ctx'> 					txq-&gt;axq_tx_inprogress = true;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-			spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+			ath_txq_unlock_complete(sc, txq);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	if (needreset) {</div><div class='del'>-		ath_dbg(ath9k_hw_common(sc-&gt;sc_ah), ATH_DBG_RESET,</div><div class='add'>+		ath_dbg(ath9k_hw_common(sc-&gt;sc_ah), RESET,</div><div class='ctx'> 			"tx hung, resetting the chip\n");</div><div class='ctx'> 		RESET_STAT_INC(sc, RESET_TYPE_TX_HANG);</div><div class='ctx'> 		ieee80211_queue_work(sc-&gt;hw, &amp;sc-&gt;hw_reset_work);</div><div class='hunk'>@@ -2253,8 +2293,7 @@ void ath_tx_edma_tasklet(struct ath_softc *sc)</div><div class='ctx'> 		if (status == -EINPROGRESS)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (status == -EIO) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_XMIT,</div><div class='del'>-				"Error processing tx status\n");</div><div class='add'>+			ath_dbg(common, XMIT, "Error processing tx status\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2264,10 +2303,10 @@ void ath_tx_edma_tasklet(struct ath_softc *sc)</div><div class='ctx'> </div><div class='ctx'> 		txq = &amp;sc-&gt;tx.txq[ts.qid];</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+		ath_txq_lock(sc, txq);</div><div class='ctx'> </div><div class='ctx'> 		if (list_empty(&amp;txq-&gt;txq_fifo[txq-&gt;txq_tailidx])) {</div><div class='del'>-			spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+			ath_txq_unlock(sc, txq);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2293,7 +2332,7 @@ void ath_tx_edma_tasklet(struct ath_softc *sc)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ath_tx_process_buffer(sc, txq, &amp;ts, bf, &amp;bf_head);</div><div class='del'>-		spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+		ath_txq_unlock_complete(sc, txq);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2431,7 +2470,7 @@ void ath_tx_node_cleanup(struct ath_softc *sc, struct ath_node *an)</div><div class='ctx'> 		ac = tid-&gt;ac;</div><div class='ctx'> 		txq = ac-&gt;txq;</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+		ath_txq_lock(sc, txq);</div><div class='ctx'> </div><div class='ctx'> 		if (tid-&gt;sched) {</div><div class='ctx'> 			list_del(&amp;tid-&gt;list);</div><div class='hunk'>@@ -2447,6 +2486,6 @@ void ath_tx_node_cleanup(struct ath_softc *sc, struct ath_node *an)</div><div class='ctx'> 		tid-&gt;state &amp;= ~AGGR_ADDBA_COMPLETE;</div><div class='ctx'> 		tid-&gt;state &amp;= ~AGGR_CLEANUP;</div><div class='ctx'> </div><div class='del'>-		spin_unlock_bh(&amp;txq-&gt;axq_lock);</div><div class='add'>+		ath_txq_unlock(sc, txq);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/ath/carl9170/debug.c b/drivers/net/wireless/ath/carl9170/debug.c<br/>index de57f90e1d5f..3c164226687f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/carl9170/debug.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/carl9170/debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/carl9170/debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/carl9170/debug.c</a></div><div class='hunk'>@@ -56,7 +56,7 @@ static int carl9170_debugfs_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> struct carl9170_debugfs_fops {</div><div class='ctx'> 	unsigned int read_bufsize;</div><div class='del'>-	mode_t attr;</div><div class='add'>+	umode_t attr;</div><div class='ctx'> 	char *(*read)(struct ar9170 *ar, char *buf, size_t bufsize,</div><div class='ctx'> 		      ssize_t *len);</div><div class='ctx'> 	ssize_t (*write)(struct ar9170 *aru, const char *buf, size_t size);</div><div class='head'>diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c<br/>index cba9d0435dc4..3de61adacd34 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/carl9170/fw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/carl9170/fw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/carl9170/fw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/carl9170/fw.c</a></div><div class='hunk'>@@ -146,13 +146,15 @@ static bool valid_cpu_addr(const u32 address)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len)</div><div class='add'>+static int carl9170_fw_checksum(struct ar9170 *ar, const __u8 *data,</div><div class='add'>+				size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	const struct carl9170fw_otus_desc *otus_desc;</div><div class='del'>-	const struct carl9170fw_chk_desc *chk_desc;</div><div class='ctx'> 	const struct carl9170fw_last_desc *last_desc;</div><div class='del'>-	const struct carl9170fw_txsq_desc *txsq_desc;</div><div class='del'>-	u16 if_comb_types;</div><div class='add'>+	const struct carl9170fw_chk_desc *chk_desc;</div><div class='add'>+	unsigned long fin, diff;</div><div class='add'>+	unsigned int dsc_len;</div><div class='add'>+	u32 crc32;</div><div class='ctx'> </div><div class='ctx'> 	last_desc = carl9170_fw_find_desc(ar, LAST_MAGIC,</div><div class='ctx'> 		sizeof(*last_desc), CARL9170FW_LAST_DESC_CUR_VER);</div><div class='hunk'>@@ -170,36 +172,68 @@ static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len)</div><div class='ctx'> 	chk_desc = carl9170_fw_find_desc(ar, CHK_MAGIC,</div><div class='ctx'> 		sizeof(*chk_desc), CARL9170FW_CHK_DESC_CUR_VER);</div><div class='ctx'> </div><div class='del'>-	if (chk_desc) {</div><div class='del'>-		unsigned long fin, diff;</div><div class='del'>-		unsigned int dsc_len;</div><div class='del'>-		u32 crc32;</div><div class='add'>+	if (!chk_desc) {</div><div class='add'>+		dev_warn(&amp;ar-&gt;udev-&gt;dev, "Unprotected firmware image.\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		dsc_len = min_t(unsigned int, len,</div><div class='add'>+	dsc_len = min_t(unsigned int, len,</div><div class='ctx'> 			(unsigned long)chk_desc - (unsigned long)otus_desc);</div><div class='ctx'> </div><div class='del'>-		fin = (unsigned long) last_desc + sizeof(*last_desc);</div><div class='del'>-		diff = fin - (unsigned long) otus_desc;</div><div class='add'>+	fin = (unsigned long) last_desc + sizeof(*last_desc);</div><div class='add'>+	diff = fin - (unsigned long) otus_desc;</div><div class='ctx'> </div><div class='del'>-		if (diff &lt; len)</div><div class='del'>-			len -= diff;</div><div class='add'>+	if (diff &lt; len)</div><div class='add'>+		len -= diff;</div><div class='ctx'> </div><div class='del'>-		if (len &lt; 256)</div><div class='del'>-			return -EIO;</div><div class='add'>+	if (len &lt; 256)</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='del'>-		crc32 = crc32_le(~0, data, len);</div><div class='del'>-		if (cpu_to_le32(crc32) != chk_desc-&gt;fw_crc32) {</div><div class='del'>-			dev_err(&amp;ar-&gt;udev-&gt;dev, "fw checksum test failed.\n");</div><div class='del'>-			return -ENOEXEC;</div><div class='del'>-		}</div><div class='add'>+	crc32 = crc32_le(~0, data, len);</div><div class='add'>+	if (cpu_to_le32(crc32) != chk_desc-&gt;fw_crc32) {</div><div class='add'>+		dev_err(&amp;ar-&gt;udev-&gt;dev, "fw checksum test failed.\n");</div><div class='add'>+		return -ENOEXEC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	crc32 = crc32_le(crc32, (void *)otus_desc, dsc_len);</div><div class='add'>+	if (cpu_to_le32(crc32) != chk_desc-&gt;hdr_crc32) {</div><div class='add'>+		dev_err(&amp;ar-&gt;udev-&gt;dev, "descriptor check failed.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		crc32 = crc32_le(crc32, (void *)otus_desc, dsc_len);</div><div class='del'>-		if (cpu_to_le32(crc32) != chk_desc-&gt;hdr_crc32) {</div><div class='del'>-			dev_err(&amp;ar-&gt;udev-&gt;dev, "descriptor check failed.\n");</div><div class='add'>+static int carl9170_fw_tx_sequence(struct ar9170 *ar)</div><div class='add'>+{</div><div class='add'>+	const struct carl9170fw_txsq_desc *txsq_desc;</div><div class='add'>+</div><div class='add'>+	txsq_desc = carl9170_fw_find_desc(ar, TXSQ_MAGIC, sizeof(*txsq_desc),</div><div class='add'>+					  CARL9170FW_TXSQ_DESC_CUR_VER);</div><div class='add'>+	if (txsq_desc) {</div><div class='add'>+		ar-&gt;fw.tx_seq_table = le32_to_cpu(txsq_desc-&gt;seq_table_addr);</div><div class='add'>+		if (!valid_cpu_addr(ar-&gt;fw.tx_seq_table))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		}</div><div class='ctx'> 	} else {</div><div class='del'>-		dev_warn(&amp;ar-&gt;udev-&gt;dev, "Unprotected firmware image.\n");</div><div class='add'>+		ar-&gt;fw.tx_seq_table = 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 carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len)</div><div class='add'>+{</div><div class='add'>+	const struct carl9170fw_otus_desc *otus_desc;</div><div class='add'>+	int err;</div><div class='add'>+	u16 if_comb_types;</div><div class='add'>+</div><div class='add'>+	err = carl9170_fw_checksum(ar, data, len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	otus_desc = carl9170_fw_find_desc(ar, OTUS_MAGIC,</div><div class='add'>+		sizeof(*otus_desc), CARL9170FW_OTUS_DESC_CUR_VER);</div><div class='add'>+	if (!otus_desc) {</div><div class='add'>+		return -ENODATA;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #define SUPP(feat)						\</div><div class='hunk'>@@ -321,19 +355,8 @@ static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len)</div><div class='ctx'> </div><div class='ctx'> 	ar-&gt;hw-&gt;wiphy-&gt;interface_modes |= if_comb_types;</div><div class='ctx'> </div><div class='del'>-	txsq_desc = carl9170_fw_find_desc(ar, TXSQ_MAGIC,</div><div class='del'>-		sizeof(*txsq_desc), CARL9170FW_TXSQ_DESC_CUR_VER);</div><div class='del'>-</div><div class='del'>-	if (txsq_desc) {</div><div class='del'>-		ar-&gt;fw.tx_seq_table = le32_to_cpu(txsq_desc-&gt;seq_table_addr);</div><div class='del'>-		if (!valid_cpu_addr(ar-&gt;fw.tx_seq_table))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	} else {</div><div class='del'>-		ar-&gt;fw.tx_seq_table = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> #undef SUPPORTED</div><div class='del'>-	return 0;</div><div class='add'>+	return carl9170_fw_tx_sequence(ar);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct carl9170fw_desc_head *</div><div class='head'>diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c<br/>index f06e0695d412..db774212161b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/carl9170/main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/carl9170/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/carl9170/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/carl9170/main.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> #include "carl9170.h"</div><div class='ctx'> #include "cmd.h"</div><div class='ctx'> </div><div class='del'>-static int modparam_nohwcrypt;</div><div class='add'>+static bool modparam_nohwcrypt;</div><div class='ctx'> module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(nohwcrypt, "Disable hardware crypto offload.");</div><div class='ctx'> </div><div class='hunk'>@@ -446,7 +446,7 @@ static void carl9170_op_stop(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ar-&gt;mutex);</div><div class='ctx'> 	if (IS_ACCEPTING_CMD(ar)) {</div><div class='del'>-		rcu_assign_pointer(ar-&gt;beacon_iter, NULL);</div><div class='add'>+		RCU_INIT_POINTER(ar-&gt;beacon_iter, NULL);</div><div class='ctx'> </div><div class='ctx'> 		carl9170_led_set_state(ar, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -678,7 +678,7 @@ unlock:</div><div class='ctx'> 		vif_priv-&gt;active = false;</div><div class='ctx'> 		bitmap_release_region(&amp;ar-&gt;vif_bitmap, vif_id, 0);</div><div class='ctx'> 		ar-&gt;vifs--;</div><div class='del'>-		rcu_assign_pointer(ar-&gt;vif_priv[vif_id].vif, NULL);</div><div class='add'>+		RCU_INIT_POINTER(ar-&gt;vif_priv[vif_id].vif, NULL);</div><div class='ctx'> 		list_del_rcu(&amp;vif_priv-&gt;list);</div><div class='ctx'> 		mutex_unlock(&amp;ar-&gt;mutex);</div><div class='ctx'> 		synchronize_rcu();</div><div class='hunk'>@@ -716,7 +716,7 @@ static void carl9170_op_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	WARN_ON(vif_priv-&gt;enable_beacon);</div><div class='ctx'> 	vif_priv-&gt;enable_beacon = false;</div><div class='ctx'> 	list_del_rcu(&amp;vif_priv-&gt;list);</div><div class='del'>-	rcu_assign_pointer(ar-&gt;vif_priv[id].vif, NULL);</div><div class='add'>+	RCU_INIT_POINTER(ar-&gt;vif_priv[id].vif, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (vif == main_vif) {</div><div class='ctx'> 		rcu_read_unlock();</div><div class='hunk'>@@ -1258,7 +1258,7 @@ static int carl9170_op_sta_add(struct ieee80211_hw *hw,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; CARL9170_NUM_TID; i++)</div><div class='del'>-			rcu_assign_pointer(sta_info-&gt;agg[i], NULL);</div><div class='add'>+			RCU_INIT_POINTER(sta_info-&gt;agg[i], NULL);</div><div class='ctx'> </div><div class='ctx'> 		sta_info-&gt;ampdu_max_len = 1 &lt;&lt; (3 + sta-&gt;ht_cap.ampdu_factor);</div><div class='ctx'> 		sta_info-&gt;ht_sta = true;</div><div class='hunk'>@@ -1285,7 +1285,7 @@ static int carl9170_op_sta_remove(struct ieee80211_hw *hw,</div><div class='ctx'> 			struct carl9170_sta_tid *tid_info;</div><div class='ctx'> </div><div class='ctx'> 			tid_info = rcu_dereference(sta_info-&gt;agg[i]);</div><div class='del'>-			rcu_assign_pointer(sta_info-&gt;agg[i], NULL);</div><div class='add'>+			RCU_INIT_POINTER(sta_info-&gt;agg[i], NULL);</div><div class='ctx'> </div><div class='ctx'> 			if (!tid_info)</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -1398,7 +1398,7 @@ static int carl9170_op_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> 			spin_unlock_bh(&amp;ar-&gt;tx_ampdu_list_lock);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		rcu_assign_pointer(sta_info-&gt;agg[tid], NULL);</div><div class='add'>+		RCU_INIT_POINTER(sta_info-&gt;agg[tid], NULL);</div><div class='ctx'> 		rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 		ieee80211_stop_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='head'>diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c<br/>index 59472e1605cd..d19a9ee9d057 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/carl9170/tx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/carl9170/tx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/carl9170/tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/carl9170/tx.c</a></div><div class='hunk'>@@ -314,7 +314,7 @@ static void carl9170_tx_release(struct kref *ref)</div><div class='ctx'> 			 *    feedback either [CTL_REQ_TX_STATUS not set]</div><div class='ctx'> 			 */</div><div class='ctx'> </div><div class='del'>-			dev_kfree_skb_any(skb);</div><div class='add'>+			ieee80211_free_txskb(ar-&gt;hw, skb);</div><div class='ctx'> 			return;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -1432,7 +1432,7 @@ void carl9170_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> err_free:</div><div class='ctx'> 	ar-&gt;tx_dropped++;</div><div class='del'>-	dev_kfree_skb_any(skb);</div><div class='add'>+	ieee80211_free_txskb(ar-&gt;hw, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void carl9170_tx_scheduler(struct ar9170 *ar)</div><div class='head'>diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c<br/>index 333b69ef2ae2..89821e4835c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/carl9170/usb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/carl9170/usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/carl9170/usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/carl9170/usb.c</a></div><div class='hunk'>@@ -1161,15 +1161,4 @@ static struct usb_driver carl9170_driver = {</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init carl9170_usb_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;carl9170_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit carl9170_usb_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;carl9170_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(carl9170_usb_init);</div><div class='del'>-module_exit(carl9170_usb_exit);</div><div class='add'>+module_usb_driver(carl9170_driver);</div><div class='head'>diff --git a/drivers/net/wireless/ath/key.c b/drivers/net/wireless/ath/key.c<br/>index 4cf7c5eb4813..0e81904956cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/key.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/key.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/key.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/key.c</a></div><div class='hunk'>@@ -143,7 +143,7 @@ static bool ath_hw_set_keycache_entry(struct ath_common *common, u16 entry,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATH_CIPHER_AES_CCM:</div><div class='ctx'> 		if (!(common-&gt;crypt_caps &amp; ATH_CRYPT_CAP_CIPHER_AESCCM)) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANY,</div><div class='add'>+			ath_dbg(common, ANY,</div><div class='ctx'> 				"AES-CCM not supported by this mac rev\n");</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -152,15 +152,15 @@ static bool ath_hw_set_keycache_entry(struct ath_common *common, u16 entry,</div><div class='ctx'> 	case ATH_CIPHER_TKIP:</div><div class='ctx'> 		keyType = AR_KEYTABLE_TYPE_TKIP;</div><div class='ctx'> 		if (entry + 64 &gt;= common-&gt;keymax) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANY,</div><div class='add'>+			ath_dbg(common, ANY,</div><div class='ctx'> 				"entry %u inappropriate for TKIP\n", entry);</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ATH_CIPHER_WEP:</div><div class='ctx'> 		if (k-&gt;kv_len &lt; WLAN_KEY_LEN_WEP40) {</div><div class='del'>-			ath_dbg(common, ATH_DBG_ANY,</div><div class='del'>-				"WEP key length %u too small\n", k-&gt;kv_len);</div><div class='add'>+			ath_dbg(common, ANY, "WEP key length %u too small\n",</div><div class='add'>+				k-&gt;kv_len);</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (k-&gt;kv_len &lt;= WLAN_KEY_LEN_WEP40)</div><div class='head'>diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c<br/>index 65ecb5bab25a..10dea37431b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/regd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ath/regd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ath/regd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ath/regd.c</a></div><div class='hunk'>@@ -21,6 +21,8 @@</div><div class='ctx'> #include "regd.h"</div><div class='ctx'> #include "regd_common.h"</div><div class='ctx'> </div><div class='add'>+static int __ath_regd_init(struct ath_regulatory *reg);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is a set of common rules used by our world regulatory domains.</div><div class='ctx'>  * We have 12 world regulatory domains. To save space we consolidate</div><div class='hunk'>@@ -347,10 +349,26 @@ static void ath_reg_apply_world_flags(struct wiphy *wiphy,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u16 ath_regd_find_country_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(allCountries); i++) {</div><div class='add'>+		if (!memcmp(allCountries[i].isoName, alpha2, 2))</div><div class='add'>+			return allCountries[i].countryCode;</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'> int ath_reg_notifier_apply(struct wiphy *wiphy,</div><div class='ctx'> 			   struct regulatory_request *request,</div><div class='ctx'> 			   struct ath_regulatory *reg)</div><div class='ctx'> {</div><div class='add'>+	struct ath_common *common = container_of(reg, struct ath_common,</div><div class='add'>+						 regulatory);</div><div class='add'>+	u16 country_code;</div><div class='add'>+</div><div class='ctx'> 	/* We always apply this */</div><div class='ctx'> 	ath_reg_apply_radar_flags(wiphy);</div><div class='ctx'> </div><div class='hunk'>@@ -363,14 +381,37 @@ int ath_reg_notifier_apply(struct wiphy *wiphy,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (request-&gt;initiator) {</div><div class='del'>-	case NL80211_REGDOM_SET_BY_DRIVER:</div><div class='ctx'> 	case NL80211_REGDOM_SET_BY_CORE:</div><div class='add'>+		/*</div><div class='add'>+		 * If common-&gt;reg_world_copy is world roaming it means we *were*</div><div class='add'>+		 * world roaming... so we now have to restore that data.</div><div class='add'>+		 */</div><div class='add'>+		if (!ath_is_world_regd(&amp;common-&gt;reg_world_copy))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		memcpy(reg, &amp;common-&gt;reg_world_copy,</div><div class='add'>+		       sizeof(struct ath_regulatory));</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_REGDOM_SET_BY_DRIVER:</div><div class='ctx'> 	case NL80211_REGDOM_SET_BY_USER:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_REGDOM_SET_BY_COUNTRY_IE:</div><div class='del'>-		if (ath_is_world_regd(reg))</div><div class='del'>-			ath_reg_apply_world_flags(wiphy, request-&gt;initiator,</div><div class='del'>-						  reg);</div><div class='add'>+		if (!ath_is_world_regd(reg))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		country_code = ath_regd_find_country_by_name(request-&gt;alpha2);</div><div class='add'>+		if (country_code == (u16) -1)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		reg-&gt;current_rd = COUNTRY_ERD_FLAG;</div><div class='add'>+		reg-&gt;current_rd |= country_code;</div><div class='add'>+</div><div class='add'>+		printk(KERN_DEBUG "ath: regdomain 0x%0x updated by CountryIE\n",</div><div class='add'>+			reg-&gt;current_rd);</div><div class='add'>+		__ath_regd_init(reg);</div><div class='add'>+</div><div class='add'>+		ath_reg_apply_world_flags(wiphy, request-&gt;initiator, reg);</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -508,11 +549,7 @@ static void ath_regd_sanitize(struct ath_regulatory *reg)</div><div class='ctx'> 	reg-&gt;current_rd = 0x64;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-ath_regd_init(struct ath_regulatory *reg,</div><div class='del'>-	      struct wiphy *wiphy,</div><div class='del'>-	      int (*reg_notifier)(struct wiphy *wiphy,</div><div class='del'>-				  struct regulatory_request *request))</div><div class='add'>+static int __ath_regd_init(struct ath_regulatory *reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct country_code_to_enum_rd *country = NULL;</div><div class='ctx'> 	u16 regdmn;</div><div class='hunk'>@@ -583,7 +620,29 @@ ath_regd_init(struct ath_regulatory *reg,</div><div class='ctx'> 	printk(KERN_DEBUG "ath: Regpair used: 0x%0x\n",</div><div class='ctx'> 		reg-&gt;regpair-&gt;regDmnEnum);</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+ath_regd_init(struct ath_regulatory *reg,</div><div class='add'>+	      struct wiphy *wiphy,</div><div class='add'>+	      int (*reg_notifier)(struct wiphy *wiphy,</div><div class='add'>+				  struct regulatory_request *request))</div><div class='add'>+{</div><div class='add'>+	struct ath_common *common = container_of(reg, struct ath_common,</div><div class='add'>+						 regulatory);</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = __ath_regd_init(reg);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	if (ath_is_world_regd(reg))</div><div class='add'>+		memcpy(&amp;common-&gt;reg_world_copy, reg,</div><div class='add'>+		       sizeof(struct ath_regulatory));</div><div class='add'>+</div><div class='ctx'> 	ath_regd_init_wiphy(reg, wiphy, reg_notifier);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ath_regd_init);</div><div class='head'>diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h<br/>index 37110dfd2c96..16e8f8058155 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/b43.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/b43.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/b43.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43/b43.h</a></div><div class='hunk'>@@ -191,6 +191,9 @@</div><div class='ctx'> #define B43_BFH_BUCKBOOST		0x0020	/* has buck/booster */</div><div class='ctx'> #define B43_BFH_FEM_BT			0x0040	/* has FEM and switch to share antenna</div><div class='ctx'> 						 * with bluetooth */</div><div class='add'>+#define B43_BFH_NOCBUCK			0x0080</div><div class='add'>+#define B43_BFH_PALDO			0x0200</div><div class='add'>+#define B43_BFH_EXTLNA_5GHZ		0x1000	/* has an external LNA (5GHz mode) */</div><div class='ctx'> </div><div class='ctx'> /* SPROM boardflags2_lo values */</div><div class='ctx'> #define B43_BFL2_RXBB_INT_REG_DIS	0x0001	/* external RX BB regulator present */</div><div class='hunk'>@@ -204,6 +207,14 @@</div><div class='ctx'> #define B43_BFL2_SKWRKFEM_BRD		0x0100	/* 4321mcm93 uses Skyworks FEM */</div><div class='ctx'> #define B43_BFL2_SPUR_WAR		0x0200	/* has a workaround for clock-harmonic spurs */</div><div class='ctx'> #define B43_BFL2_GPLL_WAR		0x0400	/* altenative G-band PLL settings implemented */</div><div class='add'>+#define B43_BFL2_SINGLEANT_CCK		0x1000</div><div class='add'>+#define B43_BFL2_2G_SPUR_WAR		0x2000</div><div class='add'>+</div><div class='add'>+/* SPROM boardflags2_hi values */</div><div class='add'>+#define B43_BFH2_GPLL_WAR2		0x0001</div><div class='add'>+#define B43_BFH2_IPALVLSHIFT_3P3	0x0002</div><div class='add'>+#define B43_BFH2_INTERNDET_TXIQCAL	0x0004</div><div class='add'>+#define B43_BFH2_XTALBUFOUTEN		0x0008</div><div class='ctx'> </div><div class='ctx'> /* GPIO register offset, in both ChipCommon and PCI core. */</div><div class='ctx'> #define B43_GPIO_CONTROL		0x6c</div><div class='hunk'>@@ -667,6 +678,7 @@ struct b43_key {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* SHM offsets to the QOS data structures for the 4 different queues. */</div><div class='add'>+#define B43_QOS_QUEUE_NUM	4</div><div class='ctx'> #define B43_QOS_PARAMS(queue)	(B43_SHM_SH_EDCFQ + \</div><div class='ctx'> 				 (B43_NR_QOSPARAMS * sizeof(u16) * (queue)))</div><div class='ctx'> #define B43_QOS_BACKGROUND	B43_QOS_PARAMS(0)</div><div class='hunk'>@@ -904,7 +916,7 @@ struct b43_wl {</div><div class='ctx'> 	struct work_struct beacon_update_trigger;</div><div class='ctx'> </div><div class='ctx'> 	/* The current QOS parameters for the 4 queues. */</div><div class='del'>-	struct b43_qos_params qos_params[4];</div><div class='add'>+	struct b43_qos_params qos_params[B43_QOS_QUEUE_NUM];</div><div class='ctx'> </div><div class='ctx'> 	/* Work for adjustment of the transmission power.</div><div class='ctx'> 	 * This is scheduled when we determine that the actual TX output</div><div class='hunk'>@@ -913,8 +925,12 @@ struct b43_wl {</div><div class='ctx'> </div><div class='ctx'> 	/* Packet transmit work */</div><div class='ctx'> 	struct work_struct tx_work;</div><div class='add'>+</div><div class='ctx'> 	/* Queue of packets to be transmitted. */</div><div class='del'>-	struct sk_buff_head tx_queue;</div><div class='add'>+	struct sk_buff_head tx_queue[B43_QOS_QUEUE_NUM];</div><div class='add'>+</div><div class='add'>+	/* Flag that implement the queues stopping. */</div><div class='add'>+	bool tx_queue_stopped[B43_QOS_QUEUE_NUM];</div><div class='ctx'> </div><div class='ctx'> 	/* The device LEDs. */</div><div class='ctx'> 	struct b43_leds leds;</div><div class='head'>diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c<br/>index 5e45604f0f5d..b5f1b91002bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43/dma.c</a></div><div class='hunk'>@@ -890,7 +890,7 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,</div><div class='ctx'> 	else</div><div class='ctx'> 		ring-&gt;ops = &amp;dma32_ops;</div><div class='ctx'> 	if (for_tx) {</div><div class='del'>-		ring-&gt;tx = 1;</div><div class='add'>+		ring-&gt;tx = true;</div><div class='ctx'> 		ring-&gt;current_slot = -1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (ring-&gt;index == 0) {</div><div class='hunk'>@@ -1061,7 +1061,7 @@ void b43_dma_free(struct b43_wldev *dev)</div><div class='ctx'> static int b43_dma_set_mask(struct b43_wldev *dev, u64 mask)</div><div class='ctx'> {</div><div class='ctx'> 	u64 orig_mask = mask;</div><div class='del'>-	bool fallback = 0;</div><div class='add'>+	bool fallback = false;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Try to set the DMA mask. If it fails, try falling back to a</div><div class='hunk'>@@ -1075,12 +1075,12 @@ static int b43_dma_set_mask(struct b43_wldev *dev, u64 mask)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (mask == DMA_BIT_MASK(64)) {</div><div class='ctx'> 			mask = DMA_BIT_MASK(32);</div><div class='del'>-			fallback = 1;</div><div class='add'>+			fallback = true;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (mask == DMA_BIT_MASK(32)) {</div><div class='ctx'> 			mask = DMA_BIT_MASK(30);</div><div class='del'>-			fallback = 1;</div><div class='add'>+			fallback = true;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		b43err(dev-&gt;wl, "The machine/kernel does not support "</div><div class='hunk'>@@ -1307,7 +1307,7 @@ static int dma_tx_fragment(struct b43_dmaring *ring,</div><div class='ctx'> 	memset(meta, 0, sizeof(*meta));</div><div class='ctx'> </div><div class='ctx'> 	meta-&gt;skb = skb;</div><div class='del'>-	meta-&gt;is_last_fragment = 1;</div><div class='add'>+	meta-&gt;is_last_fragment = true;</div><div class='ctx'> 	priv_info-&gt;bouncebuffer = NULL;</div><div class='ctx'> </div><div class='ctx'> 	meta-&gt;dmaaddr = map_descbuffer(ring, skb-&gt;data, skb-&gt;len, 1);</div><div class='hunk'>@@ -1465,8 +1465,10 @@ int b43_dma_tx(struct b43_wldev *dev, struct sk_buff *skb)</div><div class='ctx'> 	if ((free_slots(ring) &lt; TX_SLOTS_PER_FRAME) ||</div><div class='ctx'> 	    should_inject_overflow(ring)) {</div><div class='ctx'> 		/* This TX ring is full. */</div><div class='del'>-		ieee80211_stop_queue(dev-&gt;wl-&gt;hw, skb_get_queue_mapping(skb));</div><div class='del'>-		ring-&gt;stopped = 1;</div><div class='add'>+		unsigned int skb_mapping = skb_get_queue_mapping(skb);</div><div class='add'>+		ieee80211_stop_queue(dev-&gt;wl-&gt;hw, skb_mapping);</div><div class='add'>+		dev-&gt;wl-&gt;tx_queue_stopped[skb_mapping] = 1;</div><div class='add'>+		ring-&gt;stopped = true;</div><div class='ctx'> 		if (b43_debug(dev, B43_DBG_DMAVERBOSE)) {</div><div class='ctx'> 			b43dbg(dev-&gt;wl, "Stopped TX ring %d\n", ring-&gt;index);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1584,12 +1586,21 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ring-&gt;stopped) {</div><div class='ctx'> 		B43_WARN_ON(free_slots(ring) &lt; TX_SLOTS_PER_FRAME);</div><div class='add'>+		ring-&gt;stopped = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;wl-&gt;tx_queue_stopped[ring-&gt;queue_prio]) {</div><div class='add'>+		dev-&gt;wl-&gt;tx_queue_stopped[ring-&gt;queue_prio] = 0;</div><div class='add'>+	} else {</div><div class='add'>+		/* If the driver queue is running wake the corresponding</div><div class='add'>+		 * mac80211 queue. */</div><div class='ctx'> 		ieee80211_wake_queue(dev-&gt;wl-&gt;hw, ring-&gt;queue_prio);</div><div class='del'>-		ring-&gt;stopped = 0;</div><div class='ctx'> 		if (b43_debug(dev, B43_DBG_DMAVERBOSE)) {</div><div class='ctx'> 			b43dbg(dev-&gt;wl, "Woke up TX ring %d\n", ring-&gt;index);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	/* Add work to the queue. */</div><div class='add'>+	ieee80211_queue_work(dev-&gt;wl-&gt;hw, &amp;dev-&gt;wl-&gt;tx_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dma_rx(struct b43_dmaring *ring, int *slot)</div><div class='head'>diff --git a/drivers/net/wireless/b43/leds.c b/drivers/net/wireless/b43/leds.c<br/>index a38c1c6446ad..d79ab2a227e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/leds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/leds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43/leds.c</a></div><div class='hunk'>@@ -74,7 +74,7 @@ static void b43_led_update(struct b43_wldev *dev,</div><div class='ctx'> 	if (radio_enabled)</div><div class='ctx'> 		turn_on = atomic_read(&amp;led-&gt;state) != LED_OFF;</div><div class='ctx'> 	else</div><div class='del'>-		turn_on = 0;</div><div class='add'>+		turn_on = false;</div><div class='ctx'> 	if (turn_on == led-&gt;hw_state)</div><div class='ctx'> 		return;</div><div class='ctx'> 	led-&gt;hw_state = turn_on;</div><div class='hunk'>@@ -225,11 +225,11 @@ static void b43_led_get_sprominfo(struct b43_wldev *dev,</div><div class='ctx'> 	if (sprom[led_index] == 0xFF) {</div><div class='ctx'> 		/* There is no LED information in the SPROM</div><div class='ctx'> 		 * for this LED. Hardcode it here. */</div><div class='del'>-		*activelow = 0;</div><div class='add'>+		*activelow = false;</div><div class='ctx'> 		switch (led_index) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			*behaviour = B43_LED_ACTIVITY;</div><div class='del'>-			*activelow = 1;</div><div class='add'>+			*activelow = true;</div><div class='ctx'> 			if (dev-&gt;dev-&gt;board_vendor == PCI_VENDOR_ID_COMPAQ)</div><div class='ctx'> 				*behaviour = B43_LED_RADIO_ALL;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -267,11 +267,11 @@ void b43_leds_init(struct b43_wldev *dev)</div><div class='ctx'> 	if (led-&gt;wl) {</div><div class='ctx'> 		if (dev-&gt;phy.radio_on &amp;&amp; b43_is_hw_radio_enabled(dev)) {</div><div class='ctx'> 			b43_led_turn_on(dev, led-&gt;index, led-&gt;activelow);</div><div class='del'>-			led-&gt;hw_state = 1;</div><div class='add'>+			led-&gt;hw_state = true;</div><div class='ctx'> 			atomic_set(&amp;led-&gt;state, 1);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			b43_led_turn_off(dev, led-&gt;index, led-&gt;activelow);</div><div class='del'>-			led-&gt;hw_state = 0;</div><div class='add'>+			led-&gt;hw_state = false;</div><div class='ctx'> 			atomic_set(&amp;led-&gt;state, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -280,19 +280,19 @@ void b43_leds_init(struct b43_wldev *dev)</div><div class='ctx'> 	led = &amp;dev-&gt;wl-&gt;leds.led_tx;</div><div class='ctx'> 	if (led-&gt;wl) {</div><div class='ctx'> 		b43_led_turn_off(dev, led-&gt;index, led-&gt;activelow);</div><div class='del'>-		led-&gt;hw_state = 0;</div><div class='add'>+		led-&gt;hw_state = false;</div><div class='ctx'> 		atomic_set(&amp;led-&gt;state, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	led = &amp;dev-&gt;wl-&gt;leds.led_rx;</div><div class='ctx'> 	if (led-&gt;wl) {</div><div class='ctx'> 		b43_led_turn_off(dev, led-&gt;index, led-&gt;activelow);</div><div class='del'>-		led-&gt;hw_state = 0;</div><div class='add'>+		led-&gt;hw_state = false;</div><div class='ctx'> 		atomic_set(&amp;led-&gt;state, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	led = &amp;dev-&gt;wl-&gt;leds.led_assoc;</div><div class='ctx'> 	if (led-&gt;wl) {</div><div class='ctx'> 		b43_led_turn_off(dev, led-&gt;index, led-&gt;activelow);</div><div class='del'>-		led-&gt;hw_state = 0;</div><div class='add'>+		led-&gt;hw_state = false;</div><div class='ctx'> 		atomic_set(&amp;led-&gt;state, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/b43/lo.c b/drivers/net/wireless/b43/lo.c<br/>index 4c82d582a524..916123a3d74e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/lo.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/lo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/lo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43/lo.c</a></div><div class='hunk'>@@ -826,7 +826,7 @@ void b43_gphy_dc_lt_init(struct b43_wldev *dev, bool update_all)</div><div class='ctx'> 	const struct b43_rfatt *rfatt;</div><div class='ctx'> 	const struct b43_bbatt *bbatt;</div><div class='ctx'> 	u64 power_vector;</div><div class='del'>-	bool table_changed = 0;</div><div class='add'>+	bool table_changed = false;</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(B43_DC_LT_SIZE != 32);</div><div class='ctx'> 	B43_WARN_ON(lo-&gt;rfatt_list.len * lo-&gt;bbatt_list.len &gt; 64);</div><div class='hunk'>@@ -876,7 +876,7 @@ void b43_gphy_dc_lt_init(struct b43_wldev *dev, bool update_all)</div><div class='ctx'> 			lo-&gt;dc_lt[idx] = (lo-&gt;dc_lt[idx] &amp; 0xFF00)</div><div class='ctx'> 					 | (val &amp; 0x00FF);</div><div class='ctx'> 		}</div><div class='del'>-		table_changed = 1;</div><div class='add'>+		table_changed = true;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (table_changed) {</div><div class='ctx'> 		/* The table changed in memory. Update the hardware table. */</div><div class='hunk'>@@ -938,7 +938,7 @@ void b43_lo_g_maintanance_work(struct b43_wldev *dev)</div><div class='ctx'> 	unsigned long now;</div><div class='ctx'> 	unsigned long expire;</div><div class='ctx'> 	struct b43_lo_calib *cal, *tmp;</div><div class='del'>-	bool current_item_expired = 0;</div><div class='add'>+	bool current_item_expired = false;</div><div class='ctx'> 	bool hwpctl;</div><div class='ctx'> </div><div class='ctx'> 	if (!lo)</div><div class='hunk'>@@ -968,7 +968,7 @@ void b43_lo_g_maintanance_work(struct b43_wldev *dev)</div><div class='ctx'> 		if (b43_compare_bbatt(&amp;cal-&gt;bbatt, &amp;gphy-&gt;bbatt) &amp;&amp;</div><div class='ctx'> 		    b43_compare_rfatt(&amp;cal-&gt;rfatt, &amp;gphy-&gt;rfatt)) {</div><div class='ctx'> 			B43_WARN_ON(current_item_expired);</div><div class='del'>-			current_item_expired = 1;</div><div class='add'>+			current_item_expired = true;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (b43_debug(dev, B43_DBG_LO)) {</div><div class='ctx'> 			b43dbg(dev-&gt;wl, "LO: Item BB(%u), RF(%u,%u), "</div><div class='head'>diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c<br/>index 5634d9a9965b..b91f28ef1032 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43/main.c</a></div><div class='hunk'>@@ -1122,17 +1122,17 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags)</div><div class='ctx'> 	B43_WARN_ON((ps_flags &amp; B43_PS_AWAKE) &amp;&amp; (ps_flags &amp; B43_PS_ASLEEP));</div><div class='ctx'> </div><div class='ctx'> 	if (ps_flags &amp; B43_PS_ENABLED) {</div><div class='del'>-		hwps = 1;</div><div class='add'>+		hwps = true;</div><div class='ctx'> 	} else if (ps_flags &amp; B43_PS_DISABLED) {</div><div class='del'>-		hwps = 0;</div><div class='add'>+		hwps = false;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		//TODO: If powersave is not off and FIXME is not set and we are not in adhoc</div><div class='ctx'> 		//      and thus is not an AP and we are associated, set bit 25</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ps_flags &amp; B43_PS_AWAKE) {</div><div class='del'>-		awake = 1;</div><div class='add'>+		awake = true;</div><div class='ctx'> 	} else if (ps_flags &amp; B43_PS_ASLEEP) {</div><div class='del'>-		awake = 0;</div><div class='add'>+		awake = false;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		//TODO: If the device is awake or this is an AP, or we are scanning, or FIXME,</div><div class='ctx'> 		//      or we are associated, or FIXME, or the latest PS-Poll packet sent was</div><div class='hunk'>@@ -1140,8 +1140,8 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> /* FIXME: For now we force awake-on and hwps-off */</div><div class='del'>-	hwps = 0;</div><div class='del'>-	awake = 1;</div><div class='add'>+	hwps = false;</div><div class='add'>+	awake = true;</div><div class='ctx'> </div><div class='ctx'> 	macctl = b43_read32(dev, B43_MMIO_MACCTL);</div><div class='ctx'> 	if (hwps)</div><div class='hunk'>@@ -1339,7 +1339,7 @@ static void b43_calculate_link_quality(struct b43_wldev *dev)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (dev-&gt;noisecalc.calculation_running)</div><div class='ctx'> 		return;</div><div class='del'>-	dev-&gt;noisecalc.calculation_running = 1;</div><div class='add'>+	dev-&gt;noisecalc.calculation_running = true;</div><div class='ctx'> 	dev-&gt;noisecalc.nr_samples = 0;</div><div class='ctx'> </div><div class='ctx'> 	b43_generate_noise_sample(dev);</div><div class='hunk'>@@ -1408,7 +1408,7 @@ static void handle_irq_noise(struct b43_wldev *dev)</div><div class='ctx'> 			average -= 48;</div><div class='ctx'> </div><div class='ctx'> 		dev-&gt;stats.link_noise = average;</div><div class='del'>-		dev-&gt;noisecalc.calculation_running = 0;</div><div class='add'>+		dev-&gt;noisecalc.calculation_running = false;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> generate_new:</div><div class='hunk'>@@ -1424,7 +1424,7 @@ static void handle_irq_tbtt_indication(struct b43_wldev *dev)</div><div class='ctx'> 			b43_power_saving_ctl_bits(dev, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (b43_is_mode(dev-&gt;wl, NL80211_IFTYPE_ADHOC))</div><div class='del'>-		dev-&gt;dfq_valid = 1;</div><div class='add'>+		dev-&gt;dfq_valid = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void handle_irq_atim_end(struct b43_wldev *dev)</div><div class='hunk'>@@ -1433,7 +1433,7 @@ static void handle_irq_atim_end(struct b43_wldev *dev)</div><div class='ctx'> 		b43_write32(dev, B43_MMIO_MACCMD,</div><div class='ctx'> 			    b43_read32(dev, B43_MMIO_MACCMD)</div><div class='ctx'> 			    | B43_MACCMD_DFQ_VALID);</div><div class='del'>-		dev-&gt;dfq_valid = 0;</div><div class='add'>+		dev-&gt;dfq_valid = false;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1539,7 +1539,7 @@ static void b43_write_beacon_template(struct b43_wldev *dev,</div><div class='ctx'> 	unsigned int i, len, variable_len;</div><div class='ctx'> 	const struct ieee80211_mgmt *bcn;</div><div class='ctx'> 	const u8 *ie;</div><div class='del'>-	bool tim_found = 0;</div><div class='add'>+	bool tim_found = false;</div><div class='ctx'> 	unsigned int rate;</div><div class='ctx'> 	u16 ctl;</div><div class='ctx'> 	int antenna;</div><div class='hunk'>@@ -1588,7 +1588,7 @@ static void b43_write_beacon_template(struct b43_wldev *dev,</div><div class='ctx'> 			/* A valid TIM is at least 4 bytes long. */</div><div class='ctx'> 			if (ie_len &lt; 4)</div><div class='ctx'> 				break;</div><div class='del'>-			tim_found = 1;</div><div class='add'>+			tim_found = true;</div><div class='ctx'> </div><div class='ctx'> 			tim_position = sizeof(struct b43_plcp_hdr6);</div><div class='ctx'> 			tim_position += offsetof(struct ieee80211_mgmt, u.beacon.variable);</div><div class='hunk'>@@ -1625,7 +1625,7 @@ static void b43_upload_beacon0(struct b43_wldev *dev)</div><div class='ctx'> 	if (wl-&gt;beacon0_uploaded)</div><div class='ctx'> 		return;</div><div class='ctx'> 	b43_write_beacon_template(dev, 0x68, 0x18);</div><div class='del'>-	wl-&gt;beacon0_uploaded = 1;</div><div class='add'>+	wl-&gt;beacon0_uploaded = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void b43_upload_beacon1(struct b43_wldev *dev)</div><div class='hunk'>@@ -1635,7 +1635,7 @@ static void b43_upload_beacon1(struct b43_wldev *dev)</div><div class='ctx'> 	if (wl-&gt;beacon1_uploaded)</div><div class='ctx'> 		return;</div><div class='ctx'> 	b43_write_beacon_template(dev, 0x468, 0x1A);</div><div class='del'>-	wl-&gt;beacon1_uploaded = 1;</div><div class='add'>+	wl-&gt;beacon1_uploaded = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void handle_irq_beacon(struct b43_wldev *dev)</div><div class='hunk'>@@ -1667,7 +1667,7 @@ static void handle_irq_beacon(struct b43_wldev *dev)</div><div class='ctx'> 	if (unlikely(wl-&gt;beacon_templates_virgin)) {</div><div class='ctx'> 		/* We never uploaded a beacon before.</div><div class='ctx'> 		 * Upload both templates now, but only mark one valid. */</div><div class='del'>-		wl-&gt;beacon_templates_virgin = 0;</div><div class='add'>+		wl-&gt;beacon_templates_virgin = false;</div><div class='ctx'> 		b43_upload_beacon0(dev);</div><div class='ctx'> 		b43_upload_beacon1(dev);</div><div class='ctx'> 		cmd = b43_read32(dev, B43_MMIO_MACCMD);</div><div class='hunk'>@@ -1755,8 +1755,8 @@ static void b43_update_templates(struct b43_wl *wl)</div><div class='ctx'> 	if (wl-&gt;current_beacon)</div><div class='ctx'> 		dev_kfree_skb_any(wl-&gt;current_beacon);</div><div class='ctx'> 	wl-&gt;current_beacon = beacon;</div><div class='del'>-	wl-&gt;beacon0_uploaded = 0;</div><div class='del'>-	wl-&gt;beacon1_uploaded = 0;</div><div class='add'>+	wl-&gt;beacon0_uploaded = false;</div><div class='add'>+	wl-&gt;beacon1_uploaded = false;</div><div class='ctx'> 	ieee80211_queue_work(wl-&gt;hw, &amp;wl-&gt;beacon_update_trigger);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1913,7 +1913,7 @@ static void b43_do_interrupt_thread(struct b43_wldev *dev)</div><div class='ctx'> 			b43err(dev-&gt;wl, "This device does not support DMA "</div><div class='ctx'> 			       "on your system. It will now be switched to PIO.\n");</div><div class='ctx'> 			/* Fall back to PIO transfers if we get fatal DMA errors! */</div><div class='del'>-			dev-&gt;use_pio = 1;</div><div class='add'>+			dev-&gt;use_pio = true;</div><div class='ctx'> 			b43_controller_restart(dev, "DMA error");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2240,12 +2240,12 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)</div><div class='ctx'> 		filename = NULL;</div><div class='ctx'> 	else</div><div class='ctx'> 		goto err_no_pcm;</div><div class='del'>-	fw-&gt;pcm_request_failed = 0;</div><div class='add'>+	fw-&gt;pcm_request_failed = false;</div><div class='ctx'> 	err = b43_do_request_fw(ctx, filename, &amp;fw-&gt;pcm);</div><div class='ctx'> 	if (err == -ENOENT) {</div><div class='ctx'> 		/* We did not find a PCM file? Not fatal, but</div><div class='ctx'> 		 * core rev &lt;= 10 must do without hwcrypto then. */</div><div class='del'>-		fw-&gt;pcm_request_failed = 1;</div><div class='add'>+		fw-&gt;pcm_request_failed = true;</div><div class='ctx'> 	} else if (err)</div><div class='ctx'> 		goto err_load;</div><div class='ctx'> </div><div class='hunk'>@@ -2535,7 +2535,7 @@ static int b43_upload_microcode(struct b43_wldev *dev)</div><div class='ctx'> 	dev-&gt;wl-&gt;hw-&gt;queues = dev-&gt;wl-&gt;mac80211_initially_registered_queues;</div><div class='ctx'> 	dev-&gt;qos_enabled = !!modparam_qos;</div><div class='ctx'> 	/* Default to firmware/hardware crypto acceleration. */</div><div class='del'>-	dev-&gt;hwcrypto_enabled = 1;</div><div class='add'>+	dev-&gt;hwcrypto_enabled = true;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;fw.opensource) {</div><div class='ctx'> 		u16 fwcapa;</div><div class='hunk'>@@ -2549,7 +2549,7 @@ static int b43_upload_microcode(struct b43_wldev *dev)</div><div class='ctx'> 		if (!(fwcapa &amp; B43_FWCAPA_HWCRYPTO) || dev-&gt;fw.pcm_request_failed) {</div><div class='ctx'> 			b43info(dev-&gt;wl, "Hardware crypto acceleration not supported by firmware\n");</div><div class='ctx'> 			/* Disable hardware crypto and fall back to software crypto. */</div><div class='del'>-			dev-&gt;hwcrypto_enabled = 0;</div><div class='add'>+			dev-&gt;hwcrypto_enabled = false;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!(fwcapa &amp; B43_FWCAPA_QOS)) {</div><div class='ctx'> 			b43info(dev-&gt;wl, "QoS not supported by firmware\n");</div><div class='hunk'>@@ -2557,7 +2557,7 @@ static int b43_upload_microcode(struct b43_wldev *dev)</div><div class='ctx'> 			 * ieee80211_unregister to make sure the networking core can</div><div class='ctx'> 			 * properly free possible resources. */</div><div class='ctx'> 			dev-&gt;wl-&gt;hw-&gt;queues = 1;</div><div class='del'>-			dev-&gt;qos_enabled = 0;</div><div class='add'>+			dev-&gt;qos_enabled = false;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		b43info(dev-&gt;wl, "Loading firmware version %u.%u "</div><div class='hunk'>@@ -3361,10 +3361,10 @@ static int b43_rng_init(struct b43_wl *wl)</div><div class='ctx'> 	wl-&gt;rng.name = wl-&gt;rng_name;</div><div class='ctx'> 	wl-&gt;rng.data_read = b43_rng_read;</div><div class='ctx'> 	wl-&gt;rng.priv = (unsigned long)wl;</div><div class='del'>-	wl-&gt;rng_initialized = 1;</div><div class='add'>+	wl-&gt;rng_initialized = true;</div><div class='ctx'> 	err = hwrng_register(&amp;wl-&gt;rng);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		wl-&gt;rng_initialized = 0;</div><div class='add'>+		wl-&gt;rng_initialized = false;</div><div class='ctx'> 		b43err(wl, "Failed to register the random "</div><div class='ctx'> 		       "number generator (%d)\n", err);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3378,6 +3378,7 @@ static void b43_tx_work(struct work_struct *work)</div><div class='ctx'> 	struct b43_wl *wl = container_of(work, struct b43_wl, tx_work);</div><div class='ctx'> 	struct b43_wldev *dev;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	int queue_num;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='hunk'>@@ -3387,15 +3388,26 @@ static void b43_tx_work(struct work_struct *work)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	while (skb_queue_len(&amp;wl-&gt;tx_queue)) {</div><div class='del'>-		skb = skb_dequeue(&amp;wl-&gt;tx_queue);</div><div class='add'>+	for (queue_num = 0; queue_num &lt; B43_QOS_QUEUE_NUM; queue_num++) {</div><div class='add'>+		while (skb_queue_len(&amp;wl-&gt;tx_queue[queue_num])) {</div><div class='add'>+			skb = skb_dequeue(&amp;wl-&gt;tx_queue[queue_num]);</div><div class='add'>+			if (b43_using_pio_transfers(dev))</div><div class='add'>+				err = b43_pio_tx(dev, skb);</div><div class='add'>+			else</div><div class='add'>+				err = b43_dma_tx(dev, skb);</div><div class='add'>+			if (err == -ENOSPC) {</div><div class='add'>+				wl-&gt;tx_queue_stopped[queue_num] = 1;</div><div class='add'>+				ieee80211_stop_queue(wl-&gt;hw, queue_num);</div><div class='add'>+				skb_queue_head(&amp;wl-&gt;tx_queue[queue_num], skb);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (unlikely(err))</div><div class='add'>+				dev_kfree_skb(skb); /* Drop it */</div><div class='add'>+			err = 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (b43_using_pio_transfers(dev))</div><div class='del'>-			err = b43_pio_tx(dev, skb);</div><div class='del'>-		else</div><div class='del'>-			err = b43_dma_tx(dev, skb);</div><div class='del'>-		if (unlikely(err))</div><div class='del'>-			dev_kfree_skb(skb); /* Drop it */</div><div class='add'>+		if (!err)</div><div class='add'>+			wl-&gt;tx_queue_stopped[queue_num] = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #if B43_DEBUG</div><div class='hunk'>@@ -3416,8 +3428,12 @@ static void b43_op_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> 	B43_WARN_ON(skb_shinfo(skb)-&gt;nr_frags);</div><div class='ctx'> </div><div class='del'>-	skb_queue_tail(&amp;wl-&gt;tx_queue, skb);</div><div class='del'>-	ieee80211_queue_work(wl-&gt;hw, &amp;wl-&gt;tx_work);</div><div class='add'>+	skb_queue_tail(&amp;wl-&gt;tx_queue[skb-&gt;queue_mapping], skb);</div><div class='add'>+	if (!wl-&gt;tx_queue_stopped[skb-&gt;queue_mapping]) {</div><div class='add'>+		ieee80211_queue_work(wl-&gt;hw, &amp;wl-&gt;tx_work);</div><div class='add'>+	} else {</div><div class='add'>+		ieee80211_stop_queue(wl-&gt;hw, skb-&gt;queue_mapping);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void b43_qos_params_upload(struct b43_wldev *dev,</div><div class='hunk'>@@ -3702,13 +3718,13 @@ static int b43_switch_band(struct b43_wl *wl, struct ieee80211_channel *chan)</div><div class='ctx'> 		case IEEE80211_BAND_5GHZ:</div><div class='ctx'> 			if (d-&gt;phy.supports_5ghz) {</div><div class='ctx'> 				up_dev = d;</div><div class='del'>-				gmode = 0;</div><div class='add'>+				gmode = false;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IEEE80211_BAND_2GHZ:</div><div class='ctx'> 			if (d-&gt;phy.supports_2ghz) {</div><div class='ctx'> 				up_dev = d;</div><div class='del'>-				gmode = 1;</div><div class='add'>+				gmode = true;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -4147,6 +4163,7 @@ static struct b43_wldev * b43_wireless_core_stop(struct b43_wldev *dev)</div><div class='ctx'> 	struct b43_wl *wl;</div><div class='ctx'> 	struct b43_wldev *orig_dev;</div><div class='ctx'> 	u32 mask;</div><div class='add'>+	int queue_num;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -4199,9 +4216,11 @@ redo:</div><div class='ctx'> 	mask = b43_read32(dev, B43_MMIO_GEN_IRQ_MASK);</div><div class='ctx'> 	B43_WARN_ON(mask != 0xFFFFFFFF &amp;&amp; mask);</div><div class='ctx'> </div><div class='del'>-	/* Drain the TX queue */</div><div class='del'>-	while (skb_queue_len(&amp;wl-&gt;tx_queue))</div><div class='del'>-		dev_kfree_skb(skb_dequeue(&amp;wl-&gt;tx_queue));</div><div class='add'>+	/* Drain all TX queues. */</div><div class='add'>+	for (queue_num = 0; queue_num &lt; B43_QOS_QUEUE_NUM; queue_num++) {</div><div class='add'>+		while (skb_queue_len(&amp;wl-&gt;tx_queue[queue_num]))</div><div class='add'>+			dev_kfree_skb(skb_dequeue(&amp;wl-&gt;tx_queue[queue_num]));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	b43_mac_suspend(dev);</div><div class='ctx'> 	b43_leds_exit(dev);</div><div class='hunk'>@@ -4425,18 +4444,18 @@ static void setup_struct_phy_for_init(struct b43_wldev *dev,</div><div class='ctx'> 	atomic_set(&amp;phy-&gt;txerr_cnt, B43_PHY_TX_BADNESS_LIMIT);</div><div class='ctx'> </div><div class='ctx'> #if B43_DEBUG</div><div class='del'>-	phy-&gt;phy_locked = 0;</div><div class='del'>-	phy-&gt;radio_locked = 0;</div><div class='add'>+	phy-&gt;phy_locked = false;</div><div class='add'>+	phy-&gt;radio_locked = false;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void setup_struct_wldev_for_init(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	dev-&gt;dfq_valid = 0;</div><div class='add'>+	dev-&gt;dfq_valid = false;</div><div class='ctx'> </div><div class='ctx'> 	/* Assume the radio is enabled. If it's not enabled, the state will</div><div class='ctx'> 	 * immediately get fixed on the first periodic work run. */</div><div class='del'>-	dev-&gt;radio_hw_enable = 1;</div><div class='add'>+	dev-&gt;radio_hw_enable = true;</div><div class='ctx'> </div><div class='ctx'> 	/* Stats */</div><div class='ctx'> 	memset(&amp;dev-&gt;stats, 0, sizeof(dev-&gt;stats));</div><div class='hunk'>@@ -4670,16 +4689,16 @@ static int b43_wireless_core_init(struct b43_wldev *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (b43_bus_host_is_pcmcia(dev-&gt;dev) ||</div><div class='ctx'> 	    b43_bus_host_is_sdio(dev-&gt;dev)) {</div><div class='del'>-		dev-&gt;__using_pio_transfers = 1;</div><div class='add'>+		dev-&gt;__using_pio_transfers = true;</div><div class='ctx'> 		err = b43_pio_init(dev);</div><div class='ctx'> 	} else if (dev-&gt;use_pio) {</div><div class='ctx'> 		b43warn(dev-&gt;wl, "Forced PIO by use_pio module parameter. "</div><div class='ctx'> 			"This should not be needed and will result in lower "</div><div class='ctx'> 			"performance.\n");</div><div class='del'>-		dev-&gt;__using_pio_transfers = 1;</div><div class='add'>+		dev-&gt;__using_pio_transfers = true;</div><div class='ctx'> 		err = b43_pio_init(dev);</div><div class='ctx'> 	} else {</div><div class='del'>-		dev-&gt;__using_pio_transfers = 0;</div><div class='add'>+		dev-&gt;__using_pio_transfers = false;</div><div class='ctx'> 		err = b43_dma_init(dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -4733,7 +4752,7 @@ static int b43_op_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	b43dbg(wl, "Adding Interface type %d\n", vif-&gt;type);</div><div class='ctx'> </div><div class='ctx'> 	dev = wl-&gt;current_dev;</div><div class='del'>-	wl-&gt;operating = 1;</div><div class='add'>+	wl-&gt;operating = true;</div><div class='ctx'> 	wl-&gt;vif = vif;</div><div class='ctx'> 	wl-&gt;if_type = vif-&gt;type;</div><div class='ctx'> 	memcpy(wl-&gt;mac_addr, vif-&gt;addr, ETH_ALEN);</div><div class='hunk'>@@ -4767,7 +4786,7 @@ static void b43_op_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	B43_WARN_ON(wl-&gt;vif != vif);</div><div class='ctx'> 	wl-&gt;vif = NULL;</div><div class='ctx'> </div><div class='del'>-	wl-&gt;operating = 0;</div><div class='add'>+	wl-&gt;operating = false;</div><div class='ctx'> </div><div class='ctx'> 	b43_adjust_opmode(dev);</div><div class='ctx'> 	memset(wl-&gt;mac_addr, 0, ETH_ALEN);</div><div class='hunk'>@@ -4789,12 +4808,12 @@ static int b43_op_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	memset(wl-&gt;bssid, 0, ETH_ALEN);</div><div class='ctx'> 	memset(wl-&gt;mac_addr, 0, ETH_ALEN);</div><div class='ctx'> 	wl-&gt;filter_flags = 0;</div><div class='del'>-	wl-&gt;radiotap_enabled = 0;</div><div class='add'>+	wl-&gt;radiotap_enabled = false;</div><div class='ctx'> 	b43_qos_clear(wl);</div><div class='del'>-	wl-&gt;beacon0_uploaded = 0;</div><div class='del'>-	wl-&gt;beacon1_uploaded = 0;</div><div class='del'>-	wl-&gt;beacon_templates_virgin = 1;</div><div class='del'>-	wl-&gt;radio_enabled = 1;</div><div class='add'>+	wl-&gt;beacon0_uploaded = false;</div><div class='add'>+	wl-&gt;beacon1_uploaded = false;</div><div class='add'>+	wl-&gt;beacon_templates_virgin = true;</div><div class='add'>+	wl-&gt;radio_enabled = true;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -4833,6 +4852,9 @@ static void b43_op_stop(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	cancel_work_sync(&amp;(wl-&gt;beacon_update_trigger));</div><div class='ctx'> </div><div class='add'>+	if (!dev)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='ctx'> 	if (b43_status(dev) &gt;= B43_STAT_STARTED) {</div><div class='ctx'> 		dev = b43_wireless_core_stop(dev);</div><div class='hunk'>@@ -4840,11 +4862,11 @@ static void b43_op_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> 	b43_wireless_core_exit(dev);</div><div class='del'>-	wl-&gt;radio_enabled = 0;</div><div class='add'>+	wl-&gt;radio_enabled = false;</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='ctx'> 	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='del'>-</div><div class='add'>+out:</div><div class='ctx'> 	cancel_work_sync(&amp;(wl-&gt;txpower_adjust_work));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5028,7 +5050,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)</div><div class='ctx'> 	struct pci_dev *pdev = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u32 tmp;</div><div class='del'>-	bool have_2ghz_phy = 0, have_5ghz_phy = 0;</div><div class='add'>+	bool have_2ghz_phy = false, have_5ghz_phy = false;</div><div class='ctx'> </div><div class='ctx'> 	/* Do NOT do any device initialization here.</div><div class='ctx'> 	 * Do it in wireless_core_init() instead.</div><div class='hunk'>@@ -5071,7 +5093,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;phy.gmode = have_2ghz_phy;</div><div class='del'>-	dev-&gt;phy.radio_on = 1;</div><div class='add'>+	dev-&gt;phy.radio_on = true;</div><div class='ctx'> 	b43_wireless_core_reset(dev, dev-&gt;phy.gmode);</div><div class='ctx'> </div><div class='ctx'> 	err = b43_phy_versioning(dev);</div><div class='hunk'>@@ -5082,11 +5104,11 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)</div><div class='ctx'> 	    (pdev-&gt;device != 0x4312 &amp;&amp;</div><div class='ctx'> 	     pdev-&gt;device != 0x4319 &amp;&amp; pdev-&gt;device != 0x4324)) {</div><div class='ctx'> 		/* No multiband support. */</div><div class='del'>-		have_2ghz_phy = 0;</div><div class='del'>-		have_5ghz_phy = 0;</div><div class='add'>+		have_2ghz_phy = false;</div><div class='add'>+		have_5ghz_phy = false;</div><div class='ctx'> 		switch (dev-&gt;phy.type) {</div><div class='ctx'> 		case B43_PHYTYPE_A:</div><div class='del'>-			have_5ghz_phy = 1;</div><div class='add'>+			have_5ghz_phy = true;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case B43_PHYTYPE_LP: //FIXME not always!</div><div class='ctx'> #if 0 //FIXME enabling 5GHz causes a NULL pointer dereference</div><div class='hunk'>@@ -5096,7 +5118,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)</div><div class='ctx'> 		case B43_PHYTYPE_N:</div><div class='ctx'> 		case B43_PHYTYPE_HT:</div><div class='ctx'> 		case B43_PHYTYPE_LCN:</div><div class='del'>-			have_2ghz_phy = 1;</div><div class='add'>+			have_2ghz_phy = true;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			B43_WARN_ON(1);</div><div class='hunk'>@@ -5112,8 +5134,8 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)</div><div class='ctx'> 		/* FIXME: For now we disable the A-PHY on multi-PHY devices. */</div><div class='ctx'> 		if (dev-&gt;phy.type != B43_PHYTYPE_N &amp;&amp;</div><div class='ctx'> 		    dev-&gt;phy.type != B43_PHYTYPE_LP) {</div><div class='del'>-			have_2ghz_phy = 1;</div><div class='del'>-			have_5ghz_phy = 0;</div><div class='add'>+			have_2ghz_phy = true;</div><div class='add'>+			have_5ghz_phy = false;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5245,6 +5267,7 @@ static struct b43_wl *b43_wireless_init(struct b43_bus_dev *dev)</div><div class='ctx'> 	struct ieee80211_hw *hw;</div><div class='ctx'> 	struct b43_wl *wl;</div><div class='ctx'> 	char chip_name[6];</div><div class='add'>+	int queue_num;</div><div class='ctx'> </div><div class='ctx'> 	hw = ieee80211_alloc_hw(sizeof(*wl), &amp;b43_hw_ops);</div><div class='ctx'> 	if (!hw) {</div><div class='hunk'>@@ -5264,7 +5287,7 @@ static struct b43_wl *b43_wireless_init(struct b43_bus_dev *dev)</div><div class='ctx'> 		BIT(NL80211_IFTYPE_WDS) |</div><div class='ctx'> 		BIT(NL80211_IFTYPE_ADHOC);</div><div class='ctx'> </div><div class='del'>-	hw-&gt;queues = modparam_qos ? 4 : 1;</div><div class='add'>+	hw-&gt;queues = modparam_qos ? B43_QOS_QUEUE_NUM : 1;</div><div class='ctx'> 	wl-&gt;mac80211_initially_registered_queues = hw-&gt;queues;</div><div class='ctx'> 	hw-&gt;max_rates = 2;</div><div class='ctx'> 	SET_IEEE80211_DEV(hw, dev-&gt;dev);</div><div class='hunk'>@@ -5281,7 +5304,12 @@ static struct b43_wl *b43_wireless_init(struct b43_bus_dev *dev)</div><div class='ctx'> 	INIT_WORK(&amp;wl-&gt;beacon_update_trigger, b43_beacon_update_trigger_work);</div><div class='ctx'> 	INIT_WORK(&amp;wl-&gt;txpower_adjust_work, b43_phy_txpower_adjust_work);</div><div class='ctx'> 	INIT_WORK(&amp;wl-&gt;tx_work, b43_tx_work);</div><div class='del'>-	skb_queue_head_init(&amp;wl-&gt;tx_queue);</div><div class='add'>+</div><div class='add'>+	/* Initialize queues and flags. */</div><div class='add'>+	for (queue_num = 0; queue_num &lt; B43_QOS_QUEUE_NUM; queue_num++) {</div><div class='add'>+		skb_queue_head_init(&amp;wl-&gt;tx_queue[queue_num]);</div><div class='add'>+		wl-&gt;tx_queue_stopped[queue_num] = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	snprintf(chip_name, ARRAY_SIZE(chip_name),</div><div class='ctx'> 		 (dev-&gt;chip_id &gt; 0x9999) ? "%d" : "%04X", dev-&gt;chip_id);</div><div class='head'>diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/b43/phy_common.c<br/>index 3ea44bb03684..3f8883b14d9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/phy_common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/phy_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/phy_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43/phy_common.c</a></div><div class='hunk'>@@ -145,7 +145,7 @@ void b43_radio_lock(struct b43_wldev *dev)</div><div class='ctx'> </div><div class='ctx'> #if B43_DEBUG</div><div class='ctx'> 	B43_WARN_ON(dev-&gt;phy.radio_locked);</div><div class='del'>-	dev-&gt;phy.radio_locked = 1;</div><div class='add'>+	dev-&gt;phy.radio_locked = true;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	macctl = b43_read32(dev, B43_MMIO_MACCTL);</div><div class='hunk'>@@ -163,7 +163,7 @@ void b43_radio_unlock(struct b43_wldev *dev)</div><div class='ctx'> </div><div class='ctx'> #if B43_DEBUG</div><div class='ctx'> 	B43_WARN_ON(!dev-&gt;phy.radio_locked);</div><div class='del'>-	dev-&gt;phy.radio_locked = 0;</div><div class='add'>+	dev-&gt;phy.radio_locked = false;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Commit any write */</div><div class='hunk'>@@ -178,7 +178,7 @@ void b43_phy_lock(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> #if B43_DEBUG</div><div class='ctx'> 	B43_WARN_ON(dev-&gt;phy.phy_locked);</div><div class='del'>-	dev-&gt;phy.phy_locked = 1;</div><div class='add'>+	dev-&gt;phy.phy_locked = true;</div><div class='ctx'> #endif</div><div class='ctx'> 	B43_WARN_ON(dev-&gt;dev-&gt;core_rev &lt; 3);</div><div class='ctx'> </div><div class='hunk'>@@ -190,7 +190,7 @@ void b43_phy_unlock(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> #if B43_DEBUG</div><div class='ctx'> 	B43_WARN_ON(!dev-&gt;phy.phy_locked);</div><div class='del'>-	dev-&gt;phy.phy_locked = 0;</div><div class='add'>+	dev-&gt;phy.phy_locked = false;</div><div class='ctx'> #endif</div><div class='ctx'> 	B43_WARN_ON(dev-&gt;dev-&gt;core_rev &lt; 3);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/b43/phy_g.c b/drivers/net/wireless/b43/phy_g.c<br/>index 8e157bc213f3..12f467b8d564 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/phy_g.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/phy_g.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/phy_g.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43/phy_g.c</a></div><div class='hunk'>@@ -897,7 +897,7 @@ b43_radio_interference_mitigation_enable(struct b43_wldev *dev, int mode)</div><div class='ctx'> 		if (b43_phy_read(dev, 0x0033) &amp; 0x0800)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		gphy-&gt;aci_enable = 1;</div><div class='add'>+		gphy-&gt;aci_enable = true;</div><div class='ctx'> </div><div class='ctx'> 		phy_stacksave(B43_PHY_RADIO_BITFIELD);</div><div class='ctx'> 		phy_stacksave(B43_PHY_G_CRS);</div><div class='hunk'>@@ -1038,7 +1038,7 @@ b43_radio_interference_mitigation_disable(struct b43_wldev *dev, int mode)</div><div class='ctx'> 		if (!(b43_phy_read(dev, 0x0033) &amp; 0x0800))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		gphy-&gt;aci_enable = 0;</div><div class='add'>+		gphy-&gt;aci_enable = false;</div><div class='ctx'> </div><div class='ctx'> 		phy_stackrestore(B43_PHY_RADIO_BITFIELD);</div><div class='ctx'> 		phy_stackrestore(B43_PHY_G_CRS);</div><div class='hunk'>@@ -1956,10 +1956,10 @@ static void b43_phy_init_pctl(struct b43_wldev *dev)</div><div class='ctx'> 			bbatt.att = 11;</div><div class='ctx'> 			if (phy-&gt;radio_rev == 8) {</div><div class='ctx'> 				rfatt.att = 15;</div><div class='del'>-				rfatt.with_padmix = 1;</div><div class='add'>+				rfatt.with_padmix = true;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				rfatt.att = 9;</div><div class='del'>-				rfatt.with_padmix = 0;</div><div class='add'>+				rfatt.with_padmix = false;</div><div class='ctx'> 			}</div><div class='ctx'> 			b43_set_txpower_g(dev, &amp;bbatt, &amp;rfatt, 0);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2137,7 +2137,7 @@ static void default_radio_attenuation(struct b43_wldev *dev,</div><div class='ctx'> 	struct b43_bus_dev *bdev = dev-&gt;dev;</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='ctx'> </div><div class='del'>-	rf-&gt;with_padmix = 0;</div><div class='add'>+	rf-&gt;with_padmix = false;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;dev-&gt;board_vendor == SSB_BOARDVENDOR_BCM &amp;&amp;</div><div class='ctx'> 	    dev-&gt;dev-&gt;board_type == SSB_BOARD_BCM4309G) {</div><div class='hunk'>@@ -2221,7 +2221,7 @@ static void default_radio_attenuation(struct b43_wldev *dev,</div><div class='ctx'> 			return;</div><div class='ctx'> 		case 8:</div><div class='ctx'> 			rf-&gt;att = 0xA;</div><div class='del'>-			rf-&gt;with_padmix = 1;</div><div class='add'>+			rf-&gt;with_padmix = true;</div><div class='ctx'> 			return;</div><div class='ctx'> 		case 9:</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -2389,7 +2389,7 @@ static int b43_gphy_init_tssi2dbm_table(struct b43_wldev *dev)</div><div class='ctx'> 	B43_WARN_ON((dev-&gt;dev-&gt;chip_id == 0x4301) &amp;&amp;</div><div class='ctx'> 		    (phy-&gt;radio_ver != 0x2050)); /* Not supported anymore */</div><div class='ctx'> </div><div class='del'>-	gphy-&gt;dyn_tssi_tbl = 0;</div><div class='add'>+	gphy-&gt;dyn_tssi_tbl = false;</div><div class='ctx'> </div><div class='ctx'> 	if (pab0 != 0 &amp;&amp; pab1 != 0 &amp;&amp; pab2 != 0 &amp;&amp;</div><div class='ctx'> 	    pab0 != -1 &amp;&amp; pab1 != -1 &amp;&amp; pab2 != -1) {</div><div class='hunk'>@@ -2404,7 +2404,7 @@ static int b43_gphy_init_tssi2dbm_table(struct b43_wldev *dev)</div><div class='ctx'> 							       pab1, pab2);</div><div class='ctx'> 		if (!gphy-&gt;tssi2dbm)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		gphy-&gt;dyn_tssi_tbl = 1;</div><div class='add'>+		gphy-&gt;dyn_tssi_tbl = true;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* pabX values not set in SPROM. */</div><div class='ctx'> 		gphy-&gt;tgt_idle_tssi = 52;</div><div class='hunk'>@@ -2504,7 +2504,7 @@ static void b43_gphy_op_free(struct b43_wldev *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (gphy-&gt;dyn_tssi_tbl)</div><div class='ctx'> 		kfree(gphy-&gt;tssi2dbm);</div><div class='del'>-	gphy-&gt;dyn_tssi_tbl = 0;</div><div class='add'>+	gphy-&gt;dyn_tssi_tbl = false;</div><div class='ctx'> 	gphy-&gt;tssi2dbm = NULL;</div><div class='ctx'> </div><div class='ctx'> 	kfree(gphy);</div><div class='hunk'>@@ -2531,10 +2531,10 @@ static int b43_gphy_op_prepare_hardware(struct b43_wldev *dev)</div><div class='ctx'> 	if (phy-&gt;rev == 1) {</div><div class='ctx'> 		/* Workaround: Temporarly disable gmode through the early init</div><div class='ctx'> 		 * phase, as the gmode stuff is not needed for phy rev 1 */</div><div class='del'>-		phy-&gt;gmode = 0;</div><div class='add'>+		phy-&gt;gmode = false;</div><div class='ctx'> 		b43_wireless_core_reset(dev, 0);</div><div class='ctx'> 		b43_phy_initg(dev);</div><div class='del'>-		phy-&gt;gmode = 1;</div><div class='add'>+		phy-&gt;gmode = true;</div><div class='ctx'> 		b43_wireless_core_reset(dev, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2613,7 +2613,7 @@ static void b43_gphy_op_software_rfkill(struct b43_wldev *dev,</div><div class='ctx'> 				      gphy-&gt;radio_off_context.rfover);</div><div class='ctx'> 			b43_phy_write(dev, B43_PHY_RFOVERVAL,</div><div class='ctx'> 				      gphy-&gt;radio_off_context.rfoverval);</div><div class='del'>-			gphy-&gt;radio_off_context.valid = 0;</div><div class='add'>+			gphy-&gt;radio_off_context.valid = false;</div><div class='ctx'> 		}</div><div class='ctx'> 		channel = phy-&gt;channel;</div><div class='ctx'> 		b43_gphy_channel_switch(dev, 6, 1);</div><div class='hunk'>@@ -2626,7 +2626,7 @@ static void b43_gphy_op_software_rfkill(struct b43_wldev *dev,</div><div class='ctx'> 		rfoverval = b43_phy_read(dev, B43_PHY_RFOVERVAL);</div><div class='ctx'> 		gphy-&gt;radio_off_context.rfover = rfover;</div><div class='ctx'> 		gphy-&gt;radio_off_context.rfoverval = rfoverval;</div><div class='del'>-		gphy-&gt;radio_off_context.valid = 1;</div><div class='add'>+		gphy-&gt;radio_off_context.valid = true;</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_RFOVER, rfover | 0x008C);</div><div class='ctx'> 		b43_phy_write(dev, B43_PHY_RFOVERVAL, rfoverval &amp; 0xFF73);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2711,10 +2711,10 @@ static int b43_gphy_op_interf_mitigation(struct b43_wldev *dev,</div><div class='ctx'> 	if ((phy-&gt;rev == 0) || (!phy-&gt;gmode))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	gphy-&gt;aci_wlan_automatic = 0;</div><div class='add'>+	gphy-&gt;aci_wlan_automatic = false;</div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case B43_INTERFMODE_AUTOWLAN:</div><div class='del'>-		gphy-&gt;aci_wlan_automatic = 1;</div><div class='add'>+		gphy-&gt;aci_wlan_automatic = true;</div><div class='ctx'> 		if (gphy-&gt;aci_enable)</div><div class='ctx'> 			mode = B43_INTERFMODE_MANUALWLAN;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -2735,8 +2735,8 @@ static int b43_gphy_op_interf_mitigation(struct b43_wldev *dev,</div><div class='ctx'> 		b43_radio_interference_mitigation_disable(dev, currentmode);</div><div class='ctx'> </div><div class='ctx'> 	if (mode == B43_INTERFMODE_NONE) {</div><div class='del'>-		gphy-&gt;aci_enable = 0;</div><div class='del'>-		gphy-&gt;aci_hw_rssi = 0;</div><div class='add'>+		gphy-&gt;aci_enable = false;</div><div class='add'>+		gphy-&gt;aci_hw_rssi = false;</div><div class='ctx'> 	} else</div><div class='ctx'> 		b43_radio_interference_mitigation_enable(dev, mode);</div><div class='ctx'> 	gphy-&gt;interfmode = mode;</div><div class='head'>diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c<br/>index f93d66b1817b..3ae28561f7a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/phy_lp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/phy_lp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/phy_lp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43/phy_lp.c</a></div><div class='hunk'>@@ -736,9 +736,9 @@ static void lpphy_set_deaf(struct b43_wldev *dev, bool user)</div><div class='ctx'> 	struct b43_phy_lp *lpphy = dev-&gt;phy.lp;</div><div class='ctx'> </div><div class='ctx'> 	if (user)</div><div class='del'>-		lpphy-&gt;crs_usr_disable = 1;</div><div class='add'>+		lpphy-&gt;crs_usr_disable = true;</div><div class='ctx'> 	else</div><div class='del'>-		lpphy-&gt;crs_sys_disable = 1;</div><div class='add'>+		lpphy-&gt;crs_sys_disable = true;</div><div class='ctx'> 	b43_phy_maskset(dev, B43_LPPHY_CRSGAIN_CTL, 0xFF1F, 0x80);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -747,9 +747,9 @@ static void lpphy_clear_deaf(struct b43_wldev *dev, bool user)</div><div class='ctx'> 	struct b43_phy_lp *lpphy = dev-&gt;phy.lp;</div><div class='ctx'> </div><div class='ctx'> 	if (user)</div><div class='del'>-		lpphy-&gt;crs_usr_disable = 0;</div><div class='add'>+		lpphy-&gt;crs_usr_disable = false;</div><div class='ctx'> 	else</div><div class='del'>-		lpphy-&gt;crs_sys_disable = 0;</div><div class='add'>+		lpphy-&gt;crs_sys_disable = false;</div><div class='ctx'> </div><div class='ctx'> 	if (!lpphy-&gt;crs_usr_disable &amp;&amp; !lpphy-&gt;crs_sys_disable) {</div><div class='ctx'> 		if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ)</div><div class='head'>diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c<br/>index b17d9b6c33a5..bf5a43855358 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/phy_n.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/phy_n.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/phy_n.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43/phy_n.c</a></div><div class='hunk'>@@ -78,19 +78,6 @@ enum b43_nphy_rssi_type {</div><div class='ctx'> 	B43_NPHY_RSSI_TBD,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* TODO: reorder functions */</div><div class='del'>-static void b43_nphy_stay_in_carrier_search(struct b43_wldev *dev,</div><div class='del'>-						bool enable);</div><div class='del'>-static void b43_nphy_set_rf_sequence(struct b43_wldev *dev, u8 cmd,</div><div class='del'>-					u8 *events, u8 *delays, u8 length);</div><div class='del'>-static void b43_nphy_force_rf_sequence(struct b43_wldev *dev,</div><div class='del'>-				       enum b43_nphy_rf_sequence seq);</div><div class='del'>-static void b43_nphy_rf_control_override(struct b43_wldev *dev, u16 field,</div><div class='del'>-						u16 value, u8 core, bool off);</div><div class='del'>-static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,</div><div class='del'>-						u16 value, u8 core);</div><div class='del'>-static const u32 *b43_nphy_get_ipa_gain_table(struct b43_wldev *dev);</div><div class='del'>-</div><div class='ctx'> static inline bool b43_nphy_ipa(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	enum ieee80211_band band = b43_current_band(dev-&gt;wl);</div><div class='hunk'>@@ -98,57 +85,394 @@ static inline bool b43_nphy_ipa(struct b43_wldev *dev)</div><div class='ctx'> 		(dev-&gt;phy.n-&gt;ipa5g_on &amp;&amp; band == IEEE80211_BAND_5GHZ));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna)</div><div class='del'>-{//TODO</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/GetIpaGainTbl */</div><div class='add'>+static const u32 *b43_nphy_get_ipa_gain_table(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ) {</div><div class='add'>+		if (dev-&gt;phy.rev &gt;= 6) {</div><div class='add'>+			if (dev-&gt;dev-&gt;chip_id == 47162)</div><div class='add'>+				return txpwrctrl_tx_gain_ipa_rev5;</div><div class='add'>+			return txpwrctrl_tx_gain_ipa_rev6;</div><div class='add'>+		} else if (dev-&gt;phy.rev &gt;= 5) {</div><div class='add'>+			return txpwrctrl_tx_gain_ipa_rev5;</div><div class='add'>+		} else {</div><div class='add'>+			return txpwrctrl_tx_gain_ipa;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		return txpwrctrl_tx_gain_ipa_5g;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void b43_nphy_op_adjust_txpower(struct b43_wldev *dev)</div><div class='del'>-{//TODO</div><div class='add'>+/**************************************************</div><div class='add'>+ * RF (just without b43_nphy_rf_control_intc_override)</div><div class='add'>+ **************************************************/</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/ForceRFSeq */</div><div class='add'>+static void b43_nphy_force_rf_sequence(struct b43_wldev *dev,</div><div class='add'>+				       enum b43_nphy_rf_sequence seq)</div><div class='add'>+{</div><div class='add'>+	static const u16 trigger[] = {</div><div class='add'>+		[B43_RFSEQ_RX2TX]		= B43_NPHY_RFSEQTR_RX2TX,</div><div class='add'>+		[B43_RFSEQ_TX2RX]		= B43_NPHY_RFSEQTR_TX2RX,</div><div class='add'>+		[B43_RFSEQ_RESET2RX]		= B43_NPHY_RFSEQTR_RST2RX,</div><div class='add'>+		[B43_RFSEQ_UPDATE_GAINH]	= B43_NPHY_RFSEQTR_UPGH,</div><div class='add'>+		[B43_RFSEQ_UPDATE_GAINL]	= B43_NPHY_RFSEQTR_UPGL,</div><div class='add'>+		[B43_RFSEQ_UPDATE_GAINU]	= B43_NPHY_RFSEQTR_UPGU,</div><div class='add'>+	};</div><div class='add'>+	int i;</div><div class='add'>+	u16 seq_mode = b43_phy_read(dev, B43_NPHY_RFSEQMODE);</div><div class='add'>+</div><div class='add'>+	B43_WARN_ON(seq &gt;= ARRAY_SIZE(trigger));</div><div class='add'>+</div><div class='add'>+	b43_phy_set(dev, B43_NPHY_RFSEQMODE,</div><div class='add'>+		    B43_NPHY_RFSEQMODE_CAOVER | B43_NPHY_RFSEQMODE_TROVER);</div><div class='add'>+	b43_phy_set(dev, B43_NPHY_RFSEQTR, trigger[seq]);</div><div class='add'>+	for (i = 0; i &lt; 200; i++) {</div><div class='add'>+		if (!(b43_phy_read(dev, B43_NPHY_RFSEQST) &amp; trigger[seq]))</div><div class='add'>+			goto ok;</div><div class='add'>+		msleep(1);</div><div class='add'>+	}</div><div class='add'>+	b43err(dev-&gt;wl, "RF sequence status timeout\n");</div><div class='add'>+ok:</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_RFSEQMODE, seq_mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static enum b43_txpwr_result b43_nphy_op_recalc_txpower(struct b43_wldev *dev,</div><div class='del'>-							bool ignore_tssi)</div><div class='del'>-{//TODO</div><div class='del'>-	return B43_TXPWR_RES_DONE;</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RFCtrlOverride */</div><div class='add'>+static void b43_nphy_rf_control_override(struct b43_wldev *dev, u16 field,</div><div class='add'>+						u16 value, u8 core, bool off)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u8 index = fls(field);</div><div class='add'>+	u8 addr, en_addr, val_addr;</div><div class='add'>+	/* we expect only one bit set */</div><div class='add'>+	B43_WARN_ON(field &amp; (~(1 &lt;&lt; (index - 1))));</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phy.rev &gt;= 3) {</div><div class='add'>+		const struct nphy_rf_control_override_rev3 *rf_ctrl;</div><div class='add'>+		for (i = 0; i &lt; 2; i++) {</div><div class='add'>+			if (index == 0 || index == 16) {</div><div class='add'>+				b43err(dev-&gt;wl,</div><div class='add'>+					"Unsupported RF Ctrl Override call\n");</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			rf_ctrl = &amp;tbl_rf_control_override_rev3[index - 1];</div><div class='add'>+			en_addr = B43_PHY_N((i == 0) ?</div><div class='add'>+				rf_ctrl-&gt;en_addr0 : rf_ctrl-&gt;en_addr1);</div><div class='add'>+			val_addr = B43_PHY_N((i == 0) ?</div><div class='add'>+				rf_ctrl-&gt;val_addr0 : rf_ctrl-&gt;val_addr1);</div><div class='add'>+</div><div class='add'>+			if (off) {</div><div class='add'>+				b43_phy_mask(dev, en_addr, ~(field));</div><div class='add'>+				b43_phy_mask(dev, val_addr,</div><div class='add'>+						~(rf_ctrl-&gt;val_mask));</div><div class='add'>+			} else {</div><div class='add'>+				if (core == 0 || ((1 &lt;&lt; i) &amp; core)) {</div><div class='add'>+					b43_phy_set(dev, en_addr, field);</div><div class='add'>+					b43_phy_maskset(dev, val_addr,</div><div class='add'>+						~(rf_ctrl-&gt;val_mask),</div><div class='add'>+						(value &lt;&lt; rf_ctrl-&gt;val_shift));</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		const struct nphy_rf_control_override_rev2 *rf_ctrl;</div><div class='add'>+		if (off) {</div><div class='add'>+			b43_phy_mask(dev, B43_NPHY_RFCTL_OVER, ~(field));</div><div class='add'>+			value = 0;</div><div class='add'>+		} else {</div><div class='add'>+			b43_phy_set(dev, B43_NPHY_RFCTL_OVER, field);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 2; i++) {</div><div class='add'>+			if (index &lt;= 1 || index == 16) {</div><div class='add'>+				b43err(dev-&gt;wl,</div><div class='add'>+					"Unsupported RF Ctrl Override call\n");</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (index == 2 || index == 10 ||</div><div class='add'>+			    (index &gt;= 13 &amp;&amp; index &lt;= 15)) {</div><div class='add'>+				core = 1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			rf_ctrl = &amp;tbl_rf_control_override_rev2[index - 2];</div><div class='add'>+			addr = B43_PHY_N((i == 0) ?</div><div class='add'>+				rf_ctrl-&gt;addr0 : rf_ctrl-&gt;addr1);</div><div class='add'>+</div><div class='add'>+			if ((1 &lt;&lt; i) &amp; core)</div><div class='add'>+				b43_phy_maskset(dev, addr, ~(rf_ctrl-&gt;bmask),</div><div class='add'>+						(value &lt;&lt; rf_ctrl-&gt;shift));</div><div class='add'>+</div><div class='add'>+			b43_phy_set(dev, B43_NPHY_RFCTL_OVER, 0x1);</div><div class='add'>+			b43_phy_set(dev, B43_NPHY_RFCTL_CMD,</div><div class='add'>+					B43_NPHY_RFCTL_CMD_START);</div><div class='add'>+			udelay(1);</div><div class='add'>+			b43_phy_mask(dev, B43_NPHY_RFCTL_OVER, 0xFFFE);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void b43_chantab_radio_upload(struct b43_wldev *dev,</div><div class='del'>-				const struct b43_nphy_channeltab_entry_rev2 *e)</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RFCtrlIntcOverride */</div><div class='add'>+static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,</div><div class='add'>+						u16 value, u8 core)</div><div class='ctx'> {</div><div class='del'>-	b43_radio_write(dev, B2055_PLL_REF, e-&gt;radio_pll_ref);</div><div class='del'>-	b43_radio_write(dev, B2055_RF_PLLMOD0, e-&gt;radio_rf_pllmod0);</div><div class='del'>-	b43_radio_write(dev, B2055_RF_PLLMOD1, e-&gt;radio_rf_pllmod1);</div><div class='del'>-	b43_radio_write(dev, B2055_VCO_CAPTAIL, e-&gt;radio_vco_captail);</div><div class='del'>-	b43_read32(dev, B43_MMIO_MACCTL); /* flush writes */</div><div class='add'>+	u8 i, j;</div><div class='add'>+	u16 reg, tmp, val;</div><div class='ctx'> </div><div class='del'>-	b43_radio_write(dev, B2055_VCO_CAL1, e-&gt;radio_vco_cal1);</div><div class='del'>-	b43_radio_write(dev, B2055_VCO_CAL2, e-&gt;radio_vco_cal2);</div><div class='del'>-	b43_radio_write(dev, B2055_PLL_LFC1, e-&gt;radio_pll_lfc1);</div><div class='del'>-	b43_radio_write(dev, B2055_PLL_LFR1, e-&gt;radio_pll_lfr1);</div><div class='del'>-	b43_read32(dev, B43_MMIO_MACCTL); /* flush writes */</div><div class='add'>+	B43_WARN_ON(dev-&gt;phy.rev &lt; 3);</div><div class='add'>+	B43_WARN_ON(field &gt; 4);</div><div class='ctx'> </div><div class='del'>-	b43_radio_write(dev, B2055_PLL_LFC2, e-&gt;radio_pll_lfc2);</div><div class='del'>-	b43_radio_write(dev, B2055_LGBUF_CENBUF, e-&gt;radio_lgbuf_cenbuf);</div><div class='del'>-	b43_radio_write(dev, B2055_LGEN_TUNE1, e-&gt;radio_lgen_tune1);</div><div class='del'>-	b43_radio_write(dev, B2055_LGEN_TUNE2, e-&gt;radio_lgen_tune2);</div><div class='del'>-	b43_read32(dev, B43_MMIO_MACCTL); /* flush writes */</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		if ((core == 1 &amp;&amp; i == 1) || (core == 2 &amp;&amp; !i))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	b43_radio_write(dev, B2055_C1_LGBUF_ATUNE, e-&gt;radio_c1_lgbuf_atune);</div><div class='del'>-	b43_radio_write(dev, B2055_C1_LGBUF_GTUNE, e-&gt;radio_c1_lgbuf_gtune);</div><div class='del'>-	b43_radio_write(dev, B2055_C1_RX_RFR1, e-&gt;radio_c1_rx_rfr1);</div><div class='del'>-	b43_radio_write(dev, B2055_C1_TX_PGAPADTN, e-&gt;radio_c1_tx_pgapadtn);</div><div class='del'>-	b43_read32(dev, B43_MMIO_MACCTL); /* flush writes */</div><div class='add'>+		reg = (i == 0) ?</div><div class='add'>+			B43_NPHY_RFCTL_INTC1 : B43_NPHY_RFCTL_INTC2;</div><div class='add'>+		b43_phy_mask(dev, reg, 0xFBFF);</div><div class='ctx'> </div><div class='del'>-	b43_radio_write(dev, B2055_C1_TX_MXBGTRIM, e-&gt;radio_c1_tx_mxbgtrim);</div><div class='del'>-	b43_radio_write(dev, B2055_C2_LGBUF_ATUNE, e-&gt;radio_c2_lgbuf_atune);</div><div class='del'>-	b43_radio_write(dev, B2055_C2_LGBUF_GTUNE, e-&gt;radio_c2_lgbuf_gtune);</div><div class='del'>-	b43_radio_write(dev, B2055_C2_RX_RFR1, e-&gt;radio_c2_rx_rfr1);</div><div class='del'>-	b43_read32(dev, B43_MMIO_MACCTL); /* flush writes */</div><div class='add'>+		switch (field) {</div><div class='add'>+		case 0:</div><div class='add'>+			b43_phy_write(dev, reg, 0);</div><div class='add'>+			b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RESET2RX);</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			if (!i) {</div><div class='add'>+				b43_phy_maskset(dev, B43_NPHY_RFCTL_INTC1,</div><div class='add'>+						0xFC3F, (value &lt;&lt; 6));</div><div class='add'>+				b43_phy_maskset(dev, B43_NPHY_TXF_40CO_B1S1,</div><div class='add'>+						0xFFFE, 1);</div><div class='add'>+				b43_phy_set(dev, B43_NPHY_RFCTL_CMD,</div><div class='add'>+						B43_NPHY_RFCTL_CMD_START);</div><div class='add'>+				for (j = 0; j &lt; 100; j++) {</div><div class='add'>+					if (b43_phy_read(dev, B43_NPHY_RFCTL_CMD) &amp; B43_NPHY_RFCTL_CMD_START) {</div><div class='add'>+						j = 0;</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+					udelay(10);</div><div class='add'>+				}</div><div class='add'>+				if (j)</div><div class='add'>+					b43err(dev-&gt;wl,</div><div class='add'>+						"intc override timeout\n");</div><div class='add'>+				b43_phy_mask(dev, B43_NPHY_TXF_40CO_B1S1,</div><div class='add'>+						0xFFFE);</div><div class='add'>+			} else {</div><div class='add'>+				b43_phy_maskset(dev, B43_NPHY_RFCTL_INTC2,</div><div class='add'>+						0xFC3F, (value &lt;&lt; 6));</div><div class='add'>+				b43_phy_maskset(dev, B43_NPHY_RFCTL_OVER,</div><div class='add'>+						0xFFFE, 1);</div><div class='add'>+				b43_phy_set(dev, B43_NPHY_RFCTL_CMD,</div><div class='add'>+						B43_NPHY_RFCTL_CMD_RXTX);</div><div class='add'>+				for (j = 0; j &lt; 100; j++) {</div><div class='add'>+					if (b43_phy_read(dev, B43_NPHY_RFCTL_CMD) &amp; B43_NPHY_RFCTL_CMD_RXTX) {</div><div class='add'>+						j = 0;</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+					udelay(10);</div><div class='add'>+				}</div><div class='add'>+				if (j)</div><div class='add'>+					b43err(dev-&gt;wl,</div><div class='add'>+						"intc override timeout\n");</div><div class='add'>+				b43_phy_mask(dev, B43_NPHY_RFCTL_OVER,</div><div class='add'>+						0xFFFE);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ) {</div><div class='add'>+				tmp = 0x0020;</div><div class='add'>+				val = value &lt;&lt; 5;</div><div class='add'>+			} else {</div><div class='add'>+				tmp = 0x0010;</div><div class='add'>+				val = value &lt;&lt; 4;</div><div class='add'>+			}</div><div class='add'>+			b43_phy_maskset(dev, reg, ~tmp, val);</div><div class='add'>+			break;</div><div class='add'>+		case 3:</div><div class='add'>+			if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ) {</div><div class='add'>+				tmp = 0x0001;</div><div class='add'>+				val = value;</div><div class='add'>+			} else {</div><div class='add'>+				tmp = 0x0004;</div><div class='add'>+				val = value &lt;&lt; 2;</div><div class='add'>+			}</div><div class='add'>+			b43_phy_maskset(dev, reg, ~tmp, val);</div><div class='add'>+			break;</div><div class='add'>+		case 4:</div><div class='add'>+			if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ) {</div><div class='add'>+				tmp = 0x0002;</div><div class='add'>+				val = value &lt;&lt; 1;</div><div class='add'>+			} else {</div><div class='add'>+				tmp = 0x0008;</div><div class='add'>+				val = value &lt;&lt; 3;</div><div class='add'>+			}</div><div class='add'>+			b43_phy_maskset(dev, reg, ~tmp, val);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	b43_radio_write(dev, B2055_C2_TX_PGAPADTN, e-&gt;radio_c2_tx_pgapadtn);</div><div class='del'>-	b43_radio_write(dev, B2055_C2_TX_MXBGTRIM, e-&gt;radio_c2_tx_mxbgtrim);</div><div class='add'>+/**************************************************</div><div class='add'>+ * Various PHY ops</div><div class='add'>+ **************************************************/</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/clip-detection */</div><div class='add'>+static void b43_nphy_write_clip_detection(struct b43_wldev *dev,</div><div class='add'>+					  const u16 *clip_st)</div><div class='add'>+{</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_C1_CLIP1THRES, clip_st[0]);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_C2_CLIP1THRES, clip_st[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/clip-detection */</div><div class='add'>+static void b43_nphy_read_clip_detection(struct b43_wldev *dev, u16 *clip_st)</div><div class='add'>+{</div><div class='add'>+	clip_st[0] = b43_phy_read(dev, B43_NPHY_C1_CLIP1THRES);</div><div class='add'>+	clip_st[1] = b43_phy_read(dev, B43_NPHY_C2_CLIP1THRES);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/classifier */</div><div class='add'>+static u16 b43_nphy_classifier(struct b43_wldev *dev, u16 mask, u16 val)</div><div class='add'>+{</div><div class='add'>+	u16 tmp;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dev-&gt;core_rev == 16)</div><div class='add'>+		b43_mac_suspend(dev);</div><div class='add'>+</div><div class='add'>+	tmp = b43_phy_read(dev, B43_NPHY_CLASSCTL);</div><div class='add'>+	tmp &amp;= (B43_NPHY_CLASSCTL_CCKEN | B43_NPHY_CLASSCTL_OFDMEN |</div><div class='add'>+		B43_NPHY_CLASSCTL_WAITEDEN);</div><div class='add'>+	tmp &amp;= ~mask;</div><div class='add'>+	tmp |= (val &amp; mask);</div><div class='add'>+	b43_phy_maskset(dev, B43_NPHY_CLASSCTL, 0xFFF8, tmp);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dev-&gt;core_rev == 16)</div><div class='add'>+		b43_mac_enable(dev);</div><div class='add'>+</div><div class='add'>+	return tmp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/CCA */</div><div class='add'>+static void b43_nphy_reset_cca(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	u16 bbcfg;</div><div class='add'>+</div><div class='add'>+	b43_phy_force_clock(dev, 1);</div><div class='add'>+	bbcfg = b43_phy_read(dev, B43_NPHY_BBCFG);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_BBCFG, bbcfg | B43_NPHY_BBCFG_RSTCCA);</div><div class='add'>+	udelay(1);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_BBCFG, bbcfg &amp; ~B43_NPHY_BBCFG_RSTCCA);</div><div class='add'>+	b43_phy_force_clock(dev, 0);</div><div class='add'>+	b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RESET2RX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/carriersearch */</div><div class='add'>+static void b43_nphy_stay_in_carrier_search(struct b43_wldev *dev, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_n *nphy = phy-&gt;n;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		static const u16 clip[] = { 0xFFFF, 0xFFFF };</div><div class='add'>+		if (nphy-&gt;deaf_count++ == 0) {</div><div class='add'>+			nphy-&gt;classifier_state = b43_nphy_classifier(dev, 0, 0);</div><div class='add'>+			b43_nphy_classifier(dev, 0x7, 0);</div><div class='add'>+			b43_nphy_read_clip_detection(dev, nphy-&gt;clip_state);</div><div class='add'>+			b43_nphy_write_clip_detection(dev, clip);</div><div class='add'>+		}</div><div class='add'>+		b43_nphy_reset_cca(dev);</div><div class='add'>+	} else {</div><div class='add'>+		if (--nphy-&gt;deaf_count == 0) {</div><div class='add'>+			b43_nphy_classifier(dev, 0x7, nphy-&gt;classifier_state);</div><div class='add'>+			b43_nphy_write_clip_detection(dev, nphy-&gt;clip_state);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/AdjustLnaGainTbl */</div><div class='add'>+static void b43_nphy_adjust_lna_gain_table(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='add'>+</div><div class='add'>+	u8 i;</div><div class='add'>+	s16 tmp;</div><div class='add'>+	u16 data[4];</div><div class='add'>+	s16 gain[2];</div><div class='add'>+	u16 minmax[2];</div><div class='add'>+	static const u16 lna_gain[4] = { -2, 10, 19, 25 };</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;hang_avoid)</div><div class='add'>+		b43_nphy_stay_in_carrier_search(dev, 1);</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;gain_boost) {</div><div class='add'>+		if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ) {</div><div class='add'>+			gain[0] = 6;</div><div class='add'>+			gain[1] = 6;</div><div class='add'>+		} else {</div><div class='add'>+			tmp = 40370 - 315 * dev-&gt;phy.channel;</div><div class='add'>+			gain[0] = ((tmp &gt;&gt; 13) + ((tmp &gt;&gt; 12) &amp; 1));</div><div class='add'>+			tmp = 23242 - 224 * dev-&gt;phy.channel;</div><div class='add'>+			gain[1] = ((tmp &gt;&gt; 13) + ((tmp &gt;&gt; 12) &amp; 1));</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		gain[0] = 0;</div><div class='add'>+		gain[1] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		if (nphy-&gt;elna_gain_config) {</div><div class='add'>+			data[0] = 19 + gain[i];</div><div class='add'>+			data[1] = 25 + gain[i];</div><div class='add'>+			data[2] = 25 + gain[i];</div><div class='add'>+			data[3] = 25 + gain[i];</div><div class='add'>+		} else {</div><div class='add'>+			data[0] = lna_gain[0] + gain[i];</div><div class='add'>+			data[1] = lna_gain[1] + gain[i];</div><div class='add'>+			data[2] = lna_gain[2] + gain[i];</div><div class='add'>+			data[3] = lna_gain[3] + gain[i];</div><div class='add'>+		}</div><div class='add'>+		b43_ntab_write_bulk(dev, B43_NTAB16(i, 8), 4, data);</div><div class='add'>+</div><div class='add'>+		minmax[i] = 23 + gain[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	b43_phy_maskset(dev, B43_NPHY_C1_MINMAX_GAIN, ~B43_NPHY_C1_MINGAIN,</div><div class='add'>+				minmax[0] &lt;&lt; B43_NPHY_C1_MINGAIN_SHIFT);</div><div class='add'>+	b43_phy_maskset(dev, B43_NPHY_C2_MINMAX_GAIN, ~B43_NPHY_C2_MINGAIN,</div><div class='add'>+				minmax[1] &lt;&lt; B43_NPHY_C2_MINGAIN_SHIFT);</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;hang_avoid)</div><div class='add'>+		b43_nphy_stay_in_carrier_search(dev, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/SetRfSeq */</div><div class='add'>+static void b43_nphy_set_rf_sequence(struct b43_wldev *dev, u8 cmd,</div><div class='add'>+					u8 *events, u8 *delays, u8 length)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='add'>+	u8 i;</div><div class='add'>+	u8 end = (dev-&gt;phy.rev &gt;= 3) ? 0x1F : 0x0F;</div><div class='add'>+	u16 offset1 = cmd &lt;&lt; 4;</div><div class='add'>+	u16 offset2 = offset1 + 0x80;</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;hang_avoid)</div><div class='add'>+		b43_nphy_stay_in_carrier_search(dev, true);</div><div class='add'>+</div><div class='add'>+	b43_ntab_write_bulk(dev, B43_NTAB8(7, offset1), length, events);</div><div class='add'>+	b43_ntab_write_bulk(dev, B43_NTAB8(7, offset2), length, delays);</div><div class='add'>+</div><div class='add'>+	for (i = length; i &lt; 16; i++) {</div><div class='add'>+		b43_ntab_write(dev, B43_NTAB8(7, offset1 + i), end);</div><div class='add'>+		b43_ntab_write(dev, B43_NTAB8(7, offset2 + i), 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;hang_avoid)</div><div class='add'>+		b43_nphy_stay_in_carrier_search(dev, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**************************************************</div><div class='add'>+ * Radio 0x2056</div><div class='add'>+ **************************************************/</div><div class='add'>+</div><div class='ctx'> static void b43_chantab_radio_2056_upload(struct b43_wldev *dev,</div><div class='ctx'> 				const struct b43_nphy_channeltab_entry_rev3 *e)</div><div class='ctx'> {</div><div class='hunk'>@@ -228,10 +552,98 @@ static void b43_chantab_radio_2056_upload(struct b43_wldev *dev,</div><div class='ctx'> static void b43_radio_2056_setup(struct b43_wldev *dev,</div><div class='ctx'> 				const struct b43_nphy_channeltab_entry_rev3 *e)</div><div class='ctx'> {</div><div class='add'>+	struct ssb_sprom *sprom = dev-&gt;dev-&gt;bus_sprom;</div><div class='add'>+	enum ieee80211_band band = b43_current_band(dev-&gt;wl);</div><div class='add'>+	u16 offset;</div><div class='add'>+	u8 i;</div><div class='add'>+	u16 bias, cbias, pag_boost, pgag_boost, mixg_boost, padg_boost;</div><div class='add'>+</div><div class='ctx'> 	B43_WARN_ON(dev-&gt;phy.rev &lt; 3);</div><div class='ctx'> </div><div class='ctx'> 	b43_chantab_radio_2056_upload(dev, e);</div><div class='del'>-	/* TODO */</div><div class='add'>+	b2056_upload_syn_pll_cp2(dev, band == IEEE80211_BAND_5GHZ);</div><div class='add'>+</div><div class='add'>+	if (sprom-&gt;boardflags2_lo &amp; B43_BFL2_GPLL_WAR &amp;&amp;</div><div class='add'>+	    b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ) {</div><div class='add'>+		b43_radio_write(dev, B2056_SYN_PLL_LOOPFILTER1, 0x1F);</div><div class='add'>+		b43_radio_write(dev, B2056_SYN_PLL_LOOPFILTER2, 0x1F);</div><div class='add'>+		if (dev-&gt;dev-&gt;chip_id == 0x4716) {</div><div class='add'>+			b43_radio_write(dev, B2056_SYN_PLL_LOOPFILTER4, 0x14);</div><div class='add'>+			b43_radio_write(dev, B2056_SYN_PLL_CP2, 0);</div><div class='add'>+		} else {</div><div class='add'>+			b43_radio_write(dev, B2056_SYN_PLL_LOOPFILTER4, 0x0B);</div><div class='add'>+			b43_radio_write(dev, B2056_SYN_PLL_CP2, 0x14);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (sprom-&gt;boardflags2_lo &amp; B43_BFL2_APLL_WAR &amp;&amp;</div><div class='add'>+	    b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ) {</div><div class='add'>+		b43_radio_write(dev, B2056_SYN_PLL_LOOPFILTER1, 0x1F);</div><div class='add'>+		b43_radio_write(dev, B2056_SYN_PLL_LOOPFILTER2, 0x1F);</div><div class='add'>+		b43_radio_write(dev, B2056_SYN_PLL_LOOPFILTER4, 0x05);</div><div class='add'>+		b43_radio_write(dev, B2056_SYN_PLL_CP2, 0x0C);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phy.n-&gt;ipa2g_on &amp;&amp; band == IEEE80211_BAND_2GHZ) {</div><div class='add'>+		for (i = 0; i &lt; 2; i++) {</div><div class='add'>+			offset = i ? B2056_TX1 : B2056_TX0;</div><div class='add'>+			if (dev-&gt;phy.rev &gt;= 5) {</div><div class='add'>+				b43_radio_write(dev,</div><div class='add'>+					offset | B2056_TX_PADG_IDAC, 0xcc);</div><div class='add'>+</div><div class='add'>+				if (dev-&gt;dev-&gt;chip_id == 0x4716) {</div><div class='add'>+					bias = 0x40;</div><div class='add'>+					cbias = 0x45;</div><div class='add'>+					pag_boost = 0x5;</div><div class='add'>+					pgag_boost = 0x33;</div><div class='add'>+					mixg_boost = 0x55;</div><div class='add'>+				} else {</div><div class='add'>+					bias = 0x25;</div><div class='add'>+					cbias = 0x20;</div><div class='add'>+					pag_boost = 0x4;</div><div class='add'>+					pgag_boost = 0x03;</div><div class='add'>+					mixg_boost = 0x65;</div><div class='add'>+				}</div><div class='add'>+				padg_boost = 0x77;</div><div class='add'>+</div><div class='add'>+				b43_radio_write(dev,</div><div class='add'>+					offset | B2056_TX_INTPAG_IMAIN_STAT,</div><div class='add'>+					bias);</div><div class='add'>+				b43_radio_write(dev,</div><div class='add'>+					offset | B2056_TX_INTPAG_IAUX_STAT,</div><div class='add'>+					bias);</div><div class='add'>+				b43_radio_write(dev,</div><div class='add'>+					offset | B2056_TX_INTPAG_CASCBIAS,</div><div class='add'>+					cbias);</div><div class='add'>+				b43_radio_write(dev,</div><div class='add'>+					offset | B2056_TX_INTPAG_BOOST_TUNE,</div><div class='add'>+					pag_boost);</div><div class='add'>+				b43_radio_write(dev,</div><div class='add'>+					offset | B2056_TX_PGAG_BOOST_TUNE,</div><div class='add'>+					pgag_boost);</div><div class='add'>+				b43_radio_write(dev,</div><div class='add'>+					offset | B2056_TX_PADG_BOOST_TUNE,</div><div class='add'>+					padg_boost);</div><div class='add'>+				b43_radio_write(dev,</div><div class='add'>+					offset | B2056_TX_MIXG_BOOST_TUNE,</div><div class='add'>+					mixg_boost);</div><div class='add'>+			} else {</div><div class='add'>+				bias = dev-&gt;phy.is_40mhz ? 0x40 : 0x20;</div><div class='add'>+				b43_radio_write(dev,</div><div class='add'>+					offset | B2056_TX_INTPAG_IMAIN_STAT,</div><div class='add'>+					bias);</div><div class='add'>+				b43_radio_write(dev,</div><div class='add'>+					offset | B2056_TX_INTPAG_IAUX_STAT,</div><div class='add'>+					bias);</div><div class='add'>+				b43_radio_write(dev,</div><div class='add'>+					offset | B2056_TX_INTPAG_CASCBIAS,</div><div class='add'>+					0x30);</div><div class='add'>+			}</div><div class='add'>+			b43_radio_write(dev, offset | B2056_TX_PA_SPARE1, 0xee);</div><div class='add'>+		}</div><div class='add'>+	} else if (dev-&gt;phy.n-&gt;ipa5g_on &amp;&amp; band == IEEE80211_BAND_5GHZ) {</div><div class='add'>+		/* TODO */</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	udelay(50);</div><div class='ctx'> 	/* VCO calibration */</div><div class='ctx'> 	b43_radio_write(dev, B2056_SYN_PLL_VCOCAL12, 0x00);</div><div class='hunk'>@@ -242,285 +654,84 @@ static void b43_radio_2056_setup(struct b43_wldev *dev,</div><div class='ctx'> 	udelay(300);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void b43_chantab_phy_upload(struct b43_wldev *dev,</div><div class='del'>-				   const struct b43_phy_n_sfo_cfg *e)</div><div class='del'>-{</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_BW1A, e-&gt;phy_bw1a);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_BW2, e-&gt;phy_bw2);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_BW3, e-&gt;phy_bw3);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_BW4, e-&gt;phy_bw4);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_BW5, e-&gt;phy_bw5);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_BW6, e-&gt;phy_bw6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxPwrCtrlEnable */</div><div class='del'>-static void b43_nphy_tx_power_ctrl(struct b43_wldev *dev, bool enable)</div><div class='add'>+static void b43_radio_init2056_pre(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='del'>-	u8 i;</div><div class='del'>-	u16 bmask, val, tmp;</div><div class='del'>-	enum ieee80211_band band = b43_current_band(dev-&gt;wl);</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;hang_avoid)</div><div class='del'>-		b43_nphy_stay_in_carrier_search(dev, 1);</div><div class='del'>-</div><div class='del'>-	nphy-&gt;txpwrctrl = enable;</div><div class='del'>-	if (!enable) {</div><div class='del'>-		if (dev-&gt;phy.rev &gt;= 3 &amp;&amp;</div><div class='del'>-		    (b43_phy_read(dev, B43_NPHY_TXPCTL_CMD) &amp;</div><div class='del'>-		     (B43_NPHY_TXPCTL_CMD_COEFF |</div><div class='del'>-		      B43_NPHY_TXPCTL_CMD_HWPCTLEN |</div><div class='del'>-		      B43_NPHY_TXPCTL_CMD_PCTLEN))) {</div><div class='del'>-			/* We disable enabled TX pwr ctl, save it's state */</div><div class='del'>-			nphy-&gt;tx_pwr_idx[0] = b43_phy_read(dev,</div><div class='del'>-						B43_NPHY_C1_TXPCTL_STAT) &amp; 0x7f;</div><div class='del'>-			nphy-&gt;tx_pwr_idx[1] = b43_phy_read(dev,</div><div class='del'>-						B43_NPHY_C2_TXPCTL_STAT) &amp; 0x7f;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x6840);</div><div class='del'>-		for (i = 0; i &lt; 84; i++)</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0);</div><div class='del'>-</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x6C40);</div><div class='del'>-		for (i = 0; i &lt; 84; i++)</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0);</div><div class='del'>-</div><div class='del'>-		tmp = B43_NPHY_TXPCTL_CMD_COEFF | B43_NPHY_TXPCTL_CMD_HWPCTLEN;</div><div class='del'>-		if (dev-&gt;phy.rev &gt;= 3)</div><div class='del'>-			tmp |= B43_NPHY_TXPCTL_CMD_PCTLEN;</div><div class='del'>-		b43_phy_mask(dev, B43_NPHY_TXPCTL_CMD, ~tmp);</div><div class='del'>-</div><div class='del'>-		if (dev-&gt;phy.rev &gt;= 3) {</div><div class='del'>-			b43_phy_set(dev, B43_NPHY_AFECTL_OVER1, 0x0100);</div><div class='del'>-			b43_phy_set(dev, B43_NPHY_AFECTL_OVER, 0x0100);</div><div class='del'>-		} else {</div><div class='del'>-			b43_phy_set(dev, B43_NPHY_AFECTL_OVER, 0x4000);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (dev-&gt;phy.rev == 2)</div><div class='del'>-			b43_phy_maskset(dev, B43_NPHY_BPHY_CTL3,</div><div class='del'>-				~B43_NPHY_BPHY_CTL3_SCALE, 0x53);</div><div class='del'>-		else if (dev-&gt;phy.rev &lt; 2)</div><div class='del'>-			b43_phy_maskset(dev, B43_NPHY_BPHY_CTL3,</div><div class='del'>-				~B43_NPHY_BPHY_CTL3_SCALE, 0x5A);</div><div class='del'>-</div><div class='del'>-		if (dev-&gt;phy.rev &lt; 2 &amp;&amp; dev-&gt;phy.is_40mhz)</div><div class='del'>-			b43_hf_write(dev, b43_hf_read(dev) | B43_HF_TSSIRPSMW);</div><div class='del'>-	} else {</div><div class='del'>-		b43_ntab_write_bulk(dev, B43_NTAB16(26, 64), 84,</div><div class='del'>-				    nphy-&gt;adj_pwr_tbl);</div><div class='del'>-		b43_ntab_write_bulk(dev, B43_NTAB16(27, 64), 84,</div><div class='del'>-				    nphy-&gt;adj_pwr_tbl);</div><div class='del'>-</div><div class='del'>-		bmask = B43_NPHY_TXPCTL_CMD_COEFF |</div><div class='del'>-			B43_NPHY_TXPCTL_CMD_HWPCTLEN;</div><div class='del'>-		/* wl does useless check for "enable" param here */</div><div class='del'>-		val = B43_NPHY_TXPCTL_CMD_COEFF | B43_NPHY_TXPCTL_CMD_HWPCTLEN;</div><div class='del'>-		if (dev-&gt;phy.rev &gt;= 3) {</div><div class='del'>-			bmask |= B43_NPHY_TXPCTL_CMD_PCTLEN;</div><div class='del'>-			if (val)</div><div class='del'>-				val |= B43_NPHY_TXPCTL_CMD_PCTLEN;</div><div class='del'>-		}</div><div class='del'>-		b43_phy_maskset(dev, B43_NPHY_TXPCTL_CMD, ~(bmask), val);</div><div class='del'>-</div><div class='del'>-		if (band == IEEE80211_BAND_5GHZ) {</div><div class='del'>-			b43_phy_maskset(dev, B43_NPHY_TXPCTL_CMD,</div><div class='del'>-					~B43_NPHY_TXPCTL_CMD_INIT, 0x64);</div><div class='del'>-			if (dev-&gt;phy.rev &gt; 1)</div><div class='del'>-				b43_phy_maskset(dev, B43_NPHY_TXPCTL_INIT,</div><div class='del'>-						~B43_NPHY_TXPCTL_INIT_PIDXI1,</div><div class='del'>-						0x64);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (dev-&gt;phy.rev &gt;= 3) {</div><div class='del'>-			if (nphy-&gt;tx_pwr_idx[0] != 128 &amp;&amp;</div><div class='del'>-			    nphy-&gt;tx_pwr_idx[1] != 128) {</div><div class='del'>-				/* Recover TX pwr ctl state */</div><div class='del'>-				b43_phy_maskset(dev, B43_NPHY_TXPCTL_CMD,</div><div class='del'>-						~B43_NPHY_TXPCTL_CMD_INIT,</div><div class='del'>-						nphy-&gt;tx_pwr_idx[0]);</div><div class='del'>-				if (dev-&gt;phy.rev &gt; 1)</div><div class='del'>-					b43_phy_maskset(dev,</div><div class='del'>-						B43_NPHY_TXPCTL_INIT,</div><div class='del'>-						~0xff, nphy-&gt;tx_pwr_idx[1]);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (dev-&gt;phy.rev &gt;= 3) {</div><div class='del'>-			b43_phy_mask(dev, B43_NPHY_AFECTL_OVER1, ~0x100);</div><div class='del'>-			b43_phy_mask(dev, B43_NPHY_AFECTL_OVER, ~0x100);</div><div class='del'>-		} else {</div><div class='del'>-			b43_phy_mask(dev, B43_NPHY_AFECTL_OVER, ~0x4000);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (dev-&gt;phy.rev == 2)</div><div class='del'>-			b43_phy_maskset(dev, B43_NPHY_BPHY_CTL3, ~0xFF, 0x3b);</div><div class='del'>-		else if (dev-&gt;phy.rev &lt; 2)</div><div class='del'>-			b43_phy_maskset(dev, B43_NPHY_BPHY_CTL3, ~0xFF, 0x40);</div><div class='del'>-</div><div class='del'>-		if (dev-&gt;phy.rev &lt; 2 &amp;&amp; dev-&gt;phy.is_40mhz)</div><div class='del'>-			b43_hf_write(dev, b43_hf_read(dev) &amp; ~B43_HF_TSSIRPSMW);</div><div class='del'>-</div><div class='del'>-		if (b43_nphy_ipa(dev)) {</div><div class='del'>-			b43_phy_mask(dev, B43_NPHY_PAPD_EN0, ~0x4);</div><div class='del'>-			b43_phy_mask(dev, B43_NPHY_PAPD_EN1, ~0x4);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;hang_avoid)</div><div class='del'>-		b43_nphy_stay_in_carrier_search(dev, 0);</div><div class='add'>+	b43_phy_mask(dev, B43_NPHY_RFCTL_CMD,</div><div class='add'>+		     ~B43_NPHY_RFCTL_CMD_CHIP0PU);</div><div class='add'>+	/* Maybe wl meant to reset and set (order?) RFCTL_CMD_OEPORFORCE? */</div><div class='add'>+	b43_phy_mask(dev, B43_NPHY_RFCTL_CMD,</div><div class='add'>+		     B43_NPHY_RFCTL_CMD_OEPORFORCE);</div><div class='add'>+	b43_phy_set(dev, B43_NPHY_RFCTL_CMD,</div><div class='add'>+		    ~B43_NPHY_RFCTL_CMD_OEPORFORCE);</div><div class='add'>+	b43_phy_set(dev, B43_NPHY_RFCTL_CMD,</div><div class='add'>+		    B43_NPHY_RFCTL_CMD_CHIP0PU);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxPwrFix */</div><div class='del'>-static void b43_nphy_tx_power_fix(struct b43_wldev *dev)</div><div class='add'>+static void b43_radio_init2056_post(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='del'>-	struct ssb_sprom *sprom = dev-&gt;dev-&gt;bus_sprom;</div><div class='del'>-</div><div class='del'>-	u8 txpi[2], bbmult, i;</div><div class='del'>-	u16 tmp, radio_gain, dac_gain;</div><div class='del'>-	u16 freq = dev-&gt;phy.channel_freq;</div><div class='del'>-	u32 txgain;</div><div class='del'>-	/* u32 gaintbl; rev3+ */</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;hang_avoid)</div><div class='del'>-		b43_nphy_stay_in_carrier_search(dev, 1);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;phy.rev &gt;= 3) {</div><div class='del'>-		txpi[0] = 40;</div><div class='del'>-		txpi[1] = 40;</div><div class='del'>-	} else if (sprom-&gt;revision &lt; 4) {</div><div class='del'>-		txpi[0] = 72;</div><div class='del'>-		txpi[1] = 72;</div><div class='del'>-	} else {</div><div class='del'>-		if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ) {</div><div class='del'>-			txpi[0] = sprom-&gt;txpid2g[0];</div><div class='del'>-			txpi[1] = sprom-&gt;txpid2g[1];</div><div class='del'>-		} else if (freq &gt;= 4900 &amp;&amp; freq &lt; 5100) {</div><div class='del'>-			txpi[0] = sprom-&gt;txpid5gl[0];</div><div class='del'>-			txpi[1] = sprom-&gt;txpid5gl[1];</div><div class='del'>-		} else if (freq &gt;= 5100 &amp;&amp; freq &lt; 5500) {</div><div class='del'>-			txpi[0] = sprom-&gt;txpid5g[0];</div><div class='del'>-			txpi[1] = sprom-&gt;txpid5g[1];</div><div class='del'>-		} else if (freq &gt;= 5500) {</div><div class='del'>-			txpi[0] = sprom-&gt;txpid5gh[0];</div><div class='del'>-			txpi[1] = sprom-&gt;txpid5gh[1];</div><div class='del'>-		} else {</div><div class='del'>-			txpi[0] = 91;</div><div class='del'>-			txpi[1] = 91;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	b43_radio_set(dev, B2056_SYN_COM_CTRL, 0xB);</div><div class='add'>+	b43_radio_set(dev, B2056_SYN_COM_PU, 0x2);</div><div class='add'>+	b43_radio_set(dev, B2056_SYN_COM_RESET, 0x2);</div><div class='add'>+	msleep(1);</div><div class='add'>+	b43_radio_mask(dev, B2056_SYN_COM_RESET, ~0x2);</div><div class='add'>+	b43_radio_mask(dev, B2056_SYN_PLL_MAST2, ~0xFC);</div><div class='add'>+	b43_radio_mask(dev, B2056_SYN_RCCAL_CTRL0, ~0x1);</div><div class='ctx'> 	/*</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		nphy-&gt;txpwrindex[i].index_internal = txpi[i];</div><div class='del'>-		nphy-&gt;txpwrindex[i].index_internal_save = txpi[i];</div><div class='del'>-	}</div><div class='add'>+	if (nphy-&gt;init_por)</div><div class='add'>+		Call Radio 2056 Recalibrate</div><div class='ctx'> 	*/</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		if (dev-&gt;phy.rev &gt;= 3) {</div><div class='del'>-			/* FIXME: support 5GHz */</div><div class='del'>-			txgain = b43_ntab_tx_gain_rev3plus_2ghz[txpi[i]];</div><div class='del'>-			radio_gain = (txgain &gt;&gt; 16) &amp; 0x1FFFF;</div><div class='del'>-		} else {</div><div class='del'>-			txgain = b43_ntab_tx_gain_rev0_1_2[txpi[i]];</div><div class='del'>-			radio_gain = (txgain &gt;&gt; 16) &amp; 0x1FFF;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dac_gain = (txgain &gt;&gt; 8) &amp; 0x3F;</div><div class='del'>-		bbmult = txgain &amp; 0xFF;</div><div class='del'>-</div><div class='del'>-		if (dev-&gt;phy.rev &gt;= 3) {</div><div class='del'>-			if (i == 0)</div><div class='del'>-				b43_phy_set(dev, B43_NPHY_AFECTL_OVER1, 0x0100);</div><div class='del'>-			else</div><div class='del'>-				b43_phy_set(dev, B43_NPHY_AFECTL_OVER, 0x0100);</div><div class='del'>-		} else {</div><div class='del'>-			b43_phy_set(dev, B43_NPHY_AFECTL_OVER, 0x4000);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (i == 0)</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_AFECTL_DACGAIN1, dac_gain);</div><div class='del'>-		else</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_AFECTL_DACGAIN2, dac_gain);</div><div class='del'>-</div><div class='del'>-		b43_ntab_write(dev, B43_NTAB16(0x7, 0x110 + i), radio_gain);</div><div class='del'>-</div><div class='del'>-		tmp = b43_ntab_read(dev, B43_NTAB16(0xF, 0x57));</div><div class='del'>-		if (i == 0)</div><div class='del'>-			tmp = (tmp &amp; 0x00FF) | (bbmult &lt;&lt; 8);</div><div class='del'>-		else</div><div class='del'>-			tmp = (tmp &amp; 0xFF00) | bbmult;</div><div class='del'>-		b43_ntab_write(dev, B43_NTAB16(0xF, 0x57), tmp);</div><div class='del'>-</div><div class='del'>-		if (b43_nphy_ipa(dev)) {</div><div class='del'>-			u32 tmp32;</div><div class='del'>-			u16 reg = (i == 0) ?</div><div class='del'>-				B43_NPHY_PAPD_EN0 : B43_NPHY_PAPD_EN1;</div><div class='del'>-			tmp32 = b43_ntab_read(dev, B43_NTAB32(26 + i, txpi[i]));</div><div class='del'>-			b43_phy_maskset(dev, reg, 0xE00F, (u32) tmp32 &lt;&lt; 4);</div><div class='del'>-			b43_phy_set(dev, reg, 0x4);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	b43_phy_mask(dev, B43_NPHY_BPHY_CTL2, ~B43_NPHY_BPHY_CTL2_LUT);</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;hang_avoid)</div><div class='del'>-		b43_nphy_stay_in_carrier_search(dev, 0);</div><div class='add'>+/*</div><div class='add'>+ * Initialize a Broadcom 2056 N-radio</div><div class='add'>+ * http://bcm-v4.sipsolutions.net/802.11/Radio/2056/Init</div><div class='add'>+ */</div><div class='add'>+static void b43_radio_init2056(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	b43_radio_init2056_pre(dev);</div><div class='add'>+	b2056_upload_inittabs(dev, 0, 0);</div><div class='add'>+	b43_radio_init2056_post(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void b43_nphy_tx_gain_table_upload(struct b43_wldev *dev)</div><div class='add'>+/**************************************************</div><div class='add'>+ * Radio 0x2055</div><div class='add'>+ **************************************************/</div><div class='add'>+</div><div class='add'>+static void b43_chantab_radio_upload(struct b43_wldev *dev,</div><div class='add'>+				const struct b43_nphy_channeltab_entry_rev2 *e)</div><div class='ctx'> {</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	b43_radio_write(dev, B2055_PLL_REF, e-&gt;radio_pll_ref);</div><div class='add'>+	b43_radio_write(dev, B2055_RF_PLLMOD0, e-&gt;radio_rf_pllmod0);</div><div class='add'>+	b43_radio_write(dev, B2055_RF_PLLMOD1, e-&gt;radio_rf_pllmod1);</div><div class='add'>+	b43_radio_write(dev, B2055_VCO_CAPTAIL, e-&gt;radio_vco_captail);</div><div class='add'>+	b43_read32(dev, B43_MMIO_MACCTL); /* flush writes */</div><div class='ctx'> </div><div class='del'>-	const u32 *table = NULL;</div><div class='del'>-#if 0</div><div class='del'>-	TODO: b43_ntab_papd_pga_gain_delta_ipa_2*</div><div class='del'>-	u32 rfpwr_offset;</div><div class='del'>-	u8 pga_gain;</div><div class='del'>-	int i;</div><div class='del'>-#endif</div><div class='add'>+	b43_radio_write(dev, B2055_VCO_CAL1, e-&gt;radio_vco_cal1);</div><div class='add'>+	b43_radio_write(dev, B2055_VCO_CAL2, e-&gt;radio_vco_cal2);</div><div class='add'>+	b43_radio_write(dev, B2055_PLL_LFC1, e-&gt;radio_pll_lfc1);</div><div class='add'>+	b43_radio_write(dev, B2055_PLL_LFR1, e-&gt;radio_pll_lfr1);</div><div class='add'>+	b43_read32(dev, B43_MMIO_MACCTL); /* flush writes */</div><div class='ctx'> </div><div class='del'>-	if (phy-&gt;rev &gt;= 3) {</div><div class='del'>-		if (b43_nphy_ipa(dev)) {</div><div class='del'>-			table = b43_nphy_get_ipa_gain_table(dev);</div><div class='del'>-		} else {</div><div class='del'>-			if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ) {</div><div class='del'>-				if (phy-&gt;rev == 3)</div><div class='del'>-					table = b43_ntab_tx_gain_rev3_5ghz;</div><div class='del'>-				if (phy-&gt;rev == 4)</div><div class='del'>-					table = b43_ntab_tx_gain_rev4_5ghz;</div><div class='del'>-				else</div><div class='del'>-					table = b43_ntab_tx_gain_rev5plus_5ghz;</div><div class='del'>-			} else {</div><div class='del'>-				table = b43_ntab_tx_gain_rev3plus_2ghz;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		table = b43_ntab_tx_gain_rev0_1_2;</div><div class='del'>-	}</div><div class='del'>-	b43_ntab_write_bulk(dev, B43_NTAB32(26, 192), 128, table);</div><div class='del'>-	b43_ntab_write_bulk(dev, B43_NTAB32(27, 192), 128, table);</div><div class='add'>+	b43_radio_write(dev, B2055_PLL_LFC2, e-&gt;radio_pll_lfc2);</div><div class='add'>+	b43_radio_write(dev, B2055_LGBUF_CENBUF, e-&gt;radio_lgbuf_cenbuf);</div><div class='add'>+	b43_radio_write(dev, B2055_LGEN_TUNE1, e-&gt;radio_lgen_tune1);</div><div class='add'>+	b43_radio_write(dev, B2055_LGEN_TUNE2, e-&gt;radio_lgen_tune2);</div><div class='add'>+	b43_read32(dev, B43_MMIO_MACCTL); /* flush writes */</div><div class='ctx'> </div><div class='del'>-	if (phy-&gt;rev &gt;= 3) {</div><div class='del'>-#if 0</div><div class='del'>-		nphy-&gt;gmval = (table[0] &gt;&gt; 16) &amp; 0x7000;</div><div class='add'>+	b43_radio_write(dev, B2055_C1_LGBUF_ATUNE, e-&gt;radio_c1_lgbuf_atune);</div><div class='add'>+	b43_radio_write(dev, B2055_C1_LGBUF_GTUNE, e-&gt;radio_c1_lgbuf_gtune);</div><div class='add'>+	b43_radio_write(dev, B2055_C1_RX_RFR1, e-&gt;radio_c1_rx_rfr1);</div><div class='add'>+	b43_radio_write(dev, B2055_C1_TX_PGAPADTN, e-&gt;radio_c1_tx_pgapadtn);</div><div class='add'>+	b43_read32(dev, B43_MMIO_MACCTL); /* flush writes */</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; 128; i++) {</div><div class='del'>-			pga_gain = (table[i] &gt;&gt; 24) &amp; 0xF;</div><div class='del'>-			if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ)</div><div class='del'>-				rfpwr_offset = b43_ntab_papd_pga_gain_delta_ipa_2g[pga_gain];</div><div class='del'>-			else</div><div class='del'>-				rfpwr_offset = b43_ntab_papd_pga_gain_delta_ipa_5g[pga_gain];</div><div class='del'>-			b43_ntab_write(dev, B43_NTAB32(26, 576 + i),</div><div class='del'>-				       rfpwr_offset);</div><div class='del'>-			b43_ntab_write(dev, B43_NTAB32(27, 576 + i),</div><div class='del'>-				       rfpwr_offset);</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='add'>+	b43_radio_write(dev, B2055_C1_TX_MXBGTRIM, e-&gt;radio_c1_tx_mxbgtrim);</div><div class='add'>+	b43_radio_write(dev, B2055_C2_LGBUF_ATUNE, e-&gt;radio_c2_lgbuf_atune);</div><div class='add'>+	b43_radio_write(dev, B2055_C2_LGBUF_GTUNE, e-&gt;radio_c2_lgbuf_gtune);</div><div class='add'>+	b43_radio_write(dev, B2055_C2_RX_RFR1, e-&gt;radio_c2_rx_rfr1);</div><div class='add'>+	b43_read32(dev, B43_MMIO_MACCTL); /* flush writes */</div><div class='add'>+</div><div class='add'>+	b43_radio_write(dev, B2055_C2_TX_PGAPADTN, e-&gt;radio_c2_tx_pgapadtn);</div><div class='add'>+	b43_radio_write(dev, B2055_C2_TX_MXBGTRIM, e-&gt;radio_c2_tx_mxbgtrim);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* http://bcm-v4.sipsolutions.net/802.11/PHY/Radio/2055Setup */</div><div class='hunk'>@@ -622,1089 +833,9 @@ static void b43_radio_init2055(struct b43_wldev *dev)</div><div class='ctx'> 	b43_radio_init2055_post(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void b43_radio_init2056_pre(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	b43_phy_mask(dev, B43_NPHY_RFCTL_CMD,</div><div class='del'>-		     ~B43_NPHY_RFCTL_CMD_CHIP0PU);</div><div class='del'>-	/* Maybe wl meant to reset and set (order?) RFCTL_CMD_OEPORFORCE? */</div><div class='del'>-	b43_phy_mask(dev, B43_NPHY_RFCTL_CMD,</div><div class='del'>-		     B43_NPHY_RFCTL_CMD_OEPORFORCE);</div><div class='del'>-	b43_phy_set(dev, B43_NPHY_RFCTL_CMD,</div><div class='del'>-		    ~B43_NPHY_RFCTL_CMD_OEPORFORCE);</div><div class='del'>-	b43_phy_set(dev, B43_NPHY_RFCTL_CMD,</div><div class='del'>-		    B43_NPHY_RFCTL_CMD_CHIP0PU);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void b43_radio_init2056_post(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	b43_radio_set(dev, B2056_SYN_COM_CTRL, 0xB);</div><div class='del'>-	b43_radio_set(dev, B2056_SYN_COM_PU, 0x2);</div><div class='del'>-	b43_radio_set(dev, B2056_SYN_COM_RESET, 0x2);</div><div class='del'>-	msleep(1);</div><div class='del'>-	b43_radio_mask(dev, B2056_SYN_COM_RESET, ~0x2);</div><div class='del'>-	b43_radio_mask(dev, B2056_SYN_PLL_MAST2, ~0xFC);</div><div class='del'>-	b43_radio_mask(dev, B2056_SYN_RCCAL_CTRL0, ~0x1);</div><div class='del'>-	/*</div><div class='del'>-	if (nphy-&gt;init_por)</div><div class='del'>-		Call Radio 2056 Recalibrate</div><div class='del'>-	*/</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initialize a Broadcom 2056 N-radio</div><div class='del'>- * http://bcm-v4.sipsolutions.net/802.11/Radio/2056/Init</div><div class='del'>- */</div><div class='del'>-static void b43_radio_init2056(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	b43_radio_init2056_pre(dev);</div><div class='del'>-	b2056_upload_inittabs(dev, 0, 0);</div><div class='del'>-	b43_radio_init2056_post(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Upload the N-PHY tables.</div><div class='del'>- * http://bcm-v4.sipsolutions.net/802.11/PHY/N/InitTables</div><div class='del'>- */</div><div class='del'>-static void b43_nphy_tables_init(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	if (dev-&gt;phy.rev &lt; 3)</div><div class='del'>-		b43_nphy_rev0_1_2_tables_init(dev);</div><div class='del'>-	else</div><div class='del'>-		b43_nphy_rev3plus_tables_init(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/PA%20override */</div><div class='del'>-static void b43_nphy_pa_override(struct b43_wldev *dev, bool enable)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='del'>-	enum ieee80211_band band;</div><div class='del'>-	u16 tmp;</div><div class='del'>-</div><div class='del'>-	if (!enable) {</div><div class='del'>-		nphy-&gt;rfctrl_intc1_save = b43_phy_read(dev,</div><div class='del'>-						       B43_NPHY_RFCTL_INTC1);</div><div class='del'>-		nphy-&gt;rfctrl_intc2_save = b43_phy_read(dev,</div><div class='del'>-						       B43_NPHY_RFCTL_INTC2);</div><div class='del'>-		band = b43_current_band(dev-&gt;wl);</div><div class='del'>-		if (dev-&gt;phy.rev &gt;= 3) {</div><div class='del'>-			if (band == IEEE80211_BAND_5GHZ)</div><div class='del'>-				tmp = 0x600;</div><div class='del'>-			else</div><div class='del'>-				tmp = 0x480;</div><div class='del'>-		} else {</div><div class='del'>-			if (band == IEEE80211_BAND_5GHZ)</div><div class='del'>-				tmp = 0x180;</div><div class='del'>-			else</div><div class='del'>-				tmp = 0x120;</div><div class='del'>-		}</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_RFCTL_INTC1, tmp);</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_RFCTL_INTC2, tmp);</div><div class='del'>-	} else {</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_RFCTL_INTC1,</div><div class='del'>-				nphy-&gt;rfctrl_intc1_save);</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_RFCTL_INTC2,</div><div class='del'>-				nphy-&gt;rfctrl_intc2_save);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxLpFbw */</div><div class='del'>-static void b43_nphy_tx_lp_fbw(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	u16 tmp;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;phy.rev &gt;= 3) {</div><div class='del'>-		if (b43_nphy_ipa(dev)) {</div><div class='del'>-			tmp = 4;</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TXF_40CO_B32S2,</div><div class='del'>-			      (((((tmp &lt;&lt; 3) | tmp) &lt;&lt; 3) | tmp) &lt;&lt; 3) | tmp);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		tmp = 1;</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_TXF_40CO_B1S2,</div><div class='del'>-			      (((((tmp &lt;&lt; 3) | tmp) &lt;&lt; 3) | tmp) &lt;&lt; 3) | tmp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/CCA */</div><div class='del'>-static void b43_nphy_reset_cca(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	u16 bbcfg;</div><div class='del'>-</div><div class='del'>-	b43_phy_force_clock(dev, 1);</div><div class='del'>-	bbcfg = b43_phy_read(dev, B43_NPHY_BBCFG);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_BBCFG, bbcfg | B43_NPHY_BBCFG_RSTCCA);</div><div class='del'>-	udelay(1);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_BBCFG, bbcfg &amp; ~B43_NPHY_BBCFG_RSTCCA);</div><div class='del'>-	b43_phy_force_clock(dev, 0);</div><div class='del'>-	b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RESET2RX);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/MIMOConfig */</div><div class='del'>-static void b43_nphy_update_mimo_config(struct b43_wldev *dev, s32 preamble)</div><div class='del'>-{</div><div class='del'>-	u16 mimocfg = b43_phy_read(dev, B43_NPHY_MIMOCFG);</div><div class='del'>-</div><div class='del'>-	mimocfg |= B43_NPHY_MIMOCFG_AUTO;</div><div class='del'>-	if (preamble == 1)</div><div class='del'>-		mimocfg |= B43_NPHY_MIMOCFG_GFMIX;</div><div class='del'>-	else</div><div class='del'>-		mimocfg &amp;= ~B43_NPHY_MIMOCFG_GFMIX;</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_MIMOCFG, mimocfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/Chains */</div><div class='del'>-static void b43_nphy_update_txrx_chain(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='del'>-</div><div class='del'>-	bool override = false;</div><div class='del'>-	u16 chain = 0x33;</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;txrx_chain == 0) {</div><div class='del'>-		chain = 0x11;</div><div class='del'>-		override = true;</div><div class='del'>-	} else if (nphy-&gt;txrx_chain == 1) {</div><div class='del'>-		chain = 0x22;</div><div class='del'>-		override = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	b43_phy_maskset(dev, B43_NPHY_RFSEQCA,</div><div class='del'>-			~(B43_NPHY_RFSEQCA_TXEN | B43_NPHY_RFSEQCA_RXEN),</div><div class='del'>-			chain);</div><div class='del'>-</div><div class='del'>-	if (override)</div><div class='del'>-		b43_phy_set(dev, B43_NPHY_RFSEQMODE,</div><div class='del'>-				B43_NPHY_RFSEQMODE_CAOVER);</div><div class='del'>-	else</div><div class='del'>-		b43_phy_mask(dev, B43_NPHY_RFSEQMODE,</div><div class='del'>-				~B43_NPHY_RFSEQMODE_CAOVER);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RxIqEst */</div><div class='del'>-static void b43_nphy_rx_iq_est(struct b43_wldev *dev, struct nphy_iq_est *est,</div><div class='del'>-				u16 samps, u8 time, bool wait)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	u16 tmp;</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_IQEST_SAMCNT, samps);</div><div class='del'>-	b43_phy_maskset(dev, B43_NPHY_IQEST_WT, ~B43_NPHY_IQEST_WT_VAL, time);</div><div class='del'>-	if (wait)</div><div class='del'>-		b43_phy_set(dev, B43_NPHY_IQEST_CMD, B43_NPHY_IQEST_CMD_MODE);</div><div class='del'>-	else</div><div class='del'>-		b43_phy_mask(dev, B43_NPHY_IQEST_CMD, ~B43_NPHY_IQEST_CMD_MODE);</div><div class='del'>-</div><div class='del'>-	b43_phy_set(dev, B43_NPHY_IQEST_CMD, B43_NPHY_IQEST_CMD_START);</div><div class='del'>-</div><div class='del'>-	for (i = 1000; i; i--) {</div><div class='del'>-		tmp = b43_phy_read(dev, B43_NPHY_IQEST_CMD);</div><div class='del'>-		if (!(tmp &amp; B43_NPHY_IQEST_CMD_START)) {</div><div class='del'>-			est-&gt;i0_pwr = (b43_phy_read(dev, B43_NPHY_IQEST_IPACC_HI0) &lt;&lt; 16) |</div><div class='del'>-					b43_phy_read(dev, B43_NPHY_IQEST_IPACC_LO0);</div><div class='del'>-			est-&gt;q0_pwr = (b43_phy_read(dev, B43_NPHY_IQEST_QPACC_HI0) &lt;&lt; 16) |</div><div class='del'>-					b43_phy_read(dev, B43_NPHY_IQEST_QPACC_LO0);</div><div class='del'>-			est-&gt;iq0_prod = (b43_phy_read(dev, B43_NPHY_IQEST_IQACC_HI0) &lt;&lt; 16) |</div><div class='del'>-					b43_phy_read(dev, B43_NPHY_IQEST_IQACC_LO0);</div><div class='del'>-</div><div class='del'>-			est-&gt;i1_pwr = (b43_phy_read(dev, B43_NPHY_IQEST_IPACC_HI1) &lt;&lt; 16) |</div><div class='del'>-					b43_phy_read(dev, B43_NPHY_IQEST_IPACC_LO1);</div><div class='del'>-			est-&gt;q1_pwr = (b43_phy_read(dev, B43_NPHY_IQEST_QPACC_HI1) &lt;&lt; 16) |</div><div class='del'>-					b43_phy_read(dev, B43_NPHY_IQEST_QPACC_LO1);</div><div class='del'>-			est-&gt;iq1_prod = (b43_phy_read(dev, B43_NPHY_IQEST_IQACC_HI1) &lt;&lt; 16) |</div><div class='del'>-					b43_phy_read(dev, B43_NPHY_IQEST_IQACC_LO1);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		udelay(10);</div><div class='del'>-	}</div><div class='del'>-	memset(est, 0, sizeof(*est));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RxIqCoeffs */</div><div class='del'>-static void b43_nphy_rx_iq_coeffs(struct b43_wldev *dev, bool write,</div><div class='del'>-					struct b43_phy_n_iq_comp *pcomp)</div><div class='del'>-{</div><div class='del'>-	if (write) {</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_C1_RXIQ_COMPA0, pcomp-&gt;a0);</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_C1_RXIQ_COMPB0, pcomp-&gt;b0);</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_C2_RXIQ_COMPA1, pcomp-&gt;a1);</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_C2_RXIQ_COMPB1, pcomp-&gt;b1);</div><div class='del'>-	} else {</div><div class='del'>-		pcomp-&gt;a0 = b43_phy_read(dev, B43_NPHY_C1_RXIQ_COMPA0);</div><div class='del'>-		pcomp-&gt;b0 = b43_phy_read(dev, B43_NPHY_C1_RXIQ_COMPB0);</div><div class='del'>-		pcomp-&gt;a1 = b43_phy_read(dev, B43_NPHY_C2_RXIQ_COMPA1);</div><div class='del'>-		pcomp-&gt;b1 = b43_phy_read(dev, B43_NPHY_C2_RXIQ_COMPB1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/* Ready but not used anywhere */</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RxCalPhyCleanup */</div><div class='del'>-static void b43_nphy_rx_cal_phy_cleanup(struct b43_wldev *dev, u8 core)</div><div class='del'>-{</div><div class='del'>-	u16 *regs = dev-&gt;phy.n-&gt;tx_rx_cal_phy_saveregs;</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_RFSEQCA, regs[0]);</div><div class='del'>-	if (core == 0) {</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_AFECTL_C1, regs[1]);</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_AFECTL_OVER1, regs[2]);</div><div class='del'>-	} else {</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_AFECTL_C2, regs[1]);</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_AFECTL_OVER, regs[2]);</div><div class='del'>-	}</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_RFCTL_INTC1, regs[3]);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_RFCTL_INTC2, regs[4]);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_RFCTL_RSSIO1, regs[5]);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_RFCTL_RSSIO2, regs[6]);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_TXF_40CO_B1S1, regs[7]);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_RFCTL_OVER, regs[8]);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_PAPD_EN0, regs[9]);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_PAPD_EN1, regs[10]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RxCalPhySetup */</div><div class='del'>-static void b43_nphy_rx_cal_phy_setup(struct b43_wldev *dev, u8 core)</div><div class='del'>-{</div><div class='del'>-	u8 rxval, txval;</div><div class='del'>-	u16 *regs = dev-&gt;phy.n-&gt;tx_rx_cal_phy_saveregs;</div><div class='del'>-</div><div class='del'>-	regs[0] = b43_phy_read(dev, B43_NPHY_RFSEQCA);</div><div class='del'>-	if (core == 0) {</div><div class='del'>-		regs[1] = b43_phy_read(dev, B43_NPHY_AFECTL_C1);</div><div class='del'>-		regs[2] = b43_phy_read(dev, B43_NPHY_AFECTL_OVER1);</div><div class='del'>-	} else {</div><div class='del'>-		regs[1] = b43_phy_read(dev, B43_NPHY_AFECTL_C2);</div><div class='del'>-		regs[2] = b43_phy_read(dev, B43_NPHY_AFECTL_OVER);</div><div class='del'>-	}</div><div class='del'>-	regs[3] = b43_phy_read(dev, B43_NPHY_RFCTL_INTC1);</div><div class='del'>-	regs[4] = b43_phy_read(dev, B43_NPHY_RFCTL_INTC2);</div><div class='del'>-	regs[5] = b43_phy_read(dev, B43_NPHY_RFCTL_RSSIO1);</div><div class='del'>-	regs[6] = b43_phy_read(dev, B43_NPHY_RFCTL_RSSIO2);</div><div class='del'>-	regs[7] = b43_phy_read(dev, B43_NPHY_TXF_40CO_B1S1);</div><div class='del'>-	regs[8] = b43_phy_read(dev, B43_NPHY_RFCTL_OVER);</div><div class='del'>-	regs[9] = b43_phy_read(dev, B43_NPHY_PAPD_EN0);</div><div class='del'>-	regs[10] = b43_phy_read(dev, B43_NPHY_PAPD_EN1);</div><div class='del'>-</div><div class='del'>-	b43_phy_mask(dev, B43_NPHY_PAPD_EN0, ~0x0001);</div><div class='del'>-	b43_phy_mask(dev, B43_NPHY_PAPD_EN1, ~0x0001);</div><div class='del'>-</div><div class='del'>-	b43_phy_maskset(dev, B43_NPHY_RFSEQCA,</div><div class='del'>-			~B43_NPHY_RFSEQCA_RXDIS &amp; 0xFFFF,</div><div class='del'>-			((1 - core) &lt;&lt; B43_NPHY_RFSEQCA_RXDIS_SHIFT));</div><div class='del'>-	b43_phy_maskset(dev, B43_NPHY_RFSEQCA, ~B43_NPHY_RFSEQCA_TXEN,</div><div class='del'>-			((1 - core) &lt;&lt; B43_NPHY_RFSEQCA_TXEN_SHIFT));</div><div class='del'>-	b43_phy_maskset(dev, B43_NPHY_RFSEQCA, ~B43_NPHY_RFSEQCA_RXEN,</div><div class='del'>-			(core &lt;&lt; B43_NPHY_RFSEQCA_RXEN_SHIFT));</div><div class='del'>-	b43_phy_maskset(dev, B43_NPHY_RFSEQCA, ~B43_NPHY_RFSEQCA_TXDIS,</div><div class='del'>-			(core &lt;&lt; B43_NPHY_RFSEQCA_TXDIS_SHIFT));</div><div class='del'>-</div><div class='del'>-	if (core == 0) {</div><div class='del'>-		b43_phy_mask(dev, B43_NPHY_AFECTL_C1, ~0x0007);</div><div class='del'>-		b43_phy_set(dev, B43_NPHY_AFECTL_OVER1, 0x0007);</div><div class='del'>-	} else {</div><div class='del'>-		b43_phy_mask(dev, B43_NPHY_AFECTL_C2, ~0x0007);</div><div class='del'>-		b43_phy_set(dev, B43_NPHY_AFECTL_OVER, 0x0007);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	b43_nphy_rf_control_intc_override(dev, 2, 0, 3);</div><div class='del'>-	b43_nphy_rf_control_override(dev, 8, 0, 3, false);</div><div class='del'>-	b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RX2TX);</div><div class='del'>-</div><div class='del'>-	if (core == 0) {</div><div class='del'>-		rxval = 1;</div><div class='del'>-		txval = 8;</div><div class='del'>-	} else {</div><div class='del'>-		rxval = 4;</div><div class='del'>-		txval = 2;</div><div class='del'>-	}</div><div class='del'>-	b43_nphy_rf_control_intc_override(dev, 1, rxval, (core + 1));</div><div class='del'>-	b43_nphy_rf_control_intc_override(dev, 1, txval, (2 - core));</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/CalcRxIqComp */</div><div class='del'>-static void b43_nphy_calc_rx_iq_comp(struct b43_wldev *dev, u8 mask)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	s32 iq;</div><div class='del'>-	u32 ii;</div><div class='del'>-	u32 qq;</div><div class='del'>-	int iq_nbits, qq_nbits;</div><div class='del'>-	int arsh, brsh;</div><div class='del'>-	u16 tmp, a, b;</div><div class='del'>-</div><div class='del'>-	struct nphy_iq_est est;</div><div class='del'>-	struct b43_phy_n_iq_comp old;</div><div class='del'>-	struct b43_phy_n_iq_comp new = { };</div><div class='del'>-	bool error = false;</div><div class='del'>-</div><div class='del'>-	if (mask == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	b43_nphy_rx_iq_coeffs(dev, false, &amp;old);</div><div class='del'>-	b43_nphy_rx_iq_coeffs(dev, true, &amp;new);</div><div class='del'>-	b43_nphy_rx_iq_est(dev, &amp;est, 0x4000, 32, false);</div><div class='del'>-	new = old;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		if (i == 0 &amp;&amp; (mask &amp; 1)) {</div><div class='del'>-			iq = est.iq0_prod;</div><div class='del'>-			ii = est.i0_pwr;</div><div class='del'>-			qq = est.q0_pwr;</div><div class='del'>-		} else if (i == 1 &amp;&amp; (mask &amp; 2)) {</div><div class='del'>-			iq = est.iq1_prod;</div><div class='del'>-			ii = est.i1_pwr;</div><div class='del'>-			qq = est.q1_pwr;</div><div class='del'>-		} else {</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ii + qq &lt; 2) {</div><div class='del'>-			error = true;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		iq_nbits = fls(abs(iq));</div><div class='del'>-		qq_nbits = fls(qq);</div><div class='del'>-</div><div class='del'>-		arsh = iq_nbits - 20;</div><div class='del'>-		if (arsh &gt;= 0) {</div><div class='del'>-			a = -((iq &lt;&lt; (30 - iq_nbits)) + (ii &gt;&gt; (1 + arsh)));</div><div class='del'>-			tmp = ii &gt;&gt; arsh;</div><div class='del'>-		} else {</div><div class='del'>-			a = -((iq &lt;&lt; (30 - iq_nbits)) + (ii &lt;&lt; (-1 - arsh)));</div><div class='del'>-			tmp = ii &lt;&lt; -arsh;</div><div class='del'>-		}</div><div class='del'>-		if (tmp == 0) {</div><div class='del'>-			error = true;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		a /= tmp;</div><div class='del'>-</div><div class='del'>-		brsh = qq_nbits - 11;</div><div class='del'>-		if (brsh &gt;= 0) {</div><div class='del'>-			b = (qq &lt;&lt; (31 - qq_nbits));</div><div class='del'>-			tmp = ii &gt;&gt; brsh;</div><div class='del'>-		} else {</div><div class='del'>-			b = (qq &lt;&lt; (31 - qq_nbits));</div><div class='del'>-			tmp = ii &lt;&lt; -brsh;</div><div class='del'>-		}</div><div class='del'>-		if (tmp == 0) {</div><div class='del'>-			error = true;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		b = int_sqrt(b / tmp - a * a) - (1 &lt;&lt; 10);</div><div class='del'>-</div><div class='del'>-		if (i == 0 &amp;&amp; (mask &amp; 0x1)) {</div><div class='del'>-			if (dev-&gt;phy.rev &gt;= 3) {</div><div class='del'>-				new.a0 = a &amp; 0x3FF;</div><div class='del'>-				new.b0 = b &amp; 0x3FF;</div><div class='del'>-			} else {</div><div class='del'>-				new.a0 = b &amp; 0x3FF;</div><div class='del'>-				new.b0 = a &amp; 0x3FF;</div><div class='del'>-			}</div><div class='del'>-		} else if (i == 1 &amp;&amp; (mask &amp; 0x2)) {</div><div class='del'>-			if (dev-&gt;phy.rev &gt;= 3) {</div><div class='del'>-				new.a1 = a &amp; 0x3FF;</div><div class='del'>-				new.b1 = b &amp; 0x3FF;</div><div class='del'>-			} else {</div><div class='del'>-				new.a1 = b &amp; 0x3FF;</div><div class='del'>-				new.b1 = a &amp; 0x3FF;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (error)</div><div class='del'>-		new = old;</div><div class='del'>-</div><div class='del'>-	b43_nphy_rx_iq_coeffs(dev, true, &amp;new);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxIqWar */</div><div class='del'>-static void b43_nphy_tx_iq_workaround(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	u16 array[4];</div><div class='del'>-	b43_ntab_read_bulk(dev, B43_NTAB16(0xF, 0x50), 4, array);</div><div class='del'>-</div><div class='del'>-	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_NPHY_TXIQW0, array[0]);</div><div class='del'>-	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_NPHY_TXIQW1, array[1]);</div><div class='del'>-	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_NPHY_TXIQW2, array[2]);</div><div class='del'>-	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_NPHY_TXIQW3, array[3]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/clip-detection */</div><div class='del'>-static void b43_nphy_write_clip_detection(struct b43_wldev *dev,</div><div class='del'>-					  const u16 *clip_st)</div><div class='del'>-{</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_C1_CLIP1THRES, clip_st[0]);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_C2_CLIP1THRES, clip_st[1]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/clip-detection */</div><div class='del'>-static void b43_nphy_read_clip_detection(struct b43_wldev *dev, u16 *clip_st)</div><div class='del'>-{</div><div class='del'>-	clip_st[0] = b43_phy_read(dev, B43_NPHY_C1_CLIP1THRES);</div><div class='del'>-	clip_st[1] = b43_phy_read(dev, B43_NPHY_C2_CLIP1THRES);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/SuperSwitchInit */</div><div class='del'>-static void b43_nphy_superswitch_init(struct b43_wldev *dev, bool init)</div><div class='del'>-{</div><div class='del'>-	if (dev-&gt;phy.rev &gt;= 3) {</div><div class='del'>-		if (!init)</div><div class='del'>-			return;</div><div class='del'>-		if (0 /* FIXME */) {</div><div class='del'>-			b43_ntab_write(dev, B43_NTAB16(9, 2), 0x211);</div><div class='del'>-			b43_ntab_write(dev, B43_NTAB16(9, 3), 0x222);</div><div class='del'>-			b43_ntab_write(dev, B43_NTAB16(9, 8), 0x144);</div><div class='del'>-			b43_ntab_write(dev, B43_NTAB16(9, 12), 0x188);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_GPIO_LOOEN, 0);</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_GPIO_HIOEN, 0);</div><div class='del'>-</div><div class='del'>-		switch (dev-&gt;dev-&gt;bus_type) {</div><div class='del'>-#ifdef CONFIG_B43_BCMA</div><div class='del'>-		case B43_BUS_BCMA:</div><div class='del'>-			bcma_chipco_gpio_control(&amp;dev-&gt;dev-&gt;bdev-&gt;bus-&gt;drv_cc,</div><div class='del'>-						 0xFC00, 0xFC00);</div><div class='del'>-			break;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_B43_SSB</div><div class='del'>-		case B43_BUS_SSB:</div><div class='del'>-			ssb_chipco_gpio_control(&amp;dev-&gt;dev-&gt;sdev-&gt;bus-&gt;chipco,</div><div class='del'>-						0xFC00, 0xFC00);</div><div class='del'>-			break;</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		b43_write32(dev, B43_MMIO_MACCTL,</div><div class='del'>-			b43_read32(dev, B43_MMIO_MACCTL) &amp;</div><div class='del'>-			~B43_MACCTL_GPOUTSMSK);</div><div class='del'>-		b43_write16(dev, B43_MMIO_GPIO_MASK,</div><div class='del'>-			b43_read16(dev, B43_MMIO_GPIO_MASK) | 0xFC00);</div><div class='del'>-		b43_write16(dev, B43_MMIO_GPIO_CONTROL,</div><div class='del'>-			b43_read16(dev, B43_MMIO_GPIO_CONTROL) &amp; ~0xFC00);</div><div class='del'>-</div><div class='del'>-		if (init) {</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_LO1, 0x2D8);</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_UP1, 0x301);</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_LO2, 0x2D8);</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_UP2, 0x301);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/classifier */</div><div class='del'>-static u16 b43_nphy_classifier(struct b43_wldev *dev, u16 mask, u16 val)</div><div class='del'>-{</div><div class='del'>-	u16 tmp;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;dev-&gt;core_rev == 16)</div><div class='del'>-		b43_mac_suspend(dev);</div><div class='del'>-</div><div class='del'>-	tmp = b43_phy_read(dev, B43_NPHY_CLASSCTL);</div><div class='del'>-	tmp &amp;= (B43_NPHY_CLASSCTL_CCKEN | B43_NPHY_CLASSCTL_OFDMEN |</div><div class='del'>-		B43_NPHY_CLASSCTL_WAITEDEN);</div><div class='del'>-	tmp &amp;= ~mask;</div><div class='del'>-	tmp |= (val &amp; mask);</div><div class='del'>-	b43_phy_maskset(dev, B43_NPHY_CLASSCTL, 0xFFF8, tmp);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;dev-&gt;core_rev == 16)</div><div class='del'>-		b43_mac_enable(dev);</div><div class='del'>-</div><div class='del'>-	return tmp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/carriersearch */</div><div class='del'>-static void b43_nphy_stay_in_carrier_search(struct b43_wldev *dev, bool enable)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	struct b43_phy_n *nphy = phy-&gt;n;</div><div class='del'>-</div><div class='del'>-	if (enable) {</div><div class='del'>-		static const u16 clip[] = { 0xFFFF, 0xFFFF };</div><div class='del'>-		if (nphy-&gt;deaf_count++ == 0) {</div><div class='del'>-			nphy-&gt;classifier_state = b43_nphy_classifier(dev, 0, 0);</div><div class='del'>-			b43_nphy_classifier(dev, 0x7, 0);</div><div class='del'>-			b43_nphy_read_clip_detection(dev, nphy-&gt;clip_state);</div><div class='del'>-			b43_nphy_write_clip_detection(dev, clip);</div><div class='del'>-		}</div><div class='del'>-		b43_nphy_reset_cca(dev);</div><div class='del'>-	} else {</div><div class='del'>-		if (--nphy-&gt;deaf_count == 0) {</div><div class='del'>-			b43_nphy_classifier(dev, 0x7, nphy-&gt;classifier_state);</div><div class='del'>-			b43_nphy_write_clip_detection(dev, nphy-&gt;clip_state);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/stop-playback */</div><div class='del'>-static void b43_nphy_stop_playback(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='del'>-	u16 tmp;</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;hang_avoid)</div><div class='del'>-		b43_nphy_stay_in_carrier_search(dev, 1);</div><div class='del'>-</div><div class='del'>-	tmp = b43_phy_read(dev, B43_NPHY_SAMP_STAT);</div><div class='del'>-	if (tmp &amp; 0x1)</div><div class='del'>-		b43_phy_set(dev, B43_NPHY_SAMP_CMD, B43_NPHY_SAMP_CMD_STOP);</div><div class='del'>-	else if (tmp &amp; 0x2)</div><div class='del'>-		b43_phy_mask(dev, B43_NPHY_IQLOCAL_CMDGCTL, 0x7FFF);</div><div class='del'>-</div><div class='del'>-	b43_phy_mask(dev, B43_NPHY_SAMP_CMD, ~0x0004);</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;bb_mult_save &amp; 0x80000000) {</div><div class='del'>-		tmp = nphy-&gt;bb_mult_save &amp; 0xFFFF;</div><div class='del'>-		b43_ntab_write(dev, B43_NTAB16(15, 87), tmp);</div><div class='del'>-		nphy-&gt;bb_mult_save = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;hang_avoid)</div><div class='del'>-		b43_nphy_stay_in_carrier_search(dev, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/SpurWar */</div><div class='del'>-static void b43_nphy_spur_workaround(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='del'>-</div><div class='del'>-	u8 channel = dev-&gt;phy.channel;</div><div class='del'>-	int tone[2] = { 57, 58 };</div><div class='del'>-	u32 noise[2] = { 0x3FF, 0x3FF };</div><div class='del'>-</div><div class='del'>-	B43_WARN_ON(dev-&gt;phy.rev &lt; 3);</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;hang_avoid)</div><div class='del'>-		b43_nphy_stay_in_carrier_search(dev, 1);</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;gband_spurwar_en) {</div><div class='del'>-		/* TODO: N PHY Adjust Analog Pfbw (7) */</div><div class='del'>-		if (channel == 11 &amp;&amp; dev-&gt;phy.is_40mhz)</div><div class='del'>-			; /* TODO: N PHY Adjust Min Noise Var(2, tone, noise)*/</div><div class='del'>-		else</div><div class='del'>-			; /* TODO: N PHY Adjust Min Noise Var(0, NULL, NULL)*/</div><div class='del'>-		/* TODO: N PHY Adjust CRS Min Power (0x1E) */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;aband_spurwar_en) {</div><div class='del'>-		if (channel == 54) {</div><div class='del'>-			tone[0] = 0x20;</div><div class='del'>-			noise[0] = 0x25F;</div><div class='del'>-		} else if (channel == 38 || channel == 102 || channel == 118) {</div><div class='del'>-			if (0 /* FIXME */) {</div><div class='del'>-				tone[0] = 0x20;</div><div class='del'>-				noise[0] = 0x21F;</div><div class='del'>-			} else {</div><div class='del'>-				tone[0] = 0;</div><div class='del'>-				noise[0] = 0;</div><div class='del'>-			}</div><div class='del'>-		} else if (channel == 134) {</div><div class='del'>-			tone[0] = 0x20;</div><div class='del'>-			noise[0] = 0x21F;</div><div class='del'>-		} else if (channel == 151) {</div><div class='del'>-			tone[0] = 0x10;</div><div class='del'>-			noise[0] = 0x23F;</div><div class='del'>-		} else if (channel == 153 || channel == 161) {</div><div class='del'>-			tone[0] = 0x30;</div><div class='del'>-			noise[0] = 0x23F;</div><div class='del'>-		} else {</div><div class='del'>-			tone[0] = 0;</div><div class='del'>-			noise[0] = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!tone[0] &amp;&amp; !noise[0])</div><div class='del'>-			; /* TODO: N PHY Adjust Min Noise Var(1, tone, noise)*/</div><div class='del'>-		else</div><div class='del'>-			; /* TODO: N PHY Adjust Min Noise Var(0, NULL, NULL)*/</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;hang_avoid)</div><div class='del'>-		b43_nphy_stay_in_carrier_search(dev, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/AdjustLnaGainTbl */</div><div class='del'>-static void b43_nphy_adjust_lna_gain_table(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='del'>-</div><div class='del'>-	u8 i;</div><div class='del'>-	s16 tmp;</div><div class='del'>-	u16 data[4];</div><div class='del'>-	s16 gain[2];</div><div class='del'>-	u16 minmax[2];</div><div class='del'>-	static const u16 lna_gain[4] = { -2, 10, 19, 25 };</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;hang_avoid)</div><div class='del'>-		b43_nphy_stay_in_carrier_search(dev, 1);</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;gain_boost) {</div><div class='del'>-		if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ) {</div><div class='del'>-			gain[0] = 6;</div><div class='del'>-			gain[1] = 6;</div><div class='del'>-		} else {</div><div class='del'>-			tmp = 40370 - 315 * dev-&gt;phy.channel;</div><div class='del'>-			gain[0] = ((tmp &gt;&gt; 13) + ((tmp &gt;&gt; 12) &amp; 1));</div><div class='del'>-			tmp = 23242 - 224 * dev-&gt;phy.channel;</div><div class='del'>-			gain[1] = ((tmp &gt;&gt; 13) + ((tmp &gt;&gt; 12) &amp; 1));</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		gain[0] = 0;</div><div class='del'>-		gain[1] = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		if (nphy-&gt;elna_gain_config) {</div><div class='del'>-			data[0] = 19 + gain[i];</div><div class='del'>-			data[1] = 25 + gain[i];</div><div class='del'>-			data[2] = 25 + gain[i];</div><div class='del'>-			data[3] = 25 + gain[i];</div><div class='del'>-		} else {</div><div class='del'>-			data[0] = lna_gain[0] + gain[i];</div><div class='del'>-			data[1] = lna_gain[1] + gain[i];</div><div class='del'>-			data[2] = lna_gain[2] + gain[i];</div><div class='del'>-			data[3] = lna_gain[3] + gain[i];</div><div class='del'>-		}</div><div class='del'>-		b43_ntab_write_bulk(dev, B43_NTAB16(i, 8), 4, data);</div><div class='del'>-</div><div class='del'>-		minmax[i] = 23 + gain[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	b43_phy_maskset(dev, B43_NPHY_C1_MINMAX_GAIN, ~B43_NPHY_C1_MINGAIN,</div><div class='del'>-				minmax[0] &lt;&lt; B43_NPHY_C1_MINGAIN_SHIFT);</div><div class='del'>-	b43_phy_maskset(dev, B43_NPHY_C2_MINMAX_GAIN, ~B43_NPHY_C2_MINGAIN,</div><div class='del'>-				minmax[1] &lt;&lt; B43_NPHY_C2_MINGAIN_SHIFT);</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;hang_avoid)</div><div class='del'>-		b43_nphy_stay_in_carrier_search(dev, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/WorkaroundsGainCtrl */</div><div class='del'>-static void b43_nphy_gain_ctrl_workarounds(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='del'>-	struct ssb_sprom *sprom = dev-&gt;dev-&gt;bus_sprom;</div><div class='del'>-</div><div class='del'>-	/* PHY rev 0, 1, 2 */</div><div class='del'>-	u8 i, j;</div><div class='del'>-	u8 code;</div><div class='del'>-	u16 tmp;</div><div class='del'>-	u8 rfseq_events[3] = { 6, 8, 7 };</div><div class='del'>-	u8 rfseq_delays[3] = { 10, 30, 1 };</div><div class='del'>-</div><div class='del'>-	/* PHY rev &gt;= 3 */</div><div class='del'>-	bool ghz5;</div><div class='del'>-	bool ext_lna;</div><div class='del'>-	u16 rssi_gain;</div><div class='del'>-	struct nphy_gain_ctl_workaround_entry *e;</div><div class='del'>-	u8 lpf_gain[6] = { 0x00, 0x06, 0x0C, 0x12, 0x12, 0x12 };</div><div class='del'>-	u8 lpf_bits[6] = { 0, 1, 2, 3, 3, 3 };</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;phy.rev &gt;= 3) {</div><div class='del'>-		/* Prepare values */</div><div class='del'>-		ghz5 = b43_phy_read(dev, B43_NPHY_BANDCTL)</div><div class='del'>-			&amp; B43_NPHY_BANDCTL_5GHZ;</div><div class='del'>-		ext_lna = sprom-&gt;boardflags_lo &amp; B43_BFL_EXTLNA;</div><div class='del'>-		e = b43_nphy_get_gain_ctl_workaround_ent(dev, ghz5, ext_lna);</div><div class='del'>-		if (ghz5 &amp;&amp; dev-&gt;phy.rev &gt;= 5)</div><div class='del'>-			rssi_gain = 0x90;</div><div class='del'>-		else</div><div class='del'>-			rssi_gain = 0x50;</div><div class='del'>-</div><div class='del'>-		b43_phy_set(dev, B43_NPHY_RXCTL, 0x0040);</div><div class='del'>-</div><div class='del'>-		/* Set Clip 2 detect */</div><div class='del'>-		b43_phy_set(dev, B43_NPHY_C1_CGAINI,</div><div class='del'>-				B43_NPHY_C1_CGAINI_CL2DETECT);</div><div class='del'>-		b43_phy_set(dev, B43_NPHY_C2_CGAINI,</div><div class='del'>-				B43_NPHY_C2_CGAINI_CL2DETECT);</div><div class='del'>-</div><div class='del'>-		b43_radio_write(dev, B2056_RX0 | B2056_RX_BIASPOLE_LNAG1_IDAC,</div><div class='del'>-				0x17);</div><div class='del'>-		b43_radio_write(dev, B2056_RX1 | B2056_RX_BIASPOLE_LNAG1_IDAC,</div><div class='del'>-				0x17);</div><div class='del'>-		b43_radio_write(dev, B2056_RX0 | B2056_RX_LNAG2_IDAC, 0xF0);</div><div class='del'>-		b43_radio_write(dev, B2056_RX1 | B2056_RX_LNAG2_IDAC, 0xF0);</div><div class='del'>-		b43_radio_write(dev, B2056_RX0 | B2056_RX_RSSI_POLE, 0x00);</div><div class='del'>-		b43_radio_write(dev, B2056_RX1 | B2056_RX_RSSI_POLE, 0x00);</div><div class='del'>-		b43_radio_write(dev, B2056_RX0 | B2056_RX_RSSI_GAIN,</div><div class='del'>-				rssi_gain);</div><div class='del'>-		b43_radio_write(dev, B2056_RX1 | B2056_RX_RSSI_GAIN,</div><div class='del'>-				rssi_gain);</div><div class='del'>-		b43_radio_write(dev, B2056_RX0 | B2056_RX_BIASPOLE_LNAA1_IDAC,</div><div class='del'>-				0x17);</div><div class='del'>-		b43_radio_write(dev, B2056_RX1 | B2056_RX_BIASPOLE_LNAA1_IDAC,</div><div class='del'>-				0x17);</div><div class='del'>-		b43_radio_write(dev, B2056_RX0 | B2056_RX_LNAA2_IDAC, 0xFF);</div><div class='del'>-		b43_radio_write(dev, B2056_RX1 | B2056_RX_LNAA2_IDAC, 0xFF);</div><div class='del'>-</div><div class='del'>-		b43_ntab_write_bulk(dev, B43_NTAB8(0, 8), 4, e-&gt;lna1_gain);</div><div class='del'>-		b43_ntab_write_bulk(dev, B43_NTAB8(1, 8), 4, e-&gt;lna1_gain);</div><div class='del'>-		b43_ntab_write_bulk(dev, B43_NTAB8(0, 16), 4, e-&gt;lna2_gain);</div><div class='del'>-		b43_ntab_write_bulk(dev, B43_NTAB8(1, 16), 4, e-&gt;lna2_gain);</div><div class='del'>-		b43_ntab_write_bulk(dev, B43_NTAB8(0, 32), 10, e-&gt;gain_db);</div><div class='del'>-		b43_ntab_write_bulk(dev, B43_NTAB8(1, 32), 10, e-&gt;gain_db);</div><div class='del'>-		b43_ntab_write_bulk(dev, B43_NTAB8(2, 32), 10, e-&gt;gain_bits);</div><div class='del'>-		b43_ntab_write_bulk(dev, B43_NTAB8(3, 32), 10, e-&gt;gain_bits);</div><div class='del'>-		b43_ntab_write_bulk(dev, B43_NTAB8(0, 0x40), 6, lpf_gain);</div><div class='del'>-		b43_ntab_write_bulk(dev, B43_NTAB8(1, 0x40), 6, lpf_gain);</div><div class='del'>-		b43_ntab_write_bulk(dev, B43_NTAB8(2, 0x40), 6, lpf_bits);</div><div class='del'>-		b43_ntab_write_bulk(dev, B43_NTAB8(3, 0x40), 6, lpf_bits);</div><div class='del'>-</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_C1_INITGAIN, e-&gt;init_gain);</div><div class='del'>-		b43_phy_write(dev, 0x2A7, e-&gt;init_gain);</div><div class='del'>-		b43_ntab_write_bulk(dev, B43_NTAB16(7, 0x106), 2,</div><div class='del'>-					e-&gt;rfseq_init);</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_C1_INITGAIN, e-&gt;init_gain);</div><div class='del'>-</div><div class='del'>-		/* TODO: check defines. Do not match variables names */</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_C1_CLIP1_MEDGAIN, e-&gt;cliphi_gain);</div><div class='del'>-		b43_phy_write(dev, 0x2A9, e-&gt;cliphi_gain);</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_C1_CLIP2_GAIN, e-&gt;clipmd_gain);</div><div class='del'>-		b43_phy_write(dev, 0x2AB, e-&gt;clipmd_gain);</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_C2_CLIP1_HIGAIN, e-&gt;cliplo_gain);</div><div class='del'>-		b43_phy_write(dev, 0x2AD, e-&gt;cliplo_gain);</div><div class='del'>-</div><div class='del'>-		b43_phy_maskset(dev, 0x27D, 0xFF00, e-&gt;crsmin);</div><div class='del'>-		b43_phy_maskset(dev, 0x280, 0xFF00, e-&gt;crsminl);</div><div class='del'>-		b43_phy_maskset(dev, 0x283, 0xFF00, e-&gt;crsminu);</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_C1_NBCLIPTHRES, e-&gt;nbclip);</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_C2_NBCLIPTHRES, e-&gt;nbclip);</div><div class='del'>-		b43_phy_maskset(dev, B43_NPHY_C1_CLIPWBTHRES,</div><div class='del'>-				~B43_NPHY_C1_CLIPWBTHRES_CLIP2, e-&gt;wlclip);</div><div class='del'>-		b43_phy_maskset(dev, B43_NPHY_C2_CLIPWBTHRES,</div><div class='del'>-				~B43_NPHY_C2_CLIPWBTHRES_CLIP2, e-&gt;wlclip);</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_CCK_SHIFTB_REF, 0x809C);</div><div class='del'>-	} else {</div><div class='del'>-		/* Set Clip 2 detect */</div><div class='del'>-		b43_phy_set(dev, B43_NPHY_C1_CGAINI,</div><div class='del'>-				B43_NPHY_C1_CGAINI_CL2DETECT);</div><div class='del'>-		b43_phy_set(dev, B43_NPHY_C2_CGAINI,</div><div class='del'>-				B43_NPHY_C2_CGAINI_CL2DETECT);</div><div class='del'>-</div><div class='del'>-		/* Set narrowband clip threshold */</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_C1_NBCLIPTHRES, 0x84);</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_C2_NBCLIPTHRES, 0x84);</div><div class='del'>-</div><div class='del'>-		if (!dev-&gt;phy.is_40mhz) {</div><div class='del'>-			/* Set dwell lengths */</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_CLIP1_NBDWELL_LEN, 0x002B);</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_CLIP2_NBDWELL_LEN, 0x002B);</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_W1CLIP1_DWELL_LEN, 0x0009);</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_W1CLIP2_DWELL_LEN, 0x0009);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Set wideband clip 2 threshold */</div><div class='del'>-		b43_phy_maskset(dev, B43_NPHY_C1_CLIPWBTHRES,</div><div class='del'>-				~B43_NPHY_C1_CLIPWBTHRES_CLIP2,</div><div class='del'>-				21);</div><div class='del'>-		b43_phy_maskset(dev, B43_NPHY_C2_CLIPWBTHRES,</div><div class='del'>-				~B43_NPHY_C2_CLIPWBTHRES_CLIP2,</div><div class='del'>-				21);</div><div class='del'>-</div><div class='del'>-		if (!dev-&gt;phy.is_40mhz) {</div><div class='del'>-			b43_phy_maskset(dev, B43_NPHY_C1_CGAINI,</div><div class='del'>-				~B43_NPHY_C1_CGAINI_GAINBKOFF, 0x1);</div><div class='del'>-			b43_phy_maskset(dev, B43_NPHY_C2_CGAINI,</div><div class='del'>-				~B43_NPHY_C2_CGAINI_GAINBKOFF, 0x1);</div><div class='del'>-			b43_phy_maskset(dev, B43_NPHY_C1_CCK_CGAINI,</div><div class='del'>-				~B43_NPHY_C1_CCK_CGAINI_GAINBKOFF, 0x1);</div><div class='del'>-			b43_phy_maskset(dev, B43_NPHY_C2_CCK_CGAINI,</div><div class='del'>-				~B43_NPHY_C2_CCK_CGAINI_GAINBKOFF, 0x1);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_CCK_SHIFTB_REF, 0x809C);</div><div class='del'>-</div><div class='del'>-		if (nphy-&gt;gain_boost) {</div><div class='del'>-			if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ &amp;&amp;</div><div class='del'>-			    dev-&gt;phy.is_40mhz)</div><div class='del'>-				code = 4;</div><div class='del'>-			else</div><div class='del'>-				code = 5;</div><div class='del'>-		} else {</div><div class='del'>-			code = dev-&gt;phy.is_40mhz ? 6 : 7;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Set HPVGA2 index */</div><div class='del'>-		b43_phy_maskset(dev, B43_NPHY_C1_INITGAIN,</div><div class='del'>-				~B43_NPHY_C1_INITGAIN_HPVGA2,</div><div class='del'>-				code &lt;&lt; B43_NPHY_C1_INITGAIN_HPVGA2_SHIFT);</div><div class='del'>-		b43_phy_maskset(dev, B43_NPHY_C2_INITGAIN,</div><div class='del'>-				~B43_NPHY_C2_INITGAIN_HPVGA2,</div><div class='del'>-				code &lt;&lt; B43_NPHY_C2_INITGAIN_HPVGA2_SHIFT);</div><div class='del'>-</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x1D06);</div><div class='del'>-		/* specs say about 2 loops, but wl does 4 */</div><div class='del'>-		for (i = 0; i &lt; 4; i++)</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TABLE_DATALO,</div><div class='del'>-							(code &lt;&lt; 8 | 0x7C));</div><div class='del'>-</div><div class='del'>-		b43_nphy_adjust_lna_gain_table(dev);</div><div class='del'>-</div><div class='del'>-		if (nphy-&gt;elna_gain_config) {</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x0808);</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x0);</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x1);</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x1);</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x1);</div><div class='del'>-</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x0C08);</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x0);</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x1);</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x1);</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x1);</div><div class='del'>-</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x1D06);</div><div class='del'>-			/* specs say about 2 loops, but wl does 4 */</div><div class='del'>-			for (i = 0; i &lt; 4; i++)</div><div class='del'>-				b43_phy_write(dev, B43_NPHY_TABLE_DATALO,</div><div class='del'>-							(code &lt;&lt; 8 | 0x74));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (dev-&gt;phy.rev == 2) {</div><div class='del'>-			for (i = 0; i &lt; 4; i++) {</div><div class='del'>-				b43_phy_write(dev, B43_NPHY_TABLE_ADDR,</div><div class='del'>-						(0x0400 * i) + 0x0020);</div><div class='del'>-				for (j = 0; j &lt; 21; j++) {</div><div class='del'>-					tmp = j * (i &lt; 2 ? 3 : 1);</div><div class='del'>-					b43_phy_write(dev,</div><div class='del'>-						B43_NPHY_TABLE_DATALO, tmp);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		b43_nphy_set_rf_sequence(dev, 5,</div><div class='del'>-				rfseq_events, rfseq_delays, 3);</div><div class='del'>-		b43_phy_maskset(dev, B43_NPHY_OVER_DGAIN1,</div><div class='del'>-			~B43_NPHY_OVER_DGAIN_CCKDGECV &amp; 0xFFFF,</div><div class='del'>-			0x5A &lt;&lt; B43_NPHY_OVER_DGAIN_CCKDGECV_SHIFT);</div><div class='del'>-</div><div class='del'>-		if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ)</div><div class='del'>-			b43_phy_maskset(dev, B43_PHY_N(0xC5D),</div><div class='del'>-					0xFF80, 4);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='del'>-	struct ssb_sprom *sprom = dev-&gt;dev-&gt;bus_sprom;</div><div class='del'>-</div><div class='del'>-	/* TX to RX */</div><div class='del'>-	u8 tx2rx_events[9] = { 0x4, 0x3, 0x6, 0x5, 0x2, 0x1, 0x8, 0x1F };</div><div class='del'>-	u8 tx2rx_delays[9] = { 8, 4, 2, 2, 4, 4, 6, 1 };</div><div class='del'>-	/* RX to TX */</div><div class='del'>-	u8 rx2tx_events_ipa[9] = { 0x0, 0x1, 0x2, 0x8, 0x5, 0x6, 0xF, 0x3,</div><div class='del'>-					0x1F };</div><div class='del'>-	u8 rx2tx_delays_ipa[9] = { 8, 6, 6, 4, 4, 16, 43, 1, 1 };</div><div class='del'>-	u8 rx2tx_events[9] = { 0x0, 0x1, 0x2, 0x8, 0x5, 0x6, 0x3, 0x4, 0x1F };</div><div class='del'>-	u8 rx2tx_delays[9] = { 8, 6, 6, 4, 4, 18, 42, 1, 1 };</div><div class='del'>-</div><div class='del'>-	u16 tmp16;</div><div class='del'>-	u32 tmp32;</div><div class='del'>-</div><div class='del'>-	tmp32 = b43_ntab_read(dev, B43_NTAB32(30, 0));</div><div class='del'>-	tmp32 &amp;= 0xffffff;</div><div class='del'>-	b43_ntab_write(dev, B43_NTAB32(30, 0), tmp32);</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_PHASETR_A0, 0x0125);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_PHASETR_A1, 0x01B3);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_PHASETR_A2, 0x0105);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_PHASETR_B0, 0x016E);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_PHASETR_B1, 0x00CD);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_PHASETR_B2, 0x0020);</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_C2_CLIP1_MEDGAIN, 0x000C);</div><div class='del'>-	b43_phy_write(dev, 0x2AE, 0x000C);</div><div class='del'>-</div><div class='del'>-	/* TX to RX */</div><div class='del'>-	b43_nphy_set_rf_sequence(dev, 1, tx2rx_events, tx2rx_delays, 9);</div><div class='del'>-</div><div class='del'>-	/* RX to TX */</div><div class='del'>-	if (b43_nphy_ipa(dev))</div><div class='del'>-		b43_nphy_set_rf_sequence(dev, 1, rx2tx_events_ipa,</div><div class='del'>-					 rx2tx_delays_ipa, 9);</div><div class='del'>-	if (nphy-&gt;hw_phyrxchain != 3 &amp;&amp;</div><div class='del'>-	    nphy-&gt;hw_phyrxchain != nphy-&gt;hw_phytxchain) {</div><div class='del'>-		if (b43_nphy_ipa(dev)) {</div><div class='del'>-			rx2tx_delays[5] = 59;</div><div class='del'>-			rx2tx_delays[6] = 1;</div><div class='del'>-			rx2tx_events[7] = 0x1F;</div><div class='del'>-		}</div><div class='del'>-		b43_nphy_set_rf_sequence(dev, 1, rx2tx_events, rx2tx_delays, 9);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tmp16 = (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ) ?</div><div class='del'>-		0x2 : 0x9C40;</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_ENDROP_TLEN, tmp16);</div><div class='del'>-</div><div class='del'>-	b43_phy_maskset(dev, 0x294, 0xF0FF, 0x0700);</div><div class='del'>-</div><div class='del'>-	b43_ntab_write(dev, B43_NTAB32(16, 3), 0x18D);</div><div class='del'>-	b43_ntab_write(dev, B43_NTAB32(16, 127), 0x18D);</div><div class='del'>-</div><div class='del'>-	b43_nphy_gain_ctrl_workarounds(dev);</div><div class='del'>-</div><div class='del'>-	b43_ntab_write(dev, B43_NTAB32(8, 0), 2);</div><div class='del'>-	b43_ntab_write(dev, B43_NTAB32(8, 16), 2);</div><div class='del'>-</div><div class='del'>-	/* TODO */</div><div class='del'>-</div><div class='del'>-	b43_radio_write(dev, B2056_RX0 | B2056_RX_MIXA_MAST_BIAS, 0x00);</div><div class='del'>-	b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXA_MAST_BIAS, 0x00);</div><div class='del'>-	b43_radio_write(dev, B2056_RX0 | B2056_RX_MIXA_BIAS_MAIN, 0x06);</div><div class='del'>-	b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXA_BIAS_MAIN, 0x06);</div><div class='del'>-	b43_radio_write(dev, B2056_RX0 | B2056_RX_MIXA_BIAS_AUX, 0x07);</div><div class='del'>-	b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXA_BIAS_AUX, 0x07);</div><div class='del'>-	b43_radio_write(dev, B2056_RX0 | B2056_RX_MIXA_LOB_BIAS, 0x88);</div><div class='del'>-	b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXA_LOB_BIAS, 0x88);</div><div class='del'>-	b43_radio_write(dev, B2056_RX0 | B2056_RX_MIXG_CMFB_IDAC, 0x00);</div><div class='del'>-	b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXG_CMFB_IDAC, 0x00);</div><div class='del'>-</div><div class='del'>-	/* N PHY WAR TX Chain Update with hw_phytxchain as argument */</div><div class='del'>-</div><div class='del'>-	if ((sprom-&gt;boardflags2_lo &amp; B43_BFL2_APLL_WAR &amp;&amp;</div><div class='del'>-	     b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ) ||</div><div class='del'>-	    (sprom-&gt;boardflags2_lo &amp; B43_BFL2_GPLL_WAR &amp;&amp;</div><div class='del'>-	     b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ))</div><div class='del'>-		tmp32 = 0x00088888;</div><div class='del'>-	else</div><div class='del'>-		tmp32 = 0x88888888;</div><div class='del'>-	b43_ntab_write(dev, B43_NTAB32(30, 1), tmp32);</div><div class='del'>-	b43_ntab_write(dev, B43_NTAB32(30, 2), tmp32);</div><div class='del'>-	b43_ntab_write(dev, B43_NTAB32(30, 3), tmp32);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;phy.rev == 4 &amp;&amp;</div><div class='del'>-		b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ) {</div><div class='del'>-		b43_radio_write(dev, B2056_TX0 | B2056_TX_GMBB_IDAC,</div><div class='del'>-				0x70);</div><div class='del'>-		b43_radio_write(dev, B2056_TX1 | B2056_TX_GMBB_IDAC,</div><div class='del'>-				0x70);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, 0x224, 0x039C);</div><div class='del'>-	b43_phy_write(dev, 0x225, 0x0357);</div><div class='del'>-	b43_phy_write(dev, 0x226, 0x0317);</div><div class='del'>-	b43_phy_write(dev, 0x227, 0x02D7);</div><div class='del'>-	b43_phy_write(dev, 0x228, 0x039C);</div><div class='del'>-	b43_phy_write(dev, 0x229, 0x0357);</div><div class='del'>-	b43_phy_write(dev, 0x22A, 0x0317);</div><div class='del'>-	b43_phy_write(dev, 0x22B, 0x02D7);</div><div class='del'>-	b43_phy_write(dev, 0x22C, 0x039C);</div><div class='del'>-	b43_phy_write(dev, 0x22D, 0x0357);</div><div class='del'>-	b43_phy_write(dev, 0x22E, 0x0317);</div><div class='del'>-	b43_phy_write(dev, 0x22F, 0x02D7);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void b43_nphy_workarounds_rev1_2(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct ssb_sprom *sprom = dev-&gt;dev-&gt;bus_sprom;</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	struct b43_phy_n *nphy = phy-&gt;n;</div><div class='del'>-</div><div class='del'>-	u8 events1[7] = { 0x0, 0x1, 0x2, 0x8, 0x4, 0x5, 0x3 };</div><div class='del'>-	u8 delays1[7] = { 0x8, 0x6, 0x6, 0x2, 0x4, 0x3C, 0x1 };</div><div class='del'>-</div><div class='del'>-	u8 events2[7] = { 0x0, 0x3, 0x5, 0x4, 0x2, 0x1, 0x8 };</div><div class='del'>-	u8 delays2[7] = { 0x8, 0x6, 0x2, 0x4, 0x4, 0x6, 0x1 };</div><div class='del'>-</div><div class='del'>-	if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ &amp;&amp;</div><div class='del'>-	    nphy-&gt;band5g_pwrgain) {</div><div class='del'>-		b43_radio_mask(dev, B2055_C1_TX_RF_SPARE, ~0x8);</div><div class='del'>-		b43_radio_mask(dev, B2055_C2_TX_RF_SPARE, ~0x8);</div><div class='del'>-	} else {</div><div class='del'>-		b43_radio_set(dev, B2055_C1_TX_RF_SPARE, 0x8);</div><div class='del'>-		b43_radio_set(dev, B2055_C2_TX_RF_SPARE, 0x8);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	b43_ntab_write(dev, B43_NTAB16(8, 0x00), 0x000A);</div><div class='del'>-	b43_ntab_write(dev, B43_NTAB16(8, 0x10), 0x000A);</div><div class='del'>-	b43_ntab_write(dev, B43_NTAB16(8, 0x02), 0xCDAA);</div><div class='del'>-	b43_ntab_write(dev, B43_NTAB16(8, 0x12), 0xCDAA);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;phy.rev &lt; 2) {</div><div class='del'>-		b43_ntab_write(dev, B43_NTAB16(8, 0x08), 0x0000);</div><div class='del'>-		b43_ntab_write(dev, B43_NTAB16(8, 0x18), 0x0000);</div><div class='del'>-		b43_ntab_write(dev, B43_NTAB16(8, 0x07), 0x7AAB);</div><div class='del'>-		b43_ntab_write(dev, B43_NTAB16(8, 0x17), 0x7AAB);</div><div class='del'>-		b43_ntab_write(dev, B43_NTAB16(8, 0x06), 0x0800);</div><div class='del'>-		b43_ntab_write(dev, B43_NTAB16(8, 0x16), 0x0800);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_LO1, 0x2D8);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_UP1, 0x301);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_LO2, 0x2D8);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_UP2, 0x301);</div><div class='del'>-</div><div class='del'>-	if (sprom-&gt;boardflags2_lo &amp; B43_BFL2_SKWRKFEM_BRD &amp;&amp;</div><div class='del'>-	    dev-&gt;dev-&gt;board_type == 0x8B) {</div><div class='del'>-		delays1[0] = 0x1;</div><div class='del'>-		delays1[5] = 0x14;</div><div class='del'>-	}</div><div class='del'>-	b43_nphy_set_rf_sequence(dev, 0, events1, delays1, 7);</div><div class='del'>-	b43_nphy_set_rf_sequence(dev, 1, events2, delays2, 7);</div><div class='del'>-</div><div class='del'>-	b43_nphy_gain_ctrl_workarounds(dev);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;phy.rev &lt; 2) {</div><div class='del'>-		if (b43_phy_read(dev, B43_NPHY_RXCTL) &amp; 0x2)</div><div class='del'>-			b43_hf_write(dev, b43_hf_read(dev) |</div><div class='del'>-					B43_HF_MLADVW);</div><div class='del'>-	} else if (dev-&gt;phy.rev == 2) {</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_CRSCHECK2, 0);</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_CRSCHECK3, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;phy.rev &lt; 2)</div><div class='del'>-		b43_phy_mask(dev, B43_NPHY_SCRAM_SIGCTL,</div><div class='del'>-				~B43_NPHY_SCRAM_SIGCTL_SCM);</div><div class='del'>-</div><div class='del'>-	/* Set phase track alpha and beta */</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_PHASETR_A0, 0x125);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_PHASETR_A1, 0x1B3);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_PHASETR_A2, 0x105);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_PHASETR_B0, 0x16E);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_PHASETR_B1, 0xCD);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_PHASETR_B2, 0x20);</div><div class='del'>-</div><div class='del'>-	b43_phy_mask(dev, B43_NPHY_PIL_DW1,</div><div class='del'>-			~B43_NPHY_PIL_DW_64QAM &amp; 0xFFFF);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_TXF_20CO_S2B1, 0xB5);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_TXF_20CO_S2B2, 0xA4);</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_TXF_20CO_S2B3, 0x00);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;phy.rev == 2)</div><div class='del'>-		b43_phy_set(dev, B43_NPHY_FINERX2_CGC,</div><div class='del'>-				B43_NPHY_FINERX2_CGC_DECGC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/Workarounds */</div><div class='del'>-static void b43_nphy_workarounds(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='del'>-	struct b43_phy_n *nphy = phy-&gt;n;</div><div class='del'>-</div><div class='del'>-	if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ)</div><div class='del'>-		b43_nphy_classifier(dev, 1, 0);</div><div class='del'>-	else</div><div class='del'>-		b43_nphy_classifier(dev, 1, 1);</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;hang_avoid)</div><div class='del'>-		b43_nphy_stay_in_carrier_search(dev, 1);</div><div class='del'>-</div><div class='del'>-	b43_phy_set(dev, B43_NPHY_IQFLIP,</div><div class='del'>-		    B43_NPHY_IQFLIP_ADC1 | B43_NPHY_IQFLIP_ADC2);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;phy.rev &gt;= 3)</div><div class='del'>-		b43_nphy_workarounds_rev3plus(dev);</div><div class='del'>-	else</div><div class='del'>-		b43_nphy_workarounds_rev1_2(dev);</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;hang_avoid)</div><div class='del'>-		b43_nphy_stay_in_carrier_search(dev, 0);</div><div class='del'>-}</div><div class='add'>+/**************************************************</div><div class='add'>+ * Samples</div><div class='add'>+ **************************************************/</div><div class='ctx'> </div><div class='ctx'> /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/LoadSampleTable */</div><div class='ctx'> static int b43_nphy_load_samples(struct b43_wldev *dev,</div><div class='hunk'>@@ -1825,7 +956,7 @@ static void b43_nphy_run_samples(struct b43_wldev *dev, u16 samps, u16 loops,</div><div class='ctx'> 			b43_phy_write(dev, B43_NPHY_SAMP_CMD, 1);</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; 100; i++) {</div><div class='del'>-		if (b43_phy_read(dev, B43_NPHY_RFSEQST) &amp; 1) {</div><div class='add'>+		if (!(b43_phy_read(dev, B43_NPHY_RFSEQST) &amp; 1)) {</div><div class='ctx'> 			i = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1837,333 +968,9 @@ static void b43_nphy_run_samples(struct b43_wldev *dev, u16 samps, u16 loops,</div><div class='ctx'> 	b43_phy_write(dev, B43_NPHY_RFSEQMODE, seq_mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Transmits a known value for LO calibration</div><div class='del'>- * http://bcm-v4.sipsolutions.net/802.11/PHY/N/TXTone</div><div class='del'>- */</div><div class='del'>-static int b43_nphy_tx_tone(struct b43_wldev *dev, u32 freq, u16 max_val,</div><div class='del'>-				bool iqmode, bool dac_test)</div><div class='del'>-{</div><div class='del'>-	u16 samp = b43_nphy_gen_load_samples(dev, freq, max_val, dac_test);</div><div class='del'>-	if (samp == 0)</div><div class='del'>-		return -1;</div><div class='del'>-	b43_nphy_run_samples(dev, samp, 0xFFFF, 0, iqmode, dac_test);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxPwrCtrlCoefSetup */</div><div class='del'>-static void b43_nphy_tx_pwr_ctrl_coef_setup(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='del'>-	int i, j;</div><div class='del'>-	u32 tmp;</div><div class='del'>-	u32 cur_real, cur_imag, real_part, imag_part;</div><div class='del'>-</div><div class='del'>-	u16 buffer[7];</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;hang_avoid)</div><div class='del'>-		b43_nphy_stay_in_carrier_search(dev, true);</div><div class='del'>-</div><div class='del'>-	b43_ntab_read_bulk(dev, B43_NTAB16(15, 80), 7, buffer);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		tmp = ((buffer[i * 2] &amp; 0x3FF) &lt;&lt; 10) |</div><div class='del'>-			(buffer[i * 2 + 1] &amp; 0x3FF);</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_TABLE_ADDR,</div><div class='del'>-				(((i + 26) &lt;&lt; 10) | 320));</div><div class='del'>-		for (j = 0; j &lt; 128; j++) {</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TABLE_DATAHI,</div><div class='del'>-					((tmp &gt;&gt; 16) &amp; 0xFFFF));</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TABLE_DATALO,</div><div class='del'>-					(tmp &amp; 0xFFFF));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		tmp = buffer[5 + i];</div><div class='del'>-		real_part = (tmp &gt;&gt; 8) &amp; 0xFF;</div><div class='del'>-		imag_part = (tmp &amp; 0xFF);</div><div class='del'>-		b43_phy_write(dev, B43_NPHY_TABLE_ADDR,</div><div class='del'>-				(((i + 26) &lt;&lt; 10) | 448));</div><div class='del'>-</div><div class='del'>-		if (dev-&gt;phy.rev &gt;= 3) {</div><div class='del'>-			cur_real = real_part;</div><div class='del'>-			cur_imag = imag_part;</div><div class='del'>-			tmp = ((cur_real &amp; 0xFF) &lt;&lt; 8) | (cur_imag &amp; 0xFF);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; 128; j++) {</div><div class='del'>-			if (dev-&gt;phy.rev &lt; 3) {</div><div class='del'>-				cur_real = (real_part * loscale[j] + 128) &gt;&gt; 8;</div><div class='del'>-				cur_imag = (imag_part * loscale[j] + 128) &gt;&gt; 8;</div><div class='del'>-				tmp = ((cur_real &amp; 0xFF) &lt;&lt; 8) |</div><div class='del'>-					(cur_imag &amp; 0xFF);</div><div class='del'>-			}</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TABLE_DATAHI,</div><div class='del'>-					((tmp &gt;&gt; 16) &amp; 0xFFFF));</div><div class='del'>-			b43_phy_write(dev, B43_NPHY_TABLE_DATALO,</div><div class='del'>-					(tmp &amp; 0xFFFF));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;phy.rev &gt;= 3) {</div><div class='del'>-		b43_shm_write16(dev, B43_SHM_SHARED,</div><div class='del'>-				B43_SHM_SH_NPHY_TXPWR_INDX0, 0xFFFF);</div><div class='del'>-		b43_shm_write16(dev, B43_SHM_SHARED,</div><div class='del'>-				B43_SHM_SH_NPHY_TXPWR_INDX1, 0xFFFF);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;hang_avoid)</div><div class='del'>-		b43_nphy_stay_in_carrier_search(dev, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/SetRfSeq */</div><div class='del'>-static void b43_nphy_set_rf_sequence(struct b43_wldev *dev, u8 cmd,</div><div class='del'>-					u8 *events, u8 *delays, u8 length)</div><div class='del'>-{</div><div class='del'>-	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='del'>-	u8 i;</div><div class='del'>-	u8 end = (dev-&gt;phy.rev &gt;= 3) ? 0x1F : 0x0F;</div><div class='del'>-	u16 offset1 = cmd &lt;&lt; 4;</div><div class='del'>-	u16 offset2 = offset1 + 0x80;</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;hang_avoid)</div><div class='del'>-		b43_nphy_stay_in_carrier_search(dev, true);</div><div class='del'>-</div><div class='del'>-	b43_ntab_write_bulk(dev, B43_NTAB8(7, offset1), length, events);</div><div class='del'>-	b43_ntab_write_bulk(dev, B43_NTAB8(7, offset2), length, delays);</div><div class='del'>-</div><div class='del'>-	for (i = length; i &lt; 16; i++) {</div><div class='del'>-		b43_ntab_write(dev, B43_NTAB8(7, offset1 + i), end);</div><div class='del'>-		b43_ntab_write(dev, B43_NTAB8(7, offset2 + i), 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (nphy-&gt;hang_avoid)</div><div class='del'>-		b43_nphy_stay_in_carrier_search(dev, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/ForceRFSeq */</div><div class='del'>-static void b43_nphy_force_rf_sequence(struct b43_wldev *dev,</div><div class='del'>-				       enum b43_nphy_rf_sequence seq)</div><div class='del'>-{</div><div class='del'>-	static const u16 trigger[] = {</div><div class='del'>-		[B43_RFSEQ_RX2TX]		= B43_NPHY_RFSEQTR_RX2TX,</div><div class='del'>-		[B43_RFSEQ_TX2RX]		= B43_NPHY_RFSEQTR_TX2RX,</div><div class='del'>-		[B43_RFSEQ_RESET2RX]		= B43_NPHY_RFSEQTR_RST2RX,</div><div class='del'>-		[B43_RFSEQ_UPDATE_GAINH]	= B43_NPHY_RFSEQTR_UPGH,</div><div class='del'>-		[B43_RFSEQ_UPDATE_GAINL]	= B43_NPHY_RFSEQTR_UPGL,</div><div class='del'>-		[B43_RFSEQ_UPDATE_GAINU]	= B43_NPHY_RFSEQTR_UPGU,</div><div class='del'>-	};</div><div class='del'>-	int i;</div><div class='del'>-	u16 seq_mode = b43_phy_read(dev, B43_NPHY_RFSEQMODE);</div><div class='del'>-</div><div class='del'>-	B43_WARN_ON(seq &gt;= ARRAY_SIZE(trigger));</div><div class='del'>-</div><div class='del'>-	b43_phy_set(dev, B43_NPHY_RFSEQMODE,</div><div class='del'>-		    B43_NPHY_RFSEQMODE_CAOVER | B43_NPHY_RFSEQMODE_TROVER);</div><div class='del'>-	b43_phy_set(dev, B43_NPHY_RFSEQTR, trigger[seq]);</div><div class='del'>-	for (i = 0; i &lt; 200; i++) {</div><div class='del'>-		if (!(b43_phy_read(dev, B43_NPHY_RFSEQST) &amp; trigger[seq]))</div><div class='del'>-			goto ok;</div><div class='del'>-		msleep(1);</div><div class='del'>-	}</div><div class='del'>-	b43err(dev-&gt;wl, "RF sequence status timeout\n");</div><div class='del'>-ok:</div><div class='del'>-	b43_phy_write(dev, B43_NPHY_RFSEQMODE, seq_mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RFCtrlOverride */</div><div class='del'>-static void b43_nphy_rf_control_override(struct b43_wldev *dev, u16 field,</div><div class='del'>-						u16 value, u8 core, bool off)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	u8 index = fls(field);</div><div class='del'>-	u8 addr, en_addr, val_addr;</div><div class='del'>-	/* we expect only one bit set */</div><div class='del'>-	B43_WARN_ON(field &amp; (~(1 &lt;&lt; (index - 1))));</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;phy.rev &gt;= 3) {</div><div class='del'>-		const struct nphy_rf_control_override_rev3 *rf_ctrl;</div><div class='del'>-		for (i = 0; i &lt; 2; i++) {</div><div class='del'>-			if (index == 0 || index == 16) {</div><div class='del'>-				b43err(dev-&gt;wl,</div><div class='del'>-					"Unsupported RF Ctrl Override call\n");</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			rf_ctrl = &amp;tbl_rf_control_override_rev3[index - 1];</div><div class='del'>-			en_addr = B43_PHY_N((i == 0) ?</div><div class='del'>-				rf_ctrl-&gt;en_addr0 : rf_ctrl-&gt;en_addr1);</div><div class='del'>-			val_addr = B43_PHY_N((i == 0) ?</div><div class='del'>-				rf_ctrl-&gt;val_addr0 : rf_ctrl-&gt;val_addr1);</div><div class='del'>-</div><div class='del'>-			if (off) {</div><div class='del'>-				b43_phy_mask(dev, en_addr, ~(field));</div><div class='del'>-				b43_phy_mask(dev, val_addr,</div><div class='del'>-						~(rf_ctrl-&gt;val_mask));</div><div class='del'>-			} else {</div><div class='del'>-				if (core == 0 || ((1 &lt;&lt; core) &amp; i) != 0) {</div><div class='del'>-					b43_phy_set(dev, en_addr, field);</div><div class='del'>-					b43_phy_maskset(dev, val_addr,</div><div class='del'>-						~(rf_ctrl-&gt;val_mask),</div><div class='del'>-						(value &lt;&lt; rf_ctrl-&gt;val_shift));</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		const struct nphy_rf_control_override_rev2 *rf_ctrl;</div><div class='del'>-		if (off) {</div><div class='del'>-			b43_phy_mask(dev, B43_NPHY_RFCTL_OVER, ~(field));</div><div class='del'>-			value = 0;</div><div class='del'>-		} else {</div><div class='del'>-			b43_phy_set(dev, B43_NPHY_RFCTL_OVER, field);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 2; i++) {</div><div class='del'>-			if (index &lt;= 1 || index == 16) {</div><div class='del'>-				b43err(dev-&gt;wl,</div><div class='del'>-					"Unsupported RF Ctrl Override call\n");</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (index == 2 || index == 10 ||</div><div class='del'>-			    (index &gt;= 13 &amp;&amp; index &lt;= 15)) {</div><div class='del'>-				core = 1;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			rf_ctrl = &amp;tbl_rf_control_override_rev2[index - 2];</div><div class='del'>-			addr = B43_PHY_N((i == 0) ?</div><div class='del'>-				rf_ctrl-&gt;addr0 : rf_ctrl-&gt;addr1);</div><div class='del'>-</div><div class='del'>-			if ((core &amp; (1 &lt;&lt; i)) != 0)</div><div class='del'>-				b43_phy_maskset(dev, addr, ~(rf_ctrl-&gt;bmask),</div><div class='del'>-						(value &lt;&lt; rf_ctrl-&gt;shift));</div><div class='del'>-</div><div class='del'>-			b43_phy_set(dev, B43_NPHY_RFCTL_OVER, 0x1);</div><div class='del'>-			b43_phy_set(dev, B43_NPHY_RFCTL_CMD,</div><div class='del'>-					B43_NPHY_RFCTL_CMD_START);</div><div class='del'>-			udelay(1);</div><div class='del'>-			b43_phy_mask(dev, B43_NPHY_RFCTL_OVER, 0xFFFE);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RFCtrlIntcOverride */</div><div class='del'>-static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,</div><div class='del'>-						u16 value, u8 core)</div><div class='del'>-{</div><div class='del'>-	u8 i, j;</div><div class='del'>-	u16 reg, tmp, val;</div><div class='del'>-</div><div class='del'>-	B43_WARN_ON(dev-&gt;phy.rev &lt; 3);</div><div class='del'>-	B43_WARN_ON(field &gt; 4);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		if ((core == 1 &amp;&amp; i == 1) || (core == 2 &amp;&amp; !i))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		reg = (i == 0) ?</div><div class='del'>-			B43_NPHY_RFCTL_INTC1 : B43_NPHY_RFCTL_INTC2;</div><div class='del'>-		b43_phy_mask(dev, reg, 0xFBFF);</div><div class='del'>-</div><div class='del'>-		switch (field) {</div><div class='del'>-		case 0:</div><div class='del'>-			b43_phy_write(dev, reg, 0);</div><div class='del'>-			b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RESET2RX);</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			if (!i) {</div><div class='del'>-				b43_phy_maskset(dev, B43_NPHY_RFCTL_INTC1,</div><div class='del'>-						0xFC3F, (value &lt;&lt; 6));</div><div class='del'>-				b43_phy_maskset(dev, B43_NPHY_TXF_40CO_B1S1,</div><div class='del'>-						0xFFFE, 1);</div><div class='del'>-				b43_phy_set(dev, B43_NPHY_RFCTL_CMD,</div><div class='del'>-						B43_NPHY_RFCTL_CMD_START);</div><div class='del'>-				for (j = 0; j &lt; 100; j++) {</div><div class='del'>-					if (b43_phy_read(dev, B43_NPHY_RFCTL_CMD) &amp; B43_NPHY_RFCTL_CMD_START) {</div><div class='del'>-						j = 0;</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-					udelay(10);</div><div class='del'>-				}</div><div class='del'>-				if (j)</div><div class='del'>-					b43err(dev-&gt;wl,</div><div class='del'>-						"intc override timeout\n");</div><div class='del'>-				b43_phy_mask(dev, B43_NPHY_TXF_40CO_B1S1,</div><div class='del'>-						0xFFFE);</div><div class='del'>-			} else {</div><div class='del'>-				b43_phy_maskset(dev, B43_NPHY_RFCTL_INTC2,</div><div class='del'>-						0xFC3F, (value &lt;&lt; 6));</div><div class='del'>-				b43_phy_maskset(dev, B43_NPHY_RFCTL_OVER,</div><div class='del'>-						0xFFFE, 1);</div><div class='del'>-				b43_phy_set(dev, B43_NPHY_RFCTL_CMD,</div><div class='del'>-						B43_NPHY_RFCTL_CMD_RXTX);</div><div class='del'>-				for (j = 0; j &lt; 100; j++) {</div><div class='del'>-					if (b43_phy_read(dev, B43_NPHY_RFCTL_CMD) &amp; B43_NPHY_RFCTL_CMD_RXTX) {</div><div class='del'>-						j = 0;</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-					udelay(10);</div><div class='del'>-				}</div><div class='del'>-				if (j)</div><div class='del'>-					b43err(dev-&gt;wl,</div><div class='del'>-						"intc override timeout\n");</div><div class='del'>-				b43_phy_mask(dev, B43_NPHY_RFCTL_OVER,</div><div class='del'>-						0xFFFE);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ) {</div><div class='del'>-				tmp = 0x0020;</div><div class='del'>-				val = value &lt;&lt; 5;</div><div class='del'>-			} else {</div><div class='del'>-				tmp = 0x0010;</div><div class='del'>-				val = value &lt;&lt; 4;</div><div class='del'>-			}</div><div class='del'>-			b43_phy_maskset(dev, reg, ~tmp, val);</div><div class='del'>-			break;</div><div class='del'>-		case 3:</div><div class='del'>-			if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ) {</div><div class='del'>-				tmp = 0x0001;</div><div class='del'>-				val = value;</div><div class='del'>-			} else {</div><div class='del'>-				tmp = 0x0004;</div><div class='del'>-				val = value &lt;&lt; 2;</div><div class='del'>-			}</div><div class='del'>-			b43_phy_maskset(dev, reg, ~tmp, val);</div><div class='del'>-			break;</div><div class='del'>-		case 4:</div><div class='del'>-			if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ) {</div><div class='del'>-				tmp = 0x0002;</div><div class='del'>-				val = value &lt;&lt; 1;</div><div class='del'>-			} else {</div><div class='del'>-				tmp = 0x0008;</div><div class='del'>-				val = value &lt;&lt; 3;</div><div class='del'>-			}</div><div class='del'>-			b43_phy_maskset(dev, reg, ~tmp, 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='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/BPHYInit */</div><div class='del'>-static void b43_nphy_bphy_init(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-	u16 val;</div><div class='del'>-</div><div class='del'>-	val = 0x1E1F;</div><div class='del'>-	for (i = 0; i &lt; 16; i++) {</div><div class='del'>-		b43_phy_write(dev, B43_PHY_N_BMODE(0x88 + i), val);</div><div class='del'>-		val -= 0x202;</div><div class='del'>-	}</div><div class='del'>-	val = 0x3E3F;</div><div class='del'>-	for (i = 0; i &lt; 16; i++) {</div><div class='del'>-		b43_phy_write(dev, B43_PHY_N_BMODE(0x98 + i), val);</div><div class='del'>-		val -= 0x202;</div><div class='del'>-	}</div><div class='del'>-	b43_phy_write(dev, B43_PHY_N_BMODE(0x38), 0x668);</div><div class='del'>-}</div><div class='add'>+/**************************************************</div><div class='add'>+ * RSSI</div><div class='add'>+ **************************************************/</div><div class='ctx'> </div><div class='ctx'> /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/ScaleOffsetRssi */</div><div class='ctx'> static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale,</div><div class='hunk'>@@ -2233,67 +1040,6 @@ static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale,</div><div class='ctx'> 		b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_TSSI, tmp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void b43_nphy_rev2_rssi_select(struct b43_wldev *dev, u8 code, u8 type)</div><div class='del'>-{</div><div class='del'>-	u16 val;</div><div class='del'>-</div><div class='del'>-	if (type &lt; 3)</div><div class='del'>-		val = 0;</div><div class='del'>-	else if (type == 6)</div><div class='del'>-		val = 1;</div><div class='del'>-	else if (type == 3)</div><div class='del'>-		val = 2;</div><div class='del'>-	else</div><div class='del'>-		val = 3;</div><div class='del'>-</div><div class='del'>-	val = (val &lt;&lt; 12) | (val &lt;&lt; 14);</div><div class='del'>-	b43_phy_maskset(dev, B43_NPHY_AFECTL_C1, 0x0FFF, val);</div><div class='del'>-	b43_phy_maskset(dev, B43_NPHY_AFECTL_C2, 0x0FFF, val);</div><div class='del'>-</div><div class='del'>-	if (type &lt; 3) {</div><div class='del'>-		b43_phy_maskset(dev, B43_NPHY_RFCTL_RSSIO1, 0xFFCF,</div><div class='del'>-				(type + 1) &lt;&lt; 4);</div><div class='del'>-		b43_phy_maskset(dev, B43_NPHY_RFCTL_RSSIO2, 0xFFCF,</div><div class='del'>-				(type + 1) &lt;&lt; 4);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (code == 0) {</div><div class='del'>-		b43_phy_mask(dev, B43_NPHY_AFECTL_OVER, ~0x3000);</div><div class='del'>-		if (type &lt; 3) {</div><div class='del'>-			b43_phy_mask(dev, B43_NPHY_RFCTL_CMD,</div><div class='del'>-				~(B43_NPHY_RFCTL_CMD_RXEN |</div><div class='del'>-				  B43_NPHY_RFCTL_CMD_CORESEL));</div><div class='del'>-			b43_phy_mask(dev, B43_NPHY_RFCTL_OVER,</div><div class='del'>-				~(0x1 &lt;&lt; 12 |</div><div class='del'>-				  0x1 &lt;&lt; 5 |</div><div class='del'>-				  0x1 &lt;&lt; 1 |</div><div class='del'>-				  0x1));</div><div class='del'>-			b43_phy_mask(dev, B43_NPHY_RFCTL_CMD,</div><div class='del'>-				~B43_NPHY_RFCTL_CMD_START);</div><div class='del'>-			udelay(20);</div><div class='del'>-			b43_phy_mask(dev, B43_NPHY_RFCTL_OVER, ~0x1);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		b43_phy_set(dev, B43_NPHY_AFECTL_OVER, 0x3000);</div><div class='del'>-		if (type &lt; 3) {</div><div class='del'>-			b43_phy_maskset(dev, B43_NPHY_RFCTL_CMD,</div><div class='del'>-				~(B43_NPHY_RFCTL_CMD_RXEN |</div><div class='del'>-				  B43_NPHY_RFCTL_CMD_CORESEL),</div><div class='del'>-				(B43_NPHY_RFCTL_CMD_RXEN |</div><div class='del'>-				 code &lt;&lt; B43_NPHY_RFCTL_CMD_CORESEL_SHIFT));</div><div class='del'>-			b43_phy_set(dev, B43_NPHY_RFCTL_OVER,</div><div class='del'>-				(0x1 &lt;&lt; 12 |</div><div class='del'>-				  0x1 &lt;&lt; 5 |</div><div class='del'>-				  0x1 &lt;&lt; 1 |</div><div class='del'>-				  0x1));</div><div class='del'>-			b43_phy_set(dev, B43_NPHY_RFCTL_CMD,</div><div class='del'>-				B43_NPHY_RFCTL_CMD_START);</div><div class='del'>-			udelay(20);</div><div class='del'>-			b43_phy_mask(dev, B43_NPHY_RFCTL_OVER, ~0x1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void b43_nphy_rev3_rssi_select(struct b43_wldev *dev, u8 code, u8 type)</div><div class='ctx'> {</div><div class='ctx'> 	u8 i;</div><div class='hunk'>@@ -2377,6 +1123,67 @@ static void b43_nphy_rev3_rssi_select(struct b43_wldev *dev, u8 code, u8 type)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void b43_nphy_rev2_rssi_select(struct b43_wldev *dev, u8 code, u8 type)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	if (type &lt; 3)</div><div class='add'>+		val = 0;</div><div class='add'>+	else if (type == 6)</div><div class='add'>+		val = 1;</div><div class='add'>+	else if (type == 3)</div><div class='add'>+		val = 2;</div><div class='add'>+	else</div><div class='add'>+		val = 3;</div><div class='add'>+</div><div class='add'>+	val = (val &lt;&lt; 12) | (val &lt;&lt; 14);</div><div class='add'>+	b43_phy_maskset(dev, B43_NPHY_AFECTL_C1, 0x0FFF, val);</div><div class='add'>+	b43_phy_maskset(dev, B43_NPHY_AFECTL_C2, 0x0FFF, val);</div><div class='add'>+</div><div class='add'>+	if (type &lt; 3) {</div><div class='add'>+		b43_phy_maskset(dev, B43_NPHY_RFCTL_RSSIO1, 0xFFCF,</div><div class='add'>+				(type + 1) &lt;&lt; 4);</div><div class='add'>+		b43_phy_maskset(dev, B43_NPHY_RFCTL_RSSIO2, 0xFFCF,</div><div class='add'>+				(type + 1) &lt;&lt; 4);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (code == 0) {</div><div class='add'>+		b43_phy_mask(dev, B43_NPHY_AFECTL_OVER, ~0x3000);</div><div class='add'>+		if (type &lt; 3) {</div><div class='add'>+			b43_phy_mask(dev, B43_NPHY_RFCTL_CMD,</div><div class='add'>+				~(B43_NPHY_RFCTL_CMD_RXEN |</div><div class='add'>+				  B43_NPHY_RFCTL_CMD_CORESEL));</div><div class='add'>+			b43_phy_mask(dev, B43_NPHY_RFCTL_OVER,</div><div class='add'>+				~(0x1 &lt;&lt; 12 |</div><div class='add'>+				  0x1 &lt;&lt; 5 |</div><div class='add'>+				  0x1 &lt;&lt; 1 |</div><div class='add'>+				  0x1));</div><div class='add'>+			b43_phy_mask(dev, B43_NPHY_RFCTL_CMD,</div><div class='add'>+				~B43_NPHY_RFCTL_CMD_START);</div><div class='add'>+			udelay(20);</div><div class='add'>+			b43_phy_mask(dev, B43_NPHY_RFCTL_OVER, ~0x1);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		b43_phy_set(dev, B43_NPHY_AFECTL_OVER, 0x3000);</div><div class='add'>+		if (type &lt; 3) {</div><div class='add'>+			b43_phy_maskset(dev, B43_NPHY_RFCTL_CMD,</div><div class='add'>+				~(B43_NPHY_RFCTL_CMD_RXEN |</div><div class='add'>+				  B43_NPHY_RFCTL_CMD_CORESEL),</div><div class='add'>+				(B43_NPHY_RFCTL_CMD_RXEN |</div><div class='add'>+				 code &lt;&lt; B43_NPHY_RFCTL_CMD_CORESEL_SHIFT));</div><div class='add'>+			b43_phy_set(dev, B43_NPHY_RFCTL_OVER,</div><div class='add'>+				(0x1 &lt;&lt; 12 |</div><div class='add'>+				  0x1 &lt;&lt; 5 |</div><div class='add'>+				  0x1 &lt;&lt; 1 |</div><div class='add'>+				  0x1));</div><div class='add'>+			b43_phy_set(dev, B43_NPHY_RFCTL_CMD,</div><div class='add'>+				B43_NPHY_RFCTL_CMD_START);</div><div class='add'>+			udelay(20);</div><div class='add'>+			b43_phy_mask(dev, B43_NPHY_RFCTL_OVER, ~0x1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RSSISel */</div><div class='ctx'> static void b43_nphy_rssi_select(struct b43_wldev *dev, u8 code, u8 type)</div><div class='ctx'> {</div><div class='hunk'>@@ -2686,6 +1493,1413 @@ static void b43_nphy_rssi_cal(struct b43_wldev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**************************************************</div><div class='add'>+ * Workarounds</div><div class='add'>+ **************************************************/</div><div class='add'>+</div><div class='add'>+static void b43_nphy_gain_ctl_workarounds_rev3plus(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct ssb_sprom *sprom = dev-&gt;dev-&gt;bus_sprom;</div><div class='add'>+</div><div class='add'>+	bool ghz5;</div><div class='add'>+	bool ext_lna;</div><div class='add'>+	u16 rssi_gain;</div><div class='add'>+	struct nphy_gain_ctl_workaround_entry *e;</div><div class='add'>+	u8 lpf_gain[6] = { 0x00, 0x06, 0x0C, 0x12, 0x12, 0x12 };</div><div class='add'>+	u8 lpf_bits[6] = { 0, 1, 2, 3, 3, 3 };</div><div class='add'>+</div><div class='add'>+	/* Prepare values */</div><div class='add'>+	ghz5 = b43_phy_read(dev, B43_NPHY_BANDCTL)</div><div class='add'>+		&amp; B43_NPHY_BANDCTL_5GHZ;</div><div class='add'>+	ext_lna = ghz5 ? sprom-&gt;boardflags_hi &amp; B43_BFH_EXTLNA_5GHZ :</div><div class='add'>+		sprom-&gt;boardflags_lo &amp; B43_BFL_EXTLNA;</div><div class='add'>+	e = b43_nphy_get_gain_ctl_workaround_ent(dev, ghz5, ext_lna);</div><div class='add'>+	if (ghz5 &amp;&amp; dev-&gt;phy.rev &gt;= 5)</div><div class='add'>+		rssi_gain = 0x90;</div><div class='add'>+	else</div><div class='add'>+		rssi_gain = 0x50;</div><div class='add'>+</div><div class='add'>+	b43_phy_set(dev, B43_NPHY_RXCTL, 0x0040);</div><div class='add'>+</div><div class='add'>+	/* Set Clip 2 detect */</div><div class='add'>+	b43_phy_set(dev, B43_NPHY_C1_CGAINI,</div><div class='add'>+			B43_NPHY_C1_CGAINI_CL2DETECT);</div><div class='add'>+	b43_phy_set(dev, B43_NPHY_C2_CGAINI,</div><div class='add'>+			B43_NPHY_C2_CGAINI_CL2DETECT);</div><div class='add'>+</div><div class='add'>+	b43_radio_write(dev, B2056_RX0 | B2056_RX_BIASPOLE_LNAG1_IDAC,</div><div class='add'>+			0x17);</div><div class='add'>+	b43_radio_write(dev, B2056_RX1 | B2056_RX_BIASPOLE_LNAG1_IDAC,</div><div class='add'>+			0x17);</div><div class='add'>+	b43_radio_write(dev, B2056_RX0 | B2056_RX_LNAG2_IDAC, 0xF0);</div><div class='add'>+	b43_radio_write(dev, B2056_RX1 | B2056_RX_LNAG2_IDAC, 0xF0);</div><div class='add'>+	b43_radio_write(dev, B2056_RX0 | B2056_RX_RSSI_POLE, 0x00);</div><div class='add'>+	b43_radio_write(dev, B2056_RX1 | B2056_RX_RSSI_POLE, 0x00);</div><div class='add'>+	b43_radio_write(dev, B2056_RX0 | B2056_RX_RSSI_GAIN,</div><div class='add'>+			rssi_gain);</div><div class='add'>+	b43_radio_write(dev, B2056_RX1 | B2056_RX_RSSI_GAIN,</div><div class='add'>+			rssi_gain);</div><div class='add'>+	b43_radio_write(dev, B2056_RX0 | B2056_RX_BIASPOLE_LNAA1_IDAC,</div><div class='add'>+			0x17);</div><div class='add'>+	b43_radio_write(dev, B2056_RX1 | B2056_RX_BIASPOLE_LNAA1_IDAC,</div><div class='add'>+			0x17);</div><div class='add'>+	b43_radio_write(dev, B2056_RX0 | B2056_RX_LNAA2_IDAC, 0xFF);</div><div class='add'>+	b43_radio_write(dev, B2056_RX1 | B2056_RX_LNAA2_IDAC, 0xFF);</div><div class='add'>+</div><div class='add'>+	b43_ntab_write_bulk(dev, B43_NTAB8(0, 8), 4, e-&gt;lna1_gain);</div><div class='add'>+	b43_ntab_write_bulk(dev, B43_NTAB8(1, 8), 4, e-&gt;lna1_gain);</div><div class='add'>+	b43_ntab_write_bulk(dev, B43_NTAB8(0, 16), 4, e-&gt;lna2_gain);</div><div class='add'>+	b43_ntab_write_bulk(dev, B43_NTAB8(1, 16), 4, e-&gt;lna2_gain);</div><div class='add'>+	b43_ntab_write_bulk(dev, B43_NTAB8(0, 32), 10, e-&gt;gain_db);</div><div class='add'>+	b43_ntab_write_bulk(dev, B43_NTAB8(1, 32), 10, e-&gt;gain_db);</div><div class='add'>+	b43_ntab_write_bulk(dev, B43_NTAB8(2, 32), 10, e-&gt;gain_bits);</div><div class='add'>+	b43_ntab_write_bulk(dev, B43_NTAB8(3, 32), 10, e-&gt;gain_bits);</div><div class='add'>+	b43_ntab_write_bulk(dev, B43_NTAB8(0, 0x40), 6, lpf_gain);</div><div class='add'>+	b43_ntab_write_bulk(dev, B43_NTAB8(1, 0x40), 6, lpf_gain);</div><div class='add'>+	b43_ntab_write_bulk(dev, B43_NTAB8(2, 0x40), 6, lpf_bits);</div><div class='add'>+	b43_ntab_write_bulk(dev, B43_NTAB8(3, 0x40), 6, lpf_bits);</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_C1_INITGAIN, e-&gt;init_gain);</div><div class='add'>+	b43_phy_write(dev, 0x2A7, e-&gt;init_gain);</div><div class='add'>+	b43_ntab_write_bulk(dev, B43_NTAB16(7, 0x106), 2,</div><div class='add'>+				e-&gt;rfseq_init);</div><div class='add'>+</div><div class='add'>+	/* TODO: check defines. Do not match variables names */</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_C1_CLIP1_MEDGAIN, e-&gt;cliphi_gain);</div><div class='add'>+	b43_phy_write(dev, 0x2A9, e-&gt;cliphi_gain);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_C1_CLIP2_GAIN, e-&gt;clipmd_gain);</div><div class='add'>+	b43_phy_write(dev, 0x2AB, e-&gt;clipmd_gain);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_C2_CLIP1_HIGAIN, e-&gt;cliplo_gain);</div><div class='add'>+	b43_phy_write(dev, 0x2AD, e-&gt;cliplo_gain);</div><div class='add'>+</div><div class='add'>+	b43_phy_maskset(dev, 0x27D, 0xFF00, e-&gt;crsmin);</div><div class='add'>+	b43_phy_maskset(dev, 0x280, 0xFF00, e-&gt;crsminl);</div><div class='add'>+	b43_phy_maskset(dev, 0x283, 0xFF00, e-&gt;crsminu);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_C1_NBCLIPTHRES, e-&gt;nbclip);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_C2_NBCLIPTHRES, e-&gt;nbclip);</div><div class='add'>+	b43_phy_maskset(dev, B43_NPHY_C1_CLIPWBTHRES,</div><div class='add'>+			~B43_NPHY_C1_CLIPWBTHRES_CLIP2, e-&gt;wlclip);</div><div class='add'>+	b43_phy_maskset(dev, B43_NPHY_C2_CLIPWBTHRES,</div><div class='add'>+			~B43_NPHY_C2_CLIPWBTHRES_CLIP2, e-&gt;wlclip);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_CCK_SHIFTB_REF, 0x809C);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_nphy_gain_ctl_workarounds_rev1_2(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='add'>+</div><div class='add'>+	u8 i, j;</div><div class='add'>+	u8 code;</div><div class='add'>+	u16 tmp;</div><div class='add'>+	u8 rfseq_events[3] = { 6, 8, 7 };</div><div class='add'>+	u8 rfseq_delays[3] = { 10, 30, 1 };</div><div class='add'>+</div><div class='add'>+	/* Set Clip 2 detect */</div><div class='add'>+	b43_phy_set(dev, B43_NPHY_C1_CGAINI, B43_NPHY_C1_CGAINI_CL2DETECT);</div><div class='add'>+	b43_phy_set(dev, B43_NPHY_C2_CGAINI, B43_NPHY_C2_CGAINI_CL2DETECT);</div><div class='add'>+</div><div class='add'>+	/* Set narrowband clip threshold */</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_C1_NBCLIPTHRES, 0x84);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_C2_NBCLIPTHRES, 0x84);</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;phy.is_40mhz) {</div><div class='add'>+		/* Set dwell lengths */</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_CLIP1_NBDWELL_LEN, 0x002B);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_CLIP2_NBDWELL_LEN, 0x002B);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_W1CLIP1_DWELL_LEN, 0x0009);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_W1CLIP2_DWELL_LEN, 0x0009);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set wideband clip 2 threshold */</div><div class='add'>+	b43_phy_maskset(dev, B43_NPHY_C1_CLIPWBTHRES,</div><div class='add'>+			~B43_NPHY_C1_CLIPWBTHRES_CLIP2, 21);</div><div class='add'>+	b43_phy_maskset(dev, B43_NPHY_C2_CLIPWBTHRES,</div><div class='add'>+			~B43_NPHY_C2_CLIPWBTHRES_CLIP2, 21);</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;phy.is_40mhz) {</div><div class='add'>+		b43_phy_maskset(dev, B43_NPHY_C1_CGAINI,</div><div class='add'>+			~B43_NPHY_C1_CGAINI_GAINBKOFF, 0x1);</div><div class='add'>+		b43_phy_maskset(dev, B43_NPHY_C2_CGAINI,</div><div class='add'>+			~B43_NPHY_C2_CGAINI_GAINBKOFF, 0x1);</div><div class='add'>+		b43_phy_maskset(dev, B43_NPHY_C1_CCK_CGAINI,</div><div class='add'>+			~B43_NPHY_C1_CCK_CGAINI_GAINBKOFF, 0x1);</div><div class='add'>+		b43_phy_maskset(dev, B43_NPHY_C2_CCK_CGAINI,</div><div class='add'>+			~B43_NPHY_C2_CCK_CGAINI_GAINBKOFF, 0x1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_CCK_SHIFTB_REF, 0x809C);</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;gain_boost) {</div><div class='add'>+		if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ &amp;&amp;</div><div class='add'>+			dev-&gt;phy.is_40mhz)</div><div class='add'>+			code = 4;</div><div class='add'>+		else</div><div class='add'>+			code = 5;</div><div class='add'>+	} else {</div><div class='add'>+		code = dev-&gt;phy.is_40mhz ? 6 : 7;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set HPVGA2 index */</div><div class='add'>+	b43_phy_maskset(dev, B43_NPHY_C1_INITGAIN, ~B43_NPHY_C1_INITGAIN_HPVGA2,</div><div class='add'>+			code &lt;&lt; B43_NPHY_C1_INITGAIN_HPVGA2_SHIFT);</div><div class='add'>+	b43_phy_maskset(dev, B43_NPHY_C2_INITGAIN, ~B43_NPHY_C2_INITGAIN_HPVGA2,</div><div class='add'>+			code &lt;&lt; B43_NPHY_C2_INITGAIN_HPVGA2_SHIFT);</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x1D06);</div><div class='add'>+	/* specs say about 2 loops, but wl does 4 */</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_TABLE_DATALO, (code &lt;&lt; 8 | 0x7C));</div><div class='add'>+</div><div class='add'>+	b43_nphy_adjust_lna_gain_table(dev);</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;elna_gain_config) {</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x0808);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x0);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x1);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x1);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x1);</div><div class='add'>+</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x0C08);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x0);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x1);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x1);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x1);</div><div class='add'>+</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x1D06);</div><div class='add'>+		/* specs say about 2 loops, but wl does 4 */</div><div class='add'>+		for (i = 0; i &lt; 4; i++)</div><div class='add'>+			b43_phy_write(dev, B43_NPHY_TABLE_DATALO,</div><div class='add'>+						(code &lt;&lt; 8 | 0x74));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phy.rev == 2) {</div><div class='add'>+		for (i = 0; i &lt; 4; i++) {</div><div class='add'>+			b43_phy_write(dev, B43_NPHY_TABLE_ADDR,</div><div class='add'>+					(0x0400 * i) + 0x0020);</div><div class='add'>+			for (j = 0; j &lt; 21; j++) {</div><div class='add'>+				tmp = j * (i &lt; 2 ? 3 : 1);</div><div class='add'>+				b43_phy_write(dev,</div><div class='add'>+					B43_NPHY_TABLE_DATALO, tmp);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	b43_nphy_set_rf_sequence(dev, 5, rfseq_events, rfseq_delays, 3);</div><div class='add'>+	b43_phy_maskset(dev, B43_NPHY_OVER_DGAIN1,</div><div class='add'>+		~B43_NPHY_OVER_DGAIN_CCKDGECV &amp; 0xFFFF,</div><div class='add'>+		0x5A &lt;&lt; B43_NPHY_OVER_DGAIN_CCKDGECV_SHIFT);</div><div class='add'>+</div><div class='add'>+	if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ)</div><div class='add'>+		b43_phy_maskset(dev, B43_PHY_N(0xC5D), 0xFF80, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/WorkaroundsGainCtrl */</div><div class='add'>+static void b43_nphy_gain_ctl_workarounds(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;phy.rev &gt;= 3)</div><div class='add'>+		b43_nphy_gain_ctl_workarounds_rev3plus(dev);</div><div class='add'>+	else</div><div class='add'>+		b43_nphy_gain_ctl_workarounds_rev1_2(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='add'>+	struct ssb_sprom *sprom = dev-&gt;dev-&gt;bus_sprom;</div><div class='add'>+</div><div class='add'>+	/* TX to RX */</div><div class='add'>+	u8 tx2rx_events[8] = { 0x4, 0x3, 0x6, 0x5, 0x2, 0x1, 0x8, 0x1F };</div><div class='add'>+	u8 tx2rx_delays[8] = { 8, 4, 2, 2, 4, 4, 6, 1 };</div><div class='add'>+	/* RX to TX */</div><div class='add'>+	u8 rx2tx_events_ipa[9] = { 0x0, 0x1, 0x2, 0x8, 0x5, 0x6, 0xF, 0x3,</div><div class='add'>+					0x1F };</div><div class='add'>+	u8 rx2tx_delays_ipa[9] = { 8, 6, 6, 4, 4, 16, 43, 1, 1 };</div><div class='add'>+	u8 rx2tx_events[9] = { 0x0, 0x1, 0x2, 0x8, 0x5, 0x6, 0x3, 0x4, 0x1F };</div><div class='add'>+	u8 rx2tx_delays[9] = { 8, 6, 6, 4, 4, 18, 42, 1, 1 };</div><div class='add'>+</div><div class='add'>+	u16 tmp16;</div><div class='add'>+	u32 tmp32;</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, 0x23f, 0x1f8);</div><div class='add'>+	b43_phy_write(dev, 0x240, 0x1f8);</div><div class='add'>+</div><div class='add'>+	tmp32 = b43_ntab_read(dev, B43_NTAB32(30, 0));</div><div class='add'>+	tmp32 &amp;= 0xffffff;</div><div class='add'>+	b43_ntab_write(dev, B43_NTAB32(30, 0), tmp32);</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_PHASETR_A0, 0x0125);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_PHASETR_A1, 0x01B3);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_PHASETR_A2, 0x0105);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_PHASETR_B0, 0x016E);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_PHASETR_B1, 0x00CD);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_PHASETR_B2, 0x0020);</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_C2_CLIP1_MEDGAIN, 0x000C);</div><div class='add'>+	b43_phy_write(dev, 0x2AE, 0x000C);</div><div class='add'>+</div><div class='add'>+	/* TX to RX */</div><div class='add'>+	b43_nphy_set_rf_sequence(dev, 1, tx2rx_events, tx2rx_delays,</div><div class='add'>+				 ARRAY_SIZE(tx2rx_events));</div><div class='add'>+</div><div class='add'>+	/* RX to TX */</div><div class='add'>+	if (b43_nphy_ipa(dev))</div><div class='add'>+		b43_nphy_set_rf_sequence(dev, 0, rx2tx_events_ipa,</div><div class='add'>+				rx2tx_delays_ipa, ARRAY_SIZE(rx2tx_events_ipa));</div><div class='add'>+	if (nphy-&gt;hw_phyrxchain != 3 &amp;&amp;</div><div class='add'>+	    nphy-&gt;hw_phyrxchain != nphy-&gt;hw_phytxchain) {</div><div class='add'>+		if (b43_nphy_ipa(dev)) {</div><div class='add'>+			rx2tx_delays[5] = 59;</div><div class='add'>+			rx2tx_delays[6] = 1;</div><div class='add'>+			rx2tx_events[7] = 0x1F;</div><div class='add'>+		}</div><div class='add'>+		b43_nphy_set_rf_sequence(dev, 1, rx2tx_events, rx2tx_delays,</div><div class='add'>+					 ARRAY_SIZE(rx2tx_events));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmp16 = (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ) ?</div><div class='add'>+		0x2 : 0x9C40;</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_ENDROP_TLEN, tmp16);</div><div class='add'>+</div><div class='add'>+	b43_phy_maskset(dev, 0x294, 0xF0FF, 0x0700);</div><div class='add'>+</div><div class='add'>+	b43_ntab_write(dev, B43_NTAB32(16, 3), 0x18D);</div><div class='add'>+	b43_ntab_write(dev, B43_NTAB32(16, 127), 0x18D);</div><div class='add'>+</div><div class='add'>+	b43_nphy_gain_ctl_workarounds(dev);</div><div class='add'>+</div><div class='add'>+	b43_ntab_write(dev, B43_NTAB16(8, 0), 2);</div><div class='add'>+	b43_ntab_write(dev, B43_NTAB16(8, 16), 2);</div><div class='add'>+</div><div class='add'>+	/* TODO */</div><div class='add'>+</div><div class='add'>+	b43_radio_write(dev, B2056_RX0 | B2056_RX_MIXA_MAST_BIAS, 0x00);</div><div class='add'>+	b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXA_MAST_BIAS, 0x00);</div><div class='add'>+	b43_radio_write(dev, B2056_RX0 | B2056_RX_MIXA_BIAS_MAIN, 0x06);</div><div class='add'>+	b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXA_BIAS_MAIN, 0x06);</div><div class='add'>+	b43_radio_write(dev, B2056_RX0 | B2056_RX_MIXA_BIAS_AUX, 0x07);</div><div class='add'>+	b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXA_BIAS_AUX, 0x07);</div><div class='add'>+	b43_radio_write(dev, B2056_RX0 | B2056_RX_MIXA_LOB_BIAS, 0x88);</div><div class='add'>+	b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXA_LOB_BIAS, 0x88);</div><div class='add'>+	b43_radio_write(dev, B2056_RX0 | B2056_RX_MIXA_CMFB_IDAC, 0x00);</div><div class='add'>+	b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXA_CMFB_IDAC, 0x00);</div><div class='add'>+	b43_radio_write(dev, B2056_RX0 | B2056_RX_MIXG_CMFB_IDAC, 0x00);</div><div class='add'>+	b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXG_CMFB_IDAC, 0x00);</div><div class='add'>+</div><div class='add'>+	/* N PHY WAR TX Chain Update with hw_phytxchain as argument */</div><div class='add'>+</div><div class='add'>+	if ((sprom-&gt;boardflags2_lo &amp; B43_BFL2_APLL_WAR &amp;&amp;</div><div class='add'>+	     b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ) ||</div><div class='add'>+	    (sprom-&gt;boardflags2_lo &amp; B43_BFL2_GPLL_WAR &amp;&amp;</div><div class='add'>+	     b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ))</div><div class='add'>+		tmp32 = 0x00088888;</div><div class='add'>+	else</div><div class='add'>+		tmp32 = 0x88888888;</div><div class='add'>+	b43_ntab_write(dev, B43_NTAB32(30, 1), tmp32);</div><div class='add'>+	b43_ntab_write(dev, B43_NTAB32(30, 2), tmp32);</div><div class='add'>+	b43_ntab_write(dev, B43_NTAB32(30, 3), tmp32);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phy.rev == 4 &amp;&amp;</div><div class='add'>+		b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ) {</div><div class='add'>+		b43_radio_write(dev, B2056_TX0 | B2056_TX_GMBB_IDAC,</div><div class='add'>+				0x70);</div><div class='add'>+		b43_radio_write(dev, B2056_TX1 | B2056_TX_GMBB_IDAC,</div><div class='add'>+				0x70);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, 0x224, 0x03eb);</div><div class='add'>+	b43_phy_write(dev, 0x225, 0x03eb);</div><div class='add'>+	b43_phy_write(dev, 0x226, 0x0341);</div><div class='add'>+	b43_phy_write(dev, 0x227, 0x0341);</div><div class='add'>+	b43_phy_write(dev, 0x228, 0x042b);</div><div class='add'>+	b43_phy_write(dev, 0x229, 0x042b);</div><div class='add'>+	b43_phy_write(dev, 0x22a, 0x0381);</div><div class='add'>+	b43_phy_write(dev, 0x22b, 0x0381);</div><div class='add'>+	b43_phy_write(dev, 0x22c, 0x042b);</div><div class='add'>+	b43_phy_write(dev, 0x22d, 0x042b);</div><div class='add'>+	b43_phy_write(dev, 0x22e, 0x0381);</div><div class='add'>+	b43_phy_write(dev, 0x22f, 0x0381);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_nphy_workarounds_rev1_2(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct ssb_sprom *sprom = dev-&gt;dev-&gt;bus_sprom;</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_n *nphy = phy-&gt;n;</div><div class='add'>+</div><div class='add'>+	u8 events1[7] = { 0x0, 0x1, 0x2, 0x8, 0x4, 0x5, 0x3 };</div><div class='add'>+	u8 delays1[7] = { 0x8, 0x6, 0x6, 0x2, 0x4, 0x3C, 0x1 };</div><div class='add'>+</div><div class='add'>+	u8 events2[7] = { 0x0, 0x3, 0x5, 0x4, 0x2, 0x1, 0x8 };</div><div class='add'>+	u8 delays2[7] = { 0x8, 0x6, 0x2, 0x4, 0x4, 0x6, 0x1 };</div><div class='add'>+</div><div class='add'>+	if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ &amp;&amp;</div><div class='add'>+	    nphy-&gt;band5g_pwrgain) {</div><div class='add'>+		b43_radio_mask(dev, B2055_C1_TX_RF_SPARE, ~0x8);</div><div class='add'>+		b43_radio_mask(dev, B2055_C2_TX_RF_SPARE, ~0x8);</div><div class='add'>+	} else {</div><div class='add'>+		b43_radio_set(dev, B2055_C1_TX_RF_SPARE, 0x8);</div><div class='add'>+		b43_radio_set(dev, B2055_C2_TX_RF_SPARE, 0x8);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	b43_ntab_write(dev, B43_NTAB16(8, 0x00), 0x000A);</div><div class='add'>+	b43_ntab_write(dev, B43_NTAB16(8, 0x10), 0x000A);</div><div class='add'>+	b43_ntab_write(dev, B43_NTAB16(8, 0x02), 0xCDAA);</div><div class='add'>+	b43_ntab_write(dev, B43_NTAB16(8, 0x12), 0xCDAA);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phy.rev &lt; 2) {</div><div class='add'>+		b43_ntab_write(dev, B43_NTAB16(8, 0x08), 0x0000);</div><div class='add'>+		b43_ntab_write(dev, B43_NTAB16(8, 0x18), 0x0000);</div><div class='add'>+		b43_ntab_write(dev, B43_NTAB16(8, 0x07), 0x7AAB);</div><div class='add'>+		b43_ntab_write(dev, B43_NTAB16(8, 0x17), 0x7AAB);</div><div class='add'>+		b43_ntab_write(dev, B43_NTAB16(8, 0x06), 0x0800);</div><div class='add'>+		b43_ntab_write(dev, B43_NTAB16(8, 0x16), 0x0800);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_LO1, 0x2D8);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_UP1, 0x301);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_LO2, 0x2D8);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_UP2, 0x301);</div><div class='add'>+</div><div class='add'>+	if (sprom-&gt;boardflags2_lo &amp; B43_BFL2_SKWRKFEM_BRD &amp;&amp;</div><div class='add'>+	    dev-&gt;dev-&gt;board_type == 0x8B) {</div><div class='add'>+		delays1[0] = 0x1;</div><div class='add'>+		delays1[5] = 0x14;</div><div class='add'>+	}</div><div class='add'>+	b43_nphy_set_rf_sequence(dev, 0, events1, delays1, 7);</div><div class='add'>+	b43_nphy_set_rf_sequence(dev, 1, events2, delays2, 7);</div><div class='add'>+</div><div class='add'>+	b43_nphy_gain_ctl_workarounds(dev);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phy.rev &lt; 2) {</div><div class='add'>+		if (b43_phy_read(dev, B43_NPHY_RXCTL) &amp; 0x2)</div><div class='add'>+			b43_hf_write(dev, b43_hf_read(dev) |</div><div class='add'>+					B43_HF_MLADVW);</div><div class='add'>+	} else if (dev-&gt;phy.rev == 2) {</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_CRSCHECK2, 0);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_CRSCHECK3, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phy.rev &lt; 2)</div><div class='add'>+		b43_phy_mask(dev, B43_NPHY_SCRAM_SIGCTL,</div><div class='add'>+				~B43_NPHY_SCRAM_SIGCTL_SCM);</div><div class='add'>+</div><div class='add'>+	/* Set phase track alpha and beta */</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_PHASETR_A0, 0x125);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_PHASETR_A1, 0x1B3);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_PHASETR_A2, 0x105);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_PHASETR_B0, 0x16E);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_PHASETR_B1, 0xCD);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_PHASETR_B2, 0x20);</div><div class='add'>+</div><div class='add'>+	b43_phy_mask(dev, B43_NPHY_PIL_DW1,</div><div class='add'>+			~B43_NPHY_PIL_DW_64QAM &amp; 0xFFFF);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_TXF_20CO_S2B1, 0xB5);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_TXF_20CO_S2B2, 0xA4);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_TXF_20CO_S2B3, 0x00);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phy.rev == 2)</div><div class='add'>+		b43_phy_set(dev, B43_NPHY_FINERX2_CGC,</div><div class='add'>+				B43_NPHY_FINERX2_CGC_DECGC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/Workarounds */</div><div class='add'>+static void b43_nphy_workarounds(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_n *nphy = phy-&gt;n;</div><div class='add'>+</div><div class='add'>+	if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ)</div><div class='add'>+		b43_nphy_classifier(dev, 1, 0);</div><div class='add'>+	else</div><div class='add'>+		b43_nphy_classifier(dev, 1, 1);</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;hang_avoid)</div><div class='add'>+		b43_nphy_stay_in_carrier_search(dev, 1);</div><div class='add'>+</div><div class='add'>+	b43_phy_set(dev, B43_NPHY_IQFLIP,</div><div class='add'>+		    B43_NPHY_IQFLIP_ADC1 | B43_NPHY_IQFLIP_ADC2);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phy.rev &gt;= 3)</div><div class='add'>+		b43_nphy_workarounds_rev3plus(dev);</div><div class='add'>+	else</div><div class='add'>+		b43_nphy_workarounds_rev1_2(dev);</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;hang_avoid)</div><div class='add'>+		b43_nphy_stay_in_carrier_search(dev, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**************************************************</div><div class='add'>+ * Tx/Rx common</div><div class='add'>+ **************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Transmits a known value for LO calibration</div><div class='add'>+ * http://bcm-v4.sipsolutions.net/802.11/PHY/N/TXTone</div><div class='add'>+ */</div><div class='add'>+static int b43_nphy_tx_tone(struct b43_wldev *dev, u32 freq, u16 max_val,</div><div class='add'>+				bool iqmode, bool dac_test)</div><div class='add'>+{</div><div class='add'>+	u16 samp = b43_nphy_gen_load_samples(dev, freq, max_val, dac_test);</div><div class='add'>+	if (samp == 0)</div><div class='add'>+		return -1;</div><div class='add'>+	b43_nphy_run_samples(dev, samp, 0xFFFF, 0, iqmode, dac_test);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/Chains */</div><div class='add'>+static void b43_nphy_update_txrx_chain(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='add'>+</div><div class='add'>+	bool override = false;</div><div class='add'>+	u16 chain = 0x33;</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;txrx_chain == 0) {</div><div class='add'>+		chain = 0x11;</div><div class='add'>+		override = true;</div><div class='add'>+	} else if (nphy-&gt;txrx_chain == 1) {</div><div class='add'>+		chain = 0x22;</div><div class='add'>+		override = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	b43_phy_maskset(dev, B43_NPHY_RFSEQCA,</div><div class='add'>+			~(B43_NPHY_RFSEQCA_TXEN | B43_NPHY_RFSEQCA_RXEN),</div><div class='add'>+			chain);</div><div class='add'>+</div><div class='add'>+	if (override)</div><div class='add'>+		b43_phy_set(dev, B43_NPHY_RFSEQMODE,</div><div class='add'>+				B43_NPHY_RFSEQMODE_CAOVER);</div><div class='add'>+	else</div><div class='add'>+		b43_phy_mask(dev, B43_NPHY_RFSEQMODE,</div><div class='add'>+				~B43_NPHY_RFSEQMODE_CAOVER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/stop-playback */</div><div class='add'>+static void b43_nphy_stop_playback(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='add'>+	u16 tmp;</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;hang_avoid)</div><div class='add'>+		b43_nphy_stay_in_carrier_search(dev, 1);</div><div class='add'>+</div><div class='add'>+	tmp = b43_phy_read(dev, B43_NPHY_SAMP_STAT);</div><div class='add'>+	if (tmp &amp; 0x1)</div><div class='add'>+		b43_phy_set(dev, B43_NPHY_SAMP_CMD, B43_NPHY_SAMP_CMD_STOP);</div><div class='add'>+	else if (tmp &amp; 0x2)</div><div class='add'>+		b43_phy_mask(dev, B43_NPHY_IQLOCAL_CMDGCTL, 0x7FFF);</div><div class='add'>+</div><div class='add'>+	b43_phy_mask(dev, B43_NPHY_SAMP_CMD, ~0x0004);</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;bb_mult_save &amp; 0x80000000) {</div><div class='add'>+		tmp = nphy-&gt;bb_mult_save &amp; 0xFFFF;</div><div class='add'>+		b43_ntab_write(dev, B43_NTAB16(15, 87), tmp);</div><div class='add'>+		nphy-&gt;bb_mult_save = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;hang_avoid)</div><div class='add'>+		b43_nphy_stay_in_carrier_search(dev, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/IqCalGainParams */</div><div class='add'>+static void b43_nphy_iq_cal_gain_params(struct b43_wldev *dev, u16 core,</div><div class='add'>+					struct nphy_txgains target,</div><div class='add'>+					struct nphy_iqcal_params *params)</div><div class='add'>+{</div><div class='add'>+	int i, j, indx;</div><div class='add'>+	u16 gain;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phy.rev &gt;= 3) {</div><div class='add'>+		params-&gt;txgm = target.txgm[core];</div><div class='add'>+		params-&gt;pga = target.pga[core];</div><div class='add'>+		params-&gt;pad = target.pad[core];</div><div class='add'>+		params-&gt;ipa = target.ipa[core];</div><div class='add'>+		params-&gt;cal_gain = (params-&gt;txgm &lt;&lt; 12) | (params-&gt;pga &lt;&lt; 8) |</div><div class='add'>+					(params-&gt;pad &lt;&lt; 4) | (params-&gt;ipa);</div><div class='add'>+		for (j = 0; j &lt; 5; j++)</div><div class='add'>+			params-&gt;ncorr[j] = 0x79;</div><div class='add'>+	} else {</div><div class='add'>+		gain = (target.pad[core]) | (target.pga[core] &lt;&lt; 4) |</div><div class='add'>+			(target.txgm[core] &lt;&lt; 8);</div><div class='add'>+</div><div class='add'>+		indx = (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ) ?</div><div class='add'>+			1 : 0;</div><div class='add'>+		for (i = 0; i &lt; 9; i++)</div><div class='add'>+			if (tbl_iqcal_gainparams[indx][i][0] == gain)</div><div class='add'>+				break;</div><div class='add'>+		i = min(i, 8);</div><div class='add'>+</div><div class='add'>+		params-&gt;txgm = tbl_iqcal_gainparams[indx][i][1];</div><div class='add'>+		params-&gt;pga = tbl_iqcal_gainparams[indx][i][2];</div><div class='add'>+		params-&gt;pad = tbl_iqcal_gainparams[indx][i][3];</div><div class='add'>+		params-&gt;cal_gain = (params-&gt;txgm &lt;&lt; 7) | (params-&gt;pga &lt;&lt; 4) |</div><div class='add'>+					(params-&gt;pad &lt;&lt; 2);</div><div class='add'>+		for (j = 0; j &lt; 4; j++)</div><div class='add'>+			params-&gt;ncorr[j] = tbl_iqcal_gainparams[indx][i][4 + j];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**************************************************</div><div class='add'>+ * Tx and Rx</div><div class='add'>+ **************************************************/</div><div class='add'>+</div><div class='add'>+void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna)</div><div class='add'>+{//TODO</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_nphy_op_adjust_txpower(struct b43_wldev *dev)</div><div class='add'>+{//TODO</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum b43_txpwr_result b43_nphy_op_recalc_txpower(struct b43_wldev *dev,</div><div class='add'>+							bool ignore_tssi)</div><div class='add'>+{//TODO</div><div class='add'>+	return B43_TXPWR_RES_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxPwrCtrlEnable */</div><div class='add'>+static void b43_nphy_tx_power_ctrl(struct b43_wldev *dev, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='add'>+	u8 i;</div><div class='add'>+	u16 bmask, val, tmp;</div><div class='add'>+	enum ieee80211_band band = b43_current_band(dev-&gt;wl);</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;hang_avoid)</div><div class='add'>+		b43_nphy_stay_in_carrier_search(dev, 1);</div><div class='add'>+</div><div class='add'>+	nphy-&gt;txpwrctrl = enable;</div><div class='add'>+	if (!enable) {</div><div class='add'>+		if (dev-&gt;phy.rev &gt;= 3 &amp;&amp;</div><div class='add'>+		    (b43_phy_read(dev, B43_NPHY_TXPCTL_CMD) &amp;</div><div class='add'>+		     (B43_NPHY_TXPCTL_CMD_COEFF |</div><div class='add'>+		      B43_NPHY_TXPCTL_CMD_HWPCTLEN |</div><div class='add'>+		      B43_NPHY_TXPCTL_CMD_PCTLEN))) {</div><div class='add'>+			/* We disable enabled TX pwr ctl, save it's state */</div><div class='add'>+			nphy-&gt;tx_pwr_idx[0] = b43_phy_read(dev,</div><div class='add'>+						B43_NPHY_C1_TXPCTL_STAT) &amp; 0x7f;</div><div class='add'>+			nphy-&gt;tx_pwr_idx[1] = b43_phy_read(dev,</div><div class='add'>+						B43_NPHY_C2_TXPCTL_STAT) &amp; 0x7f;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x6840);</div><div class='add'>+		for (i = 0; i &lt; 84; i++)</div><div class='add'>+			b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0);</div><div class='add'>+</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x6C40);</div><div class='add'>+		for (i = 0; i &lt; 84; i++)</div><div class='add'>+			b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0);</div><div class='add'>+</div><div class='add'>+		tmp = B43_NPHY_TXPCTL_CMD_COEFF | B43_NPHY_TXPCTL_CMD_HWPCTLEN;</div><div class='add'>+		if (dev-&gt;phy.rev &gt;= 3)</div><div class='add'>+			tmp |= B43_NPHY_TXPCTL_CMD_PCTLEN;</div><div class='add'>+		b43_phy_mask(dev, B43_NPHY_TXPCTL_CMD, ~tmp);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;phy.rev &gt;= 3) {</div><div class='add'>+			b43_phy_set(dev, B43_NPHY_AFECTL_OVER1, 0x0100);</div><div class='add'>+			b43_phy_set(dev, B43_NPHY_AFECTL_OVER, 0x0100);</div><div class='add'>+		} else {</div><div class='add'>+			b43_phy_set(dev, B43_NPHY_AFECTL_OVER, 0x4000);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;phy.rev == 2)</div><div class='add'>+			b43_phy_maskset(dev, B43_NPHY_BPHY_CTL3,</div><div class='add'>+				~B43_NPHY_BPHY_CTL3_SCALE, 0x53);</div><div class='add'>+		else if (dev-&gt;phy.rev &lt; 2)</div><div class='add'>+			b43_phy_maskset(dev, B43_NPHY_BPHY_CTL3,</div><div class='add'>+				~B43_NPHY_BPHY_CTL3_SCALE, 0x5A);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;phy.rev &lt; 2 &amp;&amp; dev-&gt;phy.is_40mhz)</div><div class='add'>+			b43_hf_write(dev, b43_hf_read(dev) | B43_HF_TSSIRPSMW);</div><div class='add'>+	} else {</div><div class='add'>+		b43_ntab_write_bulk(dev, B43_NTAB16(26, 64), 84,</div><div class='add'>+				    nphy-&gt;adj_pwr_tbl);</div><div class='add'>+		b43_ntab_write_bulk(dev, B43_NTAB16(27, 64), 84,</div><div class='add'>+				    nphy-&gt;adj_pwr_tbl);</div><div class='add'>+</div><div class='add'>+		bmask = B43_NPHY_TXPCTL_CMD_COEFF |</div><div class='add'>+			B43_NPHY_TXPCTL_CMD_HWPCTLEN;</div><div class='add'>+		/* wl does useless check for "enable" param here */</div><div class='add'>+		val = B43_NPHY_TXPCTL_CMD_COEFF | B43_NPHY_TXPCTL_CMD_HWPCTLEN;</div><div class='add'>+		if (dev-&gt;phy.rev &gt;= 3) {</div><div class='add'>+			bmask |= B43_NPHY_TXPCTL_CMD_PCTLEN;</div><div class='add'>+			if (val)</div><div class='add'>+				val |= B43_NPHY_TXPCTL_CMD_PCTLEN;</div><div class='add'>+		}</div><div class='add'>+		b43_phy_maskset(dev, B43_NPHY_TXPCTL_CMD, ~(bmask), val);</div><div class='add'>+</div><div class='add'>+		if (band == IEEE80211_BAND_5GHZ) {</div><div class='add'>+			b43_phy_maskset(dev, B43_NPHY_TXPCTL_CMD,</div><div class='add'>+					~B43_NPHY_TXPCTL_CMD_INIT, 0x64);</div><div class='add'>+			if (dev-&gt;phy.rev &gt; 1)</div><div class='add'>+				b43_phy_maskset(dev, B43_NPHY_TXPCTL_INIT,</div><div class='add'>+						~B43_NPHY_TXPCTL_INIT_PIDXI1,</div><div class='add'>+						0x64);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;phy.rev &gt;= 3) {</div><div class='add'>+			if (nphy-&gt;tx_pwr_idx[0] != 128 &amp;&amp;</div><div class='add'>+			    nphy-&gt;tx_pwr_idx[1] != 128) {</div><div class='add'>+				/* Recover TX pwr ctl state */</div><div class='add'>+				b43_phy_maskset(dev, B43_NPHY_TXPCTL_CMD,</div><div class='add'>+						~B43_NPHY_TXPCTL_CMD_INIT,</div><div class='add'>+						nphy-&gt;tx_pwr_idx[0]);</div><div class='add'>+				if (dev-&gt;phy.rev &gt; 1)</div><div class='add'>+					b43_phy_maskset(dev,</div><div class='add'>+						B43_NPHY_TXPCTL_INIT,</div><div class='add'>+						~0xff, nphy-&gt;tx_pwr_idx[1]);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;phy.rev &gt;= 3) {</div><div class='add'>+			b43_phy_mask(dev, B43_NPHY_AFECTL_OVER1, ~0x100);</div><div class='add'>+			b43_phy_mask(dev, B43_NPHY_AFECTL_OVER, ~0x100);</div><div class='add'>+		} else {</div><div class='add'>+			b43_phy_mask(dev, B43_NPHY_AFECTL_OVER, ~0x4000);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;phy.rev == 2)</div><div class='add'>+			b43_phy_maskset(dev, B43_NPHY_BPHY_CTL3, ~0xFF, 0x3b);</div><div class='add'>+		else if (dev-&gt;phy.rev &lt; 2)</div><div class='add'>+			b43_phy_maskset(dev, B43_NPHY_BPHY_CTL3, ~0xFF, 0x40);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;phy.rev &lt; 2 &amp;&amp; dev-&gt;phy.is_40mhz)</div><div class='add'>+			b43_hf_write(dev, b43_hf_read(dev) &amp; ~B43_HF_TSSIRPSMW);</div><div class='add'>+</div><div class='add'>+		if (b43_nphy_ipa(dev)) {</div><div class='add'>+			b43_phy_mask(dev, B43_NPHY_PAPD_EN0, ~0x4);</div><div class='add'>+			b43_phy_mask(dev, B43_NPHY_PAPD_EN1, ~0x4);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;hang_avoid)</div><div class='add'>+		b43_nphy_stay_in_carrier_search(dev, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxPwrFix */</div><div class='add'>+static void b43_nphy_tx_power_fix(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='add'>+	struct ssb_sprom *sprom = dev-&gt;dev-&gt;bus_sprom;</div><div class='add'>+</div><div class='add'>+	u8 txpi[2], bbmult, i;</div><div class='add'>+	u16 tmp, radio_gain, dac_gain;</div><div class='add'>+	u16 freq = dev-&gt;phy.channel_freq;</div><div class='add'>+	u32 txgain;</div><div class='add'>+	/* u32 gaintbl; rev3+ */</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;hang_avoid)</div><div class='add'>+		b43_nphy_stay_in_carrier_search(dev, 1);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phy.rev &gt;= 7) {</div><div class='add'>+		txpi[0] = txpi[1] = 30;</div><div class='add'>+	} else if (dev-&gt;phy.rev &gt;= 3) {</div><div class='add'>+		txpi[0] = 40;</div><div class='add'>+		txpi[1] = 40;</div><div class='add'>+	} else if (sprom-&gt;revision &lt; 4) {</div><div class='add'>+		txpi[0] = 72;</div><div class='add'>+		txpi[1] = 72;</div><div class='add'>+	} else {</div><div class='add'>+		if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ) {</div><div class='add'>+			txpi[0] = sprom-&gt;txpid2g[0];</div><div class='add'>+			txpi[1] = sprom-&gt;txpid2g[1];</div><div class='add'>+		} else if (freq &gt;= 4900 &amp;&amp; freq &lt; 5100) {</div><div class='add'>+			txpi[0] = sprom-&gt;txpid5gl[0];</div><div class='add'>+			txpi[1] = sprom-&gt;txpid5gl[1];</div><div class='add'>+		} else if (freq &gt;= 5100 &amp;&amp; freq &lt; 5500) {</div><div class='add'>+			txpi[0] = sprom-&gt;txpid5g[0];</div><div class='add'>+			txpi[1] = sprom-&gt;txpid5g[1];</div><div class='add'>+		} else if (freq &gt;= 5500) {</div><div class='add'>+			txpi[0] = sprom-&gt;txpid5gh[0];</div><div class='add'>+			txpi[1] = sprom-&gt;txpid5gh[1];</div><div class='add'>+		} else {</div><div class='add'>+			txpi[0] = 91;</div><div class='add'>+			txpi[1] = 91;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (dev-&gt;phy.rev &lt; 7 &amp;&amp;</div><div class='add'>+	    (txpi[0] &lt; 40 || txpi[0] &gt; 100 || txpi[1] &lt; 40 || txpi[1] &gt; 100))</div><div class='add'>+		txpi[0] = txpi[1] = 91;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		nphy-&gt;txpwrindex[i].index_internal = txpi[i];</div><div class='add'>+		nphy-&gt;txpwrindex[i].index_internal_save = txpi[i];</div><div class='add'>+	}</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		if (dev-&gt;phy.rev &gt;= 3) {</div><div class='add'>+			if (b43_nphy_ipa(dev)) {</div><div class='add'>+				txgain = *(b43_nphy_get_ipa_gain_table(dev) +</div><div class='add'>+						txpi[i]);</div><div class='add'>+			} else if (b43_current_band(dev-&gt;wl) ==</div><div class='add'>+				   IEEE80211_BAND_5GHZ) {</div><div class='add'>+				/* FIXME: use 5GHz tables */</div><div class='add'>+				txgain =</div><div class='add'>+					b43_ntab_tx_gain_rev3plus_2ghz[txpi[i]];</div><div class='add'>+			} else {</div><div class='add'>+				if (dev-&gt;phy.rev &gt;= 5 &amp;&amp;</div><div class='add'>+				    sprom-&gt;fem.ghz5.extpa_gain == 3)</div><div class='add'>+					; /* FIXME: 5GHz_txgain_HiPwrEPA */</div><div class='add'>+				txgain =</div><div class='add'>+					b43_ntab_tx_gain_rev3plus_2ghz[txpi[i]];</div><div class='add'>+			}</div><div class='add'>+			radio_gain = (txgain &gt;&gt; 16) &amp; 0x1FFFF;</div><div class='add'>+		} else {</div><div class='add'>+			txgain = b43_ntab_tx_gain_rev0_1_2[txpi[i]];</div><div class='add'>+			radio_gain = (txgain &gt;&gt; 16) &amp; 0x1FFF;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;phy.rev &gt;= 7)</div><div class='add'>+			dac_gain = (txgain &gt;&gt; 8) &amp; 0x7;</div><div class='add'>+		else</div><div class='add'>+			dac_gain = (txgain &gt;&gt; 8) &amp; 0x3F;</div><div class='add'>+		bbmult = txgain &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;phy.rev &gt;= 3) {</div><div class='add'>+			if (i == 0)</div><div class='add'>+				b43_phy_set(dev, B43_NPHY_AFECTL_OVER1, 0x0100);</div><div class='add'>+			else</div><div class='add'>+				b43_phy_set(dev, B43_NPHY_AFECTL_OVER, 0x0100);</div><div class='add'>+		} else {</div><div class='add'>+			b43_phy_set(dev, B43_NPHY_AFECTL_OVER, 0x4000);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i == 0)</div><div class='add'>+			b43_phy_write(dev, B43_NPHY_AFECTL_DACGAIN1, dac_gain);</div><div class='add'>+		else</div><div class='add'>+			b43_phy_write(dev, B43_NPHY_AFECTL_DACGAIN2, dac_gain);</div><div class='add'>+</div><div class='add'>+		b43_ntab_write(dev, B43_NTAB16(0x7, 0x110 + i), radio_gain);</div><div class='add'>+</div><div class='add'>+		tmp = b43_ntab_read(dev, B43_NTAB16(0xF, 0x57));</div><div class='add'>+		if (i == 0)</div><div class='add'>+			tmp = (tmp &amp; 0x00FF) | (bbmult &lt;&lt; 8);</div><div class='add'>+		else</div><div class='add'>+			tmp = (tmp &amp; 0xFF00) | bbmult;</div><div class='add'>+		b43_ntab_write(dev, B43_NTAB16(0xF, 0x57), tmp);</div><div class='add'>+</div><div class='add'>+		if (b43_nphy_ipa(dev)) {</div><div class='add'>+			u32 tmp32;</div><div class='add'>+			u16 reg = (i == 0) ?</div><div class='add'>+				B43_NPHY_PAPD_EN0 : B43_NPHY_PAPD_EN1;</div><div class='add'>+			tmp32 = b43_ntab_read(dev, B43_NTAB32(26 + i,</div><div class='add'>+							      576 + txpi[i]));</div><div class='add'>+			b43_phy_maskset(dev, reg, 0xE00F, (u32) tmp32 &lt;&lt; 4);</div><div class='add'>+			b43_phy_set(dev, reg, 0x4);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	b43_phy_mask(dev, B43_NPHY_BPHY_CTL2, ~B43_NPHY_BPHY_CTL2_LUT);</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;hang_avoid)</div><div class='add'>+		b43_nphy_stay_in_carrier_search(dev, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_nphy_ipa_internal_tssi_setup(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+</div><div class='add'>+	u8 core;</div><div class='add'>+	u16 r; /* routing */</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;rev &gt;= 7) {</div><div class='add'>+		for (core = 0; core &lt; 2; core++) {</div><div class='add'>+			r = core ? 0x190 : 0x170;</div><div class='add'>+			if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ) {</div><div class='add'>+				b43_radio_write(dev, r + 0x5, 0x5);</div><div class='add'>+				b43_radio_write(dev, r + 0x9, 0xE);</div><div class='add'>+				if (phy-&gt;rev != 5)</div><div class='add'>+					b43_radio_write(dev, r + 0xA, 0);</div><div class='add'>+				if (phy-&gt;rev != 7)</div><div class='add'>+					b43_radio_write(dev, r + 0xB, 1);</div><div class='add'>+				else</div><div class='add'>+					b43_radio_write(dev, r + 0xB, 0x31);</div><div class='add'>+			} else {</div><div class='add'>+				b43_radio_write(dev, r + 0x5, 0x9);</div><div class='add'>+				b43_radio_write(dev, r + 0x9, 0xC);</div><div class='add'>+				b43_radio_write(dev, r + 0xB, 0x0);</div><div class='add'>+				if (phy-&gt;rev != 5)</div><div class='add'>+					b43_radio_write(dev, r + 0xA, 1);</div><div class='add'>+				else</div><div class='add'>+					b43_radio_write(dev, r + 0xA, 0x31);</div><div class='add'>+			}</div><div class='add'>+			b43_radio_write(dev, r + 0x6, 0);</div><div class='add'>+			b43_radio_write(dev, r + 0x7, 0);</div><div class='add'>+			b43_radio_write(dev, r + 0x8, 3);</div><div class='add'>+			b43_radio_write(dev, r + 0xC, 0);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ)</div><div class='add'>+			b43_radio_write(dev, B2056_SYN_RESERVED_ADDR31, 0x128);</div><div class='add'>+		else</div><div class='add'>+			b43_radio_write(dev, B2056_SYN_RESERVED_ADDR31, 0x80);</div><div class='add'>+		b43_radio_write(dev, B2056_SYN_RESERVED_ADDR30, 0);</div><div class='add'>+		b43_radio_write(dev, B2056_SYN_GPIO_MASTER1, 0x29);</div><div class='add'>+</div><div class='add'>+		for (core = 0; core &lt; 2; core++) {</div><div class='add'>+			r = core ? B2056_TX1 : B2056_TX0;</div><div class='add'>+</div><div class='add'>+			b43_radio_write(dev, r | B2056_TX_IQCAL_VCM_HG, 0);</div><div class='add'>+			b43_radio_write(dev, r | B2056_TX_IQCAL_IDAC, 0);</div><div class='add'>+			b43_radio_write(dev, r | B2056_TX_TSSI_VCM, 3);</div><div class='add'>+			b43_radio_write(dev, r | B2056_TX_TX_AMP_DET, 0);</div><div class='add'>+			b43_radio_write(dev, r | B2056_TX_TSSI_MISC1, 8);</div><div class='add'>+			b43_radio_write(dev, r | B2056_TX_TSSI_MISC2, 0);</div><div class='add'>+			b43_radio_write(dev, r | B2056_TX_TSSI_MISC3, 0);</div><div class='add'>+			if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ) {</div><div class='add'>+				b43_radio_write(dev, r | B2056_TX_TX_SSI_MASTER,</div><div class='add'>+						0x5);</div><div class='add'>+				if (phy-&gt;rev != 5)</div><div class='add'>+					b43_radio_write(dev, r | B2056_TX_TSSIA,</div><div class='add'>+							0x00);</div><div class='add'>+				if (phy-&gt;rev &gt;= 5)</div><div class='add'>+					b43_radio_write(dev, r | B2056_TX_TSSIG,</div><div class='add'>+							0x31);</div><div class='add'>+				else</div><div class='add'>+					b43_radio_write(dev, r | B2056_TX_TSSIG,</div><div class='add'>+							0x11);</div><div class='add'>+				b43_radio_write(dev, r | B2056_TX_TX_SSI_MUX,</div><div class='add'>+						0xE);</div><div class='add'>+			} else {</div><div class='add'>+				b43_radio_write(dev, r | B2056_TX_TX_SSI_MASTER,</div><div class='add'>+						0x9);</div><div class='add'>+				b43_radio_write(dev, r | B2056_TX_TSSIA, 0x31);</div><div class='add'>+				b43_radio_write(dev, r | B2056_TX_TSSIG, 0x0);</div><div class='add'>+				b43_radio_write(dev, r | B2056_TX_TX_SSI_MUX,</div><div class='add'>+						0xC);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Stop radio and transmit known signal. Then check received signal strength to</div><div class='add'>+ * get TSSI (Transmit Signal Strength Indicator).</div><div class='add'>+ * http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxPwrCtrlIdleTssi</div><div class='add'>+ */</div><div class='add'>+static void b43_nphy_tx_power_ctl_idle_tssi(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='add'>+</div><div class='add'>+	u32 tmp;</div><div class='add'>+	s32 rssi[4] = { };</div><div class='add'>+</div><div class='add'>+	/* TODO: check if we can transmit */</div><div class='add'>+</div><div class='add'>+	if (b43_nphy_ipa(dev))</div><div class='add'>+		b43_nphy_ipa_internal_tssi_setup(dev);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;rev &gt;= 7)</div><div class='add'>+		; /* TODO: Override Rev7 with 0x2000, 0, 3, 0, 0 as arguments */</div><div class='add'>+	else if (phy-&gt;rev &gt;= 3)</div><div class='add'>+		b43_nphy_rf_control_override(dev, 0x2000, 0, 3, false);</div><div class='add'>+</div><div class='add'>+	b43_nphy_stop_playback(dev);</div><div class='add'>+	b43_nphy_tx_tone(dev, 0xFA0, 0, false, false);</div><div class='add'>+	udelay(20);</div><div class='add'>+	tmp = b43_nphy_poll_rssi(dev, 4, rssi, 1);</div><div class='add'>+	b43_nphy_stop_playback(dev);</div><div class='add'>+	b43_nphy_rssi_select(dev, 0, 0);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;rev &gt;= 7)</div><div class='add'>+		; /* TODO: Override Rev7 with 0x2000, 0, 3, 1, 0 as arguments */</div><div class='add'>+	else if (phy-&gt;rev &gt;= 3)</div><div class='add'>+		b43_nphy_rf_control_override(dev, 0x2000, 0, 3, true);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;rev &gt;= 3) {</div><div class='add'>+		nphy-&gt;pwr_ctl_info[0].idle_tssi_5g = (tmp &gt;&gt; 24) &amp; 0xFF;</div><div class='add'>+		nphy-&gt;pwr_ctl_info[1].idle_tssi_5g = (tmp &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+	} else {</div><div class='add'>+		nphy-&gt;pwr_ctl_info[0].idle_tssi_5g = (tmp &gt;&gt; 16) &amp; 0xFF;</div><div class='add'>+		nphy-&gt;pwr_ctl_info[1].idle_tssi_5g = tmp &amp; 0xFF;</div><div class='add'>+	}</div><div class='add'>+	nphy-&gt;pwr_ctl_info[0].idle_tssi_2g = (tmp &gt;&gt; 24) &amp; 0xFF;</div><div class='add'>+	nphy-&gt;pwr_ctl_info[1].idle_tssi_2g = (tmp &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b43_nphy_tx_gain_table_upload(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='add'>+</div><div class='add'>+	const u32 *table = NULL;</div><div class='add'>+#if 0</div><div class='add'>+	TODO: b43_ntab_papd_pga_gain_delta_ipa_2*</div><div class='add'>+	u32 rfpwr_offset;</div><div class='add'>+	u8 pga_gain;</div><div class='add'>+	int i;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;rev &gt;= 3) {</div><div class='add'>+		if (b43_nphy_ipa(dev)) {</div><div class='add'>+			table = b43_nphy_get_ipa_gain_table(dev);</div><div class='add'>+		} else {</div><div class='add'>+			if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ) {</div><div class='add'>+				if (phy-&gt;rev == 3)</div><div class='add'>+					table = b43_ntab_tx_gain_rev3_5ghz;</div><div class='add'>+				if (phy-&gt;rev == 4)</div><div class='add'>+					table = b43_ntab_tx_gain_rev4_5ghz;</div><div class='add'>+				else</div><div class='add'>+					table = b43_ntab_tx_gain_rev5plus_5ghz;</div><div class='add'>+			} else {</div><div class='add'>+				table = b43_ntab_tx_gain_rev3plus_2ghz;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		table = b43_ntab_tx_gain_rev0_1_2;</div><div class='add'>+	}</div><div class='add'>+	b43_ntab_write_bulk(dev, B43_NTAB32(26, 192), 128, table);</div><div class='add'>+	b43_ntab_write_bulk(dev, B43_NTAB32(27, 192), 128, table);</div><div class='add'>+</div><div class='add'>+	if (phy-&gt;rev &gt;= 3) {</div><div class='add'>+#if 0</div><div class='add'>+		nphy-&gt;gmval = (table[0] &gt;&gt; 16) &amp; 0x7000;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 128; i++) {</div><div class='add'>+			pga_gain = (table[i] &gt;&gt; 24) &amp; 0xF;</div><div class='add'>+			if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ)</div><div class='add'>+				rfpwr_offset = b43_ntab_papd_pga_gain_delta_ipa_2g[pga_gain];</div><div class='add'>+			else</div><div class='add'>+				rfpwr_offset = b43_ntab_papd_pga_gain_delta_ipa_5g[pga_gain];</div><div class='add'>+			b43_ntab_write(dev, B43_NTAB32(26, 576 + i),</div><div class='add'>+				       rfpwr_offset);</div><div class='add'>+			b43_ntab_write(dev, B43_NTAB32(27, 576 + i),</div><div class='add'>+				       rfpwr_offset);</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/PA%20override */</div><div class='add'>+static void b43_nphy_pa_override(struct b43_wldev *dev, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='add'>+	enum ieee80211_band band;</div><div class='add'>+	u16 tmp;</div><div class='add'>+</div><div class='add'>+	if (!enable) {</div><div class='add'>+		nphy-&gt;rfctrl_intc1_save = b43_phy_read(dev,</div><div class='add'>+						       B43_NPHY_RFCTL_INTC1);</div><div class='add'>+		nphy-&gt;rfctrl_intc2_save = b43_phy_read(dev,</div><div class='add'>+						       B43_NPHY_RFCTL_INTC2);</div><div class='add'>+		band = b43_current_band(dev-&gt;wl);</div><div class='add'>+		if (dev-&gt;phy.rev &gt;= 3) {</div><div class='add'>+			if (band == IEEE80211_BAND_5GHZ)</div><div class='add'>+				tmp = 0x600;</div><div class='add'>+			else</div><div class='add'>+				tmp = 0x480;</div><div class='add'>+		} else {</div><div class='add'>+			if (band == IEEE80211_BAND_5GHZ)</div><div class='add'>+				tmp = 0x180;</div><div class='add'>+			else</div><div class='add'>+				tmp = 0x120;</div><div class='add'>+		}</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_RFCTL_INTC1, tmp);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_RFCTL_INTC2, tmp);</div><div class='add'>+	} else {</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_RFCTL_INTC1,</div><div class='add'>+				nphy-&gt;rfctrl_intc1_save);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_RFCTL_INTC2,</div><div class='add'>+				nphy-&gt;rfctrl_intc2_save);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxLpFbw */</div><div class='add'>+static void b43_nphy_tx_lp_fbw(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	u16 tmp;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phy.rev &gt;= 3) {</div><div class='add'>+		if (b43_nphy_ipa(dev)) {</div><div class='add'>+			tmp = 4;</div><div class='add'>+			b43_phy_write(dev, B43_NPHY_TXF_40CO_B32S2,</div><div class='add'>+			      (((((tmp &lt;&lt; 3) | tmp) &lt;&lt; 3) | tmp) &lt;&lt; 3) | tmp);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tmp = 1;</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_TXF_40CO_B1S2,</div><div class='add'>+			      (((((tmp &lt;&lt; 3) | tmp) &lt;&lt; 3) | tmp) &lt;&lt; 3) | tmp);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RxIqEst */</div><div class='add'>+static void b43_nphy_rx_iq_est(struct b43_wldev *dev, struct nphy_iq_est *est,</div><div class='add'>+				u16 samps, u8 time, bool wait)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u16 tmp;</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_IQEST_SAMCNT, samps);</div><div class='add'>+	b43_phy_maskset(dev, B43_NPHY_IQEST_WT, ~B43_NPHY_IQEST_WT_VAL, time);</div><div class='add'>+	if (wait)</div><div class='add'>+		b43_phy_set(dev, B43_NPHY_IQEST_CMD, B43_NPHY_IQEST_CMD_MODE);</div><div class='add'>+	else</div><div class='add'>+		b43_phy_mask(dev, B43_NPHY_IQEST_CMD, ~B43_NPHY_IQEST_CMD_MODE);</div><div class='add'>+</div><div class='add'>+	b43_phy_set(dev, B43_NPHY_IQEST_CMD, B43_NPHY_IQEST_CMD_START);</div><div class='add'>+</div><div class='add'>+	for (i = 1000; i; i--) {</div><div class='add'>+		tmp = b43_phy_read(dev, B43_NPHY_IQEST_CMD);</div><div class='add'>+		if (!(tmp &amp; B43_NPHY_IQEST_CMD_START)) {</div><div class='add'>+			est-&gt;i0_pwr = (b43_phy_read(dev, B43_NPHY_IQEST_IPACC_HI0) &lt;&lt; 16) |</div><div class='add'>+					b43_phy_read(dev, B43_NPHY_IQEST_IPACC_LO0);</div><div class='add'>+			est-&gt;q0_pwr = (b43_phy_read(dev, B43_NPHY_IQEST_QPACC_HI0) &lt;&lt; 16) |</div><div class='add'>+					b43_phy_read(dev, B43_NPHY_IQEST_QPACC_LO0);</div><div class='add'>+			est-&gt;iq0_prod = (b43_phy_read(dev, B43_NPHY_IQEST_IQACC_HI0) &lt;&lt; 16) |</div><div class='add'>+					b43_phy_read(dev, B43_NPHY_IQEST_IQACC_LO0);</div><div class='add'>+</div><div class='add'>+			est-&gt;i1_pwr = (b43_phy_read(dev, B43_NPHY_IQEST_IPACC_HI1) &lt;&lt; 16) |</div><div class='add'>+					b43_phy_read(dev, B43_NPHY_IQEST_IPACC_LO1);</div><div class='add'>+			est-&gt;q1_pwr = (b43_phy_read(dev, B43_NPHY_IQEST_QPACC_HI1) &lt;&lt; 16) |</div><div class='add'>+					b43_phy_read(dev, B43_NPHY_IQEST_QPACC_LO1);</div><div class='add'>+			est-&gt;iq1_prod = (b43_phy_read(dev, B43_NPHY_IQEST_IQACC_HI1) &lt;&lt; 16) |</div><div class='add'>+					b43_phy_read(dev, B43_NPHY_IQEST_IQACC_LO1);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+	memset(est, 0, sizeof(*est));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RxIqCoeffs */</div><div class='add'>+static void b43_nphy_rx_iq_coeffs(struct b43_wldev *dev, bool write,</div><div class='add'>+					struct b43_phy_n_iq_comp *pcomp)</div><div class='add'>+{</div><div class='add'>+	if (write) {</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_C1_RXIQ_COMPA0, pcomp-&gt;a0);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_C1_RXIQ_COMPB0, pcomp-&gt;b0);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_C2_RXIQ_COMPA1, pcomp-&gt;a1);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_C2_RXIQ_COMPB1, pcomp-&gt;b1);</div><div class='add'>+	} else {</div><div class='add'>+		pcomp-&gt;a0 = b43_phy_read(dev, B43_NPHY_C1_RXIQ_COMPA0);</div><div class='add'>+		pcomp-&gt;b0 = b43_phy_read(dev, B43_NPHY_C1_RXIQ_COMPB0);</div><div class='add'>+		pcomp-&gt;a1 = b43_phy_read(dev, B43_NPHY_C2_RXIQ_COMPA1);</div><div class='add'>+		pcomp-&gt;b1 = b43_phy_read(dev, B43_NPHY_C2_RXIQ_COMPB1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+/* Ready but not used anywhere */</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RxCalPhyCleanup */</div><div class='add'>+static void b43_nphy_rx_cal_phy_cleanup(struct b43_wldev *dev, u8 core)</div><div class='add'>+{</div><div class='add'>+	u16 *regs = dev-&gt;phy.n-&gt;tx_rx_cal_phy_saveregs;</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_RFSEQCA, regs[0]);</div><div class='add'>+	if (core == 0) {</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_AFECTL_C1, regs[1]);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_AFECTL_OVER1, regs[2]);</div><div class='add'>+	} else {</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_AFECTL_C2, regs[1]);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_AFECTL_OVER, regs[2]);</div><div class='add'>+	}</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_RFCTL_INTC1, regs[3]);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_RFCTL_INTC2, regs[4]);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_RFCTL_RSSIO1, regs[5]);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_RFCTL_RSSIO2, regs[6]);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_TXF_40CO_B1S1, regs[7]);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_RFCTL_OVER, regs[8]);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_PAPD_EN0, regs[9]);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_PAPD_EN1, regs[10]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RxCalPhySetup */</div><div class='add'>+static void b43_nphy_rx_cal_phy_setup(struct b43_wldev *dev, u8 core)</div><div class='add'>+{</div><div class='add'>+	u8 rxval, txval;</div><div class='add'>+	u16 *regs = dev-&gt;phy.n-&gt;tx_rx_cal_phy_saveregs;</div><div class='add'>+</div><div class='add'>+	regs[0] = b43_phy_read(dev, B43_NPHY_RFSEQCA);</div><div class='add'>+	if (core == 0) {</div><div class='add'>+		regs[1] = b43_phy_read(dev, B43_NPHY_AFECTL_C1);</div><div class='add'>+		regs[2] = b43_phy_read(dev, B43_NPHY_AFECTL_OVER1);</div><div class='add'>+	} else {</div><div class='add'>+		regs[1] = b43_phy_read(dev, B43_NPHY_AFECTL_C2);</div><div class='add'>+		regs[2] = b43_phy_read(dev, B43_NPHY_AFECTL_OVER);</div><div class='add'>+	}</div><div class='add'>+	regs[3] = b43_phy_read(dev, B43_NPHY_RFCTL_INTC1);</div><div class='add'>+	regs[4] = b43_phy_read(dev, B43_NPHY_RFCTL_INTC2);</div><div class='add'>+	regs[5] = b43_phy_read(dev, B43_NPHY_RFCTL_RSSIO1);</div><div class='add'>+	regs[6] = b43_phy_read(dev, B43_NPHY_RFCTL_RSSIO2);</div><div class='add'>+	regs[7] = b43_phy_read(dev, B43_NPHY_TXF_40CO_B1S1);</div><div class='add'>+	regs[8] = b43_phy_read(dev, B43_NPHY_RFCTL_OVER);</div><div class='add'>+	regs[9] = b43_phy_read(dev, B43_NPHY_PAPD_EN0);</div><div class='add'>+	regs[10] = b43_phy_read(dev, B43_NPHY_PAPD_EN1);</div><div class='add'>+</div><div class='add'>+	b43_phy_mask(dev, B43_NPHY_PAPD_EN0, ~0x0001);</div><div class='add'>+	b43_phy_mask(dev, B43_NPHY_PAPD_EN1, ~0x0001);</div><div class='add'>+</div><div class='add'>+	b43_phy_maskset(dev, B43_NPHY_RFSEQCA,</div><div class='add'>+			~B43_NPHY_RFSEQCA_RXDIS &amp; 0xFFFF,</div><div class='add'>+			((1 - core) &lt;&lt; B43_NPHY_RFSEQCA_RXDIS_SHIFT));</div><div class='add'>+	b43_phy_maskset(dev, B43_NPHY_RFSEQCA, ~B43_NPHY_RFSEQCA_TXEN,</div><div class='add'>+			((1 - core) &lt;&lt; B43_NPHY_RFSEQCA_TXEN_SHIFT));</div><div class='add'>+	b43_phy_maskset(dev, B43_NPHY_RFSEQCA, ~B43_NPHY_RFSEQCA_RXEN,</div><div class='add'>+			(core &lt;&lt; B43_NPHY_RFSEQCA_RXEN_SHIFT));</div><div class='add'>+	b43_phy_maskset(dev, B43_NPHY_RFSEQCA, ~B43_NPHY_RFSEQCA_TXDIS,</div><div class='add'>+			(core &lt;&lt; B43_NPHY_RFSEQCA_TXDIS_SHIFT));</div><div class='add'>+</div><div class='add'>+	if (core == 0) {</div><div class='add'>+		b43_phy_mask(dev, B43_NPHY_AFECTL_C1, ~0x0007);</div><div class='add'>+		b43_phy_set(dev, B43_NPHY_AFECTL_OVER1, 0x0007);</div><div class='add'>+	} else {</div><div class='add'>+		b43_phy_mask(dev, B43_NPHY_AFECTL_C2, ~0x0007);</div><div class='add'>+		b43_phy_set(dev, B43_NPHY_AFECTL_OVER, 0x0007);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	b43_nphy_rf_control_intc_override(dev, 2, 0, 3);</div><div class='add'>+	b43_nphy_rf_control_override(dev, 8, 0, 3, false);</div><div class='add'>+	b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RX2TX);</div><div class='add'>+</div><div class='add'>+	if (core == 0) {</div><div class='add'>+		rxval = 1;</div><div class='add'>+		txval = 8;</div><div class='add'>+	} else {</div><div class='add'>+		rxval = 4;</div><div class='add'>+		txval = 2;</div><div class='add'>+	}</div><div class='add'>+	b43_nphy_rf_control_intc_override(dev, 1, rxval, (core + 1));</div><div class='add'>+	b43_nphy_rf_control_intc_override(dev, 1, txval, (2 - core));</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/CalcRxIqComp */</div><div class='add'>+static void b43_nphy_calc_rx_iq_comp(struct b43_wldev *dev, u8 mask)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	s32 iq;</div><div class='add'>+	u32 ii;</div><div class='add'>+	u32 qq;</div><div class='add'>+	int iq_nbits, qq_nbits;</div><div class='add'>+	int arsh, brsh;</div><div class='add'>+	u16 tmp, a, b;</div><div class='add'>+</div><div class='add'>+	struct nphy_iq_est est;</div><div class='add'>+	struct b43_phy_n_iq_comp old;</div><div class='add'>+	struct b43_phy_n_iq_comp new = { };</div><div class='add'>+	bool error = false;</div><div class='add'>+</div><div class='add'>+	if (mask == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	b43_nphy_rx_iq_coeffs(dev, false, &amp;old);</div><div class='add'>+	b43_nphy_rx_iq_coeffs(dev, true, &amp;new);</div><div class='add'>+	b43_nphy_rx_iq_est(dev, &amp;est, 0x4000, 32, false);</div><div class='add'>+	new = old;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		if (i == 0 &amp;&amp; (mask &amp; 1)) {</div><div class='add'>+			iq = est.iq0_prod;</div><div class='add'>+			ii = est.i0_pwr;</div><div class='add'>+			qq = est.q0_pwr;</div><div class='add'>+		} else if (i == 1 &amp;&amp; (mask &amp; 2)) {</div><div class='add'>+			iq = est.iq1_prod;</div><div class='add'>+			ii = est.i1_pwr;</div><div class='add'>+			qq = est.q1_pwr;</div><div class='add'>+		} else {</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ii + qq &lt; 2) {</div><div class='add'>+			error = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iq_nbits = fls(abs(iq));</div><div class='add'>+		qq_nbits = fls(qq);</div><div class='add'>+</div><div class='add'>+		arsh = iq_nbits - 20;</div><div class='add'>+		if (arsh &gt;= 0) {</div><div class='add'>+			a = -((iq &lt;&lt; (30 - iq_nbits)) + (ii &gt;&gt; (1 + arsh)));</div><div class='add'>+			tmp = ii &gt;&gt; arsh;</div><div class='add'>+		} else {</div><div class='add'>+			a = -((iq &lt;&lt; (30 - iq_nbits)) + (ii &lt;&lt; (-1 - arsh)));</div><div class='add'>+			tmp = ii &lt;&lt; -arsh;</div><div class='add'>+		}</div><div class='add'>+		if (tmp == 0) {</div><div class='add'>+			error = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		a /= tmp;</div><div class='add'>+</div><div class='add'>+		brsh = qq_nbits - 11;</div><div class='add'>+		if (brsh &gt;= 0) {</div><div class='add'>+			b = (qq &lt;&lt; (31 - qq_nbits));</div><div class='add'>+			tmp = ii &gt;&gt; brsh;</div><div class='add'>+		} else {</div><div class='add'>+			b = (qq &lt;&lt; (31 - qq_nbits));</div><div class='add'>+			tmp = ii &lt;&lt; -brsh;</div><div class='add'>+		}</div><div class='add'>+		if (tmp == 0) {</div><div class='add'>+			error = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		b = int_sqrt(b / tmp - a * a) - (1 &lt;&lt; 10);</div><div class='add'>+</div><div class='add'>+		if (i == 0 &amp;&amp; (mask &amp; 0x1)) {</div><div class='add'>+			if (dev-&gt;phy.rev &gt;= 3) {</div><div class='add'>+				new.a0 = a &amp; 0x3FF;</div><div class='add'>+				new.b0 = b &amp; 0x3FF;</div><div class='add'>+			} else {</div><div class='add'>+				new.a0 = b &amp; 0x3FF;</div><div class='add'>+				new.b0 = a &amp; 0x3FF;</div><div class='add'>+			}</div><div class='add'>+		} else if (i == 1 &amp;&amp; (mask &amp; 0x2)) {</div><div class='add'>+			if (dev-&gt;phy.rev &gt;= 3) {</div><div class='add'>+				new.a1 = a &amp; 0x3FF;</div><div class='add'>+				new.b1 = b &amp; 0x3FF;</div><div class='add'>+			} else {</div><div class='add'>+				new.a1 = b &amp; 0x3FF;</div><div class='add'>+				new.b1 = a &amp; 0x3FF;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (error)</div><div class='add'>+		new = old;</div><div class='add'>+</div><div class='add'>+	b43_nphy_rx_iq_coeffs(dev, true, &amp;new);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxIqWar */</div><div class='add'>+static void b43_nphy_tx_iq_workaround(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	u16 array[4];</div><div class='add'>+	b43_ntab_read_bulk(dev, B43_NTAB16(0xF, 0x50), 4, array);</div><div class='add'>+</div><div class='add'>+	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_NPHY_TXIQW0, array[0]);</div><div class='add'>+	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_NPHY_TXIQW1, array[1]);</div><div class='add'>+	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_NPHY_TXIQW2, array[2]);</div><div class='add'>+	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_NPHY_TXIQW3, array[3]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/SpurWar */</div><div class='add'>+static void b43_nphy_spur_workaround(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='add'>+</div><div class='add'>+	u8 channel = dev-&gt;phy.channel;</div><div class='add'>+	int tone[2] = { 57, 58 };</div><div class='add'>+	u32 noise[2] = { 0x3FF, 0x3FF };</div><div class='add'>+</div><div class='add'>+	B43_WARN_ON(dev-&gt;phy.rev &lt; 3);</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;hang_avoid)</div><div class='add'>+		b43_nphy_stay_in_carrier_search(dev, 1);</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;gband_spurwar_en) {</div><div class='add'>+		/* TODO: N PHY Adjust Analog Pfbw (7) */</div><div class='add'>+		if (channel == 11 &amp;&amp; dev-&gt;phy.is_40mhz)</div><div class='add'>+			; /* TODO: N PHY Adjust Min Noise Var(2, tone, noise)*/</div><div class='add'>+		else</div><div class='add'>+			; /* TODO: N PHY Adjust Min Noise Var(0, NULL, NULL)*/</div><div class='add'>+		/* TODO: N PHY Adjust CRS Min Power (0x1E) */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;aband_spurwar_en) {</div><div class='add'>+		if (channel == 54) {</div><div class='add'>+			tone[0] = 0x20;</div><div class='add'>+			noise[0] = 0x25F;</div><div class='add'>+		} else if (channel == 38 || channel == 102 || channel == 118) {</div><div class='add'>+			if (0 /* FIXME */) {</div><div class='add'>+				tone[0] = 0x20;</div><div class='add'>+				noise[0] = 0x21F;</div><div class='add'>+			} else {</div><div class='add'>+				tone[0] = 0;</div><div class='add'>+				noise[0] = 0;</div><div class='add'>+			}</div><div class='add'>+		} else if (channel == 134) {</div><div class='add'>+			tone[0] = 0x20;</div><div class='add'>+			noise[0] = 0x21F;</div><div class='add'>+		} else if (channel == 151) {</div><div class='add'>+			tone[0] = 0x10;</div><div class='add'>+			noise[0] = 0x23F;</div><div class='add'>+		} else if (channel == 153 || channel == 161) {</div><div class='add'>+			tone[0] = 0x30;</div><div class='add'>+			noise[0] = 0x23F;</div><div class='add'>+		} else {</div><div class='add'>+			tone[0] = 0;</div><div class='add'>+			noise[0] = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!tone[0] &amp;&amp; !noise[0])</div><div class='add'>+			; /* TODO: N PHY Adjust Min Noise Var(1, tone, noise)*/</div><div class='add'>+		else</div><div class='add'>+			; /* TODO: N PHY Adjust Min Noise Var(0, NULL, NULL)*/</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;hang_avoid)</div><div class='add'>+		b43_nphy_stay_in_carrier_search(dev, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxPwrCtrlCoefSetup */</div><div class='add'>+static void b43_nphy_tx_pwr_ctrl_coef_setup(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='add'>+	int i, j;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	u32 cur_real, cur_imag, real_part, imag_part;</div><div class='add'>+</div><div class='add'>+	u16 buffer[7];</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;hang_avoid)</div><div class='add'>+		b43_nphy_stay_in_carrier_search(dev, true);</div><div class='add'>+</div><div class='add'>+	b43_ntab_read_bulk(dev, B43_NTAB16(15, 80), 7, buffer);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		tmp = ((buffer[i * 2] &amp; 0x3FF) &lt;&lt; 10) |</div><div class='add'>+			(buffer[i * 2 + 1] &amp; 0x3FF);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_TABLE_ADDR,</div><div class='add'>+				(((i + 26) &lt;&lt; 10) | 320));</div><div class='add'>+		for (j = 0; j &lt; 128; j++) {</div><div class='add'>+			b43_phy_write(dev, B43_NPHY_TABLE_DATAHI,</div><div class='add'>+					((tmp &gt;&gt; 16) &amp; 0xFFFF));</div><div class='add'>+			b43_phy_write(dev, B43_NPHY_TABLE_DATALO,</div><div class='add'>+					(tmp &amp; 0xFFFF));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		tmp = buffer[5 + i];</div><div class='add'>+		real_part = (tmp &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+		imag_part = (tmp &amp; 0xFF);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_TABLE_ADDR,</div><div class='add'>+				(((i + 26) &lt;&lt; 10) | 448));</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;phy.rev &gt;= 3) {</div><div class='add'>+			cur_real = real_part;</div><div class='add'>+			cur_imag = imag_part;</div><div class='add'>+			tmp = ((cur_real &amp; 0xFF) &lt;&lt; 8) | (cur_imag &amp; 0xFF);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; 128; j++) {</div><div class='add'>+			if (dev-&gt;phy.rev &lt; 3) {</div><div class='add'>+				cur_real = (real_part * loscale[j] + 128) &gt;&gt; 8;</div><div class='add'>+				cur_imag = (imag_part * loscale[j] + 128) &gt;&gt; 8;</div><div class='add'>+				tmp = ((cur_real &amp; 0xFF) &lt;&lt; 8) |</div><div class='add'>+					(cur_imag &amp; 0xFF);</div><div class='add'>+			}</div><div class='add'>+			b43_phy_write(dev, B43_NPHY_TABLE_DATAHI,</div><div class='add'>+					((tmp &gt;&gt; 16) &amp; 0xFFFF));</div><div class='add'>+			b43_phy_write(dev, B43_NPHY_TABLE_DATALO,</div><div class='add'>+					(tmp &amp; 0xFFFF));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phy.rev &gt;= 3) {</div><div class='add'>+		b43_shm_write16(dev, B43_SHM_SHARED,</div><div class='add'>+				B43_SHM_SH_NPHY_TXPWR_INDX0, 0xFFFF);</div><div class='add'>+		b43_shm_write16(dev, B43_SHM_SHARED,</div><div class='add'>+				B43_SHM_SH_NPHY_TXPWR_INDX1, 0xFFFF);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nphy-&gt;hang_avoid)</div><div class='add'>+		b43_nphy_stay_in_carrier_search(dev, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Restore RSSI Calibration</div><div class='ctx'>  * http://bcm-v4.sipsolutions.net/802.11/PHY/N/RestoreRssiCal</div><div class='hunk'>@@ -2729,24 +2943,6 @@ static void b43_nphy_restore_rssi_cal(struct b43_wldev *dev)</div><div class='ctx'> 	b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_Y, rssical_phy_regs[11]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/GetIpaGainTbl */</div><div class='del'>-static const u32 *b43_nphy_get_ipa_gain_table(struct b43_wldev *dev)</div><div class='del'>-{</div><div class='del'>-	if (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_2GHZ) {</div><div class='del'>-		if (dev-&gt;phy.rev &gt;= 6) {</div><div class='del'>-			if (dev-&gt;dev-&gt;chip_id == 47162)</div><div class='del'>-				return txpwrctrl_tx_gain_ipa_rev5;</div><div class='del'>-			return txpwrctrl_tx_gain_ipa_rev6;</div><div class='del'>-		} else if (dev-&gt;phy.rev &gt;= 5) {</div><div class='del'>-			return txpwrctrl_tx_gain_ipa_rev5;</div><div class='del'>-		} else {</div><div class='del'>-			return txpwrctrl_tx_gain_ipa;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		return txpwrctrl_tx_gain_ipa_5g;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxCalRadioSetup */</div><div class='ctx'> static void b43_nphy_tx_cal_radio_setup(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -2841,44 +3037,6 @@ static void b43_nphy_tx_cal_radio_setup(struct b43_wldev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/IqCalGainParams */</div><div class='del'>-static void b43_nphy_iq_cal_gain_params(struct b43_wldev *dev, u16 core,</div><div class='del'>-					struct nphy_txgains target,</div><div class='del'>-					struct nphy_iqcal_params *params)</div><div class='del'>-{</div><div class='del'>-	int i, j, indx;</div><div class='del'>-	u16 gain;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;phy.rev &gt;= 3) {</div><div class='del'>-		params-&gt;txgm = target.txgm[core];</div><div class='del'>-		params-&gt;pga = target.pga[core];</div><div class='del'>-		params-&gt;pad = target.pad[core];</div><div class='del'>-		params-&gt;ipa = target.ipa[core];</div><div class='del'>-		params-&gt;cal_gain = (params-&gt;txgm &lt;&lt; 12) | (params-&gt;pga &lt;&lt; 8) |</div><div class='del'>-					(params-&gt;pad &lt;&lt; 4) | (params-&gt;ipa);</div><div class='del'>-		for (j = 0; j &lt; 5; j++)</div><div class='del'>-			params-&gt;ncorr[j] = 0x79;</div><div class='del'>-	} else {</div><div class='del'>-		gain = (target.pad[core]) | (target.pga[core] &lt;&lt; 4) |</div><div class='del'>-			(target.txgm[core] &lt;&lt; 8);</div><div class='del'>-</div><div class='del'>-		indx = (b43_current_band(dev-&gt;wl) == IEEE80211_BAND_5GHZ) ?</div><div class='del'>-			1 : 0;</div><div class='del'>-		for (i = 0; i &lt; 9; i++)</div><div class='del'>-			if (tbl_iqcal_gainparams[indx][i][0] == gain)</div><div class='del'>-				break;</div><div class='del'>-		i = min(i, 8);</div><div class='del'>-</div><div class='del'>-		params-&gt;txgm = tbl_iqcal_gainparams[indx][i][1];</div><div class='del'>-		params-&gt;pga = tbl_iqcal_gainparams[indx][i][2];</div><div class='del'>-		params-&gt;pad = tbl_iqcal_gainparams[indx][i][3];</div><div class='del'>-		params-&gt;cal_gain = (params-&gt;txgm &lt;&lt; 7) | (params-&gt;pga &lt;&lt; 4) |</div><div class='del'>-					(params-&gt;pad &lt;&lt; 2);</div><div class='del'>-		for (j = 0; j &lt; 4; j++)</div><div class='del'>-			params-&gt;ncorr[j] = tbl_iqcal_gainparams[indx][i][4 + j];</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/UpdateTxCalLadder */</div><div class='ctx'> static void b43_nphy_update_tx_cal_ladder(struct b43_wldev *dev, u16 core)</div><div class='ctx'> {</div><div class='hunk'>@@ -3258,7 +3416,7 @@ static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;phy.rev &gt;= 4) {</div><div class='ctx'> 		avoid = nphy-&gt;hang_avoid;</div><div class='del'>-		nphy-&gt;hang_avoid = 0;</div><div class='add'>+		nphy-&gt;hang_avoid = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	b43_ntab_read_bulk(dev, B43_NTAB16(7, 0x110), 2, save);</div><div class='hunk'>@@ -3368,7 +3526,7 @@ static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev,</div><div class='ctx'> </div><div class='ctx'> 			if (phy6or5x &amp;&amp; updated[core] == 0) {</div><div class='ctx'> 				b43_nphy_update_tx_cal_ladder(dev, core);</div><div class='del'>-				updated[core] = 1;</div><div class='add'>+				updated[core] = true;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			tmp = (params[core].ncorr[type] &lt;&lt; 8) | 0x66;</div><div class='hunk'>@@ -3730,10 +3888,104 @@ static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask)</div><div class='ctx'> 	b43_mac_enable(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**************************************************</div><div class='add'>+ * N-PHY init</div><div class='add'>+ **************************************************/</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * Init N-PHY</div><div class='del'>- * http://bcm-v4.sipsolutions.net/802.11/PHY/Init/N</div><div class='add'>+ * Upload the N-PHY tables.</div><div class='add'>+ * http://bcm-v4.sipsolutions.net/802.11/PHY/N/InitTables</div><div class='ctx'>  */</div><div class='add'>+static void b43_nphy_tables_init(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;phy.rev &lt; 3)</div><div class='add'>+		b43_nphy_rev0_1_2_tables_init(dev);</div><div class='add'>+	else</div><div class='add'>+		b43_nphy_rev3plus_tables_init(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/MIMOConfig */</div><div class='add'>+static void b43_nphy_update_mimo_config(struct b43_wldev *dev, s32 preamble)</div><div class='add'>+{</div><div class='add'>+	u16 mimocfg = b43_phy_read(dev, B43_NPHY_MIMOCFG);</div><div class='add'>+</div><div class='add'>+	mimocfg |= B43_NPHY_MIMOCFG_AUTO;</div><div class='add'>+	if (preamble == 1)</div><div class='add'>+		mimocfg |= B43_NPHY_MIMOCFG_GFMIX;</div><div class='add'>+	else</div><div class='add'>+		mimocfg &amp;= ~B43_NPHY_MIMOCFG_GFMIX;</div><div class='add'>+</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_MIMOCFG, mimocfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/BPHYInit */</div><div class='add'>+static void b43_nphy_bphy_init(struct b43_wldev *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	val = 0x1E1F;</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		b43_phy_write(dev, B43_PHY_N_BMODE(0x88 + i), val);</div><div class='add'>+		val -= 0x202;</div><div class='add'>+	}</div><div class='add'>+	val = 0x3E3F;</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		b43_phy_write(dev, B43_PHY_N_BMODE(0x98 + i), val);</div><div class='add'>+		val -= 0x202;</div><div class='add'>+	}</div><div class='add'>+	b43_phy_write(dev, B43_PHY_N_BMODE(0x38), 0x668);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/SuperSwitchInit */</div><div class='add'>+static void b43_nphy_superswitch_init(struct b43_wldev *dev, bool init)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;phy.rev &gt;= 3) {</div><div class='add'>+		if (!init)</div><div class='add'>+			return;</div><div class='add'>+		if (0 /* FIXME */) {</div><div class='add'>+			b43_ntab_write(dev, B43_NTAB16(9, 2), 0x211);</div><div class='add'>+			b43_ntab_write(dev, B43_NTAB16(9, 3), 0x222);</div><div class='add'>+			b43_ntab_write(dev, B43_NTAB16(9, 8), 0x144);</div><div class='add'>+			b43_ntab_write(dev, B43_NTAB16(9, 12), 0x188);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_GPIO_LOOEN, 0);</div><div class='add'>+		b43_phy_write(dev, B43_NPHY_GPIO_HIOEN, 0);</div><div class='add'>+</div><div class='add'>+		switch (dev-&gt;dev-&gt;bus_type) {</div><div class='add'>+#ifdef CONFIG_B43_BCMA</div><div class='add'>+		case B43_BUS_BCMA:</div><div class='add'>+			bcma_chipco_gpio_control(&amp;dev-&gt;dev-&gt;bdev-&gt;bus-&gt;drv_cc,</div><div class='add'>+						 0xFC00, 0xFC00);</div><div class='add'>+			break;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_B43_SSB</div><div class='add'>+		case B43_BUS_SSB:</div><div class='add'>+			ssb_chipco_gpio_control(&amp;dev-&gt;dev-&gt;sdev-&gt;bus-&gt;chipco,</div><div class='add'>+						0xFC00, 0xFC00);</div><div class='add'>+			break;</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		b43_write32(dev, B43_MMIO_MACCTL,</div><div class='add'>+			b43_read32(dev, B43_MMIO_MACCTL) &amp;</div><div class='add'>+			~B43_MACCTL_GPOUTSMSK);</div><div class='add'>+		b43_write16(dev, B43_MMIO_GPIO_MASK,</div><div class='add'>+			b43_read16(dev, B43_MMIO_GPIO_MASK) | 0xFC00);</div><div class='add'>+		b43_write16(dev, B43_MMIO_GPIO_CONTROL,</div><div class='add'>+			b43_read16(dev, B43_MMIO_GPIO_CONTROL) &amp; ~0xFC00);</div><div class='add'>+</div><div class='add'>+		if (init) {</div><div class='add'>+			b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_LO1, 0x2D8);</div><div class='add'>+			b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_UP1, 0x301);</div><div class='add'>+			b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_LO2, 0x2D8);</div><div class='add'>+			b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_UP2, 0x301);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PHY/Init/N */</div><div class='ctx'> int b43_phy_initn(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ssb_sprom *sprom = dev-&gt;dev-&gt;bus_sprom;</div><div class='hunk'>@@ -3857,7 +4109,7 @@ int b43_phy_initn(struct b43_wldev *dev)</div><div class='ctx'> 	tx_pwr_state = nphy-&gt;txpwrctrl;</div><div class='ctx'> 	b43_nphy_tx_power_ctrl(dev, false);</div><div class='ctx'> 	b43_nphy_tx_power_fix(dev);</div><div class='del'>-	/* TODO N PHY TX Power Control Idle TSSI */</div><div class='add'>+	b43_nphy_tx_power_ctl_idle_tssi(dev);</div><div class='ctx'> 	/* TODO N PHY TX Power Control Setup */</div><div class='ctx'> 	b43_nphy_tx_gain_table_upload(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -3928,6 +4180,91 @@ int b43_phy_initn(struct b43_wldev *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**************************************************</div><div class='add'>+ * Channel switching ops.</div><div class='add'>+ **************************************************/</div><div class='add'>+</div><div class='add'>+static void b43_chantab_phy_upload(struct b43_wldev *dev,</div><div class='add'>+				   const struct b43_phy_n_sfo_cfg *e)</div><div class='add'>+{</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_BW1A, e-&gt;phy_bw1a);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_BW2, e-&gt;phy_bw2);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_BW3, e-&gt;phy_bw3);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_BW4, e-&gt;phy_bw4);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_BW5, e-&gt;phy_bw5);</div><div class='add'>+	b43_phy_write(dev, B43_NPHY_BW6, e-&gt;phy_bw6);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* http://bcm-v4.sipsolutions.net/802.11/PmuSpurAvoid */</div><div class='add'>+static void b43_nphy_pmu_spur_avoid(struct b43_wldev *dev, bool avoid)</div><div class='add'>+{</div><div class='add'>+	struct bcma_drv_cc __maybe_unused *cc;</div><div class='add'>+	u32 __maybe_unused pmu_ctl;</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;dev-&gt;bus_type) {</div><div class='add'>+#ifdef CONFIG_B43_BCMA</div><div class='add'>+	case B43_BUS_BCMA:</div><div class='add'>+		cc = &amp;dev-&gt;dev-&gt;bdev-&gt;bus-&gt;drv_cc;</div><div class='add'>+		if (dev-&gt;dev-&gt;chip_id == 43224 || dev-&gt;dev-&gt;chip_id == 43225) {</div><div class='add'>+			if (avoid) {</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x0, 0x11500010);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x1, 0x000C0C06);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x2, 0x0F600a08);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x3, 0x00000000);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x4, 0x2001E920);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x5, 0x88888815);</div><div class='add'>+			} else {</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x0, 0x11100010);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x1, 0x000c0c06);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x2, 0x03000a08);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x3, 0x00000000);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x4, 0x200005c0);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x5, 0x88888815);</div><div class='add'>+			}</div><div class='add'>+			pmu_ctl = BCMA_CC_PMU_CTL_PLL_UPD;</div><div class='add'>+		} else if (dev-&gt;dev-&gt;chip_id == 0x4716) {</div><div class='add'>+			if (avoid) {</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x0, 0x11500060);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x1, 0x080C0C06);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x2, 0x0F600000);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x3, 0x00000000);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x4, 0x2001E924);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x5, 0x88888815);</div><div class='add'>+			} else {</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x0, 0x11100060);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x1, 0x080c0c06);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x2, 0x03000000);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x3, 0x00000000);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x4, 0x200005c0);</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x5, 0x88888815);</div><div class='add'>+			}</div><div class='add'>+			pmu_ctl = BCMA_CC_PMU_CTL_PLL_UPD |</div><div class='add'>+				  BCMA_CC_PMU_CTL_NOILPONW;</div><div class='add'>+		} else if (dev-&gt;dev-&gt;chip_id == 0x4322 ||</div><div class='add'>+			   dev-&gt;dev-&gt;chip_id == 0x4340 ||</div><div class='add'>+			   dev-&gt;dev-&gt;chip_id == 0x4341) {</div><div class='add'>+			bcma_chipco_pll_write(cc, 0x0, 0x11100070);</div><div class='add'>+			bcma_chipco_pll_write(cc, 0x1, 0x1014140a);</div><div class='add'>+			bcma_chipco_pll_write(cc, 0x5, 0x88888854);</div><div class='add'>+			if (avoid)</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x2, 0x05201828);</div><div class='add'>+			else</div><div class='add'>+				bcma_chipco_pll_write(cc, 0x2, 0x05001828);</div><div class='add'>+			pmu_ctl = BCMA_CC_PMU_CTL_PLL_UPD;</div><div class='add'>+		} else {</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		bcma_cc_set32(cc, BCMA_CC_PMU_CTL, pmu_ctl);</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_B43_SSB</div><div class='add'>+	case B43_BUS_SSB:</div><div class='add'>+		/* FIXME */</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/ChanspecSetup */</div><div class='ctx'> static void b43_nphy_channel_setup(struct b43_wldev *dev,</div><div class='ctx'> 				const struct b43_phy_n_sfo_cfg *e,</div><div class='hunk'>@@ -3935,6 +4272,7 @@ static void b43_nphy_channel_setup(struct b43_wldev *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='ctx'> 	struct b43_phy_n *nphy = dev-&gt;phy.n;</div><div class='add'>+	int ch = new_channel-&gt;hw_value;</div><div class='ctx'> </div><div class='ctx'> 	u16 old_band_5ghz;</div><div class='ctx'> 	u32 tmp32;</div><div class='hunk'>@@ -3974,8 +4312,41 @@ static void b43_nphy_channel_setup(struct b43_wldev *dev,</div><div class='ctx'> </div><div class='ctx'> 	b43_nphy_tx_lp_fbw(dev);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;phy.rev &gt;= 3 &amp;&amp; 0) {</div><div class='del'>-		/* TODO */</div><div class='add'>+	if (dev-&gt;phy.rev &gt;= 3 &amp;&amp;</div><div class='add'>+	    dev-&gt;phy.n-&gt;spur_avoid != B43_SPUR_AVOID_DISABLE) {</div><div class='add'>+		bool avoid = false;</div><div class='add'>+		if (dev-&gt;phy.n-&gt;spur_avoid == B43_SPUR_AVOID_FORCE) {</div><div class='add'>+			avoid = true;</div><div class='add'>+		} else if (!b43_channel_type_is_40mhz(phy-&gt;channel_type)) {</div><div class='add'>+			if ((ch &gt;= 5 &amp;&amp; ch &lt;= 8) || ch == 13 || ch == 14)</div><div class='add'>+				avoid = true;</div><div class='add'>+		} else { /* 40MHz */</div><div class='add'>+			if (nphy-&gt;aband_spurwar_en &amp;&amp;</div><div class='add'>+			    (ch == 38 || ch == 102 || ch == 118))</div><div class='add'>+				avoid = dev-&gt;dev-&gt;chip_id == 0x4716;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		b43_nphy_pmu_spur_avoid(dev, avoid);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;dev-&gt;chip_id == 43222 || dev-&gt;dev-&gt;chip_id == 43224 ||</div><div class='add'>+		    dev-&gt;dev-&gt;chip_id == 43225) {</div><div class='add'>+			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_LOW,</div><div class='add'>+				    avoid ? 0x5341 : 0x8889);</div><div class='add'>+			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_HIGH, 0x8);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;phy.rev == 3 || dev-&gt;phy.rev == 4)</div><div class='add'>+			; /* TODO: reset PLL */</div><div class='add'>+</div><div class='add'>+		if (avoid)</div><div class='add'>+			b43_phy_set(dev, B43_NPHY_BBCFG, B43_NPHY_BBCFG_RSTRX);</div><div class='add'>+		else</div><div class='add'>+			b43_phy_mask(dev, B43_NPHY_BBCFG,</div><div class='add'>+				     ~B43_NPHY_BBCFG_RSTRX &amp; 0xFFFF);</div><div class='add'>+</div><div class='add'>+		b43_nphy_reset_cca(dev);</div><div class='add'>+</div><div class='add'>+		/* wl sets useless phy_isspuravoid here */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	b43_phy_write(dev, B43_NPHY_NDATAT_DUP40, 0x3830);</div><div class='hunk'>@@ -4039,6 +4410,10 @@ static int b43_nphy_set_channel(struct b43_wldev *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**************************************************</div><div class='add'>+ * Basic PHY ops.</div><div class='add'>+ **************************************************/</div><div class='add'>+</div><div class='ctx'> static int b43_nphy_op_allocate(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy_n *nphy;</div><div class='hunk'>@@ -4055,10 +4430,13 @@ static void b43_nphy_op_prepare_structs(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43_phy *phy = &amp;dev-&gt;phy;</div><div class='ctx'> 	struct b43_phy_n *nphy = phy-&gt;n;</div><div class='add'>+	struct ssb_sprom *sprom = dev-&gt;dev-&gt;bus_sprom;</div><div class='ctx'> </div><div class='ctx'> 	memset(nphy, 0, sizeof(*nphy));</div><div class='ctx'> </div><div class='ctx'> 	nphy-&gt;hang_avoid = (phy-&gt;rev == 3 || phy-&gt;rev == 4);</div><div class='add'>+	nphy-&gt;spur_avoid = (phy-&gt;rev &gt;= 3) ?</div><div class='add'>+				B43_SPUR_AVOID_AUTO : B43_SPUR_AVOID_DISABLE;</div><div class='ctx'> 	nphy-&gt;gain_boost = true; /* this way we follow wl, assume it is true */</div><div class='ctx'> 	nphy-&gt;txrx_chain = 2; /* sth different than 0 and 1 for now */</div><div class='ctx'> 	nphy-&gt;phyrxchain = 3; /* to avoid b43_nphy_set_rx_core_state like wl */</div><div class='hunk'>@@ -4067,6 +4445,38 @@ static void b43_nphy_op_prepare_structs(struct b43_wldev *dev)</div><div class='ctx'> 	 * 0x7f == 127 and we check for 128 when restoring TX pwr ctl. */</div><div class='ctx'> 	nphy-&gt;tx_pwr_idx[0] = 128;</div><div class='ctx'> 	nphy-&gt;tx_pwr_idx[1] = 128;</div><div class='add'>+</div><div class='add'>+	/* Hardware TX power control and 5GHz power gain */</div><div class='add'>+	nphy-&gt;txpwrctrl = false;</div><div class='add'>+	nphy-&gt;pwg_gain_5ghz = false;</div><div class='add'>+	if (dev-&gt;phy.rev &gt;= 3 ||</div><div class='add'>+	    (dev-&gt;dev-&gt;board_vendor == PCI_VENDOR_ID_APPLE &amp;&amp;</div><div class='add'>+	     (dev-&gt;dev-&gt;core_rev == 11 || dev-&gt;dev-&gt;core_rev == 12))) {</div><div class='add'>+		nphy-&gt;txpwrctrl = true;</div><div class='add'>+		nphy-&gt;pwg_gain_5ghz = true;</div><div class='add'>+	} else if (sprom-&gt;revision &gt;= 4) {</div><div class='add'>+		if (dev-&gt;phy.rev &gt;= 2 &amp;&amp;</div><div class='add'>+		    (sprom-&gt;boardflags2_lo &amp; B43_BFL2_TXPWRCTRL_EN)) {</div><div class='add'>+			nphy-&gt;txpwrctrl = true;</div><div class='add'>+#ifdef CONFIG_B43_SSB</div><div class='add'>+			if (dev-&gt;dev-&gt;bus_type == B43_BUS_SSB &amp;&amp;</div><div class='add'>+			    dev-&gt;dev-&gt;sdev-&gt;bus-&gt;bustype == SSB_BUSTYPE_PCI) {</div><div class='add'>+				struct pci_dev *pdev =</div><div class='add'>+					dev-&gt;dev-&gt;sdev-&gt;bus-&gt;host_pci;</div><div class='add'>+				if (pdev-&gt;device == 0x4328 ||</div><div class='add'>+				    pdev-&gt;device == 0x432a)</div><div class='add'>+					nphy-&gt;pwg_gain_5ghz = true;</div><div class='add'>+			}</div><div class='add'>+#endif</div><div class='add'>+		} else if (sprom-&gt;boardflags2_lo &amp; B43_BFL2_5G_PWRGAIN) {</div><div class='add'>+			nphy-&gt;pwg_gain_5ghz = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phy.rev &gt;= 3) {</div><div class='add'>+		nphy-&gt;ipa2g_on = sprom-&gt;fem.ghz2.extpa_gain == 2;</div><div class='add'>+		nphy-&gt;ipa5g_on = sprom-&gt;fem.ghz5.extpa_gain == 2;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void b43_nphy_op_free(struct b43_wldev *dev)</div><div class='head'>diff --git a/drivers/net/wireless/b43/phy_n.h b/drivers/net/wireless/b43/phy_n.h<br/>index fbf520285bd1..5de8f74cc02f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/phy_n.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/phy_n.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/phy_n.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43/phy_n.h</a></div><div class='hunk'>@@ -716,6 +716,12 @@</div><div class='ctx'> </div><div class='ctx'> struct b43_wldev;</div><div class='ctx'> </div><div class='add'>+enum b43_nphy_spur_avoid {</div><div class='add'>+	B43_SPUR_AVOID_DISABLE,</div><div class='add'>+	B43_SPUR_AVOID_AUTO,</div><div class='add'>+	B43_SPUR_AVOID_FORCE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct b43_chanspec {</div><div class='ctx'> 	u16 center_freq;</div><div class='ctx'> 	enum nl80211_channel_type channel_type;</div><div class='hunk'>@@ -759,6 +765,11 @@ struct b43_phy_n_txpwrindex {</div><div class='ctx'> 	u16 locomp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct b43_phy_n_pwr_ctl_info {</div><div class='add'>+	u8 idle_tssi_2g;</div><div class='add'>+	u8 idle_tssi_5g;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct b43_phy_n {</div><div class='ctx'> 	u8 antsel_type;</div><div class='ctx'> 	u8 cal_orig_pwr_idx[2];</div><div class='hunk'>@@ -785,12 +796,14 @@ struct b43_phy_n {</div><div class='ctx'> 	u16 mphase_txcal_bestcoeffs[11];</div><div class='ctx'> </div><div class='ctx'> 	bool txpwrctrl;</div><div class='add'>+	bool pwg_gain_5ghz;</div><div class='ctx'> 	u8 tx_pwr_idx[2];</div><div class='ctx'> 	u16 adj_pwr_tbl[84];</div><div class='ctx'> 	u16 txcal_bbmult;</div><div class='ctx'> 	u16 txiqlocal_bestc[11];</div><div class='ctx'> 	bool txiqlocal_coeffsvalid;</div><div class='ctx'> 	struct b43_phy_n_txpwrindex txpwrindex[2];</div><div class='add'>+	struct b43_phy_n_pwr_ctl_info pwr_ctl_info[2];</div><div class='ctx'> 	struct b43_chanspec txiqlocal_chanspec;</div><div class='ctx'> </div><div class='ctx'> 	u8 txrx_chain;</div><div class='hunk'>@@ -803,6 +816,7 @@ struct b43_phy_n {</div><div class='ctx'> 	u16 classifier_state;</div><div class='ctx'> 	u16 clip_state[2];</div><div class='ctx'> </div><div class='add'>+	enum b43_nphy_spur_avoid spur_avoid;</div><div class='ctx'> 	bool aband_spurwar_en;</div><div class='ctx'> 	bool gband_spurwar_en;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/b43/pio.c b/drivers/net/wireless/b43/pio.c<br/>index 279a53eae4c5..3533ab86bd36 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/pio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/pio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/pio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43/pio.c</a></div><div class='hunk'>@@ -539,7 +539,7 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb)</div><div class='ctx'> 		/* Not enough memory on the queue. */</div><div class='ctx'> 		err = -EBUSY;</div><div class='ctx'> 		ieee80211_stop_queue(dev-&gt;wl-&gt;hw, skb_get_queue_mapping(skb));</div><div class='del'>-		q-&gt;stopped = 1;</div><div class='add'>+		q-&gt;stopped = true;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -566,7 +566,7 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb)</div><div class='ctx'> 	    (q-&gt;free_packet_slots == 0)) {</div><div class='ctx'> 		/* The queue is full. */</div><div class='ctx'> 		ieee80211_stop_queue(dev-&gt;wl-&gt;hw, skb_get_queue_mapping(skb));</div><div class='del'>-		q-&gt;stopped = 1;</div><div class='add'>+		q-&gt;stopped = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -601,7 +601,7 @@ void b43_pio_handle_txstatus(struct b43_wldev *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (q-&gt;stopped) {</div><div class='ctx'> 		ieee80211_wake_queue(dev-&gt;wl-&gt;hw, q-&gt;queue_prio);</div><div class='del'>-		q-&gt;stopped = 0;</div><div class='add'>+		q-&gt;stopped = false;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/b43/radio_2056.c b/drivers/net/wireless/b43/radio_2056.c<br/>index a01f776ca4de..ce037fb6789a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/radio_2056.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/radio_2056.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/radio_2056.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43/radio_2056.c</a></div><div class='hunk'>@@ -1572,14 +1572,14 @@ static const struct b2056_inittab_entry b2056_inittab_rev6_syn[] = {</div><div class='ctx'> 	[B2056_SYN_PLL_XTAL5]		= { .ghz5 = 0x0077, .ghz2 = 0x0077, NOUPLOAD, },</div><div class='ctx'> 	[B2056_SYN_PLL_XTAL6]		= { .ghz5 = 0x0007, .ghz2 = 0x0007, NOUPLOAD, },</div><div class='ctx'> 	[B2056_SYN_PLL_REFDIV]		= { .ghz5 = 0x0001, .ghz2 = 0x0001, NOUPLOAD, },</div><div class='del'>-	[B2056_SYN_PLL_PFD]		= { .ghz5 = 0x0004, .ghz2 = 0x0004, NOUPLOAD, },</div><div class='add'>+	[B2056_SYN_PLL_PFD]		= { .ghz5 = 0x0006, .ghz2 = 0x0006, UPLOAD, },</div><div class='ctx'> 	[B2056_SYN_PLL_CP1]		= { .ghz5 = 0x000f, .ghz2 = 0x000f, NOUPLOAD, },</div><div class='del'>-	[B2056_SYN_PLL_CP2]		= { .ghz5 = 0x0030, .ghz2 = 0x0030, NOUPLOAD, },</div><div class='add'>+	[B2056_SYN_PLL_CP2]		= { .ghz5 = 0x003f, .ghz2 = 0x003f, UPLOAD, },</div><div class='ctx'> 	[B2056_SYN_PLL_CP3]		= { .ghz5 = 0x0032, .ghz2 = 0x0032, NOUPLOAD, },</div><div class='del'>-	[B2056_SYN_PLL_LOOPFILTER1]	= { .ghz5 = 0x000d, .ghz2 = 0x000d, NOUPLOAD, },</div><div class='del'>-	[B2056_SYN_PLL_LOOPFILTER2]	= { .ghz5 = 0x000d, .ghz2 = 0x000d, NOUPLOAD, },</div><div class='add'>+	[B2056_SYN_PLL_LOOPFILTER1]	= { .ghz5 = 0x0006, .ghz2 = 0x0006, UPLOAD, },</div><div class='add'>+	[B2056_SYN_PLL_LOOPFILTER2]	= { .ghz5 = 0x0006, .ghz2 = 0x0006, UPLOAD, },</div><div class='ctx'> 	[B2056_SYN_PLL_LOOPFILTER3]	= { .ghz5 = 0x0004, .ghz2 = 0x0004, NOUPLOAD, },</div><div class='del'>-	[B2056_SYN_PLL_LOOPFILTER4]	= { .ghz5 = 0x0006, .ghz2 = 0x0006, NOUPLOAD, },</div><div class='add'>+	[B2056_SYN_PLL_LOOPFILTER4]	= { .ghz5 = 0x002b, .ghz2 = 0x002b, UPLOAD, },</div><div class='ctx'> 	[B2056_SYN_PLL_LOOPFILTER5]	= { .ghz5 = 0x0001, .ghz2 = 0x0001, NOUPLOAD, },</div><div class='ctx'> 	[B2056_SYN_PLL_MMD1]		= { .ghz5 = 0x001c, .ghz2 = 0x001c, NOUPLOAD, },</div><div class='ctx'> 	[B2056_SYN_PLL_MMD2]		= { .ghz5 = 0x0002, .ghz2 = 0x0002, NOUPLOAD, },</div><div class='hunk'>@@ -9055,6 +9055,21 @@ void b2056_upload_inittabs(struct b43_wldev *dev,</div><div class='ctx'> 				B2056_RX1, pts-&gt;rx, pts-&gt;rx_length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void b2056_upload_syn_pll_cp2(struct b43_wldev *dev, bool ghz5)</div><div class='add'>+{</div><div class='add'>+	struct b2056_inittabs_pts *pts;</div><div class='add'>+	const struct b2056_inittab_entry *e;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phy.rev &gt;= ARRAY_SIZE(b2056_inittabs)) {</div><div class='add'>+		B43_WARN_ON(1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	pts = &amp;b2056_inittabs[dev-&gt;phy.rev];</div><div class='add'>+	e = &amp;pts-&gt;syn[B2056_SYN_PLL_CP2];</div><div class='add'>+</div><div class='add'>+	b43_radio_write(dev, B2056_SYN_PLL_CP2, ghz5 ? e-&gt;ghz5 : e-&gt;ghz2);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct b43_nphy_channeltab_entry_rev3 *</div><div class='ctx'> b43_nphy_get_chantabent_rev3(struct b43_wldev *dev, u16 freq)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/wireless/b43/radio_2056.h b/drivers/net/wireless/b43/radio_2056.h<br/>index a7159d8578be..5b86673459fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/radio_2056.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/radio_2056.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/radio_2056.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43/radio_2056.h</a></div><div class='hunk'>@@ -1090,6 +1090,7 @@ struct b43_nphy_channeltab_entry_rev3 {</div><div class='ctx'> </div><div class='ctx'> void b2056_upload_inittabs(struct b43_wldev *dev,</div><div class='ctx'> 			   bool ghz5, bool ignore_uploadflag);</div><div class='add'>+void b2056_upload_syn_pll_cp2(struct b43_wldev *dev, bool ghz5);</div><div class='ctx'> </div><div class='ctx'> /* Get the NPHY Channel Switch Table entry for a channel.</div><div class='ctx'>  * Returns NULL on failure to find an entry. */</div><div class='head'>diff --git a/drivers/net/wireless/b43/tables_nphy.c b/drivers/net/wireless/b43/tables_nphy.c<br/>index 7b326f2efdc9..f7def13524dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/tables_nphy.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/tables_nphy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/tables_nphy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43/tables_nphy.c</a></div><div class='hunk'>@@ -2171,6 +2171,48 @@ static const u16 b43_ntab_loftlt1_r3[] = {</div><div class='ctx'> 	0x0000, 0x0000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* volatile  tables, PHY revision &gt;= 3 */</div><div class='add'>+</div><div class='add'>+/* indexed by antswctl2g */</div><div class='add'>+static const u16 b43_ntab_antswctl2g_r3[4][32] = {</div><div class='add'>+	{</div><div class='add'>+		0x0082, 0x0082, 0x0211, 0x0222, 0x0328,</div><div class='add'>+		0x0000, 0x0000, 0x0000, 0x0144, 0x0000,</div><div class='add'>+		0x0000, 0x0000, 0x0188, 0x0000, 0x0000,</div><div class='add'>+		0x0000, 0x0082, 0x0082, 0x0211, 0x0222,</div><div class='add'>+		0x0328, 0x0000, 0x0000, 0x0000, 0x0144,</div><div class='add'>+		0x0000, 0x0000, 0x0000, 0x0188, 0x0000,</div><div class='add'>+		0x0000, 0x0000,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		0x0022, 0x0022, 0x0011, 0x0022, 0x0022,</div><div class='add'>+		0x0000, 0x0000, 0x0000, 0x0011, 0x0000,</div><div class='add'>+		0x0000, 0x0000, 0x0022, 0x0000, 0x0000,</div><div class='add'>+		0x0000, 0x0022, 0x0022, 0x0011, 0x0022,</div><div class='add'>+		0x0022, 0x0000, 0x0000, 0x0000, 0x0011,</div><div class='add'>+		0x0000, 0x0000, 0x0000, 0x0022, 0x0000,</div><div class='add'>+		0x0000, 0x0000,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		0x0088, 0x0088, 0x0044, 0x0088, 0x0088,</div><div class='add'>+		0x0000, 0x0000, 0x0000, 0x0044, 0x0000,</div><div class='add'>+		0x0000, 0x0000, 0x0088, 0x0000, 0x0000,</div><div class='add'>+		0x0000, 0x0088, 0x0088, 0x0044, 0x0088,</div><div class='add'>+		0x0088, 0x0000, 0x0000, 0x0000, 0x0044,</div><div class='add'>+		0x0000, 0x0000, 0x0000, 0x0088, 0x0000,</div><div class='add'>+		0x0000, 0x0000,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		0x0022, 0x0022, 0x0011, 0x0022, 0x0000,</div><div class='add'>+		0x0000, 0x0000, 0x0000, 0x0011, 0x0000,</div><div class='add'>+		0x0000, 0x0000, 0x0022, 0x0000, 0x0000,</div><div class='add'>+		0x03cc, 0x0022, 0x0022, 0x0011, 0x0022,</div><div class='add'>+		0x0000, 0x0000, 0x0000, 0x0000, 0x0011,</div><div class='add'>+		0x0000, 0x0000, 0x0000, 0x0022, 0x0000,</div><div class='add'>+		0x0000, 0x03cc,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* TX gain tables */</div><div class='ctx'> const u32 b43_ntab_tx_gain_rev0_1_2[] = {</div><div class='ctx'> 	0x03cc2b44, 0x03cc2b42, 0x03cc2a44, 0x03cc2a42,</div><div class='hunk'>@@ -2652,7 +2694,7 @@ const u16 tbl_tx_iqlo_cal_cmds_fullcal_nphyrev3[] = {</div><div class='ctx'> const s16 tbl_tx_filter_coef_rev4[7][15] = {</div><div class='ctx'> 	{  -377,   137,  -407,   208, -1527,</div><div class='ctx'> 	    956,    93,   186,    93,   230,</div><div class='del'>-	    -44,   230,    20,  -191,   201 },</div><div class='add'>+	    -44,   230,   201,  -191,   201 },</div><div class='ctx'> 	{   -77,    20,   -98,    49,   -93,</div><div class='ctx'> 	     60,    56,   111,    56,    26,</div><div class='ctx'> 	     -5,    26,    34,   -32,    34 },</div><div class='hunk'>@@ -2710,7 +2752,18 @@ const struct nphy_rf_control_override_rev3 tbl_rf_control_override_rev3[] = {</div><div class='ctx'> 	{ 0x00C0,  6, 0xE7, 0xF9, 0xEC, 0xFB }  /* field == 0x4000 (fls 15) */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct nphy_gain_ctl_workaround_entry nphy_gain_ctl_workaround[2][3] = {</div><div class='add'>+struct nphy_gain_ctl_workaround_entry nphy_gain_ctl_wa_phy6_radio11_ghz2 = {</div><div class='add'>+	{ 10, 14, 19, 27 },</div><div class='add'>+	{ -5, 6, 10, 15 },</div><div class='add'>+	{ 0xA, 0xA, 0xA, 0xA, 0xA, 0xA, 0xA, 0xA, 0xA, 0xA },</div><div class='add'>+	{ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 },</div><div class='add'>+	0x427E,</div><div class='add'>+	{ 0x413F, 0x413F, 0x413F, 0x413F },</div><div class='add'>+	0x007E, 0x0066, 0x1074,</div><div class='add'>+	0x18, 0x18, 0x18,</div><div class='add'>+	0x01D0, 0x5,</div><div class='add'>+};</div><div class='add'>+struct nphy_gain_ctl_workaround_entry nphy_gain_ctl_workaround[2][4] = {</div><div class='ctx'> 	{ /* 2GHz */</div><div class='ctx'> 		{ /* PHY rev 3 */</div><div class='ctx'> 			{ 7, 11, 16, 23 },</div><div class='hunk'>@@ -2734,15 +2787,26 @@ struct nphy_gain_ctl_workaround_entry nphy_gain_ctl_workaround[2][3] = {</div><div class='ctx'> 			0x18, 0x18, 0x18,</div><div class='ctx'> 			0x01A1, 0x5,</div><div class='ctx'> 		},</div><div class='del'>-		{ /* PHY rev 5+ */</div><div class='add'>+		{ /* PHY rev 5 */</div><div class='ctx'> 			{ 9, 13, 18, 26 },</div><div class='ctx'> 			{ -3, 7, 11, 16 },</div><div class='ctx'> 			{ 0xA, 0xA, 0xA, 0xA, 0xA, 0xA, 0xA, 0xA, 0xA, 0xA },</div><div class='ctx'> 			{ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 },</div><div class='ctx'> 			0x427E, /* invalid for external LNA! */</div><div class='ctx'> 			{ 0x413F, 0x413F, 0x413F, 0x413F }, /* invalid for external LNA! */</div><div class='del'>-			0x1076, 0x0066, 0x106A,</div><div class='del'>-			0xC, 0xC, 0xC,</div><div class='add'>+			0x1076, 0x0066, 0x0000, /* low is invalid (the last one) */</div><div class='add'>+			0x18, 0x18, 0x18,</div><div class='add'>+			0x01D0, 0x9,</div><div class='add'>+		},</div><div class='add'>+		{ /* PHY rev 6+ */</div><div class='add'>+			{ 8, 13, 18, 25 },</div><div class='add'>+			{ -5, 6, 10, 14 },</div><div class='add'>+			{ 0xA, 0xA, 0xA, 0xA, 0xA, 0xA, 0xA, 0xA, 0xA, 0xA },</div><div class='add'>+			{ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 },</div><div class='add'>+			0x527E, /* invalid for external LNA! */</div><div class='add'>+			{ 0x513F, 0x513F, 0x513F, 0x513F }, /* invalid for external LNA! */</div><div class='add'>+			0x1076, 0x0066, 0x0000, /* low is invalid (the last one) */</div><div class='add'>+			0x18, 0x18, 0x18,</div><div class='ctx'> 			0x01D0, 0x5,</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -2769,7 +2833,7 @@ struct nphy_gain_ctl_workaround_entry nphy_gain_ctl_workaround[2][3] = {</div><div class='ctx'> 			0x24, 0x24, 0x24,</div><div class='ctx'> 			0x0107, 25,</div><div class='ctx'> 		},</div><div class='del'>-		{ /* PHY rev 5+ */</div><div class='add'>+		{ /* PHY rev 5 */</div><div class='ctx'> 			{ 6, 10, 16, 21 },</div><div class='ctx'> 			{ -7, 0, 4, 8 },</div><div class='ctx'> 			{ 0xD, 0xD, 0xD, 0xD, 0xD, 0xD, 0xD, 0xD, 0xD, 0xD },</div><div class='hunk'>@@ -2780,6 +2844,17 @@ struct nphy_gain_ctl_workaround_entry nphy_gain_ctl_workaround[2][3] = {</div><div class='ctx'> 			0x24, 0x24, 0x24,</div><div class='ctx'> 			0x00A9, 25,</div><div class='ctx'> 		},</div><div class='add'>+		{ /* PHY rev 6+ */</div><div class='add'>+			{ 6, 10, 16, 21 },</div><div class='add'>+			{ -7, 0, 4, 8 },</div><div class='add'>+			{ 0xD, 0xD, 0xD, 0xD, 0xD, 0xD, 0xD, 0xD, 0xD, 0xD },</div><div class='add'>+			{ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 },</div><div class='add'>+			0x729E,</div><div class='add'>+			{ 0x714F, 0x714F, 0x714F, 0x714F },</div><div class='add'>+			0x029E, 0x2084, 0x2086,</div><div class='add'>+			0x24, 0x24, 0x24, /* low is invalid for radio rev 11! */</div><div class='add'>+			0x00F0, 25,</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2838,9 +2913,8 @@ u32 b43_ntab_read(struct b43_wldev *dev, u32 offset)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case B43_NTAB_32BIT:</div><div class='ctx'> 		b43_phy_write(dev, B43_NPHY_TABLE_ADDR, offset);</div><div class='del'>-		value = b43_phy_read(dev, B43_NPHY_TABLE_DATAHI);</div><div class='del'>-		value &lt;&lt;= 16;</div><div class='del'>-		value |= b43_phy_read(dev, B43_NPHY_TABLE_DATALO);</div><div class='add'>+		value = b43_phy_read(dev, B43_NPHY_TABLE_DATALO);</div><div class='add'>+		value |= b43_phy_read(dev, B43_NPHY_TABLE_DATAHI) &lt;&lt; 16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		B43_WARN_ON(1);</div><div class='hunk'>@@ -2864,6 +2938,12 @@ void b43_ntab_read_bulk(struct b43_wldev *dev, u32 offset,</div><div class='ctx'> 	b43_phy_write(dev, B43_NPHY_TABLE_ADDR, offset);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nr_elements; i++) {</div><div class='add'>+		/* Auto increment broken + caching issue on BCM43224? */</div><div class='add'>+		if (dev-&gt;dev-&gt;chip_id == 43224 &amp;&amp; dev-&gt;dev-&gt;chip_rev == 1) {</div><div class='add'>+			b43_phy_read(dev, B43_NPHY_TABLE_DATALO);</div><div class='add'>+			b43_phy_write(dev, B43_NPHY_TABLE_ADDR, offset + i);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		switch (type) {</div><div class='ctx'> 		case B43_NTAB_8BIT:</div><div class='ctx'> 			*data = b43_phy_read(dev, B43_NPHY_TABLE_DATALO) &amp; 0xFF;</div><div class='hunk'>@@ -2874,9 +2954,10 @@ void b43_ntab_read_bulk(struct b43_wldev *dev, u32 offset,</div><div class='ctx'> 			data += 2;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case B43_NTAB_32BIT:</div><div class='del'>-			*((u32 *)data) = b43_phy_read(dev, B43_NPHY_TABLE_DATAHI);</div><div class='del'>-			*((u32 *)data) &lt;&lt;= 16;</div><div class='del'>-			*((u32 *)data) |= b43_phy_read(dev, B43_NPHY_TABLE_DATALO);</div><div class='add'>+			*((u32 *)data) =</div><div class='add'>+				b43_phy_read(dev, B43_NPHY_TABLE_DATALO);</div><div class='add'>+			*((u32 *)data) |=</div><div class='add'>+				b43_phy_read(dev, B43_NPHY_TABLE_DATAHI) &lt;&lt; 16;</div><div class='ctx'> 			data += 4;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -2932,6 +3013,13 @@ void b43_ntab_write_bulk(struct b43_wldev *dev, u32 offset,</div><div class='ctx'> 	b43_phy_write(dev, B43_NPHY_TABLE_ADDR, offset);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nr_elements; i++) {</div><div class='add'>+		/* Auto increment broken + caching issue on BCM43224? */</div><div class='add'>+		if ((offset &gt;&gt; 10) == 9 &amp;&amp; dev-&gt;dev-&gt;chip_id == 43224 &amp;&amp;</div><div class='add'>+		    dev-&gt;dev-&gt;chip_rev == 1) {</div><div class='add'>+			b43_phy_read(dev, B43_NPHY_TABLE_DATALO);</div><div class='add'>+			b43_phy_write(dev, B43_NPHY_TABLE_ADDR, offset + i);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		switch (type) {</div><div class='ctx'> 		case B43_NTAB_8BIT:</div><div class='ctx'> 			value = *data;</div><div class='hunk'>@@ -2999,6 +3087,8 @@ void b43_nphy_rev0_1_2_tables_init(struct b43_wldev *dev)</div><div class='ctx'> 	} while (0)</div><div class='ctx'> void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev)</div><div class='ctx'> {</div><div class='add'>+	struct ssb_sprom *sprom = dev-&gt;dev-&gt;bus_sprom;</div><div class='add'>+</div><div class='ctx'> 	/* Static tables */</div><div class='ctx'> 	ntab_upload_r3(dev, B43_NTAB_FRAMESTRUCT_R3, b43_ntab_framestruct_r3);</div><div class='ctx'> 	ntab_upload_r3(dev, B43_NTAB_PILOT_R3, b43_ntab_pilot_r3);</div><div class='hunk'>@@ -3029,7 +3119,11 @@ void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev)</div><div class='ctx'> 	ntab_upload_r3(dev, B43_NTAB_C1_LOFEEDTH_R3, b43_ntab_loftlt1_r3);</div><div class='ctx'> </div><div class='ctx'> 	/* Volatile tables */</div><div class='del'>-	/* TODO */</div><div class='add'>+	if (sprom-&gt;fem.ghz2.antswlut &lt; ARRAY_SIZE(b43_ntab_antswctl2g_r3))</div><div class='add'>+		ntab_upload_r3(dev, B43_NTAB_ANT_SW_CTL_R3,</div><div class='add'>+			       b43_ntab_antswctl2g_r3[sprom-&gt;fem.ghz2.antswlut]);</div><div class='add'>+	else</div><div class='add'>+		B43_WARN_ON(1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct nphy_gain_ctl_workaround_entry *b43_nphy_get_gain_ctl_workaround_ent(</div><div class='hunk'>@@ -3037,26 +3131,67 @@ struct nphy_gain_ctl_workaround_entry *b43_nphy_get_gain_ctl_workaround_ent(</div><div class='ctx'> {</div><div class='ctx'> 	struct nphy_gain_ctl_workaround_entry *e;</div><div class='ctx'> 	u8 phy_idx;</div><div class='add'>+	u8 tr_iso = ghz5 ? dev-&gt;dev-&gt;bus_sprom-&gt;fem.ghz5.tr_iso :</div><div class='add'>+			   dev-&gt;dev-&gt;bus_sprom-&gt;fem.ghz2.tr_iso;</div><div class='add'>+</div><div class='add'>+	if (!ghz5 &amp;&amp; dev-&gt;phy.rev &gt;= 6 &amp;&amp; dev-&gt;phy.radio_rev == 11)</div><div class='add'>+		return &amp;nphy_gain_ctl_wa_phy6_radio11_ghz2;</div><div class='ctx'> </div><div class='ctx'> 	B43_WARN_ON(dev-&gt;phy.rev &lt; 3);</div><div class='del'>-	if (dev-&gt;phy.rev &gt;= 5)</div><div class='add'>+	if (dev-&gt;phy.rev &gt;= 6)</div><div class='add'>+		phy_idx = 3;</div><div class='add'>+	else if (dev-&gt;phy.rev == 5)</div><div class='ctx'> 		phy_idx = 2;</div><div class='ctx'> 	else if (dev-&gt;phy.rev == 4)</div><div class='ctx'> 		phy_idx = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		phy_idx = 0;</div><div class='del'>-</div><div class='ctx'> 	e = &amp;nphy_gain_ctl_workaround[ghz5][phy_idx];</div><div class='ctx'> </div><div class='del'>-	/* Only one entry differs for external LNA, so instead making whole</div><div class='del'>-	 * table 2 times bigger, hack is here</div><div class='del'>-	 */</div><div class='del'>-	if (!ghz5 &amp;&amp; dev-&gt;phy.rev &gt;= 5 &amp;&amp; ext_lna) {</div><div class='del'>-		e-&gt;rfseq_init[0] &amp;= 0x0FFF;</div><div class='del'>-		e-&gt;rfseq_init[1] &amp;= 0x0FFF;</div><div class='del'>-		e-&gt;rfseq_init[2] &amp;= 0x0FFF;</div><div class='del'>-		e-&gt;rfseq_init[3] &amp;= 0x0FFF;</div><div class='del'>-		e-&gt;init_gain &amp;= 0x0FFF;</div><div class='add'>+	/* Some workarounds to the workarounds... */</div><div class='add'>+	if (ghz5 &amp;&amp; dev-&gt;phy.rev &gt;= 6) {</div><div class='add'>+		if (dev-&gt;phy.radio_rev == 11 &amp;&amp;</div><div class='add'>+		    !b43_channel_type_is_40mhz(dev-&gt;phy.channel_type))</div><div class='add'>+			e-&gt;cliplo_gain = 0x2d;</div><div class='add'>+	} else if (!ghz5 &amp;&amp; dev-&gt;phy.rev &gt;= 5) {</div><div class='add'>+		if (ext_lna) {</div><div class='add'>+			e-&gt;rfseq_init[0] &amp;= ~0x4000;</div><div class='add'>+			e-&gt;rfseq_init[1] &amp;= ~0x4000;</div><div class='add'>+			e-&gt;rfseq_init[2] &amp;= ~0x4000;</div><div class='add'>+			e-&gt;rfseq_init[3] &amp;= ~0x4000;</div><div class='add'>+			e-&gt;init_gain &amp;= ~0x4000;</div><div class='add'>+		}</div><div class='add'>+		switch (tr_iso) {</div><div class='add'>+		case 0:</div><div class='add'>+			e-&gt;cliplo_gain = 0x0062;</div><div class='add'>+		case 1:</div><div class='add'>+			e-&gt;cliplo_gain = 0x0064;</div><div class='add'>+		case 2:</div><div class='add'>+			e-&gt;cliplo_gain = 0x006a;</div><div class='add'>+		case 3:</div><div class='add'>+			e-&gt;cliplo_gain = 0x106a;</div><div class='add'>+		case 4:</div><div class='add'>+			e-&gt;cliplo_gain = 0x106c;</div><div class='add'>+		case 5:</div><div class='add'>+			e-&gt;cliplo_gain = 0x1074;</div><div class='add'>+		case 6:</div><div class='add'>+			e-&gt;cliplo_gain = 0x107c;</div><div class='add'>+		case 7:</div><div class='add'>+			e-&gt;cliplo_gain = 0x207c;</div><div class='add'>+		default:</div><div class='add'>+			e-&gt;cliplo_gain = 0x106a;</div><div class='add'>+		}</div><div class='add'>+	} else if (ghz5 &amp;&amp; dev-&gt;phy.rev == 4 &amp;&amp; ext_lna) {</div><div class='add'>+		e-&gt;rfseq_init[0] &amp;= ~0x4000;</div><div class='add'>+		e-&gt;rfseq_init[1] &amp;= ~0x4000;</div><div class='add'>+		e-&gt;rfseq_init[2] &amp;= ~0x4000;</div><div class='add'>+		e-&gt;rfseq_init[3] &amp;= ~0x4000;</div><div class='add'>+		e-&gt;init_gain &amp;= ~0x4000;</div><div class='add'>+		e-&gt;rfseq_init[0] |= 0x1000;</div><div class='add'>+		e-&gt;rfseq_init[1] |= 0x1000;</div><div class='add'>+		e-&gt;rfseq_init[2] |= 0x1000;</div><div class='add'>+		e-&gt;rfseq_init[3] |= 0x1000;</div><div class='add'>+		e-&gt;init_gain |= 0x1000;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return e;</div><div class='head'>diff --git a/drivers/net/wireless/b43/tables_nphy.h b/drivers/net/wireless/b43/tables_nphy.h<br/>index a81696bff0ed..97038c481930 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/tables_nphy.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/tables_nphy.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/tables_nphy.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43/tables_nphy.h</a></div><div class='hunk'>@@ -126,26 +126,29 @@ struct nphy_gain_ctl_workaround_entry *b43_nphy_get_gain_ctl_workaround_ent(</div><div class='ctx'> #define B43_NTAB_C1_LOFEEDTH		B43_NTAB16(0x1B, 0x1C0) /* Local Oscillator Feed Through Lookup Table Core 1 */</div><div class='ctx'> #define B43_NTAB_C1_LOFEEDTH_SIZE	128</div><div class='ctx'> </div><div class='add'>+/* Volatile N-PHY tables, PHY revision &gt;= 3 */</div><div class='add'>+#define B43_NTAB_ANT_SW_CTL_R3		B43_NTAB16( 9,   0) /* antenna software control */</div><div class='add'>+</div><div class='ctx'> /* Static N-PHY tables, PHY revision &gt;= 3 */</div><div class='del'>-#define B43_NTAB_FRAMESTRUCT_R3		B43_NTAB32(10, 000) /* frame struct  */</div><div class='del'>-#define B43_NTAB_PILOT_R3		B43_NTAB16(11, 000) /* pilot  */</div><div class='del'>-#define B43_NTAB_TMAP_R3		B43_NTAB32(12, 000) /* TM AP  */</div><div class='del'>-#define B43_NTAB_INTLEVEL_R3		B43_NTAB32(13, 000) /* INT LV  */</div><div class='del'>-#define B43_NTAB_TDTRN_R3		B43_NTAB32(14, 000) /* TD TRN  */</div><div class='del'>-#define B43_NTAB_NOISEVAR0_R3		B43_NTAB32(16, 000) /* noise variance 0  */</div><div class='add'>+#define B43_NTAB_FRAMESTRUCT_R3		B43_NTAB32(10,   0) /* frame struct  */</div><div class='add'>+#define B43_NTAB_PILOT_R3		B43_NTAB16(11,   0) /* pilot  */</div><div class='add'>+#define B43_NTAB_TMAP_R3		B43_NTAB32(12,   0) /* TM AP  */</div><div class='add'>+#define B43_NTAB_INTLEVEL_R3		B43_NTAB32(13,   0) /* INT LV  */</div><div class='add'>+#define B43_NTAB_TDTRN_R3		B43_NTAB32(14,   0) /* TD TRN  */</div><div class='add'>+#define B43_NTAB_NOISEVAR0_R3		B43_NTAB32(16,   0) /* noise variance 0  */</div><div class='ctx'> #define B43_NTAB_NOISEVAR1_R3		B43_NTAB32(16, 128) /* noise variance 1  */</div><div class='del'>-#define B43_NTAB_MCS_R3			B43_NTAB16(18, 000) /* MCS  */</div><div class='add'>+#define B43_NTAB_MCS_R3			B43_NTAB16(18,   0) /* MCS  */</div><div class='ctx'> #define B43_NTAB_TDI20A0_R3		B43_NTAB32(19, 128) /* TDI 20/0  */</div><div class='ctx'> #define B43_NTAB_TDI20A1_R3		B43_NTAB32(19, 256) /* TDI 20/1  */</div><div class='ctx'> #define B43_NTAB_TDI40A0_R3		B43_NTAB32(19, 640) /* TDI 40/0  */</div><div class='ctx'> #define B43_NTAB_TDI40A1_R3		B43_NTAB32(19, 768) /* TDI 40/1  */</div><div class='del'>-#define B43_NTAB_PILOTLT_R3		B43_NTAB32(20, 000) /* PLT lookup  */</div><div class='del'>-#define B43_NTAB_CHANEST_R3		B43_NTAB32(22, 000) /* channel estimate  */</div><div class='del'>-#define B43_NTAB_FRAMELT_R3		B43_NTAB8 (24, 000) /* frame lookup  */</div><div class='del'>-#define B43_NTAB_C0_ESTPLT_R3		B43_NTAB8 (26, 000) /* estimated power lookup 0  */</div><div class='del'>-#define B43_NTAB_C1_ESTPLT_R3		B43_NTAB8 (27, 000) /* estimated power lookup 1  */</div><div class='del'>-#define B43_NTAB_C0_ADJPLT_R3		B43_NTAB8 (26, 064) /* adjusted power lookup 0  */</div><div class='del'>-#define B43_NTAB_C1_ADJPLT_R3		B43_NTAB8 (27, 064) /* adjusted power lookup 1  */</div><div class='add'>+#define B43_NTAB_PILOTLT_R3		B43_NTAB32(20,   0) /* PLT lookup  */</div><div class='add'>+#define B43_NTAB_CHANEST_R3		B43_NTAB32(22,   0) /* channel estimate  */</div><div class='add'>+#define B43_NTAB_FRAMELT_R3		 B43_NTAB8(24,   0) /* frame lookup  */</div><div class='add'>+#define B43_NTAB_C0_ESTPLT_R3		 B43_NTAB8(26,   0) /* estimated power lookup 0  */</div><div class='add'>+#define B43_NTAB_C1_ESTPLT_R3		 B43_NTAB8(27,   0) /* estimated power lookup 1  */</div><div class='add'>+#define B43_NTAB_C0_ADJPLT_R3		 B43_NTAB8(26,  64) /* adjusted power lookup 0  */</div><div class='add'>+#define B43_NTAB_C1_ADJPLT_R3		 B43_NTAB8(27,  64) /* adjusted power lookup 1  */</div><div class='ctx'> #define B43_NTAB_C0_GAINCTL_R3		B43_NTAB32(26, 192) /* gain control lookup 0  */</div><div class='ctx'> #define B43_NTAB_C1_GAINCTL_R3		B43_NTAB32(27, 192) /* gain control lookup 1  */</div><div class='ctx'> #define B43_NTAB_C0_IQLT_R3		B43_NTAB32(26, 320) /* I/Q lookup 0  */</div><div class='head'>diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c<br/>index 5f77cbe0b6aa..2c5367884b3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/xmit.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43/xmit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43/xmit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43/xmit.c</a></div><div class='hunk'>@@ -874,7 +874,7 @@ bool b43_fill_txstatus_report(struct b43_wldev *dev,</div><div class='ctx'> 			      struct ieee80211_tx_info *report,</div><div class='ctx'> 			      const struct b43_txstatus *status)</div><div class='ctx'> {</div><div class='del'>-	bool frame_success = 1;</div><div class='add'>+	bool frame_success = true;</div><div class='ctx'> 	int retry_limit;</div><div class='ctx'> </div><div class='ctx'> 	/* preserve the confiured retry limit before clearing the status</div><div class='hunk'>@@ -890,7 +890,7 @@ bool b43_fill_txstatus_report(struct b43_wldev *dev,</div><div class='ctx'> 		/* The frame was not ACKed... */</div><div class='ctx'> 		if (!(report-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)) {</div><div class='ctx'> 			/* ...but we expected an ACK. */</div><div class='del'>-			frame_success = 0;</div><div class='add'>+			frame_success = false;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (status-&gt;frame_count == 0) {</div><div class='head'>diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/b43legacy/b43legacy.h<br/>index 1d4fc9db7f5e..98e3d44400c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43legacy/b43legacy.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43legacy/b43legacy.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43legacy/b43legacy.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43legacy/b43legacy.h</a></div><div class='hunk'>@@ -560,8 +560,16 @@ struct b43legacy_key {</div><div class='ctx'> 	u8 algorithm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define B43legacy_QOS_QUEUE_NUM	4</div><div class='add'>+</div><div class='ctx'> struct b43legacy_wldev;</div><div class='ctx'> </div><div class='add'>+/* QOS parameters for a queue. */</div><div class='add'>+struct b43legacy_qos_params {</div><div class='add'>+	/* The QOS parameters */</div><div class='add'>+	struct ieee80211_tx_queue_params p;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Data structure for the WLAN parts (802.11 cores) of the b43legacy chip. */</div><div class='ctx'> struct b43legacy_wl {</div><div class='ctx'> 	/* Pointer to the active wireless device on this chip */</div><div class='hunk'>@@ -611,6 +619,18 @@ struct b43legacy_wl {</div><div class='ctx'> 	bool beacon1_uploaded;</div><div class='ctx'> 	bool beacon_templates_virgin; /* Never wrote the templates? */</div><div class='ctx'> 	struct work_struct beacon_update_trigger;</div><div class='add'>+	/* The current QOS parameters for the 4 queues. */</div><div class='add'>+	struct b43legacy_qos_params qos_params[B43legacy_QOS_QUEUE_NUM];</div><div class='add'>+</div><div class='add'>+	/* Packet transmit work */</div><div class='add'>+	struct work_struct tx_work;</div><div class='add'>+</div><div class='add'>+	/* Queue of packets to be transmitted. */</div><div class='add'>+	struct sk_buff_head tx_queue[B43legacy_QOS_QUEUE_NUM];</div><div class='add'>+</div><div class='add'>+	/* Flag that implement the queues stopping. */</div><div class='add'>+	bool tx_queue_stopped[B43legacy_QOS_QUEUE_NUM];</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Pointers to the firmware data and meta information about it. */</div><div class='head'>diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c<br/>index c5535adf6991..f1f8bd09bd87 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43legacy/dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43legacy/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43legacy/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43legacy/dma.c</a></div><div class='hunk'>@@ -715,7 +715,7 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev,</div><div class='ctx'> 	ring-&gt;mmio_base = b43legacy_dmacontroller_base(type, controller_index);</div><div class='ctx'> 	ring-&gt;index = controller_index;</div><div class='ctx'> 	if (for_tx) {</div><div class='del'>-		ring-&gt;tx = 1;</div><div class='add'>+		ring-&gt;tx = true;</div><div class='ctx'> 		ring-&gt;current_slot = -1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (ring-&gt;index == 0) {</div><div class='hunk'>@@ -727,7 +727,6 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev,</div><div class='ctx'> 		} else</div><div class='ctx'> 			B43legacy_WARN_ON(1);</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_init(&amp;ring-&gt;lock);</div><div class='ctx'> #ifdef CONFIG_B43LEGACY_DEBUG</div><div class='ctx'> 	ring-&gt;last_injected_overflow = jiffies;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -806,7 +805,7 @@ void b43legacy_dma_free(struct b43legacy_wldev *dev)</div><div class='ctx'> static int b43legacy_dma_set_mask(struct b43legacy_wldev *dev, u64 mask)</div><div class='ctx'> {</div><div class='ctx'> 	u64 orig_mask = mask;</div><div class='del'>-	bool fallback = 0;</div><div class='add'>+	bool fallback = false;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Try to set the DMA mask. If it fails, try falling back to a</div><div class='hunk'>@@ -820,12 +819,12 @@ static int b43legacy_dma_set_mask(struct b43legacy_wldev *dev, u64 mask)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (mask == DMA_BIT_MASK(64)) {</div><div class='ctx'> 			mask = DMA_BIT_MASK(32);</div><div class='del'>-			fallback = 1;</div><div class='add'>+			fallback = true;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (mask == DMA_BIT_MASK(32)) {</div><div class='ctx'> 			mask = DMA_BIT_MASK(30);</div><div class='del'>-			fallback = 1;</div><div class='add'>+			fallback = true;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		b43legacyerr(dev-&gt;wl, "The machine/kernel does not support "</div><div class='hunk'>@@ -858,7 +857,7 @@ int b43legacy_dma_init(struct b43legacy_wldev *dev)</div><div class='ctx'> #ifdef CONFIG_B43LEGACY_PIO</div><div class='ctx'> 		b43legacywarn(dev-&gt;wl, "DMA for this device not supported. "</div><div class='ctx'> 			"Falling back to PIO\n");</div><div class='del'>-		dev-&gt;__using_pio = 1;</div><div class='add'>+		dev-&gt;__using_pio = true;</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> #else</div><div class='ctx'> 		b43legacyerr(dev-&gt;wl, "DMA for this device not supported and "</div><div class='hunk'>@@ -1068,7 +1067,7 @@ static int dma_tx_fragment(struct b43legacy_dmaring *ring,</div><div class='ctx'> 	memset(meta, 0, sizeof(*meta));</div><div class='ctx'> </div><div class='ctx'> 	meta-&gt;skb = skb;</div><div class='del'>-	meta-&gt;is_last_fragment = 1;</div><div class='add'>+	meta-&gt;is_last_fragment = true;</div><div class='ctx'> </div><div class='ctx'> 	meta-&gt;dmaaddr = map_descbuffer(ring, skb-&gt;data, skb-&gt;len, 1);</div><div class='ctx'> 	/* create a bounce buffer in zone_dma on mapping failure. */</div><div class='hunk'>@@ -1144,10 +1143,8 @@ int b43legacy_dma_tx(struct b43legacy_wldev *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct b43legacy_dmaring *ring;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	ring = priority_to_txring(dev, skb_get_queue_mapping(skb));</div><div class='del'>-	spin_lock_irqsave(&amp;ring-&gt;lock, flags);</div><div class='ctx'> 	B43legacy_WARN_ON(!ring-&gt;tx);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(ring-&gt;stopped)) {</div><div class='hunk'>@@ -1157,16 +1154,14 @@ int b43legacy_dma_tx(struct b43legacy_wldev *dev,</div><div class='ctx'> 		 * For now, just refuse the transmit. */</div><div class='ctx'> 		if (b43legacy_debug(dev, B43legacy_DBG_DMAVERBOSE))</div><div class='ctx'> 			b43legacyerr(dev-&gt;wl, "Packet after queue stopped\n");</div><div class='del'>-		err = -ENOSPC;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return -ENOSPC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(WARN_ON(free_slots(ring) &lt; SLOTS_PER_PACKET))) {</div><div class='ctx'> 		/* If we get here, we have a real error with the queue</div><div class='ctx'> 		 * full, but queues not stopped. */</div><div class='ctx'> 		b43legacyerr(dev-&gt;wl, "DMA queue overflow\n");</div><div class='del'>-		err = -ENOSPC;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return -ENOSPC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* dma_tx_fragment might reallocate the skb, so invalidate pointers pointing</div><div class='hunk'>@@ -1176,25 +1171,23 @@ int b43legacy_dma_tx(struct b43legacy_wldev *dev,</div><div class='ctx'> 		/* Drop this packet, as we don't have the encryption key</div><div class='ctx'> 		 * anymore and must not transmit it unencrypted. */</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='del'>-		err = 0;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(err)) {</div><div class='ctx'> 		b43legacyerr(dev-&gt;wl, "DMA tx mapping failure\n");</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((free_slots(ring) &lt; SLOTS_PER_PACKET) ||</div><div class='ctx'> 	    should_inject_overflow(ring)) {</div><div class='ctx'> 		/* This TX ring is full. */</div><div class='del'>-		ieee80211_stop_queue(dev-&gt;wl-&gt;hw, txring_to_priority(ring));</div><div class='del'>-		ring-&gt;stopped = 1;</div><div class='add'>+		unsigned int skb_mapping = skb_get_queue_mapping(skb);</div><div class='add'>+		ieee80211_stop_queue(dev-&gt;wl-&gt;hw, skb_mapping);</div><div class='add'>+		dev-&gt;wl-&gt;tx_queue_stopped[skb_mapping] = 1;</div><div class='add'>+		ring-&gt;stopped = true;</div><div class='ctx'> 		if (b43legacy_debug(dev, B43legacy_DBG_DMAVERBOSE))</div><div class='ctx'> 			b43legacydbg(dev-&gt;wl, "Stopped TX ring %d\n",</div><div class='ctx'> 			       ring-&gt;index);</div><div class='ctx'> 	}</div><div class='del'>-out_unlock:</div><div class='del'>-	spin_unlock_irqrestore(&amp;ring-&gt;lock, flags);</div><div class='del'>-</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1205,14 +1198,29 @@ void b43legacy_dma_handle_txstatus(struct b43legacy_wldev *dev,</div><div class='ctx'> 	struct b43legacy_dmadesc_meta *meta;</div><div class='ctx'> 	int retry_limit;</div><div class='ctx'> 	int slot;</div><div class='add'>+	int firstused;</div><div class='ctx'> </div><div class='ctx'> 	ring = parse_cookie(dev, status-&gt;cookie, &amp;slot);</div><div class='ctx'> 	if (unlikely(!ring))</div><div class='ctx'> 		return;</div><div class='del'>-	B43legacy_WARN_ON(!irqs_disabled());</div><div class='del'>-	spin_lock(&amp;ring-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 	B43legacy_WARN_ON(!ring-&gt;tx);</div><div class='add'>+</div><div class='add'>+	/* Sanity check: TX packets are processed in-order on one ring.</div><div class='add'>+	 * Check if the slot deduced from the cookie really is the first</div><div class='add'>+	 * used slot. */</div><div class='add'>+	firstused = ring-&gt;current_slot - ring-&gt;used_slots + 1;</div><div class='add'>+	if (firstused &lt; 0)</div><div class='add'>+		firstused = ring-&gt;nr_slots + firstused;</div><div class='add'>+	if (unlikely(slot != firstused)) {</div><div class='add'>+		/* This possibly is a firmware bug and will result in</div><div class='add'>+		 * malfunction, memory leaks and/or stall of DMA functionality.</div><div class='add'>+		 */</div><div class='add'>+		b43legacydbg(dev-&gt;wl, "Out of order TX status report on DMA "</div><div class='add'>+			     "ring %d. Expected %d, but got %d\n",</div><div class='add'>+			     ring-&gt;index, firstused, slot);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		B43legacy_WARN_ON(!(slot &gt;= 0 &amp;&amp; slot &lt; ring-&gt;nr_slots));</div><div class='ctx'> 		op32_idx2desc(ring, slot, &amp;meta);</div><div class='hunk'>@@ -1285,14 +1293,21 @@ void b43legacy_dma_handle_txstatus(struct b43legacy_wldev *dev,</div><div class='ctx'> 	dev-&gt;stats.last_tx = jiffies;</div><div class='ctx'> 	if (ring-&gt;stopped) {</div><div class='ctx'> 		B43legacy_WARN_ON(free_slots(ring) &lt; SLOTS_PER_PACKET);</div><div class='del'>-		ieee80211_wake_queue(dev-&gt;wl-&gt;hw, txring_to_priority(ring));</div><div class='del'>-		ring-&gt;stopped = 0;</div><div class='add'>+		ring-&gt;stopped = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;wl-&gt;tx_queue_stopped[ring-&gt;queue_prio]) {</div><div class='add'>+		dev-&gt;wl-&gt;tx_queue_stopped[ring-&gt;queue_prio] = 0;</div><div class='add'>+	} else {</div><div class='add'>+		/* If the driver queue is running wake the corresponding</div><div class='add'>+		 * mac80211 queue. */</div><div class='add'>+		ieee80211_wake_queue(dev-&gt;wl-&gt;hw, ring-&gt;queue_prio);</div><div class='ctx'> 		if (b43legacy_debug(dev, B43legacy_DBG_DMAVERBOSE))</div><div class='ctx'> 			b43legacydbg(dev-&gt;wl, "Woke up TX ring %d\n",</div><div class='del'>-			       ring-&gt;index);</div><div class='add'>+				     ring-&gt;index);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;ring-&gt;lock);</div><div class='add'>+	/* Add work to the queue. */</div><div class='add'>+	ieee80211_queue_work(dev-&gt;wl-&gt;hw, &amp;dev-&gt;wl-&gt;tx_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dma_rx(struct b43legacy_dmaring *ring,</div><div class='hunk'>@@ -1415,22 +1430,14 @@ void b43legacy_dma_rx(struct b43legacy_dmaring *ring)</div><div class='ctx'> </div><div class='ctx'> static void b43legacy_dma_tx_suspend_ring(struct b43legacy_dmaring *ring)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;ring-&gt;lock, flags);</div><div class='ctx'> 	B43legacy_WARN_ON(!ring-&gt;tx);</div><div class='ctx'> 	op32_tx_suspend(ring);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ring-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void b43legacy_dma_tx_resume_ring(struct b43legacy_dmaring *ring)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;ring-&gt;lock, flags);</div><div class='ctx'> 	B43legacy_WARN_ON(!ring-&gt;tx);</div><div class='ctx'> 	op32_tx_resume(ring);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ring-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void b43legacy_dma_tx_suspend(struct b43legacy_wldev *dev)</div><div class='head'>diff --git a/drivers/net/wireless/b43legacy/dma.h b/drivers/net/wireless/b43legacy/dma.h<br/>index 504a58767e95..c3282f906bc7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43legacy/dma.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43legacy/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43legacy/dma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43legacy/dma.h</a></div><div class='hunk'>@@ -150,8 +150,9 @@ struct b43legacy_dmaring {</div><div class='ctx'> 	enum b43legacy_dmatype type;</div><div class='ctx'> 	/* Boolean. Is this ring stopped at ieee80211 level? */</div><div class='ctx'> 	bool stopped;</div><div class='del'>-	/* Lock, only used for TX. */</div><div class='del'>-	spinlock_t lock;</div><div class='add'>+	/* The QOS priority assigned to this ring. Only used for TX rings.</div><div class='add'>+	 * This is the mac80211 "queue" value. */</div><div class='add'>+	u8 queue_prio;</div><div class='ctx'> 	struct b43legacy_wldev *dev;</div><div class='ctx'> #ifdef CONFIG_B43LEGACY_DEBUG</div><div class='ctx'> 	/* Maximum number of used slots. */</div><div class='head'>diff --git a/drivers/net/wireless/b43legacy/leds.c b/drivers/net/wireless/b43legacy/leds.c<br/>index 2f1bfdc44f94..fd4565389c77 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43legacy/leds.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43legacy/leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43legacy/leds.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43legacy/leds.c</a></div><div class='hunk'>@@ -203,11 +203,11 @@ void b43legacy_leds_init(struct b43legacy_wldev *dev)</div><div class='ctx'> 		if (sprom[i] == 0xFF) {</div><div class='ctx'> 			/* There is no LED information in the SPROM</div><div class='ctx'> 			 * for this LED. Hardcode it here. */</div><div class='del'>-			activelow = 0;</div><div class='add'>+			activelow = false;</div><div class='ctx'> 			switch (i) {</div><div class='ctx'> 			case 0:</div><div class='ctx'> 				behaviour = B43legacy_LED_ACTIVITY;</div><div class='del'>-				activelow = 1;</div><div class='add'>+				activelow = true;</div><div class='ctx'> 				if (bus-&gt;boardinfo.vendor == PCI_VENDOR_ID_COMPAQ)</div><div class='ctx'> 					behaviour = B43legacy_LED_RADIO_ALL;</div><div class='ctx'> 				break;</div><div class='head'>diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c<br/>index 20f02437af8c..75e70bce40f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43legacy/main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43legacy/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43legacy/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43legacy/main.c</a></div><div class='hunk'>@@ -722,9 +722,9 @@ void b43legacy_wireless_core_reset(struct b43legacy_wldev *dev, u32 flags)</div><div class='ctx'> 	macctl &amp;= ~B43legacy_MACCTL_GMODE;</div><div class='ctx'> 	if (flags &amp; B43legacy_TMSLOW_GMODE) {</div><div class='ctx'> 		macctl |= B43legacy_MACCTL_GMODE;</div><div class='del'>-		dev-&gt;phy.gmode = 1;</div><div class='add'>+		dev-&gt;phy.gmode = true;</div><div class='ctx'> 	} else</div><div class='del'>-		dev-&gt;phy.gmode = 0;</div><div class='add'>+		dev-&gt;phy.gmode = false;</div><div class='ctx'> 	macctl |= B43legacy_MACCTL_IHR_ENABLED;</div><div class='ctx'> 	b43legacy_write32(dev, B43legacy_MMIO_MACCTL, macctl);</div><div class='ctx'> }</div><div class='hunk'>@@ -811,7 +811,7 @@ static void b43legacy_calculate_link_quality(struct b43legacy_wldev *dev)</div><div class='ctx'> 	if (dev-&gt;noisecalc.calculation_running)</div><div class='ctx'> 		return;</div><div class='ctx'> 	dev-&gt;noisecalc.channel_at_start = dev-&gt;phy.channel;</div><div class='del'>-	dev-&gt;noisecalc.calculation_running = 1;</div><div class='add'>+	dev-&gt;noisecalc.calculation_running = true;</div><div class='ctx'> 	dev-&gt;noisecalc.nr_samples = 0;</div><div class='ctx'> </div><div class='ctx'> 	b43legacy_generate_noise_sample(dev);</div><div class='hunk'>@@ -873,7 +873,7 @@ static void handle_irq_noise(struct b43legacy_wldev *dev)</div><div class='ctx'> </div><div class='ctx'> 		dev-&gt;stats.link_noise = average;</div><div class='ctx'> drop_calculation:</div><div class='del'>-		dev-&gt;noisecalc.calculation_running = 0;</div><div class='add'>+		dev-&gt;noisecalc.calculation_running = false;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> generate_new:</div><div class='hunk'>@@ -889,7 +889,7 @@ static void handle_irq_tbtt_indication(struct b43legacy_wldev *dev)</div><div class='ctx'> 			b43legacy_power_saving_ctl_bits(dev, -1, -1);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (b43legacy_is_mode(dev-&gt;wl, NL80211_IFTYPE_ADHOC))</div><div class='del'>-		dev-&gt;dfq_valid = 1;</div><div class='add'>+		dev-&gt;dfq_valid = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void handle_irq_atim_end(struct b43legacy_wldev *dev)</div><div class='hunk'>@@ -898,7 +898,7 @@ static void handle_irq_atim_end(struct b43legacy_wldev *dev)</div><div class='ctx'> 		b43legacy_write32(dev, B43legacy_MMIO_MACCMD,</div><div class='ctx'> 				  b43legacy_read32(dev, B43legacy_MMIO_MACCMD)</div><div class='ctx'> 				  | B43legacy_MACCMD_DFQ_VALID);</div><div class='del'>-		dev-&gt;dfq_valid = 0;</div><div class='add'>+		dev-&gt;dfq_valid = false;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -971,7 +971,7 @@ static void b43legacy_write_beacon_template(struct b43legacy_wldev *dev,</div><div class='ctx'> 	unsigned int i, len, variable_len;</div><div class='ctx'> 	const struct ieee80211_mgmt *bcn;</div><div class='ctx'> 	const u8 *ie;</div><div class='del'>-	bool tim_found = 0;</div><div class='add'>+	bool tim_found = false;</div><div class='ctx'> 	unsigned int rate;</div><div class='ctx'> 	u16 ctl;</div><div class='ctx'> 	int antenna;</div><div class='hunk'>@@ -1019,7 +1019,7 @@ static void b43legacy_write_beacon_template(struct b43legacy_wldev *dev,</div><div class='ctx'> 			/* A valid TIM is at least 4 bytes long. */</div><div class='ctx'> 			if (ie_len &lt; 4)</div><div class='ctx'> 				break;</div><div class='del'>-			tim_found = 1;</div><div class='add'>+			tim_found = true;</div><div class='ctx'> </div><div class='ctx'> 			tim_position = sizeof(struct b43legacy_plcp_hdr6);</div><div class='ctx'> 			tim_position += offsetof(struct ieee80211_mgmt,</div><div class='hunk'>@@ -1172,7 +1172,7 @@ static void b43legacy_upload_beacon0(struct b43legacy_wldev *dev)</div><div class='ctx'> 	 *        but we don't use that feature anyway. */</div><div class='ctx'> 	b43legacy_write_probe_resp_template(dev, 0x268, 0x4A,</div><div class='ctx'> 				      &amp;__b43legacy_ratetable[3]);</div><div class='del'>-	wl-&gt;beacon0_uploaded = 1;</div><div class='add'>+	wl-&gt;beacon0_uploaded = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void b43legacy_upload_beacon1(struct b43legacy_wldev *dev)</div><div class='hunk'>@@ -1182,7 +1182,7 @@ static void b43legacy_upload_beacon1(struct b43legacy_wldev *dev)</div><div class='ctx'> 	if (wl-&gt;beacon1_uploaded)</div><div class='ctx'> 		return;</div><div class='ctx'> 	b43legacy_write_beacon_template(dev, 0x468, 0x1A);</div><div class='del'>-	wl-&gt;beacon1_uploaded = 1;</div><div class='add'>+	wl-&gt;beacon1_uploaded = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void handle_irq_beacon(struct b43legacy_wldev *dev)</div><div class='hunk'>@@ -1212,7 +1212,7 @@ static void handle_irq_beacon(struct b43legacy_wldev *dev)</div><div class='ctx'> 	if (unlikely(wl-&gt;beacon_templates_virgin)) {</div><div class='ctx'> 		/* We never uploaded a beacon before.</div><div class='ctx'> 		 * Upload both templates now, but only mark one valid. */</div><div class='del'>-		wl-&gt;beacon_templates_virgin = 0;</div><div class='add'>+		wl-&gt;beacon_templates_virgin = false;</div><div class='ctx'> 		b43legacy_upload_beacon0(dev);</div><div class='ctx'> 		b43legacy_upload_beacon1(dev);</div><div class='ctx'> 		cmd = b43legacy_read32(dev, B43legacy_MMIO_MACCMD);</div><div class='hunk'>@@ -1275,8 +1275,8 @@ static void b43legacy_update_templates(struct b43legacy_wl *wl)</div><div class='ctx'> 	if (wl-&gt;current_beacon)</div><div class='ctx'> 		dev_kfree_skb_any(wl-&gt;current_beacon);</div><div class='ctx'> 	wl-&gt;current_beacon = beacon;</div><div class='del'>-	wl-&gt;beacon0_uploaded = 0;</div><div class='del'>-	wl-&gt;beacon1_uploaded = 0;</div><div class='add'>+	wl-&gt;beacon0_uploaded = false;</div><div class='add'>+	wl-&gt;beacon1_uploaded = false;</div><div class='ctx'> 	ieee80211_queue_work(wl-&gt;hw, &amp;wl-&gt;beacon_update_trigger);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2440,30 +2440,64 @@ static int b43legacy_rng_init(struct b43legacy_wl *wl)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void b43legacy_tx_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct b43legacy_wl *wl = container_of(work, struct b43legacy_wl,</div><div class='add'>+				  tx_work);</div><div class='add'>+	struct b43legacy_wldev *dev;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int queue_num;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wl-&gt;mutex);</div><div class='add'>+	dev = wl-&gt;current_dev;</div><div class='add'>+	if (unlikely(!dev || b43legacy_status(dev) &lt; B43legacy_STAT_STARTED)) {</div><div class='add'>+		mutex_unlock(&amp;wl-&gt;mutex);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (queue_num = 0; queue_num &lt; B43legacy_QOS_QUEUE_NUM; queue_num++) {</div><div class='add'>+		while (skb_queue_len(&amp;wl-&gt;tx_queue[queue_num])) {</div><div class='add'>+			skb = skb_dequeue(&amp;wl-&gt;tx_queue[queue_num]);</div><div class='add'>+			if (b43legacy_using_pio(dev))</div><div class='add'>+				err = b43legacy_pio_tx(dev, skb);</div><div class='add'>+			else</div><div class='add'>+				err = b43legacy_dma_tx(dev, skb);</div><div class='add'>+			if (err == -ENOSPC) {</div><div class='add'>+				wl-&gt;tx_queue_stopped[queue_num] = 1;</div><div class='add'>+				ieee80211_stop_queue(wl-&gt;hw, queue_num);</div><div class='add'>+				skb_queue_head(&amp;wl-&gt;tx_queue[queue_num], skb);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (unlikely(err))</div><div class='add'>+				dev_kfree_skb(skb); /* Drop it */</div><div class='add'>+			err = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!err)</div><div class='add'>+			wl-&gt;tx_queue_stopped[queue_num] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void b43legacy_op_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 			    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);</div><div class='del'>-	struct b43legacy_wldev *dev = wl-&gt;current_dev;</div><div class='del'>-	int err = -ENODEV;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!dev))</div><div class='del'>-		goto out;</div><div class='del'>-	if (unlikely(b43legacy_status(dev) &lt; B43legacy_STAT_STARTED))</div><div class='del'>-		goto out;</div><div class='del'>-	/* DMA-TX is done without a global lock. */</div><div class='del'>-	if (b43legacy_using_pio(dev)) {</div><div class='del'>-		spin_lock_irqsave(&amp;wl-&gt;irq_lock, flags);</div><div class='del'>-		err = b43legacy_pio_tx(dev, skb);</div><div class='del'>-		spin_unlock_irqrestore(&amp;wl-&gt;irq_lock, flags);</div><div class='del'>-	} else</div><div class='del'>-		err = b43legacy_dma_tx(dev, skb);</div><div class='del'>-out:</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		/* Drop the packet. */</div><div class='add'>+	if (unlikely(skb-&gt;len &lt; 2 + 2 + 6)) {</div><div class='add'>+		/* Too short, this can't be a valid frame. */</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+	B43legacy_WARN_ON(skb_shinfo(skb)-&gt;nr_frags);</div><div class='add'>+</div><div class='add'>+	skb_queue_tail(&amp;wl-&gt;tx_queue[skb-&gt;queue_mapping], skb);</div><div class='add'>+	if (!wl-&gt;tx_queue_stopped[skb-&gt;queue_mapping])</div><div class='add'>+		ieee80211_queue_work(wl-&gt;hw, &amp;wl-&gt;tx_work);</div><div class='add'>+	else</div><div class='add'>+		ieee80211_stop_queue(wl-&gt;hw, skb-&gt;queue_mapping);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int b43legacy_op_conf_tx(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -2510,7 +2544,7 @@ static int find_wldev_for_phymode(struct b43legacy_wl *wl,</div><div class='ctx'> 		if (d-&gt;phy.possible_phymodes &amp; phymode) {</div><div class='ctx'> 			/* Ok, this device supports the PHY-mode.</div><div class='ctx'> 			 * Set the gmode bit. */</div><div class='del'>-			*gmode = 1;</div><div class='add'>+			*gmode = true;</div><div class='ctx'> 			*dev = d;</div><div class='ctx'> </div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -2546,7 +2580,7 @@ static int b43legacy_switch_phymode(struct b43legacy_wl *wl,</div><div class='ctx'> 	struct b43legacy_wldev *uninitialized_var(up_dev);</div><div class='ctx'> 	struct b43legacy_wldev *down_dev;</div><div class='ctx'> 	int err;</div><div class='del'>-	bool gmode = 0;</div><div class='add'>+	bool gmode = false;</div><div class='ctx'> 	int prev_status;</div><div class='ctx'> </div><div class='ctx'> 	err = find_wldev_for_phymode(wl, new_mode, &amp;up_dev, &amp;gmode);</div><div class='hunk'>@@ -2879,6 +2913,7 @@ static void b43legacy_wireless_core_stop(struct b43legacy_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b43legacy_wl *wl = dev-&gt;wl;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	int queue_num;</div><div class='ctx'> </div><div class='ctx'> 	if (b43legacy_status(dev) &lt; B43legacy_STAT_STARTED)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2898,11 +2933,16 @@ static void b43legacy_wireless_core_stop(struct b43legacy_wldev *dev)</div><div class='ctx'> 	/* Must unlock as it would otherwise deadlock. No races here.</div><div class='ctx'> 	 * Cancel the possibly running self-rearming periodic work. */</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;dev-&gt;periodic_work);</div><div class='add'>+	cancel_work_sync(&amp;wl-&gt;tx_work);</div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	ieee80211_stop_queues(wl-&gt;hw); /* FIXME this could cause a deadlock */</div><div class='add'>+	/* Drain all TX queues. */</div><div class='add'>+	for (queue_num = 0; queue_num &lt; B43legacy_QOS_QUEUE_NUM; queue_num++) {</div><div class='add'>+		while (skb_queue_len(&amp;wl-&gt;tx_queue[queue_num]))</div><div class='add'>+			dev_kfree_skb(skb_dequeue(&amp;wl-&gt;tx_queue[queue_num]));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	b43legacy_mac_suspend(dev);</div><div class='add'>+b43legacy_mac_suspend(dev);</div><div class='ctx'> 	free_irq(dev-&gt;dev-&gt;irq, dev);</div><div class='ctx'> 	b43legacydbg(wl, "Wireless interface stopped\n");</div><div class='ctx'> }</div><div class='hunk'>@@ -3044,12 +3084,12 @@ static void setup_struct_phy_for_init(struct b43legacy_wldev *dev,</div><div class='ctx'> </div><div class='ctx'> 	/* Assume the radio is enabled. If it's not enabled, the state will</div><div class='ctx'> 	 * immediately get fixed on the first periodic work run. */</div><div class='del'>-	dev-&gt;radio_hw_enable = 1;</div><div class='add'>+	dev-&gt;radio_hw_enable = true;</div><div class='ctx'> </div><div class='ctx'> 	phy-&gt;savedpctlreg = 0xFFFF;</div><div class='del'>-	phy-&gt;aci_enable = 0;</div><div class='del'>-	phy-&gt;aci_wlan_automatic = 0;</div><div class='del'>-	phy-&gt;aci_hw_rssi = 0;</div><div class='add'>+	phy-&gt;aci_enable = false;</div><div class='add'>+	phy-&gt;aci_wlan_automatic = false;</div><div class='add'>+	phy-&gt;aci_hw_rssi = false;</div><div class='ctx'> </div><div class='ctx'> 	lo = phy-&gt;_lo_pairs;</div><div class='ctx'> 	if (lo)</div><div class='hunk'>@@ -3081,7 +3121,7 @@ static void setup_struct_phy_for_init(struct b43legacy_wldev *dev,</div><div class='ctx'> static void setup_struct_wldev_for_init(struct b43legacy_wldev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* Flags */</div><div class='del'>-	dev-&gt;dfq_valid = 0;</div><div class='add'>+	dev-&gt;dfq_valid = false;</div><div class='ctx'> </div><div class='ctx'> 	/* Stats */</div><div class='ctx'> 	memset(&amp;dev-&gt;stats, 0, sizeof(dev-&gt;stats));</div><div class='hunk'>@@ -3187,9 +3227,9 @@ static void prepare_phy_data_for_init(struct b43legacy_wldev *dev)</div><div class='ctx'> 	phy-&gt;lofcal = 0xFFFF;</div><div class='ctx'> 	phy-&gt;initval = 0xFFFF;</div><div class='ctx'> </div><div class='del'>-	phy-&gt;aci_enable = 0;</div><div class='del'>-	phy-&gt;aci_wlan_automatic = 0;</div><div class='del'>-	phy-&gt;aci_hw_rssi = 0;</div><div class='add'>+	phy-&gt;aci_enable = false;</div><div class='add'>+	phy-&gt;aci_wlan_automatic = false;</div><div class='add'>+	phy-&gt;aci_hw_rssi = false;</div><div class='ctx'> </div><div class='ctx'> 	phy-&gt;antenna_diversity = 0xFFFF;</div><div class='ctx'> 	memset(phy-&gt;minlowsig, 0xFF, sizeof(phy-&gt;minlowsig));</div><div class='hunk'>@@ -3355,7 +3395,7 @@ static int b43legacy_op_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	b43legacydbg(wl, "Adding Interface type %d\n", vif-&gt;type);</div><div class='ctx'> </div><div class='ctx'> 	dev = wl-&gt;current_dev;</div><div class='del'>-	wl-&gt;operating = 1;</div><div class='add'>+	wl-&gt;operating = true;</div><div class='ctx'> 	wl-&gt;vif = vif;</div><div class='ctx'> 	wl-&gt;if_type = vif-&gt;type;</div><div class='ctx'> 	memcpy(wl-&gt;mac_addr, vif-&gt;addr, ETH_ALEN);</div><div class='hunk'>@@ -3389,7 +3429,7 @@ static void b43legacy_op_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	B43legacy_WARN_ON(wl-&gt;vif != vif);</div><div class='ctx'> 	wl-&gt;vif = NULL;</div><div class='ctx'> </div><div class='del'>-	wl-&gt;operating = 0;</div><div class='add'>+	wl-&gt;operating = false;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;wl-&gt;irq_lock, flags);</div><div class='ctx'> 	b43legacy_adjust_opmode(dev);</div><div class='hunk'>@@ -3413,10 +3453,10 @@ static int b43legacy_op_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	memset(wl-&gt;bssid, 0, ETH_ALEN);</div><div class='ctx'> 	memset(wl-&gt;mac_addr, 0, ETH_ALEN);</div><div class='ctx'> 	wl-&gt;filter_flags = 0;</div><div class='del'>-	wl-&gt;beacon0_uploaded = 0;</div><div class='del'>-	wl-&gt;beacon1_uploaded = 0;</div><div class='del'>-	wl-&gt;beacon_templates_virgin = 1;</div><div class='del'>-	wl-&gt;radio_enabled = 1;</div><div class='add'>+	wl-&gt;beacon0_uploaded = false;</div><div class='add'>+	wl-&gt;beacon1_uploaded = false;</div><div class='add'>+	wl-&gt;beacon_templates_virgin = true;</div><div class='add'>+	wl-&gt;radio_enabled = true;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -3455,7 +3495,7 @@ static void b43legacy_op_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 	if (b43legacy_status(dev) &gt;= B43legacy_STAT_STARTED)</div><div class='ctx'> 		b43legacy_wireless_core_stop(dev);</div><div class='ctx'> 	b43legacy_wireless_core_exit(dev);</div><div class='del'>-	wl-&gt;radio_enabled = 0;</div><div class='add'>+	wl-&gt;radio_enabled = false;</div><div class='ctx'> 	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3614,7 +3654,7 @@ static int b43legacy_wireless_core_attach(struct b43legacy_wldev *dev)</div><div class='ctx'> 		have_bphy = 1;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;phy.gmode = (have_gphy || have_bphy);</div><div class='del'>-	dev-&gt;phy.radio_on = 1;</div><div class='add'>+	dev-&gt;phy.radio_on = true;</div><div class='ctx'> 	tmp = dev-&gt;phy.gmode ? B43legacy_TMSLOW_GMODE : 0;</div><div class='ctx'> 	b43legacy_wireless_core_reset(dev, tmp);</div><div class='ctx'> </div><div class='hunk'>@@ -3705,7 +3745,7 @@ static int b43legacy_one_core_attach(struct ssb_device *dev,</div><div class='ctx'> 		     (void (*)(unsigned long))b43legacy_interrupt_tasklet,</div><div class='ctx'> 		     (unsigned long)wldev);</div><div class='ctx'> 	if (modparam_pio)</div><div class='del'>-		wldev-&gt;__using_pio = 1;</div><div class='add'>+		wldev-&gt;__using_pio = true;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;wldev-&gt;list);</div><div class='ctx'> </div><div class='ctx'> 	err = b43legacy_wireless_core_attach(wldev);</div><div class='hunk'>@@ -3748,6 +3788,7 @@ static int b43legacy_wireless_init(struct ssb_device *dev)</div><div class='ctx'> 	struct ieee80211_hw *hw;</div><div class='ctx'> 	struct b43legacy_wl *wl;</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='add'>+	int queue_num;</div><div class='ctx'> </div><div class='ctx'> 	b43legacy_sprom_fixup(dev-&gt;bus);</div><div class='ctx'> </div><div class='hunk'>@@ -3782,6 +3823,13 @@ static int b43legacy_wireless_init(struct ssb_device *dev)</div><div class='ctx'> 	mutex_init(&amp;wl-&gt;mutex);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;wl-&gt;devlist);</div><div class='ctx'> 	INIT_WORK(&amp;wl-&gt;beacon_update_trigger, b43legacy_beacon_update_trigger_work);</div><div class='add'>+	INIT_WORK(&amp;wl-&gt;tx_work, b43legacy_tx_work);</div><div class='add'>+</div><div class='add'>+	/* Initialize queues and flags. */</div><div class='add'>+	for (queue_num = 0; queue_num &lt; B43legacy_QOS_QUEUE_NUM; queue_num++) {</div><div class='add'>+		skb_queue_head_init(&amp;wl-&gt;tx_queue[queue_num]);</div><div class='add'>+		wl-&gt;tx_queue_stopped[queue_num] = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ssb_set_devtypedata(dev, wl);</div><div class='ctx'> 	b43legacyinfo(wl, "Broadcom %04X WLAN found (core revision %u)\n",</div><div class='head'>diff --git a/drivers/net/wireless/b43legacy/radio.c b/drivers/net/wireless/b43legacy/radio.c<br/>index 475eb14e665b..fcbafcd603cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43legacy/radio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/b43legacy/radio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/b43legacy/radio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/b43legacy/radio.c</a></div><div class='hunk'>@@ -1067,7 +1067,7 @@ b43legacy_radio_interference_mitigation_enable(struct b43legacy_wldev *dev,</div><div class='ctx'> 		if (b43legacy_phy_read(dev, 0x0033) &amp; 0x0800)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		phy-&gt;aci_enable = 1;</div><div class='add'>+		phy-&gt;aci_enable = true;</div><div class='ctx'> </div><div class='ctx'> 		phy_stacksave(B43legacy_PHY_RADIO_BITFIELD);</div><div class='ctx'> 		phy_stacksave(B43legacy_PHY_G_CRS);</div><div class='hunk'>@@ -1279,7 +1279,7 @@ b43legacy_radio_interference_mitigation_disable(struct b43legacy_wldev *dev,</div><div class='ctx'> 		if (!(b43legacy_phy_read(dev, 0x0033) &amp; 0x0800))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		phy-&gt;aci_enable = 0;</div><div class='add'>+		phy-&gt;aci_enable = false;</div><div class='ctx'> </div><div class='ctx'> 		phy_stackrestore(B43legacy_PHY_RADIO_BITFIELD);</div><div class='ctx'> 		phy_stackrestore(B43legacy_PHY_G_CRS);</div><div class='hunk'>@@ -1346,10 +1346,10 @@ int b43legacy_radio_set_interference_mitigation(struct b43legacy_wldev *dev,</div><div class='ctx'> 	    (phy-&gt;rev == 0) || (!phy-&gt;gmode))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	phy-&gt;aci_wlan_automatic = 0;</div><div class='add'>+	phy-&gt;aci_wlan_automatic = false;</div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case B43legacy_RADIO_INTERFMODE_AUTOWLAN:</div><div class='del'>-		phy-&gt;aci_wlan_automatic = 1;</div><div class='add'>+		phy-&gt;aci_wlan_automatic = true;</div><div class='ctx'> 		if (phy-&gt;aci_enable)</div><div class='ctx'> 			mode = B43legacy_RADIO_INTERFMODE_MANUALWLAN;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1371,8 +1371,8 @@ int b43legacy_radio_set_interference_mitigation(struct b43legacy_wldev *dev,</div><div class='ctx'> 								currentmode);</div><div class='ctx'> </div><div class='ctx'> 	if (mode == B43legacy_RADIO_INTERFMODE_NONE) {</div><div class='del'>-		phy-&gt;aci_enable = 0;</div><div class='del'>-		phy-&gt;aci_hw_rssi = 0;</div><div class='add'>+		phy-&gt;aci_enable = false;</div><div class='add'>+		phy-&gt;aci_hw_rssi = false;</div><div class='ctx'> 	} else</div><div class='ctx'> 		b43legacy_radio_interference_mitigation_enable(dev, mode);</div><div class='ctx'> 	phy-&gt;interfmode = mode;</div><div class='hunk'>@@ -2102,7 +2102,7 @@ void b43legacy_radio_turn_on(struct b43legacy_wldev *dev)</div><div class='ctx'> 					    phy-&gt;radio_off_context.rfover);</div><div class='ctx'> 			b43legacy_phy_write(dev, B43legacy_PHY_RFOVERVAL,</div><div class='ctx'> 					    phy-&gt;radio_off_context.rfoverval);</div><div class='del'>-			phy-&gt;radio_off_context.valid = 0;</div><div class='add'>+			phy-&gt;radio_off_context.valid = false;</div><div class='ctx'> 		}</div><div class='ctx'> 		channel = phy-&gt;channel;</div><div class='ctx'> 		err = b43legacy_radio_selectchannel(dev,</div><div class='hunk'>@@ -2113,7 +2113,7 @@ void b43legacy_radio_turn_on(struct b43legacy_wldev *dev)</div><div class='ctx'> 	default:</div><div class='ctx'> 		B43legacy_BUG_ON(1);</div><div class='ctx'> 	}</div><div class='del'>-	phy-&gt;radio_on = 1;</div><div class='add'>+	phy-&gt;radio_on = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void b43legacy_radio_turn_off(struct b43legacy_wldev *dev, bool force)</div><div class='hunk'>@@ -2131,14 +2131,14 @@ void b43legacy_radio_turn_off(struct b43legacy_wldev *dev, bool force)</div><div class='ctx'> 		if (!force) {</div><div class='ctx'> 			phy-&gt;radio_off_context.rfover = rfover;</div><div class='ctx'> 			phy-&gt;radio_off_context.rfoverval = rfoverval;</div><div class='del'>-			phy-&gt;radio_off_context.valid = 1;</div><div class='add'>+			phy-&gt;radio_off_context.valid = true;</div><div class='ctx'> 		}</div><div class='ctx'> 		b43legacy_phy_write(dev, B43legacy_PHY_RFOVER, rfover | 0x008C);</div><div class='ctx'> 		b43legacy_phy_write(dev, B43legacy_PHY_RFOVERVAL,</div><div class='ctx'> 				    rfoverval &amp; 0xFF73);</div><div class='ctx'> 	} else</div><div class='ctx'> 		b43legacy_phy_write(dev, 0x0015, 0xAA00);</div><div class='del'>-	phy-&gt;radio_on = 0;</div><div class='add'>+	phy-&gt;radio_on = false;</div><div class='ctx'> 	b43legacydbg(dev-&gt;wl, "Radio initialized\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/Kconfig b/drivers/net/wireless/brcm80211/Kconfig<br/>index 2069fc8f7ad1..cd6375de2a60 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/Kconfig</a></div><div class='hunk'>@@ -3,9 +3,8 @@ config BRCMUTIL</div><div class='ctx'> </div><div class='ctx'> config BRCMSMAC</div><div class='ctx'> 	tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"</div><div class='del'>-	depends on PCI</div><div class='ctx'> 	depends on MAC80211</div><div class='del'>-	depends on BCMA=n</div><div class='add'>+	depends on BCMA</div><div class='ctx'> 	select BRCMUTIL</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	select CRC_CCITT</div><div class='hunk'>@@ -18,16 +17,26 @@ config BRCMSMAC</div><div class='ctx'> </div><div class='ctx'> config BRCMFMAC</div><div class='ctx'> 	tristate "Broadcom IEEE802.11n embedded FullMAC WLAN driver"</div><div class='del'>-	depends on MMC</div><div class='ctx'> 	depends on CFG80211</div><div class='ctx'> 	select BRCMUTIL</div><div class='del'>-	select FW_LOADER</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This module adds support for embedded wireless adapters based on</div><div class='del'>-	  Broadcom IEEE802.11n FullMAC chipsets.  This driver uses the kernel's</div><div class='del'>-	  wireless extensions subsystem.  If you choose to build a module,</div><div class='add'>+	  Broadcom IEEE802.11n FullMAC chipsets. It has to work with at least</div><div class='add'>+	  one of the bus interface support. If you choose to build a module,</div><div class='ctx'> 	  it'll be called brcmfmac.ko.</div><div class='ctx'> </div><div class='add'>+config BRCMFMAC_SDIO</div><div class='add'>+	bool "SDIO bus interface support for FullMAC"</div><div class='add'>+	depends on MMC</div><div class='add'>+	depends on BRCMFMAC</div><div class='add'>+	select FW_LOADER</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	  This option enables the SDIO bus interface support for Broadcom</div><div class='add'>+	  FullMAC WLAN driver.</div><div class='add'>+	  Say Y if you want to use brcmfmac for a compatible SDIO interface</div><div class='add'>+	  wireless card.</div><div class='add'>+</div><div class='ctx'> config BRCMDBG</div><div class='ctx'> 	bool "Broadcom driver debug functions"</div><div class='ctx'> 	depends on BRCMSMAC || BRCMFMAC</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/brcm80211/brcmfmac/Makefile<br/>index b44e3094588a..9ca9ea1135ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmfmac/Makefile</a></div><div class='hunk'>@@ -19,15 +19,16 @@ ccflags-y += \</div><div class='ctx'> 	-Idrivers/net/wireless/brcm80211/brcmfmac	\</div><div class='ctx'> 	-Idrivers/net/wireless/brcm80211/include</div><div class='ctx'> </div><div class='del'>-DHDOFILES = \</div><div class='del'>-	wl_cfg80211.o \</div><div class='del'>-	dhd_cdc.o \</div><div class='del'>-	dhd_common.o \</div><div class='del'>-	dhd_sdio.o	\</div><div class='del'>-	dhd_linux.o \</div><div class='del'>-	bcmsdh.o \</div><div class='del'>-	bcmsdh_sdmmc.o</div><div class='del'>-</div><div class='ctx'> obj-$(CONFIG_BRCMFMAC) += brcmfmac.o</div><div class='del'>-brcmfmac-objs += $(DHDOFILES)</div><div class='add'>+brcmfmac-objs += \</div><div class='add'>+		wl_cfg80211.o \</div><div class='add'>+		dhd_cdc.o \</div><div class='add'>+		dhd_common.o \</div><div class='add'>+		dhd_linux.o</div><div class='add'>+brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \</div><div class='add'>+		dhd_sdio.o \</div><div class='add'>+		bcmsdh.o \</div><div class='add'>+		bcmsdh_sdmmc.o \</div><div class='add'>+		sdio_chip.o</div><div class='add'>+</div><div class='ctx'> ccflags-y += -D__CHECK_ENDIAN__</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h b/drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h<br/>deleted file mode 100644<br/>index d7d3afd5a10f..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2011 Broadcom Corporation</div><div class='del'>- *</div><div class='del'>- * Permission to use, copy, modify, and/or distribute this software for any</div><div class='del'>- * purpose with or without fee is hereby granted, provided that the above</div><div class='del'>- * copyright notice and this permission notice appear in all copies.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='del'>- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY</div><div class='del'>- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='del'>- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION</div><div class='del'>- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _bcmchip_h_</div><div class='del'>-#define _bcmchip_h_</div><div class='del'>-</div><div class='del'>-/* bcm4329 */</div><div class='del'>-/* SDIO device core, ID 0x829 */</div><div class='del'>-#define BCM4329_CORE_BUS_BASE		0x18011000</div><div class='del'>-/* internal memory core, ID 0x80e */</div><div class='del'>-#define BCM4329_CORE_SOCRAM_BASE	0x18003000</div><div class='del'>-/* ARM Cortex M3 core, ID 0x82a */</div><div class='del'>-#define BCM4329_CORE_ARM_BASE		0x18002000</div><div class='del'>-#define BCM4329_RAMSIZE			0x48000</div><div class='del'>-/* firmware name */</div><div class='del'>-#define BCM4329_FW_NAME			"brcm/bcm4329-fullmac-4.bin"</div><div class='del'>-#define BCM4329_NV_NAME			"brcm/bcm4329-fullmac-4.txt"</div><div class='del'>-</div><div class='del'>-#endif				/* _bcmchip_h_ */</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c<br/>index 89ff94da556a..4bc8d251acf8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> #include &lt;brcmu_utils.h&gt;</div><div class='ctx'> #include &lt;brcmu_wifi.h&gt;</div><div class='ctx'> #include &lt;soc.h&gt;</div><div class='del'>-#include "dhd.h"</div><div class='ctx'> #include "dhd_bus.h"</div><div class='ctx'> #include "dhd_dbg.h"</div><div class='ctx'> #include "sdio_host.h"</div><div class='hunk'>@@ -51,12 +50,18 @@ static void brcmf_sdioh_irqhandler(struct sdio_func *func)</div><div class='ctx'> 	sdio_claim_host(func);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* dummy handler for SDIO function 2 interrupt */</div><div class='add'>+static void brcmf_sdioh_dummy_irq_handler(struct sdio_func *func)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int brcmf_sdcard_intr_reg(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> {</div><div class='ctx'> 	brcmf_dbg(TRACE, "Entering\n");</div><div class='ctx'> </div><div class='ctx'> 	sdio_claim_host(sdiodev-&gt;func[1]);</div><div class='ctx'> 	sdio_claim_irq(sdiodev-&gt;func[1], brcmf_sdioh_irqhandler);</div><div class='add'>+	sdio_claim_irq(sdiodev-&gt;func[2], brcmf_sdioh_dummy_irq_handler);</div><div class='ctx'> 	sdio_release_host(sdiodev-&gt;func[1]);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -67,6 +72,7 @@ int brcmf_sdcard_intr_dereg(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> 	brcmf_dbg(TRACE, "Entering\n");</div><div class='ctx'> </div><div class='ctx'> 	sdio_claim_host(sdiodev-&gt;func[1]);</div><div class='add'>+	sdio_release_irq(sdiodev-&gt;func[2]);</div><div class='ctx'> 	sdio_release_irq(sdiodev-&gt;func[1]);</div><div class='ctx'> 	sdio_release_host(sdiodev-&gt;func[1]);</div><div class='ctx'> </div><div class='hunk'>@@ -222,19 +228,12 @@ bool brcmf_sdcard_regfail(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> 	return sdiodev-&gt;regfail;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,</div><div class='del'>-		      uint flags,</div><div class='del'>-		      u8 *buf, uint nbytes, struct sk_buff *pkt)</div><div class='add'>+static int brcmf_sdcard_recv_prepare(struct brcmf_sdio_dev *sdiodev, uint fn,</div><div class='add'>+				     uint flags, uint width, u32 *addr)</div><div class='ctx'> {</div><div class='del'>-	int status;</div><div class='del'>-	uint incr_fix;</div><div class='del'>-	uint width;</div><div class='del'>-	uint bar0 = addr &amp; ~SBSDIO_SB_OFT_ADDR_MASK;</div><div class='add'>+	uint bar0 = *addr &amp; ~SBSDIO_SB_OFT_ADDR_MASK;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n", fn, addr, nbytes);</div><div class='del'>-</div><div class='ctx'> 	/* Async not implemented yet */</div><div class='ctx'> 	if (flags &amp; SDIO_REQ_ASYNC)</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='hunk'>@@ -247,29 +246,114 @@ brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,</div><div class='ctx'> 		sdiodev-&gt;sbwad = bar0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	addr &amp;= SBSDIO_SB_OFT_ADDR_MASK;</div><div class='add'>+	*addr &amp;= SBSDIO_SB_OFT_ADDR_MASK;</div><div class='add'>+</div><div class='add'>+	if (width == 4)</div><div class='add'>+		*addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,</div><div class='add'>+		      uint flags, u8 *buf, uint nbytes)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *mypkt;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mypkt = brcmu_pkt_buf_get_skb(nbytes);</div><div class='add'>+	if (!mypkt) {</div><div class='add'>+		brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: len %d\n",</div><div class='add'>+			  nbytes);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = brcmf_sdcard_recv_pkt(sdiodev, addr, fn, flags, mypkt);</div><div class='add'>+	if (!err)</div><div class='add'>+		memcpy(buf, mypkt-&gt;data, nbytes);</div><div class='add'>+</div><div class='add'>+	brcmu_pkt_buf_free_skb(mypkt);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,</div><div class='add'>+		      uint flags, struct sk_buff *pkt)</div><div class='add'>+{</div><div class='add'>+	uint incr_fix;</div><div class='add'>+	uint width;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n",</div><div class='add'>+		  fn, addr, pkt-&gt;len);</div><div class='add'>+</div><div class='add'>+	width = (flags &amp; SDIO_REQ_4BYTE) ? 4 : 2;</div><div class='add'>+	err = brcmf_sdcard_recv_prepare(sdiodev, fn, flags, width, &amp;addr);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	incr_fix = (flags &amp; SDIO_REQ_FIXED) ? SDIOH_DATA_FIX : SDIOH_DATA_INC;</div><div class='add'>+	err = brcmf_sdioh_request_buffer(sdiodev, incr_fix, SDIOH_READ,</div><div class='add'>+					 fn, addr, pkt);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,</div><div class='add'>+			    uint flags, struct sk_buff_head *pktq)</div><div class='add'>+{</div><div class='add'>+	uint incr_fix;</div><div class='add'>+	uint width;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n",</div><div class='add'>+		  fn, addr, pktq-&gt;qlen);</div><div class='add'>+</div><div class='ctx'> 	width = (flags &amp; SDIO_REQ_4BYTE) ? 4 : 2;</div><div class='del'>-	if (width == 4)</div><div class='del'>-		addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;</div><div class='add'>+	err = brcmf_sdcard_recv_prepare(sdiodev, fn, flags, width, &amp;addr);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	status = brcmf_sdioh_request_buffer(sdiodev, incr_fix, SDIOH_READ,</div><div class='del'>-					    fn, addr, width, nbytes, buf, pkt);</div><div class='add'>+	incr_fix = (flags &amp; SDIO_REQ_FIXED) ? SDIOH_DATA_FIX : SDIOH_DATA_INC;</div><div class='add'>+	err = brcmf_sdioh_request_chain(sdiodev, incr_fix, SDIOH_READ, fn, addr,</div><div class='add'>+					pktq);</div><div class='ctx'> </div><div class='del'>-	return status;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,</div><div class='del'>-		      uint flags, u8 *buf, uint nbytes, struct sk_buff *pkt)</div><div class='add'>+		      uint flags, u8 *buf, uint nbytes)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *mypkt;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mypkt = brcmu_pkt_buf_get_skb(nbytes);</div><div class='add'>+	if (!mypkt) {</div><div class='add'>+		brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: len %d\n",</div><div class='add'>+			  nbytes);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(mypkt-&gt;data, buf, nbytes);</div><div class='add'>+	err = brcmf_sdcard_send_pkt(sdiodev, addr, fn, flags, mypkt);</div><div class='add'>+</div><div class='add'>+	brcmu_pkt_buf_free_skb(mypkt);</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,</div><div class='add'>+		      uint flags, struct sk_buff *pkt)</div><div class='ctx'> {</div><div class='ctx'> 	uint incr_fix;</div><div class='ctx'> 	uint width;</div><div class='ctx'> 	uint bar0 = addr &amp; ~SBSDIO_SB_OFT_ADDR_MASK;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n", fn, addr, nbytes);</div><div class='add'>+	brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n",</div><div class='add'>+		  fn, addr, pkt-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* Async not implemented yet */</div><div class='ctx'> 	if (flags &amp; SDIO_REQ_ASYNC)</div><div class='hunk'>@@ -291,18 +375,39 @@ brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,</div><div class='ctx'> 		addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;</div><div class='ctx'> </div><div class='ctx'> 	return brcmf_sdioh_request_buffer(sdiodev, incr_fix, SDIOH_WRITE, fn,</div><div class='del'>-					  addr, width, nbytes, buf, pkt);</div><div class='add'>+					  addr, pkt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw, u32 addr,</div><div class='ctx'> 			u8 *buf, uint nbytes)</div><div class='ctx'> {</div><div class='add'>+	struct sk_buff *mypkt;</div><div class='add'>+	bool write = rw ? SDIOH_WRITE : SDIOH_READ;</div><div class='add'>+	int err;</div><div class='add'>+</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'>-	return brcmf_sdioh_request_buffer(sdiodev, SDIOH_DATA_INC,</div><div class='del'>-		(rw ? SDIOH_WRITE : SDIOH_READ), SDIO_FUNC_1,</div><div class='del'>-		addr, 4, nbytes, buf, NULL);</div><div class='add'>+	mypkt = brcmu_pkt_buf_get_skb(nbytes);</div><div class='add'>+	if (!mypkt) {</div><div class='add'>+		brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: len %d\n",</div><div class='add'>+			  nbytes);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* For a write, copy the buffer data into the packet. */</div><div class='add'>+	if (write)</div><div class='add'>+		memcpy(mypkt-&gt;data, buf, nbytes);</div><div class='add'>+</div><div class='add'>+	err = brcmf_sdioh_request_buffer(sdiodev, SDIOH_DATA_INC, write,</div><div class='add'>+					 SDIO_FUNC_1, addr, mypkt);</div><div class='add'>+</div><div class='add'>+	/* For a read, copy the packet data back to the buffer. */</div><div class='add'>+	if (!err &amp;&amp; !write)</div><div class='add'>+		memcpy(buf, mypkt-&gt;data, nbytes);</div><div class='add'>+</div><div class='add'>+	brcmu_pkt_buf_free_skb(mypkt);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn)</div><div class='hunk'>@@ -333,7 +438,7 @@ int brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> 	sdiodev-&gt;sbwad = SI_ENUM_BASE;</div><div class='ctx'> </div><div class='ctx'> 	/* try to attach to the target device */</div><div class='del'>-	sdiodev-&gt;bus = brcmf_sdbrcm_probe(0, 0, 0, 0, regs, sdiodev);</div><div class='add'>+	sdiodev-&gt;bus = brcmf_sdbrcm_probe(regs, sdiodev);</div><div class='ctx'> 	if (!sdiodev-&gt;bus) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "device attach failed\n");</div><div class='ctx'> 		ret = -ENODEV;</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c<br/>index bbaeb2d5c93a..9b8c0ed833d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c</a></div><div class='hunk'>@@ -31,15 +31,15 @@</div><div class='ctx'> #include &lt;brcmu_utils.h&gt;</div><div class='ctx'> #include &lt;brcmu_wifi.h&gt;</div><div class='ctx'> #include "sdio_host.h"</div><div class='del'>-#include "dhd.h"</div><div class='ctx'> #include "dhd_dbg.h"</div><div class='del'>-#include "wl_cfg80211.h"</div><div class='add'>+#include "dhd_bus.h"</div><div class='ctx'> </div><div class='ctx'> #define SDIO_VENDOR_ID_BROADCOM		0x02d0</div><div class='ctx'> </div><div class='ctx'> #define DMA_ALIGN_MASK	0x03</div><div class='ctx'> </div><div class='ctx'> #define SDIO_DEVICE_ID_BROADCOM_4329	0x4329</div><div class='add'>+#define SDIO_DEVICE_ID_BROADCOM_4330	0x4330</div><div class='ctx'> </div><div class='ctx'> #define SDIO_FUNC1_BLOCKSIZE		64</div><div class='ctx'> #define SDIO_FUNC2_BLOCKSIZE		512</div><div class='hunk'>@@ -47,6 +47,7 @@</div><div class='ctx'> /* devices we support, null terminated */</div><div class='ctx'> static const struct sdio_device_id brcmf_sdmmc_ids[] = {</div><div class='ctx'> 	{SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4329)},</div><div class='add'>+	{SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4330)},</div><div class='ctx'> 	{ /* end: all zeroes */ },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);</div><div class='hunk'>@@ -204,62 +205,75 @@ int brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev,</div><div class='ctx'> 	return err_ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* precondition: host controller is claimed */</div><div class='ctx'> static int</div><div class='del'>-brcmf_sdioh_request_packet(struct brcmf_sdio_dev *sdiodev, uint fix_inc,</div><div class='del'>-			   uint write, uint func, uint addr,</div><div class='del'>-			   struct sk_buff *pkt)</div><div class='add'>+brcmf_sdioh_request_data(struct brcmf_sdio_dev *sdiodev, uint write, bool fifo,</div><div class='add'>+			 uint func, uint addr, struct sk_buff *pkt, uint pktlen)</div><div class='add'>+{</div><div class='add'>+	int err_ret = 0;</div><div class='add'>+</div><div class='add'>+	if ((write) &amp;&amp; (!fifo)) {</div><div class='add'>+		err_ret = sdio_memcpy_toio(sdiodev-&gt;func[func], addr,</div><div class='add'>+					   ((u8 *) (pkt-&gt;data)), pktlen);</div><div class='add'>+	} else if (write) {</div><div class='add'>+		err_ret = sdio_memcpy_toio(sdiodev-&gt;func[func], addr,</div><div class='add'>+					   ((u8 *) (pkt-&gt;data)), pktlen);</div><div class='add'>+	} else if (fifo) {</div><div class='add'>+		err_ret = sdio_readsb(sdiodev-&gt;func[func],</div><div class='add'>+				      ((u8 *) (pkt-&gt;data)), addr, pktlen);</div><div class='add'>+	} else {</div><div class='add'>+		err_ret = sdio_memcpy_fromio(sdiodev-&gt;func[func],</div><div class='add'>+					     ((u8 *) (pkt-&gt;data)),</div><div class='add'>+					     addr, pktlen);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err_ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function takes a queue of packets. The packets on the queue</div><div class='add'>+ * are assumed to be properly aligned by the caller.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc,</div><div class='add'>+			  uint write, uint func, uint addr,</div><div class='add'>+			  struct sk_buff_head *pktq)</div><div class='ctx'> {</div><div class='ctx'> 	bool fifo = (fix_inc == SDIOH_DATA_FIX);</div><div class='ctx'> 	u32 SGCount = 0;</div><div class='ctx'> 	int err_ret = 0;</div><div class='ctx'> </div><div class='del'>-	struct sk_buff *pnext;</div><div class='add'>+	struct sk_buff *pkt;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='del'>-	brcmf_pm_resume_wait(sdiodev, &amp;sdiodev-&gt;request_packet_wait);</div><div class='add'>+	brcmf_pm_resume_wait(sdiodev, &amp;sdiodev-&gt;request_chain_wait);</div><div class='ctx'> 	if (brcmf_pm_resume_error(sdiodev))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	/* Claim host controller */</div><div class='ctx'> 	sdio_claim_host(sdiodev-&gt;func[func]);</div><div class='del'>-	for (pnext = pkt; pnext; pnext = pnext-&gt;next) {</div><div class='del'>-		uint pkt_len = pnext-&gt;len;</div><div class='add'>+</div><div class='add'>+	skb_queue_walk(pktq, pkt) {</div><div class='add'>+		uint pkt_len = pkt-&gt;len;</div><div class='ctx'> 		pkt_len += 3;</div><div class='ctx'> 		pkt_len &amp;= 0xFFFFFFFC;</div><div class='ctx'> </div><div class='del'>-		if ((write) &amp;&amp; (!fifo)) {</div><div class='del'>-			err_ret = sdio_memcpy_toio(sdiodev-&gt;func[func], addr,</div><div class='del'>-						   ((u8 *) (pnext-&gt;data)),</div><div class='del'>-						   pkt_len);</div><div class='del'>-		} else if (write) {</div><div class='del'>-			err_ret = sdio_memcpy_toio(sdiodev-&gt;func[func], addr,</div><div class='del'>-						   ((u8 *) (pnext-&gt;data)),</div><div class='del'>-						   pkt_len);</div><div class='del'>-		} else if (fifo) {</div><div class='del'>-			err_ret = sdio_readsb(sdiodev-&gt;func[func],</div><div class='del'>-					      ((u8 *) (pnext-&gt;data)),</div><div class='del'>-					      addr, pkt_len);</div><div class='del'>-		} else {</div><div class='del'>-			err_ret = sdio_memcpy_fromio(sdiodev-&gt;func[func],</div><div class='del'>-						     ((u8 *) (pnext-&gt;data)),</div><div class='del'>-						     addr, pkt_len);</div><div class='del'>-		}</div><div class='del'>-</div><div class='add'>+		err_ret = brcmf_sdioh_request_data(sdiodev, write, fifo, func,</div><div class='add'>+						   addr, pkt, pkt_len);</div><div class='ctx'> 		if (err_ret) {</div><div class='ctx'> 			brcmf_dbg(ERROR, "%s FAILED %p[%d], addr=0x%05x, pkt_len=%d, ERR=0x%08x\n",</div><div class='del'>-				  write ? "TX" : "RX", pnext, SGCount, addr,</div><div class='add'>+				  write ? "TX" : "RX", pkt, SGCount, addr,</div><div class='ctx'> 				  pkt_len, err_ret);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			brcmf_dbg(TRACE, "%s xfr'd %p[%d], addr=0x%05x, len=%d\n",</div><div class='del'>-				  write ? "TX" : "RX", pnext, SGCount, addr,</div><div class='add'>+				  write ? "TX" : "RX", pkt, SGCount, addr,</div><div class='ctx'> 				  pkt_len);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 		if (!fifo)</div><div class='ctx'> 			addr += pkt_len;</div><div class='del'>-		SGCount++;</div><div class='ctx'> </div><div class='add'>+		SGCount++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Release host controller */</div><div class='hunk'>@@ -270,91 +284,45 @@ brcmf_sdioh_request_packet(struct brcmf_sdio_dev *sdiodev, uint fix_inc,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This function takes a buffer or packet, and fixes everything up</div><div class='del'>- * so that in the end, a DMA-able packet is created.</div><div class='del'>- *</div><div class='del'>- * A buffer does not have an associated packet pointer,</div><div class='del'>- * and may or may not be aligned.</div><div class='del'>- * A packet may consist of a single packet, or a packet chain.</div><div class='del'>- * If it is a packet chain, then all the packets in the chain</div><div class='del'>- * must be properly aligned.</div><div class='del'>- *</div><div class='del'>- * If the packet data is not aligned, then there may only be</div><div class='del'>- * one packet, and in this case,  it is copied to a new</div><div class='del'>- * aligned packet.</div><div class='del'>- *</div><div class='add'>+ * This function takes a single DMA-able packet.</div><div class='ctx'>  */</div><div class='ctx'> int brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev,</div><div class='ctx'> 			       uint fix_inc, uint write, uint func, uint addr,</div><div class='del'>-			       uint reg_width, uint buflen_u, u8 *buffer,</div><div class='ctx'> 			       struct sk_buff *pkt)</div><div class='ctx'> {</div><div class='del'>-	int Status;</div><div class='del'>-	struct sk_buff *mypkt = NULL;</div><div class='add'>+	int status;</div><div class='add'>+	uint pkt_len = pkt-&gt;len;</div><div class='add'>+	bool fifo = (fix_inc == SDIOH_DATA_FIX);</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='add'>+	if (pkt == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	brcmf_pm_resume_wait(sdiodev, &amp;sdiodev-&gt;request_buffer_wait);</div><div class='ctx'> 	if (brcmf_pm_resume_error(sdiodev))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	/* Case 1: we don't have a packet. */</div><div class='del'>-	if (pkt == NULL) {</div><div class='del'>-		brcmf_dbg(DATA, "Creating new %s Packet, len=%d\n",</div><div class='del'>-			  write ? "TX" : "RX", buflen_u);</div><div class='del'>-		mypkt = brcmu_pkt_buf_get_skb(buflen_u);</div><div class='del'>-		if (!mypkt) {</div><div class='del'>-			brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: len %d\n",</div><div class='del'>-				  buflen_u);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* For a write, copy the buffer data into the packet. */</div><div class='del'>-		if (write)</div><div class='del'>-			memcpy(mypkt-&gt;data, buffer, buflen_u);</div><div class='del'>-</div><div class='del'>-		Status = brcmf_sdioh_request_packet(sdiodev, fix_inc, write,</div><div class='del'>-						    func, addr, mypkt);</div><div class='del'>-</div><div class='del'>-		/* For a read, copy the packet data back to the buffer. */</div><div class='del'>-		if (!write)</div><div class='del'>-			memcpy(buffer, mypkt-&gt;data, buflen_u);</div><div class='del'>-</div><div class='del'>-		brcmu_pkt_buf_free_skb(mypkt);</div><div class='del'>-	} else if (((ulong) (pkt-&gt;data) &amp; DMA_ALIGN_MASK) != 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * Case 2: We have a packet, but it is unaligned.</div><div class='del'>-		 * In this case, we cannot have a chain (pkt-&gt;next == NULL)</div><div class='del'>-		 */</div><div class='del'>-		brcmf_dbg(DATA, "Creating aligned %s Packet, len=%d\n",</div><div class='del'>-			  write ? "TX" : "RX", pkt-&gt;len);</div><div class='del'>-		mypkt = brcmu_pkt_buf_get_skb(pkt-&gt;len);</div><div class='del'>-		if (!mypkt) {</div><div class='del'>-			brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: len %d\n",</div><div class='del'>-				  pkt-&gt;len);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		/* For a write, copy the buffer data into the packet. */</div><div class='del'>-		if (write)</div><div class='del'>-			memcpy(mypkt-&gt;data, pkt-&gt;data, pkt-&gt;len);</div><div class='del'>-</div><div class='del'>-		Status = brcmf_sdioh_request_packet(sdiodev, fix_inc, write,</div><div class='del'>-						    func, addr, mypkt);</div><div class='add'>+	/* Claim host controller */</div><div class='add'>+	sdio_claim_host(sdiodev-&gt;func[func]);</div><div class='ctx'> </div><div class='del'>-		/* For a read, copy the packet data back to the buffer. */</div><div class='del'>-		if (!write)</div><div class='del'>-			memcpy(pkt-&gt;data, mypkt-&gt;data, mypkt-&gt;len);</div><div class='add'>+	pkt_len += 3;</div><div class='add'>+	pkt_len &amp;= (uint)~3;</div><div class='ctx'> </div><div class='del'>-		brcmu_pkt_buf_free_skb(mypkt);</div><div class='del'>-	} else {		/* case 3: We have a packet and</div><div class='del'>-				 it is aligned. */</div><div class='del'>-		brcmf_dbg(DATA, "Aligned %s Packet, direct DMA\n",</div><div class='del'>-			  write ? "Tx" : "Rx");</div><div class='del'>-		Status = brcmf_sdioh_request_packet(sdiodev, fix_inc, write,</div><div class='del'>-						    func, addr, pkt);</div><div class='add'>+	status = brcmf_sdioh_request_data(sdiodev, write, fifo, func,</div><div class='add'>+					   addr, pkt, pkt_len);</div><div class='add'>+	if (status) {</div><div class='add'>+		brcmf_dbg(ERROR, "%s FAILED %p, addr=0x%05x, pkt_len=%d, ERR=0x%08x\n",</div><div class='add'>+			  write ? "TX" : "RX", pkt, addr, pkt_len, status);</div><div class='add'>+	} else {</div><div class='add'>+		brcmf_dbg(TRACE, "%s xfr'd %p, addr=0x%05x, len=%d\n",</div><div class='add'>+			  write ? "TX" : "RX", pkt, addr, pkt_len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return Status;</div><div class='add'>+	/* Release host controller */</div><div class='add'>+	sdio_release_host(sdiodev-&gt;func[func]);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Read client card reg */</div><div class='hunk'>@@ -494,6 +462,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct brcmf_sdio_dev *sdiodev;</div><div class='add'>+	struct brcmf_bus *bus_if;</div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> 	brcmf_dbg(TRACE, "func-&gt;class=%x\n", func-&gt;class);</div><div class='ctx'> 	brcmf_dbg(TRACE, "sdio_vendor: 0x%04x\n", func-&gt;vendor);</div><div class='hunk'>@@ -505,17 +474,26 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,</div><div class='ctx'> 			brcmf_dbg(ERROR, "card private drvdata occupied\n");</div><div class='ctx'> 			return -ENXIO;</div><div class='ctx'> 		}</div><div class='add'>+		bus_if = kzalloc(sizeof(struct brcmf_bus), GFP_KERNEL);</div><div class='add'>+		if (!bus_if)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		sdiodev = kzalloc(sizeof(struct brcmf_sdio_dev), GFP_KERNEL);</div><div class='del'>-		if (!sdiodev)</div><div class='add'>+		if (!sdiodev) {</div><div class='add'>+			kfree(bus_if);</div><div class='ctx'> 			return -ENOMEM;</div><div class='add'>+		}</div><div class='ctx'> 		sdiodev-&gt;func[0] = func-&gt;card-&gt;sdio_func[0];</div><div class='ctx'> 		sdiodev-&gt;func[1] = func;</div><div class='add'>+		sdiodev-&gt;bus_if = bus_if;</div><div class='add'>+		bus_if-&gt;bus_priv = sdiodev;</div><div class='add'>+		bus_if-&gt;type = SDIO_BUS;</div><div class='add'>+		bus_if-&gt;align = BRCMF_SDALIGN;</div><div class='ctx'> 		dev_set_drvdata(&amp;func-&gt;card-&gt;dev, sdiodev);</div><div class='ctx'> </div><div class='ctx'> 		atomic_set(&amp;sdiodev-&gt;suspend, false);</div><div class='ctx'> 		init_waitqueue_head(&amp;sdiodev-&gt;request_byte_wait);</div><div class='ctx'> 		init_waitqueue_head(&amp;sdiodev-&gt;request_word_wait);</div><div class='del'>-		init_waitqueue_head(&amp;sdiodev-&gt;request_packet_wait);</div><div class='add'>+		init_waitqueue_head(&amp;sdiodev-&gt;request_chain_wait);</div><div class='ctx'> 		init_waitqueue_head(&amp;sdiodev-&gt;request_buffer_wait);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -525,6 +503,10 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		sdiodev-&gt;func[2] = func;</div><div class='ctx'> </div><div class='add'>+		bus_if = sdiodev-&gt;bus_if;</div><div class='add'>+		sdiodev-&gt;dev = &amp;func-&gt;dev;</div><div class='add'>+		dev_set_drvdata(&amp;func-&gt;dev, bus_if);</div><div class='add'>+</div><div class='ctx'> 		brcmf_dbg(TRACE, "F2 found, calling brcmf_sdio_probe...\n");</div><div class='ctx'> 		ret = brcmf_sdio_probe(sdiodev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -534,6 +516,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,</div><div class='ctx'> </div><div class='ctx'> static void brcmf_ops_sdio_remove(struct sdio_func *func)</div><div class='ctx'> {</div><div class='add'>+	struct brcmf_bus *bus_if;</div><div class='ctx'> 	struct brcmf_sdio_dev *sdiodev;</div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> 	brcmf_dbg(INFO, "func-&gt;class=%x\n", func-&gt;class);</div><div class='hunk'>@@ -542,10 +525,13 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func)</div><div class='ctx'> 	brcmf_dbg(INFO, "Function#: 0x%04x\n", func-&gt;num);</div><div class='ctx'> </div><div class='ctx'> 	if (func-&gt;num == 2) {</div><div class='del'>-		sdiodev = dev_get_drvdata(&amp;func-&gt;card-&gt;dev);</div><div class='add'>+		bus_if = dev_get_drvdata(&amp;func-&gt;dev);</div><div class='add'>+		sdiodev = bus_if-&gt;bus_priv;</div><div class='ctx'> 		brcmf_dbg(TRACE, "F2 found, calling brcmf_sdio_remove...\n");</div><div class='ctx'> 		brcmf_sdio_remove(sdiodev);</div><div class='ctx'> 		dev_set_drvdata(&amp;func-&gt;card-&gt;dev, NULL);</div><div class='add'>+		dev_set_drvdata(&amp;func-&gt;dev, NULL);</div><div class='add'>+		kfree(bus_if);</div><div class='ctx'> 		kfree(sdiodev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -554,14 +540,12 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func)</div><div class='ctx'> static int brcmf_sdio_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	mmc_pm_flag_t sdio_flags;</div><div class='del'>-	struct brcmf_sdio_dev *sdiodev;</div><div class='ctx'> 	struct sdio_func *func = dev_to_sdio_func(dev);</div><div class='add'>+	struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(&amp;func-&gt;card-&gt;dev);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "\n");</div><div class='ctx'> </div><div class='del'>-	sdiodev = dev_get_drvdata(&amp;func-&gt;card-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 	atomic_set(&amp;sdiodev-&gt;suspend, true);</div><div class='ctx'> </div><div class='ctx'> 	sdio_flags = sdio_get_host_pm_caps(sdiodev-&gt;func[1]);</div><div class='hunk'>@@ -583,10 +567,9 @@ static int brcmf_sdio_suspend(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static int brcmf_sdio_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_sdio_dev *sdiodev;</div><div class='ctx'> 	struct sdio_func *func = dev_to_sdio_func(dev);</div><div class='add'>+	struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(&amp;func-&gt;card-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	sdiodev = dev_get_drvdata(&amp;func-&gt;card-&gt;dev);</div><div class='ctx'> 	brcmf_sdio_wdtmr_enable(sdiodev, true);</div><div class='ctx'> 	atomic_set(&amp;sdiodev-&gt;suspend, false);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -610,17 +593,26 @@ static struct sdio_driver brcmf_sdmmc_driver = {</div><div class='ctx'> #endif	/* CONFIG_PM_SLEEP */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* bus register interface */</div><div class='del'>-int brcmf_bus_register(void)</div><div class='add'>+static void __exit brcmf_sdio_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='del'>-	return sdio_register_driver(&amp;brcmf_sdmmc_driver);</div><div class='add'>+	sdio_unregister_driver(&amp;brcmf_sdmmc_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void brcmf_bus_unregister(void)</div><div class='add'>+static int __init brcmf_sdio_init(void)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='del'>-	sdio_unregister_driver(&amp;brcmf_sdmmc_driver);</div><div class='add'>+	ret = sdio_register_driver(&amp;brcmf_sdmmc_driver);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		brcmf_dbg(ERROR, "sdio_register_driver failed: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+module_init(brcmf_sdio_init);</div><div class='add'>+module_exit(brcmf_sdio_exit);</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h<br/>index 4645766b4070..e58ea40a75b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/dhd.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/dhd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/dhd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmfmac/dhd.h</a></div><div class='hunk'>@@ -87,7 +87,7 @@</div><div class='ctx'> #define TOE_TX_CSUM_OL		0x00000001</div><div class='ctx'> #define TOE_RX_CSUM_OL		0x00000002</div><div class='ctx'> </div><div class='del'>-#define	BRCMF_BSS_INFO_VERSION	108 /* current ver of brcmf_bss_info struct */</div><div class='add'>+#define	BRCMF_BSS_INFO_VERSION	109 /* curr ver of brcmf_bss_info_le struct */</div><div class='ctx'> </div><div class='ctx'> /* size of brcmf_scan_params not including variable length array */</div><div class='ctx'> #define BRCMF_SCAN_PARAMS_FIXED_SIZE 64</div><div class='hunk'>@@ -122,8 +122,6 @@</div><div class='ctx'> </div><div class='ctx'> /* For supporting multiple interfaces */</div><div class='ctx'> #define BRCMF_MAX_IFS	16</div><div class='del'>-#define BRCMF_DEL_IF	-0xe</div><div class='del'>-#define BRCMF_BAD_IF	-0xf</div><div class='ctx'> </div><div class='ctx'> #define DOT11_BSSTYPE_ANY			2</div><div class='ctx'> #define DOT11_MAX_DEFAULT_KEYS	4</div><div class='hunk'>@@ -158,18 +156,6 @@ struct brcmf_event {</div><div class='ctx'> 	struct brcmf_event_msg msg;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct dngl_stats {</div><div class='del'>-	unsigned long rx_packets;	/* total packets received */</div><div class='del'>-	unsigned long tx_packets;	/* total packets transmitted */</div><div class='del'>-	unsigned long rx_bytes;	/* total bytes received */</div><div class='del'>-	unsigned long tx_bytes;	/* total bytes transmitted */</div><div class='del'>-	unsigned long rx_errors;	/* bad packets received */</div><div class='del'>-	unsigned long tx_errors;	/* packet transmit problems */</div><div class='del'>-	unsigned long rx_dropped;	/* packets dropped by dongle */</div><div class='del'>-	unsigned long tx_dropped;	/* packets dropped by dongle */</div><div class='del'>-	unsigned long multicast;	/* multicast packets received */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* event codes sent by the dongle to this driver */</div><div class='ctx'> #define BRCMF_E_SET_SSID			0</div><div class='ctx'> #define BRCMF_E_JOIN				1</div><div class='hunk'>@@ -319,13 +305,6 @@ struct dngl_stats {</div><div class='ctx'> #define BRCMF_E_LINK_ASSOC_REC			3</div><div class='ctx'> #define BRCMF_E_LINK_BSSCFG_DIS			4</div><div class='ctx'> </div><div class='del'>-/* The level of bus communication with the dongle */</div><div class='del'>-enum brcmf_bus_state {</div><div class='del'>-	BRCMF_BUS_DOWN,		/* Not ready for frame transfers */</div><div class='del'>-	BRCMF_BUS_LOAD,		/* Download access only (CPU reset) */</div><div class='del'>-	BRCMF_BUS_DATA		/* Ready for frame transfers */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Pattern matching filter. Specifies an offset within received packets to</div><div class='ctx'>  * start matching, the pattern to match, the size of the pattern, and a bitmask</div><div class='ctx'>  * that indicates which bits within the pattern should be matched.</div><div class='hunk'>@@ -365,7 +344,7 @@ struct brcmf_pkt_filter_enable_le {</div><div class='ctx'>  * Applications MUST CHECK ie_offset field and length field to access IEs and</div><div class='ctx'>  * next bss_info structure in a vector (in struct brcmf_scan_results)</div><div class='ctx'>  */</div><div class='del'>-struct brcmf_bss_info {</div><div class='add'>+struct brcmf_bss_info_le {</div><div class='ctx'> 	__le32 version;		/* version field */</div><div class='ctx'> 	__le32 length;		/* byte length of data in this record,</div><div class='ctx'> 				 * starting at version and including IEs</div><div class='hunk'>@@ -466,14 +445,13 @@ struct brcmf_scan_results {</div><div class='ctx'> 	u32 buflen;</div><div class='ctx'> 	u32 version;</div><div class='ctx'> 	u32 count;</div><div class='del'>-	struct brcmf_bss_info bss_info[1];</div><div class='add'>+	struct brcmf_bss_info_le bss_info_le[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct brcmf_scan_results_le {</div><div class='ctx'> 	__le32 buflen;</div><div class='ctx'> 	__le32 version;</div><div class='ctx'> 	__le32 count;</div><div class='del'>-	struct brcmf_bss_info bss_info[1];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* used for association with a specific BSSID and chanspec list */</div><div class='hunk'>@@ -493,10 +471,6 @@ struct brcmf_join_params {</div><div class='ctx'> 	struct brcmf_assoc_params_le params_le;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* size of brcmf_scan_results not including variable length array */</div><div class='del'>-#define BRCMF_SCAN_RESULTS_FIXED_SIZE \</div><div class='del'>-	(sizeof(struct brcmf_scan_results) - sizeof(struct brcmf_bss_info))</div><div class='del'>-</div><div class='ctx'> /* incremental scan results struct */</div><div class='ctx'> struct brcmf_iscan_results {</div><div class='ctx'> 	union {</div><div class='hunk'>@@ -511,7 +485,7 @@ struct brcmf_iscan_results {</div><div class='ctx'> </div><div class='ctx'> /* size of brcmf_iscan_results not including variable length array */</div><div class='ctx'> #define BRCMF_ISCAN_RESULTS_FIXED_SIZE \</div><div class='del'>-	(BRCMF_SCAN_RESULTS_FIXED_SIZE + \</div><div class='add'>+	(sizeof(struct brcmf_scan_results) + \</div><div class='ctx'> 	 offsetof(struct brcmf_iscan_results, results))</div><div class='ctx'> </div><div class='ctx'> struct brcmf_wsec_key {</div><div class='hunk'>@@ -579,25 +553,19 @@ struct brcmf_dcmd {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Forward decls for struct brcmf_pub (see below) */</div><div class='del'>-struct brcmf_bus;		/* device bus info */</div><div class='ctx'> struct brcmf_proto;	/* device communication protocol info */</div><div class='del'>-struct brcmf_info;	/* device driver info */</div><div class='ctx'> struct brcmf_cfg80211_dev; /* cfg80211 device info */</div><div class='ctx'> </div><div class='ctx'> /* Common structure for module and instance linkage */</div><div class='ctx'> struct brcmf_pub {</div><div class='ctx'> 	/* Linkage ponters */</div><div class='del'>-	struct brcmf_bus *bus;</div><div class='add'>+	struct brcmf_bus *bus_if;</div><div class='ctx'> 	struct brcmf_proto *prot;</div><div class='del'>-	struct brcmf_info *info;</div><div class='ctx'> 	struct brcmf_cfg80211_dev *config;</div><div class='add'>+	struct device *dev;		/* fullmac dongle device pointer */</div><div class='ctx'> </div><div class='ctx'> 	/* Internal brcmf items */</div><div class='del'>-	bool up;		/* Driver up/down (to OS) */</div><div class='del'>-	bool txoff;		/* Transmit flow-controlled */</div><div class='del'>-	enum brcmf_bus_state busstate;</div><div class='ctx'> 	uint hdrlen;		/* Total BRCMF header length (proto + bus) */</div><div class='del'>-	uint maxctl;		/* Max size rxctl request from proto to bus */</div><div class='ctx'> 	uint rxsz;		/* Rx buffer size bus module should use */</div><div class='ctx'> 	u8 wme_dp;		/* wme discard priority */</div><div class='ctx'> </div><div class='hunk'>@@ -605,48 +573,21 @@ struct brcmf_pub {</div><div class='ctx'> 	bool iswl;		/* Dongle-resident driver is wl */</div><div class='ctx'> 	unsigned long drv_version;	/* Version of dongle-resident driver */</div><div class='ctx'> 	u8 mac[ETH_ALEN];		/* MAC address obtained from dongle */</div><div class='del'>-	struct dngl_stats dstats;	/* Stats for dongle-based data */</div><div class='ctx'> </div><div class='ctx'> 	/* Additional stats for the bus level */</div><div class='ctx'> </div><div class='del'>-	/* Data packets sent to dongle */</div><div class='del'>-	unsigned long tx_packets;</div><div class='ctx'> 	/* Multicast data packets sent to dongle */</div><div class='ctx'> 	unsigned long tx_multicast;</div><div class='del'>-	/* Errors in sending data to dongle */</div><div class='del'>-	unsigned long tx_errors;</div><div class='del'>-	/* Control packets sent to dongle */</div><div class='del'>-	unsigned long tx_ctlpkts;</div><div class='del'>-	/* Errors sending control frames to dongle */</div><div class='del'>-	unsigned long tx_ctlerrs;</div><div class='del'>-	/* Packets sent up the network interface */</div><div class='del'>-	unsigned long rx_packets;</div><div class='del'>-	/* Multicast packets sent up the network interface */</div><div class='del'>-	unsigned long rx_multicast;</div><div class='del'>-	/* Errors processing rx data packets */</div><div class='del'>-	unsigned long rx_errors;</div><div class='del'>-	/* Control frames processed from dongle */</div><div class='del'>-	unsigned long rx_ctlpkts;</div><div class='del'>-</div><div class='del'>-	/* Errors in processing rx control frames */</div><div class='del'>-	unsigned long rx_ctlerrs;</div><div class='del'>-	/* Packets dropped locally (no memory) */</div><div class='del'>-	unsigned long rx_dropped;</div><div class='ctx'> 	/* Packets flushed due to unscheduled sendup thread */</div><div class='ctx'> 	unsigned long rx_flushed;</div><div class='ctx'> 	/* Number of times dpc scheduled by watchdog timer */</div><div class='ctx'> 	unsigned long wd_dpc_sched;</div><div class='ctx'> </div><div class='del'>-	/* Number of packets where header read-ahead was used. */</div><div class='del'>-	unsigned long rx_readahead_cnt;</div><div class='del'>-	/* Number of tx packets we had to realloc for headroom */</div><div class='del'>-	unsigned long tx_realloc;</div><div class='ctx'> 	/* Number of flow control pkts recvd */</div><div class='ctx'> 	unsigned long fc_packets;</div><div class='ctx'> </div><div class='ctx'> 	/* Last error return */</div><div class='ctx'> 	int bcmerror;</div><div class='del'>-	uint tickcnt;</div><div class='ctx'> </div><div class='ctx'> 	/* Last error from dongle */</div><div class='ctx'> 	int dongle_error;</div><div class='hunk'>@@ -664,6 +605,14 @@ struct brcmf_pub {</div><div class='ctx'> 	u8 country_code[BRCM_CNTRY_BUF_SZ];</div><div class='ctx'> 	char eventmask[BRCMF_EVENTING_MASK_LEN];</div><div class='ctx'> </div><div class='add'>+	struct brcmf_if *iflist[BRCMF_MAX_IFS];</div><div class='add'>+</div><div class='add'>+	struct mutex proto_block;</div><div class='add'>+</div><div class='add'>+	struct work_struct setmacaddr_work;</div><div class='add'>+	struct work_struct multicast_work;</div><div class='add'>+	u8 macvalue[ETH_ALEN];</div><div class='add'>+	atomic_t pend_8021x_cnt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct brcmf_if_event {</div><div class='hunk'>@@ -683,67 +632,33 @@ extern const struct bcmevent_name bcmevent_names[];</div><div class='ctx'> extern uint brcmf_c_mkiovar(char *name, char *data, uint datalen,</div><div class='ctx'> 			  char *buf, uint len);</div><div class='ctx'> </div><div class='del'>-/* Indication from bus module regarding presence/insertion of dongle.</div><div class='del'>- * Return struct brcmf_pub pointer, used as handle to OS module in later calls.</div><div class='del'>- * Returned structure should have bus and prot pointers filled in.</div><div class='del'>- * bus_hdrlen specifies required headroom for bus module header.</div><div class='del'>- */</div><div class='del'>-extern struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus,</div><div class='del'>-				      uint bus_hdrlen);</div><div class='ctx'> extern int brcmf_net_attach(struct brcmf_pub *drvr, int idx);</div><div class='ctx'> extern int brcmf_netdev_wait_pend8021x(struct net_device *ndev);</div><div class='ctx'> </div><div class='ctx'> extern s32 brcmf_exec_dcmd(struct net_device *dev, u32 cmd, void *arg, u32 len);</div><div class='ctx'> </div><div class='del'>-/* Indication from bus module regarding removal/absence of dongle */</div><div class='del'>-extern void brcmf_detach(struct brcmf_pub *drvr);</div><div class='del'>-</div><div class='del'>-/* Indication from bus module to change flow-control state */</div><div class='del'>-extern void brcmf_txflowcontrol(struct brcmf_pub *drvr, int ifidx, bool on);</div><div class='del'>-</div><div class='del'>-extern bool brcmf_c_prec_enq(struct brcmf_pub *drvr, struct pktq *q,</div><div class='del'>-			 struct sk_buff *pkt, int prec);</div><div class='del'>-</div><div class='del'>-/* Receive frame for delivery to OS.  Callee disposes of rxp. */</div><div class='del'>-extern void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx,</div><div class='del'>-			 struct sk_buff *rxp, int numpkt);</div><div class='del'>-</div><div class='ctx'> /* Return pointer to interface name */</div><div class='ctx'> extern char *brcmf_ifname(struct brcmf_pub *drvr, int idx);</div><div class='ctx'> </div><div class='del'>-/* Notify tx completion */</div><div class='del'>-extern void brcmf_txcomplete(struct brcmf_pub *drvr, struct sk_buff *txp,</div><div class='del'>-			     bool success);</div><div class='del'>-</div><div class='ctx'> /* Query dongle */</div><div class='ctx'> extern int brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx,</div><div class='ctx'> 				       uint cmd, void *buf, uint len);</div><div class='ctx'> </div><div class='del'>-/* OS independent layer functions */</div><div class='del'>-extern int brcmf_os_proto_block(struct brcmf_pub *drvr);</div><div class='del'>-extern int brcmf_os_proto_unblock(struct brcmf_pub *drvr);</div><div class='ctx'> #ifdef BCMDBG</div><div class='ctx'> extern int brcmf_write_to_file(struct brcmf_pub *drvr, const u8 *buf, int size);</div><div class='ctx'> #endif				/* BCMDBG */</div><div class='ctx'> </div><div class='del'>-extern int brcmf_ifname2idx(struct brcmf_info *drvr_priv, char *name);</div><div class='del'>-extern int brcmf_c_host_event(struct brcmf_info *drvr_priv, int *idx,</div><div class='add'>+extern int brcmf_ifname2idx(struct brcmf_pub *drvr, char *name);</div><div class='add'>+extern int brcmf_c_host_event(struct brcmf_pub *drvr, int *idx,</div><div class='ctx'> 			      void *pktdata, struct brcmf_event_msg *,</div><div class='ctx'> 			      void **data_ptr);</div><div class='ctx'> </div><div class='del'>-extern void brcmf_c_init(void);</div><div class='del'>-</div><div class='del'>-extern int brcmf_add_if(struct brcmf_info *drvr_priv, int ifidx,</div><div class='del'>-			struct net_device *ndev, char *name, u8 *mac_addr,</div><div class='del'>-			u32 flags, u8 bssidx);</div><div class='del'>-extern void brcmf_del_if(struct brcmf_info *drvr_priv, int ifidx);</div><div class='add'>+extern void brcmf_del_if(struct brcmf_pub *drvr, int ifidx);</div><div class='ctx'> </div><div class='ctx'> /* Send packet to dongle via data channel */</div><div class='ctx'> extern int brcmf_sendpkt(struct brcmf_pub *drvr, int ifidx,\</div><div class='ctx'> 			 struct sk_buff *pkt);</div><div class='ctx'> </div><div class='del'>-extern int brcmf_bus_start(struct brcmf_pub *drvr);</div><div class='del'>-</div><div class='ctx'> extern void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg);</div><div class='ctx'> extern void brcmf_c_pktfilter_offload_enable(struct brcmf_pub *drvr, char *arg,</div><div class='ctx'> 					     int enable, int master_mode);</div><div class='hunk'>@@ -752,25 +667,4 @@ extern void brcmf_c_pktfilter_offload_enable(struct brcmf_pub *drvr, char *arg,</div><div class='ctx'> #define BRCMF_DCMD_MEDLEN	1536	/* "med" cmd buffer required */</div><div class='ctx'> #define	BRCMF_DCMD_MAXLEN	8192	/* max length cmd buffer required */</div><div class='ctx'> </div><div class='del'>-/* message levels */</div><div class='del'>-#define BRCMF_ERROR_VAL	0x0001</div><div class='del'>-#define BRCMF_TRACE_VAL	0x0002</div><div class='del'>-#define BRCMF_INFO_VAL	0x0004</div><div class='del'>-#define BRCMF_DATA_VAL	0x0008</div><div class='del'>-#define BRCMF_CTL_VAL	0x0010</div><div class='del'>-#define BRCMF_TIMER_VAL	0x0020</div><div class='del'>-#define BRCMF_HDRS_VAL	0x0040</div><div class='del'>-#define BRCMF_BYTES_VAL	0x0080</div><div class='del'>-#define BRCMF_INTR_VAL	0x0100</div><div class='del'>-#define BRCMF_GLOM_VAL	0x0400</div><div class='del'>-#define BRCMF_EVENT_VAL	0x0800</div><div class='del'>-#define BRCMF_BTA_VAL	0x1000</div><div class='del'>-#define BRCMF_ISCAN_VAL 0x2000</div><div class='del'>-</div><div class='del'>-/* Enter idle immediately (no timeout) */</div><div class='del'>-#define BRCMF_IDLE_IMMEDIATE	(-1)</div><div class='del'>-#define BRCMF_IDLE_ACTIVE	0	/* Do not request any SD clock change</div><div class='del'>-				 when idle */</div><div class='del'>-#define BRCMF_IDLE_INTERVAL	1</div><div class='del'>-</div><div class='ctx'> #endif				/* _BRCMF_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h<br/>index a249407c9a1b..ad9be2410b59 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h</a></div><div class='hunk'>@@ -17,41 +17,89 @@</div><div class='ctx'> #ifndef _BRCMF_BUS_H_</div><div class='ctx'> #define _BRCMF_BUS_H_</div><div class='ctx'> </div><div class='del'>-/* Packet alignment for most efficient SDIO (can change based on platform) */</div><div class='del'>-#define BRCMF_SDALIGN	(1 &lt;&lt; 6)</div><div class='add'>+/* The level of bus communication with the dongle */</div><div class='add'>+enum brcmf_bus_state {</div><div class='add'>+	BRCMF_BUS_DOWN,		/* Not ready for frame transfers */</div><div class='add'>+	BRCMF_BUS_LOAD,		/* Download access only (CPU reset) */</div><div class='add'>+	BRCMF_BUS_DATA		/* Ready for frame transfers */</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-/* watchdog polling interval in ms */</div><div class='del'>-#define BRCMF_WD_POLL_MS	10</div><div class='add'>+struct dngl_stats {</div><div class='add'>+	unsigned long rx_packets;	/* total packets received */</div><div class='add'>+	unsigned long tx_packets;	/* total packets transmitted */</div><div class='add'>+	unsigned long rx_bytes;	/* total bytes received */</div><div class='add'>+	unsigned long tx_bytes;	/* total bytes transmitted */</div><div class='add'>+	unsigned long rx_errors;	/* bad packets received */</div><div class='add'>+	unsigned long tx_errors;	/* packet transmit problems */</div><div class='add'>+	unsigned long rx_dropped;	/* packets dropped by dongle */</div><div class='add'>+	unsigned long tx_dropped;	/* packets dropped by dongle */</div><div class='add'>+	unsigned long multicast;	/* multicast packets received */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* interface structure between common and bus layer */</div><div class='add'>+struct brcmf_bus {</div><div class='add'>+	u8 type;		/* bus type */</div><div class='add'>+	void *bus_priv;		/* pointer to bus private structure */</div><div class='add'>+	void *drvr;		/* pointer to driver pub structure brcmf_pub */</div><div class='add'>+	enum brcmf_bus_state state;</div><div class='add'>+	uint maxctl;		/* Max size rxctl request from proto to bus */</div><div class='add'>+	bool drvr_up;		/* Status flag of driver up/down */</div><div class='add'>+	unsigned long tx_realloc;	/* Tx packets realloced for headroom */</div><div class='add'>+	struct dngl_stats dstats;	/* Stats for dongle-based data */</div><div class='add'>+	u8 align;		/* bus alignment requirement */</div><div class='add'>+</div><div class='add'>+	/* interface functions pointers */</div><div class='add'>+	/* Stop bus module: clear pending frames, disable data flow */</div><div class='add'>+	void (*brcmf_bus_stop)(struct device *);</div><div class='add'>+	/* Initialize bus module: prepare for communication w/dongle */</div><div class='add'>+	int (*brcmf_bus_init)(struct device *);</div><div class='add'>+	/* Send a data frame to the dongle.  Callee disposes of txp. */</div><div class='add'>+	int (*brcmf_bus_txdata)(struct device *, struct sk_buff *);</div><div class='add'>+	/* Send/receive a control message to/from the dongle.</div><div class='add'>+	 * Expects caller to enforce a single outstanding transaction.</div><div class='add'>+	 */</div><div class='add'>+	int (*brcmf_bus_txctl)(struct device *, unsigned char *, uint);</div><div class='add'>+	int (*brcmf_bus_rxctl)(struct device *, unsigned char *, uint);</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Exported from brcmf bus module (brcmf_usb, brcmf_sdio)</div><div class='add'>+ * interface functions from common layer</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* Indicate (dis)interest in finding dongles. */</div><div class='del'>-extern int brcmf_bus_register(void);</div><div class='del'>-extern void brcmf_bus_unregister(void);</div><div class='add'>+/* Remove any protocol-specific data header. */</div><div class='add'>+extern int brcmf_proto_hdrpull(struct device *dev, int *ifidx,</div><div class='add'>+			       struct sk_buff *rxp);</div><div class='ctx'> </div><div class='del'>-/* obtain linux device object providing bus function */</div><div class='del'>-extern struct device *brcmf_bus_get_device(struct brcmf_bus *bus);</div><div class='add'>+extern bool brcmf_c_prec_enq(struct device *dev, struct pktq *q,</div><div class='add'>+			 struct sk_buff *pkt, int prec);</div><div class='ctx'> </div><div class='del'>-/* Stop bus module: clear pending frames, disable data flow */</div><div class='del'>-extern void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus);</div><div class='add'>+/* Receive frame for delivery to OS.  Callee disposes of rxp. */</div><div class='add'>+extern void brcmf_rx_frame(struct device *dev, int ifidx,</div><div class='add'>+			   struct sk_buff_head *rxlist);</div><div class='add'>+static inline void brcmf_rx_packet(struct device *dev, int ifidx,</div><div class='add'>+				   struct sk_buff *pkt)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff_head q;</div><div class='ctx'> </div><div class='del'>-/* Initialize bus module: prepare for communication w/dongle */</div><div class='del'>-extern int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr);</div><div class='add'>+	skb_queue_head_init(&amp;q);</div><div class='add'>+	skb_queue_tail(&amp;q, pkt);</div><div class='add'>+	brcmf_rx_frame(dev, ifidx, &amp;q);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-/* Send a data frame to the dongle.  Callee disposes of txp. */</div><div class='del'>-extern int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *txp);</div><div class='add'>+/* Indication from bus module regarding presence/insertion of dongle. */</div><div class='add'>+extern int brcmf_attach(uint bus_hdrlen, struct device *dev);</div><div class='add'>+/* Indication from bus module regarding removal/absence of dongle */</div><div class='add'>+extern void brcmf_detach(struct device *dev);</div><div class='ctx'> </div><div class='del'>-/* Send/receive a control message to/from the dongle.</div><div class='del'>- * Expects caller to enforce a single outstanding transaction.</div><div class='del'>- */</div><div class='del'>-extern int</div><div class='del'>-brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen);</div><div class='add'>+/* Indication from bus module to change flow-control state */</div><div class='add'>+extern void brcmf_txflowcontrol(struct device *dev, int ifidx, bool on);</div><div class='ctx'> </div><div class='del'>-extern int</div><div class='del'>-brcmf_sdbrcm_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen);</div><div class='add'>+/* Notify tx completion */</div><div class='add'>+extern void brcmf_txcomplete(struct device *dev, struct sk_buff *txp,</div><div class='add'>+			     bool success);</div><div class='ctx'> </div><div class='del'>-extern void brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick);</div><div class='add'>+extern int brcmf_bus_start(struct device *dev);</div><div class='ctx'> </div><div class='add'>+extern int brcmf_add_if(struct device *dev, int ifidx,</div><div class='add'>+			char *name, u8 *mac_addr);</div><div class='ctx'> #endif				/* _BRCMF_BUS_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c<br/>index e34c5c3d1d55..ac8d1f437888 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c</a></div><div class='hunk'>@@ -58,7 +58,7 @@ struct brcmf_proto_cdc_dcmd {</div><div class='ctx'>  * Used on data packets to convey priority across USB.</div><div class='ctx'>  */</div><div class='ctx'> #define	BDC_HEADER_LEN		4</div><div class='del'>-#define BDC_PROTO_VER		1	/* Protocol version */</div><div class='add'>+#define BDC_PROTO_VER		2	/* Protocol version */</div><div class='ctx'> #define BDC_FLAG_VER_MASK	0xf0	/* Protocol version mask */</div><div class='ctx'> #define BDC_FLAG_VER_SHIFT	4	/* Protocol version shift */</div><div class='ctx'> #define BDC_FLAG_SUM_GOOD	0x04	/* Good RX checksums */</div><div class='hunk'>@@ -77,18 +77,19 @@ struct brcmf_proto_bdc_header {</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> 	u8 priority;	/* 802.1d Priority, 4:7 flow control info for usb */</div><div class='ctx'> 	u8 flags2;</div><div class='del'>-	u8 rssi;</div><div class='add'>+	u8 data_offset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define RETRIES 2 /* # of retries to retrieve matching dcmd response */</div><div class='del'>-#define BUS_HEADER_LEN	(16+BRCMF_SDALIGN) /* Must be atleast SDPCM_RESERVE</div><div class='add'>+#define BUS_HEADER_LEN	(16+64)		/* Must be atleast SDPCM_RESERVE</div><div class='ctx'> 					 * (amount of header tha might be added)</div><div class='ctx'> 					 * plus any space that might be needed</div><div class='del'>-					 * for alignment padding.</div><div class='add'>+					 * for bus alignment padding.</div><div class='ctx'> 					 */</div><div class='del'>-#define ROUND_UP_MARGIN	2048	/* Biggest SDIO block size possible for</div><div class='add'>+#define ROUND_UP_MARGIN	2048	/* Biggest bus block size possible for</div><div class='ctx'> 				 * round off at the end of buffer</div><div class='add'>+				 * Currently is SDIO</div><div class='ctx'> 				 */</div><div class='ctx'> </div><div class='ctx'> struct brcmf_proto {</div><div class='hunk'>@@ -116,8 +117,9 @@ static int brcmf_proto_cdc_msg(struct brcmf_pub *drvr)</div><div class='ctx'> 		len = CDC_MAX_MSG_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	/* Send request */</div><div class='del'>-	return brcmf_sdbrcm_bus_txctl(drvr-&gt;bus, (unsigned char *)&amp;prot-&gt;msg,</div><div class='del'>-				      len);</div><div class='add'>+	return drvr-&gt;bus_if-&gt;brcmf_bus_txctl(drvr-&gt;dev,</div><div class='add'>+					     (unsigned char *)&amp;prot-&gt;msg,</div><div class='add'>+					     len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int brcmf_proto_cdc_cmplt(struct brcmf_pub *drvr, u32 id, u32 len)</div><div class='hunk'>@@ -128,7 +130,7 @@ static int brcmf_proto_cdc_cmplt(struct brcmf_pub *drvr, u32 id, u32 len)</div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		ret = brcmf_sdbrcm_bus_rxctl(drvr-&gt;bus,</div><div class='add'>+		ret = drvr-&gt;bus_if-&gt;brcmf_bus_rxctl(drvr-&gt;dev,</div><div class='ctx'> 				(unsigned char *)&amp;prot-&gt;msg,</div><div class='ctx'> 				len + sizeof(struct brcmf_proto_cdc_dcmd));</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='hunk'>@@ -280,11 +282,11 @@ brcmf_proto_dcmd(struct brcmf_pub *drvr, int ifidx, struct brcmf_dcmd *dcmd,</div><div class='ctx'> 	struct brcmf_proto *prot = drvr-&gt;prot;</div><div class='ctx'> 	int ret = -1;</div><div class='ctx'> </div><div class='del'>-	if (drvr-&gt;busstate == BRCMF_BUS_DOWN) {</div><div class='add'>+	if (drvr-&gt;bus_if-&gt;state == BRCMF_BUS_DOWN) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "bus is down. we have nothing to do.\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	brcmf_os_proto_block(drvr);</div><div class='add'>+	mutex_lock(&amp;drvr-&gt;proto_block);</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='hunk'>@@ -338,7 +340,7 @@ brcmf_proto_dcmd(struct brcmf_pub *drvr, int ifidx, struct brcmf_dcmd *dcmd,</div><div class='ctx'> 	prot-&gt;pending = false;</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='del'>-	brcmf_os_proto_unblock(drvr);</div><div class='add'>+	mutex_unlock(&amp;drvr-&gt;proto_block);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -372,14 +374,16 @@ void brcmf_proto_hdrpush(struct brcmf_pub *drvr, int ifidx,</div><div class='ctx'> </div><div class='ctx'> 	h-&gt;priority = (pktbuf-&gt;priority &amp; BDC_PRIORITY_MASK);</div><div class='ctx'> 	h-&gt;flags2 = 0;</div><div class='del'>-	h-&gt;rssi = 0;</div><div class='add'>+	h-&gt;data_offset = 0;</div><div class='ctx'> 	BDC_SET_IF_IDX(h, ifidx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int brcmf_proto_hdrpull(struct brcmf_pub *drvr, int *ifidx,</div><div class='add'>+int brcmf_proto_hdrpull(struct device *dev, int *ifidx,</div><div class='ctx'> 			struct sk_buff *pktbuf)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_proto_bdc_header *h;</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='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='hunk'>@@ -435,7 +439,7 @@ int brcmf_proto_attach(struct brcmf_pub *drvr)</div><div class='ctx'> </div><div class='ctx'> 	drvr-&gt;prot = cdc;</div><div class='ctx'> 	drvr-&gt;hdrlen += BDC_HEADER_LEN;</div><div class='del'>-	drvr-&gt;maxctl = BRCMF_DCMD_MAXLEN +</div><div class='add'>+	drvr-&gt;bus_if-&gt;maxctl = BRCMF_DCMD_MAXLEN +</div><div class='ctx'> 			sizeof(struct brcmf_proto_cdc_dcmd) + ROUND_UP_MARGIN;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -451,18 +455,6 @@ void brcmf_proto_detach(struct brcmf_pub *drvr)</div><div class='ctx'> 	drvr-&gt;prot = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void brcmf_proto_dstats(struct brcmf_pub *drvr)</div><div class='del'>-{</div><div class='del'>-	/* No stats from dongle added yet, copy bus stats */</div><div class='del'>-	drvr-&gt;dstats.tx_packets = drvr-&gt;tx_packets;</div><div class='del'>-	drvr-&gt;dstats.tx_errors = drvr-&gt;tx_errors;</div><div class='del'>-	drvr-&gt;dstats.rx_packets = drvr-&gt;rx_packets;</div><div class='del'>-	drvr-&gt;dstats.rx_errors = drvr-&gt;rx_errors;</div><div class='del'>-	drvr-&gt;dstats.rx_dropped = drvr-&gt;rx_dropped;</div><div class='del'>-	drvr-&gt;dstats.multicast = drvr-&gt;rx_multicast;</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int brcmf_proto_init(struct brcmf_pub *drvr)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -470,19 +462,19 @@ int brcmf_proto_init(struct brcmf_pub *drvr)</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='del'>-	brcmf_os_proto_block(drvr);</div><div class='add'>+	mutex_lock(&amp;drvr-&gt;proto_block);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the device MAC address */</div><div class='ctx'> 	strcpy(buf, "cur_etheraddr");</div><div class='ctx'> 	ret = brcmf_proto_cdc_query_dcmd(drvr, 0, BRCMF_C_GET_VAR,</div><div class='ctx'> 					  buf, sizeof(buf));</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		brcmf_os_proto_unblock(drvr);</div><div class='add'>+		mutex_unlock(&amp;drvr-&gt;proto_block);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	memcpy(drvr-&gt;mac, buf, ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-	brcmf_os_proto_unblock(drvr);</div><div class='add'>+	mutex_unlock(&amp;drvr-&gt;proto_block);</div><div class='ctx'> </div><div class='ctx'> 	ret = brcmf_c_preinit_dcmds(drvr);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c<br/>index 891826197f96..a51d8f5d36fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c</a></div><div class='hunk'>@@ -32,8 +32,6 @@</div><div class='ctx'> #define PKTFILTER_BUF_SIZE		2048</div><div class='ctx'> #define BRCMF_ARPOL_MODE		0xb	/* agent|snoop|peer_autoreply */</div><div class='ctx'> </div><div class='del'>-int brcmf_msg_level;</div><div class='del'>-</div><div class='ctx'> #define MSGTRACE_VERSION	1</div><div class='ctx'> </div><div class='ctx'> #define BRCMF_PKT_FILTER_FIXED_LEN	offsetof(struct brcmf_pkt_filter_le, u)</div><div class='hunk'>@@ -85,25 +83,14 @@ brcmf_c_mkiovar(char *name, char *data, uint datalen, char *buf, uint buflen)</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void brcmf_c_init(void)</div><div class='del'>-{</div><div class='del'>-	/* Init global variables at run-time, not as part of the declaration.</div><div class='del'>-	 * This is required to support init/de-init of the driver.</div><div class='del'>-	 * Initialization</div><div class='del'>-	 * of globals as part of the declaration results in non-deterministic</div><div class='del'>-	 * behaviour since the value of the globals may be different on the</div><div class='del'>-	 * first time that the driver is initialized vs subsequent</div><div class='del'>-	 * initializations.</div><div class='del'>-	 */</div><div class='del'>-	brcmf_msg_level = BRCMF_ERROR_VAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool brcmf_c_prec_enq(struct brcmf_pub *drvr, struct pktq *q,</div><div class='add'>+bool brcmf_c_prec_enq(struct device *dev, struct pktq *q,</div><div class='ctx'> 		      struct sk_buff *pkt, int prec)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *p;</div><div class='ctx'> 	int eprec = -1;		/* precedence to evict from */</div><div class='ctx'> 	bool discard_oldest;</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='ctx'> </div><div class='ctx'> 	/* Fast case, precedence queue is not full and we are also not</div><div class='ctx'> 	 * exceeding total queue length</div><div class='hunk'>@@ -446,7 +433,7 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)</div><div class='ctx'> #endif				/* BCMDBG */</div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-brcmf_c_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata,</div><div class='add'>+brcmf_c_host_event(struct brcmf_pub *drvr, int *ifidx, void *pktdata,</div><div class='ctx'> 		   struct brcmf_event_msg *event, void **data_ptr)</div><div class='ctx'> {</div><div class='ctx'> 	/* check whether packet is a BRCM event pkt */</div><div class='hunk'>@@ -488,19 +475,18 @@ brcmf_c_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata,</div><div class='ctx'> </div><div class='ctx'> 		if (ifevent-&gt;ifidx &gt; 0 &amp;&amp; ifevent-&gt;ifidx &lt; BRCMF_MAX_IFS) {</div><div class='ctx'> 			if (ifevent-&gt;action == BRCMF_E_IF_ADD)</div><div class='del'>-				brcmf_add_if(drvr_priv, ifevent-&gt;ifidx, NULL,</div><div class='add'>+				brcmf_add_if(drvr-&gt;dev, ifevent-&gt;ifidx,</div><div class='ctx'> 					     event-&gt;ifname,</div><div class='del'>-					     pvt_data-&gt;eth.h_dest,</div><div class='del'>-					     ifevent-&gt;flags, ifevent-&gt;bssidx);</div><div class='add'>+					     pvt_data-&gt;eth.h_dest);</div><div class='ctx'> 			else</div><div class='del'>-				brcmf_del_if(drvr_priv, ifevent-&gt;ifidx);</div><div class='add'>+				brcmf_del_if(drvr, ifevent-&gt;ifidx);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			brcmf_dbg(ERROR, "Invalid ifidx %d for %s\n",</div><div class='ctx'> 				  ifevent-&gt;ifidx, event-&gt;ifname);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* send up the if event: btamp user needs it */</div><div class='del'>-		*ifidx = brcmf_ifname2idx(drvr_priv, event-&gt;ifname);</div><div class='add'>+		*ifidx = brcmf_ifname2idx(drvr, event-&gt;ifname);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 		/* These are what external supplicant/authenticator wants */</div><div class='hunk'>@@ -512,7 +498,7 @@ brcmf_c_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata,</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Fall through: this should get _everything_  */</div><div class='ctx'> </div><div class='del'>-		*ifidx = brcmf_ifname2idx(drvr_priv, event-&gt;ifname);</div><div class='add'>+		*ifidx = brcmf_ifname2idx(drvr, event-&gt;ifname);</div><div class='ctx'> 		brcmf_dbg(TRACE, "MAC event %d, flags %x, status %x\n",</div><div class='ctx'> 			  type, flags, status);</div><div class='ctx'> </div><div class='hunk'>@@ -812,7 +798,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr)</div><div class='ctx'> 				 "event_msgs" + '\0' + bitvec  */</div><div class='ctx'> 	uint up = 0;</div><div class='ctx'> 	char buf[128], *ptr;</div><div class='del'>-	u32 dongle_align = BRCMF_SDALIGN;</div><div class='add'>+	u32 dongle_align = drvr-&gt;bus_if-&gt;align;</div><div class='ctx'> 	u32 glom = 0;</div><div class='ctx'> 	u32 roaming = 1;</div><div class='ctx'> 	uint bcn_timeout = 3;</div><div class='hunk'>@@ -820,7 +806,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr)</div><div class='ctx'> 	int scan_unassoc_time = 40;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	brcmf_os_proto_block(drvr);</div><div class='add'>+	mutex_lock(&amp;drvr-&gt;proto_block);</div><div class='ctx'> </div><div class='ctx'> 	/* Set Country code */</div><div class='ctx'> 	if (drvr-&gt;country_code[0] != 0) {</div><div class='hunk'>@@ -889,7 +875,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr)</div><div class='ctx'> 						 0, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	brcmf_os_proto_unblock(drvr);</div><div class='add'>+	mutex_unlock(&amp;drvr-&gt;proto_block);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h<br/>index 7467922f0536..bb26ee36bc68 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h</a></div><div class='hunk'>@@ -17,6 +17,21 @@</div><div class='ctx'> #ifndef _BRCMF_DBG_H_</div><div class='ctx'> #define _BRCMF_DBG_H_</div><div class='ctx'> </div><div class='add'>+/* message levels */</div><div class='add'>+#define BRCMF_ERROR_VAL	0x0001</div><div class='add'>+#define BRCMF_TRACE_VAL	0x0002</div><div class='add'>+#define BRCMF_INFO_VAL	0x0004</div><div class='add'>+#define BRCMF_DATA_VAL	0x0008</div><div class='add'>+#define BRCMF_CTL_VAL	0x0010</div><div class='add'>+#define BRCMF_TIMER_VAL	0x0020</div><div class='add'>+#define BRCMF_HDRS_VAL	0x0040</div><div class='add'>+#define BRCMF_BYTES_VAL	0x0080</div><div class='add'>+#define BRCMF_INTR_VAL	0x0100</div><div class='add'>+#define BRCMF_GLOM_VAL	0x0400</div><div class='add'>+#define BRCMF_EVENT_VAL	0x0800</div><div class='add'>+#define BRCMF_BTA_VAL	0x1000</div><div class='add'>+#define BRCMF_ISCAN_VAL 0x2000</div><div class='add'>+</div><div class='ctx'> #if defined(BCMDBG)</div><div class='ctx'> </div><div class='ctx'> #define brcmf_dbg(level, fmt, ...)					\</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c<br/>index 4acbac5a74c6..eb9eb766ac27 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c</a></div><div class='hunk'>@@ -43,7 +43,6 @@</div><div class='ctx'> #include "dhd_proto.h"</div><div class='ctx'> #include "dhd_dbg.h"</div><div class='ctx'> #include "wl_cfg80211.h"</div><div class='del'>-#include "bcmchip.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Broadcom Corporation");</div><div class='ctx'> MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN fullmac driver.");</div><div class='hunk'>@@ -53,48 +52,19 @@ MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> </div><div class='ctx'> /* Interface control information */</div><div class='ctx'> struct brcmf_if {</div><div class='del'>-	struct brcmf_info *info;	/* back pointer to brcmf_info */</div><div class='add'>+	struct brcmf_pub *drvr;	/* back pointer to brcmf_pub */</div><div class='ctx'> 	/* OS/stack specifics */</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> 	struct net_device_stats stats;</div><div class='ctx'> 	int idx;		/* iface idx in dongle */</div><div class='del'>-	int state;		/* interface state */</div><div class='ctx'> 	u8 mac_addr[ETH_ALEN];	/* assigned MAC address */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Local private structure (extension of pub) */</div><div class='del'>-struct brcmf_info {</div><div class='del'>-	struct brcmf_pub pub;</div><div class='del'>-</div><div class='del'>-	/* OS/stack specifics */</div><div class='del'>-	struct brcmf_if *iflist[BRCMF_MAX_IFS];</div><div class='del'>-</div><div class='del'>-	struct mutex proto_block;</div><div class='del'>-</div><div class='del'>-	struct work_struct setmacaddr_work;</div><div class='del'>-	struct work_struct multicast_work;</div><div class='del'>-	u8 macvalue[ETH_ALEN];</div><div class='del'>-	atomic_t pend_8021x_cnt;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Error bits */</div><div class='add'>+int brcmf_msg_level = BRCMF_ERROR_VAL;</div><div class='ctx'> module_param(brcmf_msg_level, int, 0);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int brcmf_net2idx(struct brcmf_info *drvr_priv, struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='del'>-	while (i &lt; BRCMF_MAX_IFS) {</div><div class='del'>-		if (drvr_priv-&gt;iflist[i] &amp;&amp; drvr_priv-&gt;iflist[i]-&gt;ndev == ndev)</div><div class='del'>-			return i;</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return BRCMF_BAD_IF;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int brcmf_ifname2idx(struct brcmf_info *drvr_priv, char *name)</div><div class='add'>+int brcmf_ifname2idx(struct brcmf_pub *drvr, char *name)</div><div class='ctx'> {</div><div class='ctx'> 	int i = BRCMF_MAX_IFS;</div><div class='ctx'> 	struct brcmf_if *ifp;</div><div class='hunk'>@@ -103,7 +73,7 @@ int brcmf_ifname2idx(struct brcmf_info *drvr_priv, char *name)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	while (--i &gt; 0) {</div><div class='del'>-		ifp = drvr_priv-&gt;iflist[i];</div><div class='add'>+		ifp = drvr-&gt;iflist[i];</div><div class='ctx'> 		if (ifp &amp;&amp; !strncmp(ifp-&gt;ndev-&gt;name, name, IFNAMSIZ))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -115,20 +85,18 @@ int brcmf_ifname2idx(struct brcmf_info *drvr_priv, char *name)</div><div class='ctx'> </div><div class='ctx'> char *brcmf_ifname(struct brcmf_pub *drvr, int ifidx)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_info *drvr_priv = drvr-&gt;info;</div><div class='del'>-</div><div class='ctx'> 	if (ifidx &lt; 0 || ifidx &gt;= BRCMF_MAX_IFS) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "ifidx %d out of range\n", ifidx);</div><div class='ctx'> 		return "&lt;if_bad&gt;";</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (drvr_priv-&gt;iflist[ifidx] == NULL) {</div><div class='add'>+	if (drvr-&gt;iflist[ifidx] == NULL) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "null i/f %d\n", ifidx);</div><div class='ctx'> 		return "&lt;if_null&gt;";</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (drvr_priv-&gt;iflist[ifidx]-&gt;ndev)</div><div class='del'>-		return drvr_priv-&gt;iflist[ifidx]-&gt;ndev-&gt;name;</div><div class='add'>+	if (drvr-&gt;iflist[ifidx]-&gt;ndev)</div><div class='add'>+		return drvr-&gt;iflist[ifidx]-&gt;ndev-&gt;name;</div><div class='ctx'> </div><div class='ctx'> 	return "&lt;if_none&gt;";</div><div class='ctx'> }</div><div class='hunk'>@@ -146,10 +114,10 @@ static void _brcmf_set_multicast_list(struct work_struct *work)</div><div class='ctx'> 	uint buflen;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	struct brcmf_info *drvr_priv = container_of(work, struct brcmf_info,</div><div class='add'>+	struct brcmf_pub *drvr = container_of(work, struct brcmf_pub,</div><div class='ctx'> 						    multicast_work);</div><div class='ctx'> </div><div class='del'>-	ndev = drvr_priv-&gt;iflist[0]-&gt;ndev;</div><div class='add'>+	ndev = drvr-&gt;iflist[0]-&gt;ndev;</div><div class='ctx'> 	cnt = netdev_mc_count(ndev);</div><div class='ctx'> </div><div class='ctx'> 	/* Determine initial value of allmulti flag */</div><div class='hunk'>@@ -183,10 +151,10 @@ static void _brcmf_set_multicast_list(struct work_struct *work)</div><div class='ctx'> 	dcmd.len = buflen;</div><div class='ctx'> 	dcmd.set = true;</div><div class='ctx'> </div><div class='del'>-	ret = brcmf_proto_dcmd(&amp;drvr_priv-&gt;pub, 0, &amp;dcmd, dcmd.len);</div><div class='add'>+	ret = brcmf_proto_dcmd(drvr, 0, &amp;dcmd, dcmd.len);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "%s: set mcast_list failed, cnt %d\n",</div><div class='del'>-			  brcmf_ifname(&amp;drvr_priv-&gt;pub, 0), cnt);</div><div class='add'>+			  brcmf_ifname(drvr, 0), cnt);</div><div class='ctx'> 		dcmd_value = cnt ? true : dcmd_value;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -208,7 +176,7 @@ static void _brcmf_set_multicast_list(struct work_struct *work)</div><div class='ctx'> 	    ("allmulti", (void *)&amp;dcmd_le_value,</div><div class='ctx'> 	    sizeof(dcmd_le_value), buf, buflen)) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "%s: mkiovar failed for allmulti, datalen %d buflen %u\n",</div><div class='del'>-			  brcmf_ifname(&amp;drvr_priv-&gt;pub, 0),</div><div class='add'>+			  brcmf_ifname(drvr, 0),</div><div class='ctx'> 			  (int)sizeof(dcmd_value), buflen);</div><div class='ctx'> 		kfree(buf);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -220,10 +188,10 @@ static void _brcmf_set_multicast_list(struct work_struct *work)</div><div class='ctx'> 	dcmd.len = buflen;</div><div class='ctx'> 	dcmd.set = true;</div><div class='ctx'> </div><div class='del'>-	ret = brcmf_proto_dcmd(&amp;drvr_priv-&gt;pub, 0, &amp;dcmd, dcmd.len);</div><div class='add'>+	ret = brcmf_proto_dcmd(drvr, 0, &amp;dcmd, dcmd.len);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "%s: set allmulti %d failed\n",</div><div class='del'>-			  brcmf_ifname(&amp;drvr_priv-&gt;pub, 0),</div><div class='add'>+			  brcmf_ifname(drvr, 0),</div><div class='ctx'> 			  le32_to_cpu(dcmd_le_value));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -241,10 +209,10 @@ static void _brcmf_set_multicast_list(struct work_struct *work)</div><div class='ctx'> 	dcmd.len = sizeof(dcmd_le_value);</div><div class='ctx'> 	dcmd.set = true;</div><div class='ctx'> </div><div class='del'>-	ret = brcmf_proto_dcmd(&amp;drvr_priv-&gt;pub, 0, &amp;dcmd, dcmd.len);</div><div class='add'>+	ret = brcmf_proto_dcmd(drvr, 0, &amp;dcmd, dcmd.len);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "%s: set promisc %d failed\n",</div><div class='del'>-			  brcmf_ifname(&amp;drvr_priv-&gt;pub, 0),</div><div class='add'>+			  brcmf_ifname(drvr, 0),</div><div class='ctx'> 			  le32_to_cpu(dcmd_le_value));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -256,14 +224,14 @@ _brcmf_set_mac_address(struct work_struct *work)</div><div class='ctx'> 	struct brcmf_dcmd dcmd;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	struct brcmf_info *drvr_priv = container_of(work, struct brcmf_info,</div><div class='add'>+	struct brcmf_pub *drvr = container_of(work, struct brcmf_pub,</div><div class='ctx'> 						    setmacaddr_work);</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "enter\n");</div><div class='del'>-	if (!brcmf_c_mkiovar("cur_etheraddr", (char *)drvr_priv-&gt;macvalue,</div><div class='add'>+	if (!brcmf_c_mkiovar("cur_etheraddr", (char *)drvr-&gt;macvalue,</div><div class='ctx'> 			   ETH_ALEN, buf, 32)) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "%s: mkiovar failed for cur_etheraddr\n",</div><div class='del'>-			  brcmf_ifname(&amp;drvr_priv-&gt;pub, 0));</div><div class='add'>+			  brcmf_ifname(drvr, 0));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(&amp;dcmd, 0, sizeof(dcmd));</div><div class='hunk'>@@ -272,52 +240,40 @@ _brcmf_set_mac_address(struct work_struct *work)</div><div class='ctx'> 	dcmd.len = 32;</div><div class='ctx'> 	dcmd.set = true;</div><div class='ctx'> </div><div class='del'>-	ret = brcmf_proto_dcmd(&amp;drvr_priv-&gt;pub, 0, &amp;dcmd, dcmd.len);</div><div class='add'>+	ret = brcmf_proto_dcmd(drvr, 0, &amp;dcmd, dcmd.len);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		brcmf_dbg(ERROR, "%s: set cur_etheraddr failed\n",</div><div class='del'>-			  brcmf_ifname(&amp;drvr_priv-&gt;pub, 0));</div><div class='add'>+			  brcmf_ifname(drvr, 0));</div><div class='ctx'> 	else</div><div class='del'>-		memcpy(drvr_priv-&gt;iflist[0]-&gt;ndev-&gt;dev_addr,</div><div class='del'>-		       drvr_priv-&gt;macvalue, ETH_ALEN);</div><div class='add'>+		memcpy(drvr-&gt;iflist[0]-&gt;ndev-&gt;dev_addr,</div><div class='add'>+		       drvr-&gt;macvalue, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int brcmf_netdev_set_mac_address(struct net_device *ndev, void *addr)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_info *drvr_priv = *(struct brcmf_info **)</div><div class='del'>-					netdev_priv(ndev);</div><div class='add'>+	struct brcmf_if *ifp = netdev_priv(ndev);</div><div class='add'>+	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='ctx'> 	struct sockaddr *sa = (struct sockaddr *)addr;</div><div class='del'>-	int ifidx;</div><div class='del'>-</div><div class='del'>-	ifidx = brcmf_net2idx(drvr_priv, ndev);</div><div class='del'>-	if (ifidx == BRCMF_BAD_IF)</div><div class='del'>-		return -1;</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;drvr_priv-&gt;macvalue, sa-&gt;sa_data, ETH_ALEN);</div><div class='del'>-	schedule_work(&amp;drvr_priv-&gt;setmacaddr_work);</div><div class='add'>+	memcpy(&amp;drvr-&gt;macvalue, sa-&gt;sa_data, ETH_ALEN);</div><div class='add'>+	schedule_work(&amp;drvr-&gt;setmacaddr_work);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void brcmf_netdev_set_multicast_list(struct net_device *ndev)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_info *drvr_priv = *(struct brcmf_info **)</div><div class='del'>-					netdev_priv(ndev);</div><div class='del'>-	int ifidx;</div><div class='del'>-</div><div class='del'>-	ifidx = brcmf_net2idx(drvr_priv, ndev);</div><div class='del'>-	if (ifidx == BRCMF_BAD_IF)</div><div class='del'>-		return;</div><div class='add'>+	struct brcmf_if *ifp = netdev_priv(ndev);</div><div class='add'>+	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='ctx'> </div><div class='del'>-	schedule_work(&amp;drvr_priv-&gt;multicast_work);</div><div class='add'>+	schedule_work(&amp;drvr-&gt;multicast_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int brcmf_sendpkt(struct brcmf_pub *drvr, int ifidx, struct sk_buff *pktbuf)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_info *drvr_priv = drvr-&gt;info;</div><div class='del'>-</div><div class='ctx'> 	/* Reject if down */</div><div class='del'>-	if (!drvr-&gt;up || (drvr-&gt;busstate == BRCMF_BUS_DOWN))</div><div class='add'>+	if (!drvr-&gt;bus_if-&gt;drvr_up || (drvr-&gt;bus_if-&gt;state == BRCMF_BUS_DOWN))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* Update multicast statistic */</div><div class='hunk'>@@ -328,122 +284,118 @@ int brcmf_sendpkt(struct brcmf_pub *drvr, int ifidx, struct sk_buff *pktbuf)</div><div class='ctx'> 		if (is_multicast_ether_addr(eh-&gt;h_dest))</div><div class='ctx'> 			drvr-&gt;tx_multicast++;</div><div class='ctx'> 		if (ntohs(eh-&gt;h_proto) == ETH_P_PAE)</div><div class='del'>-			atomic_inc(&amp;drvr_priv-&gt;pend_8021x_cnt);</div><div class='add'>+			atomic_inc(&amp;drvr-&gt;pend_8021x_cnt);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If the protocol uses a data header, apply it */</div><div class='ctx'> 	brcmf_proto_hdrpush(drvr, ifidx, pktbuf);</div><div class='ctx'> </div><div class='ctx'> 	/* Use bus module to send data frame */</div><div class='del'>-	return brcmf_sdbrcm_bus_txdata(drvr-&gt;bus, pktbuf);</div><div class='add'>+	return drvr-&gt;bus_if-&gt;brcmf_bus_txdata(drvr-&gt;dev, pktbuf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int brcmf_netdev_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct brcmf_info *drvr_priv = *(struct brcmf_info **)</div><div class='del'>-					netdev_priv(ndev);</div><div class='del'>-	int ifidx;</div><div class='add'>+	struct brcmf_if *ifp = netdev_priv(ndev);</div><div class='add'>+	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Reject if down */</div><div class='del'>-	if (!drvr_priv-&gt;pub.up || (drvr_priv-&gt;pub.busstate == BRCMF_BUS_DOWN)) {</div><div class='del'>-		brcmf_dbg(ERROR, "xmit rejected pub.up=%d busstate=%d\n",</div><div class='del'>-			  drvr_priv-&gt;pub.up, drvr_priv-&gt;pub.busstate);</div><div class='add'>+	if (!drvr-&gt;bus_if-&gt;drvr_up ||</div><div class='add'>+	    (drvr-&gt;bus_if-&gt;state == BRCMF_BUS_DOWN)) {</div><div class='add'>+		brcmf_dbg(ERROR, "xmit rejected drvup=%d state=%d\n",</div><div class='add'>+			  drvr-&gt;bus_if-&gt;drvr_up,</div><div class='add'>+			  drvr-&gt;bus_if-&gt;state);</div><div class='ctx'> 		netif_stop_queue(ndev);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ifidx = brcmf_net2idx(drvr_priv, ndev);</div><div class='del'>-	if (ifidx == BRCMF_BAD_IF) {</div><div class='del'>-		brcmf_dbg(ERROR, "bad ifidx %d\n", ifidx);</div><div class='add'>+	if (!drvr-&gt;iflist[ifp-&gt;idx]) {</div><div class='add'>+		brcmf_dbg(ERROR, "bad ifidx %d\n", ifp-&gt;idx);</div><div class='ctx'> 		netif_stop_queue(ndev);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure there's enough room for any header */</div><div class='del'>-	if (skb_headroom(skb) &lt; drvr_priv-&gt;pub.hdrlen) {</div><div class='add'>+	if (skb_headroom(skb) &lt; drvr-&gt;hdrlen) {</div><div class='ctx'> 		struct sk_buff *skb2;</div><div class='ctx'> </div><div class='ctx'> 		brcmf_dbg(INFO, "%s: insufficient headroom\n",</div><div class='del'>-			  brcmf_ifname(&amp;drvr_priv-&gt;pub, ifidx));</div><div class='del'>-		drvr_priv-&gt;pub.tx_realloc++;</div><div class='del'>-		skb2 = skb_realloc_headroom(skb, drvr_priv-&gt;pub.hdrlen);</div><div class='add'>+			  brcmf_ifname(drvr, ifp-&gt;idx));</div><div class='add'>+		drvr-&gt;bus_if-&gt;tx_realloc++;</div><div class='add'>+		skb2 = skb_realloc_headroom(skb, drvr-&gt;hdrlen);</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 		skb = skb2;</div><div class='ctx'> 		if (skb == NULL) {</div><div class='ctx'> 			brcmf_dbg(ERROR, "%s: skb_realloc_headroom failed\n",</div><div class='del'>-				  brcmf_ifname(&amp;drvr_priv-&gt;pub, ifidx));</div><div class='add'>+				  brcmf_ifname(drvr, ifp-&gt;idx));</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = brcmf_sendpkt(&amp;drvr_priv-&gt;pub, ifidx, skb);</div><div class='add'>+	ret = brcmf_sendpkt(drvr, ifp-&gt;idx, skb);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	if (ret)</div><div class='del'>-		drvr_priv-&gt;pub.dstats.tx_dropped++;</div><div class='add'>+		drvr-&gt;bus_if-&gt;dstats.tx_dropped++;</div><div class='ctx'> 	else</div><div class='del'>-		drvr_priv-&gt;pub.tx_packets++;</div><div class='add'>+		drvr-&gt;bus_if-&gt;dstats.tx_packets++;</div><div class='ctx'> </div><div class='ctx'> 	/* Return ok: we always eat the packet */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void brcmf_txflowcontrol(struct brcmf_pub *drvr, int ifidx, bool state)</div><div class='add'>+void brcmf_txflowcontrol(struct device *dev, int ifidx, bool state)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev;</div><div class='del'>-	struct brcmf_info *drvr_priv = drvr-&gt;info;</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='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='del'>-	drvr-&gt;txoff = state;</div><div class='del'>-	ndev = drvr_priv-&gt;iflist[ifidx]-&gt;ndev;</div><div class='add'>+	ndev = drvr-&gt;iflist[ifidx]-&gt;ndev;</div><div class='ctx'> 	if (state == ON)</div><div class='ctx'> 		netif_stop_queue(ndev);</div><div class='ctx'> 	else</div><div class='ctx'> 		netif_wake_queue(ndev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int brcmf_host_event(struct brcmf_info *drvr_priv, int *ifidx,</div><div class='add'>+static int brcmf_host_event(struct brcmf_pub *drvr, int *ifidx,</div><div class='ctx'> 			    void *pktdata, struct brcmf_event_msg *event,</div><div class='ctx'> 			    void **data)</div><div class='ctx'> {</div><div class='ctx'> 	int bcmerror = 0;</div><div class='ctx'> </div><div class='del'>-	bcmerror = brcmf_c_host_event(drvr_priv, ifidx, pktdata, event, data);</div><div class='add'>+	bcmerror = brcmf_c_host_event(drvr, ifidx, pktdata, event, data);</div><div class='ctx'> 	if (bcmerror != 0)</div><div class='ctx'> 		return bcmerror;</div><div class='ctx'> </div><div class='del'>-	if (drvr_priv-&gt;iflist[*ifidx]-&gt;ndev)</div><div class='del'>-		brcmf_cfg80211_event(drvr_priv-&gt;iflist[*ifidx]-&gt;ndev,</div><div class='add'>+	if (drvr-&gt;iflist[*ifidx]-&gt;ndev)</div><div class='add'>+		brcmf_cfg80211_event(drvr-&gt;iflist[*ifidx]-&gt;ndev,</div><div class='ctx'> 				     event, *data);</div><div class='ctx'> </div><div class='ctx'> 	return bcmerror;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx, struct sk_buff *skb,</div><div class='del'>-		  int numpkt)</div><div class='add'>+void brcmf_rx_frame(struct device *dev, int ifidx,</div><div class='add'>+		    struct sk_buff_head *skb_list)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_info *drvr_priv = drvr-&gt;info;</div><div class='ctx'> 	unsigned char *eth;</div><div class='ctx'> 	uint len;</div><div class='ctx'> 	void *data;</div><div class='del'>-	struct sk_buff *pnext, *save_pktbuf;</div><div class='del'>-	int i;</div><div class='add'>+	struct sk_buff *skb, *pnext;</div><div class='ctx'> 	struct brcmf_if *ifp;</div><div class='ctx'> 	struct brcmf_event_msg event;</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='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='del'>-	save_pktbuf = skb;</div><div class='del'>-</div><div class='del'>-	for (i = 0; skb &amp;&amp; i &lt; numpkt; i++, skb = pnext) {</div><div class='del'>-</div><div class='del'>-		pnext = skb-&gt;next;</div><div class='del'>-		skb-&gt;next = NULL;</div><div class='add'>+	skb_queue_walk_safe(skb_list, skb, pnext) {</div><div class='add'>+		skb_unlink(skb, skb_list);</div><div class='ctx'> </div><div class='ctx'> 		/* Get the protocol, maintain skb around eth_type_trans()</div><div class='ctx'> 		 * The main reason for this hack is for the limitation of</div><div class='hunk'>@@ -460,15 +412,21 @@ void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx, struct sk_buff *skb,</div><div class='ctx'> 		eth = skb-&gt;data;</div><div class='ctx'> 		len = skb-&gt;len;</div><div class='ctx'> </div><div class='del'>-		ifp = drvr_priv-&gt;iflist[ifidx];</div><div class='add'>+		ifp = drvr-&gt;iflist[ifidx];</div><div class='ctx'> 		if (ifp == NULL)</div><div class='del'>-			ifp = drvr_priv-&gt;iflist[0];</div><div class='add'>+			ifp = drvr-&gt;iflist[0];</div><div class='add'>+</div><div class='add'>+		if (!ifp || !ifp-&gt;ndev ||</div><div class='add'>+		    ifp-&gt;ndev-&gt;reg_state != NETREG_REGISTERED) {</div><div class='add'>+			brcmu_pkt_buf_free_skb(skb);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		skb-&gt;dev = ifp-&gt;ndev;</div><div class='ctx'> 		skb-&gt;protocol = eth_type_trans(skb, skb-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 		if (skb-&gt;pkt_type == PACKET_MULTICAST)</div><div class='del'>-			drvr_priv-&gt;pub.rx_multicast++;</div><div class='add'>+			bus_if-&gt;dstats.multicast++;</div><div class='ctx'> </div><div class='ctx'> 		skb-&gt;data = eth;</div><div class='ctx'> 		skb-&gt;len = len;</div><div class='hunk'>@@ -478,19 +436,17 @@ void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 		/* Process special event packets and then discard them */</div><div class='ctx'> 		if (ntohs(skb-&gt;protocol) == ETH_P_LINK_CTL)</div><div class='del'>-			brcmf_host_event(drvr_priv, &amp;ifidx,</div><div class='add'>+			brcmf_host_event(drvr, &amp;ifidx,</div><div class='ctx'> 					  skb_mac_header(skb),</div><div class='ctx'> 					  &amp;event, &amp;data);</div><div class='ctx'> </div><div class='del'>-		if (drvr_priv-&gt;iflist[ifidx] &amp;&amp;</div><div class='del'>-		    !drvr_priv-&gt;iflist[ifidx]-&gt;state)</div><div class='del'>-			ifp = drvr_priv-&gt;iflist[ifidx];</div><div class='del'>-</div><div class='del'>-		if (ifp-&gt;ndev)</div><div class='add'>+		if (drvr-&gt;iflist[ifidx]) {</div><div class='add'>+			ifp = drvr-&gt;iflist[ifidx];</div><div class='ctx'> 			ifp-&gt;ndev-&gt;last_rx = jiffies;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		drvr-&gt;dstats.rx_bytes += skb-&gt;len;</div><div class='del'>-		drvr-&gt;rx_packets++;	/* Local count */</div><div class='add'>+		bus_if-&gt;dstats.rx_bytes += skb-&gt;len;</div><div class='add'>+		bus_if-&gt;dstats.rx_packets++;	/* Local count */</div><div class='ctx'> </div><div class='ctx'> 		if (in_interrupt())</div><div class='ctx'> 			netif_rx(skb);</div><div class='hunk'>@@ -505,59 +461,48 @@ void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx, struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void brcmf_txcomplete(struct brcmf_pub *drvr, struct sk_buff *txp, bool success)</div><div class='add'>+void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success)</div><div class='ctx'> {</div><div class='ctx'> 	uint ifidx;</div><div class='del'>-	struct brcmf_info *drvr_priv = drvr-&gt;info;</div><div class='ctx'> 	struct ethhdr *eh;</div><div class='ctx'> 	u16 type;</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='ctx'> </div><div class='del'>-	brcmf_proto_hdrpull(drvr, &amp;ifidx, txp);</div><div class='add'>+	brcmf_proto_hdrpull(dev, &amp;ifidx, txp);</div><div class='ctx'> </div><div class='ctx'> 	eh = (struct ethhdr *)(txp-&gt;data);</div><div class='ctx'> 	type = ntohs(eh-&gt;h_proto);</div><div class='ctx'> </div><div class='ctx'> 	if (type == ETH_P_PAE)</div><div class='del'>-		atomic_dec(&amp;drvr_priv-&gt;pend_8021x_cnt);</div><div class='add'>+		atomic_dec(&amp;drvr-&gt;pend_8021x_cnt);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct net_device_stats *brcmf_netdev_get_stats(struct net_device *ndev)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_info *drvr_priv = *(struct brcmf_info **)</div><div class='del'>-					netdev_priv(ndev);</div><div class='del'>-	struct brcmf_if *ifp;</div><div class='del'>-	int ifidx;</div><div class='add'>+	struct brcmf_if *ifp = netdev_priv(ndev);</div><div class='add'>+	struct brcmf_bus *bus_if = ifp-&gt;drvr-&gt;bus_if;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='del'>-	ifidx = brcmf_net2idx(drvr_priv, ndev);</div><div class='del'>-	if (ifidx == BRCMF_BAD_IF)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	ifp = drvr_priv-&gt;iflist[ifidx];</div><div class='del'>-</div><div class='del'>-	if (drvr_priv-&gt;pub.up)</div><div class='del'>-		/* Use the protocol to get dongle stats */</div><div class='del'>-		brcmf_proto_dstats(&amp;drvr_priv-&gt;pub);</div><div class='del'>-</div><div class='ctx'> 	/* Copy dongle stats to net device stats */</div><div class='del'>-	ifp-&gt;stats.rx_packets = drvr_priv-&gt;pub.dstats.rx_packets;</div><div class='del'>-	ifp-&gt;stats.tx_packets = drvr_priv-&gt;pub.dstats.tx_packets;</div><div class='del'>-	ifp-&gt;stats.rx_bytes = drvr_priv-&gt;pub.dstats.rx_bytes;</div><div class='del'>-	ifp-&gt;stats.tx_bytes = drvr_priv-&gt;pub.dstats.tx_bytes;</div><div class='del'>-	ifp-&gt;stats.rx_errors = drvr_priv-&gt;pub.dstats.rx_errors;</div><div class='del'>-	ifp-&gt;stats.tx_errors = drvr_priv-&gt;pub.dstats.tx_errors;</div><div class='del'>-	ifp-&gt;stats.rx_dropped = drvr_priv-&gt;pub.dstats.rx_dropped;</div><div class='del'>-	ifp-&gt;stats.tx_dropped = drvr_priv-&gt;pub.dstats.tx_dropped;</div><div class='del'>-	ifp-&gt;stats.multicast = drvr_priv-&gt;pub.dstats.multicast;</div><div class='add'>+	ifp-&gt;stats.rx_packets = bus_if-&gt;dstats.rx_packets;</div><div class='add'>+	ifp-&gt;stats.tx_packets = bus_if-&gt;dstats.tx_packets;</div><div class='add'>+	ifp-&gt;stats.rx_bytes = bus_if-&gt;dstats.rx_bytes;</div><div class='add'>+	ifp-&gt;stats.tx_bytes = bus_if-&gt;dstats.tx_bytes;</div><div class='add'>+	ifp-&gt;stats.rx_errors = bus_if-&gt;dstats.rx_errors;</div><div class='add'>+	ifp-&gt;stats.tx_errors = bus_if-&gt;dstats.tx_errors;</div><div class='add'>+	ifp-&gt;stats.rx_dropped = bus_if-&gt;dstats.rx_dropped;</div><div class='add'>+	ifp-&gt;stats.tx_dropped = bus_if-&gt;dstats.tx_dropped;</div><div class='add'>+	ifp-&gt;stats.multicast = bus_if-&gt;dstats.multicast;</div><div class='ctx'> </div><div class='ctx'> 	return &amp;ifp-&gt;stats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Retrieve current toe component enables, which are kept</div><div class='ctx'> 	 as a bitmap in toe_ol iovar */</div><div class='del'>-static int brcmf_toe_get(struct brcmf_info *drvr_priv, int ifidx, u32 *toe_ol)</div><div class='add'>+static int brcmf_toe_get(struct brcmf_pub *drvr, int ifidx, u32 *toe_ol)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_dcmd dcmd;</div><div class='ctx'> 	__le32 toe_le;</div><div class='hunk'>@@ -572,17 +517,17 @@ static int brcmf_toe_get(struct brcmf_info *drvr_priv, int ifidx, u32 *toe_ol)</div><div class='ctx'> 	dcmd.set = false;</div><div class='ctx'> </div><div class='ctx'> 	strcpy(buf, "toe_ol");</div><div class='del'>-	ret = brcmf_proto_dcmd(&amp;drvr_priv-&gt;pub, ifidx, &amp;dcmd, dcmd.len);</div><div class='add'>+	ret = brcmf_proto_dcmd(drvr, ifidx, &amp;dcmd, dcmd.len);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		/* Check for older dongle image that doesn't support toe_ol */</div><div class='ctx'> 		if (ret == -EIO) {</div><div class='ctx'> 			brcmf_dbg(ERROR, "%s: toe not supported by device\n",</div><div class='del'>-				  brcmf_ifname(&amp;drvr_priv-&gt;pub, ifidx));</div><div class='add'>+				  brcmf_ifname(drvr, ifidx));</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		brcmf_dbg(INFO, "%s: could not get toe_ol: ret=%d\n",</div><div class='del'>-			  brcmf_ifname(&amp;drvr_priv-&gt;pub, ifidx), ret);</div><div class='add'>+			  brcmf_ifname(drvr, ifidx), ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -593,7 +538,7 @@ static int brcmf_toe_get(struct brcmf_info *drvr_priv, int ifidx, u32 *toe_ol)</div><div class='ctx'> </div><div class='ctx'> /* Set current toe component enables in toe_ol iovar,</div><div class='ctx'> 	 and set toe global enable iovar */</div><div class='del'>-static int brcmf_toe_set(struct brcmf_info *drvr_priv, int ifidx, u32 toe_ol)</div><div class='add'>+static int brcmf_toe_set(struct brcmf_pub *drvr, int ifidx, u32 toe_ol)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_dcmd dcmd;</div><div class='ctx'> 	char buf[32];</div><div class='hunk'>@@ -611,10 +556,10 @@ static int brcmf_toe_set(struct brcmf_info *drvr_priv, int ifidx, u32 toe_ol)</div><div class='ctx'> 	strcpy(buf, "toe_ol");</div><div class='ctx'> 	memcpy(&amp;buf[sizeof("toe_ol")], &amp;toe_le, sizeof(u32));</div><div class='ctx'> </div><div class='del'>-	ret = brcmf_proto_dcmd(&amp;drvr_priv-&gt;pub, ifidx, &amp;dcmd, dcmd.len);</div><div class='add'>+	ret = brcmf_proto_dcmd(drvr, ifidx, &amp;dcmd, dcmd.len);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "%s: could not set toe_ol: ret=%d\n",</div><div class='del'>-			  brcmf_ifname(&amp;drvr_priv-&gt;pub, ifidx), ret);</div><div class='add'>+			  brcmf_ifname(drvr, ifidx), ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -624,10 +569,10 @@ static int brcmf_toe_set(struct brcmf_info *drvr_priv, int ifidx, u32 toe_ol)</div><div class='ctx'> 	strcpy(buf, "toe");</div><div class='ctx'> 	memcpy(&amp;buf[sizeof("toe")], &amp;toe_le, sizeof(u32));</div><div class='ctx'> </div><div class='del'>-	ret = brcmf_proto_dcmd(&amp;drvr_priv-&gt;pub, ifidx, &amp;dcmd, dcmd.len);</div><div class='add'>+	ret = brcmf_proto_dcmd(drvr, ifidx, &amp;dcmd, dcmd.len);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "%s: could not set toe: ret=%d\n",</div><div class='del'>-			  brcmf_ifname(&amp;drvr_priv-&gt;pub, ifidx), ret);</div><div class='add'>+			  brcmf_ifname(drvr, ifidx), ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -637,21 +582,19 @@ static int brcmf_toe_set(struct brcmf_info *drvr_priv, int ifidx, u32 toe_ol)</div><div class='ctx'> static void brcmf_ethtool_get_drvinfo(struct net_device *ndev,</div><div class='ctx'> 				    struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_info *drvr_priv = *(struct brcmf_info **)</div><div class='del'>-					netdev_priv(ndev);</div><div class='add'>+	struct brcmf_if *ifp = netdev_priv(ndev);</div><div class='add'>+	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='ctx'> </div><div class='ctx'> 	sprintf(info-&gt;driver, KBUILD_MODNAME);</div><div class='del'>-	sprintf(info-&gt;version, "%lu", drvr_priv-&gt;pub.drv_version);</div><div class='del'>-	sprintf(info-&gt;fw_version, "%s", BCM4329_FW_NAME);</div><div class='del'>-	sprintf(info-&gt;bus_info, "%s",</div><div class='del'>-		dev_name(brcmf_bus_get_device(drvr_priv-&gt;pub.bus)));</div><div class='add'>+	sprintf(info-&gt;version, "%lu", drvr-&gt;drv_version);</div><div class='add'>+	sprintf(info-&gt;bus_info, "%s", dev_name(drvr-&gt;dev));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ethtool_ops brcmf_ethtool_ops = {</div><div class='ctx'> 	.get_drvinfo = brcmf_ethtool_get_drvinfo</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int brcmf_ethtool(struct brcmf_info *drvr_priv, void __user *uaddr)</div><div class='add'>+static int brcmf_ethtool(struct brcmf_pub *drvr, void __user *uaddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethtool_drvinfo info;</div><div class='ctx'> 	char drvname[sizeof(info.driver)];</div><div class='hunk'>@@ -685,18 +628,18 @@ static int brcmf_ethtool(struct brcmf_info *drvr_priv, void __user *uaddr)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* otherwise, require dongle to be up */</div><div class='del'>-		else if (!drvr_priv-&gt;pub.up) {</div><div class='add'>+		else if (!drvr-&gt;bus_if-&gt;drvr_up) {</div><div class='ctx'> 			brcmf_dbg(ERROR, "dongle is not up\n");</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* finally, report dongle driver type */</div><div class='del'>-		else if (drvr_priv-&gt;pub.iswl)</div><div class='add'>+		else if (drvr-&gt;iswl)</div><div class='ctx'> 			sprintf(info.driver, "wl");</div><div class='ctx'> 		else</div><div class='ctx'> 			sprintf(info.driver, "xx");</div><div class='ctx'> </div><div class='del'>-		sprintf(info.version, "%lu", drvr_priv-&gt;pub.drv_version);</div><div class='add'>+		sprintf(info.version, "%lu", drvr-&gt;drv_version);</div><div class='ctx'> 		if (copy_to_user(uaddr, &amp;info, sizeof(info)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		brcmf_dbg(CTL, "given %*s, returning %s\n",</div><div class='hunk'>@@ -706,7 +649,7 @@ static int brcmf_ethtool(struct brcmf_info *drvr_priv, void __user *uaddr)</div><div class='ctx'> 		/* Get toe offload components from dongle */</div><div class='ctx'> 	case ETHTOOL_GRXCSUM:</div><div class='ctx'> 	case ETHTOOL_GTXCSUM:</div><div class='del'>-		ret = brcmf_toe_get(drvr_priv, 0, &amp;toe_cmpnt);</div><div class='add'>+		ret = brcmf_toe_get(drvr, 0, &amp;toe_cmpnt);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -727,7 +670,7 @@ static int brcmf_ethtool(struct brcmf_info *drvr_priv, void __user *uaddr)</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		/* Read the current settings, update and write back */</div><div class='del'>-		ret = brcmf_toe_get(drvr_priv, 0, &amp;toe_cmpnt);</div><div class='add'>+		ret = brcmf_toe_get(drvr, 0, &amp;toe_cmpnt);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -739,17 +682,17 @@ static int brcmf_ethtool(struct brcmf_info *drvr_priv, void __user *uaddr)</div><div class='ctx'> 		else</div><div class='ctx'> 			toe_cmpnt &amp;= ~csum_dir;</div><div class='ctx'> </div><div class='del'>-		ret = brcmf_toe_set(drvr_priv, 0, toe_cmpnt);</div><div class='add'>+		ret = brcmf_toe_set(drvr, 0, toe_cmpnt);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='ctx'> 		/* If setting TX checksum mode, tell Linux the new mode */</div><div class='ctx'> 		if (cmd == ETHTOOL_STXCSUM) {</div><div class='ctx'> 			if (edata.data)</div><div class='del'>-				drvr_priv-&gt;iflist[0]-&gt;ndev-&gt;features |=</div><div class='add'>+				drvr-&gt;iflist[0]-&gt;ndev-&gt;features |=</div><div class='ctx'> 				    NETIF_F_IP_CSUM;</div><div class='ctx'> 			else</div><div class='del'>-				drvr_priv-&gt;iflist[0]-&gt;ndev-&gt;features &amp;=</div><div class='add'>+				drvr-&gt;iflist[0]-&gt;ndev-&gt;features &amp;=</div><div class='ctx'> 				    ~NETIF_F_IP_CSUM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -765,18 +708,16 @@ static int brcmf_ethtool(struct brcmf_info *drvr_priv, void __user *uaddr)</div><div class='ctx'> static int brcmf_netdev_ioctl_entry(struct net_device *ndev, struct ifreq *ifr,</div><div class='ctx'> 				    int cmd)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_info *drvr_priv = *(struct brcmf_info **)</div><div class='del'>-					netdev_priv(ndev);</div><div class='del'>-	int ifidx;</div><div class='add'>+	struct brcmf_if *ifp = netdev_priv(ndev);</div><div class='add'>+	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='ctx'> </div><div class='del'>-	ifidx = brcmf_net2idx(drvr_priv, ndev);</div><div class='del'>-	brcmf_dbg(TRACE, "ifidx %d, cmd 0x%04x\n", ifidx, cmd);</div><div class='add'>+	brcmf_dbg(TRACE, "ifidx %d, cmd 0x%04x\n", ifp-&gt;idx, cmd);</div><div class='ctx'> </div><div class='del'>-	if (ifidx == BRCMF_BAD_IF)</div><div class='add'>+	if (!drvr-&gt;iflist[ifp-&gt;idx])</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd == SIOCETHTOOL)</div><div class='del'>-		return brcmf_ethtool(drvr_priv, ifr-&gt;ifr_data);</div><div class='add'>+		return brcmf_ethtool(drvr, ifr-&gt;ifr_data);</div><div class='ctx'> </div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='hunk'>@@ -788,28 +729,25 @@ s32 brcmf_exec_dcmd(struct net_device *ndev, u32 cmd, void *arg, u32 len)</div><div class='ctx'> 	s32 err = 0;</div><div class='ctx'> 	int buflen = 0;</div><div class='ctx'> 	bool is_set_key_cmd;</div><div class='del'>-	struct brcmf_info *drvr_priv = *(struct brcmf_info **)</div><div class='del'>-					netdev_priv(ndev);</div><div class='del'>-	int ifidx;</div><div class='add'>+	struct brcmf_if *ifp = netdev_priv(ndev);</div><div class='add'>+	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;dcmd, 0, sizeof(dcmd));</div><div class='ctx'> 	dcmd.cmd = cmd;</div><div class='ctx'> 	dcmd.buf = arg;</div><div class='ctx'> 	dcmd.len = len;</div><div class='ctx'> </div><div class='del'>-	ifidx = brcmf_net2idx(drvr_priv, ndev);</div><div class='del'>-</div><div class='ctx'> 	if (dcmd.buf != NULL)</div><div class='ctx'> 		buflen = min_t(uint, dcmd.len, BRCMF_DCMD_MAXLEN);</div><div class='ctx'> </div><div class='ctx'> 	/* send to dongle (must be up, and wl) */</div><div class='del'>-	if ((drvr_priv-&gt;pub.busstate != BRCMF_BUS_DATA)) {</div><div class='add'>+	if ((drvr-&gt;bus_if-&gt;state != BRCMF_BUS_DATA)) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "DONGLE_DOWN\n");</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!drvr_priv-&gt;pub.iswl) {</div><div class='add'>+	if (!drvr-&gt;iswl) {</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -826,7 +764,7 @@ s32 brcmf_exec_dcmd(struct net_device *ndev, u32 cmd, void *arg, u32 len)</div><div class='ctx'> 	if (is_set_key_cmd)</div><div class='ctx'> 		brcmf_netdev_wait_pend8021x(ndev);</div><div class='ctx'> </div><div class='del'>-	err = brcmf_proto_dcmd(&amp;drvr_priv-&gt;pub, ifidx, &amp;dcmd, buflen);</div><div class='add'>+	err = brcmf_proto_dcmd(drvr, ifp-&gt;idx, &amp;dcmd, buflen);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	if (err &gt; 0)</div><div class='hunk'>@@ -837,15 +775,16 @@ done:</div><div class='ctx'> </div><div class='ctx'> static int brcmf_netdev_stop(struct net_device *ndev)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_pub *drvr = *(struct brcmf_pub **) netdev_priv(ndev);</div><div class='add'>+	struct brcmf_if *ifp = netdev_priv(ndev);</div><div class='add'>+	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> 	brcmf_cfg80211_down(drvr-&gt;config);</div><div class='del'>-	if (drvr-&gt;up == 0)</div><div class='add'>+	if (drvr-&gt;bus_if-&gt;drvr_up == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Set state and stop OS transmissions */</div><div class='del'>-	drvr-&gt;up = 0;</div><div class='add'>+	drvr-&gt;bus_if-&gt;drvr_up = false;</div><div class='ctx'> 	netif_stop_queue(ndev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -853,39 +792,37 @@ static int brcmf_netdev_stop(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> static int brcmf_netdev_open(struct net_device *ndev)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_info *drvr_priv = *(struct brcmf_info **)</div><div class='del'>-					netdev_priv(ndev);</div><div class='add'>+	struct brcmf_if *ifp = netdev_priv(ndev);</div><div class='add'>+	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='ctx'> 	u32 toe_ol;</div><div class='del'>-	int ifidx = brcmf_net2idx(drvr_priv, ndev);</div><div class='ctx'> 	s32 ret = 0;</div><div class='ctx'> </div><div class='del'>-	brcmf_dbg(TRACE, "ifidx %d\n", ifidx);</div><div class='del'>-</div><div class='del'>-	if (ifidx == 0) {	/* do it only for primary eth0 */</div><div class='add'>+	brcmf_dbg(TRACE, "ifidx %d\n", ifp-&gt;idx);</div><div class='ctx'> </div><div class='add'>+	if (ifp-&gt;idx == 0) {	/* do it only for primary eth0 */</div><div class='ctx'> 		/* try to bring up bus */</div><div class='del'>-		ret = brcmf_bus_start(&amp;drvr_priv-&gt;pub);</div><div class='add'>+		ret = brcmf_bus_start(drvr-&gt;dev);</div><div class='ctx'> 		if (ret != 0) {</div><div class='ctx'> 			brcmf_dbg(ERROR, "failed with code %d\n", ret);</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='del'>-		atomic_set(&amp;drvr_priv-&gt;pend_8021x_cnt, 0);</div><div class='add'>+		atomic_set(&amp;drvr-&gt;pend_8021x_cnt, 0);</div><div class='ctx'> </div><div class='del'>-		memcpy(ndev-&gt;dev_addr, drvr_priv-&gt;pub.mac, ETH_ALEN);</div><div class='add'>+		memcpy(ndev-&gt;dev_addr, drvr-&gt;mac, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 		/* Get current TOE mode from dongle */</div><div class='del'>-		if (brcmf_toe_get(drvr_priv, ifidx, &amp;toe_ol) &gt;= 0</div><div class='add'>+		if (brcmf_toe_get(drvr, ifp-&gt;idx, &amp;toe_ol) &gt;= 0</div><div class='ctx'> 		    &amp;&amp; (toe_ol &amp; TOE_TX_CSUM_OL) != 0)</div><div class='del'>-			drvr_priv-&gt;iflist[ifidx]-&gt;ndev-&gt;features |=</div><div class='add'>+			drvr-&gt;iflist[ifp-&gt;idx]-&gt;ndev-&gt;features |=</div><div class='ctx'> 				NETIF_F_IP_CSUM;</div><div class='ctx'> 		else</div><div class='del'>-			drvr_priv-&gt;iflist[ifidx]-&gt;ndev-&gt;features &amp;=</div><div class='add'>+			drvr-&gt;iflist[ifp-&gt;idx]-&gt;ndev-&gt;features &amp;=</div><div class='ctx'> 				~NETIF_F_IP_CSUM;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Allow transmit calls */</div><div class='ctx'> 	netif_start_queue(ndev);</div><div class='del'>-	drvr_priv-&gt;pub.up = 1;</div><div class='del'>-	if (brcmf_cfg80211_up(drvr_priv-&gt;pub.config)) {</div><div class='add'>+	drvr-&gt;bus_if-&gt;drvr_up = true;</div><div class='add'>+	if (brcmf_cfg80211_up(drvr-&gt;config)) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "failed to bring up cfg80211\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -893,193 +830,155 @@ static int brcmf_netdev_open(struct net_device *ndev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct net_device_ops brcmf_netdev_ops_pri = {</div><div class='add'>+	.ndo_open = brcmf_netdev_open,</div><div class='add'>+	.ndo_stop = brcmf_netdev_stop,</div><div class='add'>+	.ndo_get_stats = brcmf_netdev_get_stats,</div><div class='add'>+	.ndo_do_ioctl = brcmf_netdev_ioctl_entry,</div><div class='add'>+	.ndo_start_xmit = brcmf_netdev_start_xmit,</div><div class='add'>+	.ndo_set_mac_address = brcmf_netdev_set_mac_address,</div><div class='add'>+	.ndo_set_rx_mode = brcmf_netdev_set_multicast_list</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int</div><div class='del'>-brcmf_add_if(struct brcmf_info *drvr_priv, int ifidx, struct net_device *ndev,</div><div class='del'>-	     char *name, u8 *mac_addr, u32 flags, u8 bssidx)</div><div class='add'>+brcmf_add_if(struct device *dev, int ifidx, char *name, u8 *mac_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_if *ifp;</div><div class='del'>-	int ret = 0, err = 0;</div><div class='add'>+	struct net_device *ndev;</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='ctx'> </div><div class='del'>-	brcmf_dbg(TRACE, "idx %d, handle-&gt;%p\n", ifidx, ndev);</div><div class='add'>+	brcmf_dbg(TRACE, "idx %d\n", ifidx);</div><div class='ctx'> </div><div class='del'>-	ifp = drvr_priv-&gt;iflist[ifidx];</div><div class='del'>-	if (!ifp) {</div><div class='del'>-		ifp = kmalloc(sizeof(struct brcmf_if), GFP_ATOMIC);</div><div class='del'>-		if (!ifp)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+	ifp = drvr-&gt;iflist[ifidx];</div><div class='add'>+	/*</div><div class='add'>+	 * Delete the existing interface before overwriting it</div><div class='add'>+	 * in case we missed the BRCMF_E_IF_DEL event.</div><div class='add'>+	 */</div><div class='add'>+	if (ifp) {</div><div class='add'>+		brcmf_dbg(ERROR, "ERROR: netdev:%s already exists, try free &amp; unregister\n",</div><div class='add'>+			  ifp-&gt;ndev-&gt;name);</div><div class='add'>+		netif_stop_queue(ifp-&gt;ndev);</div><div class='add'>+		unregister_netdev(ifp-&gt;ndev);</div><div class='add'>+		free_netdev(ifp-&gt;ndev);</div><div class='add'>+		drvr-&gt;iflist[ifidx] = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(ifp, 0, sizeof(struct brcmf_if));</div><div class='del'>-	ifp-&gt;info = drvr_priv;</div><div class='del'>-	drvr_priv-&gt;iflist[ifidx] = ifp;</div><div class='add'>+	/* Allocate netdev, including space for private structure */</div><div class='add'>+	ndev = alloc_netdev(sizeof(struct brcmf_if), name, ether_setup);</div><div class='add'>+	if (!ndev) {</div><div class='add'>+		brcmf_dbg(ERROR, "OOM - alloc_netdev\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ifp = netdev_priv(ndev);</div><div class='add'>+	ifp-&gt;ndev = ndev;</div><div class='add'>+	ifp-&gt;drvr = drvr;</div><div class='add'>+	drvr-&gt;iflist[ifidx] = ifp;</div><div class='add'>+	ifp-&gt;idx = ifidx;</div><div class='ctx'> 	if (mac_addr != NULL)</div><div class='ctx'> 		memcpy(&amp;ifp-&gt;mac_addr, mac_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-	if (ndev == NULL) {</div><div class='del'>-		ifp-&gt;state = BRCMF_E_IF_ADD;</div><div class='del'>-		ifp-&gt;idx = ifidx;</div><div class='del'>-		/*</div><div class='del'>-		 * Delete the existing interface before overwriting it</div><div class='del'>-		 * in case we missed the BRCMF_E_IF_DEL event.</div><div class='del'>-		 */</div><div class='del'>-		if (ifp-&gt;ndev != NULL) {</div><div class='del'>-			brcmf_dbg(ERROR, "ERROR: netdev:%s already exists, try free &amp; unregister\n",</div><div class='del'>-				  ifp-&gt;ndev-&gt;name);</div><div class='del'>-			netif_stop_queue(ifp-&gt;ndev);</div><div class='del'>-			unregister_netdev(ifp-&gt;ndev);</div><div class='del'>-			free_netdev(ifp-&gt;ndev);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Allocate netdev, including space for private structure */</div><div class='del'>-		ifp-&gt;ndev = alloc_netdev(sizeof(drvr_priv), "wlan%d",</div><div class='del'>-					 ether_setup);</div><div class='del'>-		if (!ifp-&gt;ndev) {</div><div class='del'>-			brcmf_dbg(ERROR, "OOM - alloc_netdev\n");</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ret == 0) {</div><div class='del'>-			memcpy(netdev_priv(ifp-&gt;ndev), &amp;drvr_priv,</div><div class='del'>-			       sizeof(drvr_priv));</div><div class='del'>-			err = brcmf_net_attach(&amp;drvr_priv-&gt;pub, ifp-&gt;idx);</div><div class='del'>-			if (err != 0) {</div><div class='del'>-				brcmf_dbg(ERROR, "brcmf_net_attach failed, err %d\n",</div><div class='del'>-					  err);</div><div class='del'>-				ret = -EOPNOTSUPP;</div><div class='del'>-			} else {</div><div class='del'>-				brcmf_dbg(TRACE, " ==== pid:%x, net_device for if:%s created ===\n",</div><div class='del'>-					  current-&gt;pid, ifp-&gt;ndev-&gt;name);</div><div class='del'>-				ifp-&gt;state = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			if (ifp-&gt;ndev)</div><div class='del'>-				free_netdev(ifp-&gt;ndev);</div><div class='add'>+	if (brcmf_net_attach(drvr, ifp-&gt;idx)) {</div><div class='add'>+		brcmf_dbg(ERROR, "brcmf_net_attach failed");</div><div class='add'>+		free_netdev(ifp-&gt;ndev);</div><div class='add'>+		drvr-&gt;iflist[ifidx] = NULL;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			drvr_priv-&gt;iflist[ifp-&gt;idx] = NULL;</div><div class='del'>-			kfree(ifp);</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		ifp-&gt;ndev = ndev;</div><div class='add'>+	brcmf_dbg(TRACE, " ==== pid:%x, net_device for if:%s created ===\n",</div><div class='add'>+		  current-&gt;pid, ifp-&gt;ndev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void brcmf_del_if(struct brcmf_info *drvr_priv, int ifidx)</div><div class='add'>+void brcmf_del_if(struct brcmf_pub *drvr, int ifidx)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_if *ifp;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "idx %d\n", ifidx);</div><div class='ctx'> </div><div class='del'>-	ifp = drvr_priv-&gt;iflist[ifidx];</div><div class='add'>+	ifp = drvr-&gt;iflist[ifidx];</div><div class='ctx'> 	if (!ifp) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "Null interface\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+	if (ifp-&gt;ndev) {</div><div class='add'>+		if (ifidx == 0) {</div><div class='add'>+			if (ifp-&gt;ndev-&gt;netdev_ops == &amp;brcmf_netdev_ops_pri) {</div><div class='add'>+				rtnl_lock();</div><div class='add'>+				brcmf_netdev_stop(ifp-&gt;ndev);</div><div class='add'>+				rtnl_unlock();</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			netif_stop_queue(ifp-&gt;ndev);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	ifp-&gt;state = BRCMF_E_IF_DEL;</div><div class='del'>-	ifp-&gt;idx = ifidx;</div><div class='del'>-	if (ifp-&gt;ndev != NULL) {</div><div class='del'>-		netif_stop_queue(ifp-&gt;ndev);</div><div class='ctx'> 		unregister_netdev(ifp-&gt;ndev);</div><div class='add'>+		drvr-&gt;iflist[ifidx] = NULL;</div><div class='add'>+		if (ifidx == 0)</div><div class='add'>+			brcmf_cfg80211_detach(drvr-&gt;config);</div><div class='ctx'> 		free_netdev(ifp-&gt;ndev);</div><div class='del'>-		drvr_priv-&gt;iflist[ifidx] = NULL;</div><div class='del'>-		kfree(ifp);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen)</div><div class='add'>+int brcmf_attach(uint bus_hdrlen, struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_info *drvr_priv = NULL;</div><div class='del'>-	struct net_device *ndev;</div><div class='add'>+	struct brcmf_pub *drvr = NULL;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='del'>-	/* Allocate netdev, including space for private structure */</div><div class='del'>-	ndev = alloc_netdev(sizeof(drvr_priv), "wlan%d", ether_setup);</div><div class='del'>-	if (!ndev) {</div><div class='del'>-		brcmf_dbg(ERROR, "OOM - alloc_netdev\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Allocate primary brcmf_info */</div><div class='del'>-	drvr_priv = kzalloc(sizeof(struct brcmf_info), GFP_ATOMIC);</div><div class='del'>-	if (!drvr_priv)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Save the brcmf_info into the priv</div><div class='del'>-	 */</div><div class='del'>-	memcpy(netdev_priv(ndev), &amp;drvr_priv, sizeof(drvr_priv));</div><div class='del'>-</div><div class='del'>-	if (brcmf_add_if(drvr_priv, 0, ndev, ndev-&gt;name, NULL, 0, 0) ==</div><div class='del'>-	    BRCMF_BAD_IF)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	ndev-&gt;netdev_ops = NULL;</div><div class='del'>-	mutex_init(&amp;drvr_priv-&gt;proto_block);</div><div class='add'>+	drvr = kzalloc(sizeof(struct brcmf_pub), GFP_ATOMIC);</div><div class='add'>+	if (!drvr)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* Link to info module */</div><div class='del'>-	drvr_priv-&gt;pub.info = drvr_priv;</div><div class='add'>+	mutex_init(&amp;drvr-&gt;proto_block);</div><div class='ctx'> </div><div class='ctx'> 	/* Link to bus module */</div><div class='del'>-	drvr_priv-&gt;pub.bus = bus;</div><div class='del'>-	drvr_priv-&gt;pub.hdrlen = bus_hdrlen;</div><div class='add'>+	drvr-&gt;hdrlen = bus_hdrlen;</div><div class='add'>+	drvr-&gt;bus_if = dev_get_drvdata(dev);</div><div class='add'>+	drvr-&gt;bus_if-&gt;drvr = drvr;</div><div class='add'>+	drvr-&gt;dev = dev;</div><div class='ctx'> </div><div class='ctx'> 	/* Attach and link in the protocol */</div><div class='del'>-	if (brcmf_proto_attach(&amp;drvr_priv-&gt;pub) != 0) {</div><div class='add'>+	ret = brcmf_proto_attach(drvr);</div><div class='add'>+	if (ret != 0) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "brcmf_prot_attach failed\n");</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Attach and link in the cfg80211 */</div><div class='del'>-	drvr_priv-&gt;pub.config =</div><div class='del'>-			brcmf_cfg80211_attach(ndev,</div><div class='del'>-					      brcmf_bus_get_device(bus),</div><div class='del'>-					      &amp;drvr_priv-&gt;pub);</div><div class='del'>-	if (drvr_priv-&gt;pub.config == NULL) {</div><div class='del'>-		brcmf_dbg(ERROR, "wl_cfg80211_attach failed\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;drvr_priv-&gt;setmacaddr_work, _brcmf_set_mac_address);</div><div class='del'>-	INIT_WORK(&amp;drvr_priv-&gt;multicast_work, _brcmf_set_multicast_list);</div><div class='add'>+	INIT_WORK(&amp;drvr-&gt;setmacaddr_work, _brcmf_set_mac_address);</div><div class='add'>+	INIT_WORK(&amp;drvr-&gt;multicast_work, _brcmf_set_multicast_list);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Save the brcmf_info into the priv</div><div class='del'>-	 */</div><div class='del'>-	memcpy(netdev_priv(ndev), &amp;drvr_priv, sizeof(drvr_priv));</div><div class='del'>-</div><div class='del'>-	return &amp;drvr_priv-&gt;pub;</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='del'>-	if (ndev)</div><div class='del'>-		free_netdev(ndev);</div><div class='del'>-	if (drvr_priv)</div><div class='del'>-		brcmf_detach(&amp;drvr_priv-&gt;pub);</div><div class='add'>+	brcmf_detach(dev);</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int brcmf_bus_start(struct brcmf_pub *drvr)</div><div class='add'>+int brcmf_bus_start(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -1;</div><div class='del'>-	struct brcmf_info *drvr_priv = drvr-&gt;info;</div><div class='ctx'> 	/* Room for "event_msgs" + '\0' + bitvec */</div><div class='ctx'> 	char iovbuf[BRCMF_EVENTING_MASK_LEN + 12];</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='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Bring up the bus */</div><div class='del'>-	ret = brcmf_sdbrcm_bus_init(&amp;drvr_priv-&gt;pub);</div><div class='add'>+	ret = bus_if-&gt;brcmf_bus_init(dev);</div><div class='ctx'> 	if (ret != 0) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "brcmf_sdbrcm_bus_init failed %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If bus is not ready, can't come up */</div><div class='del'>-	if (drvr_priv-&gt;pub.busstate != BRCMF_BUS_DATA) {</div><div class='add'>+	if (bus_if-&gt;state != BRCMF_BUS_DATA) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "failed bus is not ready\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1116,33 +1015,22 @@ int brcmf_bus_start(struct brcmf_pub *drvr)</div><div class='ctx'> 	drvr-&gt;pktfilter[0] = "100 0 0 0 0x01 0x00";</div><div class='ctx'> </div><div class='ctx'> 	/* Bus is ready, do any protocol initialization */</div><div class='del'>-	ret = brcmf_proto_init(&amp;drvr_priv-&gt;pub);</div><div class='add'>+	ret = brcmf_proto_init(drvr);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct net_device_ops brcmf_netdev_ops_pri = {</div><div class='del'>-	.ndo_open = brcmf_netdev_open,</div><div class='del'>-	.ndo_stop = brcmf_netdev_stop,</div><div class='del'>-	.ndo_get_stats = brcmf_netdev_get_stats,</div><div class='del'>-	.ndo_do_ioctl = brcmf_netdev_ioctl_entry,</div><div class='del'>-	.ndo_start_xmit = brcmf_netdev_start_xmit,</div><div class='del'>-	.ndo_set_mac_address = brcmf_netdev_set_mac_address,</div><div class='del'>-	.ndo_set_rx_mode = brcmf_netdev_set_multicast_list</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> int brcmf_net_attach(struct brcmf_pub *drvr, int ifidx)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_info *drvr_priv = drvr-&gt;info;</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> 	u8 temp_addr[ETH_ALEN] = {</div><div class='ctx'> 		0x00, 0x90, 0x4c, 0x11, 0x22, 0x33};</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "ifidx %d\n", ifidx);</div><div class='ctx'> </div><div class='del'>-	ndev = drvr_priv-&gt;iflist[ifidx]-&gt;ndev;</div><div class='add'>+	ndev = drvr-&gt;iflist[ifidx]-&gt;ndev;</div><div class='ctx'> 	ndev-&gt;netdev_ops = &amp;brcmf_netdev_ops_pri;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1150,7 +1038,7 @@ int brcmf_net_attach(struct brcmf_pub *drvr, int ifidx)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ifidx != 0) {</div><div class='ctx'> 		/* for virtual interfaces use the primary MAC  */</div><div class='del'>-		memcpy(temp_addr, drvr_priv-&gt;pub.mac, ETH_ALEN);</div><div class='add'>+		memcpy(temp_addr, drvr-&gt;mac, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1161,14 +1049,23 @@ int brcmf_net_attach(struct brcmf_pub *drvr, int ifidx)</div><div class='ctx'> 			 - Locally Administered address  */</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='del'>-	ndev-&gt;hard_header_len = ETH_HLEN + drvr_priv-&gt;pub.hdrlen;</div><div class='add'>+	ndev-&gt;hard_header_len = ETH_HLEN + drvr-&gt;hdrlen;</div><div class='ctx'> 	ndev-&gt;ethtool_ops = &amp;brcmf_ethtool_ops;</div><div class='ctx'> </div><div class='del'>-	drvr_priv-&gt;pub.rxsz = ndev-&gt;mtu + ndev-&gt;hard_header_len +</div><div class='del'>-			      drvr_priv-&gt;pub.hdrlen;</div><div class='add'>+	drvr-&gt;rxsz = ndev-&gt;mtu + ndev-&gt;hard_header_len +</div><div class='add'>+			      drvr-&gt;hdrlen;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(ndev-&gt;dev_addr, temp_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='add'>+	/* attach to cfg80211 for primary interface */</div><div class='add'>+	if (!ifidx) {</div><div class='add'>+		drvr-&gt;config = brcmf_cfg80211_attach(ndev, drvr-&gt;dev, drvr);</div><div class='add'>+		if (drvr-&gt;config == NULL) {</div><div class='add'>+			brcmf_dbg(ERROR, "wl_cfg80211_attach failed\n");</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (register_netdev(ndev) != 0) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "couldn't register the net device\n");</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -1185,127 +1082,57 @@ fail:</div><div class='ctx'> </div><div class='ctx'> static void brcmf_bus_detach(struct brcmf_pub *drvr)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_info *drvr_priv;</div><div class='del'>-</div><div class='del'>-	brcmf_dbg(TRACE, "Enter\n");</div><div class='del'>-</div><div class='del'>-	if (drvr) {</div><div class='del'>-		drvr_priv = drvr-&gt;info;</div><div class='del'>-		if (drvr_priv) {</div><div class='del'>-			/* Stop the protocol module */</div><div class='del'>-			brcmf_proto_stop(&amp;drvr_priv-&gt;pub);</div><div class='del'>-</div><div class='del'>-			/* Stop the bus module */</div><div class='del'>-			brcmf_sdbrcm_bus_stop(drvr_priv-&gt;pub.bus);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void brcmf_detach(struct brcmf_pub *drvr)</div><div class='del'>-{</div><div class='del'>-	struct brcmf_info *drvr_priv;</div><div class='del'>-</div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='ctx'> 	if (drvr) {</div><div class='del'>-		drvr_priv = drvr-&gt;info;</div><div class='del'>-		if (drvr_priv) {</div><div class='del'>-			struct brcmf_if *ifp;</div><div class='del'>-			int i;</div><div class='del'>-</div><div class='del'>-			for (i = 1; i &lt; BRCMF_MAX_IFS; i++)</div><div class='del'>-				if (drvr_priv-&gt;iflist[i])</div><div class='del'>-					brcmf_del_if(drvr_priv, i);</div><div class='del'>-</div><div class='del'>-			ifp = drvr_priv-&gt;iflist[0];</div><div class='del'>-			if (ifp-&gt;ndev-&gt;netdev_ops == &amp;brcmf_netdev_ops_pri) {</div><div class='del'>-				rtnl_lock();</div><div class='del'>-				brcmf_netdev_stop(ifp-&gt;ndev);</div><div class='del'>-				rtnl_unlock();</div><div class='del'>-				unregister_netdev(ifp-&gt;ndev);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			cancel_work_sync(&amp;drvr_priv-&gt;setmacaddr_work);</div><div class='del'>-			cancel_work_sync(&amp;drvr_priv-&gt;multicast_work);</div><div class='del'>-</div><div class='del'>-			brcmf_bus_detach(drvr);</div><div class='del'>-</div><div class='del'>-			if (drvr-&gt;prot)</div><div class='del'>-				brcmf_proto_detach(drvr);</div><div class='del'>-</div><div class='del'>-			brcmf_cfg80211_detach(drvr-&gt;config);</div><div class='add'>+		/* Stop the protocol module */</div><div class='add'>+		brcmf_proto_stop(drvr);</div><div class='ctx'> </div><div class='del'>-			free_netdev(ifp-&gt;ndev);</div><div class='del'>-			kfree(ifp);</div><div class='del'>-			kfree(drvr_priv);</div><div class='del'>-		}</div><div class='add'>+		/* Stop the bus module */</div><div class='add'>+		drvr-&gt;bus_if-&gt;brcmf_bus_stop(drvr-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit brcmf_module_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	brcmf_dbg(TRACE, "Enter\n");</div><div class='del'>-</div><div class='del'>-	brcmf_bus_unregister();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init brcmf_module_init(void)</div><div class='add'>+void brcmf_detach(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	int error;</div><div class='add'>+	int i;</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='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='del'>-	error = brcmf_bus_register();</div><div class='del'>-</div><div class='del'>-	if (error) {</div><div class='del'>-		brcmf_dbg(ERROR, "brcmf_bus_register failed\n");</div><div class='del'>-		goto failed;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-failed:</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-module_init(brcmf_module_init);</div><div class='del'>-module_exit(brcmf_module_cleanup);</div><div class='add'>+	/* make sure primary interface removed last */</div><div class='add'>+	for (i = BRCMF_MAX_IFS-1; i &gt; -1; i--)</div><div class='add'>+		if (drvr-&gt;iflist[i])</div><div class='add'>+			brcmf_del_if(drvr, i);</div><div class='ctx'> </div><div class='del'>-int brcmf_os_proto_block(struct brcmf_pub *drvr)</div><div class='del'>-{</div><div class='del'>-	struct brcmf_info *drvr_priv = drvr-&gt;info;</div><div class='del'>-</div><div class='del'>-	if (drvr_priv) {</div><div class='del'>-		mutex_lock(&amp;drvr_priv-&gt;proto_block);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	cancel_work_sync(&amp;drvr-&gt;setmacaddr_work);</div><div class='add'>+	cancel_work_sync(&amp;drvr-&gt;multicast_work);</div><div class='ctx'> </div><div class='del'>-int brcmf_os_proto_unblock(struct brcmf_pub *drvr)</div><div class='del'>-{</div><div class='del'>-	struct brcmf_info *drvr_priv = drvr-&gt;info;</div><div class='add'>+	brcmf_bus_detach(drvr);</div><div class='ctx'> </div><div class='del'>-	if (drvr_priv) {</div><div class='del'>-		mutex_unlock(&amp;drvr_priv-&gt;proto_block);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='add'>+	if (drvr-&gt;prot)</div><div class='add'>+		brcmf_proto_detach(drvr);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	bus_if-&gt;drvr = NULL;</div><div class='add'>+	kfree(drvr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int brcmf_get_pend_8021x_cnt(struct brcmf_info *drvr_priv)</div><div class='add'>+static int brcmf_get_pend_8021x_cnt(struct brcmf_pub *drvr)</div><div class='ctx'> {</div><div class='del'>-	return atomic_read(&amp;drvr_priv-&gt;pend_8021x_cnt);</div><div class='add'>+	return atomic_read(&amp;drvr-&gt;pend_8021x_cnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define MAX_WAIT_FOR_8021X_TX	10</div><div class='ctx'> </div><div class='ctx'> int brcmf_netdev_wait_pend8021x(struct net_device *ndev)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_info *drvr_priv = *(struct brcmf_info **)netdev_priv(ndev);</div><div class='add'>+	struct brcmf_if *ifp = netdev_priv(ndev);</div><div class='add'>+	struct brcmf_pub *drvr = ifp-&gt;drvr;</div><div class='ctx'> 	int timeout = 10 * HZ / 1000;</div><div class='ctx'> 	int ntimes = MAX_WAIT_FOR_8021X_TX;</div><div class='del'>-	int pend = brcmf_get_pend_8021x_cnt(drvr_priv);</div><div class='add'>+	int pend = brcmf_get_pend_8021x_cnt(drvr);</div><div class='ctx'> </div><div class='ctx'> 	while (ntimes &amp;&amp; pend) {</div><div class='ctx'> 		if (pend) {</div><div class='hunk'>@@ -1314,7 +1141,7 @@ int brcmf_netdev_wait_pend8021x(struct net_device *ndev)</div><div class='ctx'> 			set_current_state(TASK_RUNNING);</div><div class='ctx'> 			ntimes--;</div><div class='ctx'> 		}</div><div class='del'>-		pend = brcmf_get_pend_8021x_cnt(drvr_priv);</div><div class='add'>+		pend = brcmf_get_pend_8021x_cnt(drvr);</div><div class='ctx'> 	}</div><div class='ctx'> 	return pend;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h<br/>index 4ee1ea846f6d..6bc4425a8b0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h</a></div><div class='hunk'>@@ -41,17 +41,10 @@ extern void brcmf_proto_stop(struct brcmf_pub *drvr);</div><div class='ctx'> extern void brcmf_proto_hdrpush(struct brcmf_pub *, int ifidx,</div><div class='ctx'> 				struct sk_buff *txp);</div><div class='ctx'> </div><div class='del'>-/* Remove any protocol-specific data header. */</div><div class='del'>-extern int brcmf_proto_hdrpull(struct brcmf_pub *, int *ifidx,</div><div class='del'>-			       struct sk_buff *rxp);</div><div class='del'>-</div><div class='ctx'> /* Use protocol to issue command to dongle */</div><div class='ctx'> extern int brcmf_proto_dcmd(struct brcmf_pub *drvr, int ifidx,</div><div class='ctx'> 				struct brcmf_dcmd *dcmd, int len);</div><div class='ctx'> </div><div class='del'>-/* Update local copy of dongle statistics */</div><div class='del'>-extern void brcmf_proto_dstats(struct brcmf_pub *drvr);</div><div class='del'>-</div><div class='ctx'> extern int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr);</div><div class='ctx'> </div><div class='ctx'> extern int brcmf_proto_cdc_set_dcmd(struct brcmf_pub *drvr, int ifidx,</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c<br/>index 313b8bf592d1..f7eeee1dcdb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;linux/semaphore.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/bcma/bcma.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include &lt;defs.h&gt;</div><div class='ctx'> #include &lt;brcmu_wifi.h&gt;</div><div class='hunk'>@@ -35,6 +36,7 @@</div><div class='ctx'> #include &lt;brcm_hw_ids.h&gt;</div><div class='ctx'> #include &lt;soc.h&gt;</div><div class='ctx'> #include "sdio_host.h"</div><div class='add'>+#include "sdio_chip.h"</div><div class='ctx'> </div><div class='ctx'> #define DCMD_RESP_TIMEOUT  2000	/* In milli second */</div><div class='ctx'> </div><div class='hunk'>@@ -85,11 +87,8 @@ struct rte_console {</div><div class='ctx'> #endif				/* BCMDBG */</div><div class='ctx'> #include &lt;chipcommon.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "dhd.h"</div><div class='ctx'> #include "dhd_bus.h"</div><div class='del'>-#include "dhd_proto.h"</div><div class='ctx'> #include "dhd_dbg.h"</div><div class='del'>-#include &lt;bcmchip.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define TXQLEN		2048	/* bulk tx queue length */</div><div class='ctx'> #define TXHI		(TXQLEN - 256)	/* turn on flow control above TXHI */</div><div class='hunk'>@@ -134,33 +133,6 @@ struct rte_console {</div><div class='ctx'> /*   Force no backplane reset */</div><div class='ctx'> #define SBSDIO_DEVCTL_RST_NOBPRESET	0x20</div><div class='ctx'> </div><div class='del'>-/* SBSDIO_FUNC1_CHIPCLKCSR */</div><div class='del'>-</div><div class='del'>-/* Force ALP request to backplane */</div><div class='del'>-#define SBSDIO_FORCE_ALP		0x01</div><div class='del'>-/* Force HT request to backplane */</div><div class='del'>-#define SBSDIO_FORCE_HT			0x02</div><div class='del'>-/* Force ILP request to backplane */</div><div class='del'>-#define SBSDIO_FORCE_ILP		0x04</div><div class='del'>-/* Make ALP ready (power up xtal) */</div><div class='del'>-#define SBSDIO_ALP_AVAIL_REQ		0x08</div><div class='del'>-/* Make HT ready (power up PLL) */</div><div class='del'>-#define SBSDIO_HT_AVAIL_REQ		0x10</div><div class='del'>-/* Squelch clock requests from HW */</div><div class='del'>-#define SBSDIO_FORCE_HW_CLKREQ_OFF	0x20</div><div class='del'>-/* Status: ALP is ready */</div><div class='del'>-#define SBSDIO_ALP_AVAIL		0x40</div><div class='del'>-/* Status: HT is ready */</div><div class='del'>-#define SBSDIO_HT_AVAIL			0x80</div><div class='del'>-</div><div class='del'>-#define SBSDIO_AVBITS		(SBSDIO_HT_AVAIL | SBSDIO_ALP_AVAIL)</div><div class='del'>-#define SBSDIO_ALPAV(regval)	((regval) &amp; SBSDIO_AVBITS)</div><div class='del'>-#define SBSDIO_HTAV(regval)	(((regval) &amp; SBSDIO_AVBITS) == SBSDIO_AVBITS)</div><div class='del'>-#define SBSDIO_ALPONLY(regval)	(SBSDIO_ALPAV(regval) &amp;&amp; !SBSDIO_HTAV(regval))</div><div class='del'>-</div><div class='del'>-#define SBSDIO_CLKAV(regval, alponly) \</div><div class='del'>-	(SBSDIO_ALPAV(regval) &amp;&amp; (alponly ? 1 : SBSDIO_HTAV(regval)))</div><div class='del'>-</div><div class='ctx'> /* direct(mapped) cis space */</div><div class='ctx'> </div><div class='ctx'> /* MAPPED common CIS address */</div><div class='hunk'>@@ -335,49 +307,16 @@ struct rte_console {</div><div class='ctx'> /* Flags for SDH calls */</div><div class='ctx'> #define F2SYNC	(SDIO_REQ_4BYTE | SDIO_REQ_FIXED)</div><div class='ctx'> </div><div class='del'>-/* sbimstate */</div><div class='del'>-#define	SBIM_IBE		0x20000	/* inbanderror */</div><div class='del'>-#define	SBIM_TO			0x40000	/* timeout */</div><div class='del'>-#define	SBIM_BY			0x01800000	/* busy (sonics &gt;= 2.3) */</div><div class='del'>-#define	SBIM_RJ			0x02000000	/* reject (sonics &gt;= 2.3) */</div><div class='del'>-</div><div class='del'>-/* sbtmstatelow */</div><div class='del'>-</div><div class='del'>-/* reset */</div><div class='del'>-#define	SBTML_RESET		0x0001</div><div class='del'>-/* reject field */</div><div class='del'>-#define	SBTML_REJ_MASK		0x0006</div><div class='del'>-/* reject */</div><div class='del'>-#define	SBTML_REJ		0x0002</div><div class='del'>-/* temporary reject, for error recovery */</div><div class='del'>-#define	SBTML_TMPREJ		0x0004</div><div class='del'>-</div><div class='del'>-/* Shift to locate the SI control flags in sbtml */</div><div class='del'>-#define	SBTML_SICF_SHIFT	16</div><div class='del'>-</div><div class='del'>-/* sbtmstatehigh */</div><div class='del'>-#define	SBTMH_SERR		0x0001	/* serror */</div><div class='del'>-#define	SBTMH_INT		0x0002	/* interrupt */</div><div class='del'>-#define	SBTMH_BUSY		0x0004	/* busy */</div><div class='del'>-#define	SBTMH_TO		0x0020	/* timeout (sonics &gt;= 2.3) */</div><div class='del'>-</div><div class='del'>-/* Shift to locate the SI status flags in sbtmh */</div><div class='del'>-#define	SBTMH_SISF_SHIFT	16</div><div class='del'>-</div><div class='del'>-/* sbidlow */</div><div class='del'>-#define	SBIDL_INIT		0x80	/* initiator */</div><div class='del'>-</div><div class='del'>-/* sbidhigh */</div><div class='del'>-#define	SBIDH_RC_MASK		0x000f	/* revision code */</div><div class='del'>-#define	SBIDH_RCE_MASK		0x7000	/* revision code extension field */</div><div class='del'>-#define	SBIDH_RCE_SHIFT		8</div><div class='del'>-#define	SBCOREREV(sbidh) \</div><div class='del'>-	((((sbidh) &amp; SBIDH_RCE_MASK) &gt;&gt; SBIDH_RCE_SHIFT) | \</div><div class='del'>-	  ((sbidh) &amp; SBIDH_RC_MASK))</div><div class='del'>-#define	SBIDH_CC_MASK		0x8ff0	/* core code */</div><div class='del'>-#define	SBIDH_CC_SHIFT		4</div><div class='del'>-#define	SBIDH_VC_MASK		0xffff0000	/* vendor code */</div><div class='del'>-#define	SBIDH_VC_SHIFT		16</div><div class='add'>+#define BRCMFMAC_FW_NAME	"brcm/brcmfmac.bin"</div><div class='add'>+#define BRCMFMAC_NV_NAME	"brcm/brcmfmac.txt"</div><div class='add'>+MODULE_FIRMWARE(BRCMFMAC_FW_NAME);</div><div class='add'>+MODULE_FIRMWARE(BRCMFMAC_NV_NAME);</div><div class='add'>+</div><div class='add'>+#define BRCMF_IDLE_IMMEDIATE	(-1)	/* Enter idle immediately */</div><div class='add'>+#define BRCMF_IDLE_ACTIVE	0	/* Do not request any SD clock change</div><div class='add'>+					 * when idle</div><div class='add'>+					 */</div><div class='add'>+#define BRCMF_IDLE_INTERVAL	1</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Conversion of 802.1D priority to precedence level</div><div class='hunk'>@@ -388,17 +327,6 @@ static uint prio2prec(u32 prio)</div><div class='ctx'> 	       (prio^2) : prio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Core reg address translation.</div><div class='del'>- * Both macro's returns a 32 bits byte address on the backplane bus.</div><div class='del'>- */</div><div class='del'>-#define CORE_CC_REG(base, field) \</div><div class='del'>-		(base + offsetof(struct chipcregs, field))</div><div class='del'>-#define CORE_BUS_REG(base, field) \</div><div class='del'>-		(base + offsetof(struct sdpcmd_regs, field))</div><div class='del'>-#define CORE_SB(base, field) \</div><div class='del'>-		(base + SBCONFIGOFF + offsetof(struct sbconfig, field))</div><div class='del'>-</div><div class='ctx'> /* core registers */</div><div class='ctx'> struct sdpcmd_regs {</div><div class='ctx'> 	u32 corecontrol;		/* 0x00, rev8 */</div><div class='hunk'>@@ -524,25 +452,8 @@ struct sdpcm_shared_le {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* misc chip info needed by some of the routines */</div><div class='del'>-struct chip_info {</div><div class='del'>-	u32 chip;</div><div class='del'>-	u32 chiprev;</div><div class='del'>-	u32 cccorebase;</div><div class='del'>-	u32 ccrev;</div><div class='del'>-	u32 cccaps;</div><div class='del'>-	u32 buscorebase; /* 32 bits backplane bus address */</div><div class='del'>-	u32 buscorerev;</div><div class='del'>-	u32 buscoretype;</div><div class='del'>-	u32 ramcorebase;</div><div class='del'>-	u32 armcorebase;</div><div class='del'>-	u32 pmurev;</div><div class='del'>-	u32 ramsize;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Private data for SDIO bus interaction */</div><div class='del'>-struct brcmf_bus {</div><div class='del'>-	struct brcmf_pub *drvr;</div><div class='del'>-</div><div class='add'>+struct brcmf_sdio {</div><div class='ctx'> 	struct brcmf_sdio_dev *sdiodev;	/* sdio device handler */</div><div class='ctx'> 	struct chip_info *ci;	/* Chip info struct */</div><div class='ctx'> 	char *vars;		/* Variables (from CIS and/or other) */</div><div class='hunk'>@@ -574,7 +485,7 @@ struct brcmf_bus {</div><div class='ctx'> 	uint txminmax;</div><div class='ctx'> </div><div class='ctx'> 	struct sk_buff *glomd;	/* Packet containing glomming descriptor */</div><div class='del'>-	struct sk_buff *glom;	/* Packet chain for glommed superframe */</div><div class='add'>+	struct sk_buff_head glom; /* Packet list for glommed superframe */</div><div class='ctx'> 	uint glomerr;		/* Glom packet read errors */</div><div class='ctx'> </div><div class='ctx'> 	u8 *rxbuf;		/* Buffer for receiving control packets */</div><div class='hunk'>@@ -637,6 +548,13 @@ struct brcmf_bus {</div><div class='ctx'> 	uint f2rxdata;		/* Number of frame data reads */</div><div class='ctx'> 	uint f2txdata;		/* Number of f2 frame writes */</div><div class='ctx'> 	uint f1regdata;		/* Number of f1 register accesses */</div><div class='add'>+	uint tickcnt;		/* Number of watchdog been schedule */</div><div class='add'>+	unsigned long tx_ctlerrs;	/* Err of sending ctrl frames */</div><div class='add'>+	unsigned long tx_ctlpkts;	/* Ctrl frames sent to dongle */</div><div class='add'>+	unsigned long rx_ctlerrs;	/* Err of processing rx ctrl frames */</div><div class='add'>+	unsigned long rx_ctlpkts;	/* Ctrl frames processed from dongle */</div><div class='add'>+	unsigned long rx_readahead_cnt;	/* Number of packets where header</div><div class='add'>+					 * read-ahead was used. */</div><div class='ctx'> </div><div class='ctx'> 	u8 *ctrl_frame_buf;</div><div class='ctx'> 	u32 ctrl_frame_len;</div><div class='hunk'>@@ -657,50 +575,10 @@ struct brcmf_bus {</div><div class='ctx'> </div><div class='ctx'> 	struct semaphore sdsem;</div><div class='ctx'> </div><div class='del'>-	const char *fw_name;</div><div class='ctx'> 	const struct firmware *firmware;</div><div class='del'>-	const char *nv_name;</div><div class='ctx'> 	u32 fw_ptr;</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-struct sbconfig {</div><div class='del'>-	u32 PAD[2];</div><div class='del'>-	u32 sbipsflag;	/* initiator port ocp slave flag */</div><div class='del'>-	u32 PAD[3];</div><div class='del'>-	u32 sbtpsflag;	/* target port ocp slave flag */</div><div class='del'>-	u32 PAD[11];</div><div class='del'>-	u32 sbtmerrloga;	/* (sonics &gt;= 2.3) */</div><div class='del'>-	u32 PAD;</div><div class='del'>-	u32 sbtmerrlog;	/* (sonics &gt;= 2.3) */</div><div class='del'>-	u32 PAD[3];</div><div class='del'>-	u32 sbadmatch3;	/* address match3 */</div><div class='del'>-	u32 PAD;</div><div class='del'>-	u32 sbadmatch2;	/* address match2 */</div><div class='del'>-	u32 PAD;</div><div class='del'>-	u32 sbadmatch1;	/* address match1 */</div><div class='del'>-	u32 PAD[7];</div><div class='del'>-	u32 sbimstate;	/* initiator agent state */</div><div class='del'>-	u32 sbintvec;	/* interrupt mask */</div><div class='del'>-	u32 sbtmstatelow;	/* target state */</div><div class='del'>-	u32 sbtmstatehigh;	/* target state */</div><div class='del'>-	u32 sbbwa0;		/* bandwidth allocation table0 */</div><div class='del'>-	u32 PAD;</div><div class='del'>-	u32 sbimconfiglow;	/* initiator configuration */</div><div class='del'>-	u32 sbimconfighigh;	/* initiator configuration */</div><div class='del'>-	u32 sbadmatch0;	/* address match0 */</div><div class='del'>-	u32 PAD;</div><div class='del'>-	u32 sbtmconfiglow;	/* target configuration */</div><div class='del'>-	u32 sbtmconfighigh;	/* target configuration */</div><div class='del'>-	u32 sbbconfig;	/* broadcast configuration */</div><div class='del'>-	u32 PAD;</div><div class='del'>-	u32 sbbstate;	/* broadcast state */</div><div class='del'>-	u32 PAD[3];</div><div class='del'>-	u32 sbactcnfg;	/* activate configuration */</div><div class='del'>-	u32 PAD[3];</div><div class='del'>-	u32 sbflagst;	/* current sbflags */</div><div class='del'>-	u32 PAD[3];</div><div class='del'>-	u32 sbidlow;		/* identification */</div><div class='del'>-	u32 sbidhigh;	/* identification */</div><div class='add'>+	bool txoff;		/* Transmit flow-controlled */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* clkstate */</div><div class='hunk'>@@ -737,7 +615,7 @@ static void pkt_align(struct sk_buff *p, int len, int align)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* To check if there's window offered */</div><div class='del'>-static bool data_ok(struct brcmf_bus *bus)</div><div class='add'>+static bool data_ok(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	return (u8)(bus-&gt;tx_max - bus-&gt;tx_seq) != 0 &amp;&amp;</div><div class='ctx'> 	       ((u8)(bus-&gt;tx_max - bus-&gt;tx_seq) &amp; 0x80) == 0;</div><div class='hunk'>@@ -748,12 +626,14 @@ static bool data_ok(struct brcmf_bus *bus)</div><div class='ctx'>  * adresses on the 32 bit backplane bus.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-r_sdreg32(struct brcmf_bus *bus, u32 *regvar, u32 reg_offset, u32 *retryvar)</div><div class='add'>+r_sdreg32(struct brcmf_sdio *bus, u32 *regvar, u32 reg_offset, u32 *retryvar)</div><div class='ctx'> {</div><div class='add'>+	u8 idx = brcmf_sdio_chip_getinfidx(bus-&gt;ci, BCMA_CORE_SDIO_DEV);</div><div class='ctx'> 	*retryvar = 0;</div><div class='ctx'> 	do {</div><div class='ctx'> 		*regvar = brcmf_sdcard_reg_read(bus-&gt;sdiodev,</div><div class='del'>-				bus-&gt;ci-&gt;buscorebase + reg_offset, sizeof(u32));</div><div class='add'>+				bus-&gt;ci-&gt;c_inf[idx].base + reg_offset,</div><div class='add'>+				sizeof(u32));</div><div class='ctx'> 	} while (brcmf_sdcard_regfail(bus-&gt;sdiodev) &amp;&amp;</div><div class='ctx'> 		 (++(*retryvar) &lt;= retry_limit));</div><div class='ctx'> 	if (*retryvar) {</div><div class='hunk'>@@ -766,12 +646,13 @@ r_sdreg32(struct brcmf_bus *bus, u32 *regvar, u32 reg_offset, u32 *retryvar)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-w_sdreg32(struct brcmf_bus *bus, u32 regval, u32 reg_offset, u32 *retryvar)</div><div class='add'>+w_sdreg32(struct brcmf_sdio *bus, u32 regval, u32 reg_offset, u32 *retryvar)</div><div class='ctx'> {</div><div class='add'>+	u8 idx = brcmf_sdio_chip_getinfidx(bus-&gt;ci, BCMA_CORE_SDIO_DEV);</div><div class='ctx'> 	*retryvar = 0;</div><div class='ctx'> 	do {</div><div class='ctx'> 		brcmf_sdcard_reg_write(bus-&gt;sdiodev,</div><div class='del'>-				       bus-&gt;ci-&gt;buscorebase + reg_offset,</div><div class='add'>+				       bus-&gt;ci-&gt;c_inf[idx].base + reg_offset,</div><div class='ctx'> 				       sizeof(u32), regval);</div><div class='ctx'> 	} while (brcmf_sdcard_regfail(bus-&gt;sdiodev) &amp;&amp;</div><div class='ctx'> 		 (++(*retryvar) &lt;= retry_limit));</div><div class='hunk'>@@ -790,14 +671,14 @@ w_sdreg32(struct brcmf_bus *bus, u32 regval, u32 reg_offset, u32 *retryvar)</div><div class='ctx'> /* Packet free applicable unconditionally for sdio and sdspi.</div><div class='ctx'>  * Conditional if bufpool was present for gspi bus.</div><div class='ctx'>  */</div><div class='del'>-static void brcmf_sdbrcm_pktfree2(struct brcmf_bus *bus, struct sk_buff *pkt)</div><div class='add'>+static void brcmf_sdbrcm_pktfree2(struct brcmf_sdio *bus, struct sk_buff *pkt)</div><div class='ctx'> {</div><div class='ctx'> 	if (bus-&gt;usebufpool)</div><div class='ctx'> 		brcmu_pkt_buf_free_skb(pkt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Turn backplane clock on or off */</div><div class='del'>-static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok)</div><div class='add'>+static int brcmf_sdbrcm_htclk(struct brcmf_sdio *bus, bool on, bool pendok)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u8 clkctl, clkreq, devctl;</div><div class='hunk'>@@ -812,10 +693,6 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok)</div><div class='ctx'> 		clkreq =</div><div class='ctx'> 		    bus-&gt;alp_only ? SBSDIO_ALP_AVAIL_REQ : SBSDIO_HT_AVAIL_REQ;</div><div class='ctx'> </div><div class='del'>-		if ((bus-&gt;ci-&gt;chip == BCM4329_CHIP_ID)</div><div class='del'>-		    &amp;&amp; (bus-&gt;ci-&gt;chiprev == 0))</div><div class='del'>-			clkreq |= SBSDIO_FORCE_ALP;</div><div class='del'>-</div><div class='ctx'> 		brcmf_sdcard_cfg_write(bus-&gt;sdiodev, SDIO_FUNC_1,</div><div class='ctx'> 				       SBSDIO_FUNC1_CHIPCLKCSR, clkreq, &amp;err);</div><div class='ctx'> 		if (err) {</div><div class='hunk'>@@ -823,14 +700,6 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok)</div><div class='ctx'> 			return -EBADE;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (pendok &amp;&amp; ((bus-&gt;ci-&gt;buscoretype == PCMCIA_CORE_ID)</div><div class='del'>-			       &amp;&amp; (bus-&gt;ci-&gt;buscorerev == 9))) {</div><div class='del'>-			u32 dummy, retries;</div><div class='del'>-			r_sdreg32(bus, &amp;dummy,</div><div class='del'>-				  offsetof(struct sdpcmd_regs, clockctlstatus),</div><div class='del'>-				  &amp;retries);</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/* Check current status */</div><div class='ctx'> 		clkctl = brcmf_sdcard_cfg_read(bus-&gt;sdiodev, SDIO_FUNC_1,</div><div class='ctx'> 					       SBSDIO_FUNC1_CHIPCLKCSR, &amp;err);</div><div class='hunk'>@@ -930,7 +799,7 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Change idle/active SD state */</div><div class='del'>-static int brcmf_sdbrcm_sdclk(struct brcmf_bus *bus, bool on)</div><div class='add'>+static int brcmf_sdbrcm_sdclk(struct brcmf_sdio *bus, bool on)</div><div class='ctx'> {</div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='hunk'>@@ -943,7 +812,7 @@ static int brcmf_sdbrcm_sdclk(struct brcmf_bus *bus, bool on)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Transition SD and backplane clock readiness */</div><div class='del'>-static int brcmf_sdbrcm_clkctl(struct brcmf_bus *bus, uint target, bool pendok)</div><div class='add'>+static int brcmf_sdbrcm_clkctl(struct brcmf_sdio *bus, uint target, bool pendok)</div><div class='ctx'> {</div><div class='ctx'> #ifdef BCMDBG</div><div class='ctx'> 	uint oldstate = bus-&gt;clkstate;</div><div class='hunk'>@@ -999,7 +868,7 @@ static int brcmf_sdbrcm_clkctl(struct brcmf_bus *bus, uint target, bool pendok)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int brcmf_sdbrcm_bussleep(struct brcmf_bus *bus, bool sleep)</div><div class='add'>+static int brcmf_sdbrcm_bussleep(struct brcmf_sdio *bus, bool sleep)</div><div class='ctx'> {</div><div class='ctx'> 	uint retries = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1034,11 +903,9 @@ static int brcmf_sdbrcm_bussleep(struct brcmf_bus *bus, bool sleep)</div><div class='ctx'> 			SBSDIO_FORCE_HW_CLKREQ_OFF, NULL);</div><div class='ctx'> </div><div class='ctx'> 		/* Isolate the bus */</div><div class='del'>-		if (bus-&gt;ci-&gt;chip != BCM4329_CHIP_ID) {</div><div class='del'>-			brcmf_sdcard_cfg_write(bus-&gt;sdiodev, SDIO_FUNC_1,</div><div class='del'>-				SBSDIO_DEVICE_CTL,</div><div class='del'>-				SBSDIO_DEVCTL_PADS_ISO, NULL);</div><div class='del'>-		}</div><div class='add'>+		brcmf_sdcard_cfg_write(bus-&gt;sdiodev, SDIO_FUNC_1,</div><div class='add'>+			SBSDIO_DEVICE_CTL,</div><div class='add'>+			SBSDIO_DEVCTL_PADS_ISO, NULL);</div><div class='ctx'> </div><div class='ctx'> 		/* Change state */</div><div class='ctx'> 		bus-&gt;sleeping = true;</div><div class='hunk'>@@ -1049,13 +916,6 @@ static int brcmf_sdbrcm_bussleep(struct brcmf_bus *bus, bool sleep)</div><div class='ctx'> 		brcmf_sdcard_cfg_write(bus-&gt;sdiodev, SDIO_FUNC_1,</div><div class='ctx'> 			SBSDIO_FUNC1_CHIPCLKCSR, 0, NULL);</div><div class='ctx'> </div><div class='del'>-		/* Force pad isolation off if possible</div><div class='del'>-			 (in case power never toggled) */</div><div class='del'>-		if ((bus-&gt;ci-&gt;buscoretype == PCMCIA_CORE_ID)</div><div class='del'>-		    &amp;&amp; (bus-&gt;ci-&gt;buscorerev &gt;= 10))</div><div class='del'>-			brcmf_sdcard_cfg_write(bus-&gt;sdiodev, SDIO_FUNC_1,</div><div class='del'>-				SBSDIO_DEVICE_CTL, 0, NULL);</div><div class='del'>-</div><div class='ctx'> 		/* Make sure the controller has the bus up */</div><div class='ctx'> 		brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false);</div><div class='ctx'> </div><div class='hunk'>@@ -1080,13 +940,13 @@ static int brcmf_sdbrcm_bussleep(struct brcmf_bus *bus, bool sleep)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bus_wake(struct brcmf_bus *bus)</div><div class='add'>+static void bus_wake(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	if (bus-&gt;sleeping)</div><div class='ctx'> 		brcmf_sdbrcm_bussleep(bus, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 brcmf_sdbrcm_hostmail(struct brcmf_bus *bus)</div><div class='add'>+static u32 brcmf_sdbrcm_hostmail(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	u32 intstatus = 0;</div><div class='ctx'> 	u32 hmb_data;</div><div class='hunk'>@@ -1162,7 +1022,7 @@ static u32 brcmf_sdbrcm_hostmail(struct brcmf_bus *bus)</div><div class='ctx'> 	return intstatus;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void brcmf_sdbrcm_rxfail(struct brcmf_bus *bus, bool abort, bool rtx)</div><div class='add'>+static void brcmf_sdbrcm_rxfail(struct brcmf_sdio *bus, bool abort, bool rtx)</div><div class='ctx'> {</div><div class='ctx'> 	uint retries = 0;</div><div class='ctx'> 	u16 lastrbc;</div><div class='hunk'>@@ -1219,16 +1079,61 @@ static void brcmf_sdbrcm_rxfail(struct brcmf_bus *bus, bool abort, bool rtx)</div><div class='ctx'> </div><div class='ctx'> 	/* If we can't reach the device, signal failure */</div><div class='ctx'> 	if (err || brcmf_sdcard_regfail(bus-&gt;sdiodev))</div><div class='del'>-		bus-&gt;drvr-&gt;busstate = BRCMF_BUS_DOWN;</div><div class='add'>+		bus-&gt;sdiodev-&gt;bus_if-&gt;state = BRCMF_BUS_DOWN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* copy a buffer into a pkt buffer chain */</div><div class='add'>+static uint brcmf_sdbrcm_glom_from_buf(struct brcmf_sdio *bus, uint len)</div><div class='add'>+{</div><div class='add'>+	uint n, ret = 0;</div><div class='add'>+	struct sk_buff *p;</div><div class='add'>+	u8 *buf;</div><div class='add'>+</div><div class='add'>+	buf = bus-&gt;dataptr;</div><div class='add'>+</div><div class='add'>+	/* copy the data */</div><div class='add'>+	skb_queue_walk(&amp;bus-&gt;glom, p) {</div><div class='add'>+		n = min_t(uint, p-&gt;len, len);</div><div class='add'>+		memcpy(p-&gt;data, buf, n);</div><div class='add'>+		buf += n;</div><div class='add'>+		len -= n;</div><div class='add'>+		ret += n;</div><div class='add'>+		if (!len)</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'>+/* return total length of buffer chain */</div><div class='add'>+static uint brcmf_sdbrcm_glom_len(struct brcmf_sdio *bus)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *p;</div><div class='add'>+	uint total;</div><div class='add'>+</div><div class='add'>+	total = 0;</div><div class='add'>+	skb_queue_walk(&amp;bus-&gt;glom, p)</div><div class='add'>+		total += p-&gt;len;</div><div class='add'>+	return total;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)</div><div class='add'>+static void brcmf_sdbrcm_free_glom(struct brcmf_sdio *bus)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *cur, *next;</div><div class='add'>+</div><div class='add'>+	skb_queue_walk_safe(&amp;bus-&gt;glom, cur, next) {</div><div class='add'>+		skb_unlink(cur, &amp;bus-&gt;glom);</div><div class='add'>+		brcmu_pkt_buf_free_skb(cur);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)</div><div class='ctx'> {</div><div class='ctx'> 	u16 dlen, totlen;</div><div class='ctx'> 	u8 *dptr, num = 0;</div><div class='ctx'> </div><div class='ctx'> 	u16 sublen, check;</div><div class='del'>-	struct sk_buff *pfirst, *plast, *pnext, *save_pfirst;</div><div class='add'>+	struct sk_buff *pfirst, *pnext;</div><div class='ctx'> </div><div class='ctx'> 	int errcode;</div><div class='ctx'> 	u8 chan, seq, doff, sfdoff;</div><div class='hunk'>@@ -1240,11 +1145,12 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)</div><div class='ctx'> 	/* If packets, issue read(s) and send up packet chain */</div><div class='ctx'> 	/* Return sequence numbers consumed? */</div><div class='ctx'> </div><div class='del'>-	brcmf_dbg(TRACE, "start: glomd %p glom %p\n", bus-&gt;glomd, bus-&gt;glom);</div><div class='add'>+	brcmf_dbg(TRACE, "start: glomd %p glom %p\n",</div><div class='add'>+		  bus-&gt;glomd, skb_peek(&amp;bus-&gt;glom));</div><div class='ctx'> </div><div class='ctx'> 	/* If there's a descriptor, generate the packet chain */</div><div class='ctx'> 	if (bus-&gt;glomd) {</div><div class='del'>-		pfirst = plast = pnext = NULL;</div><div class='add'>+		pfirst = pnext = NULL;</div><div class='ctx'> 		dlen = (u16) (bus-&gt;glomd-&gt;len);</div><div class='ctx'> 		dptr = bus-&gt;glomd-&gt;data;</div><div class='ctx'> 		if (!dlen || (dlen &amp; 1)) {</div><div class='hunk'>@@ -1287,12 +1193,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)</div><div class='ctx'> 					  num, sublen);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			if (!pfirst) {</div><div class='del'>-				pfirst = plast = pnext;</div><div class='del'>-			} else {</div><div class='del'>-				plast-&gt;next = pnext;</div><div class='del'>-				plast = pnext;</div><div class='del'>-			}</div><div class='add'>+			skb_queue_tail(&amp;bus-&gt;glom, pnext);</div><div class='ctx'> </div><div class='ctx'> 			/* Adhere to start alignment requirements */</div><div class='ctx'> 			pkt_align(pnext, sublen, BRCMF_SDALIGN);</div><div class='hunk'>@@ -1308,12 +1209,9 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)</div><div class='ctx'> 				brcmf_dbg(GLOM, "glomdesc mismatch: nextlen %d glomdesc %d rxseq %d\n",</div><div class='ctx'> 					  bus-&gt;nextlen, totlen, rxseq);</div><div class='ctx'> 			}</div><div class='del'>-			bus-&gt;glom = pfirst;</div><div class='ctx'> 			pfirst = pnext = NULL;</div><div class='ctx'> 		} else {</div><div class='del'>-			if (pfirst)</div><div class='del'>-				brcmu_pkt_buf_free_skb(pfirst);</div><div class='del'>-			bus-&gt;glom = NULL;</div><div class='add'>+			brcmf_sdbrcm_free_glom(bus);</div><div class='ctx'> 			num = 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1325,37 +1223,33 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)</div><div class='ctx'> </div><div class='ctx'> 	/* Ok -- either we just generated a packet chain,</div><div class='ctx'> 		 or had one from before */</div><div class='del'>-	if (bus-&gt;glom) {</div><div class='add'>+	if (!skb_queue_empty(&amp;bus-&gt;glom)) {</div><div class='ctx'> 		if (BRCMF_GLOM_ON()) {</div><div class='ctx'> 			brcmf_dbg(GLOM, "try superframe read, packet chain:\n");</div><div class='del'>-			for (pnext = bus-&gt;glom; pnext; pnext = pnext-&gt;next) {</div><div class='add'>+			skb_queue_walk(&amp;bus-&gt;glom, pnext) {</div><div class='ctx'> 				brcmf_dbg(GLOM, "    %p: %p len 0x%04x (%d)\n",</div><div class='ctx'> 					  pnext, (u8 *) (pnext-&gt;data),</div><div class='ctx'> 					  pnext-&gt;len, pnext-&gt;len);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pfirst = bus-&gt;glom;</div><div class='del'>-		dlen = (u16) brcmu_pkttotlen(pfirst);</div><div class='add'>+		pfirst = skb_peek(&amp;bus-&gt;glom);</div><div class='add'>+		dlen = (u16) brcmf_sdbrcm_glom_len(bus);</div><div class='ctx'> </div><div class='ctx'> 		/* Do an SDIO read for the superframe.  Configurable iovar to</div><div class='ctx'> 		 * read directly into the chained packet, or allocate a large</div><div class='ctx'> 		 * packet and and copy into the chain.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (usechain) {</div><div class='del'>-			errcode = brcmf_sdcard_recv_buf(bus-&gt;sdiodev,</div><div class='add'>+			errcode = brcmf_sdcard_recv_chain(bus-&gt;sdiodev,</div><div class='ctx'> 					bus-&gt;sdiodev-&gt;sbwad,</div><div class='del'>-					SDIO_FUNC_2,</div><div class='del'>-					F2SYNC, (u8 *) pfirst-&gt;data, dlen,</div><div class='del'>-					pfirst);</div><div class='add'>+					SDIO_FUNC_2, F2SYNC, &amp;bus-&gt;glom);</div><div class='ctx'> 		} else if (bus-&gt;dataptr) {</div><div class='ctx'> 			errcode = brcmf_sdcard_recv_buf(bus-&gt;sdiodev,</div><div class='ctx'> 					bus-&gt;sdiodev-&gt;sbwad,</div><div class='del'>-					SDIO_FUNC_2,</div><div class='del'>-					F2SYNC, bus-&gt;dataptr, dlen,</div><div class='del'>-					NULL);</div><div class='del'>-			sublen = (u16) brcmu_pktfrombuf(pfirst, 0, dlen,</div><div class='del'>-						bus-&gt;dataptr);</div><div class='add'>+					SDIO_FUNC_2, F2SYNC,</div><div class='add'>+					bus-&gt;dataptr, dlen);</div><div class='add'>+			sublen = (u16) brcmf_sdbrcm_glom_from_buf(bus, dlen);</div><div class='ctx'> 			if (sublen != dlen) {</div><div class='ctx'> 				brcmf_dbg(ERROR, "FAILED TO COPY, dlen %d sublen %d\n",</div><div class='ctx'> 					  dlen, sublen);</div><div class='hunk'>@@ -1373,16 +1267,15 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)</div><div class='ctx'> 		if (errcode &lt; 0) {</div><div class='ctx'> 			brcmf_dbg(ERROR, "glom read of %d bytes failed: %d\n",</div><div class='ctx'> 				  dlen, errcode);</div><div class='del'>-			bus-&gt;drvr-&gt;rx_errors++;</div><div class='add'>+			bus-&gt;sdiodev-&gt;bus_if-&gt;dstats.rx_errors++;</div><div class='ctx'> </div><div class='ctx'> 			if (bus-&gt;glomerr++ &lt; 3) {</div><div class='ctx'> 				brcmf_sdbrcm_rxfail(bus, true, true);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				bus-&gt;glomerr = 0;</div><div class='ctx'> 				brcmf_sdbrcm_rxfail(bus, true, false);</div><div class='del'>-				brcmu_pkt_buf_free_skb(bus-&gt;glom);</div><div class='ctx'> 				bus-&gt;rxglomfail++;</div><div class='del'>-				bus-&gt;glom = NULL;</div><div class='add'>+				brcmf_sdbrcm_free_glom(bus);</div><div class='ctx'> 			}</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1455,10 +1348,14 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)</div><div class='ctx'> 		/* Remove superframe header, remember offset */</div><div class='ctx'> 		skb_pull(pfirst, doff);</div><div class='ctx'> 		sfdoff = doff;</div><div class='add'>+		num = 0;</div><div class='ctx'> </div><div class='ctx'> 		/* Validate all the subframe headers */</div><div class='del'>-		for (num = 0, pnext = pfirst; pnext &amp;&amp; !errcode;</div><div class='del'>-		     num++, pnext = pnext-&gt;next) {</div><div class='add'>+		skb_queue_walk(&amp;bus-&gt;glom, pnext) {</div><div class='add'>+			/* leave when invalid subframe is found */</div><div class='add'>+			if (errcode)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='ctx'> 			dptr = (u8 *) (pnext-&gt;data);</div><div class='ctx'> 			dlen = (u16) (pnext-&gt;len);</div><div class='ctx'> 			sublen = get_unaligned_le16(dptr);</div><div class='hunk'>@@ -1491,6 +1388,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)</div><div class='ctx'> 					  num, doff, sublen, SDPCM_HDRLEN);</div><div class='ctx'> 				errcode = -1;</div><div class='ctx'> 			}</div><div class='add'>+			/* increase the subframe count */</div><div class='add'>+			num++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (errcode) {</div><div class='hunk'>@@ -1503,23 +1402,16 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)</div><div class='ctx'> 			} else {</div><div class='ctx'> 				bus-&gt;glomerr = 0;</div><div class='ctx'> 				brcmf_sdbrcm_rxfail(bus, true, false);</div><div class='del'>-				brcmu_pkt_buf_free_skb(bus-&gt;glom);</div><div class='ctx'> 				bus-&gt;rxglomfail++;</div><div class='del'>-				bus-&gt;glom = NULL;</div><div class='add'>+				brcmf_sdbrcm_free_glom(bus);</div><div class='ctx'> 			}</div><div class='ctx'> 			bus-&gt;nextlen = 0;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Basic SD framing looks ok - process each packet (header) */</div><div class='del'>-		save_pfirst = pfirst;</div><div class='del'>-		bus-&gt;glom = NULL;</div><div class='del'>-		plast = NULL;</div><div class='del'>-</div><div class='del'>-		for (num = 0; pfirst; rxseq++, pfirst = pnext) {</div><div class='del'>-			pnext = pfirst-&gt;next;</div><div class='del'>-			pfirst-&gt;next = NULL;</div><div class='ctx'> </div><div class='add'>+		skb_queue_walk_safe(&amp;bus-&gt;glom, pfirst, pnext) {</div><div class='ctx'> 			dptr = (u8 *) (pfirst-&gt;data);</div><div class='ctx'> 			sublen = get_unaligned_le16(dptr);</div><div class='ctx'> 			chan = SDPCM_PACKET_CHANNEL(&amp;dptr[SDPCM_FRAMETAG_LEN]);</div><div class='hunk'>@@ -1539,6 +1431,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)</div><div class='ctx'> 				bus-&gt;rx_badseq++;</div><div class='ctx'> 				rxseq = seq;</div><div class='ctx'> 			}</div><div class='add'>+			rxseq++;</div><div class='add'>+</div><div class='ctx'> #ifdef BCMDBG</div><div class='ctx'> 			if (BRCMF_BYTES_ON() &amp;&amp; BRCMF_DATA_ON()) {</div><div class='ctx'> 				printk(KERN_DEBUG "Rx Subframe Data:\n");</div><div class='hunk'>@@ -1551,36 +1445,22 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)</div><div class='ctx'> 			skb_pull(pfirst, doff);</div><div class='ctx'> </div><div class='ctx'> 			if (pfirst-&gt;len == 0) {</div><div class='add'>+				skb_unlink(pfirst, &amp;bus-&gt;glom);</div><div class='ctx'> 				brcmu_pkt_buf_free_skb(pfirst);</div><div class='del'>-				if (plast)</div><div class='del'>-					plast-&gt;next = pnext;</div><div class='del'>-				else</div><div class='del'>-					save_pfirst = pnext;</div><div class='del'>-</div><div class='ctx'> 				continue;</div><div class='del'>-			} else if (brcmf_proto_hdrpull(bus-&gt;drvr, &amp;ifidx,</div><div class='del'>-						       pfirst) != 0) {</div><div class='add'>+			} else if (brcmf_proto_hdrpull(bus-&gt;sdiodev-&gt;dev,</div><div class='add'>+						       &amp;ifidx, pfirst) != 0) {</div><div class='ctx'> 				brcmf_dbg(ERROR, "rx protocol error\n");</div><div class='del'>-				bus-&gt;drvr-&gt;rx_errors++;</div><div class='add'>+				bus-&gt;sdiodev-&gt;bus_if-&gt;dstats.rx_errors++;</div><div class='add'>+				skb_unlink(pfirst, &amp;bus-&gt;glom);</div><div class='ctx'> 				brcmu_pkt_buf_free_skb(pfirst);</div><div class='del'>-				if (plast)</div><div class='del'>-					plast-&gt;next = pnext;</div><div class='del'>-				else</div><div class='del'>-					save_pfirst = pnext;</div><div class='del'>-</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			/* this packet will go up, link back into</div><div class='del'>-				 chain and count it */</div><div class='del'>-			pfirst-&gt;next = pnext;</div><div class='del'>-			plast = pfirst;</div><div class='del'>-			num++;</div><div class='del'>-</div><div class='ctx'> #ifdef BCMDBG</div><div class='ctx'> 			if (BRCMF_GLOM_ON()) {</div><div class='ctx'> 				brcmf_dbg(GLOM, "subframe %d to stack, %p (%p/%d) nxt/lnk %p/%p\n",</div><div class='del'>-					  num, pfirst, pfirst-&gt;data,</div><div class='add'>+					  bus-&gt;glom.qlen, pfirst, pfirst-&gt;data,</div><div class='ctx'> 					  pfirst-&gt;len, pfirst-&gt;next,</div><div class='ctx'> 					  pfirst-&gt;prev);</div><div class='ctx'> 				print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,</div><div class='hunk'>@@ -1589,19 +1469,20 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)</div><div class='ctx'> 			}</div><div class='ctx'> #endif				/* BCMDBG */</div><div class='ctx'> 		}</div><div class='del'>-		if (num) {</div><div class='add'>+		/* sent any remaining packets up */</div><div class='add'>+		if (bus-&gt;glom.qlen) {</div><div class='ctx'> 			up(&amp;bus-&gt;sdsem);</div><div class='del'>-			brcmf_rx_frame(bus-&gt;drvr, ifidx, save_pfirst, num);</div><div class='add'>+			brcmf_rx_frame(bus-&gt;sdiodev-&gt;dev, ifidx, &amp;bus-&gt;glom);</div><div class='ctx'> 			down(&amp;bus-&gt;sdsem);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		bus-&gt;rxglomframes++;</div><div class='del'>-		bus-&gt;rxglompkts += num;</div><div class='add'>+		bus-&gt;rxglompkts += bus-&gt;glom.qlen;</div><div class='ctx'> 	}</div><div class='ctx'> 	return num;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int brcmf_sdbrcm_dcmd_resp_wait(struct brcmf_bus *bus, uint *condition,</div><div class='add'>+static int brcmf_sdbrcm_dcmd_resp_wait(struct brcmf_sdio *bus, uint *condition,</div><div class='ctx'> 					bool *pending)</div><div class='ctx'> {</div><div class='ctx'> 	DECLARE_WAITQUEUE(wait, current);</div><div class='hunk'>@@ -1623,7 +1504,7 @@ static int brcmf_sdbrcm_dcmd_resp_wait(struct brcmf_bus *bus, uint *condition,</div><div class='ctx'> 	return timeout;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int brcmf_sdbrcm_dcmd_resp_wake(struct brcmf_bus *bus)</div><div class='add'>+static int brcmf_sdbrcm_dcmd_resp_wake(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	if (waitqueue_active(&amp;bus-&gt;dcmd_resp_wait))</div><div class='ctx'> 		wake_up_interruptible(&amp;bus-&gt;dcmd_resp_wait);</div><div class='hunk'>@@ -1631,7 +1512,7 @@ static int brcmf_sdbrcm_dcmd_resp_wake(struct brcmf_bus *bus)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> static void</div><div class='del'>-brcmf_sdbrcm_read_control(struct brcmf_bus *bus, u8 *hdr, uint len, uint doff)</div><div class='add'>+brcmf_sdbrcm_read_control(struct brcmf_sdio *bus, u8 *hdr, uint len, uint doff)</div><div class='ctx'> {</div><div class='ctx'> 	uint rdlen, pad;</div><div class='ctx'> </div><div class='hunk'>@@ -1657,7 +1538,7 @@ brcmf_sdbrcm_read_control(struct brcmf_bus *bus, u8 *hdr, uint len, uint doff)</div><div class='ctx'> 	if (bus-&gt;roundup &amp;&amp; bus-&gt;blocksize &amp;&amp; (rdlen &gt; bus-&gt;blocksize)) {</div><div class='ctx'> 		pad = bus-&gt;blocksize - (rdlen % bus-&gt;blocksize);</div><div class='ctx'> 		if ((pad &lt;= bus-&gt;roundup) &amp;&amp; (pad &lt; bus-&gt;blocksize) &amp;&amp;</div><div class='del'>-		    ((len + pad) &lt; bus-&gt;drvr-&gt;maxctl))</div><div class='add'>+		    ((len + pad) &lt; bus-&gt;sdiodev-&gt;bus_if-&gt;maxctl))</div><div class='ctx'> 			rdlen += pad;</div><div class='ctx'> 	} else if (rdlen % BRCMF_SDALIGN) {</div><div class='ctx'> 		rdlen += BRCMF_SDALIGN - (rdlen % BRCMF_SDALIGN);</div><div class='hunk'>@@ -1668,18 +1549,18 @@ brcmf_sdbrcm_read_control(struct brcmf_bus *bus, u8 *hdr, uint len, uint doff)</div><div class='ctx'> 		rdlen = roundup(rdlen, ALIGNMENT);</div><div class='ctx'> </div><div class='ctx'> 	/* Drop if the read is too big or it exceeds our maximum */</div><div class='del'>-	if ((rdlen + BRCMF_FIRSTREAD) &gt; bus-&gt;drvr-&gt;maxctl) {</div><div class='add'>+	if ((rdlen + BRCMF_FIRSTREAD) &gt; bus-&gt;sdiodev-&gt;bus_if-&gt;maxctl) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "%d-byte control read exceeds %d-byte buffer\n",</div><div class='del'>-			  rdlen, bus-&gt;drvr-&gt;maxctl);</div><div class='del'>-		bus-&gt;drvr-&gt;rx_errors++;</div><div class='add'>+			  rdlen, bus-&gt;sdiodev-&gt;bus_if-&gt;maxctl);</div><div class='add'>+		bus-&gt;sdiodev-&gt;bus_if-&gt;dstats.rx_errors++;</div><div class='ctx'> 		brcmf_sdbrcm_rxfail(bus, false, false);</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((len - doff) &gt; bus-&gt;drvr-&gt;maxctl) {</div><div class='add'>+	if ((len - doff) &gt; bus-&gt;sdiodev-&gt;bus_if-&gt;maxctl) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "%d-byte ctl frame (%d-byte ctl data) exceeds %d-byte limit\n",</div><div class='del'>-			  len, len - doff, bus-&gt;drvr-&gt;maxctl);</div><div class='del'>-		bus-&gt;drvr-&gt;rx_errors++;</div><div class='add'>+			  len, len - doff, bus-&gt;sdiodev-&gt;bus_if-&gt;maxctl);</div><div class='add'>+		bus-&gt;sdiodev-&gt;bus_if-&gt;dstats.rx_errors++;</div><div class='ctx'> 		bus-&gt;rx_toolong++;</div><div class='ctx'> 		brcmf_sdbrcm_rxfail(bus, false, false);</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -1689,8 +1570,7 @@ brcmf_sdbrcm_read_control(struct brcmf_bus *bus, u8 *hdr, uint len, uint doff)</div><div class='ctx'> 	sdret = brcmf_sdcard_recv_buf(bus-&gt;sdiodev,</div><div class='ctx'> 				bus-&gt;sdiodev-&gt;sbwad,</div><div class='ctx'> 				SDIO_FUNC_2,</div><div class='del'>-				F2SYNC, (bus-&gt;rxctl + BRCMF_FIRSTREAD), rdlen,</div><div class='del'>-				NULL);</div><div class='add'>+				F2SYNC, (bus-&gt;rxctl + BRCMF_FIRSTREAD), rdlen);</div><div class='ctx'> 	bus-&gt;f2rxdata++;</div><div class='ctx'> </div><div class='ctx'> 	/* Control frame failures need retransmission */</div><div class='hunk'>@@ -1721,7 +1601,7 @@ done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Pad read to blocksize for efficiency */</div><div class='del'>-static void brcmf_pad(struct brcmf_bus *bus, u16 *pad, u16 *rdlen)</div><div class='add'>+static void brcmf_pad(struct brcmf_sdio *bus, u16 *pad, u16 *rdlen)</div><div class='ctx'> {</div><div class='ctx'> 	if (bus-&gt;roundup &amp;&amp; bus-&gt;blocksize &amp;&amp; *rdlen &gt; bus-&gt;blocksize) {</div><div class='ctx'> 		*pad = bus-&gt;blocksize - (*rdlen % bus-&gt;blocksize);</div><div class='hunk'>@@ -1734,7 +1614,7 @@ static void brcmf_pad(struct brcmf_bus *bus, u16 *pad, u16 *rdlen)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-brcmf_alloc_pkt_and_read(struct brcmf_bus *bus, u16 rdlen,</div><div class='add'>+brcmf_alloc_pkt_and_read(struct brcmf_sdio *bus, u16 rdlen,</div><div class='ctx'> 			 struct sk_buff **pkt, u8 **rxbuf)</div><div class='ctx'> {</div><div class='ctx'> 	int sdret;		/* Return code from calls */</div><div class='hunk'>@@ -1746,16 +1626,15 @@ brcmf_alloc_pkt_and_read(struct brcmf_bus *bus, u16 rdlen,</div><div class='ctx'> 	pkt_align(*pkt, rdlen, BRCMF_SDALIGN);</div><div class='ctx'> 	*rxbuf = (u8 *) ((*pkt)-&gt;data);</div><div class='ctx'> 	/* Read the entire frame */</div><div class='del'>-	sdret = brcmf_sdcard_recv_buf(bus-&gt;sdiodev, bus-&gt;sdiodev-&gt;sbwad,</div><div class='del'>-				      SDIO_FUNC_2, F2SYNC,</div><div class='del'>-				      *rxbuf, rdlen, *pkt);</div><div class='add'>+	sdret = brcmf_sdcard_recv_pkt(bus-&gt;sdiodev, bus-&gt;sdiodev-&gt;sbwad,</div><div class='add'>+				      SDIO_FUNC_2, F2SYNC, *pkt);</div><div class='ctx'> 	bus-&gt;f2rxdata++;</div><div class='ctx'> </div><div class='ctx'> 	if (sdret &lt; 0) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "(nextlen): read %d bytes failed: %d\n",</div><div class='ctx'> 			  rdlen, sdret);</div><div class='ctx'> 		brcmu_pkt_buf_free_skb(*pkt);</div><div class='del'>-		bus-&gt;drvr-&gt;rx_errors++;</div><div class='add'>+		bus-&gt;sdiodev-&gt;bus_if-&gt;dstats.rx_errors++;</div><div class='ctx'> 		/* Force retry w/normal header read.</div><div class='ctx'> 		 * Don't attempt NAK for</div><div class='ctx'> 		 * gSPI</div><div class='hunk'>@@ -1767,7 +1646,7 @@ brcmf_alloc_pkt_and_read(struct brcmf_bus *bus, u16 rdlen,</div><div class='ctx'> </div><div class='ctx'> /* Checks the header */</div><div class='ctx'> static int</div><div class='del'>-brcmf_check_rxbuf(struct brcmf_bus *bus, struct sk_buff *pkt, u8 *rxbuf,</div><div class='add'>+brcmf_check_rxbuf(struct brcmf_sdio *bus, struct sk_buff *pkt, u8 *rxbuf,</div><div class='ctx'> 		  u8 rxseq, u16 nextlen, u16 *len)</div><div class='ctx'> {</div><div class='ctx'> 	u16 check;</div><div class='hunk'>@@ -1823,7 +1702,7 @@ fail:</div><div class='ctx'> </div><div class='ctx'> /* Return true if there may be more frames to read */</div><div class='ctx'> static uint</div><div class='del'>-brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)</div><div class='add'>+brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)</div><div class='ctx'> {</div><div class='ctx'> 	u16 len, check;	/* Extracted hardware header fields */</div><div class='ctx'> 	u8 chan, seq, doff;	/* Extracted software header fields */</div><div class='hunk'>@@ -1846,14 +1725,15 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)</div><div class='ctx'> 	*finished = false;</div><div class='ctx'> </div><div class='ctx'> 	for (rxseq = bus-&gt;rx_seq, rxleft = maxframes;</div><div class='del'>-	     !bus-&gt;rxskip &amp;&amp; rxleft &amp;&amp; bus-&gt;drvr-&gt;busstate != BRCMF_BUS_DOWN;</div><div class='add'>+	     !bus-&gt;rxskip &amp;&amp; rxleft &amp;&amp;</div><div class='add'>+	     bus-&gt;sdiodev-&gt;bus_if-&gt;state != BRCMF_BUS_DOWN;</div><div class='ctx'> 	     rxseq++, rxleft--) {</div><div class='ctx'> </div><div class='ctx'> 		/* Handle glomming separately */</div><div class='del'>-		if (bus-&gt;glom || bus-&gt;glomd) {</div><div class='add'>+		if (bus-&gt;glomd || !skb_queue_empty(&amp;bus-&gt;glom)) {</div><div class='ctx'> 			u8 cnt;</div><div class='ctx'> 			brcmf_dbg(GLOM, "calling rxglom: glomd %p, glom %p\n",</div><div class='del'>-				  bus-&gt;glomd, bus-&gt;glom);</div><div class='add'>+				  bus-&gt;glomd, skb_peek(&amp;bus-&gt;glom));</div><div class='ctx'> 			cnt = brcmf_sdbrcm_rxglom(bus, rxseq);</div><div class='ctx'> 			brcmf_dbg(GLOM, "rxglom returned %d\n", cnt);</div><div class='ctx'> 			rxseq += cnt - 1;</div><div class='hunk'>@@ -1905,7 +1785,7 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)</div><div class='ctx'> 				bus-&gt;nextlen = 0;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			bus-&gt;drvr-&gt;rx_readahead_cnt++;</div><div class='add'>+			bus-&gt;rx_readahead_cnt++;</div><div class='ctx'> </div><div class='ctx'> 			/* Handle Flow Control */</div><div class='ctx'> 			fcbits = SDPCM_FCMASK_VALUE(</div><div class='hunk'>@@ -1976,7 +1856,7 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)</div><div class='ctx'> 		/* Read frame header (hardware and software) */</div><div class='ctx'> 		sdret = brcmf_sdcard_recv_buf(bus-&gt;sdiodev, bus-&gt;sdiodev-&gt;sbwad,</div><div class='ctx'> 					      SDIO_FUNC_2, F2SYNC, bus-&gt;rxhdr,</div><div class='del'>-					      BRCMF_FIRSTREAD, NULL);</div><div class='add'>+					      BRCMF_FIRSTREAD);</div><div class='ctx'> 		bus-&gt;f2rxhdrs++;</div><div class='ctx'> </div><div class='ctx'> 		if (sdret &lt; 0) {</div><div class='hunk'>@@ -2103,7 +1983,7 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)</div><div class='ctx'> 			/* Too long -- skip this frame */</div><div class='ctx'> 			brcmf_dbg(ERROR, "too long: len %d rdlen %d\n",</div><div class='ctx'> 				  len, rdlen);</div><div class='del'>-			bus-&gt;drvr-&gt;rx_errors++;</div><div class='add'>+			bus-&gt;sdiodev-&gt;bus_if-&gt;dstats.rx_errors++;</div><div class='ctx'> 			bus-&gt;rx_toolong++;</div><div class='ctx'> 			brcmf_sdbrcm_rxfail(bus, false, false);</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -2115,7 +1995,7 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)</div><div class='ctx'> 			/* Give up on data, request rtx of events */</div><div class='ctx'> 			brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: rdlen %d chan %d\n",</div><div class='ctx'> 				  rdlen, chan);</div><div class='del'>-			bus-&gt;drvr-&gt;rx_dropped++;</div><div class='add'>+			bus-&gt;sdiodev-&gt;bus_if-&gt;dstats.rx_dropped++;</div><div class='ctx'> 			brcmf_sdbrcm_rxfail(bus, false, RETRYCHAN(chan));</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2125,9 +2005,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)</div><div class='ctx'> 		pkt_align(pkt, rdlen, BRCMF_SDALIGN);</div><div class='ctx'> </div><div class='ctx'> 		/* Read the remaining frame data */</div><div class='del'>-		sdret = brcmf_sdcard_recv_buf(bus-&gt;sdiodev, bus-&gt;sdiodev-&gt;sbwad,</div><div class='del'>-				SDIO_FUNC_2, F2SYNC, ((u8 *) (pkt-&gt;data)),</div><div class='del'>-				rdlen, pkt);</div><div class='add'>+		sdret = brcmf_sdcard_recv_pkt(bus-&gt;sdiodev, bus-&gt;sdiodev-&gt;sbwad,</div><div class='add'>+					      SDIO_FUNC_2, F2SYNC, pkt);</div><div class='ctx'> 		bus-&gt;f2rxdata++;</div><div class='ctx'> </div><div class='ctx'> 		if (sdret &lt; 0) {</div><div class='hunk'>@@ -2136,7 +2015,7 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)</div><div class='ctx'> 				   : ((chan == SDPCM_DATA_CHANNEL) ? "data"</div><div class='ctx'> 				      : "test")), sdret);</div><div class='ctx'> 			brcmu_pkt_buf_free_skb(pkt);</div><div class='del'>-			bus-&gt;drvr-&gt;rx_errors++;</div><div class='add'>+			bus-&gt;sdiodev-&gt;bus_if-&gt;dstats.rx_errors++;</div><div class='ctx'> 			brcmf_sdbrcm_rxfail(bus, true, RETRYCHAN(chan));</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2185,16 +2064,17 @@ deliver:</div><div class='ctx'> 		if (pkt-&gt;len == 0) {</div><div class='ctx'> 			brcmu_pkt_buf_free_skb(pkt);</div><div class='ctx'> 			continue;</div><div class='del'>-		} else if (brcmf_proto_hdrpull(bus-&gt;drvr, &amp;ifidx, pkt) != 0) {</div><div class='add'>+		} else if (brcmf_proto_hdrpull(bus-&gt;sdiodev-&gt;dev, &amp;ifidx,</div><div class='add'>+			   pkt) != 0) {</div><div class='ctx'> 			brcmf_dbg(ERROR, "rx protocol error\n");</div><div class='ctx'> 			brcmu_pkt_buf_free_skb(pkt);</div><div class='del'>-			bus-&gt;drvr-&gt;rx_errors++;</div><div class='add'>+			bus-&gt;sdiodev-&gt;bus_if-&gt;dstats.rx_errors++;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Unlock during rx call */</div><div class='ctx'> 		up(&amp;bus-&gt;sdsem);</div><div class='del'>-		brcmf_rx_frame(bus-&gt;drvr, ifidx, pkt, 1);</div><div class='add'>+		brcmf_rx_packet(bus-&gt;sdiodev-&gt;dev, ifidx, pkt);</div><div class='ctx'> 		down(&amp;bus-&gt;sdsem);</div><div class='ctx'> 	}</div><div class='ctx'> 	rxcount = maxframes - rxleft;</div><div class='hunk'>@@ -2214,16 +2094,8 @@ deliver:</div><div class='ctx'> 	return rxcount;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-brcmf_sdbrcm_send_buf(struct brcmf_bus *bus, u32 addr, uint fn, uint flags,</div><div class='del'>-		    u8 *buf, uint nbytes, struct sk_buff *pkt)</div><div class='del'>-{</div><div class='del'>-	return brcmf_sdcard_send_buf</div><div class='del'>-		(bus-&gt;sdiodev, addr, fn, flags, buf, nbytes, pkt);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='del'>-brcmf_sdbrcm_wait_for_event(struct brcmf_bus *bus, bool *lockvar)</div><div class='add'>+brcmf_sdbrcm_wait_for_event(struct brcmf_sdio *bus, bool *lockvar)</div><div class='ctx'> {</div><div class='ctx'> 	up(&amp;bus-&gt;sdsem);</div><div class='ctx'> 	wait_event_interruptible_timeout(bus-&gt;ctrl_wait,</div><div class='hunk'>@@ -2233,7 +2105,7 @@ brcmf_sdbrcm_wait_for_event(struct brcmf_bus *bus, bool *lockvar)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-brcmf_sdbrcm_wait_event_wakeup(struct brcmf_bus *bus)</div><div class='add'>+brcmf_sdbrcm_wait_event_wakeup(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	if (waitqueue_active(&amp;bus-&gt;ctrl_wait))</div><div class='ctx'> 		wake_up_interruptible(&amp;bus-&gt;ctrl_wait);</div><div class='hunk'>@@ -2242,7 +2114,7 @@ brcmf_sdbrcm_wait_event_wakeup(struct brcmf_bus *bus)</div><div class='ctx'> </div><div class='ctx'> /* Writes a HW/SW header into the packet and sends it. */</div><div class='ctx'> /* Assumes: (a) header space already there, (b) caller holds lock */</div><div class='del'>-static int brcmf_sdbrcm_txpkt(struct brcmf_bus *bus, struct sk_buff *pkt,</div><div class='add'>+static int brcmf_sdbrcm_txpkt(struct brcmf_sdio *bus, struct sk_buff *pkt,</div><div class='ctx'> 			      uint chan, bool free_pkt)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -2262,7 +2134,7 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_bus *bus, struct sk_buff *pkt,</div><div class='ctx'> 		if (skb_headroom(pkt) &lt; pad) {</div><div class='ctx'> 			brcmf_dbg(INFO, "insufficient headroom %d for %d pad\n",</div><div class='ctx'> 				  skb_headroom(pkt), pad);</div><div class='del'>-			bus-&gt;drvr-&gt;tx_realloc++;</div><div class='add'>+			bus-&gt;sdiodev-&gt;bus_if-&gt;tx_realloc++;</div><div class='ctx'> 			new = brcmu_pkt_buf_get_skb(pkt-&gt;len + BRCMF_SDALIGN);</div><div class='ctx'> 			if (!new) {</div><div class='ctx'> 				brcmf_dbg(ERROR, "couldn't allocate new %d-byte packet\n",</div><div class='hunk'>@@ -2331,9 +2203,8 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_bus *bus, struct sk_buff *pkt,</div><div class='ctx'> 	if (len &amp; (ALIGNMENT - 1))</div><div class='ctx'> 			len = roundup(len, ALIGNMENT);</div><div class='ctx'> </div><div class='del'>-	ret = brcmf_sdbrcm_send_buf(bus, bus-&gt;sdiodev-&gt;sbwad,</div><div class='del'>-				    SDIO_FUNC_2, F2SYNC, frame,</div><div class='del'>-				    len, pkt);</div><div class='add'>+	ret = brcmf_sdcard_send_pkt(bus-&gt;sdiodev, bus-&gt;sdiodev-&gt;sbwad,</div><div class='add'>+				    SDIO_FUNC_2, F2SYNC, pkt);</div><div class='ctx'> 	bus-&gt;f2txdata++;</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -2371,7 +2242,7 @@ done:</div><div class='ctx'> 	/* restore pkt buffer pointer before calling tx complete routine */</div><div class='ctx'> 	skb_pull(pkt, SDPCM_HDRLEN + pad);</div><div class='ctx'> 	up(&amp;bus-&gt;sdsem);</div><div class='del'>-	brcmf_txcomplete(bus-&gt;drvr, pkt, ret != 0);</div><div class='add'>+	brcmf_txcomplete(bus-&gt;sdiodev-&gt;dev, pkt, ret != 0);</div><div class='ctx'> 	down(&amp;bus-&gt;sdsem);</div><div class='ctx'> </div><div class='ctx'> 	if (free_pkt)</div><div class='hunk'>@@ -2380,7 +2251,7 @@ done:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static uint brcmf_sdbrcm_sendfromq(struct brcmf_bus *bus, uint maxframes)</div><div class='add'>+static uint brcmf_sdbrcm_sendfromq(struct brcmf_sdio *bus, uint maxframes)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *pkt;</div><div class='ctx'> 	u32 intstatus = 0;</div><div class='hunk'>@@ -2390,8 +2261,6 @@ static uint brcmf_sdbrcm_sendfromq(struct brcmf_bus *bus, uint maxframes)</div><div class='ctx'> 	uint datalen;</div><div class='ctx'> 	u8 tx_prec_map;</div><div class='ctx'> </div><div class='del'>-	struct brcmf_pub *drvr = bus-&gt;drvr;</div><div class='del'>-</div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='ctx'> 	tx_prec_map = ~bus-&gt;flowcontrol;</div><div class='hunk'>@@ -2409,9 +2278,9 @@ static uint brcmf_sdbrcm_sendfromq(struct brcmf_bus *bus, uint maxframes)</div><div class='ctx'> </div><div class='ctx'> 		ret = brcmf_sdbrcm_txpkt(bus, pkt, SDPCM_DATA_CHANNEL, true);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			bus-&gt;drvr-&gt;tx_errors++;</div><div class='add'>+			bus-&gt;sdiodev-&gt;bus_if-&gt;dstats.tx_errors++;</div><div class='ctx'> 		else</div><div class='del'>-			bus-&gt;drvr-&gt;dstats.tx_bytes += datalen;</div><div class='add'>+			bus-&gt;sdiodev-&gt;bus_if-&gt;dstats.tx_bytes += datalen;</div><div class='ctx'> </div><div class='ctx'> 		/* In poll mode, need to check for other events */</div><div class='ctx'> 		if (!bus-&gt;intr &amp;&amp; cnt) {</div><div class='hunk'>@@ -2428,14 +2297,98 @@ static uint brcmf_sdbrcm_sendfromq(struct brcmf_bus *bus, uint maxframes)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Deflow-control stack if needed */</div><div class='del'>-	if (drvr-&gt;up &amp;&amp; (drvr-&gt;busstate == BRCMF_BUS_DATA) &amp;&amp;</div><div class='del'>-	    drvr-&gt;txoff &amp;&amp; (pktq_len(&amp;bus-&gt;txq) &lt; TXLOW))</div><div class='del'>-		brcmf_txflowcontrol(drvr, 0, OFF);</div><div class='add'>+	if (bus-&gt;sdiodev-&gt;bus_if-&gt;drvr_up &amp;&amp;</div><div class='add'>+	    (bus-&gt;sdiodev-&gt;bus_if-&gt;state == BRCMF_BUS_DATA) &amp;&amp;</div><div class='add'>+	    bus-&gt;txoff &amp;&amp; (pktq_len(&amp;bus-&gt;txq) &lt; TXLOW)) {</div><div class='add'>+		bus-&gt;txoff = OFF;</div><div class='add'>+		brcmf_txflowcontrol(bus-&gt;sdiodev-&gt;dev, 0, OFF);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return cnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)</div><div class='add'>+static void brcmf_sdbrcm_bus_stop(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	u32 local_hostintmask;</div><div class='add'>+	u8 saveclk;</div><div class='add'>+	uint retries;</div><div class='add'>+	int err;</div><div class='add'>+	struct brcmf_bus *bus_if = dev_get_drvdata(dev);</div><div class='add'>+	struct brcmf_sdio_dev *sdiodev = bus_if-&gt;bus_priv;</div><div class='add'>+	struct brcmf_sdio *bus = sdiodev-&gt;bus;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(TRACE, "Enter\n");</div><div class='add'>+</div><div class='add'>+	if (bus-&gt;watchdog_tsk) {</div><div class='add'>+		send_sig(SIGTERM, bus-&gt;watchdog_tsk, 1);</div><div class='add'>+		kthread_stop(bus-&gt;watchdog_tsk);</div><div class='add'>+		bus-&gt;watchdog_tsk = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bus-&gt;dpc_tsk &amp;&amp; bus-&gt;dpc_tsk != current) {</div><div class='add'>+		send_sig(SIGTERM, bus-&gt;dpc_tsk, 1);</div><div class='add'>+		kthread_stop(bus-&gt;dpc_tsk);</div><div class='add'>+		bus-&gt;dpc_tsk = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	down(&amp;bus-&gt;sdsem);</div><div class='add'>+</div><div class='add'>+	bus_wake(bus);</div><div class='add'>+</div><div class='add'>+	/* Enable clock for device interrupts */</div><div class='add'>+	brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false);</div><div class='add'>+</div><div class='add'>+	/* Disable and clear interrupts at the chip level also */</div><div class='add'>+	w_sdreg32(bus, 0, offsetof(struct sdpcmd_regs, hostintmask), &amp;retries);</div><div class='add'>+	local_hostintmask = bus-&gt;hostintmask;</div><div class='add'>+	bus-&gt;hostintmask = 0;</div><div class='add'>+</div><div class='add'>+	/* Change our idea of bus state */</div><div class='add'>+	bus-&gt;sdiodev-&gt;bus_if-&gt;state = BRCMF_BUS_DOWN;</div><div class='add'>+</div><div class='add'>+	/* Force clocks on backplane to be sure F2 interrupt propagates */</div><div class='add'>+	saveclk = brcmf_sdcard_cfg_read(bus-&gt;sdiodev, SDIO_FUNC_1,</div><div class='add'>+					SBSDIO_FUNC1_CHIPCLKCSR, &amp;err);</div><div class='add'>+	if (!err) {</div><div class='add'>+		brcmf_sdcard_cfg_write(bus-&gt;sdiodev, SDIO_FUNC_1,</div><div class='add'>+				       SBSDIO_FUNC1_CHIPCLKCSR,</div><div class='add'>+				       (saveclk | SBSDIO_FORCE_HT), &amp;err);</div><div class='add'>+	}</div><div class='add'>+	if (err)</div><div class='add'>+		brcmf_dbg(ERROR, "Failed to force clock for F2: err %d\n", err);</div><div class='add'>+</div><div class='add'>+	/* Turn off the bus (F2), free any pending packets */</div><div class='add'>+	brcmf_dbg(INTR, "disable SDIO interrupts\n");</div><div class='add'>+	brcmf_sdcard_cfg_write(bus-&gt;sdiodev, SDIO_FUNC_0, SDIO_CCCR_IOEx,</div><div class='add'>+			 SDIO_FUNC_ENABLE_1, NULL);</div><div class='add'>+</div><div class='add'>+	/* Clear any pending interrupts now that F2 is disabled */</div><div class='add'>+	w_sdreg32(bus, local_hostintmask,</div><div class='add'>+		  offsetof(struct sdpcmd_regs, intstatus), &amp;retries);</div><div class='add'>+</div><div class='add'>+	/* Turn off the backplane clock (only) */</div><div class='add'>+	brcmf_sdbrcm_clkctl(bus, CLK_SDONLY, false);</div><div class='add'>+</div><div class='add'>+	/* Clear the data packet queues */</div><div class='add'>+	brcmu_pktq_flush(&amp;bus-&gt;txq, true, NULL, NULL);</div><div class='add'>+</div><div class='add'>+	/* Clear any held glomming stuff */</div><div class='add'>+	if (bus-&gt;glomd)</div><div class='add'>+		brcmu_pkt_buf_free_skb(bus-&gt;glomd);</div><div class='add'>+	brcmf_sdbrcm_free_glom(bus);</div><div class='add'>+</div><div class='add'>+	/* Clear rx control and wake any waiters */</div><div class='add'>+	bus-&gt;rxlen = 0;</div><div class='add'>+	brcmf_sdbrcm_dcmd_resp_wake(bus);</div><div class='add'>+</div><div class='add'>+	/* Reset some F2 state stuff */</div><div class='add'>+	bus-&gt;rxskip = false;</div><div class='add'>+	bus-&gt;tx_seq = bus-&gt;rx_seq = 0;</div><div class='add'>+</div><div class='add'>+	up(&amp;bus-&gt;sdsem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	u32 intstatus, newstatus = 0;</div><div class='ctx'> 	uint retries = 0;</div><div class='hunk'>@@ -2463,7 +2416,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)</div><div class='ctx'> 					       SBSDIO_DEVICE_CTL, &amp;err);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			brcmf_dbg(ERROR, "error reading DEVCTL: %d\n", err);</div><div class='del'>-			bus-&gt;drvr-&gt;busstate = BRCMF_BUS_DOWN;</div><div class='add'>+			bus-&gt;sdiodev-&gt;bus_if-&gt;state = BRCMF_BUS_DOWN;</div><div class='ctx'> 		}</div><div class='ctx'> #endif				/* BCMDBG */</div><div class='ctx'> </div><div class='hunk'>@@ -2473,7 +2426,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			brcmf_dbg(ERROR, "error reading CSR: %d\n",</div><div class='ctx'> 				  err);</div><div class='del'>-			bus-&gt;drvr-&gt;busstate = BRCMF_BUS_DOWN;</div><div class='add'>+			bus-&gt;sdiodev-&gt;bus_if-&gt;state = BRCMF_BUS_DOWN;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		brcmf_dbg(INFO, "DPC: PENDING, devctl 0x%02x clkctl 0x%02x\n",</div><div class='hunk'>@@ -2486,7 +2439,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)</div><div class='ctx'> 			if (err) {</div><div class='ctx'> 				brcmf_dbg(ERROR, "error reading DEVCTL: %d\n",</div><div class='ctx'> 					  err);</div><div class='del'>-				bus-&gt;drvr-&gt;busstate = BRCMF_BUS_DOWN;</div><div class='add'>+				bus-&gt;sdiodev-&gt;bus_if-&gt;state = BRCMF_BUS_DOWN;</div><div class='ctx'> 			}</div><div class='ctx'> 			devctl &amp;= ~SBSDIO_DEVCTL_CA_INT_ONLY;</div><div class='ctx'> 			brcmf_sdcard_cfg_write(bus-&gt;sdiodev, SDIO_FUNC_1,</div><div class='hunk'>@@ -2494,7 +2447,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)</div><div class='ctx'> 			if (err) {</div><div class='ctx'> 				brcmf_dbg(ERROR, "error writing DEVCTL: %d\n",</div><div class='ctx'> 					  err);</div><div class='del'>-				bus-&gt;drvr-&gt;busstate = BRCMF_BUS_DOWN;</div><div class='add'>+				bus-&gt;sdiodev-&gt;bus_if-&gt;state = BRCMF_BUS_DOWN;</div><div class='ctx'> 			}</div><div class='ctx'> 			bus-&gt;clkstate = CLK_AVAIL;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -2596,9 +2549,9 @@ clkwait:</div><div class='ctx'> 		(bus-&gt;clkstate == CLK_AVAIL)) {</div><div class='ctx'> 		int ret, i;</div><div class='ctx'> </div><div class='del'>-		ret = brcmf_sdbrcm_send_buf(bus, bus-&gt;sdiodev-&gt;sbwad,</div><div class='add'>+		ret = brcmf_sdcard_send_buf(bus-&gt;sdiodev, bus-&gt;sdiodev-&gt;sbwad,</div><div class='ctx'> 			SDIO_FUNC_2, F2SYNC, (u8 *) bus-&gt;ctrl_frame_buf,</div><div class='del'>-			(u32) bus-&gt;ctrl_frame_len, NULL);</div><div class='add'>+			(u32) bus-&gt;ctrl_frame_len);</div><div class='ctx'> </div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			/* On failure, abort the command and</div><div class='hunk'>@@ -2650,11 +2603,11 @@ clkwait:</div><div class='ctx'> 		 else await next interrupt */</div><div class='ctx'> 	/* On failed register access, all bets are off:</div><div class='ctx'> 		 no resched or interrupts */</div><div class='del'>-	if ((bus-&gt;drvr-&gt;busstate == BRCMF_BUS_DOWN) ||</div><div class='add'>+	if ((bus-&gt;sdiodev-&gt;bus_if-&gt;state == BRCMF_BUS_DOWN) ||</div><div class='ctx'> 	    brcmf_sdcard_regfail(bus-&gt;sdiodev)) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "failed backplane access over SDIO, halting operation %d\n",</div><div class='ctx'> 			  brcmf_sdcard_regfail(bus-&gt;sdiodev));</div><div class='del'>-		bus-&gt;drvr-&gt;busstate = BRCMF_BUS_DOWN;</div><div class='add'>+		bus-&gt;sdiodev-&gt;bus_if-&gt;state = BRCMF_BUS_DOWN;</div><div class='ctx'> 		bus-&gt;intstatus = 0;</div><div class='ctx'> 	} else if (bus-&gt;clkstate == CLK_PENDING) {</div><div class='ctx'> 		brcmf_dbg(INFO, "rescheduled due to CLK_PENDING awaiting I_CHIPACTIVE interrupt\n");</div><div class='hunk'>@@ -2681,7 +2634,7 @@ clkwait:</div><div class='ctx'> </div><div class='ctx'> static int brcmf_sdbrcm_dpc_thread(void *data)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_bus *bus = (struct brcmf_bus *) data;</div><div class='add'>+	struct brcmf_sdio *bus = (struct brcmf_sdio *) data;</div><div class='ctx'> </div><div class='ctx'> 	allow_signal(SIGTERM);</div><div class='ctx'> 	/* Run until signal received */</div><div class='hunk'>@@ -2691,12 +2644,12 @@ static int brcmf_sdbrcm_dpc_thread(void *data)</div><div class='ctx'> 		if (!wait_for_completion_interruptible(&amp;bus-&gt;dpc_wait)) {</div><div class='ctx'> 			/* Call bus dpc unless it indicated down</div><div class='ctx'> 			(then clean stop) */</div><div class='del'>-			if (bus-&gt;drvr-&gt;busstate != BRCMF_BUS_DOWN) {</div><div class='add'>+			if (bus-&gt;sdiodev-&gt;bus_if-&gt;state != BRCMF_BUS_DOWN) {</div><div class='ctx'> 				if (brcmf_sdbrcm_dpc(bus))</div><div class='ctx'> 					complete(&amp;bus-&gt;dpc_wait);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* after stopping the bus, exit thread */</div><div class='del'>-				brcmf_sdbrcm_bus_stop(bus);</div><div class='add'>+				brcmf_sdbrcm_bus_stop(bus-&gt;sdiodev-&gt;dev);</div><div class='ctx'> 				bus-&gt;dpc_tsk = NULL;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2706,10 +2659,13 @@ static int brcmf_sdbrcm_dpc_thread(void *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *pkt)</div><div class='add'>+static int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -EBADE;</div><div class='ctx'> 	uint datalen, prec;</div><div class='add'>+	struct brcmf_bus *bus_if = dev_get_drvdata(dev);</div><div class='add'>+	struct brcmf_sdio_dev *sdiodev = bus_if-&gt;bus_priv;</div><div class='add'>+	struct brcmf_sdio *bus = sdiodev-&gt;bus;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='hunk'>@@ -2728,9 +2684,10 @@ int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *pkt)</div><div class='ctx'> </div><div class='ctx'> 	/* Priority based enq */</div><div class='ctx'> 	spin_lock_bh(&amp;bus-&gt;txqlock);</div><div class='del'>-	if (brcmf_c_prec_enq(bus-&gt;drvr, &amp;bus-&gt;txq, pkt, prec) == false) {</div><div class='add'>+	if (brcmf_c_prec_enq(bus-&gt;sdiodev-&gt;dev, &amp;bus-&gt;txq, pkt, prec) ==</div><div class='add'>+	    false) {</div><div class='ctx'> 		skb_pull(pkt, SDPCM_HDRLEN);</div><div class='del'>-		brcmf_txcomplete(bus-&gt;drvr, pkt, false);</div><div class='add'>+		brcmf_txcomplete(bus-&gt;sdiodev-&gt;dev, pkt, false);</div><div class='ctx'> 		brcmu_pkt_buf_free_skb(pkt);</div><div class='ctx'> 		brcmf_dbg(ERROR, "out of bus-&gt;txq !!!\n");</div><div class='ctx'> 		ret = -ENOSR;</div><div class='hunk'>@@ -2739,8 +2696,10 @@ int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *pkt)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;bus-&gt;txqlock);</div><div class='ctx'> </div><div class='del'>-	if (pktq_len(&amp;bus-&gt;txq) &gt;= TXHI)</div><div class='del'>-		brcmf_txflowcontrol(bus-&gt;drvr, 0, ON);</div><div class='add'>+	if (pktq_len(&amp;bus-&gt;txq) &gt;= TXHI) {</div><div class='add'>+		bus-&gt;txoff = ON;</div><div class='add'>+		brcmf_txflowcontrol(bus-&gt;sdiodev-&gt;dev, 0, ON);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #ifdef BCMDBG</div><div class='ctx'> 	if (pktq_plen(&amp;bus-&gt;txq, prec) &gt; qcount[prec])</div><div class='hunk'>@@ -2757,7 +2716,7 @@ int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *pkt)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-brcmf_sdbrcm_membytes(struct brcmf_bus *bus, bool write, u32 address, u8 *data,</div><div class='add'>+brcmf_sdbrcm_membytes(struct brcmf_sdio *bus, bool write, u32 address, u8 *data,</div><div class='ctx'> 		 uint size)</div><div class='ctx'> {</div><div class='ctx'> 	int bcmerror = 0;</div><div class='hunk'>@@ -2818,7 +2777,7 @@ xfer_done:</div><div class='ctx'> #ifdef BCMDBG</div><div class='ctx'> #define CONSOLE_LINE_MAX	192</div><div class='ctx'> </div><div class='del'>-static int brcmf_sdbrcm_readconsole(struct brcmf_bus *bus)</div><div class='add'>+static int brcmf_sdbrcm_readconsole(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_console *c = &amp;bus-&gt;console;</div><div class='ctx'> 	u8 line[CONSOLE_LINE_MAX], ch;</div><div class='hunk'>@@ -2895,14 +2854,14 @@ break2:</div><div class='ctx'> }</div><div class='ctx'> #endif				/* BCMDBG */</div><div class='ctx'> </div><div class='del'>-static int brcmf_tx_frame(struct brcmf_bus *bus, u8 *frame, u16 len)</div><div class='add'>+static int brcmf_tx_frame(struct brcmf_sdio *bus, u8 *frame, u16 len)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	bus-&gt;ctrl_frame_stat = false;</div><div class='del'>-	ret = brcmf_sdbrcm_send_buf(bus, bus-&gt;sdiodev-&gt;sbwad,</div><div class='del'>-				    SDIO_FUNC_2, F2SYNC, frame, len, NULL);</div><div class='add'>+	ret = brcmf_sdcard_send_buf(bus-&gt;sdiodev, bus-&gt;sdiodev-&gt;sbwad,</div><div class='add'>+				    SDIO_FUNC_2, F2SYNC, frame, len);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		/* On failure, abort the command and terminate the frame */</div><div class='hunk'>@@ -2937,8 +2896,8 @@ static int brcmf_tx_frame(struct brcmf_bus *bus, u8 *frame, u16 len)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)</div><div class='add'>+static int</div><div class='add'>+brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *frame;</div><div class='ctx'> 	u16 len;</div><div class='hunk'>@@ -2946,6 +2905,9 @@ brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)</div><div class='ctx'> 	uint retries = 0;</div><div class='ctx'> 	u8 doff = 0;</div><div class='ctx'> 	int ret = -1;</div><div class='add'>+	struct brcmf_bus *bus_if = dev_get_drvdata(dev);</div><div class='add'>+	struct brcmf_sdio_dev *sdiodev = bus_if-&gt;bus_priv;</div><div class='add'>+	struct brcmf_sdio *bus = sdiodev-&gt;bus;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='hunk'>@@ -3045,19 +3007,22 @@ brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)</div><div class='ctx'> 	up(&amp;bus-&gt;sdsem);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='del'>-		bus-&gt;drvr-&gt;tx_ctlerrs++;</div><div class='add'>+		bus-&gt;tx_ctlerrs++;</div><div class='ctx'> 	else</div><div class='del'>-		bus-&gt;drvr-&gt;tx_ctlpkts++;</div><div class='add'>+		bus-&gt;tx_ctlpkts++;</div><div class='ctx'> </div><div class='ctx'> 	return ret ? -EIO : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int</div><div class='del'>-brcmf_sdbrcm_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)</div><div class='add'>+static int</div><div class='add'>+brcmf_sdbrcm_bus_rxctl(struct device *dev, unsigned char *msg, uint msglen)</div><div class='ctx'> {</div><div class='ctx'> 	int timeleft;</div><div class='ctx'> 	uint rxlen = 0;</div><div class='ctx'> 	bool pending;</div><div class='add'>+	struct brcmf_bus *bus_if = dev_get_drvdata(dev);</div><div class='add'>+	struct brcmf_sdio_dev *sdiodev = bus_if-&gt;bus_priv;</div><div class='add'>+	struct brcmf_sdio *bus = sdiodev-&gt;bus;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='hunk'>@@ -3083,21 +3048,21 @@ brcmf_sdbrcm_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rxlen)</div><div class='del'>-		bus-&gt;drvr-&gt;rx_ctlpkts++;</div><div class='add'>+		bus-&gt;rx_ctlpkts++;</div><div class='ctx'> 	else</div><div class='del'>-		bus-&gt;drvr-&gt;rx_ctlerrs++;</div><div class='add'>+		bus-&gt;rx_ctlerrs++;</div><div class='ctx'> </div><div class='ctx'> 	return rxlen ? (int)rxlen : -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int brcmf_sdbrcm_downloadvars(struct brcmf_bus *bus, void *arg, int len)</div><div class='add'>+static int brcmf_sdbrcm_downloadvars(struct brcmf_sdio *bus, void *arg, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int bcmerror = 0;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Basic sanity checks */</div><div class='del'>-	if (bus-&gt;drvr-&gt;up) {</div><div class='add'>+	if (bus-&gt;sdiodev-&gt;bus_if-&gt;drvr_up) {</div><div class='ctx'> 		bcmerror = -EISCONN;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3123,7 +3088,7 @@ err:</div><div class='ctx'> 	return bcmerror;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int brcmf_sdbrcm_write_vars(struct brcmf_bus *bus)</div><div class='add'>+static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	int bcmerror = 0;</div><div class='ctx'> 	u32 varsize;</div><div class='hunk'>@@ -3154,8 +3119,10 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_bus *bus)</div><div class='ctx'> 		/* Verify NVRAM bytes */</div><div class='ctx'> 		brcmf_dbg(INFO, "Compare NVRAM dl &amp; ul; varsize=%d\n", varsize);</div><div class='ctx'> 		nvram_ularray = kmalloc(varsize, GFP_ATOMIC);</div><div class='del'>-		if (!nvram_ularray)</div><div class='add'>+		if (!nvram_ularray) {</div><div class='add'>+			kfree(vbuffer);</div><div class='ctx'> 			return -ENOMEM;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* Upload image to verify downloaded contents. */</div><div class='ctx'> 		memset(nvram_ularray, 0xaa, varsize);</div><div class='hunk'>@@ -3210,135 +3177,11 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_bus *bus)</div><div class='ctx'> 	return bcmerror;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-brcmf_sdbrcm_chip_disablecore(struct brcmf_sdio_dev *sdiodev, u32 corebase)</div><div class='del'>-{</div><div class='del'>-	u32 regdata;</div><div class='del'>-</div><div class='del'>-	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-		CORE_SB(corebase, sbtmstatelow), 4);</div><div class='del'>-	if (regdata &amp; SBTML_RESET)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-		CORE_SB(corebase, sbtmstatelow), 4);</div><div class='del'>-	if ((regdata &amp; (SICF_CLOCK_EN &lt;&lt; SBTML_SICF_SHIFT)) != 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * set target reject and spin until busy is clear</div><div class='del'>-		 * (preserve core-specific bits)</div><div class='del'>-		 */</div><div class='del'>-		regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-			CORE_SB(corebase, sbtmstatelow), 4);</div><div class='del'>-		brcmf_sdcard_reg_write(sdiodev, CORE_SB(corebase, sbtmstatelow),</div><div class='del'>-				       4, regdata | SBTML_REJ);</div><div class='del'>-</div><div class='del'>-		regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-			CORE_SB(corebase, sbtmstatelow), 4);</div><div class='del'>-		udelay(1);</div><div class='del'>-		SPINWAIT((brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-			CORE_SB(corebase, sbtmstatehigh), 4) &amp;</div><div class='del'>-			SBTMH_BUSY), 100000);</div><div class='del'>-</div><div class='del'>-		regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-			CORE_SB(corebase, sbtmstatehigh), 4);</div><div class='del'>-		if (regdata &amp; SBTMH_BUSY)</div><div class='del'>-			brcmf_dbg(ERROR, "ARM core still busy\n");</div><div class='del'>-</div><div class='del'>-		regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-			CORE_SB(corebase, sbidlow), 4);</div><div class='del'>-		if (regdata &amp; SBIDL_INIT) {</div><div class='del'>-			regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-				CORE_SB(corebase, sbimstate), 4) |</div><div class='del'>-				SBIM_RJ;</div><div class='del'>-			brcmf_sdcard_reg_write(sdiodev,</div><div class='del'>-				CORE_SB(corebase, sbimstate), 4,</div><div class='del'>-				regdata);</div><div class='del'>-			regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-				CORE_SB(corebase, sbimstate), 4);</div><div class='del'>-			udelay(1);</div><div class='del'>-			SPINWAIT((brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-				CORE_SB(corebase, sbimstate), 4) &amp;</div><div class='del'>-				SBIM_BY), 100000);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* set reset and reject while enabling the clocks */</div><div class='del'>-		brcmf_sdcard_reg_write(sdiodev,</div><div class='del'>-			CORE_SB(corebase, sbtmstatelow), 4,</div><div class='del'>-			(((SICF_FGC | SICF_CLOCK_EN) &lt;&lt; SBTML_SICF_SHIFT) |</div><div class='del'>-			SBTML_REJ | SBTML_RESET));</div><div class='del'>-		regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-			CORE_SB(corebase, sbtmstatelow), 4);</div><div class='del'>-		udelay(10);</div><div class='del'>-</div><div class='del'>-		/* clear the initiator reject bit */</div><div class='del'>-		regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-			CORE_SB(corebase, sbidlow), 4);</div><div class='del'>-		if (regdata &amp; SBIDL_INIT) {</div><div class='del'>-			regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-				CORE_SB(corebase, sbimstate), 4) &amp;</div><div class='del'>-				~SBIM_RJ;</div><div class='del'>-			brcmf_sdcard_reg_write(sdiodev,</div><div class='del'>-				CORE_SB(corebase, sbimstate), 4,</div><div class='del'>-				regdata);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* leave reset and reject asserted */</div><div class='del'>-	brcmf_sdcard_reg_write(sdiodev, CORE_SB(corebase, sbtmstatelow), 4,</div><div class='del'>-		(SBTML_REJ | SBTML_RESET));</div><div class='del'>-	udelay(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-brcmf_sdbrcm_chip_resetcore(struct brcmf_sdio_dev *sdiodev, u32 corebase)</div><div class='del'>-{</div><div class='del'>-	u32 regdata;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Must do the disable sequence first to work for</div><div class='del'>-	 * arbitrary current core state.</div><div class='del'>-	 */</div><div class='del'>-	brcmf_sdbrcm_chip_disablecore(sdiodev, corebase);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now do the initialization sequence.</div><div class='del'>-	 * set reset while enabling the clock and</div><div class='del'>-	 * forcing them on throughout the core</div><div class='del'>-	 */</div><div class='del'>-	brcmf_sdcard_reg_write(sdiodev, CORE_SB(corebase, sbtmstatelow), 4,</div><div class='del'>-		((SICF_FGC | SICF_CLOCK_EN) &lt;&lt; SBTML_SICF_SHIFT) |</div><div class='del'>-		SBTML_RESET);</div><div class='del'>-	udelay(1);</div><div class='del'>-</div><div class='del'>-	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-					CORE_SB(corebase, sbtmstatehigh), 4);</div><div class='del'>-	if (regdata &amp; SBTMH_SERR)</div><div class='del'>-		brcmf_sdcard_reg_write(sdiodev,</div><div class='del'>-				       CORE_SB(corebase, sbtmstatehigh), 4, 0);</div><div class='del'>-</div><div class='del'>-	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-					CORE_SB(corebase, sbimstate), 4);</div><div class='del'>-	if (regdata &amp; (SBIM_IBE | SBIM_TO))</div><div class='del'>-		brcmf_sdcard_reg_write(sdiodev, CORE_SB(corebase, sbimstate), 4,</div><div class='del'>-			regdata &amp; ~(SBIM_IBE | SBIM_TO));</div><div class='del'>-</div><div class='del'>-	/* clear reset and allow it to propagate throughout the core */</div><div class='del'>-	brcmf_sdcard_reg_write(sdiodev, CORE_SB(corebase, sbtmstatelow), 4,</div><div class='del'>-		(SICF_FGC &lt;&lt; SBTML_SICF_SHIFT) |</div><div class='del'>-		(SICF_CLOCK_EN &lt;&lt; SBTML_SICF_SHIFT));</div><div class='del'>-	udelay(1);</div><div class='del'>-</div><div class='del'>-	/* leave clock enabled */</div><div class='del'>-	brcmf_sdcard_reg_write(sdiodev, CORE_SB(corebase, sbtmstatelow), 4,</div><div class='del'>-		(SICF_CLOCK_EN &lt;&lt; SBTML_SICF_SHIFT));</div><div class='del'>-	udelay(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int brcmf_sdbrcm_download_state(struct brcmf_bus *bus, bool enter)</div><div class='add'>+static int brcmf_sdbrcm_download_state(struct brcmf_sdio *bus, bool enter)</div><div class='ctx'> {</div><div class='ctx'> 	uint retries;</div><div class='del'>-	u32 regdata;</div><div class='ctx'> 	int bcmerror = 0;</div><div class='add'>+	struct chip_info *ci = bus-&gt;ci;</div><div class='ctx'> </div><div class='ctx'> 	/* To enter download state, disable ARM and reset SOCRAM.</div><div class='ctx'> 	 * To exit download state, simply reset ARM (default is RAM boot).</div><div class='hunk'>@@ -3346,10 +3189,9 @@ static int brcmf_sdbrcm_download_state(struct brcmf_bus *bus, bool enter)</div><div class='ctx'> 	if (enter) {</div><div class='ctx'> 		bus-&gt;alp_only = true;</div><div class='ctx'> </div><div class='del'>-		brcmf_sdbrcm_chip_disablecore(bus-&gt;sdiodev,</div><div class='del'>-					      bus-&gt;ci-&gt;armcorebase);</div><div class='add'>+		ci-&gt;coredisable(bus-&gt;sdiodev, ci, BCMA_CORE_ARM_CM3);</div><div class='ctx'> </div><div class='del'>-		brcmf_sdbrcm_chip_resetcore(bus-&gt;sdiodev, bus-&gt;ci-&gt;ramcorebase);</div><div class='add'>+		ci-&gt;resetcore(bus-&gt;sdiodev, ci, BCMA_CORE_INTERNAL_MEM);</div><div class='ctx'> </div><div class='ctx'> 		/* Clear the top bit of memory */</div><div class='ctx'> 		if (bus-&gt;ramsize) {</div><div class='hunk'>@@ -3358,11 +3200,7 @@ static int brcmf_sdbrcm_download_state(struct brcmf_bus *bus, bool enter)</div><div class='ctx'> 					 (u8 *)&amp;zeros, 4);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		regdata = brcmf_sdcard_reg_read(bus-&gt;sdiodev,</div><div class='del'>-			CORE_SB(bus-&gt;ci-&gt;ramcorebase, sbtmstatelow), 4);</div><div class='del'>-		regdata &amp;= (SBTML_RESET | SBTML_REJ_MASK |</div><div class='del'>-			(SICF_CLOCK_EN &lt;&lt; SBTML_SICF_SHIFT));</div><div class='del'>-		if ((SICF_CLOCK_EN &lt;&lt; SBTML_SICF_SHIFT) != regdata) {</div><div class='add'>+		if (!ci-&gt;iscoreup(bus-&gt;sdiodev, ci, BCMA_CORE_INTERNAL_MEM)) {</div><div class='ctx'> 			brcmf_dbg(ERROR, "SOCRAM core is down after reset?\n");</div><div class='ctx'> 			bcmerror = -EBADE;</div><div class='ctx'> 			goto fail;</div><div class='hunk'>@@ -3377,18 +3215,18 @@ static int brcmf_sdbrcm_download_state(struct brcmf_bus *bus, bool enter)</div><div class='ctx'> 		w_sdreg32(bus, 0xFFFFFFFF,</div><div class='ctx'> 			  offsetof(struct sdpcmd_regs, intstatus), &amp;retries);</div><div class='ctx'> </div><div class='del'>-		brcmf_sdbrcm_chip_resetcore(bus-&gt;sdiodev, bus-&gt;ci-&gt;armcorebase);</div><div class='add'>+		ci-&gt;resetcore(bus-&gt;sdiodev, ci, BCMA_CORE_ARM_CM3);</div><div class='ctx'> </div><div class='ctx'> 		/* Allow HT Clock now that the ARM is running. */</div><div class='ctx'> 		bus-&gt;alp_only = false;</div><div class='ctx'> </div><div class='del'>-		bus-&gt;drvr-&gt;busstate = BRCMF_BUS_LOAD;</div><div class='add'>+		bus-&gt;sdiodev-&gt;bus_if-&gt;state = BRCMF_BUS_LOAD;</div><div class='ctx'> 	}</div><div class='ctx'> fail:</div><div class='ctx'> 	return bcmerror;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int brcmf_sdbrcm_get_image(char *buf, int len, struct brcmf_bus *bus)</div><div class='add'>+static int brcmf_sdbrcm_get_image(char *buf, int len, struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	if (bus-&gt;firmware-&gt;size &lt; bus-&gt;fw_ptr + len)</div><div class='ctx'> 		len = bus-&gt;firmware-&gt;size - bus-&gt;fw_ptr;</div><div class='hunk'>@@ -3398,10 +3236,7 @@ static int brcmf_sdbrcm_get_image(char *buf, int len, struct brcmf_bus *bus)</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-MODULE_FIRMWARE(BCM4329_FW_NAME);</div><div class='del'>-MODULE_FIRMWARE(BCM4329_NV_NAME);</div><div class='del'>-</div><div class='del'>-static int brcmf_sdbrcm_download_code_file(struct brcmf_bus *bus)</div><div class='add'>+static int brcmf_sdbrcm_download_code_file(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	int offset = 0;</div><div class='ctx'> 	uint len;</div><div class='hunk'>@@ -3410,8 +3245,7 @@ static int brcmf_sdbrcm_download_code_file(struct brcmf_bus *bus)</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(INFO, "Enter\n");</div><div class='ctx'> </div><div class='del'>-	bus-&gt;fw_name = BCM4329_FW_NAME;</div><div class='del'>-	ret = request_firmware(&amp;bus-&gt;firmware, bus-&gt;fw_name,</div><div class='add'>+	ret = request_firmware(&amp;bus-&gt;firmware, BRCMFMAC_FW_NAME,</div><div class='ctx'> 			       &amp;bus-&gt;sdiodev-&gt;func[2]-&gt;dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "Fail to request firmware %d\n", ret);</div><div class='hunk'>@@ -3501,15 +3335,14 @@ static uint brcmf_process_nvram_vars(char *varbuf, uint len)</div><div class='ctx'> 	return buf_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int brcmf_sdbrcm_download_nvram(struct brcmf_bus *bus)</div><div class='add'>+static int brcmf_sdbrcm_download_nvram(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	uint len;</div><div class='ctx'> 	char *memblock = NULL;</div><div class='ctx'> 	char *bufp;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	bus-&gt;nv_name = BCM4329_NV_NAME;</div><div class='del'>-	ret = request_firmware(&amp;bus-&gt;firmware, bus-&gt;nv_name,</div><div class='add'>+	ret = request_firmware(&amp;bus-&gt;firmware, BRCMFMAC_NV_NAME,</div><div class='ctx'> 			       &amp;bus-&gt;sdiodev-&gt;func[2]-&gt;dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "Fail to request nvram %d\n", ret);</div><div class='hunk'>@@ -3549,7 +3382,7 @@ err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int _brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus)</div><div class='add'>+static int _brcmf_sdbrcm_download_firmware(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	int bcmerror = -1;</div><div class='ctx'> </div><div class='hunk'>@@ -3582,7 +3415,7 @@ err:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='del'>-brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus)</div><div class='add'>+brcmf_sdbrcm_download_firmware(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	bool ret;</div><div class='ctx'> </div><div class='hunk'>@@ -3596,91 +3429,11 @@ brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus)</div><div class='del'>-{</div><div class='del'>-	u32 local_hostintmask;</div><div class='del'>-	u8 saveclk;</div><div class='del'>-	uint retries;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	brcmf_dbg(TRACE, "Enter\n");</div><div class='del'>-</div><div class='del'>-	if (bus-&gt;watchdog_tsk) {</div><div class='del'>-		send_sig(SIGTERM, bus-&gt;watchdog_tsk, 1);</div><div class='del'>-		kthread_stop(bus-&gt;watchdog_tsk);</div><div class='del'>-		bus-&gt;watchdog_tsk = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bus-&gt;dpc_tsk &amp;&amp; bus-&gt;dpc_tsk != current) {</div><div class='del'>-		send_sig(SIGTERM, bus-&gt;dpc_tsk, 1);</div><div class='del'>-		kthread_stop(bus-&gt;dpc_tsk);</div><div class='del'>-		bus-&gt;dpc_tsk = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	down(&amp;bus-&gt;sdsem);</div><div class='del'>-</div><div class='del'>-	bus_wake(bus);</div><div class='del'>-</div><div class='del'>-	/* Enable clock for device interrupts */</div><div class='del'>-	brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false);</div><div class='del'>-</div><div class='del'>-	/* Disable and clear interrupts at the chip level also */</div><div class='del'>-	w_sdreg32(bus, 0, offsetof(struct sdpcmd_regs, hostintmask), &amp;retries);</div><div class='del'>-	local_hostintmask = bus-&gt;hostintmask;</div><div class='del'>-	bus-&gt;hostintmask = 0;</div><div class='del'>-</div><div class='del'>-	/* Change our idea of bus state */</div><div class='del'>-	bus-&gt;drvr-&gt;busstate = BRCMF_BUS_DOWN;</div><div class='del'>-</div><div class='del'>-	/* Force clocks on backplane to be sure F2 interrupt propagates */</div><div class='del'>-	saveclk = brcmf_sdcard_cfg_read(bus-&gt;sdiodev, SDIO_FUNC_1,</div><div class='del'>-					SBSDIO_FUNC1_CHIPCLKCSR, &amp;err);</div><div class='del'>-	if (!err) {</div><div class='del'>-		brcmf_sdcard_cfg_write(bus-&gt;sdiodev, SDIO_FUNC_1,</div><div class='del'>-				       SBSDIO_FUNC1_CHIPCLKCSR,</div><div class='del'>-				       (saveclk | SBSDIO_FORCE_HT), &amp;err);</div><div class='del'>-	}</div><div class='del'>-	if (err)</div><div class='del'>-		brcmf_dbg(ERROR, "Failed to force clock for F2: err %d\n", err);</div><div class='del'>-</div><div class='del'>-	/* Turn off the bus (F2), free any pending packets */</div><div class='del'>-	brcmf_dbg(INTR, "disable SDIO interrupts\n");</div><div class='del'>-	brcmf_sdcard_cfg_write(bus-&gt;sdiodev, SDIO_FUNC_0, SDIO_CCCR_IOEx,</div><div class='del'>-			 SDIO_FUNC_ENABLE_1, NULL);</div><div class='del'>-</div><div class='del'>-	/* Clear any pending interrupts now that F2 is disabled */</div><div class='del'>-	w_sdreg32(bus, local_hostintmask,</div><div class='del'>-		  offsetof(struct sdpcmd_regs, intstatus), &amp;retries);</div><div class='del'>-</div><div class='del'>-	/* Turn off the backplane clock (only) */</div><div class='del'>-	brcmf_sdbrcm_clkctl(bus, CLK_SDONLY, false);</div><div class='del'>-</div><div class='del'>-	/* Clear the data packet queues */</div><div class='del'>-	brcmu_pktq_flush(&amp;bus-&gt;txq, true, NULL, NULL);</div><div class='del'>-</div><div class='del'>-	/* Clear any held glomming stuff */</div><div class='del'>-	if (bus-&gt;glomd)</div><div class='del'>-		brcmu_pkt_buf_free_skb(bus-&gt;glomd);</div><div class='del'>-</div><div class='del'>-	if (bus-&gt;glom)</div><div class='del'>-		brcmu_pkt_buf_free_skb(bus-&gt;glom);</div><div class='del'>-</div><div class='del'>-	bus-&gt;glom = bus-&gt;glomd = NULL;</div><div class='del'>-</div><div class='del'>-	/* Clear rx control and wake any waiters */</div><div class='del'>-	bus-&gt;rxlen = 0;</div><div class='del'>-	brcmf_sdbrcm_dcmd_resp_wake(bus);</div><div class='del'>-</div><div class='del'>-	/* Reset some F2 state stuff */</div><div class='del'>-	bus-&gt;rxskip = false;</div><div class='del'>-	bus-&gt;tx_seq = bus-&gt;rx_seq = 0;</div><div class='del'>-</div><div class='del'>-	up(&amp;bus-&gt;sdsem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr)</div><div class='add'>+static int brcmf_sdbrcm_bus_init(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_bus *bus = drvr-&gt;bus;</div><div class='add'>+	struct brcmf_bus *bus_if = dev_get_drvdata(dev);</div><div class='add'>+	struct brcmf_sdio_dev *sdiodev = bus_if-&gt;bus_priv;</div><div class='add'>+	struct brcmf_sdio *bus = sdiodev-&gt;bus;</div><div class='ctx'> 	unsigned long timeout;</div><div class='ctx'> 	uint retries = 0;</div><div class='ctx'> 	u8 ready, enable;</div><div class='hunk'>@@ -3690,16 +3443,16 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr)</div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='ctx'> 	/* try to download image and nvram to the dongle */</div><div class='del'>-	if (drvr-&gt;busstate == BRCMF_BUS_DOWN) {</div><div class='add'>+	if (bus_if-&gt;state == BRCMF_BUS_DOWN) {</div><div class='ctx'> 		if (!(brcmf_sdbrcm_download_firmware(bus)))</div><div class='ctx'> 			return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!bus-&gt;drvr)</div><div class='add'>+	if (!bus-&gt;sdiodev-&gt;bus_if-&gt;drvr)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Start the watchdog timer */</div><div class='del'>-	bus-&gt;drvr-&gt;tickcnt = 0;</div><div class='add'>+	bus-&gt;tickcnt = 0;</div><div class='ctx'> 	brcmf_sdbrcm_wd_timer(bus, BRCMF_WD_POLL_MS);</div><div class='ctx'> </div><div class='ctx'> 	down(&amp;bus-&gt;sdsem);</div><div class='hunk'>@@ -3756,7 +3509,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr)</div><div class='ctx'> 				       SBSDIO_WATERMARK, 8, &amp;err);</div><div class='ctx'> </div><div class='ctx'> 		/* Set bus state according to enable result */</div><div class='del'>-		drvr-&gt;busstate = BRCMF_BUS_DATA;</div><div class='add'>+		bus_if-&gt;state = BRCMF_BUS_DATA;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	else {</div><div class='hunk'>@@ -3771,7 +3524,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr)</div><div class='ctx'> 			       SBSDIO_FUNC1_CHIPCLKCSR, saveclk, &amp;err);</div><div class='ctx'> </div><div class='ctx'> 	/* If we didn't come up, turn off backplane clock */</div><div class='del'>-	if (drvr-&gt;busstate != BRCMF_BUS_DATA)</div><div class='add'>+	if (bus_if-&gt;state != BRCMF_BUS_DATA)</div><div class='ctx'> 		brcmf_sdbrcm_clkctl(bus, CLK_NONE, false);</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='hunk'>@@ -3782,7 +3535,7 @@ exit:</div><div class='ctx'> </div><div class='ctx'> void brcmf_sdbrcm_isr(void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_bus *bus = (struct brcmf_bus *) arg;</div><div class='add'>+	struct brcmf_sdio *bus = (struct brcmf_sdio *) arg;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='hunk'>@@ -3791,7 +3544,7 @@ void brcmf_sdbrcm_isr(void *arg)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bus-&gt;drvr-&gt;busstate == BRCMF_BUS_DOWN) {</div><div class='add'>+	if (bus-&gt;sdiodev-&gt;bus_if-&gt;state == BRCMF_BUS_DOWN) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "bus is down. we have nothing to do\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3814,14 +3567,14 @@ void brcmf_sdbrcm_isr(void *arg)</div><div class='ctx'> 		complete(&amp;bus-&gt;dpc_wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr)</div><div class='add'>+static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_bus *bus;</div><div class='add'>+#ifdef BCMDBG</div><div class='add'>+	struct brcmf_bus *bus_if = dev_get_drvdata(bus-&gt;sdiodev-&gt;dev);</div><div class='add'>+#endif	/* BCMDBG */</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TIMER, "Enter\n");</div><div class='ctx'> </div><div class='del'>-	bus = drvr-&gt;bus;</div><div class='del'>-</div><div class='ctx'> 	/* Ignore the timer if simulating bus down */</div><div class='ctx'> 	if (bus-&gt;sleeping)</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -3865,7 +3618,8 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr)</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef BCMDBG</div><div class='ctx'> 	/* Poll for console output periodically */</div><div class='del'>-	if (drvr-&gt;busstate == BRCMF_BUS_DATA &amp;&amp; bus-&gt;console_interval != 0) {</div><div class='add'>+	if (bus_if-&gt;state == BRCMF_BUS_DATA &amp;&amp;</div><div class='add'>+	    bus-&gt;console_interval != 0) {</div><div class='ctx'> 		bus-&gt;console.count += BRCMF_WD_POLL_MS;</div><div class='ctx'> 		if (bus-&gt;console.count &gt;= bus-&gt;console_interval) {</div><div class='ctx'> 			bus-&gt;console.count -= bus-&gt;console_interval;</div><div class='hunk'>@@ -3900,10 +3654,12 @@ static bool brcmf_sdbrcm_chipmatch(u16 chipid)</div><div class='ctx'> {</div><div class='ctx'> 	if (chipid == BCM4329_CHIP_ID)</div><div class='ctx'> 		return true;</div><div class='add'>+	if (chipid == BCM4330_CHIP_ID)</div><div class='add'>+		return true;</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void brcmf_sdbrcm_release_malloc(struct brcmf_bus *bus)</div><div class='add'>+static void brcmf_sdbrcm_release_malloc(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='hunk'>@@ -3915,13 +3671,13 @@ static void brcmf_sdbrcm_release_malloc(struct brcmf_bus *bus)</div><div class='ctx'> 	bus-&gt;databuf = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool brcmf_sdbrcm_probe_malloc(struct brcmf_bus *bus)</div><div class='add'>+static bool brcmf_sdbrcm_probe_malloc(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='del'>-	if (bus-&gt;drvr-&gt;maxctl) {</div><div class='add'>+	if (bus-&gt;sdiodev-&gt;bus_if-&gt;maxctl) {</div><div class='ctx'> 		bus-&gt;rxblen =</div><div class='del'>-		    roundup((bus-&gt;drvr-&gt;maxctl + SDPCM_HDRLEN),</div><div class='add'>+		    roundup((bus-&gt;sdiodev-&gt;bus_if-&gt;maxctl + SDPCM_HDRLEN),</div><div class='ctx'> 			    ALIGNMENT) + BRCMF_SDALIGN;</div><div class='ctx'> 		bus-&gt;rxbuf = kmalloc(bus-&gt;rxblen, GFP_ATOMIC);</div><div class='ctx'> 		if (!(bus-&gt;rxbuf))</div><div class='hunk'>@@ -3950,276 +3706,14 @@ fail:</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* SDIO Pad drive strength to select value mappings */</div><div class='del'>-struct sdiod_drive_str {</div><div class='del'>-	u8 strength;	/* Pad Drive Strength in mA */</div><div class='del'>-	u8 sel;		/* Chip-specific select value */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* SDIO Drive Strength to sel value table for PMU Rev 1 */</div><div class='del'>-static const struct sdiod_drive_str sdiod_drive_strength_tab1[] = {</div><div class='del'>-	{</div><div class='del'>-	4, 0x2}, {</div><div class='del'>-	2, 0x3}, {</div><div class='del'>-	1, 0x0}, {</div><div class='del'>-	0, 0x0}</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-/* SDIO Drive Strength to sel value table for PMU Rev 2, 3 */</div><div class='del'>-static const struct sdiod_drive_str sdiod_drive_strength_tab2[] = {</div><div class='del'>-	{</div><div class='del'>-	12, 0x7}, {</div><div class='del'>-	10, 0x6}, {</div><div class='del'>-	8, 0x5}, {</div><div class='del'>-	6, 0x4}, {</div><div class='del'>-	4, 0x2}, {</div><div class='del'>-	2, 0x1}, {</div><div class='del'>-	0, 0x0}</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-/* SDIO Drive Strength to sel value table for PMU Rev 8 (1.8V) */</div><div class='del'>-static const struct sdiod_drive_str sdiod_drive_strength_tab3[] = {</div><div class='del'>-	{</div><div class='del'>-	32, 0x7}, {</div><div class='del'>-	26, 0x6}, {</div><div class='del'>-	22, 0x5}, {</div><div class='del'>-	16, 0x4}, {</div><div class='del'>-	12, 0x3}, {</div><div class='del'>-	8, 0x2}, {</div><div class='del'>-	4, 0x1}, {</div><div class='del'>-	0, 0x0}</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-#define SDIOD_DRVSTR_KEY(chip, pmu)     (((chip) &lt;&lt; 16) | (pmu))</div><div class='del'>-</div><div class='del'>-static char *brcmf_chipname(uint chipid, char *buf, uint len)</div><div class='del'>-{</div><div class='del'>-	const char *fmt;</div><div class='del'>-</div><div class='del'>-	fmt = ((chipid &gt; 0xa000) || (chipid &lt; 0x4000)) ? "%d" : "%x";</div><div class='del'>-	snprintf(buf, len, fmt, chipid);</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void brcmf_sdbrcm_sdiod_drive_strength_init(struct brcmf_bus *bus,</div><div class='del'>-						   u32 drivestrength) {</div><div class='del'>-	struct sdiod_drive_str *str_tab = NULL;</div><div class='del'>-	u32 str_mask = 0;</div><div class='del'>-	u32 str_shift = 0;</div><div class='del'>-	char chn[8];</div><div class='del'>-</div><div class='del'>-	if (!(bus-&gt;ci-&gt;cccaps &amp; CC_CAP_PMU))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (SDIOD_DRVSTR_KEY(bus-&gt;ci-&gt;chip, bus-&gt;ci-&gt;pmurev)) {</div><div class='del'>-	case SDIOD_DRVSTR_KEY(BCM4325_CHIP_ID, 1):</div><div class='del'>-		str_tab = (struct sdiod_drive_str *)&amp;sdiod_drive_strength_tab1;</div><div class='del'>-		str_mask = 0x30000000;</div><div class='del'>-		str_shift = 28;</div><div class='del'>-		break;</div><div class='del'>-	case SDIOD_DRVSTR_KEY(BCM4325_CHIP_ID, 2):</div><div class='del'>-	case SDIOD_DRVSTR_KEY(BCM4325_CHIP_ID, 3):</div><div class='del'>-		str_tab = (struct sdiod_drive_str *)&amp;sdiod_drive_strength_tab2;</div><div class='del'>-		str_mask = 0x00003800;</div><div class='del'>-		str_shift = 11;</div><div class='del'>-		break;</div><div class='del'>-	case SDIOD_DRVSTR_KEY(BCM4336_CHIP_ID, 8):</div><div class='del'>-		str_tab = (struct sdiod_drive_str *)&amp;sdiod_drive_strength_tab3;</div><div class='del'>-		str_mask = 0x00003800;</div><div class='del'>-		str_shift = 11;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		brcmf_dbg(ERROR, "No SDIO Drive strength init done for chip %s rev %d pmurev %d\n",</div><div class='del'>-			  brcmf_chipname(bus-&gt;ci-&gt;chip, chn, 8),</div><div class='del'>-			  bus-&gt;ci-&gt;chiprev, bus-&gt;ci-&gt;pmurev);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (str_tab != NULL) {</div><div class='del'>-		u32 drivestrength_sel = 0;</div><div class='del'>-		u32 cc_data_temp;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		for (i = 0; str_tab[i].strength != 0; i++) {</div><div class='del'>-			if (drivestrength &gt;= str_tab[i].strength) {</div><div class='del'>-				drivestrength_sel = str_tab[i].sel;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		brcmf_sdcard_reg_write(bus-&gt;sdiodev,</div><div class='del'>-			CORE_CC_REG(bus-&gt;ci-&gt;cccorebase, chipcontrol_addr),</div><div class='del'>-			4, 1);</div><div class='del'>-		cc_data_temp = brcmf_sdcard_reg_read(bus-&gt;sdiodev,</div><div class='del'>-			CORE_CC_REG(bus-&gt;ci-&gt;cccorebase, chipcontrol_addr), 4);</div><div class='del'>-		cc_data_temp &amp;= ~str_mask;</div><div class='del'>-		drivestrength_sel &lt;&lt;= str_shift;</div><div class='del'>-		cc_data_temp |= drivestrength_sel;</div><div class='del'>-		brcmf_sdcard_reg_write(bus-&gt;sdiodev,</div><div class='del'>-			CORE_CC_REG(bus-&gt;ci-&gt;cccorebase, chipcontrol_addr),</div><div class='del'>-			4, cc_data_temp);</div><div class='del'>-</div><div class='del'>-		brcmf_dbg(INFO, "SDIO: %dmA drive strength selected, set to 0x%08x\n",</div><div class='del'>-			  drivestrength, cc_data_temp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-brcmf_sdbrcm_chip_recognition(struct brcmf_sdio_dev *sdiodev,</div><div class='del'>-			      struct chip_info *ci, u32 regs)</div><div class='del'>-{</div><div class='del'>-	u32 regdata;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get CC core rev</div><div class='del'>-	 * Chipid is assume to be at offset 0 from regs arg</div><div class='del'>-	 * For different chiptypes or old sdio hosts w/o chipcommon,</div><div class='del'>-	 * other ways of recognition should be added here.</div><div class='del'>-	 */</div><div class='del'>-	ci-&gt;cccorebase = regs;</div><div class='del'>-	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-				CORE_CC_REG(ci-&gt;cccorebase, chipid), 4);</div><div class='del'>-	ci-&gt;chip = regdata &amp; CID_ID_MASK;</div><div class='del'>-	ci-&gt;chiprev = (regdata &amp; CID_REV_MASK) &gt;&gt; CID_REV_SHIFT;</div><div class='del'>-</div><div class='del'>-	brcmf_dbg(INFO, "chipid=0x%x chiprev=%d\n", ci-&gt;chip, ci-&gt;chiprev);</div><div class='del'>-</div><div class='del'>-	/* Address of cores for new chips should be added here */</div><div class='del'>-	switch (ci-&gt;chip) {</div><div class='del'>-	case BCM4329_CHIP_ID:</div><div class='del'>-		ci-&gt;buscorebase = BCM4329_CORE_BUS_BASE;</div><div class='del'>-		ci-&gt;ramcorebase = BCM4329_CORE_SOCRAM_BASE;</div><div class='del'>-		ci-&gt;armcorebase	= BCM4329_CORE_ARM_BASE;</div><div class='del'>-		ci-&gt;ramsize = BCM4329_RAMSIZE;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		brcmf_dbg(ERROR, "chipid 0x%x is not supported\n", ci-&gt;chip);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-		CORE_SB(ci-&gt;cccorebase, sbidhigh), 4);</div><div class='del'>-	ci-&gt;ccrev = SBCOREREV(regdata);</div><div class='del'>-</div><div class='del'>-	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-		CORE_CC_REG(ci-&gt;cccorebase, pmucapabilities), 4);</div><div class='del'>-	ci-&gt;pmurev = regdata &amp; PCAP_REV_MASK;</div><div class='del'>-</div><div class='del'>-	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-					CORE_SB(ci-&gt;buscorebase, sbidhigh), 4);</div><div class='del'>-	ci-&gt;buscorerev = SBCOREREV(regdata);</div><div class='del'>-	ci-&gt;buscoretype = (regdata &amp; SBIDH_CC_MASK) &gt;&gt; SBIDH_CC_SHIFT;</div><div class='del'>-</div><div class='del'>-	brcmf_dbg(INFO, "ccrev=%d, pmurev=%d, buscore rev/type=%d/0x%x\n",</div><div class='del'>-		  ci-&gt;ccrev, ci-&gt;pmurev, ci-&gt;buscorerev, ci-&gt;buscoretype);</div><div class='del'>-</div><div class='del'>-	/* get chipcommon capabilites */</div><div class='del'>-	ci-&gt;cccaps = brcmf_sdcard_reg_read(sdiodev,</div><div class='del'>-		CORE_CC_REG(ci-&gt;cccorebase, capabilities), 4);</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'>-brcmf_sdbrcm_chip_attach(struct brcmf_bus *bus, u32 regs)</div><div class='del'>-{</div><div class='del'>-	struct chip_info *ci;</div><div class='del'>-	int err;</div><div class='del'>-	u8 clkval, clkset;</div><div class='del'>-</div><div class='del'>-	brcmf_dbg(TRACE, "Enter\n");</div><div class='del'>-</div><div class='del'>-	/* alloc chip_info_t */</div><div class='del'>-	ci = kzalloc(sizeof(struct chip_info), GFP_ATOMIC);</div><div class='del'>-	if (NULL == ci)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* bus/core/clk setup for register access */</div><div class='del'>-	/* Try forcing SDIO core to do ALPAvail request only */</div><div class='del'>-	clkset = SBSDIO_FORCE_HW_CLKREQ_OFF | SBSDIO_ALP_AVAIL_REQ;</div><div class='del'>-	brcmf_sdcard_cfg_write(bus-&gt;sdiodev, SDIO_FUNC_1,</div><div class='del'>-			       SBSDIO_FUNC1_CHIPCLKCSR,	clkset, &amp;err);</div><div class='del'>-	if (err) {</div><div class='del'>-		brcmf_dbg(ERROR, "error writing for HT off\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If register supported, wait for ALPAvail and then force ALP */</div><div class='del'>-	/* This may take up to 15 milliseconds */</div><div class='del'>-	clkval = brcmf_sdcard_cfg_read(bus-&gt;sdiodev, SDIO_FUNC_1,</div><div class='del'>-			SBSDIO_FUNC1_CHIPCLKCSR, NULL);</div><div class='del'>-	if ((clkval &amp; ~SBSDIO_AVBITS) == clkset) {</div><div class='del'>-		SPINWAIT(((clkval =</div><div class='del'>-				brcmf_sdcard_cfg_read(bus-&gt;sdiodev, SDIO_FUNC_1,</div><div class='del'>-						SBSDIO_FUNC1_CHIPCLKCSR,</div><div class='del'>-						NULL)),</div><div class='del'>-				!SBSDIO_ALPAV(clkval)),</div><div class='del'>-				PMU_MAX_TRANSITION_DLY);</div><div class='del'>-		if (!SBSDIO_ALPAV(clkval)) {</div><div class='del'>-			brcmf_dbg(ERROR, "timeout on ALPAV wait, clkval 0x%02x\n",</div><div class='del'>-				  clkval);</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-		clkset = SBSDIO_FORCE_HW_CLKREQ_OFF |</div><div class='del'>-				SBSDIO_FORCE_ALP;</div><div class='del'>-		brcmf_sdcard_cfg_write(bus-&gt;sdiodev, SDIO_FUNC_1,</div><div class='del'>-				SBSDIO_FUNC1_CHIPCLKCSR,</div><div class='del'>-				clkset, &amp;err);</div><div class='del'>-		udelay(65);</div><div class='del'>-	} else {</div><div class='del'>-		brcmf_dbg(ERROR, "ChipClkCSR access: wrote 0x%02x read 0x%02x\n",</div><div class='del'>-			  clkset, clkval);</div><div class='del'>-		err = -EACCES;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Also, disable the extra SDIO pull-ups */</div><div class='del'>-	brcmf_sdcard_cfg_write(bus-&gt;sdiodev, SDIO_FUNC_1,</div><div class='del'>-			       SBSDIO_FUNC1_SDIOPULLUP, 0, NULL);</div><div class='del'>-</div><div class='del'>-	err = brcmf_sdbrcm_chip_recognition(bus-&gt;sdiodev, ci, regs);</div><div class='del'>-	if (err)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure any on-chip ARM is off (in case strapping is wrong),</div><div class='del'>-	 * or downloaded code was already running.</div><div class='del'>-	 */</div><div class='del'>-	brcmf_sdbrcm_chip_disablecore(bus-&gt;sdiodev, ci-&gt;armcorebase);</div><div class='del'>-</div><div class='del'>-	brcmf_sdcard_reg_write(bus-&gt;sdiodev,</div><div class='del'>-		CORE_CC_REG(ci-&gt;cccorebase, gpiopullup), 4, 0);</div><div class='del'>-	brcmf_sdcard_reg_write(bus-&gt;sdiodev,</div><div class='del'>-		CORE_CC_REG(ci-&gt;cccorebase, gpiopulldown), 4, 0);</div><div class='del'>-</div><div class='del'>-	/* Disable F2 to clear any intermediate frame state on the dongle */</div><div class='del'>-	brcmf_sdcard_cfg_write(bus-&gt;sdiodev, SDIO_FUNC_0, SDIO_CCCR_IOEx,</div><div class='del'>-		SDIO_FUNC_ENABLE_1, NULL);</div><div class='del'>-</div><div class='del'>-	/* WAR: cmd52 backplane read so core HW will drop ALPReq */</div><div class='del'>-	clkval = brcmf_sdcard_cfg_read(bus-&gt;sdiodev, SDIO_FUNC_1,</div><div class='del'>-			0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Done with backplane-dependent accesses, can drop clock... */</div><div class='del'>-	brcmf_sdcard_cfg_write(bus-&gt;sdiodev, SDIO_FUNC_1,</div><div class='del'>-			       SBSDIO_FUNC1_CHIPCLKCSR, 0, NULL);</div><div class='del'>-</div><div class='del'>-	bus-&gt;ci = ci;</div><div class='del'>-	return 0;</div><div class='del'>-fail:</div><div class='del'>-	bus-&gt;ci = NULL;</div><div class='del'>-	kfree(ci);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool</div><div class='del'>-brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, u32 regsva)</div><div class='add'>+brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva)</div><div class='ctx'> {</div><div class='ctx'> 	u8 clkctl = 0;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int reg_addr;</div><div class='ctx'> 	u32 reg_val;</div><div class='add'>+	u8 idx;</div><div class='ctx'> </div><div class='ctx'> 	bus-&gt;alp_only = true;</div><div class='ctx'> </div><div class='hunk'>@@ -4234,7 +3728,7 @@ brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, u32 regsva)</div><div class='ctx'> #endif				/* BCMDBG */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Force PLL off until brcmf_sdbrcm_chip_attach()</div><div class='add'>+	 * Force PLL off until brcmf_sdio_chip_attach()</div><div class='ctx'> 	 * programs PLL control regs</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='hunk'>@@ -4252,8 +3746,8 @@ brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, u32 regsva)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (brcmf_sdbrcm_chip_attach(bus, regsva)) {</div><div class='del'>-		brcmf_dbg(ERROR, "brcmf_sdbrcm_chip_attach failed!\n");</div><div class='add'>+	if (brcmf_sdio_chip_attach(bus-&gt;sdiodev, &amp;bus-&gt;ci, regsva)) {</div><div class='add'>+		brcmf_dbg(ERROR, "brcmf_sdio_chip_attach failed!\n");</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4262,11 +3756,10 @@ brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, u32 regsva)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	brcmf_sdbrcm_sdiod_drive_strength_init(bus, SDIO_DRIVE_STRENGTH);</div><div class='add'>+	brcmf_sdio_chip_drivestrengthinit(bus-&gt;sdiodev, bus-&gt;ci,</div><div class='add'>+					  SDIO_DRIVE_STRENGTH);</div><div class='ctx'> </div><div class='del'>-	/* Get info on the ARM and SOCRAM cores... */</div><div class='del'>-	brcmf_sdcard_reg_read(bus-&gt;sdiodev,</div><div class='del'>-		  CORE_SB(bus-&gt;ci-&gt;armcorebase, sbidhigh), 4);</div><div class='add'>+	/* Get info on the SOCRAM cores... */</div><div class='ctx'> 	bus-&gt;ramsize = bus-&gt;ci-&gt;ramsize;</div><div class='ctx'> 	if (!(bus-&gt;ramsize)) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "failed to find SOCRAM memory!\n");</div><div class='hunk'>@@ -4274,7 +3767,8 @@ brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, u32 regsva)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set core control so an SDIO reset does a backplane reset */</div><div class='del'>-	reg_addr = bus-&gt;ci-&gt;buscorebase +</div><div class='add'>+	idx = brcmf_sdio_chip_getinfidx(bus-&gt;ci, BCMA_CORE_SDIO_DEV);</div><div class='add'>+	reg_addr = bus-&gt;ci-&gt;c_inf[idx].base +</div><div class='ctx'> 		   offsetof(struct sdpcmd_regs, corecontrol);</div><div class='ctx'> 	reg_val = brcmf_sdcard_reg_read(bus-&gt;sdiodev, reg_addr, sizeof(u32));</div><div class='ctx'> 	brcmf_sdcard_reg_write(bus-&gt;sdiodev, reg_addr, sizeof(u32),</div><div class='hunk'>@@ -4298,7 +3792,7 @@ fail:</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool brcmf_sdbrcm_probe_init(struct brcmf_bus *bus)</div><div class='add'>+static bool brcmf_sdbrcm_probe_init(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='hunk'>@@ -4306,7 +3800,7 @@ static bool brcmf_sdbrcm_probe_init(struct brcmf_bus *bus)</div><div class='ctx'> 	brcmf_sdcard_cfg_write(bus-&gt;sdiodev, SDIO_FUNC_0, SDIO_CCCR_IOEx,</div><div class='ctx'> 			       SDIO_FUNC_ENABLE_1, NULL);</div><div class='ctx'> </div><div class='del'>-	bus-&gt;drvr-&gt;busstate = BRCMF_BUS_DOWN;</div><div class='add'>+	bus-&gt;sdiodev-&gt;bus_if-&gt;state = BRCMF_BUS_DOWN;</div><div class='ctx'> 	bus-&gt;sleeping = false;</div><div class='ctx'> 	bus-&gt;rxflow = false;</div><div class='ctx'> </div><div class='hunk'>@@ -4333,7 +3827,7 @@ static bool brcmf_sdbrcm_probe_init(struct brcmf_bus *bus)</div><div class='ctx'> static int</div><div class='ctx'> brcmf_sdbrcm_watchdog_thread(void *data)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_bus *bus = (struct brcmf_bus *)data;</div><div class='add'>+	struct brcmf_sdio *bus = (struct brcmf_sdio *)data;</div><div class='ctx'> </div><div class='ctx'> 	allow_signal(SIGTERM);</div><div class='ctx'> 	/* Run until signal received */</div><div class='hunk'>@@ -4341,9 +3835,9 @@ brcmf_sdbrcm_watchdog_thread(void *data)</div><div class='ctx'> 		if (kthread_should_stop())</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (!wait_for_completion_interruptible(&amp;bus-&gt;watchdog_wait)) {</div><div class='del'>-			brcmf_sdbrcm_bus_watchdog(bus-&gt;drvr);</div><div class='add'>+			brcmf_sdbrcm_bus_watchdog(bus);</div><div class='ctx'> 			/* Count the tick for reference */</div><div class='del'>-			bus-&gt;drvr-&gt;tickcnt++;</div><div class='add'>+			bus-&gt;tickcnt++;</div><div class='ctx'> 		} else</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4353,7 +3847,7 @@ brcmf_sdbrcm_watchdog_thread(void *data)</div><div class='ctx'> static void</div><div class='ctx'> brcmf_sdbrcm_watchdog(unsigned long data)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_bus *bus = (struct brcmf_bus *)data;</div><div class='add'>+	struct brcmf_sdio *bus = (struct brcmf_sdio *)data;</div><div class='ctx'> </div><div class='ctx'> 	if (bus-&gt;watchdog_tsk) {</div><div class='ctx'> 		complete(&amp;bus-&gt;watchdog_wait);</div><div class='hunk'>@@ -4364,23 +3858,14 @@ brcmf_sdbrcm_watchdog(unsigned long data)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-brcmf_sdbrcm_chip_detach(struct brcmf_bus *bus)</div><div class='del'>-{</div><div class='del'>-	brcmf_dbg(TRACE, "Enter\n");</div><div class='del'>-</div><div class='del'>-	kfree(bus-&gt;ci);</div><div class='del'>-	bus-&gt;ci = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void brcmf_sdbrcm_release_dongle(struct brcmf_bus *bus)</div><div class='add'>+static void brcmf_sdbrcm_release_dongle(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='ctx'> 	if (bus-&gt;ci) {</div><div class='ctx'> 		brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false);</div><div class='ctx'> 		brcmf_sdbrcm_clkctl(bus, CLK_NONE, false);</div><div class='del'>-		brcmf_sdbrcm_chip_detach(bus);</div><div class='add'>+		brcmf_sdio_chip_detach(&amp;bus-&gt;ci);</div><div class='ctx'> 		if (bus-&gt;vars &amp;&amp; bus-&gt;varsz)</div><div class='ctx'> 			kfree(bus-&gt;vars);</div><div class='ctx'> 		bus-&gt;vars = NULL;</div><div class='hunk'>@@ -4390,7 +3875,7 @@ static void brcmf_sdbrcm_release_dongle(struct brcmf_bus *bus)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Detach and free everything */</div><div class='del'>-static void brcmf_sdbrcm_release(struct brcmf_bus *bus)</div><div class='add'>+static void brcmf_sdbrcm_release(struct brcmf_sdio *bus)</div><div class='ctx'> {</div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='hunk'>@@ -4398,10 +3883,9 @@ static void brcmf_sdbrcm_release(struct brcmf_bus *bus)</div><div class='ctx'> 		/* De-register interrupt handler */</div><div class='ctx'> 		brcmf_sdcard_intr_dereg(bus-&gt;sdiodev);</div><div class='ctx'> </div><div class='del'>-		if (bus-&gt;drvr) {</div><div class='del'>-			brcmf_detach(bus-&gt;drvr);</div><div class='add'>+		if (bus-&gt;sdiodev-&gt;bus_if-&gt;drvr) {</div><div class='add'>+			brcmf_detach(bus-&gt;sdiodev-&gt;dev);</div><div class='ctx'> 			brcmf_sdbrcm_release_dongle(bus);</div><div class='del'>-			bus-&gt;drvr = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		brcmf_sdbrcm_release_malloc(bus);</div><div class='hunk'>@@ -4412,21 +3896,10 @@ static void brcmf_sdbrcm_release(struct brcmf_bus *bus)</div><div class='ctx'> 	brcmf_dbg(TRACE, "Disconnected\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,</div><div class='del'>-			 u32 regsva, struct brcmf_sdio_dev *sdiodev)</div><div class='add'>+void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct brcmf_bus *bus;</div><div class='del'>-</div><div class='del'>-	/* Init global variables at run-time, not as part of the declaration.</div><div class='del'>-	 * This is required to support init/de-init of the driver.</div><div class='del'>-	 * Initialization</div><div class='del'>-	 * of globals as part of the declaration results in non-deterministic</div><div class='del'>-	 * behavior since the value of the globals may be different on the</div><div class='del'>-	 * first time that the driver is initialized vs subsequent</div><div class='del'>-	 * initializations.</div><div class='del'>-	 */</div><div class='del'>-	brcmf_c_init();</div><div class='add'>+	struct brcmf_sdio *bus;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='hunk'>@@ -4434,12 +3907,13 @@ void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,</div><div class='ctx'> 	 * regsva == SI_ENUM_BASE*/</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate private bus interface state */</div><div class='del'>-	bus = kzalloc(sizeof(struct brcmf_bus), GFP_ATOMIC);</div><div class='add'>+	bus = kzalloc(sizeof(struct brcmf_sdio), GFP_ATOMIC);</div><div class='ctx'> 	if (!bus)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	bus-&gt;sdiodev = sdiodev;</div><div class='ctx'> 	sdiodev-&gt;bus = bus;</div><div class='add'>+	skb_queue_head_init(&amp;bus-&gt;glom);</div><div class='ctx'> 	bus-&gt;txbound = BRCMF_TXBOUND;</div><div class='ctx'> 	bus-&gt;rxbound = BRCMF_RXBOUND;</div><div class='ctx'> 	bus-&gt;txminmax = BRCMF_TXMINMAX;</div><div class='hunk'>@@ -4484,9 +3958,15 @@ void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,</div><div class='ctx'> 		bus-&gt;dpc_tsk = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Assign bus interface call back */</div><div class='add'>+	bus-&gt;sdiodev-&gt;bus_if-&gt;brcmf_bus_stop = brcmf_sdbrcm_bus_stop;</div><div class='add'>+	bus-&gt;sdiodev-&gt;bus_if-&gt;brcmf_bus_init = brcmf_sdbrcm_bus_init;</div><div class='add'>+	bus-&gt;sdiodev-&gt;bus_if-&gt;brcmf_bus_txdata = brcmf_sdbrcm_bus_txdata;</div><div class='add'>+	bus-&gt;sdiodev-&gt;bus_if-&gt;brcmf_bus_txctl = brcmf_sdbrcm_bus_txctl;</div><div class='add'>+	bus-&gt;sdiodev-&gt;bus_if-&gt;brcmf_bus_rxctl = brcmf_sdbrcm_bus_rxctl;</div><div class='ctx'> 	/* Attach to the brcmf/OS/network interface */</div><div class='del'>-	bus-&gt;drvr = brcmf_attach(bus, SDPCM_RESERVE);</div><div class='del'>-	if (!bus-&gt;drvr) {</div><div class='add'>+	ret = brcmf_attach(SDPCM_RESERVE, bus-&gt;sdiodev-&gt;dev);</div><div class='add'>+	if (ret != 0) {</div><div class='ctx'> 		brcmf_dbg(ERROR, "brcmf_attach failed\n");</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4514,16 +3994,17 @@ void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,</div><div class='ctx'> 	brcmf_dbg(INFO, "completed!!\n");</div><div class='ctx'> </div><div class='ctx'> 	/* if firmware path present try to download and bring up bus */</div><div class='del'>-	ret = brcmf_bus_start(bus-&gt;drvr);</div><div class='add'>+	ret = brcmf_bus_start(bus-&gt;sdiodev-&gt;dev);</div><div class='ctx'> 	if (ret != 0) {</div><div class='ctx'> 		if (ret == -ENOLINK) {</div><div class='ctx'> 			brcmf_dbg(ERROR, "dongle is not responding\n");</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	/* Ok, have the per-port tell the stack we're open for business */</div><div class='del'>-	if (brcmf_net_attach(bus-&gt;drvr, 0) != 0) {</div><div class='del'>-		brcmf_dbg(ERROR, "Net attach failed!!\n");</div><div class='add'>+</div><div class='add'>+	/* add interface and open for business */</div><div class='add'>+	if (brcmf_add_if(bus-&gt;sdiodev-&gt;dev, 0, "wlan%d", NULL)) {</div><div class='add'>+		brcmf_dbg(ERROR, "Add primary net device interface failed!!\n");</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4536,7 +4017,7 @@ fail:</div><div class='ctx'> </div><div class='ctx'> void brcmf_sdbrcm_disconnect(void *ptr)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_bus *bus = (struct brcmf_bus *)ptr;</div><div class='add'>+	struct brcmf_sdio *bus = (struct brcmf_sdio *)ptr;</div><div class='ctx'> </div><div class='ctx'> 	brcmf_dbg(TRACE, "Enter\n");</div><div class='ctx'> </div><div class='hunk'>@@ -4546,18 +4027,9 @@ void brcmf_sdbrcm_disconnect(void *ptr)</div><div class='ctx'> 	brcmf_dbg(TRACE, "Disconnected\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct device *brcmf_bus_get_device(struct brcmf_bus *bus)</div><div class='del'>-{</div><div class='del'>-	return &amp;bus-&gt;sdiodev-&gt;func[2]-&gt;dev;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void</div><div class='del'>-brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick)</div><div class='add'>+brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick)</div><div class='ctx'> {</div><div class='del'>-	/* don't start the wd until fw is loaded */</div><div class='del'>-	if (bus-&gt;drvr-&gt;busstate == BRCMF_BUS_DOWN)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	/* Totally stop the timer */</div><div class='ctx'> 	if (!wdtick &amp;&amp; bus-&gt;wd_timer_valid == true) {</div><div class='ctx'> 		del_timer_sync(&amp;bus-&gt;timer);</div><div class='hunk'>@@ -4566,6 +4038,10 @@ brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* don't start the wd until fw is loaded */</div><div class='add'>+	if (bus-&gt;sdiodev-&gt;bus_if-&gt;state == BRCMF_BUS_DOWN)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (wdtick) {</div><div class='ctx'> 		if (bus-&gt;save_ms != BRCMF_WD_POLL_MS) {</div><div class='ctx'> 			if (bus-&gt;wd_timer_valid == true)</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c<br/>new file mode 100644<br/>index 000000000000..11b2d7c97ba2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c</a></div><div class='hunk'>@@ -0,0 +1,607 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2011 Broadcom Corporation</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 ANY</div><div class='add'>+ * 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 ACTION</div><div class='add'>+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+/* ***** SDIO interface chip backplane handle functions ***** */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/mmc/card.h&gt;</div><div class='add'>+#include &lt;linux/ssb/ssb_regs.h&gt;</div><div class='add'>+#include &lt;linux/bcma/bcma.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;chipcommon.h&gt;</div><div class='add'>+#include &lt;brcm_hw_ids.h&gt;</div><div class='add'>+#include &lt;brcmu_wifi.h&gt;</div><div class='add'>+#include &lt;brcmu_utils.h&gt;</div><div class='add'>+#include &lt;soc.h&gt;</div><div class='add'>+#include "dhd_dbg.h"</div><div class='add'>+#include "sdio_host.h"</div><div class='add'>+#include "sdio_chip.h"</div><div class='add'>+</div><div class='add'>+/* chip core base &amp; ramsize */</div><div class='add'>+/* bcm4329 */</div><div class='add'>+/* SDIO device core, ID 0x829 */</div><div class='add'>+#define BCM4329_CORE_BUS_BASE		0x18011000</div><div class='add'>+/* internal memory core, ID 0x80e */</div><div class='add'>+#define BCM4329_CORE_SOCRAM_BASE	0x18003000</div><div class='add'>+/* ARM Cortex M3 core, ID 0x82a */</div><div class='add'>+#define BCM4329_CORE_ARM_BASE		0x18002000</div><div class='add'>+#define BCM4329_RAMSIZE			0x48000</div><div class='add'>+</div><div class='add'>+#define	SBCOREREV(sbidh) \</div><div class='add'>+	((((sbidh) &amp; SSB_IDHIGH_RCHI) &gt;&gt; SSB_IDHIGH_RCHI_SHIFT) | \</div><div class='add'>+	  ((sbidh) &amp; SSB_IDHIGH_RCLO))</div><div class='add'>+</div><div class='add'>+/* SOC Interconnect types (aka chip types) */</div><div class='add'>+#define SOCI_SB		0</div><div class='add'>+#define SOCI_AI		1</div><div class='add'>+</div><div class='add'>+/* EROM CompIdentB */</div><div class='add'>+#define CIB_REV_MASK		0xff000000</div><div class='add'>+#define CIB_REV_SHIFT		24</div><div class='add'>+</div><div class='add'>+#define SDIOD_DRVSTR_KEY(chip, pmu)     (((chip) &lt;&lt; 16) | (pmu))</div><div class='add'>+/* SDIO Pad drive strength to select value mappings */</div><div class='add'>+struct sdiod_drive_str {</div><div class='add'>+	u8 strength;	/* Pad Drive Strength in mA */</div><div class='add'>+	u8 sel;		/* Chip-specific select value */</div><div class='add'>+};</div><div class='add'>+/* SDIO Drive Strength to sel value table for PMU Rev 11 (1.8V) */</div><div class='add'>+static const struct sdiod_drive_str sdiod_drvstr_tab1_1v8[] = {</div><div class='add'>+	{32, 0x6},</div><div class='add'>+	{26, 0x7},</div><div class='add'>+	{22, 0x4},</div><div class='add'>+	{16, 0x5},</div><div class='add'>+	{12, 0x2},</div><div class='add'>+	{8, 0x3},</div><div class='add'>+	{4, 0x0},</div><div class='add'>+	{0, 0x1}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u8</div><div class='add'>+brcmf_sdio_chip_getinfidx(struct chip_info *ci, u16 coreid)</div><div class='add'>+{</div><div class='add'>+	u8 idx;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; BRCMF_MAX_CORENUM; idx++)</div><div class='add'>+		if (coreid == ci-&gt;c_inf[idx].id)</div><div class='add'>+			return idx;</div><div class='add'>+</div><div class='add'>+	return BRCMF_MAX_CORENUM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+brcmf_sdio_sb_corerev(struct brcmf_sdio_dev *sdiodev,</div><div class='add'>+		      struct chip_info *ci, u16 coreid)</div><div class='add'>+{</div><div class='add'>+	u32 regdata;</div><div class='add'>+	u8 idx;</div><div class='add'>+</div><div class='add'>+	idx = brcmf_sdio_chip_getinfidx(ci, coreid);</div><div class='add'>+</div><div class='add'>+	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+			CORE_SB(ci-&gt;c_inf[idx].base, sbidhigh), 4);</div><div class='add'>+	return SBCOREREV(regdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+brcmf_sdio_ai_corerev(struct brcmf_sdio_dev *sdiodev,</div><div class='add'>+		      struct chip_info *ci, u16 coreid)</div><div class='add'>+{</div><div class='add'>+	u8 idx;</div><div class='add'>+</div><div class='add'>+	idx = brcmf_sdio_chip_getinfidx(ci, coreid);</div><div class='add'>+</div><div class='add'>+	return (ci-&gt;c_inf[idx].cib &amp; CIB_REV_MASK) &gt;&gt; CIB_REV_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+brcmf_sdio_sb_iscoreup(struct brcmf_sdio_dev *sdiodev,</div><div class='add'>+		       struct chip_info *ci, u16 coreid)</div><div class='add'>+{</div><div class='add'>+	u32 regdata;</div><div class='add'>+	u8 idx;</div><div class='add'>+</div><div class='add'>+	idx = brcmf_sdio_chip_getinfidx(ci, coreid);</div><div class='add'>+</div><div class='add'>+	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+			CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatelow), 4);</div><div class='add'>+	regdata &amp;= (SSB_TMSLOW_RESET | SSB_TMSLOW_REJECT |</div><div class='add'>+		    SSB_IMSTATE_REJECT | SSB_TMSLOW_CLOCK);</div><div class='add'>+	return (SSB_TMSLOW_CLOCK == regdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+brcmf_sdio_ai_iscoreup(struct brcmf_sdio_dev *sdiodev,</div><div class='add'>+		       struct chip_info *ci, u16 coreid)</div><div class='add'>+{</div><div class='add'>+	u32 regdata;</div><div class='add'>+	u8 idx;</div><div class='add'>+	bool ret;</div><div class='add'>+</div><div class='add'>+	idx = brcmf_sdio_chip_getinfidx(ci, coreid);</div><div class='add'>+</div><div class='add'>+	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+					ci-&gt;c_inf[idx].wrapbase+BCMA_IOCTL, 4);</div><div class='add'>+	ret = (regdata &amp; (BCMA_IOCTL_FGC | BCMA_IOCTL_CLK)) == BCMA_IOCTL_CLK;</div><div class='add'>+</div><div class='add'>+	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+					ci-&gt;c_inf[idx].wrapbase+BCMA_RESET_CTL,</div><div class='add'>+					4);</div><div class='add'>+	ret = ret &amp;&amp; ((regdata &amp; BCMA_RESET_CTL_RESET) == 0);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+brcmf_sdio_sb_coredisable(struct brcmf_sdio_dev *sdiodev,</div><div class='add'>+			  struct chip_info *ci, u16 coreid)</div><div class='add'>+{</div><div class='add'>+	u32 regdata;</div><div class='add'>+	u8 idx;</div><div class='add'>+</div><div class='add'>+	idx = brcmf_sdio_chip_getinfidx(ci, coreid);</div><div class='add'>+</div><div class='add'>+	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+		CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatelow), 4);</div><div class='add'>+	if (regdata &amp; SSB_TMSLOW_RESET)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+		CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatelow), 4);</div><div class='add'>+	if ((regdata &amp; SSB_TMSLOW_CLOCK) != 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * set target reject and spin until busy is clear</div><div class='add'>+		 * (preserve core-specific bits)</div><div class='add'>+		 */</div><div class='add'>+		regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+			CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatelow), 4);</div><div class='add'>+		brcmf_sdcard_reg_write(sdiodev,</div><div class='add'>+				CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatelow),</div><div class='add'>+				4, regdata | SSB_TMSLOW_REJECT);</div><div class='add'>+</div><div class='add'>+		regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+			CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatelow), 4);</div><div class='add'>+		udelay(1);</div><div class='add'>+		SPINWAIT((brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+			CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatehigh), 4) &amp;</div><div class='add'>+			SSB_TMSHIGH_BUSY), 100000);</div><div class='add'>+</div><div class='add'>+		regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+			CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatehigh), 4);</div><div class='add'>+		if (regdata &amp; SSB_TMSHIGH_BUSY)</div><div class='add'>+			brcmf_dbg(ERROR, "core state still busy\n");</div><div class='add'>+</div><div class='add'>+		regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+			CORE_SB(ci-&gt;c_inf[idx].base, sbidlow), 4);</div><div class='add'>+		if (regdata &amp; SSB_IDLOW_INITIATOR) {</div><div class='add'>+			regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+				CORE_SB(ci-&gt;c_inf[idx].base, sbimstate), 4) |</div><div class='add'>+				SSB_IMSTATE_REJECT;</div><div class='add'>+			brcmf_sdcard_reg_write(sdiodev,</div><div class='add'>+				CORE_SB(ci-&gt;c_inf[idx].base, sbimstate), 4,</div><div class='add'>+				regdata);</div><div class='add'>+			regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+				CORE_SB(ci-&gt;c_inf[idx].base, sbimstate), 4);</div><div class='add'>+			udelay(1);</div><div class='add'>+			SPINWAIT((brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+				CORE_SB(ci-&gt;c_inf[idx].base, sbimstate), 4) &amp;</div><div class='add'>+				SSB_IMSTATE_BUSY), 100000);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* set reset and reject while enabling the clocks */</div><div class='add'>+		brcmf_sdcard_reg_write(sdiodev,</div><div class='add'>+			CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatelow), 4,</div><div class='add'>+			(SSB_TMSLOW_FGC | SSB_TMSLOW_CLOCK |</div><div class='add'>+			SSB_TMSLOW_REJECT | SSB_TMSLOW_RESET));</div><div class='add'>+		regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+			CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatelow), 4);</div><div class='add'>+		udelay(10);</div><div class='add'>+</div><div class='add'>+		/* clear the initiator reject bit */</div><div class='add'>+		regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+			CORE_SB(ci-&gt;c_inf[idx].base, sbidlow), 4);</div><div class='add'>+		if (regdata &amp; SSB_IDLOW_INITIATOR) {</div><div class='add'>+			regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+				CORE_SB(ci-&gt;c_inf[idx].base, sbimstate), 4) &amp;</div><div class='add'>+				~SSB_IMSTATE_REJECT;</div><div class='add'>+			brcmf_sdcard_reg_write(sdiodev,</div><div class='add'>+				CORE_SB(ci-&gt;c_inf[idx].base, sbimstate), 4,</div><div class='add'>+				regdata);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* leave reset and reject asserted */</div><div class='add'>+	brcmf_sdcard_reg_write(sdiodev,</div><div class='add'>+		CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatelow), 4,</div><div class='add'>+		(SSB_TMSLOW_REJECT | SSB_TMSLOW_RESET));</div><div class='add'>+	udelay(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+brcmf_sdio_ai_coredisable(struct brcmf_sdio_dev *sdiodev,</div><div class='add'>+			  struct chip_info *ci, u16 coreid)</div><div class='add'>+{</div><div class='add'>+	u8 idx;</div><div class='add'>+	u32 regdata;</div><div class='add'>+</div><div class='add'>+	idx = brcmf_sdio_chip_getinfidx(ci, coreid);</div><div class='add'>+</div><div class='add'>+	/* if core is already in reset, just return */</div><div class='add'>+	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+					ci-&gt;c_inf[idx].wrapbase+BCMA_RESET_CTL,</div><div class='add'>+					4);</div><div class='add'>+	if ((regdata &amp; BCMA_RESET_CTL_RESET) != 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	brcmf_sdcard_reg_write(sdiodev, ci-&gt;c_inf[idx].wrapbase+BCMA_IOCTL,</div><div class='add'>+			       4, 0);</div><div class='add'>+	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+					ci-&gt;c_inf[idx].wrapbase+BCMA_IOCTL, 4);</div><div class='add'>+	udelay(10);</div><div class='add'>+</div><div class='add'>+	brcmf_sdcard_reg_write(sdiodev, ci-&gt;c_inf[idx].wrapbase+BCMA_RESET_CTL,</div><div class='add'>+			       4, BCMA_RESET_CTL_RESET);</div><div class='add'>+	udelay(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+brcmf_sdio_sb_resetcore(struct brcmf_sdio_dev *sdiodev,</div><div class='add'>+			struct chip_info *ci, u16 coreid)</div><div class='add'>+{</div><div class='add'>+	u32 regdata;</div><div class='add'>+	u8 idx;</div><div class='add'>+</div><div class='add'>+	idx = brcmf_sdio_chip_getinfidx(ci, coreid);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Must do the disable sequence first to work for</div><div class='add'>+	 * arbitrary current core state.</div><div class='add'>+	 */</div><div class='add'>+	brcmf_sdio_sb_coredisable(sdiodev, ci, coreid);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now do the initialization sequence.</div><div class='add'>+	 * set reset while enabling the clock and</div><div class='add'>+	 * forcing them on throughout the core</div><div class='add'>+	 */</div><div class='add'>+	brcmf_sdcard_reg_write(sdiodev,</div><div class='add'>+			CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatelow), 4,</div><div class='add'>+			SSB_TMSLOW_FGC | SSB_TMSLOW_CLOCK | SSB_TMSLOW_RESET);</div><div class='add'>+	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+				CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatelow), 4);</div><div class='add'>+	udelay(1);</div><div class='add'>+</div><div class='add'>+	/* clear any serror */</div><div class='add'>+	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+				CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatehigh), 4);</div><div class='add'>+	if (regdata &amp; SSB_TMSHIGH_SERR)</div><div class='add'>+		brcmf_sdcard_reg_write(sdiodev,</div><div class='add'>+			CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatehigh), 4, 0);</div><div class='add'>+</div><div class='add'>+	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+				CORE_SB(ci-&gt;c_inf[idx].base, sbimstate), 4);</div><div class='add'>+	if (regdata &amp; (SSB_IMSTATE_IBE | SSB_IMSTATE_TO))</div><div class='add'>+		brcmf_sdcard_reg_write(sdiodev,</div><div class='add'>+			CORE_SB(ci-&gt;c_inf[idx].base, sbimstate), 4,</div><div class='add'>+			regdata &amp; ~(SSB_IMSTATE_IBE | SSB_IMSTATE_TO));</div><div class='add'>+</div><div class='add'>+	/* clear reset and allow it to propagate throughout the core */</div><div class='add'>+	brcmf_sdcard_reg_write(sdiodev,</div><div class='add'>+		CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatelow), 4,</div><div class='add'>+		SSB_TMSLOW_FGC | SSB_TMSLOW_CLOCK);</div><div class='add'>+	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+				CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatelow), 4);</div><div class='add'>+	udelay(1);</div><div class='add'>+</div><div class='add'>+	/* leave clock enabled */</div><div class='add'>+	brcmf_sdcard_reg_write(sdiodev,</div><div class='add'>+			       CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatelow),</div><div class='add'>+			       4, SSB_TMSLOW_CLOCK);</div><div class='add'>+	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+				CORE_SB(ci-&gt;c_inf[idx].base, sbtmstatelow), 4);</div><div class='add'>+	udelay(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+brcmf_sdio_ai_resetcore(struct brcmf_sdio_dev *sdiodev,</div><div class='add'>+			struct chip_info *ci, u16 coreid)</div><div class='add'>+{</div><div class='add'>+	u8 idx;</div><div class='add'>+	u32 regdata;</div><div class='add'>+</div><div class='add'>+	idx = brcmf_sdio_chip_getinfidx(ci, coreid);</div><div class='add'>+</div><div class='add'>+	/* must disable first to work for arbitrary current core state */</div><div class='add'>+	brcmf_sdio_ai_coredisable(sdiodev, ci, coreid);</div><div class='add'>+</div><div class='add'>+	/* now do initialization sequence */</div><div class='add'>+	brcmf_sdcard_reg_write(sdiodev, ci-&gt;c_inf[idx].wrapbase+BCMA_IOCTL,</div><div class='add'>+			       4, BCMA_IOCTL_FGC | BCMA_IOCTL_CLK);</div><div class='add'>+	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+					ci-&gt;c_inf[idx].wrapbase+BCMA_IOCTL, 4);</div><div class='add'>+	brcmf_sdcard_reg_write(sdiodev, ci-&gt;c_inf[idx].wrapbase+BCMA_RESET_CTL,</div><div class='add'>+			       4, 0);</div><div class='add'>+	udelay(1);</div><div class='add'>+</div><div class='add'>+	brcmf_sdcard_reg_write(sdiodev, ci-&gt;c_inf[idx].wrapbase+BCMA_IOCTL,</div><div class='add'>+			       4, BCMA_IOCTL_CLK);</div><div class='add'>+	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+					ci-&gt;c_inf[idx].wrapbase+BCMA_IOCTL, 4);</div><div class='add'>+	udelay(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev,</div><div class='add'>+				       struct chip_info *ci, u32 regs)</div><div class='add'>+{</div><div class='add'>+	u32 regdata;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Get CC core rev</div><div class='add'>+	 * Chipid is assume to be at offset 0 from regs arg</div><div class='add'>+	 * For different chiptypes or old sdio hosts w/o chipcommon,</div><div class='add'>+	 * other ways of recognition should be added here.</div><div class='add'>+	 */</div><div class='add'>+	ci-&gt;c_inf[0].id = BCMA_CORE_CHIPCOMMON;</div><div class='add'>+	ci-&gt;c_inf[0].base = regs;</div><div class='add'>+	regdata = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+			CORE_CC_REG(ci-&gt;c_inf[0].base, chipid), 4);</div><div class='add'>+	ci-&gt;chip = regdata &amp; CID_ID_MASK;</div><div class='add'>+	ci-&gt;chiprev = (regdata &amp; CID_REV_MASK) &gt;&gt; CID_REV_SHIFT;</div><div class='add'>+	ci-&gt;socitype = (regdata &amp; CID_TYPE_MASK) &gt;&gt; CID_TYPE_SHIFT;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(INFO, "chipid=0x%x chiprev=%d\n", ci-&gt;chip, ci-&gt;chiprev);</div><div class='add'>+</div><div class='add'>+	/* Address of cores for new chips should be added here */</div><div class='add'>+	switch (ci-&gt;chip) {</div><div class='add'>+	case BCM4329_CHIP_ID:</div><div class='add'>+		ci-&gt;c_inf[1].id = BCMA_CORE_SDIO_DEV;</div><div class='add'>+		ci-&gt;c_inf[1].base = BCM4329_CORE_BUS_BASE;</div><div class='add'>+		ci-&gt;c_inf[2].id = BCMA_CORE_INTERNAL_MEM;</div><div class='add'>+		ci-&gt;c_inf[2].base = BCM4329_CORE_SOCRAM_BASE;</div><div class='add'>+		ci-&gt;c_inf[3].id = BCMA_CORE_ARM_CM3;</div><div class='add'>+		ci-&gt;c_inf[3].base = BCM4329_CORE_ARM_BASE;</div><div class='add'>+		ci-&gt;ramsize = BCM4329_RAMSIZE;</div><div class='add'>+		break;</div><div class='add'>+	case BCM4330_CHIP_ID:</div><div class='add'>+		ci-&gt;c_inf[0].wrapbase = 0x18100000;</div><div class='add'>+		ci-&gt;c_inf[0].cib = 0x27004211;</div><div class='add'>+		ci-&gt;c_inf[1].id = BCMA_CORE_SDIO_DEV;</div><div class='add'>+		ci-&gt;c_inf[1].base = 0x18002000;</div><div class='add'>+		ci-&gt;c_inf[1].wrapbase = 0x18102000;</div><div class='add'>+		ci-&gt;c_inf[1].cib = 0x07004211;</div><div class='add'>+		ci-&gt;c_inf[2].id = BCMA_CORE_INTERNAL_MEM;</div><div class='add'>+		ci-&gt;c_inf[2].base = 0x18004000;</div><div class='add'>+		ci-&gt;c_inf[2].wrapbase = 0x18104000;</div><div class='add'>+		ci-&gt;c_inf[2].cib = 0x0d080401;</div><div class='add'>+		ci-&gt;c_inf[3].id = BCMA_CORE_ARM_CM3;</div><div class='add'>+		ci-&gt;c_inf[3].base = 0x18003000;</div><div class='add'>+		ci-&gt;c_inf[3].wrapbase = 0x18103000;</div><div class='add'>+		ci-&gt;c_inf[3].cib = 0x03004211;</div><div class='add'>+		ci-&gt;ramsize = 0x48000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		brcmf_dbg(ERROR, "chipid 0x%x is not supported\n", ci-&gt;chip);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ci-&gt;socitype) {</div><div class='add'>+	case SOCI_SB:</div><div class='add'>+		ci-&gt;iscoreup = brcmf_sdio_sb_iscoreup;</div><div class='add'>+		ci-&gt;corerev = brcmf_sdio_sb_corerev;</div><div class='add'>+		ci-&gt;coredisable = brcmf_sdio_sb_coredisable;</div><div class='add'>+		ci-&gt;resetcore = brcmf_sdio_sb_resetcore;</div><div class='add'>+		break;</div><div class='add'>+	case SOCI_AI:</div><div class='add'>+		ci-&gt;iscoreup = brcmf_sdio_ai_iscoreup;</div><div class='add'>+		ci-&gt;corerev = brcmf_sdio_ai_corerev;</div><div class='add'>+		ci-&gt;coredisable = brcmf_sdio_ai_coredisable;</div><div class='add'>+		ci-&gt;resetcore = brcmf_sdio_ai_resetcore;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		brcmf_dbg(ERROR, "socitype %u not supported\n", ci-&gt;socitype);</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</div><div class='add'>+brcmf_sdio_chip_buscoreprep(struct brcmf_sdio_dev *sdiodev)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	u8 clkval, clkset;</div><div class='add'>+</div><div class='add'>+	/* Try forcing SDIO core to do ALPAvail request only */</div><div class='add'>+	clkset = SBSDIO_FORCE_HW_CLKREQ_OFF | SBSDIO_ALP_AVAIL_REQ;</div><div class='add'>+	brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_1,</div><div class='add'>+			       SBSDIO_FUNC1_CHIPCLKCSR,	clkset, &amp;err);</div><div class='add'>+	if (err) {</div><div class='add'>+		brcmf_dbg(ERROR, "error writing for HT off\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If register supported, wait for ALPAvail and then force ALP */</div><div class='add'>+	/* This may take up to 15 milliseconds */</div><div class='add'>+	clkval = brcmf_sdcard_cfg_read(sdiodev, SDIO_FUNC_1,</div><div class='add'>+				       SBSDIO_FUNC1_CHIPCLKCSR, NULL);</div><div class='add'>+</div><div class='add'>+	if ((clkval &amp; ~SBSDIO_AVBITS) != clkset) {</div><div class='add'>+		brcmf_dbg(ERROR, "ChipClkCSR access: wrote 0x%02x read 0x%02x\n",</div><div class='add'>+			  clkset, clkval);</div><div class='add'>+		return -EACCES;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	SPINWAIT(((clkval = brcmf_sdcard_cfg_read(sdiodev, SDIO_FUNC_1,</div><div class='add'>+				SBSDIO_FUNC1_CHIPCLKCSR, NULL)),</div><div class='add'>+			!SBSDIO_ALPAV(clkval)),</div><div class='add'>+			PMU_MAX_TRANSITION_DLY);</div><div class='add'>+	if (!SBSDIO_ALPAV(clkval)) {</div><div class='add'>+		brcmf_dbg(ERROR, "timeout on ALPAV wait, clkval 0x%02x\n",</div><div class='add'>+			  clkval);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clkset = SBSDIO_FORCE_HW_CLKREQ_OFF | SBSDIO_FORCE_ALP;</div><div class='add'>+	brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_1,</div><div class='add'>+			       SBSDIO_FUNC1_CHIPCLKCSR, clkset, &amp;err);</div><div class='add'>+	udelay(65);</div><div class='add'>+</div><div class='add'>+	/* Also, disable the extra SDIO pull-ups */</div><div class='add'>+	brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_1,</div><div class='add'>+			       SBSDIO_FUNC1_SDIOPULLUP, 0, 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</div><div class='add'>+brcmf_sdio_chip_buscoresetup(struct brcmf_sdio_dev *sdiodev,</div><div class='add'>+			     struct chip_info *ci)</div><div class='add'>+{</div><div class='add'>+	/* get chipcommon rev */</div><div class='add'>+	ci-&gt;c_inf[0].rev = ci-&gt;corerev(sdiodev, ci, ci-&gt;c_inf[0].id);</div><div class='add'>+</div><div class='add'>+	/* get chipcommon capabilites */</div><div class='add'>+	ci-&gt;c_inf[0].caps =</div><div class='add'>+		brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+		CORE_CC_REG(ci-&gt;c_inf[0].base, capabilities), 4);</div><div class='add'>+</div><div class='add'>+	/* get pmu caps &amp; rev */</div><div class='add'>+	if (ci-&gt;c_inf[0].caps &amp; CC_CAP_PMU) {</div><div class='add'>+		ci-&gt;pmucaps = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+			CORE_CC_REG(ci-&gt;c_inf[0].base, pmucapabilities), 4);</div><div class='add'>+		ci-&gt;pmurev = ci-&gt;pmucaps &amp; PCAP_REV_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ci-&gt;c_inf[1].rev = ci-&gt;corerev(sdiodev, ci, ci-&gt;c_inf[1].id);</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(INFO, "ccrev=%d, pmurev=%d, buscore rev/type=%d/0x%x\n",</div><div class='add'>+		  ci-&gt;c_inf[0].rev, ci-&gt;pmurev,</div><div class='add'>+		  ci-&gt;c_inf[1].rev, ci-&gt;c_inf[1].id);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure any on-chip ARM is off (in case strapping is wrong),</div><div class='add'>+	 * or downloaded code was already running.</div><div class='add'>+	 */</div><div class='add'>+	ci-&gt;coredisable(sdiodev, ci, BCMA_CORE_ARM_CM3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev,</div><div class='add'>+			   struct chip_info **ci_ptr, u32 regs)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct chip_info *ci;</div><div class='add'>+</div><div class='add'>+	brcmf_dbg(TRACE, "Enter\n");</div><div class='add'>+</div><div class='add'>+	/* alloc chip_info_t */</div><div class='add'>+	ci = kzalloc(sizeof(struct chip_info), GFP_ATOMIC);</div><div class='add'>+	if (!ci)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = brcmf_sdio_chip_buscoreprep(sdiodev);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = brcmf_sdio_chip_recognition(sdiodev, ci, regs);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	brcmf_sdio_chip_buscoresetup(sdiodev, ci);</div><div class='add'>+</div><div class='add'>+	brcmf_sdcard_reg_write(sdiodev,</div><div class='add'>+		CORE_CC_REG(ci-&gt;c_inf[0].base, gpiopullup), 4, 0);</div><div class='add'>+	brcmf_sdcard_reg_write(sdiodev,</div><div class='add'>+		CORE_CC_REG(ci-&gt;c_inf[0].base, gpiopulldown), 4, 0);</div><div class='add'>+</div><div class='add'>+	*ci_ptr = ci;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	kfree(ci);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+brcmf_sdio_chip_detach(struct chip_info **ci_ptr)</div><div class='add'>+{</div><div class='add'>+	brcmf_dbg(TRACE, "Enter\n");</div><div class='add'>+</div><div class='add'>+	kfree(*ci_ptr);</div><div class='add'>+	*ci_ptr = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *brcmf_sdio_chip_name(uint chipid, char *buf, uint len)</div><div class='add'>+{</div><div class='add'>+	const char *fmt;</div><div class='add'>+</div><div class='add'>+	fmt = ((chipid &gt; 0xa000) || (chipid &lt; 0x4000)) ? "%d" : "%x";</div><div class='add'>+	snprintf(buf, len, fmt, chipid);</div><div class='add'>+	return buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev,</div><div class='add'>+				  struct chip_info *ci, u32 drivestrength)</div><div class='add'>+{</div><div class='add'>+	struct sdiod_drive_str *str_tab = NULL;</div><div class='add'>+	u32 str_mask = 0;</div><div class='add'>+	u32 str_shift = 0;</div><div class='add'>+	char chn[8];</div><div class='add'>+</div><div class='add'>+	if (!(ci-&gt;c_inf[0].caps &amp; CC_CAP_PMU))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (SDIOD_DRVSTR_KEY(ci-&gt;chip, ci-&gt;pmurev)) {</div><div class='add'>+	case SDIOD_DRVSTR_KEY(BCM4330_CHIP_ID, 12):</div><div class='add'>+		str_tab = (struct sdiod_drive_str *)&amp;sdiod_drvstr_tab1_1v8;</div><div class='add'>+		str_mask = 0x00003800;</div><div class='add'>+		str_shift = 11;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		brcmf_dbg(ERROR, "No SDIO Drive strength init done for chip %s rev %d pmurev %d\n",</div><div class='add'>+			  brcmf_sdio_chip_name(ci-&gt;chip, chn, 8),</div><div class='add'>+			  ci-&gt;chiprev, ci-&gt;pmurev);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (str_tab != NULL) {</div><div class='add'>+		u32 drivestrength_sel = 0;</div><div class='add'>+		u32 cc_data_temp;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; str_tab[i].strength != 0; i++) {</div><div class='add'>+			if (drivestrength &gt;= str_tab[i].strength) {</div><div class='add'>+				drivestrength_sel = str_tab[i].sel;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		brcmf_sdcard_reg_write(sdiodev,</div><div class='add'>+			CORE_CC_REG(ci-&gt;c_inf[0].base, chipcontrol_addr),</div><div class='add'>+			4, 1);</div><div class='add'>+		cc_data_temp = brcmf_sdcard_reg_read(sdiodev,</div><div class='add'>+			CORE_CC_REG(ci-&gt;c_inf[0].base, chipcontrol_addr), 4);</div><div class='add'>+		cc_data_temp &amp;= ~str_mask;</div><div class='add'>+		drivestrength_sel &lt;&lt;= str_shift;</div><div class='add'>+		cc_data_temp |= drivestrength_sel;</div><div class='add'>+		brcmf_sdcard_reg_write(sdiodev,</div><div class='add'>+			CORE_CC_REG(ci-&gt;c_inf[0].base, chipcontrol_addr),</div><div class='add'>+			4, cc_data_temp);</div><div class='add'>+</div><div class='add'>+		brcmf_dbg(INFO, "SDIO: %dmA drive strength selected, set to 0x%08x\n",</div><div class='add'>+			  drivestrength, cc_data_temp);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h<br/>new file mode 100644<br/>index 000000000000..ce974d76bd92<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h</a></div><div class='hunk'>@@ -0,0 +1,136 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2011 Broadcom Corporation</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 ANY</div><div class='add'>+ * 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 ACTION</div><div class='add'>+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _BRCMFMAC_SDIO_CHIP_H_</div><div class='add'>+#define _BRCMFMAC_SDIO_CHIP_H_</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Core reg address translation.</div><div class='add'>+ * Both macro's returns a 32 bits byte address on the backplane bus.</div><div class='add'>+ */</div><div class='add'>+#define CORE_CC_REG(base, field) \</div><div class='add'>+		(base + offsetof(struct chipcregs, field))</div><div class='add'>+#define CORE_BUS_REG(base, field) \</div><div class='add'>+		(base + offsetof(struct sdpcmd_regs, field))</div><div class='add'>+#define CORE_SB(base, field) \</div><div class='add'>+		(base + SBCONFIGOFF + offsetof(struct sbconfig, field))</div><div class='add'>+</div><div class='add'>+/* SDIO function 1 register CHIPCLKCSR */</div><div class='add'>+/* Force ALP request to backplane */</div><div class='add'>+#define SBSDIO_FORCE_ALP		0x01</div><div class='add'>+/* Force HT request to backplane */</div><div class='add'>+#define SBSDIO_FORCE_HT			0x02</div><div class='add'>+/* Force ILP request to backplane */</div><div class='add'>+#define SBSDIO_FORCE_ILP		0x04</div><div class='add'>+/* Make ALP ready (power up xtal) */</div><div class='add'>+#define SBSDIO_ALP_AVAIL_REQ		0x08</div><div class='add'>+/* Make HT ready (power up PLL) */</div><div class='add'>+#define SBSDIO_HT_AVAIL_REQ		0x10</div><div class='add'>+/* Squelch clock requests from HW */</div><div class='add'>+#define SBSDIO_FORCE_HW_CLKREQ_OFF	0x20</div><div class='add'>+/* Status: ALP is ready */</div><div class='add'>+#define SBSDIO_ALP_AVAIL		0x40</div><div class='add'>+/* Status: HT is ready */</div><div class='add'>+#define SBSDIO_HT_AVAIL			0x80</div><div class='add'>+#define SBSDIO_AVBITS		(SBSDIO_HT_AVAIL | SBSDIO_ALP_AVAIL)</div><div class='add'>+#define SBSDIO_ALPAV(regval)	((regval) &amp; SBSDIO_AVBITS)</div><div class='add'>+#define SBSDIO_HTAV(regval)	(((regval) &amp; SBSDIO_AVBITS) == SBSDIO_AVBITS)</div><div class='add'>+#define SBSDIO_ALPONLY(regval)	(SBSDIO_ALPAV(regval) &amp;&amp; !SBSDIO_HTAV(regval))</div><div class='add'>+#define SBSDIO_CLKAV(regval, alponly) \</div><div class='add'>+	(SBSDIO_ALPAV(regval) &amp;&amp; (alponly ? 1 : SBSDIO_HTAV(regval)))</div><div class='add'>+</div><div class='add'>+#define BRCMF_MAX_CORENUM	6</div><div class='add'>+</div><div class='add'>+struct chip_core_info {</div><div class='add'>+	u16 id;</div><div class='add'>+	u16 rev;</div><div class='add'>+	u32 base;</div><div class='add'>+	u32 wrapbase;</div><div class='add'>+	u32 caps;</div><div class='add'>+	u32 cib;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct chip_info {</div><div class='add'>+	u32 chip;</div><div class='add'>+	u32 chiprev;</div><div class='add'>+	u32 socitype;</div><div class='add'>+	/* core info */</div><div class='add'>+	/* always put chipcommon core at 0, bus core at 1 */</div><div class='add'>+	struct chip_core_info c_inf[BRCMF_MAX_CORENUM];</div><div class='add'>+	u32 pmurev;</div><div class='add'>+	u32 pmucaps;</div><div class='add'>+	u32 ramsize;</div><div class='add'>+</div><div class='add'>+	bool (*iscoreup)(struct brcmf_sdio_dev *sdiodev, struct chip_info *ci,</div><div class='add'>+			 u16 coreid);</div><div class='add'>+	u32 (*corerev)(struct brcmf_sdio_dev *sdiodev, struct chip_info *ci,</div><div class='add'>+			 u16 coreid);</div><div class='add'>+	void (*coredisable)(struct brcmf_sdio_dev *sdiodev,</div><div class='add'>+			struct chip_info *ci, u16 coreid);</div><div class='add'>+	void (*resetcore)(struct brcmf_sdio_dev *sdiodev,</div><div class='add'>+			struct chip_info *ci, u16 coreid);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sbconfig {</div><div class='add'>+	u32 PAD[2];</div><div class='add'>+	u32 sbipsflag;	/* initiator port ocp slave flag */</div><div class='add'>+	u32 PAD[3];</div><div class='add'>+	u32 sbtpsflag;	/* target port ocp slave flag */</div><div class='add'>+	u32 PAD[11];</div><div class='add'>+	u32 sbtmerrloga;	/* (sonics &gt;= 2.3) */</div><div class='add'>+	u32 PAD;</div><div class='add'>+	u32 sbtmerrlog;	/* (sonics &gt;= 2.3) */</div><div class='add'>+	u32 PAD[3];</div><div class='add'>+	u32 sbadmatch3;	/* address match3 */</div><div class='add'>+	u32 PAD;</div><div class='add'>+	u32 sbadmatch2;	/* address match2 */</div><div class='add'>+	u32 PAD;</div><div class='add'>+	u32 sbadmatch1;	/* address match1 */</div><div class='add'>+	u32 PAD[7];</div><div class='add'>+	u32 sbimstate;	/* initiator agent state */</div><div class='add'>+	u32 sbintvec;	/* interrupt mask */</div><div class='add'>+	u32 sbtmstatelow;	/* target state */</div><div class='add'>+	u32 sbtmstatehigh;	/* target state */</div><div class='add'>+	u32 sbbwa0;		/* bandwidth allocation table0 */</div><div class='add'>+	u32 PAD;</div><div class='add'>+	u32 sbimconfiglow;	/* initiator configuration */</div><div class='add'>+	u32 sbimconfighigh;	/* initiator configuration */</div><div class='add'>+	u32 sbadmatch0;	/* address match0 */</div><div class='add'>+	u32 PAD;</div><div class='add'>+	u32 sbtmconfiglow;	/* target configuration */</div><div class='add'>+	u32 sbtmconfighigh;	/* target configuration */</div><div class='add'>+	u32 sbbconfig;	/* broadcast configuration */</div><div class='add'>+	u32 PAD;</div><div class='add'>+	u32 sbbstate;	/* broadcast state */</div><div class='add'>+	u32 PAD[3];</div><div class='add'>+	u32 sbactcnfg;	/* activate configuration */</div><div class='add'>+	u32 PAD[3];</div><div class='add'>+	u32 sbflagst;	/* current sbflags */</div><div class='add'>+	u32 PAD[3];</div><div class='add'>+	u32 sbidlow;		/* identification */</div><div class='add'>+	u32 sbidhigh;	/* identification */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev,</div><div class='add'>+				  struct chip_info **ci_ptr, u32 regs);</div><div class='add'>+extern void brcmf_sdio_chip_detach(struct chip_info **ci_ptr);</div><div class='add'>+extern void brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev,</div><div class='add'>+					      struct chip_info *ci,</div><div class='add'>+					      u32 drivestrength);</div><div class='add'>+extern u8 brcmf_sdio_chip_getinfidx(struct chip_info *ci, u16 coreid);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif		/* _BRCMFMAC_SDIO_CHIP_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h<br/>index 726fa8981113..0281d207d998 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h</a></div><div class='hunk'>@@ -116,12 +116,20 @@</div><div class='ctx'> #define SUCCESS	0</div><div class='ctx'> #define ERROR	1</div><div class='ctx'> </div><div class='add'>+/* Packet alignment for most efficient SDIO (can change based on platform) */</div><div class='add'>+#define BRCMF_SDALIGN	(1 &lt;&lt; 6)</div><div class='add'>+</div><div class='add'>+/* watchdog polling interval in ms */</div><div class='add'>+#define BRCMF_WD_POLL_MS	10</div><div class='add'>+</div><div class='ctx'> struct brcmf_sdreg {</div><div class='ctx'> 	int func;</div><div class='ctx'> 	int offset;</div><div class='ctx'> 	int value;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct brcmf_sdio;</div><div class='add'>+</div><div class='ctx'> struct brcmf_sdio_dev {</div><div class='ctx'> 	struct sdio_func *func[SDIO_MAX_FUNCS];</div><div class='ctx'> 	u8 num_funcs;			/* Supported funcs on client */</div><div class='hunk'>@@ -132,9 +140,10 @@ struct brcmf_sdio_dev {</div><div class='ctx'> 	atomic_t suspend;		/* suspend flag */</div><div class='ctx'> 	wait_queue_head_t request_byte_wait;</div><div class='ctx'> 	wait_queue_head_t request_word_wait;</div><div class='del'>-	wait_queue_head_t request_packet_wait;</div><div class='add'>+	wait_queue_head_t request_chain_wait;</div><div class='ctx'> 	wait_queue_head_t request_buffer_wait;</div><div class='del'>-</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct brcmf_bus *bus_if;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Register/deregister device interrupt handler. */</div><div class='hunk'>@@ -182,11 +191,21 @@ extern bool brcmf_sdcard_regfail(struct brcmf_sdio_dev *sdiodev);</div><div class='ctx'>  * NOTE: Async operation is not currently supported.</div><div class='ctx'>  */</div><div class='ctx'> extern int</div><div class='add'>+brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,</div><div class='add'>+		      uint flags, struct sk_buff *pkt);</div><div class='add'>+extern int</div><div class='ctx'> brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,</div><div class='del'>-		      uint flags, u8 *buf, uint nbytes, struct sk_buff *pkt);</div><div class='add'>+		      uint flags, u8 *buf, uint nbytes);</div><div class='add'>+</div><div class='add'>+extern int</div><div class='add'>+brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,</div><div class='add'>+		      uint flags, struct sk_buff *pkt);</div><div class='ctx'> extern int</div><div class='ctx'> brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,</div><div class='del'>-		      uint flags, u8 *buf, uint nbytes, struct sk_buff *pkt);</div><div class='add'>+		      uint flags, u8 *buf, uint nbytes);</div><div class='add'>+extern int</div><div class='add'>+brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,</div><div class='add'>+			uint flags, struct sk_buff_head *pktq);</div><div class='ctx'> </div><div class='ctx'> /* Flags bits */</div><div class='ctx'> </div><div class='hunk'>@@ -237,16 +256,20 @@ brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev,</div><div class='ctx'> /* read or write any buffer using cmd53 */</div><div class='ctx'> extern int</div><div class='ctx'> brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev,</div><div class='del'>-			   uint fix_inc, uint rw, uint fnc_num,</div><div class='del'>-			   u32 addr, uint regwidth,</div><div class='del'>-			   u32 buflen, u8 *buffer, struct sk_buff *pkt);</div><div class='add'>+			   uint fix_inc, uint rw, uint fnc_num, u32 addr,</div><div class='add'>+			   struct sk_buff *pkt);</div><div class='add'>+extern int</div><div class='add'>+brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc,</div><div class='add'>+			  uint write, uint func, uint addr,</div><div class='add'>+			  struct sk_buff_head *pktq);</div><div class='ctx'> </div><div class='ctx'> /* Watchdog timer interface for pm ops */</div><div class='ctx'> extern void brcmf_sdio_wdtmr_enable(struct brcmf_sdio_dev *sdiodev,</div><div class='ctx'> 				    bool enable);</div><div class='ctx'> </div><div class='del'>-extern void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,</div><div class='del'>-				u32 regsva, struct brcmf_sdio_dev *sdiodev);</div><div class='add'>+extern void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev);</div><div class='ctx'> extern void brcmf_sdbrcm_disconnect(void *ptr);</div><div class='ctx'> extern void brcmf_sdbrcm_isr(void *arg);</div><div class='add'>+</div><div class='add'>+extern void brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick);</div><div class='ctx'> #endif				/* _BRCM_SDH_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c<br/>index 5eddabe5228a..bf11850a20f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c</a></div><div class='hunk'>@@ -1429,7 +1429,7 @@ brcmf_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> </div><div class='ctx'> static s32</div><div class='ctx'> brcmf_cfg80211_set_tx_power(struct wiphy *wiphy,</div><div class='del'>-			 enum nl80211_tx_power_setting type, s32 dbm)</div><div class='add'>+			    enum nl80211_tx_power_setting type, s32 mbm)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	struct brcmf_cfg80211_priv *cfg_priv = wiphy_to_cfg(wiphy);</div><div class='hunk'>@@ -1437,6 +1437,7 @@ brcmf_cfg80211_set_tx_power(struct wiphy *wiphy,</div><div class='ctx'> 	u16 txpwrmw;</div><div class='ctx'> 	s32 err = 0;</div><div class='ctx'> 	s32 disable = 0;</div><div class='add'>+	s32 dbm = MBM_TO_DBM(mbm);</div><div class='ctx'> </div><div class='ctx'> 	WL_TRACE("Enter\n");</div><div class='ctx'> 	if (!check_sys_up(wiphy))</div><div class='hunk'>@@ -1446,12 +1447,6 @@ brcmf_cfg80211_set_tx_power(struct wiphy *wiphy,</div><div class='ctx'> 	case NL80211_TX_POWER_AUTOMATIC:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_TX_POWER_LIMITED:</div><div class='del'>-		if (dbm &lt; 0) {</div><div class='del'>-			WL_ERR("TX_POWER_LIMITED - dbm is negative\n");</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='ctx'> 	case NL80211_TX_POWER_FIXED:</div><div class='ctx'> 		if (dbm &lt; 0) {</div><div class='ctx'> 			WL_ERR("TX_POWER_FIXED - dbm is negative\n");</div><div class='hunk'>@@ -1997,7 +1992,7 @@ done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static s32 brcmf_inform_single_bss(struct brcmf_cfg80211_priv *cfg_priv,</div><div class='del'>-				   struct brcmf_bss_info *bi)</div><div class='add'>+				   struct brcmf_bss_info_le *bi)</div><div class='ctx'> {</div><div class='ctx'> 	struct wiphy *wiphy = cfg_to_wiphy(cfg_priv);</div><div class='ctx'> 	struct ieee80211_channel *notify_channel;</div><div class='hunk'>@@ -2049,18 +2044,27 @@ static s32 brcmf_inform_single_bss(struct brcmf_cfg80211_priv *cfg_priv,</div><div class='ctx'> 		notify_timestamp, notify_capability, notify_interval, notify_ie,</div><div class='ctx'> 		notify_ielen, notify_signal, GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	if (!bss) {</div><div class='del'>-		WL_ERR("cfg80211_inform_bss_frame error\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	if (!bss)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cfg80211_put_bss(bss);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct brcmf_bss_info_le *</div><div class='add'>+next_bss_le(struct brcmf_scan_results *list, struct brcmf_bss_info_le *bss)</div><div class='add'>+{</div><div class='add'>+	if (bss == NULL)</div><div class='add'>+		return list-&gt;bss_info_le;</div><div class='add'>+	return (struct brcmf_bss_info_le *)((unsigned long)bss +</div><div class='add'>+					    le32_to_cpu(bss-&gt;length));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static s32 brcmf_inform_bss(struct brcmf_cfg80211_priv *cfg_priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcmf_scan_results *bss_list;</div><div class='del'>-	struct brcmf_bss_info *bi = NULL;	/* must be initialized */</div><div class='add'>+	struct brcmf_bss_info_le *bi = NULL;	/* must be initialized */</div><div class='ctx'> 	s32 err = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -2072,7 +2076,7 @@ static s32 brcmf_inform_bss(struct brcmf_cfg80211_priv *cfg_priv)</div><div class='ctx'> 	}</div><div class='ctx'> 	WL_SCAN("scanned AP count (%d)\n", bss_list-&gt;count);</div><div class='ctx'> 	for (i = 0; i &lt; bss_list-&gt;count &amp;&amp; i &lt; WL_AP_MAX; i++) {</div><div class='del'>-		bi = next_bss(bss_list, bi);</div><div class='add'>+		bi = next_bss_le(bss_list, bi);</div><div class='ctx'> 		err = brcmf_inform_single_bss(cfg_priv, bi);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2085,8 +2089,9 @@ static s32 wl_inform_ibss(struct brcmf_cfg80211_priv *cfg_priv,</div><div class='ctx'> {</div><div class='ctx'> 	struct wiphy *wiphy = cfg_to_wiphy(cfg_priv);</div><div class='ctx'> 	struct ieee80211_channel *notify_channel;</div><div class='del'>-	struct brcmf_bss_info *bi = NULL;</div><div class='add'>+	struct brcmf_bss_info_le *bi = NULL;</div><div class='ctx'> 	struct ieee80211_supported_band *band;</div><div class='add'>+	struct cfg80211_bss *bss;</div><div class='ctx'> 	u8 *buf = NULL;</div><div class='ctx'> 	s32 err = 0;</div><div class='ctx'> 	u16 channel;</div><div class='hunk'>@@ -2114,7 +2119,7 @@ static s32 wl_inform_ibss(struct brcmf_cfg80211_priv *cfg_priv,</div><div class='ctx'> 		goto CleanUp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bi = (struct brcmf_bss_info *)(buf + 4);</div><div class='add'>+	bi = (struct brcmf_bss_info_le *)(buf + 4);</div><div class='ctx'> </div><div class='ctx'> 	channel = bi-&gt;ctl_ch ? bi-&gt;ctl_ch :</div><div class='ctx'> 				CHSPEC_CHANNEL(le16_to_cpu(bi-&gt;chanspec));</div><div class='hunk'>@@ -2140,10 +2145,17 @@ static s32 wl_inform_ibss(struct brcmf_cfg80211_priv *cfg_priv,</div><div class='ctx'> 	WL_CONN("signal: %d\n", notify_signal);</div><div class='ctx'> 	WL_CONN("notify_timestamp: %#018llx\n", notify_timestamp);</div><div class='ctx'> </div><div class='del'>-	cfg80211_inform_bss(wiphy, notify_channel, bssid,</div><div class='add'>+	bss = cfg80211_inform_bss(wiphy, notify_channel, bssid,</div><div class='ctx'> 		notify_timestamp, notify_capability, notify_interval,</div><div class='ctx'> 		notify_ie, notify_ielen, notify_signal, GFP_KERNEL);</div><div class='ctx'> </div><div class='add'>+	if (!bss) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto CleanUp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfg80211_put_bss(bss);</div><div class='add'>+</div><div class='ctx'> CleanUp:</div><div class='ctx'> </div><div class='ctx'> 	kfree(buf);</div><div class='hunk'>@@ -2188,7 +2200,7 @@ static struct brcmf_tlv *brcmf_parse_tlvs(void *buf, int buflen, uint key)</div><div class='ctx'> </div><div class='ctx'> static s32 brcmf_update_bss_info(struct brcmf_cfg80211_priv *cfg_priv)</div><div class='ctx'> {</div><div class='del'>-	struct brcmf_bss_info *bi;</div><div class='add'>+	struct brcmf_bss_info_le *bi;</div><div class='ctx'> 	struct brcmf_ssid *ssid;</div><div class='ctx'> 	struct brcmf_tlv *tim;</div><div class='ctx'> 	u16 beacon_interval;</div><div class='hunk'>@@ -2211,7 +2223,7 @@ static s32 brcmf_update_bss_info(struct brcmf_cfg80211_priv *cfg_priv)</div><div class='ctx'> 		goto update_bss_info_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bi = (struct brcmf_bss_info *)(cfg_priv-&gt;extra_buf + 4);</div><div class='add'>+	bi = (struct brcmf_bss_info_le *)(cfg_priv-&gt;extra_buf + 4);</div><div class='ctx'> 	err = brcmf_inform_single_bss(cfg_priv, bi);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto update_bss_info_out;</div><div class='hunk'>@@ -2463,7 +2475,7 @@ static s32 brcmf_init_iscan(struct brcmf_cfg80211_priv *cfg_priv)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void brcmf_delay(u32 ms)</div><div class='add'>+static __always_inline void brcmf_delay(u32 ms)</div><div class='ctx'> {</div><div class='ctx'> 	if (ms &lt; 1000 / HZ) {</div><div class='ctx'> 		cond_resched();</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h<br/>index 62dc46144ede..a613b49cb13f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h</a></div><div class='hunk'>@@ -352,15 +352,6 @@ brcmf_cfg80211_connect_info *cfg_to_conn(struct brcmf_cfg80211_priv *cfg)</div><div class='ctx'> 	return &amp;cfg-&gt;conn_info;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct brcmf_bss_info *next_bss(struct brcmf_scan_results *list,</div><div class='del'>-					   struct brcmf_bss_info *bss)</div><div class='del'>-{</div><div class='del'>-	return bss = bss ?</div><div class='del'>-		(struct brcmf_bss_info *)((unsigned long)bss +</div><div class='del'>-				       le32_to_cpu(bss-&gt;length)) :</div><div class='del'>-		list-&gt;bss_info;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> extern struct brcmf_cfg80211_dev *brcmf_cfg80211_attach(struct net_device *ndev,</div><div class='ctx'> 							struct device *busdev,</div><div class='ctx'> 							void *data);</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c<br/>index 025fa0eb6f47..ab9bb11abfbb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/aiutils.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/aiutils.c</a></div><div class='hunk'>@@ -16,6 +16,8 @@</div><div class='ctx'>  * File contents: support functions for PCI/PCIe</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -316,51 +318,24 @@</div><div class='ctx'> </div><div class='ctx'> #define	BADIDX		(SI_MAXCORES + 1)</div><div class='ctx'> </div><div class='del'>-/* Newer chips can access PCI/PCIE and CC core without requiring to change</div><div class='del'>- * PCI BAR0 WIN</div><div class='del'>- */</div><div class='del'>-#define SI_FAST(si) (((si)-&gt;pub.buscoretype == PCIE_CORE_ID) ||	\</div><div class='del'>-		     (((si)-&gt;pub.buscoretype == PCI_CORE_ID) &amp;&amp; \</div><div class='del'>-		      (si)-&gt;pub.buscorerev &gt;= 13))</div><div class='del'>-</div><div class='del'>-#define CCREGS_FAST(si) (((char __iomem *)((si)-&gt;curmap) + \</div><div class='del'>-			  PCI_16KB0_CCREGS_OFFSET))</div><div class='del'>-</div><div class='ctx'> #define	IS_SIM(chippkg)	\</div><div class='ctx'> 	((chippkg == HDLSIM_PKG_ID) || (chippkg == HWSIM_PKG_ID))</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Macros to disable/restore function core(D11, ENET, ILINE20, etc) interrupts</div><div class='del'>- * before after core switching to avoid invalid register accesss inside ISR.</div><div class='del'>- */</div><div class='del'>-#define INTR_OFF(si, intr_val) \</div><div class='del'>-	if ((si)-&gt;intrsoff_fn &amp;&amp; \</div><div class='del'>-	    (si)-&gt;coreid[(si)-&gt;curidx] == (si)-&gt;dev_coreid) \</div><div class='del'>-		intr_val = (*(si)-&gt;intrsoff_fn)((si)-&gt;intr_arg)</div><div class='add'>+#define PCI(sih)	(ai_get_buscoretype(sih) == PCI_CORE_ID)</div><div class='add'>+#define PCIE(sih)	(ai_get_buscoretype(sih) == PCIE_CORE_ID)</div><div class='ctx'> </div><div class='del'>-#define INTR_RESTORE(si, intr_val) \</div><div class='del'>-	if ((si)-&gt;intrsrestore_fn &amp;&amp; \</div><div class='del'>-	    (si)-&gt;coreid[(si)-&gt;curidx] == (si)-&gt;dev_coreid) \</div><div class='del'>-		(*(si)-&gt;intrsrestore_fn)((si)-&gt;intr_arg, intr_val)</div><div class='del'>-</div><div class='del'>-#define PCI(si)		((si)-&gt;pub.buscoretype == PCI_CORE_ID)</div><div class='del'>-#define PCIE(si)	((si)-&gt;pub.buscoretype == PCIE_CORE_ID)</div><div class='del'>-</div><div class='del'>-#define PCI_FORCEHT(si)	(PCIE(si) &amp;&amp; (si-&gt;pub.chip == BCM4716_CHIP_ID))</div><div class='add'>+#define PCI_FORCEHT(sih) (PCIE(sih) &amp;&amp; (ai_get_chip_id(sih) == BCM4716_CHIP_ID))</div><div class='ctx'> </div><div class='ctx'> #ifdef BCMDBG</div><div class='del'>-#define	SI_MSG(args)	printk args</div><div class='add'>+#define	SI_MSG(fmt, ...)	pr_debug(fmt, ##__VA_ARGS__)</div><div class='ctx'> #else</div><div class='del'>-#define	SI_MSG(args)</div><div class='add'>+#define	SI_MSG(fmt, ...)	no_printk(fmt, ##__VA_ARGS__)</div><div class='ctx'> #endif				/* BCMDBG */</div><div class='ctx'> </div><div class='ctx'> #define	GOODCOREADDR(x, b) \</div><div class='ctx'> 	(((x) &gt;= (b)) &amp;&amp; ((x) &lt; ((b) + SI_MAXCORES * SI_CORE_SIZE)) &amp;&amp; \</div><div class='ctx'> 		IS_ALIGNED((x), SI_CORE_SIZE))</div><div class='ctx'> </div><div class='del'>-#define PCIEREGS(si) ((__iomem char *)((si)-&gt;curmap) + \</div><div class='del'>-			PCI_16KB0_PCIREGS_OFFSET)</div><div class='del'>-</div><div class='ctx'> struct aidmp {</div><div class='ctx'> 	u32 oobselina30;	/* 0x000 */</div><div class='ctx'> 	u32 oobselina74;	/* 0x004 */</div><div class='hunk'>@@ -479,406 +454,13 @@ struct aidmp {</div><div class='ctx'> 	u32 componentid3;	/* 0xffc */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* EROM parsing */</div><div class='del'>-</div><div class='del'>-static u32</div><div class='del'>-get_erom_ent(struct si_pub *sih, u32 __iomem **eromptr, u32 mask, u32 match)</div><div class='del'>-{</div><div class='del'>-	u32 ent;</div><div class='del'>-	uint inv = 0, nom = 0;</div><div class='del'>-</div><div class='del'>-	while (true) {</div><div class='del'>-		ent = R_REG(*eromptr);</div><div class='del'>-		(*eromptr)++;</div><div class='del'>-</div><div class='del'>-		if (mask == 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if ((ent &amp; ER_VALID) == 0) {</div><div class='del'>-			inv++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ent == (ER_END | ER_VALID))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if ((ent &amp; mask) == match)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		nom++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ent;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32</div><div class='del'>-get_asd(struct si_pub *sih, u32 __iomem **eromptr, uint sp, uint ad, uint st,</div><div class='del'>-	u32 *addrl, u32 *addrh, u32 *sizel, u32 *sizeh)</div><div class='del'>-{</div><div class='del'>-	u32 asd, sz, szd;</div><div class='del'>-</div><div class='del'>-	asd = get_erom_ent(sih, eromptr, ER_VALID, ER_VALID);</div><div class='del'>-	if (((asd &amp; ER_TAG1) != ER_ADD) ||</div><div class='del'>-	    (((asd &amp; AD_SP_MASK) &gt;&gt; AD_SP_SHIFT) != sp) ||</div><div class='del'>-	    ((asd &amp; AD_ST_MASK) != st)) {</div><div class='del'>-		/* This is not what we want, "push" it back */</div><div class='del'>-		(*eromptr)--;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	*addrl = asd &amp; AD_ADDR_MASK;</div><div class='del'>-	if (asd &amp; AD_AG32)</div><div class='del'>-		*addrh = get_erom_ent(sih, eromptr, 0, 0);</div><div class='del'>-	else</div><div class='del'>-		*addrh = 0;</div><div class='del'>-	*sizeh = 0;</div><div class='del'>-	sz = asd &amp; AD_SZ_MASK;</div><div class='del'>-	if (sz == AD_SZ_SZD) {</div><div class='del'>-		szd = get_erom_ent(sih, eromptr, 0, 0);</div><div class='del'>-		*sizel = szd &amp; SD_SZ_MASK;</div><div class='del'>-		if (szd &amp; SD_SG32)</div><div class='del'>-			*sizeh = get_erom_ent(sih, eromptr, 0, 0);</div><div class='del'>-	} else</div><div class='del'>-		*sizel = AD_SZ_BASE &lt;&lt; (sz &gt;&gt; AD_SZ_SHIFT);</div><div class='del'>-</div><div class='del'>-	return asd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ai_hwfixup(struct si_info *sii)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* parse the enumeration rom to identify all cores */</div><div class='del'>-static void ai_scan(struct si_pub *sih, struct chipcregs __iomem *cc)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii = (struct si_info *)sih;</div><div class='del'>-</div><div class='del'>-	u32 erombase;</div><div class='del'>-	u32 __iomem *eromptr, *eromlim;</div><div class='del'>-	void __iomem *regs = cc;</div><div class='del'>-</div><div class='del'>-	erombase = R_REG(&amp;cc-&gt;eromptr);</div><div class='del'>-</div><div class='del'>-	/* Set wrappers address */</div><div class='del'>-	sii-&gt;curwrap = (void *)((unsigned long)cc + SI_CORE_SIZE);</div><div class='del'>-</div><div class='del'>-	/* Now point the window at the erom */</div><div class='del'>-	pci_write_config_dword(sii-&gt;pbus, PCI_BAR0_WIN, erombase);</div><div class='del'>-	eromptr = regs;</div><div class='del'>-	eromlim = eromptr + (ER_REMAPCONTROL / sizeof(u32));</div><div class='del'>-</div><div class='del'>-	while (eromptr &lt; eromlim) {</div><div class='del'>-		u32 cia, cib, cid, mfg, crev, nmw, nsw, nmp, nsp;</div><div class='del'>-		u32 mpd, asd, addrl, addrh, sizel, sizeh;</div><div class='del'>-		u32 __iomem *base;</div><div class='del'>-		uint i, j, idx;</div><div class='del'>-		bool br;</div><div class='del'>-</div><div class='del'>-		br = false;</div><div class='del'>-</div><div class='del'>-		/* Grok a component */</div><div class='del'>-		cia = get_erom_ent(sih, &amp;eromptr, ER_TAG, ER_CI);</div><div class='del'>-		if (cia == (ER_END | ER_VALID)) {</div><div class='del'>-			/*  Found END of erom */</div><div class='del'>-			ai_hwfixup(sii);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		base = eromptr - 1;</div><div class='del'>-		cib = get_erom_ent(sih, &amp;eromptr, 0, 0);</div><div class='del'>-</div><div class='del'>-		if ((cib &amp; ER_TAG) != ER_CI) {</div><div class='del'>-			/* CIA not followed by CIB */</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cid = (cia &amp; CIA_CID_MASK) &gt;&gt; CIA_CID_SHIFT;</div><div class='del'>-		mfg = (cia &amp; CIA_MFG_MASK) &gt;&gt; CIA_MFG_SHIFT;</div><div class='del'>-		crev = (cib &amp; CIB_REV_MASK) &gt;&gt; CIB_REV_SHIFT;</div><div class='del'>-		nmw = (cib &amp; CIB_NMW_MASK) &gt;&gt; CIB_NMW_SHIFT;</div><div class='del'>-		nsw = (cib &amp; CIB_NSW_MASK) &gt;&gt; CIB_NSW_SHIFT;</div><div class='del'>-		nmp = (cib &amp; CIB_NMP_MASK) &gt;&gt; CIB_NMP_SHIFT;</div><div class='del'>-		nsp = (cib &amp; CIB_NSP_MASK) &gt;&gt; CIB_NSP_SHIFT;</div><div class='del'>-</div><div class='del'>-		if (((mfg == MFGID_ARM) &amp;&amp; (cid == DEF_AI_COMP)) || (nsp == 0))</div><div class='del'>-			continue;</div><div class='del'>-		if ((nmw + nsw == 0)) {</div><div class='del'>-			/* A component which is not a core */</div><div class='del'>-			if (cid == OOB_ROUTER_CORE_ID) {</div><div class='del'>-				asd = get_asd(sih, &amp;eromptr, 0, 0, AD_ST_SLAVE,</div><div class='del'>-					      &amp;addrl, &amp;addrh, &amp;sizel, &amp;sizeh);</div><div class='del'>-				if (asd != 0)</div><div class='del'>-					sii-&gt;oob_router = addrl;</div><div class='del'>-			}</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		idx = sii-&gt;numcores;</div><div class='del'>-/*		sii-&gt;eromptr[idx] = base; */</div><div class='del'>-		sii-&gt;cia[idx] = cia;</div><div class='del'>-		sii-&gt;cib[idx] = cib;</div><div class='del'>-		sii-&gt;coreid[idx] = cid;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; nmp; i++) {</div><div class='del'>-			mpd = get_erom_ent(sih, &amp;eromptr, ER_VALID, ER_VALID);</div><div class='del'>-			if ((mpd &amp; ER_TAG) != ER_MP) {</div><div class='del'>-				/* Not enough MP entries for component */</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* First Slave Address Descriptor should be port 0:</div><div class='del'>-		 * the main register space for the core</div><div class='del'>-		 */</div><div class='del'>-		asd =</div><div class='del'>-		    get_asd(sih, &amp;eromptr, 0, 0, AD_ST_SLAVE, &amp;addrl, &amp;addrh,</div><div class='del'>-			    &amp;sizel, &amp;sizeh);</div><div class='del'>-		if (asd == 0) {</div><div class='del'>-			/* Try again to see if it is a bridge */</div><div class='del'>-			asd =</div><div class='del'>-			    get_asd(sih, &amp;eromptr, 0, 0, AD_ST_BRIDGE, &amp;addrl,</div><div class='del'>-				    &amp;addrh, &amp;sizel, &amp;sizeh);</div><div class='del'>-			if (asd != 0)</div><div class='del'>-				br = true;</div><div class='del'>-			else if ((addrh != 0) || (sizeh != 0)</div><div class='del'>-				 || (sizel != SI_CORE_SIZE)) {</div><div class='del'>-				/* First Slave ASD for core malformed */</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		sii-&gt;coresba[idx] = addrl;</div><div class='del'>-		sii-&gt;coresba_size[idx] = sizel;</div><div class='del'>-		/* Get any more ASDs in port 0 */</div><div class='del'>-		j = 1;</div><div class='del'>-		do {</div><div class='del'>-			asd =</div><div class='del'>-			    get_asd(sih, &amp;eromptr, 0, j, AD_ST_SLAVE, &amp;addrl,</div><div class='del'>-				    &amp;addrh, &amp;sizel, &amp;sizeh);</div><div class='del'>-			if ((asd != 0) &amp;&amp; (j == 1) &amp;&amp; (sizel == SI_CORE_SIZE)) {</div><div class='del'>-				sii-&gt;coresba2[idx] = addrl;</div><div class='del'>-				sii-&gt;coresba2_size[idx] = sizel;</div><div class='del'>-			}</div><div class='del'>-			j++;</div><div class='del'>-		} while (asd != 0);</div><div class='del'>-</div><div class='del'>-		/* Go through the ASDs for other slave ports */</div><div class='del'>-		for (i = 1; i &lt; nsp; i++) {</div><div class='del'>-			j = 0;</div><div class='del'>-			do {</div><div class='del'>-				asd =</div><div class='del'>-				    get_asd(sih, &amp;eromptr, i, j++, AD_ST_SLAVE,</div><div class='del'>-					    &amp;addrl, &amp;addrh, &amp;sizel, &amp;sizeh);</div><div class='del'>-			} while (asd != 0);</div><div class='del'>-			if (j == 0) {</div><div class='del'>-				/* SP has no address descriptors */</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Now get master wrappers */</div><div class='del'>-		for (i = 0; i &lt; nmw; i++) {</div><div class='del'>-			asd =</div><div class='del'>-			    get_asd(sih, &amp;eromptr, i, 0, AD_ST_MWRAP, &amp;addrl,</div><div class='del'>-				    &amp;addrh, &amp;sizel, &amp;sizeh);</div><div class='del'>-			if (asd == 0) {</div><div class='del'>-				/* Missing descriptor for MW */</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-			if ((sizeh != 0) || (sizel != SI_CORE_SIZE)) {</div><div class='del'>-				/* Master wrapper %d is not 4KB */</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-			if (i == 0)</div><div class='del'>-				sii-&gt;wrapba[idx] = addrl;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* And finally slave wrappers */</div><div class='del'>-		for (i = 0; i &lt; nsw; i++) {</div><div class='del'>-			uint fwp = (nsp == 1) ? 0 : 1;</div><div class='del'>-			asd =</div><div class='del'>-			    get_asd(sih, &amp;eromptr, fwp + i, 0, AD_ST_SWRAP,</div><div class='del'>-				    &amp;addrl, &amp;addrh, &amp;sizel, &amp;sizeh);</div><div class='del'>-			if (asd == 0) {</div><div class='del'>-				/* Missing descriptor for SW */</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-			if ((sizeh != 0) || (sizel != SI_CORE_SIZE)) {</div><div class='del'>-				/* Slave wrapper is not 4KB */</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-			if ((nmw == 0) &amp;&amp; (i == 0))</div><div class='del'>-				sii-&gt;wrapba[idx] = addrl;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Don't record bridges */</div><div class='del'>-		if (br)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* Done with core */</div><div class='del'>-		sii-&gt;numcores++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	/* Reached end of erom without finding END */</div><div class='del'>-	sii-&gt;numcores = 0;</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function changes the logical "focus" to the indicated core.</div><div class='del'>- * Return the current core's virtual address. Since each core starts with the</div><div class='del'>- * same set of registers (BIST, clock control, etc), the returned address</div><div class='del'>- * contains the first register of this 'common' register block (not to be</div><div class='del'>- * confused with 'common core').</div><div class='del'>- */</div><div class='del'>-void __iomem *ai_setcoreidx(struct si_pub *sih, uint coreidx)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii = (struct si_info *)sih;</div><div class='del'>-	u32 addr = sii-&gt;coresba[coreidx];</div><div class='del'>-	u32 wrap = sii-&gt;wrapba[coreidx];</div><div class='del'>-</div><div class='del'>-	if (coreidx &gt;= sii-&gt;numcores)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* point bar0 window */</div><div class='del'>-	pci_write_config_dword(sii-&gt;pbus, PCI_BAR0_WIN, addr);</div><div class='del'>-	/* point bar0 2nd 4KB window */</div><div class='del'>-	pci_write_config_dword(sii-&gt;pbus, PCI_BAR0_WIN2, wrap);</div><div class='del'>-	sii-&gt;curidx = coreidx;</div><div class='del'>-</div><div class='del'>-	return sii-&gt;curmap;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Return the number of address spaces in current core */</div><div class='del'>-int ai_numaddrspaces(struct si_pub *sih)</div><div class='del'>-{</div><div class='del'>-	return 2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Return the address of the nth address space in the current core */</div><div class='del'>-u32 ai_addrspace(struct si_pub *sih, uint asidx)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-	uint cidx;</div><div class='del'>-</div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-	cidx = sii-&gt;curidx;</div><div class='del'>-</div><div class='del'>-	if (asidx == 0)</div><div class='del'>-		return sii-&gt;coresba[cidx];</div><div class='del'>-	else if (asidx == 1)</div><div class='del'>-		return sii-&gt;coresba2[cidx];</div><div class='del'>-	else {</div><div class='del'>-		/* Need to parse the erom again to find addr space */</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Return the size of the nth address space in the current core */</div><div class='del'>-u32 ai_addrspacesize(struct si_pub *sih, uint asidx)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-	uint cidx;</div><div class='del'>-</div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-	cidx = sii-&gt;curidx;</div><div class='del'>-</div><div class='del'>-	if (asidx == 0)</div><div class='del'>-		return sii-&gt;coresba_size[cidx];</div><div class='del'>-	else if (asidx == 1)</div><div class='del'>-		return sii-&gt;coresba2_size[cidx];</div><div class='del'>-	else {</div><div class='del'>-		/* Need to parse the erom again to find addr */</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-uint ai_flag(struct si_pub *sih)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-	struct aidmp *ai;</div><div class='del'>-</div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-	ai = sii-&gt;curwrap;</div><div class='del'>-</div><div class='del'>-	return R_REG(&amp;ai-&gt;oobselouta30) &amp; 0x1f;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ai_setint(struct si_pub *sih, int siflag)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-uint ai_corevendor(struct si_pub *sih)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-	u32 cia;</div><div class='del'>-</div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-	cia = sii-&gt;cia[sii-&gt;curidx];</div><div class='del'>-	return (cia &amp; CIA_MFG_MASK) &gt;&gt; CIA_MFG_SHIFT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-uint ai_corerev(struct si_pub *sih)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-	u32 cib;</div><div class='del'>-</div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-	cib = sii-&gt;cib[sii-&gt;curidx];</div><div class='del'>-	return (cib &amp; CIB_REV_MASK) &gt;&gt; CIB_REV_SHIFT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool ai_iscoreup(struct si_pub *sih)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-	struct aidmp *ai;</div><div class='del'>-</div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-	ai = sii-&gt;curwrap;</div><div class='del'>-</div><div class='del'>-	return (((R_REG(&amp;ai-&gt;ioctrl) &amp; (SICF_FGC | SICF_CLOCK_EN)) ==</div><div class='del'>-		 SICF_CLOCK_EN)</div><div class='del'>-		&amp;&amp; ((R_REG(&amp;ai-&gt;resetctrl) &amp; AIRC_RESET) == 0));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ai_core_cflags_wo(struct si_pub *sih, u32 mask, u32 val)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-	struct aidmp *ai;</div><div class='del'>-	u32 w;</div><div class='del'>-</div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-</div><div class='del'>-	ai = sii-&gt;curwrap;</div><div class='del'>-</div><div class='del'>-	if (mask || val) {</div><div class='del'>-		w = ((R_REG(&amp;ai-&gt;ioctrl) &amp; ~mask) | val);</div><div class='del'>-		W_REG(&amp;ai-&gt;ioctrl, w);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u32 ai_core_cflags(struct si_pub *sih, u32 mask, u32 val)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-	struct aidmp *ai;</div><div class='del'>-	u32 w;</div><div class='del'>-</div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-	ai = sii-&gt;curwrap;</div><div class='del'>-</div><div class='del'>-	if (mask || val) {</div><div class='del'>-		w = ((R_REG(&amp;ai-&gt;ioctrl) &amp; ~mask) | val);</div><div class='del'>-		W_REG(&amp;ai-&gt;ioctrl, w);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return R_REG(&amp;ai-&gt;ioctrl);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* return true if PCIE capability exists in the pci config space */</div><div class='ctx'> static bool ai_ispcie(struct si_info *sii)</div><div class='ctx'> {</div><div class='ctx'> 	u8 cap_ptr;</div><div class='ctx'> </div><div class='ctx'> 	cap_ptr =</div><div class='del'>-	    pcicore_find_pci_capability(sii-&gt;pbus, PCI_CAP_ID_EXP, NULL,</div><div class='add'>+	    pcicore_find_pci_capability(sii-&gt;pcibus, PCI_CAP_ID_EXP, NULL,</div><div class='ctx'> 					NULL);</div><div class='ctx'> 	if (!cap_ptr)</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -894,117 +476,69 @@ static bool ai_buscore_prep(struct si_info *sii)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 ai_core_sflags(struct si_pub *sih, u32 mask, u32 val)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-	struct aidmp *ai;</div><div class='del'>-	u32 w;</div><div class='del'>-</div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-	ai = sii-&gt;curwrap;</div><div class='del'>-</div><div class='del'>-	if (mask || val) {</div><div class='del'>-		w = ((R_REG(&amp;ai-&gt;iostatus) &amp; ~mask) | val);</div><div class='del'>-		W_REG(&amp;ai-&gt;iostatus, w);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return R_REG(&amp;ai-&gt;iostatus);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool</div><div class='del'>-ai_buscore_setup(struct si_info *sii, u32 savewin, uint *origidx)</div><div class='add'>+ai_buscore_setup(struct si_info *sii, struct bcma_device *cc)</div><div class='ctx'> {</div><div class='del'>-	bool pci, pcie;</div><div class='del'>-	uint i;</div><div class='del'>-	uint pciidx, pcieidx, pcirev, pcierev;</div><div class='del'>-	struct chipcregs __iomem *cc;</div><div class='add'>+	struct bcma_device *pci = NULL;</div><div class='add'>+	struct bcma_device *pcie = NULL;</div><div class='add'>+	struct bcma_device *core;</div><div class='ctx'> </div><div class='del'>-	cc = ai_setcoreidx(&amp;sii-&gt;pub, SI_CC_IDX);</div><div class='add'>+</div><div class='add'>+	/* no cores found, bail out */</div><div class='add'>+	if (cc-&gt;bus-&gt;nr_cores == 0)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* get chipcommon rev */</div><div class='del'>-	sii-&gt;pub.ccrev = (int)ai_corerev(&amp;sii-&gt;pub);</div><div class='add'>+	sii-&gt;pub.ccrev = cc-&gt;id.rev;</div><div class='ctx'> </div><div class='ctx'> 	/* get chipcommon chipstatus */</div><div class='del'>-	if (sii-&gt;pub.ccrev &gt;= 11)</div><div class='del'>-		sii-&gt;pub.chipst = R_REG(&amp;cc-&gt;chipstatus);</div><div class='add'>+	if (ai_get_ccrev(&amp;sii-&gt;pub) &gt;= 11)</div><div class='add'>+		sii-&gt;chipst = bcma_read32(cc, CHIPCREGOFFS(chipstatus));</div><div class='ctx'> </div><div class='ctx'> 	/* get chipcommon capabilites */</div><div class='del'>-	sii-&gt;pub.cccaps = R_REG(&amp;cc-&gt;capabilities);</div><div class='del'>-	/* get chipcommon extended capabilities */</div><div class='del'>-</div><div class='del'>-	if (sii-&gt;pub.ccrev &gt;= 35)</div><div class='del'>-		sii-&gt;pub.cccaps_ext = R_REG(&amp;cc-&gt;capabilities_ext);</div><div class='add'>+	sii-&gt;pub.cccaps = bcma_read32(cc, CHIPCREGOFFS(capabilities));</div><div class='ctx'> </div><div class='ctx'> 	/* get pmu rev and caps */</div><div class='del'>-	if (sii-&gt;pub.cccaps &amp; CC_CAP_PMU) {</div><div class='del'>-		sii-&gt;pub.pmucaps = R_REG(&amp;cc-&gt;pmucapabilities);</div><div class='add'>+	if (ai_get_cccaps(&amp;sii-&gt;pub) &amp; CC_CAP_PMU) {</div><div class='add'>+		sii-&gt;pub.pmucaps = bcma_read32(cc,</div><div class='add'>+					       CHIPCREGOFFS(pmucapabilities));</div><div class='ctx'> 		sii-&gt;pub.pmurev = sii-&gt;pub.pmucaps &amp; PCAP_REV_MASK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* figure out bus/orignal core idx */</div><div class='del'>-	sii-&gt;pub.buscoretype = NODEV_CORE_ID;</div><div class='del'>-	sii-&gt;pub.buscorerev = NOREV;</div><div class='del'>-	sii-&gt;pub.buscoreidx = BADIDX;</div><div class='del'>-</div><div class='del'>-	pci = pcie = false;</div><div class='del'>-	pcirev = pcierev = NOREV;</div><div class='del'>-	pciidx = pcieidx = BADIDX;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sii-&gt;numcores; i++) {</div><div class='add'>+	/* figure out buscore */</div><div class='add'>+	list_for_each_entry(core, &amp;cc-&gt;bus-&gt;cores, list) {</div><div class='ctx'> 		uint cid, crev;</div><div class='ctx'> </div><div class='del'>-		ai_setcoreidx(&amp;sii-&gt;pub, i);</div><div class='del'>-		cid = ai_coreid(&amp;sii-&gt;pub);</div><div class='del'>-		crev = ai_corerev(&amp;sii-&gt;pub);</div><div class='add'>+		cid = core-&gt;id.id;</div><div class='add'>+		crev = core-&gt;id.rev;</div><div class='ctx'> </div><div class='ctx'> 		if (cid == PCI_CORE_ID) {</div><div class='del'>-			pciidx = i;</div><div class='del'>-			pcirev = crev;</div><div class='del'>-			pci = true;</div><div class='add'>+			pci = core;</div><div class='ctx'> 		} else if (cid == PCIE_CORE_ID) {</div><div class='del'>-			pcieidx = i;</div><div class='del'>-			pcierev = crev;</div><div class='del'>-			pcie = true;</div><div class='add'>+			pcie = core;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		/* find the core idx before entering this func. */</div><div class='del'>-		if ((savewin &amp;&amp; (savewin == sii-&gt;coresba[i])) ||</div><div class='del'>-		    (cc == sii-&gt;regs[i]))</div><div class='del'>-			*origidx = i;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pci &amp;&amp; pcie) {</div><div class='ctx'> 		if (ai_ispcie(sii))</div><div class='del'>-			pci = false;</div><div class='add'>+			pci = NULL;</div><div class='ctx'> 		else</div><div class='del'>-			pcie = false;</div><div class='add'>+			pcie = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pci) {</div><div class='del'>-		sii-&gt;pub.buscoretype = PCI_CORE_ID;</div><div class='del'>-		sii-&gt;pub.buscorerev = pcirev;</div><div class='del'>-		sii-&gt;pub.buscoreidx = pciidx;</div><div class='add'>+		sii-&gt;buscore = pci;</div><div class='ctx'> 	} else if (pcie) {</div><div class='del'>-		sii-&gt;pub.buscoretype = PCIE_CORE_ID;</div><div class='del'>-		sii-&gt;pub.buscorerev = pcierev;</div><div class='del'>-		sii-&gt;pub.buscoreidx = pcieidx;</div><div class='add'>+		sii-&gt;buscore = pcie;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* fixup necessary chip/core configurations */</div><div class='del'>-	if (SI_FAST(sii)) {</div><div class='del'>-		if (!sii-&gt;pch) {</div><div class='del'>-			sii-&gt;pch = pcicore_init(&amp;sii-&gt;pub, sii-&gt;pbus,</div><div class='del'>-						(__iomem void *)PCIEREGS(sii));</div><div class='del'>-			if (sii-&gt;pch == NULL)</div><div class='del'>-				return false;</div><div class='del'>-		}</div><div class='add'>+	if (!sii-&gt;pch) {</div><div class='add'>+		sii-&gt;pch = pcicore_init(&amp;sii-&gt;pub, sii-&gt;icbus-&gt;drv_pci.core);</div><div class='add'>+		if (sii-&gt;pch == NULL)</div><div class='add'>+			return false;</div><div class='ctx'> 	}</div><div class='del'>-	if (ai_pci_fixcfg(&amp;sii-&gt;pub)) {</div><div class='del'>-		/* si_doattach: si_pci_fixcfg failed */</div><div class='add'>+	if (ai_pci_fixcfg(&amp;sii-&gt;pub))</div><div class='ctx'> 		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* return to the original core */</div><div class='del'>-	ai_setcoreidx(&amp;sii-&gt;pub, *origidx);</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -1017,39 +551,27 @@ static __used void ai_nvram_process(struct si_info *sii)</div><div class='ctx'> 	uint w = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* do a pci config read to get subsystem id and subvendor id */</div><div class='del'>-	pci_read_config_dword(sii-&gt;pbus, PCI_SUBSYSTEM_VENDOR_ID, &amp;w);</div><div class='add'>+	pci_read_config_dword(sii-&gt;pcibus, PCI_SUBSYSTEM_VENDOR_ID, &amp;w);</div><div class='ctx'> </div><div class='ctx'> 	sii-&gt;pub.boardvendor = w &amp; 0xffff;</div><div class='ctx'> 	sii-&gt;pub.boardtype = (w &gt;&gt; 16) &amp; 0xffff;</div><div class='del'>-	sii-&gt;pub.boardflags = getintvar(&amp;sii-&gt;pub, BRCMS_SROM_BOARDFLAGS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct si_info *ai_doattach(struct si_info *sii,</div><div class='del'>-				   void __iomem *regs, struct pci_dev *pbus)</div><div class='add'>+				   struct bcma_bus *pbus)</div><div class='ctx'> {</div><div class='ctx'> 	struct si_pub *sih = &amp;sii-&gt;pub;</div><div class='ctx'> 	u32 w, savewin;</div><div class='del'>-	struct chipcregs __iomem *cc;</div><div class='add'>+	struct bcma_device *cc;</div><div class='ctx'> 	uint socitype;</div><div class='del'>-	uint origidx;</div><div class='del'>-</div><div class='del'>-	memset((unsigned char *) sii, 0, sizeof(struct si_info));</div><div class='ctx'> </div><div class='ctx'> 	savewin = 0;</div><div class='ctx'> </div><div class='del'>-	sih-&gt;buscoreidx = BADIDX;</div><div class='del'>-</div><div class='del'>-	sii-&gt;curmap = regs;</div><div class='del'>-	sii-&gt;pbus = pbus;</div><div class='del'>-</div><div class='del'>-	/* find Chipcommon address */</div><div class='del'>-	pci_read_config_dword(sii-&gt;pbus, PCI_BAR0_WIN, &amp;savewin);</div><div class='del'>-	if (!GOODCOREADDR(savewin, SI_ENUM_BASE))</div><div class='del'>-		savewin = SI_ENUM_BASE;</div><div class='add'>+	sii-&gt;icbus = pbus;</div><div class='add'>+	sii-&gt;pcibus = pbus-&gt;host_pci;</div><div class='ctx'> </div><div class='del'>-	pci_write_config_dword(sii-&gt;pbus, PCI_BAR0_WIN,</div><div class='del'>-			       SI_ENUM_BASE);</div><div class='del'>-	cc = (struct chipcregs __iomem *) regs;</div><div class='add'>+	/* switch to Chipcommon core */</div><div class='add'>+	cc = pbus-&gt;drv_cc.core;</div><div class='ctx'> </div><div class='ctx'> 	/* bus/core/clk setup for register access */</div><div class='ctx'> 	if (!ai_buscore_prep(sii))</div><div class='hunk'>@@ -1062,94 +584,74 @@ static struct si_info *ai_doattach(struct si_info *sii,</div><div class='ctx'> 	 *   hosts w/o chipcommon), some way of recognizing them needs to</div><div class='ctx'> 	 *   be added here.</div><div class='ctx'> 	 */</div><div class='del'>-	w = R_REG(&amp;cc-&gt;chipid);</div><div class='add'>+	w = bcma_read32(cc, CHIPCREGOFFS(chipid));</div><div class='ctx'> 	socitype = (w &amp; CID_TYPE_MASK) &gt;&gt; CID_TYPE_SHIFT;</div><div class='ctx'> 	/* Might as wll fill in chip id rev &amp; pkg */</div><div class='ctx'> 	sih-&gt;chip = w &amp; CID_ID_MASK;</div><div class='ctx'> 	sih-&gt;chiprev = (w &amp; CID_REV_MASK) &gt;&gt; CID_REV_SHIFT;</div><div class='ctx'> 	sih-&gt;chippkg = (w &amp; CID_PKG_MASK) &gt;&gt; CID_PKG_SHIFT;</div><div class='ctx'> </div><div class='del'>-	sih-&gt;issim = false;</div><div class='del'>-</div><div class='ctx'> 	/* scan for cores */</div><div class='del'>-	if (socitype == SOCI_AI) {</div><div class='del'>-		SI_MSG(("Found chip type AI (0x%08x)\n", w));</div><div class='del'>-		/* pass chipc address instead of original core base */</div><div class='del'>-		ai_scan(&amp;sii-&gt;pub, cc);</div><div class='del'>-	} else {</div><div class='del'>-		/* Found chip of unknown type */</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	/* no cores found, bail out */</div><div class='del'>-	if (sii-&gt;numcores == 0)</div><div class='add'>+	if (socitype != SOCI_AI)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	/* bus/core/clk setup */</div><div class='del'>-	origidx = SI_CC_IDX;</div><div class='del'>-	if (!ai_buscore_setup(sii, savewin, &amp;origidx))</div><div class='add'>+	SI_MSG("Found chip type AI (0x%08x)\n", w);</div><div class='add'>+	if (!ai_buscore_setup(sii, cc))</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='ctx'> 	/* Init nvram from sprom/otp if they exist */</div><div class='del'>-	if (srom_var_init(&amp;sii-&gt;pub, cc))</div><div class='add'>+	if (srom_var_init(&amp;sii-&gt;pub))</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='ctx'> 	ai_nvram_process(sii);</div><div class='ctx'> </div><div class='ctx'> 	/* === NVRAM, clock is ready === */</div><div class='del'>-	cc = (struct chipcregs __iomem *) ai_setcore(sih, CC_CORE_ID, 0);</div><div class='del'>-	W_REG(&amp;cc-&gt;gpiopullup, 0);</div><div class='del'>-	W_REG(&amp;cc-&gt;gpiopulldown, 0);</div><div class='del'>-	ai_setcoreidx(sih, origidx);</div><div class='add'>+	bcma_write32(cc, CHIPCREGOFFS(gpiopullup), 0);</div><div class='add'>+	bcma_write32(cc, CHIPCREGOFFS(gpiopulldown), 0);</div><div class='ctx'> </div><div class='ctx'> 	/* PMU specific initializations */</div><div class='del'>-	if (sih-&gt;cccaps &amp; CC_CAP_PMU) {</div><div class='del'>-		u32 xtalfreq;</div><div class='add'>+	if (ai_get_cccaps(sih) &amp; CC_CAP_PMU) {</div><div class='ctx'> 		si_pmu_init(sih);</div><div class='del'>-		si_pmu_chip_init(sih);</div><div class='del'>-</div><div class='del'>-		xtalfreq = si_pmu_measure_alpclk(sih);</div><div class='del'>-		si_pmu_pll_init(sih, xtalfreq);</div><div class='add'>+		(void)si_pmu_measure_alpclk(sih);</div><div class='ctx'> 		si_pmu_res_init(sih);</div><div class='del'>-		si_pmu_swreg_init(sih);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* setup the GPIO based LED powersave register */</div><div class='ctx'> 	w = getintvar(sih, BRCMS_SROM_LEDDC);</div><div class='ctx'> 	if (w == 0)</div><div class='ctx'> 		w = DEFAULT_GPIOTIMERVAL;</div><div class='del'>-	ai_corereg(sih, SI_CC_IDX, offsetof(struct chipcregs, gpiotimerval),</div><div class='del'>-		   ~0, w);</div><div class='add'>+	ai_cc_reg(sih, offsetof(struct chipcregs, gpiotimerval),</div><div class='add'>+		  ~0, w);</div><div class='ctx'> </div><div class='del'>-	if (PCIE(sii))</div><div class='add'>+	if (PCIE(sih))</div><div class='ctx'> 		pcicore_attach(sii-&gt;pch, SI_DOATTACH);</div><div class='ctx'> </div><div class='del'>-	if (sih-&gt;chip == BCM43224_CHIP_ID) {</div><div class='add'>+	if (ai_get_chip_id(sih) == BCM43224_CHIP_ID) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * enable 12 mA drive strenth for 43224 and</div><div class='ctx'> 		 * set chipControl register bit 15</div><div class='ctx'> 		 */</div><div class='del'>-		if (sih-&gt;chiprev == 0) {</div><div class='del'>-			SI_MSG(("Applying 43224A0 WARs\n"));</div><div class='del'>-			ai_corereg(sih, SI_CC_IDX,</div><div class='del'>-				   offsetof(struct chipcregs, chipcontrol),</div><div class='del'>-				   CCTRL43224_GPIO_TOGGLE,</div><div class='del'>-				   CCTRL43224_GPIO_TOGGLE);</div><div class='add'>+		if (ai_get_chiprev(sih) == 0) {</div><div class='add'>+			SI_MSG("Applying 43224A0 WARs\n");</div><div class='add'>+			ai_cc_reg(sih, offsetof(struct chipcregs, chipcontrol),</div><div class='add'>+				  CCTRL43224_GPIO_TOGGLE,</div><div class='add'>+				  CCTRL43224_GPIO_TOGGLE);</div><div class='ctx'> 			si_pmu_chipcontrol(sih, 0, CCTRL_43224A0_12MA_LED_DRIVE,</div><div class='ctx'> 					   CCTRL_43224A0_12MA_LED_DRIVE);</div><div class='ctx'> 		}</div><div class='del'>-		if (sih-&gt;chiprev &gt;= 1) {</div><div class='del'>-			SI_MSG(("Applying 43224B0+ WARs\n"));</div><div class='add'>+		if (ai_get_chiprev(sih) &gt;= 1) {</div><div class='add'>+			SI_MSG("Applying 43224B0+ WARs\n");</div><div class='ctx'> 			si_pmu_chipcontrol(sih, 0, CCTRL_43224B0_12MA_LED_DRIVE,</div><div class='ctx'> 					   CCTRL_43224B0_12MA_LED_DRIVE);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sih-&gt;chip == BCM4313_CHIP_ID) {</div><div class='add'>+	if (ai_get_chip_id(sih) == BCM4313_CHIP_ID) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * enable 12 mA drive strenth for 4313 and</div><div class='ctx'> 		 * set chipControl register bit 1</div><div class='ctx'> 		 */</div><div class='del'>-		SI_MSG(("Applying 4313 WARs\n"));</div><div class='add'>+		SI_MSG("Applying 4313 WARs\n");</div><div class='ctx'> 		si_pmu_chipcontrol(sih, 0, CCTRL_4313_12MA_LED_DRIVE,</div><div class='ctx'> 				   CCTRL_4313_12MA_LED_DRIVE);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1165,22 +667,19 @@ static struct si_info *ai_doattach(struct si_info *sii,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Allocate a si handle.</div><div class='del'>- * devid - pci device id (used to determine chip#)</div><div class='del'>- * osh - opaque OS handle</div><div class='del'>- * regs - virtual address of initial core registers</div><div class='add'>+ * Allocate a si handle and do the attach.</div><div class='ctx'>  */</div><div class='ctx'> struct si_pub *</div><div class='del'>-ai_attach(void __iomem *regs, struct pci_dev *sdh)</div><div class='add'>+ai_attach(struct bcma_bus *pbus)</div><div class='ctx'> {</div><div class='ctx'> 	struct si_info *sii;</div><div class='ctx'> </div><div class='ctx'> 	/* alloc struct si_info */</div><div class='del'>-	sii = kmalloc(sizeof(struct si_info), GFP_ATOMIC);</div><div class='add'>+	sii = kzalloc(sizeof(struct si_info), GFP_ATOMIC);</div><div class='ctx'> 	if (sii == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (ai_doattach(sii, regs, sdh) == NULL) {</div><div class='add'>+	if (ai_doattach(sii, pbus) == NULL) {</div><div class='ctx'> 		kfree(sii);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1209,292 +708,66 @@ void ai_detach(struct si_pub *sih)</div><div class='ctx'> 	kfree(sii);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* register driver interrupt disabling and restoring callback functions */</div><div class='del'>-void</div><div class='del'>-ai_register_intr_callback(struct si_pub *sih, void *intrsoff_fn,</div><div class='del'>-			  void *intrsrestore_fn,</div><div class='del'>-			  void *intrsenabled_fn, void *intr_arg)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-</div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-	sii-&gt;intr_arg = intr_arg;</div><div class='del'>-	sii-&gt;intrsoff_fn = (u32 (*)(void *)) intrsoff_fn;</div><div class='del'>-	sii-&gt;intrsrestore_fn = (void (*) (void *, u32)) intrsrestore_fn;</div><div class='del'>-	sii-&gt;intrsenabled_fn = (bool (*)(void *)) intrsenabled_fn;</div><div class='del'>-	/* save current core id.  when this function called, the current core</div><div class='del'>-	 * must be the core which provides driver functions(il, et, wl, etc.)</div><div class='del'>-	 */</div><div class='del'>-	sii-&gt;dev_coreid = sii-&gt;coreid[sii-&gt;curidx];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ai_deregister_intr_callback(struct si_pub *sih)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-</div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-	sii-&gt;intrsoff_fn = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-uint ai_coreid(struct si_pub *sih)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-</div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-	return sii-&gt;coreid[sii-&gt;curidx];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-uint ai_coreidx(struct si_pub *sih)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-</div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-	return sii-&gt;curidx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool ai_backplane64(struct si_pub *sih)</div><div class='del'>-{</div><div class='del'>-	return (sih-&gt;cccaps &amp; CC_CAP_BKPLN64) != 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* return index of coreid or BADIDX if not found */</div><div class='del'>-uint ai_findcoreidx(struct si_pub *sih, uint coreid, uint coreunit)</div><div class='add'>+struct bcma_device *ai_findcore(struct si_pub *sih, u16 coreid, u16 coreunit)</div><div class='ctx'> {</div><div class='add'>+	struct bcma_device *core;</div><div class='ctx'> 	struct si_info *sii;</div><div class='ctx'> 	uint found;</div><div class='del'>-	uint i;</div><div class='ctx'> </div><div class='ctx'> 	sii = (struct si_info *)sih;</div><div class='ctx'> </div><div class='ctx'> 	found = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; sii-&gt;numcores; i++)</div><div class='del'>-		if (sii-&gt;coreid[i] == coreid) {</div><div class='add'>+	list_for_each_entry(core, &amp;sii-&gt;icbus-&gt;cores, list)</div><div class='add'>+		if (core-&gt;id.id == coreid) {</div><div class='ctx'> 			if (found == coreunit)</div><div class='del'>-				return i;</div><div class='add'>+				return core;</div><div class='ctx'> 			found++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	return BADIDX;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function changes logical "focus" to the indicated core;</div><div class='del'>- * must be called with interrupts off.</div><div class='del'>- * Moreover, callers should keep interrupts off during switching</div><div class='del'>- * out of and back to d11 core.</div><div class='del'>- */</div><div class='del'>-void __iomem *ai_setcore(struct si_pub *sih, uint coreid, uint coreunit)</div><div class='del'>-{</div><div class='del'>-	uint idx;</div><div class='del'>-</div><div class='del'>-	idx = ai_findcoreidx(sih, coreid, coreunit);</div><div class='del'>-	if (idx &gt;= SI_MAXCORES)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return ai_setcoreidx(sih, idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Turn off interrupt as required by ai_setcore, before switch core */</div><div class='del'>-void __iomem *ai_switch_core(struct si_pub *sih, uint coreid, uint *origidx,</div><div class='del'>-			     uint *intr_val)</div><div class='del'>-{</div><div class='del'>-	void __iomem *cc;</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-</div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-</div><div class='del'>-	if (SI_FAST(sii)) {</div><div class='del'>-		/* Overloading the origidx variable to remember the coreid,</div><div class='del'>-		 * this works because the core ids cannot be confused with</div><div class='del'>-		 * core indices.</div><div class='del'>-		 */</div><div class='del'>-		*origidx = coreid;</div><div class='del'>-		if (coreid == CC_CORE_ID)</div><div class='del'>-			return CCREGS_FAST(sii);</div><div class='del'>-		else if (coreid == sih-&gt;buscoretype)</div><div class='del'>-			return PCIEREGS(sii);</div><div class='del'>-	}</div><div class='del'>-	INTR_OFF(sii, *intr_val);</div><div class='del'>-	*origidx = sii-&gt;curidx;</div><div class='del'>-	cc = ai_setcore(sih, coreid, 0);</div><div class='del'>-	return cc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* restore coreidx and restore interrupt */</div><div class='del'>-void ai_restore_core(struct si_pub *sih, uint coreid, uint intr_val)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-</div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-	if (SI_FAST(sii)</div><div class='del'>-	    &amp;&amp; ((coreid == CC_CORE_ID) || (coreid == sih-&gt;buscoretype)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ai_setcoreidx(sih, coreid);</div><div class='del'>-	INTR_RESTORE(sii, intr_val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ai_write_wrapperreg(struct si_pub *sih, u32 offset, u32 val)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii = (struct si_info *)sih;</div><div class='del'>-	u32 *w = (u32 *) sii-&gt;curwrap;</div><div class='del'>-	W_REG(w + (offset / 4), val);</div><div class='del'>-	return;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Switch to 'coreidx', issue a single arbitrary 32bit register mask&amp;set</div><div class='del'>- * operation, switch back to the original core, and return the new value.</div><div class='del'>- *</div><div class='del'>- * When using the silicon backplane, no fiddling with interrupts or core</div><div class='del'>- * switches is needed.</div><div class='del'>- *</div><div class='del'>- * Also, when using pci/pcie, we can optimize away the core switching for pci</div><div class='del'>- * registers and (on newer pci cores) chipcommon registers.</div><div class='add'>+ * read/modify chipcommon core register.</div><div class='ctx'>  */</div><div class='del'>-uint ai_corereg(struct si_pub *sih, uint coreidx, uint regoff, uint mask,</div><div class='del'>-		uint val)</div><div class='add'>+uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val)</div><div class='ctx'> {</div><div class='del'>-	uint origidx = 0;</div><div class='del'>-	u32 __iomem *r = NULL;</div><div class='del'>-	uint w;</div><div class='del'>-	uint intr_val = 0;</div><div class='del'>-	bool fast = false;</div><div class='add'>+	struct bcma_device *cc;</div><div class='add'>+	u32 w;</div><div class='ctx'> 	struct si_info *sii;</div><div class='ctx'> </div><div class='ctx'> 	sii = (struct si_info *)sih;</div><div class='del'>-</div><div class='del'>-	if (coreidx &gt;= SI_MAXCORES)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If pci/pcie, we can get at pci/pcie regs</div><div class='del'>-	 * and on newer cores to chipc</div><div class='del'>-	 */</div><div class='del'>-	if ((sii-&gt;coreid[coreidx] == CC_CORE_ID) &amp;&amp; SI_FAST(sii)) {</div><div class='del'>-		/* Chipc registers are mapped at 12KB */</div><div class='del'>-		fast = true;</div><div class='del'>-		r = (u32 __iomem *)((__iomem char *)sii-&gt;curmap +</div><div class='del'>-				    PCI_16KB0_CCREGS_OFFSET + regoff);</div><div class='del'>-	} else if (sii-&gt;pub.buscoreidx == coreidx) {</div><div class='del'>-		/*</div><div class='del'>-		 * pci registers are at either in the last 2KB of</div><div class='del'>-		 * an 8KB window or, in pcie and pci rev 13 at 8KB</div><div class='del'>-		 */</div><div class='del'>-		fast = true;</div><div class='del'>-		if (SI_FAST(sii))</div><div class='del'>-			r = (u32 __iomem *)((__iomem char *)sii-&gt;curmap +</div><div class='del'>-				    PCI_16KB0_PCIREGS_OFFSET + regoff);</div><div class='del'>-		else</div><div class='del'>-			r = (u32 __iomem *)((__iomem char *)sii-&gt;curmap +</div><div class='del'>-				    ((regoff &gt;= SBCONFIGOFF) ?</div><div class='del'>-				      PCI_BAR0_PCISBR_OFFSET :</div><div class='del'>-				      PCI_BAR0_PCIREGS_OFFSET) + regoff);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!fast) {</div><div class='del'>-		INTR_OFF(sii, intr_val);</div><div class='del'>-</div><div class='del'>-		/* save current core index */</div><div class='del'>-		origidx = ai_coreidx(&amp;sii-&gt;pub);</div><div class='del'>-</div><div class='del'>-		/* switch core */</div><div class='del'>-		r = (u32 __iomem *) ((unsigned char __iomem *)</div><div class='del'>-			ai_setcoreidx(&amp;sii-&gt;pub, coreidx) + regoff);</div><div class='del'>-	}</div><div class='add'>+	cc = sii-&gt;icbus-&gt;drv_cc.core;</div><div class='ctx'> </div><div class='ctx'> 	/* mask and set */</div><div class='ctx'> 	if (mask || val) {</div><div class='del'>-		w = (R_REG(r) &amp; ~mask) | val;</div><div class='del'>-		W_REG(r, w);</div><div class='add'>+		bcma_maskset32(cc, regoff, ~mask, val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* readback */</div><div class='del'>-	w = R_REG(r);</div><div class='del'>-</div><div class='del'>-	if (!fast) {</div><div class='del'>-		/* restore core index */</div><div class='del'>-		if (origidx != coreidx)</div><div class='del'>-			ai_setcoreidx(&amp;sii-&gt;pub, origidx);</div><div class='del'>-</div><div class='del'>-		INTR_RESTORE(sii, intr_val);</div><div class='del'>-	}</div><div class='add'>+	w = bcma_read32(cc, regoff);</div><div class='ctx'> </div><div class='ctx'> 	return w;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ai_core_disable(struct si_pub *sih, u32 bits)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-	u32 dummy;</div><div class='del'>-	struct aidmp *ai;</div><div class='del'>-</div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-</div><div class='del'>-	ai = sii-&gt;curwrap;</div><div class='del'>-</div><div class='del'>-	/* if core is already in reset, just return */</div><div class='del'>-	if (R_REG(&amp;ai-&gt;resetctrl) &amp; AIRC_RESET)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	W_REG(&amp;ai-&gt;ioctrl, bits);</div><div class='del'>-	dummy = R_REG(&amp;ai-&gt;ioctrl);</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	W_REG(&amp;ai-&gt;resetctrl, AIRC_RESET);</div><div class='del'>-	udelay(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* reset and re-enable a core</div><div class='del'>- * inputs:</div><div class='del'>- * bits - core specific bits that are set during and after reset sequence</div><div class='del'>- * resetbits - core specific bits that are set only during reset sequence</div><div class='del'>- */</div><div class='del'>-void ai_core_reset(struct si_pub *sih, u32 bits, u32 resetbits)</div><div class='del'>-{</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-	struct aidmp *ai;</div><div class='del'>-	u32 dummy;</div><div class='del'>-</div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-	ai = sii-&gt;curwrap;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Must do the disable sequence first to work</div><div class='del'>-	 * for arbitrary current core state.</div><div class='del'>-	 */</div><div class='del'>-	ai_core_disable(sih, (bits | resetbits));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now do the initialization sequence.</div><div class='del'>-	 */</div><div class='del'>-	W_REG(&amp;ai-&gt;ioctrl, (bits | SICF_FGC | SICF_CLOCK_EN));</div><div class='del'>-	dummy = R_REG(&amp;ai-&gt;ioctrl);</div><div class='del'>-	W_REG(&amp;ai-&gt;resetctrl, 0);</div><div class='del'>-	udelay(1);</div><div class='del'>-</div><div class='del'>-	W_REG(&amp;ai-&gt;ioctrl, (bits | SICF_CLOCK_EN));</div><div class='del'>-	dummy = R_REG(&amp;ai-&gt;ioctrl);</div><div class='del'>-	udelay(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* return the slow clock source - LPO, XTAL, or PCI */</div><div class='del'>-static uint ai_slowclk_src(struct si_info *sii)</div><div class='add'>+static uint ai_slowclk_src(struct si_pub *sih, struct bcma_device *cc)</div><div class='ctx'> {</div><div class='del'>-	struct chipcregs __iomem *cc;</div><div class='add'>+	struct si_info *sii;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	if (sii-&gt;pub.ccrev &lt; 6) {</div><div class='del'>-		pci_read_config_dword(sii-&gt;pbus, PCI_GPIO_OUT,</div><div class='add'>+	sii = (struct si_info *)sih;</div><div class='add'>+	if (ai_get_ccrev(&amp;sii-&gt;pub) &lt; 6) {</div><div class='add'>+		pci_read_config_dword(sii-&gt;pcibus, PCI_GPIO_OUT,</div><div class='ctx'> 				      &amp;val);</div><div class='ctx'> 		if (val &amp; PCI_CFG_GPIO_SCS)</div><div class='ctx'> 			return SCC_SS_PCI;</div><div class='ctx'> 		return SCC_SS_XTAL;</div><div class='del'>-	} else if (sii-&gt;pub.ccrev &lt; 10) {</div><div class='del'>-		cc = (struct chipcregs __iomem *)</div><div class='del'>-			ai_setcoreidx(&amp;sii-&gt;pub, sii-&gt;curidx);</div><div class='del'>-		return R_REG(&amp;cc-&gt;slow_clk_ctl) &amp; SCC_SS_MASK;</div><div class='add'>+	} else if (ai_get_ccrev(&amp;sii-&gt;pub) &lt; 10) {</div><div class='add'>+		return bcma_read32(cc, CHIPCREGOFFS(slow_clk_ctl)) &amp;</div><div class='add'>+		       SCC_SS_MASK;</div><div class='ctx'> 	} else			/* Insta-clock */</div><div class='ctx'> 		return SCC_SS_XTAL;</div><div class='ctx'> }</div><div class='hunk'>@@ -1503,24 +776,24 @@ static uint ai_slowclk_src(struct si_info *sii)</div><div class='ctx'> * return the ILP (slowclock) min or max frequency</div><div class='ctx'> * precondition: we've established the chip has dynamic clk control</div><div class='ctx'> */</div><div class='del'>-static uint ai_slowclk_freq(struct si_info *sii, bool max_freq,</div><div class='del'>-			    struct chipcregs __iomem *cc)</div><div class='add'>+static uint ai_slowclk_freq(struct si_pub *sih, bool max_freq,</div><div class='add'>+			    struct bcma_device *cc)</div><div class='ctx'> {</div><div class='ctx'> 	u32 slowclk;</div><div class='ctx'> 	uint div;</div><div class='ctx'> </div><div class='del'>-	slowclk = ai_slowclk_src(sii);</div><div class='del'>-	if (sii-&gt;pub.ccrev &lt; 6) {</div><div class='add'>+	slowclk = ai_slowclk_src(sih, cc);</div><div class='add'>+	if (ai_get_ccrev(sih) &lt; 6) {</div><div class='ctx'> 		if (slowclk == SCC_SS_PCI)</div><div class='ctx'> 			return max_freq ? (PCIMAXFREQ / 64)</div><div class='ctx'> 				: (PCIMINFREQ / 64);</div><div class='ctx'> 		else</div><div class='ctx'> 			return max_freq ? (XTALMAXFREQ / 32)</div><div class='ctx'> 				: (XTALMINFREQ / 32);</div><div class='del'>-	} else if (sii-&gt;pub.ccrev &lt; 10) {</div><div class='add'>+	} else if (ai_get_ccrev(sih) &lt; 10) {</div><div class='ctx'> 		div = 4 *</div><div class='del'>-		    (((R_REG(&amp;cc-&gt;slow_clk_ctl) &amp; SCC_CD_MASK) &gt;&gt;</div><div class='del'>-		      SCC_CD_SHIFT) + 1);</div><div class='add'>+		    (((bcma_read32(cc, CHIPCREGOFFS(slow_clk_ctl)) &amp;</div><div class='add'>+		      SCC_CD_MASK) &gt;&gt; SCC_CD_SHIFT) + 1);</div><div class='ctx'> 		if (slowclk == SCC_SS_LPO)</div><div class='ctx'> 			return max_freq ? LPOMAXFREQ : LPOMINFREQ;</div><div class='ctx'> 		else if (slowclk == SCC_SS_XTAL)</div><div class='hunk'>@@ -1531,15 +804,15 @@ static uint ai_slowclk_freq(struct si_info *sii, bool max_freq,</div><div class='ctx'> 				: (PCIMINFREQ / div);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Chipc rev 10 is InstaClock */</div><div class='del'>-		div = R_REG(&amp;cc-&gt;system_clk_ctl) &gt;&gt; SYCC_CD_SHIFT;</div><div class='del'>-		div = 4 * (div + 1);</div><div class='add'>+		div = bcma_read32(cc, CHIPCREGOFFS(system_clk_ctl));</div><div class='add'>+		div = 4 * ((div &gt;&gt; SYCC_CD_SHIFT) + 1);</div><div class='ctx'> 		return max_freq ? XTALMAXFREQ : (XTALMINFREQ / div);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-ai_clkctl_setdelay(struct si_info *sii, struct chipcregs __iomem *cc)</div><div class='add'>+ai_clkctl_setdelay(struct si_pub *sih, struct bcma_device *cc)</div><div class='ctx'> {</div><div class='ctx'> 	uint slowmaxfreq, pll_delay, slowclk;</div><div class='ctx'> 	uint pll_on_delay, fref_sel_delay;</div><div class='hunk'>@@ -1552,55 +825,40 @@ ai_clkctl_setdelay(struct si_info *sii, struct chipcregs __iomem *cc)</div><div class='ctx'> 	 * powered down by dynamic clk control logic.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	slowclk = ai_slowclk_src(sii);</div><div class='add'>+	slowclk = ai_slowclk_src(sih, cc);</div><div class='ctx'> 	if (slowclk != SCC_SS_XTAL)</div><div class='ctx'> 		pll_delay += XTAL_ON_DELAY;</div><div class='ctx'> </div><div class='ctx'> 	/* Starting with 4318 it is ILP that is used for the delays */</div><div class='ctx'> 	slowmaxfreq =</div><div class='del'>-	    ai_slowclk_freq(sii, (sii-&gt;pub.ccrev &gt;= 10) ? false : true, cc);</div><div class='add'>+	    ai_slowclk_freq(sih,</div><div class='add'>+			    (ai_get_ccrev(sih) &gt;= 10) ? false : true, cc);</div><div class='ctx'> </div><div class='ctx'> 	pll_on_delay = ((slowmaxfreq * pll_delay) + 999999) / 1000000;</div><div class='ctx'> 	fref_sel_delay = ((slowmaxfreq * FREF_DELAY) + 999999) / 1000000;</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;cc-&gt;pll_on_delay, pll_on_delay);</div><div class='del'>-	W_REG(&amp;cc-&gt;fref_sel_delay, fref_sel_delay);</div><div class='add'>+	bcma_write32(cc, CHIPCREGOFFS(pll_on_delay), pll_on_delay);</div><div class='add'>+	bcma_write32(cc, CHIPCREGOFFS(fref_sel_delay), fref_sel_delay);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* initialize power control delay registers */</div><div class='ctx'> void ai_clkctl_init(struct si_pub *sih)</div><div class='ctx'> {</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-	uint origidx = 0;</div><div class='del'>-	struct chipcregs __iomem *cc;</div><div class='del'>-	bool fast;</div><div class='add'>+	struct bcma_device *cc;</div><div class='ctx'> </div><div class='del'>-	if (!(sih-&gt;cccaps &amp; CC_CAP_PWR_CTL))</div><div class='add'>+	if (!(ai_get_cccaps(sih) &amp; CC_CAP_PWR_CTL))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-	fast = SI_FAST(sii);</div><div class='del'>-	if (!fast) {</div><div class='del'>-		origidx = sii-&gt;curidx;</div><div class='del'>-		cc = (struct chipcregs __iomem *)</div><div class='del'>-			ai_setcore(sih, CC_CORE_ID, 0);</div><div class='del'>-		if (cc == NULL)</div><div class='del'>-			return;</div><div class='del'>-	} else {</div><div class='del'>-		cc = (struct chipcregs __iomem *) CCREGS_FAST(sii);</div><div class='del'>-		if (cc == NULL)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='add'>+	cc = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);</div><div class='add'>+	if (cc == NULL)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* set all Instaclk chip ILP to 1 MHz */</div><div class='del'>-	if (sih-&gt;ccrev &gt;= 10)</div><div class='del'>-		SET_REG(&amp;cc-&gt;system_clk_ctl, SYCC_CD_MASK,</div><div class='del'>-			(ILP_DIV_1MHZ &lt;&lt; SYCC_CD_SHIFT));</div><div class='add'>+	if (ai_get_ccrev(sih) &gt;= 10)</div><div class='add'>+		bcma_maskset32(cc, CHIPCREGOFFS(system_clk_ctl), SYCC_CD_MASK,</div><div class='add'>+			       (ILP_DIV_1MHZ &lt;&lt; SYCC_CD_SHIFT));</div><div class='ctx'> </div><div class='del'>-	ai_clkctl_setdelay(sii, cc);</div><div class='del'>-</div><div class='del'>-	if (!fast)</div><div class='del'>-		ai_setcoreidx(sih, origidx);</div><div class='add'>+	ai_clkctl_setdelay(sih, cc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1610,47 +868,25 @@ void ai_clkctl_init(struct si_pub *sih)</div><div class='ctx'> u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih)</div><div class='ctx'> {</div><div class='ctx'> 	struct si_info *sii;</div><div class='del'>-	uint origidx = 0;</div><div class='del'>-	struct chipcregs __iomem *cc;</div><div class='add'>+	struct bcma_device *cc;</div><div class='ctx'> 	uint slowminfreq;</div><div class='ctx'> 	u16 fpdelay;</div><div class='del'>-	uint intr_val = 0;</div><div class='del'>-	bool fast;</div><div class='ctx'> </div><div class='ctx'> 	sii = (struct si_info *)sih;</div><div class='del'>-	if (sih-&gt;cccaps &amp; CC_CAP_PMU) {</div><div class='del'>-		INTR_OFF(sii, intr_val);</div><div class='add'>+	if (ai_get_cccaps(sih) &amp; CC_CAP_PMU) {</div><div class='ctx'> 		fpdelay = si_pmu_fast_pwrup_delay(sih);</div><div class='del'>-		INTR_RESTORE(sii, intr_val);</div><div class='ctx'> 		return fpdelay;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(sih-&gt;cccaps &amp; CC_CAP_PWR_CTL))</div><div class='add'>+	if (!(ai_get_cccaps(sih) &amp; CC_CAP_PWR_CTL))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	fast = SI_FAST(sii);</div><div class='ctx'> 	fpdelay = 0;</div><div class='del'>-	if (!fast) {</div><div class='del'>-		origidx = sii-&gt;curidx;</div><div class='del'>-		INTR_OFF(sii, intr_val);</div><div class='del'>-		cc = (struct chipcregs __iomem *)</div><div class='del'>-			ai_setcore(sih, CC_CORE_ID, 0);</div><div class='del'>-		if (cc == NULL)</div><div class='del'>-			goto done;</div><div class='del'>-	} else {</div><div class='del'>-		cc = (struct chipcregs __iomem *) CCREGS_FAST(sii);</div><div class='del'>-		if (cc == NULL)</div><div class='del'>-			goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	slowminfreq = ai_slowclk_freq(sii, false, cc);</div><div class='del'>-	fpdelay = (((R_REG(&amp;cc-&gt;pll_on_delay) + 2) * 1000000) +</div><div class='del'>-		   (slowminfreq - 1)) / slowminfreq;</div><div class='del'>-</div><div class='del'>- done:</div><div class='del'>-	if (!fast) {</div><div class='del'>-		ai_setcoreidx(sih, origidx);</div><div class='del'>-		INTR_RESTORE(sii, intr_val);</div><div class='add'>+	cc = ai_findcore(sih, CC_CORE_ID, 0);</div><div class='add'>+	if (cc) {</div><div class='add'>+		slowminfreq = ai_slowclk_freq(sih, false, cc);</div><div class='add'>+		fpdelay = (((bcma_read32(cc, CHIPCREGOFFS(pll_on_delay)) + 2)</div><div class='add'>+			    * 1000000) + (slowminfreq - 1)) / slowminfreq;</div><div class='ctx'> 	}</div><div class='ctx'> 	return fpdelay;</div><div class='ctx'> }</div><div class='hunk'>@@ -1664,12 +900,12 @@ int ai_clkctl_xtal(struct si_pub *sih, uint what, bool on)</div><div class='ctx'> 	sii = (struct si_info *)sih;</div><div class='ctx'> </div><div class='ctx'> 	/* pcie core doesn't have any mapping to control the xtal pu */</div><div class='del'>-	if (PCIE(sii))</div><div class='add'>+	if (PCIE(sih))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	pci_read_config_dword(sii-&gt;pbus, PCI_GPIO_IN, &amp;in);</div><div class='del'>-	pci_read_config_dword(sii-&gt;pbus, PCI_GPIO_OUT, &amp;out);</div><div class='del'>-	pci_read_config_dword(sii-&gt;pbus, PCI_GPIO_OUTEN, &amp;outen);</div><div class='add'>+	pci_read_config_dword(sii-&gt;pcibus, PCI_GPIO_IN, &amp;in);</div><div class='add'>+	pci_read_config_dword(sii-&gt;pcibus, PCI_GPIO_OUT, &amp;out);</div><div class='add'>+	pci_read_config_dword(sii-&gt;pcibus, PCI_GPIO_OUTEN, &amp;outen);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Avoid glitching the clock if GPRS is already using it.</div><div class='hunk'>@@ -1690,9 +926,9 @@ int ai_clkctl_xtal(struct si_pub *sih, uint what, bool on)</div><div class='ctx'> 			out |= PCI_CFG_GPIO_XTAL;</div><div class='ctx'> 			if (what &amp; PLL)</div><div class='ctx'> 				out |= PCI_CFG_GPIO_PLL;</div><div class='del'>-			pci_write_config_dword(sii-&gt;pbus,</div><div class='add'>+			pci_write_config_dword(sii-&gt;pcibus,</div><div class='ctx'> 					       PCI_GPIO_OUT, out);</div><div class='del'>-			pci_write_config_dword(sii-&gt;pbus,</div><div class='add'>+			pci_write_config_dword(sii-&gt;pcibus,</div><div class='ctx'> 					       PCI_GPIO_OUTEN, outen);</div><div class='ctx'> 			udelay(XTAL_ON_DELAY);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1700,7 +936,7 @@ int ai_clkctl_xtal(struct si_pub *sih, uint what, bool on)</div><div class='ctx'> 		/* turn pll on */</div><div class='ctx'> 		if (what &amp; PLL) {</div><div class='ctx'> 			out &amp;= ~PCI_CFG_GPIO_PLL;</div><div class='del'>-			pci_write_config_dword(sii-&gt;pbus,</div><div class='add'>+			pci_write_config_dword(sii-&gt;pcibus,</div><div class='ctx'> 					       PCI_GPIO_OUT, out);</div><div class='ctx'> 			mdelay(2);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1709,9 +945,9 @@ int ai_clkctl_xtal(struct si_pub *sih, uint what, bool on)</div><div class='ctx'> 			out &amp;= ~PCI_CFG_GPIO_XTAL;</div><div class='ctx'> 		if (what &amp; PLL)</div><div class='ctx'> 			out |= PCI_CFG_GPIO_PLL;</div><div class='del'>-		pci_write_config_dword(sii-&gt;pbus,</div><div class='add'>+		pci_write_config_dword(sii-&gt;pcibus,</div><div class='ctx'> 				       PCI_GPIO_OUT, out);</div><div class='del'>-		pci_write_config_dword(sii-&gt;pbus,</div><div class='add'>+		pci_write_config_dword(sii-&gt;pcibus,</div><div class='ctx'> 				       PCI_GPIO_OUTEN, outen);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1721,63 +957,52 @@ int ai_clkctl_xtal(struct si_pub *sih, uint what, bool on)</div><div class='ctx'> /* clk control mechanism through chipcommon, no policy checking */</div><div class='ctx'> static bool _ai_clkctl_cc(struct si_info *sii, uint mode)</div><div class='ctx'> {</div><div class='del'>-	uint origidx = 0;</div><div class='del'>-	struct chipcregs __iomem *cc;</div><div class='add'>+	struct bcma_device *cc;</div><div class='ctx'> 	u32 scc;</div><div class='del'>-	uint intr_val = 0;</div><div class='del'>-	bool fast = SI_FAST(sii);</div><div class='ctx'> </div><div class='ctx'> 	/* chipcommon cores prior to rev6 don't support dynamic clock control */</div><div class='del'>-	if (sii-&gt;pub.ccrev &lt; 6)</div><div class='add'>+	if (ai_get_ccrev(&amp;sii-&gt;pub) &lt; 6)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (!fast) {</div><div class='del'>-		INTR_OFF(sii, intr_val);</div><div class='del'>-		origidx = sii-&gt;curidx;</div><div class='del'>-		cc = (struct chipcregs __iomem *)</div><div class='del'>-					ai_setcore(&amp;sii-&gt;pub, CC_CORE_ID, 0);</div><div class='del'>-	} else {</div><div class='del'>-		cc = (struct chipcregs __iomem *) CCREGS_FAST(sii);</div><div class='del'>-		if (cc == NULL)</div><div class='del'>-			goto done;</div><div class='del'>-	}</div><div class='add'>+	cc = ai_findcore(&amp;sii-&gt;pub, BCMA_CORE_CHIPCOMMON, 0);</div><div class='ctx'> </div><div class='del'>-	if (!(sii-&gt;pub.cccaps &amp; CC_CAP_PWR_CTL) &amp;&amp; (sii-&gt;pub.ccrev &lt; 20))</div><div class='del'>-		goto done;</div><div class='add'>+	if (!(ai_get_cccaps(&amp;sii-&gt;pub) &amp; CC_CAP_PWR_CTL) &amp;&amp;</div><div class='add'>+	    (ai_get_ccrev(&amp;sii-&gt;pub) &lt; 20))</div><div class='add'>+		return mode == CLK_FAST;</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case CLK_FAST:		/* FORCEHT, fast (pll) clock */</div><div class='del'>-		if (sii-&gt;pub.ccrev &lt; 10) {</div><div class='add'>+		if (ai_get_ccrev(&amp;sii-&gt;pub) &lt; 10) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * don't forget to force xtal back</div><div class='ctx'> 			 * on before we clear SCC_DYN_XTAL..</div><div class='ctx'> 			 */</div><div class='ctx'> 			ai_clkctl_xtal(&amp;sii-&gt;pub, XTAL, ON);</div><div class='del'>-			SET_REG(&amp;cc-&gt;slow_clk_ctl,</div><div class='del'>-				(SCC_XC | SCC_FS | SCC_IP), SCC_IP);</div><div class='del'>-		} else if (sii-&gt;pub.ccrev &lt; 20) {</div><div class='del'>-			OR_REG(&amp;cc-&gt;system_clk_ctl, SYCC_HR);</div><div class='add'>+			bcma_maskset32(cc, CHIPCREGOFFS(slow_clk_ctl),</div><div class='add'>+				       (SCC_XC | SCC_FS | SCC_IP), SCC_IP);</div><div class='add'>+		} else if (ai_get_ccrev(&amp;sii-&gt;pub) &lt; 20) {</div><div class='add'>+			bcma_set32(cc, CHIPCREGOFFS(system_clk_ctl), SYCC_HR);</div><div class='ctx'> 		} else {</div><div class='del'>-			OR_REG(&amp;cc-&gt;clk_ctl_st, CCS_FORCEHT);</div><div class='add'>+			bcma_set32(cc, CHIPCREGOFFS(clk_ctl_st), CCS_FORCEHT);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* wait for the PLL */</div><div class='del'>-		if (sii-&gt;pub.cccaps &amp; CC_CAP_PMU) {</div><div class='add'>+		if (ai_get_cccaps(&amp;sii-&gt;pub) &amp; CC_CAP_PMU) {</div><div class='ctx'> 			u32 htavail = CCS_HTAVAIL;</div><div class='del'>-			SPINWAIT(((R_REG(&amp;cc-&gt;clk_ctl_st) &amp; htavail)</div><div class='del'>-				  == 0), PMU_MAX_TRANSITION_DLY);</div><div class='add'>+			SPINWAIT(((bcma_read32(cc, CHIPCREGOFFS(clk_ctl_st)) &amp;</div><div class='add'>+				   htavail) == 0), PMU_MAX_TRANSITION_DLY);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			udelay(PLL_DELAY);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CLK_DYNAMIC:	/* enable dynamic clock control */</div><div class='del'>-		if (sii-&gt;pub.ccrev &lt; 10) {</div><div class='del'>-			scc = R_REG(&amp;cc-&gt;slow_clk_ctl);</div><div class='add'>+		if (ai_get_ccrev(&amp;sii-&gt;pub) &lt; 10) {</div><div class='add'>+			scc = bcma_read32(cc, CHIPCREGOFFS(slow_clk_ctl));</div><div class='ctx'> 			scc &amp;= ~(SCC_FS | SCC_IP | SCC_XC);</div><div class='ctx'> 			if ((scc &amp; SCC_SS_MASK) != SCC_SS_XTAL)</div><div class='ctx'> 				scc |= SCC_XC;</div><div class='del'>-			W_REG(&amp;cc-&gt;slow_clk_ctl, scc);</div><div class='add'>+			bcma_write32(cc, CHIPCREGOFFS(slow_clk_ctl), scc);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * for dynamic control, we have to</div><div class='hunk'>@@ -1785,11 +1010,11 @@ static bool _ai_clkctl_cc(struct si_info *sii, uint mode)</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (scc &amp; SCC_XC)</div><div class='ctx'> 				ai_clkctl_xtal(&amp;sii-&gt;pub, XTAL, OFF);</div><div class='del'>-		} else if (sii-&gt;pub.ccrev &lt; 20) {</div><div class='add'>+		} else if (ai_get_ccrev(&amp;sii-&gt;pub) &lt; 20) {</div><div class='ctx'> 			/* Instaclock */</div><div class='del'>-			AND_REG(&amp;cc-&gt;system_clk_ctl, ~SYCC_HR);</div><div class='add'>+			bcma_mask32(cc, CHIPCREGOFFS(system_clk_ctl), ~SYCC_HR);</div><div class='ctx'> 		} else {</div><div class='del'>-			AND_REG(&amp;cc-&gt;clk_ctl_st, ~CCS_FORCEHT);</div><div class='add'>+			bcma_mask32(cc, CHIPCREGOFFS(clk_ctl_st), ~CCS_FORCEHT);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1797,11 +1022,6 @@ static bool _ai_clkctl_cc(struct si_info *sii, uint mode)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>- done:</div><div class='del'>-	if (!fast) {</div><div class='del'>-		ai_setcoreidx(&amp;sii-&gt;pub, origidx);</div><div class='del'>-		INTR_RESTORE(sii, intr_val);</div><div class='del'>-	}</div><div class='ctx'> 	return mode == CLK_FAST;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1820,46 +1040,25 @@ bool ai_clkctl_cc(struct si_pub *sih, uint mode)</div><div class='ctx'> 	sii = (struct si_info *)sih;</div><div class='ctx'> </div><div class='ctx'> 	/* chipcommon cores prior to rev6 don't support dynamic clock control */</div><div class='del'>-	if (sih-&gt;ccrev &lt; 6)</div><div class='add'>+	if (ai_get_ccrev(sih) &lt; 6)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (PCI_FORCEHT(sii))</div><div class='add'>+	if (PCI_FORCEHT(sih))</div><div class='ctx'> 		return mode == CLK_FAST;</div><div class='ctx'> </div><div class='ctx'> 	return _ai_clkctl_cc(sii, mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Build device path */</div><div class='del'>-int ai_devpath(struct si_pub *sih, char *path, int size)</div><div class='del'>-{</div><div class='del'>-	int slen;</div><div class='del'>-</div><div class='del'>-	if (!path || size &lt;= 0)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	slen = snprintf(path, (size_t) size, "pci/%u/%u/",</div><div class='del'>-		((struct si_info *)sih)-&gt;pbus-&gt;bus-&gt;number,</div><div class='del'>-		PCI_SLOT(((struct pci_dev *)</div><div class='del'>-				(((struct si_info *)(sih))-&gt;pbus))-&gt;devfn));</div><div class='del'>-</div><div class='del'>-	if (slen &lt; 0 || slen &gt;= size) {</div><div class='del'>-		path[0] = '\0';</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='ctx'> void ai_pci_up(struct si_pub *sih)</div><div class='ctx'> {</div><div class='ctx'> 	struct si_info *sii;</div><div class='ctx'> </div><div class='ctx'> 	sii = (struct si_info *)sih;</div><div class='ctx'> </div><div class='del'>-	if (PCI_FORCEHT(sii))</div><div class='add'>+	if (PCI_FORCEHT(sih))</div><div class='ctx'> 		_ai_clkctl_cc(sii, CLK_FAST);</div><div class='ctx'> </div><div class='del'>-	if (PCIE(sii))</div><div class='add'>+	if (PCIE(sih))</div><div class='ctx'> 		pcicore_up(sii-&gt;pch, SI_PCIUP);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -1882,7 +1081,7 @@ void ai_pci_down(struct si_pub *sih)</div><div class='ctx'> 	sii = (struct si_info *)sih;</div><div class='ctx'> </div><div class='ctx'> 	/* release FORCEHT since chip is going to "down" state */</div><div class='del'>-	if (PCI_FORCEHT(sii))</div><div class='add'>+	if (PCI_FORCEHT(sih))</div><div class='ctx'> 		_ai_clkctl_cc(sii, CLK_DYNAMIC);</div><div class='ctx'> </div><div class='ctx'> 	pcicore_down(sii-&gt;pch, SI_PCIDOWN);</div><div class='hunk'>@@ -1895,42 +1094,23 @@ void ai_pci_down(struct si_pub *sih)</div><div class='ctx'> void ai_pci_setup(struct si_pub *sih, uint coremask)</div><div class='ctx'> {</div><div class='ctx'> 	struct si_info *sii;</div><div class='del'>-	struct sbpciregs __iomem *regs = NULL;</div><div class='del'>-	u32 siflag = 0, w;</div><div class='del'>-	uint idx = 0;</div><div class='add'>+	u32 w;</div><div class='ctx'> </div><div class='ctx'> 	sii = (struct si_info *)sih;</div><div class='ctx'> </div><div class='del'>-	if (PCI(sii)) {</div><div class='del'>-		/* get current core index */</div><div class='del'>-		idx = sii-&gt;curidx;</div><div class='del'>-</div><div class='del'>-		/* we interrupt on this backplane flag number */</div><div class='del'>-		siflag = ai_flag(sih);</div><div class='del'>-</div><div class='del'>-		/* switch over to pci core */</div><div class='del'>-		regs = ai_setcoreidx(sih, sii-&gt;pub.buscoreidx);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Enable sb-&gt;pci interrupts.  Assume</div><div class='ctx'> 	 * PCI rev 2.3 support was added in pci core rev 6 and things changed..</div><div class='ctx'> 	 */</div><div class='del'>-	if (PCIE(sii) || (PCI(sii) &amp;&amp; ((sii-&gt;pub.buscorerev) &gt;= 6))) {</div><div class='add'>+	if (PCIE(sih) || (PCI(sih) &amp;&amp; (ai_get_buscorerev(sih) &gt;= 6))) {</div><div class='ctx'> 		/* pci config write to set this core bit in PCIIntMask */</div><div class='del'>-		pci_read_config_dword(sii-&gt;pbus, PCI_INT_MASK, &amp;w);</div><div class='add'>+		pci_read_config_dword(sii-&gt;pcibus, PCI_INT_MASK, &amp;w);</div><div class='ctx'> 		w |= (coremask &lt;&lt; PCI_SBIM_SHIFT);</div><div class='del'>-		pci_write_config_dword(sii-&gt;pbus, PCI_INT_MASK, w);</div><div class='del'>-	} else {</div><div class='del'>-		/* set sbintvec bit for our flag number */</div><div class='del'>-		ai_setint(sih, siflag);</div><div class='add'>+		pci_write_config_dword(sii-&gt;pcibus, PCI_INT_MASK, w);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (PCI(sii)) {</div><div class='del'>-		pcicore_pci_setup(sii-&gt;pch, regs);</div><div class='del'>-</div><div class='del'>-		/* switch back to previous core */</div><div class='del'>-		ai_setcoreidx(sih, idx);</div><div class='add'>+	if (PCI(sih)) {</div><div class='add'>+		pcicore_pci_setup(sii-&gt;pch);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1940,25 +1120,11 @@ void ai_pci_setup(struct si_pub *sih, uint coremask)</div><div class='ctx'>  */</div><div class='ctx'> int ai_pci_fixcfg(struct si_pub *sih)</div><div class='ctx'> {</div><div class='del'>-	uint origidx;</div><div class='del'>-	void __iomem *regs = NULL;</div><div class='ctx'> 	struct si_info *sii = (struct si_info *)sih;</div><div class='ctx'> </div><div class='ctx'> 	/* Fixup PI in SROM shadow area to enable the correct PCI core access */</div><div class='del'>-	/* save the current index */</div><div class='del'>-	origidx = ai_coreidx(&amp;sii-&gt;pub);</div><div class='del'>-</div><div class='ctx'> 	/* check 'pi' is correct and fix it if not */</div><div class='del'>-	regs = ai_setcore(&amp;sii-&gt;pub, sii-&gt;pub.buscoretype, 0);</div><div class='del'>-	if (sii-&gt;pub.buscoretype == PCIE_CORE_ID)</div><div class='del'>-		pcicore_fixcfg_pcie(sii-&gt;pch,</div><div class='del'>-				    (struct sbpcieregs __iomem *)regs);</div><div class='del'>-	else if (sii-&gt;pub.buscoretype == PCI_CORE_ID)</div><div class='del'>-		pcicore_fixcfg_pci(sii-&gt;pch, (struct sbpciregs __iomem *)regs);</div><div class='del'>-</div><div class='del'>-	/* restore the original index */</div><div class='del'>-	ai_setcoreidx(&amp;sii-&gt;pub, origidx);</div><div class='del'>-</div><div class='add'>+	pcicore_fixcfg(sii-&gt;pch);</div><div class='ctx'> 	pcicore_hwup(sii-&gt;pch);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1969,58 +1135,42 @@ u32 ai_gpiocontrol(struct si_pub *sih, u32 mask, u32 val, u8 priority)</div><div class='ctx'> 	uint regoff;</div><div class='ctx'> </div><div class='ctx'> 	regoff = offsetof(struct chipcregs, gpiocontrol);</div><div class='del'>-	return ai_corereg(sih, SI_CC_IDX, regoff, mask, val);</div><div class='add'>+	return ai_cc_reg(sih, regoff, mask, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ai_chipcontrl_epa4331(struct si_pub *sih, bool on)</div><div class='ctx'> {</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-	struct chipcregs __iomem *cc;</div><div class='del'>-	uint origidx;</div><div class='add'>+	struct bcma_device *cc;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-	origidx = ai_coreidx(sih);</div><div class='del'>-</div><div class='del'>-	cc = (struct chipcregs __iomem *) ai_setcore(sih, CC_CORE_ID, 0);</div><div class='del'>-</div><div class='del'>-	val = R_REG(&amp;cc-&gt;chipcontrol);</div><div class='add'>+	cc = ai_findcore(sih, CC_CORE_ID, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (on) {</div><div class='del'>-		if (sih-&gt;chippkg == 9 || sih-&gt;chippkg == 0xb)</div><div class='add'>+		if (ai_get_chippkg(sih) == 9 || ai_get_chippkg(sih) == 0xb)</div><div class='ctx'> 			/* Ext PA Controls for 4331 12x9 Package */</div><div class='del'>-			W_REG(&amp;cc-&gt;chipcontrol, val |</div><div class='del'>-			      CCTRL4331_EXTPA_EN |</div><div class='del'>-			      CCTRL4331_EXTPA_ON_GPIO2_5);</div><div class='add'>+			bcma_set32(cc, CHIPCREGOFFS(chipcontrol),</div><div class='add'>+				   CCTRL4331_EXTPA_EN |</div><div class='add'>+				   CCTRL4331_EXTPA_ON_GPIO2_5);</div><div class='ctx'> 		else</div><div class='ctx'> 			/* Ext PA Controls for 4331 12x12 Package */</div><div class='del'>-			W_REG(&amp;cc-&gt;chipcontrol,</div><div class='del'>-			      val | CCTRL4331_EXTPA_EN);</div><div class='add'>+			bcma_set32(cc, CHIPCREGOFFS(chipcontrol),</div><div class='add'>+				   CCTRL4331_EXTPA_EN);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		val &amp;= ~(CCTRL4331_EXTPA_EN | CCTRL4331_EXTPA_ON_GPIO2_5);</div><div class='del'>-		W_REG(&amp;cc-&gt;chipcontrol, val);</div><div class='add'>+		bcma_mask32(cc, CHIPCREGOFFS(chipcontrol),</div><div class='add'>+			    ~(CCTRL4331_EXTPA_EN | CCTRL4331_EXTPA_ON_GPIO2_5));</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ai_setcoreidx(sih, origidx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Enable BT-COEX &amp; Ex-PA for 4313 */</div><div class='ctx'> void ai_epa_4313war(struct si_pub *sih)</div><div class='ctx'> {</div><div class='del'>-	struct si_info *sii;</div><div class='del'>-	struct chipcregs __iomem *cc;</div><div class='del'>-	uint origidx;</div><div class='add'>+	struct bcma_device *cc;</div><div class='ctx'> </div><div class='del'>-	sii = (struct si_info *)sih;</div><div class='del'>-	origidx = ai_coreidx(sih);</div><div class='del'>-</div><div class='del'>-	cc = ai_setcore(sih, CC_CORE_ID, 0);</div><div class='add'>+	cc = ai_findcore(sih, CC_CORE_ID, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* EPA Fix */</div><div class='del'>-	W_REG(&amp;cc-&gt;gpiocontrol,</div><div class='del'>-	      R_REG(&amp;cc-&gt;gpiocontrol) | GPIO_CTRL_EPA_EN_MASK);</div><div class='del'>-</div><div class='del'>-	ai_setcoreidx(sih, origidx);</div><div class='add'>+	bcma_set32(cc, CHIPCREGOFFS(gpiocontrol), GPIO_CTRL_EPA_EN_MASK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* check if the device is removed */</div><div class='hunk'>@@ -2031,7 +1181,7 @@ bool ai_deviceremoved(struct si_pub *sih)</div><div class='ctx'> </div><div class='ctx'> 	sii = (struct si_info *)sih;</div><div class='ctx'> </div><div class='del'>-	pci_read_config_dword(sii-&gt;pbus, PCI_VENDOR_ID, &amp;w);</div><div class='add'>+	pci_read_config_dword(sii-&gt;pcibus, PCI_VENDOR_ID, &amp;w);</div><div class='ctx'> 	if ((w &amp; 0xFFFF) != PCI_VENDOR_ID_BROADCOM)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='hunk'>@@ -2040,26 +1190,23 @@ bool ai_deviceremoved(struct si_pub *sih)</div><div class='ctx'> </div><div class='ctx'> bool ai_is_sprom_available(struct si_pub *sih)</div><div class='ctx'> {</div><div class='del'>-	if (sih-&gt;ccrev &gt;= 31) {</div><div class='del'>-		struct si_info *sii;</div><div class='del'>-		uint origidx;</div><div class='del'>-		struct chipcregs __iomem *cc;</div><div class='add'>+	struct si_info *sii = (struct si_info *)sih;</div><div class='add'>+</div><div class='add'>+	if (ai_get_ccrev(sih) &gt;= 31) {</div><div class='add'>+		struct bcma_device *cc;</div><div class='ctx'> 		u32 sromctrl;</div><div class='ctx'> </div><div class='del'>-		if ((sih-&gt;cccaps &amp; CC_CAP_SROM) == 0)</div><div class='add'>+		if ((ai_get_cccaps(sih) &amp; CC_CAP_SROM) == 0)</div><div class='ctx'> 			return false;</div><div class='ctx'> </div><div class='del'>-		sii = (struct si_info *)sih;</div><div class='del'>-		origidx = sii-&gt;curidx;</div><div class='del'>-		cc = ai_setcoreidx(sih, SI_CC_IDX);</div><div class='del'>-		sromctrl = R_REG(&amp;cc-&gt;sromcontrol);</div><div class='del'>-		ai_setcoreidx(sih, origidx);</div><div class='add'>+		cc = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);</div><div class='add'>+		sromctrl = bcma_read32(cc, CHIPCREGOFFS(sromcontrol));</div><div class='ctx'> 		return sromctrl &amp; SRC_PRESENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (sih-&gt;chip) {</div><div class='add'>+	switch (ai_get_chip_id(sih)) {</div><div class='ctx'> 	case BCM4313_CHIP_ID:</div><div class='del'>-		return (sih-&gt;chipst &amp; CST4313_SPROM_PRESENT) != 0;</div><div class='add'>+		return (sii-&gt;chipst &amp; CST4313_SPROM_PRESENT) != 0;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2067,9 +1214,11 @@ bool ai_is_sprom_available(struct si_pub *sih)</div><div class='ctx'> </div><div class='ctx'> bool ai_is_otp_disabled(struct si_pub *sih)</div><div class='ctx'> {</div><div class='del'>-	switch (sih-&gt;chip) {</div><div class='add'>+	struct si_info *sii = (struct si_info *)sih;</div><div class='add'>+</div><div class='add'>+	switch (ai_get_chip_id(sih)) {</div><div class='ctx'> 	case BCM4313_CHIP_ID:</div><div class='del'>-		return (sih-&gt;chipst &amp; CST4313_OTP_PRESENT) == 0;</div><div class='add'>+		return (sii-&gt;chipst &amp; CST4313_OTP_PRESENT) == 0;</div><div class='ctx'> 		/* These chips always have their OTP on */</div><div class='ctx'> 	case BCM43224_CHIP_ID:</div><div class='ctx'> 	case BCM43225_CHIP_ID:</div><div class='hunk'>@@ -2077,3 +1226,15 @@ bool ai_is_otp_disabled(struct si_pub *sih)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+uint ai_get_buscoretype(struct si_pub *sih)</div><div class='add'>+{</div><div class='add'>+	struct si_info *sii = (struct si_info *)sih;</div><div class='add'>+	return sii-&gt;buscore-&gt;id.id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+uint ai_get_buscorerev(struct si_pub *sih)</div><div class='add'>+{</div><div class='add'>+	struct si_info *sii = (struct si_info *)sih;</div><div class='add'>+	return sii-&gt;buscore-&gt;id.rev;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h<br/>index 106a7424a7cd..f84c6f781692 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/aiutils.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/aiutils.h</a></div><div class='hunk'>@@ -17,6 +17,8 @@</div><div class='ctx'> #ifndef	_BRCM_AIUTILS_H_</div><div class='ctx'> #define	_BRCM_AIUTILS_H_</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bcma/bcma.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "types.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -38,88 +40,12 @@</div><div class='ctx'> /* PCIE Client Mode sb2pcitranslation2 (2 ZettaBytes), high 32 bits */</div><div class='ctx'> #define SI_PCIE_DMA_H32		0x80000000</div><div class='ctx'> </div><div class='del'>-/* core codes */</div><div class='del'>-#define	NODEV_CORE_ID		0x700	/* Invalid coreid */</div><div class='del'>-#define	CC_CORE_ID		0x800	/* chipcommon core */</div><div class='del'>-#define	ILINE20_CORE_ID		0x801	/* iline20 core */</div><div class='del'>-#define	SRAM_CORE_ID		0x802	/* sram core */</div><div class='del'>-#define	SDRAM_CORE_ID		0x803	/* sdram core */</div><div class='del'>-#define	PCI_CORE_ID		0x804	/* pci core */</div><div class='del'>-#define	MIPS_CORE_ID		0x805	/* mips core */</div><div class='del'>-#define	ENET_CORE_ID		0x806	/* enet mac core */</div><div class='del'>-#define	CODEC_CORE_ID		0x807	/* v90 codec core */</div><div class='del'>-#define	USB_CORE_ID		0x808	/* usb 1.1 host/device core */</div><div class='del'>-#define	ADSL_CORE_ID		0x809	/* ADSL core */</div><div class='del'>-#define	ILINE100_CORE_ID	0x80a	/* iline100 core */</div><div class='del'>-#define	IPSEC_CORE_ID		0x80b	/* ipsec core */</div><div class='del'>-#define	UTOPIA_CORE_ID		0x80c	/* utopia core */</div><div class='del'>-#define	PCMCIA_CORE_ID		0x80d	/* pcmcia core */</div><div class='del'>-#define	SOCRAM_CORE_ID		0x80e	/* internal memory core */</div><div class='del'>-#define	MEMC_CORE_ID		0x80f	/* memc sdram core */</div><div class='del'>-#define	OFDM_CORE_ID		0x810	/* OFDM phy core */</div><div class='del'>-#define	EXTIF_CORE_ID		0x811	/* external interface core */</div><div class='del'>-#define	D11_CORE_ID		0x812	/* 802.11 MAC core */</div><div class='del'>-#define	APHY_CORE_ID		0x813	/* 802.11a phy core */</div><div class='del'>-#define	BPHY_CORE_ID		0x814	/* 802.11b phy core */</div><div class='del'>-#define	GPHY_CORE_ID		0x815	/* 802.11g phy core */</div><div class='del'>-#define	MIPS33_CORE_ID		0x816	/* mips3302 core */</div><div class='del'>-#define	USB11H_CORE_ID		0x817	/* usb 1.1 host core */</div><div class='del'>-#define	USB11D_CORE_ID		0x818	/* usb 1.1 device core */</div><div class='del'>-#define	USB20H_CORE_ID		0x819	/* usb 2.0 host core */</div><div class='del'>-#define	USB20D_CORE_ID		0x81a	/* usb 2.0 device core */</div><div class='del'>-#define	SDIOH_CORE_ID		0x81b	/* sdio host core */</div><div class='del'>-#define	ROBO_CORE_ID		0x81c	/* roboswitch core */</div><div class='del'>-#define	ATA100_CORE_ID		0x81d	/* parallel ATA core */</div><div class='del'>-#define	SATAXOR_CORE_ID		0x81e	/* serial ATA &amp; XOR DMA core */</div><div class='del'>-#define	GIGETH_CORE_ID		0x81f	/* gigabit ethernet core */</div><div class='del'>-#define	PCIE_CORE_ID		0x820	/* pci express core */</div><div class='del'>-#define	NPHY_CORE_ID		0x821	/* 802.11n 2x2 phy core */</div><div class='del'>-#define	SRAMC_CORE_ID		0x822	/* SRAM controller core */</div><div class='del'>-#define	MINIMAC_CORE_ID		0x823	/* MINI MAC/phy core */</div><div class='del'>-#define	ARM11_CORE_ID		0x824	/* ARM 1176 core */</div><div class='del'>-#define	ARM7S_CORE_ID		0x825	/* ARM7tdmi-s core */</div><div class='del'>-#define	LPPHY_CORE_ID		0x826	/* 802.11a/b/g phy core */</div><div class='del'>-#define	PMU_CORE_ID		0x827	/* PMU core */</div><div class='del'>-#define	SSNPHY_CORE_ID		0x828	/* 802.11n single-stream phy core */</div><div class='del'>-#define	SDIOD_CORE_ID		0x829	/* SDIO device core */</div><div class='del'>-#define	ARMCM3_CORE_ID		0x82a	/* ARM Cortex M3 core */</div><div class='del'>-#define	HTPHY_CORE_ID		0x82b	/* 802.11n 4x4 phy core */</div><div class='del'>-#define	MIPS74K_CORE_ID		0x82c	/* mips 74k core */</div><div class='del'>-#define	GMAC_CORE_ID		0x82d	/* Gigabit MAC core */</div><div class='del'>-#define	DMEMC_CORE_ID		0x82e	/* DDR1/2 memory controller core */</div><div class='del'>-#define	PCIERC_CORE_ID		0x82f	/* PCIE Root Complex core */</div><div class='del'>-#define	OCP_CORE_ID		0x830	/* OCP2OCP bridge core */</div><div class='del'>-#define	SC_CORE_ID		0x831	/* shared common core */</div><div class='del'>-#define	AHB_CORE_ID		0x832	/* OCP2AHB bridge core */</div><div class='del'>-#define	SPIH_CORE_ID		0x833	/* SPI host core */</div><div class='del'>-#define	I2S_CORE_ID		0x834	/* I2S core */</div><div class='del'>-#define	DMEMS_CORE_ID		0x835	/* SDR/DDR1 memory controller core */</div><div class='del'>-#define	DEF_SHIM_COMP		0x837	/* SHIM component in ubus/6362 */</div><div class='del'>-#define OOB_ROUTER_CORE_ID	0x367	/* OOB router core ID */</div><div class='del'>-#define	DEF_AI_COMP		0xfff	/* Default component, in ai chips it</div><div class='del'>-					 * maps all unused address ranges</div><div class='del'>-					 */</div><div class='del'>-</div><div class='ctx'> /* chipcommon being the first core: */</div><div class='ctx'> #define	SI_CC_IDX		0</div><div class='ctx'> </div><div class='ctx'> /* SOC Interconnect types (aka chip types) */</div><div class='ctx'> #define	SOCI_AI			1</div><div class='ctx'> </div><div class='del'>-/* Common core control flags */</div><div class='del'>-#define	SICF_BIST_EN		0x8000</div><div class='del'>-#define	SICF_PME_EN		0x4000</div><div class='del'>-#define	SICF_CORE_BITS		0x3ffc</div><div class='del'>-#define	SICF_FGC		0x0002</div><div class='del'>-#define	SICF_CLOCK_EN		0x0001</div><div class='del'>-</div><div class='del'>-/* Common core status flags */</div><div class='del'>-#define	SISF_BIST_DONE		0x8000</div><div class='del'>-#define	SISF_BIST_ERROR		0x4000</div><div class='del'>-#define	SISF_GATED_CLK		0x2000</div><div class='del'>-#define	SISF_DMA64		0x1000</div><div class='del'>-#define	SISF_CORE_BITS		0x0fff</div><div class='del'>-</div><div class='ctx'> /* A register that is common to all cores to</div><div class='ctx'>  * communicate w/PMU regarding clock control.</div><div class='ctx'>  */</div><div class='hunk'>@@ -220,26 +146,15 @@</div><div class='ctx'>  *   public (read-only) portion of aiutils handle returned by si_attach()</div><div class='ctx'>  */</div><div class='ctx'> struct si_pub {</div><div class='del'>-	uint buscoretype;	/* PCI_CORE_ID, PCIE_CORE_ID, PCMCIA_CORE_ID */</div><div class='del'>-	uint buscorerev;	/* buscore rev */</div><div class='del'>-	uint buscoreidx;	/* buscore index */</div><div class='ctx'> 	int ccrev;		/* chip common core rev */</div><div class='ctx'> 	u32 cccaps;		/* chip common capabilities */</div><div class='del'>-	u32 cccaps_ext;	/* chip common capabilities extension */</div><div class='ctx'> 	int pmurev;		/* pmu core rev */</div><div class='ctx'> 	u32 pmucaps;		/* pmu capabilities */</div><div class='ctx'> 	uint boardtype;		/* board type */</div><div class='ctx'> 	uint boardvendor;	/* board vendor */</div><div class='del'>-	uint boardflags;	/* board flags */</div><div class='del'>-	uint boardflags2;	/* board flags2 */</div><div class='ctx'> 	uint chip;		/* chip number */</div><div class='ctx'> 	uint chiprev;		/* chip revision */</div><div class='ctx'> 	uint chippkg;		/* chip package option */</div><div class='del'>-	u32 chipst;		/* chip status */</div><div class='del'>-	bool issim;		/* chip is in simulation or emulation */</div><div class='del'>-	uint socirev;		/* SOC interconnect rev */</div><div class='del'>-	bool pci_pr32414;</div><div class='del'>-</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct pci_dev;</div><div class='hunk'>@@ -255,38 +170,13 @@ struct gpioh_item {</div><div class='ctx'> /* misc si info needed by some of the routines */</div><div class='ctx'> struct si_info {</div><div class='ctx'> 	struct si_pub pub;	/* back plane public state (must be first) */</div><div class='del'>-	struct pci_dev *pbus;	/* handle to pci bus */</div><div class='del'>-	uint dev_coreid;	/* the core provides driver functions */</div><div class='del'>-	void *intr_arg;		/* interrupt callback function arg */</div><div class='del'>-	u32 (*intrsoff_fn) (void *intr_arg); /* turns chip interrupts off */</div><div class='del'>-	/* restore chip interrupts */</div><div class='del'>-	void (*intrsrestore_fn) (void *intr_arg, u32 arg);</div><div class='del'>-	/* check if interrupts are enabled */</div><div class='del'>-	bool (*intrsenabled_fn) (void *intr_arg);</div><div class='del'>-</div><div class='add'>+	struct bcma_bus *icbus;	/* handle to soc interconnect bus */</div><div class='add'>+	struct pci_dev *pcibus;	/* handle to pci bus */</div><div class='ctx'> 	struct pcicore_info *pch; /* PCI/E core handle */</div><div class='del'>-</div><div class='add'>+	struct bcma_device *buscore;</div><div class='ctx'> 	struct list_head var_list; /* list of srom variables */</div><div class='ctx'> </div><div class='del'>-	void __iomem *curmap;			/* current regs va */</div><div class='del'>-	void __iomem *regs[SI_MAXCORES];	/* other regs va */</div><div class='del'>-</div><div class='del'>-	uint curidx;		/* current core index */</div><div class='del'>-	uint numcores;		/* # discovered cores */</div><div class='del'>-	uint coreid[SI_MAXCORES]; /* id of each core */</div><div class='del'>-	u32 coresba[SI_MAXCORES]; /* backplane address of each core */</div><div class='del'>-	void *regs2[SI_MAXCORES]; /* 2nd virtual address per core (usbh20) */</div><div class='del'>-	u32 coresba2[SI_MAXCORES]; /* 2nd phys address per core (usbh20) */</div><div class='del'>-	u32 coresba_size[SI_MAXCORES]; /* backplane address space size */</div><div class='del'>-	u32 coresba2_size[SI_MAXCORES];	/* second address space size */</div><div class='del'>-</div><div class='del'>-	void *curwrap;		/* current wrapper va */</div><div class='del'>-	void *wrappers[SI_MAXCORES];	/* other cores wrapper va */</div><div class='del'>-	u32 wrapba[SI_MAXCORES];	/* address of controlling wrapper */</div><div class='del'>-</div><div class='del'>-	u32 cia[SI_MAXCORES];	/* erom cia entry for each core */</div><div class='del'>-	u32 cib[SI_MAXCORES];	/* erom cia entry for each core */</div><div class='del'>-	u32 oob_router;	/* oob router registers for axi */</div><div class='add'>+	u32 chipst;		/* chip status */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -299,52 +189,15 @@ struct si_info {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* AMBA Interconnect exported externs */</div><div class='del'>-extern uint ai_flag(struct si_pub *sih);</div><div class='del'>-extern void ai_setint(struct si_pub *sih, int siflag);</div><div class='del'>-extern uint ai_coreidx(struct si_pub *sih);</div><div class='del'>-extern uint ai_corevendor(struct si_pub *sih);</div><div class='del'>-extern uint ai_corerev(struct si_pub *sih);</div><div class='del'>-extern bool ai_iscoreup(struct si_pub *sih);</div><div class='del'>-extern u32 ai_core_cflags(struct si_pub *sih, u32 mask, u32 val);</div><div class='del'>-extern void ai_core_cflags_wo(struct si_pub *sih, u32 mask, u32 val);</div><div class='del'>-extern u32 ai_core_sflags(struct si_pub *sih, u32 mask, u32 val);</div><div class='del'>-extern uint ai_corereg(struct si_pub *sih, uint coreidx, uint regoff, uint mask,</div><div class='del'>-		       uint val);</div><div class='del'>-extern void ai_core_reset(struct si_pub *sih, u32 bits, u32 resetbits);</div><div class='del'>-extern void ai_core_disable(struct si_pub *sih, u32 bits);</div><div class='del'>-extern int ai_numaddrspaces(struct si_pub *sih);</div><div class='del'>-extern u32 ai_addrspace(struct si_pub *sih, uint asidx);</div><div class='del'>-extern u32 ai_addrspacesize(struct si_pub *sih, uint asidx);</div><div class='del'>-extern void ai_write_wrap_reg(struct si_pub *sih, u32 offset, u32 val);</div><div class='add'>+extern struct bcma_device *ai_findcore(struct si_pub *sih,</div><div class='add'>+				       u16 coreid, u16 coreunit);</div><div class='add'>+extern u32 ai_core_cflags(struct bcma_device *core, u32 mask, u32 val);</div><div class='ctx'> </div><div class='ctx'> /* === exported functions === */</div><div class='del'>-extern struct si_pub *ai_attach(void __iomem *regs, struct pci_dev *sdh);</div><div class='add'>+extern struct si_pub *ai_attach(struct bcma_bus *pbus);</div><div class='ctx'> extern void ai_detach(struct si_pub *sih);</div><div class='del'>-extern uint ai_coreid(struct si_pub *sih);</div><div class='del'>-extern uint ai_corerev(struct si_pub *sih);</div><div class='del'>-extern uint ai_corereg(struct si_pub *sih, uint coreidx, uint regoff, uint mask,</div><div class='del'>-		uint val);</div><div class='del'>-extern void ai_write_wrapperreg(struct si_pub *sih, u32 offset, u32 val);</div><div class='del'>-extern u32 ai_core_cflags(struct si_pub *sih, u32 mask, u32 val);</div><div class='del'>-extern u32 ai_core_sflags(struct si_pub *sih, u32 mask, u32 val);</div><div class='del'>-extern bool ai_iscoreup(struct si_pub *sih);</div><div class='del'>-extern uint ai_findcoreidx(struct si_pub *sih, uint coreid, uint coreunit);</div><div class='del'>-extern void __iomem *ai_setcoreidx(struct si_pub *sih, uint coreidx);</div><div class='del'>-extern void __iomem *ai_setcore(struct si_pub *sih, uint coreid, uint coreunit);</div><div class='del'>-extern void __iomem *ai_switch_core(struct si_pub *sih, uint coreid,</div><div class='del'>-				    uint *origidx, uint *intr_val);</div><div class='del'>-extern void ai_restore_core(struct si_pub *sih, uint coreid, uint intr_val);</div><div class='del'>-extern void ai_core_reset(struct si_pub *sih, u32 bits, u32 resetbits);</div><div class='del'>-extern void ai_core_disable(struct si_pub *sih, u32 bits);</div><div class='del'>-extern u32 ai_alp_clock(struct si_pub *sih);</div><div class='del'>-extern u32 ai_ilp_clock(struct si_pub *sih);</div><div class='add'>+extern uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val);</div><div class='ctx'> extern void ai_pci_setup(struct si_pub *sih, uint coremask);</div><div class='del'>-extern void ai_setint(struct si_pub *sih, int siflag);</div><div class='del'>-extern bool ai_backplane64(struct si_pub *sih);</div><div class='del'>-extern void ai_register_intr_callback(struct si_pub *sih, void *intrsoff_fn,</div><div class='del'>-				      void *intrsrestore_fn,</div><div class='del'>-				      void *intrsenabled_fn, void *intr_arg);</div><div class='del'>-extern void ai_deregister_intr_callback(struct si_pub *sih);</div><div class='ctx'> extern void ai_clkctl_init(struct si_pub *sih);</div><div class='ctx'> extern u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih);</div><div class='ctx'> extern bool ai_clkctl_cc(struct si_pub *sih, uint mode);</div><div class='hunk'>@@ -359,13 +212,6 @@ extern bool ai_is_otp_disabled(struct si_pub *sih);</div><div class='ctx'> /* SPROM availability */</div><div class='ctx'> extern bool ai_is_sprom_available(struct si_pub *sih);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Build device path. Path size must be &gt;= SI_DEVPATH_BUFSZ.</div><div class='del'>- * The returned path is NULL terminated and has trailing '/'.</div><div class='del'>- * Return 0 on success, nonzero otherwise.</div><div class='del'>- */</div><div class='del'>-extern int ai_devpath(struct si_pub *sih, char *path, int size);</div><div class='del'>-</div><div class='ctx'> extern void ai_pci_sleep(struct si_pub *sih);</div><div class='ctx'> extern void ai_pci_down(struct si_pub *sih);</div><div class='ctx'> extern void ai_pci_up(struct si_pub *sih);</div><div class='hunk'>@@ -375,4 +221,52 @@ extern void ai_chipcontrl_epa4331(struct si_pub *sih, bool on);</div><div class='ctx'> /* Enable Ex-PA for 4313 */</div><div class='ctx'> extern void ai_epa_4313war(struct si_pub *sih);</div><div class='ctx'> </div><div class='add'>+extern uint ai_get_buscoretype(struct si_pub *sih);</div><div class='add'>+extern uint ai_get_buscorerev(struct si_pub *sih);</div><div class='add'>+</div><div class='add'>+static inline int ai_get_ccrev(struct si_pub *sih)</div><div class='add'>+{</div><div class='add'>+	return sih-&gt;ccrev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 ai_get_cccaps(struct si_pub *sih)</div><div class='add'>+{</div><div class='add'>+	return sih-&gt;cccaps;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ai_get_pmurev(struct si_pub *sih)</div><div class='add'>+{</div><div class='add'>+	return sih-&gt;pmurev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 ai_get_pmucaps(struct si_pub *sih)</div><div class='add'>+{</div><div class='add'>+	return sih-&gt;pmucaps;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline uint ai_get_boardtype(struct si_pub *sih)</div><div class='add'>+{</div><div class='add'>+	return sih-&gt;boardtype;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline uint ai_get_boardvendor(struct si_pub *sih)</div><div class='add'>+{</div><div class='add'>+	return sih-&gt;boardvendor;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline uint ai_get_chip_id(struct si_pub *sih)</div><div class='add'>+{</div><div class='add'>+	return sih-&gt;chip;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline uint ai_get_chiprev(struct si_pub *sih)</div><div class='add'>+{</div><div class='add'>+	return sih-&gt;chiprev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline uint ai_get_chippkg(struct si_pub *sih)</div><div class='add'>+{</div><div class='add'>+	return sih-&gt;chippkg;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif				/* _BRCM_AIUTILS_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c<br/>index 7f27dbdb6b60..90911eec0cf5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/ampdu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/ampdu.c</a></div><div class='hunk'>@@ -649,7 +649,7 @@ brcms_c_sendampdu(struct ampdu_info *ampdu, struct brcms_txq_info *qi,</div><div class='ctx'> 		len = roundup(len, 4);</div><div class='ctx'> 		ampdu_len += (len + (ndelim + 1) * AMPDU_DELIMITER_LEN);</div><div class='ctx'> </div><div class='del'>-		dma_len += (u16) brcmu_pkttotlen(p);</div><div class='add'>+		dma_len += (u16) p-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 		BCMMSG(wlc-&gt;wiphy, "wl%d: ampdu_len %d"</div><div class='ctx'> 			" seg_cnt %d null delim %d\n",</div><div class='hunk'>@@ -741,9 +741,7 @@ brcms_c_sendampdu(struct ampdu_info *ampdu, struct brcms_txq_info *qi,</div><div class='ctx'> 		if (p) {</div><div class='ctx'> 			if ((tx_info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU) &amp;&amp;</div><div class='ctx'> 			    ((u8) (p-&gt;priority) == tid)) {</div><div class='del'>-</div><div class='del'>-				plen = brcmu_pkttotlen(p) +</div><div class='del'>-				       AMPDU_MAX_MPDU_OVERHEAD;</div><div class='add'>+				plen = p-&gt;len + AMPDU_MAX_MPDU_OVERHEAD;</div><div class='ctx'> 				plen = max(scb_ampdu-&gt;min_len, plen);</div><div class='ctx'> </div><div class='ctx'> 				if ((plen + ampdu_len) &gt; max_ampdu_bytes) {</div><div class='hunk'>@@ -1120,14 +1118,17 @@ brcms_c_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb,</div><div class='ctx'> 		u8 status_delay = 0;</div><div class='ctx'> </div><div class='ctx'> 		/* wait till the next 8 bytes of txstatus is available */</div><div class='del'>-		while (((s1 = R_REG(&amp;wlc-&gt;regs-&gt;frmtxstatus)) &amp; TXS_V) == 0) {</div><div class='add'>+		s1 = bcma_read32(wlc-&gt;hw-&gt;d11core, D11REGOFFS(frmtxstatus));</div><div class='add'>+		while ((s1 &amp; TXS_V) == 0) {</div><div class='ctx'> 			udelay(1);</div><div class='ctx'> 			status_delay++;</div><div class='ctx'> 			if (status_delay &gt; 10)</div><div class='ctx'> 				return; /* error condition */</div><div class='add'>+			s1 = bcma_read32(wlc-&gt;hw-&gt;d11core,</div><div class='add'>+					 D11REGOFFS(frmtxstatus));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		s2 = R_REG(&amp;wlc-&gt;regs-&gt;frmtxstatus2);</div><div class='add'>+		s2 = bcma_read32(wlc-&gt;hw-&gt;d11core, D11REGOFFS(frmtxstatus2));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (scb) {</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/brcm80211/brcmsmac/channel.c<br/>index 89ad1b7dab8f..55e9f45fce22 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/channel.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/channel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/channel.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/channel.c</a></div><div class='hunk'>@@ -1153,121 +1153,6 @@ brcms_c_channel_set_chanspec(struct brcms_cm_info *wlc_cm, u16 chanspec,</div><div class='ctx'> 			      &amp;txpwr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef POWER_DBG</div><div class='del'>-static void wlc_phy_txpower_limits_dump(struct txpwr_limits *txpwr)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	char buf[80];</div><div class='del'>-	char fraction[4][4] = { "   ", ".25", ".5 ", ".75" };</div><div class='del'>-</div><div class='del'>-	sprintf(buf, "CCK                ");</div><div class='del'>-	for (i = 0; i &lt; BRCMS_NUM_RATES_CCK; i++)</div><div class='del'>-		sprintf(buf[strlen(buf)], " %2d%s",</div><div class='del'>-			txpwr-&gt;cck[i] / BRCMS_TXPWR_DB_FACTOR,</div><div class='del'>-			fraction[txpwr-&gt;cck[i] % BRCMS_TXPWR_DB_FACTOR]);</div><div class='del'>-	printk(KERN_DEBUG "%s\n", buf);</div><div class='del'>-</div><div class='del'>-	sprintf(buf, "20 MHz OFDM SISO   ");</div><div class='del'>-	for (i = 0; i &lt; BRCMS_NUM_RATES_OFDM; i++)</div><div class='del'>-		sprintf(buf[strlen(buf)], " %2d%s",</div><div class='del'>-			txpwr-&gt;ofdm[i] / BRCMS_TXPWR_DB_FACTOR,</div><div class='del'>-			fraction[txpwr-&gt;ofdm[i] % BRCMS_TXPWR_DB_FACTOR]);</div><div class='del'>-	printk(KERN_DEBUG "%s\n", buf);</div><div class='del'>-</div><div class='del'>-	sprintf(buf, "20 MHz OFDM CDD    ");</div><div class='del'>-	for (i = 0; i &lt; BRCMS_NUM_RATES_OFDM; i++)</div><div class='del'>-		sprintf(buf[strlen(buf)], " %2d%s",</div><div class='del'>-			txpwr-&gt;ofdm_cdd[i] / BRCMS_TXPWR_DB_FACTOR,</div><div class='del'>-			fraction[txpwr-&gt;ofdm_cdd[i] % BRCMS_TXPWR_DB_FACTOR]);</div><div class='del'>-	printk(KERN_DEBUG "%s\n", buf);</div><div class='del'>-</div><div class='del'>-	sprintf(buf, "40 MHz OFDM SISO   ");</div><div class='del'>-	for (i = 0; i &lt; BRCMS_NUM_RATES_OFDM; i++)</div><div class='del'>-		sprintf(buf[strlen(buf)], " %2d%s",</div><div class='del'>-			txpwr-&gt;ofdm_40_siso[i] / BRCMS_TXPWR_DB_FACTOR,</div><div class='del'>-			fraction[txpwr-&gt;ofdm_40_siso[i] %</div><div class='del'>-							BRCMS_TXPWR_DB_FACTOR]);</div><div class='del'>-	printk(KERN_DEBUG "%s\n", buf);</div><div class='del'>-</div><div class='del'>-	sprintf(buf, "40 MHz OFDM CDD    ");</div><div class='del'>-	for (i = 0; i &lt; BRCMS_NUM_RATES_OFDM; i++)</div><div class='del'>-		sprintf(buf[strlen(buf)], " %2d%s",</div><div class='del'>-			txpwr-&gt;ofdm_40_cdd[i] / BRCMS_TXPWR_DB_FACTOR,</div><div class='del'>-			fraction[txpwr-&gt;ofdm_40_cdd[i] %</div><div class='del'>-							BRCMS_TXPWR_DB_FACTOR]);</div><div class='del'>-	printk(KERN_DEBUG "%s\n", buf);</div><div class='del'>-</div><div class='del'>-	sprintf(buf, "20 MHz MCS0-7 SISO ");</div><div class='del'>-	for (i = 0; i &lt; BRCMS_NUM_RATES_MCS_1_STREAM; i++)</div><div class='del'>-		sprintf(buf[strlen(buf)], " %2d%s",</div><div class='del'>-			txpwr-&gt;mcs_20_siso[i] / BRCMS_TXPWR_DB_FACTOR,</div><div class='del'>-			fraction[txpwr-&gt;mcs_20_siso[i] %</div><div class='del'>-							BRCMS_TXPWR_DB_FACTOR]);</div><div class='del'>-	printk(KERN_DEBUG "%s\n", buf);</div><div class='del'>-</div><div class='del'>-	sprintf(buf, "20 MHz MCS0-7 CDD  ");</div><div class='del'>-	for (i = 0; i &lt; BRCMS_NUM_RATES_MCS_1_STREAM; i++)</div><div class='del'>-		sprintf(buf[strlen(buf)], " %2d%s",</div><div class='del'>-			txpwr-&gt;mcs_20_cdd[i] / BRCMS_TXPWR_DB_FACTOR,</div><div class='del'>-			fraction[txpwr-&gt;mcs_20_cdd[i] %</div><div class='del'>-							BRCMS_TXPWR_DB_FACTOR]);</div><div class='del'>-	printk(KERN_DEBUG "%s\n", buf);</div><div class='del'>-</div><div class='del'>-	sprintf(buf, "20 MHz MCS0-7 STBC ");</div><div class='del'>-	for (i = 0; i &lt; BRCMS_NUM_RATES_MCS_1_STREAM; i++)</div><div class='del'>-		sprintf(buf[strlen(buf)], " %2d%s",</div><div class='del'>-			txpwr-&gt;mcs_20_stbc[i] / BRCMS_TXPWR_DB_FACTOR,</div><div class='del'>-			fraction[txpwr-&gt;mcs_20_stbc[i] %</div><div class='del'>-							BRCMS_TXPWR_DB_FACTOR]);</div><div class='del'>-	printk(KERN_DEBUG "%s\n", buf);</div><div class='del'>-</div><div class='del'>-	sprintf(buf, "20 MHz MCS8-15 SDM ");</div><div class='del'>-	for (i = 0; i &lt; BRCMS_NUM_RATES_MCS_2_STREAM; i++)</div><div class='del'>-		sprintf(buf[strlen(buf)], " %2d%s",</div><div class='del'>-			txpwr-&gt;mcs_20_mimo[i] / BRCMS_TXPWR_DB_FACTOR,</div><div class='del'>-			fraction[txpwr-&gt;mcs_20_mimo[i] %</div><div class='del'>-							BRCMS_TXPWR_DB_FACTOR]);</div><div class='del'>-	printk(KERN_DEBUG "%s\n", buf);</div><div class='del'>-</div><div class='del'>-	sprintf(buf, "40 MHz MCS0-7 SISO ");</div><div class='del'>-	for (i = 0; i &lt; BRCMS_NUM_RATES_MCS_1_STREAM; i++)</div><div class='del'>-		sprintf(buf[strlen(buf)], " %2d%s",</div><div class='del'>-			txpwr-&gt;mcs_40_siso[i] / BRCMS_TXPWR_DB_FACTOR,</div><div class='del'>-			fraction[txpwr-&gt;mcs_40_siso[i] %</div><div class='del'>-							BRCMS_TXPWR_DB_FACTOR]);</div><div class='del'>-	printk(KERN_DEBUG "%s\n", buf);</div><div class='del'>-</div><div class='del'>-	sprintf(buf, "40 MHz MCS0-7 CDD  ");</div><div class='del'>-	for (i = 0; i &lt; BRCMS_NUM_RATES_MCS_1_STREAM; i++)</div><div class='del'>-		sprintf(buf[strlen(buf)], " %2d%s",</div><div class='del'>-			txpwr-&gt;mcs_40_cdd[i] / BRCMS_TXPWR_DB_FACTOR,</div><div class='del'>-			fraction[txpwr-&gt;mcs_40_cdd[i] %</div><div class='del'>-							BRCMS_TXPWR_DB_FACTOR]);</div><div class='del'>-	printk(KERN_DEBUG "%s\n", buf);</div><div class='del'>-</div><div class='del'>-	sprintf(buf, "40 MHz MCS0-7 STBC ");</div><div class='del'>-	for (i = 0; i &lt; BRCMS_NUM_RATES_MCS_1_STREAM; i++)</div><div class='del'>-		sprintf(buf[strlen(buf)], " %2d%s",</div><div class='del'>-			txpwr-&gt;mcs_40_stbc[i] / BRCMS_TXPWR_DB_FACTOR,</div><div class='del'>-			fraction[txpwr-&gt;mcs_40_stbc[i] %</div><div class='del'>-							BRCMS_TXPWR_DB_FACTOR]);</div><div class='del'>-	printk(KERN_DEBUG "%s\n", buf);</div><div class='del'>-</div><div class='del'>-	sprintf(buf, "40 MHz MCS8-15 SDM ");</div><div class='del'>-	for (i = 0; i &lt; BRCMS_NUM_RATES_MCS_2_STREAM; i++)</div><div class='del'>-		sprintf(buf[strlen(buf)], " %2d%s",</div><div class='del'>-			txpwr-&gt;mcs_40_mimo[i] / BRCMS_TXPWR_DB_FACTOR,</div><div class='del'>-			fraction[txpwr-&gt;mcs_40_mimo[i] %</div><div class='del'>-							BRCMS_TXPWR_DB_FACTOR]);</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_DEBUG "%s\n", buf);</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "MCS32               %2d%s\n",</div><div class='del'>-	       txpwr-&gt;mcs32 / BRCMS_TXPWR_DB_FACTOR,</div><div class='del'>-	       fraction[txpwr-&gt;mcs32 % BRCMS_TXPWR_DB_FACTOR]);</div><div class='del'>-}</div><div class='del'>-#endif				/* POWER_DBG */</div><div class='del'>-</div><div class='ctx'> void</div><div class='ctx'> brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm, u16 chanspec,</div><div class='ctx'> 		       struct txpwr_limits *txpwr)</div><div class='hunk'>@@ -1478,9 +1363,6 @@ brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm, u16 chanspec,</div><div class='ctx'> 			txpwr-&gt;mcs_40_stbc[i] = txpwr-&gt;mcs_40_cdd[i];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef POWER_DBG</div><div class='del'>-	wlc_phy_txpower_limits_dump(txpwr);</div><div class='del'>-#endif</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/d11.h b/drivers/net/wireless/brcm80211/brcmsmac/d11.h<br/>index ed51616abc85..1948cb2771e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/d11.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/d11.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/d11.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/d11.h</a></div><div class='hunk'>@@ -430,6 +430,9 @@ struct d11regs {</div><div class='ctx'> 	u16 PAD[0x380];	/* 0x800 - 0xEFE */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* d11 register field offset */</div><div class='add'>+#define D11REGOFFS(field)	offsetof(struct d11regs, field)</div><div class='add'>+</div><div class='ctx'> #define	PIHR_BASE	0x0400	/* byte address of packed IHR region */</div><div class='ctx'> </div><div class='ctx'> /* biststatus */</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/dma.c b/drivers/net/wireless/brcm80211/brcmsmac/dma.c<br/>index 6ebec8f42846..2e90a9a16ed6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/dma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/dma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/dma.c</a></div><div class='hunk'>@@ -13,8 +13,10 @@</div><div class='ctx'>  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN</div><div class='ctx'>  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -22,6 +24,14 @@</div><div class='ctx'> #include &lt;aiutils.h&gt;</div><div class='ctx'> #include "types.h"</div><div class='ctx'> #include "dma.h"</div><div class='add'>+#include "soc.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * dma register field offset calculation</div><div class='add'>+ */</div><div class='add'>+#define DMA64REGOFFS(field)		offsetof(struct dma64regs, field)</div><div class='add'>+#define DMA64TXREGOFFS(di, field)	(di-&gt;d64txregbase + DMA64REGOFFS(field))</div><div class='add'>+#define DMA64RXREGOFFS(di, field)	(di-&gt;d64rxregbase + DMA64REGOFFS(field))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * DMA hardware requires each descriptor ring to be 8kB aligned, and fit within</div><div class='hunk'>@@ -168,26 +178,25 @@</div><div class='ctx'> </div><div class='ctx'> /* debug/trace */</div><div class='ctx'> #ifdef BCMDBG</div><div class='del'>-#define	DMA_ERROR(args) \</div><div class='del'>-	do { \</div><div class='del'>-		if (!(*di-&gt;msg_level &amp; 1)) \</div><div class='del'>-			; \</div><div class='del'>-		else \</div><div class='del'>-			printk args; \</div><div class='del'>-	} while (0)</div><div class='del'>-#define	DMA_TRACE(args) \</div><div class='del'>-	do { \</div><div class='del'>-		if (!(*di-&gt;msg_level &amp; 2)) \</div><div class='del'>-			; \</div><div class='del'>-		else \</div><div class='del'>-			printk args; \</div><div class='del'>-	} while (0)</div><div class='add'>+#define	DMA_ERROR(fmt, ...)					\</div><div class='add'>+do {								\</div><div class='add'>+	if (*di-&gt;msg_level &amp; 1)					\</div><div class='add'>+		pr_debug("%s: " fmt, __func__, ##__VA_ARGS__);	\</div><div class='add'>+} while (0)</div><div class='add'>+#define	DMA_TRACE(fmt, ...)					\</div><div class='add'>+do {								\</div><div class='add'>+	if (*di-&gt;msg_level &amp; 2)					\</div><div class='add'>+		pr_debug("%s: " fmt, __func__, ##__VA_ARGS__);	\</div><div class='add'>+} while (0)</div><div class='ctx'> #else</div><div class='del'>-#define	DMA_ERROR(args)</div><div class='del'>-#define	DMA_TRACE(args)</div><div class='add'>+#define	DMA_ERROR(fmt, ...)			\</div><div class='add'>+	no_printk(fmt, ##__VA_ARGS__)</div><div class='add'>+#define	DMA_TRACE(fmt, ...)			\</div><div class='add'>+	no_printk(fmt, ##__VA_ARGS__)</div><div class='ctx'> #endif				/* BCMDBG */</div><div class='ctx'> </div><div class='del'>-#define	DMA_NONE(args)</div><div class='add'>+#define	DMA_NONE(fmt, ...)			\</div><div class='add'>+	no_printk(fmt, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> #define	MAXNAMEL	8	/* 8 char names */</div><div class='ctx'> </div><div class='hunk'>@@ -218,15 +227,16 @@ struct dma_info {</div><div class='ctx'> 	uint *msg_level;	/* message level pointer */</div><div class='ctx'> 	char name[MAXNAMEL];	/* callers name for diag msgs */</div><div class='ctx'> </div><div class='del'>-	struct pci_dev *pbus;		/* bus handle */</div><div class='add'>+	struct bcma_device *core;</div><div class='add'>+	struct device *dmadev;</div><div class='ctx'> </div><div class='ctx'> 	bool dma64;	/* this dma engine is operating in 64-bit mode */</div><div class='ctx'> 	bool addrext;	/* this dma engine supports DmaExtendedAddrChanges */</div><div class='ctx'> </div><div class='ctx'> 	/* 64-bit dma tx engine registers */</div><div class='del'>-	struct dma64regs __iomem *d64txregs;</div><div class='add'>+	uint d64txregbase;</div><div class='ctx'> 	/* 64-bit dma rx engine registers */</div><div class='del'>-	struct dma64regs __iomem *d64rxregs;</div><div class='add'>+	uint d64rxregbase;</div><div class='ctx'> 	/* pointer to dma64 tx descriptor ring */</div><div class='ctx'> 	struct dma64desc *txd64;</div><div class='ctx'> 	/* pointer to dma64 rx descriptor ring */</div><div class='hunk'>@@ -361,7 +371,7 @@ static uint _dma_ctrlflags(struct dma_info *di, uint mask, uint flags)</div><div class='ctx'> 	uint dmactrlflags;</div><div class='ctx'> </div><div class='ctx'> 	if (di == NULL) {</div><div class='del'>-		DMA_ERROR(("_dma_ctrlflags: NULL dma handle\n"));</div><div class='add'>+		DMA_ERROR("NULL dma handle\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -373,15 +383,16 @@ static uint _dma_ctrlflags(struct dma_info *di, uint mask, uint flags)</div><div class='ctx'> 	if (dmactrlflags &amp; DMA_CTRL_PEN) {</div><div class='ctx'> 		u32 control;</div><div class='ctx'> </div><div class='del'>-		control = R_REG(&amp;di-&gt;d64txregs-&gt;control);</div><div class='del'>-		W_REG(&amp;di-&gt;d64txregs-&gt;control,</div><div class='add'>+		control = bcma_read32(di-&gt;core, DMA64TXREGOFFS(di, control));</div><div class='add'>+		bcma_write32(di-&gt;core, DMA64TXREGOFFS(di, control),</div><div class='ctx'> 		      control | D64_XC_PD);</div><div class='del'>-		if (R_REG(&amp;di-&gt;d64txregs-&gt;control) &amp; D64_XC_PD)</div><div class='add'>+		if (bcma_read32(di-&gt;core, DMA64TXREGOFFS(di, control)) &amp;</div><div class='add'>+		    D64_XC_PD)</div><div class='ctx'> 			/* We *can* disable it so it is supported,</div><div class='ctx'> 			 * restore control register</div><div class='ctx'> 			 */</div><div class='del'>-			W_REG(&amp;di-&gt;d64txregs-&gt;control,</div><div class='del'>-			control);</div><div class='add'>+			bcma_write32(di-&gt;core, DMA64TXREGOFFS(di, control),</div><div class='add'>+				     control);</div><div class='ctx'> 		else</div><div class='ctx'> 			/* Not supported, don't allow it to be enabled */</div><div class='ctx'> 			dmactrlflags &amp;= ~DMA_CTRL_PEN;</div><div class='hunk'>@@ -392,12 +403,12 @@ static uint _dma_ctrlflags(struct dma_info *di, uint mask, uint flags)</div><div class='ctx'> 	return dmactrlflags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool _dma64_addrext(struct dma64regs __iomem *dma64regs)</div><div class='add'>+static bool _dma64_addrext(struct dma_info *di, uint ctrl_offset)</div><div class='ctx'> {</div><div class='ctx'> 	u32 w;</div><div class='del'>-	OR_REG(&amp;dma64regs-&gt;control, D64_XC_AE);</div><div class='del'>-	w = R_REG(&amp;dma64regs-&gt;control);</div><div class='del'>-	AND_REG(&amp;dma64regs-&gt;control, ~D64_XC_AE);</div><div class='add'>+	bcma_set32(di-&gt;core, ctrl_offset, D64_XC_AE);</div><div class='add'>+	w = bcma_read32(di-&gt;core, ctrl_offset);</div><div class='add'>+	bcma_mask32(di-&gt;core, ctrl_offset, ~D64_XC_AE);</div><div class='ctx'> 	return (w &amp; D64_XC_AE) == D64_XC_AE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -410,15 +421,15 @@ static bool _dma_isaddrext(struct dma_info *di)</div><div class='ctx'> 	/* DMA64 supports full 32- or 64-bit operation. AE is always valid */</div><div class='ctx'> </div><div class='ctx'> 	/* not all tx or rx channel are available */</div><div class='del'>-	if (di-&gt;d64txregs != NULL) {</div><div class='del'>-		if (!_dma64_addrext(di-&gt;d64txregs))</div><div class='del'>-			DMA_ERROR(("%s: _dma_isaddrext: DMA64 tx doesn't have "</div><div class='del'>-				   "AE set\n", di-&gt;name));</div><div class='add'>+	if (di-&gt;d64txregbase != 0) {</div><div class='add'>+		if (!_dma64_addrext(di, DMA64TXREGOFFS(di, control)))</div><div class='add'>+			DMA_ERROR("%s: DMA64 tx doesn't have AE set\n",</div><div class='add'>+				  di-&gt;name);</div><div class='ctx'> 		return true;</div><div class='del'>-	} else if (di-&gt;d64rxregs != NULL) {</div><div class='del'>-		if (!_dma64_addrext(di-&gt;d64rxregs))</div><div class='del'>-			DMA_ERROR(("%s: _dma_isaddrext: DMA64 rx doesn't have "</div><div class='del'>-				   "AE set\n", di-&gt;name));</div><div class='add'>+	} else if (di-&gt;d64rxregbase != 0) {</div><div class='add'>+		if (!_dma64_addrext(di, DMA64RXREGOFFS(di, control)))</div><div class='add'>+			DMA_ERROR("%s: DMA64 rx doesn't have AE set\n",</div><div class='add'>+				  di-&gt;name);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -430,14 +441,14 @@ static bool _dma_descriptor_align(struct dma_info *di)</div><div class='ctx'> 	u32 addrl;</div><div class='ctx'> </div><div class='ctx'> 	/* Check to see if the descriptors need to be aligned on 4K/8K or not */</div><div class='del'>-	if (di-&gt;d64txregs != NULL) {</div><div class='del'>-		W_REG(&amp;di-&gt;d64txregs-&gt;addrlow, 0xff0);</div><div class='del'>-		addrl = R_REG(&amp;di-&gt;d64txregs-&gt;addrlow);</div><div class='add'>+	if (di-&gt;d64txregbase != 0) {</div><div class='add'>+		bcma_write32(di-&gt;core, DMA64TXREGOFFS(di, addrlow), 0xff0);</div><div class='add'>+		addrl = bcma_read32(di-&gt;core, DMA64TXREGOFFS(di, addrlow));</div><div class='ctx'> 		if (addrl != 0)</div><div class='ctx'> 			return false;</div><div class='del'>-	} else if (di-&gt;d64rxregs != NULL) {</div><div class='del'>-		W_REG(&amp;di-&gt;d64rxregs-&gt;addrlow, 0xff0);</div><div class='del'>-		addrl = R_REG(&amp;di-&gt;d64rxregs-&gt;addrlow);</div><div class='add'>+	} else if (di-&gt;d64rxregbase != 0) {</div><div class='add'>+		bcma_write32(di-&gt;core, DMA64RXREGOFFS(di, addrlow), 0xff0);</div><div class='add'>+		addrl = bcma_read32(di-&gt;core, DMA64RXREGOFFS(di, addrlow));</div><div class='ctx'> 		if (addrl != 0)</div><div class='ctx'> 			return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -448,7 +459,7 @@ static bool _dma_descriptor_align(struct dma_info *di)</div><div class='ctx'>  * Descriptor table must start at the DMA hardware dictated alignment, so</div><div class='ctx'>  * allocated memory must be large enough to support this requirement.</div><div class='ctx'>  */</div><div class='del'>-static void *dma_alloc_consistent(struct pci_dev *pdev, uint size,</div><div class='add'>+static void *dma_alloc_consistent(struct dma_info *di, uint size,</div><div class='ctx'> 				  u16 align_bits, uint *alloced,</div><div class='ctx'> 				  dma_addr_t *pap)</div><div class='ctx'> {</div><div class='hunk'>@@ -458,7 +469,7 @@ static void *dma_alloc_consistent(struct pci_dev *pdev, uint size,</div><div class='ctx'> 			size += align;</div><div class='ctx'> 		*alloced = size;</div><div class='ctx'> 	}</div><div class='del'>-	return pci_alloc_consistent(pdev, size, pap);</div><div class='add'>+	return dma_alloc_coherent(di-&gt;dmadev, size, pap, GFP_ATOMIC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static</div><div class='hunk'>@@ -484,7 +495,7 @@ static void *dma_ringalloc(struct dma_info *di, u32 boundary, uint size,</div><div class='ctx'> 	u32 desc_strtaddr;</div><div class='ctx'> 	u32 alignbytes = 1 &lt;&lt; *alignbits;</div><div class='ctx'> </div><div class='del'>-	va = dma_alloc_consistent(di-&gt;pbus, size, *alignbits, alloced, descpa);</div><div class='add'>+	va = dma_alloc_consistent(di, size, *alignbits, alloced, descpa);</div><div class='ctx'> </div><div class='ctx'> 	if (NULL == va)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -493,8 +504,8 @@ static void *dma_ringalloc(struct dma_info *di, u32 boundary, uint size,</div><div class='ctx'> 	if (((desc_strtaddr + size - 1) &amp; boundary) != (desc_strtaddr</div><div class='ctx'> 							&amp; boundary)) {</div><div class='ctx'> 		*alignbits = dma_align_sizetobits(size);</div><div class='del'>-		pci_free_consistent(di-&gt;pbus, size, va, *descpa);</div><div class='del'>-		va = dma_alloc_consistent(di-&gt;pbus, size, *alignbits,</div><div class='add'>+		dma_free_coherent(di-&gt;dmadev, size, va, *descpa);</div><div class='add'>+		va = dma_alloc_consistent(di, size, *alignbits,</div><div class='ctx'> 			alloced, descpa);</div><div class='ctx'> 	}</div><div class='ctx'> 	return va;</div><div class='hunk'>@@ -519,8 +530,8 @@ static bool dma64_alloc(struct dma_info *di, uint direction)</div><div class='ctx'> 		va = dma_ringalloc(di, D64RINGALIGN, size, &amp;align_bits,</div><div class='ctx'> 			&amp;alloced, &amp;di-&gt;txdpaorig);</div><div class='ctx'> 		if (va == NULL) {</div><div class='del'>-			DMA_ERROR(("%s: dma64_alloc: DMA_ALLOC_CONSISTENT(ntxd)"</div><div class='del'>-				   " failed\n", di-&gt;name));</div><div class='add'>+			DMA_ERROR("%s: DMA_ALLOC_CONSISTENT(ntxd) failed\n",</div><div class='add'>+				  di-&gt;name);</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='ctx'> 		align = (1 &lt;&lt; align_bits);</div><div class='hunk'>@@ -533,8 +544,8 @@ static bool dma64_alloc(struct dma_info *di, uint direction)</div><div class='ctx'> 		va = dma_ringalloc(di, D64RINGALIGN, size, &amp;align_bits,</div><div class='ctx'> 			&amp;alloced, &amp;di-&gt;rxdpaorig);</div><div class='ctx'> 		if (va == NULL) {</div><div class='del'>-			DMA_ERROR(("%s: dma64_alloc: DMA_ALLOC_CONSISTENT(nrxd)"</div><div class='del'>-				   " failed\n", di-&gt;name));</div><div class='add'>+			DMA_ERROR("%s: DMA_ALLOC_CONSISTENT(nrxd) failed\n",</div><div class='add'>+				  di-&gt;name);</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='ctx'> 		align = (1 &lt;&lt; align_bits);</div><div class='hunk'>@@ -554,12 +565,13 @@ static bool _dma_alloc(struct dma_info *di, uint direction)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct dma_pub *dma_attach(char *name, struct si_pub *sih,</div><div class='del'>-		     void __iomem *dmaregstx, void __iomem *dmaregsrx,</div><div class='del'>-		     uint ntxd, uint nrxd,</div><div class='del'>-		     uint rxbufsize, int rxextheadroom,</div><div class='del'>-		     uint nrxpost, uint rxoffset, uint *msg_level)</div><div class='add'>+			   struct bcma_device *core,</div><div class='add'>+			   uint txregbase, uint rxregbase, uint ntxd, uint nrxd,</div><div class='add'>+			   uint rxbufsize, int rxextheadroom,</div><div class='add'>+			   uint nrxpost, uint rxoffset, uint *msg_level)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_info *di;</div><div class='add'>+	u8 rev = core-&gt;id.rev;</div><div class='ctx'> 	uint size;</div><div class='ctx'> </div><div class='ctx'> 	/* allocate private info structure */</div><div class='hunk'>@@ -570,11 +582,13 @@ struct dma_pub *dma_attach(char *name, struct si_pub *sih,</div><div class='ctx'> 	di-&gt;msg_level = msg_level ? msg_level : &amp;dma_msg_level;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	di-&gt;dma64 = ((ai_core_sflags(sih, 0, 0) &amp; SISF_DMA64) == SISF_DMA64);</div><div class='add'>+	di-&gt;dma64 =</div><div class='add'>+		((bcma_aread32(core, BCMA_IOST) &amp; SISF_DMA64) == SISF_DMA64);</div><div class='ctx'> </div><div class='del'>-	/* init dma reg pointer */</div><div class='del'>-	di-&gt;d64txregs = (struct dma64regs __iomem *) dmaregstx;</div><div class='del'>-	di-&gt;d64rxregs = (struct dma64regs __iomem *) dmaregsrx;</div><div class='add'>+	/* init dma reg info */</div><div class='add'>+	di-&gt;core = core;</div><div class='add'>+	di-&gt;d64txregbase = txregbase;</div><div class='add'>+	di-&gt;d64rxregbase = rxregbase;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Default flags (which can be changed by the driver calling</div><div class='hunk'>@@ -583,17 +597,17 @@ struct dma_pub *dma_attach(char *name, struct si_pub *sih,</div><div class='ctx'> 	 */</div><div class='ctx'> 	_dma_ctrlflags(di, DMA_CTRL_ROC | DMA_CTRL_PEN, 0);</div><div class='ctx'> </div><div class='del'>-	DMA_TRACE(("%s: dma_attach: %s flags 0x%x ntxd %d nrxd %d "</div><div class='del'>-		   "rxbufsize %d rxextheadroom %d nrxpost %d rxoffset %d "</div><div class='del'>-		   "dmaregstx %p dmaregsrx %p\n", name, "DMA64",</div><div class='del'>-		   di-&gt;dma.dmactrlflags, ntxd, nrxd, rxbufsize,</div><div class='del'>-		   rxextheadroom, nrxpost, rxoffset, dmaregstx, dmaregsrx));</div><div class='add'>+	DMA_TRACE("%s: %s flags 0x%x ntxd %d nrxd %d "</div><div class='add'>+		  "rxbufsize %d rxextheadroom %d nrxpost %d rxoffset %d "</div><div class='add'>+		  "txregbase %u rxregbase %u\n", name, "DMA64",</div><div class='add'>+		  di-&gt;dma.dmactrlflags, ntxd, nrxd, rxbufsize,</div><div class='add'>+		  rxextheadroom, nrxpost, rxoffset, txregbase, rxregbase);</div><div class='ctx'> </div><div class='ctx'> 	/* make a private copy of our callers name */</div><div class='ctx'> 	strncpy(di-&gt;name, name, MAXNAMEL);</div><div class='ctx'> 	di-&gt;name[MAXNAMEL - 1] = '\0';</div><div class='ctx'> </div><div class='del'>-	di-&gt;pbus = ((struct si_info *)sih)-&gt;pbus;</div><div class='add'>+	di-&gt;dmadev = core-&gt;dma_dev;</div><div class='ctx'> </div><div class='ctx'> 	/* save tunables */</div><div class='ctx'> 	di-&gt;ntxd = (u16) ntxd;</div><div class='hunk'>@@ -625,12 +639,12 @@ struct dma_pub *dma_attach(char *name, struct si_pub *sih,</div><div class='ctx'> 	di-&gt;dataoffsetlow = di-&gt;ddoffsetlow;</div><div class='ctx'> 	di-&gt;dataoffsethigh = di-&gt;ddoffsethigh;</div><div class='ctx'> 	/* WAR64450 : DMACtl.Addr ext fields are not supported in SDIOD core. */</div><div class='del'>-	if ((ai_coreid(sih) == SDIOD_CORE_ID)</div><div class='del'>-	    &amp;&amp; ((ai_corerev(sih) &gt; 0) &amp;&amp; (ai_corerev(sih) &lt;= 2)))</div><div class='del'>-		di-&gt;addrext = 0;</div><div class='del'>-	else if ((ai_coreid(sih) == I2S_CORE_ID) &amp;&amp;</div><div class='del'>-		 ((ai_corerev(sih) == 0) || (ai_corerev(sih) == 1)))</div><div class='del'>-		di-&gt;addrext = 0;</div><div class='add'>+	if ((core-&gt;id.id == SDIOD_CORE_ID)</div><div class='add'>+	    &amp;&amp; ((rev &gt; 0) &amp;&amp; (rev &lt;= 2)))</div><div class='add'>+		di-&gt;addrext = false;</div><div class='add'>+	else if ((core-&gt;id.id == I2S_CORE_ID) &amp;&amp;</div><div class='add'>+		 ((rev == 0) || (rev == 1)))</div><div class='add'>+		di-&gt;addrext = false;</div><div class='ctx'> 	else</div><div class='ctx'> 		di-&gt;addrext = _dma_isaddrext(di);</div><div class='ctx'> </div><div class='hunk'>@@ -645,8 +659,8 @@ struct dma_pub *dma_attach(char *name, struct si_pub *sih,</div><div class='ctx'> 		di-&gt;dmadesc_align = 4;	/* 16 byte alignment */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DMA_NONE(("DMA descriptor align_needed %d, align %d\n",</div><div class='del'>-		  di-&gt;aligndesc_4k, di-&gt;dmadesc_align));</div><div class='add'>+	DMA_NONE("DMA descriptor align_needed %d, align %d\n",</div><div class='add'>+		 di-&gt;aligndesc_4k, di-&gt;dmadesc_align);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate tx packet pointer vector */</div><div class='ctx'> 	if (ntxd) {</div><div class='hunk'>@@ -684,21 +698,21 @@ struct dma_pub *dma_attach(char *name, struct si_pub *sih,</div><div class='ctx'> </div><div class='ctx'> 	if ((di-&gt;ddoffsetlow != 0) &amp;&amp; !di-&gt;addrext) {</div><div class='ctx'> 		if (di-&gt;txdpa &gt; SI_PCI_DMA_SZ) {</div><div class='del'>-			DMA_ERROR(("%s: dma_attach: txdpa 0x%x: addrext not "</div><div class='del'>-				   "supported\n", di-&gt;name, (u32)di-&gt;txdpa));</div><div class='add'>+			DMA_ERROR("%s: txdpa 0x%x: addrext not supported\n",</div><div class='add'>+				  di-&gt;name, (u32)di-&gt;txdpa);</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (di-&gt;rxdpa &gt; SI_PCI_DMA_SZ) {</div><div class='del'>-			DMA_ERROR(("%s: dma_attach: rxdpa 0x%x: addrext not "</div><div class='del'>-				   "supported\n", di-&gt;name, (u32)di-&gt;rxdpa));</div><div class='add'>+			DMA_ERROR("%s: rxdpa 0x%x: addrext not supported\n",</div><div class='add'>+				  di-&gt;name, (u32)di-&gt;rxdpa);</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DMA_TRACE(("ddoffsetlow 0x%x ddoffsethigh 0x%x dataoffsetlow 0x%x "</div><div class='del'>-		   "dataoffsethigh " "0x%x addrext %d\n", di-&gt;ddoffsetlow,</div><div class='del'>-		   di-&gt;ddoffsethigh, di-&gt;dataoffsetlow, di-&gt;dataoffsethigh,</div><div class='del'>-		   di-&gt;addrext));</div><div class='add'>+	DMA_TRACE("ddoffsetlow 0x%x ddoffsethigh 0x%x dataoffsetlow 0x%x dataoffsethigh 0x%x addrext %d\n",</div><div class='add'>+		  di-&gt;ddoffsetlow, di-&gt;ddoffsethigh,</div><div class='add'>+		  di-&gt;dataoffsetlow, di-&gt;dataoffsethigh,</div><div class='add'>+		  di-&gt;addrext);</div><div class='ctx'> </div><div class='ctx'> 	return (struct dma_pub *) di;</div><div class='ctx'> </div><div class='hunk'>@@ -744,17 +758,17 @@ void dma_detach(struct dma_pub *pub)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_info *di = (struct dma_info *)pub;</div><div class='ctx'> </div><div class='del'>-	DMA_TRACE(("%s: dma_detach\n", di-&gt;name));</div><div class='add'>+	DMA_TRACE("%s:\n", di-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	/* free dma descriptor rings */</div><div class='ctx'> 	if (di-&gt;txd64)</div><div class='del'>-		pci_free_consistent(di-&gt;pbus, di-&gt;txdalloc,</div><div class='del'>-				    ((s8 *)di-&gt;txd64 - di-&gt;txdalign),</div><div class='del'>-				    (di-&gt;txdpaorig));</div><div class='add'>+		dma_free_coherent(di-&gt;dmadev, di-&gt;txdalloc,</div><div class='add'>+				  ((s8 *)di-&gt;txd64 - di-&gt;txdalign),</div><div class='add'>+				  (di-&gt;txdpaorig));</div><div class='ctx'> 	if (di-&gt;rxd64)</div><div class='del'>-		pci_free_consistent(di-&gt;pbus, di-&gt;rxdalloc,</div><div class='del'>-				    ((s8 *)di-&gt;rxd64 - di-&gt;rxdalign),</div><div class='del'>-				    (di-&gt;rxdpaorig));</div><div class='add'>+		dma_free_coherent(di-&gt;dmadev, di-&gt;rxdalloc,</div><div class='add'>+				  ((s8 *)di-&gt;rxd64 - di-&gt;rxdalign),</div><div class='add'>+				  (di-&gt;rxdpaorig));</div><div class='ctx'> </div><div class='ctx'> 	/* free packet pointer vectors */</div><div class='ctx'> 	kfree(di-&gt;txp);</div><div class='hunk'>@@ -779,11 +793,15 @@ _dma_ddtable_init(struct dma_info *di, uint direction, dma_addr_t pa)</div><div class='ctx'> 	if ((di-&gt;ddoffsetlow == 0)</div><div class='ctx'> 	    || !(pa &amp; PCI32ADDR_HIGH)) {</div><div class='ctx'> 		if (direction == DMA_TX) {</div><div class='del'>-			W_REG(&amp;di-&gt;d64txregs-&gt;addrlow, pa + di-&gt;ddoffsetlow);</div><div class='del'>-			W_REG(&amp;di-&gt;d64txregs-&gt;addrhigh, di-&gt;ddoffsethigh);</div><div class='add'>+			bcma_write32(di-&gt;core, DMA64TXREGOFFS(di, addrlow),</div><div class='add'>+				     pa + di-&gt;ddoffsetlow);</div><div class='add'>+			bcma_write32(di-&gt;core, DMA64TXREGOFFS(di, addrhigh),</div><div class='add'>+				     di-&gt;ddoffsethigh);</div><div class='ctx'> 		} else {</div><div class='del'>-			W_REG(&amp;di-&gt;d64rxregs-&gt;addrlow, pa + di-&gt;ddoffsetlow);</div><div class='del'>-			W_REG(&amp;di-&gt;d64rxregs-&gt;addrhigh, di-&gt;ddoffsethigh);</div><div class='add'>+			bcma_write32(di-&gt;core, DMA64RXREGOFFS(di, addrlow),</div><div class='add'>+				     pa + di-&gt;ddoffsetlow);</div><div class='add'>+			bcma_write32(di-&gt;core, DMA64RXREGOFFS(di, addrhigh),</div><div class='add'>+				     di-&gt;ddoffsethigh);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* DMA64 32bits address extension */</div><div class='hunk'>@@ -794,15 +812,19 @@ _dma_ddtable_init(struct dma_info *di, uint direction, dma_addr_t pa)</div><div class='ctx'> 		pa &amp;= ~PCI32ADDR_HIGH;</div><div class='ctx'> </div><div class='ctx'> 		if (direction == DMA_TX) {</div><div class='del'>-			W_REG(&amp;di-&gt;d64txregs-&gt;addrlow, pa + di-&gt;ddoffsetlow);</div><div class='del'>-			W_REG(&amp;di-&gt;d64txregs-&gt;addrhigh, di-&gt;ddoffsethigh);</div><div class='del'>-			SET_REG(&amp;di-&gt;d64txregs-&gt;control,</div><div class='del'>-				D64_XC_AE, (ae &lt;&lt; D64_XC_AE_SHIFT));</div><div class='add'>+			bcma_write32(di-&gt;core, DMA64TXREGOFFS(di, addrlow),</div><div class='add'>+				     pa + di-&gt;ddoffsetlow);</div><div class='add'>+			bcma_write32(di-&gt;core, DMA64TXREGOFFS(di, addrhigh),</div><div class='add'>+				     di-&gt;ddoffsethigh);</div><div class='add'>+			bcma_maskset32(di-&gt;core, DMA64TXREGOFFS(di, control),</div><div class='add'>+				       D64_XC_AE, (ae &lt;&lt; D64_XC_AE_SHIFT));</div><div class='ctx'> 		} else {</div><div class='del'>-			W_REG(&amp;di-&gt;d64rxregs-&gt;addrlow, pa + di-&gt;ddoffsetlow);</div><div class='del'>-			W_REG(&amp;di-&gt;d64rxregs-&gt;addrhigh, di-&gt;ddoffsethigh);</div><div class='del'>-			SET_REG(&amp;di-&gt;d64rxregs-&gt;control,</div><div class='del'>-				D64_RC_AE, (ae &lt;&lt; D64_RC_AE_SHIFT));</div><div class='add'>+			bcma_write32(di-&gt;core, DMA64RXREGOFFS(di, addrlow),</div><div class='add'>+				     pa + di-&gt;ddoffsetlow);</div><div class='add'>+			bcma_write32(di-&gt;core, DMA64RXREGOFFS(di, addrhigh),</div><div class='add'>+				     di-&gt;ddoffsethigh);</div><div class='add'>+			bcma_maskset32(di-&gt;core, DMA64RXREGOFFS(di, control),</div><div class='add'>+				       D64_RC_AE, (ae &lt;&lt; D64_RC_AE_SHIFT));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -812,11 +834,11 @@ static void _dma_rxenable(struct dma_info *di)</div><div class='ctx'> 	uint dmactrlflags = di-&gt;dma.dmactrlflags;</div><div class='ctx'> 	u32 control;</div><div class='ctx'> </div><div class='del'>-	DMA_TRACE(("%s: dma_rxenable\n", di-&gt;name));</div><div class='add'>+	DMA_TRACE("%s:\n", di-&gt;name);</div><div class='ctx'> </div><div class='del'>-	control =</div><div class='del'>-	    (R_REG(&amp;di-&gt;d64rxregs-&gt;control) &amp; D64_RC_AE) |</div><div class='del'>-	    D64_RC_RE;</div><div class='add'>+	control = D64_RC_RE | (bcma_read32(di-&gt;core,</div><div class='add'>+					   DMA64RXREGOFFS(di, control)) &amp;</div><div class='add'>+			       D64_RC_AE);</div><div class='ctx'> </div><div class='ctx'> 	if ((dmactrlflags &amp; DMA_CTRL_PEN) == 0)</div><div class='ctx'> 		control |= D64_RC_PD;</div><div class='hunk'>@@ -824,7 +846,7 @@ static void _dma_rxenable(struct dma_info *di)</div><div class='ctx'> 	if (dmactrlflags &amp; DMA_CTRL_ROC)</div><div class='ctx'> 		control |= D64_RC_OC;</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;di-&gt;d64rxregs-&gt;control,</div><div class='add'>+	bcma_write32(di-&gt;core, DMA64RXREGOFFS(di, control),</div><div class='ctx'> 		((di-&gt;rxoffset &lt;&lt; D64_RC_RO_SHIFT) | control));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -832,7 +854,7 @@ void dma_rxinit(struct dma_pub *pub)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_info *di = (struct dma_info *)pub;</div><div class='ctx'> </div><div class='del'>-	DMA_TRACE(("%s: dma_rxinit\n", di-&gt;name));</div><div class='add'>+	DMA_TRACE("%s:\n", di-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	if (di-&gt;nrxd == 0)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -867,7 +889,8 @@ static struct sk_buff *dma64_getnextrxp(struct dma_info *di, bool forceall)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	curr =</div><div class='del'>-	    B2I(((R_REG(&amp;di-&gt;d64rxregs-&gt;status0) &amp; D64_RS0_CD_MASK) -</div><div class='add'>+	    B2I(((bcma_read32(di-&gt;core,</div><div class='add'>+			      DMA64RXREGOFFS(di, status0)) &amp; D64_RS0_CD_MASK) -</div><div class='ctx'> 		 di-&gt;rcvptrbase) &amp; D64_RS0_CD_MASK, struct dma64desc);</div><div class='ctx'> </div><div class='ctx'> 	/* ignore curr if forceall */</div><div class='hunk'>@@ -881,7 +904,7 @@ static struct sk_buff *dma64_getnextrxp(struct dma_info *di, bool forceall)</div><div class='ctx'> 	pa = le32_to_cpu(di-&gt;rxd64[i].addrlow) - di-&gt;dataoffsetlow;</div><div class='ctx'> </div><div class='ctx'> 	/* clear this packet from the descriptor ring */</div><div class='del'>-	pci_unmap_single(di-&gt;pbus, pa, di-&gt;rxbufsize, PCI_DMA_FROMDEVICE);</div><div class='add'>+	dma_unmap_single(di-&gt;dmadev, pa, di-&gt;rxbufsize, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	di-&gt;rxd64[i].addrlow = cpu_to_le32(0xdeadbeef);</div><div class='ctx'> 	di-&gt;rxd64[i].addrhigh = cpu_to_le32(0xdeadbeef);</div><div class='hunk'>@@ -901,7 +924,7 @@ static struct sk_buff *_dma_getnextrxp(struct dma_info *di, bool forceall)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * !! rx entry routine</div><div class='del'>- * returns a pointer to the next frame received, or NULL if there are no more</div><div class='add'>+ * returns the number packages in the next frame, or 0 if there are no more</div><div class='ctx'>  *   if DMA_CTRL_RXMULTI is defined, DMA scattering(multiple buffers) is</div><div class='ctx'>  *   supported with pkts chain</div><div class='ctx'>  *   otherwise, it's treated as giant pkt and will be tossed.</div><div class='hunk'>@@ -909,74 +932,83 @@ static struct sk_buff *_dma_getnextrxp(struct dma_info *di, bool forceall)</div><div class='ctx'>  *   buffer data. After it reaches the max size of buffer, the data continues</div><div class='ctx'>  *   in next DMA descriptor buffer WITHOUT DMA header</div><div class='ctx'>  */</div><div class='del'>-struct sk_buff *dma_rx(struct dma_pub *pub)</div><div class='add'>+int dma_rx(struct dma_pub *pub, struct sk_buff_head *skb_list)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_info *di = (struct dma_info *)pub;</div><div class='del'>-	struct sk_buff *p, *head, *tail;</div><div class='add'>+	struct sk_buff_head dma_frames;</div><div class='add'>+	struct sk_buff *p, *next;</div><div class='ctx'> 	uint len;</div><div class='ctx'> 	uint pkt_len;</div><div class='ctx'> 	int resid = 0;</div><div class='add'>+	int pktcnt = 1;</div><div class='ctx'> </div><div class='add'>+	skb_queue_head_init(&amp;dma_frames);</div><div class='ctx'>  next_frame:</div><div class='del'>-	head = _dma_getnextrxp(di, false);</div><div class='del'>-	if (head == NULL)</div><div class='del'>-		return NULL;</div><div class='add'>+	p = _dma_getnextrxp(di, false);</div><div class='add'>+	if (p == NULL)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	len = le16_to_cpu(*(__le16 *) (head-&gt;data));</div><div class='del'>-	DMA_TRACE(("%s: dma_rx len %d\n", di-&gt;name, len));</div><div class='del'>-	dma_spin_for_len(len, head);</div><div class='add'>+	len = le16_to_cpu(*(__le16 *) (p-&gt;data));</div><div class='add'>+	DMA_TRACE("%s: dma_rx len %d\n", di-&gt;name, len);</div><div class='add'>+	dma_spin_for_len(len, p);</div><div class='ctx'> </div><div class='ctx'> 	/* set actual length */</div><div class='ctx'> 	pkt_len = min((di-&gt;rxoffset + len), di-&gt;rxbufsize);</div><div class='del'>-	__skb_trim(head, pkt_len);</div><div class='add'>+	__skb_trim(p, pkt_len);</div><div class='add'>+	skb_queue_tail(&amp;dma_frames, p);</div><div class='ctx'> 	resid = len - (di-&gt;rxbufsize - di-&gt;rxoffset);</div><div class='ctx'> </div><div class='ctx'> 	/* check for single or multi-buffer rx */</div><div class='ctx'> 	if (resid &gt; 0) {</div><div class='del'>-		tail = head;</div><div class='ctx'> 		while ((resid &gt; 0) &amp;&amp; (p = _dma_getnextrxp(di, false))) {</div><div class='del'>-			tail-&gt;next = p;</div><div class='ctx'> 			pkt_len = min_t(uint, resid, di-&gt;rxbufsize);</div><div class='ctx'> 			__skb_trim(p, pkt_len);</div><div class='del'>-</div><div class='del'>-			tail = p;</div><div class='add'>+			skb_queue_tail(&amp;dma_frames, p);</div><div class='ctx'> 			resid -= di-&gt;rxbufsize;</div><div class='add'>+			pktcnt++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> #ifdef BCMDBG</div><div class='ctx'> 		if (resid &gt; 0) {</div><div class='ctx'> 			uint cur;</div><div class='ctx'> 			cur =</div><div class='del'>-			    B2I(((R_REG(&amp;di-&gt;d64rxregs-&gt;status0) &amp;</div><div class='del'>-				  D64_RS0_CD_MASK) -</div><div class='del'>-				 di-&gt;rcvptrbase) &amp; D64_RS0_CD_MASK,</div><div class='del'>-				struct dma64desc);</div><div class='del'>-			DMA_ERROR(("dma_rx, rxin %d rxout %d, hw_curr %d\n",</div><div class='del'>-				   di-&gt;rxin, di-&gt;rxout, cur));</div><div class='add'>+			    B2I(((bcma_read32(di-&gt;core,</div><div class='add'>+					      DMA64RXREGOFFS(di, status0)) &amp;</div><div class='add'>+				  D64_RS0_CD_MASK) - di-&gt;rcvptrbase) &amp;</div><div class='add'>+				D64_RS0_CD_MASK, struct dma64desc);</div><div class='add'>+			DMA_ERROR("rxin %d rxout %d, hw_curr %d\n",</div><div class='add'>+				   di-&gt;rxin, di-&gt;rxout, cur);</div><div class='ctx'> 		}</div><div class='ctx'> #endif				/* BCMDBG */</div><div class='ctx'> </div><div class='ctx'> 		if ((di-&gt;dma.dmactrlflags &amp; DMA_CTRL_RXMULTI) == 0) {</div><div class='del'>-			DMA_ERROR(("%s: dma_rx: bad frame length (%d)\n",</div><div class='del'>-				   di-&gt;name, len));</div><div class='del'>-			brcmu_pkt_buf_free_skb(head);</div><div class='add'>+			DMA_ERROR("%s: bad frame length (%d)\n",</div><div class='add'>+				  di-&gt;name, len);</div><div class='add'>+			skb_queue_walk_safe(&amp;dma_frames, p, next) {</div><div class='add'>+				skb_unlink(p, &amp;dma_frames);</div><div class='add'>+				brcmu_pkt_buf_free_skb(p);</div><div class='add'>+			}</div><div class='ctx'> 			di-&gt;dma.rxgiants++;</div><div class='add'>+			pktcnt = 1;</div><div class='ctx'> 			goto next_frame;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return head;</div><div class='add'>+	skb_queue_splice_tail(&amp;dma_frames, skb_list);</div><div class='add'>+	return pktcnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool dma64_rxidle(struct dma_info *di)</div><div class='ctx'> {</div><div class='del'>-	DMA_TRACE(("%s: dma_rxidle\n", di-&gt;name));</div><div class='add'>+	DMA_TRACE("%s:\n", di-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	if (di-&gt;nrxd == 0)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	return ((R_REG(&amp;di-&gt;d64rxregs-&gt;status0) &amp; D64_RS0_CD_MASK) ==</div><div class='del'>-		(R_REG(&amp;di-&gt;d64rxregs-&gt;ptr) &amp; D64_RS0_CD_MASK));</div><div class='add'>+	return ((bcma_read32(di-&gt;core,</div><div class='add'>+			     DMA64RXREGOFFS(di, status0)) &amp; D64_RS0_CD_MASK) ==</div><div class='add'>+		(bcma_read32(di-&gt;core, DMA64RXREGOFFS(di, ptr)) &amp;</div><div class='add'>+		 D64_RS0_CD_MASK));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1010,7 +1042,7 @@ bool dma_rxfill(struct dma_pub *pub)</div><div class='ctx'> </div><div class='ctx'> 	n = di-&gt;nrxpost - nrxdactive(di, rxin, rxout);</div><div class='ctx'> </div><div class='del'>-	DMA_TRACE(("%s: dma_rxfill: post %d\n", di-&gt;name, n));</div><div class='add'>+	DMA_TRACE("%s: post %d\n", di-&gt;name, n);</div><div class='ctx'> </div><div class='ctx'> 	if (di-&gt;rxbufsize &gt; BCMEXTRAHDROOM)</div><div class='ctx'> 		extra_offset = di-&gt;rxextrahdrroom;</div><div class='hunk'>@@ -1023,11 +1055,9 @@ bool dma_rxfill(struct dma_pub *pub)</div><div class='ctx'> 		p = brcmu_pkt_buf_get_skb(di-&gt;rxbufsize + extra_offset);</div><div class='ctx'> </div><div class='ctx'> 		if (p == NULL) {</div><div class='del'>-			DMA_ERROR(("%s: dma_rxfill: out of rxbufs\n",</div><div class='del'>-				   di-&gt;name));</div><div class='add'>+			DMA_ERROR("%s: out of rxbufs\n", di-&gt;name);</div><div class='ctx'> 			if (i == 0 &amp;&amp; dma64_rxidle(di)) {</div><div class='del'>-				DMA_ERROR(("%s: rxfill64: ring is empty !\n",</div><div class='del'>-					   di-&gt;name));</div><div class='add'>+				DMA_ERROR("%s: ring is empty !\n", di-&gt;name);</div><div class='ctx'> 				ring_empty = true;</div><div class='ctx'> 			}</div><div class='ctx'> 			di-&gt;dma.rxnobuf++;</div><div class='hunk'>@@ -1042,8 +1072,8 @@ bool dma_rxfill(struct dma_pub *pub)</div><div class='ctx'> 		 */</div><div class='ctx'> 		*(u32 *) (p-&gt;data) = 0;</div><div class='ctx'> </div><div class='del'>-		pa = pci_map_single(di-&gt;pbus, p-&gt;data,</div><div class='del'>-			di-&gt;rxbufsize, PCI_DMA_FROMDEVICE);</div><div class='add'>+		pa = dma_map_single(di-&gt;dmadev, p-&gt;data, di-&gt;rxbufsize,</div><div class='add'>+				    DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		/* save the free packet pointer */</div><div class='ctx'> 		di-&gt;rxp[rxout] = p;</div><div class='hunk'>@@ -1061,7 +1091,7 @@ bool dma_rxfill(struct dma_pub *pub)</div><div class='ctx'> 	di-&gt;rxout = rxout;</div><div class='ctx'> </div><div class='ctx'> 	/* update the chip lastdscr pointer */</div><div class='del'>-	W_REG(&amp;di-&gt;d64rxregs-&gt;ptr,</div><div class='add'>+	bcma_write32(di-&gt;core, DMA64RXREGOFFS(di, ptr),</div><div class='ctx'> 	      di-&gt;rcvptrbase + I2B(rxout, struct dma64desc));</div><div class='ctx'> </div><div class='ctx'> 	return ring_empty;</div><div class='hunk'>@@ -1072,7 +1102,7 @@ void dma_rxreclaim(struct dma_pub *pub)</div><div class='ctx'> 	struct dma_info *di = (struct dma_info *)pub;</div><div class='ctx'> 	struct sk_buff *p;</div><div class='ctx'> </div><div class='del'>-	DMA_TRACE(("%s: dma_rxreclaim\n", di-&gt;name));</div><div class='add'>+	DMA_TRACE("%s:\n", di-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	while ((p = _dma_getnextrxp(di, true)))</div><div class='ctx'> 		brcmu_pkt_buf_free_skb(p);</div><div class='hunk'>@@ -1103,7 +1133,7 @@ void dma_txinit(struct dma_pub *pub)</div><div class='ctx'> 	struct dma_info *di = (struct dma_info *)pub;</div><div class='ctx'> 	u32 control = D64_XC_XE;</div><div class='ctx'> </div><div class='del'>-	DMA_TRACE(("%s: dma_txinit\n", di-&gt;name));</div><div class='add'>+	DMA_TRACE("%s:\n", di-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	if (di-&gt;ntxd == 0)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1122,7 +1152,7 @@ void dma_txinit(struct dma_pub *pub)</div><div class='ctx'> </div><div class='ctx'> 	if ((di-&gt;dma.dmactrlflags &amp; DMA_CTRL_PEN) == 0)</div><div class='ctx'> 		control |= D64_XC_PD;</div><div class='del'>-	OR_REG(&amp;di-&gt;d64txregs-&gt;control, control);</div><div class='add'>+	bcma_set32(di-&gt;core, DMA64TXREGOFFS(di, control), control);</div><div class='ctx'> </div><div class='ctx'> 	/* DMA engine with alignment requirement requires table to be inited</div><div class='ctx'> 	 * before enabling the engine</div><div class='hunk'>@@ -1135,24 +1165,24 @@ void dma_txsuspend(struct dma_pub *pub)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_info *di = (struct dma_info *)pub;</div><div class='ctx'> </div><div class='del'>-	DMA_TRACE(("%s: dma_txsuspend\n", di-&gt;name));</div><div class='add'>+	DMA_TRACE("%s:\n", di-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	if (di-&gt;ntxd == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	OR_REG(&amp;di-&gt;d64txregs-&gt;control, D64_XC_SE);</div><div class='add'>+	bcma_set32(di-&gt;core, DMA64TXREGOFFS(di, control), D64_XC_SE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void dma_txresume(struct dma_pub *pub)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_info *di = (struct dma_info *)pub;</div><div class='ctx'> </div><div class='del'>-	DMA_TRACE(("%s: dma_txresume\n", di-&gt;name));</div><div class='add'>+	DMA_TRACE("%s:\n", di-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	if (di-&gt;ntxd == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	AND_REG(&amp;di-&gt;d64txregs-&gt;control, ~D64_XC_SE);</div><div class='add'>+	bcma_mask32(di-&gt;core, DMA64TXREGOFFS(di, control), ~D64_XC_SE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool dma_txsuspended(struct dma_pub *pub)</div><div class='hunk'>@@ -1160,8 +1190,9 @@ bool dma_txsuspended(struct dma_pub *pub)</div><div class='ctx'> 	struct dma_info *di = (struct dma_info *)pub;</div><div class='ctx'> </div><div class='ctx'> 	return (di-&gt;ntxd == 0) ||</div><div class='del'>-	    ((R_REG(&amp;di-&gt;d64txregs-&gt;control) &amp; D64_XC_SE) ==</div><div class='del'>-	     D64_XC_SE);</div><div class='add'>+	       ((bcma_read32(di-&gt;core,</div><div class='add'>+			     DMA64TXREGOFFS(di, control)) &amp; D64_XC_SE) ==</div><div class='add'>+		D64_XC_SE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void dma_txreclaim(struct dma_pub *pub, enum txd_range range)</div><div class='hunk'>@@ -1169,11 +1200,11 @@ void dma_txreclaim(struct dma_pub *pub, enum txd_range range)</div><div class='ctx'> 	struct dma_info *di = (struct dma_info *)pub;</div><div class='ctx'> 	struct sk_buff *p;</div><div class='ctx'> </div><div class='del'>-	DMA_TRACE(("%s: dma_txreclaim %s\n", di-&gt;name,</div><div class='del'>-		   (range == DMA_RANGE_ALL) ? "all" :</div><div class='del'>-		   ((range ==</div><div class='del'>-		     DMA_RANGE_TRANSMITTED) ? "transmitted" :</div><div class='del'>-		    "transferred")));</div><div class='add'>+	DMA_TRACE("%s: %s\n",</div><div class='add'>+		  di-&gt;name,</div><div class='add'>+		  range == DMA_RANGE_ALL ? "all" :</div><div class='add'>+		  range == DMA_RANGE_TRANSMITTED ? "transmitted" :</div><div class='add'>+		  "transferred");</div><div class='ctx'> </div><div class='ctx'> 	if (di-&gt;txin == di-&gt;txout)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1194,16 +1225,17 @@ bool dma_txreset(struct dma_pub *pub)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	/* suspend tx DMA first */</div><div class='del'>-	W_REG(&amp;di-&gt;d64txregs-&gt;control, D64_XC_SE);</div><div class='add'>+	bcma_write32(di-&gt;core, DMA64TXREGOFFS(di, control), D64_XC_SE);</div><div class='ctx'> 	SPINWAIT(((status =</div><div class='del'>-		   (R_REG(&amp;di-&gt;d64txregs-&gt;status0) &amp; D64_XS0_XS_MASK))</div><div class='del'>-		  != D64_XS0_XS_DISABLED) &amp;&amp; (status != D64_XS0_XS_IDLE)</div><div class='del'>-		 &amp;&amp; (status != D64_XS0_XS_STOPPED), 10000);</div><div class='add'>+		   (bcma_read32(di-&gt;core, DMA64TXREGOFFS(di, status0)) &amp;</div><div class='add'>+		    D64_XS0_XS_MASK)) != D64_XS0_XS_DISABLED) &amp;&amp;</div><div class='add'>+		  (status != D64_XS0_XS_IDLE) &amp;&amp; (status != D64_XS0_XS_STOPPED),</div><div class='add'>+		 10000);</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;di-&gt;d64txregs-&gt;control, 0);</div><div class='add'>+	bcma_write32(di-&gt;core, DMA64TXREGOFFS(di, control), 0);</div><div class='ctx'> 	SPINWAIT(((status =</div><div class='del'>-		   (R_REG(&amp;di-&gt;d64txregs-&gt;status0) &amp; D64_XS0_XS_MASK))</div><div class='del'>-		  != D64_XS0_XS_DISABLED), 10000);</div><div class='add'>+		   (bcma_read32(di-&gt;core, DMA64TXREGOFFS(di, status0)) &amp;</div><div class='add'>+		    D64_XS0_XS_MASK)) != D64_XS0_XS_DISABLED), 10000);</div><div class='ctx'> </div><div class='ctx'> 	/* wait for the last transaction to complete */</div><div class='ctx'> 	udelay(300);</div><div class='hunk'>@@ -1219,10 +1251,10 @@ bool dma_rxreset(struct dma_pub *pub)</div><div class='ctx'> 	if (di-&gt;nrxd == 0)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;di-&gt;d64rxregs-&gt;control, 0);</div><div class='add'>+	bcma_write32(di-&gt;core, DMA64RXREGOFFS(di, control), 0);</div><div class='ctx'> 	SPINWAIT(((status =</div><div class='del'>-		   (R_REG(&amp;di-&gt;d64rxregs-&gt;status0) &amp; D64_RS0_RS_MASK))</div><div class='del'>-		  != D64_RS0_RS_DISABLED), 10000);</div><div class='add'>+		   (bcma_read32(di-&gt;core, DMA64RXREGOFFS(di, status0)) &amp;</div><div class='add'>+		    D64_RS0_RS_MASK)) != D64_RS0_RS_DISABLED), 10000);</div><div class='ctx'> </div><div class='ctx'> 	return status == D64_RS0_RS_DISABLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -1233,72 +1265,58 @@ bool dma_rxreset(struct dma_pub *pub)</div><div class='ctx'>  *   the error(toss frames) could be fatal and cause many subsequent hard</div><div class='ctx'>  *   to debug problems</div><div class='ctx'>  */</div><div class='del'>-int dma_txfast(struct dma_pub *pub, struct sk_buff *p0, bool commit)</div><div class='add'>+int dma_txfast(struct dma_pub *pub, struct sk_buff *p, bool commit)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_info *di = (struct dma_info *)pub;</div><div class='del'>-	struct sk_buff *p, *next;</div><div class='ctx'> 	unsigned char *data;</div><div class='ctx'> 	uint len;</div><div class='ctx'> 	u16 txout;</div><div class='ctx'> 	u32 flags = 0;</div><div class='ctx'> 	dma_addr_t pa;</div><div class='ctx'> </div><div class='del'>-	DMA_TRACE(("%s: dma_txfast\n", di-&gt;name));</div><div class='add'>+	DMA_TRACE("%s:\n", di-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	txout = di-&gt;txout;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Walk the chain of packet buffers</div><div class='del'>-	 * allocating and initializing transmit descriptor entries.</div><div class='add'>+	 * obtain and initialize transmit descriptor entry.</div><div class='ctx'> 	 */</div><div class='del'>-	for (p = p0; p; p = next) {</div><div class='del'>-		data = p-&gt;data;</div><div class='del'>-		len = p-&gt;len;</div><div class='del'>-		next = p-&gt;next;</div><div class='add'>+	data = p-&gt;data;</div><div class='add'>+	len = p-&gt;len;</div><div class='ctx'> </div><div class='del'>-		/* return nonzero if out of tx descriptors */</div><div class='del'>-		if (nexttxd(di, txout) == di-&gt;txin)</div><div class='del'>-			goto outoftxd;</div><div class='add'>+	/* no use to transmit a zero length packet */</div><div class='add'>+	if (len == 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		if (len == 0)</div><div class='del'>-			continue;</div><div class='add'>+	/* return nonzero if out of tx descriptors */</div><div class='add'>+	if (nexttxd(di, txout) == di-&gt;txin)</div><div class='add'>+		goto outoftxd;</div><div class='ctx'> </div><div class='del'>-		/* get physical address of buffer start */</div><div class='del'>-		pa = pci_map_single(di-&gt;pbus, data, len, PCI_DMA_TODEVICE);</div><div class='add'>+	/* get physical address of buffer start */</div><div class='add'>+	pa = dma_map_single(di-&gt;dmadev, data, len, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='del'>-		flags = 0;</div><div class='del'>-		if (p == p0)</div><div class='del'>-			flags |= D64_CTRL1_SOF;</div><div class='del'>-</div><div class='del'>-		/* With a DMA segment list, Descriptor table is filled</div><div class='del'>-		 * using the segment list instead of looping over</div><div class='del'>-		 * buffers in multi-chain DMA. Therefore, EOF for SGLIST</div><div class='del'>-		 * is when end of segment list is reached.</div><div class='del'>-		 */</div><div class='del'>-		if (next == NULL)</div><div class='del'>-			flags |= (D64_CTRL1_IOC | D64_CTRL1_EOF);</div><div class='del'>-		if (txout == (di-&gt;ntxd - 1))</div><div class='del'>-			flags |= D64_CTRL1_EOT;</div><div class='del'>-</div><div class='del'>-		dma64_dd_upd(di, di-&gt;txd64, pa, txout, &amp;flags, len);</div><div class='add'>+	/* With a DMA segment list, Descriptor table is filled</div><div class='add'>+	 * using the segment list instead of looping over</div><div class='add'>+	 * buffers in multi-chain DMA. Therefore, EOF for SGLIST</div><div class='add'>+	 * is when end of segment list is reached.</div><div class='add'>+	 */</div><div class='add'>+	flags = D64_CTRL1_SOF | D64_CTRL1_IOC | D64_CTRL1_EOF;</div><div class='add'>+	if (txout == (di-&gt;ntxd - 1))</div><div class='add'>+		flags |= D64_CTRL1_EOT;</div><div class='ctx'> </div><div class='del'>-		txout = nexttxd(di, txout);</div><div class='del'>-	}</div><div class='add'>+	dma64_dd_upd(di, di-&gt;txd64, pa, txout, &amp;flags, len);</div><div class='ctx'> </div><div class='del'>-	/* if last txd eof not set, fix it */</div><div class='del'>-	if (!(flags &amp; D64_CTRL1_EOF))</div><div class='del'>-		di-&gt;txd64[prevtxd(di, txout)].ctrl1 =</div><div class='del'>-		     cpu_to_le32(flags | D64_CTRL1_IOC | D64_CTRL1_EOF);</div><div class='add'>+	txout = nexttxd(di, txout);</div><div class='ctx'> </div><div class='ctx'> 	/* save the packet */</div><div class='del'>-	di-&gt;txp[prevtxd(di, txout)] = p0;</div><div class='add'>+	di-&gt;txp[prevtxd(di, txout)] = p;</div><div class='ctx'> </div><div class='ctx'> 	/* bump the tx descriptor index */</div><div class='ctx'> 	di-&gt;txout = txout;</div><div class='ctx'> </div><div class='ctx'> 	/* kick the chip */</div><div class='ctx'> 	if (commit)</div><div class='del'>-		W_REG(&amp;di-&gt;d64txregs-&gt;ptr,</div><div class='add'>+		bcma_write32(di-&gt;core, DMA64TXREGOFFS(di, ptr),</div><div class='ctx'> 		      di-&gt;xmtptrbase + I2B(txout, struct dma64desc));</div><div class='ctx'> </div><div class='ctx'> 	/* tx flow control */</div><div class='hunk'>@@ -1307,8 +1325,8 @@ int dma_txfast(struct dma_pub *pub, struct sk_buff *p0, bool commit)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  outoftxd:</div><div class='del'>-	DMA_ERROR(("%s: dma_txfast: out of txds !!!\n", di-&gt;name));</div><div class='del'>-	brcmu_pkt_buf_free_skb(p0);</div><div class='add'>+	DMA_ERROR("%s: out of txds !!!\n", di-&gt;name);</div><div class='add'>+	brcmu_pkt_buf_free_skb(p);</div><div class='ctx'> 	di-&gt;dma.txavail = 0;</div><div class='ctx'> 	di-&gt;dma.txnobuf++;</div><div class='ctx'> 	return -1;</div><div class='hunk'>@@ -1331,11 +1349,11 @@ struct sk_buff *dma_getnexttxp(struct dma_pub *pub, enum txd_range range)</div><div class='ctx'> 	u16 active_desc;</div><div class='ctx'> 	struct sk_buff *txp;</div><div class='ctx'> </div><div class='del'>-	DMA_TRACE(("%s: dma_getnexttxp %s\n", di-&gt;name,</div><div class='del'>-		   (range == DMA_RANGE_ALL) ? "all" :</div><div class='del'>-		   ((range ==</div><div class='del'>-		     DMA_RANGE_TRANSMITTED) ? "transmitted" :</div><div class='del'>-		    "transferred")));</div><div class='add'>+	DMA_TRACE("%s: %s\n",</div><div class='add'>+		  di-&gt;name,</div><div class='add'>+		  range == DMA_RANGE_ALL ? "all" :</div><div class='add'>+		  range == DMA_RANGE_TRANSMITTED ? "transmitted" :</div><div class='add'>+		  "transferred");</div><div class='ctx'> </div><div class='ctx'> 	if (di-&gt;ntxd == 0)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -1346,16 +1364,15 @@ struct sk_buff *dma_getnexttxp(struct dma_pub *pub, enum txd_range range)</div><div class='ctx'> 	if (range == DMA_RANGE_ALL)</div><div class='ctx'> 		end = di-&gt;txout;</div><div class='ctx'> 	else {</div><div class='del'>-		struct dma64regs __iomem *dregs = di-&gt;d64txregs;</div><div class='del'>-</div><div class='del'>-		end = (u16) (B2I(((R_REG(&amp;dregs-&gt;status0) &amp;</div><div class='del'>-				 D64_XS0_CD_MASK) -</div><div class='del'>-				 di-&gt;xmtptrbase) &amp; D64_XS0_CD_MASK,</div><div class='del'>-				 struct dma64desc));</div><div class='add'>+		end = (u16) (B2I(((bcma_read32(di-&gt;core,</div><div class='add'>+					       DMA64TXREGOFFS(di, status0)) &amp;</div><div class='add'>+				   D64_XS0_CD_MASK) - di-&gt;xmtptrbase) &amp;</div><div class='add'>+				 D64_XS0_CD_MASK, struct dma64desc));</div><div class='ctx'> </div><div class='ctx'> 		if (range == DMA_RANGE_TRANSFERED) {</div><div class='ctx'> 			active_desc =</div><div class='del'>-			    (u16) (R_REG(&amp;dregs-&gt;status1) &amp;</div><div class='add'>+				(u16)(bcma_read32(di-&gt;core,</div><div class='add'>+						  DMA64TXREGOFFS(di, status1)) &amp;</div><div class='ctx'> 				      D64_XS1_AD_MASK);</div><div class='ctx'> 			active_desc =</div><div class='ctx'> 			    (active_desc - di-&gt;xmtptrbase) &amp; D64_XS0_CD_MASK;</div><div class='hunk'>@@ -1384,7 +1401,7 @@ struct sk_buff *dma_getnexttxp(struct dma_pub *pub, enum txd_range range)</div><div class='ctx'> 		txp = di-&gt;txp[i];</div><div class='ctx'> 		di-&gt;txp[i] = NULL;</div><div class='ctx'> </div><div class='del'>-		pci_unmap_single(di-&gt;pbus, pa, size, PCI_DMA_TODEVICE);</div><div class='add'>+		dma_unmap_single(di-&gt;dmadev, pa, size, DMA_TO_DEVICE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	di-&gt;txin = i;</div><div class='hunk'>@@ -1395,8 +1412,8 @@ struct sk_buff *dma_getnexttxp(struct dma_pub *pub, enum txd_range range)</div><div class='ctx'> 	return txp;</div><div class='ctx'> </div><div class='ctx'>  bogus:</div><div class='del'>-	DMA_NONE(("dma_getnexttxp: bogus curr: start %d end %d txout %d "</div><div class='del'>-		  "force %d\n", start, end, di-&gt;txout, forceall));</div><div class='add'>+	DMA_NONE("bogus curr: start %d end %d txout %d\n",</div><div class='add'>+		 start, end, di-&gt;txout);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/dma.h b/drivers/net/wireless/brcm80211/brcmsmac/dma.h<br/>index ebc5bc546f3b..cc269ee5c499 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/dma.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/dma.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/dma.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/dma.h</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #define	_BRCM_DMA_H_</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include "types.h"		/* forward structure declarations */</div><div class='ctx'> </div><div class='ctx'> /* map/unmap direction */</div><div class='hunk'>@@ -74,13 +75,14 @@ struct dma_pub {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct dma_pub *dma_attach(char *name, struct si_pub *sih,</div><div class='del'>-			    void __iomem *dmaregstx, void __iomem *dmaregsrx,</div><div class='del'>-			    uint ntxd, uint nrxd,</div><div class='del'>-			    uint rxbufsize, int rxextheadroom,</div><div class='del'>-			    uint nrxpost, uint rxoffset, uint *msg_level);</div><div class='add'>+				  struct bcma_device *d11core,</div><div class='add'>+				  uint txregbase, uint rxregbase,</div><div class='add'>+				  uint ntxd, uint nrxd,</div><div class='add'>+				  uint rxbufsize, int rxextheadroom,</div><div class='add'>+				  uint nrxpost, uint rxoffset, uint *msg_level);</div><div class='ctx'> </div><div class='ctx'> void dma_rxinit(struct dma_pub *pub);</div><div class='del'>-struct sk_buff *dma_rx(struct dma_pub *pub);</div><div class='add'>+int dma_rx(struct dma_pub *pub, struct sk_buff_head *skb_list);</div><div class='ctx'> bool dma_rxfill(struct dma_pub *pub);</div><div class='ctx'> bool dma_rxreset(struct dma_pub *pub);</div><div class='ctx'> bool dma_txreset(struct dma_pub *pub);</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c<br/>index 0d8a9cdf897a..448ab9c4eb47 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c</a></div><div class='hunk'>@@ -17,11 +17,11 @@</div><div class='ctx'> #define __UNDEF_NO_VERSION__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.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='add'>+#include &lt;linux/bcma/bcma.h&gt;</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='ctx'> #include &lt;defs.h&gt;</div><div class='ctx'> #include "nicpci.h"</div><div class='hunk'>@@ -40,10 +40,10 @@</div><div class='ctx'> #define MAC_FILTERS (FIF_PROMISC_IN_BSS | \</div><div class='ctx'> 	FIF_ALLMULTI | \</div><div class='ctx'> 	FIF_FCSFAIL | \</div><div class='del'>-	FIF_PLCPFAIL | \</div><div class='ctx'> 	FIF_CONTROL | \</div><div class='ctx'> 	FIF_OTHER_BSS | \</div><div class='del'>-	FIF_BCN_PRBRESP_PROMISC)</div><div class='add'>+	FIF_BCN_PRBRESP_PROMISC | \</div><div class='add'>+	FIF_PSPOLL)</div><div class='ctx'> </div><div class='ctx'> #define CHAN2GHZ(channel, freqency, chflags)  { \</div><div class='ctx'> 	.band = IEEE80211_BAND_2GHZ, \</div><div class='hunk'>@@ -87,16 +87,14 @@ MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver.");</div><div class='ctx'> MODULE_SUPPORTED_DEVICE("Broadcom 802.11n WLAN cards");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> </div><div class='del'>-/* recognized PCI IDs */</div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(brcms_pci_id_table) = {</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) }, /* 43225 2G */</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) }, /* 43224 DUAL */</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) }, /* 4313 DUAL */</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) }, /* 43224 Ven */</div><div class='del'>-	{0}</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-MODULE_DEVICE_TABLE(pci, brcms_pci_id_table);</div><div class='add'>+/* recognized BCMA Core IDs */</div><div class='add'>+static struct bcma_device_id brcms_coreid_table[] = {</div><div class='add'>+	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 23, BCMA_ANY_CLASS),</div><div class='add'>+	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 24, BCMA_ANY_CLASS),</div><div class='add'>+	BCMA_CORETABLE_END</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(bcma, brcms_coreid_table);</div><div class='ctx'> </div><div class='ctx'> #ifdef BCMDBG</div><div class='ctx'> static int msglevel = 0xdeadbeef;</div><div class='hunk'>@@ -216,8 +214,7 @@ static const struct ieee80211_supported_band brcms_band_2GHz_nphy_template = {</div><div class='ctx'> 	.ht_cap = {</div><div class='ctx'> 		   /* from include/linux/ieee80211.h */</div><div class='ctx'> 		   .cap = IEEE80211_HT_CAP_GRN_FLD |</div><div class='del'>-		   IEEE80211_HT_CAP_SGI_20 |</div><div class='del'>-		   IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_40MHZ_INTOLERANT,</div><div class='add'>+			  IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40,</div><div class='ctx'> 		   .ht_supported = true,</div><div class='ctx'> 		   .ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K,</div><div class='ctx'> 		   .ampdu_density = AMPDU_DEF_MPDU_DENSITY,</div><div class='hunk'>@@ -238,8 +235,7 @@ static const struct ieee80211_supported_band brcms_band_5GHz_nphy_template = {</div><div class='ctx'> 			BRCMS_LEGACY_5G_RATE_OFFSET,</div><div class='ctx'> 	.ht_cap = {</div><div class='ctx'> 		   .cap = IEEE80211_HT_CAP_GRN_FLD | IEEE80211_HT_CAP_SGI_20 |</div><div class='del'>-			  IEEE80211_HT_CAP_SGI_40 |</div><div class='del'>-			  IEEE80211_HT_CAP_40MHZ_INTOLERANT, /* No 40 mhz yet */</div><div class='add'>+			  IEEE80211_HT_CAP_SGI_40,</div><div class='ctx'> 		   .ht_supported = true,</div><div class='ctx'> 		   .ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K,</div><div class='ctx'> 		   .ampdu_density = AMPDU_DEF_MPDU_DENSITY,</div><div class='hunk'>@@ -287,6 +283,7 @@ static int brcms_ops_start(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_info *wl = hw-&gt;priv;</div><div class='ctx'> 	bool blocked;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_wake_queues(hw);</div><div class='ctx'> 	spin_lock_bh(&amp;wl-&gt;lock);</div><div class='hunk'>@@ -295,57 +292,69 @@ static int brcms_ops_start(struct ieee80211_hw *hw)</div><div class='ctx'> 	if (!blocked)</div><div class='ctx'> 		wiphy_rfkill_stop_polling(wl-&gt;pub-&gt;ieee_hw-&gt;wiphy);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	spin_lock_bh(&amp;wl-&gt;lock);</div><div class='add'>+	/* avoid acknowledging frames before a non-monitor device is added */</div><div class='add'>+	wl-&gt;mute_tx = true;</div><div class='add'>+</div><div class='add'>+	if (!wl-&gt;pub-&gt;up)</div><div class='add'>+		err = brcms_up(wl);</div><div class='add'>+	else</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+	spin_unlock_bh(&amp;wl-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (err != 0)</div><div class='add'>+		wiphy_err(hw-&gt;wiphy, "%s: brcms_up() returned %d\n", __func__,</div><div class='add'>+			  err);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void brcms_ops_stop(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='add'>+	struct brcms_info *wl = hw-&gt;priv;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='ctx'> 	ieee80211_stop_queues(hw);</div><div class='add'>+</div><div class='add'>+	if (wl-&gt;wlc == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;wl-&gt;lock);</div><div class='add'>+	status = brcms_c_chipmatch(wl-&gt;wlc-&gt;hw-&gt;vendorid,</div><div class='add'>+				   wl-&gt;wlc-&gt;hw-&gt;deviceid);</div><div class='add'>+	spin_unlock_bh(&amp;wl-&gt;lock);</div><div class='add'>+	if (!status) {</div><div class='add'>+		wiphy_err(wl-&gt;wiphy,</div><div class='add'>+			  "wl: brcms_ops_stop: chipmatch failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* put driver in down state */</div><div class='add'>+	spin_lock_bh(&amp;wl-&gt;lock);</div><div class='add'>+	brcms_down(wl);</div><div class='add'>+	spin_unlock_bh(&amp;wl-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> brcms_ops_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct brcms_info *wl;</div><div class='del'>-	int err;</div><div class='add'>+	struct brcms_info *wl = hw-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	/* Just STA for now */</div><div class='del'>-	if (vif-&gt;type != NL80211_IFTYPE_AP &amp;&amp;</div><div class='del'>-	    vif-&gt;type != NL80211_IFTYPE_MESH_POINT &amp;&amp;</div><div class='del'>-	    vif-&gt;type != NL80211_IFTYPE_STATION &amp;&amp;</div><div class='del'>-	    vif-&gt;type != NL80211_IFTYPE_WDS &amp;&amp;</div><div class='del'>-	    vif-&gt;type != NL80211_IFTYPE_ADHOC) {</div><div class='add'>+	if (vif-&gt;type != NL80211_IFTYPE_STATION) {</div><div class='ctx'> 		wiphy_err(hw-&gt;wiphy, "%s: Attempt to add type %d, only"</div><div class='ctx'> 			  " STA for now\n", __func__, vif-&gt;type);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wl = hw-&gt;priv;</div><div class='del'>-	spin_lock_bh(&amp;wl-&gt;lock);</div><div class='del'>-	if (!wl-&gt;pub-&gt;up)</div><div class='del'>-		err = brcms_up(wl);</div><div class='del'>-	else</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-	spin_unlock_bh(&amp;wl-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (err != 0)</div><div class='del'>-		wiphy_err(hw-&gt;wiphy, "%s: brcms_up() returned %d\n", __func__,</div><div class='del'>-			  err);</div><div class='add'>+	wl-&gt;mute_tx = false;</div><div class='add'>+	brcms_c_mute(wl-&gt;wlc, false);</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'> static void</div><div class='ctx'> brcms_ops_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct brcms_info *wl;</div><div class='del'>-</div><div class='del'>-	wl = hw-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* put driver in down state */</div><div class='del'>-	spin_lock_bh(&amp;wl-&gt;lock);</div><div class='del'>-	brcms_down(wl);</div><div class='del'>-	spin_unlock_bh(&amp;wl-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int brcms_ops_config(struct ieee80211_hw *hw, u32 changed)</div><div class='hunk'>@@ -362,7 +371,7 @@ static int brcms_ops_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 						   conf-&gt;listen_interval);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (changed &amp; IEEE80211_CONF_CHANGE_MONITOR)</div><div class='del'>-		wiphy_err(wiphy, "%s: change monitor mode: %s (implement)\n",</div><div class='add'>+		wiphy_dbg(wiphy, "%s: change monitor mode: %s\n",</div><div class='ctx'> 			  __func__, conf-&gt;flags &amp; IEEE80211_CONF_MONITOR ?</div><div class='ctx'> 			  "true" : "false");</div><div class='ctx'> 	if (changed &amp; IEEE80211_CONF_CHANGE_PS)</div><div class='hunk'>@@ -539,29 +548,25 @@ brcms_ops_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	changed_flags &amp;= MAC_FILTERS;</div><div class='ctx'> 	*total_flags &amp;= MAC_FILTERS;</div><div class='add'>+</div><div class='ctx'> 	if (changed_flags &amp; FIF_PROMISC_IN_BSS)</div><div class='del'>-		wiphy_err(wiphy, "FIF_PROMISC_IN_BSS\n");</div><div class='add'>+		wiphy_dbg(wiphy, "FIF_PROMISC_IN_BSS\n");</div><div class='ctx'> 	if (changed_flags &amp; FIF_ALLMULTI)</div><div class='del'>-		wiphy_err(wiphy, "FIF_ALLMULTI\n");</div><div class='add'>+		wiphy_dbg(wiphy, "FIF_ALLMULTI\n");</div><div class='ctx'> 	if (changed_flags &amp; FIF_FCSFAIL)</div><div class='del'>-		wiphy_err(wiphy, "FIF_FCSFAIL\n");</div><div class='del'>-	if (changed_flags &amp; FIF_PLCPFAIL)</div><div class='del'>-		wiphy_err(wiphy, "FIF_PLCPFAIL\n");</div><div class='add'>+		wiphy_dbg(wiphy, "FIF_FCSFAIL\n");</div><div class='ctx'> 	if (changed_flags &amp; FIF_CONTROL)</div><div class='del'>-		wiphy_err(wiphy, "FIF_CONTROL\n");</div><div class='add'>+		wiphy_dbg(wiphy, "FIF_CONTROL\n");</div><div class='ctx'> 	if (changed_flags &amp; FIF_OTHER_BSS)</div><div class='del'>-		wiphy_err(wiphy, "FIF_OTHER_BSS\n");</div><div class='del'>-	if (changed_flags &amp; FIF_BCN_PRBRESP_PROMISC) {</div><div class='del'>-		spin_lock_bh(&amp;wl-&gt;lock);</div><div class='del'>-		if (*total_flags &amp; FIF_BCN_PRBRESP_PROMISC) {</div><div class='del'>-			wl-&gt;pub-&gt;mac80211_state |= MAC80211_PROMISC_BCNS;</div><div class='del'>-			brcms_c_mac_bcn_promisc_change(wl-&gt;wlc, 1);</div><div class='del'>-		} else {</div><div class='del'>-			brcms_c_mac_bcn_promisc_change(wl-&gt;wlc, 0);</div><div class='del'>-			wl-&gt;pub-&gt;mac80211_state &amp;= ~MAC80211_PROMISC_BCNS;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_bh(&amp;wl-&gt;lock);</div><div class='del'>-	}</div><div class='add'>+		wiphy_dbg(wiphy, "FIF_OTHER_BSS\n");</div><div class='add'>+	if (changed_flags &amp; FIF_PSPOLL)</div><div class='add'>+		wiphy_dbg(wiphy, "FIF_PSPOLL\n");</div><div class='add'>+	if (changed_flags &amp; FIF_BCN_PRBRESP_PROMISC)</div><div class='add'>+		wiphy_dbg(wiphy, "FIF_BCN_PRBRESP_PROMISC\n");</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;wl-&gt;lock);</div><div class='add'>+	brcms_c_mac_promisc(wl-&gt;wlc, *total_flags);</div><div class='add'>+	spin_unlock_bh(&amp;wl-&gt;lock);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -609,13 +614,6 @@ brcms_ops_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 	wl-&gt;pub-&gt;global_ampdu-&gt;scb = scb;</div><div class='ctx'> 	wl-&gt;pub-&gt;global_ampdu-&gt;max_pdu = 16;</div><div class='ctx'> </div><div class='del'>-	sta-&gt;ht_cap.ht_supported = true;</div><div class='del'>-	sta-&gt;ht_cap.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;</div><div class='del'>-	sta-&gt;ht_cap.ampdu_density = AMPDU_DEF_MPDU_DENSITY;</div><div class='del'>-	sta-&gt;ht_cap.cap = IEEE80211_HT_CAP_GRN_FLD |</div><div class='del'>-	    IEEE80211_HT_CAP_SGI_20 |</div><div class='del'>-	    IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_40MHZ_INTOLERANT;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * minstrel_ht initiates addBA on our behalf by calling</div><div class='ctx'> 	 * ieee80211_start_tx_ba_session()</div><div class='hunk'>@@ -724,7 +722,7 @@ static const struct ieee80211_ops brcms_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * is called in brcms_pci_probe() context, therefore no locking required.</div><div class='add'>+ * is called in brcms_bcma_probe() context, therefore no locking required.</div><div class='ctx'>  */</div><div class='ctx'> static int brcms_set_hint(struct brcms_info *wl, char *abbrev)</div><div class='ctx'> {</div><div class='hunk'>@@ -864,56 +862,26 @@ static void brcms_free(struct brcms_info *wl)</div><div class='ctx'> #endif</div><div class='ctx'> 		kfree(t);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * unregister_netdev() calls get_stats() which may read chip</div><div class='del'>-	 * registers so we cannot unmap the chip registers until</div><div class='del'>-	 * after calling unregister_netdev() .</div><div class='del'>-	 */</div><div class='del'>-	if (wl-&gt;regsva)</div><div class='del'>-		iounmap(wl-&gt;regsva);</div><div class='del'>-</div><div class='del'>-	wl-&gt;regsva = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>-* called from both kernel as from this kernel module.</div><div class='add'>+* called from both kernel as from this kernel module (error flow on attach)</div><div class='ctx'> * precondition: perimeter lock is not acquired.</div><div class='ctx'> */</div><div class='del'>-static void brcms_remove(struct pci_dev *pdev)</div><div class='add'>+static void brcms_remove(struct bcma_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct brcms_info *wl;</div><div class='del'>-	struct ieee80211_hw *hw;</div><div class='del'>-	int status;</div><div class='del'>-</div><div class='del'>-	hw = pci_get_drvdata(pdev);</div><div class='del'>-	wl = hw-&gt;priv;</div><div class='del'>-	if (!wl) {</div><div class='del'>-		pr_err("wl: brcms_remove: pci_get_drvdata failed\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	struct ieee80211_hw *hw = bcma_get_drvdata(pdev);</div><div class='add'>+	struct brcms_info *wl = hw-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;wl-&gt;lock);</div><div class='del'>-	status = brcms_c_chipmatch(pdev-&gt;vendor, pdev-&gt;device);</div><div class='del'>-	spin_unlock_bh(&amp;wl-&gt;lock);</div><div class='del'>-	if (!status) {</div><div class='del'>-		wiphy_err(wl-&gt;wiphy, "wl: brcms_remove: chipmatch "</div><div class='del'>-				     "failed\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='ctx'> 	if (wl-&gt;wlc) {</div><div class='ctx'> 		wiphy_rfkill_set_hw_state(wl-&gt;pub-&gt;ieee_hw-&gt;wiphy, false);</div><div class='ctx'> 		wiphy_rfkill_stop_polling(wl-&gt;pub-&gt;ieee_hw-&gt;wiphy);</div><div class='ctx'> 		ieee80211_unregister_hw(hw);</div><div class='del'>-		spin_lock_bh(&amp;wl-&gt;lock);</div><div class='del'>-		brcms_down(wl);</div><div class='del'>-		spin_unlock_bh(&amp;wl-&gt;lock);</div><div class='ctx'> 	}</div><div class='del'>-	pci_disable_device(pdev);</div><div class='ctx'> </div><div class='ctx'> 	brcms_free(wl);</div><div class='ctx'> </div><div class='del'>-	pci_set_drvdata(pdev, NULL);</div><div class='add'>+	bcma_set_drvdata(pdev, NULL);</div><div class='ctx'> 	ieee80211_free_hw(hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1021,11 +989,9 @@ static int ieee_hw_init(struct ieee80211_hw *hw)</div><div class='ctx'>  * it as static.</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='del'>- * is called in brcms_pci_probe() context, therefore no locking required.</div><div class='add'>+ * is called in brcms_bcma_probe() context, therefore no locking required.</div><div class='ctx'>  */</div><div class='del'>-static struct brcms_info *brcms_attach(u16 vendor, u16 device,</div><div class='del'>-				       resource_size_t regs,</div><div class='del'>-				       struct pci_dev *btparam, uint irq)</div><div class='add'>+static struct brcms_info *brcms_attach(struct bcma_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_info *wl = NULL;</div><div class='ctx'> 	int unit, err;</div><div class='hunk'>@@ -1039,7 +1005,7 @@ static struct brcms_info *brcms_attach(u16 vendor, u16 device,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* allocate private info */</div><div class='del'>-	hw = pci_get_drvdata(btparam);	/* btparam == pdev */</div><div class='add'>+	hw = bcma_get_drvdata(pdev);</div><div class='ctx'> 	if (hw != NULL)</div><div class='ctx'> 		wl = hw-&gt;priv;</div><div class='ctx'> 	if (WARN_ON(hw == NULL) || WARN_ON(wl == NULL))</div><div class='hunk'>@@ -1051,26 +1017,20 @@ static struct brcms_info *brcms_attach(u16 vendor, u16 device,</div><div class='ctx'> 	/* setup the bottom half handler */</div><div class='ctx'> 	tasklet_init(&amp;wl-&gt;tasklet, brcms_dpc, (unsigned long) wl);</div><div class='ctx'> </div><div class='del'>-	wl-&gt;regsva = ioremap_nocache(regs, PCI_BAR0_WINSZ);</div><div class='del'>-	if (wl-&gt;regsva == NULL) {</div><div class='del'>-		wiphy_err(wl-&gt;wiphy, "wl%d: ioremap() failed\n", unit);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='ctx'> 	spin_lock_init(&amp;wl-&gt;lock);</div><div class='ctx'> 	spin_lock_init(&amp;wl-&gt;isr_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* prepare ucode */</div><div class='del'>-	if (brcms_request_fw(wl, btparam) &lt; 0) {</div><div class='add'>+	if (brcms_request_fw(wl, pdev-&gt;bus-&gt;host_pci) &lt; 0) {</div><div class='ctx'> 		wiphy_err(wl-&gt;wiphy, "%s: Failed to find firmware usually in "</div><div class='ctx'> 			  "%s\n", KBUILD_MODNAME, "/lib/firmware/brcm");</div><div class='ctx'> 		brcms_release_fw(wl);</div><div class='del'>-		brcms_remove(btparam);</div><div class='add'>+		brcms_remove(pdev);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* common load-time initialization */</div><div class='del'>-	wl-&gt;wlc = brcms_c_attach(wl, vendor, device, unit, false,</div><div class='del'>-				 wl-&gt;regsva, btparam, &amp;err);</div><div class='add'>+	wl-&gt;wlc = brcms_c_attach((void *)wl, pdev, unit, false, &amp;err);</div><div class='ctx'> 	brcms_release_fw(wl);</div><div class='ctx'> 	if (!wl-&gt;wlc) {</div><div class='ctx'> 		wiphy_err(wl-&gt;wiphy, "%s: attach() failed with code %d\n",</div><div class='hunk'>@@ -1081,15 +1041,13 @@ static struct brcms_info *brcms_attach(u16 vendor, u16 device,</div><div class='ctx'> </div><div class='ctx'> 	wl-&gt;pub-&gt;ieee_hw = hw;</div><div class='ctx'> </div><div class='del'>-	/* disable mpc */</div><div class='del'>-	brcms_c_set_radio_mpc(wl-&gt;wlc, false);</div><div class='del'>-</div><div class='ctx'> 	/* register our interrupt handler */</div><div class='del'>-	if (request_irq(irq, brcms_isr, IRQF_SHARED, KBUILD_MODNAME, wl)) {</div><div class='add'>+	if (request_irq(pdev-&gt;bus-&gt;host_pci-&gt;irq, brcms_isr,</div><div class='add'>+			IRQF_SHARED, KBUILD_MODNAME, wl)) {</div><div class='ctx'> 		wiphy_err(wl-&gt;wiphy, "wl%d: request_irq() failed\n", unit);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='del'>-	wl-&gt;irq = irq;</div><div class='add'>+	wl-&gt;irq = pdev-&gt;bus-&gt;host_pci-&gt;irq;</div><div class='ctx'> </div><div class='ctx'> 	/* register module */</div><div class='ctx'> 	brcms_c_module_register(wl-&gt;pub, "linux", wl, NULL);</div><div class='hunk'>@@ -1136,37 +1094,18 @@ fail:</div><div class='ctx'>  *</div><div class='ctx'>  * Perimeter lock is initialized in the course of this function.</div><div class='ctx'>  */</div><div class='del'>-static int __devinit</div><div class='del'>-brcms_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='add'>+static int __devinit brcms_bcma_probe(struct bcma_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	int rc;</div><div class='ctx'> 	struct brcms_info *wl;</div><div class='ctx'> 	struct ieee80211_hw *hw;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "bus %d slot %d func %d irq %d\n",</div><div class='del'>-	       pdev-&gt;bus-&gt;number, PCI_SLOT(pdev-&gt;devfn),</div><div class='del'>-	       PCI_FUNC(pdev-&gt;devfn), pdev-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	if ((pdev-&gt;vendor != PCI_VENDOR_ID_BROADCOM) ||</div><div class='del'>-	    ((pdev-&gt;device != 0x0576) &amp;&amp;</div><div class='del'>-	     ((pdev-&gt;device &amp; 0xff00) != 0x4300) &amp;&amp;</div><div class='del'>-	     ((pdev-&gt;device &amp; 0xff00) != 0x4700) &amp;&amp;</div><div class='del'>-	     ((pdev-&gt;device &lt; 43000) || (pdev-&gt;device &gt; 43999))))</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "mfg %x core %x rev %d class %d irq %d\n",</div><div class='add'>+		 pdev-&gt;id.manuf, pdev-&gt;id.id, pdev-&gt;id.rev, pdev-&gt;id.class,</div><div class='add'>+		 pdev-&gt;bus-&gt;host_pci-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	rc = pci_enable_device(pdev);</div><div class='del'>-	if (rc) {</div><div class='del'>-		pr_err("%s: Cannot enable device %d-%d_%d\n",</div><div class='del'>-		       __func__, pdev-&gt;bus-&gt;number, PCI_SLOT(pdev-&gt;devfn),</div><div class='del'>-		       PCI_FUNC(pdev-&gt;devfn));</div><div class='add'>+	if ((pdev-&gt;id.manuf != BCMA_MANUF_BCM) ||</div><div class='add'>+	    (pdev-&gt;id.id != BCMA_CORE_80211))</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pdev);</div><div class='del'>-</div><div class='del'>-	pci_read_config_dword(pdev, 0x40, &amp;val);</div><div class='del'>-	if ((val &amp; 0x0000ff00) != 0)</div><div class='del'>-		pci_write_config_dword(pdev, 0x40, val &amp; 0xffff00ff);</div><div class='ctx'> </div><div class='ctx'> 	hw = ieee80211_alloc_hw(sizeof(struct brcms_info), &amp;brcms_ops);</div><div class='ctx'> 	if (!hw) {</div><div class='hunk'>@@ -1176,14 +1115,11 @@ brcms_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	SET_IEEE80211_DEV(hw, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	pci_set_drvdata(pdev, hw);</div><div class='add'>+	bcma_set_drvdata(pdev, hw);</div><div class='ctx'> </div><div class='ctx'> 	memset(hw-&gt;priv, 0, sizeof(*wl));</div><div class='ctx'> </div><div class='del'>-	wl = brcms_attach(pdev-&gt;vendor, pdev-&gt;device,</div><div class='del'>-			  pci_resource_start(pdev, 0), pdev,</div><div class='del'>-			  pdev-&gt;irq);</div><div class='del'>-</div><div class='add'>+	wl = brcms_attach(pdev);</div><div class='ctx'> 	if (!wl) {</div><div class='ctx'> 		pr_err("%s: %s: brcms_attach failed!\n", KBUILD_MODNAME,</div><div class='ctx'> 		       __func__);</div><div class='hunk'>@@ -1192,16 +1128,16 @@ brcms_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int brcms_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+static int brcms_suspend(struct bcma_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_info *wl;</div><div class='ctx'> 	struct ieee80211_hw *hw;</div><div class='ctx'> </div><div class='del'>-	hw = pci_get_drvdata(pdev);</div><div class='add'>+	hw = bcma_get_drvdata(pdev);</div><div class='ctx'> 	wl = hw-&gt;priv;</div><div class='ctx'> 	if (!wl) {</div><div class='ctx'> 		wiphy_err(wl-&gt;wiphy,</div><div class='del'>-			  "brcms_suspend: pci_get_drvdata failed\n");</div><div class='add'>+			  "brcms_suspend: bcma_get_drvdata failed\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1210,60 +1146,28 @@ static int brcms_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	wl-&gt;pub-&gt;hw_up = false;</div><div class='ctx'> 	spin_unlock_bh(&amp;wl-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	pci_save_state(pdev);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-	return pci_set_power_state(pdev, PCI_D3hot);</div><div class='add'>+	pr_debug("brcms_suspend ok\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int brcms_resume(struct pci_dev *pdev)</div><div class='add'>+static int brcms_resume(struct bcma_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct brcms_info *wl;</div><div class='del'>-	struct ieee80211_hw *hw;</div><div class='del'>-	int err = 0;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	hw = pci_get_drvdata(pdev);</div><div class='del'>-	wl = hw-&gt;priv;</div><div class='del'>-	if (!wl) {</div><div class='del'>-		wiphy_err(wl-&gt;wiphy,</div><div class='del'>-			  "wl: brcms_resume: pci_get_drvdata failed\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = pci_set_power_state(pdev, PCI_D0);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	pci_restore_state(pdev);</div><div class='del'>-</div><div class='del'>-	err = pci_enable_device(pdev);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	pci_set_master(pdev);</div><div class='del'>-</div><div class='del'>-	pci_read_config_dword(pdev, 0x40, &amp;val);</div><div class='del'>-	if ((val &amp; 0x0000ff00) != 0)</div><div class='del'>-		pci_write_config_dword(pdev, 0x40, val &amp; 0xffff00ff);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	*  done. driver will be put in up state</div><div class='del'>-	*  in brcms_ops_add_interface() call.</div><div class='del'>-	*/</div><div class='del'>-	return err;</div><div class='add'>+	pr_debug("brcms_resume ok\n");</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_driver brcms_pci_driver = {</div><div class='add'>+static struct bcma_driver brcms_bcma_driver = {</div><div class='ctx'> 	.name     = KBUILD_MODNAME,</div><div class='del'>-	.probe    = brcms_pci_probe,</div><div class='add'>+	.probe    = brcms_bcma_probe,</div><div class='ctx'> 	.suspend  = brcms_suspend,</div><div class='ctx'> 	.resume   = brcms_resume,</div><div class='ctx'> 	.remove   = __devexit_p(brcms_remove),</div><div class='del'>-	.id_table = brcms_pci_id_table,</div><div class='add'>+	.id_table = brcms_coreid_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * This is the main entry point for the WL driver.</div><div class='add'>+ * This is the main entry point for the brcmsmac driver.</div><div class='ctx'>  *</div><div class='ctx'>  * This function determines if a device pointed to by pdev is a WL device,</div><div class='ctx'>  * and if so, performs a brcms_attach() on it.</div><div class='hunk'>@@ -1278,26 +1182,24 @@ static int __init brcms_module_init(void)</div><div class='ctx'> 		brcm_msg_level = msglevel;</div><div class='ctx'> #endif				/* BCMDBG */</div><div class='ctx'> </div><div class='del'>-	error = pci_register_driver(&amp;brcms_pci_driver);</div><div class='add'>+	error = bcma_driver_register(&amp;brcms_bcma_driver);</div><div class='add'>+	printk(KERN_ERR "%s: register returned %d\n", __func__, error);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * This function unloads the WL driver from the system.</div><div class='add'>+ * This function unloads the brcmsmac driver from the system.</div><div class='ctx'>  *</div><div class='del'>- * This function unconditionally unloads the WL driver module from the</div><div class='add'>+ * This function unconditionally unloads the brcmsmac driver module from the</div><div class='ctx'>  * system.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> static void __exit brcms_module_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;brcms_pci_driver);</div><div class='del'>-</div><div class='add'>+	bcma_driver_unregister(&amp;brcms_bcma_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(brcms_module_init);</div><div class='hunk'>@@ -1319,8 +1221,7 @@ void brcms_init(struct brcms_info *wl)</div><div class='ctx'> {</div><div class='ctx'> 	BCMMSG(wl-&gt;pub-&gt;ieee_hw-&gt;wiphy, "wl%d\n", wl-&gt;pub-&gt;unit);</div><div class='ctx'> 	brcms_reset(wl);</div><div class='del'>-</div><div class='del'>-	brcms_c_init(wl-&gt;wlc);</div><div class='add'>+	brcms_c_init(wl-&gt;wlc, wl-&gt;mute_tx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1332,11 +1233,19 @@ uint brcms_reset(struct brcms_info *wl)</div><div class='ctx'> 	brcms_c_reset(wl-&gt;wlc);</div><div class='ctx'> </div><div class='ctx'> 	/* dpc will not be rescheduled */</div><div class='del'>-	wl-&gt;resched = 0;</div><div class='add'>+	wl-&gt;resched = false;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void brcms_fatal_error(struct brcms_info *wl)</div><div class='add'>+{</div><div class='add'>+	wiphy_err(wl-&gt;wlc-&gt;wiphy, "wl%d: fatal error, reinitializing\n",</div><div class='add'>+		  wl-&gt;wlc-&gt;pub-&gt;unit);</div><div class='add'>+	brcms_reset(wl);</div><div class='add'>+	ieee80211_restart_hw(wl-&gt;pub-&gt;ieee_hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * These are interrupt on/off entry points. Disable interrupts</div><div class='ctx'>  * during interrupt state transition.</div><div class='hunk'>@@ -1561,11 +1470,10 @@ int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf, u32 idx)</div><div class='ctx'> 			if (le32_to_cpu(hdr-&gt;idx) == idx) {</div><div class='ctx'> 				pdata = wl-&gt;fw.fw_bin[i]-&gt;data +</div><div class='ctx'> 					le32_to_cpu(hdr-&gt;offset);</div><div class='del'>-				*pbuf = kmalloc(len, GFP_ATOMIC);</div><div class='add'>+				*pbuf = kmemdup(pdata, len, GFP_ATOMIC);</div><div class='ctx'> 				if (*pbuf == NULL)</div><div class='ctx'> 					goto fail;</div><div class='ctx'> </div><div class='del'>-				memcpy(*pbuf, pdata, len);</div><div class='ctx'> 				return 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1578,7 +1486,7 @@ fail:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Precondition: Since this function is called in brcms_pci_probe() context,</div><div class='add'>+ * Precondition: Since this function is called in brcms_bcma_probe() context,</div><div class='ctx'>  * no locking is required.</div><div class='ctx'>  */</div><div class='ctx'> int brcms_ucode_init_uint(struct brcms_info *wl, size_t *n_bytes, u32 idx)</div><div class='hunk'>@@ -1618,7 +1526,7 @@ void brcms_ucode_free_buf(void *p)</div><div class='ctx'> /*</div><div class='ctx'>  * checks validity of all firmware images loaded from user space</div><div class='ctx'>  *</div><div class='del'>- * Precondition: Since this function is called in brcms_pci_probe() context,</div><div class='add'>+ * Precondition: Since this function is called in brcms_bcma_probe() context,</div><div class='ctx'>  * no locking is required.</div><div class='ctx'>  */</div><div class='ctx'> int brcms_check_firmwares(struct brcms_info *wl)</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h<br/>index 177f0e44e4b6..8f60419c37bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h</a></div><div class='hunk'>@@ -68,8 +68,6 @@ struct brcms_info {</div><div class='ctx'> 	spinlock_t lock;	/* per-device perimeter lock */</div><div class='ctx'> 	spinlock_t isr_lock;	/* per-device ISR synchronization lock */</div><div class='ctx'> </div><div class='del'>-	/* regsva for unmap in brcms_free() */</div><div class='del'>-	void __iomem *regsva;	/* opaque chip registers virtual address */</div><div class='ctx'> </div><div class='ctx'> 	/* timer related fields */</div><div class='ctx'> 	atomic_t callbacks;	/* # outstanding callback functions */</div><div class='hunk'>@@ -80,6 +78,7 @@ struct brcms_info {</div><div class='ctx'> 	struct brcms_firmware fw;</div><div class='ctx'> 	struct wiphy *wiphy;</div><div class='ctx'> 	struct brcms_ucode ucode;</div><div class='add'>+	bool mute_tx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* misc callbacks */</div><div class='hunk'>@@ -104,5 +103,6 @@ extern bool brcms_del_timer(struct brcms_timer *timer);</div><div class='ctx'> extern void brcms_msleep(struct brcms_info *wl, uint ms);</div><div class='ctx'> extern void brcms_dpc(unsigned long data);</div><div class='ctx'> extern void brcms_timer(struct brcms_timer *t);</div><div class='add'>+extern void brcms_fatal_error(struct brcms_info *wl);</div><div class='ctx'> </div><div class='ctx'> #endif				/* _BRCM_MAC80211_IF_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c<br/>index 510e9bb52287..f7ed34034f88 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/main.c</a></div><div class='hunk'>@@ -30,44 +30,21 @@</div><div class='ctx'> #include "mac80211_if.h"</div><div class='ctx'> #include "ucode_loader.h"</div><div class='ctx'> #include "main.h"</div><div class='add'>+#include "soc.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Indication for txflowcontrol that all priority bits in</div><div class='ctx'>  * TXQ_STOP_FOR_PRIOFC_MASK are to be considered.</div><div class='ctx'>  */</div><div class='del'>-#define ALLPRIO		-1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 32 SSID chars, max of 4 chars for each SSID char "\xFF", plus NULL.</div><div class='del'>- */</div><div class='del'>-#define SSID_FMT_BUF_LEN	((4 * IEEE80211_MAX_SSID_LEN) + 1)</div><div class='add'>+#define ALLPRIO				-1</div><div class='ctx'> </div><div class='ctx'> /* watchdog timer, in unit of ms */</div><div class='del'>-#define	TIMER_INTERVAL_WATCHDOG	1000</div><div class='add'>+#define TIMER_INTERVAL_WATCHDOG		1000</div><div class='ctx'> /* radio monitor timer, in unit of ms */</div><div class='del'>-#define	TIMER_INTERVAL_RADIOCHK	800</div><div class='del'>-</div><div class='del'>-/* Max MPC timeout, in unit of watchdog */</div><div class='del'>-#ifndef BRCMS_MPC_MAX_DELAYCNT</div><div class='del'>-#define	BRCMS_MPC_MAX_DELAYCNT	10</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Min MPC timeout, in unit of watchdog */</div><div class='del'>-#define	BRCMS_MPC_MIN_DELAYCNT	1</div><div class='del'>-#define	BRCMS_MPC_THRESHOLD	3	/* MPC count threshold level */</div><div class='add'>+#define TIMER_INTERVAL_RADIOCHK		800</div><div class='ctx'> </div><div class='ctx'> /* beacon interval, in unit of 1024TU */</div><div class='del'>-#define	BEACON_INTERVAL_DEFAULT	100</div><div class='del'>-/* DTIM interval, in unit of beacon interval */</div><div class='del'>-#define	DTIM_INTERVAL_DEFAULT	3</div><div class='del'>-</div><div class='del'>-/* Scale down delays to accommodate QT slow speed */</div><div class='del'>-/* beacon interval, in unit of 1024TU */</div><div class='del'>-#define	BEACON_INTERVAL_DEF_QT	20</div><div class='del'>-/* DTIM interval, in unit of beacon interval */</div><div class='del'>-#define	DTIM_INTERVAL_DEF_QT	1</div><div class='del'>-</div><div class='del'>-#define	TBTT_ALIGN_LEEWAY_US	100	/* min leeway before first TBTT in us */</div><div class='add'>+#define BEACON_INTERVAL_DEFAULT		100</div><div class='ctx'> </div><div class='ctx'> /* n-mode support capability */</div><div class='ctx'> /* 2x2 includes both 1x1 &amp; 2x2 devices</div><div class='hunk'>@@ -78,113 +55,71 @@</div><div class='ctx'> #define WL_11N_3x3			3</div><div class='ctx'> #define WL_11N_4x4			4</div><div class='ctx'> </div><div class='del'>-/* define 11n feature disable flags */</div><div class='del'>-#define WLFEATURE_DISABLE_11N		0x00000001</div><div class='del'>-#define WLFEATURE_DISABLE_11N_STBC_TX	0x00000002</div><div class='del'>-#define WLFEATURE_DISABLE_11N_STBC_RX	0x00000004</div><div class='del'>-#define WLFEATURE_DISABLE_11N_SGI_TX	0x00000008</div><div class='del'>-#define WLFEATURE_DISABLE_11N_SGI_RX	0x00000010</div><div class='del'>-#define WLFEATURE_DISABLE_11N_AMPDU_TX	0x00000020</div><div class='del'>-#define WLFEATURE_DISABLE_11N_AMPDU_RX	0x00000040</div><div class='del'>-#define WLFEATURE_DISABLE_11N_GF	0x00000080</div><div class='del'>-</div><div class='del'>-#define EDCF_ACI_MASK                0x60</div><div class='del'>-#define EDCF_ACI_SHIFT               5</div><div class='del'>-#define EDCF_ECWMIN_MASK             0x0f</div><div class='del'>-#define EDCF_ECWMAX_SHIFT            4</div><div class='del'>-#define EDCF_AIFSN_MASK              0x0f</div><div class='del'>-#define EDCF_AIFSN_MAX               15</div><div class='del'>-#define EDCF_ECWMAX_MASK             0xf0</div><div class='del'>-</div><div class='del'>-#define EDCF_AC_BE_TXOP_STA          0x0000</div><div class='del'>-#define EDCF_AC_BK_TXOP_STA          0x0000</div><div class='del'>-#define EDCF_AC_VO_ACI_STA           0x62</div><div class='del'>-#define EDCF_AC_VO_ECW_STA           0x32</div><div class='del'>-#define EDCF_AC_VI_ACI_STA           0x42</div><div class='del'>-#define EDCF_AC_VI_ECW_STA           0x43</div><div class='del'>-#define EDCF_AC_BK_ECW_STA           0xA4</div><div class='del'>-#define EDCF_AC_VI_TXOP_STA          0x005e</div><div class='del'>-#define EDCF_AC_VO_TXOP_STA          0x002f</div><div class='del'>-#define EDCF_AC_BE_ACI_STA           0x03</div><div class='del'>-#define EDCF_AC_BE_ECW_STA           0xA4</div><div class='del'>-#define EDCF_AC_BK_ACI_STA           0x27</div><div class='del'>-#define EDCF_AC_VO_TXOP_AP           0x002f</div><div class='del'>-</div><div class='del'>-#define EDCF_TXOP2USEC(txop)         ((txop) &lt;&lt; 5)</div><div class='del'>-#define EDCF_ECW2CW(exp)             ((1 &lt;&lt; (exp)) - 1)</div><div class='del'>-</div><div class='del'>-#define APHY_SYMBOL_TIME	4</div><div class='del'>-#define APHY_PREAMBLE_TIME	16</div><div class='del'>-#define APHY_SIGNAL_TIME	4</div><div class='del'>-#define APHY_SIFS_TIME		16</div><div class='del'>-#define APHY_SERVICE_NBITS	16</div><div class='del'>-#define APHY_TAIL_NBITS		6</div><div class='del'>-#define BPHY_SIFS_TIME		10</div><div class='del'>-#define BPHY_PLCP_SHORT_TIME	96</div><div class='del'>-</div><div class='del'>-#define PREN_PREAMBLE		24</div><div class='del'>-#define PREN_MM_EXT		12</div><div class='del'>-#define PREN_PREAMBLE_EXT	4</div><div class='add'>+#define EDCF_ACI_MASK			0x60</div><div class='add'>+#define EDCF_ACI_SHIFT			5</div><div class='add'>+#define EDCF_ECWMIN_MASK		0x0f</div><div class='add'>+#define EDCF_ECWMAX_SHIFT		4</div><div class='add'>+#define EDCF_AIFSN_MASK			0x0f</div><div class='add'>+#define EDCF_AIFSN_MAX			15</div><div class='add'>+#define EDCF_ECWMAX_MASK		0xf0</div><div class='add'>+</div><div class='add'>+#define EDCF_AC_BE_TXOP_STA		0x0000</div><div class='add'>+#define EDCF_AC_BK_TXOP_STA		0x0000</div><div class='add'>+#define EDCF_AC_VO_ACI_STA		0x62</div><div class='add'>+#define EDCF_AC_VO_ECW_STA		0x32</div><div class='add'>+#define EDCF_AC_VI_ACI_STA		0x42</div><div class='add'>+#define EDCF_AC_VI_ECW_STA		0x43</div><div class='add'>+#define EDCF_AC_BK_ECW_STA		0xA4</div><div class='add'>+#define EDCF_AC_VI_TXOP_STA		0x005e</div><div class='add'>+#define EDCF_AC_VO_TXOP_STA		0x002f</div><div class='add'>+#define EDCF_AC_BE_ACI_STA		0x03</div><div class='add'>+#define EDCF_AC_BE_ECW_STA		0xA4</div><div class='add'>+#define EDCF_AC_BK_ACI_STA		0x27</div><div class='add'>+#define EDCF_AC_VO_TXOP_AP		0x002f</div><div class='add'>+</div><div class='add'>+#define EDCF_TXOP2USEC(txop)		((txop) &lt;&lt; 5)</div><div class='add'>+#define EDCF_ECW2CW(exp)		((1 &lt;&lt; (exp)) - 1)</div><div class='add'>+</div><div class='add'>+#define APHY_SYMBOL_TIME		4</div><div class='add'>+#define APHY_PREAMBLE_TIME		16</div><div class='add'>+#define APHY_SIGNAL_TIME		4</div><div class='add'>+#define APHY_SIFS_TIME			16</div><div class='add'>+#define APHY_SERVICE_NBITS		16</div><div class='add'>+#define APHY_TAIL_NBITS			6</div><div class='add'>+#define BPHY_SIFS_TIME			10</div><div class='add'>+#define BPHY_PLCP_SHORT_TIME		96</div><div class='add'>+</div><div class='add'>+#define PREN_PREAMBLE			24</div><div class='add'>+#define PREN_MM_EXT			12</div><div class='add'>+#define PREN_PREAMBLE_EXT		4</div><div class='ctx'> </div><div class='ctx'> #define DOT11_MAC_HDR_LEN		24</div><div class='del'>-#define	DOT11_ACK_LEN		10</div><div class='del'>-#define DOT11_BA_LEN		4</div><div class='add'>+#define DOT11_ACK_LEN			10</div><div class='add'>+#define DOT11_BA_LEN			4</div><div class='ctx'> #define DOT11_OFDM_SIGNAL_EXTENSION	6</div><div class='ctx'> #define DOT11_MIN_FRAG_LEN		256</div><div class='del'>-#define	DOT11_RTS_LEN		16</div><div class='del'>-#define	DOT11_CTS_LEN		10</div><div class='add'>+#define DOT11_RTS_LEN			16</div><div class='add'>+#define DOT11_CTS_LEN			10</div><div class='ctx'> #define DOT11_BA_BITMAP_LEN		128</div><div class='ctx'> #define DOT11_MIN_BEACON_PERIOD		1</div><div class='ctx'> #define DOT11_MAX_BEACON_PERIOD		0xFFFF</div><div class='del'>-#define	DOT11_MAXNUMFRAGS	16</div><div class='add'>+#define DOT11_MAXNUMFRAGS		16</div><div class='ctx'> #define DOT11_MAX_FRAG_LEN		2346</div><div class='ctx'> </div><div class='del'>-#define BPHY_PLCP_TIME		192</div><div class='del'>-#define RIFS_11N_TIME		2</div><div class='del'>-</div><div class='del'>-#define WME_VER			1</div><div class='del'>-#define WME_SUBTYPE_PARAM_IE	1</div><div class='del'>-#define WME_TYPE		2</div><div class='del'>-#define WME_OUI			"\x00\x50\xf2"</div><div class='add'>+#define BPHY_PLCP_TIME			192</div><div class='add'>+#define RIFS_11N_TIME			2</div><div class='ctx'> </div><div class='del'>-#define AC_BE			0</div><div class='del'>-#define AC_BK			1</div><div class='del'>-#define AC_VI			2</div><div class='del'>-#define AC_VO			3</div><div class='del'>-</div><div class='del'>-#define	BCN_TMPL_LEN		512	/* length of the BCN template area */</div><div class='add'>+/* length of the BCN template area */</div><div class='add'>+#define BCN_TMPL_LEN			512</div><div class='ctx'> </div><div class='ctx'> /* brcms_bss_info flag bit values */</div><div class='del'>-#define BRCMS_BSS_HT		0x0020	/* BSS is HT (MIMO) capable */</div><div class='del'>-</div><div class='del'>-/* Flags used in brcms_c_txq_info.stopped */</div><div class='del'>-/* per prio flow control bits */</div><div class='del'>-#define TXQ_STOP_FOR_PRIOFC_MASK	0x000000FF</div><div class='del'>-/* stop txq enqueue for packet drain */</div><div class='del'>-#define TXQ_STOP_FOR_PKT_DRAIN		0x00000100</div><div class='del'>-/* stop txq enqueue for ampdu flow control */</div><div class='del'>-#define TXQ_STOP_FOR_AMPDU_FLOW_CNTRL	0x00000200</div><div class='del'>-</div><div class='del'>-#define	BRCMS_HWRXOFF		38	/* chip rx buffer offset */</div><div class='add'>+#define BRCMS_BSS_HT			0x0020	/* BSS is HT (MIMO) capable */</div><div class='ctx'> </div><div class='del'>-/* Find basic rate for a given rate */</div><div class='del'>-static u8 brcms_basic_rate(struct brcms_c_info *wlc, u32 rspec)</div><div class='del'>-{</div><div class='del'>-	if (is_mcs_rate(rspec))</div><div class='del'>-		return wlc-&gt;band-&gt;basic_rate[mcs_table[rspec &amp; RSPEC_RATE_MASK]</div><div class='del'>-		       .leg_ofdm];</div><div class='del'>-	return wlc-&gt;band-&gt;basic_rate[rspec &amp; RSPEC_RATE_MASK];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u16 frametype(u32 rspec, u8 mimoframe)</div><div class='del'>-{</div><div class='del'>-	if (is_mcs_rate(rspec))</div><div class='del'>-		return mimoframe;</div><div class='del'>-	return is_cck_rate(rspec) ? FT_CCK : FT_OFDM;</div><div class='del'>-}</div><div class='add'>+/* chip rx buffer offset */</div><div class='add'>+#define BRCMS_HWRXOFF			38</div><div class='ctx'> </div><div class='ctx'> /* rfdisable delay timer 500 ms, runs of ALP clock */</div><div class='del'>-#define RFDISABLE_DEFAULT	10000000</div><div class='add'>+#define RFDISABLE_DEFAULT		10000000</div><div class='ctx'> </div><div class='ctx'> #define BRCMS_TEMPSENSE_PERIOD		10	/* 10 second timeout */</div><div class='ctx'> </div><div class='hunk'>@@ -194,87 +129,83 @@ static u16 frametype(u32 rspec, u8 mimoframe)</div><div class='ctx'>  * These constants are used ONLY by wlc_prio2prec_map.  Do not use them</div><div class='ctx'>  * elsewhere.</div><div class='ctx'>  */</div><div class='del'>-#define	_BRCMS_PREC_NONE		0	/* None = - */</div><div class='del'>-#define	_BRCMS_PREC_BK		2	/* BK - Background */</div><div class='del'>-#define	_BRCMS_PREC_BE		4	/* BE - Best-effort */</div><div class='del'>-#define	_BRCMS_PREC_EE		6	/* EE - Excellent-effort */</div><div class='del'>-#define	_BRCMS_PREC_CL		8	/* CL - Controlled Load */</div><div class='del'>-#define	_BRCMS_PREC_VI		10	/* Vi - Video */</div><div class='del'>-#define	_BRCMS_PREC_VO		12	/* Vo - Voice */</div><div class='del'>-#define	_BRCMS_PREC_NC		14	/* NC - Network Control */</div><div class='del'>-</div><div class='del'>-/* The BSS is generating beacons in HW */</div><div class='del'>-#define BRCMS_BSSCFG_HW_BCN	0x20</div><div class='del'>-</div><div class='del'>-#define	SYNTHPU_DLY_APHY_US	3700	/* a phy synthpu_dly time in us */</div><div class='del'>-#define	SYNTHPU_DLY_BPHY_US	1050	/* b/g phy synthpu_dly time in us */</div><div class='del'>-#define	SYNTHPU_DLY_NPHY_US	2048	/* n phy REV3 synthpu_dly time in us */</div><div class='del'>-#define	SYNTHPU_DLY_LPPHY_US	300	/* lpphy synthpu_dly time in us */</div><div class='del'>-</div><div class='del'>-#define	SYNTHPU_DLY_PHY_US_QT	100	/* QT synthpu_dly time in us */</div><div class='del'>-</div><div class='del'>-#define	ANTCNT			10	/* vanilla M_MAX_ANTCNT value */</div><div class='add'>+#define _BRCMS_PREC_NONE		0	/* None = - */</div><div class='add'>+#define _BRCMS_PREC_BK			2	/* BK - Background */</div><div class='add'>+#define _BRCMS_PREC_BE			4	/* BE - Best-effort */</div><div class='add'>+#define _BRCMS_PREC_EE			6	/* EE - Excellent-effort */</div><div class='add'>+#define _BRCMS_PREC_CL			8	/* CL - Controlled Load */</div><div class='add'>+#define _BRCMS_PREC_VI			10	/* Vi - Video */</div><div class='add'>+#define _BRCMS_PREC_VO			12	/* Vo - Voice */</div><div class='add'>+#define _BRCMS_PREC_NC			14	/* NC - Network Control */</div><div class='add'>+</div><div class='add'>+/* synthpu_dly times in us */</div><div class='add'>+#define SYNTHPU_DLY_APHY_US		3700</div><div class='add'>+#define SYNTHPU_DLY_BPHY_US		1050</div><div class='add'>+#define SYNTHPU_DLY_NPHY_US		2048</div><div class='add'>+#define SYNTHPU_DLY_LPPHY_US		300</div><div class='add'>+</div><div class='add'>+#define ANTCNT				10	/* vanilla M_MAX_ANTCNT val */</div><div class='ctx'> </div><div class='ctx'> /* Per-AC retry limit register definitions; uses defs.h bitfield macros */</div><div class='del'>-#define EDCF_SHORT_S            0</div><div class='del'>-#define EDCF_SFB_S              4</div><div class='del'>-#define EDCF_LONG_S             8</div><div class='del'>-#define EDCF_LFB_S              12</div><div class='del'>-#define EDCF_SHORT_M            BITFIELD_MASK(4)</div><div class='del'>-#define EDCF_SFB_M              BITFIELD_MASK(4)</div><div class='del'>-#define EDCF_LONG_M             BITFIELD_MASK(4)</div><div class='del'>-#define EDCF_LFB_M              BITFIELD_MASK(4)</div><div class='add'>+#define EDCF_SHORT_S			0</div><div class='add'>+#define EDCF_SFB_S			4</div><div class='add'>+#define EDCF_LONG_S			8</div><div class='add'>+#define EDCF_LFB_S			12</div><div class='add'>+#define EDCF_SHORT_M			BITFIELD_MASK(4)</div><div class='add'>+#define EDCF_SFB_M			BITFIELD_MASK(4)</div><div class='add'>+#define EDCF_LONG_M			BITFIELD_MASK(4)</div><div class='add'>+#define EDCF_LFB_M			BITFIELD_MASK(4)</div><div class='ctx'> </div><div class='del'>-#define	RETRY_SHORT_DEF			7	/* Default Short retry Limit */</div><div class='del'>-#define	RETRY_SHORT_MAX			255	/* Maximum Short retry Limit */</div><div class='del'>-#define	RETRY_LONG_DEF			4	/* Default Long retry count */</div><div class='del'>-#define	RETRY_SHORT_FB			3 /* Short count for fallback rate */</div><div class='del'>-#define	RETRY_LONG_FB			2 /* Long count for fallback rate */</div><div class='add'>+#define RETRY_SHORT_DEF			7	/* Default Short retry Limit */</div><div class='add'>+#define RETRY_SHORT_MAX			255	/* Maximum Short retry Limit */</div><div class='add'>+#define RETRY_LONG_DEF			4	/* Default Long retry count */</div><div class='add'>+#define RETRY_SHORT_FB			3	/* Short count for fb rate */</div><div class='add'>+#define RETRY_LONG_FB			2	/* Long count for fb rate */</div><div class='ctx'> </div><div class='del'>-#define	APHY_CWMIN		15</div><div class='del'>-#define PHY_CWMAX		1023</div><div class='add'>+#define APHY_CWMIN			15</div><div class='add'>+#define PHY_CWMAX			1023</div><div class='ctx'> </div><div class='del'>-#define EDCF_AIFSN_MIN               1</div><div class='add'>+#define EDCF_AIFSN_MIN			1</div><div class='ctx'> </div><div class='del'>-#define FRAGNUM_MASK		0xF</div><div class='add'>+#define FRAGNUM_MASK			0xF</div><div class='ctx'> </div><div class='del'>-#define APHY_SLOT_TIME		9</div><div class='del'>-#define BPHY_SLOT_TIME		20</div><div class='add'>+#define APHY_SLOT_TIME			9</div><div class='add'>+#define BPHY_SLOT_TIME			20</div><div class='ctx'> </div><div class='del'>-#define	WL_SPURAVOID_OFF	0</div><div class='del'>-#define	WL_SPURAVOID_ON1	1</div><div class='del'>-#define	WL_SPURAVOID_ON2	2</div><div class='add'>+#define WL_SPURAVOID_OFF		0</div><div class='add'>+#define WL_SPURAVOID_ON1		1</div><div class='add'>+#define WL_SPURAVOID_ON2		2</div><div class='ctx'> </div><div class='ctx'> /* invalid core flags, use the saved coreflags */</div><div class='del'>-#define BRCMS_USE_COREFLAGS	0xffffffff</div><div class='add'>+#define BRCMS_USE_COREFLAGS		0xffffffff</div><div class='ctx'> </div><div class='ctx'> /* values for PLCPHdr_override */</div><div class='del'>-#define BRCMS_PLCP_AUTO	-1</div><div class='del'>-#define BRCMS_PLCP_SHORT	0</div><div class='del'>-#define BRCMS_PLCP_LONG	1</div><div class='add'>+#define BRCMS_PLCP_AUTO			-1</div><div class='add'>+#define BRCMS_PLCP_SHORT		0</div><div class='add'>+#define BRCMS_PLCP_LONG			1</div><div class='ctx'> </div><div class='ctx'> /* values for g_protection_override and n_protection_override */</div><div class='ctx'> #define BRCMS_PROTECTION_AUTO		-1</div><div class='ctx'> #define BRCMS_PROTECTION_OFF		0</div><div class='ctx'> #define BRCMS_PROTECTION_ON		1</div><div class='ctx'> #define BRCMS_PROTECTION_MMHDR_ONLY	2</div><div class='del'>-#define BRCMS_PROTECTION_CTS_ONLY		3</div><div class='add'>+#define BRCMS_PROTECTION_CTS_ONLY	3</div><div class='ctx'> </div><div class='ctx'> /* values for g_protection_control and n_protection_control */</div><div class='del'>-#define BRCMS_PROTECTION_CTL_OFF		0</div><div class='add'>+#define BRCMS_PROTECTION_CTL_OFF	0</div><div class='ctx'> #define BRCMS_PROTECTION_CTL_LOCAL	1</div><div class='ctx'> #define BRCMS_PROTECTION_CTL_OVERLAP	2</div><div class='ctx'> </div><div class='ctx'> /* values for n_protection */</div><div class='ctx'> #define BRCMS_N_PROTECTION_OFF		0</div><div class='ctx'> #define BRCMS_N_PROTECTION_OPTIONAL	1</div><div class='del'>-#define BRCMS_N_PROTECTION_20IN40		2</div><div class='add'>+#define BRCMS_N_PROTECTION_20IN40	2</div><div class='ctx'> #define BRCMS_N_PROTECTION_MIXEDMODE	3</div><div class='ctx'> </div><div class='ctx'> /* values for band specific 40MHz capabilities */</div><div class='del'>-#define BRCMS_N_BW_20ALL			0</div><div class='del'>-#define BRCMS_N_BW_40ALL			1</div><div class='del'>-#define BRCMS_N_BW_20IN2G_40IN5G		2</div><div class='add'>+#define BRCMS_N_BW_20ALL		0</div><div class='add'>+#define BRCMS_N_BW_40ALL		1</div><div class='add'>+#define BRCMS_N_BW_20IN2G_40IN5G	2</div><div class='ctx'> </div><div class='ctx'> /* bitflags for SGI support (sgi_rx iovar) */</div><div class='ctx'> #define BRCMS_N_SGI_20			0x01</div><div class='hunk'>@@ -282,48 +213,42 @@ static u16 frametype(u32 rspec, u8 mimoframe)</div><div class='ctx'> </div><div class='ctx'> /* defines used by the nrate iovar */</div><div class='ctx'> /* MSC in use,indicates b0-6 holds an mcs */</div><div class='del'>-#define NRATE_MCS_INUSE	0x00000080</div><div class='add'>+#define NRATE_MCS_INUSE			0x00000080</div><div class='ctx'> /* rate/mcs value */</div><div class='del'>-#define NRATE_RATE_MASK 0x0000007f</div><div class='add'>+#define NRATE_RATE_MASK			0x0000007f</div><div class='ctx'> /* stf mode mask: siso, cdd, stbc, sdm */</div><div class='del'>-#define NRATE_STF_MASK	0x0000ff00</div><div class='add'>+#define NRATE_STF_MASK			0x0000ff00</div><div class='ctx'> /* stf mode shift */</div><div class='del'>-#define NRATE_STF_SHIFT	8</div><div class='del'>-/* bit indicates override both rate &amp; mode */</div><div class='del'>-#define NRATE_OVERRIDE	0x80000000</div><div class='add'>+#define NRATE_STF_SHIFT			8</div><div class='ctx'> /* bit indicate to override mcs only */</div><div class='del'>-#define NRATE_OVERRIDE_MCS_ONLY 0x40000000</div><div class='del'>-#define NRATE_SGI_MASK  0x00800000	/* sgi mode */</div><div class='del'>-#define NRATE_SGI_SHIFT 23	/* sgi mode */</div><div class='del'>-#define NRATE_LDPC_CODING 0x00400000	/* bit indicates adv coding in use */</div><div class='del'>-#define NRATE_LDPC_SHIFT 22	/* ldpc shift */</div><div class='add'>+#define NRATE_OVERRIDE_MCS_ONLY		0x40000000</div><div class='add'>+#define NRATE_SGI_MASK			0x00800000	/* sgi mode */</div><div class='add'>+#define NRATE_SGI_SHIFT			23		/* sgi mode */</div><div class='add'>+#define NRATE_LDPC_CODING		0x00400000	/* adv coding in use */</div><div class='add'>+#define NRATE_LDPC_SHIFT		22		/* ldpc shift */</div><div class='ctx'> </div><div class='del'>-#define NRATE_STF_SISO	0	/* stf mode SISO */</div><div class='del'>-#define NRATE_STF_CDD	1	/* stf mode CDD */</div><div class='del'>-#define NRATE_STF_STBC	2	/* stf mode STBC */</div><div class='del'>-#define NRATE_STF_SDM	3	/* stf mode SDM */</div><div class='add'>+#define NRATE_STF_SISO			0		/* stf mode SISO */</div><div class='add'>+#define NRATE_STF_CDD			1		/* stf mode CDD */</div><div class='add'>+#define NRATE_STF_STBC			2		/* stf mode STBC */</div><div class='add'>+#define NRATE_STF_SDM			3		/* stf mode SDM */</div><div class='ctx'> </div><div class='del'>-#define MAX_DMA_SEGS 4</div><div class='add'>+#define MAX_DMA_SEGS			4</div><div class='ctx'> </div><div class='ctx'> /* Max # of entries in Tx FIFO based on 4kb page size */</div><div class='del'>-#define NTXD		256</div><div class='add'>+#define NTXD				256</div><div class='ctx'> /* Max # of entries in Rx FIFO based on 4kb page size */</div><div class='del'>-#define NRXD		256</div><div class='add'>+#define NRXD				256</div><div class='ctx'> </div><div class='ctx'> /* try to keep this # rbufs posted to the chip */</div><div class='del'>-#define	NRXBUFPOST	32</div><div class='add'>+#define NRXBUFPOST			32</div><div class='ctx'> </div><div class='ctx'> /* data msg txq hiwat mark */</div><div class='del'>-#define BRCMS_DATAHIWAT		50</div><div class='add'>+#define BRCMS_DATAHIWAT			50</div><div class='ctx'> </div><div class='del'>-/* bounded rx loops */</div><div class='del'>-#define RXBND		8 /* max # frames to process in brcms_c_recv() */</div><div class='del'>-#define TXSBND		8 /* max # tx status to process in wlc_txstatus() */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 32 SSID chars, max of 4 chars for each SSID char "\xFF", plus NULL.</div><div class='del'>- */</div><div class='del'>-#define SSID_FMT_BUF_LEN	((4 * IEEE80211_MAX_SSID_LEN) + 1)</div><div class='add'>+/* max # frames to process in brcms_c_recv() */</div><div class='add'>+#define RXBND				8</div><div class='add'>+/* max # tx status to process in wlc_txstatus() */</div><div class='add'>+#define TXSBND				8</div><div class='ctx'> </div><div class='ctx'> /* brcmu_format_flags() bit description structure */</div><div class='ctx'> struct brcms_c_bit_desc {</div><div class='hunk'>@@ -375,10 +300,22 @@ uint brcm_msg_level =</div><div class='ctx'> #endif				/* BCMDBG */</div><div class='ctx'> </div><div class='ctx'> /* TX FIFO number to WME/802.1E Access Category */</div><div class='del'>-static const u8 wme_fifo2ac[] = { AC_BK, AC_BE, AC_VI, AC_VO, AC_BE, AC_BE };</div><div class='add'>+static const u8 wme_fifo2ac[] = {</div><div class='add'>+	IEEE80211_AC_BK,</div><div class='add'>+	IEEE80211_AC_BE,</div><div class='add'>+	IEEE80211_AC_VI,</div><div class='add'>+	IEEE80211_AC_VO,</div><div class='add'>+	IEEE80211_AC_BE,</div><div class='add'>+	IEEE80211_AC_BE</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-/* WME/802.1E Access Category to TX FIFO number */</div><div class='del'>-static const u8 wme_ac2fifo[] = { 1, 0, 2, 3 };</div><div class='add'>+/* ieee80211 Access Category to TX FIFO number */</div><div class='add'>+static const u8 wme_ac2fifo[] = {</div><div class='add'>+	TX_AC_VO_FIFO,</div><div class='add'>+	TX_AC_VI_FIFO,</div><div class='add'>+	TX_AC_BE_FIFO,</div><div class='add'>+	TX_AC_BK_FIFO</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* 802.1D Priority to precedence queue mapping */</div><div class='ctx'> const u8 wlc_prio2prec_map[] = {</div><div class='hunk'>@@ -405,13 +342,6 @@ static const u16 xmtfifo_sz[][NFIFO] = {</div><div class='ctx'> 	{9, 58, 22, 14, 14, 5},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u8 acbitmap2maxprio[] = {</div><div class='del'>-	PRIO_8021D_BE, PRIO_8021D_BE, PRIO_8021D_BK, PRIO_8021D_BK,</div><div class='del'>-	PRIO_8021D_VI, PRIO_8021D_VI, PRIO_8021D_VI, PRIO_8021D_VI,</div><div class='del'>-	PRIO_8021D_VO, PRIO_8021D_VO, PRIO_8021D_VO, PRIO_8021D_VO,</div><div class='del'>-	PRIO_8021D_VO, PRIO_8021D_VO, PRIO_8021D_VO, PRIO_8021D_VO</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #ifdef BCMDBG</div><div class='ctx'> static const char * const fifo_names[] = {</div><div class='ctx'> 	"AC_BK", "AC_BE", "AC_VI", "AC_VO", "BCMC", "ATIM" };</div><div class='hunk'>@@ -424,6 +354,22 @@ static const char fifo_names[6][0];</div><div class='ctx'> static struct brcms_c_info *wlc_info_dbg = (struct brcms_c_info *) (NULL);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Find basic rate for a given rate */</div><div class='add'>+static u8 brcms_basic_rate(struct brcms_c_info *wlc, u32 rspec)</div><div class='add'>+{</div><div class='add'>+	if (is_mcs_rate(rspec))</div><div class='add'>+		return wlc-&gt;band-&gt;basic_rate[mcs_table[rspec &amp; RSPEC_RATE_MASK]</div><div class='add'>+		       .leg_ofdm];</div><div class='add'>+	return wlc-&gt;band-&gt;basic_rate[rspec &amp; RSPEC_RATE_MASK];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 frametype(u32 rspec, u8 mimoframe)</div><div class='add'>+{</div><div class='add'>+	if (is_mcs_rate(rspec))</div><div class='add'>+		return mimoframe;</div><div class='add'>+	return is_cck_rate(rspec) ? FT_CCK : FT_OFDM;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* currently the best mechanism for determining SIFS is the band in use */</div><div class='ctx'> static u16 get_sifs(struct brcms_band *band)</div><div class='ctx'> {</div><div class='hunk'>@@ -442,10 +388,13 @@ static u16 get_sifs(struct brcms_band *band)</div><div class='ctx'>  */</div><div class='ctx'> static bool brcms_deviceremoved(struct brcms_c_info *wlc)</div><div class='ctx'> {</div><div class='add'>+	u32 macctrl;</div><div class='add'>+</div><div class='ctx'> 	if (!wlc-&gt;hw-&gt;clk)</div><div class='ctx'> 		return ai_deviceremoved(wlc-&gt;hw-&gt;sih);</div><div class='del'>-	return (R_REG(&amp;wlc-&gt;hw-&gt;regs-&gt;maccontrol) &amp;</div><div class='del'>-		(MCTL_PSM_JMP_0 | MCTL_IHR_EN)) != MCTL_IHR_EN;</div><div class='add'>+	macctrl = bcma_read32(wlc-&gt;hw-&gt;d11core,</div><div class='add'>+			      D11REGOFFS(maccontrol));</div><div class='add'>+	return (macctrl &amp; (MCTL_PSM_JMP_0 | MCTL_IHR_EN)) != MCTL_IHR_EN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* sum the individual fifo tx pending packet counts */</div><div class='hunk'>@@ -470,20 +419,6 @@ static int brcms_chspec_bw(u16 chanspec)</div><div class='ctx'> 	return BRCMS_10_MHZ;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * return true if Minimum Power Consumption should</div><div class='del'>- * be entered, false otherwise</div><div class='del'>- */</div><div class='del'>-static bool brcms_c_is_non_delay_mpc(struct brcms_c_info *wlc)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool brcms_c_ismpc(struct brcms_c_info *wlc)</div><div class='del'>-{</div><div class='del'>-	return (wlc-&gt;mpc_delay_off == 0) &amp;&amp; (brcms_c_is_non_delay_mpc(wlc));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void brcms_c_bsscfg_mfree(struct brcms_bss_cfg *cfg)</div><div class='ctx'> {</div><div class='ctx'> 	if (cfg == NULL)</div><div class='hunk'>@@ -650,17 +585,15 @@ brcms_c_attach_malloc(uint unit, uint *err, uint devid)</div><div class='ctx'> static void brcms_b_update_slot_timing(struct brcms_hardware *wlc_hw,</div><div class='ctx'> 					bool shortslot)</div><div class='ctx'> {</div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='del'>-</div><div class='del'>-	regs = wlc_hw-&gt;regs;</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='ctx'> </div><div class='ctx'> 	if (shortslot) {</div><div class='ctx'> 		/* 11g short slot: 11a timing */</div><div class='del'>-		W_REG(&amp;regs-&gt;ifs_slot, 0x0207);	/* APHY_SLOT_TIME */</div><div class='add'>+		bcma_write16(core, D11REGOFFS(ifs_slot), 0x0207);</div><div class='ctx'> 		brcms_b_write_shm(wlc_hw, M_DOT11_SLOT, APHY_SLOT_TIME);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* 11g long slot: 11b timing */</div><div class='del'>-		W_REG(&amp;regs-&gt;ifs_slot, 0x0212);	/* BPHY_SLOT_TIME */</div><div class='add'>+		bcma_write16(core, D11REGOFFS(ifs_slot), 0x0212);</div><div class='ctx'> 		brcms_b_write_shm(wlc_hw, M_DOT11_SLOT, BPHY_SLOT_TIME);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -669,9 +602,8 @@ static void brcms_b_update_slot_timing(struct brcms_hardware *wlc_hw,</div><div class='ctx'>  * calculate frame duration of a given rate and length, return</div><div class='ctx'>  * time in usec unit</div><div class='ctx'>  */</div><div class='del'>-uint</div><div class='del'>-brcms_c_calc_frame_time(struct brcms_c_info *wlc, u32 ratespec,</div><div class='del'>-			u8 preamble_type, uint mac_len)</div><div class='add'>+static uint brcms_c_calc_frame_time(struct brcms_c_info *wlc, u32 ratespec,</div><div class='add'>+				    u8 preamble_type, uint mac_len)</div><div class='ctx'> {</div><div class='ctx'> 	uint nsyms, dur = 0, Ndps, kNdps;</div><div class='ctx'> 	uint rate = rspec2rate(ratespec);</div><div class='hunk'>@@ -741,24 +673,22 @@ brcms_c_calc_frame_time(struct brcms_c_info *wlc, u32 ratespec,</div><div class='ctx'> static void brcms_c_write_inits(struct brcms_hardware *wlc_hw,</div><div class='ctx'> 				const struct d11init *inits)</div><div class='ctx'> {</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='ctx'> 	int i;</div><div class='del'>-	u8 __iomem *base;</div><div class='del'>-	u8 __iomem *addr;</div><div class='add'>+	uint offset;</div><div class='ctx'> 	u16 size;</div><div class='ctx'> 	u32 value;</div><div class='ctx'> </div><div class='ctx'> 	BCMMSG(wlc_hw-&gt;wlc-&gt;wiphy, "wl%d\n", wlc_hw-&gt;unit);</div><div class='ctx'> </div><div class='del'>-	base = (u8 __iomem *)wlc_hw-&gt;regs;</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; inits[i].addr != cpu_to_le16(0xffff); i++) {</div><div class='ctx'> 		size = le16_to_cpu(inits[i].size);</div><div class='del'>-		addr = base + le16_to_cpu(inits[i].addr);</div><div class='add'>+		offset = le16_to_cpu(inits[i].addr);</div><div class='ctx'> 		value = le32_to_cpu(inits[i].value);</div><div class='ctx'> 		if (size == 2)</div><div class='del'>-			W_REG((u16 __iomem *)addr, value);</div><div class='add'>+			bcma_write16(core, offset, value);</div><div class='ctx'> 		else if (size == 4)</div><div class='del'>-			W_REG((u32 __iomem *)addr, value);</div><div class='add'>+			bcma_write32(core, offset, value);</div><div class='ctx'> 		else</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -808,6 +738,14 @@ static void brcms_c_ucode_bsinit(struct brcms_hardware *wlc_hw)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void brcms_b_core_ioctl(struct brcms_hardware *wlc_hw, u32 m, u32 v)</div><div class='add'>+{</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='add'>+	u32 ioctl = bcma_aread32(core, BCMA_IOCTL) &amp; ~m;</div><div class='add'>+</div><div class='add'>+	bcma_awrite32(core, BCMA_IOCTL, ioctl | v);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void brcms_b_core_phy_clk(struct brcms_hardware *wlc_hw, bool clk)</div><div class='ctx'> {</div><div class='ctx'> 	BCMMSG(wlc_hw-&gt;wlc-&gt;wiphy, "wl%d: clk %d\n", wlc_hw-&gt;unit, clk);</div><div class='hunk'>@@ -816,17 +754,17 @@ static void brcms_b_core_phy_clk(struct brcms_hardware *wlc_hw, bool clk)</div><div class='ctx'> </div><div class='ctx'> 	if (OFF == clk) {	/* clear gmode bit, put phy into reset */</div><div class='ctx'> </div><div class='del'>-		ai_core_cflags(wlc_hw-&gt;sih, (SICF_PRST | SICF_FGC | SICF_GMODE),</div><div class='del'>-			       (SICF_PRST | SICF_FGC));</div><div class='add'>+		brcms_b_core_ioctl(wlc_hw, (SICF_PRST | SICF_FGC | SICF_GMODE),</div><div class='add'>+				   (SICF_PRST | SICF_FGC));</div><div class='ctx'> 		udelay(1);</div><div class='del'>-		ai_core_cflags(wlc_hw-&gt;sih, (SICF_PRST | SICF_FGC), SICF_PRST);</div><div class='add'>+		brcms_b_core_ioctl(wlc_hw, (SICF_PRST | SICF_FGC), SICF_PRST);</div><div class='ctx'> 		udelay(1);</div><div class='ctx'> </div><div class='ctx'> 	} else {		/* take phy out of reset */</div><div class='ctx'> </div><div class='del'>-		ai_core_cflags(wlc_hw-&gt;sih, (SICF_PRST | SICF_FGC), SICF_FGC);</div><div class='add'>+		brcms_b_core_ioctl(wlc_hw, (SICF_PRST | SICF_FGC), SICF_FGC);</div><div class='ctx'> 		udelay(1);</div><div class='del'>-		ai_core_cflags(wlc_hw-&gt;sih, (SICF_FGC), 0);</div><div class='add'>+		brcms_b_core_ioctl(wlc_hw, SICF_FGC, 0);</div><div class='ctx'> 		udelay(1);</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='hunk'>@@ -847,9 +785,14 @@ static void brcms_c_setxband(struct brcms_hardware *wlc_hw, uint bandunit)</div><div class='ctx'> 	wlc_hw-&gt;wlc-&gt;band = wlc_hw-&gt;wlc-&gt;bandstate[bandunit];</div><div class='ctx'> </div><div class='ctx'> 	/* set gmode core flag */</div><div class='del'>-	if (wlc_hw-&gt;sbclk &amp;&amp; !wlc_hw-&gt;noreset)</div><div class='del'>-		ai_core_cflags(wlc_hw-&gt;sih, SICF_GMODE,</div><div class='del'>-			       ((bandunit == 0) ? SICF_GMODE : 0));</div><div class='add'>+	if (wlc_hw-&gt;sbclk &amp;&amp; !wlc_hw-&gt;noreset) {</div><div class='add'>+		u32 gmode = 0;</div><div class='add'>+</div><div class='add'>+		if (bandunit == 0)</div><div class='add'>+			gmode = SICF_GMODE;</div><div class='add'>+</div><div class='add'>+		brcms_b_core_ioctl(wlc_hw, SICF_GMODE, gmode);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* switch to new band but leave it inactive */</div><div class='hunk'>@@ -857,10 +800,12 @@ static u32 brcms_c_setband_inact(struct brcms_c_info *wlc, uint bandunit)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_hardware *wlc_hw = wlc-&gt;hw;</div><div class='ctx'> 	u32 macintmask;</div><div class='add'>+	u32 macctrl;</div><div class='ctx'> </div><div class='ctx'> 	BCMMSG(wlc-&gt;wiphy, "wl%d\n", wlc_hw-&gt;unit);</div><div class='del'>-</div><div class='del'>-	WARN_ON((R_REG(&amp;wlc_hw-&gt;regs-&gt;maccontrol) &amp; MCTL_EN_MAC) != 0);</div><div class='add'>+	macctrl = bcma_read32(wlc_hw-&gt;d11core,</div><div class='add'>+			      D11REGOFFS(maccontrol));</div><div class='add'>+	WARN_ON((macctrl &amp; MCTL_EN_MAC) != 0);</div><div class='ctx'> </div><div class='ctx'> 	/* disable interrupts */</div><div class='ctx'> 	macintmask = brcms_intrsoff(wlc-&gt;wl);</div><div class='hunk'>@@ -969,7 +914,7 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs)</div><div class='ctx'> 		    lfbl,	/* Long Frame Rate Fallback Limit */</div><div class='ctx'> 		    fbl;</div><div class='ctx'> </div><div class='del'>-		if (queue &lt; AC_COUNT) {</div><div class='add'>+		if (queue &lt; IEEE80211_NUM_ACS) {</div><div class='ctx'> 			sfbl = GFIELD(wlc-&gt;wme_retries[wme_fifo2ac[queue]],</div><div class='ctx'> 				      EDCF_SFB);</div><div class='ctx'> 			lfbl = GFIELD(wlc-&gt;wme_retries[wme_fifo2ac[queue]],</div><div class='hunk'>@@ -1018,14 +963,12 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs)</div><div class='ctx'> 			tx_info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	totlen = brcmu_pkttotlen(p);</div><div class='add'>+	totlen = p-&gt;len;</div><div class='ctx'> 	free_pdu = true;</div><div class='ctx'> </div><div class='ctx'> 	brcms_c_txfifo_complete(wlc, queue, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (lastframe) {</div><div class='del'>-		p-&gt;next = NULL;</div><div class='del'>-		p-&gt;prev = NULL;</div><div class='ctx'> 		/* remove PLCP &amp; Broadcom tx descriptor header */</div><div class='ctx'> 		skb_pull(p, D11_PHY_HDR_LEN);</div><div class='ctx'> 		skb_pull(p, D11_TXH_LEN);</div><div class='hunk'>@@ -1053,7 +996,7 @@ brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal)</div><div class='ctx'> {</div><div class='ctx'> 	bool morepending = false;</div><div class='ctx'> 	struct brcms_c_info *wlc = wlc_hw-&gt;wlc;</div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='add'>+	struct bcma_device *core;</div><div class='ctx'> 	struct tx_status txstatus, *txs;</div><div class='ctx'> 	u32 s1, s2;</div><div class='ctx'> 	uint n = 0;</div><div class='hunk'>@@ -1066,18 +1009,18 @@ brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal)</div><div class='ctx'> 	BCMMSG(wlc-&gt;wiphy, "wl%d\n", wlc_hw-&gt;unit);</div><div class='ctx'> </div><div class='ctx'> 	txs = &amp;txstatus;</div><div class='del'>-	regs = wlc_hw-&gt;regs;</div><div class='add'>+	core = wlc_hw-&gt;d11core;</div><div class='ctx'> 	*fatal = false;</div><div class='add'>+	s1 = bcma_read32(core, D11REGOFFS(frmtxstatus));</div><div class='ctx'> 	while (!(*fatal)</div><div class='del'>-	       &amp;&amp; (s1 = R_REG(&amp;regs-&gt;frmtxstatus)) &amp; TXS_V) {</div><div class='add'>+	       &amp;&amp; (s1 &amp; TXS_V)) {</div><div class='ctx'> </div><div class='ctx'> 		if (s1 == 0xffffffff) {</div><div class='ctx'> 			wiphy_err(wlc-&gt;wiphy, "wl%d: %s: dead chip\n",</div><div class='ctx'> 				wlc_hw-&gt;unit, __func__);</div><div class='ctx'> 			return morepending;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		s2 = R_REG(&amp;regs-&gt;frmtxstatus2);</div><div class='add'>+		s2 = bcma_read32(core, D11REGOFFS(frmtxstatus2));</div><div class='ctx'> </div><div class='ctx'> 		txs-&gt;status = s1 &amp; TXS_STATUS_MASK;</div><div class='ctx'> 		txs-&gt;frameid = (s1 &amp; TXS_FID_MASK) &gt;&gt; TXS_FID_SHIFT;</div><div class='hunk'>@@ -1090,6 +1033,7 @@ brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal)</div><div class='ctx'> 		/* !give others some time to run! */</div><div class='ctx'> 		if (++n &gt;= max_tx_num)</div><div class='ctx'> 			break;</div><div class='add'>+		s1 = bcma_read32(core, D11REGOFFS(frmtxstatus));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (*fatal)</div><div class='hunk'>@@ -1134,12 +1078,12 @@ brcms_c_mhfdef(struct brcms_c_info *wlc, u16 *mhfs, u16 mhf2_init)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dma64regs __iomem *</div><div class='del'>-dmareg(struct brcms_hardware *hw, uint direction, uint fifonum)</div><div class='add'>+static uint</div><div class='add'>+dmareg(uint direction, uint fifonum)</div><div class='ctx'> {</div><div class='ctx'> 	if (direction == DMA_TX)</div><div class='del'>-		return &amp;(hw-&gt;regs-&gt;fifo64regs[fifonum].dmaxmt);</div><div class='del'>-	return &amp;(hw-&gt;regs-&gt;fifo64regs[fifonum].dmarcv);</div><div class='add'>+		return offsetof(struct d11regs, fifo64regs[fifonum].dmaxmt);</div><div class='add'>+	return offsetof(struct d11regs, fifo64regs[fifonum].dmarcv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme)</div><div class='hunk'>@@ -1165,9 +1109,9 @@ static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme)</div><div class='ctx'> 		 * TX: TX_AC_BK_FIFO (TX AC Background data packets)</div><div class='ctx'> 		 * RX: RX_FIFO (RX data packets)</div><div class='ctx'> 		 */</div><div class='del'>-		wlc_hw-&gt;di[0] = dma_attach(name, wlc_hw-&gt;sih,</div><div class='del'>-					   (wme ? dmareg(wlc_hw, DMA_TX, 0) :</div><div class='del'>-					    NULL), dmareg(wlc_hw, DMA_RX, 0),</div><div class='add'>+		wlc_hw-&gt;di[0] = dma_attach(name, wlc_hw-&gt;sih, wlc_hw-&gt;d11core,</div><div class='add'>+					   (wme ? dmareg(DMA_TX, 0) : 0),</div><div class='add'>+					   dmareg(DMA_RX, 0),</div><div class='ctx'> 					   (wme ? NTXD : 0), NRXD,</div><div class='ctx'> 					   RXBUFSZ, -1, NRXBUFPOST,</div><div class='ctx'> 					   BRCMS_HWRXOFF, &amp;brcm_msg_level);</div><div class='hunk'>@@ -1179,8 +1123,8 @@ static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme)</div><div class='ctx'> 		 *   (legacy) TX_DATA_FIFO (TX data packets)</div><div class='ctx'> 		 * RX: UNUSED</div><div class='ctx'> 		 */</div><div class='del'>-		wlc_hw-&gt;di[1] = dma_attach(name, wlc_hw-&gt;sih,</div><div class='del'>-					   dmareg(wlc_hw, DMA_TX, 1), NULL,</div><div class='add'>+		wlc_hw-&gt;di[1] = dma_attach(name, wlc_hw-&gt;sih, wlc_hw-&gt;d11core,</div><div class='add'>+					   dmareg(DMA_TX, 1), 0,</div><div class='ctx'> 					   NTXD, 0, 0, -1, 0, 0,</div><div class='ctx'> 					   &amp;brcm_msg_level);</div><div class='ctx'> 		dma_attach_err |= (NULL == wlc_hw-&gt;di[1]);</div><div class='hunk'>@@ -1190,8 +1134,8 @@ static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme)</div><div class='ctx'> 		 * TX: TX_AC_VI_FIFO (TX AC Video data packets)</div><div class='ctx'> 		 * RX: UNUSED</div><div class='ctx'> 		 */</div><div class='del'>-		wlc_hw-&gt;di[2] = dma_attach(name, wlc_hw-&gt;sih,</div><div class='del'>-					   dmareg(wlc_hw, DMA_TX, 2), NULL,</div><div class='add'>+		wlc_hw-&gt;di[2] = dma_attach(name, wlc_hw-&gt;sih, wlc_hw-&gt;d11core,</div><div class='add'>+					   dmareg(DMA_TX, 2), 0,</div><div class='ctx'> 					   NTXD, 0, 0, -1, 0, 0,</div><div class='ctx'> 					   &amp;brcm_msg_level);</div><div class='ctx'> 		dma_attach_err |= (NULL == wlc_hw-&gt;di[2]);</div><div class='hunk'>@@ -1200,9 +1144,9 @@ static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme)</div><div class='ctx'> 		 * TX: TX_AC_VO_FIFO (TX AC Voice data packets)</div><div class='ctx'> 		 *   (legacy) TX_CTL_FIFO (TX control &amp; mgmt packets)</div><div class='ctx'> 		 */</div><div class='del'>-		wlc_hw-&gt;di[3] = dma_attach(name, wlc_hw-&gt;sih,</div><div class='del'>-					   dmareg(wlc_hw, DMA_TX, 3),</div><div class='del'>-					   NULL, NTXD, 0, 0, -1,</div><div class='add'>+		wlc_hw-&gt;di[3] = dma_attach(name, wlc_hw-&gt;sih, wlc_hw-&gt;d11core,</div><div class='add'>+					   dmareg(DMA_TX, 3),</div><div class='add'>+					   0, NTXD, 0, 0, -1,</div><div class='ctx'> 					   0, 0, &amp;brcm_msg_level);</div><div class='ctx'> 		dma_attach_err |= (NULL == wlc_hw-&gt;di[3]);</div><div class='ctx'> /* Cleaner to leave this as if with AP defined */</div><div class='hunk'>@@ -1276,7 +1220,7 @@ static void brcms_b_wait_for_wake(struct brcms_hardware *wlc_hw)</div><div class='ctx'> /* control chip clock to save power, enable dynamic clock or force fast clock */</div><div class='ctx'> static void brcms_b_clkctl_clk(struct brcms_hardware *wlc_hw, uint mode)</div><div class='ctx'> {</div><div class='del'>-	if (wlc_hw-&gt;sih-&gt;cccaps &amp; CC_CAP_PMU) {</div><div class='add'>+	if (ai_get_cccaps(wlc_hw-&gt;sih) &amp; CC_CAP_PMU) {</div><div class='ctx'> 		/* new chips with PMU, CCS_FORCEHT will distribute the HT clock</div><div class='ctx'> 		 * on backplane, but mac core will still run on ALP(not HT) when</div><div class='ctx'> 		 * it enters powersave mode, which means the FCA bit may not be</div><div class='hunk'>@@ -1285,29 +1229,33 @@ static void brcms_b_clkctl_clk(struct brcms_hardware *wlc_hw, uint mode)</div><div class='ctx'> </div><div class='ctx'> 		if (wlc_hw-&gt;clk) {</div><div class='ctx'> 			if (mode == CLK_FAST) {</div><div class='del'>-				OR_REG(&amp;wlc_hw-&gt;regs-&gt;clk_ctl_st,</div><div class='del'>-				       CCS_FORCEHT);</div><div class='add'>+				bcma_set32(wlc_hw-&gt;d11core,</div><div class='add'>+					   D11REGOFFS(clk_ctl_st),</div><div class='add'>+					   CCS_FORCEHT);</div><div class='ctx'> </div><div class='ctx'> 				udelay(64);</div><div class='ctx'> </div><div class='del'>-				SPINWAIT(((R_REG</div><div class='del'>-					   (&amp;wlc_hw-&gt;regs-&gt;</div><div class='del'>-					    clk_ctl_st) &amp; CCS_HTAVAIL) == 0),</div><div class='del'>-					 PMU_MAX_TRANSITION_DLY);</div><div class='del'>-				WARN_ON(!(R_REG</div><div class='del'>-					  (&amp;wlc_hw-&gt;regs-&gt;</div><div class='del'>-					   clk_ctl_st) &amp; CCS_HTAVAIL));</div><div class='add'>+				SPINWAIT(</div><div class='add'>+				    ((bcma_read32(wlc_hw-&gt;d11core,</div><div class='add'>+				      D11REGOFFS(clk_ctl_st)) &amp;</div><div class='add'>+				      CCS_HTAVAIL) == 0),</div><div class='add'>+				      PMU_MAX_TRANSITION_DLY);</div><div class='add'>+				WARN_ON(!(bcma_read32(wlc_hw-&gt;d11core,</div><div class='add'>+					D11REGOFFS(clk_ctl_st)) &amp;</div><div class='add'>+					CCS_HTAVAIL));</div><div class='ctx'> 			} else {</div><div class='del'>-				if ((wlc_hw-&gt;sih-&gt;pmurev == 0) &amp;&amp;</div><div class='del'>-				    (R_REG</div><div class='del'>-				     (&amp;wlc_hw-&gt;regs-&gt;</div><div class='del'>-				      clk_ctl_st) &amp; (CCS_FORCEHT | CCS_HTAREQ)))</div><div class='del'>-					SPINWAIT(((R_REG</div><div class='del'>-						   (&amp;wlc_hw-&gt;regs-&gt;</div><div class='del'>-						    clk_ctl_st) &amp; CCS_HTAVAIL)</div><div class='del'>-						  == 0),</div><div class='del'>-						 PMU_MAX_TRANSITION_DLY);</div><div class='del'>-				AND_REG(&amp;wlc_hw-&gt;regs-&gt;clk_ctl_st,</div><div class='add'>+				if ((ai_get_pmurev(wlc_hw-&gt;sih) == 0) &amp;&amp;</div><div class='add'>+				    (bcma_read32(wlc_hw-&gt;d11core,</div><div class='add'>+					D11REGOFFS(clk_ctl_st)) &amp;</div><div class='add'>+					(CCS_FORCEHT | CCS_HTAREQ)))</div><div class='add'>+					SPINWAIT(</div><div class='add'>+					    ((bcma_read32(wlc_hw-&gt;d11core,</div><div class='add'>+					      offsetof(struct d11regs,</div><div class='add'>+						       clk_ctl_st)) &amp;</div><div class='add'>+					      CCS_HTAVAIL) == 0),</div><div class='add'>+					      PMU_MAX_TRANSITION_DLY);</div><div class='add'>+				bcma_mask32(wlc_hw-&gt;d11core,</div><div class='add'>+					D11REGOFFS(clk_ctl_st),</div><div class='ctx'> 					~CCS_FORCEHT);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1322,7 +1270,7 @@ static void brcms_b_clkctl_clk(struct brcms_hardware *wlc_hw, uint mode)</div><div class='ctx'> </div><div class='ctx'> 		/* check fast clock is available (if core is not in reset) */</div><div class='ctx'> 		if (wlc_hw-&gt;forcefastclk &amp;&amp; wlc_hw-&gt;clk)</div><div class='del'>-			WARN_ON(!(ai_core_sflags(wlc_hw-&gt;sih, 0, 0) &amp;</div><div class='add'>+			WARN_ON(!(bcma_aread32(wlc_hw-&gt;d11core, BCMA_IOST) &amp;</div><div class='ctx'> 				  SISF_FCLKA));</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1439,7 +1387,8 @@ static void brcms_c_mctrl_write(struct brcms_hardware *wlc_hw)</div><div class='ctx'> 		maccontrol |= MCTL_INFRA;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;wlc_hw-&gt;regs-&gt;maccontrol, maccontrol);</div><div class='add'>+	bcma_write32(wlc_hw-&gt;d11core, D11REGOFFS(maccontrol),</div><div class='add'>+		     maccontrol);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* set or clear maccontrol bits */</div><div class='hunk'>@@ -1533,7 +1482,7 @@ static void</div><div class='ctx'> brcms_b_set_addrmatch(struct brcms_hardware *wlc_hw, int match_reg_offset,</div><div class='ctx'> 		       const u8 *addr)</div><div class='ctx'> {</div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='ctx'> 	u16 mac_l;</div><div class='ctx'> 	u16 mac_m;</div><div class='ctx'> 	u16 mac_h;</div><div class='hunk'>@@ -1541,38 +1490,36 @@ brcms_b_set_addrmatch(struct brcms_hardware *wlc_hw, int match_reg_offset,</div><div class='ctx'> 	BCMMSG(wlc_hw-&gt;wlc-&gt;wiphy, "wl%d: brcms_b_set_addrmatch\n",</div><div class='ctx'> 		 wlc_hw-&gt;unit);</div><div class='ctx'> </div><div class='del'>-	regs = wlc_hw-&gt;regs;</div><div class='ctx'> 	mac_l = addr[0] | (addr[1] &lt;&lt; 8);</div><div class='ctx'> 	mac_m = addr[2] | (addr[3] &lt;&lt; 8);</div><div class='ctx'> 	mac_h = addr[4] | (addr[5] &lt;&lt; 8);</div><div class='ctx'> </div><div class='ctx'> 	/* enter the MAC addr into the RXE match registers */</div><div class='del'>-	W_REG(&amp;regs-&gt;rcm_ctl, RCM_INC_DATA | match_reg_offset);</div><div class='del'>-	W_REG(&amp;regs-&gt;rcm_mat_data, mac_l);</div><div class='del'>-	W_REG(&amp;regs-&gt;rcm_mat_data, mac_m);</div><div class='del'>-	W_REG(&amp;regs-&gt;rcm_mat_data, mac_h);</div><div class='del'>-</div><div class='add'>+	bcma_write16(core, D11REGOFFS(rcm_ctl),</div><div class='add'>+		     RCM_INC_DATA | match_reg_offset);</div><div class='add'>+	bcma_write16(core, D11REGOFFS(rcm_mat_data), mac_l);</div><div class='add'>+	bcma_write16(core, D11REGOFFS(rcm_mat_data), mac_m);</div><div class='add'>+	bcma_write16(core, D11REGOFFS(rcm_mat_data), mac_h);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> brcms_b_write_template_ram(struct brcms_hardware *wlc_hw, int offset, int len,</div><div class='ctx'> 			    void *buf)</div><div class='ctx'> {</div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='ctx'> 	u32 word;</div><div class='ctx'> 	__le32 word_le;</div><div class='ctx'> 	__be32 word_be;</div><div class='ctx'> 	bool be_bit;</div><div class='ctx'> 	BCMMSG(wlc_hw-&gt;wlc-&gt;wiphy, "wl%d\n", wlc_hw-&gt;unit);</div><div class='ctx'> </div><div class='del'>-	regs = wlc_hw-&gt;regs;</div><div class='del'>-	W_REG(&amp;regs-&gt;tplatewrptr, offset);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(tplatewrptr), offset);</div><div class='ctx'> </div><div class='ctx'> 	/* if MCTL_BIGEND bit set in mac control register,</div><div class='ctx'> 	 * the chip swaps data in fifo, as well as data in</div><div class='ctx'> 	 * template ram</div><div class='ctx'> 	 */</div><div class='del'>-	be_bit = (R_REG(&amp;regs-&gt;maccontrol) &amp; MCTL_BIGEND) != 0;</div><div class='add'>+	be_bit = (bcma_read32(core, D11REGOFFS(maccontrol)) &amp; MCTL_BIGEND) != 0;</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt; 0) {</div><div class='ctx'> 		memcpy(&amp;word, buf, sizeof(u32));</div><div class='hunk'>@@ -1585,7 +1532,7 @@ brcms_b_write_template_ram(struct brcms_hardware *wlc_hw, int offset, int len,</div><div class='ctx'> 			word = *(u32 *)&amp;word_le;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		W_REG(&amp;regs-&gt;tplatewrdata, word);</div><div class='add'>+		bcma_write32(core, D11REGOFFS(tplatewrdata), word);</div><div class='ctx'> </div><div class='ctx'> 		buf = (u8 *) buf + sizeof(u32);</div><div class='ctx'> 		len -= sizeof(u32);</div><div class='hunk'>@@ -1596,18 +1543,20 @@ static void brcms_b_set_cwmin(struct brcms_hardware *wlc_hw, u16 newmin)</div><div class='ctx'> {</div><div class='ctx'> 	wlc_hw-&gt;band-&gt;CWmin = newmin;</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;wlc_hw-&gt;regs-&gt;objaddr, OBJADDR_SCR_SEL | S_DOT11_CWMIN);</div><div class='del'>-	(void)R_REG(&amp;wlc_hw-&gt;regs-&gt;objaddr);</div><div class='del'>-	W_REG(&amp;wlc_hw-&gt;regs-&gt;objdata, newmin);</div><div class='add'>+	bcma_write32(wlc_hw-&gt;d11core, D11REGOFFS(objaddr),</div><div class='add'>+		     OBJADDR_SCR_SEL | S_DOT11_CWMIN);</div><div class='add'>+	(void)bcma_read32(wlc_hw-&gt;d11core, D11REGOFFS(objaddr));</div><div class='add'>+	bcma_write32(wlc_hw-&gt;d11core, D11REGOFFS(objdata), newmin);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void brcms_b_set_cwmax(struct brcms_hardware *wlc_hw, u16 newmax)</div><div class='ctx'> {</div><div class='ctx'> 	wlc_hw-&gt;band-&gt;CWmax = newmax;</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;wlc_hw-&gt;regs-&gt;objaddr, OBJADDR_SCR_SEL | S_DOT11_CWMAX);</div><div class='del'>-	(void)R_REG(&amp;wlc_hw-&gt;regs-&gt;objaddr);</div><div class='del'>-	W_REG(&amp;wlc_hw-&gt;regs-&gt;objdata, newmax);</div><div class='add'>+	bcma_write32(wlc_hw-&gt;d11core, D11REGOFFS(objaddr),</div><div class='add'>+		     OBJADDR_SCR_SEL | S_DOT11_CWMAX);</div><div class='add'>+	(void)bcma_read32(wlc_hw-&gt;d11core, D11REGOFFS(objaddr));</div><div class='add'>+	bcma_write32(wlc_hw-&gt;d11core, D11REGOFFS(objdata), newmax);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void brcms_b_bw_set(struct brcms_hardware *wlc_hw, u16 bw)</div><div class='hunk'>@@ -1773,17 +1722,17 @@ void brcms_b_core_phypll_reset(struct brcms_hardware *wlc_hw)</div><div class='ctx'> {</div><div class='ctx'> 	BCMMSG(wlc_hw-&gt;wlc-&gt;wiphy, "wl%d\n", wlc_hw-&gt;unit);</div><div class='ctx'> </div><div class='del'>-	ai_corereg(wlc_hw-&gt;sih, SI_CC_IDX,</div><div class='del'>-		   offsetof(struct chipcregs, chipcontrol_addr), ~0, 0);</div><div class='add'>+	ai_cc_reg(wlc_hw-&gt;sih, offsetof(struct chipcregs, chipcontrol_addr),</div><div class='add'>+		  ~0, 0);</div><div class='ctx'> 	udelay(1);</div><div class='del'>-	ai_corereg(wlc_hw-&gt;sih, SI_CC_IDX,</div><div class='del'>-		   offsetof(struct chipcregs, chipcontrol_data), 0x4, 0);</div><div class='add'>+	ai_cc_reg(wlc_hw-&gt;sih, offsetof(struct chipcregs, chipcontrol_data),</div><div class='add'>+		  0x4, 0);</div><div class='ctx'> 	udelay(1);</div><div class='del'>-	ai_corereg(wlc_hw-&gt;sih, SI_CC_IDX,</div><div class='del'>-		   offsetof(struct chipcregs, chipcontrol_data), 0x4, 4);</div><div class='add'>+	ai_cc_reg(wlc_hw-&gt;sih, offsetof(struct chipcregs, chipcontrol_data),</div><div class='add'>+		  0x4, 4);</div><div class='ctx'> 	udelay(1);</div><div class='del'>-	ai_corereg(wlc_hw-&gt;sih, SI_CC_IDX,</div><div class='del'>-		   offsetof(struct chipcregs, chipcontrol_data), 0x4, 0);</div><div class='add'>+	ai_cc_reg(wlc_hw-&gt;sih, offsetof(struct chipcregs, chipcontrol_data),</div><div class='add'>+		  0x4, 0);</div><div class='ctx'> 	udelay(1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1797,18 +1746,18 @@ void brcms_b_phyclk_fgc(struct brcms_hardware *wlc_hw, bool clk)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (ON == clk)</div><div class='del'>-		ai_core_cflags(wlc_hw-&gt;sih, SICF_FGC, SICF_FGC);</div><div class='add'>+		brcms_b_core_ioctl(wlc_hw, SICF_FGC, SICF_FGC);</div><div class='ctx'> 	else</div><div class='del'>-		ai_core_cflags(wlc_hw-&gt;sih, SICF_FGC, 0);</div><div class='add'>+		brcms_b_core_ioctl(wlc_hw, SICF_FGC, 0);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void brcms_b_macphyclk_set(struct brcms_hardware *wlc_hw, bool clk)</div><div class='ctx'> {</div><div class='ctx'> 	if (ON == clk)</div><div class='del'>-		ai_core_cflags(wlc_hw-&gt;sih, SICF_MPCLKE, SICF_MPCLKE);</div><div class='add'>+		brcms_b_core_ioctl(wlc_hw, SICF_MPCLKE, SICF_MPCLKE);</div><div class='ctx'> 	else</div><div class='del'>-		ai_core_cflags(wlc_hw-&gt;sih, SICF_MPCLKE, 0);</div><div class='add'>+		brcms_b_core_ioctl(wlc_hw, SICF_MPCLKE, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void brcms_b_phy_reset(struct brcms_hardware *wlc_hw)</div><div class='hunk'>@@ -1828,7 +1777,7 @@ void brcms_b_phy_reset(struct brcms_hardware *wlc_hw)</div><div class='ctx'> 	if (BRCMS_ISNPHY(wlc_hw-&gt;band) &amp;&amp; NREV_GE(wlc_hw-&gt;band-&gt;phyrev, 3) &amp;&amp;</div><div class='ctx'> 	    NREV_LE(wlc_hw-&gt;band-&gt;phyrev, 4)) {</div><div class='ctx'> 		/* Set the PHY bandwidth */</div><div class='del'>-		ai_core_cflags(wlc_hw-&gt;sih, SICF_BWMASK, phy_bw_clkbits);</div><div class='add'>+		brcms_b_core_ioctl(wlc_hw, SICF_BWMASK, phy_bw_clkbits);</div><div class='ctx'> </div><div class='ctx'> 		udelay(1);</div><div class='ctx'> </div><div class='hunk'>@@ -1836,13 +1785,13 @@ void brcms_b_phy_reset(struct brcms_hardware *wlc_hw)</div><div class='ctx'> 		brcms_b_core_phypll_reset(wlc_hw);</div><div class='ctx'> </div><div class='ctx'> 		/* reset the PHY */</div><div class='del'>-		ai_core_cflags(wlc_hw-&gt;sih, (SICF_PRST | SICF_PCLKE),</div><div class='del'>-			       (SICF_PRST | SICF_PCLKE));</div><div class='add'>+		brcms_b_core_ioctl(wlc_hw, (SICF_PRST | SICF_PCLKE),</div><div class='add'>+				   (SICF_PRST | SICF_PCLKE));</div><div class='ctx'> 		phy_in_reset = true;</div><div class='ctx'> 	} else {</div><div class='del'>-		ai_core_cflags(wlc_hw-&gt;sih,</div><div class='del'>-			       (SICF_PRST | SICF_PCLKE | SICF_BWMASK),</div><div class='del'>-			       (SICF_PRST | SICF_PCLKE | phy_bw_clkbits));</div><div class='add'>+		brcms_b_core_ioctl(wlc_hw,</div><div class='add'>+				   (SICF_PRST | SICF_PCLKE | SICF_BWMASK),</div><div class='add'>+				   (SICF_PRST | SICF_PCLKE | phy_bw_clkbits));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	udelay(2);</div><div class='hunk'>@@ -1859,8 +1808,8 @@ static void brcms_b_setband(struct brcms_hardware *wlc_hw, uint bandunit,</div><div class='ctx'> 	u32 macintmask;</div><div class='ctx'> </div><div class='ctx'> 	/* Enable the d11 core before accessing it */</div><div class='del'>-	if (!ai_iscoreup(wlc_hw-&gt;sih)) {</div><div class='del'>-		ai_core_reset(wlc_hw-&gt;sih, 0, 0);</div><div class='add'>+	if (!bcma_core_is_enabled(wlc_hw-&gt;d11core)) {</div><div class='add'>+		bcma_core_enable(wlc_hw-&gt;d11core, 0);</div><div class='ctx'> 		brcms_c_mctrl_reset(wlc_hw);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1886,7 +1835,8 @@ static void brcms_b_setband(struct brcms_hardware *wlc_hw, uint bandunit,</div><div class='ctx'> 	brcms_intrsrestore(wlc-&gt;wl, macintmask);</div><div class='ctx'> </div><div class='ctx'> 	/* ucode should still be suspended.. */</div><div class='del'>-	WARN_ON((R_REG(&amp;wlc_hw-&gt;regs-&gt;maccontrol) &amp; MCTL_EN_MAC) != 0);</div><div class='add'>+	WARN_ON((bcma_read32(wlc_hw-&gt;d11core, D11REGOFFS(maccontrol)) &amp;</div><div class='add'>+		 MCTL_EN_MAC) != 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool brcms_c_isgoodchip(struct brcms_hardware *wlc_hw)</div><div class='hunk'>@@ -1914,7 +1864,7 @@ static bool brcms_c_validboardtype(struct brcms_hardware *wlc_hw)</div><div class='ctx'> 	uint b2 = boardrev &amp; 0xf;</div><div class='ctx'> </div><div class='ctx'> 	/* voards from other vendors are always considered valid */</div><div class='del'>-	if (wlc_hw-&gt;sih-&gt;boardvendor != PCI_VENDOR_ID_BROADCOM)</div><div class='add'>+	if (ai_get_boardvendor(wlc_hw-&gt;sih) != PCI_VENDOR_ID_BROADCOM)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	/* do some boardrev sanity checks when boardvendor is Broadcom */</div><div class='hunk'>@@ -1986,7 +1936,7 @@ static void brcms_b_xtal(struct brcms_hardware *wlc_hw, bool want)</div><div class='ctx'> static bool brcms_b_radio_read_hwdisabled(struct brcms_hardware *wlc_hw)</div><div class='ctx'> {</div><div class='ctx'> 	bool v, clk, xtal;</div><div class='del'>-	u32 resetbits = 0, flags = 0;</div><div class='add'>+	u32 flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	xtal = wlc_hw-&gt;sbclk;</div><div class='ctx'> 	if (!xtal)</div><div class='hunk'>@@ -2003,22 +1953,22 @@ static bool brcms_b_radio_read_hwdisabled(struct brcms_hardware *wlc_hw)</div><div class='ctx'> 		flags |= SICF_PCLKE;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='add'>+		 * TODO: test suspend/resume</div><div class='add'>+		 *</div><div class='ctx'> 		 * AI chip doesn't restore bar0win2 on</div><div class='ctx'> 		 * hibernation/resume, need sw fixup</div><div class='ctx'> 		 */</div><div class='del'>-		if ((wlc_hw-&gt;sih-&gt;chip == BCM43224_CHIP_ID) ||</div><div class='del'>-		    (wlc_hw-&gt;sih-&gt;chip == BCM43225_CHIP_ID))</div><div class='del'>-			wlc_hw-&gt;regs = (struct d11regs __iomem *)</div><div class='del'>-					ai_setcore(wlc_hw-&gt;sih, D11_CORE_ID, 0);</div><div class='del'>-		ai_core_reset(wlc_hw-&gt;sih, flags, resetbits);</div><div class='add'>+</div><div class='add'>+		bcma_core_enable(wlc_hw-&gt;d11core, flags);</div><div class='ctx'> 		brcms_c_mctrl_reset(wlc_hw);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	v = ((R_REG(&amp;wlc_hw-&gt;regs-&gt;phydebug) &amp; PDBG_RFD) != 0);</div><div class='add'>+	v = ((bcma_read32(wlc_hw-&gt;d11core,</div><div class='add'>+			  D11REGOFFS(phydebug)) &amp; PDBG_RFD) != 0);</div><div class='ctx'> </div><div class='ctx'> 	/* put core back into reset */</div><div class='ctx'> 	if (!clk)</div><div class='del'>-		ai_core_disable(wlc_hw-&gt;sih, 0);</div><div class='add'>+		bcma_core_disable(wlc_hw-&gt;d11core, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (!xtal)</div><div class='ctx'> 		brcms_b_xtal(wlc_hw, OFF);</div><div class='hunk'>@@ -2042,25 +1992,21 @@ static bool wlc_dma_rxreset(struct brcms_hardware *wlc_hw, uint fifo)</div><div class='ctx'>  */</div><div class='ctx'> void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags)</div><div class='ctx'> {</div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='ctx'> 	uint i;</div><div class='ctx'> 	bool fastclk;</div><div class='del'>-	u32 resetbits = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (flags == BRCMS_USE_COREFLAGS)</div><div class='ctx'> 		flags = (wlc_hw-&gt;band-&gt;pi ? wlc_hw-&gt;band-&gt;core_flags : 0);</div><div class='ctx'> </div><div class='ctx'> 	BCMMSG(wlc_hw-&gt;wlc-&gt;wiphy, "wl%d\n", wlc_hw-&gt;unit);</div><div class='ctx'> </div><div class='del'>-	regs = wlc_hw-&gt;regs;</div><div class='del'>-</div><div class='ctx'> 	/* request FAST clock if not on  */</div><div class='ctx'> 	fastclk = wlc_hw-&gt;forcefastclk;</div><div class='ctx'> 	if (!fastclk)</div><div class='ctx'> 		brcms_b_clkctl_clk(wlc_hw, CLK_FAST);</div><div class='ctx'> </div><div class='ctx'> 	/* reset the dma engines except first time thru */</div><div class='del'>-	if (ai_iscoreup(wlc_hw-&gt;sih)) {</div><div class='add'>+	if (bcma_core_is_enabled(wlc_hw-&gt;d11core)) {</div><div class='ctx'> 		for (i = 0; i &lt; NFIFO; i++)</div><div class='ctx'> 			if ((wlc_hw-&gt;di[i]) &amp;&amp; (!dma_txreset(wlc_hw-&gt;di[i])))</div><div class='ctx'> 				wiphy_err(wlc_hw-&gt;wlc-&gt;wiphy, "wl%d: %s: "</div><div class='hunk'>@@ -2098,14 +2044,14 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags)</div><div class='ctx'> 	 * they may touch chipcommon as well.</div><div class='ctx'> 	 */</div><div class='ctx'> 	wlc_hw-&gt;clk = false;</div><div class='del'>-	ai_core_reset(wlc_hw-&gt;sih, flags, resetbits);</div><div class='add'>+	bcma_core_enable(wlc_hw-&gt;d11core, flags);</div><div class='ctx'> 	wlc_hw-&gt;clk = true;</div><div class='ctx'> 	if (wlc_hw-&gt;band &amp;&amp; wlc_hw-&gt;band-&gt;pi)</div><div class='ctx'> 		wlc_phy_hw_clk_state_upd(wlc_hw-&gt;band-&gt;pi, true);</div><div class='ctx'> </div><div class='ctx'> 	brcms_c_mctrl_reset(wlc_hw);</div><div class='ctx'> </div><div class='del'>-	if (wlc_hw-&gt;sih-&gt;cccaps &amp; CC_CAP_PMU)</div><div class='add'>+	if (ai_get_cccaps(wlc_hw-&gt;sih) &amp; CC_CAP_PMU)</div><div class='ctx'> 		brcms_b_clkctl_clk(wlc_hw, CLK_FAST);</div><div class='ctx'> </div><div class='ctx'> 	brcms_b_phy_reset(wlc_hw);</div><div class='hunk'>@@ -2126,7 +2072,7 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags)</div><div class='ctx'>  */</div><div class='ctx'> static void brcms_b_corerev_fifofixup(struct brcms_hardware *wlc_hw)</div><div class='ctx'> {</div><div class='del'>-	struct d11regs __iomem *regs = wlc_hw-&gt;regs;</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='ctx'> 	u16 fifo_nu;</div><div class='ctx'> 	u16 txfifo_startblk = TXFIFO_START_BLK, txfifo_endblk;</div><div class='ctx'> 	u16 txfifo_def, txfifo_def1;</div><div class='hunk'>@@ -2147,11 +2093,11 @@ static void brcms_b_corerev_fifofixup(struct brcms_hardware *wlc_hw)</div><div class='ctx'> 		txfifo_cmd =</div><div class='ctx'> 		    TXFIFOCMD_RESET_MASK | (fifo_nu &lt;&lt; TXFIFOCMD_FIFOSEL_SHIFT);</div><div class='ctx'> </div><div class='del'>-		W_REG(&amp;regs-&gt;xmtfifocmd, txfifo_cmd);</div><div class='del'>-		W_REG(&amp;regs-&gt;xmtfifodef, txfifo_def);</div><div class='del'>-		W_REG(&amp;regs-&gt;xmtfifodef1, txfifo_def1);</div><div class='add'>+		bcma_write16(core, D11REGOFFS(xmtfifocmd), txfifo_cmd);</div><div class='add'>+		bcma_write16(core, D11REGOFFS(xmtfifodef), txfifo_def);</div><div class='add'>+		bcma_write16(core, D11REGOFFS(xmtfifodef1), txfifo_def1);</div><div class='ctx'> </div><div class='del'>-		W_REG(&amp;regs-&gt;xmtfifocmd, txfifo_cmd);</div><div class='add'>+		bcma_write16(core, D11REGOFFS(xmtfifocmd), txfifo_cmd);</div><div class='ctx'> </div><div class='ctx'> 		txfifo_startblk += wlc_hw-&gt;xmtfifo_sz[fifo_nu];</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2186,27 +2132,27 @@ static void brcms_b_corerev_fifofixup(struct brcms_hardware *wlc_hw)</div><div class='ctx'> </div><div class='ctx'> void brcms_b_switch_macfreq(struct brcms_hardware *wlc_hw, u8 spurmode)</div><div class='ctx'> {</div><div class='del'>-	struct d11regs __iomem *regs = wlc_hw-&gt;regs;</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='ctx'> </div><div class='del'>-	if ((wlc_hw-&gt;sih-&gt;chip == BCM43224_CHIP_ID) ||</div><div class='del'>-	    (wlc_hw-&gt;sih-&gt;chip == BCM43225_CHIP_ID)) {</div><div class='add'>+	if ((ai_get_chip_id(wlc_hw-&gt;sih) == BCM43224_CHIP_ID) ||</div><div class='add'>+	    (ai_get_chip_id(wlc_hw-&gt;sih) == BCM43225_CHIP_ID)) {</div><div class='ctx'> 		if (spurmode == WL_SPURAVOID_ON2) {	/* 126Mhz */</div><div class='del'>-			W_REG(&amp;regs-&gt;tsf_clk_frac_l, 0x2082);</div><div class='del'>-			W_REG(&amp;regs-&gt;tsf_clk_frac_h, 0x8);</div><div class='add'>+			bcma_write16(core, D11REGOFFS(tsf_clk_frac_l), 0x2082);</div><div class='add'>+			bcma_write16(core, D11REGOFFS(tsf_clk_frac_h), 0x8);</div><div class='ctx'> 		} else if (spurmode == WL_SPURAVOID_ON1) {	/* 123Mhz */</div><div class='del'>-			W_REG(&amp;regs-&gt;tsf_clk_frac_l, 0x5341);</div><div class='del'>-			W_REG(&amp;regs-&gt;tsf_clk_frac_h, 0x8);</div><div class='add'>+			bcma_write16(core, D11REGOFFS(tsf_clk_frac_l), 0x5341);</div><div class='add'>+			bcma_write16(core, D11REGOFFS(tsf_clk_frac_h), 0x8);</div><div class='ctx'> 		} else {	/* 120Mhz */</div><div class='del'>-			W_REG(&amp;regs-&gt;tsf_clk_frac_l, 0x8889);</div><div class='del'>-			W_REG(&amp;regs-&gt;tsf_clk_frac_h, 0x8);</div><div class='add'>+			bcma_write16(core, D11REGOFFS(tsf_clk_frac_l), 0x8889);</div><div class='add'>+			bcma_write16(core, D11REGOFFS(tsf_clk_frac_h), 0x8);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (BRCMS_ISLCNPHY(wlc_hw-&gt;band)) {</div><div class='ctx'> 		if (spurmode == WL_SPURAVOID_ON1) {	/* 82Mhz */</div><div class='del'>-			W_REG(&amp;regs-&gt;tsf_clk_frac_l, 0x7CE0);</div><div class='del'>-			W_REG(&amp;regs-&gt;tsf_clk_frac_h, 0xC);</div><div class='add'>+			bcma_write16(core, D11REGOFFS(tsf_clk_frac_l), 0x7CE0);</div><div class='add'>+			bcma_write16(core, D11REGOFFS(tsf_clk_frac_h), 0xC);</div><div class='ctx'> 		} else {	/* 80Mhz */</div><div class='del'>-			W_REG(&amp;regs-&gt;tsf_clk_frac_l, 0xCCCD);</div><div class='del'>-			W_REG(&amp;regs-&gt;tsf_clk_frac_h, 0xC);</div><div class='add'>+			bcma_write16(core, D11REGOFFS(tsf_clk_frac_l), 0xCCCD);</div><div class='add'>+			bcma_write16(core, D11REGOFFS(tsf_clk_frac_h), 0xC);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2215,11 +2161,8 @@ void brcms_b_switch_macfreq(struct brcms_hardware *wlc_hw, u8 spurmode)</div><div class='ctx'> static void brcms_c_gpio_init(struct brcms_c_info *wlc)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_hardware *wlc_hw = wlc-&gt;hw;</div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='ctx'> 	u32 gc, gm;</div><div class='ctx'> </div><div class='del'>-	regs = wlc_hw-&gt;regs;</div><div class='del'>-</div><div class='ctx'> 	/* use GPIO select 0 to get all gpio signals from the gpio out reg */</div><div class='ctx'> 	brcms_b_mctrl(wlc_hw, MCTL_GPOUT_SEL_MASK, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -2250,10 +2193,10 @@ static void brcms_c_gpio_init(struct brcms_c_info *wlc)</div><div class='ctx'> 		 * The board itself is powered by these GPIOs</div><div class='ctx'> 		 * (when not sending pattern) so set them high</div><div class='ctx'> 		 */</div><div class='del'>-		OR_REG(&amp;regs-&gt;psm_gpio_oe,</div><div class='del'>-		       (BOARD_GPIO_12 | BOARD_GPIO_13));</div><div class='del'>-		OR_REG(&amp;regs-&gt;psm_gpio_out,</div><div class='del'>-		       (BOARD_GPIO_12 | BOARD_GPIO_13));</div><div class='add'>+		bcma_set16(wlc_hw-&gt;d11core, D11REGOFFS(psm_gpio_oe),</div><div class='add'>+			   (BOARD_GPIO_12 | BOARD_GPIO_13));</div><div class='add'>+		bcma_set16(wlc_hw-&gt;d11core, D11REGOFFS(psm_gpio_out),</div><div class='add'>+			   (BOARD_GPIO_12 | BOARD_GPIO_13));</div><div class='ctx'> </div><div class='ctx'> 		/* Enable antenna diversity, use 2x4 mode */</div><div class='ctx'> 		brcms_b_mhf(wlc_hw, MHF3, MHF3_ANTSEL_EN,</div><div class='hunk'>@@ -2280,7 +2223,7 @@ static void brcms_c_gpio_init(struct brcms_c_info *wlc)</div><div class='ctx'> static void brcms_ucode_write(struct brcms_hardware *wlc_hw,</div><div class='ctx'> 			      const __le32 ucode[], const size_t nbytes)</div><div class='ctx'> {</div><div class='del'>-	struct d11regs __iomem *regs = wlc_hw-&gt;regs;</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='ctx'> 	uint i;</div><div class='ctx'> 	uint count;</div><div class='ctx'> </div><div class='hunk'>@@ -2288,10 +2231,11 @@ static void brcms_ucode_write(struct brcms_hardware *wlc_hw,</div><div class='ctx'> </div><div class='ctx'> 	count = (nbytes / sizeof(u32));</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;regs-&gt;objaddr, (OBJADDR_AUTO_INC | OBJADDR_UCM_SEL));</div><div class='del'>-	(void)R_REG(&amp;regs-&gt;objaddr);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(objaddr),</div><div class='add'>+		     OBJADDR_AUTO_INC | OBJADDR_UCM_SEL);</div><div class='add'>+	(void)bcma_read32(core, D11REGOFFS(objaddr));</div><div class='ctx'> 	for (i = 0; i &lt; count; i++)</div><div class='del'>-		W_REG(&amp;regs-&gt;objdata, le32_to_cpu(ucode[i]));</div><div class='add'>+		bcma_write32(core, D11REGOFFS(objdata), le32_to_cpu(ucode[i]));</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2352,19 +2296,12 @@ void brcms_b_antsel_type_set(struct brcms_hardware *wlc_hw, u8 antsel_type)</div><div class='ctx'> 	wlc_phy_antsel_type_set(wlc_hw-&gt;band-&gt;pi, antsel_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void brcms_c_fatal_error(struct brcms_c_info *wlc)</div><div class='del'>-{</div><div class='del'>-	wiphy_err(wlc-&gt;wiphy, "wl%d: fatal error, reinitializing\n",</div><div class='del'>-		  wlc-&gt;pub-&gt;unit);</div><div class='del'>-	brcms_init(wlc-&gt;wl);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)</div><div class='ctx'> {</div><div class='ctx'> 	bool fatal = false;</div><div class='ctx'> 	uint unit;</div><div class='ctx'> 	uint intstatus, idx;</div><div class='del'>-	struct d11regs __iomem *regs = wlc_hw-&gt;regs;</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='ctx'> 	struct wiphy *wiphy = wlc_hw-&gt;wlc-&gt;wiphy;</div><div class='ctx'> </div><div class='ctx'> 	unit = wlc_hw-&gt;unit;</div><div class='hunk'>@@ -2372,7 +2309,9 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)</div><div class='ctx'> 	for (idx = 0; idx &lt; NFIFO; idx++) {</div><div class='ctx'> 		/* read intstatus register and ignore any non-error bits */</div><div class='ctx'> 		intstatus =</div><div class='del'>-		    R_REG(&amp;regs-&gt;intctrlregs[idx].intstatus) &amp; I_ERRORS;</div><div class='add'>+			bcma_read32(core,</div><div class='add'>+				    D11REGOFFS(intctrlregs[idx].intstatus)) &amp;</div><div class='add'>+			I_ERRORS;</div><div class='ctx'> 		if (!intstatus)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -2414,11 +2353,12 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (fatal) {</div><div class='del'>-			brcms_c_fatal_error(wlc_hw-&gt;wlc);	/* big hammer */</div><div class='add'>+			brcms_fatal_error(wlc_hw-&gt;wlc-&gt;wl); /* big hammer */</div><div class='ctx'> 			break;</div><div class='ctx'> 		} else</div><div class='del'>-			W_REG(&amp;regs-&gt;intctrlregs[idx].intstatus,</div><div class='del'>-			      intstatus);</div><div class='add'>+			bcma_write32(core,</div><div class='add'>+				     D11REGOFFS(intctrlregs[idx].intstatus),</div><div class='add'>+				     intstatus);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2426,28 +2366,7 @@ void brcms_c_intrson(struct brcms_c_info *wlc)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_hardware *wlc_hw = wlc-&gt;hw;</div><div class='ctx'> 	wlc-&gt;macintmask = wlc-&gt;defmacintmask;</div><div class='del'>-	W_REG(&amp;wlc_hw-&gt;regs-&gt;macintmask, wlc-&gt;macintmask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * callback for siutils.c, which has only wlc handler, no wl they both check</div><div class='del'>- * up, not only because there is no need to off/restore d11 interrupt but also</div><div class='del'>- * because per-port code may require sync with valid interrupt.</div><div class='del'>- */</div><div class='del'>-static u32 brcms_c_wlintrsoff(struct brcms_c_info *wlc)</div><div class='del'>-{</div><div class='del'>-	if (!wlc-&gt;hw-&gt;up)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return brcms_intrsoff(wlc-&gt;wl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void brcms_c_wlintrsrestore(struct brcms_c_info *wlc, u32 macintmask)</div><div class='del'>-{</div><div class='del'>-	if (!wlc-&gt;hw-&gt;up)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	brcms_intrsrestore(wlc-&gt;wl, macintmask);</div><div class='add'>+	bcma_write32(wlc_hw-&gt;d11core, D11REGOFFS(macintmask), wlc-&gt;macintmask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u32 brcms_c_intrsoff(struct brcms_c_info *wlc)</div><div class='hunk'>@@ -2460,8 +2379,8 @@ u32 brcms_c_intrsoff(struct brcms_c_info *wlc)</div><div class='ctx'> </div><div class='ctx'> 	macintmask = wlc-&gt;macintmask;	/* isr can still happen */</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;wlc_hw-&gt;regs-&gt;macintmask, 0);</div><div class='del'>-	(void)R_REG(&amp;wlc_hw-&gt;regs-&gt;macintmask);	/* sync readback */</div><div class='add'>+	bcma_write32(wlc_hw-&gt;d11core, D11REGOFFS(macintmask), 0);</div><div class='add'>+	(void)bcma_read32(wlc_hw-&gt;d11core, D11REGOFFS(macintmask));</div><div class='ctx'> 	udelay(1);		/* ensure int line is no longer driven */</div><div class='ctx'> 	wlc-&gt;macintmask = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2476,9 +2395,10 @@ void brcms_c_intrsrestore(struct brcms_c_info *wlc, u32 macintmask)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	wlc-&gt;macintmask = macintmask;</div><div class='del'>-	W_REG(&amp;wlc_hw-&gt;regs-&gt;macintmask, wlc-&gt;macintmask);</div><div class='add'>+	bcma_write32(wlc_hw-&gt;d11core, D11REGOFFS(macintmask), wlc-&gt;macintmask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* assumes that the d11 MAC is enabled */</div><div class='ctx'> static void brcms_b_tx_fifo_suspend(struct brcms_hardware *wlc_hw,</div><div class='ctx'> 				    uint tx_fifo)</div><div class='ctx'> {</div><div class='hunk'>@@ -2535,11 +2455,12 @@ static void brcms_b_tx_fifo_resume(struct brcms_hardware *wlc_hw,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void brcms_b_mute(struct brcms_hardware *wlc_hw, bool on, u32 flags)</div><div class='add'>+/* precondition: requires the mac core to be enabled */</div><div class='add'>+static void brcms_b_mute(struct brcms_hardware *wlc_hw, bool mute_tx)</div><div class='ctx'> {</div><div class='ctx'> 	static const u8 null_ether_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};</div><div class='ctx'> </div><div class='del'>-	if (on) {</div><div class='add'>+	if (mute_tx) {</div><div class='ctx'> 		/* suspend tx fifos */</div><div class='ctx'> 		brcms_b_tx_fifo_suspend(wlc_hw, TX_DATA_FIFO);</div><div class='ctx'> 		brcms_b_tx_fifo_suspend(wlc_hw, TX_CTL_FIFO);</div><div class='hunk'>@@ -2561,14 +2482,20 @@ static void brcms_b_mute(struct brcms_hardware *wlc_hw, bool on, u32 flags)</div><div class='ctx'> 				       wlc_hw-&gt;etheraddr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wlc_phy_mute_upd(wlc_hw-&gt;band-&gt;pi, on, flags);</div><div class='add'>+	wlc_phy_mute_upd(wlc_hw-&gt;band-&gt;pi, mute_tx, 0);</div><div class='ctx'> </div><div class='del'>-	if (on)</div><div class='add'>+	if (mute_tx)</div><div class='ctx'> 		brcms_c_ucode_mute_override_set(wlc_hw);</div><div class='ctx'> 	else</div><div class='ctx'> 		brcms_c_ucode_mute_override_clear(wlc_hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void</div><div class='add'>+brcms_c_mute(struct brcms_c_info *wlc, bool mute_tx)</div><div class='add'>+{</div><div class='add'>+	brcms_b_mute(wlc-&gt;hw, mute_tx);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Read and clear macintmask and macintstatus and intstatus registers.</div><div class='ctx'>  * This routine should be called with interrupts off</div><div class='hunk'>@@ -2580,11 +2507,11 @@ static void brcms_b_mute(struct brcms_hardware *wlc_hw, bool on, u32 flags)</div><div class='ctx'> static inline u32 wlc_intstatus(struct brcms_c_info *wlc, bool in_isr)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_hardware *wlc_hw = wlc-&gt;hw;</div><div class='del'>-	struct d11regs __iomem *regs = wlc_hw-&gt;regs;</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='ctx'> 	u32 macintstatus;</div><div class='ctx'> </div><div class='ctx'> 	/* macintstatus includes a DMA interrupt summary bit */</div><div class='del'>-	macintstatus = R_REG(&amp;regs-&gt;macintstatus);</div><div class='add'>+	macintstatus = bcma_read32(core, D11REGOFFS(macintstatus));</div><div class='ctx'> </div><div class='ctx'> 	BCMMSG(wlc-&gt;wiphy, "wl%d: macintstatus: 0x%x\n", wlc_hw-&gt;unit,</div><div class='ctx'> 		 macintstatus);</div><div class='hunk'>@@ -2611,12 +2538,12 @@ static inline u32 wlc_intstatus(struct brcms_c_info *wlc, bool in_isr)</div><div class='ctx'> 	 * consequences</div><div class='ctx'> 	 */</div><div class='ctx'> 	/* turn off the interrupts */</div><div class='del'>-	W_REG(&amp;regs-&gt;macintmask, 0);</div><div class='del'>-	(void)R_REG(&amp;regs-&gt;macintmask);	/* sync readback */</div><div class='add'>+	bcma_write32(core, D11REGOFFS(macintmask), 0);</div><div class='add'>+	(void)bcma_read32(core, D11REGOFFS(macintmask));</div><div class='ctx'> 	wlc-&gt;macintmask = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* clear device interrupts */</div><div class='del'>-	W_REG(&amp;regs-&gt;macintstatus, macintstatus);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(macintstatus), macintstatus);</div><div class='ctx'> </div><div class='ctx'> 	/* MI_DMAINT is indication of non-zero intstatus */</div><div class='ctx'> 	if (macintstatus &amp; MI_DMAINT)</div><div class='hunk'>@@ -2625,8 +2552,8 @@ static inline u32 wlc_intstatus(struct brcms_c_info *wlc, bool in_isr)</div><div class='ctx'> 		 * RX_FIFO. If MI_DMAINT is set, assume it</div><div class='ctx'> 		 * is set and clear the interrupt.</div><div class='ctx'> 		 */</div><div class='del'>-		W_REG(&amp;regs-&gt;intctrlregs[RX_FIFO].intstatus,</div><div class='del'>-		      DEF_RXINTMASK);</div><div class='add'>+		bcma_write32(core, D11REGOFFS(intctrlregs[RX_FIFO].intstatus),</div><div class='add'>+			     DEF_RXINTMASK);</div><div class='ctx'> </div><div class='ctx'> 	return macintstatus;</div><div class='ctx'> }</div><div class='hunk'>@@ -2689,7 +2616,7 @@ bool brcms_c_isr(struct brcms_c_info *wlc, bool *wantdpc)</div><div class='ctx'> void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_hardware *wlc_hw = wlc-&gt;hw;</div><div class='del'>-	struct d11regs __iomem *regs = wlc_hw-&gt;regs;</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='ctx'> 	u32 mc, mi;</div><div class='ctx'> 	struct wiphy *wiphy = wlc-&gt;wiphy;</div><div class='ctx'> </div><div class='hunk'>@@ -2706,7 +2633,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)</div><div class='ctx'> 	/* force the core awake */</div><div class='ctx'> 	brcms_c_ucode_wake_override_set(wlc_hw, BRCMS_WAKE_OVERRIDE_MACSUSPEND);</div><div class='ctx'> </div><div class='del'>-	mc = R_REG(&amp;regs-&gt;maccontrol);</div><div class='add'>+	mc = bcma_read32(core, D11REGOFFS(maccontrol));</div><div class='ctx'> </div><div class='ctx'> 	if (mc == 0xffffffff) {</div><div class='ctx'> 		wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw-&gt;unit,</div><div class='hunk'>@@ -2718,7 +2645,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)</div><div class='ctx'> 	WARN_ON(!(mc &amp; MCTL_PSM_RUN));</div><div class='ctx'> 	WARN_ON(!(mc &amp; MCTL_EN_MAC));</div><div class='ctx'> </div><div class='del'>-	mi = R_REG(&amp;regs-&gt;macintstatus);</div><div class='add'>+	mi = bcma_read32(core, D11REGOFFS(macintstatus));</div><div class='ctx'> 	if (mi == 0xffffffff) {</div><div class='ctx'> 		wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw-&gt;unit,</div><div class='ctx'> 			  __func__);</div><div class='hunk'>@@ -2729,21 +2656,21 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)</div><div class='ctx'> </div><div class='ctx'> 	brcms_b_mctrl(wlc_hw, MCTL_EN_MAC, 0);</div><div class='ctx'> </div><div class='del'>-	SPINWAIT(!(R_REG(&amp;regs-&gt;macintstatus) &amp; MI_MACSSPNDD),</div><div class='add'>+	SPINWAIT(!(bcma_read32(core, D11REGOFFS(macintstatus)) &amp; MI_MACSSPNDD),</div><div class='ctx'> 		 BRCMS_MAX_MAC_SUSPEND);</div><div class='ctx'> </div><div class='del'>-	if (!(R_REG(&amp;regs-&gt;macintstatus) &amp; MI_MACSSPNDD)) {</div><div class='add'>+	if (!(bcma_read32(core, D11REGOFFS(macintstatus)) &amp; MI_MACSSPNDD)) {</div><div class='ctx'> 		wiphy_err(wiphy, "wl%d: wlc_suspend_mac_and_wait: waited %d uS"</div><div class='ctx'> 			  " and MI_MACSSPNDD is still not on.\n",</div><div class='ctx'> 			  wlc_hw-&gt;unit, BRCMS_MAX_MAC_SUSPEND);</div><div class='ctx'> 		wiphy_err(wiphy, "wl%d: psmdebug 0x%08x, phydebug 0x%08x, "</div><div class='ctx'> 			  "psm_brc 0x%04x\n", wlc_hw-&gt;unit,</div><div class='del'>-			  R_REG(&amp;regs-&gt;psmdebug),</div><div class='del'>-			  R_REG(&amp;regs-&gt;phydebug),</div><div class='del'>-			  R_REG(&amp;regs-&gt;psm_brc));</div><div class='add'>+			  bcma_read32(core, D11REGOFFS(psmdebug)),</div><div class='add'>+			  bcma_read32(core, D11REGOFFS(phydebug)),</div><div class='add'>+			  bcma_read16(core, D11REGOFFS(psm_brc)));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mc = R_REG(&amp;regs-&gt;maccontrol);</div><div class='add'>+	mc = bcma_read32(core, D11REGOFFS(maccontrol));</div><div class='ctx'> 	if (mc == 0xffffffff) {</div><div class='ctx'> 		wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw-&gt;unit,</div><div class='ctx'> 			  __func__);</div><div class='hunk'>@@ -2758,7 +2685,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)</div><div class='ctx'> void brcms_c_enable_mac(struct brcms_c_info *wlc)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_hardware *wlc_hw = wlc-&gt;hw;</div><div class='del'>-	struct d11regs __iomem *regs = wlc_hw-&gt;regs;</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='ctx'> 	u32 mc, mi;</div><div class='ctx'> </div><div class='ctx'> 	BCMMSG(wlc-&gt;wiphy, "wl%d: bandunit %d\n", wlc_hw-&gt;unit,</div><div class='hunk'>@@ -2771,20 +2698,20 @@ void brcms_c_enable_mac(struct brcms_c_info *wlc)</div><div class='ctx'> 	if (wlc_hw-&gt;mac_suspend_depth &gt; 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mc = R_REG(&amp;regs-&gt;maccontrol);</div><div class='add'>+	mc = bcma_read32(core, D11REGOFFS(maccontrol));</div><div class='ctx'> 	WARN_ON(mc &amp; MCTL_PSM_JMP_0);</div><div class='ctx'> 	WARN_ON(mc &amp; MCTL_EN_MAC);</div><div class='ctx'> 	WARN_ON(!(mc &amp; MCTL_PSM_RUN));</div><div class='ctx'> </div><div class='ctx'> 	brcms_b_mctrl(wlc_hw, MCTL_EN_MAC, MCTL_EN_MAC);</div><div class='del'>-	W_REG(&amp;regs-&gt;macintstatus, MI_MACSSPNDD);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(macintstatus), MI_MACSSPNDD);</div><div class='ctx'> </div><div class='del'>-	mc = R_REG(&amp;regs-&gt;maccontrol);</div><div class='add'>+	mc = bcma_read32(core, D11REGOFFS(maccontrol));</div><div class='ctx'> 	WARN_ON(mc &amp; MCTL_PSM_JMP_0);</div><div class='ctx'> 	WARN_ON(!(mc &amp; MCTL_EN_MAC));</div><div class='ctx'> 	WARN_ON(!(mc &amp; MCTL_PSM_RUN));</div><div class='ctx'> </div><div class='del'>-	mi = R_REG(&amp;regs-&gt;macintstatus);</div><div class='add'>+	mi = bcma_read32(core, D11REGOFFS(macintstatus));</div><div class='ctx'> 	WARN_ON(mi &amp; MI_MACSSPNDD);</div><div class='ctx'> </div><div class='ctx'> 	brcms_c_ucode_wake_override_clear(wlc_hw,</div><div class='hunk'>@@ -2801,55 +2728,53 @@ void brcms_b_band_stf_ss_set(struct brcms_hardware *wlc_hw, u8 stf_mode)</div><div class='ctx'> </div><div class='ctx'> static bool brcms_b_validate_chip_access(struct brcms_hardware *wlc_hw)</div><div class='ctx'> {</div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='ctx'> 	u32 w, val;</div><div class='ctx'> 	struct wiphy *wiphy = wlc_hw-&gt;wlc-&gt;wiphy;</div><div class='ctx'> </div><div class='ctx'> 	BCMMSG(wiphy, "wl%d\n", wlc_hw-&gt;unit);</div><div class='ctx'> </div><div class='del'>-	regs = wlc_hw-&gt;regs;</div><div class='del'>-</div><div class='ctx'> 	/* Validate dchip register access */</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;regs-&gt;objaddr, OBJADDR_SHM_SEL | 0);</div><div class='del'>-	(void)R_REG(&amp;regs-&gt;objaddr);</div><div class='del'>-	w = R_REG(&amp;regs-&gt;objdata);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);</div><div class='add'>+	(void)bcma_read32(core, D11REGOFFS(objaddr));</div><div class='add'>+	w = bcma_read32(core, D11REGOFFS(objdata));</div><div class='ctx'> </div><div class='ctx'> 	/* Can we write and read back a 32bit register? */</div><div class='del'>-	W_REG(&amp;regs-&gt;objaddr, OBJADDR_SHM_SEL | 0);</div><div class='del'>-	(void)R_REG(&amp;regs-&gt;objaddr);</div><div class='del'>-	W_REG(&amp;regs-&gt;objdata, (u32) 0xaa5555aa);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);</div><div class='add'>+	(void)bcma_read32(core, D11REGOFFS(objaddr));</div><div class='add'>+	bcma_write32(core, D11REGOFFS(objdata), (u32) 0xaa5555aa);</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;regs-&gt;objaddr, OBJADDR_SHM_SEL | 0);</div><div class='del'>-	(void)R_REG(&amp;regs-&gt;objaddr);</div><div class='del'>-	val = R_REG(&amp;regs-&gt;objdata);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);</div><div class='add'>+	(void)bcma_read32(core, D11REGOFFS(objaddr));</div><div class='add'>+	val = bcma_read32(core, D11REGOFFS(objdata));</div><div class='ctx'> 	if (val != (u32) 0xaa5555aa) {</div><div class='ctx'> 		wiphy_err(wiphy, "wl%d: validate_chip_access: SHM = 0x%x, "</div><div class='ctx'> 			  "expected 0xaa5555aa\n", wlc_hw-&gt;unit, val);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;regs-&gt;objaddr, OBJADDR_SHM_SEL | 0);</div><div class='del'>-	(void)R_REG(&amp;regs-&gt;objaddr);</div><div class='del'>-	W_REG(&amp;regs-&gt;objdata, (u32) 0x55aaaa55);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);</div><div class='add'>+	(void)bcma_read32(core, D11REGOFFS(objaddr));</div><div class='add'>+	bcma_write32(core, D11REGOFFS(objdata), (u32) 0x55aaaa55);</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;regs-&gt;objaddr, OBJADDR_SHM_SEL | 0);</div><div class='del'>-	(void)R_REG(&amp;regs-&gt;objaddr);</div><div class='del'>-	val = R_REG(&amp;regs-&gt;objdata);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);</div><div class='add'>+	(void)bcma_read32(core, D11REGOFFS(objaddr));</div><div class='add'>+	val = bcma_read32(core, D11REGOFFS(objdata));</div><div class='ctx'> 	if (val != (u32) 0x55aaaa55) {</div><div class='ctx'> 		wiphy_err(wiphy, "wl%d: validate_chip_access: SHM = 0x%x, "</div><div class='ctx'> 			  "expected 0x55aaaa55\n", wlc_hw-&gt;unit, val);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;regs-&gt;objaddr, OBJADDR_SHM_SEL | 0);</div><div class='del'>-	(void)R_REG(&amp;regs-&gt;objaddr);</div><div class='del'>-	W_REG(&amp;regs-&gt;objdata, w);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);</div><div class='add'>+	(void)bcma_read32(core, D11REGOFFS(objaddr));</div><div class='add'>+	bcma_write32(core, D11REGOFFS(objdata), w);</div><div class='ctx'> </div><div class='ctx'> 	/* clear CFPStart */</div><div class='del'>-	W_REG(&amp;regs-&gt;tsf_cfpstart, 0);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(tsf_cfpstart), 0);</div><div class='ctx'> </div><div class='del'>-	w = R_REG(&amp;regs-&gt;maccontrol);</div><div class='add'>+	w = bcma_read32(core, D11REGOFFS(maccontrol));</div><div class='ctx'> 	if ((w != (MCTL_IHR_EN | MCTL_WAKE)) &amp;&amp;</div><div class='ctx'> 	    (w != (MCTL_IHR_EN | MCTL_GMODE | MCTL_WAKE))) {</div><div class='ctx'> 		wiphy_err(wiphy, "wl%d: validate_chip_access: maccontrol = "</div><div class='hunk'>@@ -2866,38 +2791,38 @@ static bool brcms_b_validate_chip_access(struct brcms_hardware *wlc_hw)</div><div class='ctx'> </div><div class='ctx'> void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on)</div><div class='ctx'> {</div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> </div><div class='ctx'> 	BCMMSG(wlc_hw-&gt;wlc-&gt;wiphy, "wl%d\n", wlc_hw-&gt;unit);</div><div class='ctx'> </div><div class='ctx'> 	tmp = 0;</div><div class='del'>-	regs = wlc_hw-&gt;regs;</div><div class='ctx'> </div><div class='ctx'> 	if (on) {</div><div class='del'>-		if ((wlc_hw-&gt;sih-&gt;chip == BCM4313_CHIP_ID)) {</div><div class='del'>-			OR_REG(&amp;regs-&gt;clk_ctl_st,</div><div class='del'>-			       (CCS_ERSRC_REQ_HT | CCS_ERSRC_REQ_D11PLL |</div><div class='del'>-				CCS_ERSRC_REQ_PHYPLL));</div><div class='del'>-			SPINWAIT((R_REG(&amp;regs-&gt;clk_ctl_st) &amp;</div><div class='del'>-				  (CCS_ERSRC_AVAIL_HT)) != (CCS_ERSRC_AVAIL_HT),</div><div class='add'>+		if ((ai_get_chip_id(wlc_hw-&gt;sih) == BCM4313_CHIP_ID)) {</div><div class='add'>+			bcma_set32(core, D11REGOFFS(clk_ctl_st),</div><div class='add'>+				   CCS_ERSRC_REQ_HT |</div><div class='add'>+				   CCS_ERSRC_REQ_D11PLL |</div><div class='add'>+				   CCS_ERSRC_REQ_PHYPLL);</div><div class='add'>+			SPINWAIT((bcma_read32(core, D11REGOFFS(clk_ctl_st)) &amp;</div><div class='add'>+				  CCS_ERSRC_AVAIL_HT) != CCS_ERSRC_AVAIL_HT,</div><div class='ctx'> 				 PHYPLL_WAIT_US);</div><div class='ctx'> </div><div class='del'>-			tmp = R_REG(&amp;regs-&gt;clk_ctl_st);</div><div class='del'>-			if ((tmp &amp; (CCS_ERSRC_AVAIL_HT)) !=</div><div class='del'>-			    (CCS_ERSRC_AVAIL_HT))</div><div class='add'>+			tmp = bcma_read32(core, D11REGOFFS(clk_ctl_st));</div><div class='add'>+			if ((tmp &amp; CCS_ERSRC_AVAIL_HT) != CCS_ERSRC_AVAIL_HT)</div><div class='ctx'> 				wiphy_err(wlc_hw-&gt;wlc-&gt;wiphy, "%s: turn on PHY"</div><div class='ctx'> 					  " PLL failed\n", __func__);</div><div class='ctx'> 		} else {</div><div class='del'>-			OR_REG(&amp;regs-&gt;clk_ctl_st,</div><div class='del'>-			       (CCS_ERSRC_REQ_D11PLL | CCS_ERSRC_REQ_PHYPLL));</div><div class='del'>-			SPINWAIT((R_REG(&amp;regs-&gt;clk_ctl_st) &amp;</div><div class='add'>+			bcma_set32(core, D11REGOFFS(clk_ctl_st),</div><div class='add'>+				   tmp | CCS_ERSRC_REQ_D11PLL |</div><div class='add'>+				   CCS_ERSRC_REQ_PHYPLL);</div><div class='add'>+			SPINWAIT((bcma_read32(core, D11REGOFFS(clk_ctl_st)) &amp;</div><div class='ctx'> 				  (CCS_ERSRC_AVAIL_D11PLL |</div><div class='ctx'> 				   CCS_ERSRC_AVAIL_PHYPLL)) !=</div><div class='ctx'> 				 (CCS_ERSRC_AVAIL_D11PLL |</div><div class='ctx'> 				  CCS_ERSRC_AVAIL_PHYPLL), PHYPLL_WAIT_US);</div><div class='ctx'> </div><div class='del'>-			tmp = R_REG(&amp;regs-&gt;clk_ctl_st);</div><div class='add'>+			tmp = bcma_read32(core, D11REGOFFS(clk_ctl_st));</div><div class='ctx'> 			if ((tmp &amp;</div><div class='ctx'> 			     (CCS_ERSRC_AVAIL_D11PLL | CCS_ERSRC_AVAIL_PHYPLL))</div><div class='ctx'> 			    !=</div><div class='hunk'>@@ -2911,8 +2836,9 @@ void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on)</div><div class='ctx'> 		 * be requesting it; so we'll deassert the request but</div><div class='ctx'> 		 * not wait for status to comply.</div><div class='ctx'> 		 */</div><div class='del'>-		AND_REG(&amp;regs-&gt;clk_ctl_st, ~CCS_ERSRC_REQ_PHYPLL);</div><div class='del'>-		tmp = R_REG(&amp;regs-&gt;clk_ctl_st);</div><div class='add'>+		bcma_mask32(core, D11REGOFFS(clk_ctl_st),</div><div class='add'>+			    ~CCS_ERSRC_REQ_PHYPLL);</div><div class='add'>+		(void)bcma_read32(core, D11REGOFFS(clk_ctl_st));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2940,7 +2866,7 @@ static void brcms_c_coredisable(struct brcms_hardware *wlc_hw)</div><div class='ctx'> 	brcms_b_core_phypll_ctl(wlc_hw, false);</div><div class='ctx'> </div><div class='ctx'> 	wlc_hw-&gt;clk = false;</div><div class='del'>-	ai_core_disable(wlc_hw-&gt;sih, 0);</div><div class='add'>+	bcma_core_disable(wlc_hw-&gt;d11core, 0);</div><div class='ctx'> 	wlc_phy_hw_clk_state_upd(wlc_hw-&gt;band-&gt;pi, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2964,35 +2890,31 @@ static void brcms_c_flushqueues(struct brcms_c_info *wlc)</div><div class='ctx'> static u16</div><div class='ctx'> brcms_b_read_objmem(struct brcms_hardware *wlc_hw, uint offset, u32 sel)</div><div class='ctx'> {</div><div class='del'>-	struct d11regs __iomem *regs = wlc_hw-&gt;regs;</div><div class='del'>-	u16 __iomem *objdata_lo = (u16 __iomem *)&amp;regs-&gt;objdata;</div><div class='del'>-	u16 __iomem *objdata_hi = objdata_lo + 1;</div><div class='del'>-	u16 v;</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='add'>+	u16 objoff = D11REGOFFS(objdata);</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;regs-&gt;objaddr, sel | (offset &gt;&gt; 2));</div><div class='del'>-	(void)R_REG(&amp;regs-&gt;objaddr);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(objaddr), sel | (offset &gt;&gt; 2));</div><div class='add'>+	(void)bcma_read32(core, D11REGOFFS(objaddr));</div><div class='ctx'> 	if (offset &amp; 2)</div><div class='del'>-		v = R_REG(objdata_hi);</div><div class='del'>-	else</div><div class='del'>-		v = R_REG(objdata_lo);</div><div class='add'>+		objoff += 2;</div><div class='ctx'> </div><div class='del'>-	return v;</div><div class='add'>+	return bcma_read16(core, objoff);</div><div class='add'>+;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> brcms_b_write_objmem(struct brcms_hardware *wlc_hw, uint offset, u16 v,</div><div class='ctx'> 		     u32 sel)</div><div class='ctx'> {</div><div class='del'>-	struct d11regs __iomem *regs = wlc_hw-&gt;regs;</div><div class='del'>-	u16 __iomem *objdata_lo = (u16 __iomem *)&amp;regs-&gt;objdata;</div><div class='del'>-	u16 __iomem *objdata_hi = objdata_lo + 1;</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='add'>+	u16 objoff = D11REGOFFS(objdata);</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;regs-&gt;objaddr, sel | (offset &gt;&gt; 2));</div><div class='del'>-	(void)R_REG(&amp;regs-&gt;objaddr);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(objaddr), sel | (offset &gt;&gt; 2));</div><div class='add'>+	(void)bcma_read32(core, D11REGOFFS(objaddr));</div><div class='ctx'> 	if (offset &amp; 2)</div><div class='del'>-		W_REG(objdata_hi, v);</div><div class='del'>-	else</div><div class='del'>-		W_REG(objdata_lo, v);</div><div class='add'>+		objoff += 2;</div><div class='add'>+</div><div class='add'>+	bcma_write16(core, objoff, v);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3078,14 +3000,14 @@ static void brcms_b_retrylimit_upd(struct brcms_hardware *wlc_hw,</div><div class='ctx'> </div><div class='ctx'> 	/* write retry limit to SCR, shouldn't need to suspend */</div><div class='ctx'> 	if (wlc_hw-&gt;up) {</div><div class='del'>-		W_REG(&amp;wlc_hw-&gt;regs-&gt;objaddr,</div><div class='del'>-		      OBJADDR_SCR_SEL | S_DOT11_SRC_LMT);</div><div class='del'>-		(void)R_REG(&amp;wlc_hw-&gt;regs-&gt;objaddr);</div><div class='del'>-		W_REG(&amp;wlc_hw-&gt;regs-&gt;objdata, wlc_hw-&gt;SRL);</div><div class='del'>-		W_REG(&amp;wlc_hw-&gt;regs-&gt;objaddr,</div><div class='del'>-		      OBJADDR_SCR_SEL | S_DOT11_LRC_LMT);</div><div class='del'>-		(void)R_REG(&amp;wlc_hw-&gt;regs-&gt;objaddr);</div><div class='del'>-		W_REG(&amp;wlc_hw-&gt;regs-&gt;objdata, wlc_hw-&gt;LRL);</div><div class='add'>+		bcma_write32(wlc_hw-&gt;d11core, D11REGOFFS(objaddr),</div><div class='add'>+			     OBJADDR_SCR_SEL | S_DOT11_SRC_LMT);</div><div class='add'>+		(void)bcma_read32(wlc_hw-&gt;d11core, D11REGOFFS(objaddr));</div><div class='add'>+		bcma_write32(wlc_hw-&gt;d11core, D11REGOFFS(objdata), wlc_hw-&gt;SRL);</div><div class='add'>+		bcma_write32(wlc_hw-&gt;d11core, D11REGOFFS(objaddr),</div><div class='add'>+			     OBJADDR_SCR_SEL | S_DOT11_LRC_LMT);</div><div class='add'>+		(void)bcma_read32(wlc_hw-&gt;d11core, D11REGOFFS(objaddr));</div><div class='add'>+		bcma_write32(wlc_hw-&gt;d11core, D11REGOFFS(objdata), wlc_hw-&gt;LRL);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3132,7 +3054,7 @@ static bool brcms_c_ps_allowed(struct brcms_c_info *wlc)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* disallow PS when one of these meets when not scanning */</div><div class='del'>-	if (wlc-&gt;monitor)</div><div class='add'>+	if (wlc-&gt;filter_flags &amp; FIF_PROMISC_IN_BSS)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;associated) {</div><div class='hunk'>@@ -3267,9 +3189,9 @@ void brcms_c_init_scb(struct scb *scb)</div><div class='ctx'> static void brcms_b_coreinit(struct brcms_c_info *wlc)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_hardware *wlc_hw = wlc-&gt;hw;</div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='ctx'> 	u32 sflags;</div><div class='del'>-	uint bcnint_us;</div><div class='add'>+	u32 bcnint_us;</div><div class='ctx'> 	uint i = 0;</div><div class='ctx'> 	bool fifosz_fixup = false;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -3277,8 +3199,6 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)</div><div class='ctx'> 	struct wiphy *wiphy = wlc-&gt;wiphy;</div><div class='ctx'> 	struct brcms_ucode *ucode = &amp;wlc_hw-&gt;wlc-&gt;wl-&gt;ucode;</div><div class='ctx'> </div><div class='del'>-	regs = wlc_hw-&gt;regs;</div><div class='del'>-</div><div class='ctx'> 	BCMMSG(wlc-&gt;wiphy, "wl%d\n", wlc_hw-&gt;unit);</div><div class='ctx'> </div><div class='ctx'> 	/* reset PSM */</div><div class='hunk'>@@ -3291,20 +3211,20 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)</div><div class='ctx'> 	fifosz_fixup = true;</div><div class='ctx'> </div><div class='ctx'> 	/* let the PSM run to the suspended state, set mode to BSS STA */</div><div class='del'>-	W_REG(&amp;regs-&gt;macintstatus, -1);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(macintstatus), -1);</div><div class='ctx'> 	brcms_b_mctrl(wlc_hw, ~0,</div><div class='ctx'> 		       (MCTL_IHR_EN | MCTL_INFRA | MCTL_PSM_RUN | MCTL_WAKE));</div><div class='ctx'> </div><div class='ctx'> 	/* wait for ucode to self-suspend after auto-init */</div><div class='del'>-	SPINWAIT(((R_REG(&amp;regs-&gt;macintstatus) &amp; MI_MACSSPNDD) == 0),</div><div class='del'>-		 1000 * 1000);</div><div class='del'>-	if ((R_REG(&amp;regs-&gt;macintstatus) &amp; MI_MACSSPNDD) == 0)</div><div class='add'>+	SPINWAIT(((bcma_read32(core, D11REGOFFS(macintstatus)) &amp;</div><div class='add'>+		   MI_MACSSPNDD) == 0), 1000 * 1000);</div><div class='add'>+	if ((bcma_read32(core, D11REGOFFS(macintstatus)) &amp; MI_MACSSPNDD) == 0)</div><div class='ctx'> 		wiphy_err(wiphy, "wl%d: wlc_coreinit: ucode did not self-"</div><div class='ctx'> 			  "suspend!\n", wlc_hw-&gt;unit);</div><div class='ctx'> </div><div class='ctx'> 	brcms_c_gpio_init(wlc);</div><div class='ctx'> </div><div class='del'>-	sflags = ai_core_sflags(wlc_hw-&gt;sih, 0, 0);</div><div class='add'>+	sflags = bcma_aread32(core, BCMA_IOST);</div><div class='ctx'> </div><div class='ctx'> 	if (D11REV_IS(wlc_hw-&gt;corerev, 23)) {</div><div class='ctx'> 		if (BRCMS_ISNPHY(wlc_hw-&gt;band))</div><div class='hunk'>@@ -3368,7 +3288,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)</div><div class='ctx'> 			  wlc_hw-&gt;xmtfifo_sz[i], i);</div><div class='ctx'> </div><div class='ctx'> 	/* make sure we can still talk to the mac */</div><div class='del'>-	WARN_ON(R_REG(&amp;regs-&gt;maccontrol) == 0xffffffff);</div><div class='add'>+	WARN_ON(bcma_read32(core, D11REGOFFS(maccontrol)) == 0xffffffff);</div><div class='ctx'> </div><div class='ctx'> 	/* band-specific inits done by wlc_bsinit() */</div><div class='ctx'> </div><div class='hunk'>@@ -3377,7 +3297,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)</div><div class='ctx'> 	brcms_b_write_shm(wlc_hw, M_MAX_ANTCNT, ANTCNT);</div><div class='ctx'> </div><div class='ctx'> 	/* enable one rx interrupt per received frame */</div><div class='del'>-	W_REG(&amp;regs-&gt;intrcvlazy[0], (1 &lt;&lt; IRL_FC_SHIFT));</div><div class='add'>+	bcma_write32(core, D11REGOFFS(intrcvlazy[0]), (1 &lt;&lt; IRL_FC_SHIFT));</div><div class='ctx'> </div><div class='ctx'> 	/* set the station mode (BSS STA) */</div><div class='ctx'> 	brcms_b_mctrl(wlc_hw,</div><div class='hunk'>@@ -3386,19 +3306,21 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)</div><div class='ctx'> </div><div class='ctx'> 	/* set up Beacon interval */</div><div class='ctx'> 	bcnint_us = 0x8000 &lt;&lt; 10;</div><div class='del'>-	W_REG(&amp;regs-&gt;tsf_cfprep, (bcnint_us &lt;&lt; CFPREP_CBI_SHIFT));</div><div class='del'>-	W_REG(&amp;regs-&gt;tsf_cfpstart, bcnint_us);</div><div class='del'>-	W_REG(&amp;regs-&gt;macintstatus, MI_GP1);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(tsf_cfprep),</div><div class='add'>+		     (bcnint_us &lt;&lt; CFPREP_CBI_SHIFT));</div><div class='add'>+	bcma_write32(core, D11REGOFFS(tsf_cfpstart), bcnint_us);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(macintstatus), MI_GP1);</div><div class='ctx'> </div><div class='ctx'> 	/* write interrupt mask */</div><div class='del'>-	W_REG(&amp;regs-&gt;intctrlregs[RX_FIFO].intmask, DEF_RXINTMASK);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(intctrlregs[RX_FIFO].intmask),</div><div class='add'>+		     DEF_RXINTMASK);</div><div class='ctx'> </div><div class='ctx'> 	/* allow the MAC to control the PHY clock (dynamic on/off) */</div><div class='ctx'> 	brcms_b_macphyclk_set(wlc_hw, ON);</div><div class='ctx'> </div><div class='ctx'> 	/* program dynamic clock control fast powerup delay register */</div><div class='ctx'> 	wlc-&gt;fastpwrup_dly = ai_clkctl_fast_pwrup_delay(wlc_hw-&gt;sih);</div><div class='del'>-	W_REG(&amp;regs-&gt;scc_fastpwrup_dly, wlc-&gt;fastpwrup_dly);</div><div class='add'>+	bcma_write16(core, D11REGOFFS(scc_fastpwrup_dly), wlc-&gt;fastpwrup_dly);</div><div class='ctx'> </div><div class='ctx'> 	/* tell the ucode the corerev */</div><div class='ctx'> 	brcms_b_write_shm(wlc_hw, M_MACHW_VER, (u16) wlc_hw-&gt;corerev);</div><div class='hunk'>@@ -3411,19 +3333,21 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)</div><div class='ctx'> 				      machwcap &gt;&gt; 16) &amp; 0xffff));</div><div class='ctx'> </div><div class='ctx'> 	/* write retry limits to SCR, this done after PSM init */</div><div class='del'>-	W_REG(&amp;regs-&gt;objaddr, OBJADDR_SCR_SEL | S_DOT11_SRC_LMT);</div><div class='del'>-	(void)R_REG(&amp;regs-&gt;objaddr);</div><div class='del'>-	W_REG(&amp;regs-&gt;objdata, wlc_hw-&gt;SRL);</div><div class='del'>-	W_REG(&amp;regs-&gt;objaddr, OBJADDR_SCR_SEL | S_DOT11_LRC_LMT);</div><div class='del'>-	(void)R_REG(&amp;regs-&gt;objaddr);</div><div class='del'>-	W_REG(&amp;regs-&gt;objdata, wlc_hw-&gt;LRL);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(objaddr),</div><div class='add'>+		     OBJADDR_SCR_SEL | S_DOT11_SRC_LMT);</div><div class='add'>+	(void)bcma_read32(core, D11REGOFFS(objaddr));</div><div class='add'>+	bcma_write32(core, D11REGOFFS(objdata), wlc_hw-&gt;SRL);</div><div class='add'>+	bcma_write32(core, D11REGOFFS(objaddr),</div><div class='add'>+		     OBJADDR_SCR_SEL | S_DOT11_LRC_LMT);</div><div class='add'>+	(void)bcma_read32(core, D11REGOFFS(objaddr));</div><div class='add'>+	bcma_write32(core, D11REGOFFS(objdata), wlc_hw-&gt;LRL);</div><div class='ctx'> </div><div class='ctx'> 	/* write rate fallback retry limits */</div><div class='ctx'> 	brcms_b_write_shm(wlc_hw, M_SFRMTXCNTFBRTHSD, wlc_hw-&gt;SFBL);</div><div class='ctx'> 	brcms_b_write_shm(wlc_hw, M_LFRMTXCNTFBRTHSD, wlc_hw-&gt;LFBL);</div><div class='ctx'> </div><div class='del'>-	AND_REG(&amp;regs-&gt;ifs_ctl, 0x0FFF);</div><div class='del'>-	W_REG(&amp;regs-&gt;ifs_aifsn, EDCF_AIFSN_MIN);</div><div class='add'>+	bcma_mask16(core, D11REGOFFS(ifs_ctl), 0x0FFF);</div><div class='add'>+	bcma_write16(core, D11REGOFFS(ifs_aifsn), EDCF_AIFSN_MIN);</div><div class='ctx'> </div><div class='ctx'> 	/* init the tx dma engines */</div><div class='ctx'> 	for (i = 0; i &lt; NFIFO; i++) {</div><div class='hunk'>@@ -3437,8 +3361,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='del'>-static brcms_b_init(struct brcms_hardware *wlc_hw, u16 chanspec,</div><div class='del'>-			  bool mute) {</div><div class='add'>+static brcms_b_init(struct brcms_hardware *wlc_hw, u16 chanspec) {</div><div class='ctx'> 	u32 macintmask;</div><div class='ctx'> 	bool fastclk;</div><div class='ctx'> 	struct brcms_c_info *wlc = wlc_hw-&gt;wlc;</div><div class='hunk'>@@ -3463,10 +3386,6 @@ static brcms_b_init(struct brcms_hardware *wlc_hw, u16 chanspec,</div><div class='ctx'> 	/* core-specific initialization */</div><div class='ctx'> 	brcms_b_coreinit(wlc);</div><div class='ctx'> </div><div class='del'>-	/* suspend the tx fifos and mute the phy for preism cac time */</div><div class='del'>-	if (mute)</div><div class='del'>-		brcms_b_mute(wlc_hw, ON, PHY_MUTE_FOR_PREISM);</div><div class='del'>-</div><div class='ctx'> 	/* band-specific inits */</div><div class='ctx'> 	brcms_b_bsinit(wlc, chanspec);</div><div class='ctx'> </div><div class='hunk'>@@ -3656,42 +3575,32 @@ static void brcms_c_bandinit_ordered(struct brcms_c_info *wlc,</div><div class='ctx'> 	brcms_c_set_phy_chanspec(wlc, chanspec);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void brcms_c_mac_bcn_promisc(struct brcms_c_info *wlc)</div><div class='del'>-{</div><div class='del'>-	if (wlc-&gt;bcnmisc_monitor)</div><div class='del'>-		brcms_b_mctrl(wlc-&gt;hw, MCTL_BCNS_PROMISC, MCTL_BCNS_PROMISC);</div><div class='del'>-	else</div><div class='del'>-		brcms_b_mctrl(wlc-&gt;hw, MCTL_BCNS_PROMISC, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void brcms_c_mac_bcn_promisc_change(struct brcms_c_info *wlc, bool promisc)</div><div class='del'>-{</div><div class='del'>-	wlc-&gt;bcnmisc_monitor = promisc;</div><div class='del'>-	brcms_c_mac_bcn_promisc(wlc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set or clear maccontrol bits MCTL_PROMISC and MCTL_KEEPCONTROL */</div><div class='del'>-static void brcms_c_mac_promisc(struct brcms_c_info *wlc)</div><div class='add'>+/*</div><div class='add'>+ * Set or clear filtering related maccontrol bits based on</div><div class='add'>+ * specified filter flags</div><div class='add'>+ */</div><div class='add'>+void brcms_c_mac_promisc(struct brcms_c_info *wlc, uint filter_flags)</div><div class='ctx'> {</div><div class='ctx'> 	u32 promisc_bits = 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * promiscuous mode just sets MCTL_PROMISC</div><div class='del'>-	 * Note: APs get all BSS traffic without the need to set</div><div class='del'>-	 * the MCTL_PROMISC bit since all BSS data traffic is</div><div class='del'>-	 * directed at the AP</div><div class='del'>-	 */</div><div class='del'>-	if (wlc-&gt;pub-&gt;promisc)</div><div class='add'>+	wlc-&gt;filter_flags = filter_flags;</div><div class='add'>+</div><div class='add'>+	if (filter_flags &amp; (FIF_PROMISC_IN_BSS | FIF_OTHER_BSS))</div><div class='ctx'> 		promisc_bits |= MCTL_PROMISC;</div><div class='ctx'> </div><div class='del'>-	/* monitor mode needs both MCTL_PROMISC and MCTL_KEEPCONTROL</div><div class='del'>-	 * Note: monitor mode also needs MCTL_BCNS_PROMISC, but that is</div><div class='del'>-	 * handled in brcms_c_mac_bcn_promisc()</div><div class='del'>-	 */</div><div class='del'>-	if (wlc-&gt;monitor)</div><div class='del'>-		promisc_bits |= MCTL_PROMISC | MCTL_KEEPCONTROL;</div><div class='add'>+	if (filter_flags &amp; FIF_BCN_PRBRESP_PROMISC)</div><div class='add'>+		promisc_bits |= MCTL_BCNS_PROMISC;</div><div class='add'>+</div><div class='add'>+	if (filter_flags &amp; FIF_FCSFAIL)</div><div class='add'>+		promisc_bits |= MCTL_KEEPBADFCS;</div><div class='ctx'> </div><div class='del'>-	brcms_b_mctrl(wlc-&gt;hw, MCTL_PROMISC | MCTL_KEEPCONTROL, promisc_bits);</div><div class='add'>+	if (filter_flags &amp; (FIF_CONTROL | FIF_PSPOLL))</div><div class='add'>+		promisc_bits |= MCTL_KEEPCONTROL;</div><div class='add'>+</div><div class='add'>+	brcms_b_mctrl(wlc-&gt;hw,</div><div class='add'>+		MCTL_PROMISC | MCTL_BCNS_PROMISC |</div><div class='add'>+		MCTL_KEEPCONTROL | MCTL_KEEPBADFCS,</div><div class='add'>+		promisc_bits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3721,10 +3630,6 @@ static void brcms_c_ucode_mac_upd(struct brcms_c_info *wlc)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* disable an active IBSS if we are not on the home channel */</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* update the various promisc bits */</div><div class='del'>-	brcms_c_mac_bcn_promisc(wlc);</div><div class='del'>-	brcms_c_mac_promisc(wlc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void brcms_c_write_rate_shm(struct brcms_c_info *wlc, u8 rate,</div><div class='hunk'>@@ -3899,7 +3804,7 @@ static void brcms_c_set_ps_ctrl(struct brcms_c_info *wlc)</div><div class='ctx'> </div><div class='ctx'> 	BCMMSG(wlc-&gt;wiphy, "wl%d: hps %d\n", wlc-&gt;pub-&gt;unit, hps);</div><div class='ctx'> </div><div class='del'>-	v1 = R_REG(&amp;wlc-&gt;regs-&gt;maccontrol);</div><div class='add'>+	v1 = bcma_read32(wlc-&gt;hw-&gt;d11core, D11REGOFFS(maccontrol));</div><div class='ctx'> 	v2 = MCTL_WAKE;</div><div class='ctx'> 	if (hps)</div><div class='ctx'> 		v2 |= MCTL_HPS;</div><div class='hunk'>@@ -3979,7 +3884,7 @@ static void brcms_c_set_home_chanspec(struct brcms_c_info *wlc, u16 chanspec)</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> brcms_b_set_chanspec(struct brcms_hardware *wlc_hw, u16 chanspec,</div><div class='del'>-		      bool mute, struct txpwr_limits *txpwr)</div><div class='add'>+		      bool mute_tx, struct txpwr_limits *txpwr)</div><div class='ctx'> {</div><div class='ctx'> 	uint bandunit;</div><div class='ctx'> </div><div class='hunk'>@@ -4005,7 +3910,7 @@ brcms_b_set_chanspec(struct brcms_hardware *wlc_hw, u16 chanspec,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wlc_phy_initcal_enable(wlc_hw-&gt;band-&gt;pi, !mute);</div><div class='add'>+	wlc_phy_initcal_enable(wlc_hw-&gt;band-&gt;pi, !mute_tx);</div><div class='ctx'> </div><div class='ctx'> 	if (!wlc_hw-&gt;up) {</div><div class='ctx'> 		if (wlc_hw-&gt;clk)</div><div class='hunk'>@@ -4017,7 +3922,7 @@ brcms_b_set_chanspec(struct brcms_hardware *wlc_hw, u16 chanspec,</div><div class='ctx'> 		wlc_phy_txpower_limit_set(wlc_hw-&gt;band-&gt;pi, txpwr, chanspec);</div><div class='ctx'> </div><div class='ctx'> 		/* Update muting of the channel */</div><div class='del'>-		brcms_b_mute(wlc_hw, mute, 0);</div><div class='add'>+		brcms_b_mute(wlc_hw, mute_tx);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4205,7 +4110,7 @@ void brcms_c_wme_setparams(struct brcms_c_info *wlc, u16 aci,</div><div class='ctx'> 	    EDCF_TXOP2USEC(acp_shm.txop);</div><div class='ctx'> 	acp_shm.aifs = (params-&gt;aifs &amp; EDCF_AIFSN_MASK);</div><div class='ctx'> </div><div class='del'>-	if (aci == AC_VI &amp;&amp; acp_shm.txop == 0</div><div class='add'>+	if (aci == IEEE80211_AC_VI &amp;&amp; acp_shm.txop == 0</div><div class='ctx'> 	    &amp;&amp; acp_shm.aifs &lt; EDCF_AIFSN_MAX)</div><div class='ctx'> 		acp_shm.aifs++;</div><div class='ctx'> </div><div class='hunk'>@@ -4218,7 +4123,8 @@ void brcms_c_wme_setparams(struct brcms_c_info *wlc, u16 aci,</div><div class='ctx'> 		acp_shm.cwmax = params-&gt;cw_max;</div><div class='ctx'> 		acp_shm.cwcur = acp_shm.cwmin;</div><div class='ctx'> 		acp_shm.bslots =</div><div class='del'>-		    R_REG(&amp;wlc-&gt;regs-&gt;tsf_random) &amp; acp_shm.cwcur;</div><div class='add'>+			bcma_read16(wlc-&gt;hw-&gt;d11core, D11REGOFFS(tsf_random)) &amp;</div><div class='add'>+			acp_shm.cwcur;</div><div class='ctx'> 		acp_shm.reggap = acp_shm.bslots + acp_shm.aifs;</div><div class='ctx'> 		/* Indicate the new params to the ucode */</div><div class='ctx'> 		acp_shm.status = brcms_b_read_shm(wlc-&gt;hw, (M_EDCF_QINFO +</div><div class='hunk'>@@ -4242,7 +4148,7 @@ void brcms_c_wme_setparams(struct brcms_c_info *wlc, u16 aci,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void brcms_c_edcf_setparams(struct brcms_c_info *wlc, bool suspend)</div><div class='add'>+static void brcms_c_edcf_setparams(struct brcms_c_info *wlc, bool suspend)</div><div class='ctx'> {</div><div class='ctx'> 	u16 aci;</div><div class='ctx'> 	int i_ac;</div><div class='hunk'>@@ -4255,7 +4161,7 @@ void brcms_c_edcf_setparams(struct brcms_c_info *wlc, bool suspend)</div><div class='ctx'> 	}; /* ucode needs these parameters during its initialization */</div><div class='ctx'> 	const struct edcf_acparam *edcf_acp = &amp;default_edcf_acparams[0];</div><div class='ctx'> </div><div class='del'>-	for (i_ac = 0; i_ac &lt; AC_COUNT; i_ac++, edcf_acp++) {</div><div class='add'>+	for (i_ac = 0; i_ac &lt; IEEE80211_NUM_ACS; i_ac++, edcf_acp++) {</div><div class='ctx'> 		/* find out which ac this set of params applies to */</div><div class='ctx'> 		aci = (edcf_acp-&gt;ACI &amp; EDCF_ACI_MASK) &gt;&gt; EDCF_ACI_SHIFT;</div><div class='ctx'> </div><div class='hunk'>@@ -4277,17 +4183,6 @@ void brcms_c_edcf_setparams(struct brcms_c_info *wlc, bool suspend)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* maintain LED behavior in down state */</div><div class='del'>-static void brcms_c_down_led_upd(struct brcms_c_info *wlc)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * maintain LEDs while in down state, turn on sbclk if</div><div class='del'>-	 * not available yet. Turn on sbclk if necessary</div><div class='del'>-	 */</div><div class='del'>-	brcms_b_pllreq(wlc-&gt;hw, true, BRCMS_PLLREQ_FLIP);</div><div class='del'>-	brcms_b_pllreq(wlc-&gt;hw, false, BRCMS_PLLREQ_FLIP);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void brcms_c_radio_monitor_start(struct brcms_c_info *wlc)</div><div class='ctx'> {</div><div class='ctx'> 	/* Don't start the timer if HWRADIO feature is disabled */</div><div class='hunk'>@@ -4299,28 +4194,6 @@ static void brcms_c_radio_monitor_start(struct brcms_c_info *wlc)</div><div class='ctx'> 	brcms_add_timer(wlc-&gt;radio_timer, TIMER_INTERVAL_RADIOCHK, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void brcms_c_radio_disable(struct brcms_c_info *wlc)</div><div class='del'>-{</div><div class='del'>-	if (!wlc-&gt;pub-&gt;up) {</div><div class='del'>-		brcms_c_down_led_upd(wlc);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	brcms_c_radio_monitor_start(wlc);</div><div class='del'>-	brcms_down(wlc-&gt;wl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void brcms_c_radio_enable(struct brcms_c_info *wlc)</div><div class='del'>-{</div><div class='del'>-	if (wlc-&gt;pub-&gt;up)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (brcms_deviceremoved(wlc))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	brcms_up(wlc-&gt;wl);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool brcms_c_radio_monitor_stop(struct brcms_c_info *wlc)</div><div class='ctx'> {</div><div class='ctx'> 	if (!wlc-&gt;radio_monitor)</div><div class='hunk'>@@ -4343,18 +4216,6 @@ static void brcms_c_radio_hwdisable_upd(struct brcms_c_info *wlc)</div><div class='ctx'> 		mboolclr(wlc-&gt;pub-&gt;radio_disabled, WL_RADIO_HW_DISABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * centralized radio disable/enable function,</div><div class='del'>- * invoke radio enable/disable after updating hwradio status</div><div class='del'>- */</div><div class='del'>-static void brcms_c_radio_upd(struct brcms_c_info *wlc)</div><div class='del'>-{</div><div class='del'>-	if (wlc-&gt;pub-&gt;radio_disabled)</div><div class='del'>-		brcms_c_radio_disable(wlc);</div><div class='del'>-	else</div><div class='del'>-		brcms_c_radio_enable(wlc);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* update hwradio status and return it */</div><div class='ctx'> bool brcms_c_check_radio_disabled(struct brcms_c_info *wlc)</div><div class='ctx'> {</div><div class='hunk'>@@ -4376,12 +4237,7 @@ static void brcms_c_radio_timer(void *arg)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* cap mpc off count */</div><div class='del'>-	if (wlc-&gt;mpc_offcnt &lt; BRCMS_MPC_MAX_DELAYCNT)</div><div class='del'>-		wlc-&gt;mpc_offcnt++;</div><div class='del'>-</div><div class='ctx'> 	brcms_c_radio_hwdisable_upd(wlc);</div><div class='del'>-	brcms_c_radio_upd(wlc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* common low-level watchdog code */</div><div class='hunk'>@@ -4407,60 +4263,6 @@ static void brcms_b_watchdog(void *arg)</div><div class='ctx'> 	wlc_phy_watchdog(wlc_hw-&gt;band-&gt;pi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void brcms_c_radio_mpc_upd(struct brcms_c_info *wlc)</div><div class='del'>-{</div><div class='del'>-	bool mpc_radio, radio_state;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Clear the WL_RADIO_MPC_DISABLE bit when mpc feature is disabled</div><div class='del'>-	 * in case the WL_RADIO_MPC_DISABLE bit was set. Stop the radio</div><div class='del'>-	 * monitor also when WL_RADIO_MPC_DISABLE is the only reason that</div><div class='del'>-	 * the radio is going down.</div><div class='del'>-	 */</div><div class='del'>-	if (!wlc-&gt;mpc) {</div><div class='del'>-		if (!wlc-&gt;pub-&gt;radio_disabled)</div><div class='del'>-			return;</div><div class='del'>-		mboolclr(wlc-&gt;pub-&gt;radio_disabled, WL_RADIO_MPC_DISABLE);</div><div class='del'>-		brcms_c_radio_upd(wlc);</div><div class='del'>-		if (!wlc-&gt;pub-&gt;radio_disabled)</div><div class='del'>-			brcms_c_radio_monitor_stop(wlc);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * sync ismpc logic with WL_RADIO_MPC_DISABLE bit in</div><div class='del'>-	 * wlc-&gt;pub-&gt;radio_disabled to go ON, always call radio_upd</div><div class='del'>-	 * synchronously to go OFF, postpone radio_upd to later when</div><div class='del'>-	 * context is safe(e.g. watchdog)</div><div class='del'>-	 */</div><div class='del'>-	radio_state =</div><div class='del'>-	    (mboolisset(wlc-&gt;pub-&gt;radio_disabled, WL_RADIO_MPC_DISABLE) ? OFF :</div><div class='del'>-	     ON);</div><div class='del'>-	mpc_radio = (brcms_c_ismpc(wlc) == true) ? OFF : ON;</div><div class='del'>-</div><div class='del'>-	if (radio_state == ON &amp;&amp; mpc_radio == OFF)</div><div class='del'>-		wlc-&gt;mpc_delay_off = wlc-&gt;mpc_dlycnt;</div><div class='del'>-	else if (radio_state == OFF &amp;&amp; mpc_radio == ON) {</div><div class='del'>-		mboolclr(wlc-&gt;pub-&gt;radio_disabled, WL_RADIO_MPC_DISABLE);</div><div class='del'>-		brcms_c_radio_upd(wlc);</div><div class='del'>-		if (wlc-&gt;mpc_offcnt &lt; BRCMS_MPC_THRESHOLD)</div><div class='del'>-			wlc-&gt;mpc_dlycnt = BRCMS_MPC_MAX_DELAYCNT;</div><div class='del'>-		else</div><div class='del'>-			wlc-&gt;mpc_dlycnt = BRCMS_MPC_MIN_DELAYCNT;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Below logic is meant to capture the transition from mpc off</div><div class='del'>-	 * to mpc on for reasons other than wlc-&gt;mpc_delay_off keeping</div><div class='del'>-	 * the mpc off. In that case reset wlc-&gt;mpc_delay_off to</div><div class='del'>-	 * wlc-&gt;mpc_dlycnt, so that we restart the countdown of mpc_delay_off</div><div class='del'>-	 */</div><div class='del'>-	if ((wlc-&gt;prev_non_delay_mpc == false) &amp;&amp;</div><div class='del'>-	    (brcms_c_is_non_delay_mpc(wlc) == true) &amp;&amp; wlc-&gt;mpc_delay_off)</div><div class='del'>-		wlc-&gt;mpc_delay_off = wlc-&gt;mpc_dlycnt;</div><div class='del'>-</div><div class='del'>-	wlc-&gt;prev_non_delay_mpc = brcms_c_is_non_delay_mpc(wlc);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* common watchdog code */</div><div class='ctx'> static void brcms_c_watchdog(void *arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -4481,21 +4283,7 @@ static void brcms_c_watchdog(void *arg)</div><div class='ctx'> 	/* increment second count */</div><div class='ctx'> 	wlc-&gt;pub-&gt;now++;</div><div class='ctx'> </div><div class='del'>-	/* delay radio disable */</div><div class='del'>-	if (wlc-&gt;mpc_delay_off) {</div><div class='del'>-		if (--wlc-&gt;mpc_delay_off == 0) {</div><div class='del'>-			mboolset(wlc-&gt;pub-&gt;radio_disabled,</div><div class='del'>-				 WL_RADIO_MPC_DISABLE);</div><div class='del'>-			if (wlc-&gt;mpc &amp;&amp; brcms_c_ismpc(wlc))</div><div class='del'>-				wlc-&gt;mpc_offcnt = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* mpc sync */</div><div class='del'>-	brcms_c_radio_mpc_upd(wlc);</div><div class='del'>-	/* radio sync: sw/hw/mpc --&gt; radio_disable/radio_enable */</div><div class='ctx'> 	brcms_c_radio_hwdisable_upd(wlc);</div><div class='del'>-	brcms_c_radio_upd(wlc);</div><div class='ctx'> 	/* if radio is disable, driver may be down, quit here */</div><div class='ctx'> 	if (wlc-&gt;pub-&gt;radio_disabled)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -4599,9 +4387,6 @@ static void brcms_c_info_init(struct brcms_c_info *wlc, int unit)</div><div class='ctx'> 	/* WME QoS mode is Auto by default */</div><div class='ctx'> 	wlc-&gt;pub-&gt;_ampdu = AMPDU_AGG_HOST;</div><div class='ctx'> 	wlc-&gt;pub-&gt;bcmerror = 0;</div><div class='del'>-</div><div class='del'>-	/* initialize mpc delay */</div><div class='del'>-	wlc-&gt;mpc_delay_off = wlc-&gt;mpc_dlycnt = BRCMS_MPC_MIN_DELAYCNT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static uint brcms_c_attach_module(struct brcms_c_info *wlc)</div><div class='hunk'>@@ -4647,21 +4432,21 @@ struct brcms_pub *brcms_c_pub(struct brcms_c_info *wlc)</div><div class='ctx'>  *    initialize software state for each core and band</div><div class='ctx'>  *    put the whole chip in reset(driver down state), no clock</div><div class='ctx'>  */</div><div class='del'>-static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,</div><div class='del'>-			  uint unit, bool piomode, void __iomem *regsva,</div><div class='del'>-			  struct pci_dev *btparam)</div><div class='add'>+static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core,</div><div class='add'>+			  uint unit, bool piomode)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_hardware *wlc_hw;</div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='ctx'> 	char *macaddr = NULL;</div><div class='ctx'> 	uint err = 0;</div><div class='ctx'> 	uint j;</div><div class='ctx'> 	bool wme = false;</div><div class='ctx'> 	struct shared_phy_params sha_params;</div><div class='ctx'> 	struct wiphy *wiphy = wlc-&gt;wiphy;</div><div class='add'>+	struct pci_dev *pcidev = core-&gt;bus-&gt;host_pci;</div><div class='ctx'> </div><div class='del'>-	BCMMSG(wlc-&gt;wiphy, "wl%d: vendor 0x%x device 0x%x\n", unit, vendor,</div><div class='del'>-		device);</div><div class='add'>+	BCMMSG(wlc-&gt;wiphy, "wl%d: vendor 0x%x device 0x%x\n", unit,</div><div class='add'>+	       pcidev-&gt;vendor,</div><div class='add'>+	       pcidev-&gt;device);</div><div class='ctx'> </div><div class='ctx'> 	wme = true;</div><div class='ctx'> </div><div class='hunk'>@@ -4678,7 +4463,7 @@ static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,</div><div class='ctx'> 	 * Do the hardware portion of the attach. Also initialize software</div><div class='ctx'> 	 * state that depends on the particular hardware we are running.</div><div class='ctx'> 	 */</div><div class='del'>-	wlc_hw-&gt;sih = ai_attach(regsva, btparam);</div><div class='add'>+	wlc_hw-&gt;sih = ai_attach(core-&gt;bus);</div><div class='ctx'> 	if (wlc_hw-&gt;sih == NULL) {</div><div class='ctx'> 		wiphy_err(wiphy, "wl%d: brcms_b_attach: si_attach failed\n",</div><div class='ctx'> 			  unit);</div><div class='hunk'>@@ -4687,25 +4472,19 @@ static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* verify again the device is supported */</div><div class='del'>-	if (!brcms_c_chipmatch(vendor, device)) {</div><div class='add'>+	if (!brcms_c_chipmatch(pcidev-&gt;vendor, pcidev-&gt;device)) {</div><div class='ctx'> 		wiphy_err(wiphy, "wl%d: brcms_b_attach: Unsupported "</div><div class='ctx'> 			"vendor/device (0x%x/0x%x)\n",</div><div class='del'>-			 unit, vendor, device);</div><div class='add'>+			 unit, pcidev-&gt;vendor, pcidev-&gt;device);</div><div class='ctx'> 		err = 12;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wlc_hw-&gt;vendorid = vendor;</div><div class='del'>-	wlc_hw-&gt;deviceid = device;</div><div class='del'>-</div><div class='del'>-	/* set bar0 window to point at D11 core */</div><div class='del'>-	wlc_hw-&gt;regs = (struct d11regs __iomem *)</div><div class='del'>-				ai_setcore(wlc_hw-&gt;sih, D11_CORE_ID, 0);</div><div class='del'>-	wlc_hw-&gt;corerev = ai_corerev(wlc_hw-&gt;sih);</div><div class='add'>+	wlc_hw-&gt;vendorid = pcidev-&gt;vendor;</div><div class='add'>+	wlc_hw-&gt;deviceid = pcidev-&gt;device;</div><div class='ctx'> </div><div class='del'>-	regs = wlc_hw-&gt;regs;</div><div class='del'>-</div><div class='del'>-	wlc-&gt;regs = wlc_hw-&gt;regs;</div><div class='add'>+	wlc_hw-&gt;d11core = core;</div><div class='add'>+	wlc_hw-&gt;corerev = core-&gt;id.rev;</div><div class='ctx'> </div><div class='ctx'> 	/* validate chip, chiprev and corerev */</div><div class='ctx'> 	if (!brcms_c_isgoodchip(wlc_hw)) {</div><div class='hunk'>@@ -4740,8 +4519,9 @@ static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,</div><div class='ctx'> 	wlc_hw-&gt;boardrev = (u16) j;</div><div class='ctx'> 	if (!brcms_c_validboardtype(wlc_hw)) {</div><div class='ctx'> 		wiphy_err(wiphy, "wl%d: brcms_b_attach: Unsupported Broadcom "</div><div class='del'>-			"board type (0x%x)" " or revision level (0x%x)\n",</div><div class='del'>-			 unit, wlc_hw-&gt;sih-&gt;boardtype, wlc_hw-&gt;boardrev);</div><div class='add'>+			  "board type (0x%x)" " or revision level (0x%x)\n",</div><div class='add'>+			  unit, ai_get_boardtype(wlc_hw-&gt;sih),</div><div class='add'>+			  wlc_hw-&gt;boardrev);</div><div class='ctx'> 		err = 15;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4762,7 +4542,7 @@ static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,</div><div class='ctx'> 	else</div><div class='ctx'> 		wlc_hw-&gt;_nbands = 1;</div><div class='ctx'> </div><div class='del'>-	if ((wlc_hw-&gt;sih-&gt;chip == BCM43225_CHIP_ID))</div><div class='add'>+	if ((ai_get_chip_id(wlc_hw-&gt;sih) == BCM43225_CHIP_ID))</div><div class='ctx'> 		wlc_hw-&gt;_nbands = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* BMAC_NOTE: remove init of pub values when brcms_c_attach()</div><div class='hunk'>@@ -4794,16 +4574,14 @@ static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,</div><div class='ctx'> 	sha_params.corerev = wlc_hw-&gt;corerev;</div><div class='ctx'> 	sha_params.vid = wlc_hw-&gt;vendorid;</div><div class='ctx'> 	sha_params.did = wlc_hw-&gt;deviceid;</div><div class='del'>-	sha_params.chip = wlc_hw-&gt;sih-&gt;chip;</div><div class='del'>-	sha_params.chiprev = wlc_hw-&gt;sih-&gt;chiprev;</div><div class='del'>-	sha_params.chippkg = wlc_hw-&gt;sih-&gt;chippkg;</div><div class='add'>+	sha_params.chip = ai_get_chip_id(wlc_hw-&gt;sih);</div><div class='add'>+	sha_params.chiprev = ai_get_chiprev(wlc_hw-&gt;sih);</div><div class='add'>+	sha_params.chippkg = ai_get_chippkg(wlc_hw-&gt;sih);</div><div class='ctx'> 	sha_params.sromrev = wlc_hw-&gt;sromrev;</div><div class='del'>-	sha_params.boardtype = wlc_hw-&gt;sih-&gt;boardtype;</div><div class='add'>+	sha_params.boardtype = ai_get_boardtype(wlc_hw-&gt;sih);</div><div class='ctx'> 	sha_params.boardrev = wlc_hw-&gt;boardrev;</div><div class='del'>-	sha_params.boardvendor = wlc_hw-&gt;sih-&gt;boardvendor;</div><div class='ctx'> 	sha_params.boardflags = wlc_hw-&gt;boardflags;</div><div class='ctx'> 	sha_params.boardflags2 = wlc_hw-&gt;boardflags2;</div><div class='del'>-	sha_params.buscorerev = wlc_hw-&gt;sih-&gt;buscorerev;</div><div class='ctx'> </div><div class='ctx'> 	/* alloc and save pointer to shared phy state area */</div><div class='ctx'> 	wlc_hw-&gt;phy_sh = wlc_phy_shared_attach(&amp;sha_params);</div><div class='hunk'>@@ -4825,9 +4603,9 @@ static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,</div><div class='ctx'> 		wlc_hw-&gt;band-&gt;bandtype = j ? BRCM_BAND_5G : BRCM_BAND_2G;</div><div class='ctx'> 		wlc-&gt;band-&gt;bandunit = j;</div><div class='ctx'> 		wlc-&gt;band-&gt;bandtype = j ? BRCM_BAND_5G : BRCM_BAND_2G;</div><div class='del'>-		wlc-&gt;core-&gt;coreidx = ai_coreidx(wlc_hw-&gt;sih);</div><div class='add'>+		wlc-&gt;core-&gt;coreidx = core-&gt;core_index;</div><div class='ctx'> </div><div class='del'>-		wlc_hw-&gt;machwcap = R_REG(&amp;regs-&gt;machwcap);</div><div class='add'>+		wlc_hw-&gt;machwcap = bcma_read32(core, D11REGOFFS(machwcap));</div><div class='ctx'> 		wlc_hw-&gt;machwcap_backup = wlc_hw-&gt;machwcap;</div><div class='ctx'> </div><div class='ctx'> 		/* init tx fifo size */</div><div class='hunk'>@@ -4836,7 +4614,7 @@ static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,</div><div class='ctx'> </div><div class='ctx'> 		/* Get a phy for this band */</div><div class='ctx'> 		wlc_hw-&gt;band-&gt;pi =</div><div class='del'>-			wlc_phy_attach(wlc_hw-&gt;phy_sh, regs,</div><div class='add'>+			wlc_phy_attach(wlc_hw-&gt;phy_sh, core,</div><div class='ctx'> 				       wlc_hw-&gt;band-&gt;bandtype,</div><div class='ctx'> 				       wlc-&gt;wiphy);</div><div class='ctx'> 		if (wlc_hw-&gt;band-&gt;pi == NULL) {</div><div class='hunk'>@@ -4910,10 +4688,6 @@ static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,</div><div class='ctx'> 	/* Match driver "down" state */</div><div class='ctx'> 	ai_pci_down(wlc_hw-&gt;sih);</div><div class='ctx'> </div><div class='del'>-	/* register sb interrupt callback functions */</div><div class='del'>-	ai_register_intr_callback(wlc_hw-&gt;sih, (void *)brcms_c_wlintrsoff,</div><div class='del'>-				  (void *)brcms_c_wlintrsrestore, NULL, wlc);</div><div class='del'>-</div><div class='ctx'> 	/* turn off pll and xtal to match driver "down" state */</div><div class='ctx'> 	brcms_b_xtal(wlc_hw, OFF);</div><div class='ctx'> </div><div class='hunk'>@@ -4944,10 +4718,9 @@ static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	BCMMSG(wlc-&gt;wiphy,</div><div class='del'>-		 "deviceid 0x%x nbands %d board 0x%x macaddr: %s\n",</div><div class='del'>-		 wlc_hw-&gt;deviceid, wlc_hw-&gt;_nbands,</div><div class='del'>-		 wlc_hw-&gt;sih-&gt;boardtype, macaddr);</div><div class='add'>+	BCMMSG(wlc-&gt;wiphy, "deviceid 0x%x nbands %d board 0x%x macaddr: %s\n",</div><div class='add'>+	       wlc_hw-&gt;deviceid, wlc_hw-&gt;_nbands, ai_get_boardtype(wlc_hw-&gt;sih),</div><div class='add'>+	       macaddr);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='hunk'>@@ -5185,7 +4958,6 @@ static int brcms_b_detach(struct brcms_c_info *wlc)</div><div class='ctx'> 		 * and per-port interrupt object may has been freed. this must</div><div class='ctx'> 		 * be done before sb core switch</div><div class='ctx'> 		 */</div><div class='del'>-		ai_deregister_intr_callback(wlc_hw-&gt;sih);</div><div class='ctx'> 		ai_pci_sleep(wlc_hw-&gt;sih);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5259,9 +5031,6 @@ static void brcms_c_ap_upd(struct brcms_c_info *wlc)</div><div class='ctx'> {</div><div class='ctx'> 	/* STA-BSS; short capable */</div><div class='ctx'> 	wlc-&gt;PLCPHdr_override = BRCMS_PLCP_SHORT;</div><div class='del'>-</div><div class='del'>-	/* fixup mpc */</div><div class='del'>-	wlc-&gt;mpc = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Initialize just the hardware when coming out of POR or S3/S5 system states */</div><div class='hunk'>@@ -5283,13 +5052,11 @@ static void brcms_b_hw_up(struct brcms_hardware *wlc_hw)</div><div class='ctx'> 	ai_pci_fixcfg(wlc_hw-&gt;sih);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * TODO: test suspend/resume</div><div class='add'>+	 *</div><div class='ctx'> 	 * AI chip doesn't restore bar0win2 on</div><div class='ctx'> 	 * hibernation/resume, need sw fixup</div><div class='ctx'> 	 */</div><div class='del'>-	if ((wlc_hw-&gt;sih-&gt;chip == BCM43224_CHIP_ID) ||</div><div class='del'>-	    (wlc_hw-&gt;sih-&gt;chip == BCM43225_CHIP_ID))</div><div class='del'>-		wlc_hw-&gt;regs = (struct d11regs __iomem *)</div><div class='del'>-				ai_setcore(wlc_hw-&gt;sih, D11_CORE_ID, 0);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Inform phy that a POR reset has occurred so</div><div class='hunk'>@@ -5301,7 +5068,7 @@ static void brcms_b_hw_up(struct brcms_hardware *wlc_hw)</div><div class='ctx'> 	wlc_hw-&gt;wlc-&gt;pub-&gt;hw_up = true;</div><div class='ctx'> </div><div class='ctx'> 	if ((wlc_hw-&gt;boardflags &amp; BFL_FEM)</div><div class='del'>-	    &amp;&amp; (wlc_hw-&gt;sih-&gt;chip == BCM4313_CHIP_ID)) {</div><div class='add'>+	    &amp;&amp; (ai_get_chip_id(wlc_hw-&gt;sih) == BCM4313_CHIP_ID)) {</div><div class='ctx'> 		if (!</div><div class='ctx'> 		    (wlc_hw-&gt;boardrev &gt;= 0x1250</div><div class='ctx'> 		     &amp;&amp; (wlc_hw-&gt;boardflags &amp; BFL_FEM_BT)))</div><div class='hunk'>@@ -5376,7 +5143,7 @@ static void brcms_c_wme_retries_write(struct brcms_c_info *wlc)</div><div class='ctx'> 	if (!wlc-&gt;clk)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (ac = 0; ac &lt; AC_COUNT; ac++)</div><div class='add'>+	for (ac = 0; ac &lt; IEEE80211_NUM_ACS; ac++)</div><div class='ctx'> 		brcms_b_write_shm(wlc-&gt;hw, M_AC_TXLMT_ADDR(ac),</div><div class='ctx'> 				  wlc-&gt;wme_retries[ac]);</div><div class='ctx'> }</div><div class='hunk'>@@ -5396,7 +5163,7 @@ int brcms_c_up(struct brcms_c_info *wlc)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((wlc-&gt;pub-&gt;boardflags &amp; BFL_FEM)</div><div class='del'>-	    &amp;&amp; (wlc-&gt;pub-&gt;sih-&gt;chip == BCM4313_CHIP_ID)) {</div><div class='add'>+	    &amp;&amp; (ai_get_chip_id(wlc-&gt;hw-&gt;sih) == BCM4313_CHIP_ID)) {</div><div class='ctx'> 		if (wlc-&gt;pub-&gt;boardrev &gt;= 0x1250</div><div class='ctx'> 		    &amp;&amp; (wlc-&gt;pub-&gt;boardflags &amp; BFL_FEM_BT))</div><div class='ctx'> 			brcms_b_mhf(wlc-&gt;hw, MHF5, MHF5_4313_GPIOCTRL,</div><div class='hunk'>@@ -5533,9 +5300,9 @@ static int brcms_b_down_finish(struct brcms_hardware *wlc_hw)</div><div class='ctx'> 	} else {</div><div class='ctx'> </div><div class='ctx'> 		/* Reset and disable the core */</div><div class='del'>-		if (ai_iscoreup(wlc_hw-&gt;sih)) {</div><div class='del'>-			if (R_REG(&amp;wlc_hw-&gt;regs-&gt;maccontrol) &amp;</div><div class='del'>-			    MCTL_EN_MAC)</div><div class='add'>+		if (bcma_core_is_enabled(wlc_hw-&gt;d11core)) {</div><div class='add'>+			if (bcma_read32(wlc_hw-&gt;d11core,</div><div class='add'>+					D11REGOFFS(maccontrol)) &amp; MCTL_EN_MAC)</div><div class='ctx'> 				brcms_c_suspend_mac_and_wait(wlc_hw-&gt;wlc);</div><div class='ctx'> 			callbacks += brcms_reset(wlc_hw-&gt;wlc-&gt;wl);</div><div class='ctx'> 			brcms_c_coredisable(wlc_hw);</div><div class='hunk'>@@ -5575,7 +5342,6 @@ uint brcms_c_down(struct brcms_c_info *wlc)</div><div class='ctx'> 	if (!wlc-&gt;pub-&gt;up)</div><div class='ctx'> 		return callbacks;</div><div class='ctx'> </div><div class='del'>-	/* in between, mpc could try to bring down again.. */</div><div class='ctx'> 	wlc-&gt;going_down = true;</div><div class='ctx'> </div><div class='ctx'> 	callbacks += brcms_b_bmac_down_prep(wlc-&gt;hw);</div><div class='hunk'>@@ -5852,7 +5618,7 @@ int brcms_c_set_rate_limit(struct brcms_c_info *wlc, u16 srl, u16 lrl)</div><div class='ctx'> </div><div class='ctx'> 	brcms_b_retrylimit_upd(wlc-&gt;hw, wlc-&gt;SRL, wlc-&gt;LRL);</div><div class='ctx'> </div><div class='del'>-	for (ac = 0; ac &lt; AC_COUNT; ac++) {</div><div class='add'>+	for (ac = 0; ac &lt; IEEE80211_NUM_ACS; ac++) {</div><div class='ctx'> 		wlc-&gt;wme_retries[ac] =	SFIELD(wlc-&gt;wme_retries[ac],</div><div class='ctx'> 					       EDCF_SHORT,  wlc-&gt;SRL);</div><div class='ctx'> 		wlc-&gt;wme_retries[ac] =	SFIELD(wlc-&gt;wme_retries[ac],</div><div class='hunk'>@@ -6103,7 +5869,6 @@ void brcms_c_print_txdesc(struct d11txh *txh)</div><div class='ctx'> </div><div class='ctx'> 	u8 *rtsph = txh-&gt;RTSPhyHeader;</div><div class='ctx'> 	struct ieee80211_rts rts = txh-&gt;rts_frame;</div><div class='del'>-	char hexbuf[256];</div><div class='ctx'> </div><div class='ctx'> 	/* add plcp header along with txh descriptor */</div><div class='ctx'> 	printk(KERN_DEBUG "Raw TxDesc + plcp header:\n");</div><div class='hunk'>@@ -6124,17 +5889,16 @@ void brcms_c_print_txdesc(struct d11txh *txh)</div><div class='ctx'> 	printk(KERN_DEBUG "XtraFrameTypes: %04x ", xtraft);</div><div class='ctx'> 	printk(KERN_DEBUG "\n");</div><div class='ctx'> </div><div class='del'>-	brcmu_format_hex(hexbuf, iv, sizeof(txh-&gt;IV));</div><div class='del'>-	printk(KERN_DEBUG "SecIV:       %s\n", hexbuf);</div><div class='del'>-	brcmu_format_hex(hexbuf, ra, sizeof(txh-&gt;TxFrameRA));</div><div class='del'>-	printk(KERN_DEBUG "RA:          %s\n", hexbuf);</div><div class='add'>+	print_hex_dump_bytes("SecIV:", DUMP_PREFIX_OFFSET, iv, sizeof(txh-&gt;IV));</div><div class='add'>+	print_hex_dump_bytes("RA:", DUMP_PREFIX_OFFSET,</div><div class='add'>+			     ra, sizeof(txh-&gt;TxFrameRA));</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_DEBUG "Fb FES Time: %04x ", tfestfb);</div><div class='del'>-	brcmu_format_hex(hexbuf, rtspfb, sizeof(txh-&gt;RTSPLCPFallback));</div><div class='del'>-	printk(KERN_DEBUG "RTS PLCP: %s ", hexbuf);</div><div class='add'>+	print_hex_dump_bytes("Fb RTS PLCP:", DUMP_PREFIX_OFFSET,</div><div class='add'>+			     rtspfb, sizeof(txh-&gt;RTSPLCPFallback));</div><div class='ctx'> 	printk(KERN_DEBUG "RTS DUR: %04x ", rtsdfb);</div><div class='del'>-	brcmu_format_hex(hexbuf, fragpfb, sizeof(txh-&gt;FragPLCPFallback));</div><div class='del'>-	printk(KERN_DEBUG "PLCP: %s ", hexbuf);</div><div class='add'>+	print_hex_dump_bytes("PLCP:", DUMP_PREFIX_OFFSET,</div><div class='add'>+			     fragpfb, sizeof(txh-&gt;FragPLCPFallback));</div><div class='ctx'> 	printk(KERN_DEBUG "DUR: %04x", fragdfb);</div><div class='ctx'> 	printk(KERN_DEBUG "\n");</div><div class='ctx'> </div><div class='hunk'>@@ -6149,18 +5913,18 @@ void brcms_c_print_txdesc(struct d11txh *txh)</div><div class='ctx'> 	printk(KERN_DEBUG "MaxAggbyte_fb:  %04x\n", mabyte_f);</div><div class='ctx'> 	printk(KERN_DEBUG "MinByte:     %04x\n", mmbyte);</div><div class='ctx'> </div><div class='del'>-	brcmu_format_hex(hexbuf, rtsph, sizeof(txh-&gt;RTSPhyHeader));</div><div class='del'>-	printk(KERN_DEBUG "RTS PLCP: %s ", hexbuf);</div><div class='del'>-	brcmu_format_hex(hexbuf, (u8 *) &amp;rts, sizeof(txh-&gt;rts_frame));</div><div class='del'>-	printk(KERN_DEBUG "RTS Frame: %s", hexbuf);</div><div class='add'>+	print_hex_dump_bytes("RTS PLCP:", DUMP_PREFIX_OFFSET,</div><div class='add'>+			     rtsph, sizeof(txh-&gt;RTSPhyHeader));</div><div class='add'>+	print_hex_dump_bytes("RTS Frame:", DUMP_PREFIX_OFFSET,</div><div class='add'>+			     (u8 *)&amp;rts, sizeof(txh-&gt;rts_frame));</div><div class='ctx'> 	printk(KERN_DEBUG "\n");</div><div class='ctx'> }</div><div class='ctx'> #endif				/* defined(BCMDBG) */</div><div class='ctx'> </div><div class='ctx'> #if defined(BCMDBG)</div><div class='del'>-int</div><div class='add'>+static int</div><div class='ctx'> brcms_c_format_flags(const struct brcms_c_bit_desc *bd, u32 flags, char *buf,</div><div class='del'>-		   int len)</div><div class='add'>+		     int len)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	char *p = buf;</div><div class='hunk'>@@ -6916,7 +6680,7 @@ brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc, struct ieee80211_hw *hw,</div><div class='ctx'> 	qos = ieee80211_is_data_qos(h-&gt;frame_control);</div><div class='ctx'> </div><div class='ctx'> 	/* compute length of frame in bytes for use in PLCP computations */</div><div class='del'>-	len = brcmu_pkttotlen(p);</div><div class='add'>+	len = p-&gt;len;</div><div class='ctx'> 	phylen = len + FCS_LEN;</div><div class='ctx'> </div><div class='ctx'> 	/* Get tx_info */</div><div class='hunk'>@@ -7695,11 +7459,11 @@ static void</div><div class='ctx'> brcms_b_read_tsf(struct brcms_hardware *wlc_hw, u32 *tsf_l_ptr,</div><div class='ctx'> 		  u32 *tsf_h_ptr)</div><div class='ctx'> {</div><div class='del'>-	struct d11regs __iomem *regs = wlc_hw-&gt;regs;</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='ctx'> </div><div class='ctx'> 	/* read the tsf timer low, then high to get an atomic read */</div><div class='del'>-	*tsf_l_ptr = R_REG(&amp;regs-&gt;tsf_timerlow);</div><div class='del'>-	*tsf_h_ptr = R_REG(&amp;regs-&gt;tsf_timerhigh);</div><div class='add'>+	*tsf_l_ptr = bcma_read32(core, D11REGOFFS(tsf_timerlow));</div><div class='add'>+	*tsf_h_ptr = bcma_read32(core, D11REGOFFS(tsf_timerhigh));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -8253,12 +8017,6 @@ int brcms_c_get_tx_power(struct brcms_c_info *wlc)</div><div class='ctx'> 	return (int)(qdbm / BRCMS_TXPWR_DB_FACTOR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void brcms_c_set_radio_mpc(struct brcms_c_info *wlc, bool mpc)</div><div class='del'>-{</div><div class='del'>-	wlc-&gt;mpc = mpc;</div><div class='del'>-	brcms_c_radio_mpc_upd(wlc);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Process received frames */</div><div class='ctx'> /*</div><div class='ctx'>  * Return true if more frames need to be processed. false otherwise.</div><div class='hunk'>@@ -8293,14 +8051,8 @@ static void brcms_c_recv(struct brcms_c_info *wlc, struct sk_buff *p)</div><div class='ctx'> 	len = p-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	if (rxh-&gt;RxStatus1 &amp; RXS_FCSERR) {</div><div class='del'>-		if (wlc-&gt;pub-&gt;mac80211_state &amp; MAC80211_PROMISC_BCNS) {</div><div class='del'>-			wiphy_err(wlc-&gt;wiphy, "FCSERR while scanning******* -"</div><div class='del'>-				  " tossing\n");</div><div class='add'>+		if (!(wlc-&gt;filter_flags &amp; FIF_FCSFAIL))</div><div class='ctx'> 			goto toss;</div><div class='del'>-		} else {</div><div class='del'>-			wiphy_err(wlc-&gt;wiphy, "RCSERR!!!\n");</div><div class='del'>-			goto toss;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* check received pkt has at least frame control field */</div><div class='hunk'>@@ -8328,21 +8080,17 @@ static bool</div><div class='ctx'> brcms_b_recv(struct brcms_hardware *wlc_hw, uint fifo, bool bound)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *p;</div><div class='del'>-	struct sk_buff *head = NULL;</div><div class='del'>-	struct sk_buff *tail = NULL;</div><div class='add'>+	struct sk_buff *next = NULL;</div><div class='add'>+	struct sk_buff_head recv_frames;</div><div class='add'>+</div><div class='ctx'> 	uint n = 0;</div><div class='ctx'> 	uint bound_limit = bound ? RXBND : -1;</div><div class='ctx'> </div><div class='ctx'> 	BCMMSG(wlc_hw-&gt;wlc-&gt;wiphy, "wl%d\n", wlc_hw-&gt;unit);</div><div class='del'>-	/* gather received frames */</div><div class='del'>-	while ((p = dma_rx(wlc_hw-&gt;di[fifo]))) {</div><div class='add'>+	skb_queue_head_init(&amp;recv_frames);</div><div class='ctx'> </div><div class='del'>-		if (!tail)</div><div class='del'>-			head = tail = p;</div><div class='del'>-		else {</div><div class='del'>-			tail-&gt;prev = p;</div><div class='del'>-			tail = p;</div><div class='del'>-		}</div><div class='add'>+	/* gather received frames */</div><div class='add'>+	while (dma_rx(wlc_hw-&gt;di[fifo], &amp;recv_frames)) {</div><div class='ctx'> </div><div class='ctx'> 		/* !give others some time to run! */</div><div class='ctx'> 		if (++n &gt;= bound_limit)</div><div class='hunk'>@@ -8353,12 +8101,11 @@ brcms_b_recv(struct brcms_hardware *wlc_hw, uint fifo, bool bound)</div><div class='ctx'> 	dma_rxfill(wlc_hw-&gt;di[fifo]);</div><div class='ctx'> </div><div class='ctx'> 	/* process each frame */</div><div class='del'>-	while ((p = head) != NULL) {</div><div class='add'>+	skb_queue_walk_safe(&amp;recv_frames, p, next) {</div><div class='ctx'> 		struct d11rxhdr_le *rxh_le;</div><div class='ctx'> 		struct d11rxhdr *rxh;</div><div class='del'>-		head = head-&gt;prev;</div><div class='del'>-		p-&gt;prev = NULL;</div><div class='ctx'> </div><div class='add'>+		skb_unlink(p, &amp;recv_frames);</div><div class='ctx'> 		rxh_le = (struct d11rxhdr_le *)p-&gt;data;</div><div class='ctx'> 		rxh = (struct d11rxhdr *)p-&gt;data;</div><div class='ctx'> </div><div class='hunk'>@@ -8389,7 +8136,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)</div><div class='ctx'> {</div><div class='ctx'> 	u32 macintstatus;</div><div class='ctx'> 	struct brcms_hardware *wlc_hw = wlc-&gt;hw;</div><div class='del'>-	struct d11regs __iomem *regs = wlc_hw-&gt;regs;</div><div class='add'>+	struct bcma_device *core = wlc_hw-&gt;d11core;</div><div class='ctx'> 	struct wiphy *wiphy = wlc-&gt;wiphy;</div><div class='ctx'> </div><div class='ctx'> 	if (brcms_deviceremoved(wlc)) {</div><div class='hunk'>@@ -8425,7 +8172,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)</div><div class='ctx'> 	/* ATIM window end */</div><div class='ctx'> 	if (macintstatus &amp; MI_ATIMWINEND) {</div><div class='ctx'> 		BCMMSG(wlc-&gt;wiphy, "end of ATIM window\n");</div><div class='del'>-		OR_REG(&amp;regs-&gt;maccommand, wlc-&gt;qvalid);</div><div class='add'>+		bcma_set32(core, D11REGOFFS(maccommand), wlc-&gt;qvalid);</div><div class='ctx'> 		wlc-&gt;qvalid = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -8443,18 +8190,17 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)</div><div class='ctx'> </div><div class='ctx'> 	if (macintstatus &amp; MI_GP0) {</div><div class='ctx'> 		wiphy_err(wiphy, "wl%d: PSM microcode watchdog fired at %d "</div><div class='del'>-			"(seconds). Resetting.\n", wlc_hw-&gt;unit, wlc_hw-&gt;now);</div><div class='add'>+			  "(seconds). Resetting.\n", wlc_hw-&gt;unit, wlc_hw-&gt;now);</div><div class='ctx'> </div><div class='ctx'> 		printk_once("%s : PSM Watchdog, chipid 0x%x, chiprev 0x%x\n",</div><div class='del'>-					__func__, wlc_hw-&gt;sih-&gt;chip,</div><div class='del'>-					wlc_hw-&gt;sih-&gt;chiprev);</div><div class='del'>-		/* big hammer */</div><div class='del'>-		brcms_init(wlc-&gt;wl);</div><div class='add'>+			    __func__, ai_get_chip_id(wlc_hw-&gt;sih),</div><div class='add'>+			    ai_get_chiprev(wlc_hw-&gt;sih));</div><div class='add'>+		brcms_fatal_error(wlc_hw-&gt;wlc-&gt;wl);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* gptimer timeout */</div><div class='ctx'> 	if (macintstatus &amp; MI_TO)</div><div class='del'>-		W_REG(&amp;regs-&gt;gptimer, 0);</div><div class='add'>+		bcma_write32(core, D11REGOFFS(gptimer), 0);</div><div class='ctx'> </div><div class='ctx'> 	if (macintstatus &amp; MI_RFDISABLE) {</div><div class='ctx'> 		BCMMSG(wlc-&gt;wiphy, "wl%d: BMAC Detected a change on the"</div><div class='hunk'>@@ -8470,20 +8216,17 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)</div><div class='ctx'> 	return wlc-&gt;macintstatus != 0;</div><div class='ctx'> </div><div class='ctx'>  fatal:</div><div class='del'>-	brcms_init(wlc-&gt;wl);</div><div class='add'>+	brcms_fatal_error(wlc_hw-&gt;wlc-&gt;wl);</div><div class='ctx'> 	return wlc-&gt;macintstatus != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void brcms_c_init(struct brcms_c_info *wlc)</div><div class='add'>+void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx)</div><div class='ctx'> {</div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='add'>+	struct bcma_device *core = wlc-&gt;hw-&gt;d11core;</div><div class='ctx'> 	u16 chanspec;</div><div class='del'>-	bool mute = false;</div><div class='ctx'> </div><div class='ctx'> 	BCMMSG(wlc-&gt;wiphy, "wl%d\n", wlc-&gt;pub-&gt;unit);</div><div class='ctx'> </div><div class='del'>-	regs = wlc-&gt;regs;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This will happen if a big-hammer was executed. In</div><div class='ctx'> 	 * that case, we want to go back to the channel that</div><div class='hunk'>@@ -8494,7 +8237,7 @@ void brcms_c_init(struct brcms_c_info *wlc)</div><div class='ctx'> 	else</div><div class='ctx'> 		chanspec = brcms_c_init_chanspec(wlc);</div><div class='ctx'> </div><div class='del'>-	brcms_b_init(wlc-&gt;hw, chanspec, mute);</div><div class='add'>+	brcms_b_init(wlc-&gt;hw, chanspec);</div><div class='ctx'> </div><div class='ctx'> 	/* update beacon listen interval */</div><div class='ctx'> 	brcms_c_bcn_li_upd(wlc);</div><div class='hunk'>@@ -8513,8 +8256,8 @@ void brcms_c_init(struct brcms_c_info *wlc)</div><div class='ctx'> 		 * update since init path would reset</div><div class='ctx'> 		 * to default value</div><div class='ctx'> 		 */</div><div class='del'>-		W_REG(&amp;regs-&gt;tsf_cfprep,</div><div class='del'>-		      (bi &lt;&lt; CFPREP_CBI_SHIFT));</div><div class='add'>+		bcma_write32(core, D11REGOFFS(tsf_cfprep),</div><div class='add'>+			     bi &lt;&lt; CFPREP_CBI_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 		/* Update maccontrol PM related bits */</div><div class='ctx'> 		brcms_c_set_ps_ctrl(wlc);</div><div class='hunk'>@@ -8544,7 +8287,7 @@ void brcms_c_init(struct brcms_c_info *wlc)</div><div class='ctx'> 	brcms_c_bsinit(wlc);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable EDCF mode (while the MAC is suspended) */</div><div class='del'>-	OR_REG(&amp;regs-&gt;ifs_ctl, IFS_USEEDCF);</div><div class='add'>+	bcma_set16(core, D11REGOFFS(ifs_ctl), IFS_USEEDCF);</div><div class='ctx'> 	brcms_c_edcf_setparams(wlc, false);</div><div class='ctx'> </div><div class='ctx'> 	/* Init precedence maps for empty FIFOs */</div><div class='hunk'>@@ -8560,14 +8303,15 @@ void brcms_c_init(struct brcms_c_info *wlc)</div><div class='ctx'> 	/* ..now really unleash hell (allow the MAC out of suspend) */</div><div class='ctx'> 	brcms_c_enable_mac(wlc);</div><div class='ctx'> </div><div class='add'>+	/* suspend the tx fifos and mute the phy for preism cac time */</div><div class='add'>+	if (mute_tx)</div><div class='add'>+		brcms_b_mute(wlc-&gt;hw, true);</div><div class='add'>+</div><div class='ctx'> 	/* clear tx flow control */</div><div class='ctx'> 	brcms_c_txflowcontrol_reset(wlc);</div><div class='ctx'> </div><div class='ctx'> 	/* enable the RF Disable Delay timer */</div><div class='del'>-	W_REG(&amp;wlc-&gt;regs-&gt;rfdisabledly, RFDISABLE_DEFAULT);</div><div class='del'>-</div><div class='del'>-	/* initialize mpc delay */</div><div class='del'>-	wlc-&gt;mpc_delay_off = wlc-&gt;mpc_dlycnt = BRCMS_MPC_MIN_DELAYCNT;</div><div class='add'>+	bcma_write32(core, D11REGOFFS(rfdisabledly), RFDISABLE_DEFAULT);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize WME parameters; if they haven't been set by some other</div><div class='hunk'>@@ -8577,7 +8321,7 @@ void brcms_c_init(struct brcms_c_info *wlc)</div><div class='ctx'> 		/* Uninitialized; read from HW */</div><div class='ctx'> 		int ac;</div><div class='ctx'> </div><div class='del'>-		for (ac = 0; ac &lt; AC_COUNT; ac++)</div><div class='add'>+		for (ac = 0; ac &lt; IEEE80211_NUM_ACS; ac++)</div><div class='ctx'> 			wlc-&gt;wme_retries[ac] =</div><div class='ctx'> 			    brcms_b_read_shm(wlc-&gt;hw, M_AC_TXLMT_ADDR(ac));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -8587,9 +8331,8 @@ void brcms_c_init(struct brcms_c_info *wlc)</div><div class='ctx'>  * The common driver entry routine. Error codes should be unique</div><div class='ctx'>  */</div><div class='ctx'> struct brcms_c_info *</div><div class='del'>-brcms_c_attach(struct brcms_info *wl, u16 vendor, u16 device, uint unit,</div><div class='del'>-	       bool piomode, void __iomem *regsva, struct pci_dev *btparam,</div><div class='del'>-	       uint *perr)</div><div class='add'>+brcms_c_attach(struct brcms_info *wl, struct bcma_device *core, uint unit,</div><div class='add'>+	       bool piomode, uint *perr)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_c_info *wlc;</div><div class='ctx'> 	uint err = 0;</div><div class='hunk'>@@ -8597,7 +8340,7 @@ brcms_c_attach(struct brcms_info *wl, u16 vendor, u16 device, uint unit,</div><div class='ctx'> 	struct brcms_pub *pub;</div><div class='ctx'> </div><div class='ctx'> 	/* allocate struct brcms_c_info state and its substructures */</div><div class='del'>-	wlc = (struct brcms_c_info *) brcms_c_attach_malloc(unit, &amp;err, device);</div><div class='add'>+	wlc = (struct brcms_c_info *) brcms_c_attach_malloc(unit, &amp;err, 0);</div><div class='ctx'> 	if (wlc == NULL)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	wlc-&gt;wiphy = wl-&gt;wiphy;</div><div class='hunk'>@@ -8624,8 +8367,7 @@ brcms_c_attach(struct brcms_info *wl, u16 vendor, u16 device, uint unit,</div><div class='ctx'> 	 * low level attach steps(all hw accesses go</div><div class='ctx'> 	 * inside, no more in rest of the attach)</div><div class='ctx'> 	 */</div><div class='del'>-	err = brcms_b_attach(wlc, vendor, device, unit, piomode, regsva,</div><div class='del'>-			     btparam);</div><div class='add'>+	err = brcms_b_attach(wlc, core, unit, piomode);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -8754,8 +8496,6 @@ brcms_c_attach(struct brcms_info *wl, u16 vendor, u16 device, uint unit,</div><div class='ctx'> 		brcms_c_ht_update_sgi_rx(wlc, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* initialize radio_mpc_disable according to wlc-&gt;mpc */</div><div class='del'>-	brcms_c_radio_mpc_upd(wlc);</div><div class='ctx'> 	brcms_b_antsel_set(wlc-&gt;hw, wlc-&gt;asi-&gt;antsel_avail);</div><div class='ctx'> </div><div class='ctx'> 	if (perr)</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.h b/drivers/net/wireless/brcm80211/brcmsmac/main.h<br/>index c0e0fcfdfaf8..adb136ec1f04 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/main.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/main.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/main.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/main.h</a></div><div class='hunk'>@@ -44,8 +44,6 @@</div><div class='ctx'> /* transmit buffer max headroom for protocol headers */</div><div class='ctx'> #define TXOFF (D11_TXH_LEN + D11_PHY_HDR_LEN)</div><div class='ctx'> </div><div class='del'>-#define AC_COUNT		4</div><div class='del'>-</div><div class='ctx'> /* Macros for doing definition and get/set of bitfields</div><div class='ctx'>  * Usage example, e.g. a three-bit field (bits 4-6):</div><div class='ctx'>  *    #define &lt;NAME&gt;_M	BITFIELD_MASK(3)</div><div class='hunk'>@@ -336,7 +334,7 @@ struct brcms_hardware {</div><div class='ctx'> 	u32 machwcap_backup;	/* backup of machwcap */</div><div class='ctx'> </div><div class='ctx'> 	struct si_pub *sih;	/* SI handle (cookie for siutils calls) */</div><div class='del'>-	struct d11regs __iomem *regs;	/* pointer to device registers */</div><div class='add'>+	struct bcma_device *d11core;	/* pointer to 802.11 core */</div><div class='ctx'> 	struct phy_shim_info *physhim; /* phy shim layer handler */</div><div class='ctx'> 	struct shared_phy *phy_sh;	/* pointer to shared phy state */</div><div class='ctx'> 	struct brcms_hw_band *band;/* pointer to active per-band state */</div><div class='hunk'>@@ -402,7 +400,6 @@ struct brcms_txq_info {</div><div class='ctx'>  *</div><div class='ctx'>  * pub: pointer to driver public state.</div><div class='ctx'>  * wl: pointer to specific private state.</div><div class='del'>- * regs: pointer to device registers.</div><div class='ctx'>  * hw: HW related state.</div><div class='ctx'>  * clkreq_override: setting for clkreq for PCIE : Auto, 0, 1.</div><div class='ctx'>  * fastpwrup_dly: time in us needed to bring up d11 fast clock.</div><div class='hunk'>@@ -427,11 +424,6 @@ struct brcms_txq_info {</div><div class='ctx'>  * bandinit_pending: track band init in auto band.</div><div class='ctx'>  * radio_monitor: radio timer is running.</div><div class='ctx'>  * going_down: down path intermediate variable.</div><div class='del'>- * mpc: enable minimum power consumption.</div><div class='del'>- * mpc_dlycnt: # of watchdog cnt before turn disable radio.</div><div class='del'>- * mpc_offcnt: # of watchdog cnt that radio is disabled.</div><div class='del'>- * mpc_delay_off: delay radio disable by # of watchdog cnt.</div><div class='del'>- * prev_non_delay_mpc: prev state brcms_c_is_non_delay_mpc.</div><div class='ctx'>  * wdtimer: timer for watchdog routine.</div><div class='ctx'>  * radio_timer: timer for hw radio button monitor routine.</div><div class='ctx'>  * monitor: monitor (MPDU sniffing) mode.</div><div class='hunk'>@@ -441,7 +433,7 @@ struct brcms_txq_info {</div><div class='ctx'>  * bcn_li_dtim: beacon listen interval in # dtims.</div><div class='ctx'>  * WDarmed: watchdog timer is armed.</div><div class='ctx'>  * WDlast: last time wlc_watchdog() was called.</div><div class='del'>- * edcf_txop[AC_COUNT]: current txop for each ac.</div><div class='add'>+ * edcf_txop[IEEE80211_NUM_ACS]: current txop for each ac.</div><div class='ctx'>  * wme_retries: per-AC retry limits.</div><div class='ctx'>  * tx_prec_map: Precedence map based on HW FIFO space.</div><div class='ctx'>  * fifo2prec_map[NFIFO]: pointer to fifo2_prec map based on WME.</div><div class='hunk'>@@ -484,7 +476,6 @@ struct brcms_txq_info {</div><div class='ctx'> struct brcms_c_info {</div><div class='ctx'> 	struct brcms_pub *pub;</div><div class='ctx'> 	struct brcms_info *wl;</div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='ctx'> 	struct brcms_hardware *hw;</div><div class='ctx'> </div><div class='ctx'> 	/* clock */</div><div class='hunk'>@@ -522,18 +513,11 @@ struct brcms_c_info {</div><div class='ctx'> 	bool radio_monitor;</div><div class='ctx'> 	bool going_down;</div><div class='ctx'> </div><div class='del'>-	bool mpc;</div><div class='del'>-	u8 mpc_dlycnt;</div><div class='del'>-	u8 mpc_offcnt;</div><div class='del'>-	u8 mpc_delay_off;</div><div class='del'>-	u8 prev_non_delay_mpc;</div><div class='del'>-</div><div class='ctx'> 	struct brcms_timer *wdtimer;</div><div class='ctx'> 	struct brcms_timer *radio_timer;</div><div class='ctx'> </div><div class='ctx'> 	/* promiscuous */</div><div class='del'>-	bool monitor;</div><div class='del'>-	bool bcnmisc_monitor;</div><div class='add'>+	uint filter_flags;</div><div class='ctx'> </div><div class='ctx'> 	/* driver feature */</div><div class='ctx'> 	bool _rifs;</div><div class='hunk'>@@ -546,9 +530,9 @@ struct brcms_c_info {</div><div class='ctx'> 	u32 WDlast;</div><div class='ctx'> </div><div class='ctx'> 	/* WME */</div><div class='del'>-	u16 edcf_txop[AC_COUNT];</div><div class='add'>+	u16 edcf_txop[IEEE80211_NUM_ACS];</div><div class='ctx'> </div><div class='del'>-	u16 wme_retries[AC_COUNT];</div><div class='add'>+	u16 wme_retries[IEEE80211_NUM_ACS];</div><div class='ctx'> 	u16 tx_prec_map;</div><div class='ctx'> 	u16 fifo2prec_map[NFIFO];</div><div class='ctx'> </div><div class='hunk'>@@ -671,8 +655,7 @@ extern void brcms_c_print_txdesc(struct d11txh *txh);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> extern int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config);</div><div class='del'>-extern void brcms_c_mac_bcn_promisc_change(struct brcms_c_info *wlc,</div><div class='del'>-					   bool promisc);</div><div class='add'>+extern void brcms_c_mac_promisc(struct brcms_c_info *wlc, uint filter_flags);</div><div class='ctx'> extern void brcms_c_send_q(struct brcms_c_info *wlc);</div><div class='ctx'> extern int brcms_c_prep_pdu(struct brcms_c_info *wlc, struct sk_buff *pdu,</div><div class='ctx'> 			    uint *fifo);</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c b/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c<br/>index 0bcb26792046..7fad6dc19258 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/nicpci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/nicpci.c</a></div><div class='hunk'>@@ -139,6 +139,9 @@</div><div class='ctx'> #define SRSH_PI_MASK	0xf000	/* bit 15:12 */</div><div class='ctx'> #define SRSH_PI_SHIFT	12	/* bit 15:12 */</div><div class='ctx'> </div><div class='add'>+#define PCIREGOFFS(field)	offsetof(struct sbpciregs, field)</div><div class='add'>+#define PCIEREGOFFS(field)	offsetof(struct sbpcieregs, field)</div><div class='add'>+</div><div class='ctx'> /* Sonics side: PCI core and host control registers */</div><div class='ctx'> struct sbpciregs {</div><div class='ctx'> 	u32 control;		/* PCI control */</div><div class='hunk'>@@ -205,11 +208,7 @@ struct sbpcieregs {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct pcicore_info {</div><div class='del'>-	union {</div><div class='del'>-		struct sbpcieregs __iomem *pcieregs;</div><div class='del'>-		struct sbpciregs __iomem *pciregs;</div><div class='del'>-	} regs;			/* Memory mapped register to the core */</div><div class='del'>-</div><div class='add'>+	struct bcma_device *core;</div><div class='ctx'> 	struct si_pub *sih;	/* System interconnect handle */</div><div class='ctx'> 	struct pci_dev *dev;</div><div class='ctx'> 	u8 pciecap_lcreg_offset;/* PCIE capability LCreg offset</div><div class='hunk'>@@ -224,9 +223,9 @@ struct pcicore_info {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define PCIE_ASPM(sih)							\</div><div class='del'>-	(((sih)-&gt;buscoretype == PCIE_CORE_ID) &amp;&amp;			\</div><div class='del'>-	 (((sih)-&gt;buscorerev &gt;= 3) &amp;&amp;					\</div><div class='del'>-	  ((sih)-&gt;buscorerev &lt;= 5)))</div><div class='add'>+	((ai_get_buscoretype(sih) == PCIE_CORE_ID) &amp;&amp;			\</div><div class='add'>+	 ((ai_get_buscorerev(sih) &gt;= 3) &amp;&amp;				\</div><div class='add'>+	  (ai_get_buscorerev(sih) &lt;= 5)))</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* delay needed between the mdio control/ mdiodata register data access */</div><div class='hunk'>@@ -238,8 +237,7 @@ static void pr28829_delay(void)</div><div class='ctx'> /* Initialize the PCI core.</div><div class='ctx'>  * It's caller's responsibility to make sure that this is done only once</div><div class='ctx'>  */</div><div class='del'>-struct pcicore_info *pcicore_init(struct si_pub *sih, struct pci_dev *pdev,</div><div class='del'>-				  void __iomem *regs)</div><div class='add'>+struct pcicore_info *pcicore_init(struct si_pub *sih, struct bcma_device *core)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcicore_info *pi;</div><div class='ctx'> </div><div class='hunk'>@@ -249,17 +247,15 @@ struct pcicore_info *pcicore_init(struct si_pub *sih, struct pci_dev *pdev,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	pi-&gt;sih = sih;</div><div class='del'>-	pi-&gt;dev = pdev;</div><div class='add'>+	pi-&gt;dev = core-&gt;bus-&gt;host_pci;</div><div class='add'>+	pi-&gt;core = core;</div><div class='ctx'> </div><div class='del'>-	if (sih-&gt;buscoretype == PCIE_CORE_ID) {</div><div class='add'>+	if (core-&gt;id.id == PCIE_CORE_ID) {</div><div class='ctx'> 		u8 cap_ptr;</div><div class='del'>-		pi-&gt;regs.pcieregs = regs;</div><div class='ctx'> 		cap_ptr = pcicore_find_pci_capability(pi-&gt;dev, PCI_CAP_ID_EXP,</div><div class='ctx'> 						      NULL, NULL);</div><div class='ctx'> 		pi-&gt;pciecap_lcreg_offset = cap_ptr + PCIE_CAP_LINKCTRL_OFFSET;</div><div class='del'>-	} else</div><div class='del'>-		pi-&gt;regs.pciregs = regs;</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> 	return pi;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -334,37 +330,37 @@ end:</div><div class='ctx'> </div><div class='ctx'> /* ***** Register Access API */</div><div class='ctx'> static uint</div><div class='del'>-pcie_readreg(struct sbpcieregs __iomem *pcieregs, uint addrtype, uint offset)</div><div class='add'>+pcie_readreg(struct bcma_device *core, uint addrtype, uint offset)</div><div class='ctx'> {</div><div class='ctx'> 	uint retval = 0xFFFFFFFF;</div><div class='ctx'> </div><div class='ctx'> 	switch (addrtype) {</div><div class='ctx'> 	case PCIE_CONFIGREGS:</div><div class='del'>-		W_REG(&amp;pcieregs-&gt;configaddr, offset);</div><div class='del'>-		(void)R_REG((&amp;pcieregs-&gt;configaddr));</div><div class='del'>-		retval = R_REG(&amp;pcieregs-&gt;configdata);</div><div class='add'>+		bcma_write32(core, PCIEREGOFFS(configaddr), offset);</div><div class='add'>+		(void)bcma_read32(core, PCIEREGOFFS(configaddr));</div><div class='add'>+		retval = bcma_read32(core, PCIEREGOFFS(configdata));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PCIE_PCIEREGS:</div><div class='del'>-		W_REG(&amp;pcieregs-&gt;pcieindaddr, offset);</div><div class='del'>-		(void)R_REG(&amp;pcieregs-&gt;pcieindaddr);</div><div class='del'>-		retval = R_REG(&amp;pcieregs-&gt;pcieinddata);</div><div class='add'>+		bcma_write32(core, PCIEREGOFFS(pcieindaddr), offset);</div><div class='add'>+		(void)bcma_read32(core, PCIEREGOFFS(pcieindaddr));</div><div class='add'>+		retval = bcma_read32(core, PCIEREGOFFS(pcieinddata));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static uint pcie_writereg(struct sbpcieregs __iomem *pcieregs, uint addrtype,</div><div class='add'>+static uint pcie_writereg(struct bcma_device *core, uint addrtype,</div><div class='ctx'> 			  uint offset, uint val)</div><div class='ctx'> {</div><div class='ctx'> 	switch (addrtype) {</div><div class='ctx'> 	case PCIE_CONFIGREGS:</div><div class='del'>-		W_REG((&amp;pcieregs-&gt;configaddr), offset);</div><div class='del'>-		W_REG((&amp;pcieregs-&gt;configdata), val);</div><div class='add'>+		bcma_write32(core, PCIEREGOFFS(configaddr), offset);</div><div class='add'>+		bcma_write32(core, PCIEREGOFFS(configdata), val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PCIE_PCIEREGS:</div><div class='del'>-		W_REG((&amp;pcieregs-&gt;pcieindaddr), offset);</div><div class='del'>-		W_REG((&amp;pcieregs-&gt;pcieinddata), val);</div><div class='add'>+		bcma_write32(core, PCIEREGOFFS(pcieindaddr), offset);</div><div class='add'>+		bcma_write32(core, PCIEREGOFFS(pcieinddata), val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -374,7 +370,6 @@ static uint pcie_writereg(struct sbpcieregs __iomem *pcieregs, uint addrtype,</div><div class='ctx'> </div><div class='ctx'> static bool pcie_mdiosetblock(struct pcicore_info *pi, uint blk)</div><div class='ctx'> {</div><div class='del'>-	struct sbpcieregs __iomem *pcieregs = pi-&gt;regs.pcieregs;</div><div class='ctx'> 	uint mdiodata, i = 0;</div><div class='ctx'> 	uint pcie_serdes_spinwait = 200;</div><div class='ctx'> </div><div class='hunk'>@@ -382,12 +377,13 @@ static bool pcie_mdiosetblock(struct pcicore_info *pi, uint blk)</div><div class='ctx'> 		    (MDIODATA_DEV_ADDR &lt;&lt; MDIODATA_DEVADDR_SHF) |</div><div class='ctx'> 		    (MDIODATA_BLK_ADDR &lt;&lt; MDIODATA_REGADDR_SHF) |</div><div class='ctx'> 		    (blk &lt;&lt; 4));</div><div class='del'>-	W_REG(&amp;pcieregs-&gt;mdiodata, mdiodata);</div><div class='add'>+	bcma_write32(pi-&gt;core, PCIEREGOFFS(mdiodata), mdiodata);</div><div class='ctx'> </div><div class='ctx'> 	pr28829_delay();</div><div class='ctx'> 	/* retry till the transaction is complete */</div><div class='ctx'> 	while (i &lt; pcie_serdes_spinwait) {</div><div class='del'>-		if (R_REG(&amp;pcieregs-&gt;mdiocontrol) &amp; MDIOCTL_ACCESS_DONE)</div><div class='add'>+		if (bcma_read32(pi-&gt;core, PCIEREGOFFS(mdiocontrol)) &amp;</div><div class='add'>+		    MDIOCTL_ACCESS_DONE)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		udelay(1000);</div><div class='hunk'>@@ -404,15 +400,15 @@ static int</div><div class='ctx'> pcie_mdioop(struct pcicore_info *pi, uint physmedia, uint regaddr, bool write,</div><div class='ctx'> 	    uint *val)</div><div class='ctx'> {</div><div class='del'>-	struct sbpcieregs __iomem *pcieregs = pi-&gt;regs.pcieregs;</div><div class='ctx'> 	uint mdiodata;</div><div class='ctx'> 	uint i = 0;</div><div class='ctx'> 	uint pcie_serdes_spinwait = 10;</div><div class='ctx'> </div><div class='ctx'> 	/* enable mdio access to SERDES */</div><div class='del'>-	W_REG(&amp;pcieregs-&gt;mdiocontrol, MDIOCTL_PREAM_EN | MDIOCTL_DIVISOR_VAL);</div><div class='add'>+	bcma_write32(pi-&gt;core, PCIEREGOFFS(mdiocontrol),</div><div class='add'>+		     MDIOCTL_PREAM_EN | MDIOCTL_DIVISOR_VAL);</div><div class='ctx'> </div><div class='del'>-	if (pi-&gt;sih-&gt;buscorerev &gt;= 10) {</div><div class='add'>+	if (ai_get_buscorerev(pi-&gt;sih) &gt;= 10) {</div><div class='ctx'> 		/* new serdes is slower in rw,</div><div class='ctx'> 		 * using two layers of reg address mapping</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -432,20 +428,22 @@ pcie_mdioop(struct pcicore_info *pi, uint physmedia, uint regaddr, bool write,</div><div class='ctx'> 		mdiodata |= (MDIODATA_START | MDIODATA_WRITE | MDIODATA_TA |</div><div class='ctx'> 			     *val);</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;pcieregs-&gt;mdiodata, mdiodata);</div><div class='add'>+	bcma_write32(pi-&gt;core, PCIEREGOFFS(mdiodata), mdiodata);</div><div class='ctx'> </div><div class='ctx'> 	pr28829_delay();</div><div class='ctx'> </div><div class='ctx'> 	/* retry till the transaction is complete */</div><div class='ctx'> 	while (i &lt; pcie_serdes_spinwait) {</div><div class='del'>-		if (R_REG(&amp;pcieregs-&gt;mdiocontrol) &amp; MDIOCTL_ACCESS_DONE) {</div><div class='add'>+		if (bcma_read32(pi-&gt;core, PCIEREGOFFS(mdiocontrol)) &amp;</div><div class='add'>+		    MDIOCTL_ACCESS_DONE) {</div><div class='ctx'> 			if (!write) {</div><div class='ctx'> 				pr28829_delay();</div><div class='del'>-				*val = (R_REG(&amp;pcieregs-&gt;mdiodata) &amp;</div><div class='add'>+				*val = (bcma_read32(pi-&gt;core,</div><div class='add'>+						    PCIEREGOFFS(mdiodata)) &amp;</div><div class='ctx'> 					MDIODATA_MASK);</div><div class='ctx'> 			}</div><div class='ctx'> 			/* Disable mdio access to SERDES */</div><div class='del'>-			W_REG(&amp;pcieregs-&gt;mdiocontrol, 0);</div><div class='add'>+			bcma_write32(pi-&gt;core, PCIEREGOFFS(mdiocontrol), 0);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		udelay(1000);</div><div class='hunk'>@@ -453,7 +451,7 @@ pcie_mdioop(struct pcicore_info *pi, uint physmedia, uint regaddr, bool write,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Timed out. Disable mdio access to SERDES. */</div><div class='del'>-	W_REG(&amp;pcieregs-&gt;mdiocontrol, 0);</div><div class='add'>+	bcma_write32(pi-&gt;core, PCIEREGOFFS(mdiocontrol), 0);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -502,18 +500,18 @@ static void pcie_extendL1timer(struct pcicore_info *pi, bool extend)</div><div class='ctx'> {</div><div class='ctx'> 	u32 w;</div><div class='ctx'> 	struct si_pub *sih = pi-&gt;sih;</div><div class='del'>-	struct sbpcieregs __iomem *pcieregs = pi-&gt;regs.pcieregs;</div><div class='ctx'> </div><div class='del'>-	if (sih-&gt;buscoretype != PCIE_CORE_ID || sih-&gt;buscorerev &lt; 7)</div><div class='add'>+	if (ai_get_buscoretype(sih) != PCIE_CORE_ID ||</div><div class='add'>+	    ai_get_buscorerev(sih) &lt; 7)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	w = pcie_readreg(pcieregs, PCIE_PCIEREGS, PCIE_DLLP_PMTHRESHREG);</div><div class='add'>+	w = pcie_readreg(pi-&gt;core, PCIE_PCIEREGS, PCIE_DLLP_PMTHRESHREG);</div><div class='ctx'> 	if (extend)</div><div class='ctx'> 		w |= PCIE_ASPMTIMER_EXTEND;</div><div class='ctx'> 	else</div><div class='ctx'> 		w &amp;= ~PCIE_ASPMTIMER_EXTEND;</div><div class='del'>-	pcie_writereg(pcieregs, PCIE_PCIEREGS, PCIE_DLLP_PMTHRESHREG, w);</div><div class='del'>-	w = pcie_readreg(pcieregs, PCIE_PCIEREGS, PCIE_DLLP_PMTHRESHREG);</div><div class='add'>+	pcie_writereg(pi-&gt;core, PCIE_PCIEREGS, PCIE_DLLP_PMTHRESHREG, w);</div><div class='add'>+	w = pcie_readreg(pi-&gt;core, PCIE_PCIEREGS, PCIE_DLLP_PMTHRESHREG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* centralized clkreq control policy */</div><div class='hunk'>@@ -527,25 +525,27 @@ static void pcie_clkreq_upd(struct pcicore_info *pi, uint state)</div><div class='ctx'> 			pcie_clkreq(pi, 1, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SI_PCIDOWN:</div><div class='del'>-		if (sih-&gt;buscorerev == 6) {	/* turn on serdes PLL down */</div><div class='del'>-			ai_corereg(sih, SI_CC_IDX,</div><div class='del'>-				   offsetof(struct chipcregs, chipcontrol_addr),</div><div class='del'>-				   ~0, 0);</div><div class='del'>-			ai_corereg(sih, SI_CC_IDX,</div><div class='del'>-				   offsetof(struct chipcregs, chipcontrol_data),</div><div class='del'>-				   ~0x40, 0);</div><div class='add'>+		/* turn on serdes PLL down */</div><div class='add'>+		if (ai_get_buscorerev(sih) == 6) {</div><div class='add'>+			ai_cc_reg(sih,</div><div class='add'>+				  offsetof(struct chipcregs, chipcontrol_addr),</div><div class='add'>+				  ~0, 0);</div><div class='add'>+			ai_cc_reg(sih,</div><div class='add'>+				  offsetof(struct chipcregs, chipcontrol_data),</div><div class='add'>+				  ~0x40, 0);</div><div class='ctx'> 		} else if (pi-&gt;pcie_pr42767) {</div><div class='ctx'> 			pcie_clkreq(pi, 1, 1);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SI_PCIUP:</div><div class='del'>-		if (sih-&gt;buscorerev == 6) {	/* turn off serdes PLL down */</div><div class='del'>-			ai_corereg(sih, SI_CC_IDX,</div><div class='del'>-				   offsetof(struct chipcregs, chipcontrol_addr),</div><div class='del'>-				   ~0, 0);</div><div class='del'>-			ai_corereg(sih, SI_CC_IDX,</div><div class='del'>-				   offsetof(struct chipcregs, chipcontrol_data),</div><div class='del'>-				   ~0x40, 0x40);</div><div class='add'>+		/* turn off serdes PLL down */</div><div class='add'>+		if (ai_get_buscorerev(sih) == 6) {</div><div class='add'>+			ai_cc_reg(sih,</div><div class='add'>+				  offsetof(struct chipcregs, chipcontrol_addr),</div><div class='add'>+				  ~0, 0);</div><div class='add'>+			ai_cc_reg(sih,</div><div class='add'>+				  offsetof(struct chipcregs, chipcontrol_data),</div><div class='add'>+				  ~0x40, 0x40);</div><div class='ctx'> 		} else if (PCIE_ASPM(sih)) {	/* disable clkreq */</div><div class='ctx'> 			pcie_clkreq(pi, 1, 0);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -562,7 +562,7 @@ static void pcie_war_polarity(struct pcicore_info *pi)</div><div class='ctx'> 	if (pi-&gt;pcie_polarity != 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	w = pcie_readreg(pi-&gt;regs.pcieregs, PCIE_PCIEREGS, PCIE_PLP_STATUSREG);</div><div class='add'>+	w = pcie_readreg(pi-&gt;core, PCIE_PCIEREGS, PCIE_PLP_STATUSREG);</div><div class='ctx'> </div><div class='ctx'> 	/* Detect the current polarity at attach and force that polarity and</div><div class='ctx'> 	 * disable changing the polarity</div><div class='hunk'>@@ -581,18 +581,15 @@ static void pcie_war_polarity(struct pcicore_info *pi)</div><div class='ctx'>  */</div><div class='ctx'> static void pcie_war_aspm_clkreq(struct pcicore_info *pi)</div><div class='ctx'> {</div><div class='del'>-	struct sbpcieregs __iomem *pcieregs = pi-&gt;regs.pcieregs;</div><div class='ctx'> 	struct si_pub *sih = pi-&gt;sih;</div><div class='ctx'> 	u16 val16;</div><div class='del'>-	u16 __iomem *reg16;</div><div class='ctx'> 	u32 w;</div><div class='ctx'> </div><div class='ctx'> 	if (!PCIE_ASPM(sih))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* bypass this on QT or VSIM */</div><div class='del'>-	reg16 = &amp;pcieregs-&gt;sprom[SRSH_ASPM_OFFSET];</div><div class='del'>-	val16 = R_REG(reg16);</div><div class='add'>+	val16 = bcma_read16(pi-&gt;core, PCIEREGOFFS(sprom[SRSH_ASPM_OFFSET]));</div><div class='ctx'> </div><div class='ctx'> 	val16 &amp;= ~SRSH_ASPM_ENB;</div><div class='ctx'> 	if (pi-&gt;pcie_war_aspm_ovr == PCIE_ASPM_ENAB)</div><div class='hunk'>@@ -602,15 +599,15 @@ static void pcie_war_aspm_clkreq(struct pcicore_info *pi)</div><div class='ctx'> 	else if (pi-&gt;pcie_war_aspm_ovr == PCIE_ASPM_L0s_ENAB)</div><div class='ctx'> 		val16 |= SRSH_ASPM_L0s_ENB;</div><div class='ctx'> </div><div class='del'>-	W_REG(reg16, val16);</div><div class='add'>+	bcma_write16(pi-&gt;core, PCIEREGOFFS(sprom[SRSH_ASPM_OFFSET]), val16);</div><div class='ctx'> </div><div class='ctx'> 	pci_read_config_dword(pi-&gt;dev, pi-&gt;pciecap_lcreg_offset, &amp;w);</div><div class='ctx'> 	w &amp;= ~PCIE_ASPM_ENAB;</div><div class='ctx'> 	w |= pi-&gt;pcie_war_aspm_ovr;</div><div class='ctx'> 	pci_write_config_dword(pi-&gt;dev, pi-&gt;pciecap_lcreg_offset, w);</div><div class='ctx'> </div><div class='del'>-	reg16 = &amp;pcieregs-&gt;sprom[SRSH_CLKREQ_OFFSET_REV5];</div><div class='del'>-	val16 = R_REG(reg16);</div><div class='add'>+	val16 = bcma_read16(pi-&gt;core,</div><div class='add'>+			    PCIEREGOFFS(sprom[SRSH_CLKREQ_OFFSET_REV5]));</div><div class='ctx'> </div><div class='ctx'> 	if (pi-&gt;pcie_war_aspm_ovr != PCIE_ASPM_DISAB) {</div><div class='ctx'> 		val16 |= SRSH_CLKREQ_ENB;</div><div class='hunk'>@@ -618,7 +615,8 @@ static void pcie_war_aspm_clkreq(struct pcicore_info *pi)</div><div class='ctx'> 	} else</div><div class='ctx'> 		val16 &amp;= ~SRSH_CLKREQ_ENB;</div><div class='ctx'> </div><div class='del'>-	W_REG(reg16, val16);</div><div class='add'>+	bcma_write16(pi-&gt;core, PCIEREGOFFS(sprom[SRSH_CLKREQ_OFFSET_REV5]),</div><div class='add'>+		     val16);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Apply the polarity determined at the start */</div><div class='hunk'>@@ -642,16 +640,15 @@ static void pcie_war_serdes(struct pcicore_info *pi)</div><div class='ctx'> /* Needs to happen when coming out of 'standby'/'hibernate' */</div><div class='ctx'> static void pcie_misc_config_fixup(struct pcicore_info *pi)</div><div class='ctx'> {</div><div class='del'>-	struct sbpcieregs __iomem *pcieregs = pi-&gt;regs.pcieregs;</div><div class='ctx'> 	u16 val16;</div><div class='del'>-	u16 __iomem *reg16;</div><div class='ctx'> </div><div class='del'>-	reg16 = &amp;pcieregs-&gt;sprom[SRSH_PCIE_MISC_CONFIG];</div><div class='del'>-	val16 = R_REG(reg16);</div><div class='add'>+	val16 = bcma_read16(pi-&gt;core,</div><div class='add'>+			    PCIEREGOFFS(sprom[SRSH_PCIE_MISC_CONFIG]));</div><div class='ctx'> </div><div class='ctx'> 	if ((val16 &amp; SRSH_L23READY_EXIT_NOPERST) == 0) {</div><div class='ctx'> 		val16 |= SRSH_L23READY_EXIT_NOPERST;</div><div class='del'>-		W_REG(reg16, val16);</div><div class='add'>+		bcma_write16(pi-&gt;core,</div><div class='add'>+			     PCIEREGOFFS(sprom[SRSH_PCIE_MISC_CONFIG]), val16);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -659,62 +656,57 @@ static void pcie_misc_config_fixup(struct pcicore_info *pi)</div><div class='ctx'> /* Needs to happen when coming out of 'standby'/'hibernate' */</div><div class='ctx'> static void pcie_war_noplldown(struct pcicore_info *pi)</div><div class='ctx'> {</div><div class='del'>-	struct sbpcieregs __iomem *pcieregs = pi-&gt;regs.pcieregs;</div><div class='del'>-	u16 __iomem *reg16;</div><div class='del'>-</div><div class='ctx'> 	/* turn off serdes PLL down */</div><div class='del'>-	ai_corereg(pi-&gt;sih, SI_CC_IDX, offsetof(struct chipcregs, chipcontrol),</div><div class='del'>-		   CHIPCTRL_4321_PLL_DOWN, CHIPCTRL_4321_PLL_DOWN);</div><div class='add'>+	ai_cc_reg(pi-&gt;sih, offsetof(struct chipcregs, chipcontrol),</div><div class='add'>+		  CHIPCTRL_4321_PLL_DOWN, CHIPCTRL_4321_PLL_DOWN);</div><div class='ctx'> </div><div class='ctx'> 	/* clear srom shadow backdoor */</div><div class='del'>-	reg16 = &amp;pcieregs-&gt;sprom[SRSH_BD_OFFSET];</div><div class='del'>-	W_REG(reg16, 0);</div><div class='add'>+	bcma_write16(pi-&gt;core, PCIEREGOFFS(sprom[SRSH_BD_OFFSET]), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Needs to happen when coming out of 'standby'/'hibernate' */</div><div class='ctx'> static void pcie_war_pci_setup(struct pcicore_info *pi)</div><div class='ctx'> {</div><div class='ctx'> 	struct si_pub *sih = pi-&gt;sih;</div><div class='del'>-	struct sbpcieregs __iomem *pcieregs = pi-&gt;regs.pcieregs;</div><div class='ctx'> 	u32 w;</div><div class='ctx'> </div><div class='del'>-	if (sih-&gt;buscorerev == 0 || sih-&gt;buscorerev == 1) {</div><div class='del'>-		w = pcie_readreg(pcieregs, PCIE_PCIEREGS,</div><div class='add'>+	if (ai_get_buscorerev(sih) == 0 || ai_get_buscorerev(sih) == 1) {</div><div class='add'>+		w = pcie_readreg(pi-&gt;core, PCIE_PCIEREGS,</div><div class='ctx'> 				 PCIE_TLP_WORKAROUNDSREG);</div><div class='ctx'> 		w |= 0x8;</div><div class='del'>-		pcie_writereg(pcieregs, PCIE_PCIEREGS,</div><div class='add'>+		pcie_writereg(pi-&gt;core, PCIE_PCIEREGS,</div><div class='ctx'> 			      PCIE_TLP_WORKAROUNDSREG, w);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sih-&gt;buscorerev == 1) {</div><div class='del'>-		w = pcie_readreg(pcieregs, PCIE_PCIEREGS, PCIE_DLLP_LCREG);</div><div class='add'>+	if (ai_get_buscorerev(sih) == 1) {</div><div class='add'>+		w = pcie_readreg(pi-&gt;core, PCIE_PCIEREGS, PCIE_DLLP_LCREG);</div><div class='ctx'> 		w |= 0x40;</div><div class='del'>-		pcie_writereg(pcieregs, PCIE_PCIEREGS, PCIE_DLLP_LCREG, w);</div><div class='add'>+		pcie_writereg(pi-&gt;core, PCIE_PCIEREGS, PCIE_DLLP_LCREG, w);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sih-&gt;buscorerev == 0) {</div><div class='add'>+	if (ai_get_buscorerev(sih) == 0) {</div><div class='ctx'> 		pcie_mdiowrite(pi, MDIODATA_DEV_RX, SERDES_RX_TIMER1, 0x8128);</div><div class='ctx'> 		pcie_mdiowrite(pi, MDIODATA_DEV_RX, SERDES_RX_CDR, 0x0100);</div><div class='ctx'> 		pcie_mdiowrite(pi, MDIODATA_DEV_RX, SERDES_RX_CDRBW, 0x1466);</div><div class='ctx'> 	} else if (PCIE_ASPM(sih)) {</div><div class='ctx'> 		/* Change the L1 threshold for better performance */</div><div class='del'>-		w = pcie_readreg(pcieregs, PCIE_PCIEREGS,</div><div class='add'>+		w = pcie_readreg(pi-&gt;core, PCIE_PCIEREGS,</div><div class='ctx'> 				 PCIE_DLLP_PMTHRESHREG);</div><div class='ctx'> 		w &amp;= ~PCIE_L1THRESHOLDTIME_MASK;</div><div class='ctx'> 		w |= PCIE_L1THRESHOLD_WARVAL &lt;&lt; PCIE_L1THRESHOLDTIME_SHIFT;</div><div class='del'>-		pcie_writereg(pcieregs, PCIE_PCIEREGS,</div><div class='add'>+		pcie_writereg(pi-&gt;core, PCIE_PCIEREGS,</div><div class='ctx'> 			      PCIE_DLLP_PMTHRESHREG, w);</div><div class='ctx'> </div><div class='ctx'> 		pcie_war_serdes(pi);</div><div class='ctx'> </div><div class='ctx'> 		pcie_war_aspm_clkreq(pi);</div><div class='del'>-	} else if (pi-&gt;sih-&gt;buscorerev == 7)</div><div class='add'>+	} else if (ai_get_buscorerev(pi-&gt;sih) == 7)</div><div class='ctx'> 		pcie_war_noplldown(pi);</div><div class='ctx'> </div><div class='ctx'> 	/* Note that the fix is actually in the SROM,</div><div class='ctx'> 	 * that's why this is open-ended</div><div class='ctx'> 	 */</div><div class='del'>-	if (pi-&gt;sih-&gt;buscorerev &gt;= 6)</div><div class='add'>+	if (ai_get_buscorerev(pi-&gt;sih) &gt;= 6)</div><div class='ctx'> 		pcie_misc_config_fixup(pi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -745,7 +737,7 @@ void pcicore_attach(struct pcicore_info *pi, int state)</div><div class='ctx'> </div><div class='ctx'> void pcicore_hwup(struct pcicore_info *pi)</div><div class='ctx'> {</div><div class='del'>-	if (!pi || pi-&gt;sih-&gt;buscoretype != PCIE_CORE_ID)</div><div class='add'>+	if (!pi || ai_get_buscoretype(pi-&gt;sih) != PCIE_CORE_ID)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	pcie_war_pci_setup(pi);</div><div class='hunk'>@@ -753,7 +745,7 @@ void pcicore_hwup(struct pcicore_info *pi)</div><div class='ctx'> </div><div class='ctx'> void pcicore_up(struct pcicore_info *pi, int state)</div><div class='ctx'> {</div><div class='del'>-	if (!pi || pi-&gt;sih-&gt;buscoretype != PCIE_CORE_ID)</div><div class='add'>+	if (!pi || ai_get_buscoretype(pi-&gt;sih) != PCIE_CORE_ID)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Restore L1 timer for better performance */</div><div class='hunk'>@@ -781,7 +773,7 @@ void pcicore_sleep(struct pcicore_info *pi)</div><div class='ctx'> </div><div class='ctx'> void pcicore_down(struct pcicore_info *pi, int state)</div><div class='ctx'> {</div><div class='del'>-	if (!pi || pi-&gt;sih-&gt;buscoretype != PCIE_CORE_ID)</div><div class='add'>+	if (!pi || ai_get_buscoretype(pi-&gt;sih) != PCIE_CORE_ID)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	pcie_clkreq_upd(pi, state);</div><div class='hunk'>@@ -790,46 +782,45 @@ void pcicore_down(struct pcicore_info *pi, int state)</div><div class='ctx'> 	pcie_extendL1timer(pi, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* precondition: current core is sii-&gt;buscoretype */</div><div class='del'>-static void pcicore_fixcfg(struct pcicore_info *pi, u16 __iomem *reg16)</div><div class='add'>+void pcicore_fixcfg(struct pcicore_info *pi)</div><div class='ctx'> {</div><div class='del'>-	struct si_info *sii = (struct si_info *)(pi-&gt;sih);</div><div class='add'>+	struct bcma_device *core = pi-&gt;core;</div><div class='ctx'> 	u16 val16;</div><div class='del'>-	uint pciidx;</div><div class='add'>+	uint regoff;</div><div class='ctx'> </div><div class='del'>-	pciidx = ai_coreidx(&amp;sii-&gt;pub);</div><div class='del'>-	val16 = R_REG(reg16);</div><div class='del'>-	if (((val16 &amp; SRSH_PI_MASK) &gt;&gt; SRSH_PI_SHIFT) != (u16)pciidx) {</div><div class='del'>-		val16 = (u16)(pciidx &lt;&lt; SRSH_PI_SHIFT) |</div><div class='del'>-			(val16 &amp; ~SRSH_PI_MASK);</div><div class='del'>-		W_REG(reg16, val16);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+	switch (pi-&gt;core-&gt;id.id) {</div><div class='add'>+	case BCMA_CORE_PCI:</div><div class='add'>+		regoff = PCIREGOFFS(sprom[SRSH_PI_OFFSET]);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-pcicore_fixcfg_pci(struct pcicore_info *pi, struct sbpciregs __iomem *pciregs)</div><div class='del'>-{</div><div class='del'>-	pcicore_fixcfg(pi, &amp;pciregs-&gt;sprom[SRSH_PI_OFFSET]);</div><div class='del'>-}</div><div class='add'>+	case BCMA_CORE_PCIE:</div><div class='add'>+		regoff = PCIEREGOFFS(sprom[SRSH_PI_OFFSET]);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-void pcicore_fixcfg_pcie(struct pcicore_info *pi,</div><div class='del'>-			 struct sbpcieregs __iomem *pcieregs)</div><div class='del'>-{</div><div class='del'>-	pcicore_fixcfg(pi, &amp;pcieregs-&gt;sprom[SRSH_PI_OFFSET]);</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val16 = bcma_read16(pi-&gt;core, regoff);</div><div class='add'>+	if (((val16 &amp; SRSH_PI_MASK) &gt;&gt; SRSH_PI_SHIFT) !=</div><div class='add'>+	    (u16)core-&gt;core_index) {</div><div class='add'>+		val16 = ((u16)core-&gt;core_index &lt;&lt; SRSH_PI_SHIFT) |</div><div class='add'>+			(val16 &amp; ~SRSH_PI_MASK);</div><div class='add'>+		bcma_write16(pi-&gt;core, regoff, val16);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* precondition: current core is pci core */</div><div class='ctx'> void</div><div class='del'>-pcicore_pci_setup(struct pcicore_info *pi, struct sbpciregs __iomem *pciregs)</div><div class='add'>+pcicore_pci_setup(struct pcicore_info *pi)</div><div class='ctx'> {</div><div class='del'>-	u32 w;</div><div class='del'>-</div><div class='del'>-	OR_REG(&amp;pciregs-&gt;sbtopci2, SBTOPCI_PREF | SBTOPCI_BURST);</div><div class='del'>-</div><div class='del'>-	if (((struct si_info *)(pi-&gt;sih))-&gt;pub.buscorerev &gt;= 11) {</div><div class='del'>-		OR_REG(&amp;pciregs-&gt;sbtopci2, SBTOPCI_RC_READMULTI);</div><div class='del'>-		w = R_REG(&amp;pciregs-&gt;clkrun);</div><div class='del'>-		W_REG(&amp;pciregs-&gt;clkrun, w | PCI_CLKRUN_DSBL);</div><div class='del'>-		w = R_REG(&amp;pciregs-&gt;clkrun);</div><div class='add'>+	bcma_set32(pi-&gt;core, PCIREGOFFS(sbtopci2),</div><div class='add'>+		   SBTOPCI_PREF | SBTOPCI_BURST);</div><div class='add'>+</div><div class='add'>+	if (pi-&gt;core-&gt;id.rev &gt;= 11) {</div><div class='add'>+		bcma_set32(pi-&gt;core, PCIREGOFFS(sbtopci2),</div><div class='add'>+			   SBTOPCI_RC_READMULTI);</div><div class='add'>+		bcma_set32(pi-&gt;core, PCIREGOFFS(clkrun), PCI_CLKRUN_DSBL);</div><div class='add'>+		(void)bcma_read32(pi-&gt;core, PCIREGOFFS(clkrun));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/nicpci.h b/drivers/net/wireless/brcm80211/brcmsmac/nicpci.h<br/>index 58aa80dc3329..9fc3ead540a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/nicpci.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/nicpci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/nicpci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/nicpci.h</a></div><div class='hunk'>@@ -62,8 +62,7 @@ struct sbpciregs;</div><div class='ctx'> struct sbpcieregs;</div><div class='ctx'> </div><div class='ctx'> extern struct pcicore_info *pcicore_init(struct si_pub *sih,</div><div class='del'>-					 struct pci_dev *pdev,</div><div class='del'>-					 void __iomem *regs);</div><div class='add'>+					 struct bcma_device *core);</div><div class='ctx'> extern void pcicore_deinit(struct pcicore_info *pch);</div><div class='ctx'> extern void pcicore_attach(struct pcicore_info *pch, int state);</div><div class='ctx'> extern void pcicore_hwup(struct pcicore_info *pch);</div><div class='hunk'>@@ -72,11 +71,7 @@ extern void pcicore_sleep(struct pcicore_info *pch);</div><div class='ctx'> extern void pcicore_down(struct pcicore_info *pch, int state);</div><div class='ctx'> extern u8 pcicore_find_pci_capability(struct pci_dev *dev, u8 req_cap_id,</div><div class='ctx'> 				      unsigned char *buf, u32 *buflen);</div><div class='del'>-extern void pcicore_fixcfg_pci(struct pcicore_info *pch,</div><div class='del'>-			       struct sbpciregs __iomem *pciregs);</div><div class='del'>-extern void pcicore_fixcfg_pcie(struct pcicore_info *pch,</div><div class='del'>-				struct sbpcieregs __iomem *pciregs);</div><div class='del'>-extern void pcicore_pci_setup(struct pcicore_info *pch,</div><div class='del'>-			      struct sbpciregs __iomem *pciregs);</div><div class='add'>+extern void pcicore_fixcfg(struct pcicore_info *pch);</div><div class='add'>+extern void pcicore_pci_setup(struct pcicore_info *pch);</div><div class='ctx'> </div><div class='ctx'> #endif /* _BRCM_NICPCI_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/otp.c b/drivers/net/wireless/brcm80211/brcmsmac/otp.c<br/>index edf551561fd8..f1ca12625860 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/otp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/otp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/otp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/otp.c</a></div><div class='hunk'>@@ -77,7 +77,7 @@ struct otp_fn_s {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct otpinfo {</div><div class='del'>-	uint ccrev;		/* chipc revision */</div><div class='add'>+	struct bcma_device *core; /* chipc core */</div><div class='ctx'> 	const struct otp_fn_s *fn;	/* OTP functions */</div><div class='ctx'> 	struct si_pub *sih;		/* Saved sb handle */</div><div class='ctx'> </div><div class='hunk'>@@ -133,9 +133,10 @@ struct otpinfo {</div><div class='ctx'> #define OTP_SZ_FU_144		(144/8)	/* 144 bits */</div><div class='ctx'> </div><div class='ctx'> static u16</div><div class='del'>-ipxotp_otpr(struct otpinfo *oi, struct chipcregs __iomem *cc, uint wn)</div><div class='add'>+ipxotp_otpr(struct otpinfo *oi, uint wn)</div><div class='ctx'> {</div><div class='del'>-	return R_REG(&amp;cc-&gt;sromotp[wn]);</div><div class='add'>+	return bcma_read16(oi-&gt;core,</div><div class='add'>+			   CHIPCREGOFFS(sromotp[wn]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -146,7 +147,7 @@ static int ipxotp_max_rgnsz(struct si_pub *sih, int osizew)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	switch (sih-&gt;chip) {</div><div class='add'>+	switch (ai_get_chip_id(sih)) {</div><div class='ctx'> 	case BCM43224_CHIP_ID:</div><div class='ctx'> 	case BCM43225_CHIP_ID:</div><div class='ctx'> 		ret = osizew * 2 - OTP_SZ_FU_72 - OTP_SZ_CHECKSUM;</div><div class='hunk'>@@ -161,19 +162,21 @@ static int ipxotp_max_rgnsz(struct si_pub *sih, int osizew)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void _ipxotp_init(struct otpinfo *oi, struct chipcregs __iomem *cc)</div><div class='add'>+static void _ipxotp_init(struct otpinfo *oi)</div><div class='ctx'> {</div><div class='ctx'> 	uint k;</div><div class='ctx'> 	u32 otpp, st;</div><div class='add'>+	int ccrev = ai_get_ccrev(oi-&gt;sih);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * record word offset of General Use Region</div><div class='ctx'> 	 * for various chipcommon revs</div><div class='ctx'> 	 */</div><div class='del'>-	if (oi-&gt;sih-&gt;ccrev == 21 || oi-&gt;sih-&gt;ccrev == 24</div><div class='del'>-	    || oi-&gt;sih-&gt;ccrev == 27) {</div><div class='add'>+	if (ccrev == 21 || ccrev == 24</div><div class='add'>+	    || ccrev == 27) {</div><div class='ctx'> 		oi-&gt;otpgu_base = REVA4_OTPGU_BASE;</div><div class='del'>-	} else if (oi-&gt;sih-&gt;ccrev == 36) {</div><div class='add'>+	} else if (ccrev == 36) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * OTP size greater than equal to 2KB (128 words),</div><div class='ctx'> 		 * otpgu_base is similar to rev23</div><div class='hunk'>@@ -182,7 +185,7 @@ static void _ipxotp_init(struct otpinfo *oi, struct chipcregs __iomem *cc)</div><div class='ctx'> 			oi-&gt;otpgu_base = REVB8_OTPGU_BASE;</div><div class='ctx'> 		else</div><div class='ctx'> 			oi-&gt;otpgu_base = REV36_OTPGU_BASE;</div><div class='del'>-	} else if (oi-&gt;sih-&gt;ccrev == 23 || oi-&gt;sih-&gt;ccrev &gt;= 25) {</div><div class='add'>+	} else if (ccrev == 23 || ccrev &gt;= 25) {</div><div class='ctx'> 		oi-&gt;otpgu_base = REVB8_OTPGU_BASE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -190,24 +193,21 @@ static void _ipxotp_init(struct otpinfo *oi, struct chipcregs __iomem *cc)</div><div class='ctx'> 	otpp =</div><div class='ctx'> 	    OTPP_START_BUSY | ((OTPPOC_INIT &lt;&lt; OTPP_OC_SHIFT) &amp; OTPP_OC_MASK);</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;cc-&gt;otpprog, otpp);</div><div class='del'>-	for (k = 0;</div><div class='del'>-	     ((st = R_REG(&amp;cc-&gt;otpprog)) &amp; OTPP_START_BUSY)</div><div class='del'>-	     &amp;&amp; (k &lt; OTPP_TRIES); k++)</div><div class='del'>-		;</div><div class='add'>+	bcma_write32(oi-&gt;core, CHIPCREGOFFS(otpprog), otpp);</div><div class='add'>+	st = bcma_read32(oi-&gt;core, CHIPCREGOFFS(otpprog));</div><div class='add'>+	for (k = 0; (st &amp; OTPP_START_BUSY) &amp;&amp; (k &lt; OTPP_TRIES); k++)</div><div class='add'>+		st = bcma_read32(oi-&gt;core, CHIPCREGOFFS(otpprog));</div><div class='ctx'> 	if (k &gt;= OTPP_TRIES)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Read OTP lock bits and subregion programmed indication bits */</div><div class='del'>-	oi-&gt;status = R_REG(&amp;cc-&gt;otpstatus);</div><div class='add'>+	oi-&gt;status = bcma_read32(oi-&gt;core, CHIPCREGOFFS(otpstatus));</div><div class='ctx'> </div><div class='del'>-	if ((oi-&gt;sih-&gt;chip == BCM43224_CHIP_ID)</div><div class='del'>-	    || (oi-&gt;sih-&gt;chip == BCM43225_CHIP_ID)) {</div><div class='add'>+	if ((ai_get_chip_id(oi-&gt;sih) == BCM43224_CHIP_ID)</div><div class='add'>+	    || (ai_get_chip_id(oi-&gt;sih) == BCM43225_CHIP_ID)) {</div><div class='ctx'> 		u32 p_bits;</div><div class='del'>-		p_bits =</div><div class='del'>-		    (ipxotp_otpr(oi, cc, oi-&gt;otpgu_base + OTPGU_P_OFF) &amp;</div><div class='del'>-		     OTPGU_P_MSK)</div><div class='del'>-		    &gt;&gt; OTPGU_P_SHIFT;</div><div class='add'>+		p_bits = (ipxotp_otpr(oi, oi-&gt;otpgu_base + OTPGU_P_OFF) &amp;</div><div class='add'>+			  OTPGU_P_MSK) &gt;&gt; OTPGU_P_SHIFT;</div><div class='ctx'> 		oi-&gt;status |= (p_bits &lt;&lt; OTPS_GUP_SHIFT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -220,7 +220,7 @@ static void _ipxotp_init(struct otpinfo *oi, struct chipcregs __iomem *cc)</div><div class='ctx'> 	oi-&gt;hwlim = oi-&gt;wsize;</div><div class='ctx'> 	if (oi-&gt;status &amp; OTPS_GUP_HW) {</div><div class='ctx'> 		oi-&gt;hwlim =</div><div class='del'>-		    ipxotp_otpr(oi, cc, oi-&gt;otpgu_base + OTPGU_HSB_OFF) / 16;</div><div class='add'>+		    ipxotp_otpr(oi, oi-&gt;otpgu_base + OTPGU_HSB_OFF) / 16;</div><div class='ctx'> 		oi-&gt;swbase = oi-&gt;hwlim;</div><div class='ctx'> 	} else</div><div class='ctx'> 		oi-&gt;swbase = oi-&gt;hwbase;</div><div class='hunk'>@@ -230,7 +230,7 @@ static void _ipxotp_init(struct otpinfo *oi, struct chipcregs __iomem *cc)</div><div class='ctx'> </div><div class='ctx'> 	if (oi-&gt;status &amp; OTPS_GUP_SW) {</div><div class='ctx'> 		oi-&gt;swlim =</div><div class='del'>-		    ipxotp_otpr(oi, cc, oi-&gt;otpgu_base + OTPGU_SFB_OFF) / 16;</div><div class='add'>+		    ipxotp_otpr(oi, oi-&gt;otpgu_base + OTPGU_SFB_OFF) / 16;</div><div class='ctx'> 		oi-&gt;fbase = oi-&gt;swlim;</div><div class='ctx'> 	} else</div><div class='ctx'> 		oi-&gt;fbase = oi-&gt;swbase;</div><div class='hunk'>@@ -240,11 +240,8 @@ static void _ipxotp_init(struct otpinfo *oi, struct chipcregs __iomem *cc)</div><div class='ctx'> </div><div class='ctx'> static int ipxotp_init(struct si_pub *sih, struct otpinfo *oi)</div><div class='ctx'> {</div><div class='del'>-	uint idx;</div><div class='del'>-	struct chipcregs __iomem *cc;</div><div class='del'>-</div><div class='ctx'> 	/* Make sure we're running IPX OTP */</div><div class='del'>-	if (!OTPTYPE_IPX(sih-&gt;ccrev))</div><div class='add'>+	if (!OTPTYPE_IPX(ai_get_ccrev(sih)))</div><div class='ctx'> 		return -EBADE;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure OTP is not disabled */</div><div class='hunk'>@@ -252,7 +249,7 @@ static int ipxotp_init(struct si_pub *sih, struct otpinfo *oi)</div><div class='ctx'> 		return -EBADE;</div><div class='ctx'> </div><div class='ctx'> 	/* Check for otp size */</div><div class='del'>-	switch ((sih-&gt;cccaps &amp; CC_CAP_OTPSIZE) &gt;&gt; CC_CAP_OTPSIZE_SHIFT) {</div><div class='add'>+	switch ((ai_get_cccaps(sih) &amp; CC_CAP_OTPSIZE) &gt;&gt; CC_CAP_OTPSIZE_SHIFT) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		/* Nothing there */</div><div class='ctx'> 		return -EBADE;</div><div class='hunk'>@@ -282,21 +279,13 @@ static int ipxotp_init(struct si_pub *sih, struct otpinfo *oi)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Retrieve OTP region info */</div><div class='del'>-	idx = ai_coreidx(sih);</div><div class='del'>-	cc = ai_setcoreidx(sih, SI_CC_IDX);</div><div class='del'>-</div><div class='del'>-	_ipxotp_init(oi, cc);</div><div class='del'>-</div><div class='del'>-	ai_setcoreidx(sih, idx);</div><div class='del'>-</div><div class='add'>+	_ipxotp_init(oi);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> ipxotp_read_region(struct otpinfo *oi, int region, u16 *data, uint *wlen)</div><div class='ctx'> {</div><div class='del'>-	uint idx;</div><div class='del'>-	struct chipcregs __iomem *cc;</div><div class='ctx'> 	uint base, i, sz;</div><div class='ctx'> </div><div class='ctx'> 	/* Validate region selection */</div><div class='hunk'>@@ -365,14 +354,10 @@ ipxotp_read_region(struct otpinfo *oi, int region, u16 *data, uint *wlen)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	idx = ai_coreidx(oi-&gt;sih);</div><div class='del'>-	cc = ai_setcoreidx(oi-&gt;sih, SI_CC_IDX);</div><div class='del'>-</div><div class='ctx'> 	/* Read the data */</div><div class='ctx'> 	for (i = 0; i &lt; sz; i++)</div><div class='del'>-		data[i] = ipxotp_otpr(oi, cc, base + i);</div><div class='add'>+		data[i] = ipxotp_otpr(oi, base + i);</div><div class='ctx'> </div><div class='del'>-	ai_setcoreidx(oi-&gt;sih, idx);</div><div class='ctx'> 	*wlen = sz;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -384,14 +369,13 @@ static const struct otp_fn_s ipxotp_fn = {</div><div class='ctx'> </div><div class='ctx'> static int otp_init(struct si_pub *sih, struct otpinfo *oi)</div><div class='ctx'> {</div><div class='del'>-</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	memset(oi, 0, sizeof(struct otpinfo));</div><div class='ctx'> </div><div class='del'>-	oi-&gt;ccrev = sih-&gt;ccrev;</div><div class='add'>+	oi-&gt;core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);</div><div class='ctx'> </div><div class='del'>-	if (OTPTYPE_IPX(oi-&gt;ccrev))</div><div class='add'>+	if (OTPTYPE_IPX(ai_get_ccrev(sih)))</div><div class='ctx'> 		oi-&gt;fn = &amp;ipxotp_fn;</div><div class='ctx'> </div><div class='ctx'> 	if (oi-&gt;fn == NULL)</div><div class='hunk'>@@ -399,7 +383,7 @@ static int otp_init(struct si_pub *sih, struct otpinfo *oi)</div><div class='ctx'> </div><div class='ctx'> 	oi-&gt;sih = sih;</div><div class='ctx'> </div><div class='del'>-	ret = (oi-&gt;fn-&gt;init) (sih, oi);</div><div class='add'>+	ret = (oi-&gt;fn-&gt;init)(sih, oi);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c<br/>index a3149254cbcd..264f8c4c703d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c</a></div><div class='hunk'>@@ -109,10 +109,10 @@ static const struct chan_info_basic chan_info_all[] = {</div><div class='ctx'> 	{204, 5020},</div><div class='ctx'> 	{208, 5040},</div><div class='ctx'> 	{212, 5060},</div><div class='del'>-	{216, 50800}</div><div class='add'>+	{216, 5080}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const u8 ofdm_rate_lookup[] = {</div><div class='add'>+static const u8 ofdm_rate_lookup[] = {</div><div class='ctx'> </div><div class='ctx'> 	BRCM_RATE_48M,</div><div class='ctx'> 	BRCM_RATE_24M,</div><div class='hunk'>@@ -149,9 +149,8 @@ void wlc_radioreg_enter(struct brcms_phy_pub *pih)</div><div class='ctx'> void wlc_radioreg_exit(struct brcms_phy_pub *pih)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_phy *pi = (struct brcms_phy *) pih;</div><div class='del'>-	u16 dummy;</div><div class='ctx'> </div><div class='del'>-	dummy = R_REG(&amp;pi-&gt;regs-&gt;phyversion);</div><div class='add'>+	(void)bcma_read16(pi-&gt;d11core, D11REGOFFS(phyversion));</div><div class='ctx'> 	pi-&gt;phy_wreg = 0;</div><div class='ctx'> 	wlapi_bmac_mctrl(pi-&gt;sh-&gt;physhim, MCTL_LOCK_RADIO, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -186,19 +185,11 @@ u16 read_radio_reg(struct brcms_phy *pi, u16 addr)</div><div class='ctx'> 	if ((D11REV_GE(pi-&gt;sh-&gt;corerev, 24)) ||</div><div class='ctx'> 	    (D11REV_IS(pi-&gt;sh-&gt;corerev, 22)</div><div class='ctx'> 	     &amp;&amp; (pi-&gt;pubpi.phy_type != PHY_TYPE_SSN))) {</div><div class='del'>-		W_REG_FLUSH(&amp;pi-&gt;regs-&gt;radioregaddr, addr);</div><div class='del'>-		data = R_REG(&amp;pi-&gt;regs-&gt;radioregdata);</div><div class='add'>+		bcma_wflush16(pi-&gt;d11core, D11REGOFFS(radioregaddr), addr);</div><div class='add'>+		data = bcma_read16(pi-&gt;d11core, D11REGOFFS(radioregdata));</div><div class='ctx'> 	} else {</div><div class='del'>-		W_REG_FLUSH(&amp;pi-&gt;regs-&gt;phy4waddr, addr);</div><div class='del'>-</div><div class='del'>-#ifdef __ARM_ARCH_4T__</div><div class='del'>-		__asm__(" .align 4 ");</div><div class='del'>-		__asm__(" nop ");</div><div class='del'>-		data = R_REG(&amp;pi-&gt;regs-&gt;phy4wdatalo);</div><div class='del'>-#else</div><div class='del'>-		data = R_REG(&amp;pi-&gt;regs-&gt;phy4wdatalo);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='add'>+		bcma_wflush16(pi-&gt;d11core, D11REGOFFS(phy4waddr), addr);</div><div class='add'>+		data = bcma_read16(pi-&gt;d11core, D11REGOFFS(phy4wdatalo));</div><div class='ctx'> 	}</div><div class='ctx'> 	pi-&gt;phy_wreg = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -211,15 +202,15 @@ void write_radio_reg(struct brcms_phy *pi, u16 addr, u16 val)</div><div class='ctx'> 	    (D11REV_IS(pi-&gt;sh-&gt;corerev, 22)</div><div class='ctx'> 	     &amp;&amp; (pi-&gt;pubpi.phy_type != PHY_TYPE_SSN))) {</div><div class='ctx'> </div><div class='del'>-		W_REG_FLUSH(&amp;pi-&gt;regs-&gt;radioregaddr, addr);</div><div class='del'>-		W_REG(&amp;pi-&gt;regs-&gt;radioregdata, val);</div><div class='add'>+		bcma_wflush16(pi-&gt;d11core, D11REGOFFS(radioregaddr), addr);</div><div class='add'>+		bcma_write16(pi-&gt;d11core, D11REGOFFS(radioregdata), val);</div><div class='ctx'> 	} else {</div><div class='del'>-		W_REG_FLUSH(&amp;pi-&gt;regs-&gt;phy4waddr, addr);</div><div class='del'>-		W_REG(&amp;pi-&gt;regs-&gt;phy4wdatalo, val);</div><div class='add'>+		bcma_wflush16(pi-&gt;d11core, D11REGOFFS(phy4waddr), addr);</div><div class='add'>+		bcma_write16(pi-&gt;d11core, D11REGOFFS(phy4wdatalo), val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (++pi-&gt;phy_wreg &gt;= pi-&gt;phy_wreg_limit) {</div><div class='del'>-		(void)R_REG(&amp;pi-&gt;regs-&gt;maccontrol);</div><div class='add'>+		(void)bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol));</div><div class='ctx'> 		pi-&gt;phy_wreg = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -231,19 +222,20 @@ static u32 read_radio_id(struct brcms_phy *pi)</div><div class='ctx'> 	if (D11REV_GE(pi-&gt;sh-&gt;corerev, 24)) {</div><div class='ctx'> 		u32 b0, b1, b2;</div><div class='ctx'> </div><div class='del'>-		W_REG_FLUSH(&amp;pi-&gt;regs-&gt;radioregaddr, 0);</div><div class='del'>-		b0 = (u32) R_REG(&amp;pi-&gt;regs-&gt;radioregdata);</div><div class='del'>-		W_REG_FLUSH(&amp;pi-&gt;regs-&gt;radioregaddr, 1);</div><div class='del'>-		b1 = (u32) R_REG(&amp;pi-&gt;regs-&gt;radioregdata);</div><div class='del'>-		W_REG_FLUSH(&amp;pi-&gt;regs-&gt;radioregaddr, 2);</div><div class='del'>-		b2 = (u32) R_REG(&amp;pi-&gt;regs-&gt;radioregdata);</div><div class='add'>+		bcma_wflush16(pi-&gt;d11core, D11REGOFFS(radioregaddr), 0);</div><div class='add'>+		b0 = (u32) bcma_read16(pi-&gt;d11core, D11REGOFFS(radioregdata));</div><div class='add'>+		bcma_wflush16(pi-&gt;d11core, D11REGOFFS(radioregaddr), 1);</div><div class='add'>+		b1 = (u32) bcma_read16(pi-&gt;d11core, D11REGOFFS(radioregdata));</div><div class='add'>+		bcma_wflush16(pi-&gt;d11core, D11REGOFFS(radioregaddr), 2);</div><div class='add'>+		b2 = (u32) bcma_read16(pi-&gt;d11core, D11REGOFFS(radioregdata));</div><div class='ctx'> </div><div class='ctx'> 		id = ((b0 &amp; 0xf) &lt;&lt; 28) | (((b2 &lt;&lt; 8) | b1) &lt;&lt; 12) | ((b0 &gt;&gt; 4)</div><div class='ctx'> 								      &amp; 0xf);</div><div class='ctx'> 	} else {</div><div class='del'>-		W_REG_FLUSH(&amp;pi-&gt;regs-&gt;phy4waddr, RADIO_IDCODE);</div><div class='del'>-		id = (u32) R_REG(&amp;pi-&gt;regs-&gt;phy4wdatalo);</div><div class='del'>-		id |= (u32) R_REG(&amp;pi-&gt;regs-&gt;phy4wdatahi) &lt;&lt; 16;</div><div class='add'>+		bcma_wflush16(pi-&gt;d11core, D11REGOFFS(phy4waddr), RADIO_IDCODE);</div><div class='add'>+		id = (u32) bcma_read16(pi-&gt;d11core, D11REGOFFS(phy4wdatalo));</div><div class='add'>+		id |= (u32) bcma_read16(pi-&gt;d11core,</div><div class='add'>+					D11REGOFFS(phy4wdatahi)) &lt;&lt; 16;</div><div class='ctx'> 	}</div><div class='ctx'> 	pi-&gt;phy_wreg = 0;</div><div class='ctx'> 	return id;</div><div class='hunk'>@@ -283,75 +275,52 @@ void mod_radio_reg(struct brcms_phy *pi, u16 addr, u16 mask, u16 val)</div><div class='ctx'> </div><div class='ctx'> void write_phy_channel_reg(struct brcms_phy *pi, uint val)</div><div class='ctx'> {</div><div class='del'>-	W_REG(&amp;pi-&gt;regs-&gt;phychannel, val);</div><div class='add'>+	bcma_write16(pi-&gt;d11core, D11REGOFFS(phychannel), val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u16 read_phy_reg(struct brcms_phy *pi, u16 addr)</div><div class='ctx'> {</div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='del'>-</div><div class='del'>-	regs = pi-&gt;regs;</div><div class='del'>-</div><div class='del'>-	W_REG_FLUSH(&amp;regs-&gt;phyregaddr, addr);</div><div class='add'>+	bcma_wflush16(pi-&gt;d11core, D11REGOFFS(phyregaddr), addr);</div><div class='ctx'> </div><div class='ctx'> 	pi-&gt;phy_wreg = 0;</div><div class='del'>-	return R_REG(&amp;regs-&gt;phyregdata);</div><div class='add'>+	return bcma_read16(pi-&gt;d11core, D11REGOFFS(phyregdata));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void write_phy_reg(struct brcms_phy *pi, u16 addr, u16 val)</div><div class='ctx'> {</div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='del'>-</div><div class='del'>-	regs = pi-&gt;regs;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_BCM47XX</div><div class='del'>-	W_REG_FLUSH(&amp;regs-&gt;phyregaddr, addr);</div><div class='del'>-	W_REG(&amp;regs-&gt;phyregdata, val);</div><div class='add'>+	bcma_wflush16(pi-&gt;d11core, D11REGOFFS(phyregaddr), addr);</div><div class='add'>+	bcma_write16(pi-&gt;d11core, D11REGOFFS(phyregdata), val);</div><div class='ctx'> 	if (addr == 0x72)</div><div class='del'>-		(void)R_REG(&amp;regs-&gt;phyregdata);</div><div class='add'>+		(void)bcma_read16(pi-&gt;d11core, D11REGOFFS(phyversion));</div><div class='ctx'> #else</div><div class='del'>-	W_REG((u32 __iomem *)(&amp;regs-&gt;phyregaddr), addr | (val &lt;&lt; 16));</div><div class='add'>+	bcma_write32(pi-&gt;d11core, D11REGOFFS(phyregaddr), addr | (val &lt;&lt; 16));</div><div class='ctx'> 	if (++pi-&gt;phy_wreg &gt;= pi-&gt;phy_wreg_limit) {</div><div class='ctx'> 		pi-&gt;phy_wreg = 0;</div><div class='del'>-		(void)R_REG(&amp;regs-&gt;phyversion);</div><div class='add'>+		(void)bcma_read16(pi-&gt;d11core, D11REGOFFS(phyversion));</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void and_phy_reg(struct brcms_phy *pi, u16 addr, u16 val)</div><div class='ctx'> {</div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='del'>-</div><div class='del'>-	regs = pi-&gt;regs;</div><div class='del'>-</div><div class='del'>-	W_REG_FLUSH(&amp;regs-&gt;phyregaddr, addr);</div><div class='del'>-</div><div class='del'>-	W_REG(&amp;regs-&gt;phyregdata, (R_REG(&amp;regs-&gt;phyregdata) &amp; val));</div><div class='add'>+	bcma_wflush16(pi-&gt;d11core, D11REGOFFS(phyregaddr), addr);</div><div class='add'>+	bcma_mask16(pi-&gt;d11core, D11REGOFFS(phyregdata), val);</div><div class='ctx'> 	pi-&gt;phy_wreg = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void or_phy_reg(struct brcms_phy *pi, u16 addr, u16 val)</div><div class='ctx'> {</div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='del'>-</div><div class='del'>-	regs = pi-&gt;regs;</div><div class='del'>-</div><div class='del'>-	W_REG_FLUSH(&amp;regs-&gt;phyregaddr, addr);</div><div class='del'>-</div><div class='del'>-	W_REG(&amp;regs-&gt;phyregdata, (R_REG(&amp;regs-&gt;phyregdata) | val));</div><div class='add'>+	bcma_wflush16(pi-&gt;d11core, D11REGOFFS(phyregaddr), addr);</div><div class='add'>+	bcma_set16(pi-&gt;d11core, D11REGOFFS(phyregdata), val);</div><div class='ctx'> 	pi-&gt;phy_wreg = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mod_phy_reg(struct brcms_phy *pi, u16 addr, u16 mask, u16 val)</div><div class='ctx'> {</div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='del'>-</div><div class='del'>-	regs = pi-&gt;regs;</div><div class='del'>-</div><div class='del'>-	W_REG_FLUSH(&amp;regs-&gt;phyregaddr, addr);</div><div class='del'>-</div><div class='del'>-	W_REG(&amp;regs-&gt;phyregdata,</div><div class='del'>-	      ((R_REG(&amp;regs-&gt;phyregdata) &amp; ~mask) | (val &amp; mask)));</div><div class='add'>+	val &amp;= mask;</div><div class='add'>+	bcma_wflush16(pi-&gt;d11core, D11REGOFFS(phyregaddr), addr);</div><div class='add'>+	bcma_maskset16(pi-&gt;d11core, D11REGOFFS(phyregdata), ~mask, val);</div><div class='ctx'> 	pi-&gt;phy_wreg = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -412,10 +381,8 @@ struct shared_phy *wlc_phy_shared_attach(struct shared_phy_params *shp)</div><div class='ctx'> 	sh-&gt;sromrev = shp-&gt;sromrev;</div><div class='ctx'> 	sh-&gt;boardtype = shp-&gt;boardtype;</div><div class='ctx'> 	sh-&gt;boardrev = shp-&gt;boardrev;</div><div class='del'>-	sh-&gt;boardvendor = shp-&gt;boardvendor;</div><div class='ctx'> 	sh-&gt;boardflags = shp-&gt;boardflags;</div><div class='ctx'> 	sh-&gt;boardflags2 = shp-&gt;boardflags2;</div><div class='del'>-	sh-&gt;buscorerev = shp-&gt;buscorerev;</div><div class='ctx'> </div><div class='ctx'> 	sh-&gt;fast_timer = PHY_SW_TIMER_FAST;</div><div class='ctx'> 	sh-&gt;slow_timer = PHY_SW_TIMER_SLOW;</div><div class='hunk'>@@ -458,7 +425,7 @@ static u32 wlc_phy_get_radio_ver(struct brcms_phy *pi)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct brcms_phy_pub *</div><div class='del'>-wlc_phy_attach(struct shared_phy *sh, struct d11regs __iomem *regs,</div><div class='add'>+wlc_phy_attach(struct shared_phy *sh, struct bcma_device *d11core,</div><div class='ctx'> 	       int bandtype, struct wiphy *wiphy)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_phy *pi;</div><div class='hunk'>@@ -470,7 +437,7 @@ wlc_phy_attach(struct shared_phy *sh, struct d11regs __iomem *regs,</div><div class='ctx'> 	if (D11REV_IS(sh-&gt;corerev, 4))</div><div class='ctx'> 		sflags = SISF_2G_PHY | SISF_5G_PHY;</div><div class='ctx'> 	else</div><div class='del'>-		sflags = ai_core_sflags(sh-&gt;sih, 0, 0);</div><div class='add'>+		sflags = bcma_aread32(d11core, BCMA_IOST);</div><div class='ctx'> </div><div class='ctx'> 	if (bandtype == BRCM_BAND_5G) {</div><div class='ctx'> 		if ((sflags &amp; (SISF_5G_PHY | SISF_DB_PHY)) == 0)</div><div class='hunk'>@@ -488,7 +455,7 @@ wlc_phy_attach(struct shared_phy *sh, struct d11regs __iomem *regs,</div><div class='ctx'> 	if (pi == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	pi-&gt;wiphy = wiphy;</div><div class='del'>-	pi-&gt;regs = regs;</div><div class='add'>+	pi-&gt;d11core = d11core;</div><div class='ctx'> 	pi-&gt;sh = sh;</div><div class='ctx'> 	pi-&gt;phy_init_por = true;</div><div class='ctx'> 	pi-&gt;phy_wreg_limit = PHY_WREG_LIMIT;</div><div class='hunk'>@@ -503,7 +470,7 @@ wlc_phy_attach(struct shared_phy *sh, struct d11regs __iomem *regs,</div><div class='ctx'> 		pi-&gt;pubpi.coreflags = SICF_GMODE;</div><div class='ctx'> </div><div class='ctx'> 	wlapi_bmac_corereset(pi-&gt;sh-&gt;physhim, pi-&gt;pubpi.coreflags);</div><div class='del'>-	phyversion = R_REG(&amp;pi-&gt;regs-&gt;phyversion);</div><div class='add'>+	phyversion = bcma_read16(pi-&gt;d11core, D11REGOFFS(phyversion));</div><div class='ctx'> </div><div class='ctx'> 	pi-&gt;pubpi.phy_type = PHY_TYPE(phyversion);</div><div class='ctx'> 	pi-&gt;pubpi.phy_rev = phyversion &amp; PV_PV_MASK;</div><div class='hunk'>@@ -515,8 +482,8 @@ wlc_phy_attach(struct shared_phy *sh, struct d11regs __iomem *regs,</div><div class='ctx'> 	pi-&gt;pubpi.phy_corenum = PHY_CORE_NUM_2;</div><div class='ctx'> 	pi-&gt;pubpi.ana_rev = (phyversion &amp; PV_AV_MASK) &gt;&gt; PV_AV_SHIFT;</div><div class='ctx'> </div><div class='del'>-	if (!pi-&gt;pubpi.phy_type == PHY_TYPE_N &amp;&amp;</div><div class='del'>-	    !pi-&gt;pubpi.phy_type == PHY_TYPE_LCN)</div><div class='add'>+	if (pi-&gt;pubpi.phy_type != PHY_TYPE_N &amp;&amp;</div><div class='add'>+	    pi-&gt;pubpi.phy_type != PHY_TYPE_LCN)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	if (bandtype == BRCM_BAND_5G) {</div><div class='hunk'>@@ -787,14 +754,14 @@ void wlc_phy_init(struct brcms_phy_pub *pih, u16 chanspec)</div><div class='ctx'> </div><div class='ctx'> 	pi-&gt;radio_chanspec = chanspec;</div><div class='ctx'> </div><div class='del'>-	mc = R_REG(&amp;pi-&gt;regs-&gt;maccontrol);</div><div class='add'>+	mc = bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol));</div><div class='ctx'> 	if (WARN(mc &amp; MCTL_EN_MAC, "HW error MAC running on init"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!(pi-&gt;measure_hold &amp; PHY_HOLD_FOR_SCAN))</div><div class='ctx'> 		pi-&gt;measure_hold |= PHY_HOLD_FOR_NOT_ASSOC;</div><div class='ctx'> </div><div class='del'>-	if (WARN(!(ai_core_sflags(pi-&gt;sh-&gt;sih, 0, 0) &amp; SISF_FCLKA),</div><div class='add'>+	if (WARN(!(bcma_aread32(pi-&gt;d11core, BCMA_IOST) &amp; SISF_FCLKA),</div><div class='ctx'> 		 "HW error SISF_FCLKA\n"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -833,8 +800,8 @@ void wlc_phy_cal_init(struct brcms_phy_pub *pih)</div><div class='ctx'> 	struct brcms_phy *pi = (struct brcms_phy *) pih;</div><div class='ctx'> 	void (*cal_init)(struct brcms_phy *) = NULL;</div><div class='ctx'> </div><div class='del'>-	if (WARN((R_REG(&amp;pi-&gt;regs-&gt;maccontrol) &amp; MCTL_EN_MAC) != 0,</div><div class='del'>-		 "HW error: MAC enabled during phy cal\n"))</div><div class='add'>+	if (WARN((bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol)) &amp;</div><div class='add'>+		  MCTL_EN_MAC) != 0, "HW error: MAC enabled during phy cal\n"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!pi-&gt;initialized) {</div><div class='hunk'>@@ -1025,7 +992,7 @@ wlc_phy_init_radio_regs(struct brcms_phy *pi,</div><div class='ctx'> void wlc_phy_do_dummy_tx(struct brcms_phy *pi, bool ofdm, bool pa_on)</div><div class='ctx'> {</div><div class='ctx'> #define DUMMY_PKT_LEN   20</div><div class='del'>-	struct d11regs __iomem *regs = pi-&gt;regs;</div><div class='add'>+	struct bcma_device *core = pi-&gt;d11core;</div><div class='ctx'> 	int i, count;</div><div class='ctx'> 	u8 ofdmpkt[DUMMY_PKT_LEN] = {</div><div class='ctx'> 		0xcc, 0x01, 0x02, 0x00, 0x00, 0x00, 0xd4, 0x00, 0x00, 0x00,</div><div class='hunk'>@@ -1041,26 +1008,28 @@ void wlc_phy_do_dummy_tx(struct brcms_phy *pi, bool ofdm, bool pa_on)</div><div class='ctx'> 	wlapi_bmac_write_template_ram(pi-&gt;sh-&gt;physhim, 0, DUMMY_PKT_LEN,</div><div class='ctx'> 				      dummypkt);</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;regs-&gt;xmtsel, 0);</div><div class='add'>+	bcma_write16(core, D11REGOFFS(xmtsel), 0);</div><div class='ctx'> </div><div class='ctx'> 	if (D11REV_GE(pi-&gt;sh-&gt;corerev, 11))</div><div class='del'>-		W_REG(&amp;regs-&gt;wepctl, 0x100);</div><div class='add'>+		bcma_write16(core, D11REGOFFS(wepctl), 0x100);</div><div class='ctx'> 	else</div><div class='del'>-		W_REG(&amp;regs-&gt;wepctl, 0);</div><div class='add'>+		bcma_write16(core, D11REGOFFS(wepctl), 0);</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;regs-&gt;txe_phyctl, (ofdm ? 1 : 0) | PHY_TXC_ANT_0);</div><div class='add'>+	bcma_write16(core, D11REGOFFS(txe_phyctl),</div><div class='add'>+		     (ofdm ? 1 : 0) | PHY_TXC_ANT_0);</div><div class='ctx'> 	if (ISNPHY(pi) || ISLCNPHY(pi))</div><div class='del'>-		W_REG(&amp;regs-&gt;txe_phyctl1, 0x1A02);</div><div class='add'>+		bcma_write16(core, D11REGOFFS(txe_phyctl1), 0x1A02);</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;regs-&gt;txe_wm_0, 0);</div><div class='del'>-	W_REG(&amp;regs-&gt;txe_wm_1, 0);</div><div class='add'>+	bcma_write16(core, D11REGOFFS(txe_wm_0), 0);</div><div class='add'>+	bcma_write16(core, D11REGOFFS(txe_wm_1), 0);</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;regs-&gt;xmttplatetxptr, 0);</div><div class='del'>-	W_REG(&amp;regs-&gt;xmttxcnt, DUMMY_PKT_LEN);</div><div class='add'>+	bcma_write16(core, D11REGOFFS(xmttplatetxptr), 0);</div><div class='add'>+	bcma_write16(core, D11REGOFFS(xmttxcnt), DUMMY_PKT_LEN);</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;regs-&gt;xmtsel, ((8 &lt;&lt; 8) | (1 &lt;&lt; 5) | (1 &lt;&lt; 2) | 2));</div><div class='add'>+	bcma_write16(core, D11REGOFFS(xmtsel),</div><div class='add'>+		     ((8 &lt;&lt; 8) | (1 &lt;&lt; 5) | (1 &lt;&lt; 2) | 2));</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;regs-&gt;txe_ctl, 0);</div><div class='add'>+	bcma_write16(core, D11REGOFFS(txe_ctl), 0);</div><div class='ctx'> </div><div class='ctx'> 	if (!pa_on) {</div><div class='ctx'> 		if (ISNPHY(pi))</div><div class='hunk'>@@ -1068,27 +1037,28 @@ void wlc_phy_do_dummy_tx(struct brcms_phy *pi, bool ofdm, bool pa_on)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ISNPHY(pi) || ISLCNPHY(pi))</div><div class='del'>-		W_REG(&amp;regs-&gt;txe_aux, 0xD0);</div><div class='add'>+		bcma_write16(core, D11REGOFFS(txe_aux), 0xD0);</div><div class='ctx'> 	else</div><div class='del'>-		W_REG(&amp;regs-&gt;txe_aux, ((1 &lt;&lt; 5) | (1 &lt;&lt; 4)));</div><div class='add'>+		bcma_write16(core, D11REGOFFS(txe_aux), ((1 &lt;&lt; 5) | (1 &lt;&lt; 4)));</div><div class='ctx'> </div><div class='del'>-	(void)R_REG(&amp;regs-&gt;txe_aux);</div><div class='add'>+	(void)bcma_read16(core, D11REGOFFS(txe_aux));</div><div class='ctx'> </div><div class='ctx'> 	i = 0;</div><div class='ctx'> 	count = ofdm ? 30 : 250;</div><div class='ctx'> 	while ((i++ &lt; count)</div><div class='del'>-	       &amp;&amp; (R_REG(&amp;regs-&gt;txe_status) &amp; (1 &lt;&lt; 7)))</div><div class='add'>+	       &amp;&amp; (bcma_read16(core, D11REGOFFS(txe_status)) &amp; (1 &lt;&lt; 7)))</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> </div><div class='ctx'> 	i = 0;</div><div class='ctx'> </div><div class='del'>-	while ((i++ &lt; 10)</div><div class='del'>-	       &amp;&amp; ((R_REG(&amp;regs-&gt;txe_status) &amp; (1 &lt;&lt; 10)) == 0))</div><div class='add'>+	while ((i++ &lt; 10) &amp;&amp;</div><div class='add'>+	       ((bcma_read16(core, D11REGOFFS(txe_status)) &amp; (1 &lt;&lt; 10)) == 0))</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> </div><div class='ctx'> 	i = 0;</div><div class='ctx'> </div><div class='del'>-	while ((i++ &lt; 10) &amp;&amp; ((R_REG(&amp;regs-&gt;ifsstat) &amp; (1 &lt;&lt; 8))))</div><div class='add'>+	while ((i++ &lt; 10) &amp;&amp;</div><div class='add'>+	       ((bcma_read16(core, D11REGOFFS(ifsstat)) &amp; (1 &lt;&lt; 8))))</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> </div><div class='ctx'> 	if (!pa_on) {</div><div class='hunk'>@@ -1145,7 +1115,7 @@ static bool wlc_phy_cal_txpower_recalc_sw(struct brcms_phy *pi)</div><div class='ctx'> void wlc_phy_switch_radio(struct brcms_phy_pub *pih, bool on)</div><div class='ctx'> {</div><div class='ctx'> 	struct brcms_phy *pi = (struct brcms_phy *) pih;</div><div class='del'>-	(void)R_REG(&amp;pi-&gt;regs-&gt;maccontrol);</div><div class='add'>+	(void)bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol));</div><div class='ctx'> </div><div class='ctx'> 	if (ISNPHY(pi)) {</div><div class='ctx'> 		wlc_phy_switch_radio_nphy(pi, on);</div><div class='hunk'>@@ -1385,7 +1355,7 @@ void wlc_phy_txpower_target_set(struct brcms_phy_pub *ppi,</div><div class='ctx'> 	memcpy(&amp;pi-&gt;tx_user_target[TXP_FIRST_MCS_40_SDM],</div><div class='ctx'> 	       &amp;txpwr-&gt;mcs_40_mimo[0], BRCMS_NUM_RATES_MCS_2_STREAM);</div><div class='ctx'> </div><div class='del'>-	if (R_REG(&amp;pi-&gt;regs-&gt;maccontrol) &amp; MCTL_EN_MAC)</div><div class='add'>+	if (bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol)) &amp; MCTL_EN_MAC)</div><div class='ctx'> 		mac_enabled = true;</div><div class='ctx'> </div><div class='ctx'> 	if (mac_enabled)</div><div class='hunk'>@@ -1415,7 +1385,8 @@ int wlc_phy_txpower_set(struct brcms_phy_pub *ppi, uint qdbm, bool override)</div><div class='ctx'> 		if (!SCAN_INPROG_PHY(pi)) {</div><div class='ctx'> 			bool suspend;</div><div class='ctx'> </div><div class='del'>-			suspend = (0 == (R_REG(&amp;pi-&gt;regs-&gt;maccontrol) &amp;</div><div class='add'>+			suspend = (0 == (bcma_read32(pi-&gt;d11core,</div><div class='add'>+						     D11REGOFFS(maccontrol)) &amp;</div><div class='ctx'> 					 MCTL_EN_MAC));</div><div class='ctx'> </div><div class='ctx'> 			if (!suspend)</div><div class='hunk'>@@ -1868,18 +1839,17 @@ void wlc_phy_runbist_config(struct brcms_phy_pub *ppi, bool start_end)</div><div class='ctx'> </div><div class='ctx'> 		if (NREV_IS(pi-&gt;pubpi.phy_rev, 3)</div><div class='ctx'> 		    || NREV_IS(pi-&gt;pubpi.phy_rev, 4)) {</div><div class='del'>-			W_REG(&amp;pi-&gt;regs-&gt;phyregaddr, 0xa0);</div><div class='del'>-			(void)R_REG(&amp;pi-&gt;regs-&gt;phyregaddr);</div><div class='del'>-			rxc = R_REG(&amp;pi-&gt;regs-&gt;phyregdata);</div><div class='del'>-			W_REG(&amp;pi-&gt;regs-&gt;phyregdata,</div><div class='del'>-			      (0x1 &lt;&lt; 15) | rxc);</div><div class='add'>+			bcma_wflush16(pi-&gt;d11core, D11REGOFFS(phyregaddr),</div><div class='add'>+				      0xa0);</div><div class='add'>+			bcma_set16(pi-&gt;d11core, D11REGOFFS(phyregdata),</div><div class='add'>+				   0x1 &lt;&lt; 15);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (NREV_IS(pi-&gt;pubpi.phy_rev, 3)</div><div class='ctx'> 		    || NREV_IS(pi-&gt;pubpi.phy_rev, 4)) {</div><div class='del'>-			W_REG(&amp;pi-&gt;regs-&gt;phyregaddr, 0xa0);</div><div class='del'>-			(void)R_REG(&amp;pi-&gt;regs-&gt;phyregaddr);</div><div class='del'>-			W_REG(&amp;pi-&gt;regs-&gt;phyregdata, rxc);</div><div class='add'>+			bcma_wflush16(pi-&gt;d11core, D11REGOFFS(phyregaddr),</div><div class='add'>+				      0xa0);</div><div class='add'>+			bcma_write16(pi-&gt;d11core, D11REGOFFS(phyregdata), rxc);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		wlc_phy_por_inform(ppi);</div><div class='hunk'>@@ -1999,7 +1969,9 @@ void wlc_phy_txpower_hw_ctrl_set(struct brcms_phy_pub *ppi, bool hwpwrctrl)</div><div class='ctx'> 	pi-&gt;txpwrctrl = hwpwrctrl;</div><div class='ctx'> </div><div class='ctx'> 	if (ISNPHY(pi)) {</div><div class='del'>-		suspend = (0 == (R_REG(&amp;pi-&gt;regs-&gt;maccontrol) &amp; MCTL_EN_MAC));</div><div class='add'>+		suspend = (0 == (bcma_read32(pi-&gt;d11core,</div><div class='add'>+					     D11REGOFFS(maccontrol)) &amp;</div><div class='add'>+				 MCTL_EN_MAC));</div><div class='ctx'> 		if (!suspend)</div><div class='ctx'> 			wlapi_suspend_mac_and_wait(pi-&gt;sh-&gt;physhim);</div><div class='ctx'> </div><div class='hunk'>@@ -2201,7 +2173,8 @@ void wlc_phy_ant_rxdiv_set(struct brcms_phy_pub *ppi, u8 val)</div><div class='ctx'> 	if (!pi-&gt;sh-&gt;clk)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	suspend = (0 == (R_REG(&amp;pi-&gt;regs-&gt;maccontrol) &amp; MCTL_EN_MAC));</div><div class='add'>+	suspend = (0 == (bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol)) &amp;</div><div class='add'>+			 MCTL_EN_MAC));</div><div class='ctx'> 	if (!suspend)</div><div class='ctx'> 		wlapi_suspend_mac_and_wait(pi-&gt;sh-&gt;physhim);</div><div class='ctx'> </div><div class='hunk'>@@ -2419,8 +2392,8 @@ wlc_phy_noise_sample_request(struct brcms_phy_pub *pih, u8 reason, u8 ch)</div><div class='ctx'> 			wlapi_bmac_write_shm(pi-&gt;sh-&gt;physhim, M_PWRIND_MAP2, 0);</div><div class='ctx'> 			wlapi_bmac_write_shm(pi-&gt;sh-&gt;physhim, M_PWRIND_MAP3, 0);</div><div class='ctx'> </div><div class='del'>-			OR_REG(&amp;pi-&gt;regs-&gt;maccommand,</div><div class='del'>-			       MCMD_BG_NOISE);</div><div class='add'>+			bcma_set32(pi-&gt;d11core, D11REGOFFS(maccommand),</div><div class='add'>+				   MCMD_BG_NOISE);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			wlapi_suspend_mac_and_wait(pi-&gt;sh-&gt;physhim);</div><div class='ctx'> 			wlc_lcnphy_deaf_mode(pi, (bool) 0);</div><div class='hunk'>@@ -2438,8 +2411,8 @@ wlc_phy_noise_sample_request(struct brcms_phy_pub *pih, u8 reason, u8 ch)</div><div class='ctx'> 			wlapi_bmac_write_shm(pi-&gt;sh-&gt;physhim, M_PWRIND_MAP2, 0);</div><div class='ctx'> 			wlapi_bmac_write_shm(pi-&gt;sh-&gt;physhim, M_PWRIND_MAP3, 0);</div><div class='ctx'> </div><div class='del'>-			OR_REG(&amp;pi-&gt;regs-&gt;maccommand,</div><div class='del'>-			       MCMD_BG_NOISE);</div><div class='add'>+			bcma_set32(pi-&gt;d11core, D11REGOFFS(maccommand),</div><div class='add'>+				   MCMD_BG_NOISE);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			struct phy_iq_est est[PHY_CORE_MAX];</div><div class='ctx'> 			u32 cmplx_pwr[PHY_CORE_MAX];</div><div class='hunk'>@@ -2932,29 +2905,29 @@ void wlc_lcnphy_epa_switch(struct brcms_phy *pi, bool mode)</div><div class='ctx'> 				mod_phy_reg(pi, 0x44c, (0x1 &lt;&lt; 2), (1) &lt;&lt; 2);</div><div class='ctx'> </div><div class='ctx'> 			}</div><div class='del'>-			ai_corereg(pi-&gt;sh-&gt;sih, SI_CC_IDX,</div><div class='del'>-				   offsetof(struct chipcregs, gpiocontrol),</div><div class='del'>-				   ~0x0, 0x0);</div><div class='del'>-			ai_corereg(pi-&gt;sh-&gt;sih, SI_CC_IDX,</div><div class='del'>-				   offsetof(struct chipcregs, gpioout), 0x40,</div><div class='del'>-				   0x40);</div><div class='del'>-			ai_corereg(pi-&gt;sh-&gt;sih, SI_CC_IDX,</div><div class='del'>-				   offsetof(struct chipcregs, gpioouten), 0x40,</div><div class='del'>-				   0x40);</div><div class='add'>+			ai_cc_reg(pi-&gt;sh-&gt;sih,</div><div class='add'>+				  offsetof(struct chipcregs, gpiocontrol),</div><div class='add'>+				  ~0x0, 0x0);</div><div class='add'>+			ai_cc_reg(pi-&gt;sh-&gt;sih,</div><div class='add'>+				  offsetof(struct chipcregs, gpioout),</div><div class='add'>+				  0x40, 0x40);</div><div class='add'>+			ai_cc_reg(pi-&gt;sh-&gt;sih,</div><div class='add'>+				  offsetof(struct chipcregs, gpioouten),</div><div class='add'>+				  0x40, 0x40);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			mod_phy_reg(pi, 0x44c, (0x1 &lt;&lt; 2), (0) &lt;&lt; 2);</div><div class='ctx'> </div><div class='ctx'> 			mod_phy_reg(pi, 0x44d, (0x1 &lt;&lt; 2), (0) &lt;&lt; 2);</div><div class='ctx'> </div><div class='del'>-			ai_corereg(pi-&gt;sh-&gt;sih, SI_CC_IDX,</div><div class='del'>-				   offsetof(struct chipcregs, gpioout), 0x40,</div><div class='del'>-				   0x00);</div><div class='del'>-			ai_corereg(pi-&gt;sh-&gt;sih, SI_CC_IDX,</div><div class='del'>-				   offsetof(struct chipcregs, gpioouten), 0x40,</div><div class='del'>-				   0x0);</div><div class='del'>-			ai_corereg(pi-&gt;sh-&gt;sih, SI_CC_IDX,</div><div class='del'>-				   offsetof(struct chipcregs, gpiocontrol),</div><div class='del'>-				   ~0x0, 0x40);</div><div class='add'>+			ai_cc_reg(pi-&gt;sh-&gt;sih,</div><div class='add'>+				  offsetof(struct chipcregs, gpioout),</div><div class='add'>+				  0x40, 0x00);</div><div class='add'>+			ai_cc_reg(pi-&gt;sh-&gt;sih,</div><div class='add'>+				  offsetof(struct chipcregs, gpioouten),</div><div class='add'>+				  0x40, 0x0);</div><div class='add'>+			ai_cc_reg(pi-&gt;sh-&gt;sih,</div><div class='add'>+				  offsetof(struct chipcregs, gpiocontrol),</div><div class='add'>+				  ~0x0, 0x40);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h<br/>index 96e15163222b..e34a71e7d242 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h</a></div><div class='hunk'>@@ -166,7 +166,6 @@ struct shared_phy_params {</div><div class='ctx'> 	struct phy_shim_info *physhim;</div><div class='ctx'> 	uint unit;</div><div class='ctx'> 	uint corerev;</div><div class='del'>-	uint buscorerev;</div><div class='ctx'> 	u16 vid;</div><div class='ctx'> 	u16 did;</div><div class='ctx'> 	uint chip;</div><div class='hunk'>@@ -175,7 +174,6 @@ struct shared_phy_params {</div><div class='ctx'> 	uint sromrev;</div><div class='ctx'> 	uint boardtype;</div><div class='ctx'> 	uint boardrev;</div><div class='del'>-	uint boardvendor;</div><div class='ctx'> 	u32 boardflags;</div><div class='ctx'> 	u32 boardflags2;</div><div class='ctx'> };</div><div class='hunk'>@@ -183,7 +181,7 @@ struct shared_phy_params {</div><div class='ctx'> </div><div class='ctx'> extern struct shared_phy *wlc_phy_shared_attach(struct shared_phy_params *shp);</div><div class='ctx'> extern struct brcms_phy_pub *wlc_phy_attach(struct shared_phy *sh,</div><div class='del'>-					    struct d11regs __iomem *regs,</div><div class='add'>+					    struct bcma_device *d11core,</div><div class='ctx'> 					    int bandtype, struct wiphy *wiphy);</div><div class='ctx'> extern void wlc_phy_detach(struct brcms_phy_pub *ppi);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h<br/>index bea85241a244..af00e2c2b266 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h</a></div><div class='hunk'>@@ -503,10 +503,8 @@ struct shared_phy {</div><div class='ctx'> 	uint sromrev;</div><div class='ctx'> 	uint boardtype;</div><div class='ctx'> 	uint boardrev;</div><div class='del'>-	uint boardvendor;</div><div class='ctx'> 	u32 boardflags;</div><div class='ctx'> 	u32 boardflags2;</div><div class='del'>-	uint buscorerev;</div><div class='ctx'> 	uint fast_timer;</div><div class='ctx'> 	uint slow_timer;</div><div class='ctx'> 	uint glacial_timer;</div><div class='hunk'>@@ -559,7 +557,7 @@ struct brcms_phy {</div><div class='ctx'> 	} u;</div><div class='ctx'> 	bool user_txpwr_at_rfport;</div><div class='ctx'> </div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='add'>+	struct bcma_device *d11core;</div><div class='ctx'> 	struct brcms_phy *next;</div><div class='ctx'> 	struct brcms_phy_pub pubpi;</div><div class='ctx'> </div><div class='hunk'>@@ -774,11 +772,6 @@ struct brcms_phy {</div><div class='ctx'> 	s16 nphy_noise_win[PHY_CORE_MAX][PHY_NOISE_WINDOW_SZ];</div><div class='ctx'> 	u8 nphy_noise_index;</div><div class='ctx'> </div><div class='del'>-	u8 nphy_txpid2g[PHY_CORE_NUM_2];</div><div class='del'>-	u8 nphy_txpid5g[PHY_CORE_NUM_2];</div><div class='del'>-	u8 nphy_txpid5gl[PHY_CORE_NUM_2];</div><div class='del'>-	u8 nphy_txpid5gh[PHY_CORE_NUM_2];</div><div class='del'>-</div><div class='ctx'> 	bool nphy_gain_boost;</div><div class='ctx'> 	bool nphy_elna_gain_config;</div><div class='ctx'> 	u16 old_bphy_test;</div><div class='hunk'>@@ -1095,7 +1088,7 @@ extern void wlc_phy_table_write_nphy(struct brcms_phy *pi, u32, u32, u32,</div><div class='ctx'> </div><div class='ctx'> #define BRCMS_PHY_WAR_PR51571(pi) \</div><div class='ctx'> 	if (NREV_LT((pi)-&gt;pubpi.phy_rev, 3)) \</div><div class='del'>-		(void)R_REG(&amp;(pi)-&gt;regs-&gt;maccontrol)</div><div class='add'>+		(void)bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol))</div><div class='ctx'> </div><div class='ctx'> extern void wlc_phy_cal_perical_nphy_run(struct brcms_phy *pi, u8 caltype);</div><div class='ctx'> extern void wlc_phy_aci_reset_nphy(struct brcms_phy *pi);</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c<br/>index a63aa99d9810..ce8562aa5db0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c</a></div><div class='hunk'>@@ -1603,7 +1603,7 @@ wlc_lcnphy_set_chanspec_tweaks(struct brcms_phy *pi, u16 chanspec)</div><div class='ctx'> 		si_pmu_pllupd(pi-&gt;sh-&gt;sih);</div><div class='ctx'> 		write_phy_reg(pi, 0x942, 0);</div><div class='ctx'> 		wlc_lcnphy_txrx_spur_avoidance_mode(pi, false);</div><div class='del'>-		pi_lcn-&gt;lcnphy_spurmod = 0;</div><div class='add'>+		pi_lcn-&gt;lcnphy_spurmod = false;</div><div class='ctx'> 		mod_phy_reg(pi, 0x424, (0xff &lt;&lt; 8), (0x1b) &lt;&lt; 8);</div><div class='ctx'> </div><div class='ctx'> 		write_phy_reg(pi, 0x425, 0x5907);</div><div class='hunk'>@@ -1616,7 +1616,7 @@ wlc_lcnphy_set_chanspec_tweaks(struct brcms_phy *pi, u16 chanspec)</div><div class='ctx'> 		write_phy_reg(pi, 0x942, 0);</div><div class='ctx'> 		wlc_lcnphy_txrx_spur_avoidance_mode(pi, true);</div><div class='ctx'> </div><div class='del'>-		pi_lcn-&gt;lcnphy_spurmod = 0;</div><div class='add'>+		pi_lcn-&gt;lcnphy_spurmod = false;</div><div class='ctx'> 		mod_phy_reg(pi, 0x424, (0xff &lt;&lt; 8), (0x1f) &lt;&lt; 8);</div><div class='ctx'> </div><div class='ctx'> 		write_phy_reg(pi, 0x425, 0x590a);</div><div class='hunk'>@@ -2325,7 +2325,7 @@ static s8 wlc_lcnphy_tempcompensated_txpwrctrl(struct brcms_phy *pi)</div><div class='ctx'> {</div><div class='ctx'> 	s8 index, delta_brd, delta_temp, new_index, tempcorrx;</div><div class='ctx'> 	s16 manp, meas_temp, temp_diff;</div><div class='del'>-	bool neg = 0;</div><div class='add'>+	bool neg = false;</div><div class='ctx'> 	u16 temp;</div><div class='ctx'> 	struct brcms_phy_lcnphy *pi_lcn = pi-&gt;u.pi_lcnphy;</div><div class='ctx'> </div><div class='hunk'>@@ -2348,7 +2348,7 @@ static s8 wlc_lcnphy_tempcompensated_txpwrctrl(struct brcms_phy *pi)</div><div class='ctx'> 	manp = LCNPHY_TEMPSENSE(pi_lcn-&gt;lcnphy_rawtempsense);</div><div class='ctx'> 	temp_diff = manp - meas_temp;</div><div class='ctx'> 	if (temp_diff &lt; 0) {</div><div class='del'>-		neg = 1;</div><div class='add'>+		neg = true;</div><div class='ctx'> 		temp_diff = -temp_diff;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2813,10 +2813,8 @@ static void wlc_lcnphy_idle_tssi_est(struct brcms_phy_pub *ppi)</div><div class='ctx'> 	u16 SAVE_jtag_auxpga = read_radio_reg(pi, RADIO_2064_REG0FF) &amp; 0x10;</div><div class='ctx'> 	u16 SAVE_iqadc_aux_en = read_radio_reg(pi, RADIO_2064_REG11F) &amp; 4;</div><div class='ctx'> 	idleTssi = read_phy_reg(pi, 0x4ab);</div><div class='del'>-	suspend =</div><div class='del'>-		(0 ==</div><div class='del'>-		 (R_REG(&amp;((struct brcms_phy *) pi)-&gt;regs-&gt;maccontrol) &amp;</div><div class='del'>-		  MCTL_EN_MAC));</div><div class='add'>+	suspend = (0 == (bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol)) &amp;</div><div class='add'>+			 MCTL_EN_MAC));</div><div class='ctx'> 	if (!suspend)</div><div class='ctx'> 		wlapi_suspend_mac_and_wait(pi-&gt;sh-&gt;physhim);</div><div class='ctx'> 	wlc_lcnphy_set_tx_pwr_ctrl(pi, LCNPHY_TX_PWR_CTRL_OFF);</div><div class='hunk'>@@ -2890,7 +2888,8 @@ static void wlc_lcnphy_vbat_temp_sense_setup(struct brcms_phy *pi, u8 mode)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 14; i++)</div><div class='ctx'> 		values_to_save[i] = read_phy_reg(pi, tempsense_phy_regs[i]);</div><div class='del'>-	suspend = (0 == (R_REG(&amp;pi-&gt;regs-&gt;maccontrol) &amp; MCTL_EN_MAC));</div><div class='add'>+	suspend = (0 == (bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol)) &amp;</div><div class='add'>+			 MCTL_EN_MAC));</div><div class='ctx'> 	if (!suspend)</div><div class='ctx'> 		wlapi_suspend_mac_and_wait(pi-&gt;sh-&gt;physhim);</div><div class='ctx'> 	save_txpwrCtrlEn = read_radio_reg(pi, 0x4a4);</div><div class='hunk'>@@ -3016,8 +3015,8 @@ static void wlc_lcnphy_tx_pwr_ctrl_init(struct brcms_phy_pub *ppi)</div><div class='ctx'> 	bool suspend;</div><div class='ctx'> 	struct brcms_phy *pi = (struct brcms_phy *) ppi;</div><div class='ctx'> </div><div class='del'>-	suspend =</div><div class='del'>-		(0 == (R_REG(&amp;pi-&gt;regs-&gt;maccontrol) &amp; MCTL_EN_MAC));</div><div class='add'>+	suspend = (0 == (bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol)) &amp;</div><div class='add'>+			 MCTL_EN_MAC));</div><div class='ctx'> 	if (!suspend)</div><div class='ctx'> 		wlapi_suspend_mac_and_wait(pi-&gt;sh-&gt;physhim);</div><div class='ctx'> </div><div class='hunk'>@@ -3535,15 +3534,17 @@ wlc_lcnphy_samp_cap(struct brcms_phy *pi, int clip_detect_algo, u16 thresh,</div><div class='ctx'> 	timer = 0;</div><div class='ctx'> 	old_sslpnCalibClkEnCtrl = read_phy_reg(pi, 0x6da);</div><div class='ctx'> </div><div class='del'>-	curval1 = R_REG(&amp;pi-&gt;regs-&gt;psm_corectlsts);</div><div class='add'>+	curval1 = bcma_read16(pi-&gt;d11core, D11REGOFFS(psm_corectlsts));</div><div class='ctx'> 	ptr[130] = 0;</div><div class='del'>-	W_REG(&amp;pi-&gt;regs-&gt;psm_corectlsts, ((1 &lt;&lt; 6) | curval1));</div><div class='add'>+	bcma_write16(pi-&gt;d11core, D11REGOFFS(psm_corectlsts),</div><div class='add'>+		     ((1 &lt;&lt; 6) | curval1));</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;pi-&gt;regs-&gt;smpl_clct_strptr, 0x7E00);</div><div class='del'>-	W_REG(&amp;pi-&gt;regs-&gt;smpl_clct_stpptr, 0x8000);</div><div class='add'>+	bcma_write16(pi-&gt;d11core, D11REGOFFS(smpl_clct_strptr), 0x7E00);</div><div class='add'>+	bcma_write16(pi-&gt;d11core, D11REGOFFS(smpl_clct_stpptr), 0x8000);</div><div class='ctx'> 	udelay(20);</div><div class='del'>-	curval2 = R_REG(&amp;pi-&gt;regs-&gt;psm_phy_hdr_param);</div><div class='del'>-	W_REG(&amp;pi-&gt;regs-&gt;psm_phy_hdr_param, curval2 | 0x30);</div><div class='add'>+	curval2 = bcma_read16(pi-&gt;d11core, D11REGOFFS(psm_phy_hdr_param));</div><div class='add'>+	bcma_write16(pi-&gt;d11core, D11REGOFFS(psm_phy_hdr_param),</div><div class='add'>+		     curval2 | 0x30);</div><div class='ctx'> </div><div class='ctx'> 	write_phy_reg(pi, 0x555, 0x0);</div><div class='ctx'> 	write_phy_reg(pi, 0x5a6, 0x5);</div><div class='hunk'>@@ -3560,19 +3561,19 @@ wlc_lcnphy_samp_cap(struct brcms_phy *pi, int clip_detect_algo, u16 thresh,</div><div class='ctx'> </div><div class='ctx'> 	sslpnCalibClkEnCtrl = read_phy_reg(pi, 0x6da);</div><div class='ctx'> 	write_phy_reg(pi, 0x6da, (u32) (sslpnCalibClkEnCtrl | 0x2008));</div><div class='del'>-	stpptr = R_REG(&amp;pi-&gt;regs-&gt;smpl_clct_stpptr);</div><div class='del'>-	curptr = R_REG(&amp;pi-&gt;regs-&gt;smpl_clct_curptr);</div><div class='add'>+	stpptr = bcma_read16(pi-&gt;d11core, D11REGOFFS(smpl_clct_stpptr));</div><div class='add'>+	curptr = bcma_read16(pi-&gt;d11core, D11REGOFFS(smpl_clct_curptr));</div><div class='ctx'> 	do {</div><div class='ctx'> 		udelay(10);</div><div class='del'>-		curptr = R_REG(&amp;pi-&gt;regs-&gt;smpl_clct_curptr);</div><div class='add'>+		curptr = bcma_read16(pi-&gt;d11core, D11REGOFFS(smpl_clct_curptr));</div><div class='ctx'> 		timer++;</div><div class='ctx'> 	} while ((curptr != stpptr) &amp;&amp; (timer &lt; 500));</div><div class='ctx'> </div><div class='del'>-	W_REG(&amp;pi-&gt;regs-&gt;psm_phy_hdr_param, 0x2);</div><div class='add'>+	bcma_write16(pi-&gt;d11core, D11REGOFFS(psm_phy_hdr_param), 0x2);</div><div class='ctx'> 	strptr = 0x7E00;</div><div class='del'>-	W_REG(&amp;pi-&gt;regs-&gt;tplatewrptr, strptr);</div><div class='add'>+	bcma_write32(pi-&gt;d11core, D11REGOFFS(tplatewrptr), strptr);</div><div class='ctx'> 	while (strptr &lt; 0x8000) {</div><div class='del'>-		val = R_REG(&amp;pi-&gt;regs-&gt;tplatewrdata);</div><div class='add'>+		val = bcma_read32(pi-&gt;d11core, D11REGOFFS(tplatewrdata));</div><div class='ctx'> 		imag = ((val &gt;&gt; 16) &amp; 0x3ff);</div><div class='ctx'> 		real = ((val) &amp; 0x3ff);</div><div class='ctx'> 		if (imag &gt; 511)</div><div class='hunk'>@@ -3597,8 +3598,8 @@ wlc_lcnphy_samp_cap(struct brcms_phy *pi, int clip_detect_algo, u16 thresh,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	write_phy_reg(pi, 0x6da, old_sslpnCalibClkEnCtrl);</div><div class='del'>-	W_REG(&amp;pi-&gt;regs-&gt;psm_phy_hdr_param, curval2);</div><div class='del'>-	W_REG(&amp;pi-&gt;regs-&gt;psm_corectlsts, curval1);</div><div class='add'>+	bcma_write16(pi-&gt;d11core, D11REGOFFS(psm_phy_hdr_param), curval2);</div><div class='add'>+	bcma_write16(pi-&gt;d11core, D11REGOFFS(psm_corectlsts), curval1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -3681,8 +3682,8 @@ wlc_lcnphy_a1(struct brcms_phy *pi, int cal_type, int num_levels,</div><div class='ctx'> 	wlc_lcnphy_set_cc(pi, cal_type, phy_c15, phy_c16);</div><div class='ctx'> 	udelay(20);</div><div class='ctx'> 	for (phy_c8 = 0; phy_c7 != 0 &amp;&amp; phy_c8 &lt; num_levels; phy_c8++) {</div><div class='del'>-		phy_c23 = 1;</div><div class='del'>-		phy_c22 = 0;</div><div class='add'>+		phy_c23 = true;</div><div class='add'>+		phy_c22 = false;</div><div class='ctx'> 		switch (cal_type) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			phy_c10 = 511;</div><div class='hunk'>@@ -3700,18 +3701,18 @@ wlc_lcnphy_a1(struct brcms_phy *pi, int cal_type, int num_levels,</div><div class='ctx'> </div><div class='ctx'> 		phy_c9 = read_phy_reg(pi, 0x93d);</div><div class='ctx'> 		phy_c9 = 2 * phy_c9;</div><div class='del'>-		phy_c24 = 0;</div><div class='add'>+		phy_c24 = false;</div><div class='ctx'> 		phy_c5 = 7;</div><div class='del'>-		phy_c25 = 1;</div><div class='add'>+		phy_c25 = true;</div><div class='ctx'> 		while (1) {</div><div class='ctx'> 			write_radio_reg(pi, RADIO_2064_REG026,</div><div class='ctx'> 					(phy_c5 &amp; 0x7) | ((phy_c5 &amp; 0x7) &lt;&lt; 4));</div><div class='ctx'> 			udelay(50);</div><div class='del'>-			phy_c22 = 0;</div><div class='add'>+			phy_c22 = false;</div><div class='ctx'> 			ptr[130] = 0;</div><div class='ctx'> 			wlc_lcnphy_samp_cap(pi, 1, phy_c9, &amp;ptr[0], 2);</div><div class='ctx'> 			if (ptr[130] == 1)</div><div class='del'>-				phy_c22 = 1;</div><div class='add'>+				phy_c22 = true;</div><div class='ctx'> 			if (phy_c22)</div><div class='ctx'> 				phy_c5 -= 1;</div><div class='ctx'> 			if ((phy_c22 != phy_c24) &amp;&amp; (!phy_c25))</div><div class='hunk'>@@ -3721,7 +3722,7 @@ wlc_lcnphy_a1(struct brcms_phy *pi, int cal_type, int num_levels,</div><div class='ctx'> 			if (phy_c5 &lt;= 0 || phy_c5 &gt;= 7)</div><div class='ctx'> 				break;</div><div class='ctx'> 			phy_c24 = phy_c22;</div><div class='del'>-			phy_c25 = 0;</div><div class='add'>+			phy_c25 = false;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (phy_c5 &lt; 0)</div><div class='hunk'>@@ -3772,10 +3773,10 @@ wlc_lcnphy_a1(struct brcms_phy *pi, int cal_type, int num_levels,</div><div class='ctx'> 					phy_c13 = phy_c11;</div><div class='ctx'> 					phy_c14 = phy_c12;</div><div class='ctx'> 				}</div><div class='del'>-				phy_c23 = 0;</div><div class='add'>+				phy_c23 = false;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		phy_c23 = 1;</div><div class='add'>+		phy_c23 = true;</div><div class='ctx'> 		phy_c15 = phy_c13;</div><div class='ctx'> 		phy_c16 = phy_c14;</div><div class='ctx'> 		phy_c7 = phy_c7 &gt;&gt; 1;</div><div class='hunk'>@@ -3965,12 +3966,12 @@ s16 wlc_lcnphy_tempsense_new(struct brcms_phy *pi, bool mode)</div><div class='ctx'> {</div><div class='ctx'> 	u16 tempsenseval1, tempsenseval2;</div><div class='ctx'> 	s16 avg = 0;</div><div class='del'>-	bool suspend = 0;</div><div class='add'>+	bool suspend = false;</div><div class='ctx'> </div><div class='ctx'> 	if (mode == 1) {</div><div class='del'>-		suspend =</div><div class='del'>-			(0 ==</div><div class='del'>-			 (R_REG(&amp;pi-&gt;regs-&gt;maccontrol) &amp; MCTL_EN_MAC));</div><div class='add'>+		suspend = (0 == (bcma_read32(pi-&gt;d11core,</div><div class='add'>+					     D11REGOFFS(maccontrol)) &amp;</div><div class='add'>+				 MCTL_EN_MAC));</div><div class='ctx'> 		if (!suspend)</div><div class='ctx'> 			wlapi_suspend_mac_and_wait(pi-&gt;sh-&gt;physhim);</div><div class='ctx'> 		wlc_lcnphy_vbat_temp_sense_setup(pi, TEMPSENSE);</div><div class='hunk'>@@ -4007,14 +4008,14 @@ u16 wlc_lcnphy_tempsense(struct brcms_phy *pi, bool mode)</div><div class='ctx'> {</div><div class='ctx'> 	u16 tempsenseval1, tempsenseval2;</div><div class='ctx'> 	s32 avg = 0;</div><div class='del'>-	bool suspend = 0;</div><div class='add'>+	bool suspend = false;</div><div class='ctx'> 	u16 SAVE_txpwrctrl = wlc_lcnphy_get_tx_pwr_ctrl(pi);</div><div class='ctx'> 	struct brcms_phy_lcnphy *pi_lcn = pi-&gt;u.pi_lcnphy;</div><div class='ctx'> </div><div class='ctx'> 	if (mode == 1) {</div><div class='del'>-		suspend =</div><div class='del'>-			(0 ==</div><div class='del'>-			 (R_REG(&amp;pi-&gt;regs-&gt;maccontrol) &amp; MCTL_EN_MAC));</div><div class='add'>+		suspend = (0 == (bcma_read32(pi-&gt;d11core,</div><div class='add'>+					     D11REGOFFS(maccontrol)) &amp;</div><div class='add'>+				 MCTL_EN_MAC));</div><div class='ctx'> 		if (!suspend)</div><div class='ctx'> 			wlapi_suspend_mac_and_wait(pi-&gt;sh-&gt;physhim);</div><div class='ctx'> 		wlc_lcnphy_vbat_temp_sense_setup(pi, TEMPSENSE);</div><div class='hunk'>@@ -4075,12 +4076,12 @@ s8 wlc_lcnphy_vbatsense(struct brcms_phy *pi, bool mode)</div><div class='ctx'> {</div><div class='ctx'> 	u16 vbatsenseval;</div><div class='ctx'> 	s32 avg = 0;</div><div class='del'>-	bool suspend = 0;</div><div class='add'>+	bool suspend = false;</div><div class='ctx'> </div><div class='ctx'> 	if (mode == 1) {</div><div class='del'>-		suspend =</div><div class='del'>-			(0 ==</div><div class='del'>-			 (R_REG(&amp;pi-&gt;regs-&gt;maccontrol) &amp; MCTL_EN_MAC));</div><div class='add'>+		suspend = (0 == (bcma_read32(pi-&gt;d11core,</div><div class='add'>+					     D11REGOFFS(maccontrol)) &amp;</div><div class='add'>+				 MCTL_EN_MAC));</div><div class='ctx'> 		if (!suspend)</div><div class='ctx'> 			wlapi_suspend_mac_and_wait(pi-&gt;sh-&gt;physhim);</div><div class='ctx'> 		wlc_lcnphy_vbat_temp_sense_setup(pi, VBATSENSE);</div><div class='hunk'>@@ -4127,8 +4128,8 @@ static void wlc_lcnphy_glacial_timer_based_cal(struct brcms_phy *pi)</div><div class='ctx'> 	s8 index;</div><div class='ctx'> 	u16 SAVE_pwrctrl = wlc_lcnphy_get_tx_pwr_ctrl(pi);</div><div class='ctx'> 	struct brcms_phy_lcnphy *pi_lcn = pi-&gt;u.pi_lcnphy;</div><div class='del'>-	suspend =</div><div class='del'>-		(0 == (R_REG(&amp;pi-&gt;regs-&gt;maccontrol) &amp; MCTL_EN_MAC));</div><div class='add'>+	suspend = (0 == (bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol)) &amp;</div><div class='add'>+			 MCTL_EN_MAC));</div><div class='ctx'> 	if (!suspend)</div><div class='ctx'> 		wlapi_suspend_mac_and_wait(pi-&gt;sh-&gt;physhim);</div><div class='ctx'> 	wlc_lcnphy_deaf_mode(pi, true);</div><div class='hunk'>@@ -4166,8 +4167,8 @@ static void wlc_lcnphy_periodic_cal(struct brcms_phy *pi)</div><div class='ctx'> 	pi_lcn-&gt;lcnphy_full_cal_channel = CHSPEC_CHANNEL(pi-&gt;radio_chanspec);</div><div class='ctx'> 	index = pi_lcn-&gt;lcnphy_current_index;</div><div class='ctx'> </div><div class='del'>-	suspend =</div><div class='del'>-		(0 == (R_REG(&amp;pi-&gt;regs-&gt;maccontrol) &amp; MCTL_EN_MAC));</div><div class='add'>+	suspend = (0 == (bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol)) &amp;</div><div class='add'>+			 MCTL_EN_MAC));</div><div class='ctx'> 	if (!suspend) {</div><div class='ctx'> 		wlapi_bmac_write_shm(pi-&gt;sh-&gt;physhim, M_CTS_DURATION, 10000);</div><div class='ctx'> 		wlapi_suspend_mac_and_wait(pi-&gt;sh-&gt;physhim);</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c<br/>index cd19c2f7a347..a16f1ab292fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include "phy_radio.h"</div><div class='ctx'> #include "phyreg_n.h"</div><div class='ctx'> #include "phytbl_n.h"</div><div class='add'>+#include "soc.h"</div><div class='ctx'> </div><div class='ctx'> #define READ_RADIO_REG2(pi, radio_type, jspace, core, reg_name)	\</div><div class='ctx'> 	read_radio_reg(pi, radio_type##_##jspace##_##reg_name |	\</div><div class='hunk'>@@ -14417,12 +14418,6 @@ static void wlc_phy_txpwr_srom_read_ppr_nphy(struct brcms_phy *pi)</div><div class='ctx'> 		switch (band_num) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> </div><div class='del'>-			pi-&gt;nphy_txpid2g[PHY_CORE_0] =</div><div class='del'>-				(u8) wlapi_getintvar(shim,</div><div class='del'>-						     BRCMS_SROM_TXPID2GA0);</div><div class='del'>-			pi-&gt;nphy_txpid2g[PHY_CORE_1] =</div><div class='del'>-				(u8) wlapi_getintvar(shim,</div><div class='del'>-						     BRCMS_SROM_TXPID2GA1);</div><div class='ctx'> 			pi-&gt;nphy_pwrctrl_info[PHY_CORE_0].max_pwr_2g =</div><div class='ctx'> 				(s8) wlapi_getintvar(shim,</div><div class='ctx'> 						     BRCMS_SROM_MAXP2GA0);</div><div class='hunk'>@@ -14486,12 +14481,6 @@ static void wlc_phy_txpwr_srom_read_ppr_nphy(struct brcms_phy *pi)</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 1:</div><div class='ctx'> </div><div class='del'>-			pi-&gt;nphy_txpid5g[PHY_CORE_0] =</div><div class='del'>-				(u8) wlapi_getintvar(shim,</div><div class='del'>-						     BRCMS_SROM_TXPID5GA0);</div><div class='del'>-			pi-&gt;nphy_txpid5g[PHY_CORE_1] =</div><div class='del'>-				(u8) wlapi_getintvar(shim,</div><div class='del'>-						     BRCMS_SROM_TXPID5GA1);</div><div class='ctx'> 			pi-&gt;nphy_pwrctrl_info[PHY_CORE_0].max_pwr_5gm =</div><div class='ctx'> 				(s8) wlapi_getintvar(shim, BRCMS_SROM_MAXP5GA0);</div><div class='ctx'> 			pi-&gt;nphy_pwrctrl_info[PHY_CORE_1].max_pwr_5gm =</div><div class='hunk'>@@ -14551,12 +14540,6 @@ static void wlc_phy_txpwr_srom_read_ppr_nphy(struct brcms_phy *pi)</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 2:</div><div class='ctx'> </div><div class='del'>-			pi-&gt;nphy_txpid5gl[0] =</div><div class='del'>-				(u8) wlapi_getintvar(shim,</div><div class='del'>-						     BRCMS_SROM_TXPID5GLA0);</div><div class='del'>-			pi-&gt;nphy_txpid5gl[1] =</div><div class='del'>-				(u8) wlapi_getintvar(shim,</div><div class='del'>-						     BRCMS_SROM_TXPID5GLA1);</div><div class='ctx'> 			pi-&gt;nphy_pwrctrl_info[0].max_pwr_5gl =</div><div class='ctx'> 				(s8) wlapi_getintvar(shim,</div><div class='ctx'> 						     BRCMS_SROM_MAXP5GLA0);</div><div class='hunk'>@@ -14615,12 +14598,6 @@ static void wlc_phy_txpwr_srom_read_ppr_nphy(struct brcms_phy *pi)</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 3:</div><div class='ctx'> </div><div class='del'>-			pi-&gt;nphy_txpid5gh[0] =</div><div class='del'>-				(u8) wlapi_getintvar(shim,</div><div class='del'>-						     BRCMS_SROM_TXPID5GHA0);</div><div class='del'>-			pi-&gt;nphy_txpid5gh[1] =</div><div class='del'>-				(u8) wlapi_getintvar(shim,</div><div class='del'>-						     BRCMS_SROM_TXPID5GHA1);</div><div class='ctx'> 			pi-&gt;nphy_pwrctrl_info[0].max_pwr_5gh =</div><div class='ctx'> 				(s8) wlapi_getintvar(shim,</div><div class='ctx'> 						     BRCMS_SROM_MAXP5GHA0);</div><div class='hunk'>@@ -17825,7 +17802,7 @@ static void wlc_phy_txpwrctrl_pwr_setup_nphy(struct brcms_phy *pi)</div><div class='ctx'> </div><div class='ctx'> 	if (D11REV_IS(pi-&gt;sh-&gt;corerev, 11) || D11REV_IS(pi-&gt;sh-&gt;corerev, 12)) {</div><div class='ctx'> 		wlapi_bmac_mctrl(pi-&gt;sh-&gt;physhim, MCTL_PHYLOCK, MCTL_PHYLOCK);</div><div class='del'>-		(void)R_REG(&amp;pi-&gt;regs-&gt;maccontrol);</div><div class='add'>+		(void)bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol));</div><div class='ctx'> 		udelay(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -17976,7 +17953,7 @@ static void wlc_phy_txpwrctrl_pwr_setup_nphy(struct brcms_phy *pi)</div><div class='ctx'> </div><div class='ctx'> 	if (D11REV_IS(pi-&gt;sh-&gt;corerev, 11) || D11REV_IS(pi-&gt;sh-&gt;corerev, 12)) {</div><div class='ctx'> 		wlapi_bmac_mctrl(pi-&gt;sh-&gt;physhim, MCTL_PHYLOCK, MCTL_PHYLOCK);</div><div class='del'>-		(void)R_REG(&amp;pi-&gt;regs-&gt;maccontrol);</div><div class='add'>+		(void)bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol));</div><div class='ctx'> 		udelay(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -19470,8 +19447,6 @@ void wlc_phy_init_nphy(struct brcms_phy *pi)</div><div class='ctx'> 	u8 tx_pwr_ctrl_state;</div><div class='ctx'> 	bool do_nphy_cal = false;</div><div class='ctx'> 	uint core;</div><div class='del'>-	uint origidx, intr_val;</div><div class='del'>-	struct d11regs __iomem *regs;</div><div class='ctx'> 	u32 d11_clk_ctl_st;</div><div class='ctx'> 	bool do_rssi_cal = false;</div><div class='ctx'> </div><div class='hunk'>@@ -19485,25 +19460,21 @@ void wlc_phy_init_nphy(struct brcms_phy *pi)</div><div class='ctx'> 	     (pi-&gt;sh-&gt;chippkg == BCM4718_PKG_ID))) {</div><div class='ctx'> 		if ((pi-&gt;sh-&gt;boardflags &amp; BFL_EXTLNA) &amp;&amp;</div><div class='ctx'> 		    (CHSPEC_IS2G(pi-&gt;radio_chanspec)))</div><div class='del'>-			ai_corereg(pi-&gt;sh-&gt;sih, SI_CC_IDX,</div><div class='del'>-				   offsetof(struct chipcregs, chipcontrol),</div><div class='del'>-				   0x40, 0x40);</div><div class='add'>+			ai_cc_reg(pi-&gt;sh-&gt;sih,</div><div class='add'>+				  offsetof(struct chipcregs, chipcontrol),</div><div class='add'>+				  0x40, 0x40);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((pi-&gt;nphy_gband_spurwar2_en) &amp;&amp; CHSPEC_IS2G(pi-&gt;radio_chanspec) &amp;&amp;</div><div class='ctx'> 	    CHSPEC_IS40(pi-&gt;radio_chanspec)) {</div><div class='ctx'> </div><div class='del'>-		regs = (struct d11regs __iomem *)</div><div class='del'>-				ai_switch_core(pi-&gt;sh-&gt;sih,</div><div class='del'>-					       D11_CORE_ID, &amp;origidx,</div><div class='del'>-					       &amp;intr_val);</div><div class='del'>-		d11_clk_ctl_st = R_REG(&amp;regs-&gt;clk_ctl_st);</div><div class='del'>-		AND_REG(&amp;regs-&gt;clk_ctl_st,</div><div class='del'>-			~(CCS_FORCEHT | CCS_HTAREQ));</div><div class='add'>+		d11_clk_ctl_st = bcma_read32(pi-&gt;d11core,</div><div class='add'>+					     D11REGOFFS(clk_ctl_st));</div><div class='add'>+		bcma_mask32(pi-&gt;d11core, D11REGOFFS(clk_ctl_st),</div><div class='add'>+			    ~(CCS_FORCEHT | CCS_HTAREQ));</div><div class='ctx'> </div><div class='del'>-		W_REG(&amp;regs-&gt;clk_ctl_st, d11_clk_ctl_st);</div><div class='del'>-</div><div class='del'>-		ai_restore_core(pi-&gt;sh-&gt;sih, origidx, intr_val);</div><div class='add'>+		bcma_write32(pi-&gt;d11core, D11REGOFFS(clk_ctl_st),</div><div class='add'>+			     d11_clk_ctl_st);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pi-&gt;use_int_tx_iqlo_cal_nphy =</div><div class='hunk'>@@ -19908,7 +19879,8 @@ void wlc_phy_rxcore_setstate_nphy(struct brcms_phy_pub *pih, u8 rxcore_bitmask)</div><div class='ctx'> 	if (!pi-&gt;sh-&gt;clk)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	suspend = (0 == (R_REG(&amp;pi-&gt;regs-&gt;maccontrol) &amp; MCTL_EN_MAC));</div><div class='add'>+	suspend = (0 == (bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol)) &amp;</div><div class='add'>+			 MCTL_EN_MAC));</div><div class='ctx'> 	if (!suspend)</div><div class='ctx'> 		wlapi_suspend_mac_and_wait(pi-&gt;sh-&gt;physhim);</div><div class='ctx'> </div><div class='hunk'>@@ -21286,28 +21258,28 @@ wlc_phy_chanspec_nphy_setup(struct brcms_phy *pi, u16 chanspec,</div><div class='ctx'> 	val = read_phy_reg(pi, 0x09) &amp; NPHY_BandControl_currentBand;</div><div class='ctx'> 	if (CHSPEC_IS5G(chanspec) &amp;&amp; !val) {</div><div class='ctx'> </div><div class='del'>-		val = R_REG(&amp;pi-&gt;regs-&gt;psm_phy_hdr_param);</div><div class='del'>-		W_REG(&amp;pi-&gt;regs-&gt;psm_phy_hdr_param,</div><div class='add'>+		val = bcma_read16(pi-&gt;d11core, D11REGOFFS(psm_phy_hdr_param));</div><div class='add'>+		bcma_write16(pi-&gt;d11core, D11REGOFFS(psm_phy_hdr_param),</div><div class='ctx'> 		      (val | MAC_PHY_FORCE_CLK));</div><div class='ctx'> </div><div class='ctx'> 		or_phy_reg(pi, (NPHY_TO_BPHY_OFF + BPHY_BB_CONFIG),</div><div class='ctx'> 			   (BBCFG_RESETCCA | BBCFG_RESETRX));</div><div class='ctx'> </div><div class='del'>-		W_REG(&amp;pi-&gt;regs-&gt;psm_phy_hdr_param, val);</div><div class='add'>+		bcma_write16(pi-&gt;d11core, D11REGOFFS(psm_phy_hdr_param), val);</div><div class='ctx'> </div><div class='ctx'> 		or_phy_reg(pi, 0x09, NPHY_BandControl_currentBand);</div><div class='ctx'> 	} else if (!CHSPEC_IS5G(chanspec) &amp;&amp; val) {</div><div class='ctx'> </div><div class='ctx'> 		and_phy_reg(pi, 0x09, ~NPHY_BandControl_currentBand);</div><div class='ctx'> </div><div class='del'>-		val = R_REG(&amp;pi-&gt;regs-&gt;psm_phy_hdr_param);</div><div class='del'>-		W_REG(&amp;pi-&gt;regs-&gt;psm_phy_hdr_param,</div><div class='add'>+		val = bcma_read16(pi-&gt;d11core, D11REGOFFS(psm_phy_hdr_param));</div><div class='add'>+		bcma_write16(pi-&gt;d11core, D11REGOFFS(psm_phy_hdr_param),</div><div class='ctx'> 		      (val | MAC_PHY_FORCE_CLK));</div><div class='ctx'> </div><div class='ctx'> 		and_phy_reg(pi, (NPHY_TO_BPHY_OFF + BPHY_BB_CONFIG),</div><div class='ctx'> 			    (u16) (~(BBCFG_RESETCCA | BBCFG_RESETRX)));</div><div class='ctx'> </div><div class='del'>-		W_REG(&amp;pi-&gt;regs-&gt;psm_phy_hdr_param, val);</div><div class='add'>+		bcma_write16(pi-&gt;d11core, D11REGOFFS(psm_phy_hdr_param), val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	write_phy_reg(pi, 0x1ce, ci-&gt;PHY_BW1a);</div><div class='hunk'>@@ -21365,24 +21337,23 @@ wlc_phy_chanspec_nphy_setup(struct brcms_phy *pi, u16 chanspec,</div><div class='ctx'> 			spuravoid = 1;</div><div class='ctx'> </div><div class='ctx'> 		wlapi_bmac_core_phypll_ctl(pi-&gt;sh-&gt;physhim, false);</div><div class='del'>-		si_pmu_spuravoid(pi-&gt;sh-&gt;sih, spuravoid);</div><div class='add'>+		si_pmu_spuravoid_pllupdate(pi-&gt;sh-&gt;sih, spuravoid);</div><div class='ctx'> 		wlapi_bmac_core_phypll_ctl(pi-&gt;sh-&gt;physhim, true);</div><div class='ctx'> </div><div class='ctx'> 		if ((pi-&gt;sh-&gt;chip == BCM43224_CHIP_ID) ||</div><div class='ctx'> 		    (pi-&gt;sh-&gt;chip == BCM43225_CHIP_ID)) {</div><div class='del'>-</div><div class='ctx'> 			if (spuravoid == 1) {</div><div class='del'>-</div><div class='del'>-				W_REG(&amp;pi-&gt;regs-&gt;tsf_clk_frac_l,</div><div class='del'>-				      0x5341);</div><div class='del'>-				W_REG(&amp;pi-&gt;regs-&gt;tsf_clk_frac_h,</div><div class='del'>-				      0x8);</div><div class='add'>+				bcma_write16(pi-&gt;d11core,</div><div class='add'>+					     D11REGOFFS(tsf_clk_frac_l),</div><div class='add'>+					     0x5341);</div><div class='add'>+				bcma_write16(pi-&gt;d11core,</div><div class='add'>+					     D11REGOFFS(tsf_clk_frac_h), 0x8);</div><div class='ctx'> 			} else {</div><div class='del'>-</div><div class='del'>-				W_REG(&amp;pi-&gt;regs-&gt;tsf_clk_frac_l,</div><div class='del'>-				      0x8889);</div><div class='del'>-				W_REG(&amp;pi-&gt;regs-&gt;tsf_clk_frac_h,</div><div class='del'>-				      0x8);</div><div class='add'>+				bcma_write16(pi-&gt;d11core,</div><div class='add'>+					     D11REGOFFS(tsf_clk_frac_l),</div><div class='add'>+					     0x8889);</div><div class='add'>+				bcma_write16(pi-&gt;d11core,</div><div class='add'>+					     D11REGOFFS(tsf_clk_frac_h), 0x8);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -21522,13 +21493,13 @@ void wlc_phy_antsel_init(struct brcms_phy_pub *ppi, bool lut_init)</div><div class='ctx'> </div><div class='ctx'> 		ai_gpiocontrol(pi-&gt;sh-&gt;sih, mask, mask, GPIO_DRV_PRIORITY);</div><div class='ctx'> </div><div class='del'>-		mc = R_REG(&amp;pi-&gt;regs-&gt;maccontrol);</div><div class='add'>+		mc = bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol));</div><div class='ctx'> 		mc &amp;= ~MCTL_GPOUT_SEL_MASK;</div><div class='del'>-		W_REG(&amp;pi-&gt;regs-&gt;maccontrol, mc);</div><div class='add'>+		bcma_write32(pi-&gt;d11core, D11REGOFFS(maccontrol), mc);</div><div class='ctx'> </div><div class='del'>-		OR_REG(&amp;pi-&gt;regs-&gt;psm_gpio_oe, mask);</div><div class='add'>+		bcma_set16(pi-&gt;d11core, D11REGOFFS(psm_gpio_oe), mask);</div><div class='ctx'> </div><div class='del'>-		AND_REG(&amp;pi-&gt;regs-&gt;psm_gpio_out, ~mask);</div><div class='add'>+		bcma_mask16(pi-&gt;d11core, D11REGOFFS(psm_gpio_out), ~mask);</div><div class='ctx'> </div><div class='ctx'> 		if (lut_init) {</div><div class='ctx'> 			write_phy_reg(pi, 0xf8, 0x02d8);</div><div class='hunk'>@@ -21545,9 +21516,8 @@ u16 wlc_phy_classifier_nphy(struct brcms_phy *pi, u16 mask, u16 val)</div><div class='ctx'> 	bool suspended = false;</div><div class='ctx'> </div><div class='ctx'> 	if (D11REV_IS(pi-&gt;sh-&gt;corerev, 16)) {</div><div class='del'>-		suspended =</div><div class='del'>-			(R_REG(&amp;pi-&gt;regs-&gt;maccontrol) &amp; MCTL_EN_MAC) ?</div><div class='del'>-			false : true;</div><div class='add'>+		suspended = (bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol)) &amp;</div><div class='add'>+			     MCTL_EN_MAC) ? false : true;</div><div class='ctx'> 		if (!suspended)</div><div class='ctx'> 			wlapi_suspend_mac_and_wait(pi-&gt;sh-&gt;physhim);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -25406,7 +25376,8 @@ static void wlc_phy_a4(struct brcms_phy *pi, bool full_cal)</div><div class='ctx'> 	if (pi-&gt;nphy_papd_skip == 1)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	phy_b3 = (0 == (R_REG(&amp;pi-&gt;regs-&gt;maccontrol) &amp; MCTL_EN_MAC));</div><div class='add'>+	phy_b3 = (0 == (bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol)) &amp;</div><div class='add'>+			MCTL_EN_MAC));</div><div class='ctx'> 	if (!phy_b3)</div><div class='ctx'> 		wlapi_suspend_mac_and_wait(pi-&gt;sh-&gt;physhim);</div><div class='ctx'> </div><div class='hunk'>@@ -27994,20 +27965,11 @@ void wlc_phy_txpwr_fixpower_nphy(struct brcms_phy *pi)</div><div class='ctx'> 		chan_freq_range = wlc_phy_get_chan_freq_range_nphy(pi, 0);</div><div class='ctx'> 		switch (chan_freq_range) {</div><div class='ctx'> 		case WL_CHAN_FREQ_RANGE_2G:</div><div class='del'>-			txpi[0] = pi-&gt;nphy_txpid2g[0];</div><div class='del'>-			txpi[1] = pi-&gt;nphy_txpid2g[1];</div><div class='del'>-			break;</div><div class='ctx'> 		case WL_CHAN_FREQ_RANGE_5GL:</div><div class='del'>-			txpi[0] = pi-&gt;nphy_txpid5gl[0];</div><div class='del'>-			txpi[1] = pi-&gt;nphy_txpid5gl[1];</div><div class='del'>-			break;</div><div class='ctx'> 		case WL_CHAN_FREQ_RANGE_5GM:</div><div class='del'>-			txpi[0] = pi-&gt;nphy_txpid5g[0];</div><div class='del'>-			txpi[1] = pi-&gt;nphy_txpid5g[1];</div><div class='del'>-			break;</div><div class='ctx'> 		case WL_CHAN_FREQ_RANGE_5GH:</div><div class='del'>-			txpi[0] = pi-&gt;nphy_txpid5gh[0];</div><div class='del'>-			txpi[1] = pi-&gt;nphy_txpid5gh[1];</div><div class='add'>+			txpi[0] = 0;</div><div class='add'>+			txpi[1] = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			txpi[0] = txpi[1] = 91;</div><div class='hunk'>@@ -28389,7 +28351,7 @@ void wlc_phy_txpower_recalc_target_nphy(struct brcms_phy *pi)</div><div class='ctx'> </div><div class='ctx'> 	if (D11REV_IS(pi-&gt;sh-&gt;corerev, 11) || D11REV_IS(pi-&gt;sh-&gt;corerev, 12)) {</div><div class='ctx'> 		wlapi_bmac_mctrl(pi-&gt;sh-&gt;physhim, MCTL_PHYLOCK, MCTL_PHYLOCK);</div><div class='del'>-		(void)R_REG(&amp;pi-&gt;regs-&gt;maccontrol);</div><div class='add'>+		(void)bcma_read32(pi-&gt;d11core, D11REGOFFS(maccontrol));</div><div class='ctx'> 		udelay(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/pmu.c b/drivers/net/wireless/brcm80211/brcmsmac/pmu.c<br/>index 3b36e3acfd74..4931d29d077b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/pmu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/pmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/pmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/pmu.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include "pub.h"</div><div class='ctx'> #include "aiutils.h"</div><div class='ctx'> #include "pmu.h"</div><div class='add'>+#include "soc.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * external LPO crystal frequency</div><div class='hunk'>@@ -114,10 +115,10 @@ static void si_pmu_res_masks(struct si_pub *sih, u32 * pmin, u32 * pmax)</div><div class='ctx'> 	uint rsrcs;</div><div class='ctx'> </div><div class='ctx'> 	/* # resources */</div><div class='del'>-	rsrcs = (sih-&gt;pmucaps &amp; PCAP_RC_MASK) &gt;&gt; PCAP_RC_SHIFT;</div><div class='add'>+	rsrcs = (ai_get_pmucaps(sih) &amp; PCAP_RC_MASK) &gt;&gt; PCAP_RC_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	/* determine min/max rsrc masks */</div><div class='del'>-	switch (sih-&gt;chip) {</div><div class='add'>+	switch (ai_get_chip_id(sih)) {</div><div class='ctx'> 	case BCM43224_CHIP_ID:</div><div class='ctx'> 	case BCM43225_CHIP_ID:</div><div class='ctx'> 		/* ??? */</div><div class='hunk'>@@ -138,75 +139,84 @@ static void si_pmu_res_masks(struct si_pub *sih, u32 * pmin, u32 * pmax)</div><div class='ctx'> 	*pmax = max_mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-si_pmu_spuravoid_pllupdate(struct si_pub *sih, struct chipcregs __iomem *cc,</div><div class='del'>-			   u8 spuravoid)</div><div class='add'>+void si_pmu_spuravoid_pllupdate(struct si_pub *sih, u8 spuravoid)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tmp = 0;</div><div class='add'>+	struct bcma_device *core;</div><div class='ctx'> </div><div class='del'>-	switch (sih-&gt;chip) {</div><div class='add'>+	/* switch to chipc */</div><div class='add'>+	core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);</div><div class='add'>+</div><div class='add'>+	switch (ai_get_chip_id(sih)) {</div><div class='ctx'> 	case BCM43224_CHIP_ID:</div><div class='ctx'> 	case BCM43225_CHIP_ID:</div><div class='ctx'> 		if (spuravoid == 1) {</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_addr, PMU1_PLL0_PLLCTL0);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_data, 0x11500010);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_addr, PMU1_PLL0_PLLCTL1);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_data, 0x000C0C06);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_addr, PMU1_PLL0_PLLCTL2);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_data, 0x0F600a08);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_addr, PMU1_PLL0_PLLCTL3);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_data, 0x00000000);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_addr, PMU1_PLL0_PLLCTL4);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_data, 0x2001E920);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_addr, PMU1_PLL0_PLLCTL5);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_data, 0x88888815);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),</div><div class='add'>+				     PMU1_PLL0_PLLCTL0);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),</div><div class='add'>+				     0x11500010);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),</div><div class='add'>+				     PMU1_PLL0_PLLCTL1);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),</div><div class='add'>+				     0x000C0C06);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),</div><div class='add'>+				     PMU1_PLL0_PLLCTL2);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),</div><div class='add'>+				     0x0F600a08);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),</div><div class='add'>+				     PMU1_PLL0_PLLCTL3);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),</div><div class='add'>+				     0x00000000);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),</div><div class='add'>+				     PMU1_PLL0_PLLCTL4);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),</div><div class='add'>+				     0x2001E920);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),</div><div class='add'>+				     PMU1_PLL0_PLLCTL5);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),</div><div class='add'>+				     0x88888815);</div><div class='ctx'> 		} else {</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_addr, PMU1_PLL0_PLLCTL0);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_data, 0x11100010);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_addr, PMU1_PLL0_PLLCTL1);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_data, 0x000c0c06);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_addr, PMU1_PLL0_PLLCTL2);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_data, 0x03000a08);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_addr, PMU1_PLL0_PLLCTL3);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_data, 0x00000000);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_addr, PMU1_PLL0_PLLCTL4);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_data, 0x200005c0);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_addr, PMU1_PLL0_PLLCTL5);</div><div class='del'>-			W_REG(&amp;cc-&gt;pllcontrol_data, 0x88888815);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),</div><div class='add'>+				     PMU1_PLL0_PLLCTL0);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),</div><div class='add'>+				     0x11100010);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),</div><div class='add'>+				     PMU1_PLL0_PLLCTL1);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),</div><div class='add'>+				     0x000c0c06);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),</div><div class='add'>+				     PMU1_PLL0_PLLCTL2);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),</div><div class='add'>+				     0x03000a08);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),</div><div class='add'>+				     PMU1_PLL0_PLLCTL3);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),</div><div class='add'>+				     0x00000000);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),</div><div class='add'>+				     PMU1_PLL0_PLLCTL4);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),</div><div class='add'>+				     0x200005c0);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),</div><div class='add'>+				     PMU1_PLL0_PLLCTL5);</div><div class='add'>+			bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),</div><div class='add'>+				     0x88888815);</div><div class='ctx'> 		}</div><div class='ctx'> 		tmp = 1 &lt;&lt; 10;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-		W_REG(&amp;cc-&gt;pllcontrol_addr, PMU1_PLL0_PLLCTL0);</div><div class='del'>-		W_REG(&amp;cc-&gt;pllcontrol_data, 0x11100008);</div><div class='del'>-		W_REG(&amp;cc-&gt;pllcontrol_addr, PMU1_PLL0_PLLCTL1);</div><div class='del'>-		W_REG(&amp;cc-&gt;pllcontrol_data, 0x0c000c06);</div><div class='del'>-		W_REG(&amp;cc-&gt;pllcontrol_addr, PMU1_PLL0_PLLCTL2);</div><div class='del'>-		W_REG(&amp;cc-&gt;pllcontrol_data, 0x03000a08);</div><div class='del'>-		W_REG(&amp;cc-&gt;pllcontrol_addr, PMU1_PLL0_PLLCTL3);</div><div class='del'>-		W_REG(&amp;cc-&gt;pllcontrol_data, 0x00000000);</div><div class='del'>-		W_REG(&amp;cc-&gt;pllcontrol_addr, PMU1_PLL0_PLLCTL4);</div><div class='del'>-		W_REG(&amp;cc-&gt;pllcontrol_data, 0x200005c0);</div><div class='del'>-		W_REG(&amp;cc-&gt;pllcontrol_addr, PMU1_PLL0_PLLCTL5);</div><div class='del'>-		W_REG(&amp;cc-&gt;pllcontrol_data, 0x88888855);</div><div class='del'>-</div><div class='del'>-		tmp = 1 &lt;&lt; 10;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* bail out */</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tmp |= R_REG(&amp;cc-&gt;pmucontrol);</div><div class='del'>-	W_REG(&amp;cc-&gt;pmucontrol, tmp);</div><div class='add'>+	bcma_set32(core, CHIPCREGOFFS(pmucontrol), tmp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u16 si_pmu_fast_pwrup_delay(struct si_pub *sih)</div><div class='ctx'> {</div><div class='ctx'> 	uint delay = PMU_MAX_TRANSITION_DLY;</div><div class='ctx'> </div><div class='del'>-	switch (sih-&gt;chip) {</div><div class='add'>+	switch (ai_get_chip_id(sih)) {</div><div class='ctx'> 	case BCM43224_CHIP_ID:</div><div class='ctx'> 	case BCM43225_CHIP_ID:</div><div class='ctx'> 	case BCM4313_CHIP_ID:</div><div class='hunk'>@@ -219,54 +229,35 @@ u16 si_pmu_fast_pwrup_delay(struct si_pub *sih)</div><div class='ctx'> 	return (u16) delay;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void si_pmu_sprom_enable(struct si_pub *sih, bool enable)</div><div class='del'>-{</div><div class='del'>-	struct chipcregs __iomem *cc;</div><div class='del'>-	uint origidx;</div><div class='del'>-</div><div class='del'>-	/* Remember original core before switch to chipc */</div><div class='del'>-	origidx = ai_coreidx(sih);</div><div class='del'>-	cc = ai_setcoreidx(sih, SI_CC_IDX);</div><div class='del'>-</div><div class='del'>-	/* Return to original core */</div><div class='del'>-	ai_setcoreidx(sih, origidx);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Read/write a chipcontrol reg */</div><div class='ctx'> u32 si_pmu_chipcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val)</div><div class='ctx'> {</div><div class='del'>-	ai_corereg(sih, SI_CC_IDX, offsetof(struct chipcregs, chipcontrol_addr),</div><div class='del'>-		   ~0, reg);</div><div class='del'>-	return ai_corereg(sih, SI_CC_IDX,</div><div class='del'>-			  offsetof(struct chipcregs, chipcontrol_data), mask,</div><div class='del'>-			  val);</div><div class='add'>+	ai_cc_reg(sih, offsetof(struct chipcregs, chipcontrol_addr), ~0, reg);</div><div class='add'>+	return ai_cc_reg(sih, offsetof(struct chipcregs, chipcontrol_data),</div><div class='add'>+			 mask, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Read/write a regcontrol reg */</div><div class='ctx'> u32 si_pmu_regcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val)</div><div class='ctx'> {</div><div class='del'>-	ai_corereg(sih, SI_CC_IDX, offsetof(struct chipcregs, regcontrol_addr),</div><div class='del'>-		   ~0, reg);</div><div class='del'>-	return ai_corereg(sih, SI_CC_IDX,</div><div class='del'>-			  offsetof(struct chipcregs, regcontrol_data), mask,</div><div class='del'>-			  val);</div><div class='add'>+	ai_cc_reg(sih, offsetof(struct chipcregs, regcontrol_addr), ~0, reg);</div><div class='add'>+	return ai_cc_reg(sih, offsetof(struct chipcregs, regcontrol_data),</div><div class='add'>+			 mask, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Read/write a pllcontrol reg */</div><div class='ctx'> u32 si_pmu_pllcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val)</div><div class='ctx'> {</div><div class='del'>-	ai_corereg(sih, SI_CC_IDX, offsetof(struct chipcregs, pllcontrol_addr),</div><div class='del'>-		   ~0, reg);</div><div class='del'>-	return ai_corereg(sih, SI_CC_IDX,</div><div class='del'>-			  offsetof(struct chipcregs, pllcontrol_data), mask,</div><div class='del'>-			  val);</div><div class='add'>+	ai_cc_reg(sih, offsetof(struct chipcregs, pllcontrol_addr), ~0, reg);</div><div class='add'>+	return ai_cc_reg(sih, offsetof(struct chipcregs, pllcontrol_data),</div><div class='add'>+			 mask, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* PMU PLL update */</div><div class='ctx'> void si_pmu_pllupd(struct si_pub *sih)</div><div class='ctx'> {</div><div class='del'>-	ai_corereg(sih, SI_CC_IDX, offsetof(struct chipcregs, pmucontrol),</div><div class='del'>-		   PCTL_PLL_PLLCTL_UPD, PCTL_PLL_PLLCTL_UPD);</div><div class='add'>+	ai_cc_reg(sih, offsetof(struct chipcregs, pmucontrol),</div><div class='add'>+		  PCTL_PLL_PLLCTL_UPD, PCTL_PLL_PLLCTL_UPD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* query alp/xtal clock frequency */</div><div class='hunk'>@@ -275,10 +266,10 @@ u32 si_pmu_alp_clock(struct si_pub *sih)</div><div class='ctx'> 	u32 clock = ALP_CLOCK;</div><div class='ctx'> </div><div class='ctx'> 	/* bail out with default */</div><div class='del'>-	if (!(sih-&gt;cccaps &amp; CC_CAP_PMU))</div><div class='add'>+	if (!(ai_get_cccaps(sih) &amp; CC_CAP_PMU))</div><div class='ctx'> 		return clock;</div><div class='ctx'> </div><div class='del'>-	switch (sih-&gt;chip) {</div><div class='add'>+	switch (ai_get_chip_id(sih)) {</div><div class='ctx'> 	case BCM43224_CHIP_ID:</div><div class='ctx'> 	case BCM43225_CHIP_ID:</div><div class='ctx'> 	case BCM4313_CHIP_ID:</div><div class='hunk'>@@ -292,95 +283,29 @@ u32 si_pmu_alp_clock(struct si_pub *sih)</div><div class='ctx'> 	return clock;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void si_pmu_spuravoid(struct si_pub *sih, u8 spuravoid)</div><div class='del'>-{</div><div class='del'>-	struct chipcregs __iomem *cc;</div><div class='del'>-	uint origidx, intr_val;</div><div class='del'>-</div><div class='del'>-	/* Remember original core before switch to chipc */</div><div class='del'>-	cc = (struct chipcregs __iomem *)</div><div class='del'>-			ai_switch_core(sih, CC_CORE_ID, &amp;origidx, &amp;intr_val);</div><div class='del'>-</div><div class='del'>-	/* update the pll changes */</div><div class='del'>-	si_pmu_spuravoid_pllupdate(sih, cc, spuravoid);</div><div class='del'>-</div><div class='del'>-	/* Return to original core */</div><div class='del'>-	ai_restore_core(sih, origidx, intr_val);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* initialize PMU */</div><div class='ctx'> void si_pmu_init(struct si_pub *sih)</div><div class='ctx'> {</div><div class='del'>-	struct chipcregs __iomem *cc;</div><div class='del'>-	uint origidx;</div><div class='add'>+	struct bcma_device *core;</div><div class='ctx'> </div><div class='del'>-	/* Remember original core before switch to chipc */</div><div class='del'>-	origidx = ai_coreidx(sih);</div><div class='del'>-	cc = ai_setcoreidx(sih, SI_CC_IDX);</div><div class='del'>-</div><div class='del'>-	if (sih-&gt;pmurev == 1)</div><div class='del'>-		AND_REG(&amp;cc-&gt;pmucontrol, ~PCTL_NOILP_ON_WAIT);</div><div class='del'>-	else if (sih-&gt;pmurev &gt;= 2)</div><div class='del'>-		OR_REG(&amp;cc-&gt;pmucontrol, PCTL_NOILP_ON_WAIT);</div><div class='add'>+	/* select chipc */</div><div class='add'>+	core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);</div><div class='ctx'> </div><div class='del'>-	/* Return to original core */</div><div class='del'>-	ai_setcoreidx(sih, origidx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* initialize PMU chip controls and other chip level stuff */</div><div class='del'>-void si_pmu_chip_init(struct si_pub *sih)</div><div class='del'>-{</div><div class='del'>-	uint origidx;</div><div class='del'>-</div><div class='del'>-	/* Gate off SPROM clock and chip select signals */</div><div class='del'>-	si_pmu_sprom_enable(sih, false);</div><div class='del'>-</div><div class='del'>-	/* Remember original core */</div><div class='del'>-	origidx = ai_coreidx(sih);</div><div class='del'>-</div><div class='del'>-	/* Return to original core */</div><div class='del'>-	ai_setcoreidx(sih, origidx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* initialize PMU switch/regulators */</div><div class='del'>-void si_pmu_swreg_init(struct si_pub *sih)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* initialize PLL */</div><div class='del'>-void si_pmu_pll_init(struct si_pub *sih, uint xtalfreq)</div><div class='del'>-{</div><div class='del'>-	struct chipcregs __iomem *cc;</div><div class='del'>-	uint origidx;</div><div class='del'>-</div><div class='del'>-	/* Remember original core before switch to chipc */</div><div class='del'>-	origidx = ai_coreidx(sih);</div><div class='del'>-	cc = ai_setcoreidx(sih, SI_CC_IDX);</div><div class='del'>-</div><div class='del'>-	switch (sih-&gt;chip) {</div><div class='del'>-	case BCM4313_CHIP_ID:</div><div class='del'>-	case BCM43224_CHIP_ID:</div><div class='del'>-	case BCM43225_CHIP_ID:</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 to original core */</div><div class='del'>-	ai_setcoreidx(sih, origidx);</div><div class='add'>+	if (ai_get_pmurev(sih) == 1)</div><div class='add'>+		bcma_mask32(core, CHIPCREGOFFS(pmucontrol),</div><div class='add'>+			    ~PCTL_NOILP_ON_WAIT);</div><div class='add'>+	else if (ai_get_pmurev(sih) &gt;= 2)</div><div class='add'>+		bcma_set32(core, CHIPCREGOFFS(pmucontrol), PCTL_NOILP_ON_WAIT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* initialize PMU resources */</div><div class='ctx'> void si_pmu_res_init(struct si_pub *sih)</div><div class='ctx'> {</div><div class='del'>-	struct chipcregs __iomem *cc;</div><div class='del'>-	uint origidx;</div><div class='add'>+	struct bcma_device *core;</div><div class='ctx'> 	u32 min_mask = 0, max_mask = 0;</div><div class='ctx'> </div><div class='del'>-	/* Remember original core before switch to chipc */</div><div class='del'>-	origidx = ai_coreidx(sih);</div><div class='del'>-	cc = ai_setcoreidx(sih, SI_CC_IDX);</div><div class='add'>+	/* select to chipc */</div><div class='add'>+	core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Determine min/max rsrc masks */</div><div class='ctx'> 	si_pmu_res_masks(sih, &amp;min_mask, &amp;max_mask);</div><div class='hunk'>@@ -390,55 +315,50 @@ void si_pmu_res_init(struct si_pub *sih)</div><div class='ctx'> 	/* Program max resource mask */</div><div class='ctx'> </div><div class='ctx'> 	if (max_mask)</div><div class='del'>-		W_REG(&amp;cc-&gt;max_res_mask, max_mask);</div><div class='add'>+		bcma_write32(core, CHIPCREGOFFS(max_res_mask), max_mask);</div><div class='ctx'> </div><div class='ctx'> 	/* Program min resource mask */</div><div class='ctx'> </div><div class='ctx'> 	if (min_mask)</div><div class='del'>-		W_REG(&amp;cc-&gt;min_res_mask, min_mask);</div><div class='add'>+		bcma_write32(core, CHIPCREGOFFS(min_res_mask), min_mask);</div><div class='ctx'> </div><div class='ctx'> 	/* Add some delay; allow resources to come up and settle. */</div><div class='ctx'> 	mdelay(2);</div><div class='del'>-</div><div class='del'>-	/* Return to original core */</div><div class='del'>-	ai_setcoreidx(sih, origidx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u32 si_pmu_measure_alpclk(struct si_pub *sih)</div><div class='ctx'> {</div><div class='del'>-	struct chipcregs __iomem *cc;</div><div class='del'>-	uint origidx;</div><div class='add'>+	struct bcma_device *core;</div><div class='ctx'> 	u32 alp_khz;</div><div class='ctx'> </div><div class='del'>-	if (sih-&gt;pmurev &lt; 10)</div><div class='add'>+	if (ai_get_pmurev(sih) &lt; 10)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Remember original core before switch to chipc */</div><div class='del'>-	origidx = ai_coreidx(sih);</div><div class='del'>-	cc = ai_setcoreidx(sih, SI_CC_IDX);</div><div class='add'>+	core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);</div><div class='ctx'> </div><div class='del'>-	if (R_REG(&amp;cc-&gt;pmustatus) &amp; PST_EXTLPOAVAIL) {</div><div class='add'>+	if (bcma_read32(core, CHIPCREGOFFS(pmustatus)) &amp; PST_EXTLPOAVAIL) {</div><div class='ctx'> 		u32 ilp_ctr, alp_hz;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Enable the reg to measure the freq,</div><div class='ctx'> 		 * in case it was disabled before</div><div class='ctx'> 		 */</div><div class='del'>-		W_REG(&amp;cc-&gt;pmu_xtalfreq,</div><div class='del'>-		      1U &lt;&lt; PMU_XTALFREQ_REG_MEASURE_SHIFT);</div><div class='add'>+		bcma_write32(core, CHIPCREGOFFS(pmu_xtalfreq),</div><div class='add'>+			    1U &lt;&lt; PMU_XTALFREQ_REG_MEASURE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 		/* Delay for well over 4 ILP clocks */</div><div class='ctx'> 		udelay(1000);</div><div class='ctx'> </div><div class='ctx'> 		/* Read the latched number of ALP ticks per 4 ILP ticks */</div><div class='del'>-		ilp_ctr =</div><div class='del'>-		    R_REG(&amp;cc-&gt;pmu_xtalfreq) &amp; PMU_XTALFREQ_REG_ILPCTR_MASK;</div><div class='add'>+		ilp_ctr = bcma_read32(core, CHIPCREGOFFS(pmu_xtalfreq)) &amp;</div><div class='add'>+			  PMU_XTALFREQ_REG_ILPCTR_MASK;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Turn off the PMU_XTALFREQ_REG_MEASURE_SHIFT</div><div class='ctx'> 		 * bit to save power</div><div class='ctx'> 		 */</div><div class='del'>-		W_REG(&amp;cc-&gt;pmu_xtalfreq, 0);</div><div class='add'>+		bcma_write32(core, CHIPCREGOFFS(pmu_xtalfreq), 0);</div><div class='ctx'> </div><div class='ctx'> 		/* Calculate ALP frequency */</div><div class='ctx'> 		alp_hz = (ilp_ctr * EXT_ILP_HZ) / 4;</div><div class='hunk'>@@ -451,8 +371,5 @@ u32 si_pmu_measure_alpclk(struct si_pub *sih)</div><div class='ctx'> 	} else</div><div class='ctx'> 		alp_khz = 0;</div><div class='ctx'> </div><div class='del'>-	/* Return to original core */</div><div class='del'>-	ai_setcoreidx(sih, origidx);</div><div class='del'>-</div><div class='ctx'> 	return alp_khz;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/pmu.h b/drivers/net/wireless/brcm80211/brcmsmac/pmu.h<br/>index 3a08c620640e..3e39c5e0f9ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/pmu.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/pmu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/pmu.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/pmu.h</a></div><div class='hunk'>@@ -26,13 +26,10 @@ extern u32 si_pmu_chipcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val);</div><div class='ctx'> extern u32 si_pmu_regcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val);</div><div class='ctx'> extern u32 si_pmu_alp_clock(struct si_pub *sih);</div><div class='ctx'> extern void si_pmu_pllupd(struct si_pub *sih);</div><div class='del'>-extern void si_pmu_spuravoid(struct si_pub *sih, u8 spuravoid);</div><div class='add'>+extern void si_pmu_spuravoid_pllupdate(struct si_pub *sih, u8 spuravoid);</div><div class='ctx'> extern u32 si_pmu_pllcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val);</div><div class='ctx'> extern void si_pmu_init(struct si_pub *sih);</div><div class='del'>-extern void si_pmu_chip_init(struct si_pub *sih);</div><div class='del'>-extern void si_pmu_pll_init(struct si_pub *sih, u32 xtalfreq);</div><div class='ctx'> extern void si_pmu_res_init(struct si_pub *sih);</div><div class='del'>-extern void si_pmu_swreg_init(struct si_pub *sih);</div><div class='ctx'> extern u32 si_pmu_measure_alpclk(struct si_pub *sih);</div><div class='ctx'> </div><div class='ctx'> #endif /* _BRCM_PMU_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/pub.h b/drivers/net/wireless/brcm80211/brcmsmac/pub.h<br/>index 37bb2dcc113f..f0038ad7d7bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/pub.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/pub.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/pub.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/pub.h</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #ifndef _BRCM_PUB_H_</div><div class='ctx'> #define _BRCM_PUB_H_</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bcma/bcma.h&gt;</div><div class='ctx'> #include &lt;brcmu_wifi.h&gt;</div><div class='ctx'> #include "types.h"</div><div class='ctx'> #include "defs.h"</div><div class='hunk'>@@ -170,22 +171,6 @@ enum brcms_srom_id {</div><div class='ctx'> 	BRCMS_SROM_TSSIPOS2G,</div><div class='ctx'> 	BRCMS_SROM_TSSIPOS5G,</div><div class='ctx'> 	BRCMS_SROM_TXCHAIN,</div><div class='del'>-	BRCMS_SROM_TXPID2GA0,</div><div class='del'>-	BRCMS_SROM_TXPID2GA1,</div><div class='del'>-	BRCMS_SROM_TXPID2GA2,</div><div class='del'>-	BRCMS_SROM_TXPID2GA3,</div><div class='del'>-	BRCMS_SROM_TXPID5GA0,</div><div class='del'>-	BRCMS_SROM_TXPID5GA1,</div><div class='del'>-	BRCMS_SROM_TXPID5GA2,</div><div class='del'>-	BRCMS_SROM_TXPID5GA3,</div><div class='del'>-	BRCMS_SROM_TXPID5GHA0,</div><div class='del'>-	BRCMS_SROM_TXPID5GHA1,</div><div class='del'>-	BRCMS_SROM_TXPID5GHA2,</div><div class='del'>-	BRCMS_SROM_TXPID5GHA3,</div><div class='del'>-	BRCMS_SROM_TXPID5GLA0,</div><div class='del'>-	BRCMS_SROM_TXPID5GLA1,</div><div class='del'>-	BRCMS_SROM_TXPID5GLA2,</div><div class='del'>-	BRCMS_SROM_TXPID5GLA3,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * per-path identifiers (see srom.c)</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -225,10 +210,6 @@ enum brcms_srom_id {</div><div class='ctx'> 	BRCMS_SROM_PA2GW2A1,</div><div class='ctx'> 	BRCMS_SROM_PA2GW2A2,</div><div class='ctx'> 	BRCMS_SROM_PA2GW2A3,</div><div class='del'>-	BRCMS_SROM_PA2GW3A0,</div><div class='del'>-	BRCMS_SROM_PA2GW3A1,</div><div class='del'>-	BRCMS_SROM_PA2GW3A2,</div><div class='del'>-	BRCMS_SROM_PA2GW3A3,</div><div class='ctx'> 	BRCMS_SROM_PA5GHW0A0,</div><div class='ctx'> 	BRCMS_SROM_PA5GHW0A1,</div><div class='ctx'> 	BRCMS_SROM_PA5GHW0A2,</div><div class='hunk'>@@ -241,10 +222,6 @@ enum brcms_srom_id {</div><div class='ctx'> 	BRCMS_SROM_PA5GHW2A1,</div><div class='ctx'> 	BRCMS_SROM_PA5GHW2A2,</div><div class='ctx'> 	BRCMS_SROM_PA5GHW2A3,</div><div class='del'>-	BRCMS_SROM_PA5GHW3A0,</div><div class='del'>-	BRCMS_SROM_PA5GHW3A1,</div><div class='del'>-	BRCMS_SROM_PA5GHW3A2,</div><div class='del'>-	BRCMS_SROM_PA5GHW3A3,</div><div class='ctx'> 	BRCMS_SROM_PA5GLW0A0,</div><div class='ctx'> 	BRCMS_SROM_PA5GLW0A1,</div><div class='ctx'> 	BRCMS_SROM_PA5GLW0A2,</div><div class='hunk'>@@ -257,10 +234,6 @@ enum brcms_srom_id {</div><div class='ctx'> 	BRCMS_SROM_PA5GLW2A1,</div><div class='ctx'> 	BRCMS_SROM_PA5GLW2A2,</div><div class='ctx'> 	BRCMS_SROM_PA5GLW2A3,</div><div class='del'>-	BRCMS_SROM_PA5GLW3A0,</div><div class='del'>-	BRCMS_SROM_PA5GLW3A1,</div><div class='del'>-	BRCMS_SROM_PA5GLW3A2,</div><div class='del'>-	BRCMS_SROM_PA5GLW3A3,</div><div class='ctx'> 	BRCMS_SROM_PA5GW0A0,</div><div class='ctx'> 	BRCMS_SROM_PA5GW0A1,</div><div class='ctx'> 	BRCMS_SROM_PA5GW0A2,</div><div class='hunk'>@@ -273,14 +246,9 @@ enum brcms_srom_id {</div><div class='ctx'> 	BRCMS_SROM_PA5GW2A1,</div><div class='ctx'> 	BRCMS_SROM_PA5GW2A2,</div><div class='ctx'> 	BRCMS_SROM_PA5GW2A3,</div><div class='del'>-	BRCMS_SROM_PA5GW3A0,</div><div class='del'>-	BRCMS_SROM_PA5GW3A1,</div><div class='del'>-	BRCMS_SROM_PA5GW3A2,</div><div class='del'>-	BRCMS_SROM_PA5GW3A3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define	BRCMS_NUMRATES	16	/* max # of rates in a rateset */</div><div class='del'>-#define	D11_PHY_HDR_LEN	6	/* Phy header length - 6 bytes */</div><div class='ctx'> </div><div class='ctx'> /* phy types */</div><div class='ctx'> #define	PHY_TYPE_A	0	/* Phy type A */</div><div class='hunk'>@@ -414,7 +382,6 @@ struct brcms_pub {</div><div class='ctx'> 	uint _nbands;		/* # bands supported */</div><div class='ctx'> 	uint now;		/* # elapsed seconds */</div><div class='ctx'> </div><div class='del'>-	bool promisc;		/* promiscuous destination address */</div><div class='ctx'> 	bool delayed_down;	/* down delayed */</div><div class='ctx'> 	bool associated;	/* true:part of [I]BSS, false: not */</div><div class='ctx'> 	/* (union of stas_associated, aps_associated) */</div><div class='hunk'>@@ -564,15 +531,14 @@ struct brcms_antselcfg {</div><div class='ctx'> </div><div class='ctx'> /* common functions for every port */</div><div class='ctx'> extern struct brcms_c_info *</div><div class='del'>-brcms_c_attach(struct brcms_info *wl, u16 vendor, u16 device, uint unit,</div><div class='del'>-	       bool piomode, void __iomem *regsva, struct pci_dev *btparam,</div><div class='del'>-	       uint *perr);</div><div class='add'>+brcms_c_attach(struct brcms_info *wl, struct bcma_device *core, uint unit,</div><div class='add'>+	       bool piomode, uint *perr);</div><div class='ctx'> extern uint brcms_c_detach(struct brcms_c_info *wlc);</div><div class='ctx'> extern int brcms_c_up(struct brcms_c_info *wlc);</div><div class='ctx'> extern uint brcms_c_down(struct brcms_c_info *wlc);</div><div class='ctx'> </div><div class='ctx'> extern bool brcms_c_chipmatch(u16 vendor, u16 device);</div><div class='del'>-extern void brcms_c_init(struct brcms_c_info *wlc);</div><div class='add'>+extern void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx);</div><div class='ctx'> extern void brcms_c_reset(struct brcms_c_info *wlc);</div><div class='ctx'> </div><div class='ctx'> extern void brcms_c_intrson(struct brcms_c_info *wlc);</div><div class='hunk'>@@ -628,7 +594,7 @@ extern void brcms_c_set_beacon_listen_interval(struct brcms_c_info *wlc,</div><div class='ctx'> 					u8 interval);</div><div class='ctx'> extern int brcms_c_set_tx_power(struct brcms_c_info *wlc, int txpwr);</div><div class='ctx'> extern int brcms_c_get_tx_power(struct brcms_c_info *wlc);</div><div class='del'>-extern void brcms_c_set_radio_mpc(struct brcms_c_info *wlc, bool mpc);</div><div class='ctx'> extern bool brcms_c_check_radio_disabled(struct brcms_c_info *wlc);</div><div class='add'>+extern void brcms_c_mute(struct brcms_c_info *wlc, bool on);</div><div class='ctx'> </div><div class='ctx'> #endif				/* _BRCM_PUB_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/rate.h b/drivers/net/wireless/brcm80211/brcmsmac/rate.h<br/>index e7b9dc2f2731..980d578825cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/rate.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/rate.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/rate.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/rate.h</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "types.h"</div><div class='ctx'> #include "d11.h"</div><div class='add'>+#include "phy_hal.h"</div><div class='ctx'> </div><div class='ctx'> extern const u8 rate_info[];</div><div class='ctx'> extern const struct brcms_c_rateset cck_ofdm_mimo_rates;</div><div class='hunk'>@@ -198,11 +199,9 @@ static inline u8 cck_rspec(u8 cck)</div><div class='ctx'> </div><div class='ctx'> /* Convert encoded rate value in plcp header to numerical rates in 500 KHz</div><div class='ctx'>  * increments */</div><div class='del'>-extern const u8 ofdm_rate_lookup[];</div><div class='del'>-</div><div class='ctx'> static inline u8 ofdm_phy2mac_rate(u8 rlpt)</div><div class='ctx'> {</div><div class='del'>-	return ofdm_rate_lookup[rlpt &amp; 0x7];</div><div class='add'>+	return wlc_phy_get_ofdm_rate_lookup()[rlpt &amp; 0x7];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u8 cck_phy2mac_rate(u8 signal)</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/srom.c b/drivers/net/wireless/brcm80211/brcmsmac/srom.c<br/>index 99f791048e84..563743643038 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/srom.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/srom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/srom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/srom.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include "aiutils.h"</div><div class='ctx'> #include "otp.h"</div><div class='ctx'> #include "srom.h"</div><div class='add'>+#include "soc.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * SROM CRC8 polynomial value:</div><div class='hunk'>@@ -62,9 +63,6 @@</div><div class='ctx'> #define	SROM_MACHI_ET1		42</div><div class='ctx'> #define	SROM_MACMID_ET1		43</div><div class='ctx'> #define	SROM_MACLO_ET1		44</div><div class='del'>-#define	SROM3_MACHI		37</div><div class='del'>-#define	SROM3_MACMID		38</div><div class='del'>-#define	SROM3_MACLO		39</div><div class='ctx'> </div><div class='ctx'> #define	SROM_BXARSSI2G		40</div><div class='ctx'> #define	SROM_BXARSSI5G		41</div><div class='hunk'>@@ -101,7 +99,6 @@</div><div class='ctx'> </div><div class='ctx'> #define	SROM_BFL		57</div><div class='ctx'> #define	SROM_BFL2		28</div><div class='del'>-#define	SROM3_BFL2		61</div><div class='ctx'> </div><div class='ctx'> #define	SROM_AG10		58</div><div class='ctx'> </div><div class='hunk'>@@ -109,99 +106,16 @@</div><div class='ctx'> </div><div class='ctx'> #define	SROM_OPO		60</div><div class='ctx'> </div><div class='del'>-#define	SROM3_LEDDC		62</div><div class='del'>-</div><div class='ctx'> #define	SROM_CRCREV		63</div><div class='ctx'> </div><div class='del'>-/* SROM Rev 4: Reallocate the software part of the srom to accommodate</div><div class='del'>- * MIMO features. It assumes up to two PCIE functions and 440 bytes</div><div class='del'>- * of usable srom i.e. the usable storage in chips with OTP that</div><div class='del'>- * implements hardware redundancy.</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #define	SROM4_WORDS		220</div><div class='ctx'> </div><div class='del'>-#define	SROM4_SIGN		32</div><div class='del'>-#define	SROM4_SIGNATURE		0x5372</div><div class='del'>-</div><div class='del'>-#define	SROM4_BREV		33</div><div class='del'>-</div><div class='del'>-#define	SROM4_BFL0		34</div><div class='del'>-#define	SROM4_BFL1		35</div><div class='del'>-#define	SROM4_BFL2		36</div><div class='del'>-#define	SROM4_BFL3		37</div><div class='del'>-#define	SROM5_BFL0		37</div><div class='del'>-#define	SROM5_BFL1		38</div><div class='del'>-#define	SROM5_BFL2		39</div><div class='del'>-#define	SROM5_BFL3		40</div><div class='del'>-</div><div class='del'>-#define	SROM4_MACHI		38</div><div class='del'>-#define	SROM4_MACMID		39</div><div class='del'>-#define	SROM4_MACLO		40</div><div class='del'>-#define	SROM5_MACHI		41</div><div class='del'>-#define	SROM5_MACMID		42</div><div class='del'>-#define	SROM5_MACLO		43</div><div class='del'>-</div><div class='del'>-#define	SROM4_CCODE		41</div><div class='del'>-#define	SROM4_REGREV		42</div><div class='del'>-#define	SROM5_CCODE		34</div><div class='del'>-#define	SROM5_REGREV		35</div><div class='del'>-</div><div class='del'>-#define	SROM4_LEDBH10		43</div><div class='del'>-#define	SROM4_LEDBH32		44</div><div class='del'>-#define	SROM5_LEDBH10		59</div><div class='del'>-#define	SROM5_LEDBH32		60</div><div class='del'>-</div><div class='del'>-#define	SROM4_LEDDC		45</div><div class='del'>-#define	SROM5_LEDDC		45</div><div class='del'>-</div><div class='del'>-#define	SROM4_AA		46</div><div class='del'>-</div><div class='del'>-#define	SROM4_AG10		47</div><div class='del'>-#define	SROM4_AG32		48</div><div class='del'>-</div><div class='del'>-#define	SROM4_TXPID2G		49</div><div class='del'>-#define	SROM4_TXPID5G		51</div><div class='del'>-#define	SROM4_TXPID5GL		53</div><div class='del'>-#define	SROM4_TXPID5GH		55</div><div class='del'>-</div><div class='del'>-#define SROM4_TXRXC		61</div><div class='ctx'> #define SROM4_TXCHAIN_MASK	0x000f</div><div class='del'>-#define SROM4_TXCHAIN_SHIFT	0</div><div class='ctx'> #define SROM4_RXCHAIN_MASK	0x00f0</div><div class='del'>-#define SROM4_RXCHAIN_SHIFT	4</div><div class='ctx'> #define SROM4_SWITCH_MASK	0xff00</div><div class='del'>-#define SROM4_SWITCH_SHIFT	8</div><div class='ctx'> </div><div class='ctx'> /* Per-path fields */</div><div class='ctx'> #define	MAX_PATH_SROM		4</div><div class='del'>-#define	SROM4_PATH0		64</div><div class='del'>-#define	SROM4_PATH1		87</div><div class='del'>-#define	SROM4_PATH2		110</div><div class='del'>-#define	SROM4_PATH3		133</div><div class='del'>-</div><div class='del'>-#define	SROM4_2G_ITT_MAXP	0</div><div class='del'>-#define	SROM4_2G_PA		1</div><div class='del'>-#define	SROM4_5G_ITT_MAXP	5</div><div class='del'>-#define	SROM4_5GLH_MAXP		6</div><div class='del'>-#define	SROM4_5G_PA		7</div><div class='del'>-#define	SROM4_5GL_PA		11</div><div class='del'>-#define	SROM4_5GH_PA		15</div><div class='del'>-</div><div class='del'>-/* All the miriad power offsets */</div><div class='del'>-#define	SROM4_2G_CCKPO		156</div><div class='del'>-#define	SROM4_2G_OFDMPO		157</div><div class='del'>-#define	SROM4_5G_OFDMPO		159</div><div class='del'>-#define	SROM4_5GL_OFDMPO	161</div><div class='del'>-#define	SROM4_5GH_OFDMPO	163</div><div class='del'>-#define	SROM4_2G_MCSPO		165</div><div class='del'>-#define	SROM4_5G_MCSPO		173</div><div class='del'>-#define	SROM4_5GL_MCSPO		181</div><div class='del'>-#define	SROM4_5GH_MCSPO		189</div><div class='del'>-#define	SROM4_CDDPO		197</div><div class='del'>-#define	SROM4_STBCPO		198</div><div class='del'>-#define	SROM4_BW40PO		199</div><div class='del'>-#define	SROM4_BWDUPPO		200</div><div class='ctx'> </div><div class='ctx'> #define	SROM4_CRCREV		219</div><div class='ctx'> </div><div class='hunk'>@@ -424,103 +338,32 @@ struct brcms_varbuf {</div><div class='ctx'> static const struct brcms_sromvar pci_sromvars[] = {</div><div class='ctx'> 	{BRCMS_SROM_DEVID, 0xffffff00, SRFL_PRHEX | SRFL_NOVAR, PCI_F0DEVID,</div><div class='ctx'> 	 0xffff},</div><div class='del'>-	{BRCMS_SROM_BOARDREV, 0x0000000e, SRFL_PRHEX, SROM_AABREV,</div><div class='del'>-	 SROM_BR_MASK},</div><div class='del'>-	{BRCMS_SROM_BOARDREV, 0x000000f0, SRFL_PRHEX, SROM4_BREV, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_BOARDREV, 0xffffff00, SRFL_PRHEX, SROM8_BREV, 0xffff},</div><div class='del'>-	{BRCMS_SROM_BOARDFLAGS, 0x00000002, SRFL_PRHEX, SROM_BFL, 0xffff},</div><div class='del'>-	{BRCMS_SROM_BOARDFLAGS, 0x00000004, SRFL_PRHEX | SRFL_MORE, SROM_BFL,</div><div class='del'>-	 0xffff},</div><div class='del'>-	{BRCMS_SROM_CONT, 0, 0, SROM_BFL2, 0xffff},</div><div class='del'>-	{BRCMS_SROM_BOARDFLAGS, 0x00000008, SRFL_PRHEX | SRFL_MORE, SROM_BFL,</div><div class='del'>-	 0xffff},</div><div class='del'>-	{BRCMS_SROM_CONT, 0, 0, SROM3_BFL2, 0xffff},</div><div class='del'>-	{BRCMS_SROM_BOARDFLAGS, 0x00000010, SRFL_PRHEX | SRFL_MORE, SROM4_BFL0,</div><div class='del'>-	 0xffff},</div><div class='del'>-	{BRCMS_SROM_CONT, 0, 0, SROM4_BFL1, 0xffff},</div><div class='del'>-	{BRCMS_SROM_BOARDFLAGS, 0x000000e0, SRFL_PRHEX | SRFL_MORE, SROM5_BFL0,</div><div class='del'>-	 0xffff},</div><div class='del'>-	{BRCMS_SROM_CONT, 0, 0, SROM5_BFL1, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_BOARDFLAGS, 0xffffff00, SRFL_PRHEX | SRFL_MORE, SROM8_BFL0,</div><div class='ctx'> 	 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_CONT, 0, 0, SROM8_BFL1, 0xffff},</div><div class='del'>-	{BRCMS_SROM_BOARDFLAGS2, 0x00000010, SRFL_PRHEX | SRFL_MORE, SROM4_BFL2,</div><div class='del'>-	 0xffff},</div><div class='del'>-	{BRCMS_SROM_CONT, 0, 0, SROM4_BFL3, 0xffff},</div><div class='del'>-	{BRCMS_SROM_BOARDFLAGS2, 0x000000e0, SRFL_PRHEX | SRFL_MORE, SROM5_BFL2,</div><div class='del'>-	 0xffff},</div><div class='del'>-	{BRCMS_SROM_CONT, 0, 0, SROM5_BFL3, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_BOARDFLAGS2, 0xffffff00, SRFL_PRHEX | SRFL_MORE, SROM8_BFL2,</div><div class='ctx'> 	 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_CONT, 0, 0, SROM8_BFL3, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_BOARDTYPE, 0xfffffffc, SRFL_PRHEX, SROM_SSID, 0xffff},</div><div class='del'>-	{BRCMS_SROM_BOARDNUM, 0x00000006, 0, SROM_MACLO_IL0, 0xffff},</div><div class='del'>-	{BRCMS_SROM_BOARDNUM, 0x00000008, 0, SROM3_MACLO, 0xffff},</div><div class='del'>-	{BRCMS_SROM_BOARDNUM, 0x00000010, 0, SROM4_MACLO, 0xffff},</div><div class='del'>-	{BRCMS_SROM_BOARDNUM, 0x000000e0, 0, SROM5_MACLO, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_BOARDNUM, 0xffffff00, 0, SROM8_MACLO, 0xffff},</div><div class='del'>-	{BRCMS_SROM_CC, 0x00000002, 0, SROM_AABREV, SROM_CC_MASK},</div><div class='del'>-	{BRCMS_SROM_REGREV, 0x00000008, 0, SROM_OPO, 0xff00},</div><div class='del'>-	{BRCMS_SROM_REGREV, 0x00000010, 0, SROM4_REGREV, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_REGREV, 0x000000e0, 0, SROM5_REGREV, 0x00ff},</div><div class='ctx'> 	{BRCMS_SROM_REGREV, 0xffffff00, 0, SROM8_REGREV, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_LEDBH0, 0x0000000e, SRFL_NOFFS, SROM_LEDBH10, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_LEDBH1, 0x0000000e, SRFL_NOFFS, SROM_LEDBH10, 0xff00},</div><div class='del'>-	{BRCMS_SROM_LEDBH2, 0x0000000e, SRFL_NOFFS, SROM_LEDBH32, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_LEDBH3, 0x0000000e, SRFL_NOFFS, SROM_LEDBH32, 0xff00},</div><div class='del'>-	{BRCMS_SROM_LEDBH0, 0x00000010, SRFL_NOFFS, SROM4_LEDBH10, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_LEDBH1, 0x00000010, SRFL_NOFFS, SROM4_LEDBH10, 0xff00},</div><div class='del'>-	{BRCMS_SROM_LEDBH2, 0x00000010, SRFL_NOFFS, SROM4_LEDBH32, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_LEDBH3, 0x00000010, SRFL_NOFFS, SROM4_LEDBH32, 0xff00},</div><div class='del'>-	{BRCMS_SROM_LEDBH0, 0x000000e0, SRFL_NOFFS, SROM5_LEDBH10, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_LEDBH1, 0x000000e0, SRFL_NOFFS, SROM5_LEDBH10, 0xff00},</div><div class='del'>-	{BRCMS_SROM_LEDBH2, 0x000000e0, SRFL_NOFFS, SROM5_LEDBH32, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_LEDBH3, 0x000000e0, SRFL_NOFFS, SROM5_LEDBH32, 0xff00},</div><div class='ctx'> 	{BRCMS_SROM_LEDBH0, 0xffffff00, SRFL_NOFFS, SROM8_LEDBH10, 0x00ff},</div><div class='ctx'> 	{BRCMS_SROM_LEDBH1, 0xffffff00, SRFL_NOFFS, SROM8_LEDBH10, 0xff00},</div><div class='ctx'> 	{BRCMS_SROM_LEDBH2, 0xffffff00, SRFL_NOFFS, SROM8_LEDBH32, 0x00ff},</div><div class='ctx'> 	{BRCMS_SROM_LEDBH3, 0xffffff00, SRFL_NOFFS, SROM8_LEDBH32, 0xff00},</div><div class='del'>-	{BRCMS_SROM_PA0B0, 0x0000000e, SRFL_PRHEX, SROM_WL0PAB0, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA0B1, 0x0000000e, SRFL_PRHEX, SROM_WL0PAB1, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA0B2, 0x0000000e, SRFL_PRHEX, SROM_WL0PAB2, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA0ITSSIT, 0x0000000e, 0, SROM_ITT, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_PA0MAXPWR, 0x0000000e, 0, SROM_WL10MAXP, 0x00ff},</div><div class='ctx'> 	{BRCMS_SROM_PA0B0, 0xffffff00, SRFL_PRHEX, SROM8_W0_PAB0, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_PA0B1, 0xffffff00, SRFL_PRHEX, SROM8_W0_PAB1, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_PA0B2, 0xffffff00, SRFL_PRHEX, SROM8_W0_PAB2, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_PA0ITSSIT, 0xffffff00, 0, SROM8_W0_ITTMAXP, 0xff00},</div><div class='ctx'> 	{BRCMS_SROM_PA0MAXPWR, 0xffffff00, 0, SROM8_W0_ITTMAXP, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_OPO, 0x0000000c, 0, SROM_OPO, 0x00ff},</div><div class='ctx'> 	{BRCMS_SROM_OPO, 0xffffff00, 0, SROM8_2G_OFDMPO, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_AA2G, 0x0000000e, 0, SROM_AABREV, SROM_AA0_MASK},</div><div class='del'>-	{BRCMS_SROM_AA2G, 0x000000f0, 0, SROM4_AA, 0x00ff},</div><div class='ctx'> 	{BRCMS_SROM_AA2G, 0xffffff00, 0, SROM8_AA, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_AA5G, 0x0000000e, 0, SROM_AABREV, SROM_AA1_MASK},</div><div class='del'>-	{BRCMS_SROM_AA5G, 0x000000f0, 0, SROM4_AA, 0xff00},</div><div class='ctx'> 	{BRCMS_SROM_AA5G, 0xffffff00, 0, SROM8_AA, 0xff00},</div><div class='del'>-	{BRCMS_SROM_AG0, 0x0000000e, 0, SROM_AG10, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_AG1, 0x0000000e, 0, SROM_AG10, 0xff00},</div><div class='del'>-	{BRCMS_SROM_AG0, 0x000000f0, 0, SROM4_AG10, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_AG1, 0x000000f0, 0, SROM4_AG10, 0xff00},</div><div class='del'>-	{BRCMS_SROM_AG2, 0x000000f0, 0, SROM4_AG32, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_AG3, 0x000000f0, 0, SROM4_AG32, 0xff00},</div><div class='ctx'> 	{BRCMS_SROM_AG0, 0xffffff00, 0, SROM8_AG10, 0x00ff},</div><div class='ctx'> 	{BRCMS_SROM_AG1, 0xffffff00, 0, SROM8_AG10, 0xff00},</div><div class='ctx'> 	{BRCMS_SROM_AG2, 0xffffff00, 0, SROM8_AG32, 0x00ff},</div><div class='ctx'> 	{BRCMS_SROM_AG3, 0xffffff00, 0, SROM8_AG32, 0xff00},</div><div class='del'>-	{BRCMS_SROM_PA1B0, 0x0000000e, SRFL_PRHEX, SROM_WL1PAB0, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA1B1, 0x0000000e, SRFL_PRHEX, SROM_WL1PAB1, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA1B2, 0x0000000e, SRFL_PRHEX, SROM_WL1PAB2, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA1LOB0, 0x0000000c, SRFL_PRHEX, SROM_WL1LPAB0, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA1LOB1, 0x0000000c, SRFL_PRHEX, SROM_WL1LPAB1, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA1LOB2, 0x0000000c, SRFL_PRHEX, SROM_WL1LPAB2, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA1HIB0, 0x0000000c, SRFL_PRHEX, SROM_WL1HPAB0, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA1HIB1, 0x0000000c, SRFL_PRHEX, SROM_WL1HPAB1, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA1HIB2, 0x0000000c, SRFL_PRHEX, SROM_WL1HPAB2, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA1ITSSIT, 0x0000000e, 0, SROM_ITT, 0xff00},</div><div class='del'>-	{BRCMS_SROM_PA1MAXPWR, 0x0000000e, 0, SROM_WL10MAXP, 0xff00},</div><div class='del'>-	{BRCMS_SROM_PA1LOMAXPWR, 0x0000000c, 0, SROM_WL1LHMAXP, 0xff00},</div><div class='del'>-	{BRCMS_SROM_PA1HIMAXPWR, 0x0000000c, 0, SROM_WL1LHMAXP, 0x00ff},</div><div class='ctx'> 	{BRCMS_SROM_PA1B0, 0xffffff00, SRFL_PRHEX, SROM8_W1_PAB0, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_PA1B1, 0xffffff00, SRFL_PRHEX, SROM8_W1_PAB1, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_PA1B2, 0xffffff00, SRFL_PRHEX, SROM8_W1_PAB2, 0xffff},</div><div class='hunk'>@@ -534,40 +377,20 @@ static const struct brcms_sromvar pci_sromvars[] = {</div><div class='ctx'> 	{BRCMS_SROM_PA1MAXPWR, 0xffffff00, 0, SROM8_W1_ITTMAXP, 0x00ff},</div><div class='ctx'> 	{BRCMS_SROM_PA1LOMAXPWR, 0xffffff00, 0, SROM8_W1_MAXP_LCHC, 0xff00},</div><div class='ctx'> 	{BRCMS_SROM_PA1HIMAXPWR, 0xffffff00, 0, SROM8_W1_MAXP_LCHC, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_BXA2G, 0x00000008, 0, SROM_BXARSSI2G, 0x1800},</div><div class='del'>-	{BRCMS_SROM_RSSISAV2G, 0x00000008, 0, SROM_BXARSSI2G, 0x0700},</div><div class='del'>-	{BRCMS_SROM_RSSISMC2G, 0x00000008, 0, SROM_BXARSSI2G, 0x00f0},</div><div class='del'>-	{BRCMS_SROM_RSSISMF2G, 0x00000008, 0, SROM_BXARSSI2G, 0x000f},</div><div class='ctx'> 	{BRCMS_SROM_BXA2G, 0xffffff00, 0, SROM8_BXARSSI2G, 0x1800},</div><div class='ctx'> 	{BRCMS_SROM_RSSISAV2G, 0xffffff00, 0, SROM8_BXARSSI2G, 0x0700},</div><div class='ctx'> 	{BRCMS_SROM_RSSISMC2G, 0xffffff00, 0, SROM8_BXARSSI2G, 0x00f0},</div><div class='ctx'> 	{BRCMS_SROM_RSSISMF2G, 0xffffff00, 0, SROM8_BXARSSI2G, 0x000f},</div><div class='del'>-	{BRCMS_SROM_BXA5G, 0x00000008, 0, SROM_BXARSSI5G, 0x1800},</div><div class='del'>-	{BRCMS_SROM_RSSISAV5G, 0x00000008, 0, SROM_BXARSSI5G, 0x0700},</div><div class='del'>-	{BRCMS_SROM_RSSISMC5G, 0x00000008, 0, SROM_BXARSSI5G, 0x00f0},</div><div class='del'>-	{BRCMS_SROM_RSSISMF5G, 0x00000008, 0, SROM_BXARSSI5G, 0x000f},</div><div class='ctx'> 	{BRCMS_SROM_BXA5G, 0xffffff00, 0, SROM8_BXARSSI5G, 0x1800},</div><div class='ctx'> 	{BRCMS_SROM_RSSISAV5G, 0xffffff00, 0, SROM8_BXARSSI5G, 0x0700},</div><div class='ctx'> 	{BRCMS_SROM_RSSISMC5G, 0xffffff00, 0, SROM8_BXARSSI5G, 0x00f0},</div><div class='ctx'> 	{BRCMS_SROM_RSSISMF5G, 0xffffff00, 0, SROM8_BXARSSI5G, 0x000f},</div><div class='del'>-	{BRCMS_SROM_TRI2G, 0x00000008, 0, SROM_TRI52G, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_TRI5G, 0x00000008, 0, SROM_TRI52G, 0xff00},</div><div class='del'>-	{BRCMS_SROM_TRI5GL, 0x00000008, 0, SROM_TRI5GHL, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_TRI5GH, 0x00000008, 0, SROM_TRI5GHL, 0xff00},</div><div class='ctx'> 	{BRCMS_SROM_TRI2G, 0xffffff00, 0, SROM8_TRI52G, 0x00ff},</div><div class='ctx'> 	{BRCMS_SROM_TRI5G, 0xffffff00, 0, SROM8_TRI52G, 0xff00},</div><div class='ctx'> 	{BRCMS_SROM_TRI5GL, 0xffffff00, 0, SROM8_TRI5GHL, 0x00ff},</div><div class='ctx'> 	{BRCMS_SROM_TRI5GH, 0xffffff00, 0, SROM8_TRI5GHL, 0xff00},</div><div class='del'>-	{BRCMS_SROM_RXPO2G, 0x00000008, SRFL_PRSIGN, SROM_RXPO52G, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_RXPO5G, 0x00000008, SRFL_PRSIGN, SROM_RXPO52G, 0xff00},</div><div class='ctx'> 	{BRCMS_SROM_RXPO2G, 0xffffff00, SRFL_PRSIGN, SROM8_RXPO52G, 0x00ff},</div><div class='ctx'> 	{BRCMS_SROM_RXPO5G, 0xffffff00, SRFL_PRSIGN, SROM8_RXPO52G, 0xff00},</div><div class='del'>-	{BRCMS_SROM_TXCHAIN, 0x000000f0, SRFL_NOFFS, SROM4_TXRXC,</div><div class='del'>-	 SROM4_TXCHAIN_MASK},</div><div class='del'>-	{BRCMS_SROM_RXCHAIN, 0x000000f0, SRFL_NOFFS, SROM4_TXRXC,</div><div class='del'>-	 SROM4_RXCHAIN_MASK},</div><div class='del'>-	{BRCMS_SROM_ANTSWITCH, 0x000000f0, SRFL_NOFFS, SROM4_TXRXC,</div><div class='del'>-	 SROM4_SWITCH_MASK},</div><div class='ctx'> 	{BRCMS_SROM_TXCHAIN, 0xffffff00, SRFL_NOFFS, SROM8_TXRXC,</div><div class='ctx'> 	 SROM4_TXCHAIN_MASK},</div><div class='ctx'> 	{BRCMS_SROM_RXCHAIN, 0xffffff00, SRFL_NOFFS, SROM8_TXRXC,</div><div class='hunk'>@@ -594,43 +417,11 @@ static const struct brcms_sromvar pci_sromvars[] = {</div><div class='ctx'> 	 SROM8_FEM_ANTSWLUT_MASK},</div><div class='ctx'> 	{BRCMS_SROM_TEMPTHRESH, 0xffffff00, 0, SROM8_THERMAL, 0xff00},</div><div class='ctx'> 	{BRCMS_SROM_TEMPOFFSET, 0xffffff00, 0, SROM8_THERMAL, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_TXPID2GA0, 0x000000f0, 0, SROM4_TXPID2G, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_TXPID2GA1, 0x000000f0, 0, SROM4_TXPID2G, 0xff00},</div><div class='del'>-	{BRCMS_SROM_TXPID2GA2, 0x000000f0, 0, SROM4_TXPID2G + 1, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_TXPID2GA3, 0x000000f0, 0, SROM4_TXPID2G + 1, 0xff00},</div><div class='del'>-	{BRCMS_SROM_TXPID5GA0, 0x000000f0, 0, SROM4_TXPID5G, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_TXPID5GA1, 0x000000f0, 0, SROM4_TXPID5G, 0xff00},</div><div class='del'>-	{BRCMS_SROM_TXPID5GA2, 0x000000f0, 0, SROM4_TXPID5G + 1, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_TXPID5GA3, 0x000000f0, 0, SROM4_TXPID5G + 1, 0xff00},</div><div class='del'>-	{BRCMS_SROM_TXPID5GLA0, 0x000000f0, 0, SROM4_TXPID5GL, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_TXPID5GLA1, 0x000000f0, 0, SROM4_TXPID5GL, 0xff00},</div><div class='del'>-	{BRCMS_SROM_TXPID5GLA2, 0x000000f0, 0, SROM4_TXPID5GL + 1, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_TXPID5GLA3, 0x000000f0, 0, SROM4_TXPID5GL + 1, 0xff00},</div><div class='del'>-	{BRCMS_SROM_TXPID5GHA0, 0x000000f0, 0, SROM4_TXPID5GH, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_TXPID5GHA1, 0x000000f0, 0, SROM4_TXPID5GH, 0xff00},</div><div class='del'>-	{BRCMS_SROM_TXPID5GHA2, 0x000000f0, 0, SROM4_TXPID5GH + 1, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_TXPID5GHA3, 0x000000f0, 0, SROM4_TXPID5GH + 1, 0xff00},</div><div class='del'>-</div><div class='del'>-	{BRCMS_SROM_CCODE, 0x0000000f, SRFL_CCODE, SROM_CCODE, 0xffff},</div><div class='del'>-	{BRCMS_SROM_CCODE, 0x00000010, SRFL_CCODE, SROM4_CCODE, 0xffff},</div><div class='del'>-	{BRCMS_SROM_CCODE, 0x000000e0, SRFL_CCODE, SROM5_CCODE, 0xffff},</div><div class='add'>+</div><div class='ctx'> 	{BRCMS_SROM_CCODE, 0xffffff00, SRFL_CCODE, SROM8_CCODE, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_MACADDR, 0xffffff00, SRFL_ETHADDR, SROM8_MACHI, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MACADDR, 0x000000e0, SRFL_ETHADDR, SROM5_MACHI, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MACADDR, 0x00000010, SRFL_ETHADDR, SROM4_MACHI, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MACADDR, 0x00000008, SRFL_ETHADDR, SROM3_MACHI, 0xffff},</div><div class='del'>-	{BRCMS_SROM_IL0MACADDR, 0x00000007, SRFL_ETHADDR, SROM_MACHI_IL0,</div><div class='del'>-	 0xffff},</div><div class='del'>-	{BRCMS_SROM_ET1MACADDR, 0x00000007, SRFL_ETHADDR, SROM_MACHI_ET1,</div><div class='del'>-	 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_LEDDC, 0xffffff00, SRFL_NOFFS | SRFL_LEDDC, SROM8_LEDDC,</div><div class='ctx'> 	 0xffff},</div><div class='del'>-	{BRCMS_SROM_LEDDC, 0x000000e0, SRFL_NOFFS | SRFL_LEDDC, SROM5_LEDDC,</div><div class='del'>-	 0xffff},</div><div class='del'>-	{BRCMS_SROM_LEDDC, 0x00000010, SRFL_NOFFS | SRFL_LEDDC, SROM4_LEDDC,</div><div class='del'>-	 0xffff},</div><div class='del'>-	{BRCMS_SROM_LEDDC, 0x00000008, SRFL_NOFFS | SRFL_LEDDC, SROM3_LEDDC,</div><div class='del'>-	 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_RAWTEMPSENSE, 0xffffff00, SRFL_PRHEX, SROM8_MPWR_RAWTS,</div><div class='ctx'> 	 0x01ff},</div><div class='ctx'> 	{BRCMS_SROM_MEASPOWER, 0xffffff00, SRFL_PRHEX, SROM8_MPWR_RAWTS,</div><div class='hunk'>@@ -650,16 +441,7 @@ static const struct brcms_sromvar pci_sromvars[] = {</div><div class='ctx'> 	{BRCMS_SROM_PHYCAL_TEMPDELTA, 0xffffff00, 0, SROM8_PHYCAL_TEMPDELTA,</div><div class='ctx'> 	 0x00ff},</div><div class='ctx'> </div><div class='del'>-	{BRCMS_SROM_CCK2GPO, 0x000000f0, 0, SROM4_2G_CCKPO, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_CCK2GPO, 0x00000100, 0, SROM8_2G_CCKPO, 0xffff},</div><div class='del'>-	{BRCMS_SROM_OFDM2GPO, 0x000000f0, SRFL_MORE, SROM4_2G_OFDMPO, 0xffff},</div><div class='del'>-	{BRCMS_SROM_CONT, 0, 0, SROM4_2G_OFDMPO + 1, 0xffff},</div><div class='del'>-	{BRCMS_SROM_OFDM5GPO, 0x000000f0, SRFL_MORE, SROM4_5G_OFDMPO, 0xffff},</div><div class='del'>-	{BRCMS_SROM_CONT, 0, 0, SROM4_5G_OFDMPO + 1, 0xffff},</div><div class='del'>-	{BRCMS_SROM_OFDM5GLPO, 0x000000f0, SRFL_MORE, SROM4_5GL_OFDMPO, 0xffff},</div><div class='del'>-	{BRCMS_SROM_CONT, 0, 0, SROM4_5GL_OFDMPO + 1, 0xffff},</div><div class='del'>-	{BRCMS_SROM_OFDM5GHPO, 0x000000f0, SRFL_MORE, SROM4_5GH_OFDMPO, 0xffff},</div><div class='del'>-	{BRCMS_SROM_CONT, 0, 0, SROM4_5GH_OFDMPO + 1, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_OFDM2GPO, 0x00000100, SRFL_MORE, SROM8_2G_OFDMPO, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_CONT, 0, 0, SROM8_2G_OFDMPO + 1, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_OFDM5GPO, 0x00000100, SRFL_MORE, SROM8_5G_OFDMPO, 0xffff},</div><div class='hunk'>@@ -668,38 +450,6 @@ static const struct brcms_sromvar pci_sromvars[] = {</div><div class='ctx'> 	{BRCMS_SROM_CONT, 0, 0, SROM8_5GL_OFDMPO + 1, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_OFDM5GHPO, 0x00000100, SRFL_MORE, SROM8_5GH_OFDMPO, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_CONT, 0, 0, SROM8_5GH_OFDMPO + 1, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS2GPO0, 0x000000f0, 0, SROM4_2G_MCSPO, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS2GPO1, 0x000000f0, 0, SROM4_2G_MCSPO + 1, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS2GPO2, 0x000000f0, 0, SROM4_2G_MCSPO + 2, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS2GPO3, 0x000000f0, 0, SROM4_2G_MCSPO + 3, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS2GPO4, 0x000000f0, 0, SROM4_2G_MCSPO + 4, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS2GPO5, 0x000000f0, 0, SROM4_2G_MCSPO + 5, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS2GPO6, 0x000000f0, 0, SROM4_2G_MCSPO + 6, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS2GPO7, 0x000000f0, 0, SROM4_2G_MCSPO + 7, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GPO0, 0x000000f0, 0, SROM4_5G_MCSPO, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GPO1, 0x000000f0, 0, SROM4_5G_MCSPO + 1, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GPO2, 0x000000f0, 0, SROM4_5G_MCSPO + 2, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GPO3, 0x000000f0, 0, SROM4_5G_MCSPO + 3, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GPO4, 0x000000f0, 0, SROM4_5G_MCSPO + 4, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GPO5, 0x000000f0, 0, SROM4_5G_MCSPO + 5, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GPO6, 0x000000f0, 0, SROM4_5G_MCSPO + 6, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GPO7, 0x000000f0, 0, SROM4_5G_MCSPO + 7, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GLPO0, 0x000000f0, 0, SROM4_5GL_MCSPO, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GLPO1, 0x000000f0, 0, SROM4_5GL_MCSPO + 1, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GLPO2, 0x000000f0, 0, SROM4_5GL_MCSPO + 2, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GLPO3, 0x000000f0, 0, SROM4_5GL_MCSPO + 3, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GLPO4, 0x000000f0, 0, SROM4_5GL_MCSPO + 4, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GLPO5, 0x000000f0, 0, SROM4_5GL_MCSPO + 5, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GLPO6, 0x000000f0, 0, SROM4_5GL_MCSPO + 6, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GLPO7, 0x000000f0, 0, SROM4_5GL_MCSPO + 7, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GHPO0, 0x000000f0, 0, SROM4_5GH_MCSPO, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GHPO1, 0x000000f0, 0, SROM4_5GH_MCSPO + 1, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GHPO2, 0x000000f0, 0, SROM4_5GH_MCSPO + 2, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GHPO3, 0x000000f0, 0, SROM4_5GH_MCSPO + 3, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GHPO4, 0x000000f0, 0, SROM4_5GH_MCSPO + 4, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GHPO5, 0x000000f0, 0, SROM4_5GH_MCSPO + 5, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GHPO6, 0x000000f0, 0, SROM4_5GH_MCSPO + 6, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MCS5GHPO7, 0x000000f0, 0, SROM4_5GH_MCSPO + 7, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_MCS2GPO0, 0x00000100, 0, SROM8_2G_MCSPO, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_MCS2GPO1, 0x00000100, 0, SROM8_2G_MCSPO + 1, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_MCS2GPO2, 0x00000100, 0, SROM8_2G_MCSPO + 2, 0xffff},</div><div class='hunk'>@@ -732,10 +482,6 @@ static const struct brcms_sromvar pci_sromvars[] = {</div><div class='ctx'> 	{BRCMS_SROM_MCS5GHPO5, 0x00000100, 0, SROM8_5GH_MCSPO + 5, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_MCS5GHPO6, 0x00000100, 0, SROM8_5GH_MCSPO + 6, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_MCS5GHPO7, 0x00000100, 0, SROM8_5GH_MCSPO + 7, 0xffff},</div><div class='del'>-	{BRCMS_SROM_CDDPO, 0x000000f0, 0, SROM4_CDDPO, 0xffff},</div><div class='del'>-	{BRCMS_SROM_STBCPO, 0x000000f0, 0, SROM4_STBCPO, 0xffff},</div><div class='del'>-	{BRCMS_SROM_BW40PO, 0x000000f0, 0, SROM4_BW40PO, 0xffff},</div><div class='del'>-	{BRCMS_SROM_BWDUPPO, 0x000000f0, 0, SROM4_BWDUPPO, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_CDDPO, 0x00000100, 0, SROM8_CDDPO, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_STBCPO, 0x00000100, 0, SROM8_STBCPO, 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_BW40PO, 0x00000100, 0, SROM8_BW40PO, 0xffff},</div><div class='hunk'>@@ -811,34 +557,6 @@ static const struct brcms_sromvar pci_sromvars[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct brcms_sromvar perpath_pci_sromvars[] = {</div><div class='del'>-	{BRCMS_SROM_MAXP2GA0, 0x000000f0, 0, SROM4_2G_ITT_MAXP, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_ITT2GA0, 0x000000f0, 0, SROM4_2G_ITT_MAXP, 0xff00},</div><div class='del'>-	{BRCMS_SROM_ITT5GA0, 0x000000f0, 0, SROM4_5G_ITT_MAXP, 0xff00},</div><div class='del'>-	{BRCMS_SROM_PA2GW0A0, 0x000000f0, SRFL_PRHEX, SROM4_2G_PA, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA2GW1A0, 0x000000f0, SRFL_PRHEX, SROM4_2G_PA + 1, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA2GW2A0, 0x000000f0, SRFL_PRHEX, SROM4_2G_PA + 2, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA2GW3A0, 0x000000f0, SRFL_PRHEX, SROM4_2G_PA + 3, 0xffff},</div><div class='del'>-	{BRCMS_SROM_MAXP5GA0, 0x000000f0, 0, SROM4_5G_ITT_MAXP, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_MAXP5GHA0, 0x000000f0, 0, SROM4_5GLH_MAXP, 0x00ff},</div><div class='del'>-	{BRCMS_SROM_MAXP5GLA0, 0x000000f0, 0, SROM4_5GLH_MAXP, 0xff00},</div><div class='del'>-	{BRCMS_SROM_PA5GW0A0, 0x000000f0, SRFL_PRHEX, SROM4_5G_PA, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA5GW1A0, 0x000000f0, SRFL_PRHEX, SROM4_5G_PA + 1, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA5GW2A0, 0x000000f0, SRFL_PRHEX, SROM4_5G_PA + 2, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA5GW3A0, 0x000000f0, SRFL_PRHEX, SROM4_5G_PA + 3, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA5GLW0A0, 0x000000f0, SRFL_PRHEX, SROM4_5GL_PA, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA5GLW1A0, 0x000000f0, SRFL_PRHEX, SROM4_5GL_PA + 1,</div><div class='del'>-	 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA5GLW2A0, 0x000000f0, SRFL_PRHEX, SROM4_5GL_PA + 2,</div><div class='del'>-	 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA5GLW3A0, 0x000000f0, SRFL_PRHEX, SROM4_5GL_PA + 3,</div><div class='del'>-	 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA5GHW0A0, 0x000000f0, SRFL_PRHEX, SROM4_5GH_PA, 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA5GHW1A0, 0x000000f0, SRFL_PRHEX, SROM4_5GH_PA + 1,</div><div class='del'>-	 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA5GHW2A0, 0x000000f0, SRFL_PRHEX, SROM4_5GH_PA + 2,</div><div class='del'>-	 0xffff},</div><div class='del'>-	{BRCMS_SROM_PA5GHW3A0, 0x000000f0, SRFL_PRHEX, SROM4_5GH_PA + 3,</div><div class='del'>-	 0xffff},</div><div class='ctx'> 	{BRCMS_SROM_MAXP2GA0, 0xffffff00, 0, SROM8_2G_ITT_MAXP, 0x00ff},</div><div class='ctx'> 	{BRCMS_SROM_ITT2GA0, 0xffffff00, 0, SROM8_2G_ITT_MAXP, 0xff00},</div><div class='ctx'> 	{BRCMS_SROM_ITT5GA0, 0xffffff00, 0, SROM8_5G_ITT_MAXP, 0xff00},</div><div class='hunk'>@@ -868,24 +586,6 @@ static const struct brcms_sromvar perpath_pci_sromvars[] = {</div><div class='ctx'>  * shared between devices. */</div><div class='ctx'> static u8 brcms_srom_crc8_table[CRC8_TABLE_SIZE];</div><div class='ctx'> </div><div class='del'>-static u16 __iomem *</div><div class='del'>-srom_window_address(struct si_pub *sih, u8 __iomem *curmap)</div><div class='del'>-{</div><div class='del'>-	if (sih-&gt;ccrev &lt; 32)</div><div class='del'>-		return (u16 __iomem *)(curmap + PCI_BAR0_SPROM_OFFSET);</div><div class='del'>-	if (sih-&gt;cccaps &amp; CC_CAP_SROM)</div><div class='del'>-		return (u16 __iomem *)</div><div class='del'>-		       (curmap + PCI_16KB0_CCREGS_OFFSET + CC_SROM_OTP);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Parse SROM and create name=value pairs. 'srom' points to</div><div class='del'>- * the SROM word array. 'off' specifies the offset of the</div><div class='del'>- * first word 'srom' points to, which should be either 0 or</div><div class='del'>- * SROM3_SWRG_OFF (full SROM or software region).</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> static uint mask_shift(u16 mask)</div><div class='ctx'> {</div><div class='ctx'> 	uint i;</div><div class='hunk'>@@ -906,18 +606,16 @@ static uint mask_width(u16 mask)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ltoh16_buf(u16 *buf, unsigned int size)</div><div class='add'>+static inline void le16_to_cpu_buf(u16 *buf, uint nwords)</div><div class='ctx'> {</div><div class='del'>-	size /= 2;</div><div class='del'>-	while (size--)</div><div class='del'>-		*(buf + size) = le16_to_cpu(*(__le16 *)(buf + size));</div><div class='add'>+	while (nwords--)</div><div class='add'>+		*(buf + nwords) = le16_to_cpu(*(__le16 *)(buf + nwords));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void htol16_buf(u16 *buf, unsigned int size)</div><div class='add'>+static inline void cpu_to_le16_buf(u16 *buf, uint nwords)</div><div class='ctx'> {</div><div class='del'>-	size /= 2;</div><div class='del'>-	while (size--)</div><div class='del'>-		*(__le16 *)(buf + size) = cpu_to_le16(*(buf + size));</div><div class='add'>+	while (nwords--)</div><div class='add'>+		*(__le16 *)(buf + nwords) = cpu_to_le16(*(buf + nwords));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -929,11 +627,14 @@ _initvars_srom_pci(u8 sromrev, u16 *srom, struct list_head *var_list)</div><div class='ctx'> 	struct brcms_srom_list_head *entry;</div><div class='ctx'> 	enum brcms_srom_id id;</div><div class='ctx'> 	u16 w;</div><div class='del'>-	u32 val;</div><div class='add'>+	u32 val = 0;</div><div class='ctx'> 	const struct brcms_sromvar *srv;</div><div class='ctx'> 	uint width;</div><div class='ctx'> 	uint flags;</div><div class='ctx'> 	u32 sr = (1 &lt;&lt; sromrev);</div><div class='add'>+	uint p;</div><div class='add'>+	uint pb =  SROM8_PATH0;</div><div class='add'>+	const uint psz = SROM8_PATH1 - SROM8_PATH0;</div><div class='ctx'> </div><div class='ctx'> 	/* first store the srom revision */</div><div class='ctx'> 	entry = kzalloc(sizeof(struct brcms_srom_list_head), GFP_KERNEL);</div><div class='hunk'>@@ -1031,90 +732,93 @@ _initvars_srom_pci(u8 sromrev, u16 *srom, struct list_head *var_list)</div><div class='ctx'> 		list_add(&amp;entry-&gt;var_list, var_list);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sromrev &gt;= 4) {</div><div class='del'>-		/* Do per-path variables */</div><div class='del'>-		uint p, pb, psz;</div><div class='del'>-</div><div class='del'>-		if (sromrev &gt;= 8) {</div><div class='del'>-			pb = SROM8_PATH0;</div><div class='del'>-			psz = SROM8_PATH1 - SROM8_PATH0;</div><div class='del'>-		} else {</div><div class='del'>-			pb = SROM4_PATH0;</div><div class='del'>-			psz = SROM4_PATH1 - SROM4_PATH0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (p = 0; p &lt; MAX_PATH_SROM; p++) {</div><div class='del'>-			for (srv = perpath_pci_sromvars;</div><div class='del'>-			     srv-&gt;varid != BRCMS_SROM_NULL; srv++) {</div><div class='del'>-				if ((srv-&gt;revmask &amp; sr) == 0)</div><div class='del'>-					continue;</div><div class='add'>+	for (p = 0; p &lt; MAX_PATH_SROM; p++) {</div><div class='add'>+		for (srv = perpath_pci_sromvars;</div><div class='add'>+		     srv-&gt;varid != BRCMS_SROM_NULL; srv++) {</div><div class='add'>+			if ((srv-&gt;revmask &amp; sr) == 0)</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-				if (srv-&gt;flags &amp; SRFL_NOVAR)</div><div class='del'>-					continue;</div><div class='add'>+			if (srv-&gt;flags &amp; SRFL_NOVAR)</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-				w = srom[pb + srv-&gt;off];</div><div class='del'>-				val = (w &amp; srv-&gt;mask) &gt;&gt; mask_shift(srv-&gt;mask);</div><div class='del'>-				width = mask_width(srv-&gt;mask);</div><div class='add'>+			w = srom[pb + srv-&gt;off];</div><div class='add'>+			val = (w &amp; srv-&gt;mask) &gt;&gt; mask_shift(srv-&gt;mask);</div><div class='add'>+			width = mask_width(srv-&gt;mask);</div><div class='ctx'> </div><div class='del'>-				/* Cheating: no per-path var is more than</div><div class='del'>-				 * 1 word */</div><div class='del'>-				if ((srv-&gt;flags &amp; SRFL_NOFFS)</div><div class='del'>-				    &amp;&amp; ((int)val == (1 &lt;&lt; width) - 1))</div><div class='del'>-					continue;</div><div class='add'>+			/* Cheating: no per-path var is more than</div><div class='add'>+			 * 1 word */</div><div class='add'>+			if ((srv-&gt;flags &amp; SRFL_NOFFS)</div><div class='add'>+			    &amp;&amp; ((int)val == (1 &lt;&lt; width) - 1))</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-				entry =</div><div class='del'>-				    kzalloc(sizeof(struct brcms_srom_list_head),</div><div class='del'>-					    GFP_KERNEL);</div><div class='del'>-				entry-&gt;varid = srv-&gt;varid+p;</div><div class='del'>-				entry-&gt;var_type = BRCMS_SROM_UNUMBER;</div><div class='del'>-				entry-&gt;uval = val;</div><div class='del'>-				list_add(&amp;entry-&gt;var_list, var_list);</div><div class='del'>-			}</div><div class='del'>-			pb += psz;</div><div class='add'>+			entry =</div><div class='add'>+			    kzalloc(sizeof(struct brcms_srom_list_head),</div><div class='add'>+				    GFP_KERNEL);</div><div class='add'>+			entry-&gt;varid = srv-&gt;varid+p;</div><div class='add'>+			entry-&gt;var_type = BRCMS_SROM_UNUMBER;</div><div class='add'>+			entry-&gt;uval = val;</div><div class='add'>+			list_add(&amp;entry-&gt;var_list, var_list);</div><div class='ctx'> 		}</div><div class='add'>+		pb += psz;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * The crc check is done on a little-endian array, we need</div><div class='add'>+ * to switch the bytes around before checking crc (and</div><div class='add'>+ * then switch it back).</div><div class='add'>+ */</div><div class='add'>+static int do_crc_check(u16 *buf, unsigned nwords)</div><div class='add'>+{</div><div class='add'>+	u8 crc;</div><div class='add'>+</div><div class='add'>+	cpu_to_le16_buf(buf, nwords);</div><div class='add'>+	crc = crc8(brcms_srom_crc8_table, (void *)buf, nwords &lt;&lt; 1, CRC8_INIT_VALUE);</div><div class='add'>+	le16_to_cpu_buf(buf, nwords);</div><div class='add'>+</div><div class='add'>+	return crc == CRC8_GOOD_VALUE(brcms_srom_crc8_table);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Read in and validate sprom.</div><div class='ctx'>  * Return 0 on success, nonzero on error.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-sprom_read_pci(struct si_pub *sih, u16 __iomem *sprom, uint wordoff,</div><div class='del'>-	       u16 *buf, uint nwords, bool check_crc)</div><div class='add'>+sprom_read_pci(struct si_pub *sih, u16 *buf, uint nwords, bool check_crc)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	uint i;</div><div class='add'>+	struct bcma_device *core;</div><div class='add'>+	uint sprom_offset;</div><div class='add'>+</div><div class='add'>+	/* determine core to read */</div><div class='add'>+	if (ai_get_ccrev(sih) &lt; 32) {</div><div class='add'>+		core = ai_findcore(sih, BCMA_CORE_80211, 0);</div><div class='add'>+		sprom_offset = PCI_BAR0_SPROM_OFFSET;</div><div class='add'>+	} else {</div><div class='add'>+		core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);</div><div class='add'>+		sprom_offset = CHIPCREGOFFS(sromotp);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* read the sprom */</div><div class='ctx'> 	for (i = 0; i &lt; nwords; i++)</div><div class='del'>-		buf[i] = R_REG(&amp;sprom[wordoff + i]);</div><div class='add'>+		buf[i] = bcma_read16(core, sprom_offset+i*2);</div><div class='ctx'> </div><div class='del'>-	if (check_crc) {</div><div class='del'>-</div><div class='del'>-		if (buf[0] == 0xffff)</div><div class='del'>-			/*</div><div class='del'>-			 * The hardware thinks that an srom that starts with</div><div class='del'>-			 * 0xffff is blank, regardless of the rest of the</div><div class='del'>-			 * content, so declare it bad.</div><div class='del'>-			 */</div><div class='del'>-			return -ENODATA;</div><div class='add'>+	if (buf[0] == 0xffff)</div><div class='add'>+		/*</div><div class='add'>+		 * The hardware thinks that an srom that starts with</div><div class='add'>+		 * 0xffff is blank, regardless of the rest of the</div><div class='add'>+		 * content, so declare it bad.</div><div class='add'>+		 */</div><div class='add'>+		return -ENODATA;</div><div class='ctx'> </div><div class='del'>-		/* fixup the endianness so crc8 will pass */</div><div class='del'>-		htol16_buf(buf, nwords * 2);</div><div class='del'>-		if (crc8(brcms_srom_crc8_table, (u8 *) buf, nwords * 2,</div><div class='del'>-			 CRC8_INIT_VALUE) !=</div><div class='del'>-			 CRC8_GOOD_VALUE(brcms_srom_crc8_table))</div><div class='del'>-			/* DBG only pci always read srom4 first, then srom8/9 */</div><div class='del'>-			err = -EIO;</div><div class='add'>+	if (check_crc &amp;&amp; !do_crc_check(buf, nwords))</div><div class='add'>+		err = -EIO;</div><div class='ctx'> </div><div class='del'>-		/* now correct the endianness of the byte array */</div><div class='del'>-		ltoh16_buf(buf, nwords * 2);</div><div class='del'>-	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int otp_read_pci(struct si_pub *sih, u16 *buf, uint bufsz)</div><div class='add'>+static int otp_read_pci(struct si_pub *sih, u16 *buf, uint nwords)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *otp;</div><div class='ctx'> 	uint sz = OTP_SZ_MAX / 2;	/* size in words */</div><div class='hunk'>@@ -1126,7 +830,8 @@ static int otp_read_pci(struct si_pub *sih, u16 *buf, uint bufsz)</div><div class='ctx'> </div><div class='ctx'> 	err = otp_read_region(sih, OTP_HW_RGN, (u16 *) otp, &amp;sz);</div><div class='ctx'> </div><div class='del'>-	memcpy(buf, otp, bufsz);</div><div class='add'>+	sz = min_t(uint, sz, nwords);</div><div class='add'>+	memcpy(buf, otp, sz * 2);</div><div class='ctx'> </div><div class='ctx'> 	kfree(otp);</div><div class='ctx'> </div><div class='hunk'>@@ -1139,13 +844,13 @@ static int otp_read_pci(struct si_pub *sih, u16 *buf, uint bufsz)</div><div class='ctx'> 		return -ENODATA;</div><div class='ctx'> </div><div class='ctx'> 	/* fixup the endianness so crc8 will pass */</div><div class='del'>-	htol16_buf(buf, bufsz);</div><div class='del'>-	if (crc8(brcms_srom_crc8_table, (u8 *) buf, SROM4_WORDS * 2,</div><div class='add'>+	cpu_to_le16_buf(buf, sz);</div><div class='add'>+	if (crc8(brcms_srom_crc8_table, (u8 *) buf, sz * 2,</div><div class='ctx'> 		 CRC8_INIT_VALUE) != CRC8_GOOD_VALUE(brcms_srom_crc8_table))</div><div class='ctx'> 		err = -EIO;</div><div class='del'>-</div><div class='del'>-	/* now correct the endianness of the byte array */</div><div class='del'>-	ltoh16_buf(buf, bufsz);</div><div class='add'>+	else</div><div class='add'>+		/* now correct the endianness of the byte array */</div><div class='add'>+		le16_to_cpu_buf(buf, sz);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1154,10 +859,9 @@ static int otp_read_pci(struct si_pub *sih, u16 *buf, uint bufsz)</div><div class='ctx'>  * Initialize nonvolatile variable table from sprom.</div><div class='ctx'>  * Return 0 on success, nonzero on error.</div><div class='ctx'>  */</div><div class='del'>-static int initvars_srom_pci(struct si_pub *sih, void __iomem *curmap)</div><div class='add'>+int srom_var_init(struct si_pub *sih)</div><div class='ctx'> {</div><div class='ctx'> 	u16 *srom;</div><div class='del'>-	u16 __iomem *sromwindow;</div><div class='ctx'> 	u8 sromrev = 0;</div><div class='ctx'> 	u32 sr;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -1169,33 +873,17 @@ static int initvars_srom_pci(struct si_pub *sih, void __iomem *curmap)</div><div class='ctx'> 	if (!srom)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	sromwindow = srom_window_address(sih, curmap);</div><div class='del'>-</div><div class='ctx'> 	crc8_populate_lsb(brcms_srom_crc8_table, SROM_CRC8_POLY);</div><div class='ctx'> 	if (ai_is_sprom_available(sih)) {</div><div class='del'>-		err = sprom_read_pci(sih, sromwindow, 0, srom, SROM_WORDS,</div><div class='del'>-				     true);</div><div class='del'>-</div><div class='del'>-		if ((srom[SROM4_SIGN] == SROM4_SIGNATURE) ||</div><div class='del'>-		    (((sih-&gt;buscoretype == PCIE_CORE_ID)</div><div class='del'>-		      &amp;&amp; (sih-&gt;buscorerev &gt;= 6))</div><div class='del'>-		     || ((sih-&gt;buscoretype == PCI_CORE_ID)</div><div class='del'>-			 &amp;&amp; (sih-&gt;buscorerev &gt;= 0xe)))) {</div><div class='del'>-			/* sromrev &gt;= 4, read more */</div><div class='del'>-			err = sprom_read_pci(sih, sromwindow, 0, srom,</div><div class='del'>-					     SROM4_WORDS, true);</div><div class='del'>-			sromrev = srom[SROM4_CRCREV] &amp; 0xff;</div><div class='del'>-		} else if (err == 0) {</div><div class='del'>-			/* srom is good and is rev &lt; 4 */</div><div class='add'>+		err = sprom_read_pci(sih, srom, SROM4_WORDS, true);</div><div class='add'>+</div><div class='add'>+		if (err == 0)</div><div class='add'>+			/* srom read and passed crc */</div><div class='ctx'> 			/* top word of sprom contains version and crc8 */</div><div class='del'>-			sromrev = srom[SROM_CRCREV] &amp; 0xff;</div><div class='del'>-			/* bcm4401 sroms misprogrammed */</div><div class='del'>-			if (sromrev == 0x10)</div><div class='del'>-				sromrev = 1;</div><div class='del'>-		}</div><div class='add'>+			sromrev = srom[SROM4_CRCREV] &amp; 0xff;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Use OTP if SPROM not available */</div><div class='del'>-		err = otp_read_pci(sih, srom, SROM_MAX);</div><div class='add'>+		err = otp_read_pci(sih, srom, SROM4_WORDS);</div><div class='ctx'> 		if (err == 0)</div><div class='ctx'> 			/* OTP only contain SROM rev8/rev9 for now */</div><div class='ctx'> 			sromrev = srom[SROM4_CRCREV] &amp; 0xff;</div><div class='hunk'>@@ -1208,10 +896,9 @@ static int initvars_srom_pci(struct si_pub *sih, void __iomem *curmap)</div><div class='ctx'> 		sr = 1 &lt;&lt; sromrev;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * srom version check: Current valid versions: 1, 2, 3, 4, 5, 8,</div><div class='del'>-		 * 9</div><div class='add'>+		 * srom version check: Current valid versions: 8, 9</div><div class='ctx'> 		 */</div><div class='del'>-		if ((sr &amp; 0x33e) == 0) {</div><div class='add'>+		if ((sr &amp; 0x300) == 0) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto errout;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1238,21 +925,6 @@ void srom_free_vars(struct si_pub *sih)</div><div class='ctx'> 		kfree(entry);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-/*</div><div class='del'>- * Initialize local vars from the right source for this platform.</div><div class='del'>- * Return 0 on success, nonzero on error.</div><div class='del'>- */</div><div class='del'>-int srom_var_init(struct si_pub *sih, void __iomem *curmap)</div><div class='del'>-{</div><div class='del'>-	uint len;</div><div class='del'>-</div><div class='del'>-	len = 0;</div><div class='del'>-</div><div class='del'>-	if (curmap != NULL)</div><div class='del'>-		return initvars_srom_pci(sih, curmap);</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Search the name=value vars for a specific one and return its value.</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/srom.h b/drivers/net/wireless/brcm80211/brcmsmac/srom.h<br/>index 708c43ff51cc..f2a58f262c99 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/srom.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/srom.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/srom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/srom.h</a></div><div class='hunk'>@@ -20,15 +20,10 @@</div><div class='ctx'> #include "types.h"</div><div class='ctx'> </div><div class='ctx'> /* Prototypes */</div><div class='del'>-extern int srom_var_init(struct si_pub *sih, void __iomem *curmap);</div><div class='add'>+extern int srom_var_init(struct si_pub *sih);</div><div class='ctx'> extern void srom_free_vars(struct si_pub *sih);</div><div class='ctx'> </div><div class='ctx'> extern int srom_read(struct si_pub *sih, uint bus, void *curmap,</div><div class='ctx'> 		     uint byteoff, uint nbytes, u16 *buf, bool check_crc);</div><div class='ctx'> </div><div class='del'>-/* parse standard PCMCIA cis, normally used by SB/PCMCIA/SDIO/SPI/OTP</div><div class='del'>- *   and extract from it into name=value pairs</div><div class='del'>- */</div><div class='del'>-extern int srom_parsecis(u8 **pcis, uint ciscnt,</div><div class='del'>-			 char **vars, uint *count);</div><div class='ctx'> #endif				/* _BRCM_SROM_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmsmac/types.h b/drivers/net/wireless/brcm80211/brcmsmac/types.h<br/>index 27a814b07462..e11ae83111e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/types.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmsmac/types.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmsmac/types.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmsmac/types.h</a></div><div class='hunk'>@@ -250,66 +250,18 @@ do {						\</div><div class='ctx'> 		wiphy_err(dev, "%s: " fmt, __func__, ##args);	\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Register access macros.</div><div class='del'>- *</div><div class='del'>- * These macro's take a pointer to the address to read as one of their</div><div class='del'>- * arguments. The macro itself deduces the size of the IO transaction (u8, u16</div><div class='del'>- * or u32). Advantage of this approach in combination with using a struct to</div><div class='del'>- * define the registers in a register block, is that access size and access</div><div class='del'>- * location are defined in only one spot. This reduces the risk of the</div><div class='del'>- * programmer trying to use an unsupported transaction size on a register.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define R_REG(r) \</div><div class='del'>-	({ \</div><div class='del'>-		__typeof(*(r)) __osl_v; \</div><div class='del'>-		switch (sizeof(*(r))) { \</div><div class='del'>-		case sizeof(u8): \</div><div class='del'>-			__osl_v = readb((u8 __iomem *)(r)); \</div><div class='del'>-			break; \</div><div class='del'>-		case sizeof(u16): \</div><div class='del'>-			__osl_v = readw((u16 __iomem *)(r)); \</div><div class='del'>-			break; \</div><div class='del'>-		case sizeof(u32): \</div><div class='del'>-			__osl_v = readl((u32 __iomem *)(r)); \</div><div class='del'>-			break; \</div><div class='del'>-		} \</div><div class='del'>-		__osl_v; \</div><div class='del'>-	})</div><div class='del'>-</div><div class='del'>-#define W_REG(r, v) do { \</div><div class='del'>-		switch (sizeof(*(r))) { \</div><div class='del'>-		case sizeof(u8):	\</div><div class='del'>-			writeb((u8)((v) &amp; 0xFF), (u8 __iomem *)(r)); \</div><div class='del'>-			break; \</div><div class='del'>-		case sizeof(u16):	\</div><div class='del'>-			writew((u16)((v) &amp; 0xFFFF), (u16 __iomem *)(r)); \</div><div class='del'>-			break; \</div><div class='del'>-		case sizeof(u32):	\</div><div class='del'>-			writel((u32)(v), (u32 __iomem *)(r)); \</div><div class='del'>-			break; \</div><div class='del'>-		} \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_BCM47XX</div><div class='ctx'> /*</div><div class='ctx'>  * bcm4716 (which includes 4717 &amp; 4718), plus 4706 on PCIe can reorder</div><div class='ctx'>  * transactions. As a fix, a read after write is performed on certain places</div><div class='ctx'>  * in the code. Older chips and the newer 5357 family don't require this fix.</div><div class='ctx'>  */</div><div class='del'>-#define W_REG_FLUSH(r, v)	({ W_REG((r), (v)); (void)R_REG(r); })</div><div class='add'>+#define bcma_wflush16(c, o, v) \</div><div class='add'>+	({ bcma_write16(c, o, v); (void)bcma_read16(c, o); })</div><div class='ctx'> #else</div><div class='del'>-#define W_REG_FLUSH(r, v)	W_REG((r), (v))</div><div class='add'>+#define bcma_wflush16(c, o, v)	bcma_write16(c, o, v)</div><div class='ctx'> #endif				/* CONFIG_BCM47XX */</div><div class='ctx'> </div><div class='del'>-#define AND_REG(r, v)	W_REG((r), R_REG(r) &amp; (v))</div><div class='del'>-#define OR_REG(r, v)	W_REG((r), R_REG(r) | (v))</div><div class='del'>-</div><div class='del'>-#define SET_REG(r, mask, val) \</div><div class='del'>-		W_REG((r), ((R_REG(r) &amp; ~(mask)) | (val)))</div><div class='del'>-</div><div class='ctx'> /* multi-bool data type: set of bools, mbool is true if any is set */</div><div class='ctx'> </div><div class='ctx'> /* set one bool */</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/brcmutil/utils.c b/drivers/net/wireless/brcm80211/brcmutil/utils.c<br/>index f27c48910827..b7537f70a795 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmutil/utils.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/brcmutil/utils.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/brcmutil/utils.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/brcmutil/utils.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;brcmu_utils.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Broadcom Corporation");</div><div class='hunk'>@@ -40,74 +41,20 @@ EXPORT_SYMBOL(brcmu_pkt_buf_get_skb);</div><div class='ctx'> /* Free the driver packet. Free the tag if present */</div><div class='ctx'> void brcmu_pkt_buf_free_skb(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *nskb;</div><div class='del'>-	int nest = 0;</div><div class='del'>-</div><div class='del'>-	/* perversion: we use skb-&gt;next to chain multi-skb packets */</div><div class='del'>-	while (skb) {</div><div class='del'>-		nskb = skb-&gt;next;</div><div class='del'>-		skb-&gt;next = NULL;</div><div class='del'>-</div><div class='del'>-		if (skb-&gt;destructor)</div><div class='del'>-			/* cannot kfree_skb() on hard IRQ (net/core/skbuff.c) if</div><div class='del'>-			 * destructor exists</div><div class='del'>-			 */</div><div class='del'>-			dev_kfree_skb_any(skb);</div><div class='del'>-		else</div><div class='del'>-			/* can free immediately (even in_irq()) if destructor</div><div class='del'>-			 * does not exist</div><div class='del'>-			 */</div><div class='del'>-			dev_kfree_skb(skb);</div><div class='del'>-</div><div class='del'>-		nest++;</div><div class='del'>-		skb = nskb;</div><div class='del'>-	}</div><div class='add'>+	WARN_ON(skb-&gt;next);</div><div class='add'>+	if (skb-&gt;destructor)</div><div class='add'>+		/* cannot kfree_skb() on hard IRQ (net/core/skbuff.c) if</div><div class='add'>+		 * destructor exists</div><div class='add'>+		 */</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+	else</div><div class='add'>+		/* can free immediately (even in_irq()) if destructor</div><div class='add'>+		 * does not exist</div><div class='add'>+		 */</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(brcmu_pkt_buf_free_skb);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* copy a buffer into a pkt buffer chain */</div><div class='del'>-uint brcmu_pktfrombuf(struct sk_buff *p, uint offset, int len,</div><div class='del'>-		unsigned char *buf)</div><div class='del'>-{</div><div class='del'>-	uint n, ret = 0;</div><div class='del'>-</div><div class='del'>-	/* skip 'offset' bytes */</div><div class='del'>-	for (; p &amp;&amp; offset; p = p-&gt;next) {</div><div class='del'>-		if (offset &lt; (uint) (p-&gt;len))</div><div class='del'>-			break;</div><div class='del'>-		offset -= p-&gt;len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!p)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* copy the data */</div><div class='del'>-	for (; p &amp;&amp; len; p = p-&gt;next) {</div><div class='del'>-		n = min((uint) (p-&gt;len) - offset, (uint) len);</div><div class='del'>-		memcpy(p-&gt;data + offset, buf, n);</div><div class='del'>-		buf += n;</div><div class='del'>-		len -= n;</div><div class='del'>-		ret += n;</div><div class='del'>-		offset = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(brcmu_pktfrombuf);</div><div class='del'>-</div><div class='del'>-/* return total length of buffer chain */</div><div class='del'>-uint brcmu_pkttotlen(struct sk_buff *p)</div><div class='del'>-{</div><div class='del'>-	uint total;</div><div class='del'>-</div><div class='del'>-	total = 0;</div><div class='del'>-	for (; p; p = p-&gt;next)</div><div class='del'>-		total += p-&gt;len;</div><div class='del'>-	return total;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(brcmu_pkttotlen);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * osl multiple-precedence packet queue</div><div class='ctx'>  * hi_prec is always &gt;= the number of the highest non-empty precedence</div><div class='hunk'>@@ -115,21 +62,13 @@ EXPORT_SYMBOL(brcmu_pkttotlen);</div><div class='ctx'> struct sk_buff *brcmu_pktq_penq(struct pktq *pq, int prec,</div><div class='ctx'> 				      struct sk_buff *p)</div><div class='ctx'> {</div><div class='del'>-	struct pktq_prec *q;</div><div class='add'>+	struct sk_buff_head *q;</div><div class='ctx'> </div><div class='ctx'> 	if (pktq_full(pq) || pktq_pfull(pq, prec))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	q = &amp;pq-&gt;q[prec];</div><div class='del'>-</div><div class='del'>-	if (q-&gt;head)</div><div class='del'>-		q-&gt;tail-&gt;prev = p;</div><div class='del'>-	else</div><div class='del'>-		q-&gt;head = p;</div><div class='del'>-</div><div class='del'>-	q-&gt;tail = p;</div><div class='del'>-	q-&gt;len++;</div><div class='del'>-</div><div class='add'>+	q = &amp;pq-&gt;q[prec].skblist;</div><div class='add'>+	skb_queue_tail(q, p);</div><div class='ctx'> 	pq-&gt;len++;</div><div class='ctx'> </div><div class='ctx'> 	if (pq-&gt;hi_prec &lt; prec)</div><div class='hunk'>@@ -142,20 +81,13 @@ EXPORT_SYMBOL(brcmu_pktq_penq);</div><div class='ctx'> struct sk_buff *brcmu_pktq_penq_head(struct pktq *pq, int prec,</div><div class='ctx'> 					   struct sk_buff *p)</div><div class='ctx'> {</div><div class='del'>-	struct pktq_prec *q;</div><div class='add'>+	struct sk_buff_head *q;</div><div class='ctx'> </div><div class='ctx'> 	if (pktq_full(pq) || pktq_pfull(pq, prec))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	q = &amp;pq-&gt;q[prec];</div><div class='del'>-</div><div class='del'>-	if (q-&gt;head == NULL)</div><div class='del'>-		q-&gt;tail = p;</div><div class='del'>-</div><div class='del'>-	p-&gt;prev = q-&gt;head;</div><div class='del'>-	q-&gt;head = p;</div><div class='del'>-	q-&gt;len++;</div><div class='del'>-</div><div class='add'>+	q = &amp;pq-&gt;q[prec].skblist;</div><div class='add'>+	skb_queue_head(q, p);</div><div class='ctx'> 	pq-&gt;len++;</div><div class='ctx'> </div><div class='ctx'> 	if (pq-&gt;hi_prec &lt; prec)</div><div class='hunk'>@@ -167,53 +99,30 @@ EXPORT_SYMBOL(brcmu_pktq_penq_head);</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *brcmu_pktq_pdeq(struct pktq *pq, int prec)</div><div class='ctx'> {</div><div class='del'>-	struct pktq_prec *q;</div><div class='add'>+	struct sk_buff_head *q;</div><div class='ctx'> 	struct sk_buff *p;</div><div class='ctx'> </div><div class='del'>-	q = &amp;pq-&gt;q[prec];</div><div class='del'>-</div><div class='del'>-	p = q-&gt;head;</div><div class='add'>+	q = &amp;pq-&gt;q[prec].skblist;</div><div class='add'>+	p = skb_dequeue(q);</div><div class='ctx'> 	if (p == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	q-&gt;head = p-&gt;prev;</div><div class='del'>-	if (q-&gt;head == NULL)</div><div class='del'>-		q-&gt;tail = NULL;</div><div class='del'>-</div><div class='del'>-	q-&gt;len--;</div><div class='del'>-</div><div class='ctx'> 	pq-&gt;len--;</div><div class='del'>-</div><div class='del'>-	p-&gt;prev = NULL;</div><div class='del'>-</div><div class='ctx'> 	return p;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(brcmu_pktq_pdeq);</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *brcmu_pktq_pdeq_tail(struct pktq *pq, int prec)</div><div class='ctx'> {</div><div class='del'>-	struct pktq_prec *q;</div><div class='del'>-	struct sk_buff *p, *prev;</div><div class='del'>-</div><div class='del'>-	q = &amp;pq-&gt;q[prec];</div><div class='add'>+	struct sk_buff_head *q;</div><div class='add'>+	struct sk_buff *p;</div><div class='ctx'> </div><div class='del'>-	p = q-&gt;head;</div><div class='add'>+	q = &amp;pq-&gt;q[prec].skblist;</div><div class='add'>+	p = skb_dequeue_tail(q);</div><div class='ctx'> 	if (p == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	for (prev = NULL; p != q-&gt;tail; p = p-&gt;prev)</div><div class='del'>-		prev = p;</div><div class='del'>-</div><div class='del'>-	if (prev)</div><div class='del'>-		prev-&gt;prev = NULL;</div><div class='del'>-	else</div><div class='del'>-		q-&gt;head = NULL;</div><div class='del'>-</div><div class='del'>-	q-&gt;tail = prev;</div><div class='del'>-	q-&gt;len--;</div><div class='del'>-</div><div class='ctx'> 	pq-&gt;len--;</div><div class='del'>-</div><div class='ctx'> 	return p;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(brcmu_pktq_pdeq_tail);</div><div class='hunk'>@@ -222,31 +131,17 @@ void</div><div class='ctx'> brcmu_pktq_pflush(struct pktq *pq, int prec, bool dir,</div><div class='ctx'> 		  bool (*fn)(struct sk_buff *, void *), void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct pktq_prec *q;</div><div class='del'>-	struct sk_buff *p, *prev = NULL;</div><div class='add'>+	struct sk_buff_head *q;</div><div class='add'>+	struct sk_buff *p, *next;</div><div class='ctx'> </div><div class='del'>-	q = &amp;pq-&gt;q[prec];</div><div class='del'>-	p = q-&gt;head;</div><div class='del'>-	while (p) {</div><div class='add'>+	q = &amp;pq-&gt;q[prec].skblist;</div><div class='add'>+	skb_queue_walk_safe(q, p, next) {</div><div class='ctx'> 		if (fn == NULL || (*fn) (p, arg)) {</div><div class='del'>-			bool head = (p == q-&gt;head);</div><div class='del'>-			if (head)</div><div class='del'>-				q-&gt;head = p-&gt;prev;</div><div class='del'>-			else</div><div class='del'>-				prev-&gt;prev = p-&gt;prev;</div><div class='del'>-			p-&gt;prev = NULL;</div><div class='add'>+			skb_unlink(p, q);</div><div class='ctx'> 			brcmu_pkt_buf_free_skb(p);</div><div class='del'>-			q-&gt;len--;</div><div class='ctx'> 			pq-&gt;len--;</div><div class='del'>-			p = (head ? q-&gt;head : prev-&gt;prev);</div><div class='del'>-		} else {</div><div class='del'>-			prev = p;</div><div class='del'>-			p = p-&gt;prev;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (q-&gt;head == NULL)</div><div class='del'>-		q-&gt;tail = NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(brcmu_pktq_pflush);</div><div class='ctx'> </div><div class='hunk'>@@ -271,8 +166,10 @@ void brcmu_pktq_init(struct pktq *pq, int num_prec, int max_len)</div><div class='ctx'> </div><div class='ctx'> 	pq-&gt;max = (u16) max_len;</div><div class='ctx'> </div><div class='del'>-	for (prec = 0; prec &lt; num_prec; prec++)</div><div class='add'>+	for (prec = 0; prec &lt; num_prec; prec++) {</div><div class='ctx'> 		pq-&gt;q[prec].max = pq-&gt;max;</div><div class='add'>+		skb_queue_head_init(&amp;pq-&gt;q[prec].skblist);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(brcmu_pktq_init);</div><div class='ctx'> </div><div class='hunk'>@@ -284,13 +181,13 @@ struct sk_buff *brcmu_pktq_peek_tail(struct pktq *pq, int *prec_out)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	for (prec = 0; prec &lt; pq-&gt;hi_prec; prec++)</div><div class='del'>-		if (pq-&gt;q[prec].head)</div><div class='add'>+		if (!skb_queue_empty(&amp;pq-&gt;q[prec].skblist))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 	if (prec_out)</div><div class='ctx'> 		*prec_out = prec;</div><div class='ctx'> </div><div class='del'>-	return pq-&gt;q[prec].tail;</div><div class='add'>+	return skb_peek_tail(&amp;pq-&gt;q[prec].skblist);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(brcmu_pktq_peek_tail);</div><div class='ctx'> </div><div class='hunk'>@@ -303,7 +200,7 @@ int brcmu_pktq_mlen(struct pktq *pq, uint prec_bmp)</div><div class='ctx'> </div><div class='ctx'> 	for (prec = 0; prec &lt;= pq-&gt;hi_prec; prec++)</div><div class='ctx'> 		if (prec_bmp &amp; (1 &lt;&lt; prec))</div><div class='del'>-			len += pq-&gt;q[prec].len;</div><div class='add'>+			len += pq-&gt;q[prec].skblist.qlen;</div><div class='ctx'> </div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='hunk'>@@ -313,39 +210,32 @@ EXPORT_SYMBOL(brcmu_pktq_mlen);</div><div class='ctx'> struct sk_buff *brcmu_pktq_mdeq(struct pktq *pq, uint prec_bmp,</div><div class='ctx'> 				      int *prec_out)</div><div class='ctx'> {</div><div class='del'>-	struct pktq_prec *q;</div><div class='add'>+	struct sk_buff_head *q;</div><div class='ctx'> 	struct sk_buff *p;</div><div class='ctx'> 	int prec;</div><div class='ctx'> </div><div class='ctx'> 	if (pq-&gt;len == 0)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	while ((prec = pq-&gt;hi_prec) &gt; 0 &amp;&amp; pq-&gt;q[prec].head == NULL)</div><div class='add'>+	while ((prec = pq-&gt;hi_prec) &gt; 0 &amp;&amp;</div><div class='add'>+	       skb_queue_empty(&amp;pq-&gt;q[prec].skblist))</div><div class='ctx'> 		pq-&gt;hi_prec--;</div><div class='ctx'> </div><div class='del'>-	while ((prec_bmp &amp; (1 &lt;&lt; prec)) == 0 || pq-&gt;q[prec].head == NULL)</div><div class='add'>+	while ((prec_bmp &amp; (1 &lt;&lt; prec)) == 0 ||</div><div class='add'>+	       skb_queue_empty(&amp;pq-&gt;q[prec].skblist))</div><div class='ctx'> 		if (prec-- == 0)</div><div class='ctx'> 			return NULL;</div><div class='ctx'> </div><div class='del'>-	q = &amp;pq-&gt;q[prec];</div><div class='del'>-</div><div class='del'>-	p = q-&gt;head;</div><div class='add'>+	q = &amp;pq-&gt;q[prec].skblist;</div><div class='add'>+	p = skb_dequeue(q);</div><div class='ctx'> 	if (p == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	q-&gt;head = p-&gt;prev;</div><div class='del'>-	if (q-&gt;head == NULL)</div><div class='del'>-		q-&gt;tail = NULL;</div><div class='del'>-</div><div class='del'>-	q-&gt;len--;</div><div class='add'>+	pq-&gt;len--;</div><div class='ctx'> </div><div class='ctx'> 	if (prec_out)</div><div class='ctx'> 		*prec_out = prec;</div><div class='ctx'> </div><div class='del'>-	pq-&gt;len--;</div><div class='del'>-</div><div class='del'>-	p-&gt;prev = NULL;</div><div class='del'>-</div><div class='ctx'> 	return p;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(brcmu_pktq_mdeq);</div><div class='hunk'>@@ -364,23 +254,3 @@ void brcmu_prpkt(const char *msg, struct sk_buff *p0)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(brcmu_prpkt);</div><div class='ctx'> #endif				/* defined(BCMDBG) */</div><div class='del'>-</div><div class='del'>-#if defined(BCMDBG)</div><div class='del'>-/*</div><div class='del'>- * print bytes formatted as hex to a string. return the resulting</div><div class='del'>- * string length</div><div class='del'>- */</div><div class='del'>-int brcmu_format_hex(char *str, const void *bytes, int len)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	char *p = str;</div><div class='del'>-	const u8 *src = (const u8 *)bytes;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		p += snprintf(p, 3, "%02X", *src);</div><div class='del'>-		src++;</div><div class='del'>-	}</div><div class='del'>-	return (int)(p - str);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(brcmu_format_hex);</div><div class='del'>-#endif				/* defined(BCMDBG) */</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/include/brcmu_utils.h b/drivers/net/wireless/brcm80211/include/brcmu_utils.h<br/>index 7d0f46e0eb95..ad249a0b4730 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/include/brcmu_utils.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/include/brcmu_utils.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/include/brcmu_utils.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/include/brcmu_utils.h</a></div><div class='hunk'>@@ -65,9 +65,7 @@</div><div class='ctx'> #define ETHER_ADDR_STR_LEN	18</div><div class='ctx'> </div><div class='ctx'> struct pktq_prec {</div><div class='del'>-	struct sk_buff *head;	/* first packet to dequeue */</div><div class='del'>-	struct sk_buff *tail;	/* last packet to dequeue */</div><div class='del'>-	u16 len;		/* number of queued packets */</div><div class='add'>+	struct sk_buff_head skblist;</div><div class='ctx'> 	u16 max;		/* maximum number of queued packets */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -88,32 +86,32 @@ struct pktq {</div><div class='ctx'> </div><div class='ctx'> static inline int pktq_plen(struct pktq *pq, int prec)</div><div class='ctx'> {</div><div class='del'>-	return pq-&gt;q[prec].len;</div><div class='add'>+	return pq-&gt;q[prec].skblist.qlen;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int pktq_pavail(struct pktq *pq, int prec)</div><div class='ctx'> {</div><div class='del'>-	return pq-&gt;q[prec].max - pq-&gt;q[prec].len;</div><div class='add'>+	return pq-&gt;q[prec].max - pq-&gt;q[prec].skblist.qlen;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool pktq_pfull(struct pktq *pq, int prec)</div><div class='ctx'> {</div><div class='del'>-	return pq-&gt;q[prec].len &gt;= pq-&gt;q[prec].max;</div><div class='add'>+	return pq-&gt;q[prec].skblist.qlen &gt;= pq-&gt;q[prec].max;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool pktq_pempty(struct pktq *pq, int prec)</div><div class='ctx'> {</div><div class='del'>-	return pq-&gt;q[prec].len == 0;</div><div class='add'>+	return skb_queue_empty(&amp;pq-&gt;q[prec].skblist);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct sk_buff *pktq_ppeek(struct pktq *pq, int prec)</div><div class='ctx'> {</div><div class='del'>-	return pq-&gt;q[prec].head;</div><div class='add'>+	return skb_peek(&amp;pq-&gt;q[prec].skblist);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct sk_buff *pktq_ppeek_tail(struct pktq *pq, int prec)</div><div class='ctx'> {</div><div class='del'>-	return pq-&gt;q[prec].tail;</div><div class='add'>+	return skb_peek_tail(&amp;pq-&gt;q[prec].skblist);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern struct sk_buff *brcmu_pktq_penq(struct pktq *pq, int prec,</div><div class='hunk'>@@ -172,24 +170,16 @@ extern void brcmu_pktq_flush(struct pktq *pq, bool dir,</div><div class='ctx'> 		bool (*fn)(struct sk_buff *, void *), void *arg);</div><div class='ctx'> </div><div class='ctx'> /* externs */</div><div class='del'>-/* packet */</div><div class='del'>-extern uint brcmu_pktfrombuf(struct sk_buff *p,</div><div class='del'>-	uint offset, int len, unsigned char *buf);</div><div class='del'>-extern uint brcmu_pkttotlen(struct sk_buff *p);</div><div class='del'>-</div><div class='ctx'> /* ip address */</div><div class='ctx'> struct ipv4_addr;</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/* externs */</div><div class='add'>+/* format/print */</div><div class='ctx'> #ifdef BCMDBG</div><div class='ctx'> extern void brcmu_prpkt(const char *msg, struct sk_buff *p0);</div><div class='ctx'> #else</div><div class='ctx'> #define brcmu_prpkt(a, b)</div><div class='ctx'> #endif				/* BCMDBG */</div><div class='ctx'> </div><div class='del'>-/* externs */</div><div class='del'>-/* format/print */</div><div class='del'>-#if defined(BCMDBG)</div><div class='del'>-extern int brcmu_format_hex(char *str, const void *bytes, int len);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #endif				/* _BRCMU_UTILS_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/include/chipcommon.h b/drivers/net/wireless/brcm80211/include/chipcommon.h<br/>index fefabc39e646..f96834a7c055 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/include/chipcommon.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/include/chipcommon.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/include/chipcommon.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/include/chipcommon.h</a></div><div class='hunk'>@@ -19,6 +19,8 @@</div><div class='ctx'> </div><div class='ctx'> #include "defs.h"		/* for PAD macro */</div><div class='ctx'> </div><div class='add'>+#define CHIPCREGOFFS(field)	offsetof(struct chipcregs, field)</div><div class='add'>+</div><div class='ctx'> struct chipcregs {</div><div class='ctx'> 	u32 chipid;		/* 0x0 */</div><div class='ctx'> 	u32 capabilities;</div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/include/defs.h b/drivers/net/wireless/brcm80211/include/defs.h<br/>index 1e5f310af1e7..f0d8c04a9c8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/include/defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/include/defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/include/defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/include/defs.h</a></div><div class='hunk'>@@ -62,7 +62,6 @@</div><div class='ctx'> </div><div class='ctx'> #define WL_RADIO_SW_DISABLE		(1&lt;&lt;0)</div><div class='ctx'> #define WL_RADIO_HW_DISABLE		(1&lt;&lt;1)</div><div class='del'>-#define WL_RADIO_MPC_DISABLE		(1&lt;&lt;2)</div><div class='ctx'> /* some countries don't support any channel */</div><div class='ctx'> #define WL_RADIO_COUNTRY_DISABLE	(1&lt;&lt;3)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/brcm80211/include/soc.h b/drivers/net/wireless/brcm80211/include/soc.h<br/>index 4fcb956ad9e0..4e9b7e4827ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/include/soc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/brcm80211/include/soc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/brcm80211/include/soc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/brcm80211/include/soc.h</a></div><div class='hunk'>@@ -77,8 +77,9 @@</div><div class='ctx'> #define	DMEMS_CORE_ID		0x835	/* SDR/DDR1 memory controller core */</div><div class='ctx'> #define	DEF_SHIM_COMP		0x837	/* SHIM component in ubus/6362 */</div><div class='ctx'> #define OOB_ROUTER_CORE_ID	0x367	/* OOB router core ID */</div><div class='del'>-/* Default component, in ai chips it maps all unused address ranges */</div><div class='del'>-#define	DEF_AI_COMP		0xfff</div><div class='add'>+#define	DEF_AI_COMP		0xfff	/* Default component, in ai chips it</div><div class='add'>+					 * maps all unused address ranges</div><div class='add'>+					 */</div><div class='ctx'> </div><div class='ctx'> /* Common core control flags */</div><div class='ctx'> #define	SICF_BIST_EN		0x8000</div><div class='hunk'>@@ -87,4 +88,11 @@</div><div class='ctx'> #define	SICF_FGC		0x0002</div><div class='ctx'> #define	SICF_CLOCK_EN		0x0001</div><div class='ctx'> </div><div class='add'>+/* Common core status flags */</div><div class='add'>+#define	SISF_BIST_DONE		0x8000</div><div class='add'>+#define	SISF_BIST_ERROR		0x4000</div><div class='add'>+#define	SISF_GATED_CLK		0x2000</div><div class='add'>+#define	SISF_DMA64		0x1000</div><div class='add'>+#define	SISF_CORE_BITS		0x0fff</div><div class='add'>+</div><div class='ctx'> #endif				/* _BRCM_SOC_H */</div><div class='head'>diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c<br/>index 5441ad195119..89e9d3a78c3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/hostap/hostap_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/hostap/hostap_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/hostap/hostap_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/hostap/hostap_cs.c</a></div><div class='hunk'>@@ -656,6 +656,9 @@ static const struct pcmcia_device_id hostap_cs_ids[] = {</div><div class='ctx'> 		"Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",</div><div class='ctx'> 		0xe6ec52ce, 0x08649af2, 0x4b74baa0),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID123(</div><div class='add'>+		"Canon", "Wireless LAN CF Card K30225", "Version 01.00",</div><div class='add'>+		0x96ef6fe2, 0x263fcbab, 0xa57adb8c),</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID123(</div><div class='ctx'> 		"D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02",</div><div class='ctx'> 		0x71b18589, 0xb6f1b0ab, 0x4b74baa0),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID123(</div><div class='head'>diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c<br/>index 045a93645a3d..18054d9c6688 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/hostap/hostap_ioctl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/hostap/hostap_ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/hostap/hostap_ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/hostap/hostap_ioctl.c</a></div><div class='hunk'>@@ -3872,8 +3872,8 @@ static void prism2_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 	iface = netdev_priv(dev);</div><div class='ctx'> 	local = iface-&gt;local;</div><div class='ctx'> </div><div class='del'>-	strncpy(info-&gt;driver, "hostap", sizeof(info-&gt;driver) - 1);</div><div class='del'>-	snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version) - 1,</div><div class='add'>+	strlcpy(info-&gt;driver, "hostap", sizeof(info-&gt;driver));</div><div class='add'>+	snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version),</div><div class='ctx'> 		 "%d.%d.%d", (local-&gt;sta_fw_ver &gt;&gt; 16) &amp; 0xff,</div><div class='ctx'> 		 (local-&gt;sta_fw_ver &gt;&gt; 8) &amp; 0xff,</div><div class='ctx'> 		 local-&gt;sta_fw_ver &amp; 0xff);</div><div class='head'>diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c<br/>index 127e9c63beaf..a0e5c21d3657 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ipw2x00/ipw2100.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ipw2x00/ipw2100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ipw2x00/ipw2100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ipw2x00/ipw2100.c</a></div><div class='hunk'>@@ -5981,8 +5981,8 @@ static void ipw_ethtool_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 	struct ipw2100_priv *priv = libipw_priv(dev);</div><div class='ctx'> 	char fw_ver[64], ucode_ver[64];</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='ctx'> </div><div class='ctx'> 	ipw2100_get_fwversion(priv, fw_ver, sizeof(fw_ver));</div><div class='ctx'> 	ipw2100_get_ucodeversion(priv, ucode_ver, sizeof(ucode_ver));</div><div class='hunk'>@@ -5990,7 +5990,8 @@ static void ipw_ethtool_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 	snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version), "%s:%d:%s",</div><div class='ctx'> 		 fw_ver, priv-&gt;eeprom_version, ucode_ver);</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(priv-&gt;pci_dev));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(priv-&gt;pci_dev),</div><div class='add'>+		sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 ipw2100_ethtool_get_link(struct net_device *dev)</div><div class='head'>diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c<br/>index 99a710dfe771..4fcdac63a300 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ipw2x00/ipw2200.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ipw2x00/ipw2200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ipw2x00/ipw2200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ipw2x00/ipw2200.c</a></div><div class='hunk'>@@ -131,6 +131,14 @@ static struct ieee80211_rate ipw2200_rates[] = {</div><div class='ctx'> #define ipw2200_bg_rates	(ipw2200_rates + 0)</div><div class='ctx'> #define ipw2200_num_bg_rates	12</div><div class='ctx'> </div><div class='add'>+/* Ugly macro to convert literal channel numbers into their mhz equivalents</div><div class='add'>+ * There are certianly some conditions that will break this (like feeding it '30')</div><div class='add'>+ * but they shouldn't arise since nothing talks on channel 30. */</div><div class='add'>+#define ieee80211chan2mhz(x) \</div><div class='add'>+	(((x) &lt;= 14) ? \</div><div class='add'>+	(((x) == 14) ? 2484 : ((x) * 5) + 2407) : \</div><div class='add'>+	((x) + 1000) * 5)</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IPW2200_QOS</div><div class='ctx'> static int qos_enable = 0;</div><div class='ctx'> static int qos_burst_enable = 0;</div><div class='hunk'>@@ -7840,7 +7848,7 @@ static void ipw_handle_data_packet_monitor(struct ipw_priv *priv,</div><div class='ctx'> 	 * more efficiently than we can parse it. ORDER MATTERS HERE */</div><div class='ctx'> 	struct ipw_rt_hdr *ipw_rt;</div><div class='ctx'> </div><div class='del'>-	short len = le16_to_cpu(pkt-&gt;u.frame.length);</div><div class='add'>+	unsigned short len = le16_to_cpu(pkt-&gt;u.frame.length);</div><div class='ctx'> </div><div class='ctx'> 	/* We received data from the HW, so stop the watchdog */</div><div class='ctx'> 	dev-&gt;trans_start = jiffies;</div><div class='hunk'>@@ -8015,7 +8023,7 @@ static void ipw_handle_promiscuous_rx(struct ipw_priv *priv,</div><div class='ctx'> 	s8 signal = frame-&gt;rssi_dbm - IPW_RSSI_TO_DBM;</div><div class='ctx'> 	s8 noise = (s8) le16_to_cpu(frame-&gt;noise);</div><div class='ctx'> 	u8 rate = frame-&gt;rate;</div><div class='del'>-	short len = le16_to_cpu(pkt-&gt;u.frame.length);</div><div class='add'>+	unsigned short len = le16_to_cpu(pkt-&gt;u.frame.length);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int hdr_only = 0;</div><div class='ctx'> 	u16 filter = priv-&gt;prom_priv-&gt;filter;</div><div class='hunk'>@@ -10540,8 +10548,8 @@ static void ipw_ethtool_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 	char date[32];</div><div class='ctx'> 	u32 len;</div><div class='ctx'> </div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='ctx'> </div><div class='ctx'> 	len = sizeof(vers);</div><div class='ctx'> 	ipw_get_ordinal(p, IPW_ORD_STAT_FW_VERSION, vers, &amp;len);</div><div class='hunk'>@@ -10550,7 +10558,8 @@ static void ipw_ethtool_get_drvinfo(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version), "%s (%s)",</div><div class='ctx'> 		 vers, date);</div><div class='del'>-	strcpy(info-&gt;bus_info, pci_name(p-&gt;pci_dev));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(p-&gt;pci_dev),</div><div class='add'>+		sizeof(info-&gt;bus_info));</div><div class='ctx'> 	info-&gt;eedump_len = IPW_EEPROM_IMAGE_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/ipw2x00/libipw.h b/drivers/net/wireless/ipw2x00/libipw.h<br/>index 70f5586d96bd..8874588fb929 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ipw2x00/libipw.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ipw2x00/libipw.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ipw2x00/libipw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ipw2x00/libipw.h</a></div><div class='hunk'>@@ -66,16 +66,8 @@ extern u32 libipw_debug_level;</div><div class='ctx'> do { if (libipw_debug_level &amp; (level)) \</div><div class='ctx'>   printk(KERN_DEBUG "libipw: %c %s " fmt, \</div><div class='ctx'>          in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)</div><div class='del'>-static inline bool libipw_ratelimit_debug(u32 level)</div><div class='del'>-{</div><div class='del'>-	return (libipw_debug_level &amp; level) &amp;&amp; net_ratelimit();</div><div class='del'>-}</div><div class='ctx'> #else</div><div class='ctx'> #define LIBIPW_DEBUG(level, fmt, args...) do {} while (0)</div><div class='del'>-static inline bool libipw_ratelimit_debug(u32 level)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='ctx'> #endif				/* CONFIG_LIBIPW_DEBUG */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -813,9 +805,6 @@ struct libipw_device {</div><div class='ctx'> 	/* WEP and other encryption related settings at the device level */</div><div class='ctx'> 	int open_wep;		/* Set to 1 to allow unencrypted frames */</div><div class='ctx'> </div><div class='del'>-	int reset_on_keychange;	/* Set to 1 if the HW needs to be reset on</div><div class='del'>-				 * WEP key changes */</div><div class='del'>-</div><div class='ctx'> 	/* If the host performs {en,de}cryption, then set to 1 */</div><div class='ctx'> 	int host_encrypt;</div><div class='ctx'> 	int host_encrypt_msdu;</div><div class='hunk'>@@ -868,7 +857,6 @@ struct libipw_device {</div><div class='ctx'> 			      struct libipw_security * sec);</div><div class='ctx'> 	netdev_tx_t (*hard_start_xmit) (struct libipw_txb * txb,</div><div class='ctx'> 					struct net_device * dev, int pri);</div><div class='del'>-	int (*reset_port) (struct net_device * dev);</div><div class='ctx'> 	int (*is_queue_full) (struct net_device * dev, int pri);</div><div class='ctx'> </div><div class='ctx'> 	int (*handle_management) (struct net_device * dev,</div><div class='head'>diff --git a/drivers/net/wireless/ipw2x00/libipw_wx.c b/drivers/net/wireless/ipw2x00/libipw_wx.c<br/>index 6623e5052254..1571505b1a38 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ipw2x00/libipw_wx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ipw2x00/libipw_wx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ipw2x00/libipw_wx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ipw2x00/libipw_wx.c</a></div><div class='hunk'>@@ -474,17 +474,6 @@ int libipw_wx_set_encode(struct libipw_device *ieee,</div><div class='ctx'> 	if (ieee-&gt;set_security)</div><div class='ctx'> 		ieee-&gt;set_security(dev, &amp;sec);</div><div class='ctx'> </div><div class='del'>-	/* Do not reset port if card is in Managed mode since resetting will</div><div class='del'>-	 * generate new IEEE 802.11 authentication which may end up in looping</div><div class='del'>-	 * with IEEE 802.1X.  If your hardware requires a reset after WEP</div><div class='del'>-	 * configuration (for example... Prism2), implement the reset_port in</div><div class='del'>-	 * the callbacks structures used to initialize the 802.11 stack. */</div><div class='del'>-	if (ieee-&gt;reset_on_keychange &amp;&amp;</div><div class='del'>-	    ieee-&gt;iw_mode != IW_MODE_INFRA &amp;&amp;</div><div class='del'>-	    ieee-&gt;reset_port &amp;&amp; ieee-&gt;reset_port(dev)) {</div><div class='del'>-		printk(KERN_DEBUG "%s: reset_port failed\n", dev-&gt;name);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -688,20 +677,6 @@ int libipw_wx_set_encodeext(struct libipw_device *ieee,</div><div class='ctx'> 	if (ieee-&gt;set_security)</div><div class='ctx'> 		ieee-&gt;set_security(ieee-&gt;dev, &amp;sec);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Do not reset port if card is in Managed mode since resetting will</div><div class='del'>-	 * generate new IEEE 802.11 authentication which may end up in looping</div><div class='del'>-	 * with IEEE 802.1X. If your hardware requires a reset after WEP</div><div class='del'>-	 * configuration (for example... Prism2), implement the reset_port in</div><div class='del'>-	 * the callbacks structures used to initialize the 802.11 stack.</div><div class='del'>-	 */</div><div class='del'>-	if (ieee-&gt;reset_on_keychange &amp;&amp;</div><div class='del'>-	    ieee-&gt;iw_mode != IW_MODE_INFRA &amp;&amp;</div><div class='del'>-	    ieee-&gt;reset_port &amp;&amp; ieee-&gt;reset_port(dev)) {</div><div class='del'>-		LIBIPW_DEBUG_WX("%s: reset_port failed\n", dev-&gt;name);</div><div class='del'>-		return -EINVAL;</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/wireless/iwlegacy/3945-debug.c b/drivers/net/wireless/iwlegacy/3945-debug.c<br/>new file mode 100644<br/>index 000000000000..5e1a19fd354d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/3945-debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/3945-debug.c</a></div><div class='hunk'>@@ -0,0 +1,505 @@</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * GPL LICENSE SUMMARY</div><div class='add'>+ *</div><div class='add'>+ * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.</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 version 2 of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,</div><div class='add'>+ * USA</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution</div><div class='add'>+ * in the file called LICENSE.GPL.</div><div class='add'>+ *</div><div class='add'>+ * Contact Information:</div><div class='add'>+ *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='add'>+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "3945.h"</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il3945_stats_flag(struct il_priv *il, char *buf, int bufsz)</div><div class='add'>+{</div><div class='add'>+	int p = 0;</div><div class='add'>+</div><div class='add'>+	p += scnprintf(buf + p, bufsz - p, "Statistics Flag(0x%X):\n",</div><div class='add'>+		       le32_to_cpu(il-&gt;_3945.stats.flag));</div><div class='add'>+	if (le32_to_cpu(il-&gt;_3945.stats.flag) &amp; UCODE_STATS_CLEAR_MSK)</div><div class='add'>+		p += scnprintf(buf + p, bufsz - p,</div><div class='add'>+			       "\tStatistics have been cleared\n");</div><div class='add'>+	p += scnprintf(buf + p, bufsz - p, "\tOperational Frequency: %s\n",</div><div class='add'>+		       (le32_to_cpu(il-&gt;_3945.stats.flag) &amp;</div><div class='add'>+			UCODE_STATS_FREQUENCY_MSK) ? "2.4 GHz" : "5.2 GHz");</div><div class='add'>+	p += scnprintf(buf + p, bufsz - p, "\tTGj Narrow Band: %s\n",</div><div class='add'>+		       (le32_to_cpu(il-&gt;_3945.stats.flag) &amp;</div><div class='add'>+			UCODE_STATS_NARROW_BAND_MSK) ? "enabled" : "disabled");</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t</div><div class='add'>+il3945_ucode_rx_stats_read(struct file *file, char __user *user_buf,</div><div class='add'>+			   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	int pos = 0;</div><div class='add'>+	char *buf;</div><div class='add'>+	int bufsz =</div><div class='add'>+	    sizeof(struct iwl39_stats_rx_phy) * 40 +</div><div class='add'>+	    sizeof(struct iwl39_stats_rx_non_phy) * 40 + 400;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	struct iwl39_stats_rx_phy *ofdm, *accum_ofdm, *delta_ofdm, *max_ofdm;</div><div class='add'>+	struct iwl39_stats_rx_phy *cck, *accum_cck, *delta_cck, *max_cck;</div><div class='add'>+	struct iwl39_stats_rx_non_phy *general, *accum_general;</div><div class='add'>+	struct iwl39_stats_rx_non_phy *delta_general, *max_general;</div><div class='add'>+</div><div class='add'>+	if (!il_is_alive(il))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	if (!buf) {</div><div class='add'>+		IL_ERR("Can not allocate Buffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The statistic information display here is based on</div><div class='add'>+	 * the last stats notification from uCode</div><div class='add'>+	 * might not reflect the current uCode activity</div><div class='add'>+	 */</div><div class='add'>+	ofdm = &amp;il-&gt;_3945.stats.rx.ofdm;</div><div class='add'>+	cck = &amp;il-&gt;_3945.stats.rx.cck;</div><div class='add'>+	general = &amp;il-&gt;_3945.stats.rx.general;</div><div class='add'>+	accum_ofdm = &amp;il-&gt;_3945.accum_stats.rx.ofdm;</div><div class='add'>+	accum_cck = &amp;il-&gt;_3945.accum_stats.rx.cck;</div><div class='add'>+	accum_general = &amp;il-&gt;_3945.accum_stats.rx.general;</div><div class='add'>+	delta_ofdm = &amp;il-&gt;_3945.delta_stats.rx.ofdm;</div><div class='add'>+	delta_cck = &amp;il-&gt;_3945.delta_stats.rx.cck;</div><div class='add'>+	delta_general = &amp;il-&gt;_3945.delta_stats.rx.general;</div><div class='add'>+	max_ofdm = &amp;il-&gt;_3945.max_delta.rx.ofdm;</div><div class='add'>+	max_cck = &amp;il-&gt;_3945.max_delta.rx.cck;</div><div class='add'>+	max_general = &amp;il-&gt;_3945.max_delta.rx.general;</div><div class='add'>+</div><div class='add'>+	pos += il3945_stats_flag(il, buf, bufsz);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "%-32s     current"</div><div class='add'>+		      "acumulative       delta         max\n",</div><div class='add'>+		      "Statistics_Rx - OFDM:");</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "ina_cnt:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;ina_cnt), accum_ofdm-&gt;ina_cnt,</div><div class='add'>+		      delta_ofdm-&gt;ina_cnt, max_ofdm-&gt;ina_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "fina_cnt:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;fina_cnt), accum_ofdm-&gt;fina_cnt,</div><div class='add'>+		      delta_ofdm-&gt;fina_cnt, max_ofdm-&gt;fina_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "plcp_err:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;plcp_err), accum_ofdm-&gt;plcp_err,</div><div class='add'>+		      delta_ofdm-&gt;plcp_err, max_ofdm-&gt;plcp_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "crc32_err:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;crc32_err), accum_ofdm-&gt;crc32_err,</div><div class='add'>+		      delta_ofdm-&gt;crc32_err, max_ofdm-&gt;crc32_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "overrun_err:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;overrun_err), accum_ofdm-&gt;overrun_err,</div><div class='add'>+		      delta_ofdm-&gt;overrun_err, max_ofdm-&gt;overrun_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "early_overrun_err:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;early_overrun_err),</div><div class='add'>+		      accum_ofdm-&gt;early_overrun_err,</div><div class='add'>+		      delta_ofdm-&gt;early_overrun_err,</div><div class='add'>+		      max_ofdm-&gt;early_overrun_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "crc32_good:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;crc32_good), accum_ofdm-&gt;crc32_good,</div><div class='add'>+		      delta_ofdm-&gt;crc32_good, max_ofdm-&gt;crc32_good);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "false_alarm_cnt:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;false_alarm_cnt),</div><div class='add'>+		      accum_ofdm-&gt;false_alarm_cnt, delta_ofdm-&gt;false_alarm_cnt,</div><div class='add'>+		      max_ofdm-&gt;false_alarm_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "fina_sync_err_cnt:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;fina_sync_err_cnt),</div><div class='add'>+		      accum_ofdm-&gt;fina_sync_err_cnt,</div><div class='add'>+		      delta_ofdm-&gt;fina_sync_err_cnt,</div><div class='add'>+		      max_ofdm-&gt;fina_sync_err_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "sfd_timeout:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;sfd_timeout), accum_ofdm-&gt;sfd_timeout,</div><div class='add'>+		      delta_ofdm-&gt;sfd_timeout, max_ofdm-&gt;sfd_timeout);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "fina_timeout:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;fina_timeout), accum_ofdm-&gt;fina_timeout,</div><div class='add'>+		      delta_ofdm-&gt;fina_timeout, max_ofdm-&gt;fina_timeout);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "unresponded_rts:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;unresponded_rts),</div><div class='add'>+		      accum_ofdm-&gt;unresponded_rts, delta_ofdm-&gt;unresponded_rts,</div><div class='add'>+		      max_ofdm-&gt;unresponded_rts);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='add'>+		      "rxe_frame_lmt_ovrun:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;rxe_frame_limit_overrun),</div><div class='add'>+		      accum_ofdm-&gt;rxe_frame_limit_overrun,</div><div class='add'>+		      delta_ofdm-&gt;rxe_frame_limit_overrun,</div><div class='add'>+		      max_ofdm-&gt;rxe_frame_limit_overrun);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "sent_ack_cnt:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;sent_ack_cnt), accum_ofdm-&gt;sent_ack_cnt,</div><div class='add'>+		      delta_ofdm-&gt;sent_ack_cnt, max_ofdm-&gt;sent_ack_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "sent_cts_cnt:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;sent_cts_cnt), accum_ofdm-&gt;sent_cts_cnt,</div><div class='add'>+		      delta_ofdm-&gt;sent_cts_cnt, max_ofdm-&gt;sent_cts_cnt);</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "%-32s     current"</div><div class='add'>+		      "acumulative       delta         max\n",</div><div class='add'>+		      "Statistics_Rx - CCK:");</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "ina_cnt:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;ina_cnt), accum_cck-&gt;ina_cnt,</div><div class='add'>+		      delta_cck-&gt;ina_cnt, max_cck-&gt;ina_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "fina_cnt:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;fina_cnt), accum_cck-&gt;fina_cnt,</div><div class='add'>+		      delta_cck-&gt;fina_cnt, max_cck-&gt;fina_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "plcp_err:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;plcp_err), accum_cck-&gt;plcp_err,</div><div class='add'>+		      delta_cck-&gt;plcp_err, max_cck-&gt;plcp_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "crc32_err:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;crc32_err), accum_cck-&gt;crc32_err,</div><div class='add'>+		      delta_cck-&gt;crc32_err, max_cck-&gt;crc32_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "overrun_err:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;overrun_err), accum_cck-&gt;overrun_err,</div><div class='add'>+		      delta_cck-&gt;overrun_err, max_cck-&gt;overrun_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "early_overrun_err:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;early_overrun_err),</div><div class='add'>+		      accum_cck-&gt;early_overrun_err,</div><div class='add'>+		      delta_cck-&gt;early_overrun_err, max_cck-&gt;early_overrun_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "crc32_good:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;crc32_good), accum_cck-&gt;crc32_good,</div><div class='add'>+		      delta_cck-&gt;crc32_good, max_cck-&gt;crc32_good);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "false_alarm_cnt:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;false_alarm_cnt),</div><div class='add'>+		      accum_cck-&gt;false_alarm_cnt, delta_cck-&gt;false_alarm_cnt,</div><div class='add'>+		      max_cck-&gt;false_alarm_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "fina_sync_err_cnt:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;fina_sync_err_cnt),</div><div class='add'>+		      accum_cck-&gt;fina_sync_err_cnt,</div><div class='add'>+		      delta_cck-&gt;fina_sync_err_cnt, max_cck-&gt;fina_sync_err_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "sfd_timeout:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;sfd_timeout), accum_cck-&gt;sfd_timeout,</div><div class='add'>+		      delta_cck-&gt;sfd_timeout, max_cck-&gt;sfd_timeout);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "fina_timeout:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;fina_timeout), accum_cck-&gt;fina_timeout,</div><div class='add'>+		      delta_cck-&gt;fina_timeout, max_cck-&gt;fina_timeout);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "unresponded_rts:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;unresponded_rts),</div><div class='add'>+		      accum_cck-&gt;unresponded_rts, delta_cck-&gt;unresponded_rts,</div><div class='add'>+		      max_cck-&gt;unresponded_rts);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='add'>+		      "rxe_frame_lmt_ovrun:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;rxe_frame_limit_overrun),</div><div class='add'>+		      accum_cck-&gt;rxe_frame_limit_overrun,</div><div class='add'>+		      delta_cck-&gt;rxe_frame_limit_overrun,</div><div class='add'>+		      max_cck-&gt;rxe_frame_limit_overrun);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "sent_ack_cnt:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;sent_ack_cnt), accum_cck-&gt;sent_ack_cnt,</div><div class='add'>+		      delta_cck-&gt;sent_ack_cnt, max_cck-&gt;sent_ack_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "sent_cts_cnt:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;sent_cts_cnt), accum_cck-&gt;sent_cts_cnt,</div><div class='add'>+		      delta_cck-&gt;sent_cts_cnt, max_cck-&gt;sent_cts_cnt);</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "%-32s     current"</div><div class='add'>+		      "acumulative       delta         max\n",</div><div class='add'>+		      "Statistics_Rx - GENERAL:");</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "bogus_cts:",</div><div class='add'>+		      le32_to_cpu(general-&gt;bogus_cts), accum_general-&gt;bogus_cts,</div><div class='add'>+		      delta_general-&gt;bogus_cts, max_general-&gt;bogus_cts);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "bogus_ack:",</div><div class='add'>+		      le32_to_cpu(general-&gt;bogus_ack), accum_general-&gt;bogus_ack,</div><div class='add'>+		      delta_general-&gt;bogus_ack, max_general-&gt;bogus_ack);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "non_bssid_frames:",</div><div class='add'>+		      le32_to_cpu(general-&gt;non_bssid_frames),</div><div class='add'>+		      accum_general-&gt;non_bssid_frames,</div><div class='add'>+		      delta_general-&gt;non_bssid_frames,</div><div class='add'>+		      max_general-&gt;non_bssid_frames);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "filtered_frames:",</div><div class='add'>+		      le32_to_cpu(general-&gt;filtered_frames),</div><div class='add'>+		      accum_general-&gt;filtered_frames,</div><div class='add'>+		      delta_general-&gt;filtered_frames,</div><div class='add'>+		      max_general-&gt;filtered_frames);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='add'>+		      "non_channel_beacons:",</div><div class='add'>+		      le32_to_cpu(general-&gt;non_channel_beacons),</div><div class='add'>+		      accum_general-&gt;non_channel_beacons,</div><div class='add'>+		      delta_general-&gt;non_channel_beacons,</div><div class='add'>+		      max_general-&gt;non_channel_beacons);</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t</div><div class='add'>+il3945_ucode_tx_stats_read(struct file *file, char __user *user_buf,</div><div class='add'>+			   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	int pos = 0;</div><div class='add'>+	char *buf;</div><div class='add'>+	int bufsz = (sizeof(struct iwl39_stats_tx) * 48) + 250;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	struct iwl39_stats_tx *tx, *accum_tx, *delta_tx, *max_tx;</div><div class='add'>+</div><div class='add'>+	if (!il_is_alive(il))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	if (!buf) {</div><div class='add'>+		IL_ERR("Can not allocate Buffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The statistic information display here is based on</div><div class='add'>+	 * the last stats notification from uCode</div><div class='add'>+	 * might not reflect the current uCode activity</div><div class='add'>+	 */</div><div class='add'>+	tx = &amp;il-&gt;_3945.stats.tx;</div><div class='add'>+	accum_tx = &amp;il-&gt;_3945.accum_stats.tx;</div><div class='add'>+	delta_tx = &amp;il-&gt;_3945.delta_stats.tx;</div><div class='add'>+	max_tx = &amp;il-&gt;_3945.max_delta.tx;</div><div class='add'>+	pos += il3945_stats_flag(il, buf, bufsz);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "%-32s     current"</div><div class='add'>+		      "acumulative       delta         max\n",</div><div class='add'>+		      "Statistics_Tx:");</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "preamble:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;preamble_cnt), accum_tx-&gt;preamble_cnt,</div><div class='add'>+		      delta_tx-&gt;preamble_cnt, max_tx-&gt;preamble_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "rx_detected_cnt:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;rx_detected_cnt),</div><div class='add'>+		      accum_tx-&gt;rx_detected_cnt, delta_tx-&gt;rx_detected_cnt,</div><div class='add'>+		      max_tx-&gt;rx_detected_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "bt_prio_defer_cnt:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;bt_prio_defer_cnt),</div><div class='add'>+		      accum_tx-&gt;bt_prio_defer_cnt, delta_tx-&gt;bt_prio_defer_cnt,</div><div class='add'>+		      max_tx-&gt;bt_prio_defer_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "bt_prio_kill_cnt:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;bt_prio_kill_cnt),</div><div class='add'>+		      accum_tx-&gt;bt_prio_kill_cnt, delta_tx-&gt;bt_prio_kill_cnt,</div><div class='add'>+		      max_tx-&gt;bt_prio_kill_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "few_bytes_cnt:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;few_bytes_cnt), accum_tx-&gt;few_bytes_cnt,</div><div class='add'>+		      delta_tx-&gt;few_bytes_cnt, max_tx-&gt;few_bytes_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "cts_timeout:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;cts_timeout), accum_tx-&gt;cts_timeout,</div><div class='add'>+		      delta_tx-&gt;cts_timeout, max_tx-&gt;cts_timeout);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "ack_timeout:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;ack_timeout), accum_tx-&gt;ack_timeout,</div><div class='add'>+		      delta_tx-&gt;ack_timeout, max_tx-&gt;ack_timeout);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "expected_ack_cnt:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;expected_ack_cnt),</div><div class='add'>+		      accum_tx-&gt;expected_ack_cnt, delta_tx-&gt;expected_ack_cnt,</div><div class='add'>+		      max_tx-&gt;expected_ack_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "actual_ack_cnt:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;actual_ack_cnt), accum_tx-&gt;actual_ack_cnt,</div><div class='add'>+		      delta_tx-&gt;actual_ack_cnt, max_tx-&gt;actual_ack_cnt);</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t</div><div class='add'>+il3945_ucode_general_stats_read(struct file *file, char __user *user_buf,</div><div class='add'>+				size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	int pos = 0;</div><div class='add'>+	char *buf;</div><div class='add'>+	int bufsz = sizeof(struct iwl39_stats_general) * 10 + 300;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	struct iwl39_stats_general *general, *accum_general;</div><div class='add'>+	struct iwl39_stats_general *delta_general, *max_general;</div><div class='add'>+	struct stats_dbg *dbg, *accum_dbg, *delta_dbg, *max_dbg;</div><div class='add'>+	struct iwl39_stats_div *div, *accum_div, *delta_div, *max_div;</div><div class='add'>+</div><div class='add'>+	if (!il_is_alive(il))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	if (!buf) {</div><div class='add'>+		IL_ERR("Can not allocate Buffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The statistic information display here is based on</div><div class='add'>+	 * the last stats notification from uCode</div><div class='add'>+	 * might not reflect the current uCode activity</div><div class='add'>+	 */</div><div class='add'>+	general = &amp;il-&gt;_3945.stats.general;</div><div class='add'>+	dbg = &amp;il-&gt;_3945.stats.general.dbg;</div><div class='add'>+	div = &amp;il-&gt;_3945.stats.general.div;</div><div class='add'>+	accum_general = &amp;il-&gt;_3945.accum_stats.general;</div><div class='add'>+	delta_general = &amp;il-&gt;_3945.delta_stats.general;</div><div class='add'>+	max_general = &amp;il-&gt;_3945.max_delta.general;</div><div class='add'>+	accum_dbg = &amp;il-&gt;_3945.accum_stats.general.dbg;</div><div class='add'>+	delta_dbg = &amp;il-&gt;_3945.delta_stats.general.dbg;</div><div class='add'>+	max_dbg = &amp;il-&gt;_3945.max_delta.general.dbg;</div><div class='add'>+	accum_div = &amp;il-&gt;_3945.accum_stats.general.div;</div><div class='add'>+	delta_div = &amp;il-&gt;_3945.delta_stats.general.div;</div><div class='add'>+	max_div = &amp;il-&gt;_3945.max_delta.general.div;</div><div class='add'>+	pos += il3945_stats_flag(il, buf, bufsz);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "%-32s     current"</div><div class='add'>+		      "acumulative       delta         max\n",</div><div class='add'>+		      "Statistics_General:");</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "burst_check:",</div><div class='add'>+		      le32_to_cpu(dbg-&gt;burst_check), accum_dbg-&gt;burst_check,</div><div class='add'>+		      delta_dbg-&gt;burst_check, max_dbg-&gt;burst_check);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "burst_count:",</div><div class='add'>+		      le32_to_cpu(dbg-&gt;burst_count), accum_dbg-&gt;burst_count,</div><div class='add'>+		      delta_dbg-&gt;burst_count, max_dbg-&gt;burst_count);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "sleep_time:",</div><div class='add'>+		      le32_to_cpu(general-&gt;sleep_time),</div><div class='add'>+		      accum_general-&gt;sleep_time, delta_general-&gt;sleep_time,</div><div class='add'>+		      max_general-&gt;sleep_time);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "slots_out:",</div><div class='add'>+		      le32_to_cpu(general-&gt;slots_out), accum_general-&gt;slots_out,</div><div class='add'>+		      delta_general-&gt;slots_out, max_general-&gt;slots_out);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "slots_idle:",</div><div class='add'>+		      le32_to_cpu(general-&gt;slots_idle),</div><div class='add'>+		      accum_general-&gt;slots_idle, delta_general-&gt;slots_idle,</div><div class='add'>+		      max_general-&gt;slots_idle);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "ttl_timestamp:\t\t\t%u\n",</div><div class='add'>+		      le32_to_cpu(general-&gt;ttl_timestamp));</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "tx_on_a:",</div><div class='add'>+		      le32_to_cpu(div-&gt;tx_on_a), accum_div-&gt;tx_on_a,</div><div class='add'>+		      delta_div-&gt;tx_on_a, max_div-&gt;tx_on_a);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "tx_on_b:",</div><div class='add'>+		      le32_to_cpu(div-&gt;tx_on_b), accum_div-&gt;tx_on_b,</div><div class='add'>+		      delta_div-&gt;tx_on_b, max_div-&gt;tx_on_b);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "exec_time:",</div><div class='add'>+		      le32_to_cpu(div-&gt;exec_time), accum_div-&gt;exec_time,</div><div class='add'>+		      delta_div-&gt;exec_time, max_div-&gt;exec_time);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "  %-30s %10u  %10u  %10u  %10u\n", "probe_time:",</div><div class='add'>+		      le32_to_cpu(div-&gt;probe_time), accum_div-&gt;probe_time,</div><div class='add'>+		      delta_div-&gt;probe_time, max_div-&gt;probe_time);</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c<br/>new file mode 100644<br/>index 000000000000..54b2d391e91a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/3945-mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/3945-mac.c</a></div><div class='hunk'>@@ -0,0 +1,3976 @@</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Portions of this file are derived from the ipw3945 project, as well</div><div class='add'>+ * as portions of the ieee80211 subsystem header files.</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 version 2 of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution in the</div><div class='add'>+ * file called LICENSE.</div><div class='add'>+ *</div><div class='add'>+ * Contact Information:</div><div class='add'>+ *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='add'>+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/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/pci.h&gt;</div><div class='add'>+#include &lt;linux/pci-aspm.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/ieee80211_radiotap.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/div64.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRV_NAME	"iwl3945"</div><div class='add'>+</div><div class='add'>+#include "commands.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "3945.h"</div><div class='add'>+#include "iwl-spectrum.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * module name, copyright, version, etc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define DRV_DESCRIPTION	\</div><div class='add'>+"Intel(R) PRO/Wireless 3945ABG/BG Network Connection driver for Linux"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+#define VD "d"</div><div class='add'>+#else</div><div class='add'>+#define VD</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * add "s" to indicate spectrum measurement included.</div><div class='add'>+ * we add it here to be consistent with previous releases in which</div><div class='add'>+ * this was configurable.</div><div class='add'>+ */</div><div class='add'>+#define DRV_VERSION  IWLWIFI_VERSION VD "s"</div><div class='add'>+#define DRV_COPYRIGHT	"Copyright(c) 2003-2011 Intel Corporation"</div><div class='add'>+#define DRV_AUTHOR     "&lt;ilw@linux.intel.com&gt;"</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION(DRV_DESCRIPTION);</div><div class='add'>+MODULE_VERSION(DRV_VERSION);</div><div class='add'>+MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+ /* module parameters */</div><div class='add'>+struct il_mod_params il3945_mod_params = {</div><div class='add'>+	.sw_crypto = 1,</div><div class='add'>+	.restart_fw = 1,</div><div class='add'>+	.disable_hw_scan = 1,</div><div class='add'>+	/* the rest are 0 by default */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_get_antenna_flags - Get antenna flags for RXON command</div><div class='add'>+ * @il: eeprom and antenna fields are used to determine antenna flags</div><div class='add'>+ *</div><div class='add'>+ * il-&gt;eeprom39  is used to determine if antenna AUX/MAIN are reversed</div><div class='add'>+ * il3945_mod_params.antenna specifies the antenna diversity mode:</div><div class='add'>+ *</div><div class='add'>+ * IL_ANTENNA_DIVERSITY - NIC selects best antenna by itself</div><div class='add'>+ * IL_ANTENNA_MAIN      - Force MAIN antenna</div><div class='add'>+ * IL_ANTENNA_AUX       - Force AUX antenna</div><div class='add'>+ */</div><div class='add'>+__le32</div><div class='add'>+il3945_get_antenna_flags(const struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il-&gt;eeprom;</div><div class='add'>+</div><div class='add'>+	switch (il3945_mod_params.antenna) {</div><div class='add'>+	case IL_ANTENNA_DIVERSITY:</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case IL_ANTENNA_MAIN:</div><div class='add'>+		if (eeprom-&gt;antenna_switch_type)</div><div class='add'>+			return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_B_MSK;</div><div class='add'>+		return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_A_MSK;</div><div class='add'>+</div><div class='add'>+	case IL_ANTENNA_AUX:</div><div class='add'>+		if (eeprom-&gt;antenna_switch_type)</div><div class='add'>+			return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_A_MSK;</div><div class='add'>+		return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_B_MSK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* bad antenna selector value */</div><div class='add'>+	IL_ERR("Bad antenna selector value (0x%x)\n",</div><div class='add'>+	       il3945_mod_params.antenna);</div><div class='add'>+</div><div class='add'>+	return 0;		/* "diversity" is default if error */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il3945_set_ccmp_dynamic_key_info(struct il_priv *il,</div><div class='add'>+				 struct ieee80211_key_conf *keyconf, u8 sta_id)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	__le16 key_flags = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	key_flags |= (STA_KEY_FLG_CCMP | STA_KEY_FLG_MAP_KEY_MSK);</div><div class='add'>+	key_flags |= cpu_to_le16(keyconf-&gt;keyidx &lt;&lt; STA_KEY_FLG_KEYID_POS);</div><div class='add'>+</div><div class='add'>+	if (sta_id == il-&gt;ctx.bcast_sta_id)</div><div class='add'>+		key_flags |= STA_KEY_MULTICAST_MSK;</div><div class='add'>+</div><div class='add'>+	keyconf-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV;</div><div class='add'>+	keyconf-&gt;hw_key_idx = keyconf-&gt;keyidx;</div><div class='add'>+	key_flags &amp;= ~STA_KEY_FLG_INVALID;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	il-&gt;stations[sta_id].keyinfo.cipher = keyconf-&gt;cipher;</div><div class='add'>+	il-&gt;stations[sta_id].keyinfo.keylen = keyconf-&gt;keylen;</div><div class='add'>+	memcpy(il-&gt;stations[sta_id].keyinfo.key, keyconf-&gt;key, keyconf-&gt;keylen);</div><div class='add'>+</div><div class='add'>+	memcpy(il-&gt;stations[sta_id].sta.key.key, keyconf-&gt;key, keyconf-&gt;keylen);</div><div class='add'>+</div><div class='add'>+	if ((il-&gt;stations[sta_id].sta.key.</div><div class='add'>+	     key_flags &amp; STA_KEY_FLG_ENCRYPT_MSK) == STA_KEY_FLG_NO_ENC)</div><div class='add'>+		il-&gt;stations[sta_id].sta.key.key_offset =</div><div class='add'>+		    il_get_free_ucode_key_idx(il);</div><div class='add'>+	/* else, we are overriding an existing key =&gt; no need to allocated room</div><div class='add'>+	 * in uCode. */</div><div class='add'>+</div><div class='add'>+	WARN(il-&gt;stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,</div><div class='add'>+	     "no space for a new key");</div><div class='add'>+</div><div class='add'>+	il-&gt;stations[sta_id].sta.key.key_flags = key_flags;</div><div class='add'>+	il-&gt;stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;</div><div class='add'>+	il-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='add'>+</div><div class='add'>+	D_INFO("hwcrypto: modify ucode station key info\n");</div><div class='add'>+</div><div class='add'>+	ret = il_send_add_sta(il, &amp;il-&gt;stations[sta_id].sta, CMD_ASYNC);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_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</div><div class='add'>+il3945_set_tkip_dynamic_key_info(struct il_priv *il,</div><div class='add'>+				 struct ieee80211_key_conf *keyconf, u8 sta_id)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il3945_set_wep_dynamic_key_info(struct il_priv *il,</div><div class='add'>+				struct ieee80211_key_conf *keyconf, u8 sta_id)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il3945_clear_sta_key_info(struct il_priv *il, u8 sta_id)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct il_addsta_cmd sta_cmd;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	memset(&amp;il-&gt;stations[sta_id].keyinfo, 0, sizeof(struct il_hw_key));</div><div class='add'>+	memset(&amp;il-&gt;stations[sta_id].sta.key, 0, sizeof(struct il4965_keyinfo));</div><div class='add'>+	il-&gt;stations[sta_id].sta.key.key_flags = STA_KEY_FLG_NO_ENC;</div><div class='add'>+	il-&gt;stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;</div><div class='add'>+	il-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='add'>+	memcpy(&amp;sta_cmd, &amp;il-&gt;stations[sta_id].sta,</div><div class='add'>+	       sizeof(struct il_addsta_cmd));</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	D_INFO("hwcrypto: clear ucode station key info\n");</div><div class='add'>+	return il_send_add_sta(il, &amp;sta_cmd, CMD_SYNC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il3945_set_dynamic_key(struct il_priv *il, struct ieee80211_key_conf *keyconf,</div><div class='add'>+		       u8 sta_id)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	keyconf-&gt;hw_key_idx = HW_KEY_DYNAMIC;</div><div class='add'>+</div><div class='add'>+	switch (keyconf-&gt;cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		ret = il3945_set_ccmp_dynamic_key_info(il, keyconf, sta_id);</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		ret = il3945_set_tkip_dynamic_key_info(il, keyconf, sta_id);</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP40:</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP104:</div><div class='add'>+		ret = il3945_set_wep_dynamic_key_info(il, keyconf, sta_id);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		IL_ERR("Unknown alg: %s alg=%x\n", __func__, keyconf-&gt;cipher);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_WEP("Set dynamic key: alg=%x len=%d idx=%d sta=%d ret=%d\n",</div><div class='add'>+	      keyconf-&gt;cipher, keyconf-&gt;keylen, keyconf-&gt;keyidx, sta_id, 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</div><div class='add'>+il3945_remove_static_key(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int ret = -EOPNOTSUPP;</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'>+il3945_set_static_key(struct il_priv *il, struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	if (key-&gt;cipher == WLAN_CIPHER_SUITE_WEP40 ||</div><div class='add'>+	    key-&gt;cipher == WLAN_CIPHER_SUITE_WEP104)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	IL_ERR("Static key invalid: cipher %x\n", key-&gt;cipher);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_clear_free_frames(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct list_head *element;</div><div class='add'>+</div><div class='add'>+	D_INFO("%d frames on pre-allocated heap on clear.\n", il-&gt;frames_count);</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;il-&gt;free_frames)) {</div><div class='add'>+		element = il-&gt;free_frames.next;</div><div class='add'>+		list_del(element);</div><div class='add'>+		kfree(list_entry(element, struct il3945_frame, list));</div><div class='add'>+		il-&gt;frames_count--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (il-&gt;frames_count) {</div><div class='add'>+		IL_WARN("%d frames still in use.  Did we lose one?\n",</div><div class='add'>+			il-&gt;frames_count);</div><div class='add'>+		il-&gt;frames_count = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct il3945_frame *</div><div class='add'>+il3945_get_free_frame(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il3945_frame *frame;</div><div class='add'>+	struct list_head *element;</div><div class='add'>+	if (list_empty(&amp;il-&gt;free_frames)) {</div><div class='add'>+		frame = kzalloc(sizeof(*frame), GFP_KERNEL);</div><div class='add'>+		if (!frame) {</div><div class='add'>+			IL_ERR("Could not allocate frame!\n");</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		il-&gt;frames_count++;</div><div class='add'>+		return frame;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	element = il-&gt;free_frames.next;</div><div class='add'>+	list_del(element);</div><div class='add'>+	return list_entry(element, struct il3945_frame, list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_free_frame(struct il_priv *il, struct il3945_frame *frame)</div><div class='add'>+{</div><div class='add'>+	memset(frame, 0, sizeof(*frame));</div><div class='add'>+	list_add(&amp;frame-&gt;list, &amp;il-&gt;free_frames);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int</div><div class='add'>+il3945_fill_beacon_frame(struct il_priv *il, struct ieee80211_hdr *hdr,</div><div class='add'>+			 int left)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (!il_is_associated(il) || !il-&gt;beacon_skb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;beacon_skb-&gt;len &gt; left)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memcpy(hdr, il-&gt;beacon_skb-&gt;data, il-&gt;beacon_skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	return il-&gt;beacon_skb-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il3945_send_beacon_cmd(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il3945_frame *frame;</div><div class='add'>+	unsigned int frame_size;</div><div class='add'>+	int rc;</div><div class='add'>+	u8 rate;</div><div class='add'>+</div><div class='add'>+	frame = il3945_get_free_frame(il);</div><div class='add'>+</div><div class='add'>+	if (!frame) {</div><div class='add'>+		IL_ERR("Could not obtain free frame buffer for beacon "</div><div class='add'>+		       "command.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rate = il_get_lowest_plcp(il, &amp;il-&gt;ctx);</div><div class='add'>+</div><div class='add'>+	frame_size = il3945_hw_get_beacon_cmd(il, frame, rate);</div><div class='add'>+</div><div class='add'>+	rc = il_send_cmd_pdu(il, C_TX_BEACON, frame_size, &amp;frame-&gt;u.cmd[0]);</div><div class='add'>+</div><div class='add'>+	il3945_free_frame(il, frame);</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'>+il3945_unset_hw_params(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	if (il-&gt;_3945.shared_virt)</div><div class='add'>+		dma_free_coherent(&amp;il-&gt;pci_dev-&gt;dev,</div><div class='add'>+				  sizeof(struct il3945_shared),</div><div class='add'>+				  il-&gt;_3945.shared_virt, il-&gt;_3945.shared_phys);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_build_tx_cmd_hwcrypto(struct il_priv *il, struct ieee80211_tx_info *info,</div><div class='add'>+			     struct il_device_cmd *cmd,</div><div class='add'>+			     struct sk_buff *skb_frag, int sta_id)</div><div class='add'>+{</div><div class='add'>+	struct il3945_tx_cmd *tx_cmd = (struct il3945_tx_cmd *)cmd-&gt;cmd.payload;</div><div class='add'>+	struct il_hw_key *keyinfo = &amp;il-&gt;stations[sta_id].keyinfo;</div><div class='add'>+</div><div class='add'>+	tx_cmd-&gt;sec_ctl = 0;</div><div class='add'>+</div><div class='add'>+	switch (keyinfo-&gt;cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		tx_cmd-&gt;sec_ctl = TX_CMD_SEC_CCM;</div><div class='add'>+		memcpy(tx_cmd-&gt;key, keyinfo-&gt;key, keyinfo-&gt;keylen);</div><div class='add'>+		D_TX("tx_cmd with AES hwcrypto\n");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP104:</div><div class='add'>+		tx_cmd-&gt;sec_ctl |= TX_CMD_SEC_KEY128;</div><div class='add'>+		/* fall through */</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP40:</div><div class='add'>+		tx_cmd-&gt;sec_ctl |=</div><div class='add'>+		    TX_CMD_SEC_WEP | (info-&gt;control.hw_key-&gt;</div><div class='add'>+				      hw_key_idx &amp; TX_CMD_SEC_MSK) &lt;&lt;</div><div class='add'>+		    TX_CMD_SEC_SHIFT;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;tx_cmd-&gt;key[3], keyinfo-&gt;key, keyinfo-&gt;keylen);</div><div class='add'>+</div><div class='add'>+		D_TX("Configuring packet for WEP encryption " "with key %d\n",</div><div class='add'>+		     info-&gt;control.hw_key-&gt;hw_key_idx);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		IL_ERR("Unknown encode cipher %x\n", keyinfo-&gt;cipher);</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'>+ * handle build C_TX command notification.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il3945_build_tx_cmd_basic(struct il_priv *il, struct il_device_cmd *cmd,</div><div class='add'>+			  struct ieee80211_tx_info *info,</div><div class='add'>+			  struct ieee80211_hdr *hdr, u8 std_id)</div><div class='add'>+{</div><div class='add'>+	struct il3945_tx_cmd *tx_cmd = (struct il3945_tx_cmd *)cmd-&gt;cmd.payload;</div><div class='add'>+	__le32 tx_flags = tx_cmd-&gt;tx_flags;</div><div class='add'>+	__le16 fc = hdr-&gt;frame_control;</div><div class='add'>+</div><div class='add'>+	tx_cmd-&gt;stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;</div><div class='add'>+	if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)) {</div><div class='add'>+		tx_flags |= TX_CMD_FLG_ACK_MSK;</div><div class='add'>+		if (ieee80211_is_mgmt(fc))</div><div class='add'>+			tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='add'>+		if (ieee80211_is_probe_resp(fc) &amp;&amp;</div><div class='add'>+		    !(le16_to_cpu(hdr-&gt;seq_ctrl) &amp; 0xf))</div><div class='add'>+			tx_flags |= TX_CMD_FLG_TSF_MSK;</div><div class='add'>+	} else {</div><div class='add'>+		tx_flags &amp;= (~TX_CMD_FLG_ACK_MSK);</div><div class='add'>+		tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_cmd-&gt;sta_id = std_id;</div><div class='add'>+	if (ieee80211_has_morefrags(fc))</div><div class='add'>+		tx_flags |= TX_CMD_FLG_MORE_FRAG_MSK;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_data_qos(fc)) {</div><div class='add'>+		u8 *qc = ieee80211_get_qos_ctl(hdr);</div><div class='add'>+		tx_cmd-&gt;tid_tspec = qc[0] &amp; 0xf;</div><div class='add'>+		tx_flags &amp;= ~TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='add'>+	} else {</div><div class='add'>+		tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il_tx_cmd_protection(il, info, fc, &amp;tx_flags);</div><div class='add'>+</div><div class='add'>+	tx_flags &amp;= ~(TX_CMD_FLG_ANT_SEL_MSK);</div><div class='add'>+	if (ieee80211_is_mgmt(fc)) {</div><div class='add'>+		if (ieee80211_is_assoc_req(fc) || ieee80211_is_reassoc_req(fc))</div><div class='add'>+			tx_cmd-&gt;timeout.pm_frame_timeout = cpu_to_le16(3);</div><div class='add'>+		else</div><div class='add'>+			tx_cmd-&gt;timeout.pm_frame_timeout = cpu_to_le16(2);</div><div class='add'>+	} else {</div><div class='add'>+		tx_cmd-&gt;timeout.pm_frame_timeout = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_cmd-&gt;driver_txop = 0;</div><div class='add'>+	tx_cmd-&gt;tx_flags = tx_flags;</div><div class='add'>+	tx_cmd-&gt;next_frame_len = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * start C_TX command process</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il3945_tx_skb(struct il_priv *il, 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'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct il3945_tx_cmd *tx_cmd;</div><div class='add'>+	struct il_tx_queue *txq = NULL;</div><div class='add'>+	struct il_queue *q = NULL;</div><div class='add'>+	struct il_device_cmd *out_cmd;</div><div class='add'>+	struct il_cmd_meta *out_meta;</div><div class='add'>+	dma_addr_t phys_addr;</div><div class='add'>+	dma_addr_t txcmd_phys;</div><div class='add'>+	int txq_id = skb_get_queue_mapping(skb);</div><div class='add'>+	u16 len, idx, hdr_len;</div><div class='add'>+	u8 id;</div><div class='add'>+	u8 unicast;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	u8 tid = 0;</div><div class='add'>+	__le16 fc;</div><div class='add'>+	u8 wait_write_ptr = 0;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+	if (il_is_rfkill(il)) {</div><div class='add'>+		D_DROP("Dropping - RF KILL\n");</div><div class='add'>+		goto drop_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((ieee80211_get_tx_rate(il-&gt;hw, info)-&gt;hw_value &amp; 0xFF) ==</div><div class='add'>+	    IL_INVALID_RATE) {</div><div class='add'>+		IL_ERR("ERROR: No TX rate available.\n");</div><div class='add'>+		goto drop_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	unicast = !is_multicast_ether_addr(hdr-&gt;addr1);</div><div class='add'>+	id = 0;</div><div class='add'>+</div><div class='add'>+	fc = hdr-&gt;frame_control;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	if (ieee80211_is_auth(fc))</div><div class='add'>+		D_TX("Sending AUTH frame\n");</div><div class='add'>+	else if (ieee80211_is_assoc_req(fc))</div><div class='add'>+		D_TX("Sending ASSOC frame\n");</div><div class='add'>+	else if (ieee80211_is_reassoc_req(fc))</div><div class='add'>+		D_TX("Sending REASSOC frame\n");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	hdr_len = ieee80211_hdrlen(fc);</div><div class='add'>+</div><div class='add'>+	/* Find idx into station table for destination station */</div><div class='add'>+	sta_id = il_sta_id_or_broadcast(il, &amp;il-&gt;ctx, info-&gt;control.sta);</div><div class='add'>+	if (sta_id == IL_INVALID_STATION) {</div><div class='add'>+		D_DROP("Dropping - INVALID STATION: %pM\n", hdr-&gt;addr1);</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_RATE("station Id %d\n", sta_id);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_data_qos(fc)) {</div><div class='add'>+		u8 *qc = ieee80211_get_qos_ctl(hdr);</div><div class='add'>+		tid = qc[0] &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+		if (unlikely(tid &gt;= MAX_TID_COUNT))</div><div class='add'>+			goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Descriptor for chosen Tx queue */</div><div class='add'>+	txq = &amp;il-&gt;txq[txq_id];</div><div class='add'>+	q = &amp;txq-&gt;q;</div><div class='add'>+</div><div class='add'>+	if ((il_queue_space(q) &lt; q-&gt;high_mark))</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	idx = il_get_cmd_idx(q, q-&gt;write_ptr, 0);</div><div class='add'>+</div><div class='add'>+	/* Set up driver data for this TFD */</div><div class='add'>+	memset(&amp;(txq-&gt;txb[q-&gt;write_ptr]), 0, sizeof(struct il_tx_info));</div><div class='add'>+	txq-&gt;txb[q-&gt;write_ptr].skb = skb;</div><div class='add'>+	txq-&gt;txb[q-&gt;write_ptr].ctx = &amp;il-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	/* Init first empty entry in queue's array of Tx/cmd buffers */</div><div class='add'>+	out_cmd = txq-&gt;cmd[idx];</div><div class='add'>+	out_meta = &amp;txq-&gt;meta[idx];</div><div class='add'>+	tx_cmd = (struct il3945_tx_cmd *)out_cmd-&gt;cmd.payload;</div><div class='add'>+	memset(&amp;out_cmd-&gt;hdr, 0, sizeof(out_cmd-&gt;hdr));</div><div class='add'>+	memset(tx_cmd, 0, sizeof(*tx_cmd));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set up the Tx-command (not MAC!) header.</div><div class='add'>+	 * Store the chosen Tx queue and TFD idx within the sequence field;</div><div class='add'>+	 * after Tx, uCode's Tx response will return this value so driver can</div><div class='add'>+	 * locate the frame within the tx queue and do post-tx processing.</div><div class='add'>+	 */</div><div class='add'>+	out_cmd-&gt;hdr.cmd = C_TX;</div><div class='add'>+	out_cmd-&gt;hdr.sequence =</div><div class='add'>+	    cpu_to_le16((u16)</div><div class='add'>+			(QUEUE_TO_SEQ(txq_id) | IDX_TO_SEQ(q-&gt;write_ptr)));</div><div class='add'>+</div><div class='add'>+	/* Copy MAC header from skb into command buffer */</div><div class='add'>+	memcpy(tx_cmd-&gt;hdr, hdr, hdr_len);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;control.hw_key)</div><div class='add'>+		il3945_build_tx_cmd_hwcrypto(il, info, out_cmd, skb, sta_id);</div><div class='add'>+</div><div class='add'>+	/* TODO need this for burst mode later on */</div><div class='add'>+	il3945_build_tx_cmd_basic(il, out_cmd, info, hdr, sta_id);</div><div class='add'>+</div><div class='add'>+	il3945_hw_build_tx_cmd_rate(il, out_cmd, info, hdr, sta_id);</div><div class='add'>+</div><div class='add'>+	/* Total # bytes to be transmitted */</div><div class='add'>+	len = (u16) skb-&gt;len;</div><div class='add'>+	tx_cmd-&gt;len = cpu_to_le16(len);</div><div class='add'>+</div><div class='add'>+	il_dbg_log_tx_data_frame(il, len, hdr);</div><div class='add'>+	il_update_stats(il, true, fc, len);</div><div class='add'>+	tx_cmd-&gt;tx_flags &amp;= ~TX_CMD_FLG_ANT_A_MSK;</div><div class='add'>+	tx_cmd-&gt;tx_flags &amp;= ~TX_CMD_FLG_ANT_B_MSK;</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_has_morefrags(hdr-&gt;frame_control)) {</div><div class='add'>+		txq-&gt;need_update = 1;</div><div class='add'>+	} else {</div><div class='add'>+		wait_write_ptr = 1;</div><div class='add'>+		txq-&gt;need_update = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_TX("sequence nr = 0X%x\n", le16_to_cpu(out_cmd-&gt;hdr.sequence));</div><div class='add'>+	D_TX("tx_flags = 0X%x\n", le32_to_cpu(tx_cmd-&gt;tx_flags));</div><div class='add'>+	il_print_hex_dump(il, IL_DL_TX, tx_cmd, sizeof(*tx_cmd));</div><div class='add'>+	il_print_hex_dump(il, IL_DL_TX, (u8 *) tx_cmd-&gt;hdr,</div><div class='add'>+			  ieee80211_hdrlen(fc));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Use the first empty entry in this queue's command buffer array</div><div class='add'>+	 * to contain the Tx command and MAC header concatenated together</div><div class='add'>+	 * (payload data will be in another buffer).</div><div class='add'>+	 * Size of this varies, due to varying MAC header length.</div><div class='add'>+	 * If end is not dword aligned, we'll have 2 extra bytes at the end</div><div class='add'>+	 * of the MAC header (device reads on dword boundaries).</div><div class='add'>+	 * We'll tell device about this padding later.</div><div class='add'>+	 */</div><div class='add'>+	len =</div><div class='add'>+	    sizeof(struct il3945_tx_cmd) + sizeof(struct il_cmd_header) +</div><div class='add'>+	    hdr_len;</div><div class='add'>+	len = (len + 3) &amp; ~3;</div><div class='add'>+</div><div class='add'>+	/* Physical address of this Tx command's header (not MAC header!),</div><div class='add'>+	 * within command buffer array. */</div><div class='add'>+	txcmd_phys =</div><div class='add'>+	    pci_map_single(il-&gt;pci_dev, &amp;out_cmd-&gt;hdr, len, PCI_DMA_TODEVICE);</div><div class='add'>+	/* we do not map meta data ... so we can safely access address to</div><div class='add'>+	 * provide to unmap command*/</div><div class='add'>+	dma_unmap_addr_set(out_meta, mapping, txcmd_phys);</div><div class='add'>+	dma_unmap_len_set(out_meta, len, len);</div><div class='add'>+</div><div class='add'>+	/* Add buffer containing Tx command and MAC(!) header to TFD's</div><div class='add'>+	 * first entry */</div><div class='add'>+	il-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_attach_buf_to_tfd(il, txq, txcmd_phys, len, 1,</div><div class='add'>+						 0);</div><div class='add'>+</div><div class='add'>+	/* Set up TFD's 2nd entry to point directly to remainder of skb,</div><div class='add'>+	 * if any (802.11 null frames have no payload). */</div><div class='add'>+	len = skb-&gt;len - hdr_len;</div><div class='add'>+	if (len) {</div><div class='add'>+		phys_addr =</div><div class='add'>+		    pci_map_single(il-&gt;pci_dev, skb-&gt;data + hdr_len, len,</div><div class='add'>+				   PCI_DMA_TODEVICE);</div><div class='add'>+		il-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_attach_buf_to_tfd(il, txq, phys_addr,</div><div class='add'>+							 len, 0, U32_PAD(len));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Tell device the write idx *just past* this latest filled TFD */</div><div class='add'>+	q-&gt;write_ptr = il_queue_inc_wrap(q-&gt;write_ptr, q-&gt;n_bd);</div><div class='add'>+	il_txq_update_write_ptr(il, txq);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (il_queue_space(q) &lt; q-&gt;high_mark &amp;&amp; il-&gt;mac80211_registered) {</div><div class='add'>+		if (wait_write_ptr) {</div><div class='add'>+			spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+			txq-&gt;need_update = 1;</div><div class='add'>+			il_txq_update_write_ptr(il, txq);</div><div class='add'>+			spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		il_stop_queue(il, txq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+drop_unlock:</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+drop:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il3945_get_measurement(struct il_priv *il,</div><div class='add'>+		       struct ieee80211_measurement_params *params, u8 type)</div><div class='add'>+{</div><div class='add'>+	struct il_spectrum_cmd spectrum;</div><div class='add'>+	struct il_rx_pkt *pkt;</div><div class='add'>+	struct il_host_cmd cmd = {</div><div class='add'>+		.id = C_SPECTRUM_MEASUREMENT,</div><div class='add'>+		.data = (void *)&amp;spectrum,</div><div class='add'>+		.flags = CMD_WANT_SKB,</div><div class='add'>+	};</div><div class='add'>+	u32 add_time = le64_to_cpu(params-&gt;start_time);</div><div class='add'>+	int rc;</div><div class='add'>+	int spectrum_resp_status;</div><div class='add'>+	int duration = le16_to_cpu(params-&gt;duration);</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	if (il_is_associated(il))</div><div class='add'>+		add_time =</div><div class='add'>+		    il_usecs_to_beacons(il,</div><div class='add'>+					le64_to_cpu(params-&gt;start_time) -</div><div class='add'>+					il-&gt;_3945.last_tsf,</div><div class='add'>+					le16_to_cpu(ctx-&gt;timing.</div><div class='add'>+						    beacon_interval));</div><div class='add'>+</div><div class='add'>+	memset(&amp;spectrum, 0, sizeof(spectrum));</div><div class='add'>+</div><div class='add'>+	spectrum.channel_count = cpu_to_le16(1);</div><div class='add'>+	spectrum.flags =</div><div class='add'>+	    RXON_FLG_TSF2HOST_MSK | RXON_FLG_ANT_A_MSK | RXON_FLG_DIS_DIV_MSK;</div><div class='add'>+	spectrum.filter_flags = MEASUREMENT_FILTER_FLAG;</div><div class='add'>+	cmd.len = sizeof(spectrum);</div><div class='add'>+	spectrum.len = cpu_to_le16(cmd.len - sizeof(spectrum.len));</div><div class='add'>+</div><div class='add'>+	if (il_is_associated(il))</div><div class='add'>+		spectrum.start_time =</div><div class='add'>+		    il_add_beacon_time(il, il-&gt;_3945.last_beacon_time, add_time,</div><div class='add'>+				       le16_to_cpu(ctx-&gt;timing.</div><div class='add'>+						   beacon_interval));</div><div class='add'>+	else</div><div class='add'>+		spectrum.start_time = 0;</div><div class='add'>+</div><div class='add'>+	spectrum.channels[0].duration = cpu_to_le32(duration * TIME_UNIT);</div><div class='add'>+	spectrum.channels[0].channel = params-&gt;channel;</div><div class='add'>+	spectrum.channels[0].type = type;</div><div class='add'>+	if (ctx-&gt;active.flags &amp; RXON_FLG_BAND_24G_MSK)</div><div class='add'>+		spectrum.flags |=</div><div class='add'>+		    RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK |</div><div class='add'>+		    RXON_FLG_TGG_PROTECT_MSK;</div><div class='add'>+</div><div class='add'>+	rc = il_send_cmd_sync(il, &amp;cmd);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	pkt = (struct il_rx_pkt *)cmd.reply_page;</div><div class='add'>+	if (pkt-&gt;hdr.flags &amp; IL_CMD_FAILED_MSK) {</div><div class='add'>+		IL_ERR("Bad return from N_RX_ON_ASSOC command\n");</div><div class='add'>+		rc = -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spectrum_resp_status = le16_to_cpu(pkt-&gt;u.spectrum.status);</div><div class='add'>+	switch (spectrum_resp_status) {</div><div class='add'>+	case 0:		/* Command will be handled */</div><div class='add'>+		if (pkt-&gt;u.spectrum.id != 0xff) {</div><div class='add'>+			D_INFO("Replaced existing measurement: %d\n",</div><div class='add'>+			       pkt-&gt;u.spectrum.id);</div><div class='add'>+			il-&gt;measurement_status &amp;= ~MEASUREMENT_READY;</div><div class='add'>+		}</div><div class='add'>+		il-&gt;measurement_status |= MEASUREMENT_ACTIVE;</div><div class='add'>+		rc = 0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 1:		/* Command will not be handled */</div><div class='add'>+		rc = -EAGAIN;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il_free_pages(il, cmd.reply_page);</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'>+il3945_hdl_alive(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	struct il_alive_resp *palive;</div><div class='add'>+	struct delayed_work *pwork;</div><div class='add'>+</div><div class='add'>+	palive = &amp;pkt-&gt;u.alive_frame;</div><div class='add'>+</div><div class='add'>+	D_INFO("Alive ucode status 0x%08X revision " "0x%01X 0x%01X\n",</div><div class='add'>+	       palive-&gt;is_valid, palive-&gt;ver_type, palive-&gt;ver_subtype);</div><div class='add'>+</div><div class='add'>+	if (palive-&gt;ver_subtype == INITIALIZE_SUBTYPE) {</div><div class='add'>+		D_INFO("Initialization Alive received.\n");</div><div class='add'>+		memcpy(&amp;il-&gt;card_alive_init, &amp;pkt-&gt;u.alive_frame,</div><div class='add'>+		       sizeof(struct il_alive_resp));</div><div class='add'>+		pwork = &amp;il-&gt;init_alive_start;</div><div class='add'>+	} else {</div><div class='add'>+		D_INFO("Runtime Alive received.\n");</div><div class='add'>+		memcpy(&amp;il-&gt;card_alive, &amp;pkt-&gt;u.alive_frame,</div><div class='add'>+		       sizeof(struct il_alive_resp));</div><div class='add'>+		pwork = &amp;il-&gt;alive_start;</div><div class='add'>+		il3945_disable_events(il);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We delay the ALIVE response by 5ms to</div><div class='add'>+	 * give the HW RF Kill time to activate... */</div><div class='add'>+	if (palive-&gt;is_valid == UCODE_VALID_OK)</div><div class='add'>+		queue_delayed_work(il-&gt;workqueue, pwork, msecs_to_jiffies(5));</div><div class='add'>+	else</div><div class='add'>+		IL_WARN("uCode did not respond OK.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_hdl_add_sta(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	D_RX("Received C_ADD_STA: 0x%02X\n", pkt-&gt;u.status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_hdl_beacon(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	struct il3945_beacon_notif *beacon = &amp;(pkt-&gt;u.beacon_status);</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	u8 rate = beacon-&gt;beacon_notify_hdr.rate;</div><div class='add'>+</div><div class='add'>+	D_RX("beacon status %x retries %d iss %d " "tsf %d %d rate %d\n",</div><div class='add'>+	     le32_to_cpu(beacon-&gt;beacon_notify_hdr.status) &amp; TX_STATUS_MSK,</div><div class='add'>+	     beacon-&gt;beacon_notify_hdr.failure_frame,</div><div class='add'>+	     le32_to_cpu(beacon-&gt;ibss_mgr_status),</div><div class='add'>+	     le32_to_cpu(beacon-&gt;high_tsf), le32_to_cpu(beacon-&gt;low_tsf), rate);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	il-&gt;ibss_manager = le32_to_cpu(beacon-&gt;ibss_mgr_status);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Handle notification from uCode that card's power state is changing</div><div class='add'>+ * due to software, hardware, or critical temperature RFKILL */</div><div class='add'>+static void</div><div class='add'>+il3945_hdl_card_state(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	u32 flags = le32_to_cpu(pkt-&gt;u.card_state_notif.flags);</div><div class='add'>+	unsigned long status = il-&gt;status;</div><div class='add'>+</div><div class='add'>+	IL_WARN("Card state received: HW:%s SW:%s\n",</div><div class='add'>+		(flags &amp; HW_CARD_DISABLED) ? "Kill" : "On",</div><div class='add'>+		(flags &amp; SW_CARD_DISABLED) ? "Kill" : "On");</div><div class='add'>+</div><div class='add'>+	_il_wr(il, CSR_UCODE_DRV_GP1_SET, CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);</div><div class='add'>+</div><div class='add'>+	if (flags &amp; HW_CARD_DISABLED)</div><div class='add'>+		set_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+	else</div><div class='add'>+		clear_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	il_scan_cancel(il);</div><div class='add'>+</div><div class='add'>+	if ((test_bit(S_RF_KILL_HW, &amp;status) !=</div><div class='add'>+	     test_bit(S_RF_KILL_HW, &amp;il-&gt;status)))</div><div class='add'>+		wiphy_rfkill_set_hw_state(il-&gt;hw-&gt;wiphy,</div><div class='add'>+					  test_bit(S_RF_KILL_HW, &amp;il-&gt;status));</div><div class='add'>+	else</div><div class='add'>+		wake_up(&amp;il-&gt;wait_command_queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_setup_handlers - Initialize Rx handler callbacks</div><div class='add'>+ *</div><div class='add'>+ * Setup the RX handlers for each of the reply types sent from the uCode</div><div class='add'>+ * to the host.</div><div class='add'>+ *</div><div class='add'>+ * This function chains into the hardware specific files for them to setup</div><div class='add'>+ * any hardware specific handlers as well.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il3945_setup_handlers(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	il-&gt;handlers[N_ALIVE] = il3945_hdl_alive;</div><div class='add'>+	il-&gt;handlers[C_ADD_STA] = il3945_hdl_add_sta;</div><div class='add'>+	il-&gt;handlers[N_ERROR] = il_hdl_error;</div><div class='add'>+	il-&gt;handlers[N_CHANNEL_SWITCH] = il_hdl_csa;</div><div class='add'>+	il-&gt;handlers[N_SPECTRUM_MEASUREMENT] = il_hdl_spectrum_measurement;</div><div class='add'>+	il-&gt;handlers[N_PM_SLEEP] = il_hdl_pm_sleep;</div><div class='add'>+	il-&gt;handlers[N_PM_DEBUG_STATS] = il_hdl_pm_debug_stats;</div><div class='add'>+	il-&gt;handlers[N_BEACON] = il3945_hdl_beacon;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The same handler is used for both the REPLY to a discrete</div><div class='add'>+	 * stats request from the host as well as for the periodic</div><div class='add'>+	 * stats notifications (after received beacons) from the uCode.</div><div class='add'>+	 */</div><div class='add'>+	il-&gt;handlers[C_STATS] = il3945_hdl_c_stats;</div><div class='add'>+	il-&gt;handlers[N_STATS] = il3945_hdl_stats;</div><div class='add'>+</div><div class='add'>+	il_setup_rx_scan_handlers(il);</div><div class='add'>+	il-&gt;handlers[N_CARD_STATE] = il3945_hdl_card_state;</div><div class='add'>+</div><div class='add'>+	/* Set up hardware specific Rx handlers */</div><div class='add'>+	il3945_hw_handler_setup(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/************************** RX-FUNCTIONS ****************************/</div><div class='add'>+/*</div><div class='add'>+ * Rx theory of operation</div><div class='add'>+ *</div><div class='add'>+ * The host allocates 32 DMA target addresses and passes the host address</div><div class='add'>+ * to the firmware at register IL_RFDS_TBL_LOWER + N * RFD_SIZE where N is</div><div class='add'>+ * 0 to 31</div><div class='add'>+ *</div><div class='add'>+ * Rx Queue Indexes</div><div class='add'>+ * The host/firmware share two idx registers for managing the Rx buffers.</div><div class='add'>+ *</div><div class='add'>+ * The READ idx maps to the first position that the firmware may be writing</div><div class='add'>+ * to -- the driver can read up to (but not including) this position and get</div><div class='add'>+ * good data.</div><div class='add'>+ * The READ idx is managed by the firmware once the card is enabled.</div><div class='add'>+ *</div><div class='add'>+ * The WRITE idx maps to the last position the driver has read from -- the</div><div class='add'>+ * position preceding WRITE is the last slot the firmware can place a packet.</div><div class='add'>+ *</div><div class='add'>+ * The queue is empty (no good data) if WRITE = READ - 1, and is full if</div><div class='add'>+ * WRITE = READ.</div><div class='add'>+ *</div><div class='add'>+ * During initialization, the host sets up the READ queue position to the first</div><div class='add'>+ * IDX position, and WRITE to the last (READ - 1 wrapped)</div><div class='add'>+ *</div><div class='add'>+ * When the firmware places a packet in a buffer, it will advance the READ idx</div><div class='add'>+ * and fire the RX interrupt.  The driver can then query the READ idx and</div><div class='add'>+ * process as many packets as possible, moving the WRITE idx forward as it</div><div class='add'>+ * resets the Rx queue buffers with new memory.</div><div class='add'>+ *</div><div class='add'>+ * The management in the driver is as follows:</div><div class='add'>+ * + A list of pre-allocated SKBs is stored in iwl-&gt;rxq-&gt;rx_free.  When</div><div class='add'>+ *   iwl-&gt;rxq-&gt;free_count drops to or below RX_LOW_WATERMARK, work is scheduled</div><div class='add'>+ *   to replenish the iwl-&gt;rxq-&gt;rx_free.</div><div class='add'>+ * + In il3945_rx_replenish (scheduled) if 'processed' != 'read' then the</div><div class='add'>+ *   iwl-&gt;rxq is replenished and the READ IDX is updated (updating the</div><div class='add'>+ *   'processed' and 'read' driver idxes as well)</div><div class='add'>+ * + A received packet is processed and handed to the kernel network stack,</div><div class='add'>+ *   detached from the iwl-&gt;rxq.  The driver 'processed' idx is updated.</div><div class='add'>+ * + The Host/Firmware iwl-&gt;rxq is replenished at tasklet time from the rx_free</div><div class='add'>+ *   list. If there are no allocated buffers in iwl-&gt;rxq-&gt;rx_free, the READ</div><div class='add'>+ *   IDX is not incremented and iwl-&gt;status(RX_STALLED) is set.  If there</div><div class='add'>+ *   were enough free buffers and RX_STALLED is set it is cleared.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * Driver sequence:</div><div class='add'>+ *</div><div class='add'>+ * il3945_rx_replenish()     Replenishes rx_free list from rx_used, and calls</div><div class='add'>+ *                            il3945_rx_queue_restock</div><div class='add'>+ * il3945_rx_queue_restock() Moves available buffers from rx_free into Rx</div><div class='add'>+ *                            queue, updates firmware pointers, and updates</div><div class='add'>+ *                            the WRITE idx.  If insufficient rx_free buffers</div><div class='add'>+ *                            are available, schedules il3945_rx_replenish</div><div class='add'>+ *</div><div class='add'>+ * -- enable interrupts --</div><div class='add'>+ * ISR - il3945_rx()         Detach il_rx_bufs from pool up to the</div><div class='add'>+ *                            READ IDX, detaching the SKB from the pool.</div><div class='add'>+ *                            Moves the packet buffer from queue to rx_used.</div><div class='add'>+ *                            Calls il3945_rx_queue_restock to refill any empty</div><div class='add'>+ *                            slots.</div><div class='add'>+ * ...</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_dma_addr2rbd_ptr - convert a DMA address to a uCode read buffer ptr</div><div class='add'>+ */</div><div class='add'>+static inline __le32</div><div class='add'>+il3945_dma_addr2rbd_ptr(struct il_priv *il, dma_addr_t dma_addr)</div><div class='add'>+{</div><div class='add'>+	return cpu_to_le32((u32) dma_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_rx_queue_restock - refill RX queue from pre-allocated pool</div><div class='add'>+ *</div><div class='add'>+ * If there are slots in the RX queue that need to be restocked,</div><div class='add'>+ * and we have free pre-allocated buffers, fill the ranks as much</div><div class='add'>+ * as we can, pulling from rx_free.</div><div class='add'>+ *</div><div class='add'>+ * This moves the 'write' idx forward to catch up with 'processed', and</div><div class='add'>+ * also updates the memory address in the firmware to reference the new</div><div class='add'>+ * target buffer.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il3945_rx_queue_restock(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_queue *rxq = &amp;il-&gt;rxq;</div><div class='add'>+	struct list_head *element;</div><div class='add'>+	struct il_rx_buf *rxb;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int write;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='add'>+	write = rxq-&gt;write &amp; ~0x7;</div><div class='add'>+	while (il_rx_queue_space(rxq) &gt; 0 &amp;&amp; rxq-&gt;free_count) {</div><div class='add'>+		/* Get next free Rx buffer, remove from free list */</div><div class='add'>+		element = rxq-&gt;rx_free.next;</div><div class='add'>+		rxb = list_entry(element, struct il_rx_buf, list);</div><div class='add'>+		list_del(element);</div><div class='add'>+</div><div class='add'>+		/* Point to Rx buffer via next RBD in circular buffer */</div><div class='add'>+		rxq-&gt;bd[rxq-&gt;write] =</div><div class='add'>+		    il3945_dma_addr2rbd_ptr(il, rxb-&gt;page_dma);</div><div class='add'>+		rxq-&gt;queue[rxq-&gt;write] = rxb;</div><div class='add'>+		rxq-&gt;write = (rxq-&gt;write + 1) &amp; RX_QUEUE_MASK;</div><div class='add'>+		rxq-&gt;free_count--;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+	/* If the pre-allocated buffer pool is dropping low, schedule to</div><div class='add'>+	 * refill it */</div><div class='add'>+	if (rxq-&gt;free_count &lt;= RX_LOW_WATERMARK)</div><div class='add'>+		queue_work(il-&gt;workqueue, &amp;il-&gt;rx_replenish);</div><div class='add'>+</div><div class='add'>+	/* If we've added more space for the firmware to place data, tell it.</div><div class='add'>+	 * Increment device's write pointer in multiples of 8. */</div><div class='add'>+	if (rxq-&gt;write_actual != (rxq-&gt;write &amp; ~0x7) ||</div><div class='add'>+	    abs(rxq-&gt;write - rxq-&gt;read) &gt; 7) {</div><div class='add'>+		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='add'>+		rxq-&gt;need_update = 1;</div><div class='add'>+		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+		il_rx_queue_update_write_ptr(il, rxq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_rx_replenish - Move all used packet from rx_used to rx_free</div><div class='add'>+ *</div><div class='add'>+ * When moving to rx_free an SKB is allocated for the slot.</div><div class='add'>+ *</div><div class='add'>+ * Also restock the Rx queue via il3945_rx_queue_restock.</div><div class='add'>+ * This is called as a scheduled work item (except for during initialization)</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il3945_rx_allocate(struct il_priv *il, gfp_t priority)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_queue *rxq = &amp;il-&gt;rxq;</div><div class='add'>+	struct list_head *element;</div><div class='add'>+	struct il_rx_buf *rxb;</div><div class='add'>+	struct page *page;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	gfp_t gfp_mask = priority;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		if (list_empty(&amp;rxq-&gt;rx_used)) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		if (rxq-&gt;free_count &gt; RX_LOW_WATERMARK)</div><div class='add'>+			gfp_mask |= __GFP_NOWARN;</div><div class='add'>+</div><div class='add'>+		if (il-&gt;hw_params.rx_page_order &gt; 0)</div><div class='add'>+			gfp_mask |= __GFP_COMP;</div><div class='add'>+</div><div class='add'>+		/* Alloc a new receive buffer */</div><div class='add'>+		page = alloc_pages(gfp_mask, il-&gt;hw_params.rx_page_order);</div><div class='add'>+		if (!page) {</div><div class='add'>+			if (net_ratelimit())</div><div class='add'>+				D_INFO("Failed to allocate SKB buffer.\n");</div><div class='add'>+			if (rxq-&gt;free_count &lt;= RX_LOW_WATERMARK &amp;&amp;</div><div class='add'>+			    net_ratelimit())</div><div class='add'>+				IL_ERR("Failed to allocate SKB buffer with %0x."</div><div class='add'>+				       "Only %u free buffers remaining.\n",</div><div class='add'>+				       priority, rxq-&gt;free_count);</div><div class='add'>+			/* We don't reschedule replenish work here -- we will</div><div class='add'>+			 * call the restock method and if it still needs</div><div class='add'>+			 * more buffers it will schedule replenish */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='add'>+		if (list_empty(&amp;rxq-&gt;rx_used)) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+			__free_pages(page, il-&gt;hw_params.rx_page_order);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		element = rxq-&gt;rx_used.next;</div><div class='add'>+		rxb = list_entry(element, struct il_rx_buf, list);</div><div class='add'>+		list_del(element);</div><div class='add'>+		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		rxb-&gt;page = page;</div><div class='add'>+		/* Get physical address of RB/SKB */</div><div class='add'>+		rxb-&gt;page_dma =</div><div class='add'>+		    pci_map_page(il-&gt;pci_dev, page, 0,</div><div class='add'>+				 PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='add'>+				 PCI_DMA_FROMDEVICE);</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;rxb-&gt;list, &amp;rxq-&gt;rx_free);</div><div class='add'>+		rxq-&gt;free_count++;</div><div class='add'>+		il-&gt;alloc_rxb_page++;</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il3945_rx_queue_reset(struct il_priv *il, struct il_rx_queue *rxq)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i;</div><div class='add'>+	spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='add'>+	INIT_LIST_HEAD(&amp;rxq-&gt;rx_free);</div><div class='add'>+	INIT_LIST_HEAD(&amp;rxq-&gt;rx_used);</div><div class='add'>+	/* Fill the rx_used queue with _all_ of the Rx buffers */</div><div class='add'>+	for (i = 0; i &lt; RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++) {</div><div class='add'>+		/* In the reset function, these buffers may have been allocated</div><div class='add'>+		 * to an SKB, so we need to unmap and free potential storage */</div><div class='add'>+		if (rxq-&gt;pool[i].page != NULL) {</div><div class='add'>+			pci_unmap_page(il-&gt;pci_dev, rxq-&gt;pool[i].page_dma,</div><div class='add'>+				       PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='add'>+				       PCI_DMA_FROMDEVICE);</div><div class='add'>+			__il_free_pages(il, rxq-&gt;pool[i].page);</div><div class='add'>+			rxq-&gt;pool[i].page = NULL;</div><div class='add'>+		}</div><div class='add'>+		list_add_tail(&amp;rxq-&gt;pool[i].list, &amp;rxq-&gt;rx_used);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set us so that we have processed and used all buffers, but have</div><div class='add'>+	 * not restocked the Rx queue with fresh buffers */</div><div class='add'>+	rxq-&gt;read = rxq-&gt;write = 0;</div><div class='add'>+	rxq-&gt;write_actual = 0;</div><div class='add'>+	rxq-&gt;free_count = 0;</div><div class='add'>+	spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il3945_rx_replenish(void *data)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = data;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	il3945_rx_allocate(il, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+	il3945_rx_queue_restock(il);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_rx_replenish_now(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	il3945_rx_allocate(il, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	il3945_rx_queue_restock(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Assumes that the skb field of the buffers in 'pool' is kept accurate.</div><div class='add'>+ * If an SKB has been detached, the POOL needs to have its SKB set to NULL</div><div class='add'>+ * This free routine walks the list of POOL entries and if SKB is set to</div><div class='add'>+ * non NULL it is unmapped and freed</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il3945_rx_queue_free(struct il_priv *il, struct il_rx_queue *rxq)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {</div><div class='add'>+		if (rxq-&gt;pool[i].page != NULL) {</div><div class='add'>+			pci_unmap_page(il-&gt;pci_dev, rxq-&gt;pool[i].page_dma,</div><div class='add'>+				       PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='add'>+				       PCI_DMA_FROMDEVICE);</div><div class='add'>+			__il_free_pages(il, rxq-&gt;pool[i].page);</div><div class='add'>+			rxq-&gt;pool[i].page = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_free_coherent(&amp;il-&gt;pci_dev-&gt;dev, 4 * RX_QUEUE_SIZE, rxq-&gt;bd,</div><div class='add'>+			  rxq-&gt;bd_dma);</div><div class='add'>+	dma_free_coherent(&amp;il-&gt;pci_dev-&gt;dev, sizeof(struct il_rb_status),</div><div class='add'>+			  rxq-&gt;rb_stts, rxq-&gt;rb_stts_dma);</div><div class='add'>+	rxq-&gt;bd = NULL;</div><div class='add'>+	rxq-&gt;rb_stts = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convert linear signal-to-noise ratio into dB */</div><div class='add'>+static u8 ratio2dB[100] = {</div><div class='add'>+/*	 0   1   2   3   4   5   6   7   8   9 */</div><div class='add'>+	0, 0, 6, 10, 12, 14, 16, 17, 18, 19,	/* 00 - 09 */</div><div class='add'>+	20, 21, 22, 22, 23, 23, 24, 25, 26, 26,	/* 10 - 19 */</div><div class='add'>+	26, 26, 26, 27, 27, 28, 28, 28, 29, 29,	/* 20 - 29 */</div><div class='add'>+	29, 30, 30, 30, 31, 31, 31, 31, 32, 32,	/* 30 - 39 */</div><div class='add'>+	32, 32, 32, 33, 33, 33, 33, 33, 34, 34,	/* 40 - 49 */</div><div class='add'>+	34, 34, 34, 34, 35, 35, 35, 35, 35, 35,	/* 50 - 59 */</div><div class='add'>+	36, 36, 36, 36, 36, 36, 36, 37, 37, 37,	/* 60 - 69 */</div><div class='add'>+	37, 37, 37, 37, 37, 38, 38, 38, 38, 38,	/* 70 - 79 */</div><div class='add'>+	38, 38, 38, 38, 38, 39, 39, 39, 39, 39,	/* 80 - 89 */</div><div class='add'>+	39, 39, 39, 39, 39, 40, 40, 40, 40, 40	/* 90 - 99 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Calculates a relative dB value from a ratio of linear</div><div class='add'>+ *   (i.e. not dB) signal levels.</div><div class='add'>+ * Conversion assumes that levels are voltages (20*log), not powers (10*log). */</div><div class='add'>+int</div><div class='add'>+il3945_calc_db_from_ratio(int sig_ratio)</div><div class='add'>+{</div><div class='add'>+	/* 1000:1 or higher just report as 60 dB */</div><div class='add'>+	if (sig_ratio &gt;= 1000)</div><div class='add'>+		return 60;</div><div class='add'>+</div><div class='add'>+	/* 100:1 or higher, divide by 10 and use table,</div><div class='add'>+	 *   add 20 dB to make up for divide by 10 */</div><div class='add'>+	if (sig_ratio &gt;= 100)</div><div class='add'>+		return 20 + (int)ratio2dB[sig_ratio / 10];</div><div class='add'>+</div><div class='add'>+	/* We shouldn't see this */</div><div class='add'>+	if (sig_ratio &lt; 1)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Use table for ratios 1:1 - 99:1 */</div><div class='add'>+	return (int)ratio2dB[sig_ratio];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_rx_handle - Main entry function for receiving responses from uCode</div><div class='add'>+ *</div><div class='add'>+ * Uses the il-&gt;handlers callback function array to invoke</div><div class='add'>+ * the appropriate handlers, including command responses,</div><div class='add'>+ * frame-received notifications, and other notifications.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il3945_rx_handle(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_buf *rxb;</div><div class='add'>+	struct il_rx_pkt *pkt;</div><div class='add'>+	struct il_rx_queue *rxq = &amp;il-&gt;rxq;</div><div class='add'>+	u32 r, i;</div><div class='add'>+	int reclaim;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 fill_rx = 0;</div><div class='add'>+	u32 count = 8;</div><div class='add'>+	int total_empty = 0;</div><div class='add'>+</div><div class='add'>+	/* uCode's read idx (stored in shared DRAM) indicates the last Rx</div><div class='add'>+	 * buffer that the driver may process (last buffer filled by ucode). */</div><div class='add'>+	r = le16_to_cpu(rxq-&gt;rb_stts-&gt;closed_rb_num) &amp; 0x0FFF;</div><div class='add'>+	i = rxq-&gt;read;</div><div class='add'>+</div><div class='add'>+	/* calculate total frames need to be restock after handling RX */</div><div class='add'>+	total_empty = r - rxq-&gt;write_actual;</div><div class='add'>+	if (total_empty &lt; 0)</div><div class='add'>+		total_empty += RX_QUEUE_SIZE;</div><div class='add'>+</div><div class='add'>+	if (total_empty &gt; (RX_QUEUE_SIZE / 2))</div><div class='add'>+		fill_rx = 1;</div><div class='add'>+	/* Rx interrupt, but nothing sent from uCode */</div><div class='add'>+	if (i == r)</div><div class='add'>+		D_RX("r = %d, i = %d\n", r, i);</div><div class='add'>+</div><div class='add'>+	while (i != r) {</div><div class='add'>+		int len;</div><div class='add'>+</div><div class='add'>+		rxb = rxq-&gt;queue[i];</div><div class='add'>+</div><div class='add'>+		/* If an RXB doesn't have a Rx queue slot associated with it,</div><div class='add'>+		 * then a bug has been introduced in the queue refilling</div><div class='add'>+		 * routines -- catch it here */</div><div class='add'>+		BUG_ON(rxb == NULL);</div><div class='add'>+</div><div class='add'>+		rxq-&gt;queue[i] = NULL;</div><div class='add'>+</div><div class='add'>+		pci_unmap_page(il-&gt;pci_dev, rxb-&gt;page_dma,</div><div class='add'>+			       PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='add'>+			       PCI_DMA_FROMDEVICE);</div><div class='add'>+		pkt = rxb_addr(rxb);</div><div class='add'>+</div><div class='add'>+		len = le32_to_cpu(pkt-&gt;len_n_flags) &amp; IL_RX_FRAME_SIZE_MSK;</div><div class='add'>+		len += sizeof(u32);	/* account for status word */</div><div class='add'>+</div><div class='add'>+		/* Reclaim a command buffer only if this packet is a response</div><div class='add'>+		 *   to a (driver-originated) command.</div><div class='add'>+		 * If the packet (e.g. Rx frame) originated from uCode,</div><div class='add'>+		 *   there is no command buffer to reclaim.</div><div class='add'>+		 * Ucode should set SEQ_RX_FRAME bit if ucode-originated,</div><div class='add'>+		 *   but apparently a few don't get set; catch them here. */</div><div class='add'>+		reclaim = !(pkt-&gt;hdr.sequence &amp; SEQ_RX_FRAME) &amp;&amp;</div><div class='add'>+		    pkt-&gt;hdr.cmd != N_STATS &amp;&amp; pkt-&gt;hdr.cmd != C_TX;</div><div class='add'>+</div><div class='add'>+		/* Based on type of command response or notification,</div><div class='add'>+		 *   handle those that need handling via function in</div><div class='add'>+		 *   handlers table.  See il3945_setup_handlers() */</div><div class='add'>+		if (il-&gt;handlers[pkt-&gt;hdr.cmd]) {</div><div class='add'>+			D_RX("r = %d, i = %d, %s, 0x%02x\n", r, i,</div><div class='add'>+			     il_get_cmd_string(pkt-&gt;hdr.cmd), pkt-&gt;hdr.cmd);</div><div class='add'>+			il-&gt;isr_stats.handlers[pkt-&gt;hdr.cmd]++;</div><div class='add'>+			il-&gt;handlers[pkt-&gt;hdr.cmd] (il, rxb);</div><div class='add'>+		} else {</div><div class='add'>+			/* No handling needed */</div><div class='add'>+			D_RX("r %d i %d No handler needed for %s, 0x%02x\n", r,</div><div class='add'>+			     i, il_get_cmd_string(pkt-&gt;hdr.cmd), pkt-&gt;hdr.cmd);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * XXX: After here, we should always check rxb-&gt;page</div><div class='add'>+		 * against NULL before touching it or its virtual</div><div class='add'>+		 * memory (pkt). Because some handler might have</div><div class='add'>+		 * already taken or freed the pages.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		if (reclaim) {</div><div class='add'>+			/* Invoke any callbacks, transfer the buffer to caller,</div><div class='add'>+			 * and fire off the (possibly) blocking il_send_cmd()</div><div class='add'>+			 * as we reclaim the driver command queue */</div><div class='add'>+			if (rxb-&gt;page)</div><div class='add'>+				il_tx_cmd_complete(il, rxb);</div><div class='add'>+			else</div><div class='add'>+				IL_WARN("Claim null rxb?\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Reuse the page if possible. For notification packets and</div><div class='add'>+		 * SKBs that fail to Rx correctly, add them back into the</div><div class='add'>+		 * rx_free list for reuse later. */</div><div class='add'>+		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='add'>+		if (rxb-&gt;page != NULL) {</div><div class='add'>+			rxb-&gt;page_dma =</div><div class='add'>+			    pci_map_page(il-&gt;pci_dev, rxb-&gt;page, 0,</div><div class='add'>+					 PAGE_SIZE &lt;&lt; il-&gt;hw_params.</div><div class='add'>+					 rx_page_order, PCI_DMA_FROMDEVICE);</div><div class='add'>+			list_add_tail(&amp;rxb-&gt;list, &amp;rxq-&gt;rx_free);</div><div class='add'>+			rxq-&gt;free_count++;</div><div class='add'>+		} else</div><div class='add'>+			list_add_tail(&amp;rxb-&gt;list, &amp;rxq-&gt;rx_used);</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		i = (i + 1) &amp; RX_QUEUE_MASK;</div><div class='add'>+		/* If there are a lot of unused frames,</div><div class='add'>+		 * restock the Rx queue so ucode won't assert. */</div><div class='add'>+		if (fill_rx) {</div><div class='add'>+			count++;</div><div class='add'>+			if (count &gt;= 8) {</div><div class='add'>+				rxq-&gt;read = i;</div><div class='add'>+				il3945_rx_replenish_now(il);</div><div class='add'>+				count = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Backtrack one entry */</div><div class='add'>+	rxq-&gt;read = i;</div><div class='add'>+	if (fill_rx)</div><div class='add'>+		il3945_rx_replenish_now(il);</div><div class='add'>+	else</div><div class='add'>+		il3945_rx_queue_restock(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* call this function to flush any scheduled tasklet */</div><div class='add'>+static inline void</div><div class='add'>+il3945_synchronize_irq(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	/* wait to make sure we flush pending tasklet */</div><div class='add'>+	synchronize_irq(il-&gt;pci_dev-&gt;irq);</div><div class='add'>+	tasklet_kill(&amp;il-&gt;irq_tasklet);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *</div><div class='add'>+il3945_desc_lookup(int i)</div><div class='add'>+{</div><div class='add'>+	switch (i) {</div><div class='add'>+	case 1:</div><div class='add'>+		return "FAIL";</div><div class='add'>+	case 2:</div><div class='add'>+		return "BAD_PARAM";</div><div class='add'>+	case 3:</div><div class='add'>+		return "BAD_CHECKSUM";</div><div class='add'>+	case 4:</div><div class='add'>+		return "NMI_INTERRUPT";</div><div class='add'>+	case 5:</div><div class='add'>+		return "SYSASSERT";</div><div class='add'>+	case 6:</div><div class='add'>+		return "FATAL_ERROR";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "UNKNOWN";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ERROR_START_OFFSET  (1 * sizeof(u32))</div><div class='add'>+#define ERROR_ELEM_SIZE     (7 * sizeof(u32))</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il3945_dump_nic_error_log(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+	u32 desc, time, count, base, data1;</div><div class='add'>+	u32 blink1, blink2, ilink1, ilink2;</div><div class='add'>+</div><div class='add'>+	base = le32_to_cpu(il-&gt;card_alive.error_event_table_ptr);</div><div class='add'>+</div><div class='add'>+	if (!il3945_hw_valid_rtc_data_addr(base)) {</div><div class='add'>+		IL_ERR("Not valid error log pointer 0x%08X\n", base);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	count = il_read_targ_mem(il, base);</div><div class='add'>+</div><div class='add'>+	if (ERROR_START_OFFSET &lt;= count * ERROR_ELEM_SIZE) {</div><div class='add'>+		IL_ERR("Start IWL Error Log Dump:\n");</div><div class='add'>+		IL_ERR("Status: 0x%08lX, count: %d\n", il-&gt;status, count);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IL_ERR("Desc       Time       asrtPC  blink2 "</div><div class='add'>+	       "ilink1  nmiPC   Line\n");</div><div class='add'>+	for (i = ERROR_START_OFFSET;</div><div class='add'>+	     i &lt; (count * ERROR_ELEM_SIZE) + ERROR_START_OFFSET;</div><div class='add'>+	     i += ERROR_ELEM_SIZE) {</div><div class='add'>+		desc = il_read_targ_mem(il, base + i);</div><div class='add'>+		time = il_read_targ_mem(il, base + i + 1 * sizeof(u32));</div><div class='add'>+		blink1 = il_read_targ_mem(il, base + i + 2 * sizeof(u32));</div><div class='add'>+		blink2 = il_read_targ_mem(il, base + i + 3 * sizeof(u32));</div><div class='add'>+		ilink1 = il_read_targ_mem(il, base + i + 4 * sizeof(u32));</div><div class='add'>+		ilink2 = il_read_targ_mem(il, base + i + 5 * sizeof(u32));</div><div class='add'>+		data1 = il_read_targ_mem(il, base + i + 6 * sizeof(u32));</div><div class='add'>+</div><div class='add'>+		IL_ERR("%-13s (0x%X) %010u 0x%05X 0x%05X 0x%05X 0x%05X %u\n\n",</div><div class='add'>+		       il3945_desc_lookup(desc), desc, time, blink1, blink2,</div><div class='add'>+		       ilink1, ilink2, data1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_irq_tasklet(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	u32 inta, handled = 0;</div><div class='add'>+	u32 inta_fh;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	u32 inta_mask;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Ack/clear/reset pending uCode interrupts.</div><div class='add'>+	 * Note:  Some bits in CSR_INT are "OR" of bits in CSR_FH_INT_STATUS,</div><div class='add'>+	 *  and will clear only when CSR_FH_INT_STATUS gets cleared. */</div><div class='add'>+	inta = _il_rd(il, CSR_INT);</div><div class='add'>+	_il_wr(il, CSR_INT, inta);</div><div class='add'>+</div><div class='add'>+	/* Ack/clear/reset pending flow-handler (DMA) interrupts.</div><div class='add'>+	 * Any new interrupts that happen after this, either while we're</div><div class='add'>+	 * in this tasklet, or later, will show up in next ISR/tasklet. */</div><div class='add'>+	inta_fh = _il_rd(il, CSR_FH_INT_STATUS);</div><div class='add'>+	_il_wr(il, CSR_FH_INT_STATUS, inta_fh);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	if (il_get_debug_level(il) &amp; IL_DL_ISR) {</div><div class='add'>+		/* just for debug */</div><div class='add'>+		inta_mask = _il_rd(il, CSR_INT_MASK);</div><div class='add'>+		D_ISR("inta 0x%08x, enabled 0x%08x, fh 0x%08x\n", inta,</div><div class='add'>+		      inta_mask, inta_fh);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Since CSR_INT and CSR_FH_INT_STATUS reads and clears are not</div><div class='add'>+	 * atomic, make sure that inta covers all the interrupts that</div><div class='add'>+	 * we've discovered, even if FH interrupt came in just after</div><div class='add'>+	 * reading CSR_INT. */</div><div class='add'>+	if (inta_fh &amp; CSR39_FH_INT_RX_MASK)</div><div class='add'>+		inta |= CSR_INT_BIT_FH_RX;</div><div class='add'>+	if (inta_fh &amp; CSR39_FH_INT_TX_MASK)</div><div class='add'>+		inta |= CSR_INT_BIT_FH_TX;</div><div class='add'>+</div><div class='add'>+	/* Now service all interrupt bits discovered above. */</div><div class='add'>+	if (inta &amp; CSR_INT_BIT_HW_ERR) {</div><div class='add'>+		IL_ERR("Hardware error detected.  Restarting.\n");</div><div class='add'>+</div><div class='add'>+		/* Tell the device to stop sending interrupts */</div><div class='add'>+		il_disable_interrupts(il);</div><div class='add'>+</div><div class='add'>+		il-&gt;isr_stats.hw++;</div><div class='add'>+		il_irq_handle_error(il);</div><div class='add'>+</div><div class='add'>+		handled |= CSR_INT_BIT_HW_ERR;</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	if (il_get_debug_level(il) &amp; (IL_DL_ISR)) {</div><div class='add'>+		/* NIC fires this, but we don't use it, redundant with WAKEUP */</div><div class='add'>+		if (inta &amp; CSR_INT_BIT_SCD) {</div><div class='add'>+			D_ISR("Scheduler finished to transmit "</div><div class='add'>+			      "the frame/frames.\n");</div><div class='add'>+			il-&gt;isr_stats.sch++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Alive notification via Rx interrupt will do the real work */</div><div class='add'>+		if (inta &amp; CSR_INT_BIT_ALIVE) {</div><div class='add'>+			D_ISR("Alive interrupt\n");</div><div class='add'>+			il-&gt;isr_stats.alive++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	/* Safely ignore these bits for debug checks below */</div><div class='add'>+	inta &amp;= ~(CSR_INT_BIT_SCD | CSR_INT_BIT_ALIVE);</div><div class='add'>+</div><div class='add'>+	/* Error detected by uCode */</div><div class='add'>+	if (inta &amp; CSR_INT_BIT_SW_ERR) {</div><div class='add'>+		IL_ERR("Microcode SW error detected. " "Restarting 0x%X.\n",</div><div class='add'>+		       inta);</div><div class='add'>+		il-&gt;isr_stats.sw++;</div><div class='add'>+		il_irq_handle_error(il);</div><div class='add'>+		handled |= CSR_INT_BIT_SW_ERR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* uCode wakes up after power-down sleep */</div><div class='add'>+	if (inta &amp; CSR_INT_BIT_WAKEUP) {</div><div class='add'>+		D_ISR("Wakeup interrupt\n");</div><div class='add'>+		il_rx_queue_update_write_ptr(il, &amp;il-&gt;rxq);</div><div class='add'>+		il_txq_update_write_ptr(il, &amp;il-&gt;txq[0]);</div><div class='add'>+		il_txq_update_write_ptr(il, &amp;il-&gt;txq[1]);</div><div class='add'>+		il_txq_update_write_ptr(il, &amp;il-&gt;txq[2]);</div><div class='add'>+		il_txq_update_write_ptr(il, &amp;il-&gt;txq[3]);</div><div class='add'>+		il_txq_update_write_ptr(il, &amp;il-&gt;txq[4]);</div><div class='add'>+		il_txq_update_write_ptr(il, &amp;il-&gt;txq[5]);</div><div class='add'>+</div><div class='add'>+		il-&gt;isr_stats.wakeup++;</div><div class='add'>+		handled |= CSR_INT_BIT_WAKEUP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* All uCode command responses, including Tx command responses,</div><div class='add'>+	 * Rx "responses" (frame-received notification), and other</div><div class='add'>+	 * notifications from uCode come through here*/</div><div class='add'>+	if (inta &amp; (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX)) {</div><div class='add'>+		il3945_rx_handle(il);</div><div class='add'>+		il-&gt;isr_stats.rx++;</div><div class='add'>+		handled |= (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (inta &amp; CSR_INT_BIT_FH_TX) {</div><div class='add'>+		D_ISR("Tx interrupt\n");</div><div class='add'>+		il-&gt;isr_stats.tx++;</div><div class='add'>+</div><div class='add'>+		_il_wr(il, CSR_FH_INT_STATUS, (1 &lt;&lt; 6));</div><div class='add'>+		il_wr(il, FH39_TCSR_CREDIT(FH39_SRVC_CHNL), 0x0);</div><div class='add'>+		handled |= CSR_INT_BIT_FH_TX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (inta &amp; ~handled) {</div><div class='add'>+		IL_ERR("Unhandled INTA bits 0x%08x\n", inta &amp; ~handled);</div><div class='add'>+		il-&gt;isr_stats.unhandled++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (inta &amp; ~il-&gt;inta_mask) {</div><div class='add'>+		IL_WARN("Disabled INTA bits 0x%08x were pending\n",</div><div class='add'>+			inta &amp; ~il-&gt;inta_mask);</div><div class='add'>+		IL_WARN("   with inta_fh = 0x%08x\n", inta_fh);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Re-enable all interrupts */</div><div class='add'>+	/* only Re-enable if disabled by irq */</div><div class='add'>+	if (test_bit(S_INT_ENABLED, &amp;il-&gt;status))</div><div class='add'>+		il_enable_interrupts(il);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	if (il_get_debug_level(il) &amp; (IL_DL_ISR)) {</div><div class='add'>+		inta = _il_rd(il, CSR_INT);</div><div class='add'>+		inta_mask = _il_rd(il, CSR_INT_MASK);</div><div class='add'>+		inta_fh = _il_rd(il, CSR_FH_INT_STATUS);</div><div class='add'>+		D_ISR("End inta 0x%08x, enabled 0x%08x, fh 0x%08x, "</div><div class='add'>+		      "flags 0x%08lx\n", inta, inta_mask, inta_fh, flags);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il3945_get_channels_for_scan(struct il_priv *il, enum ieee80211_band band,</div><div class='add'>+			     u8 is_active, u8 n_probes,</div><div class='add'>+			     struct il3945_scan_channel *scan_ch,</div><div class='add'>+			     struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_channel *chan;</div><div class='add'>+	const struct ieee80211_supported_band *sband;</div><div class='add'>+	const struct il_channel_info *ch_info;</div><div class='add'>+	u16 passive_dwell = 0;</div><div class='add'>+	u16 active_dwell = 0;</div><div class='add'>+	int added, i;</div><div class='add'>+</div><div class='add'>+	sband = il_get_hw_mode(il, band);</div><div class='add'>+	if (!sband)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	active_dwell = il_get_active_dwell_time(il, band, n_probes);</div><div class='add'>+	passive_dwell = il_get_passive_dwell_time(il, band, vif);</div><div class='add'>+</div><div class='add'>+	if (passive_dwell &lt;= active_dwell)</div><div class='add'>+		passive_dwell = active_dwell + 1;</div><div class='add'>+</div><div class='add'>+	for (i = 0, added = 0; i &lt; il-&gt;scan_request-&gt;n_channels; i++) {</div><div class='add'>+		chan = il-&gt;scan_request-&gt;channels[i];</div><div class='add'>+</div><div class='add'>+		if (chan-&gt;band != band)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		scan_ch-&gt;channel = chan-&gt;hw_value;</div><div class='add'>+</div><div class='add'>+		ch_info = il_get_channel_info(il, band, scan_ch-&gt;channel);</div><div class='add'>+		if (!il_is_channel_valid(ch_info)) {</div><div class='add'>+			D_SCAN("Channel %d is INVALID for this band.\n",</div><div class='add'>+			       scan_ch-&gt;channel);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		scan_ch-&gt;active_dwell = cpu_to_le16(active_dwell);</div><div class='add'>+		scan_ch-&gt;passive_dwell = cpu_to_le16(passive_dwell);</div><div class='add'>+		/* If passive , set up for auto-switch</div><div class='add'>+		 *  and use long active_dwell time.</div><div class='add'>+		 */</div><div class='add'>+		if (!is_active || il_is_channel_passive(ch_info) ||</div><div class='add'>+		    (chan-&gt;flags &amp; IEEE80211_CHAN_PASSIVE_SCAN)) {</div><div class='add'>+			scan_ch-&gt;type = 0;	/* passive */</div><div class='add'>+			if (IL_UCODE_API(il-&gt;ucode_ver) == 1)</div><div class='add'>+				scan_ch-&gt;active_dwell =</div><div class='add'>+				    cpu_to_le16(passive_dwell - 1);</div><div class='add'>+		} else {</div><div class='add'>+			scan_ch-&gt;type = 1;	/* active */</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set direct probe bits. These may be used both for active</div><div class='add'>+		 * scan channels (probes gets sent right away),</div><div class='add'>+		 * or for passive channels (probes get se sent only after</div><div class='add'>+		 * hearing clear Rx packet).*/</div><div class='add'>+		if (IL_UCODE_API(il-&gt;ucode_ver) &gt;= 2) {</div><div class='add'>+			if (n_probes)</div><div class='add'>+				scan_ch-&gt;type |= IL39_SCAN_PROBE_MASK(n_probes);</div><div class='add'>+		} else {</div><div class='add'>+			/* uCode v1 does not allow setting direct probe bits on</div><div class='add'>+			 * passive channel. */</div><div class='add'>+			if ((scan_ch-&gt;type &amp; 1) &amp;&amp; n_probes)</div><div class='add'>+				scan_ch-&gt;type |= IL39_SCAN_PROBE_MASK(n_probes);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set txpower levels to defaults */</div><div class='add'>+		scan_ch-&gt;tpc.dsp_atten = 110;</div><div class='add'>+		/* scan_pwr_info-&gt;tpc.dsp_atten; */</div><div class='add'>+</div><div class='add'>+		/*scan_pwr_info-&gt;tpc.tx_gain; */</div><div class='add'>+		if (band == IEEE80211_BAND_5GHZ)</div><div class='add'>+			scan_ch-&gt;tpc.tx_gain = ((1 &lt;&lt; 5) | (3 &lt;&lt; 3)) | 3;</div><div class='add'>+		else {</div><div class='add'>+			scan_ch-&gt;tpc.tx_gain = ((1 &lt;&lt; 5) | (5 &lt;&lt; 3));</div><div class='add'>+			/* NOTE: if we were doing 6Mb OFDM for scans we'd use</div><div class='add'>+			 * power level:</div><div class='add'>+			 * scan_ch-&gt;tpc.tx_gain = ((1 &lt;&lt; 5) | (2 &lt;&lt; 3)) | 3;</div><div class='add'>+			 */</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		D_SCAN("Scanning %d [%s %d]\n", scan_ch-&gt;channel,</div><div class='add'>+		       (scan_ch-&gt;type &amp; 1) ? "ACTIVE" : "PASSIVE",</div><div class='add'>+		       (scan_ch-&gt;type &amp; 1) ? active_dwell : passive_dwell);</div><div class='add'>+</div><div class='add'>+		scan_ch++;</div><div class='add'>+		added++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_SCAN("total channels to scan %d\n", added);</div><div class='add'>+	return added;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_init_hw_rates(struct il_priv *il, struct ieee80211_rate *rates)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RATE_COUNT_LEGACY; i++) {</div><div class='add'>+		rates[i].bitrate = il3945_rates[i].ieee * 5;</div><div class='add'>+		rates[i].hw_value = i;	/* Rate scaling will work on idxes */</div><div class='add'>+		rates[i].hw_value_short = i;</div><div class='add'>+		rates[i].flags = 0;</div><div class='add'>+		if (i &gt; IL39_LAST_OFDM_RATE || i &lt; IL_FIRST_OFDM_RATE) {</div><div class='add'>+			/*</div><div class='add'>+			 * If CCK != 1M then set short preamble rate flag.</div><div class='add'>+			 */</div><div class='add'>+			rates[i].flags |=</div><div class='add'>+			    (il3945_rates[i].plcp ==</div><div class='add'>+			     10) ? 0 : IEEE80211_RATE_SHORT_PREAMBLE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * uCode download functions</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_dealloc_ucode_pci(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	il_free_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_code);</div><div class='add'>+	il_free_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_data);</div><div class='add'>+	il_free_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_data_backup);</div><div class='add'>+	il_free_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_init);</div><div class='add'>+	il_free_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_init_data);</div><div class='add'>+	il_free_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_boot);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_verify_inst_full - verify runtime uCode image in card vs. host,</div><div class='add'>+ *     looking at all data.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il3945_verify_inst_full(struct il_priv *il, __le32 * image, u32 len)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	u32 save_len = len;</div><div class='add'>+	int rc = 0;</div><div class='add'>+	u32 errcnt;</div><div class='add'>+</div><div class='add'>+	D_INFO("ucode inst image size is %u\n", len);</div><div class='add'>+</div><div class='add'>+	il_wr(il, HBUS_TARG_MEM_RADDR, IL39_RTC_INST_LOWER_BOUND);</div><div class='add'>+</div><div class='add'>+	errcnt = 0;</div><div class='add'>+	for (; len &gt; 0; len -= sizeof(u32), image++) {</div><div class='add'>+		/* read data comes through single port, auto-incr addr */</div><div class='add'>+		/* NOTE: Use the debugless read so we don't flood kernel log</div><div class='add'>+		 * if IL_DL_IO is set */</div><div class='add'>+		val = _il_rd(il, HBUS_TARG_MEM_RDAT);</div><div class='add'>+		if (val != le32_to_cpu(*image)) {</div><div class='add'>+			IL_ERR("uCode INST section is invalid at "</div><div class='add'>+			       "offset 0x%x, is 0x%x, s/b 0x%x\n",</div><div class='add'>+			       save_len - len, val, le32_to_cpu(*image));</div><div class='add'>+			rc = -EIO;</div><div class='add'>+			errcnt++;</div><div class='add'>+			if (errcnt &gt;= 20)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!errcnt)</div><div class='add'>+		D_INFO("ucode image in INSTRUCTION memory is good\n");</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'>+ * il3945_verify_inst_sparse - verify runtime uCode image in card vs. host,</div><div class='add'>+ *   using sample data 100 bytes apart.  If these sample points are good,</div><div class='add'>+ *   it's a pretty good bet that everything between them is good, too.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il3945_verify_inst_sparse(struct il_priv *il, __le32 * image, u32 len)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int rc = 0;</div><div class='add'>+	u32 errcnt = 0;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	D_INFO("ucode inst image size is %u\n", len);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i += 100, image += 100 / sizeof(u32)) {</div><div class='add'>+		/* read data comes through single port, auto-incr addr */</div><div class='add'>+		/* NOTE: Use the debugless read so we don't flood kernel log</div><div class='add'>+		 * if IL_DL_IO is set */</div><div class='add'>+		il_wr(il, HBUS_TARG_MEM_RADDR, i + IL39_RTC_INST_LOWER_BOUND);</div><div class='add'>+		val = _il_rd(il, HBUS_TARG_MEM_RDAT);</div><div class='add'>+		if (val != le32_to_cpu(*image)) {</div><div class='add'>+#if 0				/* Enable this if you want to see details */</div><div class='add'>+			IL_ERR("uCode INST section is invalid at "</div><div class='add'>+			       "offset 0x%x, is 0x%x, s/b 0x%x\n", i, val,</div><div class='add'>+			       *image);</div><div class='add'>+#endif</div><div class='add'>+			rc = -EIO;</div><div class='add'>+			errcnt++;</div><div class='add'>+			if (errcnt &gt;= 3)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_verify_ucode - determine which instruction image is in SRAM,</div><div class='add'>+ *    and verify its contents</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il3945_verify_ucode(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	__le32 *image;</div><div class='add'>+	u32 len;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	/* Try bootstrap */</div><div class='add'>+	image = (__le32 *) il-&gt;ucode_boot.v_addr;</div><div class='add'>+	len = il-&gt;ucode_boot.len;</div><div class='add'>+	rc = il3945_verify_inst_sparse(il, image, len);</div><div class='add'>+	if (rc == 0) {</div><div class='add'>+		D_INFO("Bootstrap uCode is good in inst SRAM\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Try initialize */</div><div class='add'>+	image = (__le32 *) il-&gt;ucode_init.v_addr;</div><div class='add'>+	len = il-&gt;ucode_init.len;</div><div class='add'>+	rc = il3945_verify_inst_sparse(il, image, len);</div><div class='add'>+	if (rc == 0) {</div><div class='add'>+		D_INFO("Initialize uCode is good in inst SRAM\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Try runtime/protocol */</div><div class='add'>+	image = (__le32 *) il-&gt;ucode_code.v_addr;</div><div class='add'>+	len = il-&gt;ucode_code.len;</div><div class='add'>+	rc = il3945_verify_inst_sparse(il, image, len);</div><div class='add'>+	if (rc == 0) {</div><div class='add'>+		D_INFO("Runtime uCode is good in inst SRAM\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IL_ERR("NO VALID UCODE IMAGE IN INSTRUCTION SRAM!!\n");</div><div class='add'>+</div><div class='add'>+	/* Since nothing seems to match, show first several data entries in</div><div class='add'>+	 * instruction SRAM, so maybe visual inspection will give a clue.</div><div class='add'>+	 * Selection of bootstrap image (vs. other images) is arbitrary. */</div><div class='add'>+	image = (__le32 *) il-&gt;ucode_boot.v_addr;</div><div class='add'>+	len = il-&gt;ucode_boot.len;</div><div class='add'>+	rc = il3945_verify_inst_full(il, image, len);</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'>+il3945_nic_start(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	/* Remove all resets to allow NIC to operate */</div><div class='add'>+	_il_wr(il, CSR_RESET, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IL3945_UCODE_GET(item)						\</div><div class='add'>+static u32 il3945_ucode_get_##item(const struct il_ucode_header *ucode)\</div><div class='add'>+{									\</div><div class='add'>+	return le32_to_cpu(ucode-&gt;v1.item);				\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+il3945_ucode_get_header_size(u32 api_ver)</div><div class='add'>+{</div><div class='add'>+	return 24;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *</div><div class='add'>+il3945_ucode_get_data(const struct il_ucode_header *ucode)</div><div class='add'>+{</div><div class='add'>+	return (u8 *) ucode-&gt;v1.data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+IL3945_UCODE_GET(inst_size);</div><div class='add'>+IL3945_UCODE_GET(data_size);</div><div class='add'>+IL3945_UCODE_GET(init_size);</div><div class='add'>+IL3945_UCODE_GET(init_data_size);</div><div class='add'>+IL3945_UCODE_GET(boot_size);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_read_ucode - Read uCode images from disk file.</div><div class='add'>+ *</div><div class='add'>+ * Copy into buffers for card to fetch via bus-mastering</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il3945_read_ucode(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	const struct il_ucode_header *ucode;</div><div class='add'>+	int ret = -EINVAL, idx;</div><div class='add'>+	const struct firmware *ucode_raw;</div><div class='add'>+	/* firmware file name contains uCode/driver compatibility version */</div><div class='add'>+	const char *name_pre = il-&gt;cfg-&gt;fw_name_pre;</div><div class='add'>+	const unsigned int api_max = il-&gt;cfg-&gt;ucode_api_max;</div><div class='add'>+	const unsigned int api_min = il-&gt;cfg-&gt;ucode_api_min;</div><div class='add'>+	char buf[25];</div><div class='add'>+	u8 *src;</div><div class='add'>+	size_t len;</div><div class='add'>+	u32 api_ver, inst_size, data_size, init_size, init_data_size, boot_size;</div><div class='add'>+</div><div class='add'>+	/* Ask kernel firmware_class module to get the boot firmware off disk.</div><div class='add'>+	 * request_firmware() is synchronous, file is in memory on return. */</div><div class='add'>+	for (idx = api_max; idx &gt;= api_min; idx--) {</div><div class='add'>+		sprintf(buf, "%s%u%s", name_pre, idx, ".ucode");</div><div class='add'>+		ret = request_firmware(&amp;ucode_raw, buf, &amp;il-&gt;pci_dev-&gt;dev);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			IL_ERR("%s firmware file req failed: %d\n", buf, ret);</div><div class='add'>+			if (ret == -ENOENT)</div><div class='add'>+				continue;</div><div class='add'>+			else</div><div class='add'>+				goto error;</div><div class='add'>+		} else {</div><div class='add'>+			if (idx &lt; api_max)</div><div class='add'>+				IL_ERR("Loaded firmware %s, "</div><div class='add'>+				       "which is deprecated. "</div><div class='add'>+				       " Please use API v%u instead.\n", buf,</div><div class='add'>+				       api_max);</div><div class='add'>+			D_INFO("Got firmware '%s' file "</div><div class='add'>+			       "(%zd bytes) from disk\n", buf, ucode_raw-&gt;size);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* Make sure that we got at least our header! */</div><div class='add'>+	if (ucode_raw-&gt;size &lt; il3945_ucode_get_header_size(1)) {</div><div class='add'>+		IL_ERR("File size way too small!\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_release;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Data from ucode file:  header followed by uCode images */</div><div class='add'>+	ucode = (struct il_ucode_header *)ucode_raw-&gt;data;</div><div class='add'>+</div><div class='add'>+	il-&gt;ucode_ver = le32_to_cpu(ucode-&gt;ver);</div><div class='add'>+	api_ver = IL_UCODE_API(il-&gt;ucode_ver);</div><div class='add'>+	inst_size = il3945_ucode_get_inst_size(ucode);</div><div class='add'>+	data_size = il3945_ucode_get_data_size(ucode);</div><div class='add'>+	init_size = il3945_ucode_get_init_size(ucode);</div><div class='add'>+	init_data_size = il3945_ucode_get_init_data_size(ucode);</div><div class='add'>+	boot_size = il3945_ucode_get_boot_size(ucode);</div><div class='add'>+	src = il3945_ucode_get_data(ucode);</div><div class='add'>+</div><div class='add'>+	/* api_ver should match the api version forming part of the</div><div class='add'>+	 * firmware filename ... but we don't check for that and only rely</div><div class='add'>+	 * on the API version read from firmware header from here on forward */</div><div class='add'>+</div><div class='add'>+	if (api_ver &lt; api_min || api_ver &gt; api_max) {</div><div class='add'>+		IL_ERR("Driver unable to support your firmware API. "</div><div class='add'>+		       "Driver supports v%u, firmware is v%u.\n", api_max,</div><div class='add'>+		       api_ver);</div><div class='add'>+		il-&gt;ucode_ver = 0;</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_release;</div><div class='add'>+	}</div><div class='add'>+	if (api_ver != api_max)</div><div class='add'>+		IL_ERR("Firmware has old API version. Expected %u, "</div><div class='add'>+		       "got %u. New firmware can be obtained "</div><div class='add'>+		       "from http://www.intellinuxwireless.org.\n", api_max,</div><div class='add'>+		       api_ver);</div><div class='add'>+</div><div class='add'>+	IL_INFO("loaded firmware version %u.%u.%u.%u\n",</div><div class='add'>+		IL_UCODE_MAJOR(il-&gt;ucode_ver), IL_UCODE_MINOR(il-&gt;ucode_ver),</div><div class='add'>+		IL_UCODE_API(il-&gt;ucode_ver), IL_UCODE_SERIAL(il-&gt;ucode_ver));</div><div class='add'>+</div><div class='add'>+	snprintf(il-&gt;hw-&gt;wiphy-&gt;fw_version, sizeof(il-&gt;hw-&gt;wiphy-&gt;fw_version),</div><div class='add'>+		 "%u.%u.%u.%u", IL_UCODE_MAJOR(il-&gt;ucode_ver),</div><div class='add'>+		 IL_UCODE_MINOR(il-&gt;ucode_ver), IL_UCODE_API(il-&gt;ucode_ver),</div><div class='add'>+		 IL_UCODE_SERIAL(il-&gt;ucode_ver));</div><div class='add'>+</div><div class='add'>+	D_INFO("f/w package hdr ucode version raw = 0x%x\n", il-&gt;ucode_ver);</div><div class='add'>+	D_INFO("f/w package hdr runtime inst size = %u\n", inst_size);</div><div class='add'>+	D_INFO("f/w package hdr runtime data size = %u\n", data_size);</div><div class='add'>+	D_INFO("f/w package hdr init inst size = %u\n", init_size);</div><div class='add'>+	D_INFO("f/w package hdr init data size = %u\n", init_data_size);</div><div class='add'>+	D_INFO("f/w package hdr boot inst size = %u\n", boot_size);</div><div class='add'>+</div><div class='add'>+	/* Verify size of file vs. image size info in file's header */</div><div class='add'>+	if (ucode_raw-&gt;size !=</div><div class='add'>+	    il3945_ucode_get_header_size(api_ver) + inst_size + data_size +</div><div class='add'>+	    init_size + init_data_size + boot_size) {</div><div class='add'>+</div><div class='add'>+		D_INFO("uCode file size %zd does not match expected size\n",</div><div class='add'>+		       ucode_raw-&gt;size);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_release;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Verify that uCode images will fit in card's SRAM */</div><div class='add'>+	if (inst_size &gt; IL39_MAX_INST_SIZE) {</div><div class='add'>+		D_INFO("uCode instr len %d too large to fit in\n", inst_size);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_release;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data_size &gt; IL39_MAX_DATA_SIZE) {</div><div class='add'>+		D_INFO("uCode data len %d too large to fit in\n", data_size);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_release;</div><div class='add'>+	}</div><div class='add'>+	if (init_size &gt; IL39_MAX_INST_SIZE) {</div><div class='add'>+		D_INFO("uCode init instr len %d too large to fit in\n",</div><div class='add'>+		       init_size);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_release;</div><div class='add'>+	}</div><div class='add'>+	if (init_data_size &gt; IL39_MAX_DATA_SIZE) {</div><div class='add'>+		D_INFO("uCode init data len %d too large to fit in\n",</div><div class='add'>+		       init_data_size);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_release;</div><div class='add'>+	}</div><div class='add'>+	if (boot_size &gt; IL39_MAX_BSM_SIZE) {</div><div class='add'>+		D_INFO("uCode boot instr len %d too large to fit in\n",</div><div class='add'>+		       boot_size);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_release;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate ucode buffers for card's bus-master loading ... */</div><div class='add'>+</div><div class='add'>+	/* Runtime instructions and 2 copies of data:</div><div class='add'>+	 * 1) unmodified from disk</div><div class='add'>+	 * 2) backup cache for save/restore during power-downs */</div><div class='add'>+	il-&gt;ucode_code.len = inst_size;</div><div class='add'>+	il_alloc_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_code);</div><div class='add'>+</div><div class='add'>+	il-&gt;ucode_data.len = data_size;</div><div class='add'>+	il_alloc_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_data);</div><div class='add'>+</div><div class='add'>+	il-&gt;ucode_data_backup.len = data_size;</div><div class='add'>+	il_alloc_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_data_backup);</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;ucode_code.v_addr || !il-&gt;ucode_data.v_addr ||</div><div class='add'>+	    !il-&gt;ucode_data_backup.v_addr)</div><div class='add'>+		goto err_pci_alloc;</div><div class='add'>+</div><div class='add'>+	/* Initialization instructions and data */</div><div class='add'>+	if (init_size &amp;&amp; init_data_size) {</div><div class='add'>+		il-&gt;ucode_init.len = init_size;</div><div class='add'>+		il_alloc_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_init);</div><div class='add'>+</div><div class='add'>+		il-&gt;ucode_init_data.len = init_data_size;</div><div class='add'>+		il_alloc_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_init_data);</div><div class='add'>+</div><div class='add'>+		if (!il-&gt;ucode_init.v_addr || !il-&gt;ucode_init_data.v_addr)</div><div class='add'>+			goto err_pci_alloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Bootstrap (instructions only, no data) */</div><div class='add'>+	if (boot_size) {</div><div class='add'>+		il-&gt;ucode_boot.len = boot_size;</div><div class='add'>+		il_alloc_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_boot);</div><div class='add'>+</div><div class='add'>+		if (!il-&gt;ucode_boot.v_addr)</div><div class='add'>+			goto err_pci_alloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy images into buffers for card's bus-master reads ... */</div><div class='add'>+</div><div class='add'>+	/* Runtime instructions (first block of data in file) */</div><div class='add'>+	len = inst_size;</div><div class='add'>+	D_INFO("Copying (but not loading) uCode instr len %zd\n", len);</div><div class='add'>+	memcpy(il-&gt;ucode_code.v_addr, src, len);</div><div class='add'>+	src += len;</div><div class='add'>+</div><div class='add'>+	D_INFO("uCode instr buf vaddr = 0x%p, paddr = 0x%08x\n",</div><div class='add'>+	       il-&gt;ucode_code.v_addr, (u32) il-&gt;ucode_code.p_addr);</div><div class='add'>+</div><div class='add'>+	/* Runtime data (2nd block)</div><div class='add'>+	 * NOTE:  Copy into backup buffer will be done in il3945_up()  */</div><div class='add'>+	len = data_size;</div><div class='add'>+	D_INFO("Copying (but not loading) uCode data len %zd\n", len);</div><div class='add'>+	memcpy(il-&gt;ucode_data.v_addr, src, len);</div><div class='add'>+	memcpy(il-&gt;ucode_data_backup.v_addr, src, len);</div><div class='add'>+	src += len;</div><div class='add'>+</div><div class='add'>+	/* Initialization instructions (3rd block) */</div><div class='add'>+	if (init_size) {</div><div class='add'>+		len = init_size;</div><div class='add'>+		D_INFO("Copying (but not loading) init instr len %zd\n", len);</div><div class='add'>+		memcpy(il-&gt;ucode_init.v_addr, src, len);</div><div class='add'>+		src += len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialization data (4th block) */</div><div class='add'>+	if (init_data_size) {</div><div class='add'>+		len = init_data_size;</div><div class='add'>+		D_INFO("Copying (but not loading) init data len %zd\n", len);</div><div class='add'>+		memcpy(il-&gt;ucode_init_data.v_addr, src, len);</div><div class='add'>+		src += len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Bootstrap instructions (5th block) */</div><div class='add'>+	len = boot_size;</div><div class='add'>+	D_INFO("Copying (but not loading) boot instr len %zd\n", len);</div><div class='add'>+	memcpy(il-&gt;ucode_boot.v_addr, src, len);</div><div class='add'>+</div><div class='add'>+	/* We have our copies now, allow OS release its copies */</div><div class='add'>+	release_firmware(ucode_raw);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_pci_alloc:</div><div class='add'>+	IL_ERR("failed to allocate pci memory\n");</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	il3945_dealloc_ucode_pci(il);</div><div class='add'>+</div><div class='add'>+err_release:</div><div class='add'>+	release_firmware(ucode_raw);</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_set_ucode_ptrs - Set uCode address location</div><div class='add'>+ *</div><div class='add'>+ * Tell initialization uCode where to find runtime uCode.</div><div class='add'>+ *</div><div class='add'>+ * BSM registers initially contain pointers to initialization uCode.</div><div class='add'>+ * We need to replace them to load runtime uCode inst and data,</div><div class='add'>+ * and to save runtime data when powering down.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il3945_set_ucode_ptrs(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t pinst;</div><div class='add'>+	dma_addr_t pdata;</div><div class='add'>+</div><div class='add'>+	/* bits 31:0 for 3945 */</div><div class='add'>+	pinst = il-&gt;ucode_code.p_addr;</div><div class='add'>+	pdata = il-&gt;ucode_data_backup.p_addr;</div><div class='add'>+</div><div class='add'>+	/* Tell bootstrap uCode where to find image to load */</div><div class='add'>+	il_wr_prph(il, BSM_DRAM_INST_PTR_REG, pinst);</div><div class='add'>+	il_wr_prph(il, BSM_DRAM_DATA_PTR_REG, pdata);</div><div class='add'>+	il_wr_prph(il, BSM_DRAM_DATA_BYTECOUNT_REG, il-&gt;ucode_data.len);</div><div class='add'>+</div><div class='add'>+	/* Inst byte count must be last to set up, bit 31 signals uCode</div><div class='add'>+	 *   that all new ptr/size info is in place */</div><div class='add'>+	il_wr_prph(il, BSM_DRAM_INST_BYTECOUNT_REG,</div><div class='add'>+		   il-&gt;ucode_code.len | BSM_DRAM_INST_LOAD);</div><div class='add'>+</div><div class='add'>+	D_INFO("Runtime uCode pointers are set.\n");</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'>+ * il3945_init_alive_start - Called after N_ALIVE notification received</div><div class='add'>+ *</div><div class='add'>+ * Called after N_ALIVE notification received from "initialize" uCode.</div><div class='add'>+ *</div><div class='add'>+ * Tell "initialize" uCode to go ahead and load the runtime uCode.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il3945_init_alive_start(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	/* Check alive response for "valid" sign from uCode */</div><div class='add'>+	if (il-&gt;card_alive_init.is_valid != UCODE_VALID_OK) {</div><div class='add'>+		/* We had an error bringing up the hardware, so take it</div><div class='add'>+		 * all the way back down so we can try again */</div><div class='add'>+		D_INFO("Initialize Alive failed.\n");</div><div class='add'>+		goto restart;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Bootstrap uCode has loaded initialize uCode ... verify inst image.</div><div class='add'>+	 * This is a paranoid check, because we would not have gotten the</div><div class='add'>+	 * "initialize" alive if code weren't properly loaded.  */</div><div class='add'>+	if (il3945_verify_ucode(il)) {</div><div class='add'>+		/* Runtime instruction load was bad;</div><div class='add'>+		 * take it all the way back down so we can try again */</div><div class='add'>+		D_INFO("Bad \"initialize\" uCode load.\n");</div><div class='add'>+		goto restart;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Send pointers to protocol/runtime uCode image ... init code will</div><div class='add'>+	 * load and launch runtime uCode, which will send us another "Alive"</div><div class='add'>+	 * notification. */</div><div class='add'>+	D_INFO("Initialization Alive received.\n");</div><div class='add'>+	if (il3945_set_ucode_ptrs(il)) {</div><div class='add'>+		/* Runtime instruction load won't happen;</div><div class='add'>+		 * take it all the way back down so we can try again */</div><div class='add'>+		D_INFO("Couldn't set up uCode pointers.\n");</div><div class='add'>+		goto restart;</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+restart:</div><div class='add'>+	queue_work(il-&gt;workqueue, &amp;il-&gt;restart);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_alive_start - called after N_ALIVE notification received</div><div class='add'>+ *                   from protocol/runtime uCode (initialization uCode's</div><div class='add'>+ *                   Alive gets handled by il3945_init_alive_start()).</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il3945_alive_start(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int thermal_spin = 0;</div><div class='add'>+	u32 rfkill;</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	D_INFO("Runtime Alive received.\n");</div><div class='add'>+</div><div class='add'>+	if (il-&gt;card_alive.is_valid != UCODE_VALID_OK) {</div><div class='add'>+		/* We had an error bringing up the hardware, so take it</div><div class='add'>+		 * all the way back down so we can try again */</div><div class='add'>+		D_INFO("Alive failed.\n");</div><div class='add'>+		goto restart;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize uCode has loaded Runtime uCode ... verify inst image.</div><div class='add'>+	 * This is a paranoid check, because we would not have gotten the</div><div class='add'>+	 * "runtime" alive if code weren't properly loaded.  */</div><div class='add'>+	if (il3945_verify_ucode(il)) {</div><div class='add'>+		/* Runtime instruction load was bad;</div><div class='add'>+		 * take it all the way back down so we can try again */</div><div class='add'>+		D_INFO("Bad runtime uCode load.\n");</div><div class='add'>+		goto restart;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rfkill = il_rd_prph(il, APMG_RFKILL_REG);</div><div class='add'>+	D_INFO("RFKILL status: 0x%x\n", rfkill);</div><div class='add'>+</div><div class='add'>+	if (rfkill &amp; 0x1) {</div><div class='add'>+		clear_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+		/* if RFKILL is not on, then wait for thermal</div><div class='add'>+		 * sensor in adapter to kick in */</div><div class='add'>+		while (il3945_hw_get_temperature(il) == 0) {</div><div class='add'>+			thermal_spin++;</div><div class='add'>+			udelay(10);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (thermal_spin)</div><div class='add'>+			D_INFO("Thermal calibration took %dus\n",</div><div class='add'>+			       thermal_spin * 10);</div><div class='add'>+	} else</div><div class='add'>+		set_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* After the ALIVE response, we can send commands to 3945 uCode */</div><div class='add'>+	set_bit(S_ALIVE, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* Enable watchdog to monitor the driver tx queues */</div><div class='add'>+	il_setup_watchdog(il);</div><div class='add'>+</div><div class='add'>+	if (il_is_rfkill(il))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ieee80211_wake_queues(il-&gt;hw);</div><div class='add'>+</div><div class='add'>+	il-&gt;active_rate = RATES_MASK_3945;</div><div class='add'>+</div><div class='add'>+	il_power_update_mode(il, true);</div><div class='add'>+</div><div class='add'>+	if (il_is_associated(il)) {</div><div class='add'>+		struct il3945_rxon_cmd *active_rxon =</div><div class='add'>+		    (struct il3945_rxon_cmd *)(&amp;ctx-&gt;active);</div><div class='add'>+</div><div class='add'>+		ctx-&gt;staging.filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='add'>+		active_rxon-&gt;filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='add'>+	} else {</div><div class='add'>+		/* Initialize our rx_config data */</div><div class='add'>+		il_connection_init_rx_config(il, ctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure Bluetooth device coexistence support */</div><div class='add'>+	il_send_bt_config(il);</div><div class='add'>+</div><div class='add'>+	set_bit(S_READY, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* Configure the adapter for unassociated operation */</div><div class='add'>+	il3945_commit_rxon(il, ctx);</div><div class='add'>+</div><div class='add'>+	il3945_reg_txpower_periodic(il);</div><div class='add'>+</div><div class='add'>+	D_INFO("ALIVE processing complete.\n");</div><div class='add'>+	wake_up(&amp;il-&gt;wait_command_queue);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+restart:</div><div class='add'>+	queue_work(il-&gt;workqueue, &amp;il-&gt;restart);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void il3945_cancel_deferred_work(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+__il3945_down(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int exit_pending;</div><div class='add'>+</div><div class='add'>+	D_INFO(DRV_NAME " is going down\n");</div><div class='add'>+</div><div class='add'>+	il_scan_cancel_timeout(il, 200);</div><div class='add'>+</div><div class='add'>+	exit_pending = test_and_set_bit(S_EXIT_PENDING, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* Stop TX queues watchdog. We need to have S_EXIT_PENDING bit set</div><div class='add'>+	 * to prevent rearm timer */</div><div class='add'>+	del_timer_sync(&amp;il-&gt;watchdog);</div><div class='add'>+</div><div class='add'>+	/* Station information will now be cleared in device */</div><div class='add'>+	il_clear_ucode_stations(il, NULL);</div><div class='add'>+	il_dealloc_bcast_stations(il);</div><div class='add'>+	il_clear_driver_stations(il);</div><div class='add'>+</div><div class='add'>+	/* Unblock any waiting calls */</div><div class='add'>+	wake_up_all(&amp;il-&gt;wait_command_queue);</div><div class='add'>+</div><div class='add'>+	/* Wipe out the EXIT_PENDING status bit if we are not actually</div><div class='add'>+	 * exiting the module */</div><div class='add'>+	if (!exit_pending)</div><div class='add'>+		clear_bit(S_EXIT_PENDING, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* stop and reset the on-board processor */</div><div class='add'>+	_il_wr(il, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);</div><div class='add'>+</div><div class='add'>+	/* tell the device to stop sending interrupts */</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+	il_disable_interrupts(il);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+	il3945_synchronize_irq(il);</div><div class='add'>+</div><div class='add'>+	if (il-&gt;mac80211_registered)</div><div class='add'>+		ieee80211_stop_queues(il-&gt;hw);</div><div class='add'>+</div><div class='add'>+	/* If we have not previously called il3945_init() then</div><div class='add'>+	 * clear all bits but the RF Kill bits and return */</div><div class='add'>+	if (!il_is_init(il)) {</div><div class='add'>+		il-&gt;status =</div><div class='add'>+		    test_bit(S_RF_KILL_HW,</div><div class='add'>+			     &amp;il-&gt;</div><div class='add'>+			     status) &lt;&lt; S_RF_KILL_HW |</div><div class='add'>+		    test_bit(S_GEO_CONFIGURED,</div><div class='add'>+			     &amp;il-&gt;</div><div class='add'>+			     status) &lt;&lt; S_GEO_CONFIGURED |</div><div class='add'>+		    test_bit(S_EXIT_PENDING, &amp;il-&gt;status) &lt;&lt; S_EXIT_PENDING;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ...otherwise clear out all the status bits but the RF Kill</div><div class='add'>+	 * bit and continue taking the NIC down. */</div><div class='add'>+	il-&gt;status &amp;=</div><div class='add'>+	    test_bit(S_RF_KILL_HW,</div><div class='add'>+		     &amp;il-&gt;status) &lt;&lt; S_RF_KILL_HW | test_bit(S_GEO_CONFIGURED,</div><div class='add'>+							     &amp;il-&gt;</div><div class='add'>+							     status) &lt;&lt;</div><div class='add'>+	    S_GEO_CONFIGURED | test_bit(S_FW_ERROR,</div><div class='add'>+					&amp;il-&gt;</div><div class='add'>+					status) &lt;&lt; S_FW_ERROR |</div><div class='add'>+	    test_bit(S_EXIT_PENDING, &amp;il-&gt;status) &lt;&lt; S_EXIT_PENDING;</div><div class='add'>+</div><div class='add'>+	il3945_hw_txq_ctx_stop(il);</div><div class='add'>+	il3945_hw_rxq_stop(il);</div><div class='add'>+</div><div class='add'>+	/* Power-down device's busmaster DMA clocks */</div><div class='add'>+	il_wr_prph(il, APMG_CLK_DIS_REG, APMG_CLK_VAL_DMA_CLK_RQT);</div><div class='add'>+	udelay(5);</div><div class='add'>+</div><div class='add'>+	/* Stop the device, and put it in low power state */</div><div class='add'>+	il_apm_stop(il);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	memset(&amp;il-&gt;card_alive, 0, sizeof(struct il_alive_resp));</div><div class='add'>+</div><div class='add'>+	if (il-&gt;beacon_skb)</div><div class='add'>+		dev_kfree_skb(il-&gt;beacon_skb);</div><div class='add'>+	il-&gt;beacon_skb = NULL;</div><div class='add'>+</div><div class='add'>+	/* clear out any free frames */</div><div class='add'>+	il3945_clear_free_frames(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_down(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	__il3945_down(il);</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	il3945_cancel_deferred_work(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MAX_HW_RESTARTS 5</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il3945_alloc_bcast_station(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	sta_id = il_prep_station(il, ctx, il_bcast_addr, false, NULL);</div><div class='add'>+	if (sta_id == IL_INVALID_STATION) {</div><div class='add'>+		IL_ERR("Unable to prepare broadcast station\n");</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il-&gt;stations[sta_id].used |= IL_STA_DRIVER_ACTIVE;</div><div class='add'>+	il-&gt;stations[sta_id].used |= IL_STA_BCAST;</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_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</div><div class='add'>+__il3945_up(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int rc, i;</div><div class='add'>+</div><div class='add'>+	rc = il3945_alloc_bcast_station(il);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status)) {</div><div class='add'>+		IL_WARN("Exit pending; will not bring the NIC up\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;ucode_data_backup.v_addr || !il-&gt;ucode_data.v_addr) {</div><div class='add'>+		IL_ERR("ucode not available for device bring up\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If platform's RF_KILL switch is NOT set to KILL */</div><div class='add'>+	if (_il_rd(il, CSR_GP_CNTRL) &amp; CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)</div><div class='add'>+		clear_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+	else {</div><div class='add'>+		set_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+		IL_WARN("Radio disabled by HW RF Kill switch\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	_il_wr(il, CSR_INT, 0xFFFFFFFF);</div><div class='add'>+</div><div class='add'>+	rc = il3945_hw_nic_init(il);</div><div class='add'>+	if (rc) {</div><div class='add'>+		IL_ERR("Unable to int nic\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* make sure rfkill handshake bits are cleared */</div><div class='add'>+	_il_wr(il, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);</div><div class='add'>+	_il_wr(il, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);</div><div class='add'>+</div><div class='add'>+	/* clear (again), then enable host interrupts */</div><div class='add'>+	_il_wr(il, CSR_INT, 0xFFFFFFFF);</div><div class='add'>+	il_enable_interrupts(il);</div><div class='add'>+</div><div class='add'>+	/* really make sure rfkill handshake bits are cleared */</div><div class='add'>+	_il_wr(il, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);</div><div class='add'>+	_il_wr(il, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);</div><div class='add'>+</div><div class='add'>+	/* Copy original ucode data image from disk into backup cache.</div><div class='add'>+	 * This will be used to initialize the on-board processor's</div><div class='add'>+	 * data SRAM for a clean start when the runtime program first loads. */</div><div class='add'>+	memcpy(il-&gt;ucode_data_backup.v_addr, il-&gt;ucode_data.v_addr,</div><div class='add'>+	       il-&gt;ucode_data.len);</div><div class='add'>+</div><div class='add'>+	/* We return success when we resume from suspend and rf_kill is on. */</div><div class='add'>+	if (test_bit(S_RF_KILL_HW, &amp;il-&gt;status))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_HW_RESTARTS; i++) {</div><div class='add'>+</div><div class='add'>+		/* load bootstrap state machine,</div><div class='add'>+		 * load bootstrap program into processor's memory,</div><div class='add'>+		 * prepare to load the "initialize" uCode */</div><div class='add'>+		rc = il-&gt;cfg-&gt;ops-&gt;lib-&gt;load_ucode(il);</div><div class='add'>+</div><div class='add'>+		if (rc) {</div><div class='add'>+			IL_ERR("Unable to set up bootstrap uCode: %d\n", rc);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* start card; "initialize" will load runtime ucode */</div><div class='add'>+		il3945_nic_start(il);</div><div class='add'>+</div><div class='add'>+		D_INFO(DRV_NAME " is coming up\n");</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_bit(S_EXIT_PENDING, &amp;il-&gt;status);</div><div class='add'>+	__il3945_down(il);</div><div class='add'>+	clear_bit(S_EXIT_PENDING, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* tried to restart and config the device for as long as our</div><div class='add'>+	 * patience could withstand */</div><div class='add'>+	IL_ERR("Unable to initialize device after %d attempts.\n", i);</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Workqueue callbacks</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_bg_init_alive_start(struct work_struct *data)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il =</div><div class='add'>+	    container_of(data, struct il_priv, init_alive_start.work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	il3945_init_alive_start(il);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_bg_alive_start(struct work_struct *data)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il =</div><div class='add'>+	    container_of(data, struct il_priv, alive_start.work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	il3945_alive_start(il);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 3945 cannot interrupt driver when hardware rf kill switch toggles;</div><div class='add'>+ * driver must poll CSR_GP_CNTRL_REG register for change.  This register</div><div class='add'>+ * *is* readable even when device has been SW_RESET into low power mode</div><div class='add'>+ * (e.g. during RF KILL).</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il3945_rfkill_poll(struct work_struct *data)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il =</div><div class='add'>+	    container_of(data, struct il_priv, _3945.rfkill_poll.work);</div><div class='add'>+	bool old_rfkill = test_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+	bool new_rfkill =</div><div class='add'>+	    !(_il_rd(il, CSR_GP_CNTRL) &amp; CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW);</div><div class='add'>+</div><div class='add'>+	if (new_rfkill != old_rfkill) {</div><div class='add'>+		if (new_rfkill)</div><div class='add'>+			set_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+		else</div><div class='add'>+			clear_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+		wiphy_rfkill_set_hw_state(il-&gt;hw-&gt;wiphy, new_rfkill);</div><div class='add'>+</div><div class='add'>+		D_RF_KILL("RF_KILL bit toggled to %s.\n",</div><div class='add'>+			  new_rfkill ? "disable radio" : "enable radio");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Keep this running, even if radio now enabled.  This will be</div><div class='add'>+	 * cancelled in mac_start() if system decides to start again */</div><div class='add'>+	queue_delayed_work(il-&gt;workqueue, &amp;il-&gt;_3945.rfkill_poll,</div><div class='add'>+			   round_jiffies_relative(2 * HZ));</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il3945_request_scan(struct il_priv *il, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct il_host_cmd cmd = {</div><div class='add'>+		.id = C_SCAN,</div><div class='add'>+		.len = sizeof(struct il3945_scan_cmd),</div><div class='add'>+		.flags = CMD_SIZE_HUGE,</div><div class='add'>+	};</div><div class='add'>+	struct il3945_scan_cmd *scan;</div><div class='add'>+	u8 n_probes = 0;</div><div class='add'>+	enum ieee80211_band band;</div><div class='add'>+	bool is_active = false;</div><div class='add'>+	int ret;</div><div class='add'>+	u16 len;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;scan_cmd) {</div><div class='add'>+		il-&gt;scan_cmd =</div><div class='add'>+		    kmalloc(sizeof(struct il3945_scan_cmd) + IL_MAX_SCAN_SIZE,</div><div class='add'>+			    GFP_KERNEL);</div><div class='add'>+		if (!il-&gt;scan_cmd) {</div><div class='add'>+			D_SCAN("Fail to allocate scan memory\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	scan = il-&gt;scan_cmd;</div><div class='add'>+	memset(scan, 0, sizeof(struct il3945_scan_cmd) + IL_MAX_SCAN_SIZE);</div><div class='add'>+</div><div class='add'>+	scan-&gt;quiet_plcp_th = IL_PLCP_QUIET_THRESH;</div><div class='add'>+	scan-&gt;quiet_time = IL_ACTIVE_QUIET_TIME;</div><div class='add'>+</div><div class='add'>+	if (il_is_associated(il)) {</div><div class='add'>+		u16 interval;</div><div class='add'>+		u32 extra;</div><div class='add'>+		u32 suspend_time = 100;</div><div class='add'>+		u32 scan_suspend_time = 100;</div><div class='add'>+</div><div class='add'>+		D_INFO("Scanning while associated...\n");</div><div class='add'>+</div><div class='add'>+		interval = vif-&gt;bss_conf.beacon_int;</div><div class='add'>+</div><div class='add'>+		scan-&gt;suspend_time = 0;</div><div class='add'>+		scan-&gt;max_out_time = cpu_to_le32(200 * 1024);</div><div class='add'>+		if (!interval)</div><div class='add'>+			interval = suspend_time;</div><div class='add'>+		/*</div><div class='add'>+		 * suspend time format:</div><div class='add'>+		 *  0-19: beacon interval in usec (time before exec.)</div><div class='add'>+		 * 20-23: 0</div><div class='add'>+		 * 24-31: number of beacons (suspend between channels)</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		extra = (suspend_time / interval) &lt;&lt; 24;</div><div class='add'>+		scan_suspend_time =</div><div class='add'>+		    0xFF0FFFFF &amp; (extra | ((suspend_time % interval) * 1024));</div><div class='add'>+</div><div class='add'>+		scan-&gt;suspend_time = cpu_to_le32(scan_suspend_time);</div><div class='add'>+		D_SCAN("suspend_time 0x%X beacon interval %d\n",</div><div class='add'>+		       scan_suspend_time, interval);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (il-&gt;scan_request-&gt;n_ssids) {</div><div class='add'>+		int i, p = 0;</div><div class='add'>+		D_SCAN("Kicking off active scan\n");</div><div class='add'>+		for (i = 0; i &lt; il-&gt;scan_request-&gt;n_ssids; i++) {</div><div class='add'>+			/* always does wildcard anyway */</div><div class='add'>+			if (!il-&gt;scan_request-&gt;ssids[i].ssid_len)</div><div class='add'>+				continue;</div><div class='add'>+			scan-&gt;direct_scan[p].id = WLAN_EID_SSID;</div><div class='add'>+			scan-&gt;direct_scan[p].len =</div><div class='add'>+			    il-&gt;scan_request-&gt;ssids[i].ssid_len;</div><div class='add'>+			memcpy(scan-&gt;direct_scan[p].ssid,</div><div class='add'>+			       il-&gt;scan_request-&gt;ssids[i].ssid,</div><div class='add'>+			       il-&gt;scan_request-&gt;ssids[i].ssid_len);</div><div class='add'>+			n_probes++;</div><div class='add'>+			p++;</div><div class='add'>+		}</div><div class='add'>+		is_active = true;</div><div class='add'>+	} else</div><div class='add'>+		D_SCAN("Kicking off passive scan.\n");</div><div class='add'>+</div><div class='add'>+	/* We don't build a direct scan probe request; the uCode will do</div><div class='add'>+	 * that based on the direct_mask added to each channel entry */</div><div class='add'>+	scan-&gt;tx_cmd.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='add'>+	scan-&gt;tx_cmd.sta_id = il-&gt;ctx.bcast_sta_id;</div><div class='add'>+	scan-&gt;tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;</div><div class='add'>+</div><div class='add'>+	/* flags + rate selection */</div><div class='add'>+</div><div class='add'>+	switch (il-&gt;scan_band) {</div><div class='add'>+	case IEEE80211_BAND_2GHZ:</div><div class='add'>+		scan-&gt;flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK;</div><div class='add'>+		scan-&gt;tx_cmd.rate = RATE_1M_PLCP;</div><div class='add'>+		band = IEEE80211_BAND_2GHZ;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_BAND_5GHZ:</div><div class='add'>+		scan-&gt;tx_cmd.rate = RATE_6M_PLCP;</div><div class='add'>+		band = IEEE80211_BAND_5GHZ;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		IL_WARN("Invalid scan band\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If active scaning is requested but a certain channel is marked</div><div class='add'>+	 * passive, we can do active scanning if we detect transmissions. For</div><div class='add'>+	 * passive only scanning disable switching to active on any channel.</div><div class='add'>+	 */</div><div class='add'>+	scan-&gt;good_CRC_th =</div><div class='add'>+	    is_active ? IL_GOOD_CRC_TH_DEFAULT : IL_GOOD_CRC_TH_NEVER;</div><div class='add'>+</div><div class='add'>+	len =</div><div class='add'>+	    il_fill_probe_req(il, (struct ieee80211_mgmt *)scan-&gt;data,</div><div class='add'>+			      vif-&gt;addr, il-&gt;scan_request-&gt;ie,</div><div class='add'>+			      il-&gt;scan_request-&gt;ie_len,</div><div class='add'>+			      IL_MAX_SCAN_SIZE - sizeof(*scan));</div><div class='add'>+	scan-&gt;tx_cmd.len = cpu_to_le16(len);</div><div class='add'>+</div><div class='add'>+	/* select Rx antennas */</div><div class='add'>+	scan-&gt;flags |= il3945_get_antenna_flags(il);</div><div class='add'>+</div><div class='add'>+	scan-&gt;channel_count =</div><div class='add'>+	    il3945_get_channels_for_scan(il, band, is_active, n_probes,</div><div class='add'>+					 (void *)&amp;scan-&gt;data[len], vif);</div><div class='add'>+	if (scan-&gt;channel_count == 0) {</div><div class='add'>+		D_SCAN("channel count %d\n", scan-&gt;channel_count);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd.len +=</div><div class='add'>+	    le16_to_cpu(scan-&gt;tx_cmd.len) +</div><div class='add'>+	    scan-&gt;channel_count * sizeof(struct il3945_scan_channel);</div><div class='add'>+	cmd.data = scan;</div><div class='add'>+	scan-&gt;len = cpu_to_le16(cmd.len);</div><div class='add'>+</div><div class='add'>+	set_bit(S_SCAN_HW, &amp;il-&gt;status);</div><div class='add'>+	ret = il_send_cmd_sync(il, &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		clear_bit(S_SCAN_HW, &amp;il-&gt;status);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il3945_post_scan(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Since setting the RXON may have been deferred while</div><div class='add'>+	 * performing the scan, fire one off if needed</div><div class='add'>+	 */</div><div class='add'>+	if (memcmp(&amp;ctx-&gt;staging, &amp;ctx-&gt;active, sizeof(ctx-&gt;staging)))</div><div class='add'>+		il3945_commit_rxon(il, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_bg_restart(struct work_struct *data)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = container_of(data, struct il_priv, restart);</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(S_FW_ERROR, &amp;il-&gt;status)) {</div><div class='add'>+		mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+		il-&gt;ctx.vif = NULL;</div><div class='add'>+		il-&gt;is_open = 0;</div><div class='add'>+		mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+		il3945_down(il);</div><div class='add'>+		ieee80211_restart_hw(il-&gt;hw);</div><div class='add'>+	} else {</div><div class='add'>+		il3945_down(il);</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+		if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status)) {</div><div class='add'>+			mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		__il3945_up(il);</div><div class='add'>+		mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_bg_rx_replenish(struct work_struct *data)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = container_of(data, struct il_priv, rx_replenish);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	il3945_rx_replenish(il);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il3945_post_associate(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+	struct ieee80211_conf *conf = NULL;</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	if (!ctx-&gt;vif || !il-&gt;is_open)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	D_ASSOC("Associated as %d to: %pM\n", ctx-&gt;vif-&gt;bss_conf.aid,</div><div class='add'>+		ctx-&gt;active.bssid_addr);</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	il_scan_cancel_timeout(il, 200);</div><div class='add'>+</div><div class='add'>+	conf = &amp;il-&gt;hw-&gt;conf;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;staging.filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='add'>+	il3945_commit_rxon(il, ctx);</div><div class='add'>+</div><div class='add'>+	rc = il_send_rxon_timing(il, ctx);</div><div class='add'>+	if (rc)</div><div class='add'>+		IL_WARN("C_RXON_TIMING failed - " "Attempting to continue.\n");</div><div class='add'>+</div><div class='add'>+	ctx-&gt;staging.filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;staging.assoc_id = cpu_to_le16(ctx-&gt;vif-&gt;bss_conf.aid);</div><div class='add'>+</div><div class='add'>+	D_ASSOC("assoc id %d beacon interval %d\n", ctx-&gt;vif-&gt;bss_conf.aid,</div><div class='add'>+		ctx-&gt;vif-&gt;bss_conf.beacon_int);</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;vif-&gt;bss_conf.use_short_preamble)</div><div class='add'>+		ctx-&gt;staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='add'>+	else</div><div class='add'>+		ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;staging.flags &amp; RXON_FLG_BAND_24G_MSK) {</div><div class='add'>+		if (ctx-&gt;vif-&gt;bss_conf.use_short_slot)</div><div class='add'>+			ctx-&gt;staging.flags |= RXON_FLG_SHORT_SLOT_MSK;</div><div class='add'>+		else</div><div class='add'>+			ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_SLOT_MSK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il3945_commit_rxon(il, ctx);</div><div class='add'>+</div><div class='add'>+	switch (ctx-&gt;vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		il3945_rate_scale_init(il-&gt;hw, IL_AP_ID);</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		il3945_send_beacon_cmd(il);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		IL_ERR("%s Should not be called in %d mode\n", __func__,</div><div class='add'>+		       ctx-&gt;vif-&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'>+ *</div><div class='add'>+ * mac80211 entry point functions</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define UCODE_READY_TIMEOUT	(2 * HZ)</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il3945_mac_start(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	D_MAC80211("enter\n");</div><div class='add'>+</div><div class='add'>+	/* we should be verifying the device is ready to be opened */</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* fetch ucode file from disk, alloc and copy to bus-master buffers ...</div><div class='add'>+	 * ucode filename and max sizes are card-specific. */</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;ucode_code.len) {</div><div class='add'>+		ret = il3945_read_ucode(il);</div><div class='add'>+		if (ret) {</div><div class='add'>+			IL_ERR("Could not read microcode: %d\n", ret);</div><div class='add'>+			mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+			goto out_release_irq;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = __il3945_up(il);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_release_irq;</div><div class='add'>+</div><div class='add'>+	D_INFO("Start UP work.\n");</div><div class='add'>+</div><div class='add'>+	/* Wait for START_ALIVE from ucode. Otherwise callbacks from</div><div class='add'>+	 * mac80211 will not be run successfully. */</div><div class='add'>+	ret = wait_event_timeout(il-&gt;wait_command_queue,</div><div class='add'>+				 test_bit(S_READY, &amp;il-&gt;status),</div><div class='add'>+				 UCODE_READY_TIMEOUT);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (!test_bit(S_READY, &amp;il-&gt;status)) {</div><div class='add'>+			IL_ERR("Wait for START_ALIVE timeout after %dms.\n",</div><div class='add'>+			       jiffies_to_msecs(UCODE_READY_TIMEOUT));</div><div class='add'>+			ret = -ETIMEDOUT;</div><div class='add'>+			goto out_release_irq;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ucode is running and will send rfkill notifications,</div><div class='add'>+	 * no need to poll the killswitch state anymore */</div><div class='add'>+	cancel_delayed_work(&amp;il-&gt;_3945.rfkill_poll);</div><div class='add'>+</div><div class='add'>+	il-&gt;is_open = 1;</div><div class='add'>+	D_MAC80211("leave\n");</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_release_irq:</div><div class='add'>+	il-&gt;is_open = 0;</div><div class='add'>+	D_MAC80211("leave - failed\n");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_mac_stop(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	D_MAC80211("enter\n");</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;is_open) {</div><div class='add'>+		D_MAC80211("leave - skip\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il-&gt;is_open = 0;</div><div class='add'>+</div><div class='add'>+	il3945_down(il);</div><div class='add'>+</div><div class='add'>+	flush_workqueue(il-&gt;workqueue);</div><div class='add'>+</div><div class='add'>+	/* start polling the killswitch state again */</div><div class='add'>+	queue_delayed_work(il-&gt;workqueue, &amp;il-&gt;_3945.rfkill_poll,</div><div class='add'>+			   round_jiffies_relative(2 * HZ));</div><div class='add'>+</div><div class='add'>+	D_MAC80211("leave\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	D_MAC80211("enter\n");</div><div class='add'>+</div><div class='add'>+	D_TX("dev-&gt;xmit(%d bytes) at rate 0x%02x\n", skb-&gt;len,</div><div class='add'>+	     ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))-&gt;bitrate);</div><div class='add'>+</div><div class='add'>+	if (il3945_tx_skb(il, skb))</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+</div><div class='add'>+	D_MAC80211("leave\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il3945_config_ap(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+	struct ieee80211_vif *vif = ctx-&gt;vif;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* The following should be done only at AP bring up */</div><div class='add'>+	if (!(il_is_associated(il))) {</div><div class='add'>+</div><div class='add'>+		/* RXON - unassoc (to set timing command) */</div><div class='add'>+		ctx-&gt;staging.filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='add'>+		il3945_commit_rxon(il, ctx);</div><div class='add'>+</div><div class='add'>+		/* RXON Timing */</div><div class='add'>+		rc = il_send_rxon_timing(il, ctx);</div><div class='add'>+		if (rc)</div><div class='add'>+			IL_WARN("C_RXON_TIMING failed - "</div><div class='add'>+				"Attempting to continue.\n");</div><div class='add'>+</div><div class='add'>+		ctx-&gt;staging.assoc_id = 0;</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;bss_conf.use_short_preamble)</div><div class='add'>+			ctx-&gt;staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='add'>+		else</div><div class='add'>+			ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='add'>+</div><div class='add'>+		if (ctx-&gt;staging.flags &amp; RXON_FLG_BAND_24G_MSK) {</div><div class='add'>+			if (vif-&gt;bss_conf.use_short_slot)</div><div class='add'>+				ctx-&gt;staging.flags |= RXON_FLG_SHORT_SLOT_MSK;</div><div class='add'>+			else</div><div class='add'>+				ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_SLOT_MSK;</div><div class='add'>+		}</div><div class='add'>+		/* restore RXON assoc */</div><div class='add'>+		ctx-&gt;staging.filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='add'>+		il3945_commit_rxon(il, ctx);</div><div class='add'>+	}</div><div class='add'>+	il3945_send_beacon_cmd(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il3945_mac_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 il_priv *il = hw-&gt;priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u8 sta_id = IL_INVALID_STATION;</div><div class='add'>+	u8 static_key;</div><div class='add'>+</div><div class='add'>+	D_MAC80211("enter\n");</div><div class='add'>+</div><div class='add'>+	if (il3945_mod_params.sw_crypto) {</div><div class='add'>+		D_MAC80211("leave - hwcrypto disabled\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * To support IBSS RSN, don't program group keys in IBSS, the</div><div class='add'>+	 * hardware will then not attempt to decrypt the frames.</div><div class='add'>+	 */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_ADHOC &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'>+	static_key = !il_is_associated(il);</div><div class='add'>+</div><div class='add'>+	if (!static_key) {</div><div class='add'>+		sta_id = il_sta_id_or_broadcast(il, &amp;il-&gt;ctx, sta);</div><div class='add'>+		if (sta_id == IL_INVALID_STATION)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	il_scan_cancel_timeout(il, 100);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SET_KEY:</div><div class='add'>+		if (static_key)</div><div class='add'>+			ret = il3945_set_static_key(il, key);</div><div class='add'>+		else</div><div class='add'>+			ret = il3945_set_dynamic_key(il, key, sta_id);</div><div class='add'>+		D_MAC80211("enable hwcrypto key\n");</div><div class='add'>+		break;</div><div class='add'>+	case DISABLE_KEY:</div><div class='add'>+		if (static_key)</div><div class='add'>+			ret = il3945_remove_static_key(il);</div><div class='add'>+		else</div><div class='add'>+			ret = il3945_clear_sta_key_info(il, sta_id);</div><div class='add'>+		D_MAC80211("disable hwcrypto key\n");</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'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+	D_MAC80211("leave\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'>+il3945_mac_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		   struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	struct il3945_sta_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='add'>+	int ret;</div><div class='add'>+	bool is_ap = vif-&gt;type == NL80211_IFTYPE_STATION;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+</div><div class='add'>+	D_INFO("received request to add station %pM\n", sta-&gt;addr);</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	D_INFO("proceeding to add station %pM\n", sta-&gt;addr);</div><div class='add'>+	sta_priv-&gt;common.sta_id = IL_INVALID_STATION;</div><div class='add'>+</div><div class='add'>+	ret =</div><div class='add'>+	    il_add_station_common(il, &amp;il-&gt;ctx, sta-&gt;addr, is_ap, sta, &amp;sta_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IL_ERR("Unable to add station %pM (%d)\n", sta-&gt;addr, ret);</div><div class='add'>+		/* Should we return success if return code is EEXIST ? */</div><div class='add'>+		mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sta_priv-&gt;common.sta_id = sta_id;</div><div class='add'>+</div><div class='add'>+	/* Initialize rate scaling */</div><div class='add'>+	D_INFO("Initializing rate scaling for station %pM\n", sta-&gt;addr);</div><div class='add'>+	il3945_rs_rate_init(il, sta, sta_id);</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags,</div><div class='add'>+			unsigned int *total_flags, u64 multicast)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	__le32 filter_or = 0, filter_nand = 0;</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+</div><div class='add'>+#define CHK(test, flag)	do { \</div><div class='add'>+	if (*total_flags &amp; (test))		\</div><div class='add'>+		filter_or |= (flag);		\</div><div class='add'>+	else					\</div><div class='add'>+		filter_nand |= (flag);		\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+	D_MAC80211("Enter: changed: 0x%x, total: 0x%x\n", changed_flags,</div><div class='add'>+		   *total_flags);</div><div class='add'>+</div><div class='add'>+	CHK(FIF_OTHER_BSS | FIF_PROMISC_IN_BSS, RXON_FILTER_PROMISC_MSK);</div><div class='add'>+	CHK(FIF_CONTROL, RXON_FILTER_CTL2HOST_MSK);</div><div class='add'>+	CHK(FIF_BCN_PRBRESP_PROMISC, RXON_FILTER_BCON_AWARE_MSK);</div><div class='add'>+</div><div class='add'>+#undef CHK</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;staging.filter_flags &amp;= ~filter_nand;</div><div class='add'>+	ctx-&gt;staging.filter_flags |= filter_or;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Not committing directly because hardware can perform a scan,</div><div class='add'>+	 * but even if hw is ready, committing here breaks for some reason,</div><div class='add'>+	 * we'll eventually commit the filter flags change anyway.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Receiving all multicast frames is always enabled by the</div><div class='add'>+	 * default flags setup in il_connection_init_rx_config()</div><div class='add'>+	 * since we currently do not support programming multicast</div><div class='add'>+	 * filters into the device.</div><div class='add'>+	 */</div><div class='add'>+	*total_flags &amp;=</div><div class='add'>+	    FIF_OTHER_BSS | FIF_ALLMULTI | FIF_PROMISC_IN_BSS |</div><div class='add'>+	    FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;</div><div class='add'>+}</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'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The following adds a new attribute to the sysfs representation</div><div class='add'>+ * of this device driver (i.e. a new file in /sys/bus/pci/drivers/iwl/)</div><div class='add'>+ * used for controlling the debug level.</div><div class='add'>+ *</div><div class='add'>+ * See the level definitions in iwl for details.</div><div class='add'>+ *</div><div class='add'>+ * The debug_level being managed using sysfs below is a per device debug</div><div class='add'>+ * level that is used instead of the global debug level if it (the per</div><div class='add'>+ * device debug level) is set.</div><div class='add'>+ */</div><div class='add'>+static ssize_t</div><div class='add'>+il3945_show_debug_level(struct device *d, struct device_attribute *attr,</div><div class='add'>+			char *buf)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+	return sprintf(buf, "0x%08X\n", il_get_debug_level(il));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il3945_store_debug_level(struct device *d, struct device_attribute *attr,</div><div class='add'>+			 const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = strict_strtoul(buf, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		IL_INFO("%s is not in hex or decimal form.\n", buf);</div><div class='add'>+	else {</div><div class='add'>+		il-&gt;debug_level = val;</div><div class='add'>+		if (il_alloc_traffic_mem(il))</div><div class='add'>+			IL_ERR("Not enough memory to generate traffic log\n");</div><div class='add'>+	}</div><div class='add'>+	return strnlen(buf, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(debug_level, S_IWUSR | S_IRUGO, il3945_show_debug_level,</div><div class='add'>+		   il3945_store_debug_level);</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_IWLEGACY_DEBUG */</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il3945_show_temperature(struct device *d, struct device_attribute *attr,</div><div class='add'>+			char *buf)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+</div><div class='add'>+	if (!il_is_alive(il))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", il3945_hw_get_temperature(il));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(temperature, S_IRUGO, il3945_show_temperature, NULL);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il3945_show_tx_power(struct device *d, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+	return sprintf(buf, "%d\n", il-&gt;tx_power_user_lmt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il3945_store_tx_power(struct device *d, struct device_attribute *attr,</div><div class='add'>+		      const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+	char *p = (char *)buf;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = simple_strtoul(p, &amp;p, 10);</div><div class='add'>+	if (p == buf)</div><div class='add'>+		IL_INFO(": %s is not in decimal form.\n", buf);</div><div class='add'>+	else</div><div class='add'>+		il3945_hw_reg_set_txpower(il, val);</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(tx_power, S_IWUSR | S_IRUGO, il3945_show_tx_power,</div><div class='add'>+		   il3945_store_tx_power);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il3945_show_flags(struct device *d, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "0x%04X\n", ctx-&gt;active.flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il3945_store_flags(struct device *d, struct device_attribute *attr,</div><div class='add'>+		   const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+	u32 flags = simple_strtoul(buf, NULL, 0);</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	if (le32_to_cpu(ctx-&gt;staging.flags) != flags) {</div><div class='add'>+		/* Cancel any currently running scans... */</div><div class='add'>+		if (il_scan_cancel_timeout(il, 100))</div><div class='add'>+			IL_WARN("Could not cancel scan.\n");</div><div class='add'>+		else {</div><div class='add'>+			D_INFO("Committing rxon.flags = 0x%04X\n", flags);</div><div class='add'>+			ctx-&gt;staging.flags = cpu_to_le32(flags);</div><div class='add'>+			il3945_commit_rxon(il, ctx);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</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(flags, S_IWUSR | S_IRUGO, il3945_show_flags,</div><div class='add'>+		   il3945_store_flags);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il3945_show_filter_flags(struct device *d, struct device_attribute *attr,</div><div class='add'>+			 char *buf)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "0x%04X\n", le32_to_cpu(ctx-&gt;active.filter_flags));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il3945_store_filter_flags(struct device *d, struct device_attribute *attr,</div><div class='add'>+			  const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+	u32 filter_flags = simple_strtoul(buf, NULL, 0);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	if (le32_to_cpu(ctx-&gt;staging.filter_flags) != filter_flags) {</div><div class='add'>+		/* Cancel any currently running scans... */</div><div class='add'>+		if (il_scan_cancel_timeout(il, 100))</div><div class='add'>+			IL_WARN("Could not cancel scan.\n");</div><div class='add'>+		else {</div><div class='add'>+			D_INFO("Committing rxon.filter_flags = " "0x%04X\n",</div><div class='add'>+			       filter_flags);</div><div class='add'>+			ctx-&gt;staging.filter_flags = cpu_to_le32(filter_flags);</div><div class='add'>+			il3945_commit_rxon(il, ctx);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</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(filter_flags, S_IWUSR | S_IRUGO, il3945_show_filter_flags,</div><div class='add'>+		   il3945_store_filter_flags);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il3945_show_measurement(struct device *d, struct device_attribute *attr,</div><div class='add'>+			char *buf)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+	struct il_spectrum_notification measure_report;</div><div class='add'>+	u32 size = sizeof(measure_report), len = 0, ofs = 0;</div><div class='add'>+	u8 *data = (u8 *) &amp;measure_report;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+	if (!(il-&gt;measurement_status &amp; MEASUREMENT_READY)) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	memcpy(&amp;measure_report, &amp;il-&gt;measure_report, size);</div><div class='add'>+	il-&gt;measurement_status = 0;</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	while (size &amp;&amp; PAGE_SIZE - len) {</div><div class='add'>+		hex_dump_to_buffer(data + ofs, size, 16, 1, buf + len,</div><div class='add'>+				   PAGE_SIZE - len, 1);</div><div class='add'>+		len = strlen(buf);</div><div class='add'>+		if (PAGE_SIZE - len)</div><div class='add'>+			buf[len++] = '\n';</div><div class='add'>+</div><div class='add'>+		ofs += 16;</div><div class='add'>+		size -= min(size, 16U);</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</div><div class='add'>+il3945_store_measurement(struct device *d, struct device_attribute *attr,</div><div class='add'>+			 const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+	struct ieee80211_measurement_params params = {</div><div class='add'>+		.channel = le16_to_cpu(ctx-&gt;active.channel),</div><div class='add'>+		.start_time = cpu_to_le64(il-&gt;_3945.last_tsf),</div><div class='add'>+		.duration = cpu_to_le16(1),</div><div class='add'>+	};</div><div class='add'>+	u8 type = IL_MEASURE_BASIC;</div><div class='add'>+	u8 buffer[32];</div><div class='add'>+	u8 channel;</div><div class='add'>+</div><div class='add'>+	if (count) {</div><div class='add'>+		char *p = buffer;</div><div class='add'>+		strncpy(buffer, buf, min(sizeof(buffer), count));</div><div class='add'>+		channel = simple_strtoul(p, NULL, 0);</div><div class='add'>+		if (channel)</div><div class='add'>+			params.channel = channel;</div><div class='add'>+</div><div class='add'>+		p = buffer;</div><div class='add'>+		while (*p &amp;&amp; *p != ' ')</div><div class='add'>+			p++;</div><div class='add'>+		if (*p)</div><div class='add'>+			type = simple_strtoul(p + 1, NULL, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_INFO("Invoking measurement of type %d on " "channel %d (for '%s')\n",</div><div class='add'>+	       type, params.channel, buf);</div><div class='add'>+	il3945_get_measurement(il, &amp;params, type);</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(measurement, S_IRUSR | S_IWUSR, il3945_show_measurement,</div><div class='add'>+		   il3945_store_measurement);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il3945_store_retry_rate(struct device *d, struct device_attribute *attr,</div><div class='add'>+			const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+</div><div class='add'>+	il-&gt;retry_rate = simple_strtoul(buf, NULL, 0);</div><div class='add'>+	if (il-&gt;retry_rate &lt;= 0)</div><div class='add'>+		il-&gt;retry_rate = 1;</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</div><div class='add'>+il3945_show_retry_rate(struct device *d, struct device_attribute *attr,</div><div class='add'>+		       char *buf)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+	return sprintf(buf, "%d", il-&gt;retry_rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(retry_rate, S_IWUSR | S_IRUSR, il3945_show_retry_rate,</div><div class='add'>+		   il3945_store_retry_rate);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il3945_show_channels(struct device *d, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	/* all this shit doesn't belong into sysfs anyway */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(channels, S_IRUSR, il3945_show_channels, NULL);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il3945_show_antenna(struct device *d, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+</div><div class='add'>+	if (!il_is_alive(il))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", il3945_mod_params.antenna);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il3945_store_antenna(struct device *d, struct device_attribute *attr,</div><div class='add'>+		     const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il __maybe_unused = dev_get_drvdata(d);</div><div class='add'>+	int ant;</div><div class='add'>+</div><div class='add'>+	if (count == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (sscanf(buf, "%1i", &amp;ant) != 1) {</div><div class='add'>+		D_INFO("not in hex or decimal form.\n");</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ant &gt;= 0 &amp;&amp; ant &lt;= 2) {</div><div class='add'>+		D_INFO("Setting antenna select to %d.\n", ant);</div><div class='add'>+		il3945_mod_params.antenna = (enum il3945_antenna)ant;</div><div class='add'>+	} else</div><div class='add'>+		D_INFO("Bad antenna select value %d.\n", ant);</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(antenna, S_IWUSR | S_IRUGO, il3945_show_antenna,</div><div class='add'>+		   il3945_store_antenna);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il3945_show_status(struct device *d, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+	if (!il_is_alive(il))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	return sprintf(buf, "0x%08x\n", (int)il-&gt;status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(status, S_IRUGO, il3945_show_status, NULL);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il3945_dump_error_log(struct device *d, struct device_attribute *attr,</div><div class='add'>+		      const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+	char *p = (char *)buf;</div><div class='add'>+</div><div class='add'>+	if (p[0] == '1')</div><div class='add'>+		il3945_dump_nic_error_log(il);</div><div class='add'>+</div><div class='add'>+	return strnlen(buf, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(dump_errors, S_IWUSR, NULL, il3945_dump_error_log);</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * driver setup and tear down</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_setup_deferred_work(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	il-&gt;workqueue = create_singlethread_workqueue(DRV_NAME);</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;il-&gt;wait_command_queue);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;il-&gt;restart, il3945_bg_restart);</div><div class='add'>+	INIT_WORK(&amp;il-&gt;rx_replenish, il3945_bg_rx_replenish);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;il-&gt;init_alive_start, il3945_bg_init_alive_start);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;il-&gt;alive_start, il3945_bg_alive_start);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;il-&gt;_3945.rfkill_poll, il3945_rfkill_poll);</div><div class='add'>+</div><div class='add'>+	il_setup_scan_deferred_work(il);</div><div class='add'>+</div><div class='add'>+	il3945_hw_setup_deferred_work(il);</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;il-&gt;watchdog);</div><div class='add'>+	il-&gt;watchdog.data = (unsigned long)il;</div><div class='add'>+	il-&gt;watchdog.function = il_bg_watchdog;</div><div class='add'>+</div><div class='add'>+	tasklet_init(&amp;il-&gt;irq_tasklet,</div><div class='add'>+		     (void (*)(unsigned long))il3945_irq_tasklet,</div><div class='add'>+		     (unsigned long)il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_cancel_deferred_work(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	il3945_hw_cancel_deferred_work(il);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;il-&gt;init_alive_start);</div><div class='add'>+	cancel_delayed_work(&amp;il-&gt;alive_start);</div><div class='add'>+</div><div class='add'>+	il_cancel_scan_deferred_work(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct attribute *il3945_sysfs_entries[] = {</div><div class='add'>+	&amp;dev_attr_antenna.attr,</div><div class='add'>+	&amp;dev_attr_channels.attr,</div><div class='add'>+	&amp;dev_attr_dump_errors.attr,</div><div class='add'>+	&amp;dev_attr_flags.attr,</div><div class='add'>+	&amp;dev_attr_filter_flags.attr,</div><div class='add'>+	&amp;dev_attr_measurement.attr,</div><div class='add'>+	&amp;dev_attr_retry_rate.attr,</div><div class='add'>+	&amp;dev_attr_status.attr,</div><div class='add'>+	&amp;dev_attr_temperature.attr,</div><div class='add'>+	&amp;dev_attr_tx_power.attr,</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	&amp;dev_attr_debug_level.attr,</div><div class='add'>+#endif</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute_group il3945_attribute_group = {</div><div class='add'>+	.name = NULL,		/* put in device directory */</div><div class='add'>+	.attrs = il3945_sysfs_entries,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ieee80211_ops il3945_hw_ops = {</div><div class='add'>+	.tx = il3945_mac_tx,</div><div class='add'>+	.start = il3945_mac_start,</div><div class='add'>+	.stop = il3945_mac_stop,</div><div class='add'>+	.add_interface = il_mac_add_interface,</div><div class='add'>+	.remove_interface = il_mac_remove_interface,</div><div class='add'>+	.change_interface = il_mac_change_interface,</div><div class='add'>+	.config = il_mac_config,</div><div class='add'>+	.configure_filter = il3945_configure_filter,</div><div class='add'>+	.set_key = il3945_mac_set_key,</div><div class='add'>+	.conf_tx = il_mac_conf_tx,</div><div class='add'>+	.reset_tsf = il_mac_reset_tsf,</div><div class='add'>+	.bss_info_changed = il_mac_bss_info_changed,</div><div class='add'>+	.hw_scan = il_mac_hw_scan,</div><div class='add'>+	.sta_add = il3945_mac_sta_add,</div><div class='add'>+	.sta_remove = il_mac_sta_remove,</div><div class='add'>+	.tx_last_beacon = il_mac_tx_last_beacon,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il3945_init_drv(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il-&gt;eeprom;</div><div class='add'>+</div><div class='add'>+	il-&gt;retry_rate = 1;</div><div class='add'>+	il-&gt;beacon_skb = NULL;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;il-&gt;sta_lock);</div><div class='add'>+	spin_lock_init(&amp;il-&gt;hcmd_lock);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;il-&gt;free_frames);</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	il-&gt;ieee_channels = NULL;</div><div class='add'>+	il-&gt;ieee_rates = NULL;</div><div class='add'>+	il-&gt;band = IEEE80211_BAND_2GHZ;</div><div class='add'>+</div><div class='add'>+	il-&gt;iw_mode = NL80211_IFTYPE_STATION;</div><div class='add'>+	il-&gt;missed_beacon_threshold = IL_MISSED_BEACON_THRESHOLD_DEF;</div><div class='add'>+</div><div class='add'>+	/* initialize force reset */</div><div class='add'>+	il-&gt;force_reset.reset_duration = IL_DELAY_NEXT_FORCE_FW_RELOAD;</div><div class='add'>+</div><div class='add'>+	if (eeprom-&gt;version &lt; EEPROM_3945_EEPROM_VERSION) {</div><div class='add'>+		IL_WARN("Unsupported EEPROM version: 0x%04X\n",</div><div class='add'>+			eeprom-&gt;version);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	ret = il_init_channel_map(il);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IL_ERR("initializing regulatory failed: %d\n", ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set up txpower settings in driver for all channels */</div><div class='add'>+	if (il3945_txpower_set_from_eeprom(il)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto err_free_channel_map;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = il_init_geos(il);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IL_ERR("initializing geos failed: %d\n", ret);</div><div class='add'>+		goto err_free_channel_map;</div><div class='add'>+	}</div><div class='add'>+	il3945_init_hw_rates(il, il-&gt;ieee_rates);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_channel_map:</div><div class='add'>+	il_free_channel_map(il);</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IL3945_MAX_PROBE_REQUEST	200</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il3945_setup_mac(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct ieee80211_hw *hw = il-&gt;hw;</div><div class='add'>+</div><div class='add'>+	hw-&gt;rate_control_algorithm = "iwl-3945-rs";</div><div class='add'>+	hw-&gt;sta_data_size = sizeof(struct il3945_sta_priv);</div><div class='add'>+	hw-&gt;vif_data_size = sizeof(struct il_vif_priv);</div><div class='add'>+</div><div class='add'>+	/* Tell mac80211 our characteristics */</div><div class='add'>+	hw-&gt;flags = IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_SPECTRUM_MGMT;</div><div class='add'>+</div><div class='add'>+	hw-&gt;wiphy-&gt;interface_modes = il-&gt;ctx.interface_modes;</div><div class='add'>+</div><div class='add'>+	hw-&gt;wiphy-&gt;flags |=</div><div class='add'>+	    WIPHY_FLAG_CUSTOM_REGULATORY | WIPHY_FLAG_DISABLE_BEACON_HINTS |</div><div class='add'>+	    WIPHY_FLAG_IBSS_RSN;</div><div class='add'>+</div><div class='add'>+	hw-&gt;wiphy-&gt;max_scan_ssids = PROBE_OPTION_MAX_3945;</div><div class='add'>+	/* we create the 802.11 header and a zero-length SSID element */</div><div class='add'>+	hw-&gt;wiphy-&gt;max_scan_ie_len = IL3945_MAX_PROBE_REQUEST - 24 - 2;</div><div class='add'>+</div><div class='add'>+	/* Default value; 4 EDCA QOS priorities */</div><div class='add'>+	hw-&gt;queues = 4;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;bands[IEEE80211_BAND_2GHZ].n_channels)</div><div class='add'>+		il-&gt;hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] =</div><div class='add'>+		    &amp;il-&gt;bands[IEEE80211_BAND_2GHZ];</div><div class='add'>+</div><div class='add'>+	if (il-&gt;bands[IEEE80211_BAND_5GHZ].n_channels)</div><div class='add'>+		il-&gt;hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_5GHZ] =</div><div class='add'>+		    &amp;il-&gt;bands[IEEE80211_BAND_5GHZ];</div><div class='add'>+</div><div class='add'>+	il_leds_init(il);</div><div class='add'>+</div><div class='add'>+	ret = ieee80211_register_hw(il-&gt;hw);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IL_ERR("Failed to register hw (error %d)\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	il-&gt;mac80211_registered = 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'>+il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	struct il_priv *il;</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+	struct il_cfg *cfg = (struct il_cfg *)(ent-&gt;driver_data);</div><div class='add'>+	struct il3945_eeprom *eeprom;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/***********************</div><div class='add'>+	 * 1. Allocating HW data</div><div class='add'>+	 * ********************/</div><div class='add'>+</div><div class='add'>+	/* mac80211 allocates memory for this device instance, including</div><div class='add'>+	 *   space for this driver's ilate structure */</div><div class='add'>+	hw = il_alloc_all(cfg);</div><div class='add'>+	if (hw == NULL) {</div><div class='add'>+		pr_err("Can not allocate network device\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	il = hw-&gt;priv;</div><div class='add'>+	SET_IEEE80211_DEV(hw, &amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	il-&gt;cmd_queue = IL39_CMD_QUEUE_NUM;</div><div class='add'>+</div><div class='add'>+	il-&gt;ctx.ctxid = 0;</div><div class='add'>+</div><div class='add'>+	il-&gt;ctx.rxon_cmd = C_RXON;</div><div class='add'>+	il-&gt;ctx.rxon_timing_cmd = C_RXON_TIMING;</div><div class='add'>+	il-&gt;ctx.rxon_assoc_cmd = C_RXON_ASSOC;</div><div class='add'>+	il-&gt;ctx.qos_cmd = C_QOS_PARAM;</div><div class='add'>+	il-&gt;ctx.ap_sta_id = IL_AP_ID;</div><div class='add'>+	il-&gt;ctx.wep_key_cmd = C_WEPKEY;</div><div class='add'>+	il-&gt;ctx.interface_modes =</div><div class='add'>+	    BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);</div><div class='add'>+	il-&gt;ctx.ibss_devtype = RXON_DEV_TYPE_IBSS;</div><div class='add'>+	il-&gt;ctx.station_devtype = RXON_DEV_TYPE_ESS;</div><div class='add'>+	il-&gt;ctx.unused_devtype = RXON_DEV_TYPE_ESS;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disabling hardware scan means that mac80211 will perform scans</div><div class='add'>+	 * "the hard way", rather than using device's scan.</div><div class='add'>+	 */</div><div class='add'>+	if (il3945_mod_params.disable_hw_scan) {</div><div class='add'>+		D_INFO("Disabling hw_scan\n");</div><div class='add'>+		il3945_hw_ops.hw_scan = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_INFO("*** LOAD DRIVER ***\n");</div><div class='add'>+	il-&gt;cfg = cfg;</div><div class='add'>+	il-&gt;pci_dev = pdev;</div><div class='add'>+	il-&gt;inta_mask = CSR_INI_SET_MASK;</div><div class='add'>+</div><div class='add'>+	if (il_alloc_traffic_mem(il))</div><div class='add'>+		IL_ERR("Not enough memory to generate traffic log\n");</div><div class='add'>+</div><div class='add'>+	/***************************</div><div class='add'>+	 * 2. Initializing PCI bus</div><div class='add'>+	 * *************************/</div><div class='add'>+	pci_disable_link_state(pdev,</div><div class='add'>+			       PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |</div><div class='add'>+			       PCIE_LINK_STATE_CLKPM);</div><div class='add'>+</div><div class='add'>+	if (pci_enable_device(pdev)) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto out_ieee80211_free_hw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+	if (!err)</div><div class='add'>+		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+	if (err) {</div><div class='add'>+		IL_WARN("No suitable DMA available.\n");</div><div class='add'>+		goto out_pci_disable_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, il);</div><div class='add'>+	err = pci_request_regions(pdev, DRV_NAME);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_pci_disable_device;</div><div class='add'>+</div><div class='add'>+	/***********************</div><div class='add'>+	 * 3. Read REV Register</div><div class='add'>+	 * ********************/</div><div class='add'>+	il-&gt;hw_base = pci_iomap(pdev, 0, 0);</div><div class='add'>+	if (!il-&gt;hw_base) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto out_pci_release_regions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_INFO("pci_resource_len = 0x%08llx\n",</div><div class='add'>+	       (unsigned long long)pci_resource_len(pdev, 0));</div><div class='add'>+	D_INFO("pci_resource_base = %p\n", il-&gt;hw_base);</div><div class='add'>+</div><div class='add'>+	/* We disable the RETRY_TIMEOUT register (0x41) to keep</div><div class='add'>+	 * PCI Tx retries from interfering with C3 CPU state */</div><div class='add'>+	pci_write_config_byte(pdev, 0x41, 0x00);</div><div class='add'>+</div><div class='add'>+	/* these spin locks will be used in apm_ops.init and EEPROM access</div><div class='add'>+	 * we should init now</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_init(&amp;il-&gt;reg_lock);</div><div class='add'>+	spin_lock_init(&amp;il-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * stop and reset the on-board processor just in case it is in a</div><div class='add'>+	 * strange state ... like being left stranded by a primary kernel</div><div class='add'>+	 * and this is now the kdump kernel trying to start up</div><div class='add'>+	 */</div><div class='add'>+	_il_wr(il, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);</div><div class='add'>+</div><div class='add'>+	/***********************</div><div class='add'>+	 * 4. Read EEPROM</div><div class='add'>+	 * ********************/</div><div class='add'>+</div><div class='add'>+	/* Read the EEPROM */</div><div class='add'>+	err = il_eeprom_init(il);</div><div class='add'>+	if (err) {</div><div class='add'>+		IL_ERR("Unable to init EEPROM\n");</div><div class='add'>+		goto out_iounmap;</div><div class='add'>+	}</div><div class='add'>+	/* MAC Address location in EEPROM same for 3945/4965 */</div><div class='add'>+	eeprom = (struct il3945_eeprom *)il-&gt;eeprom;</div><div class='add'>+	D_INFO("MAC address: %pM\n", eeprom-&gt;mac_address);</div><div class='add'>+	SET_IEEE80211_PERM_ADDR(il-&gt;hw, eeprom-&gt;mac_address);</div><div class='add'>+</div><div class='add'>+	/***********************</div><div class='add'>+	 * 5. Setup HW Constants</div><div class='add'>+	 * ********************/</div><div class='add'>+	/* Device-specific setup */</div><div class='add'>+	if (il3945_hw_set_hw_params(il)) {</div><div class='add'>+		IL_ERR("failed to set hw settings\n");</div><div class='add'>+		goto out_eeprom_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/***********************</div><div class='add'>+	 * 6. Setup il</div><div class='add'>+	 * ********************/</div><div class='add'>+</div><div class='add'>+	err = il3945_init_drv(il);</div><div class='add'>+	if (err) {</div><div class='add'>+		IL_ERR("initializing driver failed\n");</div><div class='add'>+		goto out_unset_hw_params;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IL_INFO("Detected Intel Wireless WiFi Link %s\n", il-&gt;cfg-&gt;name);</div><div class='add'>+</div><div class='add'>+	/***********************</div><div class='add'>+	 * 7. Setup Services</div><div class='add'>+	 * ********************/</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+	il_disable_interrupts(il);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	pci_enable_msi(il-&gt;pci_dev);</div><div class='add'>+</div><div class='add'>+	err = request_irq(il-&gt;pci_dev-&gt;irq, il_isr, IRQF_SHARED, DRV_NAME, il);</div><div class='add'>+	if (err) {</div><div class='add'>+		IL_ERR("Error allocating IRQ %d\n", il-&gt;pci_dev-&gt;irq);</div><div class='add'>+		goto out_disable_msi;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = sysfs_create_group(&amp;pdev-&gt;dev.kobj, &amp;il3945_attribute_group);</div><div class='add'>+	if (err) {</div><div class='add'>+		IL_ERR("failed to create sysfs device attributes\n");</div><div class='add'>+		goto out_release_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il_set_rxon_channel(il, &amp;il-&gt;bands[IEEE80211_BAND_2GHZ].channels[5],</div><div class='add'>+			    &amp;il-&gt;ctx);</div><div class='add'>+	il3945_setup_deferred_work(il);</div><div class='add'>+	il3945_setup_handlers(il);</div><div class='add'>+	il_power_initialize(il);</div><div class='add'>+</div><div class='add'>+	/*********************************</div><div class='add'>+	 * 8. Setup and Register mac80211</div><div class='add'>+	 * *******************************/</div><div class='add'>+</div><div class='add'>+	il_enable_interrupts(il);</div><div class='add'>+</div><div class='add'>+	err = il3945_setup_mac(il);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_remove_sysfs;</div><div class='add'>+</div><div class='add'>+	err = il_dbgfs_register(il, DRV_NAME);</div><div class='add'>+	if (err)</div><div class='add'>+		IL_ERR("failed to create debugfs files. Ignoring error: %d\n",</div><div class='add'>+		       err);</div><div class='add'>+</div><div class='add'>+	/* Start monitoring the killswitch */</div><div class='add'>+	queue_delayed_work(il-&gt;workqueue, &amp;il-&gt;_3945.rfkill_poll, 2 * HZ);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_remove_sysfs:</div><div class='add'>+	destroy_workqueue(il-&gt;workqueue);</div><div class='add'>+	il-&gt;workqueue = NULL;</div><div class='add'>+	sysfs_remove_group(&amp;pdev-&gt;dev.kobj, &amp;il3945_attribute_group);</div><div class='add'>+out_release_irq:</div><div class='add'>+	free_irq(il-&gt;pci_dev-&gt;irq, il);</div><div class='add'>+out_disable_msi:</div><div class='add'>+	pci_disable_msi(il-&gt;pci_dev);</div><div class='add'>+	il_free_geos(il);</div><div class='add'>+	il_free_channel_map(il);</div><div class='add'>+out_unset_hw_params:</div><div class='add'>+	il3945_unset_hw_params(il);</div><div class='add'>+out_eeprom_free:</div><div class='add'>+	il_eeprom_free(il);</div><div class='add'>+out_iounmap:</div><div class='add'>+	pci_iounmap(pdev, il-&gt;hw_base);</div><div class='add'>+out_pci_release_regions:</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+out_pci_disable_device:</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+out_ieee80211_free_hw:</div><div class='add'>+	il_free_traffic_mem(il);</div><div class='add'>+	ieee80211_free_hw(il-&gt;hw);</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit</div><div class='add'>+il3945_pci_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = pci_get_drvdata(pdev);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!il)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	D_INFO("*** UNLOAD DRIVER ***\n");</div><div class='add'>+</div><div class='add'>+	il_dbgfs_unregister(il);</div><div class='add'>+</div><div class='add'>+	set_bit(S_EXIT_PENDING, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	il_leds_exit(il);</div><div class='add'>+</div><div class='add'>+	if (il-&gt;mac80211_registered) {</div><div class='add'>+		ieee80211_unregister_hw(il-&gt;hw);</div><div class='add'>+		il-&gt;mac80211_registered = 0;</div><div class='add'>+	} else {</div><div class='add'>+		il3945_down(il);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure device is reset to low power before unloading driver.</div><div class='add'>+	 * This may be redundant with il_down(), but there are paths to</div><div class='add'>+	 * run il_down() without calling apm_ops.stop(), and there are</div><div class='add'>+	 * paths to avoid running il_down() at all before leaving driver.</div><div class='add'>+	 * This (inexpensive) call *makes sure* device is reset.</div><div class='add'>+	 */</div><div class='add'>+	il_apm_stop(il);</div><div class='add'>+</div><div class='add'>+	/* make sure we flush any pending irq or</div><div class='add'>+	 * tasklet for the driver</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+	il_disable_interrupts(il);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	il3945_synchronize_irq(il);</div><div class='add'>+</div><div class='add'>+	sysfs_remove_group(&amp;pdev-&gt;dev.kobj, &amp;il3945_attribute_group);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;il-&gt;_3945.rfkill_poll);</div><div class='add'>+</div><div class='add'>+	il3945_dealloc_ucode_pci(il);</div><div class='add'>+</div><div class='add'>+	if (il-&gt;rxq.bd)</div><div class='add'>+		il3945_rx_queue_free(il, &amp;il-&gt;rxq);</div><div class='add'>+	il3945_hw_txq_ctx_free(il);</div><div class='add'>+</div><div class='add'>+	il3945_unset_hw_params(il);</div><div class='add'>+</div><div class='add'>+	/*netif_stop_queue(dev); */</div><div class='add'>+	flush_workqueue(il-&gt;workqueue);</div><div class='add'>+</div><div class='add'>+	/* ieee80211_unregister_hw calls il3945_mac_stop, which flushes</div><div class='add'>+	 * il-&gt;workqueue... so we can't take down the workqueue</div><div class='add'>+	 * until now... */</div><div class='add'>+	destroy_workqueue(il-&gt;workqueue);</div><div class='add'>+	il-&gt;workqueue = NULL;</div><div class='add'>+	il_free_traffic_mem(il);</div><div class='add'>+</div><div class='add'>+	free_irq(pdev-&gt;irq, il);</div><div class='add'>+	pci_disable_msi(pdev);</div><div class='add'>+</div><div class='add'>+	pci_iounmap(pdev, il-&gt;hw_base);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	il_free_channel_map(il);</div><div class='add'>+	il_free_geos(il);</div><div class='add'>+	kfree(il-&gt;scan_cmd);</div><div class='add'>+	if (il-&gt;beacon_skb)</div><div class='add'>+		dev_kfree_skb(il-&gt;beacon_skb);</div><div class='add'>+</div><div class='add'>+	ieee80211_free_hw(il-&gt;hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * driver and module entry point</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+static struct pci_driver il3945_driver = {</div><div class='add'>+	.name = DRV_NAME,</div><div class='add'>+	.id_table = il3945_hw_card_ids,</div><div class='add'>+	.probe = il3945_pci_probe,</div><div class='add'>+	.remove = __devexit_p(il3945_pci_remove),</div><div class='add'>+	.driver.pm = IL_LEGACY_PM_OPS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init</div><div class='add'>+il3945_init(void)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	int ret;</div><div class='add'>+	pr_info(DRV_DESCRIPTION ", " DRV_VERSION "\n");</div><div class='add'>+	pr_info(DRV_COPYRIGHT "\n");</div><div class='add'>+</div><div class='add'>+	ret = il3945_rate_control_register();</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Unable to register rate control algorithm: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = pci_register_driver(&amp;il3945_driver);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Unable to initialize PCI module\n");</div><div class='add'>+		goto error_register;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+error_register:</div><div class='add'>+	il3945_rate_control_unregister();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit</div><div class='add'>+il3945_exit(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;il3945_driver);</div><div class='add'>+	il3945_rate_control_unregister();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_FIRMWARE(IL3945_MODULE_FIRMWARE(IL3945_UCODE_API_MAX));</div><div class='add'>+</div><div class='add'>+module_param_named(antenna, il3945_mod_params.antenna, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])");</div><div class='add'>+module_param_named(swcrypto, il3945_mod_params.sw_crypto, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(swcrypto, "using software crypto (default 1 [software])");</div><div class='add'>+module_param_named(disable_hw_scan, il3945_mod_params.disable_hw_scan, int,</div><div class='add'>+		   S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 1)");</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+module_param_named(debug, il_debug_level, uint, S_IRUGO | S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(debug, "debug output mask");</div><div class='add'>+#endif</div><div class='add'>+module_param_named(fw_restart, il3945_mod_params.restart_fw, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(fw_restart, "restart firmware in case of error");</div><div class='add'>+</div><div class='add'>+module_exit(il3945_exit);</div><div class='add'>+module_init(il3945_init);</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/3945-rs.c b/drivers/net/wireless/iwlegacy/3945-rs.c<br/>new file mode 100644<br/>index 000000000000..d7a83f229190<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/3945-rs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/3945-rs.c</a></div><div class='hunk'>@@ -0,0 +1,986 @@</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.</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 version 2 of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution in the</div><div class='add'>+ * file called LICENSE.</div><div class='add'>+ *</div><div class='add'>+ * Contact Information:</div><div class='add'>+ *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='add'>+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='add'>+ *</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/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+</div><div class='add'>+#include "commands.h"</div><div class='add'>+#include "3945.h"</div><div class='add'>+</div><div class='add'>+#define RS_NAME "iwl-3945-rs"</div><div class='add'>+</div><div class='add'>+static s32 il3945_expected_tpt_g[RATE_COUNT_3945] = {</div><div class='add'>+	7, 13, 35, 58, 0, 0, 76, 104, 130, 168, 191, 202</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static s32 il3945_expected_tpt_g_prot[RATE_COUNT_3945] = {</div><div class='add'>+	7, 13, 35, 58, 0, 0, 0, 80, 93, 113, 123, 125</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static s32 il3945_expected_tpt_a[RATE_COUNT_3945] = {</div><div class='add'>+	0, 0, 0, 0, 40, 57, 72, 98, 121, 154, 177, 186</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static s32 il3945_expected_tpt_b[RATE_COUNT_3945] = {</div><div class='add'>+	7, 13, 35, 58, 0, 0, 0, 0, 0, 0, 0, 0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il3945_tpt_entry {</div><div class='add'>+	s8 min_rssi;</div><div class='add'>+	u8 idx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct il3945_tpt_entry il3945_tpt_table_a[] = {</div><div class='add'>+	{-60, RATE_54M_IDX},</div><div class='add'>+	{-64, RATE_48M_IDX},</div><div class='add'>+	{-72, RATE_36M_IDX},</div><div class='add'>+	{-80, RATE_24M_IDX},</div><div class='add'>+	{-84, RATE_18M_IDX},</div><div class='add'>+	{-85, RATE_12M_IDX},</div><div class='add'>+	{-87, RATE_9M_IDX},</div><div class='add'>+	{-89, RATE_6M_IDX}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct il3945_tpt_entry il3945_tpt_table_g[] = {</div><div class='add'>+	{-60, RATE_54M_IDX},</div><div class='add'>+	{-64, RATE_48M_IDX},</div><div class='add'>+	{-68, RATE_36M_IDX},</div><div class='add'>+	{-80, RATE_24M_IDX},</div><div class='add'>+	{-84, RATE_18M_IDX},</div><div class='add'>+	{-85, RATE_12M_IDX},</div><div class='add'>+	{-86, RATE_11M_IDX},</div><div class='add'>+	{-88, RATE_5M_IDX},</div><div class='add'>+	{-90, RATE_2M_IDX},</div><div class='add'>+	{-92, RATE_1M_IDX}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RATE_MAX_WINDOW		62</div><div class='add'>+#define RATE_FLUSH		(3*HZ)</div><div class='add'>+#define RATE_WIN_FLUSH		(HZ/2)</div><div class='add'>+#define IL39_RATE_HIGH_TH	11520</div><div class='add'>+#define IL_SUCCESS_UP_TH	8960</div><div class='add'>+#define IL_SUCCESS_DOWN_TH	10880</div><div class='add'>+#define RATE_MIN_FAILURE_TH	6</div><div class='add'>+#define RATE_MIN_SUCCESS_TH	8</div><div class='add'>+#define RATE_DECREASE_TH	1920</div><div class='add'>+#define RATE_RETRY_TH		15</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+il3945_get_rate_idx_by_rssi(s32 rssi, enum ieee80211_band band)</div><div class='add'>+{</div><div class='add'>+	u32 idx = 0;</div><div class='add'>+	u32 table_size = 0;</div><div class='add'>+	struct il3945_tpt_entry *tpt_table = NULL;</div><div class='add'>+</div><div class='add'>+	if (rssi &lt; IL_MIN_RSSI_VAL || rssi &gt; IL_MAX_RSSI_VAL)</div><div class='add'>+		rssi = IL_MIN_RSSI_VAL;</div><div class='add'>+</div><div class='add'>+	switch (band) {</div><div class='add'>+	case IEEE80211_BAND_2GHZ:</div><div class='add'>+		tpt_table = il3945_tpt_table_g;</div><div class='add'>+		table_size = ARRAY_SIZE(il3945_tpt_table_g);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_BAND_5GHZ:</div><div class='add'>+		tpt_table = il3945_tpt_table_a;</div><div class='add'>+		table_size = ARRAY_SIZE(il3945_tpt_table_a);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (idx &lt; table_size &amp;&amp; rssi &lt; tpt_table[idx].min_rssi)</div><div class='add'>+		idx++;</div><div class='add'>+</div><div class='add'>+	idx = min(idx, table_size - 1);</div><div class='add'>+</div><div class='add'>+	return tpt_table[idx].idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_clear_win(struct il3945_rate_scale_data *win)</div><div class='add'>+{</div><div class='add'>+	win-&gt;data = 0;</div><div class='add'>+	win-&gt;success_counter = 0;</div><div class='add'>+	win-&gt;success_ratio = -1;</div><div class='add'>+	win-&gt;counter = 0;</div><div class='add'>+	win-&gt;average_tpt = IL_INVALID_VALUE;</div><div class='add'>+	win-&gt;stamp = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_rate_scale_flush_wins - flush out the rate scale wins</div><div class='add'>+ *</div><div class='add'>+ * Returns the number of wins that have gathered data but were</div><div class='add'>+ * not flushed.  If there were any that were not flushed, then</div><div class='add'>+ * reschedule the rate flushing routine.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il3945_rate_scale_flush_wins(struct il3945_rs_sta *rs_sta)</div><div class='add'>+{</div><div class='add'>+	int unflushed = 0;</div><div class='add'>+	int i;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct il_priv *il __maybe_unused = rs_sta-&gt;il;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For each rate, if we have collected data on that rate</div><div class='add'>+	 * and it has been more than RATE_WIN_FLUSH</div><div class='add'>+	 * since we flushed, clear out the gathered stats</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; RATE_COUNT_3945; i++) {</div><div class='add'>+		if (!rs_sta-&gt;win[i].counter)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;rs_sta-&gt;lock, flags);</div><div class='add'>+		if (time_after(jiffies, rs_sta-&gt;win[i].stamp + RATE_WIN_FLUSH)) {</div><div class='add'>+			D_RATE("flushing %d samples of rate " "idx %d\n",</div><div class='add'>+			       rs_sta-&gt;win[i].counter, i);</div><div class='add'>+			il3945_clear_win(&amp;rs_sta-&gt;win[i]);</div><div class='add'>+		} else</div><div class='add'>+			unflushed++;</div><div class='add'>+		spin_unlock_irqrestore(&amp;rs_sta-&gt;lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return unflushed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define RATE_FLUSH_MAX              5000	/* msec */</div><div class='add'>+#define RATE_FLUSH_MIN              50	/* msec */</div><div class='add'>+#define IL_AVERAGE_PACKETS             1500</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_bg_rate_scale_flush(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct il3945_rs_sta *rs_sta = (void *)data;</div><div class='add'>+	struct il_priv *il __maybe_unused = rs_sta-&gt;il;</div><div class='add'>+	int unflushed = 0;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 packet_count, duration, pps;</div><div class='add'>+</div><div class='add'>+	D_RATE("enter\n");</div><div class='add'>+</div><div class='add'>+	unflushed = il3945_rate_scale_flush_wins(rs_sta);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;rs_sta-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Number of packets Rx'd since last time this timer ran */</div><div class='add'>+	packet_count = (rs_sta-&gt;tx_packets - rs_sta-&gt;last_tx_packets) + 1;</div><div class='add'>+</div><div class='add'>+	rs_sta-&gt;last_tx_packets = rs_sta-&gt;tx_packets + 1;</div><div class='add'>+</div><div class='add'>+	if (unflushed) {</div><div class='add'>+		duration =</div><div class='add'>+		    jiffies_to_msecs(jiffies - rs_sta-&gt;last_partial_flush);</div><div class='add'>+</div><div class='add'>+		D_RATE("Tx'd %d packets in %dms\n", packet_count, duration);</div><div class='add'>+</div><div class='add'>+		/* Determine packets per second */</div><div class='add'>+		if (duration)</div><div class='add'>+			pps = (packet_count * 1000) / duration;</div><div class='add'>+		else</div><div class='add'>+			pps = 0;</div><div class='add'>+</div><div class='add'>+		if (pps) {</div><div class='add'>+			duration = (IL_AVERAGE_PACKETS * 1000) / pps;</div><div class='add'>+			if (duration &lt; RATE_FLUSH_MIN)</div><div class='add'>+				duration = RATE_FLUSH_MIN;</div><div class='add'>+			else if (duration &gt; RATE_FLUSH_MAX)</div><div class='add'>+				duration = RATE_FLUSH_MAX;</div><div class='add'>+		} else</div><div class='add'>+			duration = RATE_FLUSH_MAX;</div><div class='add'>+</div><div class='add'>+		rs_sta-&gt;flush_time = msecs_to_jiffies(duration);</div><div class='add'>+</div><div class='add'>+		D_RATE("new flush period: %d msec ave %d\n", duration,</div><div class='add'>+		       packet_count);</div><div class='add'>+</div><div class='add'>+		mod_timer(&amp;rs_sta-&gt;rate_scale_flush,</div><div class='add'>+			  jiffies + rs_sta-&gt;flush_time);</div><div class='add'>+</div><div class='add'>+		rs_sta-&gt;last_partial_flush = jiffies;</div><div class='add'>+	} else {</div><div class='add'>+		rs_sta-&gt;flush_time = RATE_FLUSH;</div><div class='add'>+		rs_sta-&gt;flush_pending = 0;</div><div class='add'>+	}</div><div class='add'>+	/* If there weren't any unflushed entries, we don't schedule the timer</div><div class='add'>+	 * to run again */</div><div class='add'>+</div><div class='add'>+	rs_sta-&gt;last_flush = jiffies;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;rs_sta-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	D_RATE("leave\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_collect_tx_data - Update the success/failure sliding win</div><div class='add'>+ *</div><div class='add'>+ * We keep a sliding win of the last 64 packets transmitted</div><div class='add'>+ * at this rate.  win-&gt;data contains the bitmask of successful</div><div class='add'>+ * packets.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il3945_collect_tx_data(struct il3945_rs_sta *rs_sta,</div><div class='add'>+		       struct il3945_rate_scale_data *win, int success,</div><div class='add'>+		       int retries, int idx)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	s32 fail_count;</div><div class='add'>+	struct il_priv *il __maybe_unused = rs_sta-&gt;il;</div><div class='add'>+</div><div class='add'>+	if (!retries) {</div><div class='add'>+		D_RATE("leave: retries == 0 -- should be at least 1\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;rs_sta-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Keep track of only the latest 62 tx frame attempts in this rate's</div><div class='add'>+	 * history win; anything older isn't really relevant any more.</div><div class='add'>+	 * If we have filled up the sliding win, drop the oldest attempt;</div><div class='add'>+	 * if the oldest attempt (highest bit in bitmap) shows "success",</div><div class='add'>+	 * subtract "1" from the success counter (this is the main reason</div><div class='add'>+	 * we keep these bitmaps!).</div><div class='add'>+	 * */</div><div class='add'>+	while (retries &gt; 0) {</div><div class='add'>+		if (win-&gt;counter &gt;= RATE_MAX_WINDOW) {</div><div class='add'>+</div><div class='add'>+			/* remove earliest */</div><div class='add'>+			win-&gt;counter = RATE_MAX_WINDOW - 1;</div><div class='add'>+</div><div class='add'>+			if (win-&gt;data &amp; (1ULL &lt;&lt; (RATE_MAX_WINDOW - 1))) {</div><div class='add'>+				win-&gt;data &amp;= ~(1ULL &lt;&lt; (RATE_MAX_WINDOW - 1));</div><div class='add'>+				win-&gt;success_counter--;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Increment frames-attempted counter */</div><div class='add'>+		win-&gt;counter++;</div><div class='add'>+</div><div class='add'>+		/* Shift bitmap by one frame (throw away oldest history),</div><div class='add'>+		 * OR in "1", and increment "success" if this</div><div class='add'>+		 * frame was successful. */</div><div class='add'>+		win-&gt;data &lt;&lt;= 1;</div><div class='add'>+		if (success &gt; 0) {</div><div class='add'>+			win-&gt;success_counter++;</div><div class='add'>+			win-&gt;data |= 0x1;</div><div class='add'>+			success--;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		retries--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Calculate current success ratio, avoid divide-by-0! */</div><div class='add'>+	if (win-&gt;counter &gt; 0)</div><div class='add'>+		win-&gt;success_ratio =</div><div class='add'>+		    128 * (100 * win-&gt;success_counter) / win-&gt;counter;</div><div class='add'>+	else</div><div class='add'>+		win-&gt;success_ratio = IL_INVALID_VALUE;</div><div class='add'>+</div><div class='add'>+	fail_count = win-&gt;counter - win-&gt;success_counter;</div><div class='add'>+</div><div class='add'>+	/* Calculate average throughput, if we have enough history. */</div><div class='add'>+	if (fail_count &gt;= RATE_MIN_FAILURE_TH ||</div><div class='add'>+	    win-&gt;success_counter &gt;= RATE_MIN_SUCCESS_TH)</div><div class='add'>+		win-&gt;average_tpt =</div><div class='add'>+		    ((win-&gt;success_ratio * rs_sta-&gt;expected_tpt[idx] +</div><div class='add'>+		      64) / 128);</div><div class='add'>+	else</div><div class='add'>+		win-&gt;average_tpt = IL_INVALID_VALUE;</div><div class='add'>+</div><div class='add'>+	/* Tag this win as having been updated */</div><div class='add'>+	win-&gt;stamp = jiffies;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;rs_sta-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called after adding a new station to initialize rate scaling</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il3945_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta, u8 sta_id)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = il-&gt;hw;</div><div class='add'>+	struct ieee80211_conf *conf = &amp;il-&gt;hw-&gt;conf;</div><div class='add'>+	struct il3945_sta_priv *psta;</div><div class='add'>+	struct il3945_rs_sta *rs_sta;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	D_INFO("enter\n");</div><div class='add'>+	if (sta_id == il-&gt;ctx.bcast_sta_id)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	psta = (struct il3945_sta_priv *)sta-&gt;drv_priv;</div><div class='add'>+	rs_sta = &amp;psta-&gt;rs_sta;</div><div class='add'>+	sband = hw-&gt;wiphy-&gt;bands[conf-&gt;channel-&gt;band];</div><div class='add'>+</div><div class='add'>+	rs_sta-&gt;il = il;</div><div class='add'>+</div><div class='add'>+	rs_sta-&gt;start_rate = RATE_INVALID;</div><div class='add'>+</div><div class='add'>+	/* default to just 802.11b */</div><div class='add'>+	rs_sta-&gt;expected_tpt = il3945_expected_tpt_b;</div><div class='add'>+</div><div class='add'>+	rs_sta-&gt;last_partial_flush = jiffies;</div><div class='add'>+	rs_sta-&gt;last_flush = jiffies;</div><div class='add'>+	rs_sta-&gt;flush_time = RATE_FLUSH;</div><div class='add'>+	rs_sta-&gt;last_tx_packets = 0;</div><div class='add'>+</div><div class='add'>+	rs_sta-&gt;rate_scale_flush.data = (unsigned long)rs_sta;</div><div class='add'>+	rs_sta-&gt;rate_scale_flush.function = il3945_bg_rate_scale_flush;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RATE_COUNT_3945; i++)</div><div class='add'>+		il3945_clear_win(&amp;rs_sta-&gt;win[i]);</div><div class='add'>+</div><div class='add'>+	/* TODO: what is a good starting rate for STA? About middle? Maybe not</div><div class='add'>+	 * the lowest or the highest rate.. Could consider using RSSI from</div><div class='add'>+	 * previous packets? Need to have IEEE 802.1X auth succeed immediately</div><div class='add'>+	 * after assoc.. */</div><div class='add'>+</div><div class='add'>+	for (i = sband-&gt;n_bitrates - 1; i &gt;= 0; i--) {</div><div class='add'>+		if (sta-&gt;supp_rates[sband-&gt;band] &amp; (1 &lt;&lt; i)) {</div><div class='add'>+			rs_sta-&gt;last_txrate_idx = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il-&gt;_3945.sta_supp_rates = sta-&gt;supp_rates[sband-&gt;band];</div><div class='add'>+	/* For 5 GHz band it start at IL_FIRST_OFDM_RATE */</div><div class='add'>+	if (sband-&gt;band == IEEE80211_BAND_5GHZ) {</div><div class='add'>+		rs_sta-&gt;last_txrate_idx += IL_FIRST_OFDM_RATE;</div><div class='add'>+		il-&gt;_3945.sta_supp_rates &lt;&lt;= IL_FIRST_OFDM_RATE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	il-&gt;stations[sta_id].used &amp;= ~IL_STA_UCODE_INPROGRESS;</div><div class='add'>+</div><div class='add'>+	D_INFO("leave\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *</div><div class='add'>+il3945_rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)</div><div class='add'>+{</div><div class='add'>+	return hw-&gt;priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rate scale requires free function to be implemented */</div><div class='add'>+static void</div><div class='add'>+il3945_rs_free(void *il)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *</div><div class='add'>+il3945_rs_alloc_sta(void *il_priv, struct ieee80211_sta *sta, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct il3945_rs_sta *rs_sta;</div><div class='add'>+	struct il3945_sta_priv *psta = (void *)sta-&gt;drv_priv;</div><div class='add'>+	struct il_priv *il __maybe_unused = il_priv;</div><div class='add'>+</div><div class='add'>+	D_RATE("enter\n");</div><div class='add'>+</div><div class='add'>+	rs_sta = &amp;psta-&gt;rs_sta;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;rs_sta-&gt;lock);</div><div class='add'>+	init_timer(&amp;rs_sta-&gt;rate_scale_flush);</div><div class='add'>+</div><div class='add'>+	D_RATE("leave\n");</div><div class='add'>+</div><div class='add'>+	return rs_sta;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_rs_free_sta(void *il_priv, struct ieee80211_sta *sta, void *il_sta)</div><div class='add'>+{</div><div class='add'>+	struct il3945_rs_sta *rs_sta = il_sta;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Be careful not to use any members of il3945_rs_sta (like trying</div><div class='add'>+	 * to use il_priv to print out debugging) since it may not be fully</div><div class='add'>+	 * initialized at this point.</div><div class='add'>+	 */</div><div class='add'>+	del_timer_sync(&amp;rs_sta-&gt;rate_scale_flush);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_rs_tx_status - Update rate control values based on Tx results</div><div class='add'>+ *</div><div class='add'>+ * NOTE: Uses il_priv-&gt;retry_rate for the # of retries attempted by</div><div class='add'>+ * the hardware for each rate.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il3945_rs_tx_status(void *il_rate, struct ieee80211_supported_band *sband,</div><div class='add'>+		    struct ieee80211_sta *sta, void *il_sta,</div><div class='add'>+		    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	s8 retries = 0, current_count;</div><div class='add'>+	int scale_rate_idx, first_idx, last_idx;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct il_priv *il = (struct il_priv *)il_rate;</div><div class='add'>+	struct il3945_rs_sta *rs_sta = il_sta;</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+	D_RATE("enter\n");</div><div class='add'>+</div><div class='add'>+	retries = info-&gt;status.rates[0].count;</div><div class='add'>+	/* Sanity Check for retries */</div><div class='add'>+	if (retries &gt; RATE_RETRY_TH)</div><div class='add'>+		retries = RATE_RETRY_TH;</div><div class='add'>+</div><div class='add'>+	first_idx = sband-&gt;bitrates[info-&gt;status.rates[0].idx].hw_value;</div><div class='add'>+	if (first_idx &lt; 0 || first_idx &gt;= RATE_COUNT_3945) {</div><div class='add'>+		D_RATE("leave: Rate out of bounds: %d\n", first_idx);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!il_sta) {</div><div class='add'>+		D_RATE("leave: No STA il data to update!\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Treat uninitialized rate scaling data same as non-existing. */</div><div class='add'>+	if (!rs_sta-&gt;il) {</div><div class='add'>+		D_RATE("leave: STA il data uninitialized!\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rs_sta-&gt;tx_packets++;</div><div class='add'>+</div><div class='add'>+	scale_rate_idx = first_idx;</div><div class='add'>+	last_idx = first_idx;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Update the win for each rate.  We determine which rates</div><div class='add'>+	 * were Tx'd based on the total number of retries vs. the number</div><div class='add'>+	 * of retries configured for each rate -- currently set to the</div><div class='add'>+	 * il value 'retry_rate' vs. rate specific</div><div class='add'>+	 *</div><div class='add'>+	 * On exit from this while loop last_idx indicates the rate</div><div class='add'>+	 * at which the frame was finally transmitted (or failed if no</div><div class='add'>+	 * ACK)</div><div class='add'>+	 */</div><div class='add'>+	while (retries &gt; 1) {</div><div class='add'>+		if ((retries - 1) &lt; il-&gt;retry_rate) {</div><div class='add'>+			current_count = (retries - 1);</div><div class='add'>+			last_idx = scale_rate_idx;</div><div class='add'>+		} else {</div><div class='add'>+			current_count = il-&gt;retry_rate;</div><div class='add'>+			last_idx = il3945_rs_next_rate(il, scale_rate_idx);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Update this rate accounting for as many retries</div><div class='add'>+		 * as was used for it (per current_count) */</div><div class='add'>+		il3945_collect_tx_data(rs_sta, &amp;rs_sta-&gt;win[scale_rate_idx], 0,</div><div class='add'>+				       current_count, scale_rate_idx);</div><div class='add'>+		D_RATE("Update rate %d for %d retries.\n", scale_rate_idx,</div><div class='add'>+		       current_count);</div><div class='add'>+</div><div class='add'>+		retries -= current_count;</div><div class='add'>+</div><div class='add'>+		scale_rate_idx = last_idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update the last idx win with success/failure based on ACK */</div><div class='add'>+	D_RATE("Update rate %d with %s.\n", last_idx,</div><div class='add'>+	       (info-&gt;flags &amp; IEEE80211_TX_STAT_ACK) ? "success" : "failure");</div><div class='add'>+	il3945_collect_tx_data(rs_sta, &amp;rs_sta-&gt;win[last_idx],</div><div class='add'>+			       info-&gt;flags &amp; IEEE80211_TX_STAT_ACK, 1,</div><div class='add'>+			       last_idx);</div><div class='add'>+</div><div class='add'>+	/* We updated the rate scale win -- if its been more than</div><div class='add'>+	 * flush_time since the last run, schedule the flush</div><div class='add'>+	 * again */</div><div class='add'>+	spin_lock_irqsave(&amp;rs_sta-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (!rs_sta-&gt;flush_pending &amp;&amp;</div><div class='add'>+	    time_after(jiffies, rs_sta-&gt;last_flush + rs_sta-&gt;flush_time)) {</div><div class='add'>+</div><div class='add'>+		rs_sta-&gt;last_partial_flush = jiffies;</div><div class='add'>+		rs_sta-&gt;flush_pending = 1;</div><div class='add'>+		mod_timer(&amp;rs_sta-&gt;rate_scale_flush,</div><div class='add'>+			  jiffies + rs_sta-&gt;flush_time);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;rs_sta-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	D_RATE("leave\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16</div><div class='add'>+il3945_get_adjacent_rate(struct il3945_rs_sta *rs_sta, u8 idx, u16 rate_mask,</div><div class='add'>+			 enum ieee80211_band band)</div><div class='add'>+{</div><div class='add'>+	u8 high = RATE_INVALID;</div><div class='add'>+	u8 low = RATE_INVALID;</div><div class='add'>+	struct il_priv *il __maybe_unused = rs_sta-&gt;il;</div><div class='add'>+</div><div class='add'>+	/* 802.11A walks to the next literal adjacent rate in</div><div class='add'>+	 * the rate table */</div><div class='add'>+	if (unlikely(band == IEEE80211_BAND_5GHZ)) {</div><div class='add'>+		int i;</div><div class='add'>+		u32 mask;</div><div class='add'>+</div><div class='add'>+		/* Find the previous rate that is in the rate mask */</div><div class='add'>+		i = idx - 1;</div><div class='add'>+		for (mask = (1 &lt;&lt; i); i &gt;= 0; i--, mask &gt;&gt;= 1) {</div><div class='add'>+			if (rate_mask &amp; mask) {</div><div class='add'>+				low = i;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Find the next rate that is in the rate mask */</div><div class='add'>+		i = idx + 1;</div><div class='add'>+		for (mask = (1 &lt;&lt; i); i &lt; RATE_COUNT_3945; i++, mask &lt;&lt;= 1) {</div><div class='add'>+			if (rate_mask &amp; mask) {</div><div class='add'>+				high = i;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return (high &lt;&lt; 8) | low;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	low = idx;</div><div class='add'>+	while (low != RATE_INVALID) {</div><div class='add'>+		if (rs_sta-&gt;tgg)</div><div class='add'>+			low = il3945_rates[low].prev_rs_tgg;</div><div class='add'>+		else</div><div class='add'>+			low = il3945_rates[low].prev_rs;</div><div class='add'>+		if (low == RATE_INVALID)</div><div class='add'>+			break;</div><div class='add'>+		if (rate_mask &amp; (1 &lt;&lt; low))</div><div class='add'>+			break;</div><div class='add'>+		D_RATE("Skipping masked lower rate: %d\n", low);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	high = idx;</div><div class='add'>+	while (high != RATE_INVALID) {</div><div class='add'>+		if (rs_sta-&gt;tgg)</div><div class='add'>+			high = il3945_rates[high].next_rs_tgg;</div><div class='add'>+		else</div><div class='add'>+			high = il3945_rates[high].next_rs;</div><div class='add'>+		if (high == RATE_INVALID)</div><div class='add'>+			break;</div><div class='add'>+		if (rate_mask &amp; (1 &lt;&lt; high))</div><div class='add'>+			break;</div><div class='add'>+		D_RATE("Skipping masked higher rate: %d\n", high);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (high &lt;&lt; 8) | low;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_rs_get_rate - find the rate for the requested packet</div><div class='add'>+ *</div><div class='add'>+ * Returns the ieee80211_rate structure allocated by the driver.</div><div class='add'>+ *</div><div class='add'>+ * The rate control algorithm has no internal mapping between hw_mode's</div><div class='add'>+ * rate ordering and the rate ordering used by the rate control algorithm.</div><div class='add'>+ *</div><div class='add'>+ * The rate control algorithm uses a single table of rates that goes across</div><div class='add'>+ * the entire A/B/G spectrum vs. being limited to just one particular</div><div class='add'>+ * hw_mode.</div><div class='add'>+ *</div><div class='add'>+ * As such, we can't convert the idx obtained below into the hw_mode's</div><div class='add'>+ * rate table and must reference the driver allocated rate table</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta, void *il_sta,</div><div class='add'>+		   struct ieee80211_tx_rate_control *txrc)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_supported_band *sband = txrc-&gt;sband;</div><div class='add'>+	struct sk_buff *skb = txrc-&gt;skb;</div><div class='add'>+	u8 low = RATE_INVALID;</div><div class='add'>+	u8 high = RATE_INVALID;</div><div class='add'>+	u16 high_low;</div><div class='add'>+	int idx;</div><div class='add'>+	struct il3945_rs_sta *rs_sta = il_sta;</div><div class='add'>+	struct il3945_rate_scale_data *win = NULL;</div><div class='add'>+	int current_tpt = IL_INVALID_VALUE;</div><div class='add'>+	int low_tpt = IL_INVALID_VALUE;</div><div class='add'>+	int high_tpt = IL_INVALID_VALUE;</div><div class='add'>+	u32 fail_count;</div><div class='add'>+	s8 scale_action = 0;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 rate_mask;</div><div class='add'>+	s8 max_rate_idx = -1;</div><div class='add'>+	struct il_priv *il __maybe_unused = (struct il_priv *)il_r;</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+	D_RATE("enter\n");</div><div class='add'>+</div><div class='add'>+	/* Treat uninitialized rate scaling data same as non-existing. */</div><div class='add'>+	if (rs_sta &amp;&amp; !rs_sta-&gt;il) {</div><div class='add'>+		D_RATE("Rate scaling information not initialized yet.\n");</div><div class='add'>+		il_sta = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rate_control_send_low(sta, il_sta, txrc))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rate_mask = sta-&gt;supp_rates[sband-&gt;band];</div><div class='add'>+</div><div class='add'>+	/* get user max rate if set */</div><div class='add'>+	max_rate_idx = txrc-&gt;max_rate_idx;</div><div class='add'>+	if (sband-&gt;band == IEEE80211_BAND_5GHZ &amp;&amp; max_rate_idx != -1)</div><div class='add'>+		max_rate_idx += IL_FIRST_OFDM_RATE;</div><div class='add'>+	if (max_rate_idx &lt; 0 || max_rate_idx &gt;= RATE_COUNT)</div><div class='add'>+		max_rate_idx = -1;</div><div class='add'>+</div><div class='add'>+	idx = min(rs_sta-&gt;last_txrate_idx &amp; 0xffff, RATE_COUNT_3945 - 1);</div><div class='add'>+</div><div class='add'>+	if (sband-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='add'>+		rate_mask = rate_mask &lt;&lt; IL_FIRST_OFDM_RATE;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;rs_sta-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* for recent assoc, choose best rate regarding</div><div class='add'>+	 * to rssi value</div><div class='add'>+	 */</div><div class='add'>+	if (rs_sta-&gt;start_rate != RATE_INVALID) {</div><div class='add'>+		if (rs_sta-&gt;start_rate &lt; idx &amp;&amp;</div><div class='add'>+		    (rate_mask &amp; (1 &lt;&lt; rs_sta-&gt;start_rate)))</div><div class='add'>+			idx = rs_sta-&gt;start_rate;</div><div class='add'>+		rs_sta-&gt;start_rate = RATE_INVALID;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* force user max rate if set by user */</div><div class='add'>+	if (max_rate_idx != -1 &amp;&amp; max_rate_idx &lt; idx) {</div><div class='add'>+		if (rate_mask &amp; (1 &lt;&lt; max_rate_idx))</div><div class='add'>+			idx = max_rate_idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	win = &amp;(rs_sta-&gt;win[idx]);</div><div class='add'>+</div><div class='add'>+	fail_count = win-&gt;counter - win-&gt;success_counter;</div><div class='add'>+</div><div class='add'>+	if (fail_count &lt; RATE_MIN_FAILURE_TH &amp;&amp;</div><div class='add'>+	    win-&gt;success_counter &lt; RATE_MIN_SUCCESS_TH) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;rs_sta-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		D_RATE("Invalid average_tpt on rate %d: "</div><div class='add'>+		       "counter: %d, success_counter: %d, "</div><div class='add'>+		       "expected_tpt is %sNULL\n", idx, win-&gt;counter,</div><div class='add'>+		       win-&gt;success_counter,</div><div class='add'>+		       rs_sta-&gt;expected_tpt ? "not " : "");</div><div class='add'>+</div><div class='add'>+		/* Can't calculate this yet; not enough history */</div><div class='add'>+		win-&gt;average_tpt = IL_INVALID_VALUE;</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	current_tpt = win-&gt;average_tpt;</div><div class='add'>+</div><div class='add'>+	high_low =</div><div class='add'>+	    il3945_get_adjacent_rate(rs_sta, idx, rate_mask, sband-&gt;band);</div><div class='add'>+	low = high_low &amp; 0xff;</div><div class='add'>+	high = (high_low &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	/* If user set max rate, dont allow higher than user constrain */</div><div class='add'>+	if (max_rate_idx != -1 &amp;&amp; max_rate_idx &lt; high)</div><div class='add'>+		high = RATE_INVALID;</div><div class='add'>+</div><div class='add'>+	/* Collect Measured throughputs of adjacent rates */</div><div class='add'>+	if (low != RATE_INVALID)</div><div class='add'>+		low_tpt = rs_sta-&gt;win[low].average_tpt;</div><div class='add'>+</div><div class='add'>+	if (high != RATE_INVALID)</div><div class='add'>+		high_tpt = rs_sta-&gt;win[high].average_tpt;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;rs_sta-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	scale_action = 0;</div><div class='add'>+</div><div class='add'>+	/* Low success ratio , need to drop the rate */</div><div class='add'>+	if (win-&gt;success_ratio &lt; RATE_DECREASE_TH || !current_tpt) {</div><div class='add'>+		D_RATE("decrease rate because of low success_ratio\n");</div><div class='add'>+		scale_action = -1;</div><div class='add'>+		/* No throughput measured yet for adjacent rates,</div><div class='add'>+		 * try increase */</div><div class='add'>+	} else if (low_tpt == IL_INVALID_VALUE &amp;&amp; high_tpt == IL_INVALID_VALUE) {</div><div class='add'>+</div><div class='add'>+		if (high != RATE_INVALID &amp;&amp;</div><div class='add'>+		    win-&gt;success_ratio &gt;= RATE_INCREASE_TH)</div><div class='add'>+			scale_action = 1;</div><div class='add'>+		else if (low != RATE_INVALID)</div><div class='add'>+			scale_action = 0;</div><div class='add'>+</div><div class='add'>+		/* Both adjacent throughputs are measured, but neither one has</div><div class='add'>+		 * better throughput; we're using the best rate, don't change</div><div class='add'>+		 * it! */</div><div class='add'>+	} else if (low_tpt != IL_INVALID_VALUE &amp;&amp; high_tpt != IL_INVALID_VALUE</div><div class='add'>+		   &amp;&amp; low_tpt &lt; current_tpt &amp;&amp; high_tpt &lt; current_tpt) {</div><div class='add'>+</div><div class='add'>+		D_RATE("No action -- low [%d] &amp; high [%d] &lt; "</div><div class='add'>+		       "current_tpt [%d]\n", low_tpt, high_tpt, current_tpt);</div><div class='add'>+		scale_action = 0;</div><div class='add'>+</div><div class='add'>+		/* At least one of the rates has better throughput */</div><div class='add'>+	} else {</div><div class='add'>+		if (high_tpt != IL_INVALID_VALUE) {</div><div class='add'>+</div><div class='add'>+			/* High rate has better throughput, Increase</div><div class='add'>+			 * rate */</div><div class='add'>+			if (high_tpt &gt; current_tpt &amp;&amp;</div><div class='add'>+			    win-&gt;success_ratio &gt;= RATE_INCREASE_TH)</div><div class='add'>+				scale_action = 1;</div><div class='add'>+			else {</div><div class='add'>+				D_RATE("decrease rate because of high tpt\n");</div><div class='add'>+				scale_action = 0;</div><div class='add'>+			}</div><div class='add'>+		} else if (low_tpt != IL_INVALID_VALUE) {</div><div class='add'>+			if (low_tpt &gt; current_tpt) {</div><div class='add'>+				D_RATE("decrease rate because of low tpt\n");</div><div class='add'>+				scale_action = -1;</div><div class='add'>+			} else if (win-&gt;success_ratio &gt;= RATE_INCREASE_TH) {</div><div class='add'>+				/* Lower rate has better</div><div class='add'>+				 * throughput,decrease rate */</div><div class='add'>+				scale_action = 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Sanity check; asked for decrease, but success rate or throughput</div><div class='add'>+	 * has been good at old rate.  Don't change it. */</div><div class='add'>+	if (scale_action == -1 &amp;&amp; low != RATE_INVALID &amp;&amp;</div><div class='add'>+	    (win-&gt;success_ratio &gt; RATE_HIGH_TH ||</div><div class='add'>+	     current_tpt &gt; 100 * rs_sta-&gt;expected_tpt[low]))</div><div class='add'>+		scale_action = 0;</div><div class='add'>+</div><div class='add'>+	switch (scale_action) {</div><div class='add'>+	case -1:</div><div class='add'>+		/* Decrese rate */</div><div class='add'>+		if (low != RATE_INVALID)</div><div class='add'>+			idx = low;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		/* Increase rate */</div><div class='add'>+		if (high != RATE_INVALID)</div><div class='add'>+			idx = high;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case 0:</div><div class='add'>+	default:</div><div class='add'>+		/* No change */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_RATE("Selected %d (action %d) - low %d high %d\n", idx, scale_action,</div><div class='add'>+	       low, high);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+</div><div class='add'>+	if (sband-&gt;band == IEEE80211_BAND_5GHZ) {</div><div class='add'>+		if (WARN_ON_ONCE(idx &lt; IL_FIRST_OFDM_RATE))</div><div class='add'>+			idx = IL_FIRST_OFDM_RATE;</div><div class='add'>+		rs_sta-&gt;last_txrate_idx = idx;</div><div class='add'>+		info-&gt;control.rates[0].idx = idx - IL_FIRST_OFDM_RATE;</div><div class='add'>+	} else {</div><div class='add'>+		rs_sta-&gt;last_txrate_idx = idx;</div><div class='add'>+		info-&gt;control.rates[0].idx = rs_sta-&gt;last_txrate_idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_RATE("leave: %d\n", idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='add'>+static int</div><div class='add'>+il3945_open_file_generic(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	file-&gt;private_data = inode-&gt;i_private;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il3945_sta_dbgfs_stats_table_read(struct file *file, char __user *user_buf,</div><div class='add'>+				  size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	char *buff;</div><div class='add'>+	int desc = 0;</div><div class='add'>+	int j;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	struct il3945_rs_sta *lq_sta = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	buff = kmalloc(1024, GFP_KERNEL);</div><div class='add'>+	if (!buff)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	desc +=</div><div class='add'>+	    sprintf(buff + desc,</div><div class='add'>+		    "tx packets=%d last rate idx=%d\n"</div><div class='add'>+		    "rate=0x%X flush time %d\n", lq_sta-&gt;tx_packets,</div><div class='add'>+		    lq_sta-&gt;last_txrate_idx, lq_sta-&gt;start_rate,</div><div class='add'>+		    jiffies_to_msecs(lq_sta-&gt;flush_time));</div><div class='add'>+	for (j = 0; j &lt; RATE_COUNT_3945; j++) {</div><div class='add'>+		desc +=</div><div class='add'>+		    sprintf(buff + desc, "counter=%d success=%d %%=%d\n",</div><div class='add'>+			    lq_sta-&gt;win[j].counter,</div><div class='add'>+			    lq_sta-&gt;win[j].success_counter,</div><div class='add'>+			    lq_sta-&gt;win[j].success_ratio);</div><div class='add'>+	}</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);</div><div class='add'>+	kfree(buff);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations rs_sta_dbgfs_stats_table_ops = {</div><div class='add'>+	.read = il3945_sta_dbgfs_stats_table_read,</div><div class='add'>+	.open = il3945_open_file_generic,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_add_debugfs(void *il, void *il_sta, struct dentry *dir)</div><div class='add'>+{</div><div class='add'>+	struct il3945_rs_sta *lq_sta = il_sta;</div><div class='add'>+</div><div class='add'>+	lq_sta-&gt;rs_sta_dbgfs_stats_table_file =</div><div class='add'>+	    debugfs_create_file("rate_stats_table", 0600, dir, lq_sta,</div><div class='add'>+				&amp;rs_sta_dbgfs_stats_table_ops);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_remove_debugfs(void *il, void *il_sta)</div><div class='add'>+{</div><div class='add'>+	struct il3945_rs_sta *lq_sta = il_sta;</div><div class='add'>+	debugfs_remove(lq_sta-&gt;rs_sta_dbgfs_stats_table_file);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialization of rate scaling information is done by driver after</div><div class='add'>+ * the station is added. Since mac80211 calls this function before a</div><div class='add'>+ * station is added we ignore it.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il3945_rs_rate_init_stub(void *il_r, struct ieee80211_supported_band *sband,</div><div class='add'>+			 struct ieee80211_sta *sta, void *il_sta)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rate_control_ops rs_ops = {</div><div class='add'>+	.module = NULL,</div><div class='add'>+	.name = RS_NAME,</div><div class='add'>+	.tx_status = il3945_rs_tx_status,</div><div class='add'>+	.get_rate = il3945_rs_get_rate,</div><div class='add'>+	.rate_init = il3945_rs_rate_init_stub,</div><div class='add'>+	.alloc = il3945_rs_alloc,</div><div class='add'>+	.free = il3945_rs_free,</div><div class='add'>+	.alloc_sta = il3945_rs_alloc_sta,</div><div class='add'>+	.free_sta = il3945_rs_free_sta,</div><div class='add'>+#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='add'>+	.add_sta_debugfs = il3945_add_debugfs,</div><div class='add'>+	.remove_sta_debugfs = il3945_remove_debugfs,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	s32 rssi = 0;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct il3945_rs_sta *rs_sta;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct il3945_sta_priv *psta;</div><div class='add'>+</div><div class='add'>+	D_RATE("enter\n");</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	sta =</div><div class='add'>+	    ieee80211_find_sta(il-&gt;ctx.vif, il-&gt;stations[sta_id].sta.sta.addr);</div><div class='add'>+	if (!sta) {</div><div class='add'>+		D_RATE("Unable to find station to initialize rate scaling.\n");</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	psta = (void *)sta-&gt;drv_priv;</div><div class='add'>+	rs_sta = &amp;psta-&gt;rs_sta;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;rs_sta-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	rs_sta-&gt;tgg = 0;</div><div class='add'>+	switch (il-&gt;band) {</div><div class='add'>+	case IEEE80211_BAND_2GHZ:</div><div class='add'>+		/* TODO: this always does G, not a regression */</div><div class='add'>+		if (il-&gt;ctx.active.flags &amp; RXON_FLG_TGG_PROTECT_MSK) {</div><div class='add'>+			rs_sta-&gt;tgg = 1;</div><div class='add'>+			rs_sta-&gt;expected_tpt = il3945_expected_tpt_g_prot;</div><div class='add'>+		} else</div><div class='add'>+			rs_sta-&gt;expected_tpt = il3945_expected_tpt_g;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_BAND_5GHZ:</div><div class='add'>+		rs_sta-&gt;expected_tpt = il3945_expected_tpt_a;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_NUM_BANDS:</div><div class='add'>+		BUG();</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;rs_sta-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	rssi = il-&gt;_3945.last_rx_rssi;</div><div class='add'>+	if (rssi == 0)</div><div class='add'>+		rssi = IL_MIN_RSSI_VAL;</div><div class='add'>+</div><div class='add'>+	D_RATE("Network RSSI: %d\n", rssi);</div><div class='add'>+</div><div class='add'>+	rs_sta-&gt;start_rate = il3945_get_rate_idx_by_rssi(rssi, il-&gt;band);</div><div class='add'>+</div><div class='add'>+	D_RATE("leave: rssi %d assign rate idx: " "%d (plcp 0x%x)\n", rssi,</div><div class='add'>+	       rs_sta-&gt;start_rate, il3945_rates[rs_sta-&gt;start_rate].plcp);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il3945_rate_control_register(void)</div><div class='add'>+{</div><div class='add'>+	return ieee80211_rate_control_register(&amp;rs_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il3945_rate_control_unregister(void)</div><div class='add'>+{</div><div class='add'>+	ieee80211_rate_control_unregister(&amp;rs_ops);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c<br/>new file mode 100644<br/>index 000000000000..1489b1573a6a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/3945.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/3945.c</a></div><div class='hunk'>@@ -0,0 +1,2743 @@</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.</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 version 2 of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution in the</div><div class='add'>+ * file called LICENSE.</div><div class='add'>+ *</div><div class='add'>+ * Contact Information:</div><div class='add'>+ *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='add'>+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='add'>+ *</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/pci.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "3945.h"</div><div class='add'>+</div><div class='add'>+/* Send led command */</div><div class='add'>+static int</div><div class='add'>+il3945_send_led_cmd(struct il_priv *il, struct il_led_cmd *led_cmd)</div><div class='add'>+{</div><div class='add'>+	struct il_host_cmd cmd = {</div><div class='add'>+		.id = C_LEDS,</div><div class='add'>+		.len = sizeof(struct il_led_cmd),</div><div class='add'>+		.data = led_cmd,</div><div class='add'>+		.flags = CMD_ASYNC,</div><div class='add'>+		.callback = NULL,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return il_send_cmd(il, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct il_led_ops il3945_led_ops = {</div><div class='add'>+	.cmd = il3945_send_led_cmd,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IL_DECLARE_RATE_INFO(r, ip, in, rp, rn, pp, np)    \</div><div class='add'>+	[RATE_##r##M_IDX] = { RATE_##r##M_PLCP,   \</div><div class='add'>+				    RATE_##r##M_IEEE,   \</div><div class='add'>+				    RATE_##ip##M_IDX, \</div><div class='add'>+				    RATE_##in##M_IDX, \</div><div class='add'>+				    RATE_##rp##M_IDX, \</div><div class='add'>+				    RATE_##rn##M_IDX, \</div><div class='add'>+				    RATE_##pp##M_IDX, \</div><div class='add'>+				    RATE_##np##M_IDX, \</div><div class='add'>+				    RATE_##r##M_IDX_TBL, \</div><div class='add'>+				    RATE_##ip##M_IDX_TBL }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Parameter order:</div><div class='add'>+ *   rate, prev rate, next rate, prev tgg rate, next tgg rate</div><div class='add'>+ *</div><div class='add'>+ * If there isn't a valid next or previous rate then INV is used which</div><div class='add'>+ * maps to RATE_INVALID</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+const struct il3945_rate_info il3945_rates[RATE_COUNT_3945] = {</div><div class='add'>+	IL_DECLARE_RATE_INFO(1, INV, 2, INV, 2, INV, 2),	/*  1mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(2, 1, 5, 1, 5, 1, 5),	/*  2mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(5, 2, 6, 2, 11, 2, 11),	/*5.5mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(11, 9, 12, 5, 12, 5, 18),	/* 11mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(6, 5, 9, 5, 11, 5, 11),	/*  6mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(9, 6, 11, 5, 11, 5, 11),	/*  9mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(12, 11, 18, 11, 18, 11, 18),	/* 12mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(18, 12, 24, 12, 24, 11, 24),	/* 18mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(24, 18, 36, 18, 36, 18, 36),	/* 24mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(36, 24, 48, 24, 48, 24, 48),	/* 36mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(48, 36, 54, 36, 54, 36, 54),	/* 48mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(54, 48, INV, 48, INV, 48, INV),	/* 54mbps */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u8</div><div class='add'>+il3945_get_prev_ieee_rate(u8 rate_idx)</div><div class='add'>+{</div><div class='add'>+	u8 rate = il3945_rates[rate_idx].prev_ieee;</div><div class='add'>+</div><div class='add'>+	if (rate == RATE_INVALID)</div><div class='add'>+		rate = rate_idx;</div><div class='add'>+	return rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* 1 = enable the il3945_disable_events() function */</div><div class='add'>+#define IL_EVT_DISABLE (0)</div><div class='add'>+#define IL_EVT_DISABLE_SIZE (1532/32)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_disable_events - Disable selected events in uCode event log</div><div class='add'>+ *</div><div class='add'>+ * Disable an event by writing "1"s into "disable"</div><div class='add'>+ *   bitmap in SRAM.  Bit position corresponds to Event # (id/type).</div><div class='add'>+ *   Default values of 0 enable uCode events to be logged.</div><div class='add'>+ * Use for only special debugging.  This function is just a placeholder as-is,</div><div class='add'>+ *   you'll need to provide the special bits! ...</div><div class='add'>+ *   ... and set IL_EVT_DISABLE to 1. */</div><div class='add'>+void</div><div class='add'>+il3945_disable_events(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 base;		/* SRAM address of event log header */</div><div class='add'>+	u32 disable_ptr;	/* SRAM address of event-disable bitmap array */</div><div class='add'>+	u32 array_size;		/* # of u32 entries in array */</div><div class='add'>+	static const u32 evt_disable[IL_EVT_DISABLE_SIZE] = {</div><div class='add'>+		0x00000000,	/*   31 -    0  Event id numbers */</div><div class='add'>+		0x00000000,	/*   63 -   32 */</div><div class='add'>+		0x00000000,	/*   95 -   64 */</div><div class='add'>+		0x00000000,	/*  127 -   96 */</div><div class='add'>+		0x00000000,	/*  159 -  128 */</div><div class='add'>+		0x00000000,	/*  191 -  160 */</div><div class='add'>+		0x00000000,	/*  223 -  192 */</div><div class='add'>+		0x00000000,	/*  255 -  224 */</div><div class='add'>+		0x00000000,	/*  287 -  256 */</div><div class='add'>+		0x00000000,	/*  319 -  288 */</div><div class='add'>+		0x00000000,	/*  351 -  320 */</div><div class='add'>+		0x00000000,	/*  383 -  352 */</div><div class='add'>+		0x00000000,	/*  415 -  384 */</div><div class='add'>+		0x00000000,	/*  447 -  416 */</div><div class='add'>+		0x00000000,	/*  479 -  448 */</div><div class='add'>+		0x00000000,	/*  511 -  480 */</div><div class='add'>+		0x00000000,	/*  543 -  512 */</div><div class='add'>+		0x00000000,	/*  575 -  544 */</div><div class='add'>+		0x00000000,	/*  607 -  576 */</div><div class='add'>+		0x00000000,	/*  639 -  608 */</div><div class='add'>+		0x00000000,	/*  671 -  640 */</div><div class='add'>+		0x00000000,	/*  703 -  672 */</div><div class='add'>+		0x00000000,	/*  735 -  704 */</div><div class='add'>+		0x00000000,	/*  767 -  736 */</div><div class='add'>+		0x00000000,	/*  799 -  768 */</div><div class='add'>+		0x00000000,	/*  831 -  800 */</div><div class='add'>+		0x00000000,	/*  863 -  832 */</div><div class='add'>+		0x00000000,	/*  895 -  864 */</div><div class='add'>+		0x00000000,	/*  927 -  896 */</div><div class='add'>+		0x00000000,	/*  959 -  928 */</div><div class='add'>+		0x00000000,	/*  991 -  960 */</div><div class='add'>+		0x00000000,	/* 1023 -  992 */</div><div class='add'>+		0x00000000,	/* 1055 - 1024 */</div><div class='add'>+		0x00000000,	/* 1087 - 1056 */</div><div class='add'>+		0x00000000,	/* 1119 - 1088 */</div><div class='add'>+		0x00000000,	/* 1151 - 1120 */</div><div class='add'>+		0x00000000,	/* 1183 - 1152 */</div><div class='add'>+		0x00000000,	/* 1215 - 1184 */</div><div class='add'>+		0x00000000,	/* 1247 - 1216 */</div><div class='add'>+		0x00000000,	/* 1279 - 1248 */</div><div class='add'>+		0x00000000,	/* 1311 - 1280 */</div><div class='add'>+		0x00000000,	/* 1343 - 1312 */</div><div class='add'>+		0x00000000,	/* 1375 - 1344 */</div><div class='add'>+		0x00000000,	/* 1407 - 1376 */</div><div class='add'>+		0x00000000,	/* 1439 - 1408 */</div><div class='add'>+		0x00000000,	/* 1471 - 1440 */</div><div class='add'>+		0x00000000,	/* 1503 - 1472 */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	base = le32_to_cpu(il-&gt;card_alive.log_event_table_ptr);</div><div class='add'>+	if (!il3945_hw_valid_rtc_data_addr(base)) {</div><div class='add'>+		IL_ERR("Invalid event log pointer 0x%08X\n", base);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	disable_ptr = il_read_targ_mem(il, base + (4 * sizeof(u32)));</div><div class='add'>+	array_size = il_read_targ_mem(il, base + (5 * sizeof(u32)));</div><div class='add'>+</div><div class='add'>+	if (IL_EVT_DISABLE &amp;&amp; array_size == IL_EVT_DISABLE_SIZE) {</div><div class='add'>+		D_INFO("Disabling selected uCode log events at 0x%x\n",</div><div class='add'>+		       disable_ptr);</div><div class='add'>+		for (i = 0; i &lt; IL_EVT_DISABLE_SIZE; i++)</div><div class='add'>+			il_write_targ_mem(il, disable_ptr + (i * sizeof(u32)),</div><div class='add'>+					  evt_disable[i]);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		D_INFO("Selected uCode log events may be disabled\n");</div><div class='add'>+		D_INFO("  by writing \"1\"s into disable bitmap\n");</div><div class='add'>+		D_INFO("  in SRAM at 0x%x, size %d u32s\n", disable_ptr,</div><div class='add'>+		       array_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il3945_hwrate_to_plcp_idx(u8 plcp)</div><div class='add'>+{</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; RATE_COUNT_3945; idx++)</div><div class='add'>+		if (il3945_rates[idx].plcp == plcp)</div><div class='add'>+			return idx;</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+#define TX_STATUS_ENTRY(x) case TX_3945_STATUS_FAIL_ ## x: return #x</div><div class='add'>+</div><div class='add'>+static const char *</div><div class='add'>+il3945_get_tx_fail_reason(u32 status)</div><div class='add'>+{</div><div class='add'>+	switch (status &amp; TX_STATUS_MSK) {</div><div class='add'>+	case TX_3945_STATUS_SUCCESS:</div><div class='add'>+		return "SUCCESS";</div><div class='add'>+		TX_STATUS_ENTRY(SHORT_LIMIT);</div><div class='add'>+		TX_STATUS_ENTRY(LONG_LIMIT);</div><div class='add'>+		TX_STATUS_ENTRY(FIFO_UNDERRUN);</div><div class='add'>+		TX_STATUS_ENTRY(MGMNT_ABORT);</div><div class='add'>+		TX_STATUS_ENTRY(NEXT_FRAG);</div><div class='add'>+		TX_STATUS_ENTRY(LIFE_EXPIRE);</div><div class='add'>+		TX_STATUS_ENTRY(DEST_PS);</div><div class='add'>+		TX_STATUS_ENTRY(ABORTED);</div><div class='add'>+		TX_STATUS_ENTRY(BT_RETRY);</div><div class='add'>+		TX_STATUS_ENTRY(STA_INVALID);</div><div class='add'>+		TX_STATUS_ENTRY(FRAG_DROPPED);</div><div class='add'>+		TX_STATUS_ENTRY(TID_DISABLE);</div><div class='add'>+		TX_STATUS_ENTRY(FRAME_FLUSHED);</div><div class='add'>+		TX_STATUS_ENTRY(INSUFFICIENT_CF_POLL);</div><div class='add'>+		TX_STATUS_ENTRY(TX_LOCKED);</div><div class='add'>+		TX_STATUS_ENTRY(NO_BEACON_ON_RADAR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "UNKNOWN";</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline const char *</div><div class='add'>+il3945_get_tx_fail_reason(u32 status)</div><div class='add'>+{</div><div class='add'>+	return "";</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * get ieee prev rate from rate scale table.</div><div class='add'>+ * for A and B mode we need to overright prev</div><div class='add'>+ * value</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il3945_rs_next_rate(struct il_priv *il, int rate)</div><div class='add'>+{</div><div class='add'>+	int next_rate = il3945_get_prev_ieee_rate(rate);</div><div class='add'>+</div><div class='add'>+	switch (il-&gt;band) {</div><div class='add'>+	case IEEE80211_BAND_5GHZ:</div><div class='add'>+		if (rate == RATE_12M_IDX)</div><div class='add'>+			next_rate = RATE_9M_IDX;</div><div class='add'>+		else if (rate == RATE_6M_IDX)</div><div class='add'>+			next_rate = RATE_6M_IDX;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_BAND_2GHZ:</div><div class='add'>+		if (!(il-&gt;_3945.sta_supp_rates &amp; IL_OFDM_RATES_MASK) &amp;&amp;</div><div class='add'>+		    il_is_associated(il)) {</div><div class='add'>+			if (rate == RATE_11M_IDX)</div><div class='add'>+				next_rate = RATE_5M_IDX;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return next_rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_tx_queue_reclaim - Reclaim Tx queue entries already Tx'd</div><div class='add'>+ *</div><div class='add'>+ * When FW advances 'R' idx, all entries between old and new 'R' idx</div><div class='add'>+ * need to be reclaimed. As result, some free space forms. If there is</div><div class='add'>+ * enough free space (&gt; low mark), wake the stack that feeds us.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il3945_tx_queue_reclaim(struct il_priv *il, int txq_id, int idx)</div><div class='add'>+{</div><div class='add'>+	struct il_tx_queue *txq = &amp;il-&gt;txq[txq_id];</div><div class='add'>+	struct il_queue *q = &amp;txq-&gt;q;</div><div class='add'>+	struct il_tx_info *tx_info;</div><div class='add'>+</div><div class='add'>+	BUG_ON(txq_id == IL39_CMD_QUEUE_NUM);</div><div class='add'>+</div><div class='add'>+	for (idx = il_queue_inc_wrap(idx, q-&gt;n_bd); q-&gt;read_ptr != idx;</div><div class='add'>+	     q-&gt;read_ptr = il_queue_inc_wrap(q-&gt;read_ptr, q-&gt;n_bd)) {</div><div class='add'>+</div><div class='add'>+		tx_info = &amp;txq-&gt;txb[txq-&gt;q.read_ptr];</div><div class='add'>+		ieee80211_tx_status_irqsafe(il-&gt;hw, tx_info-&gt;skb);</div><div class='add'>+		tx_info-&gt;skb = NULL;</div><div class='add'>+		il-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_free_tfd(il, txq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (il_queue_space(q) &gt; q-&gt;low_mark &amp;&amp; txq_id &gt;= 0 &amp;&amp;</div><div class='add'>+	    txq_id != IL39_CMD_QUEUE_NUM &amp;&amp; il-&gt;mac80211_registered)</div><div class='add'>+		il_wake_queue(il, txq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_hdl_tx - Handle Tx response</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il3945_hdl_tx(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	u16 sequence = le16_to_cpu(pkt-&gt;hdr.sequence);</div><div class='add'>+	int txq_id = SEQ_TO_QUEUE(sequence);</div><div class='add'>+	int idx = SEQ_TO_IDX(sequence);</div><div class='add'>+	struct il_tx_queue *txq = &amp;il-&gt;txq[txq_id];</div><div class='add'>+	struct ieee80211_tx_info *info;</div><div class='add'>+	struct il3945_tx_resp *tx_resp = (void *)&amp;pkt-&gt;u.raw[0];</div><div class='add'>+	u32 status = le32_to_cpu(tx_resp-&gt;status);</div><div class='add'>+	int rate_idx;</div><div class='add'>+	int fail;</div><div class='add'>+</div><div class='add'>+	if (idx &gt;= txq-&gt;q.n_bd || il_queue_used(&amp;txq-&gt;q, idx) == 0) {</div><div class='add'>+		IL_ERR("Read idx for DMA queue txq_id (%d) idx %d "</div><div class='add'>+		       "is out of range [0-%d] %d %d\n", txq_id, idx,</div><div class='add'>+		       txq-&gt;q.n_bd, txq-&gt;q.write_ptr, txq-&gt;q.read_ptr);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	txq-&gt;time_stamp = jiffies;</div><div class='add'>+	info = IEEE80211_SKB_CB(txq-&gt;txb[txq-&gt;q.read_ptr].skb);</div><div class='add'>+	ieee80211_tx_info_clear_status(info);</div><div class='add'>+</div><div class='add'>+	/* Fill the MRR chain with some info about on-chip retransmissions */</div><div class='add'>+	rate_idx = il3945_hwrate_to_plcp_idx(tx_resp-&gt;rate);</div><div class='add'>+	if (info-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='add'>+		rate_idx -= IL_FIRST_OFDM_RATE;</div><div class='add'>+</div><div class='add'>+	fail = tx_resp-&gt;failure_frame;</div><div class='add'>+</div><div class='add'>+	info-&gt;status.rates[0].idx = rate_idx;</div><div class='add'>+	info-&gt;status.rates[0].count = fail + 1;	/* add final attempt */</div><div class='add'>+</div><div class='add'>+	/* tx_status-&gt;rts_retry_count = tx_resp-&gt;failure_rts; */</div><div class='add'>+	info-&gt;flags |=</div><div class='add'>+	    ((status &amp; TX_STATUS_MSK) ==</div><div class='add'>+	     TX_STATUS_SUCCESS) ? IEEE80211_TX_STAT_ACK : 0;</div><div class='add'>+</div><div class='add'>+	D_TX("Tx queue %d Status %s (0x%08x) plcp rate %d retries %d\n", txq_id,</div><div class='add'>+	     il3945_get_tx_fail_reason(status), status, tx_resp-&gt;rate,</div><div class='add'>+	     tx_resp-&gt;failure_frame);</div><div class='add'>+</div><div class='add'>+	D_TX_REPLY("Tx queue reclaim %d\n", idx);</div><div class='add'>+	il3945_tx_queue_reclaim(il, txq_id, idx);</div><div class='add'>+</div><div class='add'>+	if (status &amp; TX_ABORT_REQUIRED_MSK)</div><div class='add'>+		IL_ERR("TODO:  Implement Tx ABORT REQUIRED!!!\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Intel PRO/Wireless 3945ABG/BG Network Connection</div><div class='add'>+ *</div><div class='add'>+ *  RX handler implementations</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+static void</div><div class='add'>+il3945_accumulative_stats(struct il_priv *il, __le32 * stats)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	__le32 *prev_stats;</div><div class='add'>+	u32 *accum_stats;</div><div class='add'>+	u32 *delta, *max_delta;</div><div class='add'>+</div><div class='add'>+	prev_stats = (__le32 *) &amp;il-&gt;_3945.stats;</div><div class='add'>+	accum_stats = (u32 *) &amp;il-&gt;_3945.accum_stats;</div><div class='add'>+	delta = (u32 *) &amp;il-&gt;_3945.delta_stats;</div><div class='add'>+	max_delta = (u32 *) &amp;il-&gt;_3945.max_delta;</div><div class='add'>+</div><div class='add'>+	for (i = sizeof(__le32); i &lt; sizeof(struct il3945_notif_stats);</div><div class='add'>+	     i +=</div><div class='add'>+	     sizeof(__le32), stats++, prev_stats++, delta++, max_delta++,</div><div class='add'>+	     accum_stats++) {</div><div class='add'>+		if (le32_to_cpu(*stats) &gt; le32_to_cpu(*prev_stats)) {</div><div class='add'>+			*delta =</div><div class='add'>+			    (le32_to_cpu(*stats) - le32_to_cpu(*prev_stats));</div><div class='add'>+			*accum_stats += *delta;</div><div class='add'>+			if (*delta &gt; *max_delta)</div><div class='add'>+				*max_delta = *delta;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* reset accumulative stats for "no-counter" type stats */</div><div class='add'>+	il-&gt;_3945.accum_stats.general.temperature =</div><div class='add'>+	    il-&gt;_3945.stats.general.temperature;</div><div class='add'>+	il-&gt;_3945.accum_stats.general.ttl_timestamp =</div><div class='add'>+	    il-&gt;_3945.stats.general.ttl_timestamp;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il3945_hdl_stats(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+</div><div class='add'>+	D_RX("Statistics notification received (%d vs %d).\n",</div><div class='add'>+	     (int)sizeof(struct il3945_notif_stats),</div><div class='add'>+	     le32_to_cpu(pkt-&gt;len_n_flags) &amp; IL_RX_FRAME_SIZE_MSK);</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+	il3945_accumulative_stats(il, (__le32 *) &amp;pkt-&gt;u.raw);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;il-&gt;_3945.stats, pkt-&gt;u.raw, sizeof(il-&gt;_3945.stats));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il3945_hdl_c_stats(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	__le32 *flag = (__le32 *) &amp;pkt-&gt;u.raw;</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(*flag) &amp; UCODE_STATS_CLEAR_MSK) {</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+		memset(&amp;il-&gt;_3945.accum_stats, 0,</div><div class='add'>+		       sizeof(struct il3945_notif_stats));</div><div class='add'>+		memset(&amp;il-&gt;_3945.delta_stats, 0,</div><div class='add'>+		       sizeof(struct il3945_notif_stats));</div><div class='add'>+		memset(&amp;il-&gt;_3945.max_delta, 0,</div><div class='add'>+		       sizeof(struct il3945_notif_stats));</div><div class='add'>+#endif</div><div class='add'>+		D_RX("Statistics have been cleared\n");</div><div class='add'>+	}</div><div class='add'>+	il3945_hdl_stats(il, rxb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Misc. internal state and helper functions</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+/* This is necessary only for a number of stats, see the caller. */</div><div class='add'>+static int</div><div class='add'>+il3945_is_network_packet(struct il_priv *il, struct ieee80211_hdr *header)</div><div class='add'>+{</div><div class='add'>+	/* Filter incoming packets to determine if they are targeted toward</div><div class='add'>+	 * this network, discarding packets coming from ourselves */</div><div class='add'>+	switch (il-&gt;iw_mode) {</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:	/* Header: Dest. | Source    | BSSID */</div><div class='add'>+		/* packets to our IBSS update information */</div><div class='add'>+		return !compare_ether_addr(header-&gt;addr3, il-&gt;bssid);</div><div class='add'>+	case NL80211_IFTYPE_STATION:	/* Header: Dest. | AP{BSSID} | Source */</div><div class='add'>+		/* packets to our IBSS update information */</div><div class='add'>+		return !compare_ether_addr(header-&gt;addr2, il-&gt;bssid);</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'>+static void</div><div class='add'>+il3945_pass_packet_to_mac80211(struct il_priv *il, struct il_rx_buf *rxb,</div><div class='add'>+			       struct ieee80211_rx_status *stats)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)IL_RX_DATA(pkt);</div><div class='add'>+	struct il3945_rx_frame_hdr *rx_hdr = IL_RX_HDR(pkt);</div><div class='add'>+	struct il3945_rx_frame_end *rx_end = IL_RX_END(pkt);</div><div class='add'>+	u16 len = le16_to_cpu(rx_hdr-&gt;len);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	__le16 fc = hdr-&gt;frame_control;</div><div class='add'>+</div><div class='add'>+	/* We received data from the HW, so stop the watchdog */</div><div class='add'>+	if (unlikely</div><div class='add'>+	    (len + IL39_RX_FRAME_SIZE &gt;</div><div class='add'>+	     PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order)) {</div><div class='add'>+		D_DROP("Corruption detected!\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We only process data packets if the interface is open */</div><div class='add'>+	if (unlikely(!il-&gt;is_open)) {</div><div class='add'>+		D_DROP("Dropping packet while interface is not open.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(128);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		IL_ERR("dev_alloc_skb failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!il3945_mod_params.sw_crypto)</div><div class='add'>+		il_set_decrypted_flag(il, (struct ieee80211_hdr *)rxb_addr(rxb),</div><div class='add'>+				      le32_to_cpu(rx_end-&gt;status), stats);</div><div class='add'>+</div><div class='add'>+	skb_add_rx_frag(skb, 0, rxb-&gt;page,</div><div class='add'>+			(void *)rx_hdr-&gt;payload - (void *)pkt, len);</div><div class='add'>+</div><div class='add'>+	il_update_stats(il, false, fc, len);</div><div class='add'>+	memcpy(IEEE80211_SKB_RXCB(skb), stats, sizeof(*stats));</div><div class='add'>+</div><div class='add'>+	ieee80211_rx(il-&gt;hw, skb);</div><div class='add'>+	il-&gt;alloc_rxb_page--;</div><div class='add'>+	rxb-&gt;page = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IL_DELAY_NEXT_SCAN_AFTER_ASSOC (HZ*6)</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_hdl_rx(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *header;</div><div class='add'>+	struct ieee80211_rx_status rx_status;</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	struct il3945_rx_frame_stats *rx_stats = IL_RX_STATS(pkt);</div><div class='add'>+	struct il3945_rx_frame_hdr *rx_hdr = IL_RX_HDR(pkt);</div><div class='add'>+	struct il3945_rx_frame_end *rx_end = IL_RX_END(pkt);</div><div class='add'>+	u16 rx_stats_sig_avg __maybe_unused = le16_to_cpu(rx_stats-&gt;sig_avg);</div><div class='add'>+	u16 rx_stats_noise_diff __maybe_unused =</div><div class='add'>+	    le16_to_cpu(rx_stats-&gt;noise_diff);</div><div class='add'>+	u8 network_packet;</div><div class='add'>+</div><div class='add'>+	rx_status.flag = 0;</div><div class='add'>+	rx_status.mactime = le64_to_cpu(rx_end-&gt;timestamp);</div><div class='add'>+	rx_status.band =</div><div class='add'>+	    (rx_hdr-&gt;</div><div class='add'>+	     phy_flags &amp; RX_RES_PHY_FLAGS_BAND_24_MSK) ? IEEE80211_BAND_2GHZ :</div><div class='add'>+	    IEEE80211_BAND_5GHZ;</div><div class='add'>+	rx_status.freq =</div><div class='add'>+	    ieee80211_channel_to_frequency(le16_to_cpu(rx_hdr-&gt;channel),</div><div class='add'>+					   rx_status.band);</div><div class='add'>+</div><div class='add'>+	rx_status.rate_idx = il3945_hwrate_to_plcp_idx(rx_hdr-&gt;rate);</div><div class='add'>+	if (rx_status.band == IEEE80211_BAND_5GHZ)</div><div class='add'>+		rx_status.rate_idx -= IL_FIRST_OFDM_RATE;</div><div class='add'>+</div><div class='add'>+	rx_status.antenna =</div><div class='add'>+	    (le16_to_cpu(rx_hdr-&gt;phy_flags) &amp; RX_RES_PHY_FLAGS_ANTENNA_MSK) &gt;&gt;</div><div class='add'>+	    4;</div><div class='add'>+</div><div class='add'>+	/* set the preamble flag if appropriate */</div><div class='add'>+	if (rx_hdr-&gt;phy_flags &amp; RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK)</div><div class='add'>+		rx_status.flag |= RX_FLAG_SHORTPRE;</div><div class='add'>+</div><div class='add'>+	if ((unlikely(rx_stats-&gt;phy_count &gt; 20))) {</div><div class='add'>+		D_DROP("dsp size out of range [0,20]: %d/n",</div><div class='add'>+		       rx_stats-&gt;phy_count);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(rx_end-&gt;status &amp; RX_RES_STATUS_NO_CRC32_ERROR) ||</div><div class='add'>+	    !(rx_end-&gt;status &amp; RX_RES_STATUS_NO_RXE_OVERFLOW)) {</div><div class='add'>+		D_RX("Bad CRC or FIFO: 0x%08X.\n", rx_end-&gt;status);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Convert 3945's rssi indicator to dBm */</div><div class='add'>+	rx_status.signal = rx_stats-&gt;rssi - IL39_RSSI_OFFSET;</div><div class='add'>+</div><div class='add'>+	D_STATS("Rssi %d sig_avg %d noise_diff %d\n", rx_status.signal,</div><div class='add'>+		rx_stats_sig_avg, rx_stats_noise_diff);</div><div class='add'>+</div><div class='add'>+	header = (struct ieee80211_hdr *)IL_RX_DATA(pkt);</div><div class='add'>+</div><div class='add'>+	network_packet = il3945_is_network_packet(il, header);</div><div class='add'>+</div><div class='add'>+	D_STATS("[%c] %d RSSI:%d Signal:%u, Rate:%u\n",</div><div class='add'>+		network_packet ? '*' : ' ', le16_to_cpu(rx_hdr-&gt;channel),</div><div class='add'>+		rx_status.signal, rx_status.signal, rx_status.rate_idx);</div><div class='add'>+</div><div class='add'>+	il_dbg_log_rx_data_frame(il, le16_to_cpu(rx_hdr-&gt;len), header);</div><div class='add'>+</div><div class='add'>+	if (network_packet) {</div><div class='add'>+		il-&gt;_3945.last_beacon_time =</div><div class='add'>+		    le32_to_cpu(rx_end-&gt;beacon_timestamp);</div><div class='add'>+		il-&gt;_3945.last_tsf = le64_to_cpu(rx_end-&gt;timestamp);</div><div class='add'>+		il-&gt;_3945.last_rx_rssi = rx_status.signal;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il3945_pass_packet_to_mac80211(il, rxb, &amp;rx_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il3945_hw_txq_attach_buf_to_tfd(struct il_priv *il, struct il_tx_queue *txq,</div><div class='add'>+				dma_addr_t addr, u16 len, u8 reset, u8 pad)</div><div class='add'>+{</div><div class='add'>+	int count;</div><div class='add'>+	struct il_queue *q;</div><div class='add'>+	struct il3945_tfd *tfd, *tfd_tmp;</div><div class='add'>+</div><div class='add'>+	q = &amp;txq-&gt;q;</div><div class='add'>+	tfd_tmp = (struct il3945_tfd *)txq-&gt;tfds;</div><div class='add'>+	tfd = &amp;tfd_tmp[q-&gt;write_ptr];</div><div class='add'>+</div><div class='add'>+	if (reset)</div><div class='add'>+		memset(tfd, 0, sizeof(*tfd));</div><div class='add'>+</div><div class='add'>+	count = TFD_CTL_COUNT_GET(le32_to_cpu(tfd-&gt;control_flags));</div><div class='add'>+</div><div class='add'>+	if (count &gt;= NUM_TFD_CHUNKS || count &lt; 0) {</div><div class='add'>+		IL_ERR("Error can not send more than %d chunks\n",</div><div class='add'>+		       NUM_TFD_CHUNKS);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tfd-&gt;tbs[count].addr = cpu_to_le32(addr);</div><div class='add'>+	tfd-&gt;tbs[count].len = cpu_to_le32(len);</div><div class='add'>+</div><div class='add'>+	count++;</div><div class='add'>+</div><div class='add'>+	tfd-&gt;control_flags =</div><div class='add'>+	    cpu_to_le32(TFD_CTL_COUNT_SET(count) | TFD_CTL_PAD_SET(pad));</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'>+ * il3945_hw_txq_free_tfd - Free one TFD, those at idx [txq-&gt;q.read_ptr]</div><div class='add'>+ *</div><div class='add'>+ * Does NOT advance any idxes</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il3945_hw_txq_free_tfd(struct il_priv *il, struct il_tx_queue *txq)</div><div class='add'>+{</div><div class='add'>+	struct il3945_tfd *tfd_tmp = (struct il3945_tfd *)txq-&gt;tfds;</div><div class='add'>+	int idx = txq-&gt;q.read_ptr;</div><div class='add'>+	struct il3945_tfd *tfd = &amp;tfd_tmp[idx];</div><div class='add'>+	struct pci_dev *dev = il-&gt;pci_dev;</div><div class='add'>+	int i;</div><div class='add'>+	int counter;</div><div class='add'>+</div><div class='add'>+	/* sanity check */</div><div class='add'>+	counter = TFD_CTL_COUNT_GET(le32_to_cpu(tfd-&gt;control_flags));</div><div class='add'>+	if (counter &gt; NUM_TFD_CHUNKS) {</div><div class='add'>+		IL_ERR("Too many chunks: %i\n", counter);</div><div class='add'>+		/* @todo issue fatal error, it is quite serious situation */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Unmap tx_cmd */</div><div class='add'>+	if (counter)</div><div class='add'>+		pci_unmap_single(dev, dma_unmap_addr(&amp;txq-&gt;meta[idx], mapping),</div><div class='add'>+				 dma_unmap_len(&amp;txq-&gt;meta[idx], len),</div><div class='add'>+				 PCI_DMA_TODEVICE);</div><div class='add'>+</div><div class='add'>+	/* unmap chunks if any */</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; counter; i++)</div><div class='add'>+		pci_unmap_single(dev, le32_to_cpu(tfd-&gt;tbs[i].addr),</div><div class='add'>+				 le32_to_cpu(tfd-&gt;tbs[i].len),</div><div class='add'>+				 PCI_DMA_TODEVICE);</div><div class='add'>+</div><div class='add'>+	/* free SKB */</div><div class='add'>+	if (txq-&gt;txb) {</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		skb = txq-&gt;txb[txq-&gt;q.read_ptr].skb;</div><div class='add'>+</div><div class='add'>+		/* can be called from irqs-disabled context */</div><div class='add'>+		if (skb) {</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			txq-&gt;txb[txq-&gt;q.read_ptr].skb = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_hw_build_tx_cmd_rate - Add rate portion to TX_CMD:</div><div class='add'>+ *</div><div class='add'>+*/</div><div class='add'>+void</div><div class='add'>+il3945_hw_build_tx_cmd_rate(struct il_priv *il, struct il_device_cmd *cmd,</div><div class='add'>+			    struct ieee80211_tx_info *info,</div><div class='add'>+			    struct ieee80211_hdr *hdr, int sta_id)</div><div class='add'>+{</div><div class='add'>+	u16 hw_value = ieee80211_get_tx_rate(il-&gt;hw, info)-&gt;hw_value;</div><div class='add'>+	u16 rate_idx = min(hw_value &amp; 0xffff, RATE_COUNT_3945 - 1);</div><div class='add'>+	u16 rate_mask;</div><div class='add'>+	int rate;</div><div class='add'>+	const u8 rts_retry_limit = 7;</div><div class='add'>+	u8 data_retry_limit;</div><div class='add'>+	__le32 tx_flags;</div><div class='add'>+	__le16 fc = hdr-&gt;frame_control;</div><div class='add'>+	struct il3945_tx_cmd *tx_cmd = (struct il3945_tx_cmd *)cmd-&gt;cmd.payload;</div><div class='add'>+</div><div class='add'>+	rate = il3945_rates[rate_idx].plcp;</div><div class='add'>+	tx_flags = tx_cmd-&gt;tx_flags;</div><div class='add'>+</div><div class='add'>+	/* We need to figure out how to get the sta-&gt;supp_rates while</div><div class='add'>+	 * in this running context */</div><div class='add'>+	rate_mask = RATES_MASK_3945;</div><div class='add'>+</div><div class='add'>+	/* Set retry limit on DATA packets and Probe Responses */</div><div class='add'>+	if (ieee80211_is_probe_resp(fc))</div><div class='add'>+		data_retry_limit = 3;</div><div class='add'>+	else</div><div class='add'>+		data_retry_limit = IL_DEFAULT_TX_RETRY;</div><div class='add'>+	tx_cmd-&gt;data_retry_limit = data_retry_limit;</div><div class='add'>+	/* Set retry limit on RTS packets */</div><div class='add'>+	tx_cmd-&gt;rts_retry_limit = min(data_retry_limit, rts_retry_limit);</div><div class='add'>+</div><div class='add'>+	tx_cmd-&gt;rate = rate;</div><div class='add'>+	tx_cmd-&gt;tx_flags = tx_flags;</div><div class='add'>+</div><div class='add'>+	/* OFDM */</div><div class='add'>+	tx_cmd-&gt;supp_rates[0] =</div><div class='add'>+	    ((rate_mask &amp; IL_OFDM_RATES_MASK) &gt;&gt; IL_FIRST_OFDM_RATE) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	/* CCK */</div><div class='add'>+	tx_cmd-&gt;supp_rates[1] = (rate_mask &amp; 0xF);</div><div class='add'>+</div><div class='add'>+	D_RATE("Tx sta id: %d, rate: %d (plcp), flags: 0x%4X "</div><div class='add'>+	       "cck/ofdm mask: 0x%x/0x%x\n", sta_id, tx_cmd-&gt;rate,</div><div class='add'>+	       le32_to_cpu(tx_cmd-&gt;tx_flags), tx_cmd-&gt;supp_rates[1],</div><div class='add'>+	       tx_cmd-&gt;supp_rates[0]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+il3945_sync_sta(struct il_priv *il, int sta_id, u16 tx_rate)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags_spin;</div><div class='add'>+	struct il_station_entry *station;</div><div class='add'>+</div><div class='add'>+	if (sta_id == IL_INVALID_STATION)</div><div class='add'>+		return IL_INVALID_STATION;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+	station = &amp;il-&gt;stations[sta_id];</div><div class='add'>+</div><div class='add'>+	station-&gt;sta.sta.modify_mask = STA_MODIFY_TX_RATE_MSK;</div><div class='add'>+	station-&gt;sta.rate_n_flags = cpu_to_le16(tx_rate);</div><div class='add'>+	station-&gt;sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='add'>+	il_send_add_sta(il, &amp;station-&gt;sta, CMD_ASYNC);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+</div><div class='add'>+	D_RATE("SCALE sync station %d to rate %d\n", sta_id, tx_rate);</div><div class='add'>+	return sta_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_set_pwr_vmain(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+/*</div><div class='add'>+ * (for documentation purposes)</div><div class='add'>+ * to set power to V_AUX, do</div><div class='add'>+</div><div class='add'>+		if (pci_pme_capable(il-&gt;pci_dev, PCI_D3cold)) {</div><div class='add'>+			il_set_bits_mask_prph(il, APMG_PS_CTRL_REG,</div><div class='add'>+					APMG_PS_CTRL_VAL_PWR_SRC_VAUX,</div><div class='add'>+					~APMG_PS_CTRL_MSK_PWR_SRC);</div><div class='add'>+</div><div class='add'>+			_il_poll_bit(il, CSR_GPIO_IN,</div><div class='add'>+				     CSR_GPIO_IN_VAL_VAUX_PWR_SRC,</div><div class='add'>+				     CSR_GPIO_IN_BIT_AUX_POWER, 5000);</div><div class='add'>+		}</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+	il_set_bits_mask_prph(il, APMG_PS_CTRL_REG,</div><div class='add'>+			      APMG_PS_CTRL_VAL_PWR_SRC_VMAIN,</div><div class='add'>+			      ~APMG_PS_CTRL_MSK_PWR_SRC);</div><div class='add'>+</div><div class='add'>+	_il_poll_bit(il, CSR_GPIO_IN, CSR_GPIO_IN_VAL_VMAIN_PWR_SRC,</div><div class='add'>+		     CSR_GPIO_IN_BIT_AUX_POWER, 5000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il3945_rx_init(struct il_priv *il, struct il_rx_queue *rxq)</div><div class='add'>+{</div><div class='add'>+	il_wr(il, FH39_RCSR_RBD_BASE(0), rxq-&gt;bd_dma);</div><div class='add'>+	il_wr(il, FH39_RCSR_RPTR_ADDR(0), rxq-&gt;rb_stts_dma);</div><div class='add'>+	il_wr(il, FH39_RCSR_WPTR(0), 0);</div><div class='add'>+	il_wr(il, FH39_RCSR_CONFIG(0),</div><div class='add'>+	      FH39_RCSR_RX_CONFIG_REG_VAL_DMA_CHNL_EN_ENABLE |</div><div class='add'>+	      FH39_RCSR_RX_CONFIG_REG_VAL_RDRBD_EN_ENABLE |</div><div class='add'>+	      FH39_RCSR_RX_CONFIG_REG_BIT_WR_STTS_EN |</div><div class='add'>+	      FH39_RCSR_RX_CONFIG_REG_VAL_MAX_FRAG_SIZE_128 | (RX_QUEUE_SIZE_LOG</div><div class='add'>+							       &lt;&lt;</div><div class='add'>+							       FH39_RCSR_RX_CONFIG_REG_POS_RBDC_SIZE)</div><div class='add'>+	      | FH39_RCSR_RX_CONFIG_REG_VAL_IRQ_DEST_INT_HOST | (1 &lt;&lt;</div><div class='add'>+								 FH39_RCSR_RX_CONFIG_REG_POS_IRQ_RBTH)</div><div class='add'>+	      | FH39_RCSR_RX_CONFIG_REG_VAL_MSG_MODE_FH);</div><div class='add'>+</div><div class='add'>+	/* fake read to flush all prev I/O */</div><div class='add'>+	il_rd(il, FH39_RSSR_CTRL);</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'>+il3945_tx_reset(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	/* bypass mode */</div><div class='add'>+	il_wr_prph(il, ALM_SCD_MODE_REG, 0x2);</div><div class='add'>+</div><div class='add'>+	/* RA 0 is active */</div><div class='add'>+	il_wr_prph(il, ALM_SCD_ARASTAT_REG, 0x01);</div><div class='add'>+</div><div class='add'>+	/* all 6 fifo are active */</div><div class='add'>+	il_wr_prph(il, ALM_SCD_TXFACT_REG, 0x3f);</div><div class='add'>+</div><div class='add'>+	il_wr_prph(il, ALM_SCD_SBYP_MODE_1_REG, 0x010000);</div><div class='add'>+	il_wr_prph(il, ALM_SCD_SBYP_MODE_2_REG, 0x030002);</div><div class='add'>+	il_wr_prph(il, ALM_SCD_TXF4MF_REG, 0x000004);</div><div class='add'>+	il_wr_prph(il, ALM_SCD_TXF5MF_REG, 0x000005);</div><div class='add'>+</div><div class='add'>+	il_wr(il, FH39_TSSR_CBB_BASE, il-&gt;_3945.shared_phys);</div><div class='add'>+</div><div class='add'>+	il_wr(il, FH39_TSSR_MSG_CONFIG,</div><div class='add'>+	      FH39_TSSR_TX_MSG_CONFIG_REG_VAL_SNOOP_RD_TXPD_ON |</div><div class='add'>+	      FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RD_TXPD_ON |</div><div class='add'>+	      FH39_TSSR_TX_MSG_CONFIG_REG_VAL_MAX_FRAG_SIZE_128B |</div><div class='add'>+	      FH39_TSSR_TX_MSG_CONFIG_REG_VAL_SNOOP_RD_TFD_ON |</div><div class='add'>+	      FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RD_CBB_ON |</div><div class='add'>+	      FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RSP_WAIT_TH |</div><div class='add'>+	      FH39_TSSR_TX_MSG_CONFIG_REG_VAL_RSP_WAIT_TH);</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'>+ * il3945_txq_ctx_reset - Reset TX queue context</div><div class='add'>+ *</div><div class='add'>+ * Destroys all DMA structures and initialize them again</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il3945_txq_ctx_reset(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	int txq_id, slots_num;</div><div class='add'>+</div><div class='add'>+	il3945_hw_txq_ctx_free(il);</div><div class='add'>+</div><div class='add'>+	/* allocate tx queue structure */</div><div class='add'>+	rc = il_alloc_txq_mem(il);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Tx CMD queue */</div><div class='add'>+	rc = il3945_tx_reset(il);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* Tx queue(s) */</div><div class='add'>+	for (txq_id = 0; txq_id &lt; il-&gt;hw_params.max_txq_num; txq_id++) {</div><div class='add'>+		slots_num =</div><div class='add'>+		    (txq_id ==</div><div class='add'>+		     IL39_CMD_QUEUE_NUM) ? TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;</div><div class='add'>+		rc = il_tx_queue_init(il, &amp;il-&gt;txq[txq_id], slots_num, txq_id);</div><div class='add'>+		if (rc) {</div><div class='add'>+			IL_ERR("Tx %d queue init failed\n", txq_id);</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	il3945_hw_txq_ctx_free(il);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Start up 3945's basic functionality after it has been reset</div><div class='add'>+ * (e.g. after platform boot, or shutdown via il_apm_stop())</div><div class='add'>+ * NOTE:  This does not load uCode nor start the embedded processor</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il3945_apm_init(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int ret = il_apm_init(il);</div><div class='add'>+</div><div class='add'>+	/* Clear APMG (NIC's internal power management) interrupts */</div><div class='add'>+	il_wr_prph(il, APMG_RTC_INT_MSK_REG, 0x0);</div><div class='add'>+	il_wr_prph(il, APMG_RTC_INT_STT_REG, 0xFFFFFFFF);</div><div class='add'>+</div><div class='add'>+	/* Reset radio chip */</div><div class='add'>+	il_set_bits_prph(il, APMG_PS_CTRL_REG, APMG_PS_CTRL_VAL_RESET_REQ);</div><div class='add'>+	udelay(5);</div><div class='add'>+	il_clear_bits_prph(il, APMG_PS_CTRL_REG, APMG_PS_CTRL_VAL_RESET_REQ);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_nic_config(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il-&gt;eeprom;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 rev_id = il-&gt;pci_dev-&gt;revision;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Determine HW type */</div><div class='add'>+	D_INFO("HW Revision ID = 0x%X\n", rev_id);</div><div class='add'>+</div><div class='add'>+	if (rev_id &amp; PCI_CFG_REV_ID_BIT_RTP)</div><div class='add'>+		D_INFO("RTP type\n");</div><div class='add'>+	else if (rev_id &amp; PCI_CFG_REV_ID_BIT_BASIC_SKU) {</div><div class='add'>+		D_INFO("3945 RADIO-MB type\n");</div><div class='add'>+		il_set_bit(il, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+			   CSR39_HW_IF_CONFIG_REG_BIT_3945_MB);</div><div class='add'>+	} else {</div><div class='add'>+		D_INFO("3945 RADIO-MM type\n");</div><div class='add'>+		il_set_bit(il, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+			   CSR39_HW_IF_CONFIG_REG_BIT_3945_MM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (EEPROM_SKU_CAP_OP_MODE_MRC == eeprom-&gt;sku_cap) {</div><div class='add'>+		D_INFO("SKU OP mode is mrc\n");</div><div class='add'>+		il_set_bit(il, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+			   CSR39_HW_IF_CONFIG_REG_BIT_SKU_MRC);</div><div class='add'>+	} else</div><div class='add'>+		D_INFO("SKU OP mode is basic\n");</div><div class='add'>+</div><div class='add'>+	if ((eeprom-&gt;board_revision &amp; 0xF0) == 0xD0) {</div><div class='add'>+		D_INFO("3945ABG revision is 0x%X\n", eeprom-&gt;board_revision);</div><div class='add'>+		il_set_bit(il, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+			   CSR39_HW_IF_CONFIG_REG_BIT_BOARD_TYPE);</div><div class='add'>+	} else {</div><div class='add'>+		D_INFO("3945ABG revision is 0x%X\n", eeprom-&gt;board_revision);</div><div class='add'>+		il_clear_bit(il, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+			     CSR39_HW_IF_CONFIG_REG_BIT_BOARD_TYPE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (eeprom-&gt;almgor_m_version &lt;= 1) {</div><div class='add'>+		il_set_bit(il, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+			   CSR39_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_A);</div><div class='add'>+		D_INFO("Card M type A version is 0x%X\n",</div><div class='add'>+		       eeprom-&gt;almgor_m_version);</div><div class='add'>+	} else {</div><div class='add'>+		D_INFO("Card M type B version is 0x%X\n",</div><div class='add'>+		       eeprom-&gt;almgor_m_version);</div><div class='add'>+		il_set_bit(il, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+			   CSR39_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_B);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (eeprom-&gt;sku_cap &amp; EEPROM_SKU_CAP_SW_RF_KILL_ENABLE)</div><div class='add'>+		D_RF_KILL("SW RF KILL supported in EEPROM.\n");</div><div class='add'>+</div><div class='add'>+	if (eeprom-&gt;sku_cap &amp; EEPROM_SKU_CAP_HW_RF_KILL_ENABLE)</div><div class='add'>+		D_RF_KILL("HW RF KILL supported in EEPROM.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il3945_hw_nic_init(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct il_rx_queue *rxq = &amp;il-&gt;rxq;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+	il-&gt;cfg-&gt;ops-&gt;lib-&gt;apm_ops.init(il);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	il3945_set_pwr_vmain(il);</div><div class='add'>+</div><div class='add'>+	il-&gt;cfg-&gt;ops-&gt;lib-&gt;apm_ops.config(il);</div><div class='add'>+</div><div class='add'>+	/* Allocate the RX queue, or reset if it is already allocated */</div><div class='add'>+	if (!rxq-&gt;bd) {</div><div class='add'>+		rc = il_rx_queue_alloc(il);</div><div class='add'>+		if (rc) {</div><div class='add'>+			IL_ERR("Unable to initialize Rx queue\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		il3945_rx_queue_reset(il, rxq);</div><div class='add'>+</div><div class='add'>+	il3945_rx_replenish(il);</div><div class='add'>+</div><div class='add'>+	il3945_rx_init(il, rxq);</div><div class='add'>+</div><div class='add'>+	/* Look at using this instead:</div><div class='add'>+	   rxq-&gt;need_update = 1;</div><div class='add'>+	   il_rx_queue_update_write_ptr(il, rxq);</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	il_wr(il, FH39_RCSR_WPTR(0), rxq-&gt;write &amp; ~7);</div><div class='add'>+</div><div class='add'>+	rc = il3945_txq_ctx_reset(il);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	set_bit(S_INIT, &amp;il-&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'>+ * il3945_hw_txq_ctx_free - Free TXQ Context</div><div class='add'>+ *</div><div class='add'>+ * Destroy all TX DMA queues and structures</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il3945_hw_txq_ctx_free(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int txq_id;</div><div class='add'>+</div><div class='add'>+	/* Tx queues */</div><div class='add'>+	if (il-&gt;txq)</div><div class='add'>+		for (txq_id = 0; txq_id &lt; il-&gt;hw_params.max_txq_num; txq_id++)</div><div class='add'>+			if (txq_id == IL39_CMD_QUEUE_NUM)</div><div class='add'>+				il_cmd_queue_free(il);</div><div class='add'>+			else</div><div class='add'>+				il_tx_queue_free(il, txq_id);</div><div class='add'>+</div><div class='add'>+	/* free tx queue structure */</div><div class='add'>+	il_txq_mem(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il3945_hw_txq_ctx_stop(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int txq_id;</div><div class='add'>+</div><div class='add'>+	/* stop SCD */</div><div class='add'>+	il_wr_prph(il, ALM_SCD_MODE_REG, 0);</div><div class='add'>+	il_wr_prph(il, ALM_SCD_TXFACT_REG, 0);</div><div class='add'>+</div><div class='add'>+	/* reset TFD queues */</div><div class='add'>+	for (txq_id = 0; txq_id &lt; il-&gt;hw_params.max_txq_num; txq_id++) {</div><div class='add'>+		il_wr(il, FH39_TCSR_CONFIG(txq_id), 0x0);</div><div class='add'>+		il_poll_bit(il, FH39_TSSR_TX_STATUS,</div><div class='add'>+			    FH39_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(txq_id),</div><div class='add'>+			    1000);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il3945_hw_txq_ctx_free(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_hw_reg_adjust_power_by_temp</div><div class='add'>+ * return idx delta into power gain settings table</div><div class='add'>+*/</div><div class='add'>+static int</div><div class='add'>+il3945_hw_reg_adjust_power_by_temp(int new_reading, int old_reading)</div><div class='add'>+{</div><div class='add'>+	return (new_reading - old_reading) * (-11) / 100;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_hw_reg_temp_out_of_range - Keep temperature in sane range</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+il3945_hw_reg_temp_out_of_range(int temperature)</div><div class='add'>+{</div><div class='add'>+	return (temperature &lt; -260 || temperature &gt; 25) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il3945_hw_get_temperature(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	return _il_rd(il, CSR_UCODE_DRV_GP2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_hw_reg_txpower_get_temperature</div><div class='add'>+ * get the current temperature by reading from NIC</div><div class='add'>+*/</div><div class='add'>+static int</div><div class='add'>+il3945_hw_reg_txpower_get_temperature(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il-&gt;eeprom;</div><div class='add'>+	int temperature;</div><div class='add'>+</div><div class='add'>+	temperature = il3945_hw_get_temperature(il);</div><div class='add'>+</div><div class='add'>+	/* driver's okay range is -260 to +25.</div><div class='add'>+	 *   human readable okay range is 0 to +285 */</div><div class='add'>+	D_INFO("Temperature: %d\n", temperature + IL_TEMP_CONVERT);</div><div class='add'>+</div><div class='add'>+	/* handle insane temp reading */</div><div class='add'>+	if (il3945_hw_reg_temp_out_of_range(temperature)) {</div><div class='add'>+		IL_ERR("Error bad temperature value  %d\n", temperature);</div><div class='add'>+</div><div class='add'>+		/* if really really hot(?),</div><div class='add'>+		 *   substitute the 3rd band/group's temp measured at factory */</div><div class='add'>+		if (il-&gt;last_temperature &gt; 100)</div><div class='add'>+			temperature = eeprom-&gt;groups[2].temperature;</div><div class='add'>+		else		/* else use most recent "sane" value from driver */</div><div class='add'>+			temperature = il-&gt;last_temperature;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return temperature;	/* raw, not "human readable" */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Adjust Txpower only if temperature variance is greater than threshold.</div><div class='add'>+ *</div><div class='add'>+ * Both are lower than older versions' 9 degrees */</div><div class='add'>+#define IL_TEMPERATURE_LIMIT_TIMER   6</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_is_temp_calib_needed - determines if new calibration is needed</div><div class='add'>+ *</div><div class='add'>+ * records new temperature in tx_mgr-&gt;temperature.</div><div class='add'>+ * replaces tx_mgr-&gt;last_temperature *only* if calib needed</div><div class='add'>+ *    (assumes caller will actually do the calibration!). */</div><div class='add'>+static int</div><div class='add'>+il3945_is_temp_calib_needed(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int temp_diff;</div><div class='add'>+</div><div class='add'>+	il-&gt;temperature = il3945_hw_reg_txpower_get_temperature(il);</div><div class='add'>+	temp_diff = il-&gt;temperature - il-&gt;last_temperature;</div><div class='add'>+</div><div class='add'>+	/* get absolute value */</div><div class='add'>+	if (temp_diff &lt; 0) {</div><div class='add'>+		D_POWER("Getting cooler, delta %d,\n", temp_diff);</div><div class='add'>+		temp_diff = -temp_diff;</div><div class='add'>+	} else if (temp_diff == 0)</div><div class='add'>+		D_POWER("Same temp,\n");</div><div class='add'>+	else</div><div class='add'>+		D_POWER("Getting warmer, delta %d,\n", temp_diff);</div><div class='add'>+</div><div class='add'>+	/* if we don't need calibration, *don't* update last_temperature */</div><div class='add'>+	if (temp_diff &lt; IL_TEMPERATURE_LIMIT_TIMER) {</div><div class='add'>+		D_POWER("Timed thermal calib not needed\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_POWER("Timed thermal calib needed\n");</div><div class='add'>+</div><div class='add'>+	/* assume that caller will actually do calib ...</div><div class='add'>+	 *   update the "last temperature" value */</div><div class='add'>+	il-&gt;last_temperature = il-&gt;temperature;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IL_MAX_GAIN_ENTRIES 78</div><div class='add'>+#define IL_CCK_FROM_OFDM_POWER_DIFF  -5</div><div class='add'>+#define IL_CCK_FROM_OFDM_IDX_DIFF (10)</div><div class='add'>+</div><div class='add'>+/* radio and DSP power table, each step is 1/2 dB.</div><div class='add'>+ * 1st number is for RF analog gain, 2nd number is for DSP pre-DAC gain. */</div><div class='add'>+static struct il3945_tx_power power_gain_table[2][IL_MAX_GAIN_ENTRIES] = {</div><div class='add'>+	{</div><div class='add'>+	 {251, 127},		/* 2.4 GHz, highest power */</div><div class='add'>+	 {251, 127},</div><div class='add'>+	 {251, 127},</div><div class='add'>+	 {251, 127},</div><div class='add'>+	 {251, 125},</div><div class='add'>+	 {251, 110},</div><div class='add'>+	 {251, 105},</div><div class='add'>+	 {251, 98},</div><div class='add'>+	 {187, 125},</div><div class='add'>+	 {187, 115},</div><div class='add'>+	 {187, 108},</div><div class='add'>+	 {187, 99},</div><div class='add'>+	 {243, 119},</div><div class='add'>+	 {243, 111},</div><div class='add'>+	 {243, 105},</div><div class='add'>+	 {243, 97},</div><div class='add'>+	 {243, 92},</div><div class='add'>+	 {211, 106},</div><div class='add'>+	 {211, 100},</div><div class='add'>+	 {179, 120},</div><div class='add'>+	 {179, 113},</div><div class='add'>+	 {179, 107},</div><div class='add'>+	 {147, 125},</div><div class='add'>+	 {147, 119},</div><div class='add'>+	 {147, 112},</div><div class='add'>+	 {147, 106},</div><div class='add'>+	 {147, 101},</div><div class='add'>+	 {147, 97},</div><div class='add'>+	 {147, 91},</div><div class='add'>+	 {115, 107},</div><div class='add'>+	 {235, 121},</div><div class='add'>+	 {235, 115},</div><div class='add'>+	 {235, 109},</div><div class='add'>+	 {203, 127},</div><div class='add'>+	 {203, 121},</div><div class='add'>+	 {203, 115},</div><div class='add'>+	 {203, 108},</div><div class='add'>+	 {203, 102},</div><div class='add'>+	 {203, 96},</div><div class='add'>+	 {203, 92},</div><div class='add'>+	 {171, 110},</div><div class='add'>+	 {171, 104},</div><div class='add'>+	 {171, 98},</div><div class='add'>+	 {139, 116},</div><div class='add'>+	 {227, 125},</div><div class='add'>+	 {227, 119},</div><div class='add'>+	 {227, 113},</div><div class='add'>+	 {227, 107},</div><div class='add'>+	 {227, 101},</div><div class='add'>+	 {227, 96},</div><div class='add'>+	 {195, 113},</div><div class='add'>+	 {195, 106},</div><div class='add'>+	 {195, 102},</div><div class='add'>+	 {195, 95},</div><div class='add'>+	 {163, 113},</div><div class='add'>+	 {163, 106},</div><div class='add'>+	 {163, 102},</div><div class='add'>+	 {163, 95},</div><div class='add'>+	 {131, 113},</div><div class='add'>+	 {131, 106},</div><div class='add'>+	 {131, 102},</div><div class='add'>+	 {131, 95},</div><div class='add'>+	 {99, 113},</div><div class='add'>+	 {99, 106},</div><div class='add'>+	 {99, 102},</div><div class='add'>+	 {99, 95},</div><div class='add'>+	 {67, 113},</div><div class='add'>+	 {67, 106},</div><div class='add'>+	 {67, 102},</div><div class='add'>+	 {67, 95},</div><div class='add'>+	 {35, 113},</div><div class='add'>+	 {35, 106},</div><div class='add'>+	 {35, 102},</div><div class='add'>+	 {35, 95},</div><div class='add'>+	 {3, 113},</div><div class='add'>+	 {3, 106},</div><div class='add'>+	 {3, 102},</div><div class='add'>+	 {3, 95}		/* 2.4 GHz, lowest power */</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	 {251, 127},		/* 5.x GHz, highest power */</div><div class='add'>+	 {251, 120},</div><div class='add'>+	 {251, 114},</div><div class='add'>+	 {219, 119},</div><div class='add'>+	 {219, 101},</div><div class='add'>+	 {187, 113},</div><div class='add'>+	 {187, 102},</div><div class='add'>+	 {155, 114},</div><div class='add'>+	 {155, 103},</div><div class='add'>+	 {123, 117},</div><div class='add'>+	 {123, 107},</div><div class='add'>+	 {123, 99},</div><div class='add'>+	 {123, 92},</div><div class='add'>+	 {91, 108},</div><div class='add'>+	 {59, 125},</div><div class='add'>+	 {59, 118},</div><div class='add'>+	 {59, 109},</div><div class='add'>+	 {59, 102},</div><div class='add'>+	 {59, 96},</div><div class='add'>+	 {59, 90},</div><div class='add'>+	 {27, 104},</div><div class='add'>+	 {27, 98},</div><div class='add'>+	 {27, 92},</div><div class='add'>+	 {115, 118},</div><div class='add'>+	 {115, 111},</div><div class='add'>+	 {115, 104},</div><div class='add'>+	 {83, 126},</div><div class='add'>+	 {83, 121},</div><div class='add'>+	 {83, 113},</div><div class='add'>+	 {83, 105},</div><div class='add'>+	 {83, 99},</div><div class='add'>+	 {51, 118},</div><div class='add'>+	 {51, 111},</div><div class='add'>+	 {51, 104},</div><div class='add'>+	 {51, 98},</div><div class='add'>+	 {19, 116},</div><div class='add'>+	 {19, 109},</div><div class='add'>+	 {19, 102},</div><div class='add'>+	 {19, 98},</div><div class='add'>+	 {19, 93},</div><div class='add'>+	 {171, 113},</div><div class='add'>+	 {171, 107},</div><div class='add'>+	 {171, 99},</div><div class='add'>+	 {139, 120},</div><div class='add'>+	 {139, 113},</div><div class='add'>+	 {139, 107},</div><div class='add'>+	 {139, 99},</div><div class='add'>+	 {107, 120},</div><div class='add'>+	 {107, 113},</div><div class='add'>+	 {107, 107},</div><div class='add'>+	 {107, 99},</div><div class='add'>+	 {75, 120},</div><div class='add'>+	 {75, 113},</div><div class='add'>+	 {75, 107},</div><div class='add'>+	 {75, 99},</div><div class='add'>+	 {43, 120},</div><div class='add'>+	 {43, 113},</div><div class='add'>+	 {43, 107},</div><div class='add'>+	 {43, 99},</div><div class='add'>+	 {11, 120},</div><div class='add'>+	 {11, 113},</div><div class='add'>+	 {11, 107},</div><div class='add'>+	 {11, 99},</div><div class='add'>+	 {131, 107},</div><div class='add'>+	 {131, 99},</div><div class='add'>+	 {99, 120},</div><div class='add'>+	 {99, 113},</div><div class='add'>+	 {99, 107},</div><div class='add'>+	 {99, 99},</div><div class='add'>+	 {67, 120},</div><div class='add'>+	 {67, 113},</div><div class='add'>+	 {67, 107},</div><div class='add'>+	 {67, 99},</div><div class='add'>+	 {35, 120},</div><div class='add'>+	 {35, 113},</div><div class='add'>+	 {35, 107},</div><div class='add'>+	 {35, 99},</div><div class='add'>+	 {3, 120}		/* 5.x GHz, lowest power */</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u8</div><div class='add'>+il3945_hw_reg_fix_power_idx(int idx)</div><div class='add'>+{</div><div class='add'>+	if (idx &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+	if (idx &gt;= IL_MAX_GAIN_ENTRIES)</div><div class='add'>+		return IL_MAX_GAIN_ENTRIES - 1;</div><div class='add'>+	return (u8) idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Kick off thermal recalibration check every 60 seconds */</div><div class='add'>+#define REG_RECALIB_PERIOD (60)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_hw_reg_set_scan_power - Set Tx power for scan probe requests</div><div class='add'>+ *</div><div class='add'>+ * Set (in our channel info database) the direct scan Tx power for 1 Mbit (CCK)</div><div class='add'>+ * or 6 Mbit (OFDM) rates.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il3945_hw_reg_set_scan_power(struct il_priv *il, u32 scan_tbl_idx, s32 rate_idx,</div><div class='add'>+			     const s8 *clip_pwrs,</div><div class='add'>+			     struct il_channel_info *ch_info, int band_idx)</div><div class='add'>+{</div><div class='add'>+	struct il3945_scan_power_info *scan_power_info;</div><div class='add'>+	s8 power;</div><div class='add'>+	u8 power_idx;</div><div class='add'>+</div><div class='add'>+	scan_power_info = &amp;ch_info-&gt;scan_pwr_info[scan_tbl_idx];</div><div class='add'>+</div><div class='add'>+	/* use this channel group's 6Mbit clipping/saturation pwr,</div><div class='add'>+	 *   but cap at regulatory scan power restriction (set during init</div><div class='add'>+	 *   based on eeprom channel data) for this channel.  */</div><div class='add'>+	power = min(ch_info-&gt;scan_power, clip_pwrs[RATE_6M_IDX_TBL]);</div><div class='add'>+</div><div class='add'>+	power = min(power, il-&gt;tx_power_user_lmt);</div><div class='add'>+	scan_power_info-&gt;requested_power = power;</div><div class='add'>+</div><div class='add'>+	/* find difference between new scan *power* and current "normal"</div><div class='add'>+	 *   Tx *power* for 6Mb.  Use this difference (x2) to adjust the</div><div class='add'>+	 *   current "normal" temperature-compensated Tx power *idx* for</div><div class='add'>+	 *   this rate (1Mb or 6Mb) to yield new temp-compensated scan power</div><div class='add'>+	 *   *idx*. */</div><div class='add'>+	power_idx =</div><div class='add'>+	    ch_info-&gt;power_info[rate_idx].power_table_idx - (power -</div><div class='add'>+							     ch_info-&gt;</div><div class='add'>+							     power_info</div><div class='add'>+							     [RATE_6M_IDX_TBL].</div><div class='add'>+							     requested_power) *</div><div class='add'>+	    2;</div><div class='add'>+</div><div class='add'>+	/* store reference idx that we use when adjusting *all* scan</div><div class='add'>+	 *   powers.  So we can accommodate user (all channel) or spectrum</div><div class='add'>+	 *   management (single channel) power changes "between" temperature</div><div class='add'>+	 *   feedback compensation procedures.</div><div class='add'>+	 * don't force fit this reference idx into gain table; it may be a</div><div class='add'>+	 *   negative number.  This will help avoid errors when we're at</div><div class='add'>+	 *   the lower bounds (highest gains, for warmest temperatures)</div><div class='add'>+	 *   of the table. */</div><div class='add'>+</div><div class='add'>+	/* don't exceed table bounds for "real" setting */</div><div class='add'>+	power_idx = il3945_hw_reg_fix_power_idx(power_idx);</div><div class='add'>+</div><div class='add'>+	scan_power_info-&gt;power_table_idx = power_idx;</div><div class='add'>+	scan_power_info-&gt;tpc.tx_gain =</div><div class='add'>+	    power_gain_table[band_idx][power_idx].tx_gain;</div><div class='add'>+	scan_power_info-&gt;tpc.dsp_atten =</div><div class='add'>+	    power_gain_table[band_idx][power_idx].dsp_atten;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_send_tx_power - fill in Tx Power command with gain settings</div><div class='add'>+ *</div><div class='add'>+ * Configures power settings for all rates for the current channel,</div><div class='add'>+ * using values from channel info struct, and send to NIC</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il3945_send_tx_power(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int rate_idx, i;</div><div class='add'>+	const struct il_channel_info *ch_info = NULL;</div><div class='add'>+	struct il3945_txpowertable_cmd txpower = {</div><div class='add'>+		.channel = il-&gt;ctx.active.channel,</div><div class='add'>+	};</div><div class='add'>+	u16 chan;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE</div><div class='add'>+	    (test_bit(S_SCAN_HW, &amp;il-&gt;status),</div><div class='add'>+	     "TX Power requested while scanning!\n"))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	chan = le16_to_cpu(il-&gt;ctx.active.channel);</div><div class='add'>+</div><div class='add'>+	txpower.band = (il-&gt;band == IEEE80211_BAND_5GHZ) ? 0 : 1;</div><div class='add'>+	ch_info = il_get_channel_info(il, il-&gt;band, chan);</div><div class='add'>+	if (!ch_info) {</div><div class='add'>+		IL_ERR("Failed to get channel info for channel %d [%d]\n", chan,</div><div class='add'>+		       il-&gt;band);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!il_is_channel_valid(ch_info)) {</div><div class='add'>+		D_POWER("Not calling TX_PWR_TBL_CMD on " "non-Tx channel.\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* fill cmd with power settings for all rates for current channel */</div><div class='add'>+	/* Fill OFDM rate */</div><div class='add'>+	for (rate_idx = IL_FIRST_OFDM_RATE, i = 0;</div><div class='add'>+	     rate_idx &lt;= IL39_LAST_OFDM_RATE; rate_idx++, i++) {</div><div class='add'>+</div><div class='add'>+		txpower.power[i].tpc = ch_info-&gt;power_info[i].tpc;</div><div class='add'>+		txpower.power[i].rate = il3945_rates[rate_idx].plcp;</div><div class='add'>+</div><div class='add'>+		D_POWER("ch %d:%d rf %d dsp %3d rate code 0x%02x\n",</div><div class='add'>+			le16_to_cpu(txpower.channel), txpower.band,</div><div class='add'>+			txpower.power[i].tpc.tx_gain,</div><div class='add'>+			txpower.power[i].tpc.dsp_atten, txpower.power[i].rate);</div><div class='add'>+	}</div><div class='add'>+	/* Fill CCK rates */</div><div class='add'>+	for (rate_idx = IL_FIRST_CCK_RATE; rate_idx &lt;= IL_LAST_CCK_RATE;</div><div class='add'>+	     rate_idx++, i++) {</div><div class='add'>+		txpower.power[i].tpc = ch_info-&gt;power_info[i].tpc;</div><div class='add'>+		txpower.power[i].rate = il3945_rates[rate_idx].plcp;</div><div class='add'>+</div><div class='add'>+		D_POWER("ch %d:%d rf %d dsp %3d rate code 0x%02x\n",</div><div class='add'>+			le16_to_cpu(txpower.channel), txpower.band,</div><div class='add'>+			txpower.power[i].tpc.tx_gain,</div><div class='add'>+			txpower.power[i].tpc.dsp_atten, txpower.power[i].rate);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return il_send_cmd_pdu(il, C_TX_PWR_TBL,</div><div class='add'>+			       sizeof(struct il3945_txpowertable_cmd),</div><div class='add'>+			       &amp;txpower);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_hw_reg_set_new_power - Configures power tables at new levels</div><div class='add'>+ * @ch_info: Channel to update.  Uses power_info.requested_power.</div><div class='add'>+ *</div><div class='add'>+ * Replace requested_power and base_power_idx ch_info fields for</div><div class='add'>+ * one channel.</div><div class='add'>+ *</div><div class='add'>+ * Called if user or spectrum management changes power preferences.</div><div class='add'>+ * Takes into account h/w and modulation limitations (clip power).</div><div class='add'>+ *</div><div class='add'>+ * This does *not* send anything to NIC, just sets up ch_info for one channel.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: reg_compensate_for_temperature_dif() *must* be run after this to</div><div class='add'>+ *	 properly fill out the scan powers, and actual h/w gain settings,</div><div class='add'>+ *	 and send changes to NIC</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il3945_hw_reg_set_new_power(struct il_priv *il, struct il_channel_info *ch_info)</div><div class='add'>+{</div><div class='add'>+	struct il3945_channel_power_info *power_info;</div><div class='add'>+	int power_changed = 0;</div><div class='add'>+	int i;</div><div class='add'>+	const s8 *clip_pwrs;</div><div class='add'>+	int power;</div><div class='add'>+</div><div class='add'>+	/* Get this chnlgrp's rate-to-max/clip-powers table */</div><div class='add'>+	clip_pwrs = il-&gt;_3945.clip_groups[ch_info-&gt;group_idx].clip_powers;</div><div class='add'>+</div><div class='add'>+	/* Get this channel's rate-to-current-power settings table */</div><div class='add'>+	power_info = ch_info-&gt;power_info;</div><div class='add'>+</div><div class='add'>+	/* update OFDM Txpower settings */</div><div class='add'>+	for (i = RATE_6M_IDX_TBL; i &lt;= RATE_54M_IDX_TBL; i++, ++power_info) {</div><div class='add'>+		int delta_idx;</div><div class='add'>+</div><div class='add'>+		/* limit new power to be no more than h/w capability */</div><div class='add'>+		power = min(ch_info-&gt;curr_txpow, clip_pwrs[i]);</div><div class='add'>+		if (power == power_info-&gt;requested_power)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* find difference between old and new requested powers,</div><div class='add'>+		 *    update base (non-temp-compensated) power idx */</div><div class='add'>+		delta_idx = (power - power_info-&gt;requested_power) * 2;</div><div class='add'>+		power_info-&gt;base_power_idx -= delta_idx;</div><div class='add'>+</div><div class='add'>+		/* save new requested power value */</div><div class='add'>+		power_info-&gt;requested_power = power;</div><div class='add'>+</div><div class='add'>+		power_changed = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* update CCK Txpower settings, based on OFDM 12M setting ...</div><div class='add'>+	 *    ... all CCK power settings for a given channel are the *same*. */</div><div class='add'>+	if (power_changed) {</div><div class='add'>+		power =</div><div class='add'>+		    ch_info-&gt;power_info[RATE_12M_IDX_TBL].requested_power +</div><div class='add'>+		    IL_CCK_FROM_OFDM_POWER_DIFF;</div><div class='add'>+</div><div class='add'>+		/* do all CCK rates' il3945_channel_power_info structures */</div><div class='add'>+		for (i = RATE_1M_IDX_TBL; i &lt;= RATE_11M_IDX_TBL; i++) {</div><div class='add'>+			power_info-&gt;requested_power = power;</div><div class='add'>+			power_info-&gt;base_power_idx =</div><div class='add'>+			    ch_info-&gt;power_info[RATE_12M_IDX_TBL].</div><div class='add'>+			    base_power_idx + IL_CCK_FROM_OFDM_IDX_DIFF;</div><div class='add'>+			++power_info;</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'>+ * il3945_hw_reg_get_ch_txpower_limit - returns new power limit for channel</div><div class='add'>+ *</div><div class='add'>+ * NOTE: Returned power limit may be less (but not more) than requested,</div><div class='add'>+ *	 based strictly on regulatory (eeprom and spectrum mgt) limitations</div><div class='add'>+ *	 (no consideration for h/w clipping limitations).</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il3945_hw_reg_get_ch_txpower_limit(struct il_channel_info *ch_info)</div><div class='add'>+{</div><div class='add'>+	s8 max_power;</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+	/* if we're using TGd limits, use lower of TGd or EEPROM */</div><div class='add'>+	if (ch_info-&gt;tgd_data.max_power != 0)</div><div class='add'>+		max_power =</div><div class='add'>+		    min(ch_info-&gt;tgd_data.max_power,</div><div class='add'>+			ch_info-&gt;eeprom.max_power_avg);</div><div class='add'>+</div><div class='add'>+	/* else just use EEPROM limits */</div><div class='add'>+	else</div><div class='add'>+#endif</div><div class='add'>+		max_power = ch_info-&gt;eeprom.max_power_avg;</div><div class='add'>+</div><div class='add'>+	return min(max_power, ch_info-&gt;max_power_avg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_hw_reg_comp_txpower_temp - Compensate for temperature</div><div class='add'>+ *</div><div class='add'>+ * Compensate txpower settings of *all* channels for temperature.</div><div class='add'>+ * This only accounts for the difference between current temperature</div><div class='add'>+ *   and the factory calibration temperatures, and bases the new settings</div><div class='add'>+ *   on the channel's base_power_idx.</div><div class='add'>+ *</div><div class='add'>+ * If RxOn is "associated", this sends the new Txpower to NIC!</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il3945_hw_reg_comp_txpower_temp(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_channel_info *ch_info = NULL;</div><div class='add'>+	struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il-&gt;eeprom;</div><div class='add'>+	int delta_idx;</div><div class='add'>+	const s8 *clip_pwrs;	/* array of h/w max power levels for each rate */</div><div class='add'>+	u8 a_band;</div><div class='add'>+	u8 rate_idx;</div><div class='add'>+	u8 scan_tbl_idx;</div><div class='add'>+	u8 i;</div><div class='add'>+	int ref_temp;</div><div class='add'>+	int temperature = il-&gt;temperature;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;disable_tx_power_cal || test_bit(S_SCANNING, &amp;il-&gt;status)) {</div><div class='add'>+		/* do not perform tx power calibration */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	/* set up new Tx power info for each and every channel, 2.4 and 5.x */</div><div class='add'>+	for (i = 0; i &lt; il-&gt;channel_count; i++) {</div><div class='add'>+		ch_info = &amp;il-&gt;channel_info[i];</div><div class='add'>+		a_band = il_is_channel_a_band(ch_info);</div><div class='add'>+</div><div class='add'>+		/* Get this chnlgrp's factory calibration temperature */</div><div class='add'>+		ref_temp = (s16) eeprom-&gt;groups[ch_info-&gt;group_idx].temperature;</div><div class='add'>+</div><div class='add'>+		/* get power idx adjustment based on current and factory</div><div class='add'>+		 * temps */</div><div class='add'>+		delta_idx =</div><div class='add'>+		    il3945_hw_reg_adjust_power_by_temp(temperature, ref_temp);</div><div class='add'>+</div><div class='add'>+		/* set tx power value for all rates, OFDM and CCK */</div><div class='add'>+		for (rate_idx = 0; rate_idx &lt; RATE_COUNT_3945; rate_idx++) {</div><div class='add'>+			int power_idx =</div><div class='add'>+			    ch_info-&gt;power_info[rate_idx].base_power_idx;</div><div class='add'>+</div><div class='add'>+			/* temperature compensate */</div><div class='add'>+			power_idx += delta_idx;</div><div class='add'>+</div><div class='add'>+			/* stay within table range */</div><div class='add'>+			power_idx = il3945_hw_reg_fix_power_idx(power_idx);</div><div class='add'>+			ch_info-&gt;power_info[rate_idx].power_table_idx =</div><div class='add'>+			    (u8) power_idx;</div><div class='add'>+			ch_info-&gt;power_info[rate_idx].tpc =</div><div class='add'>+			    power_gain_table[a_band][power_idx];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Get this chnlgrp's rate-to-max/clip-powers table */</div><div class='add'>+		clip_pwrs =</div><div class='add'>+		    il-&gt;_3945.clip_groups[ch_info-&gt;group_idx].clip_powers;</div><div class='add'>+</div><div class='add'>+		/* set scan tx power, 1Mbit for CCK, 6Mbit for OFDM */</div><div class='add'>+		for (scan_tbl_idx = 0; scan_tbl_idx &lt; IL_NUM_SCAN_RATES;</div><div class='add'>+		     scan_tbl_idx++) {</div><div class='add'>+			s32 actual_idx =</div><div class='add'>+			    (scan_tbl_idx ==</div><div class='add'>+			     0) ? RATE_1M_IDX_TBL : RATE_6M_IDX_TBL;</div><div class='add'>+			il3945_hw_reg_set_scan_power(il, scan_tbl_idx,</div><div class='add'>+						     actual_idx, clip_pwrs,</div><div class='add'>+						     ch_info, a_band);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* send Txpower command for current channel to ucode */</div><div class='add'>+	return il-&gt;cfg-&gt;ops-&gt;lib-&gt;send_tx_power(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il3945_hw_reg_set_txpower(struct il_priv *il, s8 power)</div><div class='add'>+{</div><div class='add'>+	struct il_channel_info *ch_info;</div><div class='add'>+	s8 max_power;</div><div class='add'>+	u8 a_band;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;tx_power_user_lmt == power) {</div><div class='add'>+		D_POWER("Requested Tx power same as current " "limit: %ddBm.\n",</div><div class='add'>+			power);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_POWER("Setting upper limit clamp to %ddBm.\n", power);</div><div class='add'>+	il-&gt;tx_power_user_lmt = power;</div><div class='add'>+</div><div class='add'>+	/* set up new Tx powers for each and every channel, 2.4 and 5.x */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; il-&gt;channel_count; i++) {</div><div class='add'>+		ch_info = &amp;il-&gt;channel_info[i];</div><div class='add'>+		a_band = il_is_channel_a_band(ch_info);</div><div class='add'>+</div><div class='add'>+		/* find minimum power of all user and regulatory constraints</div><div class='add'>+		 *    (does not consider h/w clipping limitations) */</div><div class='add'>+		max_power = il3945_hw_reg_get_ch_txpower_limit(ch_info);</div><div class='add'>+		max_power = min(power, max_power);</div><div class='add'>+		if (max_power != ch_info-&gt;curr_txpow) {</div><div class='add'>+			ch_info-&gt;curr_txpow = max_power;</div><div class='add'>+</div><div class='add'>+			/* this considers the h/w clipping limitations */</div><div class='add'>+			il3945_hw_reg_set_new_power(il, ch_info);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* update txpower settings for all channels,</div><div class='add'>+	 *   send to NIC if associated. */</div><div class='add'>+	il3945_is_temp_calib_needed(il);</div><div class='add'>+	il3945_hw_reg_comp_txpower_temp(il);</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'>+il3945_send_rxon_assoc(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+	struct il_rx_pkt *pkt;</div><div class='add'>+	struct il3945_rxon_assoc_cmd rxon_assoc;</div><div class='add'>+	struct il_host_cmd cmd = {</div><div class='add'>+		.id = C_RXON_ASSOC,</div><div class='add'>+		.len = sizeof(rxon_assoc),</div><div class='add'>+		.flags = CMD_WANT_SKB,</div><div class='add'>+		.data = &amp;rxon_assoc,</div><div class='add'>+	};</div><div class='add'>+	const struct il_rxon_cmd *rxon1 = &amp;ctx-&gt;staging;</div><div class='add'>+	const struct il_rxon_cmd *rxon2 = &amp;ctx-&gt;active;</div><div class='add'>+</div><div class='add'>+	if (rxon1-&gt;flags == rxon2-&gt;flags &amp;&amp;</div><div class='add'>+	    rxon1-&gt;filter_flags == rxon2-&gt;filter_flags &amp;&amp;</div><div class='add'>+	    rxon1-&gt;cck_basic_rates == rxon2-&gt;cck_basic_rates &amp;&amp;</div><div class='add'>+	    rxon1-&gt;ofdm_basic_rates == rxon2-&gt;ofdm_basic_rates) {</div><div class='add'>+		D_INFO("Using current RXON_ASSOC.  Not resending.\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rxon_assoc.flags = ctx-&gt;staging.flags;</div><div class='add'>+	rxon_assoc.filter_flags = ctx-&gt;staging.filter_flags;</div><div class='add'>+	rxon_assoc.ofdm_basic_rates = ctx-&gt;staging.ofdm_basic_rates;</div><div class='add'>+	rxon_assoc.cck_basic_rates = ctx-&gt;staging.cck_basic_rates;</div><div class='add'>+	rxon_assoc.reserved = 0;</div><div class='add'>+</div><div class='add'>+	rc = il_send_cmd_sync(il, &amp;cmd);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	pkt = (struct il_rx_pkt *)cmd.reply_page;</div><div class='add'>+	if (pkt-&gt;hdr.flags &amp; IL_CMD_FAILED_MSK) {</div><div class='add'>+		IL_ERR("Bad return from C_RXON_ASSOC command\n");</div><div class='add'>+		rc = -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il_free_pages(il, cmd.reply_page);</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'>+ * il3945_commit_rxon - commit staging_rxon to hardware</div><div class='add'>+ *</div><div class='add'>+ * The RXON command in staging_rxon is committed to the hardware and</div><div class='add'>+ * the active_rxon structure is updated with the new data.  This</div><div class='add'>+ * function correctly transitions out of the RXON_ASSOC_MSK state if</div><div class='add'>+ * a HW tune is required based on the RXON structure changes.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il3945_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	/* cast away the const for active_rxon in this function */</div><div class='add'>+	struct il3945_rxon_cmd *active_rxon = (void *)&amp;ctx-&gt;active;</div><div class='add'>+	struct il3945_rxon_cmd *staging_rxon = (void *)&amp;ctx-&gt;staging;</div><div class='add'>+	int rc = 0;</div><div class='add'>+	bool new_assoc = !!(staging_rxon-&gt;filter_flags &amp; RXON_FILTER_ASSOC_MSK);</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!il_is_alive(il))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* always get timestamp with Rx frame */</div><div class='add'>+	staging_rxon-&gt;flags |= RXON_FLG_TSF2HOST_MSK;</div><div class='add'>+</div><div class='add'>+	/* select antenna */</div><div class='add'>+	staging_rxon-&gt;flags &amp;= ~(RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_SEL_MSK);</div><div class='add'>+	staging_rxon-&gt;flags |= il3945_get_antenna_flags(il);</div><div class='add'>+</div><div class='add'>+	rc = il_check_rxon_cmd(il, ctx);</div><div class='add'>+	if (rc) {</div><div class='add'>+		IL_ERR("Invalid RXON configuration.  Not committing.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we don't need to send a full RXON, we can use</div><div class='add'>+	 * il3945_rxon_assoc_cmd which is used to reconfigure filter</div><div class='add'>+	 * and other flags for the current radio configuration. */</div><div class='add'>+	if (!il_full_rxon_required(il, &amp;il-&gt;ctx)) {</div><div class='add'>+		rc = il_send_rxon_assoc(il, &amp;il-&gt;ctx);</div><div class='add'>+		if (rc) {</div><div class='add'>+			IL_ERR("Error setting RXON_ASSOC "</div><div class='add'>+			       "configuration (%d).\n", rc);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(active_rxon, staging_rxon, sizeof(*active_rxon));</div><div class='add'>+		/*</div><div class='add'>+		 * We do not commit tx power settings while channel changing,</div><div class='add'>+		 * do it now if tx power changed.</div><div class='add'>+		 */</div><div class='add'>+		il_set_tx_power(il, il-&gt;tx_power_next, false);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we are currently associated and the new config requires</div><div class='add'>+	 * an RXON_ASSOC and the new config wants the associated mask enabled,</div><div class='add'>+	 * we must clear the associated from the active configuration</div><div class='add'>+	 * before we apply the new config */</div><div class='add'>+	if (il_is_associated(il) &amp;&amp; new_assoc) {</div><div class='add'>+		D_INFO("Toggling associated bit on current RXON\n");</div><div class='add'>+		active_rxon-&gt;filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * reserved4 and 5 could have been filled by the iwlcore code.</div><div class='add'>+		 * Let's clear them before pushing to the 3945.</div><div class='add'>+		 */</div><div class='add'>+		active_rxon-&gt;reserved4 = 0;</div><div class='add'>+		active_rxon-&gt;reserved5 = 0;</div><div class='add'>+		rc = il_send_cmd_pdu(il, C_RXON, sizeof(struct il3945_rxon_cmd),</div><div class='add'>+				     &amp;il-&gt;ctx.active);</div><div class='add'>+</div><div class='add'>+		/* If the mask clearing failed then we set</div><div class='add'>+		 * active_rxon back to what it was previously */</div><div class='add'>+		if (rc) {</div><div class='add'>+			active_rxon-&gt;filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='add'>+			IL_ERR("Error clearing ASSOC_MSK on current "</div><div class='add'>+			       "configuration (%d).\n", rc);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+		il_clear_ucode_stations(il, &amp;il-&gt;ctx);</div><div class='add'>+		il_restore_stations(il, &amp;il-&gt;ctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_INFO("Sending RXON\n" "* with%s RXON_FILTER_ASSOC_MSK\n"</div><div class='add'>+	       "* channel = %d\n" "* bssid = %pM\n", (new_assoc ? "" : "out"),</div><div class='add'>+	       le16_to_cpu(staging_rxon-&gt;channel), staging_rxon-&gt;bssid_addr);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * reserved4 and 5 could have been filled by the iwlcore code.</div><div class='add'>+	 * Let's clear them before pushing to the 3945.</div><div class='add'>+	 */</div><div class='add'>+	staging_rxon-&gt;reserved4 = 0;</div><div class='add'>+	staging_rxon-&gt;reserved5 = 0;</div><div class='add'>+</div><div class='add'>+	il_set_rxon_hwcrypto(il, ctx, !il3945_mod_params.sw_crypto);</div><div class='add'>+</div><div class='add'>+	/* Apply the new configuration */</div><div class='add'>+	rc = il_send_cmd_pdu(il, C_RXON, sizeof(struct il3945_rxon_cmd),</div><div class='add'>+			     staging_rxon);</div><div class='add'>+	if (rc) {</div><div class='add'>+		IL_ERR("Error setting new configuration (%d).\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(active_rxon, staging_rxon, sizeof(*active_rxon));</div><div class='add'>+</div><div class='add'>+	if (!new_assoc) {</div><div class='add'>+		il_clear_ucode_stations(il, &amp;il-&gt;ctx);</div><div class='add'>+		il_restore_stations(il, &amp;il-&gt;ctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we issue a new RXON command which required a tune then we must</div><div class='add'>+	 * send a new TXPOWER command or we won't be able to Tx any frames */</div><div class='add'>+	rc = il_set_tx_power(il, il-&gt;tx_power_next, true);</div><div class='add'>+	if (rc) {</div><div class='add'>+		IL_ERR("Error setting Tx power (%d).\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Init the hardware's rate fallback order based on the band */</div><div class='add'>+	rc = il3945_init_hw_rate_table(il);</div><div class='add'>+	if (rc) {</div><div class='add'>+		IL_ERR("Error setting HW rate table: %02X\n", rc);</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'>+ * il3945_reg_txpower_periodic -  called when time to check our temperature.</div><div class='add'>+ *</div><div class='add'>+ * -- reset periodic timer</div><div class='add'>+ * -- see if temp has changed enough to warrant re-calibration ... if so:</div><div class='add'>+ *     -- correct coeffs for temp (can reset temp timer)</div><div class='add'>+ *     -- save this temp as "last",</div><div class='add'>+ *     -- send new set of gain settings to NIC</div><div class='add'>+ * NOTE:  This should continue working, even when we're not associated,</div><div class='add'>+ *   so we can keep our internal table of scan powers current. */</div><div class='add'>+void</div><div class='add'>+il3945_reg_txpower_periodic(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	/* This will kick in the "brute force"</div><div class='add'>+	 * il3945_hw_reg_comp_txpower_temp() below */</div><div class='add'>+	if (!il3945_is_temp_calib_needed(il))</div><div class='add'>+		goto reschedule;</div><div class='add'>+</div><div class='add'>+	/* Set up a new set of temp-adjusted TxPowers, send to NIC.</div><div class='add'>+	 * This is based *only* on current temperature,</div><div class='add'>+	 * ignoring any previous power measurements */</div><div class='add'>+	il3945_hw_reg_comp_txpower_temp(il);</div><div class='add'>+</div><div class='add'>+reschedule:</div><div class='add'>+	queue_delayed_work(il-&gt;workqueue, &amp;il-&gt;_3945.thermal_periodic,</div><div class='add'>+			   REG_RECALIB_PERIOD * HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_bg_reg_txpower_periodic(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = container_of(work, struct il_priv,</div><div class='add'>+					  _3945.thermal_periodic.work);</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	il3945_reg_txpower_periodic(il);</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_hw_reg_get_ch_grp_idx - find the channel-group idx (0-4) for channel.</div><div class='add'>+ *</div><div class='add'>+ * This function is used when initializing channel-info structs.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: These channel groups do *NOT* match the bands above!</div><div class='add'>+ *	 These channel groups are based on factory-tested channels;</div><div class='add'>+ *	 on A-band, EEPROM's "group frequency" entries represent the top</div><div class='add'>+ *	 channel in each group 1-4.  Group 5 All B/G channels are in group 0.</div><div class='add'>+ */</div><div class='add'>+static u16</div><div class='add'>+il3945_hw_reg_get_ch_grp_idx(struct il_priv *il,</div><div class='add'>+			     const struct il_channel_info *ch_info)</div><div class='add'>+{</div><div class='add'>+	struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il-&gt;eeprom;</div><div class='add'>+	struct il3945_eeprom_txpower_group *ch_grp = &amp;eeprom-&gt;groups[0];</div><div class='add'>+	u8 group;</div><div class='add'>+	u16 group_idx = 0;	/* based on factory calib frequencies */</div><div class='add'>+	u8 grp_channel;</div><div class='add'>+</div><div class='add'>+	/* Find the group idx for the channel ... don't use idx 1(?) */</div><div class='add'>+	if (il_is_channel_a_band(ch_info)) {</div><div class='add'>+		for (group = 1; group &lt; 5; group++) {</div><div class='add'>+			grp_channel = ch_grp[group].group_channel;</div><div class='add'>+			if (ch_info-&gt;channel &lt;= grp_channel) {</div><div class='add'>+				group_idx = group;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/* group 4 has a few channels *above* its factory cal freq */</div><div class='add'>+		if (group == 5)</div><div class='add'>+			group_idx = 4;</div><div class='add'>+	} else</div><div class='add'>+		group_idx = 0;	/* 2.4 GHz, group 0 */</div><div class='add'>+</div><div class='add'>+	D_POWER("Chnl %d mapped to grp %d\n", ch_info-&gt;channel, group_idx);</div><div class='add'>+	return group_idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_hw_reg_get_matched_power_idx - Interpolate to get nominal idx</div><div class='add'>+ *</div><div class='add'>+ * Interpolate to get nominal (i.e. at factory calibration temperature) idx</div><div class='add'>+ *   into radio/DSP gain settings table for requested power.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il3945_hw_reg_get_matched_power_idx(struct il_priv *il, s8 requested_power,</div><div class='add'>+				    s32 setting_idx, s32 *new_idx)</div><div class='add'>+{</div><div class='add'>+	const struct il3945_eeprom_txpower_group *chnl_grp = NULL;</div><div class='add'>+	struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il-&gt;eeprom;</div><div class='add'>+	s32 idx0, idx1;</div><div class='add'>+	s32 power = 2 * requested_power;</div><div class='add'>+	s32 i;</div><div class='add'>+	const struct il3945_eeprom_txpower_sample *samples;</div><div class='add'>+	s32 gains0, gains1;</div><div class='add'>+	s32 res;</div><div class='add'>+	s32 denominator;</div><div class='add'>+</div><div class='add'>+	chnl_grp = &amp;eeprom-&gt;groups[setting_idx];</div><div class='add'>+	samples = chnl_grp-&gt;samples;</div><div class='add'>+	for (i = 0; i &lt; 5; i++) {</div><div class='add'>+		if (power == samples[i].power) {</div><div class='add'>+			*new_idx = samples[i].gain_idx;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (power &gt; samples[1].power) {</div><div class='add'>+		idx0 = 0;</div><div class='add'>+		idx1 = 1;</div><div class='add'>+	} else if (power &gt; samples[2].power) {</div><div class='add'>+		idx0 = 1;</div><div class='add'>+		idx1 = 2;</div><div class='add'>+	} else if (power &gt; samples[3].power) {</div><div class='add'>+		idx0 = 2;</div><div class='add'>+		idx1 = 3;</div><div class='add'>+	} else {</div><div class='add'>+		idx0 = 3;</div><div class='add'>+		idx1 = 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	denominator = (s32) samples[idx1].power - (s32) samples[idx0].power;</div><div class='add'>+	if (denominator == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	gains0 = (s32) samples[idx0].gain_idx * (1 &lt;&lt; 19);</div><div class='add'>+	gains1 = (s32) samples[idx1].gain_idx * (1 &lt;&lt; 19);</div><div class='add'>+	res =</div><div class='add'>+	    gains0 + (gains1 - gains0) * ((s32) power -</div><div class='add'>+					  (s32) samples[idx0].power) /</div><div class='add'>+	    denominator + (1 &lt;&lt; 18);</div><div class='add'>+	*new_idx = res &gt;&gt; 19;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_hw_reg_init_channel_groups(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+	s32 rate_idx;</div><div class='add'>+	struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il-&gt;eeprom;</div><div class='add'>+	const struct il3945_eeprom_txpower_group *group;</div><div class='add'>+</div><div class='add'>+	D_POWER("Initializing factory calib info from EEPROM\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IL_NUM_TX_CALIB_GROUPS; i++) {</div><div class='add'>+		s8 *clip_pwrs;	/* table of power levels for each rate */</div><div class='add'>+		s8 satur_pwr;	/* saturation power for each chnl group */</div><div class='add'>+		group = &amp;eeprom-&gt;groups[i];</div><div class='add'>+</div><div class='add'>+		/* sanity check on factory saturation power value */</div><div class='add'>+		if (group-&gt;saturation_power &lt; 40) {</div><div class='add'>+			IL_WARN("Error: saturation power is %d, "</div><div class='add'>+				"less than minimum expected 40\n",</div><div class='add'>+				group-&gt;saturation_power);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Derive requested power levels for each rate, based on</div><div class='add'>+		 *   hardware capabilities (saturation power for band).</div><div class='add'>+		 * Basic value is 3dB down from saturation, with further</div><div class='add'>+		 *   power reductions for highest 3 data rates.  These</div><div class='add'>+		 *   backoffs provide headroom for high rate modulation</div><div class='add'>+		 *   power peaks, without too much distortion (clipping).</div><div class='add'>+		 */</div><div class='add'>+		/* we'll fill in this array with h/w max power levels */</div><div class='add'>+		clip_pwrs = (s8 *) il-&gt;_3945.clip_groups[i].clip_powers;</div><div class='add'>+</div><div class='add'>+		/* divide factory saturation power by 2 to find -3dB level */</div><div class='add'>+		satur_pwr = (s8) (group-&gt;saturation_power &gt;&gt; 1);</div><div class='add'>+</div><div class='add'>+		/* fill in channel group's nominal powers for each rate */</div><div class='add'>+		for (rate_idx = 0; rate_idx &lt; RATE_COUNT_3945;</div><div class='add'>+		     rate_idx++, clip_pwrs++) {</div><div class='add'>+			switch (rate_idx) {</div><div class='add'>+			case RATE_36M_IDX_TBL:</div><div class='add'>+				if (i == 0)	/* B/G */</div><div class='add'>+					*clip_pwrs = satur_pwr;</div><div class='add'>+				else	/* A */</div><div class='add'>+					*clip_pwrs = satur_pwr - 5;</div><div class='add'>+				break;</div><div class='add'>+			case RATE_48M_IDX_TBL:</div><div class='add'>+				if (i == 0)</div><div class='add'>+					*clip_pwrs = satur_pwr - 7;</div><div class='add'>+				else</div><div class='add'>+					*clip_pwrs = satur_pwr - 10;</div><div class='add'>+				break;</div><div class='add'>+			case RATE_54M_IDX_TBL:</div><div class='add'>+				if (i == 0)</div><div class='add'>+					*clip_pwrs = satur_pwr - 9;</div><div class='add'>+				else</div><div class='add'>+					*clip_pwrs = satur_pwr - 12;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				*clip_pwrs = satur_pwr;</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'>+/**</div><div class='add'>+ * il3945_txpower_set_from_eeprom - Set channel power info based on EEPROM</div><div class='add'>+ *</div><div class='add'>+ * Second pass (during init) to set up il-&gt;channel_info</div><div class='add'>+ *</div><div class='add'>+ * Set up Tx-power settings in our channel info database for each VALID</div><div class='add'>+ * (for this geo/SKU) channel, at all Tx data rates, based on eeprom values</div><div class='add'>+ * and current temperature.</div><div class='add'>+ *</div><div class='add'>+ * Since this is based on current temperature (at init time), these values may</div><div class='add'>+ * not be valid for very long, but it gives us a starting/default point,</div><div class='add'>+ * and allows us to active (i.e. using Tx) scan.</div><div class='add'>+ *</div><div class='add'>+ * This does *not* write values to NIC, just sets up our internal table.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il3945_txpower_set_from_eeprom(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_channel_info *ch_info = NULL;</div><div class='add'>+	struct il3945_channel_power_info *pwr_info;</div><div class='add'>+	struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il-&gt;eeprom;</div><div class='add'>+	int delta_idx;</div><div class='add'>+	u8 rate_idx;</div><div class='add'>+	u8 scan_tbl_idx;</div><div class='add'>+	const s8 *clip_pwrs;	/* array of power levels for each rate */</div><div class='add'>+	u8 gain, dsp_atten;</div><div class='add'>+	s8 power;</div><div class='add'>+	u8 pwr_idx, base_pwr_idx, a_band;</div><div class='add'>+	u8 i;</div><div class='add'>+	int temperature;</div><div class='add'>+</div><div class='add'>+	/* save temperature reference,</div><div class='add'>+	 *   so we can determine next time to calibrate */</div><div class='add'>+	temperature = il3945_hw_reg_txpower_get_temperature(il);</div><div class='add'>+	il-&gt;last_temperature = temperature;</div><div class='add'>+</div><div class='add'>+	il3945_hw_reg_init_channel_groups(il);</div><div class='add'>+</div><div class='add'>+	/* initialize Tx power info for each and every channel, 2.4 and 5.x */</div><div class='add'>+	for (i = 0, ch_info = il-&gt;channel_info; i &lt; il-&gt;channel_count;</div><div class='add'>+	     i++, ch_info++) {</div><div class='add'>+		a_band = il_is_channel_a_band(ch_info);</div><div class='add'>+		if (!il_is_channel_valid(ch_info))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* find this channel's channel group (*not* "band") idx */</div><div class='add'>+		ch_info-&gt;group_idx = il3945_hw_reg_get_ch_grp_idx(il, ch_info);</div><div class='add'>+</div><div class='add'>+		/* Get this chnlgrp's rate-&gt;max/clip-powers table */</div><div class='add'>+		clip_pwrs =</div><div class='add'>+		    il-&gt;_3945.clip_groups[ch_info-&gt;group_idx].clip_powers;</div><div class='add'>+</div><div class='add'>+		/* calculate power idx *adjustment* value according to</div><div class='add'>+		 *  diff between current temperature and factory temperature */</div><div class='add'>+		delta_idx =</div><div class='add'>+		    il3945_hw_reg_adjust_power_by_temp(temperature,</div><div class='add'>+						       eeprom-&gt;groups[ch_info-&gt;</div><div class='add'>+								      group_idx].</div><div class='add'>+						       temperature);</div><div class='add'>+</div><div class='add'>+		D_POWER("Delta idx for channel %d: %d [%d]\n", ch_info-&gt;channel,</div><div class='add'>+			delta_idx, temperature + IL_TEMP_CONVERT);</div><div class='add'>+</div><div class='add'>+		/* set tx power value for all OFDM rates */</div><div class='add'>+		for (rate_idx = 0; rate_idx &lt; IL_OFDM_RATES; rate_idx++) {</div><div class='add'>+			s32 uninitialized_var(power_idx);</div><div class='add'>+			int rc;</div><div class='add'>+</div><div class='add'>+			/* use channel group's clip-power table,</div><div class='add'>+			 *   but don't exceed channel's max power */</div><div class='add'>+			s8 pwr = min(ch_info-&gt;max_power_avg,</div><div class='add'>+				     clip_pwrs[rate_idx]);</div><div class='add'>+</div><div class='add'>+			pwr_info = &amp;ch_info-&gt;power_info[rate_idx];</div><div class='add'>+</div><div class='add'>+			/* get base (i.e. at factory-measured temperature)</div><div class='add'>+			 *    power table idx for this rate's power */</div><div class='add'>+			rc = il3945_hw_reg_get_matched_power_idx(il, pwr,</div><div class='add'>+								 ch_info-&gt;</div><div class='add'>+								 group_idx,</div><div class='add'>+								 &amp;power_idx);</div><div class='add'>+			if (rc) {</div><div class='add'>+				IL_ERR("Invalid power idx\n");</div><div class='add'>+				return rc;</div><div class='add'>+			}</div><div class='add'>+			pwr_info-&gt;base_power_idx = (u8) power_idx;</div><div class='add'>+</div><div class='add'>+			/* temperature compensate */</div><div class='add'>+			power_idx += delta_idx;</div><div class='add'>+</div><div class='add'>+			/* stay within range of gain table */</div><div class='add'>+			power_idx = il3945_hw_reg_fix_power_idx(power_idx);</div><div class='add'>+</div><div class='add'>+			/* fill 1 OFDM rate's il3945_channel_power_info struct */</div><div class='add'>+			pwr_info-&gt;requested_power = pwr;</div><div class='add'>+			pwr_info-&gt;power_table_idx = (u8) power_idx;</div><div class='add'>+			pwr_info-&gt;tpc.tx_gain =</div><div class='add'>+			    power_gain_table[a_band][power_idx].tx_gain;</div><div class='add'>+			pwr_info-&gt;tpc.dsp_atten =</div><div class='add'>+			    power_gain_table[a_band][power_idx].dsp_atten;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* set tx power for CCK rates, based on OFDM 12 Mbit settings */</div><div class='add'>+		pwr_info = &amp;ch_info-&gt;power_info[RATE_12M_IDX_TBL];</div><div class='add'>+		power = pwr_info-&gt;requested_power + IL_CCK_FROM_OFDM_POWER_DIFF;</div><div class='add'>+		pwr_idx = pwr_info-&gt;power_table_idx + IL_CCK_FROM_OFDM_IDX_DIFF;</div><div class='add'>+		base_pwr_idx =</div><div class='add'>+		    pwr_info-&gt;base_power_idx + IL_CCK_FROM_OFDM_IDX_DIFF;</div><div class='add'>+</div><div class='add'>+		/* stay within table range */</div><div class='add'>+		pwr_idx = il3945_hw_reg_fix_power_idx(pwr_idx);</div><div class='add'>+		gain = power_gain_table[a_band][pwr_idx].tx_gain;</div><div class='add'>+		dsp_atten = power_gain_table[a_band][pwr_idx].dsp_atten;</div><div class='add'>+</div><div class='add'>+		/* fill each CCK rate's il3945_channel_power_info structure</div><div class='add'>+		 * NOTE:  All CCK-rate Txpwrs are the same for a given chnl!</div><div class='add'>+		 * NOTE:  CCK rates start at end of OFDM rates! */</div><div class='add'>+		for (rate_idx = 0; rate_idx &lt; IL_CCK_RATES; rate_idx++) {</div><div class='add'>+			pwr_info =</div><div class='add'>+			    &amp;ch_info-&gt;power_info[rate_idx + IL_OFDM_RATES];</div><div class='add'>+			pwr_info-&gt;requested_power = power;</div><div class='add'>+			pwr_info-&gt;power_table_idx = pwr_idx;</div><div class='add'>+			pwr_info-&gt;base_power_idx = base_pwr_idx;</div><div class='add'>+			pwr_info-&gt;tpc.tx_gain = gain;</div><div class='add'>+			pwr_info-&gt;tpc.dsp_atten = dsp_atten;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* set scan tx power, 1Mbit for CCK, 6Mbit for OFDM */</div><div class='add'>+		for (scan_tbl_idx = 0; scan_tbl_idx &lt; IL_NUM_SCAN_RATES;</div><div class='add'>+		     scan_tbl_idx++) {</div><div class='add'>+			s32 actual_idx =</div><div class='add'>+			    (scan_tbl_idx ==</div><div class='add'>+			     0) ? RATE_1M_IDX_TBL : RATE_6M_IDX_TBL;</div><div class='add'>+			il3945_hw_reg_set_scan_power(il, scan_tbl_idx,</div><div class='add'>+						     actual_idx, clip_pwrs,</div><div class='add'>+						     ch_info, a_band);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il3945_hw_rxq_stop(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	il_wr(il, FH39_RCSR_CONFIG(0), 0);</div><div class='add'>+	rc = il_poll_bit(il, FH39_RSSR_STATUS,</div><div class='add'>+			 FH39_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		IL_ERR("Can't stop Rx DMA.\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il3945_hw_tx_queue_init(struct il_priv *il, struct il_tx_queue *txq)</div><div class='add'>+{</div><div class='add'>+	int txq_id = txq-&gt;q.id;</div><div class='add'>+</div><div class='add'>+	struct il3945_shared *shared_data = il-&gt;_3945.shared_virt;</div><div class='add'>+</div><div class='add'>+	shared_data-&gt;tx_base_ptr[txq_id] = cpu_to_le32((u32) txq-&gt;q.dma_addr);</div><div class='add'>+</div><div class='add'>+	il_wr(il, FH39_CBCC_CTRL(txq_id), 0);</div><div class='add'>+	il_wr(il, FH39_CBCC_BASE(txq_id), 0);</div><div class='add'>+</div><div class='add'>+	il_wr(il, FH39_TCSR_CONFIG(txq_id),</div><div class='add'>+	      FH39_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_NOINT |</div><div class='add'>+	      FH39_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_TXF |</div><div class='add'>+	      FH39_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_IFTFD |</div><div class='add'>+	      FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE_VAL |</div><div class='add'>+	      FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE);</div><div class='add'>+</div><div class='add'>+	/* fake read to flush all prev. writes */</div><div class='add'>+	_il_rd(il, FH39_TSSR_CBB_BASE);</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'>+ * HCMD utils</div><div class='add'>+ */</div><div class='add'>+static u16</div><div class='add'>+il3945_get_hcmd_size(u8 cmd_id, u16 len)</div><div class='add'>+{</div><div class='add'>+	switch (cmd_id) {</div><div class='add'>+	case C_RXON:</div><div class='add'>+		return sizeof(struct il3945_rxon_cmd);</div><div class='add'>+	case C_POWER_TBL:</div><div class='add'>+		return sizeof(struct il3945_powertable_cmd);</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'>+static u16</div><div class='add'>+il3945_build_addsta_hcmd(const struct il_addsta_cmd *cmd, u8 * data)</div><div class='add'>+{</div><div class='add'>+	struct il3945_addsta_cmd *addsta = (struct il3945_addsta_cmd *)data;</div><div class='add'>+	addsta-&gt;mode = cmd-&gt;mode;</div><div class='add'>+	memcpy(&amp;addsta-&gt;sta, &amp;cmd-&gt;sta, sizeof(struct sta_id_modify));</div><div class='add'>+	memcpy(&amp;addsta-&gt;key, &amp;cmd-&gt;key, sizeof(struct il4965_keyinfo));</div><div class='add'>+	addsta-&gt;station_flags = cmd-&gt;station_flags;</div><div class='add'>+	addsta-&gt;station_flags_msk = cmd-&gt;station_flags_msk;</div><div class='add'>+	addsta-&gt;tid_disable_tx = cpu_to_le16(0);</div><div class='add'>+	addsta-&gt;rate_n_flags = cmd-&gt;rate_n_flags;</div><div class='add'>+	addsta-&gt;add_immediate_ba_tid = cmd-&gt;add_immediate_ba_tid;</div><div class='add'>+	addsta-&gt;remove_immediate_ba_tid = cmd-&gt;remove_immediate_ba_tid;</div><div class='add'>+	addsta-&gt;add_immediate_ba_ssn = cmd-&gt;add_immediate_ba_ssn;</div><div class='add'>+</div><div class='add'>+	return (u16) sizeof(struct il3945_addsta_cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il3945_add_bssid_station(struct il_priv *il, const u8 * addr, u8 * sta_id_r)</div><div class='add'>+{</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (sta_id_r)</div><div class='add'>+		*sta_id_r = IL_INVALID_STATION;</div><div class='add'>+</div><div class='add'>+	ret = il_add_station_common(il, ctx, addr, 0, NULL, &amp;sta_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IL_ERR("Unable to add station %pM\n", addr);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sta_id_r)</div><div class='add'>+		*sta_id_r = sta_id;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	il-&gt;stations[sta_id].used |= IL_STA_LOCAL;</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_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</div><div class='add'>+il3945_manage_ibss_station(struct il_priv *il, struct ieee80211_vif *vif,</div><div class='add'>+			   bool add)</div><div class='add'>+{</div><div class='add'>+	struct il_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (add) {</div><div class='add'>+		ret =</div><div class='add'>+		    il3945_add_bssid_station(il, vif-&gt;bss_conf.bssid,</div><div class='add'>+					     &amp;vif_priv-&gt;ibss_bssid_sta_id);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		il3945_sync_sta(il, vif_priv-&gt;ibss_bssid_sta_id,</div><div class='add'>+				(il-&gt;band ==</div><div class='add'>+				 IEEE80211_BAND_5GHZ) ? RATE_6M_PLCP :</div><div class='add'>+				RATE_1M_PLCP);</div><div class='add'>+		il3945_rate_scale_init(il-&gt;hw, vif_priv-&gt;ibss_bssid_sta_id);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return il_remove_station(il, vif_priv-&gt;ibss_bssid_sta_id,</div><div class='add'>+				 vif-&gt;bss_conf.bssid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_init_hw_rate_table - Initialize the hardware rate fallback table</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il3945_init_hw_rate_table(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int rc, i, idx, prev_idx;</div><div class='add'>+	struct il3945_rate_scaling_cmd rate_cmd = {</div><div class='add'>+		.reserved = {0, 0, 0},</div><div class='add'>+	};</div><div class='add'>+	struct il3945_rate_scaling_info *table = rate_cmd.table;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(il3945_rates); i++) {</div><div class='add'>+		idx = il3945_rates[i].table_rs_idx;</div><div class='add'>+</div><div class='add'>+		table[idx].rate_n_flags = cpu_to_le16(il3945_rates[i].plcp);</div><div class='add'>+		table[idx].try_cnt = il-&gt;retry_rate;</div><div class='add'>+		prev_idx = il3945_get_prev_ieee_rate(i);</div><div class='add'>+		table[idx].next_rate_idx = il3945_rates[prev_idx].table_rs_idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (il-&gt;band) {</div><div class='add'>+	case IEEE80211_BAND_5GHZ:</div><div class='add'>+		D_RATE("Select A mode rate scale\n");</div><div class='add'>+		/* If one of the following CCK rates is used,</div><div class='add'>+		 * have it fall back to the 6M OFDM rate */</div><div class='add'>+		for (i = RATE_1M_IDX_TBL; i &lt;= RATE_11M_IDX_TBL; i++)</div><div class='add'>+			table[i].next_rate_idx =</div><div class='add'>+			    il3945_rates[IL_FIRST_OFDM_RATE].table_rs_idx;</div><div class='add'>+</div><div class='add'>+		/* Don't fall back to CCK rates */</div><div class='add'>+		table[RATE_12M_IDX_TBL].next_rate_idx = RATE_9M_IDX_TBL;</div><div class='add'>+</div><div class='add'>+		/* Don't drop out of OFDM rates */</div><div class='add'>+		table[RATE_6M_IDX_TBL].next_rate_idx =</div><div class='add'>+		    il3945_rates[IL_FIRST_OFDM_RATE].table_rs_idx;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IEEE80211_BAND_2GHZ:</div><div class='add'>+		D_RATE("Select B/G mode rate scale\n");</div><div class='add'>+		/* If an OFDM rate is used, have it fall back to the</div><div class='add'>+		 * 1M CCK rates */</div><div class='add'>+</div><div class='add'>+		if (!(il-&gt;_3945.sta_supp_rates &amp; IL_OFDM_RATES_MASK) &amp;&amp;</div><div class='add'>+		    il_is_associated(il)) {</div><div class='add'>+</div><div class='add'>+			idx = IL_FIRST_CCK_RATE;</div><div class='add'>+			for (i = RATE_6M_IDX_TBL; i &lt;= RATE_54M_IDX_TBL; i++)</div><div class='add'>+				table[i].next_rate_idx =</div><div class='add'>+				    il3945_rates[idx].table_rs_idx;</div><div class='add'>+</div><div class='add'>+			idx = RATE_11M_IDX_TBL;</div><div class='add'>+			/* CCK shouldn't fall back to OFDM... */</div><div class='add'>+			table[idx].next_rate_idx = RATE_5M_IDX_TBL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update the rate scaling for control frame Tx */</div><div class='add'>+	rate_cmd.table_id = 0;</div><div class='add'>+	rc = il_send_cmd_pdu(il, C_RATE_SCALE, sizeof(rate_cmd), &amp;rate_cmd);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Update the rate scaling for data frame Tx */</div><div class='add'>+	rate_cmd.table_id = 1;</div><div class='add'>+	return il_send_cmd_pdu(il, C_RATE_SCALE, sizeof(rate_cmd), &amp;rate_cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called when initializing driver */</div><div class='add'>+int</div><div class='add'>+il3945_hw_set_hw_params(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	memset((void *)&amp;il-&gt;hw_params, 0, sizeof(struct il_hw_params));</div><div class='add'>+</div><div class='add'>+	il-&gt;_3945.shared_virt =</div><div class='add'>+	    dma_alloc_coherent(&amp;il-&gt;pci_dev-&gt;dev, sizeof(struct il3945_shared),</div><div class='add'>+			       &amp;il-&gt;_3945.shared_phys, GFP_KERNEL);</div><div class='add'>+	if (!il-&gt;_3945.shared_virt) {</div><div class='add'>+		IL_ERR("failed to allocate pci memory\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Assign number of Usable TX queues */</div><div class='add'>+	il-&gt;hw_params.max_txq_num = il-&gt;cfg-&gt;base_params-&gt;num_of_queues;</div><div class='add'>+</div><div class='add'>+	il-&gt;hw_params.tfd_size = sizeof(struct il3945_tfd);</div><div class='add'>+	il-&gt;hw_params.rx_page_order = get_order(IL_RX_BUF_SIZE_3K);</div><div class='add'>+	il-&gt;hw_params.max_rxq_size = RX_QUEUE_SIZE;</div><div class='add'>+	il-&gt;hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG;</div><div class='add'>+	il-&gt;hw_params.max_stations = IL3945_STATION_COUNT;</div><div class='add'>+	il-&gt;ctx.bcast_sta_id = IL3945_BROADCAST_ID;</div><div class='add'>+</div><div class='add'>+	il-&gt;sta_key_max_num = STA_KEY_MAX_NUM;</div><div class='add'>+</div><div class='add'>+	il-&gt;hw_params.rx_wrt_ptr_reg = FH39_RSCSR_CHNL0_WPTR;</div><div class='add'>+	il-&gt;hw_params.max_beacon_itrvl = IL39_MAX_UCODE_BEACON_INTERVAL;</div><div class='add'>+	il-&gt;hw_params.beacon_time_tsf_bits = IL3945_EXT_BEACON_TIME_POS;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int</div><div class='add'>+il3945_hw_get_beacon_cmd(struct il_priv *il, struct il3945_frame *frame,</div><div class='add'>+			 u8 rate)</div><div class='add'>+{</div><div class='add'>+	struct il3945_tx_beacon_cmd *tx_beacon_cmd;</div><div class='add'>+	unsigned int frame_size;</div><div class='add'>+</div><div class='add'>+	tx_beacon_cmd = (struct il3945_tx_beacon_cmd *)&amp;frame-&gt;u;</div><div class='add'>+	memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd));</div><div class='add'>+</div><div class='add'>+	tx_beacon_cmd-&gt;tx.sta_id = il-&gt;ctx.bcast_sta_id;</div><div class='add'>+	tx_beacon_cmd-&gt;tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;</div><div class='add'>+</div><div class='add'>+	frame_size =</div><div class='add'>+	    il3945_fill_beacon_frame(il, tx_beacon_cmd-&gt;frame,</div><div class='add'>+				     sizeof(frame-&gt;u) - sizeof(*tx_beacon_cmd));</div><div class='add'>+</div><div class='add'>+	BUG_ON(frame_size &gt; MAX_MPDU_SIZE);</div><div class='add'>+	tx_beacon_cmd-&gt;tx.len = cpu_to_le16((u16) frame_size);</div><div class='add'>+</div><div class='add'>+	tx_beacon_cmd-&gt;tx.rate = rate;</div><div class='add'>+	tx_beacon_cmd-&gt;tx.tx_flags =</div><div class='add'>+	    (TX_CMD_FLG_SEQ_CTL_MSK | TX_CMD_FLG_TSF_MSK);</div><div class='add'>+</div><div class='add'>+	/* supp_rates[0] == OFDM start at IL_FIRST_OFDM_RATE */</div><div class='add'>+	tx_beacon_cmd-&gt;tx.supp_rates[0] =</div><div class='add'>+	    (IL_OFDM_BASIC_RATES_MASK &gt;&gt; IL_FIRST_OFDM_RATE) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	tx_beacon_cmd-&gt;tx.supp_rates[1] = (IL_CCK_BASIC_RATES_MASK &amp; 0xF);</div><div class='add'>+</div><div class='add'>+	return sizeof(struct il3945_tx_beacon_cmd) + frame_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il3945_hw_handler_setup(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	il-&gt;handlers[C_TX] = il3945_hdl_tx;</div><div class='add'>+	il-&gt;handlers[N_3945_RX] = il3945_hdl_rx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il3945_hw_setup_deferred_work(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	INIT_DELAYED_WORK(&amp;il-&gt;_3945.thermal_periodic,</div><div class='add'>+			  il3945_bg_reg_txpower_periodic);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il3945_hw_cancel_deferred_work(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	cancel_delayed_work(&amp;il-&gt;_3945.thermal_periodic);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check contents of special bootstrap uCode SRAM */</div><div class='add'>+static int</div><div class='add'>+il3945_verify_bsm(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	__le32 *image = il-&gt;ucode_boot.v_addr;</div><div class='add'>+	u32 len = il-&gt;ucode_boot.len;</div><div class='add'>+	u32 reg;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	D_INFO("Begin verify bsm\n");</div><div class='add'>+</div><div class='add'>+	/* verify BSM SRAM contents */</div><div class='add'>+	val = il_rd_prph(il, BSM_WR_DWCOUNT_REG);</div><div class='add'>+	for (reg = BSM_SRAM_LOWER_BOUND; reg &lt; BSM_SRAM_LOWER_BOUND + len;</div><div class='add'>+	     reg += sizeof(u32), image++) {</div><div class='add'>+		val = il_rd_prph(il, reg);</div><div class='add'>+		if (val != le32_to_cpu(*image)) {</div><div class='add'>+			IL_ERR("BSM uCode verification failed at "</div><div class='add'>+			       "addr 0x%08X+%u (of %u), is 0x%x, s/b 0x%x\n",</div><div class='add'>+			       BSM_SRAM_LOWER_BOUND, reg - BSM_SRAM_LOWER_BOUND,</div><div class='add'>+			       len, val, le32_to_cpu(*image));</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_INFO("BSM bootstrap uCode image OK\n");</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'>+ * EEPROM related functions</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clear the OWNER_MSK, to establish driver (instead of uCode running on</div><div class='add'>+ * embedded controller) as EEPROM reader; each read is a series of pulses</div><div class='add'>+ * to/from the EEPROM chip, not a single event, so even reads could conflict</div><div class='add'>+ * if they weren't arbitrated by some ownership mechanism.  Here, the driver</div><div class='add'>+ * simply claims ownership, which should be safe when this function is called</div><div class='add'>+ * (i.e. before loading uCode!).</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il3945_eeprom_acquire_semaphore(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	_il_clear_bit(il, CSR_EEPROM_GP, CSR_EEPROM_GP_IF_OWNER_MSK);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il3945_eeprom_release_semaphore(struct il_priv *il)</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'>+  * il3945_load_bsm - Load bootstrap instructions</div><div class='add'>+  *</div><div class='add'>+  * BSM operation:</div><div class='add'>+  *</div><div class='add'>+  * The Bootstrap State Machine (BSM) stores a short bootstrap uCode program</div><div class='add'>+  * in special SRAM that does not power down during RFKILL.  When powering back</div><div class='add'>+  * up after power-saving sleeps (or during initial uCode load), the BSM loads</div><div class='add'>+  * the bootstrap program into the on-board processor, and starts it.</div><div class='add'>+  *</div><div class='add'>+  * The bootstrap program loads (via DMA) instructions and data for a new</div><div class='add'>+  * program from host DRAM locations indicated by the host driver in the</div><div class='add'>+  * BSM_DRAM_* registers.  Once the new program is loaded, it starts</div><div class='add'>+  * automatically.</div><div class='add'>+  *</div><div class='add'>+  * When initializing the NIC, the host driver points the BSM to the</div><div class='add'>+  * "initialize" uCode image.  This uCode sets up some internal data, then</div><div class='add'>+  * notifies host via "initialize alive" that it is complete.</div><div class='add'>+  *</div><div class='add'>+  * The host then replaces the BSM_DRAM_* pointer values to point to the</div><div class='add'>+  * normal runtime uCode instructions and a backup uCode data cache buffer</div><div class='add'>+  * (filled initially with starting data values for the on-board processor),</div><div class='add'>+  * then triggers the "initialize" uCode to load and launch the runtime uCode,</div><div class='add'>+  * which begins normal operation.</div><div class='add'>+  *</div><div class='add'>+  * When doing a power-save shutdown, runtime uCode saves data SRAM into</div><div class='add'>+  * the backup data cache in DRAM before SRAM is powered down.</div><div class='add'>+  *</div><div class='add'>+  * When powering back up, the BSM loads the bootstrap program.  This reloads</div><div class='add'>+  * the runtime uCode instructions and the backup data cache into SRAM,</div><div class='add'>+  * and re-launches the runtime uCode from where it left off.</div><div class='add'>+  */</div><div class='add'>+static int</div><div class='add'>+il3945_load_bsm(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	__le32 *image = il-&gt;ucode_boot.v_addr;</div><div class='add'>+	u32 len = il-&gt;ucode_boot.len;</div><div class='add'>+	dma_addr_t pinst;</div><div class='add'>+	dma_addr_t pdata;</div><div class='add'>+	u32 inst_len;</div><div class='add'>+	u32 data_len;</div><div class='add'>+	int rc;</div><div class='add'>+	int i;</div><div class='add'>+	u32 done;</div><div class='add'>+	u32 reg_offset;</div><div class='add'>+</div><div class='add'>+	D_INFO("Begin load bsm\n");</div><div class='add'>+</div><div class='add'>+	/* make sure bootstrap program is no larger than BSM's SRAM size */</div><div class='add'>+	if (len &gt; IL39_MAX_BSM_SIZE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Tell bootstrap uCode where to find the "Initialize" uCode</div><div class='add'>+	 *   in host DRAM ... host DRAM physical address bits 31:0 for 3945.</div><div class='add'>+	 * NOTE:  il3945_initialize_alive_start() will replace these values,</div><div class='add'>+	 *        after the "initialize" uCode has run, to point to</div><div class='add'>+	 *        runtime/protocol instructions and backup data cache. */</div><div class='add'>+	pinst = il-&gt;ucode_init.p_addr;</div><div class='add'>+	pdata = il-&gt;ucode_init_data.p_addr;</div><div class='add'>+	inst_len = il-&gt;ucode_init.len;</div><div class='add'>+	data_len = il-&gt;ucode_init_data.len;</div><div class='add'>+</div><div class='add'>+	il_wr_prph(il, BSM_DRAM_INST_PTR_REG, pinst);</div><div class='add'>+	il_wr_prph(il, BSM_DRAM_DATA_PTR_REG, pdata);</div><div class='add'>+	il_wr_prph(il, BSM_DRAM_INST_BYTECOUNT_REG, inst_len);</div><div class='add'>+	il_wr_prph(il, BSM_DRAM_DATA_BYTECOUNT_REG, data_len);</div><div class='add'>+</div><div class='add'>+	/* Fill BSM memory with bootstrap instructions */</div><div class='add'>+	for (reg_offset = BSM_SRAM_LOWER_BOUND;</div><div class='add'>+	     reg_offset &lt; BSM_SRAM_LOWER_BOUND + len;</div><div class='add'>+	     reg_offset += sizeof(u32), image++)</div><div class='add'>+		_il_wr_prph(il, reg_offset, le32_to_cpu(*image));</div><div class='add'>+</div><div class='add'>+	rc = il3945_verify_bsm(il);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Tell BSM to copy from BSM SRAM into instruction SRAM, when asked */</div><div class='add'>+	il_wr_prph(il, BSM_WR_MEM_SRC_REG, 0x0);</div><div class='add'>+	il_wr_prph(il, BSM_WR_MEM_DST_REG, IL39_RTC_INST_LOWER_BOUND);</div><div class='add'>+	il_wr_prph(il, BSM_WR_DWCOUNT_REG, len / sizeof(u32));</div><div class='add'>+</div><div class='add'>+	/* Load bootstrap code into instruction SRAM now,</div><div class='add'>+	 *   to prepare to load "initialize" uCode */</div><div class='add'>+	il_wr_prph(il, BSM_WR_CTRL_REG, BSM_WR_CTRL_REG_BIT_START);</div><div class='add'>+</div><div class='add'>+	/* Wait for load of bootstrap uCode to finish */</div><div class='add'>+	for (i = 0; i &lt; 100; i++) {</div><div class='add'>+		done = il_rd_prph(il, BSM_WR_CTRL_REG);</div><div class='add'>+		if (!(done &amp; BSM_WR_CTRL_REG_BIT_START))</div><div class='add'>+			break;</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+	if (i &lt; 100)</div><div class='add'>+		D_INFO("BSM write complete, poll %d iterations\n", i);</div><div class='add'>+	else {</div><div class='add'>+		IL_ERR("BSM write did not complete!\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable future boot loads whenever power management unit triggers it</div><div class='add'>+	 *   (e.g. when powering back up after power-save shutdown) */</div><div class='add'>+	il_wr_prph(il, BSM_WR_CTRL_REG, BSM_WR_CTRL_REG_BIT_START_EN);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct il_hcmd_ops il3945_hcmd = {</div><div class='add'>+	.rxon_assoc = il3945_send_rxon_assoc,</div><div class='add'>+	.commit_rxon = il3945_commit_rxon,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct il_lib_ops il3945_lib = {</div><div class='add'>+	.txq_attach_buf_to_tfd = il3945_hw_txq_attach_buf_to_tfd,</div><div class='add'>+	.txq_free_tfd = il3945_hw_txq_free_tfd,</div><div class='add'>+	.txq_init = il3945_hw_tx_queue_init,</div><div class='add'>+	.load_ucode = il3945_load_bsm,</div><div class='add'>+	.dump_nic_error_log = il3945_dump_nic_error_log,</div><div class='add'>+	.apm_ops = {</div><div class='add'>+		    .init = il3945_apm_init,</div><div class='add'>+		    .config = il3945_nic_config,</div><div class='add'>+		    },</div><div class='add'>+	.eeprom_ops = {</div><div class='add'>+		       .regulatory_bands = {</div><div class='add'>+					    EEPROM_REGULATORY_BAND_1_CHANNELS,</div><div class='add'>+					    EEPROM_REGULATORY_BAND_2_CHANNELS,</div><div class='add'>+					    EEPROM_REGULATORY_BAND_3_CHANNELS,</div><div class='add'>+					    EEPROM_REGULATORY_BAND_4_CHANNELS,</div><div class='add'>+					    EEPROM_REGULATORY_BAND_5_CHANNELS,</div><div class='add'>+					    EEPROM_REGULATORY_BAND_NO_HT40,</div><div class='add'>+					    EEPROM_REGULATORY_BAND_NO_HT40,</div><div class='add'>+					    },</div><div class='add'>+		       .acquire_semaphore = il3945_eeprom_acquire_semaphore,</div><div class='add'>+		       .release_semaphore = il3945_eeprom_release_semaphore,</div><div class='add'>+		       },</div><div class='add'>+	.send_tx_power = il3945_send_tx_power,</div><div class='add'>+	.is_valid_rtc_data_addr = il3945_hw_valid_rtc_data_addr,</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+	.debugfs_ops = {</div><div class='add'>+			.rx_stats_read = il3945_ucode_rx_stats_read,</div><div class='add'>+			.tx_stats_read = il3945_ucode_tx_stats_read,</div><div class='add'>+			.general_stats_read = il3945_ucode_general_stats_read,</div><div class='add'>+			},</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct il_legacy_ops il3945_legacy_ops = {</div><div class='add'>+	.post_associate = il3945_post_associate,</div><div class='add'>+	.config_ap = il3945_config_ap,</div><div class='add'>+	.manage_ibss_station = il3945_manage_ibss_station,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct il_hcmd_utils_ops il3945_hcmd_utils = {</div><div class='add'>+	.get_hcmd_size = il3945_get_hcmd_size,</div><div class='add'>+	.build_addsta_hcmd = il3945_build_addsta_hcmd,</div><div class='add'>+	.request_scan = il3945_request_scan,</div><div class='add'>+	.post_scan = il3945_post_scan,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct il_ops il3945_ops = {</div><div class='add'>+	.lib = &amp;il3945_lib,</div><div class='add'>+	.hcmd = &amp;il3945_hcmd,</div><div class='add'>+	.utils = &amp;il3945_hcmd_utils,</div><div class='add'>+	.led = &amp;il3945_led_ops,</div><div class='add'>+	.legacy = &amp;il3945_legacy_ops,</div><div class='add'>+	.ieee80211_ops = &amp;il3945_hw_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct il_base_params il3945_base_params = {</div><div class='add'>+	.eeprom_size = IL3945_EEPROM_IMG_SIZE,</div><div class='add'>+	.num_of_queues = IL39_NUM_QUEUES,</div><div class='add'>+	.pll_cfg_val = CSR39_ANA_PLL_CFG_VAL,</div><div class='add'>+	.set_l0s = false,</div><div class='add'>+	.use_bsm = true,</div><div class='add'>+	.led_compensation = 64,</div><div class='add'>+	.wd_timeout = IL_DEF_WD_TIMEOUT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct il_cfg il3945_bg_cfg = {</div><div class='add'>+	.name = "3945BG",</div><div class='add'>+	.fw_name_pre = IL3945_FW_PRE,</div><div class='add'>+	.ucode_api_max = IL3945_UCODE_API_MAX,</div><div class='add'>+	.ucode_api_min = IL3945_UCODE_API_MIN,</div><div class='add'>+	.sku = IL_SKU_G,</div><div class='add'>+	.eeprom_ver = EEPROM_3945_EEPROM_VERSION,</div><div class='add'>+	.ops = &amp;il3945_ops,</div><div class='add'>+	.mod_params = &amp;il3945_mod_params,</div><div class='add'>+	.base_params = &amp;il3945_base_params,</div><div class='add'>+	.led_mode = IL_LED_BLINK,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct il_cfg il3945_abg_cfg = {</div><div class='add'>+	.name = "3945ABG",</div><div class='add'>+	.fw_name_pre = IL3945_FW_PRE,</div><div class='add'>+	.ucode_api_max = IL3945_UCODE_API_MAX,</div><div class='add'>+	.ucode_api_min = IL3945_UCODE_API_MIN,</div><div class='add'>+	.sku = IL_SKU_A | IL_SKU_G,</div><div class='add'>+	.eeprom_ver = EEPROM_3945_EEPROM_VERSION,</div><div class='add'>+	.ops = &amp;il3945_ops,</div><div class='add'>+	.mod_params = &amp;il3945_mod_params,</div><div class='add'>+	.base_params = &amp;il3945_base_params,</div><div class='add'>+	.led_mode = IL_LED_BLINK,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DEFINE_PCI_DEVICE_TABLE(il3945_hw_card_ids) = {</div><div class='add'>+	{IL_PCI_DEVICE(0x4222, 0x1005, il3945_bg_cfg)},</div><div class='add'>+	{IL_PCI_DEVICE(0x4222, 0x1034, il3945_bg_cfg)},</div><div class='add'>+	{IL_PCI_DEVICE(0x4222, 0x1044, il3945_bg_cfg)},</div><div class='add'>+	{IL_PCI_DEVICE(0x4227, 0x1014, il3945_bg_cfg)},</div><div class='add'>+	{IL_PCI_DEVICE(0x4222, PCI_ANY_ID, il3945_abg_cfg)},</div><div class='add'>+	{IL_PCI_DEVICE(0x4227, PCI_ANY_ID, il3945_abg_cfg)},</div><div class='add'>+	{0}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pci, il3945_hw_card_ids);</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/3945.h b/drivers/net/wireless/iwlegacy/3945.h<br/>new file mode 100644<br/>index 000000000000..9f42f79f8778<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/3945.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/3945.h</a></div><div class='hunk'>@@ -0,0 +1,607 @@</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.</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 version 2 of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution in the</div><div class='add'>+ * file called LICENSE.</div><div class='add'>+ *</div><div class='add'>+ * Contact Information:</div><div class='add'>+ *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='add'>+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef __il_3945_h__</div><div class='add'>+#define __il_3945_h__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;		/* for struct pci_device_id */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;net/ieee80211_radiotap.h&gt;</div><div class='add'>+</div><div class='add'>+/* Hardware specific file defines the PCI IDs table for that hardware module */</div><div class='add'>+extern const struct pci_device_id il3945_hw_card_ids[];</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+/* Highest firmware API version supported */</div><div class='add'>+#define IL3945_UCODE_API_MAX 2</div><div class='add'>+</div><div class='add'>+/* Lowest firmware API version supported */</div><div class='add'>+#define IL3945_UCODE_API_MIN 1</div><div class='add'>+</div><div class='add'>+#define IL3945_FW_PRE	"iwlwifi-3945-"</div><div class='add'>+#define _IL3945_MODULE_FIRMWARE(api) IL3945_FW_PRE #api ".ucode"</div><div class='add'>+#define IL3945_MODULE_FIRMWARE(api) _IL3945_MODULE_FIRMWARE(api)</div><div class='add'>+</div><div class='add'>+/* Default noise level to report when noise measurement is not available.</div><div class='add'>+ *   This may be because we're:</div><div class='add'>+ *   1)  Not associated (4965, no beacon stats being sent to driver)</div><div class='add'>+ *   2)  Scanning (noise measurement does not apply to associated channel)</div><div class='add'>+ *   3)  Receiving CCK (3945 delivers noise info only for OFDM frames)</div><div class='add'>+ * Use default noise value of -127 ... this is below the range of measurable</div><div class='add'>+ *   Rx dBm for either 3945 or 4965, so it can indicate "unmeasurable" to user.</div><div class='add'>+ *   Also, -127 works better than 0 when averaging frames with/without</div><div class='add'>+ *   noise info (e.g. averaging might be done in app); measured dBm values are</div><div class='add'>+ *   always negative ... using a negative value as the default keeps all</div><div class='add'>+ *   averages within an s8's (used in some apps) range of negative values. */</div><div class='add'>+#define IL_NOISE_MEAS_NOT_AVAILABLE (-127)</div><div class='add'>+</div><div class='add'>+/* Module parameters accessible from iwl-*.c */</div><div class='add'>+extern struct il_mod_params il3945_mod_params;</div><div class='add'>+</div><div class='add'>+struct il3945_rate_scale_data {</div><div class='add'>+	u64 data;</div><div class='add'>+	s32 success_counter;</div><div class='add'>+	s32 success_ratio;</div><div class='add'>+	s32 counter;</div><div class='add'>+	s32 average_tpt;</div><div class='add'>+	unsigned long stamp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il3945_rs_sta {</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	struct il_priv *il;</div><div class='add'>+	s32 *expected_tpt;</div><div class='add'>+	unsigned long last_partial_flush;</div><div class='add'>+	unsigned long last_flush;</div><div class='add'>+	u32 flush_time;</div><div class='add'>+	u32 last_tx_packets;</div><div class='add'>+	u32 tx_packets;</div><div class='add'>+	u8 tgg;</div><div class='add'>+	u8 flush_pending;</div><div class='add'>+	u8 start_rate;</div><div class='add'>+	struct timer_list rate_scale_flush;</div><div class='add'>+	struct il3945_rate_scale_data win[RATE_COUNT_3945];</div><div class='add'>+#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='add'>+	struct dentry *rs_sta_dbgfs_stats_table_file;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* used to be in sta_info */</div><div class='add'>+	int last_txrate_idx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The common struct MUST be first because it is shared between</div><div class='add'>+ * 3945 and 4965!</div><div class='add'>+ */</div><div class='add'>+struct il3945_sta_priv {</div><div class='add'>+	struct il_station_priv_common common;</div><div class='add'>+	struct il3945_rs_sta rs_sta;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum il3945_antenna {</div><div class='add'>+	IL_ANTENNA_DIVERSITY,</div><div class='add'>+	IL_ANTENNA_MAIN,</div><div class='add'>+	IL_ANTENNA_AUX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RTS threshold here is total size [2347] minus 4 FCS bytes</div><div class='add'>+ * Per spec:</div><div class='add'>+ *   a value of 0 means RTS on all data/management packets</div><div class='add'>+ *   a value &gt; max MSDU size means no RTS</div><div class='add'>+ * else RTS for data/management frames where MPDU is larger</div><div class='add'>+ *   than RTS value.</div><div class='add'>+ */</div><div class='add'>+#define DEFAULT_RTS_THRESHOLD     2347U</div><div class='add'>+#define MIN_RTS_THRESHOLD         0U</div><div class='add'>+#define MAX_RTS_THRESHOLD         2347U</div><div class='add'>+#define MAX_MSDU_SIZE		  2304U</div><div class='add'>+#define MAX_MPDU_SIZE		  2346U</div><div class='add'>+#define DEFAULT_BEACON_INTERVAL   100U</div><div class='add'>+#define	DEFAULT_SHORT_RETRY_LIMIT 7U</div><div class='add'>+#define	DEFAULT_LONG_RETRY_LIMIT  4U</div><div class='add'>+</div><div class='add'>+#define IL_TX_FIFO_AC0	0</div><div class='add'>+#define IL_TX_FIFO_AC1	1</div><div class='add'>+#define IL_TX_FIFO_AC2	2</div><div class='add'>+#define IL_TX_FIFO_AC3	3</div><div class='add'>+#define IL_TX_FIFO_HCCA_1	5</div><div class='add'>+#define IL_TX_FIFO_HCCA_2	6</div><div class='add'>+#define IL_TX_FIFO_NONE	7</div><div class='add'>+</div><div class='add'>+#define IEEE80211_DATA_LEN              2304</div><div class='add'>+#define IEEE80211_4ADDR_LEN             30</div><div class='add'>+#define IEEE80211_HLEN                  (IEEE80211_4ADDR_LEN)</div><div class='add'>+#define IEEE80211_FRAME_LEN             (IEEE80211_DATA_LEN + IEEE80211_HLEN)</div><div class='add'>+</div><div class='add'>+struct il3945_frame {</div><div class='add'>+	union {</div><div class='add'>+		struct ieee80211_hdr frame;</div><div class='add'>+		struct il3945_tx_beacon_cmd beacon;</div><div class='add'>+		u8 raw[IEEE80211_FRAME_LEN];</div><div class='add'>+		u8 cmd[360];</div><div class='add'>+	} u;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SEQ_TO_SN(seq) (((seq) &amp; IEEE80211_SCTL_SEQ) &gt;&gt; 4)</div><div class='add'>+#define SN_TO_SEQ(ssn) (((ssn) &lt;&lt; 4) &amp; IEEE80211_SCTL_SEQ)</div><div class='add'>+#define MAX_SN ((IEEE80211_SCTL_SEQ) &gt;&gt; 4)</div><div class='add'>+</div><div class='add'>+#define SUP_RATE_11A_MAX_NUM_CHANNELS  8</div><div class='add'>+#define SUP_RATE_11B_MAX_NUM_CHANNELS  4</div><div class='add'>+#define SUP_RATE_11G_MAX_NUM_CHANNELS  12</div><div class='add'>+</div><div class='add'>+#define IL_SUPPORTED_RATES_IE_LEN         8</div><div class='add'>+</div><div class='add'>+#define SCAN_INTERVAL 100</div><div class='add'>+</div><div class='add'>+#define MAX_TID_COUNT        9</div><div class='add'>+</div><div class='add'>+#define IL_INVALID_RATE     0xFF</div><div class='add'>+#define IL_INVALID_VALUE    -1</div><div class='add'>+</div><div class='add'>+#define STA_PS_STATUS_WAKE             0</div><div class='add'>+#define STA_PS_STATUS_SLEEP            1</div><div class='add'>+</div><div class='add'>+struct il3945_ibss_seq {</div><div class='add'>+	u8 mac[ETH_ALEN];</div><div class='add'>+	u16 seq_num;</div><div class='add'>+	u16 frag_num;</div><div class='add'>+	unsigned long packet_time;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IL_RX_HDR(x) ((struct il3945_rx_frame_hdr *)(\</div><div class='add'>+		       x-&gt;u.rx_frame.stats.payload + \</div><div class='add'>+		       x-&gt;u.rx_frame.stats.phy_count))</div><div class='add'>+#define IL_RX_END(x) ((struct il3945_rx_frame_end *)(\</div><div class='add'>+		       IL_RX_HDR(x)-&gt;payload + \</div><div class='add'>+		       le16_to_cpu(IL_RX_HDR(x)-&gt;len)))</div><div class='add'>+#define IL_RX_STATS(x) (&amp;x-&gt;u.rx_frame.stats)</div><div class='add'>+#define IL_RX_DATA(x) (IL_RX_HDR(x)-&gt;payload)</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Functions implemented in iwl3945-base.c which are forward declared here</div><div class='add'>+ * for use by iwl-*.c</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+extern int il3945_calc_db_from_ratio(int sig_ratio);</div><div class='add'>+extern void il3945_rx_replenish(void *data);</div><div class='add'>+extern void il3945_rx_queue_reset(struct il_priv *il, struct il_rx_queue *rxq);</div><div class='add'>+extern unsigned int il3945_fill_beacon_frame(struct il_priv *il,</div><div class='add'>+					     struct ieee80211_hdr *hdr,</div><div class='add'>+					     int left);</div><div class='add'>+extern int il3945_dump_nic_event_log(struct il_priv *il, bool full_log,</div><div class='add'>+				     char **buf, bool display);</div><div class='add'>+extern void il3945_dump_nic_error_log(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Functions implemented in iwl-[34]*.c which are forward declared here</div><div class='add'>+ * for use by iwl3945-base.c</div><div class='add'>+ *</div><div class='add'>+ * NOTE:  The implementation of these functions are hardware specific</div><div class='add'>+ * which is why they are in the hardware specific files (vs. iwl-base.c)</div><div class='add'>+ *</div><div class='add'>+ * Naming convention --</div><div class='add'>+ * il3945_         &lt;-- Its part of iwlwifi (should be changed to il3945_)</div><div class='add'>+ * il3945_hw_      &lt;-- Hardware specific (implemented in iwl-XXXX.c by all HW)</div><div class='add'>+ * iwlXXXX_     &lt;-- Hardware specific (implemented in iwl-XXXX.c for XXXX)</div><div class='add'>+ * il3945_bg_      &lt;-- Called from work queue context</div><div class='add'>+ * il3945_mac_     &lt;-- mac80211 callback</div><div class='add'>+ *</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+extern void il3945_hw_handler_setup(struct il_priv *il);</div><div class='add'>+extern void il3945_hw_setup_deferred_work(struct il_priv *il);</div><div class='add'>+extern void il3945_hw_cancel_deferred_work(struct il_priv *il);</div><div class='add'>+extern int il3945_hw_rxq_stop(struct il_priv *il);</div><div class='add'>+extern int il3945_hw_set_hw_params(struct il_priv *il);</div><div class='add'>+extern int il3945_hw_nic_init(struct il_priv *il);</div><div class='add'>+extern int il3945_hw_nic_stop_master(struct il_priv *il);</div><div class='add'>+extern void il3945_hw_txq_ctx_free(struct il_priv *il);</div><div class='add'>+extern void il3945_hw_txq_ctx_stop(struct il_priv *il);</div><div class='add'>+extern int il3945_hw_nic_reset(struct il_priv *il);</div><div class='add'>+extern int il3945_hw_txq_attach_buf_to_tfd(struct il_priv *il,</div><div class='add'>+					   struct il_tx_queue *txq,</div><div class='add'>+					   dma_addr_t addr, u16 len, u8 reset,</div><div class='add'>+					   u8 pad);</div><div class='add'>+extern void il3945_hw_txq_free_tfd(struct il_priv *il, struct il_tx_queue *txq);</div><div class='add'>+extern int il3945_hw_get_temperature(struct il_priv *il);</div><div class='add'>+extern int il3945_hw_tx_queue_init(struct il_priv *il, struct il_tx_queue *txq);</div><div class='add'>+extern unsigned int il3945_hw_get_beacon_cmd(struct il_priv *il,</div><div class='add'>+					     struct il3945_frame *frame,</div><div class='add'>+					     u8 rate);</div><div class='add'>+void il3945_hw_build_tx_cmd_rate(struct il_priv *il, struct il_device_cmd *cmd,</div><div class='add'>+				 struct ieee80211_tx_info *info,</div><div class='add'>+				 struct ieee80211_hdr *hdr, int sta_id);</div><div class='add'>+extern int il3945_hw_reg_send_txpower(struct il_priv *il);</div><div class='add'>+extern int il3945_hw_reg_set_txpower(struct il_priv *il, s8 power);</div><div class='add'>+extern void il3945_hdl_stats(struct il_priv *il, struct il_rx_buf *rxb);</div><div class='add'>+void il3945_hdl_c_stats(struct il_priv *il, struct il_rx_buf *rxb);</div><div class='add'>+extern void il3945_disable_events(struct il_priv *il);</div><div class='add'>+extern int il4965_get_temperature(const struct il_priv *il);</div><div class='add'>+extern void il3945_post_associate(struct il_priv *il);</div><div class='add'>+extern void il3945_config_ap(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+extern int il3945_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_hw_find_station - Find station id for a given BSSID</div><div class='add'>+ * @bssid: MAC address of station ID to find</div><div class='add'>+ *</div><div class='add'>+ * NOTE:  This should not be hardware specific but the code has</div><div class='add'>+ * not yet been merged into a single common layer for managing the</div><div class='add'>+ * station tables.</div><div class='add'>+ */</div><div class='add'>+extern u8 il3945_hw_find_station(struct il_priv *il, const u8 * bssid);</div><div class='add'>+</div><div class='add'>+extern struct ieee80211_ops il3945_hw_ops;</div><div class='add'>+</div><div class='add'>+extern __le32 il3945_get_antenna_flags(const struct il_priv *il);</div><div class='add'>+extern int il3945_init_hw_rate_table(struct il_priv *il);</div><div class='add'>+extern void il3945_reg_txpower_periodic(struct il_priv *il);</div><div class='add'>+extern int il3945_txpower_set_from_eeprom(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+extern int il3945_rs_next_rate(struct il_priv *il, int rate);</div><div class='add'>+</div><div class='add'>+/* scanning */</div><div class='add'>+int il3945_request_scan(struct il_priv *il, struct ieee80211_vif *vif);</div><div class='add'>+void il3945_post_scan(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+/* rates */</div><div class='add'>+extern const struct il3945_rate_info il3945_rates[RATE_COUNT_3945];</div><div class='add'>+</div><div class='add'>+/* RSSI to dBm */</div><div class='add'>+#define IL39_RSSI_OFFSET	95</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * EEPROM related constants, enums, and structures.</div><div class='add'>+ */</div><div class='add'>+#define EEPROM_SKU_CAP_OP_MODE_MRC                      (1 &lt;&lt; 7)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mapping of a Tx power level, at factory calibration temperature,</div><div class='add'>+ *   to a radio/DSP gain table idx.</div><div class='add'>+ * One for each of 5 "sample" power levels in each band.</div><div class='add'>+ * v_det is measured at the factory, using the 3945's built-in power amplifier</div><div class='add'>+ *   (PA) output voltage detector.  This same detector is used during Tx of</div><div class='add'>+ *   long packets in normal operation to provide feedback as to proper output</div><div class='add'>+ *   level.</div><div class='add'>+ * Data copied from EEPROM.</div><div class='add'>+ * DO NOT ALTER THIS STRUCTURE!!!</div><div class='add'>+ */</div><div class='add'>+struct il3945_eeprom_txpower_sample {</div><div class='add'>+	u8 gain_idx;		/* idx into power (gain) setup table ... */</div><div class='add'>+	s8 power;		/* ... for this pwr level for this chnl group */</div><div class='add'>+	u16 v_det;		/* PA output voltage */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mappings of Tx power levels -&gt; nominal radio/DSP gain table idxes.</div><div class='add'>+ * One for each channel group (a.k.a. "band") (1 for BG, 4 for A).</div><div class='add'>+ * Tx power setup code interpolates between the 5 "sample" power levels</div><div class='add'>+ *    to determine the nominal setup for a requested power level.</div><div class='add'>+ * Data copied from EEPROM.</div><div class='add'>+ * DO NOT ALTER THIS STRUCTURE!!!</div><div class='add'>+ */</div><div class='add'>+struct il3945_eeprom_txpower_group {</div><div class='add'>+	struct il3945_eeprom_txpower_sample samples[5];	/* 5 power levels */</div><div class='add'>+	s32 a, b, c, d, e;	/* coefficients for voltage-&gt;power</div><div class='add'>+				 * formula (signed) */</div><div class='add'>+	s32 Fa, Fb, Fc, Fd, Fe;	/* these modify coeffs based on</div><div class='add'>+				 * frequency (signed) */</div><div class='add'>+	s8 saturation_power;	/* highest power possible by h/w in this</div><div class='add'>+				 * band */</div><div class='add'>+	u8 group_channel;	/* "representative" channel # in this band */</div><div class='add'>+	s16 temperature;	/* h/w temperature at factory calib this band</div><div class='add'>+				 * (signed) */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Temperature-based Tx-power compensation data, not band-specific.</div><div class='add'>+ * These coefficients are use to modify a/b/c/d/e coeffs based on</div><div class='add'>+ *   difference between current temperature and factory calib temperature.</div><div class='add'>+ * Data copied from EEPROM.</div><div class='add'>+ */</div><div class='add'>+struct il3945_eeprom_temperature_corr {</div><div class='add'>+	u32 Ta;</div><div class='add'>+	u32 Tb;</div><div class='add'>+	u32 Tc;</div><div class='add'>+	u32 Td;</div><div class='add'>+	u32 Te;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * EEPROM map</div><div class='add'>+ */</div><div class='add'>+struct il3945_eeprom {</div><div class='add'>+	u8 reserved0[16];</div><div class='add'>+	u16 device_id;		/* abs.ofs: 16 */</div><div class='add'>+	u8 reserved1[2];</div><div class='add'>+	u16 pmc;		/* abs.ofs: 20 */</div><div class='add'>+	u8 reserved2[20];</div><div class='add'>+	u8 mac_address[6];	/* abs.ofs: 42 */</div><div class='add'>+	u8 reserved3[58];</div><div class='add'>+	u16 board_revision;	/* abs.ofs: 106 */</div><div class='add'>+	u8 reserved4[11];</div><div class='add'>+	u8 board_pba_number[9];	/* abs.ofs: 119 */</div><div class='add'>+	u8 reserved5[8];</div><div class='add'>+	u16 version;		/* abs.ofs: 136 */</div><div class='add'>+	u8 sku_cap;		/* abs.ofs: 138 */</div><div class='add'>+	u8 leds_mode;		/* abs.ofs: 139 */</div><div class='add'>+	u16 oem_mode;</div><div class='add'>+	u16 wowlan_mode;	/* abs.ofs: 142 */</div><div class='add'>+	u16 leds_time_interval;	/* abs.ofs: 144 */</div><div class='add'>+	u8 leds_off_time;	/* abs.ofs: 146 */</div><div class='add'>+	u8 leds_on_time;	/* abs.ofs: 147 */</div><div class='add'>+	u8 almgor_m_version;	/* abs.ofs: 148 */</div><div class='add'>+	u8 antenna_switch_type;	/* abs.ofs: 149 */</div><div class='add'>+	u8 reserved6[42];</div><div class='add'>+	u8 sku_id[4];		/* abs.ofs: 192 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Per-channel regulatory data.</div><div class='add'>+ *</div><div class='add'>+ * Each channel that *might* be supported by 3945 has a fixed location</div><div class='add'>+ * in EEPROM containing EEPROM_CHANNEL_* usage flags (LSB) and max regulatory</div><div class='add'>+ * txpower (MSB).</div><div class='add'>+ *</div><div class='add'>+ * Entries immediately below are for 20 MHz channel width.</div><div class='add'>+ *</div><div class='add'>+ * 2.4 GHz channels 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14</div><div class='add'>+ */</div><div class='add'>+	u16 band_1_count;	/* abs.ofs: 196 */</div><div class='add'>+	struct il_eeprom_channel band_1_channels[14];	/* abs.ofs: 198 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 4.9 GHz channels 183, 184, 185, 187, 188, 189, 192, 196,</div><div class='add'>+ * 5.0 GHz channels 7, 8, 11, 12, 16</div><div class='add'>+ * (4915-5080MHz) (none of these is ever supported)</div><div class='add'>+ */</div><div class='add'>+	u16 band_2_count;	/* abs.ofs: 226 */</div><div class='add'>+	struct il_eeprom_channel band_2_channels[13];	/* abs.ofs: 228 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 5.2 GHz channels 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64</div><div class='add'>+ * (5170-5320MHz)</div><div class='add'>+ */</div><div class='add'>+	u16 band_3_count;	/* abs.ofs: 254 */</div><div class='add'>+	struct il_eeprom_channel band_3_channels[12];	/* abs.ofs: 256 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 5.5 GHz channels 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140</div><div class='add'>+ * (5500-5700MHz)</div><div class='add'>+ */</div><div class='add'>+	u16 band_4_count;	/* abs.ofs: 280 */</div><div class='add'>+	struct il_eeprom_channel band_4_channels[11];	/* abs.ofs: 282 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 5.7 GHz channels 145, 149, 153, 157, 161, 165</div><div class='add'>+ * (5725-5825MHz)</div><div class='add'>+ */</div><div class='add'>+	u16 band_5_count;	/* abs.ofs: 304 */</div><div class='add'>+	struct il_eeprom_channel band_5_channels[6];	/* abs.ofs: 306 */</div><div class='add'>+</div><div class='add'>+	u8 reserved9[194];</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 3945 Txpower calibration data.</div><div class='add'>+ */</div><div class='add'>+#define IL_NUM_TX_CALIB_GROUPS 5</div><div class='add'>+	struct il3945_eeprom_txpower_group groups[IL_NUM_TX_CALIB_GROUPS];</div><div class='add'>+/* abs.ofs: 512 */</div><div class='add'>+	struct il3945_eeprom_temperature_corr corrections;	/* abs.ofs: 832 */</div><div class='add'>+	u8 reserved16[172];	/* fill out to full 1024 byte block */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define IL3945_EEPROM_IMG_SIZE 1024</div><div class='add'>+</div><div class='add'>+/* End of EEPROM */</div><div class='add'>+</div><div class='add'>+#define PCI_CFG_REV_ID_BIT_BASIC_SKU                (0x40)	/* bit 6    */</div><div class='add'>+#define PCI_CFG_REV_ID_BIT_RTP                      (0x80)	/* bit 7    */</div><div class='add'>+</div><div class='add'>+/* 4 DATA + 1 CMD. There are 2 HCCA queues that are not used. */</div><div class='add'>+#define IL39_NUM_QUEUES        5</div><div class='add'>+#define IL39_CMD_QUEUE_NUM	4</div><div class='add'>+</div><div class='add'>+#define IL_DEFAULT_TX_RETRY  15</div><div class='add'>+</div><div class='add'>+/*********************************************/</div><div class='add'>+</div><div class='add'>+#define RFD_SIZE                              4</div><div class='add'>+#define NUM_TFD_CHUNKS                        4</div><div class='add'>+</div><div class='add'>+#define TFD_CTL_COUNT_SET(n)       (n &lt;&lt; 24)</div><div class='add'>+#define TFD_CTL_COUNT_GET(ctl)     ((ctl &gt;&gt; 24) &amp; 7)</div><div class='add'>+#define TFD_CTL_PAD_SET(n)         (n &lt;&lt; 28)</div><div class='add'>+#define TFD_CTL_PAD_GET(ctl)       (ctl &gt;&gt; 28)</div><div class='add'>+</div><div class='add'>+/* Sizes and addresses for instruction and data memory (SRAM) in</div><div class='add'>+ * 3945's embedded processor.  Driver access is via HBUS_TARG_MEM_* regs. */</div><div class='add'>+#define IL39_RTC_INST_LOWER_BOUND		(0x000000)</div><div class='add'>+#define IL39_RTC_INST_UPPER_BOUND		(0x014000)</div><div class='add'>+</div><div class='add'>+#define IL39_RTC_DATA_LOWER_BOUND		(0x800000)</div><div class='add'>+#define IL39_RTC_DATA_UPPER_BOUND		(0x808000)</div><div class='add'>+</div><div class='add'>+#define IL39_RTC_INST_SIZE (IL39_RTC_INST_UPPER_BOUND - \</div><div class='add'>+				IL39_RTC_INST_LOWER_BOUND)</div><div class='add'>+#define IL39_RTC_DATA_SIZE (IL39_RTC_DATA_UPPER_BOUND - \</div><div class='add'>+				IL39_RTC_DATA_LOWER_BOUND)</div><div class='add'>+</div><div class='add'>+#define IL39_MAX_INST_SIZE IL39_RTC_INST_SIZE</div><div class='add'>+#define IL39_MAX_DATA_SIZE IL39_RTC_DATA_SIZE</div><div class='add'>+</div><div class='add'>+/* Size of uCode instruction memory in bootstrap state machine */</div><div class='add'>+#define IL39_MAX_BSM_SIZE IL39_RTC_INST_SIZE</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il3945_hw_valid_rtc_data_addr(u32 addr)</div><div class='add'>+{</div><div class='add'>+	return (addr &gt;= IL39_RTC_DATA_LOWER_BOUND &amp;&amp;</div><div class='add'>+		addr &lt; IL39_RTC_DATA_UPPER_BOUND);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Base physical address of il3945_shared is provided to FH39_TSSR_CBB_BASE</div><div class='add'>+ * and &amp;il3945_shared.rx_read_ptr[0] is provided to FH39_RCSR_RPTR_ADDR(0) */</div><div class='add'>+struct il3945_shared {</div><div class='add'>+	__le32 tx_base_ptr[8];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/************************************/</div><div class='add'>+/* iwl3945 Flow Handler Definitions */</div><div class='add'>+/************************************/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * This I/O area is directly read/writable by driver (e.g. Linux uses writel())</div><div class='add'>+ * Addresses are offsets from device's PCI hardware base address.</div><div class='add'>+ */</div><div class='add'>+#define FH39_MEM_LOWER_BOUND                   (0x0800)</div><div class='add'>+#define FH39_MEM_UPPER_BOUND                   (0x1000)</div><div class='add'>+</div><div class='add'>+#define FH39_CBCC_TBL		(FH39_MEM_LOWER_BOUND + 0x140)</div><div class='add'>+#define FH39_TFDB_TBL		(FH39_MEM_LOWER_BOUND + 0x180)</div><div class='add'>+#define FH39_RCSR_TBL		(FH39_MEM_LOWER_BOUND + 0x400)</div><div class='add'>+#define FH39_RSSR_TBL		(FH39_MEM_LOWER_BOUND + 0x4c0)</div><div class='add'>+#define FH39_TCSR_TBL		(FH39_MEM_LOWER_BOUND + 0x500)</div><div class='add'>+#define FH39_TSSR_TBL		(FH39_MEM_LOWER_BOUND + 0x680)</div><div class='add'>+</div><div class='add'>+/* TFDB (Transmit Frame Buffer Descriptor) */</div><div class='add'>+#define FH39_TFDB(_ch, buf)			(FH39_TFDB_TBL + \</div><div class='add'>+						 ((_ch) * 2 + (buf)) * 0x28)</div><div class='add'>+#define FH39_TFDB_CHNL_BUF_CTRL_REG(_ch)	(FH39_TFDB_TBL + 0x50 * (_ch))</div><div class='add'>+</div><div class='add'>+/* CBCC channel is [0,2] */</div><div class='add'>+#define FH39_CBCC(_ch)		(FH39_CBCC_TBL + (_ch) * 0x8)</div><div class='add'>+#define FH39_CBCC_CTRL(_ch)	(FH39_CBCC(_ch) + 0x00)</div><div class='add'>+#define FH39_CBCC_BASE(_ch)	(FH39_CBCC(_ch) + 0x04)</div><div class='add'>+</div><div class='add'>+/* RCSR channel is [0,2] */</div><div class='add'>+#define FH39_RCSR(_ch)			(FH39_RCSR_TBL + (_ch) * 0x40)</div><div class='add'>+#define FH39_RCSR_CONFIG(_ch)		(FH39_RCSR(_ch) + 0x00)</div><div class='add'>+#define FH39_RCSR_RBD_BASE(_ch)		(FH39_RCSR(_ch) + 0x04)</div><div class='add'>+#define FH39_RCSR_WPTR(_ch)		(FH39_RCSR(_ch) + 0x20)</div><div class='add'>+#define FH39_RCSR_RPTR_ADDR(_ch)	(FH39_RCSR(_ch) + 0x24)</div><div class='add'>+</div><div class='add'>+#define FH39_RSCSR_CHNL0_WPTR		(FH39_RCSR_WPTR(0))</div><div class='add'>+</div><div class='add'>+/* RSSR */</div><div class='add'>+#define FH39_RSSR_CTRL			(FH39_RSSR_TBL + 0x000)</div><div class='add'>+#define FH39_RSSR_STATUS		(FH39_RSSR_TBL + 0x004)</div><div class='add'>+</div><div class='add'>+/* TCSR */</div><div class='add'>+#define FH39_TCSR(_ch)			(FH39_TCSR_TBL + (_ch) * 0x20)</div><div class='add'>+#define FH39_TCSR_CONFIG(_ch)		(FH39_TCSR(_ch) + 0x00)</div><div class='add'>+#define FH39_TCSR_CREDIT(_ch)		(FH39_TCSR(_ch) + 0x04)</div><div class='add'>+#define FH39_TCSR_BUFF_STTS(_ch)	(FH39_TCSR(_ch) + 0x08)</div><div class='add'>+</div><div class='add'>+/* TSSR */</div><div class='add'>+#define FH39_TSSR_CBB_BASE        (FH39_TSSR_TBL + 0x000)</div><div class='add'>+#define FH39_TSSR_MSG_CONFIG      (FH39_TSSR_TBL + 0x008)</div><div class='add'>+#define FH39_TSSR_TX_STATUS       (FH39_TSSR_TBL + 0x010)</div><div class='add'>+</div><div class='add'>+/* DBM */</div><div class='add'>+</div><div class='add'>+#define FH39_SRVC_CHNL                            (6)</div><div class='add'>+</div><div class='add'>+#define FH39_RCSR_RX_CONFIG_REG_POS_RBDC_SIZE     (20)</div><div class='add'>+#define FH39_RCSR_RX_CONFIG_REG_POS_IRQ_RBTH      (4)</div><div class='add'>+</div><div class='add'>+#define FH39_RCSR_RX_CONFIG_REG_BIT_WR_STTS_EN    (0x08000000)</div><div class='add'>+</div><div class='add'>+#define FH39_RCSR_RX_CONFIG_REG_VAL_DMA_CHNL_EN_ENABLE        (0x80000000)</div><div class='add'>+</div><div class='add'>+#define FH39_RCSR_RX_CONFIG_REG_VAL_RDRBD_EN_ENABLE           (0x20000000)</div><div class='add'>+</div><div class='add'>+#define FH39_RCSR_RX_CONFIG_REG_VAL_MAX_FRAG_SIZE_128		(0x01000000)</div><div class='add'>+</div><div class='add'>+#define FH39_RCSR_RX_CONFIG_REG_VAL_IRQ_DEST_INT_HOST		(0x00001000)</div><div class='add'>+</div><div class='add'>+#define FH39_RCSR_RX_CONFIG_REG_VAL_MSG_MODE_FH			(0x00000000)</div><div class='add'>+</div><div class='add'>+#define FH39_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_TXF		(0x00000000)</div><div class='add'>+#define FH39_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_DRIVER		(0x00000001)</div><div class='add'>+</div><div class='add'>+#define FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE_VAL	(0x00000000)</div><div class='add'>+#define FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE_VAL	(0x00000008)</div><div class='add'>+</div><div class='add'>+#define FH39_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_IFTFD		(0x00200000)</div><div class='add'>+</div><div class='add'>+#define FH39_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_NOINT		(0x00000000)</div><div class='add'>+</div><div class='add'>+#define FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE		(0x00000000)</div><div class='add'>+#define FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE		(0x80000000)</div><div class='add'>+</div><div class='add'>+#define FH39_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_VALID		(0x00004000)</div><div class='add'>+</div><div class='add'>+#define FH39_TCSR_CHNL_TX_BUF_STS_REG_BIT_TFDB_WPTR		(0x00000001)</div><div class='add'>+</div><div class='add'>+#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_SNOOP_RD_TXPD_ON	(0xFF000000)</div><div class='add'>+#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RD_TXPD_ON	(0x00FF0000)</div><div class='add'>+</div><div class='add'>+#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_MAX_FRAG_SIZE_128B	(0x00000400)</div><div class='add'>+</div><div class='add'>+#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_SNOOP_RD_TFD_ON		(0x00000100)</div><div class='add'>+#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RD_CBB_ON		(0x00000080)</div><div class='add'>+</div><div class='add'>+#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RSP_WAIT_TH	(0x00000020)</div><div class='add'>+#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_RSP_WAIT_TH		(0x00000005)</div><div class='add'>+</div><div class='add'>+#define FH39_TSSR_TX_STATUS_REG_BIT_BUFS_EMPTY(_ch)	(BIT(_ch) &lt;&lt; 24)</div><div class='add'>+#define FH39_TSSR_TX_STATUS_REG_BIT_NO_PEND_REQ(_ch)	(BIT(_ch) &lt;&lt; 16)</div><div class='add'>+</div><div class='add'>+#define FH39_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(_ch) \</div><div class='add'>+	(FH39_TSSR_TX_STATUS_REG_BIT_BUFS_EMPTY(_ch) | \</div><div class='add'>+	 FH39_TSSR_TX_STATUS_REG_BIT_NO_PEND_REQ(_ch))</div><div class='add'>+</div><div class='add'>+#define FH39_RSSR_CHNL0_RX_STATUS_CHNL_IDLE			(0x01000000)</div><div class='add'>+</div><div class='add'>+struct il3945_tfd_tb {</div><div class='add'>+	__le32 addr;</div><div class='add'>+	__le32 len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct il3945_tfd {</div><div class='add'>+	__le32 control_flags;</div><div class='add'>+	struct il3945_tfd_tb tbs[4];</div><div class='add'>+	u8 __pad[28];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+ssize_t il3945_ucode_rx_stats_read(struct file *file, char __user *user_buf,</div><div class='add'>+				   size_t count, loff_t *ppos);</div><div class='add'>+ssize_t il3945_ucode_tx_stats_read(struct file *file, char __user *user_buf,</div><div class='add'>+				   size_t count, loff_t *ppos);</div><div class='add'>+ssize_t il3945_ucode_general_stats_read(struct file *file,</div><div class='add'>+					char __user *user_buf, size_t count,</div><div class='add'>+					loff_t *ppos);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-calib.c b/drivers/net/wireless/iwlegacy/4965-calib.c<br/>index 162d877e6869..d3248e3ef23b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-4965-calib.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-calib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/4965-calib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/4965-calib.c</a></div><div class='hunk'>@@ -63,15 +63,14 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-4965-calib.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "4965.h"</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  * INIT calibrations framework</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-struct statistics_general_data {</div><div class='add'>+struct stats_general_data {</div><div class='ctx'> 	u32 beacon_silence_rssi_a;</div><div class='ctx'> 	u32 beacon_silence_rssi_b;</div><div class='ctx'> 	u32 beacon_silence_rssi_c;</div><div class='hunk'>@@ -80,14 +79,15 @@ struct statistics_general_data {</div><div class='ctx'> 	u32 beacon_energy_c;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void iwl4965_calib_free_results(struct iwl_priv *priv)</div><div class='add'>+void</div><div class='add'>+il4965_calib_free_results(struct il_priv *il)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; IWL_CALIB_MAX; i++) {</div><div class='del'>-		kfree(priv-&gt;calib_results[i].buf);</div><div class='del'>-		priv-&gt;calib_results[i].buf = NULL;</div><div class='del'>-		priv-&gt;calib_results[i].buf_len = 0;</div><div class='add'>+	for (i = 0; i &lt; IL_CALIB_MAX; i++) {</div><div class='add'>+		kfree(il-&gt;calib_results[i].buf);</div><div class='add'>+		il-&gt;calib_results[i].buf = NULL;</div><div class='add'>+		il-&gt;calib_results[i].buf_len = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -103,10 +103,9 @@ void iwl4965_calib_free_results(struct iwl_priv *priv)</div><div class='ctx'>  *   enough to receive all of our own network traffic, but not so</div><div class='ctx'>  *   high that our DSP gets too busy trying to lock onto non-network</div><div class='ctx'>  *   activity/noise. */</div><div class='del'>-static int iwl4965_sens_energy_cck(struct iwl_priv *priv,</div><div class='del'>-				   u32 norm_fa,</div><div class='del'>-				   u32 rx_enable_time,</div><div class='del'>-				   struct statistics_general_data *rx_info)</div><div class='add'>+static int</div><div class='add'>+il4965_sens_energy_cck(struct il_priv *il, u32 norm_fa, u32 rx_enable_time,</div><div class='add'>+		       struct stats_general_data *rx_info)</div><div class='ctx'> {</div><div class='ctx'> 	u32 max_nrg_cck = 0;</div><div class='ctx'> 	int i = 0;</div><div class='hunk'>@@ -129,22 +128,22 @@ static int iwl4965_sens_energy_cck(struct iwl_priv *priv,</div><div class='ctx'> 	u32 false_alarms = norm_fa * 200 * 1024;</div><div class='ctx'> 	u32 max_false_alarms = MAX_FA_CCK * rx_enable_time;</div><div class='ctx'> 	u32 min_false_alarms = MIN_FA_CCK * rx_enable_time;</div><div class='del'>-	struct iwl_sensitivity_data *data = NULL;</div><div class='del'>-	const struct iwl_sensitivity_ranges *ranges = priv-&gt;hw_params.sens;</div><div class='add'>+	struct il_sensitivity_data *data = NULL;</div><div class='add'>+	const struct il_sensitivity_ranges *ranges = il-&gt;hw_params.sens;</div><div class='ctx'> </div><div class='del'>-	data = &amp;(priv-&gt;sensitivity_data);</div><div class='add'>+	data = &amp;(il-&gt;sensitivity_data);</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;nrg_auto_corr_silence_diff = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Find max silence rssi among all 3 receivers.</div><div class='ctx'> 	 * This is background noise, which may include transmissions from other</div><div class='ctx'> 	 *    networks, measured during silence before our network's beacon */</div><div class='del'>-	silence_rssi_a = (u8)((rx_info-&gt;beacon_silence_rssi_a &amp;</div><div class='del'>-			    ALL_BAND_FILTER) &gt;&gt; 8);</div><div class='del'>-	silence_rssi_b = (u8)((rx_info-&gt;beacon_silence_rssi_b &amp;</div><div class='del'>-			    ALL_BAND_FILTER) &gt;&gt; 8);</div><div class='del'>-	silence_rssi_c = (u8)((rx_info-&gt;beacon_silence_rssi_c &amp;</div><div class='del'>-			    ALL_BAND_FILTER) &gt;&gt; 8);</div><div class='add'>+	silence_rssi_a =</div><div class='add'>+	    (u8) ((rx_info-&gt;beacon_silence_rssi_a &amp; ALL_BAND_FILTER) &gt;&gt; 8);</div><div class='add'>+	silence_rssi_b =</div><div class='add'>+	    (u8) ((rx_info-&gt;beacon_silence_rssi_b &amp; ALL_BAND_FILTER) &gt;&gt; 8);</div><div class='add'>+	silence_rssi_c =</div><div class='add'>+	    (u8) ((rx_info-&gt;beacon_silence_rssi_c &amp; ALL_BAND_FILTER) &gt;&gt; 8);</div><div class='ctx'> </div><div class='ctx'> 	val = max(silence_rssi_b, silence_rssi_c);</div><div class='ctx'> 	max_silence_rssi = max(silence_rssi_a, (u8) val);</div><div class='hunk'>@@ -160,9 +159,8 @@ static int iwl4965_sens_energy_cck(struct iwl_priv *priv,</div><div class='ctx'> 		val = data-&gt;nrg_silence_rssi[i];</div><div class='ctx'> 		silence_ref = max(silence_ref, val);</div><div class='ctx'> 	}</div><div class='del'>-	IWL_DEBUG_CALIB(priv, "silence a %u, b %u, c %u, 20-bcn max %u\n",</div><div class='del'>-			silence_rssi_a, silence_rssi_b, silence_rssi_c,</div><div class='del'>-			silence_ref);</div><div class='add'>+	D_CALIB("silence a %u, b %u, c %u, 20-bcn max %u\n", silence_rssi_a,</div><div class='add'>+		silence_rssi_b, silence_rssi_c, silence_ref);</div><div class='ctx'> </div><div class='ctx'> 	/* Find max rx energy (min value!) among all 3 receivers,</div><div class='ctx'> 	 *   measured during beacon frame.</div><div class='hunk'>@@ -184,9 +182,9 @@ static int iwl4965_sens_energy_cck(struct iwl_priv *priv,</div><div class='ctx'> 		max_nrg_cck = (u32) max(max_nrg_cck, (data-&gt;nrg_value[i]));</div><div class='ctx'> 	max_nrg_cck += 6;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_CALIB(priv, "rx energy a %u, b %u, c %u, 10-bcn max/min %u\n",</div><div class='del'>-			rx_info-&gt;beacon_energy_a, rx_info-&gt;beacon_energy_b,</div><div class='del'>-			rx_info-&gt;beacon_energy_c, max_nrg_cck - 6);</div><div class='add'>+	D_CALIB("rx energy a %u, b %u, c %u, 10-bcn max/min %u\n",</div><div class='add'>+		rx_info-&gt;beacon_energy_a, rx_info-&gt;beacon_energy_b,</div><div class='add'>+		rx_info-&gt;beacon_energy_c, max_nrg_cck - 6);</div><div class='ctx'> </div><div class='ctx'> 	/* Count number of consecutive beacons with fewer-than-desired</div><div class='ctx'> 	 *   false alarms. */</div><div class='hunk'>@@ -194,35 +192,34 @@ static int iwl4965_sens_energy_cck(struct iwl_priv *priv,</div><div class='ctx'> 		data-&gt;num_in_cck_no_fa++;</div><div class='ctx'> 	else</div><div class='ctx'> 		data-&gt;num_in_cck_no_fa = 0;</div><div class='del'>-	IWL_DEBUG_CALIB(priv, "consecutive bcns with few false alarms = %u\n",</div><div class='del'>-			data-&gt;num_in_cck_no_fa);</div><div class='add'>+	D_CALIB("consecutive bcns with few false alarms = %u\n",</div><div class='add'>+		data-&gt;num_in_cck_no_fa);</div><div class='ctx'> </div><div class='ctx'> 	/* If we got too many false alarms this time, reduce sensitivity */</div><div class='del'>-	if ((false_alarms &gt; max_false_alarms) &amp;&amp;</div><div class='del'>-		(data-&gt;auto_corr_cck &gt; AUTO_CORR_MAX_TH_CCK)) {</div><div class='del'>-		IWL_DEBUG_CALIB(priv, "norm FA %u &gt; max FA %u\n",</div><div class='del'>-		     false_alarms, max_false_alarms);</div><div class='del'>-		IWL_DEBUG_CALIB(priv, "... reducing sensitivity\n");</div><div class='del'>-		data-&gt;nrg_curr_state = IWL_FA_TOO_MANY;</div><div class='add'>+	if (false_alarms &gt; max_false_alarms &amp;&amp;</div><div class='add'>+	    data-&gt;auto_corr_cck &gt; AUTO_CORR_MAX_TH_CCK) {</div><div class='add'>+		D_CALIB("norm FA %u &gt; max FA %u\n", false_alarms,</div><div class='add'>+			max_false_alarms);</div><div class='add'>+		D_CALIB("... reducing sensitivity\n");</div><div class='add'>+		data-&gt;nrg_curr_state = IL_FA_TOO_MANY;</div><div class='ctx'> 		/* Store for "fewer than desired" on later beacon */</div><div class='ctx'> 		data-&gt;nrg_silence_ref = silence_ref;</div><div class='ctx'> </div><div class='ctx'> 		/* increase energy threshold (reduce nrg value)</div><div class='ctx'> 		 *   to decrease sensitivity */</div><div class='ctx'> 		data-&gt;nrg_th_cck = data-&gt;nrg_th_cck - NRG_STEP_CCK;</div><div class='del'>-	/* Else if we got fewer than desired, increase sensitivity */</div><div class='add'>+		/* Else if we got fewer than desired, increase sensitivity */</div><div class='ctx'> 	} else if (false_alarms &lt; min_false_alarms) {</div><div class='del'>-		data-&gt;nrg_curr_state = IWL_FA_TOO_FEW;</div><div class='add'>+		data-&gt;nrg_curr_state = IL_FA_TOO_FEW;</div><div class='ctx'> </div><div class='ctx'> 		/* Compare silence level with silence level for most recent</div><div class='ctx'> 		 *   healthy number or too many false alarms */</div><div class='del'>-		data-&gt;nrg_auto_corr_silence_diff = (s32)data-&gt;nrg_silence_ref -</div><div class='del'>-						   (s32)silence_ref;</div><div class='add'>+		data-&gt;nrg_auto_corr_silence_diff =</div><div class='add'>+		    (s32) data-&gt;nrg_silence_ref - (s32) silence_ref;</div><div class='ctx'> </div><div class='del'>-		IWL_DEBUG_CALIB(priv,</div><div class='del'>-			 "norm FA %u &lt; min FA %u, silence diff %d\n",</div><div class='del'>-			 false_alarms, min_false_alarms,</div><div class='del'>-			 data-&gt;nrg_auto_corr_silence_diff);</div><div class='add'>+		D_CALIB("norm FA %u &lt; min FA %u, silence diff %d\n",</div><div class='add'>+			false_alarms, min_false_alarms,</div><div class='add'>+			data-&gt;nrg_auto_corr_silence_diff);</div><div class='ctx'> </div><div class='ctx'> 		/* Increase value to increase sensitivity, but only if:</div><div class='ctx'> 		 * 1a) previous beacon did *not* have *too many* false alarms</div><div class='hunk'>@@ -230,23 +227,22 @@ static int iwl4965_sens_energy_cck(struct iwl_priv *priv,</div><div class='ctx'> 		 *      from a previous beacon with too many, or healthy # FAs</div><div class='ctx'> 		 * OR 2) We've seen a lot of beacons (100) with too few</div><div class='ctx'> 		 *       false alarms */</div><div class='del'>-		if ((data-&gt;nrg_prev_state != IWL_FA_TOO_MANY) &amp;&amp;</div><div class='del'>-			((data-&gt;nrg_auto_corr_silence_diff &gt; NRG_DIFF) ||</div><div class='del'>-			(data-&gt;num_in_cck_no_fa &gt; MAX_NUMBER_CCK_NO_FA))) {</div><div class='add'>+		if (data-&gt;nrg_prev_state != IL_FA_TOO_MANY &amp;&amp;</div><div class='add'>+		    (data-&gt;nrg_auto_corr_silence_diff &gt; NRG_DIFF ||</div><div class='add'>+		     data-&gt;num_in_cck_no_fa &gt; MAX_NUMBER_CCK_NO_FA)) {</div><div class='ctx'> </div><div class='del'>-			IWL_DEBUG_CALIB(priv, "... increasing sensitivity\n");</div><div class='add'>+			D_CALIB("... increasing sensitivity\n");</div><div class='ctx'> 			/* Increase nrg value to increase sensitivity */</div><div class='ctx'> 			val = data-&gt;nrg_th_cck + NRG_STEP_CCK;</div><div class='del'>-			data-&gt;nrg_th_cck = min((u32)ranges-&gt;min_nrg_cck, val);</div><div class='add'>+			data-&gt;nrg_th_cck = min((u32) ranges-&gt;min_nrg_cck, val);</div><div class='ctx'> 		} else {</div><div class='del'>-			IWL_DEBUG_CALIB(priv,</div><div class='del'>-					 "... but not changing sensitivity\n");</div><div class='add'>+			D_CALIB("... but not changing sensitivity\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	/* Else we got a healthy number of false alarms, keep status quo */</div><div class='add'>+		/* Else we got a healthy number of false alarms, keep status quo */</div><div class='ctx'> 	} else {</div><div class='del'>-		IWL_DEBUG_CALIB(priv, " FA in safe zone\n");</div><div class='del'>-		data-&gt;nrg_curr_state = IWL_FA_GOOD_RANGE;</div><div class='add'>+		D_CALIB(" FA in safe zone\n");</div><div class='add'>+		data-&gt;nrg_curr_state = IL_FA_GOOD_RANGE;</div><div class='ctx'> </div><div class='ctx'> 		/* Store for use in "fewer than desired" with later beacon */</div><div class='ctx'> 		data-&gt;nrg_silence_ref = silence_ref;</div><div class='hunk'>@@ -254,8 +250,8 @@ static int iwl4965_sens_energy_cck(struct iwl_priv *priv,</div><div class='ctx'> 		/* If previous beacon had too many false alarms,</div><div class='ctx'> 		 *   give it some extra margin by reducing sensitivity again</div><div class='ctx'> 		 *   (but don't go below measured energy of desired Rx) */</div><div class='del'>-		if (IWL_FA_TOO_MANY == data-&gt;nrg_prev_state) {</div><div class='del'>-			IWL_DEBUG_CALIB(priv, "... increasing margin\n");</div><div class='add'>+		if (IL_FA_TOO_MANY == data-&gt;nrg_prev_state) {</div><div class='add'>+			D_CALIB("... increasing margin\n");</div><div class='ctx'> 			if (data-&gt;nrg_th_cck &gt; (max_nrg_cck + NRG_MARGIN))</div><div class='ctx'> 				data-&gt;nrg_th_cck -= NRG_MARGIN;</div><div class='ctx'> 			else</div><div class='hunk'>@@ -269,7 +265,7 @@ static int iwl4965_sens_energy_cck(struct iwl_priv *priv,</div><div class='ctx'> 	 * Lower value is higher energy, so we use max()!</div><div class='ctx'> 	 */</div><div class='ctx'> 	data-&gt;nrg_th_cck = max(max_nrg_cck, data-&gt;nrg_th_cck);</div><div class='del'>-	IWL_DEBUG_CALIB(priv, "new nrg_th_cck %u\n", data-&gt;nrg_th_cck);</div><div class='add'>+	D_CALIB("new nrg_th_cck %u\n", data-&gt;nrg_th_cck);</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;nrg_prev_state = data-&gt;nrg_curr_state;</div><div class='ctx'> </div><div class='hunk'>@@ -284,190 +280,187 @@ static int iwl4965_sens_energy_cck(struct iwl_priv *priv,</div><div class='ctx'> 		else {</div><div class='ctx'> 			val = data-&gt;auto_corr_cck + AUTO_CORR_STEP_CCK;</div><div class='ctx'> 			data-&gt;auto_corr_cck =</div><div class='del'>-				min((u32)ranges-&gt;auto_corr_max_cck, val);</div><div class='add'>+			    min((u32) ranges-&gt;auto_corr_max_cck, val);</div><div class='ctx'> 		}</div><div class='ctx'> 		val = data-&gt;auto_corr_cck_mrc + AUTO_CORR_STEP_CCK;</div><div class='ctx'> 		data-&gt;auto_corr_cck_mrc =</div><div class='del'>-			min((u32)ranges-&gt;auto_corr_max_cck_mrc, val);</div><div class='del'>-	} else if ((false_alarms &lt; min_false_alarms) &amp;&amp;</div><div class='del'>-	   ((data-&gt;nrg_auto_corr_silence_diff &gt; NRG_DIFF) ||</div><div class='del'>-	   (data-&gt;num_in_cck_no_fa &gt; MAX_NUMBER_CCK_NO_FA))) {</div><div class='add'>+		    min((u32) ranges-&gt;auto_corr_max_cck_mrc, val);</div><div class='add'>+	} else if (false_alarms &lt; min_false_alarms &amp;&amp;</div><div class='add'>+		   (data-&gt;nrg_auto_corr_silence_diff &gt; NRG_DIFF ||</div><div class='add'>+		    data-&gt;num_in_cck_no_fa &gt; MAX_NUMBER_CCK_NO_FA)) {</div><div class='ctx'> </div><div class='ctx'> 		/* Decrease auto_corr values to increase sensitivity */</div><div class='ctx'> 		val = data-&gt;auto_corr_cck - AUTO_CORR_STEP_CCK;</div><div class='del'>-		data-&gt;auto_corr_cck =</div><div class='del'>-			max((u32)ranges-&gt;auto_corr_min_cck, val);</div><div class='add'>+		data-&gt;auto_corr_cck = max((u32) ranges-&gt;auto_corr_min_cck, val);</div><div class='ctx'> 		val = data-&gt;auto_corr_cck_mrc - AUTO_CORR_STEP_CCK;</div><div class='ctx'> 		data-&gt;auto_corr_cck_mrc =</div><div class='del'>-			max((u32)ranges-&gt;auto_corr_min_cck_mrc, val);</div><div class='add'>+		    max((u32) ranges-&gt;auto_corr_min_cck_mrc, val);</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'>-</div><div class='del'>-static int iwl4965_sens_auto_corr_ofdm(struct iwl_priv *priv,</div><div class='del'>-				       u32 norm_fa,</div><div class='del'>-				       u32 rx_enable_time)</div><div class='add'>+static int</div><div class='add'>+il4965_sens_auto_corr_ofdm(struct il_priv *il, u32 norm_fa, u32 rx_enable_time)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	u32 false_alarms = norm_fa * 200 * 1024;</div><div class='ctx'> 	u32 max_false_alarms = MAX_FA_OFDM * rx_enable_time;</div><div class='ctx'> 	u32 min_false_alarms = MIN_FA_OFDM * rx_enable_time;</div><div class='del'>-	struct iwl_sensitivity_data *data = NULL;</div><div class='del'>-	const struct iwl_sensitivity_ranges *ranges = priv-&gt;hw_params.sens;</div><div class='add'>+	struct il_sensitivity_data *data = NULL;</div><div class='add'>+	const struct il_sensitivity_ranges *ranges = il-&gt;hw_params.sens;</div><div class='ctx'> </div><div class='del'>-	data = &amp;(priv-&gt;sensitivity_data);</div><div class='add'>+	data = &amp;(il-&gt;sensitivity_data);</div><div class='ctx'> </div><div class='ctx'> 	/* If we got too many false alarms this time, reduce sensitivity */</div><div class='ctx'> 	if (false_alarms &gt; max_false_alarms) {</div><div class='ctx'> </div><div class='del'>-		IWL_DEBUG_CALIB(priv, "norm FA %u &gt; max FA %u)\n",</div><div class='del'>-			     false_alarms, max_false_alarms);</div><div class='add'>+		D_CALIB("norm FA %u &gt; max FA %u)\n", false_alarms,</div><div class='add'>+			max_false_alarms);</div><div class='ctx'> </div><div class='ctx'> 		val = data-&gt;auto_corr_ofdm + AUTO_CORR_STEP_OFDM;</div><div class='ctx'> 		data-&gt;auto_corr_ofdm =</div><div class='del'>-			min((u32)ranges-&gt;auto_corr_max_ofdm, val);</div><div class='add'>+		    min((u32) ranges-&gt;auto_corr_max_ofdm, val);</div><div class='ctx'> </div><div class='ctx'> 		val = data-&gt;auto_corr_ofdm_mrc + AUTO_CORR_STEP_OFDM;</div><div class='ctx'> 		data-&gt;auto_corr_ofdm_mrc =</div><div class='del'>-			min((u32)ranges-&gt;auto_corr_max_ofdm_mrc, val);</div><div class='add'>+		    min((u32) ranges-&gt;auto_corr_max_ofdm_mrc, val);</div><div class='ctx'> </div><div class='ctx'> 		val = data-&gt;auto_corr_ofdm_x1 + AUTO_CORR_STEP_OFDM;</div><div class='ctx'> 		data-&gt;auto_corr_ofdm_x1 =</div><div class='del'>-			min((u32)ranges-&gt;auto_corr_max_ofdm_x1, val);</div><div class='add'>+		    min((u32) ranges-&gt;auto_corr_max_ofdm_x1, val);</div><div class='ctx'> </div><div class='ctx'> 		val = data-&gt;auto_corr_ofdm_mrc_x1 + AUTO_CORR_STEP_OFDM;</div><div class='ctx'> 		data-&gt;auto_corr_ofdm_mrc_x1 =</div><div class='del'>-			min((u32)ranges-&gt;auto_corr_max_ofdm_mrc_x1, val);</div><div class='add'>+		    min((u32) ranges-&gt;auto_corr_max_ofdm_mrc_x1, val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Else if we got fewer than desired, increase sensitivity */</div><div class='ctx'> 	else if (false_alarms &lt; min_false_alarms) {</div><div class='ctx'> </div><div class='del'>-		IWL_DEBUG_CALIB(priv, "norm FA %u &lt; min FA %u\n",</div><div class='del'>-			     false_alarms, min_false_alarms);</div><div class='add'>+		D_CALIB("norm FA %u &lt; min FA %u\n", false_alarms,</div><div class='add'>+			min_false_alarms);</div><div class='ctx'> </div><div class='ctx'> 		val = data-&gt;auto_corr_ofdm - AUTO_CORR_STEP_OFDM;</div><div class='ctx'> 		data-&gt;auto_corr_ofdm =</div><div class='del'>-			max((u32)ranges-&gt;auto_corr_min_ofdm, val);</div><div class='add'>+		    max((u32) ranges-&gt;auto_corr_min_ofdm, val);</div><div class='ctx'> </div><div class='ctx'> 		val = data-&gt;auto_corr_ofdm_mrc - AUTO_CORR_STEP_OFDM;</div><div class='ctx'> 		data-&gt;auto_corr_ofdm_mrc =</div><div class='del'>-			max((u32)ranges-&gt;auto_corr_min_ofdm_mrc, val);</div><div class='add'>+		    max((u32) ranges-&gt;auto_corr_min_ofdm_mrc, val);</div><div class='ctx'> </div><div class='ctx'> 		val = data-&gt;auto_corr_ofdm_x1 - AUTO_CORR_STEP_OFDM;</div><div class='ctx'> 		data-&gt;auto_corr_ofdm_x1 =</div><div class='del'>-			max((u32)ranges-&gt;auto_corr_min_ofdm_x1, val);</div><div class='add'>+		    max((u32) ranges-&gt;auto_corr_min_ofdm_x1, val);</div><div class='ctx'> </div><div class='ctx'> 		val = data-&gt;auto_corr_ofdm_mrc_x1 - AUTO_CORR_STEP_OFDM;</div><div class='ctx'> 		data-&gt;auto_corr_ofdm_mrc_x1 =</div><div class='del'>-			max((u32)ranges-&gt;auto_corr_min_ofdm_mrc_x1, val);</div><div class='add'>+		    max((u32) ranges-&gt;auto_corr_min_ofdm_mrc_x1, val);</div><div class='ctx'> 	} else {</div><div class='del'>-		IWL_DEBUG_CALIB(priv, "min FA %u &lt; norm FA %u &lt; max FA %u OK\n",</div><div class='del'>-			 min_false_alarms, false_alarms, max_false_alarms);</div><div class='add'>+		D_CALIB("min FA %u &lt; norm FA %u &lt; max FA %u OK\n",</div><div class='add'>+			min_false_alarms, false_alarms, max_false_alarms);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl4965_prepare_legacy_sensitivity_tbl(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_sensitivity_data *data,</div><div class='del'>-				__le16 *tbl)</div><div class='add'>+static void</div><div class='add'>+il4965_prepare_legacy_sensitivity_tbl(struct il_priv *il,</div><div class='add'>+				      struct il_sensitivity_data *data,</div><div class='add'>+				      __le16 *tbl)</div><div class='ctx'> {</div><div class='del'>-	tbl[HD_AUTO_CORR32_X4_TH_ADD_MIN_INDEX] =</div><div class='del'>-				cpu_to_le16((u16)data-&gt;auto_corr_ofdm);</div><div class='del'>-	tbl[HD_AUTO_CORR32_X4_TH_ADD_MIN_MRC_INDEX] =</div><div class='del'>-				cpu_to_le16((u16)data-&gt;auto_corr_ofdm_mrc);</div><div class='del'>-	tbl[HD_AUTO_CORR32_X1_TH_ADD_MIN_INDEX] =</div><div class='del'>-				cpu_to_le16((u16)data-&gt;auto_corr_ofdm_x1);</div><div class='del'>-	tbl[HD_AUTO_CORR32_X1_TH_ADD_MIN_MRC_INDEX] =</div><div class='del'>-				cpu_to_le16((u16)data-&gt;auto_corr_ofdm_mrc_x1);</div><div class='del'>-</div><div class='del'>-	tbl[HD_AUTO_CORR40_X4_TH_ADD_MIN_INDEX] =</div><div class='del'>-				cpu_to_le16((u16)data-&gt;auto_corr_cck);</div><div class='del'>-	tbl[HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_INDEX] =</div><div class='del'>-				cpu_to_le16((u16)data-&gt;auto_corr_cck_mrc);</div><div class='del'>-</div><div class='del'>-	tbl[HD_MIN_ENERGY_CCK_DET_INDEX] =</div><div class='del'>-				cpu_to_le16((u16)data-&gt;nrg_th_cck);</div><div class='del'>-	tbl[HD_MIN_ENERGY_OFDM_DET_INDEX] =</div><div class='del'>-				cpu_to_le16((u16)data-&gt;nrg_th_ofdm);</div><div class='del'>-</div><div class='del'>-	tbl[HD_BARKER_CORR_TH_ADD_MIN_INDEX] =</div><div class='del'>-				cpu_to_le16(data-&gt;barker_corr_th_min);</div><div class='del'>-	tbl[HD_BARKER_CORR_TH_ADD_MIN_MRC_INDEX] =</div><div class='del'>-				cpu_to_le16(data-&gt;barker_corr_th_min_mrc);</div><div class='del'>-	tbl[HD_OFDM_ENERGY_TH_IN_INDEX] =</div><div class='del'>-				cpu_to_le16(data-&gt;nrg_th_cca);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_CALIB(priv, "ofdm: ac %u mrc %u x1 %u mrc_x1 %u thresh %u\n",</div><div class='del'>-			data-&gt;auto_corr_ofdm, data-&gt;auto_corr_ofdm_mrc,</div><div class='del'>-			data-&gt;auto_corr_ofdm_x1, data-&gt;auto_corr_ofdm_mrc_x1,</div><div class='del'>-			data-&gt;nrg_th_ofdm);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_CALIB(priv, "cck: ac %u mrc %u thresh %u\n",</div><div class='del'>-			data-&gt;auto_corr_cck, data-&gt;auto_corr_cck_mrc,</div><div class='del'>-			data-&gt;nrg_th_cck);</div><div class='add'>+	tbl[HD_AUTO_CORR32_X4_TH_ADD_MIN_IDX] =</div><div class='add'>+	    cpu_to_le16((u16) data-&gt;auto_corr_ofdm);</div><div class='add'>+	tbl[HD_AUTO_CORR32_X4_TH_ADD_MIN_MRC_IDX] =</div><div class='add'>+	    cpu_to_le16((u16) data-&gt;auto_corr_ofdm_mrc);</div><div class='add'>+	tbl[HD_AUTO_CORR32_X1_TH_ADD_MIN_IDX] =</div><div class='add'>+	    cpu_to_le16((u16) data-&gt;auto_corr_ofdm_x1);</div><div class='add'>+	tbl[HD_AUTO_CORR32_X1_TH_ADD_MIN_MRC_IDX] =</div><div class='add'>+	    cpu_to_le16((u16) data-&gt;auto_corr_ofdm_mrc_x1);</div><div class='add'>+</div><div class='add'>+	tbl[HD_AUTO_CORR40_X4_TH_ADD_MIN_IDX] =</div><div class='add'>+	    cpu_to_le16((u16) data-&gt;auto_corr_cck);</div><div class='add'>+	tbl[HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_IDX] =</div><div class='add'>+	    cpu_to_le16((u16) data-&gt;auto_corr_cck_mrc);</div><div class='add'>+</div><div class='add'>+	tbl[HD_MIN_ENERGY_CCK_DET_IDX] = cpu_to_le16((u16) data-&gt;nrg_th_cck);</div><div class='add'>+	tbl[HD_MIN_ENERGY_OFDM_DET_IDX] = cpu_to_le16((u16) data-&gt;nrg_th_ofdm);</div><div class='add'>+</div><div class='add'>+	tbl[HD_BARKER_CORR_TH_ADD_MIN_IDX] =</div><div class='add'>+	    cpu_to_le16(data-&gt;barker_corr_th_min);</div><div class='add'>+	tbl[HD_BARKER_CORR_TH_ADD_MIN_MRC_IDX] =</div><div class='add'>+	    cpu_to_le16(data-&gt;barker_corr_th_min_mrc);</div><div class='add'>+	tbl[HD_OFDM_ENERGY_TH_IN_IDX] = cpu_to_le16(data-&gt;nrg_th_cca);</div><div class='add'>+</div><div class='add'>+	D_CALIB("ofdm: ac %u mrc %u x1 %u mrc_x1 %u thresh %u\n",</div><div class='add'>+		data-&gt;auto_corr_ofdm, data-&gt;auto_corr_ofdm_mrc,</div><div class='add'>+		data-&gt;auto_corr_ofdm_x1, data-&gt;auto_corr_ofdm_mrc_x1,</div><div class='add'>+		data-&gt;nrg_th_ofdm);</div><div class='add'>+</div><div class='add'>+	D_CALIB("cck: ac %u mrc %u thresh %u\n", data-&gt;auto_corr_cck,</div><div class='add'>+		data-&gt;auto_corr_cck_mrc, data-&gt;nrg_th_cck);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Prepare a SENSITIVITY_CMD, send to uCode if values have changed */</div><div class='del'>-static int iwl4965_sensitivity_write(struct iwl_priv *priv)</div><div class='add'>+/* Prepare a C_SENSITIVITY, send to uCode if values have changed */</div><div class='add'>+static int</div><div class='add'>+il4965_sensitivity_write(struct il_priv *il)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_sensitivity_cmd cmd;</div><div class='del'>-	struct iwl_sensitivity_data *data = NULL;</div><div class='del'>-	struct iwl_host_cmd cmd_out = {</div><div class='del'>-		.id = SENSITIVITY_CMD,</div><div class='del'>-		.len = sizeof(struct iwl_sensitivity_cmd),</div><div class='add'>+	struct il_sensitivity_cmd cmd;</div><div class='add'>+	struct il_sensitivity_data *data = NULL;</div><div class='add'>+	struct il_host_cmd cmd_out = {</div><div class='add'>+		.id = C_SENSITIVITY,</div><div class='add'>+		.len = sizeof(struct il_sensitivity_cmd),</div><div class='ctx'> 		.flags = CMD_ASYNC,</div><div class='ctx'> 		.data = &amp;cmd,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	data = &amp;(priv-&gt;sensitivity_data);</div><div class='add'>+	data = &amp;(il-&gt;sensitivity_data);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='ctx'> </div><div class='del'>-	iwl4965_prepare_legacy_sensitivity_tbl(priv, data, &amp;cmd.table[0]);</div><div class='add'>+	il4965_prepare_legacy_sensitivity_tbl(il, data, &amp;cmd.table[0]);</div><div class='ctx'> </div><div class='ctx'> 	/* Update uCode's "work" table, and copy it to DSP */</div><div class='del'>-	cmd.control = SENSITIVITY_CMD_CONTROL_WORK_TABLE;</div><div class='add'>+	cmd.control = C_SENSITIVITY_CONTROL_WORK_TBL;</div><div class='ctx'> </div><div class='ctx'> 	/* Don't send command to uCode if nothing has changed */</div><div class='del'>-	if (!memcmp(&amp;cmd.table[0], &amp;(priv-&gt;sensitivity_tbl[0]),</div><div class='del'>-		    sizeof(u16)*HD_TABLE_SIZE)) {</div><div class='del'>-		IWL_DEBUG_CALIB(priv, "No change in SENSITIVITY_CMD\n");</div><div class='add'>+	if (!memcmp</div><div class='add'>+	    (&amp;cmd.table[0], &amp;(il-&gt;sensitivity_tbl[0]),</div><div class='add'>+	     sizeof(u16) * HD_TBL_SIZE)) {</div><div class='add'>+		D_CALIB("No change in C_SENSITIVITY\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Copy table for comparison next time */</div><div class='del'>-	memcpy(&amp;(priv-&gt;sensitivity_tbl[0]), &amp;(cmd.table[0]),</div><div class='del'>-	       sizeof(u16)*HD_TABLE_SIZE);</div><div class='add'>+	memcpy(&amp;(il-&gt;sensitivity_tbl[0]), &amp;(cmd.table[0]),</div><div class='add'>+	       sizeof(u16) * HD_TBL_SIZE);</div><div class='ctx'> </div><div class='del'>-	return iwl_legacy_send_cmd(priv, &amp;cmd_out);</div><div class='add'>+	return il_send_cmd(il, &amp;cmd_out);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl4965_init_sensitivity(struct iwl_priv *priv)</div><div class='add'>+void</div><div class='add'>+il4965_init_sensitivity(struct il_priv *il)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int i;</div><div class='del'>-	struct iwl_sensitivity_data *data = NULL;</div><div class='del'>-	const struct iwl_sensitivity_ranges *ranges = priv-&gt;hw_params.sens;</div><div class='add'>+	struct il_sensitivity_data *data = NULL;</div><div class='add'>+	const struct il_sensitivity_ranges *ranges = il-&gt;hw_params.sens;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;disable_sens_cal)</div><div class='add'>+	if (il-&gt;disable_sens_cal)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_CALIB(priv, "Start iwl4965_init_sensitivity\n");</div><div class='add'>+	D_CALIB("Start il4965_init_sensitivity\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Clear driver's sensitivity algo data */</div><div class='del'>-	data = &amp;(priv-&gt;sensitivity_data);</div><div class='add'>+	data = &amp;(il-&gt;sensitivity_data);</div><div class='ctx'> </div><div class='ctx'> 	if (ranges == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	memset(data, 0, sizeof(struct iwl_sensitivity_data));</div><div class='add'>+	memset(data, 0, sizeof(struct il_sensitivity_data));</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;num_in_cck_no_fa = 0;</div><div class='del'>-	data-&gt;nrg_curr_state = IWL_FA_TOO_MANY;</div><div class='del'>-	data-&gt;nrg_prev_state = IWL_FA_TOO_MANY;</div><div class='add'>+	data-&gt;nrg_curr_state = IL_FA_TOO_MANY;</div><div class='add'>+	data-&gt;nrg_prev_state = IL_FA_TOO_MANY;</div><div class='ctx'> 	data-&gt;nrg_silence_ref = 0;</div><div class='ctx'> 	data-&gt;nrg_silence_idx = 0;</div><div class='ctx'> 	data-&gt;nrg_energy_idx = 0;</div><div class='hunk'>@@ -478,9 +471,9 @@ void iwl4965_init_sensitivity(struct iwl_priv *priv)</div><div class='ctx'> 	for (i = 0; i &lt; NRG_NUM_PREV_STAT_L; i++)</div><div class='ctx'> 		data-&gt;nrg_silence_rssi[i] = 0;</div><div class='ctx'> </div><div class='del'>-	data-&gt;auto_corr_ofdm =  ranges-&gt;auto_corr_min_ofdm;</div><div class='add'>+	data-&gt;auto_corr_ofdm = ranges-&gt;auto_corr_min_ofdm;</div><div class='ctx'> 	data-&gt;auto_corr_ofdm_mrc = ranges-&gt;auto_corr_min_ofdm_mrc;</div><div class='del'>-	data-&gt;auto_corr_ofdm_x1  = ranges-&gt;auto_corr_min_ofdm_x1;</div><div class='add'>+	data-&gt;auto_corr_ofdm_x1 = ranges-&gt;auto_corr_min_ofdm_x1;</div><div class='ctx'> 	data-&gt;auto_corr_ofdm_mrc_x1 = ranges-&gt;auto_corr_min_ofdm_mrc_x1;</div><div class='ctx'> 	data-&gt;auto_corr_cck = AUTO_CORR_CCK_MIN_VAL_DEF;</div><div class='ctx'> 	data-&gt;auto_corr_cck_mrc = ranges-&gt;auto_corr_min_cck_mrc;</div><div class='hunk'>@@ -495,11 +488,12 @@ void iwl4965_init_sensitivity(struct iwl_priv *priv)</div><div class='ctx'> 	data-&gt;last_bad_plcp_cnt_cck = 0;</div><div class='ctx'> 	data-&gt;last_fa_cnt_cck = 0;</div><div class='ctx'> </div><div class='del'>-	ret |= iwl4965_sensitivity_write(priv);</div><div class='del'>-	IWL_DEBUG_CALIB(priv, "&lt;&lt;return 0x%X\n", ret);</div><div class='add'>+	ret |= il4965_sensitivity_write(il);</div><div class='add'>+	D_CALIB("&lt;&lt;return 0x%X\n", ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl4965_sensitivity_calibration(struct iwl_priv *priv, void *resp)</div><div class='add'>+void</div><div class='add'>+il4965_sensitivity_calibration(struct il_priv *il, void *resp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 rx_enable_time;</div><div class='ctx'> 	u32 fa_cck;</div><div class='hunk'>@@ -508,31 +502,31 @@ void iwl4965_sensitivity_calibration(struct iwl_priv *priv, void *resp)</div><div class='ctx'> 	u32 bad_plcp_ofdm;</div><div class='ctx'> 	u32 norm_fa_ofdm;</div><div class='ctx'> 	u32 norm_fa_cck;</div><div class='del'>-	struct iwl_sensitivity_data *data = NULL;</div><div class='del'>-	struct statistics_rx_non_phy *rx_info;</div><div class='del'>-	struct statistics_rx_phy *ofdm, *cck;</div><div class='add'>+	struct il_sensitivity_data *data = NULL;</div><div class='add'>+	struct stats_rx_non_phy *rx_info;</div><div class='add'>+	struct stats_rx_phy *ofdm, *cck;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	struct statistics_general_data statis;</div><div class='add'>+	struct stats_general_data statis;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;disable_sens_cal)</div><div class='add'>+	if (il-&gt;disable_sens_cal)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	data = &amp;(priv-&gt;sensitivity_data);</div><div class='add'>+	data = &amp;(il-&gt;sensitivity_data);</div><div class='ctx'> </div><div class='del'>-	if (!iwl_legacy_is_any_associated(priv)) {</div><div class='del'>-		IWL_DEBUG_CALIB(priv, "&lt;&lt; - not associated\n");</div><div class='add'>+	if (!il_is_any_associated(il)) {</div><div class='add'>+		D_CALIB("&lt;&lt; - not associated\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	rx_info = &amp;(((struct iwl_notif_statistics *)resp)-&gt;rx.general);</div><div class='del'>-	ofdm = &amp;(((struct iwl_notif_statistics *)resp)-&gt;rx.ofdm);</div><div class='del'>-	cck = &amp;(((struct iwl_notif_statistics *)resp)-&gt;rx.cck);</div><div class='add'>+	rx_info = &amp;(((struct il_notif_stats *)resp)-&gt;rx.general);</div><div class='add'>+	ofdm = &amp;(((struct il_notif_stats *)resp)-&gt;rx.ofdm);</div><div class='add'>+	cck = &amp;(((struct il_notif_stats *)resp)-&gt;rx.cck);</div><div class='ctx'> </div><div class='ctx'> 	if (rx_info-&gt;interference_data_flag != INTERFERENCE_DATA_AVAILABLE) {</div><div class='del'>-		IWL_DEBUG_CALIB(priv, "&lt;&lt; invalid data.\n");</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+		D_CALIB("&lt;&lt; invalid data.\n");</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -544,30 +538,27 @@ void iwl4965_sensitivity_calibration(struct iwl_priv *priv, void *resp)</div><div class='ctx'> 	bad_plcp_ofdm = le32_to_cpu(ofdm-&gt;plcp_err);</div><div class='ctx'> </div><div class='ctx'> 	statis.beacon_silence_rssi_a =</div><div class='del'>-			le32_to_cpu(rx_info-&gt;beacon_silence_rssi_a);</div><div class='add'>+	    le32_to_cpu(rx_info-&gt;beacon_silence_rssi_a);</div><div class='ctx'> 	statis.beacon_silence_rssi_b =</div><div class='del'>-			le32_to_cpu(rx_info-&gt;beacon_silence_rssi_b);</div><div class='add'>+	    le32_to_cpu(rx_info-&gt;beacon_silence_rssi_b);</div><div class='ctx'> 	statis.beacon_silence_rssi_c =</div><div class='del'>-			le32_to_cpu(rx_info-&gt;beacon_silence_rssi_c);</div><div class='del'>-	statis.beacon_energy_a =</div><div class='del'>-			le32_to_cpu(rx_info-&gt;beacon_energy_a);</div><div class='del'>-	statis.beacon_energy_b =</div><div class='del'>-			le32_to_cpu(rx_info-&gt;beacon_energy_b);</div><div class='del'>-	statis.beacon_energy_c =</div><div class='del'>-			le32_to_cpu(rx_info-&gt;beacon_energy_c);</div><div class='add'>+	    le32_to_cpu(rx_info-&gt;beacon_silence_rssi_c);</div><div class='add'>+	statis.beacon_energy_a = le32_to_cpu(rx_info-&gt;beacon_energy_a);</div><div class='add'>+	statis.beacon_energy_b = le32_to_cpu(rx_info-&gt;beacon_energy_b);</div><div class='add'>+	statis.beacon_energy_c = le32_to_cpu(rx_info-&gt;beacon_energy_c);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_CALIB(priv, "rx_enable_time = %u usecs\n", rx_enable_time);</div><div class='add'>+	D_CALIB("rx_enable_time = %u usecs\n", rx_enable_time);</div><div class='ctx'> </div><div class='ctx'> 	if (!rx_enable_time) {</div><div class='del'>-		IWL_DEBUG_CALIB(priv, "&lt;&lt; RX Enable Time == 0!\n");</div><div class='add'>+		D_CALIB("&lt;&lt; RX Enable Time == 0!\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* These statistics increase monotonically, and do not reset</div><div class='add'>+	/* These stats increase monotonically, and do not reset</div><div class='ctx'> 	 *   at each beacon.  Calculate difference from last value, or just</div><div class='del'>-	 *   use the new statistics value if it has reset or wrapped around. */</div><div class='add'>+	 *   use the new stats value if it has reset or wrapped around. */</div><div class='ctx'> 	if (data-&gt;last_bad_plcp_cnt_cck &gt; bad_plcp_cck)</div><div class='ctx'> 		data-&gt;last_bad_plcp_cnt_cck = bad_plcp_cck;</div><div class='ctx'> 	else {</div><div class='hunk'>@@ -600,17 +591,17 @@ void iwl4965_sensitivity_calibration(struct iwl_priv *priv, void *resp)</div><div class='ctx'> 	norm_fa_ofdm = fa_ofdm + bad_plcp_ofdm;</div><div class='ctx'> 	norm_fa_cck = fa_cck + bad_plcp_cck;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_CALIB(priv,</div><div class='del'>-			 "cck: fa %u badp %u  ofdm: fa %u badp %u\n", fa_cck,</div><div class='del'>-			bad_plcp_cck, fa_ofdm, bad_plcp_ofdm);</div><div class='add'>+	D_CALIB("cck: fa %u badp %u  ofdm: fa %u badp %u\n", fa_cck,</div><div class='add'>+		bad_plcp_cck, fa_ofdm, bad_plcp_ofdm);</div><div class='ctx'> </div><div class='del'>-	iwl4965_sens_auto_corr_ofdm(priv, norm_fa_ofdm, rx_enable_time);</div><div class='del'>-	iwl4965_sens_energy_cck(priv, norm_fa_cck, rx_enable_time, &amp;statis);</div><div class='add'>+	il4965_sens_auto_corr_ofdm(il, norm_fa_ofdm, rx_enable_time);</div><div class='add'>+	il4965_sens_energy_cck(il, norm_fa_cck, rx_enable_time, &amp;statis);</div><div class='ctx'> </div><div class='del'>-	iwl4965_sensitivity_write(priv);</div><div class='add'>+	il4965_sensitivity_write(il);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u8 iwl4965_find_first_chain(u8 mask)</div><div class='add'>+static inline u8</div><div class='add'>+il4965_find_first_chain(u8 mask)</div><div class='ctx'> {</div><div class='ctx'> 	if (mask &amp; ANT_A)</div><div class='ctx'> 		return CHAIN_A;</div><div class='hunk'>@@ -624,8 +615,8 @@ static inline u8 iwl4965_find_first_chain(u8 mask)</div><div class='ctx'>  * disconnected.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-iwl4965_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,</div><div class='del'>-				     struct iwl_chain_noise_data *data)</div><div class='add'>+il4965_find_disconn_antenna(struct il_priv *il, u32 * average_sig,</div><div class='add'>+			    struct il_chain_noise_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	u32 active_chains = 0;</div><div class='ctx'> 	u32 max_average_sig;</div><div class='hunk'>@@ -634,12 +625,15 @@ iwl4965_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,</div><div class='ctx'> 	u8 first_chain;</div><div class='ctx'> 	u16 i = 0;</div><div class='ctx'> </div><div class='del'>-	average_sig[0] = data-&gt;chain_signal_a /</div><div class='del'>-			 priv-&gt;cfg-&gt;base_params-&gt;chain_noise_num_beacons;</div><div class='del'>-	average_sig[1] = data-&gt;chain_signal_b /</div><div class='del'>-			 priv-&gt;cfg-&gt;base_params-&gt;chain_noise_num_beacons;</div><div class='del'>-	average_sig[2] = data-&gt;chain_signal_c /</div><div class='del'>-			 priv-&gt;cfg-&gt;base_params-&gt;chain_noise_num_beacons;</div><div class='add'>+	average_sig[0] =</div><div class='add'>+	    data-&gt;chain_signal_a /</div><div class='add'>+	    il-&gt;cfg-&gt;base_params-&gt;chain_noise_num_beacons;</div><div class='add'>+	average_sig[1] =</div><div class='add'>+	    data-&gt;chain_signal_b /</div><div class='add'>+	    il-&gt;cfg-&gt;base_params-&gt;chain_noise_num_beacons;</div><div class='add'>+	average_sig[2] =</div><div class='add'>+	    data-&gt;chain_signal_c /</div><div class='add'>+	    il-&gt;cfg-&gt;base_params-&gt;chain_noise_num_beacons;</div><div class='ctx'> </div><div class='ctx'> 	if (average_sig[0] &gt;= average_sig[1]) {</div><div class='ctx'> 		max_average_sig = average_sig[0];</div><div class='hunk'>@@ -657,10 +651,10 @@ iwl4965_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,</div><div class='ctx'> 		active_chains = (1 &lt;&lt; max_average_sig_antenna_i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_CALIB(priv, "average_sig: a %d b %d c %d\n",</div><div class='del'>-		     average_sig[0], average_sig[1], average_sig[2]);</div><div class='del'>-	IWL_DEBUG_CALIB(priv, "max_average_sig = %d, antenna %d\n",</div><div class='del'>-		     max_average_sig, max_average_sig_antenna_i);</div><div class='add'>+	D_CALIB("average_sig: a %d b %d c %d\n", average_sig[0], average_sig[1],</div><div class='add'>+		average_sig[2]);</div><div class='add'>+	D_CALIB("max_average_sig = %d, antenna %d\n", max_average_sig,</div><div class='add'>+		max_average_sig_antenna_i);</div><div class='ctx'> </div><div class='ctx'> 	/* Compare signal strengths for all 3 receivers. */</div><div class='ctx'> 	for (i = 0; i &lt; NUM_RX_CHAINS; i++) {</div><div class='hunk'>@@ -673,9 +667,9 @@ iwl4965_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,</div><div class='ctx'> 				data-&gt;disconn_array[i] = 1;</div><div class='ctx'> 			else</div><div class='ctx'> 				active_chains |= (1 &lt;&lt; i);</div><div class='del'>-			IWL_DEBUG_CALIB(priv, "i = %d  rssiDelta = %d  "</div><div class='del'>-			     "disconn_array[i] = %d\n",</div><div class='del'>-			     i, rssi_delta, data-&gt;disconn_array[i]);</div><div class='add'>+			D_CALIB("i = %d  rssiDelta = %d  "</div><div class='add'>+				"disconn_array[i] = %d\n", i, rssi_delta,</div><div class='add'>+				data-&gt;disconn_array[i]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -689,119 +683,110 @@ iwl4965_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,</div><div class='ctx'> 	 * To be safe, simply mask out any chains that we know</div><div class='ctx'> 	 * are not on the device.</div><div class='ctx'> 	 */</div><div class='del'>-	active_chains &amp;= priv-&gt;hw_params.valid_rx_ant;</div><div class='add'>+	active_chains &amp;= il-&gt;hw_params.valid_rx_ant;</div><div class='ctx'> </div><div class='ctx'> 	num_tx_chains = 0;</div><div class='ctx'> 	for (i = 0; i &lt; NUM_RX_CHAINS; i++) {</div><div class='ctx'> 		/* loops on all the bits of</div><div class='del'>-		 * priv-&gt;hw_setting.valid_tx_ant */</div><div class='add'>+		 * il-&gt;hw_setting.valid_tx_ant */</div><div class='ctx'> 		u8 ant_msk = (1 &lt;&lt; i);</div><div class='del'>-		if (!(priv-&gt;hw_params.valid_tx_ant &amp; ant_msk))</div><div class='add'>+		if (!(il-&gt;hw_params.valid_tx_ant &amp; ant_msk))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		num_tx_chains++;</div><div class='ctx'> 		if (data-&gt;disconn_array[i] == 0)</div><div class='ctx'> 			/* there is a Tx antenna connected */</div><div class='ctx'> 			break;</div><div class='del'>-		if (num_tx_chains == priv-&gt;hw_params.tx_chains_num &amp;&amp;</div><div class='add'>+		if (num_tx_chains == il-&gt;hw_params.tx_chains_num &amp;&amp;</div><div class='ctx'> 		    data-&gt;disconn_array[i]) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If all chains are disconnected</div><div class='ctx'> 			 * connect the first valid tx chain</div><div class='ctx'> 			 */</div><div class='ctx'> 			first_chain =</div><div class='del'>-			iwl4965_find_first_chain(priv-&gt;cfg-&gt;valid_tx_ant);</div><div class='add'>+			    il4965_find_first_chain(il-&gt;cfg-&gt;valid_tx_ant);</div><div class='ctx'> 			data-&gt;disconn_array[first_chain] = 0;</div><div class='ctx'> 			active_chains |= BIT(first_chain);</div><div class='del'>-			IWL_DEBUG_CALIB(priv,</div><div class='del'>-					"All Tx chains are disconnected W/A - declare %d as connected\n",</div><div class='del'>-					first_chain);</div><div class='add'>+			D_CALIB("All Tx chains are disconnected"</div><div class='add'>+				"- declare %d as connected\n", first_chain);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (active_chains != priv-&gt;hw_params.valid_rx_ant &amp;&amp;</div><div class='del'>-	    active_chains != priv-&gt;chain_noise_data.active_chains)</div><div class='del'>-		IWL_DEBUG_CALIB(priv,</div><div class='del'>-				"Detected that not all antennas are connected! "</div><div class='del'>-				"Connected: %#x, valid: %#x.\n",</div><div class='del'>-				active_chains, priv-&gt;hw_params.valid_rx_ant);</div><div class='add'>+	if (active_chains != il-&gt;hw_params.valid_rx_ant &amp;&amp;</div><div class='add'>+	    active_chains != il-&gt;chain_noise_data.active_chains)</div><div class='add'>+		D_CALIB("Detected that not all antennas are connected! "</div><div class='add'>+			"Connected: %#x, valid: %#x.\n", active_chains,</div><div class='add'>+			il-&gt;hw_params.valid_rx_ant);</div><div class='ctx'> </div><div class='ctx'> 	/* Save for use within RXON, TX, SCAN commands, etc. */</div><div class='ctx'> 	data-&gt;active_chains = active_chains;</div><div class='del'>-	IWL_DEBUG_CALIB(priv, "active_chains (bitwise) = 0x%x\n",</div><div class='del'>-			active_chains);</div><div class='add'>+	D_CALIB("active_chains (bitwise) = 0x%x\n", active_chains);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl4965_gain_computation(struct iwl_priv *priv,</div><div class='del'>-		u32 *average_noise,</div><div class='del'>-		u16 min_average_noise_antenna_i,</div><div class='del'>-		u32 min_average_noise,</div><div class='del'>-		u8 default_chain)</div><div class='add'>+static void</div><div class='add'>+il4965_gain_computation(struct il_priv *il, u32 * average_noise,</div><div class='add'>+			u16 min_average_noise_antenna_i, u32 min_average_noise,</div><div class='add'>+			u8 default_chain)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret;</div><div class='del'>-	struct iwl_chain_noise_data *data = &amp;priv-&gt;chain_noise_data;</div><div class='add'>+	struct il_chain_noise_data *data = &amp;il-&gt;chain_noise_data;</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;delta_gain_code[min_average_noise_antenna_i] = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = default_chain; i &lt; NUM_RX_CHAINS; i++) {</div><div class='ctx'> 		s32 delta_g = 0;</div><div class='ctx'> </div><div class='del'>-		if (!(data-&gt;disconn_array[i]) &amp;&amp;</div><div class='del'>-		    (data-&gt;delta_gain_code[i] ==</div><div class='del'>-			     CHAIN_NOISE_DELTA_GAIN_INIT_VAL)) {</div><div class='add'>+		if (!data-&gt;disconn_array[i] &amp;&amp;</div><div class='add'>+		    data-&gt;delta_gain_code[i] ==</div><div class='add'>+		    CHAIN_NOISE_DELTA_GAIN_INIT_VAL) {</div><div class='ctx'> 			delta_g = average_noise[i] - min_average_noise;</div><div class='del'>-			data-&gt;delta_gain_code[i] = (u8)((delta_g * 10) / 15);</div><div class='add'>+			data-&gt;delta_gain_code[i] = (u8) ((delta_g * 10) / 15);</div><div class='ctx'> 			data-&gt;delta_gain_code[i] =</div><div class='del'>-				min(data-&gt;delta_gain_code[i],</div><div class='add'>+			    min(data-&gt;delta_gain_code[i],</div><div class='ctx'> 				(u8) CHAIN_NOISE_MAX_DELTA_GAIN_CODE);</div><div class='ctx'> </div><div class='ctx'> 			data-&gt;delta_gain_code[i] =</div><div class='del'>-				(data-&gt;delta_gain_code[i] | (1 &lt;&lt; 2));</div><div class='add'>+			    (data-&gt;delta_gain_code[i] | (1 &lt;&lt; 2));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			data-&gt;delta_gain_code[i] = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	IWL_DEBUG_CALIB(priv, "delta_gain_codes: a %d b %d c %d\n",</div><div class='del'>-		     data-&gt;delta_gain_code[0],</div><div class='del'>-		     data-&gt;delta_gain_code[1],</div><div class='del'>-		     data-&gt;delta_gain_code[2]);</div><div class='add'>+	D_CALIB("delta_gain_codes: a %d b %d c %d\n", data-&gt;delta_gain_code[0],</div><div class='add'>+		data-&gt;delta_gain_code[1], data-&gt;delta_gain_code[2]);</div><div class='ctx'> </div><div class='ctx'> 	/* Differential gain gets sent to uCode only once */</div><div class='ctx'> 	if (!data-&gt;radio_write) {</div><div class='del'>-		struct iwl_calib_diff_gain_cmd cmd;</div><div class='add'>+		struct il_calib_diff_gain_cmd cmd;</div><div class='ctx'> 		data-&gt;radio_write = 1;</div><div class='ctx'> </div><div class='ctx'> 		memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-		cmd.hdr.op_code = IWL_PHY_CALIBRATE_DIFF_GAIN_CMD;</div><div class='add'>+		cmd.hdr.op_code = IL_PHY_CALIBRATE_DIFF_GAIN_CMD;</div><div class='ctx'> 		cmd.diff_gain_a = data-&gt;delta_gain_code[0];</div><div class='ctx'> 		cmd.diff_gain_b = data-&gt;delta_gain_code[1];</div><div class='ctx'> 		cmd.diff_gain_c = data-&gt;delta_gain_code[2];</div><div class='del'>-		ret = iwl_legacy_send_cmd_pdu(priv, REPLY_PHY_CALIBRATION_CMD,</div><div class='del'>-				      sizeof(cmd), &amp;cmd);</div><div class='add'>+		ret = il_send_cmd_pdu(il, C_PHY_CALIBRATION, sizeof(cmd), &amp;cmd);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			IWL_DEBUG_CALIB(priv, "fail sending cmd "</div><div class='del'>-				     "REPLY_PHY_CALIBRATION_CMD\n");</div><div class='add'>+			D_CALIB("fail sending cmd " "C_PHY_CALIBRATION\n");</div><div class='ctx'> </div><div class='ctx'> 		/* TODO we might want recalculate</div><div class='ctx'> 		 * rx_chain in rxon cmd */</div><div class='ctx'> </div><div class='ctx'> 		/* Mark so we run this algo only once! */</div><div class='del'>-		data-&gt;state = IWL_CHAIN_NOISE_CALIBRATED;</div><div class='add'>+		data-&gt;state = IL_CHAIN_NOISE_CALIBRATED;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * Accumulate 16 beacons of signal and noise statistics for each of</div><div class='add'>+ * Accumulate 16 beacons of signal and noise stats for each of</div><div class='ctx'>  *   3 receivers/antennas/rx-chains, then figure out:</div><div class='ctx'>  * 1)  Which antennas are connected.</div><div class='ctx'>  * 2)  Differential rx gain settings to balance the 3 receivers.</div><div class='ctx'>  */</div><div class='del'>-void iwl4965_chain_noise_calibration(struct iwl_priv *priv, void *stat_resp)</div><div class='add'>+void</div><div class='add'>+il4965_chain_noise_calibration(struct il_priv *il, void *stat_resp)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_chain_noise_data *data = NULL;</div><div class='add'>+	struct il_chain_noise_data *data = NULL;</div><div class='ctx'> </div><div class='ctx'> 	u32 chain_noise_a;</div><div class='ctx'> 	u32 chain_noise_b;</div><div class='hunk'>@@ -809,8 +794,8 @@ void iwl4965_chain_noise_calibration(struct iwl_priv *priv, void *stat_resp)</div><div class='ctx'> 	u32 chain_sig_a;</div><div class='ctx'> 	u32 chain_sig_b;</div><div class='ctx'> 	u32 chain_sig_c;</div><div class='del'>-	u32 average_sig[NUM_RX_CHAINS] = {INITIALIZATION_VALUE};</div><div class='del'>-	u32 average_noise[NUM_RX_CHAINS] = {INITIALIZATION_VALUE};</div><div class='add'>+	u32 average_sig[NUM_RX_CHAINS] = { INITIALIZATION_VALUE };</div><div class='add'>+	u32 average_noise[NUM_RX_CHAINS] = { INITIALIZATION_VALUE };</div><div class='ctx'> 	u32 min_average_noise = MIN_AVERAGE_NOISE_MAX_VALUE;</div><div class='ctx'> 	u16 min_average_noise_antenna_i = INITIALIZATION_VALUE;</div><div class='ctx'> 	u16 i = 0;</div><div class='hunk'>@@ -819,70 +804,69 @@ void iwl4965_chain_noise_calibration(struct iwl_priv *priv, void *stat_resp)</div><div class='ctx'> 	u8 rxon_band24;</div><div class='ctx'> 	u8 stat_band24;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	struct statistics_rx_non_phy *rx_info;</div><div class='add'>+	struct stats_rx_non_phy *rx_info;</div><div class='ctx'> </div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;disable_chain_noise_cal)</div><div class='add'>+	if (il-&gt;disable_chain_noise_cal)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	data = &amp;(priv-&gt;chain_noise_data);</div><div class='add'>+	data = &amp;(il-&gt;chain_noise_data);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Accumulate just the first "chain_noise_num_beacons" after</div><div class='ctx'> 	 * the first association, then we're done forever.</div><div class='ctx'> 	 */</div><div class='del'>-	if (data-&gt;state != IWL_CHAIN_NOISE_ACCUMULATE) {</div><div class='del'>-		if (data-&gt;state == IWL_CHAIN_NOISE_ALIVE)</div><div class='del'>-			IWL_DEBUG_CALIB(priv, "Wait for noise calib reset\n");</div><div class='add'>+	if (data-&gt;state != IL_CHAIN_NOISE_ACCUMULATE) {</div><div class='add'>+		if (data-&gt;state == IL_CHAIN_NOISE_ALIVE)</div><div class='add'>+			D_CALIB("Wait for noise calib reset\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	rx_info = &amp;(((struct iwl_notif_statistics *)stat_resp)-&gt;</div><div class='del'>-		      rx.general);</div><div class='add'>+	rx_info = &amp;(((struct il_notif_stats *)stat_resp)-&gt;rx.general);</div><div class='ctx'> </div><div class='ctx'> 	if (rx_info-&gt;interference_data_flag != INTERFERENCE_DATA_AVAILABLE) {</div><div class='del'>-		IWL_DEBUG_CALIB(priv, " &lt;&lt; Interference data unavailable\n");</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+		D_CALIB(" &lt;&lt; Interference data unavailable\n");</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rxon_band24 = !!(ctx-&gt;staging.flags &amp; RXON_FLG_BAND_24G_MSK);</div><div class='ctx'> 	rxon_chnum = le16_to_cpu(ctx-&gt;staging.channel);</div><div class='ctx'> </div><div class='del'>-	stat_band24 = !!(((struct iwl_notif_statistics *)</div><div class='del'>-			 stat_resp)-&gt;flag &amp;</div><div class='del'>-			 STATISTICS_REPLY_FLG_BAND_24G_MSK);</div><div class='del'>-	stat_chnum = le32_to_cpu(((struct iwl_notif_statistics *)</div><div class='del'>-				 stat_resp)-&gt;flag) &gt;&gt; 16;</div><div class='add'>+	stat_band24 =</div><div class='add'>+	    !!(((struct il_notif_stats *)stat_resp)-&gt;</div><div class='add'>+	       flag &amp; STATS_REPLY_FLG_BAND_24G_MSK);</div><div class='add'>+	stat_chnum =</div><div class='add'>+	    le32_to_cpu(((struct il_notif_stats *)stat_resp)-&gt;flag) &gt;&gt; 16;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we accumulate data for just the associated channel</div><div class='ctx'> 	 *   (even if scanning). */</div><div class='del'>-	if ((rxon_chnum != stat_chnum) || (rxon_band24 != stat_band24)) {</div><div class='del'>-		IWL_DEBUG_CALIB(priv, "Stats not from chan=%d, band24=%d\n",</div><div class='del'>-				rxon_chnum, rxon_band24);</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+	if (rxon_chnum != stat_chnum || rxon_band24 != stat_band24) {</div><div class='add'>+		D_CALIB("Stats not from chan=%d, band24=%d\n", rxon_chnum,</div><div class='add'>+			rxon_band24);</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 *  Accumulate beacon statistics values across</div><div class='add'>+	 *  Accumulate beacon stats values across</div><div class='ctx'> 	 * "chain_noise_num_beacons"</div><div class='ctx'> 	 */</div><div class='del'>-	chain_noise_a = le32_to_cpu(rx_info-&gt;beacon_silence_rssi_a) &amp;</div><div class='del'>-				IN_BAND_FILTER;</div><div class='del'>-	chain_noise_b = le32_to_cpu(rx_info-&gt;beacon_silence_rssi_b) &amp;</div><div class='del'>-				IN_BAND_FILTER;</div><div class='del'>-	chain_noise_c = le32_to_cpu(rx_info-&gt;beacon_silence_rssi_c) &amp;</div><div class='del'>-				IN_BAND_FILTER;</div><div class='add'>+	chain_noise_a =</div><div class='add'>+	    le32_to_cpu(rx_info-&gt;beacon_silence_rssi_a) &amp; IN_BAND_FILTER;</div><div class='add'>+	chain_noise_b =</div><div class='add'>+	    le32_to_cpu(rx_info-&gt;beacon_silence_rssi_b) &amp; IN_BAND_FILTER;</div><div class='add'>+	chain_noise_c =</div><div class='add'>+	    le32_to_cpu(rx_info-&gt;beacon_silence_rssi_c) &amp; IN_BAND_FILTER;</div><div class='ctx'> </div><div class='ctx'> 	chain_sig_a = le32_to_cpu(rx_info-&gt;beacon_rssi_a) &amp; IN_BAND_FILTER;</div><div class='ctx'> 	chain_sig_b = le32_to_cpu(rx_info-&gt;beacon_rssi_b) &amp; IN_BAND_FILTER;</div><div class='ctx'> 	chain_sig_c = le32_to_cpu(rx_info-&gt;beacon_rssi_c) &amp; IN_BAND_FILTER;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;beacon_count++;</div><div class='ctx'> </div><div class='hunk'>@@ -894,34 +878,33 @@ void iwl4965_chain_noise_calibration(struct iwl_priv *priv, void *stat_resp)</div><div class='ctx'> 	data-&gt;chain_signal_b = (chain_sig_b + data-&gt;chain_signal_b);</div><div class='ctx'> 	data-&gt;chain_signal_c = (chain_sig_c + data-&gt;chain_signal_c);</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_CALIB(priv, "chan=%d, band24=%d, beacon=%d\n",</div><div class='del'>-			rxon_chnum, rxon_band24, data-&gt;beacon_count);</div><div class='del'>-	IWL_DEBUG_CALIB(priv, "chain_sig: a %d b %d c %d\n",</div><div class='del'>-			chain_sig_a, chain_sig_b, chain_sig_c);</div><div class='del'>-	IWL_DEBUG_CALIB(priv, "chain_noise: a %d b %d c %d\n",</div><div class='del'>-			chain_noise_a, chain_noise_b, chain_noise_c);</div><div class='add'>+	D_CALIB("chan=%d, band24=%d, beacon=%d\n", rxon_chnum, rxon_band24,</div><div class='add'>+		data-&gt;beacon_count);</div><div class='add'>+	D_CALIB("chain_sig: a %d b %d c %d\n", chain_sig_a, chain_sig_b,</div><div class='add'>+		chain_sig_c);</div><div class='add'>+	D_CALIB("chain_noise: a %d b %d c %d\n", chain_noise_a, chain_noise_b,</div><div class='add'>+		chain_noise_c);</div><div class='ctx'> </div><div class='ctx'> 	/* If this is the "chain_noise_num_beacons", determine:</div><div class='ctx'> 	 * 1)  Disconnected antennas (using signal strengths)</div><div class='ctx'> 	 * 2)  Differential gain (using silence noise) to balance receivers */</div><div class='del'>-	if (data-&gt;beacon_count !=</div><div class='del'>-		priv-&gt;cfg-&gt;base_params-&gt;chain_noise_num_beacons)</div><div class='add'>+	if (data-&gt;beacon_count != il-&gt;cfg-&gt;base_params-&gt;chain_noise_num_beacons)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Analyze signal for disconnected antenna */</div><div class='del'>-	iwl4965_find_disconn_antenna(priv, average_sig, data);</div><div class='add'>+	il4965_find_disconn_antenna(il, average_sig, data);</div><div class='ctx'> </div><div class='ctx'> 	/* Analyze noise for rx balance */</div><div class='del'>-	average_noise[0] = data-&gt;chain_noise_a /</div><div class='del'>-			   priv-&gt;cfg-&gt;base_params-&gt;chain_noise_num_beacons;</div><div class='del'>-	average_noise[1] = data-&gt;chain_noise_b /</div><div class='del'>-			   priv-&gt;cfg-&gt;base_params-&gt;chain_noise_num_beacons;</div><div class='del'>-	average_noise[2] = data-&gt;chain_noise_c /</div><div class='del'>-			   priv-&gt;cfg-&gt;base_params-&gt;chain_noise_num_beacons;</div><div class='add'>+	average_noise[0] =</div><div class='add'>+	    data-&gt;chain_noise_a / il-&gt;cfg-&gt;base_params-&gt;chain_noise_num_beacons;</div><div class='add'>+	average_noise[1] =</div><div class='add'>+	    data-&gt;chain_noise_b / il-&gt;cfg-&gt;base_params-&gt;chain_noise_num_beacons;</div><div class='add'>+	average_noise[2] =</div><div class='add'>+	    data-&gt;chain_noise_c / il-&gt;cfg-&gt;base_params-&gt;chain_noise_num_beacons;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NUM_RX_CHAINS; i++) {</div><div class='del'>-		if (!(data-&gt;disconn_array[i]) &amp;&amp;</div><div class='del'>-		   (average_noise[i] &lt;= min_average_noise)) {</div><div class='add'>+		if (!data-&gt;disconn_array[i] &amp;&amp;</div><div class='add'>+		    average_noise[i] &lt;= min_average_noise) {</div><div class='ctx'> 			/* This means that chain i is active and has</div><div class='ctx'> 			 * lower noise values so far: */</div><div class='ctx'> 			min_average_noise = average_noise[i];</div><div class='hunk'>@@ -929,39 +912,37 @@ void iwl4965_chain_noise_calibration(struct iwl_priv *priv, void *stat_resp)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_CALIB(priv, "average_noise: a %d b %d c %d\n",</div><div class='del'>-			average_noise[0], average_noise[1],</div><div class='del'>-			average_noise[2]);</div><div class='add'>+	D_CALIB("average_noise: a %d b %d c %d\n", average_noise[0],</div><div class='add'>+		average_noise[1], average_noise[2]);</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_CALIB(priv, "min_average_noise = %d, antenna %d\n",</div><div class='del'>-			min_average_noise, min_average_noise_antenna_i);</div><div class='add'>+	D_CALIB("min_average_noise = %d, antenna %d\n", min_average_noise,</div><div class='add'>+		min_average_noise_antenna_i);</div><div class='ctx'> </div><div class='del'>-	iwl4965_gain_computation(priv, average_noise,</div><div class='del'>-			min_average_noise_antenna_i, min_average_noise,</div><div class='del'>-			iwl4965_find_first_chain(priv-&gt;cfg-&gt;valid_rx_ant));</div><div class='add'>+	il4965_gain_computation(il, average_noise, min_average_noise_antenna_i,</div><div class='add'>+				min_average_noise,</div><div class='add'>+				il4965_find_first_chain(il-&gt;cfg-&gt;valid_rx_ant));</div><div class='ctx'> </div><div class='ctx'> 	/* Some power changes may have been made during the calibration.</div><div class='ctx'> 	 * Update and commit the RXON</div><div class='ctx'> 	 */</div><div class='del'>-	if (priv-&gt;cfg-&gt;ops-&gt;lib-&gt;update_chain_flags)</div><div class='del'>-		priv-&gt;cfg-&gt;ops-&gt;lib-&gt;update_chain_flags(priv);</div><div class='add'>+	if (il-&gt;cfg-&gt;ops-&gt;lib-&gt;update_chain_flags)</div><div class='add'>+		il-&gt;cfg-&gt;ops-&gt;lib-&gt;update_chain_flags(il);</div><div class='ctx'> </div><div class='del'>-	data-&gt;state = IWL_CHAIN_NOISE_DONE;</div><div class='del'>-	iwl_legacy_power_update_mode(priv, false);</div><div class='add'>+	data-&gt;state = IL_CHAIN_NOISE_DONE;</div><div class='add'>+	il_power_update_mode(il, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl4965_reset_run_time_calib(struct iwl_priv *priv)</div><div class='add'>+void</div><div class='add'>+il4965_reset_run_time_calib(struct il_priv *il)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	memset(&amp;(priv-&gt;sensitivity_data), 0,</div><div class='del'>-	       sizeof(struct iwl_sensitivity_data));</div><div class='del'>-	memset(&amp;(priv-&gt;chain_noise_data), 0,</div><div class='del'>-	       sizeof(struct iwl_chain_noise_data));</div><div class='add'>+	memset(&amp;(il-&gt;sensitivity_data), 0, sizeof(struct il_sensitivity_data));</div><div class='add'>+	memset(&amp;(il-&gt;chain_noise_data), 0, sizeof(struct il_chain_noise_data));</div><div class='ctx'> 	for (i = 0; i &lt; NUM_RX_CHAINS; i++)</div><div class='del'>-		priv-&gt;chain_noise_data.delta_gain_code[i] =</div><div class='del'>-				CHAIN_NOISE_DELTA_GAIN_INIT_VAL;</div><div class='add'>+		il-&gt;chain_noise_data.delta_gain_code[i] =</div><div class='add'>+		    CHAIN_NOISE_DELTA_GAIN_INIT_VAL;</div><div class='ctx'> </div><div class='del'>-	/* Ask for statistics now, the uCode will send notification</div><div class='add'>+	/* Ask for stats now, the uCode will send notification</div><div class='ctx'> 	 * periodically after association */</div><div class='del'>-	iwl_legacy_send_statistics_request(priv, CMD_ASYNC, true);</div><div class='add'>+	il_send_stats_request(il, CMD_ASYNC, true);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/4965-debug.c b/drivers/net/wireless/iwlegacy/4965-debug.c<br/>new file mode 100644<br/>index 000000000000..98ec39f56ba3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/4965-debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/4965-debug.c</a></div><div class='hunk'>@@ -0,0 +1,746 @@</div><div class='add'>+/******************************************************************************</div><div class='add'>+*</div><div class='add'>+* GPL LICENSE SUMMARY</div><div class='add'>+*</div><div class='add'>+* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.</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 version 2 of the GNU General Public License as</div><div class='add'>+* published by the Free Software Foundation.</div><div class='add'>+*</div><div class='add'>+* This program is distributed in the hope that it will be useful, but</div><div class='add'>+* WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+* General Public License for more details.</div><div class='add'>+*</div><div class='add'>+* You should have received a copy of the GNU General Public License</div><div class='add'>+* along with this program; if not, write to the Free Software</div><div class='add'>+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,</div><div class='add'>+* USA</div><div class='add'>+*</div><div class='add'>+* The full GNU General Public License is included in this distribution</div><div class='add'>+* in the file called LICENSE.GPL.</div><div class='add'>+*</div><div class='add'>+* Contact Information:</div><div class='add'>+*  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='add'>+* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='add'>+*****************************************************************************/</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "4965.h"</div><div class='add'>+</div><div class='add'>+static const char *fmt_value = "  %-30s %10u\n";</div><div class='add'>+static const char *fmt_table = "  %-30s %10u  %10u  %10u  %10u\n";</div><div class='add'>+static const char *fmt_header =</div><div class='add'>+    "%-32s    current  cumulative       delta         max\n";</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il4965_stats_flag(struct il_priv *il, char *buf, int bufsz)</div><div class='add'>+{</div><div class='add'>+	int p = 0;</div><div class='add'>+	u32 flag;</div><div class='add'>+</div><div class='add'>+	flag = le32_to_cpu(il-&gt;_4965.stats.flag);</div><div class='add'>+</div><div class='add'>+	p += scnprintf(buf + p, bufsz - p, "Statistics Flag(0x%X):\n", flag);</div><div class='add'>+	if (flag &amp; UCODE_STATS_CLEAR_MSK)</div><div class='add'>+		p += scnprintf(buf + p, bufsz - p,</div><div class='add'>+			       "\tStatistics have been cleared\n");</div><div class='add'>+	p += scnprintf(buf + p, bufsz - p, "\tOperational Frequency: %s\n",</div><div class='add'>+		       (flag &amp; UCODE_STATS_FREQUENCY_MSK) ? "2.4 GHz" :</div><div class='add'>+		       "5.2 GHz");</div><div class='add'>+	p += scnprintf(buf + p, bufsz - p, "\tTGj Narrow Band: %s\n",</div><div class='add'>+		       (flag &amp; UCODE_STATS_NARROW_BAND_MSK) ? "enabled" :</div><div class='add'>+		       "disabled");</div><div class='add'>+</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t</div><div class='add'>+il4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,</div><div class='add'>+			   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	int pos = 0;</div><div class='add'>+	char *buf;</div><div class='add'>+	int bufsz =</div><div class='add'>+	    sizeof(struct stats_rx_phy) * 40 +</div><div class='add'>+	    sizeof(struct stats_rx_non_phy) * 40 +</div><div class='add'>+	    sizeof(struct stats_rx_ht_phy) * 40 + 400;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	struct stats_rx_phy *ofdm, *accum_ofdm, *delta_ofdm, *max_ofdm;</div><div class='add'>+	struct stats_rx_phy *cck, *accum_cck, *delta_cck, *max_cck;</div><div class='add'>+	struct stats_rx_non_phy *general, *accum_general;</div><div class='add'>+	struct stats_rx_non_phy *delta_general, *max_general;</div><div class='add'>+	struct stats_rx_ht_phy *ht, *accum_ht, *delta_ht, *max_ht;</div><div class='add'>+</div><div class='add'>+	if (!il_is_alive(il))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	if (!buf) {</div><div class='add'>+		IL_ERR("Can not allocate Buffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * the statistic information display here is based on</div><div class='add'>+	 * the last stats notification from uCode</div><div class='add'>+	 * might not reflect the current uCode activity</div><div class='add'>+	 */</div><div class='add'>+	ofdm = &amp;il-&gt;_4965.stats.rx.ofdm;</div><div class='add'>+	cck = &amp;il-&gt;_4965.stats.rx.cck;</div><div class='add'>+	general = &amp;il-&gt;_4965.stats.rx.general;</div><div class='add'>+	ht = &amp;il-&gt;_4965.stats.rx.ofdm_ht;</div><div class='add'>+	accum_ofdm = &amp;il-&gt;_4965.accum_stats.rx.ofdm;</div><div class='add'>+	accum_cck = &amp;il-&gt;_4965.accum_stats.rx.cck;</div><div class='add'>+	accum_general = &amp;il-&gt;_4965.accum_stats.rx.general;</div><div class='add'>+	accum_ht = &amp;il-&gt;_4965.accum_stats.rx.ofdm_ht;</div><div class='add'>+	delta_ofdm = &amp;il-&gt;_4965.delta_stats.rx.ofdm;</div><div class='add'>+	delta_cck = &amp;il-&gt;_4965.delta_stats.rx.cck;</div><div class='add'>+	delta_general = &amp;il-&gt;_4965.delta_stats.rx.general;</div><div class='add'>+	delta_ht = &amp;il-&gt;_4965.delta_stats.rx.ofdm_ht;</div><div class='add'>+	max_ofdm = &amp;il-&gt;_4965.max_delta.rx.ofdm;</div><div class='add'>+	max_cck = &amp;il-&gt;_4965.max_delta.rx.cck;</div><div class='add'>+	max_general = &amp;il-&gt;_4965.max_delta.rx.general;</div><div class='add'>+	max_ht = &amp;il-&gt;_4965.max_delta.rx.ofdm_ht;</div><div class='add'>+</div><div class='add'>+	pos += il4965_stats_flag(il, buf, bufsz);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_header,</div><div class='add'>+		      "Statistics_Rx - OFDM:");</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "ina_cnt:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;ina_cnt), accum_ofdm-&gt;ina_cnt,</div><div class='add'>+		      delta_ofdm-&gt;ina_cnt, max_ofdm-&gt;ina_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "fina_cnt:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;fina_cnt), accum_ofdm-&gt;fina_cnt,</div><div class='add'>+		      delta_ofdm-&gt;fina_cnt, max_ofdm-&gt;fina_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "plcp_err:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;plcp_err), accum_ofdm-&gt;plcp_err,</div><div class='add'>+		      delta_ofdm-&gt;plcp_err, max_ofdm-&gt;plcp_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "crc32_err:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;crc32_err), accum_ofdm-&gt;crc32_err,</div><div class='add'>+		      delta_ofdm-&gt;crc32_err, max_ofdm-&gt;crc32_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "overrun_err:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;overrun_err), accum_ofdm-&gt;overrun_err,</div><div class='add'>+		      delta_ofdm-&gt;overrun_err, max_ofdm-&gt;overrun_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "early_overrun_err:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;early_overrun_err),</div><div class='add'>+		      accum_ofdm-&gt;early_overrun_err,</div><div class='add'>+		      delta_ofdm-&gt;early_overrun_err,</div><div class='add'>+		      max_ofdm-&gt;early_overrun_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "crc32_good:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;crc32_good), accum_ofdm-&gt;crc32_good,</div><div class='add'>+		      delta_ofdm-&gt;crc32_good, max_ofdm-&gt;crc32_good);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "false_alarm_cnt:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;false_alarm_cnt),</div><div class='add'>+		      accum_ofdm-&gt;false_alarm_cnt, delta_ofdm-&gt;false_alarm_cnt,</div><div class='add'>+		      max_ofdm-&gt;false_alarm_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "fina_sync_err_cnt:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;fina_sync_err_cnt),</div><div class='add'>+		      accum_ofdm-&gt;fina_sync_err_cnt,</div><div class='add'>+		      delta_ofdm-&gt;fina_sync_err_cnt,</div><div class='add'>+		      max_ofdm-&gt;fina_sync_err_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "sfd_timeout:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;sfd_timeout), accum_ofdm-&gt;sfd_timeout,</div><div class='add'>+		      delta_ofdm-&gt;sfd_timeout, max_ofdm-&gt;sfd_timeout);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "fina_timeout:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;fina_timeout), accum_ofdm-&gt;fina_timeout,</div><div class='add'>+		      delta_ofdm-&gt;fina_timeout, max_ofdm-&gt;fina_timeout);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "unresponded_rts:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;unresponded_rts),</div><div class='add'>+		      accum_ofdm-&gt;unresponded_rts, delta_ofdm-&gt;unresponded_rts,</div><div class='add'>+		      max_ofdm-&gt;unresponded_rts);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "rxe_frame_lmt_ovrun:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;rxe_frame_limit_overrun),</div><div class='add'>+		      accum_ofdm-&gt;rxe_frame_limit_overrun,</div><div class='add'>+		      delta_ofdm-&gt;rxe_frame_limit_overrun,</div><div class='add'>+		      max_ofdm-&gt;rxe_frame_limit_overrun);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "sent_ack_cnt:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;sent_ack_cnt), accum_ofdm-&gt;sent_ack_cnt,</div><div class='add'>+		      delta_ofdm-&gt;sent_ack_cnt, max_ofdm-&gt;sent_ack_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "sent_cts_cnt:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;sent_cts_cnt), accum_ofdm-&gt;sent_cts_cnt,</div><div class='add'>+		      delta_ofdm-&gt;sent_cts_cnt, max_ofdm-&gt;sent_cts_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "sent_ba_rsp_cnt:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;sent_ba_rsp_cnt),</div><div class='add'>+		      accum_ofdm-&gt;sent_ba_rsp_cnt, delta_ofdm-&gt;sent_ba_rsp_cnt,</div><div class='add'>+		      max_ofdm-&gt;sent_ba_rsp_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "dsp_self_kill:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;dsp_self_kill),</div><div class='add'>+		      accum_ofdm-&gt;dsp_self_kill, delta_ofdm-&gt;dsp_self_kill,</div><div class='add'>+		      max_ofdm-&gt;dsp_self_kill);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "mh_format_err:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;mh_format_err),</div><div class='add'>+		      accum_ofdm-&gt;mh_format_err, delta_ofdm-&gt;mh_format_err,</div><div class='add'>+		      max_ofdm-&gt;mh_format_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table,</div><div class='add'>+		      "re_acq_main_rssi_sum:",</div><div class='add'>+		      le32_to_cpu(ofdm-&gt;re_acq_main_rssi_sum),</div><div class='add'>+		      accum_ofdm-&gt;re_acq_main_rssi_sum,</div><div class='add'>+		      delta_ofdm-&gt;re_acq_main_rssi_sum,</div><div class='add'>+		      max_ofdm-&gt;re_acq_main_rssi_sum);</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_header,</div><div class='add'>+		      "Statistics_Rx - CCK:");</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "ina_cnt:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;ina_cnt), accum_cck-&gt;ina_cnt,</div><div class='add'>+		      delta_cck-&gt;ina_cnt, max_cck-&gt;ina_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "fina_cnt:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;fina_cnt), accum_cck-&gt;fina_cnt,</div><div class='add'>+		      delta_cck-&gt;fina_cnt, max_cck-&gt;fina_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "plcp_err:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;plcp_err), accum_cck-&gt;plcp_err,</div><div class='add'>+		      delta_cck-&gt;plcp_err, max_cck-&gt;plcp_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "crc32_err:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;crc32_err), accum_cck-&gt;crc32_err,</div><div class='add'>+		      delta_cck-&gt;crc32_err, max_cck-&gt;crc32_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "overrun_err:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;overrun_err), accum_cck-&gt;overrun_err,</div><div class='add'>+		      delta_cck-&gt;overrun_err, max_cck-&gt;overrun_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "early_overrun_err:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;early_overrun_err),</div><div class='add'>+		      accum_cck-&gt;early_overrun_err,</div><div class='add'>+		      delta_cck-&gt;early_overrun_err, max_cck-&gt;early_overrun_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "crc32_good:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;crc32_good), accum_cck-&gt;crc32_good,</div><div class='add'>+		      delta_cck-&gt;crc32_good, max_cck-&gt;crc32_good);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "false_alarm_cnt:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;false_alarm_cnt),</div><div class='add'>+		      accum_cck-&gt;false_alarm_cnt, delta_cck-&gt;false_alarm_cnt,</div><div class='add'>+		      max_cck-&gt;false_alarm_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "fina_sync_err_cnt:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;fina_sync_err_cnt),</div><div class='add'>+		      accum_cck-&gt;fina_sync_err_cnt,</div><div class='add'>+		      delta_cck-&gt;fina_sync_err_cnt, max_cck-&gt;fina_sync_err_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "sfd_timeout:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;sfd_timeout), accum_cck-&gt;sfd_timeout,</div><div class='add'>+		      delta_cck-&gt;sfd_timeout, max_cck-&gt;sfd_timeout);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "fina_timeout:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;fina_timeout), accum_cck-&gt;fina_timeout,</div><div class='add'>+		      delta_cck-&gt;fina_timeout, max_cck-&gt;fina_timeout);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "unresponded_rts:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;unresponded_rts),</div><div class='add'>+		      accum_cck-&gt;unresponded_rts, delta_cck-&gt;unresponded_rts,</div><div class='add'>+		      max_cck-&gt;unresponded_rts);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "rxe_frame_lmt_ovrun:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;rxe_frame_limit_overrun),</div><div class='add'>+		      accum_cck-&gt;rxe_frame_limit_overrun,</div><div class='add'>+		      delta_cck-&gt;rxe_frame_limit_overrun,</div><div class='add'>+		      max_cck-&gt;rxe_frame_limit_overrun);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "sent_ack_cnt:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;sent_ack_cnt), accum_cck-&gt;sent_ack_cnt,</div><div class='add'>+		      delta_cck-&gt;sent_ack_cnt, max_cck-&gt;sent_ack_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "sent_cts_cnt:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;sent_cts_cnt), accum_cck-&gt;sent_cts_cnt,</div><div class='add'>+		      delta_cck-&gt;sent_cts_cnt, max_cck-&gt;sent_cts_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "sent_ba_rsp_cnt:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;sent_ba_rsp_cnt),</div><div class='add'>+		      accum_cck-&gt;sent_ba_rsp_cnt, delta_cck-&gt;sent_ba_rsp_cnt,</div><div class='add'>+		      max_cck-&gt;sent_ba_rsp_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "dsp_self_kill:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;dsp_self_kill), accum_cck-&gt;dsp_self_kill,</div><div class='add'>+		      delta_cck-&gt;dsp_self_kill, max_cck-&gt;dsp_self_kill);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "mh_format_err:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;mh_format_err), accum_cck-&gt;mh_format_err,</div><div class='add'>+		      delta_cck-&gt;mh_format_err, max_cck-&gt;mh_format_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table,</div><div class='add'>+		      "re_acq_main_rssi_sum:",</div><div class='add'>+		      le32_to_cpu(cck-&gt;re_acq_main_rssi_sum),</div><div class='add'>+		      accum_cck-&gt;re_acq_main_rssi_sum,</div><div class='add'>+		      delta_cck-&gt;re_acq_main_rssi_sum,</div><div class='add'>+		      max_cck-&gt;re_acq_main_rssi_sum);</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_header,</div><div class='add'>+		      "Statistics_Rx - GENERAL:");</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "bogus_cts:",</div><div class='add'>+		      le32_to_cpu(general-&gt;bogus_cts), accum_general-&gt;bogus_cts,</div><div class='add'>+		      delta_general-&gt;bogus_cts, max_general-&gt;bogus_cts);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "bogus_ack:",</div><div class='add'>+		      le32_to_cpu(general-&gt;bogus_ack), accum_general-&gt;bogus_ack,</div><div class='add'>+		      delta_general-&gt;bogus_ack, max_general-&gt;bogus_ack);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "non_bssid_frames:",</div><div class='add'>+		      le32_to_cpu(general-&gt;non_bssid_frames),</div><div class='add'>+		      accum_general-&gt;non_bssid_frames,</div><div class='add'>+		      delta_general-&gt;non_bssid_frames,</div><div class='add'>+		      max_general-&gt;non_bssid_frames);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "filtered_frames:",</div><div class='add'>+		      le32_to_cpu(general-&gt;filtered_frames),</div><div class='add'>+		      accum_general-&gt;filtered_frames,</div><div class='add'>+		      delta_general-&gt;filtered_frames,</div><div class='add'>+		      max_general-&gt;filtered_frames);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "non_channel_beacons:",</div><div class='add'>+		      le32_to_cpu(general-&gt;non_channel_beacons),</div><div class='add'>+		      accum_general-&gt;non_channel_beacons,</div><div class='add'>+		      delta_general-&gt;non_channel_beacons,</div><div class='add'>+		      max_general-&gt;non_channel_beacons);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "channel_beacons:",</div><div class='add'>+		      le32_to_cpu(general-&gt;channel_beacons),</div><div class='add'>+		      accum_general-&gt;channel_beacons,</div><div class='add'>+		      delta_general-&gt;channel_beacons,</div><div class='add'>+		      max_general-&gt;channel_beacons);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "num_missed_bcon:",</div><div class='add'>+		      le32_to_cpu(general-&gt;num_missed_bcon),</div><div class='add'>+		      accum_general-&gt;num_missed_bcon,</div><div class='add'>+		      delta_general-&gt;num_missed_bcon,</div><div class='add'>+		      max_general-&gt;num_missed_bcon);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table,</div><div class='add'>+		      "adc_rx_saturation_time:",</div><div class='add'>+		      le32_to_cpu(general-&gt;adc_rx_saturation_time),</div><div class='add'>+		      accum_general-&gt;adc_rx_saturation_time,</div><div class='add'>+		      delta_general-&gt;adc_rx_saturation_time,</div><div class='add'>+		      max_general-&gt;adc_rx_saturation_time);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table,</div><div class='add'>+		      "ina_detect_search_tm:",</div><div class='add'>+		      le32_to_cpu(general-&gt;ina_detection_search_time),</div><div class='add'>+		      accum_general-&gt;ina_detection_search_time,</div><div class='add'>+		      delta_general-&gt;ina_detection_search_time,</div><div class='add'>+		      max_general-&gt;ina_detection_search_time);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table,</div><div class='add'>+		      "beacon_silence_rssi_a:",</div><div class='add'>+		      le32_to_cpu(general-&gt;beacon_silence_rssi_a),</div><div class='add'>+		      accum_general-&gt;beacon_silence_rssi_a,</div><div class='add'>+		      delta_general-&gt;beacon_silence_rssi_a,</div><div class='add'>+		      max_general-&gt;beacon_silence_rssi_a);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table,</div><div class='add'>+		      "beacon_silence_rssi_b:",</div><div class='add'>+		      le32_to_cpu(general-&gt;beacon_silence_rssi_b),</div><div class='add'>+		      accum_general-&gt;beacon_silence_rssi_b,</div><div class='add'>+		      delta_general-&gt;beacon_silence_rssi_b,</div><div class='add'>+		      max_general-&gt;beacon_silence_rssi_b);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table,</div><div class='add'>+		      "beacon_silence_rssi_c:",</div><div class='add'>+		      le32_to_cpu(general-&gt;beacon_silence_rssi_c),</div><div class='add'>+		      accum_general-&gt;beacon_silence_rssi_c,</div><div class='add'>+		      delta_general-&gt;beacon_silence_rssi_c,</div><div class='add'>+		      max_general-&gt;beacon_silence_rssi_c);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table,</div><div class='add'>+		      "interference_data_flag:",</div><div class='add'>+		      le32_to_cpu(general-&gt;interference_data_flag),</div><div class='add'>+		      accum_general-&gt;interference_data_flag,</div><div class='add'>+		      delta_general-&gt;interference_data_flag,</div><div class='add'>+		      max_general-&gt;interference_data_flag);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "channel_load:",</div><div class='add'>+		      le32_to_cpu(general-&gt;channel_load),</div><div class='add'>+		      accum_general-&gt;channel_load, delta_general-&gt;channel_load,</div><div class='add'>+		      max_general-&gt;channel_load);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "dsp_false_alarms:",</div><div class='add'>+		      le32_to_cpu(general-&gt;dsp_false_alarms),</div><div class='add'>+		      accum_general-&gt;dsp_false_alarms,</div><div class='add'>+		      delta_general-&gt;dsp_false_alarms,</div><div class='add'>+		      max_general-&gt;dsp_false_alarms);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "beacon_rssi_a:",</div><div class='add'>+		      le32_to_cpu(general-&gt;beacon_rssi_a),</div><div class='add'>+		      accum_general-&gt;beacon_rssi_a,</div><div class='add'>+		      delta_general-&gt;beacon_rssi_a, max_general-&gt;beacon_rssi_a);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "beacon_rssi_b:",</div><div class='add'>+		      le32_to_cpu(general-&gt;beacon_rssi_b),</div><div class='add'>+		      accum_general-&gt;beacon_rssi_b,</div><div class='add'>+		      delta_general-&gt;beacon_rssi_b, max_general-&gt;beacon_rssi_b);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "beacon_rssi_c:",</div><div class='add'>+		      le32_to_cpu(general-&gt;beacon_rssi_c),</div><div class='add'>+		      accum_general-&gt;beacon_rssi_c,</div><div class='add'>+		      delta_general-&gt;beacon_rssi_c, max_general-&gt;beacon_rssi_c);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "beacon_energy_a:",</div><div class='add'>+		      le32_to_cpu(general-&gt;beacon_energy_a),</div><div class='add'>+		      accum_general-&gt;beacon_energy_a,</div><div class='add'>+		      delta_general-&gt;beacon_energy_a,</div><div class='add'>+		      max_general-&gt;beacon_energy_a);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "beacon_energy_b:",</div><div class='add'>+		      le32_to_cpu(general-&gt;beacon_energy_b),</div><div class='add'>+		      accum_general-&gt;beacon_energy_b,</div><div class='add'>+		      delta_general-&gt;beacon_energy_b,</div><div class='add'>+		      max_general-&gt;beacon_energy_b);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "beacon_energy_c:",</div><div class='add'>+		      le32_to_cpu(general-&gt;beacon_energy_c),</div><div class='add'>+		      accum_general-&gt;beacon_energy_c,</div><div class='add'>+		      delta_general-&gt;beacon_energy_c,</div><div class='add'>+		      max_general-&gt;beacon_energy_c);</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_header,</div><div class='add'>+		      "Statistics_Rx - OFDM_HT:");</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "plcp_err:",</div><div class='add'>+		      le32_to_cpu(ht-&gt;plcp_err), accum_ht-&gt;plcp_err,</div><div class='add'>+		      delta_ht-&gt;plcp_err, max_ht-&gt;plcp_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "overrun_err:",</div><div class='add'>+		      le32_to_cpu(ht-&gt;overrun_err), accum_ht-&gt;overrun_err,</div><div class='add'>+		      delta_ht-&gt;overrun_err, max_ht-&gt;overrun_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "early_overrun_err:",</div><div class='add'>+		      le32_to_cpu(ht-&gt;early_overrun_err),</div><div class='add'>+		      accum_ht-&gt;early_overrun_err, delta_ht-&gt;early_overrun_err,</div><div class='add'>+		      max_ht-&gt;early_overrun_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "crc32_good:",</div><div class='add'>+		      le32_to_cpu(ht-&gt;crc32_good), accum_ht-&gt;crc32_good,</div><div class='add'>+		      delta_ht-&gt;crc32_good, max_ht-&gt;crc32_good);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "crc32_err:",</div><div class='add'>+		      le32_to_cpu(ht-&gt;crc32_err), accum_ht-&gt;crc32_err,</div><div class='add'>+		      delta_ht-&gt;crc32_err, max_ht-&gt;crc32_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "mh_format_err:",</div><div class='add'>+		      le32_to_cpu(ht-&gt;mh_format_err), accum_ht-&gt;mh_format_err,</div><div class='add'>+		      delta_ht-&gt;mh_format_err, max_ht-&gt;mh_format_err);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "agg_crc32_good:",</div><div class='add'>+		      le32_to_cpu(ht-&gt;agg_crc32_good), accum_ht-&gt;agg_crc32_good,</div><div class='add'>+		      delta_ht-&gt;agg_crc32_good, max_ht-&gt;agg_crc32_good);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "agg_mpdu_cnt:",</div><div class='add'>+		      le32_to_cpu(ht-&gt;agg_mpdu_cnt), accum_ht-&gt;agg_mpdu_cnt,</div><div class='add'>+		      delta_ht-&gt;agg_mpdu_cnt, max_ht-&gt;agg_mpdu_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "agg_cnt:",</div><div class='add'>+		      le32_to_cpu(ht-&gt;agg_cnt), accum_ht-&gt;agg_cnt,</div><div class='add'>+		      delta_ht-&gt;agg_cnt, max_ht-&gt;agg_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "unsupport_mcs:",</div><div class='add'>+		      le32_to_cpu(ht-&gt;unsupport_mcs), accum_ht-&gt;unsupport_mcs,</div><div class='add'>+		      delta_ht-&gt;unsupport_mcs, max_ht-&gt;unsupport_mcs);</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t</div><div class='add'>+il4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,</div><div class='add'>+			   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	int pos = 0;</div><div class='add'>+	char *buf;</div><div class='add'>+	int bufsz = (sizeof(struct stats_tx) * 48) + 250;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	struct stats_tx *tx, *accum_tx, *delta_tx, *max_tx;</div><div class='add'>+</div><div class='add'>+	if (!il_is_alive(il))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	if (!buf) {</div><div class='add'>+		IL_ERR("Can not allocate Buffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* the statistic information display here is based on</div><div class='add'>+	 * the last stats notification from uCode</div><div class='add'>+	 * might not reflect the current uCode activity</div><div class='add'>+	 */</div><div class='add'>+	tx = &amp;il-&gt;_4965.stats.tx;</div><div class='add'>+	accum_tx = &amp;il-&gt;_4965.accum_stats.tx;</div><div class='add'>+	delta_tx = &amp;il-&gt;_4965.delta_stats.tx;</div><div class='add'>+	max_tx = &amp;il-&gt;_4965.max_delta.tx;</div><div class='add'>+</div><div class='add'>+	pos += il4965_stats_flag(il, buf, bufsz);</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, fmt_header, "Statistics_Tx:");</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "preamble:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;preamble_cnt), accum_tx-&gt;preamble_cnt,</div><div class='add'>+		      delta_tx-&gt;preamble_cnt, max_tx-&gt;preamble_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "rx_detected_cnt:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;rx_detected_cnt),</div><div class='add'>+		      accum_tx-&gt;rx_detected_cnt, delta_tx-&gt;rx_detected_cnt,</div><div class='add'>+		      max_tx-&gt;rx_detected_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "bt_prio_defer_cnt:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;bt_prio_defer_cnt),</div><div class='add'>+		      accum_tx-&gt;bt_prio_defer_cnt, delta_tx-&gt;bt_prio_defer_cnt,</div><div class='add'>+		      max_tx-&gt;bt_prio_defer_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "bt_prio_kill_cnt:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;bt_prio_kill_cnt),</div><div class='add'>+		      accum_tx-&gt;bt_prio_kill_cnt, delta_tx-&gt;bt_prio_kill_cnt,</div><div class='add'>+		      max_tx-&gt;bt_prio_kill_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "few_bytes_cnt:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;few_bytes_cnt), accum_tx-&gt;few_bytes_cnt,</div><div class='add'>+		      delta_tx-&gt;few_bytes_cnt, max_tx-&gt;few_bytes_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "cts_timeout:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;cts_timeout), accum_tx-&gt;cts_timeout,</div><div class='add'>+		      delta_tx-&gt;cts_timeout, max_tx-&gt;cts_timeout);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "ack_timeout:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;ack_timeout), accum_tx-&gt;ack_timeout,</div><div class='add'>+		      delta_tx-&gt;ack_timeout, max_tx-&gt;ack_timeout);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "expected_ack_cnt:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;expected_ack_cnt),</div><div class='add'>+		      accum_tx-&gt;expected_ack_cnt, delta_tx-&gt;expected_ack_cnt,</div><div class='add'>+		      max_tx-&gt;expected_ack_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "actual_ack_cnt:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;actual_ack_cnt), accum_tx-&gt;actual_ack_cnt,</div><div class='add'>+		      delta_tx-&gt;actual_ack_cnt, max_tx-&gt;actual_ack_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "dump_msdu_cnt:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;dump_msdu_cnt), accum_tx-&gt;dump_msdu_cnt,</div><div class='add'>+		      delta_tx-&gt;dump_msdu_cnt, max_tx-&gt;dump_msdu_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table,</div><div class='add'>+		      "abort_nxt_frame_mismatch:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;burst_abort_next_frame_mismatch_cnt),</div><div class='add'>+		      accum_tx-&gt;burst_abort_next_frame_mismatch_cnt,</div><div class='add'>+		      delta_tx-&gt;burst_abort_next_frame_mismatch_cnt,</div><div class='add'>+		      max_tx-&gt;burst_abort_next_frame_mismatch_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table,</div><div class='add'>+		      "abort_missing_nxt_frame:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;burst_abort_missing_next_frame_cnt),</div><div class='add'>+		      accum_tx-&gt;burst_abort_missing_next_frame_cnt,</div><div class='add'>+		      delta_tx-&gt;burst_abort_missing_next_frame_cnt,</div><div class='add'>+		      max_tx-&gt;burst_abort_missing_next_frame_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table,</div><div class='add'>+		      "cts_timeout_collision:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;cts_timeout_collision),</div><div class='add'>+		      accum_tx-&gt;cts_timeout_collision,</div><div class='add'>+		      delta_tx-&gt;cts_timeout_collision,</div><div class='add'>+		      max_tx-&gt;cts_timeout_collision);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table,</div><div class='add'>+		      "ack_ba_timeout_collision:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;ack_or_ba_timeout_collision),</div><div class='add'>+		      accum_tx-&gt;ack_or_ba_timeout_collision,</div><div class='add'>+		      delta_tx-&gt;ack_or_ba_timeout_collision,</div><div class='add'>+		      max_tx-&gt;ack_or_ba_timeout_collision);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "agg ba_timeout:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;agg.ba_timeout), accum_tx-&gt;agg.ba_timeout,</div><div class='add'>+		      delta_tx-&gt;agg.ba_timeout, max_tx-&gt;agg.ba_timeout);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table,</div><div class='add'>+		      "agg ba_resched_frames:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;agg.ba_reschedule_frames),</div><div class='add'>+		      accum_tx-&gt;agg.ba_reschedule_frames,</div><div class='add'>+		      delta_tx-&gt;agg.ba_reschedule_frames,</div><div class='add'>+		      max_tx-&gt;agg.ba_reschedule_frames);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table,</div><div class='add'>+		      "agg scd_query_agg_frame:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;agg.scd_query_agg_frame_cnt),</div><div class='add'>+		      accum_tx-&gt;agg.scd_query_agg_frame_cnt,</div><div class='add'>+		      delta_tx-&gt;agg.scd_query_agg_frame_cnt,</div><div class='add'>+		      max_tx-&gt;agg.scd_query_agg_frame_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table,</div><div class='add'>+		      "agg scd_query_no_agg:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;agg.scd_query_no_agg),</div><div class='add'>+		      accum_tx-&gt;agg.scd_query_no_agg,</div><div class='add'>+		      delta_tx-&gt;agg.scd_query_no_agg,</div><div class='add'>+		      max_tx-&gt;agg.scd_query_no_agg);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "agg scd_query_agg:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;agg.scd_query_agg),</div><div class='add'>+		      accum_tx-&gt;agg.scd_query_agg, delta_tx-&gt;agg.scd_query_agg,</div><div class='add'>+		      max_tx-&gt;agg.scd_query_agg);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table,</div><div class='add'>+		      "agg scd_query_mismatch:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;agg.scd_query_mismatch),</div><div class='add'>+		      accum_tx-&gt;agg.scd_query_mismatch,</div><div class='add'>+		      delta_tx-&gt;agg.scd_query_mismatch,</div><div class='add'>+		      max_tx-&gt;agg.scd_query_mismatch);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "agg frame_not_ready:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;agg.frame_not_ready),</div><div class='add'>+		      accum_tx-&gt;agg.frame_not_ready,</div><div class='add'>+		      delta_tx-&gt;agg.frame_not_ready,</div><div class='add'>+		      max_tx-&gt;agg.frame_not_ready);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "agg underrun:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;agg.underrun), accum_tx-&gt;agg.underrun,</div><div class='add'>+		      delta_tx-&gt;agg.underrun, max_tx-&gt;agg.underrun);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "agg bt_prio_kill:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;agg.bt_prio_kill),</div><div class='add'>+		      accum_tx-&gt;agg.bt_prio_kill, delta_tx-&gt;agg.bt_prio_kill,</div><div class='add'>+		      max_tx-&gt;agg.bt_prio_kill);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "agg rx_ba_rsp_cnt:",</div><div class='add'>+		      le32_to_cpu(tx-&gt;agg.rx_ba_rsp_cnt),</div><div class='add'>+		      accum_tx-&gt;agg.rx_ba_rsp_cnt, delta_tx-&gt;agg.rx_ba_rsp_cnt,</div><div class='add'>+		      max_tx-&gt;agg.rx_ba_rsp_cnt);</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t</div><div class='add'>+il4965_ucode_general_stats_read(struct file *file, char __user *user_buf,</div><div class='add'>+				size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	int pos = 0;</div><div class='add'>+	char *buf;</div><div class='add'>+	int bufsz = sizeof(struct stats_general) * 10 + 300;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	struct stats_general_common *general, *accum_general;</div><div class='add'>+	struct stats_general_common *delta_general, *max_general;</div><div class='add'>+	struct stats_dbg *dbg, *accum_dbg, *delta_dbg, *max_dbg;</div><div class='add'>+	struct stats_div *div, *accum_div, *delta_div, *max_div;</div><div class='add'>+</div><div class='add'>+	if (!il_is_alive(il))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	if (!buf) {</div><div class='add'>+		IL_ERR("Can not allocate Buffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* the statistic information display here is based on</div><div class='add'>+	 * the last stats notification from uCode</div><div class='add'>+	 * might not reflect the current uCode activity</div><div class='add'>+	 */</div><div class='add'>+	general = &amp;il-&gt;_4965.stats.general.common;</div><div class='add'>+	dbg = &amp;il-&gt;_4965.stats.general.common.dbg;</div><div class='add'>+	div = &amp;il-&gt;_4965.stats.general.common.div;</div><div class='add'>+	accum_general = &amp;il-&gt;_4965.accum_stats.general.common;</div><div class='add'>+	accum_dbg = &amp;il-&gt;_4965.accum_stats.general.common.dbg;</div><div class='add'>+	accum_div = &amp;il-&gt;_4965.accum_stats.general.common.div;</div><div class='add'>+	delta_general = &amp;il-&gt;_4965.delta_stats.general.common;</div><div class='add'>+	max_general = &amp;il-&gt;_4965.max_delta.general.common;</div><div class='add'>+	delta_dbg = &amp;il-&gt;_4965.delta_stats.general.common.dbg;</div><div class='add'>+	max_dbg = &amp;il-&gt;_4965.max_delta.general.common.dbg;</div><div class='add'>+	delta_div = &amp;il-&gt;_4965.delta_stats.general.common.div;</div><div class='add'>+	max_div = &amp;il-&gt;_4965.max_delta.general.common.div;</div><div class='add'>+</div><div class='add'>+	pos += il4965_stats_flag(il, buf, bufsz);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_header,</div><div class='add'>+		      "Statistics_General:");</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_value, "temperature:",</div><div class='add'>+		      le32_to_cpu(general-&gt;temperature));</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_value, "ttl_timestamp:",</div><div class='add'>+		      le32_to_cpu(general-&gt;ttl_timestamp));</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "burst_check:",</div><div class='add'>+		      le32_to_cpu(dbg-&gt;burst_check), accum_dbg-&gt;burst_check,</div><div class='add'>+		      delta_dbg-&gt;burst_check, max_dbg-&gt;burst_check);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "burst_count:",</div><div class='add'>+		      le32_to_cpu(dbg-&gt;burst_count), accum_dbg-&gt;burst_count,</div><div class='add'>+		      delta_dbg-&gt;burst_count, max_dbg-&gt;burst_count);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table,</div><div class='add'>+		      "wait_for_silence_timeout_count:",</div><div class='add'>+		      le32_to_cpu(dbg-&gt;wait_for_silence_timeout_cnt),</div><div class='add'>+		      accum_dbg-&gt;wait_for_silence_timeout_cnt,</div><div class='add'>+		      delta_dbg-&gt;wait_for_silence_timeout_cnt,</div><div class='add'>+		      max_dbg-&gt;wait_for_silence_timeout_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "sleep_time:",</div><div class='add'>+		      le32_to_cpu(general-&gt;sleep_time),</div><div class='add'>+		      accum_general-&gt;sleep_time, delta_general-&gt;sleep_time,</div><div class='add'>+		      max_general-&gt;sleep_time);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "slots_out:",</div><div class='add'>+		      le32_to_cpu(general-&gt;slots_out), accum_general-&gt;slots_out,</div><div class='add'>+		      delta_general-&gt;slots_out, max_general-&gt;slots_out);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "slots_idle:",</div><div class='add'>+		      le32_to_cpu(general-&gt;slots_idle),</div><div class='add'>+		      accum_general-&gt;slots_idle, delta_general-&gt;slots_idle,</div><div class='add'>+		      max_general-&gt;slots_idle);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "tx_on_a:",</div><div class='add'>+		      le32_to_cpu(div-&gt;tx_on_a), accum_div-&gt;tx_on_a,</div><div class='add'>+		      delta_div-&gt;tx_on_a, max_div-&gt;tx_on_a);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "tx_on_b:",</div><div class='add'>+		      le32_to_cpu(div-&gt;tx_on_b), accum_div-&gt;tx_on_b,</div><div class='add'>+		      delta_div-&gt;tx_on_b, max_div-&gt;tx_on_b);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "exec_time:",</div><div class='add'>+		      le32_to_cpu(div-&gt;exec_time), accum_div-&gt;exec_time,</div><div class='add'>+		      delta_div-&gt;exec_time, max_div-&gt;exec_time);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "probe_time:",</div><div class='add'>+		      le32_to_cpu(div-&gt;probe_time), accum_div-&gt;probe_time,</div><div class='add'>+		      delta_div-&gt;probe_time, max_div-&gt;probe_time);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "rx_enable_counter:",</div><div class='add'>+		      le32_to_cpu(general-&gt;rx_enable_counter),</div><div class='add'>+		      accum_general-&gt;rx_enable_counter,</div><div class='add'>+		      delta_general-&gt;rx_enable_counter,</div><div class='add'>+		      max_general-&gt;rx_enable_counter);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, fmt_table, "num_of_sos_states:",</div><div class='add'>+		      le32_to_cpu(general-&gt;num_of_sos_states),</div><div class='add'>+		      accum_general-&gt;num_of_sos_states,</div><div class='add'>+		      delta_general-&gt;num_of_sos_states,</div><div class='add'>+		      max_general-&gt;num_of_sos_states);</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c<br/>new file mode 100644<br/>index 000000000000..1667232af647<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/4965-mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/4965-mac.c</a></div><div class='hunk'>@@ -0,0 +1,6515 @@</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Portions of this file are derived from the ipw3945 project, as well</div><div class='add'>+ * as portions of the ieee80211 subsystem header files.</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 version 2 of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution in the</div><div class='add'>+ * file called LICENSE.</div><div class='add'>+ *</div><div class='add'>+ * Contact Information:</div><div class='add'>+ *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='add'>+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/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/pci.h&gt;</div><div class='add'>+#include &lt;linux/pci-aspm.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/div64.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRV_NAME        "iwl4965"</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "4965.h"</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * module boiler plate</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * module name, copyright, version, etc.</div><div class='add'>+ */</div><div class='add'>+#define DRV_DESCRIPTION	"Intel(R) Wireless WiFi 4965 driver for Linux"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+#define VD "d"</div><div class='add'>+#else</div><div class='add'>+#define VD</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define DRV_VERSION     IWLWIFI_VERSION VD</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION(DRV_DESCRIPTION);</div><div class='add'>+MODULE_VERSION(DRV_VERSION);</div><div class='add'>+MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("iwl4965");</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_check_abort_status(struct il_priv *il, u8 frame_count, u32 status)</div><div class='add'>+{</div><div class='add'>+	if (frame_count == 1 &amp;&amp; status == TX_STATUS_FAIL_RFKILL_FLUSH) {</div><div class='add'>+		IL_ERR("Tx flush command to flush out all frames\n");</div><div class='add'>+		if (!test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+			queue_work(il-&gt;workqueue, &amp;il-&gt;tx_flush);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * EEPROM</div><div class='add'>+ */</div><div class='add'>+struct il_mod_params il4965_mod_params = {</div><div class='add'>+	.amsdu_size_8K = 1,</div><div class='add'>+	.restart_fw = 1,</div><div class='add'>+	/* the rest are 0 by default */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_rx_queue_reset(struct il_priv *il, struct il_rx_queue *rxq)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i;</div><div class='add'>+	spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='add'>+	INIT_LIST_HEAD(&amp;rxq-&gt;rx_free);</div><div class='add'>+	INIT_LIST_HEAD(&amp;rxq-&gt;rx_used);</div><div class='add'>+	/* Fill the rx_used queue with _all_ of the Rx buffers */</div><div class='add'>+	for (i = 0; i &lt; RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++) {</div><div class='add'>+		/* In the reset function, these buffers may have been allocated</div><div class='add'>+		 * to an SKB, so we need to unmap and free potential storage */</div><div class='add'>+		if (rxq-&gt;pool[i].page != NULL) {</div><div class='add'>+			pci_unmap_page(il-&gt;pci_dev, rxq-&gt;pool[i].page_dma,</div><div class='add'>+				       PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='add'>+				       PCI_DMA_FROMDEVICE);</div><div class='add'>+			__il_free_pages(il, rxq-&gt;pool[i].page);</div><div class='add'>+			rxq-&gt;pool[i].page = NULL;</div><div class='add'>+		}</div><div class='add'>+		list_add_tail(&amp;rxq-&gt;pool[i].list, &amp;rxq-&gt;rx_used);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RX_QUEUE_SIZE; i++)</div><div class='add'>+		rxq-&gt;queue[i] = NULL;</div><div class='add'>+</div><div class='add'>+	/* Set us so that we have processed and used all buffers, but have</div><div class='add'>+	 * not restocked the Rx queue with fresh buffers */</div><div class='add'>+	rxq-&gt;read = rxq-&gt;write = 0;</div><div class='add'>+	rxq-&gt;write_actual = 0;</div><div class='add'>+	rxq-&gt;free_count = 0;</div><div class='add'>+	spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_rx_init(struct il_priv *il, struct il_rx_queue *rxq)</div><div class='add'>+{</div><div class='add'>+	u32 rb_size;</div><div class='add'>+	const u32 rfdnlog = RX_QUEUE_SIZE_LOG;	/* 256 RBDs */</div><div class='add'>+	u32 rb_timeout = 0;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;cfg-&gt;mod_params-&gt;amsdu_size_8K)</div><div class='add'>+		rb_size = FH49_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_8K;</div><div class='add'>+	else</div><div class='add'>+		rb_size = FH49_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_4K;</div><div class='add'>+</div><div class='add'>+	/* Stop Rx DMA */</div><div class='add'>+	il_wr(il, FH49_MEM_RCSR_CHNL0_CONFIG_REG, 0);</div><div class='add'>+</div><div class='add'>+	/* Reset driver's Rx queue write idx */</div><div class='add'>+	il_wr(il, FH49_RSCSR_CHNL0_RBDCB_WPTR_REG, 0);</div><div class='add'>+</div><div class='add'>+	/* Tell device where to find RBD circular buffer in DRAM */</div><div class='add'>+	il_wr(il, FH49_RSCSR_CHNL0_RBDCB_BASE_REG, (u32) (rxq-&gt;bd_dma &gt;&gt; 8));</div><div class='add'>+</div><div class='add'>+	/* Tell device where in DRAM to update its Rx status */</div><div class='add'>+	il_wr(il, FH49_RSCSR_CHNL0_STTS_WPTR_REG, rxq-&gt;rb_stts_dma &gt;&gt; 4);</div><div class='add'>+</div><div class='add'>+	/* Enable Rx DMA</div><div class='add'>+	 * Direct rx interrupts to hosts</div><div class='add'>+	 * Rx buffer size 4 or 8k</div><div class='add'>+	 * RB timeout 0x10</div><div class='add'>+	 * 256 RBDs</div><div class='add'>+	 */</div><div class='add'>+	il_wr(il, FH49_MEM_RCSR_CHNL0_CONFIG_REG,</div><div class='add'>+	      FH49_RCSR_RX_CONFIG_CHNL_EN_ENABLE_VAL |</div><div class='add'>+	      FH49_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL |</div><div class='add'>+	      FH49_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME_MSK |</div><div class='add'>+	      rb_size |</div><div class='add'>+	      (rb_timeout &lt;&lt; FH49_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS) |</div><div class='add'>+	      (rfdnlog &lt;&lt; FH49_RCSR_RX_CONFIG_RBDCB_SIZE_POS));</div><div class='add'>+</div><div class='add'>+	/* Set interrupt coalescing timer to default (2048 usecs) */</div><div class='add'>+	il_write8(il, CSR_INT_COALESCING, IL_HOST_INT_TIMEOUT_DEF);</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'>+il4965_set_pwr_vmain(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+/*</div><div class='add'>+ * (for documentation purposes)</div><div class='add'>+ * to set power to V_AUX, do:</div><div class='add'>+</div><div class='add'>+		if (pci_pme_capable(il-&gt;pci_dev, PCI_D3cold))</div><div class='add'>+			il_set_bits_mask_prph(il, APMG_PS_CTRL_REG,</div><div class='add'>+					       APMG_PS_CTRL_VAL_PWR_SRC_VAUX,</div><div class='add'>+					       ~APMG_PS_CTRL_MSK_PWR_SRC);</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+	il_set_bits_mask_prph(il, APMG_PS_CTRL_REG,</div><div class='add'>+			      APMG_PS_CTRL_VAL_PWR_SRC_VMAIN,</div><div class='add'>+			      ~APMG_PS_CTRL_MSK_PWR_SRC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_hw_nic_init(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct il_rx_queue *rxq = &amp;il-&gt;rxq;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* nic_init */</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+	il-&gt;cfg-&gt;ops-&gt;lib-&gt;apm_ops.init(il);</div><div class='add'>+</div><div class='add'>+	/* Set interrupt coalescing calibration timer to default (512 usecs) */</div><div class='add'>+	il_write8(il, CSR_INT_COALESCING, IL_HOST_INT_CALIB_TIMEOUT_DEF);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	il4965_set_pwr_vmain(il);</div><div class='add'>+</div><div class='add'>+	il-&gt;cfg-&gt;ops-&gt;lib-&gt;apm_ops.config(il);</div><div class='add'>+</div><div class='add'>+	/* Allocate the RX queue, or reset if it is already allocated */</div><div class='add'>+	if (!rxq-&gt;bd) {</div><div class='add'>+		ret = il_rx_queue_alloc(il);</div><div class='add'>+		if (ret) {</div><div class='add'>+			IL_ERR("Unable to initialize Rx queue\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		il4965_rx_queue_reset(il, rxq);</div><div class='add'>+</div><div class='add'>+	il4965_rx_replenish(il);</div><div class='add'>+</div><div class='add'>+	il4965_rx_init(il, rxq);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	rxq-&gt;need_update = 1;</div><div class='add'>+	il_rx_queue_update_write_ptr(il, rxq);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Allocate or reset and init all Tx and Command queues */</div><div class='add'>+	if (!il-&gt;txq) {</div><div class='add'>+		ret = il4965_txq_ctx_alloc(il);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} else</div><div class='add'>+		il4965_txq_ctx_reset(il);</div><div class='add'>+</div><div class='add'>+	set_bit(S_INIT, &amp;il-&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'>+ * il4965_dma_addr2rbd_ptr - convert a DMA address to a uCode read buffer ptr</div><div class='add'>+ */</div><div class='add'>+static inline __le32</div><div class='add'>+il4965_dma_addr2rbd_ptr(struct il_priv *il, dma_addr_t dma_addr)</div><div class='add'>+{</div><div class='add'>+	return cpu_to_le32((u32) (dma_addr &gt;&gt; 8));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_rx_queue_restock - refill RX queue from pre-allocated pool</div><div class='add'>+ *</div><div class='add'>+ * If there are slots in the RX queue that need to be restocked,</div><div class='add'>+ * and we have free pre-allocated buffers, fill the ranks as much</div><div class='add'>+ * as we can, pulling from rx_free.</div><div class='add'>+ *</div><div class='add'>+ * This moves the 'write' idx forward to catch up with 'processed', and</div><div class='add'>+ * also updates the memory address in the firmware to reference the new</div><div class='add'>+ * target buffer.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il4965_rx_queue_restock(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_queue *rxq = &amp;il-&gt;rxq;</div><div class='add'>+	struct list_head *element;</div><div class='add'>+	struct il_rx_buf *rxb;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='add'>+	while (il_rx_queue_space(rxq) &gt; 0 &amp;&amp; rxq-&gt;free_count) {</div><div class='add'>+		/* The overwritten rxb must be a used one */</div><div class='add'>+		rxb = rxq-&gt;queue[rxq-&gt;write];</div><div class='add'>+		BUG_ON(rxb &amp;&amp; rxb-&gt;page);</div><div class='add'>+</div><div class='add'>+		/* Get next free Rx buffer, remove from free list */</div><div class='add'>+		element = rxq-&gt;rx_free.next;</div><div class='add'>+		rxb = list_entry(element, struct il_rx_buf, list);</div><div class='add'>+		list_del(element);</div><div class='add'>+</div><div class='add'>+		/* Point to Rx buffer via next RBD in circular buffer */</div><div class='add'>+		rxq-&gt;bd[rxq-&gt;write] =</div><div class='add'>+		    il4965_dma_addr2rbd_ptr(il, rxb-&gt;page_dma);</div><div class='add'>+		rxq-&gt;queue[rxq-&gt;write] = rxb;</div><div class='add'>+		rxq-&gt;write = (rxq-&gt;write + 1) &amp; RX_QUEUE_MASK;</div><div class='add'>+		rxq-&gt;free_count--;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+	/* If the pre-allocated buffer pool is dropping low, schedule to</div><div class='add'>+	 * refill it */</div><div class='add'>+	if (rxq-&gt;free_count &lt;= RX_LOW_WATERMARK)</div><div class='add'>+		queue_work(il-&gt;workqueue, &amp;il-&gt;rx_replenish);</div><div class='add'>+</div><div class='add'>+	/* If we've added more space for the firmware to place data, tell it.</div><div class='add'>+	 * Increment device's write pointer in multiples of 8. */</div><div class='add'>+	if (rxq-&gt;write_actual != (rxq-&gt;write &amp; ~0x7)) {</div><div class='add'>+		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='add'>+		rxq-&gt;need_update = 1;</div><div class='add'>+		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+		il_rx_queue_update_write_ptr(il, rxq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_rx_replenish - Move all used packet from rx_used to rx_free</div><div class='add'>+ *</div><div class='add'>+ * When moving to rx_free an SKB is allocated for the slot.</div><div class='add'>+ *</div><div class='add'>+ * Also restock the Rx queue via il_rx_queue_restock.</div><div class='add'>+ * This is called as a scheduled work item (except for during initialization)</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_rx_allocate(struct il_priv *il, gfp_t priority)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_queue *rxq = &amp;il-&gt;rxq;</div><div class='add'>+	struct list_head *element;</div><div class='add'>+	struct il_rx_buf *rxb;</div><div class='add'>+	struct page *page;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	gfp_t gfp_mask = priority;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='add'>+		if (list_empty(&amp;rxq-&gt;rx_used)) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		if (rxq-&gt;free_count &gt; RX_LOW_WATERMARK)</div><div class='add'>+			gfp_mask |= __GFP_NOWARN;</div><div class='add'>+</div><div class='add'>+		if (il-&gt;hw_params.rx_page_order &gt; 0)</div><div class='add'>+			gfp_mask |= __GFP_COMP;</div><div class='add'>+</div><div class='add'>+		/* Alloc a new receive buffer */</div><div class='add'>+		page = alloc_pages(gfp_mask, il-&gt;hw_params.rx_page_order);</div><div class='add'>+		if (!page) {</div><div class='add'>+			if (net_ratelimit())</div><div class='add'>+				D_INFO("alloc_pages failed, " "order: %d\n",</div><div class='add'>+				       il-&gt;hw_params.rx_page_order);</div><div class='add'>+</div><div class='add'>+			if (rxq-&gt;free_count &lt;= RX_LOW_WATERMARK &amp;&amp;</div><div class='add'>+			    net_ratelimit())</div><div class='add'>+				IL_ERR("Failed to alloc_pages with %s. "</div><div class='add'>+				       "Only %u free buffers remaining.\n",</div><div class='add'>+				       priority ==</div><div class='add'>+				       GFP_ATOMIC ? "GFP_ATOMIC" : "GFP_KERNEL",</div><div class='add'>+				       rxq-&gt;free_count);</div><div class='add'>+			/* We don't reschedule replenish work here -- we will</div><div class='add'>+			 * call the restock method and if it still needs</div><div class='add'>+			 * more buffers it will schedule replenish */</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		if (list_empty(&amp;rxq-&gt;rx_used)) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+			__free_pages(page, il-&gt;hw_params.rx_page_order);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		element = rxq-&gt;rx_used.next;</div><div class='add'>+		rxb = list_entry(element, struct il_rx_buf, list);</div><div class='add'>+		list_del(element);</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		BUG_ON(rxb-&gt;page);</div><div class='add'>+		rxb-&gt;page = page;</div><div class='add'>+		/* Get physical address of the RB */</div><div class='add'>+		rxb-&gt;page_dma =</div><div class='add'>+		    pci_map_page(il-&gt;pci_dev, page, 0,</div><div class='add'>+				 PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='add'>+				 PCI_DMA_FROMDEVICE);</div><div class='add'>+		/* dma address must be no more than 36 bits */</div><div class='add'>+		BUG_ON(rxb-&gt;page_dma &amp; ~DMA_BIT_MASK(36));</div><div class='add'>+		/* and also 256 byte aligned! */</div><div class='add'>+		BUG_ON(rxb-&gt;page_dma &amp; DMA_BIT_MASK(8));</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;rxb-&gt;list, &amp;rxq-&gt;rx_free);</div><div class='add'>+		rxq-&gt;free_count++;</div><div class='add'>+		il-&gt;alloc_rxb_page++;</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_rx_replenish(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	il4965_rx_allocate(il, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+	il4965_rx_queue_restock(il);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_rx_replenish_now(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	il4965_rx_allocate(il, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	il4965_rx_queue_restock(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Assumes that the skb field of the buffers in 'pool' is kept accurate.</div><div class='add'>+ * If an SKB has been detached, the POOL needs to have its SKB set to NULL</div><div class='add'>+ * This free routine walks the list of POOL entries and if SKB is set to</div><div class='add'>+ * non NULL it is unmapped and freed</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il4965_rx_queue_free(struct il_priv *il, struct il_rx_queue *rxq)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {</div><div class='add'>+		if (rxq-&gt;pool[i].page != NULL) {</div><div class='add'>+			pci_unmap_page(il-&gt;pci_dev, rxq-&gt;pool[i].page_dma,</div><div class='add'>+				       PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='add'>+				       PCI_DMA_FROMDEVICE);</div><div class='add'>+			__il_free_pages(il, rxq-&gt;pool[i].page);</div><div class='add'>+			rxq-&gt;pool[i].page = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_free_coherent(&amp;il-&gt;pci_dev-&gt;dev, 4 * RX_QUEUE_SIZE, rxq-&gt;bd,</div><div class='add'>+			  rxq-&gt;bd_dma);</div><div class='add'>+	dma_free_coherent(&amp;il-&gt;pci_dev-&gt;dev, sizeof(struct il_rb_status),</div><div class='add'>+			  rxq-&gt;rb_stts, rxq-&gt;rb_stts_dma);</div><div class='add'>+	rxq-&gt;bd = NULL;</div><div class='add'>+	rxq-&gt;rb_stts = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_rxq_stop(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	/* stop Rx DMA */</div><div class='add'>+	il_wr(il, FH49_MEM_RCSR_CHNL0_CONFIG_REG, 0);</div><div class='add'>+	il_poll_bit(il, FH49_MEM_RSSR_RX_STATUS_REG,</div><div class='add'>+		    FH49_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band)</div><div class='add'>+{</div><div class='add'>+	int idx = 0;</div><div class='add'>+	int band_offset = 0;</div><div class='add'>+</div><div class='add'>+	/* HT rate format: mac80211 wants an MCS number, which is just LSB */</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_HT_MSK) {</div><div class='add'>+		idx = (rate_n_flags &amp; 0xff);</div><div class='add'>+		return idx;</div><div class='add'>+		/* Legacy rate format, search for match in table */</div><div class='add'>+	} else {</div><div class='add'>+		if (band == IEEE80211_BAND_5GHZ)</div><div class='add'>+			band_offset = IL_FIRST_OFDM_RATE;</div><div class='add'>+		for (idx = band_offset; idx &lt; RATE_COUNT_LEGACY; idx++)</div><div class='add'>+			if (il_rates[idx].plcp == (rate_n_flags &amp; 0xFF))</div><div class='add'>+				return idx - band_offset;</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</div><div class='add'>+il4965_calc_rssi(struct il_priv *il, struct il_rx_phy_res *rx_resp)</div><div class='add'>+{</div><div class='add'>+	/* data from PHY/DSP regarding signal strength, etc.,</div><div class='add'>+	 *   contents are always there, not configurable by host.  */</div><div class='add'>+	struct il4965_rx_non_cfg_phy *ncphy =</div><div class='add'>+	    (struct il4965_rx_non_cfg_phy *)rx_resp-&gt;non_cfg_phy_buf;</div><div class='add'>+	u32 agc =</div><div class='add'>+	    (le16_to_cpu(ncphy-&gt;agc_info) &amp; IL49_AGC_DB_MASK) &gt;&gt;</div><div class='add'>+	    IL49_AGC_DB_POS;</div><div class='add'>+</div><div class='add'>+	u32 valid_antennae =</div><div class='add'>+	    (le16_to_cpu(rx_resp-&gt;phy_flags) &amp; IL49_RX_PHY_FLAGS_ANTENNAE_MASK)</div><div class='add'>+	    &gt;&gt; IL49_RX_PHY_FLAGS_ANTENNAE_OFFSET;</div><div class='add'>+	u8 max_rssi = 0;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	/* Find max rssi among 3 possible receivers.</div><div class='add'>+	 * These values are measured by the digital signal processor (DSP).</div><div class='add'>+	 * They should stay fairly constant even as the signal strength varies,</div><div class='add'>+	 *   if the radio's automatic gain control (AGC) is working right.</div><div class='add'>+	 * AGC value (see below) will provide the "interesting" info. */</div><div class='add'>+	for (i = 0; i &lt; 3; i++)</div><div class='add'>+		if (valid_antennae &amp; (1 &lt;&lt; i))</div><div class='add'>+			max_rssi = max(ncphy-&gt;rssi_info[i &lt;&lt; 1], max_rssi);</div><div class='add'>+</div><div class='add'>+	D_STATS("Rssi In A %d B %d C %d Max %d AGC dB %d\n",</div><div class='add'>+		ncphy-&gt;rssi_info[0], ncphy-&gt;rssi_info[2], ncphy-&gt;rssi_info[4],</div><div class='add'>+		max_rssi, agc);</div><div class='add'>+</div><div class='add'>+	/* dBm = max_rssi dB - agc dB - constant.</div><div class='add'>+	 * Higher AGC (higher radio gain) means lower signal. */</div><div class='add'>+	return max_rssi - agc - IL4965_RSSI_OFFSET;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+il4965_translate_rx_status(struct il_priv *il, u32 decrypt_in)</div><div class='add'>+{</div><div class='add'>+	u32 decrypt_out = 0;</div><div class='add'>+</div><div class='add'>+	if ((decrypt_in &amp; RX_RES_STATUS_STATION_FOUND) ==</div><div class='add'>+	    RX_RES_STATUS_STATION_FOUND)</div><div class='add'>+		decrypt_out |=</div><div class='add'>+		    (RX_RES_STATUS_STATION_FOUND |</div><div class='add'>+		     RX_RES_STATUS_NO_STATION_INFO_MISMATCH);</div><div class='add'>+</div><div class='add'>+	decrypt_out |= (decrypt_in &amp; RX_RES_STATUS_SEC_TYPE_MSK);</div><div class='add'>+</div><div class='add'>+	/* packet was not encrypted */</div><div class='add'>+	if ((decrypt_in &amp; RX_RES_STATUS_SEC_TYPE_MSK) ==</div><div class='add'>+	    RX_RES_STATUS_SEC_TYPE_NONE)</div><div class='add'>+		return decrypt_out;</div><div class='add'>+</div><div class='add'>+	/* packet was encrypted with unknown alg */</div><div class='add'>+	if ((decrypt_in &amp; RX_RES_STATUS_SEC_TYPE_MSK) ==</div><div class='add'>+	    RX_RES_STATUS_SEC_TYPE_ERR)</div><div class='add'>+		return decrypt_out;</div><div class='add'>+</div><div class='add'>+	/* decryption was not done in HW */</div><div class='add'>+	if ((decrypt_in &amp; RX_MPDU_RES_STATUS_DEC_DONE_MSK) !=</div><div class='add'>+	    RX_MPDU_RES_STATUS_DEC_DONE_MSK)</div><div class='add'>+		return decrypt_out;</div><div class='add'>+</div><div class='add'>+	switch (decrypt_in &amp; RX_RES_STATUS_SEC_TYPE_MSK) {</div><div class='add'>+</div><div class='add'>+	case RX_RES_STATUS_SEC_TYPE_CCMP:</div><div class='add'>+		/* alg is CCM: check MIC only */</div><div class='add'>+		if (!(decrypt_in &amp; RX_MPDU_RES_STATUS_MIC_OK))</div><div class='add'>+			/* Bad MIC */</div><div class='add'>+			decrypt_out |= RX_RES_STATUS_BAD_ICV_MIC;</div><div class='add'>+		else</div><div class='add'>+			decrypt_out |= RX_RES_STATUS_DECRYPT_OK;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RX_RES_STATUS_SEC_TYPE_TKIP:</div><div class='add'>+		if (!(decrypt_in &amp; RX_MPDU_RES_STATUS_TTAK_OK)) {</div><div class='add'>+			/* Bad TTAK */</div><div class='add'>+			decrypt_out |= RX_RES_STATUS_BAD_KEY_TTAK;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		/* fall through if TTAK OK */</div><div class='add'>+	default:</div><div class='add'>+		if (!(decrypt_in &amp; RX_MPDU_RES_STATUS_ICV_OK))</div><div class='add'>+			decrypt_out |= RX_RES_STATUS_BAD_ICV_MIC;</div><div class='add'>+		else</div><div class='add'>+			decrypt_out |= RX_RES_STATUS_DECRYPT_OK;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_RX("decrypt_in:0x%x  decrypt_out = 0x%x\n", decrypt_in, decrypt_out);</div><div class='add'>+</div><div class='add'>+	return decrypt_out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_pass_packet_to_mac80211(struct il_priv *il, struct ieee80211_hdr *hdr,</div><div class='add'>+			       u16 len, u32 ampdu_status, struct il_rx_buf *rxb,</div><div class='add'>+			       struct ieee80211_rx_status *stats)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	__le16 fc = hdr-&gt;frame_control;</div><div class='add'>+</div><div class='add'>+	/* We only process data packets if the interface is open */</div><div class='add'>+	if (unlikely(!il-&gt;is_open)) {</div><div class='add'>+		D_DROP("Dropping packet while interface is not open.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In case of HW accelerated crypto and bad decryption, drop */</div><div class='add'>+	if (!il-&gt;cfg-&gt;mod_params-&gt;sw_crypto &amp;&amp;</div><div class='add'>+	    il_set_decrypted_flag(il, hdr, ampdu_status, stats))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(128);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		IL_ERR("dev_alloc_skb failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_add_rx_frag(skb, 0, rxb-&gt;page, (void *)hdr - rxb_addr(rxb), len);</div><div class='add'>+</div><div class='add'>+	il_update_stats(il, false, fc, len);</div><div class='add'>+	memcpy(IEEE80211_SKB_RXCB(skb), stats, sizeof(*stats));</div><div class='add'>+</div><div class='add'>+	ieee80211_rx(il-&gt;hw, skb);</div><div class='add'>+	il-&gt;alloc_rxb_page--;</div><div class='add'>+	rxb-&gt;page = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called for N_RX (legacy ABG frames), or</div><div class='add'>+ * N_RX_MPDU (HT high-throughput N frames). */</div><div class='add'>+void</div><div class='add'>+il4965_hdl_rx(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr *header;</div><div class='add'>+	struct ieee80211_rx_status rx_status;</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	struct il_rx_phy_res *phy_res;</div><div class='add'>+	__le32 rx_pkt_status;</div><div class='add'>+	struct il_rx_mpdu_res_start *amsdu;</div><div class='add'>+	u32 len;</div><div class='add'>+	u32 ampdu_status;</div><div class='add'>+	u32 rate_n_flags;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * N_RX and N_RX_MPDU are handled differently.</div><div class='add'>+	 *	N_RX: physical layer info is in this buffer</div><div class='add'>+	 *	N_RX_MPDU: physical layer info was sent in separate</div><div class='add'>+	 *		command and cached in il-&gt;last_phy_res</div><div class='add'>+	 *</div><div class='add'>+	 * Here we set up local variables depending on which command is</div><div class='add'>+	 * received.</div><div class='add'>+	 */</div><div class='add'>+	if (pkt-&gt;hdr.cmd == N_RX) {</div><div class='add'>+		phy_res = (struct il_rx_phy_res *)pkt-&gt;u.raw;</div><div class='add'>+		header =</div><div class='add'>+		    (struct ieee80211_hdr *)(pkt-&gt;u.raw + sizeof(*phy_res) +</div><div class='add'>+					     phy_res-&gt;cfg_phy_cnt);</div><div class='add'>+</div><div class='add'>+		len = le16_to_cpu(phy_res-&gt;byte_count);</div><div class='add'>+		rx_pkt_status =</div><div class='add'>+		    *(__le32 *) (pkt-&gt;u.raw + sizeof(*phy_res) +</div><div class='add'>+				 phy_res-&gt;cfg_phy_cnt + len);</div><div class='add'>+		ampdu_status = le32_to_cpu(rx_pkt_status);</div><div class='add'>+	} else {</div><div class='add'>+		if (!il-&gt;_4965.last_phy_res_valid) {</div><div class='add'>+			IL_ERR("MPDU frame without cached PHY data\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		phy_res = &amp;il-&gt;_4965.last_phy_res;</div><div class='add'>+		amsdu = (struct il_rx_mpdu_res_start *)pkt-&gt;u.raw;</div><div class='add'>+		header = (struct ieee80211_hdr *)(pkt-&gt;u.raw + sizeof(*amsdu));</div><div class='add'>+		len = le16_to_cpu(amsdu-&gt;byte_count);</div><div class='add'>+		rx_pkt_status = *(__le32 *) (pkt-&gt;u.raw + sizeof(*amsdu) + len);</div><div class='add'>+		ampdu_status =</div><div class='add'>+		    il4965_translate_rx_status(il, le32_to_cpu(rx_pkt_status));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((unlikely(phy_res-&gt;cfg_phy_cnt &gt; 20))) {</div><div class='add'>+		D_DROP("dsp size out of range [0,20]: %d/n",</div><div class='add'>+		       phy_res-&gt;cfg_phy_cnt);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(rx_pkt_status &amp; RX_RES_STATUS_NO_CRC32_ERROR) ||</div><div class='add'>+	    !(rx_pkt_status &amp; RX_RES_STATUS_NO_RXE_OVERFLOW)) {</div><div class='add'>+		D_RX("Bad CRC or FIFO: 0x%08X.\n", le32_to_cpu(rx_pkt_status));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This will be used in several places later */</div><div class='add'>+	rate_n_flags = le32_to_cpu(phy_res-&gt;rate_n_flags);</div><div class='add'>+</div><div class='add'>+	/* rx_status carries information about the packet to mac80211 */</div><div class='add'>+	rx_status.mactime = le64_to_cpu(phy_res-&gt;timestamp);</div><div class='add'>+	rx_status.band =</div><div class='add'>+	    (phy_res-&gt;</div><div class='add'>+	     phy_flags &amp; RX_RES_PHY_FLAGS_BAND_24_MSK) ? IEEE80211_BAND_2GHZ :</div><div class='add'>+	    IEEE80211_BAND_5GHZ;</div><div class='add'>+	rx_status.freq =</div><div class='add'>+	    ieee80211_channel_to_frequency(le16_to_cpu(phy_res-&gt;channel),</div><div class='add'>+					   rx_status.band);</div><div class='add'>+	rx_status.rate_idx =</div><div class='add'>+	    il4965_hwrate_to_mac80211_idx(rate_n_flags, rx_status.band);</div><div class='add'>+	rx_status.flag = 0;</div><div class='add'>+</div><div class='add'>+	/* TSF isn't reliable. In order to allow smooth user experience,</div><div class='add'>+	 * this W/A doesn't propagate it to the mac80211 */</div><div class='add'>+	/*rx_status.flag |= RX_FLAG_MACTIME_MPDU; */</div><div class='add'>+</div><div class='add'>+	il-&gt;ucode_beacon_time = le32_to_cpu(phy_res-&gt;beacon_time_stamp);</div><div class='add'>+</div><div class='add'>+	/* Find max signal strength (dBm) among 3 antenna/receiver chains */</div><div class='add'>+	rx_status.signal = il4965_calc_rssi(il, phy_res);</div><div class='add'>+</div><div class='add'>+	il_dbg_log_rx_data_frame(il, len, header);</div><div class='add'>+	D_STATS("Rssi %d, TSF %llu\n", rx_status.signal,</div><div class='add'>+		(unsigned long long)rx_status.mactime);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * "antenna number"</div><div class='add'>+	 *</div><div class='add'>+	 * It seems that the antenna field in the phy flags value</div><div class='add'>+	 * is actually a bit field. This is undefined by radiotap,</div><div class='add'>+	 * it wants an actual antenna number but I always get "7"</div><div class='add'>+	 * for most legacy frames I receive indicating that the</div><div class='add'>+	 * same frame was received on all three RX chains.</div><div class='add'>+	 *</div><div class='add'>+	 * I think this field should be removed in favor of a</div><div class='add'>+	 * new 802.11n radiotap field "RX chains" that is defined</div><div class='add'>+	 * as a bitmask.</div><div class='add'>+	 */</div><div class='add'>+	rx_status.antenna =</div><div class='add'>+	    (le16_to_cpu(phy_res-&gt;phy_flags) &amp; RX_RES_PHY_FLAGS_ANTENNA_MSK) &gt;&gt;</div><div class='add'>+	    RX_RES_PHY_FLAGS_ANTENNA_POS;</div><div class='add'>+</div><div class='add'>+	/* set the preamble flag if appropriate */</div><div class='add'>+	if (phy_res-&gt;phy_flags &amp; RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK)</div><div class='add'>+		rx_status.flag |= RX_FLAG_SHORTPRE;</div><div class='add'>+</div><div class='add'>+	/* Set up the HT phy flags */</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_HT_MSK)</div><div class='add'>+		rx_status.flag |= RX_FLAG_HT;</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_HT40_MSK)</div><div class='add'>+		rx_status.flag |= RX_FLAG_40MHZ;</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_SGI_MSK)</div><div class='add'>+		rx_status.flag |= RX_FLAG_SHORT_GI;</div><div class='add'>+</div><div class='add'>+	il4965_pass_packet_to_mac80211(il, header, len, ampdu_status, rxb,</div><div class='add'>+				       &amp;rx_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Cache phy data (Rx signal strength, etc) for HT frame (N_RX_PHY).</div><div class='add'>+ * This will be used later in il_hdl_rx() for N_RX_MPDU. */</div><div class='add'>+void</div><div class='add'>+il4965_hdl_rx_phy(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	il-&gt;_4965.last_phy_res_valid = true;</div><div class='add'>+	memcpy(&amp;il-&gt;_4965.last_phy_res, pkt-&gt;u.raw,</div><div class='add'>+	       sizeof(struct il_rx_phy_res));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il4965_get_channels_for_scan(struct il_priv *il, struct ieee80211_vif *vif,</div><div class='add'>+			     enum ieee80211_band band, u8 is_active,</div><div class='add'>+			     u8 n_probes, struct il_scan_channel *scan_ch)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_channel *chan;</div><div class='add'>+	const struct ieee80211_supported_band *sband;</div><div class='add'>+	const struct il_channel_info *ch_info;</div><div class='add'>+	u16 passive_dwell = 0;</div><div class='add'>+	u16 active_dwell = 0;</div><div class='add'>+	int added, i;</div><div class='add'>+	u16 channel;</div><div class='add'>+</div><div class='add'>+	sband = il_get_hw_mode(il, band);</div><div class='add'>+	if (!sband)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	active_dwell = il_get_active_dwell_time(il, band, n_probes);</div><div class='add'>+	passive_dwell = il_get_passive_dwell_time(il, band, vif);</div><div class='add'>+</div><div class='add'>+	if (passive_dwell &lt;= active_dwell)</div><div class='add'>+		passive_dwell = active_dwell + 1;</div><div class='add'>+</div><div class='add'>+	for (i = 0, added = 0; i &lt; il-&gt;scan_request-&gt;n_channels; i++) {</div><div class='add'>+		chan = il-&gt;scan_request-&gt;channels[i];</div><div class='add'>+</div><div class='add'>+		if (chan-&gt;band != band)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		channel = chan-&gt;hw_value;</div><div class='add'>+		scan_ch-&gt;channel = cpu_to_le16(channel);</div><div class='add'>+</div><div class='add'>+		ch_info = il_get_channel_info(il, band, channel);</div><div class='add'>+		if (!il_is_channel_valid(ch_info)) {</div><div class='add'>+			D_SCAN("Channel %d is INVALID for this band.\n",</div><div class='add'>+			       channel);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!is_active || il_is_channel_passive(ch_info) ||</div><div class='add'>+		    (chan-&gt;flags &amp; IEEE80211_CHAN_PASSIVE_SCAN))</div><div class='add'>+			scan_ch-&gt;type = SCAN_CHANNEL_TYPE_PASSIVE;</div><div class='add'>+		else</div><div class='add'>+			scan_ch-&gt;type = SCAN_CHANNEL_TYPE_ACTIVE;</div><div class='add'>+</div><div class='add'>+		if (n_probes)</div><div class='add'>+			scan_ch-&gt;type |= IL_SCAN_PROBE_MASK(n_probes);</div><div class='add'>+</div><div class='add'>+		scan_ch-&gt;active_dwell = cpu_to_le16(active_dwell);</div><div class='add'>+		scan_ch-&gt;passive_dwell = cpu_to_le16(passive_dwell);</div><div class='add'>+</div><div class='add'>+		/* Set txpower levels to defaults */</div><div class='add'>+		scan_ch-&gt;dsp_atten = 110;</div><div class='add'>+</div><div class='add'>+		/* NOTE: if we were doing 6Mb OFDM for scans we'd use</div><div class='add'>+		 * power level:</div><div class='add'>+		 * scan_ch-&gt;tx_gain = ((1 &lt;&lt; 5) | (2 &lt;&lt; 3)) | 3;</div><div class='add'>+		 */</div><div class='add'>+		if (band == IEEE80211_BAND_5GHZ)</div><div class='add'>+			scan_ch-&gt;tx_gain = ((1 &lt;&lt; 5) | (3 &lt;&lt; 3)) | 3;</div><div class='add'>+		else</div><div class='add'>+			scan_ch-&gt;tx_gain = ((1 &lt;&lt; 5) | (5 &lt;&lt; 3));</div><div class='add'>+</div><div class='add'>+		D_SCAN("Scanning ch=%d prob=0x%X [%s %d]\n", channel,</div><div class='add'>+		       le32_to_cpu(scan_ch-&gt;type),</div><div class='add'>+		       (scan_ch-&gt;</div><div class='add'>+			type &amp; SCAN_CHANNEL_TYPE_ACTIVE) ? "ACTIVE" : "PASSIVE",</div><div class='add'>+		       (scan_ch-&gt;</div><div class='add'>+			type &amp; SCAN_CHANNEL_TYPE_ACTIVE) ? active_dwell :</div><div class='add'>+		       passive_dwell);</div><div class='add'>+</div><div class='add'>+		scan_ch++;</div><div class='add'>+		added++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_SCAN("total channels to scan %d\n", added);</div><div class='add'>+	return added;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_toggle_tx_ant(struct il_priv *il, u8 *ant, u8 valid)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u8 ind = *ant;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RATE_ANT_NUM - 1; i++) {</div><div class='add'>+		ind = (ind + 1) &lt; RATE_ANT_NUM ? ind + 1 : 0;</div><div class='add'>+		if (valid &amp; BIT(ind)) {</div><div class='add'>+			*ant = ind;</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'>+int</div><div class='add'>+il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct il_host_cmd cmd = {</div><div class='add'>+		.id = C_SCAN,</div><div class='add'>+		.len = sizeof(struct il_scan_cmd),</div><div class='add'>+		.flags = CMD_SIZE_HUGE,</div><div class='add'>+	};</div><div class='add'>+	struct il_scan_cmd *scan;</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+	u32 rate_flags = 0;</div><div class='add'>+	u16 cmd_len;</div><div class='add'>+	u16 rx_chain = 0;</div><div class='add'>+	enum ieee80211_band band;</div><div class='add'>+	u8 n_probes = 0;</div><div class='add'>+	u8 rx_ant = il-&gt;hw_params.valid_rx_ant;</div><div class='add'>+	u8 rate;</div><div class='add'>+	bool is_active = false;</div><div class='add'>+	int chan_mod;</div><div class='add'>+	u8 active_chains;</div><div class='add'>+	u8 scan_tx_antennas = il-&gt;hw_params.valid_tx_ant;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	ctx = il_rxon_ctx_from_vif(vif);</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;scan_cmd) {</div><div class='add'>+		il-&gt;scan_cmd =</div><div class='add'>+		    kmalloc(sizeof(struct il_scan_cmd) + IL_MAX_SCAN_SIZE,</div><div class='add'>+			    GFP_KERNEL);</div><div class='add'>+		if (!il-&gt;scan_cmd) {</div><div class='add'>+			D_SCAN("fail to allocate memory for scan\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	scan = il-&gt;scan_cmd;</div><div class='add'>+	memset(scan, 0, sizeof(struct il_scan_cmd) + IL_MAX_SCAN_SIZE);</div><div class='add'>+</div><div class='add'>+	scan-&gt;quiet_plcp_th = IL_PLCP_QUIET_THRESH;</div><div class='add'>+	scan-&gt;quiet_time = IL_ACTIVE_QUIET_TIME;</div><div class='add'>+</div><div class='add'>+	if (il_is_any_associated(il)) {</div><div class='add'>+		u16 interval;</div><div class='add'>+		u32 extra;</div><div class='add'>+		u32 suspend_time = 100;</div><div class='add'>+		u32 scan_suspend_time = 100;</div><div class='add'>+</div><div class='add'>+		D_INFO("Scanning while associated...\n");</div><div class='add'>+		interval = vif-&gt;bss_conf.beacon_int;</div><div class='add'>+</div><div class='add'>+		scan-&gt;suspend_time = 0;</div><div class='add'>+		scan-&gt;max_out_time = cpu_to_le32(200 * 1024);</div><div class='add'>+		if (!interval)</div><div class='add'>+			interval = suspend_time;</div><div class='add'>+</div><div class='add'>+		extra = (suspend_time / interval) &lt;&lt; 22;</div><div class='add'>+		scan_suspend_time =</div><div class='add'>+		    (extra | ((suspend_time % interval) * 1024));</div><div class='add'>+		scan-&gt;suspend_time = cpu_to_le32(scan_suspend_time);</div><div class='add'>+		D_SCAN("suspend_time 0x%X beacon interval %d\n",</div><div class='add'>+		       scan_suspend_time, interval);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (il-&gt;scan_request-&gt;n_ssids) {</div><div class='add'>+		int i, p = 0;</div><div class='add'>+		D_SCAN("Kicking off active scan\n");</div><div class='add'>+		for (i = 0; i &lt; il-&gt;scan_request-&gt;n_ssids; i++) {</div><div class='add'>+			/* always does wildcard anyway */</div><div class='add'>+			if (!il-&gt;scan_request-&gt;ssids[i].ssid_len)</div><div class='add'>+				continue;</div><div class='add'>+			scan-&gt;direct_scan[p].id = WLAN_EID_SSID;</div><div class='add'>+			scan-&gt;direct_scan[p].len =</div><div class='add'>+			    il-&gt;scan_request-&gt;ssids[i].ssid_len;</div><div class='add'>+			memcpy(scan-&gt;direct_scan[p].ssid,</div><div class='add'>+			       il-&gt;scan_request-&gt;ssids[i].ssid,</div><div class='add'>+			       il-&gt;scan_request-&gt;ssids[i].ssid_len);</div><div class='add'>+			n_probes++;</div><div class='add'>+			p++;</div><div class='add'>+		}</div><div class='add'>+		is_active = true;</div><div class='add'>+	} else</div><div class='add'>+		D_SCAN("Start passive scan.\n");</div><div class='add'>+</div><div class='add'>+	scan-&gt;tx_cmd.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='add'>+	scan-&gt;tx_cmd.sta_id = ctx-&gt;bcast_sta_id;</div><div class='add'>+	scan-&gt;tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;</div><div class='add'>+</div><div class='add'>+	switch (il-&gt;scan_band) {</div><div class='add'>+	case IEEE80211_BAND_2GHZ:</div><div class='add'>+		scan-&gt;flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK;</div><div class='add'>+		chan_mod =</div><div class='add'>+		    le32_to_cpu(il-&gt;ctx.active.</div><div class='add'>+				flags &amp; RXON_FLG_CHANNEL_MODE_MSK) &gt;&gt;</div><div class='add'>+		    RXON_FLG_CHANNEL_MODE_POS;</div><div class='add'>+		if (chan_mod == CHANNEL_MODE_PURE_40) {</div><div class='add'>+			rate = RATE_6M_PLCP;</div><div class='add'>+		} else {</div><div class='add'>+			rate = RATE_1M_PLCP;</div><div class='add'>+			rate_flags = RATE_MCS_CCK_MSK;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_BAND_5GHZ:</div><div class='add'>+		rate = RATE_6M_PLCP;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		IL_WARN("Invalid scan band\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If active scanning is requested but a certain channel is</div><div class='add'>+	 * marked passive, we can do active scanning if we detect</div><div class='add'>+	 * transmissions.</div><div class='add'>+	 *</div><div class='add'>+	 * There is an issue with some firmware versions that triggers</div><div class='add'>+	 * a sysassert on a "good CRC threshold" of zero (== disabled),</div><div class='add'>+	 * on a radar channel even though this means that we should NOT</div><div class='add'>+	 * send probes.</div><div class='add'>+	 *</div><div class='add'>+	 * The "good CRC threshold" is the number of frames that we</div><div class='add'>+	 * need to receive during our dwell time on a channel before</div><div class='add'>+	 * sending out probes -- setting this to a huge value will</div><div class='add'>+	 * mean we never reach it, but at the same time work around</div><div class='add'>+	 * the aforementioned issue. Thus use IL_GOOD_CRC_TH_NEVER</div><div class='add'>+	 * here instead of IL_GOOD_CRC_TH_DISABLED.</div><div class='add'>+	 */</div><div class='add'>+	scan-&gt;good_CRC_th =</div><div class='add'>+	    is_active ? IL_GOOD_CRC_TH_DEFAULT : IL_GOOD_CRC_TH_NEVER;</div><div class='add'>+</div><div class='add'>+	band = il-&gt;scan_band;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;cfg-&gt;scan_rx_antennas[band])</div><div class='add'>+		rx_ant = il-&gt;cfg-&gt;scan_rx_antennas[band];</div><div class='add'>+</div><div class='add'>+	il4965_toggle_tx_ant(il, &amp;il-&gt;scan_tx_ant[band], scan_tx_antennas);</div><div class='add'>+	rate_flags |= BIT(il-&gt;scan_tx_ant[band]) &lt;&lt; RATE_MCS_ANT_POS;</div><div class='add'>+	scan-&gt;tx_cmd.rate_n_flags = cpu_to_le32(rate | rate_flags);</div><div class='add'>+</div><div class='add'>+	/* In power save mode use one chain, otherwise use all chains */</div><div class='add'>+	if (test_bit(S_POWER_PMI, &amp;il-&gt;status)) {</div><div class='add'>+		/* rx_ant has been set to all valid chains previously */</div><div class='add'>+		active_chains =</div><div class='add'>+		    rx_ant &amp; ((u8) (il-&gt;chain_noise_data.active_chains));</div><div class='add'>+		if (!active_chains)</div><div class='add'>+			active_chains = rx_ant;</div><div class='add'>+</div><div class='add'>+		D_SCAN("chain_noise_data.active_chains: %u\n",</div><div class='add'>+		       il-&gt;chain_noise_data.active_chains);</div><div class='add'>+</div><div class='add'>+		rx_ant = il4965_first_antenna(active_chains);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* MIMO is not used here, but value is required */</div><div class='add'>+	rx_chain |= il-&gt;hw_params.valid_rx_ant &lt;&lt; RXON_RX_CHAIN_VALID_POS;</div><div class='add'>+	rx_chain |= rx_ant &lt;&lt; RXON_RX_CHAIN_FORCE_MIMO_SEL_POS;</div><div class='add'>+	rx_chain |= rx_ant &lt;&lt; RXON_RX_CHAIN_FORCE_SEL_POS;</div><div class='add'>+	rx_chain |= 0x1 &lt;&lt; RXON_RX_CHAIN_DRIVER_FORCE_POS;</div><div class='add'>+	scan-&gt;rx_chain = cpu_to_le16(rx_chain);</div><div class='add'>+</div><div class='add'>+	cmd_len =</div><div class='add'>+	    il_fill_probe_req(il, (struct ieee80211_mgmt *)scan-&gt;data,</div><div class='add'>+			      vif-&gt;addr, il-&gt;scan_request-&gt;ie,</div><div class='add'>+			      il-&gt;scan_request-&gt;ie_len,</div><div class='add'>+			      IL_MAX_SCAN_SIZE - sizeof(*scan));</div><div class='add'>+	scan-&gt;tx_cmd.len = cpu_to_le16(cmd_len);</div><div class='add'>+</div><div class='add'>+	scan-&gt;filter_flags |=</div><div class='add'>+	    (RXON_FILTER_ACCEPT_GRP_MSK | RXON_FILTER_BCON_AWARE_MSK);</div><div class='add'>+</div><div class='add'>+	scan-&gt;channel_count =</div><div class='add'>+	    il4965_get_channels_for_scan(il, vif, band, is_active, n_probes,</div><div class='add'>+					 (void *)&amp;scan-&gt;data[cmd_len]);</div><div class='add'>+	if (scan-&gt;channel_count == 0) {</div><div class='add'>+		D_SCAN("channel count %d\n", scan-&gt;channel_count);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd.len +=</div><div class='add'>+	    le16_to_cpu(scan-&gt;tx_cmd.len) +</div><div class='add'>+	    scan-&gt;channel_count * sizeof(struct il_scan_channel);</div><div class='add'>+	cmd.data = scan;</div><div class='add'>+	scan-&gt;len = cpu_to_le16(cmd.len);</div><div class='add'>+</div><div class='add'>+	set_bit(S_SCAN_HW, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	ret = il_send_cmd_sync(il, &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		clear_bit(S_SCAN_HW, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_manage_ibss_station(struct il_priv *il, struct ieee80211_vif *vif,</div><div class='add'>+			   bool add)</div><div class='add'>+{</div><div class='add'>+	struct il_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	if (add)</div><div class='add'>+		return il4965_add_bssid_station(il, vif_priv-&gt;ctx,</div><div class='add'>+						vif-&gt;bss_conf.bssid,</div><div class='add'>+						&amp;vif_priv-&gt;ibss_bssid_sta_id);</div><div class='add'>+	return il_remove_station(il, vif_priv-&gt;ibss_bssid_sta_id,</div><div class='add'>+				 vif-&gt;bss_conf.bssid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_free_tfds_in_queue(struct il_priv *il, int sta_id, int tid, int freed)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;sta_lock);</div><div class='add'>+</div><div class='add'>+	if (il-&gt;stations[sta_id].tid[tid].tfds_in_queue &gt;= freed)</div><div class='add'>+		il-&gt;stations[sta_id].tid[tid].tfds_in_queue -= freed;</div><div class='add'>+	else {</div><div class='add'>+		D_TX("free more than tfds_in_queue (%u:%d)\n",</div><div class='add'>+		     il-&gt;stations[sta_id].tid[tid].tfds_in_queue, freed);</div><div class='add'>+		il-&gt;stations[sta_id].tid[tid].tfds_in_queue = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IL_TX_QUEUE_MSK	0xfffff</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+il4965_is_single_rx_stream(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	return il-&gt;current_ht_config.smps == IEEE80211_SMPS_STATIC ||</div><div class='add'>+	    il-&gt;current_ht_config.single_chain_sufficient;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IL_NUM_RX_CHAINS_MULTIPLE	3</div><div class='add'>+#define IL_NUM_RX_CHAINS_SINGLE	2</div><div class='add'>+#define IL_NUM_IDLE_CHAINS_DUAL	2</div><div class='add'>+#define IL_NUM_IDLE_CHAINS_SINGLE	1</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Determine how many receiver/antenna chains to use.</div><div class='add'>+ *</div><div class='add'>+ * More provides better reception via diversity.  Fewer saves power</div><div class='add'>+ * at the expense of throughput, but only when not in powersave to</div><div class='add'>+ * start with.</div><div class='add'>+ *</div><div class='add'>+ * MIMO (dual stream) requires at least 2, but works better with 3.</div><div class='add'>+ * This does not determine *which* chains to use, just how many.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_get_active_rx_chain_count(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	/* # of Rx chains to use when expecting MIMO. */</div><div class='add'>+	if (il4965_is_single_rx_stream(il))</div><div class='add'>+		return IL_NUM_RX_CHAINS_SINGLE;</div><div class='add'>+	else</div><div class='add'>+		return IL_NUM_RX_CHAINS_MULTIPLE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * When we are in power saving mode, unless device support spatial</div><div class='add'>+ * multiplexing power save, use the active count for rx chain count.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_get_idle_rx_chain_count(struct il_priv *il, int active_cnt)</div><div class='add'>+{</div><div class='add'>+	/* # Rx chains when idling, depending on SMPS mode */</div><div class='add'>+	switch (il-&gt;current_ht_config.smps) {</div><div class='add'>+	case IEEE80211_SMPS_STATIC:</div><div class='add'>+	case IEEE80211_SMPS_DYNAMIC:</div><div class='add'>+		return IL_NUM_IDLE_CHAINS_SINGLE;</div><div class='add'>+	case IEEE80211_SMPS_OFF:</div><div class='add'>+		return active_cnt;</div><div class='add'>+	default:</div><div class='add'>+		WARN(1, "invalid SMPS mode %d", il-&gt;current_ht_config.smps);</div><div class='add'>+		return active_cnt;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* up to 4 chains */</div><div class='add'>+static u8</div><div class='add'>+il4965_count_chain_bitmap(u32 chain_bitmap)</div><div class='add'>+{</div><div class='add'>+	u8 res;</div><div class='add'>+	res = (chain_bitmap &amp; BIT(0)) &gt;&gt; 0;</div><div class='add'>+	res += (chain_bitmap &amp; BIT(1)) &gt;&gt; 1;</div><div class='add'>+	res += (chain_bitmap &amp; BIT(2)) &gt;&gt; 2;</div><div class='add'>+	res += (chain_bitmap &amp; BIT(3)) &gt;&gt; 3;</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_set_rxon_chain - Set up Rx chain usage in "staging" RXON image</div><div class='add'>+ *</div><div class='add'>+ * Selects how many and which Rx receivers/antennas/chains to use.</div><div class='add'>+ * This should not be used for scan command ... it puts data in wrong place.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il4965_set_rxon_chain(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	bool is_single = il4965_is_single_rx_stream(il);</div><div class='add'>+	bool is_cam = !test_bit(S_POWER_PMI, &amp;il-&gt;status);</div><div class='add'>+	u8 idle_rx_cnt, active_rx_cnt, valid_rx_cnt;</div><div class='add'>+	u32 active_chains;</div><div class='add'>+	u16 rx_chain;</div><div class='add'>+</div><div class='add'>+	/* Tell uCode which antennas are actually connected.</div><div class='add'>+	 * Before first association, we assume all antennas are connected.</div><div class='add'>+	 * Just after first association, il4965_chain_noise_calibration()</div><div class='add'>+	 *    checks which antennas actually *are* connected. */</div><div class='add'>+	if (il-&gt;chain_noise_data.active_chains)</div><div class='add'>+		active_chains = il-&gt;chain_noise_data.active_chains;</div><div class='add'>+	else</div><div class='add'>+		active_chains = il-&gt;hw_params.valid_rx_ant;</div><div class='add'>+</div><div class='add'>+	rx_chain = active_chains &lt;&lt; RXON_RX_CHAIN_VALID_POS;</div><div class='add'>+</div><div class='add'>+	/* How many receivers should we use? */</div><div class='add'>+	active_rx_cnt = il4965_get_active_rx_chain_count(il);</div><div class='add'>+	idle_rx_cnt = il4965_get_idle_rx_chain_count(il, active_rx_cnt);</div><div class='add'>+</div><div class='add'>+	/* correct rx chain count according hw settings</div><div class='add'>+	 * and chain noise calibration</div><div class='add'>+	 */</div><div class='add'>+	valid_rx_cnt = il4965_count_chain_bitmap(active_chains);</div><div class='add'>+	if (valid_rx_cnt &lt; active_rx_cnt)</div><div class='add'>+		active_rx_cnt = valid_rx_cnt;</div><div class='add'>+</div><div class='add'>+	if (valid_rx_cnt &lt; idle_rx_cnt)</div><div class='add'>+		idle_rx_cnt = valid_rx_cnt;</div><div class='add'>+</div><div class='add'>+	rx_chain |= active_rx_cnt &lt;&lt; RXON_RX_CHAIN_MIMO_CNT_POS;</div><div class='add'>+	rx_chain |= idle_rx_cnt &lt;&lt; RXON_RX_CHAIN_CNT_POS;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;staging.rx_chain = cpu_to_le16(rx_chain);</div><div class='add'>+</div><div class='add'>+	if (!is_single &amp;&amp; active_rx_cnt &gt;= IL_NUM_RX_CHAINS_SINGLE &amp;&amp; is_cam)</div><div class='add'>+		ctx-&gt;staging.rx_chain |= RXON_RX_CHAIN_MIMO_FORCE_MSK;</div><div class='add'>+	else</div><div class='add'>+		ctx-&gt;staging.rx_chain &amp;= ~RXON_RX_CHAIN_MIMO_FORCE_MSK;</div><div class='add'>+</div><div class='add'>+	D_ASSOC("rx_chain=0x%X active=%d idle=%d\n", ctx-&gt;staging.rx_chain,</div><div class='add'>+		active_rx_cnt, idle_rx_cnt);</div><div class='add'>+</div><div class='add'>+	WARN_ON(active_rx_cnt == 0 || idle_rx_cnt == 0 ||</div><div class='add'>+		active_rx_cnt &lt; idle_rx_cnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *</div><div class='add'>+il4965_get_fh_string(int cmd)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+		IL_CMD(FH49_RSCSR_CHNL0_STTS_WPTR_REG);</div><div class='add'>+		IL_CMD(FH49_RSCSR_CHNL0_RBDCB_BASE_REG);</div><div class='add'>+		IL_CMD(FH49_RSCSR_CHNL0_WPTR);</div><div class='add'>+		IL_CMD(FH49_MEM_RCSR_CHNL0_CONFIG_REG);</div><div class='add'>+		IL_CMD(FH49_MEM_RSSR_SHARED_CTRL_REG);</div><div class='add'>+		IL_CMD(FH49_MEM_RSSR_RX_STATUS_REG);</div><div class='add'>+		IL_CMD(FH49_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV);</div><div class='add'>+		IL_CMD(FH49_TSSR_TX_STATUS_REG);</div><div class='add'>+		IL_CMD(FH49_TSSR_TX_ERROR_REG);</div><div class='add'>+	default:</div><div class='add'>+		return "UNKNOWN";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_dump_fh(struct il_priv *il, char **buf, bool display)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	int pos = 0;</div><div class='add'>+	size_t bufsz = 0;</div><div class='add'>+#endif</div><div class='add'>+	static const u32 fh_tbl[] = {</div><div class='add'>+		FH49_RSCSR_CHNL0_STTS_WPTR_REG,</div><div class='add'>+		FH49_RSCSR_CHNL0_RBDCB_BASE_REG,</div><div class='add'>+		FH49_RSCSR_CHNL0_WPTR,</div><div class='add'>+		FH49_MEM_RCSR_CHNL0_CONFIG_REG,</div><div class='add'>+		FH49_MEM_RSSR_SHARED_CTRL_REG,</div><div class='add'>+		FH49_MEM_RSSR_RX_STATUS_REG,</div><div class='add'>+		FH49_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV,</div><div class='add'>+		FH49_TSSR_TX_STATUS_REG,</div><div class='add'>+		FH49_TSSR_TX_ERROR_REG</div><div class='add'>+	};</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	if (display) {</div><div class='add'>+		bufsz = ARRAY_SIZE(fh_tbl) * 48 + 40;</div><div class='add'>+		*buf = kmalloc(bufsz, GFP_KERNEL);</div><div class='add'>+		if (!*buf)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(*buf + pos, bufsz - pos, "FH register values:\n");</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(fh_tbl); i++) {</div><div class='add'>+			pos +=</div><div class='add'>+			    scnprintf(*buf + pos, bufsz - pos,</div><div class='add'>+				      "  %34s: 0X%08x\n",</div><div class='add'>+				      il4965_get_fh_string(fh_tbl[i]),</div><div class='add'>+				      il_rd(il, fh_tbl[i]));</div><div class='add'>+		}</div><div class='add'>+		return pos;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	IL_ERR("FH register values:\n");</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(fh_tbl); i++) {</div><div class='add'>+		IL_ERR("  %34s: 0X%08x\n", il4965_get_fh_string(fh_tbl[i]),</div><div class='add'>+		       il_rd(il, fh_tbl[i]));</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_hdl_missed_beacon(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	struct il_missed_beacon_notif *missed_beacon;</div><div class='add'>+</div><div class='add'>+	missed_beacon = &amp;pkt-&gt;u.missed_beacon;</div><div class='add'>+	if (le32_to_cpu(missed_beacon-&gt;consecutive_missed_beacons) &gt;</div><div class='add'>+	    il-&gt;missed_beacon_threshold) {</div><div class='add'>+		D_CALIB("missed bcn cnsq %d totl %d rcd %d expctd %d\n",</div><div class='add'>+			le32_to_cpu(missed_beacon-&gt;consecutive_missed_beacons),</div><div class='add'>+			le32_to_cpu(missed_beacon-&gt;total_missed_becons),</div><div class='add'>+			le32_to_cpu(missed_beacon-&gt;num_recvd_beacons),</div><div class='add'>+			le32_to_cpu(missed_beacon-&gt;num_expected_beacons));</div><div class='add'>+		if (!test_bit(S_SCANNING, &amp;il-&gt;status))</div><div class='add'>+			il4965_init_sensitivity(il);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Calculate noise level, based on measurements during network silence just</div><div class='add'>+ *   before arriving beacon.  This measurement can be done only if we know</div><div class='add'>+ *   exactly when to expect beacons, therefore only when we're associated. */</div><div class='add'>+static void</div><div class='add'>+il4965_rx_calc_noise(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct stats_rx_non_phy *rx_info;</div><div class='add'>+	int num_active_rx = 0;</div><div class='add'>+	int total_silence = 0;</div><div class='add'>+	int bcn_silence_a, bcn_silence_b, bcn_silence_c;</div><div class='add'>+	int last_rx_noise;</div><div class='add'>+</div><div class='add'>+	rx_info = &amp;(il-&gt;_4965.stats.rx.general);</div><div class='add'>+	bcn_silence_a =</div><div class='add'>+	    le32_to_cpu(rx_info-&gt;beacon_silence_rssi_a) &amp; IN_BAND_FILTER;</div><div class='add'>+	bcn_silence_b =</div><div class='add'>+	    le32_to_cpu(rx_info-&gt;beacon_silence_rssi_b) &amp; IN_BAND_FILTER;</div><div class='add'>+	bcn_silence_c =</div><div class='add'>+	    le32_to_cpu(rx_info-&gt;beacon_silence_rssi_c) &amp; IN_BAND_FILTER;</div><div class='add'>+</div><div class='add'>+	if (bcn_silence_a) {</div><div class='add'>+		total_silence += bcn_silence_a;</div><div class='add'>+		num_active_rx++;</div><div class='add'>+	}</div><div class='add'>+	if (bcn_silence_b) {</div><div class='add'>+		total_silence += bcn_silence_b;</div><div class='add'>+		num_active_rx++;</div><div class='add'>+	}</div><div class='add'>+	if (bcn_silence_c) {</div><div class='add'>+		total_silence += bcn_silence_c;</div><div class='add'>+		num_active_rx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Average among active antennas */</div><div class='add'>+	if (num_active_rx)</div><div class='add'>+		last_rx_noise = (total_silence / num_active_rx) - 107;</div><div class='add'>+	else</div><div class='add'>+		last_rx_noise = IL_NOISE_MEAS_NOT_AVAILABLE;</div><div class='add'>+</div><div class='add'>+	D_CALIB("inband silence a %u, b %u, c %u, dBm %d\n", bcn_silence_a,</div><div class='add'>+		bcn_silence_b, bcn_silence_c, last_rx_noise);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+/*</div><div class='add'>+ *  based on the assumption of all stats counter are in DWORD</div><div class='add'>+ *  FIXME: This function is for debugging, do not deal with</div><div class='add'>+ *  the case of counters roll-over.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_accumulative_stats(struct il_priv *il, __le32 * stats)</div><div class='add'>+{</div><div class='add'>+	int i, size;</div><div class='add'>+	__le32 *prev_stats;</div><div class='add'>+	u32 *accum_stats;</div><div class='add'>+	u32 *delta, *max_delta;</div><div class='add'>+	struct stats_general_common *general, *accum_general;</div><div class='add'>+	struct stats_tx *tx, *accum_tx;</div><div class='add'>+</div><div class='add'>+	prev_stats = (__le32 *) &amp;il-&gt;_4965.stats;</div><div class='add'>+	accum_stats = (u32 *) &amp;il-&gt;_4965.accum_stats;</div><div class='add'>+	size = sizeof(struct il_notif_stats);</div><div class='add'>+	general = &amp;il-&gt;_4965.stats.general.common;</div><div class='add'>+	accum_general = &amp;il-&gt;_4965.accum_stats.general.common;</div><div class='add'>+	tx = &amp;il-&gt;_4965.stats.tx;</div><div class='add'>+	accum_tx = &amp;il-&gt;_4965.accum_stats.tx;</div><div class='add'>+	delta = (u32 *) &amp;il-&gt;_4965.delta_stats;</div><div class='add'>+	max_delta = (u32 *) &amp;il-&gt;_4965.max_delta;</div><div class='add'>+</div><div class='add'>+	for (i = sizeof(__le32); i &lt; size;</div><div class='add'>+	     i +=</div><div class='add'>+	     sizeof(__le32), stats++, prev_stats++, delta++, max_delta++,</div><div class='add'>+	     accum_stats++) {</div><div class='add'>+		if (le32_to_cpu(*stats) &gt; le32_to_cpu(*prev_stats)) {</div><div class='add'>+			*delta =</div><div class='add'>+			    (le32_to_cpu(*stats) - le32_to_cpu(*prev_stats));</div><div class='add'>+			*accum_stats += *delta;</div><div class='add'>+			if (*delta &gt; *max_delta)</div><div class='add'>+				*max_delta = *delta;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* reset accumulative stats for "no-counter" type stats */</div><div class='add'>+	accum_general-&gt;temperature = general-&gt;temperature;</div><div class='add'>+	accum_general-&gt;ttl_timestamp = general-&gt;ttl_timestamp;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define REG_RECALIB_PERIOD (60)</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_hdl_stats(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	int change;</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+</div><div class='add'>+	D_RX("Statistics notification received (%d vs %d).\n",</div><div class='add'>+	     (int)sizeof(struct il_notif_stats),</div><div class='add'>+	     le32_to_cpu(pkt-&gt;len_n_flags) &amp; IL_RX_FRAME_SIZE_MSK);</div><div class='add'>+</div><div class='add'>+	change =</div><div class='add'>+	    ((il-&gt;_4965.stats.general.common.temperature !=</div><div class='add'>+	      pkt-&gt;u.stats.general.common.temperature) ||</div><div class='add'>+	     ((il-&gt;_4965.stats.flag &amp; STATS_REPLY_FLG_HT40_MODE_MSK) !=</div><div class='add'>+	      (pkt-&gt;u.stats.flag &amp; STATS_REPLY_FLG_HT40_MODE_MSK)));</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+	il4965_accumulative_stats(il, (__le32 *) &amp;pkt-&gt;u.stats);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* TODO: reading some of stats is unneeded */</div><div class='add'>+	memcpy(&amp;il-&gt;_4965.stats, &amp;pkt-&gt;u.stats, sizeof(il-&gt;_4965.stats));</div><div class='add'>+</div><div class='add'>+	set_bit(S_STATS, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* Reschedule the stats timer to occur in</div><div class='add'>+	 * REG_RECALIB_PERIOD seconds to ensure we get a</div><div class='add'>+	 * thermal update even if the uCode doesn't give</div><div class='add'>+	 * us one */</div><div class='add'>+	mod_timer(&amp;il-&gt;stats_periodic,</div><div class='add'>+		  jiffies + msecs_to_jiffies(REG_RECALIB_PERIOD * 1000));</div><div class='add'>+</div><div class='add'>+	if (unlikely(!test_bit(S_SCANNING, &amp;il-&gt;status)) &amp;&amp;</div><div class='add'>+	    (pkt-&gt;hdr.cmd == N_STATS)) {</div><div class='add'>+		il4965_rx_calc_noise(il);</div><div class='add'>+		queue_work(il-&gt;workqueue, &amp;il-&gt;run_time_calib_work);</div><div class='add'>+	}</div><div class='add'>+	if (il-&gt;cfg-&gt;ops-&gt;lib-&gt;temp_ops.temperature &amp;&amp; change)</div><div class='add'>+		il-&gt;cfg-&gt;ops-&gt;lib-&gt;temp_ops.temperature(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_hdl_c_stats(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(pkt-&gt;u.stats.flag) &amp; UCODE_STATS_CLEAR_MSK) {</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+		memset(&amp;il-&gt;_4965.accum_stats, 0,</div><div class='add'>+		       sizeof(struct il_notif_stats));</div><div class='add'>+		memset(&amp;il-&gt;_4965.delta_stats, 0,</div><div class='add'>+		       sizeof(struct il_notif_stats));</div><div class='add'>+		memset(&amp;il-&gt;_4965.max_delta, 0, sizeof(struct il_notif_stats));</div><div class='add'>+#endif</div><div class='add'>+		D_RX("Statistics have been cleared\n");</div><div class='add'>+	}</div><div class='add'>+	il4965_hdl_stats(il, rxb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mac80211 queues, ACs, hardware queues, FIFOs.</div><div class='add'>+ *</div><div class='add'>+ * Cf. http://wireless.kernel.org/en/developers/Documentation/mac80211/queues</div><div class='add'>+ *</div><div class='add'>+ * Mac80211 uses the following numbers, which we get as from it</div><div class='add'>+ * by way of skb_get_queue_mapping(skb):</div><div class='add'>+ *</div><div class='add'>+ *     VO      0</div><div class='add'>+ *     VI      1</div><div class='add'>+ *     BE      2</div><div class='add'>+ *     BK      3</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * Regular (not A-MPDU) frames are put into hardware queues corresponding</div><div class='add'>+ * to the FIFOs, see comments in iwl-prph.h. Aggregated frames get their</div><div class='add'>+ * own queue per aggregation session (RA/TID combination), such queues are</div><div class='add'>+ * set up to map into FIFOs too, for which we need an AC-&gt;FIFO mapping. In</div><div class='add'>+ * order to map frames to the right queue, we also need an AC-&gt;hw queue</div><div class='add'>+ * mapping. This is implemented here.</div><div class='add'>+ *</div><div class='add'>+ * Due to the way hw queues are set up (by the hw specific modules like</div><div class='add'>+ * 4965.c), the AC-&gt;hw queue mapping is the identity</div><div class='add'>+ * mapping.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static const u8 tid_to_ac[] = {</div><div class='add'>+	IEEE80211_AC_BE,</div><div class='add'>+	IEEE80211_AC_BK,</div><div class='add'>+	IEEE80211_AC_BK,</div><div class='add'>+	IEEE80211_AC_BE,</div><div class='add'>+	IEEE80211_AC_VI,</div><div class='add'>+	IEEE80211_AC_VI,</div><div class='add'>+	IEEE80211_AC_VO,</div><div class='add'>+	IEEE80211_AC_VO</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il4965_get_ac_from_tid(u16 tid)</div><div class='add'>+{</div><div class='add'>+	if (likely(tid &lt; ARRAY_SIZE(tid_to_ac)))</div><div class='add'>+		return tid_to_ac[tid];</div><div class='add'>+</div><div class='add'>+	/* no support for TIDs 8-15 yet */</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il4965_get_fifo_from_tid(struct il_rxon_context *ctx, u16 tid)</div><div class='add'>+{</div><div class='add'>+	if (likely(tid &lt; ARRAY_SIZE(tid_to_ac)))</div><div class='add'>+		return ctx-&gt;ac_to_fifo[tid_to_ac[tid]];</div><div class='add'>+</div><div class='add'>+	/* no support for TIDs 8-15 yet */</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * handle build C_TX command notification.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_tx_cmd_build_basic(struct il_priv *il, struct sk_buff *skb,</div><div class='add'>+			  struct il_tx_cmd *tx_cmd,</div><div class='add'>+			  struct ieee80211_tx_info *info,</div><div class='add'>+			  struct ieee80211_hdr *hdr, u8 std_id)</div><div class='add'>+{</div><div class='add'>+	__le16 fc = hdr-&gt;frame_control;</div><div class='add'>+	__le32 tx_flags = tx_cmd-&gt;tx_flags;</div><div class='add'>+</div><div class='add'>+	tx_cmd-&gt;stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;</div><div class='add'>+	if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)) {</div><div class='add'>+		tx_flags |= TX_CMD_FLG_ACK_MSK;</div><div class='add'>+		if (ieee80211_is_mgmt(fc))</div><div class='add'>+			tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='add'>+		if (ieee80211_is_probe_resp(fc) &amp;&amp;</div><div class='add'>+		    !(le16_to_cpu(hdr-&gt;seq_ctrl) &amp; 0xf))</div><div class='add'>+			tx_flags |= TX_CMD_FLG_TSF_MSK;</div><div class='add'>+	} else {</div><div class='add'>+		tx_flags &amp;= (~TX_CMD_FLG_ACK_MSK);</div><div class='add'>+		tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_back_req(fc))</div><div class='add'>+		tx_flags |= TX_CMD_FLG_ACK_MSK | TX_CMD_FLG_IMM_BA_RSP_MASK;</div><div class='add'>+</div><div class='add'>+	tx_cmd-&gt;sta_id = std_id;</div><div class='add'>+	if (ieee80211_has_morefrags(fc))</div><div class='add'>+		tx_flags |= TX_CMD_FLG_MORE_FRAG_MSK;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_data_qos(fc)) {</div><div class='add'>+		u8 *qc = ieee80211_get_qos_ctl(hdr);</div><div class='add'>+		tx_cmd-&gt;tid_tspec = qc[0] &amp; 0xf;</div><div class='add'>+		tx_flags &amp;= ~TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='add'>+	} else {</div><div class='add'>+		tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il_tx_cmd_protection(il, info, fc, &amp;tx_flags);</div><div class='add'>+</div><div class='add'>+	tx_flags &amp;= ~(TX_CMD_FLG_ANT_SEL_MSK);</div><div class='add'>+	if (ieee80211_is_mgmt(fc)) {</div><div class='add'>+		if (ieee80211_is_assoc_req(fc) || ieee80211_is_reassoc_req(fc))</div><div class='add'>+			tx_cmd-&gt;timeout.pm_frame_timeout = cpu_to_le16(3);</div><div class='add'>+		else</div><div class='add'>+			tx_cmd-&gt;timeout.pm_frame_timeout = cpu_to_le16(2);</div><div class='add'>+	} else {</div><div class='add'>+		tx_cmd-&gt;timeout.pm_frame_timeout = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_cmd-&gt;driver_txop = 0;</div><div class='add'>+	tx_cmd-&gt;tx_flags = tx_flags;</div><div class='add'>+	tx_cmd-&gt;next_frame_len = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_tx_cmd_build_rate(struct il_priv *il, struct il_tx_cmd *tx_cmd,</div><div class='add'>+			 struct ieee80211_tx_info *info, __le16 fc)</div><div class='add'>+{</div><div class='add'>+	const u8 rts_retry_limit = 60;</div><div class='add'>+	u32 rate_flags;</div><div class='add'>+	int rate_idx;</div><div class='add'>+	u8 data_retry_limit;</div><div class='add'>+	u8 rate_plcp;</div><div class='add'>+</div><div class='add'>+	/* Set retry limit on DATA packets and Probe Responses */</div><div class='add'>+	if (ieee80211_is_probe_resp(fc))</div><div class='add'>+		data_retry_limit = 3;</div><div class='add'>+	else</div><div class='add'>+		data_retry_limit = IL4965_DEFAULT_TX_RETRY;</div><div class='add'>+	tx_cmd-&gt;data_retry_limit = data_retry_limit;</div><div class='add'>+	/* Set retry limit on RTS packets */</div><div class='add'>+	tx_cmd-&gt;rts_retry_limit = min(data_retry_limit, rts_retry_limit);</div><div class='add'>+</div><div class='add'>+	/* DATA packets will use the uCode station table for rate/antenna</div><div class='add'>+	 * selection */</div><div class='add'>+	if (ieee80211_is_data(fc)) {</div><div class='add'>+		tx_cmd-&gt;initial_rate_idx = 0;</div><div class='add'>+		tx_cmd-&gt;tx_flags |= TX_CMD_FLG_STA_RATE_MSK;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * If the current TX rate stored in mac80211 has the MCS bit set, it's</div><div class='add'>+	 * not really a TX rate.  Thus, we use the lowest supported rate for</div><div class='add'>+	 * this band.  Also use the lowest supported rate if the stored rate</div><div class='add'>+	 * idx is invalid.</div><div class='add'>+	 */</div><div class='add'>+	rate_idx = info-&gt;control.rates[0].idx;</div><div class='add'>+	if ((info-&gt;control.rates[0].flags &amp; IEEE80211_TX_RC_MCS) || rate_idx &lt; 0</div><div class='add'>+	    || rate_idx &gt; RATE_COUNT_LEGACY)</div><div class='add'>+		rate_idx =</div><div class='add'>+		    rate_lowest_index(&amp;il-&gt;bands[info-&gt;band],</div><div class='add'>+				      info-&gt;control.sta);</div><div class='add'>+	/* For 5 GHZ band, remap mac80211 rate indices into driver indices */</div><div class='add'>+	if (info-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='add'>+		rate_idx += IL_FIRST_OFDM_RATE;</div><div class='add'>+	/* Get PLCP rate for tx_cmd-&gt;rate_n_flags */</div><div class='add'>+	rate_plcp = il_rates[rate_idx].plcp;</div><div class='add'>+	/* Zero out flags for this packet */</div><div class='add'>+	rate_flags = 0;</div><div class='add'>+</div><div class='add'>+	/* Set CCK flag as needed */</div><div class='add'>+	if (rate_idx &gt;= IL_FIRST_CCK_RATE &amp;&amp; rate_idx &lt;= IL_LAST_CCK_RATE)</div><div class='add'>+		rate_flags |= RATE_MCS_CCK_MSK;</div><div class='add'>+</div><div class='add'>+	/* Set up antennas */</div><div class='add'>+	il4965_toggle_tx_ant(il, &amp;il-&gt;mgmt_tx_ant, il-&gt;hw_params.valid_tx_ant);</div><div class='add'>+	rate_flags |= BIT(il-&gt;mgmt_tx_ant) &lt;&lt; RATE_MCS_ANT_POS;</div><div class='add'>+</div><div class='add'>+	/* Set the rate in the TX cmd */</div><div class='add'>+	tx_cmd-&gt;rate_n_flags = cpu_to_le32(rate_plcp | rate_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_tx_cmd_build_hwcrypto(struct il_priv *il, struct ieee80211_tx_info *info,</div><div class='add'>+			     struct il_tx_cmd *tx_cmd, struct sk_buff *skb_frag,</div><div class='add'>+			     int sta_id)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_key_conf *keyconf = info-&gt;control.hw_key;</div><div class='add'>+</div><div class='add'>+	switch (keyconf-&gt;cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		tx_cmd-&gt;sec_ctl = TX_CMD_SEC_CCM;</div><div class='add'>+		memcpy(tx_cmd-&gt;key, keyconf-&gt;key, keyconf-&gt;keylen);</div><div class='add'>+		if (info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU)</div><div class='add'>+			tx_cmd-&gt;tx_flags |= TX_CMD_FLG_AGG_CCMP_MSK;</div><div class='add'>+		D_TX("tx_cmd with AES hwcrypto\n");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		tx_cmd-&gt;sec_ctl = TX_CMD_SEC_TKIP;</div><div class='add'>+		ieee80211_get_tkip_p2k(keyconf, skb_frag, tx_cmd-&gt;key);</div><div class='add'>+		D_TX("tx_cmd with tkip hwcrypto\n");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP104:</div><div class='add'>+		tx_cmd-&gt;sec_ctl |= TX_CMD_SEC_KEY128;</div><div class='add'>+		/* fall through */</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP40:</div><div class='add'>+		tx_cmd-&gt;sec_ctl |=</div><div class='add'>+		    (TX_CMD_SEC_WEP | (keyconf-&gt;keyidx &amp; TX_CMD_SEC_MSK) &lt;&lt;</div><div class='add'>+		     TX_CMD_SEC_SHIFT);</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;tx_cmd-&gt;key[3], keyconf-&gt;key, keyconf-&gt;keylen);</div><div class='add'>+</div><div class='add'>+		D_TX("Configuring packet for WEP encryption " "with key %d\n",</div><div class='add'>+		     keyconf-&gt;keyidx);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		IL_ERR("Unknown encode cipher %x\n", keyconf-&gt;cipher);</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'>+ * start C_TX command process</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il4965_tx_skb(struct il_priv *il, 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'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct ieee80211_sta *sta = info-&gt;control.sta;</div><div class='add'>+	struct il_station_priv *sta_priv = NULL;</div><div class='add'>+	struct il_tx_queue *txq;</div><div class='add'>+	struct il_queue *q;</div><div class='add'>+	struct il_device_cmd *out_cmd;</div><div class='add'>+	struct il_cmd_meta *out_meta;</div><div class='add'>+	struct il_tx_cmd *tx_cmd;</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+	int txq_id;</div><div class='add'>+	dma_addr_t phys_addr;</div><div class='add'>+	dma_addr_t txcmd_phys;</div><div class='add'>+	dma_addr_t scratch_phys;</div><div class='add'>+	u16 len, firstlen, secondlen;</div><div class='add'>+	u16 seq_number = 0;</div><div class='add'>+	__le16 fc;</div><div class='add'>+	u8 hdr_len;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	u8 wait_write_ptr = 0;</div><div class='add'>+	u8 tid = 0;</div><div class='add'>+	u8 *qc = NULL;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	bool is_agg = false;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;control.vif)</div><div class='add'>+		ctx = il_rxon_ctx_from_vif(info-&gt;control.vif);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+	if (il_is_rfkill(il)) {</div><div class='add'>+		D_DROP("Dropping - RF KILL\n");</div><div class='add'>+		goto drop_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fc = hdr-&gt;frame_control;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	if (ieee80211_is_auth(fc))</div><div class='add'>+		D_TX("Sending AUTH frame\n");</div><div class='add'>+	else if (ieee80211_is_assoc_req(fc))</div><div class='add'>+		D_TX("Sending ASSOC frame\n");</div><div class='add'>+	else if (ieee80211_is_reassoc_req(fc))</div><div class='add'>+		D_TX("Sending REASSOC frame\n");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	hdr_len = ieee80211_hdrlen(fc);</div><div class='add'>+</div><div class='add'>+	/* For management frames use broadcast id to do not break aggregation */</div><div class='add'>+	if (!ieee80211_is_data(fc))</div><div class='add'>+		sta_id = ctx-&gt;bcast_sta_id;</div><div class='add'>+	else {</div><div class='add'>+		/* Find idx into station table for destination station */</div><div class='add'>+		sta_id = il_sta_id_or_broadcast(il, ctx, info-&gt;control.sta);</div><div class='add'>+</div><div class='add'>+		if (sta_id == IL_INVALID_STATION) {</div><div class='add'>+			D_DROP("Dropping - INVALID STATION: %pM\n", hdr-&gt;addr1);</div><div class='add'>+			goto drop_unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_TX("station Id %d\n", sta_id);</div><div class='add'>+</div><div class='add'>+	if (sta)</div><div class='add'>+		sta_priv = (void *)sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	if (sta_priv &amp;&amp; sta_priv-&gt;asleep &amp;&amp;</div><div class='add'>+	    (info-&gt;flags &amp; IEEE80211_TX_CTL_POLL_RESPONSE)) {</div><div class='add'>+		/*</div><div class='add'>+		 * This sends an asynchronous command to the device,</div><div class='add'>+		 * but we can rely on it being processed before the</div><div class='add'>+		 * next frame is processed -- and the next frame to</div><div class='add'>+		 * this station is the one that will consume this</div><div class='add'>+		 * counter.</div><div class='add'>+		 * For now set the counter to just 1 since we do not</div><div class='add'>+		 * support uAPSD yet.</div><div class='add'>+		 */</div><div class='add'>+		il4965_sta_modify_sleep_tx_count(il, sta_id, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Send this frame after DTIM -- there's a special queue</div><div class='add'>+	 * reserved for this for contexts that support AP mode.</div><div class='add'>+	 */</div><div class='add'>+	if (info-&gt;flags &amp; IEEE80211_TX_CTL_SEND_AFTER_DTIM) {</div><div class='add'>+		txq_id = ctx-&gt;mcast_queue;</div><div class='add'>+		/*</div><div class='add'>+		 * The microcode will clear the more data</div><div class='add'>+		 * bit in the last frame it transmits.</div><div class='add'>+		 */</div><div class='add'>+		hdr-&gt;frame_control |= cpu_to_le16(IEEE80211_FCTL_MOREDATA);</div><div class='add'>+	} else</div><div class='add'>+		txq_id = ctx-&gt;ac_to_queue[skb_get_queue_mapping(skb)];</div><div class='add'>+</div><div class='add'>+	/* irqs already disabled/saved above when locking il-&gt;lock */</div><div class='add'>+	spin_lock(&amp;il-&gt;sta_lock);</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_data_qos(fc)) {</div><div class='add'>+		qc = ieee80211_get_qos_ctl(hdr);</div><div class='add'>+		tid = qc[0] &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+		if (WARN_ON_ONCE(tid &gt;= MAX_TID_COUNT)) {</div><div class='add'>+			spin_unlock(&amp;il-&gt;sta_lock);</div><div class='add'>+			goto drop_unlock;</div><div class='add'>+		}</div><div class='add'>+		seq_number = il-&gt;stations[sta_id].tid[tid].seq_number;</div><div class='add'>+		seq_number &amp;= IEEE80211_SCTL_SEQ;</div><div class='add'>+		hdr-&gt;seq_ctrl =</div><div class='add'>+		    hdr-&gt;seq_ctrl &amp; cpu_to_le16(IEEE80211_SCTL_FRAG);</div><div class='add'>+		hdr-&gt;seq_ctrl |= cpu_to_le16(seq_number);</div><div class='add'>+		seq_number += 0x10;</div><div class='add'>+		/* aggregation is on for this &lt;sta,tid&gt; */</div><div class='add'>+		if (info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU &amp;&amp;</div><div class='add'>+		    il-&gt;stations[sta_id].tid[tid].agg.state == IL_AGG_ON) {</div><div class='add'>+			txq_id = il-&gt;stations[sta_id].tid[tid].agg.txq_id;</div><div class='add'>+			is_agg = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	txq = &amp;il-&gt;txq[txq_id];</div><div class='add'>+	q = &amp;txq-&gt;q;</div><div class='add'>+</div><div class='add'>+	if (unlikely(il_queue_space(q) &lt; q-&gt;high_mark)) {</div><div class='add'>+		spin_unlock(&amp;il-&gt;sta_lock);</div><div class='add'>+		goto drop_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_data_qos(fc)) {</div><div class='add'>+		il-&gt;stations[sta_id].tid[tid].tfds_in_queue++;</div><div class='add'>+		if (!ieee80211_has_morefrags(fc))</div><div class='add'>+			il-&gt;stations[sta_id].tid[tid].seq_number = seq_number;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;il-&gt;sta_lock);</div><div class='add'>+</div><div class='add'>+	/* Set up driver data for this TFD */</div><div class='add'>+	memset(&amp;(txq-&gt;txb[q-&gt;write_ptr]), 0, sizeof(struct il_tx_info));</div><div class='add'>+	txq-&gt;txb[q-&gt;write_ptr].skb = skb;</div><div class='add'>+	txq-&gt;txb[q-&gt;write_ptr].ctx = ctx;</div><div class='add'>+</div><div class='add'>+	/* Set up first empty entry in queue's array of Tx/cmd buffers */</div><div class='add'>+	out_cmd = txq-&gt;cmd[q-&gt;write_ptr];</div><div class='add'>+	out_meta = &amp;txq-&gt;meta[q-&gt;write_ptr];</div><div class='add'>+	tx_cmd = &amp;out_cmd-&gt;cmd.tx;</div><div class='add'>+	memset(&amp;out_cmd-&gt;hdr, 0, sizeof(out_cmd-&gt;hdr));</div><div class='add'>+	memset(tx_cmd, 0, sizeof(struct il_tx_cmd));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set up the Tx-command (not MAC!) header.</div><div class='add'>+	 * Store the chosen Tx queue and TFD idx within the sequence field;</div><div class='add'>+	 * after Tx, uCode's Tx response will return this value so driver can</div><div class='add'>+	 * locate the frame within the tx queue and do post-tx processing.</div><div class='add'>+	 */</div><div class='add'>+	out_cmd-&gt;hdr.cmd = C_TX;</div><div class='add'>+	out_cmd-&gt;hdr.sequence =</div><div class='add'>+	    cpu_to_le16((u16)</div><div class='add'>+			(QUEUE_TO_SEQ(txq_id) | IDX_TO_SEQ(q-&gt;write_ptr)));</div><div class='add'>+</div><div class='add'>+	/* Copy MAC header from skb into command buffer */</div><div class='add'>+	memcpy(tx_cmd-&gt;hdr, hdr, hdr_len);</div><div class='add'>+</div><div class='add'>+	/* Total # bytes to be transmitted */</div><div class='add'>+	len = (u16) skb-&gt;len;</div><div class='add'>+	tx_cmd-&gt;len = cpu_to_le16(len);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;control.hw_key)</div><div class='add'>+		il4965_tx_cmd_build_hwcrypto(il, info, tx_cmd, skb, sta_id);</div><div class='add'>+</div><div class='add'>+	/* TODO need this for burst mode later on */</div><div class='add'>+	il4965_tx_cmd_build_basic(il, skb, tx_cmd, info, hdr, sta_id);</div><div class='add'>+	il_dbg_log_tx_data_frame(il, len, hdr);</div><div class='add'>+</div><div class='add'>+	il4965_tx_cmd_build_rate(il, tx_cmd, info, fc);</div><div class='add'>+</div><div class='add'>+	il_update_stats(il, true, fc, len);</div><div class='add'>+	/*</div><div class='add'>+	 * Use the first empty entry in this queue's command buffer array</div><div class='add'>+	 * to contain the Tx command and MAC header concatenated together</div><div class='add'>+	 * (payload data will be in another buffer).</div><div class='add'>+	 * Size of this varies, due to varying MAC header length.</div><div class='add'>+	 * If end is not dword aligned, we'll have 2 extra bytes at the end</div><div class='add'>+	 * of the MAC header (device reads on dword boundaries).</div><div class='add'>+	 * We'll tell device about this padding later.</div><div class='add'>+	 */</div><div class='add'>+	len = sizeof(struct il_tx_cmd) + sizeof(struct il_cmd_header) + hdr_len;</div><div class='add'>+	firstlen = (len + 3) &amp; ~3;</div><div class='add'>+</div><div class='add'>+	/* Tell NIC about any 2-byte padding after MAC header */</div><div class='add'>+	if (firstlen != len)</div><div class='add'>+		tx_cmd-&gt;tx_flags |= TX_CMD_FLG_MH_PAD_MSK;</div><div class='add'>+</div><div class='add'>+	/* Physical address of this Tx command's header (not MAC header!),</div><div class='add'>+	 * within command buffer array. */</div><div class='add'>+	txcmd_phys =</div><div class='add'>+	    pci_map_single(il-&gt;pci_dev, &amp;out_cmd-&gt;hdr, firstlen,</div><div class='add'>+			   PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+	dma_unmap_addr_set(out_meta, mapping, txcmd_phys);</div><div class='add'>+	dma_unmap_len_set(out_meta, len, firstlen);</div><div class='add'>+	/* Add buffer containing Tx command and MAC(!) header to TFD's</div><div class='add'>+	 * first entry */</div><div class='add'>+	il-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_attach_buf_to_tfd(il, txq, txcmd_phys, firstlen,</div><div class='add'>+						 1, 0);</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_has_morefrags(hdr-&gt;frame_control)) {</div><div class='add'>+		txq-&gt;need_update = 1;</div><div class='add'>+	} else {</div><div class='add'>+		wait_write_ptr = 1;</div><div class='add'>+		txq-&gt;need_update = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set up TFD's 2nd entry to point directly to remainder of skb,</div><div class='add'>+	 * if any (802.11 null frames have no payload). */</div><div class='add'>+	secondlen = skb-&gt;len - hdr_len;</div><div class='add'>+	if (secondlen &gt; 0) {</div><div class='add'>+		phys_addr =</div><div class='add'>+		    pci_map_single(il-&gt;pci_dev, skb-&gt;data + hdr_len, secondlen,</div><div class='add'>+				   PCI_DMA_TODEVICE);</div><div class='add'>+		il-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_attach_buf_to_tfd(il, txq, phys_addr,</div><div class='add'>+							 secondlen, 0, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scratch_phys =</div><div class='add'>+	    txcmd_phys + sizeof(struct il_cmd_header) +</div><div class='add'>+	    offsetof(struct il_tx_cmd, scratch);</div><div class='add'>+</div><div class='add'>+	/* take back ownership of DMA buffer to enable update */</div><div class='add'>+	pci_dma_sync_single_for_cpu(il-&gt;pci_dev, txcmd_phys, firstlen,</div><div class='add'>+				    PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+	tx_cmd-&gt;dram_lsb_ptr = cpu_to_le32(scratch_phys);</div><div class='add'>+	tx_cmd-&gt;dram_msb_ptr = il_get_dma_hi_addr(scratch_phys);</div><div class='add'>+</div><div class='add'>+	D_TX("sequence nr = 0X%x\n", le16_to_cpu(out_cmd-&gt;hdr.sequence));</div><div class='add'>+	D_TX("tx_flags = 0X%x\n", le32_to_cpu(tx_cmd-&gt;tx_flags));</div><div class='add'>+	il_print_hex_dump(il, IL_DL_TX, (u8 *) tx_cmd, sizeof(*tx_cmd));</div><div class='add'>+	il_print_hex_dump(il, IL_DL_TX, (u8 *) tx_cmd-&gt;hdr, hdr_len);</div><div class='add'>+</div><div class='add'>+	/* Set up entry for this TFD in Tx byte-count array */</div><div class='add'>+	if (info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU)</div><div class='add'>+		il-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_update_byte_cnt_tbl(il, txq,</div><div class='add'>+							   le16_to_cpu(tx_cmd-&gt;</div><div class='add'>+								       len));</div><div class='add'>+</div><div class='add'>+	pci_dma_sync_single_for_device(il-&gt;pci_dev, txcmd_phys, firstlen,</div><div class='add'>+				       PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+</div><div class='add'>+	/* Tell device the write idx *just past* this latest filled TFD */</div><div class='add'>+	q-&gt;write_ptr = il_queue_inc_wrap(q-&gt;write_ptr, q-&gt;n_bd);</div><div class='add'>+	il_txq_update_write_ptr(il, txq);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * At this point the frame is "transmitted" successfully</div><div class='add'>+	 * and we will get a TX status notification eventually,</div><div class='add'>+	 * regardless of the value of ret. "ret" only indicates</div><div class='add'>+	 * whether or not we should update the write pointer.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Avoid atomic ops if it isn't an associated client.</div><div class='add'>+	 * Also, if this is a packet for aggregation, don't</div><div class='add'>+	 * increase the counter because the ucode will stop</div><div class='add'>+	 * aggregation queues when their respective station</div><div class='add'>+	 * goes to sleep.</div><div class='add'>+	 */</div><div class='add'>+	if (sta_priv &amp;&amp; sta_priv-&gt;client &amp;&amp; !is_agg)</div><div class='add'>+		atomic_inc(&amp;sta_priv-&gt;pending_frames);</div><div class='add'>+</div><div class='add'>+	if (il_queue_space(q) &lt; q-&gt;high_mark &amp;&amp; il-&gt;mac80211_registered) {</div><div class='add'>+		if (wait_write_ptr) {</div><div class='add'>+			spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+			txq-&gt;need_update = 1;</div><div class='add'>+			il_txq_update_write_ptr(il, txq);</div><div class='add'>+			spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+		} else {</div><div class='add'>+			il_stop_queue(il, txq);</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'>+drop_unlock:</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il4965_alloc_dma_ptr(struct il_priv *il, struct il_dma_ptr *ptr, size_t size)</div><div class='add'>+{</div><div class='add'>+	ptr-&gt;addr =</div><div class='add'>+	    dma_alloc_coherent(&amp;il-&gt;pci_dev-&gt;dev, size, &amp;ptr-&gt;dma, GFP_KERNEL);</div><div class='add'>+	if (!ptr-&gt;addr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	ptr-&gt;size = size;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il4965_free_dma_ptr(struct il_priv *il, struct il_dma_ptr *ptr)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(!ptr-&gt;addr))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dma_free_coherent(&amp;il-&gt;pci_dev-&gt;dev, ptr-&gt;size, ptr-&gt;addr, ptr-&gt;dma);</div><div class='add'>+	memset(ptr, 0, sizeof(*ptr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_hw_txq_ctx_free - Free TXQ Context</div><div class='add'>+ *</div><div class='add'>+ * Destroy all TX DMA queues and structures</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il4965_hw_txq_ctx_free(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int txq_id;</div><div class='add'>+</div><div class='add'>+	/* Tx queues */</div><div class='add'>+	if (il-&gt;txq) {</div><div class='add'>+		for (txq_id = 0; txq_id &lt; il-&gt;hw_params.max_txq_num; txq_id++)</div><div class='add'>+			if (txq_id == il-&gt;cmd_queue)</div><div class='add'>+				il_cmd_queue_free(il);</div><div class='add'>+			else</div><div class='add'>+				il_tx_queue_free(il, txq_id);</div><div class='add'>+	}</div><div class='add'>+	il4965_free_dma_ptr(il, &amp;il-&gt;kw);</div><div class='add'>+</div><div class='add'>+	il4965_free_dma_ptr(il, &amp;il-&gt;scd_bc_tbls);</div><div class='add'>+</div><div class='add'>+	/* free tx queue structure */</div><div class='add'>+	il_txq_mem(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_txq_ctx_alloc - allocate TX queue context</div><div class='add'>+ * Allocate all Tx DMA structures and initialize them</div><div class='add'>+ *</div><div class='add'>+ * @param il</div><div class='add'>+ * @return error code</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il4965_txq_ctx_alloc(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	int txq_id, slots_num;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* Free all tx/cmd queues and keep-warm buffer */</div><div class='add'>+	il4965_hw_txq_ctx_free(il);</div><div class='add'>+</div><div class='add'>+	ret =</div><div class='add'>+	    il4965_alloc_dma_ptr(il, &amp;il-&gt;scd_bc_tbls,</div><div class='add'>+				 il-&gt;hw_params.scd_bc_tbls_size);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IL_ERR("Scheduler BC Table allocation failed\n");</div><div class='add'>+		goto error_bc_tbls;</div><div class='add'>+	}</div><div class='add'>+	/* Alloc keep-warm buffer */</div><div class='add'>+	ret = il4965_alloc_dma_ptr(il, &amp;il-&gt;kw, IL_KW_SIZE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IL_ERR("Keep Warm allocation failed\n");</div><div class='add'>+		goto error_kw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* allocate tx queue structure */</div><div class='add'>+	ret = il_alloc_txq_mem(il);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Turn off all Tx DMA fifos */</div><div class='add'>+	il4965_txq_set_sched(il, 0);</div><div class='add'>+</div><div class='add'>+	/* Tell NIC where to find the "keep warm" buffer */</div><div class='add'>+	il_wr(il, FH49_KW_MEM_ADDR_REG, il-&gt;kw.dma &gt;&gt; 4);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Alloc and init all Tx queues, including the command queue (#4/#9) */</div><div class='add'>+	for (txq_id = 0; txq_id &lt; il-&gt;hw_params.max_txq_num; txq_id++) {</div><div class='add'>+		slots_num =</div><div class='add'>+		    (txq_id ==</div><div class='add'>+		     il-&gt;cmd_queue) ? TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;</div><div class='add'>+		ret = il_tx_queue_init(il, &amp;il-&gt;txq[txq_id], slots_num, txq_id);</div><div class='add'>+		if (ret) {</div><div class='add'>+			IL_ERR("Tx %d queue init failed\n", txq_id);</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	il4965_hw_txq_ctx_free(il);</div><div class='add'>+	il4965_free_dma_ptr(il, &amp;il-&gt;kw);</div><div class='add'>+error_kw:</div><div class='add'>+	il4965_free_dma_ptr(il, &amp;il-&gt;scd_bc_tbls);</div><div class='add'>+error_bc_tbls:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_txq_ctx_reset(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int txq_id, slots_num;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Turn off all Tx DMA fifos */</div><div class='add'>+	il4965_txq_set_sched(il, 0);</div><div class='add'>+</div><div class='add'>+	/* Tell NIC where to find the "keep warm" buffer */</div><div class='add'>+	il_wr(il, FH49_KW_MEM_ADDR_REG, il-&gt;kw.dma &gt;&gt; 4);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Alloc and init all Tx queues, including the command queue (#4) */</div><div class='add'>+	for (txq_id = 0; txq_id &lt; il-&gt;hw_params.max_txq_num; txq_id++) {</div><div class='add'>+		slots_num =</div><div class='add'>+		    txq_id == il-&gt;cmd_queue ? TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;</div><div class='add'>+		il_tx_queue_reset(il, &amp;il-&gt;txq[txq_id], slots_num, txq_id);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_txq_ctx_stop - Stop all Tx DMA channels</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il4965_txq_ctx_stop(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int ch, txq_id;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* Turn off all Tx DMA fifos */</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	il4965_txq_set_sched(il, 0);</div><div class='add'>+</div><div class='add'>+	/* Stop each Tx DMA channel, and wait for it to be idle */</div><div class='add'>+	for (ch = 0; ch &lt; il-&gt;hw_params.dma_chnl_num; ch++) {</div><div class='add'>+		il_wr(il, FH49_TCSR_CHNL_TX_CONFIG_REG(ch), 0x0);</div><div class='add'>+		if (il_poll_bit</div><div class='add'>+		    (il, FH49_TSSR_TX_STATUS_REG,</div><div class='add'>+		     FH49_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(ch), 1000))</div><div class='add'>+			IL_ERR("Failing on timeout while stopping"</div><div class='add'>+			       " DMA channel %d [0x%08x]", ch,</div><div class='add'>+			       il_rd(il, FH49_TSSR_TX_STATUS_REG));</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;txq)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Unmap DMA from host system and free skb's */</div><div class='add'>+	for (txq_id = 0; txq_id &lt; il-&gt;hw_params.max_txq_num; txq_id++)</div><div class='add'>+		if (txq_id == il-&gt;cmd_queue)</div><div class='add'>+			il_cmd_queue_unmap(il);</div><div class='add'>+		else</div><div class='add'>+			il_tx_queue_unmap(il, txq_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Find first available (lowest unused) Tx Queue, mark it "active".</div><div class='add'>+ * Called only when finding queue for aggregation.</div><div class='add'>+ * Should never return anything &lt; 7, because they should already</div><div class='add'>+ * be in use as EDCA AC (0-3), Command (4), reserved (5, 6)</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_txq_ctx_activate_free(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int txq_id;</div><div class='add'>+</div><div class='add'>+	for (txq_id = 0; txq_id &lt; il-&gt;hw_params.max_txq_num; txq_id++)</div><div class='add'>+		if (!test_and_set_bit(txq_id, &amp;il-&gt;txq_ctx_active_msk))</div><div class='add'>+			return txq_id;</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_tx_queue_stop_scheduler - Stop queue, but keep configuration</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_tx_queue_stop_scheduler(struct il_priv *il, u16 txq_id)</div><div class='add'>+{</div><div class='add'>+	/* Simply stop the queue, but don't change any configuration;</div><div class='add'>+	 * the SCD_ACT_EN bit is the write-enable mask for the ACTIVE bit. */</div><div class='add'>+	il_wr_prph(il, IL49_SCD_QUEUE_STATUS_BITS(txq_id),</div><div class='add'>+		   (0 &lt;&lt; IL49_SCD_QUEUE_STTS_REG_POS_ACTIVE) |</div><div class='add'>+		   (1 &lt;&lt; IL49_SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_tx_queue_set_q2ratid - Map unique receiver/tid combination to a queue</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_tx_queue_set_q2ratid(struct il_priv *il, u16 ra_tid, u16 txq_id)</div><div class='add'>+{</div><div class='add'>+	u32 tbl_dw_addr;</div><div class='add'>+	u32 tbl_dw;</div><div class='add'>+	u16 scd_q2ratid;</div><div class='add'>+</div><div class='add'>+	scd_q2ratid = ra_tid &amp; IL_SCD_QUEUE_RA_TID_MAP_RATID_MSK;</div><div class='add'>+</div><div class='add'>+	tbl_dw_addr =</div><div class='add'>+	    il-&gt;scd_base_addr + IL49_SCD_TRANSLATE_TBL_OFFSET_QUEUE(txq_id);</div><div class='add'>+</div><div class='add'>+	tbl_dw = il_read_targ_mem(il, tbl_dw_addr);</div><div class='add'>+</div><div class='add'>+	if (txq_id &amp; 0x1)</div><div class='add'>+		tbl_dw = (scd_q2ratid &lt;&lt; 16) | (tbl_dw &amp; 0x0000FFFF);</div><div class='add'>+	else</div><div class='add'>+		tbl_dw = scd_q2ratid | (tbl_dw &amp; 0xFFFF0000);</div><div class='add'>+</div><div class='add'>+	il_write_targ_mem(il, tbl_dw_addr, tbl_dw);</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'>+ * il4965_tx_queue_agg_enable - Set up &amp; enable aggregation for selected queue</div><div class='add'>+ *</div><div class='add'>+ * NOTE:  txq_id must be greater than IL49_FIRST_AMPDU_QUEUE,</div><div class='add'>+ *        i.e. it must be one of the higher queues used for aggregation</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_txq_agg_enable(struct il_priv *il, int txq_id, int tx_fifo, int sta_id,</div><div class='add'>+		      int tid, u16 ssn_idx)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 ra_tid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if ((IL49_FIRST_AMPDU_QUEUE &gt; txq_id) ||</div><div class='add'>+	    (IL49_FIRST_AMPDU_QUEUE +</div><div class='add'>+	     il-&gt;cfg-&gt;base_params-&gt;num_of_ampdu_queues &lt;= txq_id)) {</div><div class='add'>+		IL_WARN("queue number out of range: %d, must be %d to %d\n",</div><div class='add'>+			txq_id, IL49_FIRST_AMPDU_QUEUE,</div><div class='add'>+			IL49_FIRST_AMPDU_QUEUE +</div><div class='add'>+			il-&gt;cfg-&gt;base_params-&gt;num_of_ampdu_queues - 1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ra_tid = BUILD_RAxTID(sta_id, tid);</div><div class='add'>+</div><div class='add'>+	/* Modify device's station table to Tx this TID */</div><div class='add'>+	ret = il4965_sta_tx_modify_enable_tid(il, sta_id, tid);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Stop this Tx queue before configuring it */</div><div class='add'>+	il4965_tx_queue_stop_scheduler(il, txq_id);</div><div class='add'>+</div><div class='add'>+	/* Map receiver-address / traffic-ID to this queue */</div><div class='add'>+	il4965_tx_queue_set_q2ratid(il, ra_tid, txq_id);</div><div class='add'>+</div><div class='add'>+	/* Set this queue as a chain-building queue */</div><div class='add'>+	il_set_bits_prph(il, IL49_SCD_QUEUECHAIN_SEL, (1 &lt;&lt; txq_id));</div><div class='add'>+</div><div class='add'>+	/* Place first TFD at idx corresponding to start sequence number.</div><div class='add'>+	 * Assumes that ssn_idx is valid (!= 0xFFF) */</div><div class='add'>+	il-&gt;txq[txq_id].q.read_ptr = (ssn_idx &amp; 0xff);</div><div class='add'>+	il-&gt;txq[txq_id].q.write_ptr = (ssn_idx &amp; 0xff);</div><div class='add'>+	il4965_set_wr_ptrs(il, txq_id, ssn_idx);</div><div class='add'>+</div><div class='add'>+	/* Set up Tx win size and frame limit for this queue */</div><div class='add'>+	il_write_targ_mem(il,</div><div class='add'>+			  il-&gt;scd_base_addr +</div><div class='add'>+			  IL49_SCD_CONTEXT_QUEUE_OFFSET(txq_id),</div><div class='add'>+			  (SCD_WIN_SIZE &lt;&lt; IL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_POS)</div><div class='add'>+			  &amp; IL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK);</div><div class='add'>+</div><div class='add'>+	il_write_targ_mem(il,</div><div class='add'>+			  il-&gt;scd_base_addr +</div><div class='add'>+			  IL49_SCD_CONTEXT_QUEUE_OFFSET(txq_id) + sizeof(u32),</div><div class='add'>+			  (SCD_FRAME_LIMIT &lt;&lt;</div><div class='add'>+			   IL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) &amp;</div><div class='add'>+			  IL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK);</div><div class='add'>+</div><div class='add'>+	il_set_bits_prph(il, IL49_SCD_INTERRUPT_MASK, (1 &lt;&lt; txq_id));</div><div class='add'>+</div><div class='add'>+	/* Set up Status area in SRAM, map to Tx DMA/FIFO, activate the queue */</div><div class='add'>+	il4965_tx_queue_set_status(il, &amp;il-&gt;txq[txq_id], tx_fifo, 1);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&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'>+int</div><div class='add'>+il4965_tx_agg_start(struct il_priv *il, struct ieee80211_vif *vif,</div><div class='add'>+		    struct ieee80211_sta *sta, u16 tid, u16 * ssn)</div><div class='add'>+{</div><div class='add'>+	int sta_id;</div><div class='add'>+	int tx_fifo;</div><div class='add'>+	int txq_id;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct il_tid_data *tid_data;</div><div class='add'>+</div><div class='add'>+	tx_fifo = il4965_get_fifo_from_tid(il_rxon_ctx_from_vif(vif), tid);</div><div class='add'>+	if (unlikely(tx_fifo &lt; 0))</div><div class='add'>+		return tx_fifo;</div><div class='add'>+</div><div class='add'>+	D_HT("%s on ra = %pM tid = %d\n", __func__, sta-&gt;addr, tid);</div><div class='add'>+</div><div class='add'>+	sta_id = il_sta_id(sta);</div><div class='add'>+	if (sta_id == IL_INVALID_STATION) {</div><div class='add'>+		IL_ERR("Start AGG on invalid station\n");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(tid &gt;= MAX_TID_COUNT))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;stations[sta_id].tid[tid].agg.state != IL_AGG_OFF) {</div><div class='add'>+		IL_ERR("Start AGG when state is not IL_AGG_OFF !\n");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	txq_id = il4965_txq_ctx_activate_free(il);</div><div class='add'>+	if (txq_id == -1) {</div><div class='add'>+		IL_ERR("No free aggregation queue available\n");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	tid_data = &amp;il-&gt;stations[sta_id].tid[tid];</div><div class='add'>+	*ssn = SEQ_TO_SN(tid_data-&gt;seq_number);</div><div class='add'>+	tid_data-&gt;agg.txq_id = txq_id;</div><div class='add'>+	il_set_swq_id(&amp;il-&gt;txq[txq_id], il4965_get_ac_from_tid(tid), txq_id);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	ret = il4965_txq_agg_enable(il, txq_id, tx_fifo, sta_id, tid, *ssn);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	tid_data = &amp;il-&gt;stations[sta_id].tid[tid];</div><div class='add'>+	if (tid_data-&gt;tfds_in_queue == 0) {</div><div class='add'>+		D_HT("HW queue is empty\n");</div><div class='add'>+		tid_data-&gt;agg.state = IL_AGG_ON;</div><div class='add'>+		ieee80211_start_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='add'>+	} else {</div><div class='add'>+		D_HT("HW queue is NOT empty: %d packets in HW queue\n",</div><div class='add'>+		     tid_data-&gt;tfds_in_queue);</div><div class='add'>+		tid_data-&gt;agg.state = IL_EMPTYING_HW_QUEUE_ADDBA;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * txq_id must be greater than IL49_FIRST_AMPDU_QUEUE</div><div class='add'>+ * il-&gt;lock must be held by the caller</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_txq_agg_disable(struct il_priv *il, u16 txq_id, u16 ssn_idx, u8 tx_fifo)</div><div class='add'>+{</div><div class='add'>+	if ((IL49_FIRST_AMPDU_QUEUE &gt; txq_id) ||</div><div class='add'>+	    (IL49_FIRST_AMPDU_QUEUE +</div><div class='add'>+	     il-&gt;cfg-&gt;base_params-&gt;num_of_ampdu_queues &lt;= txq_id)) {</div><div class='add'>+		IL_WARN("queue number out of range: %d, must be %d to %d\n",</div><div class='add'>+			txq_id, IL49_FIRST_AMPDU_QUEUE,</div><div class='add'>+			IL49_FIRST_AMPDU_QUEUE +</div><div class='add'>+			il-&gt;cfg-&gt;base_params-&gt;num_of_ampdu_queues - 1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il4965_tx_queue_stop_scheduler(il, txq_id);</div><div class='add'>+</div><div class='add'>+	il_clear_bits_prph(il, IL49_SCD_QUEUECHAIN_SEL, (1 &lt;&lt; txq_id));</div><div class='add'>+</div><div class='add'>+	il-&gt;txq[txq_id].q.read_ptr = (ssn_idx &amp; 0xff);</div><div class='add'>+	il-&gt;txq[txq_id].q.write_ptr = (ssn_idx &amp; 0xff);</div><div class='add'>+	/* supposes that ssn_idx is valid (!= 0xFFF) */</div><div class='add'>+	il4965_set_wr_ptrs(il, txq_id, ssn_idx);</div><div class='add'>+</div><div class='add'>+	il_clear_bits_prph(il, IL49_SCD_INTERRUPT_MASK, (1 &lt;&lt; txq_id));</div><div class='add'>+	il_txq_ctx_deactivate(il, txq_id);</div><div class='add'>+	il4965_tx_queue_set_status(il, &amp;il-&gt;txq[txq_id], tx_fifo, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_tx_agg_stop(struct il_priv *il, struct ieee80211_vif *vif,</div><div class='add'>+		   struct ieee80211_sta *sta, u16 tid)</div><div class='add'>+{</div><div class='add'>+	int tx_fifo_id, txq_id, sta_id, ssn;</div><div class='add'>+	struct il_tid_data *tid_data;</div><div class='add'>+	int write_ptr, read_ptr;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	tx_fifo_id = il4965_get_fifo_from_tid(il_rxon_ctx_from_vif(vif), tid);</div><div class='add'>+	if (unlikely(tx_fifo_id &lt; 0))</div><div class='add'>+		return tx_fifo_id;</div><div class='add'>+</div><div class='add'>+	sta_id = il_sta_id(sta);</div><div class='add'>+</div><div class='add'>+	if (sta_id == IL_INVALID_STATION) {</div><div class='add'>+		IL_ERR("Invalid station for AGG tid %d\n", tid);</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	tid_data = &amp;il-&gt;stations[sta_id].tid[tid];</div><div class='add'>+	ssn = (tid_data-&gt;seq_number &amp; IEEE80211_SCTL_SEQ) &gt;&gt; 4;</div><div class='add'>+	txq_id = tid_data-&gt;agg.txq_id;</div><div class='add'>+</div><div class='add'>+	switch (il-&gt;stations[sta_id].tid[tid].agg.state) {</div><div class='add'>+	case IL_EMPTYING_HW_QUEUE_ADDBA:</div><div class='add'>+		/*</div><div class='add'>+		 * This can happen if the peer stops aggregation</div><div class='add'>+		 * again before we've had a chance to drain the</div><div class='add'>+		 * queue we selected previously, i.e. before the</div><div class='add'>+		 * session was really started completely.</div><div class='add'>+		 */</div><div class='add'>+		D_HT("AGG stop before setup done\n");</div><div class='add'>+		goto turn_off;</div><div class='add'>+	case IL_AGG_ON:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		IL_WARN("Stopping AGG while state not ON or starting\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	write_ptr = il-&gt;txq[txq_id].q.write_ptr;</div><div class='add'>+	read_ptr = il-&gt;txq[txq_id].q.read_ptr;</div><div class='add'>+</div><div class='add'>+	/* The queue is not empty */</div><div class='add'>+	if (write_ptr != read_ptr) {</div><div class='add'>+		D_HT("Stopping a non empty AGG HW QUEUE\n");</div><div class='add'>+		il-&gt;stations[sta_id].tid[tid].agg.state =</div><div class='add'>+		    IL_EMPTYING_HW_QUEUE_DELBA;</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_HT("HW queue is empty\n");</div><div class='add'>+turn_off:</div><div class='add'>+	il-&gt;stations[sta_id].tid[tid].agg.state = IL_AGG_OFF;</div><div class='add'>+</div><div class='add'>+	/* do not restore/save irqs */</div><div class='add'>+	spin_unlock(&amp;il-&gt;sta_lock);</div><div class='add'>+	spin_lock(&amp;il-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * the only reason this call can fail is queue number out of range,</div><div class='add'>+	 * which can happen if uCode is reloaded and all the station</div><div class='add'>+	 * information are lost. if it is outside the range, there is no need</div><div class='add'>+	 * to deactivate the uCode queue, just return "success" to allow</div><div class='add'>+	 *  mac80211 to clean up it own data.</div><div class='add'>+	 */</div><div class='add'>+	il4965_txq_agg_disable(il, txq_id, ssn, tx_fifo_id);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	ieee80211_stop_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_txq_check_empty(struct il_priv *il, int sta_id, u8 tid, int txq_id)</div><div class='add'>+{</div><div class='add'>+	struct il_queue *q = &amp;il-&gt;txq[txq_id].q;</div><div class='add'>+	u8 *addr = il-&gt;stations[sta_id].sta.sta.addr;</div><div class='add'>+	struct il_tid_data *tid_data = &amp;il-&gt;stations[sta_id].tid[tid];</div><div class='add'>+	struct il_rxon_context *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = &amp;il-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;sta_lock);</div><div class='add'>+</div><div class='add'>+	switch (il-&gt;stations[sta_id].tid[tid].agg.state) {</div><div class='add'>+	case IL_EMPTYING_HW_QUEUE_DELBA:</div><div class='add'>+		/* We are reclaiming the last packet of the */</div><div class='add'>+		/* aggregated HW queue */</div><div class='add'>+		if (txq_id == tid_data-&gt;agg.txq_id &amp;&amp;</div><div class='add'>+		    q-&gt;read_ptr == q-&gt;write_ptr) {</div><div class='add'>+			u16 ssn = SEQ_TO_SN(tid_data-&gt;seq_number);</div><div class='add'>+			int tx_fifo = il4965_get_fifo_from_tid(ctx, tid);</div><div class='add'>+			D_HT("HW queue empty: continue DELBA flow\n");</div><div class='add'>+			il4965_txq_agg_disable(il, txq_id, ssn, tx_fifo);</div><div class='add'>+			tid_data-&gt;agg.state = IL_AGG_OFF;</div><div class='add'>+			ieee80211_stop_tx_ba_cb_irqsafe(ctx-&gt;vif, addr, tid);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case IL_EMPTYING_HW_QUEUE_ADDBA:</div><div class='add'>+		/* We are reclaiming the last packet of the queue */</div><div class='add'>+		if (tid_data-&gt;tfds_in_queue == 0) {</div><div class='add'>+			D_HT("HW queue empty: continue ADDBA flow\n");</div><div class='add'>+			tid_data-&gt;agg.state = IL_AGG_ON;</div><div class='add'>+			ieee80211_start_tx_ba_cb_irqsafe(ctx-&gt;vif, addr, tid);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_non_agg_tx_status(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+			 const u8 *addr1)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct il_station_priv *sta_priv;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	sta = ieee80211_find_sta(ctx-&gt;vif, addr1);</div><div class='add'>+	if (sta) {</div><div class='add'>+		sta_priv = (void *)sta-&gt;drv_priv;</div><div class='add'>+		/* avoid atomic ops if this isn't a client */</div><div class='add'>+		if (sta_priv-&gt;client &amp;&amp;</div><div class='add'>+		    atomic_dec_return(&amp;sta_priv-&gt;pending_frames) == 0)</div><div class='add'>+			ieee80211_sta_block_awake(il-&gt;hw, sta, false);</div><div class='add'>+	}</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'>+il4965_tx_status(struct il_priv *il, struct il_tx_info *tx_info, bool is_agg)</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'>+</div><div class='add'>+	if (!is_agg)</div><div class='add'>+		il4965_non_agg_tx_status(il, tx_info-&gt;ctx, hdr-&gt;addr1);</div><div class='add'>+</div><div class='add'>+	ieee80211_tx_status_irqsafe(il-&gt;hw, tx_info-&gt;skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_tx_queue_reclaim(struct il_priv *il, int txq_id, int idx)</div><div class='add'>+{</div><div class='add'>+	struct il_tx_queue *txq = &amp;il-&gt;txq[txq_id];</div><div class='add'>+	struct il_queue *q = &amp;txq-&gt;q;</div><div class='add'>+	struct il_tx_info *tx_info;</div><div class='add'>+	int nfreed = 0;</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+</div><div class='add'>+	if (idx &gt;= q-&gt;n_bd || il_queue_used(q, idx) == 0) {</div><div class='add'>+		IL_ERR("Read idx for DMA queue txq id (%d), idx %d, "</div><div class='add'>+		       "is out of range [0-%d] %d %d.\n", txq_id, idx, q-&gt;n_bd,</div><div class='add'>+		       q-&gt;write_ptr, q-&gt;read_ptr);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (idx = il_queue_inc_wrap(idx, q-&gt;n_bd); q-&gt;read_ptr != idx;</div><div class='add'>+	     q-&gt;read_ptr = il_queue_inc_wrap(q-&gt;read_ptr, q-&gt;n_bd)) {</div><div class='add'>+</div><div class='add'>+		tx_info = &amp;txq-&gt;txb[txq-&gt;q.read_ptr];</div><div class='add'>+</div><div class='add'>+		if (WARN_ON_ONCE(tx_info-&gt;skb == NULL))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		hdr = (struct ieee80211_hdr *)tx_info-&gt;skb-&gt;data;</div><div class='add'>+		if (ieee80211_is_data_qos(hdr-&gt;frame_control))</div><div class='add'>+			nfreed++;</div><div class='add'>+</div><div class='add'>+		il4965_tx_status(il, tx_info,</div><div class='add'>+				 txq_id &gt;= IL4965_FIRST_AMPDU_QUEUE);</div><div class='add'>+		tx_info-&gt;skb = NULL;</div><div class='add'>+</div><div class='add'>+		il-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_free_tfd(il, txq);</div><div class='add'>+	}</div><div class='add'>+	return nfreed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_tx_status_reply_compressed_ba - Update tx status from block-ack</div><div class='add'>+ *</div><div class='add'>+ * Go through block-ack's bitmap of ACK'd frames, update driver's record of</div><div class='add'>+ * ACK vs. not.  This gets sent to mac80211, then to rate scaling algo.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_tx_status_reply_compressed_ba(struct il_priv *il, struct il_ht_agg *agg,</div><div class='add'>+				     struct il_compressed_ba_resp *ba_resp)</div><div class='add'>+{</div><div class='add'>+	int i, sh, ack;</div><div class='add'>+	u16 seq_ctl = le16_to_cpu(ba_resp-&gt;seq_ctl);</div><div class='add'>+	u16 scd_flow = le16_to_cpu(ba_resp-&gt;scd_flow);</div><div class='add'>+	int successes = 0;</div><div class='add'>+	struct ieee80211_tx_info *info;</div><div class='add'>+	u64 bitmap, sent_bitmap;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!agg-&gt;wait_for_ba)) {</div><div class='add'>+		if (unlikely(ba_resp-&gt;bitmap))</div><div class='add'>+			IL_ERR("Received BA when not expected\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Mark that the expected block-ack response arrived */</div><div class='add'>+	agg-&gt;wait_for_ba = 0;</div><div class='add'>+	D_TX_REPLY("BA %d %d\n", agg-&gt;start_idx, ba_resp-&gt;seq_ctl);</div><div class='add'>+</div><div class='add'>+	/* Calculate shift to align block-ack bits with our Tx win bits */</div><div class='add'>+	sh = agg-&gt;start_idx - SEQ_TO_IDX(seq_ctl &gt;&gt; 4);</div><div class='add'>+	if (sh &lt; 0)		/* tbw something is wrong with indices */</div><div class='add'>+		sh += 0x100;</div><div class='add'>+</div><div class='add'>+	if (agg-&gt;frame_count &gt; (64 - sh)) {</div><div class='add'>+		D_TX_REPLY("more frames than bitmap size");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* don't use 64-bit values for now */</div><div class='add'>+	bitmap = le64_to_cpu(ba_resp-&gt;bitmap) &gt;&gt; sh;</div><div class='add'>+</div><div class='add'>+	/* check for success or failure according to the</div><div class='add'>+	 * transmitted bitmap and block-ack bitmap */</div><div class='add'>+	sent_bitmap = bitmap &amp; agg-&gt;bitmap;</div><div class='add'>+</div><div class='add'>+	/* For each frame attempted in aggregation,</div><div class='add'>+	 * update driver's record of tx frame's status. */</div><div class='add'>+	i = 0;</div><div class='add'>+	while (sent_bitmap) {</div><div class='add'>+		ack = sent_bitmap &amp; 1ULL;</div><div class='add'>+		successes += ack;</div><div class='add'>+		D_TX_REPLY("%s ON i=%d idx=%d raw=%d\n", ack ? "ACK" : "NACK",</div><div class='add'>+			   i, (agg-&gt;start_idx + i) &amp; 0xff, agg-&gt;start_idx + i);</div><div class='add'>+		sent_bitmap &gt;&gt;= 1;</div><div class='add'>+		++i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_TX_REPLY("Bitmap %llx\n", (unsigned long long)bitmap);</div><div class='add'>+</div><div class='add'>+	info = IEEE80211_SKB_CB(il-&gt;txq[scd_flow].txb[agg-&gt;start_idx].skb);</div><div class='add'>+	memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='add'>+	info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='add'>+	info-&gt;flags |= IEEE80211_TX_STAT_AMPDU;</div><div class='add'>+	info-&gt;status.ampdu_ack_len = successes;</div><div class='add'>+	info-&gt;status.ampdu_len = agg-&gt;frame_count;</div><div class='add'>+	il4965_hwrate_to_tx_control(il, agg-&gt;rate_n_flags, info);</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'>+ * translate ucode response to mac80211 tx status control values</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il4965_hwrate_to_tx_control(struct il_priv *il, u32 rate_n_flags,</div><div class='add'>+			    struct ieee80211_tx_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_tx_rate *r = &amp;info-&gt;control.rates[0];</div><div class='add'>+</div><div class='add'>+	info-&gt;antenna_sel_tx =</div><div class='add'>+	    ((rate_n_flags &amp; RATE_MCS_ANT_ABC_MSK) &gt;&gt; RATE_MCS_ANT_POS);</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_HT_MSK)</div><div class='add'>+		r-&gt;flags |= IEEE80211_TX_RC_MCS;</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_GF_MSK)</div><div class='add'>+		r-&gt;flags |= IEEE80211_TX_RC_GREEN_FIELD;</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_HT40_MSK)</div><div class='add'>+		r-&gt;flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_DUP_MSK)</div><div class='add'>+		r-&gt;flags |= IEEE80211_TX_RC_DUP_DATA;</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_SGI_MSK)</div><div class='add'>+		r-&gt;flags |= IEEE80211_TX_RC_SHORT_GI;</div><div class='add'>+	r-&gt;idx = il4965_hwrate_to_mac80211_idx(rate_n_flags, info-&gt;band);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_hdl_compressed_ba - Handler for N_COMPRESSED_BA</div><div class='add'>+ *</div><div class='add'>+ * Handles block-acknowledge notification from device, which reports success</div><div class='add'>+ * of frames sent via aggregation.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il4965_hdl_compressed_ba(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	struct il_compressed_ba_resp *ba_resp = &amp;pkt-&gt;u.compressed_ba;</div><div class='add'>+	struct il_tx_queue *txq = NULL;</div><div class='add'>+	struct il_ht_agg *agg;</div><div class='add'>+	int idx;</div><div class='add'>+	int sta_id;</div><div class='add'>+	int tid;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* "flow" corresponds to Tx queue */</div><div class='add'>+	u16 scd_flow = le16_to_cpu(ba_resp-&gt;scd_flow);</div><div class='add'>+</div><div class='add'>+	/* "ssn" is start of block-ack Tx win, corresponds to idx</div><div class='add'>+	 * (in Tx queue's circular buffer) of first TFD/frame in win */</div><div class='add'>+	u16 ba_resp_scd_ssn = le16_to_cpu(ba_resp-&gt;scd_ssn);</div><div class='add'>+</div><div class='add'>+	if (scd_flow &gt;= il-&gt;hw_params.max_txq_num) {</div><div class='add'>+		IL_ERR("BUG_ON scd_flow is bigger than number of queues\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	txq = &amp;il-&gt;txq[scd_flow];</div><div class='add'>+	sta_id = ba_resp-&gt;sta_id;</div><div class='add'>+	tid = ba_resp-&gt;tid;</div><div class='add'>+	agg = &amp;il-&gt;stations[sta_id].tid[tid].agg;</div><div class='add'>+	if (unlikely(agg-&gt;txq_id != scd_flow)) {</div><div class='add'>+		/*</div><div class='add'>+		 * FIXME: this is a uCode bug which need to be addressed,</div><div class='add'>+		 * log the information and return for now!</div><div class='add'>+		 * since it is possible happen very often and in order</div><div class='add'>+		 * not to fill the syslog, don't enable the logging by default</div><div class='add'>+		 */</div><div class='add'>+		D_TX_REPLY("BA scd_flow %d does not match txq_id %d\n",</div><div class='add'>+			   scd_flow, agg-&gt;txq_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Find idx just before block-ack win */</div><div class='add'>+	idx = il_queue_dec_wrap(ba_resp_scd_ssn &amp; 0xff, txq-&gt;q.n_bd);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	D_TX_REPLY("N_COMPRESSED_BA [%d] Received from %pM, " "sta_id = %d\n",</div><div class='add'>+		   agg-&gt;wait_for_ba, (u8 *) &amp;ba_resp-&gt;sta_addr_lo32,</div><div class='add'>+		   ba_resp-&gt;sta_id);</div><div class='add'>+	D_TX_REPLY("TID = %d, SeqCtl = %d, bitmap = 0x%llx," "scd_flow = "</div><div class='add'>+		   "%d, scd_ssn = %d\n", ba_resp-&gt;tid, ba_resp-&gt;seq_ctl,</div><div class='add'>+		   (unsigned long long)le64_to_cpu(ba_resp-&gt;bitmap),</div><div class='add'>+		   ba_resp-&gt;scd_flow, ba_resp-&gt;scd_ssn);</div><div class='add'>+	D_TX_REPLY("DAT start_idx = %d, bitmap = 0x%llx\n", agg-&gt;start_idx,</div><div class='add'>+		   (unsigned long long)agg-&gt;bitmap);</div><div class='add'>+</div><div class='add'>+	/* Update driver's record of ACK vs. not for each frame in win */</div><div class='add'>+	il4965_tx_status_reply_compressed_ba(il, agg, ba_resp);</div><div class='add'>+</div><div class='add'>+	/* Release all TFDs before the SSN, i.e. all TFDs in front of</div><div class='add'>+	 * block-ack win (we assume that they've been successfully</div><div class='add'>+	 * transmitted ... if not, it's too late anyway). */</div><div class='add'>+	if (txq-&gt;q.read_ptr != (ba_resp_scd_ssn &amp; 0xff)) {</div><div class='add'>+		/* calculate mac80211 ampdu sw queue to wake */</div><div class='add'>+		int freed = il4965_tx_queue_reclaim(il, scd_flow, idx);</div><div class='add'>+		il4965_free_tfds_in_queue(il, sta_id, tid, freed);</div><div class='add'>+</div><div class='add'>+		if (il_queue_space(&amp;txq-&gt;q) &gt; txq-&gt;q.low_mark &amp;&amp;</div><div class='add'>+		    il-&gt;mac80211_registered &amp;&amp;</div><div class='add'>+		    agg-&gt;state != IL_EMPTYING_HW_QUEUE_DELBA)</div><div class='add'>+			il_wake_queue(il, txq);</div><div class='add'>+</div><div class='add'>+		il4965_txq_check_empty(il, sta_id, tid, scd_flow);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+const char *</div><div class='add'>+il4965_get_tx_fail_reason(u32 status)</div><div class='add'>+{</div><div class='add'>+#define TX_STATUS_FAIL(x) case TX_STATUS_FAIL_ ## x: return #x</div><div class='add'>+#define TX_STATUS_POSTPONE(x) case TX_STATUS_POSTPONE_ ## x: return #x</div><div class='add'>+</div><div class='add'>+	switch (status &amp; TX_STATUS_MSK) {</div><div class='add'>+	case TX_STATUS_SUCCESS:</div><div class='add'>+		return "SUCCESS";</div><div class='add'>+		TX_STATUS_POSTPONE(DELAY);</div><div class='add'>+		TX_STATUS_POSTPONE(FEW_BYTES);</div><div class='add'>+		TX_STATUS_POSTPONE(QUIET_PERIOD);</div><div class='add'>+		TX_STATUS_POSTPONE(CALC_TTAK);</div><div class='add'>+		TX_STATUS_FAIL(INTERNAL_CROSSED_RETRY);</div><div class='add'>+		TX_STATUS_FAIL(SHORT_LIMIT);</div><div class='add'>+		TX_STATUS_FAIL(LONG_LIMIT);</div><div class='add'>+		TX_STATUS_FAIL(FIFO_UNDERRUN);</div><div class='add'>+		TX_STATUS_FAIL(DRAIN_FLOW);</div><div class='add'>+		TX_STATUS_FAIL(RFKILL_FLUSH);</div><div class='add'>+		TX_STATUS_FAIL(LIFE_EXPIRE);</div><div class='add'>+		TX_STATUS_FAIL(DEST_PS);</div><div class='add'>+		TX_STATUS_FAIL(HOST_ABORTED);</div><div class='add'>+		TX_STATUS_FAIL(BT_RETRY);</div><div class='add'>+		TX_STATUS_FAIL(STA_INVALID);</div><div class='add'>+		TX_STATUS_FAIL(FRAG_DROPPED);</div><div class='add'>+		TX_STATUS_FAIL(TID_DISABLE);</div><div class='add'>+		TX_STATUS_FAIL(FIFO_FLUSHED);</div><div class='add'>+		TX_STATUS_FAIL(INSUFFICIENT_CF_POLL);</div><div class='add'>+		TX_STATUS_FAIL(PASSIVE_NO_RX);</div><div class='add'>+		TX_STATUS_FAIL(NO_BEACON_ON_RADAR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "UNKNOWN";</div><div class='add'>+</div><div class='add'>+#undef TX_STATUS_FAIL</div><div class='add'>+#undef TX_STATUS_POSTPONE</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_IWLEGACY_DEBUG */</div><div class='add'>+</div><div class='add'>+static struct il_link_quality_cmd *</div><div class='add'>+il4965_sta_alloc_lq(struct il_priv *il, u8 sta_id)</div><div class='add'>+{</div><div class='add'>+	int i, r;</div><div class='add'>+	struct il_link_quality_cmd *link_cmd;</div><div class='add'>+	u32 rate_flags = 0;</div><div class='add'>+	__le32 rate_n_flags;</div><div class='add'>+</div><div class='add'>+	link_cmd = kzalloc(sizeof(struct il_link_quality_cmd), GFP_KERNEL);</div><div class='add'>+	if (!link_cmd) {</div><div class='add'>+		IL_ERR("Unable to allocate memory for LQ cmd.\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	/* Set up the rate scaling to start at selected rate, fall back</div><div class='add'>+	 * all the way down to 1M in IEEE order, and then spin on 1M */</div><div class='add'>+	if (il-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='add'>+		r = RATE_6M_IDX;</div><div class='add'>+	else</div><div class='add'>+		r = RATE_1M_IDX;</div><div class='add'>+</div><div class='add'>+	if (r &gt;= IL_FIRST_CCK_RATE &amp;&amp; r &lt;= IL_LAST_CCK_RATE)</div><div class='add'>+		rate_flags |= RATE_MCS_CCK_MSK;</div><div class='add'>+</div><div class='add'>+	rate_flags |=</div><div class='add'>+	    il4965_first_antenna(il-&gt;hw_params.</div><div class='add'>+				 valid_tx_ant) &lt;&lt; RATE_MCS_ANT_POS;</div><div class='add'>+	rate_n_flags = cpu_to_le32(il_rates[r].plcp | rate_flags);</div><div class='add'>+	for (i = 0; i &lt; LINK_QUAL_MAX_RETRY_NUM; i++)</div><div class='add'>+		link_cmd-&gt;rs_table[i].rate_n_flags = rate_n_flags;</div><div class='add'>+</div><div class='add'>+	link_cmd-&gt;general_params.single_stream_ant_msk =</div><div class='add'>+	    il4965_first_antenna(il-&gt;hw_params.valid_tx_ant);</div><div class='add'>+</div><div class='add'>+	link_cmd-&gt;general_params.dual_stream_ant_msk =</div><div class='add'>+	    il-&gt;hw_params.valid_tx_ant &amp; ~il4965_first_antenna(il-&gt;hw_params.</div><div class='add'>+							       valid_tx_ant);</div><div class='add'>+	if (!link_cmd-&gt;general_params.dual_stream_ant_msk) {</div><div class='add'>+		link_cmd-&gt;general_params.dual_stream_ant_msk = ANT_AB;</div><div class='add'>+	} else if (il4965_num_of_ant(il-&gt;hw_params.valid_tx_ant) == 2) {</div><div class='add'>+		link_cmd-&gt;general_params.dual_stream_ant_msk =</div><div class='add'>+		    il-&gt;hw_params.valid_tx_ant;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link_cmd-&gt;agg_params.agg_dis_start_th = LINK_QUAL_AGG_DISABLE_START_DEF;</div><div class='add'>+	link_cmd-&gt;agg_params.agg_time_limit =</div><div class='add'>+	    cpu_to_le16(LINK_QUAL_AGG_TIME_LIMIT_DEF);</div><div class='add'>+</div><div class='add'>+	link_cmd-&gt;sta_id = sta_id;</div><div class='add'>+</div><div class='add'>+	return link_cmd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * il4965_add_bssid_station - Add the special IBSS BSSID station</div><div class='add'>+ *</div><div class='add'>+ * Function sleeps.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il4965_add_bssid_station(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+			 const u8 *addr, u8 *sta_id_r)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	struct il_link_quality_cmd *link_cmd;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (sta_id_r)</div><div class='add'>+		*sta_id_r = IL_INVALID_STATION;</div><div class='add'>+</div><div class='add'>+	ret = il_add_station_common(il, ctx, addr, 0, NULL, &amp;sta_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IL_ERR("Unable to add station %pM\n", addr);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sta_id_r)</div><div class='add'>+		*sta_id_r = sta_id;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	il-&gt;stations[sta_id].used |= IL_STA_LOCAL;</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Set up default rate scaling table in device's station table */</div><div class='add'>+	link_cmd = il4965_sta_alloc_lq(il, sta_id);</div><div class='add'>+	if (!link_cmd) {</div><div class='add'>+		IL_ERR("Unable to initialize rate scaling for station %pM.\n",</div><div class='add'>+		       addr);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = il_send_lq_cmd(il, ctx, link_cmd, CMD_SYNC, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		IL_ERR("Link quality command failed (%d)\n", ret);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	il-&gt;stations[sta_id].lq = link_cmd;</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_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</div><div class='add'>+il4965_static_wepkey_cmd(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+			 bool send_if_empty)</div><div class='add'>+{</div><div class='add'>+	int i, not_empty = 0;</div><div class='add'>+	u8 buff[sizeof(struct il_wep_cmd) +</div><div class='add'>+		sizeof(struct il_wep_key) * WEP_KEYS_MAX];</div><div class='add'>+	struct il_wep_cmd *wep_cmd = (struct il_wep_cmd *)buff;</div><div class='add'>+	size_t cmd_size = sizeof(struct il_wep_cmd);</div><div class='add'>+	struct il_host_cmd cmd = {</div><div class='add'>+		.id = ctx-&gt;wep_key_cmd,</div><div class='add'>+		.data = wep_cmd,</div><div class='add'>+		.flags = CMD_SYNC,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	memset(wep_cmd, 0,</div><div class='add'>+	       cmd_size + (sizeof(struct il_wep_key) * WEP_KEYS_MAX));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WEP_KEYS_MAX; i++) {</div><div class='add'>+		wep_cmd-&gt;key[i].key_idx = i;</div><div class='add'>+		if (ctx-&gt;wep_keys[i].key_size) {</div><div class='add'>+			wep_cmd-&gt;key[i].key_offset = i;</div><div class='add'>+			not_empty = 1;</div><div class='add'>+		} else {</div><div class='add'>+			wep_cmd-&gt;key[i].key_offset = WEP_INVALID_OFFSET;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		wep_cmd-&gt;key[i].key_size = ctx-&gt;wep_keys[i].key_size;</div><div class='add'>+		memcpy(&amp;wep_cmd-&gt;key[i].key[3], ctx-&gt;wep_keys[i].key,</div><div class='add'>+		       ctx-&gt;wep_keys[i].key_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wep_cmd-&gt;global_key_type = WEP_KEY_WEP_TYPE;</div><div class='add'>+	wep_cmd-&gt;num_keys = WEP_KEYS_MAX;</div><div class='add'>+</div><div class='add'>+	cmd_size += sizeof(struct il_wep_key) * WEP_KEYS_MAX;</div><div class='add'>+</div><div class='add'>+	cmd.len = cmd_size;</div><div class='add'>+</div><div class='add'>+	if (not_empty || send_if_empty)</div><div class='add'>+		return il_send_cmd(il, &amp;cmd);</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_restore_default_wep_keys(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return il4965_static_wepkey_cmd(il, ctx, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_remove_default_wep_key(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+			      struct ieee80211_key_conf *keyconf)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	D_WEP("Removing default WEP key: idx=%d\n", keyconf-&gt;keyidx);</div><div class='add'>+</div><div class='add'>+	memset(&amp;ctx-&gt;wep_keys[keyconf-&gt;keyidx], 0, sizeof(ctx-&gt;wep_keys[0]));</div><div class='add'>+	if (il_is_rfkill(il)) {</div><div class='add'>+		D_WEP("Not sending C_WEPKEY command due to RFKILL.\n");</div><div class='add'>+		/* but keys in device are clear anyway so return success */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	ret = il4965_static_wepkey_cmd(il, ctx, 1);</div><div class='add'>+	D_WEP("Remove default WEP key: idx=%d ret=%d\n", keyconf-&gt;keyidx, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_set_default_wep_key(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+			   struct ieee80211_key_conf *keyconf)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (keyconf-&gt;keylen != WEP_KEY_LEN_128 &amp;&amp;</div><div class='add'>+	    keyconf-&gt;keylen != WEP_KEY_LEN_64) {</div><div class='add'>+		D_WEP("Bad WEP key length %d\n", keyconf-&gt;keylen);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	keyconf-&gt;flags &amp;= ~IEEE80211_KEY_FLAG_GENERATE_IV;</div><div class='add'>+	keyconf-&gt;hw_key_idx = HW_KEY_DEFAULT;</div><div class='add'>+	il-&gt;stations[ctx-&gt;ap_sta_id].keyinfo.cipher = keyconf-&gt;cipher;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;wep_keys[keyconf-&gt;keyidx].key_size = keyconf-&gt;keylen;</div><div class='add'>+	memcpy(&amp;ctx-&gt;wep_keys[keyconf-&gt;keyidx].key, &amp;keyconf-&gt;key,</div><div class='add'>+	       keyconf-&gt;keylen);</div><div class='add'>+</div><div class='add'>+	ret = il4965_static_wepkey_cmd(il, ctx, false);</div><div class='add'>+	D_WEP("Set default WEP key: len=%d idx=%d ret=%d\n", keyconf-&gt;keylen,</div><div class='add'>+	      keyconf-&gt;keyidx, 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</div><div class='add'>+il4965_set_wep_dynamic_key_info(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+				struct ieee80211_key_conf *keyconf, u8 sta_id)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	__le16 key_flags = 0;</div><div class='add'>+	struct il_addsta_cmd sta_cmd;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	keyconf-&gt;flags &amp;= ~IEEE80211_KEY_FLAG_GENERATE_IV;</div><div class='add'>+</div><div class='add'>+	key_flags |= (STA_KEY_FLG_WEP | STA_KEY_FLG_MAP_KEY_MSK);</div><div class='add'>+	key_flags |= cpu_to_le16(keyconf-&gt;keyidx &lt;&lt; STA_KEY_FLG_KEYID_POS);</div><div class='add'>+	key_flags &amp;= ~STA_KEY_FLG_INVALID;</div><div class='add'>+</div><div class='add'>+	if (keyconf-&gt;keylen == WEP_KEY_LEN_128)</div><div class='add'>+		key_flags |= STA_KEY_FLG_KEY_SIZE_MSK;</div><div class='add'>+</div><div class='add'>+	if (sta_id == ctx-&gt;bcast_sta_id)</div><div class='add'>+		key_flags |= STA_KEY_MULTICAST_MSK;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	il-&gt;stations[sta_id].keyinfo.cipher = keyconf-&gt;cipher;</div><div class='add'>+	il-&gt;stations[sta_id].keyinfo.keylen = keyconf-&gt;keylen;</div><div class='add'>+	il-&gt;stations[sta_id].keyinfo.keyidx = keyconf-&gt;keyidx;</div><div class='add'>+</div><div class='add'>+	memcpy(il-&gt;stations[sta_id].keyinfo.key, keyconf-&gt;key, keyconf-&gt;keylen);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;il-&gt;stations[sta_id].sta.key.key[3], keyconf-&gt;key,</div><div class='add'>+	       keyconf-&gt;keylen);</div><div class='add'>+</div><div class='add'>+	if ((il-&gt;stations[sta_id].sta.key.</div><div class='add'>+	     key_flags &amp; STA_KEY_FLG_ENCRYPT_MSK) == STA_KEY_FLG_NO_ENC)</div><div class='add'>+		il-&gt;stations[sta_id].sta.key.key_offset =</div><div class='add'>+		    il_get_free_ucode_key_idx(il);</div><div class='add'>+	/* else, we are overriding an existing key =&gt; no need to allocated room</div><div class='add'>+	 * in uCode. */</div><div class='add'>+</div><div class='add'>+	WARN(il-&gt;stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,</div><div class='add'>+	     "no space for a new key");</div><div class='add'>+</div><div class='add'>+	il-&gt;stations[sta_id].sta.key.key_flags = key_flags;</div><div class='add'>+	il-&gt;stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;</div><div class='add'>+	il-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;sta_cmd, &amp;il-&gt;stations[sta_id].sta,</div><div class='add'>+	       sizeof(struct il_addsta_cmd));</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	return il_send_add_sta(il, &amp;sta_cmd, CMD_SYNC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il4965_set_ccmp_dynamic_key_info(struct il_priv *il,</div><div class='add'>+				 struct il_rxon_context *ctx,</div><div class='add'>+				 struct ieee80211_key_conf *keyconf, u8 sta_id)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	__le16 key_flags = 0;</div><div class='add'>+	struct il_addsta_cmd sta_cmd;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	key_flags |= (STA_KEY_FLG_CCMP | STA_KEY_FLG_MAP_KEY_MSK);</div><div class='add'>+	key_flags |= cpu_to_le16(keyconf-&gt;keyidx &lt;&lt; STA_KEY_FLG_KEYID_POS);</div><div class='add'>+	key_flags &amp;= ~STA_KEY_FLG_INVALID;</div><div class='add'>+</div><div class='add'>+	if (sta_id == ctx-&gt;bcast_sta_id)</div><div class='add'>+		key_flags |= STA_KEY_MULTICAST_MSK;</div><div class='add'>+</div><div class='add'>+	keyconf-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	il-&gt;stations[sta_id].keyinfo.cipher = keyconf-&gt;cipher;</div><div class='add'>+	il-&gt;stations[sta_id].keyinfo.keylen = keyconf-&gt;keylen;</div><div class='add'>+</div><div class='add'>+	memcpy(il-&gt;stations[sta_id].keyinfo.key, keyconf-&gt;key, keyconf-&gt;keylen);</div><div class='add'>+</div><div class='add'>+	memcpy(il-&gt;stations[sta_id].sta.key.key, keyconf-&gt;key, keyconf-&gt;keylen);</div><div class='add'>+</div><div class='add'>+	if ((il-&gt;stations[sta_id].sta.key.</div><div class='add'>+	     key_flags &amp; STA_KEY_FLG_ENCRYPT_MSK) == STA_KEY_FLG_NO_ENC)</div><div class='add'>+		il-&gt;stations[sta_id].sta.key.key_offset =</div><div class='add'>+		    il_get_free_ucode_key_idx(il);</div><div class='add'>+	/* else, we are overriding an existing key =&gt; no need to allocated room</div><div class='add'>+	 * in uCode. */</div><div class='add'>+</div><div class='add'>+	WARN(il-&gt;stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,</div><div class='add'>+	     "no space for a new key");</div><div class='add'>+</div><div class='add'>+	il-&gt;stations[sta_id].sta.key.key_flags = key_flags;</div><div class='add'>+	il-&gt;stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;</div><div class='add'>+	il-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;sta_cmd, &amp;il-&gt;stations[sta_id].sta,</div><div class='add'>+	       sizeof(struct il_addsta_cmd));</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	return il_send_add_sta(il, &amp;sta_cmd, CMD_SYNC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il4965_set_tkip_dynamic_key_info(struct il_priv *il,</div><div class='add'>+				 struct il_rxon_context *ctx,</div><div class='add'>+				 struct ieee80211_key_conf *keyconf, u8 sta_id)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	__le16 key_flags = 0;</div><div class='add'>+</div><div class='add'>+	key_flags |= (STA_KEY_FLG_TKIP | STA_KEY_FLG_MAP_KEY_MSK);</div><div class='add'>+	key_flags |= cpu_to_le16(keyconf-&gt;keyidx &lt;&lt; STA_KEY_FLG_KEYID_POS);</div><div class='add'>+	key_flags &amp;= ~STA_KEY_FLG_INVALID;</div><div class='add'>+</div><div class='add'>+	if (sta_id == ctx-&gt;bcast_sta_id)</div><div class='add'>+		key_flags |= STA_KEY_MULTICAST_MSK;</div><div class='add'>+</div><div class='add'>+	keyconf-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV;</div><div class='add'>+	keyconf-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	il-&gt;stations[sta_id].keyinfo.cipher = keyconf-&gt;cipher;</div><div class='add'>+	il-&gt;stations[sta_id].keyinfo.keylen = 16;</div><div class='add'>+</div><div class='add'>+	if ((il-&gt;stations[sta_id].sta.key.</div><div class='add'>+	     key_flags &amp; STA_KEY_FLG_ENCRYPT_MSK) == STA_KEY_FLG_NO_ENC)</div><div class='add'>+		il-&gt;stations[sta_id].sta.key.key_offset =</div><div class='add'>+		    il_get_free_ucode_key_idx(il);</div><div class='add'>+	/* else, we are overriding an existing key =&gt; no need to allocated room</div><div class='add'>+	 * in uCode. */</div><div class='add'>+</div><div class='add'>+	WARN(il-&gt;stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,</div><div class='add'>+	     "no space for a new key");</div><div class='add'>+</div><div class='add'>+	il-&gt;stations[sta_id].sta.key.key_flags = key_flags;</div><div class='add'>+</div><div class='add'>+	/* This copy is acutally not needed: we get the key with each TX */</div><div class='add'>+	memcpy(il-&gt;stations[sta_id].keyinfo.key, keyconf-&gt;key, 16);</div><div class='add'>+</div><div class='add'>+	memcpy(il-&gt;stations[sta_id].sta.key.key, keyconf-&gt;key, 16);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_update_tkip_key(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+		       struct ieee80211_key_conf *keyconf,</div><div class='add'>+		       struct ieee80211_sta *sta, u32 iv32, u16 * phase1key)</div><div class='add'>+{</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (il_scan_cancel(il)) {</div><div class='add'>+		/* cancel scan failed, just live w/ bad key and rely</div><div class='add'>+		   briefly on SW decryption */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sta_id = il_sta_id_or_broadcast(il, ctx, sta);</div><div class='add'>+	if (sta_id == IL_INVALID_STATION)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	il-&gt;stations[sta_id].sta.key.tkip_rx_tsc_byte2 = (u8) iv32;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 5; i++)</div><div class='add'>+		il-&gt;stations[sta_id].sta.key.tkip_rx_ttak[i] =</div><div class='add'>+		    cpu_to_le16(phase1key[i]);</div><div class='add'>+</div><div class='add'>+	il-&gt;stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;</div><div class='add'>+	il-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='add'>+</div><div class='add'>+	il_send_add_sta(il, &amp;il-&gt;stations[sta_id].sta, CMD_ASYNC);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_remove_dynamic_key(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+			  struct ieee80211_key_conf *keyconf, u8 sta_id)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 key_flags;</div><div class='add'>+	u8 keyidx;</div><div class='add'>+	struct il_addsta_cmd sta_cmd;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;key_mapping_keys--;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	key_flags = le16_to_cpu(il-&gt;stations[sta_id].sta.key.key_flags);</div><div class='add'>+	keyidx = (key_flags &gt;&gt; STA_KEY_FLG_KEYID_POS) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	D_WEP("Remove dynamic key: idx=%d sta=%d\n", keyconf-&gt;keyidx, sta_id);</div><div class='add'>+</div><div class='add'>+	if (keyconf-&gt;keyidx != keyidx) {</div><div class='add'>+		/* We need to remove a key with idx different that the one</div><div class='add'>+		 * in the uCode. This means that the key we need to remove has</div><div class='add'>+		 * been replaced by another one with different idx.</div><div class='add'>+		 * Don't do anything and return ok</div><div class='add'>+		 */</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (il-&gt;stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET) {</div><div class='add'>+		IL_WARN("Removing wrong key %d 0x%x\n", keyconf-&gt;keyidx,</div><div class='add'>+			key_flags);</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!test_and_clear_bit</div><div class='add'>+	    (il-&gt;stations[sta_id].sta.key.key_offset, &amp;il-&gt;ucode_key_table))</div><div class='add'>+		IL_ERR("idx %d not used in uCode key table.\n",</div><div class='add'>+		       il-&gt;stations[sta_id].sta.key.key_offset);</div><div class='add'>+	memset(&amp;il-&gt;stations[sta_id].keyinfo, 0, sizeof(struct il_hw_key));</div><div class='add'>+	memset(&amp;il-&gt;stations[sta_id].sta.key, 0, sizeof(struct il4965_keyinfo));</div><div class='add'>+	il-&gt;stations[sta_id].sta.key.key_flags =</div><div class='add'>+	    STA_KEY_FLG_NO_ENC | STA_KEY_FLG_INVALID;</div><div class='add'>+	il-&gt;stations[sta_id].sta.key.key_offset = WEP_INVALID_OFFSET;</div><div class='add'>+	il-&gt;stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;</div><div class='add'>+	il-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='add'>+</div><div class='add'>+	if (il_is_rfkill(il)) {</div><div class='add'>+		D_WEP</div><div class='add'>+		    ("Not sending C_ADD_STA command because RFKILL enabled.\n");</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	memcpy(&amp;sta_cmd, &amp;il-&gt;stations[sta_id].sta,</div><div class='add'>+	       sizeof(struct il_addsta_cmd));</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	return il_send_add_sta(il, &amp;sta_cmd, CMD_SYNC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_set_dynamic_key(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+		       struct ieee80211_key_conf *keyconf, u8 sta_id)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;key_mapping_keys++;</div><div class='add'>+	keyconf-&gt;hw_key_idx = HW_KEY_DYNAMIC;</div><div class='add'>+</div><div class='add'>+	switch (keyconf-&gt;cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		ret =</div><div class='add'>+		    il4965_set_ccmp_dynamic_key_info(il, ctx, keyconf, sta_id);</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		ret =</div><div class='add'>+		    il4965_set_tkip_dynamic_key_info(il, ctx, keyconf, sta_id);</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP40:</div><div class='add'>+	case WLAN_CIPHER_SUITE_WEP104:</div><div class='add'>+		ret = il4965_set_wep_dynamic_key_info(il, ctx, keyconf, sta_id);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		IL_ERR("Unknown alg: %s cipher = %x\n", __func__,</div><div class='add'>+		       keyconf-&gt;cipher);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_WEP("Set dynamic key: cipher=%x len=%d idx=%d sta=%d ret=%d\n",</div><div class='add'>+	      keyconf-&gt;cipher, keyconf-&gt;keylen, keyconf-&gt;keyidx, sta_id, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_alloc_bcast_station - add broadcast station into driver's station table.</div><div class='add'>+ *</div><div class='add'>+ * This adds the broadcast station into the driver's station table</div><div class='add'>+ * and marks it driver active, so that it will be restored to the</div><div class='add'>+ * device at the next best time.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il4965_alloc_bcast_station(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct il_link_quality_cmd *link_cmd;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	sta_id = il_prep_station(il, ctx, il_bcast_addr, false, NULL);</div><div class='add'>+	if (sta_id == IL_INVALID_STATION) {</div><div class='add'>+		IL_ERR("Unable to prepare broadcast station\n");</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il-&gt;stations[sta_id].used |= IL_STA_DRIVER_ACTIVE;</div><div class='add'>+	il-&gt;stations[sta_id].used |= IL_STA_BCAST;</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	link_cmd = il4965_sta_alloc_lq(il, sta_id);</div><div class='add'>+	if (!link_cmd) {</div><div class='add'>+		IL_ERR</div><div class='add'>+		    ("Unable to initialize rate scaling for bcast station.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	il-&gt;stations[sta_id].lq = link_cmd;</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_update_bcast_station - update broadcast station's LQ command</div><div class='add'>+ *</div><div class='add'>+ * Only used by iwl4965. Placed here to have all bcast station management</div><div class='add'>+ * code together.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_update_bcast_station(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct il_link_quality_cmd *link_cmd;</div><div class='add'>+	u8 sta_id = ctx-&gt;bcast_sta_id;</div><div class='add'>+</div><div class='add'>+	link_cmd = il4965_sta_alloc_lq(il, sta_id);</div><div class='add'>+	if (!link_cmd) {</div><div class='add'>+		IL_ERR("Unable to initialize rate scaling for bcast sta.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	if (il-&gt;stations[sta_id].lq)</div><div class='add'>+		kfree(il-&gt;stations[sta_id].lq);</div><div class='add'>+	else</div><div class='add'>+		D_INFO("Bcast sta rate scaling has not been initialized.\n");</div><div class='add'>+	il-&gt;stations[sta_id].lq = link_cmd;</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_update_bcast_stations(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	return il4965_update_bcast_station(il, &amp;il-&gt;ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_sta_tx_modify_enable_tid - Enable Tx for this TID in station table</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il4965_sta_tx_modify_enable_tid(struct il_priv *il, int sta_id, int tid)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct il_addsta_cmd sta_cmd;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* Remove "disable" flag, to enable Tx for this TID */</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	il-&gt;stations[sta_id].sta.sta.modify_mask = STA_MODIFY_TID_DISABLE_TX;</div><div class='add'>+	il-&gt;stations[sta_id].sta.tid_disable_tx &amp;= cpu_to_le16(~(1 &lt;&lt; tid));</div><div class='add'>+	il-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='add'>+	memcpy(&amp;sta_cmd, &amp;il-&gt;stations[sta_id].sta,</div><div class='add'>+	       sizeof(struct il_addsta_cmd));</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	return il_send_add_sta(il, &amp;sta_cmd, CMD_SYNC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_sta_rx_agg_start(struct il_priv *il, struct ieee80211_sta *sta, int tid,</div><div class='add'>+			u16 ssn)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int sta_id;</div><div class='add'>+	struct il_addsta_cmd sta_cmd;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	sta_id = il_sta_id(sta);</div><div class='add'>+	if (sta_id == IL_INVALID_STATION)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	il-&gt;stations[sta_id].sta.station_flags_msk = 0;</div><div class='add'>+	il-&gt;stations[sta_id].sta.sta.modify_mask = STA_MODIFY_ADDBA_TID_MSK;</div><div class='add'>+	il-&gt;stations[sta_id].sta.add_immediate_ba_tid = (u8) tid;</div><div class='add'>+	il-&gt;stations[sta_id].sta.add_immediate_ba_ssn = cpu_to_le16(ssn);</div><div class='add'>+	il-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='add'>+	memcpy(&amp;sta_cmd, &amp;il-&gt;stations[sta_id].sta,</div><div class='add'>+	       sizeof(struct il_addsta_cmd));</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	return il_send_add_sta(il, &amp;sta_cmd, CMD_SYNC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_sta_rx_agg_stop(struct il_priv *il, struct ieee80211_sta *sta, int tid)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int sta_id;</div><div class='add'>+	struct il_addsta_cmd sta_cmd;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	sta_id = il_sta_id(sta);</div><div class='add'>+	if (sta_id == IL_INVALID_STATION) {</div><div class='add'>+		IL_ERR("Invalid station for AGG tid %d\n", tid);</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	il-&gt;stations[sta_id].sta.station_flags_msk = 0;</div><div class='add'>+	il-&gt;stations[sta_id].sta.sta.modify_mask = STA_MODIFY_DELBA_TID_MSK;</div><div class='add'>+	il-&gt;stations[sta_id].sta.remove_immediate_ba_tid = (u8) tid;</div><div class='add'>+	il-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='add'>+	memcpy(&amp;sta_cmd, &amp;il-&gt;stations[sta_id].sta,</div><div class='add'>+	       sizeof(struct il_addsta_cmd));</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	return il_send_add_sta(il, &amp;sta_cmd, CMD_SYNC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_sta_modify_sleep_tx_count(struct il_priv *il, int sta_id, int cnt)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	il-&gt;stations[sta_id].sta.station_flags |= STA_FLG_PWR_SAVE_MSK;</div><div class='add'>+	il-&gt;stations[sta_id].sta.station_flags_msk = STA_FLG_PWR_SAVE_MSK;</div><div class='add'>+	il-&gt;stations[sta_id].sta.sta.modify_mask =</div><div class='add'>+	    STA_MODIFY_SLEEP_TX_COUNT_MSK;</div><div class='add'>+	il-&gt;stations[sta_id].sta.sleep_tx_count = cpu_to_le16(cnt);</div><div class='add'>+	il-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='add'>+	il_send_add_sta(il, &amp;il-&gt;stations[sta_id].sta, CMD_ASYNC);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_update_chain_flags(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	if (il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain) {</div><div class='add'>+		il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain(il, &amp;il-&gt;ctx);</div><div class='add'>+		if (il-&gt;ctx.active.rx_chain != il-&gt;ctx.staging.rx_chain)</div><div class='add'>+			il_commit_rxon(il, &amp;il-&gt;ctx);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_clear_free_frames(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct list_head *element;</div><div class='add'>+</div><div class='add'>+	D_INFO("%d frames on pre-allocated heap on clear.\n", il-&gt;frames_count);</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;il-&gt;free_frames)) {</div><div class='add'>+		element = il-&gt;free_frames.next;</div><div class='add'>+		list_del(element);</div><div class='add'>+		kfree(list_entry(element, struct il_frame, list));</div><div class='add'>+		il-&gt;frames_count--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (il-&gt;frames_count) {</div><div class='add'>+		IL_WARN("%d frames still in use.  Did we lose one?\n",</div><div class='add'>+			il-&gt;frames_count);</div><div class='add'>+		il-&gt;frames_count = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct il_frame *</div><div class='add'>+il4965_get_free_frame(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_frame *frame;</div><div class='add'>+	struct list_head *element;</div><div class='add'>+	if (list_empty(&amp;il-&gt;free_frames)) {</div><div class='add'>+		frame = kzalloc(sizeof(*frame), GFP_KERNEL);</div><div class='add'>+		if (!frame) {</div><div class='add'>+			IL_ERR("Could not allocate frame!\n");</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		il-&gt;frames_count++;</div><div class='add'>+		return frame;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	element = il-&gt;free_frames.next;</div><div class='add'>+	list_del(element);</div><div class='add'>+	return list_entry(element, struct il_frame, list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_free_frame(struct il_priv *il, struct il_frame *frame)</div><div class='add'>+{</div><div class='add'>+	memset(frame, 0, sizeof(*frame));</div><div class='add'>+	list_add(&amp;frame-&gt;list, &amp;il-&gt;free_frames);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+il4965_fill_beacon_frame(struct il_priv *il, struct ieee80211_hdr *hdr,</div><div class='add'>+			 int left)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;beacon_skb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;beacon_skb-&gt;len &gt; left)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memcpy(hdr, il-&gt;beacon_skb-&gt;data, il-&gt;beacon_skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	return il-&gt;beacon_skb-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Parse the beacon frame to find the TIM element and set tim_idx &amp; tim_size */</div><div class='add'>+static void</div><div class='add'>+il4965_set_beacon_tim(struct il_priv *il,</div><div class='add'>+		      struct il_tx_beacon_cmd *tx_beacon_cmd, u8 * beacon,</div><div class='add'>+		      u32 frame_size)</div><div class='add'>+{</div><div class='add'>+	u16 tim_idx;</div><div class='add'>+	struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)beacon;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The idx is relative to frame start but we start looking at the</div><div class='add'>+	 * variable-length part of the beacon.</div><div class='add'>+	 */</div><div class='add'>+	tim_idx = mgmt-&gt;u.beacon.variable - beacon;</div><div class='add'>+</div><div class='add'>+	/* Parse variable-length elements of beacon to find WLAN_EID_TIM */</div><div class='add'>+	while ((tim_idx &lt; (frame_size - 2)) &amp;&amp;</div><div class='add'>+	       (beacon[tim_idx] != WLAN_EID_TIM))</div><div class='add'>+		tim_idx += beacon[tim_idx + 1] + 2;</div><div class='add'>+</div><div class='add'>+	/* If TIM field was found, set variables */</div><div class='add'>+	if ((tim_idx &lt; (frame_size - 1)) &amp;&amp; (beacon[tim_idx] == WLAN_EID_TIM)) {</div><div class='add'>+		tx_beacon_cmd-&gt;tim_idx = cpu_to_le16(tim_idx);</div><div class='add'>+		tx_beacon_cmd-&gt;tim_size = beacon[tim_idx + 1];</div><div class='add'>+	} else</div><div class='add'>+		IL_WARN("Unable to find TIM Element in beacon\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int</div><div class='add'>+il4965_hw_get_beacon_cmd(struct il_priv *il, struct il_frame *frame)</div><div class='add'>+{</div><div class='add'>+	struct il_tx_beacon_cmd *tx_beacon_cmd;</div><div class='add'>+	u32 frame_size;</div><div class='add'>+	u32 rate_flags;</div><div class='add'>+	u32 rate;</div><div class='add'>+	/*</div><div class='add'>+	 * We have to set up the TX command, the TX Beacon command, and the</div><div class='add'>+	 * beacon contents.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;beacon_ctx) {</div><div class='add'>+		IL_ERR("trying to build beacon w/o beacon context!\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize memory */</div><div class='add'>+	tx_beacon_cmd = &amp;frame-&gt;u.beacon;</div><div class='add'>+	memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd));</div><div class='add'>+</div><div class='add'>+	/* Set up TX beacon contents */</div><div class='add'>+	frame_size =</div><div class='add'>+	    il4965_fill_beacon_frame(il, tx_beacon_cmd-&gt;frame,</div><div class='add'>+				     sizeof(frame-&gt;u) - sizeof(*tx_beacon_cmd));</div><div class='add'>+	if (WARN_ON_ONCE(frame_size &gt; MAX_MPDU_SIZE))</div><div class='add'>+		return 0;</div><div class='add'>+	if (!frame_size)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Set up TX command fields */</div><div class='add'>+	tx_beacon_cmd-&gt;tx.len = cpu_to_le16((u16) frame_size);</div><div class='add'>+	tx_beacon_cmd-&gt;tx.sta_id = il-&gt;beacon_ctx-&gt;bcast_sta_id;</div><div class='add'>+	tx_beacon_cmd-&gt;tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;</div><div class='add'>+	tx_beacon_cmd-&gt;tx.tx_flags =</div><div class='add'>+	    TX_CMD_FLG_SEQ_CTL_MSK | TX_CMD_FLG_TSF_MSK |</div><div class='add'>+	    TX_CMD_FLG_STA_RATE_MSK;</div><div class='add'>+</div><div class='add'>+	/* Set up TX beacon command fields */</div><div class='add'>+	il4965_set_beacon_tim(il, tx_beacon_cmd, (u8 *) tx_beacon_cmd-&gt;frame,</div><div class='add'>+			      frame_size);</div><div class='add'>+</div><div class='add'>+	/* Set up packet rate and flags */</div><div class='add'>+	rate = il_get_lowest_plcp(il, il-&gt;beacon_ctx);</div><div class='add'>+	il4965_toggle_tx_ant(il, &amp;il-&gt;mgmt_tx_ant, il-&gt;hw_params.valid_tx_ant);</div><div class='add'>+	rate_flags = BIT(il-&gt;mgmt_tx_ant) &lt;&lt; RATE_MCS_ANT_POS;</div><div class='add'>+	if ((rate &gt;= IL_FIRST_CCK_RATE) &amp;&amp; (rate &lt;= IL_LAST_CCK_RATE))</div><div class='add'>+		rate_flags |= RATE_MCS_CCK_MSK;</div><div class='add'>+	tx_beacon_cmd-&gt;tx.rate_n_flags = cpu_to_le32(rate | rate_flags);</div><div class='add'>+</div><div class='add'>+	return sizeof(*tx_beacon_cmd) + frame_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_send_beacon_cmd(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_frame *frame;</div><div class='add'>+	unsigned int frame_size;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	frame = il4965_get_free_frame(il);</div><div class='add'>+	if (!frame) {</div><div class='add'>+		IL_ERR("Could not obtain free frame buffer for beacon "</div><div class='add'>+		       "command.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	frame_size = il4965_hw_get_beacon_cmd(il, frame);</div><div class='add'>+	if (!frame_size) {</div><div class='add'>+		IL_ERR("Error configuring the beacon command\n");</div><div class='add'>+		il4965_free_frame(il, frame);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = il_send_cmd_pdu(il, C_TX_BEACON, frame_size, &amp;frame-&gt;u.cmd[0]);</div><div class='add'>+</div><div class='add'>+	il4965_free_frame(il, frame);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline dma_addr_t</div><div class='add'>+il4965_tfd_tb_get_addr(struct il_tfd *tfd, u8 idx)</div><div class='add'>+{</div><div class='add'>+	struct il_tfd_tb *tb = &amp;tfd-&gt;tbs[idx];</div><div class='add'>+</div><div class='add'>+	dma_addr_t addr = get_unaligned_le32(&amp;tb-&gt;lo);</div><div class='add'>+	if (sizeof(dma_addr_t) &gt; sizeof(u32))</div><div class='add'>+		addr |=</div><div class='add'>+		    ((dma_addr_t) (le16_to_cpu(tb-&gt;hi_n_len) &amp; 0xF) &lt;&lt; 16) &lt;&lt;</div><div class='add'>+		    16;</div><div class='add'>+</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16</div><div class='add'>+il4965_tfd_tb_get_len(struct il_tfd *tfd, u8 idx)</div><div class='add'>+{</div><div class='add'>+	struct il_tfd_tb *tb = &amp;tfd-&gt;tbs[idx];</div><div class='add'>+</div><div class='add'>+	return le16_to_cpu(tb-&gt;hi_n_len) &gt;&gt; 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il4965_tfd_set_tb(struct il_tfd *tfd, u8 idx, dma_addr_t addr, u16 len)</div><div class='add'>+{</div><div class='add'>+	struct il_tfd_tb *tb = &amp;tfd-&gt;tbs[idx];</div><div class='add'>+	u16 hi_n_len = len &lt;&lt; 4;</div><div class='add'>+</div><div class='add'>+	put_unaligned_le32(addr, &amp;tb-&gt;lo);</div><div class='add'>+	if (sizeof(dma_addr_t) &gt; sizeof(u32))</div><div class='add'>+		hi_n_len |= ((addr &gt;&gt; 16) &gt;&gt; 16) &amp; 0xF;</div><div class='add'>+</div><div class='add'>+	tb-&gt;hi_n_len = cpu_to_le16(hi_n_len);</div><div class='add'>+</div><div class='add'>+	tfd-&gt;num_tbs = idx + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8</div><div class='add'>+il4965_tfd_get_num_tbs(struct il_tfd *tfd)</div><div class='add'>+{</div><div class='add'>+	return tfd-&gt;num_tbs &amp; 0x1f;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_hw_txq_free_tfd - Free all chunks referenced by TFD [txq-&gt;q.read_ptr]</div><div class='add'>+ * @il - driver ilate data</div><div class='add'>+ * @txq - tx queue</div><div class='add'>+ *</div><div class='add'>+ * Does NOT advance any TFD circular buffer read/write idxes</div><div class='add'>+ * Does NOT free the TFD itself (which is within circular buffer)</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il4965_hw_txq_free_tfd(struct il_priv *il, struct il_tx_queue *txq)</div><div class='add'>+{</div><div class='add'>+	struct il_tfd *tfd_tmp = (struct il_tfd *)txq-&gt;tfds;</div><div class='add'>+	struct il_tfd *tfd;</div><div class='add'>+	struct pci_dev *dev = il-&gt;pci_dev;</div><div class='add'>+	int idx = txq-&gt;q.read_ptr;</div><div class='add'>+	int i;</div><div class='add'>+	int num_tbs;</div><div class='add'>+</div><div class='add'>+	tfd = &amp;tfd_tmp[idx];</div><div class='add'>+</div><div class='add'>+	/* Sanity check on number of chunks */</div><div class='add'>+	num_tbs = il4965_tfd_get_num_tbs(tfd);</div><div class='add'>+</div><div class='add'>+	if (num_tbs &gt;= IL_NUM_OF_TBS) {</div><div class='add'>+		IL_ERR("Too many chunks: %i\n", num_tbs);</div><div class='add'>+		/* @todo issue fatal error, it is quite serious situation */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Unmap tx_cmd */</div><div class='add'>+	if (num_tbs)</div><div class='add'>+		pci_unmap_single(dev, dma_unmap_addr(&amp;txq-&gt;meta[idx], mapping),</div><div class='add'>+				 dma_unmap_len(&amp;txq-&gt;meta[idx], len),</div><div class='add'>+				 PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+</div><div class='add'>+	/* Unmap chunks, if any. */</div><div class='add'>+	for (i = 1; i &lt; num_tbs; i++)</div><div class='add'>+		pci_unmap_single(dev, il4965_tfd_tb_get_addr(tfd, i),</div><div class='add'>+				 il4965_tfd_tb_get_len(tfd, i),</div><div class='add'>+				 PCI_DMA_TODEVICE);</div><div class='add'>+</div><div class='add'>+	/* free SKB */</div><div class='add'>+	if (txq-&gt;txb) {</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		skb = txq-&gt;txb[txq-&gt;q.read_ptr].skb;</div><div class='add'>+</div><div class='add'>+		/* can be called from irqs-disabled context */</div><div class='add'>+		if (skb) {</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			txq-&gt;txb[txq-&gt;q.read_ptr].skb = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_hw_txq_attach_buf_to_tfd(struct il_priv *il, struct il_tx_queue *txq,</div><div class='add'>+				dma_addr_t addr, u16 len, u8 reset, u8 pad)</div><div class='add'>+{</div><div class='add'>+	struct il_queue *q;</div><div class='add'>+	struct il_tfd *tfd, *tfd_tmp;</div><div class='add'>+	u32 num_tbs;</div><div class='add'>+</div><div class='add'>+	q = &amp;txq-&gt;q;</div><div class='add'>+	tfd_tmp = (struct il_tfd *)txq-&gt;tfds;</div><div class='add'>+	tfd = &amp;tfd_tmp[q-&gt;write_ptr];</div><div class='add'>+</div><div class='add'>+	if (reset)</div><div class='add'>+		memset(tfd, 0, sizeof(*tfd));</div><div class='add'>+</div><div class='add'>+	num_tbs = il4965_tfd_get_num_tbs(tfd);</div><div class='add'>+</div><div class='add'>+	/* Each TFD can point to a maximum 20 Tx buffers */</div><div class='add'>+	if (num_tbs &gt;= IL_NUM_OF_TBS) {</div><div class='add'>+		IL_ERR("Error can not send more than %d chunks\n",</div><div class='add'>+		       IL_NUM_OF_TBS);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUG_ON(addr &amp; ~DMA_BIT_MASK(36));</div><div class='add'>+	if (unlikely(addr &amp; ~IL_TX_DMA_MASK))</div><div class='add'>+		IL_ERR("Unaligned address = %llx\n", (unsigned long long)addr);</div><div class='add'>+</div><div class='add'>+	il4965_tfd_set_tb(tfd, num_tbs, addr, len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Tell nic where to find circular buffer of Tx Frame Descriptors for</div><div class='add'>+ * given Tx queue, and enable the DMA channel used for that queue.</div><div class='add'>+ *</div><div class='add'>+ * 4965 supports up to 16 Tx queues in DRAM, mapped to up to 8 Tx DMA</div><div class='add'>+ * channels supported in hardware.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il4965_hw_tx_queue_init(struct il_priv *il, struct il_tx_queue *txq)</div><div class='add'>+{</div><div class='add'>+	int txq_id = txq-&gt;q.id;</div><div class='add'>+</div><div class='add'>+	/* Circular buffer (TFD queue in DRAM) physical base address */</div><div class='add'>+	il_wr(il, FH49_MEM_CBBC_QUEUE(txq_id), txq-&gt;q.dma_addr &gt;&gt; 8);</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'>+ * Generic RX handler implementations</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+static void</div><div class='add'>+il4965_hdl_alive(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	struct il_alive_resp *palive;</div><div class='add'>+	struct delayed_work *pwork;</div><div class='add'>+</div><div class='add'>+	palive = &amp;pkt-&gt;u.alive_frame;</div><div class='add'>+</div><div class='add'>+	D_INFO("Alive ucode status 0x%08X revision " "0x%01X 0x%01X\n",</div><div class='add'>+	       palive-&gt;is_valid, palive-&gt;ver_type, palive-&gt;ver_subtype);</div><div class='add'>+</div><div class='add'>+	if (palive-&gt;ver_subtype == INITIALIZE_SUBTYPE) {</div><div class='add'>+		D_INFO("Initialization Alive received.\n");</div><div class='add'>+		memcpy(&amp;il-&gt;card_alive_init, &amp;pkt-&gt;u.alive_frame,</div><div class='add'>+		       sizeof(struct il_init_alive_resp));</div><div class='add'>+		pwork = &amp;il-&gt;init_alive_start;</div><div class='add'>+	} else {</div><div class='add'>+		D_INFO("Runtime Alive received.\n");</div><div class='add'>+		memcpy(&amp;il-&gt;card_alive, &amp;pkt-&gt;u.alive_frame,</div><div class='add'>+		       sizeof(struct il_alive_resp));</div><div class='add'>+		pwork = &amp;il-&gt;alive_start;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We delay the ALIVE response by 5ms to</div><div class='add'>+	 * give the HW RF Kill time to activate... */</div><div class='add'>+	if (palive-&gt;is_valid == UCODE_VALID_OK)</div><div class='add'>+		queue_delayed_work(il-&gt;workqueue, pwork, msecs_to_jiffies(5));</div><div class='add'>+	else</div><div class='add'>+		IL_WARN("uCode did not respond OK.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_bg_stats_periodic - Timer callback to queue stats</div><div class='add'>+ *</div><div class='add'>+ * This callback is provided in order to send a stats request.</div><div class='add'>+ *</div><div class='add'>+ * This timer function is continually reset to execute within</div><div class='add'>+ * REG_RECALIB_PERIOD seconds since the last N_STATS</div><div class='add'>+ * was received.  We need to ensure we receive the stats in order</div><div class='add'>+ * to update the temperature used for calibrating the TXPOWER.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_bg_stats_periodic(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = (struct il_priv *)data;</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* dont send host command if rf-kill is on */</div><div class='add'>+	if (!il_is_ready_rf(il))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	il_send_stats_request(il, CMD_ASYNC, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_hdl_beacon(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	struct il4965_beacon_notif *beacon =</div><div class='add'>+	    (struct il4965_beacon_notif *)pkt-&gt;u.raw;</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	u8 rate = il4965_hw_get_rate(beacon-&gt;beacon_notify_hdr.rate_n_flags);</div><div class='add'>+</div><div class='add'>+	D_RX("beacon status %x retries %d iss %d tsf:0x%.8x%.8x rate %d\n",</div><div class='add'>+	     le32_to_cpu(beacon-&gt;beacon_notify_hdr.u.status) &amp; TX_STATUS_MSK,</div><div class='add'>+	     beacon-&gt;beacon_notify_hdr.failure_frame,</div><div class='add'>+	     le32_to_cpu(beacon-&gt;ibss_mgr_status),</div><div class='add'>+	     le32_to_cpu(beacon-&gt;high_tsf), le32_to_cpu(beacon-&gt;low_tsf), rate);</div><div class='add'>+#endif</div><div class='add'>+	il-&gt;ibss_manager = le32_to_cpu(beacon-&gt;ibss_mgr_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_perform_ct_kill_task(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	D_POWER("Stop all queues\n");</div><div class='add'>+</div><div class='add'>+	if (il-&gt;mac80211_registered)</div><div class='add'>+		ieee80211_stop_queues(il-&gt;hw);</div><div class='add'>+</div><div class='add'>+	_il_wr(il, CSR_UCODE_DRV_GP1_SET,</div><div class='add'>+	       CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);</div><div class='add'>+	_il_rd(il, CSR_UCODE_DRV_GP1);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;reg_lock, flags);</div><div class='add'>+	if (!_il_grab_nic_access(il))</div><div class='add'>+		_il_release_nic_access(il);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;reg_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Handle notification from uCode that card's power state is changing</div><div class='add'>+ * due to software, hardware, or critical temperature RFKILL */</div><div class='add'>+static void</div><div class='add'>+il4965_hdl_card_state(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	u32 flags = le32_to_cpu(pkt-&gt;u.card_state_notif.flags);</div><div class='add'>+	unsigned long status = il-&gt;status;</div><div class='add'>+</div><div class='add'>+	D_RF_KILL("Card state received: HW:%s SW:%s CT:%s\n",</div><div class='add'>+		  (flags &amp; HW_CARD_DISABLED) ? "Kill" : "On",</div><div class='add'>+		  (flags &amp; SW_CARD_DISABLED) ? "Kill" : "On",</div><div class='add'>+		  (flags &amp; CT_CARD_DISABLED) ? "Reached" : "Not reached");</div><div class='add'>+</div><div class='add'>+	if (flags &amp; (SW_CARD_DISABLED | HW_CARD_DISABLED | CT_CARD_DISABLED)) {</div><div class='add'>+</div><div class='add'>+		_il_wr(il, CSR_UCODE_DRV_GP1_SET,</div><div class='add'>+		       CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);</div><div class='add'>+</div><div class='add'>+		il_wr(il, HBUS_TARG_MBX_C, HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED);</div><div class='add'>+</div><div class='add'>+		if (!(flags &amp; RXON_CARD_DISABLED)) {</div><div class='add'>+			_il_wr(il, CSR_UCODE_DRV_GP1_CLR,</div><div class='add'>+			       CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);</div><div class='add'>+			il_wr(il, HBUS_TARG_MBX_C,</div><div class='add'>+			      HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags &amp; CT_CARD_DISABLED)</div><div class='add'>+		il4965_perform_ct_kill_task(il);</div><div class='add'>+</div><div class='add'>+	if (flags &amp; HW_CARD_DISABLED)</div><div class='add'>+		set_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+	else</div><div class='add'>+		clear_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (!(flags &amp; RXON_CARD_DISABLED))</div><div class='add'>+		il_scan_cancel(il);</div><div class='add'>+</div><div class='add'>+	if ((test_bit(S_RF_KILL_HW, &amp;status) !=</div><div class='add'>+	     test_bit(S_RF_KILL_HW, &amp;il-&gt;status)))</div><div class='add'>+		wiphy_rfkill_set_hw_state(il-&gt;hw-&gt;wiphy,</div><div class='add'>+					  test_bit(S_RF_KILL_HW, &amp;il-&gt;status));</div><div class='add'>+	else</div><div class='add'>+		wake_up(&amp;il-&gt;wait_command_queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_setup_handlers - Initialize Rx handler callbacks</div><div class='add'>+ *</div><div class='add'>+ * Setup the RX handlers for each of the reply types sent from the uCode</div><div class='add'>+ * to the host.</div><div class='add'>+ *</div><div class='add'>+ * This function chains into the hardware specific files for them to setup</div><div class='add'>+ * any hardware specific handlers as well.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_setup_handlers(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	il-&gt;handlers[N_ALIVE] = il4965_hdl_alive;</div><div class='add'>+	il-&gt;handlers[N_ERROR] = il_hdl_error;</div><div class='add'>+	il-&gt;handlers[N_CHANNEL_SWITCH] = il_hdl_csa;</div><div class='add'>+	il-&gt;handlers[N_SPECTRUM_MEASUREMENT] = il_hdl_spectrum_measurement;</div><div class='add'>+	il-&gt;handlers[N_PM_SLEEP] = il_hdl_pm_sleep;</div><div class='add'>+	il-&gt;handlers[N_PM_DEBUG_STATS] = il_hdl_pm_debug_stats;</div><div class='add'>+	il-&gt;handlers[N_BEACON] = il4965_hdl_beacon;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The same handler is used for both the REPLY to a discrete</div><div class='add'>+	 * stats request from the host as well as for the periodic</div><div class='add'>+	 * stats notifications (after received beacons) from the uCode.</div><div class='add'>+	 */</div><div class='add'>+	il-&gt;handlers[C_STATS] = il4965_hdl_c_stats;</div><div class='add'>+	il-&gt;handlers[N_STATS] = il4965_hdl_stats;</div><div class='add'>+</div><div class='add'>+	il_setup_rx_scan_handlers(il);</div><div class='add'>+</div><div class='add'>+	/* status change handler */</div><div class='add'>+	il-&gt;handlers[N_CARD_STATE] = il4965_hdl_card_state;</div><div class='add'>+</div><div class='add'>+	il-&gt;handlers[N_MISSED_BEACONS] = il4965_hdl_missed_beacon;</div><div class='add'>+	/* Rx handlers */</div><div class='add'>+	il-&gt;handlers[N_RX_PHY] = il4965_hdl_rx_phy;</div><div class='add'>+	il-&gt;handlers[N_RX_MPDU] = il4965_hdl_rx;</div><div class='add'>+	/* block ack */</div><div class='add'>+	il-&gt;handlers[N_COMPRESSED_BA] = il4965_hdl_compressed_ba;</div><div class='add'>+	/* Set up hardware specific Rx handlers */</div><div class='add'>+	il-&gt;cfg-&gt;ops-&gt;lib-&gt;handler_setup(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_rx_handle - Main entry function for receiving responses from uCode</div><div class='add'>+ *</div><div class='add'>+ * Uses the il-&gt;handlers callback function array to invoke</div><div class='add'>+ * the appropriate handlers, including command responses,</div><div class='add'>+ * frame-received notifications, and other notifications.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il4965_rx_handle(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_buf *rxb;</div><div class='add'>+	struct il_rx_pkt *pkt;</div><div class='add'>+	struct il_rx_queue *rxq = &amp;il-&gt;rxq;</div><div class='add'>+	u32 r, i;</div><div class='add'>+	int reclaim;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 fill_rx = 0;</div><div class='add'>+	u32 count = 8;</div><div class='add'>+	int total_empty;</div><div class='add'>+</div><div class='add'>+	/* uCode's read idx (stored in shared DRAM) indicates the last Rx</div><div class='add'>+	 * buffer that the driver may process (last buffer filled by ucode). */</div><div class='add'>+	r = le16_to_cpu(rxq-&gt;rb_stts-&gt;closed_rb_num) &amp; 0x0FFF;</div><div class='add'>+	i = rxq-&gt;read;</div><div class='add'>+</div><div class='add'>+	/* Rx interrupt, but nothing sent from uCode */</div><div class='add'>+	if (i == r)</div><div class='add'>+		D_RX("r = %d, i = %d\n", r, i);</div><div class='add'>+</div><div class='add'>+	/* calculate total frames need to be restock after handling RX */</div><div class='add'>+	total_empty = r - rxq-&gt;write_actual;</div><div class='add'>+	if (total_empty &lt; 0)</div><div class='add'>+		total_empty += RX_QUEUE_SIZE;</div><div class='add'>+</div><div class='add'>+	if (total_empty &gt; (RX_QUEUE_SIZE / 2))</div><div class='add'>+		fill_rx = 1;</div><div class='add'>+</div><div class='add'>+	while (i != r) {</div><div class='add'>+		int len;</div><div class='add'>+</div><div class='add'>+		rxb = rxq-&gt;queue[i];</div><div class='add'>+</div><div class='add'>+		/* If an RXB doesn't have a Rx queue slot associated with it,</div><div class='add'>+		 * then a bug has been introduced in the queue refilling</div><div class='add'>+		 * routines -- catch it here */</div><div class='add'>+		BUG_ON(rxb == NULL);</div><div class='add'>+</div><div class='add'>+		rxq-&gt;queue[i] = NULL;</div><div class='add'>+</div><div class='add'>+		pci_unmap_page(il-&gt;pci_dev, rxb-&gt;page_dma,</div><div class='add'>+			       PAGE_SIZE &lt;&lt; il-&gt;hw_params.rx_page_order,</div><div class='add'>+			       PCI_DMA_FROMDEVICE);</div><div class='add'>+		pkt = rxb_addr(rxb);</div><div class='add'>+</div><div class='add'>+		len = le32_to_cpu(pkt-&gt;len_n_flags) &amp; IL_RX_FRAME_SIZE_MSK;</div><div class='add'>+		len += sizeof(u32);	/* account for status word */</div><div class='add'>+</div><div class='add'>+		/* Reclaim a command buffer only if this packet is a response</div><div class='add'>+		 *   to a (driver-originated) command.</div><div class='add'>+		 * If the packet (e.g. Rx frame) originated from uCode,</div><div class='add'>+		 *   there is no command buffer to reclaim.</div><div class='add'>+		 * Ucode should set SEQ_RX_FRAME bit if ucode-originated,</div><div class='add'>+		 *   but apparently a few don't get set; catch them here. */</div><div class='add'>+		reclaim = !(pkt-&gt;hdr.sequence &amp; SEQ_RX_FRAME) &amp;&amp;</div><div class='add'>+		    (pkt-&gt;hdr.cmd != N_RX_PHY) &amp;&amp; (pkt-&gt;hdr.cmd != N_RX) &amp;&amp;</div><div class='add'>+		    (pkt-&gt;hdr.cmd != N_RX_MPDU) &amp;&amp;</div><div class='add'>+		    (pkt-&gt;hdr.cmd != N_COMPRESSED_BA) &amp;&amp;</div><div class='add'>+		    (pkt-&gt;hdr.cmd != N_STATS) &amp;&amp; (pkt-&gt;hdr.cmd != C_TX);</div><div class='add'>+</div><div class='add'>+		/* Based on type of command response or notification,</div><div class='add'>+		 *   handle those that need handling via function in</div><div class='add'>+		 *   handlers table.  See il4965_setup_handlers() */</div><div class='add'>+		if (il-&gt;handlers[pkt-&gt;hdr.cmd]) {</div><div class='add'>+			D_RX("r = %d, i = %d, %s, 0x%02x\n", r, i,</div><div class='add'>+			     il_get_cmd_string(pkt-&gt;hdr.cmd), pkt-&gt;hdr.cmd);</div><div class='add'>+			il-&gt;isr_stats.handlers[pkt-&gt;hdr.cmd]++;</div><div class='add'>+			il-&gt;handlers[pkt-&gt;hdr.cmd] (il, rxb);</div><div class='add'>+		} else {</div><div class='add'>+			/* No handling needed */</div><div class='add'>+			D_RX("r %d i %d No handler needed for %s, 0x%02x\n", r,</div><div class='add'>+			     i, il_get_cmd_string(pkt-&gt;hdr.cmd), pkt-&gt;hdr.cmd);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * XXX: After here, we should always check rxb-&gt;page</div><div class='add'>+		 * against NULL before touching it or its virtual</div><div class='add'>+		 * memory (pkt). Because some handler might have</div><div class='add'>+		 * already taken or freed the pages.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		if (reclaim) {</div><div class='add'>+			/* Invoke any callbacks, transfer the buffer to caller,</div><div class='add'>+			 * and fire off the (possibly) blocking il_send_cmd()</div><div class='add'>+			 * as we reclaim the driver command queue */</div><div class='add'>+			if (rxb-&gt;page)</div><div class='add'>+				il_tx_cmd_complete(il, rxb);</div><div class='add'>+			else</div><div class='add'>+				IL_WARN("Claim null rxb?\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Reuse the page if possible. For notification packets and</div><div class='add'>+		 * SKBs that fail to Rx correctly, add them back into the</div><div class='add'>+		 * rx_free list for reuse later. */</div><div class='add'>+		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='add'>+		if (rxb-&gt;page != NULL) {</div><div class='add'>+			rxb-&gt;page_dma =</div><div class='add'>+			    pci_map_page(il-&gt;pci_dev, rxb-&gt;page, 0,</div><div class='add'>+					 PAGE_SIZE &lt;&lt; il-&gt;hw_params.</div><div class='add'>+					 rx_page_order, PCI_DMA_FROMDEVICE);</div><div class='add'>+			list_add_tail(&amp;rxb-&gt;list, &amp;rxq-&gt;rx_free);</div><div class='add'>+			rxq-&gt;free_count++;</div><div class='add'>+		} else</div><div class='add'>+			list_add_tail(&amp;rxb-&gt;list, &amp;rxq-&gt;rx_used);</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		i = (i + 1) &amp; RX_QUEUE_MASK;</div><div class='add'>+		/* If there are a lot of unused frames,</div><div class='add'>+		 * restock the Rx queue so ucode wont assert. */</div><div class='add'>+		if (fill_rx) {</div><div class='add'>+			count++;</div><div class='add'>+			if (count &gt;= 8) {</div><div class='add'>+				rxq-&gt;read = i;</div><div class='add'>+				il4965_rx_replenish_now(il);</div><div class='add'>+				count = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Backtrack one entry */</div><div class='add'>+	rxq-&gt;read = i;</div><div class='add'>+	if (fill_rx)</div><div class='add'>+		il4965_rx_replenish_now(il);</div><div class='add'>+	else</div><div class='add'>+		il4965_rx_queue_restock(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* call this function to flush any scheduled tasklet */</div><div class='add'>+static inline void</div><div class='add'>+il4965_synchronize_irq(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	/* wait to make sure we flush pending tasklet */</div><div class='add'>+	synchronize_irq(il-&gt;pci_dev-&gt;irq);</div><div class='add'>+	tasklet_kill(&amp;il-&gt;irq_tasklet);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_irq_tasklet(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	u32 inta, handled = 0;</div><div class='add'>+	u32 inta_fh;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 i;</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	u32 inta_mask;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Ack/clear/reset pending uCode interrupts.</div><div class='add'>+	 * Note:  Some bits in CSR_INT are "OR" of bits in CSR_FH_INT_STATUS,</div><div class='add'>+	 *  and will clear only when CSR_FH_INT_STATUS gets cleared. */</div><div class='add'>+	inta = _il_rd(il, CSR_INT);</div><div class='add'>+	_il_wr(il, CSR_INT, inta);</div><div class='add'>+</div><div class='add'>+	/* Ack/clear/reset pending flow-handler (DMA) interrupts.</div><div class='add'>+	 * Any new interrupts that happen after this, either while we're</div><div class='add'>+	 * in this tasklet, or later, will show up in next ISR/tasklet. */</div><div class='add'>+	inta_fh = _il_rd(il, CSR_FH_INT_STATUS);</div><div class='add'>+	_il_wr(il, CSR_FH_INT_STATUS, inta_fh);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	if (il_get_debug_level(il) &amp; IL_DL_ISR) {</div><div class='add'>+		/* just for debug */</div><div class='add'>+		inta_mask = _il_rd(il, CSR_INT_MASK);</div><div class='add'>+		D_ISR("inta 0x%08x, enabled 0x%08x, fh 0x%08x\n", inta,</div><div class='add'>+		      inta_mask, inta_fh);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Since CSR_INT and CSR_FH_INT_STATUS reads and clears are not</div><div class='add'>+	 * atomic, make sure that inta covers all the interrupts that</div><div class='add'>+	 * we've discovered, even if FH interrupt came in just after</div><div class='add'>+	 * reading CSR_INT. */</div><div class='add'>+	if (inta_fh &amp; CSR49_FH_INT_RX_MASK)</div><div class='add'>+		inta |= CSR_INT_BIT_FH_RX;</div><div class='add'>+	if (inta_fh &amp; CSR49_FH_INT_TX_MASK)</div><div class='add'>+		inta |= CSR_INT_BIT_FH_TX;</div><div class='add'>+</div><div class='add'>+	/* Now service all interrupt bits discovered above. */</div><div class='add'>+	if (inta &amp; CSR_INT_BIT_HW_ERR) {</div><div class='add'>+		IL_ERR("Hardware error detected.  Restarting.\n");</div><div class='add'>+</div><div class='add'>+		/* Tell the device to stop sending interrupts */</div><div class='add'>+		il_disable_interrupts(il);</div><div class='add'>+</div><div class='add'>+		il-&gt;isr_stats.hw++;</div><div class='add'>+		il_irq_handle_error(il);</div><div class='add'>+</div><div class='add'>+		handled |= CSR_INT_BIT_HW_ERR;</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	if (il_get_debug_level(il) &amp; (IL_DL_ISR)) {</div><div class='add'>+		/* NIC fires this, but we don't use it, redundant with WAKEUP */</div><div class='add'>+		if (inta &amp; CSR_INT_BIT_SCD) {</div><div class='add'>+			D_ISR("Scheduler finished to transmit "</div><div class='add'>+			      "the frame/frames.\n");</div><div class='add'>+			il-&gt;isr_stats.sch++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Alive notification via Rx interrupt will do the real work */</div><div class='add'>+		if (inta &amp; CSR_INT_BIT_ALIVE) {</div><div class='add'>+			D_ISR("Alive interrupt\n");</div><div class='add'>+			il-&gt;isr_stats.alive++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	/* Safely ignore these bits for debug checks below */</div><div class='add'>+	inta &amp;= ~(CSR_INT_BIT_SCD | CSR_INT_BIT_ALIVE);</div><div class='add'>+</div><div class='add'>+	/* HW RF KILL switch toggled */</div><div class='add'>+	if (inta &amp; CSR_INT_BIT_RF_KILL) {</div><div class='add'>+		int hw_rf_kill = 0;</div><div class='add'>+		if (!</div><div class='add'>+		    (_il_rd(il, CSR_GP_CNTRL) &amp;</div><div class='add'>+		     CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW))</div><div class='add'>+			hw_rf_kill = 1;</div><div class='add'>+</div><div class='add'>+		IL_WARN("RF_KILL bit toggled to %s.\n",</div><div class='add'>+			hw_rf_kill ? "disable radio" : "enable radio");</div><div class='add'>+</div><div class='add'>+		il-&gt;isr_stats.rfkill++;</div><div class='add'>+</div><div class='add'>+		/* driver only loads ucode once setting the interface up.</div><div class='add'>+		 * the driver allows loading the ucode even if the radio</div><div class='add'>+		 * is killed. Hence update the killswitch state here. The</div><div class='add'>+		 * rfkill handler will care about restarting if needed.</div><div class='add'>+		 */</div><div class='add'>+		if (!test_bit(S_ALIVE, &amp;il-&gt;status)) {</div><div class='add'>+			if (hw_rf_kill)</div><div class='add'>+				set_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+			else</div><div class='add'>+				clear_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+			wiphy_rfkill_set_hw_state(il-&gt;hw-&gt;wiphy, hw_rf_kill);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		handled |= CSR_INT_BIT_RF_KILL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Chip got too hot and stopped itself */</div><div class='add'>+	if (inta &amp; CSR_INT_BIT_CT_KILL) {</div><div class='add'>+		IL_ERR("Microcode CT kill error detected.\n");</div><div class='add'>+		il-&gt;isr_stats.ctkill++;</div><div class='add'>+		handled |= CSR_INT_BIT_CT_KILL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Error detected by uCode */</div><div class='add'>+	if (inta &amp; CSR_INT_BIT_SW_ERR) {</div><div class='add'>+		IL_ERR("Microcode SW error detected. " " Restarting 0x%X.\n",</div><div class='add'>+		       inta);</div><div class='add'>+		il-&gt;isr_stats.sw++;</div><div class='add'>+		il_irq_handle_error(il);</div><div class='add'>+		handled |= CSR_INT_BIT_SW_ERR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * uCode wakes up after power-down sleep.</div><div class='add'>+	 * Tell device about any new tx or host commands enqueued,</div><div class='add'>+	 * and about any Rx buffers made available while asleep.</div><div class='add'>+	 */</div><div class='add'>+	if (inta &amp; CSR_INT_BIT_WAKEUP) {</div><div class='add'>+		D_ISR("Wakeup interrupt\n");</div><div class='add'>+		il_rx_queue_update_write_ptr(il, &amp;il-&gt;rxq);</div><div class='add'>+		for (i = 0; i &lt; il-&gt;hw_params.max_txq_num; i++)</div><div class='add'>+			il_txq_update_write_ptr(il, &amp;il-&gt;txq[i]);</div><div class='add'>+		il-&gt;isr_stats.wakeup++;</div><div class='add'>+		handled |= CSR_INT_BIT_WAKEUP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* All uCode command responses, including Tx command responses,</div><div class='add'>+	 * Rx "responses" (frame-received notification), and other</div><div class='add'>+	 * notifications from uCode come through here*/</div><div class='add'>+	if (inta &amp; (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX)) {</div><div class='add'>+		il4965_rx_handle(il);</div><div class='add'>+		il-&gt;isr_stats.rx++;</div><div class='add'>+		handled |= (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This "Tx" DMA channel is used only for loading uCode */</div><div class='add'>+	if (inta &amp; CSR_INT_BIT_FH_TX) {</div><div class='add'>+		D_ISR("uCode load interrupt\n");</div><div class='add'>+		il-&gt;isr_stats.tx++;</div><div class='add'>+		handled |= CSR_INT_BIT_FH_TX;</div><div class='add'>+		/* Wake up uCode load routine, now that load is complete */</div><div class='add'>+		il-&gt;ucode_write_complete = 1;</div><div class='add'>+		wake_up(&amp;il-&gt;wait_command_queue);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (inta &amp; ~handled) {</div><div class='add'>+		IL_ERR("Unhandled INTA bits 0x%08x\n", inta &amp; ~handled);</div><div class='add'>+		il-&gt;isr_stats.unhandled++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (inta &amp; ~(il-&gt;inta_mask)) {</div><div class='add'>+		IL_WARN("Disabled INTA bits 0x%08x were pending\n",</div><div class='add'>+			inta &amp; ~il-&gt;inta_mask);</div><div class='add'>+		IL_WARN("   with FH49_INT = 0x%08x\n", inta_fh);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Re-enable all interrupts */</div><div class='add'>+	/* only Re-enable if disabled by irq */</div><div class='add'>+	if (test_bit(S_INT_ENABLED, &amp;il-&gt;status))</div><div class='add'>+		il_enable_interrupts(il);</div><div class='add'>+	/* Re-enable RF_KILL if it occurred */</div><div class='add'>+	else if (handled &amp; CSR_INT_BIT_RF_KILL)</div><div class='add'>+		il_enable_rfkill_int(il);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	if (il_get_debug_level(il) &amp; (IL_DL_ISR)) {</div><div class='add'>+		inta = _il_rd(il, CSR_INT);</div><div class='add'>+		inta_mask = _il_rd(il, CSR_INT_MASK);</div><div class='add'>+		inta_fh = _il_rd(il, CSR_FH_INT_STATUS);</div><div class='add'>+		D_ISR("End inta 0x%08x, enabled 0x%08x, fh 0x%08x, "</div><div class='add'>+		      "flags 0x%08lx\n", inta, inta_mask, inta_fh, flags);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * sysfs attributes</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The following adds a new attribute to the sysfs representation</div><div class='add'>+ * of this device driver (i.e. a new file in /sys/class/net/wlan0/device/)</div><div class='add'>+ * used for controlling the debug level.</div><div class='add'>+ *</div><div class='add'>+ * See the level definitions in iwl for details.</div><div class='add'>+ *</div><div class='add'>+ * The debug_level being managed using sysfs below is a per device debug</div><div class='add'>+ * level that is used instead of the global debug level if it (the per</div><div class='add'>+ * device debug level) is set.</div><div class='add'>+ */</div><div class='add'>+static ssize_t</div><div class='add'>+il4965_show_debug_level(struct device *d, struct device_attribute *attr,</div><div class='add'>+			char *buf)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+	return sprintf(buf, "0x%08X\n", il_get_debug_level(il));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il4965_store_debug_level(struct device *d, struct device_attribute *attr,</div><div class='add'>+			 const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = strict_strtoul(buf, 0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		IL_ERR("%s is not in hex or decimal form.\n", buf);</div><div class='add'>+	else {</div><div class='add'>+		il-&gt;debug_level = val;</div><div class='add'>+		if (il_alloc_traffic_mem(il))</div><div class='add'>+			IL_ERR("Not enough memory to generate traffic log\n");</div><div class='add'>+	}</div><div class='add'>+	return strnlen(buf, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(debug_level, S_IWUSR | S_IRUGO, il4965_show_debug_level,</div><div class='add'>+		   il4965_store_debug_level);</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_IWLEGACY_DEBUG */</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il4965_show_temperature(struct device *d, struct device_attribute *attr,</div><div class='add'>+			char *buf)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+</div><div class='add'>+	if (!il_is_alive(il))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", il-&gt;temperature);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(temperature, S_IRUGO, il4965_show_temperature, NULL);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il4965_show_tx_power(struct device *d, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+</div><div class='add'>+	if (!il_is_ready_rf(il))</div><div class='add'>+		return sprintf(buf, "off\n");</div><div class='add'>+	else</div><div class='add'>+		return sprintf(buf, "%d\n", il-&gt;tx_power_user_lmt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il4965_store_tx_power(struct device *d, struct device_attribute *attr,</div><div class='add'>+		      const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = dev_get_drvdata(d);</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = strict_strtoul(buf, 10, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		IL_INFO("%s is not in decimal form.\n", buf);</div><div class='add'>+	else {</div><div class='add'>+		ret = il_set_tx_power(il, val, false);</div><div class='add'>+		if (ret)</div><div class='add'>+			IL_ERR("failed setting tx power (0x%d).\n", ret);</div><div class='add'>+		else</div><div class='add'>+			ret = count;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(tx_power, S_IWUSR | S_IRUGO, il4965_show_tx_power,</div><div class='add'>+		   il4965_store_tx_power);</div><div class='add'>+</div><div class='add'>+static struct attribute *il_sysfs_entries[] = {</div><div class='add'>+	&amp;dev_attr_temperature.attr,</div><div class='add'>+	&amp;dev_attr_tx_power.attr,</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	&amp;dev_attr_debug_level.attr,</div><div class='add'>+#endif</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute_group il_attribute_group = {</div><div class='add'>+	.name = NULL,		/* put in device directory */</div><div class='add'>+	.attrs = il_sysfs_entries,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * uCode download functions</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_dealloc_ucode_pci(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	il_free_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_code);</div><div class='add'>+	il_free_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_data);</div><div class='add'>+	il_free_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_data_backup);</div><div class='add'>+	il_free_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_init);</div><div class='add'>+	il_free_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_init_data);</div><div class='add'>+	il_free_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_boot);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_nic_start(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	/* Remove all resets to allow NIC to operate */</div><div class='add'>+	_il_wr(il, CSR_RESET, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void il4965_ucode_callback(const struct firmware *ucode_raw,</div><div class='add'>+				  void *context);</div><div class='add'>+static int il4965_mac_setup_register(struct il_priv *il, u32 max_probe_length);</div><div class='add'>+</div><div class='add'>+static int __must_check</div><div class='add'>+il4965_request_firmware(struct il_priv *il, bool first)</div><div class='add'>+{</div><div class='add'>+	const char *name_pre = il-&gt;cfg-&gt;fw_name_pre;</div><div class='add'>+	char tag[8];</div><div class='add'>+</div><div class='add'>+	if (first) {</div><div class='add'>+		il-&gt;fw_idx = il-&gt;cfg-&gt;ucode_api_max;</div><div class='add'>+		sprintf(tag, "%d", il-&gt;fw_idx);</div><div class='add'>+	} else {</div><div class='add'>+		il-&gt;fw_idx--;</div><div class='add'>+		sprintf(tag, "%d", il-&gt;fw_idx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (il-&gt;fw_idx &lt; il-&gt;cfg-&gt;ucode_api_min) {</div><div class='add'>+		IL_ERR("no suitable firmware found!\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sprintf(il-&gt;firmware_name, "%s%s%s", name_pre, tag, ".ucode");</div><div class='add'>+</div><div class='add'>+	D_INFO("attempting to load firmware '%s'\n", il-&gt;firmware_name);</div><div class='add'>+</div><div class='add'>+	return request_firmware_nowait(THIS_MODULE, 1, il-&gt;firmware_name,</div><div class='add'>+				       &amp;il-&gt;pci_dev-&gt;dev, GFP_KERNEL, il,</div><div class='add'>+				       il4965_ucode_callback);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct il4965_firmware_pieces {</div><div class='add'>+	const void *inst, *data, *init, *init_data, *boot;</div><div class='add'>+	size_t inst_size, data_size, init_size, init_data_size, boot_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il4965_load_firmware(struct il_priv *il, const struct firmware *ucode_raw,</div><div class='add'>+		     struct il4965_firmware_pieces *pieces)</div><div class='add'>+{</div><div class='add'>+	struct il_ucode_header *ucode = (void *)ucode_raw-&gt;data;</div><div class='add'>+	u32 api_ver, hdr_size;</div><div class='add'>+	const u8 *src;</div><div class='add'>+</div><div class='add'>+	il-&gt;ucode_ver = le32_to_cpu(ucode-&gt;ver);</div><div class='add'>+	api_ver = IL_UCODE_API(il-&gt;ucode_ver);</div><div class='add'>+</div><div class='add'>+	switch (api_ver) {</div><div class='add'>+	default:</div><div class='add'>+	case 0:</div><div class='add'>+	case 1:</div><div class='add'>+	case 2:</div><div class='add'>+		hdr_size = 24;</div><div class='add'>+		if (ucode_raw-&gt;size &lt; hdr_size) {</div><div class='add'>+			IL_ERR("File size too small!\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		pieces-&gt;inst_size = le32_to_cpu(ucode-&gt;v1.inst_size);</div><div class='add'>+		pieces-&gt;data_size = le32_to_cpu(ucode-&gt;v1.data_size);</div><div class='add'>+		pieces-&gt;init_size = le32_to_cpu(ucode-&gt;v1.init_size);</div><div class='add'>+		pieces-&gt;init_data_size = le32_to_cpu(ucode-&gt;v1.init_data_size);</div><div class='add'>+		pieces-&gt;boot_size = le32_to_cpu(ucode-&gt;v1.boot_size);</div><div class='add'>+		src = ucode-&gt;v1.data;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Verify size of file vs. image size info in file's header */</div><div class='add'>+	if (ucode_raw-&gt;size !=</div><div class='add'>+	    hdr_size + pieces-&gt;inst_size + pieces-&gt;data_size +</div><div class='add'>+	    pieces-&gt;init_size + pieces-&gt;init_data_size + pieces-&gt;boot_size) {</div><div class='add'>+</div><div class='add'>+		IL_ERR("uCode file size %d does not match expected size\n",</div><div class='add'>+		       (int)ucode_raw-&gt;size);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pieces-&gt;inst = src;</div><div class='add'>+	src += pieces-&gt;inst_size;</div><div class='add'>+	pieces-&gt;data = src;</div><div class='add'>+	src += pieces-&gt;data_size;</div><div class='add'>+	pieces-&gt;init = src;</div><div class='add'>+	src += pieces-&gt;init_size;</div><div class='add'>+	pieces-&gt;init_data = src;</div><div class='add'>+	src += pieces-&gt;init_data_size;</div><div class='add'>+	pieces-&gt;boot = src;</div><div class='add'>+	src += pieces-&gt;boot_size;</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'>+ * il4965_ucode_callback - callback when firmware was loaded</div><div class='add'>+ *</div><div class='add'>+ * If loaded successfully, copies the firmware into buffers</div><div class='add'>+ * for the card to fetch (via DMA).</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_ucode_callback(const struct firmware *ucode_raw, void *context)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = context;</div><div class='add'>+	struct il_ucode_header *ucode;</div><div class='add'>+	int err;</div><div class='add'>+	struct il4965_firmware_pieces pieces;</div><div class='add'>+	const unsigned int api_max = il-&gt;cfg-&gt;ucode_api_max;</div><div class='add'>+	const unsigned int api_min = il-&gt;cfg-&gt;ucode_api_min;</div><div class='add'>+	u32 api_ver;</div><div class='add'>+</div><div class='add'>+	u32 max_probe_length = 200;</div><div class='add'>+	u32 standard_phy_calibration_size =</div><div class='add'>+	    IL_DEFAULT_STANDARD_PHY_CALIBRATE_TBL_SIZE;</div><div class='add'>+</div><div class='add'>+	memset(&amp;pieces, 0, sizeof(pieces));</div><div class='add'>+</div><div class='add'>+	if (!ucode_raw) {</div><div class='add'>+		if (il-&gt;fw_idx &lt;= il-&gt;cfg-&gt;ucode_api_max)</div><div class='add'>+			IL_ERR("request for firmware file '%s' failed.\n",</div><div class='add'>+			       il-&gt;firmware_name);</div><div class='add'>+		goto try_again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_INFO("Loaded firmware file '%s' (%zd bytes).\n", il-&gt;firmware_name,</div><div class='add'>+	       ucode_raw-&gt;size);</div><div class='add'>+</div><div class='add'>+	/* Make sure that we got at least the API version number */</div><div class='add'>+	if (ucode_raw-&gt;size &lt; 4) {</div><div class='add'>+		IL_ERR("File size way too small!\n");</div><div class='add'>+		goto try_again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Data from ucode file:  header followed by uCode images */</div><div class='add'>+	ucode = (struct il_ucode_header *)ucode_raw-&gt;data;</div><div class='add'>+</div><div class='add'>+	err = il4965_load_firmware(il, ucode_raw, &amp;pieces);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		goto try_again;</div><div class='add'>+</div><div class='add'>+	api_ver = IL_UCODE_API(il-&gt;ucode_ver);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * api_ver should match the api version forming part of the</div><div class='add'>+	 * firmware filename ... but we don't check for that and only rely</div><div class='add'>+	 * on the API version read from firmware header from here on forward</div><div class='add'>+	 */</div><div class='add'>+	if (api_ver &lt; api_min || api_ver &gt; api_max) {</div><div class='add'>+		IL_ERR("Driver unable to support your firmware API. "</div><div class='add'>+		       "Driver supports v%u, firmware is v%u.\n", api_max,</div><div class='add'>+		       api_ver);</div><div class='add'>+		goto try_again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (api_ver != api_max)</div><div class='add'>+		IL_ERR("Firmware has old API version. Expected v%u, "</div><div class='add'>+		       "got v%u. New firmware can be obtained "</div><div class='add'>+		       "from http://www.intellinuxwireless.org.\n", api_max,</div><div class='add'>+		       api_ver);</div><div class='add'>+</div><div class='add'>+	IL_INFO("loaded firmware version %u.%u.%u.%u\n",</div><div class='add'>+		IL_UCODE_MAJOR(il-&gt;ucode_ver), IL_UCODE_MINOR(il-&gt;ucode_ver),</div><div class='add'>+		IL_UCODE_API(il-&gt;ucode_ver), IL_UCODE_SERIAL(il-&gt;ucode_ver));</div><div class='add'>+</div><div class='add'>+	snprintf(il-&gt;hw-&gt;wiphy-&gt;fw_version, sizeof(il-&gt;hw-&gt;wiphy-&gt;fw_version),</div><div class='add'>+		 "%u.%u.%u.%u", IL_UCODE_MAJOR(il-&gt;ucode_ver),</div><div class='add'>+		 IL_UCODE_MINOR(il-&gt;ucode_ver), IL_UCODE_API(il-&gt;ucode_ver),</div><div class='add'>+		 IL_UCODE_SERIAL(il-&gt;ucode_ver));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For any of the failures below (before allocating pci memory)</div><div class='add'>+	 * we will try to load a version with a smaller API -- maybe the</div><div class='add'>+	 * user just got a corrupted version of the latest API.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	D_INFO("f/w package hdr ucode version raw = 0x%x\n", il-&gt;ucode_ver);</div><div class='add'>+	D_INFO("f/w package hdr runtime inst size = %Zd\n", pieces.inst_size);</div><div class='add'>+	D_INFO("f/w package hdr runtime data size = %Zd\n", pieces.data_size);</div><div class='add'>+	D_INFO("f/w package hdr init inst size = %Zd\n", pieces.init_size);</div><div class='add'>+	D_INFO("f/w package hdr init data size = %Zd\n", pieces.init_data_size);</div><div class='add'>+	D_INFO("f/w package hdr boot inst size = %Zd\n", pieces.boot_size);</div><div class='add'>+</div><div class='add'>+	/* Verify that uCode images will fit in card's SRAM */</div><div class='add'>+	if (pieces.inst_size &gt; il-&gt;hw_params.max_inst_size) {</div><div class='add'>+		IL_ERR("uCode instr len %Zd too large to fit in\n",</div><div class='add'>+		       pieces.inst_size);</div><div class='add'>+		goto try_again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pieces.data_size &gt; il-&gt;hw_params.max_data_size) {</div><div class='add'>+		IL_ERR("uCode data len %Zd too large to fit in\n",</div><div class='add'>+		       pieces.data_size);</div><div class='add'>+		goto try_again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pieces.init_size &gt; il-&gt;hw_params.max_inst_size) {</div><div class='add'>+		IL_ERR("uCode init instr len %Zd too large to fit in\n",</div><div class='add'>+		       pieces.init_size);</div><div class='add'>+		goto try_again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pieces.init_data_size &gt; il-&gt;hw_params.max_data_size) {</div><div class='add'>+		IL_ERR("uCode init data len %Zd too large to fit in\n",</div><div class='add'>+		       pieces.init_data_size);</div><div class='add'>+		goto try_again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pieces.boot_size &gt; il-&gt;hw_params.max_bsm_size) {</div><div class='add'>+		IL_ERR("uCode boot instr len %Zd too large to fit in\n",</div><div class='add'>+		       pieces.boot_size);</div><div class='add'>+		goto try_again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate ucode buffers for card's bus-master loading ... */</div><div class='add'>+</div><div class='add'>+	/* Runtime instructions and 2 copies of data:</div><div class='add'>+	 * 1) unmodified from disk</div><div class='add'>+	 * 2) backup cache for save/restore during power-downs */</div><div class='add'>+	il-&gt;ucode_code.len = pieces.inst_size;</div><div class='add'>+	il_alloc_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_code);</div><div class='add'>+</div><div class='add'>+	il-&gt;ucode_data.len = pieces.data_size;</div><div class='add'>+	il_alloc_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_data);</div><div class='add'>+</div><div class='add'>+	il-&gt;ucode_data_backup.len = pieces.data_size;</div><div class='add'>+	il_alloc_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_data_backup);</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;ucode_code.v_addr || !il-&gt;ucode_data.v_addr ||</div><div class='add'>+	    !il-&gt;ucode_data_backup.v_addr)</div><div class='add'>+		goto err_pci_alloc;</div><div class='add'>+</div><div class='add'>+	/* Initialization instructions and data */</div><div class='add'>+	if (pieces.init_size &amp;&amp; pieces.init_data_size) {</div><div class='add'>+		il-&gt;ucode_init.len = pieces.init_size;</div><div class='add'>+		il_alloc_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_init);</div><div class='add'>+</div><div class='add'>+		il-&gt;ucode_init_data.len = pieces.init_data_size;</div><div class='add'>+		il_alloc_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_init_data);</div><div class='add'>+</div><div class='add'>+		if (!il-&gt;ucode_init.v_addr || !il-&gt;ucode_init_data.v_addr)</div><div class='add'>+			goto err_pci_alloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Bootstrap (instructions only, no data) */</div><div class='add'>+	if (pieces.boot_size) {</div><div class='add'>+		il-&gt;ucode_boot.len = pieces.boot_size;</div><div class='add'>+		il_alloc_fw_desc(il-&gt;pci_dev, &amp;il-&gt;ucode_boot);</div><div class='add'>+</div><div class='add'>+		if (!il-&gt;ucode_boot.v_addr)</div><div class='add'>+			goto err_pci_alloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now that we can no longer fail, copy information */</div><div class='add'>+</div><div class='add'>+	il-&gt;sta_key_max_num = STA_KEY_MAX_NUM;</div><div class='add'>+</div><div class='add'>+	/* Copy images into buffers for card's bus-master reads ... */</div><div class='add'>+</div><div class='add'>+	/* Runtime instructions (first block of data in file) */</div><div class='add'>+	D_INFO("Copying (but not loading) uCode instr len %Zd\n",</div><div class='add'>+	       pieces.inst_size);</div><div class='add'>+	memcpy(il-&gt;ucode_code.v_addr, pieces.inst, pieces.inst_size);</div><div class='add'>+</div><div class='add'>+	D_INFO("uCode instr buf vaddr = 0x%p, paddr = 0x%08x\n",</div><div class='add'>+	       il-&gt;ucode_code.v_addr, (u32) il-&gt;ucode_code.p_addr);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Runtime data</div><div class='add'>+	 * NOTE:  Copy into backup buffer will be done in il_up()</div><div class='add'>+	 */</div><div class='add'>+	D_INFO("Copying (but not loading) uCode data len %Zd\n",</div><div class='add'>+	       pieces.data_size);</div><div class='add'>+	memcpy(il-&gt;ucode_data.v_addr, pieces.data, pieces.data_size);</div><div class='add'>+	memcpy(il-&gt;ucode_data_backup.v_addr, pieces.data, pieces.data_size);</div><div class='add'>+</div><div class='add'>+	/* Initialization instructions */</div><div class='add'>+	if (pieces.init_size) {</div><div class='add'>+		D_INFO("Copying (but not loading) init instr len %Zd\n",</div><div class='add'>+		       pieces.init_size);</div><div class='add'>+		memcpy(il-&gt;ucode_init.v_addr, pieces.init, pieces.init_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialization data */</div><div class='add'>+	if (pieces.init_data_size) {</div><div class='add'>+		D_INFO("Copying (but not loading) init data len %Zd\n",</div><div class='add'>+		       pieces.init_data_size);</div><div class='add'>+		memcpy(il-&gt;ucode_init_data.v_addr, pieces.init_data,</div><div class='add'>+		       pieces.init_data_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Bootstrap instructions */</div><div class='add'>+	D_INFO("Copying (but not loading) boot instr len %Zd\n",</div><div class='add'>+	       pieces.boot_size);</div><div class='add'>+	memcpy(il-&gt;ucode_boot.v_addr, pieces.boot, pieces.boot_size);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * figure out the offset of chain noise reset and gain commands</div><div class='add'>+	 * base on the size of standard phy calibration commands table size</div><div class='add'>+	 */</div><div class='add'>+	il-&gt;_4965.phy_calib_chain_noise_reset_cmd =</div><div class='add'>+	    standard_phy_calibration_size;</div><div class='add'>+	il-&gt;_4965.phy_calib_chain_noise_gain_cmd =</div><div class='add'>+	    standard_phy_calibration_size + 1;</div><div class='add'>+</div><div class='add'>+	/**************************************************</div><div class='add'>+	 * This is still part of probe() in a sense...</div><div class='add'>+	 *</div><div class='add'>+	 * 9. Setup and register with mac80211 and debugfs</div><div class='add'>+	 **************************************************/</div><div class='add'>+	err = il4965_mac_setup_register(il, max_probe_length);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unbind;</div><div class='add'>+</div><div class='add'>+	err = il_dbgfs_register(il, DRV_NAME);</div><div class='add'>+	if (err)</div><div class='add'>+		IL_ERR("failed to create debugfs files. Ignoring error: %d\n",</div><div class='add'>+		       err);</div><div class='add'>+</div><div class='add'>+	err = sysfs_create_group(&amp;il-&gt;pci_dev-&gt;dev.kobj, &amp;il_attribute_group);</div><div class='add'>+	if (err) {</div><div class='add'>+		IL_ERR("failed to create sysfs device attributes\n");</div><div class='add'>+		goto out_unbind;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We have our copies now, allow OS release its copies */</div><div class='add'>+	release_firmware(ucode_raw);</div><div class='add'>+	complete(&amp;il-&gt;_4965.firmware_loading_complete);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+try_again:</div><div class='add'>+	/* try next, if any */</div><div class='add'>+	if (il4965_request_firmware(il, false))</div><div class='add'>+		goto out_unbind;</div><div class='add'>+	release_firmware(ucode_raw);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err_pci_alloc:</div><div class='add'>+	IL_ERR("failed to allocate pci memory\n");</div><div class='add'>+	il4965_dealloc_ucode_pci(il);</div><div class='add'>+out_unbind:</div><div class='add'>+	complete(&amp;il-&gt;_4965.firmware_loading_complete);</div><div class='add'>+	device_release_driver(&amp;il-&gt;pci_dev-&gt;dev);</div><div class='add'>+	release_firmware(ucode_raw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *const desc_lookup_text[] = {</div><div class='add'>+	"OK",</div><div class='add'>+	"FAIL",</div><div class='add'>+	"BAD_PARAM",</div><div class='add'>+	"BAD_CHECKSUM",</div><div class='add'>+	"NMI_INTERRUPT_WDG",</div><div class='add'>+	"SYSASSERT",</div><div class='add'>+	"FATAL_ERROR",</div><div class='add'>+	"BAD_COMMAND",</div><div class='add'>+	"HW_ERROR_TUNE_LOCK",</div><div class='add'>+	"HW_ERROR_TEMPERATURE",</div><div class='add'>+	"ILLEGAL_CHAN_FREQ",</div><div class='add'>+	"VCC_NOT_STBL",</div><div class='add'>+	"FH49_ERROR",</div><div class='add'>+	"NMI_INTERRUPT_HOST",</div><div class='add'>+	"NMI_INTERRUPT_ACTION_PT",</div><div class='add'>+	"NMI_INTERRUPT_UNKNOWN",</div><div class='add'>+	"UCODE_VERSION_MISMATCH",</div><div class='add'>+	"HW_ERROR_ABS_LOCK",</div><div class='add'>+	"HW_ERROR_CAL_LOCK_FAIL",</div><div class='add'>+	"NMI_INTERRUPT_INST_ACTION_PT",</div><div class='add'>+	"NMI_INTERRUPT_DATA_ACTION_PT",</div><div class='add'>+	"NMI_TRM_HW_ER",</div><div class='add'>+	"NMI_INTERRUPT_TRM",</div><div class='add'>+	"NMI_INTERRUPT_BREAK_POINT",</div><div class='add'>+	"DEBUG_0",</div><div class='add'>+	"DEBUG_1",</div><div class='add'>+	"DEBUG_2",</div><div class='add'>+	"DEBUG_3",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct {</div><div class='add'>+	char *name;</div><div class='add'>+	u8 num;</div><div class='add'>+} advanced_lookup[] = {</div><div class='add'>+	{</div><div class='add'>+	"NMI_INTERRUPT_WDG", 0x34}, {</div><div class='add'>+	"SYSASSERT", 0x35}, {</div><div class='add'>+	"UCODE_VERSION_MISMATCH", 0x37}, {</div><div class='add'>+	"BAD_COMMAND", 0x38}, {</div><div class='add'>+	"NMI_INTERRUPT_DATA_ACTION_PT", 0x3C}, {</div><div class='add'>+	"FATAL_ERROR", 0x3D}, {</div><div class='add'>+	"NMI_TRM_HW_ERR", 0x46}, {</div><div class='add'>+	"NMI_INTERRUPT_TRM", 0x4C}, {</div><div class='add'>+	"NMI_INTERRUPT_BREAK_POINT", 0x54}, {</div><div class='add'>+	"NMI_INTERRUPT_WDG_RXF_FULL", 0x5C}, {</div><div class='add'>+	"NMI_INTERRUPT_WDG_NO_RBD_RXF_FULL", 0x64}, {</div><div class='add'>+	"NMI_INTERRUPT_HOST", 0x66}, {</div><div class='add'>+	"NMI_INTERRUPT_ACTION_PT", 0x7C}, {</div><div class='add'>+	"NMI_INTERRUPT_UNKNOWN", 0x84}, {</div><div class='add'>+	"NMI_INTERRUPT_INST_ACTION_PT", 0x86}, {</div><div class='add'>+"ADVANCED_SYSASSERT", 0},};</div><div class='add'>+</div><div class='add'>+static const char *</div><div class='add'>+il4965_desc_lookup(u32 num)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int max = ARRAY_SIZE(desc_lookup_text);</div><div class='add'>+</div><div class='add'>+	if (num &lt; max)</div><div class='add'>+		return desc_lookup_text[num];</div><div class='add'>+</div><div class='add'>+	max = ARRAY_SIZE(advanced_lookup) - 1;</div><div class='add'>+	for (i = 0; i &lt; max; i++) {</div><div class='add'>+		if (advanced_lookup[i].num == num)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return advanced_lookup[i].name;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ERROR_START_OFFSET  (1 * sizeof(u32))</div><div class='add'>+#define ERROR_ELEM_SIZE     (7 * sizeof(u32))</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_dump_nic_error_log(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	u32 data2, line;</div><div class='add'>+	u32 desc, time, count, base, data1;</div><div class='add'>+	u32 blink1, blink2, ilink1, ilink2;</div><div class='add'>+	u32 pc, hcmd;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;ucode_type == UCODE_INIT)</div><div class='add'>+		base = le32_to_cpu(il-&gt;card_alive_init.error_event_table_ptr);</div><div class='add'>+	else</div><div class='add'>+		base = le32_to_cpu(il-&gt;card_alive.error_event_table_ptr);</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;cfg-&gt;ops-&gt;lib-&gt;is_valid_rtc_data_addr(base)) {</div><div class='add'>+		IL_ERR("Not valid error log pointer 0x%08X for %s uCode\n",</div><div class='add'>+		       base, (il-&gt;ucode_type == UCODE_INIT) ? "Init" : "RT");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	count = il_read_targ_mem(il, base);</div><div class='add'>+</div><div class='add'>+	if (ERROR_START_OFFSET &lt;= count * ERROR_ELEM_SIZE) {</div><div class='add'>+		IL_ERR("Start IWL Error Log Dump:\n");</div><div class='add'>+		IL_ERR("Status: 0x%08lX, count: %d\n", il-&gt;status, count);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc = il_read_targ_mem(il, base + 1 * sizeof(u32));</div><div class='add'>+	il-&gt;isr_stats.err_code = desc;</div><div class='add'>+	pc = il_read_targ_mem(il, base + 2 * sizeof(u32));</div><div class='add'>+	blink1 = il_read_targ_mem(il, base + 3 * sizeof(u32));</div><div class='add'>+	blink2 = il_read_targ_mem(il, base + 4 * sizeof(u32));</div><div class='add'>+	ilink1 = il_read_targ_mem(il, base + 5 * sizeof(u32));</div><div class='add'>+	ilink2 = il_read_targ_mem(il, base + 6 * sizeof(u32));</div><div class='add'>+	data1 = il_read_targ_mem(il, base + 7 * sizeof(u32));</div><div class='add'>+	data2 = il_read_targ_mem(il, base + 8 * sizeof(u32));</div><div class='add'>+	line = il_read_targ_mem(il, base + 9 * sizeof(u32));</div><div class='add'>+	time = il_read_targ_mem(il, base + 11 * sizeof(u32));</div><div class='add'>+	hcmd = il_read_targ_mem(il, base + 22 * sizeof(u32));</div><div class='add'>+</div><div class='add'>+	IL_ERR("Desc                                  Time       "</div><div class='add'>+	       "data1      data2      line\n");</div><div class='add'>+	IL_ERR("%-28s (0x%04X) %010u 0x%08X 0x%08X %u\n",</div><div class='add'>+	       il4965_desc_lookup(desc), desc, time, data1, data2, line);</div><div class='add'>+	IL_ERR("pc      blink1  blink2  ilink1  ilink2  hcmd\n");</div><div class='add'>+	IL_ERR("0x%05X 0x%05X 0x%05X 0x%05X 0x%05X 0x%05X\n", pc, blink1,</div><div class='add'>+	       blink2, ilink1, ilink2, hcmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_rf_kill_ct_config(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_ct_kill_config cmd;</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;il-&gt;lock, flags);</div><div class='add'>+	_il_wr(il, CSR_UCODE_DRV_GP1_CLR,</div><div class='add'>+	       CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	cmd.critical_temperature_R =</div><div class='add'>+	    cpu_to_le32(il-&gt;hw_params.ct_kill_threshold);</div><div class='add'>+</div><div class='add'>+	ret = il_send_cmd_pdu(il, C_CT_KILL_CONFIG, sizeof(cmd), &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		IL_ERR("C_CT_KILL_CONFIG failed\n");</div><div class='add'>+	else</div><div class='add'>+		D_INFO("C_CT_KILL_CONFIG " "succeeded, "</div><div class='add'>+		       "critical temperature is %d\n",</div><div class='add'>+		       il-&gt;hw_params.ct_kill_threshold);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const s8 default_queue_to_tx_fifo[] = {</div><div class='add'>+	IL_TX_FIFO_VO,</div><div class='add'>+	IL_TX_FIFO_VI,</div><div class='add'>+	IL_TX_FIFO_BE,</div><div class='add'>+	IL_TX_FIFO_BK,</div><div class='add'>+	IL49_CMD_FIFO_NUM,</div><div class='add'>+	IL_TX_FIFO_UNUSED,</div><div class='add'>+	IL_TX_FIFO_UNUSED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IL_MASK(lo, hi) ((1 &lt;&lt; (hi)) | ((1 &lt;&lt; (hi)) - (1 &lt;&lt; (lo))))</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il4965_alive_notify(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	u32 a;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i, chan;</div><div class='add'>+	u32 reg_val;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Clear 4965's internal Tx Scheduler data base */</div><div class='add'>+	il-&gt;scd_base_addr = il_rd_prph(il, IL49_SCD_SRAM_BASE_ADDR);</div><div class='add'>+	a = il-&gt;scd_base_addr + IL49_SCD_CONTEXT_DATA_OFFSET;</div><div class='add'>+	for (; a &lt; il-&gt;scd_base_addr + IL49_SCD_TX_STTS_BITMAP_OFFSET; a += 4)</div><div class='add'>+		il_write_targ_mem(il, a, 0);</div><div class='add'>+	for (; a &lt; il-&gt;scd_base_addr + IL49_SCD_TRANSLATE_TBL_OFFSET; a += 4)</div><div class='add'>+		il_write_targ_mem(il, a, 0);</div><div class='add'>+	for (;</div><div class='add'>+	     a &lt;</div><div class='add'>+	     il-&gt;scd_base_addr +</div><div class='add'>+	     IL49_SCD_TRANSLATE_TBL_OFFSET_QUEUE(il-&gt;hw_params.max_txq_num);</div><div class='add'>+	     a += 4)</div><div class='add'>+		il_write_targ_mem(il, a, 0);</div><div class='add'>+</div><div class='add'>+	/* Tel 4965 where to find Tx byte count tables */</div><div class='add'>+	il_wr_prph(il, IL49_SCD_DRAM_BASE_ADDR, il-&gt;scd_bc_tbls.dma &gt;&gt; 10);</div><div class='add'>+</div><div class='add'>+	/* Enable DMA channel */</div><div class='add'>+	for (chan = 0; chan &lt; FH49_TCSR_CHNL_NUM; chan++)</div><div class='add'>+		il_wr(il, FH49_TCSR_CHNL_TX_CONFIG_REG(chan),</div><div class='add'>+		      FH49_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE |</div><div class='add'>+		      FH49_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE);</div><div class='add'>+</div><div class='add'>+	/* Update FH chicken bits */</div><div class='add'>+	reg_val = il_rd(il, FH49_TX_CHICKEN_BITS_REG);</div><div class='add'>+	il_wr(il, FH49_TX_CHICKEN_BITS_REG,</div><div class='add'>+	      reg_val | FH49_TX_CHICKEN_BITS_SCD_AUTO_RETRY_EN);</div><div class='add'>+</div><div class='add'>+	/* Disable chain mode for all queues */</div><div class='add'>+	il_wr_prph(il, IL49_SCD_QUEUECHAIN_SEL, 0);</div><div class='add'>+</div><div class='add'>+	/* Initialize each Tx queue (including the command queue) */</div><div class='add'>+	for (i = 0; i &lt; il-&gt;hw_params.max_txq_num; i++) {</div><div class='add'>+</div><div class='add'>+		/* TFD circular buffer read/write idxes */</div><div class='add'>+		il_wr_prph(il, IL49_SCD_QUEUE_RDPTR(i), 0);</div><div class='add'>+		il_wr(il, HBUS_TARG_WRPTR, 0 | (i &lt;&lt; 8));</div><div class='add'>+</div><div class='add'>+		/* Max Tx Window size for Scheduler-ACK mode */</div><div class='add'>+		il_write_targ_mem(il,</div><div class='add'>+				  il-&gt;scd_base_addr +</div><div class='add'>+				  IL49_SCD_CONTEXT_QUEUE_OFFSET(i),</div><div class='add'>+				  (SCD_WIN_SIZE &lt;&lt;</div><div class='add'>+				   IL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_POS) &amp;</div><div class='add'>+				  IL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK);</div><div class='add'>+</div><div class='add'>+		/* Frame limit */</div><div class='add'>+		il_write_targ_mem(il,</div><div class='add'>+				  il-&gt;scd_base_addr +</div><div class='add'>+				  IL49_SCD_CONTEXT_QUEUE_OFFSET(i) +</div><div class='add'>+				  sizeof(u32),</div><div class='add'>+				  (SCD_FRAME_LIMIT &lt;&lt;</div><div class='add'>+				   IL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) &amp;</div><div class='add'>+				  IL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	il_wr_prph(il, IL49_SCD_INTERRUPT_MASK,</div><div class='add'>+		   (1 &lt;&lt; il-&gt;hw_params.max_txq_num) - 1);</div><div class='add'>+</div><div class='add'>+	/* Activate all Tx DMA/FIFO channels */</div><div class='add'>+	il4965_txq_set_sched(il, IL_MASK(0, 6));</div><div class='add'>+</div><div class='add'>+	il4965_set_wr_ptrs(il, IL_DEFAULT_CMD_QUEUE_NUM, 0);</div><div class='add'>+</div><div class='add'>+	/* make sure all queue are not stopped */</div><div class='add'>+	memset(&amp;il-&gt;queue_stopped[0], 0, sizeof(il-&gt;queue_stopped));</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		atomic_set(&amp;il-&gt;queue_stop_count[i], 0);</div><div class='add'>+</div><div class='add'>+	/* reset to 0 to enable all the queue first */</div><div class='add'>+	il-&gt;txq_ctx_active_msk = 0;</div><div class='add'>+	/* Map each Tx/cmd queue to its corresponding fifo */</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(default_queue_to_tx_fifo) != 7);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(default_queue_to_tx_fifo); i++) {</div><div class='add'>+		int ac = default_queue_to_tx_fifo[i];</div><div class='add'>+</div><div class='add'>+		il_txq_ctx_activate(il, i);</div><div class='add'>+</div><div class='add'>+		if (ac == IL_TX_FIFO_UNUSED)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		il4965_tx_queue_set_status(il, &amp;il-&gt;txq[i], ac, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&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'>+/**</div><div class='add'>+ * il4965_alive_start - called after N_ALIVE notification received</div><div class='add'>+ *                   from protocol/runtime uCode (initialization uCode's</div><div class='add'>+ *                   Alive gets handled by il_init_alive_start()).</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_alive_start(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	D_INFO("Runtime Alive received.\n");</div><div class='add'>+</div><div class='add'>+	if (il-&gt;card_alive.is_valid != UCODE_VALID_OK) {</div><div class='add'>+		/* We had an error bringing up the hardware, so take it</div><div class='add'>+		 * all the way back down so we can try again */</div><div class='add'>+		D_INFO("Alive failed.\n");</div><div class='add'>+		goto restart;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize uCode has loaded Runtime uCode ... verify inst image.</div><div class='add'>+	 * This is a paranoid check, because we would not have gotten the</div><div class='add'>+	 * "runtime" alive if code weren't properly loaded.  */</div><div class='add'>+	if (il4965_verify_ucode(il)) {</div><div class='add'>+		/* Runtime instruction load was bad;</div><div class='add'>+		 * take it all the way back down so we can try again */</div><div class='add'>+		D_INFO("Bad runtime uCode load.\n");</div><div class='add'>+		goto restart;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = il4965_alive_notify(il);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IL_WARN("Could not complete ALIVE transition [ntf]: %d\n", ret);</div><div class='add'>+		goto restart;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* After the ALIVE response, we can send host commands to the uCode */</div><div class='add'>+	set_bit(S_ALIVE, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* Enable watchdog to monitor the driver tx queues */</div><div class='add'>+	il_setup_watchdog(il);</div><div class='add'>+</div><div class='add'>+	if (il_is_rfkill(il))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ieee80211_wake_queues(il-&gt;hw);</div><div class='add'>+</div><div class='add'>+	il-&gt;active_rate = RATES_MASK;</div><div class='add'>+</div><div class='add'>+	if (il_is_associated_ctx(ctx)) {</div><div class='add'>+		struct il_rxon_cmd *active_rxon =</div><div class='add'>+		    (struct il_rxon_cmd *)&amp;ctx-&gt;active;</div><div class='add'>+		/* apply any changes in staging */</div><div class='add'>+		ctx-&gt;staging.filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='add'>+		active_rxon-&gt;filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='add'>+	} else {</div><div class='add'>+		/* Initialize our rx_config data */</div><div class='add'>+		il_connection_init_rx_config(il, &amp;il-&gt;ctx);</div><div class='add'>+</div><div class='add'>+		if (il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain)</div><div class='add'>+			il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain(il, ctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure bluetooth coexistence if enabled */</div><div class='add'>+	il_send_bt_config(il);</div><div class='add'>+</div><div class='add'>+	il4965_reset_run_time_calib(il);</div><div class='add'>+</div><div class='add'>+	set_bit(S_READY, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* Configure the adapter for unassociated operation */</div><div class='add'>+	il_commit_rxon(il, ctx);</div><div class='add'>+</div><div class='add'>+	/* At this point, the NIC is initialized and operational */</div><div class='add'>+	il4965_rf_kill_ct_config(il);</div><div class='add'>+</div><div class='add'>+	D_INFO("ALIVE processing complete.\n");</div><div class='add'>+	wake_up(&amp;il-&gt;wait_command_queue);</div><div class='add'>+</div><div class='add'>+	il_power_update_mode(il, true);</div><div class='add'>+	D_INFO("Updated power mode\n");</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+restart:</div><div class='add'>+	queue_work(il-&gt;workqueue, &amp;il-&gt;restart);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void il4965_cancel_deferred_work(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+__il4965_down(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int exit_pending;</div><div class='add'>+</div><div class='add'>+	D_INFO(DRV_NAME " is going down\n");</div><div class='add'>+</div><div class='add'>+	il_scan_cancel_timeout(il, 200);</div><div class='add'>+</div><div class='add'>+	exit_pending = test_and_set_bit(S_EXIT_PENDING, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* Stop TX queues watchdog. We need to have S_EXIT_PENDING bit set</div><div class='add'>+	 * to prevent rearm timer */</div><div class='add'>+	del_timer_sync(&amp;il-&gt;watchdog);</div><div class='add'>+</div><div class='add'>+	il_clear_ucode_stations(il, NULL);</div><div class='add'>+	il_dealloc_bcast_stations(il);</div><div class='add'>+	il_clear_driver_stations(il);</div><div class='add'>+</div><div class='add'>+	/* Unblock any waiting calls */</div><div class='add'>+	wake_up_all(&amp;il-&gt;wait_command_queue);</div><div class='add'>+</div><div class='add'>+	/* Wipe out the EXIT_PENDING status bit if we are not actually</div><div class='add'>+	 * exiting the module */</div><div class='add'>+	if (!exit_pending)</div><div class='add'>+		clear_bit(S_EXIT_PENDING, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* stop and reset the on-board processor */</div><div class='add'>+	_il_wr(il, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);</div><div class='add'>+</div><div class='add'>+	/* tell the device to stop sending interrupts */</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+	il_disable_interrupts(il);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+	il4965_synchronize_irq(il);</div><div class='add'>+</div><div class='add'>+	if (il-&gt;mac80211_registered)</div><div class='add'>+		ieee80211_stop_queues(il-&gt;hw);</div><div class='add'>+</div><div class='add'>+	/* If we have not previously called il_init() then</div><div class='add'>+	 * clear all bits but the RF Kill bit and return */</div><div class='add'>+	if (!il_is_init(il)) {</div><div class='add'>+		il-&gt;status =</div><div class='add'>+		    test_bit(S_RF_KILL_HW,</div><div class='add'>+			     &amp;il-&gt;</div><div class='add'>+			     status) &lt;&lt; S_RF_KILL_HW |</div><div class='add'>+		    test_bit(S_GEO_CONFIGURED,</div><div class='add'>+			     &amp;il-&gt;</div><div class='add'>+			     status) &lt;&lt; S_GEO_CONFIGURED |</div><div class='add'>+		    test_bit(S_EXIT_PENDING, &amp;il-&gt;status) &lt;&lt; S_EXIT_PENDING;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ...otherwise clear out all the status bits but the RF Kill</div><div class='add'>+	 * bit and continue taking the NIC down. */</div><div class='add'>+	il-&gt;status &amp;=</div><div class='add'>+	    test_bit(S_RF_KILL_HW,</div><div class='add'>+		     &amp;il-&gt;status) &lt;&lt; S_RF_KILL_HW | test_bit(S_GEO_CONFIGURED,</div><div class='add'>+							     &amp;il-&gt;</div><div class='add'>+							     status) &lt;&lt;</div><div class='add'>+	    S_GEO_CONFIGURED | test_bit(S_FW_ERROR,</div><div class='add'>+					&amp;il-&gt;</div><div class='add'>+					status) &lt;&lt; S_FW_ERROR |</div><div class='add'>+	    test_bit(S_EXIT_PENDING, &amp;il-&gt;status) &lt;&lt; S_EXIT_PENDING;</div><div class='add'>+</div><div class='add'>+	il4965_txq_ctx_stop(il);</div><div class='add'>+	il4965_rxq_stop(il);</div><div class='add'>+</div><div class='add'>+	/* Power-down device's busmaster DMA clocks */</div><div class='add'>+	il_wr_prph(il, APMG_CLK_DIS_REG, APMG_CLK_VAL_DMA_CLK_RQT);</div><div class='add'>+	udelay(5);</div><div class='add'>+</div><div class='add'>+	/* Make sure (redundant) we've released our request to stay awake */</div><div class='add'>+	il_clear_bit(il, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='add'>+</div><div class='add'>+	/* Stop the device, and put it in low power state */</div><div class='add'>+	il_apm_stop(il);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	memset(&amp;il-&gt;card_alive, 0, sizeof(struct il_alive_resp));</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(il-&gt;beacon_skb);</div><div class='add'>+	il-&gt;beacon_skb = NULL;</div><div class='add'>+</div><div class='add'>+	/* clear out any free frames */</div><div class='add'>+	il4965_clear_free_frames(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_down(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	__il4965_down(il);</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	il4965_cancel_deferred_work(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HW_READY_TIMEOUT (50)</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il4965_set_hw_ready(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	il_set_bit(il, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+		   CSR_HW_IF_CONFIG_REG_BIT_NIC_READY);</div><div class='add'>+</div><div class='add'>+	/* See if we got it */</div><div class='add'>+	ret =</div><div class='add'>+	    _il_poll_bit(il, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+			 CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,</div><div class='add'>+			 CSR_HW_IF_CONFIG_REG_BIT_NIC_READY, HW_READY_TIMEOUT);</div><div class='add'>+	if (ret != -ETIMEDOUT)</div><div class='add'>+		il-&gt;hw_ready = true;</div><div class='add'>+	else</div><div class='add'>+		il-&gt;hw_ready = false;</div><div class='add'>+</div><div class='add'>+	D_INFO("hardware %s\n", (il-&gt;hw_ready == 1) ? "ready" : "not ready");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il4965_prepare_card_hw(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	D_INFO("il4965_prepare_card_hw enter\n");</div><div class='add'>+</div><div class='add'>+	ret = il4965_set_hw_ready(il);</div><div class='add'>+	if (il-&gt;hw_ready)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* If HW is not ready, prepare the conditions to check again */</div><div class='add'>+	il_set_bit(il, CSR_HW_IF_CONFIG_REG, CSR_HW_IF_CONFIG_REG_PREPARE);</div><div class='add'>+</div><div class='add'>+	ret =</div><div class='add'>+	    _il_poll_bit(il, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+			 ~CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE,</div><div class='add'>+			 CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE, 150000);</div><div class='add'>+</div><div class='add'>+	/* HW should be ready by now, check again. */</div><div class='add'>+	if (ret != -ETIMEDOUT)</div><div class='add'>+		il4965_set_hw_ready(il);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MAX_HW_RESTARTS 5</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+__il4965_up(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status)) {</div><div class='add'>+		IL_WARN("Exit pending; will not bring the NIC up\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;ucode_data_backup.v_addr || !il-&gt;ucode_data.v_addr) {</div><div class='add'>+		IL_ERR("ucode not available for device bringup\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = il4965_alloc_bcast_station(il, &amp;il-&gt;ctx);</div><div class='add'>+	if (ret) {</div><div class='add'>+		il_dealloc_bcast_stations(il);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il4965_prepare_card_hw(il);</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;hw_ready) {</div><div class='add'>+		IL_WARN("Exit HW not ready\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If platform's RF_KILL switch is NOT set to KILL */</div><div class='add'>+	if (_il_rd(il, CSR_GP_CNTRL) &amp; CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)</div><div class='add'>+		clear_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+	else</div><div class='add'>+		set_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (il_is_rfkill(il)) {</div><div class='add'>+		wiphy_rfkill_set_hw_state(il-&gt;hw-&gt;wiphy, true);</div><div class='add'>+</div><div class='add'>+		il_enable_interrupts(il);</div><div class='add'>+		IL_WARN("Radio disabled by HW RF Kill switch\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	_il_wr(il, CSR_INT, 0xFFFFFFFF);</div><div class='add'>+</div><div class='add'>+	/* must be initialised before il_hw_nic_init */</div><div class='add'>+	il-&gt;cmd_queue = IL_DEFAULT_CMD_QUEUE_NUM;</div><div class='add'>+</div><div class='add'>+	ret = il4965_hw_nic_init(il);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IL_ERR("Unable to init nic\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* make sure rfkill handshake bits are cleared */</div><div class='add'>+	_il_wr(il, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);</div><div class='add'>+	_il_wr(il, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);</div><div class='add'>+</div><div class='add'>+	/* clear (again), then enable host interrupts */</div><div class='add'>+	_il_wr(il, CSR_INT, 0xFFFFFFFF);</div><div class='add'>+	il_enable_interrupts(il);</div><div class='add'>+</div><div class='add'>+	/* really make sure rfkill handshake bits are cleared */</div><div class='add'>+	_il_wr(il, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);</div><div class='add'>+	_il_wr(il, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);</div><div class='add'>+</div><div class='add'>+	/* Copy original ucode data image from disk into backup cache.</div><div class='add'>+	 * This will be used to initialize the on-board processor's</div><div class='add'>+	 * data SRAM for a clean start when the runtime program first loads. */</div><div class='add'>+	memcpy(il-&gt;ucode_data_backup.v_addr, il-&gt;ucode_data.v_addr,</div><div class='add'>+	       il-&gt;ucode_data.len);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_HW_RESTARTS; i++) {</div><div class='add'>+</div><div class='add'>+		/* load bootstrap state machine,</div><div class='add'>+		 * load bootstrap program into processor's memory,</div><div class='add'>+		 * prepare to load the "initialize" uCode */</div><div class='add'>+		ret = il-&gt;cfg-&gt;ops-&gt;lib-&gt;load_ucode(il);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			IL_ERR("Unable to set up bootstrap uCode: %d\n", ret);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* start card; "initialize" will load runtime ucode */</div><div class='add'>+		il4965_nic_start(il);</div><div class='add'>+</div><div class='add'>+		D_INFO(DRV_NAME " is coming up\n");</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_bit(S_EXIT_PENDING, &amp;il-&gt;status);</div><div class='add'>+	__il4965_down(il);</div><div class='add'>+	clear_bit(S_EXIT_PENDING, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* tried to restart and config the device for as long as our</div><div class='add'>+	 * patience could withstand */</div><div class='add'>+	IL_ERR("Unable to initialize device after %d attempts.\n", i);</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Workqueue callbacks</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_bg_init_alive_start(struct work_struct *data)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il =</div><div class='add'>+	    container_of(data, struct il_priv, init_alive_start.work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	il-&gt;cfg-&gt;ops-&gt;lib-&gt;init_alive_start(il);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_bg_alive_start(struct work_struct *data)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il =</div><div class='add'>+	    container_of(data, struct il_priv, alive_start.work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	il4965_alive_start(il);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_bg_run_time_calib_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = container_of(work, struct il_priv,</div><div class='add'>+					  run_time_calib_work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status) ||</div><div class='add'>+	    test_bit(S_SCANNING, &amp;il-&gt;status)) {</div><div class='add'>+		mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (il-&gt;start_calib) {</div><div class='add'>+		il4965_chain_noise_calibration(il, (void *)&amp;il-&gt;_4965.stats);</div><div class='add'>+		il4965_sensitivity_calibration(il, (void *)&amp;il-&gt;_4965.stats);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_bg_restart(struct work_struct *data)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = container_of(data, struct il_priv, restart);</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(S_FW_ERROR, &amp;il-&gt;status)) {</div><div class='add'>+		mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+		il-&gt;ctx.vif = NULL;</div><div class='add'>+		il-&gt;is_open = 0;</div><div class='add'>+</div><div class='add'>+		__il4965_down(il);</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+		il4965_cancel_deferred_work(il);</div><div class='add'>+		ieee80211_restart_hw(il-&gt;hw);</div><div class='add'>+	} else {</div><div class='add'>+		il4965_down(il);</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+		if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status)) {</div><div class='add'>+			mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		__il4965_up(il);</div><div class='add'>+		mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_bg_rx_replenish(struct work_struct *data)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = container_of(data, struct il_priv, rx_replenish);</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	il4965_rx_replenish(il);</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * mac80211 entry point functions</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define UCODE_READY_TIMEOUT	(4 * HZ)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Not a mac80211 entry point function, but it fits in with all the</div><div class='add'>+ * other mac80211 functions grouped here.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_mac_setup_register(struct il_priv *il, u32 max_probe_length)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct ieee80211_hw *hw = il-&gt;hw;</div><div class='add'>+</div><div class='add'>+	hw-&gt;rate_control_algorithm = "iwl-4965-rs";</div><div class='add'>+</div><div class='add'>+	/* Tell mac80211 our characteristics */</div><div class='add'>+	hw-&gt;flags =</div><div class='add'>+	    IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_AMPDU_AGGREGATION |</div><div class='add'>+	    IEEE80211_HW_NEED_DTIM_PERIOD | IEEE80211_HW_SPECTRUM_MGMT |</div><div class='add'>+	    IEEE80211_HW_REPORTS_TX_ACK_STATUS;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;cfg-&gt;sku &amp; IL_SKU_N)</div><div class='add'>+		hw-&gt;flags |=</div><div class='add'>+		    IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |</div><div class='add'>+		    IEEE80211_HW_SUPPORTS_STATIC_SMPS;</div><div class='add'>+</div><div class='add'>+	hw-&gt;sta_data_size = sizeof(struct il_station_priv);</div><div class='add'>+	hw-&gt;vif_data_size = sizeof(struct il_vif_priv);</div><div class='add'>+</div><div class='add'>+	hw-&gt;wiphy-&gt;interface_modes |= il-&gt;ctx.interface_modes;</div><div class='add'>+	hw-&gt;wiphy-&gt;interface_modes |= il-&gt;ctx.exclusive_interface_modes;</div><div class='add'>+</div><div class='add'>+	hw-&gt;wiphy-&gt;flags |=</div><div class='add'>+	    WIPHY_FLAG_CUSTOM_REGULATORY | WIPHY_FLAG_DISABLE_BEACON_HINTS;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For now, disable PS by default because it affects</div><div class='add'>+	 * RX performance significantly.</div><div class='add'>+	 */</div><div class='add'>+	hw-&gt;wiphy-&gt;flags &amp;= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;</div><div class='add'>+</div><div class='add'>+	hw-&gt;wiphy-&gt;max_scan_ssids = PROBE_OPTION_MAX;</div><div class='add'>+	/* we create the 802.11 header and a zero-length SSID element */</div><div class='add'>+	hw-&gt;wiphy-&gt;max_scan_ie_len = max_probe_length - 24 - 2;</div><div class='add'>+</div><div class='add'>+	/* Default value; 4 EDCA QOS priorities */</div><div class='add'>+	hw-&gt;queues = 4;</div><div class='add'>+</div><div class='add'>+	hw-&gt;max_listen_interval = IL_CONN_MAX_LISTEN_INTERVAL;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;bands[IEEE80211_BAND_2GHZ].n_channels)</div><div class='add'>+		il-&gt;hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] =</div><div class='add'>+		    &amp;il-&gt;bands[IEEE80211_BAND_2GHZ];</div><div class='add'>+	if (il-&gt;bands[IEEE80211_BAND_5GHZ].n_channels)</div><div class='add'>+		il-&gt;hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_5GHZ] =</div><div class='add'>+		    &amp;il-&gt;bands[IEEE80211_BAND_5GHZ];</div><div class='add'>+</div><div class='add'>+	il_leds_init(il);</div><div class='add'>+</div><div class='add'>+	ret = ieee80211_register_hw(il-&gt;hw);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IL_ERR("Failed to register hw (error %d)\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	il-&gt;mac80211_registered = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_mac_start(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	D_MAC80211("enter\n");</div><div class='add'>+</div><div class='add'>+	/* we should be verifying the device is ready to be opened */</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	ret = __il4965_up(il);</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</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 (il_is_rfkill(il))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	D_INFO("Start UP work done.\n");</div><div class='add'>+</div><div class='add'>+	/* Wait for START_ALIVE from Run Time ucode. Otherwise callbacks from</div><div class='add'>+	 * mac80211 will not be run successfully. */</div><div class='add'>+	ret = wait_event_timeout(il-&gt;wait_command_queue,</div><div class='add'>+				 test_bit(S_READY, &amp;il-&gt;status),</div><div class='add'>+				 UCODE_READY_TIMEOUT);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (!test_bit(S_READY, &amp;il-&gt;status)) {</div><div class='add'>+			IL_ERR("START_ALIVE timeout after %dms.\n",</div><div class='add'>+				jiffies_to_msecs(UCODE_READY_TIMEOUT));</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il4965_led_enable(il);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	il-&gt;is_open = 1;</div><div class='add'>+	D_MAC80211("leave\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_mac_stop(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	D_MAC80211("enter\n");</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;is_open)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	il-&gt;is_open = 0;</div><div class='add'>+</div><div class='add'>+	il4965_down(il);</div><div class='add'>+</div><div class='add'>+	flush_workqueue(il-&gt;workqueue);</div><div class='add'>+</div><div class='add'>+	/* User space software may expect getting rfkill changes</div><div class='add'>+	 * even if interface is down */</div><div class='add'>+	_il_wr(il, CSR_INT, 0xFFFFFFFF);</div><div class='add'>+	il_enable_rfkill_int(il);</div><div class='add'>+</div><div class='add'>+	D_MAC80211("leave\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	D_MACDUMP("enter\n");</div><div class='add'>+</div><div class='add'>+	D_TX("dev-&gt;xmit(%d bytes) at rate 0x%02x\n", skb-&gt;len,</div><div class='add'>+	     ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))-&gt;bitrate);</div><div class='add'>+</div><div class='add'>+	if (il4965_tx_skb(il, skb))</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+</div><div class='add'>+	D_MACDUMP("leave\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_mac_update_tkip_key(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			   struct ieee80211_key_conf *keyconf,</div><div class='add'>+			   struct ieee80211_sta *sta, u32 iv32, u16 * phase1key)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	struct il_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	D_MAC80211("enter\n");</div><div class='add'>+</div><div class='add'>+	il4965_update_tkip_key(il, vif_priv-&gt;ctx, keyconf, sta, iv32,</div><div class='add'>+			       phase1key);</div><div class='add'>+</div><div class='add'>+	D_MAC80211("leave\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_mac_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 il_priv *il = hw-&gt;priv;</div><div class='add'>+	struct il_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct il_rxon_context *ctx = vif_priv-&gt;ctx;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	bool is_default_wep_key = false;</div><div class='add'>+</div><div class='add'>+	D_MAC80211("enter\n");</div><div class='add'>+</div><div class='add'>+	if (il-&gt;cfg-&gt;mod_params-&gt;sw_crypto) {</div><div class='add'>+		D_MAC80211("leave - hwcrypto disabled\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sta_id = il_sta_id_or_broadcast(il, vif_priv-&gt;ctx, sta);</div><div class='add'>+	if (sta_id == IL_INVALID_STATION)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	il_scan_cancel_timeout(il, 100);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we are getting WEP group key and we didn't receive any key mapping</div><div class='add'>+	 * so far, we are in legacy wep mode (group key only), otherwise we are</div><div class='add'>+	 * in 1X mode.</div><div class='add'>+	 * In legacy wep mode, we use another host command to the uCode.</div><div class='add'>+	 */</div><div class='add'>+	if ((key-&gt;cipher == WLAN_CIPHER_SUITE_WEP40 ||</div><div class='add'>+	     key-&gt;cipher == WLAN_CIPHER_SUITE_WEP104) &amp;&amp; !sta) {</div><div class='add'>+		if (cmd == SET_KEY)</div><div class='add'>+			is_default_wep_key = !ctx-&gt;key_mapping_keys;</div><div class='add'>+		else</div><div class='add'>+			is_default_wep_key =</div><div class='add'>+			    (key-&gt;hw_key_idx == HW_KEY_DEFAULT);</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'>+		if (is_default_wep_key)</div><div class='add'>+			ret =</div><div class='add'>+			    il4965_set_default_wep_key(il, vif_priv-&gt;ctx, key);</div><div class='add'>+		else</div><div class='add'>+			ret =</div><div class='add'>+			    il4965_set_dynamic_key(il, vif_priv-&gt;ctx, key,</div><div class='add'>+						   sta_id);</div><div class='add'>+</div><div class='add'>+		D_MAC80211("enable hwcrypto key\n");</div><div class='add'>+		break;</div><div class='add'>+	case DISABLE_KEY:</div><div class='add'>+		if (is_default_wep_key)</div><div class='add'>+			ret = il4965_remove_default_wep_key(il, ctx, key);</div><div class='add'>+		else</div><div class='add'>+			ret = il4965_remove_dynamic_key(il, ctx, key, sta_id);</div><div class='add'>+</div><div class='add'>+		D_MAC80211("disable hwcrypto key\n");</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'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+	D_MAC80211("leave\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_mac_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			enum ieee80211_ampdu_mlme_action action,</div><div class='add'>+			struct ieee80211_sta *sta, u16 tid, u16 * ssn,</div><div class='add'>+			u8 buf_size)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	D_HT("A-MPDU action on addr %pM tid %d\n", sta-&gt;addr, tid);</div><div class='add'>+</div><div class='add'>+	if (!(il-&gt;cfg-&gt;sku &amp; IL_SKU_N))</div><div class='add'>+		return -EACCES;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case IEEE80211_AMPDU_RX_START:</div><div class='add'>+		D_HT("start Rx\n");</div><div class='add'>+		ret = il4965_sta_rx_agg_start(il, sta, tid, *ssn);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_RX_STOP:</div><div class='add'>+		D_HT("stop Rx\n");</div><div class='add'>+		ret = il4965_sta_rx_agg_stop(il, sta, tid);</div><div class='add'>+		if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+			ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_TX_START:</div><div class='add'>+		D_HT("start Tx\n");</div><div class='add'>+		ret = il4965_tx_agg_start(il, vif, sta, tid, ssn);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_TX_STOP:</div><div class='add'>+		D_HT("stop Tx\n");</div><div class='add'>+		ret = il4965_tx_agg_stop(il, vif, sta, tid);</div><div class='add'>+		if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+			ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_TX_OPERATIONAL:</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_mac_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		   struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	struct il_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='add'>+	struct il_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='add'>+	bool is_ap = vif-&gt;type == NL80211_IFTYPE_STATION;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+</div><div class='add'>+	D_INFO("received request to add station %pM\n", sta-&gt;addr);</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	D_INFO("proceeding to add station %pM\n", sta-&gt;addr);</div><div class='add'>+	sta_priv-&gt;common.sta_id = IL_INVALID_STATION;</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;sta_priv-&gt;pending_frames, 0);</div><div class='add'>+</div><div class='add'>+	ret =</div><div class='add'>+	    il_add_station_common(il, vif_priv-&gt;ctx, sta-&gt;addr, is_ap, sta,</div><div class='add'>+				  &amp;sta_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IL_ERR("Unable to add station %pM (%d)\n", sta-&gt;addr, ret);</div><div class='add'>+		/* Should we return success if return code is EEXIST ? */</div><div class='add'>+		mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sta_priv-&gt;common.sta_id = sta_id;</div><div class='add'>+</div><div class='add'>+	/* Initialize rate scaling */</div><div class='add'>+	D_INFO("Initializing rate scaling for station %pM\n", sta-&gt;addr);</div><div class='add'>+	il4965_rs_rate_init(il, sta, sta_id);</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_mac_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+			  struct ieee80211_channel_switch *ch_switch)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	const struct il_channel_info *ch_info;</div><div class='add'>+	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</div><div class='add'>+	struct ieee80211_channel *channel = ch_switch-&gt;channel;</div><div class='add'>+	struct il_ht_config *ht_conf = &amp;il-&gt;current_ht_config;</div><div class='add'>+</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+	u16 ch;</div><div class='add'>+</div><div class='add'>+	D_MAC80211("enter\n");</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (il_is_rfkill(il))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status) ||</div><div class='add'>+	    test_bit(S_SCANNING, &amp;il-&gt;status) ||</div><div class='add'>+	    test_bit(S_CHANNEL_SWITCH_PENDING, &amp;il-&gt;status))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!il_is_associated_ctx(ctx))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;cfg-&gt;ops-&gt;lib-&gt;set_channel_switch)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ch = channel-&gt;hw_value;</div><div class='add'>+	if (le16_to_cpu(ctx-&gt;active.channel) == ch)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ch_info = il_get_channel_info(il, channel-&gt;band, ch);</div><div class='add'>+	if (!il_is_channel_valid(ch_info)) {</div><div class='add'>+		D_MAC80211("invalid channel\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;il-&gt;lock);</div><div class='add'>+</div><div class='add'>+	il-&gt;current_ht_config.smps = conf-&gt;smps_mode;</div><div class='add'>+</div><div class='add'>+	/* Configure HT40 channels */</div><div class='add'>+	ctx-&gt;ht.enabled = conf_is_ht(conf);</div><div class='add'>+	if (ctx-&gt;ht.enabled) {</div><div class='add'>+		if (conf_is_ht40_minus(conf)) {</div><div class='add'>+			ctx-&gt;ht.extension_chan_offset =</div><div class='add'>+			    IEEE80211_HT_PARAM_CHA_SEC_BELOW;</div><div class='add'>+			ctx-&gt;ht.is_40mhz = true;</div><div class='add'>+		} else if (conf_is_ht40_plus(conf)) {</div><div class='add'>+			ctx-&gt;ht.extension_chan_offset =</div><div class='add'>+			    IEEE80211_HT_PARAM_CHA_SEC_ABOVE;</div><div class='add'>+			ctx-&gt;ht.is_40mhz = true;</div><div class='add'>+		} else {</div><div class='add'>+			ctx-&gt;ht.extension_chan_offset =</div><div class='add'>+			    IEEE80211_HT_PARAM_CHA_SEC_NONE;</div><div class='add'>+			ctx-&gt;ht.is_40mhz = false;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		ctx-&gt;ht.is_40mhz = false;</div><div class='add'>+</div><div class='add'>+	if ((le16_to_cpu(ctx-&gt;staging.channel) != ch))</div><div class='add'>+		ctx-&gt;staging.flags = 0;</div><div class='add'>+</div><div class='add'>+	il_set_rxon_channel(il, channel, ctx);</div><div class='add'>+	il_set_rxon_ht(il, ht_conf);</div><div class='add'>+	il_set_flags_for_band(il, ctx, channel-&gt;band, ctx-&gt;vif);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;il-&gt;lock);</div><div class='add'>+</div><div class='add'>+	il_set_rate(il);</div><div class='add'>+	/*</div><div class='add'>+	 * at this point, staging_rxon has the</div><div class='add'>+	 * configuration for channel switch</div><div class='add'>+	 */</div><div class='add'>+	set_bit(S_CHANNEL_SWITCH_PENDING, &amp;il-&gt;status);</div><div class='add'>+	il-&gt;switch_channel = cpu_to_le16(ch);</div><div class='add'>+	if (il-&gt;cfg-&gt;ops-&gt;lib-&gt;set_channel_switch(il, ch_switch)) {</div><div class='add'>+		clear_bit(S_CHANNEL_SWITCH_PENDING, &amp;il-&gt;status);</div><div class='add'>+		il-&gt;switch_channel = 0;</div><div class='add'>+		ieee80211_chswitch_done(ctx-&gt;vif, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+	D_MAC80211("leave\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags,</div><div class='add'>+			unsigned int *total_flags, u64 multicast)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	__le32 filter_or = 0, filter_nand = 0;</div><div class='add'>+</div><div class='add'>+#define CHK(test, flag)	do { \</div><div class='add'>+	if (*total_flags &amp; (test))		\</div><div class='add'>+		filter_or |= (flag);		\</div><div class='add'>+	else					\</div><div class='add'>+		filter_nand |= (flag);		\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+	D_MAC80211("Enter: changed: 0x%x, total: 0x%x\n", changed_flags,</div><div class='add'>+		   *total_flags);</div><div class='add'>+</div><div class='add'>+	CHK(FIF_OTHER_BSS | FIF_PROMISC_IN_BSS, RXON_FILTER_PROMISC_MSK);</div><div class='add'>+	/* Setting _just_ RXON_FILTER_CTL2HOST_MSK causes FH errors */</div><div class='add'>+	CHK(FIF_CONTROL, RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_PROMISC_MSK);</div><div class='add'>+	CHK(FIF_BCN_PRBRESP_PROMISC, RXON_FILTER_BCON_AWARE_MSK);</div><div class='add'>+</div><div class='add'>+#undef CHK</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	il-&gt;ctx.staging.filter_flags &amp;= ~filter_nand;</div><div class='add'>+	il-&gt;ctx.staging.filter_flags |= filter_or;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Not committing directly because hardware can perform a scan,</div><div class='add'>+	 * but we'll eventually commit the filter flags change anyway.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Receiving all multicast frames is always enabled by the</div><div class='add'>+	 * default flags setup in il_connection_init_rx_config()</div><div class='add'>+	 * since we currently do not support programming multicast</div><div class='add'>+	 * filters into the device.</div><div class='add'>+	 */</div><div class='add'>+	*total_flags &amp;=</div><div class='add'>+	    FIF_OTHER_BSS | FIF_ALLMULTI | FIF_PROMISC_IN_BSS |</div><div class='add'>+	    FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * driver setup and teardown</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_bg_txpower_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = container_of(work, struct il_priv,</div><div class='add'>+					  txpower_work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* If a scan happened to start before we got here</div><div class='add'>+	 * then just return; the stats notification will</div><div class='add'>+	 * kick off another scheduled work to compensate for</div><div class='add'>+	 * any temperature delta we missed here. */</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status) ||</div><div class='add'>+	    test_bit(S_SCANNING, &amp;il-&gt;status))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Regardless of if we are associated, we must reconfigure the</div><div class='add'>+	 * TX power since frames can be sent on non-radar channels while</div><div class='add'>+	 * not associated */</div><div class='add'>+	il-&gt;cfg-&gt;ops-&gt;lib-&gt;send_tx_power(il);</div><div class='add'>+</div><div class='add'>+	/* Update last_temperature to keep is_calib_needed from running</div><div class='add'>+	 * when it isn't needed... */</div><div class='add'>+	il-&gt;last_temperature = il-&gt;temperature;</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_setup_deferred_work(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	il-&gt;workqueue = create_singlethread_workqueue(DRV_NAME);</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;il-&gt;wait_command_queue);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;il-&gt;restart, il4965_bg_restart);</div><div class='add'>+	INIT_WORK(&amp;il-&gt;rx_replenish, il4965_bg_rx_replenish);</div><div class='add'>+	INIT_WORK(&amp;il-&gt;run_time_calib_work, il4965_bg_run_time_calib_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;il-&gt;init_alive_start, il4965_bg_init_alive_start);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;il-&gt;alive_start, il4965_bg_alive_start);</div><div class='add'>+</div><div class='add'>+	il_setup_scan_deferred_work(il);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;il-&gt;txpower_work, il4965_bg_txpower_work);</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;il-&gt;stats_periodic);</div><div class='add'>+	il-&gt;stats_periodic.data = (unsigned long)il;</div><div class='add'>+	il-&gt;stats_periodic.function = il4965_bg_stats_periodic;</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;il-&gt;watchdog);</div><div class='add'>+	il-&gt;watchdog.data = (unsigned long)il;</div><div class='add'>+	il-&gt;watchdog.function = il_bg_watchdog;</div><div class='add'>+</div><div class='add'>+	tasklet_init(&amp;il-&gt;irq_tasklet,</div><div class='add'>+		     (void (*)(unsigned long))il4965_irq_tasklet,</div><div class='add'>+		     (unsigned long)il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_cancel_deferred_work(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	cancel_work_sync(&amp;il-&gt;txpower_work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;il-&gt;init_alive_start);</div><div class='add'>+	cancel_delayed_work(&amp;il-&gt;alive_start);</div><div class='add'>+	cancel_work_sync(&amp;il-&gt;run_time_calib_work);</div><div class='add'>+</div><div class='add'>+	il_cancel_scan_deferred_work(il);</div><div class='add'>+</div><div class='add'>+	del_timer_sync(&amp;il-&gt;stats_periodic);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_init_hw_rates(struct il_priv *il, struct ieee80211_rate *rates)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RATE_COUNT_LEGACY; i++) {</div><div class='add'>+		rates[i].bitrate = il_rates[i].ieee * 5;</div><div class='add'>+		rates[i].hw_value = i;	/* Rate scaling will work on idxes */</div><div class='add'>+		rates[i].hw_value_short = i;</div><div class='add'>+		rates[i].flags = 0;</div><div class='add'>+		if ((i &gt;= IL_FIRST_CCK_RATE) &amp;&amp; (i &lt;= IL_LAST_CCK_RATE)) {</div><div class='add'>+			/*</div><div class='add'>+			 * If CCK != 1M then set short preamble rate flag.</div><div class='add'>+			 */</div><div class='add'>+			rates[i].flags |=</div><div class='add'>+			    (il_rates[i].plcp ==</div><div class='add'>+			     RATE_1M_PLCP) ? 0 : IEEE80211_RATE_SHORT_PREAMBLE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Acquire il-&gt;lock before calling this function !</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il4965_set_wr_ptrs(struct il_priv *il, int txq_id, u32 idx)</div><div class='add'>+{</div><div class='add'>+	il_wr(il, HBUS_TARG_WRPTR, (idx &amp; 0xff) | (txq_id &lt;&lt; 8));</div><div class='add'>+	il_wr_prph(il, IL49_SCD_QUEUE_RDPTR(txq_id), idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_tx_queue_set_status(struct il_priv *il, struct il_tx_queue *txq,</div><div class='add'>+			   int tx_fifo_id, int scd_retry)</div><div class='add'>+{</div><div class='add'>+	int txq_id = txq-&gt;q.id;</div><div class='add'>+</div><div class='add'>+	/* Find out whether to activate Tx queue */</div><div class='add'>+	int active = test_bit(txq_id, &amp;il-&gt;txq_ctx_active_msk) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	/* Set up and activate */</div><div class='add'>+	il_wr_prph(il, IL49_SCD_QUEUE_STATUS_BITS(txq_id),</div><div class='add'>+		   (active &lt;&lt; IL49_SCD_QUEUE_STTS_REG_POS_ACTIVE) |</div><div class='add'>+		   (tx_fifo_id &lt;&lt; IL49_SCD_QUEUE_STTS_REG_POS_TXF) |</div><div class='add'>+		   (scd_retry &lt;&lt; IL49_SCD_QUEUE_STTS_REG_POS_WSL) |</div><div class='add'>+		   (scd_retry &lt;&lt; IL49_SCD_QUEUE_STTS_REG_POS_SCD_ACK) |</div><div class='add'>+		   IL49_SCD_QUEUE_STTS_REG_MSK);</div><div class='add'>+</div><div class='add'>+	txq-&gt;sched_retry = scd_retry;</div><div class='add'>+</div><div class='add'>+	D_INFO("%s %s Queue %d on AC %d\n", active ? "Activate" : "Deactivate",</div><div class='add'>+	       scd_retry ? "BA" : "AC", txq_id, tx_fifo_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il4965_init_drv(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;il-&gt;sta_lock);</div><div class='add'>+	spin_lock_init(&amp;il-&gt;hcmd_lock);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;il-&gt;free_frames);</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	il-&gt;ieee_channels = NULL;</div><div class='add'>+	il-&gt;ieee_rates = NULL;</div><div class='add'>+	il-&gt;band = IEEE80211_BAND_2GHZ;</div><div class='add'>+</div><div class='add'>+	il-&gt;iw_mode = NL80211_IFTYPE_STATION;</div><div class='add'>+	il-&gt;current_ht_config.smps = IEEE80211_SMPS_STATIC;</div><div class='add'>+	il-&gt;missed_beacon_threshold = IL_MISSED_BEACON_THRESHOLD_DEF;</div><div class='add'>+</div><div class='add'>+	/* initialize force reset */</div><div class='add'>+	il-&gt;force_reset.reset_duration = IL_DELAY_NEXT_FORCE_FW_RELOAD;</div><div class='add'>+</div><div class='add'>+	/* Choose which receivers/antennas to use */</div><div class='add'>+	if (il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain)</div><div class='add'>+		il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain(il, &amp;il-&gt;ctx);</div><div class='add'>+</div><div class='add'>+	il_init_scan_params(il);</div><div class='add'>+</div><div class='add'>+	ret = il_init_channel_map(il);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IL_ERR("initializing regulatory failed: %d\n", ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = il_init_geos(il);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IL_ERR("initializing geos failed: %d\n", ret);</div><div class='add'>+		goto err_free_channel_map;</div><div class='add'>+	}</div><div class='add'>+	il4965_init_hw_rates(il, il-&gt;ieee_rates);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_channel_map:</div><div class='add'>+	il_free_channel_map(il);</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_uninit_drv(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	il4965_calib_free_results(il);</div><div class='add'>+	il_free_geos(il);</div><div class='add'>+	il_free_channel_map(il);</div><div class='add'>+	kfree(il-&gt;scan_cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_hw_detect(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	il-&gt;hw_rev = _il_rd(il, CSR_HW_REV);</div><div class='add'>+	il-&gt;hw_wa_rev = _il_rd(il, CSR_HW_REV_WA_REG);</div><div class='add'>+	il-&gt;rev_id = il-&gt;pci_dev-&gt;revision;</div><div class='add'>+	D_INFO("HW Revision ID = 0x%X\n", il-&gt;rev_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il4965_set_hw_params(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	il-&gt;hw_params.max_rxq_size = RX_QUEUE_SIZE;</div><div class='add'>+	il-&gt;hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG;</div><div class='add'>+	if (il-&gt;cfg-&gt;mod_params-&gt;amsdu_size_8K)</div><div class='add'>+		il-&gt;hw_params.rx_page_order = get_order(IL_RX_BUF_SIZE_8K);</div><div class='add'>+	else</div><div class='add'>+		il-&gt;hw_params.rx_page_order = get_order(IL_RX_BUF_SIZE_4K);</div><div class='add'>+</div><div class='add'>+	il-&gt;hw_params.max_beacon_itrvl = IL_MAX_UCODE_BEACON_INTERVAL;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;cfg-&gt;mod_params-&gt;disable_11n)</div><div class='add'>+		il-&gt;cfg-&gt;sku &amp;= ~IL_SKU_N;</div><div class='add'>+</div><div class='add'>+	/* Device-specific setup */</div><div class='add'>+	return il-&gt;cfg-&gt;ops-&gt;lib-&gt;set_hw_params(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const u8 il4965_bss_ac_to_fifo[] = {</div><div class='add'>+	IL_TX_FIFO_VO,</div><div class='add'>+	IL_TX_FIFO_VI,</div><div class='add'>+	IL_TX_FIFO_BE,</div><div class='add'>+	IL_TX_FIFO_BK,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 il4965_bss_ac_to_queue[] = {</div><div class='add'>+	0, 1, 2, 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	struct il_priv *il;</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+	struct il_cfg *cfg = (struct il_cfg *)(ent-&gt;driver_data);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 pci_cmd;</div><div class='add'>+</div><div class='add'>+	/************************</div><div class='add'>+	 * 1. Allocating HW data</div><div class='add'>+	 ************************/</div><div class='add'>+</div><div class='add'>+	hw = il_alloc_all(cfg);</div><div class='add'>+	if (!hw) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	il = hw-&gt;priv;</div><div class='add'>+	/* At this point both hw and il are allocated. */</div><div class='add'>+</div><div class='add'>+	il-&gt;ctx.ctxid = 0;</div><div class='add'>+</div><div class='add'>+	il-&gt;ctx.always_active = true;</div><div class='add'>+	il-&gt;ctx.is_active = true;</div><div class='add'>+	il-&gt;ctx.rxon_cmd = C_RXON;</div><div class='add'>+	il-&gt;ctx.rxon_timing_cmd = C_RXON_TIMING;</div><div class='add'>+	il-&gt;ctx.rxon_assoc_cmd = C_RXON_ASSOC;</div><div class='add'>+	il-&gt;ctx.qos_cmd = C_QOS_PARAM;</div><div class='add'>+	il-&gt;ctx.ap_sta_id = IL_AP_ID;</div><div class='add'>+	il-&gt;ctx.wep_key_cmd = C_WEPKEY;</div><div class='add'>+	il-&gt;ctx.ac_to_fifo = il4965_bss_ac_to_fifo;</div><div class='add'>+	il-&gt;ctx.ac_to_queue = il4965_bss_ac_to_queue;</div><div class='add'>+	il-&gt;ctx.exclusive_interface_modes = BIT(NL80211_IFTYPE_ADHOC);</div><div class='add'>+	il-&gt;ctx.interface_modes = BIT(NL80211_IFTYPE_STATION);</div><div class='add'>+	il-&gt;ctx.ap_devtype = RXON_DEV_TYPE_AP;</div><div class='add'>+	il-&gt;ctx.ibss_devtype = RXON_DEV_TYPE_IBSS;</div><div class='add'>+	il-&gt;ctx.station_devtype = RXON_DEV_TYPE_ESS;</div><div class='add'>+	il-&gt;ctx.unused_devtype = RXON_DEV_TYPE_ESS;</div><div class='add'>+</div><div class='add'>+	SET_IEEE80211_DEV(hw, &amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	D_INFO("*** LOAD DRIVER ***\n");</div><div class='add'>+	il-&gt;cfg = cfg;</div><div class='add'>+	il-&gt;pci_dev = pdev;</div><div class='add'>+	il-&gt;inta_mask = CSR_INI_SET_MASK;</div><div class='add'>+</div><div class='add'>+	if (il_alloc_traffic_mem(il))</div><div class='add'>+		IL_ERR("Not enough memory to generate traffic log\n");</div><div class='add'>+</div><div class='add'>+	/**************************</div><div class='add'>+	 * 2. Initializing PCI bus</div><div class='add'>+	 **************************/</div><div class='add'>+	pci_disable_link_state(pdev,</div><div class='add'>+			       PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |</div><div class='add'>+			       PCIE_LINK_STATE_CLKPM);</div><div class='add'>+</div><div class='add'>+	if (pci_enable_device(pdev)) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto out_ieee80211_free_hw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));</div><div class='add'>+	if (!err)</div><div class='add'>+		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(36));</div><div class='add'>+	if (err) {</div><div class='add'>+		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+		if (!err)</div><div class='add'>+			err =</div><div class='add'>+			    pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+		/* both attempts failed: */</div><div class='add'>+		if (err) {</div><div class='add'>+			IL_WARN("No suitable DMA available.\n");</div><div class='add'>+			goto out_pci_disable_device;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pci_request_regions(pdev, DRV_NAME);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_pci_disable_device;</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, il);</div><div class='add'>+</div><div class='add'>+	/***********************</div><div class='add'>+	 * 3. Read REV register</div><div class='add'>+	 ***********************/</div><div class='add'>+	il-&gt;hw_base = pci_iomap(pdev, 0, 0);</div><div class='add'>+	if (!il-&gt;hw_base) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto out_pci_release_regions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_INFO("pci_resource_len = 0x%08llx\n",</div><div class='add'>+	       (unsigned long long)pci_resource_len(pdev, 0));</div><div class='add'>+	D_INFO("pci_resource_base = %p\n", il-&gt;hw_base);</div><div class='add'>+</div><div class='add'>+	/* these spin locks will be used in apm_ops.init and EEPROM access</div><div class='add'>+	 * we should init now</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_init(&amp;il-&gt;reg_lock);</div><div class='add'>+	spin_lock_init(&amp;il-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * stop and reset the on-board processor just in case it is in a</div><div class='add'>+	 * strange state ... like being left stranded by a primary kernel</div><div class='add'>+	 * and this is now the kdump kernel trying to start up</div><div class='add'>+	 */</div><div class='add'>+	_il_wr(il, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);</div><div class='add'>+</div><div class='add'>+	il4965_hw_detect(il);</div><div class='add'>+	IL_INFO("Detected %s, REV=0x%X\n", il-&gt;cfg-&gt;name, il-&gt;hw_rev);</div><div class='add'>+</div><div class='add'>+	/* We disable the RETRY_TIMEOUT register (0x41) to keep</div><div class='add'>+	 * PCI Tx retries from interfering with C3 CPU state */</div><div class='add'>+	pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);</div><div class='add'>+</div><div class='add'>+	il4965_prepare_card_hw(il);</div><div class='add'>+	if (!il-&gt;hw_ready) {</div><div class='add'>+		IL_WARN("Failed, HW not ready\n");</div><div class='add'>+		goto out_iounmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*****************</div><div class='add'>+	 * 4. Read EEPROM</div><div class='add'>+	 *****************/</div><div class='add'>+	/* Read the EEPROM */</div><div class='add'>+	err = il_eeprom_init(il);</div><div class='add'>+	if (err) {</div><div class='add'>+		IL_ERR("Unable to init EEPROM\n");</div><div class='add'>+		goto out_iounmap;</div><div class='add'>+	}</div><div class='add'>+	err = il4965_eeprom_check_version(il);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_eeprom;</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_eeprom;</div><div class='add'>+</div><div class='add'>+	/* extract MAC Address */</div><div class='add'>+	il4965_eeprom_get_mac(il, il-&gt;addresses[0].addr);</div><div class='add'>+	D_INFO("MAC address: %pM\n", il-&gt;addresses[0].addr);</div><div class='add'>+	il-&gt;hw-&gt;wiphy-&gt;addresses = il-&gt;addresses;</div><div class='add'>+	il-&gt;hw-&gt;wiphy-&gt;n_addresses = 1;</div><div class='add'>+</div><div class='add'>+	/************************</div><div class='add'>+	 * 5. Setup HW constants</div><div class='add'>+	 ************************/</div><div class='add'>+	if (il4965_set_hw_params(il)) {</div><div class='add'>+		IL_ERR("failed to set hw parameters\n");</div><div class='add'>+		goto out_free_eeprom;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*******************</div><div class='add'>+	 * 6. Setup il</div><div class='add'>+	 *******************/</div><div class='add'>+</div><div class='add'>+	err = il4965_init_drv(il);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_eeprom;</div><div class='add'>+	/* At this point both hw and il are initialized. */</div><div class='add'>+</div><div class='add'>+	/********************</div><div class='add'>+	 * 7. Setup services</div><div class='add'>+	 ********************/</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+	il_disable_interrupts(il);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	pci_enable_msi(il-&gt;pci_dev);</div><div class='add'>+</div><div class='add'>+	err = request_irq(il-&gt;pci_dev-&gt;irq, il_isr, IRQF_SHARED, DRV_NAME, il);</div><div class='add'>+	if (err) {</div><div class='add'>+		IL_ERR("Error allocating IRQ %d\n", il-&gt;pci_dev-&gt;irq);</div><div class='add'>+		goto out_disable_msi;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il4965_setup_deferred_work(il);</div><div class='add'>+	il4965_setup_handlers(il);</div><div class='add'>+</div><div class='add'>+	/*********************************************</div><div class='add'>+	 * 8. Enable interrupts and read RFKILL state</div><div class='add'>+	 *********************************************/</div><div class='add'>+</div><div class='add'>+	/* enable rfkill interrupt: hw bug w/a */</div><div class='add'>+	pci_read_config_word(il-&gt;pci_dev, PCI_COMMAND, &amp;pci_cmd);</div><div class='add'>+	if (pci_cmd &amp; PCI_COMMAND_INTX_DISABLE) {</div><div class='add'>+		pci_cmd &amp;= ~PCI_COMMAND_INTX_DISABLE;</div><div class='add'>+		pci_write_config_word(il-&gt;pci_dev, PCI_COMMAND, pci_cmd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il_enable_rfkill_int(il);</div><div class='add'>+</div><div class='add'>+	/* If platform's RF_KILL switch is NOT set to KILL */</div><div class='add'>+	if (_il_rd(il, CSR_GP_CNTRL) &amp; CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)</div><div class='add'>+		clear_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+	else</div><div class='add'>+		set_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	wiphy_rfkill_set_hw_state(il-&gt;hw-&gt;wiphy,</div><div class='add'>+				  test_bit(S_RF_KILL_HW, &amp;il-&gt;status));</div><div class='add'>+</div><div class='add'>+	il_power_initialize(il);</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;il-&gt;_4965.firmware_loading_complete);</div><div class='add'>+</div><div class='add'>+	err = il4965_request_firmware(il, true);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_destroy_workqueue;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_destroy_workqueue:</div><div class='add'>+	destroy_workqueue(il-&gt;workqueue);</div><div class='add'>+	il-&gt;workqueue = NULL;</div><div class='add'>+	free_irq(il-&gt;pci_dev-&gt;irq, il);</div><div class='add'>+out_disable_msi:</div><div class='add'>+	pci_disable_msi(il-&gt;pci_dev);</div><div class='add'>+	il4965_uninit_drv(il);</div><div class='add'>+out_free_eeprom:</div><div class='add'>+	il_eeprom_free(il);</div><div class='add'>+out_iounmap:</div><div class='add'>+	pci_iounmap(pdev, il-&gt;hw_base);</div><div class='add'>+out_pci_release_regions:</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+out_pci_disable_device:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+out_ieee80211_free_hw:</div><div class='add'>+	il_free_traffic_mem(il);</div><div class='add'>+	ieee80211_free_hw(il-&gt;hw);</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit</div><div class='add'>+il4965_pci_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = pci_get_drvdata(pdev);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!il)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	wait_for_completion(&amp;il-&gt;_4965.firmware_loading_complete);</div><div class='add'>+</div><div class='add'>+	D_INFO("*** UNLOAD DRIVER ***\n");</div><div class='add'>+</div><div class='add'>+	il_dbgfs_unregister(il);</div><div class='add'>+	sysfs_remove_group(&amp;pdev-&gt;dev.kobj, &amp;il_attribute_group);</div><div class='add'>+</div><div class='add'>+	/* ieee80211_unregister_hw call wil cause il_mac_stop to</div><div class='add'>+	 * to be called and il4965_down since we are removing the device</div><div class='add'>+	 * we need to set S_EXIT_PENDING bit.</div><div class='add'>+	 */</div><div class='add'>+	set_bit(S_EXIT_PENDING, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	il_leds_exit(il);</div><div class='add'>+</div><div class='add'>+	if (il-&gt;mac80211_registered) {</div><div class='add'>+		ieee80211_unregister_hw(il-&gt;hw);</div><div class='add'>+		il-&gt;mac80211_registered = 0;</div><div class='add'>+	} else {</div><div class='add'>+		il4965_down(il);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure device is reset to low power before unloading driver.</div><div class='add'>+	 * This may be redundant with il4965_down(), but there are paths to</div><div class='add'>+	 * run il4965_down() without calling apm_ops.stop(), and there are</div><div class='add'>+	 * paths to avoid running il4965_down() at all before leaving driver.</div><div class='add'>+	 * This (inexpensive) call *makes sure* device is reset.</div><div class='add'>+	 */</div><div class='add'>+	il_apm_stop(il);</div><div class='add'>+</div><div class='add'>+	/* make sure we flush any pending irq or</div><div class='add'>+	 * tasklet for the driver</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+	il_disable_interrupts(il);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	il4965_synchronize_irq(il);</div><div class='add'>+</div><div class='add'>+	il4965_dealloc_ucode_pci(il);</div><div class='add'>+</div><div class='add'>+	if (il-&gt;rxq.bd)</div><div class='add'>+		il4965_rx_queue_free(il, &amp;il-&gt;rxq);</div><div class='add'>+	il4965_hw_txq_ctx_free(il);</div><div class='add'>+</div><div class='add'>+	il_eeprom_free(il);</div><div class='add'>+</div><div class='add'>+	/*netif_stop_queue(dev); */</div><div class='add'>+	flush_workqueue(il-&gt;workqueue);</div><div class='add'>+</div><div class='add'>+	/* ieee80211_unregister_hw calls il_mac_stop, which flushes</div><div class='add'>+	 * il-&gt;workqueue... so we can't take down the workqueue</div><div class='add'>+	 * until now... */</div><div class='add'>+	destroy_workqueue(il-&gt;workqueue);</div><div class='add'>+	il-&gt;workqueue = NULL;</div><div class='add'>+	il_free_traffic_mem(il);</div><div class='add'>+</div><div class='add'>+	free_irq(il-&gt;pci_dev-&gt;irq, il);</div><div class='add'>+	pci_disable_msi(il-&gt;pci_dev);</div><div class='add'>+	pci_iounmap(pdev, il-&gt;hw_base);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	il4965_uninit_drv(il);</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(il-&gt;beacon_skb);</div><div class='add'>+</div><div class='add'>+	ieee80211_free_hw(il-&gt;hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Activate/Deactivate Tx DMA/FIFO channels according tx fifos mask</div><div class='add'>+ * must be called under il-&gt;lock and mac access</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il4965_txq_set_sched(struct il_priv *il, u32 mask)</div><div class='add'>+{</div><div class='add'>+	il_wr_prph(il, IL49_SCD_TXFACT, mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * driver and module entry point</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+/* Hardware specific file defines the PCI IDs table for that hardware module */</div><div class='add'>+static DEFINE_PCI_DEVICE_TABLE(il4965_hw_card_ids) = {</div><div class='add'>+	{IL_PCI_DEVICE(0x4229, PCI_ANY_ID, il4965_cfg)},</div><div class='add'>+	{IL_PCI_DEVICE(0x4230, PCI_ANY_ID, il4965_cfg)},</div><div class='add'>+	{0}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pci, il4965_hw_card_ids);</div><div class='add'>+</div><div class='add'>+static struct pci_driver il4965_driver = {</div><div class='add'>+	.name = DRV_NAME,</div><div class='add'>+	.id_table = il4965_hw_card_ids,</div><div class='add'>+	.probe = il4965_pci_probe,</div><div class='add'>+	.remove = __devexit_p(il4965_pci_remove),</div><div class='add'>+	.driver.pm = IL_LEGACY_PM_OPS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init</div><div class='add'>+il4965_init(void)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	int ret;</div><div class='add'>+	pr_info(DRV_DESCRIPTION ", " DRV_VERSION "\n");</div><div class='add'>+	pr_info(DRV_COPYRIGHT "\n");</div><div class='add'>+</div><div class='add'>+	ret = il4965_rate_control_register();</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Unable to register rate control algorithm: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = pci_register_driver(&amp;il4965_driver);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Unable to initialize PCI module\n");</div><div class='add'>+		goto error_register;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+error_register:</div><div class='add'>+	il4965_rate_control_unregister();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit</div><div class='add'>+il4965_exit(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;il4965_driver);</div><div class='add'>+	il4965_rate_control_unregister();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_exit(il4965_exit);</div><div class='add'>+module_init(il4965_init);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+module_param_named(debug, il_debug_level, uint, S_IRUGO | S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(debug, "debug output mask");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+module_param_named(swcrypto, il4965_mod_params.sw_crypto, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])");</div><div class='add'>+module_param_named(queues_num, il4965_mod_params.num_of_queues, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(queues_num, "number of hw queues.");</div><div class='add'>+module_param_named(11n_disable, il4965_mod_params.disable_11n, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(11n_disable, "disable 11n functionality");</div><div class='add'>+module_param_named(amsdu_size_8K, il4965_mod_params.amsdu_size_8K, int,</div><div class='add'>+		   S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size");</div><div class='add'>+module_param_named(fw_restart, il4965_mod_params.restart_fw, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(fw_restart, "restart firmware in case of error");</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/4965-rs.c b/drivers/net/wireless/iwlegacy/4965-rs.c<br/>new file mode 100644<br/>index 000000000000..467d0cb14ecd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/4965-rs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/4965-rs.c</a></div><div class='hunk'>@@ -0,0 +1,2860 @@</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.</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 version 2 of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution in the</div><div class='add'>+ * file called LICENSE.</div><div class='add'>+ *</div><div class='add'>+ * Contact Information:</div><div class='add'>+ *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='add'>+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</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/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "4965.h"</div><div class='add'>+</div><div class='add'>+#define IL4965_RS_NAME "iwl-4965-rs"</div><div class='add'>+</div><div class='add'>+#define NUM_TRY_BEFORE_ANT_TOGGLE 1</div><div class='add'>+#define IL_NUMBER_TRY      1</div><div class='add'>+#define IL_HT_NUMBER_TRY   3</div><div class='add'>+</div><div class='add'>+#define RATE_MAX_WINDOW		62	/* # tx in history win */</div><div class='add'>+#define RATE_MIN_FAILURE_TH		6	/* min failures to calc tpt */</div><div class='add'>+#define RATE_MIN_SUCCESS_TH		8	/* min successes to calc tpt */</div><div class='add'>+</div><div class='add'>+/* max allowed rate miss before sync LQ cmd */</div><div class='add'>+#define IL_MISSED_RATE_MAX		15</div><div class='add'>+/* max time to accum history 2 seconds */</div><div class='add'>+#define RATE_SCALE_FLUSH_INTVL   (3*HZ)</div><div class='add'>+</div><div class='add'>+static u8 rs_ht_to_legacy[] = {</div><div class='add'>+	RATE_6M_IDX, RATE_6M_IDX,</div><div class='add'>+	RATE_6M_IDX, RATE_6M_IDX,</div><div class='add'>+	RATE_6M_IDX,</div><div class='add'>+	RATE_6M_IDX, RATE_9M_IDX,</div><div class='add'>+	RATE_12M_IDX, RATE_18M_IDX,</div><div class='add'>+	RATE_24M_IDX, RATE_36M_IDX,</div><div class='add'>+	RATE_48M_IDX, RATE_54M_IDX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ant_toggle_lookup[] = {</div><div class='add'>+	/*ANT_NONE -&gt; */ ANT_NONE,</div><div class='add'>+	/*ANT_A    -&gt; */ ANT_B,</div><div class='add'>+	/*ANT_B    -&gt; */ ANT_C,</div><div class='add'>+	/*ANT_AB   -&gt; */ ANT_BC,</div><div class='add'>+	/*ANT_C    -&gt; */ ANT_A,</div><div class='add'>+	/*ANT_AC   -&gt; */ ANT_AB,</div><div class='add'>+	/*ANT_BC   -&gt; */ ANT_AC,</div><div class='add'>+	/*ANT_ABC  -&gt; */ ANT_ABC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IL_DECLARE_RATE_INFO(r, s, ip, in, rp, rn, pp, np)    \</div><div class='add'>+	[RATE_##r##M_IDX] = { RATE_##r##M_PLCP,      \</div><div class='add'>+				    RATE_SISO_##s##M_PLCP, \</div><div class='add'>+				    RATE_MIMO2_##s##M_PLCP,\</div><div class='add'>+				    RATE_##r##M_IEEE,      \</div><div class='add'>+				    RATE_##ip##M_IDX,    \</div><div class='add'>+				    RATE_##in##M_IDX,    \</div><div class='add'>+				    RATE_##rp##M_IDX,    \</div><div class='add'>+				    RATE_##rn##M_IDX,    \</div><div class='add'>+				    RATE_##pp##M_IDX,    \</div><div class='add'>+				    RATE_##np##M_IDX }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Parameter order:</div><div class='add'>+ *   rate, ht rate, prev rate, next rate, prev tgg rate, next tgg rate</div><div class='add'>+ *</div><div class='add'>+ * If there isn't a valid next or previous rate then INV is used which</div><div class='add'>+ * maps to RATE_INVALID</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+const struct il_rate_info il_rates[RATE_COUNT] = {</div><div class='add'>+	IL_DECLARE_RATE_INFO(1, INV, INV, 2, INV, 2, INV, 2),	/*  1mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(2, INV, 1, 5, 1, 5, 1, 5),		/*  2mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(5, INV, 2, 6, 2, 11, 2, 11),	/*5.5mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(11, INV, 9, 12, 9, 12, 5, 18),	/* 11mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(6, 6, 5, 9, 5, 11, 5, 11),		/*  6mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(9, 6, 6, 11, 6, 11, 5, 11),	/*  9mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(12, 12, 11, 18, 11, 18, 11, 18),	/* 12mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(18, 18, 12, 24, 12, 24, 11, 24),	/* 18mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(24, 24, 18, 36, 18, 36, 18, 36),	/* 24mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(36, 36, 24, 48, 24, 48, 24, 48),	/* 36mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(48, 48, 36, 54, 36, 54, 36, 54),	/* 48mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(54, 54, 48, INV, 48, INV, 48, INV),/* 54mbps */</div><div class='add'>+	IL_DECLARE_RATE_INFO(60, 60, 48, INV, 48, INV, 48, INV),/* 60mbps */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il4965_hwrate_to_plcp_idx(u32 rate_n_flags)</div><div class='add'>+{</div><div class='add'>+	int idx = 0;</div><div class='add'>+</div><div class='add'>+	/* HT rate format */</div><div class='add'>+	if (rate_n_flags &amp; RATE_MCS_HT_MSK) {</div><div class='add'>+		idx = (rate_n_flags &amp; 0xff);</div><div class='add'>+</div><div class='add'>+		if (idx &gt;= RATE_MIMO2_6M_PLCP)</div><div class='add'>+			idx = idx - RATE_MIMO2_6M_PLCP;</div><div class='add'>+</div><div class='add'>+		idx += IL_FIRST_OFDM_RATE;</div><div class='add'>+		/* skip 9M not supported in ht */</div><div class='add'>+		if (idx &gt;= RATE_9M_IDX)</div><div class='add'>+			idx += 1;</div><div class='add'>+		if (idx &gt;= IL_FIRST_OFDM_RATE &amp;&amp; idx &lt;= IL_LAST_OFDM_RATE)</div><div class='add'>+			return idx;</div><div class='add'>+</div><div class='add'>+		/* legacy rate format, search for match in table */</div><div class='add'>+	} else {</div><div class='add'>+		for (idx = 0; idx &lt; ARRAY_SIZE(il_rates); idx++)</div><div class='add'>+			if (il_rates[idx].plcp == (rate_n_flags &amp; 0xFF))</div><div class='add'>+				return idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void il4965_rs_rate_scale_perform(struct il_priv *il,</div><div class='add'>+					 struct sk_buff *skb,</div><div class='add'>+					 struct ieee80211_sta *sta,</div><div class='add'>+					 struct il_lq_sta *lq_sta);</div><div class='add'>+static void il4965_rs_fill_link_cmd(struct il_priv *il,</div><div class='add'>+				    struct il_lq_sta *lq_sta, u32 rate_n_flags);</div><div class='add'>+static void il4965_rs_stay_in_table(struct il_lq_sta *lq_sta,</div><div class='add'>+				    bool force_search);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='add'>+static void il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta,</div><div class='add'>+				    u32 *rate_n_flags, int idx);</div><div class='add'>+#else</div><div class='add'>+static void</div><div class='add'>+il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta, u32 * rate_n_flags, int idx)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * The following tables contain the expected throughput metrics for all rates</div><div class='add'>+ *</div><div class='add'>+ *	1, 2, 5.5, 11, 6, 9, 12, 18, 24, 36, 48, 54, 60 MBits</div><div class='add'>+ *</div><div class='add'>+ * where invalid entries are zeros.</div><div class='add'>+ *</div><div class='add'>+ * CCK rates are only valid in legacy table and will only be used in G</div><div class='add'>+ * (2.4 GHz) band.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static s32 expected_tpt_legacy[RATE_COUNT] = {</div><div class='add'>+	7, 13, 35, 58, 40, 57, 72, 98, 121, 154, 177, 186, 0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static s32 expected_tpt_siso20MHz[4][RATE_COUNT] = {</div><div class='add'>+	{0, 0, 0, 0, 42, 0, 76, 102, 124, 158, 183, 193, 202},	/* Norm */</div><div class='add'>+	{0, 0, 0, 0, 46, 0, 82, 110, 132, 167, 192, 202, 210},	/* SGI */</div><div class='add'>+	{0, 0, 0, 0, 48, 0, 93, 135, 176, 251, 319, 351, 381},	/* AGG */</div><div class='add'>+	{0, 0, 0, 0, 53, 0, 102, 149, 193, 275, 348, 381, 413},	/* AGG+SGI */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static s32 expected_tpt_siso40MHz[4][RATE_COUNT] = {</div><div class='add'>+	{0, 0, 0, 0, 77, 0, 127, 160, 184, 220, 242, 250, 257},	/* Norm */</div><div class='add'>+	{0, 0, 0, 0, 83, 0, 135, 169, 193, 229, 250, 257, 264},	/* SGI */</div><div class='add'>+	{0, 0, 0, 0, 96, 0, 182, 259, 328, 451, 553, 598, 640},	/* AGG */</div><div class='add'>+	{0, 0, 0, 0, 106, 0, 199, 282, 357, 487, 593, 640, 683},	/* AGG+SGI */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static s32 expected_tpt_mimo2_20MHz[4][RATE_COUNT] = {</div><div class='add'>+	{0, 0, 0, 0, 74, 0, 123, 155, 179, 213, 235, 243, 250},	/* Norm */</div><div class='add'>+	{0, 0, 0, 0, 81, 0, 131, 164, 187, 221, 242, 250, 256},	/* SGI */</div><div class='add'>+	{0, 0, 0, 0, 92, 0, 175, 250, 317, 436, 534, 578, 619},	/* AGG */</div><div class='add'>+	{0, 0, 0, 0, 102, 0, 192, 273, 344, 470, 573, 619, 660},	/* AGG+SGI */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static s32 expected_tpt_mimo2_40MHz[4][RATE_COUNT] = {</div><div class='add'>+	{0, 0, 0, 0, 123, 0, 182, 214, 235, 264, 279, 285, 289},	/* Norm */</div><div class='add'>+	{0, 0, 0, 0, 131, 0, 191, 222, 242, 270, 284, 289, 293},	/* SGI */</div><div class='add'>+	{0, 0, 0, 0, 180, 0, 327, 446, 545, 708, 828, 878, 922},	/* AGG */</div><div class='add'>+	{0, 0, 0, 0, 197, 0, 355, 481, 584, 752, 872, 922, 966},	/* AGG+SGI */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* mbps, mcs */</div><div class='add'>+static const struct il_rate_mcs_info il_rate_mcs[RATE_COUNT] = {</div><div class='add'>+	{"1", "BPSK DSSS"},</div><div class='add'>+	{"2", "QPSK DSSS"},</div><div class='add'>+	{"5.5", "BPSK CCK"},</div><div class='add'>+	{"11", "QPSK CCK"},</div><div class='add'>+	{"6", "BPSK 1/2"},</div><div class='add'>+	{"9", "BPSK 1/2"},</div><div class='add'>+	{"12", "QPSK 1/2"},</div><div class='add'>+	{"18", "QPSK 3/4"},</div><div class='add'>+	{"24", "16QAM 1/2"},</div><div class='add'>+	{"36", "16QAM 3/4"},</div><div class='add'>+	{"48", "64QAM 2/3"},</div><div class='add'>+	{"54", "64QAM 3/4"},</div><div class='add'>+	{"60", "64QAM 5/6"},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MCS_IDX_PER_STREAM	(8)</div><div class='add'>+</div><div class='add'>+static inline u8</div><div class='add'>+il4965_rs_extract_rate(u32 rate_n_flags)</div><div class='add'>+{</div><div class='add'>+	return (u8) (rate_n_flags &amp; 0xFF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_rs_rate_scale_clear_win(struct il_rate_scale_data *win)</div><div class='add'>+{</div><div class='add'>+	win-&gt;data = 0;</div><div class='add'>+	win-&gt;success_counter = 0;</div><div class='add'>+	win-&gt;success_ratio = IL_INVALID_VALUE;</div><div class='add'>+	win-&gt;counter = 0;</div><div class='add'>+	win-&gt;average_tpt = IL_INVALID_VALUE;</div><div class='add'>+	win-&gt;stamp = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8</div><div class='add'>+il4965_rs_is_valid_ant(u8 valid_antenna, u8 ant_type)</div><div class='add'>+{</div><div class='add'>+	return (ant_type &amp; valid_antenna) == ant_type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	removes the old data from the stats. All data that is older than</div><div class='add'>+ *	TID_MAX_TIME_DIFF, will be deleted.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_rs_tl_rm_old_stats(struct il_traffic_load *tl, u32 curr_time)</div><div class='add'>+{</div><div class='add'>+	/* The oldest age we want to keep */</div><div class='add'>+	u32 oldest_time = curr_time - TID_MAX_TIME_DIFF;</div><div class='add'>+</div><div class='add'>+	while (tl-&gt;queue_count &amp;&amp; tl-&gt;time_stamp &lt; oldest_time) {</div><div class='add'>+		tl-&gt;total -= tl-&gt;packet_count[tl-&gt;head];</div><div class='add'>+		tl-&gt;packet_count[tl-&gt;head] = 0;</div><div class='add'>+		tl-&gt;time_stamp += TID_QUEUE_CELL_SPACING;</div><div class='add'>+		tl-&gt;queue_count--;</div><div class='add'>+		tl-&gt;head++;</div><div class='add'>+		if (tl-&gt;head &gt;= TID_QUEUE_MAX_SIZE)</div><div class='add'>+			tl-&gt;head = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	increment traffic load value for tid and also remove</div><div class='add'>+ *	any old values if passed the certain time period</div><div class='add'>+ */</div><div class='add'>+static u8</div><div class='add'>+il4965_rs_tl_add_packet(struct il_lq_sta *lq_data, struct ieee80211_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	u32 curr_time = jiffies_to_msecs(jiffies);</div><div class='add'>+	u32 time_diff;</div><div class='add'>+	s32 idx;</div><div class='add'>+	struct il_traffic_load *tl = NULL;</div><div class='add'>+	u8 tid;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_data_qos(hdr-&gt;frame_control)) {</div><div class='add'>+		u8 *qc = ieee80211_get_qos_ctl(hdr);</div><div class='add'>+		tid = qc[0] &amp; 0xf;</div><div class='add'>+	} else</div><div class='add'>+		return MAX_TID_COUNT;</div><div class='add'>+</div><div class='add'>+	if (unlikely(tid &gt;= TID_MAX_LOAD_COUNT))</div><div class='add'>+		return MAX_TID_COUNT;</div><div class='add'>+</div><div class='add'>+	tl = &amp;lq_data-&gt;load[tid];</div><div class='add'>+</div><div class='add'>+	curr_time -= curr_time % TID_ROUND_VALUE;</div><div class='add'>+</div><div class='add'>+	/* Happens only for the first packet. Initialize the data */</div><div class='add'>+	if (!(tl-&gt;queue_count)) {</div><div class='add'>+		tl-&gt;total = 1;</div><div class='add'>+		tl-&gt;time_stamp = curr_time;</div><div class='add'>+		tl-&gt;queue_count = 1;</div><div class='add'>+		tl-&gt;head = 0;</div><div class='add'>+		tl-&gt;packet_count[0] = 1;</div><div class='add'>+		return MAX_TID_COUNT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	time_diff = TIME_WRAP_AROUND(tl-&gt;time_stamp, curr_time);</div><div class='add'>+	idx = time_diff / TID_QUEUE_CELL_SPACING;</div><div class='add'>+</div><div class='add'>+	/* The history is too long: remove data that is older than */</div><div class='add'>+	/* TID_MAX_TIME_DIFF */</div><div class='add'>+	if (idx &gt;= TID_QUEUE_MAX_SIZE)</div><div class='add'>+		il4965_rs_tl_rm_old_stats(tl, curr_time);</div><div class='add'>+</div><div class='add'>+	idx = (tl-&gt;head + idx) % TID_QUEUE_MAX_SIZE;</div><div class='add'>+	tl-&gt;packet_count[idx] = tl-&gt;packet_count[idx] + 1;</div><div class='add'>+	tl-&gt;total = tl-&gt;total + 1;</div><div class='add'>+</div><div class='add'>+	if ((idx + 1) &gt; tl-&gt;queue_count)</div><div class='add'>+		tl-&gt;queue_count = idx + 1;</div><div class='add'>+</div><div class='add'>+	return tid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+	get the traffic load value for tid</div><div class='add'>+*/</div><div class='add'>+static u32</div><div class='add'>+il4965_rs_tl_get_load(struct il_lq_sta *lq_data, u8 tid)</div><div class='add'>+{</div><div class='add'>+	u32 curr_time = jiffies_to_msecs(jiffies);</div><div class='add'>+	u32 time_diff;</div><div class='add'>+	s32 idx;</div><div class='add'>+	struct il_traffic_load *tl = NULL;</div><div class='add'>+</div><div class='add'>+	if (tid &gt;= TID_MAX_LOAD_COUNT)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	tl = &amp;(lq_data-&gt;load[tid]);</div><div class='add'>+</div><div class='add'>+	curr_time -= curr_time % TID_ROUND_VALUE;</div><div class='add'>+</div><div class='add'>+	if (!(tl-&gt;queue_count))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	time_diff = TIME_WRAP_AROUND(tl-&gt;time_stamp, curr_time);</div><div class='add'>+	idx = time_diff / TID_QUEUE_CELL_SPACING;</div><div class='add'>+</div><div class='add'>+	/* The history is too long: remove data that is older than */</div><div class='add'>+	/* TID_MAX_TIME_DIFF */</div><div class='add'>+	if (idx &gt;= TID_QUEUE_MAX_SIZE)</div><div class='add'>+		il4965_rs_tl_rm_old_stats(tl, curr_time);</div><div class='add'>+</div><div class='add'>+	return tl-&gt;total;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il4965_rs_tl_turn_on_agg_for_tid(struct il_priv *il, struct il_lq_sta *lq_data,</div><div class='add'>+				 u8 tid, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	int ret = -EAGAIN;</div><div class='add'>+	u32 load;</div><div class='add'>+</div><div class='add'>+	load = il4965_rs_tl_get_load(lq_data, tid);</div><div class='add'>+</div><div class='add'>+	if (load &gt; IL_AGG_LOAD_THRESHOLD) {</div><div class='add'>+		D_HT("Starting Tx agg: STA: %pM tid: %d\n", sta-&gt;addr, tid);</div><div class='add'>+		ret = ieee80211_start_tx_ba_session(sta, tid, 5000);</div><div class='add'>+		if (ret == -EAGAIN) {</div><div class='add'>+			/*</div><div class='add'>+			 * driver and mac80211 is out of sync</div><div class='add'>+			 * this might be cause by reloading firmware</div><div class='add'>+			 * stop the tx ba session here</div><div class='add'>+			 */</div><div class='add'>+			IL_ERR("Fail start Tx agg on tid: %d\n", tid);</div><div class='add'>+			ieee80211_stop_tx_ba_session(sta, tid);</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		D_HT("Aggregation not enabled for tid %d because load = %u\n",</div><div class='add'>+		     tid, load);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_rs_tl_turn_on_agg(struct il_priv *il, u8 tid, struct il_lq_sta *lq_data,</div><div class='add'>+			 struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	if (tid &lt; TID_MAX_LOAD_COUNT)</div><div class='add'>+		il4965_rs_tl_turn_on_agg_for_tid(il, lq_data, tid, sta);</div><div class='add'>+	else</div><div class='add'>+		IL_ERR("tid exceeds max load count: %d/%d\n", tid,</div><div class='add'>+		       TID_MAX_LOAD_COUNT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il4965_get_il4965_num_of_ant_from_rate(u32 rate_n_flags)</div><div class='add'>+{</div><div class='add'>+	return !!(rate_n_flags &amp; RATE_MCS_ANT_A_MSK) +</div><div class='add'>+	    !!(rate_n_flags &amp; RATE_MCS_ANT_B_MSK) +</div><div class='add'>+	    !!(rate_n_flags &amp; RATE_MCS_ANT_C_MSK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Static function to get the expected throughput from an il_scale_tbl_info</div><div class='add'>+ * that wraps a NULL pointer check</div><div class='add'>+ */</div><div class='add'>+static s32</div><div class='add'>+il4965_get_expected_tpt(struct il_scale_tbl_info *tbl, int rs_idx)</div><div class='add'>+{</div><div class='add'>+	if (tbl-&gt;expected_tpt)</div><div class='add'>+		return tbl-&gt;expected_tpt[rs_idx];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_rs_collect_tx_data - Update the success/failure sliding win</div><div class='add'>+ *</div><div class='add'>+ * We keep a sliding win of the last 62 packets transmitted</div><div class='add'>+ * at this rate.  win-&gt;data contains the bitmask of successful</div><div class='add'>+ * packets.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_rs_collect_tx_data(struct il_scale_tbl_info *tbl, int scale_idx,</div><div class='add'>+			  int attempts, int successes)</div><div class='add'>+{</div><div class='add'>+	struct il_rate_scale_data *win = NULL;</div><div class='add'>+	static const u64 mask = (((u64) 1) &lt;&lt; (RATE_MAX_WINDOW - 1));</div><div class='add'>+	s32 fail_count, tpt;</div><div class='add'>+</div><div class='add'>+	if (scale_idx &lt; 0 || scale_idx &gt;= RATE_COUNT)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Select win for current tx bit rate */</div><div class='add'>+	win = &amp;(tbl-&gt;win[scale_idx]);</div><div class='add'>+</div><div class='add'>+	/* Get expected throughput */</div><div class='add'>+	tpt = il4965_get_expected_tpt(tbl, scale_idx);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Keep track of only the latest 62 tx frame attempts in this rate's</div><div class='add'>+	 * history win; anything older isn't really relevant any more.</div><div class='add'>+	 * If we have filled up the sliding win, drop the oldest attempt;</div><div class='add'>+	 * if the oldest attempt (highest bit in bitmap) shows "success",</div><div class='add'>+	 * subtract "1" from the success counter (this is the main reason</div><div class='add'>+	 * we keep these bitmaps!).</div><div class='add'>+	 */</div><div class='add'>+	while (attempts &gt; 0) {</div><div class='add'>+		if (win-&gt;counter &gt;= RATE_MAX_WINDOW) {</div><div class='add'>+</div><div class='add'>+			/* remove earliest */</div><div class='add'>+			win-&gt;counter = RATE_MAX_WINDOW - 1;</div><div class='add'>+</div><div class='add'>+			if (win-&gt;data &amp; mask) {</div><div class='add'>+				win-&gt;data &amp;= ~mask;</div><div class='add'>+				win-&gt;success_counter--;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Increment frames-attempted counter */</div><div class='add'>+		win-&gt;counter++;</div><div class='add'>+</div><div class='add'>+		/* Shift bitmap by one frame to throw away oldest history */</div><div class='add'>+		win-&gt;data &lt;&lt;= 1;</div><div class='add'>+</div><div class='add'>+		/* Mark the most recent #successes attempts as successful */</div><div class='add'>+		if (successes &gt; 0) {</div><div class='add'>+			win-&gt;success_counter++;</div><div class='add'>+			win-&gt;data |= 0x1;</div><div class='add'>+			successes--;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		attempts--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Calculate current success ratio, avoid divide-by-0! */</div><div class='add'>+	if (win-&gt;counter &gt; 0)</div><div class='add'>+		win-&gt;success_ratio =</div><div class='add'>+		    128 * (100 * win-&gt;success_counter) / win-&gt;counter;</div><div class='add'>+	else</div><div class='add'>+		win-&gt;success_ratio = IL_INVALID_VALUE;</div><div class='add'>+</div><div class='add'>+	fail_count = win-&gt;counter - win-&gt;success_counter;</div><div class='add'>+</div><div class='add'>+	/* Calculate average throughput, if we have enough history. */</div><div class='add'>+	if (fail_count &gt;= RATE_MIN_FAILURE_TH ||</div><div class='add'>+	    win-&gt;success_counter &gt;= RATE_MIN_SUCCESS_TH)</div><div class='add'>+		win-&gt;average_tpt = (win-&gt;success_ratio * tpt + 64) / 128;</div><div class='add'>+	else</div><div class='add'>+		win-&gt;average_tpt = IL_INVALID_VALUE;</div><div class='add'>+</div><div class='add'>+	/* Tag this win as having been updated */</div><div class='add'>+	win-&gt;stamp = jiffies;</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'>+ * Fill uCode API rate_n_flags field, based on "search" or "active" table.</div><div class='add'>+ */</div><div class='add'>+static u32</div><div class='add'>+il4965_rate_n_flags_from_tbl(struct il_priv *il, struct il_scale_tbl_info *tbl,</div><div class='add'>+			     int idx, u8 use_green)</div><div class='add'>+{</div><div class='add'>+	u32 rate_n_flags = 0;</div><div class='add'>+</div><div class='add'>+	if (is_legacy(tbl-&gt;lq_type)) {</div><div class='add'>+		rate_n_flags = il_rates[idx].plcp;</div><div class='add'>+		if (idx &gt;= IL_FIRST_CCK_RATE &amp;&amp; idx &lt;= IL_LAST_CCK_RATE)</div><div class='add'>+			rate_n_flags |= RATE_MCS_CCK_MSK;</div><div class='add'>+</div><div class='add'>+	} else if (is_Ht(tbl-&gt;lq_type)) {</div><div class='add'>+		if (idx &gt; IL_LAST_OFDM_RATE) {</div><div class='add'>+			IL_ERR("Invalid HT rate idx %d\n", idx);</div><div class='add'>+			idx = IL_LAST_OFDM_RATE;</div><div class='add'>+		}</div><div class='add'>+		rate_n_flags = RATE_MCS_HT_MSK;</div><div class='add'>+</div><div class='add'>+		if (is_siso(tbl-&gt;lq_type))</div><div class='add'>+			rate_n_flags |= il_rates[idx].plcp_siso;</div><div class='add'>+		else</div><div class='add'>+			rate_n_flags |= il_rates[idx].plcp_mimo2;</div><div class='add'>+	} else {</div><div class='add'>+		IL_ERR("Invalid tbl-&gt;lq_type %d\n", tbl-&gt;lq_type);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rate_n_flags |=</div><div class='add'>+	    ((tbl-&gt;ant_type &lt;&lt; RATE_MCS_ANT_POS) &amp; RATE_MCS_ANT_ABC_MSK);</div><div class='add'>+</div><div class='add'>+	if (is_Ht(tbl-&gt;lq_type)) {</div><div class='add'>+		if (tbl-&gt;is_ht40) {</div><div class='add'>+			if (tbl-&gt;is_dup)</div><div class='add'>+				rate_n_flags |= RATE_MCS_DUP_MSK;</div><div class='add'>+			else</div><div class='add'>+				rate_n_flags |= RATE_MCS_HT40_MSK;</div><div class='add'>+		}</div><div class='add'>+		if (tbl-&gt;is_SGI)</div><div class='add'>+			rate_n_flags |= RATE_MCS_SGI_MSK;</div><div class='add'>+</div><div class='add'>+		if (use_green) {</div><div class='add'>+			rate_n_flags |= RATE_MCS_GF_MSK;</div><div class='add'>+			if (is_siso(tbl-&gt;lq_type) &amp;&amp; tbl-&gt;is_SGI) {</div><div class='add'>+				rate_n_flags &amp;= ~RATE_MCS_SGI_MSK;</div><div class='add'>+				IL_ERR("GF was set with SGI:SISO\n");</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return rate_n_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Interpret uCode API's rate_n_flags format,</div><div class='add'>+ * fill "search" or "active" tx mode table.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_rs_get_tbl_info_from_mcs(const u32 rate_n_flags,</div><div class='add'>+				enum ieee80211_band band,</div><div class='add'>+				struct il_scale_tbl_info *tbl, int *rate_idx)</div><div class='add'>+{</div><div class='add'>+	u32 ant_msk = (rate_n_flags &amp; RATE_MCS_ANT_ABC_MSK);</div><div class='add'>+	u8 il4965_num_of_ant =</div><div class='add'>+	    il4965_get_il4965_num_of_ant_from_rate(rate_n_flags);</div><div class='add'>+	u8 mcs;</div><div class='add'>+</div><div class='add'>+	memset(tbl, 0, sizeof(struct il_scale_tbl_info));</div><div class='add'>+	*rate_idx = il4965_hwrate_to_plcp_idx(rate_n_flags);</div><div class='add'>+</div><div class='add'>+	if (*rate_idx == RATE_INVALID) {</div><div class='add'>+		*rate_idx = -1;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	tbl-&gt;is_SGI = 0;	/* default legacy setup */</div><div class='add'>+	tbl-&gt;is_ht40 = 0;</div><div class='add'>+	tbl-&gt;is_dup = 0;</div><div class='add'>+	tbl-&gt;ant_type = (ant_msk &gt;&gt; RATE_MCS_ANT_POS);</div><div class='add'>+	tbl-&gt;lq_type = LQ_NONE;</div><div class='add'>+	tbl-&gt;max_search = IL_MAX_SEARCH;</div><div class='add'>+</div><div class='add'>+	/* legacy rate format */</div><div class='add'>+	if (!(rate_n_flags &amp; RATE_MCS_HT_MSK)) {</div><div class='add'>+		if (il4965_num_of_ant == 1) {</div><div class='add'>+			if (band == IEEE80211_BAND_5GHZ)</div><div class='add'>+				tbl-&gt;lq_type = LQ_A;</div><div class='add'>+			else</div><div class='add'>+				tbl-&gt;lq_type = LQ_G;</div><div class='add'>+		}</div><div class='add'>+		/* HT rate format */</div><div class='add'>+	} else {</div><div class='add'>+		if (rate_n_flags &amp; RATE_MCS_SGI_MSK)</div><div class='add'>+			tbl-&gt;is_SGI = 1;</div><div class='add'>+</div><div class='add'>+		if ((rate_n_flags &amp; RATE_MCS_HT40_MSK) ||</div><div class='add'>+		    (rate_n_flags &amp; RATE_MCS_DUP_MSK))</div><div class='add'>+			tbl-&gt;is_ht40 = 1;</div><div class='add'>+</div><div class='add'>+		if (rate_n_flags &amp; RATE_MCS_DUP_MSK)</div><div class='add'>+			tbl-&gt;is_dup = 1;</div><div class='add'>+</div><div class='add'>+		mcs = il4965_rs_extract_rate(rate_n_flags);</div><div class='add'>+</div><div class='add'>+		/* SISO */</div><div class='add'>+		if (mcs &lt;= RATE_SISO_60M_PLCP) {</div><div class='add'>+			if (il4965_num_of_ant == 1)</div><div class='add'>+				tbl-&gt;lq_type = LQ_SISO;	/*else NONE */</div><div class='add'>+			/* MIMO2 */</div><div class='add'>+		} else {</div><div class='add'>+			if (il4965_num_of_ant == 2)</div><div class='add'>+				tbl-&gt;lq_type = LQ_MIMO2;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* switch to another antenna/antennas and return 1 */</div><div class='add'>+/* if no other valid antenna found, return 0 */</div><div class='add'>+static int</div><div class='add'>+il4965_rs_toggle_antenna(u32 valid_ant, u32 *rate_n_flags,</div><div class='add'>+			 struct il_scale_tbl_info *tbl)</div><div class='add'>+{</div><div class='add'>+	u8 new_ant_type;</div><div class='add'>+</div><div class='add'>+	if (!tbl-&gt;ant_type || tbl-&gt;ant_type &gt; ANT_ABC)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!il4965_rs_is_valid_ant(valid_ant, tbl-&gt;ant_type))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	new_ant_type = ant_toggle_lookup[tbl-&gt;ant_type];</div><div class='add'>+</div><div class='add'>+	while (new_ant_type != tbl-&gt;ant_type &amp;&amp;</div><div class='add'>+	       !il4965_rs_is_valid_ant(valid_ant, new_ant_type))</div><div class='add'>+		new_ant_type = ant_toggle_lookup[new_ant_type];</div><div class='add'>+</div><div class='add'>+	if (new_ant_type == tbl-&gt;ant_type)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	tbl-&gt;ant_type = new_ant_type;</div><div class='add'>+	*rate_n_flags &amp;= ~RATE_MCS_ANT_ABC_MSK;</div><div class='add'>+	*rate_n_flags |= new_ant_type &lt;&lt; RATE_MCS_ANT_POS;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Green-field mode is valid if the station supports it and</div><div class='add'>+ * there are no non-GF stations present in the BSS.</div><div class='add'>+ */</div><div class='add'>+static bool</div><div class='add'>+il4965_rs_use_green(struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct il_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='add'>+	struct il_rxon_context *ctx = sta_priv-&gt;common.ctx;</div><div class='add'>+</div><div class='add'>+	return (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_GRN_FLD) &amp;&amp;</div><div class='add'>+	    !(ctx-&gt;ht.non_gf_sta_present);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_rs_get_supported_rates - get the available rates</div><div class='add'>+ *</div><div class='add'>+ * if management frame or broadcast frame only return</div><div class='add'>+ * basic available rates.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static u16</div><div class='add'>+il4965_rs_get_supported_rates(struct il_lq_sta *lq_sta,</div><div class='add'>+			      struct ieee80211_hdr *hdr,</div><div class='add'>+			      enum il_table_type rate_type)</div><div class='add'>+{</div><div class='add'>+	if (is_legacy(rate_type)) {</div><div class='add'>+		return lq_sta-&gt;active_legacy_rate;</div><div class='add'>+	} else {</div><div class='add'>+		if (is_siso(rate_type))</div><div class='add'>+			return lq_sta-&gt;active_siso_rate;</div><div class='add'>+		else</div><div class='add'>+			return lq_sta-&gt;active_mimo2_rate;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16</div><div class='add'>+il4965_rs_get_adjacent_rate(struct il_priv *il, u8 idx, u16 rate_mask,</div><div class='add'>+			    int rate_type)</div><div class='add'>+{</div><div class='add'>+	u8 high = RATE_INVALID;</div><div class='add'>+	u8 low = RATE_INVALID;</div><div class='add'>+</div><div class='add'>+	/* 802.11A or ht walks to the next literal adjacent rate in</div><div class='add'>+	 * the rate table */</div><div class='add'>+	if (is_a_band(rate_type) || !is_legacy(rate_type)) {</div><div class='add'>+		int i;</div><div class='add'>+		u32 mask;</div><div class='add'>+</div><div class='add'>+		/* Find the previous rate that is in the rate mask */</div><div class='add'>+		i = idx - 1;</div><div class='add'>+		for (mask = (1 &lt;&lt; i); i &gt;= 0; i--, mask &gt;&gt;= 1) {</div><div class='add'>+			if (rate_mask &amp; mask) {</div><div class='add'>+				low = i;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Find the next rate that is in the rate mask */</div><div class='add'>+		i = idx + 1;</div><div class='add'>+		for (mask = (1 &lt;&lt; i); i &lt; RATE_COUNT; i++, mask &lt;&lt;= 1) {</div><div class='add'>+			if (rate_mask &amp; mask) {</div><div class='add'>+				high = i;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return (high &lt;&lt; 8) | low;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	low = idx;</div><div class='add'>+	while (low != RATE_INVALID) {</div><div class='add'>+		low = il_rates[low].prev_rs;</div><div class='add'>+		if (low == RATE_INVALID)</div><div class='add'>+			break;</div><div class='add'>+		if (rate_mask &amp; (1 &lt;&lt; low))</div><div class='add'>+			break;</div><div class='add'>+		D_RATE("Skipping masked lower rate: %d\n", low);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	high = idx;</div><div class='add'>+	while (high != RATE_INVALID) {</div><div class='add'>+		high = il_rates[high].next_rs;</div><div class='add'>+		if (high == RATE_INVALID)</div><div class='add'>+			break;</div><div class='add'>+		if (rate_mask &amp; (1 &lt;&lt; high))</div><div class='add'>+			break;</div><div class='add'>+		D_RATE("Skipping masked higher rate: %d\n", high);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (high &lt;&lt; 8) | low;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+il4965_rs_get_lower_rate(struct il_lq_sta *lq_sta,</div><div class='add'>+			 struct il_scale_tbl_info *tbl, u8 scale_idx,</div><div class='add'>+			 u8 ht_possible)</div><div class='add'>+{</div><div class='add'>+	s32 low;</div><div class='add'>+	u16 rate_mask;</div><div class='add'>+	u16 high_low;</div><div class='add'>+	u8 switch_to_legacy = 0;</div><div class='add'>+	u8 is_green = lq_sta-&gt;is_green;</div><div class='add'>+	struct il_priv *il = lq_sta-&gt;drv;</div><div class='add'>+</div><div class='add'>+	/* check if we need to switch from HT to legacy rates.</div><div class='add'>+	 * assumption is that mandatory rates (1Mbps or 6Mbps)</div><div class='add'>+	 * are always supported (spec demand) */</div><div class='add'>+	if (!is_legacy(tbl-&gt;lq_type) &amp;&amp; (!ht_possible || !scale_idx)) {</div><div class='add'>+		switch_to_legacy = 1;</div><div class='add'>+		scale_idx = rs_ht_to_legacy[scale_idx];</div><div class='add'>+		if (lq_sta-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='add'>+			tbl-&gt;lq_type = LQ_A;</div><div class='add'>+		else</div><div class='add'>+			tbl-&gt;lq_type = LQ_G;</div><div class='add'>+</div><div class='add'>+		if (il4965_num_of_ant(tbl-&gt;ant_type) &gt; 1)</div><div class='add'>+			tbl-&gt;ant_type =</div><div class='add'>+			    il4965_first_antenna(il-&gt;hw_params.valid_tx_ant);</div><div class='add'>+</div><div class='add'>+		tbl-&gt;is_ht40 = 0;</div><div class='add'>+		tbl-&gt;is_SGI = 0;</div><div class='add'>+		tbl-&gt;max_search = IL_MAX_SEARCH;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rate_mask = il4965_rs_get_supported_rates(lq_sta, NULL, tbl-&gt;lq_type);</div><div class='add'>+</div><div class='add'>+	/* Mask with station rate restriction */</div><div class='add'>+	if (is_legacy(tbl-&gt;lq_type)) {</div><div class='add'>+		/* supp_rates has no CCK bits in A mode */</div><div class='add'>+		if (lq_sta-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='add'>+			rate_mask =</div><div class='add'>+			    (u16) (rate_mask &amp;</div><div class='add'>+				   (lq_sta-&gt;supp_rates &lt;&lt; IL_FIRST_OFDM_RATE));</div><div class='add'>+		else</div><div class='add'>+			rate_mask = (u16) (rate_mask &amp; lq_sta-&gt;supp_rates);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we switched from HT to legacy, check current rate */</div><div class='add'>+	if (switch_to_legacy &amp;&amp; (rate_mask &amp; (1 &lt;&lt; scale_idx))) {</div><div class='add'>+		low = scale_idx;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	high_low =</div><div class='add'>+	    il4965_rs_get_adjacent_rate(lq_sta-&gt;drv, scale_idx, rate_mask,</div><div class='add'>+					tbl-&gt;lq_type);</div><div class='add'>+	low = high_low &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	if (low == RATE_INVALID)</div><div class='add'>+		low = scale_idx;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return il4965_rate_n_flags_from_tbl(lq_sta-&gt;drv, tbl, low, is_green);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Simple function to compare two rate scale table types</div><div class='add'>+ */</div><div class='add'>+static bool</div><div class='add'>+il4965_table_type_matches(struct il_scale_tbl_info *a,</div><div class='add'>+			  struct il_scale_tbl_info *b)</div><div class='add'>+{</div><div class='add'>+	return (a-&gt;lq_type == b-&gt;lq_type &amp;&amp; a-&gt;ant_type == b-&gt;ant_type &amp;&amp;</div><div class='add'>+		a-&gt;is_SGI == b-&gt;is_SGI);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mac80211 sends us Tx status</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_rs_tx_status(void *il_r, struct ieee80211_supported_band *sband,</div><div class='add'>+		    struct ieee80211_sta *sta, void *il_sta,</div><div class='add'>+		    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int legacy_success;</div><div class='add'>+	int retries;</div><div class='add'>+	int rs_idx, mac_idx, i;</div><div class='add'>+	struct il_lq_sta *lq_sta = il_sta;</div><div class='add'>+	struct il_link_quality_cmd *table;</div><div class='add'>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+	struct il_priv *il = (struct il_priv *)il_r;</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	enum mac80211_rate_control_flags mac_flags;</div><div class='add'>+	u32 tx_rate;</div><div class='add'>+	struct il_scale_tbl_info tbl_type;</div><div class='add'>+	struct il_scale_tbl_info *curr_tbl, *other_tbl, *tmp_tbl;</div><div class='add'>+	struct il_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='add'>+	struct il_rxon_context *ctx = sta_priv-&gt;common.ctx;</div><div class='add'>+</div><div class='add'>+	D_RATE("get frame ack response, update rate scale win\n");</div><div class='add'>+</div><div class='add'>+	/* Treat uninitialized rate scaling data same as non-existing. */</div><div class='add'>+	if (!lq_sta) {</div><div class='add'>+		D_RATE("Station rate scaling not created yet.\n");</div><div class='add'>+		return;</div><div class='add'>+	} else if (!lq_sta-&gt;drv) {</div><div class='add'>+		D_RATE("Rate scaling not initialized yet.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_is_data(hdr-&gt;frame_control) ||</div><div class='add'>+	    (info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* This packet was aggregated but doesn't carry status info */</div><div class='add'>+	if ((info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU) &amp;&amp;</div><div class='add'>+	    !(info-&gt;flags &amp; IEEE80211_TX_STAT_AMPDU))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ignore this Tx frame response if its initial rate doesn't match</div><div class='add'>+	 * that of latest Link Quality command.  There may be stragglers</div><div class='add'>+	 * from a previous Link Quality command, but we're no longer interested</div><div class='add'>+	 * in those; they're either from the "active" mode while we're trying</div><div class='add'>+	 * to check "search" mode, or a prior "search" mode after we've moved</div><div class='add'>+	 * to a new "search" mode (which might become the new "active" mode).</div><div class='add'>+	 */</div><div class='add'>+	table = &amp;lq_sta-&gt;lq;</div><div class='add'>+	tx_rate = le32_to_cpu(table-&gt;rs_table[0].rate_n_flags);</div><div class='add'>+	il4965_rs_get_tbl_info_from_mcs(tx_rate, il-&gt;band, &amp;tbl_type, &amp;rs_idx);</div><div class='add'>+	if (il-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='add'>+		rs_idx -= IL_FIRST_OFDM_RATE;</div><div class='add'>+	mac_flags = info-&gt;status.rates[0].flags;</div><div class='add'>+	mac_idx = info-&gt;status.rates[0].idx;</div><div class='add'>+	/* For HT packets, map MCS to PLCP */</div><div class='add'>+	if (mac_flags &amp; IEEE80211_TX_RC_MCS) {</div><div class='add'>+		mac_idx &amp;= RATE_MCS_CODE_MSK;	/* Remove # of streams */</div><div class='add'>+		if (mac_idx &gt;= (RATE_9M_IDX - IL_FIRST_OFDM_RATE))</div><div class='add'>+			mac_idx++;</div><div class='add'>+		/*</div><div class='add'>+		 * mac80211 HT idx is always zero-idxed; we need to move</div><div class='add'>+		 * HT OFDM rates after CCK rates in 2.4 GHz band</div><div class='add'>+		 */</div><div class='add'>+		if (il-&gt;band == IEEE80211_BAND_2GHZ)</div><div class='add'>+			mac_idx += IL_FIRST_OFDM_RATE;</div><div class='add'>+	}</div><div class='add'>+	/* Here we actually compare this rate to the latest LQ command */</div><div class='add'>+	if (mac_idx &lt; 0 ||</div><div class='add'>+	    tbl_type.is_SGI != !!(mac_flags &amp; IEEE80211_TX_RC_SHORT_GI) ||</div><div class='add'>+	    tbl_type.is_ht40 != !!(mac_flags &amp; IEEE80211_TX_RC_40_MHZ_WIDTH) ||</div><div class='add'>+	    tbl_type.is_dup != !!(mac_flags &amp; IEEE80211_TX_RC_DUP_DATA) ||</div><div class='add'>+	    tbl_type.ant_type != info-&gt;antenna_sel_tx ||</div><div class='add'>+	    !!(tx_rate &amp; RATE_MCS_HT_MSK) != !!(mac_flags &amp; IEEE80211_TX_RC_MCS)</div><div class='add'>+	    || !!(tx_rate &amp; RATE_MCS_GF_MSK) !=</div><div class='add'>+	    !!(mac_flags &amp; IEEE80211_TX_RC_GREEN_FIELD) || rs_idx != mac_idx) {</div><div class='add'>+		D_RATE("initial rate %d does not match %d (0x%x)\n", mac_idx,</div><div class='add'>+		       rs_idx, tx_rate);</div><div class='add'>+		/*</div><div class='add'>+		 * Since rates mis-match, the last LQ command may have failed.</div><div class='add'>+		 * After IL_MISSED_RATE_MAX mis-matches, resync the uCode with</div><div class='add'>+		 * ... driver.</div><div class='add'>+		 */</div><div class='add'>+		lq_sta-&gt;missed_rate_counter++;</div><div class='add'>+		if (lq_sta-&gt;missed_rate_counter &gt; IL_MISSED_RATE_MAX) {</div><div class='add'>+			lq_sta-&gt;missed_rate_counter = 0;</div><div class='add'>+			il_send_lq_cmd(il, ctx, &amp;lq_sta-&gt;lq, CMD_ASYNC, false);</div><div class='add'>+		}</div><div class='add'>+		/* Regardless, ignore this status info for outdated rate */</div><div class='add'>+		return;</div><div class='add'>+	} else</div><div class='add'>+		/* Rate did match, so reset the missed_rate_counter */</div><div class='add'>+		lq_sta-&gt;missed_rate_counter = 0;</div><div class='add'>+</div><div class='add'>+	/* Figure out if rate scale algorithm is in active or search table */</div><div class='add'>+	if (il4965_table_type_matches</div><div class='add'>+	    (&amp;tbl_type, &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]))) {</div><div class='add'>+		curr_tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='add'>+		other_tbl = &amp;(lq_sta-&gt;lq_info[1 - lq_sta-&gt;active_tbl]);</div><div class='add'>+	} else</div><div class='add'>+	    if (il4965_table_type_matches</div><div class='add'>+		(&amp;tbl_type, &amp;lq_sta-&gt;lq_info[1 - lq_sta-&gt;active_tbl])) {</div><div class='add'>+		curr_tbl = &amp;(lq_sta-&gt;lq_info[1 - lq_sta-&gt;active_tbl]);</div><div class='add'>+		other_tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='add'>+	} else {</div><div class='add'>+		D_RATE("Neither active nor search matches tx rate\n");</div><div class='add'>+		tmp_tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='add'>+		D_RATE("active- lq:%x, ant:%x, SGI:%d\n", tmp_tbl-&gt;lq_type,</div><div class='add'>+		       tmp_tbl-&gt;ant_type, tmp_tbl-&gt;is_SGI);</div><div class='add'>+		tmp_tbl = &amp;(lq_sta-&gt;lq_info[1 - lq_sta-&gt;active_tbl]);</div><div class='add'>+		D_RATE("search- lq:%x, ant:%x, SGI:%d\n", tmp_tbl-&gt;lq_type,</div><div class='add'>+		       tmp_tbl-&gt;ant_type, tmp_tbl-&gt;is_SGI);</div><div class='add'>+		D_RATE("actual- lq:%x, ant:%x, SGI:%d\n", tbl_type.lq_type,</div><div class='add'>+		       tbl_type.ant_type, tbl_type.is_SGI);</div><div class='add'>+		/*</div><div class='add'>+		 * no matching table found, let's by-pass the data collection</div><div class='add'>+		 * and continue to perform rate scale to find the rate table</div><div class='add'>+		 */</div><div class='add'>+		il4965_rs_stay_in_table(lq_sta, true);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Updating the frame history depends on whether packets were</div><div class='add'>+	 * aggregated.</div><div class='add'>+	 *</div><div class='add'>+	 * For aggregation, all packets were transmitted at the same rate, the</div><div class='add'>+	 * first idx into rate scale table.</div><div class='add'>+	 */</div><div class='add'>+	if (info-&gt;flags &amp; IEEE80211_TX_STAT_AMPDU) {</div><div class='add'>+		tx_rate = le32_to_cpu(table-&gt;rs_table[0].rate_n_flags);</div><div class='add'>+		il4965_rs_get_tbl_info_from_mcs(tx_rate, il-&gt;band, &amp;tbl_type,</div><div class='add'>+						&amp;rs_idx);</div><div class='add'>+		il4965_rs_collect_tx_data(curr_tbl, rs_idx,</div><div class='add'>+					  info-&gt;status.ampdu_len,</div><div class='add'>+					  info-&gt;status.ampdu_ack_len);</div><div class='add'>+</div><div class='add'>+		/* Update success/fail counts if not searching for new mode */</div><div class='add'>+		if (lq_sta-&gt;stay_in_tbl) {</div><div class='add'>+			lq_sta-&gt;total_success += info-&gt;status.ampdu_ack_len;</div><div class='add'>+			lq_sta-&gt;total_failed +=</div><div class='add'>+			    (info-&gt;status.ampdu_len -</div><div class='add'>+			     info-&gt;status.ampdu_ack_len);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * For legacy, update frame history with for each Tx retry.</div><div class='add'>+		 */</div><div class='add'>+		retries = info-&gt;status.rates[0].count - 1;</div><div class='add'>+		/* HW doesn't send more than 15 retries */</div><div class='add'>+		retries = min(retries, 15);</div><div class='add'>+</div><div class='add'>+		/* The last transmission may have been successful */</div><div class='add'>+		legacy_success = !!(info-&gt;flags &amp; IEEE80211_TX_STAT_ACK);</div><div class='add'>+		/* Collect data for each rate used during failed TX attempts */</div><div class='add'>+		for (i = 0; i &lt;= retries; ++i) {</div><div class='add'>+			tx_rate = le32_to_cpu(table-&gt;rs_table[i].rate_n_flags);</div><div class='add'>+			il4965_rs_get_tbl_info_from_mcs(tx_rate, il-&gt;band,</div><div class='add'>+							&amp;tbl_type, &amp;rs_idx);</div><div class='add'>+			/*</div><div class='add'>+			 * Only collect stats if retried rate is in the same RS</div><div class='add'>+			 * table as active/search.</div><div class='add'>+			 */</div><div class='add'>+			if (il4965_table_type_matches(&amp;tbl_type, curr_tbl))</div><div class='add'>+				tmp_tbl = curr_tbl;</div><div class='add'>+			else if (il4965_table_type_matches</div><div class='add'>+				 (&amp;tbl_type, other_tbl))</div><div class='add'>+				tmp_tbl = other_tbl;</div><div class='add'>+			else</div><div class='add'>+				continue;</div><div class='add'>+			il4965_rs_collect_tx_data(tmp_tbl, rs_idx, 1,</div><div class='add'>+						  i &lt;</div><div class='add'>+						  retries ? 0 : legacy_success);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Update success/fail counts if not searching for new mode */</div><div class='add'>+		if (lq_sta-&gt;stay_in_tbl) {</div><div class='add'>+			lq_sta-&gt;total_success += legacy_success;</div><div class='add'>+			lq_sta-&gt;total_failed += retries + (1 - legacy_success);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* The last TX rate is cached in lq_sta; it's set in if/else above */</div><div class='add'>+	lq_sta-&gt;last_rate_n_flags = tx_rate;</div><div class='add'>+done:</div><div class='add'>+	/* See if there's a better rate or modulation mode to try. */</div><div class='add'>+	if (sta-&gt;supp_rates[sband-&gt;band])</div><div class='add'>+		il4965_rs_rate_scale_perform(il, skb, sta, lq_sta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Begin a period of staying with a selected modulation mode.</div><div class='add'>+ * Set "stay_in_tbl" flag to prevent any mode switches.</div><div class='add'>+ * Set frame tx success limits according to legacy vs. high-throughput,</div><div class='add'>+ * and reset overall (spanning all rates) tx success history stats.</div><div class='add'>+ * These control how long we stay using same modulation mode before</div><div class='add'>+ * searching for a new mode.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_rs_set_stay_in_table(struct il_priv *il, u8 is_legacy,</div><div class='add'>+			    struct il_lq_sta *lq_sta)</div><div class='add'>+{</div><div class='add'>+	D_RATE("we are staying in the same table\n");</div><div class='add'>+	lq_sta-&gt;stay_in_tbl = 1;	/* only place this gets set */</div><div class='add'>+	if (is_legacy) {</div><div class='add'>+		lq_sta-&gt;table_count_limit = IL_LEGACY_TBL_COUNT;</div><div class='add'>+		lq_sta-&gt;max_failure_limit = IL_LEGACY_FAILURE_LIMIT;</div><div class='add'>+		lq_sta-&gt;max_success_limit = IL_LEGACY_SUCCESS_LIMIT;</div><div class='add'>+	} else {</div><div class='add'>+		lq_sta-&gt;table_count_limit = IL_NONE_LEGACY_TBL_COUNT;</div><div class='add'>+		lq_sta-&gt;max_failure_limit = IL_NONE_LEGACY_FAILURE_LIMIT;</div><div class='add'>+		lq_sta-&gt;max_success_limit = IL_NONE_LEGACY_SUCCESS_LIMIT;</div><div class='add'>+	}</div><div class='add'>+	lq_sta-&gt;table_count = 0;</div><div class='add'>+	lq_sta-&gt;total_failed = 0;</div><div class='add'>+	lq_sta-&gt;total_success = 0;</div><div class='add'>+	lq_sta-&gt;flush_timer = jiffies;</div><div class='add'>+	lq_sta-&gt;action_counter = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Find correct throughput table for given mode of modulation</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_rs_set_expected_tpt_table(struct il_lq_sta *lq_sta,</div><div class='add'>+				 struct il_scale_tbl_info *tbl)</div><div class='add'>+{</div><div class='add'>+	/* Used to choose among HT tables */</div><div class='add'>+	s32(*ht_tbl_pointer)[RATE_COUNT];</div><div class='add'>+</div><div class='add'>+	/* Check for invalid LQ type */</div><div class='add'>+	if (WARN_ON_ONCE(!is_legacy(tbl-&gt;lq_type) &amp;&amp; !is_Ht(tbl-&gt;lq_type))) {</div><div class='add'>+		tbl-&gt;expected_tpt = expected_tpt_legacy;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Legacy rates have only one table */</div><div class='add'>+	if (is_legacy(tbl-&gt;lq_type)) {</div><div class='add'>+		tbl-&gt;expected_tpt = expected_tpt_legacy;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Choose among many HT tables depending on number of streams</div><div class='add'>+	 * (SISO/MIMO2), channel width (20/40), SGI, and aggregation</div><div class='add'>+	 * status */</div><div class='add'>+	if (is_siso(tbl-&gt;lq_type) &amp;&amp; (!tbl-&gt;is_ht40 || lq_sta-&gt;is_dup))</div><div class='add'>+		ht_tbl_pointer = expected_tpt_siso20MHz;</div><div class='add'>+	else if (is_siso(tbl-&gt;lq_type))</div><div class='add'>+		ht_tbl_pointer = expected_tpt_siso40MHz;</div><div class='add'>+	else if (is_mimo2(tbl-&gt;lq_type) &amp;&amp; (!tbl-&gt;is_ht40 || lq_sta-&gt;is_dup))</div><div class='add'>+		ht_tbl_pointer = expected_tpt_mimo2_20MHz;</div><div class='add'>+	else			/* if (is_mimo2(tbl-&gt;lq_type)) &lt;-- must be true */</div><div class='add'>+		ht_tbl_pointer = expected_tpt_mimo2_40MHz;</div><div class='add'>+</div><div class='add'>+	if (!tbl-&gt;is_SGI &amp;&amp; !lq_sta-&gt;is_agg)	/* Normal */</div><div class='add'>+		tbl-&gt;expected_tpt = ht_tbl_pointer[0];</div><div class='add'>+	else if (tbl-&gt;is_SGI &amp;&amp; !lq_sta-&gt;is_agg)	/* SGI */</div><div class='add'>+		tbl-&gt;expected_tpt = ht_tbl_pointer[1];</div><div class='add'>+	else if (!tbl-&gt;is_SGI &amp;&amp; lq_sta-&gt;is_agg)	/* AGG */</div><div class='add'>+		tbl-&gt;expected_tpt = ht_tbl_pointer[2];</div><div class='add'>+	else			/* AGG+SGI */</div><div class='add'>+		tbl-&gt;expected_tpt = ht_tbl_pointer[3];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Find starting rate for new "search" high-throughput mode of modulation.</div><div class='add'>+ * Goal is to find lowest expected rate (under perfect conditions) that is</div><div class='add'>+ * above the current measured throughput of "active" mode, to give new mode</div><div class='add'>+ * a fair chance to prove itself without too many challenges.</div><div class='add'>+ *</div><div class='add'>+ * This gets called when transitioning to more aggressive modulation</div><div class='add'>+ * (i.e. legacy to SISO or MIMO, or SISO to MIMO), as well as less aggressive</div><div class='add'>+ * (i.e. MIMO to SISO).  When moving to MIMO, bit rate will typically need</div><div class='add'>+ * to decrease to match "active" throughput.  When moving from MIMO to SISO,</div><div class='add'>+ * bit rate will typically need to increase, but not if performance was bad.</div><div class='add'>+ */</div><div class='add'>+static s32</div><div class='add'>+il4965_rs_get_best_rate(struct il_priv *il, struct il_lq_sta *lq_sta,</div><div class='add'>+			struct il_scale_tbl_info *tbl,	/* "search" */</div><div class='add'>+			u16 rate_mask, s8 idx)</div><div class='add'>+{</div><div class='add'>+	/* "active" values */</div><div class='add'>+	struct il_scale_tbl_info *active_tbl =</div><div class='add'>+	    &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='add'>+	s32 active_sr = active_tbl-&gt;win[idx].success_ratio;</div><div class='add'>+	s32 active_tpt = active_tbl-&gt;expected_tpt[idx];</div><div class='add'>+</div><div class='add'>+	/* expected "search" throughput */</div><div class='add'>+	s32 *tpt_tbl = tbl-&gt;expected_tpt;</div><div class='add'>+</div><div class='add'>+	s32 new_rate, high, low, start_hi;</div><div class='add'>+	u16 high_low;</div><div class='add'>+	s8 rate = idx;</div><div class='add'>+</div><div class='add'>+	new_rate = high = low = start_hi = RATE_INVALID;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		high_low =</div><div class='add'>+		    il4965_rs_get_adjacent_rate(il, rate, rate_mask,</div><div class='add'>+						tbl-&gt;lq_type);</div><div class='add'>+</div><div class='add'>+		low = high_low &amp; 0xff;</div><div class='add'>+		high = (high_low &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Lower the "search" bit rate, to give new "search" mode</div><div class='add'>+		 * approximately the same throughput as "active" if:</div><div class='add'>+		 *</div><div class='add'>+		 * 1) "Active" mode has been working modestly well (but not</div><div class='add'>+		 *    great), and expected "search" throughput (under perfect</div><div class='add'>+		 *    conditions) at candidate rate is above the actual</div><div class='add'>+		 *    measured "active" throughput (but less than expected</div><div class='add'>+		 *    "active" throughput under perfect conditions).</div><div class='add'>+		 * OR</div><div class='add'>+		 * 2) "Active" mode has been working perfectly or very well</div><div class='add'>+		 *    and expected "search" throughput (under perfect</div><div class='add'>+		 *    conditions) at candidate rate is above expected</div><div class='add'>+		 *    "active" throughput (under perfect conditions).</div><div class='add'>+		 */</div><div class='add'>+		if ((100 * tpt_tbl[rate] &gt; lq_sta-&gt;last_tpt &amp;&amp;</div><div class='add'>+		     (active_sr &gt; RATE_DECREASE_TH &amp;&amp; active_sr &lt;= RATE_HIGH_TH</div><div class='add'>+		      &amp;&amp; tpt_tbl[rate] &lt;= active_tpt)) ||</div><div class='add'>+		    (active_sr &gt;= RATE_SCALE_SWITCH &amp;&amp;</div><div class='add'>+		     tpt_tbl[rate] &gt; active_tpt)) {</div><div class='add'>+</div><div class='add'>+			/* (2nd or later pass)</div><div class='add'>+			 * If we've already tried to raise the rate, and are</div><div class='add'>+			 * now trying to lower it, use the higher rate. */</div><div class='add'>+			if (start_hi != RATE_INVALID) {</div><div class='add'>+				new_rate = start_hi;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			new_rate = rate;</div><div class='add'>+</div><div class='add'>+			/* Loop again with lower rate */</div><div class='add'>+			if (low != RATE_INVALID)</div><div class='add'>+				rate = low;</div><div class='add'>+</div><div class='add'>+			/* Lower rate not available, use the original */</div><div class='add'>+			else</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			/* Else try to raise the "search" rate to match "active" */</div><div class='add'>+		} else {</div><div class='add'>+			/* (2nd or later pass)</div><div class='add'>+			 * If we've already tried to lower the rate, and are</div><div class='add'>+			 * now trying to raise it, use the lower rate. */</div><div class='add'>+			if (new_rate != RATE_INVALID)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			/* Loop again with higher rate */</div><div class='add'>+			else if (high != RATE_INVALID) {</div><div class='add'>+				start_hi = high;</div><div class='add'>+				rate = high;</div><div class='add'>+</div><div class='add'>+				/* Higher rate not available, use the original */</div><div class='add'>+			} else {</div><div class='add'>+				new_rate = rate;</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'>+	return new_rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set up search table for MIMO2</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_rs_switch_to_mimo2(struct il_priv *il, struct il_lq_sta *lq_sta,</div><div class='add'>+			  struct ieee80211_conf *conf,</div><div class='add'>+			  struct ieee80211_sta *sta,</div><div class='add'>+			  struct il_scale_tbl_info *tbl, int idx)</div><div class='add'>+{</div><div class='add'>+	u16 rate_mask;</div><div class='add'>+	s32 rate;</div><div class='add'>+	s8 is_green = lq_sta-&gt;is_green;</div><div class='add'>+	struct il_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='add'>+	struct il_rxon_context *ctx = sta_priv-&gt;common.ctx;</div><div class='add'>+</div><div class='add'>+	if (!conf_is_ht(conf) || !sta-&gt;ht_cap.ht_supported)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (((sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SM_PS) &gt;&gt; 2) ==</div><div class='add'>+	    WLAN_HT_CAP_SM_PS_STATIC)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* Need both Tx chains/antennas to support MIMO */</div><div class='add'>+	if (il-&gt;hw_params.tx_chains_num &lt; 2)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	D_RATE("LQ: try to switch to MIMO2\n");</div><div class='add'>+</div><div class='add'>+	tbl-&gt;lq_type = LQ_MIMO2;</div><div class='add'>+	tbl-&gt;is_dup = lq_sta-&gt;is_dup;</div><div class='add'>+	tbl-&gt;action = 0;</div><div class='add'>+	tbl-&gt;max_search = IL_MAX_SEARCH;</div><div class='add'>+	rate_mask = lq_sta-&gt;active_mimo2_rate;</div><div class='add'>+</div><div class='add'>+	if (il_is_ht40_tx_allowed(il, ctx, &amp;sta-&gt;ht_cap))</div><div class='add'>+		tbl-&gt;is_ht40 = 1;</div><div class='add'>+	else</div><div class='add'>+		tbl-&gt;is_ht40 = 0;</div><div class='add'>+</div><div class='add'>+	il4965_rs_set_expected_tpt_table(lq_sta, tbl);</div><div class='add'>+</div><div class='add'>+	rate = il4965_rs_get_best_rate(il, lq_sta, tbl, rate_mask, idx);</div><div class='add'>+</div><div class='add'>+	D_RATE("LQ: MIMO2 best rate %d mask %X\n", rate, rate_mask);</div><div class='add'>+	if (rate == RATE_INVALID || !((1 &lt;&lt; rate) &amp; rate_mask)) {</div><div class='add'>+		D_RATE("Can't switch with idx %d rate mask %x\n", rate,</div><div class='add'>+		       rate_mask);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	tbl-&gt;current_rate =</div><div class='add'>+	    il4965_rate_n_flags_from_tbl(il, tbl, rate, is_green);</div><div class='add'>+</div><div class='add'>+	D_RATE("LQ: Switch to new mcs %X idx is green %X\n", tbl-&gt;current_rate,</div><div class='add'>+	       is_green);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set up search table for SISO</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_rs_switch_to_siso(struct il_priv *il, struct il_lq_sta *lq_sta,</div><div class='add'>+			 struct ieee80211_conf *conf, struct ieee80211_sta *sta,</div><div class='add'>+			 struct il_scale_tbl_info *tbl, int idx)</div><div class='add'>+{</div><div class='add'>+	u16 rate_mask;</div><div class='add'>+	u8 is_green = lq_sta-&gt;is_green;</div><div class='add'>+	s32 rate;</div><div class='add'>+	struct il_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='add'>+	struct il_rxon_context *ctx = sta_priv-&gt;common.ctx;</div><div class='add'>+</div><div class='add'>+	if (!conf_is_ht(conf) || !sta-&gt;ht_cap.ht_supported)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	D_RATE("LQ: try to switch to SISO\n");</div><div class='add'>+</div><div class='add'>+	tbl-&gt;is_dup = lq_sta-&gt;is_dup;</div><div class='add'>+	tbl-&gt;lq_type = LQ_SISO;</div><div class='add'>+	tbl-&gt;action = 0;</div><div class='add'>+	tbl-&gt;max_search = IL_MAX_SEARCH;</div><div class='add'>+	rate_mask = lq_sta-&gt;active_siso_rate;</div><div class='add'>+</div><div class='add'>+	if (il_is_ht40_tx_allowed(il, ctx, &amp;sta-&gt;ht_cap))</div><div class='add'>+		tbl-&gt;is_ht40 = 1;</div><div class='add'>+	else</div><div class='add'>+		tbl-&gt;is_ht40 = 0;</div><div class='add'>+</div><div class='add'>+	if (is_green)</div><div class='add'>+		tbl-&gt;is_SGI = 0;	/*11n spec: no SGI in SISO+Greenfield */</div><div class='add'>+</div><div class='add'>+	il4965_rs_set_expected_tpt_table(lq_sta, tbl);</div><div class='add'>+	rate = il4965_rs_get_best_rate(il, lq_sta, tbl, rate_mask, idx);</div><div class='add'>+</div><div class='add'>+	D_RATE("LQ: get best rate %d mask %X\n", rate, rate_mask);</div><div class='add'>+	if (rate == RATE_INVALID || !((1 &lt;&lt; rate) &amp; rate_mask)) {</div><div class='add'>+		D_RATE("can not switch with idx %d rate mask %x\n", rate,</div><div class='add'>+		       rate_mask);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	tbl-&gt;current_rate =</div><div class='add'>+	    il4965_rate_n_flags_from_tbl(il, tbl, rate, is_green);</div><div class='add'>+	D_RATE("LQ: Switch to new mcs %X idx is green %X\n", tbl-&gt;current_rate,</div><div class='add'>+	       is_green);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Try to switch to new modulation mode from legacy</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_rs_move_legacy_other(struct il_priv *il, struct il_lq_sta *lq_sta,</div><div class='add'>+			    struct ieee80211_conf *conf,</div><div class='add'>+			    struct ieee80211_sta *sta, int idx)</div><div class='add'>+{</div><div class='add'>+	struct il_scale_tbl_info *tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='add'>+	struct il_scale_tbl_info *search_tbl =</div><div class='add'>+	    &amp;(lq_sta-&gt;lq_info[(1 - lq_sta-&gt;active_tbl)]);</div><div class='add'>+	struct il_rate_scale_data *win = &amp;(tbl-&gt;win[idx]);</div><div class='add'>+	u32 sz =</div><div class='add'>+	    (sizeof(struct il_scale_tbl_info) -</div><div class='add'>+	     (sizeof(struct il_rate_scale_data) * RATE_COUNT));</div><div class='add'>+	u8 start_action;</div><div class='add'>+	u8 valid_tx_ant = il-&gt;hw_params.valid_tx_ant;</div><div class='add'>+	u8 tx_chains_num = il-&gt;hw_params.tx_chains_num;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u8 update_search_tbl_counter = 0;</div><div class='add'>+</div><div class='add'>+	tbl-&gt;action = IL_LEGACY_SWITCH_SISO;</div><div class='add'>+</div><div class='add'>+	start_action = tbl-&gt;action;</div><div class='add'>+	for (;;) {</div><div class='add'>+		lq_sta-&gt;action_counter++;</div><div class='add'>+		switch (tbl-&gt;action) {</div><div class='add'>+		case IL_LEGACY_SWITCH_ANTENNA1:</div><div class='add'>+		case IL_LEGACY_SWITCH_ANTENNA2:</div><div class='add'>+			D_RATE("LQ: Legacy toggle Antenna\n");</div><div class='add'>+</div><div class='add'>+			if ((tbl-&gt;action == IL_LEGACY_SWITCH_ANTENNA1 &amp;&amp;</div><div class='add'>+			     tx_chains_num &lt;= 1) ||</div><div class='add'>+			    (tbl-&gt;action == IL_LEGACY_SWITCH_ANTENNA2 &amp;&amp;</div><div class='add'>+			     tx_chains_num &lt;= 2))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			/* Don't change antenna if success has been great */</div><div class='add'>+			if (win-&gt;success_ratio &gt;= IL_RS_GOOD_RATIO)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			/* Set up search table to try other antenna */</div><div class='add'>+			memcpy(search_tbl, tbl, sz);</div><div class='add'>+</div><div class='add'>+			if (il4965_rs_toggle_antenna</div><div class='add'>+			    (valid_tx_ant, &amp;search_tbl-&gt;current_rate,</div><div class='add'>+			     search_tbl)) {</div><div class='add'>+				update_search_tbl_counter = 1;</div><div class='add'>+				il4965_rs_set_expected_tpt_table(lq_sta,</div><div class='add'>+								 search_tbl);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case IL_LEGACY_SWITCH_SISO:</div><div class='add'>+			D_RATE("LQ: Legacy switch to SISO\n");</div><div class='add'>+</div><div class='add'>+			/* Set up search table to try SISO */</div><div class='add'>+			memcpy(search_tbl, tbl, sz);</div><div class='add'>+			search_tbl-&gt;is_SGI = 0;</div><div class='add'>+			ret =</div><div class='add'>+			    il4965_rs_switch_to_siso(il, lq_sta, conf, sta,</div><div class='add'>+						     search_tbl, idx);</div><div class='add'>+			if (!ret) {</div><div class='add'>+				lq_sta-&gt;action_counter = 0;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		case IL_LEGACY_SWITCH_MIMO2_AB:</div><div class='add'>+		case IL_LEGACY_SWITCH_MIMO2_AC:</div><div class='add'>+		case IL_LEGACY_SWITCH_MIMO2_BC:</div><div class='add'>+			D_RATE("LQ: Legacy switch to MIMO2\n");</div><div class='add'>+</div><div class='add'>+			/* Set up search table to try MIMO */</div><div class='add'>+			memcpy(search_tbl, tbl, sz);</div><div class='add'>+			search_tbl-&gt;is_SGI = 0;</div><div class='add'>+</div><div class='add'>+			if (tbl-&gt;action == IL_LEGACY_SWITCH_MIMO2_AB)</div><div class='add'>+				search_tbl-&gt;ant_type = ANT_AB;</div><div class='add'>+			else if (tbl-&gt;action == IL_LEGACY_SWITCH_MIMO2_AC)</div><div class='add'>+				search_tbl-&gt;ant_type = ANT_AC;</div><div class='add'>+			else</div><div class='add'>+				search_tbl-&gt;ant_type = ANT_BC;</div><div class='add'>+</div><div class='add'>+			if (!il4965_rs_is_valid_ant</div><div class='add'>+			    (valid_tx_ant, search_tbl-&gt;ant_type))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			ret =</div><div class='add'>+			    il4965_rs_switch_to_mimo2(il, lq_sta, conf, sta,</div><div class='add'>+						      search_tbl, idx);</div><div class='add'>+			if (!ret) {</div><div class='add'>+				lq_sta-&gt;action_counter = 0;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		tbl-&gt;action++;</div><div class='add'>+		if (tbl-&gt;action &gt; IL_LEGACY_SWITCH_MIMO2_BC)</div><div class='add'>+			tbl-&gt;action = IL_LEGACY_SWITCH_ANTENNA1;</div><div class='add'>+</div><div class='add'>+		if (tbl-&gt;action == start_action)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	search_tbl-&gt;lq_type = LQ_NONE;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	lq_sta-&gt;search_better_tbl = 1;</div><div class='add'>+	tbl-&gt;action++;</div><div class='add'>+	if (tbl-&gt;action &gt; IL_LEGACY_SWITCH_MIMO2_BC)</div><div class='add'>+		tbl-&gt;action = IL_LEGACY_SWITCH_ANTENNA1;</div><div class='add'>+	if (update_search_tbl_counter)</div><div class='add'>+		search_tbl-&gt;action = tbl-&gt;action;</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'>+ * Try to switch to new modulation mode from SISO</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_rs_move_siso_to_other(struct il_priv *il, struct il_lq_sta *lq_sta,</div><div class='add'>+			     struct ieee80211_conf *conf,</div><div class='add'>+			     struct ieee80211_sta *sta, int idx)</div><div class='add'>+{</div><div class='add'>+	u8 is_green = lq_sta-&gt;is_green;</div><div class='add'>+	struct il_scale_tbl_info *tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='add'>+	struct il_scale_tbl_info *search_tbl =</div><div class='add'>+	    &amp;(lq_sta-&gt;lq_info[(1 - lq_sta-&gt;active_tbl)]);</div><div class='add'>+	struct il_rate_scale_data *win = &amp;(tbl-&gt;win[idx]);</div><div class='add'>+	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='add'>+	u32 sz =</div><div class='add'>+	    (sizeof(struct il_scale_tbl_info) -</div><div class='add'>+	     (sizeof(struct il_rate_scale_data) * RATE_COUNT));</div><div class='add'>+	u8 start_action;</div><div class='add'>+	u8 valid_tx_ant = il-&gt;hw_params.valid_tx_ant;</div><div class='add'>+	u8 tx_chains_num = il-&gt;hw_params.tx_chains_num;</div><div class='add'>+	u8 update_search_tbl_counter = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	start_action = tbl-&gt;action;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		lq_sta-&gt;action_counter++;</div><div class='add'>+		switch (tbl-&gt;action) {</div><div class='add'>+		case IL_SISO_SWITCH_ANTENNA1:</div><div class='add'>+		case IL_SISO_SWITCH_ANTENNA2:</div><div class='add'>+			D_RATE("LQ: SISO toggle Antenna\n");</div><div class='add'>+			if ((tbl-&gt;action == IL_SISO_SWITCH_ANTENNA1 &amp;&amp;</div><div class='add'>+			     tx_chains_num &lt;= 1) ||</div><div class='add'>+			    (tbl-&gt;action == IL_SISO_SWITCH_ANTENNA2 &amp;&amp;</div><div class='add'>+			     tx_chains_num &lt;= 2))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			if (win-&gt;success_ratio &gt;= IL_RS_GOOD_RATIO)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			memcpy(search_tbl, tbl, sz);</div><div class='add'>+			if (il4965_rs_toggle_antenna</div><div class='add'>+			    (valid_tx_ant, &amp;search_tbl-&gt;current_rate,</div><div class='add'>+			     search_tbl)) {</div><div class='add'>+				update_search_tbl_counter = 1;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case IL_SISO_SWITCH_MIMO2_AB:</div><div class='add'>+		case IL_SISO_SWITCH_MIMO2_AC:</div><div class='add'>+		case IL_SISO_SWITCH_MIMO2_BC:</div><div class='add'>+			D_RATE("LQ: SISO switch to MIMO2\n");</div><div class='add'>+			memcpy(search_tbl, tbl, sz);</div><div class='add'>+			search_tbl-&gt;is_SGI = 0;</div><div class='add'>+</div><div class='add'>+			if (tbl-&gt;action == IL_SISO_SWITCH_MIMO2_AB)</div><div class='add'>+				search_tbl-&gt;ant_type = ANT_AB;</div><div class='add'>+			else if (tbl-&gt;action == IL_SISO_SWITCH_MIMO2_AC)</div><div class='add'>+				search_tbl-&gt;ant_type = ANT_AC;</div><div class='add'>+			else</div><div class='add'>+				search_tbl-&gt;ant_type = ANT_BC;</div><div class='add'>+</div><div class='add'>+			if (!il4965_rs_is_valid_ant</div><div class='add'>+			    (valid_tx_ant, search_tbl-&gt;ant_type))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			ret =</div><div class='add'>+			    il4965_rs_switch_to_mimo2(il, lq_sta, conf, sta,</div><div class='add'>+						      search_tbl, idx);</div><div class='add'>+			if (!ret)</div><div class='add'>+				goto out;</div><div class='add'>+			break;</div><div class='add'>+		case IL_SISO_SWITCH_GI:</div><div class='add'>+			if (!tbl-&gt;is_ht40 &amp;&amp;</div><div class='add'>+			    !(ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_SGI_20))</div><div class='add'>+				break;</div><div class='add'>+			if (tbl-&gt;is_ht40 &amp;&amp;</div><div class='add'>+			    !(ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_SGI_40))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			D_RATE("LQ: SISO toggle SGI/NGI\n");</div><div class='add'>+</div><div class='add'>+			memcpy(search_tbl, tbl, sz);</div><div class='add'>+			if (is_green) {</div><div class='add'>+				if (!tbl-&gt;is_SGI)</div><div class='add'>+					break;</div><div class='add'>+				else</div><div class='add'>+					IL_ERR("SGI was set in GF+SISO\n");</div><div class='add'>+			}</div><div class='add'>+			search_tbl-&gt;is_SGI = !tbl-&gt;is_SGI;</div><div class='add'>+			il4965_rs_set_expected_tpt_table(lq_sta, search_tbl);</div><div class='add'>+			if (tbl-&gt;is_SGI) {</div><div class='add'>+				s32 tpt = lq_sta-&gt;last_tpt / 100;</div><div class='add'>+				if (tpt &gt;= search_tbl-&gt;expected_tpt[idx])</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+			search_tbl-&gt;current_rate =</div><div class='add'>+			    il4965_rate_n_flags_from_tbl(il, search_tbl, idx,</div><div class='add'>+							 is_green);</div><div class='add'>+			update_search_tbl_counter = 1;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		tbl-&gt;action++;</div><div class='add'>+		if (tbl-&gt;action &gt; IL_SISO_SWITCH_GI)</div><div class='add'>+			tbl-&gt;action = IL_SISO_SWITCH_ANTENNA1;</div><div class='add'>+</div><div class='add'>+		if (tbl-&gt;action == start_action)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	search_tbl-&gt;lq_type = LQ_NONE;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	lq_sta-&gt;search_better_tbl = 1;</div><div class='add'>+	tbl-&gt;action++;</div><div class='add'>+	if (tbl-&gt;action &gt; IL_SISO_SWITCH_GI)</div><div class='add'>+		tbl-&gt;action = IL_SISO_SWITCH_ANTENNA1;</div><div class='add'>+	if (update_search_tbl_counter)</div><div class='add'>+		search_tbl-&gt;action = tbl-&gt;action;</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'>+ * Try to switch to new modulation mode from MIMO2</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_rs_move_mimo2_to_other(struct il_priv *il, struct il_lq_sta *lq_sta,</div><div class='add'>+			      struct ieee80211_conf *conf,</div><div class='add'>+			      struct ieee80211_sta *sta, int idx)</div><div class='add'>+{</div><div class='add'>+	s8 is_green = lq_sta-&gt;is_green;</div><div class='add'>+	struct il_scale_tbl_info *tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='add'>+	struct il_scale_tbl_info *search_tbl =</div><div class='add'>+	    &amp;(lq_sta-&gt;lq_info[(1 - lq_sta-&gt;active_tbl)]);</div><div class='add'>+	struct il_rate_scale_data *win = &amp;(tbl-&gt;win[idx]);</div><div class='add'>+	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='add'>+	u32 sz =</div><div class='add'>+	    (sizeof(struct il_scale_tbl_info) -</div><div class='add'>+	     (sizeof(struct il_rate_scale_data) * RATE_COUNT));</div><div class='add'>+	u8 start_action;</div><div class='add'>+	u8 valid_tx_ant = il-&gt;hw_params.valid_tx_ant;</div><div class='add'>+	u8 tx_chains_num = il-&gt;hw_params.tx_chains_num;</div><div class='add'>+	u8 update_search_tbl_counter = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	start_action = tbl-&gt;action;</div><div class='add'>+	for (;;) {</div><div class='add'>+		lq_sta-&gt;action_counter++;</div><div class='add'>+		switch (tbl-&gt;action) {</div><div class='add'>+		case IL_MIMO2_SWITCH_ANTENNA1:</div><div class='add'>+		case IL_MIMO2_SWITCH_ANTENNA2:</div><div class='add'>+			D_RATE("LQ: MIMO2 toggle Antennas\n");</div><div class='add'>+</div><div class='add'>+			if (tx_chains_num &lt;= 2)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			if (win-&gt;success_ratio &gt;= IL_RS_GOOD_RATIO)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			memcpy(search_tbl, tbl, sz);</div><div class='add'>+			if (il4965_rs_toggle_antenna</div><div class='add'>+			    (valid_tx_ant, &amp;search_tbl-&gt;current_rate,</div><div class='add'>+			     search_tbl)) {</div><div class='add'>+				update_search_tbl_counter = 1;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case IL_MIMO2_SWITCH_SISO_A:</div><div class='add'>+		case IL_MIMO2_SWITCH_SISO_B:</div><div class='add'>+		case IL_MIMO2_SWITCH_SISO_C:</div><div class='add'>+			D_RATE("LQ: MIMO2 switch to SISO\n");</div><div class='add'>+</div><div class='add'>+			/* Set up new search table for SISO */</div><div class='add'>+			memcpy(search_tbl, tbl, sz);</div><div class='add'>+</div><div class='add'>+			if (tbl-&gt;action == IL_MIMO2_SWITCH_SISO_A)</div><div class='add'>+				search_tbl-&gt;ant_type = ANT_A;</div><div class='add'>+			else if (tbl-&gt;action == IL_MIMO2_SWITCH_SISO_B)</div><div class='add'>+				search_tbl-&gt;ant_type = ANT_B;</div><div class='add'>+			else</div><div class='add'>+				search_tbl-&gt;ant_type = ANT_C;</div><div class='add'>+</div><div class='add'>+			if (!il4965_rs_is_valid_ant</div><div class='add'>+			    (valid_tx_ant, search_tbl-&gt;ant_type))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			ret =</div><div class='add'>+			    il4965_rs_switch_to_siso(il, lq_sta, conf, sta,</div><div class='add'>+						     search_tbl, idx);</div><div class='add'>+			if (!ret)</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case IL_MIMO2_SWITCH_GI:</div><div class='add'>+			if (!tbl-&gt;is_ht40 &amp;&amp;</div><div class='add'>+			    !(ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_SGI_20))</div><div class='add'>+				break;</div><div class='add'>+			if (tbl-&gt;is_ht40 &amp;&amp;</div><div class='add'>+			    !(ht_cap-&gt;cap &amp; IEEE80211_HT_CAP_SGI_40))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			D_RATE("LQ: MIMO2 toggle SGI/NGI\n");</div><div class='add'>+</div><div class='add'>+			/* Set up new search table for MIMO2 */</div><div class='add'>+			memcpy(search_tbl, tbl, sz);</div><div class='add'>+			search_tbl-&gt;is_SGI = !tbl-&gt;is_SGI;</div><div class='add'>+			il4965_rs_set_expected_tpt_table(lq_sta, search_tbl);</div><div class='add'>+			/*</div><div class='add'>+			 * If active table already uses the fastest possible</div><div class='add'>+			 * modulation (dual stream with short guard interval),</div><div class='add'>+			 * and it's working well, there's no need to look</div><div class='add'>+			 * for a better type of modulation!</div><div class='add'>+			 */</div><div class='add'>+			if (tbl-&gt;is_SGI) {</div><div class='add'>+				s32 tpt = lq_sta-&gt;last_tpt / 100;</div><div class='add'>+				if (tpt &gt;= search_tbl-&gt;expected_tpt[idx])</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+			search_tbl-&gt;current_rate =</div><div class='add'>+			    il4965_rate_n_flags_from_tbl(il, search_tbl, idx,</div><div class='add'>+							 is_green);</div><div class='add'>+			update_search_tbl_counter = 1;</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+		tbl-&gt;action++;</div><div class='add'>+		if (tbl-&gt;action &gt; IL_MIMO2_SWITCH_GI)</div><div class='add'>+			tbl-&gt;action = IL_MIMO2_SWITCH_ANTENNA1;</div><div class='add'>+</div><div class='add'>+		if (tbl-&gt;action == start_action)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	search_tbl-&gt;lq_type = LQ_NONE;</div><div class='add'>+	return 0;</div><div class='add'>+out:</div><div class='add'>+	lq_sta-&gt;search_better_tbl = 1;</div><div class='add'>+	tbl-&gt;action++;</div><div class='add'>+	if (tbl-&gt;action &gt; IL_MIMO2_SWITCH_GI)</div><div class='add'>+		tbl-&gt;action = IL_MIMO2_SWITCH_ANTENNA1;</div><div class='add'>+	if (update_search_tbl_counter)</div><div class='add'>+		search_tbl-&gt;action = tbl-&gt;action;</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'>+ * Check whether we should continue using same modulation mode, or</div><div class='add'>+ * begin search for a new mode, based on:</div><div class='add'>+ * 1) # tx successes or failures while using this mode</div><div class='add'>+ * 2) # times calling this function</div><div class='add'>+ * 3) elapsed time in this mode (not used, for now)</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_rs_stay_in_table(struct il_lq_sta *lq_sta, bool force_search)</div><div class='add'>+{</div><div class='add'>+	struct il_scale_tbl_info *tbl;</div><div class='add'>+	int i;</div><div class='add'>+	int active_tbl;</div><div class='add'>+	int flush_interval_passed = 0;</div><div class='add'>+	struct il_priv *il;</div><div class='add'>+</div><div class='add'>+	il = lq_sta-&gt;drv;</div><div class='add'>+	active_tbl = lq_sta-&gt;active_tbl;</div><div class='add'>+</div><div class='add'>+	tbl = &amp;(lq_sta-&gt;lq_info[active_tbl]);</div><div class='add'>+</div><div class='add'>+	/* If we've been disallowing search, see if we should now allow it */</div><div class='add'>+	if (lq_sta-&gt;stay_in_tbl) {</div><div class='add'>+</div><div class='add'>+		/* Elapsed time using current modulation mode */</div><div class='add'>+		if (lq_sta-&gt;flush_timer)</div><div class='add'>+			flush_interval_passed =</div><div class='add'>+			    time_after(jiffies,</div><div class='add'>+				       (unsigned long)(lq_sta-&gt;flush_timer +</div><div class='add'>+						       RATE_SCALE_FLUSH_INTVL));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Check if we should allow search for new modulation mode.</div><div class='add'>+		 * If many frames have failed or succeeded, or we've used</div><div class='add'>+		 * this same modulation for a long time, allow search, and</div><div class='add'>+		 * reset history stats that keep track of whether we should</div><div class='add'>+		 * allow a new search.  Also (below) reset all bitmaps and</div><div class='add'>+		 * stats in active history.</div><div class='add'>+		 */</div><div class='add'>+		if (force_search ||</div><div class='add'>+		    lq_sta-&gt;total_failed &gt; lq_sta-&gt;max_failure_limit ||</div><div class='add'>+		    lq_sta-&gt;total_success &gt; lq_sta-&gt;max_success_limit ||</div><div class='add'>+		    (!lq_sta-&gt;search_better_tbl &amp;&amp; lq_sta-&gt;flush_timer &amp;&amp;</div><div class='add'>+		     flush_interval_passed)) {</div><div class='add'>+			D_RATE("LQ: stay is expired %d %d %d\n:",</div><div class='add'>+			       lq_sta-&gt;total_failed, lq_sta-&gt;total_success,</div><div class='add'>+			       flush_interval_passed);</div><div class='add'>+</div><div class='add'>+			/* Allow search for new mode */</div><div class='add'>+			lq_sta-&gt;stay_in_tbl = 0;	/* only place reset */</div><div class='add'>+			lq_sta-&gt;total_failed = 0;</div><div class='add'>+			lq_sta-&gt;total_success = 0;</div><div class='add'>+			lq_sta-&gt;flush_timer = 0;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Else if we've used this modulation mode enough repetitions</div><div class='add'>+			 * (regardless of elapsed time or success/failure), reset</div><div class='add'>+			 * history bitmaps and rate-specific stats for all rates in</div><div class='add'>+			 * active table.</div><div class='add'>+			 */</div><div class='add'>+		} else {</div><div class='add'>+			lq_sta-&gt;table_count++;</div><div class='add'>+			if (lq_sta-&gt;table_count &gt;= lq_sta-&gt;table_count_limit) {</div><div class='add'>+				lq_sta-&gt;table_count = 0;</div><div class='add'>+</div><div class='add'>+				D_RATE("LQ: stay in table clear win\n");</div><div class='add'>+				for (i = 0; i &lt; RATE_COUNT; i++)</div><div class='add'>+					il4965_rs_rate_scale_clear_win(&amp;</div><div class='add'>+								       (tbl-&gt;</div><div class='add'>+									win</div><div class='add'>+									[i]));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If transitioning to allow "search", reset all history</div><div class='add'>+		 * bitmaps and stats in active table (this will become the new</div><div class='add'>+		 * "search" table). */</div><div class='add'>+		if (!lq_sta-&gt;stay_in_tbl) {</div><div class='add'>+			for (i = 0; i &lt; RATE_COUNT; i++)</div><div class='add'>+				il4965_rs_rate_scale_clear_win(&amp;(tbl-&gt;win[i]));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * setup rate table in uCode</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_rs_update_rate_tbl(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+			  struct il_lq_sta *lq_sta,</div><div class='add'>+			  struct il_scale_tbl_info *tbl, int idx, u8 is_green)</div><div class='add'>+{</div><div class='add'>+	u32 rate;</div><div class='add'>+</div><div class='add'>+	/* Update uCode's rate table. */</div><div class='add'>+	rate = il4965_rate_n_flags_from_tbl(il, tbl, idx, is_green);</div><div class='add'>+	il4965_rs_fill_link_cmd(il, lq_sta, rate);</div><div class='add'>+	il_send_lq_cmd(il, ctx, &amp;lq_sta-&gt;lq, CMD_ASYNC, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Do rate scaling and search for new modulation mode.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_rs_rate_scale_perform(struct il_priv *il, struct sk_buff *skb,</div><div class='add'>+			     struct ieee80211_sta *sta,</div><div class='add'>+			     struct il_lq_sta *lq_sta)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hw *hw = il-&gt;hw;</div><div class='add'>+	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</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'>+	int low = RATE_INVALID;</div><div class='add'>+	int high = RATE_INVALID;</div><div class='add'>+	int idx;</div><div class='add'>+	int i;</div><div class='add'>+	struct il_rate_scale_data *win = NULL;</div><div class='add'>+	int current_tpt = IL_INVALID_VALUE;</div><div class='add'>+	int low_tpt = IL_INVALID_VALUE;</div><div class='add'>+	int high_tpt = IL_INVALID_VALUE;</div><div class='add'>+	u32 fail_count;</div><div class='add'>+	s8 scale_action = 0;</div><div class='add'>+	u16 rate_mask;</div><div class='add'>+	u8 update_lq = 0;</div><div class='add'>+	struct il_scale_tbl_info *tbl, *tbl1;</div><div class='add'>+	u16 rate_scale_idx_msk = 0;</div><div class='add'>+	u8 is_green = 0;</div><div class='add'>+	u8 active_tbl = 0;</div><div class='add'>+	u8 done_search = 0;</div><div class='add'>+	u16 high_low;</div><div class='add'>+	s32 sr;</div><div class='add'>+	u8 tid = MAX_TID_COUNT;</div><div class='add'>+	struct il_tid_data *tid_data;</div><div class='add'>+	struct il_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='add'>+	struct il_rxon_context *ctx = sta_priv-&gt;common.ctx;</div><div class='add'>+</div><div class='add'>+	D_RATE("rate scale calculate new rate for skb\n");</div><div class='add'>+</div><div class='add'>+	/* Send management frames and NO_ACK data using lowest rate. */</div><div class='add'>+	/* TODO: this could probably be improved.. */</div><div class='add'>+	if (!ieee80211_is_data(hdr-&gt;frame_control) ||</div><div class='add'>+	    (info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	lq_sta-&gt;supp_rates = sta-&gt;supp_rates[lq_sta-&gt;band];</div><div class='add'>+</div><div class='add'>+	tid = il4965_rs_tl_add_packet(lq_sta, hdr);</div><div class='add'>+	if (tid != MAX_TID_COUNT &amp;&amp; (lq_sta-&gt;tx_agg_tid_en &amp; (1 &lt;&lt; tid))) {</div><div class='add'>+		tid_data = &amp;il-&gt;stations[lq_sta-&gt;lq.sta_id].tid[tid];</div><div class='add'>+		if (tid_data-&gt;agg.state == IL_AGG_OFF)</div><div class='add'>+			lq_sta-&gt;is_agg = 0;</div><div class='add'>+		else</div><div class='add'>+			lq_sta-&gt;is_agg = 1;</div><div class='add'>+	} else</div><div class='add'>+		lq_sta-&gt;is_agg = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Select rate-scale / modulation-mode table to work with in</div><div class='add'>+	 * the rest of this function:  "search" if searching for better</div><div class='add'>+	 * modulation mode, or "active" if doing rate scaling within a mode.</div><div class='add'>+	 */</div><div class='add'>+	if (!lq_sta-&gt;search_better_tbl)</div><div class='add'>+		active_tbl = lq_sta-&gt;active_tbl;</div><div class='add'>+	else</div><div class='add'>+		active_tbl = 1 - lq_sta-&gt;active_tbl;</div><div class='add'>+</div><div class='add'>+	tbl = &amp;(lq_sta-&gt;lq_info[active_tbl]);</div><div class='add'>+	if (is_legacy(tbl-&gt;lq_type))</div><div class='add'>+		lq_sta-&gt;is_green = 0;</div><div class='add'>+	else</div><div class='add'>+		lq_sta-&gt;is_green = il4965_rs_use_green(sta);</div><div class='add'>+	is_green = lq_sta-&gt;is_green;</div><div class='add'>+</div><div class='add'>+	/* current tx rate */</div><div class='add'>+	idx = lq_sta-&gt;last_txrate_idx;</div><div class='add'>+</div><div class='add'>+	D_RATE("Rate scale idx %d for type %d\n", idx, tbl-&gt;lq_type);</div><div class='add'>+</div><div class='add'>+	/* rates available for this association, and for modulation mode */</div><div class='add'>+	rate_mask = il4965_rs_get_supported_rates(lq_sta, hdr, tbl-&gt;lq_type);</div><div class='add'>+</div><div class='add'>+	D_RATE("mask 0x%04X\n", rate_mask);</div><div class='add'>+</div><div class='add'>+	/* mask with station rate restriction */</div><div class='add'>+	if (is_legacy(tbl-&gt;lq_type)) {</div><div class='add'>+		if (lq_sta-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='add'>+			/* supp_rates has no CCK bits in A mode */</div><div class='add'>+			rate_scale_idx_msk =</div><div class='add'>+			    (u16) (rate_mask &amp;</div><div class='add'>+				   (lq_sta-&gt;supp_rates &lt;&lt; IL_FIRST_OFDM_RATE));</div><div class='add'>+		else</div><div class='add'>+			rate_scale_idx_msk =</div><div class='add'>+			    (u16) (rate_mask &amp; lq_sta-&gt;supp_rates);</div><div class='add'>+</div><div class='add'>+	} else</div><div class='add'>+		rate_scale_idx_msk = rate_mask;</div><div class='add'>+</div><div class='add'>+	if (!rate_scale_idx_msk)</div><div class='add'>+		rate_scale_idx_msk = rate_mask;</div><div class='add'>+</div><div class='add'>+	if (!((1 &lt;&lt; idx) &amp; rate_scale_idx_msk)) {</div><div class='add'>+		IL_ERR("Current Rate is not valid\n");</div><div class='add'>+		if (lq_sta-&gt;search_better_tbl) {</div><div class='add'>+			/* revert to active table if search table is not valid */</div><div class='add'>+			tbl-&gt;lq_type = LQ_NONE;</div><div class='add'>+			lq_sta-&gt;search_better_tbl = 0;</div><div class='add'>+			tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='add'>+			/* get "active" rate info */</div><div class='add'>+			idx = il4965_hwrate_to_plcp_idx(tbl-&gt;current_rate);</div><div class='add'>+			il4965_rs_update_rate_tbl(il, ctx, lq_sta, tbl, idx,</div><div class='add'>+						      is_green);</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get expected throughput table and history win for current rate */</div><div class='add'>+	if (!tbl-&gt;expected_tpt) {</div><div class='add'>+		IL_ERR("tbl-&gt;expected_tpt is NULL\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* force user max rate if set by user */</div><div class='add'>+	if (lq_sta-&gt;max_rate_idx != -1 &amp;&amp; lq_sta-&gt;max_rate_idx &lt; idx) {</div><div class='add'>+		idx = lq_sta-&gt;max_rate_idx;</div><div class='add'>+		update_lq = 1;</div><div class='add'>+		win = &amp;(tbl-&gt;win[idx]);</div><div class='add'>+		goto lq_update;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	win = &amp;(tbl-&gt;win[idx]);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If there is not enough history to calculate actual average</div><div class='add'>+	 * throughput, keep analyzing results of more tx frames, without</div><div class='add'>+	 * changing rate or mode (bypass most of the rest of this function).</div><div class='add'>+	 * Set up new rate table in uCode only if old rate is not supported</div><div class='add'>+	 * in current association (use new rate found above).</div><div class='add'>+	 */</div><div class='add'>+	fail_count = win-&gt;counter - win-&gt;success_counter;</div><div class='add'>+	if (fail_count &lt; RATE_MIN_FAILURE_TH &amp;&amp;</div><div class='add'>+	    win-&gt;success_counter &lt; RATE_MIN_SUCCESS_TH) {</div><div class='add'>+		D_RATE("LQ: still below TH. succ=%d total=%d " "for idx %d\n",</div><div class='add'>+		       win-&gt;success_counter, win-&gt;counter, idx);</div><div class='add'>+</div><div class='add'>+		/* Can't calculate this yet; not enough history */</div><div class='add'>+		win-&gt;average_tpt = IL_INVALID_VALUE;</div><div class='add'>+</div><div class='add'>+		/* Should we stay with this modulation mode,</div><div class='add'>+		 * or search for a new one? */</div><div class='add'>+		il4965_rs_stay_in_table(lq_sta, false);</div><div class='add'>+</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	/* Else we have enough samples; calculate estimate of</div><div class='add'>+	 * actual average throughput */</div><div class='add'>+	if (win-&gt;average_tpt !=</div><div class='add'>+	    ((win-&gt;success_ratio * tbl-&gt;expected_tpt[idx] + 64) / 128)) {</div><div class='add'>+		IL_ERR("expected_tpt should have been calculated by now\n");</div><div class='add'>+		win-&gt;average_tpt =</div><div class='add'>+		    ((win-&gt;success_ratio * tbl-&gt;expected_tpt[idx] + 64) / 128);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we are searching for better modulation mode, check success. */</div><div class='add'>+	if (lq_sta-&gt;search_better_tbl) {</div><div class='add'>+		/* If good success, continue using the "search" mode;</div><div class='add'>+		 * no need to send new link quality command, since we're</div><div class='add'>+		 * continuing to use the setup that we've been trying. */</div><div class='add'>+		if (win-&gt;average_tpt &gt; lq_sta-&gt;last_tpt) {</div><div class='add'>+</div><div class='add'>+			D_RATE("LQ: SWITCHING TO NEW TBL "</div><div class='add'>+			       "suc=%d cur-tpt=%d old-tpt=%d\n",</div><div class='add'>+			       win-&gt;success_ratio, win-&gt;average_tpt,</div><div class='add'>+			       lq_sta-&gt;last_tpt);</div><div class='add'>+</div><div class='add'>+			if (!is_legacy(tbl-&gt;lq_type))</div><div class='add'>+				lq_sta-&gt;enable_counter = 1;</div><div class='add'>+</div><div class='add'>+			/* Swap tables; "search" becomes "active" */</div><div class='add'>+			lq_sta-&gt;active_tbl = active_tbl;</div><div class='add'>+			current_tpt = win-&gt;average_tpt;</div><div class='add'>+</div><div class='add'>+			/* Else poor success; go back to mode in "active" table */</div><div class='add'>+		} else {</div><div class='add'>+</div><div class='add'>+			D_RATE("LQ: GOING BACK TO THE OLD TBL "</div><div class='add'>+			       "suc=%d cur-tpt=%d old-tpt=%d\n",</div><div class='add'>+			       win-&gt;success_ratio, win-&gt;average_tpt,</div><div class='add'>+			       lq_sta-&gt;last_tpt);</div><div class='add'>+</div><div class='add'>+			/* Nullify "search" table */</div><div class='add'>+			tbl-&gt;lq_type = LQ_NONE;</div><div class='add'>+</div><div class='add'>+			/* Revert to "active" table */</div><div class='add'>+			active_tbl = lq_sta-&gt;active_tbl;</div><div class='add'>+			tbl = &amp;(lq_sta-&gt;lq_info[active_tbl]);</div><div class='add'>+</div><div class='add'>+			/* Revert to "active" rate and throughput info */</div><div class='add'>+			idx = il4965_hwrate_to_plcp_idx(tbl-&gt;current_rate);</div><div class='add'>+			current_tpt = lq_sta-&gt;last_tpt;</div><div class='add'>+</div><div class='add'>+			/* Need to set up a new rate table in uCode */</div><div class='add'>+			update_lq = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Either way, we've made a decision; modulation mode</div><div class='add'>+		 * search is done, allow rate adjustment next time. */</div><div class='add'>+		lq_sta-&gt;search_better_tbl = 0;</div><div class='add'>+		done_search = 1;	/* Don't switch modes below! */</div><div class='add'>+		goto lq_update;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* (Else) not in search of better modulation mode, try for better</div><div class='add'>+	 * starting rate, while staying in this mode. */</div><div class='add'>+	high_low =</div><div class='add'>+	    il4965_rs_get_adjacent_rate(il, idx, rate_scale_idx_msk,</div><div class='add'>+					tbl-&gt;lq_type);</div><div class='add'>+	low = high_low &amp; 0xff;</div><div class='add'>+	high = (high_low &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	/* If user set max rate, dont allow higher than user constrain */</div><div class='add'>+	if (lq_sta-&gt;max_rate_idx != -1 &amp;&amp; lq_sta-&gt;max_rate_idx &lt; high)</div><div class='add'>+		high = RATE_INVALID;</div><div class='add'>+</div><div class='add'>+	sr = win-&gt;success_ratio;</div><div class='add'>+</div><div class='add'>+	/* Collect measured throughputs for current and adjacent rates */</div><div class='add'>+	current_tpt = win-&gt;average_tpt;</div><div class='add'>+	if (low != RATE_INVALID)</div><div class='add'>+		low_tpt = tbl-&gt;win[low].average_tpt;</div><div class='add'>+	if (high != RATE_INVALID)</div><div class='add'>+		high_tpt = tbl-&gt;win[high].average_tpt;</div><div class='add'>+</div><div class='add'>+	scale_action = 0;</div><div class='add'>+</div><div class='add'>+	/* Too many failures, decrease rate */</div><div class='add'>+	if (sr &lt;= RATE_DECREASE_TH || current_tpt == 0) {</div><div class='add'>+		D_RATE("decrease rate because of low success_ratio\n");</div><div class='add'>+		scale_action = -1;</div><div class='add'>+</div><div class='add'>+		/* No throughput measured yet for adjacent rates; try increase. */</div><div class='add'>+	} else if (low_tpt == IL_INVALID_VALUE &amp;&amp; high_tpt == IL_INVALID_VALUE) {</div><div class='add'>+</div><div class='add'>+		if (high != RATE_INVALID &amp;&amp; sr &gt;= RATE_INCREASE_TH)</div><div class='add'>+			scale_action = 1;</div><div class='add'>+		else if (low != RATE_INVALID)</div><div class='add'>+			scale_action = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Both adjacent throughputs are measured, but neither one has better</div><div class='add'>+	 * throughput; we're using the best rate, don't change it! */</div><div class='add'>+	else if (low_tpt != IL_INVALID_VALUE &amp;&amp; high_tpt != IL_INVALID_VALUE &amp;&amp;</div><div class='add'>+		 low_tpt &lt; current_tpt &amp;&amp; high_tpt &lt; current_tpt)</div><div class='add'>+		scale_action = 0;</div><div class='add'>+</div><div class='add'>+	/* At least one adjacent rate's throughput is measured,</div><div class='add'>+	 * and may have better performance. */</div><div class='add'>+	else {</div><div class='add'>+		/* Higher adjacent rate's throughput is measured */</div><div class='add'>+		if (high_tpt != IL_INVALID_VALUE) {</div><div class='add'>+			/* Higher rate has better throughput */</div><div class='add'>+			if (high_tpt &gt; current_tpt &amp;&amp; sr &gt;= RATE_INCREASE_TH)</div><div class='add'>+				scale_action = 1;</div><div class='add'>+			else</div><div class='add'>+				scale_action = 0;</div><div class='add'>+</div><div class='add'>+			/* Lower adjacent rate's throughput is measured */</div><div class='add'>+		} else if (low_tpt != IL_INVALID_VALUE) {</div><div class='add'>+			/* Lower rate has better throughput */</div><div class='add'>+			if (low_tpt &gt; current_tpt) {</div><div class='add'>+				D_RATE("decrease rate because of low tpt\n");</div><div class='add'>+				scale_action = -1;</div><div class='add'>+			} else if (sr &gt;= RATE_INCREASE_TH) {</div><div class='add'>+				scale_action = 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Sanity check; asked for decrease, but success rate or throughput</div><div class='add'>+	 * has been good at old rate.  Don't change it. */</div><div class='add'>+	if (scale_action == -1 &amp;&amp; low != RATE_INVALID &amp;&amp;</div><div class='add'>+	    (sr &gt; RATE_HIGH_TH || current_tpt &gt; 100 * tbl-&gt;expected_tpt[low]))</div><div class='add'>+		scale_action = 0;</div><div class='add'>+</div><div class='add'>+	switch (scale_action) {</div><div class='add'>+	case -1:</div><div class='add'>+		/* Decrease starting rate, update uCode's rate table */</div><div class='add'>+		if (low != RATE_INVALID) {</div><div class='add'>+			update_lq = 1;</div><div class='add'>+			idx = low;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		/* Increase starting rate, update uCode's rate table */</div><div class='add'>+		if (high != RATE_INVALID) {</div><div class='add'>+			update_lq = 1;</div><div class='add'>+			idx = high;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case 0:</div><div class='add'>+		/* No change */</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_RATE("choose rate scale idx %d action %d low %d " "high %d type %d\n",</div><div class='add'>+	       idx, scale_action, low, high, tbl-&gt;lq_type);</div><div class='add'>+</div><div class='add'>+lq_update:</div><div class='add'>+	/* Replace uCode's rate table for the destination station. */</div><div class='add'>+	if (update_lq)</div><div class='add'>+		il4965_rs_update_rate_tbl(il, ctx, lq_sta, tbl, idx,</div><div class='add'>+					      is_green);</div><div class='add'>+</div><div class='add'>+	/* Should we stay with this modulation mode,</div><div class='add'>+	 * or search for a new one? */</div><div class='add'>+	il4965_rs_stay_in_table(lq_sta, false);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Search for new modulation mode if we're:</div><div class='add'>+	 * 1)  Not changing rates right now</div><div class='add'>+	 * 2)  Not just finishing up a search</div><div class='add'>+	 * 3)  Allowing a new search</div><div class='add'>+	 */</div><div class='add'>+	if (!update_lq &amp;&amp; !done_search &amp;&amp; !lq_sta-&gt;stay_in_tbl &amp;&amp; win-&gt;counter) {</div><div class='add'>+		/* Save current throughput to compare with "search" throughput */</div><div class='add'>+		lq_sta-&gt;last_tpt = current_tpt;</div><div class='add'>+</div><div class='add'>+		/* Select a new "search" modulation mode to try.</div><div class='add'>+		 * If one is found, set up the new "search" table. */</div><div class='add'>+		if (is_legacy(tbl-&gt;lq_type))</div><div class='add'>+			il4965_rs_move_legacy_other(il, lq_sta, conf, sta, idx);</div><div class='add'>+		else if (is_siso(tbl-&gt;lq_type))</div><div class='add'>+			il4965_rs_move_siso_to_other(il, lq_sta, conf, sta,</div><div class='add'>+						     idx);</div><div class='add'>+		else		/* (is_mimo2(tbl-&gt;lq_type)) */</div><div class='add'>+			il4965_rs_move_mimo2_to_other(il, lq_sta, conf, sta,</div><div class='add'>+						      idx);</div><div class='add'>+</div><div class='add'>+		/* If new "search" mode was selected, set up in uCode table */</div><div class='add'>+		if (lq_sta-&gt;search_better_tbl) {</div><div class='add'>+			/* Access the "search" table, clear its history. */</div><div class='add'>+			tbl = &amp;(lq_sta-&gt;lq_info[(1 - lq_sta-&gt;active_tbl)]);</div><div class='add'>+			for (i = 0; i &lt; RATE_COUNT; i++)</div><div class='add'>+				il4965_rs_rate_scale_clear_win(&amp;(tbl-&gt;win[i]));</div><div class='add'>+</div><div class='add'>+			/* Use new "search" start rate */</div><div class='add'>+			idx = il4965_hwrate_to_plcp_idx(tbl-&gt;current_rate);</div><div class='add'>+</div><div class='add'>+			D_RATE("Switch current  mcs: %X idx: %d\n",</div><div class='add'>+			       tbl-&gt;current_rate, idx);</div><div class='add'>+			il4965_rs_fill_link_cmd(il, lq_sta, tbl-&gt;current_rate);</div><div class='add'>+			il_send_lq_cmd(il, ctx, &amp;lq_sta-&gt;lq, CMD_ASYNC, false);</div><div class='add'>+		} else</div><div class='add'>+			done_search = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (done_search &amp;&amp; !lq_sta-&gt;stay_in_tbl) {</div><div class='add'>+		/* If the "active" (non-search) mode was legacy,</div><div class='add'>+		 * and we've tried switching antennas,</div><div class='add'>+		 * but we haven't been able to try HT modes (not available),</div><div class='add'>+		 * stay with best antenna legacy modulation for a while</div><div class='add'>+		 * before next round of mode comparisons. */</div><div class='add'>+		tbl1 = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='add'>+		if (is_legacy(tbl1-&gt;lq_type) &amp;&amp; !conf_is_ht(conf) &amp;&amp;</div><div class='add'>+		    lq_sta-&gt;action_counter &gt; tbl1-&gt;max_search) {</div><div class='add'>+			D_RATE("LQ: STAY in legacy table\n");</div><div class='add'>+			il4965_rs_set_stay_in_table(il, 1, lq_sta);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If we're in an HT mode, and all 3 mode switch actions</div><div class='add'>+		 * have been tried and compared, stay in this best modulation</div><div class='add'>+		 * mode for a while before next round of mode comparisons. */</div><div class='add'>+		if (lq_sta-&gt;enable_counter &amp;&amp;</div><div class='add'>+		    lq_sta-&gt;action_counter &gt;= tbl1-&gt;max_search) {</div><div class='add'>+			if (lq_sta-&gt;last_tpt &gt; IL_AGG_TPT_THREHOLD &amp;&amp;</div><div class='add'>+			    (lq_sta-&gt;tx_agg_tid_en &amp; (1 &lt;&lt; tid)) &amp;&amp;</div><div class='add'>+			    tid != MAX_TID_COUNT) {</div><div class='add'>+				tid_data =</div><div class='add'>+				    &amp;il-&gt;stations[lq_sta-&gt;lq.sta_id].tid[tid];</div><div class='add'>+				if (tid_data-&gt;agg.state == IL_AGG_OFF) {</div><div class='add'>+					D_RATE("try to aggregate tid %d\n",</div><div class='add'>+					       tid);</div><div class='add'>+					il4965_rs_tl_turn_on_agg(il, tid,</div><div class='add'>+								 lq_sta, sta);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			il4965_rs_set_stay_in_table(il, 0, lq_sta);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	tbl-&gt;current_rate =</div><div class='add'>+	    il4965_rate_n_flags_from_tbl(il, tbl, idx, is_green);</div><div class='add'>+	i = idx;</div><div class='add'>+	lq_sta-&gt;last_txrate_idx = i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_rs_initialize_lq - Initialize a station's hardware rate table</div><div class='add'>+ *</div><div class='add'>+ * The uCode's station table contains a table of fallback rates</div><div class='add'>+ * for automatic fallback during transmission.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: This sets up a default set of values.  These will be replaced later</div><div class='add'>+ *       if the driver's iwl-4965-rs rate scaling algorithm is used, instead of</div><div class='add'>+ *       rc80211_simple.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: Run C_ADD_STA command to set up station table entry, before</div><div class='add'>+ *       calling this function (which runs C_TX_LINK_QUALITY_CMD,</div><div class='add'>+ *       which requires station table entry to exist).</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_rs_initialize_lq(struct il_priv *il, struct ieee80211_conf *conf,</div><div class='add'>+			struct ieee80211_sta *sta, struct il_lq_sta *lq_sta)</div><div class='add'>+{</div><div class='add'>+	struct il_scale_tbl_info *tbl;</div><div class='add'>+	int rate_idx;</div><div class='add'>+	int i;</div><div class='add'>+	u32 rate;</div><div class='add'>+	u8 use_green = il4965_rs_use_green(sta);</div><div class='add'>+	u8 active_tbl = 0;</div><div class='add'>+	u8 valid_tx_ant;</div><div class='add'>+	struct il_station_priv *sta_priv;</div><div class='add'>+	struct il_rxon_context *ctx;</div><div class='add'>+</div><div class='add'>+	if (!sta || !lq_sta)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sta_priv = (void *)sta-&gt;drv_priv;</div><div class='add'>+	ctx = sta_priv-&gt;common.ctx;</div><div class='add'>+</div><div class='add'>+	i = lq_sta-&gt;last_txrate_idx;</div><div class='add'>+</div><div class='add'>+	valid_tx_ant = il-&gt;hw_params.valid_tx_ant;</div><div class='add'>+</div><div class='add'>+	if (!lq_sta-&gt;search_better_tbl)</div><div class='add'>+		active_tbl = lq_sta-&gt;active_tbl;</div><div class='add'>+	else</div><div class='add'>+		active_tbl = 1 - lq_sta-&gt;active_tbl;</div><div class='add'>+</div><div class='add'>+	tbl = &amp;(lq_sta-&gt;lq_info[active_tbl]);</div><div class='add'>+</div><div class='add'>+	if (i &lt; 0 || i &gt;= RATE_COUNT)</div><div class='add'>+		i = 0;</div><div class='add'>+</div><div class='add'>+	rate = il_rates[i].plcp;</div><div class='add'>+	tbl-&gt;ant_type = il4965_first_antenna(valid_tx_ant);</div><div class='add'>+	rate |= tbl-&gt;ant_type &lt;&lt; RATE_MCS_ANT_POS;</div><div class='add'>+</div><div class='add'>+	if (i &gt;= IL_FIRST_CCK_RATE &amp;&amp; i &lt;= IL_LAST_CCK_RATE)</div><div class='add'>+		rate |= RATE_MCS_CCK_MSK;</div><div class='add'>+</div><div class='add'>+	il4965_rs_get_tbl_info_from_mcs(rate, il-&gt;band, tbl, &amp;rate_idx);</div><div class='add'>+	if (!il4965_rs_is_valid_ant(valid_tx_ant, tbl-&gt;ant_type))</div><div class='add'>+		il4965_rs_toggle_antenna(valid_tx_ant, &amp;rate, tbl);</div><div class='add'>+</div><div class='add'>+	rate = il4965_rate_n_flags_from_tbl(il, tbl, rate_idx, use_green);</div><div class='add'>+	tbl-&gt;current_rate = rate;</div><div class='add'>+	il4965_rs_set_expected_tpt_table(lq_sta, tbl);</div><div class='add'>+	il4965_rs_fill_link_cmd(NULL, lq_sta, rate);</div><div class='add'>+	il-&gt;stations[lq_sta-&gt;lq.sta_id].lq = &amp;lq_sta-&gt;lq;</div><div class='add'>+	il_send_lq_cmd(il, ctx, &amp;lq_sta-&gt;lq, CMD_SYNC, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_rs_get_rate(void *il_r, struct ieee80211_sta *sta, void *il_sta,</div><div class='add'>+		   struct ieee80211_tx_rate_control *txrc)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct sk_buff *skb = txrc-&gt;skb;</div><div class='add'>+	struct ieee80211_supported_band *sband = txrc-&gt;sband;</div><div class='add'>+	struct il_priv *il __maybe_unused = (struct il_priv *)il_r;</div><div class='add'>+	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+	struct il_lq_sta *lq_sta = il_sta;</div><div class='add'>+	int rate_idx;</div><div class='add'>+</div><div class='add'>+	D_RATE("rate scale calculate new rate for skb\n");</div><div class='add'>+</div><div class='add'>+	/* Get max rate if user set max rate */</div><div class='add'>+	if (lq_sta) {</div><div class='add'>+		lq_sta-&gt;max_rate_idx = txrc-&gt;max_rate_idx;</div><div class='add'>+		if (sband-&gt;band == IEEE80211_BAND_5GHZ &amp;&amp;</div><div class='add'>+		    lq_sta-&gt;max_rate_idx != -1)</div><div class='add'>+			lq_sta-&gt;max_rate_idx += IL_FIRST_OFDM_RATE;</div><div class='add'>+		if (lq_sta-&gt;max_rate_idx &lt; 0 ||</div><div class='add'>+		    lq_sta-&gt;max_rate_idx &gt;= RATE_COUNT)</div><div class='add'>+			lq_sta-&gt;max_rate_idx = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Treat uninitialized rate scaling data same as non-existing. */</div><div class='add'>+	if (lq_sta &amp;&amp; !lq_sta-&gt;drv) {</div><div class='add'>+		D_RATE("Rate scaling not initialized yet.\n");</div><div class='add'>+		il_sta = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Send management frames and NO_ACK data using lowest rate. */</div><div class='add'>+	if (rate_control_send_low(sta, il_sta, txrc))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!lq_sta)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rate_idx = lq_sta-&gt;last_txrate_idx;</div><div class='add'>+</div><div class='add'>+	if (lq_sta-&gt;last_rate_n_flags &amp; RATE_MCS_HT_MSK) {</div><div class='add'>+		rate_idx -= IL_FIRST_OFDM_RATE;</div><div class='add'>+		/* 6M and 9M shared same MCS idx */</div><div class='add'>+		rate_idx = (rate_idx &gt; 0) ? (rate_idx - 1) : 0;</div><div class='add'>+		if (il4965_rs_extract_rate(lq_sta-&gt;last_rate_n_flags) &gt;=</div><div class='add'>+		    RATE_MIMO2_6M_PLCP)</div><div class='add'>+			rate_idx = rate_idx + MCS_IDX_PER_STREAM;</div><div class='add'>+		info-&gt;control.rates[0].flags = IEEE80211_TX_RC_MCS;</div><div class='add'>+		if (lq_sta-&gt;last_rate_n_flags &amp; RATE_MCS_SGI_MSK)</div><div class='add'>+			info-&gt;control.rates[0].flags |=</div><div class='add'>+			    IEEE80211_TX_RC_SHORT_GI;</div><div class='add'>+		if (lq_sta-&gt;last_rate_n_flags &amp; RATE_MCS_DUP_MSK)</div><div class='add'>+			info-&gt;control.rates[0].flags |=</div><div class='add'>+			    IEEE80211_TX_RC_DUP_DATA;</div><div class='add'>+		if (lq_sta-&gt;last_rate_n_flags &amp; RATE_MCS_HT40_MSK)</div><div class='add'>+			info-&gt;control.rates[0].flags |=</div><div class='add'>+			    IEEE80211_TX_RC_40_MHZ_WIDTH;</div><div class='add'>+		if (lq_sta-&gt;last_rate_n_flags &amp; RATE_MCS_GF_MSK)</div><div class='add'>+			info-&gt;control.rates[0].flags |=</div><div class='add'>+			    IEEE80211_TX_RC_GREEN_FIELD;</div><div class='add'>+	} else {</div><div class='add'>+		/* Check for invalid rates */</div><div class='add'>+		if (rate_idx &lt; 0 || rate_idx &gt;= RATE_COUNT_LEGACY ||</div><div class='add'>+		    (sband-&gt;band == IEEE80211_BAND_5GHZ &amp;&amp;</div><div class='add'>+		     rate_idx &lt; IL_FIRST_OFDM_RATE))</div><div class='add'>+			rate_idx = rate_lowest_index(sband, sta);</div><div class='add'>+		/* On valid 5 GHz rate, adjust idx */</div><div class='add'>+		else if (sband-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='add'>+			rate_idx -= IL_FIRST_OFDM_RATE;</div><div class='add'>+		info-&gt;control.rates[0].flags = 0;</div><div class='add'>+	}</div><div class='add'>+	info-&gt;control.rates[0].idx = rate_idx;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *</div><div class='add'>+il4965_rs_alloc_sta(void *il_rate, struct ieee80211_sta *sta, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct il_station_priv *sta_priv =</div><div class='add'>+	    (struct il_station_priv *)sta-&gt;drv_priv;</div><div class='add'>+	struct il_priv *il;</div><div class='add'>+</div><div class='add'>+	il = (struct il_priv *)il_rate;</div><div class='add'>+	D_RATE("create station rate scale win\n");</div><div class='add'>+</div><div class='add'>+	return &amp;sta_priv-&gt;lq_sta;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called after adding a new station to initialize rate scaling</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il4965_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta, u8 sta_id)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+	struct ieee80211_hw *hw = il-&gt;hw;</div><div class='add'>+	struct ieee80211_conf *conf = &amp;il-&gt;hw-&gt;conf;</div><div class='add'>+	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='add'>+	struct il_station_priv *sta_priv;</div><div class='add'>+	struct il_lq_sta *lq_sta;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+</div><div class='add'>+	sta_priv = (struct il_station_priv *)sta-&gt;drv_priv;</div><div class='add'>+	lq_sta = &amp;sta_priv-&gt;lq_sta;</div><div class='add'>+	sband = hw-&gt;wiphy-&gt;bands[conf-&gt;channel-&gt;band];</div><div class='add'>+</div><div class='add'>+	lq_sta-&gt;lq.sta_id = sta_id;</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; LQ_SIZE; j++)</div><div class='add'>+		for (i = 0; i &lt; RATE_COUNT; i++)</div><div class='add'>+			il4965_rs_rate_scale_clear_win(&amp;lq_sta-&gt;lq_info[j].</div><div class='add'>+						       win[i]);</div><div class='add'>+</div><div class='add'>+	lq_sta-&gt;flush_timer = 0;</div><div class='add'>+	lq_sta-&gt;supp_rates = sta-&gt;supp_rates[sband-&gt;band];</div><div class='add'>+	for (j = 0; j &lt; LQ_SIZE; j++)</div><div class='add'>+		for (i = 0; i &lt; RATE_COUNT; i++)</div><div class='add'>+			il4965_rs_rate_scale_clear_win(&amp;lq_sta-&gt;lq_info[j].</div><div class='add'>+						       win[i]);</div><div class='add'>+</div><div class='add'>+	D_RATE("LQ:" "*** rate scale station global init for station %d ***\n",</div><div class='add'>+	       sta_id);</div><div class='add'>+	/* TODO: what is a good starting rate for STA? About middle? Maybe not</div><div class='add'>+	 * the lowest or the highest rate.. Could consider using RSSI from</div><div class='add'>+	 * previous packets? Need to have IEEE 802.1X auth succeed immediately</div><div class='add'>+	 * after assoc.. */</div><div class='add'>+</div><div class='add'>+	lq_sta-&gt;is_dup = 0;</div><div class='add'>+	lq_sta-&gt;max_rate_idx = -1;</div><div class='add'>+	lq_sta-&gt;missed_rate_counter = IL_MISSED_RATE_MAX;</div><div class='add'>+	lq_sta-&gt;is_green = il4965_rs_use_green(sta);</div><div class='add'>+	lq_sta-&gt;active_legacy_rate = il-&gt;active_rate &amp; ~(0x1000);</div><div class='add'>+	lq_sta-&gt;band = il-&gt;band;</div><div class='add'>+	/*</div><div class='add'>+	 * active_siso_rate mask includes 9 MBits (bit 5), and CCK (bits 0-3),</div><div class='add'>+	 * supp_rates[] does not; shift to convert format, force 9 MBits off.</div><div class='add'>+	 */</div><div class='add'>+	lq_sta-&gt;active_siso_rate = ht_cap-&gt;mcs.rx_mask[0] &lt;&lt; 1;</div><div class='add'>+	lq_sta-&gt;active_siso_rate |= ht_cap-&gt;mcs.rx_mask[0] &amp; 0x1;</div><div class='add'>+	lq_sta-&gt;active_siso_rate &amp;= ~((u16) 0x2);</div><div class='add'>+	lq_sta-&gt;active_siso_rate &lt;&lt;= IL_FIRST_OFDM_RATE;</div><div class='add'>+</div><div class='add'>+	/* Same here */</div><div class='add'>+	lq_sta-&gt;active_mimo2_rate = ht_cap-&gt;mcs.rx_mask[1] &lt;&lt; 1;</div><div class='add'>+	lq_sta-&gt;active_mimo2_rate |= ht_cap-&gt;mcs.rx_mask[1] &amp; 0x1;</div><div class='add'>+	lq_sta-&gt;active_mimo2_rate &amp;= ~((u16) 0x2);</div><div class='add'>+	lq_sta-&gt;active_mimo2_rate &lt;&lt;= IL_FIRST_OFDM_RATE;</div><div class='add'>+</div><div class='add'>+	/* These values will be overridden later */</div><div class='add'>+	lq_sta-&gt;lq.general_params.single_stream_ant_msk =</div><div class='add'>+	    il4965_first_antenna(il-&gt;hw_params.valid_tx_ant);</div><div class='add'>+	lq_sta-&gt;lq.general_params.dual_stream_ant_msk =</div><div class='add'>+	    il-&gt;hw_params.valid_tx_ant &amp; ~il4965_first_antenna(il-&gt;hw_params.</div><div class='add'>+							       valid_tx_ant);</div><div class='add'>+	if (!lq_sta-&gt;lq.general_params.dual_stream_ant_msk) {</div><div class='add'>+		lq_sta-&gt;lq.general_params.dual_stream_ant_msk = ANT_AB;</div><div class='add'>+	} else if (il4965_num_of_ant(il-&gt;hw_params.valid_tx_ant) == 2) {</div><div class='add'>+		lq_sta-&gt;lq.general_params.dual_stream_ant_msk =</div><div class='add'>+		    il-&gt;hw_params.valid_tx_ant;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* as default allow aggregation for all tids */</div><div class='add'>+	lq_sta-&gt;tx_agg_tid_en = IL_AGG_ALL_TID;</div><div class='add'>+	lq_sta-&gt;drv = il;</div><div class='add'>+</div><div class='add'>+	/* Set last_txrate_idx to lowest rate */</div><div class='add'>+	lq_sta-&gt;last_txrate_idx = rate_lowest_index(sband, sta);</div><div class='add'>+	if (sband-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='add'>+		lq_sta-&gt;last_txrate_idx += IL_FIRST_OFDM_RATE;</div><div class='add'>+	lq_sta-&gt;is_agg = 0;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='add'>+	lq_sta-&gt;dbg_fixed_rate = 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	il4965_rs_initialize_lq(il, conf, sta, lq_sta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_rs_fill_link_cmd(struct il_priv *il, struct il_lq_sta *lq_sta,</div><div class='add'>+			u32 new_rate)</div><div class='add'>+{</div><div class='add'>+	struct il_scale_tbl_info tbl_type;</div><div class='add'>+	int idx = 0;</div><div class='add'>+	int rate_idx;</div><div class='add'>+	int repeat_rate = 0;</div><div class='add'>+	u8 ant_toggle_cnt = 0;</div><div class='add'>+	u8 use_ht_possible = 1;</div><div class='add'>+	u8 valid_tx_ant = 0;</div><div class='add'>+	struct il_link_quality_cmd *lq_cmd = &amp;lq_sta-&gt;lq;</div><div class='add'>+</div><div class='add'>+	/* Override starting rate (idx 0) if needed for debug purposes */</div><div class='add'>+	il4965_rs_dbgfs_set_mcs(lq_sta, &amp;new_rate, idx);</div><div class='add'>+</div><div class='add'>+	/* Interpret new_rate (rate_n_flags) */</div><div class='add'>+	il4965_rs_get_tbl_info_from_mcs(new_rate, lq_sta-&gt;band, &amp;tbl_type,</div><div class='add'>+					&amp;rate_idx);</div><div class='add'>+</div><div class='add'>+	/* How many times should we repeat the initial rate? */</div><div class='add'>+	if (is_legacy(tbl_type.lq_type)) {</div><div class='add'>+		ant_toggle_cnt = 1;</div><div class='add'>+		repeat_rate = IL_NUMBER_TRY;</div><div class='add'>+	} else {</div><div class='add'>+		repeat_rate = IL_HT_NUMBER_TRY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lq_cmd-&gt;general_params.mimo_delimiter =</div><div class='add'>+	    is_mimo(tbl_type.lq_type) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	/* Fill 1st table entry (idx 0) */</div><div class='add'>+	lq_cmd-&gt;rs_table[idx].rate_n_flags = cpu_to_le32(new_rate);</div><div class='add'>+</div><div class='add'>+	if (il4965_num_of_ant(tbl_type.ant_type) == 1) {</div><div class='add'>+		lq_cmd-&gt;general_params.single_stream_ant_msk =</div><div class='add'>+		    tbl_type.ant_type;</div><div class='add'>+	} else if (il4965_num_of_ant(tbl_type.ant_type) == 2) {</div><div class='add'>+		lq_cmd-&gt;general_params.dual_stream_ant_msk = tbl_type.ant_type;</div><div class='add'>+	}</div><div class='add'>+	/* otherwise we don't modify the existing value */</div><div class='add'>+	idx++;</div><div class='add'>+	repeat_rate--;</div><div class='add'>+	if (il)</div><div class='add'>+		valid_tx_ant = il-&gt;hw_params.valid_tx_ant;</div><div class='add'>+</div><div class='add'>+	/* Fill rest of rate table */</div><div class='add'>+	while (idx &lt; LINK_QUAL_MAX_RETRY_NUM) {</div><div class='add'>+		/* Repeat initial/next rate.</div><div class='add'>+		 * For legacy IL_NUMBER_TRY == 1, this loop will not execute.</div><div class='add'>+		 * For HT IL_HT_NUMBER_TRY == 3, this executes twice. */</div><div class='add'>+		while (repeat_rate &gt; 0 &amp;&amp; idx &lt; LINK_QUAL_MAX_RETRY_NUM) {</div><div class='add'>+			if (is_legacy(tbl_type.lq_type)) {</div><div class='add'>+				if (ant_toggle_cnt &lt; NUM_TRY_BEFORE_ANT_TOGGLE)</div><div class='add'>+					ant_toggle_cnt++;</div><div class='add'>+				else if (il &amp;&amp;</div><div class='add'>+					 il4965_rs_toggle_antenna(valid_tx_ant,</div><div class='add'>+								  &amp;new_rate,</div><div class='add'>+								  &amp;tbl_type))</div><div class='add'>+					ant_toggle_cnt = 1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Override next rate if needed for debug purposes */</div><div class='add'>+			il4965_rs_dbgfs_set_mcs(lq_sta, &amp;new_rate, idx);</div><div class='add'>+</div><div class='add'>+			/* Fill next table entry */</div><div class='add'>+			lq_cmd-&gt;rs_table[idx].rate_n_flags =</div><div class='add'>+			    cpu_to_le32(new_rate);</div><div class='add'>+			repeat_rate--;</div><div class='add'>+			idx++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		il4965_rs_get_tbl_info_from_mcs(new_rate, lq_sta-&gt;band,</div><div class='add'>+						&amp;tbl_type, &amp;rate_idx);</div><div class='add'>+</div><div class='add'>+		/* Indicate to uCode which entries might be MIMO.</div><div class='add'>+		 * If initial rate was MIMO, this will finally end up</div><div class='add'>+		 * as (IL_HT_NUMBER_TRY * 2), after 2nd pass, otherwise 0. */</div><div class='add'>+		if (is_mimo(tbl_type.lq_type))</div><div class='add'>+			lq_cmd-&gt;general_params.mimo_delimiter = idx;</div><div class='add'>+</div><div class='add'>+		/* Get next rate */</div><div class='add'>+		new_rate =</div><div class='add'>+		    il4965_rs_get_lower_rate(lq_sta, &amp;tbl_type, rate_idx,</div><div class='add'>+					     use_ht_possible);</div><div class='add'>+</div><div class='add'>+		/* How many times should we repeat the next rate? */</div><div class='add'>+		if (is_legacy(tbl_type.lq_type)) {</div><div class='add'>+			if (ant_toggle_cnt &lt; NUM_TRY_BEFORE_ANT_TOGGLE)</div><div class='add'>+				ant_toggle_cnt++;</div><div class='add'>+			else if (il &amp;&amp;</div><div class='add'>+				 il4965_rs_toggle_antenna(valid_tx_ant,</div><div class='add'>+							  &amp;new_rate, &amp;tbl_type))</div><div class='add'>+				ant_toggle_cnt = 1;</div><div class='add'>+</div><div class='add'>+			repeat_rate = IL_NUMBER_TRY;</div><div class='add'>+		} else {</div><div class='add'>+			repeat_rate = IL_HT_NUMBER_TRY;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Don't allow HT rates after next pass.</div><div class='add'>+		 * il4965_rs_get_lower_rate() will change type to LQ_A or LQ_G. */</div><div class='add'>+		use_ht_possible = 0;</div><div class='add'>+</div><div class='add'>+		/* Override next rate if needed for debug purposes */</div><div class='add'>+		il4965_rs_dbgfs_set_mcs(lq_sta, &amp;new_rate, idx);</div><div class='add'>+</div><div class='add'>+		/* Fill next table entry */</div><div class='add'>+		lq_cmd-&gt;rs_table[idx].rate_n_flags = cpu_to_le32(new_rate);</div><div class='add'>+</div><div class='add'>+		idx++;</div><div class='add'>+		repeat_rate--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lq_cmd-&gt;agg_params.agg_frame_cnt_limit = LINK_QUAL_AGG_FRAME_LIMIT_DEF;</div><div class='add'>+	lq_cmd-&gt;agg_params.agg_dis_start_th = LINK_QUAL_AGG_DISABLE_START_DEF;</div><div class='add'>+</div><div class='add'>+	lq_cmd-&gt;agg_params.agg_time_limit =</div><div class='add'>+	    cpu_to_le16(LINK_QUAL_AGG_TIME_LIMIT_DEF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *</div><div class='add'>+il4965_rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)</div><div class='add'>+{</div><div class='add'>+	return hw-&gt;priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rate scale requires free function to be implemented */</div><div class='add'>+static void</div><div class='add'>+il4965_rs_free(void *il_rate)</div><div class='add'>+{</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_rs_free_sta(void *il_r, struct ieee80211_sta *sta, void *il_sta)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il __maybe_unused = il_r;</div><div class='add'>+</div><div class='add'>+	D_RATE("enter\n");</div><div class='add'>+	D_RATE("leave\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='add'>+static int</div><div class='add'>+il4965_open_file_generic(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	file-&gt;private_data = inode-&gt;i_private;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta, u32 * rate_n_flags, int idx)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il;</div><div class='add'>+	u8 valid_tx_ant;</div><div class='add'>+	u8 ant_sel_tx;</div><div class='add'>+</div><div class='add'>+	il = lq_sta-&gt;drv;</div><div class='add'>+	valid_tx_ant = il-&gt;hw_params.valid_tx_ant;</div><div class='add'>+	if (lq_sta-&gt;dbg_fixed_rate) {</div><div class='add'>+		ant_sel_tx =</div><div class='add'>+		    ((lq_sta-&gt;</div><div class='add'>+		      dbg_fixed_rate &amp; RATE_MCS_ANT_ABC_MSK) &gt;&gt;</div><div class='add'>+		     RATE_MCS_ANT_POS);</div><div class='add'>+		if ((valid_tx_ant &amp; ant_sel_tx) == ant_sel_tx) {</div><div class='add'>+			*rate_n_flags = lq_sta-&gt;dbg_fixed_rate;</div><div class='add'>+			D_RATE("Fixed rate ON\n");</div><div class='add'>+		} else {</div><div class='add'>+			lq_sta-&gt;dbg_fixed_rate = 0;</div><div class='add'>+			IL_ERR</div><div class='add'>+			    ("Invalid antenna selection 0x%X, Valid is 0x%X\n",</div><div class='add'>+			     ant_sel_tx, valid_tx_ant);</div><div class='add'>+			D_RATE("Fixed rate OFF\n");</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		D_RATE("Fixed rate OFF\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il4965_rs_sta_dbgfs_scale_table_write(struct file *file,</div><div class='add'>+				      const char __user *user_buf,</div><div class='add'>+				      size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_lq_sta *lq_sta = file-&gt;private_data;</div><div class='add'>+	struct il_priv *il;</div><div class='add'>+	char buf[64];</div><div class='add'>+	size_t buf_size;</div><div class='add'>+	u32 parsed_rate;</div><div class='add'>+	struct il_station_priv *sta_priv =</div><div class='add'>+	    container_of(lq_sta, struct il_station_priv, lq_sta);</div><div class='add'>+	struct il_rxon_context *ctx = sta_priv-&gt;common.ctx;</div><div class='add'>+</div><div class='add'>+	il = lq_sta-&gt;drv;</div><div class='add'>+	memset(buf, 0, sizeof(buf));</div><div class='add'>+	buf_size = min(count, sizeof(buf) - 1);</div><div class='add'>+	if (copy_from_user(buf, user_buf, buf_size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (sscanf(buf, "%x", &amp;parsed_rate) == 1)</div><div class='add'>+		lq_sta-&gt;dbg_fixed_rate = parsed_rate;</div><div class='add'>+	else</div><div class='add'>+		lq_sta-&gt;dbg_fixed_rate = 0;</div><div class='add'>+</div><div class='add'>+	lq_sta-&gt;active_legacy_rate = 0x0FFF;	/* 1 - 54 MBits, includes CCK */</div><div class='add'>+	lq_sta-&gt;active_siso_rate = 0x1FD0;	/* 6 - 60 MBits, no 9, no CCK */</div><div class='add'>+	lq_sta-&gt;active_mimo2_rate = 0x1FD0;	/* 6 - 60 MBits, no 9, no CCK */</div><div class='add'>+</div><div class='add'>+	D_RATE("sta_id %d rate 0x%X\n", lq_sta-&gt;lq.sta_id,</div><div class='add'>+	       lq_sta-&gt;dbg_fixed_rate);</div><div class='add'>+</div><div class='add'>+	if (lq_sta-&gt;dbg_fixed_rate) {</div><div class='add'>+		il4965_rs_fill_link_cmd(NULL, lq_sta, lq_sta-&gt;dbg_fixed_rate);</div><div class='add'>+		il_send_lq_cmd(lq_sta-&gt;drv, ctx, &amp;lq_sta-&gt;lq, CMD_ASYNC, false);</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</div><div class='add'>+il4965_rs_sta_dbgfs_scale_table_read(struct file *file, char __user *user_buf,</div><div class='add'>+				     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	char *buff;</div><div class='add'>+	int desc = 0;</div><div class='add'>+	int i = 0;</div><div class='add'>+	int idx = 0;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	struct il_lq_sta *lq_sta = file-&gt;private_data;</div><div class='add'>+	struct il_priv *il;</div><div class='add'>+	struct il_scale_tbl_info *tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='add'>+</div><div class='add'>+	il = lq_sta-&gt;drv;</div><div class='add'>+	buff = kmalloc(1024, GFP_KERNEL);</div><div class='add'>+	if (!buff)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	desc += sprintf(buff + desc, "sta_id %d\n", lq_sta-&gt;lq.sta_id);</div><div class='add'>+	desc +=</div><div class='add'>+	    sprintf(buff + desc, "failed=%d success=%d rate=0%X\n",</div><div class='add'>+		    lq_sta-&gt;total_failed, lq_sta-&gt;total_success,</div><div class='add'>+		    lq_sta-&gt;active_legacy_rate);</div><div class='add'>+	desc +=</div><div class='add'>+	    sprintf(buff + desc, "fixed rate 0x%X\n", lq_sta-&gt;dbg_fixed_rate);</div><div class='add'>+	desc +=</div><div class='add'>+	    sprintf(buff + desc, "valid_tx_ant %s%s%s\n",</div><div class='add'>+		    (il-&gt;hw_params.valid_tx_ant &amp; ANT_A) ? "ANT_A," : "",</div><div class='add'>+		    (il-&gt;hw_params.valid_tx_ant &amp; ANT_B) ? "ANT_B," : "",</div><div class='add'>+		    (il-&gt;hw_params.valid_tx_ant &amp; ANT_C) ? "ANT_C" : "");</div><div class='add'>+	desc +=</div><div class='add'>+	    sprintf(buff + desc, "lq type %s\n",</div><div class='add'>+		    (is_legacy(tbl-&gt;lq_type)) ? "legacy" : "HT");</div><div class='add'>+	if (is_Ht(tbl-&gt;lq_type)) {</div><div class='add'>+		desc +=</div><div class='add'>+		    sprintf(buff + desc, " %s",</div><div class='add'>+			    (is_siso(tbl-&gt;lq_type)) ? "SISO" : "MIMO2");</div><div class='add'>+		desc +=</div><div class='add'>+		    sprintf(buff + desc, " %s",</div><div class='add'>+			    (tbl-&gt;is_ht40) ? "40MHz" : "20MHz");</div><div class='add'>+		desc +=</div><div class='add'>+		    sprintf(buff + desc, " %s %s %s\n",</div><div class='add'>+			    (tbl-&gt;is_SGI) ? "SGI" : "",</div><div class='add'>+			    (lq_sta-&gt;is_green) ? "GF enabled" : "",</div><div class='add'>+			    (lq_sta-&gt;is_agg) ? "AGG on" : "");</div><div class='add'>+	}</div><div class='add'>+	desc +=</div><div class='add'>+	    sprintf(buff + desc, "last tx rate=0x%X\n",</div><div class='add'>+		    lq_sta-&gt;last_rate_n_flags);</div><div class='add'>+	desc +=</div><div class='add'>+	    sprintf(buff + desc,</div><div class='add'>+		    "general:" "flags=0x%X mimo-d=%d s-ant0x%x d-ant=0x%x\n",</div><div class='add'>+		    lq_sta-&gt;lq.general_params.flags,</div><div class='add'>+		    lq_sta-&gt;lq.general_params.mimo_delimiter,</div><div class='add'>+		    lq_sta-&gt;lq.general_params.single_stream_ant_msk,</div><div class='add'>+		    lq_sta-&gt;lq.general_params.dual_stream_ant_msk);</div><div class='add'>+</div><div class='add'>+	desc +=</div><div class='add'>+	    sprintf(buff + desc,</div><div class='add'>+		    "agg:"</div><div class='add'>+		    "time_limit=%d dist_start_th=%d frame_cnt_limit=%d\n",</div><div class='add'>+		    le16_to_cpu(lq_sta-&gt;lq.agg_params.agg_time_limit),</div><div class='add'>+		    lq_sta-&gt;lq.agg_params.agg_dis_start_th,</div><div class='add'>+		    lq_sta-&gt;lq.agg_params.agg_frame_cnt_limit);</div><div class='add'>+</div><div class='add'>+	desc +=</div><div class='add'>+	    sprintf(buff + desc,</div><div class='add'>+		    "Start idx [0]=0x%x [1]=0x%x [2]=0x%x [3]=0x%x\n",</div><div class='add'>+		    lq_sta-&gt;lq.general_params.start_rate_idx[0],</div><div class='add'>+		    lq_sta-&gt;lq.general_params.start_rate_idx[1],</div><div class='add'>+		    lq_sta-&gt;lq.general_params.start_rate_idx[2],</div><div class='add'>+		    lq_sta-&gt;lq.general_params.start_rate_idx[3]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; LINK_QUAL_MAX_RETRY_NUM; i++) {</div><div class='add'>+		idx =</div><div class='add'>+		    il4965_hwrate_to_plcp_idx(le32_to_cpu</div><div class='add'>+					      (lq_sta-&gt;lq.rs_table[i].</div><div class='add'>+					       rate_n_flags));</div><div class='add'>+		if (is_legacy(tbl-&gt;lq_type)) {</div><div class='add'>+			desc +=</div><div class='add'>+			    sprintf(buff + desc, " rate[%d] 0x%X %smbps\n", i,</div><div class='add'>+				    le32_to_cpu(lq_sta-&gt;lq.rs_table[i].</div><div class='add'>+						rate_n_flags),</div><div class='add'>+				    il_rate_mcs[idx].mbps);</div><div class='add'>+		} else {</div><div class='add'>+			desc +=</div><div class='add'>+			    sprintf(buff + desc, " rate[%d] 0x%X %smbps (%s)\n",</div><div class='add'>+				    i,</div><div class='add'>+				    le32_to_cpu(lq_sta-&gt;lq.rs_table[i].</div><div class='add'>+						rate_n_flags),</div><div class='add'>+				    il_rate_mcs[idx].mbps,</div><div class='add'>+				    il_rate_mcs[idx].mcs);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);</div><div class='add'>+	kfree(buff);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations rs_sta_dbgfs_scale_table_ops = {</div><div class='add'>+	.write = il4965_rs_sta_dbgfs_scale_table_write,</div><div class='add'>+	.read = il4965_rs_sta_dbgfs_scale_table_read,</div><div class='add'>+	.open = il4965_open_file_generic,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il4965_rs_sta_dbgfs_stats_table_read(struct file *file, char __user *user_buf,</div><div class='add'>+				     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	char *buff;</div><div class='add'>+	int desc = 0;</div><div class='add'>+	int i, j;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	struct il_lq_sta *lq_sta = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	buff = kmalloc(1024, GFP_KERNEL);</div><div class='add'>+	if (!buff)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; LQ_SIZE; i++) {</div><div class='add'>+		desc +=</div><div class='add'>+		    sprintf(buff + desc,</div><div class='add'>+			    "%s type=%d SGI=%d HT40=%d DUP=%d GF=%d\n"</div><div class='add'>+			    "rate=0x%X\n", lq_sta-&gt;active_tbl == i ? "*" : "x",</div><div class='add'>+			    lq_sta-&gt;lq_info[i].lq_type,</div><div class='add'>+			    lq_sta-&gt;lq_info[i].is_SGI,</div><div class='add'>+			    lq_sta-&gt;lq_info[i].is_ht40,</div><div class='add'>+			    lq_sta-&gt;lq_info[i].is_dup, lq_sta-&gt;is_green,</div><div class='add'>+			    lq_sta-&gt;lq_info[i].current_rate);</div><div class='add'>+		for (j = 0; j &lt; RATE_COUNT; j++) {</div><div class='add'>+			desc +=</div><div class='add'>+			    sprintf(buff + desc,</div><div class='add'>+				    "counter=%d success=%d %%=%d\n",</div><div class='add'>+				    lq_sta-&gt;lq_info[i].win[j].counter,</div><div class='add'>+				    lq_sta-&gt;lq_info[i].win[j].success_counter,</div><div class='add'>+				    lq_sta-&gt;lq_info[i].win[j].success_ratio);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);</div><div class='add'>+	kfree(buff);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations rs_sta_dbgfs_stats_table_ops = {</div><div class='add'>+	.read = il4965_rs_sta_dbgfs_stats_table_read,</div><div class='add'>+	.open = il4965_open_file_generic,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il4965_rs_sta_dbgfs_rate_scale_data_read(struct file *file,</div><div class='add'>+					 char __user *user_buf, size_t count,</div><div class='add'>+					 loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	char buff[120];</div><div class='add'>+	int desc = 0;</div><div class='add'>+	struct il_lq_sta *lq_sta = file-&gt;private_data;</div><div class='add'>+	struct il_scale_tbl_info *tbl = &amp;lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl];</div><div class='add'>+</div><div class='add'>+	if (is_Ht(tbl-&gt;lq_type))</div><div class='add'>+		desc +=</div><div class='add'>+		    sprintf(buff + desc, "Bit Rate= %d Mb/s\n",</div><div class='add'>+			    tbl-&gt;expected_tpt[lq_sta-&gt;last_txrate_idx]);</div><div class='add'>+	else</div><div class='add'>+		desc +=</div><div class='add'>+		    sprintf(buff + desc, "Bit Rate= %d Mb/s\n",</div><div class='add'>+			    il_rates[lq_sta-&gt;last_txrate_idx].ieee &gt;&gt; 1);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buff, desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations rs_sta_dbgfs_rate_scale_data_ops = {</div><div class='add'>+	.read = il4965_rs_sta_dbgfs_rate_scale_data_read,</div><div class='add'>+	.open = il4965_open_file_generic,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_rs_add_debugfs(void *il, void *il_sta, struct dentry *dir)</div><div class='add'>+{</div><div class='add'>+	struct il_lq_sta *lq_sta = il_sta;</div><div class='add'>+	lq_sta-&gt;rs_sta_dbgfs_scale_table_file =</div><div class='add'>+	    debugfs_create_file("rate_scale_table", S_IRUSR | S_IWUSR, dir,</div><div class='add'>+				lq_sta, &amp;rs_sta_dbgfs_scale_table_ops);</div><div class='add'>+	lq_sta-&gt;rs_sta_dbgfs_stats_table_file =</div><div class='add'>+	    debugfs_create_file("rate_stats_table", S_IRUSR, dir, lq_sta,</div><div class='add'>+				&amp;rs_sta_dbgfs_stats_table_ops);</div><div class='add'>+	lq_sta-&gt;rs_sta_dbgfs_rate_scale_data_file =</div><div class='add'>+	    debugfs_create_file("rate_scale_data", S_IRUSR, dir, lq_sta,</div><div class='add'>+				&amp;rs_sta_dbgfs_rate_scale_data_ops);</div><div class='add'>+	lq_sta-&gt;rs_sta_dbgfs_tx_agg_tid_en_file =</div><div class='add'>+	    debugfs_create_u8("tx_agg_tid_enable", S_IRUSR | S_IWUSR, dir,</div><div class='add'>+			      &amp;lq_sta-&gt;tx_agg_tid_en);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_rs_remove_debugfs(void *il, void *il_sta)</div><div class='add'>+{</div><div class='add'>+	struct il_lq_sta *lq_sta = il_sta;</div><div class='add'>+	debugfs_remove(lq_sta-&gt;rs_sta_dbgfs_scale_table_file);</div><div class='add'>+	debugfs_remove(lq_sta-&gt;rs_sta_dbgfs_stats_table_file);</div><div class='add'>+	debugfs_remove(lq_sta-&gt;rs_sta_dbgfs_rate_scale_data_file);</div><div class='add'>+	debugfs_remove(lq_sta-&gt;rs_sta_dbgfs_tx_agg_tid_en_file);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialization of rate scaling information is done by driver after</div><div class='add'>+ * the station is added. Since mac80211 calls this function before a</div><div class='add'>+ * station is added we ignore it.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_rs_rate_init_stub(void *il_r, struct ieee80211_supported_band *sband,</div><div class='add'>+			 struct ieee80211_sta *sta, void *il_sta)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rate_control_ops rs_4965_ops = {</div><div class='add'>+	.module = NULL,</div><div class='add'>+	.name = IL4965_RS_NAME,</div><div class='add'>+	.tx_status = il4965_rs_tx_status,</div><div class='add'>+	.get_rate = il4965_rs_get_rate,</div><div class='add'>+	.rate_init = il4965_rs_rate_init_stub,</div><div class='add'>+	.alloc = il4965_rs_alloc,</div><div class='add'>+	.free = il4965_rs_free,</div><div class='add'>+	.alloc_sta = il4965_rs_alloc_sta,</div><div class='add'>+	.free_sta = il4965_rs_free_sta,</div><div class='add'>+#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='add'>+	.add_sta_debugfs = il4965_rs_add_debugfs,</div><div class='add'>+	.remove_sta_debugfs = il4965_rs_remove_debugfs,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_rate_control_register(void)</div><div class='add'>+{</div><div class='add'>+	return ieee80211_rate_control_register(&amp;rs_4965_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_rate_control_unregister(void)</div><div class='add'>+{</div><div class='add'>+	ieee80211_rate_control_unregister(&amp;rs_4965_ops);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/4965.c b/drivers/net/wireless/iwlegacy/4965.c<br/>new file mode 100644<br/>index 000000000000..cacbc03880b0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/4965.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/4965.c</a></div><div class='hunk'>@@ -0,0 +1,2402 @@</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.</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 version 2 of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution in the</div><div class='add'>+ * file called LICENSE.</div><div class='add'>+ *</div><div class='add'>+ * Contact Information:</div><div class='add'>+ *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='add'>+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='add'>+ *</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/pci.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;asm/unaligned.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+#include "4965.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_verify_inst_sparse - verify runtime uCode image in card vs. host,</div><div class='add'>+ *   using sample data 100 bytes apart.  If these sample points are good,</div><div class='add'>+ *   it's a pretty good bet that everything between them is good, too.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_verify_inst_sparse(struct il_priv *il, __le32 * image, u32 len)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 errcnt = 0;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	D_INFO("ucode inst image size is %u\n", len);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i += 100, image += 100 / sizeof(u32)) {</div><div class='add'>+		/* read data comes through single port, auto-incr addr */</div><div class='add'>+		/* NOTE: Use the debugless read so we don't flood kernel log</div><div class='add'>+		 * if IL_DL_IO is set */</div><div class='add'>+		il_wr(il, HBUS_TARG_MEM_RADDR, i + IL4965_RTC_INST_LOWER_BOUND);</div><div class='add'>+		val = _il_rd(il, HBUS_TARG_MEM_RDAT);</div><div class='add'>+		if (val != le32_to_cpu(*image)) {</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			errcnt++;</div><div class='add'>+			if (errcnt &gt;= 3)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_verify_inst_full - verify runtime uCode image in card vs. host,</div><div class='add'>+ *     looking at all data.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_verify_inst_full(struct il_priv *il, __le32 * image, u32 len)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	u32 save_len = len;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 errcnt;</div><div class='add'>+</div><div class='add'>+	D_INFO("ucode inst image size is %u\n", len);</div><div class='add'>+</div><div class='add'>+	il_wr(il, HBUS_TARG_MEM_RADDR, IL4965_RTC_INST_LOWER_BOUND);</div><div class='add'>+</div><div class='add'>+	errcnt = 0;</div><div class='add'>+	for (; len &gt; 0; len -= sizeof(u32), image++) {</div><div class='add'>+		/* read data comes through single port, auto-incr addr */</div><div class='add'>+		/* NOTE: Use the debugless read so we don't flood kernel log</div><div class='add'>+		 * if IL_DL_IO is set */</div><div class='add'>+		val = _il_rd(il, HBUS_TARG_MEM_RDAT);</div><div class='add'>+		if (val != le32_to_cpu(*image)) {</div><div class='add'>+			IL_ERR("uCode INST section is invalid at "</div><div class='add'>+			       "offset 0x%x, is 0x%x, s/b 0x%x\n",</div><div class='add'>+			       save_len - len, val, le32_to_cpu(*image));</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			errcnt++;</div><div class='add'>+			if (errcnt &gt;= 20)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!errcnt)</div><div class='add'>+		D_INFO("ucode image in INSTRUCTION memory is good\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_verify_ucode - determine which instruction image is in SRAM,</div><div class='add'>+ *    and verify its contents</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il4965_verify_ucode(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	__le32 *image;</div><div class='add'>+	u32 len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Try bootstrap */</div><div class='add'>+	image = (__le32 *) il-&gt;ucode_boot.v_addr;</div><div class='add'>+	len = il-&gt;ucode_boot.len;</div><div class='add'>+	ret = il4965_verify_inst_sparse(il, image, len);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		D_INFO("Bootstrap uCode is good in inst SRAM\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Try initialize */</div><div class='add'>+	image = (__le32 *) il-&gt;ucode_init.v_addr;</div><div class='add'>+	len = il-&gt;ucode_init.len;</div><div class='add'>+	ret = il4965_verify_inst_sparse(il, image, len);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		D_INFO("Initialize uCode is good in inst SRAM\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Try runtime/protocol */</div><div class='add'>+	image = (__le32 *) il-&gt;ucode_code.v_addr;</div><div class='add'>+	len = il-&gt;ucode_code.len;</div><div class='add'>+	ret = il4965_verify_inst_sparse(il, image, len);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		D_INFO("Runtime uCode is good in inst SRAM\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IL_ERR("NO VALID UCODE IMAGE IN INSTRUCTION SRAM!!\n");</div><div class='add'>+</div><div class='add'>+	/* Since nothing seems to match, show first several data entries in</div><div class='add'>+	 * instruction SRAM, so maybe visual inspection will give a clue.</div><div class='add'>+	 * Selection of bootstrap image (vs. other images) is arbitrary. */</div><div class='add'>+	image = (__le32 *) il-&gt;ucode_boot.v_addr;</div><div class='add'>+	len = il-&gt;ucode_boot.len;</div><div class='add'>+	ret = il4965_verify_inst_full(il, image, len);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * EEPROM related functions</div><div class='add'>+ *</div><div class='add'>+******************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The device's EEPROM semaphore prevents conflicts between driver and uCode</div><div class='add'>+ * when accessing the EEPROM; each access is a series of pulses to/from the</div><div class='add'>+ * EEPROM chip, not a single event, so even reads could conflict if they</div><div class='add'>+ * weren't arbitrated by the semaphore.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il4965_eeprom_acquire_semaphore(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	u16 count;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for (count = 0; count &lt; EEPROM_SEM_RETRY_LIMIT; count++) {</div><div class='add'>+		/* Request semaphore */</div><div class='add'>+		il_set_bit(il, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+			   CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);</div><div class='add'>+</div><div class='add'>+		/* See if we got it */</div><div class='add'>+		ret =</div><div class='add'>+		    _il_poll_bit(il, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+				 CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,</div><div class='add'>+				 CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,</div><div class='add'>+				 EEPROM_SEM_TIMEOUT);</div><div class='add'>+		if (ret &gt;= 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_eeprom_release_semaphore(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	il_clear_bit(il, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+		     CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il4965_eeprom_check_version(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	u16 eeprom_ver;</div><div class='add'>+	u16 calib_ver;</div><div class='add'>+</div><div class='add'>+	eeprom_ver = il_eeprom_query16(il, EEPROM_VERSION);</div><div class='add'>+	calib_ver = il_eeprom_query16(il, EEPROM_4965_CALIB_VERSION_OFFSET);</div><div class='add'>+</div><div class='add'>+	if (eeprom_ver &lt; il-&gt;cfg-&gt;eeprom_ver ||</div><div class='add'>+	    calib_ver &lt; il-&gt;cfg-&gt;eeprom_calib_ver)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	IL_INFO("device EEPROM VER=0x%x, CALIB=0x%x\n", eeprom_ver, calib_ver);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	IL_ERR("Unsupported (too old) EEPROM VER=0x%x &lt; 0x%x "</div><div class='add'>+	       "CALIB=0x%x &lt; 0x%x\n", eeprom_ver, il-&gt;cfg-&gt;eeprom_ver,</div><div class='add'>+	       calib_ver, il-&gt;cfg-&gt;eeprom_calib_ver);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il4965_eeprom_get_mac(const struct il_priv *il, u8 * mac)</div><div class='add'>+{</div><div class='add'>+	const u8 *addr = il_eeprom_query_addr(il,</div><div class='add'>+					      EEPROM_MAC_ADDRESS);</div><div class='add'>+	memcpy(mac, addr, ETH_ALEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Send led command */</div><div class='add'>+static int</div><div class='add'>+il4965_send_led_cmd(struct il_priv *il, struct il_led_cmd *led_cmd)</div><div class='add'>+{</div><div class='add'>+	struct il_host_cmd cmd = {</div><div class='add'>+		.id = C_LEDS,</div><div class='add'>+		.len = sizeof(struct il_led_cmd),</div><div class='add'>+		.data = led_cmd,</div><div class='add'>+		.flags = CMD_ASYNC,</div><div class='add'>+		.callback = NULL,</div><div class='add'>+	};</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	reg = _il_rd(il, CSR_LED_REG);</div><div class='add'>+	if (reg != (reg &amp; CSR_LED_BSM_CTRL_MSK))</div><div class='add'>+		_il_wr(il, CSR_LED_REG, reg &amp; CSR_LED_BSM_CTRL_MSK);</div><div class='add'>+</div><div class='add'>+	return il_send_cmd(il, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set led register off */</div><div class='add'>+void</div><div class='add'>+il4965_led_enable(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	_il_wr(il, CSR_LED_REG, CSR_LED_REG_TRUN_ON);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct il_led_ops il4965_led_ops = {</div><div class='add'>+	.cmd = il4965_send_led_cmd,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int il4965_send_tx_power(struct il_priv *il);</div><div class='add'>+static int il4965_hw_get_temperature(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+/* Highest firmware API version supported */</div><div class='add'>+#define IL4965_UCODE_API_MAX 2</div><div class='add'>+</div><div class='add'>+/* Lowest firmware API version supported */</div><div class='add'>+#define IL4965_UCODE_API_MIN 2</div><div class='add'>+</div><div class='add'>+#define IL4965_FW_PRE "iwlwifi-4965-"</div><div class='add'>+#define _IL4965_MODULE_FIRMWARE(api) IL4965_FW_PRE #api ".ucode"</div><div class='add'>+#define IL4965_MODULE_FIRMWARE(api) _IL4965_MODULE_FIRMWARE(api)</div><div class='add'>+</div><div class='add'>+/* check contents of special bootstrap uCode SRAM */</div><div class='add'>+static int</div><div class='add'>+il4965_verify_bsm(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	__le32 *image = il-&gt;ucode_boot.v_addr;</div><div class='add'>+	u32 len = il-&gt;ucode_boot.len;</div><div class='add'>+	u32 reg;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	D_INFO("Begin verify bsm\n");</div><div class='add'>+</div><div class='add'>+	/* verify BSM SRAM contents */</div><div class='add'>+	val = il_rd_prph(il, BSM_WR_DWCOUNT_REG);</div><div class='add'>+	for (reg = BSM_SRAM_LOWER_BOUND; reg &lt; BSM_SRAM_LOWER_BOUND + len;</div><div class='add'>+	     reg += sizeof(u32), image++) {</div><div class='add'>+		val = il_rd_prph(il, reg);</div><div class='add'>+		if (val != le32_to_cpu(*image)) {</div><div class='add'>+			IL_ERR("BSM uCode verification failed at "</div><div class='add'>+			       "addr 0x%08X+%u (of %u), is 0x%x, s/b 0x%x\n",</div><div class='add'>+			       BSM_SRAM_LOWER_BOUND, reg - BSM_SRAM_LOWER_BOUND,</div><div class='add'>+			       len, val, le32_to_cpu(*image));</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_INFO("BSM bootstrap uCode image OK\n");</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'>+ * il4965_load_bsm - Load bootstrap instructions</div><div class='add'>+ *</div><div class='add'>+ * BSM operation:</div><div class='add'>+ *</div><div class='add'>+ * The Bootstrap State Machine (BSM) stores a short bootstrap uCode program</div><div class='add'>+ * in special SRAM that does not power down during RFKILL.  When powering back</div><div class='add'>+ * up after power-saving sleeps (or during initial uCode load), the BSM loads</div><div class='add'>+ * the bootstrap program into the on-board processor, and starts it.</div><div class='add'>+ *</div><div class='add'>+ * The bootstrap program loads (via DMA) instructions and data for a new</div><div class='add'>+ * program from host DRAM locations indicated by the host driver in the</div><div class='add'>+ * BSM_DRAM_* registers.  Once the new program is loaded, it starts</div><div class='add'>+ * automatically.</div><div class='add'>+ *</div><div class='add'>+ * When initializing the NIC, the host driver points the BSM to the</div><div class='add'>+ * "initialize" uCode image.  This uCode sets up some internal data, then</div><div class='add'>+ * notifies host via "initialize alive" that it is complete.</div><div class='add'>+ *</div><div class='add'>+ * The host then replaces the BSM_DRAM_* pointer values to point to the</div><div class='add'>+ * normal runtime uCode instructions and a backup uCode data cache buffer</div><div class='add'>+ * (filled initially with starting data values for the on-board processor),</div><div class='add'>+ * then triggers the "initialize" uCode to load and launch the runtime uCode,</div><div class='add'>+ * which begins normal operation.</div><div class='add'>+ *</div><div class='add'>+ * When doing a power-save shutdown, runtime uCode saves data SRAM into</div><div class='add'>+ * the backup data cache in DRAM before SRAM is powered down.</div><div class='add'>+ *</div><div class='add'>+ * When powering back up, the BSM loads the bootstrap program.  This reloads</div><div class='add'>+ * the runtime uCode instructions and the backup data cache into SRAM,</div><div class='add'>+ * and re-launches the runtime uCode from where it left off.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_load_bsm(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	__le32 *image = il-&gt;ucode_boot.v_addr;</div><div class='add'>+	u32 len = il-&gt;ucode_boot.len;</div><div class='add'>+	dma_addr_t pinst;</div><div class='add'>+	dma_addr_t pdata;</div><div class='add'>+	u32 inst_len;</div><div class='add'>+	u32 data_len;</div><div class='add'>+	int i;</div><div class='add'>+	u32 done;</div><div class='add'>+	u32 reg_offset;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	D_INFO("Begin load bsm\n");</div><div class='add'>+</div><div class='add'>+	il-&gt;ucode_type = UCODE_RT;</div><div class='add'>+</div><div class='add'>+	/* make sure bootstrap program is no larger than BSM's SRAM size */</div><div class='add'>+	if (len &gt; IL49_MAX_BSM_SIZE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Tell bootstrap uCode where to find the "Initialize" uCode</div><div class='add'>+	 *   in host DRAM ... host DRAM physical address bits 35:4 for 4965.</div><div class='add'>+	 * NOTE:  il_init_alive_start() will replace these values,</div><div class='add'>+	 *        after the "initialize" uCode has run, to point to</div><div class='add'>+	 *        runtime/protocol instructions and backup data cache.</div><div class='add'>+	 */</div><div class='add'>+	pinst = il-&gt;ucode_init.p_addr &gt;&gt; 4;</div><div class='add'>+	pdata = il-&gt;ucode_init_data.p_addr &gt;&gt; 4;</div><div class='add'>+	inst_len = il-&gt;ucode_init.len;</div><div class='add'>+	data_len = il-&gt;ucode_init_data.len;</div><div class='add'>+</div><div class='add'>+	il_wr_prph(il, BSM_DRAM_INST_PTR_REG, pinst);</div><div class='add'>+	il_wr_prph(il, BSM_DRAM_DATA_PTR_REG, pdata);</div><div class='add'>+	il_wr_prph(il, BSM_DRAM_INST_BYTECOUNT_REG, inst_len);</div><div class='add'>+	il_wr_prph(il, BSM_DRAM_DATA_BYTECOUNT_REG, data_len);</div><div class='add'>+</div><div class='add'>+	/* Fill BSM memory with bootstrap instructions */</div><div class='add'>+	for (reg_offset = BSM_SRAM_LOWER_BOUND;</div><div class='add'>+	     reg_offset &lt; BSM_SRAM_LOWER_BOUND + len;</div><div class='add'>+	     reg_offset += sizeof(u32), image++)</div><div class='add'>+		_il_wr_prph(il, reg_offset, le32_to_cpu(*image));</div><div class='add'>+</div><div class='add'>+	ret = il4965_verify_bsm(il);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Tell BSM to copy from BSM SRAM into instruction SRAM, when asked */</div><div class='add'>+	il_wr_prph(il, BSM_WR_MEM_SRC_REG, 0x0);</div><div class='add'>+	il_wr_prph(il, BSM_WR_MEM_DST_REG, IL49_RTC_INST_LOWER_BOUND);</div><div class='add'>+	il_wr_prph(il, BSM_WR_DWCOUNT_REG, len / sizeof(u32));</div><div class='add'>+</div><div class='add'>+	/* Load bootstrap code into instruction SRAM now,</div><div class='add'>+	 *   to prepare to load "initialize" uCode */</div><div class='add'>+	il_wr_prph(il, BSM_WR_CTRL_REG, BSM_WR_CTRL_REG_BIT_START);</div><div class='add'>+</div><div class='add'>+	/* Wait for load of bootstrap uCode to finish */</div><div class='add'>+	for (i = 0; i &lt; 100; i++) {</div><div class='add'>+		done = il_rd_prph(il, BSM_WR_CTRL_REG);</div><div class='add'>+		if (!(done &amp; BSM_WR_CTRL_REG_BIT_START))</div><div class='add'>+			break;</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+	if (i &lt; 100)</div><div class='add'>+		D_INFO("BSM write complete, poll %d iterations\n", i);</div><div class='add'>+	else {</div><div class='add'>+		IL_ERR("BSM write did not complete!\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable future boot loads whenever power management unit triggers it</div><div class='add'>+	 *   (e.g. when powering back up after power-save shutdown) */</div><div class='add'>+	il_wr_prph(il, BSM_WR_CTRL_REG, BSM_WR_CTRL_REG_BIT_START_EN);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_set_ucode_ptrs - Set uCode address location</div><div class='add'>+ *</div><div class='add'>+ * Tell initialization uCode where to find runtime uCode.</div><div class='add'>+ *</div><div class='add'>+ * BSM registers initially contain pointers to initialization uCode.</div><div class='add'>+ * We need to replace them to load runtime uCode inst and data,</div><div class='add'>+ * and to save runtime data when powering down.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_set_ucode_ptrs(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t pinst;</div><div class='add'>+	dma_addr_t pdata;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* bits 35:4 for 4965 */</div><div class='add'>+	pinst = il-&gt;ucode_code.p_addr &gt;&gt; 4;</div><div class='add'>+	pdata = il-&gt;ucode_data_backup.p_addr &gt;&gt; 4;</div><div class='add'>+</div><div class='add'>+	/* Tell bootstrap uCode where to find image to load */</div><div class='add'>+	il_wr_prph(il, BSM_DRAM_INST_PTR_REG, pinst);</div><div class='add'>+	il_wr_prph(il, BSM_DRAM_DATA_PTR_REG, pdata);</div><div class='add'>+	il_wr_prph(il, BSM_DRAM_DATA_BYTECOUNT_REG, il-&gt;ucode_data.len);</div><div class='add'>+</div><div class='add'>+	/* Inst byte count must be last to set up, bit 31 signals uCode</div><div class='add'>+	 *   that all new ptr/size info is in place */</div><div class='add'>+	il_wr_prph(il, BSM_DRAM_INST_BYTECOUNT_REG,</div><div class='add'>+		   il-&gt;ucode_code.len | BSM_DRAM_INST_LOAD);</div><div class='add'>+	D_INFO("Runtime uCode pointers are set.\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_init_alive_start - Called after N_ALIVE notification received</div><div class='add'>+ *</div><div class='add'>+ * Called after N_ALIVE notification received from "initialize" uCode.</div><div class='add'>+ *</div><div class='add'>+ * The 4965 "initialize" ALIVE reply contains calibration data for:</div><div class='add'>+ *   Voltage, temperature, and MIMO tx gain correction, now stored in il</div><div class='add'>+ *   (3945 does not contain this data).</div><div class='add'>+ *</div><div class='add'>+ * Tell "initialize" uCode to go ahead and load the runtime uCode.</div><div class='add'>+*/</div><div class='add'>+static void</div><div class='add'>+il4965_init_alive_start(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	/* Bootstrap uCode has loaded initialize uCode ... verify inst image.</div><div class='add'>+	 * This is a paranoid check, because we would not have gotten the</div><div class='add'>+	 * "initialize" alive if code weren't properly loaded.  */</div><div class='add'>+	if (il4965_verify_ucode(il)) {</div><div class='add'>+		/* Runtime instruction load was bad;</div><div class='add'>+		 * take it all the way back down so we can try again */</div><div class='add'>+		D_INFO("Bad \"initialize\" uCode load.\n");</div><div class='add'>+		goto restart;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Calculate temperature */</div><div class='add'>+	il-&gt;temperature = il4965_hw_get_temperature(il);</div><div class='add'>+</div><div class='add'>+	/* Send pointers to protocol/runtime uCode image ... init code will</div><div class='add'>+	 * load and launch runtime uCode, which will send us another "Alive"</div><div class='add'>+	 * notification. */</div><div class='add'>+	D_INFO("Initialization Alive received.\n");</div><div class='add'>+	if (il4965_set_ucode_ptrs(il)) {</div><div class='add'>+		/* Runtime instruction load won't happen;</div><div class='add'>+		 * take it all the way back down so we can try again */</div><div class='add'>+		D_INFO("Couldn't set up uCode pointers.\n");</div><div class='add'>+		goto restart;</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+restart:</div><div class='add'>+	queue_work(il-&gt;workqueue, &amp;il-&gt;restart);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+iw4965_is_ht40_channel(__le32 rxon_flags)</div><div class='add'>+{</div><div class='add'>+	int chan_mod =</div><div class='add'>+	    le32_to_cpu(rxon_flags &amp; RXON_FLG_CHANNEL_MODE_MSK) &gt;&gt;</div><div class='add'>+	    RXON_FLG_CHANNEL_MODE_POS;</div><div class='add'>+	return (chan_mod == CHANNEL_MODE_PURE_40 ||</div><div class='add'>+		chan_mod == CHANNEL_MODE_MIXED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_nic_config(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 radio_cfg;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	radio_cfg = il_eeprom_query16(il, EEPROM_RADIO_CONFIG);</div><div class='add'>+</div><div class='add'>+	/* write radio config values to register */</div><div class='add'>+	if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) == EEPROM_4965_RF_CFG_TYPE_MAX)</div><div class='add'>+		il_set_bit(il, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+			   EEPROM_RF_CFG_TYPE_MSK(radio_cfg) |</div><div class='add'>+			   EEPROM_RF_CFG_STEP_MSK(radio_cfg) |</div><div class='add'>+			   EEPROM_RF_CFG_DASH_MSK(radio_cfg));</div><div class='add'>+</div><div class='add'>+	/* set CSR_HW_CONFIG_REG for uCode use */</div><div class='add'>+	il_set_bit(il, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+		   CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |</div><div class='add'>+		   CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);</div><div class='add'>+</div><div class='add'>+	il-&gt;calib_info =</div><div class='add'>+	    (struct il_eeprom_calib_info *)</div><div class='add'>+	    il_eeprom_query_addr(il, EEPROM_4965_CALIB_TXPOWER_OFFSET);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Reset differential Rx gains in NIC to prepare for chain noise calibration.</div><div class='add'>+ * Called after every association, but this runs only once!</div><div class='add'>+ *  ... once chain noise is calibrated the first time, it's good forever.  */</div><div class='add'>+static void</div><div class='add'>+il4965_chain_noise_reset(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_chain_noise_data *data = &amp;(il-&gt;chain_noise_data);</div><div class='add'>+</div><div class='add'>+	if (data-&gt;state == IL_CHAIN_NOISE_ALIVE &amp;&amp; il_is_any_associated(il)) {</div><div class='add'>+		struct il_calib_diff_gain_cmd cmd;</div><div class='add'>+</div><div class='add'>+		/* clear data for chain noise calibration algorithm */</div><div class='add'>+		data-&gt;chain_noise_a = 0;</div><div class='add'>+		data-&gt;chain_noise_b = 0;</div><div class='add'>+		data-&gt;chain_noise_c = 0;</div><div class='add'>+		data-&gt;chain_signal_a = 0;</div><div class='add'>+		data-&gt;chain_signal_b = 0;</div><div class='add'>+		data-&gt;chain_signal_c = 0;</div><div class='add'>+		data-&gt;beacon_count = 0;</div><div class='add'>+</div><div class='add'>+		memset(&amp;cmd, 0, sizeof(cmd));</div><div class='add'>+		cmd.hdr.op_code = IL_PHY_CALIBRATE_DIFF_GAIN_CMD;</div><div class='add'>+		cmd.diff_gain_a = 0;</div><div class='add'>+		cmd.diff_gain_b = 0;</div><div class='add'>+		cmd.diff_gain_c = 0;</div><div class='add'>+		if (il_send_cmd_pdu(il, C_PHY_CALIBRATION, sizeof(cmd), &amp;cmd))</div><div class='add'>+			IL_ERR("Could not send C_PHY_CALIBRATION\n");</div><div class='add'>+		data-&gt;state = IL_CHAIN_NOISE_ACCUMULATE;</div><div class='add'>+		D_CALIB("Run chain_noise_calibrate\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct il_sensitivity_ranges il4965_sensitivity = {</div><div class='add'>+	.min_nrg_cck = 97,</div><div class='add'>+	.max_nrg_cck = 0,	/* not used, set to 0 */</div><div class='add'>+</div><div class='add'>+	.auto_corr_min_ofdm = 85,</div><div class='add'>+	.auto_corr_min_ofdm_mrc = 170,</div><div class='add'>+	.auto_corr_min_ofdm_x1 = 105,</div><div class='add'>+	.auto_corr_min_ofdm_mrc_x1 = 220,</div><div class='add'>+</div><div class='add'>+	.auto_corr_max_ofdm = 120,</div><div class='add'>+	.auto_corr_max_ofdm_mrc = 210,</div><div class='add'>+	.auto_corr_max_ofdm_x1 = 140,</div><div class='add'>+	.auto_corr_max_ofdm_mrc_x1 = 270,</div><div class='add'>+</div><div class='add'>+	.auto_corr_min_cck = 125,</div><div class='add'>+	.auto_corr_max_cck = 200,</div><div class='add'>+	.auto_corr_min_cck_mrc = 200,</div><div class='add'>+	.auto_corr_max_cck_mrc = 400,</div><div class='add'>+</div><div class='add'>+	.nrg_th_cck = 100,</div><div class='add'>+	.nrg_th_ofdm = 100,</div><div class='add'>+</div><div class='add'>+	.barker_corr_th_min = 190,</div><div class='add'>+	.barker_corr_th_min_mrc = 390,</div><div class='add'>+	.nrg_th_cca = 62,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_set_ct_threshold(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	/* want Kelvin */</div><div class='add'>+	il-&gt;hw_params.ct_kill_threshold =</div><div class='add'>+	    CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD_LEGACY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_hw_set_hw_params</div><div class='add'>+ *</div><div class='add'>+ * Called when initializing driver</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_hw_set_hw_params(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	if (il-&gt;cfg-&gt;mod_params-&gt;num_of_queues &gt;= IL_MIN_NUM_QUEUES &amp;&amp;</div><div class='add'>+	    il-&gt;cfg-&gt;mod_params-&gt;num_of_queues &lt;= IL49_NUM_QUEUES)</div><div class='add'>+		il-&gt;cfg-&gt;base_params-&gt;num_of_queues =</div><div class='add'>+		    il-&gt;cfg-&gt;mod_params-&gt;num_of_queues;</div><div class='add'>+</div><div class='add'>+	il-&gt;hw_params.max_txq_num = il-&gt;cfg-&gt;base_params-&gt;num_of_queues;</div><div class='add'>+	il-&gt;hw_params.dma_chnl_num = FH49_TCSR_CHNL_NUM;</div><div class='add'>+	il-&gt;hw_params.scd_bc_tbls_size =</div><div class='add'>+	    il-&gt;cfg-&gt;base_params-&gt;num_of_queues *</div><div class='add'>+	    sizeof(struct il4965_scd_bc_tbl);</div><div class='add'>+	il-&gt;hw_params.tfd_size = sizeof(struct il_tfd);</div><div class='add'>+	il-&gt;hw_params.max_stations = IL4965_STATION_COUNT;</div><div class='add'>+	il-&gt;ctx.bcast_sta_id = IL4965_BROADCAST_ID;</div><div class='add'>+	il-&gt;hw_params.max_data_size = IL49_RTC_DATA_SIZE;</div><div class='add'>+	il-&gt;hw_params.max_inst_size = IL49_RTC_INST_SIZE;</div><div class='add'>+	il-&gt;hw_params.max_bsm_size = BSM_SRAM_SIZE;</div><div class='add'>+	il-&gt;hw_params.ht40_channel = BIT(IEEE80211_BAND_5GHZ);</div><div class='add'>+</div><div class='add'>+	il-&gt;hw_params.rx_wrt_ptr_reg = FH49_RSCSR_CHNL0_WPTR;</div><div class='add'>+</div><div class='add'>+	il-&gt;hw_params.tx_chains_num = il4965_num_of_ant(il-&gt;cfg-&gt;valid_tx_ant);</div><div class='add'>+	il-&gt;hw_params.rx_chains_num = il4965_num_of_ant(il-&gt;cfg-&gt;valid_rx_ant);</div><div class='add'>+	il-&gt;hw_params.valid_tx_ant = il-&gt;cfg-&gt;valid_tx_ant;</div><div class='add'>+	il-&gt;hw_params.valid_rx_ant = il-&gt;cfg-&gt;valid_rx_ant;</div><div class='add'>+</div><div class='add'>+	il4965_set_ct_threshold(il);</div><div class='add'>+</div><div class='add'>+	il-&gt;hw_params.sens = &amp;il4965_sensitivity;</div><div class='add'>+	il-&gt;hw_params.beacon_time_tsf_bits = IL4965_EXT_BEACON_TIME_POS;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static s32</div><div class='add'>+il4965_math_div_round(s32 num, s32 denom, s32 * res)</div><div class='add'>+{</div><div class='add'>+	s32 sign = 1;</div><div class='add'>+</div><div class='add'>+	if (num &lt; 0) {</div><div class='add'>+		sign = -sign;</div><div class='add'>+		num = -num;</div><div class='add'>+	}</div><div class='add'>+	if (denom &lt; 0) {</div><div class='add'>+		sign = -sign;</div><div class='add'>+		denom = -denom;</div><div class='add'>+	}</div><div class='add'>+	*res = 1;</div><div class='add'>+	*res = ((num * 2 + denom) / (denom * 2)) * sign;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_get_voltage_compensation - Power supply voltage comp for txpower</div><div class='add'>+ *</div><div class='add'>+ * Determines power supply voltage compensation for txpower calculations.</div><div class='add'>+ * Returns number of 1/2-dB steps to subtract from gain table idx,</div><div class='add'>+ * to compensate for difference between power supply voltage during</div><div class='add'>+ * factory measurements, vs. current power supply voltage.</div><div class='add'>+ *</div><div class='add'>+ * Voltage indication is higher for lower voltage.</div><div class='add'>+ * Lower voltage requires more gain (lower gain table idx).</div><div class='add'>+ */</div><div class='add'>+static s32</div><div class='add'>+il4965_get_voltage_compensation(s32 eeprom_voltage, s32 current_voltage)</div><div class='add'>+{</div><div class='add'>+	s32 comp = 0;</div><div class='add'>+</div><div class='add'>+	if (TX_POWER_IL_ILLEGAL_VOLTAGE == eeprom_voltage ||</div><div class='add'>+	    TX_POWER_IL_ILLEGAL_VOLTAGE == current_voltage)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	il4965_math_div_round(current_voltage - eeprom_voltage,</div><div class='add'>+			      TX_POWER_IL_VOLTAGE_CODES_PER_03V, &amp;comp);</div><div class='add'>+</div><div class='add'>+	if (current_voltage &gt; eeprom_voltage)</div><div class='add'>+		comp *= 2;</div><div class='add'>+	if ((comp &lt; -2) || (comp &gt; 2))</div><div class='add'>+		comp = 0;</div><div class='add'>+</div><div class='add'>+	return comp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static s32</div><div class='add'>+il4965_get_tx_atten_grp(u16 channel)</div><div class='add'>+{</div><div class='add'>+	if (channel &gt;= CALIB_IL_TX_ATTEN_GR5_FCH &amp;&amp;</div><div class='add'>+	    channel &lt;= CALIB_IL_TX_ATTEN_GR5_LCH)</div><div class='add'>+		return CALIB_CH_GROUP_5;</div><div class='add'>+</div><div class='add'>+	if (channel &gt;= CALIB_IL_TX_ATTEN_GR1_FCH &amp;&amp;</div><div class='add'>+	    channel &lt;= CALIB_IL_TX_ATTEN_GR1_LCH)</div><div class='add'>+		return CALIB_CH_GROUP_1;</div><div class='add'>+</div><div class='add'>+	if (channel &gt;= CALIB_IL_TX_ATTEN_GR2_FCH &amp;&amp;</div><div class='add'>+	    channel &lt;= CALIB_IL_TX_ATTEN_GR2_LCH)</div><div class='add'>+		return CALIB_CH_GROUP_2;</div><div class='add'>+</div><div class='add'>+	if (channel &gt;= CALIB_IL_TX_ATTEN_GR3_FCH &amp;&amp;</div><div class='add'>+	    channel &lt;= CALIB_IL_TX_ATTEN_GR3_LCH)</div><div class='add'>+		return CALIB_CH_GROUP_3;</div><div class='add'>+</div><div class='add'>+	if (channel &gt;= CALIB_IL_TX_ATTEN_GR4_FCH &amp;&amp;</div><div class='add'>+	    channel &lt;= CALIB_IL_TX_ATTEN_GR4_LCH)</div><div class='add'>+		return CALIB_CH_GROUP_4;</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+il4965_get_sub_band(const struct il_priv *il, u32 channel)</div><div class='add'>+{</div><div class='add'>+	s32 b = -1;</div><div class='add'>+</div><div class='add'>+	for (b = 0; b &lt; EEPROM_TX_POWER_BANDS; b++) {</div><div class='add'>+		if (il-&gt;calib_info-&gt;band_info[b].ch_from == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (channel &gt;= il-&gt;calib_info-&gt;band_info[b].ch_from &amp;&amp;</div><div class='add'>+		    channel &lt;= il-&gt;calib_info-&gt;band_info[b].ch_to)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static s32</div><div class='add'>+il4965_interpolate_value(s32 x, s32 x1, s32 y1, s32 x2, s32 y2)</div><div class='add'>+{</div><div class='add'>+	s32 val;</div><div class='add'>+</div><div class='add'>+	if (x2 == x1)</div><div class='add'>+		return y1;</div><div class='add'>+	else {</div><div class='add'>+		il4965_math_div_round((x2 - x) * (y1 - y2), (x2 - x1), &amp;val);</div><div class='add'>+		return val + y2;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_interpolate_chan - Interpolate factory measurements for one channel</div><div class='add'>+ *</div><div class='add'>+ * Interpolates factory measurements from the two sample channels within a</div><div class='add'>+ * sub-band, to apply to channel of interest.  Interpolation is proportional to</div><div class='add'>+ * differences in channel frequencies, which is proportional to differences</div><div class='add'>+ * in channel number.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_interpolate_chan(struct il_priv *il, u32 channel,</div><div class='add'>+			struct il_eeprom_calib_ch_info *chan_info)</div><div class='add'>+{</div><div class='add'>+	s32 s = -1;</div><div class='add'>+	u32 c;</div><div class='add'>+	u32 m;</div><div class='add'>+	const struct il_eeprom_calib_measure *m1;</div><div class='add'>+	const struct il_eeprom_calib_measure *m2;</div><div class='add'>+	struct il_eeprom_calib_measure *omeas;</div><div class='add'>+	u32 ch_i1;</div><div class='add'>+	u32 ch_i2;</div><div class='add'>+</div><div class='add'>+	s = il4965_get_sub_band(il, channel);</div><div class='add'>+	if (s &gt;= EEPROM_TX_POWER_BANDS) {</div><div class='add'>+		IL_ERR("Tx Power can not find channel %d\n", channel);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ch_i1 = il-&gt;calib_info-&gt;band_info[s].ch1.ch_num;</div><div class='add'>+	ch_i2 = il-&gt;calib_info-&gt;band_info[s].ch2.ch_num;</div><div class='add'>+	chan_info-&gt;ch_num = (u8) channel;</div><div class='add'>+</div><div class='add'>+	D_TXPOWER("channel %d subband %d factory cal ch %d &amp; %d\n", channel, s,</div><div class='add'>+		  ch_i1, ch_i2);</div><div class='add'>+</div><div class='add'>+	for (c = 0; c &lt; EEPROM_TX_POWER_TX_CHAINS; c++) {</div><div class='add'>+		for (m = 0; m &lt; EEPROM_TX_POWER_MEASUREMENTS; m++) {</div><div class='add'>+			m1 = &amp;(il-&gt;calib_info-&gt;band_info[s].ch1.</div><div class='add'>+			       measurements[c][m]);</div><div class='add'>+			m2 = &amp;(il-&gt;calib_info-&gt;band_info[s].ch2.</div><div class='add'>+			       measurements[c][m]);</div><div class='add'>+			omeas = &amp;(chan_info-&gt;measurements[c][m]);</div><div class='add'>+</div><div class='add'>+			omeas-&gt;actual_pow =</div><div class='add'>+			    (u8) il4965_interpolate_value(channel, ch_i1,</div><div class='add'>+							  m1-&gt;actual_pow, ch_i2,</div><div class='add'>+							  m2-&gt;actual_pow);</div><div class='add'>+			omeas-&gt;gain_idx =</div><div class='add'>+			    (u8) il4965_interpolate_value(channel, ch_i1,</div><div class='add'>+							  m1-&gt;gain_idx, ch_i2,</div><div class='add'>+							  m2-&gt;gain_idx);</div><div class='add'>+			omeas-&gt;temperature =</div><div class='add'>+			    (u8) il4965_interpolate_value(channel, ch_i1,</div><div class='add'>+							  m1-&gt;temperature,</div><div class='add'>+							  ch_i2,</div><div class='add'>+							  m2-&gt;temperature);</div><div class='add'>+			omeas-&gt;pa_det =</div><div class='add'>+			    (s8) il4965_interpolate_value(channel, ch_i1,</div><div class='add'>+							  m1-&gt;pa_det, ch_i2,</div><div class='add'>+							  m2-&gt;pa_det);</div><div class='add'>+</div><div class='add'>+			D_TXPOWER("chain %d meas %d AP1=%d AP2=%d AP=%d\n", c,</div><div class='add'>+				  m, m1-&gt;actual_pow, m2-&gt;actual_pow,</div><div class='add'>+				  omeas-&gt;actual_pow);</div><div class='add'>+			D_TXPOWER("chain %d meas %d NI1=%d NI2=%d NI=%d\n", c,</div><div class='add'>+				  m, m1-&gt;gain_idx, m2-&gt;gain_idx,</div><div class='add'>+				  omeas-&gt;gain_idx);</div><div class='add'>+			D_TXPOWER("chain %d meas %d PA1=%d PA2=%d PA=%d\n", c,</div><div class='add'>+				  m, m1-&gt;pa_det, m2-&gt;pa_det, omeas-&gt;pa_det);</div><div class='add'>+			D_TXPOWER("chain %d meas %d  T1=%d  T2=%d  T=%d\n", c,</div><div class='add'>+				  m, m1-&gt;temperature, m2-&gt;temperature,</div><div class='add'>+				  omeas-&gt;temperature);</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'>+/* bit-rate-dependent table to prevent Tx distortion, in half-dB units,</div><div class='add'>+ * for OFDM 6, 12, 18, 24, 36, 48, 54, 60 MBit, and CCK all rates. */</div><div class='add'>+static s32 back_off_table[] = {</div><div class='add'>+	10, 10, 10, 10, 10, 15, 17, 20,	/* OFDM SISO 20 MHz */</div><div class='add'>+	10, 10, 10, 10, 10, 15, 17, 20,	/* OFDM MIMO 20 MHz */</div><div class='add'>+	10, 10, 10, 10, 10, 15, 17, 20,	/* OFDM SISO 40 MHz */</div><div class='add'>+	10, 10, 10, 10, 10, 15, 17, 20,	/* OFDM MIMO 40 MHz */</div><div class='add'>+	10			/* CCK */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Thermal compensation values for txpower for various frequency ranges ...</div><div class='add'>+ *   ratios from 3:1 to 4.5:1 of degrees (Celsius) per half-dB gain adjust */</div><div class='add'>+static struct il4965_txpower_comp_entry {</div><div class='add'>+	s32 degrees_per_05db_a;</div><div class='add'>+	s32 degrees_per_05db_a_denom;</div><div class='add'>+} tx_power_cmp_tble[CALIB_CH_GROUP_MAX] = {</div><div class='add'>+	{</div><div class='add'>+	9, 2},			/* group 0 5.2, ch  34-43 */</div><div class='add'>+	{</div><div class='add'>+	4, 1},			/* group 1 5.2, ch  44-70 */</div><div class='add'>+	{</div><div class='add'>+	4, 1},			/* group 2 5.2, ch  71-124 */</div><div class='add'>+	{</div><div class='add'>+	4, 1},			/* group 3 5.2, ch 125-200 */</div><div class='add'>+	{</div><div class='add'>+	3, 1}			/* group 4 2.4, ch   all */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static s32</div><div class='add'>+get_min_power_idx(s32 rate_power_idx, u32 band)</div><div class='add'>+{</div><div class='add'>+	if (!band) {</div><div class='add'>+		if ((rate_power_idx &amp; 7) &lt;= 4)</div><div class='add'>+			return MIN_TX_GAIN_IDX_52GHZ_EXT;</div><div class='add'>+	}</div><div class='add'>+	return MIN_TX_GAIN_IDX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct gain_entry {</div><div class='add'>+	u8 dsp;</div><div class='add'>+	u8 radio;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gain_entry gain_table[2][108] = {</div><div class='add'>+	/* 5.2GHz power gain idx table */</div><div class='add'>+	{</div><div class='add'>+	 {123, 0x3F},		/* highest txpower */</div><div class='add'>+	 {117, 0x3F},</div><div class='add'>+	 {110, 0x3F},</div><div class='add'>+	 {104, 0x3F},</div><div class='add'>+	 {98, 0x3F},</div><div class='add'>+	 {110, 0x3E},</div><div class='add'>+	 {104, 0x3E},</div><div class='add'>+	 {98, 0x3E},</div><div class='add'>+	 {110, 0x3D},</div><div class='add'>+	 {104, 0x3D},</div><div class='add'>+	 {98, 0x3D},</div><div class='add'>+	 {110, 0x3C},</div><div class='add'>+	 {104, 0x3C},</div><div class='add'>+	 {98, 0x3C},</div><div class='add'>+	 {110, 0x3B},</div><div class='add'>+	 {104, 0x3B},</div><div class='add'>+	 {98, 0x3B},</div><div class='add'>+	 {110, 0x3A},</div><div class='add'>+	 {104, 0x3A},</div><div class='add'>+	 {98, 0x3A},</div><div class='add'>+	 {110, 0x39},</div><div class='add'>+	 {104, 0x39},</div><div class='add'>+	 {98, 0x39},</div><div class='add'>+	 {110, 0x38},</div><div class='add'>+	 {104, 0x38},</div><div class='add'>+	 {98, 0x38},</div><div class='add'>+	 {110, 0x37},</div><div class='add'>+	 {104, 0x37},</div><div class='add'>+	 {98, 0x37},</div><div class='add'>+	 {110, 0x36},</div><div class='add'>+	 {104, 0x36},</div><div class='add'>+	 {98, 0x36},</div><div class='add'>+	 {110, 0x35},</div><div class='add'>+	 {104, 0x35},</div><div class='add'>+	 {98, 0x35},</div><div class='add'>+	 {110, 0x34},</div><div class='add'>+	 {104, 0x34},</div><div class='add'>+	 {98, 0x34},</div><div class='add'>+	 {110, 0x33},</div><div class='add'>+	 {104, 0x33},</div><div class='add'>+	 {98, 0x33},</div><div class='add'>+	 {110, 0x32},</div><div class='add'>+	 {104, 0x32},</div><div class='add'>+	 {98, 0x32},</div><div class='add'>+	 {110, 0x31},</div><div class='add'>+	 {104, 0x31},</div><div class='add'>+	 {98, 0x31},</div><div class='add'>+	 {110, 0x30},</div><div class='add'>+	 {104, 0x30},</div><div class='add'>+	 {98, 0x30},</div><div class='add'>+	 {110, 0x25},</div><div class='add'>+	 {104, 0x25},</div><div class='add'>+	 {98, 0x25},</div><div class='add'>+	 {110, 0x24},</div><div class='add'>+	 {104, 0x24},</div><div class='add'>+	 {98, 0x24},</div><div class='add'>+	 {110, 0x23},</div><div class='add'>+	 {104, 0x23},</div><div class='add'>+	 {98, 0x23},</div><div class='add'>+	 {110, 0x22},</div><div class='add'>+	 {104, 0x18},</div><div class='add'>+	 {98, 0x18},</div><div class='add'>+	 {110, 0x17},</div><div class='add'>+	 {104, 0x17},</div><div class='add'>+	 {98, 0x17},</div><div class='add'>+	 {110, 0x16},</div><div class='add'>+	 {104, 0x16},</div><div class='add'>+	 {98, 0x16},</div><div class='add'>+	 {110, 0x15},</div><div class='add'>+	 {104, 0x15},</div><div class='add'>+	 {98, 0x15},</div><div class='add'>+	 {110, 0x14},</div><div class='add'>+	 {104, 0x14},</div><div class='add'>+	 {98, 0x14},</div><div class='add'>+	 {110, 0x13},</div><div class='add'>+	 {104, 0x13},</div><div class='add'>+	 {98, 0x13},</div><div class='add'>+	 {110, 0x12},</div><div class='add'>+	 {104, 0x08},</div><div class='add'>+	 {98, 0x08},</div><div class='add'>+	 {110, 0x07},</div><div class='add'>+	 {104, 0x07},</div><div class='add'>+	 {98, 0x07},</div><div class='add'>+	 {110, 0x06},</div><div class='add'>+	 {104, 0x06},</div><div class='add'>+	 {98, 0x06},</div><div class='add'>+	 {110, 0x05},</div><div class='add'>+	 {104, 0x05},</div><div class='add'>+	 {98, 0x05},</div><div class='add'>+	 {110, 0x04},</div><div class='add'>+	 {104, 0x04},</div><div class='add'>+	 {98, 0x04},</div><div class='add'>+	 {110, 0x03},</div><div class='add'>+	 {104, 0x03},</div><div class='add'>+	 {98, 0x03},</div><div class='add'>+	 {110, 0x02},</div><div class='add'>+	 {104, 0x02},</div><div class='add'>+	 {98, 0x02},</div><div class='add'>+	 {110, 0x01},</div><div class='add'>+	 {104, 0x01},</div><div class='add'>+	 {98, 0x01},</div><div class='add'>+	 {110, 0x00},</div><div class='add'>+	 {104, 0x00},</div><div class='add'>+	 {98, 0x00},</div><div class='add'>+	 {93, 0x00},</div><div class='add'>+	 {88, 0x00},</div><div class='add'>+	 {83, 0x00},</div><div class='add'>+	 {78, 0x00},</div><div class='add'>+	 },</div><div class='add'>+	/* 2.4GHz power gain idx table */</div><div class='add'>+	{</div><div class='add'>+	 {110, 0x3f},		/* highest txpower */</div><div class='add'>+	 {104, 0x3f},</div><div class='add'>+	 {98, 0x3f},</div><div class='add'>+	 {110, 0x3e},</div><div class='add'>+	 {104, 0x3e},</div><div class='add'>+	 {98, 0x3e},</div><div class='add'>+	 {110, 0x3d},</div><div class='add'>+	 {104, 0x3d},</div><div class='add'>+	 {98, 0x3d},</div><div class='add'>+	 {110, 0x3c},</div><div class='add'>+	 {104, 0x3c},</div><div class='add'>+	 {98, 0x3c},</div><div class='add'>+	 {110, 0x3b},</div><div class='add'>+	 {104, 0x3b},</div><div class='add'>+	 {98, 0x3b},</div><div class='add'>+	 {110, 0x3a},</div><div class='add'>+	 {104, 0x3a},</div><div class='add'>+	 {98, 0x3a},</div><div class='add'>+	 {110, 0x39},</div><div class='add'>+	 {104, 0x39},</div><div class='add'>+	 {98, 0x39},</div><div class='add'>+	 {110, 0x38},</div><div class='add'>+	 {104, 0x38},</div><div class='add'>+	 {98, 0x38},</div><div class='add'>+	 {110, 0x37},</div><div class='add'>+	 {104, 0x37},</div><div class='add'>+	 {98, 0x37},</div><div class='add'>+	 {110, 0x36},</div><div class='add'>+	 {104, 0x36},</div><div class='add'>+	 {98, 0x36},</div><div class='add'>+	 {110, 0x35},</div><div class='add'>+	 {104, 0x35},</div><div class='add'>+	 {98, 0x35},</div><div class='add'>+	 {110, 0x34},</div><div class='add'>+	 {104, 0x34},</div><div class='add'>+	 {98, 0x34},</div><div class='add'>+	 {110, 0x33},</div><div class='add'>+	 {104, 0x33},</div><div class='add'>+	 {98, 0x33},</div><div class='add'>+	 {110, 0x32},</div><div class='add'>+	 {104, 0x32},</div><div class='add'>+	 {98, 0x32},</div><div class='add'>+	 {110, 0x31},</div><div class='add'>+	 {104, 0x31},</div><div class='add'>+	 {98, 0x31},</div><div class='add'>+	 {110, 0x30},</div><div class='add'>+	 {104, 0x30},</div><div class='add'>+	 {98, 0x30},</div><div class='add'>+	 {110, 0x6},</div><div class='add'>+	 {104, 0x6},</div><div class='add'>+	 {98, 0x6},</div><div class='add'>+	 {110, 0x5},</div><div class='add'>+	 {104, 0x5},</div><div class='add'>+	 {98, 0x5},</div><div class='add'>+	 {110, 0x4},</div><div class='add'>+	 {104, 0x4},</div><div class='add'>+	 {98, 0x4},</div><div class='add'>+	 {110, 0x3},</div><div class='add'>+	 {104, 0x3},</div><div class='add'>+	 {98, 0x3},</div><div class='add'>+	 {110, 0x2},</div><div class='add'>+	 {104, 0x2},</div><div class='add'>+	 {98, 0x2},</div><div class='add'>+	 {110, 0x1},</div><div class='add'>+	 {104, 0x1},</div><div class='add'>+	 {98, 0x1},</div><div class='add'>+	 {110, 0x0},</div><div class='add'>+	 {104, 0x0},</div><div class='add'>+	 {98, 0x0},</div><div class='add'>+	 {97, 0},</div><div class='add'>+	 {96, 0},</div><div class='add'>+	 {95, 0},</div><div class='add'>+	 {94, 0},</div><div class='add'>+	 {93, 0},</div><div class='add'>+	 {92, 0},</div><div class='add'>+	 {91, 0},</div><div class='add'>+	 {90, 0},</div><div class='add'>+	 {89, 0},</div><div class='add'>+	 {88, 0},</div><div class='add'>+	 {87, 0},</div><div class='add'>+	 {86, 0},</div><div class='add'>+	 {85, 0},</div><div class='add'>+	 {84, 0},</div><div class='add'>+	 {83, 0},</div><div class='add'>+	 {82, 0},</div><div class='add'>+	 {81, 0},</div><div class='add'>+	 {80, 0},</div><div class='add'>+	 {79, 0},</div><div class='add'>+	 {78, 0},</div><div class='add'>+	 {77, 0},</div><div class='add'>+	 {76, 0},</div><div class='add'>+	 {75, 0},</div><div class='add'>+	 {74, 0},</div><div class='add'>+	 {73, 0},</div><div class='add'>+	 {72, 0},</div><div class='add'>+	 {71, 0},</div><div class='add'>+	 {70, 0},</div><div class='add'>+	 {69, 0},</div><div class='add'>+	 {68, 0},</div><div class='add'>+	 {67, 0},</div><div class='add'>+	 {66, 0},</div><div class='add'>+	 {65, 0},</div><div class='add'>+	 {64, 0},</div><div class='add'>+	 {63, 0},</div><div class='add'>+	 {62, 0},</div><div class='add'>+	 {61, 0},</div><div class='add'>+	 {60, 0},</div><div class='add'>+	 {59, 0},</div><div class='add'>+	 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il4965_fill_txpower_tbl(struct il_priv *il, u8 band, u16 channel, u8 is_ht40,</div><div class='add'>+			u8 ctrl_chan_high,</div><div class='add'>+			struct il4965_tx_power_db *tx_power_tbl)</div><div class='add'>+{</div><div class='add'>+	u8 saturation_power;</div><div class='add'>+	s32 target_power;</div><div class='add'>+	s32 user_target_power;</div><div class='add'>+	s32 power_limit;</div><div class='add'>+	s32 current_temp;</div><div class='add'>+	s32 reg_limit;</div><div class='add'>+	s32 current_regulatory;</div><div class='add'>+	s32 txatten_grp = CALIB_CH_GROUP_MAX;</div><div class='add'>+	int i;</div><div class='add'>+	int c;</div><div class='add'>+	const struct il_channel_info *ch_info = NULL;</div><div class='add'>+	struct il_eeprom_calib_ch_info ch_eeprom_info;</div><div class='add'>+	const struct il_eeprom_calib_measure *measurement;</div><div class='add'>+	s16 voltage;</div><div class='add'>+	s32 init_voltage;</div><div class='add'>+	s32 voltage_compensation;</div><div class='add'>+	s32 degrees_per_05db_num;</div><div class='add'>+	s32 degrees_per_05db_denom;</div><div class='add'>+	s32 factory_temp;</div><div class='add'>+	s32 temperature_comp[2];</div><div class='add'>+	s32 factory_gain_idx[2];</div><div class='add'>+	s32 factory_actual_pwr[2];</div><div class='add'>+	s32 power_idx;</div><div class='add'>+</div><div class='add'>+	/* tx_power_user_lmt is in dBm, convert to half-dBm (half-dB units</div><div class='add'>+	 *   are used for idxing into txpower table) */</div><div class='add'>+	user_target_power = 2 * il-&gt;tx_power_user_lmt;</div><div class='add'>+</div><div class='add'>+	/* Get current (RXON) channel, band, width */</div><div class='add'>+	D_TXPOWER("chan %d band %d is_ht40 %d\n", channel, band, is_ht40);</div><div class='add'>+</div><div class='add'>+	ch_info = il_get_channel_info(il, il-&gt;band, channel);</div><div class='add'>+</div><div class='add'>+	if (!il_is_channel_valid(ch_info))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* get txatten group, used to select 1) thermal txpower adjustment</div><div class='add'>+	 *   and 2) mimo txpower balance between Tx chains. */</div><div class='add'>+	txatten_grp = il4965_get_tx_atten_grp(channel);</div><div class='add'>+	if (txatten_grp &lt; 0) {</div><div class='add'>+		IL_ERR("Can't find txatten group for channel %d.\n", channel);</div><div class='add'>+		return txatten_grp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_TXPOWER("channel %d belongs to txatten group %d\n", channel,</div><div class='add'>+		  txatten_grp);</div><div class='add'>+</div><div class='add'>+	if (is_ht40) {</div><div class='add'>+		if (ctrl_chan_high)</div><div class='add'>+			channel -= 2;</div><div class='add'>+		else</div><div class='add'>+			channel += 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* hardware txpower limits ...</div><div class='add'>+	 * saturation (clipping distortion) txpowers are in half-dBm */</div><div class='add'>+	if (band)</div><div class='add'>+		saturation_power = il-&gt;calib_info-&gt;saturation_power24;</div><div class='add'>+	else</div><div class='add'>+		saturation_power = il-&gt;calib_info-&gt;saturation_power52;</div><div class='add'>+</div><div class='add'>+	if (saturation_power &lt; IL_TX_POWER_SATURATION_MIN ||</div><div class='add'>+	    saturation_power &gt; IL_TX_POWER_SATURATION_MAX) {</div><div class='add'>+		if (band)</div><div class='add'>+			saturation_power = IL_TX_POWER_DEFAULT_SATURATION_24;</div><div class='add'>+		else</div><div class='add'>+			saturation_power = IL_TX_POWER_DEFAULT_SATURATION_52;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* regulatory txpower limits ... reg_limit values are in half-dBm,</div><div class='add'>+	 *   max_power_avg values are in dBm, convert * 2 */</div><div class='add'>+	if (is_ht40)</div><div class='add'>+		reg_limit = ch_info-&gt;ht40_max_power_avg * 2;</div><div class='add'>+	else</div><div class='add'>+		reg_limit = ch_info-&gt;max_power_avg * 2;</div><div class='add'>+</div><div class='add'>+	if ((reg_limit &lt; IL_TX_POWER_REGULATORY_MIN) ||</div><div class='add'>+	    (reg_limit &gt; IL_TX_POWER_REGULATORY_MAX)) {</div><div class='add'>+		if (band)</div><div class='add'>+			reg_limit = IL_TX_POWER_DEFAULT_REGULATORY_24;</div><div class='add'>+		else</div><div class='add'>+			reg_limit = IL_TX_POWER_DEFAULT_REGULATORY_52;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Interpolate txpower calibration values for this channel,</div><div class='add'>+	 *   based on factory calibration tests on spaced channels. */</div><div class='add'>+	il4965_interpolate_chan(il, channel, &amp;ch_eeprom_info);</div><div class='add'>+</div><div class='add'>+	/* calculate tx gain adjustment based on power supply voltage */</div><div class='add'>+	voltage = le16_to_cpu(il-&gt;calib_info-&gt;voltage);</div><div class='add'>+	init_voltage = (s32) le32_to_cpu(il-&gt;card_alive_init.voltage);</div><div class='add'>+	voltage_compensation =</div><div class='add'>+	    il4965_get_voltage_compensation(voltage, init_voltage);</div><div class='add'>+</div><div class='add'>+	D_TXPOWER("curr volt %d eeprom volt %d volt comp %d\n", init_voltage,</div><div class='add'>+		  voltage, voltage_compensation);</div><div class='add'>+</div><div class='add'>+	/* get current temperature (Celsius) */</div><div class='add'>+	current_temp = max(il-&gt;temperature, IL_TX_POWER_TEMPERATURE_MIN);</div><div class='add'>+	current_temp = min(il-&gt;temperature, IL_TX_POWER_TEMPERATURE_MAX);</div><div class='add'>+	current_temp = KELVIN_TO_CELSIUS(current_temp);</div><div class='add'>+</div><div class='add'>+	/* select thermal txpower adjustment params, based on channel group</div><div class='add'>+	 *   (same frequency group used for mimo txatten adjustment) */</div><div class='add'>+	degrees_per_05db_num =</div><div class='add'>+	    tx_power_cmp_tble[txatten_grp].degrees_per_05db_a;</div><div class='add'>+	degrees_per_05db_denom =</div><div class='add'>+	    tx_power_cmp_tble[txatten_grp].degrees_per_05db_a_denom;</div><div class='add'>+</div><div class='add'>+	/* get per-chain txpower values from factory measurements */</div><div class='add'>+	for (c = 0; c &lt; 2; c++) {</div><div class='add'>+		measurement = &amp;ch_eeprom_info.measurements[c][1];</div><div class='add'>+</div><div class='add'>+		/* txgain adjustment (in half-dB steps) based on difference</div><div class='add'>+		 *   between factory and current temperature */</div><div class='add'>+		factory_temp = measurement-&gt;temperature;</div><div class='add'>+		il4965_math_div_round((current_temp -</div><div class='add'>+				       factory_temp) * degrees_per_05db_denom,</div><div class='add'>+				      degrees_per_05db_num,</div><div class='add'>+				      &amp;temperature_comp[c]);</div><div class='add'>+</div><div class='add'>+		factory_gain_idx[c] = measurement-&gt;gain_idx;</div><div class='add'>+		factory_actual_pwr[c] = measurement-&gt;actual_pow;</div><div class='add'>+</div><div class='add'>+		D_TXPOWER("chain = %d\n", c);</div><div class='add'>+		D_TXPOWER("fctry tmp %d, " "curr tmp %d, comp %d steps\n",</div><div class='add'>+			  factory_temp, current_temp, temperature_comp[c]);</div><div class='add'>+</div><div class='add'>+		D_TXPOWER("fctry idx %d, fctry pwr %d\n", factory_gain_idx[c],</div><div class='add'>+			  factory_actual_pwr[c]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* for each of 33 bit-rates (including 1 for CCK) */</div><div class='add'>+	for (i = 0; i &lt; POWER_TBL_NUM_ENTRIES; i++) {</div><div class='add'>+		u8 is_mimo_rate;</div><div class='add'>+		union il4965_tx_power_dual_stream tx_power;</div><div class='add'>+</div><div class='add'>+		/* for mimo, reduce each chain's txpower by half</div><div class='add'>+		 * (3dB, 6 steps), so total output power is regulatory</div><div class='add'>+		 * compliant. */</div><div class='add'>+		if (i &amp; 0x8) {</div><div class='add'>+			current_regulatory =</div><div class='add'>+			    reg_limit -</div><div class='add'>+			    IL_TX_POWER_MIMO_REGULATORY_COMPENSATION;</div><div class='add'>+			is_mimo_rate = 1;</div><div class='add'>+		} else {</div><div class='add'>+			current_regulatory = reg_limit;</div><div class='add'>+			is_mimo_rate = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* find txpower limit, either hardware or regulatory */</div><div class='add'>+		power_limit = saturation_power - back_off_table[i];</div><div class='add'>+		if (power_limit &gt; current_regulatory)</div><div class='add'>+			power_limit = current_regulatory;</div><div class='add'>+</div><div class='add'>+		/* reduce user's txpower request if necessary</div><div class='add'>+		 * for this rate on this channel */</div><div class='add'>+		target_power = user_target_power;</div><div class='add'>+		if (target_power &gt; power_limit)</div><div class='add'>+			target_power = power_limit;</div><div class='add'>+</div><div class='add'>+		D_TXPOWER("rate %d sat %d reg %d usr %d tgt %d\n", i,</div><div class='add'>+			  saturation_power - back_off_table[i],</div><div class='add'>+			  current_regulatory, user_target_power, target_power);</div><div class='add'>+</div><div class='add'>+		/* for each of 2 Tx chains (radio transmitters) */</div><div class='add'>+		for (c = 0; c &lt; 2; c++) {</div><div class='add'>+			s32 atten_value;</div><div class='add'>+</div><div class='add'>+			if (is_mimo_rate)</div><div class='add'>+				atten_value =</div><div class='add'>+				    (s32) le32_to_cpu(il-&gt;card_alive_init.</div><div class='add'>+						      tx_atten[txatten_grp][c]);</div><div class='add'>+			else</div><div class='add'>+				atten_value = 0;</div><div class='add'>+</div><div class='add'>+			/* calculate idx; higher idx means lower txpower */</div><div class='add'>+			power_idx =</div><div class='add'>+			    (u8) (factory_gain_idx[c] -</div><div class='add'>+				  (target_power - factory_actual_pwr[c]) -</div><div class='add'>+				  temperature_comp[c] - voltage_compensation +</div><div class='add'>+				  atten_value);</div><div class='add'>+</div><div class='add'>+/*			D_TXPOWER("calculated txpower idx %d\n",</div><div class='add'>+						power_idx); */</div><div class='add'>+</div><div class='add'>+			if (power_idx &lt; get_min_power_idx(i, band))</div><div class='add'>+				power_idx = get_min_power_idx(i, band);</div><div class='add'>+</div><div class='add'>+			/* adjust 5 GHz idx to support negative idxes */</div><div class='add'>+			if (!band)</div><div class='add'>+				power_idx += 9;</div><div class='add'>+</div><div class='add'>+			/* CCK, rate 32, reduce txpower for CCK */</div><div class='add'>+			if (i == POWER_TBL_CCK_ENTRY)</div><div class='add'>+				power_idx +=</div><div class='add'>+				    IL_TX_POWER_CCK_COMPENSATION_C_STEP;</div><div class='add'>+</div><div class='add'>+			/* stay within the table! */</div><div class='add'>+			if (power_idx &gt; 107) {</div><div class='add'>+				IL_WARN("txpower idx %d &gt; 107\n", power_idx);</div><div class='add'>+				power_idx = 107;</div><div class='add'>+			}</div><div class='add'>+			if (power_idx &lt; 0) {</div><div class='add'>+				IL_WARN("txpower idx %d &lt; 0\n", power_idx);</div><div class='add'>+				power_idx = 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* fill txpower command for this rate/chain */</div><div class='add'>+			tx_power.s.radio_tx_gain[c] =</div><div class='add'>+			    gain_table[band][power_idx].radio;</div><div class='add'>+			tx_power.s.dsp_predis_atten[c] =</div><div class='add'>+			    gain_table[band][power_idx].dsp;</div><div class='add'>+</div><div class='add'>+			D_TXPOWER("chain %d mimo %d idx %d "</div><div class='add'>+				  "gain 0x%02x dsp %d\n", c, atten_value,</div><div class='add'>+				  power_idx, tx_power.s.radio_tx_gain[c],</div><div class='add'>+				  tx_power.s.dsp_predis_atten[c]);</div><div class='add'>+		}		/* for each chain */</div><div class='add'>+</div><div class='add'>+		tx_power_tbl-&gt;power_tbl[i].dw = cpu_to_le32(tx_power.dw);</div><div class='add'>+</div><div class='add'>+	}			/* for each rate */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_send_tx_power - Configure the TXPOWER level user limit</div><div class='add'>+ *</div><div class='add'>+ * Uses the active RXON for channel, band, and characteristics (ht40, high)</div><div class='add'>+ * The power limit is taken from il-&gt;tx_power_user_lmt.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_send_tx_power(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il4965_txpowertable_cmd cmd = { 0 };</div><div class='add'>+	int ret;</div><div class='add'>+	u8 band = 0;</div><div class='add'>+	bool is_ht40 = false;</div><div class='add'>+	u8 ctrl_chan_high = 0;</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE</div><div class='add'>+	    (test_bit(S_SCAN_HW, &amp;il-&gt;status),</div><div class='add'>+	     "TX Power requested while scanning!\n"))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	band = il-&gt;band == IEEE80211_BAND_2GHZ;</div><div class='add'>+</div><div class='add'>+	is_ht40 = iw4965_is_ht40_channel(ctx-&gt;active.flags);</div><div class='add'>+</div><div class='add'>+	if (is_ht40 &amp;&amp; (ctx-&gt;active.flags &amp; RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK))</div><div class='add'>+		ctrl_chan_high = 1;</div><div class='add'>+</div><div class='add'>+	cmd.band = band;</div><div class='add'>+	cmd.channel = ctx-&gt;active.channel;</div><div class='add'>+</div><div class='add'>+	ret =</div><div class='add'>+	    il4965_fill_txpower_tbl(il, band, le16_to_cpu(ctx-&gt;active.channel),</div><div class='add'>+				    is_ht40, ctrl_chan_high, &amp;cmd.tx_power);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = il_send_cmd_pdu(il, C_TX_PWR_TBL, sizeof(cmd), &amp;cmd);</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</div><div class='add'>+il4965_send_rxon_assoc(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct il4965_rxon_assoc_cmd rxon_assoc;</div><div class='add'>+	const struct il_rxon_cmd *rxon1 = &amp;ctx-&gt;staging;</div><div class='add'>+	const struct il_rxon_cmd *rxon2 = &amp;ctx-&gt;active;</div><div class='add'>+</div><div class='add'>+	if (rxon1-&gt;flags == rxon2-&gt;flags &amp;&amp;</div><div class='add'>+	    rxon1-&gt;filter_flags == rxon2-&gt;filter_flags &amp;&amp;</div><div class='add'>+	    rxon1-&gt;cck_basic_rates == rxon2-&gt;cck_basic_rates &amp;&amp;</div><div class='add'>+	    rxon1-&gt;ofdm_ht_single_stream_basic_rates ==</div><div class='add'>+	    rxon2-&gt;ofdm_ht_single_stream_basic_rates &amp;&amp;</div><div class='add'>+	    rxon1-&gt;ofdm_ht_dual_stream_basic_rates ==</div><div class='add'>+	    rxon2-&gt;ofdm_ht_dual_stream_basic_rates &amp;&amp;</div><div class='add'>+	    rxon1-&gt;rx_chain == rxon2-&gt;rx_chain &amp;&amp;</div><div class='add'>+	    rxon1-&gt;ofdm_basic_rates == rxon2-&gt;ofdm_basic_rates) {</div><div class='add'>+		D_INFO("Using current RXON_ASSOC.  Not resending.\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rxon_assoc.flags = ctx-&gt;staging.flags;</div><div class='add'>+	rxon_assoc.filter_flags = ctx-&gt;staging.filter_flags;</div><div class='add'>+	rxon_assoc.ofdm_basic_rates = ctx-&gt;staging.ofdm_basic_rates;</div><div class='add'>+	rxon_assoc.cck_basic_rates = ctx-&gt;staging.cck_basic_rates;</div><div class='add'>+	rxon_assoc.reserved = 0;</div><div class='add'>+	rxon_assoc.ofdm_ht_single_stream_basic_rates =</div><div class='add'>+	    ctx-&gt;staging.ofdm_ht_single_stream_basic_rates;</div><div class='add'>+	rxon_assoc.ofdm_ht_dual_stream_basic_rates =</div><div class='add'>+	    ctx-&gt;staging.ofdm_ht_dual_stream_basic_rates;</div><div class='add'>+	rxon_assoc.rx_chain_select_flags = ctx-&gt;staging.rx_chain;</div><div class='add'>+</div><div class='add'>+	ret =</div><div class='add'>+	    il_send_cmd_pdu_async(il, C_RXON_ASSOC, sizeof(rxon_assoc),</div><div class='add'>+				  &amp;rxon_assoc, NULL);</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'>+il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	/* cast away the const for active_rxon in this function */</div><div class='add'>+	struct il_rxon_cmd *active_rxon = (void *)&amp;ctx-&gt;active;</div><div class='add'>+	int ret;</div><div class='add'>+	bool new_assoc = !!(ctx-&gt;staging.filter_flags &amp; RXON_FILTER_ASSOC_MSK);</div><div class='add'>+</div><div class='add'>+	if (!il_is_alive(il))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (!ctx-&gt;is_active)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* always get timestamp with Rx frame */</div><div class='add'>+	ctx-&gt;staging.flags |= RXON_FLG_TSF2HOST_MSK;</div><div class='add'>+</div><div class='add'>+	ret = il_check_rxon_cmd(il, ctx);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IL_ERR("Invalid RXON configuration.  Not committing.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * receive commit_rxon request</div><div class='add'>+	 * abort any previous channel switch if still in process</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(S_CHANNEL_SWITCH_PENDING, &amp;il-&gt;status) &amp;&amp;</div><div class='add'>+	    il-&gt;switch_channel != ctx-&gt;staging.channel) {</div><div class='add'>+		D_11H("abort channel switch on %d\n",</div><div class='add'>+		      le16_to_cpu(il-&gt;switch_channel));</div><div class='add'>+		il_chswitch_done(il, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we don't need to send a full RXON, we can use</div><div class='add'>+	 * il_rxon_assoc_cmd which is used to reconfigure filter</div><div class='add'>+	 * and other flags for the current radio configuration. */</div><div class='add'>+	if (!il_full_rxon_required(il, ctx)) {</div><div class='add'>+		ret = il_send_rxon_assoc(il, ctx);</div><div class='add'>+		if (ret) {</div><div class='add'>+			IL_ERR("Error setting RXON_ASSOC (%d)\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(active_rxon, &amp;ctx-&gt;staging, sizeof(*active_rxon));</div><div class='add'>+		il_print_rx_config_cmd(il, ctx);</div><div class='add'>+		/*</div><div class='add'>+		 * We do not commit tx power settings while channel changing,</div><div class='add'>+		 * do it now if tx power changed.</div><div class='add'>+		 */</div><div class='add'>+		il_set_tx_power(il, il-&gt;tx_power_next, false);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we are currently associated and the new config requires</div><div class='add'>+	 * an RXON_ASSOC and the new config wants the associated mask enabled,</div><div class='add'>+	 * we must clear the associated from the active configuration</div><div class='add'>+	 * before we apply the new config */</div><div class='add'>+	if (il_is_associated_ctx(ctx) &amp;&amp; new_assoc) {</div><div class='add'>+		D_INFO("Toggling associated bit on current RXON\n");</div><div class='add'>+		active_rxon-&gt;filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='add'>+</div><div class='add'>+		ret =</div><div class='add'>+		    il_send_cmd_pdu(il, ctx-&gt;rxon_cmd,</div><div class='add'>+				    sizeof(struct il_rxon_cmd), active_rxon);</div><div class='add'>+</div><div class='add'>+		/* If the mask clearing failed then we set</div><div class='add'>+		 * active_rxon back to what it was previously */</div><div class='add'>+		if (ret) {</div><div class='add'>+			active_rxon-&gt;filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='add'>+			IL_ERR("Error clearing ASSOC_MSK (%d)\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		il_clear_ucode_stations(il, ctx);</div><div class='add'>+		il_restore_stations(il, ctx);</div><div class='add'>+		ret = il4965_restore_default_wep_keys(il, ctx);</div><div class='add'>+		if (ret) {</div><div class='add'>+			IL_ERR("Failed to restore WEP keys (%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'>+	D_INFO("Sending RXON\n" "* with%s RXON_FILTER_ASSOC_MSK\n"</div><div class='add'>+	       "* channel = %d\n" "* bssid = %pM\n", (new_assoc ? "" : "out"),</div><div class='add'>+	       le16_to_cpu(ctx-&gt;staging.channel), ctx-&gt;staging.bssid_addr);</div><div class='add'>+</div><div class='add'>+	il_set_rxon_hwcrypto(il, ctx, !il-&gt;cfg-&gt;mod_params-&gt;sw_crypto);</div><div class='add'>+</div><div class='add'>+	/* Apply the new configuration</div><div class='add'>+	 * RXON unassoc clears the station table in uCode so restoration of</div><div class='add'>+	 * stations is needed after it (the RXON command) completes</div><div class='add'>+	 */</div><div class='add'>+	if (!new_assoc) {</div><div class='add'>+		ret =</div><div class='add'>+		    il_send_cmd_pdu(il, ctx-&gt;rxon_cmd,</div><div class='add'>+				    sizeof(struct il_rxon_cmd), &amp;ctx-&gt;staging);</div><div class='add'>+		if (ret) {</div><div class='add'>+			IL_ERR("Error setting new RXON (%d)\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		D_INFO("Return from !new_assoc RXON.\n");</div><div class='add'>+		memcpy(active_rxon, &amp;ctx-&gt;staging, sizeof(*active_rxon));</div><div class='add'>+		il_clear_ucode_stations(il, ctx);</div><div class='add'>+		il_restore_stations(il, ctx);</div><div class='add'>+		ret = il4965_restore_default_wep_keys(il, ctx);</div><div class='add'>+		if (ret) {</div><div class='add'>+			IL_ERR("Failed to restore WEP keys (%d)\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (new_assoc) {</div><div class='add'>+		il-&gt;start_calib = 0;</div><div class='add'>+		/* Apply the new configuration</div><div class='add'>+		 * RXON assoc doesn't clear the station table in uCode,</div><div class='add'>+		 */</div><div class='add'>+		ret =</div><div class='add'>+		    il_send_cmd_pdu(il, ctx-&gt;rxon_cmd,</div><div class='add'>+				    sizeof(struct il_rxon_cmd), &amp;ctx-&gt;staging);</div><div class='add'>+		if (ret) {</div><div class='add'>+			IL_ERR("Error setting new RXON (%d)\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		memcpy(active_rxon, &amp;ctx-&gt;staging, sizeof(*active_rxon));</div><div class='add'>+	}</div><div class='add'>+	il_print_rx_config_cmd(il, ctx);</div><div class='add'>+</div><div class='add'>+	il4965_init_sensitivity(il);</div><div class='add'>+</div><div class='add'>+	/* If we issue a new RXON command which required a tune then we must</div><div class='add'>+	 * send a new TXPOWER command or we won't be able to Tx any frames */</div><div class='add'>+	ret = il_set_tx_power(il, il-&gt;tx_power_next, true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IL_ERR("Error sending TX power (%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</div><div class='add'>+il4965_hw_channel_switch(struct il_priv *il,</div><div class='add'>+			 struct ieee80211_channel_switch *ch_switch)</div><div class='add'>+{</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+	int rc;</div><div class='add'>+	u8 band = 0;</div><div class='add'>+	bool is_ht40 = false;</div><div class='add'>+	u8 ctrl_chan_high = 0;</div><div class='add'>+	struct il4965_channel_switch_cmd cmd;</div><div class='add'>+	const struct il_channel_info *ch_info;</div><div class='add'>+	u32 switch_time_in_usec, ucode_switch_time;</div><div class='add'>+	u16 ch;</div><div class='add'>+	u32 tsf_low;</div><div class='add'>+	u8 switch_count;</div><div class='add'>+	u16 beacon_interval = le16_to_cpu(ctx-&gt;timing.beacon_interval);</div><div class='add'>+	struct ieee80211_vif *vif = ctx-&gt;vif;</div><div class='add'>+	band = il-&gt;band == IEEE80211_BAND_2GHZ;</div><div class='add'>+</div><div class='add'>+	is_ht40 = iw4965_is_ht40_channel(ctx-&gt;staging.flags);</div><div class='add'>+</div><div class='add'>+	if (is_ht40 &amp;&amp; (ctx-&gt;staging.flags &amp; RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK))</div><div class='add'>+		ctrl_chan_high = 1;</div><div class='add'>+</div><div class='add'>+	cmd.band = band;</div><div class='add'>+	cmd.expect_beacon = 0;</div><div class='add'>+	ch = ch_switch-&gt;channel-&gt;hw_value;</div><div class='add'>+	cmd.channel = cpu_to_le16(ch);</div><div class='add'>+	cmd.rxon_flags = ctx-&gt;staging.flags;</div><div class='add'>+	cmd.rxon_filter_flags = ctx-&gt;staging.filter_flags;</div><div class='add'>+	switch_count = ch_switch-&gt;count;</div><div class='add'>+	tsf_low = ch_switch-&gt;timestamp &amp; 0x0ffffffff;</div><div class='add'>+	/*</div><div class='add'>+	 * calculate the ucode channel switch time</div><div class='add'>+	 * adding TSF as one of the factor for when to switch</div><div class='add'>+	 */</div><div class='add'>+	if (il-&gt;ucode_beacon_time &gt; tsf_low &amp;&amp; beacon_interval) {</div><div class='add'>+		if (switch_count &gt;</div><div class='add'>+		    ((il-&gt;ucode_beacon_time - tsf_low) / beacon_interval)) {</div><div class='add'>+			switch_count -=</div><div class='add'>+			    (il-&gt;ucode_beacon_time - tsf_low) / beacon_interval;</div><div class='add'>+		} else</div><div class='add'>+			switch_count = 0;</div><div class='add'>+	}</div><div class='add'>+	if (switch_count &lt;= 1)</div><div class='add'>+		cmd.switch_time = cpu_to_le32(il-&gt;ucode_beacon_time);</div><div class='add'>+	else {</div><div class='add'>+		switch_time_in_usec =</div><div class='add'>+		    vif-&gt;bss_conf.beacon_int * switch_count * TIME_UNIT;</div><div class='add'>+		ucode_switch_time =</div><div class='add'>+		    il_usecs_to_beacons(il, switch_time_in_usec,</div><div class='add'>+					beacon_interval);</div><div class='add'>+		cmd.switch_time =</div><div class='add'>+		    il_add_beacon_time(il, il-&gt;ucode_beacon_time,</div><div class='add'>+				       ucode_switch_time, beacon_interval);</div><div class='add'>+	}</div><div class='add'>+	D_11H("uCode time for the switch is 0x%x\n", cmd.switch_time);</div><div class='add'>+	ch_info = il_get_channel_info(il, il-&gt;band, ch);</div><div class='add'>+	if (ch_info)</div><div class='add'>+		cmd.expect_beacon = il_is_channel_radar(ch_info);</div><div class='add'>+	else {</div><div class='add'>+		IL_ERR("invalid channel switch from %u to %u\n",</div><div class='add'>+		       ctx-&gt;active.channel, ch);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = il4965_fill_txpower_tbl(il, band, ch, is_ht40, ctrl_chan_high,</div><div class='add'>+				     &amp;cmd.tx_power);</div><div class='add'>+	if (rc) {</div><div class='add'>+		D_11H("error:%d  fill txpower_tbl\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return il_send_cmd_pdu(il, C_CHANNEL_SWITCH, sizeof(cmd), &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_txq_update_byte_cnt_tbl(struct il_priv *il, struct il_tx_queue *txq,</div><div class='add'>+			       u16 byte_cnt)</div><div class='add'>+{</div><div class='add'>+	struct il4965_scd_bc_tbl *scd_bc_tbl = il-&gt;scd_bc_tbls.addr;</div><div class='add'>+	int txq_id = txq-&gt;q.id;</div><div class='add'>+	int write_ptr = txq-&gt;q.write_ptr;</div><div class='add'>+	int len = byte_cnt + IL_TX_CRC_SIZE + IL_TX_DELIMITER_SIZE;</div><div class='add'>+	__le16 bc_ent;</div><div class='add'>+</div><div class='add'>+	WARN_ON(len &gt; 0xFFF || write_ptr &gt;= TFD_QUEUE_SIZE_MAX);</div><div class='add'>+</div><div class='add'>+	bc_ent = cpu_to_le16(len &amp; 0xFFF);</div><div class='add'>+	/* Set up byte count within first 256 entries */</div><div class='add'>+	scd_bc_tbl[txq_id].tfd_offset[write_ptr] = bc_ent;</div><div class='add'>+</div><div class='add'>+	/* If within first 64 entries, duplicate at end */</div><div class='add'>+	if (write_ptr &lt; TFD_QUEUE_SIZE_BC_DUP)</div><div class='add'>+		scd_bc_tbl[txq_id].tfd_offset[TFD_QUEUE_SIZE_MAX + write_ptr] =</div><div class='add'>+		    bc_ent;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_hw_get_temperature - return the calibrated temperature (in Kelvin)</div><div class='add'>+ * @stats: Provides the temperature reading from the uCode</div><div class='add'>+ *</div><div class='add'>+ * A return of &lt;0 indicates bogus data in the stats</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_hw_get_temperature(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	s32 temperature;</div><div class='add'>+	s32 vt;</div><div class='add'>+	s32 R1, R2, R3;</div><div class='add'>+	u32 R4;</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_TEMPERATURE, &amp;il-&gt;status) &amp;&amp;</div><div class='add'>+	    (il-&gt;_4965.stats.flag &amp; STATS_REPLY_FLG_HT40_MODE_MSK)) {</div><div class='add'>+		D_TEMP("Running HT40 temperature calibration\n");</div><div class='add'>+		R1 = (s32) le32_to_cpu(il-&gt;card_alive_init.therm_r1[1]);</div><div class='add'>+		R2 = (s32) le32_to_cpu(il-&gt;card_alive_init.therm_r2[1]);</div><div class='add'>+		R3 = (s32) le32_to_cpu(il-&gt;card_alive_init.therm_r3[1]);</div><div class='add'>+		R4 = le32_to_cpu(il-&gt;card_alive_init.therm_r4[1]);</div><div class='add'>+	} else {</div><div class='add'>+		D_TEMP("Running temperature calibration\n");</div><div class='add'>+		R1 = (s32) le32_to_cpu(il-&gt;card_alive_init.therm_r1[0]);</div><div class='add'>+		R2 = (s32) le32_to_cpu(il-&gt;card_alive_init.therm_r2[0]);</div><div class='add'>+		R3 = (s32) le32_to_cpu(il-&gt;card_alive_init.therm_r3[0]);</div><div class='add'>+		R4 = le32_to_cpu(il-&gt;card_alive_init.therm_r4[0]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Temperature is only 23 bits, so sign extend out to 32.</div><div class='add'>+	 *</div><div class='add'>+	 * NOTE If we haven't received a stats notification yet</div><div class='add'>+	 * with an updated temperature, use R4 provided to us in the</div><div class='add'>+	 * "initialize" ALIVE response.</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(S_TEMPERATURE, &amp;il-&gt;status))</div><div class='add'>+		vt = sign_extend32(R4, 23);</div><div class='add'>+	else</div><div class='add'>+		vt = sign_extend32(le32_to_cpu</div><div class='add'>+				   (il-&gt;_4965.stats.general.common.temperature),</div><div class='add'>+				   23);</div><div class='add'>+</div><div class='add'>+	D_TEMP("Calib values R[1-3]: %d %d %d R4: %d\n", R1, R2, R3, vt);</div><div class='add'>+</div><div class='add'>+	if (R3 == R1) {</div><div class='add'>+		IL_ERR("Calibration conflict R1 == R3\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Calculate temperature in degrees Kelvin, adjust by 97%.</div><div class='add'>+	 * Add offset to center the adjustment around 0 degrees Centigrade. */</div><div class='add'>+	temperature = TEMPERATURE_CALIB_A_VAL * (vt - R2);</div><div class='add'>+	temperature /= (R3 - R1);</div><div class='add'>+	temperature =</div><div class='add'>+	    (temperature * 97) / 100 + TEMPERATURE_CALIB_KELVIN_OFFSET;</div><div class='add'>+</div><div class='add'>+	D_TEMP("Calibrated temperature: %dK, %dC\n", temperature,</div><div class='add'>+	       KELVIN_TO_CELSIUS(temperature));</div><div class='add'>+</div><div class='add'>+	return temperature;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Adjust Txpower only if temperature variance is greater than threshold. */</div><div class='add'>+#define IL_TEMPERATURE_THRESHOLD   3</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_is_temp_calib_needed - determines if new calibration is needed</div><div class='add'>+ *</div><div class='add'>+ * If the temperature changed has changed sufficiently, then a recalibration</div><div class='add'>+ * is needed.</div><div class='add'>+ *</div><div class='add'>+ * Assumes caller will replace il-&gt;last_temperature once calibration</div><div class='add'>+ * executed.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_is_temp_calib_needed(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int temp_diff;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(S_STATS, &amp;il-&gt;status)) {</div><div class='add'>+		D_TEMP("Temperature not updated -- no stats.\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	temp_diff = il-&gt;temperature - il-&gt;last_temperature;</div><div class='add'>+</div><div class='add'>+	/* get absolute value */</div><div class='add'>+	if (temp_diff &lt; 0) {</div><div class='add'>+		D_POWER("Getting cooler, delta %d\n", temp_diff);</div><div class='add'>+		temp_diff = -temp_diff;</div><div class='add'>+	} else if (temp_diff == 0)</div><div class='add'>+		D_POWER("Temperature unchanged\n");</div><div class='add'>+	else</div><div class='add'>+		D_POWER("Getting warmer, delta %d\n", temp_diff);</div><div class='add'>+</div><div class='add'>+	if (temp_diff &lt; IL_TEMPERATURE_THRESHOLD) {</div><div class='add'>+		D_POWER(" =&gt; thermal txpower calib not needed\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_POWER(" =&gt; thermal txpower calib needed\n");</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_temperature_calib(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	s32 temp;</div><div class='add'>+</div><div class='add'>+	temp = il4965_hw_get_temperature(il);</div><div class='add'>+	if (IL_TX_POWER_TEMPERATURE_OUT_OF_RANGE(temp))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;temperature != temp) {</div><div class='add'>+		if (il-&gt;temperature)</div><div class='add'>+			D_TEMP("Temperature changed " "from %dC to %dC\n",</div><div class='add'>+			       KELVIN_TO_CELSIUS(il-&gt;temperature),</div><div class='add'>+			       KELVIN_TO_CELSIUS(temp));</div><div class='add'>+		else</div><div class='add'>+			D_TEMP("Temperature " "initialized to %dC\n",</div><div class='add'>+			       KELVIN_TO_CELSIUS(temp));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il-&gt;temperature = temp;</div><div class='add'>+	set_bit(S_TEMPERATURE, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;disable_tx_power_cal &amp;&amp;</div><div class='add'>+	    unlikely(!test_bit(S_SCANNING, &amp;il-&gt;status)) &amp;&amp;</div><div class='add'>+	    il4965_is_temp_calib_needed(il))</div><div class='add'>+		queue_work(il-&gt;workqueue, &amp;il-&gt;txpower_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16</div><div class='add'>+il4965_get_hcmd_size(u8 cmd_id, u16 len)</div><div class='add'>+{</div><div class='add'>+	switch (cmd_id) {</div><div class='add'>+	case C_RXON:</div><div class='add'>+		return (u16) sizeof(struct il4965_rxon_cmd);</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'>+static u16</div><div class='add'>+il4965_build_addsta_hcmd(const struct il_addsta_cmd *cmd, u8 * data)</div><div class='add'>+{</div><div class='add'>+	struct il4965_addsta_cmd *addsta = (struct il4965_addsta_cmd *)data;</div><div class='add'>+	addsta-&gt;mode = cmd-&gt;mode;</div><div class='add'>+	memcpy(&amp;addsta-&gt;sta, &amp;cmd-&gt;sta, sizeof(struct sta_id_modify));</div><div class='add'>+	memcpy(&amp;addsta-&gt;key, &amp;cmd-&gt;key, sizeof(struct il4965_keyinfo));</div><div class='add'>+	addsta-&gt;station_flags = cmd-&gt;station_flags;</div><div class='add'>+	addsta-&gt;station_flags_msk = cmd-&gt;station_flags_msk;</div><div class='add'>+	addsta-&gt;tid_disable_tx = cmd-&gt;tid_disable_tx;</div><div class='add'>+	addsta-&gt;add_immediate_ba_tid = cmd-&gt;add_immediate_ba_tid;</div><div class='add'>+	addsta-&gt;remove_immediate_ba_tid = cmd-&gt;remove_immediate_ba_tid;</div><div class='add'>+	addsta-&gt;add_immediate_ba_ssn = cmd-&gt;add_immediate_ba_ssn;</div><div class='add'>+	addsta-&gt;sleep_tx_count = cmd-&gt;sleep_tx_count;</div><div class='add'>+	addsta-&gt;reserved1 = cpu_to_le16(0);</div><div class='add'>+	addsta-&gt;reserved2 = cpu_to_le16(0);</div><div class='add'>+</div><div class='add'>+	return (u16) sizeof(struct il4965_addsta_cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+il4965_get_scd_ssn(struct il4965_tx_resp *tx_resp)</div><div class='add'>+{</div><div class='add'>+	return le32_to_cpup(&amp;tx_resp-&gt;u.status + tx_resp-&gt;frame_count) &amp; MAX_SN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+il4965_tx_status_to_mac80211(u32 status)</div><div class='add'>+{</div><div class='add'>+	status &amp;= TX_STATUS_MSK;</div><div class='add'>+</div><div class='add'>+	switch (status) {</div><div class='add'>+	case TX_STATUS_SUCCESS:</div><div class='add'>+	case TX_STATUS_DIRECT_DONE:</div><div class='add'>+		return IEEE80211_TX_STAT_ACK;</div><div class='add'>+	case TX_STATUS_FAIL_DEST_PS:</div><div class='add'>+		return IEEE80211_TX_STAT_TX_FILTERED;</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 inline bool</div><div class='add'>+il4965_is_tx_success(u32 status)</div><div class='add'>+{</div><div class='add'>+	status &amp;= TX_STATUS_MSK;</div><div class='add'>+	return (status == TX_STATUS_SUCCESS || status == TX_STATUS_DIRECT_DONE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_tx_status_reply_tx - Handle Tx response for frames in aggregation queue</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il4965_tx_status_reply_tx(struct il_priv *il, struct il_ht_agg *agg,</div><div class='add'>+			  struct il4965_tx_resp *tx_resp, int txq_id,</div><div class='add'>+			  u16 start_idx)</div><div class='add'>+{</div><div class='add'>+	u16 status;</div><div class='add'>+	struct agg_tx_status *frame_status = tx_resp-&gt;u.agg_status;</div><div class='add'>+	struct ieee80211_tx_info *info = NULL;</div><div class='add'>+	struct ieee80211_hdr *hdr = NULL;</div><div class='add'>+	u32 rate_n_flags = le32_to_cpu(tx_resp-&gt;rate_n_flags);</div><div class='add'>+	int i, sh, idx;</div><div class='add'>+	u16 seq;</div><div class='add'>+	if (agg-&gt;wait_for_ba)</div><div class='add'>+		D_TX_REPLY("got tx response w/o block-ack\n");</div><div class='add'>+</div><div class='add'>+	agg-&gt;frame_count = tx_resp-&gt;frame_count;</div><div class='add'>+	agg-&gt;start_idx = start_idx;</div><div class='add'>+	agg-&gt;rate_n_flags = rate_n_flags;</div><div class='add'>+	agg-&gt;bitmap = 0;</div><div class='add'>+</div><div class='add'>+	/* num frames attempted by Tx command */</div><div class='add'>+	if (agg-&gt;frame_count == 1) {</div><div class='add'>+		/* Only one frame was attempted; no block-ack will arrive */</div><div class='add'>+		status = le16_to_cpu(frame_status[0].status);</div><div class='add'>+		idx = start_idx;</div><div class='add'>+</div><div class='add'>+		D_TX_REPLY("FrameCnt = %d, StartIdx=%d idx=%d\n",</div><div class='add'>+			   agg-&gt;frame_count, agg-&gt;start_idx, idx);</div><div class='add'>+</div><div class='add'>+		info = IEEE80211_SKB_CB(il-&gt;txq[txq_id].txb[idx].skb);</div><div class='add'>+		info-&gt;status.rates[0].count = tx_resp-&gt;failure_frame + 1;</div><div class='add'>+		info-&gt;flags &amp;= ~IEEE80211_TX_CTL_AMPDU;</div><div class='add'>+		info-&gt;flags |= il4965_tx_status_to_mac80211(status);</div><div class='add'>+		il4965_hwrate_to_tx_control(il, rate_n_flags, info);</div><div class='add'>+</div><div class='add'>+		D_TX_REPLY("1 Frame 0x%x failure :%d\n", status &amp; 0xff,</div><div class='add'>+			   tx_resp-&gt;failure_frame);</div><div class='add'>+		D_TX_REPLY("Rate Info rate_n_flags=%x\n", rate_n_flags);</div><div class='add'>+</div><div class='add'>+		agg-&gt;wait_for_ba = 0;</div><div class='add'>+	} else {</div><div class='add'>+		/* Two or more frames were attempted; expect block-ack */</div><div class='add'>+		u64 bitmap = 0;</div><div class='add'>+		int start = agg-&gt;start_idx;</div><div class='add'>+</div><div class='add'>+		/* Construct bit-map of pending frames within Tx win */</div><div class='add'>+		for (i = 0; i &lt; agg-&gt;frame_count; i++) {</div><div class='add'>+			u16 sc;</div><div class='add'>+			status = le16_to_cpu(frame_status[i].status);</div><div class='add'>+			seq = le16_to_cpu(frame_status[i].sequence);</div><div class='add'>+			idx = SEQ_TO_IDX(seq);</div><div class='add'>+			txq_id = SEQ_TO_QUEUE(seq);</div><div class='add'>+</div><div class='add'>+			if (status &amp;</div><div class='add'>+			    (AGG_TX_STATE_FEW_BYTES_MSK |</div><div class='add'>+			     AGG_TX_STATE_ABORT_MSK))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			D_TX_REPLY("FrameCnt = %d, txq_id=%d idx=%d\n",</div><div class='add'>+				   agg-&gt;frame_count, txq_id, idx);</div><div class='add'>+</div><div class='add'>+			hdr = il_tx_queue_get_hdr(il, txq_id, idx);</div><div class='add'>+			if (!hdr) {</div><div class='add'>+				IL_ERR("BUG_ON idx doesn't point to valid skb"</div><div class='add'>+				       " idx=%d, txq_id=%d\n", idx, txq_id);</div><div class='add'>+				return -1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			sc = le16_to_cpu(hdr-&gt;seq_ctrl);</div><div class='add'>+			if (idx != (SEQ_TO_SN(sc) &amp; 0xff)) {</div><div class='add'>+				IL_ERR("BUG_ON idx doesn't match seq control"</div><div class='add'>+				       " idx=%d, seq_idx=%d, seq=%d\n", idx,</div><div class='add'>+				       SEQ_TO_SN(sc), hdr-&gt;seq_ctrl);</div><div class='add'>+				return -1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			D_TX_REPLY("AGG Frame i=%d idx %d seq=%d\n", i, idx,</div><div class='add'>+				   SEQ_TO_SN(sc));</div><div class='add'>+</div><div class='add'>+			sh = idx - start;</div><div class='add'>+			if (sh &gt; 64) {</div><div class='add'>+				sh = (start - idx) + 0xff;</div><div class='add'>+				bitmap = bitmap &lt;&lt; sh;</div><div class='add'>+				sh = 0;</div><div class='add'>+				start = idx;</div><div class='add'>+			} else if (sh &lt; -64)</div><div class='add'>+				sh = 0xff - (start - idx);</div><div class='add'>+			else if (sh &lt; 0) {</div><div class='add'>+				sh = start - idx;</div><div class='add'>+				start = idx;</div><div class='add'>+				bitmap = bitmap &lt;&lt; sh;</div><div class='add'>+				sh = 0;</div><div class='add'>+			}</div><div class='add'>+			bitmap |= 1ULL &lt;&lt; sh;</div><div class='add'>+			D_TX_REPLY("start=%d bitmap=0x%llx\n", start,</div><div class='add'>+				   (unsigned long long)bitmap);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		agg-&gt;bitmap = bitmap;</div><div class='add'>+		agg-&gt;start_idx = start;</div><div class='add'>+		D_TX_REPLY("Frames %d start_idx=%d bitmap=0x%llx\n",</div><div class='add'>+			   agg-&gt;frame_count, agg-&gt;start_idx,</div><div class='add'>+			   (unsigned long long)agg-&gt;bitmap);</div><div class='add'>+</div><div class='add'>+		if (bitmap)</div><div class='add'>+			agg-&gt;wait_for_ba = 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+il4965_find_station(struct il_priv *il, const u8 * addr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int start = 0;</div><div class='add'>+	int ret = IL_INVALID_STATION;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if ((il-&gt;iw_mode == NL80211_IFTYPE_ADHOC))</div><div class='add'>+		start = IL_STA_ID;</div><div class='add'>+</div><div class='add'>+	if (is_broadcast_ether_addr(addr))</div><div class='add'>+		return il-&gt;ctx.bcast_sta_id;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	for (i = start; i &lt; il-&gt;hw_params.max_stations; i++)</div><div class='add'>+		if (il-&gt;stations[i].used &amp;&amp;</div><div class='add'>+		    (!compare_ether_addr(il-&gt;stations[i].sta.sta.addr, addr))) {</div><div class='add'>+			ret = i;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	D_ASSOC("can not find STA %pM total %d\n", addr, il-&gt;num_stations);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	/*</div><div class='add'>+	 * It may be possible that more commands interacting with stations</div><div class='add'>+	 * arrive before we completed processing the adding of</div><div class='add'>+	 * station</div><div class='add'>+	 */</div><div class='add'>+	if (ret != IL_INVALID_STATION &amp;&amp;</div><div class='add'>+	    (!(il-&gt;stations[ret].used &amp; IL_STA_UCODE_ACTIVE) ||</div><div class='add'>+	     ((il-&gt;stations[ret].used &amp; IL_STA_UCODE_ACTIVE) &amp;&amp;</div><div class='add'>+	      (il-&gt;stations[ret].used &amp; IL_STA_UCODE_INPROGRESS)))) {</div><div class='add'>+		IL_ERR("Requested station info for sta %d before ready.\n",</div><div class='add'>+		       ret);</div><div class='add'>+		ret = IL_INVALID_STATION;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il4965_get_ra_sta_id(struct il_priv *il, struct ieee80211_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	if (il-&gt;iw_mode == NL80211_IFTYPE_STATION) {</div><div class='add'>+		return IL_AP_ID;</div><div class='add'>+	} else {</div><div class='add'>+		u8 *da = ieee80211_get_DA(hdr);</div><div class='add'>+		return il4965_find_station(il, da);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il4965_hdl_tx - Handle standard (non-aggregation) Tx response</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il4965_hdl_tx(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	u16 sequence = le16_to_cpu(pkt-&gt;hdr.sequence);</div><div class='add'>+	int txq_id = SEQ_TO_QUEUE(sequence);</div><div class='add'>+	int idx = SEQ_TO_IDX(sequence);</div><div class='add'>+	struct il_tx_queue *txq = &amp;il-&gt;txq[txq_id];</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	struct ieee80211_tx_info *info;</div><div class='add'>+	struct il4965_tx_resp *tx_resp = (void *)&amp;pkt-&gt;u.raw[0];</div><div class='add'>+	u32 status = le32_to_cpu(tx_resp-&gt;u.status);</div><div class='add'>+	int uninitialized_var(tid);</div><div class='add'>+	int sta_id;</div><div class='add'>+	int freed;</div><div class='add'>+	u8 *qc = NULL;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (idx &gt;= txq-&gt;q.n_bd || il_queue_used(&amp;txq-&gt;q, idx) == 0) {</div><div class='add'>+		IL_ERR("Read idx for DMA queue txq_id (%d) idx %d "</div><div class='add'>+		       "is out of range [0-%d] %d %d\n", txq_id, idx,</div><div class='add'>+		       txq-&gt;q.n_bd, txq-&gt;q.write_ptr, txq-&gt;q.read_ptr);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	txq-&gt;time_stamp = jiffies;</div><div class='add'>+	info = IEEE80211_SKB_CB(txq-&gt;txb[txq-&gt;q.read_ptr].skb);</div><div class='add'>+	memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='add'>+</div><div class='add'>+	hdr = il_tx_queue_get_hdr(il, txq_id, idx);</div><div class='add'>+	if (ieee80211_is_data_qos(hdr-&gt;frame_control)) {</div><div class='add'>+		qc = ieee80211_get_qos_ctl(hdr);</div><div class='add'>+		tid = qc[0] &amp; 0xf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sta_id = il4965_get_ra_sta_id(il, hdr);</div><div class='add'>+	if (txq-&gt;sched_retry &amp;&amp; unlikely(sta_id == IL_INVALID_STATION)) {</div><div class='add'>+		IL_ERR("Station not known\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	if (txq-&gt;sched_retry) {</div><div class='add'>+		const u32 scd_ssn = il4965_get_scd_ssn(tx_resp);</div><div class='add'>+		struct il_ht_agg *agg = NULL;</div><div class='add'>+		WARN_ON(!qc);</div><div class='add'>+</div><div class='add'>+		agg = &amp;il-&gt;stations[sta_id].tid[tid].agg;</div><div class='add'>+</div><div class='add'>+		il4965_tx_status_reply_tx(il, agg, tx_resp, txq_id, idx);</div><div class='add'>+</div><div class='add'>+		/* check if BAR is needed */</div><div class='add'>+		if ((tx_resp-&gt;frame_count == 1) &amp;&amp;</div><div class='add'>+		    !il4965_is_tx_success(status))</div><div class='add'>+			info-&gt;flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;</div><div class='add'>+</div><div class='add'>+		if (txq-&gt;q.read_ptr != (scd_ssn &amp; 0xff)) {</div><div class='add'>+			idx = il_queue_dec_wrap(scd_ssn &amp; 0xff, txq-&gt;q.n_bd);</div><div class='add'>+			D_TX_REPLY("Retry scheduler reclaim scd_ssn "</div><div class='add'>+				   "%d idx %d\n", scd_ssn, idx);</div><div class='add'>+			freed = il4965_tx_queue_reclaim(il, txq_id, idx);</div><div class='add'>+			if (qc)</div><div class='add'>+				il4965_free_tfds_in_queue(il, sta_id, tid,</div><div class='add'>+							  freed);</div><div class='add'>+</div><div class='add'>+			if (il-&gt;mac80211_registered &amp;&amp;</div><div class='add'>+			    il_queue_space(&amp;txq-&gt;q) &gt; txq-&gt;q.low_mark &amp;&amp;</div><div class='add'>+			    agg-&gt;state != IL_EMPTYING_HW_QUEUE_DELBA)</div><div class='add'>+				il_wake_queue(il, txq);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		info-&gt;status.rates[0].count = tx_resp-&gt;failure_frame + 1;</div><div class='add'>+		info-&gt;flags |= il4965_tx_status_to_mac80211(status);</div><div class='add'>+		il4965_hwrate_to_tx_control(il,</div><div class='add'>+					    le32_to_cpu(tx_resp-&gt;rate_n_flags),</div><div class='add'>+					    info);</div><div class='add'>+</div><div class='add'>+		D_TX_REPLY("TXQ %d status %s (0x%08x) "</div><div class='add'>+			   "rate_n_flags 0x%x retries %d\n", txq_id,</div><div class='add'>+			   il4965_get_tx_fail_reason(status), status,</div><div class='add'>+			   le32_to_cpu(tx_resp-&gt;rate_n_flags),</div><div class='add'>+			   tx_resp-&gt;failure_frame);</div><div class='add'>+</div><div class='add'>+		freed = il4965_tx_queue_reclaim(il, txq_id, idx);</div><div class='add'>+		if (qc &amp;&amp; likely(sta_id != IL_INVALID_STATION))</div><div class='add'>+			il4965_free_tfds_in_queue(il, sta_id, tid, freed);</div><div class='add'>+		else if (sta_id == IL_INVALID_STATION)</div><div class='add'>+			D_TX_REPLY("Station not known\n");</div><div class='add'>+</div><div class='add'>+		if (il-&gt;mac80211_registered &amp;&amp;</div><div class='add'>+		    il_queue_space(&amp;txq-&gt;q) &gt; txq-&gt;q.low_mark)</div><div class='add'>+			il_wake_queue(il, txq);</div><div class='add'>+	}</div><div class='add'>+	if (qc &amp;&amp; likely(sta_id != IL_INVALID_STATION))</div><div class='add'>+		il4965_txq_check_empty(il, sta_id, tid, txq_id);</div><div class='add'>+</div><div class='add'>+	il4965_check_abort_status(il, tx_resp-&gt;frame_count, status);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set up 4965-specific Rx frame reply handlers */</div><div class='add'>+static void</div><div class='add'>+il4965_handler_setup(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	/* Legacy Rx frames */</div><div class='add'>+	il-&gt;handlers[N_RX] = il4965_hdl_rx;</div><div class='add'>+	/* Tx response */</div><div class='add'>+	il-&gt;handlers[C_TX] = il4965_hdl_tx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct il_hcmd_ops il4965_hcmd = {</div><div class='add'>+	.rxon_assoc = il4965_send_rxon_assoc,</div><div class='add'>+	.commit_rxon = il4965_commit_rxon,</div><div class='add'>+	.set_rxon_chain = il4965_set_rxon_chain,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_post_scan(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Since setting the RXON may have been deferred while</div><div class='add'>+	 * performing the scan, fire one off if needed</div><div class='add'>+	 */</div><div class='add'>+	if (memcmp(&amp;ctx-&gt;staging, &amp;ctx-&gt;active, sizeof(ctx-&gt;staging)))</div><div class='add'>+		il_commit_rxon(il, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_post_associate(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+	struct ieee80211_vif *vif = ctx-&gt;vif;</div><div class='add'>+	struct ieee80211_conf *conf = NULL;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!vif || !il-&gt;is_open)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	il_scan_cancel_timeout(il, 200);</div><div class='add'>+</div><div class='add'>+	conf = &amp;il-&gt;hw-&gt;conf;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;staging.filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='add'>+	il_commit_rxon(il, ctx);</div><div class='add'>+</div><div class='add'>+	ret = il_send_rxon_timing(il, ctx);</div><div class='add'>+	if (ret)</div><div class='add'>+		IL_WARN("RXON timing - " "Attempting to continue.\n");</div><div class='add'>+</div><div class='add'>+	ctx-&gt;staging.filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='add'>+</div><div class='add'>+	il_set_rxon_ht(il, &amp;il-&gt;current_ht_config);</div><div class='add'>+</div><div class='add'>+	if (il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain)</div><div class='add'>+		il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain(il, ctx);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;staging.assoc_id = cpu_to_le16(vif-&gt;bss_conf.aid);</div><div class='add'>+</div><div class='add'>+	D_ASSOC("assoc id %d beacon interval %d\n", vif-&gt;bss_conf.aid,</div><div class='add'>+		vif-&gt;bss_conf.beacon_int);</div><div class='add'>+</div><div class='add'>+	if (vif-&gt;bss_conf.use_short_preamble)</div><div class='add'>+		ctx-&gt;staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='add'>+	else</div><div class='add'>+		ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;staging.flags &amp; RXON_FLG_BAND_24G_MSK) {</div><div class='add'>+		if (vif-&gt;bss_conf.use_short_slot)</div><div class='add'>+			ctx-&gt;staging.flags |= RXON_FLG_SHORT_SLOT_MSK;</div><div class='add'>+		else</div><div class='add'>+			ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_SLOT_MSK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il_commit_rxon(il, ctx);</div><div class='add'>+</div><div class='add'>+	D_ASSOC("Associated as %d to: %pM\n", vif-&gt;bss_conf.aid,</div><div class='add'>+		ctx-&gt;active.bssid_addr);</div><div class='add'>+</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		il4965_send_beacon_cmd(il);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		IL_ERR("%s Should not be called in %d mode\n", __func__,</div><div class='add'>+		       vif-&gt;type);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* the chain noise calibration will enabled PM upon completion</div><div class='add'>+	 * If chain noise has already been run, then we need to enable</div><div class='add'>+	 * power management here */</div><div class='add'>+	if (il-&gt;chain_noise_data.state == IL_CHAIN_NOISE_DONE)</div><div class='add'>+		il_power_update_mode(il, false);</div><div class='add'>+</div><div class='add'>+	/* Enable Rx differential gain and sensitivity calibrations */</div><div class='add'>+	il4965_chain_noise_reset(il);</div><div class='add'>+	il-&gt;start_calib = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il4965_config_ap(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+	struct ieee80211_vif *vif = ctx-&gt;vif;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* The following should be done only at AP bring up */</div><div class='add'>+	if (!il_is_associated_ctx(ctx)) {</div><div class='add'>+</div><div class='add'>+		/* RXON - unassoc (to set timing command) */</div><div class='add'>+		ctx-&gt;staging.filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='add'>+		il_commit_rxon(il, ctx);</div><div class='add'>+</div><div class='add'>+		/* RXON Timing */</div><div class='add'>+		ret = il_send_rxon_timing(il, ctx);</div><div class='add'>+		if (ret)</div><div class='add'>+			IL_WARN("RXON timing failed - "</div><div class='add'>+				"Attempting to continue.\n");</div><div class='add'>+</div><div class='add'>+		/* AP has all antennas */</div><div class='add'>+		il-&gt;chain_noise_data.active_chains = il-&gt;hw_params.valid_rx_ant;</div><div class='add'>+		il_set_rxon_ht(il, &amp;il-&gt;current_ht_config);</div><div class='add'>+		if (il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain)</div><div class='add'>+			il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain(il, ctx);</div><div class='add'>+</div><div class='add'>+		ctx-&gt;staging.assoc_id = 0;</div><div class='add'>+</div><div class='add'>+		if (vif-&gt;bss_conf.use_short_preamble)</div><div class='add'>+			ctx-&gt;staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='add'>+		else</div><div class='add'>+			ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='add'>+</div><div class='add'>+		if (ctx-&gt;staging.flags &amp; RXON_FLG_BAND_24G_MSK) {</div><div class='add'>+			if (vif-&gt;bss_conf.use_short_slot)</div><div class='add'>+				ctx-&gt;staging.flags |= RXON_FLG_SHORT_SLOT_MSK;</div><div class='add'>+			else</div><div class='add'>+				ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_SLOT_MSK;</div><div class='add'>+		}</div><div class='add'>+		/* need to send beacon cmd before committing assoc RXON! */</div><div class='add'>+		il4965_send_beacon_cmd(il);</div><div class='add'>+		/* restore RXON assoc */</div><div class='add'>+		ctx-&gt;staging.filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='add'>+		il_commit_rxon(il, ctx);</div><div class='add'>+	}</div><div class='add'>+	il4965_send_beacon_cmd(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct il_hcmd_utils_ops il4965_hcmd_utils = {</div><div class='add'>+	.get_hcmd_size = il4965_get_hcmd_size,</div><div class='add'>+	.build_addsta_hcmd = il4965_build_addsta_hcmd,</div><div class='add'>+	.request_scan = il4965_request_scan,</div><div class='add'>+	.post_scan = il4965_post_scan,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct il_lib_ops il4965_lib = {</div><div class='add'>+	.set_hw_params = il4965_hw_set_hw_params,</div><div class='add'>+	.txq_update_byte_cnt_tbl = il4965_txq_update_byte_cnt_tbl,</div><div class='add'>+	.txq_attach_buf_to_tfd = il4965_hw_txq_attach_buf_to_tfd,</div><div class='add'>+	.txq_free_tfd = il4965_hw_txq_free_tfd,</div><div class='add'>+	.txq_init = il4965_hw_tx_queue_init,</div><div class='add'>+	.handler_setup = il4965_handler_setup,</div><div class='add'>+	.is_valid_rtc_data_addr = il4965_hw_valid_rtc_data_addr,</div><div class='add'>+	.init_alive_start = il4965_init_alive_start,</div><div class='add'>+	.load_ucode = il4965_load_bsm,</div><div class='add'>+	.dump_nic_error_log = il4965_dump_nic_error_log,</div><div class='add'>+	.dump_fh = il4965_dump_fh,</div><div class='add'>+	.set_channel_switch = il4965_hw_channel_switch,</div><div class='add'>+	.apm_ops = {</div><div class='add'>+		    .init = il_apm_init,</div><div class='add'>+		    .config = il4965_nic_config,</div><div class='add'>+		    },</div><div class='add'>+	.eeprom_ops = {</div><div class='add'>+		       .regulatory_bands = {</div><div class='add'>+					    EEPROM_REGULATORY_BAND_1_CHANNELS,</div><div class='add'>+					    EEPROM_REGULATORY_BAND_2_CHANNELS,</div><div class='add'>+					    EEPROM_REGULATORY_BAND_3_CHANNELS,</div><div class='add'>+					    EEPROM_REGULATORY_BAND_4_CHANNELS,</div><div class='add'>+					    EEPROM_REGULATORY_BAND_5_CHANNELS,</div><div class='add'>+					    EEPROM_4965_REGULATORY_BAND_24_HT40_CHANNELS,</div><div class='add'>+					    EEPROM_4965_REGULATORY_BAND_52_HT40_CHANNELS},</div><div class='add'>+		       .acquire_semaphore = il4965_eeprom_acquire_semaphore,</div><div class='add'>+		       .release_semaphore = il4965_eeprom_release_semaphore,</div><div class='add'>+		       },</div><div class='add'>+	.send_tx_power = il4965_send_tx_power,</div><div class='add'>+	.update_chain_flags = il4965_update_chain_flags,</div><div class='add'>+	.temp_ops = {</div><div class='add'>+		     .temperature = il4965_temperature_calib,</div><div class='add'>+		     },</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+	.debugfs_ops = {</div><div class='add'>+			.rx_stats_read = il4965_ucode_rx_stats_read,</div><div class='add'>+			.tx_stats_read = il4965_ucode_tx_stats_read,</div><div class='add'>+			.general_stats_read = il4965_ucode_general_stats_read,</div><div class='add'>+			},</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct il_legacy_ops il4965_legacy_ops = {</div><div class='add'>+	.post_associate = il4965_post_associate,</div><div class='add'>+	.config_ap = il4965_config_ap,</div><div class='add'>+	.manage_ibss_station = il4965_manage_ibss_station,</div><div class='add'>+	.update_bcast_stations = il4965_update_bcast_stations,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ieee80211_ops il4965_hw_ops = {</div><div class='add'>+	.tx = il4965_mac_tx,</div><div class='add'>+	.start = il4965_mac_start,</div><div class='add'>+	.stop = il4965_mac_stop,</div><div class='add'>+	.add_interface = il_mac_add_interface,</div><div class='add'>+	.remove_interface = il_mac_remove_interface,</div><div class='add'>+	.change_interface = il_mac_change_interface,</div><div class='add'>+	.config = il_mac_config,</div><div class='add'>+	.configure_filter = il4965_configure_filter,</div><div class='add'>+	.set_key = il4965_mac_set_key,</div><div class='add'>+	.update_tkip_key = il4965_mac_update_tkip_key,</div><div class='add'>+	.conf_tx = il_mac_conf_tx,</div><div class='add'>+	.reset_tsf = il_mac_reset_tsf,</div><div class='add'>+	.bss_info_changed = il_mac_bss_info_changed,</div><div class='add'>+	.ampdu_action = il4965_mac_ampdu_action,</div><div class='add'>+	.hw_scan = il_mac_hw_scan,</div><div class='add'>+	.sta_add = il4965_mac_sta_add,</div><div class='add'>+	.sta_remove = il_mac_sta_remove,</div><div class='add'>+	.channel_switch = il4965_mac_channel_switch,</div><div class='add'>+	.tx_last_beacon = il_mac_tx_last_beacon,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct il_ops il4965_ops = {</div><div class='add'>+	.lib = &amp;il4965_lib,</div><div class='add'>+	.hcmd = &amp;il4965_hcmd,</div><div class='add'>+	.utils = &amp;il4965_hcmd_utils,</div><div class='add'>+	.led = &amp;il4965_led_ops,</div><div class='add'>+	.legacy = &amp;il4965_legacy_ops,</div><div class='add'>+	.ieee80211_ops = &amp;il4965_hw_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct il_base_params il4965_base_params = {</div><div class='add'>+	.eeprom_size = IL4965_EEPROM_IMG_SIZE,</div><div class='add'>+	.num_of_queues = IL49_NUM_QUEUES,</div><div class='add'>+	.num_of_ampdu_queues = IL49_NUM_AMPDU_QUEUES,</div><div class='add'>+	.pll_cfg_val = 0,</div><div class='add'>+	.set_l0s = true,</div><div class='add'>+	.use_bsm = true,</div><div class='add'>+	.led_compensation = 61,</div><div class='add'>+	.chain_noise_num_beacons = IL4965_CAL_NUM_BEACONS,</div><div class='add'>+	.wd_timeout = IL_DEF_WD_TIMEOUT,</div><div class='add'>+	.temperature_kelvin = true,</div><div class='add'>+	.ucode_tracing = true,</div><div class='add'>+	.sensitivity_calib_by_driver = true,</div><div class='add'>+	.chain_noise_calib_by_driver = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il_cfg il4965_cfg = {</div><div class='add'>+	.name = "Intel(R) Wireless WiFi Link 4965AGN",</div><div class='add'>+	.fw_name_pre = IL4965_FW_PRE,</div><div class='add'>+	.ucode_api_max = IL4965_UCODE_API_MAX,</div><div class='add'>+	.ucode_api_min = IL4965_UCODE_API_MIN,</div><div class='add'>+	.sku = IL_SKU_A | IL_SKU_G | IL_SKU_N,</div><div class='add'>+	.valid_tx_ant = ANT_AB,</div><div class='add'>+	.valid_rx_ant = ANT_ABC,</div><div class='add'>+	.eeprom_ver = EEPROM_4965_EEPROM_VERSION,</div><div class='add'>+	.eeprom_calib_ver = EEPROM_4965_TX_POWER_VERSION,</div><div class='add'>+	.ops = &amp;il4965_ops,</div><div class='add'>+	.mod_params = &amp;il4965_mod_params,</div><div class='add'>+	.base_params = &amp;il4965_base_params,</div><div class='add'>+	.led_mode = IL_LED_BLINK,</div><div class='add'>+	/*</div><div class='add'>+	 * Force use of chains B and C for scan RX on 5 GHz band</div><div class='add'>+	 * because the device has off-channel reception on chain A.</div><div class='add'>+	 */</div><div class='add'>+	.scan_rx_antennas[IEEE80211_BAND_5GHZ] = ANT_BC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Module firmware */</div><div class='add'>+MODULE_FIRMWARE(IL4965_MODULE_FIRMWARE(IL4965_UCODE_API_MAX));</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/4965.h b/drivers/net/wireless/iwlegacy/4965.h<br/>new file mode 100644<br/>index 000000000000..f280e0161b17<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/4965.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/4965.h</a></div><div class='hunk'>@@ -0,0 +1,1301 @@</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * GPL LICENSE SUMMARY</div><div class='add'>+ *</div><div class='add'>+ * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.</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 version 2 of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,</div><div class='add'>+ * USA</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution</div><div class='add'>+ * in the file called LICENSE.GPL.</div><div class='add'>+ *</div><div class='add'>+ * Contact Information:</div><div class='add'>+ *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='add'>+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef __il_4965_h__</div><div class='add'>+#define __il_4965_h__</div><div class='add'>+</div><div class='add'>+struct il_rx_queue;</div><div class='add'>+struct il_rx_buf;</div><div class='add'>+struct il_rx_pkt;</div><div class='add'>+struct il_tx_queue;</div><div class='add'>+struct il_rxon_context;</div><div class='add'>+</div><div class='add'>+/* configuration for the _4965 devices */</div><div class='add'>+extern struct il_cfg il4965_cfg;</div><div class='add'>+</div><div class='add'>+extern struct il_mod_params il4965_mod_params;</div><div class='add'>+</div><div class='add'>+extern struct ieee80211_ops il4965_hw_ops;</div><div class='add'>+</div><div class='add'>+/* tx queue */</div><div class='add'>+void il4965_free_tfds_in_queue(struct il_priv *il, int sta_id, int tid,</div><div class='add'>+			       int freed);</div><div class='add'>+</div><div class='add'>+/* RXON */</div><div class='add'>+void il4965_set_rxon_chain(struct il_priv *il, struct il_rxon_context *ctx);</div><div class='add'>+</div><div class='add'>+/* uCode */</div><div class='add'>+int il4965_verify_ucode(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+/* lib */</div><div class='add'>+void il4965_check_abort_status(struct il_priv *il, u8 frame_count, u32 status);</div><div class='add'>+</div><div class='add'>+void il4965_rx_queue_reset(struct il_priv *il, struct il_rx_queue *rxq);</div><div class='add'>+int il4965_rx_init(struct il_priv *il, struct il_rx_queue *rxq);</div><div class='add'>+int il4965_hw_nic_init(struct il_priv *il);</div><div class='add'>+int il4965_dump_fh(struct il_priv *il, char **buf, bool display);</div><div class='add'>+</div><div class='add'>+/* rx */</div><div class='add'>+void il4965_rx_queue_restock(struct il_priv *il);</div><div class='add'>+void il4965_rx_replenish(struct il_priv *il);</div><div class='add'>+void il4965_rx_replenish_now(struct il_priv *il);</div><div class='add'>+void il4965_rx_queue_free(struct il_priv *il, struct il_rx_queue *rxq);</div><div class='add'>+int il4965_rxq_stop(struct il_priv *il);</div><div class='add'>+int il4965_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band);</div><div class='add'>+void il4965_hdl_rx(struct il_priv *il, struct il_rx_buf *rxb);</div><div class='add'>+void il4965_hdl_rx_phy(struct il_priv *il, struct il_rx_buf *rxb);</div><div class='add'>+void il4965_rx_handle(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+/* tx */</div><div class='add'>+void il4965_hw_txq_free_tfd(struct il_priv *il, struct il_tx_queue *txq);</div><div class='add'>+int il4965_hw_txq_attach_buf_to_tfd(struct il_priv *il, struct il_tx_queue *txq,</div><div class='add'>+				    dma_addr_t addr, u16 len, u8 reset, u8 pad);</div><div class='add'>+int il4965_hw_tx_queue_init(struct il_priv *il, struct il_tx_queue *txq);</div><div class='add'>+void il4965_hwrate_to_tx_control(struct il_priv *il, u32 rate_n_flags,</div><div class='add'>+				 struct ieee80211_tx_info *info);</div><div class='add'>+int il4965_tx_skb(struct il_priv *il, struct sk_buff *skb);</div><div class='add'>+int il4965_tx_agg_start(struct il_priv *il, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta, u16 tid, u16 * ssn);</div><div class='add'>+int il4965_tx_agg_stop(struct il_priv *il, struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_sta *sta, u16 tid);</div><div class='add'>+int il4965_txq_check_empty(struct il_priv *il, int sta_id, u8 tid, int txq_id);</div><div class='add'>+void il4965_hdl_compressed_ba(struct il_priv *il, struct il_rx_buf *rxb);</div><div class='add'>+int il4965_tx_queue_reclaim(struct il_priv *il, int txq_id, int idx);</div><div class='add'>+void il4965_hw_txq_ctx_free(struct il_priv *il);</div><div class='add'>+int il4965_txq_ctx_alloc(struct il_priv *il);</div><div class='add'>+void il4965_txq_ctx_reset(struct il_priv *il);</div><div class='add'>+void il4965_txq_ctx_stop(struct il_priv *il);</div><div class='add'>+void il4965_txq_set_sched(struct il_priv *il, u32 mask);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Acquire il-&gt;lock before calling this function !</div><div class='add'>+ */</div><div class='add'>+void il4965_set_wr_ptrs(struct il_priv *il, int txq_id, u32 idx);</div><div class='add'>+/**</div><div class='add'>+ * il4965_tx_queue_set_status - (optionally) start Tx/Cmd queue</div><div class='add'>+ * @tx_fifo_id: Tx DMA/FIFO channel (range 0-7) that the queue will feed</div><div class='add'>+ * @scd_retry: (1) Indicates queue will be used in aggregation mode</div><div class='add'>+ *</div><div class='add'>+ * NOTE:  Acquire il-&gt;lock before calling this function !</div><div class='add'>+ */</div><div class='add'>+void il4965_tx_queue_set_status(struct il_priv *il, struct il_tx_queue *txq,</div><div class='add'>+				int tx_fifo_id, int scd_retry);</div><div class='add'>+</div><div class='add'>+/* rx */</div><div class='add'>+void il4965_hdl_missed_beacon(struct il_priv *il, struct il_rx_buf *rxb);</div><div class='add'>+bool il4965_good_plcp_health(struct il_priv *il, struct il_rx_pkt *pkt);</div><div class='add'>+void il4965_hdl_stats(struct il_priv *il, struct il_rx_buf *rxb);</div><div class='add'>+void il4965_hdl_c_stats(struct il_priv *il, struct il_rx_buf *rxb);</div><div class='add'>+</div><div class='add'>+/* scan */</div><div class='add'>+int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif);</div><div class='add'>+</div><div class='add'>+/* station mgmt */</div><div class='add'>+int il4965_manage_ibss_station(struct il_priv *il, struct ieee80211_vif *vif,</div><div class='add'>+			       bool add);</div><div class='add'>+</div><div class='add'>+/* hcmd */</div><div class='add'>+int il4965_send_beacon_cmd(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+const char *il4965_get_tx_fail_reason(u32 status);</div><div class='add'>+#else</div><div class='add'>+static inline const char *</div><div class='add'>+il4965_get_tx_fail_reason(u32 status)</div><div class='add'>+{</div><div class='add'>+	return "";</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* station management */</div><div class='add'>+int il4965_alloc_bcast_station(struct il_priv *il, struct il_rxon_context *ctx);</div><div class='add'>+int il4965_add_bssid_station(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+			     const u8 *addr, u8 *sta_id_r);</div><div class='add'>+int il4965_remove_default_wep_key(struct il_priv *il,</div><div class='add'>+				  struct il_rxon_context *ctx,</div><div class='add'>+				  struct ieee80211_key_conf *key);</div><div class='add'>+int il4965_set_default_wep_key(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+			       struct ieee80211_key_conf *key);</div><div class='add'>+int il4965_restore_default_wep_keys(struct il_priv *il,</div><div class='add'>+				    struct il_rxon_context *ctx);</div><div class='add'>+int il4965_set_dynamic_key(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+			   struct ieee80211_key_conf *key, u8 sta_id);</div><div class='add'>+int il4965_remove_dynamic_key(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+			      struct ieee80211_key_conf *key, u8 sta_id);</div><div class='add'>+void il4965_update_tkip_key(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+			    struct ieee80211_key_conf *keyconf,</div><div class='add'>+			    struct ieee80211_sta *sta, u32 iv32,</div><div class='add'>+			    u16 *phase1key);</div><div class='add'>+int il4965_sta_tx_modify_enable_tid(struct il_priv *il, int sta_id, int tid);</div><div class='add'>+int il4965_sta_rx_agg_start(struct il_priv *il, struct ieee80211_sta *sta,</div><div class='add'>+			    int tid, u16 ssn);</div><div class='add'>+int il4965_sta_rx_agg_stop(struct il_priv *il, struct ieee80211_sta *sta,</div><div class='add'>+			   int tid);</div><div class='add'>+void il4965_sta_modify_sleep_tx_count(struct il_priv *il, int sta_id, int cnt);</div><div class='add'>+int il4965_update_bcast_stations(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+/* rate */</div><div class='add'>+static inline u8</div><div class='add'>+il4965_hw_get_rate(__le32 rate_n_flags)</div><div class='add'>+{</div><div class='add'>+	return le32_to_cpu(rate_n_flags) &amp; 0xFF;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* eeprom */</div><div class='add'>+void il4965_eeprom_get_mac(const struct il_priv *il, u8 * mac);</div><div class='add'>+int il4965_eeprom_acquire_semaphore(struct il_priv *il);</div><div class='add'>+void il4965_eeprom_release_semaphore(struct il_priv *il);</div><div class='add'>+int il4965_eeprom_check_version(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+/* mac80211 handlers (for 4965) */</div><div class='add'>+void il4965_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb);</div><div class='add'>+int il4965_mac_start(struct ieee80211_hw *hw);</div><div class='add'>+void il4965_mac_stop(struct ieee80211_hw *hw);</div><div class='add'>+void il4965_configure_filter(struct ieee80211_hw *hw,</div><div class='add'>+			     unsigned int changed_flags,</div><div class='add'>+			     unsigned int *total_flags, u64 multicast);</div><div class='add'>+int il4965_mac_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'>+void il4965_mac_update_tkip_key(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				struct ieee80211_key_conf *keyconf,</div><div class='add'>+				struct ieee80211_sta *sta, u32 iv32,</div><div class='add'>+				u16 *phase1key);</div><div class='add'>+int il4965_mac_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			    enum ieee80211_ampdu_mlme_action action,</div><div class='add'>+			    struct ieee80211_sta *sta, u16 tid, u16 * ssn,</div><div class='add'>+			    u8 buf_size);</div><div class='add'>+int il4965_mac_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		       struct ieee80211_sta *sta);</div><div class='add'>+void il4965_mac_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+			       struct ieee80211_channel_switch *ch_switch);</div><div class='add'>+</div><div class='add'>+void il4965_led_enable(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+/* EEPROM */</div><div class='add'>+#define IL4965_EEPROM_IMG_SIZE			1024</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * uCode queue management definitions ...</div><div class='add'>+ * The first queue used for block-ack aggregation is #7 (4965 only).</div><div class='add'>+ * All block-ack aggregation queues should map to Tx DMA/FIFO channel 7.</div><div class='add'>+ */</div><div class='add'>+#define IL49_FIRST_AMPDU_QUEUE	7</div><div class='add'>+</div><div class='add'>+/* Sizes and addresses for instruction and data memory (SRAM) in</div><div class='add'>+ * 4965's embedded processor.  Driver access is via HBUS_TARG_MEM_* regs. */</div><div class='add'>+#define IL49_RTC_INST_LOWER_BOUND		(0x000000)</div><div class='add'>+#define IL49_RTC_INST_UPPER_BOUND		(0x018000)</div><div class='add'>+</div><div class='add'>+#define IL49_RTC_DATA_LOWER_BOUND		(0x800000)</div><div class='add'>+#define IL49_RTC_DATA_UPPER_BOUND		(0x80A000)</div><div class='add'>+</div><div class='add'>+#define IL49_RTC_INST_SIZE  (IL49_RTC_INST_UPPER_BOUND - \</div><div class='add'>+				IL49_RTC_INST_LOWER_BOUND)</div><div class='add'>+#define IL49_RTC_DATA_SIZE  (IL49_RTC_DATA_UPPER_BOUND - \</div><div class='add'>+				IL49_RTC_DATA_LOWER_BOUND)</div><div class='add'>+</div><div class='add'>+#define IL49_MAX_INST_SIZE IL49_RTC_INST_SIZE</div><div class='add'>+#define IL49_MAX_DATA_SIZE IL49_RTC_DATA_SIZE</div><div class='add'>+</div><div class='add'>+/* Size of uCode instruction memory in bootstrap state machine */</div><div class='add'>+#define IL49_MAX_BSM_SIZE BSM_SRAM_SIZE</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il4965_hw_valid_rtc_data_addr(u32 addr)</div><div class='add'>+{</div><div class='add'>+	return (addr &gt;= IL49_RTC_DATA_LOWER_BOUND &amp;&amp;</div><div class='add'>+		addr &lt; IL49_RTC_DATA_UPPER_BOUND);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/********************* START TEMPERATURE *************************************/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * 4965 temperature calculation.</div><div class='add'>+ *</div><div class='add'>+ * The driver must calculate the device temperature before calculating</div><div class='add'>+ * a txpower setting (amplifier gain is temperature dependent).  The</div><div class='add'>+ * calculation uses 4 measurements, 3 of which (R1, R2, R3) are calibration</div><div class='add'>+ * values used for the life of the driver, and one of which (R4) is the</div><div class='add'>+ * real-time temperature indicator.</div><div class='add'>+ *</div><div class='add'>+ * uCode provides all 4 values to the driver via the "initialize alive"</div><div class='add'>+ * notification (see struct il4965_init_alive_resp).  After the runtime uCode</div><div class='add'>+ * image loads, uCode updates the R4 value via stats notifications</div><div class='add'>+ * (see N_STATS), which occur after each received beacon</div><div class='add'>+ * when associated, or can be requested via C_STATS.</div><div class='add'>+ *</div><div class='add'>+ * NOTE:  uCode provides the R4 value as a 23-bit signed value.  Driver</div><div class='add'>+ *        must sign-extend to 32 bits before applying formula below.</div><div class='add'>+ *</div><div class='add'>+ * Formula:</div><div class='add'>+ *</div><div class='add'>+ * degrees Kelvin = ((97 * 259 * (R4 - R2) / (R3 - R1)) / 100) + 8</div><div class='add'>+ *</div><div class='add'>+ * NOTE:  The basic formula is 259 * (R4-R2) / (R3-R1).  The 97/100 is</div><div class='add'>+ * an additional correction, which should be centered around 0 degrees</div><div class='add'>+ * Celsius (273 degrees Kelvin).  The 8 (3 percent of 273) compensates for</div><div class='add'>+ * centering the 97/100 correction around 0 degrees K.</div><div class='add'>+ *</div><div class='add'>+ * Add 273 to Kelvin value to find degrees Celsius, for comparing current</div><div class='add'>+ * temperature with factory-measured temperatures when calculating txpower</div><div class='add'>+ * settings.</div><div class='add'>+ */</div><div class='add'>+#define TEMPERATURE_CALIB_KELVIN_OFFSET 8</div><div class='add'>+#define TEMPERATURE_CALIB_A_VAL 259</div><div class='add'>+</div><div class='add'>+/* Limit range of calculated temperature to be between these Kelvin values */</div><div class='add'>+#define IL_TX_POWER_TEMPERATURE_MIN  (263)</div><div class='add'>+#define IL_TX_POWER_TEMPERATURE_MAX  (410)</div><div class='add'>+</div><div class='add'>+#define IL_TX_POWER_TEMPERATURE_OUT_OF_RANGE(t) \</div><div class='add'>+	((t) &lt; IL_TX_POWER_TEMPERATURE_MIN || \</div><div class='add'>+	 (t) &gt; IL_TX_POWER_TEMPERATURE_MAX)</div><div class='add'>+</div><div class='add'>+/********************* END TEMPERATURE ***************************************/</div><div class='add'>+</div><div class='add'>+/********************* START TXPOWER *****************************************/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * 4965 txpower calculations rely on information from three sources:</div><div class='add'>+ *</div><div class='add'>+ *     1) EEPROM</div><div class='add'>+ *     2) "initialize" alive notification</div><div class='add'>+ *     3) stats notifications</div><div class='add'>+ *</div><div class='add'>+ * EEPROM data consists of:</div><div class='add'>+ *</div><div class='add'>+ * 1)  Regulatory information (max txpower and channel usage flags) is provided</div><div class='add'>+ *     separately for each channel that can possibly supported by 4965.</div><div class='add'>+ *     40 MHz wide (.11n HT40) channels are listed separately from 20 MHz</div><div class='add'>+ *     (legacy) channels.</div><div class='add'>+ *</div><div class='add'>+ *     See struct il4965_eeprom_channel for format, and struct il4965_eeprom</div><div class='add'>+ *     for locations in EEPROM.</div><div class='add'>+ *</div><div class='add'>+ * 2)  Factory txpower calibration information is provided separately for</div><div class='add'>+ *     sub-bands of contiguous channels.  2.4GHz has just one sub-band,</div><div class='add'>+ *     but 5 GHz has several sub-bands.</div><div class='add'>+ *</div><div class='add'>+ *     In addition, per-band (2.4 and 5 Ghz) saturation txpowers are provided.</div><div class='add'>+ *</div><div class='add'>+ *     See struct il4965_eeprom_calib_info (and the tree of structures</div><div class='add'>+ *     contained within it) for format, and struct il4965_eeprom for</div><div class='add'>+ *     locations in EEPROM.</div><div class='add'>+ *</div><div class='add'>+ * "Initialization alive" notification (see struct il4965_init_alive_resp)</div><div class='add'>+ * consists of:</div><div class='add'>+ *</div><div class='add'>+ * 1)  Temperature calculation parameters.</div><div class='add'>+ *</div><div class='add'>+ * 2)  Power supply voltage measurement.</div><div class='add'>+ *</div><div class='add'>+ * 3)  Tx gain compensation to balance 2 transmitters for MIMO use.</div><div class='add'>+ *</div><div class='add'>+ * Statistics notifications deliver:</div><div class='add'>+ *</div><div class='add'>+ * 1)  Current values for temperature param R4.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * To calculate a txpower setting for a given desired target txpower, channel,</div><div class='add'>+ * modulation bit rate, and transmitter chain (4965 has 2 transmitters to</div><div class='add'>+ * support MIMO and transmit diversity), driver must do the following:</div><div class='add'>+ *</div><div class='add'>+ * 1)  Compare desired txpower vs. (EEPROM) regulatory limit for this channel.</div><div class='add'>+ *     Do not exceed regulatory limit; reduce target txpower if necessary.</div><div class='add'>+ *</div><div class='add'>+ *     If setting up txpowers for MIMO rates (rate idxes 8-15, 24-31),</div><div class='add'>+ *     2 transmitters will be used simultaneously; driver must reduce the</div><div class='add'>+ *     regulatory limit by 3 dB (half-power) for each transmitter, so the</div><div class='add'>+ *     combined total output of the 2 transmitters is within regulatory limits.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * 2)  Compare target txpower vs. (EEPROM) saturation txpower *reduced by</div><div class='add'>+ *     backoff for this bit rate*.  Do not exceed (saturation - backoff[rate]);</div><div class='add'>+ *     reduce target txpower if necessary.</div><div class='add'>+ *</div><div class='add'>+ *     Backoff values below are in 1/2 dB units (equivalent to steps in</div><div class='add'>+ *     txpower gain tables):</div><div class='add'>+ *</div><div class='add'>+ *     OFDM 6 - 36 MBit:  10 steps (5 dB)</div><div class='add'>+ *     OFDM 48 MBit:      15 steps (7.5 dB)</div><div class='add'>+ *     OFDM 54 MBit:      17 steps (8.5 dB)</div><div class='add'>+ *     OFDM 60 MBit:      20 steps (10 dB)</div><div class='add'>+ *     CCK all rates:     10 steps (5 dB)</div><div class='add'>+ *</div><div class='add'>+ *     Backoff values apply to saturation txpower on a per-transmitter basis;</div><div class='add'>+ *     when using MIMO (2 transmitters), each transmitter uses the same</div><div class='add'>+ *     saturation level provided in EEPROM, and the same backoff values;</div><div class='add'>+ *     no reduction (such as with regulatory txpower limits) is required.</div><div class='add'>+ *</div><div class='add'>+ *     Saturation and Backoff values apply equally to 20 Mhz (legacy) channel</div><div class='add'>+ *     widths and 40 Mhz (.11n HT40) channel widths; there is no separate</div><div class='add'>+ *     factory measurement for ht40 channels.</div><div class='add'>+ *</div><div class='add'>+ *     The result of this step is the final target txpower.  The rest of</div><div class='add'>+ *     the steps figure out the proper settings for the device to achieve</div><div class='add'>+ *     that target txpower.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * 3)  Determine (EEPROM) calibration sub band for the target channel, by</div><div class='add'>+ *     comparing against first and last channels in each sub band</div><div class='add'>+ *     (see struct il4965_eeprom_calib_subband_info).</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * 4)  Linearly interpolate (EEPROM) factory calibration measurement sets,</div><div class='add'>+ *     referencing the 2 factory-measured (sample) channels within the sub band.</div><div class='add'>+ *</div><div class='add'>+ *     Interpolation is based on difference between target channel's frequency</div><div class='add'>+ *     and the sample channels' frequencies.  Since channel numbers are based</div><div class='add'>+ *     on frequency (5 MHz between each channel number), this is equivalent</div><div class='add'>+ *     to interpolating based on channel number differences.</div><div class='add'>+ *</div><div class='add'>+ *     Note that the sample channels may or may not be the channels at the</div><div class='add'>+ *     edges of the sub band.  The target channel may be "outside" of the</div><div class='add'>+ *     span of the sampled channels.</div><div class='add'>+ *</div><div class='add'>+ *     Driver may choose the pair (for 2 Tx chains) of measurements (see</div><div class='add'>+ *     struct il4965_eeprom_calib_ch_info) for which the actual measured</div><div class='add'>+ *     txpower comes closest to the desired txpower.  Usually, though,</div><div class='add'>+ *     the middle set of measurements is closest to the regulatory limits,</div><div class='add'>+ *     and is therefore a good choice for all txpower calculations (this</div><div class='add'>+ *     assumes that high accuracy is needed for maximizing legal txpower,</div><div class='add'>+ *     while lower txpower configurations do not need as much accuracy).</div><div class='add'>+ *</div><div class='add'>+ *     Driver should interpolate both members of the chosen measurement pair,</div><div class='add'>+ *     i.e. for both Tx chains (radio transmitters), unless the driver knows</div><div class='add'>+ *     that only one of the chains will be used (e.g. only one tx antenna</div><div class='add'>+ *     connected, but this should be unusual).  The rate scaling algorithm</div><div class='add'>+ *     switches antennas to find best performance, so both Tx chains will</div><div class='add'>+ *     be used (although only one at a time) even for non-MIMO transmissions.</div><div class='add'>+ *</div><div class='add'>+ *     Driver should interpolate factory values for temperature, gain table</div><div class='add'>+ *     idx, and actual power.  The power amplifier detector values are</div><div class='add'>+ *     not used by the driver.</div><div class='add'>+ *</div><div class='add'>+ *     Sanity check:  If the target channel happens to be one of the sample</div><div class='add'>+ *     channels, the results should agree with the sample channel's</div><div class='add'>+ *     measurements!</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * 5)  Find difference between desired txpower and (interpolated)</div><div class='add'>+ *     factory-measured txpower.  Using (interpolated) factory gain table idx</div><div class='add'>+ *     (shown elsewhere) as a starting point, adjust this idx lower to</div><div class='add'>+ *     increase txpower, or higher to decrease txpower, until the target</div><div class='add'>+ *     txpower is reached.  Each step in the gain table is 1/2 dB.</div><div class='add'>+ *</div><div class='add'>+ *     For example, if factory measured txpower is 16 dBm, and target txpower</div><div class='add'>+ *     is 13 dBm, add 6 steps to the factory gain idx to reduce txpower</div><div class='add'>+ *     by 3 dB.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * 6)  Find difference between current device temperature and (interpolated)</div><div class='add'>+ *     factory-measured temperature for sub-band.  Factory values are in</div><div class='add'>+ *     degrees Celsius.  To calculate current temperature, see comments for</div><div class='add'>+ *     "4965 temperature calculation".</div><div class='add'>+ *</div><div class='add'>+ *     If current temperature is higher than factory temperature, driver must</div><div class='add'>+ *     increase gain (lower gain table idx), and vice verse.</div><div class='add'>+ *</div><div class='add'>+ *     Temperature affects gain differently for different channels:</div><div class='add'>+ *</div><div class='add'>+ *     2.4 GHz all channels:  3.5 degrees per half-dB step</div><div class='add'>+ *     5 GHz channels 34-43:  4.5 degrees per half-dB step</div><div class='add'>+ *     5 GHz channels &gt;= 44:  4.0 degrees per half-dB step</div><div class='add'>+ *</div><div class='add'>+ *     NOTE:  Temperature can increase rapidly when transmitting, especially</div><div class='add'>+ *            with heavy traffic at high txpowers.  Driver should update</div><div class='add'>+ *            temperature calculations often under these conditions to</div><div class='add'>+ *            maintain strong txpower in the face of rising temperature.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * 7)  Find difference between current power supply voltage indicator</div><div class='add'>+ *     (from "initialize alive") and factory-measured power supply voltage</div><div class='add'>+ *     indicator (EEPROM).</div><div class='add'>+ *</div><div class='add'>+ *     If the current voltage is higher (indicator is lower) than factory</div><div class='add'>+ *     voltage, gain should be reduced (gain table idx increased) by:</div><div class='add'>+ *</div><div class='add'>+ *     (eeprom - current) / 7</div><div class='add'>+ *</div><div class='add'>+ *     If the current voltage is lower (indicator is higher) than factory</div><div class='add'>+ *     voltage, gain should be increased (gain table idx decreased) by:</div><div class='add'>+ *</div><div class='add'>+ *     2 * (current - eeprom) / 7</div><div class='add'>+ *</div><div class='add'>+ *     If number of idx steps in either direction turns out to be &gt; 2,</div><div class='add'>+ *     something is wrong ... just use 0.</div><div class='add'>+ *</div><div class='add'>+ *     NOTE:  Voltage compensation is independent of band/channel.</div><div class='add'>+ *</div><div class='add'>+ *     NOTE:  "Initialize" uCode measures current voltage, which is assumed</div><div class='add'>+ *            to be constant after this initial measurement.  Voltage</div><div class='add'>+ *            compensation for txpower (number of steps in gain table)</div><div class='add'>+ *            may be calculated once and used until the next uCode bootload.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * 8)  If setting up txpowers for MIMO rates (rate idxes 8-15, 24-31),</div><div class='add'>+ *     adjust txpower for each transmitter chain, so txpower is balanced</div><div class='add'>+ *     between the two chains.  There are 5 pairs of tx_atten[group][chain]</div><div class='add'>+ *     values in "initialize alive", one pair for each of 5 channel ranges:</div><div class='add'>+ *</div><div class='add'>+ *     Group 0:  5 GHz channel 34-43</div><div class='add'>+ *     Group 1:  5 GHz channel 44-70</div><div class='add'>+ *     Group 2:  5 GHz channel 71-124</div><div class='add'>+ *     Group 3:  5 GHz channel 125-200</div><div class='add'>+ *     Group 4:  2.4 GHz all channels</div><div class='add'>+ *</div><div class='add'>+ *     Add the tx_atten[group][chain] value to the idx for the target chain.</div><div class='add'>+ *     The values are signed, but are in pairs of 0 and a non-negative number,</div><div class='add'>+ *     so as to reduce gain (if necessary) of the "hotter" channel.  This</div><div class='add'>+ *     avoids any need to double-check for regulatory compliance after</div><div class='add'>+ *     this step.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * 9)  If setting up for a CCK rate, lower the gain by adding a CCK compensation</div><div class='add'>+ *     value to the idx:</div><div class='add'>+ *</div><div class='add'>+ *     Hardware rev B:  9 steps (4.5 dB)</div><div class='add'>+ *     Hardware rev C:  5 steps (2.5 dB)</div><div class='add'>+ *</div><div class='add'>+ *     Hardware rev for 4965 can be determined by reading CSR_HW_REV_WA_REG,</div><div class='add'>+ *     bits [3:2], 1 = B, 2 = C.</div><div class='add'>+ *</div><div class='add'>+ *     NOTE:  This compensation is in addition to any saturation backoff that</div><div class='add'>+ *            might have been applied in an earlier step.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * 10) Select the gain table, based on band (2.4 vs 5 GHz).</div><div class='add'>+ *</div><div class='add'>+ *     Limit the adjusted idx to stay within the table!</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * 11) Read gain table entries for DSP and radio gain, place into appropriate</div><div class='add'>+ *     location(s) in command (struct il4965_txpowertable_cmd).</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * When MIMO is used (2 transmitters operating simultaneously), driver should</div><div class='add'>+ * limit each transmitter to deliver a max of 3 dB below the regulatory limit</div><div class='add'>+ * for the device.  That is, use half power for each transmitter, so total</div><div class='add'>+ * txpower is within regulatory limits.</div><div class='add'>+ *</div><div class='add'>+ * The value "6" represents number of steps in gain table to reduce power 3 dB.</div><div class='add'>+ * Each step is 1/2 dB.</div><div class='add'>+ */</div><div class='add'>+#define IL_TX_POWER_MIMO_REGULATORY_COMPENSATION (6)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * CCK gain compensation.</div><div class='add'>+ *</div><div class='add'>+ * When calculating txpowers for CCK, after making sure that the target power</div><div class='add'>+ * is within regulatory and saturation limits, driver must additionally</div><div class='add'>+ * back off gain by adding these values to the gain table idx.</div><div class='add'>+ *</div><div class='add'>+ * Hardware rev for 4965 can be determined by reading CSR_HW_REV_WA_REG,</div><div class='add'>+ * bits [3:2], 1 = B, 2 = C.</div><div class='add'>+ */</div><div class='add'>+#define IL_TX_POWER_CCK_COMPENSATION_B_STEP (9)</div><div class='add'>+#define IL_TX_POWER_CCK_COMPENSATION_C_STEP (5)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 4965 power supply voltage compensation for txpower</div><div class='add'>+ */</div><div class='add'>+#define TX_POWER_IL_VOLTAGE_CODES_PER_03V   (7)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Gain tables.</div><div class='add'>+ *</div><div class='add'>+ * The following tables contain pair of values for setting txpower, i.e.</div><div class='add'>+ * gain settings for the output of the device's digital signal processor (DSP),</div><div class='add'>+ * and for the analog gain structure of the transmitter.</div><div class='add'>+ *</div><div class='add'>+ * Each entry in the gain tables represents a step of 1/2 dB.  Note that these</div><div class='add'>+ * are *relative* steps, not indications of absolute output power.  Output</div><div class='add'>+ * power varies with temperature, voltage, and channel frequency, and also</div><div class='add'>+ * requires consideration of average power (to satisfy regulatory constraints),</div><div class='add'>+ * and peak power (to avoid distortion of the output signal).</div><div class='add'>+ *</div><div class='add'>+ * Each entry contains two values:</div><div class='add'>+ * 1)  DSP gain (or sometimes called DSP attenuation).  This is a fine-grained</div><div class='add'>+ *     linear value that multiplies the output of the digital signal processor,</div><div class='add'>+ *     before being sent to the analog radio.</div><div class='add'>+ * 2)  Radio gain.  This sets the analog gain of the radio Tx path.</div><div class='add'>+ *     It is a coarser setting, and behaves in a logarithmic (dB) fashion.</div><div class='add'>+ *</div><div class='add'>+ * EEPROM contains factory calibration data for txpower.  This maps actual</div><div class='add'>+ * measured txpower levels to gain settings in the "well known" tables</div><div class='add'>+ * below ("well-known" means here that both factory calibration *and* the</div><div class='add'>+ * driver work with the same table).</div><div class='add'>+ *</div><div class='add'>+ * There are separate tables for 2.4 GHz and 5 GHz bands.  The 5 GHz table</div><div class='add'>+ * has an extension (into negative idxes), in case the driver needs to</div><div class='add'>+ * boost power setting for high device temperatures (higher than would be</div><div class='add'>+ * present during factory calibration).  A 5 Ghz EEPROM idx of "40"</div><div class='add'>+ * corresponds to the 49th entry in the table used by the driver.</div><div class='add'>+ */</div><div class='add'>+#define MIN_TX_GAIN_IDX		(0)	/* highest gain, lowest idx, 2.4 */</div><div class='add'>+#define MIN_TX_GAIN_IDX_52GHZ_EXT	(-9)	/* highest gain, lowest idx, 5 */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * 2.4 GHz gain table</div><div class='add'>+ *</div><div class='add'>+ * Index    Dsp gain   Radio gain</div><div class='add'>+ *   0        110         0x3f      (highest gain)</div><div class='add'>+ *   1        104         0x3f</div><div class='add'>+ *   2         98         0x3f</div><div class='add'>+ *   3        110         0x3e</div><div class='add'>+ *   4        104         0x3e</div><div class='add'>+ *   5         98         0x3e</div><div class='add'>+ *   6        110         0x3d</div><div class='add'>+ *   7        104         0x3d</div><div class='add'>+ *   8         98         0x3d</div><div class='add'>+ *   9        110         0x3c</div><div class='add'>+ *  10        104         0x3c</div><div class='add'>+ *  11         98         0x3c</div><div class='add'>+ *  12        110         0x3b</div><div class='add'>+ *  13        104         0x3b</div><div class='add'>+ *  14         98         0x3b</div><div class='add'>+ *  15        110         0x3a</div><div class='add'>+ *  16        104         0x3a</div><div class='add'>+ *  17         98         0x3a</div><div class='add'>+ *  18        110         0x39</div><div class='add'>+ *  19        104         0x39</div><div class='add'>+ *  20         98         0x39</div><div class='add'>+ *  21        110         0x38</div><div class='add'>+ *  22        104         0x38</div><div class='add'>+ *  23         98         0x38</div><div class='add'>+ *  24        110         0x37</div><div class='add'>+ *  25        104         0x37</div><div class='add'>+ *  26         98         0x37</div><div class='add'>+ *  27        110         0x36</div><div class='add'>+ *  28        104         0x36</div><div class='add'>+ *  29         98         0x36</div><div class='add'>+ *  30        110         0x35</div><div class='add'>+ *  31        104         0x35</div><div class='add'>+ *  32         98         0x35</div><div class='add'>+ *  33        110         0x34</div><div class='add'>+ *  34        104         0x34</div><div class='add'>+ *  35         98         0x34</div><div class='add'>+ *  36        110         0x33</div><div class='add'>+ *  37        104         0x33</div><div class='add'>+ *  38         98         0x33</div><div class='add'>+ *  39        110         0x32</div><div class='add'>+ *  40        104         0x32</div><div class='add'>+ *  41         98         0x32</div><div class='add'>+ *  42        110         0x31</div><div class='add'>+ *  43        104         0x31</div><div class='add'>+ *  44         98         0x31</div><div class='add'>+ *  45        110         0x30</div><div class='add'>+ *  46        104         0x30</div><div class='add'>+ *  47         98         0x30</div><div class='add'>+ *  48        110          0x6</div><div class='add'>+ *  49        104          0x6</div><div class='add'>+ *  50         98          0x6</div><div class='add'>+ *  51        110          0x5</div><div class='add'>+ *  52        104          0x5</div><div class='add'>+ *  53         98          0x5</div><div class='add'>+ *  54        110          0x4</div><div class='add'>+ *  55        104          0x4</div><div class='add'>+ *  56         98          0x4</div><div class='add'>+ *  57        110          0x3</div><div class='add'>+ *  58        104          0x3</div><div class='add'>+ *  59         98          0x3</div><div class='add'>+ *  60        110          0x2</div><div class='add'>+ *  61        104          0x2</div><div class='add'>+ *  62         98          0x2</div><div class='add'>+ *  63        110          0x1</div><div class='add'>+ *  64        104          0x1</div><div class='add'>+ *  65         98          0x1</div><div class='add'>+ *  66        110          0x0</div><div class='add'>+ *  67        104          0x0</div><div class='add'>+ *  68         98          0x0</div><div class='add'>+ *  69         97            0</div><div class='add'>+ *  70         96            0</div><div class='add'>+ *  71         95            0</div><div class='add'>+ *  72         94            0</div><div class='add'>+ *  73         93            0</div><div class='add'>+ *  74         92            0</div><div class='add'>+ *  75         91            0</div><div class='add'>+ *  76         90            0</div><div class='add'>+ *  77         89            0</div><div class='add'>+ *  78         88            0</div><div class='add'>+ *  79         87            0</div><div class='add'>+ *  80         86            0</div><div class='add'>+ *  81         85            0</div><div class='add'>+ *  82         84            0</div><div class='add'>+ *  83         83            0</div><div class='add'>+ *  84         82            0</div><div class='add'>+ *  85         81            0</div><div class='add'>+ *  86         80            0</div><div class='add'>+ *  87         79            0</div><div class='add'>+ *  88         78            0</div><div class='add'>+ *  89         77            0</div><div class='add'>+ *  90         76            0</div><div class='add'>+ *  91         75            0</div><div class='add'>+ *  92         74            0</div><div class='add'>+ *  93         73            0</div><div class='add'>+ *  94         72            0</div><div class='add'>+ *  95         71            0</div><div class='add'>+ *  96         70            0</div><div class='add'>+ *  97         69            0</div><div class='add'>+ *  98         68            0</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * 5 GHz gain table</div><div class='add'>+ *</div><div class='add'>+ * Index    Dsp gain   Radio gain</div><div class='add'>+ *  -9 	      123         0x3F      (highest gain)</div><div class='add'>+ *  -8 	      117         0x3F</div><div class='add'>+ *  -7        110         0x3F</div><div class='add'>+ *  -6        104         0x3F</div><div class='add'>+ *  -5         98         0x3F</div><div class='add'>+ *  -4        110         0x3E</div><div class='add'>+ *  -3        104         0x3E</div><div class='add'>+ *  -2         98         0x3E</div><div class='add'>+ *  -1        110         0x3D</div><div class='add'>+ *   0        104         0x3D</div><div class='add'>+ *   1         98         0x3D</div><div class='add'>+ *   2        110         0x3C</div><div class='add'>+ *   3        104         0x3C</div><div class='add'>+ *   4         98         0x3C</div><div class='add'>+ *   5        110         0x3B</div><div class='add'>+ *   6        104         0x3B</div><div class='add'>+ *   7         98         0x3B</div><div class='add'>+ *   8        110         0x3A</div><div class='add'>+ *   9        104         0x3A</div><div class='add'>+ *  10         98         0x3A</div><div class='add'>+ *  11        110         0x39</div><div class='add'>+ *  12        104         0x39</div><div class='add'>+ *  13         98         0x39</div><div class='add'>+ *  14        110         0x38</div><div class='add'>+ *  15        104         0x38</div><div class='add'>+ *  16         98         0x38</div><div class='add'>+ *  17        110         0x37</div><div class='add'>+ *  18        104         0x37</div><div class='add'>+ *  19         98         0x37</div><div class='add'>+ *  20        110         0x36</div><div class='add'>+ *  21        104         0x36</div><div class='add'>+ *  22         98         0x36</div><div class='add'>+ *  23        110         0x35</div><div class='add'>+ *  24        104         0x35</div><div class='add'>+ *  25         98         0x35</div><div class='add'>+ *  26        110         0x34</div><div class='add'>+ *  27        104         0x34</div><div class='add'>+ *  28         98         0x34</div><div class='add'>+ *  29        110         0x33</div><div class='add'>+ *  30        104         0x33</div><div class='add'>+ *  31         98         0x33</div><div class='add'>+ *  32        110         0x32</div><div class='add'>+ *  33        104         0x32</div><div class='add'>+ *  34         98         0x32</div><div class='add'>+ *  35        110         0x31</div><div class='add'>+ *  36        104         0x31</div><div class='add'>+ *  37         98         0x31</div><div class='add'>+ *  38        110         0x30</div><div class='add'>+ *  39        104         0x30</div><div class='add'>+ *  40         98         0x30</div><div class='add'>+ *  41        110         0x25</div><div class='add'>+ *  42        104         0x25</div><div class='add'>+ *  43         98         0x25</div><div class='add'>+ *  44        110         0x24</div><div class='add'>+ *  45        104         0x24</div><div class='add'>+ *  46         98         0x24</div><div class='add'>+ *  47        110         0x23</div><div class='add'>+ *  48        104         0x23</div><div class='add'>+ *  49         98         0x23</div><div class='add'>+ *  50        110         0x22</div><div class='add'>+ *  51        104         0x18</div><div class='add'>+ *  52         98         0x18</div><div class='add'>+ *  53        110         0x17</div><div class='add'>+ *  54        104         0x17</div><div class='add'>+ *  55         98         0x17</div><div class='add'>+ *  56        110         0x16</div><div class='add'>+ *  57        104         0x16</div><div class='add'>+ *  58         98         0x16</div><div class='add'>+ *  59        110         0x15</div><div class='add'>+ *  60        104         0x15</div><div class='add'>+ *  61         98         0x15</div><div class='add'>+ *  62        110         0x14</div><div class='add'>+ *  63        104         0x14</div><div class='add'>+ *  64         98         0x14</div><div class='add'>+ *  65        110         0x13</div><div class='add'>+ *  66        104         0x13</div><div class='add'>+ *  67         98         0x13</div><div class='add'>+ *  68        110         0x12</div><div class='add'>+ *  69        104         0x08</div><div class='add'>+ *  70         98         0x08</div><div class='add'>+ *  71        110         0x07</div><div class='add'>+ *  72        104         0x07</div><div class='add'>+ *  73         98         0x07</div><div class='add'>+ *  74        110         0x06</div><div class='add'>+ *  75        104         0x06</div><div class='add'>+ *  76         98         0x06</div><div class='add'>+ *  77        110         0x05</div><div class='add'>+ *  78        104         0x05</div><div class='add'>+ *  79         98         0x05</div><div class='add'>+ *  80        110         0x04</div><div class='add'>+ *  81        104         0x04</div><div class='add'>+ *  82         98         0x04</div><div class='add'>+ *  83        110         0x03</div><div class='add'>+ *  84        104         0x03</div><div class='add'>+ *  85         98         0x03</div><div class='add'>+ *  86        110         0x02</div><div class='add'>+ *  87        104         0x02</div><div class='add'>+ *  88         98         0x02</div><div class='add'>+ *  89        110         0x01</div><div class='add'>+ *  90        104         0x01</div><div class='add'>+ *  91         98         0x01</div><div class='add'>+ *  92        110         0x00</div><div class='add'>+ *  93        104         0x00</div><div class='add'>+ *  94         98         0x00</div><div class='add'>+ *  95         93         0x00</div><div class='add'>+ *  96         88         0x00</div><div class='add'>+ *  97         83         0x00</div><div class='add'>+ *  98         78         0x00</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Sanity checks and default values for EEPROM regulatory levels.</div><div class='add'>+ * If EEPROM values fall outside MIN/MAX range, use default values.</div><div class='add'>+ *</div><div class='add'>+ * Regulatory limits refer to the maximum average txpower allowed by</div><div class='add'>+ * regulatory agencies in the geographies in which the device is meant</div><div class='add'>+ * to be operated.  These limits are SKU-specific (i.e. geography-specific),</div><div class='add'>+ * and channel-specific; each channel has an individual regulatory limit</div><div class='add'>+ * listed in the EEPROM.</div><div class='add'>+ *</div><div class='add'>+ * Units are in half-dBm (i.e. "34" means 17 dBm).</div><div class='add'>+ */</div><div class='add'>+#define IL_TX_POWER_DEFAULT_REGULATORY_24   (34)</div><div class='add'>+#define IL_TX_POWER_DEFAULT_REGULATORY_52   (34)</div><div class='add'>+#define IL_TX_POWER_REGULATORY_MIN          (0)</div><div class='add'>+#define IL_TX_POWER_REGULATORY_MAX          (34)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Sanity checks and default values for EEPROM saturation levels.</div><div class='add'>+ * If EEPROM values fall outside MIN/MAX range, use default values.</div><div class='add'>+ *</div><div class='add'>+ * Saturation is the highest level that the output power amplifier can produce</div><div class='add'>+ * without significant clipping distortion.  This is a "peak" power level.</div><div class='add'>+ * Different types of modulation (i.e. various "rates", and OFDM vs. CCK)</div><div class='add'>+ * require differing amounts of backoff, relative to their average power output,</div><div class='add'>+ * in order to avoid clipping distortion.</div><div class='add'>+ *</div><div class='add'>+ * Driver must make sure that it is violating neither the saturation limit,</div><div class='add'>+ * nor the regulatory limit, when calculating Tx power settings for various</div><div class='add'>+ * rates.</div><div class='add'>+ *</div><div class='add'>+ * Units are in half-dBm (i.e. "38" means 19 dBm).</div><div class='add'>+ */</div><div class='add'>+#define IL_TX_POWER_DEFAULT_SATURATION_24   (38)</div><div class='add'>+#define IL_TX_POWER_DEFAULT_SATURATION_52   (38)</div><div class='add'>+#define IL_TX_POWER_SATURATION_MIN          (20)</div><div class='add'>+#define IL_TX_POWER_SATURATION_MAX          (50)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Channel groups used for Tx Attenuation calibration (MIMO tx channel balance)</div><div class='add'>+ * and thermal Txpower calibration.</div><div class='add'>+ *</div><div class='add'>+ * When calculating txpower, driver must compensate for current device</div><div class='add'>+ * temperature; higher temperature requires higher gain.  Driver must calculate</div><div class='add'>+ * current temperature (see "4965 temperature calculation"), then compare vs.</div><div class='add'>+ * factory calibration temperature in EEPROM; if current temperature is higher</div><div class='add'>+ * than factory temperature, driver must *increase* gain by proportions shown</div><div class='add'>+ * in table below.  If current temperature is lower than factory, driver must</div><div class='add'>+ * *decrease* gain.</div><div class='add'>+ *</div><div class='add'>+ * Different frequency ranges require different compensation, as shown below.</div><div class='add'>+ */</div><div class='add'>+/* Group 0, 5.2 GHz ch 34-43:  4.5 degrees per 1/2 dB. */</div><div class='add'>+#define CALIB_IL_TX_ATTEN_GR1_FCH 34</div><div class='add'>+#define CALIB_IL_TX_ATTEN_GR1_LCH 43</div><div class='add'>+</div><div class='add'>+/* Group 1, 5.3 GHz ch 44-70:  4.0 degrees per 1/2 dB. */</div><div class='add'>+#define CALIB_IL_TX_ATTEN_GR2_FCH 44</div><div class='add'>+#define CALIB_IL_TX_ATTEN_GR2_LCH 70</div><div class='add'>+</div><div class='add'>+/* Group 2, 5.5 GHz ch 71-124:  4.0 degrees per 1/2 dB. */</div><div class='add'>+#define CALIB_IL_TX_ATTEN_GR3_FCH 71</div><div class='add'>+#define CALIB_IL_TX_ATTEN_GR3_LCH 124</div><div class='add'>+</div><div class='add'>+/* Group 3, 5.7 GHz ch 125-200:  4.0 degrees per 1/2 dB. */</div><div class='add'>+#define CALIB_IL_TX_ATTEN_GR4_FCH 125</div><div class='add'>+#define CALIB_IL_TX_ATTEN_GR4_LCH 200</div><div class='add'>+</div><div class='add'>+/* Group 4, 2.4 GHz all channels:  3.5 degrees per 1/2 dB. */</div><div class='add'>+#define CALIB_IL_TX_ATTEN_GR5_FCH 1</div><div class='add'>+#define CALIB_IL_TX_ATTEN_GR5_LCH 20</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CALIB_CH_GROUP_1 = 0,</div><div class='add'>+	CALIB_CH_GROUP_2 = 1,</div><div class='add'>+	CALIB_CH_GROUP_3 = 2,</div><div class='add'>+	CALIB_CH_GROUP_4 = 3,</div><div class='add'>+	CALIB_CH_GROUP_5 = 4,</div><div class='add'>+	CALIB_CH_GROUP_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/********************* END TXPOWER *****************************************/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Tx/Rx Queues</div><div class='add'>+ *</div><div class='add'>+ * Most communication between driver and 4965 is via queues of data buffers.</div><div class='add'>+ * For example, all commands that the driver issues to device's embedded</div><div class='add'>+ * controller (uCode) are via the command queue (one of the Tx queues).  All</div><div class='add'>+ * uCode command responses/replies/notifications, including Rx frames, are</div><div class='add'>+ * conveyed from uCode to driver via the Rx queue.</div><div class='add'>+ *</div><div class='add'>+ * Most support for these queues, including handshake support, resides in</div><div class='add'>+ * structures in host DRAM, shared between the driver and the device.  When</div><div class='add'>+ * allocating this memory, the driver must make sure that data written by</div><div class='add'>+ * the host CPU updates DRAM immediately (and does not get "stuck" in CPU's</div><div class='add'>+ * cache memory), so DRAM and cache are consistent, and the device can</div><div class='add'>+ * immediately see changes made by the driver.</div><div class='add'>+ *</div><div class='add'>+ * 4965 supports up to 16 DRAM-based Tx queues, and services these queues via</div><div class='add'>+ * up to 7 DMA channels (FIFOs).  Each Tx queue is supported by a circular array</div><div class='add'>+ * in DRAM containing 256 Transmit Frame Descriptors (TFDs).</div><div class='add'>+ */</div><div class='add'>+#define IL49_NUM_FIFOS	7</div><div class='add'>+#define IL49_CMD_FIFO_NUM	4</div><div class='add'>+#define IL49_NUM_QUEUES	16</div><div class='add'>+#define IL49_NUM_AMPDU_QUEUES	8</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct il4965_schedq_bc_tbl</div><div class='add'>+ *</div><div class='add'>+ * Byte Count table</div><div class='add'>+ *</div><div class='add'>+ * Each Tx queue uses a byte-count table containing 320 entries:</div><div class='add'>+ * one 16-bit entry for each of 256 TFDs, plus an additional 64 entries that</div><div class='add'>+ * duplicate the first 64 entries (to avoid wrap-around within a Tx win;</div><div class='add'>+ * max Tx win is 64 TFDs).</div><div class='add'>+ *</div><div class='add'>+ * When driver sets up a new TFD, it must also enter the total byte count</div><div class='add'>+ * of the frame to be transmitted into the corresponding entry in the byte</div><div class='add'>+ * count table for the chosen Tx queue.  If the TFD idx is 0-63, the driver</div><div class='add'>+ * must duplicate the byte count entry in corresponding idx 256-319.</div><div class='add'>+ *</div><div class='add'>+ * padding puts each byte count table on a 1024-byte boundary;</div><div class='add'>+ * 4965 assumes tables are separated by 1024 bytes.</div><div class='add'>+ */</div><div class='add'>+struct il4965_scd_bc_tbl {</div><div class='add'>+	__le16 tfd_offset[TFD_QUEUE_BC_SIZE];</div><div class='add'>+	u8 pad[1024 - (TFD_QUEUE_BC_SIZE) * sizeof(__le16)];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define IL4965_RTC_INST_LOWER_BOUND		(0x000000)</div><div class='add'>+</div><div class='add'>+/* RSSI to dBm */</div><div class='add'>+#define IL4965_RSSI_OFFSET	44</div><div class='add'>+</div><div class='add'>+/* PCI registers */</div><div class='add'>+#define PCI_CFG_RETRY_TIMEOUT	0x041</div><div class='add'>+</div><div class='add'>+/* PCI register values */</div><div class='add'>+#define PCI_CFG_LINK_CTRL_VAL_L0S_EN	0x01</div><div class='add'>+#define PCI_CFG_LINK_CTRL_VAL_L1_EN	0x02</div><div class='add'>+</div><div class='add'>+#define IL4965_DEFAULT_TX_RETRY  15</div><div class='add'>+</div><div class='add'>+/* EEPROM */</div><div class='add'>+#define IL4965_FIRST_AMPDU_QUEUE	10</div><div class='add'>+</div><div class='add'>+/* Calibration */</div><div class='add'>+void il4965_chain_noise_calibration(struct il_priv *il, void *stat_resp);</div><div class='add'>+void il4965_sensitivity_calibration(struct il_priv *il, void *resp);</div><div class='add'>+void il4965_init_sensitivity(struct il_priv *il);</div><div class='add'>+void il4965_reset_run_time_calib(struct il_priv *il);</div><div class='add'>+void il4965_calib_free_results(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+/* Debug */</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+ssize_t il4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,</div><div class='add'>+				   size_t count, loff_t *ppos);</div><div class='add'>+ssize_t il4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,</div><div class='add'>+				   size_t count, loff_t *ppos);</div><div class='add'>+ssize_t il4965_ucode_general_stats_read(struct file *file,</div><div class='add'>+					char __user *user_buf, size_t count,</div><div class='add'>+					loff_t *ppos);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/****************************/</div><div class='add'>+/* Flow Handler Definitions */</div><div class='add'>+/****************************/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * This I/O area is directly read/writable by driver (e.g. Linux uses writel())</div><div class='add'>+ * Addresses are offsets from device's PCI hardware base address.</div><div class='add'>+ */</div><div class='add'>+#define FH49_MEM_LOWER_BOUND                   (0x1000)</div><div class='add'>+#define FH49_MEM_UPPER_BOUND                   (0x2000)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Keep-Warm (KW) buffer base address.</div><div class='add'>+ *</div><div class='add'>+ * Driver must allocate a 4KByte buffer that is used by 4965 for keeping the</div><div class='add'>+ * host DRAM powered on (via dummy accesses to DRAM) to maintain low-latency</div><div class='add'>+ * DRAM access when 4965 is Txing or Rxing.  The dummy accesses prevent host</div><div class='add'>+ * from going into a power-savings mode that would cause higher DRAM latency,</div><div class='add'>+ * and possible data over/under-runs, before all Tx/Rx is complete.</div><div class='add'>+ *</div><div class='add'>+ * Driver loads FH49_KW_MEM_ADDR_REG with the physical address (bits 35:4)</div><div class='add'>+ * of the buffer, which must be 4K aligned.  Once this is set up, the 4965</div><div class='add'>+ * automatically invokes keep-warm accesses when normal accesses might not</div><div class='add'>+ * be sufficient to maintain fast DRAM response.</div><div class='add'>+ *</div><div class='add'>+ * Bit fields:</div><div class='add'>+ *  31-0:  Keep-warm buffer physical base address [35:4], must be 4K aligned</div><div class='add'>+ */</div><div class='add'>+#define FH49_KW_MEM_ADDR_REG		     (FH49_MEM_LOWER_BOUND + 0x97C)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * TFD Circular Buffers Base (CBBC) addresses</div><div class='add'>+ *</div><div class='add'>+ * 4965 has 16 base pointer registers, one for each of 16 host-DRAM-resident</div><div class='add'>+ * circular buffers (CBs/queues) containing Transmit Frame Descriptors (TFDs)</div><div class='add'>+ * (see struct il_tfd_frame).  These 16 pointer registers are offset by 0x04</div><div class='add'>+ * bytes from one another.  Each TFD circular buffer in DRAM must be 256-byte</div><div class='add'>+ * aligned (address bits 0-7 must be 0).</div><div class='add'>+ *</div><div class='add'>+ * Bit fields in each pointer register:</div><div class='add'>+ *  27-0: TFD CB physical base address [35:8], must be 256-byte aligned</div><div class='add'>+ */</div><div class='add'>+#define FH49_MEM_CBBC_LOWER_BOUND          (FH49_MEM_LOWER_BOUND + 0x9D0)</div><div class='add'>+#define FH49_MEM_CBBC_UPPER_BOUND          (FH49_MEM_LOWER_BOUND + 0xA10)</div><div class='add'>+</div><div class='add'>+/* Find TFD CB base pointer for given queue (range 0-15). */</div><div class='add'>+#define FH49_MEM_CBBC_QUEUE(x)  (FH49_MEM_CBBC_LOWER_BOUND + (x) * 0x4)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Rx SRAM Control and Status Registers (RSCSR)</div><div class='add'>+ *</div><div class='add'>+ * These registers provide handshake between driver and 4965 for the Rx queue</div><div class='add'>+ * (this queue handles *all* command responses, notifications, Rx data, etc.</div><div class='add'>+ * sent from 4965 uCode to host driver).  Unlike Tx, there is only one Rx</div><div class='add'>+ * queue, and only one Rx DMA/FIFO channel.  Also unlike Tx, which can</div><div class='add'>+ * concatenate up to 20 DRAM buffers to form a Tx frame, each Receive Buffer</div><div class='add'>+ * Descriptor (RBD) points to only one Rx Buffer (RB); there is a 1:1</div><div class='add'>+ * mapping between RBDs and RBs.</div><div class='add'>+ *</div><div class='add'>+ * Driver must allocate host DRAM memory for the following, and set the</div><div class='add'>+ * physical address of each into 4965 registers:</div><div class='add'>+ *</div><div class='add'>+ * 1)  Receive Buffer Descriptor (RBD) circular buffer (CB), typically with 256</div><div class='add'>+ *     entries (although any power of 2, up to 4096, is selectable by driver).</div><div class='add'>+ *     Each entry (1 dword) points to a receive buffer (RB) of consistent size</div><div class='add'>+ *     (typically 4K, although 8K or 16K are also selectable by driver).</div><div class='add'>+ *     Driver sets up RB size and number of RBDs in the CB via Rx config</div><div class='add'>+ *     register FH49_MEM_RCSR_CHNL0_CONFIG_REG.</div><div class='add'>+ *</div><div class='add'>+ *     Bit fields within one RBD:</div><div class='add'>+ *     27-0:  Receive Buffer physical address bits [35:8], 256-byte aligned</div><div class='add'>+ *</div><div class='add'>+ *     Driver sets physical address [35:8] of base of RBD circular buffer</div><div class='add'>+ *     into FH49_RSCSR_CHNL0_RBDCB_BASE_REG [27:0].</div><div class='add'>+ *</div><div class='add'>+ * 2)  Rx status buffer, 8 bytes, in which 4965 indicates which Rx Buffers</div><div class='add'>+ *     (RBs) have been filled, via a "write pointer", actually the idx of</div><div class='add'>+ *     the RB's corresponding RBD within the circular buffer.  Driver sets</div><div class='add'>+ *     physical address [35:4] into FH49_RSCSR_CHNL0_STTS_WPTR_REG [31:0].</div><div class='add'>+ *</div><div class='add'>+ *     Bit fields in lower dword of Rx status buffer (upper dword not used</div><div class='add'>+ *     by driver; see struct il4965_shared, val0):</div><div class='add'>+ *     31-12:  Not used by driver</div><div class='add'>+ *     11- 0:  Index of last filled Rx buffer descriptor</div><div class='add'>+ *             (4965 writes, driver reads this value)</div><div class='add'>+ *</div><div class='add'>+ * As the driver prepares Receive Buffers (RBs) for 4965 to fill, driver must</div><div class='add'>+ * enter pointers to these RBs into contiguous RBD circular buffer entries,</div><div class='add'>+ * and update the 4965's "write" idx register,</div><div class='add'>+ * FH49_RSCSR_CHNL0_RBDCB_WPTR_REG.</div><div class='add'>+ *</div><div class='add'>+ * This "write" idx corresponds to the *next* RBD that the driver will make</div><div class='add'>+ * available, i.e. one RBD past the tail of the ready-to-fill RBDs within</div><div class='add'>+ * the circular buffer.  This value should initially be 0 (before preparing any</div><div class='add'>+ * RBs), should be 8 after preparing the first 8 RBs (for example), and must</div><div class='add'>+ * wrap back to 0 at the end of the circular buffer (but don't wrap before</div><div class='add'>+ * "read" idx has advanced past 1!  See below).</div><div class='add'>+ * NOTE:  4965 EXPECTS THE WRITE IDX TO BE INCREMENTED IN MULTIPLES OF 8.</div><div class='add'>+ *</div><div class='add'>+ * As the 4965 fills RBs (referenced from contiguous RBDs within the circular</div><div class='add'>+ * buffer), it updates the Rx status buffer in host DRAM, 2) described above,</div><div class='add'>+ * to tell the driver the idx of the latest filled RBD.  The driver must</div><div class='add'>+ * read this "read" idx from DRAM after receiving an Rx interrupt from 4965.</div><div class='add'>+ *</div><div class='add'>+ * The driver must also internally keep track of a third idx, which is the</div><div class='add'>+ * next RBD to process.  When receiving an Rx interrupt, driver should process</div><div class='add'>+ * all filled but unprocessed RBs up to, but not including, the RB</div><div class='add'>+ * corresponding to the "read" idx.  For example, if "read" idx becomes "1",</div><div class='add'>+ * driver may process the RB pointed to by RBD 0.  Depending on volume of</div><div class='add'>+ * traffic, there may be many RBs to process.</div><div class='add'>+ *</div><div class='add'>+ * If read idx == write idx, 4965 thinks there is no room to put new data.</div><div class='add'>+ * Due to this, the maximum number of filled RBs is 255, instead of 256.  To</div><div class='add'>+ * be safe, make sure that there is a gap of at least 2 RBDs between "write"</div><div class='add'>+ * and "read" idxes; that is, make sure that there are no more than 254</div><div class='add'>+ * buffers waiting to be filled.</div><div class='add'>+ */</div><div class='add'>+#define FH49_MEM_RSCSR_LOWER_BOUND	(FH49_MEM_LOWER_BOUND + 0xBC0)</div><div class='add'>+#define FH49_MEM_RSCSR_UPPER_BOUND	(FH49_MEM_LOWER_BOUND + 0xC00)</div><div class='add'>+#define FH49_MEM_RSCSR_CHNL0		(FH49_MEM_RSCSR_LOWER_BOUND)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Physical base address of 8-byte Rx Status buffer.</div><div class='add'>+ * Bit fields:</div><div class='add'>+ *  31-0: Rx status buffer physical base address [35:4], must 16-byte aligned.</div><div class='add'>+ */</div><div class='add'>+#define FH49_RSCSR_CHNL0_STTS_WPTR_REG	(FH49_MEM_RSCSR_CHNL0)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Physical base address of Rx Buffer Descriptor Circular Buffer.</div><div class='add'>+ * Bit fields:</div><div class='add'>+ *  27-0:  RBD CD physical base address [35:8], must be 256-byte aligned.</div><div class='add'>+ */</div><div class='add'>+#define FH49_RSCSR_CHNL0_RBDCB_BASE_REG	(FH49_MEM_RSCSR_CHNL0 + 0x004)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Rx write pointer (idx, really!).</div><div class='add'>+ * Bit fields:</div><div class='add'>+ *  11-0:  Index of driver's most recent prepared-to-be-filled RBD, + 1.</div><div class='add'>+ *         NOTE:  For 256-entry circular buffer, use only bits [7:0].</div><div class='add'>+ */</div><div class='add'>+#define FH49_RSCSR_CHNL0_RBDCB_WPTR_REG	(FH49_MEM_RSCSR_CHNL0 + 0x008)</div><div class='add'>+#define FH49_RSCSR_CHNL0_WPTR        (FH49_RSCSR_CHNL0_RBDCB_WPTR_REG)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Rx Config/Status Registers (RCSR)</div><div class='add'>+ * Rx Config Reg for channel 0 (only channel used)</div><div class='add'>+ *</div><div class='add'>+ * Driver must initialize FH49_MEM_RCSR_CHNL0_CONFIG_REG as follows for</div><div class='add'>+ * normal operation (see bit fields).</div><div class='add'>+ *</div><div class='add'>+ * Clearing FH49_MEM_RCSR_CHNL0_CONFIG_REG to 0 turns off Rx DMA.</div><div class='add'>+ * Driver should poll FH49_MEM_RSSR_RX_STATUS_REG	for</div><div class='add'>+ * FH49_RSSR_CHNL0_RX_STATUS_CHNL_IDLE (bit 24) before continuing.</div><div class='add'>+ *</div><div class='add'>+ * Bit fields:</div><div class='add'>+ * 31-30: Rx DMA channel enable: '00' off/pause, '01' pause at end of frame,</div><div class='add'>+ *        '10' operate normally</div><div class='add'>+ * 29-24: reserved</div><div class='add'>+ * 23-20: # RBDs in circular buffer = 2^value; use "8" for 256 RBDs (normal),</div><div class='add'>+ *        min "5" for 32 RBDs, max "12" for 4096 RBDs.</div><div class='add'>+ * 19-18: reserved</div><div class='add'>+ * 17-16: size of each receive buffer; '00' 4K (normal), '01' 8K,</div><div class='add'>+ *        '10' 12K, '11' 16K.</div><div class='add'>+ * 15-14: reserved</div><div class='add'>+ * 13-12: IRQ destination; '00' none, '01' host driver (normal operation)</div><div class='add'>+ * 11- 4: timeout for closing Rx buffer and interrupting host (units 32 usec)</div><div class='add'>+ *        typical value 0x10 (about 1/2 msec)</div><div class='add'>+ *  3- 0: reserved</div><div class='add'>+ */</div><div class='add'>+#define FH49_MEM_RCSR_LOWER_BOUND      (FH49_MEM_LOWER_BOUND + 0xC00)</div><div class='add'>+#define FH49_MEM_RCSR_UPPER_BOUND      (FH49_MEM_LOWER_BOUND + 0xCC0)</div><div class='add'>+#define FH49_MEM_RCSR_CHNL0            (FH49_MEM_RCSR_LOWER_BOUND)</div><div class='add'>+</div><div class='add'>+#define FH49_MEM_RCSR_CHNL0_CONFIG_REG	(FH49_MEM_RCSR_CHNL0)</div><div class='add'>+</div><div class='add'>+#define FH49_RCSR_CHNL0_RX_CONFIG_RB_TIMEOUT_MSK (0x00000FF0)	/* bits 4-11 */</div><div class='add'>+#define FH49_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_MSK   (0x00001000)	/* bits 12 */</div><div class='add'>+#define FH49_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME_MSK (0x00008000)	/* bit 15 */</div><div class='add'>+#define FH49_RCSR_CHNL0_RX_CONFIG_RB_SIZE_MSK   (0x00030000)	/* bits 16-17 */</div><div class='add'>+#define FH49_RCSR_CHNL0_RX_CONFIG_RBDBC_SIZE_MSK (0x00F00000)	/* bits 20-23 */</div><div class='add'>+#define FH49_RCSR_CHNL0_RX_CONFIG_DMA_CHNL_EN_MSK (0xC0000000)	/* bits 30-31 */</div><div class='add'>+</div><div class='add'>+#define FH49_RCSR_RX_CONFIG_RBDCB_SIZE_POS	(20)</div><div class='add'>+#define FH49_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS	(4)</div><div class='add'>+#define RX_RB_TIMEOUT	(0x10)</div><div class='add'>+</div><div class='add'>+#define FH49_RCSR_RX_CONFIG_CHNL_EN_PAUSE_VAL         (0x00000000)</div><div class='add'>+#define FH49_RCSR_RX_CONFIG_CHNL_EN_PAUSE_EOF_VAL     (0x40000000)</div><div class='add'>+#define FH49_RCSR_RX_CONFIG_CHNL_EN_ENABLE_VAL        (0x80000000)</div><div class='add'>+</div><div class='add'>+#define FH49_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_4K    (0x00000000)</div><div class='add'>+#define FH49_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_8K    (0x00010000)</div><div class='add'>+#define FH49_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_12K   (0x00020000)</div><div class='add'>+#define FH49_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_16K   (0x00030000)</div><div class='add'>+</div><div class='add'>+#define FH49_RCSR_CHNL0_RX_IGNORE_RXF_EMPTY              (0x00000004)</div><div class='add'>+#define FH49_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_NO_INT_VAL    (0x00000000)</div><div class='add'>+#define FH49_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL  (0x00001000)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Rx Shared Status Registers (RSSR)</div><div class='add'>+ *</div><div class='add'>+ * After stopping Rx DMA channel (writing 0 to</div><div class='add'>+ * FH49_MEM_RCSR_CHNL0_CONFIG_REG), driver must poll</div><div class='add'>+ * FH49_MEM_RSSR_RX_STATUS_REG until Rx channel is idle.</div><div class='add'>+ *</div><div class='add'>+ * Bit fields:</div><div class='add'>+ *  24:  1 = Channel 0 is idle</div><div class='add'>+ *</div><div class='add'>+ * FH49_MEM_RSSR_SHARED_CTRL_REG and FH49_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV</div><div class='add'>+ * contain default values that should not be altered by the driver.</div><div class='add'>+ */</div><div class='add'>+#define FH49_MEM_RSSR_LOWER_BOUND           (FH49_MEM_LOWER_BOUND + 0xC40)</div><div class='add'>+#define FH49_MEM_RSSR_UPPER_BOUND           (FH49_MEM_LOWER_BOUND + 0xD00)</div><div class='add'>+</div><div class='add'>+#define FH49_MEM_RSSR_SHARED_CTRL_REG       (FH49_MEM_RSSR_LOWER_BOUND)</div><div class='add'>+#define FH49_MEM_RSSR_RX_STATUS_REG	(FH49_MEM_RSSR_LOWER_BOUND + 0x004)</div><div class='add'>+#define FH49_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV\</div><div class='add'>+					(FH49_MEM_RSSR_LOWER_BOUND + 0x008)</div><div class='add'>+</div><div class='add'>+#define FH49_RSSR_CHNL0_RX_STATUS_CHNL_IDLE	(0x01000000)</div><div class='add'>+</div><div class='add'>+#define FH49_MEM_TFDIB_REG1_ADDR_BITSHIFT	28</div><div class='add'>+</div><div class='add'>+/* TFDB  Area - TFDs buffer table */</div><div class='add'>+#define FH49_MEM_TFDIB_DRAM_ADDR_LSB_MSK      (0xFFFFFFFF)</div><div class='add'>+#define FH49_TFDIB_LOWER_BOUND       (FH49_MEM_LOWER_BOUND + 0x900)</div><div class='add'>+#define FH49_TFDIB_UPPER_BOUND       (FH49_MEM_LOWER_BOUND + 0x958)</div><div class='add'>+#define FH49_TFDIB_CTRL0_REG(_chnl)  (FH49_TFDIB_LOWER_BOUND + 0x8 * (_chnl))</div><div class='add'>+#define FH49_TFDIB_CTRL1_REG(_chnl)  (FH49_TFDIB_LOWER_BOUND + 0x8 * (_chnl) + 0x4)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Transmit DMA Channel Control/Status Registers (TCSR)</div><div class='add'>+ *</div><div class='add'>+ * 4965 has one configuration register for each of 8 Tx DMA/FIFO channels</div><div class='add'>+ * supported in hardware (don't confuse these with the 16 Tx queues in DRAM,</div><div class='add'>+ * which feed the DMA/FIFO channels); config regs are separated by 0x20 bytes.</div><div class='add'>+ *</div><div class='add'>+ * To use a Tx DMA channel, driver must initialize its</div><div class='add'>+ * FH49_TCSR_CHNL_TX_CONFIG_REG(chnl) with:</div><div class='add'>+ *</div><div class='add'>+ * FH49_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE |</div><div class='add'>+ * FH49_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE_VAL</div><div class='add'>+ *</div><div class='add'>+ * All other bits should be 0.</div><div class='add'>+ *</div><div class='add'>+ * Bit fields:</div><div class='add'>+ * 31-30: Tx DMA channel enable: '00' off/pause, '01' pause at end of frame,</div><div class='add'>+ *        '10' operate normally</div><div class='add'>+ * 29- 4: Reserved, set to "0"</div><div class='add'>+ *     3: Enable internal DMA requests (1, normal operation), disable (0)</div><div class='add'>+ *  2- 0: Reserved, set to "0"</div><div class='add'>+ */</div><div class='add'>+#define FH49_TCSR_LOWER_BOUND  (FH49_MEM_LOWER_BOUND + 0xD00)</div><div class='add'>+#define FH49_TCSR_UPPER_BOUND  (FH49_MEM_LOWER_BOUND + 0xE60)</div><div class='add'>+</div><div class='add'>+/* Find Control/Status reg for given Tx DMA/FIFO channel */</div><div class='add'>+#define FH49_TCSR_CHNL_NUM                            (7)</div><div class='add'>+#define FH50_TCSR_CHNL_NUM                            (8)</div><div class='add'>+</div><div class='add'>+/* TCSR: tx_config register values */</div><div class='add'>+#define FH49_TCSR_CHNL_TX_CONFIG_REG(_chnl)	\</div><div class='add'>+		(FH49_TCSR_LOWER_BOUND + 0x20 * (_chnl))</div><div class='add'>+#define FH49_TCSR_CHNL_TX_CREDIT_REG(_chnl)	\</div><div class='add'>+		(FH49_TCSR_LOWER_BOUND + 0x20 * (_chnl) + 0x4)</div><div class='add'>+#define FH49_TCSR_CHNL_TX_BUF_STS_REG(_chnl)	\</div><div class='add'>+		(FH49_TCSR_LOWER_BOUND + 0x20 * (_chnl) + 0x8)</div><div class='add'>+</div><div class='add'>+#define FH49_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_TXF		(0x00000000)</div><div class='add'>+#define FH49_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_DRV		(0x00000001)</div><div class='add'>+</div><div class='add'>+#define FH49_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE	(0x00000000)</div><div class='add'>+#define FH49_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE	(0x00000008)</div><div class='add'>+</div><div class='add'>+#define FH49_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_NOINT	(0x00000000)</div><div class='add'>+#define FH49_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD	(0x00100000)</div><div class='add'>+#define FH49_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_IFTFD	(0x00200000)</div><div class='add'>+</div><div class='add'>+#define FH49_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_NOINT	(0x00000000)</div><div class='add'>+#define FH49_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_ENDTFD	(0x00400000)</div><div class='add'>+#define FH49_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_IFTFD	(0x00800000)</div><div class='add'>+</div><div class='add'>+#define FH49_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE	(0x00000000)</div><div class='add'>+#define FH49_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE_EOF	(0x40000000)</div><div class='add'>+#define FH49_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE	(0x80000000)</div><div class='add'>+</div><div class='add'>+#define FH49_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_EMPTY	(0x00000000)</div><div class='add'>+#define FH49_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_WAIT	(0x00002000)</div><div class='add'>+#define FH49_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_VALID	(0x00000003)</div><div class='add'>+</div><div class='add'>+#define FH49_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_NUM		(20)</div><div class='add'>+#define FH49_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_IDX		(12)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Tx Shared Status Registers (TSSR)</div><div class='add'>+ *</div><div class='add'>+ * After stopping Tx DMA channel (writing 0 to</div><div class='add'>+ * FH49_TCSR_CHNL_TX_CONFIG_REG(chnl)), driver must poll</div><div class='add'>+ * FH49_TSSR_TX_STATUS_REG until selected Tx channel is idle</div><div class='add'>+ * (channel's buffers empty | no pending requests).</div><div class='add'>+ *</div><div class='add'>+ * Bit fields:</div><div class='add'>+ * 31-24:  1 = Channel buffers empty (channel 7:0)</div><div class='add'>+ * 23-16:  1 = No pending requests (channel 7:0)</div><div class='add'>+ */</div><div class='add'>+#define FH49_TSSR_LOWER_BOUND		(FH49_MEM_LOWER_BOUND + 0xEA0)</div><div class='add'>+#define FH49_TSSR_UPPER_BOUND		(FH49_MEM_LOWER_BOUND + 0xEC0)</div><div class='add'>+</div><div class='add'>+#define FH49_TSSR_TX_STATUS_REG		(FH49_TSSR_LOWER_BOUND + 0x010)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Bit fields for TSSR(Tx Shared Status &amp; Control) error status register:</div><div class='add'>+ * 31:  Indicates an address error when accessed to internal memory</div><div class='add'>+ *	uCode/driver must write "1" in order to clear this flag</div><div class='add'>+ * 30:  Indicates that Host did not send the expected number of dwords to FH</div><div class='add'>+ *	uCode/driver must write "1" in order to clear this flag</div><div class='add'>+ * 16-9:Each status bit is for one channel. Indicates that an (Error) ActDMA</div><div class='add'>+ *	command was received from the scheduler while the TRB was already full</div><div class='add'>+ *	with previous command</div><div class='add'>+ *	uCode/driver must write "1" in order to clear this flag</div><div class='add'>+ * 7-0: Each status bit indicates a channel's TxCredit error. When an error</div><div class='add'>+ *	bit is set, it indicates that the FH has received a full indication</div><div class='add'>+ *	from the RTC TxFIFO and the current value of the TxCredit counter was</div><div class='add'>+ *	not equal to zero. This mean that the credit mechanism was not</div><div class='add'>+ *	synchronized to the TxFIFO status</div><div class='add'>+ *	uCode/driver must write "1" in order to clear this flag</div><div class='add'>+ */</div><div class='add'>+#define FH49_TSSR_TX_ERROR_REG		(FH49_TSSR_LOWER_BOUND + 0x018)</div><div class='add'>+</div><div class='add'>+#define FH49_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(_chnl) ((1 &lt;&lt; (_chnl)) &lt;&lt; 16)</div><div class='add'>+</div><div class='add'>+/* Tx service channels */</div><div class='add'>+#define FH49_SRVC_CHNL		(9)</div><div class='add'>+#define FH49_SRVC_LOWER_BOUND	(FH49_MEM_LOWER_BOUND + 0x9C8)</div><div class='add'>+#define FH49_SRVC_UPPER_BOUND	(FH49_MEM_LOWER_BOUND + 0x9D0)</div><div class='add'>+#define FH49_SRVC_CHNL_SRAM_ADDR_REG(_chnl) \</div><div class='add'>+		(FH49_SRVC_LOWER_BOUND + ((_chnl) - 9) * 0x4)</div><div class='add'>+</div><div class='add'>+#define FH49_TX_CHICKEN_BITS_REG	(FH49_MEM_LOWER_BOUND + 0xE98)</div><div class='add'>+/* Instruct FH to increment the retry count of a packet when</div><div class='add'>+ * it is brought from the memory to TX-FIFO</div><div class='add'>+ */</div><div class='add'>+#define FH49_TX_CHICKEN_BITS_SCD_AUTO_RETRY_EN	(0x00000002)</div><div class='add'>+</div><div class='add'>+/* Keep Warm Size */</div><div class='add'>+#define IL_KW_SIZE 0x1000	/* 4k */</div><div class='add'>+</div><div class='add'>+#endif /* __il_4965_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/Kconfig b/drivers/net/wireless/iwlegacy/Kconfig<br/>index aef65cd47661..05bd375cb845 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/Kconfig</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-config IWLWIFI_LEGACY</div><div class='add'>+config IWLEGACY</div><div class='ctx'> 	tristate</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	select NEW_LEDS</div><div class='hunk'>@@ -7,13 +7,13 @@ config IWLWIFI_LEGACY</div><div class='ctx'> 	select MAC80211_LEDS</div><div class='ctx'> </div><div class='ctx'> menu "Debugging Options"</div><div class='del'>-	depends on IWLWIFI_LEGACY</div><div class='add'>+	depends on IWLEGACY</div><div class='ctx'> </div><div class='del'>-config IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	bool "Enable full debugging output in 4965 and 3945 drivers"</div><div class='del'>-	depends on IWLWIFI_LEGACY</div><div class='add'>+config IWLEGACY_DEBUG</div><div class='add'>+	bool "Enable full debugging output in iwlegacy (iwl 3945/4965) drivers"</div><div class='add'>+	depends on IWLEGACY</div><div class='ctx'> 	---help---</div><div class='del'>-	  This option will enable debug tracing output for the iwlwifilegacy</div><div class='add'>+	  This option will enable debug tracing output for the iwlegacy</div><div class='ctx'> 	  drivers.</div><div class='ctx'> </div><div class='ctx'> 	  This will result in the kernel module being ~100k larger.  You can</div><div class='hunk'>@@ -29,43 +29,26 @@ config IWLWIFI_LEGACY_DEBUG</div><div class='ctx'> 		  % echo 0x43fff &gt; /sys/class/net/wlan0/device/debug_level</div><div class='ctx'> </div><div class='ctx'> 	  You can find the list of debug mask values in:</div><div class='del'>-		  drivers/net/wireless/iwlwifilegacy/iwl-debug.h</div><div class='add'>+		  drivers/net/wireless/iwlegacy/common.h</div><div class='ctx'> </div><div class='ctx'> 	  If this is your first time using this driver, you should say Y here</div><div class='ctx'> 	  as the debug information can assist others in helping you resolve</div><div class='ctx'> 	  any problems you may encounter.</div><div class='ctx'> </div><div class='del'>-config IWLWIFI_LEGACY_DEBUGFS</div><div class='del'>-        bool "4965 and 3945 debugfs support"</div><div class='del'>-        depends on IWLWIFI_LEGACY &amp;&amp; MAC80211_DEBUGFS</div><div class='add'>+config IWLEGACY_DEBUGFS</div><div class='add'>+        bool "iwlegacy (iwl 3945/4965) debugfs support"</div><div class='add'>+        depends on IWLEGACY &amp;&amp; MAC80211_DEBUGFS</div><div class='ctx'>         ---help---</div><div class='del'>-	  Enable creation of debugfs files for the iwlwifilegacy drivers. This</div><div class='add'>+	  Enable creation of debugfs files for the iwlegacy drivers. This</div><div class='ctx'> 	  is a low-impact option that allows getting insight into the</div><div class='ctx'> 	  driver's state at runtime.</div><div class='ctx'> </div><div class='del'>-config IWLWIFI_LEGACY_DEVICE_TRACING</div><div class='del'>-	bool "iwlwifilegacy legacy device access tracing"</div><div class='del'>-	depends on IWLWIFI_LEGACY</div><div class='del'>-	depends on EVENT_TRACING</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to trace all commands, including TX frames and IO</div><div class='del'>-	  accesses, sent to the device. If you say yes, iwlwifilegacy will</div><div class='del'>-	  register with the ftrace framework for event tracing and dump</div><div class='del'>-	  all this information to the ringbuffer, you may need to</div><div class='del'>-	  increase the ringbuffer size. See the ftrace documentation</div><div class='del'>-	  for more information.</div><div class='del'>-</div><div class='del'>-	  When tracing is not enabled, this option still has some</div><div class='del'>-	  (though rather small) overhead.</div><div class='del'>-</div><div class='del'>-	  If unsure, say Y so we can help you better when problems</div><div class='del'>-	  occur.</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> config IWL4965</div><div class='ctx'> 	tristate "Intel Wireless WiFi 4965AGN (iwl4965)"</div><div class='ctx'> 	depends on PCI &amp;&amp; MAC80211</div><div class='del'>-	select IWLWIFI_LEGACY</div><div class='add'>+	select IWLEGACY</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This option enables support for</div><div class='ctx'> </div><div class='hunk'>@@ -93,7 +76,7 @@ config IWL4965</div><div class='ctx'> config IWL3945</div><div class='ctx'> 	tristate "Intel PRO/Wireless 3945ABG/BG Network Connection (iwl3945)"</div><div class='ctx'> 	depends on PCI &amp;&amp; MAC80211</div><div class='del'>-	select IWLWIFI_LEGACY</div><div class='add'>+	select IWLEGACY</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Select to build the driver supporting the:</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/Makefile b/drivers/net/wireless/iwlegacy/Makefile<br/>index d56aeb38c211..c985a01a0731 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/Makefile</a></div><div class='hunk'>@@ -1,25 +1,17 @@</div><div class='del'>-obj-$(CONFIG_IWLWIFI_LEGACY)	+= iwl-legacy.o</div><div class='del'>-iwl-legacy-objs 		:= iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o</div><div class='del'>-iwl-legacy-objs 		+= iwl-rx.o iwl-tx.o iwl-sta.o</div><div class='del'>-iwl-legacy-objs 		+= iwl-scan.o iwl-led.o</div><div class='del'>-iwl-legacy-$(CONFIG_IWLWIFI_LEGACY_DEBUGFS) += iwl-debugfs.o</div><div class='del'>-iwl-legacy-$(CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING) += iwl-devtrace.o</div><div class='add'>+obj-$(CONFIG_IWLEGACY)	+= iwlegacy.o</div><div class='add'>+iwlegacy-objs 		:= common.o</div><div class='add'>+iwlegacy-$(CONFIG_IWLEGACY_DEBUGFS) += debug.o</div><div class='ctx'> </div><div class='del'>-iwl-legacy-objs += $(iwl-legacy-m)</div><div class='del'>-</div><div class='del'>-CFLAGS_iwl-devtrace.o := -I$(src)</div><div class='add'>+iwlegacy-objs += $(iwlegacy-m)</div><div class='ctx'> </div><div class='ctx'> # 4965</div><div class='ctx'> obj-$(CONFIG_IWL4965)	+= iwl4965.o</div><div class='del'>-iwl4965-objs		:= iwl-4965.o iwl4965-base.o iwl-4965-rs.o iwl-4965-led.o</div><div class='del'>-iwl4965-objs		+= iwl-4965-ucode.o iwl-4965-tx.o</div><div class='del'>-iwl4965-objs		+= iwl-4965-lib.o iwl-4965-rx.o iwl-4965-calib.o</div><div class='del'>-iwl4965-objs		+= iwl-4965-sta.o iwl-4965-eeprom.o</div><div class='del'>-iwl4965-$(CONFIG_IWLWIFI_LEGACY_DEBUGFS) += iwl-4965-debugfs.o</div><div class='add'>+iwl4965-objs		:= 4965.o 4965-mac.o 4965-rs.o 4965-calib.o</div><div class='add'>+iwl4965-$(CONFIG_IWLEGACY_DEBUGFS) += 4965-debug.o</div><div class='ctx'> </div><div class='ctx'> # 3945</div><div class='ctx'> obj-$(CONFIG_IWL3945)	+= iwl3945.o</div><div class='del'>-iwl3945-objs		:= iwl3945-base.o iwl-3945.o iwl-3945-rs.o iwl-3945-led.o</div><div class='del'>-iwl3945-$(CONFIG_IWLWIFI_LEGACY_DEBUGFS) += iwl-3945-debugfs.o</div><div class='add'>+iwl3945-objs		:= 3945-mac.o 3945.o 3945-rs.o</div><div class='add'>+iwl3945-$(CONFIG_IWLEGACY_DEBUGFS) += 3945-debug.o</div><div class='ctx'> </div><div class='ctx'> ccflags-y += -D__CHECK_ENDIAN__</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-commands.h b/drivers/net/wireless/iwlegacy/commands.h<br/>index 89904054473f..25dd7d28d022 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-commands.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-commands.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/commands.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/commands.h</a></div><div class='hunk'>@@ -60,100 +60,96 @@</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='del'>-/*</div><div class='del'>- * Please use this file (iwl-commands.h) only for uCode API definitions.</div><div class='del'>- * Please use iwl-xxxx-hw.h for hardware-related definitions.</div><div class='del'>- * Please use iwl-dev.h for driver implementation definitions.</div><div class='del'>- */</div><div class='ctx'> </div><div class='del'>-#ifndef __iwl_legacy_commands_h__</div><div class='del'>-#define __iwl_legacy_commands_h__</div><div class='add'>+#ifndef __il_commands_h__</div><div class='add'>+#define __il_commands_h__</div><div class='ctx'> </div><div class='del'>-struct iwl_priv;</div><div class='add'>+#include &lt;linux/ieee80211.h&gt;</div><div class='ctx'> </div><div class='del'>-/* uCode version contains 4 values: Major/Minor/API/Serial */</div><div class='del'>-#define IWL_UCODE_MAJOR(ver)	(((ver) &amp; 0xFF000000) &gt;&gt; 24)</div><div class='del'>-#define IWL_UCODE_MINOR(ver)	(((ver) &amp; 0x00FF0000) &gt;&gt; 16)</div><div class='del'>-#define IWL_UCODE_API(ver)	(((ver) &amp; 0x0000FF00) &gt;&gt; 8)</div><div class='del'>-#define IWL_UCODE_SERIAL(ver)	((ver) &amp; 0x000000FF)</div><div class='add'>+struct il_priv;</div><div class='ctx'> </div><div class='add'>+/* uCode version contains 4 values: Major/Minor/API/Serial */</div><div class='add'>+#define IL_UCODE_MAJOR(ver)	(((ver) &amp; 0xFF000000) &gt;&gt; 24)</div><div class='add'>+#define IL_UCODE_MINOR(ver)	(((ver) &amp; 0x00FF0000) &gt;&gt; 16)</div><div class='add'>+#define IL_UCODE_API(ver)	(((ver) &amp; 0x0000FF00) &gt;&gt; 8)</div><div class='add'>+#define IL_UCODE_SERIAL(ver)	((ver) &amp; 0x000000FF)</div><div class='ctx'> </div><div class='ctx'> /* Tx rates */</div><div class='del'>-#define IWL_CCK_RATES	4</div><div class='del'>-#define IWL_OFDM_RATES	8</div><div class='del'>-#define IWL_MAX_RATES	(IWL_CCK_RATES + IWL_OFDM_RATES)</div><div class='add'>+#define IL_CCK_RATES	4</div><div class='add'>+#define IL_OFDM_RATES	8</div><div class='add'>+#define IL_MAX_RATES	(IL_CCK_RATES + IL_OFDM_RATES)</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	REPLY_ALIVE = 0x1,</div><div class='del'>-	REPLY_ERROR = 0x2,</div><div class='add'>+	N_ALIVE = 0x1,</div><div class='add'>+	N_ERROR = 0x2,</div><div class='ctx'> </div><div class='ctx'> 	/* RXON and QOS commands */</div><div class='del'>-	REPLY_RXON = 0x10,</div><div class='del'>-	REPLY_RXON_ASSOC = 0x11,</div><div class='del'>-	REPLY_QOS_PARAM = 0x13,</div><div class='del'>-	REPLY_RXON_TIMING = 0x14,</div><div class='add'>+	C_RXON = 0x10,</div><div class='add'>+	C_RXON_ASSOC = 0x11,</div><div class='add'>+	C_QOS_PARAM = 0x13,</div><div class='add'>+	C_RXON_TIMING = 0x14,</div><div class='ctx'> </div><div class='ctx'> 	/* Multi-Station support */</div><div class='del'>-	REPLY_ADD_STA = 0x18,</div><div class='del'>-	REPLY_REMOVE_STA = 0x19,</div><div class='add'>+	C_ADD_STA = 0x18,</div><div class='add'>+	C_REM_STA = 0x19,</div><div class='ctx'> </div><div class='ctx'> 	/* Security */</div><div class='del'>-	REPLY_WEPKEY = 0x20,</div><div class='add'>+	C_WEPKEY = 0x20,</div><div class='ctx'> </div><div class='ctx'> 	/* RX, TX, LEDs */</div><div class='del'>-	REPLY_3945_RX = 0x1b,           /* 3945 only */</div><div class='del'>-	REPLY_TX = 0x1c,</div><div class='del'>-	REPLY_RATE_SCALE = 0x47,	/* 3945 only */</div><div class='del'>-	REPLY_LEDS_CMD = 0x48,</div><div class='del'>-	REPLY_TX_LINK_QUALITY_CMD = 0x4e, /* for 4965 and up */</div><div class='add'>+	N_3945_RX = 0x1b,	/* 3945 only */</div><div class='add'>+	C_TX = 0x1c,</div><div class='add'>+	C_RATE_SCALE = 0x47,	/* 3945 only */</div><div class='add'>+	C_LEDS = 0x48,</div><div class='add'>+	C_TX_LINK_QUALITY_CMD = 0x4e,	/* for 4965 */</div><div class='ctx'> </div><div class='ctx'> 	/* 802.11h related */</div><div class='del'>-	REPLY_CHANNEL_SWITCH = 0x72,</div><div class='del'>-	CHANNEL_SWITCH_NOTIFICATION = 0x73,</div><div class='del'>-	REPLY_SPECTRUM_MEASUREMENT_CMD = 0x74,</div><div class='del'>-	SPECTRUM_MEASURE_NOTIFICATION = 0x75,</div><div class='add'>+	C_CHANNEL_SWITCH = 0x72,</div><div class='add'>+	N_CHANNEL_SWITCH = 0x73,</div><div class='add'>+	C_SPECTRUM_MEASUREMENT = 0x74,</div><div class='add'>+	N_SPECTRUM_MEASUREMENT = 0x75,</div><div class='ctx'> </div><div class='ctx'> 	/* Power Management */</div><div class='del'>-	POWER_TABLE_CMD = 0x77,</div><div class='del'>-	PM_SLEEP_NOTIFICATION = 0x7A,</div><div class='del'>-	PM_DEBUG_STATISTIC_NOTIFIC = 0x7B,</div><div class='add'>+	C_POWER_TBL = 0x77,</div><div class='add'>+	N_PM_SLEEP = 0x7A,</div><div class='add'>+	N_PM_DEBUG_STATS = 0x7B,</div><div class='ctx'> </div><div class='ctx'> 	/* Scan commands and notifications */</div><div class='del'>-	REPLY_SCAN_CMD = 0x80,</div><div class='del'>-	REPLY_SCAN_ABORT_CMD = 0x81,</div><div class='del'>-	SCAN_START_NOTIFICATION = 0x82,</div><div class='del'>-	SCAN_RESULTS_NOTIFICATION = 0x83,</div><div class='del'>-	SCAN_COMPLETE_NOTIFICATION = 0x84,</div><div class='add'>+	C_SCAN = 0x80,</div><div class='add'>+	C_SCAN_ABORT = 0x81,</div><div class='add'>+	N_SCAN_START = 0x82,</div><div class='add'>+	N_SCAN_RESULTS = 0x83,</div><div class='add'>+	N_SCAN_COMPLETE = 0x84,</div><div class='ctx'> </div><div class='ctx'> 	/* IBSS/AP commands */</div><div class='del'>-	BEACON_NOTIFICATION = 0x90,</div><div class='del'>-	REPLY_TX_BEACON = 0x91,</div><div class='add'>+	N_BEACON = 0x90,</div><div class='add'>+	C_TX_BEACON = 0x91,</div><div class='ctx'> </div><div class='ctx'> 	/* Miscellaneous commands */</div><div class='del'>-	REPLY_TX_PWR_TABLE_CMD = 0x97,</div><div class='add'>+	C_TX_PWR_TBL = 0x97,</div><div class='ctx'> </div><div class='ctx'> 	/* Bluetooth device coexistence config command */</div><div class='del'>-	REPLY_BT_CONFIG = 0x9b,</div><div class='add'>+	C_BT_CONFIG = 0x9b,</div><div class='ctx'> </div><div class='ctx'> 	/* Statistics */</div><div class='del'>-	REPLY_STATISTICS_CMD = 0x9c,</div><div class='del'>-	STATISTICS_NOTIFICATION = 0x9d,</div><div class='add'>+	C_STATS = 0x9c,</div><div class='add'>+	N_STATS = 0x9d,</div><div class='ctx'> </div><div class='ctx'> 	/* RF-KILL commands and notifications */</div><div class='del'>-	CARD_STATE_NOTIFICATION = 0xa1,</div><div class='add'>+	N_CARD_STATE = 0xa1,</div><div class='ctx'> </div><div class='ctx'> 	/* Missed beacons notification */</div><div class='del'>-	MISSED_BEACONS_NOTIFICATION = 0xa2,</div><div class='add'>+	N_MISSED_BEACONS = 0xa2,</div><div class='ctx'> </div><div class='del'>-	REPLY_CT_KILL_CONFIG_CMD = 0xa4,</div><div class='del'>-	SENSITIVITY_CMD = 0xa8,</div><div class='del'>-	REPLY_PHY_CALIBRATION_CMD = 0xb0,</div><div class='del'>-	REPLY_RX_PHY_CMD = 0xc0,</div><div class='del'>-	REPLY_RX_MPDU_CMD = 0xc1,</div><div class='del'>-	REPLY_RX = 0xc3,</div><div class='del'>-	REPLY_COMPRESSED_BA = 0xc5,</div><div class='add'>+	C_CT_KILL_CONFIG = 0xa4,</div><div class='add'>+	C_SENSITIVITY = 0xa8,</div><div class='add'>+	C_PHY_CALIBRATION = 0xb0,</div><div class='add'>+	N_RX_PHY = 0xc0,</div><div class='add'>+	N_RX_MPDU = 0xc1,</div><div class='add'>+	N_RX = 0xc3,</div><div class='add'>+	N_COMPRESSED_BA = 0xc5,</div><div class='ctx'> </div><div class='del'>-	REPLY_MAX = 0xff</div><div class='add'>+	IL_CN_MAX = 0xff</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='hunk'>@@ -163,25 +159,25 @@ enum {</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-/* iwl_cmd_header flags value */</div><div class='del'>-#define IWL_CMD_FAILED_MSK 0x40</div><div class='add'>+/* il_cmd_header flags value */</div><div class='add'>+#define IL_CMD_FAILED_MSK 0x40</div><div class='ctx'> </div><div class='ctx'> #define SEQ_TO_QUEUE(s)	(((s) &gt;&gt; 8) &amp; 0x1f)</div><div class='ctx'> #define QUEUE_TO_SEQ(q)	(((q) &amp; 0x1f) &lt;&lt; 8)</div><div class='del'>-#define SEQ_TO_INDEX(s)	((s) &amp; 0xff)</div><div class='del'>-#define INDEX_TO_SEQ(i)	((i) &amp; 0xff)</div><div class='add'>+#define SEQ_TO_IDX(s)	((s) &amp; 0xff)</div><div class='add'>+#define IDX_TO_SEQ(i)	((i) &amp; 0xff)</div><div class='ctx'> #define SEQ_HUGE_FRAME	cpu_to_le16(0x4000)</div><div class='ctx'> #define SEQ_RX_FRAME	cpu_to_le16(0x8000)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_cmd_header</div><div class='add'>+ * struct il_cmd_header</div><div class='ctx'>  *</div><div class='ctx'>  * This header format appears in the beginning of each command sent from the</div><div class='ctx'>  * driver, and each response/notification received from uCode.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_cmd_header {</div><div class='del'>-	u8 cmd;		/* Command ID:  REPLY_RXON, etc. */</div><div class='del'>-	u8 flags;	/* 0:5 reserved, 6 abort, 7 internal */</div><div class='add'>+struct il_cmd_header {</div><div class='add'>+	u8 cmd;			/* Command ID:  C_RXON, etc. */</div><div class='add'>+	u8 flags;		/* 0:5 reserved, 6 abort, 7 internal */</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The driver sets up the sequence number to values of its choosing.</div><div class='ctx'> 	 * uCode does not use this value, but passes it back to the driver</div><div class='hunk'>@@ -192,29 +188,28 @@ struct iwl_cmd_header {</div><div class='ctx'> 	 * There is one exception:  uCode sets bit 15 when it originates</div><div class='ctx'> 	 * the response/notification, i.e. when the response/notification</div><div class='ctx'> 	 * is not a direct response to a command sent by the driver.  For</div><div class='del'>-	 * example, uCode issues REPLY_3945_RX when it sends a received frame</div><div class='add'>+	 * example, uCode issues N_3945_RX when it sends a received frame</div><div class='ctx'> 	 * to the driver; it is not a direct response to any driver command.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The Linux driver uses the following format:</div><div class='ctx'> 	 *</div><div class='del'>-	 *  0:7		tfd index - position within TX queue</div><div class='del'>-	 *  8:12	TX queue id</div><div class='del'>-	 *  13		reserved</div><div class='del'>-	 *  14		huge - driver sets this to indicate command is in the</div><div class='del'>-	 *  		'huge' storage at the end of the command buffers</div><div class='del'>-	 *  15		unsolicited RX or uCode-originated notification</div><div class='del'>-	*/</div><div class='add'>+	 *  0:7         tfd idx - position within TX queue</div><div class='add'>+	 *  8:12        TX queue id</div><div class='add'>+	 *  13          reserved</div><div class='add'>+	 *  14          huge - driver sets this to indicate command is in the</div><div class='add'>+	 *              'huge' storage at the end of the command buffers</div><div class='add'>+	 *  15          unsolicited RX or uCode-originated notification</div><div class='add'>+	 */</div><div class='ctx'> 	__le16 sequence;</div><div class='ctx'> </div><div class='ctx'> 	/* command or response/notification data follows immediately */</div><div class='ctx'> 	u8 data[0];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * struct iwl3945_tx_power</div><div class='add'>+ * struct il3945_tx_power</div><div class='ctx'>  *</div><div class='del'>- * Used in REPLY_TX_PWR_TABLE_CMD, REPLY_SCAN_CMD, REPLY_CHANNEL_SWITCH</div><div class='add'>+ * Used in C_TX_PWR_TBL, C_SCAN, C_CHANNEL_SWITCH</div><div class='ctx'>  *</div><div class='ctx'>  * Each entry contains two values:</div><div class='ctx'>  * 1)  DSP gain (or sometimes called DSP attenuation).  This is a fine-grained</div><div class='hunk'>@@ -223,21 +218,21 @@ struct iwl_cmd_header {</div><div class='ctx'>  * 2)  Radio gain.  This sets the analog gain of the radio Tx path.</div><div class='ctx'>  *     It is a coarser setting, and behaves in a logarithmic (dB) fashion.</div><div class='ctx'>  *</div><div class='del'>- * Driver obtains values from struct iwl3945_tx_power power_gain_table[][].</div><div class='add'>+ * Driver obtains values from struct il3945_tx_power power_gain_table[][].</div><div class='ctx'>  */</div><div class='del'>-struct iwl3945_tx_power {</div><div class='add'>+struct il3945_tx_power {</div><div class='ctx'> 	u8 tx_gain;		/* gain for analog radio */</div><div class='ctx'> 	u8 dsp_atten;		/* gain for DSP */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl3945_power_per_rate</div><div class='add'>+ * struct il3945_power_per_rate</div><div class='ctx'>  *</div><div class='del'>- * Used in REPLY_TX_PWR_TABLE_CMD, REPLY_CHANNEL_SWITCH</div><div class='add'>+ * Used in C_TX_PWR_TBL, C_CHANNEL_SWITCH</div><div class='ctx'>  */</div><div class='del'>-struct iwl3945_power_per_rate {</div><div class='add'>+struct il3945_power_per_rate {</div><div class='ctx'> 	u8 rate;		/* plcp */</div><div class='del'>-	struct iwl3945_tx_power tpc;</div><div class='add'>+	struct il3945_tx_power tpc;</div><div class='ctx'> 	u8 reserved;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -245,10 +240,10 @@ struct iwl3945_power_per_rate {</div><div class='ctx'>  * iwl4965 rate_n_flags bit fields</div><div class='ctx'>  *</div><div class='ctx'>  * rate_n_flags format is used in following iwl4965 commands:</div><div class='del'>- *  REPLY_RX (response only)</div><div class='del'>- *  REPLY_RX_MPDU (response only)</div><div class='del'>- *  REPLY_TX (both command and response)</div><div class='del'>- *  REPLY_TX_LINK_QUALITY_CMD</div><div class='add'>+ *  N_RX (response only)</div><div class='add'>+ *  N_RX_MPDU (response only)</div><div class='add'>+ *  C_TX (both command and response)</div><div class='add'>+ *  C_TX_LINK_QUALITY_CMD</div><div class='ctx'>  *</div><div class='ctx'>  * High-throughput (HT) rate format for bits 7:0 (bit 8 must be "1"):</div><div class='ctx'>  *  2-0:  0)   6 Mbps</div><div class='hunk'>@@ -326,17 +321,17 @@ struct iwl3945_power_per_rate {</div><div class='ctx'> #define RATE_MCS_ANT_ABC_MSK	(RATE_MCS_ANT_AB_MSK | RATE_MCS_ANT_C_MSK)</div><div class='ctx'> #define RATE_ANT_NUM 3</div><div class='ctx'> </div><div class='del'>-#define POWER_TABLE_NUM_ENTRIES			33</div><div class='del'>-#define POWER_TABLE_NUM_HT_OFDM_ENTRIES		32</div><div class='del'>-#define POWER_TABLE_CCK_ENTRY			32</div><div class='add'>+#define POWER_TBL_NUM_ENTRIES			33</div><div class='add'>+#define POWER_TBL_NUM_HT_OFDM_ENTRIES		32</div><div class='add'>+#define POWER_TBL_CCK_ENTRY			32</div><div class='ctx'> </div><div class='del'>-#define IWL_PWR_NUM_HT_OFDM_ENTRIES		24</div><div class='del'>-#define IWL_PWR_CCK_ENTRIES			2</div><div class='add'>+#define IL_PWR_NUM_HT_OFDM_ENTRIES		24</div><div class='add'>+#define IL_PWR_CCK_ENTRIES			2</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * union iwl4965_tx_power_dual_stream</div><div class='add'>+ * union il4965_tx_power_dual_stream</div><div class='ctx'>  *</div><div class='del'>- * Host format used for REPLY_TX_PWR_TABLE_CMD, REPLY_CHANNEL_SWITCH</div><div class='add'>+ * Host format used for C_TX_PWR_TBL, C_CHANNEL_SWITCH</div><div class='ctx'>  * Use __le32 version (struct tx_power_dual_stream) when building command.</div><div class='ctx'>  *</div><div class='ctx'>  * Driver provides radio gain and DSP attenuation settings to device in pairs,</div><div class='hunk'>@@ -347,9 +342,9 @@ struct iwl3945_power_per_rate {</div><div class='ctx'>  * For MIMO rates, one value may be different from the other,</div><div class='ctx'>  * in order to balance the Tx output between the two transmitters.</div><div class='ctx'>  *</div><div class='del'>- * See more details in doc for TXPOWER in iwl-4965-hw.h.</div><div class='add'>+ * See more details in doc for TXPOWER in 4965.h.</div><div class='ctx'>  */</div><div class='del'>-union iwl4965_tx_power_dual_stream {</div><div class='add'>+union il4965_tx_power_dual_stream {</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u8 radio_tx_gain[2];</div><div class='ctx'> 		u8 dsp_predis_atten[2];</div><div class='hunk'>@@ -360,21 +355,21 @@ union iwl4965_tx_power_dual_stream {</div><div class='ctx'> /**</div><div class='ctx'>  * struct tx_power_dual_stream</div><div class='ctx'>  *</div><div class='del'>- * Table entries in REPLY_TX_PWR_TABLE_CMD, REPLY_CHANNEL_SWITCH</div><div class='add'>+ * Table entries in C_TX_PWR_TBL, C_CHANNEL_SWITCH</div><div class='ctx'>  *</div><div class='del'>- * Same format as iwl_tx_power_dual_stream, but __le32</div><div class='add'>+ * Same format as il_tx_power_dual_stream, but __le32</div><div class='ctx'>  */</div><div class='ctx'> struct tx_power_dual_stream {</div><div class='ctx'> 	__le32 dw;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl4965_tx_power_db</div><div class='add'>+ * struct il4965_tx_power_db</div><div class='ctx'>  *</div><div class='del'>- * Entire table within REPLY_TX_PWR_TABLE_CMD, REPLY_CHANNEL_SWITCH</div><div class='add'>+ * Entire table within C_TX_PWR_TBL, C_CHANNEL_SWITCH</div><div class='ctx'>  */</div><div class='del'>-struct iwl4965_tx_power_db {</div><div class='del'>-	struct tx_power_dual_stream power_tbl[POWER_TABLE_NUM_ENTRIES];</div><div class='add'>+struct il4965_tx_power_db {</div><div class='add'>+	struct tx_power_dual_stream power_tbl[POWER_TBL_NUM_ENTRIES];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='hunk'>@@ -387,7 +382,7 @@ struct iwl4965_tx_power_db {</div><div class='ctx'> #define INITIALIZE_SUBTYPE    (9)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ("Initialize") REPLY_ALIVE = 0x1 (response only, not a command)</div><div class='add'>+ * ("Initialize") N_ALIVE = 0x1 (response only, not a command)</div><div class='ctx'>  *</div><div class='ctx'>  * uCode issues this "initialize alive" notification once the initialization</div><div class='ctx'>  * uCode image has completed its work, and is ready to load the runtime image.</div><div class='hunk'>@@ -410,7 +405,7 @@ struct iwl4965_tx_power_db {</div><div class='ctx'>  * 3)  Tx gain compensation to balance 4965's 2 Tx chains for MIMO operation,</div><div class='ctx'>  *     for each of 5 frequency ranges.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_init_alive_resp {</div><div class='add'>+struct il_init_alive_resp {</div><div class='ctx'> 	u8 ucode_minor;</div><div class='ctx'> 	u8 ucode_major;</div><div class='ctx'> 	__le16 reserved1;</div><div class='hunk'>@@ -433,9 +428,8 @@ struct iwl_init_alive_resp {</div><div class='ctx'> 				 * 2 Tx chains */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * REPLY_ALIVE = 0x1 (response only, not a command)</div><div class='add'>+ * N_ALIVE = 0x1 (response only, not a command)</div><div class='ctx'>  *</div><div class='ctx'>  * uCode issues this "alive" notification once the runtime image is ready</div><div class='ctx'>  * to receive commands from the driver.  This is the *second* "alive"</div><div class='hunk'>@@ -454,7 +448,7 @@ struct iwl_init_alive_resp {</div><div class='ctx'>  *	__le32 log_size;     log capacity (in number of entries)</div><div class='ctx'>  *	__le32 type;         (1) timestamp with each entry, (0) no timestamp</div><div class='ctx'>  *	__le32 wraps;        # times uCode has wrapped to top of circular buffer</div><div class='del'>- *      __le32 write_index;  next circular buffer entry that uCode would fill</div><div class='add'>+ *      __le32 write_idx;  next circular buffer entry that uCode would fill</div><div class='ctx'>  *</div><div class='ctx'>  *     The header is followed by the circular buffer of log entries.  Entries</div><div class='ctx'>  *     with timestamps have the following format:</div><div class='hunk'>@@ -511,13 +505,13 @@ struct iwl_init_alive_resp {</div><div class='ctx'>  * The Linux driver can print both logs to the system log when a uCode error</div><div class='ctx'>  * occurs.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_alive_resp {</div><div class='add'>+struct il_alive_resp {</div><div class='ctx'> 	u8 ucode_minor;</div><div class='ctx'> 	u8 ucode_major;</div><div class='ctx'> 	__le16 reserved1;</div><div class='ctx'> 	u8 sw_rev[8];</div><div class='ctx'> 	u8 ver_type;</div><div class='del'>-	u8 ver_subtype;			/* not "9" for runtime alive */</div><div class='add'>+	u8 ver_subtype;		/* not "9" for runtime alive */</div><div class='ctx'> 	__le16 reserved2;</div><div class='ctx'> 	__le32 log_event_table_ptr;	/* SRAM address for event log */</div><div class='ctx'> 	__le32 error_event_table_ptr;	/* SRAM address for error log */</div><div class='hunk'>@@ -526,9 +520,9 @@ struct iwl_alive_resp {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_ERROR = 0x2 (response only, not a command)</div><div class='add'>+ * N_ERROR = 0x2 (response only, not a command)</div><div class='ctx'>  */</div><div class='del'>-struct iwl_error_resp {</div><div class='add'>+struct il_error_resp {</div><div class='ctx'> 	__le32 error_type;</div><div class='ctx'> 	u8 cmd_id;</div><div class='ctx'> 	u8 reserved1;</div><div class='hunk'>@@ -554,7 +548,6 @@ enum {</div><div class='ctx'> 	RXON_DEV_TYPE_SNIFFER = 6,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #define RXON_RX_CHAIN_DRIVER_FORCE_MSK		cpu_to_le16(0x1 &lt;&lt; 0)</div><div class='ctx'> #define RXON_RX_CHAIN_DRIVER_FORCE_POS		(0)</div><div class='ctx'> #define RXON_RX_CHAIN_VALID_MSK			cpu_to_le16(0x7 &lt;&lt; 1)</div><div class='hunk'>@@ -593,7 +586,6 @@ enum {</div><div class='ctx'> * (according to ON_AIR deassertion) */</div><div class='ctx'> #define RXON_FLG_TSF2HOST_MSK           cpu_to_le32(1 &lt;&lt; 15)</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* HT flags */</div><div class='ctx'> #define RXON_FLG_CTRL_CHANNEL_LOC_POS		(22)</div><div class='ctx'> #define RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK	cpu_to_le32(0x1 &lt;&lt; 22)</div><div class='hunk'>@@ -640,7 +632,7 @@ enum {</div><div class='ctx'> #define RXON_FILTER_BCON_AWARE_MSK      cpu_to_le32(1 &lt;&lt; 6)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * REPLY_RXON = 0x10 (command, has simple generic response)</div><div class='add'>+ * C_RXON = 0x10 (command, has simple generic response)</div><div class='ctx'>  *</div><div class='ctx'>  * RXON tunes the radio tuner to a service channel, and sets up a number</div><div class='ctx'>  * of parameters that are used primarily for Rx, but also for Tx operations.</div><div class='hunk'>@@ -653,11 +645,11 @@ enum {</div><div class='ctx'>  *        channel.</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE:  All RXONs wipe clean the internal txpower table.  Driver must</div><div class='del'>- *        issue a new REPLY_TX_PWR_TABLE_CMD after each REPLY_RXON (0x10),</div><div class='add'>+ *        issue a new C_TX_PWR_TBL after each C_RXON (0x10),</div><div class='ctx'>  *        regardless of whether RXON_FILTER_ASSOC_MSK is set.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-struct iwl3945_rxon_cmd {</div><div class='add'>+struct il3945_rxon_cmd {</div><div class='ctx'> 	u8 node_addr[6];</div><div class='ctx'> 	__le16 reserved1;</div><div class='ctx'> 	u8 bssid_addr[6];</div><div class='hunk'>@@ -676,7 +668,7 @@ struct iwl3945_rxon_cmd {</div><div class='ctx'> 	__le16 reserved5;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl4965_rxon_cmd {</div><div class='add'>+struct il4965_rxon_cmd {</div><div class='ctx'> 	u8 node_addr[6];</div><div class='ctx'> 	__le16 reserved1;</div><div class='ctx'> 	u8 bssid_addr[6];</div><div class='hunk'>@@ -699,7 +691,7 @@ struct iwl4965_rxon_cmd {</div><div class='ctx'> /* Create a common rxon cmd which will be typecast into the 3945 or 4965</div><div class='ctx'>  * specific rxon cmd, depending on where it is called from.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_legacy_rxon_cmd {</div><div class='add'>+struct il_rxon_cmd {</div><div class='ctx'> 	u8 node_addr[6];</div><div class='ctx'> 	__le16 reserved1;</div><div class='ctx'> 	u8 bssid_addr[6];</div><div class='hunk'>@@ -721,11 +713,10 @@ struct iwl_legacy_rxon_cmd {</div><div class='ctx'> 	u8 reserved5;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * REPLY_RXON_ASSOC = 0x11 (command, has simple generic response)</div><div class='add'>+ * C_RXON_ASSOC = 0x11 (command, has simple generic response)</div><div class='ctx'>  */</div><div class='del'>-struct iwl3945_rxon_assoc_cmd {</div><div class='add'>+struct il3945_rxon_assoc_cmd {</div><div class='ctx'> 	__le32 flags;</div><div class='ctx'> 	__le32 filter_flags;</div><div class='ctx'> 	u8 ofdm_basic_rates;</div><div class='hunk'>@@ -733,7 +724,7 @@ struct iwl3945_rxon_assoc_cmd {</div><div class='ctx'> 	__le16 reserved;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl4965_rxon_assoc_cmd {</div><div class='add'>+struct il4965_rxon_assoc_cmd {</div><div class='ctx'> 	__le32 flags;</div><div class='ctx'> 	__le32 filter_flags;</div><div class='ctx'> 	u8 ofdm_basic_rates;</div><div class='hunk'>@@ -744,17 +735,17 @@ struct iwl4965_rxon_assoc_cmd {</div><div class='ctx'> 	__le16 reserved;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-#define IWL_CONN_MAX_LISTEN_INTERVAL	10</div><div class='del'>-#define IWL_MAX_UCODE_BEACON_INTERVAL	4 /* 4096 */</div><div class='del'>-#define IWL39_MAX_UCODE_BEACON_INTERVAL	1 /* 1024 */</div><div class='add'>+#define IL_CONN_MAX_LISTEN_INTERVAL	10</div><div class='add'>+#define IL_MAX_UCODE_BEACON_INTERVAL	4	/* 4096 */</div><div class='add'>+#define IL39_MAX_UCODE_BEACON_INTERVAL	1	/* 1024 */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_RXON_TIMING = 0x14 (command, has simple generic response)</div><div class='add'>+ * C_RXON_TIMING = 0x14 (command, has simple generic response)</div><div class='ctx'>  */</div><div class='del'>-struct iwl_rxon_time_cmd {</div><div class='add'>+struct il_rxon_time_cmd {</div><div class='ctx'> 	__le64 timestamp;</div><div class='ctx'> 	__le16 beacon_interval;</div><div class='del'>-	__le16 atim_window;</div><div class='add'>+	__le16 atim_win;</div><div class='ctx'> 	__le32 beacon_init_val;</div><div class='ctx'> 	__le16 listen_interval;</div><div class='ctx'> 	u8 dtim_period;</div><div class='hunk'>@@ -762,32 +753,32 @@ struct iwl_rxon_time_cmd {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_CHANNEL_SWITCH = 0x72 (command, has simple generic response)</div><div class='add'>+ * C_CHANNEL_SWITCH = 0x72 (command, has simple generic response)</div><div class='ctx'>  */</div><div class='del'>-struct iwl3945_channel_switch_cmd {</div><div class='add'>+struct il3945_channel_switch_cmd {</div><div class='ctx'> 	u8 band;</div><div class='ctx'> 	u8 expect_beacon;</div><div class='ctx'> 	__le16 channel;</div><div class='ctx'> 	__le32 rxon_flags;</div><div class='ctx'> 	__le32 rxon_filter_flags;</div><div class='ctx'> 	__le32 switch_time;</div><div class='del'>-	struct iwl3945_power_per_rate power[IWL_MAX_RATES];</div><div class='add'>+	struct il3945_power_per_rate power[IL_MAX_RATES];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl4965_channel_switch_cmd {</div><div class='add'>+struct il4965_channel_switch_cmd {</div><div class='ctx'> 	u8 band;</div><div class='ctx'> 	u8 expect_beacon;</div><div class='ctx'> 	__le16 channel;</div><div class='ctx'> 	__le32 rxon_flags;</div><div class='ctx'> 	__le32 rxon_filter_flags;</div><div class='ctx'> 	__le32 switch_time;</div><div class='del'>-	struct iwl4965_tx_power_db tx_power;</div><div class='add'>+	struct il4965_tx_power_db tx_power;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * CHANNEL_SWITCH_NOTIFICATION = 0x73 (notification only, not a command)</div><div class='add'>+ * N_CHANNEL_SWITCH = 0x73 (notification only, not a command)</div><div class='ctx'>  */</div><div class='del'>-struct iwl_csa_notification {</div><div class='add'>+struct il_csa_notification {</div><div class='ctx'> 	__le16 band;</div><div class='ctx'> 	__le16 channel;</div><div class='ctx'> 	__le32 status;		/* 0 - OK, 1 - fail */</div><div class='hunk'>@@ -800,22 +791,22 @@ struct iwl_csa_notification {</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_ac_qos -- QOS timing params for REPLY_QOS_PARAM</div><div class='del'>- * One for each of 4 EDCA access categories in struct iwl_qosparam_cmd</div><div class='add'>+ * struct il_ac_qos -- QOS timing params for C_QOS_PARAM</div><div class='add'>+ * One for each of 4 EDCA access categories in struct il_qosparam_cmd</div><div class='ctx'>  *</div><div class='del'>- * @cw_min: Contention window, start value in numbers of slots.</div><div class='add'>+ * @cw_min: Contention win, start value in numbers of slots.</div><div class='ctx'>  *          Should be a power-of-2, minus 1.  Device's default is 0x0f.</div><div class='del'>- * @cw_max: Contention window, max value in numbers of slots.</div><div class='add'>+ * @cw_max: Contention win, max value in numbers of slots.</div><div class='ctx'>  *          Should be a power-of-2, minus 1.  Device's default is 0x3f.</div><div class='ctx'>  * @aifsn:  Number of slots in Arbitration Interframe Space (before</div><div class='ctx'>  *          performing random backoff timing prior to Tx).  Device default 1.</div><div class='ctx'>  * @edca_txop:  Length of Tx opportunity, in uSecs.  Device default is 0.</div><div class='ctx'>  *</div><div class='del'>- * Device will automatically increase contention window by (2*CW) + 1 for each</div><div class='add'>+ * Device will automatically increase contention win by (2*CW) + 1 for each</div><div class='ctx'>  * transmission retry.  Device uses cw_max as a bit mask, ANDed with new CW</div><div class='ctx'>  * value, to cap the CW value.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_ac_qos {</div><div class='add'>+struct il_ac_qos {</div><div class='ctx'> 	__le16 cw_min;</div><div class='ctx'> 	__le16 cw_max;</div><div class='ctx'> 	u8 aifsn;</div><div class='hunk'>@@ -832,14 +823,14 @@ struct iwl_ac_qos {</div><div class='ctx'> #define AC_NUM                4</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_QOS_PARAM = 0x13 (command, has simple generic response)</div><div class='add'>+ * C_QOS_PARAM = 0x13 (command, has simple generic response)</div><div class='ctx'>  *</div><div class='ctx'>  * This command sets up timings for each of the 4 prioritized EDCA Tx FIFOs</div><div class='ctx'>  * 0: Background, 1: Best Effort, 2: Video, 3: Voice.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_qosparam_cmd {</div><div class='add'>+struct il_qosparam_cmd {</div><div class='ctx'> 	__le32 qos_flags;</div><div class='del'>-	struct iwl_ac_qos ac[AC_NUM];</div><div class='add'>+	struct il_ac_qos ac[AC_NUM];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='hunk'>@@ -852,15 +843,15 @@ struct iwl_qosparam_cmd {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* Special, dedicated locations within device's station table */</div><div class='del'>-#define	IWL_AP_ID		0</div><div class='del'>-#define	IWL_STA_ID		2</div><div class='del'>-#define	IWL3945_BROADCAST_ID	24</div><div class='del'>-#define IWL3945_STATION_COUNT	25</div><div class='del'>-#define IWL4965_BROADCAST_ID	31</div><div class='del'>-#define	IWL4965_STATION_COUNT	32</div><div class='add'>+#define	IL_AP_ID		0</div><div class='add'>+#define	IL_STA_ID		2</div><div class='add'>+#define	IL3945_BROADCAST_ID	24</div><div class='add'>+#define IL3945_STATION_COUNT	25</div><div class='add'>+#define IL4965_BROADCAST_ID	31</div><div class='add'>+#define	IL4965_STATION_COUNT	32</div><div class='ctx'> </div><div class='del'>-#define	IWL_STATION_COUNT	32 	/* MAX(3945,4965)*/</div><div class='del'>-#define	IWL_INVALID_STATION	255</div><div class='add'>+#define	IL_STATION_COUNT	32	/* MAX(3945,4965) */</div><div class='add'>+#define	IL_INVALID_STATION	255</div><div class='ctx'> </div><div class='ctx'> #define STA_FLG_TX_RATE_MSK		cpu_to_le32(1 &lt;&lt; 2)</div><div class='ctx'> #define STA_FLG_PWR_SAVE_MSK		cpu_to_le32(1 &lt;&lt; 8)</div><div class='hunk'>@@ -901,11 +892,11 @@ struct iwl_qosparam_cmd {</div><div class='ctx'> #define STA_MODIFY_DELBA_TID_MSK	0x10</div><div class='ctx'> #define STA_MODIFY_SLEEP_TX_COUNT_MSK	0x20</div><div class='ctx'> </div><div class='del'>-/* Receiver address (actually, Rx station's index into station table),</div><div class='add'>+/* Receiver address (actually, Rx station's idx into station table),</div><div class='ctx'>  * combined with Traffic ID (QOS priority), in format used by Tx Scheduler */</div><div class='ctx'> #define BUILD_RAxTID(sta_id, tid)	(((sta_id) &lt;&lt; 4) + (tid))</div><div class='ctx'> </div><div class='del'>-struct iwl4965_keyinfo {</div><div class='add'>+struct il4965_keyinfo {</div><div class='ctx'> 	__le16 key_flags;</div><div class='ctx'> 	u8 tkip_rx_tsc_byte2;	/* TSC[2] for key mix ph1 detection */</div><div class='ctx'> 	u8 reserved1;</div><div class='hunk'>@@ -918,12 +909,12 @@ struct iwl4965_keyinfo {</div><div class='ctx'> /**</div><div class='ctx'>  * struct sta_id_modify</div><div class='ctx'>  * @addr[ETH_ALEN]: station's MAC address</div><div class='del'>- * @sta_id: index of station in uCode's station table</div><div class='add'>+ * @sta_id: idx of station in uCode's station table</div><div class='ctx'>  * @modify_mask: STA_MODIFY_*, 1: modify, 0: don't change</div><div class='ctx'>  *</div><div class='del'>- * Driver selects unused table index when adding new station,</div><div class='del'>- * or the index to a pre-existing station entry when modifying that station.</div><div class='del'>- * Some indexes have special purposes (IWL_AP_ID, index 0, is for AP).</div><div class='add'>+ * Driver selects unused table idx when adding new station,</div><div class='add'>+ * or the idx to a pre-existing station entry when modifying that station.</div><div class='add'>+ * Some idxes have special purposes (IL_AP_ID, idx 0, is for AP).</div><div class='ctx'>  *</div><div class='ctx'>  * modify_mask flags select which parameters to modify vs. leave alone.</div><div class='ctx'>  */</div><div class='hunk'>@@ -936,15 +927,15 @@ struct sta_id_modify {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_ADD_STA = 0x18 (command)</div><div class='add'>+ * C_ADD_STA = 0x18 (command)</div><div class='ctx'>  *</div><div class='ctx'>  * The device contains an internal table of per-station information,</div><div class='ctx'>  * with info on security keys, aggregation parameters, and Tx rates for</div><div class='ctx'>  * initial Tx attempt and any retries (4965 devices uses</div><div class='del'>- * REPLY_TX_LINK_QUALITY_CMD,</div><div class='del'>- * 3945 uses REPLY_RATE_SCALE to set up rate tables).</div><div class='add'>+ * C_TX_LINK_QUALITY_CMD,</div><div class='add'>+ * 3945 uses C_RATE_SCALE to set up rate tables).</div><div class='ctx'>  *</div><div class='del'>- * REPLY_ADD_STA sets up the table entry for one station, either creating</div><div class='add'>+ * C_ADD_STA sets up the table entry for one station, either creating</div><div class='ctx'>  * a new entry, or modifying a pre-existing one.</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE:  RXON command (without "associated" bit set) wipes the station table</div><div class='hunk'>@@ -954,20 +945,20 @@ struct sta_id_modify {</div><div class='ctx'>  *        their own txpower/rate setup data).</div><div class='ctx'>  *</div><div class='ctx'>  *        When getting started on a new channel, driver must set up the</div><div class='del'>- *        IWL_BROADCAST_ID entry (last entry in the table).  For a client</div><div class='add'>+ *        IL_BROADCAST_ID entry (last entry in the table).  For a client</div><div class='ctx'>  *        station in a BSS, once an AP is selected, driver sets up the AP STA</div><div class='del'>- *        in the IWL_AP_ID entry (1st entry in the table).  BROADCAST and AP</div><div class='add'>+ *        in the IL_AP_ID entry (1st entry in the table).  BROADCAST and AP</div><div class='ctx'>  *        are all that are needed for a BSS client station.  If the device is</div><div class='ctx'>  *        used as AP, or in an IBSS network, driver must set up station table</div><div class='del'>- *        entries for all STAs in network, starting with index IWL_STA_ID.</div><div class='add'>+ *        entries for all STAs in network, starting with idx IL_STA_ID.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-struct iwl3945_addsta_cmd {</div><div class='add'>+struct il3945_addsta_cmd {</div><div class='ctx'> 	u8 mode;		/* 1: modify existing, 0: add new station */</div><div class='ctx'> 	u8 reserved[3];</div><div class='ctx'> 	struct sta_id_modify sta;</div><div class='del'>-	struct iwl4965_keyinfo key;</div><div class='del'>-	__le32 station_flags;		/* STA_FLG_* */</div><div class='add'>+	struct il4965_keyinfo key;</div><div class='add'>+	__le32 station_flags;	/* STA_FLG_* */</div><div class='ctx'> 	__le32 station_flags_msk;	/* STA_FLG_* */</div><div class='ctx'> </div><div class='ctx'> 	/* bit field to disable (1) or enable (0) Tx for Traffic ID (TID)</div><div class='hunk'>@@ -990,12 +981,12 @@ struct iwl3945_addsta_cmd {</div><div class='ctx'> 	__le16 add_immediate_ba_ssn;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl4965_addsta_cmd {</div><div class='add'>+struct il4965_addsta_cmd {</div><div class='ctx'> 	u8 mode;		/* 1: modify existing, 0: add new station */</div><div class='ctx'> 	u8 reserved[3];</div><div class='ctx'> 	struct sta_id_modify sta;</div><div class='del'>-	struct iwl4965_keyinfo key;</div><div class='del'>-	__le32 station_flags;		/* STA_FLG_* */</div><div class='add'>+	struct il4965_keyinfo key;</div><div class='add'>+	__le32 station_flags;	/* STA_FLG_* */</div><div class='ctx'> 	__le32 station_flags_msk;	/* STA_FLG_* */</div><div class='ctx'> </div><div class='ctx'> 	/* bit field to disable (1) or enable (0) Tx for Traffic ID (TID)</div><div class='hunk'>@@ -1003,7 +994,7 @@ struct iwl4965_addsta_cmd {</div><div class='ctx'> 	 * Set modify_mask bit STA_MODIFY_TID_DISABLE_TX to use this field. */</div><div class='ctx'> 	__le16 tid_disable_tx;</div><div class='ctx'> </div><div class='del'>-	__le16	reserved1;</div><div class='add'>+	__le16 reserved1;</div><div class='ctx'> </div><div class='ctx'> 	/* TID for which to add block-ack support.</div><div class='ctx'> 	 * Set modify_mask bit STA_MODIFY_ADDBA_TID_MSK to use this field. */</div><div class='hunk'>@@ -1028,12 +1019,12 @@ struct iwl4965_addsta_cmd {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* Wrapper struct for 3945 and 4965 addsta_cmd structures */</div><div class='del'>-struct iwl_legacy_addsta_cmd {</div><div class='add'>+struct il_addsta_cmd {</div><div class='ctx'> 	u8 mode;		/* 1: modify existing, 0: add new station */</div><div class='ctx'> 	u8 reserved[3];</div><div class='ctx'> 	struct sta_id_modify sta;</div><div class='del'>-	struct iwl4965_keyinfo key;</div><div class='del'>-	__le32 station_flags;		/* STA_FLG_* */</div><div class='add'>+	struct il4965_keyinfo key;</div><div class='add'>+	__le32 station_flags;	/* STA_FLG_* */</div><div class='ctx'> 	__le32 station_flags_msk;	/* STA_FLG_* */</div><div class='ctx'> </div><div class='ctx'> 	/* bit field to disable (1) or enable (0) Tx for Traffic ID (TID)</div><div class='hunk'>@@ -1041,7 +1032,7 @@ struct iwl_legacy_addsta_cmd {</div><div class='ctx'> 	 * Set modify_mask bit STA_MODIFY_TID_DISABLE_TX to use this field. */</div><div class='ctx'> 	__le16 tid_disable_tx;</div><div class='ctx'> </div><div class='del'>-	__le16	rate_n_flags;		/* 3945 only */</div><div class='add'>+	__le16 rate_n_flags;	/* 3945 only */</div><div class='ctx'> </div><div class='ctx'> 	/* TID for which to add block-ack support.</div><div class='ctx'> 	 * Set modify_mask bit STA_MODIFY_ADDBA_TID_MSK to use this field. */</div><div class='hunk'>@@ -1065,51 +1056,50 @@ struct iwl_legacy_addsta_cmd {</div><div class='ctx'> 	__le16 reserved2;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #define ADD_STA_SUCCESS_MSK		0x1</div><div class='del'>-#define ADD_STA_NO_ROOM_IN_TABLE	0x2</div><div class='add'>+#define ADD_STA_NO_ROOM_IN_TBL	0x2</div><div class='ctx'> #define ADD_STA_NO_BLOCK_ACK_RESOURCE	0x4</div><div class='ctx'> #define ADD_STA_MODIFY_NON_EXIST_STA	0x8</div><div class='ctx'> /*</div><div class='del'>- * REPLY_ADD_STA = 0x18 (response)</div><div class='add'>+ * C_ADD_STA = 0x18 (response)</div><div class='ctx'>  */</div><div class='del'>-struct iwl_add_sta_resp {</div><div class='del'>-	u8 status;	/* ADD_STA_* */</div><div class='add'>+struct il_add_sta_resp {</div><div class='add'>+	u8 status;		/* ADD_STA_* */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define REM_STA_SUCCESS_MSK              0x1</div><div class='ctx'> /*</div><div class='del'>- *  REPLY_REM_STA = 0x19 (response)</div><div class='add'>+ *  C_REM_STA = 0x19 (response)</div><div class='ctx'>  */</div><div class='del'>-struct iwl_rem_sta_resp {</div><div class='add'>+struct il_rem_sta_resp {</div><div class='ctx'> 	u8 status;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *  REPLY_REM_STA = 0x19 (command)</div><div class='add'>+ *  C_REM_STA = 0x19 (command)</div><div class='ctx'>  */</div><div class='del'>-struct iwl_rem_sta_cmd {</div><div class='del'>-	u8 num_sta;     /* number of removed stations */</div><div class='add'>+struct il_rem_sta_cmd {</div><div class='add'>+	u8 num_sta;		/* number of removed stations */</div><div class='ctx'> 	u8 reserved[3];</div><div class='del'>-	u8 addr[ETH_ALEN]; /* MAC addr of the first station */</div><div class='add'>+	u8 addr[ETH_ALEN];	/* MAC addr of the first station */</div><div class='ctx'> 	u8 reserved2[2];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-#define IWL_TX_FIFO_BK_MSK		cpu_to_le32(BIT(0))</div><div class='del'>-#define IWL_TX_FIFO_BE_MSK		cpu_to_le32(BIT(1))</div><div class='del'>-#define IWL_TX_FIFO_VI_MSK		cpu_to_le32(BIT(2))</div><div class='del'>-#define IWL_TX_FIFO_VO_MSK		cpu_to_le32(BIT(3))</div><div class='del'>-#define IWL_AGG_TX_QUEUE_MSK		cpu_to_le32(0xffc00)</div><div class='add'>+#define IL_TX_FIFO_BK_MSK		cpu_to_le32(BIT(0))</div><div class='add'>+#define IL_TX_FIFO_BE_MSK		cpu_to_le32(BIT(1))</div><div class='add'>+#define IL_TX_FIFO_VI_MSK		cpu_to_le32(BIT(2))</div><div class='add'>+#define IL_TX_FIFO_VO_MSK		cpu_to_le32(BIT(3))</div><div class='add'>+#define IL_AGG_TX_QUEUE_MSK		cpu_to_le32(0xffc00)</div><div class='ctx'> </div><div class='del'>-#define IWL_DROP_SINGLE		0</div><div class='del'>-#define IWL_DROP_SELECTED	1</div><div class='del'>-#define IWL_DROP_ALL		2</div><div class='add'>+#define IL_DROP_SINGLE		0</div><div class='add'>+#define IL_DROP_SELECTED	1</div><div class='add'>+#define IL_DROP_ALL		2</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * REPLY_WEP_KEY = 0x20</div><div class='ctx'>  */</div><div class='del'>-struct iwl_wep_key {</div><div class='del'>-	u8 key_index;</div><div class='add'>+struct il_wep_key {</div><div class='add'>+	u8 key_idx;</div><div class='ctx'> 	u8 key_offset;</div><div class='ctx'> 	u8 reserved1[2];</div><div class='ctx'> 	u8 key_size;</div><div class='hunk'>@@ -1117,12 +1107,12 @@ struct iwl_wep_key {</div><div class='ctx'> 	u8 key[16];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl_wep_cmd {</div><div class='add'>+struct il_wep_cmd {</div><div class='ctx'> 	u8 num_keys;</div><div class='ctx'> 	u8 global_key_type;</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> 	u8 reserved;</div><div class='del'>-	struct iwl_wep_key key[0];</div><div class='add'>+	struct il_wep_key key[0];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define WEP_KEY_WEP_TYPE 1</div><div class='hunk'>@@ -1168,8 +1158,7 @@ struct iwl_wep_cmd {</div><div class='ctx'> #define RX_MPDU_RES_STATUS_TTAK_OK	(1 &lt;&lt; 7)</div><div class='ctx'> #define RX_MPDU_RES_STATUS_DEC_DONE_MSK	(0x800)</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-struct iwl3945_rx_frame_stats {</div><div class='add'>+struct il3945_rx_frame_stats {</div><div class='ctx'> 	u8 phy_count;</div><div class='ctx'> 	u8 id;</div><div class='ctx'> 	u8 rssi;</div><div class='hunk'>@@ -1179,7 +1168,7 @@ struct iwl3945_rx_frame_stats {</div><div class='ctx'> 	u8 payload[0];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl3945_rx_frame_hdr {</div><div class='add'>+struct il3945_rx_frame_hdr {</div><div class='ctx'> 	__le16 channel;</div><div class='ctx'> 	__le16 phy_flags;</div><div class='ctx'> 	u8 reserved1;</div><div class='hunk'>@@ -1188,73 +1177,71 @@ struct iwl3945_rx_frame_hdr {</div><div class='ctx'> 	u8 payload[0];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl3945_rx_frame_end {</div><div class='add'>+struct il3945_rx_frame_end {</div><div class='ctx'> 	__le32 status;</div><div class='ctx'> 	__le64 timestamp;</div><div class='ctx'> 	__le32 beacon_timestamp;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_3945_RX = 0x1b (response only, not a command)</div><div class='add'>+ * N_3945_RX = 0x1b (response only, not a command)</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE:  DO NOT dereference from casts to this structure</div><div class='ctx'>  * It is provided only for calculating minimum data set size.</div><div class='ctx'>  * The actual offsets of the hdr and end are dynamic based on</div><div class='ctx'>  * stats.phy_count</div><div class='ctx'>  */</div><div class='del'>-struct iwl3945_rx_frame {</div><div class='del'>-	struct iwl3945_rx_frame_stats stats;</div><div class='del'>-	struct iwl3945_rx_frame_hdr hdr;</div><div class='del'>-	struct iwl3945_rx_frame_end end;</div><div class='add'>+struct il3945_rx_frame {</div><div class='add'>+	struct il3945_rx_frame_stats stats;</div><div class='add'>+	struct il3945_rx_frame_hdr hdr;</div><div class='add'>+	struct il3945_rx_frame_end end;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-#define IWL39_RX_FRAME_SIZE	(4 + sizeof(struct iwl3945_rx_frame))</div><div class='add'>+#define IL39_RX_FRAME_SIZE	(4 + sizeof(struct il3945_rx_frame))</div><div class='ctx'> </div><div class='ctx'> /* Fixed (non-configurable) rx data from phy */</div><div class='ctx'> </div><div class='del'>-#define IWL49_RX_RES_PHY_CNT 14</div><div class='del'>-#define IWL49_RX_PHY_FLAGS_ANTENNAE_OFFSET	(4)</div><div class='del'>-#define IWL49_RX_PHY_FLAGS_ANTENNAE_MASK	(0x70)</div><div class='del'>-#define IWL49_AGC_DB_MASK			(0x3f80)	/* MASK(7,13) */</div><div class='del'>-#define IWL49_AGC_DB_POS			(7)</div><div class='del'>-struct iwl4965_rx_non_cfg_phy {</div><div class='add'>+#define IL49_RX_RES_PHY_CNT 14</div><div class='add'>+#define IL49_RX_PHY_FLAGS_ANTENNAE_OFFSET	(4)</div><div class='add'>+#define IL49_RX_PHY_FLAGS_ANTENNAE_MASK	(0x70)</div><div class='add'>+#define IL49_AGC_DB_MASK			(0x3f80)	/* MASK(7,13) */</div><div class='add'>+#define IL49_AGC_DB_POS			(7)</div><div class='add'>+struct il4965_rx_non_cfg_phy {</div><div class='ctx'> 	__le16 ant_selection;	/* ant A bit 4, ant B bit 5, ant C bit 6 */</div><div class='ctx'> 	__le16 agc_info;	/* agc code 0:6, agc dB 7:13, reserved 14:15 */</div><div class='ctx'> 	u8 rssi_info[6];	/* we use even entries, 0/2/4 for A/B/C rssi */</div><div class='ctx'> 	u8 pad[0];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * REPLY_RX = 0xc3 (response only, not a command)</div><div class='add'>+ * N_RX = 0xc3 (response only, not a command)</div><div class='ctx'>  * Used only for legacy (non 11n) frames.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_rx_phy_res {</div><div class='del'>-	u8 non_cfg_phy_cnt;     /* non configurable DSP phy data byte count */</div><div class='add'>+struct il_rx_phy_res {</div><div class='add'>+	u8 non_cfg_phy_cnt;	/* non configurable DSP phy data byte count */</div><div class='ctx'> 	u8 cfg_phy_cnt;		/* configurable DSP phy data byte count */</div><div class='ctx'> 	u8 stat_id;		/* configurable DSP phy data set ID */</div><div class='ctx'> 	u8 reserved1;</div><div class='ctx'> 	__le64 timestamp;	/* TSF at on air rise */</div><div class='del'>-	__le32 beacon_time_stamp; /* beacon at on-air rise */</div><div class='add'>+	__le32 beacon_time_stamp;	/* beacon at on-air rise */</div><div class='ctx'> 	__le16 phy_flags;	/* general phy flags: band, modulation, ... */</div><div class='ctx'> 	__le16 channel;		/* channel number */</div><div class='del'>-	u8 non_cfg_phy_buf[32]; /* for various implementations of non_cfg_phy */</div><div class='add'>+	u8 non_cfg_phy_buf[32];	/* for various implementations of non_cfg_phy */</div><div class='ctx'> 	__le32 rate_n_flags;	/* RATE_MCS_* */</div><div class='ctx'> 	__le16 byte_count;	/* frame's byte-count */</div><div class='ctx'> 	__le16 frame_time;	/* frame's time on the air */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl_rx_mpdu_res_start {</div><div class='add'>+struct il_rx_mpdu_res_start {</div><div class='ctx'> 	__le16 byte_count;</div><div class='ctx'> 	__le16 reserved;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * (5)</div><div class='ctx'>  * Tx Commands &amp; Responses:</div><div class='ctx'>  *</div><div class='del'>- * Driver must place each REPLY_TX command into one of the prioritized Tx</div><div class='add'>+ * Driver must place each C_TX command into one of the prioritized Tx</div><div class='ctx'>  * queues in host DRAM, shared between driver and device (see comments for</div><div class='ctx'>  * SCD registers and Tx/Rx Queues).  When the device's Tx scheduler and uCode</div><div class='ctx'>  * are preparing to transmit, the device pulls the Tx command over the PCI</div><div class='hunk'>@@ -1264,18 +1251,18 @@ struct iwl_rx_mpdu_res_start {</div><div class='ctx'>  * uCode handles all timing and protocol related to control frames</div><div class='ctx'>  * (RTS/CTS/ACK), based on flags in the Tx command.  uCode and Tx scheduler</div><div class='ctx'>  * handle reception of block-acks; uCode updates the host driver via</div><div class='del'>- * REPLY_COMPRESSED_BA.</div><div class='add'>+ * N_COMPRESSED_BA.</div><div class='ctx'>  *</div><div class='ctx'>  * uCode handles retrying Tx when an ACK is expected but not received.</div><div class='ctx'>  * This includes trying lower data rates than the one requested in the Tx</div><div class='del'>- * command, as set up by the REPLY_RATE_SCALE (for 3945) or</div><div class='del'>- * REPLY_TX_LINK_QUALITY_CMD (4965).</div><div class='add'>+ * command, as set up by the C_RATE_SCALE (for 3945) or</div><div class='add'>+ * C_TX_LINK_QUALITY_CMD (4965).</div><div class='ctx'>  *</div><div class='del'>- * Driver sets up transmit power for various rates via REPLY_TX_PWR_TABLE_CMD.</div><div class='add'>+ * Driver sets up transmit power for various rates via C_TX_PWR_TBL.</div><div class='ctx'>  * This command must be executed after every RXON command, before Tx can occur.</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-/* REPLY_TX Tx flags field */</div><div class='add'>+/* C_TX Tx flags field */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * 1: Use Request-To-Send protocol before this frame.</div><div class='hunk'>@@ -1296,8 +1283,8 @@ struct iwl_rx_mpdu_res_start {</div><div class='ctx'> #define TX_CMD_FLG_ACK_MSK cpu_to_le32(1 &lt;&lt; 3)</div><div class='ctx'> </div><div class='ctx'> /* For 4965 devices:</div><div class='del'>- * 1: Use rate scale table (see REPLY_TX_LINK_QUALITY_CMD).</div><div class='del'>- *    Tx command's initial_rate_index indicates first rate to try;</div><div class='add'>+ * 1: Use rate scale table (see C_TX_LINK_QUALITY_CMD).</div><div class='add'>+ *    Tx command's initial_rate_idx indicates first rate to try;</div><div class='ctx'>  *    uCode walks through table for additional Tx attempts.</div><div class='ctx'>  * 0: Use Tx rate/MCS from Tx command's rate_n_flags field.</div><div class='ctx'>  *    This rate will be used for all Tx attempts; it will not be scaled. */</div><div class='hunk'>@@ -1322,7 +1309,7 @@ struct iwl_rx_mpdu_res_start {</div><div class='ctx'> /* 1: uCode overrides sequence control field in MAC header.</div><div class='ctx'>  * 0: Driver provides sequence control field in MAC header.</div><div class='ctx'>  * Set this for management frames, non-QOS data frames, non-unicast frames,</div><div class='del'>- * and also in Tx command embedded in REPLY_SCAN_CMD for active scans. */</div><div class='add'>+ * and also in Tx command embedded in C_SCAN for active scans. */</div><div class='ctx'> #define TX_CMD_FLG_SEQ_CTL_MSK cpu_to_le32(1 &lt;&lt; 13)</div><div class='ctx'> </div><div class='ctx'> /* 1: This frame is non-last MPDU; more fragments are coming.</div><div class='hunk'>@@ -1349,7 +1336,6 @@ struct iwl_rx_mpdu_res_start {</div><div class='ctx'> /* HCCA-AP - disable duration overwriting. */</div><div class='ctx'> #define TX_CMD_FLG_DUR_MSK cpu_to_le32(1 &lt;&lt; 25)</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * TX command security control</div><div class='ctx'>  */</div><div class='hunk'>@@ -1369,10 +1355,10 @@ struct iwl_rx_mpdu_res_start {</div><div class='ctx'> #define TKIP_ICV_LEN 4</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_TX = 0x1c (command)</div><div class='add'>+ * C_TX = 0x1c (command)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-struct iwl3945_tx_cmd {</div><div class='add'>+struct il3945_tx_cmd {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * MPDU byte count:</div><div class='ctx'> 	 * MAC header (24/26/30/32 bytes) + 2 bytes pad if 26/30 header size,</div><div class='hunk'>@@ -1434,9 +1420,9 @@ struct iwl3945_tx_cmd {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_TX = 0x1c (response)</div><div class='add'>+ * C_TX = 0x1c (response)</div><div class='ctx'>  */</div><div class='del'>-struct iwl3945_tx_resp {</div><div class='add'>+struct il3945_tx_resp {</div><div class='ctx'> 	u8 failure_rts;</div><div class='ctx'> 	u8 failure_frame;</div><div class='ctx'> 	u8 bt_kill_count;</div><div class='hunk'>@@ -1445,19 +1431,18 @@ struct iwl3945_tx_resp {</div><div class='ctx'> 	__le32 status;		/* TX status */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * 4965 uCode updates these Tx attempt count values in host DRAM.</div><div class='ctx'>  * Used for managing Tx retries when expecting block-acks.</div><div class='ctx'>  * Driver should set these fields to 0.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_dram_scratch {</div><div class='add'>+struct il_dram_scratch {</div><div class='ctx'> 	u8 try_cnt;		/* Tx attempts */</div><div class='ctx'> 	u8 bt_kill_cnt;		/* Tx attempts blocked by Bluetooth device */</div><div class='ctx'> 	__le16 reserved;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl_tx_cmd {</div><div class='add'>+struct il_tx_cmd {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * MPDU byte count:</div><div class='ctx'> 	 * MAC header (24/26/30/32 bytes) + 2 bytes pad if 26/30 header size,</div><div class='hunk'>@@ -1481,7 +1466,7 @@ struct iwl_tx_cmd {</div><div class='ctx'> </div><div class='ctx'> 	/* uCode may modify this field of the Tx command (in host DRAM!).</div><div class='ctx'> 	 * Driver must also set dram_lsb_ptr and dram_msb_ptr in this cmd. */</div><div class='del'>-	struct iwl_dram_scratch scratch;</div><div class='add'>+	struct il_dram_scratch scratch;</div><div class='ctx'> </div><div class='ctx'> 	/* Rate for *all* Tx attempts, if TX_CMD_FLG_STA_RATE_MSK is cleared. */</div><div class='ctx'> 	__le32 rate_n_flags;	/* RATE_MCS_* */</div><div class='hunk'>@@ -1493,13 +1478,13 @@ struct iwl_tx_cmd {</div><div class='ctx'> 	u8 sec_ctl;		/* TX_CMD_SEC_* */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Index into rate table (see REPLY_TX_LINK_QUALITY_CMD) for initial</div><div class='add'>+	 * Index into rate table (see C_TX_LINK_QUALITY_CMD) for initial</div><div class='ctx'> 	 * Tx attempt, if TX_CMD_FLG_STA_RATE_MSK is set.  Normally "0" for</div><div class='ctx'> 	 * data frames, this field may be used to selectively reduce initial</div><div class='ctx'> 	 * rate (via non-0 value) for special frames (e.g. management), while</div><div class='ctx'> 	 * still supporting rate scaling for all frames.</div><div class='ctx'> 	 */</div><div class='del'>-	u8 initial_rate_index;</div><div class='add'>+	u8 initial_rate_idx;</div><div class='ctx'> 	u8 reserved;</div><div class='ctx'> 	u8 key[16];</div><div class='ctx'> 	__le16 next_frame_flags;</div><div class='hunk'>@@ -1628,12 +1613,12 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	TX_STATUS_MSK = 0x000000ff,		/* bits 0:7 */</div><div class='add'>+	TX_STATUS_MSK = 0x000000ff,	/* bits 0:7 */</div><div class='ctx'> 	TX_STATUS_DELAY_MSK = 0x00000040,</div><div class='ctx'> 	TX_STATUS_ABORT_MSK = 0x00000080,</div><div class='ctx'> 	TX_PACKET_MODE_MSK = 0x0000ff00,	/* bits 8:15 */</div><div class='ctx'> 	TX_FIFO_NUMBER_MSK = 0x00070000,	/* bits 16:18 */</div><div class='del'>-	TX_RESERVED = 0x00780000,		/* bits 19:22 */</div><div class='add'>+	TX_RESERVED = 0x00780000,	/* bits 19:22 */</div><div class='ctx'> 	TX_POWER_PA_DETECT_MSK = 0x7f800000,	/* bits 23:30 */</div><div class='ctx'> 	TX_ABORT_REQUIRED_MSK = 0x80000000,	/* bits 31:31 */</div><div class='ctx'> };</div><div class='hunk'>@@ -1671,7 +1656,7 @@ enum {</div><div class='ctx'> #define AGG_TX_STATE_SEQ_NUM_MSK 0xffff0000</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_TX = 0x1c (response)</div><div class='add'>+ * C_TX = 0x1c (response)</div><div class='ctx'>  *</div><div class='ctx'>  * This response may be in one of two slightly different formats, indicated</div><div class='ctx'>  * by the frame_count field:</div><div class='hunk'>@@ -1697,7 +1682,7 @@ struct agg_tx_status {</div><div class='ctx'> 	__le16 sequence;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl4965_tx_resp {</div><div class='add'>+struct il4965_tx_resp {</div><div class='ctx'> 	u8 frame_count;		/* 1 no aggregation, &gt;1 aggregation */</div><div class='ctx'> 	u8 bt_kill_count;	/* # blocked by bluetooth (unused for agg) */</div><div class='ctx'> 	u8 failure_rts;		/* # failures due to unsuccessful RTS */</div><div class='hunk'>@@ -1730,16 +1715,16 @@ struct iwl4965_tx_resp {</div><div class='ctx'> 	 */</div><div class='ctx'> 	union {</div><div class='ctx'> 		__le32 status;</div><div class='del'>-		struct agg_tx_status agg_status[0]; /* for each agg frame */</div><div class='add'>+		struct agg_tx_status agg_status[0];	/* for each agg frame */</div><div class='ctx'> 	} u;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_COMPRESSED_BA = 0xc5 (response only, not a command)</div><div class='add'>+ * N_COMPRESSED_BA = 0xc5 (response only, not a command)</div><div class='ctx'>  *</div><div class='ctx'>  * Reports Block-Acknowledge from recipient station</div><div class='ctx'>  */</div><div class='del'>-struct iwl_compressed_ba_resp {</div><div class='add'>+struct il_compressed_ba_resp {</div><div class='ctx'> 	__le32 sta_addr_lo32;</div><div class='ctx'> 	__le16 sta_addr_hi16;</div><div class='ctx'> 	__le16 reserved;</div><div class='hunk'>@@ -1754,30 +1739,29 @@ struct iwl_compressed_ba_resp {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_TX_PWR_TABLE_CMD = 0x97 (command, has simple generic response)</div><div class='add'>+ * C_TX_PWR_TBL = 0x97 (command, has simple generic response)</div><div class='ctx'>  *</div><div class='del'>- * See details under "TXPOWER" in iwl-4965-hw.h.</div><div class='add'>+ * See details under "TXPOWER" in 4965.h.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-struct iwl3945_txpowertable_cmd {</div><div class='add'>+struct il3945_txpowertable_cmd {</div><div class='ctx'> 	u8 band;		/* 0: 5 GHz, 1: 2.4 GHz */</div><div class='ctx'> 	u8 reserved;</div><div class='ctx'> 	__le16 channel;</div><div class='del'>-	struct iwl3945_power_per_rate power[IWL_MAX_RATES];</div><div class='add'>+	struct il3945_power_per_rate power[IL_MAX_RATES];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl4965_txpowertable_cmd {</div><div class='add'>+struct il4965_txpowertable_cmd {</div><div class='ctx'> 	u8 band;		/* 0: 5 GHz, 1: 2.4 GHz */</div><div class='ctx'> 	u8 reserved;</div><div class='ctx'> 	__le16 channel;</div><div class='del'>-	struct iwl4965_tx_power_db tx_power;</div><div class='add'>+	struct il4965_tx_power_db tx_power;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * struct iwl3945_rate_scaling_cmd - Rate Scaling Command &amp; Response</div><div class='add'>+ * struct il3945_rate_scaling_cmd - Rate Scaling Command &amp; Response</div><div class='ctx'>  *</div><div class='del'>- * REPLY_RATE_SCALE = 0x47 (command, has simple generic response)</div><div class='add'>+ * C_RATE_SCALE = 0x47 (command, has simple generic response)</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE: The table of rates passed to the uCode via the</div><div class='ctx'>  * RATE_SCALE command sets up the corresponding order of</div><div class='hunk'>@@ -1786,22 +1770,21 @@ struct iwl4965_txpowertable_cmd {</div><div class='ctx'>  *</div><div class='ctx'>  * For example, if you set 9MB (PLCP 0x0f) as the first</div><div class='ctx'>  * rate in the rate table, the bit mask for that rate</div><div class='del'>- * when passed through ofdm_basic_rates on the REPLY_RXON</div><div class='add'>+ * when passed through ofdm_basic_rates on the C_RXON</div><div class='ctx'>  * command would be bit 0 (1 &lt;&lt; 0)</div><div class='ctx'>  */</div><div class='del'>-struct iwl3945_rate_scaling_info {</div><div class='add'>+struct il3945_rate_scaling_info {</div><div class='ctx'> 	__le16 rate_n_flags;</div><div class='ctx'> 	u8 try_cnt;</div><div class='del'>-	u8 next_rate_index;</div><div class='add'>+	u8 next_rate_idx;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl3945_rate_scaling_cmd {</div><div class='add'>+struct il3945_rate_scaling_cmd {</div><div class='ctx'> 	u8 table_id;</div><div class='ctx'> 	u8 reserved[3];</div><div class='del'>-	struct iwl3945_rate_scaling_info table[IWL_MAX_RATES];</div><div class='add'>+	struct il3945_rate_scaling_info table[IL_MAX_RATES];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*RS_NEW_API: only TLC_RTS remains and moved to bit 0 */</div><div class='ctx'> #define  LINK_QUAL_FLAGS_SET_STA_TLC_RTS_MSK	(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='hunk'>@@ -1816,28 +1799,27 @@ struct iwl3945_rate_scaling_cmd {</div><div class='ctx'> #define  LINK_QUAL_ANT_B_MSK (1 &lt;&lt; 1)</div><div class='ctx'> #define  LINK_QUAL_ANT_MSK   (LINK_QUAL_ANT_A_MSK|LINK_QUAL_ANT_B_MSK)</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * struct iwl_link_qual_general_params</div><div class='add'>+ * struct il_link_qual_general_params</div><div class='ctx'>  *</div><div class='del'>- * Used in REPLY_TX_LINK_QUALITY_CMD</div><div class='add'>+ * Used in C_TX_LINK_QUALITY_CMD</div><div class='ctx'>  */</div><div class='del'>-struct iwl_link_qual_general_params {</div><div class='add'>+struct il_link_qual_general_params {</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> </div><div class='del'>-	/* No entries at or above this (driver chosen) index contain MIMO */</div><div class='add'>+	/* No entries at or above this (driver chosen) idx contain MIMO */</div><div class='ctx'> 	u8 mimo_delimiter;</div><div class='ctx'> </div><div class='ctx'> 	/* Best single antenna to use for single stream (legacy, SISO). */</div><div class='ctx'> 	u8 single_stream_ant_msk;	/* LINK_QUAL_ANT_* */</div><div class='ctx'> </div><div class='ctx'> 	/* Best antennas to use for MIMO (unused for 4965, assumes both). */</div><div class='del'>-	u8 dual_stream_ant_msk;		/* LINK_QUAL_ANT_* */</div><div class='add'>+	u8 dual_stream_ant_msk;	/* LINK_QUAL_ANT_* */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If driver needs to use different initial rates for different</div><div class='ctx'> 	 * EDCA QOS access categories (as implemented by tx fifos 0-3),</div><div class='del'>-	 * this table will set that up, by indicating the indexes in the</div><div class='add'>+	 * this table will set that up, by indicating the idxes in the</div><div class='ctx'> 	 * rs_table[LINK_QUAL_MAX_RETRY_NUM] rate table at which to start.</div><div class='ctx'> 	 * Otherwise, driver should set all entries to 0.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -1845,10 +1827,10 @@ struct iwl_link_qual_general_params {</div><div class='ctx'> 	 * 0 = Background, 1 = Best Effort (normal), 2 = Video, 3 = Voice</div><div class='ctx'> 	 * TX FIFOs above 3 use same value (typically 0) as TX FIFO 3.</div><div class='ctx'> 	 */</div><div class='del'>-	u8 start_rate_index[LINK_QUAL_AC_NUM];</div><div class='add'>+	u8 start_rate_idx[LINK_QUAL_AC_NUM];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-#define LINK_QUAL_AGG_TIME_LIMIT_DEF	(4000) /* 4 milliseconds */</div><div class='add'>+#define LINK_QUAL_AGG_TIME_LIMIT_DEF	(4000)	/* 4 milliseconds */</div><div class='ctx'> #define LINK_QUAL_AGG_TIME_LIMIT_MAX	(8000)</div><div class='ctx'> #define LINK_QUAL_AGG_TIME_LIMIT_MIN	(100)</div><div class='ctx'> </div><div class='hunk'>@@ -1861,11 +1843,11 @@ struct iwl_link_qual_general_params {</div><div class='ctx'> #define LINK_QUAL_AGG_FRAME_LIMIT_MIN	(0)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_link_qual_agg_params</div><div class='add'>+ * struct il_link_qual_agg_params</div><div class='ctx'>  *</div><div class='del'>- * Used in REPLY_TX_LINK_QUALITY_CMD</div><div class='add'>+ * Used in C_TX_LINK_QUALITY_CMD</div><div class='ctx'>  */</div><div class='del'>-struct iwl_link_qual_agg_params {</div><div class='add'>+struct il_link_qual_agg_params {</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *Maximum number of uSec in aggregation.</div><div class='hunk'>@@ -1892,9 +1874,9 @@ struct iwl_link_qual_agg_params {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_TX_LINK_QUALITY_CMD = 0x4e (command, has simple generic response)</div><div class='add'>+ * C_TX_LINK_QUALITY_CMD = 0x4e (command, has simple generic response)</div><div class='ctx'>  *</div><div class='del'>- * For 4965 devices only; 3945 uses REPLY_RATE_SCALE.</div><div class='add'>+ * For 4965 devices only; 3945 uses C_RATE_SCALE.</div><div class='ctx'>  *</div><div class='ctx'>  * Each station in the 4965 device's internal station table has its own table</div><div class='ctx'>  * of 16</div><div class='hunk'>@@ -1903,13 +1885,13 @@ struct iwl_link_qual_agg_params {</div><div class='ctx'>  * one station.</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE:  Station must already be in 4965 device's station table.</div><div class='del'>- *	  Use REPLY_ADD_STA.</div><div class='add'>+ *	  Use C_ADD_STA.</div><div class='ctx'>  *</div><div class='ctx'>  * The rate scaling procedures described below work well.  Of course, other</div><div class='ctx'>  * procedures are possible, and may work better for particular environments.</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='del'>- * FILLING THE RATE TABLE</div><div class='add'>+ * FILLING THE RATE TBL</div><div class='ctx'>  *</div><div class='ctx'>  * Given a particular initial rate and mode, as determined by the rate</div><div class='ctx'>  * scaling algorithm described below, the Linux driver uses the following</div><div class='hunk'>@@ -1948,13 +1930,13 @@ struct iwl_link_qual_agg_params {</div><div class='ctx'>  * speculative mode as the new current active mode.</div><div class='ctx'>  *</div><div class='ctx'>  * Each history set contains, separately for each possible rate, data for a</div><div class='del'>- * sliding window of the 62 most recent tx attempts at that rate.  The data</div><div class='add'>+ * sliding win of the 62 most recent tx attempts at that rate.  The data</div><div class='ctx'>  * includes a shifting bitmap of success(1)/failure(0), and sums of successful</div><div class='ctx'>  * and attempted frames, from which the driver can additionally calculate a</div><div class='ctx'>  * success ratio (success / attempted) and number of failures</div><div class='del'>- * (attempted - success), and control the size of the window (attempted).</div><div class='add'>+ * (attempted - success), and control the size of the win (attempted).</div><div class='ctx'>  * The driver uses the bit map to remove successes from the success sum, as</div><div class='del'>- * the oldest tx attempts fall out of the window.</div><div class='add'>+ * the oldest tx attempts fall out of the win.</div><div class='ctx'>  *</div><div class='ctx'>  * When the 4965 device makes multiple tx attempts for a given frame, each</div><div class='ctx'>  * attempt might be at a different rate, and have different modulation</div><div class='hunk'>@@ -1966,7 +1948,7 @@ struct iwl_link_qual_agg_params {</div><div class='ctx'>  *</div><div class='ctx'>  * When using block-ack (aggregation), all frames are transmitted at the same</div><div class='ctx'>  * rate, since there is no per-attempt acknowledgment from the destination</div><div class='del'>- * station.  The Tx response struct iwl_tx_resp indicates the Tx rate in</div><div class='add'>+ * station.  The Tx response struct il_tx_resp indicates the Tx rate in</div><div class='ctx'>  * rate_n_flags field.  After receiving a block-ack, the driver can update</div><div class='ctx'>  * history for the entire block all at once.</div><div class='ctx'>  *</div><div class='hunk'>@@ -2016,8 +1998,8 @@ struct iwl_link_qual_agg_params {</div><div class='ctx'>  *         good performance; higher rate is sure to have poorer success.</div><div class='ctx'>  *</div><div class='ctx'>  * 6)  Re-evaluate the rate after each tx frame.  If working with block-</div><div class='del'>- *     acknowledge, history and statistics may be calculated for the entire</div><div class='del'>- *     block (including prior history that fits within the history windows),</div><div class='add'>+ *     acknowledge, history and stats may be calculated for the entire</div><div class='add'>+ *     block (including prior history that fits within the history wins),</div><div class='ctx'>  *     before re-evaluation.</div><div class='ctx'>  *</div><div class='ctx'>  * FINDING BEST STARTING MODULATION MODE:</div><div class='hunk'>@@ -2079,22 +2061,22 @@ struct iwl_link_qual_agg_params {</div><div class='ctx'>  * legacy), and then repeat the search process.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-struct iwl_link_quality_cmd {</div><div class='add'>+struct il_link_quality_cmd {</div><div class='ctx'> </div><div class='ctx'> 	/* Index of destination/recipient station in uCode's station table */</div><div class='ctx'> 	u8 sta_id;</div><div class='ctx'> 	u8 reserved1;</div><div class='ctx'> 	__le16 control;		/* not used */</div><div class='del'>-	struct iwl_link_qual_general_params general_params;</div><div class='del'>-	struct iwl_link_qual_agg_params agg_params;</div><div class='add'>+	struct il_link_qual_general_params general_params;</div><div class='add'>+	struct il_link_qual_agg_params agg_params;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Rate info; when using rate-scaling, Tx command's initial_rate_index</div><div class='del'>-	 * specifies 1st Tx rate attempted, via index into this table.</div><div class='add'>+	 * Rate info; when using rate-scaling, Tx command's initial_rate_idx</div><div class='add'>+	 * specifies 1st Tx rate attempted, via idx into this table.</div><div class='ctx'> 	 * 4965 devices works its way through table when retrying Tx.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct {</div><div class='del'>-		__le32 rate_n_flags;	/* RATE_MCS_*, IWL_RATE_* */</div><div class='add'>+		__le32 rate_n_flags;	/* RATE_MCS_*, RATE_* */</div><div class='ctx'> 	} rs_table[LINK_QUAL_MAX_RETRY_NUM];</div><div class='ctx'> 	__le32 reserved2;</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -2117,13 +2099,13 @@ struct iwl_link_quality_cmd {</div><div class='ctx'> #define BT_MAX_KILL_DEF (0x5)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_BT_CONFIG = 0x9b (command, has simple generic response)</div><div class='add'>+ * C_BT_CONFIG = 0x9b (command, has simple generic response)</div><div class='ctx'>  *</div><div class='ctx'>  * 3945 and 4965 devices support hardware handshake with Bluetooth device on</div><div class='ctx'>  * same platform.  Bluetooth device alerts wireless device when it will Tx;</div><div class='ctx'>  * wireless device can delay or kill its own Tx to accommodate.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_bt_cmd {</div><div class='add'>+struct il_bt_cmd {</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> 	u8 lead_time;</div><div class='ctx'> 	u8 max_kill;</div><div class='hunk'>@@ -2132,7 +2114,6 @@ struct iwl_bt_cmd {</div><div class='ctx'> 	__le32 kill_cts_mask;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * (6)</div><div class='ctx'>  * Spectrum Management (802.11h) Commands, Responses, Notifications:</div><div class='hunk'>@@ -2150,18 +2131,18 @@ struct iwl_bt_cmd {</div><div class='ctx'> 				 RXON_FILTER_ASSOC_MSK           | \</div><div class='ctx'> 				 RXON_FILTER_BCON_AWARE_MSK)</div><div class='ctx'> </div><div class='del'>-struct iwl_measure_channel {</div><div class='add'>+struct il_measure_channel {</div><div class='ctx'> 	__le32 duration;	/* measurement duration in extended beacon</div><div class='ctx'> 				 * format */</div><div class='ctx'> 	u8 channel;		/* channel to measure */</div><div class='del'>-	u8 type;		/* see enum iwl_measure_type */</div><div class='add'>+	u8 type;		/* see enum il_measure_type */</div><div class='ctx'> 	__le16 reserved;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_SPECTRUM_MEASUREMENT_CMD = 0x74 (command)</div><div class='add'>+ * C_SPECTRUM_MEASUREMENT = 0x74 (command)</div><div class='ctx'>  */</div><div class='del'>-struct iwl_spectrum_cmd {</div><div class='add'>+struct il_spectrum_cmd {</div><div class='ctx'> 	__le16 len;		/* number of bytes starting from token */</div><div class='ctx'> 	u8 token;		/* token id */</div><div class='ctx'> 	u8 id;			/* measurement id -- 0 or 1 */</div><div class='hunk'>@@ -2174,13 +2155,13 @@ struct iwl_spectrum_cmd {</div><div class='ctx'> 	__le32 filter_flags;	/* rxon filter flags */</div><div class='ctx'> 	__le16 channel_count;	/* minimum 1, maximum 10 */</div><div class='ctx'> 	__le16 reserved3;</div><div class='del'>-	struct iwl_measure_channel channels[10];</div><div class='add'>+	struct il_measure_channel channels[10];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_SPECTRUM_MEASUREMENT_CMD = 0x74 (response)</div><div class='add'>+ * C_SPECTRUM_MEASUREMENT = 0x74 (response)</div><div class='ctx'>  */</div><div class='del'>-struct iwl_spectrum_resp {</div><div class='add'>+struct il_spectrum_resp {</div><div class='ctx'> 	u8 token;</div><div class='ctx'> 	u8 id;			/* id of the prior command replaced, or 0xff */</div><div class='ctx'> 	__le16 status;		/* 0 - command will be handled</div><div class='hunk'>@@ -2188,57 +2169,57 @@ struct iwl_spectrum_resp {</div><div class='ctx'> 				 *     measurement) */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-enum iwl_measurement_state {</div><div class='del'>-	IWL_MEASUREMENT_START = 0,</div><div class='del'>-	IWL_MEASUREMENT_STOP = 1,</div><div class='add'>+enum il_measurement_state {</div><div class='add'>+	IL_MEASUREMENT_START = 0,</div><div class='add'>+	IL_MEASUREMENT_STOP = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum iwl_measurement_status {</div><div class='del'>-	IWL_MEASUREMENT_OK = 0,</div><div class='del'>-	IWL_MEASUREMENT_CONCURRENT = 1,</div><div class='del'>-	IWL_MEASUREMENT_CSA_CONFLICT = 2,</div><div class='del'>-	IWL_MEASUREMENT_TGH_CONFLICT = 3,</div><div class='add'>+enum il_measurement_status {</div><div class='add'>+	IL_MEASUREMENT_OK = 0,</div><div class='add'>+	IL_MEASUREMENT_CONCURRENT = 1,</div><div class='add'>+	IL_MEASUREMENT_CSA_CONFLICT = 2,</div><div class='add'>+	IL_MEASUREMENT_TGH_CONFLICT = 3,</div><div class='ctx'> 	/* 4-5 reserved */</div><div class='del'>-	IWL_MEASUREMENT_STOPPED = 6,</div><div class='del'>-	IWL_MEASUREMENT_TIMEOUT = 7,</div><div class='del'>-	IWL_MEASUREMENT_PERIODIC_FAILED = 8,</div><div class='add'>+	IL_MEASUREMENT_STOPPED = 6,</div><div class='add'>+	IL_MEASUREMENT_TIMEOUT = 7,</div><div class='add'>+	IL_MEASUREMENT_PERIODIC_FAILED = 8,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define NUM_ELEMENTS_IN_HISTOGRAM 8</div><div class='ctx'> </div><div class='del'>-struct iwl_measurement_histogram {</div><div class='add'>+struct il_measurement_histogram {</div><div class='ctx'> 	__le32 ofdm[NUM_ELEMENTS_IN_HISTOGRAM];	/* in 0.8usec counts */</div><div class='ctx'> 	__le32 cck[NUM_ELEMENTS_IN_HISTOGRAM];	/* in 1usec counts */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* clear channel availability counters */</div><div class='del'>-struct iwl_measurement_cca_counters {</div><div class='add'>+struct il_measurement_cca_counters {</div><div class='ctx'> 	__le32 ofdm;</div><div class='ctx'> 	__le32 cck;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-enum iwl_measure_type {</div><div class='del'>-	IWL_MEASURE_BASIC = (1 &lt;&lt; 0),</div><div class='del'>-	IWL_MEASURE_CHANNEL_LOAD = (1 &lt;&lt; 1),</div><div class='del'>-	IWL_MEASURE_HISTOGRAM_RPI = (1 &lt;&lt; 2),</div><div class='del'>-	IWL_MEASURE_HISTOGRAM_NOISE = (1 &lt;&lt; 3),</div><div class='del'>-	IWL_MEASURE_FRAME = (1 &lt;&lt; 4),</div><div class='add'>+enum il_measure_type {</div><div class='add'>+	IL_MEASURE_BASIC = (1 &lt;&lt; 0),</div><div class='add'>+	IL_MEASURE_CHANNEL_LOAD = (1 &lt;&lt; 1),</div><div class='add'>+	IL_MEASURE_HISTOGRAM_RPI = (1 &lt;&lt; 2),</div><div class='add'>+	IL_MEASURE_HISTOGRAM_NOISE = (1 &lt;&lt; 3),</div><div class='add'>+	IL_MEASURE_FRAME = (1 &lt;&lt; 4),</div><div class='ctx'> 	/* bits 5:6 are reserved */</div><div class='del'>-	IWL_MEASURE_IDLE = (1 &lt;&lt; 7),</div><div class='add'>+	IL_MEASURE_IDLE = (1 &lt;&lt; 7),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * SPECTRUM_MEASURE_NOTIFICATION = 0x75 (notification only, not a command)</div><div class='add'>+ * N_SPECTRUM_MEASUREMENT = 0x75 (notification only, not a command)</div><div class='ctx'>  */</div><div class='del'>-struct iwl_spectrum_notification {</div><div class='add'>+struct il_spectrum_notification {</div><div class='ctx'> 	u8 id;			/* measurement id -- 0 or 1 */</div><div class='ctx'> 	u8 token;</div><div class='del'>-	u8 channel_index;	/* index in measurement channel list */</div><div class='add'>+	u8 channel_idx;		/* idx in measurement channel list */</div><div class='ctx'> 	u8 state;		/* 0 - start, 1 - stop */</div><div class='ctx'> 	__le32 start_time;	/* lower 32-bits of TSF */</div><div class='ctx'> 	u8 band;		/* 0 - 5.2GHz, 1 - 2.4GHz */</div><div class='ctx'> 	u8 channel;</div><div class='del'>-	u8 type;		/* see enum iwl_measurement_type */</div><div class='add'>+	u8 type;		/* see enum il_measurement_type */</div><div class='ctx'> 	u8 reserved1;</div><div class='ctx'> 	/* NOTE:  cca_ofdm, cca_cck, basic_type, and histogram are only only</div><div class='ctx'> 	 * valid if applicable for measurement type requested. */</div><div class='hunk'>@@ -2248,9 +2229,9 @@ struct iwl_spectrum_notification {</div><div class='ctx'> 	u8 basic_type;		/* 0 - bss, 1 - ofdm preamble, 2 -</div><div class='ctx'> 				 * unidentified */</div><div class='ctx'> 	u8 reserved2[3];</div><div class='del'>-	struct iwl_measurement_histogram histogram;</div><div class='add'>+	struct il_measurement_histogram histogram;</div><div class='ctx'> 	__le32 stop_time;	/* lower 32-bits of TSF */</div><div class='del'>-	__le32 status;		/* see iwl_measurement_status */</div><div class='add'>+	__le32 status;		/* see il_measurement_status */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='hunk'>@@ -2260,10 +2241,10 @@ struct iwl_spectrum_notification {</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_powertable_cmd - Power Table Command</div><div class='add'>+ * struct il_powertable_cmd - Power Table Command</div><div class='ctx'>  * @flags: See below:</div><div class='ctx'>  *</div><div class='del'>- * POWER_TABLE_CMD = 0x77 (command, has simple generic response)</div><div class='add'>+ * C_POWER_TBL = 0x77 (command, has simple generic response)</div><div class='ctx'>  *</div><div class='ctx'>  * PM allow:</div><div class='ctx'>  *   bit 0 - '0' Driver not allow power management</div><div class='hunk'>@@ -2290,38 +2271,38 @@ struct iwl_spectrum_notification {</div><div class='ctx'>  *              '10' force xtal sleep</div><div class='ctx'>  *              '11' Illegal set</div><div class='ctx'>  *</div><div class='del'>- * NOTE: if sleep_interval[SLEEP_INTRVL_TABLE_SIZE-1] &gt; DTIM period then</div><div class='add'>+ * NOTE: if sleep_interval[SLEEP_INTRVL_TBL_SIZE-1] &gt; DTIM period then</div><div class='ctx'>  * ucode assume sleep over DTIM is allowed and we don't need to wake up</div><div class='ctx'>  * for every DTIM.</div><div class='ctx'>  */</div><div class='del'>-#define IWL_POWER_VEC_SIZE 5</div><div class='add'>+#define IL_POWER_VEC_SIZE 5</div><div class='ctx'> </div><div class='del'>-#define IWL_POWER_DRIVER_ALLOW_SLEEP_MSK	cpu_to_le16(BIT(0))</div><div class='del'>-#define IWL_POWER_PCI_PM_MSK			cpu_to_le16(BIT(3))</div><div class='add'>+#define IL_POWER_DRIVER_ALLOW_SLEEP_MSK	cpu_to_le16(BIT(0))</div><div class='add'>+#define IL_POWER_PCI_PM_MSK			cpu_to_le16(BIT(3))</div><div class='ctx'> </div><div class='del'>-struct iwl3945_powertable_cmd {</div><div class='add'>+struct il3945_powertable_cmd {</div><div class='ctx'> 	__le16 flags;</div><div class='ctx'> 	u8 reserved[2];</div><div class='ctx'> 	__le32 rx_data_timeout;</div><div class='ctx'> 	__le32 tx_data_timeout;</div><div class='del'>-	__le32 sleep_interval[IWL_POWER_VEC_SIZE];</div><div class='add'>+	__le32 sleep_interval[IL_POWER_VEC_SIZE];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl_powertable_cmd {</div><div class='add'>+struct il_powertable_cmd {</div><div class='ctx'> 	__le16 flags;</div><div class='del'>-	u8 keep_alive_seconds;		/* 3945 reserved */</div><div class='del'>-	u8 debug_flags;			/* 3945 reserved */</div><div class='add'>+	u8 keep_alive_seconds;	/* 3945 reserved */</div><div class='add'>+	u8 debug_flags;		/* 3945 reserved */</div><div class='ctx'> 	__le32 rx_data_timeout;</div><div class='ctx'> 	__le32 tx_data_timeout;</div><div class='del'>-	__le32 sleep_interval[IWL_POWER_VEC_SIZE];</div><div class='add'>+	__le32 sleep_interval[IL_POWER_VEC_SIZE];</div><div class='ctx'> 	__le32 keep_alive_beacons;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * PM_SLEEP_NOTIFICATION = 0x7A (notification only, not a command)</div><div class='add'>+ * N_PM_SLEEP = 0x7A (notification only, not a command)</div><div class='ctx'>  * all devices identical.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_sleep_notification {</div><div class='add'>+struct il_sleep_notification {</div><div class='ctx'> 	u8 pm_sleep_mode;</div><div class='ctx'> 	u8 pm_wakeup_src;</div><div class='ctx'> 	__le16 reserved;</div><div class='hunk'>@@ -2332,23 +2313,23 @@ struct iwl_sleep_notification {</div><div class='ctx'> </div><div class='ctx'> /* Sleep states.  all devices identical. */</div><div class='ctx'> enum {</div><div class='del'>-	IWL_PM_NO_SLEEP = 0,</div><div class='del'>-	IWL_PM_SLP_MAC = 1,</div><div class='del'>-	IWL_PM_SLP_FULL_MAC_UNASSOCIATE = 2,</div><div class='del'>-	IWL_PM_SLP_FULL_MAC_CARD_STATE = 3,</div><div class='del'>-	IWL_PM_SLP_PHY = 4,</div><div class='del'>-	IWL_PM_SLP_REPENT = 5,</div><div class='del'>-	IWL_PM_WAKEUP_BY_TIMER = 6,</div><div class='del'>-	IWL_PM_WAKEUP_BY_DRIVER = 7,</div><div class='del'>-	IWL_PM_WAKEUP_BY_RFKILL = 8,</div><div class='add'>+	IL_PM_NO_SLEEP = 0,</div><div class='add'>+	IL_PM_SLP_MAC = 1,</div><div class='add'>+	IL_PM_SLP_FULL_MAC_UNASSOCIATE = 2,</div><div class='add'>+	IL_PM_SLP_FULL_MAC_CARD_STATE = 3,</div><div class='add'>+	IL_PM_SLP_PHY = 4,</div><div class='add'>+	IL_PM_SLP_REPENT = 5,</div><div class='add'>+	IL_PM_WAKEUP_BY_TIMER = 6,</div><div class='add'>+	IL_PM_WAKEUP_BY_DRIVER = 7,</div><div class='add'>+	IL_PM_WAKEUP_BY_RFKILL = 8,</div><div class='ctx'> 	/* 3 reserved */</div><div class='del'>-	IWL_PM_NUM_OF_MODES = 12,</div><div class='add'>+	IL_PM_NUM_OF_MODES = 12,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * CARD_STATE_NOTIFICATION = 0xa1 (notification only, not a command)</div><div class='add'>+ * N_CARD_STATE = 0xa1 (notification only, not a command)</div><div class='ctx'>  */</div><div class='del'>-struct iwl_card_state_notif {</div><div class='add'>+struct il_card_state_notif {</div><div class='ctx'> 	__le32 flags;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -2357,11 +2338,11 @@ struct iwl_card_state_notif {</div><div class='ctx'> #define CT_CARD_DISABLED   0x04</div><div class='ctx'> #define RXON_CARD_DISABLED 0x10</div><div class='ctx'> </div><div class='del'>-struct iwl_ct_kill_config {</div><div class='del'>-	__le32   reserved;</div><div class='del'>-	__le32   critical_temperature_M;</div><div class='del'>-	__le32   critical_temperature_R;</div><div class='del'>-}  __packed;</div><div class='add'>+struct il_ct_kill_config {</div><div class='add'>+	__le32 reserved;</div><div class='add'>+	__le32 critical_temperature_M;</div><div class='add'>+	__le32 critical_temperature_R;</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * (8)</div><div class='hunk'>@@ -2373,7 +2354,7 @@ struct iwl_ct_kill_config {</div><div class='ctx'> #define SCAN_CHANNEL_TYPE_ACTIVE  cpu_to_le32(1)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_scan_channel - entry in REPLY_SCAN_CMD channel table</div><div class='add'>+ * struct il_scan_channel - entry in C_SCAN channel table</div><div class='ctx'>  *</div><div class='ctx'>  * One for each channel in the scan list.</div><div class='ctx'>  * Each channel can independently select:</div><div class='hunk'>@@ -2383,7 +2364,7 @@ struct iwl_ct_kill_config {</div><div class='ctx'>  *     quiet_plcp_th, good_CRC_th)</div><div class='ctx'>  *</div><div class='ctx'>  * To avoid uCode errors, make sure the following are true (see comments</div><div class='del'>- * under struct iwl_scan_cmd about max_out_time and quiet_time):</div><div class='add'>+ * under struct il_scan_cmd about max_out_time and quiet_time):</div><div class='ctx'>  * 1)  If using passive_dwell (i.e. passive_dwell != 0):</div><div class='ctx'>  *     active_dwell &lt;= passive_dwell (&lt; max_out_time if max_out_time != 0)</div><div class='ctx'>  * 2)  quiet_time &lt;= active_dwell</div><div class='hunk'>@@ -2391,7 +2372,7 @@ struct iwl_ct_kill_config {</div><div class='ctx'>  *     passive_dwell &lt; max_out_time</div><div class='ctx'>  *     active_dwell &lt; max_out_time</div><div class='ctx'>  */</div><div class='del'>-struct iwl3945_scan_channel {</div><div class='add'>+struct il3945_scan_channel {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * type is defined as:</div><div class='ctx'> 	 * 0:0 1 = active, 0 = passive</div><div class='hunk'>@@ -2400,16 +2381,16 @@ struct iwl3945_scan_channel {</div><div class='ctx'> 	 * 5:7 reserved</div><div class='ctx'> 	 */</div><div class='ctx'> 	u8 type;</div><div class='del'>-	u8 channel;	/* band is selected by iwl3945_scan_cmd "flags" field */</div><div class='del'>-	struct iwl3945_tx_power tpc;</div><div class='add'>+	u8 channel;		/* band is selected by il3945_scan_cmd "flags" field */</div><div class='add'>+	struct il3945_tx_power tpc;</div><div class='ctx'> 	__le16 active_dwell;	/* in 1024-uSec TU (time units), typ 5-50 */</div><div class='ctx'> 	__le16 passive_dwell;	/* in 1024-uSec TU (time units), typ 20-500 */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* set number of direct probes u8 type */</div><div class='del'>-#define IWL39_SCAN_PROBE_MASK(n) ((BIT(n) | (BIT(n) - BIT(1))))</div><div class='add'>+#define IL39_SCAN_PROBE_MASK(n) ((BIT(n) | (BIT(n) - BIT(1))))</div><div class='ctx'> </div><div class='del'>-struct iwl_scan_channel {</div><div class='add'>+struct il_scan_channel {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * type is defined as:</div><div class='ctx'> 	 * 0:0 1 = active, 0 = passive</div><div class='hunk'>@@ -2418,7 +2399,7 @@ struct iwl_scan_channel {</div><div class='ctx'> 	 * 21:31 reserved</div><div class='ctx'> 	 */</div><div class='ctx'> 	__le32 type;</div><div class='del'>-	__le16 channel;	/* band is selected by iwl_scan_cmd "flags" field */</div><div class='add'>+	__le16 channel;		/* band is selected by il_scan_cmd "flags" field */</div><div class='ctx'> 	u8 tx_gain;		/* gain for analog radio */</div><div class='ctx'> 	u8 dsp_atten;		/* gain for DSP */</div><div class='ctx'> 	__le16 active_dwell;	/* in 1024-uSec TU (time units), typ 5-50 */</div><div class='hunk'>@@ -2426,17 +2407,17 @@ struct iwl_scan_channel {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* set number of direct probes __le32 type */</div><div class='del'>-#define IWL_SCAN_PROBE_MASK(n)	cpu_to_le32((BIT(n) | (BIT(n) - BIT(1))))</div><div class='add'>+#define IL_SCAN_PROBE_MASK(n)	cpu_to_le32((BIT(n) | (BIT(n) - BIT(1))))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_ssid_ie - directed scan network information element</div><div class='add'>+ * struct il_ssid_ie - directed scan network information element</div><div class='ctx'>  *</div><div class='del'>- * Up to 20 of these may appear in REPLY_SCAN_CMD (Note: Only 4 are in</div><div class='del'>- * 3945 SCAN api), selected by "type" bit field in struct iwl_scan_channel;</div><div class='add'>+ * Up to 20 of these may appear in C_SCAN (Note: Only 4 are in</div><div class='add'>+ * 3945 SCAN api), selected by "type" bit field in struct il_scan_channel;</div><div class='ctx'>  * each channel may select different ssids from among the 20 (4) entries.</div><div class='ctx'>  * SSID IEs get transmitted in reverse order of entry.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_ssid_ie {</div><div class='add'>+struct il_ssid_ie {</div><div class='ctx'> 	u8 id;</div><div class='ctx'> 	u8 len;</div><div class='ctx'> 	u8 ssid[32];</div><div class='hunk'>@@ -2445,14 +2426,14 @@ struct iwl_ssid_ie {</div><div class='ctx'> #define PROBE_OPTION_MAX_3945		4</div><div class='ctx'> #define PROBE_OPTION_MAX		20</div><div class='ctx'> #define TX_CMD_LIFE_TIME_INFINITE	cpu_to_le32(0xFFFFFFFF)</div><div class='del'>-#define IWL_GOOD_CRC_TH_DISABLED	0</div><div class='del'>-#define IWL_GOOD_CRC_TH_DEFAULT		cpu_to_le16(1)</div><div class='del'>-#define IWL_GOOD_CRC_TH_NEVER		cpu_to_le16(0xffff)</div><div class='del'>-#define IWL_MAX_SCAN_SIZE 1024</div><div class='del'>-#define IWL_MAX_CMD_SIZE 4096</div><div class='add'>+#define IL_GOOD_CRC_TH_DISABLED	0</div><div class='add'>+#define IL_GOOD_CRC_TH_DEFAULT		cpu_to_le16(1)</div><div class='add'>+#define IL_GOOD_CRC_TH_NEVER		cpu_to_le16(0xffff)</div><div class='add'>+#define IL_MAX_SCAN_SIZE 1024</div><div class='add'>+#define IL_MAX_CMD_SIZE 4096</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_SCAN_CMD = 0x80 (command)</div><div class='add'>+ * C_SCAN = 0x80 (command)</div><div class='ctx'>  *</div><div class='ctx'>  * The hardware scan command is very powerful; the driver can set it up to</div><div class='ctx'>  * maintain (relatively) normal network traffic while doing a scan in the</div><div class='hunk'>@@ -2501,10 +2482,10 @@ struct iwl_ssid_ie {</div><div class='ctx'>  * Driver must use separate scan commands for 2.4 vs. 5 GHz bands.</div><div class='ctx'>  *</div><div class='ctx'>  * To avoid uCode errors, see timing restrictions described under</div><div class='del'>- * struct iwl_scan_channel.</div><div class='add'>+ * struct il_scan_channel.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-struct iwl3945_scan_cmd {</div><div class='add'>+struct il3945_scan_cmd {</div><div class='ctx'> 	__le16 len;</div><div class='ctx'> 	u8 reserved0;</div><div class='ctx'> 	u8 channel_count;	/* # channels in channel list */</div><div class='hunk'>@@ -2525,10 +2506,10 @@ struct iwl3945_scan_cmd {</div><div class='ctx'> </div><div class='ctx'> 	/* For active scans (set to all-0s for passive scans).</div><div class='ctx'> 	 * Does not include payload.  Must specify Tx rate; no rate scaling. */</div><div class='del'>-	struct iwl3945_tx_cmd tx_cmd;</div><div class='add'>+	struct il3945_tx_cmd tx_cmd;</div><div class='ctx'> </div><div class='ctx'> 	/* For directed active scans (set to all-0s otherwise) */</div><div class='del'>-	struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX_3945];</div><div class='add'>+	struct il_ssid_ie direct_scan[PROBE_OPTION_MAX_3945];</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Probe request frame, followed by channel list.</div><div class='hunk'>@@ -2538,17 +2519,17 @@ struct iwl3945_scan_cmd {</div><div class='ctx'> 	 * Number of channels in list is specified by channel_count.</div><div class='ctx'> 	 * Each channel in list is of type:</div><div class='ctx'> 	 *</div><div class='del'>-	 * struct iwl3945_scan_channel channels[0];</div><div class='add'>+	 * struct il3945_scan_channel channels[0];</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * NOTE:  Only one band of channels can be scanned per pass.  You</div><div class='ctx'> 	 * must not mix 2.4GHz channels and 5.2GHz channels, and you must wait</div><div class='del'>-	 * for one scan to complete (i.e. receive SCAN_COMPLETE_NOTIFICATION)</div><div class='add'>+	 * for one scan to complete (i.e. receive N_SCAN_COMPLETE)</div><div class='ctx'> 	 * before requesting another scan.</div><div class='ctx'> 	 */</div><div class='ctx'> 	u8 data[0];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl_scan_cmd {</div><div class='add'>+struct il_scan_cmd {</div><div class='ctx'> 	__le16 len;</div><div class='ctx'> 	u8 reserved0;</div><div class='ctx'> 	u8 channel_count;	/* # channels in channel list */</div><div class='hunk'>@@ -2569,10 +2550,10 @@ struct iwl_scan_cmd {</div><div class='ctx'> </div><div class='ctx'> 	/* For active scans (set to all-0s for passive scans).</div><div class='ctx'> 	 * Does not include payload.  Must specify Tx rate; no rate scaling. */</div><div class='del'>-	struct iwl_tx_cmd tx_cmd;</div><div class='add'>+	struct il_tx_cmd tx_cmd;</div><div class='ctx'> </div><div class='ctx'> 	/* For directed active scans (set to all-0s otherwise) */</div><div class='del'>-	struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];</div><div class='add'>+	struct il_ssid_ie direct_scan[PROBE_OPTION_MAX];</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Probe request frame, followed by channel list.</div><div class='hunk'>@@ -2582,11 +2563,11 @@ struct iwl_scan_cmd {</div><div class='ctx'> 	 * Number of channels in list is specified by channel_count.</div><div class='ctx'> 	 * Each channel in list is of type:</div><div class='ctx'> 	 *</div><div class='del'>-	 * struct iwl_scan_channel channels[0];</div><div class='add'>+	 * struct il_scan_channel channels[0];</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * NOTE:  Only one band of channels can be scanned per pass.  You</div><div class='ctx'> 	 * must not mix 2.4GHz channels and 5.2GHz channels, and you must wait</div><div class='del'>-	 * for one scan to complete (i.e. receive SCAN_COMPLETE_NOTIFICATION)</div><div class='add'>+	 * for one scan to complete (i.e. receive N_SCAN_COMPLETE)</div><div class='ctx'> 	 * before requesting another scan.</div><div class='ctx'> 	 */</div><div class='ctx'> 	u8 data[0];</div><div class='hunk'>@@ -2598,16 +2579,16 @@ struct iwl_scan_cmd {</div><div class='ctx'> #define ABORT_STATUS            0x2</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_SCAN_CMD = 0x80 (response)</div><div class='add'>+ * C_SCAN = 0x80 (response)</div><div class='ctx'>  */</div><div class='del'>-struct iwl_scanreq_notification {</div><div class='add'>+struct il_scanreq_notification {</div><div class='ctx'> 	__le32 status;		/* 1: okay, 2: cannot fulfill request */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * SCAN_START_NOTIFICATION = 0x82 (notification only, not a command)</div><div class='add'>+ * N_SCAN_START = 0x82 (notification only, not a command)</div><div class='ctx'>  */</div><div class='del'>-struct iwl_scanstart_notification {</div><div class='add'>+struct il_scanstart_notification {</div><div class='ctx'> 	__le32 tsf_low;</div><div class='ctx'> 	__le32 tsf_high;</div><div class='ctx'> 	__le32 beacon_timer;</div><div class='hunk'>@@ -2620,30 +2601,30 @@ struct iwl_scanstart_notification {</div><div class='ctx'> #define  SCAN_OWNER_STATUS 0x1</div><div class='ctx'> #define  MEASURE_OWNER_STATUS 0x2</div><div class='ctx'> </div><div class='del'>-#define IWL_PROBE_STATUS_OK		0</div><div class='del'>-#define IWL_PROBE_STATUS_TX_FAILED	BIT(0)</div><div class='add'>+#define IL_PROBE_STATUS_OK		0</div><div class='add'>+#define IL_PROBE_STATUS_TX_FAILED	BIT(0)</div><div class='ctx'> /* error statuses combined with TX_FAILED */</div><div class='del'>-#define IWL_PROBE_STATUS_FAIL_TTL	BIT(1)</div><div class='del'>-#define IWL_PROBE_STATUS_FAIL_BT	BIT(2)</div><div class='add'>+#define IL_PROBE_STATUS_FAIL_TTL	BIT(1)</div><div class='add'>+#define IL_PROBE_STATUS_FAIL_BT	BIT(2)</div><div class='ctx'> </div><div class='del'>-#define NUMBER_OF_STATISTICS 1	/* first __le32 is good CRC */</div><div class='add'>+#define NUMBER_OF_STATS 1	/* first __le32 is good CRC */</div><div class='ctx'> /*</div><div class='del'>- * SCAN_RESULTS_NOTIFICATION = 0x83 (notification only, not a command)</div><div class='add'>+ * N_SCAN_RESULTS = 0x83 (notification only, not a command)</div><div class='ctx'>  */</div><div class='del'>-struct iwl_scanresults_notification {</div><div class='add'>+struct il_scanresults_notification {</div><div class='ctx'> 	u8 channel;</div><div class='ctx'> 	u8 band;</div><div class='ctx'> 	u8 probe_status;</div><div class='del'>-	u8 num_probe_not_sent; /* not enough time to send */</div><div class='add'>+	u8 num_probe_not_sent;	/* not enough time to send */</div><div class='ctx'> 	__le32 tsf_low;</div><div class='ctx'> 	__le32 tsf_high;</div><div class='del'>-	__le32 statistics[NUMBER_OF_STATISTICS];</div><div class='add'>+	__le32 stats[NUMBER_OF_STATS];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * SCAN_COMPLETE_NOTIFICATION = 0x84 (notification only, not a command)</div><div class='add'>+ * N_SCAN_COMPLETE = 0x84 (notification only, not a command)</div><div class='ctx'>  */</div><div class='del'>-struct iwl_scancomplete_notification {</div><div class='add'>+struct il_scancomplete_notification {</div><div class='ctx'> 	u8 scanned_channels;</div><div class='ctx'> 	u8 status;</div><div class='ctx'> 	u8 last_channel;</div><div class='hunk'>@@ -2651,50 +2632,49 @@ struct iwl_scancomplete_notification {</div><div class='ctx'> 	__le32 tsf_high;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * (9)</div><div class='ctx'>  * IBSS/AP Commands and Notifications:</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-enum iwl_ibss_manager {</div><div class='del'>-	IWL_NOT_IBSS_MANAGER = 0,</div><div class='del'>-	IWL_IBSS_MANAGER = 1,</div><div class='add'>+enum il_ibss_manager {</div><div class='add'>+	IL_NOT_IBSS_MANAGER = 0,</div><div class='add'>+	IL_IBSS_MANAGER = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * BEACON_NOTIFICATION = 0x90 (notification only, not a command)</div><div class='add'>+ * N_BEACON = 0x90 (notification only, not a command)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-struct iwl3945_beacon_notif {</div><div class='del'>-	struct iwl3945_tx_resp beacon_notify_hdr;</div><div class='add'>+struct il3945_beacon_notif {</div><div class='add'>+	struct il3945_tx_resp beacon_notify_hdr;</div><div class='ctx'> 	__le32 low_tsf;</div><div class='ctx'> 	__le32 high_tsf;</div><div class='ctx'> 	__le32 ibss_mgr_status;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl4965_beacon_notif {</div><div class='del'>-	struct iwl4965_tx_resp beacon_notify_hdr;</div><div class='add'>+struct il4965_beacon_notif {</div><div class='add'>+	struct il4965_tx_resp beacon_notify_hdr;</div><div class='ctx'> 	__le32 low_tsf;</div><div class='ctx'> 	__le32 high_tsf;</div><div class='ctx'> 	__le32 ibss_mgr_status;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_TX_BEACON = 0x91 (command, has simple generic response)</div><div class='add'>+ * C_TX_BEACON= 0x91 (command, has simple generic response)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-struct iwl3945_tx_beacon_cmd {</div><div class='del'>-	struct iwl3945_tx_cmd tx;</div><div class='add'>+struct il3945_tx_beacon_cmd {</div><div class='add'>+	struct il3945_tx_cmd tx;</div><div class='ctx'> 	__le16 tim_idx;</div><div class='ctx'> 	u8 tim_size;</div><div class='ctx'> 	u8 reserved1;</div><div class='ctx'> 	struct ieee80211_hdr frame[0];	/* beacon frame */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl_tx_beacon_cmd {</div><div class='del'>-	struct iwl_tx_cmd tx;</div><div class='add'>+struct il_tx_beacon_cmd {</div><div class='add'>+	struct il_tx_cmd tx;</div><div class='ctx'> 	__le16 tim_idx;</div><div class='ctx'> 	u8 tim_size;</div><div class='ctx'> 	u8 reserved1;</div><div class='hunk'>@@ -2707,7 +2687,7 @@ struct iwl_tx_beacon_cmd {</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#define IWL_TEMP_CONVERT 260</div><div class='add'>+#define IL_TEMP_CONVERT 260</div><div class='ctx'> </div><div class='ctx'> #define SUP_RATE_11A_MAX_NUM_CHANNELS  8</div><div class='ctx'> #define SUP_RATE_11B_MAX_NUM_CHANNELS  4</div><div class='hunk'>@@ -2727,9 +2707,9 @@ struct rate_histogram {</div><div class='ctx'> 	} failed;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/* statistics command response */</div><div class='add'>+/* stats command response */</div><div class='ctx'> </div><div class='del'>-struct iwl39_statistics_rx_phy {</div><div class='add'>+struct iwl39_stats_rx_phy {</div><div class='ctx'> 	__le32 ina_cnt;</div><div class='ctx'> 	__le32 fina_cnt;</div><div class='ctx'> 	__le32 plcp_err;</div><div class='hunk'>@@ -2747,7 +2727,7 @@ struct iwl39_statistics_rx_phy {</div><div class='ctx'> 	__le32 sent_cts_cnt;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl39_statistics_rx_non_phy {</div><div class='add'>+struct iwl39_stats_rx_non_phy {</div><div class='ctx'> 	__le32 bogus_cts;	/* CTS received when not expecting CTS */</div><div class='ctx'> 	__le32 bogus_ack;	/* ACK received when not expecting ACK */</div><div class='ctx'> 	__le32 non_bssid_frames;	/* number of frames with BSSID that</div><div class='hunk'>@@ -2758,13 +2738,13 @@ struct iwl39_statistics_rx_non_phy {</div><div class='ctx'> 					 * our serving channel */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl39_statistics_rx {</div><div class='del'>-	struct iwl39_statistics_rx_phy ofdm;</div><div class='del'>-	struct iwl39_statistics_rx_phy cck;</div><div class='del'>-	struct iwl39_statistics_rx_non_phy general;</div><div class='add'>+struct iwl39_stats_rx {</div><div class='add'>+	struct iwl39_stats_rx_phy ofdm;</div><div class='add'>+	struct iwl39_stats_rx_phy cck;</div><div class='add'>+	struct iwl39_stats_rx_non_phy general;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl39_statistics_tx {</div><div class='add'>+struct iwl39_stats_tx {</div><div class='ctx'> 	__le32 preamble_cnt;</div><div class='ctx'> 	__le32 rx_detected_cnt;</div><div class='ctx'> 	__le32 bt_prio_defer_cnt;</div><div class='hunk'>@@ -2776,31 +2756,31 @@ struct iwl39_statistics_tx {</div><div class='ctx'> 	__le32 actual_ack_cnt;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct statistics_dbg {</div><div class='add'>+struct stats_dbg {</div><div class='ctx'> 	__le32 burst_check;</div><div class='ctx'> 	__le32 burst_count;</div><div class='ctx'> 	__le32 wait_for_silence_timeout_cnt;</div><div class='ctx'> 	__le32 reserved[3];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl39_statistics_div {</div><div class='add'>+struct iwl39_stats_div {</div><div class='ctx'> 	__le32 tx_on_a;</div><div class='ctx'> 	__le32 tx_on_b;</div><div class='ctx'> 	__le32 exec_time;</div><div class='ctx'> 	__le32 probe_time;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl39_statistics_general {</div><div class='add'>+struct iwl39_stats_general {</div><div class='ctx'> 	__le32 temperature;</div><div class='del'>-	struct statistics_dbg dbg;</div><div class='add'>+	struct stats_dbg dbg;</div><div class='ctx'> 	__le32 sleep_time;</div><div class='ctx'> 	__le32 slots_out;</div><div class='ctx'> 	__le32 slots_idle;</div><div class='ctx'> 	__le32 ttl_timestamp;</div><div class='del'>-	struct iwl39_statistics_div div;</div><div class='add'>+	struct iwl39_stats_div div;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct statistics_rx_phy {</div><div class='add'>+struct stats_rx_phy {</div><div class='ctx'> 	__le32 ina_cnt;</div><div class='ctx'> 	__le32 fina_cnt;</div><div class='ctx'> 	__le32 plcp_err;</div><div class='hunk'>@@ -2823,7 +2803,7 @@ struct statistics_rx_phy {</div><div class='ctx'> 	__le32 reserved3;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct statistics_rx_ht_phy {</div><div class='add'>+struct stats_rx_ht_phy {</div><div class='ctx'> 	__le32 plcp_err;</div><div class='ctx'> 	__le32 overrun_err;</div><div class='ctx'> 	__le32 early_overrun_err;</div><div class='hunk'>@@ -2838,7 +2818,7 @@ struct statistics_rx_ht_phy {</div><div class='ctx'> </div><div class='ctx'> #define INTERFERENCE_DATA_AVAILABLE      cpu_to_le32(1)</div><div class='ctx'> </div><div class='del'>-struct statistics_rx_non_phy {</div><div class='add'>+struct stats_rx_non_phy {</div><div class='ctx'> 	__le32 bogus_cts;	/* CTS received when not expecting CTS */</div><div class='ctx'> 	__le32 bogus_ack;	/* ACK received when not expecting ACK */</div><div class='ctx'> 	__le32 non_bssid_frames;	/* number of frames with BSSID that</div><div class='hunk'>@@ -2852,15 +2832,15 @@ struct statistics_rx_non_phy {</div><div class='ctx'> 	__le32 num_missed_bcon;	/* number of missed beacons */</div><div class='ctx'> 	__le32 adc_rx_saturation_time;	/* count in 0.8us units the time the</div><div class='ctx'> 					 * ADC was in saturation */</div><div class='del'>-	__le32 ina_detection_search_time;/* total time (in 0.8us) searched</div><div class='del'>-					  * for INA */</div><div class='add'>+	__le32 ina_detection_search_time;	/* total time (in 0.8us) searched</div><div class='add'>+						 * for INA */</div><div class='ctx'> 	__le32 beacon_silence_rssi_a;	/* RSSI silence after beacon frame */</div><div class='ctx'> 	__le32 beacon_silence_rssi_b;	/* RSSI silence after beacon frame */</div><div class='ctx'> 	__le32 beacon_silence_rssi_c;	/* RSSI silence after beacon frame */</div><div class='ctx'> 	__le32 interference_data_flag;	/* flag for interference data</div><div class='ctx'> 					 * availability. 1 when data is</div><div class='ctx'> 					 * available. */</div><div class='del'>-	__le32 channel_load;		/* counts RX Enable time in uSec */</div><div class='add'>+	__le32 channel_load;	/* counts RX Enable time in uSec */</div><div class='ctx'> 	__le32 dsp_false_alarms;	/* DSP false alarm (both OFDM</div><div class='ctx'> 					 * and CCK) counter */</div><div class='ctx'> 	__le32 beacon_rssi_a;</div><div class='hunk'>@@ -2871,28 +2851,28 @@ struct statistics_rx_non_phy {</div><div class='ctx'> 	__le32 beacon_energy_c;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct statistics_rx {</div><div class='del'>-	struct statistics_rx_phy ofdm;</div><div class='del'>-	struct statistics_rx_phy cck;</div><div class='del'>-	struct statistics_rx_non_phy general;</div><div class='del'>-	struct statistics_rx_ht_phy ofdm_ht;</div><div class='add'>+struct stats_rx {</div><div class='add'>+	struct stats_rx_phy ofdm;</div><div class='add'>+	struct stats_rx_phy cck;</div><div class='add'>+	struct stats_rx_non_phy general;</div><div class='add'>+	struct stats_rx_ht_phy ofdm_ht;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct statistics_tx_power - current tx power</div><div class='add'>+ * struct stats_tx_power - current tx power</div><div class='ctx'>  *</div><div class='ctx'>  * @ant_a: current tx power on chain a in 1/2 dB step</div><div class='ctx'>  * @ant_b: current tx power on chain b in 1/2 dB step</div><div class='ctx'>  * @ant_c: current tx power on chain c in 1/2 dB step</div><div class='ctx'>  */</div><div class='del'>-struct statistics_tx_power {</div><div class='add'>+struct stats_tx_power {</div><div class='ctx'> 	u8 ant_a;</div><div class='ctx'> 	u8 ant_b;</div><div class='ctx'> 	u8 ant_c;</div><div class='ctx'> 	u8 reserved;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct statistics_tx_non_phy_agg {</div><div class='add'>+struct stats_tx_non_phy_agg {</div><div class='ctx'> 	__le32 ba_timeout;</div><div class='ctx'> 	__le32 ba_reschedule_frames;</div><div class='ctx'> 	__le32 scd_query_agg_frame_cnt;</div><div class='hunk'>@@ -2905,7 +2885,7 @@ struct statistics_tx_non_phy_agg {</div><div class='ctx'> 	__le32 rx_ba_rsp_cnt;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct statistics_tx {</div><div class='add'>+struct stats_tx {</div><div class='ctx'> 	__le32 preamble_cnt;</div><div class='ctx'> 	__le32 rx_detected_cnt;</div><div class='ctx'> 	__le32 bt_prio_defer_cnt;</div><div class='hunk'>@@ -2920,13 +2900,12 @@ struct statistics_tx {</div><div class='ctx'> 	__le32 burst_abort_missing_next_frame_cnt;</div><div class='ctx'> 	__le32 cts_timeout_collision;</div><div class='ctx'> 	__le32 ack_or_ba_timeout_collision;</div><div class='del'>-	struct statistics_tx_non_phy_agg agg;</div><div class='add'>+	struct stats_tx_non_phy_agg agg;</div><div class='ctx'> </div><div class='ctx'> 	__le32 reserved1;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-struct statistics_div {</div><div class='add'>+struct stats_div {</div><div class='ctx'> 	__le32 tx_on_a;</div><div class='ctx'> 	__le32 tx_on_b;</div><div class='ctx'> 	__le32 exec_time;</div><div class='hunk'>@@ -2935,14 +2914,14 @@ struct statistics_div {</div><div class='ctx'> 	__le32 reserved2;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct statistics_general_common {</div><div class='del'>-	__le32 temperature;   /* radio temperature */</div><div class='del'>-	struct statistics_dbg dbg;</div><div class='add'>+struct stats_general_common {</div><div class='add'>+	__le32 temperature;	/* radio temperature */</div><div class='add'>+	struct stats_dbg dbg;</div><div class='ctx'> 	__le32 sleep_time;</div><div class='ctx'> 	__le32 slots_out;</div><div class='ctx'> 	__le32 slots_idle;</div><div class='ctx'> 	__le32 ttl_timestamp;</div><div class='del'>-	struct statistics_div div;</div><div class='add'>+	struct stats_div div;</div><div class='ctx'> 	__le32 rx_enable_counter;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * num_of_sos_states:</div><div class='hunk'>@@ -2952,73 +2931,73 @@ struct statistics_general_common {</div><div class='ctx'> 	__le32 num_of_sos_states;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct statistics_general {</div><div class='del'>-	struct statistics_general_common common;</div><div class='add'>+struct stats_general {</div><div class='add'>+	struct stats_general_common common;</div><div class='ctx'> 	__le32 reserved2;</div><div class='ctx'> 	__le32 reserved3;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-#define UCODE_STATISTICS_CLEAR_MSK		(0x1 &lt;&lt; 0)</div><div class='del'>-#define UCODE_STATISTICS_FREQUENCY_MSK		(0x1 &lt;&lt; 1)</div><div class='del'>-#define UCODE_STATISTICS_NARROW_BAND_MSK	(0x1 &lt;&lt; 2)</div><div class='add'>+#define UCODE_STATS_CLEAR_MSK		(0x1 &lt;&lt; 0)</div><div class='add'>+#define UCODE_STATS_FREQUENCY_MSK		(0x1 &lt;&lt; 1)</div><div class='add'>+#define UCODE_STATS_NARROW_BAND_MSK	(0x1 &lt;&lt; 2)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * REPLY_STATISTICS_CMD = 0x9c,</div><div class='add'>+ * C_STATS = 0x9c,</div><div class='ctx'>  * all devices identical.</div><div class='ctx'>  *</div><div class='del'>- * This command triggers an immediate response containing uCode statistics.</div><div class='del'>- * The response is in the same format as STATISTICS_NOTIFICATION 0x9d, below.</div><div class='add'>+ * This command triggers an immediate response containing uCode stats.</div><div class='add'>+ * The response is in the same format as N_STATS 0x9d, below.</div><div class='ctx'>  *</div><div class='ctx'>  * If the CLEAR_STATS configuration flag is set, uCode will clear its</div><div class='del'>- * internal copy of the statistics (counters) after issuing the response.</div><div class='del'>- * This flag does not affect STATISTICS_NOTIFICATIONs after beacons (see below).</div><div class='add'>+ * internal copy of the stats (counters) after issuing the response.</div><div class='add'>+ * This flag does not affect N_STATSs after beacons (see below).</div><div class='ctx'>  *</div><div class='ctx'>  * If the DISABLE_NOTIF configuration flag is set, uCode will not issue</div><div class='del'>- * STATISTICS_NOTIFICATIONs after received beacons (see below).  This flag</div><div class='del'>- * does not affect the response to the REPLY_STATISTICS_CMD 0x9c itself.</div><div class='add'>+ * N_STATSs after received beacons (see below).  This flag</div><div class='add'>+ * does not affect the response to the C_STATS 0x9c itself.</div><div class='ctx'>  */</div><div class='del'>-#define IWL_STATS_CONF_CLEAR_STATS cpu_to_le32(0x1)	/* see above */</div><div class='del'>-#define IWL_STATS_CONF_DISABLE_NOTIF cpu_to_le32(0x2)/* see above */</div><div class='del'>-struct iwl_statistics_cmd {</div><div class='del'>-	__le32 configuration_flags;	/* IWL_STATS_CONF_* */</div><div class='add'>+#define IL_STATS_CONF_CLEAR_STATS cpu_to_le32(0x1)	/* see above */</div><div class='add'>+#define IL_STATS_CONF_DISABLE_NOTIF cpu_to_le32(0x2)	/* see above */</div><div class='add'>+struct il_stats_cmd {</div><div class='add'>+	__le32 configuration_flags;	/* IL_STATS_CONF_* */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * STATISTICS_NOTIFICATION = 0x9d (notification only, not a command)</div><div class='add'>+ * N_STATS = 0x9d (notification only, not a command)</div><div class='ctx'>  *</div><div class='ctx'>  * By default, uCode issues this notification after receiving a beacon</div><div class='ctx'>  * while associated.  To disable this behavior, set DISABLE_NOTIF flag in the</div><div class='del'>- * REPLY_STATISTICS_CMD 0x9c, above.</div><div class='add'>+ * C_STATS 0x9c, above.</div><div class='ctx'>  *</div><div class='ctx'>  * Statistics counters continue to increment beacon after beacon, but are</div><div class='del'>- * cleared when changing channels or when driver issues REPLY_STATISTICS_CMD</div><div class='add'>+ * cleared when changing channels or when driver issues C_STATS</div><div class='ctx'>  * 0x9c with CLEAR_STATS bit set (see above).</div><div class='ctx'>  *</div><div class='del'>- * uCode also issues this notification during scans.  uCode clears statistics</div><div class='del'>- * appropriately so that each notification contains statistics for only the</div><div class='add'>+ * uCode also issues this notification during scans.  uCode clears stats</div><div class='add'>+ * appropriately so that each notification contains stats for only the</div><div class='ctx'>  * one channel that has just been scanned.</div><div class='ctx'>  */</div><div class='del'>-#define STATISTICS_REPLY_FLG_BAND_24G_MSK         cpu_to_le32(0x2)</div><div class='del'>-#define STATISTICS_REPLY_FLG_HT40_MODE_MSK        cpu_to_le32(0x8)</div><div class='add'>+#define STATS_REPLY_FLG_BAND_24G_MSK         cpu_to_le32(0x2)</div><div class='add'>+#define STATS_REPLY_FLG_HT40_MODE_MSK        cpu_to_le32(0x8)</div><div class='ctx'> </div><div class='del'>-struct iwl3945_notif_statistics {</div><div class='add'>+struct il3945_notif_stats {</div><div class='ctx'> 	__le32 flag;</div><div class='del'>-	struct iwl39_statistics_rx rx;</div><div class='del'>-	struct iwl39_statistics_tx tx;</div><div class='del'>-	struct iwl39_statistics_general general;</div><div class='add'>+	struct iwl39_stats_rx rx;</div><div class='add'>+	struct iwl39_stats_tx tx;</div><div class='add'>+	struct iwl39_stats_general general;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct iwl_notif_statistics {</div><div class='add'>+struct il_notif_stats {</div><div class='ctx'> 	__le32 flag;</div><div class='del'>-	struct statistics_rx rx;</div><div class='del'>-	struct statistics_tx tx;</div><div class='del'>-	struct statistics_general general;</div><div class='add'>+	struct stats_rx rx;</div><div class='add'>+	struct stats_tx tx;</div><div class='add'>+	struct stats_general general;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * MISSED_BEACONS_NOTIFICATION = 0xa2 (notification only, not a command)</div><div class='add'>+ * N_MISSED_BEACONS = 0xa2 (notification only, not a command)</div><div class='ctx'>  *</div><div class='del'>- * uCode send MISSED_BEACONS_NOTIFICATION to driver when detect beacon missed</div><div class='add'>+ * uCode send N_MISSED_BEACONS to driver when detect beacon missed</div><div class='ctx'>  * in regardless of how many missed beacons, which mean when driver receive the</div><div class='ctx'>  * notification, inside the command, it can find all the beacons information</div><div class='ctx'>  * which include number of total missed beacons, number of consecutive missed</div><div class='hunk'>@@ -3035,18 +3014,17 @@ struct iwl_notif_statistics {</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define IWL_MISSED_BEACON_THRESHOLD_MIN	(1)</div><div class='del'>-#define IWL_MISSED_BEACON_THRESHOLD_DEF	(5)</div><div class='del'>-#define IWL_MISSED_BEACON_THRESHOLD_MAX	IWL_MISSED_BEACON_THRESHOLD_DEF</div><div class='add'>+#define IL_MISSED_BEACON_THRESHOLD_MIN	(1)</div><div class='add'>+#define IL_MISSED_BEACON_THRESHOLD_DEF	(5)</div><div class='add'>+#define IL_MISSED_BEACON_THRESHOLD_MAX	IL_MISSED_BEACON_THRESHOLD_DEF</div><div class='ctx'> </div><div class='del'>-struct iwl_missed_beacon_notif {</div><div class='add'>+struct il_missed_beacon_notif {</div><div class='ctx'> 	__le32 consecutive_missed_beacons;</div><div class='ctx'> 	__le32 total_missed_becons;</div><div class='ctx'> 	__le32 num_expected_beacons;</div><div class='ctx'> 	__le32 num_recvd_beacons;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * (11)</div><div class='ctx'>  * Rx Calibration Commands:</div><div class='hunk'>@@ -3062,7 +3040,7 @@ struct iwl_missed_beacon_notif {</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * SENSITIVITY_CMD = 0xa8 (command, has simple generic response)</div><div class='add'>+ * C_SENSITIVITY = 0xa8 (command, has simple generic response)</div><div class='ctx'>  *</div><div class='ctx'>  * This command sets up the Rx signal detector for a sensitivity level that</div><div class='ctx'>  * is high enough to lock onto all signals within the associated network,</div><div class='hunk'>@@ -3076,12 +3054,12 @@ struct iwl_missed_beacon_notif {</div><div class='ctx'>  * time listening, not transmitting).  Driver must adjust sensitivity so that</div><div class='ctx'>  * the ratio of actual false alarms to actual Rx time falls within this range.</div><div class='ctx'>  *</div><div class='del'>- * While associated, uCode delivers STATISTICS_NOTIFICATIONs after each</div><div class='add'>+ * While associated, uCode delivers N_STATSs after each</div><div class='ctx'>  * received beacon.  These provide information to the driver to analyze the</div><div class='del'>- * sensitivity.  Don't analyze statistics that come in from scanning, or any</div><div class='del'>- * other non-associated-network source.  Pertinent statistics include:</div><div class='add'>+ * sensitivity.  Don't analyze stats that come in from scanning, or any</div><div class='add'>+ * other non-associated-network source.  Pertinent stats include:</div><div class='ctx'>  *</div><div class='del'>- * From "general" statistics (struct statistics_rx_non_phy):</div><div class='add'>+ * From "general" stats (struct stats_rx_non_phy):</div><div class='ctx'>  *</div><div class='ctx'>  * (beacon_energy_[abc] &amp; 0x0FF00) &gt;&gt; 8 (unsigned, higher value is lower level)</div><div class='ctx'>  *   Measure of energy of desired signal.  Used for establishing a level</div><div class='hunk'>@@ -3094,7 +3072,7 @@ struct iwl_missed_beacon_notif {</div><div class='ctx'>  *   uSecs of actual Rx time during beacon period (varies according to</div><div class='ctx'>  *   how much time was spent transmitting).</div><div class='ctx'>  *</div><div class='del'>- * From "cck" and "ofdm" statistics (struct statistics_rx_phy), separately:</div><div class='add'>+ * From "cck" and "ofdm" stats (struct stats_rx_phy), separately:</div><div class='ctx'>  *</div><div class='ctx'>  * false_alarm_cnt</div><div class='ctx'>  *   Signal locks abandoned early (before phy-level header).</div><div class='hunk'>@@ -3111,15 +3089,15 @@ struct iwl_missed_beacon_notif {</div><div class='ctx'>  *</div><div class='ctx'>  * Total number of false alarms = false_alarms + plcp_errs</div><div class='ctx'>  *</div><div class='del'>- * For OFDM, adjust the following table entries in struct iwl_sensitivity_cmd</div><div class='add'>+ * For OFDM, adjust the following table entries in struct il_sensitivity_cmd</div><div class='ctx'>  * (notice that the start points for OFDM are at or close to settings for</div><div class='ctx'>  * maximum sensitivity):</div><div class='ctx'>  *</div><div class='ctx'>  *                                             START  /  MIN  /  MAX</div><div class='del'>- *   HD_AUTO_CORR32_X1_TH_ADD_MIN_INDEX          90   /   85  /  120</div><div class='del'>- *   HD_AUTO_CORR32_X1_TH_ADD_MIN_MRC_INDEX     170   /  170  /  210</div><div class='del'>- *   HD_AUTO_CORR32_X4_TH_ADD_MIN_INDEX         105   /  105  /  140</div><div class='del'>- *   HD_AUTO_CORR32_X4_TH_ADD_MIN_MRC_INDEX     220   /  220  /  270</div><div class='add'>+ *   HD_AUTO_CORR32_X1_TH_ADD_MIN_IDX          90   /   85  /  120</div><div class='add'>+ *   HD_AUTO_CORR32_X1_TH_ADD_MIN_MRC_IDX     170   /  170  /  210</div><div class='add'>+ *   HD_AUTO_CORR32_X4_TH_ADD_MIN_IDX         105   /  105  /  140</div><div class='add'>+ *   HD_AUTO_CORR32_X4_TH_ADD_MIN_MRC_IDX     220   /  220  /  270</div><div class='ctx'>  *</div><div class='ctx'>  *   If actual rate of OFDM false alarms (+ plcp_errors) is too high</div><div class='ctx'>  *   (greater than 50 for each 204.8 msecs listening), reduce sensitivity</div><div class='hunk'>@@ -3152,30 +3130,30 @@ struct iwl_missed_beacon_notif {</div><div class='ctx'>  *        Reset this to 0 at the first beacon period that falls within the</div><div class='ctx'>  *        "good" range (5 to 50 false alarms per 204.8 milliseconds rx).</div><div class='ctx'>  *</div><div class='del'>- * Then, adjust the following CCK table entries in struct iwl_sensitivity_cmd</div><div class='add'>+ * Then, adjust the following CCK table entries in struct il_sensitivity_cmd</div><div class='ctx'>  * (notice that the start points for CCK are at maximum sensitivity):</div><div class='ctx'>  *</div><div class='ctx'>  *                                             START  /  MIN  /  MAX</div><div class='del'>- *   HD_AUTO_CORR40_X4_TH_ADD_MIN_INDEX         125   /  125  /  200</div><div class='del'>- *   HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_INDEX     200   /  200  /  400</div><div class='del'>- *   HD_MIN_ENERGY_CCK_DET_INDEX                100   /    0  /  100</div><div class='add'>+ *   HD_AUTO_CORR40_X4_TH_ADD_MIN_IDX         125   /  125  /  200</div><div class='add'>+ *   HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_IDX     200   /  200  /  400</div><div class='add'>+ *   HD_MIN_ENERGY_CCK_DET_IDX                100   /    0  /  100</div><div class='ctx'>  *</div><div class='ctx'>  *   If actual rate of CCK false alarms (+ plcp_errors) is too high</div><div class='ctx'>  *   (greater than 50 for each 204.8 msecs listening), method for reducing</div><div class='ctx'>  *   sensitivity is:</div><div class='ctx'>  *</div><div class='del'>- *   1)  *Add* 3 to value in HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_INDEX,</div><div class='add'>+ *   1)  *Add* 3 to value in HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_IDX,</div><div class='ctx'>  *       up to max 400.</div><div class='ctx'>  *</div><div class='del'>- *   2)  If current value in HD_AUTO_CORR40_X4_TH_ADD_MIN_INDEX is &lt; 160,</div><div class='add'>+ *   2)  If current value in HD_AUTO_CORR40_X4_TH_ADD_MIN_IDX is &lt; 160,</div><div class='ctx'>  *       sensitivity has been reduced a significant amount; bring it up to</div><div class='ctx'>  *       a moderate 161.  Otherwise, *add* 3, up to max 200.</div><div class='ctx'>  *</div><div class='del'>- *   3)  a)  If current value in HD_AUTO_CORR40_X4_TH_ADD_MIN_INDEX is &gt; 160,</div><div class='add'>+ *   3)  a)  If current value in HD_AUTO_CORR40_X4_TH_ADD_MIN_IDX is &gt; 160,</div><div class='ctx'>  *       sensitivity has been reduced only a moderate or small amount;</div><div class='del'>- *       *subtract* 2 from value in HD_MIN_ENERGY_CCK_DET_INDEX,</div><div class='add'>+ *       *subtract* 2 from value in HD_MIN_ENERGY_CCK_DET_IDX,</div><div class='ctx'>  *       down to min 0.  Otherwise (if gain has been significantly reduced),</div><div class='del'>- *       don't change the HD_MIN_ENERGY_CCK_DET_INDEX value.</div><div class='add'>+ *       don't change the HD_MIN_ENERGY_CCK_DET_IDX value.</div><div class='ctx'>  *</div><div class='ctx'>  *       b)  Save a snapshot of the "silence reference".</div><div class='ctx'>  *</div><div class='hunk'>@@ -3191,13 +3169,13 @@ struct iwl_missed_beacon_notif {</div><div class='ctx'>  *</div><div class='ctx'>  *   Method for increasing sensitivity:</div><div class='ctx'>  *</div><div class='del'>- *   1)  *Subtract* 3 from value in HD_AUTO_CORR40_X4_TH_ADD_MIN_INDEX,</div><div class='add'>+ *   1)  *Subtract* 3 from value in HD_AUTO_CORR40_X4_TH_ADD_MIN_IDX,</div><div class='ctx'>  *       down to min 125.</div><div class='ctx'>  *</div><div class='del'>- *   2)  *Subtract* 3 from value in HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_INDEX,</div><div class='add'>+ *   2)  *Subtract* 3 from value in HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_IDX,</div><div class='ctx'>  *       down to min 200.</div><div class='ctx'>  *</div><div class='del'>- *   3)  *Add* 2 to value in HD_MIN_ENERGY_CCK_DET_INDEX, up to max 100.</div><div class='add'>+ *   3)  *Add* 2 to value in HD_MIN_ENERGY_CCK_DET_IDX, up to max 100.</div><div class='ctx'>  *</div><div class='ctx'>  *   If actual rate of CCK false alarms (+ plcp_errors) is within good range</div><div class='ctx'>  *   (between 5 and 50 for each 204.8 msecs listening):</div><div class='hunk'>@@ -3206,57 +3184,56 @@ struct iwl_missed_beacon_notif {</div><div class='ctx'>  *</div><div class='ctx'>  *   2)  If previous beacon had too many CCK false alarms (+ plcp_errors),</div><div class='ctx'>  *       give some extra margin to energy threshold by *subtracting* 8</div><div class='del'>- *       from value in HD_MIN_ENERGY_CCK_DET_INDEX.</div><div class='add'>+ *       from value in HD_MIN_ENERGY_CCK_DET_IDX.</div><div class='ctx'>  *</div><div class='ctx'>  *   For all cases (too few, too many, good range), make sure that the CCK</div><div class='ctx'>  *   detection threshold (energy) is below the energy level for robust</div><div class='ctx'>  *   detection over the past 10 beacon periods, the "Max cck energy".</div><div class='ctx'>  *   Lower values mean higher energy; this means making sure that the value</div><div class='del'>- *   in HD_MIN_ENERGY_CCK_DET_INDEX is at or *above* "Max cck energy".</div><div class='add'>+ *   in HD_MIN_ENERGY_CCK_DET_IDX is at or *above* "Max cck energy".</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Table entries in SENSITIVITY_CMD (struct iwl_sensitivity_cmd)</div><div class='del'>- */</div><div class='del'>-#define HD_TABLE_SIZE  (11)	/* number of entries */</div><div class='del'>-#define HD_MIN_ENERGY_CCK_DET_INDEX                 (0)	/* table indexes */</div><div class='del'>-#define HD_MIN_ENERGY_OFDM_DET_INDEX                (1)</div><div class='del'>-#define HD_AUTO_CORR32_X1_TH_ADD_MIN_INDEX          (2)</div><div class='del'>-#define HD_AUTO_CORR32_X1_TH_ADD_MIN_MRC_INDEX      (3)</div><div class='del'>-#define HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_INDEX      (4)</div><div class='del'>-#define HD_AUTO_CORR32_X4_TH_ADD_MIN_INDEX          (5)</div><div class='del'>-#define HD_AUTO_CORR32_X4_TH_ADD_MIN_MRC_INDEX      (6)</div><div class='del'>-#define HD_BARKER_CORR_TH_ADD_MIN_INDEX             (7)</div><div class='del'>-#define HD_BARKER_CORR_TH_ADD_MIN_MRC_INDEX         (8)</div><div class='del'>-#define HD_AUTO_CORR40_X4_TH_ADD_MIN_INDEX          (9)</div><div class='del'>-#define HD_OFDM_ENERGY_TH_IN_INDEX                  (10)</div><div class='del'>-</div><div class='del'>-/* Control field in struct iwl_sensitivity_cmd */</div><div class='del'>-#define SENSITIVITY_CMD_CONTROL_DEFAULT_TABLE	cpu_to_le16(0)</div><div class='del'>-#define SENSITIVITY_CMD_CONTROL_WORK_TABLE	cpu_to_le16(1)</div><div class='add'>+ * Table entries in C_SENSITIVITY (struct il_sensitivity_cmd)</div><div class='add'>+ */</div><div class='add'>+#define HD_TBL_SIZE  (11)	/* number of entries */</div><div class='add'>+#define HD_MIN_ENERGY_CCK_DET_IDX                 (0)	/* table idxes */</div><div class='add'>+#define HD_MIN_ENERGY_OFDM_DET_IDX                (1)</div><div class='add'>+#define HD_AUTO_CORR32_X1_TH_ADD_MIN_IDX          (2)</div><div class='add'>+#define HD_AUTO_CORR32_X1_TH_ADD_MIN_MRC_IDX      (3)</div><div class='add'>+#define HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_IDX      (4)</div><div class='add'>+#define HD_AUTO_CORR32_X4_TH_ADD_MIN_IDX          (5)</div><div class='add'>+#define HD_AUTO_CORR32_X4_TH_ADD_MIN_MRC_IDX      (6)</div><div class='add'>+#define HD_BARKER_CORR_TH_ADD_MIN_IDX             (7)</div><div class='add'>+#define HD_BARKER_CORR_TH_ADD_MIN_MRC_IDX         (8)</div><div class='add'>+#define HD_AUTO_CORR40_X4_TH_ADD_MIN_IDX          (9)</div><div class='add'>+#define HD_OFDM_ENERGY_TH_IN_IDX                  (10)</div><div class='add'>+</div><div class='add'>+/* Control field in struct il_sensitivity_cmd */</div><div class='add'>+#define C_SENSITIVITY_CONTROL_DEFAULT_TBL	cpu_to_le16(0)</div><div class='add'>+#define C_SENSITIVITY_CONTROL_WORK_TBL	cpu_to_le16(1)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_sensitivity_cmd</div><div class='add'>+ * struct il_sensitivity_cmd</div><div class='ctx'>  * @control:  (1) updates working table, (0) updates default table</div><div class='del'>- * @table:  energy threshold values, use HD_* as index into table</div><div class='add'>+ * @table:  energy threshold values, use HD_* as idx into table</div><div class='ctx'>  *</div><div class='ctx'>  * Always use "1" in "control" to update uCode's working table and DSP.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_sensitivity_cmd {</div><div class='del'>-	__le16 control;			/* always use "1" */</div><div class='del'>-	__le16 table[HD_TABLE_SIZE];	/* use HD_* as index */</div><div class='add'>+struct il_sensitivity_cmd {</div><div class='add'>+	__le16 control;		/* always use "1" */</div><div class='add'>+	__le16 table[HD_TBL_SIZE];	/* use HD_* as idx */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * REPLY_PHY_CALIBRATION_CMD = 0xb0 (command, has simple generic response)</div><div class='add'>+ * C_PHY_CALIBRATION = 0xb0 (command, has simple generic response)</div><div class='ctx'>  *</div><div class='ctx'>  * This command sets the relative gains of 4965 device's 3 radio receiver chains.</div><div class='ctx'>  *</div><div class='ctx'>  * After the first association, driver should accumulate signal and noise</div><div class='del'>- * statistics from the STATISTICS_NOTIFICATIONs that follow the first 20</div><div class='del'>- * beacons from the associated network (don't collect statistics that come</div><div class='add'>+ * stats from the N_STATSs that follow the first 20</div><div class='add'>+ * beacons from the associated network (don't collect stats that come</div><div class='ctx'>  * in from scanning, or any other non-network source).</div><div class='ctx'>  *</div><div class='ctx'>  * DISCONNECTED ANTENNA:</div><div class='hunk'>@@ -3264,7 +3241,7 @@ struct iwl_sensitivity_cmd {</div><div class='ctx'>  * Driver should determine which antennas are actually connected, by comparing</div><div class='ctx'>  * average beacon signal levels for the 3 Rx chains.  Accumulate (add) the</div><div class='ctx'>  * following values over 20 beacons, one accumulator for each of the chains</div><div class='del'>- * a/b/c, from struct statistics_rx_non_phy:</div><div class='add'>+ * a/b/c, from struct stats_rx_non_phy:</div><div class='ctx'>  *</div><div class='ctx'>  * beacon_rssi_[abc] &amp; 0x0FF (unsigned, units in dB)</div><div class='ctx'>  *</div><div class='hunk'>@@ -3283,7 +3260,7 @@ struct iwl_sensitivity_cmd {</div><div class='ctx'>  * to antennas, see above) for gain, by comparing the average signal levels</div><div class='ctx'>  * detected during the silence after each beacon (background noise).</div><div class='ctx'>  * Accumulate (add) the following values over 20 beacons, one accumulator for</div><div class='del'>- * each of the chains a/b/c, from struct statistics_rx_non_phy:</div><div class='add'>+ * each of the chains a/b/c, from struct stats_rx_non_phy:</div><div class='ctx'>  *</div><div class='ctx'>  * beacon_silence_rssi_[abc] &amp; 0x0FF (unsigned, units in dB)</div><div class='ctx'>  *</div><div class='hunk'>@@ -3294,7 +3271,7 @@ struct iwl_sensitivity_cmd {</div><div class='ctx'>  * (accum_noise[i] - accum_noise[reference]) / 30</div><div class='ctx'>  *</div><div class='ctx'>  * The "30" adjusts the dB in the 20 accumulated samples to units of 1.5 dB.</div><div class='del'>- * For use in diff_gain_[abc] fields of struct iwl_calibration_cmd, the</div><div class='add'>+ * For use in diff_gain_[abc] fields of struct il_calibration_cmd, the</div><div class='ctx'>  * driver should limit the difference results to a range of 0-3 (0-4.5 dB),</div><div class='ctx'>  * and set bit 2 to indicate "reduce gain".  The value for the reference</div><div class='ctx'>  * (weakest) chain should be "0".</div><div class='hunk'>@@ -3306,24 +3283,24 @@ struct iwl_sensitivity_cmd {</div><div class='ctx'> </div><div class='ctx'> /* Phy calibration command for series */</div><div class='ctx'> /* The default calibrate table size if not specified by firmware */</div><div class='del'>-#define IWL_DEFAULT_STANDARD_PHY_CALIBRATE_TBL_SIZE	18</div><div class='add'>+#define IL_DEFAULT_STANDARD_PHY_CALIBRATE_TBL_SIZE	18</div><div class='ctx'> enum {</div><div class='del'>-	IWL_PHY_CALIBRATE_DIFF_GAIN_CMD		= 7,</div><div class='del'>-	IWL_MAX_STANDARD_PHY_CALIBRATE_TBL_SIZE	= 19,</div><div class='add'>+	IL_PHY_CALIBRATE_DIFF_GAIN_CMD = 7,</div><div class='add'>+	IL_MAX_STANDARD_PHY_CALIBRATE_TBL_SIZE = 19,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define IWL_MAX_PHY_CALIBRATE_TBL_SIZE		(253)</div><div class='add'>+#define IL_MAX_PHY_CALIBRATE_TBL_SIZE		(253)</div><div class='ctx'> </div><div class='del'>-struct iwl_calib_hdr {</div><div class='add'>+struct il_calib_hdr {</div><div class='ctx'> 	u8 op_code;</div><div class='ctx'> 	u8 first_group;</div><div class='ctx'> 	u8 groups_num;</div><div class='ctx'> 	u8 data_valid;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/* IWL_PHY_CALIBRATE_DIFF_GAIN_CMD (7) */</div><div class='del'>-struct iwl_calib_diff_gain_cmd {</div><div class='del'>-	struct iwl_calib_hdr hdr;</div><div class='add'>+/* IL_PHY_CALIBRATE_DIFF_GAIN_CMD (7) */</div><div class='add'>+struct il_calib_diff_gain_cmd {</div><div class='add'>+	struct il_calib_hdr hdr;</div><div class='ctx'> 	s8 diff_gain_a;		/* see above */</div><div class='ctx'> 	s8 diff_gain_b;</div><div class='ctx'> 	s8 diff_gain_c;</div><div class='hunk'>@@ -3338,12 +3315,12 @@ struct iwl_calib_diff_gain_cmd {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * LEDs Command &amp; Response</div><div class='del'>- * REPLY_LEDS_CMD = 0x48 (command, has simple generic response)</div><div class='add'>+ * C_LEDS = 0x48 (command, has simple generic response)</div><div class='ctx'>  *</div><div class='ctx'>  * For each of 3 possible LEDs (Activity/Link/Tech, selected by "id" field),</div><div class='ctx'>  * this command turns it on or off, or sets up a periodic blinking cycle.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_led_cmd {</div><div class='add'>+struct il_led_cmd {</div><div class='ctx'> 	__le32 interval;	/* "interval" in uSec */</div><div class='ctx'> 	u8 id;			/* 1: Activity, 2: Link, 3: Tech */</div><div class='ctx'> 	u8 off;			/* # intervals off while blinking;</div><div class='hunk'>@@ -3353,14 +3330,15 @@ struct iwl_led_cmd {</div><div class='ctx'> 	u8 reserved;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * (13)</div><div class='ctx'>  * Union of all expected notifications/responses:</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-struct iwl_rx_packet {</div><div class='add'>+#define IL_RX_FRAME_SIZE_MSK	0x00003fff</div><div class='add'>+</div><div class='add'>+struct il_rx_pkt {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The first 4 bytes of the RX frame header contain both the RX frame</div><div class='ctx'> 	 * size and some flags.</div><div class='hunk'>@@ -3372,27 +3350,27 @@ struct iwl_rx_packet {</div><div class='ctx'> 	 * 13-00: RX frame size</div><div class='ctx'> 	 */</div><div class='ctx'> 	__le32 len_n_flags;</div><div class='del'>-	struct iwl_cmd_header hdr;</div><div class='add'>+	struct il_cmd_header hdr;</div><div class='ctx'> 	union {</div><div class='del'>-		struct iwl3945_rx_frame rx_frame;</div><div class='del'>-		struct iwl3945_tx_resp tx_resp;</div><div class='del'>-		struct iwl3945_beacon_notif beacon_status;</div><div class='del'>-</div><div class='del'>-		struct iwl_alive_resp alive_frame;</div><div class='del'>-		struct iwl_spectrum_notification spectrum_notif;</div><div class='del'>-		struct iwl_csa_notification csa_notif;</div><div class='del'>-		struct iwl_error_resp err_resp;</div><div class='del'>-		struct iwl_card_state_notif card_state_notif;</div><div class='del'>-		struct iwl_add_sta_resp add_sta;</div><div class='del'>-		struct iwl_rem_sta_resp rem_sta;</div><div class='del'>-		struct iwl_sleep_notification sleep_notif;</div><div class='del'>-		struct iwl_spectrum_resp spectrum;</div><div class='del'>-		struct iwl_notif_statistics stats;</div><div class='del'>-		struct iwl_compressed_ba_resp compressed_ba;</div><div class='del'>-		struct iwl_missed_beacon_notif missed_beacon;</div><div class='add'>+		struct il3945_rx_frame rx_frame;</div><div class='add'>+		struct il3945_tx_resp tx_resp;</div><div class='add'>+		struct il3945_beacon_notif beacon_status;</div><div class='add'>+</div><div class='add'>+		struct il_alive_resp alive_frame;</div><div class='add'>+		struct il_spectrum_notification spectrum_notif;</div><div class='add'>+		struct il_csa_notification csa_notif;</div><div class='add'>+		struct il_error_resp err_resp;</div><div class='add'>+		struct il_card_state_notif card_state_notif;</div><div class='add'>+		struct il_add_sta_resp add_sta;</div><div class='add'>+		struct il_rem_sta_resp rem_sta;</div><div class='add'>+		struct il_sleep_notification sleep_notif;</div><div class='add'>+		struct il_spectrum_resp spectrum;</div><div class='add'>+		struct il_notif_stats stats;</div><div class='add'>+		struct il_compressed_ba_resp compressed_ba;</div><div class='add'>+		struct il_missed_beacon_notif missed_beacon;</div><div class='ctx'> 		__le32 status;</div><div class='ctx'> 		u8 raw[0];</div><div class='ctx'> 	} u;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-#endif				/* __iwl_legacy_commands_h__ */</div><div class='add'>+#endif /* __il_commands_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c<br/>new file mode 100644<br/>index 000000000000..36454d0bbeed<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/common.c</a></div><div class='hunk'>@@ -0,0 +1,5867 @@</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * GPL LICENSE SUMMARY</div><div class='add'>+ *</div><div class='add'>+ * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.</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 version 2 of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,</div><div class='add'>+ * USA</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution</div><div class='add'>+ * in the file called LICENSE.GPL.</div><div class='add'>+ *</div><div class='add'>+ * Contact Information:</div><div class='add'>+ *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='add'>+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</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/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/lockdep.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+_il_poll_bit(struct il_priv *il, u32 addr, u32 bits, u32 mask, int timeout)</div><div class='add'>+{</div><div class='add'>+	const int interval = 10; /* microseconds */</div><div class='add'>+	int t = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if ((_il_rd(il, addr) &amp; mask) == (bits &amp; mask))</div><div class='add'>+			return t;</div><div class='add'>+		udelay(interval);</div><div class='add'>+		t += interval;</div><div class='add'>+	} while (t &lt; timeout);</div><div class='add'>+</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(_il_poll_bit);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_set_bit(struct il_priv *p, u32 r, u32 m)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg_flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;p-&gt;reg_lock, reg_flags);</div><div class='add'>+	_il_set_bit(p, r, m);</div><div class='add'>+	spin_unlock_irqrestore(&amp;p-&gt;reg_lock, reg_flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_set_bit);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_clear_bit(struct il_priv *p, u32 r, u32 m)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg_flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;p-&gt;reg_lock, reg_flags);</div><div class='add'>+	_il_clear_bit(p, r, m);</div><div class='add'>+	spin_unlock_irqrestore(&amp;p-&gt;reg_lock, reg_flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_clear_bit);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+_il_grab_nic_access(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* this bit wakes up the NIC */</div><div class='add'>+	_il_set_bit(il, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * These bits say the device is running, and should keep running for</div><div class='add'>+	 * at least a short while (at least as long as MAC_ACCESS_REQ stays 1),</div><div class='add'>+	 * but they do not indicate that embedded SRAM is restored yet;</div><div class='add'>+	 * 3945 and 4965 have volatile SRAM, and must save/restore contents</div><div class='add'>+	 * to/from host DRAM when sleeping/waking for power-saving.</div><div class='add'>+	 * Each direction takes approximately 1/4 millisecond; with this</div><div class='add'>+	 * overhead, it's a good idea to grab and hold MAC_ACCESS_REQUEST if a</div><div class='add'>+	 * series of register accesses are expected (e.g. reading Event Log),</div><div class='add'>+	 * to keep device from sleeping.</div><div class='add'>+	 *</div><div class='add'>+	 * CSR_UCODE_DRV_GP1 register bit MAC_SLEEP == 0 indicates that</div><div class='add'>+	 * SRAM is okay/restored.  We don't check that here because this call</div><div class='add'>+	 * is just for hardware register access; but GP1 MAC_SLEEP check is a</div><div class='add'>+	 * good idea before accessing 3945/4965 SRAM (e.g. reading Event Log).</div><div class='add'>+	 *</div><div class='add'>+	 */</div><div class='add'>+	ret =</div><div class='add'>+	    _il_poll_bit(il, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_VAL_MAC_ACCESS_EN,</div><div class='add'>+			 (CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY |</div><div class='add'>+			  CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP), 15000);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		val = _il_rd(il, CSR_GP_CNTRL);</div><div class='add'>+		IL_ERR("MAC is in deep sleep!.  CSR_GP_CNTRL = 0x%08X\n", val);</div><div class='add'>+		_il_wr(il, CSR_RESET, CSR_RESET_REG_FLAG_FORCE_NMI);</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'>+EXPORT_SYMBOL_GPL(_il_grab_nic_access);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_poll_bit(struct il_priv *il, u32 addr, u32 mask, int timeout)</div><div class='add'>+{</div><div class='add'>+	const int interval = 10; /* microseconds */</div><div class='add'>+	int t = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if ((il_rd(il, addr) &amp; mask) == mask)</div><div class='add'>+			return t;</div><div class='add'>+		udelay(interval);</div><div class='add'>+		t += interval;</div><div class='add'>+	} while (t &lt; timeout);</div><div class='add'>+</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_poll_bit);</div><div class='add'>+</div><div class='add'>+u32</div><div class='add'>+il_rd_prph(struct il_priv *il, u32 reg)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg_flags;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;reg_lock, reg_flags);</div><div class='add'>+	_il_grab_nic_access(il);</div><div class='add'>+	val = _il_rd_prph(il, reg);</div><div class='add'>+	_il_release_nic_access(il);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;reg_lock, reg_flags);</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_rd_prph);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_wr_prph(struct il_priv *il, u32 addr, u32 val)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg_flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;reg_lock, reg_flags);</div><div class='add'>+	if (!_il_grab_nic_access(il)) {</div><div class='add'>+		_il_wr_prph(il, addr, val);</div><div class='add'>+		_il_release_nic_access(il);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;reg_lock, reg_flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_wr_prph);</div><div class='add'>+</div><div class='add'>+u32</div><div class='add'>+il_read_targ_mem(struct il_priv *il, u32 addr)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg_flags;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;reg_lock, reg_flags);</div><div class='add'>+	_il_grab_nic_access(il);</div><div class='add'>+</div><div class='add'>+	_il_wr(il, HBUS_TARG_MEM_RADDR, addr);</div><div class='add'>+	rmb();</div><div class='add'>+	value = _il_rd(il, HBUS_TARG_MEM_RDAT);</div><div class='add'>+</div><div class='add'>+	_il_release_nic_access(il);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;reg_lock, reg_flags);</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_read_targ_mem);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_write_targ_mem(struct il_priv *il, u32 addr, u32 val)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg_flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;reg_lock, reg_flags);</div><div class='add'>+	if (!_il_grab_nic_access(il)) {</div><div class='add'>+		_il_wr(il, HBUS_TARG_MEM_WADDR, addr);</div><div class='add'>+		wmb();</div><div class='add'>+		_il_wr(il, HBUS_TARG_MEM_WDAT, val);</div><div class='add'>+		_il_release_nic_access(il);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;reg_lock, reg_flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_write_targ_mem);</div><div class='add'>+</div><div class='add'>+const char *</div><div class='add'>+il_get_cmd_string(u8 cmd)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+		IL_CMD(N_ALIVE);</div><div class='add'>+		IL_CMD(N_ERROR);</div><div class='add'>+		IL_CMD(C_RXON);</div><div class='add'>+		IL_CMD(C_RXON_ASSOC);</div><div class='add'>+		IL_CMD(C_QOS_PARAM);</div><div class='add'>+		IL_CMD(C_RXON_TIMING);</div><div class='add'>+		IL_CMD(C_ADD_STA);</div><div class='add'>+		IL_CMD(C_REM_STA);</div><div class='add'>+		IL_CMD(C_WEPKEY);</div><div class='add'>+		IL_CMD(N_3945_RX);</div><div class='add'>+		IL_CMD(C_TX);</div><div class='add'>+		IL_CMD(C_RATE_SCALE);</div><div class='add'>+		IL_CMD(C_LEDS);</div><div class='add'>+		IL_CMD(C_TX_LINK_QUALITY_CMD);</div><div class='add'>+		IL_CMD(C_CHANNEL_SWITCH);</div><div class='add'>+		IL_CMD(N_CHANNEL_SWITCH);</div><div class='add'>+		IL_CMD(C_SPECTRUM_MEASUREMENT);</div><div class='add'>+		IL_CMD(N_SPECTRUM_MEASUREMENT);</div><div class='add'>+		IL_CMD(C_POWER_TBL);</div><div class='add'>+		IL_CMD(N_PM_SLEEP);</div><div class='add'>+		IL_CMD(N_PM_DEBUG_STATS);</div><div class='add'>+		IL_CMD(C_SCAN);</div><div class='add'>+		IL_CMD(C_SCAN_ABORT);</div><div class='add'>+		IL_CMD(N_SCAN_START);</div><div class='add'>+		IL_CMD(N_SCAN_RESULTS);</div><div class='add'>+		IL_CMD(N_SCAN_COMPLETE);</div><div class='add'>+		IL_CMD(N_BEACON);</div><div class='add'>+		IL_CMD(C_TX_BEACON);</div><div class='add'>+		IL_CMD(C_TX_PWR_TBL);</div><div class='add'>+		IL_CMD(C_BT_CONFIG);</div><div class='add'>+		IL_CMD(C_STATS);</div><div class='add'>+		IL_CMD(N_STATS);</div><div class='add'>+		IL_CMD(N_CARD_STATE);</div><div class='add'>+		IL_CMD(N_MISSED_BEACONS);</div><div class='add'>+		IL_CMD(C_CT_KILL_CONFIG);</div><div class='add'>+		IL_CMD(C_SENSITIVITY);</div><div class='add'>+		IL_CMD(C_PHY_CALIBRATION);</div><div class='add'>+		IL_CMD(N_RX_PHY);</div><div class='add'>+		IL_CMD(N_RX_MPDU);</div><div class='add'>+		IL_CMD(N_RX);</div><div class='add'>+		IL_CMD(N_COMPRESSED_BA);</div><div class='add'>+	default:</div><div class='add'>+		return "UNKNOWN";</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_get_cmd_string);</div><div class='add'>+</div><div class='add'>+#define HOST_COMPLETE_TIMEOUT (HZ / 2)</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il_generic_cmd_callback(struct il_priv *il, struct il_device_cmd *cmd,</div><div class='add'>+			struct il_rx_pkt *pkt)</div><div class='add'>+{</div><div class='add'>+	if (pkt-&gt;hdr.flags &amp; IL_CMD_FAILED_MSK) {</div><div class='add'>+		IL_ERR("Bad return from %s (0x%08X)\n",</div><div class='add'>+		       il_get_cmd_string(cmd-&gt;hdr.cmd), pkt-&gt;hdr.flags);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	switch (cmd-&gt;hdr.cmd) {</div><div class='add'>+	case C_TX_LINK_QUALITY_CMD:</div><div class='add'>+	case C_SENSITIVITY:</div><div class='add'>+		D_HC_DUMP("back from %s (0x%08X)\n",</div><div class='add'>+			  il_get_cmd_string(cmd-&gt;hdr.cmd), pkt-&gt;hdr.flags);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		D_HC("back from %s (0x%08X)\n", il_get_cmd_string(cmd-&gt;hdr.cmd),</div><div class='add'>+		     pkt-&gt;hdr.flags);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il_send_cmd_async(struct il_priv *il, struct il_host_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!(cmd-&gt;flags &amp; CMD_ASYNC));</div><div class='add'>+</div><div class='add'>+	/* An asynchronous command can not expect an SKB to be set. */</div><div class='add'>+	BUG_ON(cmd-&gt;flags &amp; CMD_WANT_SKB);</div><div class='add'>+</div><div class='add'>+	/* Assign a generic callback if one is not provided */</div><div class='add'>+	if (!cmd-&gt;callback)</div><div class='add'>+		cmd-&gt;callback = il_generic_cmd_callback;</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	ret = il_enqueue_hcmd(il, cmd);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		IL_ERR("Error sending %s: enqueue_hcmd failed: %d\n",</div><div class='add'>+		       il_get_cmd_string(cmd-&gt;id), ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_send_cmd_sync(struct il_priv *il, struct il_host_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	int cmd_idx;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	BUG_ON(cmd-&gt;flags &amp; CMD_ASYNC);</div><div class='add'>+</div><div class='add'>+	/* A synchronous command can not have a callback set. */</div><div class='add'>+	BUG_ON(cmd-&gt;callback);</div><div class='add'>+</div><div class='add'>+	D_INFO("Attempting to send sync command %s\n",</div><div class='add'>+	       il_get_cmd_string(cmd-&gt;id));</div><div class='add'>+</div><div class='add'>+	set_bit(S_HCMD_ACTIVE, &amp;il-&gt;status);</div><div class='add'>+	D_INFO("Setting HCMD_ACTIVE for command %s\n",</div><div class='add'>+	       il_get_cmd_string(cmd-&gt;id));</div><div class='add'>+</div><div class='add'>+	cmd_idx = il_enqueue_hcmd(il, cmd);</div><div class='add'>+	if (cmd_idx &lt; 0) {</div><div class='add'>+		ret = cmd_idx;</div><div class='add'>+		IL_ERR("Error sending %s: enqueue_hcmd failed: %d\n",</div><div class='add'>+		       il_get_cmd_string(cmd-&gt;id), ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wait_event_timeout(il-&gt;wait_command_queue,</div><div class='add'>+				 !test_bit(S_HCMD_ACTIVE, &amp;il-&gt;status),</div><div class='add'>+				 HOST_COMPLETE_TIMEOUT);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (test_bit(S_HCMD_ACTIVE, &amp;il-&gt;status)) {</div><div class='add'>+			IL_ERR("Error sending %s: time out after %dms.\n",</div><div class='add'>+			       il_get_cmd_string(cmd-&gt;id),</div><div class='add'>+			       jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));</div><div class='add'>+</div><div class='add'>+			clear_bit(S_HCMD_ACTIVE, &amp;il-&gt;status);</div><div class='add'>+			D_INFO("Clearing HCMD_ACTIVE for command %s\n",</div><div class='add'>+			       il_get_cmd_string(cmd-&gt;id));</div><div class='add'>+			ret = -ETIMEDOUT;</div><div class='add'>+			goto cancel;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_RF_KILL_HW, &amp;il-&gt;status)) {</div><div class='add'>+		IL_ERR("Command %s aborted: RF KILL Switch\n",</div><div class='add'>+		       il_get_cmd_string(cmd-&gt;id));</div><div class='add'>+		ret = -ECANCELED;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	if (test_bit(S_FW_ERROR, &amp;il-&gt;status)) {</div><div class='add'>+		IL_ERR("Command %s failed: FW Error\n",</div><div class='add'>+		       il_get_cmd_string(cmd-&gt;id));</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	if ((cmd-&gt;flags &amp; CMD_WANT_SKB) &amp;&amp; !cmd-&gt;reply_page) {</div><div class='add'>+		IL_ERR("Error: Response NULL in '%s'\n",</div><div class='add'>+		       il_get_cmd_string(cmd-&gt;id));</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+cancel:</div><div class='add'>+	if (cmd-&gt;flags &amp; CMD_WANT_SKB) {</div><div class='add'>+		/*</div><div class='add'>+		 * Cancel the CMD_WANT_SKB flag for the cmd in the</div><div class='add'>+		 * TX cmd queue. Otherwise in case the cmd comes</div><div class='add'>+		 * in later, it will possibly set an invalid</div><div class='add'>+		 * address (cmd-&gt;meta.source).</div><div class='add'>+		 */</div><div class='add'>+		il-&gt;txq[il-&gt;cmd_queue].meta[cmd_idx].flags &amp;= ~CMD_WANT_SKB;</div><div class='add'>+	}</div><div class='add'>+fail:</div><div class='add'>+	if (cmd-&gt;reply_page) {</div><div class='add'>+		il_free_pages(il, cmd-&gt;reply_page);</div><div class='add'>+		cmd-&gt;reply_page = 0;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_send_cmd_sync);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_send_cmd(struct il_priv *il, struct il_host_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	if (cmd-&gt;flags &amp; CMD_ASYNC)</div><div class='add'>+		return il_send_cmd_async(il, cmd);</div><div class='add'>+</div><div class='add'>+	return il_send_cmd_sync(il, cmd);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_send_cmd);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_send_cmd_pdu(struct il_priv *il, u8 id, u16 len, const void *data)</div><div class='add'>+{</div><div class='add'>+	struct il_host_cmd cmd = {</div><div class='add'>+		.id = id,</div><div class='add'>+		.len = len,</div><div class='add'>+		.data = data,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return il_send_cmd_sync(il, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_send_cmd_pdu);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_send_cmd_pdu_async(struct il_priv *il, u8 id, u16 len, const void *data,</div><div class='add'>+		      void (*callback) (struct il_priv *il,</div><div class='add'>+					struct il_device_cmd *cmd,</div><div class='add'>+					struct il_rx_pkt *pkt))</div><div class='add'>+{</div><div class='add'>+	struct il_host_cmd cmd = {</div><div class='add'>+		.id = id,</div><div class='add'>+		.len = len,</div><div class='add'>+		.data = data,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cmd.flags |= CMD_ASYNC;</div><div class='add'>+	cmd.callback = callback;</div><div class='add'>+</div><div class='add'>+	return il_send_cmd_async(il, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_send_cmd_pdu_async);</div><div class='add'>+</div><div class='add'>+/* default: IL_LED_BLINK(0) using blinking idx table */</div><div class='add'>+static int led_mode;</div><div class='add'>+module_param(led_mode, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(led_mode,</div><div class='add'>+		 "0=system default, " "1=On(RF On)/Off(RF Off), 2=blinking");</div><div class='add'>+</div><div class='add'>+/* Throughput		OFF time(ms)	ON time (ms)</div><div class='add'>+ *	&gt;300			25		25</div><div class='add'>+ *	&gt;200 to 300		40		40</div><div class='add'>+ *	&gt;100 to 200		55		55</div><div class='add'>+ *	&gt;70 to 100		65		65</div><div class='add'>+ *	&gt;50 to 70		75		75</div><div class='add'>+ *	&gt;20 to 50		85		85</div><div class='add'>+ *	&gt;10 to 20		95		95</div><div class='add'>+ *	&gt;5 to 10		110		110</div><div class='add'>+ *	&gt;1 to 5			130		130</div><div class='add'>+ *	&gt;0 to 1			167		167</div><div class='add'>+ *	&lt;=0					SOLID ON</div><div class='add'>+ */</div><div class='add'>+static const struct ieee80211_tpt_blink il_blink[] = {</div><div class='add'>+	{.throughput = 0,		.blink_time = 334},</div><div class='add'>+	{.throughput = 1 * 1024 - 1,	.blink_time = 260},</div><div class='add'>+	{.throughput = 5 * 1024 - 1,	.blink_time = 220},</div><div class='add'>+	{.throughput = 10 * 1024 - 1,	.blink_time = 190},</div><div class='add'>+	{.throughput = 20 * 1024 - 1,	.blink_time = 170},</div><div class='add'>+	{.throughput = 50 * 1024 - 1,	.blink_time = 150},</div><div class='add'>+	{.throughput = 70 * 1024 - 1,	.blink_time = 130},</div><div class='add'>+	{.throughput = 100 * 1024 - 1,	.blink_time = 110},</div><div class='add'>+	{.throughput = 200 * 1024 - 1,	.blink_time = 80},</div><div class='add'>+	{.throughput = 300 * 1024 - 1,	.blink_time = 50},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Adjust led blink rate to compensate on a MAC Clock difference on every HW</div><div class='add'>+ * Led blink rate analysis showed an average deviation of 0% on 3945,</div><div class='add'>+ * 5% on 4965 HW.</div><div class='add'>+ * Need to compensate on the led on/off time per HW according to the deviation</div><div class='add'>+ * to achieve the desired led frequency</div><div class='add'>+ * The calculation is: (100-averageDeviation)/100 * blinkTime</div><div class='add'>+ * For code efficiency the calculation will be:</div><div class='add'>+ *     compensation = (100 - averageDeviation) * 64 / 100</div><div class='add'>+ *     NewBlinkTime = (compensation * BlinkTime) / 64</div><div class='add'>+ */</div><div class='add'>+static inline u8</div><div class='add'>+il_blink_compensation(struct il_priv *il, u8 time, u16 compensation)</div><div class='add'>+{</div><div class='add'>+	if (!compensation) {</div><div class='add'>+		IL_ERR("undefined blink compensation: "</div><div class='add'>+		       "use pre-defined blinking time\n");</div><div class='add'>+		return time;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (u8) ((time * compensation) &gt;&gt; 6);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set led pattern command */</div><div class='add'>+static int</div><div class='add'>+il_led_cmd(struct il_priv *il, unsigned long on, unsigned long off)</div><div class='add'>+{</div><div class='add'>+	struct il_led_cmd led_cmd = {</div><div class='add'>+		.id = IL_LED_LINK,</div><div class='add'>+		.interval = IL_DEF_LED_INTRVL</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(S_READY, &amp;il-&gt;status))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;blink_on == on &amp;&amp; il-&gt;blink_off == off)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (off == 0) {</div><div class='add'>+		/* led is SOLID_ON */</div><div class='add'>+		on = IL_LED_SOLID;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_LED("Led blink time compensation=%u\n",</div><div class='add'>+	      il-&gt;cfg-&gt;base_params-&gt;led_compensation);</div><div class='add'>+	led_cmd.on =</div><div class='add'>+	    il_blink_compensation(il, on,</div><div class='add'>+				  il-&gt;cfg-&gt;base_params-&gt;led_compensation);</div><div class='add'>+	led_cmd.off =</div><div class='add'>+	    il_blink_compensation(il, off,</div><div class='add'>+				  il-&gt;cfg-&gt;base_params-&gt;led_compensation);</div><div class='add'>+</div><div class='add'>+	ret = il-&gt;cfg-&gt;ops-&gt;led-&gt;cmd(il, &amp;led_cmd);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		il-&gt;blink_on = on;</div><div class='add'>+		il-&gt;blink_off = off;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il_led_brightness_set(struct led_classdev *led_cdev,</div><div class='add'>+		      enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = container_of(led_cdev, struct il_priv, led);</div><div class='add'>+	unsigned long on = 0;</div><div class='add'>+</div><div class='add'>+	if (brightness &gt; 0)</div><div class='add'>+		on = IL_LED_SOLID;</div><div class='add'>+</div><div class='add'>+	il_led_cmd(il, on, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il_led_blink_set(struct led_classdev *led_cdev, unsigned long *delay_on,</div><div class='add'>+		 unsigned long *delay_off)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = container_of(led_cdev, struct il_priv, led);</div><div class='add'>+</div><div class='add'>+	return il_led_cmd(il, *delay_on, *delay_off);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_leds_init(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int mode = led_mode;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (mode == IL_LED_DEFAULT)</div><div class='add'>+		mode = il-&gt;cfg-&gt;led_mode;</div><div class='add'>+</div><div class='add'>+	il-&gt;led.name =</div><div class='add'>+	    kasprintf(GFP_KERNEL, "%s-led", wiphy_name(il-&gt;hw-&gt;wiphy));</div><div class='add'>+	il-&gt;led.brightness_set = il_led_brightness_set;</div><div class='add'>+	il-&gt;led.blink_set = il_led_blink_set;</div><div class='add'>+	il-&gt;led.max_brightness = 1;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case IL_LED_DEFAULT:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		break;</div><div class='add'>+	case IL_LED_BLINK:</div><div class='add'>+		il-&gt;led.default_trigger =</div><div class='add'>+		    ieee80211_create_tpt_led_trigger(il-&gt;hw,</div><div class='add'>+						     IEEE80211_TPT_LEDTRIG_FL_CONNECTED,</div><div class='add'>+						     il_blink,</div><div class='add'>+						     ARRAY_SIZE(il_blink));</div><div class='add'>+		break;</div><div class='add'>+	case IL_LED_RF_STATE:</div><div class='add'>+		il-&gt;led.default_trigger = ieee80211_get_radio_led_name(il-&gt;hw);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = led_classdev_register(&amp;il-&gt;pci_dev-&gt;dev, &amp;il-&gt;led);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(il-&gt;led.name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il-&gt;led_registered = true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_leds_init);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_leds_exit(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	if (!il-&gt;led_registered)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	led_classdev_unregister(&amp;il-&gt;led);</div><div class='add'>+	kfree(il-&gt;led.name);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_leds_exit);</div><div class='add'>+</div><div class='add'>+/************************** EEPROM BANDS ****************************</div><div class='add'>+ *</div><div class='add'>+ * The il_eeprom_band definitions below provide the mapping from the</div><div class='add'>+ * EEPROM contents to the specific channel number supported for each</div><div class='add'>+ * band.</div><div class='add'>+ *</div><div class='add'>+ * For example, il_priv-&gt;eeprom.band_3_channels[4] from the band_3</div><div class='add'>+ * definition below maps to physical channel 42 in the 5.2GHz spectrum.</div><div class='add'>+ * The specific geography and calibration information for that channel</div><div class='add'>+ * is contained in the eeprom map itself.</div><div class='add'>+ *</div><div class='add'>+ * During init, we copy the eeprom information and channel map</div><div class='add'>+ * information into il-&gt;channel_info_24/52 and il-&gt;channel_map_24/52</div><div class='add'>+ *</div><div class='add'>+ * channel_map_24/52 provides the idx in the channel_info array for a</div><div class='add'>+ * given channel.  We have to have two separate maps as there is channel</div><div class='add'>+ * overlap with the 2.4GHz and 5.2GHz spectrum as seen in band_1 and</div><div class='add'>+ * band_2</div><div class='add'>+ *</div><div class='add'>+ * A value of 0xff stored in the channel_map indicates that the channel</div><div class='add'>+ * is not supported by the hardware at all.</div><div class='add'>+ *</div><div class='add'>+ * A value of 0xfe in the channel_map indicates that the channel is not</div><div class='add'>+ * valid for Tx with the current hardware.  This means that</div><div class='add'>+ * while the system can tune and receive on a given channel, it may not</div><div class='add'>+ * be able to associate or transmit any frames on that</div><div class='add'>+ * channel.  There is no corresponding channel information for that</div><div class='add'>+ * entry.</div><div class='add'>+ *</div><div class='add'>+ *********************************************************************/</div><div class='add'>+</div><div class='add'>+/* 2.4 GHz */</div><div class='add'>+const u8 il_eeprom_band_1[14] = {</div><div class='add'>+	1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 5.2 GHz bands */</div><div class='add'>+static const u8 il_eeprom_band_2[] = {	/* 4915-5080MHz */</div><div class='add'>+	183, 184, 185, 187, 188, 189, 192, 196, 7, 8, 11, 12, 16</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 il_eeprom_band_3[] = {	/* 5170-5320MHz */</div><div class='add'>+	34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 il_eeprom_band_4[] = {	/* 5500-5700MHz */</div><div class='add'>+	100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 il_eeprom_band_5[] = {	/* 5725-5825MHz */</div><div class='add'>+	145, 149, 153, 157, 161, 165</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 il_eeprom_band_6[] = {	/* 2.4 ht40 channel */</div><div class='add'>+	1, 2, 3, 4, 5, 6, 7</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 il_eeprom_band_7[] = {	/* 5.2 ht40 channel */</div><div class='add'>+	36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * EEPROM related functions</div><div class='add'>+ *</div><div class='add'>+******************************************************************************/</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il_eeprom_verify_signature(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	u32 gp = _il_rd(il, CSR_EEPROM_GP) &amp; CSR_EEPROM_GP_VALID_MSK;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	D_EEPROM("EEPROM signature=0x%08x\n", gp);</div><div class='add'>+	switch (gp) {</div><div class='add'>+	case CSR_EEPROM_GP_GOOD_SIG_EEP_LESS_THAN_4K:</div><div class='add'>+	case CSR_EEPROM_GP_GOOD_SIG_EEP_MORE_THAN_4K:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		IL_ERR("bad EEPROM signature," "EEPROM_GP=0x%08x\n", gp);</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const u8 *</div><div class='add'>+il_eeprom_query_addr(const struct il_priv *il, size_t offset)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(offset &gt;= il-&gt;cfg-&gt;base_params-&gt;eeprom_size);</div><div class='add'>+	return &amp;il-&gt;eeprom[offset];</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_eeprom_query_addr);</div><div class='add'>+</div><div class='add'>+u16</div><div class='add'>+il_eeprom_query16(const struct il_priv *il, size_t offset)</div><div class='add'>+{</div><div class='add'>+	if (!il-&gt;eeprom)</div><div class='add'>+		return 0;</div><div class='add'>+	return (u16) il-&gt;eeprom[offset] | ((u16) il-&gt;eeprom[offset + 1] &lt;&lt; 8);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_eeprom_query16);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_eeprom_init - read EEPROM contents</div><div class='add'>+ *</div><div class='add'>+ * Load the EEPROM contents from adapter into il-&gt;eeprom</div><div class='add'>+ *</div><div class='add'>+ * NOTE:  This routine uses the non-debug IO access functions.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il_eeprom_init(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	__le16 *e;</div><div class='add'>+	u32 gp = _il_rd(il, CSR_EEPROM_GP);</div><div class='add'>+	int sz;</div><div class='add'>+	int ret;</div><div class='add'>+	u16 addr;</div><div class='add'>+</div><div class='add'>+	/* allocate eeprom */</div><div class='add'>+	sz = il-&gt;cfg-&gt;base_params-&gt;eeprom_size;</div><div class='add'>+	D_EEPROM("NVM size = %d\n", sz);</div><div class='add'>+	il-&gt;eeprom = kzalloc(sz, GFP_KERNEL);</div><div class='add'>+	if (!il-&gt;eeprom) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto alloc_err;</div><div class='add'>+	}</div><div class='add'>+	e = (__le16 *) il-&gt;eeprom;</div><div class='add'>+</div><div class='add'>+	il-&gt;cfg-&gt;ops-&gt;lib-&gt;apm_ops.init(il);</div><div class='add'>+</div><div class='add'>+	ret = il_eeprom_verify_signature(il);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		IL_ERR("EEPROM not found, EEPROM_GP=0x%08x\n", gp);</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make sure driver (instead of uCode) is allowed to read EEPROM */</div><div class='add'>+	ret = il-&gt;cfg-&gt;ops-&gt;lib-&gt;eeprom_ops.acquire_semaphore(il);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		IL_ERR("Failed to acquire EEPROM semaphore.\n");</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* eeprom is an array of 16bit values */</div><div class='add'>+	for (addr = 0; addr &lt; sz; addr += sizeof(u16)) {</div><div class='add'>+		u32 r;</div><div class='add'>+</div><div class='add'>+		_il_wr(il, CSR_EEPROM_REG,</div><div class='add'>+		       CSR_EEPROM_REG_MSK_ADDR &amp; (addr &lt;&lt; 1));</div><div class='add'>+</div><div class='add'>+		ret =</div><div class='add'>+		    _il_poll_bit(il, CSR_EEPROM_REG,</div><div class='add'>+				 CSR_EEPROM_REG_READ_VALID_MSK,</div><div class='add'>+				 CSR_EEPROM_REG_READ_VALID_MSK,</div><div class='add'>+				 IL_EEPROM_ACCESS_TIMEOUT);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			IL_ERR("Time out reading EEPROM[%d]\n", addr);</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+		r = _il_rd(il, CSR_EEPROM_REG);</div><div class='add'>+		e[addr / 2] = cpu_to_le16(r &gt;&gt; 16);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_EEPROM("NVM Type: %s, version: 0x%x\n", "EEPROM",</div><div class='add'>+		 il_eeprom_query16(il, EEPROM_VERSION));</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+done:</div><div class='add'>+	il-&gt;cfg-&gt;ops-&gt;lib-&gt;eeprom_ops.release_semaphore(il);</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	if (ret)</div><div class='add'>+		il_eeprom_free(il);</div><div class='add'>+	/* Reset chip to save power until we load uCode during "up". */</div><div class='add'>+	il_apm_stop(il);</div><div class='add'>+alloc_err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_eeprom_init);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_eeprom_free(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	kfree(il-&gt;eeprom);</div><div class='add'>+	il-&gt;eeprom = NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_eeprom_free);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il_init_band_reference(const struct il_priv *il, int eep_band,</div><div class='add'>+		       int *eeprom_ch_count,</div><div class='add'>+		       const struct il_eeprom_channel **eeprom_ch_info,</div><div class='add'>+		       const u8 **eeprom_ch_idx)</div><div class='add'>+{</div><div class='add'>+	u32 offset =</div><div class='add'>+	    il-&gt;cfg-&gt;ops-&gt;lib-&gt;eeprom_ops.regulatory_bands[eep_band - 1];</div><div class='add'>+	switch (eep_band) {</div><div class='add'>+	case 1:		/* 2.4GHz band */</div><div class='add'>+		*eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_1);</div><div class='add'>+		*eeprom_ch_info =</div><div class='add'>+		    (struct il_eeprom_channel *)il_eeprom_query_addr(il,</div><div class='add'>+								     offset);</div><div class='add'>+		*eeprom_ch_idx = il_eeprom_band_1;</div><div class='add'>+		break;</div><div class='add'>+	case 2:		/* 4.9GHz band */</div><div class='add'>+		*eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_2);</div><div class='add'>+		*eeprom_ch_info =</div><div class='add'>+		    (struct il_eeprom_channel *)il_eeprom_query_addr(il,</div><div class='add'>+								     offset);</div><div class='add'>+		*eeprom_ch_idx = il_eeprom_band_2;</div><div class='add'>+		break;</div><div class='add'>+	case 3:		/* 5.2GHz band */</div><div class='add'>+		*eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_3);</div><div class='add'>+		*eeprom_ch_info =</div><div class='add'>+		    (struct il_eeprom_channel *)il_eeprom_query_addr(il,</div><div class='add'>+								     offset);</div><div class='add'>+		*eeprom_ch_idx = il_eeprom_band_3;</div><div class='add'>+		break;</div><div class='add'>+	case 4:		/* 5.5GHz band */</div><div class='add'>+		*eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_4);</div><div class='add'>+		*eeprom_ch_info =</div><div class='add'>+		    (struct il_eeprom_channel *)il_eeprom_query_addr(il,</div><div class='add'>+								     offset);</div><div class='add'>+		*eeprom_ch_idx = il_eeprom_band_4;</div><div class='add'>+		break;</div><div class='add'>+	case 5:		/* 5.7GHz band */</div><div class='add'>+		*eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_5);</div><div class='add'>+		*eeprom_ch_info =</div><div class='add'>+		    (struct il_eeprom_channel *)il_eeprom_query_addr(il,</div><div class='add'>+								     offset);</div><div class='add'>+		*eeprom_ch_idx = il_eeprom_band_5;</div><div class='add'>+		break;</div><div class='add'>+	case 6:		/* 2.4GHz ht40 channels */</div><div class='add'>+		*eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_6);</div><div class='add'>+		*eeprom_ch_info =</div><div class='add'>+		    (struct il_eeprom_channel *)il_eeprom_query_addr(il,</div><div class='add'>+								     offset);</div><div class='add'>+		*eeprom_ch_idx = il_eeprom_band_6;</div><div class='add'>+		break;</div><div class='add'>+	case 7:		/* 5 GHz ht40 channels */</div><div class='add'>+		*eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_7);</div><div class='add'>+		*eeprom_ch_info =</div><div class='add'>+		    (struct il_eeprom_channel *)il_eeprom_query_addr(il,</div><div class='add'>+								     offset);</div><div class='add'>+		*eeprom_ch_idx = il_eeprom_band_7;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CHECK_AND_PRINT(x) ((eeprom_ch-&gt;flags &amp; EEPROM_CHANNEL_##x) \</div><div class='add'>+			    ? # x " " : "")</div><div class='add'>+/**</div><div class='add'>+ * il_mod_ht40_chan_info - Copy ht40 channel info into driver's il.</div><div class='add'>+ *</div><div class='add'>+ * Does not set up a command, or touch hardware.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il_mod_ht40_chan_info(struct il_priv *il, enum ieee80211_band band, u16 channel,</div><div class='add'>+		      const struct il_eeprom_channel *eeprom_ch,</div><div class='add'>+		      u8 clear_ht40_extension_channel)</div><div class='add'>+{</div><div class='add'>+	struct il_channel_info *ch_info;</div><div class='add'>+</div><div class='add'>+	ch_info =</div><div class='add'>+	    (struct il_channel_info *)il_get_channel_info(il, band, channel);</div><div class='add'>+</div><div class='add'>+	if (!il_is_channel_valid(ch_info))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	D_EEPROM("HT40 Ch. %d [%sGHz] %s%s%s%s%s(0x%02x %ddBm):"</div><div class='add'>+		 " Ad-Hoc %ssupported\n", ch_info-&gt;channel,</div><div class='add'>+		 il_is_channel_a_band(ch_info) ? "5.2" : "2.4",</div><div class='add'>+		 CHECK_AND_PRINT(IBSS), CHECK_AND_PRINT(ACTIVE),</div><div class='add'>+		 CHECK_AND_PRINT(RADAR), CHECK_AND_PRINT(WIDE),</div><div class='add'>+		 CHECK_AND_PRINT(DFS), eeprom_ch-&gt;flags,</div><div class='add'>+		 eeprom_ch-&gt;max_power_avg,</div><div class='add'>+		 ((eeprom_ch-&gt;flags &amp; EEPROM_CHANNEL_IBSS) &amp;&amp;</div><div class='add'>+		  !(eeprom_ch-&gt;flags &amp; EEPROM_CHANNEL_RADAR)) ? "" : "not ");</div><div class='add'>+</div><div class='add'>+	ch_info-&gt;ht40_eeprom = *eeprom_ch;</div><div class='add'>+	ch_info-&gt;ht40_max_power_avg = eeprom_ch-&gt;max_power_avg;</div><div class='add'>+	ch_info-&gt;ht40_flags = eeprom_ch-&gt;flags;</div><div class='add'>+	if (eeprom_ch-&gt;flags &amp; EEPROM_CHANNEL_VALID)</div><div class='add'>+		ch_info-&gt;ht40_extension_channel &amp;=</div><div class='add'>+		    ~clear_ht40_extension_channel;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CHECK_AND_PRINT_I(x) ((eeprom_ch_info[ch].flags &amp; EEPROM_CHANNEL_##x) \</div><div class='add'>+			    ? # x " " : "")</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_init_channel_map - Set up driver's info for all possible channels</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il_init_channel_map(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int eeprom_ch_count = 0;</div><div class='add'>+	const u8 *eeprom_ch_idx = NULL;</div><div class='add'>+	const struct il_eeprom_channel *eeprom_ch_info = NULL;</div><div class='add'>+	int band, ch;</div><div class='add'>+	struct il_channel_info *ch_info;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;channel_count) {</div><div class='add'>+		D_EEPROM("Channel map already initialized.\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_EEPROM("Initializing regulatory info from EEPROM\n");</div><div class='add'>+</div><div class='add'>+	il-&gt;channel_count =</div><div class='add'>+	    ARRAY_SIZE(il_eeprom_band_1) + ARRAY_SIZE(il_eeprom_band_2) +</div><div class='add'>+	    ARRAY_SIZE(il_eeprom_band_3) + ARRAY_SIZE(il_eeprom_band_4) +</div><div class='add'>+	    ARRAY_SIZE(il_eeprom_band_5);</div><div class='add'>+</div><div class='add'>+	D_EEPROM("Parsing data for %d channels.\n", il-&gt;channel_count);</div><div class='add'>+</div><div class='add'>+	il-&gt;channel_info =</div><div class='add'>+	    kzalloc(sizeof(struct il_channel_info) * il-&gt;channel_count,</div><div class='add'>+		    GFP_KERNEL);</div><div class='add'>+	if (!il-&gt;channel_info) {</div><div class='add'>+		IL_ERR("Could not allocate channel_info\n");</div><div class='add'>+		il-&gt;channel_count = 0;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ch_info = il-&gt;channel_info;</div><div class='add'>+</div><div class='add'>+	/* Loop through the 5 EEPROM bands adding them in order to the</div><div class='add'>+	 * channel map we maintain (that contains additional information than</div><div class='add'>+	 * what just in the EEPROM) */</div><div class='add'>+	for (band = 1; band &lt;= 5; band++) {</div><div class='add'>+</div><div class='add'>+		il_init_band_reference(il, band, &amp;eeprom_ch_count,</div><div class='add'>+				       &amp;eeprom_ch_info, &amp;eeprom_ch_idx);</div><div class='add'>+</div><div class='add'>+		/* Loop through each band adding each of the channels */</div><div class='add'>+		for (ch = 0; ch &lt; eeprom_ch_count; ch++) {</div><div class='add'>+			ch_info-&gt;channel = eeprom_ch_idx[ch];</div><div class='add'>+			ch_info-&gt;band =</div><div class='add'>+			    (band ==</div><div class='add'>+			     1) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;</div><div class='add'>+</div><div class='add'>+			/* permanently store EEPROM's channel regulatory flags</div><div class='add'>+			 *   and max power in channel info database. */</div><div class='add'>+			ch_info-&gt;eeprom = eeprom_ch_info[ch];</div><div class='add'>+</div><div class='add'>+			/* Copy the run-time flags so they are there even on</div><div class='add'>+			 * invalid channels */</div><div class='add'>+			ch_info-&gt;flags = eeprom_ch_info[ch].flags;</div><div class='add'>+			/* First write that ht40 is not enabled, and then enable</div><div class='add'>+			 * one by one */</div><div class='add'>+			ch_info-&gt;ht40_extension_channel =</div><div class='add'>+			    IEEE80211_CHAN_NO_HT40;</div><div class='add'>+</div><div class='add'>+			if (!(il_is_channel_valid(ch_info))) {</div><div class='add'>+				D_EEPROM("Ch. %d Flags %x [%sGHz] - "</div><div class='add'>+					 "No traffic\n", ch_info-&gt;channel,</div><div class='add'>+					 ch_info-&gt;flags,</div><div class='add'>+					 il_is_channel_a_band(ch_info) ? "5.2" :</div><div class='add'>+					 "2.4");</div><div class='add'>+				ch_info++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Initialize regulatory-based run-time data */</div><div class='add'>+			ch_info-&gt;max_power_avg = ch_info-&gt;curr_txpow =</div><div class='add'>+			    eeprom_ch_info[ch].max_power_avg;</div><div class='add'>+			ch_info-&gt;scan_power = eeprom_ch_info[ch].max_power_avg;</div><div class='add'>+			ch_info-&gt;min_power = 0;</div><div class='add'>+</div><div class='add'>+			D_EEPROM("Ch. %d [%sGHz] " "%s%s%s%s%s%s(0x%02x %ddBm):"</div><div class='add'>+				 " Ad-Hoc %ssupported\n", ch_info-&gt;channel,</div><div class='add'>+				 il_is_channel_a_band(ch_info) ? "5.2" : "2.4",</div><div class='add'>+				 CHECK_AND_PRINT_I(VALID),</div><div class='add'>+				 CHECK_AND_PRINT_I(IBSS),</div><div class='add'>+				 CHECK_AND_PRINT_I(ACTIVE),</div><div class='add'>+				 CHECK_AND_PRINT_I(RADAR),</div><div class='add'>+				 CHECK_AND_PRINT_I(WIDE),</div><div class='add'>+				 CHECK_AND_PRINT_I(DFS),</div><div class='add'>+				 eeprom_ch_info[ch].flags,</div><div class='add'>+				 eeprom_ch_info[ch].max_power_avg,</div><div class='add'>+				 ((eeprom_ch_info[ch].</div><div class='add'>+				   flags &amp; EEPROM_CHANNEL_IBSS) &amp;&amp;</div><div class='add'>+				  !(eeprom_ch_info[ch].</div><div class='add'>+				    flags &amp; EEPROM_CHANNEL_RADAR)) ? "" :</div><div class='add'>+				 "not ");</div><div class='add'>+</div><div class='add'>+			ch_info++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if we do have HT40 channels */</div><div class='add'>+	if (il-&gt;cfg-&gt;ops-&gt;lib-&gt;eeprom_ops.regulatory_bands[5] ==</div><div class='add'>+	    EEPROM_REGULATORY_BAND_NO_HT40 &amp;&amp;</div><div class='add'>+	    il-&gt;cfg-&gt;ops-&gt;lib-&gt;eeprom_ops.regulatory_bands[6] ==</div><div class='add'>+	    EEPROM_REGULATORY_BAND_NO_HT40)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Two additional EEPROM bands for 2.4 and 5 GHz HT40 channels */</div><div class='add'>+	for (band = 6; band &lt;= 7; band++) {</div><div class='add'>+		enum ieee80211_band ieeeband;</div><div class='add'>+</div><div class='add'>+		il_init_band_reference(il, band, &amp;eeprom_ch_count,</div><div class='add'>+				       &amp;eeprom_ch_info, &amp;eeprom_ch_idx);</div><div class='add'>+</div><div class='add'>+		/* EEPROM band 6 is 2.4, band 7 is 5 GHz */</div><div class='add'>+		ieeeband =</div><div class='add'>+		    (band == 6) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;</div><div class='add'>+</div><div class='add'>+		/* Loop through each band adding each of the channels */</div><div class='add'>+		for (ch = 0; ch &lt; eeprom_ch_count; ch++) {</div><div class='add'>+			/* Set up driver's info for lower half */</div><div class='add'>+			il_mod_ht40_chan_info(il, ieeeband, eeprom_ch_idx[ch],</div><div class='add'>+					      &amp;eeprom_ch_info[ch],</div><div class='add'>+					      IEEE80211_CHAN_NO_HT40PLUS);</div><div class='add'>+</div><div class='add'>+			/* Set up driver's info for upper half */</div><div class='add'>+			il_mod_ht40_chan_info(il, ieeeband,</div><div class='add'>+					      eeprom_ch_idx[ch] + 4,</div><div class='add'>+					      &amp;eeprom_ch_info[ch],</div><div class='add'>+					      IEEE80211_CHAN_NO_HT40MINUS);</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(il_init_channel_map);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * il_free_channel_map - undo allocations in il_init_channel_map</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il_free_channel_map(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	kfree(il-&gt;channel_info);</div><div class='add'>+	il-&gt;channel_count = 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_free_channel_map);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_get_channel_info - Find driver's ilate channel info</div><div class='add'>+ *</div><div class='add'>+ * Based on band and channel number.</div><div class='add'>+ */</div><div class='add'>+const struct il_channel_info *</div><div class='add'>+il_get_channel_info(const struct il_priv *il, enum ieee80211_band band,</div><div class='add'>+		    u16 channel)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (band) {</div><div class='add'>+	case IEEE80211_BAND_5GHZ:</div><div class='add'>+		for (i = 14; i &lt; il-&gt;channel_count; i++) {</div><div class='add'>+			if (il-&gt;channel_info[i].channel == channel)</div><div class='add'>+				return &amp;il-&gt;channel_info[i];</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_BAND_2GHZ:</div><div class='add'>+		if (channel &gt;= 1 &amp;&amp; channel &lt;= 14)</div><div class='add'>+			return &amp;il-&gt;channel_info[channel - 1];</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_get_channel_info);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setting power level allows the card to go to sleep when not busy.</div><div class='add'>+ *</div><div class='add'>+ * We calculate a sleep command based on the required latency, which</div><div class='add'>+ * we get from mac80211. In order to handle thermal throttling, we can</div><div class='add'>+ * also use pre-defined power levels.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This defines the old power levels. They are still used by default</div><div class='add'>+ * (level 1) and for thermal throttle (levels 3 through 5)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct il_power_vec_entry {</div><div class='add'>+	struct il_powertable_cmd cmd;</div><div class='add'>+	u8 no_dtim;		/* number of skip dtim */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il_power_sleep_cam_cmd(struct il_priv *il, struct il_powertable_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	memset(cmd, 0, sizeof(*cmd));</div><div class='add'>+</div><div class='add'>+	if (il-&gt;power_data.pci_pm)</div><div class='add'>+		cmd-&gt;flags |= IL_POWER_PCI_PM_MSK;</div><div class='add'>+</div><div class='add'>+	D_POWER("Sleep command for CAM\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il_set_power(struct il_priv *il, struct il_powertable_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	D_POWER("Sending power/sleep command\n");</div><div class='add'>+	D_POWER("Flags value = 0x%08X\n", cmd-&gt;flags);</div><div class='add'>+	D_POWER("Tx timeout = %u\n", le32_to_cpu(cmd-&gt;tx_data_timeout));</div><div class='add'>+	D_POWER("Rx timeout = %u\n", le32_to_cpu(cmd-&gt;rx_data_timeout));</div><div class='add'>+	D_POWER("Sleep interval vector = { %d , %d , %d , %d , %d }\n",</div><div class='add'>+		le32_to_cpu(cmd-&gt;sleep_interval[0]),</div><div class='add'>+		le32_to_cpu(cmd-&gt;sleep_interval[1]),</div><div class='add'>+		le32_to_cpu(cmd-&gt;sleep_interval[2]),</div><div class='add'>+		le32_to_cpu(cmd-&gt;sleep_interval[3]),</div><div class='add'>+		le32_to_cpu(cmd-&gt;sleep_interval[4]));</div><div class='add'>+</div><div class='add'>+	return il_send_cmd_pdu(il, C_POWER_TBL,</div><div class='add'>+			       sizeof(struct il_powertable_cmd), cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_power_set_mode(struct il_priv *il, struct il_powertable_cmd *cmd, bool force)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	bool update_chains;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* Don't update the RX chain when chain noise calibration is running */</div><div class='add'>+	update_chains = il-&gt;chain_noise_data.state == IL_CHAIN_NOISE_DONE ||</div><div class='add'>+	    il-&gt;chain_noise_data.state == IL_CHAIN_NOISE_ALIVE;</div><div class='add'>+</div><div class='add'>+	if (!memcmp(&amp;il-&gt;power_data.sleep_cmd, cmd, sizeof(*cmd)) &amp;&amp; !force)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!il_is_ready_rf(il))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* scan complete use sleep_power_next, need to be updated */</div><div class='add'>+	memcpy(&amp;il-&gt;power_data.sleep_cmd_next, cmd, sizeof(*cmd));</div><div class='add'>+	if (test_bit(S_SCANNING, &amp;il-&gt;status) &amp;&amp; !force) {</div><div class='add'>+		D_INFO("Defer power set mode while scanning\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;flags &amp; IL_POWER_DRIVER_ALLOW_SLEEP_MSK)</div><div class='add'>+		set_bit(S_POWER_PMI, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	ret = il_set_power(il, cmd);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (!(cmd-&gt;flags &amp; IL_POWER_DRIVER_ALLOW_SLEEP_MSK))</div><div class='add'>+			clear_bit(S_POWER_PMI, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+		if (il-&gt;cfg-&gt;ops-&gt;lib-&gt;update_chain_flags &amp;&amp; update_chains)</div><div class='add'>+			il-&gt;cfg-&gt;ops-&gt;lib-&gt;update_chain_flags(il);</div><div class='add'>+		else if (il-&gt;cfg-&gt;ops-&gt;lib-&gt;update_chain_flags)</div><div class='add'>+			D_POWER("Cannot update the power, chain noise "</div><div class='add'>+				"calibration running: %d\n",</div><div class='add'>+				il-&gt;chain_noise_data.state);</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;il-&gt;power_data.sleep_cmd, cmd, sizeof(*cmd));</div><div class='add'>+	} else</div><div class='add'>+		IL_ERR("set power fail, ret = %d", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_power_update_mode(struct il_priv *il, bool force)</div><div class='add'>+{</div><div class='add'>+	struct il_powertable_cmd cmd;</div><div class='add'>+</div><div class='add'>+	il_power_sleep_cam_cmd(il, &amp;cmd);</div><div class='add'>+	return il_power_set_mode(il, &amp;cmd, force);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_power_update_mode);</div><div class='add'>+</div><div class='add'>+/* initialize to default */</div><div class='add'>+void</div><div class='add'>+il_power_initialize(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	u16 lctl = il_pcie_link_ctl(il);</div><div class='add'>+</div><div class='add'>+	il-&gt;power_data.pci_pm = !(lctl &amp; PCI_CFG_LINK_CTRL_VAL_L0S_EN);</div><div class='add'>+</div><div class='add'>+	il-&gt;power_data.debug_sleep_level_override = -1;</div><div class='add'>+</div><div class='add'>+	memset(&amp;il-&gt;power_data.sleep_cmd, 0, sizeof(il-&gt;power_data.sleep_cmd));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_power_initialize);</div><div class='add'>+</div><div class='add'>+/* For active scan, listen ACTIVE_DWELL_TIME (msec) on each channel after</div><div class='add'>+ * sending probe req.  This should be set long enough to hear probe responses</div><div class='add'>+ * from more than one AP.  */</div><div class='add'>+#define IL_ACTIVE_DWELL_TIME_24    (30)	/* all times in msec */</div><div class='add'>+#define IL_ACTIVE_DWELL_TIME_52    (20)</div><div class='add'>+</div><div class='add'>+#define IL_ACTIVE_DWELL_FACTOR_24GHZ (3)</div><div class='add'>+#define IL_ACTIVE_DWELL_FACTOR_52GHZ (2)</div><div class='add'>+</div><div class='add'>+/* For passive scan, listen PASSIVE_DWELL_TIME (msec) on each channel.</div><div class='add'>+ * Must be set longer than active dwell time.</div><div class='add'>+ * For the most reliable scan, set &gt; AP beacon interval (typically 100msec). */</div><div class='add'>+#define IL_PASSIVE_DWELL_TIME_24   (20)	/* all times in msec */</div><div class='add'>+#define IL_PASSIVE_DWELL_TIME_52   (10)</div><div class='add'>+#define IL_PASSIVE_DWELL_BASE      (100)</div><div class='add'>+#define IL_CHANNEL_TUNE_TIME       5</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il_send_scan_abort(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct il_rx_pkt *pkt;</div><div class='add'>+	struct il_host_cmd cmd = {</div><div class='add'>+		.id = C_SCAN_ABORT,</div><div class='add'>+		.flags = CMD_WANT_SKB,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Exit instantly with error when device is not ready</div><div class='add'>+	 * to receive scan abort command or it does not perform</div><div class='add'>+	 * hardware scan currently */</div><div class='add'>+	if (!test_bit(S_READY, &amp;il-&gt;status) ||</div><div class='add'>+	    !test_bit(S_GEO_CONFIGURED, &amp;il-&gt;status) ||</div><div class='add'>+	    !test_bit(S_SCAN_HW, &amp;il-&gt;status) ||</div><div class='add'>+	    test_bit(S_FW_ERROR, &amp;il-&gt;status) ||</div><div class='add'>+	    test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	ret = il_send_cmd_sync(il, &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pkt = (struct il_rx_pkt *)cmd.reply_page;</div><div class='add'>+	if (pkt-&gt;u.status != CAN_ABORT_STATUS) {</div><div class='add'>+		/* The scan abort will return 1 for success or</div><div class='add'>+		 * 2 for "failure".  A failure condition can be</div><div class='add'>+		 * due to simply not being in an active scan which</div><div class='add'>+		 * can occur if we send the scan abort before we</div><div class='add'>+		 * the microcode has notified us that a scan is</div><div class='add'>+		 * completed. */</div><div class='add'>+		D_SCAN("SCAN_ABORT ret %d.\n", pkt-&gt;u.status);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il_free_pages(il, cmd.reply_page);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il_complete_scan(struct il_priv *il, bool aborted)</div><div class='add'>+{</div><div class='add'>+	/* check if scan was requested from mac80211 */</div><div class='add'>+	if (il-&gt;scan_request) {</div><div class='add'>+		D_SCAN("Complete scan in mac80211\n");</div><div class='add'>+		ieee80211_scan_completed(il-&gt;hw, aborted);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il-&gt;scan_vif = NULL;</div><div class='add'>+	il-&gt;scan_request = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_force_scan_end(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(S_SCANNING, &amp;il-&gt;status)) {</div><div class='add'>+		D_SCAN("Forcing scan end while not scanning\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_SCAN("Forcing scan end\n");</div><div class='add'>+	clear_bit(S_SCANNING, &amp;il-&gt;status);</div><div class='add'>+	clear_bit(S_SCAN_HW, &amp;il-&gt;status);</div><div class='add'>+	clear_bit(S_SCAN_ABORTING, &amp;il-&gt;status);</div><div class='add'>+	il_complete_scan(il, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il_do_scan_abort(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(S_SCANNING, &amp;il-&gt;status)) {</div><div class='add'>+		D_SCAN("Not performing scan to abort\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_and_set_bit(S_SCAN_ABORTING, &amp;il-&gt;status)) {</div><div class='add'>+		D_SCAN("Scan abort in progress\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = il_send_scan_abort(il);</div><div class='add'>+	if (ret) {</div><div class='add'>+		D_SCAN("Send scan abort failed %d\n", ret);</div><div class='add'>+		il_force_scan_end(il);</div><div class='add'>+	} else</div><div class='add'>+		D_SCAN("Successfully send scan abort\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_scan_cancel - Cancel any currently executing HW scan</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il_scan_cancel(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	D_SCAN("Queuing abort scan\n");</div><div class='add'>+	queue_work(il-&gt;workqueue, &amp;il-&gt;abort_scan);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_scan_cancel);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_scan_cancel_timeout - Cancel any currently executing HW scan</div><div class='add'>+ * @ms: amount of time to wait (in milliseconds) for scan to abort</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il_scan_cancel_timeout(struct il_priv *il, unsigned long ms)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout = jiffies + msecs_to_jiffies(ms);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	D_SCAN("Scan cancel timeout\n");</div><div class='add'>+</div><div class='add'>+	il_do_scan_abort(il);</div><div class='add'>+</div><div class='add'>+	while (time_before_eq(jiffies, timeout)) {</div><div class='add'>+		if (!test_bit(S_SCAN_HW, &amp;il-&gt;status))</div><div class='add'>+			break;</div><div class='add'>+		msleep(20);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return test_bit(S_SCAN_HW, &amp;il-&gt;status);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_scan_cancel_timeout);</div><div class='add'>+</div><div class='add'>+/* Service response to C_SCAN (0x80) */</div><div class='add'>+static void</div><div class='add'>+il_hdl_scan(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	struct il_scanreq_notification *notif =</div><div class='add'>+	    (struct il_scanreq_notification *)pkt-&gt;u.raw;</div><div class='add'>+</div><div class='add'>+	D_SCAN("Scan request status = 0x%x\n", notif-&gt;status);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Service N_SCAN_START (0x82) */</div><div class='add'>+static void</div><div class='add'>+il_hdl_scan_start(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	struct il_scanstart_notification *notif =</div><div class='add'>+	    (struct il_scanstart_notification *)pkt-&gt;u.raw;</div><div class='add'>+	il-&gt;scan_start_tsf = le32_to_cpu(notif-&gt;tsf_low);</div><div class='add'>+	D_SCAN("Scan start: " "%d [802.11%s] "</div><div class='add'>+	       "(TSF: 0x%08X:%08X) - %d (beacon timer %u)\n", notif-&gt;channel,</div><div class='add'>+	       notif-&gt;band ? "bg" : "a", le32_to_cpu(notif-&gt;tsf_high),</div><div class='add'>+	       le32_to_cpu(notif-&gt;tsf_low), notif-&gt;status, notif-&gt;beacon_timer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Service N_SCAN_RESULTS (0x83) */</div><div class='add'>+static void</div><div class='add'>+il_hdl_scan_results(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	struct il_scanresults_notification *notif =</div><div class='add'>+	    (struct il_scanresults_notification *)pkt-&gt;u.raw;</div><div class='add'>+</div><div class='add'>+	D_SCAN("Scan ch.res: " "%d [802.11%s] " "(TSF: 0x%08X:%08X) - %d "</div><div class='add'>+	       "elapsed=%lu usec\n", notif-&gt;channel, notif-&gt;band ? "bg" : "a",</div><div class='add'>+	       le32_to_cpu(notif-&gt;tsf_high), le32_to_cpu(notif-&gt;tsf_low),</div><div class='add'>+	       le32_to_cpu(notif-&gt;stats[0]),</div><div class='add'>+	       le32_to_cpu(notif-&gt;tsf_low) - il-&gt;scan_start_tsf);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Service N_SCAN_COMPLETE (0x84) */</div><div class='add'>+static void</div><div class='add'>+il_hdl_scan_complete(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	struct il_scancomplete_notification *scan_notif = (void *)pkt-&gt;u.raw;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	D_SCAN("Scan complete: %d channels (TSF 0x%08X:%08X) - %d\n",</div><div class='add'>+	       scan_notif-&gt;scanned_channels, scan_notif-&gt;tsf_low,</div><div class='add'>+	       scan_notif-&gt;tsf_high, scan_notif-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* The HW is no longer scanning */</div><div class='add'>+	clear_bit(S_SCAN_HW, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	D_SCAN("Scan on %sGHz took %dms\n",</div><div class='add'>+	       (il-&gt;scan_band == IEEE80211_BAND_2GHZ) ? "2.4" : "5.2",</div><div class='add'>+	       jiffies_to_msecs(jiffies - il-&gt;scan_start));</div><div class='add'>+</div><div class='add'>+	queue_work(il-&gt;workqueue, &amp;il-&gt;scan_completed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_setup_rx_scan_handlers(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	/* scan handlers */</div><div class='add'>+	il-&gt;handlers[C_SCAN] = il_hdl_scan;</div><div class='add'>+	il-&gt;handlers[N_SCAN_START] = il_hdl_scan_start;</div><div class='add'>+	il-&gt;handlers[N_SCAN_RESULTS] = il_hdl_scan_results;</div><div class='add'>+	il-&gt;handlers[N_SCAN_COMPLETE] = il_hdl_scan_complete;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_setup_rx_scan_handlers);</div><div class='add'>+</div><div class='add'>+inline u16</div><div class='add'>+il_get_active_dwell_time(struct il_priv *il, enum ieee80211_band band,</div><div class='add'>+			 u8 n_probes)</div><div class='add'>+{</div><div class='add'>+	if (band == IEEE80211_BAND_5GHZ)</div><div class='add'>+		return IL_ACTIVE_DWELL_TIME_52 +</div><div class='add'>+		    IL_ACTIVE_DWELL_FACTOR_52GHZ * (n_probes + 1);</div><div class='add'>+	else</div><div class='add'>+		return IL_ACTIVE_DWELL_TIME_24 +</div><div class='add'>+		    IL_ACTIVE_DWELL_FACTOR_24GHZ * (n_probes + 1);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_get_active_dwell_time);</div><div class='add'>+</div><div class='add'>+u16</div><div class='add'>+il_get_passive_dwell_time(struct il_priv *il, enum ieee80211_band band,</div><div class='add'>+			  struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+	u16 value;</div><div class='add'>+</div><div class='add'>+	u16 passive =</div><div class='add'>+	    (band ==</div><div class='add'>+	     IEEE80211_BAND_2GHZ) ? IL_PASSIVE_DWELL_BASE +</div><div class='add'>+	    IL_PASSIVE_DWELL_TIME_24 : IL_PASSIVE_DWELL_BASE +</div><div class='add'>+	    IL_PASSIVE_DWELL_TIME_52;</div><div class='add'>+</div><div class='add'>+	if (il_is_any_associated(il)) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we're associated, we clamp the maximum passive</div><div class='add'>+		 * dwell time to be 98% of the smallest beacon interval</div><div class='add'>+		 * (minus 2 * channel tune time)</div><div class='add'>+		 */</div><div class='add'>+		value = ctx-&gt;vif ? ctx-&gt;vif-&gt;bss_conf.beacon_int : 0;</div><div class='add'>+		if (value &gt; IL_PASSIVE_DWELL_BASE || !value)</div><div class='add'>+			value = IL_PASSIVE_DWELL_BASE;</div><div class='add'>+		value = (value * 98) / 100 - IL_CHANNEL_TUNE_TIME * 2;</div><div class='add'>+		passive = min(value, passive);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return passive;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_get_passive_dwell_time);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_init_scan_params(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	u8 ant_idx = fls(il-&gt;hw_params.valid_tx_ant) - 1;</div><div class='add'>+	if (!il-&gt;scan_tx_ant[IEEE80211_BAND_5GHZ])</div><div class='add'>+		il-&gt;scan_tx_ant[IEEE80211_BAND_5GHZ] = ant_idx;</div><div class='add'>+	if (!il-&gt;scan_tx_ant[IEEE80211_BAND_2GHZ])</div><div class='add'>+		il-&gt;scan_tx_ant[IEEE80211_BAND_2GHZ] = ant_idx;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_init_scan_params);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il_scan_initiate(struct il_priv *il, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!il-&gt;cfg-&gt;ops-&gt;utils-&gt;request_scan))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work(&amp;il-&gt;scan_check);</div><div class='add'>+</div><div class='add'>+	if (!il_is_ready_rf(il)) {</div><div class='add'>+		IL_WARN("Request scan called when driver not ready.\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_SCAN_HW, &amp;il-&gt;status)) {</div><div class='add'>+		D_SCAN("Multiple concurrent scan requests in parallel.\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_SCAN_ABORTING, &amp;il-&gt;status)) {</div><div class='add'>+		D_SCAN("Scan request while abort pending.\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_SCAN("Starting scan...\n");</div><div class='add'>+</div><div class='add'>+	set_bit(S_SCANNING, &amp;il-&gt;status);</div><div class='add'>+	il-&gt;scan_start = jiffies;</div><div class='add'>+</div><div class='add'>+	ret = il-&gt;cfg-&gt;ops-&gt;utils-&gt;request_scan(il, vif);</div><div class='add'>+	if (ret) {</div><div class='add'>+		clear_bit(S_SCANNING, &amp;il-&gt;status);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	queue_delayed_work(il-&gt;workqueue, &amp;il-&gt;scan_check,</div><div class='add'>+			   IL_SCAN_CHECK_WATCHDOG);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_mac_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+	       struct cfg80211_scan_request *req)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	D_MAC80211("enter\n");</div><div class='add'>+</div><div class='add'>+	if (req-&gt;n_channels == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_SCANNING, &amp;il-&gt;status)) {</div><div class='add'>+		D_SCAN("Scan already in progress.\n");</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* mac80211 will only ask for one band at a time */</div><div class='add'>+	il-&gt;scan_request = req;</div><div class='add'>+	il-&gt;scan_vif = vif;</div><div class='add'>+	il-&gt;scan_band = req-&gt;channels[0]-&gt;band;</div><div class='add'>+</div><div class='add'>+	ret = il_scan_initiate(il, vif);</div><div class='add'>+</div><div class='add'>+	D_MAC80211("leave\n");</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_mac_hw_scan);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il_bg_scan_check(struct work_struct *data)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il =</div><div class='add'>+	    container_of(data, struct il_priv, scan_check.work);</div><div class='add'>+</div><div class='add'>+	D_SCAN("Scan check work\n");</div><div class='add'>+</div><div class='add'>+	/* Since we are here firmware does not finish scan and</div><div class='add'>+	 * most likely is in bad shape, so we don't bother to</div><div class='add'>+	 * send abort command, just force scan complete to mac80211 */</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	il_force_scan_end(il);</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_fill_probe_req - fill in all required fields and IE for probe request</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+u16</div><div class='add'>+il_fill_probe_req(struct il_priv *il, struct ieee80211_mgmt *frame,</div><div class='add'>+		  const u8 *ta, const u8 *ies, int ie_len, int left)</div><div class='add'>+{</div><div class='add'>+	int len = 0;</div><div class='add'>+	u8 *pos = NULL;</div><div class='add'>+</div><div class='add'>+	/* Make sure there is enough space for the probe request,</div><div class='add'>+	 * two mandatory IEs and the data */</div><div class='add'>+	left -= 24;</div><div class='add'>+	if (left &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	frame-&gt;frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ);</div><div class='add'>+	memcpy(frame-&gt;da, il_bcast_addr, ETH_ALEN);</div><div class='add'>+	memcpy(frame-&gt;sa, ta, ETH_ALEN);</div><div class='add'>+	memcpy(frame-&gt;bssid, il_bcast_addr, ETH_ALEN);</div><div class='add'>+	frame-&gt;seq_ctrl = 0;</div><div class='add'>+</div><div class='add'>+	len += 24;</div><div class='add'>+</div><div class='add'>+	/* ...next IE... */</div><div class='add'>+	pos = &amp;frame-&gt;u.probe_req.variable[0];</div><div class='add'>+</div><div class='add'>+	/* fill in our indirect SSID IE */</div><div class='add'>+	left -= 2;</div><div class='add'>+	if (left &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+	*pos++ = WLAN_EID_SSID;</div><div class='add'>+	*pos++ = 0;</div><div class='add'>+</div><div class='add'>+	len += 2;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(left &lt; ie_len))</div><div class='add'>+		return len;</div><div class='add'>+</div><div class='add'>+	if (ies &amp;&amp; ie_len) {</div><div class='add'>+		memcpy(pos, ies, ie_len);</div><div class='add'>+		len += ie_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (u16) len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_fill_probe_req);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il_bg_abort_scan(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = container_of(work, struct il_priv, abort_scan);</div><div class='add'>+</div><div class='add'>+	D_SCAN("Abort scan work\n");</div><div class='add'>+</div><div class='add'>+	/* We keep scan_check work queued in case when firmware will not</div><div class='add'>+	 * report back scan completed notification */</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	il_scan_cancel_timeout(il, 200);</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il_bg_scan_completed(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = container_of(work, struct il_priv, scan_completed);</div><div class='add'>+	bool aborted;</div><div class='add'>+</div><div class='add'>+	D_SCAN("Completed scan.\n");</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work(&amp;il-&gt;scan_check);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	aborted = test_and_clear_bit(S_SCAN_ABORTING, &amp;il-&gt;status);</div><div class='add'>+	if (aborted)</div><div class='add'>+		D_SCAN("Aborted scan completed.\n");</div><div class='add'>+</div><div class='add'>+	if (!test_and_clear_bit(S_SCANNING, &amp;il-&gt;status)) {</div><div class='add'>+		D_SCAN("Scan already completed.\n");</div><div class='add'>+		goto out_settings;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il_complete_scan(il, aborted);</div><div class='add'>+</div><div class='add'>+out_settings:</div><div class='add'>+	/* Can we still talk to firmware ? */</div><div class='add'>+	if (!il_is_ready_rf(il))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We do not commit power settings while scan is pending,</div><div class='add'>+	 * do it now if the settings changed.</div><div class='add'>+	 */</div><div class='add'>+	il_power_set_mode(il, &amp;il-&gt;power_data.sleep_cmd_next, false);</div><div class='add'>+	il_set_tx_power(il, il-&gt;tx_power_next, false);</div><div class='add'>+</div><div class='add'>+	il-&gt;cfg-&gt;ops-&gt;utils-&gt;post_scan(il);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_setup_scan_deferred_work(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	INIT_WORK(&amp;il-&gt;scan_completed, il_bg_scan_completed);</div><div class='add'>+	INIT_WORK(&amp;il-&gt;abort_scan, il_bg_abort_scan);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;il-&gt;scan_check, il_bg_scan_check);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_setup_scan_deferred_work);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_cancel_scan_deferred_work(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	cancel_work_sync(&amp;il-&gt;abort_scan);</div><div class='add'>+	cancel_work_sync(&amp;il-&gt;scan_completed);</div><div class='add'>+</div><div class='add'>+	if (cancel_delayed_work_sync(&amp;il-&gt;scan_check)) {</div><div class='add'>+		mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+		il_force_scan_end(il);</div><div class='add'>+		mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_cancel_scan_deferred_work);</div><div class='add'>+</div><div class='add'>+/* il-&gt;sta_lock must be held */</div><div class='add'>+static void</div><div class='add'>+il_sta_ucode_activate(struct il_priv *il, u8 sta_id)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (!(il-&gt;stations[sta_id].used &amp; IL_STA_DRIVER_ACTIVE))</div><div class='add'>+		IL_ERR("ACTIVATE a non DRIVER active station id %u addr %pM\n",</div><div class='add'>+		       sta_id, il-&gt;stations[sta_id].sta.sta.addr);</div><div class='add'>+</div><div class='add'>+	if (il-&gt;stations[sta_id].used &amp; IL_STA_UCODE_ACTIVE) {</div><div class='add'>+		D_ASSOC("STA id %u addr %pM already present"</div><div class='add'>+			" in uCode (according to driver)\n", sta_id,</div><div class='add'>+			il-&gt;stations[sta_id].sta.sta.addr);</div><div class='add'>+	} else {</div><div class='add'>+		il-&gt;stations[sta_id].used |= IL_STA_UCODE_ACTIVE;</div><div class='add'>+		D_ASSOC("Added STA id %u addr %pM to uCode\n", sta_id,</div><div class='add'>+			il-&gt;stations[sta_id].sta.sta.addr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il_process_add_sta_resp(struct il_priv *il, struct il_addsta_cmd *addsta,</div><div class='add'>+			struct il_rx_pkt *pkt, bool sync)</div><div class='add'>+{</div><div class='add'>+	u8 sta_id = addsta-&gt;sta.sta_id;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = -EIO;</div><div class='add'>+</div><div class='add'>+	if (pkt-&gt;hdr.flags &amp; IL_CMD_FAILED_MSK) {</div><div class='add'>+		IL_ERR("Bad return from C_ADD_STA (0x%08X)\n", pkt-&gt;hdr.flags);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_INFO("Processing response for adding station %u\n", sta_id);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	switch (pkt-&gt;u.add_sta.status) {</div><div class='add'>+	case ADD_STA_SUCCESS_MSK:</div><div class='add'>+		D_INFO("C_ADD_STA PASSED\n");</div><div class='add'>+		il_sta_ucode_activate(il, sta_id);</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	case ADD_STA_NO_ROOM_IN_TBL:</div><div class='add'>+		IL_ERR("Adding station %d failed, no room in table.\n", sta_id);</div><div class='add'>+		break;</div><div class='add'>+	case ADD_STA_NO_BLOCK_ACK_RESOURCE:</div><div class='add'>+		IL_ERR("Adding station %d failed, no block ack resource.\n",</div><div class='add'>+		       sta_id);</div><div class='add'>+		break;</div><div class='add'>+	case ADD_STA_MODIFY_NON_EXIST_STA:</div><div class='add'>+		IL_ERR("Attempting to modify non-existing station %d\n",</div><div class='add'>+		       sta_id);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		D_ASSOC("Received C_ADD_STA:(0x%08X)\n", pkt-&gt;u.add_sta.status);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_INFO("%s station id %u addr %pM\n",</div><div class='add'>+	       il-&gt;stations[sta_id].sta.mode ==</div><div class='add'>+	       STA_CONTROL_MODIFY_MSK ? "Modified" : "Added", sta_id,</div><div class='add'>+	       il-&gt;stations[sta_id].sta.sta.addr);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * XXX: The MAC address in the command buffer is often changed from</div><div class='add'>+	 * the original sent to the device. That is, the MAC address</div><div class='add'>+	 * written to the command buffer often is not the same MAC address</div><div class='add'>+	 * read from the command buffer when the command returns. This</div><div class='add'>+	 * issue has not yet been resolved and this debugging is left to</div><div class='add'>+	 * observe the problem.</div><div class='add'>+	 */</div><div class='add'>+	D_INFO("%s station according to cmd buffer %pM\n",</div><div class='add'>+	       il-&gt;stations[sta_id].sta.mode ==</div><div class='add'>+	       STA_CONTROL_MODIFY_MSK ? "Modified" : "Added", addsta-&gt;sta.addr);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_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 void</div><div class='add'>+il_add_sta_callback(struct il_priv *il, struct il_device_cmd *cmd,</div><div class='add'>+		    struct il_rx_pkt *pkt)</div><div class='add'>+{</div><div class='add'>+	struct il_addsta_cmd *addsta = (struct il_addsta_cmd *)cmd-&gt;cmd.payload;</div><div class='add'>+</div><div class='add'>+	il_process_add_sta_resp(il, addsta, pkt, false);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_send_add_sta(struct il_priv *il, struct il_addsta_cmd *sta, u8 flags)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = NULL;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u8 data[sizeof(*sta)];</div><div class='add'>+	struct il_host_cmd cmd = {</div><div class='add'>+		.id = C_ADD_STA,</div><div class='add'>+		.flags = flags,</div><div class='add'>+		.data = data,</div><div class='add'>+	};</div><div class='add'>+	u8 sta_id __maybe_unused = sta-&gt;sta.sta_id;</div><div class='add'>+</div><div class='add'>+	D_INFO("Adding sta %u (%pM) %ssynchronously\n", sta_id, sta-&gt;sta.addr,</div><div class='add'>+	       flags &amp; CMD_ASYNC ? "a" : "");</div><div class='add'>+</div><div class='add'>+	if (flags &amp; CMD_ASYNC)</div><div class='add'>+		cmd.callback = il_add_sta_callback;</div><div class='add'>+	else {</div><div class='add'>+		cmd.flags |= CMD_WANT_SKB;</div><div class='add'>+		might_sleep();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd.len = il-&gt;cfg-&gt;ops-&gt;utils-&gt;build_addsta_hcmd(sta, data);</div><div class='add'>+	ret = il_send_cmd(il, &amp;cmd);</div><div class='add'>+</div><div class='add'>+	if (ret || (flags &amp; CMD_ASYNC))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		pkt = (struct il_rx_pkt *)cmd.reply_page;</div><div class='add'>+		ret = il_process_add_sta_resp(il, sta, pkt, true);</div><div class='add'>+	}</div><div class='add'>+	il_free_pages(il, cmd.reply_page);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_send_add_sta);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il_set_ht_add_station(struct il_priv *il, u8 idx, struct ieee80211_sta *sta,</div><div class='add'>+		      struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_sta_ht_cap *sta_ht_inf = &amp;sta-&gt;ht_cap;</div><div class='add'>+	__le32 sta_flags;</div><div class='add'>+	u8 mimo_ps_mode;</div><div class='add'>+</div><div class='add'>+	if (!sta || !sta_ht_inf-&gt;ht_supported)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	mimo_ps_mode = (sta_ht_inf-&gt;cap &amp; IEEE80211_HT_CAP_SM_PS) &gt;&gt; 2;</div><div class='add'>+	D_ASSOC("spatial multiplexing power save mode: %s\n",</div><div class='add'>+		(mimo_ps_mode == WLAN_HT_CAP_SM_PS_STATIC) ? "static" :</div><div class='add'>+		(mimo_ps_mode == WLAN_HT_CAP_SM_PS_DYNAMIC) ? "dynamic" :</div><div class='add'>+		"disabled");</div><div class='add'>+</div><div class='add'>+	sta_flags = il-&gt;stations[idx].sta.station_flags;</div><div class='add'>+</div><div class='add'>+	sta_flags &amp;= ~(STA_FLG_RTS_MIMO_PROT_MSK | STA_FLG_MIMO_DIS_MSK);</div><div class='add'>+</div><div class='add'>+	switch (mimo_ps_mode) {</div><div class='add'>+	case WLAN_HT_CAP_SM_PS_STATIC:</div><div class='add'>+		sta_flags |= STA_FLG_MIMO_DIS_MSK;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_HT_CAP_SM_PS_DYNAMIC:</div><div class='add'>+		sta_flags |= STA_FLG_RTS_MIMO_PROT_MSK;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_HT_CAP_SM_PS_DISABLED:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		IL_WARN("Invalid MIMO PS mode %d\n", mimo_ps_mode);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sta_flags |=</div><div class='add'>+	    cpu_to_le32((u32) sta_ht_inf-&gt;</div><div class='add'>+			ampdu_factor &lt;&lt; STA_FLG_MAX_AGG_SIZE_POS);</div><div class='add'>+</div><div class='add'>+	sta_flags |=</div><div class='add'>+	    cpu_to_le32((u32) sta_ht_inf-&gt;</div><div class='add'>+			ampdu_density &lt;&lt; STA_FLG_AGG_MPDU_DENSITY_POS);</div><div class='add'>+</div><div class='add'>+	if (il_is_ht40_tx_allowed(il, ctx, &amp;sta-&gt;ht_cap))</div><div class='add'>+		sta_flags |= STA_FLG_HT40_EN_MSK;</div><div class='add'>+	else</div><div class='add'>+		sta_flags &amp;= ~STA_FLG_HT40_EN_MSK;</div><div class='add'>+</div><div class='add'>+	il-&gt;stations[idx].sta.station_flags = sta_flags;</div><div class='add'>+done:</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_prep_station - Prepare station information for addition</div><div class='add'>+ *</div><div class='add'>+ * should be called with sta_lock held</div><div class='add'>+ */</div><div class='add'>+u8</div><div class='add'>+il_prep_station(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+		const u8 *addr, bool is_ap, struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct il_station_entry *station;</div><div class='add'>+	int i;</div><div class='add'>+	u8 sta_id = IL_INVALID_STATION;</div><div class='add'>+	u16 rate;</div><div class='add'>+</div><div class='add'>+	if (is_ap)</div><div class='add'>+		sta_id = ctx-&gt;ap_sta_id;</div><div class='add'>+	else if (is_broadcast_ether_addr(addr))</div><div class='add'>+		sta_id = ctx-&gt;bcast_sta_id;</div><div class='add'>+	else</div><div class='add'>+		for (i = IL_STA_ID; i &lt; il-&gt;hw_params.max_stations; i++) {</div><div class='add'>+			if (!compare_ether_addr</div><div class='add'>+			    (il-&gt;stations[i].sta.sta.addr, addr)) {</div><div class='add'>+				sta_id = i;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!il-&gt;stations[i].used &amp;&amp;</div><div class='add'>+			    sta_id == IL_INVALID_STATION)</div><div class='add'>+				sta_id = i;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * These two conditions have the same outcome, but keep them</div><div class='add'>+	 * separate</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(sta_id == IL_INVALID_STATION))</div><div class='add'>+		return sta_id;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * uCode is not able to deal with multiple requests to add a</div><div class='add'>+	 * station. Keep track if one is in progress so that we do not send</div><div class='add'>+	 * another.</div><div class='add'>+	 */</div><div class='add'>+	if (il-&gt;stations[sta_id].used &amp; IL_STA_UCODE_INPROGRESS) {</div><div class='add'>+		D_INFO("STA %d already in process of being added.\n", sta_id);</div><div class='add'>+		return sta_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((il-&gt;stations[sta_id].used &amp; IL_STA_DRIVER_ACTIVE) &amp;&amp;</div><div class='add'>+	    (il-&gt;stations[sta_id].used &amp; IL_STA_UCODE_ACTIVE) &amp;&amp;</div><div class='add'>+	    !compare_ether_addr(il-&gt;stations[sta_id].sta.sta.addr, addr)) {</div><div class='add'>+		D_ASSOC("STA %d (%pM) already added, not adding again.\n",</div><div class='add'>+			sta_id, addr);</div><div class='add'>+		return sta_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	station = &amp;il-&gt;stations[sta_id];</div><div class='add'>+	station-&gt;used = IL_STA_DRIVER_ACTIVE;</div><div class='add'>+	D_ASSOC("Add STA to driver ID %d: %pM\n", sta_id, addr);</div><div class='add'>+	il-&gt;num_stations++;</div><div class='add'>+</div><div class='add'>+	/* Set up the C_ADD_STA command to send to device */</div><div class='add'>+	memset(&amp;station-&gt;sta, 0, sizeof(struct il_addsta_cmd));</div><div class='add'>+	memcpy(station-&gt;sta.sta.addr, addr, ETH_ALEN);</div><div class='add'>+	station-&gt;sta.mode = 0;</div><div class='add'>+	station-&gt;sta.sta.sta_id = sta_id;</div><div class='add'>+	station-&gt;sta.station_flags = ctx-&gt;station_flags;</div><div class='add'>+	station-&gt;ctxid = ctx-&gt;ctxid;</div><div class='add'>+</div><div class='add'>+	if (sta) {</div><div class='add'>+		struct il_station_priv_common *sta_priv;</div><div class='add'>+</div><div class='add'>+		sta_priv = (void *)sta-&gt;drv_priv;</div><div class='add'>+		sta_priv-&gt;ctx = ctx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * OK to call unconditionally, since local stations (IBSS BSSID</div><div class='add'>+	 * STA and broadcast STA) pass in a NULL sta, and mac80211</div><div class='add'>+	 * doesn't allow HT IBSS.</div><div class='add'>+	 */</div><div class='add'>+	il_set_ht_add_station(il, sta_id, sta, ctx);</div><div class='add'>+</div><div class='add'>+	/* 3945 only */</div><div class='add'>+	rate = (il-&gt;band == IEEE80211_BAND_5GHZ) ? RATE_6M_PLCP : RATE_1M_PLCP;</div><div class='add'>+	/* Turn on both antennas for the station... */</div><div class='add'>+	station-&gt;sta.rate_n_flags = cpu_to_le16(rate | RATE_MCS_ANT_AB_MSK);</div><div class='add'>+</div><div class='add'>+	return sta_id;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(il_prep_station);</div><div class='add'>+</div><div class='add'>+#define STA_WAIT_TIMEOUT (HZ/2)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_add_station_common -</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il_add_station_common(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+		      const u8 *addr, bool is_ap, struct ieee80211_sta *sta,</div><div class='add'>+		      u8 *sta_id_r)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags_spin;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+	struct il_addsta_cmd sta_cmd;</div><div class='add'>+</div><div class='add'>+	*sta_id_r = 0;</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+	sta_id = il_prep_station(il, ctx, addr, is_ap, sta);</div><div class='add'>+	if (sta_id == IL_INVALID_STATION) {</div><div class='add'>+		IL_ERR("Unable to prepare station %pM for addition\n", addr);</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * uCode is not able to deal with multiple requests to add a</div><div class='add'>+	 * station. Keep track if one is in progress so that we do not send</div><div class='add'>+	 * another.</div><div class='add'>+	 */</div><div class='add'>+	if (il-&gt;stations[sta_id].used &amp; IL_STA_UCODE_INPROGRESS) {</div><div class='add'>+		D_INFO("STA %d already in process of being added.\n", sta_id);</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((il-&gt;stations[sta_id].used &amp; IL_STA_DRIVER_ACTIVE) &amp;&amp;</div><div class='add'>+	    (il-&gt;stations[sta_id].used &amp; IL_STA_UCODE_ACTIVE)) {</div><div class='add'>+		D_ASSOC("STA %d (%pM) already added, not adding again.\n",</div><div class='add'>+			sta_id, addr);</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il-&gt;stations[sta_id].used |= IL_STA_UCODE_INPROGRESS;</div><div class='add'>+	memcpy(&amp;sta_cmd, &amp;il-&gt;stations[sta_id].sta,</div><div class='add'>+	       sizeof(struct il_addsta_cmd));</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+</div><div class='add'>+	/* Add station to device's station table */</div><div class='add'>+	ret = il_send_add_sta(il, &amp;sta_cmd, CMD_SYNC);</div><div class='add'>+	if (ret) {</div><div class='add'>+		spin_lock_irqsave(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+		IL_ERR("Adding station %pM failed.\n",</div><div class='add'>+		       il-&gt;stations[sta_id].sta.sta.addr);</div><div class='add'>+		il-&gt;stations[sta_id].used &amp;= ~IL_STA_DRIVER_ACTIVE;</div><div class='add'>+		il-&gt;stations[sta_id].used &amp;= ~IL_STA_UCODE_INPROGRESS;</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+	}</div><div class='add'>+	*sta_id_r = sta_id;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_add_station_common);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_sta_ucode_deactivate - deactivate ucode status for a station</div><div class='add'>+ *</div><div class='add'>+ * il-&gt;sta_lock must be held</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il_sta_ucode_deactivate(struct il_priv *il, u8 sta_id)</div><div class='add'>+{</div><div class='add'>+	/* Ucode must be active and driver must be non active */</div><div class='add'>+	if ((il-&gt;stations[sta_id].</div><div class='add'>+	     used &amp; (IL_STA_UCODE_ACTIVE | IL_STA_DRIVER_ACTIVE)) !=</div><div class='add'>+	    IL_STA_UCODE_ACTIVE)</div><div class='add'>+		IL_ERR("removed non active STA %u\n", sta_id);</div><div class='add'>+</div><div class='add'>+	il-&gt;stations[sta_id].used &amp;= ~IL_STA_UCODE_ACTIVE;</div><div class='add'>+</div><div class='add'>+	memset(&amp;il-&gt;stations[sta_id], 0, sizeof(struct il_station_entry));</div><div class='add'>+	D_ASSOC("Removed STA %u\n", sta_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il_send_remove_station(struct il_priv *il, const u8 * addr, int sta_id,</div><div class='add'>+		       bool temporary)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	unsigned long flags_spin;</div><div class='add'>+	struct il_rem_sta_cmd rm_sta_cmd;</div><div class='add'>+</div><div class='add'>+	struct il_host_cmd cmd = {</div><div class='add'>+		.id = C_REM_STA,</div><div class='add'>+		.len = sizeof(struct il_rem_sta_cmd),</div><div class='add'>+		.flags = CMD_SYNC,</div><div class='add'>+		.data = &amp;rm_sta_cmd,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memset(&amp;rm_sta_cmd, 0, sizeof(rm_sta_cmd));</div><div class='add'>+	rm_sta_cmd.num_sta = 1;</div><div class='add'>+	memcpy(&amp;rm_sta_cmd.addr, addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	cmd.flags |= CMD_WANT_SKB;</div><div class='add'>+</div><div class='add'>+	ret = il_send_cmd(il, &amp;cmd);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pkt = (struct il_rx_pkt *)cmd.reply_page;</div><div class='add'>+	if (pkt-&gt;hdr.flags &amp; IL_CMD_FAILED_MSK) {</div><div class='add'>+		IL_ERR("Bad return from C_REM_STA (0x%08X)\n", pkt-&gt;hdr.flags);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ret) {</div><div class='add'>+		switch (pkt-&gt;u.rem_sta.status) {</div><div class='add'>+		case REM_STA_SUCCESS_MSK:</div><div class='add'>+			if (!temporary) {</div><div class='add'>+				spin_lock_irqsave(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+				il_sta_ucode_deactivate(il, sta_id);</div><div class='add'>+				spin_unlock_irqrestore(&amp;il-&gt;sta_lock,</div><div class='add'>+						       flags_spin);</div><div class='add'>+			}</div><div class='add'>+			D_ASSOC("C_REM_STA PASSED\n");</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			IL_ERR("C_REM_STA failed\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	il_free_pages(il, cmd.reply_page);</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'>+ * il_remove_station - Remove driver's knowledge of station.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il_remove_station(struct il_priv *il, const u8 sta_id, const u8 * addr)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!il_is_ready(il)) {</div><div class='add'>+		D_INFO("Unable to remove station %pM, device not ready.\n",</div><div class='add'>+		       addr);</div><div class='add'>+		/*</div><div class='add'>+		 * It is typical for stations to be removed when we are</div><div class='add'>+		 * going down. Return success since device will be down</div><div class='add'>+		 * soon anyway</div><div class='add'>+		 */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_ASSOC("Removing STA from driver:%d  %pM\n", sta_id, addr);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(sta_id == IL_INVALID_STATION))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (!(il-&gt;stations[sta_id].used &amp; IL_STA_DRIVER_ACTIVE)) {</div><div class='add'>+		D_INFO("Removing %pM but non DRIVER active\n", addr);</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(il-&gt;stations[sta_id].used &amp; IL_STA_UCODE_ACTIVE)) {</div><div class='add'>+		D_INFO("Removing %pM but non UCODE active\n", addr);</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (il-&gt;stations[sta_id].used &amp; IL_STA_LOCAL) {</div><div class='add'>+		kfree(il-&gt;stations[sta_id].lq);</div><div class='add'>+		il-&gt;stations[sta_id].lq = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il-&gt;stations[sta_id].used &amp;= ~IL_STA_DRIVER_ACTIVE;</div><div class='add'>+</div><div class='add'>+	il-&gt;num_stations--;</div><div class='add'>+</div><div class='add'>+	BUG_ON(il-&gt;num_stations &lt; 0);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	return il_send_remove_station(il, addr, sta_id, false);</div><div class='add'>+out_err:</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(il_remove_station);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_clear_ucode_stations - clear ucode station table bits</div><div class='add'>+ *</div><div class='add'>+ * This function clears all the bits in the driver indicating</div><div class='add'>+ * which stations are active in the ucode. Call when something</div><div class='add'>+ * other than explicit station management would cause this in</div><div class='add'>+ * the ucode, e.g. unassociated RXON.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il_clear_ucode_stations(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned long flags_spin;</div><div class='add'>+	bool cleared = false;</div><div class='add'>+</div><div class='add'>+	D_INFO("Clearing ucode stations in driver\n");</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+	for (i = 0; i &lt; il-&gt;hw_params.max_stations; i++) {</div><div class='add'>+		if (ctx &amp;&amp; ctx-&gt;ctxid != il-&gt;stations[i].ctxid)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (il-&gt;stations[i].used &amp; IL_STA_UCODE_ACTIVE) {</div><div class='add'>+			D_INFO("Clearing ucode active for station %d\n", i);</div><div class='add'>+			il-&gt;stations[i].used &amp;= ~IL_STA_UCODE_ACTIVE;</div><div class='add'>+			cleared = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+</div><div class='add'>+	if (!cleared)</div><div class='add'>+		D_INFO("No active stations found to be cleared\n");</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_clear_ucode_stations);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_restore_stations() - Restore driver known stations to device</div><div class='add'>+ *</div><div class='add'>+ * All stations considered active by driver, but not present in ucode, is</div><div class='add'>+ * restored.</div><div class='add'>+ *</div><div class='add'>+ * Function sleeps.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il_restore_stations(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct il_addsta_cmd sta_cmd;</div><div class='add'>+	struct il_link_quality_cmd lq;</div><div class='add'>+	unsigned long flags_spin;</div><div class='add'>+	int i;</div><div class='add'>+	bool found = false;</div><div class='add'>+	int ret;</div><div class='add'>+	bool send_lq;</div><div class='add'>+</div><div class='add'>+	if (!il_is_ready(il)) {</div><div class='add'>+		D_INFO("Not ready yet, not restoring any stations.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_ASSOC("Restoring all known stations ... start.\n");</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+	for (i = 0; i &lt; il-&gt;hw_params.max_stations; i++) {</div><div class='add'>+		if (ctx-&gt;ctxid != il-&gt;stations[i].ctxid)</div><div class='add'>+			continue;</div><div class='add'>+		if ((il-&gt;stations[i].used &amp; IL_STA_DRIVER_ACTIVE) &amp;&amp;</div><div class='add'>+		    !(il-&gt;stations[i].used &amp; IL_STA_UCODE_ACTIVE)) {</div><div class='add'>+			D_ASSOC("Restoring sta %pM\n",</div><div class='add'>+				il-&gt;stations[i].sta.sta.addr);</div><div class='add'>+			il-&gt;stations[i].sta.mode = 0;</div><div class='add'>+			il-&gt;stations[i].used |= IL_STA_UCODE_INPROGRESS;</div><div class='add'>+			found = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; il-&gt;hw_params.max_stations; i++) {</div><div class='add'>+		if ((il-&gt;stations[i].used &amp; IL_STA_UCODE_INPROGRESS)) {</div><div class='add'>+			memcpy(&amp;sta_cmd, &amp;il-&gt;stations[i].sta,</div><div class='add'>+			       sizeof(struct il_addsta_cmd));</div><div class='add'>+			send_lq = false;</div><div class='add'>+			if (il-&gt;stations[i].lq) {</div><div class='add'>+				memcpy(&amp;lq, il-&gt;stations[i].lq,</div><div class='add'>+				       sizeof(struct il_link_quality_cmd));</div><div class='add'>+				send_lq = true;</div><div class='add'>+			}</div><div class='add'>+			spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+			ret = il_send_add_sta(il, &amp;sta_cmd, CMD_SYNC);</div><div class='add'>+			if (ret) {</div><div class='add'>+				spin_lock_irqsave(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+				IL_ERR("Adding station %pM failed.\n",</div><div class='add'>+				       il-&gt;stations[i].sta.sta.addr);</div><div class='add'>+				il-&gt;stations[i].used &amp;= ~IL_STA_DRIVER_ACTIVE;</div><div class='add'>+				il-&gt;stations[i].used &amp;=</div><div class='add'>+				    ~IL_STA_UCODE_INPROGRESS;</div><div class='add'>+				spin_unlock_irqrestore(&amp;il-&gt;sta_lock,</div><div class='add'>+						       flags_spin);</div><div class='add'>+			}</div><div class='add'>+			/*</div><div class='add'>+			 * Rate scaling has already been initialized, send</div><div class='add'>+			 * current LQ command</div><div class='add'>+			 */</div><div class='add'>+			if (send_lq)</div><div class='add'>+				il_send_lq_cmd(il, ctx, &amp;lq, CMD_SYNC, true);</div><div class='add'>+			spin_lock_irqsave(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+			il-&gt;stations[i].used &amp;= ~IL_STA_UCODE_INPROGRESS;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+	if (!found)</div><div class='add'>+		D_INFO("Restoring all known stations"</div><div class='add'>+		       " .... no stations to be restored.\n");</div><div class='add'>+	else</div><div class='add'>+		D_INFO("Restoring all known stations" " .... complete.\n");</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_restore_stations);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_get_free_ucode_key_idx(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; il-&gt;sta_key_max_num; i++)</div><div class='add'>+		if (!test_and_set_bit(i, &amp;il-&gt;ucode_key_table))</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+	return WEP_INVALID_OFFSET;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_get_free_ucode_key_idx);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_dealloc_bcast_stations(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	for (i = 0; i &lt; il-&gt;hw_params.max_stations; i++) {</div><div class='add'>+		if (!(il-&gt;stations[i].used &amp; IL_STA_BCAST))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		il-&gt;stations[i].used &amp;= ~IL_STA_UCODE_ACTIVE;</div><div class='add'>+		il-&gt;num_stations--;</div><div class='add'>+		BUG_ON(il-&gt;num_stations &lt; 0);</div><div class='add'>+		kfree(il-&gt;stations[i].lq);</div><div class='add'>+		il-&gt;stations[i].lq = NULL;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(il_dealloc_bcast_stations);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+static void</div><div class='add'>+il_dump_lq_cmd(struct il_priv *il, struct il_link_quality_cmd *lq)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	D_RATE("lq station id 0x%x\n", lq-&gt;sta_id);</div><div class='add'>+	D_RATE("lq ant 0x%X 0x%X\n", lq-&gt;general_params.single_stream_ant_msk,</div><div class='add'>+	       lq-&gt;general_params.dual_stream_ant_msk);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; LINK_QUAL_MAX_RETRY_NUM; i++)</div><div class='add'>+		D_RATE("lq idx %d 0x%X\n", i, lq-&gt;rs_table[i].rate_n_flags);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void</div><div class='add'>+il_dump_lq_cmd(struct il_priv *il, struct il_link_quality_cmd *lq)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_is_lq_table_valid() - Test one aspect of LQ cmd for validity</div><div class='add'>+ *</div><div class='add'>+ * It sometimes happens when a HT rate has been in use and we</div><div class='add'>+ * loose connectivity with AP then mac80211 will first tell us that the</div><div class='add'>+ * current channel is not HT anymore before removing the station. In such a</div><div class='add'>+ * scenario the RXON flags will be updated to indicate we are not</div><div class='add'>+ * communicating HT anymore, but the LQ command may still contain HT rates.</div><div class='add'>+ * Test for this to prevent driver from sending LQ command between the time</div><div class='add'>+ * RXON flags are updated and when LQ command is updated.</div><div class='add'>+ */</div><div class='add'>+static bool</div><div class='add'>+il_is_lq_table_valid(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+		     struct il_link_quality_cmd *lq)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;ht.enabled)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	D_INFO("Channel %u is not an HT channel\n", ctx-&gt;active.channel);</div><div class='add'>+	for (i = 0; i &lt; LINK_QUAL_MAX_RETRY_NUM; i++) {</div><div class='add'>+		if (le32_to_cpu(lq-&gt;rs_table[i].rate_n_flags) &amp; RATE_MCS_HT_MSK) {</div><div class='add'>+			D_INFO("idx %d of LQ expects HT channel\n", i);</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_send_lq_cmd() - Send link quality command</div><div class='add'>+ * @init: This command is sent as part of station initialization right</div><div class='add'>+ *        after station has been added.</div><div class='add'>+ *</div><div class='add'>+ * The link quality command is sent as the last step of station creation.</div><div class='add'>+ * This is the special case in which init is set and we call a callback in</div><div class='add'>+ * this case to clear the state indicating that station creation is in</div><div class='add'>+ * progress.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il_send_lq_cmd(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+	       struct il_link_quality_cmd *lq, u8 flags, bool init)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	unsigned long flags_spin;</div><div class='add'>+</div><div class='add'>+	struct il_host_cmd cmd = {</div><div class='add'>+		.id = C_TX_LINK_QUALITY_CMD,</div><div class='add'>+		.len = sizeof(struct il_link_quality_cmd),</div><div class='add'>+		.flags = flags,</div><div class='add'>+		.data = lq,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(lq-&gt;sta_id == IL_INVALID_STATION))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+	if (!(il-&gt;stations[lq-&gt;sta_id].used &amp; IL_STA_DRIVER_ACTIVE)) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+</div><div class='add'>+	il_dump_lq_cmd(il, lq);</div><div class='add'>+	BUG_ON(init &amp;&amp; (cmd.flags &amp; CMD_ASYNC));</div><div class='add'>+</div><div class='add'>+	if (il_is_lq_table_valid(il, ctx, lq))</div><div class='add'>+		ret = il_send_cmd(il, &amp;cmd);</div><div class='add'>+	else</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (cmd.flags &amp; CMD_ASYNC)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (init) {</div><div class='add'>+		D_INFO("init LQ command complete,"</div><div class='add'>+		       " clearing sta addition status for sta %d\n",</div><div class='add'>+		       lq-&gt;sta_id);</div><div class='add'>+		spin_lock_irqsave(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+		il-&gt;stations[lq-&gt;sta_id].used &amp;= ~IL_STA_UCODE_INPROGRESS;</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags_spin);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_send_lq_cmd);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_mac_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		  struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	struct il_station_priv_common *sta_common = (void *)sta-&gt;drv_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	D_INFO("received request to remove station %pM\n", sta-&gt;addr);</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	D_INFO("proceeding to remove station %pM\n", sta-&gt;addr);</div><div class='add'>+	ret = il_remove_station(il, sta_common-&gt;sta_id, sta-&gt;addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		IL_ERR("Error removing station %pM\n", sta-&gt;addr);</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_mac_sta_remove);</div><div class='add'>+</div><div class='add'>+/************************** RX-FUNCTIONS ****************************/</div><div class='add'>+/*</div><div class='add'>+ * Rx theory of operation</div><div class='add'>+ *</div><div class='add'>+ * Driver allocates a circular buffer of Receive Buffer Descriptors (RBDs),</div><div class='add'>+ * each of which point to Receive Buffers to be filled by the NIC.  These get</div><div class='add'>+ * used not only for Rx frames, but for any command response or notification</div><div class='add'>+ * from the NIC.  The driver and NIC manage the Rx buffers by means</div><div class='add'>+ * of idxes into the circular buffer.</div><div class='add'>+ *</div><div class='add'>+ * Rx Queue Indexes</div><div class='add'>+ * The host/firmware share two idx registers for managing the Rx buffers.</div><div class='add'>+ *</div><div class='add'>+ * The READ idx maps to the first position that the firmware may be writing</div><div class='add'>+ * to -- the driver can read up to (but not including) this position and get</div><div class='add'>+ * good data.</div><div class='add'>+ * The READ idx is managed by the firmware once the card is enabled.</div><div class='add'>+ *</div><div class='add'>+ * The WRITE idx maps to the last position the driver has read from -- the</div><div class='add'>+ * position preceding WRITE is the last slot the firmware can place a packet.</div><div class='add'>+ *</div><div class='add'>+ * The queue is empty (no good data) if WRITE = READ - 1, and is full if</div><div class='add'>+ * WRITE = READ.</div><div class='add'>+ *</div><div class='add'>+ * During initialization, the host sets up the READ queue position to the first</div><div class='add'>+ * IDX position, and WRITE to the last (READ - 1 wrapped)</div><div class='add'>+ *</div><div class='add'>+ * When the firmware places a packet in a buffer, it will advance the READ idx</div><div class='add'>+ * and fire the RX interrupt.  The driver can then query the READ idx and</div><div class='add'>+ * process as many packets as possible, moving the WRITE idx forward as it</div><div class='add'>+ * resets the Rx queue buffers with new memory.</div><div class='add'>+ *</div><div class='add'>+ * The management in the driver is as follows:</div><div class='add'>+ * + A list of pre-allocated SKBs is stored in iwl-&gt;rxq-&gt;rx_free.  When</div><div class='add'>+ *   iwl-&gt;rxq-&gt;free_count drops to or below RX_LOW_WATERMARK, work is scheduled</div><div class='add'>+ *   to replenish the iwl-&gt;rxq-&gt;rx_free.</div><div class='add'>+ * + In il_rx_replenish (scheduled) if 'processed' != 'read' then the</div><div class='add'>+ *   iwl-&gt;rxq is replenished and the READ IDX is updated (updating the</div><div class='add'>+ *   'processed' and 'read' driver idxes as well)</div><div class='add'>+ * + A received packet is processed and handed to the kernel network stack,</div><div class='add'>+ *   detached from the iwl-&gt;rxq.  The driver 'processed' idx is updated.</div><div class='add'>+ * + The Host/Firmware iwl-&gt;rxq is replenished at tasklet time from the rx_free</div><div class='add'>+ *   list. If there are no allocated buffers in iwl-&gt;rxq-&gt;rx_free, the READ</div><div class='add'>+ *   IDX is not incremented and iwl-&gt;status(RX_STALLED) is set.  If there</div><div class='add'>+ *   were enough free buffers and RX_STALLED is set it is cleared.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * Driver sequence:</div><div class='add'>+ *</div><div class='add'>+ * il_rx_queue_alloc()   Allocates rx_free</div><div class='add'>+ * il_rx_replenish()     Replenishes rx_free list from rx_used, and calls</div><div class='add'>+ *                            il_rx_queue_restock</div><div class='add'>+ * il_rx_queue_restock() Moves available buffers from rx_free into Rx</div><div class='add'>+ *                            queue, updates firmware pointers, and updates</div><div class='add'>+ *                            the WRITE idx.  If insufficient rx_free buffers</div><div class='add'>+ *                            are available, schedules il_rx_replenish</div><div class='add'>+ *</div><div class='add'>+ * -- enable interrupts --</div><div class='add'>+ * ISR - il_rx()         Detach il_rx_bufs from pool up to the</div><div class='add'>+ *                            READ IDX, detaching the SKB from the pool.</div><div class='add'>+ *                            Moves the packet buffer from queue to rx_used.</div><div class='add'>+ *                            Calls il_rx_queue_restock to refill any empty</div><div class='add'>+ *                            slots.</div><div class='add'>+ * ...</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_rx_queue_space - Return number of free slots available in queue.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il_rx_queue_space(const struct il_rx_queue *q)</div><div class='add'>+{</div><div class='add'>+	int s = q-&gt;read - q-&gt;write;</div><div class='add'>+	if (s &lt;= 0)</div><div class='add'>+		s += RX_QUEUE_SIZE;</div><div class='add'>+	/* keep some buffer to not confuse full and empty queue */</div><div class='add'>+	s -= 2;</div><div class='add'>+	if (s &lt; 0)</div><div class='add'>+		s = 0;</div><div class='add'>+	return s;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_rx_queue_space);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_rx_queue_update_write_ptr - Update the write pointer for the RX queue</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il_rx_queue_update_write_ptr(struct il_priv *il, struct il_rx_queue *q)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 rx_wrt_ptr_reg = il-&gt;hw_params.rx_wrt_ptr_reg;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;q-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (q-&gt;need_update == 0)</div><div class='add'>+		goto exit_unlock;</div><div class='add'>+</div><div class='add'>+	/* If power-saving is in use, make sure device is awake */</div><div class='add'>+	if (test_bit(S_POWER_PMI, &amp;il-&gt;status)) {</div><div class='add'>+		reg = _il_rd(il, CSR_UCODE_DRV_GP1);</div><div class='add'>+</div><div class='add'>+		if (reg &amp; CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {</div><div class='add'>+			D_INFO("Rx queue requesting wakeup," " GP1 = 0x%x\n",</div><div class='add'>+			       reg);</div><div class='add'>+			il_set_bit(il, CSR_GP_CNTRL,</div><div class='add'>+				   CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='add'>+			goto exit_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		q-&gt;write_actual = (q-&gt;write &amp; ~0x7);</div><div class='add'>+		il_wr(il, rx_wrt_ptr_reg, q-&gt;write_actual);</div><div class='add'>+</div><div class='add'>+		/* Else device is assumed to be awake */</div><div class='add'>+	} else {</div><div class='add'>+		/* Device expects a multiple of 8 */</div><div class='add'>+		q-&gt;write_actual = (q-&gt;write &amp; ~0x7);</div><div class='add'>+		il_wr(il, rx_wrt_ptr_reg, q-&gt;write_actual);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	q-&gt;need_update = 0;</div><div class='add'>+</div><div class='add'>+exit_unlock:</div><div class='add'>+	spin_unlock_irqrestore(&amp;q-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_rx_queue_update_write_ptr);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_rx_queue_alloc(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_queue *rxq = &amp;il-&gt;rxq;</div><div class='add'>+	struct device *dev = &amp;il-&gt;pci_dev-&gt;dev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;rxq-&gt;lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;rxq-&gt;rx_free);</div><div class='add'>+	INIT_LIST_HEAD(&amp;rxq-&gt;rx_used);</div><div class='add'>+</div><div class='add'>+	/* Alloc the circular buffer of Read Buffer Descriptors (RBDs) */</div><div class='add'>+	rxq-&gt;bd =</div><div class='add'>+	    dma_alloc_coherent(dev, 4 * RX_QUEUE_SIZE, &amp;rxq-&gt;bd_dma,</div><div class='add'>+			       GFP_KERNEL);</div><div class='add'>+	if (!rxq-&gt;bd)</div><div class='add'>+		goto err_bd;</div><div class='add'>+</div><div class='add'>+	rxq-&gt;rb_stts =</div><div class='add'>+	    dma_alloc_coherent(dev, sizeof(struct il_rb_status),</div><div class='add'>+			       &amp;rxq-&gt;rb_stts_dma, GFP_KERNEL);</div><div class='add'>+	if (!rxq-&gt;rb_stts)</div><div class='add'>+		goto err_rb;</div><div class='add'>+</div><div class='add'>+	/* Fill the rx_used queue with _all_ of the Rx buffers */</div><div class='add'>+	for (i = 0; i &lt; RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++)</div><div class='add'>+		list_add_tail(&amp;rxq-&gt;pool[i].list, &amp;rxq-&gt;rx_used);</div><div class='add'>+</div><div class='add'>+	/* Set us so that we have processed and used all buffers, but have</div><div class='add'>+	 * not restocked the Rx queue with fresh buffers */</div><div class='add'>+	rxq-&gt;read = rxq-&gt;write = 0;</div><div class='add'>+	rxq-&gt;write_actual = 0;</div><div class='add'>+	rxq-&gt;free_count = 0;</div><div class='add'>+	rxq-&gt;need_update = 0;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_rb:</div><div class='add'>+	dma_free_coherent(&amp;il-&gt;pci_dev-&gt;dev, 4 * RX_QUEUE_SIZE, rxq-&gt;bd,</div><div class='add'>+			  rxq-&gt;bd_dma);</div><div class='add'>+err_bd:</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_rx_queue_alloc);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_hdl_spectrum_measurement(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	struct il_spectrum_notification *report = &amp;(pkt-&gt;u.spectrum_notif);</div><div class='add'>+</div><div class='add'>+	if (!report-&gt;state) {</div><div class='add'>+		D_11H("Spectrum Measure Notification: Start\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;il-&gt;measure_report, report, sizeof(*report));</div><div class='add'>+	il-&gt;measurement_status |= MEASUREMENT_READY;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_hdl_spectrum_measurement);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * returns non-zero if packet should be dropped</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il_set_decrypted_flag(struct il_priv *il, struct ieee80211_hdr *hdr,</div><div class='add'>+		      u32 decrypt_res, struct ieee80211_rx_status *stats)</div><div class='add'>+{</div><div class='add'>+	u16 fc = le16_to_cpu(hdr-&gt;frame_control);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * All contexts have the same setting here due to it being</div><div class='add'>+	 * a module parameter, so OK to check any context.</div><div class='add'>+	 */</div><div class='add'>+	if (il-&gt;ctx.active.filter_flags &amp; RXON_FILTER_DIS_DECRYPT_MSK)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!(fc &amp; IEEE80211_FCTL_PROTECTED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	D_RX("decrypt_res:0x%x\n", decrypt_res);</div><div class='add'>+	switch (decrypt_res &amp; RX_RES_STATUS_SEC_TYPE_MSK) {</div><div class='add'>+	case RX_RES_STATUS_SEC_TYPE_TKIP:</div><div class='add'>+		/* The uCode has got a bad phase 1 Key, pushes the packet.</div><div class='add'>+		 * Decryption will be done in SW. */</div><div class='add'>+		if ((decrypt_res &amp; RX_RES_STATUS_DECRYPT_TYPE_MSK) ==</div><div class='add'>+		    RX_RES_STATUS_BAD_KEY_TTAK)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	case RX_RES_STATUS_SEC_TYPE_WEP:</div><div class='add'>+		if ((decrypt_res &amp; RX_RES_STATUS_DECRYPT_TYPE_MSK) ==</div><div class='add'>+		    RX_RES_STATUS_BAD_ICV_MIC) {</div><div class='add'>+			/* bad ICV, the packet is destroyed since the</div><div class='add'>+			 * decryption is inplace, drop it */</div><div class='add'>+			D_RX("Packet destroyed\n");</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+	case RX_RES_STATUS_SEC_TYPE_CCMP:</div><div class='add'>+		if ((decrypt_res &amp; RX_RES_STATUS_DECRYPT_TYPE_MSK) ==</div><div class='add'>+		    RX_RES_STATUS_DECRYPT_OK) {</div><div class='add'>+			D_RX("hw decrypt successfully!!!\n");</div><div class='add'>+			stats-&gt;flag |= RX_FLAG_DECRYPTED;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_set_decrypted_flag);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_txq_update_write_ptr - Send new write idx to hardware</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il_txq_update_write_ptr(struct il_priv *il, struct il_tx_queue *txq)</div><div class='add'>+{</div><div class='add'>+	u32 reg = 0;</div><div class='add'>+	int txq_id = txq-&gt;q.id;</div><div class='add'>+</div><div class='add'>+	if (txq-&gt;need_update == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* if we're trying to save power */</div><div class='add'>+	if (test_bit(S_POWER_PMI, &amp;il-&gt;status)) {</div><div class='add'>+		/* wake up nic if it's powered down ...</div><div class='add'>+		 * uCode will wake up, and interrupt us again, so next</div><div class='add'>+		 * time we'll skip this part. */</div><div class='add'>+		reg = _il_rd(il, CSR_UCODE_DRV_GP1);</div><div class='add'>+</div><div class='add'>+		if (reg &amp; CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {</div><div class='add'>+			D_INFO("Tx queue %d requesting wakeup," " GP1 = 0x%x\n",</div><div class='add'>+			       txq_id, reg);</div><div class='add'>+			il_set_bit(il, CSR_GP_CNTRL,</div><div class='add'>+				   CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		il_wr(il, HBUS_TARG_WRPTR, txq-&gt;q.write_ptr | (txq_id &lt;&lt; 8));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * else not in power-save mode,</div><div class='add'>+		 * uCode will never sleep when we're</div><div class='add'>+		 * trying to tx (during RFKILL, we're not trying to tx).</div><div class='add'>+		 */</div><div class='add'>+	} else</div><div class='add'>+		_il_wr(il, HBUS_TARG_WRPTR, txq-&gt;q.write_ptr | (txq_id &lt;&lt; 8));</div><div class='add'>+	txq-&gt;need_update = 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_txq_update_write_ptr);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_tx_queue_unmap -  Unmap any remaining DMA mappings and free skb's</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il_tx_queue_unmap(struct il_priv *il, int txq_id)</div><div class='add'>+{</div><div class='add'>+	struct il_tx_queue *txq = &amp;il-&gt;txq[txq_id];</div><div class='add'>+	struct il_queue *q = &amp;txq-&gt;q;</div><div class='add'>+</div><div class='add'>+	if (q-&gt;n_bd == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	while (q-&gt;write_ptr != q-&gt;read_ptr) {</div><div class='add'>+		il-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_free_tfd(il, txq);</div><div class='add'>+		q-&gt;read_ptr = il_queue_inc_wrap(q-&gt;read_ptr, q-&gt;n_bd);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_tx_queue_unmap);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_tx_queue_free - Deallocate DMA queue.</div><div class='add'>+ * @txq: Transmit queue to deallocate.</div><div class='add'>+ *</div><div class='add'>+ * Empty queue by removing and destroying all BD's.</div><div class='add'>+ * Free all buffers.</div><div class='add'>+ * 0-fill, but do not free "txq" descriptor structure.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il_tx_queue_free(struct il_priv *il, int txq_id)</div><div class='add'>+{</div><div class='add'>+	struct il_tx_queue *txq = &amp;il-&gt;txq[txq_id];</div><div class='add'>+	struct device *dev = &amp;il-&gt;pci_dev-&gt;dev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	il_tx_queue_unmap(il, txq_id);</div><div class='add'>+</div><div class='add'>+	/* De-alloc array of command/tx buffers */</div><div class='add'>+	for (i = 0; i &lt; TFD_TX_CMD_SLOTS; i++)</div><div class='add'>+		kfree(txq-&gt;cmd[i]);</div><div class='add'>+</div><div class='add'>+	/* De-alloc circular buffer of TFDs */</div><div class='add'>+	if (txq-&gt;q.n_bd)</div><div class='add'>+		dma_free_coherent(dev, il-&gt;hw_params.tfd_size * txq-&gt;q.n_bd,</div><div class='add'>+				  txq-&gt;tfds, txq-&gt;q.dma_addr);</div><div class='add'>+</div><div class='add'>+	/* De-alloc array of per-TFD driver data */</div><div class='add'>+	kfree(txq-&gt;txb);</div><div class='add'>+	txq-&gt;txb = NULL;</div><div class='add'>+</div><div class='add'>+	/* deallocate arrays */</div><div class='add'>+	kfree(txq-&gt;cmd);</div><div class='add'>+	kfree(txq-&gt;meta);</div><div class='add'>+	txq-&gt;cmd = NULL;</div><div class='add'>+	txq-&gt;meta = NULL;</div><div class='add'>+</div><div class='add'>+	/* 0-fill queue descriptor structure */</div><div class='add'>+	memset(txq, 0, sizeof(*txq));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_tx_queue_free);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_cmd_queue_unmap - Unmap any remaining DMA mappings from command queue</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il_cmd_queue_unmap(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_tx_queue *txq = &amp;il-&gt;txq[il-&gt;cmd_queue];</div><div class='add'>+	struct il_queue *q = &amp;txq-&gt;q;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (q-&gt;n_bd == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	while (q-&gt;read_ptr != q-&gt;write_ptr) {</div><div class='add'>+		i = il_get_cmd_idx(q, q-&gt;read_ptr, 0);</div><div class='add'>+</div><div class='add'>+		if (txq-&gt;meta[i].flags &amp; CMD_MAPPED) {</div><div class='add'>+			pci_unmap_single(il-&gt;pci_dev,</div><div class='add'>+					 dma_unmap_addr(&amp;txq-&gt;meta[i], mapping),</div><div class='add'>+					 dma_unmap_len(&amp;txq-&gt;meta[i], len),</div><div class='add'>+					 PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+			txq-&gt;meta[i].flags = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		q-&gt;read_ptr = il_queue_inc_wrap(q-&gt;read_ptr, q-&gt;n_bd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i = q-&gt;n_win;</div><div class='add'>+	if (txq-&gt;meta[i].flags &amp; CMD_MAPPED) {</div><div class='add'>+		pci_unmap_single(il-&gt;pci_dev,</div><div class='add'>+				 dma_unmap_addr(&amp;txq-&gt;meta[i], mapping),</div><div class='add'>+				 dma_unmap_len(&amp;txq-&gt;meta[i], len),</div><div class='add'>+				 PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+		txq-&gt;meta[i].flags = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_cmd_queue_unmap);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_cmd_queue_free - Deallocate DMA queue.</div><div class='add'>+ * @txq: Transmit queue to deallocate.</div><div class='add'>+ *</div><div class='add'>+ * Empty queue by removing and destroying all BD's.</div><div class='add'>+ * Free all buffers.</div><div class='add'>+ * 0-fill, but do not free "txq" descriptor structure.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il_cmd_queue_free(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_tx_queue *txq = &amp;il-&gt;txq[il-&gt;cmd_queue];</div><div class='add'>+	struct device *dev = &amp;il-&gt;pci_dev-&gt;dev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	il_cmd_queue_unmap(il);</div><div class='add'>+</div><div class='add'>+	/* De-alloc array of command/tx buffers */</div><div class='add'>+	for (i = 0; i &lt;= TFD_CMD_SLOTS; i++)</div><div class='add'>+		kfree(txq-&gt;cmd[i]);</div><div class='add'>+</div><div class='add'>+	/* De-alloc circular buffer of TFDs */</div><div class='add'>+	if (txq-&gt;q.n_bd)</div><div class='add'>+		dma_free_coherent(dev, il-&gt;hw_params.tfd_size * txq-&gt;q.n_bd,</div><div class='add'>+				  txq-&gt;tfds, txq-&gt;q.dma_addr);</div><div class='add'>+</div><div class='add'>+	/* deallocate arrays */</div><div class='add'>+	kfree(txq-&gt;cmd);</div><div class='add'>+	kfree(txq-&gt;meta);</div><div class='add'>+	txq-&gt;cmd = NULL;</div><div class='add'>+	txq-&gt;meta = NULL;</div><div class='add'>+</div><div class='add'>+	/* 0-fill queue descriptor structure */</div><div class='add'>+	memset(txq, 0, sizeof(*txq));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_cmd_queue_free);</div><div class='add'>+</div><div class='add'>+/*************** DMA-QUEUE-GENERAL-FUNCTIONS  *****</div><div class='add'>+ * DMA services</div><div class='add'>+ *</div><div class='add'>+ * Theory of operation</div><div class='add'>+ *</div><div class='add'>+ * A Tx or Rx queue resides in host DRAM, and is comprised of a circular buffer</div><div class='add'>+ * of buffer descriptors, each of which points to one or more data buffers for</div><div class='add'>+ * the device to read from or fill.  Driver and device exchange status of each</div><div class='add'>+ * queue via "read" and "write" pointers.  Driver keeps minimum of 2 empty</div><div class='add'>+ * entries in each circular buffer, to protect against confusing empty and full</div><div class='add'>+ * queue states.</div><div class='add'>+ *</div><div class='add'>+ * The device reads or writes the data in the queues via the device's several</div><div class='add'>+ * DMA/FIFO channels.  Each queue is mapped to a single DMA channel.</div><div class='add'>+ *</div><div class='add'>+ * For Tx queue, there are low mark and high mark limits. If, after queuing</div><div class='add'>+ * the packet for Tx, free space become &lt; low mark, Tx queue stopped. When</div><div class='add'>+ * reclaiming packets (on 'tx done IRQ), if free space become &gt; high mark,</div><div class='add'>+ * Tx queue resumed.</div><div class='add'>+ *</div><div class='add'>+ * See more detailed info in 4965.h.</div><div class='add'>+ ***************************************************/</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_queue_space(const struct il_queue *q)</div><div class='add'>+{</div><div class='add'>+	int s = q-&gt;read_ptr - q-&gt;write_ptr;</div><div class='add'>+</div><div class='add'>+	if (q-&gt;read_ptr &gt; q-&gt;write_ptr)</div><div class='add'>+		s -= q-&gt;n_bd;</div><div class='add'>+</div><div class='add'>+	if (s &lt;= 0)</div><div class='add'>+		s += q-&gt;n_win;</div><div class='add'>+	/* keep some reserve to not confuse empty and full situations */</div><div class='add'>+	s -= 2;</div><div class='add'>+	if (s &lt; 0)</div><div class='add'>+		s = 0;</div><div class='add'>+	return s;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_queue_space);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_queue_init - Initialize queue's high/low-water and read/write idxes</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il_queue_init(struct il_priv *il, struct il_queue *q, int count, int slots_num,</div><div class='add'>+	      u32 id)</div><div class='add'>+{</div><div class='add'>+	q-&gt;n_bd = count;</div><div class='add'>+	q-&gt;n_win = slots_num;</div><div class='add'>+	q-&gt;id = id;</div><div class='add'>+</div><div class='add'>+	/* count must be power-of-two size, otherwise il_queue_inc_wrap</div><div class='add'>+	 * and il_queue_dec_wrap are broken. */</div><div class='add'>+	BUG_ON(!is_power_of_2(count));</div><div class='add'>+</div><div class='add'>+	/* slots_num must be power-of-two size, otherwise</div><div class='add'>+	 * il_get_cmd_idx is broken. */</div><div class='add'>+	BUG_ON(!is_power_of_2(slots_num));</div><div class='add'>+</div><div class='add'>+	q-&gt;low_mark = q-&gt;n_win / 4;</div><div class='add'>+	if (q-&gt;low_mark &lt; 4)</div><div class='add'>+		q-&gt;low_mark = 4;</div><div class='add'>+</div><div class='add'>+	q-&gt;high_mark = q-&gt;n_win / 8;</div><div class='add'>+	if (q-&gt;high_mark &lt; 2)</div><div class='add'>+		q-&gt;high_mark = 2;</div><div class='add'>+</div><div class='add'>+	q-&gt;write_ptr = q-&gt;read_ptr = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_tx_queue_alloc - Alloc driver data and TFD CB for one Tx/cmd queue</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il_tx_queue_alloc(struct il_priv *il, struct il_tx_queue *txq, u32 id)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;il-&gt;pci_dev-&gt;dev;</div><div class='add'>+	size_t tfd_sz = il-&gt;hw_params.tfd_size * TFD_QUEUE_SIZE_MAX;</div><div class='add'>+</div><div class='add'>+	/* Driver ilate data, only for Tx (not command) queues,</div><div class='add'>+	 * not shared with device. */</div><div class='add'>+	if (id != il-&gt;cmd_queue) {</div><div class='add'>+		txq-&gt;txb = kcalloc(TFD_QUEUE_SIZE_MAX, sizeof(txq-&gt;txb[0]),</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+		if (!txq-&gt;txb) {</div><div class='add'>+			IL_ERR("kmalloc for auxiliary BD "</div><div class='add'>+			       "structures failed\n");</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		txq-&gt;txb = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Circular buffer of transmit frame descriptors (TFDs),</div><div class='add'>+	 * shared with device */</div><div class='add'>+	txq-&gt;tfds =</div><div class='add'>+	    dma_alloc_coherent(dev, tfd_sz, &amp;txq-&gt;q.dma_addr, GFP_KERNEL);</div><div class='add'>+	if (!txq-&gt;tfds) {</div><div class='add'>+		IL_ERR("pci_alloc_consistent(%zd) failed\n", tfd_sz);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	txq-&gt;q.id = id;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	kfree(txq-&gt;txb);</div><div class='add'>+	txq-&gt;txb = NULL;</div><div class='add'>+</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_tx_queue_init - Allocate and initialize one tx/cmd queue</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il_tx_queue_init(struct il_priv *il, struct il_tx_queue *txq, int slots_num,</div><div class='add'>+		 u32 txq_id)</div><div class='add'>+{</div><div class='add'>+	int i, len;</div><div class='add'>+	int ret;</div><div class='add'>+	int actual_slots = slots_num;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Alloc buffer array for commands (Tx or other types of commands).</div><div class='add'>+	 * For the command queue (#4/#9), allocate command space + one big</div><div class='add'>+	 * command for scan, since scan command is very huge; the system will</div><div class='add'>+	 * not have two scans at the same time, so only one is needed.</div><div class='add'>+	 * For normal Tx queues (all other queues), no super-size command</div><div class='add'>+	 * space is needed.</div><div class='add'>+	 */</div><div class='add'>+	if (txq_id == il-&gt;cmd_queue)</div><div class='add'>+		actual_slots++;</div><div class='add'>+</div><div class='add'>+	txq-&gt;meta =</div><div class='add'>+	    kzalloc(sizeof(struct il_cmd_meta) * actual_slots, GFP_KERNEL);</div><div class='add'>+	txq-&gt;cmd =</div><div class='add'>+	    kzalloc(sizeof(struct il_device_cmd *) * actual_slots, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!txq-&gt;meta || !txq-&gt;cmd)</div><div class='add'>+		goto out_free_arrays;</div><div class='add'>+</div><div class='add'>+	len = sizeof(struct il_device_cmd);</div><div class='add'>+	for (i = 0; i &lt; actual_slots; i++) {</div><div class='add'>+		/* only happens for cmd queue */</div><div class='add'>+		if (i == slots_num)</div><div class='add'>+			len = IL_MAX_CMD_SIZE;</div><div class='add'>+</div><div class='add'>+		txq-&gt;cmd[i] = kmalloc(len, GFP_KERNEL);</div><div class='add'>+		if (!txq-&gt;cmd[i])</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Alloc driver data array and TFD circular buffer */</div><div class='add'>+	ret = il_tx_queue_alloc(il, txq, txq_id);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	txq-&gt;need_update = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For the default queues 0-3, set up the swq_id</div><div class='add'>+	 * already -- all others need to get one later</div><div class='add'>+	 * (if they need one at all).</div><div class='add'>+	 */</div><div class='add'>+	if (txq_id &lt; 4)</div><div class='add'>+		il_set_swq_id(txq, txq_id, txq_id);</div><div class='add'>+</div><div class='add'>+	/* TFD_QUEUE_SIZE_MAX must be power-of-two size, otherwise</div><div class='add'>+	 * il_queue_inc_wrap and il_queue_dec_wrap are broken. */</div><div class='add'>+	BUILD_BUG_ON(TFD_QUEUE_SIZE_MAX &amp; (TFD_QUEUE_SIZE_MAX - 1));</div><div class='add'>+</div><div class='add'>+	/* Initialize queue's high/low-water marks, and head/tail idxes */</div><div class='add'>+	il_queue_init(il, &amp;txq-&gt;q, TFD_QUEUE_SIZE_MAX, slots_num, txq_id);</div><div class='add'>+</div><div class='add'>+	/* Tell device where to find queue */</div><div class='add'>+	il-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_init(il, txq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	for (i = 0; i &lt; actual_slots; i++)</div><div class='add'>+		kfree(txq-&gt;cmd[i]);</div><div class='add'>+out_free_arrays:</div><div class='add'>+	kfree(txq-&gt;meta);</div><div class='add'>+	kfree(txq-&gt;cmd);</div><div class='add'>+</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_tx_queue_init);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_tx_queue_reset(struct il_priv *il, struct il_tx_queue *txq, int slots_num,</div><div class='add'>+		  u32 txq_id)</div><div class='add'>+{</div><div class='add'>+	int actual_slots = slots_num;</div><div class='add'>+</div><div class='add'>+	if (txq_id == il-&gt;cmd_queue)</div><div class='add'>+		actual_slots++;</div><div class='add'>+</div><div class='add'>+	memset(txq-&gt;meta, 0, sizeof(struct il_cmd_meta) * actual_slots);</div><div class='add'>+</div><div class='add'>+	txq-&gt;need_update = 0;</div><div class='add'>+</div><div class='add'>+	/* Initialize queue's high/low-water marks, and head/tail idxes */</div><div class='add'>+	il_queue_init(il, &amp;txq-&gt;q, TFD_QUEUE_SIZE_MAX, slots_num, txq_id);</div><div class='add'>+</div><div class='add'>+	/* Tell device where to find queue */</div><div class='add'>+	il-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_init(il, txq);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_tx_queue_reset);</div><div class='add'>+</div><div class='add'>+/*************** HOST COMMAND QUEUE FUNCTIONS   *****/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_enqueue_hcmd - enqueue a uCode command</div><div class='add'>+ * @il: device ilate data point</div><div class='add'>+ * @cmd: a point to the ucode command structure</div><div class='add'>+ *</div><div class='add'>+ * The function returns &lt; 0 values to indicate the operation is</div><div class='add'>+ * failed. On success, it turns the idx (&gt; 0) of command in the</div><div class='add'>+ * command queue.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct il_tx_queue *txq = &amp;il-&gt;txq[il-&gt;cmd_queue];</div><div class='add'>+	struct il_queue *q = &amp;txq-&gt;q;</div><div class='add'>+	struct il_device_cmd *out_cmd;</div><div class='add'>+	struct il_cmd_meta *out_meta;</div><div class='add'>+	dma_addr_t phys_addr;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int len;</div><div class='add'>+	u32 idx;</div><div class='add'>+	u16 fix_size;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;len = il-&gt;cfg-&gt;ops-&gt;utils-&gt;get_hcmd_size(cmd-&gt;id, cmd-&gt;len);</div><div class='add'>+	fix_size = (u16) (cmd-&gt;len + sizeof(out_cmd-&gt;hdr));</div><div class='add'>+</div><div class='add'>+	/* If any of the command structures end up being larger than</div><div class='add'>+	 * the TFD_MAX_PAYLOAD_SIZE, and it sent as a 'small' command then</div><div class='add'>+	 * we will need to increase the size of the TFD entries</div><div class='add'>+	 * Also, check to see if command buffer should not exceed the size</div><div class='add'>+	 * of device_cmd and max_cmd_size. */</div><div class='add'>+	BUG_ON((fix_size &gt; TFD_MAX_PAYLOAD_SIZE) &amp;&amp;</div><div class='add'>+	       !(cmd-&gt;flags &amp; CMD_SIZE_HUGE));</div><div class='add'>+	BUG_ON(fix_size &gt; IL_MAX_CMD_SIZE);</div><div class='add'>+</div><div class='add'>+	if (il_is_rfkill(il) || il_is_ctkill(il)) {</div><div class='add'>+		IL_WARN("Not sending command - %s KILL\n",</div><div class='add'>+			il_is_rfkill(il) ? "RF" : "CT");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;hcmd_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (il_queue_space(q) &lt; ((cmd-&gt;flags &amp; CMD_ASYNC) ? 2 : 1)) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;hcmd_lock, flags);</div><div class='add'>+</div><div class='add'>+		IL_ERR("Restarting adapter due to command queue full\n");</div><div class='add'>+		queue_work(il-&gt;workqueue, &amp;il-&gt;restart);</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	idx = il_get_cmd_idx(q, q-&gt;write_ptr, cmd-&gt;flags &amp; CMD_SIZE_HUGE);</div><div class='add'>+	out_cmd = txq-&gt;cmd[idx];</div><div class='add'>+	out_meta = &amp;txq-&gt;meta[idx];</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(out_meta-&gt;flags &amp; CMD_MAPPED)) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;hcmd_lock, flags);</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(out_meta, 0, sizeof(*out_meta));	/* re-initialize to NULL */</div><div class='add'>+	out_meta-&gt;flags = cmd-&gt;flags | CMD_MAPPED;</div><div class='add'>+	if (cmd-&gt;flags &amp; CMD_WANT_SKB)</div><div class='add'>+		out_meta-&gt;source = cmd;</div><div class='add'>+	if (cmd-&gt;flags &amp; CMD_ASYNC)</div><div class='add'>+		out_meta-&gt;callback = cmd-&gt;callback;</div><div class='add'>+</div><div class='add'>+	out_cmd-&gt;hdr.cmd = cmd-&gt;id;</div><div class='add'>+	memcpy(&amp;out_cmd-&gt;cmd.payload, cmd-&gt;data, cmd-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* At this point, the out_cmd now has all of the incoming cmd</div><div class='add'>+	 * information */</div><div class='add'>+</div><div class='add'>+	out_cmd-&gt;hdr.flags = 0;</div><div class='add'>+	out_cmd-&gt;hdr.sequence =</div><div class='add'>+	    cpu_to_le16(QUEUE_TO_SEQ(il-&gt;cmd_queue) | IDX_TO_SEQ(q-&gt;write_ptr));</div><div class='add'>+	if (cmd-&gt;flags &amp; CMD_SIZE_HUGE)</div><div class='add'>+		out_cmd-&gt;hdr.sequence |= SEQ_HUGE_FRAME;</div><div class='add'>+	len = sizeof(struct il_device_cmd);</div><div class='add'>+	if (idx == TFD_CMD_SLOTS)</div><div class='add'>+		len = IL_MAX_CMD_SIZE;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	switch (out_cmd-&gt;hdr.cmd) {</div><div class='add'>+	case C_TX_LINK_QUALITY_CMD:</div><div class='add'>+	case C_SENSITIVITY:</div><div class='add'>+		D_HC_DUMP("Sending command %s (#%x), seq: 0x%04X, "</div><div class='add'>+			  "%d bytes at %d[%d]:%d\n",</div><div class='add'>+			  il_get_cmd_string(out_cmd-&gt;hdr.cmd), out_cmd-&gt;hdr.cmd,</div><div class='add'>+			  le16_to_cpu(out_cmd-&gt;hdr.sequence), fix_size,</div><div class='add'>+			  q-&gt;write_ptr, idx, il-&gt;cmd_queue);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		D_HC("Sending command %s (#%x), seq: 0x%04X, "</div><div class='add'>+		     "%d bytes at %d[%d]:%d\n",</div><div class='add'>+		     il_get_cmd_string(out_cmd-&gt;hdr.cmd), out_cmd-&gt;hdr.cmd,</div><div class='add'>+		     le16_to_cpu(out_cmd-&gt;hdr.sequence), fix_size, q-&gt;write_ptr,</div><div class='add'>+		     idx, il-&gt;cmd_queue);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	txq-&gt;need_update = 1;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_update_byte_cnt_tbl)</div><div class='add'>+		/* Set up entry in queue's byte count circular buffer */</div><div class='add'>+		il-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_update_byte_cnt_tbl(il, txq, 0);</div><div class='add'>+</div><div class='add'>+	phys_addr =</div><div class='add'>+	    pci_map_single(il-&gt;pci_dev, &amp;out_cmd-&gt;hdr, fix_size,</div><div class='add'>+			   PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+	dma_unmap_addr_set(out_meta, mapping, phys_addr);</div><div class='add'>+	dma_unmap_len_set(out_meta, len, fix_size);</div><div class='add'>+</div><div class='add'>+	il-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_attach_buf_to_tfd(il, txq, phys_addr, fix_size,</div><div class='add'>+						 1, U32_PAD(cmd-&gt;len));</div><div class='add'>+</div><div class='add'>+	/* Increment and update queue's write idx */</div><div class='add'>+	q-&gt;write_ptr = il_queue_inc_wrap(q-&gt;write_ptr, q-&gt;n_bd);</div><div class='add'>+	il_txq_update_write_ptr(il, txq);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;hcmd_lock, flags);</div><div class='add'>+	return idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_hcmd_queue_reclaim - Reclaim TX command queue entries already Tx'd</div><div class='add'>+ *</div><div class='add'>+ * When FW advances 'R' idx, all entries between old and new 'R' idx</div><div class='add'>+ * need to be reclaimed. As result, some free space forms.  If there is</div><div class='add'>+ * enough free space (&gt; low mark), wake the stack that feeds us.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+il_hcmd_queue_reclaim(struct il_priv *il, int txq_id, int idx, int cmd_idx)</div><div class='add'>+{</div><div class='add'>+	struct il_tx_queue *txq = &amp;il-&gt;txq[txq_id];</div><div class='add'>+	struct il_queue *q = &amp;txq-&gt;q;</div><div class='add'>+	int nfreed = 0;</div><div class='add'>+</div><div class='add'>+	if (idx &gt;= q-&gt;n_bd || il_queue_used(q, idx) == 0) {</div><div class='add'>+		IL_ERR("Read idx for DMA queue txq id (%d), idx %d, "</div><div class='add'>+		       "is out of range [0-%d] %d %d.\n", txq_id, idx, q-&gt;n_bd,</div><div class='add'>+		       q-&gt;write_ptr, q-&gt;read_ptr);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (idx = il_queue_inc_wrap(idx, q-&gt;n_bd); q-&gt;read_ptr != idx;</div><div class='add'>+	     q-&gt;read_ptr = il_queue_inc_wrap(q-&gt;read_ptr, q-&gt;n_bd)) {</div><div class='add'>+</div><div class='add'>+		if (nfreed++ &gt; 0) {</div><div class='add'>+			IL_ERR("HCMD skipped: idx (%d) %d %d\n", idx,</div><div class='add'>+			       q-&gt;write_ptr, q-&gt;read_ptr);</div><div class='add'>+			queue_work(il-&gt;workqueue, &amp;il-&gt;restart);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_tx_cmd_complete - Pull unused buffers off the queue and reclaim them</div><div class='add'>+ * @rxb: Rx buffer to reclaim</div><div class='add'>+ *</div><div class='add'>+ * If an Rx buffer has an async callback associated with it the callback</div><div class='add'>+ * will be executed.  The attached skb (if present) will only be freed</div><div class='add'>+ * if the callback returns 1</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il_tx_cmd_complete(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	u16 sequence = le16_to_cpu(pkt-&gt;hdr.sequence);</div><div class='add'>+	int txq_id = SEQ_TO_QUEUE(sequence);</div><div class='add'>+	int idx = SEQ_TO_IDX(sequence);</div><div class='add'>+	int cmd_idx;</div><div class='add'>+	bool huge = !!(pkt-&gt;hdr.sequence &amp; SEQ_HUGE_FRAME);</div><div class='add'>+	struct il_device_cmd *cmd;</div><div class='add'>+	struct il_cmd_meta *meta;</div><div class='add'>+	struct il_tx_queue *txq = &amp;il-&gt;txq[il-&gt;cmd_queue];</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* If a Tx command is being handled and it isn't in the actual</div><div class='add'>+	 * command queue then there a command routing bug has been introduced</div><div class='add'>+	 * in the queue management code. */</div><div class='add'>+	if (WARN</div><div class='add'>+	    (txq_id != il-&gt;cmd_queue,</div><div class='add'>+	     "wrong command queue %d (should be %d), sequence 0x%X readp=%d writep=%d\n",</div><div class='add'>+	     txq_id, il-&gt;cmd_queue, sequence, il-&gt;txq[il-&gt;cmd_queue].q.read_ptr,</div><div class='add'>+	     il-&gt;txq[il-&gt;cmd_queue].q.write_ptr)) {</div><div class='add'>+		il_print_hex_error(il, pkt, 32);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd_idx = il_get_cmd_idx(&amp;txq-&gt;q, idx, huge);</div><div class='add'>+	cmd = txq-&gt;cmd[cmd_idx];</div><div class='add'>+	meta = &amp;txq-&gt;meta[cmd_idx];</div><div class='add'>+</div><div class='add'>+	txq-&gt;time_stamp = jiffies;</div><div class='add'>+</div><div class='add'>+	pci_unmap_single(il-&gt;pci_dev, dma_unmap_addr(meta, mapping),</div><div class='add'>+			 dma_unmap_len(meta, len), PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+</div><div class='add'>+	/* Input error checking is done when commands are added to queue. */</div><div class='add'>+	if (meta-&gt;flags &amp; CMD_WANT_SKB) {</div><div class='add'>+		meta-&gt;source-&gt;reply_page = (unsigned long)rxb_addr(rxb);</div><div class='add'>+		rxb-&gt;page = NULL;</div><div class='add'>+	} else if (meta-&gt;callback)</div><div class='add'>+		meta-&gt;callback(il, cmd, pkt);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;hcmd_lock, flags);</div><div class='add'>+</div><div class='add'>+	il_hcmd_queue_reclaim(il, txq_id, idx, cmd_idx);</div><div class='add'>+</div><div class='add'>+	if (!(meta-&gt;flags &amp; CMD_ASYNC)) {</div><div class='add'>+		clear_bit(S_HCMD_ACTIVE, &amp;il-&gt;status);</div><div class='add'>+		D_INFO("Clearing HCMD_ACTIVE for command %s\n",</div><div class='add'>+		       il_get_cmd_string(cmd-&gt;hdr.cmd));</div><div class='add'>+		wake_up(&amp;il-&gt;wait_command_queue);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Mark as unmapped */</div><div class='add'>+	meta-&gt;flags = 0;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;hcmd_lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_tx_cmd_complete);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("iwl-legacy: common functions for 3945 and 4965");</div><div class='add'>+MODULE_VERSION(IWLWIFI_VERSION);</div><div class='add'>+MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * set bt_coex_active to true, uCode will do kill/defer</div><div class='add'>+ * every time the priority line is asserted (BT is sending signals on the</div><div class='add'>+ * priority line in the PCIx).</div><div class='add'>+ * set bt_coex_active to false, uCode will ignore the BT activity and</div><div class='add'>+ * perform the normal operation</div><div class='add'>+ *</div><div class='add'>+ * User might experience transmit issue on some platform due to WiFi/BT</div><div class='add'>+ * co-exist problem. The possible behaviors are:</div><div class='add'>+ *   Able to scan and finding all the available AP</div><div class='add'>+ *   Not able to associate with any AP</div><div class='add'>+ * On those platforms, WiFi communication can be restored by set</div><div class='add'>+ * "bt_coex_active" module parameter to "false"</div><div class='add'>+ *</div><div class='add'>+ * default: bt_coex_active = true (BT_COEX_ENABLE)</div><div class='add'>+ */</div><div class='add'>+static bool bt_coex_active = true;</div><div class='add'>+module_param(bt_coex_active, bool, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(bt_coex_active, "enable wifi/bluetooth co-exist");</div><div class='add'>+</div><div class='add'>+u32 il_debug_level;</div><div class='add'>+EXPORT_SYMBOL(il_debug_level);</div><div class='add'>+</div><div class='add'>+const u8 il_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };</div><div class='add'>+EXPORT_SYMBOL(il_bcast_addr);</div><div class='add'>+</div><div class='add'>+/* This function both allocates and initializes hw and il. */</div><div class='add'>+struct ieee80211_hw *</div><div class='add'>+il_alloc_all(struct il_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il;</div><div class='add'>+	/* mac80211 allocates memory for this device instance, including</div><div class='add'>+	 *   space for this driver's ilate structure */</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+</div><div class='add'>+	hw = ieee80211_alloc_hw(sizeof(struct il_priv),</div><div class='add'>+				cfg-&gt;ops-&gt;ieee80211_ops);</div><div class='add'>+	if (hw == NULL) {</div><div class='add'>+		pr_err("%s: Can not allocate network device\n", cfg-&gt;name);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il = hw-&gt;priv;</div><div class='add'>+	il-&gt;hw = hw;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return hw;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_alloc_all);</div><div class='add'>+</div><div class='add'>+#define MAX_BIT_RATE_40_MHZ 150	/* Mbps */</div><div class='add'>+#define MAX_BIT_RATE_20_MHZ 72	/* Mbps */</div><div class='add'>+static void</div><div class='add'>+il_init_ht_hw_capab(const struct il_priv *il,</div><div class='add'>+		    struct ieee80211_sta_ht_cap *ht_info,</div><div class='add'>+		    enum ieee80211_band band)</div><div class='add'>+{</div><div class='add'>+	u16 max_bit_rate = 0;</div><div class='add'>+	u8 rx_chains_num = il-&gt;hw_params.rx_chains_num;</div><div class='add'>+	u8 tx_chains_num = il-&gt;hw_params.tx_chains_num;</div><div class='add'>+</div><div class='add'>+	ht_info-&gt;cap = 0;</div><div class='add'>+	memset(&amp;ht_info-&gt;mcs, 0, sizeof(ht_info-&gt;mcs));</div><div class='add'>+</div><div class='add'>+	ht_info-&gt;ht_supported = true;</div><div class='add'>+</div><div class='add'>+	ht_info-&gt;cap |= IEEE80211_HT_CAP_SGI_20;</div><div class='add'>+	max_bit_rate = MAX_BIT_RATE_20_MHZ;</div><div class='add'>+	if (il-&gt;hw_params.ht40_channel &amp; BIT(band)) {</div><div class='add'>+		ht_info-&gt;cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;</div><div class='add'>+		ht_info-&gt;cap |= IEEE80211_HT_CAP_SGI_40;</div><div class='add'>+		ht_info-&gt;mcs.rx_mask[4] = 0x01;</div><div class='add'>+		max_bit_rate = MAX_BIT_RATE_40_MHZ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (il-&gt;cfg-&gt;mod_params-&gt;amsdu_size_8K)</div><div class='add'>+		ht_info-&gt;cap |= IEEE80211_HT_CAP_MAX_AMSDU;</div><div class='add'>+</div><div class='add'>+	ht_info-&gt;ampdu_factor = CFG_HT_RX_AMPDU_FACTOR_DEF;</div><div class='add'>+	ht_info-&gt;ampdu_density = CFG_HT_MPDU_DENSITY_DEF;</div><div class='add'>+</div><div class='add'>+	ht_info-&gt;mcs.rx_mask[0] = 0xFF;</div><div class='add'>+	if (rx_chains_num &gt;= 2)</div><div class='add'>+		ht_info-&gt;mcs.rx_mask[1] = 0xFF;</div><div class='add'>+	if (rx_chains_num &gt;= 3)</div><div class='add'>+		ht_info-&gt;mcs.rx_mask[2] = 0xFF;</div><div class='add'>+</div><div class='add'>+	/* Highest supported Rx data rate */</div><div class='add'>+	max_bit_rate *= rx_chains_num;</div><div class='add'>+	WARN_ON(max_bit_rate &amp; ~IEEE80211_HT_MCS_RX_HIGHEST_MASK);</div><div class='add'>+	ht_info-&gt;mcs.rx_highest = cpu_to_le16(max_bit_rate);</div><div class='add'>+</div><div class='add'>+	/* Tx MCS capabilities */</div><div class='add'>+	ht_info-&gt;mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;</div><div class='add'>+	if (tx_chains_num != rx_chains_num) {</div><div class='add'>+		ht_info-&gt;mcs.tx_params |= IEEE80211_HT_MCS_TX_RX_DIFF;</div><div class='add'>+		ht_info-&gt;mcs.tx_params |=</div><div class='add'>+		    ((tx_chains_num -</div><div class='add'>+		      1) &lt;&lt; IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_init_geos - Initialize mac80211's geo/channel info based from eeprom</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il_init_geos(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_channel_info *ch;</div><div class='add'>+	struct ieee80211_supported_band *sband;</div><div class='add'>+	struct ieee80211_channel *channels;</div><div class='add'>+	struct ieee80211_channel *geo_ch;</div><div class='add'>+	struct ieee80211_rate *rates;</div><div class='add'>+	int i = 0;</div><div class='add'>+	s8 max_tx_power = 0;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;bands[IEEE80211_BAND_2GHZ].n_bitrates ||</div><div class='add'>+	    il-&gt;bands[IEEE80211_BAND_5GHZ].n_bitrates) {</div><div class='add'>+		D_INFO("Geography modes already initialized.\n");</div><div class='add'>+		set_bit(S_GEO_CONFIGURED, &amp;il-&gt;status);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	channels =</div><div class='add'>+	    kzalloc(sizeof(struct ieee80211_channel) * il-&gt;channel_count,</div><div class='add'>+		    GFP_KERNEL);</div><div class='add'>+	if (!channels)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rates =</div><div class='add'>+	    kzalloc((sizeof(struct ieee80211_rate) * RATE_COUNT_LEGACY),</div><div class='add'>+		    GFP_KERNEL);</div><div class='add'>+	if (!rates) {</div><div class='add'>+		kfree(channels);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 5.2GHz channels start after the 2.4GHz channels */</div><div class='add'>+	sband = &amp;il-&gt;bands[IEEE80211_BAND_5GHZ];</div><div class='add'>+	sband-&gt;channels = &amp;channels[ARRAY_SIZE(il_eeprom_band_1)];</div><div class='add'>+	/* just OFDM */</div><div class='add'>+	sband-&gt;bitrates = &amp;rates[IL_FIRST_OFDM_RATE];</div><div class='add'>+	sband-&gt;n_bitrates = RATE_COUNT_LEGACY - IL_FIRST_OFDM_RATE;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;cfg-&gt;sku &amp; IL_SKU_N)</div><div class='add'>+		il_init_ht_hw_capab(il, &amp;sband-&gt;ht_cap, IEEE80211_BAND_5GHZ);</div><div class='add'>+</div><div class='add'>+	sband = &amp;il-&gt;bands[IEEE80211_BAND_2GHZ];</div><div class='add'>+	sband-&gt;channels = channels;</div><div class='add'>+	/* OFDM &amp; CCK */</div><div class='add'>+	sband-&gt;bitrates = rates;</div><div class='add'>+	sband-&gt;n_bitrates = RATE_COUNT_LEGACY;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;cfg-&gt;sku &amp; IL_SKU_N)</div><div class='add'>+		il_init_ht_hw_capab(il, &amp;sband-&gt;ht_cap, IEEE80211_BAND_2GHZ);</div><div class='add'>+</div><div class='add'>+	il-&gt;ieee_channels = channels;</div><div class='add'>+	il-&gt;ieee_rates = rates;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; il-&gt;channel_count; i++) {</div><div class='add'>+		ch = &amp;il-&gt;channel_info[i];</div><div class='add'>+</div><div class='add'>+		if (!il_is_channel_valid(ch))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sband = &amp;il-&gt;bands[ch-&gt;band];</div><div class='add'>+</div><div class='add'>+		geo_ch = &amp;sband-&gt;channels[sband-&gt;n_channels++];</div><div class='add'>+</div><div class='add'>+		geo_ch-&gt;center_freq =</div><div class='add'>+		    ieee80211_channel_to_frequency(ch-&gt;channel, ch-&gt;band);</div><div class='add'>+		geo_ch-&gt;max_power = ch-&gt;max_power_avg;</div><div class='add'>+		geo_ch-&gt;max_antenna_gain = 0xff;</div><div class='add'>+		geo_ch-&gt;hw_value = ch-&gt;channel;</div><div class='add'>+</div><div class='add'>+		if (il_is_channel_valid(ch)) {</div><div class='add'>+			if (!(ch-&gt;flags &amp; EEPROM_CHANNEL_IBSS))</div><div class='add'>+				geo_ch-&gt;flags |= IEEE80211_CHAN_NO_IBSS;</div><div class='add'>+</div><div class='add'>+			if (!(ch-&gt;flags &amp; EEPROM_CHANNEL_ACTIVE))</div><div class='add'>+				geo_ch-&gt;flags |= IEEE80211_CHAN_PASSIVE_SCAN;</div><div class='add'>+</div><div class='add'>+			if (ch-&gt;flags &amp; EEPROM_CHANNEL_RADAR)</div><div class='add'>+				geo_ch-&gt;flags |= IEEE80211_CHAN_RADAR;</div><div class='add'>+</div><div class='add'>+			geo_ch-&gt;flags |= ch-&gt;ht40_extension_channel;</div><div class='add'>+</div><div class='add'>+			if (ch-&gt;max_power_avg &gt; max_tx_power)</div><div class='add'>+				max_tx_power = ch-&gt;max_power_avg;</div><div class='add'>+		} else {</div><div class='add'>+			geo_ch-&gt;flags |= IEEE80211_CHAN_DISABLED;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		D_INFO("Channel %d Freq=%d[%sGHz] %s flag=0x%X\n", ch-&gt;channel,</div><div class='add'>+		       geo_ch-&gt;center_freq,</div><div class='add'>+		       il_is_channel_a_band(ch) ? "5.2" : "2.4",</div><div class='add'>+		       geo_ch-&gt;</div><div class='add'>+		       flags &amp; IEEE80211_CHAN_DISABLED ? "restricted" : "valid",</div><div class='add'>+		       geo_ch-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il-&gt;tx_power_device_lmt = max_tx_power;</div><div class='add'>+	il-&gt;tx_power_user_lmt = max_tx_power;</div><div class='add'>+	il-&gt;tx_power_next = max_tx_power;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;bands[IEEE80211_BAND_5GHZ].n_channels == 0 &amp;&amp;</div><div class='add'>+	    (il-&gt;cfg-&gt;sku &amp; IL_SKU_A)) {</div><div class='add'>+		IL_INFO("Incorrectly detected BG card as ABG. "</div><div class='add'>+			"Please send your PCI ID 0x%04X:0x%04X to maintainer.\n",</div><div class='add'>+			il-&gt;pci_dev-&gt;device, il-&gt;pci_dev-&gt;subsystem_device);</div><div class='add'>+		il-&gt;cfg-&gt;sku &amp;= ~IL_SKU_A;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IL_INFO("Tunable channels: %d 802.11bg, %d 802.11a channels\n",</div><div class='add'>+		il-&gt;bands[IEEE80211_BAND_2GHZ].n_channels,</div><div class='add'>+		il-&gt;bands[IEEE80211_BAND_5GHZ].n_channels);</div><div class='add'>+</div><div class='add'>+	set_bit(S_GEO_CONFIGURED, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_init_geos);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * il_free_geos - undo allocations in il_init_geos</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il_free_geos(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	kfree(il-&gt;ieee_channels);</div><div class='add'>+	kfree(il-&gt;ieee_rates);</div><div class='add'>+	clear_bit(S_GEO_CONFIGURED, &amp;il-&gt;status);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_free_geos);</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+il_is_channel_extension(struct il_priv *il, enum ieee80211_band band,</div><div class='add'>+			u16 channel, u8 extension_chan_offset)</div><div class='add'>+{</div><div class='add'>+	const struct il_channel_info *ch_info;</div><div class='add'>+</div><div class='add'>+	ch_info = il_get_channel_info(il, band, channel);</div><div class='add'>+	if (!il_is_channel_valid(ch_info))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_ABOVE)</div><div class='add'>+		return !(ch_info-&gt;</div><div class='add'>+			 ht40_extension_channel &amp; IEEE80211_CHAN_NO_HT40PLUS);</div><div class='add'>+	else if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_BELOW)</div><div class='add'>+		return !(ch_info-&gt;</div><div class='add'>+			 ht40_extension_channel &amp; IEEE80211_CHAN_NO_HT40MINUS);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool</div><div class='add'>+il_is_ht40_tx_allowed(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+		      struct ieee80211_sta_ht_cap *ht_cap)</div><div class='add'>+{</div><div class='add'>+	if (!ctx-&gt;ht.enabled || !ctx-&gt;ht.is_40mhz)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We do not check for IEEE80211_HT_CAP_SUP_WIDTH_20_40</div><div class='add'>+	 * the bit will not set if it is pure 40MHz case</div><div class='add'>+	 */</div><div class='add'>+	if (ht_cap &amp;&amp; !ht_cap-&gt;ht_supported)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+	if (il-&gt;disable_ht40)</div><div class='add'>+		return false;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return il_is_channel_extension(il, il-&gt;band,</div><div class='add'>+				       le16_to_cpu(ctx-&gt;staging.channel),</div><div class='add'>+				       ctx-&gt;ht.extension_chan_offset);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_is_ht40_tx_allowed);</div><div class='add'>+</div><div class='add'>+static u16</div><div class='add'>+il_adjust_beacon_interval(u16 beacon_val, u16 max_beacon_val)</div><div class='add'>+{</div><div class='add'>+	u16 new_val;</div><div class='add'>+	u16 beacon_factor;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If mac80211 hasn't given us a beacon interval, program</div><div class='add'>+	 * the default into the device.</div><div class='add'>+	 */</div><div class='add'>+	if (!beacon_val)</div><div class='add'>+		return DEFAULT_BEACON_INTERVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the beacon interval we obtained from the peer</div><div class='add'>+	 * is too large, we'll have to wake up more often</div><div class='add'>+	 * (and in IBSS case, we'll beacon too much)</div><div class='add'>+	 *</div><div class='add'>+	 * For example, if max_beacon_val is 4096, and the</div><div class='add'>+	 * requested beacon interval is 7000, we'll have to</div><div class='add'>+	 * use 3500 to be able to wake up on the beacons.</div><div class='add'>+	 *</div><div class='add'>+	 * This could badly influence beacon detection stats.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	beacon_factor = (beacon_val + max_beacon_val) / max_beacon_val;</div><div class='add'>+	new_val = beacon_val / beacon_factor;</div><div class='add'>+</div><div class='add'>+	if (!new_val)</div><div class='add'>+		new_val = max_beacon_val;</div><div class='add'>+</div><div class='add'>+	return new_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_send_rxon_timing(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	u64 tsf;</div><div class='add'>+	s32 interval_tm, rem;</div><div class='add'>+	struct ieee80211_conf *conf = NULL;</div><div class='add'>+	u16 beacon_int;</div><div class='add'>+	struct ieee80211_vif *vif = ctx-&gt;vif;</div><div class='add'>+</div><div class='add'>+	conf = &amp;il-&gt;hw-&gt;conf;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	memset(&amp;ctx-&gt;timing, 0, sizeof(struct il_rxon_time_cmd));</div><div class='add'>+</div><div class='add'>+	ctx-&gt;timing.timestamp = cpu_to_le64(il-&gt;timestamp);</div><div class='add'>+	ctx-&gt;timing.listen_interval = cpu_to_le16(conf-&gt;listen_interval);</div><div class='add'>+</div><div class='add'>+	beacon_int = vif ? vif-&gt;bss_conf.beacon_int : 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * TODO: For IBSS we need to get atim_win from mac80211,</div><div class='add'>+	 *       for now just always use 0</div><div class='add'>+	 */</div><div class='add'>+	ctx-&gt;timing.atim_win = 0;</div><div class='add'>+</div><div class='add'>+	beacon_int =</div><div class='add'>+	    il_adjust_beacon_interval(beacon_int,</div><div class='add'>+				      il-&gt;hw_params.max_beacon_itrvl *</div><div class='add'>+				      TIME_UNIT);</div><div class='add'>+	ctx-&gt;timing.beacon_interval = cpu_to_le16(beacon_int);</div><div class='add'>+</div><div class='add'>+	tsf = il-&gt;timestamp;	/* tsf is modifed by do_div: copy it */</div><div class='add'>+	interval_tm = beacon_int * TIME_UNIT;</div><div class='add'>+	rem = do_div(tsf, interval_tm);</div><div class='add'>+	ctx-&gt;timing.beacon_init_val = cpu_to_le32(interval_tm - rem);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;timing.dtim_period = vif ? (vif-&gt;bss_conf.dtim_period ? : 1) : 1;</div><div class='add'>+</div><div class='add'>+	D_ASSOC("beacon interval %d beacon timer %d beacon tim %d\n",</div><div class='add'>+		le16_to_cpu(ctx-&gt;timing.beacon_interval),</div><div class='add'>+		le32_to_cpu(ctx-&gt;timing.beacon_init_val),</div><div class='add'>+		le16_to_cpu(ctx-&gt;timing.atim_win));</div><div class='add'>+</div><div class='add'>+	return il_send_cmd_pdu(il, ctx-&gt;rxon_timing_cmd, sizeof(ctx-&gt;timing),</div><div class='add'>+			       &amp;ctx-&gt;timing);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_send_rxon_timing);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_set_rxon_hwcrypto(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+		     int hw_decrypt)</div><div class='add'>+{</div><div class='add'>+	struct il_rxon_cmd *rxon = &amp;ctx-&gt;staging;</div><div class='add'>+</div><div class='add'>+	if (hw_decrypt)</div><div class='add'>+		rxon-&gt;filter_flags &amp;= ~RXON_FILTER_DIS_DECRYPT_MSK;</div><div class='add'>+	else</div><div class='add'>+		rxon-&gt;filter_flags |= RXON_FILTER_DIS_DECRYPT_MSK;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_set_rxon_hwcrypto);</div><div class='add'>+</div><div class='add'>+/* validate RXON structure is valid */</div><div class='add'>+int</div><div class='add'>+il_check_rxon_cmd(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct il_rxon_cmd *rxon = &amp;ctx-&gt;staging;</div><div class='add'>+	bool error = false;</div><div class='add'>+</div><div class='add'>+	if (rxon-&gt;flags &amp; RXON_FLG_BAND_24G_MSK) {</div><div class='add'>+		if (rxon-&gt;flags &amp; RXON_FLG_TGJ_NARROW_BAND_MSK) {</div><div class='add'>+			IL_WARN("check 2.4G: wrong narrow\n");</div><div class='add'>+			error = true;</div><div class='add'>+		}</div><div class='add'>+		if (rxon-&gt;flags &amp; RXON_FLG_RADAR_DETECT_MSK) {</div><div class='add'>+			IL_WARN("check 2.4G: wrong radar\n");</div><div class='add'>+			error = true;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (!(rxon-&gt;flags &amp; RXON_FLG_SHORT_SLOT_MSK)) {</div><div class='add'>+			IL_WARN("check 5.2G: not short slot!\n");</div><div class='add'>+			error = true;</div><div class='add'>+		}</div><div class='add'>+		if (rxon-&gt;flags &amp; RXON_FLG_CCK_MSK) {</div><div class='add'>+			IL_WARN("check 5.2G: CCK!\n");</div><div class='add'>+			error = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if ((rxon-&gt;node_addr[0] | rxon-&gt;bssid_addr[0]) &amp; 0x1) {</div><div class='add'>+		IL_WARN("mac/bssid mcast!\n");</div><div class='add'>+		error = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* make sure basic rates 6Mbps and 1Mbps are supported */</div><div class='add'>+	if ((rxon-&gt;ofdm_basic_rates &amp; RATE_6M_MASK) == 0 &amp;&amp;</div><div class='add'>+	    (rxon-&gt;cck_basic_rates &amp; RATE_1M_MASK) == 0) {</div><div class='add'>+		IL_WARN("neither 1 nor 6 are basic\n");</div><div class='add'>+		error = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (le16_to_cpu(rxon-&gt;assoc_id) &gt; 2007) {</div><div class='add'>+		IL_WARN("aid &gt; 2007\n");</div><div class='add'>+		error = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((rxon-&gt;flags &amp; (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)) ==</div><div class='add'>+	    (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)) {</div><div class='add'>+		IL_WARN("CCK and short slot\n");</div><div class='add'>+		error = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((rxon-&gt;flags &amp; (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)) ==</div><div class='add'>+	    (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)) {</div><div class='add'>+		IL_WARN("CCK and auto detect");</div><div class='add'>+		error = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((rxon-&gt;</div><div class='add'>+	     flags &amp; (RXON_FLG_AUTO_DETECT_MSK | RXON_FLG_TGG_PROTECT_MSK)) ==</div><div class='add'>+	    RXON_FLG_TGG_PROTECT_MSK) {</div><div class='add'>+		IL_WARN("TGg but no auto-detect\n");</div><div class='add'>+		error = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (error)</div><div class='add'>+		IL_WARN("Tuning to channel %d\n", le16_to_cpu(rxon-&gt;channel));</div><div class='add'>+</div><div class='add'>+	if (error) {</div><div class='add'>+		IL_ERR("Invalid RXON\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_check_rxon_cmd);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_full_rxon_required - check if full RXON (vs RXON_ASSOC) cmd is needed</div><div class='add'>+ * @il: staging_rxon is compared to active_rxon</div><div class='add'>+ *</div><div class='add'>+ * If the RXON structure is changing enough to require a new tune,</div><div class='add'>+ * or is clearing the RXON_FILTER_ASSOC_MSK, then return 1 to indicate that</div><div class='add'>+ * a new tune (full RXON command, rather than RXON_ASSOC cmd) is required.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il_full_rxon_required(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct il_rxon_cmd *staging = &amp;ctx-&gt;staging;</div><div class='add'>+	const struct il_rxon_cmd *active = &amp;ctx-&gt;active;</div><div class='add'>+</div><div class='add'>+#define CHK(cond)							\</div><div class='add'>+	if ((cond)) {							\</div><div class='add'>+		D_INFO("need full RXON - " #cond "\n");	\</div><div class='add'>+		return 1;						\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define CHK_NEQ(c1, c2)						\</div><div class='add'>+	if ((c1) != (c2)) {					\</div><div class='add'>+		D_INFO("need full RXON - "	\</div><div class='add'>+			       #c1 " != " #c2 " - %d != %d\n",	\</div><div class='add'>+			       (c1), (c2));			\</div><div class='add'>+		return 1;					\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* These items are only settable from the full RXON command */</div><div class='add'>+	CHK(!il_is_associated_ctx(ctx));</div><div class='add'>+	CHK(compare_ether_addr(staging-&gt;bssid_addr, active-&gt;bssid_addr));</div><div class='add'>+	CHK(compare_ether_addr(staging-&gt;node_addr, active-&gt;node_addr));</div><div class='add'>+	CHK(compare_ether_addr</div><div class='add'>+	    (staging-&gt;wlap_bssid_addr, active-&gt;wlap_bssid_addr));</div><div class='add'>+	CHK_NEQ(staging-&gt;dev_type, active-&gt;dev_type);</div><div class='add'>+	CHK_NEQ(staging-&gt;channel, active-&gt;channel);</div><div class='add'>+	CHK_NEQ(staging-&gt;air_propagation, active-&gt;air_propagation);</div><div class='add'>+	CHK_NEQ(staging-&gt;ofdm_ht_single_stream_basic_rates,</div><div class='add'>+		active-&gt;ofdm_ht_single_stream_basic_rates);</div><div class='add'>+	CHK_NEQ(staging-&gt;ofdm_ht_dual_stream_basic_rates,</div><div class='add'>+		active-&gt;ofdm_ht_dual_stream_basic_rates);</div><div class='add'>+	CHK_NEQ(staging-&gt;assoc_id, active-&gt;assoc_id);</div><div class='add'>+</div><div class='add'>+	/* flags, filter_flags, ofdm_basic_rates, and cck_basic_rates can</div><div class='add'>+	 * be updated with the RXON_ASSOC command -- however only some</div><div class='add'>+	 * flag transitions are allowed using RXON_ASSOC */</div><div class='add'>+</div><div class='add'>+	/* Check if we are not switching bands */</div><div class='add'>+	CHK_NEQ(staging-&gt;flags &amp; RXON_FLG_BAND_24G_MSK,</div><div class='add'>+		active-&gt;flags &amp; RXON_FLG_BAND_24G_MSK);</div><div class='add'>+</div><div class='add'>+	/* Check if we are switching association toggle */</div><div class='add'>+	CHK_NEQ(staging-&gt;filter_flags &amp; RXON_FILTER_ASSOC_MSK,</div><div class='add'>+		active-&gt;filter_flags &amp; RXON_FILTER_ASSOC_MSK);</div><div class='add'>+</div><div class='add'>+#undef CHK</div><div class='add'>+#undef CHK_NEQ</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_full_rxon_required);</div><div class='add'>+</div><div class='add'>+u8</div><div class='add'>+il_get_lowest_plcp(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Assign the lowest rate -- should really get this from</div><div class='add'>+	 * the beacon skb from mac80211.</div><div class='add'>+	 */</div><div class='add'>+	if (ctx-&gt;staging.flags &amp; RXON_FLG_BAND_24G_MSK)</div><div class='add'>+		return RATE_1M_PLCP;</div><div class='add'>+	else</div><div class='add'>+		return RATE_6M_PLCP;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_get_lowest_plcp);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+_il_set_rxon_ht(struct il_priv *il, struct il_ht_config *ht_conf,</div><div class='add'>+		struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct il_rxon_cmd *rxon = &amp;ctx-&gt;staging;</div><div class='add'>+</div><div class='add'>+	if (!ctx-&gt;ht.enabled) {</div><div class='add'>+		rxon-&gt;flags &amp;=</div><div class='add'>+		    ~(RXON_FLG_CHANNEL_MODE_MSK |</div><div class='add'>+		      RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK | RXON_FLG_HT40_PROT_MSK</div><div class='add'>+		      | RXON_FLG_HT_PROT_MSK);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rxon-&gt;flags |=</div><div class='add'>+	    cpu_to_le32(ctx-&gt;ht.protection &lt;&lt; RXON_FLG_HT_OPERATING_MODE_POS);</div><div class='add'>+</div><div class='add'>+	/* Set up channel bandwidth:</div><div class='add'>+	 * 20 MHz only, 20/40 mixed or pure 40 if ht40 ok */</div><div class='add'>+	/* clear the HT channel mode before set the mode */</div><div class='add'>+	rxon-&gt;flags &amp;=</div><div class='add'>+	    ~(RXON_FLG_CHANNEL_MODE_MSK | RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK);</div><div class='add'>+	if (il_is_ht40_tx_allowed(il, ctx, NULL)) {</div><div class='add'>+		/* pure ht40 */</div><div class='add'>+		if (ctx-&gt;ht.protection == IEEE80211_HT_OP_MODE_PROTECTION_20MHZ) {</div><div class='add'>+			rxon-&gt;flags |= RXON_FLG_CHANNEL_MODE_PURE_40;</div><div class='add'>+			/* Note: control channel is opposite of extension channel */</div><div class='add'>+			switch (ctx-&gt;ht.extension_chan_offset) {</div><div class='add'>+			case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:</div><div class='add'>+				rxon-&gt;flags &amp;=</div><div class='add'>+				    ~RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;</div><div class='add'>+				break;</div><div class='add'>+			case IEEE80211_HT_PARAM_CHA_SEC_BELOW:</div><div class='add'>+				rxon-&gt;flags |= RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			/* Note: control channel is opposite of extension channel */</div><div class='add'>+			switch (ctx-&gt;ht.extension_chan_offset) {</div><div class='add'>+			case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:</div><div class='add'>+				rxon-&gt;flags &amp;=</div><div class='add'>+				    ~(RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK);</div><div class='add'>+				rxon-&gt;flags |= RXON_FLG_CHANNEL_MODE_MIXED;</div><div class='add'>+				break;</div><div class='add'>+			case IEEE80211_HT_PARAM_CHA_SEC_BELOW:</div><div class='add'>+				rxon-&gt;flags |= RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;</div><div class='add'>+				rxon-&gt;flags |= RXON_FLG_CHANNEL_MODE_MIXED;</div><div class='add'>+				break;</div><div class='add'>+			case IEEE80211_HT_PARAM_CHA_SEC_NONE:</div><div class='add'>+			default:</div><div class='add'>+				/* channel location only valid if in Mixed mode */</div><div class='add'>+				IL_ERR("invalid extension channel offset\n");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		rxon-&gt;flags |= RXON_FLG_CHANNEL_MODE_LEGACY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain)</div><div class='add'>+		il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain(il, ctx);</div><div class='add'>+</div><div class='add'>+	D_ASSOC("rxon flags 0x%X operation mode :0x%X "</div><div class='add'>+		"extension channel offset 0x%x\n", le32_to_cpu(rxon-&gt;flags),</div><div class='add'>+		ctx-&gt;ht.protection, ctx-&gt;ht.extension_chan_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_set_rxon_ht(struct il_priv *il, struct il_ht_config *ht_conf)</div><div class='add'>+{</div><div class='add'>+	_il_set_rxon_ht(il, ht_conf, &amp;il-&gt;ctx);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_set_rxon_ht);</div><div class='add'>+</div><div class='add'>+/* Return valid, unused, channel for a passive scan to reset the RF */</div><div class='add'>+u8</div><div class='add'>+il_get_single_channel_number(struct il_priv *il, enum ieee80211_band band)</div><div class='add'>+{</div><div class='add'>+	const struct il_channel_info *ch_info;</div><div class='add'>+	int i;</div><div class='add'>+	u8 channel = 0;</div><div class='add'>+	u8 min, max;</div><div class='add'>+</div><div class='add'>+	if (band == IEEE80211_BAND_5GHZ) {</div><div class='add'>+		min = 14;</div><div class='add'>+		max = il-&gt;channel_count;</div><div class='add'>+	} else {</div><div class='add'>+		min = 0;</div><div class='add'>+		max = 14;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = min; i &lt; max; i++) {</div><div class='add'>+		channel = il-&gt;channel_info[i].channel;</div><div class='add'>+		if (channel == le16_to_cpu(il-&gt;ctx.staging.channel))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ch_info = il_get_channel_info(il, band, channel);</div><div class='add'>+		if (il_is_channel_valid(ch_info))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return channel;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_get_single_channel_number);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_set_rxon_channel - Set the band and channel values in staging RXON</div><div class='add'>+ * @ch: requested channel as a pointer to struct ieee80211_channel</div><div class='add'>+</div><div class='add'>+ * NOTE:  Does not commit to the hardware; it sets appropriate bit fields</div><div class='add'>+ * in the staging RXON flag structure based on the ch-&gt;band</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il_set_rxon_channel(struct il_priv *il, struct ieee80211_channel *ch,</div><div class='add'>+		    struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	enum ieee80211_band band = ch-&gt;band;</div><div class='add'>+	u16 channel = ch-&gt;hw_value;</div><div class='add'>+</div><div class='add'>+	if (le16_to_cpu(ctx-&gt;staging.channel) == channel &amp;&amp; il-&gt;band == band)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;staging.channel = cpu_to_le16(channel);</div><div class='add'>+	if (band == IEEE80211_BAND_5GHZ)</div><div class='add'>+		ctx-&gt;staging.flags &amp;= ~RXON_FLG_BAND_24G_MSK;</div><div class='add'>+	else</div><div class='add'>+		ctx-&gt;staging.flags |= RXON_FLG_BAND_24G_MSK;</div><div class='add'>+</div><div class='add'>+	il-&gt;band = band;</div><div class='add'>+</div><div class='add'>+	D_INFO("Staging channel set to %d [%d]\n", channel, band);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_set_rxon_channel);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_set_flags_for_band(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+		      enum ieee80211_band band, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	if (band == IEEE80211_BAND_5GHZ) {</div><div class='add'>+		ctx-&gt;staging.flags &amp;=</div><div class='add'>+		    ~(RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK |</div><div class='add'>+		      RXON_FLG_CCK_MSK);</div><div class='add'>+		ctx-&gt;staging.flags |= RXON_FLG_SHORT_SLOT_MSK;</div><div class='add'>+	} else {</div><div class='add'>+		/* Copied from il_post_associate() */</div><div class='add'>+		if (vif &amp;&amp; vif-&gt;bss_conf.use_short_slot)</div><div class='add'>+			ctx-&gt;staging.flags |= RXON_FLG_SHORT_SLOT_MSK;</div><div class='add'>+		else</div><div class='add'>+			ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_SLOT_MSK;</div><div class='add'>+</div><div class='add'>+		ctx-&gt;staging.flags |= RXON_FLG_BAND_24G_MSK;</div><div class='add'>+		ctx-&gt;staging.flags |= RXON_FLG_AUTO_DETECT_MSK;</div><div class='add'>+		ctx-&gt;staging.flags &amp;= ~RXON_FLG_CCK_MSK;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_set_flags_for_band);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * initialize rxon structure with default values from eeprom</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il_connection_init_rx_config(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct il_channel_info *ch_info;</div><div class='add'>+</div><div class='add'>+	memset(&amp;ctx-&gt;staging, 0, sizeof(ctx-&gt;staging));</div><div class='add'>+</div><div class='add'>+	if (!ctx-&gt;vif) {</div><div class='add'>+		ctx-&gt;staging.dev_type = ctx-&gt;unused_devtype;</div><div class='add'>+	} else</div><div class='add'>+		switch (ctx-&gt;vif-&gt;type) {</div><div class='add'>+</div><div class='add'>+		case NL80211_IFTYPE_STATION:</div><div class='add'>+			ctx-&gt;staging.dev_type = ctx-&gt;station_devtype;</div><div class='add'>+			ctx-&gt;staging.filter_flags = RXON_FILTER_ACCEPT_GRP_MSK;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case NL80211_IFTYPE_ADHOC:</div><div class='add'>+			ctx-&gt;staging.dev_type = ctx-&gt;ibss_devtype;</div><div class='add'>+			ctx-&gt;staging.flags = RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='add'>+			ctx-&gt;staging.filter_flags =</div><div class='add'>+			    RXON_FILTER_BCON_AWARE_MSK |</div><div class='add'>+			    RXON_FILTER_ACCEPT_GRP_MSK;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			IL_ERR("Unsupported interface type %d\n",</div><div class='add'>+			       ctx-&gt;vif-&gt;type);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+	/* TODO:  Figure out when short_preamble would be set and cache from</div><div class='add'>+	 * that */</div><div class='add'>+	if (!hw_to_local(il-&gt;hw)-&gt;short_preamble)</div><div class='add'>+		ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='add'>+	else</div><div class='add'>+		ctx-&gt;staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	ch_info =</div><div class='add'>+	    il_get_channel_info(il, il-&gt;band, le16_to_cpu(ctx-&gt;active.channel));</div><div class='add'>+</div><div class='add'>+	if (!ch_info)</div><div class='add'>+		ch_info = &amp;il-&gt;channel_info[0];</div><div class='add'>+</div><div class='add'>+	ctx-&gt;staging.channel = cpu_to_le16(ch_info-&gt;channel);</div><div class='add'>+	il-&gt;band = ch_info-&gt;band;</div><div class='add'>+</div><div class='add'>+	il_set_flags_for_band(il, ctx, il-&gt;band, ctx-&gt;vif);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;staging.ofdm_basic_rates =</div><div class='add'>+	    (IL_OFDM_RATES_MASK &gt;&gt; IL_FIRST_OFDM_RATE) &amp; 0xFF;</div><div class='add'>+	ctx-&gt;staging.cck_basic_rates =</div><div class='add'>+	    (IL_CCK_RATES_MASK &gt;&gt; IL_FIRST_CCK_RATE) &amp; 0xF;</div><div class='add'>+</div><div class='add'>+	/* clear both MIX and PURE40 mode flag */</div><div class='add'>+	ctx-&gt;staging.flags &amp;=</div><div class='add'>+	    ~(RXON_FLG_CHANNEL_MODE_MIXED | RXON_FLG_CHANNEL_MODE_PURE_40);</div><div class='add'>+	if (ctx-&gt;vif)</div><div class='add'>+		memcpy(ctx-&gt;staging.node_addr, ctx-&gt;vif-&gt;addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;staging.ofdm_ht_single_stream_basic_rates = 0xff;</div><div class='add'>+	ctx-&gt;staging.ofdm_ht_dual_stream_basic_rates = 0xff;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_connection_init_rx_config);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_set_rate(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_supported_band *hw = NULL;</div><div class='add'>+	struct ieee80211_rate *rate;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	hw = il_get_hw_mode(il, il-&gt;band);</div><div class='add'>+	if (!hw) {</div><div class='add'>+		IL_ERR("Failed to set rate: unable to get hw mode\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il-&gt;active_rate = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; hw-&gt;n_bitrates; i++) {</div><div class='add'>+		rate = &amp;(hw-&gt;bitrates[i]);</div><div class='add'>+		if (rate-&gt;hw_value &lt; RATE_COUNT_LEGACY)</div><div class='add'>+			il-&gt;active_rate |= (1 &lt;&lt; rate-&gt;hw_value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_RATE("Set active_rate = %0x\n", il-&gt;active_rate);</div><div class='add'>+</div><div class='add'>+	il-&gt;ctx.staging.cck_basic_rates =</div><div class='add'>+	    (IL_CCK_BASIC_RATES_MASK &gt;&gt; IL_FIRST_CCK_RATE) &amp; 0xF;</div><div class='add'>+</div><div class='add'>+	il-&gt;ctx.staging.ofdm_basic_rates =</div><div class='add'>+	    (IL_OFDM_BASIC_RATES_MASK &gt;&gt; IL_FIRST_OFDM_RATE) &amp; 0xFF;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_set_rate);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_chswitch_done(struct il_priv *il, bool is_success)</div><div class='add'>+{</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(S_CHANNEL_SWITCH_PENDING, &amp;il-&gt;status))</div><div class='add'>+		ieee80211_chswitch_done(ctx-&gt;vif, is_success);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_chswitch_done);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_hdl_csa(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	struct il_csa_notification *csa = &amp;(pkt-&gt;u.csa_notif);</div><div class='add'>+</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+	struct il_rxon_cmd *rxon = (void *)&amp;ctx-&gt;active;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(S_CHANNEL_SWITCH_PENDING, &amp;il-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!le32_to_cpu(csa-&gt;status) &amp;&amp; csa-&gt;channel == il-&gt;switch_channel) {</div><div class='add'>+		rxon-&gt;channel = csa-&gt;channel;</div><div class='add'>+		ctx-&gt;staging.channel = csa-&gt;channel;</div><div class='add'>+		D_11H("CSA notif: channel %d\n", le16_to_cpu(csa-&gt;channel));</div><div class='add'>+		il_chswitch_done(il, true);</div><div class='add'>+	} else {</div><div class='add'>+		IL_ERR("CSA notif (fail) : channel %d\n",</div><div class='add'>+		       le16_to_cpu(csa-&gt;channel));</div><div class='add'>+		il_chswitch_done(il, false);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_hdl_csa);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+void</div><div class='add'>+il_print_rx_config_cmd(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct il_rxon_cmd *rxon = &amp;ctx-&gt;staging;</div><div class='add'>+</div><div class='add'>+	D_RADIO("RX CONFIG:\n");</div><div class='add'>+	il_print_hex_dump(il, IL_DL_RADIO, (u8 *) rxon, sizeof(*rxon));</div><div class='add'>+	D_RADIO("u16 channel: 0x%x\n", le16_to_cpu(rxon-&gt;channel));</div><div class='add'>+	D_RADIO("u32 flags: 0x%08X\n", le32_to_cpu(rxon-&gt;flags));</div><div class='add'>+	D_RADIO("u32 filter_flags: 0x%08x\n", le32_to_cpu(rxon-&gt;filter_flags));</div><div class='add'>+	D_RADIO("u8 dev_type: 0x%x\n", rxon-&gt;dev_type);</div><div class='add'>+	D_RADIO("u8 ofdm_basic_rates: 0x%02x\n", rxon-&gt;ofdm_basic_rates);</div><div class='add'>+	D_RADIO("u8 cck_basic_rates: 0x%02x\n", rxon-&gt;cck_basic_rates);</div><div class='add'>+	D_RADIO("u8[6] node_addr: %pM\n", rxon-&gt;node_addr);</div><div class='add'>+	D_RADIO("u8[6] bssid_addr: %pM\n", rxon-&gt;bssid_addr);</div><div class='add'>+	D_RADIO("u16 assoc_id: 0x%x\n", le16_to_cpu(rxon-&gt;assoc_id));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_print_rx_config_cmd);</div><div class='add'>+#endif</div><div class='add'>+/**</div><div class='add'>+ * il_irq_handle_error - called for HW or SW error interrupt from card</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il_irq_handle_error(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	/* Set the FW error flag -- cleared on il_down */</div><div class='add'>+	set_bit(S_FW_ERROR, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* Cancel currently queued command. */</div><div class='add'>+	clear_bit(S_HCMD_ACTIVE, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	IL_ERR("Loaded firmware version: %s\n", il-&gt;hw-&gt;wiphy-&gt;fw_version);</div><div class='add'>+</div><div class='add'>+	il-&gt;cfg-&gt;ops-&gt;lib-&gt;dump_nic_error_log(il);</div><div class='add'>+	if (il-&gt;cfg-&gt;ops-&gt;lib-&gt;dump_fh)</div><div class='add'>+		il-&gt;cfg-&gt;ops-&gt;lib-&gt;dump_fh(il, NULL, false);</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	if (il_get_debug_level(il) &amp; IL_DL_FW_ERRORS)</div><div class='add'>+		il_print_rx_config_cmd(il, &amp;il-&gt;ctx);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	wake_up(&amp;il-&gt;wait_command_queue);</div><div class='add'>+</div><div class='add'>+	/* Keep the restart process from trying to send host</div><div class='add'>+	 * commands by clearing the INIT status bit */</div><div class='add'>+	clear_bit(S_READY, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(S_EXIT_PENDING, &amp;il-&gt;status)) {</div><div class='add'>+		IL_DBG(IL_DL_FW_ERRORS,</div><div class='add'>+		       "Restarting adapter due to uCode error.\n");</div><div class='add'>+</div><div class='add'>+		if (il-&gt;cfg-&gt;mod_params-&gt;restart_fw)</div><div class='add'>+			queue_work(il-&gt;workqueue, &amp;il-&gt;restart);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_irq_handle_error);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il_apm_stop_master(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* stop device's busmaster DMA activity */</div><div class='add'>+	il_set_bit(il, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER);</div><div class='add'>+</div><div class='add'>+	ret =</div><div class='add'>+	    _il_poll_bit(il, CSR_RESET, CSR_RESET_REG_FLAG_MASTER_DISABLED,</div><div class='add'>+			 CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);</div><div class='add'>+	if (ret)</div><div class='add'>+		IL_WARN("Master Disable Timed Out, 100 usec\n");</div><div class='add'>+</div><div class='add'>+	D_INFO("stop master\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_apm_stop(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	D_INFO("Stop card, put in low power state\n");</div><div class='add'>+</div><div class='add'>+	/* Stop device's DMA activity */</div><div class='add'>+	il_apm_stop_master(il);</div><div class='add'>+</div><div class='add'>+	/* Reset the entire device */</div><div class='add'>+	il_set_bit(il, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET);</div><div class='add'>+</div><div class='add'>+	udelay(10);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clear "initialization complete" bit to move adapter from</div><div class='add'>+	 * D0A* (powered-up Active) --&gt; D0U* (Uninitialized) state.</div><div class='add'>+	 */</div><div class='add'>+	il_clear_bit(il, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_apm_stop);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Start up NIC's basic functionality after it has been reset</div><div class='add'>+ * (e.g. after platform boot, or shutdown via il_apm_stop())</div><div class='add'>+ * NOTE:  This does not load uCode nor start the embedded processor</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il_apm_init(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u16 lctl;</div><div class='add'>+</div><div class='add'>+	D_INFO("Init card's basic functions\n");</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Use "set_bit" below rather than "write", to preserve any hardware</div><div class='add'>+	 * bits already set by default after reset.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Disable L0S exit timer (platform NMI Work/Around) */</div><div class='add'>+	il_set_bit(il, CSR_GIO_CHICKEN_BITS,</div><div class='add'>+		   CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disable L0s without affecting L1;</div><div class='add'>+	 *  don't wait for ICH L0s (ICH bug W/A)</div><div class='add'>+	 */</div><div class='add'>+	il_set_bit(il, CSR_GIO_CHICKEN_BITS,</div><div class='add'>+		   CSR_GIO_CHICKEN_BITS_REG_BIT_L1A_NO_L0S_RX);</div><div class='add'>+</div><div class='add'>+	/* Set FH wait threshold to maximum (HW error during stress W/A) */</div><div class='add'>+	il_set_bit(il, CSR_DBG_HPET_MEM_REG, CSR_DBG_HPET_MEM_REG_VAL);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable HAP INTA (interrupt from management bus) to</div><div class='add'>+	 * wake device's PCI Express link L1a -&gt; L0s</div><div class='add'>+	 * NOTE:  This is no-op for 3945 (non-existent bit)</div><div class='add'>+	 */</div><div class='add'>+	il_set_bit(il, CSR_HW_IF_CONFIG_REG,</div><div class='add'>+		   CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * HW bug W/A for instability in PCIe bus L0-&gt;L0S-&gt;L1 transition.</div><div class='add'>+	 * Check if BIOS (or OS) enabled L1-ASPM on this device.</div><div class='add'>+	 * If so (likely), disable L0S, so device moves directly L0-&gt;L1;</div><div class='add'>+	 *    costs negligible amount of power savings.</div><div class='add'>+	 * If not (unlikely), enable L0S, so there is at least some</div><div class='add'>+	 *    power savings, even without L1.</div><div class='add'>+	 */</div><div class='add'>+	if (il-&gt;cfg-&gt;base_params-&gt;set_l0s) {</div><div class='add'>+		lctl = il_pcie_link_ctl(il);</div><div class='add'>+		if ((lctl &amp; PCI_CFG_LINK_CTRL_VAL_L1_EN) ==</div><div class='add'>+		    PCI_CFG_LINK_CTRL_VAL_L1_EN) {</div><div class='add'>+			/* L1-ASPM enabled; disable(!) L0S  */</div><div class='add'>+			il_set_bit(il, CSR_GIO_REG,</div><div class='add'>+				   CSR_GIO_REG_VAL_L0S_ENABLED);</div><div class='add'>+			D_POWER("L1 Enabled; Disabling L0S\n");</div><div class='add'>+		} else {</div><div class='add'>+			/* L1-ASPM disabled; enable(!) L0S */</div><div class='add'>+			il_clear_bit(il, CSR_GIO_REG,</div><div class='add'>+				     CSR_GIO_REG_VAL_L0S_ENABLED);</div><div class='add'>+			D_POWER("L1 Disabled; Enabling L0S\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure analog phase-lock-loop before activating to D0A */</div><div class='add'>+	if (il-&gt;cfg-&gt;base_params-&gt;pll_cfg_val)</div><div class='add'>+		il_set_bit(il, CSR_ANA_PLL_CFG,</div><div class='add'>+			   il-&gt;cfg-&gt;base_params-&gt;pll_cfg_val);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set "initialization complete" bit to move adapter from</div><div class='add'>+	 * D0U* --&gt; D0A* (powered-up active) state.</div><div class='add'>+	 */</div><div class='add'>+	il_set_bit(il, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Wait for clock stabilization; once stabilized, access to</div><div class='add'>+	 * device-internal resources is supported, e.g. il_wr_prph()</div><div class='add'>+	 * and accesses to uCode SRAM.</div><div class='add'>+	 */</div><div class='add'>+	ret =</div><div class='add'>+	    _il_poll_bit(il, CSR_GP_CNTRL,</div><div class='add'>+			 CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,</div><div class='add'>+			 CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		D_INFO("Failed to init the card\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable DMA and BSM (if used) clocks, wait for them to stabilize.</div><div class='add'>+	 * BSM (Boostrap State Machine) is only in 3945 and 4965.</div><div class='add'>+	 *</div><div class='add'>+	 * Write to "CLK_EN_REG"; "1" bits enable clocks, while "0" bits</div><div class='add'>+	 * do not disable clocks.  This preserves any hardware bits already</div><div class='add'>+	 * set by default in "CLK_CTRL_REG" after reset.</div><div class='add'>+	 */</div><div class='add'>+	if (il-&gt;cfg-&gt;base_params-&gt;use_bsm)</div><div class='add'>+		il_wr_prph(il, APMG_CLK_EN_REG,</div><div class='add'>+			   APMG_CLK_VAL_DMA_CLK_RQT | APMG_CLK_VAL_BSM_CLK_RQT);</div><div class='add'>+	else</div><div class='add'>+		il_wr_prph(il, APMG_CLK_EN_REG, APMG_CLK_VAL_DMA_CLK_RQT);</div><div class='add'>+	udelay(20);</div><div class='add'>+</div><div class='add'>+	/* Disable L1-Active */</div><div class='add'>+	il_set_bits_prph(il, APMG_PCIDEV_STT_REG,</div><div class='add'>+			 APMG_PCIDEV_STT_VAL_L1_ACT_DIS);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_apm_init);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_set_tx_power(struct il_priv *il, s8 tx_power, bool force)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	s8 prev_tx_power;</div><div class='add'>+	bool defer;</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (il-&gt;tx_power_user_lmt == tx_power &amp;&amp; !force)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;cfg-&gt;ops-&gt;lib-&gt;send_tx_power)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* 0 dBm mean 1 milliwatt */</div><div class='add'>+	if (tx_power &lt; 0) {</div><div class='add'>+		IL_WARN("Requested user TXPOWER %d below 1 mW.\n", tx_power);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tx_power &gt; il-&gt;tx_power_device_lmt) {</div><div class='add'>+		IL_WARN("Requested user TXPOWER %d above upper limit %d.\n",</div><div class='add'>+			tx_power, il-&gt;tx_power_device_lmt);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!il_is_ready_rf(il))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* scan complete and commit_rxon use tx_power_next value,</div><div class='add'>+	 * it always need to be updated for newest request */</div><div class='add'>+	il-&gt;tx_power_next = tx_power;</div><div class='add'>+</div><div class='add'>+	/* do not set tx power when scanning or channel changing */</div><div class='add'>+	defer = test_bit(S_SCANNING, &amp;il-&gt;status) ||</div><div class='add'>+	    memcmp(&amp;ctx-&gt;active, &amp;ctx-&gt;staging, sizeof(ctx-&gt;staging));</div><div class='add'>+	if (defer &amp;&amp; !force) {</div><div class='add'>+		D_INFO("Deferring tx power set\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prev_tx_power = il-&gt;tx_power_user_lmt;</div><div class='add'>+	il-&gt;tx_power_user_lmt = tx_power;</div><div class='add'>+</div><div class='add'>+	ret = il-&gt;cfg-&gt;ops-&gt;lib-&gt;send_tx_power(il);</div><div class='add'>+</div><div class='add'>+	/* if fail to set tx_power, restore the orig. tx power */</div><div class='add'>+	if (ret) {</div><div class='add'>+		il-&gt;tx_power_user_lmt = prev_tx_power;</div><div class='add'>+		il-&gt;tx_power_next = prev_tx_power;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_set_tx_power);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_send_bt_config(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	struct il_bt_cmd bt_cmd = {</div><div class='add'>+		.lead_time = BT_LEAD_TIME_DEF,</div><div class='add'>+		.max_kill = BT_MAX_KILL_DEF,</div><div class='add'>+		.kill_ack_mask = 0,</div><div class='add'>+		.kill_cts_mask = 0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!bt_coex_active)</div><div class='add'>+		bt_cmd.flags = BT_COEX_DISABLE;</div><div class='add'>+	else</div><div class='add'>+		bt_cmd.flags = BT_COEX_ENABLE;</div><div class='add'>+</div><div class='add'>+	D_INFO("BT coex %s\n",</div><div class='add'>+	       (bt_cmd.flags == BT_COEX_DISABLE) ? "disable" : "active");</div><div class='add'>+</div><div class='add'>+	if (il_send_cmd_pdu(il, C_BT_CONFIG, sizeof(struct il_bt_cmd), &amp;bt_cmd))</div><div class='add'>+		IL_ERR("failed to send BT Coex Config\n");</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_send_bt_config);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_send_stats_request(struct il_priv *il, u8 flags, bool clear)</div><div class='add'>+{</div><div class='add'>+	struct il_stats_cmd stats_cmd = {</div><div class='add'>+		.configuration_flags = clear ? IL_STATS_CONF_CLEAR_STATS : 0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (flags &amp; CMD_ASYNC)</div><div class='add'>+		return il_send_cmd_pdu_async(il, C_STATS, sizeof(struct il_stats_cmd),</div><div class='add'>+					     &amp;stats_cmd, NULL);</div><div class='add'>+	else</div><div class='add'>+		return il_send_cmd_pdu(il, C_STATS, sizeof(struct il_stats_cmd),</div><div class='add'>+				       &amp;stats_cmd);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_send_stats_request);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_hdl_pm_sleep(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	struct il_sleep_notification *sleep = &amp;(pkt-&gt;u.sleep_notif);</div><div class='add'>+	D_RX("sleep mode: %d, src: %d\n",</div><div class='add'>+	     sleep-&gt;pm_sleep_mode, sleep-&gt;pm_wakeup_src);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_hdl_pm_sleep);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_hdl_pm_debug_stats(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+	u32 len = le32_to_cpu(pkt-&gt;len_n_flags) &amp; IL_RX_FRAME_SIZE_MSK;</div><div class='add'>+	D_RADIO("Dumping %d bytes of unhandled notification for %s:\n", len,</div><div class='add'>+		il_get_cmd_string(pkt-&gt;hdr.cmd));</div><div class='add'>+	il_print_hex_dump(il, IL_DL_RADIO, pkt-&gt;u.raw, len);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_hdl_pm_debug_stats);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_hdl_error(struct il_priv *il, struct il_rx_buf *rxb)</div><div class='add'>+{</div><div class='add'>+	struct il_rx_pkt *pkt = rxb_addr(rxb);</div><div class='add'>+</div><div class='add'>+	IL_ERR("Error Reply type 0x%08X cmd %s (0x%02X) "</div><div class='add'>+	       "seq 0x%04X ser 0x%08X\n",</div><div class='add'>+	       le32_to_cpu(pkt-&gt;u.err_resp.error_type),</div><div class='add'>+	       il_get_cmd_string(pkt-&gt;u.err_resp.cmd_id),</div><div class='add'>+	       pkt-&gt;u.err_resp.cmd_id,</div><div class='add'>+	       le16_to_cpu(pkt-&gt;u.err_resp.bad_cmd_seq_num),</div><div class='add'>+	       le32_to_cpu(pkt-&gt;u.err_resp.error_info));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_hdl_error);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_clear_isr_stats(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	memset(&amp;il-&gt;isr_stats, 0, sizeof(il-&gt;isr_stats));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_mac_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 il_priv *il = hw-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int q;</div><div class='add'>+</div><div class='add'>+	D_MAC80211("enter\n");</div><div class='add'>+</div><div class='add'>+	if (!il_is_ready_rf(il)) {</div><div class='add'>+		D_MAC80211("leave - RF not ready\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (queue &gt;= AC_NUM) {</div><div class='add'>+		D_MAC80211("leave - queue &gt;= AC_NUM %d\n", queue);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	q = AC_NUM - 1 - queue;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	il-&gt;ctx.qos_data.def_qos_parm.ac[q].cw_min =</div><div class='add'>+	    cpu_to_le16(params-&gt;cw_min);</div><div class='add'>+	il-&gt;ctx.qos_data.def_qos_parm.ac[q].cw_max =</div><div class='add'>+	    cpu_to_le16(params-&gt;cw_max);</div><div class='add'>+	il-&gt;ctx.qos_data.def_qos_parm.ac[q].aifsn = params-&gt;aifs;</div><div class='add'>+	il-&gt;ctx.qos_data.def_qos_parm.ac[q].edca_txop =</div><div class='add'>+	    cpu_to_le16((params-&gt;txop * 32));</div><div class='add'>+</div><div class='add'>+	il-&gt;ctx.qos_data.def_qos_parm.ac[q].reserved1 = 0;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	D_MAC80211("leave\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_mac_conf_tx);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_mac_tx_last_beacon(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return il-&gt;ibss_manager == IL_IBSS_MANAGER;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(il_mac_tx_last_beacon);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il_set_mode(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	il_connection_init_rx_config(il, ctx);</div><div class='add'>+</div><div class='add'>+	if (il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain)</div><div class='add'>+		il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain(il, ctx);</div><div class='add'>+</div><div class='add'>+	return il_commit_rxon(il, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il_setup_interface(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = ctx-&gt;vif;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This variable will be correct only when there's just</div><div class='add'>+	 * a single context, but all code using it is for hardware</div><div class='add'>+	 * that supports only one context.</div><div class='add'>+	 */</div><div class='add'>+	il-&gt;iw_mode = vif-&gt;type;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;is_active = true;</div><div class='add'>+</div><div class='add'>+	err = il_set_mode(il, ctx);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (!ctx-&gt;always_active)</div><div class='add'>+			ctx-&gt;is_active = false;</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</div><div class='add'>+il_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	struct il_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='add'>+	int err;</div><div class='add'>+	u32 modes;</div><div class='add'>+</div><div class='add'>+	D_MAC80211("enter: type %d, addr %pM\n", vif-&gt;type, vif-&gt;addr);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!il_is_ready_rf(il)) {</div><div class='add'>+		IL_WARN("Try to add interface when device not ready\n");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check if busy context is exclusive */</div><div class='add'>+	if (il-&gt;ctx.vif &amp;&amp;</div><div class='add'>+	    (il-&gt;ctx.exclusive_interface_modes &amp; BIT(il-&gt;ctx.vif-&gt;type))) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	modes = il-&gt;ctx.interface_modes | il-&gt;ctx.exclusive_interface_modes;</div><div class='add'>+	if (!(modes &amp; BIT(vif-&gt;type))) {</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vif_priv-&gt;ctx = &amp;il-&gt;ctx;</div><div class='add'>+	il-&gt;ctx.vif = vif;</div><div class='add'>+</div><div class='add'>+	err = il_setup_interface(il, &amp;il-&gt;ctx);</div><div class='add'>+	if (err) {</div><div class='add'>+		il-&gt;ctx.vif = NULL;</div><div class='add'>+		il-&gt;iw_mode = NL80211_IFTYPE_STATION;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	D_MAC80211("leave\n");</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_mac_add_interface);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il_teardown_interface(struct il_priv *il, struct ieee80211_vif *vif,</div><div class='add'>+		      bool mode_change)</div><div class='add'>+{</div><div class='add'>+	struct il_rxon_context *ctx = il_rxon_ctx_from_vif(vif);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (il-&gt;scan_vif == vif) {</div><div class='add'>+		il_scan_cancel_timeout(il, 200);</div><div class='add'>+		il_force_scan_end(il);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mode_change) {</div><div class='add'>+		il_set_mode(il, ctx);</div><div class='add'>+		if (!ctx-&gt;always_active)</div><div class='add'>+			ctx-&gt;is_active = false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_mac_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	struct il_rxon_context *ctx = il_rxon_ctx_from_vif(vif);</div><div class='add'>+</div><div class='add'>+	D_MAC80211("enter\n");</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	WARN_ON(ctx-&gt;vif != vif);</div><div class='add'>+	ctx-&gt;vif = NULL;</div><div class='add'>+</div><div class='add'>+	il_teardown_interface(il, vif, false);</div><div class='add'>+</div><div class='add'>+	memset(il-&gt;bssid, 0, ETH_ALEN);</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	D_MAC80211("leave\n");</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_mac_remove_interface);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_alloc_txq_mem(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	if (!il-&gt;txq)</div><div class='add'>+		il-&gt;txq =</div><div class='add'>+		    kzalloc(sizeof(struct il_tx_queue) *</div><div class='add'>+			    il-&gt;cfg-&gt;base_params-&gt;num_of_queues, GFP_KERNEL);</div><div class='add'>+	if (!il-&gt;txq) {</div><div class='add'>+		IL_ERR("Not enough memory for txq\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_alloc_txq_mem);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_txq_mem(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	kfree(il-&gt;txq);</div><div class='add'>+	il-&gt;txq = NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_txq_mem);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+</div><div class='add'>+#define IL_TRAFFIC_DUMP_SIZE	(IL_TRAFFIC_ENTRY_SIZE * IL_TRAFFIC_ENTRIES)</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_reset_traffic_log(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	il-&gt;tx_traffic_idx = 0;</div><div class='add'>+	il-&gt;rx_traffic_idx = 0;</div><div class='add'>+	if (il-&gt;tx_traffic)</div><div class='add'>+		memset(il-&gt;tx_traffic, 0, IL_TRAFFIC_DUMP_SIZE);</div><div class='add'>+	if (il-&gt;rx_traffic)</div><div class='add'>+		memset(il-&gt;rx_traffic, 0, IL_TRAFFIC_DUMP_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_alloc_traffic_mem(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	u32 traffic_size = IL_TRAFFIC_DUMP_SIZE;</div><div class='add'>+</div><div class='add'>+	if (il_debug_level &amp; IL_DL_TX) {</div><div class='add'>+		if (!il-&gt;tx_traffic) {</div><div class='add'>+			il-&gt;tx_traffic = kzalloc(traffic_size, GFP_KERNEL);</div><div class='add'>+			if (!il-&gt;tx_traffic)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (il_debug_level &amp; IL_DL_RX) {</div><div class='add'>+		if (!il-&gt;rx_traffic) {</div><div class='add'>+			il-&gt;rx_traffic = kzalloc(traffic_size, GFP_KERNEL);</div><div class='add'>+			if (!il-&gt;rx_traffic)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	il_reset_traffic_log(il);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_alloc_traffic_mem);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_free_traffic_mem(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	kfree(il-&gt;tx_traffic);</div><div class='add'>+	il-&gt;tx_traffic = NULL;</div><div class='add'>+</div><div class='add'>+	kfree(il-&gt;rx_traffic);</div><div class='add'>+	il-&gt;rx_traffic = NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_free_traffic_mem);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_dbg_log_tx_data_frame(struct il_priv *il, u16 length,</div><div class='add'>+			 struct ieee80211_hdr *header)</div><div class='add'>+{</div><div class='add'>+	__le16 fc;</div><div class='add'>+	u16 len;</div><div class='add'>+</div><div class='add'>+	if (likely(!(il_debug_level &amp; IL_DL_TX)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;tx_traffic)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fc = header-&gt;frame_control;</div><div class='add'>+	if (ieee80211_is_data(fc)) {</div><div class='add'>+		len =</div><div class='add'>+		    (length &gt;</div><div class='add'>+		     IL_TRAFFIC_ENTRY_SIZE) ? IL_TRAFFIC_ENTRY_SIZE : length;</div><div class='add'>+		memcpy((il-&gt;tx_traffic +</div><div class='add'>+			(il-&gt;tx_traffic_idx * IL_TRAFFIC_ENTRY_SIZE)), header,</div><div class='add'>+		       len);</div><div class='add'>+		il-&gt;tx_traffic_idx =</div><div class='add'>+		    (il-&gt;tx_traffic_idx + 1) % IL_TRAFFIC_ENTRIES;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_dbg_log_tx_data_frame);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_dbg_log_rx_data_frame(struct il_priv *il, u16 length,</div><div class='add'>+			 struct ieee80211_hdr *header)</div><div class='add'>+{</div><div class='add'>+	__le16 fc;</div><div class='add'>+	u16 len;</div><div class='add'>+</div><div class='add'>+	if (likely(!(il_debug_level &amp; IL_DL_RX)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;rx_traffic)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fc = header-&gt;frame_control;</div><div class='add'>+	if (ieee80211_is_data(fc)) {</div><div class='add'>+		len =</div><div class='add'>+		    (length &gt;</div><div class='add'>+		     IL_TRAFFIC_ENTRY_SIZE) ? IL_TRAFFIC_ENTRY_SIZE : length;</div><div class='add'>+		memcpy((il-&gt;rx_traffic +</div><div class='add'>+			(il-&gt;rx_traffic_idx * IL_TRAFFIC_ENTRY_SIZE)), header,</div><div class='add'>+		       len);</div><div class='add'>+		il-&gt;rx_traffic_idx =</div><div class='add'>+		    (il-&gt;rx_traffic_idx + 1) % IL_TRAFFIC_ENTRIES;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_dbg_log_rx_data_frame);</div><div class='add'>+</div><div class='add'>+const char *</div><div class='add'>+il_get_mgmt_string(int cmd)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+		IL_CMD(MANAGEMENT_ASSOC_REQ);</div><div class='add'>+		IL_CMD(MANAGEMENT_ASSOC_RESP);</div><div class='add'>+		IL_CMD(MANAGEMENT_REASSOC_REQ);</div><div class='add'>+		IL_CMD(MANAGEMENT_REASSOC_RESP);</div><div class='add'>+		IL_CMD(MANAGEMENT_PROBE_REQ);</div><div class='add'>+		IL_CMD(MANAGEMENT_PROBE_RESP);</div><div class='add'>+		IL_CMD(MANAGEMENT_BEACON);</div><div class='add'>+		IL_CMD(MANAGEMENT_ATIM);</div><div class='add'>+		IL_CMD(MANAGEMENT_DISASSOC);</div><div class='add'>+		IL_CMD(MANAGEMENT_AUTH);</div><div class='add'>+		IL_CMD(MANAGEMENT_DEAUTH);</div><div class='add'>+		IL_CMD(MANAGEMENT_ACTION);</div><div class='add'>+	default:</div><div class='add'>+		return "UNKNOWN";</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *</div><div class='add'>+il_get_ctrl_string(int cmd)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+		IL_CMD(CONTROL_BACK_REQ);</div><div class='add'>+		IL_CMD(CONTROL_BACK);</div><div class='add'>+		IL_CMD(CONTROL_PSPOLL);</div><div class='add'>+		IL_CMD(CONTROL_RTS);</div><div class='add'>+		IL_CMD(CONTROL_CTS);</div><div class='add'>+		IL_CMD(CONTROL_ACK);</div><div class='add'>+		IL_CMD(CONTROL_CFEND);</div><div class='add'>+		IL_CMD(CONTROL_CFENDACK);</div><div class='add'>+	default:</div><div class='add'>+		return "UNKNOWN";</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_clear_traffic_stats(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	memset(&amp;il-&gt;tx_stats, 0, sizeof(struct traffic_stats));</div><div class='add'>+	memset(&amp;il-&gt;rx_stats, 0, sizeof(struct traffic_stats));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * if CONFIG_IWLEGACY_DEBUGFS defined,</div><div class='add'>+ * il_update_stats function will</div><div class='add'>+ * record all the MGMT, CTRL and DATA pkt for both TX and Rx pass</div><div class='add'>+ * Use debugFs to display the rx/rx_stats</div><div class='add'>+ * if CONFIG_IWLEGACY_DEBUGFS not being defined, then no MGMT and CTRL</div><div class='add'>+ * information will be recorded, but DATA pkt still will be recorded</div><div class='add'>+ * for the reason of il_led.c need to control the led blinking based on</div><div class='add'>+ * number of tx and rx data.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il_update_stats(struct il_priv *il, bool is_tx, __le16 fc, u16 len)</div><div class='add'>+{</div><div class='add'>+	struct traffic_stats *stats;</div><div class='add'>+</div><div class='add'>+	if (is_tx)</div><div class='add'>+		stats = &amp;il-&gt;tx_stats;</div><div class='add'>+	else</div><div class='add'>+		stats = &amp;il-&gt;rx_stats;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_is_mgmt(fc)) {</div><div class='add'>+		switch (fc &amp; cpu_to_le16(IEEE80211_FCTL_STYPE)) {</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_ASSOC_REQ):</div><div class='add'>+			stats-&gt;mgmt[MANAGEMENT_ASSOC_REQ]++;</div><div class='add'>+			break;</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):</div><div class='add'>+			stats-&gt;mgmt[MANAGEMENT_ASSOC_RESP]++;</div><div class='add'>+			break;</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_REASSOC_REQ):</div><div class='add'>+			stats-&gt;mgmt[MANAGEMENT_REASSOC_REQ]++;</div><div class='add'>+			break;</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):</div><div class='add'>+			stats-&gt;mgmt[MANAGEMENT_REASSOC_RESP]++;</div><div class='add'>+			break;</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_PROBE_REQ):</div><div class='add'>+			stats-&gt;mgmt[MANAGEMENT_PROBE_REQ]++;</div><div class='add'>+			break;</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):</div><div class='add'>+			stats-&gt;mgmt[MANAGEMENT_PROBE_RESP]++;</div><div class='add'>+			break;</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_BEACON):</div><div class='add'>+			stats-&gt;mgmt[MANAGEMENT_BEACON]++;</div><div class='add'>+			break;</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_ATIM):</div><div class='add'>+			stats-&gt;mgmt[MANAGEMENT_ATIM]++;</div><div class='add'>+			break;</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_DISASSOC):</div><div class='add'>+			stats-&gt;mgmt[MANAGEMENT_DISASSOC]++;</div><div class='add'>+			break;</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_AUTH):</div><div class='add'>+			stats-&gt;mgmt[MANAGEMENT_AUTH]++;</div><div class='add'>+			break;</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_DEAUTH):</div><div class='add'>+			stats-&gt;mgmt[MANAGEMENT_DEAUTH]++;</div><div class='add'>+			break;</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_ACTION):</div><div class='add'>+			stats-&gt;mgmt[MANAGEMENT_ACTION]++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else if (ieee80211_is_ctl(fc)) {</div><div class='add'>+		switch (fc &amp; cpu_to_le16(IEEE80211_FCTL_STYPE)) {</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_BACK_REQ):</div><div class='add'>+			stats-&gt;ctrl[CONTROL_BACK_REQ]++;</div><div class='add'>+			break;</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_BACK):</div><div class='add'>+			stats-&gt;ctrl[CONTROL_BACK]++;</div><div class='add'>+			break;</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_PSPOLL):</div><div class='add'>+			stats-&gt;ctrl[CONTROL_PSPOLL]++;</div><div class='add'>+			break;</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_RTS):</div><div class='add'>+			stats-&gt;ctrl[CONTROL_RTS]++;</div><div class='add'>+			break;</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_CTS):</div><div class='add'>+			stats-&gt;ctrl[CONTROL_CTS]++;</div><div class='add'>+			break;</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_ACK):</div><div class='add'>+			stats-&gt;ctrl[CONTROL_ACK]++;</div><div class='add'>+			break;</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_CFEND):</div><div class='add'>+			stats-&gt;ctrl[CONTROL_CFEND]++;</div><div class='add'>+			break;</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_CFENDACK):</div><div class='add'>+			stats-&gt;ctrl[CONTROL_CFENDACK]++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* data */</div><div class='add'>+		stats-&gt;data_cnt++;</div><div class='add'>+		stats-&gt;data_bytes += len;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_update_stats);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_force_reset(struct il_priv *il, bool external)</div><div class='add'>+{</div><div class='add'>+	struct il_force_reset *force_reset;</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	force_reset = &amp;il-&gt;force_reset;</div><div class='add'>+	force_reset-&gt;reset_request_count++;</div><div class='add'>+	if (!external) {</div><div class='add'>+		if (force_reset-&gt;last_force_reset_jiffies &amp;&amp;</div><div class='add'>+		    time_after(force_reset-&gt;last_force_reset_jiffies +</div><div class='add'>+			       force_reset-&gt;reset_duration, jiffies)) {</div><div class='add'>+			D_INFO("force reset rejected\n");</div><div class='add'>+			force_reset-&gt;reset_reject_count++;</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	force_reset-&gt;reset_success_count++;</div><div class='add'>+	force_reset-&gt;last_force_reset_jiffies = jiffies;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if the request is from external(ex: debugfs),</div><div class='add'>+	 * then always perform the request in regardless the module</div><div class='add'>+	 * parameter setting</div><div class='add'>+	 * if the request is from internal (uCode error or driver</div><div class='add'>+	 * detect failure), then fw_restart module parameter</div><div class='add'>+	 * need to be check before performing firmware reload</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (!external &amp;&amp; !il-&gt;cfg-&gt;mod_params-&gt;restart_fw) {</div><div class='add'>+		D_INFO("Cancel firmware reload based on "</div><div class='add'>+		       "module parameter setting\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IL_ERR("On demand firmware reload\n");</div><div class='add'>+</div><div class='add'>+	/* Set the FW error flag -- cleared on il_down */</div><div class='add'>+	set_bit(S_FW_ERROR, &amp;il-&gt;status);</div><div class='add'>+	wake_up(&amp;il-&gt;wait_command_queue);</div><div class='add'>+	/*</div><div class='add'>+	 * Keep the restart process from trying to send host</div><div class='add'>+	 * commands by clearing the INIT status bit</div><div class='add'>+	 */</div><div class='add'>+	clear_bit(S_READY, &amp;il-&gt;status);</div><div class='add'>+	queue_work(il-&gt;workqueue, &amp;il-&gt;restart);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			enum nl80211_iftype newtype, bool newp2p)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	struct il_rxon_context *ctx = il_rxon_ctx_from_vif(vif);</div><div class='add'>+	u32 modes;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	newtype = ieee80211_iftype_p2p(newtype, newp2p);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!ctx-&gt;vif || !il_is_ready_rf(il)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Huh? But wait ... this can maybe happen when</div><div class='add'>+		 * we're in the middle of a firmware restart!</div><div class='add'>+		 */</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	modes = ctx-&gt;interface_modes | ctx-&gt;exclusive_interface_modes;</div><div class='add'>+	if (!(modes &amp; BIT(newtype))) {</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((il-&gt;ctx.exclusive_interface_modes &amp; BIT(il-&gt;ctx.vif-&gt;type)) ||</div><div class='add'>+	    (il-&gt;ctx.exclusive_interface_modes &amp; BIT(newtype))) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* success */</div><div class='add'>+	il_teardown_interface(il, vif, true);</div><div class='add'>+	vif-&gt;type = newtype;</div><div class='add'>+	vif-&gt;p2p = newp2p;</div><div class='add'>+	err = il_setup_interface(il, ctx);</div><div class='add'>+	WARN_ON(err);</div><div class='add'>+	/*</div><div class='add'>+	 * We've switched internally, but submitting to the</div><div class='add'>+	 * device may have failed for some reason. Mask this</div><div class='add'>+	 * error, because otherwise mac80211 will not switch</div><div class='add'>+	 * (and set the interface type back) and we'll be</div><div class='add'>+	 * out of sync with it.</div><div class='add'>+	 */</div><div class='add'>+	err = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_mac_change_interface);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On every watchdog tick we check (latest) time stamp. If it does not</div><div class='add'>+ * change during timeout period and queue is not empty we reset firmware.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+il_check_stuck_queue(struct il_priv *il, int cnt)</div><div class='add'>+{</div><div class='add'>+	struct il_tx_queue *txq = &amp;il-&gt;txq[cnt];</div><div class='add'>+	struct il_queue *q = &amp;txq-&gt;q;</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (q-&gt;read_ptr == q-&gt;write_ptr) {</div><div class='add'>+		txq-&gt;time_stamp = jiffies;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	timeout =</div><div class='add'>+	    txq-&gt;time_stamp +</div><div class='add'>+	    msecs_to_jiffies(il-&gt;cfg-&gt;base_params-&gt;wd_timeout);</div><div class='add'>+</div><div class='add'>+	if (time_after(jiffies, timeout)) {</div><div class='add'>+		IL_ERR("Queue %d stuck for %u ms.\n", q-&gt;id,</div><div class='add'>+		       il-&gt;cfg-&gt;base_params-&gt;wd_timeout);</div><div class='add'>+		ret = il_force_reset(il, false);</div><div class='add'>+		return (ret == -EAGAIN) ? 0 : 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Making watchdog tick be a quarter of timeout assure we will</div><div class='add'>+ * discover the queue hung between timeout and 1.25*timeout</div><div class='add'>+ */</div><div class='add'>+#define IL_WD_TICK(timeout) ((timeout) / 4)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Watchdog timer callback, we check each tx queue for stuck, if if hung</div><div class='add'>+ * we reset the firmware. If everything is fine just rearm the timer.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il_bg_watchdog(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = (struct il_priv *)data;</div><div class='add'>+	int cnt;</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	timeout = il-&gt;cfg-&gt;base_params-&gt;wd_timeout;</div><div class='add'>+	if (timeout == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* monitor and check for stuck cmd queue */</div><div class='add'>+	if (il_check_stuck_queue(il, il-&gt;cmd_queue))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* monitor and check for other stuck queues */</div><div class='add'>+	if (il_is_any_associated(il)) {</div><div class='add'>+		for (cnt = 0; cnt &lt; il-&gt;hw_params.max_txq_num; cnt++) {</div><div class='add'>+			/* skip as we already checked the command queue */</div><div class='add'>+			if (cnt == il-&gt;cmd_queue)</div><div class='add'>+				continue;</div><div class='add'>+			if (il_check_stuck_queue(il, cnt))</div><div class='add'>+				return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mod_timer(&amp;il-&gt;watchdog,</div><div class='add'>+		  jiffies + msecs_to_jiffies(IL_WD_TICK(timeout)));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_bg_watchdog);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_setup_watchdog(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	unsigned int timeout = il-&gt;cfg-&gt;base_params-&gt;wd_timeout;</div><div class='add'>+</div><div class='add'>+	if (timeout)</div><div class='add'>+		mod_timer(&amp;il-&gt;watchdog,</div><div class='add'>+			  jiffies + msecs_to_jiffies(IL_WD_TICK(timeout)));</div><div class='add'>+	else</div><div class='add'>+		del_timer(&amp;il-&gt;watchdog);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_setup_watchdog);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * extended beacon time format</div><div class='add'>+ * time in usec will be changed into a 32-bit value in extended:internal format</div><div class='add'>+ * the extended part is the beacon counts</div><div class='add'>+ * the internal part is the time in usec within one beacon interval</div><div class='add'>+ */</div><div class='add'>+u32</div><div class='add'>+il_usecs_to_beacons(struct il_priv *il, u32 usec, u32 beacon_interval)</div><div class='add'>+{</div><div class='add'>+	u32 quot;</div><div class='add'>+	u32 rem;</div><div class='add'>+	u32 interval = beacon_interval * TIME_UNIT;</div><div class='add'>+</div><div class='add'>+	if (!interval || !usec)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	quot =</div><div class='add'>+	    (usec /</div><div class='add'>+	     interval) &amp; (il_beacon_time_mask_high(il,</div><div class='add'>+						   il-&gt;hw_params.</div><div class='add'>+						   beacon_time_tsf_bits) &gt;&gt; il-&gt;</div><div class='add'>+			  hw_params.beacon_time_tsf_bits);</div><div class='add'>+	rem =</div><div class='add'>+	    (usec % interval) &amp; il_beacon_time_mask_low(il,</div><div class='add'>+							il-&gt;hw_params.</div><div class='add'>+							beacon_time_tsf_bits);</div><div class='add'>+</div><div class='add'>+	return (quot &lt;&lt; il-&gt;hw_params.beacon_time_tsf_bits) + rem;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_usecs_to_beacons);</div><div class='add'>+</div><div class='add'>+/* base is usually what we get from ucode with each received frame,</div><div class='add'>+ * the same as HW timer counter counting down</div><div class='add'>+ */</div><div class='add'>+__le32</div><div class='add'>+il_add_beacon_time(struct il_priv *il, u32 base, u32 addon,</div><div class='add'>+		   u32 beacon_interval)</div><div class='add'>+{</div><div class='add'>+	u32 base_low = base &amp; il_beacon_time_mask_low(il,</div><div class='add'>+						      il-&gt;hw_params.</div><div class='add'>+						      beacon_time_tsf_bits);</div><div class='add'>+	u32 addon_low = addon &amp; il_beacon_time_mask_low(il,</div><div class='add'>+							il-&gt;hw_params.</div><div class='add'>+							beacon_time_tsf_bits);</div><div class='add'>+	u32 interval = beacon_interval * TIME_UNIT;</div><div class='add'>+	u32 res = (base &amp; il_beacon_time_mask_high(il,</div><div class='add'>+						   il-&gt;hw_params.</div><div class='add'>+						   beacon_time_tsf_bits)) +</div><div class='add'>+	    (addon &amp; il_beacon_time_mask_high(il,</div><div class='add'>+					      il-&gt;hw_params.</div><div class='add'>+					      beacon_time_tsf_bits));</div><div class='add'>+</div><div class='add'>+	if (base_low &gt; addon_low)</div><div class='add'>+		res += base_low - addon_low;</div><div class='add'>+	else if (base_low &lt; addon_low) {</div><div class='add'>+		res += interval + base_low - addon_low;</div><div class='add'>+		res += (1 &lt;&lt; il-&gt;hw_params.beacon_time_tsf_bits);</div><div class='add'>+	} else</div><div class='add'>+		res += (1 &lt;&lt; il-&gt;hw_params.beacon_time_tsf_bits);</div><div class='add'>+</div><div class='add'>+	return cpu_to_le32(res);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_add_beacon_time);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_pci_suspend(struct device *device)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(device);</div><div class='add'>+	struct il_priv *il = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This function is called when system goes into suspend state</div><div class='add'>+	 * mac80211 will call il_mac_stop() from the mac80211 suspend function</div><div class='add'>+	 * first but since il_mac_stop() has no knowledge of who the caller is,</div><div class='add'>+	 * it will not call apm_ops.stop() to stop the DMA operation.</div><div class='add'>+	 * Calling apm_ops.stop here to make sure we stop the DMA.</div><div class='add'>+	 */</div><div class='add'>+	il_apm_stop(il);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_pci_suspend);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+il_pci_resume(struct device *device)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(device);</div><div class='add'>+	struct il_priv *il = pci_get_drvdata(pdev);</div><div class='add'>+	bool hw_rfkill = false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We disable the RETRY_TIMEOUT register (0x41) to keep</div><div class='add'>+	 * PCI Tx retries from interfering with C3 CPU state.</div><div class='add'>+	 */</div><div class='add'>+	pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);</div><div class='add'>+</div><div class='add'>+	il_enable_interrupts(il);</div><div class='add'>+</div><div class='add'>+	if (!(_il_rd(il, CSR_GP_CNTRL) &amp; CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW))</div><div class='add'>+		hw_rfkill = true;</div><div class='add'>+</div><div class='add'>+	if (hw_rfkill)</div><div class='add'>+		set_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+	else</div><div class='add'>+		clear_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	wiphy_rfkill_set_hw_state(il-&gt;hw-&gt;wiphy, hw_rfkill);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_pci_resume);</div><div class='add'>+</div><div class='add'>+const struct dev_pm_ops il_pm_ops = {</div><div class='add'>+	.suspend = il_pci_suspend,</div><div class='add'>+	.resume = il_pci_resume,</div><div class='add'>+	.freeze = il_pci_suspend,</div><div class='add'>+	.thaw = il_pci_resume,</div><div class='add'>+	.poweroff = il_pci_suspend,</div><div class='add'>+	.restore = il_pci_resume,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(il_pm_ops);</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il_update_qos(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	if (test_bit(S_EXIT_PENDING, &amp;il-&gt;status))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ctx-&gt;is_active)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;qos_data.def_qos_parm.qos_flags = 0;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;qos_data.qos_active)</div><div class='add'>+		ctx-&gt;qos_data.def_qos_parm.qos_flags |=</div><div class='add'>+		    QOS_PARAM_FLG_UPDATE_EDCA_MSK;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;ht.enabled)</div><div class='add'>+		ctx-&gt;qos_data.def_qos_parm.qos_flags |= QOS_PARAM_FLG_TGN_MSK;</div><div class='add'>+</div><div class='add'>+	D_QOS("send QoS cmd with Qos active=%d FLAGS=0x%X\n",</div><div class='add'>+	      ctx-&gt;qos_data.qos_active, ctx-&gt;qos_data.def_qos_parm.qos_flags);</div><div class='add'>+</div><div class='add'>+	il_send_cmd_pdu_async(il, ctx-&gt;qos_cmd, sizeof(struct il_qosparam_cmd),</div><div class='add'>+			      &amp;ctx-&gt;qos_data.def_qos_parm, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_mac_config - mac80211 config callback</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il_mac_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	const struct il_channel_info *ch_info;</div><div class='add'>+	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</div><div class='add'>+	struct ieee80211_channel *channel = conf-&gt;channel;</div><div class='add'>+	struct il_ht_config *ht_conf = &amp;il-&gt;current_ht_config;</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+	unsigned long flags = 0;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u16 ch;</div><div class='add'>+	int scan_active = 0;</div><div class='add'>+	bool ht_changed = false;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!il-&gt;cfg-&gt;ops-&gt;legacy))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	D_MAC80211("enter to channel %d changed 0x%X\n", channel-&gt;hw_value,</div><div class='add'>+		   changed);</div><div class='add'>+</div><div class='add'>+	if (unlikely(test_bit(S_SCANNING, &amp;il-&gt;status))) {</div><div class='add'>+		scan_active = 1;</div><div class='add'>+		D_MAC80211("scan active\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp;</div><div class='add'>+	    (IEEE80211_CONF_CHANGE_SMPS | IEEE80211_CONF_CHANGE_CHANNEL)) {</div><div class='add'>+		/* mac80211 uses static for non-HT which is what we want */</div><div class='add'>+		il-&gt;current_ht_config.smps = conf-&gt;smps_mode;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Recalculate chain counts.</div><div class='add'>+		 *</div><div class='add'>+		 * If monitor mode is enabled then mac80211 will</div><div class='add'>+		 * set up the SM PS mode to OFF if an HT channel is</div><div class='add'>+		 * configured.</div><div class='add'>+		 */</div><div class='add'>+		if (il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain)</div><div class='add'>+			il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain(il, &amp;il-&gt;ctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* during scanning mac80211 will delay channel setting until</div><div class='add'>+	 * scan finish with changed = 0</div><div class='add'>+	 */</div><div class='add'>+	if (!changed || (changed &amp; IEEE80211_CONF_CHANGE_CHANNEL)) {</div><div class='add'>+</div><div class='add'>+		if (scan_active)</div><div class='add'>+			goto set_ch_out;</div><div class='add'>+</div><div class='add'>+		ch = channel-&gt;hw_value;</div><div class='add'>+		ch_info = il_get_channel_info(il, channel-&gt;band, ch);</div><div class='add'>+		if (!il_is_channel_valid(ch_info)) {</div><div class='add'>+			D_MAC80211("leave - invalid channel\n");</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto set_ch_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (il-&gt;iw_mode == NL80211_IFTYPE_ADHOC &amp;&amp;</div><div class='add'>+		    !il_is_channel_ibss(ch_info)) {</div><div class='add'>+			D_MAC80211("leave - not IBSS channel\n");</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto set_ch_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		/* Configure HT40 channels */</div><div class='add'>+		if (ctx-&gt;ht.enabled != conf_is_ht(conf)) {</div><div class='add'>+			ctx-&gt;ht.enabled = conf_is_ht(conf);</div><div class='add'>+			ht_changed = true;</div><div class='add'>+		}</div><div class='add'>+		if (ctx-&gt;ht.enabled) {</div><div class='add'>+			if (conf_is_ht40_minus(conf)) {</div><div class='add'>+				ctx-&gt;ht.extension_chan_offset =</div><div class='add'>+				    IEEE80211_HT_PARAM_CHA_SEC_BELOW;</div><div class='add'>+				ctx-&gt;ht.is_40mhz = true;</div><div class='add'>+			} else if (conf_is_ht40_plus(conf)) {</div><div class='add'>+				ctx-&gt;ht.extension_chan_offset =</div><div class='add'>+				    IEEE80211_HT_PARAM_CHA_SEC_ABOVE;</div><div class='add'>+				ctx-&gt;ht.is_40mhz = true;</div><div class='add'>+			} else {</div><div class='add'>+				ctx-&gt;ht.extension_chan_offset =</div><div class='add'>+				    IEEE80211_HT_PARAM_CHA_SEC_NONE;</div><div class='add'>+				ctx-&gt;ht.is_40mhz = false;</div><div class='add'>+			}</div><div class='add'>+		} else</div><div class='add'>+			ctx-&gt;ht.is_40mhz = false;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Default to no protection. Protection mode will</div><div class='add'>+		 * later be set from BSS config in il_ht_conf</div><div class='add'>+		 */</div><div class='add'>+		ctx-&gt;ht.protection = IEEE80211_HT_OP_MODE_PROTECTION_NONE;</div><div class='add'>+</div><div class='add'>+		/* if we are switching from ht to 2.4 clear flags</div><div class='add'>+		 * from any ht related info since 2.4 does not</div><div class='add'>+		 * support ht */</div><div class='add'>+		if ((le16_to_cpu(ctx-&gt;staging.channel) != ch))</div><div class='add'>+			ctx-&gt;staging.flags = 0;</div><div class='add'>+</div><div class='add'>+		il_set_rxon_channel(il, channel, ctx);</div><div class='add'>+		il_set_rxon_ht(il, ht_conf);</div><div class='add'>+</div><div class='add'>+		il_set_flags_for_band(il, ctx, channel-&gt;band, ctx-&gt;vif);</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		if (il-&gt;cfg-&gt;ops-&gt;legacy-&gt;update_bcast_stations)</div><div class='add'>+			ret = il-&gt;cfg-&gt;ops-&gt;legacy-&gt;update_bcast_stations(il);</div><div class='add'>+</div><div class='add'>+set_ch_out:</div><div class='add'>+		/* The list of supported rates and rate mask can be different</div><div class='add'>+		 * for each band; since the band may have changed, reset</div><div class='add'>+		 * the rate mask to what mac80211 lists */</div><div class='add'>+		il_set_rate(il);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; (IEEE80211_CONF_CHANGE_PS | IEEE80211_CONF_CHANGE_IDLE)) {</div><div class='add'>+		ret = il_power_update_mode(il, false);</div><div class='add'>+		if (ret)</div><div class='add'>+			D_MAC80211("Error setting sleep level\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_CONF_CHANGE_POWER) {</div><div class='add'>+		D_MAC80211("TX Power old=%d new=%d\n", il-&gt;tx_power_user_lmt,</div><div class='add'>+			   conf-&gt;power_level);</div><div class='add'>+</div><div class='add'>+		il_set_tx_power(il, conf-&gt;power_level, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!il_is_ready(il)) {</div><div class='add'>+		D_MAC80211("leave - not ready\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (scan_active)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (memcmp(&amp;ctx-&gt;active, &amp;ctx-&gt;staging, sizeof(ctx-&gt;staging)))</div><div class='add'>+		il_commit_rxon(il, ctx);</div><div class='add'>+	else</div><div class='add'>+		D_INFO("Not re-sending same RXON configuration.\n");</div><div class='add'>+	if (ht_changed)</div><div class='add'>+		il_update_qos(il, ctx);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	D_MAC80211("leave\n");</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_mac_config);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_mac_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!il-&gt;cfg-&gt;ops-&gt;legacy))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	D_MAC80211("enter\n");</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+	memset(&amp;il-&gt;current_ht_config, 0, sizeof(struct il_ht_config));</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* new association get rid of ibss beacon skb */</div><div class='add'>+	if (il-&gt;beacon_skb)</div><div class='add'>+		dev_kfree_skb(il-&gt;beacon_skb);</div><div class='add'>+</div><div class='add'>+	il-&gt;beacon_skb = NULL;</div><div class='add'>+</div><div class='add'>+	il-&gt;timestamp = 0;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	il_scan_cancel_timeout(il, 100);</div><div class='add'>+	if (!il_is_ready_rf(il)) {</div><div class='add'>+		D_MAC80211("leave - not ready\n");</div><div class='add'>+		mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we are restarting association process</div><div class='add'>+	 * clear RXON_FILTER_ASSOC_MSK bit</div><div class='add'>+	 */</div><div class='add'>+	ctx-&gt;staging.filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='add'>+	il_commit_rxon(il, ctx);</div><div class='add'>+</div><div class='add'>+	il_set_rate(il);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	D_MAC80211("leave\n");</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_mac_reset_tsf);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il_ht_conf(struct il_priv *il, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct il_ht_config *ht_conf = &amp;il-&gt;current_ht_config;</div><div class='add'>+	struct ieee80211_sta *sta;</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf = &amp;vif-&gt;bss_conf;</div><div class='add'>+	struct il_rxon_context *ctx = il_rxon_ctx_from_vif(vif);</div><div class='add'>+</div><div class='add'>+	D_ASSOC("enter:\n");</div><div class='add'>+</div><div class='add'>+	if (!ctx-&gt;ht.enabled)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;ht.protection =</div><div class='add'>+	    bss_conf-&gt;ht_operation_mode &amp; IEEE80211_HT_OP_MODE_PROTECTION;</div><div class='add'>+	ctx-&gt;ht.non_gf_sta_present =</div><div class='add'>+	    !!(bss_conf-&gt;</div><div class='add'>+	       ht_operation_mode &amp; IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);</div><div class='add'>+</div><div class='add'>+	ht_conf-&gt;single_chain_sufficient = false;</div><div class='add'>+</div><div class='add'>+	switch (vif-&gt;type) {</div><div class='add'>+	case NL80211_IFTYPE_STATION:</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		sta = ieee80211_find_sta(vif, bss_conf-&gt;bssid);</div><div class='add'>+		if (sta) {</div><div class='add'>+			struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='add'>+			int maxstreams;</div><div class='add'>+</div><div class='add'>+			maxstreams =</div><div class='add'>+			    (ht_cap-&gt;mcs.</div><div class='add'>+			     tx_params &amp; IEEE80211_HT_MCS_TX_MAX_STREAMS_MASK)</div><div class='add'>+			    &gt;&gt; IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT;</div><div class='add'>+			maxstreams += 1;</div><div class='add'>+</div><div class='add'>+			if (ht_cap-&gt;mcs.rx_mask[1] == 0 &amp;&amp;</div><div class='add'>+			    ht_cap-&gt;mcs.rx_mask[2] == 0)</div><div class='add'>+				ht_conf-&gt;single_chain_sufficient = true;</div><div class='add'>+			if (maxstreams &lt;= 1)</div><div class='add'>+				ht_conf-&gt;single_chain_sufficient = true;</div><div class='add'>+		} else {</div><div class='add'>+			/*</div><div class='add'>+			 * If at all, this can only happen through a race</div><div class='add'>+			 * when the AP disconnects us while we're still</div><div class='add'>+			 * setting up the connection, in that case mac80211</div><div class='add'>+			 * will soon tell us about that.</div><div class='add'>+			 */</div><div class='add'>+			ht_conf-&gt;single_chain_sufficient = true;</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		break;</div><div class='add'>+	case NL80211_IFTYPE_ADHOC:</div><div class='add'>+		ht_conf-&gt;single_chain_sufficient = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_ASSOC("leave\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il_set_no_assoc(struct il_priv *il, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct il_rxon_context *ctx = il_rxon_ctx_from_vif(vif);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * inform the ucode that there is no longer an</div><div class='add'>+	 * association and that no more packets should be</div><div class='add'>+	 * sent</div><div class='add'>+	 */</div><div class='add'>+	ctx-&gt;staging.filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='add'>+	ctx-&gt;staging.assoc_id = 0;</div><div class='add'>+	il_commit_rxon(il, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+il_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	__le64 timestamp;</div><div class='add'>+	struct sk_buff *skb = ieee80211_beacon_get(hw, vif);</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	D_MAC80211("enter\n");</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;beacon_ctx) {</div><div class='add'>+		IL_ERR("update beacon but no beacon context!\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (il-&gt;beacon_skb)</div><div class='add'>+		dev_kfree_skb(il-&gt;beacon_skb);</div><div class='add'>+</div><div class='add'>+	il-&gt;beacon_skb = skb;</div><div class='add'>+</div><div class='add'>+	timestamp = ((struct ieee80211_mgmt *)skb-&gt;data)-&gt;u.beacon.timestamp;</div><div class='add'>+	il-&gt;timestamp = le64_to_cpu(timestamp);</div><div class='add'>+</div><div class='add'>+	D_MAC80211("leave\n");</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (!il_is_ready_rf(il)) {</div><div class='add'>+		D_MAC80211("leave - RF not ready\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	il-&gt;cfg-&gt;ops-&gt;legacy-&gt;post_associate(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+il_mac_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_bss_conf *bss_conf, u32 changes)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = hw-&gt;priv;</div><div class='add'>+	struct il_rxon_context *ctx = il_rxon_ctx_from_vif(vif);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!il-&gt;cfg-&gt;ops-&gt;legacy))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	D_MAC80211("changes = 0x%X\n", changes);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!il_is_alive(il)) {</div><div class='add'>+		mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_QOS) {</div><div class='add'>+		unsigned long flags;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+		ctx-&gt;qos_data.qos_active = bss_conf-&gt;qos;</div><div class='add'>+		il_update_qos(il, ctx);</div><div class='add'>+		spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_BEACON_ENABLED) {</div><div class='add'>+		/*</div><div class='add'>+		 * the add_interface code must make sure we only ever</div><div class='add'>+		 * have a single interface that could be beaconing at</div><div class='add'>+		 * any time.</div><div class='add'>+		 */</div><div class='add'>+		if (vif-&gt;bss_conf.enable_beacon)</div><div class='add'>+			il-&gt;beacon_ctx = ctx;</div><div class='add'>+		else</div><div class='add'>+			il-&gt;beacon_ctx = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_BSSID) {</div><div class='add'>+		D_MAC80211("BSSID %pM\n", bss_conf-&gt;bssid);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If there is currently a HW scan going on in the</div><div class='add'>+		 * background then we need to cancel it else the RXON</div><div class='add'>+		 * below/in post_associate will fail.</div><div class='add'>+		 */</div><div class='add'>+		if (il_scan_cancel_timeout(il, 100)) {</div><div class='add'>+			IL_WARN("Aborted scan still in progress after 100ms\n");</div><div class='add'>+			D_MAC80211("leaving - scan abort failed.\n");</div><div class='add'>+			mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* mac80211 only sets assoc when in STATION mode */</div><div class='add'>+		if (vif-&gt;type == NL80211_IFTYPE_ADHOC || bss_conf-&gt;assoc) {</div><div class='add'>+			memcpy(ctx-&gt;staging.bssid_addr, bss_conf-&gt;bssid,</div><div class='add'>+			       ETH_ALEN);</div><div class='add'>+</div><div class='add'>+			/* currently needed in a few places */</div><div class='add'>+			memcpy(il-&gt;bssid, bss_conf-&gt;bssid, ETH_ALEN);</div><div class='add'>+		} else {</div><div class='add'>+			ctx-&gt;staging.filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This needs to be after setting the BSSID in case</div><div class='add'>+	 * mac80211 decides to do both changes at once because</div><div class='add'>+	 * it will invoke post_associate.</div><div class='add'>+	 */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_ADHOC &amp;&amp; (changes &amp; BSS_CHANGED_BEACON))</div><div class='add'>+		il_beacon_update(hw, vif);</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_ERP_PREAMBLE) {</div><div class='add'>+		D_MAC80211("ERP_PREAMBLE %d\n", bss_conf-&gt;use_short_preamble);</div><div class='add'>+		if (bss_conf-&gt;use_short_preamble)</div><div class='add'>+			ctx-&gt;staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='add'>+		else</div><div class='add'>+			ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_ERP_CTS_PROT) {</div><div class='add'>+		D_MAC80211("ERP_CTS %d\n", bss_conf-&gt;use_cts_prot);</div><div class='add'>+		if (bss_conf-&gt;use_cts_prot &amp;&amp; il-&gt;band != IEEE80211_BAND_5GHZ)</div><div class='add'>+			ctx-&gt;staging.flags |= RXON_FLG_TGG_PROTECT_MSK;</div><div class='add'>+		else</div><div class='add'>+			ctx-&gt;staging.flags &amp;= ~RXON_FLG_TGG_PROTECT_MSK;</div><div class='add'>+		if (bss_conf-&gt;use_cts_prot)</div><div class='add'>+			ctx-&gt;staging.flags |= RXON_FLG_SELF_CTS_EN;</div><div class='add'>+		else</div><div class='add'>+			ctx-&gt;staging.flags &amp;= ~RXON_FLG_SELF_CTS_EN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_BASIC_RATES) {</div><div class='add'>+		/* XXX use this information</div><div class='add'>+		 *</div><div class='add'>+		 * To do that, remove code from il_set_rate() and put something</div><div class='add'>+		 * like this here:</div><div class='add'>+		 *</div><div class='add'>+		 if (A-band)</div><div class='add'>+		 ctx-&gt;staging.ofdm_basic_rates =</div><div class='add'>+		 bss_conf-&gt;basic_rates;</div><div class='add'>+		 else</div><div class='add'>+		 ctx-&gt;staging.ofdm_basic_rates =</div><div class='add'>+		 bss_conf-&gt;basic_rates &gt;&gt; 4;</div><div class='add'>+		 ctx-&gt;staging.cck_basic_rates =</div><div class='add'>+		 bss_conf-&gt;basic_rates &amp; 0xF;</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_HT) {</div><div class='add'>+		il_ht_conf(il, vif);</div><div class='add'>+</div><div class='add'>+		if (il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain)</div><div class='add'>+			il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain(il, ctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_ASSOC) {</div><div class='add'>+		D_MAC80211("ASSOC %d\n", bss_conf-&gt;assoc);</div><div class='add'>+		if (bss_conf-&gt;assoc) {</div><div class='add'>+			il-&gt;timestamp = bss_conf-&gt;timestamp;</div><div class='add'>+</div><div class='add'>+			if (!il_is_rfkill(il))</div><div class='add'>+				il-&gt;cfg-&gt;ops-&gt;legacy-&gt;post_associate(il);</div><div class='add'>+		} else</div><div class='add'>+			il_set_no_assoc(il, vif);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp;&amp; il_is_associated_ctx(ctx) &amp;&amp; bss_conf-&gt;aid) {</div><div class='add'>+		D_MAC80211("Changes (%#x) while associated\n", changes);</div><div class='add'>+		ret = il_send_rxon_assoc(il, ctx);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			/* Sync active_rxon with latest change. */</div><div class='add'>+			memcpy((void *)&amp;ctx-&gt;active, &amp;ctx-&gt;staging,</div><div class='add'>+			       sizeof(struct il_rxon_cmd));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_BEACON_ENABLED) {</div><div class='add'>+		if (vif-&gt;bss_conf.enable_beacon) {</div><div class='add'>+			memcpy(ctx-&gt;staging.bssid_addr, bss_conf-&gt;bssid,</div><div class='add'>+			       ETH_ALEN);</div><div class='add'>+			memcpy(il-&gt;bssid, bss_conf-&gt;bssid, ETH_ALEN);</div><div class='add'>+			il-&gt;cfg-&gt;ops-&gt;legacy-&gt;config_ap(il);</div><div class='add'>+		} else</div><div class='add'>+			il_set_no_assoc(il, vif);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changes &amp; BSS_CHANGED_IBSS) {</div><div class='add'>+		ret =</div><div class='add'>+		    il-&gt;cfg-&gt;ops-&gt;legacy-&gt;manage_ibss_station(il, vif,</div><div class='add'>+							      bss_conf-&gt;</div><div class='add'>+							      ibss_joined);</div><div class='add'>+		if (ret)</div><div class='add'>+			IL_ERR("failed to %s IBSS station %pM\n",</div><div class='add'>+			       bss_conf-&gt;ibss_joined ? "add" : "remove",</div><div class='add'>+			       bss_conf-&gt;bssid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	D_MAC80211("leave\n");</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_mac_bss_info_changed);</div><div class='add'>+</div><div class='add'>+irqreturn_t</div><div class='add'>+il_isr(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = data;</div><div class='add'>+	u32 inta, inta_mask;</div><div class='add'>+	u32 inta_fh;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	if (!il)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Disable (but don't clear!) interrupts here to avoid</div><div class='add'>+	 *    back-to-back ISRs and sporadic interrupts from our NIC.</div><div class='add'>+	 * If we have something to service, the tasklet will re-enable ints.</div><div class='add'>+	 * If we *don't* have something, we'll re-enable before leaving here. */</div><div class='add'>+	inta_mask = _il_rd(il, CSR_INT_MASK);	/* just for debug */</div><div class='add'>+	_il_wr(il, CSR_INT_MASK, 0x00000000);</div><div class='add'>+</div><div class='add'>+	/* Discover which interrupts are active/pending */</div><div class='add'>+	inta = _il_rd(il, CSR_INT);</div><div class='add'>+	inta_fh = _il_rd(il, CSR_FH_INT_STATUS);</div><div class='add'>+</div><div class='add'>+	/* Ignore interrupt if there's nothing in NIC to service.</div><div class='add'>+	 * This may be due to IRQ shared with another device,</div><div class='add'>+	 * or due to sporadic interrupts thrown from our NIC. */</div><div class='add'>+	if (!inta &amp;&amp; !inta_fh) {</div><div class='add'>+		D_ISR("Ignore interrupt, inta == 0, inta_fh == 0\n");</div><div class='add'>+		goto none;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (inta == 0xFFFFFFFF || (inta &amp; 0xFFFFFFF0) == 0xa5a5a5a0) {</div><div class='add'>+		/* Hardware disappeared. It might have already raised</div><div class='add'>+		 * an interrupt */</div><div class='add'>+		IL_WARN("HARDWARE GONE?? INTA == 0x%08x\n", inta);</div><div class='add'>+		goto unplugged;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D_ISR("ISR inta 0x%08x, enabled 0x%08x, fh 0x%08x\n", inta, inta_mask,</div><div class='add'>+	      inta_fh);</div><div class='add'>+</div><div class='add'>+	inta &amp;= ~CSR_INT_BIT_SCD;</div><div class='add'>+</div><div class='add'>+	/* il_irq_tasklet() will service interrupts and re-enable them */</div><div class='add'>+	if (likely(inta || inta_fh))</div><div class='add'>+		tasklet_schedule(&amp;il-&gt;irq_tasklet);</div><div class='add'>+</div><div class='add'>+unplugged:</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+</div><div class='add'>+none:</div><div class='add'>+	/* re-enable interrupts here since we don't have anything to service. */</div><div class='add'>+	/* only Re-enable if disabled by irq */</div><div class='add'>+	if (test_bit(S_INT_ENABLED, &amp;il-&gt;status))</div><div class='add'>+		il_enable_interrupts(il);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;lock, flags);</div><div class='add'>+	return IRQ_NONE;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_isr);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  il_tx_cmd_protection: Set rts/cts. 3945 and 4965 only share this</div><div class='add'>+ *  function.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il_tx_cmd_protection(struct il_priv *il, struct ieee80211_tx_info *info,</div><div class='add'>+		     __le16 fc, __le32 *tx_flags)</div><div class='add'>+{</div><div class='add'>+	if (info-&gt;control.rates[0].flags &amp; IEEE80211_TX_RC_USE_RTS_CTS) {</div><div class='add'>+		*tx_flags |= TX_CMD_FLG_RTS_MSK;</div><div class='add'>+		*tx_flags &amp;= ~TX_CMD_FLG_CTS_MSK;</div><div class='add'>+		*tx_flags |= TX_CMD_FLG_FULL_TXOP_PROT_MSK;</div><div class='add'>+</div><div class='add'>+		if (!ieee80211_is_mgmt(fc))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		switch (fc &amp; cpu_to_le16(IEEE80211_FCTL_STYPE)) {</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_AUTH):</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_DEAUTH):</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_ASSOC_REQ):</div><div class='add'>+		case cpu_to_le16(IEEE80211_STYPE_REASSOC_REQ):</div><div class='add'>+			*tx_flags &amp;= ~TX_CMD_FLG_RTS_MSK;</div><div class='add'>+			*tx_flags |= TX_CMD_FLG_CTS_MSK;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else if (info-&gt;control.rates[0].</div><div class='add'>+		   flags &amp; IEEE80211_TX_RC_USE_CTS_PROTECT) {</div><div class='add'>+		*tx_flags &amp;= ~TX_CMD_FLG_RTS_MSK;</div><div class='add'>+		*tx_flags |= TX_CMD_FLG_CTS_MSK;</div><div class='add'>+		*tx_flags |= TX_CMD_FLG_FULL_TXOP_PROT_MSK;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_tx_cmd_protection);</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h<br/>new file mode 100644<br/>index 000000000000..abfa388588be<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/common.h</a></div><div class='hunk'>@@ -0,0 +1,3246 @@</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.</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 version 2 of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution in the</div><div class='add'>+ * file called LICENSE.</div><div class='add'>+ *</div><div class='add'>+ * Contact Information:</div><div class='add'>+ *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='add'>+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+#ifndef __il_core_h__</div><div class='add'>+#define __il_core_h__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;		/* for struct pci_device_id */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+#include &lt;net/ieee80211_radiotap.h&gt;</div><div class='add'>+</div><div class='add'>+#include "commands.h"</div><div class='add'>+#include "csr.h"</div><div class='add'>+#include "prph.h"</div><div class='add'>+</div><div class='add'>+struct il_host_cmd;</div><div class='add'>+struct il_cmd;</div><div class='add'>+struct il_tx_queue;</div><div class='add'>+</div><div class='add'>+#define IL_ERR(f, a...) dev_err(&amp;il-&gt;pci_dev-&gt;dev, f, ## a)</div><div class='add'>+#define IL_WARN(f, a...) dev_warn(&amp;il-&gt;pci_dev-&gt;dev, f, ## a)</div><div class='add'>+#define IL_INFO(f, a...) dev_info(&amp;il-&gt;pci_dev-&gt;dev, f, ## a)</div><div class='add'>+</div><div class='add'>+#define RX_QUEUE_SIZE                         256</div><div class='add'>+#define RX_QUEUE_MASK                         255</div><div class='add'>+#define RX_QUEUE_SIZE_LOG                     8</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RX related structures and functions</div><div class='add'>+ */</div><div class='add'>+#define RX_FREE_BUFFERS 64</div><div class='add'>+#define RX_LOW_WATERMARK 8</div><div class='add'>+</div><div class='add'>+#define U32_PAD(n)		((4-(n))&amp;0x3)</div><div class='add'>+</div><div class='add'>+/* CT-KILL constants */</div><div class='add'>+#define CT_KILL_THRESHOLD_LEGACY   110	/* in Celsius */</div><div class='add'>+</div><div class='add'>+/* Default noise level to report when noise measurement is not available.</div><div class='add'>+ *   This may be because we're:</div><div class='add'>+ *   1)  Not associated (4965, no beacon stats being sent to driver)</div><div class='add'>+ *   2)  Scanning (noise measurement does not apply to associated channel)</div><div class='add'>+ *   3)  Receiving CCK (3945 delivers noise info only for OFDM frames)</div><div class='add'>+ * Use default noise value of -127 ... this is below the range of measurable</div><div class='add'>+ *   Rx dBm for either 3945 or 4965, so it can indicate "unmeasurable" to user.</div><div class='add'>+ *   Also, -127 works better than 0 when averaging frames with/without</div><div class='add'>+ *   noise info (e.g. averaging might be done in app); measured dBm values are</div><div class='add'>+ *   always negative ... using a negative value as the default keeps all</div><div class='add'>+ *   averages within an s8's (used in some apps) range of negative values. */</div><div class='add'>+#define IL_NOISE_MEAS_NOT_AVAILABLE (-127)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RTS threshold here is total size [2347] minus 4 FCS bytes</div><div class='add'>+ * Per spec:</div><div class='add'>+ *   a value of 0 means RTS on all data/management packets</div><div class='add'>+ *   a value &gt; max MSDU size means no RTS</div><div class='add'>+ * else RTS for data/management frames where MPDU is larger</div><div class='add'>+ *   than RTS value.</div><div class='add'>+ */</div><div class='add'>+#define DEFAULT_RTS_THRESHOLD     2347U</div><div class='add'>+#define MIN_RTS_THRESHOLD         0U</div><div class='add'>+#define MAX_RTS_THRESHOLD         2347U</div><div class='add'>+#define MAX_MSDU_SIZE		  2304U</div><div class='add'>+#define MAX_MPDU_SIZE		  2346U</div><div class='add'>+#define DEFAULT_BEACON_INTERVAL   100U</div><div class='add'>+#define	DEFAULT_SHORT_RETRY_LIMIT 7U</div><div class='add'>+#define	DEFAULT_LONG_RETRY_LIMIT  4U</div><div class='add'>+</div><div class='add'>+struct il_rx_buf {</div><div class='add'>+	dma_addr_t page_dma;</div><div class='add'>+	struct page *page;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define rxb_addr(r) page_address(r-&gt;page)</div><div class='add'>+</div><div class='add'>+/* defined below */</div><div class='add'>+struct il_device_cmd;</div><div class='add'>+</div><div class='add'>+struct il_cmd_meta {</div><div class='add'>+	/* only for SYNC commands, iff the reply skb is wanted */</div><div class='add'>+	struct il_host_cmd *source;</div><div class='add'>+	/*</div><div class='add'>+	 * only for ASYNC commands</div><div class='add'>+	 * (which is somewhat stupid -- look at common.c for instance</div><div class='add'>+	 * which duplicates a bunch of code because the callback isn't</div><div class='add'>+	 * invoked for SYNC commands, if it were and its result passed</div><div class='add'>+	 * through it would be simpler...)</div><div class='add'>+	 */</div><div class='add'>+	void (*callback) (struct il_priv *il, struct il_device_cmd *cmd,</div><div class='add'>+			  struct il_rx_pkt *pkt);</div><div class='add'>+</div><div class='add'>+	/* The CMD_SIZE_HUGE flag bit indicates that the command</div><div class='add'>+	 * structure is stored at the end of the shared queue memory. */</div><div class='add'>+	u32 flags;</div><div class='add'>+</div><div class='add'>+	 DEFINE_DMA_UNMAP_ADDR(mapping);</div><div class='add'>+	 DEFINE_DMA_UNMAP_LEN(len);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generic queue structure</div><div class='add'>+ *</div><div class='add'>+ * Contains common data for Rx and Tx queues</div><div class='add'>+ */</div><div class='add'>+struct il_queue {</div><div class='add'>+	int n_bd;		/* number of BDs in this queue */</div><div class='add'>+	int write_ptr;		/* 1-st empty entry (idx) host_w */</div><div class='add'>+	int read_ptr;		/* last used entry (idx) host_r */</div><div class='add'>+	/* use for monitoring and recovering the stuck queue */</div><div class='add'>+	dma_addr_t dma_addr;	/* physical addr for BD's */</div><div class='add'>+	int n_win;		/* safe queue win */</div><div class='add'>+	u32 id;</div><div class='add'>+	int low_mark;		/* low watermark, resume queue if free</div><div class='add'>+				 * space more than this */</div><div class='add'>+	int high_mark;		/* high watermark, stop queue if free</div><div class='add'>+				 * space less than this */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* One for each TFD */</div><div class='add'>+struct il_tx_info {</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct il_rxon_context *ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct il_tx_queue - Tx Queue for DMA</div><div class='add'>+ * @q: generic Rx/Tx queue descriptor</div><div class='add'>+ * @bd: base of circular buffer of TFDs</div><div class='add'>+ * @cmd: array of command/TX buffer pointers</div><div class='add'>+ * @meta: array of meta data for each command/tx buffer</div><div class='add'>+ * @dma_addr_cmd: physical address of cmd/tx buffer array</div><div class='add'>+ * @txb: array of per-TFD driver data</div><div class='add'>+ * @time_stamp: time (in jiffies) of last read_ptr change</div><div class='add'>+ * @need_update: indicates need to update read/write idx</div><div class='add'>+ * @sched_retry: indicates queue is high-throughput aggregation (HT AGG) enabled</div><div class='add'>+ *</div><div class='add'>+ * A Tx queue consists of circular buffer of BDs (a.k.a. TFDs, transmit frame</div><div class='add'>+ * descriptors) and required locking structures.</div><div class='add'>+ */</div><div class='add'>+#define TFD_TX_CMD_SLOTS 256</div><div class='add'>+#define TFD_CMD_SLOTS 32</div><div class='add'>+</div><div class='add'>+struct il_tx_queue {</div><div class='add'>+	struct il_queue q;</div><div class='add'>+	void *tfds;</div><div class='add'>+	struct il_device_cmd **cmd;</div><div class='add'>+	struct il_cmd_meta *meta;</div><div class='add'>+	struct il_tx_info *txb;</div><div class='add'>+	unsigned long time_stamp;</div><div class='add'>+	u8 need_update;</div><div class='add'>+	u8 sched_retry;</div><div class='add'>+	u8 active;</div><div class='add'>+	u8 swq_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * EEPROM access time values:</div><div class='add'>+ *</div><div class='add'>+ * Driver initiates EEPROM read by writing byte address &lt;&lt; 1 to CSR_EEPROM_REG.</div><div class='add'>+ * Driver then polls CSR_EEPROM_REG for CSR_EEPROM_REG_READ_VALID_MSK (0x1).</div><div class='add'>+ * When polling, wait 10 uSec between polling loops, up to a maximum 5000 uSec.</div><div class='add'>+ * Driver reads 16-bit value from bits 31-16 of CSR_EEPROM_REG.</div><div class='add'>+ */</div><div class='add'>+#define IL_EEPROM_ACCESS_TIMEOUT	5000	/* uSec */</div><div class='add'>+</div><div class='add'>+#define IL_EEPROM_SEM_TIMEOUT		10	/* microseconds */</div><div class='add'>+#define IL_EEPROM_SEM_RETRY_LIMIT	1000	/* number of attempts (not time) */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Regulatory channel usage flags in EEPROM struct il4965_eeprom_channel.flags.</div><div class='add'>+ *</div><div class='add'>+ * IBSS and/or AP operation is allowed *only* on those channels with</div><div class='add'>+ * (VALID &amp;&amp; IBSS &amp;&amp; ACTIVE &amp;&amp; !RADAR).  This restriction is in place because</div><div class='add'>+ * RADAR detection is not supported by the 4965 driver, but is a</div><div class='add'>+ * requirement for establishing a new network for legal operation on channels</div><div class='add'>+ * requiring RADAR detection or restricting ACTIVE scanning.</div><div class='add'>+ *</div><div class='add'>+ * NOTE:  "WIDE" flag does not indicate anything about "HT40" 40 MHz channels.</div><div class='add'>+ *        It only indicates that 20 MHz channel use is supported; HT40 channel</div><div class='add'>+ *        usage is indicated by a separate set of regulatory flags for each</div><div class='add'>+ *        HT40 channel pair.</div><div class='add'>+ *</div><div class='add'>+ * NOTE:  Using a channel inappropriately will result in a uCode error!</div><div class='add'>+ */</div><div class='add'>+#define IL_NUM_TX_CALIB_GROUPS 5</div><div class='add'>+enum {</div><div class='add'>+	EEPROM_CHANNEL_VALID = (1 &lt;&lt; 0),	/* usable for this SKU/geo */</div><div class='add'>+	EEPROM_CHANNEL_IBSS = (1 &lt;&lt; 1),	/* usable as an IBSS channel */</div><div class='add'>+	/* Bit 2 Reserved */</div><div class='add'>+	EEPROM_CHANNEL_ACTIVE = (1 &lt;&lt; 3),	/* active scanning allowed */</div><div class='add'>+	EEPROM_CHANNEL_RADAR = (1 &lt;&lt; 4),	/* radar detection required */</div><div class='add'>+	EEPROM_CHANNEL_WIDE = (1 &lt;&lt; 5),	/* 20 MHz channel okay */</div><div class='add'>+	/* Bit 6 Reserved (was Narrow Channel) */</div><div class='add'>+	EEPROM_CHANNEL_DFS = (1 &lt;&lt; 7),	/* dynamic freq selection candidate */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SKU Capabilities */</div><div class='add'>+/* 3945 only */</div><div class='add'>+#define EEPROM_SKU_CAP_SW_RF_KILL_ENABLE                (1 &lt;&lt; 0)</div><div class='add'>+#define EEPROM_SKU_CAP_HW_RF_KILL_ENABLE                (1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+/* *regulatory* channel data format in eeprom, one for each channel.</div><div class='add'>+ * There are separate entries for HT40 (40 MHz) vs. normal (20 MHz) channels. */</div><div class='add'>+struct il_eeprom_channel {</div><div class='add'>+	u8 flags;		/* EEPROM_CHANNEL_* flags copied from EEPROM */</div><div class='add'>+	s8 max_power_avg;	/* max power (dBm) on this chnl, limit 31 */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* 3945 Specific */</div><div class='add'>+#define EEPROM_3945_EEPROM_VERSION	(0x2f)</div><div class='add'>+</div><div class='add'>+/* 4965 has two radio transmitters (and 3 radio receivers) */</div><div class='add'>+#define EEPROM_TX_POWER_TX_CHAINS      (2)</div><div class='add'>+</div><div class='add'>+/* 4965 has room for up to 8 sets of txpower calibration data */</div><div class='add'>+#define EEPROM_TX_POWER_BANDS          (8)</div><div class='add'>+</div><div class='add'>+/* 4965 factory calibration measures txpower gain settings for</div><div class='add'>+ * each of 3 target output levels */</div><div class='add'>+#define EEPROM_TX_POWER_MEASUREMENTS   (3)</div><div class='add'>+</div><div class='add'>+/* 4965 Specific */</div><div class='add'>+/* 4965 driver does not work with txpower calibration version &lt; 5 */</div><div class='add'>+#define EEPROM_4965_TX_POWER_VERSION    (5)</div><div class='add'>+#define EEPROM_4965_EEPROM_VERSION	(0x2f)</div><div class='add'>+#define EEPROM_4965_CALIB_VERSION_OFFSET       (2*0xB6)	/* 2 bytes */</div><div class='add'>+#define EEPROM_4965_CALIB_TXPOWER_OFFSET       (2*0xE8)	/* 48  bytes */</div><div class='add'>+#define EEPROM_4965_BOARD_REVISION             (2*0x4F)	/* 2 bytes */</div><div class='add'>+#define EEPROM_4965_BOARD_PBA                  (2*0x56+1)	/* 9 bytes */</div><div class='add'>+</div><div class='add'>+/* 2.4 GHz */</div><div class='add'>+extern const u8 il_eeprom_band_1[14];</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * factory calibration data for one txpower level, on one channel,</div><div class='add'>+ * measured on one of the 2 tx chains (radio transmitter and associated</div><div class='add'>+ * antenna).  EEPROM contains:</div><div class='add'>+ *</div><div class='add'>+ * 1)  Temperature (degrees Celsius) of device when measurement was made.</div><div class='add'>+ *</div><div class='add'>+ * 2)  Gain table idx used to achieve the target measurement power.</div><div class='add'>+ *     This refers to the "well-known" gain tables (see 4965.h).</div><div class='add'>+ *</div><div class='add'>+ * 3)  Actual measured output power, in half-dBm ("34" = 17 dBm).</div><div class='add'>+ *</div><div class='add'>+ * 4)  RF power amplifier detector level measurement (not used).</div><div class='add'>+ */</div><div class='add'>+struct il_eeprom_calib_measure {</div><div class='add'>+	u8 temperature;		/* Device temperature (Celsius) */</div><div class='add'>+	u8 gain_idx;		/* Index into gain table */</div><div class='add'>+	u8 actual_pow;		/* Measured RF output power, half-dBm */</div><div class='add'>+	s8 pa_det;		/* Power amp detector level (not used) */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * measurement set for one channel.  EEPROM contains:</div><div class='add'>+ *</div><div class='add'>+ * 1)  Channel number measured</div><div class='add'>+ *</div><div class='add'>+ * 2)  Measurements for each of 3 power levels for each of 2 radio transmitters</div><div class='add'>+ *     (a.k.a. "tx chains") (6 measurements altogether)</div><div class='add'>+ */</div><div class='add'>+struct il_eeprom_calib_ch_info {</div><div class='add'>+	u8 ch_num;</div><div class='add'>+	struct il_eeprom_calib_measure</div><div class='add'>+	    measurements[EEPROM_TX_POWER_TX_CHAINS]</div><div class='add'>+	    [EEPROM_TX_POWER_MEASUREMENTS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * txpower subband info.</div><div class='add'>+ *</div><div class='add'>+ * For each frequency subband, EEPROM contains the following:</div><div class='add'>+ *</div><div class='add'>+ * 1)  First and last channels within range of the subband.  "0" values</div><div class='add'>+ *     indicate that this sample set is not being used.</div><div class='add'>+ *</div><div class='add'>+ * 2)  Sample measurement sets for 2 channels close to the range endpoints.</div><div class='add'>+ */</div><div class='add'>+struct il_eeprom_calib_subband_info {</div><div class='add'>+	u8 ch_from;		/* channel number of lowest channel in subband */</div><div class='add'>+	u8 ch_to;		/* channel number of highest channel in subband */</div><div class='add'>+	struct il_eeprom_calib_ch_info ch1;</div><div class='add'>+	struct il_eeprom_calib_ch_info ch2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * txpower calibration info.  EEPROM contains:</div><div class='add'>+ *</div><div class='add'>+ * 1)  Factory-measured saturation power levels (maximum levels at which</div><div class='add'>+ *     tx power amplifier can output a signal without too much distortion).</div><div class='add'>+ *     There is one level for 2.4 GHz band and one for 5 GHz band.  These</div><div class='add'>+ *     values apply to all channels within each of the bands.</div><div class='add'>+ *</div><div class='add'>+ * 2)  Factory-measured power supply voltage level.  This is assumed to be</div><div class='add'>+ *     constant (i.e. same value applies to all channels/bands) while the</div><div class='add'>+ *     factory measurements are being made.</div><div class='add'>+ *</div><div class='add'>+ * 3)  Up to 8 sets of factory-measured txpower calibration values.</div><div class='add'>+ *     These are for different frequency ranges, since txpower gain</div><div class='add'>+ *     characteristics of the analog radio circuitry vary with frequency.</div><div class='add'>+ *</div><div class='add'>+ *     Not all sets need to be filled with data;</div><div class='add'>+ *     struct il_eeprom_calib_subband_info contains range of channels</div><div class='add'>+ *     (0 if unused) for each set of data.</div><div class='add'>+ */</div><div class='add'>+struct il_eeprom_calib_info {</div><div class='add'>+	u8 saturation_power24;	/* half-dBm (e.g. "34" = 17 dBm) */</div><div class='add'>+	u8 saturation_power52;	/* half-dBm */</div><div class='add'>+	__le16 voltage;		/* signed */</div><div class='add'>+	struct il_eeprom_calib_subband_info band_info[EEPROM_TX_POWER_BANDS];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* General */</div><div class='add'>+#define EEPROM_DEVICE_ID                    (2*0x08)	/* 2 bytes */</div><div class='add'>+#define EEPROM_MAC_ADDRESS                  (2*0x15)	/* 6  bytes */</div><div class='add'>+#define EEPROM_BOARD_REVISION               (2*0x35)	/* 2  bytes */</div><div class='add'>+#define EEPROM_BOARD_PBA_NUMBER             (2*0x3B+1)	/* 9  bytes */</div><div class='add'>+#define EEPROM_VERSION                      (2*0x44)	/* 2  bytes */</div><div class='add'>+#define EEPROM_SKU_CAP                      (2*0x45)	/* 2  bytes */</div><div class='add'>+#define EEPROM_OEM_MODE                     (2*0x46)	/* 2  bytes */</div><div class='add'>+#define EEPROM_WOWLAN_MODE                  (2*0x47)	/* 2  bytes */</div><div class='add'>+#define EEPROM_RADIO_CONFIG                 (2*0x48)	/* 2  bytes */</div><div class='add'>+#define EEPROM_NUM_MAC_ADDRESS              (2*0x4C)	/* 2  bytes */</div><div class='add'>+</div><div class='add'>+/* The following masks are to be applied on EEPROM_RADIO_CONFIG */</div><div class='add'>+#define EEPROM_RF_CFG_TYPE_MSK(x)   (x &amp; 0x3)	/* bits 0-1   */</div><div class='add'>+#define EEPROM_RF_CFG_STEP_MSK(x)   ((x &gt;&gt; 2)  &amp; 0x3)	/* bits 2-3   */</div><div class='add'>+#define EEPROM_RF_CFG_DASH_MSK(x)   ((x &gt;&gt; 4)  &amp; 0x3)	/* bits 4-5   */</div><div class='add'>+#define EEPROM_RF_CFG_PNUM_MSK(x)   ((x &gt;&gt; 6)  &amp; 0x3)	/* bits 6-7   */</div><div class='add'>+#define EEPROM_RF_CFG_TX_ANT_MSK(x) ((x &gt;&gt; 8)  &amp; 0xF)	/* bits 8-11  */</div><div class='add'>+#define EEPROM_RF_CFG_RX_ANT_MSK(x) ((x &gt;&gt; 12) &amp; 0xF)	/* bits 12-15 */</div><div class='add'>+</div><div class='add'>+#define EEPROM_3945_RF_CFG_TYPE_MAX  0x0</div><div class='add'>+#define EEPROM_4965_RF_CFG_TYPE_MAX  0x1</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Per-channel regulatory data.</div><div class='add'>+ *</div><div class='add'>+ * Each channel that *might* be supported by iwl has a fixed location</div><div class='add'>+ * in EEPROM containing EEPROM_CHANNEL_* usage flags (LSB) and max regulatory</div><div class='add'>+ * txpower (MSB).</div><div class='add'>+ *</div><div class='add'>+ * Entries immediately below are for 20 MHz channel width.  HT40 (40 MHz)</div><div class='add'>+ * channels (only for 4965, not supported by 3945) appear later in the EEPROM.</div><div class='add'>+ *</div><div class='add'>+ * 2.4 GHz channels 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14</div><div class='add'>+ */</div><div class='add'>+#define EEPROM_REGULATORY_SKU_ID            (2*0x60)	/* 4  bytes */</div><div class='add'>+#define EEPROM_REGULATORY_BAND_1            (2*0x62)	/* 2  bytes */</div><div class='add'>+#define EEPROM_REGULATORY_BAND_1_CHANNELS   (2*0x63)	/* 28 bytes */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 4.9 GHz channels 183, 184, 185, 187, 188, 189, 192, 196,</div><div class='add'>+ * 5.0 GHz channels 7, 8, 11, 12, 16</div><div class='add'>+ * (4915-5080MHz) (none of these is ever supported)</div><div class='add'>+ */</div><div class='add'>+#define EEPROM_REGULATORY_BAND_2            (2*0x71)	/* 2  bytes */</div><div class='add'>+#define EEPROM_REGULATORY_BAND_2_CHANNELS   (2*0x72)	/* 26 bytes */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 5.2 GHz channels 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64</div><div class='add'>+ * (5170-5320MHz)</div><div class='add'>+ */</div><div class='add'>+#define EEPROM_REGULATORY_BAND_3            (2*0x7F)	/* 2  bytes */</div><div class='add'>+#define EEPROM_REGULATORY_BAND_3_CHANNELS   (2*0x80)	/* 24 bytes */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 5.5 GHz channels 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140</div><div class='add'>+ * (5500-5700MHz)</div><div class='add'>+ */</div><div class='add'>+#define EEPROM_REGULATORY_BAND_4            (2*0x8C)	/* 2  bytes */</div><div class='add'>+#define EEPROM_REGULATORY_BAND_4_CHANNELS   (2*0x8D)	/* 22 bytes */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 5.7 GHz channels 145, 149, 153, 157, 161, 165</div><div class='add'>+ * (5725-5825MHz)</div><div class='add'>+ */</div><div class='add'>+#define EEPROM_REGULATORY_BAND_5            (2*0x98)	/* 2  bytes */</div><div class='add'>+#define EEPROM_REGULATORY_BAND_5_CHANNELS   (2*0x99)	/* 12 bytes */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 2.4 GHz HT40 channels 1 (5), 2 (6), 3 (7), 4 (8), 5 (9), 6 (10), 7 (11)</div><div class='add'>+ *</div><div class='add'>+ * The channel listed is the center of the lower 20 MHz half of the channel.</div><div class='add'>+ * The overall center frequency is actually 2 channels (10 MHz) above that,</div><div class='add'>+ * and the upper half of each HT40 channel is centered 4 channels (20 MHz) away</div><div class='add'>+ * from the lower half; e.g. the upper half of HT40 channel 1 is channel 5,</div><div class='add'>+ * and the overall HT40 channel width centers on channel 3.</div><div class='add'>+ *</div><div class='add'>+ * NOTE:  The RXON command uses 20 MHz channel numbers to specify the</div><div class='add'>+ *        control channel to which to tune.  RXON also specifies whether the</div><div class='add'>+ *        control channel is the upper or lower half of a HT40 channel.</div><div class='add'>+ *</div><div class='add'>+ * NOTE:  4965 does not support HT40 channels on 2.4 GHz.</div><div class='add'>+ */</div><div class='add'>+#define EEPROM_4965_REGULATORY_BAND_24_HT40_CHANNELS (2*0xA0)	/* 14 bytes */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 5.2 GHz HT40 channels 36 (40), 44 (48), 52 (56), 60 (64),</div><div class='add'>+ * 100 (104), 108 (112), 116 (120), 124 (128), 132 (136), 149 (153), 157 (161)</div><div class='add'>+ */</div><div class='add'>+#define EEPROM_4965_REGULATORY_BAND_52_HT40_CHANNELS (2*0xA8)	/* 22 bytes */</div><div class='add'>+</div><div class='add'>+#define EEPROM_REGULATORY_BAND_NO_HT40			(0)</div><div class='add'>+</div><div class='add'>+struct il_eeprom_ops {</div><div class='add'>+	const u32 regulatory_bands[7];</div><div class='add'>+	int (*acquire_semaphore) (struct il_priv *il);</div><div class='add'>+	void (*release_semaphore) (struct il_priv *il);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int il_eeprom_init(struct il_priv *il);</div><div class='add'>+void il_eeprom_free(struct il_priv *il);</div><div class='add'>+const u8 *il_eeprom_query_addr(const struct il_priv *il, size_t offset);</div><div class='add'>+u16 il_eeprom_query16(const struct il_priv *il, size_t offset);</div><div class='add'>+int il_init_channel_map(struct il_priv *il);</div><div class='add'>+void il_free_channel_map(struct il_priv *il);</div><div class='add'>+const struct il_channel_info *il_get_channel_info(const struct il_priv *il,</div><div class='add'>+						  enum ieee80211_band band,</div><div class='add'>+						  u16 channel);</div><div class='add'>+</div><div class='add'>+#define IL_NUM_SCAN_RATES         (2)</div><div class='add'>+</div><div class='add'>+struct il4965_channel_tgd_info {</div><div class='add'>+	u8 type;</div><div class='add'>+	s8 max_power;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il4965_channel_tgh_info {</div><div class='add'>+	s64 last_radar_time;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IL4965_MAX_RATE (33)</div><div class='add'>+</div><div class='add'>+struct il3945_clip_group {</div><div class='add'>+	/* maximum power level to prevent clipping for each rate, derived by</div><div class='add'>+	 *   us from this band's saturation power in EEPROM */</div><div class='add'>+	const s8 clip_powers[IL_MAX_RATES];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* current Tx power values to use, one for each rate for each channel.</div><div class='add'>+ * requested power is limited by:</div><div class='add'>+ * -- regulatory EEPROM limits for this channel</div><div class='add'>+ * -- hardware capabilities (clip-powers)</div><div class='add'>+ * -- spectrum management</div><div class='add'>+ * -- user preference (e.g. iwconfig)</div><div class='add'>+ * when requested power is set, base power idx must also be set. */</div><div class='add'>+struct il3945_channel_power_info {</div><div class='add'>+	struct il3945_tx_power tpc;	/* actual radio and DSP gain settings */</div><div class='add'>+	s8 power_table_idx;	/* actual (compenst'd) idx into gain table */</div><div class='add'>+	s8 base_power_idx;	/* gain idx for power at factory temp. */</div><div class='add'>+	s8 requested_power;	/* power (dBm) requested for this chnl/rate */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* current scan Tx power values to use, one for each scan rate for each</div><div class='add'>+ * channel. */</div><div class='add'>+struct il3945_scan_power_info {</div><div class='add'>+	struct il3945_tx_power tpc;	/* actual radio and DSP gain settings */</div><div class='add'>+	s8 power_table_idx;	/* actual (compenst'd) idx into gain table */</div><div class='add'>+	s8 requested_power;	/* scan pwr (dBm) requested for chnl/rate */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * One for each channel, holds all channel setup data</div><div class='add'>+ * Some of the fields (e.g. eeprom and flags/max_power_avg) are redundant</div><div class='add'>+ *     with one another!</div><div class='add'>+ */</div><div class='add'>+struct il_channel_info {</div><div class='add'>+	struct il4965_channel_tgd_info tgd;</div><div class='add'>+	struct il4965_channel_tgh_info tgh;</div><div class='add'>+	struct il_eeprom_channel eeprom;	/* EEPROM regulatory limit */</div><div class='add'>+	struct il_eeprom_channel ht40_eeprom;	/* EEPROM regulatory limit for</div><div class='add'>+						 * HT40 channel */</div><div class='add'>+</div><div class='add'>+	u8 channel;		/* channel number */</div><div class='add'>+	u8 flags;		/* flags copied from EEPROM */</div><div class='add'>+	s8 max_power_avg;	/* (dBm) regul. eeprom, normal Tx, any rate */</div><div class='add'>+	s8 curr_txpow;		/* (dBm) regulatory/spectrum/user (not h/w) limit */</div><div class='add'>+	s8 min_power;		/* always 0 */</div><div class='add'>+	s8 scan_power;		/* (dBm) regul. eeprom, direct scans, any rate */</div><div class='add'>+</div><div class='add'>+	u8 group_idx;		/* 0-4, maps channel to group1/2/3/4/5 */</div><div class='add'>+	u8 band_idx;		/* 0-4, maps channel to band1/2/3/4/5 */</div><div class='add'>+	enum ieee80211_band band;</div><div class='add'>+</div><div class='add'>+	/* HT40 channel info */</div><div class='add'>+	s8 ht40_max_power_avg;	/* (dBm) regul. eeprom, normal Tx, any rate */</div><div class='add'>+	u8 ht40_flags;		/* flags copied from EEPROM */</div><div class='add'>+	u8 ht40_extension_channel;	/* HT_IE_EXT_CHANNEL_* */</div><div class='add'>+</div><div class='add'>+	/* Radio/DSP gain settings for each "normal" data Tx rate.</div><div class='add'>+	 * These include, in addition to RF and DSP gain, a few fields for</div><div class='add'>+	 *   remembering/modifying gain settings (idxes). */</div><div class='add'>+	struct il3945_channel_power_info power_info[IL4965_MAX_RATE];</div><div class='add'>+</div><div class='add'>+	/* Radio/DSP gain settings for each scan rate, for directed scans. */</div><div class='add'>+	struct il3945_scan_power_info scan_pwr_info[IL_NUM_SCAN_RATES];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IL_TX_FIFO_BK		0	/* shared */</div><div class='add'>+#define IL_TX_FIFO_BE		1</div><div class='add'>+#define IL_TX_FIFO_VI		2	/* shared */</div><div class='add'>+#define IL_TX_FIFO_VO		3</div><div class='add'>+#define IL_TX_FIFO_UNUSED	-1</div><div class='add'>+</div><div class='add'>+/* Minimum number of queues. MAX_NUM is defined in hw specific files.</div><div class='add'>+ * Set the minimum to accommodate the 4 standard TX queues, 1 command</div><div class='add'>+ * queue, 2 (unused) HCCA queues, and 4 HT queues (one for each AC) */</div><div class='add'>+#define IL_MIN_NUM_QUEUES	10</div><div class='add'>+</div><div class='add'>+#define IL_DEFAULT_CMD_QUEUE_NUM	4</div><div class='add'>+</div><div class='add'>+#define IEEE80211_DATA_LEN              2304</div><div class='add'>+#define IEEE80211_4ADDR_LEN             30</div><div class='add'>+#define IEEE80211_HLEN                  (IEEE80211_4ADDR_LEN)</div><div class='add'>+#define IEEE80211_FRAME_LEN             (IEEE80211_DATA_LEN + IEEE80211_HLEN)</div><div class='add'>+</div><div class='add'>+struct il_frame {</div><div class='add'>+	union {</div><div class='add'>+		struct ieee80211_hdr frame;</div><div class='add'>+		struct il_tx_beacon_cmd beacon;</div><div class='add'>+		u8 raw[IEEE80211_FRAME_LEN];</div><div class='add'>+		u8 cmd[360];</div><div class='add'>+	} u;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SEQ_TO_SN(seq) (((seq) &amp; IEEE80211_SCTL_SEQ) &gt;&gt; 4)</div><div class='add'>+#define SN_TO_SEQ(ssn) (((ssn) &lt;&lt; 4) &amp; IEEE80211_SCTL_SEQ)</div><div class='add'>+#define MAX_SN ((IEEE80211_SCTL_SEQ) &gt;&gt; 4)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CMD_SYNC = 0,</div><div class='add'>+	CMD_SIZE_NORMAL = 0,</div><div class='add'>+	CMD_NO_SKB = 0,</div><div class='add'>+	CMD_SIZE_HUGE = (1 &lt;&lt; 0),</div><div class='add'>+	CMD_ASYNC = (1 &lt;&lt; 1),</div><div class='add'>+	CMD_WANT_SKB = (1 &lt;&lt; 2),</div><div class='add'>+	CMD_MAPPED = (1 &lt;&lt; 3),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DEF_CMD_PAYLOAD_SIZE 320</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct il_device_cmd</div><div class='add'>+ *</div><div class='add'>+ * For allocation of the command and tx queues, this establishes the overall</div><div class='add'>+ * size of the largest command we send to uCode, except for a scan command</div><div class='add'>+ * (which is relatively huge; space is allocated separately).</div><div class='add'>+ */</div><div class='add'>+struct il_device_cmd {</div><div class='add'>+	struct il_cmd_header hdr;	/* uCode API */</div><div class='add'>+	union {</div><div class='add'>+		u32 flags;</div><div class='add'>+		u8 val8;</div><div class='add'>+		u16 val16;</div><div class='add'>+		u32 val32;</div><div class='add'>+		struct il_tx_cmd tx;</div><div class='add'>+		u8 payload[DEF_CMD_PAYLOAD_SIZE];</div><div class='add'>+	} __packed cmd;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define TFD_MAX_PAYLOAD_SIZE (sizeof(struct il_device_cmd))</div><div class='add'>+</div><div class='add'>+struct il_host_cmd {</div><div class='add'>+	const void *data;</div><div class='add'>+	unsigned long reply_page;</div><div class='add'>+	void (*callback) (struct il_priv *il, struct il_device_cmd *cmd,</div><div class='add'>+			  struct il_rx_pkt *pkt);</div><div class='add'>+	u32 flags;</div><div class='add'>+	u16 len;</div><div class='add'>+	u8 id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SUP_RATE_11A_MAX_NUM_CHANNELS  8</div><div class='add'>+#define SUP_RATE_11B_MAX_NUM_CHANNELS  4</div><div class='add'>+#define SUP_RATE_11G_MAX_NUM_CHANNELS  12</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct il_rx_queue - Rx queue</div><div class='add'>+ * @bd: driver's pointer to buffer of receive buffer descriptors (rbd)</div><div class='add'>+ * @bd_dma: bus address of buffer of receive buffer descriptors (rbd)</div><div class='add'>+ * @read: Shared idx to newest available Rx buffer</div><div class='add'>+ * @write: Shared idx to oldest written Rx packet</div><div class='add'>+ * @free_count: Number of pre-allocated buffers in rx_free</div><div class='add'>+ * @rx_free: list of free SKBs for use</div><div class='add'>+ * @rx_used: List of Rx buffers with no SKB</div><div class='add'>+ * @need_update: flag to indicate we need to update read/write idx</div><div class='add'>+ * @rb_stts: driver's pointer to receive buffer status</div><div class='add'>+ * @rb_stts_dma: bus address of receive buffer status</div><div class='add'>+ *</div><div class='add'>+ * NOTE:  rx_free and rx_used are used as a FIFO for il_rx_bufs</div><div class='add'>+ */</div><div class='add'>+struct il_rx_queue {</div><div class='add'>+	__le32 *bd;</div><div class='add'>+	dma_addr_t bd_dma;</div><div class='add'>+	struct il_rx_buf pool[RX_QUEUE_SIZE + RX_FREE_BUFFERS];</div><div class='add'>+	struct il_rx_buf *queue[RX_QUEUE_SIZE];</div><div class='add'>+	u32 read;</div><div class='add'>+	u32 write;</div><div class='add'>+	u32 free_count;</div><div class='add'>+	u32 write_actual;</div><div class='add'>+	struct list_head rx_free;</div><div class='add'>+	struct list_head rx_used;</div><div class='add'>+	int need_update;</div><div class='add'>+	struct il_rb_status *rb_stts;</div><div class='add'>+	dma_addr_t rb_stts_dma;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IL_SUPPORTED_RATES_IE_LEN         8</div><div class='add'>+</div><div class='add'>+#define MAX_TID_COUNT        9</div><div class='add'>+</div><div class='add'>+#define IL_INVALID_RATE     0xFF</div><div class='add'>+#define IL_INVALID_VALUE    -1</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct il_ht_agg -- aggregation status while waiting for block-ack</div><div class='add'>+ * @txq_id: Tx queue used for Tx attempt</div><div class='add'>+ * @frame_count: # frames attempted by Tx command</div><div class='add'>+ * @wait_for_ba: Expect block-ack before next Tx reply</div><div class='add'>+ * @start_idx: Index of 1st Transmit Frame Descriptor (TFD) in Tx win</div><div class='add'>+ * @bitmap0: Low order bitmap, one bit for each frame pending ACK in Tx win</div><div class='add'>+ * @bitmap1: High order, one bit for each frame pending ACK in Tx win</div><div class='add'>+ * @rate_n_flags: Rate at which Tx was attempted</div><div class='add'>+ *</div><div class='add'>+ * If C_TX indicates that aggregation was attempted, driver must wait</div><div class='add'>+ * for block ack (N_COMPRESSED_BA).  This struct stores tx reply info</div><div class='add'>+ * until block ack arrives.</div><div class='add'>+ */</div><div class='add'>+struct il_ht_agg {</div><div class='add'>+	u16 txq_id;</div><div class='add'>+	u16 frame_count;</div><div class='add'>+	u16 wait_for_ba;</div><div class='add'>+	u16 start_idx;</div><div class='add'>+	u64 bitmap;</div><div class='add'>+	u32 rate_n_flags;</div><div class='add'>+#define IL_AGG_OFF 0</div><div class='add'>+#define IL_AGG_ON 1</div><div class='add'>+#define IL_EMPTYING_HW_QUEUE_ADDBA 2</div><div class='add'>+#define IL_EMPTYING_HW_QUEUE_DELBA 3</div><div class='add'>+	u8 state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il_tid_data {</div><div class='add'>+	u16 seq_number;		/* 4965 only */</div><div class='add'>+	u16 tfds_in_queue;</div><div class='add'>+	struct il_ht_agg agg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il_hw_key {</div><div class='add'>+	u32 cipher;</div><div class='add'>+	int keylen;</div><div class='add'>+	u8 keyidx;</div><div class='add'>+	u8 key[32];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union il_ht_rate_supp {</div><div class='add'>+	u16 rates;</div><div class='add'>+	struct {</div><div class='add'>+		u8 siso_rate;</div><div class='add'>+		u8 mimo_rate;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CFG_HT_RX_AMPDU_FACTOR_8K   (0x0)</div><div class='add'>+#define CFG_HT_RX_AMPDU_FACTOR_16K  (0x1)</div><div class='add'>+#define CFG_HT_RX_AMPDU_FACTOR_32K  (0x2)</div><div class='add'>+#define CFG_HT_RX_AMPDU_FACTOR_64K  (0x3)</div><div class='add'>+#define CFG_HT_RX_AMPDU_FACTOR_DEF  CFG_HT_RX_AMPDU_FACTOR_64K</div><div class='add'>+#define CFG_HT_RX_AMPDU_FACTOR_MAX  CFG_HT_RX_AMPDU_FACTOR_64K</div><div class='add'>+#define CFG_HT_RX_AMPDU_FACTOR_MIN  CFG_HT_RX_AMPDU_FACTOR_8K</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Maximal MPDU density for TX aggregation</div><div class='add'>+ * 4 - 2us density</div><div class='add'>+ * 5 - 4us density</div><div class='add'>+ * 6 - 8us density</div><div class='add'>+ * 7 - 16us density</div><div class='add'>+ */</div><div class='add'>+#define CFG_HT_MPDU_DENSITY_2USEC   (0x4)</div><div class='add'>+#define CFG_HT_MPDU_DENSITY_4USEC   (0x5)</div><div class='add'>+#define CFG_HT_MPDU_DENSITY_8USEC   (0x6)</div><div class='add'>+#define CFG_HT_MPDU_DENSITY_16USEC  (0x7)</div><div class='add'>+#define CFG_HT_MPDU_DENSITY_DEF CFG_HT_MPDU_DENSITY_4USEC</div><div class='add'>+#define CFG_HT_MPDU_DENSITY_MAX CFG_HT_MPDU_DENSITY_16USEC</div><div class='add'>+#define CFG_HT_MPDU_DENSITY_MIN     (0x1)</div><div class='add'>+</div><div class='add'>+struct il_ht_config {</div><div class='add'>+	bool single_chain_sufficient;</div><div class='add'>+	enum ieee80211_smps_mode smps;	/* current smps mode */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* QoS structures */</div><div class='add'>+struct il_qos_info {</div><div class='add'>+	int qos_active;</div><div class='add'>+	struct il_qosparam_cmd def_qos_parm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Structure should be accessed with sta_lock held. When station addition</div><div class='add'>+ * is in progress (IL_STA_UCODE_INPROGRESS) it is possible to access only</div><div class='add'>+ * the commands (il_addsta_cmd and il_link_quality_cmd) without</div><div class='add'>+ * sta_lock held.</div><div class='add'>+ */</div><div class='add'>+struct il_station_entry {</div><div class='add'>+	struct il_addsta_cmd sta;</div><div class='add'>+	struct il_tid_data tid[MAX_TID_COUNT];</div><div class='add'>+	u8 used, ctxid;</div><div class='add'>+	struct il_hw_key keyinfo;</div><div class='add'>+	struct il_link_quality_cmd *lq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il_station_priv_common {</div><div class='add'>+	struct il_rxon_context *ctx;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct il_vif_priv - driver's ilate per-interface information</div><div class='add'>+ *</div><div class='add'>+ * When mac80211 allocates a virtual interface, it can allocate</div><div class='add'>+ * space for us to put data into.</div><div class='add'>+ */</div><div class='add'>+struct il_vif_priv {</div><div class='add'>+	struct il_rxon_context *ctx;</div><div class='add'>+	u8 ibss_bssid_sta_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* one for each uCode image (inst/data, boot/init/runtime) */</div><div class='add'>+struct fw_desc {</div><div class='add'>+	void *v_addr;		/* access by driver */</div><div class='add'>+	dma_addr_t p_addr;	/* access by card's busmaster DMA */</div><div class='add'>+	u32 len;		/* bytes */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* uCode file layout */</div><div class='add'>+struct il_ucode_header {</div><div class='add'>+	__le32 ver;		/* major/minor/API/serial */</div><div class='add'>+	struct {</div><div class='add'>+		__le32 inst_size;	/* bytes of runtime code */</div><div class='add'>+		__le32 data_size;	/* bytes of runtime data */</div><div class='add'>+		__le32 init_size;	/* bytes of init code */</div><div class='add'>+		__le32 init_data_size;	/* bytes of init data */</div><div class='add'>+		__le32 boot_size;	/* bytes of bootstrap code */</div><div class='add'>+		u8 data[0];	/* in same order as sizes */</div><div class='add'>+	} v1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il4965_ibss_seq {</div><div class='add'>+	u8 mac[ETH_ALEN];</div><div class='add'>+	u16 seq_num;</div><div class='add'>+	u16 frag_num;</div><div class='add'>+	unsigned long packet_time;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il_sensitivity_ranges {</div><div class='add'>+	u16 min_nrg_cck;</div><div class='add'>+	u16 max_nrg_cck;</div><div class='add'>+</div><div class='add'>+	u16 nrg_th_cck;</div><div class='add'>+	u16 nrg_th_ofdm;</div><div class='add'>+</div><div class='add'>+	u16 auto_corr_min_ofdm;</div><div class='add'>+	u16 auto_corr_min_ofdm_mrc;</div><div class='add'>+	u16 auto_corr_min_ofdm_x1;</div><div class='add'>+	u16 auto_corr_min_ofdm_mrc_x1;</div><div class='add'>+</div><div class='add'>+	u16 auto_corr_max_ofdm;</div><div class='add'>+	u16 auto_corr_max_ofdm_mrc;</div><div class='add'>+	u16 auto_corr_max_ofdm_x1;</div><div class='add'>+	u16 auto_corr_max_ofdm_mrc_x1;</div><div class='add'>+</div><div class='add'>+	u16 auto_corr_max_cck;</div><div class='add'>+	u16 auto_corr_max_cck_mrc;</div><div class='add'>+	u16 auto_corr_min_cck;</div><div class='add'>+	u16 auto_corr_min_cck_mrc;</div><div class='add'>+</div><div class='add'>+	u16 barker_corr_th_min;</div><div class='add'>+	u16 barker_corr_th_min_mrc;</div><div class='add'>+	u16 nrg_th_cca;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define KELVIN_TO_CELSIUS(x) ((x)-273)</div><div class='add'>+#define CELSIUS_TO_KELVIN(x) ((x)+273)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct il_hw_params</div><div class='add'>+ * @max_txq_num: Max # Tx queues supported</div><div class='add'>+ * @dma_chnl_num: Number of Tx DMA/FIFO channels</div><div class='add'>+ * @scd_bc_tbls_size: size of scheduler byte count tables</div><div class='add'>+ * @tfd_size: TFD size</div><div class='add'>+ * @tx/rx_chains_num: Number of TX/RX chains</div><div class='add'>+ * @valid_tx/rx_ant: usable antennas</div><div class='add'>+ * @max_rxq_size: Max # Rx frames in Rx queue (must be power-of-2)</div><div class='add'>+ * @max_rxq_log: Log-base-2 of max_rxq_size</div><div class='add'>+ * @rx_page_order: Rx buffer page order</div><div class='add'>+ * @rx_wrt_ptr_reg: FH{39}_RSCSR_CHNL0_WPTR</div><div class='add'>+ * @max_stations:</div><div class='add'>+ * @ht40_channel: is 40MHz width possible in band 2.4</div><div class='add'>+ * BIT(IEEE80211_BAND_5GHZ) BIT(IEEE80211_BAND_5GHZ)</div><div class='add'>+ * @sw_crypto: 0 for hw, 1 for sw</div><div class='add'>+ * @max_xxx_size: for ucode uses</div><div class='add'>+ * @ct_kill_threshold: temperature threshold</div><div class='add'>+ * @beacon_time_tsf_bits: number of valid tsf bits for beacon time</div><div class='add'>+ * @struct il_sensitivity_ranges: range of sensitivity values</div><div class='add'>+ */</div><div class='add'>+struct il_hw_params {</div><div class='add'>+	u8 max_txq_num;</div><div class='add'>+	u8 dma_chnl_num;</div><div class='add'>+	u16 scd_bc_tbls_size;</div><div class='add'>+	u32 tfd_size;</div><div class='add'>+	u8 tx_chains_num;</div><div class='add'>+	u8 rx_chains_num;</div><div class='add'>+	u8 valid_tx_ant;</div><div class='add'>+	u8 valid_rx_ant;</div><div class='add'>+	u16 max_rxq_size;</div><div class='add'>+	u16 max_rxq_log;</div><div class='add'>+	u32 rx_page_order;</div><div class='add'>+	u32 rx_wrt_ptr_reg;</div><div class='add'>+	u8 max_stations;</div><div class='add'>+	u8 ht40_channel;</div><div class='add'>+	u8 max_beacon_itrvl;	/* in 1024 ms */</div><div class='add'>+	u32 max_inst_size;</div><div class='add'>+	u32 max_data_size;</div><div class='add'>+	u32 max_bsm_size;</div><div class='add'>+	u32 ct_kill_threshold;	/* value in hw-dependent units */</div><div class='add'>+	u16 beacon_time_tsf_bits;</div><div class='add'>+	const struct il_sensitivity_ranges *sens;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Functions implemented in core module which are forward declared here</div><div class='add'>+ * for use by iwl-[4-5].c</div><div class='add'>+ *</div><div class='add'>+ * NOTE:  The implementation of these functions are not hardware specific</div><div class='add'>+ * which is why they are in the core module files.</div><div class='add'>+ *</div><div class='add'>+ * Naming convention --</div><div class='add'>+ * il_         &lt;-- Is part of iwlwifi</div><div class='add'>+ * iwlXXXX_     &lt;-- Hardware specific (implemented in iwl-XXXX.c for XXXX)</div><div class='add'>+ * il4965_bg_      &lt;-- Called from work queue context</div><div class='add'>+ * il4965_mac_     &lt;-- mac80211 callback</div><div class='add'>+ *</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+extern void il4965_update_chain_flags(struct il_priv *il);</div><div class='add'>+extern const u8 il_bcast_addr[ETH_ALEN];</div><div class='add'>+extern int il_queue_space(const struct il_queue *q);</div><div class='add'>+static inline int</div><div class='add'>+il_queue_used(const struct il_queue *q, int i)</div><div class='add'>+{</div><div class='add'>+	return q-&gt;write_ptr &gt;= q-&gt;read_ptr ? (i &gt;= q-&gt;read_ptr &amp;&amp;</div><div class='add'>+					      i &lt; q-&gt;write_ptr) : !(i &lt;</div><div class='add'>+								    q-&gt;read_ptr</div><div class='add'>+								    &amp;&amp; i &gt;=</div><div class='add'>+								    q-&gt;</div><div class='add'>+								    write_ptr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8</div><div class='add'>+il_get_cmd_idx(struct il_queue *q, u32 idx, int is_huge)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * This is for init calibration result and scan command which</div><div class='add'>+	 * required buffer &gt; TFD_MAX_PAYLOAD_SIZE,</div><div class='add'>+	 * the big buffer at end of command array</div><div class='add'>+	 */</div><div class='add'>+	if (is_huge)</div><div class='add'>+		return q-&gt;n_win;	/* must be power of 2 */</div><div class='add'>+</div><div class='add'>+	/* Otherwise, use normal size buffers */</div><div class='add'>+	return idx &amp; (q-&gt;n_win - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct il_dma_ptr {</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+	void *addr;</div><div class='add'>+	size_t size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IL_OPERATION_MODE_AUTO     0</div><div class='add'>+#define IL_OPERATION_MODE_HT_ONLY  1</div><div class='add'>+#define IL_OPERATION_MODE_MIXED    2</div><div class='add'>+#define IL_OPERATION_MODE_20MHZ    3</div><div class='add'>+</div><div class='add'>+#define IL_TX_CRC_SIZE 4</div><div class='add'>+#define IL_TX_DELIMITER_SIZE 4</div><div class='add'>+</div><div class='add'>+#define TX_POWER_IL_ILLEGAL_VOLTAGE -10000</div><div class='add'>+</div><div class='add'>+/* Sensitivity and chain noise calibration */</div><div class='add'>+#define INITIALIZATION_VALUE		0xFFFF</div><div class='add'>+#define IL4965_CAL_NUM_BEACONS		20</div><div class='add'>+#define IL_CAL_NUM_BEACONS		16</div><div class='add'>+#define MAXIMUM_ALLOWED_PATHLOSS	15</div><div class='add'>+</div><div class='add'>+#define CHAIN_NOISE_MAX_DELTA_GAIN_CODE 3</div><div class='add'>+</div><div class='add'>+#define MAX_FA_OFDM  50</div><div class='add'>+#define MIN_FA_OFDM  5</div><div class='add'>+#define MAX_FA_CCK   50</div><div class='add'>+#define MIN_FA_CCK   5</div><div class='add'>+</div><div class='add'>+#define AUTO_CORR_STEP_OFDM       1</div><div class='add'>+</div><div class='add'>+#define AUTO_CORR_STEP_CCK     3</div><div class='add'>+#define AUTO_CORR_MAX_TH_CCK   160</div><div class='add'>+</div><div class='add'>+#define NRG_DIFF               2</div><div class='add'>+#define NRG_STEP_CCK           2</div><div class='add'>+#define NRG_MARGIN             8</div><div class='add'>+#define MAX_NUMBER_CCK_NO_FA 100</div><div class='add'>+</div><div class='add'>+#define AUTO_CORR_CCK_MIN_VAL_DEF    (125)</div><div class='add'>+</div><div class='add'>+#define CHAIN_A             0</div><div class='add'>+#define CHAIN_B             1</div><div class='add'>+#define CHAIN_C             2</div><div class='add'>+#define CHAIN_NOISE_DELTA_GAIN_INIT_VAL 4</div><div class='add'>+#define ALL_BAND_FILTER			0xFF00</div><div class='add'>+#define IN_BAND_FILTER			0xFF</div><div class='add'>+#define MIN_AVERAGE_NOISE_MAX_VALUE	0xFFFFFFFF</div><div class='add'>+</div><div class='add'>+#define NRG_NUM_PREV_STAT_L     20</div><div class='add'>+#define NUM_RX_CHAINS           3</div><div class='add'>+</div><div class='add'>+enum il4965_false_alarm_state {</div><div class='add'>+	IL_FA_TOO_MANY = 0,</div><div class='add'>+	IL_FA_TOO_FEW = 1,</div><div class='add'>+	IL_FA_GOOD_RANGE = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum il4965_chain_noise_state {</div><div class='add'>+	IL_CHAIN_NOISE_ALIVE = 0,	/* must be 0 */</div><div class='add'>+	IL_CHAIN_NOISE_ACCUMULATE,</div><div class='add'>+	IL_CHAIN_NOISE_CALIBRATED,</div><div class='add'>+	IL_CHAIN_NOISE_DONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum il4965_calib_enabled_state {</div><div class='add'>+	IL_CALIB_DISABLED = 0,	/* must be 0 */</div><div class='add'>+	IL_CALIB_ENABLED = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * enum il_calib</div><div class='add'>+ * defines the order in which results of initial calibrations</div><div class='add'>+ * should be sent to the runtime uCode</div><div class='add'>+ */</div><div class='add'>+enum il_calib {</div><div class='add'>+	IL_CALIB_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Opaque calibration results */</div><div class='add'>+struct il_calib_result {</div><div class='add'>+	void *buf;</div><div class='add'>+	size_t buf_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ucode_type {</div><div class='add'>+	UCODE_NONE = 0,</div><div class='add'>+	UCODE_INIT,</div><div class='add'>+	UCODE_RT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Sensitivity calib data */</div><div class='add'>+struct il_sensitivity_data {</div><div class='add'>+	u32 auto_corr_ofdm;</div><div class='add'>+	u32 auto_corr_ofdm_mrc;</div><div class='add'>+	u32 auto_corr_ofdm_x1;</div><div class='add'>+	u32 auto_corr_ofdm_mrc_x1;</div><div class='add'>+	u32 auto_corr_cck;</div><div class='add'>+	u32 auto_corr_cck_mrc;</div><div class='add'>+</div><div class='add'>+	u32 last_bad_plcp_cnt_ofdm;</div><div class='add'>+	u32 last_fa_cnt_ofdm;</div><div class='add'>+	u32 last_bad_plcp_cnt_cck;</div><div class='add'>+	u32 last_fa_cnt_cck;</div><div class='add'>+</div><div class='add'>+	u32 nrg_curr_state;</div><div class='add'>+	u32 nrg_prev_state;</div><div class='add'>+	u32 nrg_value[10];</div><div class='add'>+	u8 nrg_silence_rssi[NRG_NUM_PREV_STAT_L];</div><div class='add'>+	u32 nrg_silence_ref;</div><div class='add'>+	u32 nrg_energy_idx;</div><div class='add'>+	u32 nrg_silence_idx;</div><div class='add'>+	u32 nrg_th_cck;</div><div class='add'>+	s32 nrg_auto_corr_silence_diff;</div><div class='add'>+	u32 num_in_cck_no_fa;</div><div class='add'>+	u32 nrg_th_ofdm;</div><div class='add'>+</div><div class='add'>+	u16 barker_corr_th_min;</div><div class='add'>+	u16 barker_corr_th_min_mrc;</div><div class='add'>+	u16 nrg_th_cca;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Chain noise (differential Rx gain) calib data */</div><div class='add'>+struct il_chain_noise_data {</div><div class='add'>+	u32 active_chains;</div><div class='add'>+	u32 chain_noise_a;</div><div class='add'>+	u32 chain_noise_b;</div><div class='add'>+	u32 chain_noise_c;</div><div class='add'>+	u32 chain_signal_a;</div><div class='add'>+	u32 chain_signal_b;</div><div class='add'>+	u32 chain_signal_c;</div><div class='add'>+	u16 beacon_count;</div><div class='add'>+	u8 disconn_array[NUM_RX_CHAINS];</div><div class='add'>+	u8 delta_gain_code[NUM_RX_CHAINS];</div><div class='add'>+	u8 radio_write;</div><div class='add'>+	u8 state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define	EEPROM_SEM_TIMEOUT 10	/* milliseconds */</div><div class='add'>+#define EEPROM_SEM_RETRY_LIMIT 1000	/* number of attempts (not time) */</div><div class='add'>+</div><div class='add'>+#define IL_TRAFFIC_ENTRIES	(256)</div><div class='add'>+#define IL_TRAFFIC_ENTRY_SIZE  (64)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MEASUREMENT_READY = (1 &lt;&lt; 0),</div><div class='add'>+	MEASUREMENT_ACTIVE = (1 &lt;&lt; 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* interrupt stats */</div><div class='add'>+struct isr_stats {</div><div class='add'>+	u32 hw;</div><div class='add'>+	u32 sw;</div><div class='add'>+	u32 err_code;</div><div class='add'>+	u32 sch;</div><div class='add'>+	u32 alive;</div><div class='add'>+	u32 rfkill;</div><div class='add'>+	u32 ctkill;</div><div class='add'>+	u32 wakeup;</div><div class='add'>+	u32 rx;</div><div class='add'>+	u32 handlers[IL_CN_MAX];</div><div class='add'>+	u32 tx;</div><div class='add'>+	u32 unhandled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* management stats */</div><div class='add'>+enum il_mgmt_stats {</div><div class='add'>+	MANAGEMENT_ASSOC_REQ = 0,</div><div class='add'>+	MANAGEMENT_ASSOC_RESP,</div><div class='add'>+	MANAGEMENT_REASSOC_REQ,</div><div class='add'>+	MANAGEMENT_REASSOC_RESP,</div><div class='add'>+	MANAGEMENT_PROBE_REQ,</div><div class='add'>+	MANAGEMENT_PROBE_RESP,</div><div class='add'>+	MANAGEMENT_BEACON,</div><div class='add'>+	MANAGEMENT_ATIM,</div><div class='add'>+	MANAGEMENT_DISASSOC,</div><div class='add'>+	MANAGEMENT_AUTH,</div><div class='add'>+	MANAGEMENT_DEAUTH,</div><div class='add'>+	MANAGEMENT_ACTION,</div><div class='add'>+	MANAGEMENT_MAX,</div><div class='add'>+};</div><div class='add'>+/* control stats */</div><div class='add'>+enum il_ctrl_stats {</div><div class='add'>+	CONTROL_BACK_REQ = 0,</div><div class='add'>+	CONTROL_BACK,</div><div class='add'>+	CONTROL_PSPOLL,</div><div class='add'>+	CONTROL_RTS,</div><div class='add'>+	CONTROL_CTS,</div><div class='add'>+	CONTROL_ACK,</div><div class='add'>+	CONTROL_CFEND,</div><div class='add'>+	CONTROL_CFENDACK,</div><div class='add'>+	CONTROL_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct traffic_stats {</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+	u32 mgmt[MANAGEMENT_MAX];</div><div class='add'>+	u32 ctrl[CONTROL_MAX];</div><div class='add'>+	u32 data_cnt;</div><div class='add'>+	u64 data_bytes;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * host interrupt timeout value</div><div class='add'>+ * used with setting interrupt coalescing timer</div><div class='add'>+ * the CSR_INT_COALESCING is an 8 bit register in 32-usec unit</div><div class='add'>+ *</div><div class='add'>+ * default interrupt coalescing timer is 64 x 32 = 2048 usecs</div><div class='add'>+ * default interrupt coalescing calibration timer is 16 x 32 = 512 usecs</div><div class='add'>+ */</div><div class='add'>+#define IL_HOST_INT_TIMEOUT_MAX	(0xFF)</div><div class='add'>+#define IL_HOST_INT_TIMEOUT_DEF	(0x40)</div><div class='add'>+#define IL_HOST_INT_TIMEOUT_MIN	(0x0)</div><div class='add'>+#define IL_HOST_INT_CALIB_TIMEOUT_MAX	(0xFF)</div><div class='add'>+#define IL_HOST_INT_CALIB_TIMEOUT_DEF	(0x10)</div><div class='add'>+#define IL_HOST_INT_CALIB_TIMEOUT_MIN	(0x0)</div><div class='add'>+</div><div class='add'>+#define IL_DELAY_NEXT_FORCE_FW_RELOAD (HZ*5)</div><div class='add'>+</div><div class='add'>+/* TX queue watchdog timeouts in mSecs */</div><div class='add'>+#define IL_DEF_WD_TIMEOUT	(2000)</div><div class='add'>+#define IL_LONG_WD_TIMEOUT	(10000)</div><div class='add'>+#define IL_MAX_WD_TIMEOUT	(120000)</div><div class='add'>+</div><div class='add'>+struct il_force_reset {</div><div class='add'>+	int reset_request_count;</div><div class='add'>+	int reset_success_count;</div><div class='add'>+	int reset_reject_count;</div><div class='add'>+	unsigned long reset_duration;</div><div class='add'>+	unsigned long last_force_reset_jiffies;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* extend beacon time format bit shifting  */</div><div class='add'>+/*</div><div class='add'>+ * for _3945 devices</div><div class='add'>+ * bits 31:24 - extended</div><div class='add'>+ * bits 23:0  - interval</div><div class='add'>+ */</div><div class='add'>+#define IL3945_EXT_BEACON_TIME_POS	24</div><div class='add'>+/*</div><div class='add'>+ * for _4965 devices</div><div class='add'>+ * bits 31:22 - extended</div><div class='add'>+ * bits 21:0  - interval</div><div class='add'>+ */</div><div class='add'>+#define IL4965_EXT_BEACON_TIME_POS	22</div><div class='add'>+</div><div class='add'>+struct il_rxon_context {</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+</div><div class='add'>+	const u8 *ac_to_fifo;</div><div class='add'>+	const u8 *ac_to_queue;</div><div class='add'>+	u8 mcast_queue;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We could use the vif to indicate active, but we</div><div class='add'>+	 * also need it to be active during disabling when</div><div class='add'>+	 * we already removed the vif for type setting.</div><div class='add'>+	 */</div><div class='add'>+	bool always_active, is_active;</div><div class='add'>+</div><div class='add'>+	bool ht_need_multiple_chains;</div><div class='add'>+</div><div class='add'>+	int ctxid;</div><div class='add'>+</div><div class='add'>+	u32 interface_modes, exclusive_interface_modes;</div><div class='add'>+	u8 unused_devtype, ap_devtype, ibss_devtype, station_devtype;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We declare this const so it can only be</div><div class='add'>+	 * changed via explicit cast within the</div><div class='add'>+	 * routines that actually update the physical</div><div class='add'>+	 * hardware.</div><div class='add'>+	 */</div><div class='add'>+	const struct il_rxon_cmd active;</div><div class='add'>+	struct il_rxon_cmd staging;</div><div class='add'>+</div><div class='add'>+	struct il_rxon_time_cmd timing;</div><div class='add'>+</div><div class='add'>+	struct il_qos_info qos_data;</div><div class='add'>+</div><div class='add'>+	u8 bcast_sta_id, ap_sta_id;</div><div class='add'>+</div><div class='add'>+	u8 rxon_cmd, rxon_assoc_cmd, rxon_timing_cmd;</div><div class='add'>+	u8 qos_cmd;</div><div class='add'>+	u8 wep_key_cmd;</div><div class='add'>+</div><div class='add'>+	struct il_wep_key wep_keys[WEP_KEYS_MAX];</div><div class='add'>+	u8 key_mapping_keys;</div><div class='add'>+</div><div class='add'>+	__le32 station_flags;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		bool non_gf_sta_present;</div><div class='add'>+		u8 protection;</div><div class='add'>+		bool enabled, is_40mhz;</div><div class='add'>+		u8 extension_chan_offset;</div><div class='add'>+	} ht;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il_power_mgr {</div><div class='add'>+	struct il_powertable_cmd sleep_cmd;</div><div class='add'>+	struct il_powertable_cmd sleep_cmd_next;</div><div class='add'>+	int debug_sleep_level_override;</div><div class='add'>+	bool pci_pm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il_priv {</div><div class='add'>+</div><div class='add'>+	/* ieee device used by generic ieee processing code */</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+	struct ieee80211_channel *ieee_channels;</div><div class='add'>+	struct ieee80211_rate *ieee_rates;</div><div class='add'>+	struct il_cfg *cfg;</div><div class='add'>+</div><div class='add'>+	/* temporary frame storage list */</div><div class='add'>+	struct list_head free_frames;</div><div class='add'>+	int frames_count;</div><div class='add'>+</div><div class='add'>+	enum ieee80211_band band;</div><div class='add'>+	int alloc_rxb_page;</div><div class='add'>+</div><div class='add'>+	void (*handlers[IL_CN_MAX]) (struct il_priv *il,</div><div class='add'>+				     struct il_rx_buf *rxb);</div><div class='add'>+</div><div class='add'>+	struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];</div><div class='add'>+</div><div class='add'>+	/* spectrum measurement report caching */</div><div class='add'>+	struct il_spectrum_notification measure_report;</div><div class='add'>+	u8 measurement_status;</div><div class='add'>+</div><div class='add'>+	/* ucode beacon time */</div><div class='add'>+	u32 ucode_beacon_time;</div><div class='add'>+	int missed_beacon_threshold;</div><div class='add'>+</div><div class='add'>+	/* track IBSS manager (last beacon) status */</div><div class='add'>+	u32 ibss_manager;</div><div class='add'>+</div><div class='add'>+	/* force reset */</div><div class='add'>+	struct il_force_reset force_reset;</div><div class='add'>+</div><div class='add'>+	/* we allocate array of il_channel_info for NIC's valid channels.</div><div class='add'>+	 *    Access via channel # using indirect idx array */</div><div class='add'>+	struct il_channel_info *channel_info;	/* channel info array */</div><div class='add'>+	u8 channel_count;	/* # of channels */</div><div class='add'>+</div><div class='add'>+	/* thermal calibration */</div><div class='add'>+	s32 temperature;	/* degrees Kelvin */</div><div class='add'>+	s32 last_temperature;</div><div class='add'>+</div><div class='add'>+	/* init calibration results */</div><div class='add'>+	struct il_calib_result calib_results[IL_CALIB_MAX];</div><div class='add'>+</div><div class='add'>+	/* Scan related variables */</div><div class='add'>+	unsigned long scan_start;</div><div class='add'>+	unsigned long scan_start_tsf;</div><div class='add'>+	void *scan_cmd;</div><div class='add'>+	enum ieee80211_band scan_band;</div><div class='add'>+	struct cfg80211_scan_request *scan_request;</div><div class='add'>+	struct ieee80211_vif *scan_vif;</div><div class='add'>+	u8 scan_tx_ant[IEEE80211_NUM_BANDS];</div><div class='add'>+	u8 mgmt_tx_ant;</div><div class='add'>+</div><div class='add'>+	/* spinlock */</div><div class='add'>+	spinlock_t lock;	/* protect general shared data */</div><div class='add'>+	spinlock_t hcmd_lock;	/* protect hcmd */</div><div class='add'>+	spinlock_t reg_lock;	/* protect hw register access */</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+</div><div class='add'>+	/* basic pci-network driver stuff */</div><div class='add'>+	struct pci_dev *pci_dev;</div><div class='add'>+</div><div class='add'>+	/* pci hardware address support */</div><div class='add'>+	void __iomem *hw_base;</div><div class='add'>+	u32 hw_rev;</div><div class='add'>+	u32 hw_wa_rev;</div><div class='add'>+	u8 rev_id;</div><div class='add'>+</div><div class='add'>+	/* command queue number */</div><div class='add'>+	u8 cmd_queue;</div><div class='add'>+</div><div class='add'>+	/* max number of station keys */</div><div class='add'>+	u8 sta_key_max_num;</div><div class='add'>+</div><div class='add'>+	/* EEPROM MAC addresses */</div><div class='add'>+	struct mac_address addresses[1];</div><div class='add'>+</div><div class='add'>+	/* uCode images, save to reload in case of failure */</div><div class='add'>+	int fw_idx;		/* firmware we're trying to load */</div><div class='add'>+	u32 ucode_ver;		/* version of ucode, copy of</div><div class='add'>+				   il_ucode.ver */</div><div class='add'>+	struct fw_desc ucode_code;	/* runtime inst */</div><div class='add'>+	struct fw_desc ucode_data;	/* runtime data original */</div><div class='add'>+	struct fw_desc ucode_data_backup;	/* runtime data save/restore */</div><div class='add'>+	struct fw_desc ucode_init;	/* initialization inst */</div><div class='add'>+	struct fw_desc ucode_init_data;	/* initialization data */</div><div class='add'>+	struct fw_desc ucode_boot;	/* bootstrap inst */</div><div class='add'>+	enum ucode_type ucode_type;</div><div class='add'>+	u8 ucode_write_complete;	/* the image write is complete */</div><div class='add'>+	char firmware_name[25];</div><div class='add'>+</div><div class='add'>+	struct il_rxon_context ctx;</div><div class='add'>+</div><div class='add'>+	__le16 switch_channel;</div><div class='add'>+</div><div class='add'>+	/* 1st responses from initialize and runtime uCode images.</div><div class='add'>+	 * _4965's initialize alive response contains some calibration data. */</div><div class='add'>+	struct il_init_alive_resp card_alive_init;</div><div class='add'>+	struct il_alive_resp card_alive;</div><div class='add'>+</div><div class='add'>+	u16 active_rate;</div><div class='add'>+</div><div class='add'>+	u8 start_calib;</div><div class='add'>+	struct il_sensitivity_data sensitivity_data;</div><div class='add'>+	struct il_chain_noise_data chain_noise_data;</div><div class='add'>+	__le16 sensitivity_tbl[HD_TBL_SIZE];</div><div class='add'>+</div><div class='add'>+	struct il_ht_config current_ht_config;</div><div class='add'>+</div><div class='add'>+	/* Rate scaling data */</div><div class='add'>+	u8 retry_rate;</div><div class='add'>+</div><div class='add'>+	wait_queue_head_t wait_command_queue;</div><div class='add'>+</div><div class='add'>+	int activity_timer_active;</div><div class='add'>+</div><div class='add'>+	/* Rx and Tx DMA processing queues */</div><div class='add'>+	struct il_rx_queue rxq;</div><div class='add'>+	struct il_tx_queue *txq;</div><div class='add'>+	unsigned long txq_ctx_active_msk;</div><div class='add'>+	struct il_dma_ptr kw;	/* keep warm address */</div><div class='add'>+	struct il_dma_ptr scd_bc_tbls;</div><div class='add'>+</div><div class='add'>+	u32 scd_base_addr;	/* scheduler sram base address */</div><div class='add'>+</div><div class='add'>+	unsigned long status;</div><div class='add'>+</div><div class='add'>+	/* counts mgmt, ctl, and data packets */</div><div class='add'>+	struct traffic_stats tx_stats;</div><div class='add'>+	struct traffic_stats rx_stats;</div><div class='add'>+</div><div class='add'>+	/* counts interrupts */</div><div class='add'>+	struct isr_stats isr_stats;</div><div class='add'>+</div><div class='add'>+	struct il_power_mgr power_data;</div><div class='add'>+</div><div class='add'>+	/* context information */</div><div class='add'>+	u8 bssid[ETH_ALEN];	/* used only on 3945 but filled by core */</div><div class='add'>+</div><div class='add'>+	/* station table variables */</div><div class='add'>+</div><div class='add'>+	/* Note: if lock and sta_lock are needed, lock must be acquired first */</div><div class='add'>+	spinlock_t sta_lock;</div><div class='add'>+	int num_stations;</div><div class='add'>+	struct il_station_entry stations[IL_STATION_COUNT];</div><div class='add'>+	unsigned long ucode_key_table;</div><div class='add'>+</div><div class='add'>+	/* queue refcounts */</div><div class='add'>+#define IL_MAX_HW_QUEUES	32</div><div class='add'>+	unsigned long queue_stopped[BITS_TO_LONGS(IL_MAX_HW_QUEUES)];</div><div class='add'>+	/* for each AC */</div><div class='add'>+	atomic_t queue_stop_count[4];</div><div class='add'>+</div><div class='add'>+	/* Indication if ieee80211_ops-&gt;open has been called */</div><div class='add'>+	u8 is_open;</div><div class='add'>+</div><div class='add'>+	u8 mac80211_registered;</div><div class='add'>+</div><div class='add'>+	/* eeprom -- this is in the card's little endian byte order */</div><div class='add'>+	u8 *eeprom;</div><div class='add'>+	struct il_eeprom_calib_info *calib_info;</div><div class='add'>+</div><div class='add'>+	enum nl80211_iftype iw_mode;</div><div class='add'>+</div><div class='add'>+	/* Last Rx'd beacon timestamp */</div><div class='add'>+	u64 timestamp;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+#if defined(CONFIG_IWL3945) || defined(CONFIG_IWL3945_MODULE)</div><div class='add'>+		struct {</div><div class='add'>+			void *shared_virt;</div><div class='add'>+			dma_addr_t shared_phys;</div><div class='add'>+</div><div class='add'>+			struct delayed_work thermal_periodic;</div><div class='add'>+			struct delayed_work rfkill_poll;</div><div class='add'>+</div><div class='add'>+			struct il3945_notif_stats stats;</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+			struct il3945_notif_stats accum_stats;</div><div class='add'>+			struct il3945_notif_stats delta_stats;</div><div class='add'>+			struct il3945_notif_stats max_delta;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+			u32 sta_supp_rates;</div><div class='add'>+			int last_rx_rssi;	/* From Rx packet stats */</div><div class='add'>+</div><div class='add'>+			/* Rx'd packet timing information */</div><div class='add'>+			u32 last_beacon_time;</div><div class='add'>+			u64 last_tsf;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * each calibration channel group in the</div><div class='add'>+			 * EEPROM has a derived clip setting for</div><div class='add'>+			 * each rate.</div><div class='add'>+			 */</div><div class='add'>+			const struct il3945_clip_group clip_groups[5];</div><div class='add'>+</div><div class='add'>+		} _3945;</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_IWL4965) || defined(CONFIG_IWL4965_MODULE)</div><div class='add'>+		struct {</div><div class='add'>+			struct il_rx_phy_res last_phy_res;</div><div class='add'>+			bool last_phy_res_valid;</div><div class='add'>+</div><div class='add'>+			struct completion firmware_loading_complete;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * chain noise reset and gain commands are the</div><div class='add'>+			 * two extra calibration commands follows the standard</div><div class='add'>+			 * phy calibration commands</div><div class='add'>+			 */</div><div class='add'>+			u8 phy_calib_chain_noise_reset_cmd;</div><div class='add'>+			u8 phy_calib_chain_noise_gain_cmd;</div><div class='add'>+</div><div class='add'>+			struct il_notif_stats stats;</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+			struct il_notif_stats accum_stats;</div><div class='add'>+			struct il_notif_stats delta_stats;</div><div class='add'>+			struct il_notif_stats max_delta;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		} _4965;</div><div class='add'>+#endif</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	struct il_hw_params hw_params;</div><div class='add'>+</div><div class='add'>+	u32 inta_mask;</div><div class='add'>+</div><div class='add'>+	struct workqueue_struct *workqueue;</div><div class='add'>+</div><div class='add'>+	struct work_struct restart;</div><div class='add'>+	struct work_struct scan_completed;</div><div class='add'>+	struct work_struct rx_replenish;</div><div class='add'>+	struct work_struct abort_scan;</div><div class='add'>+</div><div class='add'>+	struct il_rxon_context *beacon_ctx;</div><div class='add'>+	struct sk_buff *beacon_skb;</div><div class='add'>+</div><div class='add'>+	struct work_struct tx_flush;</div><div class='add'>+</div><div class='add'>+	struct tasklet_struct irq_tasklet;</div><div class='add'>+</div><div class='add'>+	struct delayed_work init_alive_start;</div><div class='add'>+	struct delayed_work alive_start;</div><div class='add'>+	struct delayed_work scan_check;</div><div class='add'>+</div><div class='add'>+	/* TX Power */</div><div class='add'>+	s8 tx_power_user_lmt;</div><div class='add'>+	s8 tx_power_device_lmt;</div><div class='add'>+	s8 tx_power_next;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	/* debugging info */</div><div class='add'>+	u32 debug_level;	/* per device debugging will override global</div><div class='add'>+				   il_debug_level if set */</div><div class='add'>+#endif				/* CONFIG_IWLEGACY_DEBUG */</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+	/* debugfs */</div><div class='add'>+	u16 tx_traffic_idx;</div><div class='add'>+	u16 rx_traffic_idx;</div><div class='add'>+	u8 *tx_traffic;</div><div class='add'>+	u8 *rx_traffic;</div><div class='add'>+	struct dentry *debugfs_dir;</div><div class='add'>+	u32 dbgfs_sram_offset, dbgfs_sram_len;</div><div class='add'>+	bool disable_ht40;</div><div class='add'>+#endif				/* CONFIG_IWLEGACY_DEBUGFS */</div><div class='add'>+</div><div class='add'>+	struct work_struct txpower_work;</div><div class='add'>+	u32 disable_sens_cal;</div><div class='add'>+	u32 disable_chain_noise_cal;</div><div class='add'>+	u32 disable_tx_power_cal;</div><div class='add'>+	struct work_struct run_time_calib_work;</div><div class='add'>+	struct timer_list stats_periodic;</div><div class='add'>+	struct timer_list watchdog;</div><div class='add'>+	bool hw_ready;</div><div class='add'>+</div><div class='add'>+	struct led_classdev led;</div><div class='add'>+	unsigned long blink_on, blink_off;</div><div class='add'>+	bool led_registered;</div><div class='add'>+};				/*il_priv */</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il_txq_ctx_activate(struct il_priv *il, int txq_id)</div><div class='add'>+{</div><div class='add'>+	set_bit(txq_id, &amp;il-&gt;txq_ctx_active_msk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il_txq_ctx_deactivate(struct il_priv *il, int txq_id)</div><div class='add'>+{</div><div class='add'>+	clear_bit(txq_id, &amp;il-&gt;txq_ctx_active_msk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ieee80211_hdr *</div><div class='add'>+il_tx_queue_get_hdr(struct il_priv *il, int txq_id, int idx)</div><div class='add'>+{</div><div class='add'>+	if (il-&gt;txq[txq_id].txb[idx].skb)</div><div class='add'>+		return (struct ieee80211_hdr *)il-&gt;txq[txq_id].txb[idx].skb-&gt;</div><div class='add'>+		    data;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct il_rxon_context *</div><div class='add'>+il_rxon_ctx_from_vif(struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct il_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	return vif_priv-&gt;ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define for_each_context(il, _ctx) \</div><div class='add'>+	for (_ctx = &amp;il-&gt;ctx; _ctx == &amp;il-&gt;ctx; _ctx++)</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il_is_associated(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	return (il-&gt;ctx.active.filter_flags &amp; RXON_FILTER_ASSOC_MSK) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il_is_any_associated(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	return il_is_associated(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il_is_associated_ctx(struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	return (ctx-&gt;active.filter_flags &amp; RXON_FILTER_ASSOC_MSK) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il_is_channel_valid(const struct il_channel_info *ch_info)</div><div class='add'>+{</div><div class='add'>+	if (ch_info == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+	return (ch_info-&gt;flags &amp; EEPROM_CHANNEL_VALID) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il_is_channel_radar(const struct il_channel_info *ch_info)</div><div class='add'>+{</div><div class='add'>+	return (ch_info-&gt;flags &amp; EEPROM_CHANNEL_RADAR) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8</div><div class='add'>+il_is_channel_a_band(const struct il_channel_info *ch_info)</div><div class='add'>+{</div><div class='add'>+	return ch_info-&gt;band == IEEE80211_BAND_5GHZ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il_is_channel_passive(const struct il_channel_info *ch)</div><div class='add'>+{</div><div class='add'>+	return (!(ch-&gt;flags &amp; EEPROM_CHANNEL_ACTIVE)) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il_is_channel_ibss(const struct il_channel_info *ch)</div><div class='add'>+{</div><div class='add'>+	return (ch-&gt;flags &amp; EEPROM_CHANNEL_IBSS) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+__il_free_pages(struct il_priv *il, struct page *page)</div><div class='add'>+{</div><div class='add'>+	__free_pages(page, il-&gt;hw_params.rx_page_order);</div><div class='add'>+	il-&gt;alloc_rxb_page--;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il_free_pages(struct il_priv *il, unsigned long page)</div><div class='add'>+{</div><div class='add'>+	free_pages(page, il-&gt;hw_params.rx_page_order);</div><div class='add'>+	il-&gt;alloc_rxb_page--;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IWLWIFI_VERSION "in-tree:"</div><div class='add'>+#define DRV_COPYRIGHT	"Copyright(c) 2003-2011 Intel Corporation"</div><div class='add'>+#define DRV_AUTHOR     "&lt;ilw@linux.intel.com&gt;"</div><div class='add'>+</div><div class='add'>+#define IL_PCI_DEVICE(dev, subdev, cfg) \</div><div class='add'>+	.vendor = PCI_VENDOR_ID_INTEL,  .device = (dev), \</div><div class='add'>+	.subvendor = PCI_ANY_ID, .subdevice = (subdev), \</div><div class='add'>+	.driver_data = (kernel_ulong_t)&amp;(cfg)</div><div class='add'>+</div><div class='add'>+#define TIME_UNIT		1024</div><div class='add'>+</div><div class='add'>+#define IL_SKU_G       0x1</div><div class='add'>+#define IL_SKU_A       0x2</div><div class='add'>+#define IL_SKU_N       0x8</div><div class='add'>+</div><div class='add'>+#define IL_CMD(x) case x: return #x</div><div class='add'>+</div><div class='add'>+/* Size of one Rx buffer in host DRAM */</div><div class='add'>+#define IL_RX_BUF_SIZE_3K (3 * 1000)	/* 3945 only */</div><div class='add'>+#define IL_RX_BUF_SIZE_4K (4 * 1024)</div><div class='add'>+#define IL_RX_BUF_SIZE_8K (8 * 1024)</div><div class='add'>+</div><div class='add'>+struct il_hcmd_ops {</div><div class='add'>+	int (*rxon_assoc) (struct il_priv *il, struct il_rxon_context *ctx);</div><div class='add'>+	int (*commit_rxon) (struct il_priv *il, struct il_rxon_context *ctx);</div><div class='add'>+	void (*set_rxon_chain) (struct il_priv *il,</div><div class='add'>+				struct il_rxon_context *ctx);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il_hcmd_utils_ops {</div><div class='add'>+	u16(*get_hcmd_size) (u8 cmd_id, u16 len);</div><div class='add'>+	u16(*build_addsta_hcmd) (const struct il_addsta_cmd *cmd, u8 *data);</div><div class='add'>+	int (*request_scan) (struct il_priv *il, struct ieee80211_vif *vif);</div><div class='add'>+	void (*post_scan) (struct il_priv *il);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il_apm_ops {</div><div class='add'>+	int (*init) (struct il_priv *il);</div><div class='add'>+	void (*config) (struct il_priv *il);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+struct il_debugfs_ops {</div><div class='add'>+	ssize_t(*rx_stats_read) (struct file *file, char __user *user_buf,</div><div class='add'>+				 size_t count, loff_t *ppos);</div><div class='add'>+	ssize_t(*tx_stats_read) (struct file *file, char __user *user_buf,</div><div class='add'>+				 size_t count, loff_t *ppos);</div><div class='add'>+	ssize_t(*general_stats_read) (struct file *file,</div><div class='add'>+				      char __user *user_buf, size_t count,</div><div class='add'>+				      loff_t *ppos);</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct il_temp_ops {</div><div class='add'>+	void (*temperature) (struct il_priv *il);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il_lib_ops {</div><div class='add'>+	/* set hw dependent parameters */</div><div class='add'>+	int (*set_hw_params) (struct il_priv *il);</div><div class='add'>+	/* Handling TX */</div><div class='add'>+	void (*txq_update_byte_cnt_tbl) (struct il_priv *il,</div><div class='add'>+					 struct il_tx_queue *txq,</div><div class='add'>+					 u16 byte_cnt);</div><div class='add'>+	int (*txq_attach_buf_to_tfd) (struct il_priv *il,</div><div class='add'>+				      struct il_tx_queue *txq, dma_addr_t addr,</div><div class='add'>+				      u16 len, u8 reset, u8 pad);</div><div class='add'>+	void (*txq_free_tfd) (struct il_priv *il, struct il_tx_queue *txq);</div><div class='add'>+	int (*txq_init) (struct il_priv *il, struct il_tx_queue *txq);</div><div class='add'>+	/* setup Rx handler */</div><div class='add'>+	void (*handler_setup) (struct il_priv *il);</div><div class='add'>+	/* alive notification after init uCode load */</div><div class='add'>+	void (*init_alive_start) (struct il_priv *il);</div><div class='add'>+	/* check validity of rtc data address */</div><div class='add'>+	int (*is_valid_rtc_data_addr) (u32 addr);</div><div class='add'>+	/* 1st ucode load */</div><div class='add'>+	int (*load_ucode) (struct il_priv *il);</div><div class='add'>+</div><div class='add'>+	void (*dump_nic_error_log) (struct il_priv *il);</div><div class='add'>+	int (*dump_fh) (struct il_priv *il, char **buf, bool display);</div><div class='add'>+	int (*set_channel_switch) (struct il_priv *il,</div><div class='add'>+				   struct ieee80211_channel_switch *ch_switch);</div><div class='add'>+	/* power management */</div><div class='add'>+	struct il_apm_ops apm_ops;</div><div class='add'>+</div><div class='add'>+	/* power */</div><div class='add'>+	int (*send_tx_power) (struct il_priv *il);</div><div class='add'>+	void (*update_chain_flags) (struct il_priv *il);</div><div class='add'>+</div><div class='add'>+	/* eeprom operations */</div><div class='add'>+	struct il_eeprom_ops eeprom_ops;</div><div class='add'>+</div><div class='add'>+	/* temperature */</div><div class='add'>+	struct il_temp_ops temp_ops;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+	struct il_debugfs_ops debugfs_ops;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il_led_ops {</div><div class='add'>+	int (*cmd) (struct il_priv *il, struct il_led_cmd *led_cmd);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il_legacy_ops {</div><div class='add'>+	void (*post_associate) (struct il_priv *il);</div><div class='add'>+	void (*config_ap) (struct il_priv *il);</div><div class='add'>+	/* station management */</div><div class='add'>+	int (*update_bcast_stations) (struct il_priv *il);</div><div class='add'>+	int (*manage_ibss_station) (struct il_priv *il,</div><div class='add'>+				    struct ieee80211_vif *vif, bool add);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il_ops {</div><div class='add'>+	const struct il_lib_ops *lib;</div><div class='add'>+	const struct il_hcmd_ops *hcmd;</div><div class='add'>+	const struct il_hcmd_utils_ops *utils;</div><div class='add'>+	const struct il_led_ops *led;</div><div class='add'>+	const struct il_nic_ops *nic;</div><div class='add'>+	const struct il_legacy_ops *legacy;</div><div class='add'>+	const struct ieee80211_ops *ieee80211_ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il_mod_params {</div><div class='add'>+	int sw_crypto;		/* def: 0 = using hardware encryption */</div><div class='add'>+	int disable_hw_scan;	/* def: 0 = use h/w scan */</div><div class='add'>+	int num_of_queues;	/* def: HW dependent */</div><div class='add'>+	int disable_11n;	/* def: 0 = 11n capabilities enabled */</div><div class='add'>+	int amsdu_size_8K;	/* def: 1 = enable 8K amsdu size */</div><div class='add'>+	int antenna;		/* def: 0 = both antennas (use diversity) */</div><div class='add'>+	int restart_fw;		/* def: 1 = restart firmware */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * @led_compensation: compensate on the led on/off time per HW according</div><div class='add'>+ *	to the deviation to achieve the desired led frequency.</div><div class='add'>+ *	The detail algorithm is described in common.c</div><div class='add'>+ * @chain_noise_num_beacons: number of beacons used to compute chain noise</div><div class='add'>+ * @wd_timeout: TX queues watchdog timeout</div><div class='add'>+ * @temperature_kelvin: temperature report by uCode in kelvin</div><div class='add'>+ * @ucode_tracing: support ucode continuous tracing</div><div class='add'>+ * @sensitivity_calib_by_driver: driver has the capability to perform</div><div class='add'>+ *	sensitivity calibration operation</div><div class='add'>+ * @chain_noise_calib_by_driver: driver has the capability to perform</div><div class='add'>+ *	chain noise calibration operation</div><div class='add'>+ */</div><div class='add'>+struct il_base_params {</div><div class='add'>+	int eeprom_size;</div><div class='add'>+	int num_of_queues;	/* def: HW dependent */</div><div class='add'>+	int num_of_ampdu_queues;	/* def: HW dependent */</div><div class='add'>+	/* for il_apm_init() */</div><div class='add'>+	u32 pll_cfg_val;</div><div class='add'>+	bool set_l0s;</div><div class='add'>+	bool use_bsm;</div><div class='add'>+</div><div class='add'>+	u16 led_compensation;</div><div class='add'>+	int chain_noise_num_beacons;</div><div class='add'>+	unsigned int wd_timeout;</div><div class='add'>+	bool temperature_kelvin;</div><div class='add'>+	const bool ucode_tracing;</div><div class='add'>+	const bool sensitivity_calib_by_driver;</div><div class='add'>+	const bool chain_noise_calib_by_driver;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IL_LED_SOLID 11</div><div class='add'>+#define IL_DEF_LED_INTRVL cpu_to_le32(1000)</div><div class='add'>+</div><div class='add'>+#define IL_LED_ACTIVITY       (0&lt;&lt;1)</div><div class='add'>+#define IL_LED_LINK           (1&lt;&lt;1)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * LED mode</div><div class='add'>+ *    IL_LED_DEFAULT:  use device default</div><div class='add'>+ *    IL_LED_RF_STATE: turn LED on/off based on RF state</div><div class='add'>+ *			LED ON  = RF ON</div><div class='add'>+ *			LED OFF = RF OFF</div><div class='add'>+ *    IL_LED_BLINK:    adjust led blink rate based on blink table</div><div class='add'>+ */</div><div class='add'>+enum il_led_mode {</div><div class='add'>+	IL_LED_DEFAULT,</div><div class='add'>+	IL_LED_RF_STATE,</div><div class='add'>+	IL_LED_BLINK,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void il_leds_init(struct il_priv *il);</div><div class='add'>+void il_leds_exit(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct il_cfg</div><div class='add'>+ * @fw_name_pre: Firmware filename prefix. The api version and extension</div><div class='add'>+ *	(.ucode) will be added to filename before loading from disk. The</div><div class='add'>+ *	filename is constructed as fw_name_pre&lt;api&gt;.ucode.</div><div class='add'>+ * @ucode_api_max: Highest version of uCode API supported by driver.</div><div class='add'>+ * @ucode_api_min: Lowest version of uCode API supported by driver.</div><div class='add'>+ * @scan_antennas: available antenna for scan operation</div><div class='add'>+ * @led_mode: 0=blinking, 1=On(RF On)/Off(RF Off)</div><div class='add'>+ *</div><div class='add'>+ * We enable the driver to be backward compatible wrt API version. The</div><div class='add'>+ * driver specifies which APIs it supports (with @ucode_api_max being the</div><div class='add'>+ * highest and @ucode_api_min the lowest). Firmware will only be loaded if</div><div class='add'>+ * it has a supported API version. The firmware's API version will be</div><div class='add'>+ * stored in @il_priv, enabling the driver to make runtime changes based</div><div class='add'>+ * on firmware version used.</div><div class='add'>+ *</div><div class='add'>+ * For example,</div><div class='add'>+ * if (IL_UCODE_API(il-&gt;ucode_ver) &gt;= 2) {</div><div class='add'>+ *	Driver interacts with Firmware API version &gt;= 2.</div><div class='add'>+ * } else {</div><div class='add'>+ *	Driver interacts with Firmware API version 1.</div><div class='add'>+ * }</div><div class='add'>+ *</div><div class='add'>+ * The ideal usage of this infrastructure is to treat a new ucode API</div><div class='add'>+ * release as a new hardware revision. That is, through utilizing the</div><div class='add'>+ * il_hcmd_utils_ops etc. we accommodate different command structures</div><div class='add'>+ * and flows between hardware versions as well as their API</div><div class='add'>+ * versions.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+struct il_cfg {</div><div class='add'>+	/* params specific to an individual device within a device family */</div><div class='add'>+	const char *name;</div><div class='add'>+	const char *fw_name_pre;</div><div class='add'>+	const unsigned int ucode_api_max;</div><div class='add'>+	const unsigned int ucode_api_min;</div><div class='add'>+	u8 valid_tx_ant;</div><div class='add'>+	u8 valid_rx_ant;</div><div class='add'>+	unsigned int sku;</div><div class='add'>+	u16 eeprom_ver;</div><div class='add'>+	u16 eeprom_calib_ver;</div><div class='add'>+	const struct il_ops *ops;</div><div class='add'>+	/* module based parameters which can be set from modprobe cmd */</div><div class='add'>+	const struct il_mod_params *mod_params;</div><div class='add'>+	/* params not likely to change within a device family */</div><div class='add'>+	struct il_base_params *base_params;</div><div class='add'>+	/* params likely to change within a device family */</div><div class='add'>+	u8 scan_rx_antennas[IEEE80211_NUM_BANDS];</div><div class='add'>+	enum il_led_mode led_mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/***************************</div><div class='add'>+ *   L i b                 *</div><div class='add'>+ ***************************/</div><div class='add'>+</div><div class='add'>+struct ieee80211_hw *il_alloc_all(struct il_cfg *cfg);</div><div class='add'>+int il_mac_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		   u16 queue, const struct ieee80211_tx_queue_params *params);</div><div class='add'>+int il_mac_tx_last_beacon(struct ieee80211_hw *hw);</div><div class='add'>+</div><div class='add'>+void il_set_rxon_hwcrypto(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+			  int hw_decrypt);</div><div class='add'>+int il_check_rxon_cmd(struct il_priv *il, struct il_rxon_context *ctx);</div><div class='add'>+int il_full_rxon_required(struct il_priv *il, struct il_rxon_context *ctx);</div><div class='add'>+int il_set_rxon_channel(struct il_priv *il, struct ieee80211_channel *ch,</div><div class='add'>+			struct il_rxon_context *ctx);</div><div class='add'>+void il_set_flags_for_band(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+			   enum ieee80211_band band, struct ieee80211_vif *vif);</div><div class='add'>+u8 il_get_single_channel_number(struct il_priv *il, enum ieee80211_band band);</div><div class='add'>+void il_set_rxon_ht(struct il_priv *il, struct il_ht_config *ht_conf);</div><div class='add'>+bool il_is_ht40_tx_allowed(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+			   struct ieee80211_sta_ht_cap *ht_cap);</div><div class='add'>+void il_connection_init_rx_config(struct il_priv *il,</div><div class='add'>+				  struct il_rxon_context *ctx);</div><div class='add'>+void il_set_rate(struct il_priv *il);</div><div class='add'>+int il_set_decrypted_flag(struct il_priv *il, struct ieee80211_hdr *hdr,</div><div class='add'>+			  u32 decrypt_res, struct ieee80211_rx_status *stats);</div><div class='add'>+void il_irq_handle_error(struct il_priv *il);</div><div class='add'>+int il_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif);</div><div class='add'>+void il_mac_remove_interface(struct ieee80211_hw *hw,</div><div class='add'>+			     struct ieee80211_vif *vif);</div><div class='add'>+int il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			    enum nl80211_iftype newtype, bool newp2p);</div><div class='add'>+int il_alloc_txq_mem(struct il_priv *il);</div><div class='add'>+void il_txq_mem(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+int il_alloc_traffic_mem(struct il_priv *il);</div><div class='add'>+void il_free_traffic_mem(struct il_priv *il);</div><div class='add'>+void il_reset_traffic_log(struct il_priv *il);</div><div class='add'>+void il_dbg_log_tx_data_frame(struct il_priv *il, u16 length,</div><div class='add'>+			      struct ieee80211_hdr *header);</div><div class='add'>+void il_dbg_log_rx_data_frame(struct il_priv *il, u16 length,</div><div class='add'>+			      struct ieee80211_hdr *header);</div><div class='add'>+const char *il_get_mgmt_string(int cmd);</div><div class='add'>+const char *il_get_ctrl_string(int cmd);</div><div class='add'>+void il_clear_traffic_stats(struct il_priv *il);</div><div class='add'>+void il_update_stats(struct il_priv *il, bool is_tx, __le16 fc, u16 len);</div><div class='add'>+#else</div><div class='add'>+static inline int</div><div class='add'>+il_alloc_traffic_mem(struct il_priv *il)</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</div><div class='add'>+il_free_traffic_mem(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il_reset_traffic_log(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il_dbg_log_tx_data_frame(struct il_priv *il, u16 length,</div><div class='add'>+			 struct ieee80211_hdr *header)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il_dbg_log_rx_data_frame(struct il_priv *il, u16 length,</div><div class='add'>+			 struct ieee80211_hdr *header)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il_update_stats(struct il_priv *il, bool is_tx, __le16 fc, u16 len)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+/*****************************************************</div><div class='add'>+ * RX handlers.</div><div class='add'>+ * **************************************************/</div><div class='add'>+void il_hdl_pm_sleep(struct il_priv *il, struct il_rx_buf *rxb);</div><div class='add'>+void il_hdl_pm_debug_stats(struct il_priv *il, struct il_rx_buf *rxb);</div><div class='add'>+void il_hdl_error(struct il_priv *il, struct il_rx_buf *rxb);</div><div class='add'>+</div><div class='add'>+/*****************************************************</div><div class='add'>+* RX</div><div class='add'>+******************************************************/</div><div class='add'>+void il_cmd_queue_unmap(struct il_priv *il);</div><div class='add'>+void il_cmd_queue_free(struct il_priv *il);</div><div class='add'>+int il_rx_queue_alloc(struct il_priv *il);</div><div class='add'>+void il_rx_queue_update_write_ptr(struct il_priv *il, struct il_rx_queue *q);</div><div class='add'>+int il_rx_queue_space(const struct il_rx_queue *q);</div><div class='add'>+void il_tx_cmd_complete(struct il_priv *il, struct il_rx_buf *rxb);</div><div class='add'>+/* Handlers */</div><div class='add'>+void il_hdl_spectrum_measurement(struct il_priv *il, struct il_rx_buf *rxb);</div><div class='add'>+void il_recover_from_stats(struct il_priv *il, struct il_rx_pkt *pkt);</div><div class='add'>+void il_chswitch_done(struct il_priv *il, bool is_success);</div><div class='add'>+void il_hdl_csa(struct il_priv *il, struct il_rx_buf *rxb);</div><div class='add'>+</div><div class='add'>+/* TX helpers */</div><div class='add'>+</div><div class='add'>+/*****************************************************</div><div class='add'>+* TX</div><div class='add'>+******************************************************/</div><div class='add'>+void il_txq_update_write_ptr(struct il_priv *il, struct il_tx_queue *txq);</div><div class='add'>+int il_tx_queue_init(struct il_priv *il, struct il_tx_queue *txq, int slots_num,</div><div class='add'>+		     u32 txq_id);</div><div class='add'>+void il_tx_queue_reset(struct il_priv *il, struct il_tx_queue *txq,</div><div class='add'>+		       int slots_num, u32 txq_id);</div><div class='add'>+void il_tx_queue_unmap(struct il_priv *il, int txq_id);</div><div class='add'>+void il_tx_queue_free(struct il_priv *il, int txq_id);</div><div class='add'>+void il_setup_watchdog(struct il_priv *il);</div><div class='add'>+/*****************************************************</div><div class='add'>+ * TX power</div><div class='add'>+ ****************************************************/</div><div class='add'>+int il_set_tx_power(struct il_priv *il, s8 tx_power, bool force);</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ * Rate</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+u8 il_get_lowest_plcp(struct il_priv *il, struct il_rxon_context *ctx);</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ * Scanning</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+void il_init_scan_params(struct il_priv *il);</div><div class='add'>+int il_scan_cancel(struct il_priv *il);</div><div class='add'>+int il_scan_cancel_timeout(struct il_priv *il, unsigned long ms);</div><div class='add'>+void il_force_scan_end(struct il_priv *il);</div><div class='add'>+int il_mac_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		   struct cfg80211_scan_request *req);</div><div class='add'>+void il_internal_short_hw_scan(struct il_priv *il);</div><div class='add'>+int il_force_reset(struct il_priv *il, bool external);</div><div class='add'>+u16 il_fill_probe_req(struct il_priv *il, struct ieee80211_mgmt *frame,</div><div class='add'>+		      const u8 *ta, const u8 *ie, int ie_len, int left);</div><div class='add'>+void il_setup_rx_scan_handlers(struct il_priv *il);</div><div class='add'>+u16 il_get_active_dwell_time(struct il_priv *il, enum ieee80211_band band,</div><div class='add'>+			     u8 n_probes);</div><div class='add'>+u16 il_get_passive_dwell_time(struct il_priv *il, enum ieee80211_band band,</div><div class='add'>+			      struct ieee80211_vif *vif);</div><div class='add'>+void il_setup_scan_deferred_work(struct il_priv *il);</div><div class='add'>+void il_cancel_scan_deferred_work(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+/* For faster active scanning, scan will move to the next channel if fewer than</div><div class='add'>+ * PLCP_QUIET_THRESH packets are heard on this channel within</div><div class='add'>+ * ACTIVE_QUIET_TIME after sending probe request.  This shortens the dwell</div><div class='add'>+ * time if it's a quiet channel (nothing responded to our probe, and there's</div><div class='add'>+ * no other traffic).</div><div class='add'>+ * Disable "quiet" feature by setting PLCP_QUIET_THRESH to 0. */</div><div class='add'>+#define IL_ACTIVE_QUIET_TIME       cpu_to_le16(10)	/* msec */</div><div class='add'>+#define IL_PLCP_QUIET_THRESH       cpu_to_le16(1)	/* packets */</div><div class='add'>+</div><div class='add'>+#define IL_SCAN_CHECK_WATCHDOG		(HZ * 7)</div><div class='add'>+</div><div class='add'>+/*****************************************************</div><div class='add'>+ *   S e n d i n g     H o s t     C o m m a n d s   *</div><div class='add'>+ *****************************************************/</div><div class='add'>+</div><div class='add'>+const char *il_get_cmd_string(u8 cmd);</div><div class='add'>+int __must_check il_send_cmd_sync(struct il_priv *il, struct il_host_cmd *cmd);</div><div class='add'>+int il_send_cmd(struct il_priv *il, struct il_host_cmd *cmd);</div><div class='add'>+int __must_check il_send_cmd_pdu(struct il_priv *il, u8 id, u16 len,</div><div class='add'>+				 const void *data);</div><div class='add'>+int il_send_cmd_pdu_async(struct il_priv *il, u8 id, u16 len, const void *data,</div><div class='add'>+			  void (*callback) (struct il_priv *il,</div><div class='add'>+					    struct il_device_cmd *cmd,</div><div class='add'>+					    struct il_rx_pkt *pkt));</div><div class='add'>+</div><div class='add'>+int il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd);</div><div class='add'>+</div><div class='add'>+/*****************************************************</div><div class='add'>+ * PCI						     *</div><div class='add'>+ *****************************************************/</div><div class='add'>+</div><div class='add'>+static inline u16</div><div class='add'>+il_pcie_link_ctl(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	int pos;</div><div class='add'>+	u16 pci_lnk_ctl;</div><div class='add'>+	pos = pci_pcie_cap(il-&gt;pci_dev);</div><div class='add'>+	pci_read_config_word(il-&gt;pci_dev, pos + PCI_EXP_LNKCTL, &amp;pci_lnk_ctl);</div><div class='add'>+	return pci_lnk_ctl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void il_bg_watchdog(unsigned long data);</div><div class='add'>+u32 il_usecs_to_beacons(struct il_priv *il, u32 usec, u32 beacon_interval);</div><div class='add'>+__le32 il_add_beacon_time(struct il_priv *il, u32 base, u32 addon,</div><div class='add'>+			  u32 beacon_interval);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+int il_pci_suspend(struct device *device);</div><div class='add'>+int il_pci_resume(struct device *device);</div><div class='add'>+extern const struct dev_pm_ops il_pm_ops;</div><div class='add'>+</div><div class='add'>+#define IL_LEGACY_PM_OPS	(&amp;il_pm_ops)</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_PM */</div><div class='add'>+</div><div class='add'>+#define IL_LEGACY_PM_OPS	NULL</div><div class='add'>+</div><div class='add'>+#endif /* !CONFIG_PM */</div><div class='add'>+</div><div class='add'>+/*****************************************************</div><div class='add'>+*  Error Handling Debugging</div><div class='add'>+******************************************************/</div><div class='add'>+void il4965_dump_nic_error_log(struct il_priv *il);</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+void il_print_rx_config_cmd(struct il_priv *il, struct il_rxon_context *ctx);</div><div class='add'>+#else</div><div class='add'>+static inline void</div><div class='add'>+il_print_rx_config_cmd(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void il_clear_isr_stats(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+/*****************************************************</div><div class='add'>+*  GEOS</div><div class='add'>+******************************************************/</div><div class='add'>+int il_init_geos(struct il_priv *il);</div><div class='add'>+void il_free_geos(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+/*************** DRIVER STATUS FUNCTIONS   *****/</div><div class='add'>+</div><div class='add'>+#define S_HCMD_ACTIVE	0	/* host command in progress */</div><div class='add'>+/* 1 is unused (used to be S_HCMD_SYNC_ACTIVE) */</div><div class='add'>+#define S_INT_ENABLED	2</div><div class='add'>+#define S_RF_KILL_HW	3</div><div class='add'>+#define S_CT_KILL		4</div><div class='add'>+#define S_INIT		5</div><div class='add'>+#define S_ALIVE		6</div><div class='add'>+#define S_READY		7</div><div class='add'>+#define S_TEMPERATURE	8</div><div class='add'>+#define S_GEO_CONFIGURED	9</div><div class='add'>+#define S_EXIT_PENDING	10</div><div class='add'>+#define S_STATS		12</div><div class='add'>+#define S_SCANNING		13</div><div class='add'>+#define S_SCAN_ABORTING	14</div><div class='add'>+#define S_SCAN_HW		15</div><div class='add'>+#define S_POWER_PMI	16</div><div class='add'>+#define S_FW_ERROR		17</div><div class='add'>+#define S_CHANNEL_SWITCH_PENDING 18</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il_is_ready(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	/* The adapter is 'ready' if READY and GEO_CONFIGURED bits are</div><div class='add'>+	 * set but EXIT_PENDING is not */</div><div class='add'>+	return test_bit(S_READY, &amp;il-&gt;status) &amp;&amp;</div><div class='add'>+	    test_bit(S_GEO_CONFIGURED, &amp;il-&gt;status) &amp;&amp;</div><div class='add'>+	    !test_bit(S_EXIT_PENDING, &amp;il-&gt;status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il_is_alive(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	return test_bit(S_ALIVE, &amp;il-&gt;status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il_is_init(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	return test_bit(S_INIT, &amp;il-&gt;status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il_is_rfkill_hw(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	return test_bit(S_RF_KILL_HW, &amp;il-&gt;status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il_is_rfkill(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	return il_is_rfkill_hw(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il_is_ctkill(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	return test_bit(S_CT_KILL, &amp;il-&gt;status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il_is_ready_rf(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (il_is_rfkill(il))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return il_is_ready(il);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern void il_send_bt_config(struct il_priv *il);</div><div class='add'>+extern int il_send_stats_request(struct il_priv *il, u8 flags, bool clear);</div><div class='add'>+void il_apm_stop(struct il_priv *il);</div><div class='add'>+int il_apm_init(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+int il_send_rxon_timing(struct il_priv *il, struct il_rxon_context *ctx);</div><div class='add'>+static inline int</div><div class='add'>+il_send_rxon_assoc(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	return il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;rxon_assoc(il, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	return il-&gt;cfg-&gt;ops-&gt;hcmd-&gt;commit_rxon(il, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline const struct ieee80211_supported_band *</div><div class='add'>+il_get_hw_mode(struct il_priv *il, enum ieee80211_band band)</div><div class='add'>+{</div><div class='add'>+	return il-&gt;hw-&gt;wiphy-&gt;bands[band];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* mac80211 handlers */</div><div class='add'>+int il_mac_config(struct ieee80211_hw *hw, u32 changed);</div><div class='add'>+void il_mac_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif);</div><div class='add'>+void il_mac_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+			     struct ieee80211_bss_conf *bss_conf, u32 changes);</div><div class='add'>+void il_tx_cmd_protection(struct il_priv *il, struct ieee80211_tx_info *info,</div><div class='add'>+			  __le16 fc, __le32 *tx_flags);</div><div class='add'>+</div><div class='add'>+irqreturn_t il_isr(int irq, void *data);</div><div class='add'>+</div><div class='add'>+extern void il_set_bit(struct il_priv *p, u32 r, u32 m);</div><div class='add'>+extern void il_clear_bit(struct il_priv *p, u32 r, u32 m);</div><div class='add'>+extern int _il_grab_nic_access(struct il_priv *il);</div><div class='add'>+extern int _il_poll_bit(struct il_priv *il, u32 addr, u32 bits, u32 mask, int timeout);</div><div class='add'>+extern int il_poll_bit(struct il_priv *il, u32 addr, u32 mask, int timeout);</div><div class='add'>+extern u32 il_rd_prph(struct il_priv *il, u32 reg);</div><div class='add'>+extern void il_wr_prph(struct il_priv *il, u32 addr, u32 val);</div><div class='add'>+extern u32 il_read_targ_mem(struct il_priv *il, u32 addr);</div><div class='add'>+extern void il_write_targ_mem(struct il_priv *il, u32 addr, u32 val);</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+_il_write8(struct il_priv *il, u32 ofs, u8 val)</div><div class='add'>+{</div><div class='add'>+	iowrite8(val, il-&gt;hw_base + ofs);</div><div class='add'>+}</div><div class='add'>+#define il_write8(il, ofs, val) _il_write8(il, ofs, val)</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+_il_wr(struct il_priv *il, u32 ofs, u32 val)</div><div class='add'>+{</div><div class='add'>+	iowrite32(val, il-&gt;hw_base + ofs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+_il_rd(struct il_priv *il, u32 ofs)</div><div class='add'>+{</div><div class='add'>+	return ioread32(il-&gt;hw_base + ofs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+_il_clear_bit(struct il_priv *il, u32 reg, u32 mask)</div><div class='add'>+{</div><div class='add'>+	_il_wr(il, reg, _il_rd(il, reg) &amp; ~mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+_il_set_bit(struct il_priv *il, u32 reg, u32 mask)</div><div class='add'>+{</div><div class='add'>+	_il_wr(il, reg, _il_rd(il, reg) | mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+_il_release_nic_access(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	_il_clear_bit(il, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+il_rd(struct il_priv *il, u32 reg)</div><div class='add'>+{</div><div class='add'>+	u32 value;</div><div class='add'>+	unsigned long reg_flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;reg_lock, reg_flags);</div><div class='add'>+	_il_grab_nic_access(il);</div><div class='add'>+	value = _il_rd(il, reg);</div><div class='add'>+	_il_release_nic_access(il);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;reg_lock, reg_flags);</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il_wr(struct il_priv *il, u32 reg, u32 value)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg_flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;reg_lock, reg_flags);</div><div class='add'>+	if (!_il_grab_nic_access(il)) {</div><div class='add'>+		_il_wr(il, reg, value);</div><div class='add'>+		_il_release_nic_access(il);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;reg_lock, reg_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+_il_rd_prph(struct il_priv *il, u32 reg)</div><div class='add'>+{</div><div class='add'>+	_il_wr(il, HBUS_TARG_PRPH_RADDR, reg | (3 &lt;&lt; 24));</div><div class='add'>+	rmb();</div><div class='add'>+	return _il_rd(il, HBUS_TARG_PRPH_RDAT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+_il_wr_prph(struct il_priv *il, u32 addr, u32 val)</div><div class='add'>+{</div><div class='add'>+	_il_wr(il, HBUS_TARG_PRPH_WADDR, ((addr &amp; 0x0000FFFF) | (3 &lt;&lt; 24)));</div><div class='add'>+	wmb();</div><div class='add'>+	_il_wr(il, HBUS_TARG_PRPH_WDAT, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il_set_bits_prph(struct il_priv *il, u32 reg, u32 mask)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg_flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;reg_lock, reg_flags);</div><div class='add'>+	_il_grab_nic_access(il);</div><div class='add'>+	_il_wr_prph(il, reg, (_il_rd_prph(il, reg) | mask));</div><div class='add'>+	_il_release_nic_access(il);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;reg_lock, reg_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il_set_bits_mask_prph(struct il_priv *il, u32 reg, u32 bits, u32 mask)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg_flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;reg_lock, reg_flags);</div><div class='add'>+	_il_grab_nic_access(il);</div><div class='add'>+	_il_wr_prph(il, reg, ((_il_rd_prph(il, reg) &amp; mask) | bits));</div><div class='add'>+	_il_release_nic_access(il);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;reg_lock, reg_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il_clear_bits_prph(struct il_priv *il, u32 reg, u32 mask)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg_flags;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;reg_lock, reg_flags);</div><div class='add'>+	_il_grab_nic_access(il);</div><div class='add'>+	val = _il_rd_prph(il, reg);</div><div class='add'>+	_il_wr_prph(il, reg, (val &amp; ~mask));</div><div class='add'>+	_il_release_nic_access(il);</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;reg_lock, reg_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HW_KEY_DYNAMIC 0</div><div class='add'>+#define HW_KEY_DEFAULT 1</div><div class='add'>+</div><div class='add'>+#define IL_STA_DRIVER_ACTIVE BIT(0)	/* driver entry is active */</div><div class='add'>+#define IL_STA_UCODE_ACTIVE  BIT(1)	/* ucode entry is active */</div><div class='add'>+#define IL_STA_UCODE_INPROGRESS  BIT(2)	/* ucode entry is in process of</div><div class='add'>+					   being activated */</div><div class='add'>+#define IL_STA_LOCAL BIT(3)	/* station state not directed by mac80211;</div><div class='add'>+				   (this is for the IBSS BSSID stations) */</div><div class='add'>+#define IL_STA_BCAST BIT(4)	/* this station is the special bcast station */</div><div class='add'>+</div><div class='add'>+void il_restore_stations(struct il_priv *il, struct il_rxon_context *ctx);</div><div class='add'>+void il_clear_ucode_stations(struct il_priv *il, struct il_rxon_context *ctx);</div><div class='add'>+void il_dealloc_bcast_stations(struct il_priv *il);</div><div class='add'>+int il_get_free_ucode_key_idx(struct il_priv *il);</div><div class='add'>+int il_send_add_sta(struct il_priv *il, struct il_addsta_cmd *sta, u8 flags);</div><div class='add'>+int il_add_station_common(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+			  const u8 *addr, bool is_ap,</div><div class='add'>+			  struct ieee80211_sta *sta, u8 *sta_id_r);</div><div class='add'>+int il_remove_station(struct il_priv *il, const u8 sta_id, const u8 * addr);</div><div class='add'>+int il_mac_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='add'>+		      struct ieee80211_sta *sta);</div><div class='add'>+</div><div class='add'>+u8 il_prep_station(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+		   const u8 *addr, bool is_ap, struct ieee80211_sta *sta);</div><div class='add'>+</div><div class='add'>+int il_send_lq_cmd(struct il_priv *il, struct il_rxon_context *ctx,</div><div class='add'>+		   struct il_link_quality_cmd *lq, u8 flags, bool init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_clear_driver_stations - clear knowledge of all stations from driver</div><div class='add'>+ * @il: iwl il struct</div><div class='add'>+ *</div><div class='add'>+ * This is called during il_down() to make sure that in the case</div><div class='add'>+ * we're coming there from a hardware restart mac80211 will be</div><div class='add'>+ * able to reconfigure stations -- if we're getting there in the</div><div class='add'>+ * normal down flow then the stations will already be cleared.</div><div class='add'>+ */</div><div class='add'>+static inline void</div><div class='add'>+il_clear_driver_stations(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+	memset(il-&gt;stations, 0, sizeof(il-&gt;stations));</div><div class='add'>+	il-&gt;num_stations = 0;</div><div class='add'>+</div><div class='add'>+	il-&gt;ucode_key_table = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Remove all key information that is not stored as part</div><div class='add'>+	 * of station information since mac80211 may not have had</div><div class='add'>+	 * a chance to remove all the keys. When device is</div><div class='add'>+	 * reconfigured by mac80211 after an error all keys will</div><div class='add'>+	 * be reconfigured.</div><div class='add'>+	 */</div><div class='add'>+	memset(ctx-&gt;wep_keys, 0, sizeof(ctx-&gt;wep_keys));</div><div class='add'>+	ctx-&gt;key_mapping_keys = 0;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;il-&gt;sta_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il_sta_id(struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!sta))</div><div class='add'>+		return IL_INVALID_STATION;</div><div class='add'>+</div><div class='add'>+	return ((struct il_station_priv_common *)sta-&gt;drv_priv)-&gt;sta_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_sta_id_or_broadcast - return sta_id or broadcast sta</div><div class='add'>+ * @il: iwl il</div><div class='add'>+ * @context: the current context</div><div class='add'>+ * @sta: mac80211 station</div><div class='add'>+ *</div><div class='add'>+ * In certain circumstances mac80211 passes a station pointer</div><div class='add'>+ * that may be %NULL, for example during TX or key setup. In</div><div class='add'>+ * that case, we need to use the broadcast station, so this</div><div class='add'>+ * inline wraps that pattern.</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+il_sta_id_or_broadcast(struct il_priv *il, struct il_rxon_context *context,</div><div class='add'>+		       struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	int sta_id;</div><div class='add'>+</div><div class='add'>+	if (!sta)</div><div class='add'>+		return context-&gt;bcast_sta_id;</div><div class='add'>+</div><div class='add'>+	sta_id = il_sta_id(sta);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * mac80211 should not be passing a partially</div><div class='add'>+	 * initialised station!</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(sta_id == IL_INVALID_STATION);</div><div class='add'>+</div><div class='add'>+	return sta_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_queue_inc_wrap - increment queue idx, wrap back to beginning</div><div class='add'>+ * @idx -- current idx</div><div class='add'>+ * @n_bd -- total number of entries in queue (must be power of 2)</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+il_queue_inc_wrap(int idx, int n_bd)</div><div class='add'>+{</div><div class='add'>+	return ++idx &amp; (n_bd - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_queue_dec_wrap - decrement queue idx, wrap back to end</div><div class='add'>+ * @idx -- current idx</div><div class='add'>+ * @n_bd -- total number of entries in queue (must be power of 2)</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+il_queue_dec_wrap(int idx, int n_bd)</div><div class='add'>+{</div><div class='add'>+	return --idx &amp; (n_bd - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* TODO: Move fw_desc functions to iwl-pci.ko */</div><div class='add'>+static inline void</div><div class='add'>+il_free_fw_desc(struct pci_dev *pci_dev, struct fw_desc *desc)</div><div class='add'>+{</div><div class='add'>+	if (desc-&gt;v_addr)</div><div class='add'>+		dma_free_coherent(&amp;pci_dev-&gt;dev, desc-&gt;len, desc-&gt;v_addr,</div><div class='add'>+				  desc-&gt;p_addr);</div><div class='add'>+	desc-&gt;v_addr = NULL;</div><div class='add'>+	desc-&gt;len = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+il_alloc_fw_desc(struct pci_dev *pci_dev, struct fw_desc *desc)</div><div class='add'>+{</div><div class='add'>+	if (!desc-&gt;len) {</div><div class='add'>+		desc-&gt;v_addr = NULL;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc-&gt;v_addr =</div><div class='add'>+	    dma_alloc_coherent(&amp;pci_dev-&gt;dev, desc-&gt;len, &amp;desc-&gt;p_addr,</div><div class='add'>+			       GFP_KERNEL);</div><div class='add'>+	return (desc-&gt;v_addr != NULL) ? 0 : -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * we have 8 bits used like this:</div><div class='add'>+ *</div><div class='add'>+ * 7 6 5 4 3 2 1 0</div><div class='add'>+ * | | | | | | | |</div><div class='add'>+ * | | | | | | +-+-------- AC queue (0-3)</div><div class='add'>+ * | | | | | |</div><div class='add'>+ * | +-+-+-+-+------------ HW queue ID</div><div class='add'>+ * |</div><div class='add'>+ * +---------------------- unused</div><div class='add'>+ */</div><div class='add'>+static inline void</div><div class='add'>+il_set_swq_id(struct il_tx_queue *txq, u8 ac, u8 hwq)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(ac &gt; 3);		/* only have 2 bits */</div><div class='add'>+	BUG_ON(hwq &gt; 31);	/* only use 5 bits */</div><div class='add'>+</div><div class='add'>+	txq-&gt;swq_id = (hwq &lt;&lt; 2) | ac;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il_wake_queue(struct il_priv *il, struct il_tx_queue *txq)</div><div class='add'>+{</div><div class='add'>+	u8 queue = txq-&gt;swq_id;</div><div class='add'>+	u8 ac = queue &amp; 3;</div><div class='add'>+	u8 hwq = (queue &gt;&gt; 2) &amp; 0x1f;</div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(hwq, il-&gt;queue_stopped))</div><div class='add'>+		if (atomic_dec_return(&amp;il-&gt;queue_stop_count[ac]) &lt;= 0)</div><div class='add'>+			ieee80211_wake_queue(il-&gt;hw, ac);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il_stop_queue(struct il_priv *il, struct il_tx_queue *txq)</div><div class='add'>+{</div><div class='add'>+	u8 queue = txq-&gt;swq_id;</div><div class='add'>+	u8 ac = queue &amp; 3;</div><div class='add'>+	u8 hwq = (queue &gt;&gt; 2) &amp; 0x1f;</div><div class='add'>+</div><div class='add'>+	if (!test_and_set_bit(hwq, il-&gt;queue_stopped))</div><div class='add'>+		if (atomic_inc_return(&amp;il-&gt;queue_stop_count[ac]) &gt; 0)</div><div class='add'>+			ieee80211_stop_queue(il-&gt;hw, ac);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef ieee80211_stop_queue</div><div class='add'>+#undef ieee80211_stop_queue</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define ieee80211_stop_queue DO_NOT_USE_ieee80211_stop_queue</div><div class='add'>+</div><div class='add'>+#ifdef ieee80211_wake_queue</div><div class='add'>+#undef ieee80211_wake_queue</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define ieee80211_wake_queue DO_NOT_USE_ieee80211_wake_queue</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il_disable_interrupts(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	clear_bit(S_INT_ENABLED, &amp;il-&gt;status);</div><div class='add'>+</div><div class='add'>+	/* disable interrupts from uCode/NIC to host */</div><div class='add'>+	_il_wr(il, CSR_INT_MASK, 0x00000000);</div><div class='add'>+</div><div class='add'>+	/* acknowledge/clear/reset any interrupts still pending</div><div class='add'>+	 * from uCode or flow handler (Rx/Tx DMA) */</div><div class='add'>+	_il_wr(il, CSR_INT, 0xffffffff);</div><div class='add'>+	_il_wr(il, CSR_FH_INT_STATUS, 0xffffffff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il_enable_rfkill_int(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	_il_wr(il, CSR_INT_MASK, CSR_INT_BIT_RF_KILL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+il_enable_interrupts(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	set_bit(S_INT_ENABLED, &amp;il-&gt;status);</div><div class='add'>+	_il_wr(il, CSR_INT_MASK, il-&gt;inta_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_beacon_time_mask_low - mask of lower 32 bit of beacon time</div><div class='add'>+ * @il -- pointer to il_priv data structure</div><div class='add'>+ * @tsf_bits -- number of bits need to shift for masking)</div><div class='add'>+ */</div><div class='add'>+static inline u32</div><div class='add'>+il_beacon_time_mask_low(struct il_priv *il, u16 tsf_bits)</div><div class='add'>+{</div><div class='add'>+	return (1 &lt;&lt; tsf_bits) - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_beacon_time_mask_high - mask of higher 32 bit of beacon time</div><div class='add'>+ * @il -- pointer to il_priv data structure</div><div class='add'>+ * @tsf_bits -- number of bits need to shift for masking)</div><div class='add'>+ */</div><div class='add'>+static inline u32</div><div class='add'>+il_beacon_time_mask_high(struct il_priv *il, u16 tsf_bits)</div><div class='add'>+{</div><div class='add'>+	return ((1 &lt;&lt; (32 - tsf_bits)) - 1) &lt;&lt; tsf_bits;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct il_rb_status - reseve buffer status host memory mapped FH registers</div><div class='add'>+ *</div><div class='add'>+ * @closed_rb_num [0:11] - Indicates the idx of the RB which was closed</div><div class='add'>+ * @closed_fr_num [0:11] - Indicates the idx of the RX Frame which was closed</div><div class='add'>+ * @finished_rb_num [0:11] - Indicates the idx of the current RB</div><div class='add'>+ *			     in which the last frame was written to</div><div class='add'>+ * @finished_fr_num [0:11] - Indicates the idx of the RX Frame</div><div class='add'>+ *			     which was transferred</div><div class='add'>+ */</div><div class='add'>+struct il_rb_status {</div><div class='add'>+	__le16 closed_rb_num;</div><div class='add'>+	__le16 closed_fr_num;</div><div class='add'>+	__le16 finished_rb_num;</div><div class='add'>+	__le16 finished_fr_nam;</div><div class='add'>+	__le32 __unused;	/* 3945 only */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define TFD_QUEUE_SIZE_MAX      (256)</div><div class='add'>+#define TFD_QUEUE_SIZE_BC_DUP	(64)</div><div class='add'>+#define TFD_QUEUE_BC_SIZE	(TFD_QUEUE_SIZE_MAX + TFD_QUEUE_SIZE_BC_DUP)</div><div class='add'>+#define IL_TX_DMA_MASK        DMA_BIT_MASK(36)</div><div class='add'>+#define IL_NUM_OF_TBS		20</div><div class='add'>+</div><div class='add'>+static inline u8</div><div class='add'>+il_get_dma_hi_addr(dma_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	return (sizeof(addr) &gt; sizeof(u32) ? (addr &gt;&gt; 16) &gt;&gt; 16 : 0) &amp; 0xF;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct il_tfd_tb transmit buffer descriptor within transmit frame descriptor</div><div class='add'>+ *</div><div class='add'>+ * This structure contains dma address and length of transmission address</div><div class='add'>+ *</div><div class='add'>+ * @lo: low [31:0] portion of the dma address of TX buffer every even is</div><div class='add'>+ *	unaligned on 16 bit boundary</div><div class='add'>+ * @hi_n_len: 0-3 [35:32] portion of dma</div><div class='add'>+ *	      4-15 length of the tx buffer</div><div class='add'>+ */</div><div class='add'>+struct il_tfd_tb {</div><div class='add'>+	__le32 lo;</div><div class='add'>+	__le16 hi_n_len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct il_tfd</div><div class='add'>+ *</div><div class='add'>+ * Transmit Frame Descriptor (TFD)</div><div class='add'>+ *</div><div class='add'>+ * @ __reserved1[3] reserved</div><div class='add'>+ * @ num_tbs 0-4 number of active tbs</div><div class='add'>+ *	     5   reserved</div><div class='add'>+ * 	     6-7 padding (not used)</div><div class='add'>+ * @ tbs[20]	transmit frame buffer descriptors</div><div class='add'>+ * @ __pad	padding</div><div class='add'>+ *</div><div class='add'>+ * Each Tx queue uses a circular buffer of 256 TFDs stored in host DRAM.</div><div class='add'>+ * Both driver and device share these circular buffers, each of which must be</div><div class='add'>+ * contiguous 256 TFDs x 128 bytes-per-TFD = 32 KBytes</div><div class='add'>+ *</div><div class='add'>+ * Driver must indicate the physical address of the base of each</div><div class='add'>+ * circular buffer via the FH49_MEM_CBBC_QUEUE registers.</div><div class='add'>+ *</div><div class='add'>+ * Each TFD contains pointer/size information for up to 20 data buffers</div><div class='add'>+ * in host DRAM.  These buffers collectively contain the (one) frame described</div><div class='add'>+ * by the TFD.  Each buffer must be a single contiguous block of memory within</div><div class='add'>+ * itself, but buffers may be scattered in host DRAM.  Each buffer has max size</div><div class='add'>+ * of (4K - 4).  The concatenates all of a TFD's buffers into a single</div><div class='add'>+ * Tx frame, up to 8 KBytes in size.</div><div class='add'>+ *</div><div class='add'>+ * A maximum of 255 (not 256!) TFDs may be on a queue waiting for Tx.</div><div class='add'>+ */</div><div class='add'>+struct il_tfd {</div><div class='add'>+	u8 __reserved1[3];</div><div class='add'>+	u8 num_tbs;</div><div class='add'>+	struct il_tfd_tb tbs[IL_NUM_OF_TBS];</div><div class='add'>+	__le32 __pad;</div><div class='add'>+} __packed;</div><div class='add'>+/* PCI registers */</div><div class='add'>+#define PCI_CFG_RETRY_TIMEOUT	0x041</div><div class='add'>+</div><div class='add'>+/* PCI register values */</div><div class='add'>+#define PCI_CFG_LINK_CTRL_VAL_L0S_EN	0x01</div><div class='add'>+#define PCI_CFG_LINK_CTRL_VAL_L1_EN	0x02</div><div class='add'>+</div><div class='add'>+struct il_rate_info {</div><div class='add'>+	u8 plcp;		/* uCode API:  RATE_6M_PLCP, etc. */</div><div class='add'>+	u8 plcp_siso;		/* uCode API:  RATE_SISO_6M_PLCP, etc. */</div><div class='add'>+	u8 plcp_mimo2;		/* uCode API:  RATE_MIMO2_6M_PLCP, etc. */</div><div class='add'>+	u8 ieee;		/* MAC header:  RATE_6M_IEEE, etc. */</div><div class='add'>+	u8 prev_ieee;		/* previous rate in IEEE speeds */</div><div class='add'>+	u8 next_ieee;		/* next rate in IEEE speeds */</div><div class='add'>+	u8 prev_rs;		/* previous rate used in rs algo */</div><div class='add'>+	u8 next_rs;		/* next rate used in rs algo */</div><div class='add'>+	u8 prev_rs_tgg;		/* previous rate used in TGG rs algo */</div><div class='add'>+	u8 next_rs_tgg;		/* next rate used in TGG rs algo */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il3945_rate_info {</div><div class='add'>+	u8 plcp;		/* uCode API:  RATE_6M_PLCP, etc. */</div><div class='add'>+	u8 ieee;		/* MAC header:  RATE_6M_IEEE, etc. */</div><div class='add'>+	u8 prev_ieee;		/* previous rate in IEEE speeds */</div><div class='add'>+	u8 next_ieee;		/* next rate in IEEE speeds */</div><div class='add'>+	u8 prev_rs;		/* previous rate used in rs algo */</div><div class='add'>+	u8 next_rs;		/* next rate used in rs algo */</div><div class='add'>+	u8 prev_rs_tgg;		/* previous rate used in TGG rs algo */</div><div class='add'>+	u8 next_rs_tgg;		/* next rate used in TGG rs algo */</div><div class='add'>+	u8 table_rs_idx;	/* idx in rate scale table cmd */</div><div class='add'>+	u8 prev_table_rs;	/* prev in rate table cmd */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These serve as idxes into</div><div class='add'>+ * struct il_rate_info il_rates[RATE_COUNT];</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	RATE_1M_IDX = 0,</div><div class='add'>+	RATE_2M_IDX,</div><div class='add'>+	RATE_5M_IDX,</div><div class='add'>+	RATE_11M_IDX,</div><div class='add'>+	RATE_6M_IDX,</div><div class='add'>+	RATE_9M_IDX,</div><div class='add'>+	RATE_12M_IDX,</div><div class='add'>+	RATE_18M_IDX,</div><div class='add'>+	RATE_24M_IDX,</div><div class='add'>+	RATE_36M_IDX,</div><div class='add'>+	RATE_48M_IDX,</div><div class='add'>+	RATE_54M_IDX,</div><div class='add'>+	RATE_60M_IDX,</div><div class='add'>+	RATE_COUNT,</div><div class='add'>+	RATE_COUNT_LEGACY = RATE_COUNT - 1,	/* Excluding 60M */</div><div class='add'>+	RATE_COUNT_3945 = RATE_COUNT - 1,</div><div class='add'>+	RATE_INVM_IDX = RATE_COUNT,</div><div class='add'>+	RATE_INVALID = RATE_COUNT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	RATE_6M_IDX_TBL = 0,</div><div class='add'>+	RATE_9M_IDX_TBL,</div><div class='add'>+	RATE_12M_IDX_TBL,</div><div class='add'>+	RATE_18M_IDX_TBL,</div><div class='add'>+	RATE_24M_IDX_TBL,</div><div class='add'>+	RATE_36M_IDX_TBL,</div><div class='add'>+	RATE_48M_IDX_TBL,</div><div class='add'>+	RATE_54M_IDX_TBL,</div><div class='add'>+	RATE_1M_IDX_TBL,</div><div class='add'>+	RATE_2M_IDX_TBL,</div><div class='add'>+	RATE_5M_IDX_TBL,</div><div class='add'>+	RATE_11M_IDX_TBL,</div><div class='add'>+	RATE_INVM_IDX_TBL = RATE_INVM_IDX - 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	IL_FIRST_OFDM_RATE = RATE_6M_IDX,</div><div class='add'>+	IL39_LAST_OFDM_RATE = RATE_54M_IDX,</div><div class='add'>+	IL_LAST_OFDM_RATE = RATE_60M_IDX,</div><div class='add'>+	IL_FIRST_CCK_RATE = RATE_1M_IDX,</div><div class='add'>+	IL_LAST_CCK_RATE = RATE_11M_IDX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* #define vs. enum to keep from defaulting to 'large integer' */</div><div class='add'>+#define	RATE_6M_MASK   (1 &lt;&lt; RATE_6M_IDX)</div><div class='add'>+#define	RATE_9M_MASK   (1 &lt;&lt; RATE_9M_IDX)</div><div class='add'>+#define	RATE_12M_MASK  (1 &lt;&lt; RATE_12M_IDX)</div><div class='add'>+#define	RATE_18M_MASK  (1 &lt;&lt; RATE_18M_IDX)</div><div class='add'>+#define	RATE_24M_MASK  (1 &lt;&lt; RATE_24M_IDX)</div><div class='add'>+#define	RATE_36M_MASK  (1 &lt;&lt; RATE_36M_IDX)</div><div class='add'>+#define	RATE_48M_MASK  (1 &lt;&lt; RATE_48M_IDX)</div><div class='add'>+#define	RATE_54M_MASK  (1 &lt;&lt; RATE_54M_IDX)</div><div class='add'>+#define RATE_60M_MASK  (1 &lt;&lt; RATE_60M_IDX)</div><div class='add'>+#define	RATE_1M_MASK   (1 &lt;&lt; RATE_1M_IDX)</div><div class='add'>+#define	RATE_2M_MASK   (1 &lt;&lt; RATE_2M_IDX)</div><div class='add'>+#define	RATE_5M_MASK   (1 &lt;&lt; RATE_5M_IDX)</div><div class='add'>+#define	RATE_11M_MASK  (1 &lt;&lt; RATE_11M_IDX)</div><div class='add'>+</div><div class='add'>+/* uCode API values for legacy bit rates, both OFDM and CCK */</div><div class='add'>+enum {</div><div class='add'>+	RATE_6M_PLCP = 13,</div><div class='add'>+	RATE_9M_PLCP = 15,</div><div class='add'>+	RATE_12M_PLCP = 5,</div><div class='add'>+	RATE_18M_PLCP = 7,</div><div class='add'>+	RATE_24M_PLCP = 9,</div><div class='add'>+	RATE_36M_PLCP = 11,</div><div class='add'>+	RATE_48M_PLCP = 1,</div><div class='add'>+	RATE_54M_PLCP = 3,</div><div class='add'>+	RATE_60M_PLCP = 3,	/*FIXME:RS:should be removed */</div><div class='add'>+	RATE_1M_PLCP = 10,</div><div class='add'>+	RATE_2M_PLCP = 20,</div><div class='add'>+	RATE_5M_PLCP = 55,</div><div class='add'>+	RATE_11M_PLCP = 110,</div><div class='add'>+	/*FIXME:RS:add RATE_LEGACY_INVM_PLCP = 0, */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* uCode API values for OFDM high-throughput (HT) bit rates */</div><div class='add'>+enum {</div><div class='add'>+	RATE_SISO_6M_PLCP = 0,</div><div class='add'>+	RATE_SISO_12M_PLCP = 1,</div><div class='add'>+	RATE_SISO_18M_PLCP = 2,</div><div class='add'>+	RATE_SISO_24M_PLCP = 3,</div><div class='add'>+	RATE_SISO_36M_PLCP = 4,</div><div class='add'>+	RATE_SISO_48M_PLCP = 5,</div><div class='add'>+	RATE_SISO_54M_PLCP = 6,</div><div class='add'>+	RATE_SISO_60M_PLCP = 7,</div><div class='add'>+	RATE_MIMO2_6M_PLCP = 0x8,</div><div class='add'>+	RATE_MIMO2_12M_PLCP = 0x9,</div><div class='add'>+	RATE_MIMO2_18M_PLCP = 0xa,</div><div class='add'>+	RATE_MIMO2_24M_PLCP = 0xb,</div><div class='add'>+	RATE_MIMO2_36M_PLCP = 0xc,</div><div class='add'>+	RATE_MIMO2_48M_PLCP = 0xd,</div><div class='add'>+	RATE_MIMO2_54M_PLCP = 0xe,</div><div class='add'>+	RATE_MIMO2_60M_PLCP = 0xf,</div><div class='add'>+	RATE_SISO_INVM_PLCP,</div><div class='add'>+	RATE_MIMO2_INVM_PLCP = RATE_SISO_INVM_PLCP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* MAC header values for bit rates */</div><div class='add'>+enum {</div><div class='add'>+	RATE_6M_IEEE = 12,</div><div class='add'>+	RATE_9M_IEEE = 18,</div><div class='add'>+	RATE_12M_IEEE = 24,</div><div class='add'>+	RATE_18M_IEEE = 36,</div><div class='add'>+	RATE_24M_IEEE = 48,</div><div class='add'>+	RATE_36M_IEEE = 72,</div><div class='add'>+	RATE_48M_IEEE = 96,</div><div class='add'>+	RATE_54M_IEEE = 108,</div><div class='add'>+	RATE_60M_IEEE = 120,</div><div class='add'>+	RATE_1M_IEEE = 2,</div><div class='add'>+	RATE_2M_IEEE = 4,</div><div class='add'>+	RATE_5M_IEEE = 11,</div><div class='add'>+	RATE_11M_IEEE = 22,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IL_CCK_BASIC_RATES_MASK    \</div><div class='add'>+	(RATE_1M_MASK          | \</div><div class='add'>+	RATE_2M_MASK)</div><div class='add'>+</div><div class='add'>+#define IL_CCK_RATES_MASK          \</div><div class='add'>+	(IL_CCK_BASIC_RATES_MASK  | \</div><div class='add'>+	RATE_5M_MASK          | \</div><div class='add'>+	RATE_11M_MASK)</div><div class='add'>+</div><div class='add'>+#define IL_OFDM_BASIC_RATES_MASK   \</div><div class='add'>+	(RATE_6M_MASK         | \</div><div class='add'>+	RATE_12M_MASK         | \</div><div class='add'>+	RATE_24M_MASK)</div><div class='add'>+</div><div class='add'>+#define IL_OFDM_RATES_MASK         \</div><div class='add'>+	(IL_OFDM_BASIC_RATES_MASK | \</div><div class='add'>+	RATE_9M_MASK          | \</div><div class='add'>+	RATE_18M_MASK         | \</div><div class='add'>+	RATE_36M_MASK         | \</div><div class='add'>+	RATE_48M_MASK         | \</div><div class='add'>+	RATE_54M_MASK)</div><div class='add'>+</div><div class='add'>+#define IL_BASIC_RATES_MASK         \</div><div class='add'>+	(IL_OFDM_BASIC_RATES_MASK | \</div><div class='add'>+	 IL_CCK_BASIC_RATES_MASK)</div><div class='add'>+</div><div class='add'>+#define RATES_MASK ((1 &lt;&lt; RATE_COUNT) - 1)</div><div class='add'>+#define RATES_MASK_3945 ((1 &lt;&lt; RATE_COUNT_3945) - 1)</div><div class='add'>+</div><div class='add'>+#define IL_INVALID_VALUE    -1</div><div class='add'>+</div><div class='add'>+#define IL_MIN_RSSI_VAL                 -100</div><div class='add'>+#define IL_MAX_RSSI_VAL                    0</div><div class='add'>+</div><div class='add'>+/* These values specify how many Tx frame attempts before</div><div class='add'>+ * searching for a new modulation mode */</div><div class='add'>+#define IL_LEGACY_FAILURE_LIMIT	160</div><div class='add'>+#define IL_LEGACY_SUCCESS_LIMIT	480</div><div class='add'>+#define IL_LEGACY_TBL_COUNT		160</div><div class='add'>+</div><div class='add'>+#define IL_NONE_LEGACY_FAILURE_LIMIT	400</div><div class='add'>+#define IL_NONE_LEGACY_SUCCESS_LIMIT	4500</div><div class='add'>+#define IL_NONE_LEGACY_TBL_COUNT	1500</div><div class='add'>+</div><div class='add'>+/* Success ratio (ACKed / attempted tx frames) values (perfect is 128 * 100) */</div><div class='add'>+#define IL_RS_GOOD_RATIO		12800	/* 100% */</div><div class='add'>+#define RATE_SCALE_SWITCH		10880	/*  85% */</div><div class='add'>+#define RATE_HIGH_TH		10880	/*  85% */</div><div class='add'>+#define RATE_INCREASE_TH		6400	/*  50% */</div><div class='add'>+#define RATE_DECREASE_TH		1920	/*  15% */</div><div class='add'>+</div><div class='add'>+/* possible actions when in legacy mode */</div><div class='add'>+#define IL_LEGACY_SWITCH_ANTENNA1      0</div><div class='add'>+#define IL_LEGACY_SWITCH_ANTENNA2      1</div><div class='add'>+#define IL_LEGACY_SWITCH_SISO          2</div><div class='add'>+#define IL_LEGACY_SWITCH_MIMO2_AB      3</div><div class='add'>+#define IL_LEGACY_SWITCH_MIMO2_AC      4</div><div class='add'>+#define IL_LEGACY_SWITCH_MIMO2_BC      5</div><div class='add'>+</div><div class='add'>+/* possible actions when in siso mode */</div><div class='add'>+#define IL_SISO_SWITCH_ANTENNA1        0</div><div class='add'>+#define IL_SISO_SWITCH_ANTENNA2        1</div><div class='add'>+#define IL_SISO_SWITCH_MIMO2_AB        2</div><div class='add'>+#define IL_SISO_SWITCH_MIMO2_AC        3</div><div class='add'>+#define IL_SISO_SWITCH_MIMO2_BC        4</div><div class='add'>+#define IL_SISO_SWITCH_GI              5</div><div class='add'>+</div><div class='add'>+/* possible actions when in mimo mode */</div><div class='add'>+#define IL_MIMO2_SWITCH_ANTENNA1       0</div><div class='add'>+#define IL_MIMO2_SWITCH_ANTENNA2       1</div><div class='add'>+#define IL_MIMO2_SWITCH_SISO_A         2</div><div class='add'>+#define IL_MIMO2_SWITCH_SISO_B         3</div><div class='add'>+#define IL_MIMO2_SWITCH_SISO_C         4</div><div class='add'>+#define IL_MIMO2_SWITCH_GI             5</div><div class='add'>+</div><div class='add'>+#define IL_MAX_SEARCH IL_MIMO2_SWITCH_GI</div><div class='add'>+</div><div class='add'>+#define IL_ACTION_LIMIT		3	/* # possible actions */</div><div class='add'>+</div><div class='add'>+#define LQ_SIZE		2	/* 2 mode tables:  "Active" and "Search" */</div><div class='add'>+</div><div class='add'>+/* load per tid defines for A-MPDU activation */</div><div class='add'>+#define IL_AGG_TPT_THREHOLD	0</div><div class='add'>+#define IL_AGG_LOAD_THRESHOLD	10</div><div class='add'>+#define IL_AGG_ALL_TID		0xff</div><div class='add'>+#define TID_QUEUE_CELL_SPACING	50	/*mS */</div><div class='add'>+#define TID_QUEUE_MAX_SIZE	20</div><div class='add'>+#define TID_ROUND_VALUE		5	/* mS */</div><div class='add'>+#define TID_MAX_LOAD_COUNT	8</div><div class='add'>+</div><div class='add'>+#define TID_MAX_TIME_DIFF ((TID_QUEUE_MAX_SIZE - 1) * TID_QUEUE_CELL_SPACING)</div><div class='add'>+#define TIME_WRAP_AROUND(x, y) (((y) &gt; (x)) ? (y) - (x) : (0-(x)) + (y))</div><div class='add'>+</div><div class='add'>+extern const struct il_rate_info il_rates[RATE_COUNT];</div><div class='add'>+</div><div class='add'>+enum il_table_type {</div><div class='add'>+	LQ_NONE,</div><div class='add'>+	LQ_G,			/* legacy types */</div><div class='add'>+	LQ_A,</div><div class='add'>+	LQ_SISO,		/* high-throughput types */</div><div class='add'>+	LQ_MIMO2,</div><div class='add'>+	LQ_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define is_legacy(tbl) ((tbl) == LQ_G || (tbl) == LQ_A)</div><div class='add'>+#define is_siso(tbl) ((tbl) == LQ_SISO)</div><div class='add'>+#define is_mimo2(tbl) ((tbl) == LQ_MIMO2)</div><div class='add'>+#define is_mimo(tbl) (is_mimo2(tbl))</div><div class='add'>+#define is_Ht(tbl) (is_siso(tbl) || is_mimo(tbl))</div><div class='add'>+#define is_a_band(tbl) ((tbl) == LQ_A)</div><div class='add'>+#define is_g_and(tbl) ((tbl) == LQ_G)</div><div class='add'>+</div><div class='add'>+#define	ANT_NONE	0x0</div><div class='add'>+#define	ANT_A		BIT(0)</div><div class='add'>+#define	ANT_B		BIT(1)</div><div class='add'>+#define	ANT_AB		(ANT_A | ANT_B)</div><div class='add'>+#define ANT_C		BIT(2)</div><div class='add'>+#define	ANT_AC		(ANT_A | ANT_C)</div><div class='add'>+#define ANT_BC		(ANT_B | ANT_C)</div><div class='add'>+#define ANT_ABC		(ANT_AB | ANT_C)</div><div class='add'>+</div><div class='add'>+#define IL_MAX_MCS_DISPLAY_SIZE	12</div><div class='add'>+</div><div class='add'>+struct il_rate_mcs_info {</div><div class='add'>+	char mbps[IL_MAX_MCS_DISPLAY_SIZE];</div><div class='add'>+	char mcs[IL_MAX_MCS_DISPLAY_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct il_rate_scale_data -- tx success history for one rate</div><div class='add'>+ */</div><div class='add'>+struct il_rate_scale_data {</div><div class='add'>+	u64 data;		/* bitmap of successful frames */</div><div class='add'>+	s32 success_counter;	/* number of frames successful */</div><div class='add'>+	s32 success_ratio;	/* per-cent * 128  */</div><div class='add'>+	s32 counter;		/* number of frames attempted */</div><div class='add'>+	s32 average_tpt;	/* success ratio * expected throughput */</div><div class='add'>+	unsigned long stamp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct il_scale_tbl_info -- tx params and success history for all rates</div><div class='add'>+ *</div><div class='add'>+ * There are two of these in struct il_lq_sta,</div><div class='add'>+ * one for "active", and one for "search".</div><div class='add'>+ */</div><div class='add'>+struct il_scale_tbl_info {</div><div class='add'>+	enum il_table_type lq_type;</div><div class='add'>+	u8 ant_type;</div><div class='add'>+	u8 is_SGI;		/* 1 = short guard interval */</div><div class='add'>+	u8 is_ht40;		/* 1 = 40 MHz channel width */</div><div class='add'>+	u8 is_dup;		/* 1 = duplicated data streams */</div><div class='add'>+	u8 action;		/* change modulation; IL_[LEGACY/SISO/MIMO]_SWITCH_* */</div><div class='add'>+	u8 max_search;		/* maximun number of tables we can search */</div><div class='add'>+	s32 *expected_tpt;	/* throughput metrics; expected_tpt_G, etc. */</div><div class='add'>+	u32 current_rate;	/* rate_n_flags, uCode API format */</div><div class='add'>+	struct il_rate_scale_data win[RATE_COUNT];	/* rate histories */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct il_traffic_load {</div><div class='add'>+	unsigned long time_stamp;	/* age of the oldest stats */</div><div class='add'>+	u32 packet_count[TID_QUEUE_MAX_SIZE];	/* packet count in this time</div><div class='add'>+						 * slice */</div><div class='add'>+	u32 total;		/* total num of packets during the</div><div class='add'>+				 * last TID_MAX_TIME_DIFF */</div><div class='add'>+	u8 queue_count;		/* number of queues that has</div><div class='add'>+				 * been used since the last cleanup */</div><div class='add'>+	u8 head;		/* start of the circular buffer */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct il_lq_sta -- driver's rate scaling ilate structure</div><div class='add'>+ *</div><div class='add'>+ * Pointer to this gets passed back and forth between driver and mac80211.</div><div class='add'>+ */</div><div class='add'>+struct il_lq_sta {</div><div class='add'>+	u8 active_tbl;		/* idx of active table, range 0-1 */</div><div class='add'>+	u8 enable_counter;	/* indicates HT mode */</div><div class='add'>+	u8 stay_in_tbl;		/* 1: disallow, 0: allow search for new mode */</div><div class='add'>+	u8 search_better_tbl;	/* 1: currently trying alternate mode */</div><div class='add'>+	s32 last_tpt;</div><div class='add'>+</div><div class='add'>+	/* The following determine when to search for a new mode */</div><div class='add'>+	u32 table_count_limit;</div><div class='add'>+	u32 max_failure_limit;	/* # failed frames before new search */</div><div class='add'>+	u32 max_success_limit;	/* # successful frames before new search */</div><div class='add'>+	u32 table_count;</div><div class='add'>+	u32 total_failed;	/* total failed frames, any/all rates */</div><div class='add'>+	u32 total_success;	/* total successful frames, any/all rates */</div><div class='add'>+	u64 flush_timer;	/* time staying in mode before new search */</div><div class='add'>+</div><div class='add'>+	u8 action_counter;	/* # mode-switch actions tried */</div><div class='add'>+	u8 is_green;</div><div class='add'>+	u8 is_dup;</div><div class='add'>+	enum ieee80211_band band;</div><div class='add'>+</div><div class='add'>+	/* The following are bitmaps of rates; RATE_6M_MASK, etc. */</div><div class='add'>+	u32 supp_rates;</div><div class='add'>+	u16 active_legacy_rate;</div><div class='add'>+	u16 active_siso_rate;</div><div class='add'>+	u16 active_mimo2_rate;</div><div class='add'>+	s8 max_rate_idx;	/* Max rate set by user */</div><div class='add'>+	u8 missed_rate_counter;</div><div class='add'>+</div><div class='add'>+	struct il_link_quality_cmd lq;</div><div class='add'>+	struct il_scale_tbl_info lq_info[LQ_SIZE];	/* "active", "search" */</div><div class='add'>+	struct il_traffic_load load[TID_MAX_LOAD_COUNT];</div><div class='add'>+	u8 tx_agg_tid_en;</div><div class='add'>+#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='add'>+	struct dentry *rs_sta_dbgfs_scale_table_file;</div><div class='add'>+	struct dentry *rs_sta_dbgfs_stats_table_file;</div><div class='add'>+	struct dentry *rs_sta_dbgfs_rate_scale_data_file;</div><div class='add'>+	struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file;</div><div class='add'>+	u32 dbg_fixed_rate;</div><div class='add'>+#endif</div><div class='add'>+	struct il_priv *drv;</div><div class='add'>+</div><div class='add'>+	/* used to be in sta_info */</div><div class='add'>+	int last_txrate_idx;</div><div class='add'>+	/* last tx rate_n_flags */</div><div class='add'>+	u32 last_rate_n_flags;</div><div class='add'>+	/* packets destined for this STA are aggregated */</div><div class='add'>+	u8 is_agg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * il_station_priv: Driver's ilate station information</div><div class='add'>+ *</div><div class='add'>+ * When mac80211 creates a station it reserves some space (hw-&gt;sta_data_size)</div><div class='add'>+ * in the structure for use by driver. This structure is places in that</div><div class='add'>+ * space.</div><div class='add'>+ *</div><div class='add'>+ * The common struct MUST be first because it is shared between</div><div class='add'>+ * 3945 and 4965!</div><div class='add'>+ */</div><div class='add'>+struct il_station_priv {</div><div class='add'>+	struct il_station_priv_common common;</div><div class='add'>+	struct il_lq_sta lq_sta;</div><div class='add'>+	atomic_t pending_frames;</div><div class='add'>+	bool client;</div><div class='add'>+	bool asleep;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u8</div><div class='add'>+il4965_num_of_ant(u8 m)</div><div class='add'>+{</div><div class='add'>+	return !!(m &amp; ANT_A) + !!(m &amp; ANT_B) + !!(m &amp; ANT_C);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8</div><div class='add'>+il4965_first_antenna(u8 mask)</div><div class='add'>+{</div><div class='add'>+	if (mask &amp; ANT_A)</div><div class='add'>+		return ANT_A;</div><div class='add'>+	if (mask &amp; ANT_B)</div><div class='add'>+		return ANT_B;</div><div class='add'>+	return ANT_C;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il3945_rate_scale_init - Initialize the rate scale table based on assoc info</div><div class='add'>+ *</div><div class='add'>+ * The specific throughput table used is based on the type of network</div><div class='add'>+ * the associated with, including A, B, G, and G w/ TGG protection</div><div class='add'>+ */</div><div class='add'>+extern void il3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id);</div><div class='add'>+</div><div class='add'>+/* Initialize station's rate scaling information after adding station */</div><div class='add'>+extern void il4965_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta,</div><div class='add'>+				u8 sta_id);</div><div class='add'>+extern void il3945_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta,</div><div class='add'>+				u8 sta_id);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_rate_control_register - Register the rate control algorithm callbacks</div><div class='add'>+ *</div><div class='add'>+ * Since the rate control algorithm is hardware specific, there is no need</div><div class='add'>+ * or reason to place it as a stand alone module.  The driver can call</div><div class='add'>+ * il_rate_control_register in order to register the rate control callbacks</div><div class='add'>+ * with the mac80211 subsystem.  This should be performed prior to calling</div><div class='add'>+ * ieee80211_register_hw</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+extern int il4965_rate_control_register(void);</div><div class='add'>+extern int il3945_rate_control_register(void);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * il_rate_control_unregister - Unregister the rate control callbacks</div><div class='add'>+ *</div><div class='add'>+ * This should be called after calling ieee80211_unregister_hw, but before</div><div class='add'>+ * the driver is unloaded.</div><div class='add'>+ */</div><div class='add'>+extern void il4965_rate_control_unregister(void);</div><div class='add'>+extern void il3945_rate_control_unregister(void);</div><div class='add'>+</div><div class='add'>+extern int il_power_update_mode(struct il_priv *il, bool force);</div><div class='add'>+extern void il_power_initialize(struct il_priv *il);</div><div class='add'>+</div><div class='add'>+extern u32 il_debug_level;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+/*</div><div class='add'>+ * il_get_debug_level: Return active debug level for device</div><div class='add'>+ *</div><div class='add'>+ * Using sysfs it is possible to set per device debug level. This debug</div><div class='add'>+ * level will be used if set, otherwise the global debug level which can be</div><div class='add'>+ * set via module parameter is used.</div><div class='add'>+ */</div><div class='add'>+static inline u32</div><div class='add'>+il_get_debug_level(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	if (il-&gt;debug_level)</div><div class='add'>+		return il-&gt;debug_level;</div><div class='add'>+	else</div><div class='add'>+		return il_debug_level;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline u32</div><div class='add'>+il_get_debug_level(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	return il_debug_level;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define il_print_hex_error(il, p, len)					\</div><div class='add'>+do {									\</div><div class='add'>+	print_hex_dump(KERN_ERR, "iwl data: ",				\</div><div class='add'>+		       DUMP_PREFIX_OFFSET, 16, 1, p, len, 1);		\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+#define IL_DBG(level, fmt, args...)					\</div><div class='add'>+do {									\</div><div class='add'>+	if (il_get_debug_level(il) &amp; level)				\</div><div class='add'>+		dev_printk(KERN_ERR, &amp;il-&gt;hw-&gt;wiphy-&gt;dev,		\</div><div class='add'>+			 "%c %s " fmt, in_interrupt() ? 'I' : 'U',	\</div><div class='add'>+			__func__ , ## args);				\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define il_print_hex_dump(il, level, p, len)				\</div><div class='add'>+do {									\</div><div class='add'>+	if (il_get_debug_level(il) &amp; level)				\</div><div class='add'>+		print_hex_dump(KERN_DEBUG, "iwl data: ",		\</div><div class='add'>+			       DUMP_PREFIX_OFFSET, 16, 1, p, len, 1);	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define IL_DBG(level, fmt, args...)</div><div class='add'>+static inline void</div><div class='add'>+il_print_hex_dump(struct il_priv *il, int level, const void *p, u32 len)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_IWLEGACY_DEBUG */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUGFS</div><div class='add'>+int il_dbgfs_register(struct il_priv *il, const char *name);</div><div class='add'>+void il_dbgfs_unregister(struct il_priv *il);</div><div class='add'>+#else</div><div class='add'>+static inline int</div><div class='add'>+il_dbgfs_register(struct il_priv *il, const char *name)</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</div><div class='add'>+il_dbgfs_unregister(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_IWLEGACY_DEBUGFS */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * To use the debug system:</div><div class='add'>+ *</div><div class='add'>+ * If you are defining a new debug classification, simply add it to the #define</div><div class='add'>+ * list here in the form of</div><div class='add'>+ *</div><div class='add'>+ * #define IL_DL_xxxx VALUE</div><div class='add'>+ *</div><div class='add'>+ * where xxxx should be the name of the classification (for example, WEP).</div><div class='add'>+ *</div><div class='add'>+ * You then need to either add a IL_xxxx_DEBUG() macro definition for your</div><div class='add'>+ * classification, or use IL_DBG(IL_DL_xxxx, ...) whenever you want</div><div class='add'>+ * to send output to that classification.</div><div class='add'>+ *</div><div class='add'>+ * The active debug levels can be accessed via files</div><div class='add'>+ *</div><div class='add'>+ *	/sys/module/iwl4965/parameters/debug</div><div class='add'>+ *	/sys/module/iwl3945/parameters/debug</div><div class='add'>+ *	/sys/class/net/wlan0/device/debug_level</div><div class='add'>+ *</div><div class='add'>+ * when CONFIG_IWLEGACY_DEBUG=y.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* 0x0000000F - 0x00000001 */</div><div class='add'>+#define IL_DL_INFO		(1 &lt;&lt; 0)</div><div class='add'>+#define IL_DL_MAC80211		(1 &lt;&lt; 1)</div><div class='add'>+#define IL_DL_HCMD		(1 &lt;&lt; 2)</div><div class='add'>+#define IL_DL_STATE		(1 &lt;&lt; 3)</div><div class='add'>+/* 0x000000F0 - 0x00000010 */</div><div class='add'>+#define IL_DL_MACDUMP		(1 &lt;&lt; 4)</div><div class='add'>+#define IL_DL_HCMD_DUMP		(1 &lt;&lt; 5)</div><div class='add'>+#define IL_DL_EEPROM		(1 &lt;&lt; 6)</div><div class='add'>+#define IL_DL_RADIO		(1 &lt;&lt; 7)</div><div class='add'>+/* 0x00000F00 - 0x00000100 */</div><div class='add'>+#define IL_DL_POWER		(1 &lt;&lt; 8)</div><div class='add'>+#define IL_DL_TEMP		(1 &lt;&lt; 9)</div><div class='add'>+#define IL_DL_NOTIF		(1 &lt;&lt; 10)</div><div class='add'>+#define IL_DL_SCAN		(1 &lt;&lt; 11)</div><div class='add'>+/* 0x0000F000 - 0x00001000 */</div><div class='add'>+#define IL_DL_ASSOC		(1 &lt;&lt; 12)</div><div class='add'>+#define IL_DL_DROP		(1 &lt;&lt; 13)</div><div class='add'>+#define IL_DL_TXPOWER		(1 &lt;&lt; 14)</div><div class='add'>+#define IL_DL_AP		(1 &lt;&lt; 15)</div><div class='add'>+/* 0x000F0000 - 0x00010000 */</div><div class='add'>+#define IL_DL_FW		(1 &lt;&lt; 16)</div><div class='add'>+#define IL_DL_RF_KILL		(1 &lt;&lt; 17)</div><div class='add'>+#define IL_DL_FW_ERRORS		(1 &lt;&lt; 18)</div><div class='add'>+#define IL_DL_LED		(1 &lt;&lt; 19)</div><div class='add'>+/* 0x00F00000 - 0x00100000 */</div><div class='add'>+#define IL_DL_RATE		(1 &lt;&lt; 20)</div><div class='add'>+#define IL_DL_CALIB		(1 &lt;&lt; 21)</div><div class='add'>+#define IL_DL_WEP		(1 &lt;&lt; 22)</div><div class='add'>+#define IL_DL_TX		(1 &lt;&lt; 23)</div><div class='add'>+/* 0x0F000000 - 0x01000000 */</div><div class='add'>+#define IL_DL_RX		(1 &lt;&lt; 24)</div><div class='add'>+#define IL_DL_ISR		(1 &lt;&lt; 25)</div><div class='add'>+#define IL_DL_HT		(1 &lt;&lt; 26)</div><div class='add'>+/* 0xF0000000 - 0x10000000 */</div><div class='add'>+#define IL_DL_11H		(1 &lt;&lt; 28)</div><div class='add'>+#define IL_DL_STATS		(1 &lt;&lt; 29)</div><div class='add'>+#define IL_DL_TX_REPLY		(1 &lt;&lt; 30)</div><div class='add'>+#define IL_DL_QOS		(1 &lt;&lt; 31)</div><div class='add'>+</div><div class='add'>+#define D_INFO(f, a...)		IL_DBG(IL_DL_INFO, f, ## a)</div><div class='add'>+#define D_MAC80211(f, a...)	IL_DBG(IL_DL_MAC80211, f, ## a)</div><div class='add'>+#define D_MACDUMP(f, a...)	IL_DBG(IL_DL_MACDUMP, f, ## a)</div><div class='add'>+#define D_TEMP(f, a...)		IL_DBG(IL_DL_TEMP, f, ## a)</div><div class='add'>+#define D_SCAN(f, a...)		IL_DBG(IL_DL_SCAN, f, ## a)</div><div class='add'>+#define D_RX(f, a...)		IL_DBG(IL_DL_RX, f, ## a)</div><div class='add'>+#define D_TX(f, a...)		IL_DBG(IL_DL_TX, f, ## a)</div><div class='add'>+#define D_ISR(f, a...)		IL_DBG(IL_DL_ISR, f, ## a)</div><div class='add'>+#define D_LED(f, a...)		IL_DBG(IL_DL_LED, f, ## a)</div><div class='add'>+#define D_WEP(f, a...)		IL_DBG(IL_DL_WEP, f, ## a)</div><div class='add'>+#define D_HC(f, a...)		IL_DBG(IL_DL_HCMD, f, ## a)</div><div class='add'>+#define D_HC_DUMP(f, a...)	IL_DBG(IL_DL_HCMD_DUMP, f, ## a)</div><div class='add'>+#define D_EEPROM(f, a...)	IL_DBG(IL_DL_EEPROM, f, ## a)</div><div class='add'>+#define D_CALIB(f, a...)	IL_DBG(IL_DL_CALIB, f, ## a)</div><div class='add'>+#define D_FW(f, a...)		IL_DBG(IL_DL_FW, f, ## a)</div><div class='add'>+#define D_RF_KILL(f, a...)	IL_DBG(IL_DL_RF_KILL, f, ## a)</div><div class='add'>+#define D_DROP(f, a...)		IL_DBG(IL_DL_DROP, f, ## a)</div><div class='add'>+#define D_AP(f, a...)		IL_DBG(IL_DL_AP, f, ## a)</div><div class='add'>+#define D_TXPOWER(f, a...)	IL_DBG(IL_DL_TXPOWER, f, ## a)</div><div class='add'>+#define D_RATE(f, a...)		IL_DBG(IL_DL_RATE, f, ## a)</div><div class='add'>+#define D_NOTIF(f, a...)	IL_DBG(IL_DL_NOTIF, f, ## a)</div><div class='add'>+#define D_ASSOC(f, a...)	IL_DBG(IL_DL_ASSOC, f, ## a)</div><div class='add'>+#define D_HT(f, a...)		IL_DBG(IL_DL_HT, f, ## a)</div><div class='add'>+#define D_STATS(f, a...)	IL_DBG(IL_DL_STATS, f, ## a)</div><div class='add'>+#define D_TX_REPLY(f, a...)	IL_DBG(IL_DL_TX_REPLY, f, ## a)</div><div class='add'>+#define D_QOS(f, a...)		IL_DBG(IL_DL_QOS, f, ## a)</div><div class='add'>+#define D_RADIO(f, a...)	IL_DBG(IL_DL_RADIO, f, ## a)</div><div class='add'>+#define D_POWER(f, a...)	IL_DBG(IL_DL_POWER, f, ## a)</div><div class='add'>+#define D_11H(f, a...)		IL_DBG(IL_DL_11H, f, ## a)</div><div class='add'>+</div><div class='add'>+#endif /* __il_core_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-csr.h b/drivers/net/wireless/iwlegacy/csr.h<br/>index 668a9616c269..9138e15004fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-csr.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-csr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/csr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/csr.h</a></div><div class='hunk'>@@ -60,8 +60,8 @@</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='del'>-#ifndef __iwl_legacy_csr_h__</div><div class='del'>-#define __iwl_legacy_csr_h__</div><div class='add'>+#ifndef __il_csr_h__</div><div class='add'>+#define __il_csr_h__</div><div class='ctx'> /*</div><div class='ctx'>  * CSR (control and status registers)</div><div class='ctx'>  *</div><div class='hunk'>@@ -70,9 +70,9 @@</div><div class='ctx'>  * low power states due to driver-invoked device resets</div><div class='ctx'>  * (e.g. CSR_RESET_REG_FLAG_SW_RESET) or uCode-driven power-saving modes.</div><div class='ctx'>  *</div><div class='del'>- * Use iwl_write32() and iwl_read32() family to access these registers;</div><div class='add'>+ * Use _il_wr() and _il_rd() family to access these registers;</div><div class='ctx'>  * these provide simple PCI bus access, without waking up the MAC.</div><div class='del'>- * Do not use iwl_legacy_write_direct32() family for these registers;</div><div class='add'>+ * Do not use il_wr() family for these registers;</div><div class='ctx'>  * no need to "grab nic access" via CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ.</div><div class='ctx'>  * The MAC (uCode processor, etc.) does not need to be powered up for accessing</div><div class='ctx'>  * the CSR registers.</div><div class='hunk'>@@ -82,16 +82,16 @@</div><div class='ctx'>  */</div><div class='ctx'> #define CSR_BASE    (0x000)</div><div class='ctx'> </div><div class='del'>-#define CSR_HW_IF_CONFIG_REG    (CSR_BASE+0x000) /* hardware interface config */</div><div class='del'>-#define CSR_INT_COALESCING      (CSR_BASE+0x004) /* accum ints, 32-usec units */</div><div class='del'>-#define CSR_INT                 (CSR_BASE+0x008) /* host interrupt status/ack */</div><div class='del'>-#define CSR_INT_MASK            (CSR_BASE+0x00c) /* host interrupt enable */</div><div class='del'>-#define CSR_FH_INT_STATUS       (CSR_BASE+0x010) /* busmaster int status/ack*/</div><div class='del'>-#define CSR_GPIO_IN             (CSR_BASE+0x018) /* read external chip pins */</div><div class='del'>-#define CSR_RESET               (CSR_BASE+0x020) /* busmaster enable, NMI, etc*/</div><div class='add'>+#define CSR_HW_IF_CONFIG_REG    (CSR_BASE+0x000)	/* hardware interface config */</div><div class='add'>+#define CSR_INT_COALESCING      (CSR_BASE+0x004)	/* accum ints, 32-usec units */</div><div class='add'>+#define CSR_INT                 (CSR_BASE+0x008)	/* host interrupt status/ack */</div><div class='add'>+#define CSR_INT_MASK            (CSR_BASE+0x00c)	/* host interrupt enable */</div><div class='add'>+#define CSR_FH_INT_STATUS       (CSR_BASE+0x010)	/* busmaster int status/ack */</div><div class='add'>+#define CSR_GPIO_IN             (CSR_BASE+0x018)	/* read external chip pins */</div><div class='add'>+#define CSR_RESET               (CSR_BASE+0x020)	/* busmaster enable, NMI, etc */</div><div class='ctx'> #define CSR_GP_CNTRL            (CSR_BASE+0x024)</div><div class='ctx'> </div><div class='del'>-/* 2nd byte of CSR_INT_COALESCING, not accessible via iwl_write32()! */</div><div class='add'>+/* 2nd byte of CSR_INT_COALESCING, not accessible via _il_wr()! */</div><div class='ctx'> #define CSR_INT_PERIODIC_REG	(CSR_BASE+0x005)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -166,26 +166,26 @@</div><div class='ctx'> </div><div class='ctx'> #define CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A	(0x00080000)</div><div class='ctx'> #define CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM	(0x00200000)</div><div class='del'>-#define CSR_HW_IF_CONFIG_REG_BIT_NIC_READY	(0x00400000) /* PCI_OWN_SEM */</div><div class='del'>-#define CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE (0x02000000) /* ME_OWN */</div><div class='del'>-#define CSR_HW_IF_CONFIG_REG_PREPARE		  (0x08000000) /* WAKE_ME */</div><div class='add'>+#define CSR_HW_IF_CONFIG_REG_BIT_NIC_READY	(0x00400000)	/* PCI_OWN_SEM */</div><div class='add'>+#define CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE (0x02000000)	/* ME_OWN */</div><div class='add'>+#define CSR_HW_IF_CONFIG_REG_PREPARE		  (0x08000000)	/* WAKE_ME */</div><div class='ctx'> </div><div class='del'>-#define CSR_INT_PERIODIC_DIS			(0x00) /* disable periodic int*/</div><div class='del'>-#define CSR_INT_PERIODIC_ENA			(0xFF) /* 255*32 usec ~ 8 msec*/</div><div class='add'>+#define CSR_INT_PERIODIC_DIS			(0x00)	/* disable periodic int */</div><div class='add'>+#define CSR_INT_PERIODIC_ENA			(0xFF)	/* 255*32 usec ~ 8 msec */</div><div class='ctx'> </div><div class='ctx'> /* interrupt flags in INTA, set by uCode or hardware (e.g. dma),</div><div class='ctx'>  * acknowledged (reset) by host writing "1" to flagged bits. */</div><div class='del'>-#define CSR_INT_BIT_FH_RX        (1 &lt;&lt; 31) /* Rx DMA, cmd responses, FH_INT[17:16] */</div><div class='del'>-#define CSR_INT_BIT_HW_ERR       (1 &lt;&lt; 29) /* DMA hardware error FH_INT[31] */</div><div class='del'>-#define CSR_INT_BIT_RX_PERIODIC	 (1 &lt;&lt; 28) /* Rx periodic */</div><div class='del'>-#define CSR_INT_BIT_FH_TX        (1 &lt;&lt; 27) /* Tx DMA FH_INT[1:0] */</div><div class='del'>-#define CSR_INT_BIT_SCD          (1 &lt;&lt; 26) /* TXQ pointer advanced */</div><div class='del'>-#define CSR_INT_BIT_SW_ERR       (1 &lt;&lt; 25) /* uCode error */</div><div class='del'>-#define CSR_INT_BIT_RF_KILL      (1 &lt;&lt; 7)  /* HW RFKILL switch GP_CNTRL[27] toggled */</div><div class='del'>-#define CSR_INT_BIT_CT_KILL      (1 &lt;&lt; 6)  /* Critical temp (chip too hot) rfkill */</div><div class='del'>-#define CSR_INT_BIT_SW_RX        (1 &lt;&lt; 3)  /* Rx, command responses, 3945 */</div><div class='del'>-#define CSR_INT_BIT_WAKEUP       (1 &lt;&lt; 1)  /* NIC controller waking up (pwr mgmt) */</div><div class='del'>-#define CSR_INT_BIT_ALIVE        (1 &lt;&lt; 0)  /* uCode interrupts once it initializes */</div><div class='add'>+#define CSR_INT_BIT_FH_RX        (1 &lt;&lt; 31)	/* Rx DMA, cmd responses, FH_INT[17:16] */</div><div class='add'>+#define CSR_INT_BIT_HW_ERR       (1 &lt;&lt; 29)	/* DMA hardware error FH_INT[31] */</div><div class='add'>+#define CSR_INT_BIT_RX_PERIODIC	 (1 &lt;&lt; 28)	/* Rx periodic */</div><div class='add'>+#define CSR_INT_BIT_FH_TX        (1 &lt;&lt; 27)	/* Tx DMA FH_INT[1:0] */</div><div class='add'>+#define CSR_INT_BIT_SCD          (1 &lt;&lt; 26)	/* TXQ pointer advanced */</div><div class='add'>+#define CSR_INT_BIT_SW_ERR       (1 &lt;&lt; 25)	/* uCode error */</div><div class='add'>+#define CSR_INT_BIT_RF_KILL      (1 &lt;&lt; 7)	/* HW RFKILL switch GP_CNTRL[27] toggled */</div><div class='add'>+#define CSR_INT_BIT_CT_KILL      (1 &lt;&lt; 6)	/* Critical temp (chip too hot) rfkill */</div><div class='add'>+#define CSR_INT_BIT_SW_RX        (1 &lt;&lt; 3)	/* Rx, command responses, 3945 */</div><div class='add'>+#define CSR_INT_BIT_WAKEUP       (1 &lt;&lt; 1)	/* NIC controller waking up (pwr mgmt) */</div><div class='add'>+#define CSR_INT_BIT_ALIVE        (1 &lt;&lt; 0)	/* uCode interrupts once it initializes */</div><div class='ctx'> </div><div class='ctx'> #define CSR_INI_SET_MASK	(CSR_INT_BIT_FH_RX   | \</div><div class='ctx'> 				 CSR_INT_BIT_HW_ERR  | \</div><div class='hunk'>@@ -197,21 +197,20 @@</div><div class='ctx'> 				 CSR_INT_BIT_ALIVE)</div><div class='ctx'> </div><div class='ctx'> /* interrupt flags in FH (flow handler) (PCI busmaster DMA) */</div><div class='del'>-#define CSR_FH_INT_BIT_ERR       (1 &lt;&lt; 31) /* Error */</div><div class='del'>-#define CSR_FH_INT_BIT_HI_PRIOR  (1 &lt;&lt; 30) /* High priority Rx, bypass coalescing */</div><div class='del'>-#define CSR39_FH_INT_BIT_RX_CHNL2  (1 &lt;&lt; 18) /* Rx channel 2 (3945 only) */</div><div class='del'>-#define CSR_FH_INT_BIT_RX_CHNL1  (1 &lt;&lt; 17) /* Rx channel 1 */</div><div class='del'>-#define CSR_FH_INT_BIT_RX_CHNL0  (1 &lt;&lt; 16) /* Rx channel 0 */</div><div class='del'>-#define CSR39_FH_INT_BIT_TX_CHNL6  (1 &lt;&lt; 6)  /* Tx channel 6 (3945 only) */</div><div class='del'>-#define CSR_FH_INT_BIT_TX_CHNL1  (1 &lt;&lt; 1)  /* Tx channel 1 */</div><div class='del'>-#define CSR_FH_INT_BIT_TX_CHNL0  (1 &lt;&lt; 0)  /* Tx channel 0 */</div><div class='add'>+#define CSR_FH_INT_BIT_ERR       (1 &lt;&lt; 31)	/* Error */</div><div class='add'>+#define CSR_FH_INT_BIT_HI_PRIOR  (1 &lt;&lt; 30)	/* High priority Rx, bypass coalescing */</div><div class='add'>+#define CSR39_FH_INT_BIT_RX_CHNL2  (1 &lt;&lt; 18)	/* Rx channel 2 (3945 only) */</div><div class='add'>+#define CSR_FH_INT_BIT_RX_CHNL1  (1 &lt;&lt; 17)	/* Rx channel 1 */</div><div class='add'>+#define CSR_FH_INT_BIT_RX_CHNL0  (1 &lt;&lt; 16)	/* Rx channel 0 */</div><div class='add'>+#define CSR39_FH_INT_BIT_TX_CHNL6  (1 &lt;&lt; 6)	/* Tx channel 6 (3945 only) */</div><div class='add'>+#define CSR_FH_INT_BIT_TX_CHNL1  (1 &lt;&lt; 1)	/* Tx channel 1 */</div><div class='add'>+#define CSR_FH_INT_BIT_TX_CHNL0  (1 &lt;&lt; 0)	/* Tx channel 0 */</div><div class='ctx'> </div><div class='ctx'> #define CSR39_FH_INT_RX_MASK	(CSR_FH_INT_BIT_HI_PRIOR | \</div><div class='ctx'> 				 CSR39_FH_INT_BIT_RX_CHNL2 | \</div><div class='ctx'> 				 CSR_FH_INT_BIT_RX_CHNL1 | \</div><div class='ctx'> 				 CSR_FH_INT_BIT_RX_CHNL0)</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #define CSR39_FH_INT_TX_MASK	(CSR39_FH_INT_BIT_TX_CHNL6 | \</div><div class='ctx'> 				 CSR_FH_INT_BIT_TX_CHNL1 | \</div><div class='ctx'> 				 CSR_FH_INT_BIT_TX_CHNL0)</div><div class='hunk'>@@ -285,7 +284,6 @@</div><div class='ctx'> #define CSR_GP_CNTRL_REG_FLAG_MAC_POWER_SAVE         (0x04000000)</div><div class='ctx'> #define CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW          (0x08000000)</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* EEPROM REG */</div><div class='ctx'> #define CSR_EEPROM_REG_READ_VALID_MSK	(0x00000001)</div><div class='ctx'> #define CSR_EEPROM_REG_BIT_CMD		(0x00000002)</div><div class='hunk'>@@ -293,19 +291,18 @@</div><div class='ctx'> #define CSR_EEPROM_REG_MSK_DATA		(0xFFFF0000)</div><div class='ctx'> </div><div class='ctx'> /* EEPROM GP */</div><div class='del'>-#define CSR_EEPROM_GP_VALID_MSK		(0x00000007) /* signature */</div><div class='add'>+#define CSR_EEPROM_GP_VALID_MSK		(0x00000007)	/* signature */</div><div class='ctx'> #define CSR_EEPROM_GP_IF_OWNER_MSK	(0x00000180)</div><div class='ctx'> #define CSR_EEPROM_GP_GOOD_SIG_EEP_LESS_THAN_4K		(0x00000002)</div><div class='ctx'> #define CSR_EEPROM_GP_GOOD_SIG_EEP_MORE_THAN_4K		(0x00000004)</div><div class='ctx'> </div><div class='ctx'> /* GP REG */</div><div class='del'>-#define CSR_GP_REG_POWER_SAVE_STATUS_MSK            (0x03000000) /* bit 24/25 */</div><div class='add'>+#define CSR_GP_REG_POWER_SAVE_STATUS_MSK            (0x03000000)	/* bit 24/25 */</div><div class='ctx'> #define CSR_GP_REG_NO_POWER_SAVE            (0x00000000)</div><div class='ctx'> #define CSR_GP_REG_MAC_POWER_SAVE           (0x01000000)</div><div class='ctx'> #define CSR_GP_REG_PHY_POWER_SAVE           (0x02000000)</div><div class='ctx'> #define CSR_GP_REG_POWER_SAVE_ERROR         (0x03000000)</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* CSR GIO */</div><div class='ctx'> #define CSR_GIO_REG_VAL_L0S_ENABLED	(0x00000002)</div><div class='ctx'> </div><div class='hunk'>@@ -357,7 +354,7 @@</div><div class='ctx'> /* HPET MEM debug */</div><div class='ctx'> #define CSR_DBG_HPET_MEM_REG_VAL	(0xFFFF0000)</div><div class='ctx'> </div><div class='del'>-/* DRAM INT TABLE */</div><div class='add'>+/* DRAM INT TBL */</div><div class='ctx'> #define CSR_DRAM_INT_TBL_ENABLE		(1 &lt;&lt; 31)</div><div class='ctx'> #define CSR_DRAM_INIT_TBL_WRAP_CHECK	(1 &lt;&lt; 27)</div><div class='ctx'> </div><div class='hunk'>@@ -368,13 +365,13 @@</div><div class='ctx'>  * to indirectly access device's internal memory or registers that</div><div class='ctx'>  * may be powered-down.</div><div class='ctx'>  *</div><div class='del'>- * Use iwl_legacy_write_direct32()/iwl_legacy_read_direct32() family</div><div class='add'>+ * Use il_wr()/il_rd() family</div><div class='ctx'>  * for these registers;</div><div class='ctx'>  * host must "grab nic access" via CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ</div><div class='ctx'>  * to make sure the MAC (uCode processor, etc.) is powered up for accessing</div><div class='ctx'>  * internal resources.</div><div class='ctx'>  *</div><div class='del'>- * Do not use iwl_write32()/iwl_read32() family to access these registers;</div><div class='add'>+ * Do not use _il_wr()/_il_rd() family to access these registers;</div><div class='ctx'>  * these provide only simple PCI bus access, without waking up the MAC.</div><div class='ctx'>  */</div><div class='ctx'> #define HBUS_BASE	(0x400)</div><div class='hunk'>@@ -411,12 +408,12 @@</div><div class='ctx'> #define HBUS_TARG_PRPH_RDAT     (HBUS_BASE+0x050)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Per-Tx-queue write pointer (index, really!)</div><div class='del'>- * Indicates index to next TFD that driver will fill (1 past latest filled).</div><div class='add'>+ * Per-Tx-queue write pointer (idx, really!)</div><div class='add'>+ * Indicates idx to next TFD that driver will fill (1 past latest filled).</div><div class='ctx'>  * Bit usage:</div><div class='del'>- *  0-7:  queue write index</div><div class='add'>+ *  0-7:  queue write idx</div><div class='ctx'>  * 11-8:  queue selector</div><div class='ctx'>  */</div><div class='ctx'> #define HBUS_TARG_WRPTR         (HBUS_BASE+0x060)</div><div class='ctx'> </div><div class='del'>-#endif /* !__iwl_legacy_csr_h__ */</div><div class='add'>+#endif /* !__il_csr_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/debug.c b/drivers/net/wireless/iwlegacy/debug.c<br/>new file mode 100644<br/>index 000000000000..b1b8926a9c7b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/debug.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/debug.c</a></div><div class='hunk'>@@ -0,0 +1,1411 @@</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * GPL LICENSE SUMMARY</div><div class='add'>+ *</div><div class='add'>+ * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.</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 version 2 of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,</div><div class='add'>+ * USA</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution</div><div class='add'>+ * in the file called LICENSE.GPL.</div><div class='add'>+ *</div><div class='add'>+ * Contact Information:</div><div class='add'>+ *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='add'>+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+#include &lt;linux/ieee80211.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+/* create and remove of files */</div><div class='add'>+#define DEBUGFS_ADD_FILE(name, parent, mode) do {			\</div><div class='add'>+	if (!debugfs_create_file(#name, mode, parent, il,		\</div><div class='add'>+			 &amp;il_dbgfs_##name##_ops))		\</div><div class='add'>+		goto err;						\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define DEBUGFS_ADD_BOOL(name, parent, ptr) do {			\</div><div class='add'>+	struct dentry *__tmp;						\</div><div class='add'>+	__tmp = debugfs_create_bool(#name, S_IWUSR | S_IRUSR,		\</div><div class='add'>+				    parent, ptr);			\</div><div class='add'>+	if (IS_ERR(__tmp) || !__tmp)					\</div><div class='add'>+		goto err;						\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define DEBUGFS_ADD_X32(name, parent, ptr) do {				\</div><div class='add'>+	struct dentry *__tmp;						\</div><div class='add'>+	__tmp = debugfs_create_x32(#name, S_IWUSR | S_IRUSR,		\</div><div class='add'>+				   parent, ptr);			\</div><div class='add'>+	if (IS_ERR(__tmp) || !__tmp)					\</div><div class='add'>+		goto err;						\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+/* file operation */</div><div class='add'>+#define DEBUGFS_READ_FUNC(name)                                         \</div><div class='add'>+static ssize_t il_dbgfs_##name##_read(struct file *file,               \</div><div class='add'>+					char __user *user_buf,          \</div><div class='add'>+					size_t count, loff_t *ppos);</div><div class='add'>+</div><div class='add'>+#define DEBUGFS_WRITE_FUNC(name)                                        \</div><div class='add'>+static ssize_t il_dbgfs_##name##_write(struct file *file,              \</div><div class='add'>+					const char __user *user_buf,    \</div><div class='add'>+					size_t count, loff_t *ppos);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+il_dbgfs_open_file_generic(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	file-&gt;private_data = inode-&gt;i_private;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DEBUGFS_READ_FILE_OPS(name)				\</div><div class='add'>+	DEBUGFS_READ_FUNC(name);				\</div><div class='add'>+static const struct file_operations il_dbgfs_##name##_ops = {	\</div><div class='add'>+	.read = il_dbgfs_##name##_read,				\</div><div class='add'>+	.open = il_dbgfs_open_file_generic,			\</div><div class='add'>+	.llseek = generic_file_llseek,				\</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DEBUGFS_WRITE_FILE_OPS(name)				\</div><div class='add'>+	DEBUGFS_WRITE_FUNC(name);				\</div><div class='add'>+static const struct file_operations il_dbgfs_##name##_ops = {	\</div><div class='add'>+	.write = il_dbgfs_##name##_write,			\</div><div class='add'>+	.open = il_dbgfs_open_file_generic,			\</div><div class='add'>+	.llseek = generic_file_llseek,				\</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DEBUGFS_READ_WRITE_FILE_OPS(name)			\</div><div class='add'>+	DEBUGFS_READ_FUNC(name);				\</div><div class='add'>+	DEBUGFS_WRITE_FUNC(name);				\</div><div class='add'>+static const struct file_operations il_dbgfs_##name##_ops = {	\</div><div class='add'>+	.write = il_dbgfs_##name##_write,			\</div><div class='add'>+	.read = il_dbgfs_##name##_read,				\</div><div class='add'>+	.open = il_dbgfs_open_file_generic,			\</div><div class='add'>+	.llseek = generic_file_llseek,				\</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il_dbgfs_tx_stats_read(struct file *file, char __user *user_buf, size_t count,</div><div class='add'>+		       loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	char *buf;</div><div class='add'>+	int pos = 0;</div><div class='add'>+</div><div class='add'>+	int cnt;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	const size_t bufsz =</div><div class='add'>+	    100 + sizeof(char) * 50 * (MANAGEMENT_MAX + CONTROL_MAX);</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'>+	pos += scnprintf(buf + pos, bufsz - pos, "Management:\n");</div><div class='add'>+	for (cnt = 0; cnt &lt; MANAGEMENT_MAX; cnt++) {</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos, "\t%25s\t\t: %u\n",</div><div class='add'>+			      il_get_mgmt_string(cnt), il-&gt;tx_stats.mgmt[cnt]);</div><div class='add'>+	}</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "Control\n");</div><div class='add'>+	for (cnt = 0; cnt &lt; CONTROL_MAX; cnt++) {</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos, "\t%25s\t\t: %u\n",</div><div class='add'>+			      il_get_ctrl_string(cnt), il-&gt;tx_stats.ctrl[cnt]);</div><div class='add'>+	}</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "Data:\n");</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "\tcnt: %u\n",</div><div class='add'>+		      il-&gt;tx_stats.data_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "\tbytes: %llu\n",</div><div class='add'>+		      il-&gt;tx_stats.data_bytes);</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</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 ssize_t</div><div class='add'>+il_dbgfs_clear_traffic_stats_write(struct file *file,</div><div class='add'>+				   const char __user *user_buf, size_t count,</div><div class='add'>+				   loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	u32 clear_flag;</div><div class='add'>+	char buf[8];</div><div class='add'>+	int buf_size;</div><div class='add'>+</div><div class='add'>+	memset(buf, 0, sizeof(buf));</div><div class='add'>+	buf_size = min(count, sizeof(buf) - 1);</div><div class='add'>+	if (copy_from_user(buf, user_buf, buf_size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (sscanf(buf, "%x", &amp;clear_flag) != 1)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	il_clear_traffic_stats(il);</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</div><div class='add'>+il_dbgfs_rx_stats_read(struct file *file, char __user *user_buf, size_t count,</div><div class='add'>+		       loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	char *buf;</div><div class='add'>+	int pos = 0;</div><div class='add'>+	int cnt;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	const size_t bufsz =</div><div class='add'>+	    100 + sizeof(char) * 50 * (MANAGEMENT_MAX + CONTROL_MAX);</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'>+	pos += scnprintf(buf + pos, bufsz - pos, "Management:\n");</div><div class='add'>+	for (cnt = 0; cnt &lt; MANAGEMENT_MAX; cnt++) {</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos, "\t%25s\t\t: %u\n",</div><div class='add'>+			      il_get_mgmt_string(cnt), il-&gt;rx_stats.mgmt[cnt]);</div><div class='add'>+	}</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "Control:\n");</div><div class='add'>+	for (cnt = 0; cnt &lt; CONTROL_MAX; cnt++) {</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos, "\t%25s\t\t: %u\n",</div><div class='add'>+			      il_get_ctrl_string(cnt), il-&gt;rx_stats.ctrl[cnt]);</div><div class='add'>+	}</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "Data:\n");</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "\tcnt: %u\n",</div><div class='add'>+		      il-&gt;rx_stats.data_cnt);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "\tbytes: %llu\n",</div><div class='add'>+		      il-&gt;rx_stats.data_bytes);</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BYTE1_MASK 0x000000ff;</div><div class='add'>+#define BYTE2_MASK 0x0000ffff;</div><div class='add'>+#define BYTE3_MASK 0x00ffffff;</div><div class='add'>+static ssize_t</div><div class='add'>+il_dbgfs_sram_read(struct file *file, char __user *user_buf, size_t count,</div><div class='add'>+		   loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	char *buf;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	int i;</div><div class='add'>+	int pos = 0;</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	size_t bufsz;</div><div class='add'>+</div><div class='add'>+	/* default is to dump the entire data segment */</div><div class='add'>+	if (!il-&gt;dbgfs_sram_offset &amp;&amp; !il-&gt;dbgfs_sram_len) {</div><div class='add'>+		il-&gt;dbgfs_sram_offset = 0x800000;</div><div class='add'>+		if (il-&gt;ucode_type == UCODE_INIT)</div><div class='add'>+			il-&gt;dbgfs_sram_len = il-&gt;ucode_init_data.len;</div><div class='add'>+		else</div><div class='add'>+			il-&gt;dbgfs_sram_len = il-&gt;ucode_data.len;</div><div class='add'>+	}</div><div class='add'>+	bufsz = 30 + il-&gt;dbgfs_sram_len * sizeof(char) * 10;</div><div class='add'>+	buf = kmalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "sram_len: 0x%x\n",</div><div class='add'>+		      il-&gt;dbgfs_sram_len);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "sram_offset: 0x%x\n",</div><div class='add'>+		      il-&gt;dbgfs_sram_offset);</div><div class='add'>+	for (i = il-&gt;dbgfs_sram_len; i &gt; 0; i -= 4) {</div><div class='add'>+		val =</div><div class='add'>+		    il_read_targ_mem(il,</div><div class='add'>+				     il-&gt;dbgfs_sram_offset +</div><div class='add'>+				     il-&gt;dbgfs_sram_len - i);</div><div class='add'>+		if (i &lt; 4) {</div><div class='add'>+			switch (i) {</div><div class='add'>+			case 1:</div><div class='add'>+				val &amp;= BYTE1_MASK;</div><div class='add'>+				break;</div><div class='add'>+			case 2:</div><div class='add'>+				val &amp;= BYTE2_MASK;</div><div class='add'>+				break;</div><div class='add'>+			case 3:</div><div class='add'>+				val &amp;= BYTE3_MASK;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (!(i % 16))</div><div class='add'>+			pos += scnprintf(buf + pos, bufsz - pos, "\n");</div><div class='add'>+		pos += scnprintf(buf + pos, bufsz - pos, "0x%08x ", val);</div><div class='add'>+	}</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "\n");</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</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 ssize_t</div><div class='add'>+il_dbgfs_sram_write(struct file *file, const char __user *user_buf,</div><div class='add'>+		    size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	char buf[64];</div><div class='add'>+	int buf_size;</div><div class='add'>+	u32 offset, len;</div><div class='add'>+</div><div class='add'>+	memset(buf, 0, sizeof(buf));</div><div class='add'>+	buf_size = min(count, sizeof(buf) - 1);</div><div class='add'>+	if (copy_from_user(buf, user_buf, buf_size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (sscanf(buf, "%x,%x", &amp;offset, &amp;len) == 2) {</div><div class='add'>+		il-&gt;dbgfs_sram_offset = offset;</div><div class='add'>+		il-&gt;dbgfs_sram_len = len;</div><div class='add'>+	} else {</div><div class='add'>+		il-&gt;dbgfs_sram_offset = 0;</div><div class='add'>+		il-&gt;dbgfs_sram_len = 0;</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</div><div class='add'>+il_dbgfs_stations_read(struct file *file, char __user *user_buf, size_t count,</div><div class='add'>+		       loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	struct il_station_entry *station;</div><div class='add'>+	int max_sta = il-&gt;hw_params.max_stations;</div><div class='add'>+	char *buf;</div><div class='add'>+	int i, j, pos = 0;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	/* Add 30 for initial string */</div><div class='add'>+	const size_t bufsz = 30 + sizeof(char) * 500 * (il-&gt;num_stations);</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "num of stations: %d\n\n",</div><div class='add'>+		      il-&gt;num_stations);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; max_sta; i++) {</div><div class='add'>+		station = &amp;il-&gt;stations[i];</div><div class='add'>+		if (!station-&gt;used)</div><div class='add'>+			continue;</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+			      "station %d - addr: %pM, flags: %#x\n", i,</div><div class='add'>+			      station-&gt;sta.sta.addr,</div><div class='add'>+			      station-&gt;sta.station_flags_msk);</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+			      "TID\tseq_num\ttxq_id\tframes\ttfds\t");</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+			      "start_idx\tbitmap\t\t\trate_n_flags\n");</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; MAX_TID_COUNT; j++) {</div><div class='add'>+			pos +=</div><div class='add'>+			    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+				      "%d:\t%#x\t%#x\t%u\t%u\t%u\t\t%#.16llx\t%#x",</div><div class='add'>+				      j, station-&gt;tid[j].seq_number,</div><div class='add'>+				      station-&gt;tid[j].agg.txq_id,</div><div class='add'>+				      station-&gt;tid[j].agg.frame_count,</div><div class='add'>+				      station-&gt;tid[j].tfds_in_queue,</div><div class='add'>+				      station-&gt;tid[j].agg.start_idx,</div><div class='add'>+				      station-&gt;tid[j].agg.bitmap,</div><div class='add'>+				      station-&gt;tid[j].agg.rate_n_flags);</div><div class='add'>+</div><div class='add'>+			if (station-&gt;tid[j].agg.wait_for_ba)</div><div class='add'>+				pos +=</div><div class='add'>+				    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+					      " - waitforba");</div><div class='add'>+			pos += scnprintf(buf + pos, bufsz - pos, "\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pos += scnprintf(buf + pos, bufsz - pos, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</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 ssize_t</div><div class='add'>+il_dbgfs_nvm_read(struct file *file, char __user *user_buf, size_t count,</div><div class='add'>+		  loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	int pos = 0, ofs = 0, buf_size = 0;</div><div class='add'>+	const u8 *ptr;</div><div class='add'>+	char *buf;</div><div class='add'>+	u16 eeprom_ver;</div><div class='add'>+	size_t eeprom_len = il-&gt;cfg-&gt;base_params-&gt;eeprom_size;</div><div class='add'>+	buf_size = 4 * eeprom_len + 256;</div><div class='add'>+</div><div class='add'>+	if (eeprom_len % 16) {</div><div class='add'>+		IL_ERR("NVM size is not multiple of 16.\n");</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptr = il-&gt;eeprom;</div><div class='add'>+	if (!ptr) {</div><div class='add'>+		IL_ERR("Invalid EEPROM memory\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 4 characters for byte 0xYY */</div><div class='add'>+	buf = kzalloc(buf_size, GFP_KERNEL);</div><div class='add'>+	if (!buf) {</div><div class='add'>+		IL_ERR("Can not allocate Buffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	eeprom_ver = il_eeprom_query16(il, EEPROM_VERSION);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, buf_size - pos, "EEPROM " "version: 0x%x\n",</div><div class='add'>+		      eeprom_ver);</div><div class='add'>+	for (ofs = 0; ofs &lt; eeprom_len; ofs += 16) {</div><div class='add'>+		pos += scnprintf(buf + pos, buf_size - pos, "0x%.4x ", ofs);</div><div class='add'>+		hex_dump_to_buffer(ptr + ofs, 16, 16, 2, buf + pos,</div><div class='add'>+				   buf_size - pos, 0);</div><div class='add'>+		pos += strlen(buf + pos);</div><div class='add'>+		if (buf_size - pos &gt; 0)</div><div class='add'>+			buf[pos++] = '\n';</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</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 ssize_t</div><div class='add'>+il_dbgfs_channels_read(struct file *file, char __user *user_buf, size_t count,</div><div class='add'>+		       loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	struct ieee80211_channel *channels = NULL;</div><div class='add'>+	const struct ieee80211_supported_band *supp_band = NULL;</div><div class='add'>+	int pos = 0, i, bufsz = PAGE_SIZE;</div><div class='add'>+	char *buf;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(S_GEO_CONFIGURED, &amp;il-&gt;status))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	if (!buf) {</div><div class='add'>+		IL_ERR("Can not allocate Buffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	supp_band = il_get_hw_mode(il, IEEE80211_BAND_2GHZ);</div><div class='add'>+	if (supp_band) {</div><div class='add'>+		channels = supp_band-&gt;channels;</div><div class='add'>+</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+			      "Displaying %d channels in 2.4GHz band 802.11bg):\n",</div><div class='add'>+			      supp_band-&gt;n_channels);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; supp_band-&gt;n_channels; i++)</div><div class='add'>+			pos +=</div><div class='add'>+			    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+				      "%d: %ddBm: BSS%s%s, %s.\n",</div><div class='add'>+				      channels[i].hw_value,</div><div class='add'>+				      channels[i].max_power,</div><div class='add'>+				      channels[i].</div><div class='add'>+				      flags &amp; IEEE80211_CHAN_RADAR ?</div><div class='add'>+				      " (IEEE 802.11h required)" : "",</div><div class='add'>+				      ((channels[i].</div><div class='add'>+					flags &amp; IEEE80211_CHAN_NO_IBSS) ||</div><div class='add'>+				       (channels[i].</div><div class='add'>+					flags &amp; IEEE80211_CHAN_RADAR)) ? "" :</div><div class='add'>+				      ", IBSS",</div><div class='add'>+				      channels[i].</div><div class='add'>+				      flags &amp; IEEE80211_CHAN_PASSIVE_SCAN ?</div><div class='add'>+				      "passive only" : "active/passive");</div><div class='add'>+	}</div><div class='add'>+	supp_band = il_get_hw_mode(il, IEEE80211_BAND_5GHZ);</div><div class='add'>+	if (supp_band) {</div><div class='add'>+		channels = supp_band-&gt;channels;</div><div class='add'>+</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+			      "Displaying %d channels in 5.2GHz band (802.11a)\n",</div><div class='add'>+			      supp_band-&gt;n_channels);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; supp_band-&gt;n_channels; i++)</div><div class='add'>+			pos +=</div><div class='add'>+			    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+				      "%d: %ddBm: BSS%s%s, %s.\n",</div><div class='add'>+				      channels[i].hw_value,</div><div class='add'>+				      channels[i].max_power,</div><div class='add'>+				      channels[i].</div><div class='add'>+				      flags &amp; IEEE80211_CHAN_RADAR ?</div><div class='add'>+				      " (IEEE 802.11h required)" : "",</div><div class='add'>+				      ((channels[i].</div><div class='add'>+					flags &amp; IEEE80211_CHAN_NO_IBSS) ||</div><div class='add'>+				       (channels[i].</div><div class='add'>+					flags &amp; IEEE80211_CHAN_RADAR)) ? "" :</div><div class='add'>+				      ", IBSS",</div><div class='add'>+				      channels[i].</div><div class='add'>+				      flags &amp; IEEE80211_CHAN_PASSIVE_SCAN ?</div><div class='add'>+				      "passive only" : "active/passive");</div><div class='add'>+	}</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</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 ssize_t</div><div class='add'>+il_dbgfs_status_read(struct file *file, char __user *user_buf, size_t count,</div><div class='add'>+		     loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	char buf[512];</div><div class='add'>+	int pos = 0;</div><div class='add'>+	const size_t bufsz = sizeof(buf);</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "S_HCMD_ACTIVE:\t %d\n",</div><div class='add'>+		      test_bit(S_HCMD_ACTIVE, &amp;il-&gt;status));</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "S_INT_ENABLED:\t %d\n",</div><div class='add'>+		      test_bit(S_INT_ENABLED, &amp;il-&gt;status));</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "S_RF_KILL_HW:\t %d\n",</div><div class='add'>+		      test_bit(S_RF_KILL_HW, &amp;il-&gt;status));</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "S_CT_KILL:\t\t %d\n",</div><div class='add'>+		      test_bit(S_CT_KILL, &amp;il-&gt;status));</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "S_INIT:\t\t %d\n",</div><div class='add'>+		      test_bit(S_INIT, &amp;il-&gt;status));</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "S_ALIVE:\t\t %d\n",</div><div class='add'>+		      test_bit(S_ALIVE, &amp;il-&gt;status));</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "S_READY:\t\t %d\n",</div><div class='add'>+		      test_bit(S_READY, &amp;il-&gt;status));</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "S_TEMPERATURE:\t %d\n",</div><div class='add'>+		      test_bit(S_TEMPERATURE, &amp;il-&gt;status));</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "S_GEO_CONFIGURED:\t %d\n",</div><div class='add'>+		      test_bit(S_GEO_CONFIGURED, &amp;il-&gt;status));</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "S_EXIT_PENDING:\t %d\n",</div><div class='add'>+		      test_bit(S_EXIT_PENDING, &amp;il-&gt;status));</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "S_STATS:\t %d\n",</div><div class='add'>+		      test_bit(S_STATS, &amp;il-&gt;status));</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "S_SCANNING:\t %d\n",</div><div class='add'>+		      test_bit(S_SCANNING, &amp;il-&gt;status));</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "S_SCAN_ABORTING:\t %d\n",</div><div class='add'>+		      test_bit(S_SCAN_ABORTING, &amp;il-&gt;status));</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "S_SCAN_HW:\t\t %d\n",</div><div class='add'>+		      test_bit(S_SCAN_HW, &amp;il-&gt;status));</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "S_POWER_PMI:\t %d\n",</div><div class='add'>+		      test_bit(S_POWER_PMI, &amp;il-&gt;status));</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "S_FW_ERROR:\t %d\n",</div><div class='add'>+		      test_bit(S_FW_ERROR, &amp;il-&gt;status));</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il_dbgfs_interrupt_read(struct file *file, char __user *user_buf, size_t count,</div><div class='add'>+			loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	int pos = 0;</div><div class='add'>+	int cnt = 0;</div><div class='add'>+	char *buf;</div><div class='add'>+	int bufsz = 24 * 64;	/* 24 items * 64 char per item */</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	if (!buf) {</div><div class='add'>+		IL_ERR("Can not allocate Buffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "Interrupt Statistics Report:\n");</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "HW Error:\t\t\t %u\n",</div><div class='add'>+		      il-&gt;isr_stats.hw);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "SW Error:\t\t\t %u\n",</div><div class='add'>+		      il-&gt;isr_stats.sw);</div><div class='add'>+	if (il-&gt;isr_stats.sw || il-&gt;isr_stats.hw) {</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+			      "\tLast Restarting Code:  0x%X\n",</div><div class='add'>+			      il-&gt;isr_stats.err_code);</div><div class='add'>+	}</div><div class='add'>+#ifdef CONFIG_IWLEGACY_DEBUG</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "Frame transmitted:\t\t %u\n",</div><div class='add'>+		      il-&gt;isr_stats.sch);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "Alive interrupt:\t\t %u\n",</div><div class='add'>+		      il-&gt;isr_stats.alive);</div><div class='add'>+#endif</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "HW RF KILL switch toggled:\t %u\n",</div><div class='add'>+		      il-&gt;isr_stats.rfkill);</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "CT KILL:\t\t\t %u\n",</div><div class='add'>+		      il-&gt;isr_stats.ctkill);</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "Wakeup Interrupt:\t\t %u\n",</div><div class='add'>+		      il-&gt;isr_stats.wakeup);</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "Rx command responses:\t\t %u\n",</div><div class='add'>+		      il-&gt;isr_stats.rx);</div><div class='add'>+	for (cnt = 0; cnt &lt; IL_CN_MAX; cnt++) {</div><div class='add'>+		if (il-&gt;isr_stats.handlers[cnt] &gt; 0)</div><div class='add'>+			pos +=</div><div class='add'>+			    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+				      "\tRx handler[%36s]:\t\t %u\n",</div><div class='add'>+				      il_get_cmd_string(cnt),</div><div class='add'>+				      il-&gt;isr_stats.handlers[cnt]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "Tx/FH interrupt:\t\t %u\n",</div><div class='add'>+		      il-&gt;isr_stats.tx);</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "Unexpected INTA:\t\t %u\n",</div><div class='add'>+		      il-&gt;isr_stats.unhandled);</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</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 ssize_t</div><div class='add'>+il_dbgfs_interrupt_write(struct file *file, const char __user *user_buf,</div><div class='add'>+			 size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	char buf[8];</div><div class='add'>+	int buf_size;</div><div class='add'>+	u32 reset_flag;</div><div class='add'>+</div><div class='add'>+	memset(buf, 0, sizeof(buf));</div><div class='add'>+	buf_size = min(count, sizeof(buf) - 1);</div><div class='add'>+	if (copy_from_user(buf, user_buf, buf_size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (sscanf(buf, "%x", &amp;reset_flag) != 1)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (reset_flag == 0)</div><div class='add'>+		il_clear_isr_stats(il);</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</div><div class='add'>+il_dbgfs_qos_read(struct file *file, char __user *user_buf, size_t count,</div><div class='add'>+		  loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	struct il_rxon_context *ctx = &amp;il-&gt;ctx;</div><div class='add'>+	int pos = 0, i;</div><div class='add'>+	char buf[256];</div><div class='add'>+	const size_t bufsz = sizeof(buf);</div><div class='add'>+</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n", ctx-&gt;ctxid);</div><div class='add'>+	for (i = 0; i &lt; AC_NUM; i++) {</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+			      "\tcw_min\tcw_max\taifsn\ttxop\n");</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+			      "AC[%d]\t%u\t%u\t%u\t%u\n", i,</div><div class='add'>+			      ctx-&gt;qos_data.def_qos_parm.ac[i].cw_min,</div><div class='add'>+			      ctx-&gt;qos_data.def_qos_parm.ac[i].cw_max,</div><div class='add'>+			      ctx-&gt;qos_data.def_qos_parm.ac[i].aifsn,</div><div class='add'>+			      ctx-&gt;qos_data.def_qos_parm.ac[i].edca_txop);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il_dbgfs_disable_ht40_write(struct file *file, const char __user *user_buf,</div><div class='add'>+			    size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	char buf[8];</div><div class='add'>+	int buf_size;</div><div class='add'>+	int ht40;</div><div class='add'>+</div><div class='add'>+	memset(buf, 0, sizeof(buf));</div><div class='add'>+	buf_size = min(count, sizeof(buf) - 1);</div><div class='add'>+	if (copy_from_user(buf, user_buf, buf_size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (sscanf(buf, "%d", &amp;ht40) != 1)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (!il_is_any_associated(il))</div><div class='add'>+		il-&gt;disable_ht40 = ht40 ? true : false;</div><div class='add'>+	else {</div><div class='add'>+		IL_ERR("Sta associated with AP - "</div><div class='add'>+		       "Change to 40MHz channel support is not allowed\n");</div><div class='add'>+		return -EINVAL;</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</div><div class='add'>+il_dbgfs_disable_ht40_read(struct file *file, char __user *user_buf,</div><div class='add'>+			   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	char buf[100];</div><div class='add'>+	int pos = 0;</div><div class='add'>+	const size_t bufsz = sizeof(buf);</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "11n 40MHz Mode: %s\n",</div><div class='add'>+		      il-&gt;disable_ht40 ? "Disabled" : "Enabled");</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEBUGFS_READ_WRITE_FILE_OPS(sram);</div><div class='add'>+DEBUGFS_READ_FILE_OPS(nvm);</div><div class='add'>+DEBUGFS_READ_FILE_OPS(stations);</div><div class='add'>+DEBUGFS_READ_FILE_OPS(channels);</div><div class='add'>+DEBUGFS_READ_FILE_OPS(status);</div><div class='add'>+DEBUGFS_READ_WRITE_FILE_OPS(interrupt);</div><div class='add'>+DEBUGFS_READ_FILE_OPS(qos);</div><div class='add'>+DEBUGFS_READ_WRITE_FILE_OPS(disable_ht40);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il_dbgfs_traffic_log_read(struct file *file, char __user *user_buf,</div><div class='add'>+			  size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	int pos = 0, ofs = 0;</div><div class='add'>+	int cnt = 0, entry;</div><div class='add'>+	struct il_tx_queue *txq;</div><div class='add'>+	struct il_queue *q;</div><div class='add'>+	struct il_rx_queue *rxq = &amp;il-&gt;rxq;</div><div class='add'>+	char *buf;</div><div class='add'>+	int bufsz =</div><div class='add'>+	    ((IL_TRAFFIC_ENTRIES * IL_TRAFFIC_ENTRY_SIZE * 64) * 2) +</div><div class='add'>+	    (il-&gt;cfg-&gt;base_params-&gt;num_of_queues * 32 * 8) + 400;</div><div class='add'>+	const u8 *ptr;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;txq) {</div><div class='add'>+		IL_ERR("txq not ready\n");</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	if (!buf) {</div><div class='add'>+		IL_ERR("Can not allocate buffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "Tx Queue\n");</div><div class='add'>+	for (cnt = 0; cnt &lt; il-&gt;hw_params.max_txq_num; cnt++) {</div><div class='add'>+		txq = &amp;il-&gt;txq[cnt];</div><div class='add'>+		q = &amp;txq-&gt;q;</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+			      "q[%d]: read_ptr: %u, write_ptr: %u\n", cnt,</div><div class='add'>+			      q-&gt;read_ptr, q-&gt;write_ptr);</div><div class='add'>+	}</div><div class='add'>+	if (il-&gt;tx_traffic &amp;&amp; (il_debug_level &amp; IL_DL_TX)) {</div><div class='add'>+		ptr = il-&gt;tx_traffic;</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos, "Tx Traffic idx: %u\n",</div><div class='add'>+			      il-&gt;tx_traffic_idx);</div><div class='add'>+		for (cnt = 0, ofs = 0; cnt &lt; IL_TRAFFIC_ENTRIES; cnt++) {</div><div class='add'>+			for (entry = 0; entry &lt; IL_TRAFFIC_ENTRY_SIZE / 16;</div><div class='add'>+			     entry++, ofs += 16) {</div><div class='add'>+				pos +=</div><div class='add'>+				    scnprintf(buf + pos, bufsz - pos, "0x%.4x ",</div><div class='add'>+					      ofs);</div><div class='add'>+				hex_dump_to_buffer(ptr + ofs, 16, 16, 2,</div><div class='add'>+						   buf + pos, bufsz - pos, 0);</div><div class='add'>+				pos += strlen(buf + pos);</div><div class='add'>+				if (bufsz - pos &gt; 0)</div><div class='add'>+					buf[pos++] = '\n';</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "Rx Queue\n");</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "read: %u, write: %u\n",</div><div class='add'>+		      rxq-&gt;read, rxq-&gt;write);</div><div class='add'>+</div><div class='add'>+	if (il-&gt;rx_traffic &amp;&amp; (il_debug_level &amp; IL_DL_RX)) {</div><div class='add'>+		ptr = il-&gt;rx_traffic;</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos, "Rx Traffic idx: %u\n",</div><div class='add'>+			      il-&gt;rx_traffic_idx);</div><div class='add'>+		for (cnt = 0, ofs = 0; cnt &lt; IL_TRAFFIC_ENTRIES; cnt++) {</div><div class='add'>+			for (entry = 0; entry &lt; IL_TRAFFIC_ENTRY_SIZE / 16;</div><div class='add'>+			     entry++, ofs += 16) {</div><div class='add'>+				pos +=</div><div class='add'>+				    scnprintf(buf + pos, bufsz - pos, "0x%.4x ",</div><div class='add'>+					      ofs);</div><div class='add'>+				hex_dump_to_buffer(ptr + ofs, 16, 16, 2,</div><div class='add'>+						   buf + pos, bufsz - pos, 0);</div><div class='add'>+				pos += strlen(buf + pos);</div><div class='add'>+				if (bufsz - pos &gt; 0)</div><div class='add'>+					buf[pos++] = '\n';</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</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 ssize_t</div><div class='add'>+il_dbgfs_traffic_log_write(struct file *file, const char __user *user_buf,</div><div class='add'>+			   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	char buf[8];</div><div class='add'>+	int buf_size;</div><div class='add'>+	int traffic_log;</div><div class='add'>+</div><div class='add'>+	memset(buf, 0, sizeof(buf));</div><div class='add'>+	buf_size = min(count, sizeof(buf) - 1);</div><div class='add'>+	if (copy_from_user(buf, user_buf, buf_size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (sscanf(buf, "%d", &amp;traffic_log) != 1)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (traffic_log == 0)</div><div class='add'>+		il_reset_traffic_log(il);</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</div><div class='add'>+il_dbgfs_tx_queue_read(struct file *file, char __user *user_buf, size_t count,</div><div class='add'>+		       loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	struct il_tx_queue *txq;</div><div class='add'>+	struct il_queue *q;</div><div class='add'>+	char *buf;</div><div class='add'>+	int pos = 0;</div><div class='add'>+	int cnt;</div><div class='add'>+	int ret;</div><div class='add'>+	const size_t bufsz =</div><div class='add'>+	    sizeof(char) * 64 * il-&gt;cfg-&gt;base_params-&gt;num_of_queues;</div><div class='add'>+</div><div class='add'>+	if (!il-&gt;txq) {</div><div class='add'>+		IL_ERR("txq not ready\n");</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</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'>+	for (cnt = 0; cnt &lt; il-&gt;hw_params.max_txq_num; cnt++) {</div><div class='add'>+		txq = &amp;il-&gt;txq[cnt];</div><div class='add'>+		q = &amp;txq-&gt;q;</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+			      "hwq %.2d: read=%u write=%u stop=%d"</div><div class='add'>+			      " swq_id=%#.2x (ac %d/hwq %d)\n", cnt,</div><div class='add'>+			      q-&gt;read_ptr, q-&gt;write_ptr,</div><div class='add'>+			      !!test_bit(cnt, il-&gt;queue_stopped),</div><div class='add'>+			      txq-&gt;swq_id, txq-&gt;swq_id &amp; 3,</div><div class='add'>+			      (txq-&gt;swq_id &gt;&gt; 2) &amp; 0x1f);</div><div class='add'>+		if (cnt &gt;= 4)</div><div class='add'>+			continue;</div><div class='add'>+		/* for the ACs, display the stop count too */</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+			      "        stop-count: %d\n",</div><div class='add'>+			      atomic_read(&amp;il-&gt;queue_stop_count[cnt]));</div><div class='add'>+	}</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</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 ssize_t</div><div class='add'>+il_dbgfs_rx_queue_read(struct file *file, char __user *user_buf, size_t count,</div><div class='add'>+		       loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	struct il_rx_queue *rxq = &amp;il-&gt;rxq;</div><div class='add'>+	char buf[256];</div><div class='add'>+	int pos = 0;</div><div class='add'>+	const size_t bufsz = sizeof(buf);</div><div class='add'>+</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "read: %u\n", rxq-&gt;read);</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "write: %u\n", rxq-&gt;write);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "free_count: %u\n",</div><div class='add'>+		      rxq-&gt;free_count);</div><div class='add'>+	if (rxq-&gt;rb_stts) {</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos, "closed_rb_num: %u\n",</div><div class='add'>+			      le16_to_cpu(rxq-&gt;rb_stts-&gt;</div><div class='add'>+					  closed_rb_num) &amp; 0x0FFF);</div><div class='add'>+	} else {</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+			      "closed_rb_num: Not Allocated\n");</div><div class='add'>+	}</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il_dbgfs_ucode_rx_stats_read(struct file *file, char __user *user_buf,</div><div class='add'>+			     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	return il-&gt;cfg-&gt;ops-&gt;lib-&gt;debugfs_ops.rx_stats_read(file, user_buf,</div><div class='add'>+							    count, ppos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il_dbgfs_ucode_tx_stats_read(struct file *file, char __user *user_buf,</div><div class='add'>+			     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	return il-&gt;cfg-&gt;ops-&gt;lib-&gt;debugfs_ops.tx_stats_read(file, user_buf,</div><div class='add'>+							    count, ppos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il_dbgfs_ucode_general_stats_read(struct file *file, char __user *user_buf,</div><div class='add'>+				  size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	return il-&gt;cfg-&gt;ops-&gt;lib-&gt;debugfs_ops.general_stats_read(file, user_buf,</div><div class='add'>+								 count, ppos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il_dbgfs_sensitivity_read(struct file *file, char __user *user_buf,</div><div class='add'>+			  size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	int pos = 0;</div><div class='add'>+	int cnt = 0;</div><div class='add'>+	char *buf;</div><div class='add'>+	int bufsz = sizeof(struct il_sensitivity_data) * 4 + 100;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	struct il_sensitivity_data *data;</div><div class='add'>+</div><div class='add'>+	data = &amp;il-&gt;sensitivity_data;</div><div class='add'>+	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	if (!buf) {</div><div class='add'>+		IL_ERR("Can not allocate Buffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "auto_corr_ofdm:\t\t\t %u\n",</div><div class='add'>+		      data-&gt;auto_corr_ofdm);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "auto_corr_ofdm_mrc:\t\t %u\n",</div><div class='add'>+		      data-&gt;auto_corr_ofdm_mrc);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "auto_corr_ofdm_x1:\t\t %u\n",</div><div class='add'>+		      data-&gt;auto_corr_ofdm_x1);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "auto_corr_ofdm_mrc_x1:\t\t %u\n",</div><div class='add'>+		      data-&gt;auto_corr_ofdm_mrc_x1);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "auto_corr_cck:\t\t\t %u\n",</div><div class='add'>+		      data-&gt;auto_corr_cck);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "auto_corr_cck_mrc:\t\t %u\n",</div><div class='add'>+		      data-&gt;auto_corr_cck_mrc);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "last_bad_plcp_cnt_ofdm:\t\t %u\n",</div><div class='add'>+		      data-&gt;last_bad_plcp_cnt_ofdm);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "last_fa_cnt_ofdm:\t\t %u\n",</div><div class='add'>+		      data-&gt;last_fa_cnt_ofdm);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "last_bad_plcp_cnt_cck:\t\t %u\n",</div><div class='add'>+		      data-&gt;last_bad_plcp_cnt_cck);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "last_fa_cnt_cck:\t\t %u\n",</div><div class='add'>+		      data-&gt;last_fa_cnt_cck);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "nrg_curr_state:\t\t\t %u\n",</div><div class='add'>+		      data-&gt;nrg_curr_state);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "nrg_prev_state:\t\t\t %u\n",</div><div class='add'>+		      data-&gt;nrg_prev_state);</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "nrg_value:\t\t\t");</div><div class='add'>+	for (cnt = 0; cnt &lt; 10; cnt++) {</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos, " %u",</div><div class='add'>+			      data-&gt;nrg_value[cnt]);</div><div class='add'>+	}</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "\n");</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "nrg_silence_rssi:\t\t");</div><div class='add'>+	for (cnt = 0; cnt &lt; NRG_NUM_PREV_STAT_L; cnt++) {</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos, " %u",</div><div class='add'>+			      data-&gt;nrg_silence_rssi[cnt]);</div><div class='add'>+	}</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "\n");</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "nrg_silence_ref:\t\t %u\n",</div><div class='add'>+		      data-&gt;nrg_silence_ref);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "nrg_energy_idx:\t\t\t %u\n",</div><div class='add'>+		      data-&gt;nrg_energy_idx);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "nrg_silence_idx:\t\t %u\n",</div><div class='add'>+		      data-&gt;nrg_silence_idx);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "nrg_th_cck:\t\t\t %u\n",</div><div class='add'>+		      data-&gt;nrg_th_cck);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "nrg_auto_corr_silence_diff:\t %u\n",</div><div class='add'>+		      data-&gt;nrg_auto_corr_silence_diff);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "num_in_cck_no_fa:\t\t %u\n",</div><div class='add'>+		      data-&gt;num_in_cck_no_fa);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "nrg_th_ofdm:\t\t\t %u\n",</div><div class='add'>+		      data-&gt;nrg_th_ofdm);</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</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 ssize_t</div><div class='add'>+il_dbgfs_chain_noise_read(struct file *file, char __user *user_buf,</div><div class='add'>+			  size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	int pos = 0;</div><div class='add'>+	int cnt = 0;</div><div class='add'>+	char *buf;</div><div class='add'>+	int bufsz = sizeof(struct il_chain_noise_data) * 4 + 100;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	struct il_chain_noise_data *data;</div><div class='add'>+</div><div class='add'>+	data = &amp;il-&gt;chain_noise_data;</div><div class='add'>+	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='add'>+	if (!buf) {</div><div class='add'>+		IL_ERR("Can not allocate Buffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "active_chains:\t\t\t %u\n",</div><div class='add'>+		      data-&gt;active_chains);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "chain_noise_a:\t\t\t %u\n",</div><div class='add'>+		      data-&gt;chain_noise_a);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "chain_noise_b:\t\t\t %u\n",</div><div class='add'>+		      data-&gt;chain_noise_b);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "chain_noise_c:\t\t\t %u\n",</div><div class='add'>+		      data-&gt;chain_noise_c);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "chain_signal_a:\t\t\t %u\n",</div><div class='add'>+		      data-&gt;chain_signal_a);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "chain_signal_b:\t\t\t %u\n",</div><div class='add'>+		      data-&gt;chain_signal_b);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "chain_signal_c:\t\t\t %u\n",</div><div class='add'>+		      data-&gt;chain_signal_c);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "beacon_count:\t\t\t %u\n",</div><div class='add'>+		      data-&gt;beacon_count);</div><div class='add'>+</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "disconn_array:\t\t\t");</div><div class='add'>+	for (cnt = 0; cnt &lt; NUM_RX_CHAINS; cnt++) {</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos, " %u",</div><div class='add'>+			      data-&gt;disconn_array[cnt]);</div><div class='add'>+	}</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "\n");</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "delta_gain_code:\t\t");</div><div class='add'>+	for (cnt = 0; cnt &lt; NUM_RX_CHAINS; cnt++) {</div><div class='add'>+		pos +=</div><div class='add'>+		    scnprintf(buf + pos, bufsz - pos, " %u",</div><div class='add'>+			      data-&gt;delta_gain_code[cnt]);</div><div class='add'>+	}</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "\n");</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "radio_write:\t\t\t %u\n",</div><div class='add'>+		      data-&gt;radio_write);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "state:\t\t\t\t %u\n",</div><div class='add'>+		      data-&gt;state);</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</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 ssize_t</div><div class='add'>+il_dbgfs_power_save_status_read(struct file *file, char __user *user_buf,</div><div class='add'>+				size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	char buf[60];</div><div class='add'>+	int pos = 0;</div><div class='add'>+	const size_t bufsz = sizeof(buf);</div><div class='add'>+	u32 pwrsave_status;</div><div class='add'>+</div><div class='add'>+	pwrsave_status =</div><div class='add'>+	    _il_rd(il, CSR_GP_CNTRL) &amp; CSR_GP_REG_POWER_SAVE_STATUS_MSK;</div><div class='add'>+</div><div class='add'>+	pos += scnprintf(buf + pos, bufsz - pos, "Power Save Status: ");</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "%s\n",</div><div class='add'>+		      (pwrsave_status == CSR_GP_REG_NO_POWER_SAVE) ? "none" :</div><div class='add'>+		      (pwrsave_status == CSR_GP_REG_MAC_POWER_SAVE) ? "MAC" :</div><div class='add'>+		      (pwrsave_status == CSR_GP_REG_PHY_POWER_SAVE) ? "PHY" :</div><div class='add'>+		      "error");</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il_dbgfs_clear_ucode_stats_write(struct file *file,</div><div class='add'>+				 const char __user *user_buf, size_t count,</div><div class='add'>+				 loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	char buf[8];</div><div class='add'>+	int buf_size;</div><div class='add'>+	int clear;</div><div class='add'>+</div><div class='add'>+	memset(buf, 0, sizeof(buf));</div><div class='add'>+	buf_size = min(count, sizeof(buf) - 1);</div><div class='add'>+	if (copy_from_user(buf, user_buf, buf_size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (sscanf(buf, "%d", &amp;clear) != 1)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	/* make request to uCode to retrieve stats information */</div><div class='add'>+	mutex_lock(&amp;il-&gt;mutex);</div><div class='add'>+	il_send_stats_request(il, CMD_SYNC, true);</div><div class='add'>+	mutex_unlock(&amp;il-&gt;mutex);</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</div><div class='add'>+il_dbgfs_rxon_flags_read(struct file *file, char __user *user_buf,</div><div class='add'>+			 size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	int len = 0;</div><div class='add'>+	char buf[20];</div><div class='add'>+</div><div class='add'>+	len = sprintf(buf, "0x%04X\n", le32_to_cpu(il-&gt;ctx.active.flags));</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il_dbgfs_rxon_filter_flags_read(struct file *file, char __user *user_buf,</div><div class='add'>+				size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	int len = 0;</div><div class='add'>+	char buf[20];</div><div class='add'>+</div><div class='add'>+	len =</div><div class='add'>+	    sprintf(buf, "0x%04X\n", le32_to_cpu(il-&gt;ctx.active.filter_flags));</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il_dbgfs_fh_reg_read(struct file *file, char __user *user_buf, size_t count,</div><div class='add'>+		     loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	char *buf;</div><div class='add'>+	int pos = 0;</div><div class='add'>+	ssize_t ret = -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (il-&gt;cfg-&gt;ops-&gt;lib-&gt;dump_fh) {</div><div class='add'>+		ret = pos = il-&gt;cfg-&gt;ops-&gt;lib-&gt;dump_fh(il, &amp;buf, true);</div><div class='add'>+		if (buf) {</div><div class='add'>+			ret =</div><div class='add'>+			    simple_read_from_buffer(user_buf, count, ppos, buf,</div><div class='add'>+						    pos);</div><div class='add'>+			kfree(buf);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il_dbgfs_missed_beacon_read(struct file *file, char __user *user_buf,</div><div class='add'>+			    size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	int pos = 0;</div><div class='add'>+	char buf[12];</div><div class='add'>+	const size_t bufsz = sizeof(buf);</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "%d\n",</div><div class='add'>+		      il-&gt;missed_beacon_threshold);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il_dbgfs_missed_beacon_write(struct file *file, const char __user *user_buf,</div><div class='add'>+			     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	char buf[8];</div><div class='add'>+	int buf_size;</div><div class='add'>+	int missed;</div><div class='add'>+</div><div class='add'>+	memset(buf, 0, sizeof(buf));</div><div class='add'>+	buf_size = min(count, sizeof(buf) - 1);</div><div class='add'>+	if (copy_from_user(buf, user_buf, buf_size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (sscanf(buf, "%d", &amp;missed) != 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (missed &lt; IL_MISSED_BEACON_THRESHOLD_MIN ||</div><div class='add'>+	    missed &gt; IL_MISSED_BEACON_THRESHOLD_MAX)</div><div class='add'>+		il-&gt;missed_beacon_threshold = IL_MISSED_BEACON_THRESHOLD_DEF;</div><div class='add'>+	else</div><div class='add'>+		il-&gt;missed_beacon_threshold = missed;</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</div><div class='add'>+il_dbgfs_force_reset_read(struct file *file, char __user *user_buf,</div><div class='add'>+			  size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	int pos = 0;</div><div class='add'>+	char buf[300];</div><div class='add'>+	const size_t bufsz = sizeof(buf);</div><div class='add'>+	struct il_force_reset *force_reset;</div><div class='add'>+</div><div class='add'>+	force_reset = &amp;il-&gt;force_reset;</div><div class='add'>+</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "\tnumber of reset request: %d\n",</div><div class='add'>+		      force_reset-&gt;reset_request_count);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "\tnumber of reset request success: %d\n",</div><div class='add'>+		      force_reset-&gt;reset_success_count);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos,</div><div class='add'>+		      "\tnumber of reset request reject: %d\n",</div><div class='add'>+		      force_reset-&gt;reset_reject_count);</div><div class='add'>+	pos +=</div><div class='add'>+	    scnprintf(buf + pos, bufsz - pos, "\treset duration: %lu\n",</div><div class='add'>+		      force_reset-&gt;reset_duration);</div><div class='add'>+</div><div class='add'>+	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il_dbgfs_force_reset_write(struct file *file, const char __user *user_buf,</div><div class='add'>+			   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	int ret;</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	ret = il_force_reset(il, true);</div><div class='add'>+</div><div class='add'>+	return ret ? ret : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+il_dbgfs_wd_timeout_write(struct file *file, const char __user *user_buf,</div><div class='add'>+			  size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct il_priv *il = file-&gt;private_data;</div><div class='add'>+	char buf[8];</div><div class='add'>+	int buf_size;</div><div class='add'>+	int timeout;</div><div class='add'>+</div><div class='add'>+	memset(buf, 0, sizeof(buf));</div><div class='add'>+	buf_size = min(count, sizeof(buf) - 1);</div><div class='add'>+	if (copy_from_user(buf, user_buf, buf_size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (sscanf(buf, "%d", &amp;timeout) != 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (timeout &lt; 0 || timeout &gt; IL_MAX_WD_TIMEOUT)</div><div class='add'>+		timeout = IL_DEF_WD_TIMEOUT;</div><div class='add'>+</div><div class='add'>+	il-&gt;cfg-&gt;base_params-&gt;wd_timeout = timeout;</div><div class='add'>+	il_setup_watchdog(il);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEBUGFS_READ_FILE_OPS(rx_stats);</div><div class='add'>+DEBUGFS_READ_FILE_OPS(tx_stats);</div><div class='add'>+DEBUGFS_READ_WRITE_FILE_OPS(traffic_log);</div><div class='add'>+DEBUGFS_READ_FILE_OPS(rx_queue);</div><div class='add'>+DEBUGFS_READ_FILE_OPS(tx_queue);</div><div class='add'>+DEBUGFS_READ_FILE_OPS(ucode_rx_stats);</div><div class='add'>+DEBUGFS_READ_FILE_OPS(ucode_tx_stats);</div><div class='add'>+DEBUGFS_READ_FILE_OPS(ucode_general_stats);</div><div class='add'>+DEBUGFS_READ_FILE_OPS(sensitivity);</div><div class='add'>+DEBUGFS_READ_FILE_OPS(chain_noise);</div><div class='add'>+DEBUGFS_READ_FILE_OPS(power_save_status);</div><div class='add'>+DEBUGFS_WRITE_FILE_OPS(clear_ucode_stats);</div><div class='add'>+DEBUGFS_WRITE_FILE_OPS(clear_traffic_stats);</div><div class='add'>+DEBUGFS_READ_FILE_OPS(fh_reg);</div><div class='add'>+DEBUGFS_READ_WRITE_FILE_OPS(missed_beacon);</div><div class='add'>+DEBUGFS_READ_WRITE_FILE_OPS(force_reset);</div><div class='add'>+DEBUGFS_READ_FILE_OPS(rxon_flags);</div><div class='add'>+DEBUGFS_READ_FILE_OPS(rxon_filter_flags);</div><div class='add'>+DEBUGFS_WRITE_FILE_OPS(wd_timeout);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create the debugfs files and directories</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+il_dbgfs_register(struct il_priv *il, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct dentry *phyd = il-&gt;hw-&gt;wiphy-&gt;debugfsdir;</div><div class='add'>+	struct dentry *dir_drv, *dir_data, *dir_rf, *dir_debug;</div><div class='add'>+</div><div class='add'>+	dir_drv = debugfs_create_dir(name, phyd);</div><div class='add'>+	if (!dir_drv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	il-&gt;debugfs_dir = dir_drv;</div><div class='add'>+</div><div class='add'>+	dir_data = debugfs_create_dir("data", dir_drv);</div><div class='add'>+	if (!dir_data)</div><div class='add'>+		goto err;</div><div class='add'>+	dir_rf = debugfs_create_dir("rf", dir_drv);</div><div class='add'>+	if (!dir_rf)</div><div class='add'>+		goto err;</div><div class='add'>+	dir_debug = debugfs_create_dir("debug", dir_drv);</div><div class='add'>+	if (!dir_debug)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	DEBUGFS_ADD_FILE(nvm, dir_data, S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(sram, dir_data, S_IWUSR | S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(stations, dir_data, S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(channels, dir_data, S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(status, dir_data, S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(interrupt, dir_data, S_IWUSR | S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(qos, dir_data, S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(disable_ht40, dir_data, S_IWUSR | S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(rx_stats, dir_debug, S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(tx_stats, dir_debug, S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(traffic_log, dir_debug, S_IWUSR | S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(rx_queue, dir_debug, S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(tx_queue, dir_debug, S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(power_save_status, dir_debug, S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(clear_ucode_stats, dir_debug, S_IWUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(clear_traffic_stats, dir_debug, S_IWUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(fh_reg, dir_debug, S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(missed_beacon, dir_debug, S_IWUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(force_reset, dir_debug, S_IWUSR | S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(ucode_rx_stats, dir_debug, S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(ucode_tx_stats, dir_debug, S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(ucode_general_stats, dir_debug, S_IRUSR);</div><div class='add'>+</div><div class='add'>+	if (il-&gt;cfg-&gt;base_params-&gt;sensitivity_calib_by_driver)</div><div class='add'>+		DEBUGFS_ADD_FILE(sensitivity, dir_debug, S_IRUSR);</div><div class='add'>+	if (il-&gt;cfg-&gt;base_params-&gt;chain_noise_calib_by_driver)</div><div class='add'>+		DEBUGFS_ADD_FILE(chain_noise, dir_debug, S_IRUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(rxon_filter_flags, dir_debug, S_IWUSR);</div><div class='add'>+	DEBUGFS_ADD_FILE(wd_timeout, dir_debug, S_IWUSR);</div><div class='add'>+	if (il-&gt;cfg-&gt;base_params-&gt;sensitivity_calib_by_driver)</div><div class='add'>+		DEBUGFS_ADD_BOOL(disable_sensitivity, dir_rf,</div><div class='add'>+				 &amp;il-&gt;disable_sens_cal);</div><div class='add'>+	if (il-&gt;cfg-&gt;base_params-&gt;chain_noise_calib_by_driver)</div><div class='add'>+		DEBUGFS_ADD_BOOL(disable_chain_noise, dir_rf,</div><div class='add'>+				 &amp;il-&gt;disable_chain_noise_cal);</div><div class='add'>+	DEBUGFS_ADD_BOOL(disable_tx_power, dir_rf, &amp;il-&gt;disable_tx_power_cal);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	IL_ERR("Can't create the debugfs directory\n");</div><div class='add'>+	il_dbgfs_unregister(il);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_dbgfs_register);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Remove the debugfs files and directories</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+il_dbgfs_unregister(struct il_priv *il)</div><div class='add'>+{</div><div class='add'>+	if (!il-&gt;debugfs_dir)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	debugfs_remove_recursive(il-&gt;debugfs_dir);</div><div class='add'>+	il-&gt;debugfs_dir = NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(il_dbgfs_unregister);</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c b/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c<br/>deleted file mode 100644<br/>index cfabb38793ab..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,523 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * GPL LICENSE SUMMARY</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2008 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include "iwl-3945-debugfs.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int iwl3945_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)</div><div class='del'>-{</div><div class='del'>-	int p = 0;</div><div class='del'>-</div><div class='del'>-	p += scnprintf(buf + p, bufsz - p, "Statistics Flag(0x%X):\n",</div><div class='del'>-		       le32_to_cpu(priv-&gt;_3945.statistics.flag));</div><div class='del'>-	if (le32_to_cpu(priv-&gt;_3945.statistics.flag) &amp;</div><div class='del'>-			UCODE_STATISTICS_CLEAR_MSK)</div><div class='del'>-		p += scnprintf(buf + p, bufsz - p,</div><div class='del'>-			       "\tStatistics have been cleared\n");</div><div class='del'>-	p += scnprintf(buf + p, bufsz - p, "\tOperational Frequency: %s\n",</div><div class='del'>-		       (le32_to_cpu(priv-&gt;_3945.statistics.flag) &amp;</div><div class='del'>-			UCODE_STATISTICS_FREQUENCY_MSK)</div><div class='del'>-			? "2.4 GHz" : "5.2 GHz");</div><div class='del'>-	p += scnprintf(buf + p, bufsz - p, "\tTGj Narrow Band: %s\n",</div><div class='del'>-		       (le32_to_cpu(priv-&gt;_3945.statistics.flag) &amp;</div><div class='del'>-			UCODE_STATISTICS_NARROW_BAND_MSK)</div><div class='del'>-			? "enabled" : "disabled");</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ssize_t iwl3945_ucode_rx_stats_read(struct file *file,</div><div class='del'>-				    char __user *user_buf,</div><div class='del'>-				    size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	int pos = 0;</div><div class='del'>-	char *buf;</div><div class='del'>-	int bufsz = sizeof(struct iwl39_statistics_rx_phy) * 40 +</div><div class='del'>-		    sizeof(struct iwl39_statistics_rx_non_phy) * 40 + 400;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	struct iwl39_statistics_rx_phy *ofdm, *accum_ofdm, *delta_ofdm,</div><div class='del'>-					*max_ofdm;</div><div class='del'>-	struct iwl39_statistics_rx_phy *cck, *accum_cck, *delta_cck, *max_cck;</div><div class='del'>-	struct iwl39_statistics_rx_non_phy *general, *accum_general;</div><div class='del'>-	struct iwl39_statistics_rx_non_phy *delta_general, *max_general;</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_alive(priv))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf) {</div><div class='del'>-		IWL_ERR(priv, "Can not allocate Buffer\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The statistic information display here is based on</div><div class='del'>-	 * the last statistics notification from uCode</div><div class='del'>-	 * might not reflect the current uCode activity</div><div class='del'>-	 */</div><div class='del'>-	ofdm = &amp;priv-&gt;_3945.statistics.rx.ofdm;</div><div class='del'>-	cck = &amp;priv-&gt;_3945.statistics.rx.cck;</div><div class='del'>-	general = &amp;priv-&gt;_3945.statistics.rx.general;</div><div class='del'>-	accum_ofdm = &amp;priv-&gt;_3945.accum_statistics.rx.ofdm;</div><div class='del'>-	accum_cck = &amp;priv-&gt;_3945.accum_statistics.rx.cck;</div><div class='del'>-	accum_general = &amp;priv-&gt;_3945.accum_statistics.rx.general;</div><div class='del'>-	delta_ofdm = &amp;priv-&gt;_3945.delta_statistics.rx.ofdm;</div><div class='del'>-	delta_cck = &amp;priv-&gt;_3945.delta_statistics.rx.cck;</div><div class='del'>-	delta_general = &amp;priv-&gt;_3945.delta_statistics.rx.general;</div><div class='del'>-	max_ofdm = &amp;priv-&gt;_3945.max_delta.rx.ofdm;</div><div class='del'>-	max_cck = &amp;priv-&gt;_3945.max_delta.rx.cck;</div><div class='del'>-	max_general = &amp;priv-&gt;_3945.max_delta.rx.general;</div><div class='del'>-</div><div class='del'>-	pos += iwl3945_statistics_flag(priv, buf, bufsz);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"</div><div class='del'>-			 "acumulative       delta         max\n",</div><div class='del'>-			 "Statistics_Rx - OFDM:");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "ina_cnt:", le32_to_cpu(ofdm-&gt;ina_cnt),</div><div class='del'>-			 accum_ofdm-&gt;ina_cnt,</div><div class='del'>-			 delta_ofdm-&gt;ina_cnt, max_ofdm-&gt;ina_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "fina_cnt:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;fina_cnt), accum_ofdm-&gt;fina_cnt,</div><div class='del'>-			 delta_ofdm-&gt;fina_cnt, max_ofdm-&gt;fina_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n", "plcp_err:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;plcp_err), accum_ofdm-&gt;plcp_err,</div><div class='del'>-			 delta_ofdm-&gt;plcp_err, max_ofdm-&gt;plcp_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",  "crc32_err:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;crc32_err), accum_ofdm-&gt;crc32_err,</div><div class='del'>-			 delta_ofdm-&gt;crc32_err, max_ofdm-&gt;crc32_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n", "overrun_err:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;overrun_err),</div><div class='del'>-			 accum_ofdm-&gt;overrun_err, delta_ofdm-&gt;overrun_err,</div><div class='del'>-			 max_ofdm-&gt;overrun_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "early_overrun_err:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;early_overrun_err),</div><div class='del'>-			 accum_ofdm-&gt;early_overrun_err,</div><div class='del'>-			 delta_ofdm-&gt;early_overrun_err,</div><div class='del'>-			 max_ofdm-&gt;early_overrun_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "crc32_good:", le32_to_cpu(ofdm-&gt;crc32_good),</div><div class='del'>-			 accum_ofdm-&gt;crc32_good, delta_ofdm-&gt;crc32_good,</div><div class='del'>-			 max_ofdm-&gt;crc32_good);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n", "false_alarm_cnt:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;false_alarm_cnt),</div><div class='del'>-			 accum_ofdm-&gt;false_alarm_cnt,</div><div class='del'>-			 delta_ofdm-&gt;false_alarm_cnt,</div><div class='del'>-			 max_ofdm-&gt;false_alarm_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "fina_sync_err_cnt:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;fina_sync_err_cnt),</div><div class='del'>-			 accum_ofdm-&gt;fina_sync_err_cnt,</div><div class='del'>-			 delta_ofdm-&gt;fina_sync_err_cnt,</div><div class='del'>-			 max_ofdm-&gt;fina_sync_err_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "sfd_timeout:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;sfd_timeout),</div><div class='del'>-			 accum_ofdm-&gt;sfd_timeout,</div><div class='del'>-			 delta_ofdm-&gt;sfd_timeout,</div><div class='del'>-			 max_ofdm-&gt;sfd_timeout);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "fina_timeout:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;fina_timeout),</div><div class='del'>-			 accum_ofdm-&gt;fina_timeout,</div><div class='del'>-			 delta_ofdm-&gt;fina_timeout,</div><div class='del'>-			 max_ofdm-&gt;fina_timeout);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "unresponded_rts:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;unresponded_rts),</div><div class='del'>-			 accum_ofdm-&gt;unresponded_rts,</div><div class='del'>-			 delta_ofdm-&gt;unresponded_rts,</div><div class='del'>-			 max_ofdm-&gt;unresponded_rts);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "rxe_frame_lmt_ovrun:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;rxe_frame_limit_overrun),</div><div class='del'>-			 accum_ofdm-&gt;rxe_frame_limit_overrun,</div><div class='del'>-			 delta_ofdm-&gt;rxe_frame_limit_overrun,</div><div class='del'>-			 max_ofdm-&gt;rxe_frame_limit_overrun);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "sent_ack_cnt:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;sent_ack_cnt),</div><div class='del'>-			 accum_ofdm-&gt;sent_ack_cnt,</div><div class='del'>-			 delta_ofdm-&gt;sent_ack_cnt,</div><div class='del'>-			 max_ofdm-&gt;sent_ack_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "sent_cts_cnt:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;sent_cts_cnt),</div><div class='del'>-			 accum_ofdm-&gt;sent_cts_cnt,</div><div class='del'>-			 delta_ofdm-&gt;sent_cts_cnt, max_ofdm-&gt;sent_cts_cnt);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"</div><div class='del'>-			 "acumulative       delta         max\n",</div><div class='del'>-			 "Statistics_Rx - CCK:");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "ina_cnt:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;ina_cnt), accum_cck-&gt;ina_cnt,</div><div class='del'>-			 delta_cck-&gt;ina_cnt, max_cck-&gt;ina_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "fina_cnt:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;fina_cnt), accum_cck-&gt;fina_cnt,</div><div class='del'>-			 delta_cck-&gt;fina_cnt, max_cck-&gt;fina_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "plcp_err:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;plcp_err), accum_cck-&gt;plcp_err,</div><div class='del'>-			 delta_cck-&gt;plcp_err, max_cck-&gt;plcp_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "crc32_err:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;crc32_err), accum_cck-&gt;crc32_err,</div><div class='del'>-			 delta_cck-&gt;crc32_err, max_cck-&gt;crc32_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "overrun_err:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;overrun_err),</div><div class='del'>-			 accum_cck-&gt;overrun_err,</div><div class='del'>-			 delta_cck-&gt;overrun_err, max_cck-&gt;overrun_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "early_overrun_err:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;early_overrun_err),</div><div class='del'>-			 accum_cck-&gt;early_overrun_err,</div><div class='del'>-			 delta_cck-&gt;early_overrun_err,</div><div class='del'>-			 max_cck-&gt;early_overrun_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "crc32_good:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;crc32_good), accum_cck-&gt;crc32_good,</div><div class='del'>-			 delta_cck-&gt;crc32_good,</div><div class='del'>-			 max_cck-&gt;crc32_good);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "false_alarm_cnt:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;false_alarm_cnt),</div><div class='del'>-			 accum_cck-&gt;false_alarm_cnt,</div><div class='del'>-			 delta_cck-&gt;false_alarm_cnt, max_cck-&gt;false_alarm_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "fina_sync_err_cnt:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;fina_sync_err_cnt),</div><div class='del'>-			 accum_cck-&gt;fina_sync_err_cnt,</div><div class='del'>-			 delta_cck-&gt;fina_sync_err_cnt,</div><div class='del'>-			 max_cck-&gt;fina_sync_err_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "sfd_timeout:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;sfd_timeout),</div><div class='del'>-			 accum_cck-&gt;sfd_timeout,</div><div class='del'>-			 delta_cck-&gt;sfd_timeout, max_cck-&gt;sfd_timeout);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "fina_timeout:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;fina_timeout),</div><div class='del'>-			 accum_cck-&gt;fina_timeout,</div><div class='del'>-			 delta_cck-&gt;fina_timeout, max_cck-&gt;fina_timeout);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "unresponded_rts:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;unresponded_rts),</div><div class='del'>-			 accum_cck-&gt;unresponded_rts,</div><div class='del'>-			 delta_cck-&gt;unresponded_rts,</div><div class='del'>-			 max_cck-&gt;unresponded_rts);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "rxe_frame_lmt_ovrun:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;rxe_frame_limit_overrun),</div><div class='del'>-			 accum_cck-&gt;rxe_frame_limit_overrun,</div><div class='del'>-			 delta_cck-&gt;rxe_frame_limit_overrun,</div><div class='del'>-			 max_cck-&gt;rxe_frame_limit_overrun);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "sent_ack_cnt:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;sent_ack_cnt),</div><div class='del'>-			 accum_cck-&gt;sent_ack_cnt,</div><div class='del'>-			 delta_cck-&gt;sent_ack_cnt,</div><div class='del'>-			 max_cck-&gt;sent_ack_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "sent_cts_cnt:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;sent_cts_cnt),</div><div class='del'>-			 accum_cck-&gt;sent_cts_cnt,</div><div class='del'>-			 delta_cck-&gt;sent_cts_cnt,</div><div class='del'>-			 max_cck-&gt;sent_cts_cnt);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"</div><div class='del'>-			 "acumulative       delta         max\n",</div><div class='del'>-			 "Statistics_Rx - GENERAL:");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "bogus_cts:",</div><div class='del'>-			 le32_to_cpu(general-&gt;bogus_cts),</div><div class='del'>-			 accum_general-&gt;bogus_cts,</div><div class='del'>-			 delta_general-&gt;bogus_cts, max_general-&gt;bogus_cts);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "bogus_ack:",</div><div class='del'>-			 le32_to_cpu(general-&gt;bogus_ack),</div><div class='del'>-			 accum_general-&gt;bogus_ack,</div><div class='del'>-			 delta_general-&gt;bogus_ack, max_general-&gt;bogus_ack);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "non_bssid_frames:",</div><div class='del'>-			 le32_to_cpu(general-&gt;non_bssid_frames),</div><div class='del'>-			 accum_general-&gt;non_bssid_frames,</div><div class='del'>-			 delta_general-&gt;non_bssid_frames,</div><div class='del'>-			 max_general-&gt;non_bssid_frames);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "filtered_frames:",</div><div class='del'>-			 le32_to_cpu(general-&gt;filtered_frames),</div><div class='del'>-			 accum_general-&gt;filtered_frames,</div><div class='del'>-			 delta_general-&gt;filtered_frames,</div><div class='del'>-			 max_general-&gt;filtered_frames);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "non_channel_beacons:",</div><div class='del'>-			 le32_to_cpu(general-&gt;non_channel_beacons),</div><div class='del'>-			 accum_general-&gt;non_channel_beacons,</div><div class='del'>-			 delta_general-&gt;non_channel_beacons,</div><div class='del'>-			 max_general-&gt;non_channel_beacons);</div><div class='del'>-</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ssize_t iwl3945_ucode_tx_stats_read(struct file *file,</div><div class='del'>-				    char __user *user_buf,</div><div class='del'>-				    size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	int pos = 0;</div><div class='del'>-	char *buf;</div><div class='del'>-	int bufsz = (sizeof(struct iwl39_statistics_tx) * 48) + 250;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	struct iwl39_statistics_tx *tx, *accum_tx, *delta_tx, *max_tx;</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_alive(priv))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf) {</div><div class='del'>-		IWL_ERR(priv, "Can not allocate Buffer\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The statistic information display here is based on</div><div class='del'>-	 * the last statistics notification from uCode</div><div class='del'>-	 * might not reflect the current uCode activity</div><div class='del'>-	 */</div><div class='del'>-	tx = &amp;priv-&gt;_3945.statistics.tx;</div><div class='del'>-	accum_tx = &amp;priv-&gt;_3945.accum_statistics.tx;</div><div class='del'>-	delta_tx = &amp;priv-&gt;_3945.delta_statistics.tx;</div><div class='del'>-	max_tx = &amp;priv-&gt;_3945.max_delta.tx;</div><div class='del'>-	pos += iwl3945_statistics_flag(priv, buf, bufsz);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"</div><div class='del'>-			 "acumulative       delta         max\n",</div><div class='del'>-			 "Statistics_Tx:");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "preamble:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;preamble_cnt),</div><div class='del'>-			 accum_tx-&gt;preamble_cnt,</div><div class='del'>-			 delta_tx-&gt;preamble_cnt, max_tx-&gt;preamble_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "rx_detected_cnt:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;rx_detected_cnt),</div><div class='del'>-			 accum_tx-&gt;rx_detected_cnt,</div><div class='del'>-			 delta_tx-&gt;rx_detected_cnt, max_tx-&gt;rx_detected_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "bt_prio_defer_cnt:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;bt_prio_defer_cnt),</div><div class='del'>-			 accum_tx-&gt;bt_prio_defer_cnt,</div><div class='del'>-			 delta_tx-&gt;bt_prio_defer_cnt,</div><div class='del'>-			 max_tx-&gt;bt_prio_defer_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "bt_prio_kill_cnt:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;bt_prio_kill_cnt),</div><div class='del'>-			 accum_tx-&gt;bt_prio_kill_cnt,</div><div class='del'>-			 delta_tx-&gt;bt_prio_kill_cnt,</div><div class='del'>-			 max_tx-&gt;bt_prio_kill_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "few_bytes_cnt:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;few_bytes_cnt),</div><div class='del'>-			 accum_tx-&gt;few_bytes_cnt,</div><div class='del'>-			 delta_tx-&gt;few_bytes_cnt, max_tx-&gt;few_bytes_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "cts_timeout:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;cts_timeout), accum_tx-&gt;cts_timeout,</div><div class='del'>-			 delta_tx-&gt;cts_timeout, max_tx-&gt;cts_timeout);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "ack_timeout:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;ack_timeout),</div><div class='del'>-			 accum_tx-&gt;ack_timeout,</div><div class='del'>-			 delta_tx-&gt;ack_timeout, max_tx-&gt;ack_timeout);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "expected_ack_cnt:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;expected_ack_cnt),</div><div class='del'>-			 accum_tx-&gt;expected_ack_cnt,</div><div class='del'>-			 delta_tx-&gt;expected_ack_cnt,</div><div class='del'>-			 max_tx-&gt;expected_ack_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "actual_ack_cnt:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;actual_ack_cnt),</div><div class='del'>-			 accum_tx-&gt;actual_ack_cnt,</div><div class='del'>-			 delta_tx-&gt;actual_ack_cnt,</div><div class='del'>-			 max_tx-&gt;actual_ack_cnt);</div><div class='del'>-</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ssize_t iwl3945_ucode_general_stats_read(struct file *file,</div><div class='del'>-					 char __user *user_buf,</div><div class='del'>-					 size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	int pos = 0;</div><div class='del'>-	char *buf;</div><div class='del'>-	int bufsz = sizeof(struct iwl39_statistics_general) * 10 + 300;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	struct iwl39_statistics_general *general, *accum_general;</div><div class='del'>-	struct iwl39_statistics_general *delta_general, *max_general;</div><div class='del'>-	struct statistics_dbg *dbg, *accum_dbg, *delta_dbg, *max_dbg;</div><div class='del'>-	struct iwl39_statistics_div *div, *accum_div, *delta_div, *max_div;</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_alive(priv))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf) {</div><div class='del'>-		IWL_ERR(priv, "Can not allocate Buffer\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The statistic information display here is based on</div><div class='del'>-	 * the last statistics notification from uCode</div><div class='del'>-	 * might not reflect the current uCode activity</div><div class='del'>-	 */</div><div class='del'>-	general = &amp;priv-&gt;_3945.statistics.general;</div><div class='del'>-	dbg = &amp;priv-&gt;_3945.statistics.general.dbg;</div><div class='del'>-	div = &amp;priv-&gt;_3945.statistics.general.div;</div><div class='del'>-	accum_general = &amp;priv-&gt;_3945.accum_statistics.general;</div><div class='del'>-	delta_general = &amp;priv-&gt;_3945.delta_statistics.general;</div><div class='del'>-	max_general = &amp;priv-&gt;_3945.max_delta.general;</div><div class='del'>-	accum_dbg = &amp;priv-&gt;_3945.accum_statistics.general.dbg;</div><div class='del'>-	delta_dbg = &amp;priv-&gt;_3945.delta_statistics.general.dbg;</div><div class='del'>-	max_dbg = &amp;priv-&gt;_3945.max_delta.general.dbg;</div><div class='del'>-	accum_div = &amp;priv-&gt;_3945.accum_statistics.general.div;</div><div class='del'>-	delta_div = &amp;priv-&gt;_3945.delta_statistics.general.div;</div><div class='del'>-	max_div = &amp;priv-&gt;_3945.max_delta.general.div;</div><div class='del'>-	pos += iwl3945_statistics_flag(priv, buf, bufsz);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"</div><div class='del'>-			 "acumulative       delta         max\n",</div><div class='del'>-			 "Statistics_General:");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "burst_check:",</div><div class='del'>-			 le32_to_cpu(dbg-&gt;burst_check),</div><div class='del'>-			 accum_dbg-&gt;burst_check,</div><div class='del'>-			 delta_dbg-&gt;burst_check, max_dbg-&gt;burst_check);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "burst_count:",</div><div class='del'>-			 le32_to_cpu(dbg-&gt;burst_count),</div><div class='del'>-			 accum_dbg-&gt;burst_count,</div><div class='del'>-			 delta_dbg-&gt;burst_count, max_dbg-&gt;burst_count);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "sleep_time:",</div><div class='del'>-			 le32_to_cpu(general-&gt;sleep_time),</div><div class='del'>-			 accum_general-&gt;sleep_time,</div><div class='del'>-			 delta_general-&gt;sleep_time, max_general-&gt;sleep_time);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "slots_out:",</div><div class='del'>-			 le32_to_cpu(general-&gt;slots_out),</div><div class='del'>-			 accum_general-&gt;slots_out,</div><div class='del'>-			 delta_general-&gt;slots_out, max_general-&gt;slots_out);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "slots_idle:",</div><div class='del'>-			 le32_to_cpu(general-&gt;slots_idle),</div><div class='del'>-			 accum_general-&gt;slots_idle,</div><div class='del'>-			 delta_general-&gt;slots_idle, max_general-&gt;slots_idle);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "ttl_timestamp:\t\t\t%u\n",</div><div class='del'>-			 le32_to_cpu(general-&gt;ttl_timestamp));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "tx_on_a:",</div><div class='del'>-			 le32_to_cpu(div-&gt;tx_on_a), accum_div-&gt;tx_on_a,</div><div class='del'>-			 delta_div-&gt;tx_on_a, max_div-&gt;tx_on_a);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "tx_on_b:",</div><div class='del'>-			 le32_to_cpu(div-&gt;tx_on_b), accum_div-&gt;tx_on_b,</div><div class='del'>-			 delta_div-&gt;tx_on_b, max_div-&gt;tx_on_b);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "exec_time:",</div><div class='del'>-			 le32_to_cpu(div-&gt;exec_time), accum_div-&gt;exec_time,</div><div class='del'>-			 delta_div-&gt;exec_time, max_div-&gt;exec_time);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 "  %-30s %10u  %10u  %10u  %10u\n",</div><div class='del'>-			 "probe_time:",</div><div class='del'>-			 le32_to_cpu(div-&gt;probe_time), accum_div-&gt;probe_time,</div><div class='del'>-			 delta_div-&gt;probe_time, max_div-&gt;probe_time);</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h b/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h<br/>deleted file mode 100644<br/>index 8fef4b32b447..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,60 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * GPL LICENSE SUMMARY</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2008 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-debug.h"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS</div><div class='del'>-ssize_t iwl3945_ucode_rx_stats_read(struct file *file, char __user *user_buf,</div><div class='del'>-				    size_t count, loff_t *ppos);</div><div class='del'>-ssize_t iwl3945_ucode_tx_stats_read(struct file *file, char __user *user_buf,</div><div class='del'>-				    size_t count, loff_t *ppos);</div><div class='del'>-ssize_t iwl3945_ucode_general_stats_read(struct file *file,</div><div class='del'>-					 char __user *user_buf, size_t count,</div><div class='del'>-					 loff_t *ppos);</div><div class='del'>-#else</div><div class='del'>-static ssize_t iwl3945_ucode_rx_stats_read(struct file *file,</div><div class='del'>-					   char __user *user_buf, size_t count,</div><div class='del'>-					   loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static ssize_t iwl3945_ucode_tx_stats_read(struct file *file,</div><div class='del'>-					   char __user *user_buf, size_t count,</div><div class='del'>-					   loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static ssize_t iwl3945_ucode_general_stats_read(struct file *file,</div><div class='del'>-						char __user *user_buf,</div><div class='del'>-						size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-fh.h b/drivers/net/wireless/iwlegacy/iwl-3945-fh.h<br/>deleted file mode 100644<br/>index 836c9919f82e..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-3945-fh.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-3945-fh.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,187 +0,0 @@</div><div class='del'>-/******************************************************************************</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) 2005 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- * BSD LICENSE</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2005 - 2011 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='del'>-#ifndef __iwl_3945_fh_h__</div><div class='del'>-#define __iwl_3945_fh_h__</div><div class='del'>-</div><div class='del'>-/************************************/</div><div class='del'>-/* iwl3945 Flow Handler Definitions */</div><div class='del'>-/************************************/</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * This I/O area is directly read/writable by driver (e.g. Linux uses writel())</div><div class='del'>- * Addresses are offsets from device's PCI hardware base address.</div><div class='del'>- */</div><div class='del'>-#define FH39_MEM_LOWER_BOUND                   (0x0800)</div><div class='del'>-#define FH39_MEM_UPPER_BOUND                   (0x1000)</div><div class='del'>-</div><div class='del'>-#define FH39_CBCC_TABLE		(FH39_MEM_LOWER_BOUND + 0x140)</div><div class='del'>-#define FH39_TFDB_TABLE		(FH39_MEM_LOWER_BOUND + 0x180)</div><div class='del'>-#define FH39_RCSR_TABLE		(FH39_MEM_LOWER_BOUND + 0x400)</div><div class='del'>-#define FH39_RSSR_TABLE		(FH39_MEM_LOWER_BOUND + 0x4c0)</div><div class='del'>-#define FH39_TCSR_TABLE		(FH39_MEM_LOWER_BOUND + 0x500)</div><div class='del'>-#define FH39_TSSR_TABLE		(FH39_MEM_LOWER_BOUND + 0x680)</div><div class='del'>-</div><div class='del'>-/* TFDB (Transmit Frame Buffer Descriptor) */</div><div class='del'>-#define FH39_TFDB(_ch, buf)			(FH39_TFDB_TABLE + \</div><div class='del'>-						 ((_ch) * 2 + (buf)) * 0x28)</div><div class='del'>-#define FH39_TFDB_CHNL_BUF_CTRL_REG(_ch)	(FH39_TFDB_TABLE + 0x50 * (_ch))</div><div class='del'>-</div><div class='del'>-/* CBCC channel is [0,2] */</div><div class='del'>-#define FH39_CBCC(_ch)		(FH39_CBCC_TABLE + (_ch) * 0x8)</div><div class='del'>-#define FH39_CBCC_CTRL(_ch)	(FH39_CBCC(_ch) + 0x00)</div><div class='del'>-#define FH39_CBCC_BASE(_ch)	(FH39_CBCC(_ch) + 0x04)</div><div class='del'>-</div><div class='del'>-/* RCSR channel is [0,2] */</div><div class='del'>-#define FH39_RCSR(_ch)			(FH39_RCSR_TABLE + (_ch) * 0x40)</div><div class='del'>-#define FH39_RCSR_CONFIG(_ch)		(FH39_RCSR(_ch) + 0x00)</div><div class='del'>-#define FH39_RCSR_RBD_BASE(_ch)		(FH39_RCSR(_ch) + 0x04)</div><div class='del'>-#define FH39_RCSR_WPTR(_ch)		(FH39_RCSR(_ch) + 0x20)</div><div class='del'>-#define FH39_RCSR_RPTR_ADDR(_ch)	(FH39_RCSR(_ch) + 0x24)</div><div class='del'>-</div><div class='del'>-#define FH39_RSCSR_CHNL0_WPTR		(FH39_RCSR_WPTR(0))</div><div class='del'>-</div><div class='del'>-/* RSSR */</div><div class='del'>-#define FH39_RSSR_CTRL			(FH39_RSSR_TABLE + 0x000)</div><div class='del'>-#define FH39_RSSR_STATUS		(FH39_RSSR_TABLE + 0x004)</div><div class='del'>-</div><div class='del'>-/* TCSR */</div><div class='del'>-#define FH39_TCSR(_ch)			(FH39_TCSR_TABLE + (_ch) * 0x20)</div><div class='del'>-#define FH39_TCSR_CONFIG(_ch)		(FH39_TCSR(_ch) + 0x00)</div><div class='del'>-#define FH39_TCSR_CREDIT(_ch)		(FH39_TCSR(_ch) + 0x04)</div><div class='del'>-#define FH39_TCSR_BUFF_STTS(_ch)	(FH39_TCSR(_ch) + 0x08)</div><div class='del'>-</div><div class='del'>-/* TSSR */</div><div class='del'>-#define FH39_TSSR_CBB_BASE        (FH39_TSSR_TABLE + 0x000)</div><div class='del'>-#define FH39_TSSR_MSG_CONFIG      (FH39_TSSR_TABLE + 0x008)</div><div class='del'>-#define FH39_TSSR_TX_STATUS       (FH39_TSSR_TABLE + 0x010)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* DBM */</div><div class='del'>-</div><div class='del'>-#define FH39_SRVC_CHNL                            (6)</div><div class='del'>-</div><div class='del'>-#define FH39_RCSR_RX_CONFIG_REG_POS_RBDC_SIZE     (20)</div><div class='del'>-#define FH39_RCSR_RX_CONFIG_REG_POS_IRQ_RBTH      (4)</div><div class='del'>-</div><div class='del'>-#define FH39_RCSR_RX_CONFIG_REG_BIT_WR_STTS_EN    (0x08000000)</div><div class='del'>-</div><div class='del'>-#define FH39_RCSR_RX_CONFIG_REG_VAL_DMA_CHNL_EN_ENABLE        (0x80000000)</div><div class='del'>-</div><div class='del'>-#define FH39_RCSR_RX_CONFIG_REG_VAL_RDRBD_EN_ENABLE           (0x20000000)</div><div class='del'>-</div><div class='del'>-#define FH39_RCSR_RX_CONFIG_REG_VAL_MAX_FRAG_SIZE_128		(0x01000000)</div><div class='del'>-</div><div class='del'>-#define FH39_RCSR_RX_CONFIG_REG_VAL_IRQ_DEST_INT_HOST		(0x00001000)</div><div class='del'>-</div><div class='del'>-#define FH39_RCSR_RX_CONFIG_REG_VAL_MSG_MODE_FH			(0x00000000)</div><div class='del'>-</div><div class='del'>-#define FH39_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_TXF		(0x00000000)</div><div class='del'>-#define FH39_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_DRIVER		(0x00000001)</div><div class='del'>-</div><div class='del'>-#define FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE_VAL	(0x00000000)</div><div class='del'>-#define FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE_VAL	(0x00000008)</div><div class='del'>-</div><div class='del'>-#define FH39_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_IFTFD		(0x00200000)</div><div class='del'>-</div><div class='del'>-#define FH39_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_NOINT		(0x00000000)</div><div class='del'>-</div><div class='del'>-#define FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE		(0x00000000)</div><div class='del'>-#define FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE		(0x80000000)</div><div class='del'>-</div><div class='del'>-#define FH39_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_VALID		(0x00004000)</div><div class='del'>-</div><div class='del'>-#define FH39_TCSR_CHNL_TX_BUF_STS_REG_BIT_TFDB_WPTR		(0x00000001)</div><div class='del'>-</div><div class='del'>-#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_SNOOP_RD_TXPD_ON	(0xFF000000)</div><div class='del'>-#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RD_TXPD_ON	(0x00FF0000)</div><div class='del'>-</div><div class='del'>-#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_MAX_FRAG_SIZE_128B	(0x00000400)</div><div class='del'>-</div><div class='del'>-#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_SNOOP_RD_TFD_ON		(0x00000100)</div><div class='del'>-#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RD_CBB_ON		(0x00000080)</div><div class='del'>-</div><div class='del'>-#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RSP_WAIT_TH	(0x00000020)</div><div class='del'>-#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_RSP_WAIT_TH		(0x00000005)</div><div class='del'>-</div><div class='del'>-#define FH39_TSSR_TX_STATUS_REG_BIT_BUFS_EMPTY(_ch)	(BIT(_ch) &lt;&lt; 24)</div><div class='del'>-#define FH39_TSSR_TX_STATUS_REG_BIT_NO_PEND_REQ(_ch)	(BIT(_ch) &lt;&lt; 16)</div><div class='del'>-</div><div class='del'>-#define FH39_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(_ch) \</div><div class='del'>-	(FH39_TSSR_TX_STATUS_REG_BIT_BUFS_EMPTY(_ch) | \</div><div class='del'>-	 FH39_TSSR_TX_STATUS_REG_BIT_NO_PEND_REQ(_ch))</div><div class='del'>-</div><div class='del'>-#define FH39_RSSR_CHNL0_RX_STATUS_CHNL_IDLE			(0x01000000)</div><div class='del'>-</div><div class='del'>-struct iwl3945_tfd_tb {</div><div class='del'>-	__le32 addr;</div><div class='del'>-	__le32 len;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct iwl3945_tfd {</div><div class='del'>-	__le32 control_flags;</div><div class='del'>-	struct iwl3945_tfd_tb tbs[4];</div><div class='del'>-	u8 __pad[28];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __iwl_3945_fh_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-hw.h b/drivers/net/wireless/iwlegacy/iwl-3945-hw.h<br/>deleted file mode 100644<br/>index 5c3a68d3af12..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-3945-hw.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-3945-hw.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,291 +0,0 @@</div><div class='del'>-/******************************************************************************</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) 2005 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- * BSD LICENSE</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2005 - 2011 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='del'>-/*</div><div class='del'>- * Please use this file (iwl-3945-hw.h) only for hardware-related definitions.</div><div class='del'>- * Please use iwl-commands.h for uCode API definitions.</div><div class='del'>- * Please use iwl-3945.h for driver implementation definitions.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __iwl_3945_hw__</div><div class='del'>-#define __iwl_3945_hw__</div><div class='del'>-</div><div class='del'>-#include "iwl-eeprom.h"</div><div class='del'>-</div><div class='del'>-/* RSSI to dBm */</div><div class='del'>-#define IWL39_RSSI_OFFSET	95</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EEPROM related constants, enums, and structures.</div><div class='del'>- */</div><div class='del'>-#define EEPROM_SKU_CAP_OP_MODE_MRC                      (1 &lt;&lt; 7)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Mapping of a Tx power level, at factory calibration temperature,</div><div class='del'>- *   to a radio/DSP gain table index.</div><div class='del'>- * One for each of 5 "sample" power levels in each band.</div><div class='del'>- * v_det is measured at the factory, using the 3945's built-in power amplifier</div><div class='del'>- *   (PA) output voltage detector.  This same detector is used during Tx of</div><div class='del'>- *   long packets in normal operation to provide feedback as to proper output</div><div class='del'>- *   level.</div><div class='del'>- * Data copied from EEPROM.</div><div class='del'>- * DO NOT ALTER THIS STRUCTURE!!!</div><div class='del'>- */</div><div class='del'>-struct iwl3945_eeprom_txpower_sample {</div><div class='del'>-	u8 gain_index;		/* index into power (gain) setup table ... */</div><div class='del'>-	s8 power;		/* ... for this pwr level for this chnl group */</div><div class='del'>-	u16 v_det;		/* PA output voltage */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Mappings of Tx power levels -&gt; nominal radio/DSP gain table indexes.</div><div class='del'>- * One for each channel group (a.k.a. "band") (1 for BG, 4 for A).</div><div class='del'>- * Tx power setup code interpolates between the 5 "sample" power levels</div><div class='del'>- *    to determine the nominal setup for a requested power level.</div><div class='del'>- * Data copied from EEPROM.</div><div class='del'>- * DO NOT ALTER THIS STRUCTURE!!!</div><div class='del'>- */</div><div class='del'>-struct iwl3945_eeprom_txpower_group {</div><div class='del'>-	struct iwl3945_eeprom_txpower_sample samples[5];  /* 5 power levels */</div><div class='del'>-	s32 a, b, c, d, e;	/* coefficients for voltage-&gt;power</div><div class='del'>-				 * formula (signed) */</div><div class='del'>-	s32 Fa, Fb, Fc, Fd, Fe;	/* these modify coeffs based on</div><div class='del'>-				 * frequency (signed) */</div><div class='del'>-	s8 saturation_power;	/* highest power possible by h/w in this</div><div class='del'>-				 * band */</div><div class='del'>-	u8 group_channel;	/* "representative" channel # in this band */</div><div class='del'>-	s16 temperature;	/* h/w temperature at factory calib this band</div><div class='del'>-				 * (signed) */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Temperature-based Tx-power compensation data, not band-specific.</div><div class='del'>- * These coefficients are use to modify a/b/c/d/e coeffs based on</div><div class='del'>- *   difference between current temperature and factory calib temperature.</div><div class='del'>- * Data copied from EEPROM.</div><div class='del'>- */</div><div class='del'>-struct iwl3945_eeprom_temperature_corr {</div><div class='del'>-	u32 Ta;</div><div class='del'>-	u32 Tb;</div><div class='del'>-	u32 Tc;</div><div class='del'>-	u32 Td;</div><div class='del'>-	u32 Te;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EEPROM map</div><div class='del'>- */</div><div class='del'>-struct iwl3945_eeprom {</div><div class='del'>-	u8 reserved0[16];</div><div class='del'>-	u16 device_id;	/* abs.ofs: 16 */</div><div class='del'>-	u8 reserved1[2];</div><div class='del'>-	u16 pmc;		/* abs.ofs: 20 */</div><div class='del'>-	u8 reserved2[20];</div><div class='del'>-	u8 mac_address[6];	/* abs.ofs: 42 */</div><div class='del'>-	u8 reserved3[58];</div><div class='del'>-	u16 board_revision;	/* abs.ofs: 106 */</div><div class='del'>-	u8 reserved4[11];</div><div class='del'>-	u8 board_pba_number[9];	/* abs.ofs: 119 */</div><div class='del'>-	u8 reserved5[8];</div><div class='del'>-	u16 version;		/* abs.ofs: 136 */</div><div class='del'>-	u8 sku_cap;		/* abs.ofs: 138 */</div><div class='del'>-	u8 leds_mode;		/* abs.ofs: 139 */</div><div class='del'>-	u16 oem_mode;</div><div class='del'>-	u16 wowlan_mode;	/* abs.ofs: 142 */</div><div class='del'>-	u16 leds_time_interval;	/* abs.ofs: 144 */</div><div class='del'>-	u8 leds_off_time;	/* abs.ofs: 146 */</div><div class='del'>-	u8 leds_on_time;	/* abs.ofs: 147 */</div><div class='del'>-	u8 almgor_m_version;	/* abs.ofs: 148 */</div><div class='del'>-	u8 antenna_switch_type;	/* abs.ofs: 149 */</div><div class='del'>-	u8 reserved6[42];</div><div class='del'>-	u8 sku_id[4];		/* abs.ofs: 192 */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Per-channel regulatory data.</div><div class='del'>- *</div><div class='del'>- * Each channel that *might* be supported by 3945 has a fixed location</div><div class='del'>- * in EEPROM containing EEPROM_CHANNEL_* usage flags (LSB) and max regulatory</div><div class='del'>- * txpower (MSB).</div><div class='del'>- *</div><div class='del'>- * Entries immediately below are for 20 MHz channel width.</div><div class='del'>- *</div><div class='del'>- * 2.4 GHz channels 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14</div><div class='del'>- */</div><div class='del'>-	u16 band_1_count;	/* abs.ofs: 196 */</div><div class='del'>-	struct iwl_eeprom_channel band_1_channels[14];  /* abs.ofs: 198 */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 4.9 GHz channels 183, 184, 185, 187, 188, 189, 192, 196,</div><div class='del'>- * 5.0 GHz channels 7, 8, 11, 12, 16</div><div class='del'>- * (4915-5080MHz) (none of these is ever supported)</div><div class='del'>- */</div><div class='del'>-	u16 band_2_count;	/* abs.ofs: 226 */</div><div class='del'>-	struct iwl_eeprom_channel band_2_channels[13];  /* abs.ofs: 228 */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 5.2 GHz channels 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64</div><div class='del'>- * (5170-5320MHz)</div><div class='del'>- */</div><div class='del'>-	u16 band_3_count;	/* abs.ofs: 254 */</div><div class='del'>-	struct iwl_eeprom_channel band_3_channels[12];  /* abs.ofs: 256 */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 5.5 GHz channels 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140</div><div class='del'>- * (5500-5700MHz)</div><div class='del'>- */</div><div class='del'>-	u16 band_4_count;	/* abs.ofs: 280 */</div><div class='del'>-	struct iwl_eeprom_channel band_4_channels[11];  /* abs.ofs: 282 */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 5.7 GHz channels 145, 149, 153, 157, 161, 165</div><div class='del'>- * (5725-5825MHz)</div><div class='del'>- */</div><div class='del'>-	u16 band_5_count;	/* abs.ofs: 304 */</div><div class='del'>-	struct iwl_eeprom_channel band_5_channels[6];  /* abs.ofs: 306 */</div><div class='del'>-</div><div class='del'>-	u8 reserved9[194];</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 3945 Txpower calibration data.</div><div class='del'>- */</div><div class='del'>-#define IWL_NUM_TX_CALIB_GROUPS 5</div><div class='del'>-	struct iwl3945_eeprom_txpower_group groups[IWL_NUM_TX_CALIB_GROUPS];</div><div class='del'>-/* abs.ofs: 512 */</div><div class='del'>-	struct iwl3945_eeprom_temperature_corr corrections;  /* abs.ofs: 832 */</div><div class='del'>-	u8 reserved16[172];	/* fill out to full 1024 byte block */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define IWL3945_EEPROM_IMG_SIZE 1024</div><div class='del'>-</div><div class='del'>-/* End of EEPROM */</div><div class='del'>-</div><div class='del'>-#define PCI_CFG_REV_ID_BIT_BASIC_SKU                (0x40)	/* bit 6    */</div><div class='del'>-#define PCI_CFG_REV_ID_BIT_RTP                      (0x80)	/* bit 7    */</div><div class='del'>-</div><div class='del'>-/* 4 DATA + 1 CMD. There are 2 HCCA queues that are not used. */</div><div class='del'>-#define IWL39_NUM_QUEUES        5</div><div class='del'>-#define IWL39_CMD_QUEUE_NUM	4</div><div class='del'>-</div><div class='del'>-#define IWL_DEFAULT_TX_RETRY  15</div><div class='del'>-</div><div class='del'>-/*********************************************/</div><div class='del'>-</div><div class='del'>-#define RFD_SIZE                              4</div><div class='del'>-#define NUM_TFD_CHUNKS                        4</div><div class='del'>-</div><div class='del'>-#define RX_QUEUE_SIZE                         256</div><div class='del'>-#define RX_QUEUE_MASK                         255</div><div class='del'>-#define RX_QUEUE_SIZE_LOG                     8</div><div class='del'>-</div><div class='del'>-#define U32_PAD(n)		((4-(n))&amp;0x3)</div><div class='del'>-</div><div class='del'>-#define TFD_CTL_COUNT_SET(n)       (n &lt;&lt; 24)</div><div class='del'>-#define TFD_CTL_COUNT_GET(ctl)     ((ctl &gt;&gt; 24) &amp; 7)</div><div class='del'>-#define TFD_CTL_PAD_SET(n)         (n &lt;&lt; 28)</div><div class='del'>-#define TFD_CTL_PAD_GET(ctl)       (ctl &gt;&gt; 28)</div><div class='del'>-</div><div class='del'>-/* Sizes and addresses for instruction and data memory (SRAM) in</div><div class='del'>- * 3945's embedded processor.  Driver access is via HBUS_TARG_MEM_* regs. */</div><div class='del'>-#define IWL39_RTC_INST_LOWER_BOUND		(0x000000)</div><div class='del'>-#define IWL39_RTC_INST_UPPER_BOUND		(0x014000)</div><div class='del'>-</div><div class='del'>-#define IWL39_RTC_DATA_LOWER_BOUND		(0x800000)</div><div class='del'>-#define IWL39_RTC_DATA_UPPER_BOUND		(0x808000)</div><div class='del'>-</div><div class='del'>-#define IWL39_RTC_INST_SIZE (IWL39_RTC_INST_UPPER_BOUND - \</div><div class='del'>-				IWL39_RTC_INST_LOWER_BOUND)</div><div class='del'>-#define IWL39_RTC_DATA_SIZE (IWL39_RTC_DATA_UPPER_BOUND - \</div><div class='del'>-				IWL39_RTC_DATA_LOWER_BOUND)</div><div class='del'>-</div><div class='del'>-#define IWL39_MAX_INST_SIZE IWL39_RTC_INST_SIZE</div><div class='del'>-#define IWL39_MAX_DATA_SIZE IWL39_RTC_DATA_SIZE</div><div class='del'>-</div><div class='del'>-/* Size of uCode instruction memory in bootstrap state machine */</div><div class='del'>-#define IWL39_MAX_BSM_SIZE IWL39_RTC_INST_SIZE</div><div class='del'>-</div><div class='del'>-static inline int iwl3945_hw_valid_rtc_data_addr(u32 addr)</div><div class='del'>-{</div><div class='del'>-	return (addr &gt;= IWL39_RTC_DATA_LOWER_BOUND) &amp;&amp;</div><div class='del'>-	       (addr &lt; IWL39_RTC_DATA_UPPER_BOUND);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Base physical address of iwl3945_shared is provided to FH_TSSR_CBB_BASE</div><div class='del'>- * and &amp;iwl3945_shared.rx_read_ptr[0] is provided to FH_RCSR_RPTR_ADDR(0) */</div><div class='del'>-struct iwl3945_shared {</div><div class='del'>-	__le32 tx_base_ptr[8];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-static inline u8 iwl3945_hw_get_rate(__le16 rate_n_flags)</div><div class='del'>-{</div><div class='del'>-	return le16_to_cpu(rate_n_flags) &amp; 0xFF;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 iwl3945_hw_get_rate_n_flags(__le16 rate_n_flags)</div><div class='del'>-{</div><div class='del'>-	return le16_to_cpu(rate_n_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __le16 iwl3945_hw_set_rate_n_flags(u8 rate, u16 flags)</div><div class='del'>-{</div><div class='del'>-	return cpu_to_le16((u16)rate|flags);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-led.c b/drivers/net/wireless/iwlegacy/iwl-3945-led.c<br/>deleted file mode 100644<br/>index 7a7f0f38c8ab..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-3945-led.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-3945-led.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-commands.h"</div><div class='del'>-#include "iwl-3945.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-3945-led.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Send led command */</div><div class='del'>-static int iwl3945_send_led_cmd(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_led_cmd *led_cmd)</div><div class='del'>-{</div><div class='del'>-	struct iwl_host_cmd cmd = {</div><div class='del'>-		.id = REPLY_LEDS_CMD,</div><div class='del'>-		.len = sizeof(struct iwl_led_cmd),</div><div class='del'>-		.data = led_cmd,</div><div class='del'>-		.flags = CMD_ASYNC,</div><div class='del'>-		.callback = NULL,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_send_cmd(priv, &amp;cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct iwl_led_ops iwl3945_led_ops = {</div><div class='del'>-	.cmd = iwl3945_send_led_cmd,</div><div class='del'>-};</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-led.h b/drivers/net/wireless/iwlegacy/iwl-3945-led.h<br/>deleted file mode 100644<br/>index 96716276eb0d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-3945-led.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-3945-led.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifndef __iwl_3945_led_h__</div><div class='del'>-#define __iwl_3945_led_h__</div><div class='del'>-</div><div class='del'>-extern const struct iwl_led_ops iwl3945_led_ops;</div><div class='del'>-</div><div class='del'>-#endif /* __iwl_3945_led_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-rs.c b/drivers/net/wireless/iwlegacy/iwl-3945-rs.c<br/>deleted file mode 100644<br/>index 8faeaf2dddec..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-3945-rs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-3945-rs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,996 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2005 - 2011 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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</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/init.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-commands.h"</div><div class='del'>-#include "iwl-3945.h"</div><div class='del'>-#include "iwl-sta.h"</div><div class='del'>-</div><div class='del'>-#define RS_NAME "iwl-3945-rs"</div><div class='del'>-</div><div class='del'>-static s32 iwl3945_expected_tpt_g[IWL_RATE_COUNT_3945] = {</div><div class='del'>-	7, 13, 35, 58, 0, 0, 76, 104, 130, 168, 191, 202</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static s32 iwl3945_expected_tpt_g_prot[IWL_RATE_COUNT_3945] = {</div><div class='del'>-	7, 13, 35, 58, 0, 0, 0, 80, 93, 113, 123, 125</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static s32 iwl3945_expected_tpt_a[IWL_RATE_COUNT_3945] = {</div><div class='del'>-	0, 0, 0, 0, 40, 57, 72, 98, 121, 154, 177, 186</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static s32 iwl3945_expected_tpt_b[IWL_RATE_COUNT_3945] = {</div><div class='del'>-	7, 13, 35, 58, 0, 0, 0, 0, 0, 0, 0, 0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl3945_tpt_entry {</div><div class='del'>-	s8 min_rssi;</div><div class='del'>-	u8 index;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct iwl3945_tpt_entry iwl3945_tpt_table_a[] = {</div><div class='del'>-	{-60, IWL_RATE_54M_INDEX},</div><div class='del'>-	{-64, IWL_RATE_48M_INDEX},</div><div class='del'>-	{-72, IWL_RATE_36M_INDEX},</div><div class='del'>-	{-80, IWL_RATE_24M_INDEX},</div><div class='del'>-	{-84, IWL_RATE_18M_INDEX},</div><div class='del'>-	{-85, IWL_RATE_12M_INDEX},</div><div class='del'>-	{-87, IWL_RATE_9M_INDEX},</div><div class='del'>-	{-89, IWL_RATE_6M_INDEX}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct iwl3945_tpt_entry iwl3945_tpt_table_g[] = {</div><div class='del'>-	{-60, IWL_RATE_54M_INDEX},</div><div class='del'>-	{-64, IWL_RATE_48M_INDEX},</div><div class='del'>-	{-68, IWL_RATE_36M_INDEX},</div><div class='del'>-	{-80, IWL_RATE_24M_INDEX},</div><div class='del'>-	{-84, IWL_RATE_18M_INDEX},</div><div class='del'>-	{-85, IWL_RATE_12M_INDEX},</div><div class='del'>-	{-86, IWL_RATE_11M_INDEX},</div><div class='del'>-	{-88, IWL_RATE_5M_INDEX},</div><div class='del'>-	{-90, IWL_RATE_2M_INDEX},</div><div class='del'>-	{-92, IWL_RATE_1M_INDEX}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IWL_RATE_MAX_WINDOW          62</div><div class='del'>-#define IWL_RATE_FLUSH		(3*HZ)</div><div class='del'>-#define IWL_RATE_WIN_FLUSH       (HZ/2)</div><div class='del'>-#define IWL39_RATE_HIGH_TH          11520</div><div class='del'>-#define IWL_SUCCESS_UP_TH	   8960</div><div class='del'>-#define IWL_SUCCESS_DOWN_TH	  10880</div><div class='del'>-#define IWL_RATE_MIN_FAILURE_TH       6</div><div class='del'>-#define IWL_RATE_MIN_SUCCESS_TH       8</div><div class='del'>-#define IWL_RATE_DECREASE_TH       1920</div><div class='del'>-#define IWL_RATE_RETRY_TH	     15</div><div class='del'>-</div><div class='del'>-static u8 iwl3945_get_rate_index_by_rssi(s32 rssi, enum ieee80211_band band)</div><div class='del'>-{</div><div class='del'>-	u32 index = 0;</div><div class='del'>-	u32 table_size = 0;</div><div class='del'>-	struct iwl3945_tpt_entry *tpt_table = NULL;</div><div class='del'>-</div><div class='del'>-	if ((rssi &lt; IWL_MIN_RSSI_VAL) || (rssi &gt; IWL_MAX_RSSI_VAL))</div><div class='del'>-		rssi = IWL_MIN_RSSI_VAL;</div><div class='del'>-</div><div class='del'>-	switch (band) {</div><div class='del'>-	case IEEE80211_BAND_2GHZ:</div><div class='del'>-		tpt_table = iwl3945_tpt_table_g;</div><div class='del'>-		table_size = ARRAY_SIZE(iwl3945_tpt_table_g);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IEEE80211_BAND_5GHZ:</div><div class='del'>-		tpt_table = iwl3945_tpt_table_a;</div><div class='del'>-		table_size = ARRAY_SIZE(iwl3945_tpt_table_a);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while ((index &lt; table_size) &amp;&amp; (rssi &lt; tpt_table[index].min_rssi))</div><div class='del'>-		index++;</div><div class='del'>-</div><div class='del'>-	index = min(index, (table_size - 1));</div><div class='del'>-</div><div class='del'>-	return tpt_table[index].index;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_clear_window(struct iwl3945_rate_scale_data *window)</div><div class='del'>-{</div><div class='del'>-	window-&gt;data = 0;</div><div class='del'>-	window-&gt;success_counter = 0;</div><div class='del'>-	window-&gt;success_ratio = -1;</div><div class='del'>-	window-&gt;counter = 0;</div><div class='del'>-	window-&gt;average_tpt = IWL_INVALID_VALUE;</div><div class='del'>-	window-&gt;stamp = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_rate_scale_flush_windows - flush out the rate scale windows</div><div class='del'>- *</div><div class='del'>- * Returns the number of windows that have gathered data but were</div><div class='del'>- * not flushed.  If there were any that were not flushed, then</div><div class='del'>- * reschedule the rate flushing routine.</div><div class='del'>- */</div><div class='del'>-static int iwl3945_rate_scale_flush_windows(struct iwl3945_rs_sta *rs_sta)</div><div class='del'>-{</div><div class='del'>-	int unflushed = 0;</div><div class='del'>-	int i;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct iwl_priv *priv __maybe_unused = rs_sta-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For each rate, if we have collected data on that rate</div><div class='del'>-	 * and it has been more than IWL_RATE_WIN_FLUSH</div><div class='del'>-	 * since we flushed, clear out the gathered statistics</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; IWL_RATE_COUNT_3945; i++) {</div><div class='del'>-		if (!rs_sta-&gt;win[i].counter)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;rs_sta-&gt;lock, flags);</div><div class='del'>-		if (time_after(jiffies, rs_sta-&gt;win[i].stamp +</div><div class='del'>-			       IWL_RATE_WIN_FLUSH)) {</div><div class='del'>-			IWL_DEBUG_RATE(priv, "flushing %d samples of rate "</div><div class='del'>-				       "index %d\n",</div><div class='del'>-				       rs_sta-&gt;win[i].counter, i);</div><div class='del'>-			iwl3945_clear_window(&amp;rs_sta-&gt;win[i]);</div><div class='del'>-		} else</div><div class='del'>-			unflushed++;</div><div class='del'>-		spin_unlock_irqrestore(&amp;rs_sta-&gt;lock, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return unflushed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define IWL_RATE_FLUSH_MAX              5000	/* msec */</div><div class='del'>-#define IWL_RATE_FLUSH_MIN              50	/* msec */</div><div class='del'>-#define IWL_AVERAGE_PACKETS             1500</div><div class='del'>-</div><div class='del'>-static void iwl3945_bg_rate_scale_flush(unsigned long data)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_rs_sta *rs_sta = (void *)data;</div><div class='del'>-	struct iwl_priv *priv __maybe_unused = rs_sta-&gt;priv;</div><div class='del'>-	int unflushed = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u32 packet_count, duration, pps;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	unflushed = iwl3945_rate_scale_flush_windows(rs_sta);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;rs_sta-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Number of packets Rx'd since last time this timer ran */</div><div class='del'>-	packet_count = (rs_sta-&gt;tx_packets - rs_sta-&gt;last_tx_packets) + 1;</div><div class='del'>-</div><div class='del'>-	rs_sta-&gt;last_tx_packets = rs_sta-&gt;tx_packets + 1;</div><div class='del'>-</div><div class='del'>-	if (unflushed) {</div><div class='del'>-		duration =</div><div class='del'>-		    jiffies_to_msecs(jiffies - rs_sta-&gt;last_partial_flush);</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_RATE(priv, "Tx'd %d packets in %dms\n",</div><div class='del'>-			       packet_count, duration);</div><div class='del'>-</div><div class='del'>-		/* Determine packets per second */</div><div class='del'>-		if (duration)</div><div class='del'>-			pps = (packet_count * 1000) / duration;</div><div class='del'>-		else</div><div class='del'>-			pps = 0;</div><div class='del'>-</div><div class='del'>-		if (pps) {</div><div class='del'>-			duration = (IWL_AVERAGE_PACKETS * 1000) / pps;</div><div class='del'>-			if (duration &lt; IWL_RATE_FLUSH_MIN)</div><div class='del'>-				duration = IWL_RATE_FLUSH_MIN;</div><div class='del'>-			else if (duration &gt; IWL_RATE_FLUSH_MAX)</div><div class='del'>-				duration = IWL_RATE_FLUSH_MAX;</div><div class='del'>-		} else</div><div class='del'>-			duration = IWL_RATE_FLUSH_MAX;</div><div class='del'>-</div><div class='del'>-		rs_sta-&gt;flush_time = msecs_to_jiffies(duration);</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_RATE(priv, "new flush period: %d msec ave %d\n",</div><div class='del'>-			       duration, packet_count);</div><div class='del'>-</div><div class='del'>-		mod_timer(&amp;rs_sta-&gt;rate_scale_flush, jiffies +</div><div class='del'>-			  rs_sta-&gt;flush_time);</div><div class='del'>-</div><div class='del'>-		rs_sta-&gt;last_partial_flush = jiffies;</div><div class='del'>-	} else {</div><div class='del'>-		rs_sta-&gt;flush_time = IWL_RATE_FLUSH;</div><div class='del'>-		rs_sta-&gt;flush_pending = 0;</div><div class='del'>-	}</div><div class='del'>-	/* If there weren't any unflushed entries, we don't schedule the timer</div><div class='del'>-	 * to run again */</div><div class='del'>-</div><div class='del'>-	rs_sta-&gt;last_flush = jiffies;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;rs_sta-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_collect_tx_data - Update the success/failure sliding window</div><div class='del'>- *</div><div class='del'>- * We keep a sliding window of the last 64 packets transmitted</div><div class='del'>- * at this rate.  window-&gt;data contains the bitmask of successful</div><div class='del'>- * packets.</div><div class='del'>- */</div><div class='del'>-static void iwl3945_collect_tx_data(struct iwl3945_rs_sta *rs_sta,</div><div class='del'>-				struct iwl3945_rate_scale_data *window,</div><div class='del'>-				int success, int retries, int index)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	s32 fail_count;</div><div class='del'>-	struct iwl_priv *priv __maybe_unused = rs_sta-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!retries) {</div><div class='del'>-		IWL_DEBUG_RATE(priv, "leave: retries == 0 -- should be at least 1\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;rs_sta-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Keep track of only the latest 62 tx frame attempts in this rate's</div><div class='del'>-	 * history window; anything older isn't really relevant any more.</div><div class='del'>-	 * If we have filled up the sliding window, drop the oldest attempt;</div><div class='del'>-	 * if the oldest attempt (highest bit in bitmap) shows "success",</div><div class='del'>-	 * subtract "1" from the success counter (this is the main reason</div><div class='del'>-	 * we keep these bitmaps!).</div><div class='del'>-	 * */</div><div class='del'>-	while (retries &gt; 0) {</div><div class='del'>-		if (window-&gt;counter &gt;= IWL_RATE_MAX_WINDOW) {</div><div class='del'>-</div><div class='del'>-			/* remove earliest */</div><div class='del'>-			window-&gt;counter = IWL_RATE_MAX_WINDOW - 1;</div><div class='del'>-</div><div class='del'>-			if (window-&gt;data &amp; (1ULL &lt;&lt; (IWL_RATE_MAX_WINDOW - 1))) {</div><div class='del'>-				window-&gt;data &amp;= ~(1ULL &lt;&lt; (IWL_RATE_MAX_WINDOW - 1));</div><div class='del'>-				window-&gt;success_counter--;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Increment frames-attempted counter */</div><div class='del'>-		window-&gt;counter++;</div><div class='del'>-</div><div class='del'>-		/* Shift bitmap by one frame (throw away oldest history),</div><div class='del'>-		 * OR in "1", and increment "success" if this</div><div class='del'>-		 * frame was successful. */</div><div class='del'>-		window-&gt;data &lt;&lt;= 1;</div><div class='del'>-		if (success &gt; 0) {</div><div class='del'>-			window-&gt;success_counter++;</div><div class='del'>-			window-&gt;data |= 0x1;</div><div class='del'>-			success--;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		retries--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate current success ratio, avoid divide-by-0! */</div><div class='del'>-	if (window-&gt;counter &gt; 0)</div><div class='del'>-		window-&gt;success_ratio = 128 * (100 * window-&gt;success_counter)</div><div class='del'>-					/ window-&gt;counter;</div><div class='del'>-	else</div><div class='del'>-		window-&gt;success_ratio = IWL_INVALID_VALUE;</div><div class='del'>-</div><div class='del'>-	fail_count = window-&gt;counter - window-&gt;success_counter;</div><div class='del'>-</div><div class='del'>-	/* Calculate average throughput, if we have enough history. */</div><div class='del'>-	if ((fail_count &gt;= IWL_RATE_MIN_FAILURE_TH) ||</div><div class='del'>-	    (window-&gt;success_counter &gt;= IWL_RATE_MIN_SUCCESS_TH))</div><div class='del'>-		window-&gt;average_tpt = ((window-&gt;success_ratio *</div><div class='del'>-				rs_sta-&gt;expected_tpt[index] + 64) / 128);</div><div class='del'>-	else</div><div class='del'>-		window-&gt;average_tpt = IWL_INVALID_VALUE;</div><div class='del'>-</div><div class='del'>-	/* Tag this window as having been updated */</div><div class='del'>-	window-&gt;stamp = jiffies;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;rs_sta-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Called after adding a new station to initialize rate scaling</div><div class='del'>- */</div><div class='del'>-void iwl3945_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_id)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hw *hw = priv-&gt;hw;</div><div class='del'>-	struct ieee80211_conf *conf = &amp;priv-&gt;hw-&gt;conf;</div><div class='del'>-	struct iwl3945_sta_priv *psta;</div><div class='del'>-	struct iwl3945_rs_sta *rs_sta;</div><div class='del'>-	struct ieee80211_supported_band *sband;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "enter\n");</div><div class='del'>-	if (sta_id == priv-&gt;contexts[IWL_RXON_CTX_BSS].bcast_sta_id)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	psta = (struct iwl3945_sta_priv *) sta-&gt;drv_priv;</div><div class='del'>-	rs_sta = &amp;psta-&gt;rs_sta;</div><div class='del'>-	sband = hw-&gt;wiphy-&gt;bands[conf-&gt;channel-&gt;band];</div><div class='del'>-</div><div class='del'>-	rs_sta-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	rs_sta-&gt;start_rate = IWL_RATE_INVALID;</div><div class='del'>-</div><div class='del'>-	/* default to just 802.11b */</div><div class='del'>-	rs_sta-&gt;expected_tpt = iwl3945_expected_tpt_b;</div><div class='del'>-</div><div class='del'>-	rs_sta-&gt;last_partial_flush = jiffies;</div><div class='del'>-	rs_sta-&gt;last_flush = jiffies;</div><div class='del'>-	rs_sta-&gt;flush_time = IWL_RATE_FLUSH;</div><div class='del'>-	rs_sta-&gt;last_tx_packets = 0;</div><div class='del'>-</div><div class='del'>-	rs_sta-&gt;rate_scale_flush.data = (unsigned long)rs_sta;</div><div class='del'>-	rs_sta-&gt;rate_scale_flush.function = iwl3945_bg_rate_scale_flush;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; IWL_RATE_COUNT_3945; i++)</div><div class='del'>-		iwl3945_clear_window(&amp;rs_sta-&gt;win[i]);</div><div class='del'>-</div><div class='del'>-	/* TODO: what is a good starting rate for STA? About middle? Maybe not</div><div class='del'>-	 * the lowest or the highest rate.. Could consider using RSSI from</div><div class='del'>-	 * previous packets? Need to have IEEE 802.1X auth succeed immediately</div><div class='del'>-	 * after assoc.. */</div><div class='del'>-</div><div class='del'>-	for (i = sband-&gt;n_bitrates - 1; i &gt;= 0; i--) {</div><div class='del'>-		if (sta-&gt;supp_rates[sband-&gt;band] &amp; (1 &lt;&lt; i)) {</div><div class='del'>-			rs_sta-&gt;last_txrate_idx = i;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;_3945.sta_supp_rates = sta-&gt;supp_rates[sband-&gt;band];</div><div class='del'>-	/* For 5 GHz band it start at IWL_FIRST_OFDM_RATE */</div><div class='del'>-	if (sband-&gt;band == IEEE80211_BAND_5GHZ) {</div><div class='del'>-		rs_sta-&gt;last_txrate_idx += IWL_FIRST_OFDM_RATE;</div><div class='del'>-		priv-&gt;_3945.sta_supp_rates = priv-&gt;_3945.sta_supp_rates &lt;&lt;</div><div class='del'>-						IWL_FIRST_OFDM_RATE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	priv-&gt;stations[sta_id].used &amp;= ~IWL_STA_UCODE_INPROGRESS;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *iwl3945_rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)</div><div class='del'>-{</div><div class='del'>-	return hw-&gt;priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* rate scale requires free function to be implemented */</div><div class='del'>-static void iwl3945_rs_free(void *priv)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *iwl3945_rs_alloc_sta(void *iwl_priv, struct ieee80211_sta *sta, gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_rs_sta *rs_sta;</div><div class='del'>-	struct iwl3945_sta_priv *psta = (void *) sta-&gt;drv_priv;</div><div class='del'>-	struct iwl_priv *priv __maybe_unused = iwl_priv;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	rs_sta = &amp;psta-&gt;rs_sta;</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;rs_sta-&gt;lock);</div><div class='del'>-	init_timer(&amp;rs_sta-&gt;rate_scale_flush);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "leave\n");</div><div class='del'>-</div><div class='del'>-	return rs_sta;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_rs_free_sta(void *iwl_priv, struct ieee80211_sta *sta,</div><div class='del'>-			void *priv_sta)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_rs_sta *rs_sta = priv_sta;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Be careful not to use any members of iwl3945_rs_sta (like trying</div><div class='del'>-	 * to use iwl_priv to print out debugging) since it may not be fully</div><div class='del'>-	 * initialized at this point.</div><div class='del'>-	 */</div><div class='del'>-	del_timer_sync(&amp;rs_sta-&gt;rate_scale_flush);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_rs_tx_status - Update rate control values based on Tx results</div><div class='del'>- *</div><div class='del'>- * NOTE: Uses iwl_priv-&gt;retry_rate for the # of retries attempted by</div><div class='del'>- * the hardware for each rate.</div><div class='del'>- */</div><div class='del'>-static void iwl3945_rs_tx_status(void *priv_rate, struct ieee80211_supported_band *sband,</div><div class='del'>-			 struct ieee80211_sta *sta, void *priv_sta,</div><div class='del'>-			 struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	s8 retries = 0, current_count;</div><div class='del'>-	int scale_rate_index, first_index, last_index;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct iwl_priv *priv = (struct iwl_priv *)priv_rate;</div><div class='del'>-	struct iwl3945_rs_sta *rs_sta = priv_sta;</div><div class='del'>-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	retries = info-&gt;status.rates[0].count;</div><div class='del'>-	/* Sanity Check for retries */</div><div class='del'>-	if (retries &gt; IWL_RATE_RETRY_TH)</div><div class='del'>-		retries = IWL_RATE_RETRY_TH;</div><div class='del'>-</div><div class='del'>-	first_index = sband-&gt;bitrates[info-&gt;status.rates[0].idx].hw_value;</div><div class='del'>-	if ((first_index &lt; 0) || (first_index &gt;= IWL_RATE_COUNT_3945)) {</div><div class='del'>-		IWL_DEBUG_RATE(priv, "leave: Rate out of bounds: %d\n", first_index);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!priv_sta) {</div><div class='del'>-		IWL_DEBUG_RATE(priv, "leave: No STA priv data to update!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Treat uninitialized rate scaling data same as non-existing. */</div><div class='del'>-	if (!rs_sta-&gt;priv) {</div><div class='del'>-		IWL_DEBUG_RATE(priv, "leave: STA priv data uninitialized!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	rs_sta-&gt;tx_packets++;</div><div class='del'>-</div><div class='del'>-	scale_rate_index = first_index;</div><div class='del'>-	last_index = first_index;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Update the window for each rate.  We determine which rates</div><div class='del'>-	 * were Tx'd based on the total number of retries vs. the number</div><div class='del'>-	 * of retries configured for each rate -- currently set to the</div><div class='del'>-	 * priv value 'retry_rate' vs. rate specific</div><div class='del'>-	 *</div><div class='del'>-	 * On exit from this while loop last_index indicates the rate</div><div class='del'>-	 * at which the frame was finally transmitted (or failed if no</div><div class='del'>-	 * ACK)</div><div class='del'>-	 */</div><div class='del'>-	while (retries &gt; 1) {</div><div class='del'>-		if ((retries - 1) &lt; priv-&gt;retry_rate) {</div><div class='del'>-			current_count = (retries - 1);</div><div class='del'>-			last_index = scale_rate_index;</div><div class='del'>-		} else {</div><div class='del'>-			current_count = priv-&gt;retry_rate;</div><div class='del'>-			last_index = iwl3945_rs_next_rate(priv,</div><div class='del'>-							 scale_rate_index);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Update this rate accounting for as many retries</div><div class='del'>-		 * as was used for it (per current_count) */</div><div class='del'>-		iwl3945_collect_tx_data(rs_sta,</div><div class='del'>-				    &amp;rs_sta-&gt;win[scale_rate_index],</div><div class='del'>-				    0, current_count, scale_rate_index);</div><div class='del'>-		IWL_DEBUG_RATE(priv, "Update rate %d for %d retries.\n",</div><div class='del'>-			       scale_rate_index, current_count);</div><div class='del'>-</div><div class='del'>-		retries -= current_count;</div><div class='del'>-</div><div class='del'>-		scale_rate_index = last_index;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Update the last index window with success/failure based on ACK */</div><div class='del'>-	IWL_DEBUG_RATE(priv, "Update rate %d with %s.\n",</div><div class='del'>-		       last_index,</div><div class='del'>-		       (info-&gt;flags &amp; IEEE80211_TX_STAT_ACK) ?</div><div class='del'>-		       "success" : "failure");</div><div class='del'>-	iwl3945_collect_tx_data(rs_sta,</div><div class='del'>-			    &amp;rs_sta-&gt;win[last_index],</div><div class='del'>-			    info-&gt;flags &amp; IEEE80211_TX_STAT_ACK, 1, last_index);</div><div class='del'>-</div><div class='del'>-	/* We updated the rate scale window -- if its been more than</div><div class='del'>-	 * flush_time since the last run, schedule the flush</div><div class='del'>-	 * again */</div><div class='del'>-	spin_lock_irqsave(&amp;rs_sta-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	if (!rs_sta-&gt;flush_pending &amp;&amp;</div><div class='del'>-	    time_after(jiffies, rs_sta-&gt;last_flush +</div><div class='del'>-		       rs_sta-&gt;flush_time)) {</div><div class='del'>-</div><div class='del'>-		rs_sta-&gt;last_partial_flush = jiffies;</div><div class='del'>-		rs_sta-&gt;flush_pending = 1;</div><div class='del'>-		mod_timer(&amp;rs_sta-&gt;rate_scale_flush,</div><div class='del'>-			  jiffies + rs_sta-&gt;flush_time);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;rs_sta-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u16 iwl3945_get_adjacent_rate(struct iwl3945_rs_sta *rs_sta,</div><div class='del'>-				 u8 index, u16 rate_mask, enum ieee80211_band band)</div><div class='del'>-{</div><div class='del'>-	u8 high = IWL_RATE_INVALID;</div><div class='del'>-	u8 low = IWL_RATE_INVALID;</div><div class='del'>-	struct iwl_priv *priv __maybe_unused = rs_sta-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* 802.11A walks to the next literal adjacent rate in</div><div class='del'>-	 * the rate table */</div><div class='del'>-	if (unlikely(band == IEEE80211_BAND_5GHZ)) {</div><div class='del'>-		int i;</div><div class='del'>-		u32 mask;</div><div class='del'>-</div><div class='del'>-		/* Find the previous rate that is in the rate mask */</div><div class='del'>-		i = index - 1;</div><div class='del'>-		for (mask = (1 &lt;&lt; i); i &gt;= 0; i--, mask &gt;&gt;= 1) {</div><div class='del'>-			if (rate_mask &amp; mask) {</div><div class='del'>-				low = i;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Find the next rate that is in the rate mask */</div><div class='del'>-		i = index + 1;</div><div class='del'>-		for (mask = (1 &lt;&lt; i); i &lt; IWL_RATE_COUNT_3945;</div><div class='del'>-		     i++, mask &lt;&lt;= 1) {</div><div class='del'>-			if (rate_mask &amp; mask) {</div><div class='del'>-				high = i;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return (high &lt;&lt; 8) | low;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	low = index;</div><div class='del'>-	while (low != IWL_RATE_INVALID) {</div><div class='del'>-		if (rs_sta-&gt;tgg)</div><div class='del'>-			low = iwl3945_rates[low].prev_rs_tgg;</div><div class='del'>-		else</div><div class='del'>-			low = iwl3945_rates[low].prev_rs;</div><div class='del'>-		if (low == IWL_RATE_INVALID)</div><div class='del'>-			break;</div><div class='del'>-		if (rate_mask &amp; (1 &lt;&lt; low))</div><div class='del'>-			break;</div><div class='del'>-		IWL_DEBUG_RATE(priv, "Skipping masked lower rate: %d\n", low);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	high = index;</div><div class='del'>-	while (high != IWL_RATE_INVALID) {</div><div class='del'>-		if (rs_sta-&gt;tgg)</div><div class='del'>-			high = iwl3945_rates[high].next_rs_tgg;</div><div class='del'>-		else</div><div class='del'>-			high = iwl3945_rates[high].next_rs;</div><div class='del'>-		if (high == IWL_RATE_INVALID)</div><div class='del'>-			break;</div><div class='del'>-		if (rate_mask &amp; (1 &lt;&lt; high))</div><div class='del'>-			break;</div><div class='del'>-		IWL_DEBUG_RATE(priv, "Skipping masked higher rate: %d\n", high);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (high &lt;&lt; 8) | low;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_rs_get_rate - find the rate for the requested packet</div><div class='del'>- *</div><div class='del'>- * Returns the ieee80211_rate structure allocated by the driver.</div><div class='del'>- *</div><div class='del'>- * The rate control algorithm has no internal mapping between hw_mode's</div><div class='del'>- * rate ordering and the rate ordering used by the rate control algorithm.</div><div class='del'>- *</div><div class='del'>- * The rate control algorithm uses a single table of rates that goes across</div><div class='del'>- * the entire A/B/G spectrum vs. being limited to just one particular</div><div class='del'>- * hw_mode.</div><div class='del'>- *</div><div class='del'>- * As such, we can't convert the index obtained below into the hw_mode's</div><div class='del'>- * rate table and must reference the driver allocated rate table</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static void iwl3945_rs_get_rate(void *priv_r, struct ieee80211_sta *sta,</div><div class='del'>-			void *priv_sta,	struct ieee80211_tx_rate_control *txrc)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_supported_band *sband = txrc-&gt;sband;</div><div class='del'>-	struct sk_buff *skb = txrc-&gt;skb;</div><div class='del'>-	u8 low = IWL_RATE_INVALID;</div><div class='del'>-	u8 high = IWL_RATE_INVALID;</div><div class='del'>-	u16 high_low;</div><div class='del'>-	int index;</div><div class='del'>-	struct iwl3945_rs_sta *rs_sta = priv_sta;</div><div class='del'>-	struct iwl3945_rate_scale_data *window = NULL;</div><div class='del'>-	int current_tpt = IWL_INVALID_VALUE;</div><div class='del'>-	int low_tpt = IWL_INVALID_VALUE;</div><div class='del'>-	int high_tpt = IWL_INVALID_VALUE;</div><div class='del'>-	u32 fail_count;</div><div class='del'>-	s8 scale_action = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u16 rate_mask;</div><div class='del'>-	s8 max_rate_idx = -1;</div><div class='del'>-	struct iwl_priv *priv __maybe_unused = (struct iwl_priv *)priv_r;</div><div class='del'>-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	/* Treat uninitialized rate scaling data same as non-existing. */</div><div class='del'>-	if (rs_sta &amp;&amp; !rs_sta-&gt;priv) {</div><div class='del'>-		IWL_DEBUG_RATE(priv, "Rate scaling information not initialized yet.\n");</div><div class='del'>-		priv_sta = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rate_control_send_low(sta, priv_sta, txrc))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	rate_mask = sta-&gt;supp_rates[sband-&gt;band];</div><div class='del'>-</div><div class='del'>-	/* get user max rate if set */</div><div class='del'>-	max_rate_idx = txrc-&gt;max_rate_idx;</div><div class='del'>-	if ((sband-&gt;band == IEEE80211_BAND_5GHZ) &amp;&amp; (max_rate_idx != -1))</div><div class='del'>-		max_rate_idx += IWL_FIRST_OFDM_RATE;</div><div class='del'>-	if ((max_rate_idx &lt; 0) || (max_rate_idx &gt;= IWL_RATE_COUNT))</div><div class='del'>-		max_rate_idx = -1;</div><div class='del'>-</div><div class='del'>-	index = min(rs_sta-&gt;last_txrate_idx &amp; 0xffff, IWL_RATE_COUNT_3945 - 1);</div><div class='del'>-</div><div class='del'>-	if (sband-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='del'>-		rate_mask = rate_mask &lt;&lt; IWL_FIRST_OFDM_RATE;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;rs_sta-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* for recent assoc, choose best rate regarding</div><div class='del'>-	 * to rssi value</div><div class='del'>-	 */</div><div class='del'>-	if (rs_sta-&gt;start_rate != IWL_RATE_INVALID) {</div><div class='del'>-		if (rs_sta-&gt;start_rate &lt; index &amp;&amp;</div><div class='del'>-		   (rate_mask &amp; (1 &lt;&lt; rs_sta-&gt;start_rate)))</div><div class='del'>-			index = rs_sta-&gt;start_rate;</div><div class='del'>-		rs_sta-&gt;start_rate = IWL_RATE_INVALID;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* force user max rate if set by user */</div><div class='del'>-	if ((max_rate_idx != -1) &amp;&amp; (max_rate_idx &lt; index)) {</div><div class='del'>-		if (rate_mask &amp; (1 &lt;&lt; max_rate_idx))</div><div class='del'>-			index = max_rate_idx;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	window = &amp;(rs_sta-&gt;win[index]);</div><div class='del'>-</div><div class='del'>-	fail_count = window-&gt;counter - window-&gt;success_counter;</div><div class='del'>-</div><div class='del'>-	if (((fail_count &lt; IWL_RATE_MIN_FAILURE_TH) &amp;&amp;</div><div class='del'>-	     (window-&gt;success_counter &lt; IWL_RATE_MIN_SUCCESS_TH))) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;rs_sta-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_RATE(priv, "Invalid average_tpt on rate %d: "</div><div class='del'>-			       "counter: %d, success_counter: %d, "</div><div class='del'>-			       "expected_tpt is %sNULL\n",</div><div class='del'>-			       index,</div><div class='del'>-			       window-&gt;counter,</div><div class='del'>-			       window-&gt;success_counter,</div><div class='del'>-			       rs_sta-&gt;expected_tpt ? "not " : "");</div><div class='del'>-</div><div class='del'>-	   /* Can't calculate this yet; not enough history */</div><div class='del'>-		window-&gt;average_tpt = IWL_INVALID_VALUE;</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	current_tpt = window-&gt;average_tpt;</div><div class='del'>-</div><div class='del'>-	high_low = iwl3945_get_adjacent_rate(rs_sta, index, rate_mask,</div><div class='del'>-					     sband-&gt;band);</div><div class='del'>-	low = high_low &amp; 0xff;</div><div class='del'>-	high = (high_low &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	/* If user set max rate, dont allow higher than user constrain */</div><div class='del'>-	if ((max_rate_idx != -1) &amp;&amp; (max_rate_idx &lt; high))</div><div class='del'>-		high = IWL_RATE_INVALID;</div><div class='del'>-</div><div class='del'>-	/* Collect Measured throughputs of adjacent rates */</div><div class='del'>-	if (low != IWL_RATE_INVALID)</div><div class='del'>-		low_tpt = rs_sta-&gt;win[low].average_tpt;</div><div class='del'>-</div><div class='del'>-	if (high != IWL_RATE_INVALID)</div><div class='del'>-		high_tpt = rs_sta-&gt;win[high].average_tpt;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;rs_sta-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	scale_action = 0;</div><div class='del'>-</div><div class='del'>-	/* Low success ratio , need to drop the rate */</div><div class='del'>-	if ((window-&gt;success_ratio &lt; IWL_RATE_DECREASE_TH) || !current_tpt) {</div><div class='del'>-		IWL_DEBUG_RATE(priv, "decrease rate because of low success_ratio\n");</div><div class='del'>-		scale_action = -1;</div><div class='del'>-	/* No throughput measured yet for adjacent rates,</div><div class='del'>-	 * try increase */</div><div class='del'>-	} else if ((low_tpt == IWL_INVALID_VALUE) &amp;&amp;</div><div class='del'>-		   (high_tpt == IWL_INVALID_VALUE)) {</div><div class='del'>-</div><div class='del'>-		if (high != IWL_RATE_INVALID &amp;&amp; window-&gt;success_ratio &gt;= IWL_RATE_INCREASE_TH)</div><div class='del'>-			scale_action = 1;</div><div class='del'>-		else if (low != IWL_RATE_INVALID)</div><div class='del'>-			scale_action = 0;</div><div class='del'>-</div><div class='del'>-	/* Both adjacent throughputs are measured, but neither one has</div><div class='del'>-	 * better throughput; we're using the best rate, don't change</div><div class='del'>-	 * it! */</div><div class='del'>-	} else if ((low_tpt != IWL_INVALID_VALUE) &amp;&amp;</div><div class='del'>-		 (high_tpt != IWL_INVALID_VALUE) &amp;&amp;</div><div class='del'>-		 (low_tpt &lt; current_tpt) &amp;&amp; (high_tpt &lt; current_tpt)) {</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_RATE(priv, "No action -- low [%d] &amp; high [%d] &lt; "</div><div class='del'>-			       "current_tpt [%d]\n",</div><div class='del'>-			       low_tpt, high_tpt, current_tpt);</div><div class='del'>-		scale_action = 0;</div><div class='del'>-</div><div class='del'>-	/* At least one of the rates has better throughput */</div><div class='del'>-	} else {</div><div class='del'>-		if (high_tpt != IWL_INVALID_VALUE) {</div><div class='del'>-</div><div class='del'>-			/* High rate has better throughput, Increase</div><div class='del'>-			 * rate */</div><div class='del'>-			if (high_tpt &gt; current_tpt &amp;&amp;</div><div class='del'>-				window-&gt;success_ratio &gt;= IWL_RATE_INCREASE_TH)</div><div class='del'>-				scale_action = 1;</div><div class='del'>-			else {</div><div class='del'>-				IWL_DEBUG_RATE(priv,</div><div class='del'>-				    "decrease rate because of high tpt\n");</div><div class='del'>-				scale_action = 0;</div><div class='del'>-			}</div><div class='del'>-		} else if (low_tpt != IWL_INVALID_VALUE) {</div><div class='del'>-			if (low_tpt &gt; current_tpt) {</div><div class='del'>-				IWL_DEBUG_RATE(priv,</div><div class='del'>-				    "decrease rate because of low tpt\n");</div><div class='del'>-				scale_action = -1;</div><div class='del'>-			} else if (window-&gt;success_ratio &gt;= IWL_RATE_INCREASE_TH) {</div><div class='del'>-				/* Lower rate has better</div><div class='del'>-				 * throughput,decrease rate */</div><div class='del'>-				scale_action = 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Sanity check; asked for decrease, but success rate or throughput</div><div class='del'>-	 * has been good at old rate.  Don't change it. */</div><div class='del'>-	if ((scale_action == -1) &amp;&amp; (low != IWL_RATE_INVALID) &amp;&amp;</div><div class='del'>-		    ((window-&gt;success_ratio &gt; IWL_RATE_HIGH_TH) ||</div><div class='del'>-		     (current_tpt &gt; (100 * rs_sta-&gt;expected_tpt[low]))))</div><div class='del'>-		scale_action = 0;</div><div class='del'>-</div><div class='del'>-	switch (scale_action) {</div><div class='del'>-	case -1:</div><div class='del'>-</div><div class='del'>-		/* Decrese rate */</div><div class='del'>-		if (low != IWL_RATE_INVALID)</div><div class='del'>-			index = low;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 1:</div><div class='del'>-		/* Increase rate */</div><div class='del'>-		if (high != IWL_RATE_INVALID)</div><div class='del'>-			index = high;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 0:</div><div class='del'>-	default:</div><div class='del'>-		/* No change */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "Selected %d (action %d) - low %d high %d\n",</div><div class='del'>-		       index, scale_action, low, high);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	if (sband-&gt;band == IEEE80211_BAND_5GHZ) {</div><div class='del'>-		if (WARN_ON_ONCE(index &lt; IWL_FIRST_OFDM_RATE))</div><div class='del'>-			index = IWL_FIRST_OFDM_RATE;</div><div class='del'>-		rs_sta-&gt;last_txrate_idx = index;</div><div class='del'>-		info-&gt;control.rates[0].idx = index - IWL_FIRST_OFDM_RATE;</div><div class='del'>-	} else {</div><div class='del'>-		rs_sta-&gt;last_txrate_idx = index;</div><div class='del'>-		info-&gt;control.rates[0].idx = rs_sta-&gt;last_txrate_idx;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "leave: %d\n", index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='del'>-static int iwl3945_open_file_generic(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	file-&gt;private_data = inode-&gt;i_private;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl3945_sta_dbgfs_stats_table_read(struct file *file,</div><div class='del'>-						  char __user *user_buf,</div><div class='del'>-						  size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	char *buff;</div><div class='del'>-	int desc = 0;</div><div class='del'>-	int j;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	struct iwl3945_rs_sta *lq_sta = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	buff = kmalloc(1024, GFP_KERNEL);</div><div class='del'>-	if (!buff)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	desc += sprintf(buff + desc, "tx packets=%d last rate index=%d\n"</div><div class='del'>-			"rate=0x%X flush time %d\n",</div><div class='del'>-			lq_sta-&gt;tx_packets,</div><div class='del'>-			lq_sta-&gt;last_txrate_idx,</div><div class='del'>-			lq_sta-&gt;start_rate, jiffies_to_msecs(lq_sta-&gt;flush_time));</div><div class='del'>-	for (j = 0; j &lt; IWL_RATE_COUNT_3945; j++) {</div><div class='del'>-		desc += sprintf(buff+desc,</div><div class='del'>-				"counter=%d success=%d %%=%d\n",</div><div class='del'>-				lq_sta-&gt;win[j].counter,</div><div class='del'>-				lq_sta-&gt;win[j].success_counter,</div><div class='del'>-				lq_sta-&gt;win[j].success_ratio);</div><div class='del'>-	}</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);</div><div class='del'>-	kfree(buff);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations rs_sta_dbgfs_stats_table_ops = {</div><div class='del'>-	.read = iwl3945_sta_dbgfs_stats_table_read,</div><div class='del'>-	.open = iwl3945_open_file_generic,</div><div class='del'>-	.llseek = default_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void iwl3945_add_debugfs(void *priv, void *priv_sta,</div><div class='del'>-				struct dentry *dir)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_rs_sta *lq_sta = priv_sta;</div><div class='del'>-</div><div class='del'>-	lq_sta-&gt;rs_sta_dbgfs_stats_table_file =</div><div class='del'>-		debugfs_create_file("rate_stats_table", 0600, dir,</div><div class='del'>-		lq_sta, &amp;rs_sta_dbgfs_stats_table_ops);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_remove_debugfs(void *priv, void *priv_sta)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_rs_sta *lq_sta = priv_sta;</div><div class='del'>-	debugfs_remove(lq_sta-&gt;rs_sta_dbgfs_stats_table_file);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initialization of rate scaling information is done by driver after</div><div class='del'>- * the station is added. Since mac80211 calls this function before a</div><div class='del'>- * station is added we ignore it.</div><div class='del'>- */</div><div class='del'>-static void iwl3945_rs_rate_init_stub(void *priv_r,</div><div class='del'>-				struct ieee80211_supported_band *sband,</div><div class='del'>-			      struct ieee80211_sta *sta, void *priv_sta)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct rate_control_ops rs_ops = {</div><div class='del'>-	.module = NULL,</div><div class='del'>-	.name = RS_NAME,</div><div class='del'>-	.tx_status = iwl3945_rs_tx_status,</div><div class='del'>-	.get_rate = iwl3945_rs_get_rate,</div><div class='del'>-	.rate_init = iwl3945_rs_rate_init_stub,</div><div class='del'>-	.alloc = iwl3945_rs_alloc,</div><div class='del'>-	.free = iwl3945_rs_free,</div><div class='del'>-	.alloc_sta = iwl3945_rs_alloc_sta,</div><div class='del'>-	.free_sta = iwl3945_rs_free_sta,</div><div class='del'>-#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='del'>-	.add_sta_debugfs = iwl3945_add_debugfs,</div><div class='del'>-	.remove_sta_debugfs = iwl3945_remove_debugfs,</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-void iwl3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	s32 rssi = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct iwl3945_rs_sta *rs_sta;</div><div class='del'>-	struct ieee80211_sta *sta;</div><div class='del'>-	struct iwl3945_sta_priv *psta;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	sta = ieee80211_find_sta(priv-&gt;contexts[IWL_RXON_CTX_BSS].vif,</div><div class='del'>-				 priv-&gt;stations[sta_id].sta.sta.addr);</div><div class='del'>-	if (!sta) {</div><div class='del'>-		IWL_DEBUG_RATE(priv, "Unable to find station to initialize rate scaling.\n");</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	psta = (void *) sta-&gt;drv_priv;</div><div class='del'>-	rs_sta = &amp;psta-&gt;rs_sta;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;rs_sta-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	rs_sta-&gt;tgg = 0;</div><div class='del'>-	switch (priv-&gt;band) {</div><div class='del'>-	case IEEE80211_BAND_2GHZ:</div><div class='del'>-		/* TODO: this always does G, not a regression */</div><div class='del'>-		if (priv-&gt;contexts[IWL_RXON_CTX_BSS].active.flags &amp;</div><div class='del'>-						RXON_FLG_TGG_PROTECT_MSK) {</div><div class='del'>-			rs_sta-&gt;tgg = 1;</div><div class='del'>-			rs_sta-&gt;expected_tpt = iwl3945_expected_tpt_g_prot;</div><div class='del'>-		} else</div><div class='del'>-			rs_sta-&gt;expected_tpt = iwl3945_expected_tpt_g;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IEEE80211_BAND_5GHZ:</div><div class='del'>-		rs_sta-&gt;expected_tpt = iwl3945_expected_tpt_a;</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_NUM_BANDS:</div><div class='del'>-		BUG();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;rs_sta-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	rssi = priv-&gt;_3945.last_rx_rssi;</div><div class='del'>-	if (rssi == 0)</div><div class='del'>-		rssi = IWL_MIN_RSSI_VAL;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "Network RSSI: %d\n", rssi);</div><div class='del'>-</div><div class='del'>-	rs_sta-&gt;start_rate = iwl3945_get_rate_index_by_rssi(rssi, priv-&gt;band);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "leave: rssi %d assign rate index: "</div><div class='del'>-		       "%d (plcp 0x%x)\n", rssi, rs_sta-&gt;start_rate,</div><div class='del'>-		       iwl3945_rates[rs_sta-&gt;start_rate].plcp);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl3945_rate_control_register(void)</div><div class='del'>-{</div><div class='del'>-	return ieee80211_rate_control_register(&amp;rs_ops);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl3945_rate_control_unregister(void)</div><div class='del'>-{</div><div class='del'>-	ieee80211_rate_control_unregister(&amp;rs_ops);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-3945.c b/drivers/net/wireless/iwlegacy/iwl-3945.c<br/>deleted file mode 100644<br/>index f7c0a7438476..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-3945.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-3945.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2741 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.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/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-fh.h"</div><div class='del'>-#include "iwl-3945-fh.h"</div><div class='del'>-#include "iwl-commands.h"</div><div class='del'>-#include "iwl-sta.h"</div><div class='del'>-#include "iwl-3945.h"</div><div class='del'>-#include "iwl-eeprom.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-helpers.h"</div><div class='del'>-#include "iwl-led.h"</div><div class='del'>-#include "iwl-3945-led.h"</div><div class='del'>-#include "iwl-3945-debugfs.h"</div><div class='del'>-</div><div class='del'>-#define IWL_DECLARE_RATE_INFO(r, ip, in, rp, rn, pp, np)    \</div><div class='del'>-	[IWL_RATE_##r##M_INDEX] = { IWL_RATE_##r##M_PLCP,   \</div><div class='del'>-				    IWL_RATE_##r##M_IEEE,   \</div><div class='del'>-				    IWL_RATE_##ip##M_INDEX, \</div><div class='del'>-				    IWL_RATE_##in##M_INDEX, \</div><div class='del'>-				    IWL_RATE_##rp##M_INDEX, \</div><div class='del'>-				    IWL_RATE_##rn##M_INDEX, \</div><div class='del'>-				    IWL_RATE_##pp##M_INDEX, \</div><div class='del'>-				    IWL_RATE_##np##M_INDEX, \</div><div class='del'>-				    IWL_RATE_##r##M_INDEX_TABLE, \</div><div class='del'>-				    IWL_RATE_##ip##M_INDEX_TABLE }</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Parameter order:</div><div class='del'>- *   rate, prev rate, next rate, prev tgg rate, next tgg rate</div><div class='del'>- *</div><div class='del'>- * If there isn't a valid next or previous rate then INV is used which</div><div class='del'>- * maps to IWL_RATE_INVALID</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-const struct iwl3945_rate_info iwl3945_rates[IWL_RATE_COUNT_3945] = {</div><div class='del'>-	IWL_DECLARE_RATE_INFO(1, INV, 2, INV, 2, INV, 2),    /*  1mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(2, 1, 5, 1, 5, 1, 5),          /*  2mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(5, 2, 6, 2, 11, 2, 11),        /*5.5mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(11, 9, 12, 5, 12, 5, 18),      /* 11mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(6, 5, 9, 5, 11, 5, 11),        /*  6mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(9, 6, 11, 5, 11, 5, 11),       /*  9mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(12, 11, 18, 11, 18, 11, 18),   /* 12mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(18, 12, 24, 12, 24, 11, 24),   /* 18mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(24, 18, 36, 18, 36, 18, 36),   /* 24mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(36, 24, 48, 24, 48, 24, 48),   /* 36mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(48, 36, 54, 36, 54, 36, 54),   /* 48mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(54, 48, INV, 48, INV, 48, INV),/* 54mbps */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline u8 iwl3945_get_prev_ieee_rate(u8 rate_index)</div><div class='del'>-{</div><div class='del'>-	u8 rate = iwl3945_rates[rate_index].prev_ieee;</div><div class='del'>-</div><div class='del'>-	if (rate == IWL_RATE_INVALID)</div><div class='del'>-		rate = rate_index;</div><div class='del'>-	return rate;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 1 = enable the iwl3945_disable_events() function */</div><div class='del'>-#define IWL_EVT_DISABLE (0)</div><div class='del'>-#define IWL_EVT_DISABLE_SIZE (1532/32)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_disable_events - Disable selected events in uCode event log</div><div class='del'>- *</div><div class='del'>- * Disable an event by writing "1"s into "disable"</div><div class='del'>- *   bitmap in SRAM.  Bit position corresponds to Event # (id/type).</div><div class='del'>- *   Default values of 0 enable uCode events to be logged.</div><div class='del'>- * Use for only special debugging.  This function is just a placeholder as-is,</div><div class='del'>- *   you'll need to provide the special bits! ...</div><div class='del'>- *   ... and set IWL_EVT_DISABLE to 1. */</div><div class='del'>-void iwl3945_disable_events(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	u32 base;		/* SRAM address of event log header */</div><div class='del'>-	u32 disable_ptr;	/* SRAM address of event-disable bitmap array */</div><div class='del'>-	u32 array_size;		/* # of u32 entries in array */</div><div class='del'>-	static const u32 evt_disable[IWL_EVT_DISABLE_SIZE] = {</div><div class='del'>-		0x00000000,	/*   31 -    0  Event id numbers */</div><div class='del'>-		0x00000000,	/*   63 -   32 */</div><div class='del'>-		0x00000000,	/*   95 -   64 */</div><div class='del'>-		0x00000000,	/*  127 -   96 */</div><div class='del'>-		0x00000000,	/*  159 -  128 */</div><div class='del'>-		0x00000000,	/*  191 -  160 */</div><div class='del'>-		0x00000000,	/*  223 -  192 */</div><div class='del'>-		0x00000000,	/*  255 -  224 */</div><div class='del'>-		0x00000000,	/*  287 -  256 */</div><div class='del'>-		0x00000000,	/*  319 -  288 */</div><div class='del'>-		0x00000000,	/*  351 -  320 */</div><div class='del'>-		0x00000000,	/*  383 -  352 */</div><div class='del'>-		0x00000000,	/*  415 -  384 */</div><div class='del'>-		0x00000000,	/*  447 -  416 */</div><div class='del'>-		0x00000000,	/*  479 -  448 */</div><div class='del'>-		0x00000000,	/*  511 -  480 */</div><div class='del'>-		0x00000000,	/*  543 -  512 */</div><div class='del'>-		0x00000000,	/*  575 -  544 */</div><div class='del'>-		0x00000000,	/*  607 -  576 */</div><div class='del'>-		0x00000000,	/*  639 -  608 */</div><div class='del'>-		0x00000000,	/*  671 -  640 */</div><div class='del'>-		0x00000000,	/*  703 -  672 */</div><div class='del'>-		0x00000000,	/*  735 -  704 */</div><div class='del'>-		0x00000000,	/*  767 -  736 */</div><div class='del'>-		0x00000000,	/*  799 -  768 */</div><div class='del'>-		0x00000000,	/*  831 -  800 */</div><div class='del'>-		0x00000000,	/*  863 -  832 */</div><div class='del'>-		0x00000000,	/*  895 -  864 */</div><div class='del'>-		0x00000000,	/*  927 -  896 */</div><div class='del'>-		0x00000000,	/*  959 -  928 */</div><div class='del'>-		0x00000000,	/*  991 -  960 */</div><div class='del'>-		0x00000000,	/* 1023 -  992 */</div><div class='del'>-		0x00000000,	/* 1055 - 1024 */</div><div class='del'>-		0x00000000,	/* 1087 - 1056 */</div><div class='del'>-		0x00000000,	/* 1119 - 1088 */</div><div class='del'>-		0x00000000,	/* 1151 - 1120 */</div><div class='del'>-		0x00000000,	/* 1183 - 1152 */</div><div class='del'>-		0x00000000,	/* 1215 - 1184 */</div><div class='del'>-		0x00000000,	/* 1247 - 1216 */</div><div class='del'>-		0x00000000,	/* 1279 - 1248 */</div><div class='del'>-		0x00000000,	/* 1311 - 1280 */</div><div class='del'>-		0x00000000,	/* 1343 - 1312 */</div><div class='del'>-		0x00000000,	/* 1375 - 1344 */</div><div class='del'>-		0x00000000,	/* 1407 - 1376 */</div><div class='del'>-		0x00000000,	/* 1439 - 1408 */</div><div class='del'>-		0x00000000,	/* 1471 - 1440 */</div><div class='del'>-		0x00000000,	/* 1503 - 1472 */</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	base = le32_to_cpu(priv-&gt;card_alive.log_event_table_ptr);</div><div class='del'>-	if (!iwl3945_hw_valid_rtc_data_addr(base)) {</div><div class='del'>-		IWL_ERR(priv, "Invalid event log pointer 0x%08X\n", base);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	disable_ptr = iwl_legacy_read_targ_mem(priv, base + (4 * sizeof(u32)));</div><div class='del'>-	array_size = iwl_legacy_read_targ_mem(priv, base + (5 * sizeof(u32)));</div><div class='del'>-</div><div class='del'>-	if (IWL_EVT_DISABLE &amp;&amp; (array_size == IWL_EVT_DISABLE_SIZE)) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Disabling selected uCode log events at 0x%x\n",</div><div class='del'>-			       disable_ptr);</div><div class='del'>-		for (i = 0; i &lt; IWL_EVT_DISABLE_SIZE; i++)</div><div class='del'>-			iwl_legacy_write_targ_mem(priv,</div><div class='del'>-					   disable_ptr + (i * sizeof(u32)),</div><div class='del'>-					   evt_disable[i]);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Selected uCode log events may be disabled\n");</div><div class='del'>-		IWL_DEBUG_INFO(priv, "  by writing \"1\"s into disable bitmap\n");</div><div class='del'>-		IWL_DEBUG_INFO(priv, "  in SRAM at 0x%x, size %d u32s\n",</div><div class='del'>-			       disable_ptr, array_size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl3945_hwrate_to_plcp_idx(u8 plcp)</div><div class='del'>-{</div><div class='del'>-	int idx;</div><div class='del'>-</div><div class='del'>-	for (idx = 0; idx &lt; IWL_RATE_COUNT_3945; idx++)</div><div class='del'>-		if (iwl3945_rates[idx].plcp == plcp)</div><div class='del'>-			return idx;</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-#define TX_STATUS_ENTRY(x) case TX_3945_STATUS_FAIL_ ## x: return #x</div><div class='del'>-</div><div class='del'>-static const char *iwl3945_get_tx_fail_reason(u32 status)</div><div class='del'>-{</div><div class='del'>-	switch (status &amp; TX_STATUS_MSK) {</div><div class='del'>-	case TX_3945_STATUS_SUCCESS:</div><div class='del'>-		return "SUCCESS";</div><div class='del'>-		TX_STATUS_ENTRY(SHORT_LIMIT);</div><div class='del'>-		TX_STATUS_ENTRY(LONG_LIMIT);</div><div class='del'>-		TX_STATUS_ENTRY(FIFO_UNDERRUN);</div><div class='del'>-		TX_STATUS_ENTRY(MGMNT_ABORT);</div><div class='del'>-		TX_STATUS_ENTRY(NEXT_FRAG);</div><div class='del'>-		TX_STATUS_ENTRY(LIFE_EXPIRE);</div><div class='del'>-		TX_STATUS_ENTRY(DEST_PS);</div><div class='del'>-		TX_STATUS_ENTRY(ABORTED);</div><div class='del'>-		TX_STATUS_ENTRY(BT_RETRY);</div><div class='del'>-		TX_STATUS_ENTRY(STA_INVALID);</div><div class='del'>-		TX_STATUS_ENTRY(FRAG_DROPPED);</div><div class='del'>-		TX_STATUS_ENTRY(TID_DISABLE);</div><div class='del'>-		TX_STATUS_ENTRY(FRAME_FLUSHED);</div><div class='del'>-		TX_STATUS_ENTRY(INSUFFICIENT_CF_POLL);</div><div class='del'>-		TX_STATUS_ENTRY(TX_LOCKED);</div><div class='del'>-		TX_STATUS_ENTRY(NO_BEACON_ON_RADAR);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return "UNKNOWN";</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline const char *iwl3945_get_tx_fail_reason(u32 status)</div><div class='del'>-{</div><div class='del'>-	return "";</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * get ieee prev rate from rate scale table.</div><div class='del'>- * for A and B mode we need to overright prev</div><div class='del'>- * value</div><div class='del'>- */</div><div class='del'>-int iwl3945_rs_next_rate(struct iwl_priv *priv, int rate)</div><div class='del'>-{</div><div class='del'>-	int next_rate = iwl3945_get_prev_ieee_rate(rate);</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;band) {</div><div class='del'>-	case IEEE80211_BAND_5GHZ:</div><div class='del'>-		if (rate == IWL_RATE_12M_INDEX)</div><div class='del'>-			next_rate = IWL_RATE_9M_INDEX;</div><div class='del'>-		else if (rate == IWL_RATE_6M_INDEX)</div><div class='del'>-			next_rate = IWL_RATE_6M_INDEX;</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_BAND_2GHZ:</div><div class='del'>-		if (!(priv-&gt;_3945.sta_supp_rates &amp; IWL_OFDM_RATES_MASK) &amp;&amp;</div><div class='del'>-		    iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS)) {</div><div class='del'>-			if (rate == IWL_RATE_11M_INDEX)</div><div class='del'>-				next_rate = IWL_RATE_5M_INDEX;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return next_rate;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_tx_queue_reclaim - Reclaim Tx queue entries already Tx'd</div><div class='del'>- *</div><div class='del'>- * When FW advances 'R' index, all entries between old and new 'R' index</div><div class='del'>- * need to be reclaimed. As result, some free space forms. If there is</div><div class='del'>- * enough free space (&gt; low mark), wake the stack that feeds us.</div><div class='del'>- */</div><div class='del'>-static void iwl3945_tx_queue_reclaim(struct iwl_priv *priv,</div><div class='del'>-				     int txq_id, int index)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tx_queue *txq = &amp;priv-&gt;txq[txq_id];</div><div class='del'>-	struct iwl_queue *q = &amp;txq-&gt;q;</div><div class='del'>-	struct iwl_tx_info *tx_info;</div><div class='del'>-</div><div class='del'>-	BUG_ON(txq_id == IWL39_CMD_QUEUE_NUM);</div><div class='del'>-</div><div class='del'>-	for (index = iwl_legacy_queue_inc_wrap(index, q-&gt;n_bd);</div><div class='del'>-		q-&gt;read_ptr != index;</div><div class='del'>-		q-&gt;read_ptr = iwl_legacy_queue_inc_wrap(q-&gt;read_ptr, q-&gt;n_bd)) {</div><div class='del'>-</div><div class='del'>-		tx_info = &amp;txq-&gt;txb[txq-&gt;q.read_ptr];</div><div class='del'>-		ieee80211_tx_status_irqsafe(priv-&gt;hw, tx_info-&gt;skb);</div><div class='del'>-		tx_info-&gt;skb = NULL;</div><div class='del'>-		priv-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_free_tfd(priv, txq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_queue_space(q) &gt; q-&gt;low_mark &amp;&amp; (txq_id &gt;= 0) &amp;&amp;</div><div class='del'>-			(txq_id != IWL39_CMD_QUEUE_NUM) &amp;&amp;</div><div class='del'>-			priv-&gt;mac80211_registered)</div><div class='del'>-		iwl_legacy_wake_queue(priv, txq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_rx_reply_tx - Handle Tx response</div><div class='del'>- */</div><div class='del'>-static void iwl3945_rx_reply_tx(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	u16 sequence = le16_to_cpu(pkt-&gt;hdr.sequence);</div><div class='del'>-	int txq_id = SEQ_TO_QUEUE(sequence);</div><div class='del'>-	int index = SEQ_TO_INDEX(sequence);</div><div class='del'>-	struct iwl_tx_queue *txq = &amp;priv-&gt;txq[txq_id];</div><div class='del'>-	struct ieee80211_tx_info *info;</div><div class='del'>-	struct iwl3945_tx_resp *tx_resp = (void *)&amp;pkt-&gt;u.raw[0];</div><div class='del'>-	u32  status = le32_to_cpu(tx_resp-&gt;status);</div><div class='del'>-	int rate_idx;</div><div class='del'>-	int fail;</div><div class='del'>-</div><div class='del'>-	if ((index &gt;= txq-&gt;q.n_bd) || (iwl_legacy_queue_used(&amp;txq-&gt;q, index) == 0)) {</div><div class='del'>-		IWL_ERR(priv, "Read index for DMA queue txq_id (%d) index %d "</div><div class='del'>-			  "is out of range [0-%d] %d %d\n", txq_id,</div><div class='del'>-			  index, txq-&gt;q.n_bd, txq-&gt;q.write_ptr,</div><div class='del'>-			  txq-&gt;q.read_ptr);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	txq-&gt;time_stamp = jiffies;</div><div class='del'>-	info = IEEE80211_SKB_CB(txq-&gt;txb[txq-&gt;q.read_ptr].skb);</div><div class='del'>-	ieee80211_tx_info_clear_status(info);</div><div class='del'>-</div><div class='del'>-	/* Fill the MRR chain with some info about on-chip retransmissions */</div><div class='del'>-	rate_idx = iwl3945_hwrate_to_plcp_idx(tx_resp-&gt;rate);</div><div class='del'>-	if (info-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='del'>-		rate_idx -= IWL_FIRST_OFDM_RATE;</div><div class='del'>-</div><div class='del'>-	fail = tx_resp-&gt;failure_frame;</div><div class='del'>-</div><div class='del'>-	info-&gt;status.rates[0].idx = rate_idx;</div><div class='del'>-	info-&gt;status.rates[0].count = fail + 1; /* add final attempt */</div><div class='del'>-</div><div class='del'>-	/* tx_status-&gt;rts_retry_count = tx_resp-&gt;failure_rts; */</div><div class='del'>-	info-&gt;flags |= ((status &amp; TX_STATUS_MSK) == TX_STATUS_SUCCESS) ?</div><div class='del'>-				IEEE80211_TX_STAT_ACK : 0;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TX(priv, "Tx queue %d Status %s (0x%08x) plcp rate %d retries %d\n",</div><div class='del'>-			txq_id, iwl3945_get_tx_fail_reason(status), status,</div><div class='del'>-			tx_resp-&gt;rate, tx_resp-&gt;failure_frame);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TX_REPLY(priv, "Tx queue reclaim %d\n", index);</div><div class='del'>-	iwl3945_tx_queue_reclaim(priv, txq_id, index);</div><div class='del'>-</div><div class='del'>-	if (status &amp; TX_ABORT_REQUIRED_MSK)</div><div class='del'>-		IWL_ERR(priv, "TODO:  Implement Tx ABORT REQUIRED!!!\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'>- *</div><div class='del'>- * Intel PRO/Wireless 3945ABG/BG Network Connection</div><div class='del'>- *</div><div class='del'>- *  RX handler implementations</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS</div><div class='del'>-static void iwl3945_accumulative_statistics(struct iwl_priv *priv,</div><div class='del'>-					    __le32 *stats)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	__le32 *prev_stats;</div><div class='del'>-	u32 *accum_stats;</div><div class='del'>-	u32 *delta, *max_delta;</div><div class='del'>-</div><div class='del'>-	prev_stats = (__le32 *)&amp;priv-&gt;_3945.statistics;</div><div class='del'>-	accum_stats = (u32 *)&amp;priv-&gt;_3945.accum_statistics;</div><div class='del'>-	delta = (u32 *)&amp;priv-&gt;_3945.delta_statistics;</div><div class='del'>-	max_delta = (u32 *)&amp;priv-&gt;_3945.max_delta;</div><div class='del'>-</div><div class='del'>-	for (i = sizeof(__le32); i &lt; sizeof(struct iwl3945_notif_statistics);</div><div class='del'>-	     i += sizeof(__le32), stats++, prev_stats++, delta++,</div><div class='del'>-	     max_delta++, accum_stats++) {</div><div class='del'>-		if (le32_to_cpu(*stats) &gt; le32_to_cpu(*prev_stats)) {</div><div class='del'>-			*delta = (le32_to_cpu(*stats) -</div><div class='del'>-				le32_to_cpu(*prev_stats));</div><div class='del'>-			*accum_stats += *delta;</div><div class='del'>-			if (*delta &gt; *max_delta)</div><div class='del'>-				*max_delta = *delta;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* reset accumulative statistics for "no-counter" type statistics */</div><div class='del'>-	priv-&gt;_3945.accum_statistics.general.temperature =</div><div class='del'>-		priv-&gt;_3945.statistics.general.temperature;</div><div class='del'>-	priv-&gt;_3945.accum_statistics.general.ttl_timestamp =</div><div class='del'>-		priv-&gt;_3945.statistics.general.ttl_timestamp;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void iwl3945_hw_rx_statistics(struct iwl_priv *priv,</div><div class='del'>-		struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RX(priv, "Statistics notification received (%d vs %d).\n",</div><div class='del'>-		     (int)sizeof(struct iwl3945_notif_statistics),</div><div class='del'>-		     le32_to_cpu(pkt-&gt;len_n_flags) &amp; FH_RSCSR_FRAME_SIZE_MSK);</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS</div><div class='del'>-	iwl3945_accumulative_statistics(priv, (__le32 *)&amp;pkt-&gt;u.raw);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;priv-&gt;_3945.statistics, pkt-&gt;u.raw, sizeof(priv-&gt;_3945.statistics));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl3945_reply_statistics(struct iwl_priv *priv,</div><div class='del'>-			      struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	__le32 *flag = (__le32 *)&amp;pkt-&gt;u.raw;</div><div class='del'>-</div><div class='del'>-	if (le32_to_cpu(*flag) &amp; UCODE_STATISTICS_CLEAR_MSK) {</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS</div><div class='del'>-		memset(&amp;priv-&gt;_3945.accum_statistics, 0,</div><div class='del'>-			sizeof(struct iwl3945_notif_statistics));</div><div class='del'>-		memset(&amp;priv-&gt;_3945.delta_statistics, 0,</div><div class='del'>-			sizeof(struct iwl3945_notif_statistics));</div><div class='del'>-		memset(&amp;priv-&gt;_3945.max_delta, 0,</div><div class='del'>-			sizeof(struct iwl3945_notif_statistics));</div><div class='del'>-#endif</div><div class='del'>-		IWL_DEBUG_RX(priv, "Statistics have been cleared\n");</div><div class='del'>-	}</div><div class='del'>-	iwl3945_hw_rx_statistics(priv, rxb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Misc. internal state and helper functions</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-/* This is necessary only for a number of statistics, see the caller. */</div><div class='del'>-static int iwl3945_is_network_packet(struct iwl_priv *priv,</div><div class='del'>-		struct ieee80211_hdr *header)</div><div class='del'>-{</div><div class='del'>-	/* Filter incoming packets to determine if they are targeted toward</div><div class='del'>-	 * this network, discarding packets coming from ourselves */</div><div class='del'>-	switch (priv-&gt;iw_mode) {</div><div class='del'>-	case NL80211_IFTYPE_ADHOC: /* Header: Dest. | Source    | BSSID */</div><div class='del'>-		/* packets to our IBSS update information */</div><div class='del'>-		return !compare_ether_addr(header-&gt;addr3, priv-&gt;bssid);</div><div class='del'>-	case NL80211_IFTYPE_STATION: /* Header: Dest. | AP{BSSID} | Source */</div><div class='del'>-		/* packets to our IBSS update information */</div><div class='del'>-		return !compare_ether_addr(header-&gt;addr2, priv-&gt;bssid);</div><div class='del'>-	default:</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_pass_packet_to_mac80211(struct iwl_priv *priv,</div><div class='del'>-				   struct iwl_rx_mem_buffer *rxb,</div><div class='del'>-				   struct ieee80211_rx_status *stats)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)IWL_RX_DATA(pkt);</div><div class='del'>-	struct iwl3945_rx_frame_hdr *rx_hdr = IWL_RX_HDR(pkt);</div><div class='del'>-	struct iwl3945_rx_frame_end *rx_end = IWL_RX_END(pkt);</div><div class='del'>-	u16 len = le16_to_cpu(rx_hdr-&gt;len);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	__le16 fc = hdr-&gt;frame_control;</div><div class='del'>-</div><div class='del'>-	/* We received data from the HW, so stop the watchdog */</div><div class='del'>-	if (unlikely(len + IWL39_RX_FRAME_SIZE &gt;</div><div class='del'>-		     PAGE_SIZE &lt;&lt; priv-&gt;hw_params.rx_page_order)) {</div><div class='del'>-		IWL_DEBUG_DROP(priv, "Corruption detected!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We only process data packets if the interface is open */</div><div class='del'>-	if (unlikely(!priv-&gt;is_open)) {</div><div class='del'>-		IWL_DEBUG_DROP_LIMIT(priv,</div><div class='del'>-			"Dropping packet while interface is not open.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb = dev_alloc_skb(128);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		IWL_ERR(priv, "dev_alloc_skb failed\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!iwl3945_mod_params.sw_crypto)</div><div class='del'>-		iwl_legacy_set_decrypted_flag(priv,</div><div class='del'>-				       (struct ieee80211_hdr *)rxb_addr(rxb),</div><div class='del'>-				       le32_to_cpu(rx_end-&gt;status), stats);</div><div class='del'>-</div><div class='del'>-	skb_add_rx_frag(skb, 0, rxb-&gt;page,</div><div class='del'>-			(void *)rx_hdr-&gt;payload - (void *)pkt, len);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_update_stats(priv, false, fc, len);</div><div class='del'>-	memcpy(IEEE80211_SKB_RXCB(skb), stats, sizeof(*stats));</div><div class='del'>-</div><div class='del'>-	ieee80211_rx(priv-&gt;hw, skb);</div><div class='del'>-	priv-&gt;alloc_rxb_page--;</div><div class='del'>-	rxb-&gt;page = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define IWL_DELAY_NEXT_SCAN_AFTER_ASSOC (HZ*6)</div><div class='del'>-</div><div class='del'>-static void iwl3945_rx_reply_rx(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hdr *header;</div><div class='del'>-	struct ieee80211_rx_status rx_status;</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl3945_rx_frame_stats *rx_stats = IWL_RX_STATS(pkt);</div><div class='del'>-	struct iwl3945_rx_frame_hdr *rx_hdr = IWL_RX_HDR(pkt);</div><div class='del'>-	struct iwl3945_rx_frame_end *rx_end = IWL_RX_END(pkt);</div><div class='del'>-	u16 rx_stats_sig_avg __maybe_unused = le16_to_cpu(rx_stats-&gt;sig_avg);</div><div class='del'>-	u16 rx_stats_noise_diff __maybe_unused = le16_to_cpu(rx_stats-&gt;noise_diff);</div><div class='del'>-	u8 network_packet;</div><div class='del'>-</div><div class='del'>-	rx_status.flag = 0;</div><div class='del'>-	rx_status.mactime = le64_to_cpu(rx_end-&gt;timestamp);</div><div class='del'>-	rx_status.band = (rx_hdr-&gt;phy_flags &amp; RX_RES_PHY_FLAGS_BAND_24_MSK) ?</div><div class='del'>-				IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;</div><div class='del'>-	rx_status.freq =</div><div class='del'>-		ieee80211_channel_to_frequency(le16_to_cpu(rx_hdr-&gt;channel),</div><div class='del'>-					       rx_status.band);</div><div class='del'>-</div><div class='del'>-	rx_status.rate_idx = iwl3945_hwrate_to_plcp_idx(rx_hdr-&gt;rate);</div><div class='del'>-	if (rx_status.band == IEEE80211_BAND_5GHZ)</div><div class='del'>-		rx_status.rate_idx -= IWL_FIRST_OFDM_RATE;</div><div class='del'>-</div><div class='del'>-	rx_status.antenna = (le16_to_cpu(rx_hdr-&gt;phy_flags) &amp;</div><div class='del'>-					RX_RES_PHY_FLAGS_ANTENNA_MSK) &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	/* set the preamble flag if appropriate */</div><div class='del'>-	if (rx_hdr-&gt;phy_flags &amp; RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK)</div><div class='del'>-		rx_status.flag |= RX_FLAG_SHORTPRE;</div><div class='del'>-</div><div class='del'>-	if ((unlikely(rx_stats-&gt;phy_count &gt; 20))) {</div><div class='del'>-		IWL_DEBUG_DROP(priv, "dsp size out of range [0,20]: %d/n",</div><div class='del'>-				rx_stats-&gt;phy_count);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(rx_end-&gt;status &amp; RX_RES_STATUS_NO_CRC32_ERROR)</div><div class='del'>-	    || !(rx_end-&gt;status &amp; RX_RES_STATUS_NO_RXE_OVERFLOW)) {</div><div class='del'>-		IWL_DEBUG_RX(priv, "Bad CRC or FIFO: 0x%08X.\n", rx_end-&gt;status);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Convert 3945's rssi indicator to dBm */</div><div class='del'>-	rx_status.signal = rx_stats-&gt;rssi - IWL39_RSSI_OFFSET;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_STATS(priv, "Rssi %d sig_avg %d noise_diff %d\n",</div><div class='del'>-			rx_status.signal, rx_stats_sig_avg,</div><div class='del'>-			rx_stats_noise_diff);</div><div class='del'>-</div><div class='del'>-	header = (struct ieee80211_hdr *)IWL_RX_DATA(pkt);</div><div class='del'>-</div><div class='del'>-	network_packet = iwl3945_is_network_packet(priv, header);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_STATS_LIMIT(priv, "[%c] %d RSSI:%d Signal:%u, Rate:%u\n",</div><div class='del'>-			      network_packet ? '*' : ' ',</div><div class='del'>-			      le16_to_cpu(rx_hdr-&gt;channel),</div><div class='del'>-			      rx_status.signal, rx_status.signal,</div><div class='del'>-			      rx_status.rate_idx);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_dbg_log_rx_data_frame(priv, le16_to_cpu(rx_hdr-&gt;len),</div><div class='del'>-						header);</div><div class='del'>-</div><div class='del'>-	if (network_packet) {</div><div class='del'>-		priv-&gt;_3945.last_beacon_time =</div><div class='del'>-			le32_to_cpu(rx_end-&gt;beacon_timestamp);</div><div class='del'>-		priv-&gt;_3945.last_tsf = le64_to_cpu(rx_end-&gt;timestamp);</div><div class='del'>-		priv-&gt;_3945.last_rx_rssi = rx_status.signal;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl3945_pass_packet_to_mac80211(priv, rxb, &amp;rx_status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv,</div><div class='del'>-				     struct iwl_tx_queue *txq,</div><div class='del'>-				     dma_addr_t addr, u16 len, u8 reset, u8 pad)</div><div class='del'>-{</div><div class='del'>-	int count;</div><div class='del'>-	struct iwl_queue *q;</div><div class='del'>-	struct iwl3945_tfd *tfd, *tfd_tmp;</div><div class='del'>-</div><div class='del'>-	q = &amp;txq-&gt;q;</div><div class='del'>-	tfd_tmp = (struct iwl3945_tfd *)txq-&gt;tfds;</div><div class='del'>-	tfd = &amp;tfd_tmp[q-&gt;write_ptr];</div><div class='del'>-</div><div class='del'>-	if (reset)</div><div class='del'>-		memset(tfd, 0, sizeof(*tfd));</div><div class='del'>-</div><div class='del'>-	count = TFD_CTL_COUNT_GET(le32_to_cpu(tfd-&gt;control_flags));</div><div class='del'>-</div><div class='del'>-	if ((count &gt;= NUM_TFD_CHUNKS) || (count &lt; 0)) {</div><div class='del'>-		IWL_ERR(priv, "Error can not send more than %d chunks\n",</div><div class='del'>-			  NUM_TFD_CHUNKS);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tfd-&gt;tbs[count].addr = cpu_to_le32(addr);</div><div class='del'>-	tfd-&gt;tbs[count].len = cpu_to_le32(len);</div><div class='del'>-</div><div class='del'>-	count++;</div><div class='del'>-</div><div class='del'>-	tfd-&gt;control_flags = cpu_to_le32(TFD_CTL_COUNT_SET(count) |</div><div class='del'>-					 TFD_CTL_PAD_SET(pad));</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'>- * iwl3945_hw_txq_free_tfd - Free one TFD, those at index [txq-&gt;q.read_ptr]</div><div class='del'>- *</div><div class='del'>- * Does NOT advance any indexes</div><div class='del'>- */</div><div class='del'>-void iwl3945_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_tfd *tfd_tmp = (struct iwl3945_tfd *)txq-&gt;tfds;</div><div class='del'>-	int index = txq-&gt;q.read_ptr;</div><div class='del'>-	struct iwl3945_tfd *tfd = &amp;tfd_tmp[index];</div><div class='del'>-	struct pci_dev *dev = priv-&gt;pci_dev;</div><div class='del'>-	int i;</div><div class='del'>-	int counter;</div><div class='del'>-</div><div class='del'>-	/* sanity check */</div><div class='del'>-	counter = TFD_CTL_COUNT_GET(le32_to_cpu(tfd-&gt;control_flags));</div><div class='del'>-	if (counter &gt; NUM_TFD_CHUNKS) {</div><div class='del'>-		IWL_ERR(priv, "Too many chunks: %i\n", counter);</div><div class='del'>-		/* @todo issue fatal error, it is quite serious situation */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Unmap tx_cmd */</div><div class='del'>-	if (counter)</div><div class='del'>-		pci_unmap_single(dev,</div><div class='del'>-				dma_unmap_addr(&amp;txq-&gt;meta[index], mapping),</div><div class='del'>-				dma_unmap_len(&amp;txq-&gt;meta[index], len),</div><div class='del'>-				PCI_DMA_TODEVICE);</div><div class='del'>-</div><div class='del'>-	/* unmap chunks if any */</div><div class='del'>-</div><div class='del'>-	for (i = 1; i &lt; counter; i++)</div><div class='del'>-		pci_unmap_single(dev, le32_to_cpu(tfd-&gt;tbs[i].addr),</div><div class='del'>-			 le32_to_cpu(tfd-&gt;tbs[i].len), PCI_DMA_TODEVICE);</div><div class='del'>-</div><div class='del'>-	/* free SKB */</div><div class='del'>-	if (txq-&gt;txb) {</div><div class='del'>-		struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-		skb = txq-&gt;txb[txq-&gt;q.read_ptr].skb;</div><div class='del'>-</div><div class='del'>-		/* can be called from irqs-disabled context */</div><div class='del'>-		if (skb) {</div><div class='del'>-			dev_kfree_skb_any(skb);</div><div class='del'>-			txq-&gt;txb[txq-&gt;q.read_ptr].skb = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_hw_build_tx_cmd_rate - Add rate portion to TX_CMD:</div><div class='del'>- *</div><div class='del'>-*/</div><div class='del'>-void iwl3945_hw_build_tx_cmd_rate(struct iwl_priv *priv,</div><div class='del'>-				  struct iwl_device_cmd *cmd,</div><div class='del'>-				  struct ieee80211_tx_info *info,</div><div class='del'>-				  struct ieee80211_hdr *hdr,</div><div class='del'>-				  int sta_id, int tx_id)</div><div class='del'>-{</div><div class='del'>-	u16 hw_value = ieee80211_get_tx_rate(priv-&gt;hw, info)-&gt;hw_value;</div><div class='del'>-	u16 rate_index = min(hw_value &amp; 0xffff, IWL_RATE_COUNT_3945);</div><div class='del'>-	u16 rate_mask;</div><div class='del'>-	int rate;</div><div class='del'>-	u8 rts_retry_limit;</div><div class='del'>-	u8 data_retry_limit;</div><div class='del'>-	__le32 tx_flags;</div><div class='del'>-	__le16 fc = hdr-&gt;frame_control;</div><div class='del'>-	struct iwl3945_tx_cmd *tx_cmd = (struct iwl3945_tx_cmd *)cmd-&gt;cmd.payload;</div><div class='del'>-</div><div class='del'>-	rate = iwl3945_rates[rate_index].plcp;</div><div class='del'>-	tx_flags = tx_cmd-&gt;tx_flags;</div><div class='del'>-</div><div class='del'>-	/* We need to figure out how to get the sta-&gt;supp_rates while</div><div class='del'>-	 * in this running context */</div><div class='del'>-	rate_mask = IWL_RATES_MASK_3945;</div><div class='del'>-</div><div class='del'>-	/* Set retry limit on DATA packets and Probe Responses*/</div><div class='del'>-	if (ieee80211_is_probe_resp(fc))</div><div class='del'>-		data_retry_limit = 3;</div><div class='del'>-	else</div><div class='del'>-		data_retry_limit = IWL_DEFAULT_TX_RETRY;</div><div class='del'>-	tx_cmd-&gt;data_retry_limit = data_retry_limit;</div><div class='del'>-</div><div class='del'>-	if (tx_id &gt;= IWL39_CMD_QUEUE_NUM)</div><div class='del'>-		rts_retry_limit = 3;</div><div class='del'>-	else</div><div class='del'>-		rts_retry_limit = 7;</div><div class='del'>-</div><div class='del'>-	if (data_retry_limit &lt; rts_retry_limit)</div><div class='del'>-		rts_retry_limit = data_retry_limit;</div><div class='del'>-	tx_cmd-&gt;rts_retry_limit = rts_retry_limit;</div><div class='del'>-</div><div class='del'>-	tx_cmd-&gt;rate = rate;</div><div class='del'>-	tx_cmd-&gt;tx_flags = tx_flags;</div><div class='del'>-</div><div class='del'>-	/* OFDM */</div><div class='del'>-	tx_cmd-&gt;supp_rates[0] =</div><div class='del'>-	   ((rate_mask &amp; IWL_OFDM_RATES_MASK) &gt;&gt; IWL_FIRST_OFDM_RATE) &amp; 0xFF;</div><div class='del'>-</div><div class='del'>-	/* CCK */</div><div class='del'>-	tx_cmd-&gt;supp_rates[1] = (rate_mask &amp; 0xF);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "Tx sta id: %d, rate: %d (plcp), flags: 0x%4X "</div><div class='del'>-		       "cck/ofdm mask: 0x%x/0x%x\n", sta_id,</div><div class='del'>-		       tx_cmd-&gt;rate, le32_to_cpu(tx_cmd-&gt;tx_flags),</div><div class='del'>-		       tx_cmd-&gt;supp_rates[1], tx_cmd-&gt;supp_rates[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 iwl3945_sync_sta(struct iwl_priv *priv, int sta_id, u16 tx_rate)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags_spin;</div><div class='del'>-	struct iwl_station_entry *station;</div><div class='del'>-</div><div class='del'>-	if (sta_id == IWL_INVALID_STATION)</div><div class='del'>-		return IWL_INVALID_STATION;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-	station = &amp;priv-&gt;stations[sta_id];</div><div class='del'>-</div><div class='del'>-	station-&gt;sta.sta.modify_mask = STA_MODIFY_TX_RATE_MSK;</div><div class='del'>-	station-&gt;sta.rate_n_flags = cpu_to_le16(tx_rate);</div><div class='del'>-	station-&gt;sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='del'>-	iwl_legacy_send_add_sta(priv, &amp;station-&gt;sta, CMD_ASYNC);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "SCALE sync station %d to rate %d\n",</div><div class='del'>-			sta_id, tx_rate);</div><div class='del'>-	return sta_id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_set_pwr_vmain(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-/*</div><div class='del'>- * (for documentation purposes)</div><div class='del'>- * to set power to V_AUX, do</div><div class='del'>-</div><div class='del'>-		if (pci_pme_capable(priv-&gt;pci_dev, PCI_D3cold)) {</div><div class='del'>-			iwl_legacy_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,</div><div class='del'>-					APMG_PS_CTRL_VAL_PWR_SRC_VAUX,</div><div class='del'>-					~APMG_PS_CTRL_MSK_PWR_SRC);</div><div class='del'>-</div><div class='del'>-			iwl_poll_bit(priv, CSR_GPIO_IN,</div><div class='del'>-				     CSR_GPIO_IN_VAL_VAUX_PWR_SRC,</div><div class='del'>-				     CSR_GPIO_IN_BIT_AUX_POWER, 5000);</div><div class='del'>-		}</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-	iwl_legacy_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,</div><div class='del'>-			APMG_PS_CTRL_VAL_PWR_SRC_VMAIN,</div><div class='del'>-			~APMG_PS_CTRL_MSK_PWR_SRC);</div><div class='del'>-</div><div class='del'>-	iwl_poll_bit(priv, CSR_GPIO_IN, CSR_GPIO_IN_VAL_VMAIN_PWR_SRC,</div><div class='del'>-		     CSR_GPIO_IN_BIT_AUX_POWER, 5000);	/* uS */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl3945_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq)</div><div class='del'>-{</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH39_RCSR_RBD_BASE(0), rxq-&gt;bd_dma);</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH39_RCSR_RPTR_ADDR(0),</div><div class='del'>-					rxq-&gt;rb_stts_dma);</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH39_RCSR_WPTR(0), 0);</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH39_RCSR_CONFIG(0),</div><div class='del'>-		FH39_RCSR_RX_CONFIG_REG_VAL_DMA_CHNL_EN_ENABLE |</div><div class='del'>-		FH39_RCSR_RX_CONFIG_REG_VAL_RDRBD_EN_ENABLE |</div><div class='del'>-		FH39_RCSR_RX_CONFIG_REG_BIT_WR_STTS_EN |</div><div class='del'>-		FH39_RCSR_RX_CONFIG_REG_VAL_MAX_FRAG_SIZE_128 |</div><div class='del'>-		(RX_QUEUE_SIZE_LOG &lt;&lt; FH39_RCSR_RX_CONFIG_REG_POS_RBDC_SIZE) |</div><div class='del'>-		FH39_RCSR_RX_CONFIG_REG_VAL_IRQ_DEST_INT_HOST |</div><div class='del'>-		(1 &lt;&lt; FH39_RCSR_RX_CONFIG_REG_POS_IRQ_RBTH) |</div><div class='del'>-		FH39_RCSR_RX_CONFIG_REG_VAL_MSG_MODE_FH);</div><div class='del'>-</div><div class='del'>-	/* fake read to flush all prev I/O */</div><div class='del'>-	iwl_legacy_read_direct32(priv, FH39_RSSR_CTRL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl3945_tx_reset(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	/* bypass mode */</div><div class='del'>-	iwl_legacy_write_prph(priv, ALM_SCD_MODE_REG, 0x2);</div><div class='del'>-</div><div class='del'>-	/* RA 0 is active */</div><div class='del'>-	iwl_legacy_write_prph(priv, ALM_SCD_ARASTAT_REG, 0x01);</div><div class='del'>-</div><div class='del'>-	/* all 6 fifo are active */</div><div class='del'>-	iwl_legacy_write_prph(priv, ALM_SCD_TXFACT_REG, 0x3f);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_write_prph(priv, ALM_SCD_SBYP_MODE_1_REG, 0x010000);</div><div class='del'>-	iwl_legacy_write_prph(priv, ALM_SCD_SBYP_MODE_2_REG, 0x030002);</div><div class='del'>-	iwl_legacy_write_prph(priv, ALM_SCD_TXF4MF_REG, 0x000004);</div><div class='del'>-	iwl_legacy_write_prph(priv, ALM_SCD_TXF5MF_REG, 0x000005);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH39_TSSR_CBB_BASE,</div><div class='del'>-			     priv-&gt;_3945.shared_phys);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH39_TSSR_MSG_CONFIG,</div><div class='del'>-		FH39_TSSR_TX_MSG_CONFIG_REG_VAL_SNOOP_RD_TXPD_ON |</div><div class='del'>-		FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RD_TXPD_ON |</div><div class='del'>-		FH39_TSSR_TX_MSG_CONFIG_REG_VAL_MAX_FRAG_SIZE_128B |</div><div class='del'>-		FH39_TSSR_TX_MSG_CONFIG_REG_VAL_SNOOP_RD_TFD_ON |</div><div class='del'>-		FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RD_CBB_ON |</div><div class='del'>-		FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RSP_WAIT_TH |</div><div class='del'>-		FH39_TSSR_TX_MSG_CONFIG_REG_VAL_RSP_WAIT_TH);</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'>- * iwl3945_txq_ctx_reset - Reset TX queue context</div><div class='del'>- *</div><div class='del'>- * Destroys all DMA structures and initialize them again</div><div class='del'>- */</div><div class='del'>-static int iwl3945_txq_ctx_reset(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-	int txq_id, slots_num;</div><div class='del'>-</div><div class='del'>-	iwl3945_hw_txq_ctx_free(priv);</div><div class='del'>-</div><div class='del'>-	/* allocate tx queue structure */</div><div class='del'>-	rc = iwl_legacy_alloc_txq_mem(priv);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	/* Tx CMD queue */</div><div class='del'>-	rc = iwl3945_tx_reset(priv);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	/* Tx queue(s) */</div><div class='del'>-	for (txq_id = 0; txq_id &lt; priv-&gt;hw_params.max_txq_num; txq_id++) {</div><div class='del'>-		slots_num = (txq_id == IWL39_CMD_QUEUE_NUM) ?</div><div class='del'>-				TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;</div><div class='del'>-		rc = iwl_legacy_tx_queue_init(priv, &amp;priv-&gt;txq[txq_id],</div><div class='del'>-						slots_num, txq_id);</div><div class='del'>-		if (rc) {</div><div class='del'>-			IWL_ERR(priv, "Tx %d queue init failed\n", txq_id);</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	iwl3945_hw_txq_ctx_free(priv);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Start up 3945's basic functionality after it has been reset</div><div class='del'>- * (e.g. after platform boot, or shutdown via iwl_legacy_apm_stop())</div><div class='del'>- * NOTE:  This does not load uCode nor start the embedded processor</div><div class='del'>- */</div><div class='del'>-static int iwl3945_apm_init(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int ret = iwl_legacy_apm_init(priv);</div><div class='del'>-</div><div class='del'>-	/* Clear APMG (NIC's internal power management) interrupts */</div><div class='del'>-	iwl_legacy_write_prph(priv, APMG_RTC_INT_MSK_REG, 0x0);</div><div class='del'>-	iwl_legacy_write_prph(priv, APMG_RTC_INT_STT_REG, 0xFFFFFFFF);</div><div class='del'>-</div><div class='del'>-	/* Reset radio chip */</div><div class='del'>-	iwl_legacy_set_bits_prph(priv, APMG_PS_CTRL_REG,</div><div class='del'>-				APMG_PS_CTRL_VAL_RESET_REQ);</div><div class='del'>-	udelay(5);</div><div class='del'>-	iwl_legacy_clear_bits_prph(priv, APMG_PS_CTRL_REG,</div><div class='del'>-				APMG_PS_CTRL_VAL_RESET_REQ);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_nic_config(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv-&gt;eeprom;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u8 rev_id = priv-&gt;pci_dev-&gt;revision;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Determine HW type */</div><div class='del'>-	IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", rev_id);</div><div class='del'>-</div><div class='del'>-	if (rev_id &amp; PCI_CFG_REV_ID_BIT_RTP)</div><div class='del'>-		IWL_DEBUG_INFO(priv, "RTP type\n");</div><div class='del'>-	else if (rev_id &amp; PCI_CFG_REV_ID_BIT_BASIC_SKU) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "3945 RADIO-MB type\n");</div><div class='del'>-		iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-			    CSR39_HW_IF_CONFIG_REG_BIT_3945_MB);</div><div class='del'>-	} else {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "3945 RADIO-MM type\n");</div><div class='del'>-		iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-			    CSR39_HW_IF_CONFIG_REG_BIT_3945_MM);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (EEPROM_SKU_CAP_OP_MODE_MRC == eeprom-&gt;sku_cap) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "SKU OP mode is mrc\n");</div><div class='del'>-		iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-			    CSR39_HW_IF_CONFIG_REG_BIT_SKU_MRC);</div><div class='del'>-	} else</div><div class='del'>-		IWL_DEBUG_INFO(priv, "SKU OP mode is basic\n");</div><div class='del'>-</div><div class='del'>-	if ((eeprom-&gt;board_revision &amp; 0xF0) == 0xD0) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "3945ABG revision is 0x%X\n",</div><div class='del'>-			       eeprom-&gt;board_revision);</div><div class='del'>-		iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-			    CSR39_HW_IF_CONFIG_REG_BIT_BOARD_TYPE);</div><div class='del'>-	} else {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "3945ABG revision is 0x%X\n",</div><div class='del'>-			       eeprom-&gt;board_revision);</div><div class='del'>-		iwl_legacy_clear_bit(priv, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-			      CSR39_HW_IF_CONFIG_REG_BIT_BOARD_TYPE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (eeprom-&gt;almgor_m_version &lt;= 1) {</div><div class='del'>-		iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-			    CSR39_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_A);</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Card M type A version is 0x%X\n",</div><div class='del'>-			       eeprom-&gt;almgor_m_version);</div><div class='del'>-	} else {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Card M type B version is 0x%X\n",</div><div class='del'>-			       eeprom-&gt;almgor_m_version);</div><div class='del'>-		iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-			    CSR39_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_B);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	if (eeprom-&gt;sku_cap &amp; EEPROM_SKU_CAP_SW_RF_KILL_ENABLE)</div><div class='del'>-		IWL_DEBUG_RF_KILL(priv, "SW RF KILL supported in EEPROM.\n");</div><div class='del'>-</div><div class='del'>-	if (eeprom-&gt;sku_cap &amp; EEPROM_SKU_CAP_HW_RF_KILL_ENABLE)</div><div class='del'>-		IWL_DEBUG_RF_KILL(priv, "HW RF KILL supported in EEPROM.\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl3945_hw_nic_init(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct iwl_rx_queue *rxq = &amp;priv-&gt;rxq;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	priv-&gt;cfg-&gt;ops-&gt;lib-&gt;apm_ops.init(priv);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	iwl3945_set_pwr_vmain(priv);</div><div class='del'>-</div><div class='del'>-	priv-&gt;cfg-&gt;ops-&gt;lib-&gt;apm_ops.config(priv);</div><div class='del'>-</div><div class='del'>-	/* Allocate the RX queue, or reset if it is already allocated */</div><div class='del'>-	if (!rxq-&gt;bd) {</div><div class='del'>-		rc = iwl_legacy_rx_queue_alloc(priv);</div><div class='del'>-		if (rc) {</div><div class='del'>-			IWL_ERR(priv, "Unable to initialize Rx queue\n");</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		iwl3945_rx_queue_reset(priv, rxq);</div><div class='del'>-</div><div class='del'>-	iwl3945_rx_replenish(priv);</div><div class='del'>-</div><div class='del'>-	iwl3945_rx_init(priv, rxq);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Look at using this instead:</div><div class='del'>-	rxq-&gt;need_update = 1;</div><div class='del'>-	iwl_legacy_rx_queue_update_write_ptr(priv, rxq);</div><div class='del'>-	*/</div><div class='del'>-</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH39_RCSR_WPTR(0), rxq-&gt;write &amp; ~7);</div><div class='del'>-</div><div class='del'>-	rc = iwl3945_txq_ctx_reset(priv);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	set_bit(STATUS_INIT, &amp;priv-&gt;status);</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'>- * iwl3945_hw_txq_ctx_free - Free TXQ Context</div><div class='del'>- *</div><div class='del'>- * Destroy all TX DMA queues and structures</div><div class='del'>- */</div><div class='del'>-void iwl3945_hw_txq_ctx_free(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int txq_id;</div><div class='del'>-</div><div class='del'>-	/* Tx queues */</div><div class='del'>-	if (priv-&gt;txq)</div><div class='del'>-		for (txq_id = 0; txq_id &lt; priv-&gt;hw_params.max_txq_num;</div><div class='del'>-		     txq_id++)</div><div class='del'>-			if (txq_id == IWL39_CMD_QUEUE_NUM)</div><div class='del'>-				iwl_legacy_cmd_queue_free(priv);</div><div class='del'>-			else</div><div class='del'>-				iwl_legacy_tx_queue_free(priv, txq_id);</div><div class='del'>-</div><div class='del'>-	/* free tx queue structure */</div><div class='del'>-	iwl_legacy_txq_mem(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl3945_hw_txq_ctx_stop(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int txq_id;</div><div class='del'>-</div><div class='del'>-	/* stop SCD */</div><div class='del'>-	iwl_legacy_write_prph(priv, ALM_SCD_MODE_REG, 0);</div><div class='del'>-	iwl_legacy_write_prph(priv, ALM_SCD_TXFACT_REG, 0);</div><div class='del'>-</div><div class='del'>-	/* reset TFD queues */</div><div class='del'>-	for (txq_id = 0; txq_id &lt; priv-&gt;hw_params.max_txq_num; txq_id++) {</div><div class='del'>-		iwl_legacy_write_direct32(priv, FH39_TCSR_CONFIG(txq_id), 0x0);</div><div class='del'>-		iwl_poll_direct_bit(priv, FH39_TSSR_TX_STATUS,</div><div class='del'>-				FH39_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(txq_id),</div><div class='del'>-				1000);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl3945_hw_txq_ctx_free(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_hw_reg_adjust_power_by_temp</div><div class='del'>- * return index delta into power gain settings table</div><div class='del'>-*/</div><div class='del'>-static int iwl3945_hw_reg_adjust_power_by_temp(int new_reading, int old_reading)</div><div class='del'>-{</div><div class='del'>-	return (new_reading - old_reading) * (-11) / 100;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_hw_reg_temp_out_of_range - Keep temperature in sane range</div><div class='del'>- */</div><div class='del'>-static inline int iwl3945_hw_reg_temp_out_of_range(int temperature)</div><div class='del'>-{</div><div class='del'>-	return ((temperature &lt; -260) || (temperature &gt; 25)) ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl3945_hw_get_temperature(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	return iwl_read32(priv, CSR_UCODE_DRV_GP2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_hw_reg_txpower_get_temperature</div><div class='del'>- * get the current temperature by reading from NIC</div><div class='del'>-*/</div><div class='del'>-static int iwl3945_hw_reg_txpower_get_temperature(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv-&gt;eeprom;</div><div class='del'>-	int temperature;</div><div class='del'>-</div><div class='del'>-	temperature = iwl3945_hw_get_temperature(priv);</div><div class='del'>-</div><div class='del'>-	/* driver's okay range is -260 to +25.</div><div class='del'>-	 *   human readable okay range is 0 to +285 */</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Temperature: %d\n", temperature + IWL_TEMP_CONVERT);</div><div class='del'>-</div><div class='del'>-	/* handle insane temp reading */</div><div class='del'>-	if (iwl3945_hw_reg_temp_out_of_range(temperature)) {</div><div class='del'>-		IWL_ERR(priv, "Error bad temperature value  %d\n", temperature);</div><div class='del'>-</div><div class='del'>-		/* if really really hot(?),</div><div class='del'>-		 *   substitute the 3rd band/group's temp measured at factory */</div><div class='del'>-		if (priv-&gt;last_temperature &gt; 100)</div><div class='del'>-			temperature = eeprom-&gt;groups[2].temperature;</div><div class='del'>-		else /* else use most recent "sane" value from driver */</div><div class='del'>-			temperature = priv-&gt;last_temperature;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return temperature;	/* raw, not "human readable" */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adjust Txpower only if temperature variance is greater than threshold.</div><div class='del'>- *</div><div class='del'>- * Both are lower than older versions' 9 degrees */</div><div class='del'>-#define IWL_TEMPERATURE_LIMIT_TIMER   6</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_is_temp_calib_needed - determines if new calibration is needed</div><div class='del'>- *</div><div class='del'>- * records new temperature in tx_mgr-&gt;temperature.</div><div class='del'>- * replaces tx_mgr-&gt;last_temperature *only* if calib needed</div><div class='del'>- *    (assumes caller will actually do the calibration!). */</div><div class='del'>-static int iwl3945_is_temp_calib_needed(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int temp_diff;</div><div class='del'>-</div><div class='del'>-	priv-&gt;temperature = iwl3945_hw_reg_txpower_get_temperature(priv);</div><div class='del'>-	temp_diff = priv-&gt;temperature - priv-&gt;last_temperature;</div><div class='del'>-</div><div class='del'>-	/* get absolute value */</div><div class='del'>-	if (temp_diff &lt; 0) {</div><div class='del'>-		IWL_DEBUG_POWER(priv, "Getting cooler, delta %d,\n", temp_diff);</div><div class='del'>-		temp_diff = -temp_diff;</div><div class='del'>-	} else if (temp_diff == 0)</div><div class='del'>-		IWL_DEBUG_POWER(priv, "Same temp,\n");</div><div class='del'>-	else</div><div class='del'>-		IWL_DEBUG_POWER(priv, "Getting warmer, delta %d,\n", temp_diff);</div><div class='del'>-</div><div class='del'>-	/* if we don't need calibration, *don't* update last_temperature */</div><div class='del'>-	if (temp_diff &lt; IWL_TEMPERATURE_LIMIT_TIMER) {</div><div class='del'>-		IWL_DEBUG_POWER(priv, "Timed thermal calib not needed\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_POWER(priv, "Timed thermal calib needed\n");</div><div class='del'>-</div><div class='del'>-	/* assume that caller will actually do calib ...</div><div class='del'>-	 *   update the "last temperature" value */</div><div class='del'>-	priv-&gt;last_temperature = priv-&gt;temperature;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define IWL_MAX_GAIN_ENTRIES 78</div><div class='del'>-#define IWL_CCK_FROM_OFDM_POWER_DIFF  -5</div><div class='del'>-#define IWL_CCK_FROM_OFDM_INDEX_DIFF (10)</div><div class='del'>-</div><div class='del'>-/* radio and DSP power table, each step is 1/2 dB.</div><div class='del'>- * 1st number is for RF analog gain, 2nd number is for DSP pre-DAC gain. */</div><div class='del'>-static struct iwl3945_tx_power power_gain_table[2][IWL_MAX_GAIN_ENTRIES] = {</div><div class='del'>-	{</div><div class='del'>-	 {251, 127},		/* 2.4 GHz, highest power */</div><div class='del'>-	 {251, 127},</div><div class='del'>-	 {251, 127},</div><div class='del'>-	 {251, 127},</div><div class='del'>-	 {251, 125},</div><div class='del'>-	 {251, 110},</div><div class='del'>-	 {251, 105},</div><div class='del'>-	 {251, 98},</div><div class='del'>-	 {187, 125},</div><div class='del'>-	 {187, 115},</div><div class='del'>-	 {187, 108},</div><div class='del'>-	 {187, 99},</div><div class='del'>-	 {243, 119},</div><div class='del'>-	 {243, 111},</div><div class='del'>-	 {243, 105},</div><div class='del'>-	 {243, 97},</div><div class='del'>-	 {243, 92},</div><div class='del'>-	 {211, 106},</div><div class='del'>-	 {211, 100},</div><div class='del'>-	 {179, 120},</div><div class='del'>-	 {179, 113},</div><div class='del'>-	 {179, 107},</div><div class='del'>-	 {147, 125},</div><div class='del'>-	 {147, 119},</div><div class='del'>-	 {147, 112},</div><div class='del'>-	 {147, 106},</div><div class='del'>-	 {147, 101},</div><div class='del'>-	 {147, 97},</div><div class='del'>-	 {147, 91},</div><div class='del'>-	 {115, 107},</div><div class='del'>-	 {235, 121},</div><div class='del'>-	 {235, 115},</div><div class='del'>-	 {235, 109},</div><div class='del'>-	 {203, 127},</div><div class='del'>-	 {203, 121},</div><div class='del'>-	 {203, 115},</div><div class='del'>-	 {203, 108},</div><div class='del'>-	 {203, 102},</div><div class='del'>-	 {203, 96},</div><div class='del'>-	 {203, 92},</div><div class='del'>-	 {171, 110},</div><div class='del'>-	 {171, 104},</div><div class='del'>-	 {171, 98},</div><div class='del'>-	 {139, 116},</div><div class='del'>-	 {227, 125},</div><div class='del'>-	 {227, 119},</div><div class='del'>-	 {227, 113},</div><div class='del'>-	 {227, 107},</div><div class='del'>-	 {227, 101},</div><div class='del'>-	 {227, 96},</div><div class='del'>-	 {195, 113},</div><div class='del'>-	 {195, 106},</div><div class='del'>-	 {195, 102},</div><div class='del'>-	 {195, 95},</div><div class='del'>-	 {163, 113},</div><div class='del'>-	 {163, 106},</div><div class='del'>-	 {163, 102},</div><div class='del'>-	 {163, 95},</div><div class='del'>-	 {131, 113},</div><div class='del'>-	 {131, 106},</div><div class='del'>-	 {131, 102},</div><div class='del'>-	 {131, 95},</div><div class='del'>-	 {99, 113},</div><div class='del'>-	 {99, 106},</div><div class='del'>-	 {99, 102},</div><div class='del'>-	 {99, 95},</div><div class='del'>-	 {67, 113},</div><div class='del'>-	 {67, 106},</div><div class='del'>-	 {67, 102},</div><div class='del'>-	 {67, 95},</div><div class='del'>-	 {35, 113},</div><div class='del'>-	 {35, 106},</div><div class='del'>-	 {35, 102},</div><div class='del'>-	 {35, 95},</div><div class='del'>-	 {3, 113},</div><div class='del'>-	 {3, 106},</div><div class='del'>-	 {3, 102},</div><div class='del'>-	 {3, 95} },		/* 2.4 GHz, lowest power */</div><div class='del'>-	{</div><div class='del'>-	 {251, 127},		/* 5.x GHz, highest power */</div><div class='del'>-	 {251, 120},</div><div class='del'>-	 {251, 114},</div><div class='del'>-	 {219, 119},</div><div class='del'>-	 {219, 101},</div><div class='del'>-	 {187, 113},</div><div class='del'>-	 {187, 102},</div><div class='del'>-	 {155, 114},</div><div class='del'>-	 {155, 103},</div><div class='del'>-	 {123, 117},</div><div class='del'>-	 {123, 107},</div><div class='del'>-	 {123, 99},</div><div class='del'>-	 {123, 92},</div><div class='del'>-	 {91, 108},</div><div class='del'>-	 {59, 125},</div><div class='del'>-	 {59, 118},</div><div class='del'>-	 {59, 109},</div><div class='del'>-	 {59, 102},</div><div class='del'>-	 {59, 96},</div><div class='del'>-	 {59, 90},</div><div class='del'>-	 {27, 104},</div><div class='del'>-	 {27, 98},</div><div class='del'>-	 {27, 92},</div><div class='del'>-	 {115, 118},</div><div class='del'>-	 {115, 111},</div><div class='del'>-	 {115, 104},</div><div class='del'>-	 {83, 126},</div><div class='del'>-	 {83, 121},</div><div class='del'>-	 {83, 113},</div><div class='del'>-	 {83, 105},</div><div class='del'>-	 {83, 99},</div><div class='del'>-	 {51, 118},</div><div class='del'>-	 {51, 111},</div><div class='del'>-	 {51, 104},</div><div class='del'>-	 {51, 98},</div><div class='del'>-	 {19, 116},</div><div class='del'>-	 {19, 109},</div><div class='del'>-	 {19, 102},</div><div class='del'>-	 {19, 98},</div><div class='del'>-	 {19, 93},</div><div class='del'>-	 {171, 113},</div><div class='del'>-	 {171, 107},</div><div class='del'>-	 {171, 99},</div><div class='del'>-	 {139, 120},</div><div class='del'>-	 {139, 113},</div><div class='del'>-	 {139, 107},</div><div class='del'>-	 {139, 99},</div><div class='del'>-	 {107, 120},</div><div class='del'>-	 {107, 113},</div><div class='del'>-	 {107, 107},</div><div class='del'>-	 {107, 99},</div><div class='del'>-	 {75, 120},</div><div class='del'>-	 {75, 113},</div><div class='del'>-	 {75, 107},</div><div class='del'>-	 {75, 99},</div><div class='del'>-	 {43, 120},</div><div class='del'>-	 {43, 113},</div><div class='del'>-	 {43, 107},</div><div class='del'>-	 {43, 99},</div><div class='del'>-	 {11, 120},</div><div class='del'>-	 {11, 113},</div><div class='del'>-	 {11, 107},</div><div class='del'>-	 {11, 99},</div><div class='del'>-	 {131, 107},</div><div class='del'>-	 {131, 99},</div><div class='del'>-	 {99, 120},</div><div class='del'>-	 {99, 113},</div><div class='del'>-	 {99, 107},</div><div class='del'>-	 {99, 99},</div><div class='del'>-	 {67, 120},</div><div class='del'>-	 {67, 113},</div><div class='del'>-	 {67, 107},</div><div class='del'>-	 {67, 99},</div><div class='del'>-	 {35, 120},</div><div class='del'>-	 {35, 113},</div><div class='del'>-	 {35, 107},</div><div class='del'>-	 {35, 99},</div><div class='del'>-	 {3, 120} }		/* 5.x GHz, lowest power */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline u8 iwl3945_hw_reg_fix_power_index(int index)</div><div class='del'>-{</div><div class='del'>-	if (index &lt; 0)</div><div class='del'>-		return 0;</div><div class='del'>-	if (index &gt;= IWL_MAX_GAIN_ENTRIES)</div><div class='del'>-		return IWL_MAX_GAIN_ENTRIES - 1;</div><div class='del'>-	return (u8) index;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Kick off thermal recalibration check every 60 seconds */</div><div class='del'>-#define REG_RECALIB_PERIOD (60)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_hw_reg_set_scan_power - Set Tx power for scan probe requests</div><div class='del'>- *</div><div class='del'>- * Set (in our channel info database) the direct scan Tx power for 1 Mbit (CCK)</div><div class='del'>- * or 6 Mbit (OFDM) rates.</div><div class='del'>- */</div><div class='del'>-static void iwl3945_hw_reg_set_scan_power(struct iwl_priv *priv, u32 scan_tbl_index,</div><div class='del'>-			       s32 rate_index, const s8 *clip_pwrs,</div><div class='del'>-			       struct iwl_channel_info *ch_info,</div><div class='del'>-			       int band_index)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_scan_power_info *scan_power_info;</div><div class='del'>-	s8 power;</div><div class='del'>-	u8 power_index;</div><div class='del'>-</div><div class='del'>-	scan_power_info = &amp;ch_info-&gt;scan_pwr_info[scan_tbl_index];</div><div class='del'>-</div><div class='del'>-	/* use this channel group's 6Mbit clipping/saturation pwr,</div><div class='del'>-	 *   but cap at regulatory scan power restriction (set during init</div><div class='del'>-	 *   based on eeprom channel data) for this channel.  */</div><div class='del'>-	power = min(ch_info-&gt;scan_power, clip_pwrs[IWL_RATE_6M_INDEX_TABLE]);</div><div class='del'>-</div><div class='del'>-	power = min(power, priv-&gt;tx_power_user_lmt);</div><div class='del'>-	scan_power_info-&gt;requested_power = power;</div><div class='del'>-</div><div class='del'>-	/* find difference between new scan *power* and current "normal"</div><div class='del'>-	 *   Tx *power* for 6Mb.  Use this difference (x2) to adjust the</div><div class='del'>-	 *   current "normal" temperature-compensated Tx power *index* for</div><div class='del'>-	 *   this rate (1Mb or 6Mb) to yield new temp-compensated scan power</div><div class='del'>-	 *   *index*. */</div><div class='del'>-	power_index = ch_info-&gt;power_info[rate_index].power_table_index</div><div class='del'>-	    - (power - ch_info-&gt;power_info</div><div class='del'>-	       [IWL_RATE_6M_INDEX_TABLE].requested_power) * 2;</div><div class='del'>-</div><div class='del'>-	/* store reference index that we use when adjusting *all* scan</div><div class='del'>-	 *   powers.  So we can accommodate user (all channel) or spectrum</div><div class='del'>-	 *   management (single channel) power changes "between" temperature</div><div class='del'>-	 *   feedback compensation procedures.</div><div class='del'>-	 * don't force fit this reference index into gain table; it may be a</div><div class='del'>-	 *   negative number.  This will help avoid errors when we're at</div><div class='del'>-	 *   the lower bounds (highest gains, for warmest temperatures)</div><div class='del'>-	 *   of the table. */</div><div class='del'>-</div><div class='del'>-	/* don't exceed table bounds for "real" setting */</div><div class='del'>-	power_index = iwl3945_hw_reg_fix_power_index(power_index);</div><div class='del'>-</div><div class='del'>-	scan_power_info-&gt;power_table_index = power_index;</div><div class='del'>-	scan_power_info-&gt;tpc.tx_gain =</div><div class='del'>-	    power_gain_table[band_index][power_index].tx_gain;</div><div class='del'>-	scan_power_info-&gt;tpc.dsp_atten =</div><div class='del'>-	    power_gain_table[band_index][power_index].dsp_atten;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_send_tx_power - fill in Tx Power command with gain settings</div><div class='del'>- *</div><div class='del'>- * Configures power settings for all rates for the current channel,</div><div class='del'>- * using values from channel info struct, and send to NIC</div><div class='del'>- */</div><div class='del'>-static int iwl3945_send_tx_power(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int rate_idx, i;</div><div class='del'>-	const struct iwl_channel_info *ch_info = NULL;</div><div class='del'>-	struct iwl3945_txpowertable_cmd txpower = {</div><div class='del'>-		.channel = priv-&gt;contexts[IWL_RXON_CTX_BSS].active.channel,</div><div class='del'>-	};</div><div class='del'>-	u16 chan;</div><div class='del'>-</div><div class='del'>-	if (WARN_ONCE(test_bit(STATUS_SCAN_HW, &amp;priv-&gt;status),</div><div class='del'>-		      "TX Power requested while scanning!\n"))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	chan = le16_to_cpu(priv-&gt;contexts[IWL_RXON_CTX_BSS].active.channel);</div><div class='del'>-</div><div class='del'>-	txpower.band = (priv-&gt;band == IEEE80211_BAND_5GHZ) ? 0 : 1;</div><div class='del'>-	ch_info = iwl_legacy_get_channel_info(priv, priv-&gt;band, chan);</div><div class='del'>-	if (!ch_info) {</div><div class='del'>-		IWL_ERR(priv,</div><div class='del'>-			"Failed to get channel info for channel %d [%d]\n",</div><div class='del'>-			chan, priv-&gt;band);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_channel_valid(ch_info)) {</div><div class='del'>-		IWL_DEBUG_POWER(priv, "Not calling TX_PWR_TABLE_CMD on "</div><div class='del'>-				"non-Tx channel.\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* fill cmd with power settings for all rates for current channel */</div><div class='del'>-	/* Fill OFDM rate */</div><div class='del'>-	for (rate_idx = IWL_FIRST_OFDM_RATE, i = 0;</div><div class='del'>-	     rate_idx &lt;= IWL39_LAST_OFDM_RATE; rate_idx++, i++) {</div><div class='del'>-</div><div class='del'>-		txpower.power[i].tpc = ch_info-&gt;power_info[i].tpc;</div><div class='del'>-		txpower.power[i].rate = iwl3945_rates[rate_idx].plcp;</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_POWER(priv, "ch %d:%d rf %d dsp %3d rate code 0x%02x\n",</div><div class='del'>-				le16_to_cpu(txpower.channel),</div><div class='del'>-				txpower.band,</div><div class='del'>-				txpower.power[i].tpc.tx_gain,</div><div class='del'>-				txpower.power[i].tpc.dsp_atten,</div><div class='del'>-				txpower.power[i].rate);</div><div class='del'>-	}</div><div class='del'>-	/* Fill CCK rates */</div><div class='del'>-	for (rate_idx = IWL_FIRST_CCK_RATE;</div><div class='del'>-	     rate_idx &lt;= IWL_LAST_CCK_RATE; rate_idx++, i++) {</div><div class='del'>-		txpower.power[i].tpc = ch_info-&gt;power_info[i].tpc;</div><div class='del'>-		txpower.power[i].rate = iwl3945_rates[rate_idx].plcp;</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_POWER(priv, "ch %d:%d rf %d dsp %3d rate code 0x%02x\n",</div><div class='del'>-				le16_to_cpu(txpower.channel),</div><div class='del'>-				txpower.band,</div><div class='del'>-				txpower.power[i].tpc.tx_gain,</div><div class='del'>-				txpower.power[i].tpc.dsp_atten,</div><div class='del'>-				txpower.power[i].rate);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_send_cmd_pdu(priv, REPLY_TX_PWR_TABLE_CMD,</div><div class='del'>-				sizeof(struct iwl3945_txpowertable_cmd),</div><div class='del'>-				&amp;txpower);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_hw_reg_set_new_power - Configures power tables at new levels</div><div class='del'>- * @ch_info: Channel to update.  Uses power_info.requested_power.</div><div class='del'>- *</div><div class='del'>- * Replace requested_power and base_power_index ch_info fields for</div><div class='del'>- * one channel.</div><div class='del'>- *</div><div class='del'>- * Called if user or spectrum management changes power preferences.</div><div class='del'>- * Takes into account h/w and modulation limitations (clip power).</div><div class='del'>- *</div><div class='del'>- * This does *not* send anything to NIC, just sets up ch_info for one channel.</div><div class='del'>- *</div><div class='del'>- * NOTE: reg_compensate_for_temperature_dif() *must* be run after this to</div><div class='del'>- *	 properly fill out the scan powers, and actual h/w gain settings,</div><div class='del'>- *	 and send changes to NIC</div><div class='del'>- */</div><div class='del'>-static int iwl3945_hw_reg_set_new_power(struct iwl_priv *priv,</div><div class='del'>-			     struct iwl_channel_info *ch_info)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_channel_power_info *power_info;</div><div class='del'>-	int power_changed = 0;</div><div class='del'>-	int i;</div><div class='del'>-	const s8 *clip_pwrs;</div><div class='del'>-	int power;</div><div class='del'>-</div><div class='del'>-	/* Get this chnlgrp's rate-to-max/clip-powers table */</div><div class='del'>-	clip_pwrs = priv-&gt;_3945.clip_groups[ch_info-&gt;group_index].clip_powers;</div><div class='del'>-</div><div class='del'>-	/* Get this channel's rate-to-current-power settings table */</div><div class='del'>-	power_info = ch_info-&gt;power_info;</div><div class='del'>-</div><div class='del'>-	/* update OFDM Txpower settings */</div><div class='del'>-	for (i = IWL_RATE_6M_INDEX_TABLE; i &lt;= IWL_RATE_54M_INDEX_TABLE;</div><div class='del'>-	     i++, ++power_info) {</div><div class='del'>-		int delta_idx;</div><div class='del'>-</div><div class='del'>-		/* limit new power to be no more than h/w capability */</div><div class='del'>-		power = min(ch_info-&gt;curr_txpow, clip_pwrs[i]);</div><div class='del'>-		if (power == power_info-&gt;requested_power)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* find difference between old and new requested powers,</div><div class='del'>-		 *    update base (non-temp-compensated) power index */</div><div class='del'>-		delta_idx = (power - power_info-&gt;requested_power) * 2;</div><div class='del'>-		power_info-&gt;base_power_index -= delta_idx;</div><div class='del'>-</div><div class='del'>-		/* save new requested power value */</div><div class='del'>-		power_info-&gt;requested_power = power;</div><div class='del'>-</div><div class='del'>-		power_changed = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* update CCK Txpower settings, based on OFDM 12M setting ...</div><div class='del'>-	 *    ... all CCK power settings for a given channel are the *same*. */</div><div class='del'>-	if (power_changed) {</div><div class='del'>-		power =</div><div class='del'>-		    ch_info-&gt;power_info[IWL_RATE_12M_INDEX_TABLE].</div><div class='del'>-		    requested_power + IWL_CCK_FROM_OFDM_POWER_DIFF;</div><div class='del'>-</div><div class='del'>-		/* do all CCK rates' iwl3945_channel_power_info structures */</div><div class='del'>-		for (i = IWL_RATE_1M_INDEX_TABLE; i &lt;= IWL_RATE_11M_INDEX_TABLE; i++) {</div><div class='del'>-			power_info-&gt;requested_power = power;</div><div class='del'>-			power_info-&gt;base_power_index =</div><div class='del'>-			    ch_info-&gt;power_info[IWL_RATE_12M_INDEX_TABLE].</div><div class='del'>-			    base_power_index + IWL_CCK_FROM_OFDM_INDEX_DIFF;</div><div class='del'>-			++power_info;</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'>-/**</div><div class='del'>- * iwl3945_hw_reg_get_ch_txpower_limit - returns new power limit for channel</div><div class='del'>- *</div><div class='del'>- * NOTE: Returned power limit may be less (but not more) than requested,</div><div class='del'>- *	 based strictly on regulatory (eeprom and spectrum mgt) limitations</div><div class='del'>- *	 (no consideration for h/w clipping limitations).</div><div class='del'>- */</div><div class='del'>-static int iwl3945_hw_reg_get_ch_txpower_limit(struct iwl_channel_info *ch_info)</div><div class='del'>-{</div><div class='del'>-	s8 max_power;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* if we're using TGd limits, use lower of TGd or EEPROM */</div><div class='del'>-	if (ch_info-&gt;tgd_data.max_power != 0)</div><div class='del'>-		max_power = min(ch_info-&gt;tgd_data.max_power,</div><div class='del'>-				ch_info-&gt;eeprom.max_power_avg);</div><div class='del'>-</div><div class='del'>-	/* else just use EEPROM limits */</div><div class='del'>-	else</div><div class='del'>-#endif</div><div class='del'>-		max_power = ch_info-&gt;eeprom.max_power_avg;</div><div class='del'>-</div><div class='del'>-	return min(max_power, ch_info-&gt;max_power_avg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_hw_reg_comp_txpower_temp - Compensate for temperature</div><div class='del'>- *</div><div class='del'>- * Compensate txpower settings of *all* channels for temperature.</div><div class='del'>- * This only accounts for the difference between current temperature</div><div class='del'>- *   and the factory calibration temperatures, and bases the new settings</div><div class='del'>- *   on the channel's base_power_index.</div><div class='del'>- *</div><div class='del'>- * If RxOn is "associated", this sends the new Txpower to NIC!</div><div class='del'>- */</div><div class='del'>-static int iwl3945_hw_reg_comp_txpower_temp(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_channel_info *ch_info = NULL;</div><div class='del'>-	struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv-&gt;eeprom;</div><div class='del'>-	int delta_index;</div><div class='del'>-	const s8 *clip_pwrs; /* array of h/w max power levels for each rate */</div><div class='del'>-	u8 a_band;</div><div class='del'>-	u8 rate_index;</div><div class='del'>-	u8 scan_tbl_index;</div><div class='del'>-	u8 i;</div><div class='del'>-	int ref_temp;</div><div class='del'>-	int temperature = priv-&gt;temperature;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;disable_tx_power_cal ||</div><div class='del'>-	    test_bit(STATUS_SCANNING, &amp;priv-&gt;status)) {</div><div class='del'>-		/* do not perform tx power calibration */</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/* set up new Tx power info for each and every channel, 2.4 and 5.x */</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;channel_count; i++) {</div><div class='del'>-		ch_info = &amp;priv-&gt;channel_info[i];</div><div class='del'>-		a_band = iwl_legacy_is_channel_a_band(ch_info);</div><div class='del'>-</div><div class='del'>-		/* Get this chnlgrp's factory calibration temperature */</div><div class='del'>-		ref_temp = (s16)eeprom-&gt;groups[ch_info-&gt;group_index].</div><div class='del'>-		    temperature;</div><div class='del'>-</div><div class='del'>-		/* get power index adjustment based on current and factory</div><div class='del'>-		 * temps */</div><div class='del'>-		delta_index = iwl3945_hw_reg_adjust_power_by_temp(temperature,</div><div class='del'>-							      ref_temp);</div><div class='del'>-</div><div class='del'>-		/* set tx power value for all rates, OFDM and CCK */</div><div class='del'>-		for (rate_index = 0; rate_index &lt; IWL_RATE_COUNT_3945;</div><div class='del'>-		     rate_index++) {</div><div class='del'>-			int power_idx =</div><div class='del'>-			    ch_info-&gt;power_info[rate_index].base_power_index;</div><div class='del'>-</div><div class='del'>-			/* temperature compensate */</div><div class='del'>-			power_idx += delta_index;</div><div class='del'>-</div><div class='del'>-			/* stay within table range */</div><div class='del'>-			power_idx = iwl3945_hw_reg_fix_power_index(power_idx);</div><div class='del'>-			ch_info-&gt;power_info[rate_index].</div><div class='del'>-			    power_table_index = (u8) power_idx;</div><div class='del'>-			ch_info-&gt;power_info[rate_index].tpc =</div><div class='del'>-			    power_gain_table[a_band][power_idx];</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Get this chnlgrp's rate-to-max/clip-powers table */</div><div class='del'>-		clip_pwrs = priv-&gt;_3945.clip_groups[ch_info-&gt;group_index].clip_powers;</div><div class='del'>-</div><div class='del'>-		/* set scan tx power, 1Mbit for CCK, 6Mbit for OFDM */</div><div class='del'>-		for (scan_tbl_index = 0;</div><div class='del'>-		     scan_tbl_index &lt; IWL_NUM_SCAN_RATES; scan_tbl_index++) {</div><div class='del'>-			s32 actual_index = (scan_tbl_index == 0) ?</div><div class='del'>-			    IWL_RATE_1M_INDEX_TABLE : IWL_RATE_6M_INDEX_TABLE;</div><div class='del'>-			iwl3945_hw_reg_set_scan_power(priv, scan_tbl_index,</div><div class='del'>-					   actual_index, clip_pwrs,</div><div class='del'>-					   ch_info, a_band);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* send Txpower command for current channel to ucode */</div><div class='del'>-	return priv-&gt;cfg-&gt;ops-&gt;lib-&gt;send_tx_power(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl3945_hw_reg_set_txpower(struct iwl_priv *priv, s8 power)</div><div class='del'>-{</div><div class='del'>-	struct iwl_channel_info *ch_info;</div><div class='del'>-	s8 max_power;</div><div class='del'>-	u8 a_band;</div><div class='del'>-	u8 i;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;tx_power_user_lmt == power) {</div><div class='del'>-		IWL_DEBUG_POWER(priv, "Requested Tx power same as current "</div><div class='del'>-				"limit: %ddBm.\n", power);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_POWER(priv, "Setting upper limit clamp to %ddBm.\n", power);</div><div class='del'>-	priv-&gt;tx_power_user_lmt = power;</div><div class='del'>-</div><div class='del'>-	/* set up new Tx powers for each and every channel, 2.4 and 5.x */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;channel_count; i++) {</div><div class='del'>-		ch_info = &amp;priv-&gt;channel_info[i];</div><div class='del'>-		a_band = iwl_legacy_is_channel_a_band(ch_info);</div><div class='del'>-</div><div class='del'>-		/* find minimum power of all user and regulatory constraints</div><div class='del'>-		 *    (does not consider h/w clipping limitations) */</div><div class='del'>-		max_power = iwl3945_hw_reg_get_ch_txpower_limit(ch_info);</div><div class='del'>-		max_power = min(power, max_power);</div><div class='del'>-		if (max_power != ch_info-&gt;curr_txpow) {</div><div class='del'>-			ch_info-&gt;curr_txpow = max_power;</div><div class='del'>-</div><div class='del'>-			/* this considers the h/w clipping limitations */</div><div class='del'>-			iwl3945_hw_reg_set_new_power(priv, ch_info);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* update txpower settings for all channels,</div><div class='del'>-	 *   send to NIC if associated. */</div><div class='del'>-	iwl3945_is_temp_calib_needed(priv);</div><div class='del'>-	iwl3945_hw_reg_comp_txpower_temp(priv);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl3945_send_rxon_assoc(struct iwl_priv *priv,</div><div class='del'>-				   struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	int rc = 0;</div><div class='del'>-	struct iwl_rx_packet *pkt;</div><div class='del'>-	struct iwl3945_rxon_assoc_cmd rxon_assoc;</div><div class='del'>-	struct iwl_host_cmd cmd = {</div><div class='del'>-		.id = REPLY_RXON_ASSOC,</div><div class='del'>-		.len = sizeof(rxon_assoc),</div><div class='del'>-		.flags = CMD_WANT_SKB,</div><div class='del'>-		.data = &amp;rxon_assoc,</div><div class='del'>-	};</div><div class='del'>-	const struct iwl_legacy_rxon_cmd *rxon1 = &amp;ctx-&gt;staging;</div><div class='del'>-	const struct iwl_legacy_rxon_cmd *rxon2 = &amp;ctx-&gt;active;</div><div class='del'>-</div><div class='del'>-	if ((rxon1-&gt;flags == rxon2-&gt;flags) &amp;&amp;</div><div class='del'>-	    (rxon1-&gt;filter_flags == rxon2-&gt;filter_flags) &amp;&amp;</div><div class='del'>-	    (rxon1-&gt;cck_basic_rates == rxon2-&gt;cck_basic_rates) &amp;&amp;</div><div class='del'>-	    (rxon1-&gt;ofdm_basic_rates == rxon2-&gt;ofdm_basic_rates)) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Using current RXON_ASSOC.  Not resending.\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rxon_assoc.flags = ctx-&gt;staging.flags;</div><div class='del'>-	rxon_assoc.filter_flags = ctx-&gt;staging.filter_flags;</div><div class='del'>-	rxon_assoc.ofdm_basic_rates = ctx-&gt;staging.ofdm_basic_rates;</div><div class='del'>-	rxon_assoc.cck_basic_rates = ctx-&gt;staging.cck_basic_rates;</div><div class='del'>-	rxon_assoc.reserved = 0;</div><div class='del'>-</div><div class='del'>-	rc = iwl_legacy_send_cmd_sync(priv, &amp;cmd);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	pkt = (struct iwl_rx_packet *)cmd.reply_page;</div><div class='del'>-	if (pkt-&gt;hdr.flags &amp; IWL_CMD_FAILED_MSK) {</div><div class='del'>-		IWL_ERR(priv, "Bad return from REPLY_RXON_ASSOC command\n");</div><div class='del'>-		rc = -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_legacy_free_pages(priv, cmd.reply_page);</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'>- * iwl3945_commit_rxon - commit staging_rxon to hardware</div><div class='del'>- *</div><div class='del'>- * The RXON command in staging_rxon is committed to the hardware and</div><div class='del'>- * the active_rxon structure is updated with the new data.  This</div><div class='del'>- * function correctly transitions out of the RXON_ASSOC_MSK state if</div><div class='del'>- * a HW tune is required based on the RXON structure changes.</div><div class='del'>- */</div><div class='del'>-int iwl3945_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	/* cast away the const for active_rxon in this function */</div><div class='del'>-	struct iwl3945_rxon_cmd *active_rxon = (void *)&amp;ctx-&gt;active;</div><div class='del'>-	struct iwl3945_rxon_cmd *staging_rxon = (void *)&amp;ctx-&gt;staging;</div><div class='del'>-	int rc = 0;</div><div class='del'>-	bool new_assoc = !!(staging_rxon-&gt;filter_flags &amp; RXON_FILTER_ASSOC_MSK);</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_alive(priv))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	/* always get timestamp with Rx frame */</div><div class='del'>-	staging_rxon-&gt;flags |= RXON_FLG_TSF2HOST_MSK;</div><div class='del'>-</div><div class='del'>-	/* select antenna */</div><div class='del'>-	staging_rxon-&gt;flags &amp;=</div><div class='del'>-	    ~(RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_SEL_MSK);</div><div class='del'>-	staging_rxon-&gt;flags |= iwl3945_get_antenna_flags(priv);</div><div class='del'>-</div><div class='del'>-	rc = iwl_legacy_check_rxon_cmd(priv, ctx);</div><div class='del'>-	if (rc) {</div><div class='del'>-		IWL_ERR(priv, "Invalid RXON configuration.  Not committing.\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we don't need to send a full RXON, we can use</div><div class='del'>-	 * iwl3945_rxon_assoc_cmd which is used to reconfigure filter</div><div class='del'>-	 * and other flags for the current radio configuration. */</div><div class='del'>-	if (!iwl_legacy_full_rxon_required(priv,</div><div class='del'>-			&amp;priv-&gt;contexts[IWL_RXON_CTX_BSS])) {</div><div class='del'>-		rc = iwl_legacy_send_rxon_assoc(priv,</div><div class='del'>-					 &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS]);</div><div class='del'>-		if (rc) {</div><div class='del'>-			IWL_ERR(priv, "Error setting RXON_ASSOC "</div><div class='del'>-				  "configuration (%d).\n", rc);</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy(active_rxon, staging_rxon, sizeof(*active_rxon));</div><div class='del'>-		/*</div><div class='del'>-		 * We do not commit tx power settings while channel changing,</div><div class='del'>-		 * do it now if tx power changed.</div><div class='del'>-		 */</div><div class='del'>-		iwl_legacy_set_tx_power(priv, priv-&gt;tx_power_next, false);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we are currently associated and the new config requires</div><div class='del'>-	 * an RXON_ASSOC and the new config wants the associated mask enabled,</div><div class='del'>-	 * we must clear the associated from the active configuration</div><div class='del'>-	 * before we apply the new config */</div><div class='del'>-	if (iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS) &amp;&amp; new_assoc) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Toggling associated bit on current RXON\n");</div><div class='del'>-		active_rxon-&gt;filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * reserved4 and 5 could have been filled by the iwlcore code.</div><div class='del'>-		 * Let's clear them before pushing to the 3945.</div><div class='del'>-		 */</div><div class='del'>-		active_rxon-&gt;reserved4 = 0;</div><div class='del'>-		active_rxon-&gt;reserved5 = 0;</div><div class='del'>-		rc = iwl_legacy_send_cmd_pdu(priv, REPLY_RXON,</div><div class='del'>-				      sizeof(struct iwl3945_rxon_cmd),</div><div class='del'>-				      &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS].active);</div><div class='del'>-</div><div class='del'>-		/* If the mask clearing failed then we set</div><div class='del'>-		 * active_rxon back to what it was previously */</div><div class='del'>-		if (rc) {</div><div class='del'>-			active_rxon-&gt;filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='del'>-			IWL_ERR(priv, "Error clearing ASSOC_MSK on current "</div><div class='del'>-				  "configuration (%d).\n", rc);</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='del'>-		iwl_legacy_clear_ucode_stations(priv,</div><div class='del'>-					 &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS]);</div><div class='del'>-		iwl_legacy_restore_stations(priv,</div><div class='del'>-					 &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Sending RXON\n"</div><div class='del'>-		       "* with%s RXON_FILTER_ASSOC_MSK\n"</div><div class='del'>-		       "* channel = %d\n"</div><div class='del'>-		       "* bssid = %pM\n",</div><div class='del'>-		       (new_assoc ? "" : "out"),</div><div class='del'>-		       le16_to_cpu(staging_rxon-&gt;channel),</div><div class='del'>-		       staging_rxon-&gt;bssid_addr);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * reserved4 and 5 could have been filled by the iwlcore code.</div><div class='del'>-	 * Let's clear them before pushing to the 3945.</div><div class='del'>-	 */</div><div class='del'>-	staging_rxon-&gt;reserved4 = 0;</div><div class='del'>-	staging_rxon-&gt;reserved5 = 0;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_set_rxon_hwcrypto(priv, ctx, !iwl3945_mod_params.sw_crypto);</div><div class='del'>-</div><div class='del'>-	/* Apply the new configuration */</div><div class='del'>-	rc = iwl_legacy_send_cmd_pdu(priv, REPLY_RXON,</div><div class='del'>-			      sizeof(struct iwl3945_rxon_cmd),</div><div class='del'>-			      staging_rxon);</div><div class='del'>-	if (rc) {</div><div class='del'>-		IWL_ERR(priv, "Error setting new configuration (%d).\n", rc);</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(active_rxon, staging_rxon, sizeof(*active_rxon));</div><div class='del'>-</div><div class='del'>-	if (!new_assoc) {</div><div class='del'>-		iwl_legacy_clear_ucode_stations(priv,</div><div class='del'>-					 &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS]);</div><div class='del'>-		iwl_legacy_restore_stations(priv,</div><div class='del'>-					&amp;priv-&gt;contexts[IWL_RXON_CTX_BSS]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we issue a new RXON command which required a tune then we must</div><div class='del'>-	 * send a new TXPOWER command or we won't be able to Tx any frames */</div><div class='del'>-	rc = iwl_legacy_set_tx_power(priv, priv-&gt;tx_power_next, true);</div><div class='del'>-	if (rc) {</div><div class='del'>-		IWL_ERR(priv, "Error setting Tx power (%d).\n", rc);</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Init the hardware's rate fallback order based on the band */</div><div class='del'>-	rc = iwl3945_init_hw_rate_table(priv);</div><div class='del'>-	if (rc) {</div><div class='del'>-		IWL_ERR(priv, "Error setting HW rate table: %02X\n", rc);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_reg_txpower_periodic -  called when time to check our temperature.</div><div class='del'>- *</div><div class='del'>- * -- reset periodic timer</div><div class='del'>- * -- see if temp has changed enough to warrant re-calibration ... if so:</div><div class='del'>- *     -- correct coeffs for temp (can reset temp timer)</div><div class='del'>- *     -- save this temp as "last",</div><div class='del'>- *     -- send new set of gain settings to NIC</div><div class='del'>- * NOTE:  This should continue working, even when we're not associated,</div><div class='del'>- *   so we can keep our internal table of scan powers current. */</div><div class='del'>-void iwl3945_reg_txpower_periodic(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	/* This will kick in the "brute force"</div><div class='del'>-	 * iwl3945_hw_reg_comp_txpower_temp() below */</div><div class='del'>-	if (!iwl3945_is_temp_calib_needed(priv))</div><div class='del'>-		goto reschedule;</div><div class='del'>-</div><div class='del'>-	/* Set up a new set of temp-adjusted TxPowers, send to NIC.</div><div class='del'>-	 * This is based *only* on current temperature,</div><div class='del'>-	 * ignoring any previous power measurements */</div><div class='del'>-	iwl3945_hw_reg_comp_txpower_temp(priv);</div><div class='del'>-</div><div class='del'>- reschedule:</div><div class='del'>-	queue_delayed_work(priv-&gt;workqueue,</div><div class='del'>-			   &amp;priv-&gt;_3945.thermal_periodic, REG_RECALIB_PERIOD * HZ);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_bg_reg_txpower_periodic(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = container_of(work, struct iwl_priv,</div><div class='del'>-					     _3945.thermal_periodic.work);</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	iwl3945_reg_txpower_periodic(priv);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_hw_reg_get_ch_grp_index - find the channel-group index (0-4)</div><div class='del'>- * 				   for the channel.</div><div class='del'>- *</div><div class='del'>- * This function is used when initializing channel-info structs.</div><div class='del'>- *</div><div class='del'>- * NOTE: These channel groups do *NOT* match the bands above!</div><div class='del'>- *	 These channel groups are based on factory-tested channels;</div><div class='del'>- *	 on A-band, EEPROM's "group frequency" entries represent the top</div><div class='del'>- *	 channel in each group 1-4.  Group 5 All B/G channels are in group 0.</div><div class='del'>- */</div><div class='del'>-static u16 iwl3945_hw_reg_get_ch_grp_index(struct iwl_priv *priv,</div><div class='del'>-				       const struct iwl_channel_info *ch_info)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv-&gt;eeprom;</div><div class='del'>-	struct iwl3945_eeprom_txpower_group *ch_grp = &amp;eeprom-&gt;groups[0];</div><div class='del'>-	u8 group;</div><div class='del'>-	u16 group_index = 0;	/* based on factory calib frequencies */</div><div class='del'>-	u8 grp_channel;</div><div class='del'>-</div><div class='del'>-	/* Find the group index for the channel ... don't use index 1(?) */</div><div class='del'>-	if (iwl_legacy_is_channel_a_band(ch_info)) {</div><div class='del'>-		for (group = 1; group &lt; 5; group++) {</div><div class='del'>-			grp_channel = ch_grp[group].group_channel;</div><div class='del'>-			if (ch_info-&gt;channel &lt;= grp_channel) {</div><div class='del'>-				group_index = group;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		/* group 4 has a few channels *above* its factory cal freq */</div><div class='del'>-		if (group == 5)</div><div class='del'>-			group_index = 4;</div><div class='del'>-	} else</div><div class='del'>-		group_index = 0;	/* 2.4 GHz, group 0 */</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_POWER(priv, "Chnl %d mapped to grp %d\n", ch_info-&gt;channel,</div><div class='del'>-			group_index);</div><div class='del'>-	return group_index;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_hw_reg_get_matched_power_index - Interpolate to get nominal index</div><div class='del'>- *</div><div class='del'>- * Interpolate to get nominal (i.e. at factory calibration temperature) index</div><div class='del'>- *   into radio/DSP gain settings table for requested power.</div><div class='del'>- */</div><div class='del'>-static int iwl3945_hw_reg_get_matched_power_index(struct iwl_priv *priv,</div><div class='del'>-				       s8 requested_power,</div><div class='del'>-				       s32 setting_index, s32 *new_index)</div><div class='del'>-{</div><div class='del'>-	const struct iwl3945_eeprom_txpower_group *chnl_grp = NULL;</div><div class='del'>-	struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv-&gt;eeprom;</div><div class='del'>-	s32 index0, index1;</div><div class='del'>-	s32 power = 2 * requested_power;</div><div class='del'>-	s32 i;</div><div class='del'>-	const struct iwl3945_eeprom_txpower_sample *samples;</div><div class='del'>-	s32 gains0, gains1;</div><div class='del'>-	s32 res;</div><div class='del'>-	s32 denominator;</div><div class='del'>-</div><div class='del'>-	chnl_grp = &amp;eeprom-&gt;groups[setting_index];</div><div class='del'>-	samples = chnl_grp-&gt;samples;</div><div class='del'>-	for (i = 0; i &lt; 5; i++) {</div><div class='del'>-		if (power == samples[i].power) {</div><div class='del'>-			*new_index = samples[i].gain_index;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (power &gt; samples[1].power) {</div><div class='del'>-		index0 = 0;</div><div class='del'>-		index1 = 1;</div><div class='del'>-	} else if (power &gt; samples[2].power) {</div><div class='del'>-		index0 = 1;</div><div class='del'>-		index1 = 2;</div><div class='del'>-	} else if (power &gt; samples[3].power) {</div><div class='del'>-		index0 = 2;</div><div class='del'>-		index1 = 3;</div><div class='del'>-	} else {</div><div class='del'>-		index0 = 3;</div><div class='del'>-		index1 = 4;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	denominator = (s32) samples[index1].power - (s32) samples[index0].power;</div><div class='del'>-	if (denominator == 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	gains0 = (s32) samples[index0].gain_index * (1 &lt;&lt; 19);</div><div class='del'>-	gains1 = (s32) samples[index1].gain_index * (1 &lt;&lt; 19);</div><div class='del'>-	res = gains0 + (gains1 - gains0) *</div><div class='del'>-	    ((s32) power - (s32) samples[index0].power) / denominator +</div><div class='del'>-	    (1 &lt;&lt; 18);</div><div class='del'>-	*new_index = res &gt;&gt; 19;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_hw_reg_init_channel_groups(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	u32 i;</div><div class='del'>-	s32 rate_index;</div><div class='del'>-	struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv-&gt;eeprom;</div><div class='del'>-	const struct iwl3945_eeprom_txpower_group *group;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_POWER(priv, "Initializing factory calib info from EEPROM\n");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; IWL_NUM_TX_CALIB_GROUPS; i++) {</div><div class='del'>-		s8 *clip_pwrs;	/* table of power levels for each rate */</div><div class='del'>-		s8 satur_pwr;	/* saturation power for each chnl group */</div><div class='del'>-		group = &amp;eeprom-&gt;groups[i];</div><div class='del'>-</div><div class='del'>-		/* sanity check on factory saturation power value */</div><div class='del'>-		if (group-&gt;saturation_power &lt; 40) {</div><div class='del'>-			IWL_WARN(priv, "Error: saturation power is %d, "</div><div class='del'>-				    "less than minimum expected 40\n",</div><div class='del'>-				    group-&gt;saturation_power);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Derive requested power levels for each rate, based on</div><div class='del'>-		 *   hardware capabilities (saturation power for band).</div><div class='del'>-		 * Basic value is 3dB down from saturation, with further</div><div class='del'>-		 *   power reductions for highest 3 data rates.  These</div><div class='del'>-		 *   backoffs provide headroom for high rate modulation</div><div class='del'>-		 *   power peaks, without too much distortion (clipping).</div><div class='del'>-		 */</div><div class='del'>-		/* we'll fill in this array with h/w max power levels */</div><div class='del'>-		clip_pwrs = (s8 *) priv-&gt;_3945.clip_groups[i].clip_powers;</div><div class='del'>-</div><div class='del'>-		/* divide factory saturation power by 2 to find -3dB level */</div><div class='del'>-		satur_pwr = (s8) (group-&gt;saturation_power &gt;&gt; 1);</div><div class='del'>-</div><div class='del'>-		/* fill in channel group's nominal powers for each rate */</div><div class='del'>-		for (rate_index = 0;</div><div class='del'>-		     rate_index &lt; IWL_RATE_COUNT_3945; rate_index++, clip_pwrs++) {</div><div class='del'>-			switch (rate_index) {</div><div class='del'>-			case IWL_RATE_36M_INDEX_TABLE:</div><div class='del'>-				if (i == 0)	/* B/G */</div><div class='del'>-					*clip_pwrs = satur_pwr;</div><div class='del'>-				else	/* A */</div><div class='del'>-					*clip_pwrs = satur_pwr - 5;</div><div class='del'>-				break;</div><div class='del'>-			case IWL_RATE_48M_INDEX_TABLE:</div><div class='del'>-				if (i == 0)</div><div class='del'>-					*clip_pwrs = satur_pwr - 7;</div><div class='del'>-				else</div><div class='del'>-					*clip_pwrs = satur_pwr - 10;</div><div class='del'>-				break;</div><div class='del'>-			case IWL_RATE_54M_INDEX_TABLE:</div><div class='del'>-				if (i == 0)</div><div class='del'>-					*clip_pwrs = satur_pwr - 9;</div><div class='del'>-				else</div><div class='del'>-					*clip_pwrs = satur_pwr - 12;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				*clip_pwrs = satur_pwr;</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'>- * iwl3945_txpower_set_from_eeprom - Set channel power info based on EEPROM</div><div class='del'>- *</div><div class='del'>- * Second pass (during init) to set up priv-&gt;channel_info</div><div class='del'>- *</div><div class='del'>- * Set up Tx-power settings in our channel info database for each VALID</div><div class='del'>- * (for this geo/SKU) channel, at all Tx data rates, based on eeprom values</div><div class='del'>- * and current temperature.</div><div class='del'>- *</div><div class='del'>- * Since this is based on current temperature (at init time), these values may</div><div class='del'>- * not be valid for very long, but it gives us a starting/default point,</div><div class='del'>- * and allows us to active (i.e. using Tx) scan.</div><div class='del'>- *</div><div class='del'>- * This does *not* write values to NIC, just sets up our internal table.</div><div class='del'>- */</div><div class='del'>-int iwl3945_txpower_set_from_eeprom(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_channel_info *ch_info = NULL;</div><div class='del'>-	struct iwl3945_channel_power_info *pwr_info;</div><div class='del'>-	struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv-&gt;eeprom;</div><div class='del'>-	int delta_index;</div><div class='del'>-	u8 rate_index;</div><div class='del'>-	u8 scan_tbl_index;</div><div class='del'>-	const s8 *clip_pwrs;	/* array of power levels for each rate */</div><div class='del'>-	u8 gain, dsp_atten;</div><div class='del'>-	s8 power;</div><div class='del'>-	u8 pwr_index, base_pwr_index, a_band;</div><div class='del'>-	u8 i;</div><div class='del'>-	int temperature;</div><div class='del'>-</div><div class='del'>-	/* save temperature reference,</div><div class='del'>-	 *   so we can determine next time to calibrate */</div><div class='del'>-	temperature = iwl3945_hw_reg_txpower_get_temperature(priv);</div><div class='del'>-	priv-&gt;last_temperature = temperature;</div><div class='del'>-</div><div class='del'>-	iwl3945_hw_reg_init_channel_groups(priv);</div><div class='del'>-</div><div class='del'>-	/* initialize Tx power info for each and every channel, 2.4 and 5.x */</div><div class='del'>-	for (i = 0, ch_info = priv-&gt;channel_info; i &lt; priv-&gt;channel_count;</div><div class='del'>-	     i++, ch_info++) {</div><div class='del'>-		a_band = iwl_legacy_is_channel_a_band(ch_info);</div><div class='del'>-		if (!iwl_legacy_is_channel_valid(ch_info))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* find this channel's channel group (*not* "band") index */</div><div class='del'>-		ch_info-&gt;group_index =</div><div class='del'>-			iwl3945_hw_reg_get_ch_grp_index(priv, ch_info);</div><div class='del'>-</div><div class='del'>-		/* Get this chnlgrp's rate-&gt;max/clip-powers table */</div><div class='del'>-		clip_pwrs = priv-&gt;_3945.clip_groups[ch_info-&gt;group_index].clip_powers;</div><div class='del'>-</div><div class='del'>-		/* calculate power index *adjustment* value according to</div><div class='del'>-		 *  diff between current temperature and factory temperature */</div><div class='del'>-		delta_index = iwl3945_hw_reg_adjust_power_by_temp(temperature,</div><div class='del'>-				eeprom-&gt;groups[ch_info-&gt;group_index].</div><div class='del'>-				temperature);</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_POWER(priv, "Delta index for channel %d: %d [%d]\n",</div><div class='del'>-				ch_info-&gt;channel, delta_index, temperature +</div><div class='del'>-				IWL_TEMP_CONVERT);</div><div class='del'>-</div><div class='del'>-		/* set tx power value for all OFDM rates */</div><div class='del'>-		for (rate_index = 0; rate_index &lt; IWL_OFDM_RATES;</div><div class='del'>-		     rate_index++) {</div><div class='del'>-			s32 uninitialized_var(power_idx);</div><div class='del'>-			int rc;</div><div class='del'>-</div><div class='del'>-			/* use channel group's clip-power table,</div><div class='del'>-			 *   but don't exceed channel's max power */</div><div class='del'>-			s8 pwr = min(ch_info-&gt;max_power_avg,</div><div class='del'>-				     clip_pwrs[rate_index]);</div><div class='del'>-</div><div class='del'>-			pwr_info = &amp;ch_info-&gt;power_info[rate_index];</div><div class='del'>-</div><div class='del'>-			/* get base (i.e. at factory-measured temperature)</div><div class='del'>-			 *    power table index for this rate's power */</div><div class='del'>-			rc = iwl3945_hw_reg_get_matched_power_index(priv, pwr,</div><div class='del'>-							 ch_info-&gt;group_index,</div><div class='del'>-							 &amp;power_idx);</div><div class='del'>-			if (rc) {</div><div class='del'>-				IWL_ERR(priv, "Invalid power index\n");</div><div class='del'>-				return rc;</div><div class='del'>-			}</div><div class='del'>-			pwr_info-&gt;base_power_index = (u8) power_idx;</div><div class='del'>-</div><div class='del'>-			/* temperature compensate */</div><div class='del'>-			power_idx += delta_index;</div><div class='del'>-</div><div class='del'>-			/* stay within range of gain table */</div><div class='del'>-			power_idx = iwl3945_hw_reg_fix_power_index(power_idx);</div><div class='del'>-</div><div class='del'>-			/* fill 1 OFDM rate's iwl3945_channel_power_info struct */</div><div class='del'>-			pwr_info-&gt;requested_power = pwr;</div><div class='del'>-			pwr_info-&gt;power_table_index = (u8) power_idx;</div><div class='del'>-			pwr_info-&gt;tpc.tx_gain =</div><div class='del'>-			    power_gain_table[a_band][power_idx].tx_gain;</div><div class='del'>-			pwr_info-&gt;tpc.dsp_atten =</div><div class='del'>-			    power_gain_table[a_band][power_idx].dsp_atten;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* set tx power for CCK rates, based on OFDM 12 Mbit settings*/</div><div class='del'>-		pwr_info = &amp;ch_info-&gt;power_info[IWL_RATE_12M_INDEX_TABLE];</div><div class='del'>-		power = pwr_info-&gt;requested_power +</div><div class='del'>-			IWL_CCK_FROM_OFDM_POWER_DIFF;</div><div class='del'>-		pwr_index = pwr_info-&gt;power_table_index +</div><div class='del'>-			IWL_CCK_FROM_OFDM_INDEX_DIFF;</div><div class='del'>-		base_pwr_index = pwr_info-&gt;base_power_index +</div><div class='del'>-			IWL_CCK_FROM_OFDM_INDEX_DIFF;</div><div class='del'>-</div><div class='del'>-		/* stay within table range */</div><div class='del'>-		pwr_index = iwl3945_hw_reg_fix_power_index(pwr_index);</div><div class='del'>-		gain = power_gain_table[a_band][pwr_index].tx_gain;</div><div class='del'>-		dsp_atten = power_gain_table[a_band][pwr_index].dsp_atten;</div><div class='del'>-</div><div class='del'>-		/* fill each CCK rate's iwl3945_channel_power_info structure</div><div class='del'>-		 * NOTE:  All CCK-rate Txpwrs are the same for a given chnl!</div><div class='del'>-		 * NOTE:  CCK rates start at end of OFDM rates! */</div><div class='del'>-		for (rate_index = 0;</div><div class='del'>-		     rate_index &lt; IWL_CCK_RATES; rate_index++) {</div><div class='del'>-			pwr_info = &amp;ch_info-&gt;power_info[rate_index+IWL_OFDM_RATES];</div><div class='del'>-			pwr_info-&gt;requested_power = power;</div><div class='del'>-			pwr_info-&gt;power_table_index = pwr_index;</div><div class='del'>-			pwr_info-&gt;base_power_index = base_pwr_index;</div><div class='del'>-			pwr_info-&gt;tpc.tx_gain = gain;</div><div class='del'>-			pwr_info-&gt;tpc.dsp_atten = dsp_atten;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* set scan tx power, 1Mbit for CCK, 6Mbit for OFDM */</div><div class='del'>-		for (scan_tbl_index = 0;</div><div class='del'>-		     scan_tbl_index &lt; IWL_NUM_SCAN_RATES; scan_tbl_index++) {</div><div class='del'>-			s32 actual_index = (scan_tbl_index == 0) ?</div><div class='del'>-				IWL_RATE_1M_INDEX_TABLE : IWL_RATE_6M_INDEX_TABLE;</div><div class='del'>-			iwl3945_hw_reg_set_scan_power(priv, scan_tbl_index,</div><div class='del'>-				actual_index, clip_pwrs, ch_info, a_band);</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'>-int iwl3945_hw_rxq_stop(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH39_RCSR_CONFIG(0), 0);</div><div class='del'>-	rc = iwl_poll_direct_bit(priv, FH39_RSSR_STATUS,</div><div class='del'>-			FH39_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		IWL_ERR(priv, "Can't stop Rx DMA.\n");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl3945_hw_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq)</div><div class='del'>-{</div><div class='del'>-	int txq_id = txq-&gt;q.id;</div><div class='del'>-</div><div class='del'>-	struct iwl3945_shared *shared_data = priv-&gt;_3945.shared_virt;</div><div class='del'>-</div><div class='del'>-	shared_data-&gt;tx_base_ptr[txq_id] = cpu_to_le32((u32)txq-&gt;q.dma_addr);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH39_CBCC_CTRL(txq_id), 0);</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH39_CBCC_BASE(txq_id), 0);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH39_TCSR_CONFIG(txq_id),</div><div class='del'>-		FH39_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_NOINT |</div><div class='del'>-		FH39_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_TXF |</div><div class='del'>-		FH39_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_IFTFD |</div><div class='del'>-		FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE_VAL |</div><div class='del'>-		FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE);</div><div class='del'>-</div><div class='del'>-	/* fake read to flush all prev. writes */</div><div class='del'>-	iwl_read32(priv, FH39_TSSR_CBB_BASE);</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'>- * HCMD utils</div><div class='del'>- */</div><div class='del'>-static u16 iwl3945_get_hcmd_size(u8 cmd_id, u16 len)</div><div class='del'>-{</div><div class='del'>-	switch (cmd_id) {</div><div class='del'>-	case REPLY_RXON:</div><div class='del'>-		return sizeof(struct iwl3945_rxon_cmd);</div><div class='del'>-	case POWER_TABLE_CMD:</div><div class='del'>-		return sizeof(struct iwl3945_powertable_cmd);</div><div class='del'>-	default:</div><div class='del'>-		return len;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static u16 iwl3945_build_addsta_hcmd(const struct iwl_legacy_addsta_cmd *cmd,</div><div class='del'>-								u8 *data)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_addsta_cmd *addsta = (struct iwl3945_addsta_cmd *)data;</div><div class='del'>-	addsta-&gt;mode = cmd-&gt;mode;</div><div class='del'>-	memcpy(&amp;addsta-&gt;sta, &amp;cmd-&gt;sta, sizeof(struct sta_id_modify));</div><div class='del'>-	memcpy(&amp;addsta-&gt;key, &amp;cmd-&gt;key, sizeof(struct iwl4965_keyinfo));</div><div class='del'>-	addsta-&gt;station_flags = cmd-&gt;station_flags;</div><div class='del'>-	addsta-&gt;station_flags_msk = cmd-&gt;station_flags_msk;</div><div class='del'>-	addsta-&gt;tid_disable_tx = cpu_to_le16(0);</div><div class='del'>-	addsta-&gt;rate_n_flags = cmd-&gt;rate_n_flags;</div><div class='del'>-	addsta-&gt;add_immediate_ba_tid = cmd-&gt;add_immediate_ba_tid;</div><div class='del'>-	addsta-&gt;remove_immediate_ba_tid = cmd-&gt;remove_immediate_ba_tid;</div><div class='del'>-	addsta-&gt;add_immediate_ba_ssn = cmd-&gt;add_immediate_ba_ssn;</div><div class='del'>-</div><div class='del'>-	return (u16)sizeof(struct iwl3945_addsta_cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl3945_add_bssid_station(struct iwl_priv *priv,</div><div class='del'>-				     const u8 *addr, u8 *sta_id_r)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-	int ret;</div><div class='del'>-	u8 sta_id;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (sta_id_r)</div><div class='del'>-		*sta_id_r = IWL_INVALID_STATION;</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_add_station_common(priv, ctx, addr, 0, NULL, &amp;sta_id);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "Unable to add station %pM\n", addr);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sta_id_r)</div><div class='del'>-		*sta_id_r = sta_id;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	priv-&gt;stations[sta_id].used |= IWL_STA_LOCAL;</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static int iwl3945_manage_ibss_station(struct iwl_priv *priv,</div><div class='del'>-				       struct ieee80211_vif *vif, bool add)</div><div class='del'>-{</div><div class='del'>-	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (add) {</div><div class='del'>-		ret = iwl3945_add_bssid_station(priv, vif-&gt;bss_conf.bssid,</div><div class='del'>-						&amp;vif_priv-&gt;ibss_bssid_sta_id);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		iwl3945_sync_sta(priv, vif_priv-&gt;ibss_bssid_sta_id,</div><div class='del'>-				 (priv-&gt;band == IEEE80211_BAND_5GHZ) ?</div><div class='del'>-				 IWL_RATE_6M_PLCP : IWL_RATE_1M_PLCP);</div><div class='del'>-		iwl3945_rate_scale_init(priv-&gt;hw, vif_priv-&gt;ibss_bssid_sta_id);</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_remove_station(priv, vif_priv-&gt;ibss_bssid_sta_id,</div><div class='del'>-				  vif-&gt;bss_conf.bssid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_init_hw_rate_table - Initialize the hardware rate fallback table</div><div class='del'>- */</div><div class='del'>-int iwl3945_init_hw_rate_table(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int rc, i, index, prev_index;</div><div class='del'>-	struct iwl3945_rate_scaling_cmd rate_cmd = {</div><div class='del'>-		.reserved = {0, 0, 0},</div><div class='del'>-	};</div><div class='del'>-	struct iwl3945_rate_scaling_info *table = rate_cmd.table;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(iwl3945_rates); i++) {</div><div class='del'>-		index = iwl3945_rates[i].table_rs_index;</div><div class='del'>-</div><div class='del'>-		table[index].rate_n_flags =</div><div class='del'>-			iwl3945_hw_set_rate_n_flags(iwl3945_rates[i].plcp, 0);</div><div class='del'>-		table[index].try_cnt = priv-&gt;retry_rate;</div><div class='del'>-		prev_index = iwl3945_get_prev_ieee_rate(i);</div><div class='del'>-		table[index].next_rate_index =</div><div class='del'>-				iwl3945_rates[prev_index].table_rs_index;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;band) {</div><div class='del'>-	case IEEE80211_BAND_5GHZ:</div><div class='del'>-		IWL_DEBUG_RATE(priv, "Select A mode rate scale\n");</div><div class='del'>-		/* If one of the following CCK rates is used,</div><div class='del'>-		 * have it fall back to the 6M OFDM rate */</div><div class='del'>-		for (i = IWL_RATE_1M_INDEX_TABLE;</div><div class='del'>-			i &lt;= IWL_RATE_11M_INDEX_TABLE; i++)</div><div class='del'>-			table[i].next_rate_index =</div><div class='del'>-			  iwl3945_rates[IWL_FIRST_OFDM_RATE].table_rs_index;</div><div class='del'>-</div><div class='del'>-		/* Don't fall back to CCK rates */</div><div class='del'>-		table[IWL_RATE_12M_INDEX_TABLE].next_rate_index =</div><div class='del'>-						IWL_RATE_9M_INDEX_TABLE;</div><div class='del'>-</div><div class='del'>-		/* Don't drop out of OFDM rates */</div><div class='del'>-		table[IWL_RATE_6M_INDEX_TABLE].next_rate_index =</div><div class='del'>-		    iwl3945_rates[IWL_FIRST_OFDM_RATE].table_rs_index;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IEEE80211_BAND_2GHZ:</div><div class='del'>-		IWL_DEBUG_RATE(priv, "Select B/G mode rate scale\n");</div><div class='del'>-		/* If an OFDM rate is used, have it fall back to the</div><div class='del'>-		 * 1M CCK rates */</div><div class='del'>-</div><div class='del'>-		if (!(priv-&gt;_3945.sta_supp_rates &amp; IWL_OFDM_RATES_MASK) &amp;&amp;</div><div class='del'>-		    iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS)) {</div><div class='del'>-</div><div class='del'>-			index = IWL_FIRST_CCK_RATE;</div><div class='del'>-			for (i = IWL_RATE_6M_INDEX_TABLE;</div><div class='del'>-			     i &lt;= IWL_RATE_54M_INDEX_TABLE; i++)</div><div class='del'>-				table[i].next_rate_index =</div><div class='del'>-					iwl3945_rates[index].table_rs_index;</div><div class='del'>-</div><div class='del'>-			index = IWL_RATE_11M_INDEX_TABLE;</div><div class='del'>-			/* CCK shouldn't fall back to OFDM... */</div><div class='del'>-			table[index].next_rate_index = IWL_RATE_5M_INDEX_TABLE;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Update the rate scaling for control frame Tx */</div><div class='del'>-	rate_cmd.table_id = 0;</div><div class='del'>-	rc = iwl_legacy_send_cmd_pdu(priv, REPLY_RATE_SCALE, sizeof(rate_cmd),</div><div class='del'>-			      &amp;rate_cmd);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	/* Update the rate scaling for data frame Tx */</div><div class='del'>-	rate_cmd.table_id = 1;</div><div class='del'>-	return iwl_legacy_send_cmd_pdu(priv, REPLY_RATE_SCALE, sizeof(rate_cmd),</div><div class='del'>-				&amp;rate_cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called when initializing driver */</div><div class='del'>-int iwl3945_hw_set_hw_params(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	memset((void *)&amp;priv-&gt;hw_params, 0,</div><div class='del'>-	       sizeof(struct iwl_hw_params));</div><div class='del'>-</div><div class='del'>-	priv-&gt;_3945.shared_virt =</div><div class='del'>-		dma_alloc_coherent(&amp;priv-&gt;pci_dev-&gt;dev,</div><div class='del'>-				   sizeof(struct iwl3945_shared),</div><div class='del'>-				   &amp;priv-&gt;_3945.shared_phys, GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;_3945.shared_virt) {</div><div class='del'>-		IWL_ERR(priv, "failed to allocate pci memory\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Assign number of Usable TX queues */</div><div class='del'>-	priv-&gt;hw_params.max_txq_num = priv-&gt;cfg-&gt;base_params-&gt;num_of_queues;</div><div class='del'>-</div><div class='del'>-	priv-&gt;hw_params.tfd_size = sizeof(struct iwl3945_tfd);</div><div class='del'>-	priv-&gt;hw_params.rx_page_order = get_order(IWL_RX_BUF_SIZE_3K);</div><div class='del'>-	priv-&gt;hw_params.max_rxq_size = RX_QUEUE_SIZE;</div><div class='del'>-	priv-&gt;hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG;</div><div class='del'>-	priv-&gt;hw_params.max_stations = IWL3945_STATION_COUNT;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWL3945_BROADCAST_ID;</div><div class='del'>-</div><div class='del'>-	priv-&gt;sta_key_max_num = STA_KEY_MAX_NUM;</div><div class='del'>-</div><div class='del'>-	priv-&gt;hw_params.rx_wrt_ptr_reg = FH39_RSCSR_CHNL0_WPTR;</div><div class='del'>-	priv-&gt;hw_params.max_beacon_itrvl = IWL39_MAX_UCODE_BEACON_INTERVAL;</div><div class='del'>-	priv-&gt;hw_params.beacon_time_tsf_bits = IWL3945_EXT_BEACON_TIME_POS;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned int iwl3945_hw_get_beacon_cmd(struct iwl_priv *priv,</div><div class='del'>-			  struct iwl3945_frame *frame, u8 rate)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_tx_beacon_cmd *tx_beacon_cmd;</div><div class='del'>-	unsigned int frame_size;</div><div class='del'>-</div><div class='del'>-	tx_beacon_cmd = (struct iwl3945_tx_beacon_cmd *)&amp;frame-&gt;u;</div><div class='del'>-	memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd));</div><div class='del'>-</div><div class='del'>-	tx_beacon_cmd-&gt;tx.sta_id =</div><div class='del'>-		priv-&gt;contexts[IWL_RXON_CTX_BSS].bcast_sta_id;</div><div class='del'>-	tx_beacon_cmd-&gt;tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;</div><div class='del'>-</div><div class='del'>-	frame_size = iwl3945_fill_beacon_frame(priv,</div><div class='del'>-				tx_beacon_cmd-&gt;frame,</div><div class='del'>-				sizeof(frame-&gt;u) - sizeof(*tx_beacon_cmd));</div><div class='del'>-</div><div class='del'>-	BUG_ON(frame_size &gt; MAX_MPDU_SIZE);</div><div class='del'>-	tx_beacon_cmd-&gt;tx.len = cpu_to_le16((u16)frame_size);</div><div class='del'>-</div><div class='del'>-	tx_beacon_cmd-&gt;tx.rate = rate;</div><div class='del'>-	tx_beacon_cmd-&gt;tx.tx_flags = (TX_CMD_FLG_SEQ_CTL_MSK |</div><div class='del'>-				      TX_CMD_FLG_TSF_MSK);</div><div class='del'>-</div><div class='del'>-	/* supp_rates[0] == OFDM start at IWL_FIRST_OFDM_RATE*/</div><div class='del'>-	tx_beacon_cmd-&gt;tx.supp_rates[0] =</div><div class='del'>-		(IWL_OFDM_BASIC_RATES_MASK &gt;&gt; IWL_FIRST_OFDM_RATE) &amp; 0xFF;</div><div class='del'>-</div><div class='del'>-	tx_beacon_cmd-&gt;tx.supp_rates[1] =</div><div class='del'>-		(IWL_CCK_BASIC_RATES_MASK &amp; 0xF);</div><div class='del'>-</div><div class='del'>-	return sizeof(struct iwl3945_tx_beacon_cmd) + frame_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl3945_hw_rx_handler_setup(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	priv-&gt;rx_handlers[REPLY_TX] = iwl3945_rx_reply_tx;</div><div class='del'>-	priv-&gt;rx_handlers[REPLY_3945_RX] = iwl3945_rx_reply_rx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl3945_hw_setup_deferred_work(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	INIT_DELAYED_WORK(&amp;priv-&gt;_3945.thermal_periodic,</div><div class='del'>-			  iwl3945_bg_reg_txpower_periodic);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl3945_hw_cancel_deferred_work(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	cancel_delayed_work(&amp;priv-&gt;_3945.thermal_periodic);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* check contents of special bootstrap uCode SRAM */</div><div class='del'>-static int iwl3945_verify_bsm(struct iwl_priv *priv)</div><div class='del'>- {</div><div class='del'>-	__le32 *image = priv-&gt;ucode_boot.v_addr;</div><div class='del'>-	u32 len = priv-&gt;ucode_boot.len;</div><div class='del'>-	u32 reg;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Begin verify bsm\n");</div><div class='del'>-</div><div class='del'>-	/* verify BSM SRAM contents */</div><div class='del'>-	val = iwl_legacy_read_prph(priv, BSM_WR_DWCOUNT_REG);</div><div class='del'>-	for (reg = BSM_SRAM_LOWER_BOUND;</div><div class='del'>-	     reg &lt; BSM_SRAM_LOWER_BOUND + len;</div><div class='del'>-	     reg += sizeof(u32), image++) {</div><div class='del'>-		val = iwl_legacy_read_prph(priv, reg);</div><div class='del'>-		if (val != le32_to_cpu(*image)) {</div><div class='del'>-			IWL_ERR(priv, "BSM uCode verification failed at "</div><div class='del'>-				  "addr 0x%08X+%u (of %u), is 0x%x, s/b 0x%x\n",</div><div class='del'>-				  BSM_SRAM_LOWER_BOUND,</div><div class='del'>-				  reg - BSM_SRAM_LOWER_BOUND, len,</div><div class='del'>-				  val, le32_to_cpu(*image));</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "BSM bootstrap uCode image OK\n");</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'>- * EEPROM related functions</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Clear the OWNER_MSK, to establish driver (instead of uCode running on</div><div class='del'>- * embedded controller) as EEPROM reader; each read is a series of pulses</div><div class='del'>- * to/from the EEPROM chip, not a single event, so even reads could conflict</div><div class='del'>- * if they weren't arbitrated by some ownership mechanism.  Here, the driver</div><div class='del'>- * simply claims ownership, which should be safe when this function is called</div><div class='del'>- * (i.e. before loading uCode!).</div><div class='del'>- */</div><div class='del'>-static int iwl3945_eeprom_acquire_semaphore(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	_iwl_legacy_clear_bit(priv, CSR_EEPROM_GP, CSR_EEPROM_GP_IF_OWNER_MSK);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void iwl3945_eeprom_release_semaphore(struct iwl_priv *priv)</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'>-  * iwl3945_load_bsm - Load bootstrap instructions</div><div class='del'>-  *</div><div class='del'>-  * BSM operation:</div><div class='del'>-  *</div><div class='del'>-  * The Bootstrap State Machine (BSM) stores a short bootstrap uCode program</div><div class='del'>-  * in special SRAM that does not power down during RFKILL.  When powering back</div><div class='del'>-  * up after power-saving sleeps (or during initial uCode load), the BSM loads</div><div class='del'>-  * the bootstrap program into the on-board processor, and starts it.</div><div class='del'>-  *</div><div class='del'>-  * The bootstrap program loads (via DMA) instructions and data for a new</div><div class='del'>-  * program from host DRAM locations indicated by the host driver in the</div><div class='del'>-  * BSM_DRAM_* registers.  Once the new program is loaded, it starts</div><div class='del'>-  * automatically.</div><div class='del'>-  *</div><div class='del'>-  * When initializing the NIC, the host driver points the BSM to the</div><div class='del'>-  * "initialize" uCode image.  This uCode sets up some internal data, then</div><div class='del'>-  * notifies host via "initialize alive" that it is complete.</div><div class='del'>-  *</div><div class='del'>-  * The host then replaces the BSM_DRAM_* pointer values to point to the</div><div class='del'>-  * normal runtime uCode instructions and a backup uCode data cache buffer</div><div class='del'>-  * (filled initially with starting data values for the on-board processor),</div><div class='del'>-  * then triggers the "initialize" uCode to load and launch the runtime uCode,</div><div class='del'>-  * which begins normal operation.</div><div class='del'>-  *</div><div class='del'>-  * When doing a power-save shutdown, runtime uCode saves data SRAM into</div><div class='del'>-  * the backup data cache in DRAM before SRAM is powered down.</div><div class='del'>-  *</div><div class='del'>-  * When powering back up, the BSM loads the bootstrap program.  This reloads</div><div class='del'>-  * the runtime uCode instructions and the backup data cache into SRAM,</div><div class='del'>-  * and re-launches the runtime uCode from where it left off.</div><div class='del'>-  */</div><div class='del'>-static int iwl3945_load_bsm(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	__le32 *image = priv-&gt;ucode_boot.v_addr;</div><div class='del'>-	u32 len = priv-&gt;ucode_boot.len;</div><div class='del'>-	dma_addr_t pinst;</div><div class='del'>-	dma_addr_t pdata;</div><div class='del'>-	u32 inst_len;</div><div class='del'>-	u32 data_len;</div><div class='del'>-	int rc;</div><div class='del'>-	int i;</div><div class='del'>-	u32 done;</div><div class='del'>-	u32 reg_offset;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Begin load bsm\n");</div><div class='del'>-</div><div class='del'>-	/* make sure bootstrap program is no larger than BSM's SRAM size */</div><div class='del'>-	if (len &gt; IWL39_MAX_BSM_SIZE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Tell bootstrap uCode where to find the "Initialize" uCode</div><div class='del'>-	*   in host DRAM ... host DRAM physical address bits 31:0 for 3945.</div><div class='del'>-	* NOTE:  iwl3945_initialize_alive_start() will replace these values,</div><div class='del'>-	*        after the "initialize" uCode has run, to point to</div><div class='del'>-	*        runtime/protocol instructions and backup data cache. */</div><div class='del'>-	pinst = priv-&gt;ucode_init.p_addr;</div><div class='del'>-	pdata = priv-&gt;ucode_init_data.p_addr;</div><div class='del'>-	inst_len = priv-&gt;ucode_init.len;</div><div class='del'>-	data_len = priv-&gt;ucode_init_data.len;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_DRAM_INST_PTR_REG, pinst);</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_DRAM_DATA_PTR_REG, pdata);</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_DRAM_INST_BYTECOUNT_REG, inst_len);</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_DRAM_DATA_BYTECOUNT_REG, data_len);</div><div class='del'>-</div><div class='del'>-	/* Fill BSM memory with bootstrap instructions */</div><div class='del'>-	for (reg_offset = BSM_SRAM_LOWER_BOUND;</div><div class='del'>-	     reg_offset &lt; BSM_SRAM_LOWER_BOUND + len;</div><div class='del'>-	     reg_offset += sizeof(u32), image++)</div><div class='del'>-		_iwl_legacy_write_prph(priv, reg_offset,</div><div class='del'>-					  le32_to_cpu(*image));</div><div class='del'>-</div><div class='del'>-	rc = iwl3945_verify_bsm(priv);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	/* Tell BSM to copy from BSM SRAM into instruction SRAM, when asked */</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_WR_MEM_SRC_REG, 0x0);</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_WR_MEM_DST_REG,</div><div class='del'>-				 IWL39_RTC_INST_LOWER_BOUND);</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_WR_DWCOUNT_REG, len / sizeof(u32));</div><div class='del'>-</div><div class='del'>-	/* Load bootstrap code into instruction SRAM now,</div><div class='del'>-	 *   to prepare to load "initialize" uCode */</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_WR_CTRL_REG,</div><div class='del'>-		BSM_WR_CTRL_REG_BIT_START);</div><div class='del'>-</div><div class='del'>-	/* Wait for load of bootstrap uCode to finish */</div><div class='del'>-	for (i = 0; i &lt; 100; i++) {</div><div class='del'>-		done = iwl_legacy_read_prph(priv, BSM_WR_CTRL_REG);</div><div class='del'>-		if (!(done &amp; BSM_WR_CTRL_REG_BIT_START))</div><div class='del'>-			break;</div><div class='del'>-		udelay(10);</div><div class='del'>-	}</div><div class='del'>-	if (i &lt; 100)</div><div class='del'>-		IWL_DEBUG_INFO(priv, "BSM write complete, poll %d iterations\n", i);</div><div class='del'>-	else {</div><div class='del'>-		IWL_ERR(priv, "BSM write did not complete!\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Enable future boot loads whenever power management unit triggers it</div><div class='del'>-	 *   (e.g. when powering back up after power-save shutdown) */</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_WR_CTRL_REG,</div><div class='del'>-		BSM_WR_CTRL_REG_BIT_START_EN);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct iwl_hcmd_ops iwl3945_hcmd = {</div><div class='del'>-	.rxon_assoc = iwl3945_send_rxon_assoc,</div><div class='del'>-	.commit_rxon = iwl3945_commit_rxon,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct iwl_lib_ops iwl3945_lib = {</div><div class='del'>-	.txq_attach_buf_to_tfd = iwl3945_hw_txq_attach_buf_to_tfd,</div><div class='del'>-	.txq_free_tfd = iwl3945_hw_txq_free_tfd,</div><div class='del'>-	.txq_init = iwl3945_hw_tx_queue_init,</div><div class='del'>-	.load_ucode = iwl3945_load_bsm,</div><div class='del'>-	.dump_nic_error_log = iwl3945_dump_nic_error_log,</div><div class='del'>-	.apm_ops = {</div><div class='del'>-		.init = iwl3945_apm_init,</div><div class='del'>-		.config = iwl3945_nic_config,</div><div class='del'>-	},</div><div class='del'>-	.eeprom_ops = {</div><div class='del'>-		.regulatory_bands = {</div><div class='del'>-			EEPROM_REGULATORY_BAND_1_CHANNELS,</div><div class='del'>-			EEPROM_REGULATORY_BAND_2_CHANNELS,</div><div class='del'>-			EEPROM_REGULATORY_BAND_3_CHANNELS,</div><div class='del'>-			EEPROM_REGULATORY_BAND_4_CHANNELS,</div><div class='del'>-			EEPROM_REGULATORY_BAND_5_CHANNELS,</div><div class='del'>-			EEPROM_REGULATORY_BAND_NO_HT40,</div><div class='del'>-			EEPROM_REGULATORY_BAND_NO_HT40,</div><div class='del'>-		},</div><div class='del'>-		.acquire_semaphore = iwl3945_eeprom_acquire_semaphore,</div><div class='del'>-		.release_semaphore = iwl3945_eeprom_release_semaphore,</div><div class='del'>-	},</div><div class='del'>-	.send_tx_power	= iwl3945_send_tx_power,</div><div class='del'>-	.is_valid_rtc_data_addr = iwl3945_hw_valid_rtc_data_addr,</div><div class='del'>-</div><div class='del'>-	.debugfs_ops = {</div><div class='del'>-		.rx_stats_read = iwl3945_ucode_rx_stats_read,</div><div class='del'>-		.tx_stats_read = iwl3945_ucode_tx_stats_read,</div><div class='del'>-		.general_stats_read = iwl3945_ucode_general_stats_read,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct iwl_legacy_ops iwl3945_legacy_ops = {</div><div class='del'>-	.post_associate = iwl3945_post_associate,</div><div class='del'>-	.config_ap = iwl3945_config_ap,</div><div class='del'>-	.manage_ibss_station = iwl3945_manage_ibss_station,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = {</div><div class='del'>-	.get_hcmd_size = iwl3945_get_hcmd_size,</div><div class='del'>-	.build_addsta_hcmd = iwl3945_build_addsta_hcmd,</div><div class='del'>-	.request_scan = iwl3945_request_scan,</div><div class='del'>-	.post_scan = iwl3945_post_scan,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct iwl_ops iwl3945_ops = {</div><div class='del'>-	.lib = &amp;iwl3945_lib,</div><div class='del'>-	.hcmd = &amp;iwl3945_hcmd,</div><div class='del'>-	.utils = &amp;iwl3945_hcmd_utils,</div><div class='del'>-	.led = &amp;iwl3945_led_ops,</div><div class='del'>-	.legacy = &amp;iwl3945_legacy_ops,</div><div class='del'>-	.ieee80211_ops = &amp;iwl3945_hw_ops,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct iwl_base_params iwl3945_base_params = {</div><div class='del'>-	.eeprom_size = IWL3945_EEPROM_IMG_SIZE,</div><div class='del'>-	.num_of_queues = IWL39_NUM_QUEUES,</div><div class='del'>-	.pll_cfg_val = CSR39_ANA_PLL_CFG_VAL,</div><div class='del'>-	.set_l0s = false,</div><div class='del'>-	.use_bsm = true,</div><div class='del'>-	.led_compensation = 64,</div><div class='del'>-	.wd_timeout = IWL_DEF_WD_TIMEOUT,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct iwl_cfg iwl3945_bg_cfg = {</div><div class='del'>-	.name = "3945BG",</div><div class='del'>-	.fw_name_pre = IWL3945_FW_PRE,</div><div class='del'>-	.ucode_api_max = IWL3945_UCODE_API_MAX,</div><div class='del'>-	.ucode_api_min = IWL3945_UCODE_API_MIN,</div><div class='del'>-	.sku = IWL_SKU_G,</div><div class='del'>-	.eeprom_ver = EEPROM_3945_EEPROM_VERSION,</div><div class='del'>-	.ops = &amp;iwl3945_ops,</div><div class='del'>-	.mod_params = &amp;iwl3945_mod_params,</div><div class='del'>-	.base_params = &amp;iwl3945_base_params,</div><div class='del'>-	.led_mode = IWL_LED_BLINK,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct iwl_cfg iwl3945_abg_cfg = {</div><div class='del'>-	.name = "3945ABG",</div><div class='del'>-	.fw_name_pre = IWL3945_FW_PRE,</div><div class='del'>-	.ucode_api_max = IWL3945_UCODE_API_MAX,</div><div class='del'>-	.ucode_api_min = IWL3945_UCODE_API_MIN,</div><div class='del'>-	.sku = IWL_SKU_A|IWL_SKU_G,</div><div class='del'>-	.eeprom_ver = EEPROM_3945_EEPROM_VERSION,</div><div class='del'>-	.ops = &amp;iwl3945_ops,</div><div class='del'>-	.mod_params = &amp;iwl3945_mod_params,</div><div class='del'>-	.base_params = &amp;iwl3945_base_params,</div><div class='del'>-	.led_mode = IWL_LED_BLINK,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-DEFINE_PCI_DEVICE_TABLE(iwl3945_hw_card_ids) = {</div><div class='del'>-	{IWL_PCI_DEVICE(0x4222, 0x1005, iwl3945_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x4222, 0x1034, iwl3945_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x4222, 0x1044, iwl3945_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x4227, 0x1014, iwl3945_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x4222, PCI_ANY_ID, iwl3945_abg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x4227, PCI_ANY_ID, iwl3945_abg_cfg)},</div><div class='del'>-	{0}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(pci, iwl3945_hw_card_ids);</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-3945.h b/drivers/net/wireless/iwlegacy/iwl-3945.h<br/>deleted file mode 100644<br/>index b118b59b71de..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-3945.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-3945.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,308 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-/*</div><div class='del'>- * Please use this file (iwl-3945.h) for driver implementation definitions.</div><div class='del'>- * Please use iwl-3945-commands.h for uCode API definitions.</div><div class='del'>- * Please use iwl-3945-hw.h for hardware-related definitions.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __iwl_3945_h__</div><div class='del'>-#define __iwl_3945_h__</div><div class='del'>-</div><div class='del'>-#include &lt;linux/pci.h&gt; /* for struct pci_device_id */</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;net/ieee80211_radiotap.h&gt;</div><div class='del'>-</div><div class='del'>-/* Hardware specific file defines the PCI IDs table for that hardware module */</div><div class='del'>-extern const struct pci_device_id iwl3945_hw_card_ids[];</div><div class='del'>-</div><div class='del'>-#include "iwl-csr.h"</div><div class='del'>-#include "iwl-prph.h"</div><div class='del'>-#include "iwl-fh.h"</div><div class='del'>-#include "iwl-3945-hw.h"</div><div class='del'>-#include "iwl-debug.h"</div><div class='del'>-#include "iwl-power.h"</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-led.h"</div><div class='del'>-</div><div class='del'>-/* Highest firmware API version supported */</div><div class='del'>-#define IWL3945_UCODE_API_MAX 2</div><div class='del'>-</div><div class='del'>-/* Lowest firmware API version supported */</div><div class='del'>-#define IWL3945_UCODE_API_MIN 1</div><div class='del'>-</div><div class='del'>-#define IWL3945_FW_PRE	"iwlwifi-3945-"</div><div class='del'>-#define _IWL3945_MODULE_FIRMWARE(api) IWL3945_FW_PRE #api ".ucode"</div><div class='del'>-#define IWL3945_MODULE_FIRMWARE(api) _IWL3945_MODULE_FIRMWARE(api)</div><div class='del'>-</div><div class='del'>-/* Default noise level to report when noise measurement is not available.</div><div class='del'>- *   This may be because we're:</div><div class='del'>- *   1)  Not associated (4965, no beacon statistics being sent to driver)</div><div class='del'>- *   2)  Scanning (noise measurement does not apply to associated channel)</div><div class='del'>- *   3)  Receiving CCK (3945 delivers noise info only for OFDM frames)</div><div class='del'>- * Use default noise value of -127 ... this is below the range of measurable</div><div class='del'>- *   Rx dBm for either 3945 or 4965, so it can indicate "unmeasurable" to user.</div><div class='del'>- *   Also, -127 works better than 0 when averaging frames with/without</div><div class='del'>- *   noise info (e.g. averaging might be done in app); measured dBm values are</div><div class='del'>- *   always negative ... using a negative value as the default keeps all</div><div class='del'>- *   averages within an s8's (used in some apps) range of negative values. */</div><div class='del'>-#define IWL_NOISE_MEAS_NOT_AVAILABLE (-127)</div><div class='del'>-</div><div class='del'>-/* Module parameters accessible from iwl-*.c */</div><div class='del'>-extern struct iwl_mod_params iwl3945_mod_params;</div><div class='del'>-</div><div class='del'>-struct iwl3945_rate_scale_data {</div><div class='del'>-	u64 data;</div><div class='del'>-	s32 success_counter;</div><div class='del'>-	s32 success_ratio;</div><div class='del'>-	s32 counter;</div><div class='del'>-	s32 average_tpt;</div><div class='del'>-	unsigned long stamp;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl3945_rs_sta {</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-	struct iwl_priv *priv;</div><div class='del'>-	s32 *expected_tpt;</div><div class='del'>-	unsigned long last_partial_flush;</div><div class='del'>-	unsigned long last_flush;</div><div class='del'>-	u32 flush_time;</div><div class='del'>-	u32 last_tx_packets;</div><div class='del'>-	u32 tx_packets;</div><div class='del'>-	u8 tgg;</div><div class='del'>-	u8 flush_pending;</div><div class='del'>-	u8 start_rate;</div><div class='del'>-	struct timer_list rate_scale_flush;</div><div class='del'>-	struct iwl3945_rate_scale_data win[IWL_RATE_COUNT_3945];</div><div class='del'>-#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='del'>-	struct dentry *rs_sta_dbgfs_stats_table_file;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* used to be in sta_info */</div><div class='del'>-	int last_txrate_idx;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The common struct MUST be first because it is shared between</div><div class='del'>- * 3945 and 4965!</div><div class='del'>- */</div><div class='del'>-struct iwl3945_sta_priv {</div><div class='del'>-	struct iwl_station_priv_common common;</div><div class='del'>-	struct iwl3945_rs_sta rs_sta;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum iwl3945_antenna {</div><div class='del'>-	IWL_ANTENNA_DIVERSITY,</div><div class='del'>-	IWL_ANTENNA_MAIN,</div><div class='del'>-	IWL_ANTENNA_AUX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * RTS threshold here is total size [2347] minus 4 FCS bytes</div><div class='del'>- * Per spec:</div><div class='del'>- *   a value of 0 means RTS on all data/management packets</div><div class='del'>- *   a value &gt; max MSDU size means no RTS</div><div class='del'>- * else RTS for data/management frames where MPDU is larger</div><div class='del'>- *   than RTS value.</div><div class='del'>- */</div><div class='del'>-#define DEFAULT_RTS_THRESHOLD     2347U</div><div class='del'>-#define MIN_RTS_THRESHOLD         0U</div><div class='del'>-#define MAX_RTS_THRESHOLD         2347U</div><div class='del'>-#define MAX_MSDU_SIZE		  2304U</div><div class='del'>-#define MAX_MPDU_SIZE		  2346U</div><div class='del'>-#define DEFAULT_BEACON_INTERVAL   100U</div><div class='del'>-#define	DEFAULT_SHORT_RETRY_LIMIT 7U</div><div class='del'>-#define	DEFAULT_LONG_RETRY_LIMIT  4U</div><div class='del'>-</div><div class='del'>-#define IWL_TX_FIFO_AC0	0</div><div class='del'>-#define IWL_TX_FIFO_AC1	1</div><div class='del'>-#define IWL_TX_FIFO_AC2	2</div><div class='del'>-#define IWL_TX_FIFO_AC3	3</div><div class='del'>-#define IWL_TX_FIFO_HCCA_1	5</div><div class='del'>-#define IWL_TX_FIFO_HCCA_2	6</div><div class='del'>-#define IWL_TX_FIFO_NONE	7</div><div class='del'>-</div><div class='del'>-#define IEEE80211_DATA_LEN              2304</div><div class='del'>-#define IEEE80211_4ADDR_LEN             30</div><div class='del'>-#define IEEE80211_HLEN                  (IEEE80211_4ADDR_LEN)</div><div class='del'>-#define IEEE80211_FRAME_LEN             (IEEE80211_DATA_LEN + IEEE80211_HLEN)</div><div class='del'>-</div><div class='del'>-struct iwl3945_frame {</div><div class='del'>-	union {</div><div class='del'>-		struct ieee80211_hdr frame;</div><div class='del'>-		struct iwl3945_tx_beacon_cmd beacon;</div><div class='del'>-		u8 raw[IEEE80211_FRAME_LEN];</div><div class='del'>-		u8 cmd[360];</div><div class='del'>-	} u;</div><div class='del'>-	struct list_head list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define SEQ_TO_SN(seq) (((seq) &amp; IEEE80211_SCTL_SEQ) &gt;&gt; 4)</div><div class='del'>-#define SN_TO_SEQ(ssn) (((ssn) &lt;&lt; 4) &amp; IEEE80211_SCTL_SEQ)</div><div class='del'>-#define MAX_SN ((IEEE80211_SCTL_SEQ) &gt;&gt; 4)</div><div class='del'>-</div><div class='del'>-#define SUP_RATE_11A_MAX_NUM_CHANNELS  8</div><div class='del'>-#define SUP_RATE_11B_MAX_NUM_CHANNELS  4</div><div class='del'>-#define SUP_RATE_11G_MAX_NUM_CHANNELS  12</div><div class='del'>-</div><div class='del'>-#define IWL_SUPPORTED_RATES_IE_LEN         8</div><div class='del'>-</div><div class='del'>-#define SCAN_INTERVAL 100</div><div class='del'>-</div><div class='del'>-#define MAX_TID_COUNT        9</div><div class='del'>-</div><div class='del'>-#define IWL_INVALID_RATE     0xFF</div><div class='del'>-#define IWL_INVALID_VALUE    -1</div><div class='del'>-</div><div class='del'>-#define STA_PS_STATUS_WAKE             0</div><div class='del'>-#define STA_PS_STATUS_SLEEP            1</div><div class='del'>-</div><div class='del'>-struct iwl3945_ibss_seq {</div><div class='del'>-	u8 mac[ETH_ALEN];</div><div class='del'>-	u16 seq_num;</div><div class='del'>-	u16 frag_num;</div><div class='del'>-	unsigned long packet_time;</div><div class='del'>-	struct list_head list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IWL_RX_HDR(x) ((struct iwl3945_rx_frame_hdr *)(\</div><div class='del'>-		       x-&gt;u.rx_frame.stats.payload + \</div><div class='del'>-		       x-&gt;u.rx_frame.stats.phy_count))</div><div class='del'>-#define IWL_RX_END(x) ((struct iwl3945_rx_frame_end *)(\</div><div class='del'>-		       IWL_RX_HDR(x)-&gt;payload + \</div><div class='del'>-		       le16_to_cpu(IWL_RX_HDR(x)-&gt;len)))</div><div class='del'>-#define IWL_RX_STATS(x) (&amp;x-&gt;u.rx_frame.stats)</div><div class='del'>-#define IWL_RX_DATA(x) (IWL_RX_HDR(x)-&gt;payload)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Functions implemented in iwl3945-base.c which are forward declared here</div><div class='del'>- * for use by iwl-*.c</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-extern int iwl3945_calc_db_from_ratio(int sig_ratio);</div><div class='del'>-extern void iwl3945_rx_replenish(void *data);</div><div class='del'>-extern void iwl3945_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq);</div><div class='del'>-extern unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,</div><div class='del'>-					struct ieee80211_hdr *hdr, int left);</div><div class='del'>-extern int iwl3945_dump_nic_event_log(struct iwl_priv *priv, bool full_log,</div><div class='del'>-				       char **buf, bool display);</div><div class='del'>-extern void iwl3945_dump_nic_error_log(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Functions implemented in iwl-[34]*.c which are forward declared here</div><div class='del'>- * for use by iwl3945-base.c</div><div class='del'>- *</div><div class='del'>- * NOTE:  The implementation of these functions are hardware specific</div><div class='del'>- * which is why they are in the hardware specific files (vs. iwl-base.c)</div><div class='del'>- *</div><div class='del'>- * Naming convention --</div><div class='del'>- * iwl3945_         &lt;-- Its part of iwlwifi (should be changed to iwl3945_)</div><div class='del'>- * iwl3945_hw_      &lt;-- Hardware specific (implemented in iwl-XXXX.c by all HW)</div><div class='del'>- * iwlXXXX_     &lt;-- Hardware specific (implemented in iwl-XXXX.c for XXXX)</div><div class='del'>- * iwl3945_bg_      &lt;-- Called from work queue context</div><div class='del'>- * iwl3945_mac_     &lt;-- mac80211 callback</div><div class='del'>- *</div><div class='del'>- ****************************************************************************/</div><div class='del'>-extern void iwl3945_hw_rx_handler_setup(struct iwl_priv *priv);</div><div class='del'>-extern void iwl3945_hw_setup_deferred_work(struct iwl_priv *priv);</div><div class='del'>-extern void iwl3945_hw_cancel_deferred_work(struct iwl_priv *priv);</div><div class='del'>-extern int iwl3945_hw_rxq_stop(struct iwl_priv *priv);</div><div class='del'>-extern int iwl3945_hw_set_hw_params(struct iwl_priv *priv);</div><div class='del'>-extern int iwl3945_hw_nic_init(struct iwl_priv *priv);</div><div class='del'>-extern int iwl3945_hw_nic_stop_master(struct iwl_priv *priv);</div><div class='del'>-extern void iwl3945_hw_txq_ctx_free(struct iwl_priv *priv);</div><div class='del'>-extern void iwl3945_hw_txq_ctx_stop(struct iwl_priv *priv);</div><div class='del'>-extern int iwl3945_hw_nic_reset(struct iwl_priv *priv);</div><div class='del'>-extern int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv,</div><div class='del'>-					    struct iwl_tx_queue *txq,</div><div class='del'>-					    dma_addr_t addr, u16 len,</div><div class='del'>-					    u8 reset, u8 pad);</div><div class='del'>-extern void iwl3945_hw_txq_free_tfd(struct iwl_priv *priv,</div><div class='del'>-				    struct iwl_tx_queue *txq);</div><div class='del'>-extern int iwl3945_hw_get_temperature(struct iwl_priv *priv);</div><div class='del'>-extern int iwl3945_hw_tx_queue_init(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_tx_queue *txq);</div><div class='del'>-extern unsigned int iwl3945_hw_get_beacon_cmd(struct iwl_priv *priv,</div><div class='del'>-				 struct iwl3945_frame *frame, u8 rate);</div><div class='del'>-void iwl3945_hw_build_tx_cmd_rate(struct iwl_priv *priv,</div><div class='del'>-				  struct iwl_device_cmd *cmd,</div><div class='del'>-				  struct ieee80211_tx_info *info,</div><div class='del'>-				  struct ieee80211_hdr *hdr,</div><div class='del'>-				  int sta_id, int tx_id);</div><div class='del'>-extern int iwl3945_hw_reg_send_txpower(struct iwl_priv *priv);</div><div class='del'>-extern int iwl3945_hw_reg_set_txpower(struct iwl_priv *priv, s8 power);</div><div class='del'>-extern void iwl3945_hw_rx_statistics(struct iwl_priv *priv,</div><div class='del'>-				 struct iwl_rx_mem_buffer *rxb);</div><div class='del'>-void iwl3945_reply_statistics(struct iwl_priv *priv,</div><div class='del'>-			      struct iwl_rx_mem_buffer *rxb);</div><div class='del'>-extern void iwl3945_disable_events(struct iwl_priv *priv);</div><div class='del'>-extern int iwl4965_get_temperature(const struct iwl_priv *priv);</div><div class='del'>-extern void iwl3945_post_associate(struct iwl_priv *priv);</div><div class='del'>-extern void iwl3945_config_ap(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-extern int iwl3945_commit_rxon(struct iwl_priv *priv,</div><div class='del'>-			       struct iwl_rxon_context *ctx);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_hw_find_station - Find station id for a given BSSID</div><div class='del'>- * @bssid: MAC address of station ID to find</div><div class='del'>- *</div><div class='del'>- * NOTE:  This should not be hardware specific but the code has</div><div class='del'>- * not yet been merged into a single common layer for managing the</div><div class='del'>- * station tables.</div><div class='del'>- */</div><div class='del'>-extern u8 iwl3945_hw_find_station(struct iwl_priv *priv, const u8 *bssid);</div><div class='del'>-</div><div class='del'>-extern struct ieee80211_ops iwl3945_hw_ops;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Forward declare iwl-3945.c functions for iwl3945-base.c</div><div class='del'>- */</div><div class='del'>-extern __le32 iwl3945_get_antenna_flags(const struct iwl_priv *priv);</div><div class='del'>-extern int iwl3945_init_hw_rate_table(struct iwl_priv *priv);</div><div class='del'>-extern void iwl3945_reg_txpower_periodic(struct iwl_priv *priv);</div><div class='del'>-extern int iwl3945_txpower_set_from_eeprom(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-extern const struct iwl_channel_info *iwl3945_get_channel_info(</div><div class='del'>-	const struct iwl_priv *priv, enum ieee80211_band band, u16 channel);</div><div class='del'>-</div><div class='del'>-extern int iwl3945_rs_next_rate(struct iwl_priv *priv, int rate);</div><div class='del'>-</div><div class='del'>-/* scanning */</div><div class='del'>-int iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif);</div><div class='del'>-void iwl3945_post_scan(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-/* rates */</div><div class='del'>-extern const struct iwl3945_rate_info iwl3945_rates[IWL_RATE_COUNT_3945];</div><div class='del'>-</div><div class='del'>-/* Requires full declaration of iwl_priv before including */</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c b/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c<br/>deleted file mode 100644<br/>index 1c93665766e4..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,774 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>-*</div><div class='del'>-* GPL LICENSE SUMMARY</div><div class='del'>-*</div><div class='del'>-* Copyright(c) 2008 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>-* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>-*****************************************************************************/</div><div class='del'>-#include "iwl-4965.h"</div><div class='del'>-#include "iwl-4965-debugfs.h"</div><div class='del'>-</div><div class='del'>-static const char *fmt_value = "  %-30s %10u\n";</div><div class='del'>-static const char *fmt_table = "  %-30s %10u  %10u  %10u  %10u\n";</div><div class='del'>-static const char *fmt_header =</div><div class='del'>-	"%-32s    current  cumulative       delta         max\n";</div><div class='del'>-</div><div class='del'>-static int iwl4965_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)</div><div class='del'>-{</div><div class='del'>-	int p = 0;</div><div class='del'>-	u32 flag;</div><div class='del'>-</div><div class='del'>-	flag = le32_to_cpu(priv-&gt;_4965.statistics.flag);</div><div class='del'>-</div><div class='del'>-	p += scnprintf(buf + p, bufsz - p, "Statistics Flag(0x%X):\n", flag);</div><div class='del'>-	if (flag &amp; UCODE_STATISTICS_CLEAR_MSK)</div><div class='del'>-		p += scnprintf(buf + p, bufsz - p,</div><div class='del'>-		"\tStatistics have been cleared\n");</div><div class='del'>-	p += scnprintf(buf + p, bufsz - p, "\tOperational Frequency: %s\n",</div><div class='del'>-		(flag &amp; UCODE_STATISTICS_FREQUENCY_MSK)</div><div class='del'>-		? "2.4 GHz" : "5.2 GHz");</div><div class='del'>-	p += scnprintf(buf + p, bufsz - p, "\tTGj Narrow Band: %s\n",</div><div class='del'>-		(flag &amp; UCODE_STATISTICS_NARROW_BAND_MSK)</div><div class='del'>-		 ? "enabled" : "disabled");</div><div class='del'>-</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ssize_t iwl4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,</div><div class='del'>-				size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	int pos = 0;</div><div class='del'>-	char *buf;</div><div class='del'>-	int bufsz = sizeof(struct statistics_rx_phy) * 40 +</div><div class='del'>-		    sizeof(struct statistics_rx_non_phy) * 40 +</div><div class='del'>-		    sizeof(struct statistics_rx_ht_phy) * 40 + 400;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	struct statistics_rx_phy *ofdm, *accum_ofdm, *delta_ofdm, *max_ofdm;</div><div class='del'>-	struct statistics_rx_phy *cck, *accum_cck, *delta_cck, *max_cck;</div><div class='del'>-	struct statistics_rx_non_phy *general, *accum_general;</div><div class='del'>-	struct statistics_rx_non_phy *delta_general, *max_general;</div><div class='del'>-	struct statistics_rx_ht_phy *ht, *accum_ht, *delta_ht, *max_ht;</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_alive(priv))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf) {</div><div class='del'>-		IWL_ERR(priv, "Can not allocate Buffer\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * the statistic information display here is based on</div><div class='del'>-	 * the last statistics notification from uCode</div><div class='del'>-	 * might not reflect the current uCode activity</div><div class='del'>-	 */</div><div class='del'>-	ofdm = &amp;priv-&gt;_4965.statistics.rx.ofdm;</div><div class='del'>-	cck = &amp;priv-&gt;_4965.statistics.rx.cck;</div><div class='del'>-	general = &amp;priv-&gt;_4965.statistics.rx.general;</div><div class='del'>-	ht = &amp;priv-&gt;_4965.statistics.rx.ofdm_ht;</div><div class='del'>-	accum_ofdm = &amp;priv-&gt;_4965.accum_statistics.rx.ofdm;</div><div class='del'>-	accum_cck = &amp;priv-&gt;_4965.accum_statistics.rx.cck;</div><div class='del'>-	accum_general = &amp;priv-&gt;_4965.accum_statistics.rx.general;</div><div class='del'>-	accum_ht = &amp;priv-&gt;_4965.accum_statistics.rx.ofdm_ht;</div><div class='del'>-	delta_ofdm = &amp;priv-&gt;_4965.delta_statistics.rx.ofdm;</div><div class='del'>-	delta_cck = &amp;priv-&gt;_4965.delta_statistics.rx.cck;</div><div class='del'>-	delta_general = &amp;priv-&gt;_4965.delta_statistics.rx.general;</div><div class='del'>-	delta_ht = &amp;priv-&gt;_4965.delta_statistics.rx.ofdm_ht;</div><div class='del'>-	max_ofdm = &amp;priv-&gt;_4965.max_delta.rx.ofdm;</div><div class='del'>-	max_cck = &amp;priv-&gt;_4965.max_delta.rx.cck;</div><div class='del'>-	max_general = &amp;priv-&gt;_4965.max_delta.rx.general;</div><div class='del'>-	max_ht = &amp;priv-&gt;_4965.max_delta.rx.ofdm_ht;</div><div class='del'>-</div><div class='del'>-	pos += iwl4965_statistics_flag(priv, buf, bufsz);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_header, "Statistics_Rx - OFDM:");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "ina_cnt:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;ina_cnt),</div><div class='del'>-			 accum_ofdm-&gt;ina_cnt,</div><div class='del'>-			 delta_ofdm-&gt;ina_cnt, max_ofdm-&gt;ina_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "fina_cnt:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;fina_cnt), accum_ofdm-&gt;fina_cnt,</div><div class='del'>-			 delta_ofdm-&gt;fina_cnt, max_ofdm-&gt;fina_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "plcp_err:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;plcp_err), accum_ofdm-&gt;plcp_err,</div><div class='del'>-			 delta_ofdm-&gt;plcp_err, max_ofdm-&gt;plcp_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "crc32_err:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;crc32_err), accum_ofdm-&gt;crc32_err,</div><div class='del'>-			 delta_ofdm-&gt;crc32_err, max_ofdm-&gt;crc32_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "overrun_err:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;overrun_err),</div><div class='del'>-			 accum_ofdm-&gt;overrun_err, delta_ofdm-&gt;overrun_err,</div><div class='del'>-			 max_ofdm-&gt;overrun_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "early_overrun_err:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;early_overrun_err),</div><div class='del'>-			 accum_ofdm-&gt;early_overrun_err,</div><div class='del'>-			 delta_ofdm-&gt;early_overrun_err,</div><div class='del'>-			 max_ofdm-&gt;early_overrun_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "crc32_good:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;crc32_good),</div><div class='del'>-			 accum_ofdm-&gt;crc32_good, delta_ofdm-&gt;crc32_good,</div><div class='del'>-			 max_ofdm-&gt;crc32_good);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "false_alarm_cnt:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;false_alarm_cnt),</div><div class='del'>-			 accum_ofdm-&gt;false_alarm_cnt,</div><div class='del'>-			 delta_ofdm-&gt;false_alarm_cnt,</div><div class='del'>-			 max_ofdm-&gt;false_alarm_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "fina_sync_err_cnt:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;fina_sync_err_cnt),</div><div class='del'>-			 accum_ofdm-&gt;fina_sync_err_cnt,</div><div class='del'>-			 delta_ofdm-&gt;fina_sync_err_cnt,</div><div class='del'>-			 max_ofdm-&gt;fina_sync_err_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "sfd_timeout:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;sfd_timeout),</div><div class='del'>-			 accum_ofdm-&gt;sfd_timeout, delta_ofdm-&gt;sfd_timeout,</div><div class='del'>-			 max_ofdm-&gt;sfd_timeout);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "fina_timeout:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;fina_timeout),</div><div class='del'>-			 accum_ofdm-&gt;fina_timeout, delta_ofdm-&gt;fina_timeout,</div><div class='del'>-			 max_ofdm-&gt;fina_timeout);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "unresponded_rts:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;unresponded_rts),</div><div class='del'>-			 accum_ofdm-&gt;unresponded_rts,</div><div class='del'>-			 delta_ofdm-&gt;unresponded_rts,</div><div class='del'>-			 max_ofdm-&gt;unresponded_rts);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "rxe_frame_lmt_ovrun:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;rxe_frame_limit_overrun),</div><div class='del'>-			 accum_ofdm-&gt;rxe_frame_limit_overrun,</div><div class='del'>-			 delta_ofdm-&gt;rxe_frame_limit_overrun,</div><div class='del'>-			 max_ofdm-&gt;rxe_frame_limit_overrun);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "sent_ack_cnt:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;sent_ack_cnt),</div><div class='del'>-			 accum_ofdm-&gt;sent_ack_cnt, delta_ofdm-&gt;sent_ack_cnt,</div><div class='del'>-			 max_ofdm-&gt;sent_ack_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "sent_cts_cnt:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;sent_cts_cnt),</div><div class='del'>-			 accum_ofdm-&gt;sent_cts_cnt, delta_ofdm-&gt;sent_cts_cnt,</div><div class='del'>-			 max_ofdm-&gt;sent_cts_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "sent_ba_rsp_cnt:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;sent_ba_rsp_cnt),</div><div class='del'>-			 accum_ofdm-&gt;sent_ba_rsp_cnt,</div><div class='del'>-			 delta_ofdm-&gt;sent_ba_rsp_cnt,</div><div class='del'>-			 max_ofdm-&gt;sent_ba_rsp_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "dsp_self_kill:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;dsp_self_kill),</div><div class='del'>-			 accum_ofdm-&gt;dsp_self_kill,</div><div class='del'>-			 delta_ofdm-&gt;dsp_self_kill,</div><div class='del'>-			 max_ofdm-&gt;dsp_self_kill);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "mh_format_err:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;mh_format_err),</div><div class='del'>-			 accum_ofdm-&gt;mh_format_err,</div><div class='del'>-			 delta_ofdm-&gt;mh_format_err,</div><div class='del'>-			 max_ofdm-&gt;mh_format_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "re_acq_main_rssi_sum:",</div><div class='del'>-			 le32_to_cpu(ofdm-&gt;re_acq_main_rssi_sum),</div><div class='del'>-			 accum_ofdm-&gt;re_acq_main_rssi_sum,</div><div class='del'>-			 delta_ofdm-&gt;re_acq_main_rssi_sum,</div><div class='del'>-			 max_ofdm-&gt;re_acq_main_rssi_sum);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_header, "Statistics_Rx - CCK:");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "ina_cnt:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;ina_cnt), accum_cck-&gt;ina_cnt,</div><div class='del'>-			 delta_cck-&gt;ina_cnt, max_cck-&gt;ina_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "fina_cnt:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;fina_cnt), accum_cck-&gt;fina_cnt,</div><div class='del'>-			 delta_cck-&gt;fina_cnt, max_cck-&gt;fina_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "plcp_err:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;plcp_err), accum_cck-&gt;plcp_err,</div><div class='del'>-			 delta_cck-&gt;plcp_err, max_cck-&gt;plcp_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "crc32_err:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;crc32_err), accum_cck-&gt;crc32_err,</div><div class='del'>-			 delta_cck-&gt;crc32_err, max_cck-&gt;crc32_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "overrun_err:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;overrun_err),</div><div class='del'>-			 accum_cck-&gt;overrun_err, delta_cck-&gt;overrun_err,</div><div class='del'>-			 max_cck-&gt;overrun_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "early_overrun_err:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;early_overrun_err),</div><div class='del'>-			 accum_cck-&gt;early_overrun_err,</div><div class='del'>-			 delta_cck-&gt;early_overrun_err,</div><div class='del'>-			 max_cck-&gt;early_overrun_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "crc32_good:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;crc32_good), accum_cck-&gt;crc32_good,</div><div class='del'>-			 delta_cck-&gt;crc32_good, max_cck-&gt;crc32_good);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "false_alarm_cnt:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;false_alarm_cnt),</div><div class='del'>-			 accum_cck-&gt;false_alarm_cnt,</div><div class='del'>-			 delta_cck-&gt;false_alarm_cnt, max_cck-&gt;false_alarm_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "fina_sync_err_cnt:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;fina_sync_err_cnt),</div><div class='del'>-			 accum_cck-&gt;fina_sync_err_cnt,</div><div class='del'>-			 delta_cck-&gt;fina_sync_err_cnt,</div><div class='del'>-			 max_cck-&gt;fina_sync_err_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "sfd_timeout:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;sfd_timeout),</div><div class='del'>-			 accum_cck-&gt;sfd_timeout, delta_cck-&gt;sfd_timeout,</div><div class='del'>-			 max_cck-&gt;sfd_timeout);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "fina_timeout:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;fina_timeout),</div><div class='del'>-			 accum_cck-&gt;fina_timeout, delta_cck-&gt;fina_timeout,</div><div class='del'>-			 max_cck-&gt;fina_timeout);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "unresponded_rts:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;unresponded_rts),</div><div class='del'>-			 accum_cck-&gt;unresponded_rts, delta_cck-&gt;unresponded_rts,</div><div class='del'>-			 max_cck-&gt;unresponded_rts);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "rxe_frame_lmt_ovrun:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;rxe_frame_limit_overrun),</div><div class='del'>-			 accum_cck-&gt;rxe_frame_limit_overrun,</div><div class='del'>-			 delta_cck-&gt;rxe_frame_limit_overrun,</div><div class='del'>-			 max_cck-&gt;rxe_frame_limit_overrun);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "sent_ack_cnt:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;sent_ack_cnt),</div><div class='del'>-			 accum_cck-&gt;sent_ack_cnt, delta_cck-&gt;sent_ack_cnt,</div><div class='del'>-			 max_cck-&gt;sent_ack_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "sent_cts_cnt:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;sent_cts_cnt),</div><div class='del'>-			 accum_cck-&gt;sent_cts_cnt, delta_cck-&gt;sent_cts_cnt,</div><div class='del'>-			 max_cck-&gt;sent_cts_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "sent_ba_rsp_cnt:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;sent_ba_rsp_cnt),</div><div class='del'>-			 accum_cck-&gt;sent_ba_rsp_cnt,</div><div class='del'>-			 delta_cck-&gt;sent_ba_rsp_cnt,</div><div class='del'>-			 max_cck-&gt;sent_ba_rsp_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "dsp_self_kill:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;dsp_self_kill),</div><div class='del'>-			 accum_cck-&gt;dsp_self_kill, delta_cck-&gt;dsp_self_kill,</div><div class='del'>-			 max_cck-&gt;dsp_self_kill);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "mh_format_err:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;mh_format_err),</div><div class='del'>-			 accum_cck-&gt;mh_format_err, delta_cck-&gt;mh_format_err,</div><div class='del'>-			 max_cck-&gt;mh_format_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "re_acq_main_rssi_sum:",</div><div class='del'>-			 le32_to_cpu(cck-&gt;re_acq_main_rssi_sum),</div><div class='del'>-			 accum_cck-&gt;re_acq_main_rssi_sum,</div><div class='del'>-			 delta_cck-&gt;re_acq_main_rssi_sum,</div><div class='del'>-			 max_cck-&gt;re_acq_main_rssi_sum);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_header, "Statistics_Rx - GENERAL:");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "bogus_cts:",</div><div class='del'>-			 le32_to_cpu(general-&gt;bogus_cts),</div><div class='del'>-			 accum_general-&gt;bogus_cts, delta_general-&gt;bogus_cts,</div><div class='del'>-			 max_general-&gt;bogus_cts);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "bogus_ack:",</div><div class='del'>-			 le32_to_cpu(general-&gt;bogus_ack),</div><div class='del'>-			 accum_general-&gt;bogus_ack, delta_general-&gt;bogus_ack,</div><div class='del'>-			 max_general-&gt;bogus_ack);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "non_bssid_frames:",</div><div class='del'>-			 le32_to_cpu(general-&gt;non_bssid_frames),</div><div class='del'>-			 accum_general-&gt;non_bssid_frames,</div><div class='del'>-			 delta_general-&gt;non_bssid_frames,</div><div class='del'>-			 max_general-&gt;non_bssid_frames);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "filtered_frames:",</div><div class='del'>-			 le32_to_cpu(general-&gt;filtered_frames),</div><div class='del'>-			 accum_general-&gt;filtered_frames,</div><div class='del'>-			 delta_general-&gt;filtered_frames,</div><div class='del'>-			 max_general-&gt;filtered_frames);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "non_channel_beacons:",</div><div class='del'>-			 le32_to_cpu(general-&gt;non_channel_beacons),</div><div class='del'>-			 accum_general-&gt;non_channel_beacons,</div><div class='del'>-			 delta_general-&gt;non_channel_beacons,</div><div class='del'>-			 max_general-&gt;non_channel_beacons);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "channel_beacons:",</div><div class='del'>-			 le32_to_cpu(general-&gt;channel_beacons),</div><div class='del'>-			 accum_general-&gt;channel_beacons,</div><div class='del'>-			 delta_general-&gt;channel_beacons,</div><div class='del'>-			 max_general-&gt;channel_beacons);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "num_missed_bcon:",</div><div class='del'>-			 le32_to_cpu(general-&gt;num_missed_bcon),</div><div class='del'>-			 accum_general-&gt;num_missed_bcon,</div><div class='del'>-			 delta_general-&gt;num_missed_bcon,</div><div class='del'>-			 max_general-&gt;num_missed_bcon);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "adc_rx_saturation_time:",</div><div class='del'>-			 le32_to_cpu(general-&gt;adc_rx_saturation_time),</div><div class='del'>-			 accum_general-&gt;adc_rx_saturation_time,</div><div class='del'>-			 delta_general-&gt;adc_rx_saturation_time,</div><div class='del'>-			 max_general-&gt;adc_rx_saturation_time);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "ina_detect_search_tm:",</div><div class='del'>-			 le32_to_cpu(general-&gt;ina_detection_search_time),</div><div class='del'>-			 accum_general-&gt;ina_detection_search_time,</div><div class='del'>-			 delta_general-&gt;ina_detection_search_time,</div><div class='del'>-			 max_general-&gt;ina_detection_search_time);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "beacon_silence_rssi_a:",</div><div class='del'>-			 le32_to_cpu(general-&gt;beacon_silence_rssi_a),</div><div class='del'>-			 accum_general-&gt;beacon_silence_rssi_a,</div><div class='del'>-			 delta_general-&gt;beacon_silence_rssi_a,</div><div class='del'>-			 max_general-&gt;beacon_silence_rssi_a);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "beacon_silence_rssi_b:",</div><div class='del'>-			 le32_to_cpu(general-&gt;beacon_silence_rssi_b),</div><div class='del'>-			 accum_general-&gt;beacon_silence_rssi_b,</div><div class='del'>-			 delta_general-&gt;beacon_silence_rssi_b,</div><div class='del'>-			 max_general-&gt;beacon_silence_rssi_b);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "beacon_silence_rssi_c:",</div><div class='del'>-			 le32_to_cpu(general-&gt;beacon_silence_rssi_c),</div><div class='del'>-			 accum_general-&gt;beacon_silence_rssi_c,</div><div class='del'>-			 delta_general-&gt;beacon_silence_rssi_c,</div><div class='del'>-			 max_general-&gt;beacon_silence_rssi_c);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "interference_data_flag:",</div><div class='del'>-			 le32_to_cpu(general-&gt;interference_data_flag),</div><div class='del'>-			 accum_general-&gt;interference_data_flag,</div><div class='del'>-			 delta_general-&gt;interference_data_flag,</div><div class='del'>-			 max_general-&gt;interference_data_flag);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "channel_load:",</div><div class='del'>-			 le32_to_cpu(general-&gt;channel_load),</div><div class='del'>-			 accum_general-&gt;channel_load,</div><div class='del'>-			 delta_general-&gt;channel_load,</div><div class='del'>-			 max_general-&gt;channel_load);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "dsp_false_alarms:",</div><div class='del'>-			 le32_to_cpu(general-&gt;dsp_false_alarms),</div><div class='del'>-			 accum_general-&gt;dsp_false_alarms,</div><div class='del'>-			 delta_general-&gt;dsp_false_alarms,</div><div class='del'>-			 max_general-&gt;dsp_false_alarms);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "beacon_rssi_a:",</div><div class='del'>-			 le32_to_cpu(general-&gt;beacon_rssi_a),</div><div class='del'>-			 accum_general-&gt;beacon_rssi_a,</div><div class='del'>-			 delta_general-&gt;beacon_rssi_a,</div><div class='del'>-			 max_general-&gt;beacon_rssi_a);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "beacon_rssi_b:",</div><div class='del'>-			 le32_to_cpu(general-&gt;beacon_rssi_b),</div><div class='del'>-			 accum_general-&gt;beacon_rssi_b,</div><div class='del'>-			 delta_general-&gt;beacon_rssi_b,</div><div class='del'>-			 max_general-&gt;beacon_rssi_b);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "beacon_rssi_c:",</div><div class='del'>-			 le32_to_cpu(general-&gt;beacon_rssi_c),</div><div class='del'>-			 accum_general-&gt;beacon_rssi_c,</div><div class='del'>-			 delta_general-&gt;beacon_rssi_c,</div><div class='del'>-			 max_general-&gt;beacon_rssi_c);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "beacon_energy_a:",</div><div class='del'>-			 le32_to_cpu(general-&gt;beacon_energy_a),</div><div class='del'>-			 accum_general-&gt;beacon_energy_a,</div><div class='del'>-			 delta_general-&gt;beacon_energy_a,</div><div class='del'>-			 max_general-&gt;beacon_energy_a);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "beacon_energy_b:",</div><div class='del'>-			 le32_to_cpu(general-&gt;beacon_energy_b),</div><div class='del'>-			 accum_general-&gt;beacon_energy_b,</div><div class='del'>-			 delta_general-&gt;beacon_energy_b,</div><div class='del'>-			 max_general-&gt;beacon_energy_b);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "beacon_energy_c:",</div><div class='del'>-			 le32_to_cpu(general-&gt;beacon_energy_c),</div><div class='del'>-			 accum_general-&gt;beacon_energy_c,</div><div class='del'>-			 delta_general-&gt;beacon_energy_c,</div><div class='del'>-			 max_general-&gt;beacon_energy_c);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_header, "Statistics_Rx - OFDM_HT:");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "plcp_err:",</div><div class='del'>-			 le32_to_cpu(ht-&gt;plcp_err), accum_ht-&gt;plcp_err,</div><div class='del'>-			 delta_ht-&gt;plcp_err, max_ht-&gt;plcp_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "overrun_err:",</div><div class='del'>-			 le32_to_cpu(ht-&gt;overrun_err), accum_ht-&gt;overrun_err,</div><div class='del'>-			 delta_ht-&gt;overrun_err, max_ht-&gt;overrun_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "early_overrun_err:",</div><div class='del'>-			 le32_to_cpu(ht-&gt;early_overrun_err),</div><div class='del'>-			 accum_ht-&gt;early_overrun_err,</div><div class='del'>-			 delta_ht-&gt;early_overrun_err,</div><div class='del'>-			 max_ht-&gt;early_overrun_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "crc32_good:",</div><div class='del'>-			 le32_to_cpu(ht-&gt;crc32_good), accum_ht-&gt;crc32_good,</div><div class='del'>-			 delta_ht-&gt;crc32_good, max_ht-&gt;crc32_good);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "crc32_err:",</div><div class='del'>-			 le32_to_cpu(ht-&gt;crc32_err), accum_ht-&gt;crc32_err,</div><div class='del'>-			 delta_ht-&gt;crc32_err, max_ht-&gt;crc32_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "mh_format_err:",</div><div class='del'>-			 le32_to_cpu(ht-&gt;mh_format_err),</div><div class='del'>-			 accum_ht-&gt;mh_format_err,</div><div class='del'>-			 delta_ht-&gt;mh_format_err, max_ht-&gt;mh_format_err);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "agg_crc32_good:",</div><div class='del'>-			 le32_to_cpu(ht-&gt;agg_crc32_good),</div><div class='del'>-			 accum_ht-&gt;agg_crc32_good,</div><div class='del'>-			 delta_ht-&gt;agg_crc32_good, max_ht-&gt;agg_crc32_good);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "agg_mpdu_cnt:",</div><div class='del'>-			 le32_to_cpu(ht-&gt;agg_mpdu_cnt),</div><div class='del'>-			 accum_ht-&gt;agg_mpdu_cnt,</div><div class='del'>-			 delta_ht-&gt;agg_mpdu_cnt, max_ht-&gt;agg_mpdu_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "agg_cnt:",</div><div class='del'>-			 le32_to_cpu(ht-&gt;agg_cnt), accum_ht-&gt;agg_cnt,</div><div class='del'>-			 delta_ht-&gt;agg_cnt, max_ht-&gt;agg_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "unsupport_mcs:",</div><div class='del'>-			 le32_to_cpu(ht-&gt;unsupport_mcs),</div><div class='del'>-			 accum_ht-&gt;unsupport_mcs,</div><div class='del'>-			 delta_ht-&gt;unsupport_mcs, max_ht-&gt;unsupport_mcs);</div><div class='del'>-</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ssize_t iwl4965_ucode_tx_stats_read(struct file *file,</div><div class='del'>-				char __user *user_buf,</div><div class='del'>-				size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	int pos = 0;</div><div class='del'>-	char *buf;</div><div class='del'>-	int bufsz = (sizeof(struct statistics_tx) * 48) + 250;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	struct statistics_tx *tx, *accum_tx, *delta_tx, *max_tx;</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_alive(priv))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf) {</div><div class='del'>-		IWL_ERR(priv, "Can not allocate Buffer\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* the statistic information display here is based on</div><div class='del'>-	  * the last statistics notification from uCode</div><div class='del'>-	  * might not reflect the current uCode activity</div><div class='del'>-	  */</div><div class='del'>-	tx = &amp;priv-&gt;_4965.statistics.tx;</div><div class='del'>-	accum_tx = &amp;priv-&gt;_4965.accum_statistics.tx;</div><div class='del'>-	delta_tx = &amp;priv-&gt;_4965.delta_statistics.tx;</div><div class='del'>-	max_tx = &amp;priv-&gt;_4965.max_delta.tx;</div><div class='del'>-</div><div class='del'>-	pos += iwl4965_statistics_flag(priv, buf, bufsz);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_header, "Statistics_Tx:");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "preamble:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;preamble_cnt),</div><div class='del'>-			 accum_tx-&gt;preamble_cnt,</div><div class='del'>-			 delta_tx-&gt;preamble_cnt, max_tx-&gt;preamble_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "rx_detected_cnt:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;rx_detected_cnt),</div><div class='del'>-			 accum_tx-&gt;rx_detected_cnt,</div><div class='del'>-			 delta_tx-&gt;rx_detected_cnt, max_tx-&gt;rx_detected_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "bt_prio_defer_cnt:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;bt_prio_defer_cnt),</div><div class='del'>-			 accum_tx-&gt;bt_prio_defer_cnt,</div><div class='del'>-			 delta_tx-&gt;bt_prio_defer_cnt,</div><div class='del'>-			 max_tx-&gt;bt_prio_defer_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "bt_prio_kill_cnt:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;bt_prio_kill_cnt),</div><div class='del'>-			 accum_tx-&gt;bt_prio_kill_cnt,</div><div class='del'>-			 delta_tx-&gt;bt_prio_kill_cnt,</div><div class='del'>-			 max_tx-&gt;bt_prio_kill_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "few_bytes_cnt:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;few_bytes_cnt),</div><div class='del'>-			 accum_tx-&gt;few_bytes_cnt,</div><div class='del'>-			 delta_tx-&gt;few_bytes_cnt, max_tx-&gt;few_bytes_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "cts_timeout:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;cts_timeout), accum_tx-&gt;cts_timeout,</div><div class='del'>-			 delta_tx-&gt;cts_timeout, max_tx-&gt;cts_timeout);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "ack_timeout:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;ack_timeout),</div><div class='del'>-			 accum_tx-&gt;ack_timeout,</div><div class='del'>-			 delta_tx-&gt;ack_timeout, max_tx-&gt;ack_timeout);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "expected_ack_cnt:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;expected_ack_cnt),</div><div class='del'>-			 accum_tx-&gt;expected_ack_cnt,</div><div class='del'>-			 delta_tx-&gt;expected_ack_cnt,</div><div class='del'>-			 max_tx-&gt;expected_ack_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "actual_ack_cnt:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;actual_ack_cnt),</div><div class='del'>-			 accum_tx-&gt;actual_ack_cnt,</div><div class='del'>-			 delta_tx-&gt;actual_ack_cnt,</div><div class='del'>-			 max_tx-&gt;actual_ack_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "dump_msdu_cnt:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;dump_msdu_cnt),</div><div class='del'>-			 accum_tx-&gt;dump_msdu_cnt,</div><div class='del'>-			 delta_tx-&gt;dump_msdu_cnt,</div><div class='del'>-			 max_tx-&gt;dump_msdu_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "abort_nxt_frame_mismatch:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;burst_abort_next_frame_mismatch_cnt),</div><div class='del'>-			 accum_tx-&gt;burst_abort_next_frame_mismatch_cnt,</div><div class='del'>-			 delta_tx-&gt;burst_abort_next_frame_mismatch_cnt,</div><div class='del'>-			 max_tx-&gt;burst_abort_next_frame_mismatch_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "abort_missing_nxt_frame:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;burst_abort_missing_next_frame_cnt),</div><div class='del'>-			 accum_tx-&gt;burst_abort_missing_next_frame_cnt,</div><div class='del'>-			 delta_tx-&gt;burst_abort_missing_next_frame_cnt,</div><div class='del'>-			 max_tx-&gt;burst_abort_missing_next_frame_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "cts_timeout_collision:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;cts_timeout_collision),</div><div class='del'>-			 accum_tx-&gt;cts_timeout_collision,</div><div class='del'>-			 delta_tx-&gt;cts_timeout_collision,</div><div class='del'>-			 max_tx-&gt;cts_timeout_collision);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "ack_ba_timeout_collision:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;ack_or_ba_timeout_collision),</div><div class='del'>-			 accum_tx-&gt;ack_or_ba_timeout_collision,</div><div class='del'>-			 delta_tx-&gt;ack_or_ba_timeout_collision,</div><div class='del'>-			 max_tx-&gt;ack_or_ba_timeout_collision);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "agg ba_timeout:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;agg.ba_timeout),</div><div class='del'>-			 accum_tx-&gt;agg.ba_timeout,</div><div class='del'>-			 delta_tx-&gt;agg.ba_timeout,</div><div class='del'>-			 max_tx-&gt;agg.ba_timeout);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "agg ba_resched_frames:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;agg.ba_reschedule_frames),</div><div class='del'>-			 accum_tx-&gt;agg.ba_reschedule_frames,</div><div class='del'>-			 delta_tx-&gt;agg.ba_reschedule_frames,</div><div class='del'>-			 max_tx-&gt;agg.ba_reschedule_frames);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "agg scd_query_agg_frame:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;agg.scd_query_agg_frame_cnt),</div><div class='del'>-			 accum_tx-&gt;agg.scd_query_agg_frame_cnt,</div><div class='del'>-			 delta_tx-&gt;agg.scd_query_agg_frame_cnt,</div><div class='del'>-			 max_tx-&gt;agg.scd_query_agg_frame_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "agg scd_query_no_agg:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;agg.scd_query_no_agg),</div><div class='del'>-			 accum_tx-&gt;agg.scd_query_no_agg,</div><div class='del'>-			 delta_tx-&gt;agg.scd_query_no_agg,</div><div class='del'>-			 max_tx-&gt;agg.scd_query_no_agg);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "agg scd_query_agg:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;agg.scd_query_agg),</div><div class='del'>-			 accum_tx-&gt;agg.scd_query_agg,</div><div class='del'>-			 delta_tx-&gt;agg.scd_query_agg,</div><div class='del'>-			 max_tx-&gt;agg.scd_query_agg);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "agg scd_query_mismatch:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;agg.scd_query_mismatch),</div><div class='del'>-			 accum_tx-&gt;agg.scd_query_mismatch,</div><div class='del'>-			 delta_tx-&gt;agg.scd_query_mismatch,</div><div class='del'>-			 max_tx-&gt;agg.scd_query_mismatch);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "agg frame_not_ready:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;agg.frame_not_ready),</div><div class='del'>-			 accum_tx-&gt;agg.frame_not_ready,</div><div class='del'>-			 delta_tx-&gt;agg.frame_not_ready,</div><div class='del'>-			 max_tx-&gt;agg.frame_not_ready);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "agg underrun:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;agg.underrun),</div><div class='del'>-			 accum_tx-&gt;agg.underrun,</div><div class='del'>-			 delta_tx-&gt;agg.underrun, max_tx-&gt;agg.underrun);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "agg bt_prio_kill:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;agg.bt_prio_kill),</div><div class='del'>-			 accum_tx-&gt;agg.bt_prio_kill,</div><div class='del'>-			 delta_tx-&gt;agg.bt_prio_kill,</div><div class='del'>-			 max_tx-&gt;agg.bt_prio_kill);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "agg rx_ba_rsp_cnt:",</div><div class='del'>-			 le32_to_cpu(tx-&gt;agg.rx_ba_rsp_cnt),</div><div class='del'>-			 accum_tx-&gt;agg.rx_ba_rsp_cnt,</div><div class='del'>-			 delta_tx-&gt;agg.rx_ba_rsp_cnt,</div><div class='del'>-			 max_tx-&gt;agg.rx_ba_rsp_cnt);</div><div class='del'>-</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ssize_t</div><div class='del'>-iwl4965_ucode_general_stats_read(struct file *file, char __user *user_buf,</div><div class='del'>-				     size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	int pos = 0;</div><div class='del'>-	char *buf;</div><div class='del'>-	int bufsz = sizeof(struct statistics_general) * 10 + 300;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	struct statistics_general_common *general, *accum_general;</div><div class='del'>-	struct statistics_general_common *delta_general, *max_general;</div><div class='del'>-	struct statistics_dbg *dbg, *accum_dbg, *delta_dbg, *max_dbg;</div><div class='del'>-	struct statistics_div *div, *accum_div, *delta_div, *max_div;</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_alive(priv))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf) {</div><div class='del'>-		IWL_ERR(priv, "Can not allocate Buffer\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* the statistic information display here is based on</div><div class='del'>-	  * the last statistics notification from uCode</div><div class='del'>-	  * might not reflect the current uCode activity</div><div class='del'>-	  */</div><div class='del'>-	general = &amp;priv-&gt;_4965.statistics.general.common;</div><div class='del'>-	dbg = &amp;priv-&gt;_4965.statistics.general.common.dbg;</div><div class='del'>-	div = &amp;priv-&gt;_4965.statistics.general.common.div;</div><div class='del'>-	accum_general = &amp;priv-&gt;_4965.accum_statistics.general.common;</div><div class='del'>-	accum_dbg = &amp;priv-&gt;_4965.accum_statistics.general.common.dbg;</div><div class='del'>-	accum_div = &amp;priv-&gt;_4965.accum_statistics.general.common.div;</div><div class='del'>-	delta_general = &amp;priv-&gt;_4965.delta_statistics.general.common;</div><div class='del'>-	max_general = &amp;priv-&gt;_4965.max_delta.general.common;</div><div class='del'>-	delta_dbg = &amp;priv-&gt;_4965.delta_statistics.general.common.dbg;</div><div class='del'>-	max_dbg = &amp;priv-&gt;_4965.max_delta.general.common.dbg;</div><div class='del'>-	delta_div = &amp;priv-&gt;_4965.delta_statistics.general.common.div;</div><div class='del'>-	max_div = &amp;priv-&gt;_4965.max_delta.general.common.div;</div><div class='del'>-</div><div class='del'>-	pos += iwl4965_statistics_flag(priv, buf, bufsz);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_header, "Statistics_General:");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_value, "temperature:",</div><div class='del'>-			 le32_to_cpu(general-&gt;temperature));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_value, "ttl_timestamp:",</div><div class='del'>-			 le32_to_cpu(general-&gt;ttl_timestamp));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "burst_check:",</div><div class='del'>-			 le32_to_cpu(dbg-&gt;burst_check),</div><div class='del'>-			 accum_dbg-&gt;burst_check,</div><div class='del'>-			 delta_dbg-&gt;burst_check, max_dbg-&gt;burst_check);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "burst_count:",</div><div class='del'>-			 le32_to_cpu(dbg-&gt;burst_count),</div><div class='del'>-			 accum_dbg-&gt;burst_count,</div><div class='del'>-			 delta_dbg-&gt;burst_count, max_dbg-&gt;burst_count);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "wait_for_silence_timeout_count:",</div><div class='del'>-			 le32_to_cpu(dbg-&gt;wait_for_silence_timeout_cnt),</div><div class='del'>-			 accum_dbg-&gt;wait_for_silence_timeout_cnt,</div><div class='del'>-			 delta_dbg-&gt;wait_for_silence_timeout_cnt,</div><div class='del'>-			 max_dbg-&gt;wait_for_silence_timeout_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "sleep_time:",</div><div class='del'>-			 le32_to_cpu(general-&gt;sleep_time),</div><div class='del'>-			 accum_general-&gt;sleep_time,</div><div class='del'>-			 delta_general-&gt;sleep_time, max_general-&gt;sleep_time);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "slots_out:",</div><div class='del'>-			 le32_to_cpu(general-&gt;slots_out),</div><div class='del'>-			 accum_general-&gt;slots_out,</div><div class='del'>-			 delta_general-&gt;slots_out, max_general-&gt;slots_out);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "slots_idle:",</div><div class='del'>-			 le32_to_cpu(general-&gt;slots_idle),</div><div class='del'>-			 accum_general-&gt;slots_idle,</div><div class='del'>-			 delta_general-&gt;slots_idle, max_general-&gt;slots_idle);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "tx_on_a:",</div><div class='del'>-			 le32_to_cpu(div-&gt;tx_on_a), accum_div-&gt;tx_on_a,</div><div class='del'>-			 delta_div-&gt;tx_on_a, max_div-&gt;tx_on_a);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "tx_on_b:",</div><div class='del'>-			 le32_to_cpu(div-&gt;tx_on_b), accum_div-&gt;tx_on_b,</div><div class='del'>-			 delta_div-&gt;tx_on_b, max_div-&gt;tx_on_b);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "exec_time:",</div><div class='del'>-			 le32_to_cpu(div-&gt;exec_time), accum_div-&gt;exec_time,</div><div class='del'>-			 delta_div-&gt;exec_time, max_div-&gt;exec_time);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "probe_time:",</div><div class='del'>-			 le32_to_cpu(div-&gt;probe_time), accum_div-&gt;probe_time,</div><div class='del'>-			 delta_div-&gt;probe_time, max_div-&gt;probe_time);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "rx_enable_counter:",</div><div class='del'>-			 le32_to_cpu(general-&gt;rx_enable_counter),</div><div class='del'>-			 accum_general-&gt;rx_enable_counter,</div><div class='del'>-			 delta_general-&gt;rx_enable_counter,</div><div class='del'>-			 max_general-&gt;rx_enable_counter);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			 fmt_table, "num_of_sos_states:",</div><div class='del'>-			 le32_to_cpu(general-&gt;num_of_sos_states),</div><div class='del'>-			 accum_general-&gt;num_of_sos_states,</div><div class='del'>-			 delta_general-&gt;num_of_sos_states,</div><div class='del'>-			 max_general-&gt;num_of_sos_states);</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h b/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h<br/>deleted file mode 100644<br/>index 6c8e35361a9e..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * GPL LICENSE SUMMARY</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2008 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-debug.h"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS</div><div class='del'>-ssize_t iwl4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,</div><div class='del'>-				size_t count, loff_t *ppos);</div><div class='del'>-ssize_t iwl4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,</div><div class='del'>-				size_t count, loff_t *ppos);</div><div class='del'>-ssize_t iwl4965_ucode_general_stats_read(struct file *file,</div><div class='del'>-			char __user *user_buf, size_t count, loff_t *ppos);</div><div class='del'>-#else</div><div class='del'>-static ssize_t</div><div class='del'>-iwl4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,</div><div class='del'>-				       size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static ssize_t</div><div class='del'>-iwl4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,</div><div class='del'>-				       size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static ssize_t</div><div class='del'>-iwl4965_ucode_general_stats_read(struct file *file, char __user *user_buf,</div><div class='del'>-					    size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c b/drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c<br/>deleted file mode 100644<br/>index cb9baab1ff7d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,154 +0,0 @@</div><div class='del'>-/******************************************************************************</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) 2008 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- * BSD LICENSE</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2005 - 2011 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='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/slab.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-commands.h"</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-debug.h"</div><div class='del'>-#include "iwl-4965.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * EEPROM related functions</div><div class='del'>- *</div><div class='del'>-******************************************************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The device's EEPROM semaphore prevents conflicts between driver and uCode</div><div class='del'>- * when accessing the EEPROM; each access is a series of pulses to/from the</div><div class='del'>- * EEPROM chip, not a single event, so even reads could conflict if they</div><div class='del'>- * weren't arbitrated by the semaphore.</div><div class='del'>- */</div><div class='del'>-int iwl4965_eeprom_acquire_semaphore(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	u16 count;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	for (count = 0; count &lt; EEPROM_SEM_RETRY_LIMIT; count++) {</div><div class='del'>-		/* Request semaphore */</div><div class='del'>-		iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-			    CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);</div><div class='del'>-</div><div class='del'>-		/* See if we got it */</div><div class='del'>-		ret = iwl_poll_bit(priv, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-				CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,</div><div class='del'>-				CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,</div><div class='del'>-				EEPROM_SEM_TIMEOUT);</div><div class='del'>-		if (ret &gt;= 0) {</div><div class='del'>-			IWL_DEBUG_IO(priv,</div><div class='del'>-				"Acquired semaphore after %d tries.\n",</div><div class='del'>-				count+1);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl4965_eeprom_release_semaphore(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	iwl_legacy_clear_bit(priv, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-		CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_eeprom_check_version(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	u16 eeprom_ver;</div><div class='del'>-	u16 calib_ver;</div><div class='del'>-</div><div class='del'>-	eeprom_ver = iwl_legacy_eeprom_query16(priv, EEPROM_VERSION);</div><div class='del'>-	calib_ver = iwl_legacy_eeprom_query16(priv,</div><div class='del'>-			EEPROM_4965_CALIB_VERSION_OFFSET);</div><div class='del'>-</div><div class='del'>-	if (eeprom_ver &lt; priv-&gt;cfg-&gt;eeprom_ver ||</div><div class='del'>-	    calib_ver &lt; priv-&gt;cfg-&gt;eeprom_calib_ver)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	IWL_INFO(priv, "device EEPROM VER=0x%x, CALIB=0x%x\n",</div><div class='del'>-		 eeprom_ver, calib_ver);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	IWL_ERR(priv, "Unsupported (too old) EEPROM VER=0x%x &lt; 0x%x "</div><div class='del'>-		  "CALIB=0x%x &lt; 0x%x\n",</div><div class='del'>-		  eeprom_ver, priv-&gt;cfg-&gt;eeprom_ver,</div><div class='del'>-		  calib_ver,  priv-&gt;cfg-&gt;eeprom_calib_ver);</div><div class='del'>-	return -EINVAL;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl4965_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac)</div><div class='del'>-{</div><div class='del'>-	const u8 *addr = iwl_legacy_eeprom_query_addr(priv,</div><div class='del'>-					EEPROM_MAC_ADDRESS);</div><div class='del'>-	memcpy(mac, addr, ETH_ALEN);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-hw.h b/drivers/net/wireless/iwlegacy/iwl-4965-hw.h<br/>deleted file mode 100644<br/>index fc6fa2886d9c..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-4965-hw.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-hw.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,811 +0,0 @@</div><div class='del'>-/******************************************************************************</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) 2005 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- * BSD LICENSE</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2005 - 2011 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='del'>-/*</div><div class='del'>- * Please use this file (iwl-4965-hw.h) only for hardware-related definitions.</div><div class='del'>- * Use iwl-commands.h for uCode API definitions.</div><div class='del'>- * Use iwl-dev.h for driver implementation definitions.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __iwl_4965_hw_h__</div><div class='del'>-#define __iwl_4965_hw_h__</div><div class='del'>-</div><div class='del'>-#include "iwl-fh.h"</div><div class='del'>-</div><div class='del'>-/* EEPROM */</div><div class='del'>-#define IWL4965_EEPROM_IMG_SIZE			1024</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * uCode queue management definitions ...</div><div class='del'>- * The first queue used for block-ack aggregation is #7 (4965 only).</div><div class='del'>- * All block-ack aggregation queues should map to Tx DMA/FIFO channel 7.</div><div class='del'>- */</div><div class='del'>-#define IWL49_FIRST_AMPDU_QUEUE	7</div><div class='del'>-</div><div class='del'>-/* Sizes and addresses for instruction and data memory (SRAM) in</div><div class='del'>- * 4965's embedded processor.  Driver access is via HBUS_TARG_MEM_* regs. */</div><div class='del'>-#define IWL49_RTC_INST_LOWER_BOUND		(0x000000)</div><div class='del'>-#define IWL49_RTC_INST_UPPER_BOUND		(0x018000)</div><div class='del'>-</div><div class='del'>-#define IWL49_RTC_DATA_LOWER_BOUND		(0x800000)</div><div class='del'>-#define IWL49_RTC_DATA_UPPER_BOUND		(0x80A000)</div><div class='del'>-</div><div class='del'>-#define IWL49_RTC_INST_SIZE  (IWL49_RTC_INST_UPPER_BOUND - \</div><div class='del'>-				IWL49_RTC_INST_LOWER_BOUND)</div><div class='del'>-#define IWL49_RTC_DATA_SIZE  (IWL49_RTC_DATA_UPPER_BOUND - \</div><div class='del'>-				IWL49_RTC_DATA_LOWER_BOUND)</div><div class='del'>-</div><div class='del'>-#define IWL49_MAX_INST_SIZE IWL49_RTC_INST_SIZE</div><div class='del'>-#define IWL49_MAX_DATA_SIZE IWL49_RTC_DATA_SIZE</div><div class='del'>-</div><div class='del'>-/* Size of uCode instruction memory in bootstrap state machine */</div><div class='del'>-#define IWL49_MAX_BSM_SIZE BSM_SRAM_SIZE</div><div class='del'>-</div><div class='del'>-static inline int iwl4965_hw_valid_rtc_data_addr(u32 addr)</div><div class='del'>-{</div><div class='del'>-	return (addr &gt;= IWL49_RTC_DATA_LOWER_BOUND) &amp;&amp;</div><div class='del'>-	       (addr &lt; IWL49_RTC_DATA_UPPER_BOUND);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/********************* START TEMPERATURE *************************************/</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * 4965 temperature calculation.</div><div class='del'>- *</div><div class='del'>- * The driver must calculate the device temperature before calculating</div><div class='del'>- * a txpower setting (amplifier gain is temperature dependent).  The</div><div class='del'>- * calculation uses 4 measurements, 3 of which (R1, R2, R3) are calibration</div><div class='del'>- * values used for the life of the driver, and one of which (R4) is the</div><div class='del'>- * real-time temperature indicator.</div><div class='del'>- *</div><div class='del'>- * uCode provides all 4 values to the driver via the "initialize alive"</div><div class='del'>- * notification (see struct iwl4965_init_alive_resp).  After the runtime uCode</div><div class='del'>- * image loads, uCode updates the R4 value via statistics notifications</div><div class='del'>- * (see STATISTICS_NOTIFICATION), which occur after each received beacon</div><div class='del'>- * when associated, or can be requested via REPLY_STATISTICS_CMD.</div><div class='del'>- *</div><div class='del'>- * NOTE:  uCode provides the R4 value as a 23-bit signed value.  Driver</div><div class='del'>- *        must sign-extend to 32 bits before applying formula below.</div><div class='del'>- *</div><div class='del'>- * Formula:</div><div class='del'>- *</div><div class='del'>- * degrees Kelvin = ((97 * 259 * (R4 - R2) / (R3 - R1)) / 100) + 8</div><div class='del'>- *</div><div class='del'>- * NOTE:  The basic formula is 259 * (R4-R2) / (R3-R1).  The 97/100 is</div><div class='del'>- * an additional correction, which should be centered around 0 degrees</div><div class='del'>- * Celsius (273 degrees Kelvin).  The 8 (3 percent of 273) compensates for</div><div class='del'>- * centering the 97/100 correction around 0 degrees K.</div><div class='del'>- *</div><div class='del'>- * Add 273 to Kelvin value to find degrees Celsius, for comparing current</div><div class='del'>- * temperature with factory-measured temperatures when calculating txpower</div><div class='del'>- * settings.</div><div class='del'>- */</div><div class='del'>-#define TEMPERATURE_CALIB_KELVIN_OFFSET 8</div><div class='del'>-#define TEMPERATURE_CALIB_A_VAL 259</div><div class='del'>-</div><div class='del'>-/* Limit range of calculated temperature to be between these Kelvin values */</div><div class='del'>-#define IWL_TX_POWER_TEMPERATURE_MIN  (263)</div><div class='del'>-#define IWL_TX_POWER_TEMPERATURE_MAX  (410)</div><div class='del'>-</div><div class='del'>-#define IWL_TX_POWER_TEMPERATURE_OUT_OF_RANGE(t) \</div><div class='del'>-	(((t) &lt; IWL_TX_POWER_TEMPERATURE_MIN) || \</div><div class='del'>-	 ((t) &gt; IWL_TX_POWER_TEMPERATURE_MAX))</div><div class='del'>-</div><div class='del'>-/********************* END TEMPERATURE ***************************************/</div><div class='del'>-</div><div class='del'>-/********************* START TXPOWER *****************************************/</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * 4965 txpower calculations rely on information from three sources:</div><div class='del'>- *</div><div class='del'>- *     1) EEPROM</div><div class='del'>- *     2) "initialize" alive notification</div><div class='del'>- *     3) statistics notifications</div><div class='del'>- *</div><div class='del'>- * EEPROM data consists of:</div><div class='del'>- *</div><div class='del'>- * 1)  Regulatory information (max txpower and channel usage flags) is provided</div><div class='del'>- *     separately for each channel that can possibly supported by 4965.</div><div class='del'>- *     40 MHz wide (.11n HT40) channels are listed separately from 20 MHz</div><div class='del'>- *     (legacy) channels.</div><div class='del'>- *</div><div class='del'>- *     See struct iwl4965_eeprom_channel for format, and struct iwl4965_eeprom</div><div class='del'>- *     for locations in EEPROM.</div><div class='del'>- *</div><div class='del'>- * 2)  Factory txpower calibration information is provided separately for</div><div class='del'>- *     sub-bands of contiguous channels.  2.4GHz has just one sub-band,</div><div class='del'>- *     but 5 GHz has several sub-bands.</div><div class='del'>- *</div><div class='del'>- *     In addition, per-band (2.4 and 5 Ghz) saturation txpowers are provided.</div><div class='del'>- *</div><div class='del'>- *     See struct iwl4965_eeprom_calib_info (and the tree of structures</div><div class='del'>- *     contained within it) for format, and struct iwl4965_eeprom for</div><div class='del'>- *     locations in EEPROM.</div><div class='del'>- *</div><div class='del'>- * "Initialization alive" notification (see struct iwl4965_init_alive_resp)</div><div class='del'>- * consists of:</div><div class='del'>- *</div><div class='del'>- * 1)  Temperature calculation parameters.</div><div class='del'>- *</div><div class='del'>- * 2)  Power supply voltage measurement.</div><div class='del'>- *</div><div class='del'>- * 3)  Tx gain compensation to balance 2 transmitters for MIMO use.</div><div class='del'>- *</div><div class='del'>- * Statistics notifications deliver:</div><div class='del'>- *</div><div class='del'>- * 1)  Current values for temperature param R4.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * To calculate a txpower setting for a given desired target txpower, channel,</div><div class='del'>- * modulation bit rate, and transmitter chain (4965 has 2 transmitters to</div><div class='del'>- * support MIMO and transmit diversity), driver must do the following:</div><div class='del'>- *</div><div class='del'>- * 1)  Compare desired txpower vs. (EEPROM) regulatory limit for this channel.</div><div class='del'>- *     Do not exceed regulatory limit; reduce target txpower if necessary.</div><div class='del'>- *</div><div class='del'>- *     If setting up txpowers for MIMO rates (rate indexes 8-15, 24-31),</div><div class='del'>- *     2 transmitters will be used simultaneously; driver must reduce the</div><div class='del'>- *     regulatory limit by 3 dB (half-power) for each transmitter, so the</div><div class='del'>- *     combined total output of the 2 transmitters is within regulatory limits.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * 2)  Compare target txpower vs. (EEPROM) saturation txpower *reduced by</div><div class='del'>- *     backoff for this bit rate*.  Do not exceed (saturation - backoff[rate]);</div><div class='del'>- *     reduce target txpower if necessary.</div><div class='del'>- *</div><div class='del'>- *     Backoff values below are in 1/2 dB units (equivalent to steps in</div><div class='del'>- *     txpower gain tables):</div><div class='del'>- *</div><div class='del'>- *     OFDM 6 - 36 MBit:  10 steps (5 dB)</div><div class='del'>- *     OFDM 48 MBit:      15 steps (7.5 dB)</div><div class='del'>- *     OFDM 54 MBit:      17 steps (8.5 dB)</div><div class='del'>- *     OFDM 60 MBit:      20 steps (10 dB)</div><div class='del'>- *     CCK all rates:     10 steps (5 dB)</div><div class='del'>- *</div><div class='del'>- *     Backoff values apply to saturation txpower on a per-transmitter basis;</div><div class='del'>- *     when using MIMO (2 transmitters), each transmitter uses the same</div><div class='del'>- *     saturation level provided in EEPROM, and the same backoff values;</div><div class='del'>- *     no reduction (such as with regulatory txpower limits) is required.</div><div class='del'>- *</div><div class='del'>- *     Saturation and Backoff values apply equally to 20 Mhz (legacy) channel</div><div class='del'>- *     widths and 40 Mhz (.11n HT40) channel widths; there is no separate</div><div class='del'>- *     factory measurement for ht40 channels.</div><div class='del'>- *</div><div class='del'>- *     The result of this step is the final target txpower.  The rest of</div><div class='del'>- *     the steps figure out the proper settings for the device to achieve</div><div class='del'>- *     that target txpower.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * 3)  Determine (EEPROM) calibration sub band for the target channel, by</div><div class='del'>- *     comparing against first and last channels in each sub band</div><div class='del'>- *     (see struct iwl4965_eeprom_calib_subband_info).</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * 4)  Linearly interpolate (EEPROM) factory calibration measurement sets,</div><div class='del'>- *     referencing the 2 factory-measured (sample) channels within the sub band.</div><div class='del'>- *</div><div class='del'>- *     Interpolation is based on difference between target channel's frequency</div><div class='del'>- *     and the sample channels' frequencies.  Since channel numbers are based</div><div class='del'>- *     on frequency (5 MHz between each channel number), this is equivalent</div><div class='del'>- *     to interpolating based on channel number differences.</div><div class='del'>- *</div><div class='del'>- *     Note that the sample channels may or may not be the channels at the</div><div class='del'>- *     edges of the sub band.  The target channel may be "outside" of the</div><div class='del'>- *     span of the sampled channels.</div><div class='del'>- *</div><div class='del'>- *     Driver may choose the pair (for 2 Tx chains) of measurements (see</div><div class='del'>- *     struct iwl4965_eeprom_calib_ch_info) for which the actual measured</div><div class='del'>- *     txpower comes closest to the desired txpower.  Usually, though,</div><div class='del'>- *     the middle set of measurements is closest to the regulatory limits,</div><div class='del'>- *     and is therefore a good choice for all txpower calculations (this</div><div class='del'>- *     assumes that high accuracy is needed for maximizing legal txpower,</div><div class='del'>- *     while lower txpower configurations do not need as much accuracy).</div><div class='del'>- *</div><div class='del'>- *     Driver should interpolate both members of the chosen measurement pair,</div><div class='del'>- *     i.e. for both Tx chains (radio transmitters), unless the driver knows</div><div class='del'>- *     that only one of the chains will be used (e.g. only one tx antenna</div><div class='del'>- *     connected, but this should be unusual).  The rate scaling algorithm</div><div class='del'>- *     switches antennas to find best performance, so both Tx chains will</div><div class='del'>- *     be used (although only one at a time) even for non-MIMO transmissions.</div><div class='del'>- *</div><div class='del'>- *     Driver should interpolate factory values for temperature, gain table</div><div class='del'>- *     index, and actual power.  The power amplifier detector values are</div><div class='del'>- *     not used by the driver.</div><div class='del'>- *</div><div class='del'>- *     Sanity check:  If the target channel happens to be one of the sample</div><div class='del'>- *     channels, the results should agree with the sample channel's</div><div class='del'>- *     measurements!</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * 5)  Find difference between desired txpower and (interpolated)</div><div class='del'>- *     factory-measured txpower.  Using (interpolated) factory gain table index</div><div class='del'>- *     (shown elsewhere) as a starting point, adjust this index lower to</div><div class='del'>- *     increase txpower, or higher to decrease txpower, until the target</div><div class='del'>- *     txpower is reached.  Each step in the gain table is 1/2 dB.</div><div class='del'>- *</div><div class='del'>- *     For example, if factory measured txpower is 16 dBm, and target txpower</div><div class='del'>- *     is 13 dBm, add 6 steps to the factory gain index to reduce txpower</div><div class='del'>- *     by 3 dB.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * 6)  Find difference between current device temperature and (interpolated)</div><div class='del'>- *     factory-measured temperature for sub-band.  Factory values are in</div><div class='del'>- *     degrees Celsius.  To calculate current temperature, see comments for</div><div class='del'>- *     "4965 temperature calculation".</div><div class='del'>- *</div><div class='del'>- *     If current temperature is higher than factory temperature, driver must</div><div class='del'>- *     increase gain (lower gain table index), and vice verse.</div><div class='del'>- *</div><div class='del'>- *     Temperature affects gain differently for different channels:</div><div class='del'>- *</div><div class='del'>- *     2.4 GHz all channels:  3.5 degrees per half-dB step</div><div class='del'>- *     5 GHz channels 34-43:  4.5 degrees per half-dB step</div><div class='del'>- *     5 GHz channels &gt;= 44:  4.0 degrees per half-dB step</div><div class='del'>- *</div><div class='del'>- *     NOTE:  Temperature can increase rapidly when transmitting, especially</div><div class='del'>- *            with heavy traffic at high txpowers.  Driver should update</div><div class='del'>- *            temperature calculations often under these conditions to</div><div class='del'>- *            maintain strong txpower in the face of rising temperature.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * 7)  Find difference between current power supply voltage indicator</div><div class='del'>- *     (from "initialize alive") and factory-measured power supply voltage</div><div class='del'>- *     indicator (EEPROM).</div><div class='del'>- *</div><div class='del'>- *     If the current voltage is higher (indicator is lower) than factory</div><div class='del'>- *     voltage, gain should be reduced (gain table index increased) by:</div><div class='del'>- *</div><div class='del'>- *     (eeprom - current) / 7</div><div class='del'>- *</div><div class='del'>- *     If the current voltage is lower (indicator is higher) than factory</div><div class='del'>- *     voltage, gain should be increased (gain table index decreased) by:</div><div class='del'>- *</div><div class='del'>- *     2 * (current - eeprom) / 7</div><div class='del'>- *</div><div class='del'>- *     If number of index steps in either direction turns out to be &gt; 2,</div><div class='del'>- *     something is wrong ... just use 0.</div><div class='del'>- *</div><div class='del'>- *     NOTE:  Voltage compensation is independent of band/channel.</div><div class='del'>- *</div><div class='del'>- *     NOTE:  "Initialize" uCode measures current voltage, which is assumed</div><div class='del'>- *            to be constant after this initial measurement.  Voltage</div><div class='del'>- *            compensation for txpower (number of steps in gain table)</div><div class='del'>- *            may be calculated once and used until the next uCode bootload.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * 8)  If setting up txpowers for MIMO rates (rate indexes 8-15, 24-31),</div><div class='del'>- *     adjust txpower for each transmitter chain, so txpower is balanced</div><div class='del'>- *     between the two chains.  There are 5 pairs of tx_atten[group][chain]</div><div class='del'>- *     values in "initialize alive", one pair for each of 5 channel ranges:</div><div class='del'>- *</div><div class='del'>- *     Group 0:  5 GHz channel 34-43</div><div class='del'>- *     Group 1:  5 GHz channel 44-70</div><div class='del'>- *     Group 2:  5 GHz channel 71-124</div><div class='del'>- *     Group 3:  5 GHz channel 125-200</div><div class='del'>- *     Group 4:  2.4 GHz all channels</div><div class='del'>- *</div><div class='del'>- *     Add the tx_atten[group][chain] value to the index for the target chain.</div><div class='del'>- *     The values are signed, but are in pairs of 0 and a non-negative number,</div><div class='del'>- *     so as to reduce gain (if necessary) of the "hotter" channel.  This</div><div class='del'>- *     avoids any need to double-check for regulatory compliance after</div><div class='del'>- *     this step.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * 9)  If setting up for a CCK rate, lower the gain by adding a CCK compensation</div><div class='del'>- *     value to the index:</div><div class='del'>- *</div><div class='del'>- *     Hardware rev B:  9 steps (4.5 dB)</div><div class='del'>- *     Hardware rev C:  5 steps (2.5 dB)</div><div class='del'>- *</div><div class='del'>- *     Hardware rev for 4965 can be determined by reading CSR_HW_REV_WA_REG,</div><div class='del'>- *     bits [3:2], 1 = B, 2 = C.</div><div class='del'>- *</div><div class='del'>- *     NOTE:  This compensation is in addition to any saturation backoff that</div><div class='del'>- *            might have been applied in an earlier step.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * 10) Select the gain table, based on band (2.4 vs 5 GHz).</div><div class='del'>- *</div><div class='del'>- *     Limit the adjusted index to stay within the table!</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * 11) Read gain table entries for DSP and radio gain, place into appropriate</div><div class='del'>- *     location(s) in command (struct iwl4965_txpowertable_cmd).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * When MIMO is used (2 transmitters operating simultaneously), driver should</div><div class='del'>- * limit each transmitter to deliver a max of 3 dB below the regulatory limit</div><div class='del'>- * for the device.  That is, use half power for each transmitter, so total</div><div class='del'>- * txpower is within regulatory limits.</div><div class='del'>- *</div><div class='del'>- * The value "6" represents number of steps in gain table to reduce power 3 dB.</div><div class='del'>- * Each step is 1/2 dB.</div><div class='del'>- */</div><div class='del'>-#define IWL_TX_POWER_MIMO_REGULATORY_COMPENSATION (6)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * CCK gain compensation.</div><div class='del'>- *</div><div class='del'>- * When calculating txpowers for CCK, after making sure that the target power</div><div class='del'>- * is within regulatory and saturation limits, driver must additionally</div><div class='del'>- * back off gain by adding these values to the gain table index.</div><div class='del'>- *</div><div class='del'>- * Hardware rev for 4965 can be determined by reading CSR_HW_REV_WA_REG,</div><div class='del'>- * bits [3:2], 1 = B, 2 = C.</div><div class='del'>- */</div><div class='del'>-#define IWL_TX_POWER_CCK_COMPENSATION_B_STEP (9)</div><div class='del'>-#define IWL_TX_POWER_CCK_COMPENSATION_C_STEP (5)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 4965 power supply voltage compensation for txpower</div><div class='del'>- */</div><div class='del'>-#define TX_POWER_IWL_VOLTAGE_CODES_PER_03V   (7)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Gain tables.</div><div class='del'>- *</div><div class='del'>- * The following tables contain pair of values for setting txpower, i.e.</div><div class='del'>- * gain settings for the output of the device's digital signal processor (DSP),</div><div class='del'>- * and for the analog gain structure of the transmitter.</div><div class='del'>- *</div><div class='del'>- * Each entry in the gain tables represents a step of 1/2 dB.  Note that these</div><div class='del'>- * are *relative* steps, not indications of absolute output power.  Output</div><div class='del'>- * power varies with temperature, voltage, and channel frequency, and also</div><div class='del'>- * requires consideration of average power (to satisfy regulatory constraints),</div><div class='del'>- * and peak power (to avoid distortion of the output signal).</div><div class='del'>- *</div><div class='del'>- * Each entry contains two values:</div><div class='del'>- * 1)  DSP gain (or sometimes called DSP attenuation).  This is a fine-grained</div><div class='del'>- *     linear value that multiplies the output of the digital signal processor,</div><div class='del'>- *     before being sent to the analog radio.</div><div class='del'>- * 2)  Radio gain.  This sets the analog gain of the radio Tx path.</div><div class='del'>- *     It is a coarser setting, and behaves in a logarithmic (dB) fashion.</div><div class='del'>- *</div><div class='del'>- * EEPROM contains factory calibration data for txpower.  This maps actual</div><div class='del'>- * measured txpower levels to gain settings in the "well known" tables</div><div class='del'>- * below ("well-known" means here that both factory calibration *and* the</div><div class='del'>- * driver work with the same table).</div><div class='del'>- *</div><div class='del'>- * There are separate tables for 2.4 GHz and 5 GHz bands.  The 5 GHz table</div><div class='del'>- * has an extension (into negative indexes), in case the driver needs to</div><div class='del'>- * boost power setting for high device temperatures (higher than would be</div><div class='del'>- * present during factory calibration).  A 5 Ghz EEPROM index of "40"</div><div class='del'>- * corresponds to the 49th entry in the table used by the driver.</div><div class='del'>- */</div><div class='del'>-#define MIN_TX_GAIN_INDEX		(0)  /* highest gain, lowest idx, 2.4 */</div><div class='del'>-#define MIN_TX_GAIN_INDEX_52GHZ_EXT	(-9) /* highest gain, lowest idx, 5 */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * 2.4 GHz gain table</div><div class='del'>- *</div><div class='del'>- * Index    Dsp gain   Radio gain</div><div class='del'>- *   0        110         0x3f      (highest gain)</div><div class='del'>- *   1        104         0x3f</div><div class='del'>- *   2         98         0x3f</div><div class='del'>- *   3        110         0x3e</div><div class='del'>- *   4        104         0x3e</div><div class='del'>- *   5         98         0x3e</div><div class='del'>- *   6        110         0x3d</div><div class='del'>- *   7        104         0x3d</div><div class='del'>- *   8         98         0x3d</div><div class='del'>- *   9        110         0x3c</div><div class='del'>- *  10        104         0x3c</div><div class='del'>- *  11         98         0x3c</div><div class='del'>- *  12        110         0x3b</div><div class='del'>- *  13        104         0x3b</div><div class='del'>- *  14         98         0x3b</div><div class='del'>- *  15        110         0x3a</div><div class='del'>- *  16        104         0x3a</div><div class='del'>- *  17         98         0x3a</div><div class='del'>- *  18        110         0x39</div><div class='del'>- *  19        104         0x39</div><div class='del'>- *  20         98         0x39</div><div class='del'>- *  21        110         0x38</div><div class='del'>- *  22        104         0x38</div><div class='del'>- *  23         98         0x38</div><div class='del'>- *  24        110         0x37</div><div class='del'>- *  25        104         0x37</div><div class='del'>- *  26         98         0x37</div><div class='del'>- *  27        110         0x36</div><div class='del'>- *  28        104         0x36</div><div class='del'>- *  29         98         0x36</div><div class='del'>- *  30        110         0x35</div><div class='del'>- *  31        104         0x35</div><div class='del'>- *  32         98         0x35</div><div class='del'>- *  33        110         0x34</div><div class='del'>- *  34        104         0x34</div><div class='del'>- *  35         98         0x34</div><div class='del'>- *  36        110         0x33</div><div class='del'>- *  37        104         0x33</div><div class='del'>- *  38         98         0x33</div><div class='del'>- *  39        110         0x32</div><div class='del'>- *  40        104         0x32</div><div class='del'>- *  41         98         0x32</div><div class='del'>- *  42        110         0x31</div><div class='del'>- *  43        104         0x31</div><div class='del'>- *  44         98         0x31</div><div class='del'>- *  45        110         0x30</div><div class='del'>- *  46        104         0x30</div><div class='del'>- *  47         98         0x30</div><div class='del'>- *  48        110          0x6</div><div class='del'>- *  49        104          0x6</div><div class='del'>- *  50         98          0x6</div><div class='del'>- *  51        110          0x5</div><div class='del'>- *  52        104          0x5</div><div class='del'>- *  53         98          0x5</div><div class='del'>- *  54        110          0x4</div><div class='del'>- *  55        104          0x4</div><div class='del'>- *  56         98          0x4</div><div class='del'>- *  57        110          0x3</div><div class='del'>- *  58        104          0x3</div><div class='del'>- *  59         98          0x3</div><div class='del'>- *  60        110          0x2</div><div class='del'>- *  61        104          0x2</div><div class='del'>- *  62         98          0x2</div><div class='del'>- *  63        110          0x1</div><div class='del'>- *  64        104          0x1</div><div class='del'>- *  65         98          0x1</div><div class='del'>- *  66        110          0x0</div><div class='del'>- *  67        104          0x0</div><div class='del'>- *  68         98          0x0</div><div class='del'>- *  69         97            0</div><div class='del'>- *  70         96            0</div><div class='del'>- *  71         95            0</div><div class='del'>- *  72         94            0</div><div class='del'>- *  73         93            0</div><div class='del'>- *  74         92            0</div><div class='del'>- *  75         91            0</div><div class='del'>- *  76         90            0</div><div class='del'>- *  77         89            0</div><div class='del'>- *  78         88            0</div><div class='del'>- *  79         87            0</div><div class='del'>- *  80         86            0</div><div class='del'>- *  81         85            0</div><div class='del'>- *  82         84            0</div><div class='del'>- *  83         83            0</div><div class='del'>- *  84         82            0</div><div class='del'>- *  85         81            0</div><div class='del'>- *  86         80            0</div><div class='del'>- *  87         79            0</div><div class='del'>- *  88         78            0</div><div class='del'>- *  89         77            0</div><div class='del'>- *  90         76            0</div><div class='del'>- *  91         75            0</div><div class='del'>- *  92         74            0</div><div class='del'>- *  93         73            0</div><div class='del'>- *  94         72            0</div><div class='del'>- *  95         71            0</div><div class='del'>- *  96         70            0</div><div class='del'>- *  97         69            0</div><div class='del'>- *  98         68            0</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * 5 GHz gain table</div><div class='del'>- *</div><div class='del'>- * Index    Dsp gain   Radio gain</div><div class='del'>- *  -9 	      123         0x3F      (highest gain)</div><div class='del'>- *  -8 	      117         0x3F</div><div class='del'>- *  -7        110         0x3F</div><div class='del'>- *  -6        104         0x3F</div><div class='del'>- *  -5         98         0x3F</div><div class='del'>- *  -4        110         0x3E</div><div class='del'>- *  -3        104         0x3E</div><div class='del'>- *  -2         98         0x3E</div><div class='del'>- *  -1        110         0x3D</div><div class='del'>- *   0        104         0x3D</div><div class='del'>- *   1         98         0x3D</div><div class='del'>- *   2        110         0x3C</div><div class='del'>- *   3        104         0x3C</div><div class='del'>- *   4         98         0x3C</div><div class='del'>- *   5        110         0x3B</div><div class='del'>- *   6        104         0x3B</div><div class='del'>- *   7         98         0x3B</div><div class='del'>- *   8        110         0x3A</div><div class='del'>- *   9        104         0x3A</div><div class='del'>- *  10         98         0x3A</div><div class='del'>- *  11        110         0x39</div><div class='del'>- *  12        104         0x39</div><div class='del'>- *  13         98         0x39</div><div class='del'>- *  14        110         0x38</div><div class='del'>- *  15        104         0x38</div><div class='del'>- *  16         98         0x38</div><div class='del'>- *  17        110         0x37</div><div class='del'>- *  18        104         0x37</div><div class='del'>- *  19         98         0x37</div><div class='del'>- *  20        110         0x36</div><div class='del'>- *  21        104         0x36</div><div class='del'>- *  22         98         0x36</div><div class='del'>- *  23        110         0x35</div><div class='del'>- *  24        104         0x35</div><div class='del'>- *  25         98         0x35</div><div class='del'>- *  26        110         0x34</div><div class='del'>- *  27        104         0x34</div><div class='del'>- *  28         98         0x34</div><div class='del'>- *  29        110         0x33</div><div class='del'>- *  30        104         0x33</div><div class='del'>- *  31         98         0x33</div><div class='del'>- *  32        110         0x32</div><div class='del'>- *  33        104         0x32</div><div class='del'>- *  34         98         0x32</div><div class='del'>- *  35        110         0x31</div><div class='del'>- *  36        104         0x31</div><div class='del'>- *  37         98         0x31</div><div class='del'>- *  38        110         0x30</div><div class='del'>- *  39        104         0x30</div><div class='del'>- *  40         98         0x30</div><div class='del'>- *  41        110         0x25</div><div class='del'>- *  42        104         0x25</div><div class='del'>- *  43         98         0x25</div><div class='del'>- *  44        110         0x24</div><div class='del'>- *  45        104         0x24</div><div class='del'>- *  46         98         0x24</div><div class='del'>- *  47        110         0x23</div><div class='del'>- *  48        104         0x23</div><div class='del'>- *  49         98         0x23</div><div class='del'>- *  50        110         0x22</div><div class='del'>- *  51        104         0x18</div><div class='del'>- *  52         98         0x18</div><div class='del'>- *  53        110         0x17</div><div class='del'>- *  54        104         0x17</div><div class='del'>- *  55         98         0x17</div><div class='del'>- *  56        110         0x16</div><div class='del'>- *  57        104         0x16</div><div class='del'>- *  58         98         0x16</div><div class='del'>- *  59        110         0x15</div><div class='del'>- *  60        104         0x15</div><div class='del'>- *  61         98         0x15</div><div class='del'>- *  62        110         0x14</div><div class='del'>- *  63        104         0x14</div><div class='del'>- *  64         98         0x14</div><div class='del'>- *  65        110         0x13</div><div class='del'>- *  66        104         0x13</div><div class='del'>- *  67         98         0x13</div><div class='del'>- *  68        110         0x12</div><div class='del'>- *  69        104         0x08</div><div class='del'>- *  70         98         0x08</div><div class='del'>- *  71        110         0x07</div><div class='del'>- *  72        104         0x07</div><div class='del'>- *  73         98         0x07</div><div class='del'>- *  74        110         0x06</div><div class='del'>- *  75        104         0x06</div><div class='del'>- *  76         98         0x06</div><div class='del'>- *  77        110         0x05</div><div class='del'>- *  78        104         0x05</div><div class='del'>- *  79         98         0x05</div><div class='del'>- *  80        110         0x04</div><div class='del'>- *  81        104         0x04</div><div class='del'>- *  82         98         0x04</div><div class='del'>- *  83        110         0x03</div><div class='del'>- *  84        104         0x03</div><div class='del'>- *  85         98         0x03</div><div class='del'>- *  86        110         0x02</div><div class='del'>- *  87        104         0x02</div><div class='del'>- *  88         98         0x02</div><div class='del'>- *  89        110         0x01</div><div class='del'>- *  90        104         0x01</div><div class='del'>- *  91         98         0x01</div><div class='del'>- *  92        110         0x00</div><div class='del'>- *  93        104         0x00</div><div class='del'>- *  94         98         0x00</div><div class='del'>- *  95         93         0x00</div><div class='del'>- *  96         88         0x00</div><div class='del'>- *  97         83         0x00</div><div class='del'>- *  98         78         0x00</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Sanity checks and default values for EEPROM regulatory levels.</div><div class='del'>- * If EEPROM values fall outside MIN/MAX range, use default values.</div><div class='del'>- *</div><div class='del'>- * Regulatory limits refer to the maximum average txpower allowed by</div><div class='del'>- * regulatory agencies in the geographies in which the device is meant</div><div class='del'>- * to be operated.  These limits are SKU-specific (i.e. geography-specific),</div><div class='del'>- * and channel-specific; each channel has an individual regulatory limit</div><div class='del'>- * listed in the EEPROM.</div><div class='del'>- *</div><div class='del'>- * Units are in half-dBm (i.e. "34" means 17 dBm).</div><div class='del'>- */</div><div class='del'>-#define IWL_TX_POWER_DEFAULT_REGULATORY_24   (34)</div><div class='del'>-#define IWL_TX_POWER_DEFAULT_REGULATORY_52   (34)</div><div class='del'>-#define IWL_TX_POWER_REGULATORY_MIN          (0)</div><div class='del'>-#define IWL_TX_POWER_REGULATORY_MAX          (34)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Sanity checks and default values for EEPROM saturation levels.</div><div class='del'>- * If EEPROM values fall outside MIN/MAX range, use default values.</div><div class='del'>- *</div><div class='del'>- * Saturation is the highest level that the output power amplifier can produce</div><div class='del'>- * without significant clipping distortion.  This is a "peak" power level.</div><div class='del'>- * Different types of modulation (i.e. various "rates", and OFDM vs. CCK)</div><div class='del'>- * require differing amounts of backoff, relative to their average power output,</div><div class='del'>- * in order to avoid clipping distortion.</div><div class='del'>- *</div><div class='del'>- * Driver must make sure that it is violating neither the saturation limit,</div><div class='del'>- * nor the regulatory limit, when calculating Tx power settings for various</div><div class='del'>- * rates.</div><div class='del'>- *</div><div class='del'>- * Units are in half-dBm (i.e. "38" means 19 dBm).</div><div class='del'>- */</div><div class='del'>-#define IWL_TX_POWER_DEFAULT_SATURATION_24   (38)</div><div class='del'>-#define IWL_TX_POWER_DEFAULT_SATURATION_52   (38)</div><div class='del'>-#define IWL_TX_POWER_SATURATION_MIN          (20)</div><div class='del'>-#define IWL_TX_POWER_SATURATION_MAX          (50)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Channel groups used for Tx Attenuation calibration (MIMO tx channel balance)</div><div class='del'>- * and thermal Txpower calibration.</div><div class='del'>- *</div><div class='del'>- * When calculating txpower, driver must compensate for current device</div><div class='del'>- * temperature; higher temperature requires higher gain.  Driver must calculate</div><div class='del'>- * current temperature (see "4965 temperature calculation"), then compare vs.</div><div class='del'>- * factory calibration temperature in EEPROM; if current temperature is higher</div><div class='del'>- * than factory temperature, driver must *increase* gain by proportions shown</div><div class='del'>- * in table below.  If current temperature is lower than factory, driver must</div><div class='del'>- * *decrease* gain.</div><div class='del'>- *</div><div class='del'>- * Different frequency ranges require different compensation, as shown below.</div><div class='del'>- */</div><div class='del'>-/* Group 0, 5.2 GHz ch 34-43:  4.5 degrees per 1/2 dB. */</div><div class='del'>-#define CALIB_IWL_TX_ATTEN_GR1_FCH 34</div><div class='del'>-#define CALIB_IWL_TX_ATTEN_GR1_LCH 43</div><div class='del'>-</div><div class='del'>-/* Group 1, 5.3 GHz ch 44-70:  4.0 degrees per 1/2 dB. */</div><div class='del'>-#define CALIB_IWL_TX_ATTEN_GR2_FCH 44</div><div class='del'>-#define CALIB_IWL_TX_ATTEN_GR2_LCH 70</div><div class='del'>-</div><div class='del'>-/* Group 2, 5.5 GHz ch 71-124:  4.0 degrees per 1/2 dB. */</div><div class='del'>-#define CALIB_IWL_TX_ATTEN_GR3_FCH 71</div><div class='del'>-#define CALIB_IWL_TX_ATTEN_GR3_LCH 124</div><div class='del'>-</div><div class='del'>-/* Group 3, 5.7 GHz ch 125-200:  4.0 degrees per 1/2 dB. */</div><div class='del'>-#define CALIB_IWL_TX_ATTEN_GR4_FCH 125</div><div class='del'>-#define CALIB_IWL_TX_ATTEN_GR4_LCH 200</div><div class='del'>-</div><div class='del'>-/* Group 4, 2.4 GHz all channels:  3.5 degrees per 1/2 dB. */</div><div class='del'>-#define CALIB_IWL_TX_ATTEN_GR5_FCH 1</div><div class='del'>-#define CALIB_IWL_TX_ATTEN_GR5_LCH 20</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CALIB_CH_GROUP_1 = 0,</div><div class='del'>-	CALIB_CH_GROUP_2 = 1,</div><div class='del'>-	CALIB_CH_GROUP_3 = 2,</div><div class='del'>-	CALIB_CH_GROUP_4 = 3,</div><div class='del'>-	CALIB_CH_GROUP_5 = 4,</div><div class='del'>-	CALIB_CH_GROUP_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/********************* END TXPOWER *****************************************/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Tx/Rx Queues</div><div class='del'>- *</div><div class='del'>- * Most communication between driver and 4965 is via queues of data buffers.</div><div class='del'>- * For example, all commands that the driver issues to device's embedded</div><div class='del'>- * controller (uCode) are via the command queue (one of the Tx queues).  All</div><div class='del'>- * uCode command responses/replies/notifications, including Rx frames, are</div><div class='del'>- * conveyed from uCode to driver via the Rx queue.</div><div class='del'>- *</div><div class='del'>- * Most support for these queues, including handshake support, resides in</div><div class='del'>- * structures in host DRAM, shared between the driver and the device.  When</div><div class='del'>- * allocating this memory, the driver must make sure that data written by</div><div class='del'>- * the host CPU updates DRAM immediately (and does not get "stuck" in CPU's</div><div class='del'>- * cache memory), so DRAM and cache are consistent, and the device can</div><div class='del'>- * immediately see changes made by the driver.</div><div class='del'>- *</div><div class='del'>- * 4965 supports up to 16 DRAM-based Tx queues, and services these queues via</div><div class='del'>- * up to 7 DMA channels (FIFOs).  Each Tx queue is supported by a circular array</div><div class='del'>- * in DRAM containing 256 Transmit Frame Descriptors (TFDs).</div><div class='del'>- */</div><div class='del'>-#define IWL49_NUM_FIFOS 	7</div><div class='del'>-#define IWL49_CMD_FIFO_NUM	4</div><div class='del'>-#define IWL49_NUM_QUEUES	16</div><div class='del'>-#define IWL49_NUM_AMPDU_QUEUES	8</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl4965_schedq_bc_tbl</div><div class='del'>- *</div><div class='del'>- * Byte Count table</div><div class='del'>- *</div><div class='del'>- * Each Tx queue uses a byte-count table containing 320 entries:</div><div class='del'>- * one 16-bit entry for each of 256 TFDs, plus an additional 64 entries that</div><div class='del'>- * duplicate the first 64 entries (to avoid wrap-around within a Tx window;</div><div class='del'>- * max Tx window is 64 TFDs).</div><div class='del'>- *</div><div class='del'>- * When driver sets up a new TFD, it must also enter the total byte count</div><div class='del'>- * of the frame to be transmitted into the corresponding entry in the byte</div><div class='del'>- * count table for the chosen Tx queue.  If the TFD index is 0-63, the driver</div><div class='del'>- * must duplicate the byte count entry in corresponding index 256-319.</div><div class='del'>- *</div><div class='del'>- * padding puts each byte count table on a 1024-byte boundary;</div><div class='del'>- * 4965 assumes tables are separated by 1024 bytes.</div><div class='del'>- */</div><div class='del'>-struct iwl4965_scd_bc_tbl {</div><div class='del'>-	__le16 tfd_offset[TFD_QUEUE_BC_SIZE];</div><div class='del'>-	u8 pad[1024 - (TFD_QUEUE_BC_SIZE) * sizeof(__le16)];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define IWL4965_RTC_INST_LOWER_BOUND		(0x000000)</div><div class='del'>-</div><div class='del'>-/* RSSI to dBm */</div><div class='del'>-#define IWL4965_RSSI_OFFSET	44</div><div class='del'>-</div><div class='del'>-/* PCI registers */</div><div class='del'>-#define PCI_CFG_RETRY_TIMEOUT	0x041</div><div class='del'>-</div><div class='del'>-/* PCI register values */</div><div class='del'>-#define PCI_CFG_LINK_CTRL_VAL_L0S_EN	0x01</div><div class='del'>-#define PCI_CFG_LINK_CTRL_VAL_L1_EN	0x02</div><div class='del'>-</div><div class='del'>-#define IWL4965_DEFAULT_TX_RETRY  15</div><div class='del'>-</div><div class='del'>-/* EEPROM */</div><div class='del'>-#define IWL4965_FIRST_AMPDU_QUEUE	10</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* !__iwl_4965_hw_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-led.c b/drivers/net/wireless/iwlegacy/iwl-4965-led.c<br/>deleted file mode 100644<br/>index 6862fdcaee62..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-4965-led.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-led.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-commands.h"</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-#include "iwl-4965-led.h"</div><div class='del'>-</div><div class='del'>-/* Send led command */</div><div class='del'>-static int</div><div class='del'>-iwl4965_send_led_cmd(struct iwl_priv *priv, struct iwl_led_cmd *led_cmd)</div><div class='del'>-{</div><div class='del'>-	struct iwl_host_cmd cmd = {</div><div class='del'>-		.id = REPLY_LEDS_CMD,</div><div class='del'>-		.len = sizeof(struct iwl_led_cmd),</div><div class='del'>-		.data = led_cmd,</div><div class='del'>-		.flags = CMD_ASYNC,</div><div class='del'>-		.callback = NULL,</div><div class='del'>-	};</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	reg = iwl_read32(priv, CSR_LED_REG);</div><div class='del'>-	if (reg != (reg &amp; CSR_LED_BSM_CTRL_MSK))</div><div class='del'>-		iwl_write32(priv, CSR_LED_REG, reg &amp; CSR_LED_BSM_CTRL_MSK);</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_send_cmd(priv, &amp;cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set led register off */</div><div class='del'>-void iwl4965_led_enable(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	iwl_write32(priv, CSR_LED_REG, CSR_LED_REG_TRUN_ON);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct iwl_led_ops iwl4965_led_ops = {</div><div class='del'>-	.cmd = iwl4965_send_led_cmd,</div><div class='del'>-};</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-led.h b/drivers/net/wireless/iwlegacy/iwl-4965-led.h<br/>deleted file mode 100644<br/>index 5ed3615fc338..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-4965-led.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-led.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifndef __iwl_4965_led_h__</div><div class='del'>-#define __iwl_4965_led_h__</div><div class='del'>-</div><div class='del'>-extern const struct iwl_led_ops iwl4965_led_ops;</div><div class='del'>-void iwl4965_led_enable(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-#endif /* __iwl_4965_led_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-lib.c b/drivers/net/wireless/iwlegacy/iwl-4965-lib.c<br/>deleted file mode 100644<br/>index 2be6d9e3b019..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-4965-lib.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-lib.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1194 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * GPL LICENSE SUMMARY</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2008 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/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/sched.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-#include "iwl-helpers.h"</div><div class='del'>-#include "iwl-4965-hw.h"</div><div class='del'>-#include "iwl-4965.h"</div><div class='del'>-#include "iwl-sta.h"</div><div class='del'>-</div><div class='del'>-void iwl4965_check_abort_status(struct iwl_priv *priv,</div><div class='del'>-			    u8 frame_count, u32 status)</div><div class='del'>-{</div><div class='del'>-	if (frame_count == 1 &amp;&amp; status == TX_STATUS_FAIL_RFKILL_FLUSH) {</div><div class='del'>-		IWL_ERR(priv, "Tx flush command to flush out all frames\n");</div><div class='del'>-		if (!test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-			queue_work(priv-&gt;workqueue, &amp;priv-&gt;tx_flush);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EEPROM</div><div class='del'>- */</div><div class='del'>-struct iwl_mod_params iwl4965_mod_params = {</div><div class='del'>-	.amsdu_size_8K = 1,</div><div class='del'>-	.restart_fw = 1,</div><div class='del'>-	/* the rest are 0 by default */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void iwl4965_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int i;</div><div class='del'>-	spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='del'>-	INIT_LIST_HEAD(&amp;rxq-&gt;rx_free);</div><div class='del'>-	INIT_LIST_HEAD(&amp;rxq-&gt;rx_used);</div><div class='del'>-	/* Fill the rx_used queue with _all_ of the Rx buffers */</div><div class='del'>-	for (i = 0; i &lt; RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++) {</div><div class='del'>-		/* In the reset function, these buffers may have been allocated</div><div class='del'>-		 * to an SKB, so we need to unmap and free potential storage */</div><div class='del'>-		if (rxq-&gt;pool[i].page != NULL) {</div><div class='del'>-			pci_unmap_page(priv-&gt;pci_dev, rxq-&gt;pool[i].page_dma,</div><div class='del'>-				PAGE_SIZE &lt;&lt; priv-&gt;hw_params.rx_page_order,</div><div class='del'>-				PCI_DMA_FROMDEVICE);</div><div class='del'>-			__iwl_legacy_free_pages(priv, rxq-&gt;pool[i].page);</div><div class='del'>-			rxq-&gt;pool[i].page = NULL;</div><div class='del'>-		}</div><div class='del'>-		list_add_tail(&amp;rxq-&gt;pool[i].list, &amp;rxq-&gt;rx_used);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; RX_QUEUE_SIZE; i++)</div><div class='del'>-		rxq-&gt;queue[i] = NULL;</div><div class='del'>-</div><div class='del'>-	/* Set us so that we have processed and used all buffers, but have</div><div class='del'>-	 * not restocked the Rx queue with fresh buffers */</div><div class='del'>-	rxq-&gt;read = rxq-&gt;write = 0;</div><div class='del'>-	rxq-&gt;write_actual = 0;</div><div class='del'>-	rxq-&gt;free_count = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq)</div><div class='del'>-{</div><div class='del'>-	u32 rb_size;</div><div class='del'>-	const u32 rfdnlog = RX_QUEUE_SIZE_LOG; /* 256 RBDs */</div><div class='del'>-	u32 rb_timeout = 0;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cfg-&gt;mod_params-&gt;amsdu_size_8K)</div><div class='del'>-		rb_size = FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_8K;</div><div class='del'>-	else</div><div class='del'>-		rb_size = FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_4K;</div><div class='del'>-</div><div class='del'>-	/* Stop Rx DMA */</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG, 0);</div><div class='del'>-</div><div class='del'>-	/* Reset driver's Rx queue write index */</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH_RSCSR_CHNL0_RBDCB_WPTR_REG, 0);</div><div class='del'>-</div><div class='del'>-	/* Tell device where to find RBD circular buffer in DRAM */</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH_RSCSR_CHNL0_RBDCB_BASE_REG,</div><div class='del'>-			   (u32)(rxq-&gt;bd_dma &gt;&gt; 8));</div><div class='del'>-</div><div class='del'>-	/* Tell device where in DRAM to update its Rx status */</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH_RSCSR_CHNL0_STTS_WPTR_REG,</div><div class='del'>-			   rxq-&gt;rb_stts_dma &gt;&gt; 4);</div><div class='del'>-</div><div class='del'>-	/* Enable Rx DMA</div><div class='del'>-	 * Direct rx interrupts to hosts</div><div class='del'>-	 * Rx buffer size 4 or 8k</div><div class='del'>-	 * RB timeout 0x10</div><div class='del'>-	 * 256 RBDs</div><div class='del'>-	 */</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG,</div><div class='del'>-			   FH_RCSR_RX_CONFIG_CHNL_EN_ENABLE_VAL |</div><div class='del'>-			   FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL |</div><div class='del'>-			   FH_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME_MSK |</div><div class='del'>-			   rb_size|</div><div class='del'>-			   (rb_timeout &lt;&lt; FH_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS)|</div><div class='del'>-			   (rfdnlog &lt;&lt; FH_RCSR_RX_CONFIG_RBDCB_SIZE_POS));</div><div class='del'>-</div><div class='del'>-	/* Set interrupt coalescing timer to default (2048 usecs) */</div><div class='del'>-	iwl_write8(priv, CSR_INT_COALESCING, IWL_HOST_INT_TIMEOUT_DEF);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_set_pwr_vmain(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-/*</div><div class='del'>- * (for documentation purposes)</div><div class='del'>- * to set power to V_AUX, do:</div><div class='del'>-</div><div class='del'>-		if (pci_pme_capable(priv-&gt;pci_dev, PCI_D3cold))</div><div class='del'>-			iwl_legacy_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,</div><div class='del'>-					       APMG_PS_CTRL_VAL_PWR_SRC_VAUX,</div><div class='del'>-					       ~APMG_PS_CTRL_MSK_PWR_SRC);</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-	iwl_legacy_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,</div><div class='del'>-			       APMG_PS_CTRL_VAL_PWR_SRC_VMAIN,</div><div class='del'>-			       ~APMG_PS_CTRL_MSK_PWR_SRC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_hw_nic_init(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct iwl_rx_queue *rxq = &amp;priv-&gt;rxq;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* nic_init */</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	priv-&gt;cfg-&gt;ops-&gt;lib-&gt;apm_ops.init(priv);</div><div class='del'>-</div><div class='del'>-	/* Set interrupt coalescing calibration timer to default (512 usecs) */</div><div class='del'>-	iwl_write8(priv, CSR_INT_COALESCING, IWL_HOST_INT_CALIB_TIMEOUT_DEF);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	iwl4965_set_pwr_vmain(priv);</div><div class='del'>-</div><div class='del'>-	priv-&gt;cfg-&gt;ops-&gt;lib-&gt;apm_ops.config(priv);</div><div class='del'>-</div><div class='del'>-	/* Allocate the RX queue, or reset if it is already allocated */</div><div class='del'>-	if (!rxq-&gt;bd) {</div><div class='del'>-		ret = iwl_legacy_rx_queue_alloc(priv);</div><div class='del'>-		if (ret) {</div><div class='del'>-			IWL_ERR(priv, "Unable to initialize Rx queue\n");</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		iwl4965_rx_queue_reset(priv, rxq);</div><div class='del'>-</div><div class='del'>-	iwl4965_rx_replenish(priv);</div><div class='del'>-</div><div class='del'>-	iwl4965_rx_init(priv, rxq);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	rxq-&gt;need_update = 1;</div><div class='del'>-	iwl_legacy_rx_queue_update_write_ptr(priv, rxq);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Allocate or reset and init all Tx and Command queues */</div><div class='del'>-	if (!priv-&gt;txq) {</div><div class='del'>-		ret = iwl4965_txq_ctx_alloc(priv);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	} else</div><div class='del'>-		iwl4965_txq_ctx_reset(priv);</div><div class='del'>-</div><div class='del'>-	set_bit(STATUS_INIT, &amp;priv-&gt;status);</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'>- * iwl4965_dma_addr2rbd_ptr - convert a DMA address to a uCode read buffer ptr</div><div class='del'>- */</div><div class='del'>-static inline __le32 iwl4965_dma_addr2rbd_ptr(struct iwl_priv *priv,</div><div class='del'>-					  dma_addr_t dma_addr)</div><div class='del'>-{</div><div class='del'>-	return cpu_to_le32((u32)(dma_addr &gt;&gt; 8));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_rx_queue_restock - refill RX queue from pre-allocated pool</div><div class='del'>- *</div><div class='del'>- * If there are slots in the RX queue that need to be restocked,</div><div class='del'>- * and we have free pre-allocated buffers, fill the ranks as much</div><div class='del'>- * as we can, pulling from rx_free.</div><div class='del'>- *</div><div class='del'>- * This moves the 'write' index forward to catch up with 'processed', and</div><div class='del'>- * also updates the memory address in the firmware to reference the new</div><div class='del'>- * target buffer.</div><div class='del'>- */</div><div class='del'>-void iwl4965_rx_queue_restock(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_queue *rxq = &amp;priv-&gt;rxq;</div><div class='del'>-	struct list_head *element;</div><div class='del'>-	struct iwl_rx_mem_buffer *rxb;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='del'>-	while ((iwl_legacy_rx_queue_space(rxq) &gt; 0) &amp;&amp; (rxq-&gt;free_count)) {</div><div class='del'>-		/* The overwritten rxb must be a used one */</div><div class='del'>-		rxb = rxq-&gt;queue[rxq-&gt;write];</div><div class='del'>-		BUG_ON(rxb &amp;&amp; rxb-&gt;page);</div><div class='del'>-</div><div class='del'>-		/* Get next free Rx buffer, remove from free list */</div><div class='del'>-		element = rxq-&gt;rx_free.next;</div><div class='del'>-		rxb = list_entry(element, struct iwl_rx_mem_buffer, list);</div><div class='del'>-		list_del(element);</div><div class='del'>-</div><div class='del'>-		/* Point to Rx buffer via next RBD in circular buffer */</div><div class='del'>-		rxq-&gt;bd[rxq-&gt;write] = iwl4965_dma_addr2rbd_ptr(priv,</div><div class='del'>-							      rxb-&gt;page_dma);</div><div class='del'>-		rxq-&gt;queue[rxq-&gt;write] = rxb;</div><div class='del'>-		rxq-&gt;write = (rxq-&gt;write + 1) &amp; RX_QUEUE_MASK;</div><div class='del'>-		rxq-&gt;free_count--;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-	/* If the pre-allocated buffer pool is dropping low, schedule to</div><div class='del'>-	 * refill it */</div><div class='del'>-	if (rxq-&gt;free_count &lt;= RX_LOW_WATERMARK)</div><div class='del'>-		queue_work(priv-&gt;workqueue, &amp;priv-&gt;rx_replenish);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* If we've added more space for the firmware to place data, tell it.</div><div class='del'>-	 * Increment device's write pointer in multiples of 8. */</div><div class='del'>-	if (rxq-&gt;write_actual != (rxq-&gt;write &amp; ~0x7)) {</div><div class='del'>-		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='del'>-		rxq-&gt;need_update = 1;</div><div class='del'>-		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-		iwl_legacy_rx_queue_update_write_ptr(priv, rxq);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_rx_replenish - Move all used packet from rx_used to rx_free</div><div class='del'>- *</div><div class='del'>- * When moving to rx_free an SKB is allocated for the slot.</div><div class='del'>- *</div><div class='del'>- * Also restock the Rx queue via iwl_rx_queue_restock.</div><div class='del'>- * This is called as a scheduled work item (except for during initialization)</div><div class='del'>- */</div><div class='del'>-static void iwl4965_rx_allocate(struct iwl_priv *priv, gfp_t priority)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_queue *rxq = &amp;priv-&gt;rxq;</div><div class='del'>-	struct list_head *element;</div><div class='del'>-	struct iwl_rx_mem_buffer *rxb;</div><div class='del'>-	struct page *page;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	gfp_t gfp_mask = priority;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='del'>-		if (list_empty(&amp;rxq-&gt;rx_used)) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-		if (rxq-&gt;free_count &gt; RX_LOW_WATERMARK)</div><div class='del'>-			gfp_mask |= __GFP_NOWARN;</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;hw_params.rx_page_order &gt; 0)</div><div class='del'>-			gfp_mask |= __GFP_COMP;</div><div class='del'>-</div><div class='del'>-		/* Alloc a new receive buffer */</div><div class='del'>-		page = alloc_pages(gfp_mask, priv-&gt;hw_params.rx_page_order);</div><div class='del'>-		if (!page) {</div><div class='del'>-			if (net_ratelimit())</div><div class='del'>-				IWL_DEBUG_INFO(priv, "alloc_pages failed, "</div><div class='del'>-					       "order: %d\n",</div><div class='del'>-					       priv-&gt;hw_params.rx_page_order);</div><div class='del'>-</div><div class='del'>-			if ((rxq-&gt;free_count &lt;= RX_LOW_WATERMARK) &amp;&amp;</div><div class='del'>-			    net_ratelimit())</div><div class='del'>-				IWL_CRIT(priv,</div><div class='del'>-					"Failed to alloc_pages with %s. "</div><div class='del'>-					"Only %u free buffers remaining.\n",</div><div class='del'>-					 priority == GFP_ATOMIC ?</div><div class='del'>-						 "GFP_ATOMIC" : "GFP_KERNEL",</div><div class='del'>-					 rxq-&gt;free_count);</div><div class='del'>-			/* We don't reschedule replenish work here -- we will</div><div class='del'>-			 * call the restock method and if it still needs</div><div class='del'>-			 * more buffers it will schedule replenish */</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-		if (list_empty(&amp;rxq-&gt;rx_used)) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-			__free_pages(page, priv-&gt;hw_params.rx_page_order);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		element = rxq-&gt;rx_used.next;</div><div class='del'>-		rxb = list_entry(element, struct iwl_rx_mem_buffer, list);</div><div class='del'>-		list_del(element);</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-		BUG_ON(rxb-&gt;page);</div><div class='del'>-		rxb-&gt;page = page;</div><div class='del'>-		/* Get physical address of the RB */</div><div class='del'>-		rxb-&gt;page_dma = pci_map_page(priv-&gt;pci_dev, page, 0,</div><div class='del'>-				PAGE_SIZE &lt;&lt; priv-&gt;hw_params.rx_page_order,</div><div class='del'>-				PCI_DMA_FROMDEVICE);</div><div class='del'>-		/* dma address must be no more than 36 bits */</div><div class='del'>-		BUG_ON(rxb-&gt;page_dma &amp; ~DMA_BIT_MASK(36));</div><div class='del'>-		/* and also 256 byte aligned! */</div><div class='del'>-		BUG_ON(rxb-&gt;page_dma &amp; DMA_BIT_MASK(8));</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-		list_add_tail(&amp;rxb-&gt;list, &amp;rxq-&gt;rx_free);</div><div class='del'>-		rxq-&gt;free_count++;</div><div class='del'>-		priv-&gt;alloc_rxb_page++;</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl4965_rx_replenish(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	iwl4965_rx_allocate(priv, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	iwl4965_rx_queue_restock(priv);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl4965_rx_replenish_now(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	iwl4965_rx_allocate(priv, GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-	iwl4965_rx_queue_restock(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Assumes that the skb field of the buffers in 'pool' is kept accurate.</div><div class='del'>- * If an SKB has been detached, the POOL needs to have its SKB set to NULL</div><div class='del'>- * This free routine walks the list of POOL entries and if SKB is set to</div><div class='del'>- * non NULL it is unmapped and freed</div><div class='del'>- */</div><div class='del'>-void iwl4965_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {</div><div class='del'>-		if (rxq-&gt;pool[i].page != NULL) {</div><div class='del'>-			pci_unmap_page(priv-&gt;pci_dev, rxq-&gt;pool[i].page_dma,</div><div class='del'>-				PAGE_SIZE &lt;&lt; priv-&gt;hw_params.rx_page_order,</div><div class='del'>-				PCI_DMA_FROMDEVICE);</div><div class='del'>-			__iwl_legacy_free_pages(priv, rxq-&gt;pool[i].page);</div><div class='del'>-			rxq-&gt;pool[i].page = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dma_free_coherent(&amp;priv-&gt;pci_dev-&gt;dev, 4 * RX_QUEUE_SIZE, rxq-&gt;bd,</div><div class='del'>-			  rxq-&gt;bd_dma);</div><div class='del'>-	dma_free_coherent(&amp;priv-&gt;pci_dev-&gt;dev, sizeof(struct iwl_rb_status),</div><div class='del'>-			  rxq-&gt;rb_stts, rxq-&gt;rb_stts_dma);</div><div class='del'>-	rxq-&gt;bd = NULL;</div><div class='del'>-	rxq-&gt;rb_stts  = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_rxq_stop(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	/* stop Rx DMA */</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG, 0);</div><div class='del'>-	iwl_poll_direct_bit(priv, FH_MEM_RSSR_RX_STATUS_REG,</div><div class='del'>-			    FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band)</div><div class='del'>-{</div><div class='del'>-	int idx = 0;</div><div class='del'>-	int band_offset = 0;</div><div class='del'>-</div><div class='del'>-	/* HT rate format: mac80211 wants an MCS number, which is just LSB */</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_HT_MSK) {</div><div class='del'>-		idx = (rate_n_flags &amp; 0xff);</div><div class='del'>-		return idx;</div><div class='del'>-	/* Legacy rate format, search for match in table */</div><div class='del'>-	} else {</div><div class='del'>-		if (band == IEEE80211_BAND_5GHZ)</div><div class='del'>-			band_offset = IWL_FIRST_OFDM_RATE;</div><div class='del'>-		for (idx = band_offset; idx &lt; IWL_RATE_COUNT_LEGACY; idx++)</div><div class='del'>-			if (iwlegacy_rates[idx].plcp == (rate_n_flags &amp; 0xFF))</div><div class='del'>-				return idx - band_offset;</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 int iwl4965_calc_rssi(struct iwl_priv *priv,</div><div class='del'>-			     struct iwl_rx_phy_res *rx_resp)</div><div class='del'>-{</div><div class='del'>-	/* data from PHY/DSP regarding signal strength, etc.,</div><div class='del'>-	 *   contents are always there, not configurable by host.  */</div><div class='del'>-	struct iwl4965_rx_non_cfg_phy *ncphy =</div><div class='del'>-	    (struct iwl4965_rx_non_cfg_phy *)rx_resp-&gt;non_cfg_phy_buf;</div><div class='del'>-	u32 agc = (le16_to_cpu(ncphy-&gt;agc_info) &amp; IWL49_AGC_DB_MASK)</div><div class='del'>-			&gt;&gt; IWL49_AGC_DB_POS;</div><div class='del'>-</div><div class='del'>-	u32 valid_antennae =</div><div class='del'>-	    (le16_to_cpu(rx_resp-&gt;phy_flags) &amp; IWL49_RX_PHY_FLAGS_ANTENNAE_MASK)</div><div class='del'>-			&gt;&gt; IWL49_RX_PHY_FLAGS_ANTENNAE_OFFSET;</div><div class='del'>-	u8 max_rssi = 0;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	/* Find max rssi among 3 possible receivers.</div><div class='del'>-	 * These values are measured by the digital signal processor (DSP).</div><div class='del'>-	 * They should stay fairly constant even as the signal strength varies,</div><div class='del'>-	 *   if the radio's automatic gain control (AGC) is working right.</div><div class='del'>-	 * AGC value (see below) will provide the "interesting" info. */</div><div class='del'>-	for (i = 0; i &lt; 3; i++)</div><div class='del'>-		if (valid_antennae &amp; (1 &lt;&lt; i))</div><div class='del'>-			max_rssi = max(ncphy-&gt;rssi_info[i &lt;&lt; 1], max_rssi);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_STATS(priv, "Rssi In A %d B %d C %d Max %d AGC dB %d\n",</div><div class='del'>-		ncphy-&gt;rssi_info[0], ncphy-&gt;rssi_info[2], ncphy-&gt;rssi_info[4],</div><div class='del'>-		max_rssi, agc);</div><div class='del'>-</div><div class='del'>-	/* dBm = max_rssi dB - agc dB - constant.</div><div class='del'>-	 * Higher AGC (higher radio gain) means lower signal. */</div><div class='del'>-	return max_rssi - agc - IWL4965_RSSI_OFFSET;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static u32 iwl4965_translate_rx_status(struct iwl_priv *priv, u32 decrypt_in)</div><div class='del'>-{</div><div class='del'>-	u32 decrypt_out = 0;</div><div class='del'>-</div><div class='del'>-	if ((decrypt_in &amp; RX_RES_STATUS_STATION_FOUND) ==</div><div class='del'>-					RX_RES_STATUS_STATION_FOUND)</div><div class='del'>-		decrypt_out |= (RX_RES_STATUS_STATION_FOUND |</div><div class='del'>-				RX_RES_STATUS_NO_STATION_INFO_MISMATCH);</div><div class='del'>-</div><div class='del'>-	decrypt_out |= (decrypt_in &amp; RX_RES_STATUS_SEC_TYPE_MSK);</div><div class='del'>-</div><div class='del'>-	/* packet was not encrypted */</div><div class='del'>-	if ((decrypt_in &amp; RX_RES_STATUS_SEC_TYPE_MSK) ==</div><div class='del'>-					RX_RES_STATUS_SEC_TYPE_NONE)</div><div class='del'>-		return decrypt_out;</div><div class='del'>-</div><div class='del'>-	/* packet was encrypted with unknown alg */</div><div class='del'>-	if ((decrypt_in &amp; RX_RES_STATUS_SEC_TYPE_MSK) ==</div><div class='del'>-					RX_RES_STATUS_SEC_TYPE_ERR)</div><div class='del'>-		return decrypt_out;</div><div class='del'>-</div><div class='del'>-	/* decryption was not done in HW */</div><div class='del'>-	if ((decrypt_in &amp; RX_MPDU_RES_STATUS_DEC_DONE_MSK) !=</div><div class='del'>-					RX_MPDU_RES_STATUS_DEC_DONE_MSK)</div><div class='del'>-		return decrypt_out;</div><div class='del'>-</div><div class='del'>-	switch (decrypt_in &amp; RX_RES_STATUS_SEC_TYPE_MSK) {</div><div class='del'>-</div><div class='del'>-	case RX_RES_STATUS_SEC_TYPE_CCMP:</div><div class='del'>-		/* alg is CCM: check MIC only */</div><div class='del'>-		if (!(decrypt_in &amp; RX_MPDU_RES_STATUS_MIC_OK))</div><div class='del'>-			/* Bad MIC */</div><div class='del'>-			decrypt_out |= RX_RES_STATUS_BAD_ICV_MIC;</div><div class='del'>-		else</div><div class='del'>-			decrypt_out |= RX_RES_STATUS_DECRYPT_OK;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RX_RES_STATUS_SEC_TYPE_TKIP:</div><div class='del'>-		if (!(decrypt_in &amp; RX_MPDU_RES_STATUS_TTAK_OK)) {</div><div class='del'>-			/* Bad TTAK */</div><div class='del'>-			decrypt_out |= RX_RES_STATUS_BAD_KEY_TTAK;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		/* fall through if TTAK OK */</div><div class='del'>-	default:</div><div class='del'>-		if (!(decrypt_in &amp; RX_MPDU_RES_STATUS_ICV_OK))</div><div class='del'>-			decrypt_out |= RX_RES_STATUS_BAD_ICV_MIC;</div><div class='del'>-		else</div><div class='del'>-			decrypt_out |= RX_RES_STATUS_DECRYPT_OK;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RX(priv, "decrypt_in:0x%x  decrypt_out = 0x%x\n",</div><div class='del'>-					decrypt_in, decrypt_out);</div><div class='del'>-</div><div class='del'>-	return decrypt_out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_pass_packet_to_mac80211(struct iwl_priv *priv,</div><div class='del'>-					struct ieee80211_hdr *hdr,</div><div class='del'>-					u16 len,</div><div class='del'>-					u32 ampdu_status,</div><div class='del'>-					struct iwl_rx_mem_buffer *rxb,</div><div class='del'>-					struct ieee80211_rx_status *stats)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	__le16 fc = hdr-&gt;frame_control;</div><div class='del'>-</div><div class='del'>-	/* We only process data packets if the interface is open */</div><div class='del'>-	if (unlikely(!priv-&gt;is_open)) {</div><div class='del'>-		IWL_DEBUG_DROP_LIMIT(priv,</div><div class='del'>-		    "Dropping packet while interface is not open.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* In case of HW accelerated crypto and bad decryption, drop */</div><div class='del'>-	if (!priv-&gt;cfg-&gt;mod_params-&gt;sw_crypto &amp;&amp;</div><div class='del'>-	    iwl_legacy_set_decrypted_flag(priv, hdr, ampdu_status, stats))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skb = dev_alloc_skb(128);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		IWL_ERR(priv, "dev_alloc_skb failed\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_add_rx_frag(skb, 0, rxb-&gt;page, (void *)hdr - rxb_addr(rxb), len);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_update_stats(priv, false, fc, len);</div><div class='del'>-	memcpy(IEEE80211_SKB_RXCB(skb), stats, sizeof(*stats));</div><div class='del'>-</div><div class='del'>-	ieee80211_rx(priv-&gt;hw, skb);</div><div class='del'>-	priv-&gt;alloc_rxb_page--;</div><div class='del'>-	rxb-&gt;page = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called for REPLY_RX (legacy ABG frames), or</div><div class='del'>- * REPLY_RX_MPDU_CMD (HT high-throughput N frames). */</div><div class='del'>-void iwl4965_rx_reply_rx(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hdr *header;</div><div class='del'>-	struct ieee80211_rx_status rx_status;</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_rx_phy_res *phy_res;</div><div class='del'>-	__le32 rx_pkt_status;</div><div class='del'>-	struct iwl_rx_mpdu_res_start *amsdu;</div><div class='del'>-	u32 len;</div><div class='del'>-	u32 ampdu_status;</div><div class='del'>-	u32 rate_n_flags;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * REPLY_RX and REPLY_RX_MPDU_CMD are handled differently.</div><div class='del'>-	 *	REPLY_RX: physical layer info is in this buffer</div><div class='del'>-	 *	REPLY_RX_MPDU_CMD: physical layer info was sent in separate</div><div class='del'>-	 *		command and cached in priv-&gt;last_phy_res</div><div class='del'>-	 *</div><div class='del'>-	 * Here we set up local variables depending on which command is</div><div class='del'>-	 * received.</div><div class='del'>-	 */</div><div class='del'>-	if (pkt-&gt;hdr.cmd == REPLY_RX) {</div><div class='del'>-		phy_res = (struct iwl_rx_phy_res *)pkt-&gt;u.raw;</div><div class='del'>-		header = (struct ieee80211_hdr *)(pkt-&gt;u.raw + sizeof(*phy_res)</div><div class='del'>-				+ phy_res-&gt;cfg_phy_cnt);</div><div class='del'>-</div><div class='del'>-		len = le16_to_cpu(phy_res-&gt;byte_count);</div><div class='del'>-		rx_pkt_status = *(__le32 *)(pkt-&gt;u.raw + sizeof(*phy_res) +</div><div class='del'>-				phy_res-&gt;cfg_phy_cnt + len);</div><div class='del'>-		ampdu_status = le32_to_cpu(rx_pkt_status);</div><div class='del'>-	} else {</div><div class='del'>-		if (!priv-&gt;_4965.last_phy_res_valid) {</div><div class='del'>-			IWL_ERR(priv, "MPDU frame without cached PHY data\n");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		phy_res = &amp;priv-&gt;_4965.last_phy_res;</div><div class='del'>-		amsdu = (struct iwl_rx_mpdu_res_start *)pkt-&gt;u.raw;</div><div class='del'>-		header = (struct ieee80211_hdr *)(pkt-&gt;u.raw + sizeof(*amsdu));</div><div class='del'>-		len = le16_to_cpu(amsdu-&gt;byte_count);</div><div class='del'>-		rx_pkt_status = *(__le32 *)(pkt-&gt;u.raw + sizeof(*amsdu) + len);</div><div class='del'>-		ampdu_status = iwl4965_translate_rx_status(priv,</div><div class='del'>-				le32_to_cpu(rx_pkt_status));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((unlikely(phy_res-&gt;cfg_phy_cnt &gt; 20))) {</div><div class='del'>-		IWL_DEBUG_DROP(priv, "dsp size out of range [0,20]: %d/n",</div><div class='del'>-				phy_res-&gt;cfg_phy_cnt);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(rx_pkt_status &amp; RX_RES_STATUS_NO_CRC32_ERROR) ||</div><div class='del'>-	    !(rx_pkt_status &amp; RX_RES_STATUS_NO_RXE_OVERFLOW)) {</div><div class='del'>-		IWL_DEBUG_RX(priv, "Bad CRC or FIFO: 0x%08X.\n",</div><div class='del'>-				le32_to_cpu(rx_pkt_status));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* This will be used in several places later */</div><div class='del'>-	rate_n_flags = le32_to_cpu(phy_res-&gt;rate_n_flags);</div><div class='del'>-</div><div class='del'>-	/* rx_status carries information about the packet to mac80211 */</div><div class='del'>-	rx_status.mactime = le64_to_cpu(phy_res-&gt;timestamp);</div><div class='del'>-	rx_status.band = (phy_res-&gt;phy_flags &amp; RX_RES_PHY_FLAGS_BAND_24_MSK) ?</div><div class='del'>-				IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;</div><div class='del'>-	rx_status.freq =</div><div class='del'>-		ieee80211_channel_to_frequency(le16_to_cpu(phy_res-&gt;channel),</div><div class='del'>-							rx_status.band);</div><div class='del'>-	rx_status.rate_idx =</div><div class='del'>-		iwl4965_hwrate_to_mac80211_idx(rate_n_flags, rx_status.band);</div><div class='del'>-	rx_status.flag = 0;</div><div class='del'>-</div><div class='del'>-	/* TSF isn't reliable. In order to allow smooth user experience,</div><div class='del'>-	 * this W/A doesn't propagate it to the mac80211 */</div><div class='del'>-	/*rx_status.flag |= RX_FLAG_MACTIME_MPDU;*/</div><div class='del'>-</div><div class='del'>-	priv-&gt;ucode_beacon_time = le32_to_cpu(phy_res-&gt;beacon_time_stamp);</div><div class='del'>-</div><div class='del'>-	/* Find max signal strength (dBm) among 3 antenna/receiver chains */</div><div class='del'>-	rx_status.signal = iwl4965_calc_rssi(priv, phy_res);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_dbg_log_rx_data_frame(priv, len, header);</div><div class='del'>-	IWL_DEBUG_STATS_LIMIT(priv, "Rssi %d, TSF %llu\n",</div><div class='del'>-		rx_status.signal, (unsigned long long)rx_status.mactime);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * "antenna number"</div><div class='del'>-	 *</div><div class='del'>-	 * It seems that the antenna field in the phy flags value</div><div class='del'>-	 * is actually a bit field. This is undefined by radiotap,</div><div class='del'>-	 * it wants an actual antenna number but I always get "7"</div><div class='del'>-	 * for most legacy frames I receive indicating that the</div><div class='del'>-	 * same frame was received on all three RX chains.</div><div class='del'>-	 *</div><div class='del'>-	 * I think this field should be removed in favor of a</div><div class='del'>-	 * new 802.11n radiotap field "RX chains" that is defined</div><div class='del'>-	 * as a bitmask.</div><div class='del'>-	 */</div><div class='del'>-	rx_status.antenna =</div><div class='del'>-		(le16_to_cpu(phy_res-&gt;phy_flags) &amp; RX_RES_PHY_FLAGS_ANTENNA_MSK)</div><div class='del'>-		&gt;&gt; RX_RES_PHY_FLAGS_ANTENNA_POS;</div><div class='del'>-</div><div class='del'>-	/* set the preamble flag if appropriate */</div><div class='del'>-	if (phy_res-&gt;phy_flags &amp; RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK)</div><div class='del'>-		rx_status.flag |= RX_FLAG_SHORTPRE;</div><div class='del'>-</div><div class='del'>-	/* Set up the HT phy flags */</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_HT_MSK)</div><div class='del'>-		rx_status.flag |= RX_FLAG_HT;</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_HT40_MSK)</div><div class='del'>-		rx_status.flag |= RX_FLAG_40MHZ;</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_SGI_MSK)</div><div class='del'>-		rx_status.flag |= RX_FLAG_SHORT_GI;</div><div class='del'>-</div><div class='del'>-	iwl4965_pass_packet_to_mac80211(priv, header, len, ampdu_status,</div><div class='del'>-				    rxb, &amp;rx_status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cache phy data (Rx signal strength, etc) for HT frame (REPLY_RX_PHY_CMD).</div><div class='del'>- * This will be used later in iwl_rx_reply_rx() for REPLY_RX_MPDU_CMD. */</div><div class='del'>-void iwl4965_rx_reply_rx_phy(struct iwl_priv *priv,</div><div class='del'>-			    struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	priv-&gt;_4965.last_phy_res_valid = true;</div><div class='del'>-	memcpy(&amp;priv-&gt;_4965.last_phy_res, pkt-&gt;u.raw,</div><div class='del'>-	       sizeof(struct iwl_rx_phy_res));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl4965_get_channels_for_scan(struct iwl_priv *priv,</div><div class='del'>-				     struct ieee80211_vif *vif,</div><div class='del'>-				     enum ieee80211_band band,</div><div class='del'>-				     u8 is_active, u8 n_probes,</div><div class='del'>-				     struct iwl_scan_channel *scan_ch)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_channel *chan;</div><div class='del'>-	const struct ieee80211_supported_band *sband;</div><div class='del'>-	const struct iwl_channel_info *ch_info;</div><div class='del'>-	u16 passive_dwell = 0;</div><div class='del'>-	u16 active_dwell = 0;</div><div class='del'>-	int added, i;</div><div class='del'>-	u16 channel;</div><div class='del'>-</div><div class='del'>-	sband = iwl_get_hw_mode(priv, band);</div><div class='del'>-	if (!sband)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	active_dwell = iwl_legacy_get_active_dwell_time(priv, band, n_probes);</div><div class='del'>-	passive_dwell = iwl_legacy_get_passive_dwell_time(priv, band, vif);</div><div class='del'>-</div><div class='del'>-	if (passive_dwell &lt;= active_dwell)</div><div class='del'>-		passive_dwell = active_dwell + 1;</div><div class='del'>-</div><div class='del'>-	for (i = 0, added = 0; i &lt; priv-&gt;scan_request-&gt;n_channels; i++) {</div><div class='del'>-		chan = priv-&gt;scan_request-&gt;channels[i];</div><div class='del'>-</div><div class='del'>-		if (chan-&gt;band != band)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		channel = chan-&gt;hw_value;</div><div class='del'>-		scan_ch-&gt;channel = cpu_to_le16(channel);</div><div class='del'>-</div><div class='del'>-		ch_info = iwl_legacy_get_channel_info(priv, band, channel);</div><div class='del'>-		if (!iwl_legacy_is_channel_valid(ch_info)) {</div><div class='del'>-			IWL_DEBUG_SCAN(priv,</div><div class='del'>-				 "Channel %d is INVALID for this band.\n",</div><div class='del'>-					channel);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!is_active || iwl_legacy_is_channel_passive(ch_info) ||</div><div class='del'>-		    (chan-&gt;flags &amp; IEEE80211_CHAN_PASSIVE_SCAN))</div><div class='del'>-			scan_ch-&gt;type = SCAN_CHANNEL_TYPE_PASSIVE;</div><div class='del'>-		else</div><div class='del'>-			scan_ch-&gt;type = SCAN_CHANNEL_TYPE_ACTIVE;</div><div class='del'>-</div><div class='del'>-		if (n_probes)</div><div class='del'>-			scan_ch-&gt;type |= IWL_SCAN_PROBE_MASK(n_probes);</div><div class='del'>-</div><div class='del'>-		scan_ch-&gt;active_dwell = cpu_to_le16(active_dwell);</div><div class='del'>-		scan_ch-&gt;passive_dwell = cpu_to_le16(passive_dwell);</div><div class='del'>-</div><div class='del'>-		/* Set txpower levels to defaults */</div><div class='del'>-		scan_ch-&gt;dsp_atten = 110;</div><div class='del'>-</div><div class='del'>-		/* NOTE: if we were doing 6Mb OFDM for scans we'd use</div><div class='del'>-		 * power level:</div><div class='del'>-		 * scan_ch-&gt;tx_gain = ((1 &lt;&lt; 5) | (2 &lt;&lt; 3)) | 3;</div><div class='del'>-		 */</div><div class='del'>-		if (band == IEEE80211_BAND_5GHZ)</div><div class='del'>-			scan_ch-&gt;tx_gain = ((1 &lt;&lt; 5) | (3 &lt;&lt; 3)) | 3;</div><div class='del'>-		else</div><div class='del'>-			scan_ch-&gt;tx_gain = ((1 &lt;&lt; 5) | (5 &lt;&lt; 3));</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "Scanning ch=%d prob=0x%X [%s %d]\n",</div><div class='del'>-			       channel, le32_to_cpu(scan_ch-&gt;type),</div><div class='del'>-			       (scan_ch-&gt;type &amp; SCAN_CHANNEL_TYPE_ACTIVE) ?</div><div class='del'>-				"ACTIVE" : "PASSIVE",</div><div class='del'>-			       (scan_ch-&gt;type &amp; SCAN_CHANNEL_TYPE_ACTIVE) ?</div><div class='del'>-			       active_dwell : passive_dwell);</div><div class='del'>-</div><div class='del'>-		scan_ch++;</div><div class='del'>-		added++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_SCAN(priv, "total channels to scan %d\n", added);</div><div class='del'>-	return added;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct iwl_host_cmd cmd = {</div><div class='del'>-		.id = REPLY_SCAN_CMD,</div><div class='del'>-		.len = sizeof(struct iwl_scan_cmd),</div><div class='del'>-		.flags = CMD_SIZE_HUGE,</div><div class='del'>-	};</div><div class='del'>-	struct iwl_scan_cmd *scan;</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-	u32 rate_flags = 0;</div><div class='del'>-	u16 cmd_len;</div><div class='del'>-	u16 rx_chain = 0;</div><div class='del'>-	enum ieee80211_band band;</div><div class='del'>-	u8 n_probes = 0;</div><div class='del'>-	u8 rx_ant = priv-&gt;hw_params.valid_rx_ant;</div><div class='del'>-	u8 rate;</div><div class='del'>-	bool is_active = false;</div><div class='del'>-	int  chan_mod;</div><div class='del'>-	u8 active_chains;</div><div class='del'>-	u8 scan_tx_antennas = priv-&gt;hw_params.valid_tx_ant;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (vif)</div><div class='del'>-		ctx = iwl_legacy_rxon_ctx_from_vif(vif);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;scan_cmd) {</div><div class='del'>-		priv-&gt;scan_cmd = kmalloc(sizeof(struct iwl_scan_cmd) +</div><div class='del'>-					 IWL_MAX_SCAN_SIZE, GFP_KERNEL);</div><div class='del'>-		if (!priv-&gt;scan_cmd) {</div><div class='del'>-			IWL_DEBUG_SCAN(priv,</div><div class='del'>-				       "fail to allocate memory for scan\n");</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	scan = priv-&gt;scan_cmd;</div><div class='del'>-	memset(scan, 0, sizeof(struct iwl_scan_cmd) + IWL_MAX_SCAN_SIZE);</div><div class='del'>-</div><div class='del'>-	scan-&gt;quiet_plcp_th = IWL_PLCP_QUIET_THRESH;</div><div class='del'>-	scan-&gt;quiet_time = IWL_ACTIVE_QUIET_TIME;</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_is_any_associated(priv)) {</div><div class='del'>-		u16 interval;</div><div class='del'>-		u32 extra;</div><div class='del'>-		u32 suspend_time = 100;</div><div class='del'>-		u32 scan_suspend_time = 100;</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Scanning while associated...\n");</div><div class='del'>-		interval = vif-&gt;bss_conf.beacon_int;</div><div class='del'>-</div><div class='del'>-		scan-&gt;suspend_time = 0;</div><div class='del'>-		scan-&gt;max_out_time = cpu_to_le32(200 * 1024);</div><div class='del'>-		if (!interval)</div><div class='del'>-			interval = suspend_time;</div><div class='del'>-</div><div class='del'>-		extra = (suspend_time / interval) &lt;&lt; 22;</div><div class='del'>-		scan_suspend_time = (extra |</div><div class='del'>-		    ((suspend_time % interval) * 1024));</div><div class='del'>-		scan-&gt;suspend_time = cpu_to_le32(scan_suspend_time);</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "suspend_time 0x%X beacon interval %d\n",</div><div class='del'>-			       scan_suspend_time, interval);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;scan_request-&gt;n_ssids) {</div><div class='del'>-		int i, p = 0;</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "Kicking off active scan\n");</div><div class='del'>-		for (i = 0; i &lt; priv-&gt;scan_request-&gt;n_ssids; i++) {</div><div class='del'>-			/* always does wildcard anyway */</div><div class='del'>-			if (!priv-&gt;scan_request-&gt;ssids[i].ssid_len)</div><div class='del'>-				continue;</div><div class='del'>-			scan-&gt;direct_scan[p].id = WLAN_EID_SSID;</div><div class='del'>-			scan-&gt;direct_scan[p].len =</div><div class='del'>-				priv-&gt;scan_request-&gt;ssids[i].ssid_len;</div><div class='del'>-			memcpy(scan-&gt;direct_scan[p].ssid,</div><div class='del'>-			       priv-&gt;scan_request-&gt;ssids[i].ssid,</div><div class='del'>-			       priv-&gt;scan_request-&gt;ssids[i].ssid_len);</div><div class='del'>-			n_probes++;</div><div class='del'>-			p++;</div><div class='del'>-		}</div><div class='del'>-		is_active = true;</div><div class='del'>-	} else</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "Start passive scan.\n");</div><div class='del'>-</div><div class='del'>-	scan-&gt;tx_cmd.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='del'>-	scan-&gt;tx_cmd.sta_id = ctx-&gt;bcast_sta_id;</div><div class='del'>-	scan-&gt;tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;scan_band) {</div><div class='del'>-	case IEEE80211_BAND_2GHZ:</div><div class='del'>-		scan-&gt;flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK;</div><div class='del'>-		chan_mod = le32_to_cpu(</div><div class='del'>-			priv-&gt;contexts[IWL_RXON_CTX_BSS].active.flags &amp;</div><div class='del'>-						RXON_FLG_CHANNEL_MODE_MSK)</div><div class='del'>-				       &gt;&gt; RXON_FLG_CHANNEL_MODE_POS;</div><div class='del'>-		if (chan_mod == CHANNEL_MODE_PURE_40) {</div><div class='del'>-			rate = IWL_RATE_6M_PLCP;</div><div class='del'>-		} else {</div><div class='del'>-			rate = IWL_RATE_1M_PLCP;</div><div class='del'>-			rate_flags = RATE_MCS_CCK_MSK;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_BAND_5GHZ:</div><div class='del'>-		rate = IWL_RATE_6M_PLCP;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		IWL_WARN(priv, "Invalid scan band\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If active scanning is requested but a certain channel is</div><div class='del'>-	 * marked passive, we can do active scanning if we detect</div><div class='del'>-	 * transmissions.</div><div class='del'>-	 *</div><div class='del'>-	 * There is an issue with some firmware versions that triggers</div><div class='del'>-	 * a sysassert on a "good CRC threshold" of zero (== disabled),</div><div class='del'>-	 * on a radar channel even though this means that we should NOT</div><div class='del'>-	 * send probes.</div><div class='del'>-	 *</div><div class='del'>-	 * The "good CRC threshold" is the number of frames that we</div><div class='del'>-	 * need to receive during our dwell time on a channel before</div><div class='del'>-	 * sending out probes -- setting this to a huge value will</div><div class='del'>-	 * mean we never reach it, but at the same time work around</div><div class='del'>-	 * the aforementioned issue. Thus use IWL_GOOD_CRC_TH_NEVER</div><div class='del'>-	 * here instead of IWL_GOOD_CRC_TH_DISABLED.</div><div class='del'>-	 */</div><div class='del'>-	scan-&gt;good_CRC_th = is_active ? IWL_GOOD_CRC_TH_DEFAULT :</div><div class='del'>-					IWL_GOOD_CRC_TH_NEVER;</div><div class='del'>-</div><div class='del'>-	band = priv-&gt;scan_band;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cfg-&gt;scan_rx_antennas[band])</div><div class='del'>-		rx_ant = priv-&gt;cfg-&gt;scan_rx_antennas[band];</div><div class='del'>-</div><div class='del'>-	priv-&gt;scan_tx_ant[band] = iwl4965_toggle_tx_ant(priv,</div><div class='del'>-						priv-&gt;scan_tx_ant[band],</div><div class='del'>-						    scan_tx_antennas);</div><div class='del'>-	rate_flags |= iwl4965_ant_idx_to_flags(priv-&gt;scan_tx_ant[band]);</div><div class='del'>-	scan-&gt;tx_cmd.rate_n_flags = iwl4965_hw_set_rate_n_flags(rate, rate_flags);</div><div class='del'>-</div><div class='del'>-	/* In power save mode use one chain, otherwise use all chains */</div><div class='del'>-	if (test_bit(STATUS_POWER_PMI, &amp;priv-&gt;status)) {</div><div class='del'>-		/* rx_ant has been set to all valid chains previously */</div><div class='del'>-		active_chains = rx_ant &amp;</div><div class='del'>-				((u8)(priv-&gt;chain_noise_data.active_chains));</div><div class='del'>-		if (!active_chains)</div><div class='del'>-			active_chains = rx_ant;</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "chain_noise_data.active_chains: %u\n",</div><div class='del'>-				priv-&gt;chain_noise_data.active_chains);</div><div class='del'>-</div><div class='del'>-		rx_ant = iwl4965_first_antenna(active_chains);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* MIMO is not used here, but value is required */</div><div class='del'>-	rx_chain |= priv-&gt;hw_params.valid_rx_ant &lt;&lt; RXON_RX_CHAIN_VALID_POS;</div><div class='del'>-	rx_chain |= rx_ant &lt;&lt; RXON_RX_CHAIN_FORCE_MIMO_SEL_POS;</div><div class='del'>-	rx_chain |= rx_ant &lt;&lt; RXON_RX_CHAIN_FORCE_SEL_POS;</div><div class='del'>-	rx_chain |= 0x1 &lt;&lt; RXON_RX_CHAIN_DRIVER_FORCE_POS;</div><div class='del'>-	scan-&gt;rx_chain = cpu_to_le16(rx_chain);</div><div class='del'>-</div><div class='del'>-	cmd_len = iwl_legacy_fill_probe_req(priv,</div><div class='del'>-					(struct ieee80211_mgmt *)scan-&gt;data,</div><div class='del'>-					vif-&gt;addr,</div><div class='del'>-					priv-&gt;scan_request-&gt;ie,</div><div class='del'>-					priv-&gt;scan_request-&gt;ie_len,</div><div class='del'>-					IWL_MAX_SCAN_SIZE - sizeof(*scan));</div><div class='del'>-	scan-&gt;tx_cmd.len = cpu_to_le16(cmd_len);</div><div class='del'>-</div><div class='del'>-	scan-&gt;filter_flags |= (RXON_FILTER_ACCEPT_GRP_MSK |</div><div class='del'>-			       RXON_FILTER_BCON_AWARE_MSK);</div><div class='del'>-</div><div class='del'>-	scan-&gt;channel_count = iwl4965_get_channels_for_scan(priv, vif, band,</div><div class='del'>-						is_active, n_probes,</div><div class='del'>-						(void *)&amp;scan-&gt;data[cmd_len]);</div><div class='del'>-	if (scan-&gt;channel_count == 0) {</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "channel count %d\n", scan-&gt;channel_count);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd.len += le16_to_cpu(scan-&gt;tx_cmd.len) +</div><div class='del'>-	    scan-&gt;channel_count * sizeof(struct iwl_scan_channel);</div><div class='del'>-	cmd.data = scan;</div><div class='del'>-	scan-&gt;len = cpu_to_le16(cmd.len);</div><div class='del'>-</div><div class='del'>-	set_bit(STATUS_SCAN_HW, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_send_cmd_sync(priv, &amp;cmd);</div><div class='del'>-	if (ret)</div><div class='del'>-		clear_bit(STATUS_SCAN_HW, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_manage_ibss_station(struct iwl_priv *priv,</div><div class='del'>-			       struct ieee80211_vif *vif, bool add)</div><div class='del'>-{</div><div class='del'>-	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='del'>-</div><div class='del'>-	if (add)</div><div class='del'>-		return iwl4965_add_bssid_station(priv, vif_priv-&gt;ctx,</div><div class='del'>-						vif-&gt;bss_conf.bssid,</div><div class='del'>-						&amp;vif_priv-&gt;ibss_bssid_sta_id);</div><div class='del'>-	return iwl_legacy_remove_station(priv, vif_priv-&gt;ibss_bssid_sta_id,</div><div class='del'>-				  vif-&gt;bss_conf.bssid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl4965_free_tfds_in_queue(struct iwl_priv *priv,</div><div class='del'>-			    int sta_id, int tid, int freed)</div><div class='del'>-{</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;sta_lock);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;stations[sta_id].tid[tid].tfds_in_queue &gt;= freed)</div><div class='del'>-		priv-&gt;stations[sta_id].tid[tid].tfds_in_queue -= freed;</div><div class='del'>-	else {</div><div class='del'>-		IWL_DEBUG_TX(priv, "free more than tfds_in_queue (%u:%d)\n",</div><div class='del'>-			priv-&gt;stations[sta_id].tid[tid].tfds_in_queue,</div><div class='del'>-			freed);</div><div class='del'>-		priv-&gt;stations[sta_id].tid[tid].tfds_in_queue = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define IWL_TX_QUEUE_MSK	0xfffff</div><div class='del'>-</div><div class='del'>-static bool iwl4965_is_single_rx_stream(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	return priv-&gt;current_ht_config.smps == IEEE80211_SMPS_STATIC ||</div><div class='del'>-	       priv-&gt;current_ht_config.single_chain_sufficient;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define IWL_NUM_RX_CHAINS_MULTIPLE	3</div><div class='del'>-#define IWL_NUM_RX_CHAINS_SINGLE	2</div><div class='del'>-#define IWL_NUM_IDLE_CHAINS_DUAL	2</div><div class='del'>-#define IWL_NUM_IDLE_CHAINS_SINGLE	1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Determine how many receiver/antenna chains to use.</div><div class='del'>- *</div><div class='del'>- * More provides better reception via diversity.  Fewer saves power</div><div class='del'>- * at the expense of throughput, but only when not in powersave to</div><div class='del'>- * start with.</div><div class='del'>- *</div><div class='del'>- * MIMO (dual stream) requires at least 2, but works better with 3.</div><div class='del'>- * This does not determine *which* chains to use, just how many.</div><div class='del'>- */</div><div class='del'>-static int iwl4965_get_active_rx_chain_count(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	/* # of Rx chains to use when expecting MIMO. */</div><div class='del'>-	if (iwl4965_is_single_rx_stream(priv))</div><div class='del'>-		return IWL_NUM_RX_CHAINS_SINGLE;</div><div class='del'>-	else</div><div class='del'>-		return IWL_NUM_RX_CHAINS_MULTIPLE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * When we are in power saving mode, unless device support spatial</div><div class='del'>- * multiplexing power save, use the active count for rx chain count.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-iwl4965_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt)</div><div class='del'>-{</div><div class='del'>-	/* # Rx chains when idling, depending on SMPS mode */</div><div class='del'>-	switch (priv-&gt;current_ht_config.smps) {</div><div class='del'>-	case IEEE80211_SMPS_STATIC:</div><div class='del'>-	case IEEE80211_SMPS_DYNAMIC:</div><div class='del'>-		return IWL_NUM_IDLE_CHAINS_SINGLE;</div><div class='del'>-	case IEEE80211_SMPS_OFF:</div><div class='del'>-		return active_cnt;</div><div class='del'>-	default:</div><div class='del'>-		WARN(1, "invalid SMPS mode %d",</div><div class='del'>-		     priv-&gt;current_ht_config.smps);</div><div class='del'>-		return active_cnt;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* up to 4 chains */</div><div class='del'>-static u8 iwl4965_count_chain_bitmap(u32 chain_bitmap)</div><div class='del'>-{</div><div class='del'>-	u8 res;</div><div class='del'>-	res = (chain_bitmap &amp; BIT(0)) &gt;&gt; 0;</div><div class='del'>-	res += (chain_bitmap &amp; BIT(1)) &gt;&gt; 1;</div><div class='del'>-	res += (chain_bitmap &amp; BIT(2)) &gt;&gt; 2;</div><div class='del'>-	res += (chain_bitmap &amp; BIT(3)) &gt;&gt; 3;</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_set_rxon_chain - Set up Rx chain usage in "staging" RXON image</div><div class='del'>- *</div><div class='del'>- * Selects how many and which Rx receivers/antennas/chains to use.</div><div class='del'>- * This should not be used for scan command ... it puts data in wrong place.</div><div class='del'>- */</div><div class='del'>-void iwl4965_set_rxon_chain(struct iwl_priv *priv, struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	bool is_single = iwl4965_is_single_rx_stream(priv);</div><div class='del'>-	bool is_cam = !test_bit(STATUS_POWER_PMI, &amp;priv-&gt;status);</div><div class='del'>-	u8 idle_rx_cnt, active_rx_cnt, valid_rx_cnt;</div><div class='del'>-	u32 active_chains;</div><div class='del'>-	u16 rx_chain;</div><div class='del'>-</div><div class='del'>-	/* Tell uCode which antennas are actually connected.</div><div class='del'>-	 * Before first association, we assume all antennas are connected.</div><div class='del'>-	 * Just after first association, iwl4965_chain_noise_calibration()</div><div class='del'>-	 *    checks which antennas actually *are* connected. */</div><div class='del'>-	if (priv-&gt;chain_noise_data.active_chains)</div><div class='del'>-		active_chains = priv-&gt;chain_noise_data.active_chains;</div><div class='del'>-	else</div><div class='del'>-		active_chains = priv-&gt;hw_params.valid_rx_ant;</div><div class='del'>-</div><div class='del'>-	rx_chain = active_chains &lt;&lt; RXON_RX_CHAIN_VALID_POS;</div><div class='del'>-</div><div class='del'>-	/* How many receivers should we use? */</div><div class='del'>-	active_rx_cnt = iwl4965_get_active_rx_chain_count(priv);</div><div class='del'>-	idle_rx_cnt = iwl4965_get_idle_rx_chain_count(priv, active_rx_cnt);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* correct rx chain count according hw settings</div><div class='del'>-	 * and chain noise calibration</div><div class='del'>-	 */</div><div class='del'>-	valid_rx_cnt = iwl4965_count_chain_bitmap(active_chains);</div><div class='del'>-	if (valid_rx_cnt &lt; active_rx_cnt)</div><div class='del'>-		active_rx_cnt = valid_rx_cnt;</div><div class='del'>-</div><div class='del'>-	if (valid_rx_cnt &lt; idle_rx_cnt)</div><div class='del'>-		idle_rx_cnt = valid_rx_cnt;</div><div class='del'>-</div><div class='del'>-	rx_chain |= active_rx_cnt &lt;&lt; RXON_RX_CHAIN_MIMO_CNT_POS;</div><div class='del'>-	rx_chain |= idle_rx_cnt  &lt;&lt; RXON_RX_CHAIN_CNT_POS;</div><div class='del'>-</div><div class='del'>-	ctx-&gt;staging.rx_chain = cpu_to_le16(rx_chain);</div><div class='del'>-</div><div class='del'>-	if (!is_single &amp;&amp; (active_rx_cnt &gt;= IWL_NUM_RX_CHAINS_SINGLE) &amp;&amp; is_cam)</div><div class='del'>-		ctx-&gt;staging.rx_chain |= RXON_RX_CHAIN_MIMO_FORCE_MSK;</div><div class='del'>-	else</div><div class='del'>-		ctx-&gt;staging.rx_chain &amp;= ~RXON_RX_CHAIN_MIMO_FORCE_MSK;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_ASSOC(priv, "rx_chain=0x%X active=%d idle=%d\n",</div><div class='del'>-			ctx-&gt;staging.rx_chain,</div><div class='del'>-			active_rx_cnt, idle_rx_cnt);</div><div class='del'>-</div><div class='del'>-	WARN_ON(active_rx_cnt == 0 || idle_rx_cnt == 0 ||</div><div class='del'>-		active_rx_cnt &lt; idle_rx_cnt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 iwl4965_toggle_tx_ant(struct iwl_priv *priv, u8 ant, u8 valid)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	u8 ind = ant;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; RATE_ANT_NUM - 1; i++) {</div><div class='del'>-		ind = (ind + 1) &lt; RATE_ANT_NUM ?  ind + 1 : 0;</div><div class='del'>-		if (valid &amp; BIT(ind))</div><div class='del'>-			return ind;</div><div class='del'>-	}</div><div class='del'>-	return ant;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *iwl4965_get_fh_string(int cmd)</div><div class='del'>-{</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	IWL_CMD(FH_RSCSR_CHNL0_STTS_WPTR_REG);</div><div class='del'>-	IWL_CMD(FH_RSCSR_CHNL0_RBDCB_BASE_REG);</div><div class='del'>-	IWL_CMD(FH_RSCSR_CHNL0_WPTR);</div><div class='del'>-	IWL_CMD(FH_MEM_RCSR_CHNL0_CONFIG_REG);</div><div class='del'>-	IWL_CMD(FH_MEM_RSSR_SHARED_CTRL_REG);</div><div class='del'>-	IWL_CMD(FH_MEM_RSSR_RX_STATUS_REG);</div><div class='del'>-	IWL_CMD(FH_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV);</div><div class='del'>-	IWL_CMD(FH_TSSR_TX_STATUS_REG);</div><div class='del'>-	IWL_CMD(FH_TSSR_TX_ERROR_REG);</div><div class='del'>-	default:</div><div class='del'>-		return "UNKNOWN";</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_dump_fh(struct iwl_priv *priv, char **buf, bool display)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	int pos = 0;</div><div class='del'>-	size_t bufsz = 0;</div><div class='del'>-#endif</div><div class='del'>-	static const u32 fh_tbl[] = {</div><div class='del'>-		FH_RSCSR_CHNL0_STTS_WPTR_REG,</div><div class='del'>-		FH_RSCSR_CHNL0_RBDCB_BASE_REG,</div><div class='del'>-		FH_RSCSR_CHNL0_WPTR,</div><div class='del'>-		FH_MEM_RCSR_CHNL0_CONFIG_REG,</div><div class='del'>-		FH_MEM_RSSR_SHARED_CTRL_REG,</div><div class='del'>-		FH_MEM_RSSR_RX_STATUS_REG,</div><div class='del'>-		FH_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV,</div><div class='del'>-		FH_TSSR_TX_STATUS_REG,</div><div class='del'>-		FH_TSSR_TX_ERROR_REG</div><div class='del'>-	};</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	if (display) {</div><div class='del'>-		bufsz = ARRAY_SIZE(fh_tbl) * 48 + 40;</div><div class='del'>-		*buf = kmalloc(bufsz, GFP_KERNEL);</div><div class='del'>-		if (!*buf)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		pos += scnprintf(*buf + pos, bufsz - pos,</div><div class='del'>-				"FH register values:\n");</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(fh_tbl); i++) {</div><div class='del'>-			pos += scnprintf(*buf + pos, bufsz - pos,</div><div class='del'>-				"  %34s: 0X%08x\n",</div><div class='del'>-				iwl4965_get_fh_string(fh_tbl[i]),</div><div class='del'>-				iwl_legacy_read_direct32(priv, fh_tbl[i]));</div><div class='del'>-		}</div><div class='del'>-		return pos;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	IWL_ERR(priv, "FH register values:\n");</div><div class='del'>-	for (i = 0; i &lt;  ARRAY_SIZE(fh_tbl); i++) {</div><div class='del'>-		IWL_ERR(priv, "  %34s: 0X%08x\n",</div><div class='del'>-			iwl4965_get_fh_string(fh_tbl[i]),</div><div class='del'>-			iwl_legacy_read_direct32(priv, fh_tbl[i]));</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-rs.c b/drivers/net/wireless/iwlegacy/iwl-4965-rs.c<br/>deleted file mode 100644<br/>index 57ebe214e68c..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-4965-rs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-rs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2871 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2005 - 2011 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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</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/init.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-sta.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-4965.h"</div><div class='del'>-</div><div class='del'>-#define IWL4965_RS_NAME "iwl-4965-rs"</div><div class='del'>-</div><div class='del'>-#define NUM_TRY_BEFORE_ANT_TOGGLE 1</div><div class='del'>-#define IWL_NUMBER_TRY      1</div><div class='del'>-#define IWL_HT_NUMBER_TRY   3</div><div class='del'>-</div><div class='del'>-#define IWL_RATE_MAX_WINDOW		62	/* # tx in history window */</div><div class='del'>-#define IWL_RATE_MIN_FAILURE_TH		6	/* min failures to calc tpt */</div><div class='del'>-#define IWL_RATE_MIN_SUCCESS_TH		8	/* min successes to calc tpt */</div><div class='del'>-</div><div class='del'>-/* max allowed rate miss before sync LQ cmd */</div><div class='del'>-#define IWL_MISSED_RATE_MAX		15</div><div class='del'>-/* max time to accum history 2 seconds */</div><div class='del'>-#define IWL_RATE_SCALE_FLUSH_INTVL   (3*HZ)</div><div class='del'>-</div><div class='del'>-static u8 rs_ht_to_legacy[] = {</div><div class='del'>-	IWL_RATE_6M_INDEX, IWL_RATE_6M_INDEX,</div><div class='del'>-	IWL_RATE_6M_INDEX, IWL_RATE_6M_INDEX,</div><div class='del'>-	IWL_RATE_6M_INDEX,</div><div class='del'>-	IWL_RATE_6M_INDEX, IWL_RATE_9M_INDEX,</div><div class='del'>-	IWL_RATE_12M_INDEX, IWL_RATE_18M_INDEX,</div><div class='del'>-	IWL_RATE_24M_INDEX, IWL_RATE_36M_INDEX,</div><div class='del'>-	IWL_RATE_48M_INDEX, IWL_RATE_54M_INDEX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u8 ant_toggle_lookup[] = {</div><div class='del'>-	/*ANT_NONE -&gt; */ ANT_NONE,</div><div class='del'>-	/*ANT_A    -&gt; */ ANT_B,</div><div class='del'>-	/*ANT_B    -&gt; */ ANT_C,</div><div class='del'>-	/*ANT_AB   -&gt; */ ANT_BC,</div><div class='del'>-	/*ANT_C    -&gt; */ ANT_A,</div><div class='del'>-	/*ANT_AC   -&gt; */ ANT_AB,</div><div class='del'>-	/*ANT_BC   -&gt; */ ANT_AC,</div><div class='del'>-	/*ANT_ABC  -&gt; */ ANT_ABC,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IWL_DECLARE_RATE_INFO(r, s, ip, in, rp, rn, pp, np)    \</div><div class='del'>-	[IWL_RATE_##r##M_INDEX] = { IWL_RATE_##r##M_PLCP,      \</div><div class='del'>-				    IWL_RATE_SISO_##s##M_PLCP, \</div><div class='del'>-				    IWL_RATE_MIMO2_##s##M_PLCP,\</div><div class='del'>-				    IWL_RATE_##r##M_IEEE,      \</div><div class='del'>-				    IWL_RATE_##ip##M_INDEX,    \</div><div class='del'>-				    IWL_RATE_##in##M_INDEX,    \</div><div class='del'>-				    IWL_RATE_##rp##M_INDEX,    \</div><div class='del'>-				    IWL_RATE_##rn##M_INDEX,    \</div><div class='del'>-				    IWL_RATE_##pp##M_INDEX,    \</div><div class='del'>-				    IWL_RATE_##np##M_INDEX }</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Parameter order:</div><div class='del'>- *   rate, ht rate, prev rate, next rate, prev tgg rate, next tgg rate</div><div class='del'>- *</div><div class='del'>- * If there isn't a valid next or previous rate then INV is used which</div><div class='del'>- * maps to IWL_RATE_INVALID</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-const struct iwl_rate_info iwlegacy_rates[IWL_RATE_COUNT] = {</div><div class='del'>-	IWL_DECLARE_RATE_INFO(1, INV, INV, 2, INV, 2, INV, 2),    /*  1mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(2, INV, 1, 5, 1, 5, 1, 5),          /*  2mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(5, INV, 2, 6, 2, 11, 2, 11),        /*5.5mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(11, INV, 9, 12, 9, 12, 5, 18),      /* 11mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(6, 6, 5, 9, 5, 11, 5, 11),        /*  6mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(9, 6, 6, 11, 6, 11, 5, 11),       /*  9mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(12, 12, 11, 18, 11, 18, 11, 18),   /* 12mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(18, 18, 12, 24, 12, 24, 11, 24),   /* 18mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(24, 24, 18, 36, 18, 36, 18, 36),   /* 24mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(36, 36, 24, 48, 24, 48, 24, 48),   /* 36mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(48, 48, 36, 54, 36, 54, 36, 54),   /* 48mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(54, 54, 48, INV, 48, INV, 48, INV),/* 54mbps */</div><div class='del'>-	IWL_DECLARE_RATE_INFO(60, 60, 48, INV, 48, INV, 48, INV),/* 60mbps */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int iwl4965_hwrate_to_plcp_idx(u32 rate_n_flags)</div><div class='del'>-{</div><div class='del'>-	int idx = 0;</div><div class='del'>-</div><div class='del'>-	/* HT rate format */</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_HT_MSK) {</div><div class='del'>-		idx = (rate_n_flags &amp; 0xff);</div><div class='del'>-</div><div class='del'>-		if (idx &gt;= IWL_RATE_MIMO2_6M_PLCP)</div><div class='del'>-			idx = idx - IWL_RATE_MIMO2_6M_PLCP;</div><div class='del'>-</div><div class='del'>-		idx += IWL_FIRST_OFDM_RATE;</div><div class='del'>-		/* skip 9M not supported in ht*/</div><div class='del'>-		if (idx &gt;= IWL_RATE_9M_INDEX)</div><div class='del'>-			idx += 1;</div><div class='del'>-		if ((idx &gt;= IWL_FIRST_OFDM_RATE) &amp;&amp; (idx &lt;= IWL_LAST_OFDM_RATE))</div><div class='del'>-			return idx;</div><div class='del'>-</div><div class='del'>-	/* legacy rate format, search for match in table */</div><div class='del'>-	} else {</div><div class='del'>-		for (idx = 0; idx &lt; ARRAY_SIZE(iwlegacy_rates); idx++)</div><div class='del'>-			if (iwlegacy_rates[idx].plcp == (rate_n_flags &amp; 0xFF))</div><div class='del'>-				return idx;</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 void iwl4965_rs_rate_scale_perform(struct iwl_priv *priv,</div><div class='del'>-				   struct sk_buff *skb,</div><div class='del'>-				   struct ieee80211_sta *sta,</div><div class='del'>-				   struct iwl_lq_sta *lq_sta);</div><div class='del'>-static void iwl4965_rs_fill_link_cmd(struct iwl_priv *priv,</div><div class='del'>-			     struct iwl_lq_sta *lq_sta, u32 rate_n_flags);</div><div class='del'>-static void iwl4965_rs_stay_in_table(struct iwl_lq_sta *lq_sta,</div><div class='del'>-					bool force_search);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='del'>-static void iwl4965_rs_dbgfs_set_mcs(struct iwl_lq_sta *lq_sta,</div><div class='del'>-			     u32 *rate_n_flags, int index);</div><div class='del'>-#else</div><div class='del'>-static void iwl4965_rs_dbgfs_set_mcs(struct iwl_lq_sta *lq_sta,</div><div class='del'>-			     u32 *rate_n_flags, int index)</div><div class='del'>-{}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * The following tables contain the expected throughput metrics for all rates</div><div class='del'>- *</div><div class='del'>- *	1, 2, 5.5, 11, 6, 9, 12, 18, 24, 36, 48, 54, 60 MBits</div><div class='del'>- *</div><div class='del'>- * where invalid entries are zeros.</div><div class='del'>- *</div><div class='del'>- * CCK rates are only valid in legacy table and will only be used in G</div><div class='del'>- * (2.4 GHz) band.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static s32 expected_tpt_legacy[IWL_RATE_COUNT] = {</div><div class='del'>-	7, 13, 35, 58, 40, 57, 72, 98, 121, 154, 177, 186, 0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static s32 expected_tpt_siso20MHz[4][IWL_RATE_COUNT] = {</div><div class='del'>-	{0, 0, 0, 0, 42, 0,  76, 102, 124, 158, 183, 193, 202}, /* Norm */</div><div class='del'>-	{0, 0, 0, 0, 46, 0,  82, 110, 132, 167, 192, 202, 210}, /* SGI */</div><div class='del'>-	{0, 0, 0, 0, 48, 0,  93, 135, 176, 251, 319, 351, 381}, /* AGG */</div><div class='del'>-	{0, 0, 0, 0, 53, 0, 102, 149, 193, 275, 348, 381, 413}, /* AGG+SGI */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static s32 expected_tpt_siso40MHz[4][IWL_RATE_COUNT] = {</div><div class='del'>-	{0, 0, 0, 0,  77, 0, 127, 160, 184, 220, 242, 250, 257}, /* Norm */</div><div class='del'>-	{0, 0, 0, 0,  83, 0, 135, 169, 193, 229, 250, 257, 264}, /* SGI */</div><div class='del'>-	{0, 0, 0, 0,  96, 0, 182, 259, 328, 451, 553, 598, 640}, /* AGG */</div><div class='del'>-	{0, 0, 0, 0, 106, 0, 199, 282, 357, 487, 593, 640, 683}, /* AGG+SGI */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static s32 expected_tpt_mimo2_20MHz[4][IWL_RATE_COUNT] = {</div><div class='del'>-	{0, 0, 0, 0,  74, 0, 123, 155, 179, 213, 235, 243, 250}, /* Norm */</div><div class='del'>-	{0, 0, 0, 0,  81, 0, 131, 164, 187, 221, 242, 250, 256}, /* SGI */</div><div class='del'>-	{0, 0, 0, 0,  92, 0, 175, 250, 317, 436, 534, 578, 619}, /* AGG */</div><div class='del'>-	{0, 0, 0, 0, 102, 0, 192, 273, 344, 470, 573, 619, 660}, /* AGG+SGI*/</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static s32 expected_tpt_mimo2_40MHz[4][IWL_RATE_COUNT] = {</div><div class='del'>-	{0, 0, 0, 0, 123, 0, 182, 214, 235, 264, 279, 285, 289}, /* Norm */</div><div class='del'>-	{0, 0, 0, 0, 131, 0, 191, 222, 242, 270, 284, 289, 293}, /* SGI */</div><div class='del'>-	{0, 0, 0, 0, 180, 0, 327, 446, 545, 708, 828, 878, 922}, /* AGG */</div><div class='del'>-	{0, 0, 0, 0, 197, 0, 355, 481, 584, 752, 872, 922, 966}, /* AGG+SGI */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* mbps, mcs */</div><div class='del'>-static const struct iwl_rate_mcs_info iwl_rate_mcs[IWL_RATE_COUNT] = {</div><div class='del'>-	{  "1", "BPSK DSSS"},</div><div class='del'>-	{  "2", "QPSK DSSS"},</div><div class='del'>-	{"5.5", "BPSK CCK"},</div><div class='del'>-	{ "11", "QPSK CCK"},</div><div class='del'>-	{  "6", "BPSK 1/2"},</div><div class='del'>-	{  "9", "BPSK 1/2"},</div><div class='del'>-	{ "12", "QPSK 1/2"},</div><div class='del'>-	{ "18", "QPSK 3/4"},</div><div class='del'>-	{ "24", "16QAM 1/2"},</div><div class='del'>-	{ "36", "16QAM 3/4"},</div><div class='del'>-	{ "48", "64QAM 2/3"},</div><div class='del'>-	{ "54", "64QAM 3/4"},</div><div class='del'>-	{ "60", "64QAM 5/6"},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define MCS_INDEX_PER_STREAM	(8)</div><div class='del'>-</div><div class='del'>-static inline u8 iwl4965_rs_extract_rate(u32 rate_n_flags)</div><div class='del'>-{</div><div class='del'>-	return (u8)(rate_n_flags &amp; 0xFF);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-iwl4965_rs_rate_scale_clear_window(struct iwl_rate_scale_data *window)</div><div class='del'>-{</div><div class='del'>-	window-&gt;data = 0;</div><div class='del'>-	window-&gt;success_counter = 0;</div><div class='del'>-	window-&gt;success_ratio = IWL_INVALID_VALUE;</div><div class='del'>-	window-&gt;counter = 0;</div><div class='del'>-	window-&gt;average_tpt = IWL_INVALID_VALUE;</div><div class='del'>-	window-&gt;stamp = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 iwl4965_rs_is_valid_ant(u8 valid_antenna, u8 ant_type)</div><div class='del'>-{</div><div class='del'>-	return (ant_type &amp; valid_antenna) == ant_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	removes the old data from the statistics. All data that is older than</div><div class='del'>- *	TID_MAX_TIME_DIFF, will be deleted.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-iwl4965_rs_tl_rm_old_stats(struct iwl_traffic_load *tl, u32 curr_time)</div><div class='del'>-{</div><div class='del'>-	/* The oldest age we want to keep */</div><div class='del'>-	u32 oldest_time = curr_time - TID_MAX_TIME_DIFF;</div><div class='del'>-</div><div class='del'>-	while (tl-&gt;queue_count &amp;&amp;</div><div class='del'>-	       (tl-&gt;time_stamp &lt; oldest_time)) {</div><div class='del'>-		tl-&gt;total -= tl-&gt;packet_count[tl-&gt;head];</div><div class='del'>-		tl-&gt;packet_count[tl-&gt;head] = 0;</div><div class='del'>-		tl-&gt;time_stamp += TID_QUEUE_CELL_SPACING;</div><div class='del'>-		tl-&gt;queue_count--;</div><div class='del'>-		tl-&gt;head++;</div><div class='del'>-		if (tl-&gt;head &gt;= TID_QUEUE_MAX_SIZE)</div><div class='del'>-			tl-&gt;head = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	increment traffic load value for tid and also remove</div><div class='del'>- *	any old values if passed the certain time period</div><div class='del'>- */</div><div class='del'>-static u8 iwl4965_rs_tl_add_packet(struct iwl_lq_sta *lq_data,</div><div class='del'>-			   struct ieee80211_hdr *hdr)</div><div class='del'>-{</div><div class='del'>-	u32 curr_time = jiffies_to_msecs(jiffies);</div><div class='del'>-	u32 time_diff;</div><div class='del'>-	s32 index;</div><div class='del'>-	struct iwl_traffic_load *tl = NULL;</div><div class='del'>-	u8 tid;</div><div class='del'>-</div><div class='del'>-	if (ieee80211_is_data_qos(hdr-&gt;frame_control)) {</div><div class='del'>-		u8 *qc = ieee80211_get_qos_ctl(hdr);</div><div class='del'>-		tid = qc[0] &amp; 0xf;</div><div class='del'>-	} else</div><div class='del'>-		return MAX_TID_COUNT;</div><div class='del'>-</div><div class='del'>-	if (unlikely(tid &gt;= TID_MAX_LOAD_COUNT))</div><div class='del'>-		return MAX_TID_COUNT;</div><div class='del'>-</div><div class='del'>-	tl = &amp;lq_data-&gt;load[tid];</div><div class='del'>-</div><div class='del'>-	curr_time -= curr_time % TID_ROUND_VALUE;</div><div class='del'>-</div><div class='del'>-	/* Happens only for the first packet. Initialize the data */</div><div class='del'>-	if (!(tl-&gt;queue_count)) {</div><div class='del'>-		tl-&gt;total = 1;</div><div class='del'>-		tl-&gt;time_stamp = curr_time;</div><div class='del'>-		tl-&gt;queue_count = 1;</div><div class='del'>-		tl-&gt;head = 0;</div><div class='del'>-		tl-&gt;packet_count[0] = 1;</div><div class='del'>-		return MAX_TID_COUNT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	time_diff = TIME_WRAP_AROUND(tl-&gt;time_stamp, curr_time);</div><div class='del'>-	index = time_diff / TID_QUEUE_CELL_SPACING;</div><div class='del'>-</div><div class='del'>-	/* The history is too long: remove data that is older than */</div><div class='del'>-	/* TID_MAX_TIME_DIFF */</div><div class='del'>-	if (index &gt;= TID_QUEUE_MAX_SIZE)</div><div class='del'>-		iwl4965_rs_tl_rm_old_stats(tl, curr_time);</div><div class='del'>-</div><div class='del'>-	index = (tl-&gt;head + index) % TID_QUEUE_MAX_SIZE;</div><div class='del'>-	tl-&gt;packet_count[index] = tl-&gt;packet_count[index] + 1;</div><div class='del'>-	tl-&gt;total = tl-&gt;total + 1;</div><div class='del'>-</div><div class='del'>-	if ((index + 1) &gt; tl-&gt;queue_count)</div><div class='del'>-		tl-&gt;queue_count = index + 1;</div><div class='del'>-</div><div class='del'>-	return tid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-	get the traffic load value for tid</div><div class='del'>-*/</div><div class='del'>-static u32 iwl4965_rs_tl_get_load(struct iwl_lq_sta *lq_data, u8 tid)</div><div class='del'>-{</div><div class='del'>-	u32 curr_time = jiffies_to_msecs(jiffies);</div><div class='del'>-	u32 time_diff;</div><div class='del'>-	s32 index;</div><div class='del'>-	struct iwl_traffic_load *tl = NULL;</div><div class='del'>-</div><div class='del'>-	if (tid &gt;= TID_MAX_LOAD_COUNT)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	tl = &amp;(lq_data-&gt;load[tid]);</div><div class='del'>-</div><div class='del'>-	curr_time -= curr_time % TID_ROUND_VALUE;</div><div class='del'>-</div><div class='del'>-	if (!(tl-&gt;queue_count))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	time_diff = TIME_WRAP_AROUND(tl-&gt;time_stamp, curr_time);</div><div class='del'>-	index = time_diff / TID_QUEUE_CELL_SPACING;</div><div class='del'>-</div><div class='del'>-	/* The history is too long: remove data that is older than */</div><div class='del'>-	/* TID_MAX_TIME_DIFF */</div><div class='del'>-	if (index &gt;= TID_QUEUE_MAX_SIZE)</div><div class='del'>-		iwl4965_rs_tl_rm_old_stats(tl, curr_time);</div><div class='del'>-</div><div class='del'>-	return tl-&gt;total;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl4965_rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,</div><div class='del'>-				      struct iwl_lq_sta *lq_data, u8 tid,</div><div class='del'>-				      struct ieee80211_sta *sta)</div><div class='del'>-{</div><div class='del'>-	int ret = -EAGAIN;</div><div class='del'>-	u32 load;</div><div class='del'>-</div><div class='del'>-	load = iwl4965_rs_tl_get_load(lq_data, tid);</div><div class='del'>-</div><div class='del'>-	if (load &gt; IWL_AGG_LOAD_THRESHOLD) {</div><div class='del'>-		IWL_DEBUG_HT(priv, "Starting Tx agg: STA: %pM tid: %d\n",</div><div class='del'>-				sta-&gt;addr, tid);</div><div class='del'>-		ret = ieee80211_start_tx_ba_session(sta, tid, 5000);</div><div class='del'>-		if (ret == -EAGAIN) {</div><div class='del'>-			/*</div><div class='del'>-			 * driver and mac80211 is out of sync</div><div class='del'>-			 * this might be cause by reloading firmware</div><div class='del'>-			 * stop the tx ba session here</div><div class='del'>-			 */</div><div class='del'>-			IWL_ERR(priv, "Fail start Tx agg on tid: %d\n",</div><div class='del'>-				tid);</div><div class='del'>-			ieee80211_stop_tx_ba_session(sta, tid);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		IWL_ERR(priv, "Aggregation not enabled for tid %d "</div><div class='del'>-			"because load = %u\n", tid, load);</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_rs_tl_turn_on_agg(struct iwl_priv *priv, u8 tid,</div><div class='del'>-			      struct iwl_lq_sta *lq_data,</div><div class='del'>-			      struct ieee80211_sta *sta)</div><div class='del'>-{</div><div class='del'>-	if (tid &lt; TID_MAX_LOAD_COUNT)</div><div class='del'>-		iwl4965_rs_tl_turn_on_agg_for_tid(priv, lq_data, tid, sta);</div><div class='del'>-	else</div><div class='del'>-		IWL_ERR(priv, "tid exceeds max load count: %d/%d\n",</div><div class='del'>-			tid, TID_MAX_LOAD_COUNT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int iwl4965_get_iwl4965_num_of_ant_from_rate(u32 rate_n_flags)</div><div class='del'>-{</div><div class='del'>-	return !!(rate_n_flags &amp; RATE_MCS_ANT_A_MSK) +</div><div class='del'>-	       !!(rate_n_flags &amp; RATE_MCS_ANT_B_MSK) +</div><div class='del'>-	       !!(rate_n_flags &amp; RATE_MCS_ANT_C_MSK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Static function to get the expected throughput from an iwl_scale_tbl_info</div><div class='del'>- * that wraps a NULL pointer check</div><div class='del'>- */</div><div class='del'>-static s32</div><div class='del'>-iwl4965_get_expected_tpt(struct iwl_scale_tbl_info *tbl, int rs_index)</div><div class='del'>-{</div><div class='del'>-	if (tbl-&gt;expected_tpt)</div><div class='del'>-		return tbl-&gt;expected_tpt[rs_index];</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_rs_collect_tx_data - Update the success/failure sliding window</div><div class='del'>- *</div><div class='del'>- * We keep a sliding window of the last 62 packets transmitted</div><div class='del'>- * at this rate.  window-&gt;data contains the bitmask of successful</div><div class='del'>- * packets.</div><div class='del'>- */</div><div class='del'>-static int iwl4965_rs_collect_tx_data(struct iwl_scale_tbl_info *tbl,</div><div class='del'>-			      int scale_index, int attempts, int successes)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rate_scale_data *window = NULL;</div><div class='del'>-	static const u64 mask = (((u64)1) &lt;&lt; (IWL_RATE_MAX_WINDOW - 1));</div><div class='del'>-	s32 fail_count, tpt;</div><div class='del'>-</div><div class='del'>-	if (scale_index &lt; 0 || scale_index &gt;= IWL_RATE_COUNT)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Select window for current tx bit rate */</div><div class='del'>-	window = &amp;(tbl-&gt;win[scale_index]);</div><div class='del'>-</div><div class='del'>-	/* Get expected throughput */</div><div class='del'>-	tpt = iwl4965_get_expected_tpt(tbl, scale_index);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Keep track of only the latest 62 tx frame attempts in this rate's</div><div class='del'>-	 * history window; anything older isn't really relevant any more.</div><div class='del'>-	 * If we have filled up the sliding window, drop the oldest attempt;</div><div class='del'>-	 * if the oldest attempt (highest bit in bitmap) shows "success",</div><div class='del'>-	 * subtract "1" from the success counter (this is the main reason</div><div class='del'>-	 * we keep these bitmaps!).</div><div class='del'>-	 */</div><div class='del'>-	while (attempts &gt; 0) {</div><div class='del'>-		if (window-&gt;counter &gt;= IWL_RATE_MAX_WINDOW) {</div><div class='del'>-</div><div class='del'>-			/* remove earliest */</div><div class='del'>-			window-&gt;counter = IWL_RATE_MAX_WINDOW - 1;</div><div class='del'>-</div><div class='del'>-			if (window-&gt;data &amp; mask) {</div><div class='del'>-				window-&gt;data &amp;= ~mask;</div><div class='del'>-				window-&gt;success_counter--;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Increment frames-attempted counter */</div><div class='del'>-		window-&gt;counter++;</div><div class='del'>-</div><div class='del'>-		/* Shift bitmap by one frame to throw away oldest history */</div><div class='del'>-		window-&gt;data &lt;&lt;= 1;</div><div class='del'>-</div><div class='del'>-		/* Mark the most recent #successes attempts as successful */</div><div class='del'>-		if (successes &gt; 0) {</div><div class='del'>-			window-&gt;success_counter++;</div><div class='del'>-			window-&gt;data |= 0x1;</div><div class='del'>-			successes--;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		attempts--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate current success ratio, avoid divide-by-0! */</div><div class='del'>-	if (window-&gt;counter &gt; 0)</div><div class='del'>-		window-&gt;success_ratio = 128 * (100 * window-&gt;success_counter)</div><div class='del'>-					/ window-&gt;counter;</div><div class='del'>-	else</div><div class='del'>-		window-&gt;success_ratio = IWL_INVALID_VALUE;</div><div class='del'>-</div><div class='del'>-	fail_count = window-&gt;counter - window-&gt;success_counter;</div><div class='del'>-</div><div class='del'>-	/* Calculate average throughput, if we have enough history. */</div><div class='del'>-	if ((fail_count &gt;= IWL_RATE_MIN_FAILURE_TH) ||</div><div class='del'>-	    (window-&gt;success_counter &gt;= IWL_RATE_MIN_SUCCESS_TH))</div><div class='del'>-		window-&gt;average_tpt = (window-&gt;success_ratio * tpt + 64) / 128;</div><div class='del'>-	else</div><div class='del'>-		window-&gt;average_tpt = IWL_INVALID_VALUE;</div><div class='del'>-</div><div class='del'>-	/* Tag this window as having been updated */</div><div class='del'>-	window-&gt;stamp = jiffies;</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'>- * Fill uCode API rate_n_flags field, based on "search" or "active" table.</div><div class='del'>- */</div><div class='del'>-static u32 iwl4965_rate_n_flags_from_tbl(struct iwl_priv *priv,</div><div class='del'>-				 struct iwl_scale_tbl_info *tbl,</div><div class='del'>-				 int index, u8 use_green)</div><div class='del'>-{</div><div class='del'>-	u32 rate_n_flags = 0;</div><div class='del'>-</div><div class='del'>-	if (is_legacy(tbl-&gt;lq_type)) {</div><div class='del'>-		rate_n_flags = iwlegacy_rates[index].plcp;</div><div class='del'>-		if (index &gt;= IWL_FIRST_CCK_RATE &amp;&amp; index &lt;= IWL_LAST_CCK_RATE)</div><div class='del'>-			rate_n_flags |= RATE_MCS_CCK_MSK;</div><div class='del'>-</div><div class='del'>-	} else if (is_Ht(tbl-&gt;lq_type)) {</div><div class='del'>-		if (index &gt; IWL_LAST_OFDM_RATE) {</div><div class='del'>-			IWL_ERR(priv, "Invalid HT rate index %d\n", index);</div><div class='del'>-			index = IWL_LAST_OFDM_RATE;</div><div class='del'>-		}</div><div class='del'>-		rate_n_flags = RATE_MCS_HT_MSK;</div><div class='del'>-</div><div class='del'>-		if (is_siso(tbl-&gt;lq_type))</div><div class='del'>-			rate_n_flags |=	iwlegacy_rates[index].plcp_siso;</div><div class='del'>-		else</div><div class='del'>-			rate_n_flags |=	iwlegacy_rates[index].plcp_mimo2;</div><div class='del'>-	} else {</div><div class='del'>-		IWL_ERR(priv, "Invalid tbl-&gt;lq_type %d\n", tbl-&gt;lq_type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rate_n_flags |= ((tbl-&gt;ant_type &lt;&lt; RATE_MCS_ANT_POS) &amp;</div><div class='del'>-						     RATE_MCS_ANT_ABC_MSK);</div><div class='del'>-</div><div class='del'>-	if (is_Ht(tbl-&gt;lq_type)) {</div><div class='del'>-		if (tbl-&gt;is_ht40) {</div><div class='del'>-			if (tbl-&gt;is_dup)</div><div class='del'>-				rate_n_flags |= RATE_MCS_DUP_MSK;</div><div class='del'>-			else</div><div class='del'>-				rate_n_flags |= RATE_MCS_HT40_MSK;</div><div class='del'>-		}</div><div class='del'>-		if (tbl-&gt;is_SGI)</div><div class='del'>-			rate_n_flags |= RATE_MCS_SGI_MSK;</div><div class='del'>-</div><div class='del'>-		if (use_green) {</div><div class='del'>-			rate_n_flags |= RATE_MCS_GF_MSK;</div><div class='del'>-			if (is_siso(tbl-&gt;lq_type) &amp;&amp; tbl-&gt;is_SGI) {</div><div class='del'>-				rate_n_flags &amp;= ~RATE_MCS_SGI_MSK;</div><div class='del'>-				IWL_ERR(priv, "GF was set with SGI:SISO\n");</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return rate_n_flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Interpret uCode API's rate_n_flags format,</div><div class='del'>- * fill "search" or "active" tx mode table.</div><div class='del'>- */</div><div class='del'>-static int iwl4965_rs_get_tbl_info_from_mcs(const u32 rate_n_flags,</div><div class='del'>-				    enum ieee80211_band band,</div><div class='del'>-				    struct iwl_scale_tbl_info *tbl,</div><div class='del'>-				    int *rate_idx)</div><div class='del'>-{</div><div class='del'>-	u32 ant_msk = (rate_n_flags &amp; RATE_MCS_ANT_ABC_MSK);</div><div class='del'>-	u8 iwl4965_num_of_ant = iwl4965_get_iwl4965_num_of_ant_from_rate(rate_n_flags);</div><div class='del'>-	u8 mcs;</div><div class='del'>-</div><div class='del'>-	memset(tbl, 0, sizeof(struct iwl_scale_tbl_info));</div><div class='del'>-	*rate_idx = iwl4965_hwrate_to_plcp_idx(rate_n_flags);</div><div class='del'>-</div><div class='del'>-	if (*rate_idx  == IWL_RATE_INVALID) {</div><div class='del'>-		*rate_idx = -1;</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	tbl-&gt;is_SGI = 0;	/* default legacy setup */</div><div class='del'>-	tbl-&gt;is_ht40 = 0;</div><div class='del'>-	tbl-&gt;is_dup = 0;</div><div class='del'>-	tbl-&gt;ant_type = (ant_msk &gt;&gt; RATE_MCS_ANT_POS);</div><div class='del'>-	tbl-&gt;lq_type = LQ_NONE;</div><div class='del'>-	tbl-&gt;max_search = IWL_MAX_SEARCH;</div><div class='del'>-</div><div class='del'>-	/* legacy rate format */</div><div class='del'>-	if (!(rate_n_flags &amp; RATE_MCS_HT_MSK)) {</div><div class='del'>-		if (iwl4965_num_of_ant == 1) {</div><div class='del'>-			if (band == IEEE80211_BAND_5GHZ)</div><div class='del'>-				tbl-&gt;lq_type = LQ_A;</div><div class='del'>-			else</div><div class='del'>-				tbl-&gt;lq_type = LQ_G;</div><div class='del'>-		}</div><div class='del'>-	/* HT rate format */</div><div class='del'>-	} else {</div><div class='del'>-		if (rate_n_flags &amp; RATE_MCS_SGI_MSK)</div><div class='del'>-			tbl-&gt;is_SGI = 1;</div><div class='del'>-</div><div class='del'>-		if ((rate_n_flags &amp; RATE_MCS_HT40_MSK) ||</div><div class='del'>-		    (rate_n_flags &amp; RATE_MCS_DUP_MSK))</div><div class='del'>-			tbl-&gt;is_ht40 = 1;</div><div class='del'>-</div><div class='del'>-		if (rate_n_flags &amp; RATE_MCS_DUP_MSK)</div><div class='del'>-			tbl-&gt;is_dup = 1;</div><div class='del'>-</div><div class='del'>-		mcs = iwl4965_rs_extract_rate(rate_n_flags);</div><div class='del'>-</div><div class='del'>-		/* SISO */</div><div class='del'>-		if (mcs &lt;= IWL_RATE_SISO_60M_PLCP) {</div><div class='del'>-			if (iwl4965_num_of_ant == 1)</div><div class='del'>-				tbl-&gt;lq_type = LQ_SISO; /*else NONE*/</div><div class='del'>-		/* MIMO2 */</div><div class='del'>-		} else {</div><div class='del'>-			if (iwl4965_num_of_ant == 2)</div><div class='del'>-				tbl-&gt;lq_type = LQ_MIMO2;</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'>-/* switch to another antenna/antennas and return 1 */</div><div class='del'>-/* if no other valid antenna found, return 0 */</div><div class='del'>-static int iwl4965_rs_toggle_antenna(u32 valid_ant, u32 *rate_n_flags,</div><div class='del'>-			     struct iwl_scale_tbl_info *tbl)</div><div class='del'>-{</div><div class='del'>-	u8 new_ant_type;</div><div class='del'>-</div><div class='del'>-	if (!tbl-&gt;ant_type || tbl-&gt;ant_type &gt; ANT_ABC)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!iwl4965_rs_is_valid_ant(valid_ant, tbl-&gt;ant_type))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	new_ant_type = ant_toggle_lookup[tbl-&gt;ant_type];</div><div class='del'>-</div><div class='del'>-	while ((new_ant_type != tbl-&gt;ant_type) &amp;&amp;</div><div class='del'>-	       !iwl4965_rs_is_valid_ant(valid_ant, new_ant_type))</div><div class='del'>-		new_ant_type = ant_toggle_lookup[new_ant_type];</div><div class='del'>-</div><div class='del'>-	if (new_ant_type == tbl-&gt;ant_type)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	tbl-&gt;ant_type = new_ant_type;</div><div class='del'>-	*rate_n_flags &amp;= ~RATE_MCS_ANT_ABC_MSK;</div><div class='del'>-	*rate_n_flags |= new_ant_type &lt;&lt; RATE_MCS_ANT_POS;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Green-field mode is valid if the station supports it and</div><div class='del'>- * there are no non-GF stations present in the BSS.</div><div class='del'>- */</div><div class='del'>-static bool iwl4965_rs_use_green(struct ieee80211_sta *sta)</div><div class='del'>-{</div><div class='del'>-	struct iwl_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='del'>-	struct iwl_rxon_context *ctx = sta_priv-&gt;common.ctx;</div><div class='del'>-</div><div class='del'>-	return (sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_GRN_FLD) &amp;&amp;</div><div class='del'>-		!(ctx-&gt;ht.non_gf_sta_present);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_rs_get_supported_rates - get the available rates</div><div class='del'>- *</div><div class='del'>- * if management frame or broadcast frame only return</div><div class='del'>- * basic available rates.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static u16 iwl4965_rs_get_supported_rates(struct iwl_lq_sta *lq_sta,</div><div class='del'>-				  struct ieee80211_hdr *hdr,</div><div class='del'>-				  enum iwl_table_type rate_type)</div><div class='del'>-{</div><div class='del'>-	if (is_legacy(rate_type)) {</div><div class='del'>-		return lq_sta-&gt;active_legacy_rate;</div><div class='del'>-	} else {</div><div class='del'>-		if (is_siso(rate_type))</div><div class='del'>-			return lq_sta-&gt;active_siso_rate;</div><div class='del'>-		else</div><div class='del'>-			return lq_sta-&gt;active_mimo2_rate;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u16</div><div class='del'>-iwl4965_rs_get_adjacent_rate(struct iwl_priv *priv, u8 index, u16 rate_mask,</div><div class='del'>-				int rate_type)</div><div class='del'>-{</div><div class='del'>-	u8 high = IWL_RATE_INVALID;</div><div class='del'>-	u8 low = IWL_RATE_INVALID;</div><div class='del'>-</div><div class='del'>-	/* 802.11A or ht walks to the next literal adjacent rate in</div><div class='del'>-	 * the rate table */</div><div class='del'>-	if (is_a_band(rate_type) || !is_legacy(rate_type)) {</div><div class='del'>-		int i;</div><div class='del'>-		u32 mask;</div><div class='del'>-</div><div class='del'>-		/* Find the previous rate that is in the rate mask */</div><div class='del'>-		i = index - 1;</div><div class='del'>-		for (mask = (1 &lt;&lt; i); i &gt;= 0; i--, mask &gt;&gt;= 1) {</div><div class='del'>-			if (rate_mask &amp; mask) {</div><div class='del'>-				low = i;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Find the next rate that is in the rate mask */</div><div class='del'>-		i = index + 1;</div><div class='del'>-		for (mask = (1 &lt;&lt; i); i &lt; IWL_RATE_COUNT; i++, mask &lt;&lt;= 1) {</div><div class='del'>-			if (rate_mask &amp; mask) {</div><div class='del'>-				high = i;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return (high &lt;&lt; 8) | low;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	low = index;</div><div class='del'>-	while (low != IWL_RATE_INVALID) {</div><div class='del'>-		low = iwlegacy_rates[low].prev_rs;</div><div class='del'>-		if (low == IWL_RATE_INVALID)</div><div class='del'>-			break;</div><div class='del'>-		if (rate_mask &amp; (1 &lt;&lt; low))</div><div class='del'>-			break;</div><div class='del'>-		IWL_DEBUG_RATE(priv, "Skipping masked lower rate: %d\n", low);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	high = index;</div><div class='del'>-	while (high != IWL_RATE_INVALID) {</div><div class='del'>-		high = iwlegacy_rates[high].next_rs;</div><div class='del'>-		if (high == IWL_RATE_INVALID)</div><div class='del'>-			break;</div><div class='del'>-		if (rate_mask &amp; (1 &lt;&lt; high))</div><div class='del'>-			break;</div><div class='del'>-		IWL_DEBUG_RATE(priv, "Skipping masked higher rate: %d\n", high);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (high &lt;&lt; 8) | low;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 iwl4965_rs_get_lower_rate(struct iwl_lq_sta *lq_sta,</div><div class='del'>-			     struct iwl_scale_tbl_info *tbl,</div><div class='del'>-			     u8 scale_index, u8 ht_possible)</div><div class='del'>-{</div><div class='del'>-	s32 low;</div><div class='del'>-	u16 rate_mask;</div><div class='del'>-	u16 high_low;</div><div class='del'>-	u8 switch_to_legacy = 0;</div><div class='del'>-	u8 is_green = lq_sta-&gt;is_green;</div><div class='del'>-	struct iwl_priv *priv = lq_sta-&gt;drv;</div><div class='del'>-</div><div class='del'>-	/* check if we need to switch from HT to legacy rates.</div><div class='del'>-	 * assumption is that mandatory rates (1Mbps or 6Mbps)</div><div class='del'>-	 * are always supported (spec demand) */</div><div class='del'>-	if (!is_legacy(tbl-&gt;lq_type) &amp;&amp; (!ht_possible || !scale_index)) {</div><div class='del'>-		switch_to_legacy = 1;</div><div class='del'>-		scale_index = rs_ht_to_legacy[scale_index];</div><div class='del'>-		if (lq_sta-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='del'>-			tbl-&gt;lq_type = LQ_A;</div><div class='del'>-		else</div><div class='del'>-			tbl-&gt;lq_type = LQ_G;</div><div class='del'>-</div><div class='del'>-		if (iwl4965_num_of_ant(tbl-&gt;ant_type) &gt; 1)</div><div class='del'>-			tbl-&gt;ant_type =</div><div class='del'>-				iwl4965_first_antenna(priv-&gt;hw_params.valid_tx_ant);</div><div class='del'>-</div><div class='del'>-		tbl-&gt;is_ht40 = 0;</div><div class='del'>-		tbl-&gt;is_SGI = 0;</div><div class='del'>-		tbl-&gt;max_search = IWL_MAX_SEARCH;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rate_mask = iwl4965_rs_get_supported_rates(lq_sta, NULL, tbl-&gt;lq_type);</div><div class='del'>-</div><div class='del'>-	/* Mask with station rate restriction */</div><div class='del'>-	if (is_legacy(tbl-&gt;lq_type)) {</div><div class='del'>-		/* supp_rates has no CCK bits in A mode */</div><div class='del'>-		if (lq_sta-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='del'>-			rate_mask  = (u16)(rate_mask &amp;</div><div class='del'>-			   (lq_sta-&gt;supp_rates &lt;&lt; IWL_FIRST_OFDM_RATE));</div><div class='del'>-		else</div><div class='del'>-			rate_mask = (u16)(rate_mask &amp; lq_sta-&gt;supp_rates);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we switched from HT to legacy, check current rate */</div><div class='del'>-	if (switch_to_legacy &amp;&amp; (rate_mask &amp; (1 &lt;&lt; scale_index))) {</div><div class='del'>-		low = scale_index;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	high_low = iwl4965_rs_get_adjacent_rate(lq_sta-&gt;drv,</div><div class='del'>-					scale_index, rate_mask,</div><div class='del'>-					tbl-&gt;lq_type);</div><div class='del'>-	low = high_low &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	if (low == IWL_RATE_INVALID)</div><div class='del'>-		low = scale_index;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return iwl4965_rate_n_flags_from_tbl(lq_sta-&gt;drv, tbl, low, is_green);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Simple function to compare two rate scale table types</div><div class='del'>- */</div><div class='del'>-static bool iwl4965_table_type_matches(struct iwl_scale_tbl_info *a,</div><div class='del'>-			       struct iwl_scale_tbl_info *b)</div><div class='del'>-{</div><div class='del'>-	return (a-&gt;lq_type == b-&gt;lq_type) &amp;&amp; (a-&gt;ant_type == b-&gt;ant_type) &amp;&amp;</div><div class='del'>-		(a-&gt;is_SGI == b-&gt;is_SGI);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * mac80211 sends us Tx status</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-iwl4965_rs_tx_status(void *priv_r, struct ieee80211_supported_band *sband,</div><div class='del'>-			 struct ieee80211_sta *sta, void *priv_sta,</div><div class='del'>-			 struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int legacy_success;</div><div class='del'>-	int retries;</div><div class='del'>-	int rs_index, mac_index, i;</div><div class='del'>-	struct iwl_lq_sta *lq_sta = priv_sta;</div><div class='del'>-	struct iwl_link_quality_cmd *table;</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='del'>-	struct iwl_priv *priv = (struct iwl_priv *)priv_r;</div><div class='del'>-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	enum mac80211_rate_control_flags mac_flags;</div><div class='del'>-	u32 tx_rate;</div><div class='del'>-	struct iwl_scale_tbl_info tbl_type;</div><div class='del'>-	struct iwl_scale_tbl_info *curr_tbl, *other_tbl, *tmp_tbl;</div><div class='del'>-	struct iwl_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='del'>-	struct iwl_rxon_context *ctx = sta_priv-&gt;common.ctx;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE_LIMIT(priv,</div><div class='del'>-		"get frame ack response, update rate scale window\n");</div><div class='del'>-</div><div class='del'>-	/* Treat uninitialized rate scaling data same as non-existing. */</div><div class='del'>-	if (!lq_sta) {</div><div class='del'>-		IWL_DEBUG_RATE(priv, "Station rate scaling not created yet.\n");</div><div class='del'>-		return;</div><div class='del'>-	} else if (!lq_sta-&gt;drv) {</div><div class='del'>-		IWL_DEBUG_RATE(priv, "Rate scaling not initialized yet.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ieee80211_is_data(hdr-&gt;frame_control) ||</div><div class='del'>-	    info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* This packet was aggregated but doesn't carry status info */</div><div class='del'>-	if ((info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU) &amp;&amp;</div><div class='del'>-	    !(info-&gt;flags &amp; IEEE80211_TX_STAT_AMPDU))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Ignore this Tx frame response if its initial rate doesn't match</div><div class='del'>-	 * that of latest Link Quality command.  There may be stragglers</div><div class='del'>-	 * from a previous Link Quality command, but we're no longer interested</div><div class='del'>-	 * in those; they're either from the "active" mode while we're trying</div><div class='del'>-	 * to check "search" mode, or a prior "search" mode after we've moved</div><div class='del'>-	 * to a new "search" mode (which might become the new "active" mode).</div><div class='del'>-	 */</div><div class='del'>-	table = &amp;lq_sta-&gt;lq;</div><div class='del'>-	tx_rate = le32_to_cpu(table-&gt;rs_table[0].rate_n_flags);</div><div class='del'>-	iwl4965_rs_get_tbl_info_from_mcs(tx_rate,</div><div class='del'>-			 priv-&gt;band, &amp;tbl_type, &amp;rs_index);</div><div class='del'>-	if (priv-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='del'>-		rs_index -= IWL_FIRST_OFDM_RATE;</div><div class='del'>-	mac_flags = info-&gt;status.rates[0].flags;</div><div class='del'>-	mac_index = info-&gt;status.rates[0].idx;</div><div class='del'>-	/* For HT packets, map MCS to PLCP */</div><div class='del'>-	if (mac_flags &amp; IEEE80211_TX_RC_MCS) {</div><div class='del'>-		mac_index &amp;= RATE_MCS_CODE_MSK;	/* Remove # of streams */</div><div class='del'>-		if (mac_index &gt;= (IWL_RATE_9M_INDEX - IWL_FIRST_OFDM_RATE))</div><div class='del'>-			mac_index++;</div><div class='del'>-		/*</div><div class='del'>-		 * mac80211 HT index is always zero-indexed; we need to move</div><div class='del'>-		 * HT OFDM rates after CCK rates in 2.4 GHz band</div><div class='del'>-		 */</div><div class='del'>-		if (priv-&gt;band == IEEE80211_BAND_2GHZ)</div><div class='del'>-			mac_index += IWL_FIRST_OFDM_RATE;</div><div class='del'>-	}</div><div class='del'>-	/* Here we actually compare this rate to the latest LQ command */</div><div class='del'>-	if ((mac_index &lt; 0) ||</div><div class='del'>-	    (tbl_type.is_SGI !=</div><div class='del'>-			!!(mac_flags &amp; IEEE80211_TX_RC_SHORT_GI)) ||</div><div class='del'>-	    (tbl_type.is_ht40 !=</div><div class='del'>-			!!(mac_flags &amp; IEEE80211_TX_RC_40_MHZ_WIDTH)) ||</div><div class='del'>-	    (tbl_type.is_dup !=</div><div class='del'>-			!!(mac_flags &amp; IEEE80211_TX_RC_DUP_DATA)) ||</div><div class='del'>-	    (tbl_type.ant_type != info-&gt;antenna_sel_tx) ||</div><div class='del'>-	    (!!(tx_rate &amp; RATE_MCS_HT_MSK) !=</div><div class='del'>-			!!(mac_flags &amp; IEEE80211_TX_RC_MCS)) ||</div><div class='del'>-	    (!!(tx_rate &amp; RATE_MCS_GF_MSK) !=</div><div class='del'>-			!!(mac_flags &amp; IEEE80211_TX_RC_GREEN_FIELD)) ||</div><div class='del'>-	    (rs_index != mac_index)) {</div><div class='del'>-		IWL_DEBUG_RATE(priv,</div><div class='del'>-		"initial rate %d does not match %d (0x%x)\n",</div><div class='del'>-			 mac_index, rs_index, tx_rate);</div><div class='del'>-		/*</div><div class='del'>-		 * Since rates mis-match, the last LQ command may have failed.</div><div class='del'>-		 * After IWL_MISSED_RATE_MAX mis-matches, resync the uCode with</div><div class='del'>-		 * ... driver.</div><div class='del'>-		 */</div><div class='del'>-		lq_sta-&gt;missed_rate_counter++;</div><div class='del'>-		if (lq_sta-&gt;missed_rate_counter &gt; IWL_MISSED_RATE_MAX) {</div><div class='del'>-			lq_sta-&gt;missed_rate_counter = 0;</div><div class='del'>-			iwl_legacy_send_lq_cmd(priv, ctx, &amp;lq_sta-&gt;lq,</div><div class='del'>-							CMD_ASYNC, false);</div><div class='del'>-		}</div><div class='del'>-		/* Regardless, ignore this status info for outdated rate */</div><div class='del'>-		return;</div><div class='del'>-	} else</div><div class='del'>-		/* Rate did match, so reset the missed_rate_counter */</div><div class='del'>-		lq_sta-&gt;missed_rate_counter = 0;</div><div class='del'>-</div><div class='del'>-	/* Figure out if rate scale algorithm is in active or search table */</div><div class='del'>-	if (iwl4965_table_type_matches(&amp;tbl_type,</div><div class='del'>-				&amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]))) {</div><div class='del'>-		curr_tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='del'>-		other_tbl = &amp;(lq_sta-&gt;lq_info[1 - lq_sta-&gt;active_tbl]);</div><div class='del'>-	} else if (iwl4965_table_type_matches(&amp;tbl_type,</div><div class='del'>-				&amp;lq_sta-&gt;lq_info[1 - lq_sta-&gt;active_tbl])) {</div><div class='del'>-		curr_tbl = &amp;(lq_sta-&gt;lq_info[1 - lq_sta-&gt;active_tbl]);</div><div class='del'>-		other_tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='del'>-	} else {</div><div class='del'>-		IWL_DEBUG_RATE(priv,</div><div class='del'>-			"Neither active nor search matches tx rate\n");</div><div class='del'>-		tmp_tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='del'>-		IWL_DEBUG_RATE(priv, "active- lq:%x, ant:%x, SGI:%d\n",</div><div class='del'>-			tmp_tbl-&gt;lq_type, tmp_tbl-&gt;ant_type, tmp_tbl-&gt;is_SGI);</div><div class='del'>-		tmp_tbl = &amp;(lq_sta-&gt;lq_info[1 - lq_sta-&gt;active_tbl]);</div><div class='del'>-		IWL_DEBUG_RATE(priv, "search- lq:%x, ant:%x, SGI:%d\n",</div><div class='del'>-			tmp_tbl-&gt;lq_type, tmp_tbl-&gt;ant_type, tmp_tbl-&gt;is_SGI);</div><div class='del'>-		IWL_DEBUG_RATE(priv, "actual- lq:%x, ant:%x, SGI:%d\n",</div><div class='del'>-			tbl_type.lq_type, tbl_type.ant_type, tbl_type.is_SGI);</div><div class='del'>-		/*</div><div class='del'>-		 * no matching table found, let's by-pass the data collection</div><div class='del'>-		 * and continue to perform rate scale to find the rate table</div><div class='del'>-		 */</div><div class='del'>-		iwl4965_rs_stay_in_table(lq_sta, true);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Updating the frame history depends on whether packets were</div><div class='del'>-	 * aggregated.</div><div class='del'>-	 *</div><div class='del'>-	 * For aggregation, all packets were transmitted at the same rate, the</div><div class='del'>-	 * first index into rate scale table.</div><div class='del'>-	 */</div><div class='del'>-	if (info-&gt;flags &amp; IEEE80211_TX_STAT_AMPDU) {</div><div class='del'>-		tx_rate = le32_to_cpu(table-&gt;rs_table[0].rate_n_flags);</div><div class='del'>-		iwl4965_rs_get_tbl_info_from_mcs(tx_rate, priv-&gt;band, &amp;tbl_type,</div><div class='del'>-				&amp;rs_index);</div><div class='del'>-		iwl4965_rs_collect_tx_data(curr_tbl, rs_index,</div><div class='del'>-				   info-&gt;status.ampdu_len,</div><div class='del'>-				   info-&gt;status.ampdu_ack_len);</div><div class='del'>-</div><div class='del'>-		/* Update success/fail counts if not searching for new mode */</div><div class='del'>-		if (lq_sta-&gt;stay_in_tbl) {</div><div class='del'>-			lq_sta-&gt;total_success += info-&gt;status.ampdu_ack_len;</div><div class='del'>-			lq_sta-&gt;total_failed += (info-&gt;status.ampdu_len -</div><div class='del'>-					info-&gt;status.ampdu_ack_len);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-	/*</div><div class='del'>-	 * For legacy, update frame history with for each Tx retry.</div><div class='del'>-	 */</div><div class='del'>-		retries = info-&gt;status.rates[0].count - 1;</div><div class='del'>-		/* HW doesn't send more than 15 retries */</div><div class='del'>-		retries = min(retries, 15);</div><div class='del'>-</div><div class='del'>-		/* The last transmission may have been successful */</div><div class='del'>-		legacy_success = !!(info-&gt;flags &amp; IEEE80211_TX_STAT_ACK);</div><div class='del'>-		/* Collect data for each rate used during failed TX attempts */</div><div class='del'>-		for (i = 0; i &lt;= retries; ++i) {</div><div class='del'>-			tx_rate = le32_to_cpu(table-&gt;rs_table[i].rate_n_flags);</div><div class='del'>-			iwl4965_rs_get_tbl_info_from_mcs(tx_rate, priv-&gt;band,</div><div class='del'>-					&amp;tbl_type, &amp;rs_index);</div><div class='del'>-			/*</div><div class='del'>-			 * Only collect stats if retried rate is in the same RS</div><div class='del'>-			 * table as active/search.</div><div class='del'>-			 */</div><div class='del'>-			if (iwl4965_table_type_matches(&amp;tbl_type, curr_tbl))</div><div class='del'>-				tmp_tbl = curr_tbl;</div><div class='del'>-			else if (iwl4965_table_type_matches(&amp;tbl_type,</div><div class='del'>-								 other_tbl))</div><div class='del'>-				tmp_tbl = other_tbl;</div><div class='del'>-			else</div><div class='del'>-				continue;</div><div class='del'>-			iwl4965_rs_collect_tx_data(tmp_tbl, rs_index, 1,</div><div class='del'>-					   i &lt; retries ? 0 : legacy_success);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Update success/fail counts if not searching for new mode */</div><div class='del'>-		if (lq_sta-&gt;stay_in_tbl) {</div><div class='del'>-			lq_sta-&gt;total_success += legacy_success;</div><div class='del'>-			lq_sta-&gt;total_failed += retries + (1 - legacy_success);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* The last TX rate is cached in lq_sta; it's set in if/else above */</div><div class='del'>-	lq_sta-&gt;last_rate_n_flags = tx_rate;</div><div class='del'>-done:</div><div class='del'>-	/* See if there's a better rate or modulation mode to try. */</div><div class='del'>-	if (sta &amp;&amp; sta-&gt;supp_rates[sband-&gt;band])</div><div class='del'>-		iwl4965_rs_rate_scale_perform(priv, skb, sta, lq_sta);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Begin a period of staying with a selected modulation mode.</div><div class='del'>- * Set "stay_in_tbl" flag to prevent any mode switches.</div><div class='del'>- * Set frame tx success limits according to legacy vs. high-throughput,</div><div class='del'>- * and reset overall (spanning all rates) tx success history statistics.</div><div class='del'>- * These control how long we stay using same modulation mode before</div><div class='del'>- * searching for a new mode.</div><div class='del'>- */</div><div class='del'>-static void iwl4965_rs_set_stay_in_table(struct iwl_priv *priv, u8 is_legacy,</div><div class='del'>-				 struct iwl_lq_sta *lq_sta)</div><div class='del'>-{</div><div class='del'>-	IWL_DEBUG_RATE(priv, "we are staying in the same table\n");</div><div class='del'>-	lq_sta-&gt;stay_in_tbl = 1;	/* only place this gets set */</div><div class='del'>-	if (is_legacy) {</div><div class='del'>-		lq_sta-&gt;table_count_limit = IWL_LEGACY_TABLE_COUNT;</div><div class='del'>-		lq_sta-&gt;max_failure_limit = IWL_LEGACY_FAILURE_LIMIT;</div><div class='del'>-		lq_sta-&gt;max_success_limit = IWL_LEGACY_SUCCESS_LIMIT;</div><div class='del'>-	} else {</div><div class='del'>-		lq_sta-&gt;table_count_limit = IWL_NONE_LEGACY_TABLE_COUNT;</div><div class='del'>-		lq_sta-&gt;max_failure_limit = IWL_NONE_LEGACY_FAILURE_LIMIT;</div><div class='del'>-		lq_sta-&gt;max_success_limit = IWL_NONE_LEGACY_SUCCESS_LIMIT;</div><div class='del'>-	}</div><div class='del'>-	lq_sta-&gt;table_count = 0;</div><div class='del'>-	lq_sta-&gt;total_failed = 0;</div><div class='del'>-	lq_sta-&gt;total_success = 0;</div><div class='del'>-	lq_sta-&gt;flush_timer = jiffies;</div><div class='del'>-	lq_sta-&gt;action_counter = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Find correct throughput table for given mode of modulation</div><div class='del'>- */</div><div class='del'>-static void iwl4965_rs_set_expected_tpt_table(struct iwl_lq_sta *lq_sta,</div><div class='del'>-				      struct iwl_scale_tbl_info *tbl)</div><div class='del'>-{</div><div class='del'>-	/* Used to choose among HT tables */</div><div class='del'>-	s32 (*ht_tbl_pointer)[IWL_RATE_COUNT];</div><div class='del'>-</div><div class='del'>-	/* Check for invalid LQ type */</div><div class='del'>-	if (WARN_ON_ONCE(!is_legacy(tbl-&gt;lq_type) &amp;&amp; !is_Ht(tbl-&gt;lq_type))) {</div><div class='del'>-		tbl-&gt;expected_tpt = expected_tpt_legacy;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Legacy rates have only one table */</div><div class='del'>-	if (is_legacy(tbl-&gt;lq_type)) {</div><div class='del'>-		tbl-&gt;expected_tpt = expected_tpt_legacy;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Choose among many HT tables depending on number of streams</div><div class='del'>-	 * (SISO/MIMO2), channel width (20/40), SGI, and aggregation</div><div class='del'>-	 * status */</div><div class='del'>-	if (is_siso(tbl-&gt;lq_type) &amp;&amp; (!tbl-&gt;is_ht40 || lq_sta-&gt;is_dup))</div><div class='del'>-		ht_tbl_pointer = expected_tpt_siso20MHz;</div><div class='del'>-	else if (is_siso(tbl-&gt;lq_type))</div><div class='del'>-		ht_tbl_pointer = expected_tpt_siso40MHz;</div><div class='del'>-	else if (is_mimo2(tbl-&gt;lq_type) &amp;&amp; (!tbl-&gt;is_ht40 || lq_sta-&gt;is_dup))</div><div class='del'>-		ht_tbl_pointer = expected_tpt_mimo2_20MHz;</div><div class='del'>-	else /* if (is_mimo2(tbl-&gt;lq_type)) &lt;-- must be true */</div><div class='del'>-		ht_tbl_pointer = expected_tpt_mimo2_40MHz;</div><div class='del'>-</div><div class='del'>-	if (!tbl-&gt;is_SGI &amp;&amp; !lq_sta-&gt;is_agg)		/* Normal */</div><div class='del'>-		tbl-&gt;expected_tpt = ht_tbl_pointer[0];</div><div class='del'>-	else if (tbl-&gt;is_SGI &amp;&amp; !lq_sta-&gt;is_agg)	/* SGI */</div><div class='del'>-		tbl-&gt;expected_tpt = ht_tbl_pointer[1];</div><div class='del'>-	else if (!tbl-&gt;is_SGI &amp;&amp; lq_sta-&gt;is_agg)	/* AGG */</div><div class='del'>-		tbl-&gt;expected_tpt = ht_tbl_pointer[2];</div><div class='del'>-	else						/* AGG+SGI */</div><div class='del'>-		tbl-&gt;expected_tpt = ht_tbl_pointer[3];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Find starting rate for new "search" high-throughput mode of modulation.</div><div class='del'>- * Goal is to find lowest expected rate (under perfect conditions) that is</div><div class='del'>- * above the current measured throughput of "active" mode, to give new mode</div><div class='del'>- * a fair chance to prove itself without too many challenges.</div><div class='del'>- *</div><div class='del'>- * This gets called when transitioning to more aggressive modulation</div><div class='del'>- * (i.e. legacy to SISO or MIMO, or SISO to MIMO), as well as less aggressive</div><div class='del'>- * (i.e. MIMO to SISO).  When moving to MIMO, bit rate will typically need</div><div class='del'>- * to decrease to match "active" throughput.  When moving from MIMO to SISO,</div><div class='del'>- * bit rate will typically need to increase, but not if performance was bad.</div><div class='del'>- */</div><div class='del'>-static s32 iwl4965_rs_get_best_rate(struct iwl_priv *priv,</div><div class='del'>-			    struct iwl_lq_sta *lq_sta,</div><div class='del'>-			    struct iwl_scale_tbl_info *tbl,	/* "search" */</div><div class='del'>-			    u16 rate_mask, s8 index)</div><div class='del'>-{</div><div class='del'>-	/* "active" values */</div><div class='del'>-	struct iwl_scale_tbl_info *active_tbl =</div><div class='del'>-	    &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='del'>-	s32 active_sr = active_tbl-&gt;win[index].success_ratio;</div><div class='del'>-	s32 active_tpt = active_tbl-&gt;expected_tpt[index];</div><div class='del'>-</div><div class='del'>-	/* expected "search" throughput */</div><div class='del'>-	s32 *tpt_tbl = tbl-&gt;expected_tpt;</div><div class='del'>-</div><div class='del'>-	s32 new_rate, high, low, start_hi;</div><div class='del'>-	u16 high_low;</div><div class='del'>-	s8 rate = index;</div><div class='del'>-</div><div class='del'>-	new_rate = high = low = start_hi = IWL_RATE_INVALID;</div><div class='del'>-</div><div class='del'>-	for (; ;) {</div><div class='del'>-		high_low = iwl4965_rs_get_adjacent_rate(priv, rate, rate_mask,</div><div class='del'>-						tbl-&gt;lq_type);</div><div class='del'>-</div><div class='del'>-		low = high_low &amp; 0xff;</div><div class='del'>-		high = (high_low &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Lower the "search" bit rate, to give new "search" mode</div><div class='del'>-		 * approximately the same throughput as "active" if:</div><div class='del'>-		 *</div><div class='del'>-		 * 1) "Active" mode has been working modestly well (but not</div><div class='del'>-		 *    great), and expected "search" throughput (under perfect</div><div class='del'>-		 *    conditions) at candidate rate is above the actual</div><div class='del'>-		 *    measured "active" throughput (but less than expected</div><div class='del'>-		 *    "active" throughput under perfect conditions).</div><div class='del'>-		 * OR</div><div class='del'>-		 * 2) "Active" mode has been working perfectly or very well</div><div class='del'>-		 *    and expected "search" throughput (under perfect</div><div class='del'>-		 *    conditions) at candidate rate is above expected</div><div class='del'>-		 *    "active" throughput (under perfect conditions).</div><div class='del'>-		 */</div><div class='del'>-		if ((((100 * tpt_tbl[rate]) &gt; lq_sta-&gt;last_tpt) &amp;&amp;</div><div class='del'>-		     ((active_sr &gt; IWL_RATE_DECREASE_TH) &amp;&amp;</div><div class='del'>-		      (active_sr &lt;= IWL_RATE_HIGH_TH) &amp;&amp;</div><div class='del'>-		      (tpt_tbl[rate] &lt;= active_tpt))) ||</div><div class='del'>-		    ((active_sr &gt;= IWL_RATE_SCALE_SWITCH) &amp;&amp;</div><div class='del'>-		     (tpt_tbl[rate] &gt; active_tpt))) {</div><div class='del'>-</div><div class='del'>-			/* (2nd or later pass)</div><div class='del'>-			 * If we've already tried to raise the rate, and are</div><div class='del'>-			 * now trying to lower it, use the higher rate. */</div><div class='del'>-			if (start_hi != IWL_RATE_INVALID) {</div><div class='del'>-				new_rate = start_hi;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			new_rate = rate;</div><div class='del'>-</div><div class='del'>-			/* Loop again with lower rate */</div><div class='del'>-			if (low != IWL_RATE_INVALID)</div><div class='del'>-				rate = low;</div><div class='del'>-</div><div class='del'>-			/* Lower rate not available, use the original */</div><div class='del'>-			else</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-		/* Else try to raise the "search" rate to match "active" */</div><div class='del'>-		} else {</div><div class='del'>-			/* (2nd or later pass)</div><div class='del'>-			 * If we've already tried to lower the rate, and are</div><div class='del'>-			 * now trying to raise it, use the lower rate. */</div><div class='del'>-			if (new_rate != IWL_RATE_INVALID)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			/* Loop again with higher rate */</div><div class='del'>-			else if (high != IWL_RATE_INVALID) {</div><div class='del'>-				start_hi = high;</div><div class='del'>-				rate = high;</div><div class='del'>-</div><div class='del'>-			/* Higher rate not available, use the original */</div><div class='del'>-			} else {</div><div class='del'>-				new_rate = rate;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return new_rate;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set up search table for MIMO2</div><div class='del'>- */</div><div class='del'>-static int iwl4965_rs_switch_to_mimo2(struct iwl_priv *priv,</div><div class='del'>-			     struct iwl_lq_sta *lq_sta,</div><div class='del'>-			     struct ieee80211_conf *conf,</div><div class='del'>-			     struct ieee80211_sta *sta,</div><div class='del'>-			     struct iwl_scale_tbl_info *tbl, int index)</div><div class='del'>-{</div><div class='del'>-	u16 rate_mask;</div><div class='del'>-	s32 rate;</div><div class='del'>-	s8 is_green = lq_sta-&gt;is_green;</div><div class='del'>-	struct iwl_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='del'>-	struct iwl_rxon_context *ctx = sta_priv-&gt;common.ctx;</div><div class='del'>-</div><div class='del'>-	if (!conf_is_ht(conf) || !sta-&gt;ht_cap.ht_supported)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (((sta-&gt;ht_cap.cap &amp; IEEE80211_HT_CAP_SM_PS) &gt;&gt; 2)</div><div class='del'>-						== WLAN_HT_CAP_SM_PS_STATIC)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	/* Need both Tx chains/antennas to support MIMO */</div><div class='del'>-	if (priv-&gt;hw_params.tx_chains_num &lt; 2)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "LQ: try to switch to MIMO2\n");</div><div class='del'>-</div><div class='del'>-	tbl-&gt;lq_type = LQ_MIMO2;</div><div class='del'>-	tbl-&gt;is_dup = lq_sta-&gt;is_dup;</div><div class='del'>-	tbl-&gt;action = 0;</div><div class='del'>-	tbl-&gt;max_search = IWL_MAX_SEARCH;</div><div class='del'>-	rate_mask = lq_sta-&gt;active_mimo2_rate;</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_is_ht40_tx_allowed(priv, ctx, &amp;sta-&gt;ht_cap))</div><div class='del'>-		tbl-&gt;is_ht40 = 1;</div><div class='del'>-	else</div><div class='del'>-		tbl-&gt;is_ht40 = 0;</div><div class='del'>-</div><div class='del'>-	iwl4965_rs_set_expected_tpt_table(lq_sta, tbl);</div><div class='del'>-</div><div class='del'>-	rate = iwl4965_rs_get_best_rate(priv, lq_sta, tbl, rate_mask, index);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "LQ: MIMO2 best rate %d mask %X\n",</div><div class='del'>-				rate, rate_mask);</div><div class='del'>-	if ((rate == IWL_RATE_INVALID) || !((1 &lt;&lt; rate) &amp; rate_mask)) {</div><div class='del'>-		IWL_DEBUG_RATE(priv,</div><div class='del'>-				"Can't switch with index %d rate mask %x\n",</div><div class='del'>-						rate, rate_mask);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	tbl-&gt;current_rate = iwl4965_rate_n_flags_from_tbl(priv,</div><div class='del'>-						 tbl, rate, is_green);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "LQ: Switch to new mcs %X index is green %X\n",</div><div class='del'>-		     tbl-&gt;current_rate, is_green);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set up search table for SISO</div><div class='del'>- */</div><div class='del'>-static int iwl4965_rs_switch_to_siso(struct iwl_priv *priv,</div><div class='del'>-			     struct iwl_lq_sta *lq_sta,</div><div class='del'>-			     struct ieee80211_conf *conf,</div><div class='del'>-			     struct ieee80211_sta *sta,</div><div class='del'>-			     struct iwl_scale_tbl_info *tbl, int index)</div><div class='del'>-{</div><div class='del'>-	u16 rate_mask;</div><div class='del'>-	u8 is_green = lq_sta-&gt;is_green;</div><div class='del'>-	s32 rate;</div><div class='del'>-	struct iwl_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='del'>-	struct iwl_rxon_context *ctx = sta_priv-&gt;common.ctx;</div><div class='del'>-</div><div class='del'>-	if (!conf_is_ht(conf) || !sta-&gt;ht_cap.ht_supported)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "LQ: try to switch to SISO\n");</div><div class='del'>-</div><div class='del'>-	tbl-&gt;is_dup = lq_sta-&gt;is_dup;</div><div class='del'>-	tbl-&gt;lq_type = LQ_SISO;</div><div class='del'>-	tbl-&gt;action = 0;</div><div class='del'>-	tbl-&gt;max_search = IWL_MAX_SEARCH;</div><div class='del'>-	rate_mask = lq_sta-&gt;active_siso_rate;</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_is_ht40_tx_allowed(priv, ctx, &amp;sta-&gt;ht_cap))</div><div class='del'>-		tbl-&gt;is_ht40 = 1;</div><div class='del'>-	else</div><div class='del'>-		tbl-&gt;is_ht40 = 0;</div><div class='del'>-</div><div class='del'>-	if (is_green)</div><div class='del'>-		tbl-&gt;is_SGI = 0; /*11n spec: no SGI in SISO+Greenfield*/</div><div class='del'>-</div><div class='del'>-	iwl4965_rs_set_expected_tpt_table(lq_sta, tbl);</div><div class='del'>-	rate = iwl4965_rs_get_best_rate(priv, lq_sta, tbl, rate_mask, index);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "LQ: get best rate %d mask %X\n", rate, rate_mask);</div><div class='del'>-	if ((rate == IWL_RATE_INVALID) || !((1 &lt;&lt; rate) &amp; rate_mask)) {</div><div class='del'>-		IWL_DEBUG_RATE(priv,</div><div class='del'>-			"can not switch with index %d rate mask %x\n",</div><div class='del'>-			     rate, rate_mask);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	tbl-&gt;current_rate = iwl4965_rate_n_flags_from_tbl(priv,</div><div class='del'>-						tbl, rate, is_green);</div><div class='del'>-	IWL_DEBUG_RATE(priv, "LQ: Switch to new mcs %X index is green %X\n",</div><div class='del'>-		     tbl-&gt;current_rate, is_green);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Try to switch to new modulation mode from legacy</div><div class='del'>- */</div><div class='del'>-static int iwl4965_rs_move_legacy_other(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_lq_sta *lq_sta,</div><div class='del'>-				struct ieee80211_conf *conf,</div><div class='del'>-				struct ieee80211_sta *sta,</div><div class='del'>-				int index)</div><div class='del'>-{</div><div class='del'>-	struct iwl_scale_tbl_info *tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='del'>-	struct iwl_scale_tbl_info *search_tbl =</div><div class='del'>-				&amp;(lq_sta-&gt;lq_info[(1 - lq_sta-&gt;active_tbl)]);</div><div class='del'>-	struct iwl_rate_scale_data *window = &amp;(tbl-&gt;win[index]);</div><div class='del'>-	u32 sz = (sizeof(struct iwl_scale_tbl_info) -</div><div class='del'>-		  (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));</div><div class='del'>-	u8 start_action;</div><div class='del'>-	u8 valid_tx_ant = priv-&gt;hw_params.valid_tx_ant;</div><div class='del'>-	u8 tx_chains_num = priv-&gt;hw_params.tx_chains_num;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u8 update_search_tbl_counter = 0;</div><div class='del'>-</div><div class='del'>-	tbl-&gt;action = IWL_LEGACY_SWITCH_SISO;</div><div class='del'>-</div><div class='del'>-	start_action = tbl-&gt;action;</div><div class='del'>-	for (; ;) {</div><div class='del'>-		lq_sta-&gt;action_counter++;</div><div class='del'>-		switch (tbl-&gt;action) {</div><div class='del'>-		case IWL_LEGACY_SWITCH_ANTENNA1:</div><div class='del'>-		case IWL_LEGACY_SWITCH_ANTENNA2:</div><div class='del'>-			IWL_DEBUG_RATE(priv, "LQ: Legacy toggle Antenna\n");</div><div class='del'>-</div><div class='del'>-			if ((tbl-&gt;action == IWL_LEGACY_SWITCH_ANTENNA1 &amp;&amp;</div><div class='del'>-							tx_chains_num &lt;= 1) ||</div><div class='del'>-			    (tbl-&gt;action == IWL_LEGACY_SWITCH_ANTENNA2 &amp;&amp;</div><div class='del'>-							tx_chains_num &lt;= 2))</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			/* Don't change antenna if success has been great */</div><div class='del'>-			if (window-&gt;success_ratio &gt;= IWL_RS_GOOD_RATIO)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			/* Set up search table to try other antenna */</div><div class='del'>-			memcpy(search_tbl, tbl, sz);</div><div class='del'>-</div><div class='del'>-			if (iwl4965_rs_toggle_antenna(valid_tx_ant,</div><div class='del'>-				&amp;search_tbl-&gt;current_rate, search_tbl)) {</div><div class='del'>-				update_search_tbl_counter = 1;</div><div class='del'>-				iwl4965_rs_set_expected_tpt_table(lq_sta,</div><div class='del'>-								search_tbl);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case IWL_LEGACY_SWITCH_SISO:</div><div class='del'>-			IWL_DEBUG_RATE(priv, "LQ: Legacy switch to SISO\n");</div><div class='del'>-</div><div class='del'>-			/* Set up search table to try SISO */</div><div class='del'>-			memcpy(search_tbl, tbl, sz);</div><div class='del'>-			search_tbl-&gt;is_SGI = 0;</div><div class='del'>-			ret = iwl4965_rs_switch_to_siso(priv, lq_sta, conf, sta,</div><div class='del'>-						 search_tbl, index);</div><div class='del'>-			if (!ret) {</div><div class='del'>-				lq_sta-&gt;action_counter = 0;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-		case IWL_LEGACY_SWITCH_MIMO2_AB:</div><div class='del'>-		case IWL_LEGACY_SWITCH_MIMO2_AC:</div><div class='del'>-		case IWL_LEGACY_SWITCH_MIMO2_BC:</div><div class='del'>-			IWL_DEBUG_RATE(priv, "LQ: Legacy switch to MIMO2\n");</div><div class='del'>-</div><div class='del'>-			/* Set up search table to try MIMO */</div><div class='del'>-			memcpy(search_tbl, tbl, sz);</div><div class='del'>-			search_tbl-&gt;is_SGI = 0;</div><div class='del'>-</div><div class='del'>-			if (tbl-&gt;action == IWL_LEGACY_SWITCH_MIMO2_AB)</div><div class='del'>-				search_tbl-&gt;ant_type = ANT_AB;</div><div class='del'>-			else if (tbl-&gt;action == IWL_LEGACY_SWITCH_MIMO2_AC)</div><div class='del'>-				search_tbl-&gt;ant_type = ANT_AC;</div><div class='del'>-			else</div><div class='del'>-				search_tbl-&gt;ant_type = ANT_BC;</div><div class='del'>-</div><div class='del'>-			if (!iwl4965_rs_is_valid_ant(valid_tx_ant,</div><div class='del'>-						search_tbl-&gt;ant_type))</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			ret = iwl4965_rs_switch_to_mimo2(priv, lq_sta,</div><div class='del'>-						conf, sta,</div><div class='del'>-						 search_tbl, index);</div><div class='del'>-			if (!ret) {</div><div class='del'>-				lq_sta-&gt;action_counter = 0;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		tbl-&gt;action++;</div><div class='del'>-		if (tbl-&gt;action &gt; IWL_LEGACY_SWITCH_MIMO2_BC)</div><div class='del'>-			tbl-&gt;action = IWL_LEGACY_SWITCH_ANTENNA1;</div><div class='del'>-</div><div class='del'>-		if (tbl-&gt;action == start_action)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	search_tbl-&gt;lq_type = LQ_NONE;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	lq_sta-&gt;search_better_tbl = 1;</div><div class='del'>-	tbl-&gt;action++;</div><div class='del'>-	if (tbl-&gt;action &gt; IWL_LEGACY_SWITCH_MIMO2_BC)</div><div class='del'>-		tbl-&gt;action = IWL_LEGACY_SWITCH_ANTENNA1;</div><div class='del'>-	if (update_search_tbl_counter)</div><div class='del'>-		search_tbl-&gt;action = tbl-&gt;action;</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'>- * Try to switch to new modulation mode from SISO</div><div class='del'>- */</div><div class='del'>-static int iwl4965_rs_move_siso_to_other(struct iwl_priv *priv,</div><div class='del'>-				 struct iwl_lq_sta *lq_sta,</div><div class='del'>-				 struct ieee80211_conf *conf,</div><div class='del'>-				 struct ieee80211_sta *sta, int index)</div><div class='del'>-{</div><div class='del'>-	u8 is_green = lq_sta-&gt;is_green;</div><div class='del'>-	struct iwl_scale_tbl_info *tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='del'>-	struct iwl_scale_tbl_info *search_tbl =</div><div class='del'>-				&amp;(lq_sta-&gt;lq_info[(1 - lq_sta-&gt;active_tbl)]);</div><div class='del'>-	struct iwl_rate_scale_data *window = &amp;(tbl-&gt;win[index]);</div><div class='del'>-	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='del'>-	u32 sz = (sizeof(struct iwl_scale_tbl_info) -</div><div class='del'>-		  (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));</div><div class='del'>-	u8 start_action;</div><div class='del'>-	u8 valid_tx_ant = priv-&gt;hw_params.valid_tx_ant;</div><div class='del'>-	u8 tx_chains_num = priv-&gt;hw_params.tx_chains_num;</div><div class='del'>-	u8 update_search_tbl_counter = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	start_action = tbl-&gt;action;</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		lq_sta-&gt;action_counter++;</div><div class='del'>-		switch (tbl-&gt;action) {</div><div class='del'>-		case IWL_SISO_SWITCH_ANTENNA1:</div><div class='del'>-		case IWL_SISO_SWITCH_ANTENNA2:</div><div class='del'>-			IWL_DEBUG_RATE(priv, "LQ: SISO toggle Antenna\n");</div><div class='del'>-			if ((tbl-&gt;action == IWL_SISO_SWITCH_ANTENNA1 &amp;&amp;</div><div class='del'>-						tx_chains_num &lt;= 1) ||</div><div class='del'>-			    (tbl-&gt;action == IWL_SISO_SWITCH_ANTENNA2 &amp;&amp;</div><div class='del'>-						tx_chains_num &lt;= 2))</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			if (window-&gt;success_ratio &gt;= IWL_RS_GOOD_RATIO)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			memcpy(search_tbl, tbl, sz);</div><div class='del'>-			if (iwl4965_rs_toggle_antenna(valid_tx_ant,</div><div class='del'>-				       &amp;search_tbl-&gt;current_rate, search_tbl)) {</div><div class='del'>-				update_search_tbl_counter = 1;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case IWL_SISO_SWITCH_MIMO2_AB:</div><div class='del'>-		case IWL_SISO_SWITCH_MIMO2_AC:</div><div class='del'>-		case IWL_SISO_SWITCH_MIMO2_BC:</div><div class='del'>-			IWL_DEBUG_RATE(priv, "LQ: SISO switch to MIMO2\n");</div><div class='del'>-			memcpy(search_tbl, tbl, sz);</div><div class='del'>-			search_tbl-&gt;is_SGI = 0;</div><div class='del'>-</div><div class='del'>-			if (tbl-&gt;action == IWL_SISO_SWITCH_MIMO2_AB)</div><div class='del'>-				search_tbl-&gt;ant_type = ANT_AB;</div><div class='del'>-			else if (tbl-&gt;action == IWL_SISO_SWITCH_MIMO2_AC)</div><div class='del'>-				search_tbl-&gt;ant_type = ANT_AC;</div><div class='del'>-			else</div><div class='del'>-				search_tbl-&gt;ant_type = ANT_BC;</div><div class='del'>-</div><div class='del'>-			if (!iwl4965_rs_is_valid_ant(valid_tx_ant,</div><div class='del'>-						 search_tbl-&gt;ant_type))</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			ret = iwl4965_rs_switch_to_mimo2(priv, lq_sta,</div><div class='del'>-						conf, sta,</div><div class='del'>-						 search_tbl, index);</div><div class='del'>-			if (!ret)</div><div class='del'>-				goto out;</div><div class='del'>-			break;</div><div class='del'>-		case IWL_SISO_SWITCH_GI:</div><div class='del'>-			if (!tbl-&gt;is_ht40 &amp;&amp; !(ht_cap-&gt;cap &amp;</div><div class='del'>-						IEEE80211_HT_CAP_SGI_20))</div><div class='del'>-				break;</div><div class='del'>-			if (tbl-&gt;is_ht40 &amp;&amp; !(ht_cap-&gt;cap &amp;</div><div class='del'>-						IEEE80211_HT_CAP_SGI_40))</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			IWL_DEBUG_RATE(priv, "LQ: SISO toggle SGI/NGI\n");</div><div class='del'>-</div><div class='del'>-			memcpy(search_tbl, tbl, sz);</div><div class='del'>-			if (is_green) {</div><div class='del'>-				if (!tbl-&gt;is_SGI)</div><div class='del'>-					break;</div><div class='del'>-				else</div><div class='del'>-					IWL_ERR(priv,</div><div class='del'>-						"SGI was set in GF+SISO\n");</div><div class='del'>-			}</div><div class='del'>-			search_tbl-&gt;is_SGI = !tbl-&gt;is_SGI;</div><div class='del'>-			iwl4965_rs_set_expected_tpt_table(lq_sta, search_tbl);</div><div class='del'>-			if (tbl-&gt;is_SGI) {</div><div class='del'>-				s32 tpt = lq_sta-&gt;last_tpt / 100;</div><div class='del'>-				if (tpt &gt;= search_tbl-&gt;expected_tpt[index])</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			search_tbl-&gt;current_rate =</div><div class='del'>-				iwl4965_rate_n_flags_from_tbl(priv, search_tbl,</div><div class='del'>-						      index, is_green);</div><div class='del'>-			update_search_tbl_counter = 1;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		tbl-&gt;action++;</div><div class='del'>-		if (tbl-&gt;action &gt; IWL_SISO_SWITCH_GI)</div><div class='del'>-			tbl-&gt;action = IWL_SISO_SWITCH_ANTENNA1;</div><div class='del'>-</div><div class='del'>-		if (tbl-&gt;action == start_action)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	search_tbl-&gt;lq_type = LQ_NONE;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	lq_sta-&gt;search_better_tbl = 1;</div><div class='del'>-	tbl-&gt;action++;</div><div class='del'>-	if (tbl-&gt;action &gt; IWL_SISO_SWITCH_GI)</div><div class='del'>-		tbl-&gt;action = IWL_SISO_SWITCH_ANTENNA1;</div><div class='del'>-	if (update_search_tbl_counter)</div><div class='del'>-		search_tbl-&gt;action = tbl-&gt;action;</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'>- * Try to switch to new modulation mode from MIMO2</div><div class='del'>- */</div><div class='del'>-static int iwl4965_rs_move_mimo2_to_other(struct iwl_priv *priv,</div><div class='del'>-				 struct iwl_lq_sta *lq_sta,</div><div class='del'>-				 struct ieee80211_conf *conf,</div><div class='del'>-				 struct ieee80211_sta *sta, int index)</div><div class='del'>-{</div><div class='del'>-	s8 is_green = lq_sta-&gt;is_green;</div><div class='del'>-	struct iwl_scale_tbl_info *tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='del'>-	struct iwl_scale_tbl_info *search_tbl =</div><div class='del'>-				&amp;(lq_sta-&gt;lq_info[(1 - lq_sta-&gt;active_tbl)]);</div><div class='del'>-	struct iwl_rate_scale_data *window = &amp;(tbl-&gt;win[index]);</div><div class='del'>-	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='del'>-	u32 sz = (sizeof(struct iwl_scale_tbl_info) -</div><div class='del'>-		  (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));</div><div class='del'>-	u8 start_action;</div><div class='del'>-	u8 valid_tx_ant = priv-&gt;hw_params.valid_tx_ant;</div><div class='del'>-	u8 tx_chains_num = priv-&gt;hw_params.tx_chains_num;</div><div class='del'>-	u8 update_search_tbl_counter = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	start_action = tbl-&gt;action;</div><div class='del'>-	for (;;) {</div><div class='del'>-		lq_sta-&gt;action_counter++;</div><div class='del'>-		switch (tbl-&gt;action) {</div><div class='del'>-		case IWL_MIMO2_SWITCH_ANTENNA1:</div><div class='del'>-		case IWL_MIMO2_SWITCH_ANTENNA2:</div><div class='del'>-			IWL_DEBUG_RATE(priv, "LQ: MIMO2 toggle Antennas\n");</div><div class='del'>-</div><div class='del'>-			if (tx_chains_num &lt;= 2)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			if (window-&gt;success_ratio &gt;= IWL_RS_GOOD_RATIO)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			memcpy(search_tbl, tbl, sz);</div><div class='del'>-			if (iwl4965_rs_toggle_antenna(valid_tx_ant,</div><div class='del'>-				       &amp;search_tbl-&gt;current_rate, search_tbl)) {</div><div class='del'>-				update_search_tbl_counter = 1;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case IWL_MIMO2_SWITCH_SISO_A:</div><div class='del'>-		case IWL_MIMO2_SWITCH_SISO_B:</div><div class='del'>-		case IWL_MIMO2_SWITCH_SISO_C:</div><div class='del'>-			IWL_DEBUG_RATE(priv, "LQ: MIMO2 switch to SISO\n");</div><div class='del'>-</div><div class='del'>-			/* Set up new search table for SISO */</div><div class='del'>-			memcpy(search_tbl, tbl, sz);</div><div class='del'>-</div><div class='del'>-			if (tbl-&gt;action == IWL_MIMO2_SWITCH_SISO_A)</div><div class='del'>-				search_tbl-&gt;ant_type = ANT_A;</div><div class='del'>-			else if (tbl-&gt;action == IWL_MIMO2_SWITCH_SISO_B)</div><div class='del'>-				search_tbl-&gt;ant_type = ANT_B;</div><div class='del'>-			else</div><div class='del'>-				search_tbl-&gt;ant_type = ANT_C;</div><div class='del'>-</div><div class='del'>-			if (!iwl4965_rs_is_valid_ant(valid_tx_ant,</div><div class='del'>-						search_tbl-&gt;ant_type))</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			ret = iwl4965_rs_switch_to_siso(priv, lq_sta,</div><div class='del'>-						conf, sta,</div><div class='del'>-						 search_tbl, index);</div><div class='del'>-			if (!ret)</div><div class='del'>-				goto out;</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case IWL_MIMO2_SWITCH_GI:</div><div class='del'>-			if (!tbl-&gt;is_ht40 &amp;&amp; !(ht_cap-&gt;cap &amp;</div><div class='del'>-						IEEE80211_HT_CAP_SGI_20))</div><div class='del'>-				break;</div><div class='del'>-			if (tbl-&gt;is_ht40 &amp;&amp; !(ht_cap-&gt;cap &amp;</div><div class='del'>-						IEEE80211_HT_CAP_SGI_40))</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			IWL_DEBUG_RATE(priv, "LQ: MIMO2 toggle SGI/NGI\n");</div><div class='del'>-</div><div class='del'>-			/* Set up new search table for MIMO2 */</div><div class='del'>-			memcpy(search_tbl, tbl, sz);</div><div class='del'>-			search_tbl-&gt;is_SGI = !tbl-&gt;is_SGI;</div><div class='del'>-			iwl4965_rs_set_expected_tpt_table(lq_sta, search_tbl);</div><div class='del'>-			/*</div><div class='del'>-			 * If active table already uses the fastest possible</div><div class='del'>-			 * modulation (dual stream with short guard interval),</div><div class='del'>-			 * and it's working well, there's no need to look</div><div class='del'>-			 * for a better type of modulation!</div><div class='del'>-			 */</div><div class='del'>-			if (tbl-&gt;is_SGI) {</div><div class='del'>-				s32 tpt = lq_sta-&gt;last_tpt / 100;</div><div class='del'>-				if (tpt &gt;= search_tbl-&gt;expected_tpt[index])</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			search_tbl-&gt;current_rate =</div><div class='del'>-				iwl4965_rate_n_flags_from_tbl(priv, search_tbl,</div><div class='del'>-						      index, is_green);</div><div class='del'>-			update_search_tbl_counter = 1;</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-		tbl-&gt;action++;</div><div class='del'>-		if (tbl-&gt;action &gt; IWL_MIMO2_SWITCH_GI)</div><div class='del'>-			tbl-&gt;action = IWL_MIMO2_SWITCH_ANTENNA1;</div><div class='del'>-</div><div class='del'>-		if (tbl-&gt;action == start_action)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	search_tbl-&gt;lq_type = LQ_NONE;</div><div class='del'>-	return 0;</div><div class='del'>- out:</div><div class='del'>-	lq_sta-&gt;search_better_tbl = 1;</div><div class='del'>-	tbl-&gt;action++;</div><div class='del'>-	if (tbl-&gt;action &gt; IWL_MIMO2_SWITCH_GI)</div><div class='del'>-		tbl-&gt;action = IWL_MIMO2_SWITCH_ANTENNA1;</div><div class='del'>-	if (update_search_tbl_counter)</div><div class='del'>-		search_tbl-&gt;action = tbl-&gt;action;</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'>- * Check whether we should continue using same modulation mode, or</div><div class='del'>- * begin search for a new mode, based on:</div><div class='del'>- * 1) # tx successes or failures while using this mode</div><div class='del'>- * 2) # times calling this function</div><div class='del'>- * 3) elapsed time in this mode (not used, for now)</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-iwl4965_rs_stay_in_table(struct iwl_lq_sta *lq_sta, bool force_search)</div><div class='del'>-{</div><div class='del'>-	struct iwl_scale_tbl_info *tbl;</div><div class='del'>-	int i;</div><div class='del'>-	int active_tbl;</div><div class='del'>-	int flush_interval_passed = 0;</div><div class='del'>-	struct iwl_priv *priv;</div><div class='del'>-</div><div class='del'>-	priv = lq_sta-&gt;drv;</div><div class='del'>-	active_tbl = lq_sta-&gt;active_tbl;</div><div class='del'>-</div><div class='del'>-	tbl = &amp;(lq_sta-&gt;lq_info[active_tbl]);</div><div class='del'>-</div><div class='del'>-	/* If we've been disallowing search, see if we should now allow it */</div><div class='del'>-	if (lq_sta-&gt;stay_in_tbl) {</div><div class='del'>-</div><div class='del'>-		/* Elapsed time using current modulation mode */</div><div class='del'>-		if (lq_sta-&gt;flush_timer)</div><div class='del'>-			flush_interval_passed =</div><div class='del'>-			time_after(jiffies,</div><div class='del'>-					(unsigned long)(lq_sta-&gt;flush_timer +</div><div class='del'>-					IWL_RATE_SCALE_FLUSH_INTVL));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Check if we should allow search for new modulation mode.</div><div class='del'>-		 * If many frames have failed or succeeded, or we've used</div><div class='del'>-		 * this same modulation for a long time, allow search, and</div><div class='del'>-		 * reset history stats that keep track of whether we should</div><div class='del'>-		 * allow a new search.  Also (below) reset all bitmaps and</div><div class='del'>-		 * stats in active history.</div><div class='del'>-		 */</div><div class='del'>-		if (force_search ||</div><div class='del'>-		    (lq_sta-&gt;total_failed &gt; lq_sta-&gt;max_failure_limit) ||</div><div class='del'>-		    (lq_sta-&gt;total_success &gt; lq_sta-&gt;max_success_limit) ||</div><div class='del'>-		    ((!lq_sta-&gt;search_better_tbl) &amp;&amp; (lq_sta-&gt;flush_timer)</div><div class='del'>-		     &amp;&amp; (flush_interval_passed))) {</div><div class='del'>-			IWL_DEBUG_RATE(priv, "LQ: stay is expired %d %d %d\n:",</div><div class='del'>-				     lq_sta-&gt;total_failed,</div><div class='del'>-				     lq_sta-&gt;total_success,</div><div class='del'>-				     flush_interval_passed);</div><div class='del'>-</div><div class='del'>-			/* Allow search for new mode */</div><div class='del'>-			lq_sta-&gt;stay_in_tbl = 0;	/* only place reset */</div><div class='del'>-			lq_sta-&gt;total_failed = 0;</div><div class='del'>-			lq_sta-&gt;total_success = 0;</div><div class='del'>-			lq_sta-&gt;flush_timer = 0;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Else if we've used this modulation mode enough repetitions</div><div class='del'>-		 * (regardless of elapsed time or success/failure), reset</div><div class='del'>-		 * history bitmaps and rate-specific stats for all rates in</div><div class='del'>-		 * active table.</div><div class='del'>-		 */</div><div class='del'>-		} else {</div><div class='del'>-			lq_sta-&gt;table_count++;</div><div class='del'>-			if (lq_sta-&gt;table_count &gt;=</div><div class='del'>-			    lq_sta-&gt;table_count_limit) {</div><div class='del'>-				lq_sta-&gt;table_count = 0;</div><div class='del'>-</div><div class='del'>-				IWL_DEBUG_RATE(priv,</div><div class='del'>-					"LQ: stay in table clear win\n");</div><div class='del'>-				for (i = 0; i &lt; IWL_RATE_COUNT; i++)</div><div class='del'>-					iwl4965_rs_rate_scale_clear_window(</div><div class='del'>-						&amp;(tbl-&gt;win[i]));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* If transitioning to allow "search", reset all history</div><div class='del'>-		 * bitmaps and stats in active table (this will become the new</div><div class='del'>-		 * "search" table). */</div><div class='del'>-		if (!lq_sta-&gt;stay_in_tbl) {</div><div class='del'>-			for (i = 0; i &lt; IWL_RATE_COUNT; i++)</div><div class='del'>-				iwl4965_rs_rate_scale_clear_window(</div><div class='del'>-							&amp;(tbl-&gt;win[i]));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * setup rate table in uCode</div><div class='del'>- * return rate_n_flags as used in the table</div><div class='del'>- */</div><div class='del'>-static u32 iwl4965_rs_update_rate_tbl(struct iwl_priv *priv,</div><div class='del'>-			      struct iwl_rxon_context *ctx,</div><div class='del'>-				struct iwl_lq_sta *lq_sta,</div><div class='del'>-				struct iwl_scale_tbl_info *tbl,</div><div class='del'>-				int index, u8 is_green)</div><div class='del'>-{</div><div class='del'>-	u32 rate;</div><div class='del'>-</div><div class='del'>-	/* Update uCode's rate table. */</div><div class='del'>-	rate = iwl4965_rate_n_flags_from_tbl(priv, tbl, index, is_green);</div><div class='del'>-	iwl4965_rs_fill_link_cmd(priv, lq_sta, rate);</div><div class='del'>-	iwl_legacy_send_lq_cmd(priv, ctx, &amp;lq_sta-&gt;lq, CMD_ASYNC, false);</div><div class='del'>-</div><div class='del'>-	return rate;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Do rate scaling and search for new modulation mode.</div><div class='del'>- */</div><div class='del'>-static void iwl4965_rs_rate_scale_perform(struct iwl_priv *priv,</div><div class='del'>-				  struct sk_buff *skb,</div><div class='del'>-				  struct ieee80211_sta *sta,</div><div class='del'>-				  struct iwl_lq_sta *lq_sta)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hw *hw = priv-&gt;hw;</div><div class='del'>-	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</div><div class='del'>-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='del'>-	int low = IWL_RATE_INVALID;</div><div class='del'>-	int high = IWL_RATE_INVALID;</div><div class='del'>-	int index;</div><div class='del'>-	int i;</div><div class='del'>-	struct iwl_rate_scale_data *window = NULL;</div><div class='del'>-	int current_tpt = IWL_INVALID_VALUE;</div><div class='del'>-	int low_tpt = IWL_INVALID_VALUE;</div><div class='del'>-	int high_tpt = IWL_INVALID_VALUE;</div><div class='del'>-	u32 fail_count;</div><div class='del'>-	s8 scale_action = 0;</div><div class='del'>-	u16 rate_mask;</div><div class='del'>-	u8 update_lq = 0;</div><div class='del'>-	struct iwl_scale_tbl_info *tbl, *tbl1;</div><div class='del'>-	u16 rate_scale_index_msk = 0;</div><div class='del'>-	u32 rate;</div><div class='del'>-	u8 is_green = 0;</div><div class='del'>-	u8 active_tbl = 0;</div><div class='del'>-	u8 done_search = 0;</div><div class='del'>-	u16 high_low;</div><div class='del'>-	s32 sr;</div><div class='del'>-	u8 tid = MAX_TID_COUNT;</div><div class='del'>-	struct iwl_tid_data *tid_data;</div><div class='del'>-	struct iwl_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='del'>-	struct iwl_rxon_context *ctx = sta_priv-&gt;common.ctx;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "rate scale calculate new rate for skb\n");</div><div class='del'>-</div><div class='del'>-	/* Send management frames and NO_ACK data using lowest rate. */</div><div class='del'>-	/* TODO: this could probably be improved.. */</div><div class='del'>-	if (!ieee80211_is_data(hdr-&gt;frame_control) ||</div><div class='del'>-	    info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!sta || !lq_sta)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	lq_sta-&gt;supp_rates = sta-&gt;supp_rates[lq_sta-&gt;band];</div><div class='del'>-</div><div class='del'>-	tid = iwl4965_rs_tl_add_packet(lq_sta, hdr);</div><div class='del'>-	if ((tid != MAX_TID_COUNT) &amp;&amp; (lq_sta-&gt;tx_agg_tid_en &amp; (1 &lt;&lt; tid))) {</div><div class='del'>-		tid_data = &amp;priv-&gt;stations[lq_sta-&gt;lq.sta_id].tid[tid];</div><div class='del'>-		if (tid_data-&gt;agg.state == IWL_AGG_OFF)</div><div class='del'>-			lq_sta-&gt;is_agg = 0;</div><div class='del'>-		else</div><div class='del'>-			lq_sta-&gt;is_agg = 1;</div><div class='del'>-	} else</div><div class='del'>-		lq_sta-&gt;is_agg = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Select rate-scale / modulation-mode table to work with in</div><div class='del'>-	 * the rest of this function:  "search" if searching for better</div><div class='del'>-	 * modulation mode, or "active" if doing rate scaling within a mode.</div><div class='del'>-	 */</div><div class='del'>-	if (!lq_sta-&gt;search_better_tbl)</div><div class='del'>-		active_tbl = lq_sta-&gt;active_tbl;</div><div class='del'>-	else</div><div class='del'>-		active_tbl = 1 - lq_sta-&gt;active_tbl;</div><div class='del'>-</div><div class='del'>-	tbl = &amp;(lq_sta-&gt;lq_info[active_tbl]);</div><div class='del'>-	if (is_legacy(tbl-&gt;lq_type))</div><div class='del'>-		lq_sta-&gt;is_green = 0;</div><div class='del'>-	else</div><div class='del'>-		lq_sta-&gt;is_green = iwl4965_rs_use_green(sta);</div><div class='del'>-	is_green = lq_sta-&gt;is_green;</div><div class='del'>-</div><div class='del'>-	/* current tx rate */</div><div class='del'>-	index = lq_sta-&gt;last_txrate_idx;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "Rate scale index %d for type %d\n", index,</div><div class='del'>-		       tbl-&gt;lq_type);</div><div class='del'>-</div><div class='del'>-	/* rates available for this association, and for modulation mode */</div><div class='del'>-	rate_mask = iwl4965_rs_get_supported_rates(lq_sta, hdr, tbl-&gt;lq_type);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "mask 0x%04X\n", rate_mask);</div><div class='del'>-</div><div class='del'>-	/* mask with station rate restriction */</div><div class='del'>-	if (is_legacy(tbl-&gt;lq_type)) {</div><div class='del'>-		if (lq_sta-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='del'>-			/* supp_rates has no CCK bits in A mode */</div><div class='del'>-			rate_scale_index_msk = (u16) (rate_mask &amp;</div><div class='del'>-				(lq_sta-&gt;supp_rates &lt;&lt; IWL_FIRST_OFDM_RATE));</div><div class='del'>-		else</div><div class='del'>-			rate_scale_index_msk = (u16) (rate_mask &amp;</div><div class='del'>-						      lq_sta-&gt;supp_rates);</div><div class='del'>-</div><div class='del'>-	} else</div><div class='del'>-		rate_scale_index_msk = rate_mask;</div><div class='del'>-</div><div class='del'>-	if (!rate_scale_index_msk)</div><div class='del'>-		rate_scale_index_msk = rate_mask;</div><div class='del'>-</div><div class='del'>-	if (!((1 &lt;&lt; index) &amp; rate_scale_index_msk)) {</div><div class='del'>-		IWL_ERR(priv, "Current Rate is not valid\n");</div><div class='del'>-		if (lq_sta-&gt;search_better_tbl) {</div><div class='del'>-			/* revert to active table if search table is not valid*/</div><div class='del'>-			tbl-&gt;lq_type = LQ_NONE;</div><div class='del'>-			lq_sta-&gt;search_better_tbl = 0;</div><div class='del'>-			tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='del'>-			/* get "active" rate info */</div><div class='del'>-			index = iwl4965_hwrate_to_plcp_idx(tbl-&gt;current_rate);</div><div class='del'>-			rate = iwl4965_rs_update_rate_tbl(priv, ctx, lq_sta,</div><div class='del'>-						  tbl, index, is_green);</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get expected throughput table and history window for current rate */</div><div class='del'>-	if (!tbl-&gt;expected_tpt) {</div><div class='del'>-		IWL_ERR(priv, "tbl-&gt;expected_tpt is NULL\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* force user max rate if set by user */</div><div class='del'>-	if ((lq_sta-&gt;max_rate_idx != -1) &amp;&amp;</div><div class='del'>-	    (lq_sta-&gt;max_rate_idx &lt; index)) {</div><div class='del'>-		index = lq_sta-&gt;max_rate_idx;</div><div class='del'>-		update_lq = 1;</div><div class='del'>-		window = &amp;(tbl-&gt;win[index]);</div><div class='del'>-		goto lq_update;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	window = &amp;(tbl-&gt;win[index]);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If there is not enough history to calculate actual average</div><div class='del'>-	 * throughput, keep analyzing results of more tx frames, without</div><div class='del'>-	 * changing rate or mode (bypass most of the rest of this function).</div><div class='del'>-	 * Set up new rate table in uCode only if old rate is not supported</div><div class='del'>-	 * in current association (use new rate found above).</div><div class='del'>-	 */</div><div class='del'>-	fail_count = window-&gt;counter - window-&gt;success_counter;</div><div class='del'>-	if ((fail_count &lt; IWL_RATE_MIN_FAILURE_TH) &amp;&amp;</div><div class='del'>-			(window-&gt;success_counter &lt; IWL_RATE_MIN_SUCCESS_TH)) {</div><div class='del'>-		IWL_DEBUG_RATE(priv, "LQ: still below TH. succ=%d total=%d "</div><div class='del'>-			       "for index %d\n",</div><div class='del'>-			       window-&gt;success_counter, window-&gt;counter, index);</div><div class='del'>-</div><div class='del'>-		/* Can't calculate this yet; not enough history */</div><div class='del'>-		window-&gt;average_tpt = IWL_INVALID_VALUE;</div><div class='del'>-</div><div class='del'>-		/* Should we stay with this modulation mode,</div><div class='del'>-		 * or search for a new one? */</div><div class='del'>-		iwl4965_rs_stay_in_table(lq_sta, false);</div><div class='del'>-</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	/* Else we have enough samples; calculate estimate of</div><div class='del'>-	 * actual average throughput */</div><div class='del'>-	if (window-&gt;average_tpt != ((window-&gt;success_ratio *</div><div class='del'>-			tbl-&gt;expected_tpt[index] + 64) / 128)) {</div><div class='del'>-		IWL_ERR(priv,</div><div class='del'>-			 "expected_tpt should have been calculated by now\n");</div><div class='del'>-		window-&gt;average_tpt = ((window-&gt;success_ratio *</div><div class='del'>-					tbl-&gt;expected_tpt[index] + 64) / 128);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we are searching for better modulation mode, check success. */</div><div class='del'>-	if (lq_sta-&gt;search_better_tbl) {</div><div class='del'>-		/* If good success, continue using the "search" mode;</div><div class='del'>-		 * no need to send new link quality command, since we're</div><div class='del'>-		 * continuing to use the setup that we've been trying. */</div><div class='del'>-		if (window-&gt;average_tpt &gt; lq_sta-&gt;last_tpt) {</div><div class='del'>-</div><div class='del'>-			IWL_DEBUG_RATE(priv, "LQ: SWITCHING TO NEW TABLE "</div><div class='del'>-					"suc=%d cur-tpt=%d old-tpt=%d\n",</div><div class='del'>-					window-&gt;success_ratio,</div><div class='del'>-					window-&gt;average_tpt,</div><div class='del'>-					lq_sta-&gt;last_tpt);</div><div class='del'>-</div><div class='del'>-			if (!is_legacy(tbl-&gt;lq_type))</div><div class='del'>-				lq_sta-&gt;enable_counter = 1;</div><div class='del'>-</div><div class='del'>-			/* Swap tables; "search" becomes "active" */</div><div class='del'>-			lq_sta-&gt;active_tbl = active_tbl;</div><div class='del'>-			current_tpt = window-&gt;average_tpt;</div><div class='del'>-</div><div class='del'>-		/* Else poor success; go back to mode in "active" table */</div><div class='del'>-		} else {</div><div class='del'>-</div><div class='del'>-			IWL_DEBUG_RATE(priv, "LQ: GOING BACK TO THE OLD TABLE "</div><div class='del'>-					"suc=%d cur-tpt=%d old-tpt=%d\n",</div><div class='del'>-					window-&gt;success_ratio,</div><div class='del'>-					window-&gt;average_tpt,</div><div class='del'>-					lq_sta-&gt;last_tpt);</div><div class='del'>-</div><div class='del'>-			/* Nullify "search" table */</div><div class='del'>-			tbl-&gt;lq_type = LQ_NONE;</div><div class='del'>-</div><div class='del'>-			/* Revert to "active" table */</div><div class='del'>-			active_tbl = lq_sta-&gt;active_tbl;</div><div class='del'>-			tbl = &amp;(lq_sta-&gt;lq_info[active_tbl]);</div><div class='del'>-</div><div class='del'>-			/* Revert to "active" rate and throughput info */</div><div class='del'>-			index = iwl4965_hwrate_to_plcp_idx(tbl-&gt;current_rate);</div><div class='del'>-			current_tpt = lq_sta-&gt;last_tpt;</div><div class='del'>-</div><div class='del'>-			/* Need to set up a new rate table in uCode */</div><div class='del'>-			update_lq = 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Either way, we've made a decision; modulation mode</div><div class='del'>-		 * search is done, allow rate adjustment next time. */</div><div class='del'>-		lq_sta-&gt;search_better_tbl = 0;</div><div class='del'>-		done_search = 1;	/* Don't switch modes below! */</div><div class='del'>-		goto lq_update;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* (Else) not in search of better modulation mode, try for better</div><div class='del'>-	 * starting rate, while staying in this mode. */</div><div class='del'>-	high_low = iwl4965_rs_get_adjacent_rate(priv, index,</div><div class='del'>-					rate_scale_index_msk,</div><div class='del'>-					tbl-&gt;lq_type);</div><div class='del'>-	low = high_low &amp; 0xff;</div><div class='del'>-	high = (high_low &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	/* If user set max rate, dont allow higher than user constrain */</div><div class='del'>-	if ((lq_sta-&gt;max_rate_idx != -1) &amp;&amp;</div><div class='del'>-	    (lq_sta-&gt;max_rate_idx &lt; high))</div><div class='del'>-		high = IWL_RATE_INVALID;</div><div class='del'>-</div><div class='del'>-	sr = window-&gt;success_ratio;</div><div class='del'>-</div><div class='del'>-	/* Collect measured throughputs for current and adjacent rates */</div><div class='del'>-	current_tpt = window-&gt;average_tpt;</div><div class='del'>-	if (low != IWL_RATE_INVALID)</div><div class='del'>-		low_tpt = tbl-&gt;win[low].average_tpt;</div><div class='del'>-	if (high != IWL_RATE_INVALID)</div><div class='del'>-		high_tpt = tbl-&gt;win[high].average_tpt;</div><div class='del'>-</div><div class='del'>-	scale_action = 0;</div><div class='del'>-</div><div class='del'>-	/* Too many failures, decrease rate */</div><div class='del'>-	if ((sr &lt;= IWL_RATE_DECREASE_TH) || (current_tpt == 0)) {</div><div class='del'>-		IWL_DEBUG_RATE(priv,</div><div class='del'>-			"decrease rate because of low success_ratio\n");</div><div class='del'>-		scale_action = -1;</div><div class='del'>-</div><div class='del'>-	/* No throughput measured yet for adjacent rates; try increase. */</div><div class='del'>-	} else if ((low_tpt == IWL_INVALID_VALUE) &amp;&amp;</div><div class='del'>-		   (high_tpt == IWL_INVALID_VALUE)) {</div><div class='del'>-</div><div class='del'>-		if (high != IWL_RATE_INVALID &amp;&amp; sr &gt;= IWL_RATE_INCREASE_TH)</div><div class='del'>-			scale_action = 1;</div><div class='del'>-		else if (low != IWL_RATE_INVALID)</div><div class='del'>-			scale_action = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Both adjacent throughputs are measured, but neither one has better</div><div class='del'>-	 * throughput; we're using the best rate, don't change it! */</div><div class='del'>-	else if ((low_tpt != IWL_INVALID_VALUE) &amp;&amp;</div><div class='del'>-		 (high_tpt != IWL_INVALID_VALUE) &amp;&amp;</div><div class='del'>-		 (low_tpt &lt; current_tpt) &amp;&amp;</div><div class='del'>-		 (high_tpt &lt; current_tpt))</div><div class='del'>-		scale_action = 0;</div><div class='del'>-</div><div class='del'>-	/* At least one adjacent rate's throughput is measured,</div><div class='del'>-	 * and may have better performance. */</div><div class='del'>-	else {</div><div class='del'>-		/* Higher adjacent rate's throughput is measured */</div><div class='del'>-		if (high_tpt != IWL_INVALID_VALUE) {</div><div class='del'>-			/* Higher rate has better throughput */</div><div class='del'>-			if (high_tpt &gt; current_tpt &amp;&amp;</div><div class='del'>-					sr &gt;= IWL_RATE_INCREASE_TH) {</div><div class='del'>-				scale_action = 1;</div><div class='del'>-			} else {</div><div class='del'>-				scale_action = 0;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		/* Lower adjacent rate's throughput is measured */</div><div class='del'>-		} else if (low_tpt != IWL_INVALID_VALUE) {</div><div class='del'>-			/* Lower rate has better throughput */</div><div class='del'>-			if (low_tpt &gt; current_tpt) {</div><div class='del'>-				IWL_DEBUG_RATE(priv,</div><div class='del'>-				    "decrease rate because of low tpt\n");</div><div class='del'>-				scale_action = -1;</div><div class='del'>-			} else if (sr &gt;= IWL_RATE_INCREASE_TH) {</div><div class='del'>-				scale_action = 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Sanity check; asked for decrease, but success rate or throughput</div><div class='del'>-	 * has been good at old rate.  Don't change it. */</div><div class='del'>-	if ((scale_action == -1) &amp;&amp; (low != IWL_RATE_INVALID) &amp;&amp;</div><div class='del'>-		    ((sr &gt; IWL_RATE_HIGH_TH) ||</div><div class='del'>-		     (current_tpt &gt; (100 * tbl-&gt;expected_tpt[low]))))</div><div class='del'>-		scale_action = 0;</div><div class='del'>-</div><div class='del'>-	switch (scale_action) {</div><div class='del'>-	case -1:</div><div class='del'>-		/* Decrease starting rate, update uCode's rate table */</div><div class='del'>-		if (low != IWL_RATE_INVALID) {</div><div class='del'>-			update_lq = 1;</div><div class='del'>-			index = low;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		/* Increase starting rate, update uCode's rate table */</div><div class='del'>-		if (high != IWL_RATE_INVALID) {</div><div class='del'>-			update_lq = 1;</div><div class='del'>-			index = high;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case 0:</div><div class='del'>-		/* No change */</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "choose rate scale index %d action %d low %d "</div><div class='del'>-		    "high %d type %d\n",</div><div class='del'>-		     index, scale_action, low, high, tbl-&gt;lq_type);</div><div class='del'>-</div><div class='del'>-lq_update:</div><div class='del'>-	/* Replace uCode's rate table for the destination station. */</div><div class='del'>-	if (update_lq)</div><div class='del'>-		rate = iwl4965_rs_update_rate_tbl(priv, ctx, lq_sta,</div><div class='del'>-					  tbl, index, is_green);</div><div class='del'>-</div><div class='del'>-	/* Should we stay with this modulation mode,</div><div class='del'>-	 * or search for a new one? */</div><div class='del'>-	 iwl4965_rs_stay_in_table(lq_sta, false);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Search for new modulation mode if we're:</div><div class='del'>-	 * 1)  Not changing rates right now</div><div class='del'>-	 * 2)  Not just finishing up a search</div><div class='del'>-	 * 3)  Allowing a new search</div><div class='del'>-	 */</div><div class='del'>-	if (!update_lq &amp;&amp; !done_search &amp;&amp;</div><div class='del'>-		!lq_sta-&gt;stay_in_tbl &amp;&amp; window-&gt;counter) {</div><div class='del'>-		/* Save current throughput to compare with "search" throughput*/</div><div class='del'>-		lq_sta-&gt;last_tpt = current_tpt;</div><div class='del'>-</div><div class='del'>-		/* Select a new "search" modulation mode to try.</div><div class='del'>-		 * If one is found, set up the new "search" table. */</div><div class='del'>-		if (is_legacy(tbl-&gt;lq_type))</div><div class='del'>-			iwl4965_rs_move_legacy_other(priv, lq_sta,</div><div class='del'>-							conf, sta, index);</div><div class='del'>-		else if (is_siso(tbl-&gt;lq_type))</div><div class='del'>-			iwl4965_rs_move_siso_to_other(priv, lq_sta,</div><div class='del'>-							conf, sta, index);</div><div class='del'>-		else /* (is_mimo2(tbl-&gt;lq_type)) */</div><div class='del'>-			iwl4965_rs_move_mimo2_to_other(priv, lq_sta,</div><div class='del'>-							conf, sta, index);</div><div class='del'>-</div><div class='del'>-		/* If new "search" mode was selected, set up in uCode table */</div><div class='del'>-		if (lq_sta-&gt;search_better_tbl) {</div><div class='del'>-			/* Access the "search" table, clear its history. */</div><div class='del'>-			tbl = &amp;(lq_sta-&gt;lq_info[(1 - lq_sta-&gt;active_tbl)]);</div><div class='del'>-			for (i = 0; i &lt; IWL_RATE_COUNT; i++)</div><div class='del'>-				iwl4965_rs_rate_scale_clear_window(</div><div class='del'>-							&amp;(tbl-&gt;win[i]));</div><div class='del'>-</div><div class='del'>-			/* Use new "search" start rate */</div><div class='del'>-			index = iwl4965_hwrate_to_plcp_idx(tbl-&gt;current_rate);</div><div class='del'>-</div><div class='del'>-			IWL_DEBUG_RATE(priv,</div><div class='del'>-				"Switch current  mcs: %X index: %d\n",</div><div class='del'>-				     tbl-&gt;current_rate, index);</div><div class='del'>-			iwl4965_rs_fill_link_cmd(priv, lq_sta,</div><div class='del'>-						tbl-&gt;current_rate);</div><div class='del'>-			iwl_legacy_send_lq_cmd(priv, ctx,</div><div class='del'>-						&amp;lq_sta-&gt;lq, CMD_ASYNC, false);</div><div class='del'>-		} else</div><div class='del'>-			done_search = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (done_search &amp;&amp; !lq_sta-&gt;stay_in_tbl) {</div><div class='del'>-		/* If the "active" (non-search) mode was legacy,</div><div class='del'>-		 * and we've tried switching antennas,</div><div class='del'>-		 * but we haven't been able to try HT modes (not available),</div><div class='del'>-		 * stay with best antenna legacy modulation for a while</div><div class='del'>-		 * before next round of mode comparisons. */</div><div class='del'>-		tbl1 = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='del'>-		if (is_legacy(tbl1-&gt;lq_type) &amp;&amp; !conf_is_ht(conf) &amp;&amp;</div><div class='del'>-		    lq_sta-&gt;action_counter &gt; tbl1-&gt;max_search) {</div><div class='del'>-			IWL_DEBUG_RATE(priv, "LQ: STAY in legacy table\n");</div><div class='del'>-			iwl4965_rs_set_stay_in_table(priv, 1, lq_sta);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* If we're in an HT mode, and all 3 mode switch actions</div><div class='del'>-		 * have been tried and compared, stay in this best modulation</div><div class='del'>-		 * mode for a while before next round of mode comparisons. */</div><div class='del'>-		if (lq_sta-&gt;enable_counter &amp;&amp;</div><div class='del'>-		    (lq_sta-&gt;action_counter &gt;= tbl1-&gt;max_search)) {</div><div class='del'>-			if ((lq_sta-&gt;last_tpt &gt; IWL_AGG_TPT_THREHOLD) &amp;&amp;</div><div class='del'>-			    (lq_sta-&gt;tx_agg_tid_en &amp; (1 &lt;&lt; tid)) &amp;&amp;</div><div class='del'>-			    (tid != MAX_TID_COUNT)) {</div><div class='del'>-				tid_data =</div><div class='del'>-				   &amp;priv-&gt;stations[lq_sta-&gt;lq.sta_id].tid[tid];</div><div class='del'>-				if (tid_data-&gt;agg.state == IWL_AGG_OFF) {</div><div class='del'>-					IWL_DEBUG_RATE(priv,</div><div class='del'>-						       "try to aggregate tid %d\n",</div><div class='del'>-						       tid);</div><div class='del'>-					iwl4965_rs_tl_turn_on_agg(priv, tid,</div><div class='del'>-							  lq_sta, sta);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			iwl4965_rs_set_stay_in_table(priv, 0, lq_sta);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	tbl-&gt;current_rate = iwl4965_rate_n_flags_from_tbl(priv, tbl,</div><div class='del'>-							index, is_green);</div><div class='del'>-	i = index;</div><div class='del'>-	lq_sta-&gt;last_txrate_idx = i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_rs_initialize_lq - Initialize a station's hardware rate table</div><div class='del'>- *</div><div class='del'>- * The uCode's station table contains a table of fallback rates</div><div class='del'>- * for automatic fallback during transmission.</div><div class='del'>- *</div><div class='del'>- * NOTE: This sets up a default set of values.  These will be replaced later</div><div class='del'>- *       if the driver's iwl-4965-rs rate scaling algorithm is used, instead of</div><div class='del'>- *       rc80211_simple.</div><div class='del'>- *</div><div class='del'>- * NOTE: Run REPLY_ADD_STA command to set up station table entry, before</div><div class='del'>- *       calling this function (which runs REPLY_TX_LINK_QUALITY_CMD,</div><div class='del'>- *       which requires station table entry to exist).</div><div class='del'>- */</div><div class='del'>-static void iwl4965_rs_initialize_lq(struct iwl_priv *priv,</div><div class='del'>-			     struct ieee80211_conf *conf,</div><div class='del'>-			     struct ieee80211_sta *sta,</div><div class='del'>-			     struct iwl_lq_sta *lq_sta)</div><div class='del'>-{</div><div class='del'>-	struct iwl_scale_tbl_info *tbl;</div><div class='del'>-	int rate_idx;</div><div class='del'>-	int i;</div><div class='del'>-	u32 rate;</div><div class='del'>-	u8 use_green = iwl4965_rs_use_green(sta);</div><div class='del'>-	u8 active_tbl = 0;</div><div class='del'>-	u8 valid_tx_ant;</div><div class='del'>-	struct iwl_station_priv *sta_priv;</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-</div><div class='del'>-	if (!sta || !lq_sta)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	sta_priv = (void *)sta-&gt;drv_priv;</div><div class='del'>-	ctx = sta_priv-&gt;common.ctx;</div><div class='del'>-</div><div class='del'>-	i = lq_sta-&gt;last_txrate_idx;</div><div class='del'>-</div><div class='del'>-	valid_tx_ant = priv-&gt;hw_params.valid_tx_ant;</div><div class='del'>-</div><div class='del'>-	if (!lq_sta-&gt;search_better_tbl)</div><div class='del'>-		active_tbl = lq_sta-&gt;active_tbl;</div><div class='del'>-	else</div><div class='del'>-		active_tbl = 1 - lq_sta-&gt;active_tbl;</div><div class='del'>-</div><div class='del'>-	tbl = &amp;(lq_sta-&gt;lq_info[active_tbl]);</div><div class='del'>-</div><div class='del'>-	if ((i &lt; 0) || (i &gt;= IWL_RATE_COUNT))</div><div class='del'>-		i = 0;</div><div class='del'>-</div><div class='del'>-	rate = iwlegacy_rates[i].plcp;</div><div class='del'>-	tbl-&gt;ant_type = iwl4965_first_antenna(valid_tx_ant);</div><div class='del'>-	rate |= tbl-&gt;ant_type &lt;&lt; RATE_MCS_ANT_POS;</div><div class='del'>-</div><div class='del'>-	if (i &gt;= IWL_FIRST_CCK_RATE &amp;&amp; i &lt;= IWL_LAST_CCK_RATE)</div><div class='del'>-		rate |= RATE_MCS_CCK_MSK;</div><div class='del'>-</div><div class='del'>-	iwl4965_rs_get_tbl_info_from_mcs(rate, priv-&gt;band, tbl, &amp;rate_idx);</div><div class='del'>-	if (!iwl4965_rs_is_valid_ant(valid_tx_ant, tbl-&gt;ant_type))</div><div class='del'>-		iwl4965_rs_toggle_antenna(valid_tx_ant, &amp;rate, tbl);</div><div class='del'>-</div><div class='del'>-	rate = iwl4965_rate_n_flags_from_tbl(priv, tbl, rate_idx, use_green);</div><div class='del'>-	tbl-&gt;current_rate = rate;</div><div class='del'>-	iwl4965_rs_set_expected_tpt_table(lq_sta, tbl);</div><div class='del'>-	iwl4965_rs_fill_link_cmd(NULL, lq_sta, rate);</div><div class='del'>-	priv-&gt;stations[lq_sta-&gt;lq.sta_id].lq = &amp;lq_sta-&gt;lq;</div><div class='del'>-	iwl_legacy_send_lq_cmd(priv, ctx, &amp;lq_sta-&gt;lq, CMD_SYNC, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-iwl4965_rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta,</div><div class='del'>-			struct ieee80211_tx_rate_control *txrc)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	struct sk_buff *skb = txrc-&gt;skb;</div><div class='del'>-	struct ieee80211_supported_band *sband = txrc-&gt;sband;</div><div class='del'>-	struct iwl_priv *priv __maybe_unused = (struct iwl_priv *)priv_r;</div><div class='del'>-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	struct iwl_lq_sta *lq_sta = priv_sta;</div><div class='del'>-	int rate_idx;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE_LIMIT(priv, "rate scale calculate new rate for skb\n");</div><div class='del'>-</div><div class='del'>-	/* Get max rate if user set max rate */</div><div class='del'>-	if (lq_sta) {</div><div class='del'>-		lq_sta-&gt;max_rate_idx = txrc-&gt;max_rate_idx;</div><div class='del'>-		if ((sband-&gt;band == IEEE80211_BAND_5GHZ) &amp;&amp;</div><div class='del'>-		    (lq_sta-&gt;max_rate_idx != -1))</div><div class='del'>-			lq_sta-&gt;max_rate_idx += IWL_FIRST_OFDM_RATE;</div><div class='del'>-		if ((lq_sta-&gt;max_rate_idx &lt; 0) ||</div><div class='del'>-		    (lq_sta-&gt;max_rate_idx &gt;= IWL_RATE_COUNT))</div><div class='del'>-			lq_sta-&gt;max_rate_idx = -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Treat uninitialized rate scaling data same as non-existing. */</div><div class='del'>-	if (lq_sta &amp;&amp; !lq_sta-&gt;drv) {</div><div class='del'>-		IWL_DEBUG_RATE(priv, "Rate scaling not initialized yet.\n");</div><div class='del'>-		priv_sta = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Send management frames and NO_ACK data using lowest rate. */</div><div class='del'>-	if (rate_control_send_low(sta, priv_sta, txrc))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!lq_sta)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	rate_idx  = lq_sta-&gt;last_txrate_idx;</div><div class='del'>-</div><div class='del'>-	if (lq_sta-&gt;last_rate_n_flags &amp; RATE_MCS_HT_MSK) {</div><div class='del'>-		rate_idx -= IWL_FIRST_OFDM_RATE;</div><div class='del'>-		/* 6M and 9M shared same MCS index */</div><div class='del'>-		rate_idx = (rate_idx &gt; 0) ? (rate_idx - 1) : 0;</div><div class='del'>-		if (iwl4965_rs_extract_rate(lq_sta-&gt;last_rate_n_flags) &gt;=</div><div class='del'>-			 IWL_RATE_MIMO2_6M_PLCP)</div><div class='del'>-			rate_idx = rate_idx + MCS_INDEX_PER_STREAM;</div><div class='del'>-		info-&gt;control.rates[0].flags = IEEE80211_TX_RC_MCS;</div><div class='del'>-		if (lq_sta-&gt;last_rate_n_flags &amp; RATE_MCS_SGI_MSK)</div><div class='del'>-			info-&gt;control.rates[0].flags |=</div><div class='del'>-					IEEE80211_TX_RC_SHORT_GI;</div><div class='del'>-		if (lq_sta-&gt;last_rate_n_flags &amp; RATE_MCS_DUP_MSK)</div><div class='del'>-			info-&gt;control.rates[0].flags |=</div><div class='del'>-					IEEE80211_TX_RC_DUP_DATA;</div><div class='del'>-		if (lq_sta-&gt;last_rate_n_flags &amp; RATE_MCS_HT40_MSK)</div><div class='del'>-			info-&gt;control.rates[0].flags |=</div><div class='del'>-					IEEE80211_TX_RC_40_MHZ_WIDTH;</div><div class='del'>-		if (lq_sta-&gt;last_rate_n_flags &amp; RATE_MCS_GF_MSK)</div><div class='del'>-			info-&gt;control.rates[0].flags |=</div><div class='del'>-					IEEE80211_TX_RC_GREEN_FIELD;</div><div class='del'>-	} else {</div><div class='del'>-		/* Check for invalid rates */</div><div class='del'>-		if ((rate_idx &lt; 0) || (rate_idx &gt;= IWL_RATE_COUNT_LEGACY) ||</div><div class='del'>-				((sband-&gt;band == IEEE80211_BAND_5GHZ) &amp;&amp;</div><div class='del'>-				 (rate_idx &lt; IWL_FIRST_OFDM_RATE)))</div><div class='del'>-			rate_idx = rate_lowest_index(sband, sta);</div><div class='del'>-		/* On valid 5 GHz rate, adjust index */</div><div class='del'>-		else if (sband-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='del'>-			rate_idx -= IWL_FIRST_OFDM_RATE;</div><div class='del'>-		info-&gt;control.rates[0].flags = 0;</div><div class='del'>-	}</div><div class='del'>-	info-&gt;control.rates[0].idx = rate_idx;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *iwl4965_rs_alloc_sta(void *priv_rate, struct ieee80211_sta *sta,</div><div class='del'>-			  gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	struct iwl_lq_sta *lq_sta;</div><div class='del'>-	struct iwl_station_priv *sta_priv =</div><div class='del'>-				(struct iwl_station_priv *) sta-&gt;drv_priv;</div><div class='del'>-	struct iwl_priv *priv;</div><div class='del'>-</div><div class='del'>-	priv = (struct iwl_priv *)priv_rate;</div><div class='del'>-	IWL_DEBUG_RATE(priv, "create station rate scale window\n");</div><div class='del'>-</div><div class='del'>-	lq_sta = &amp;sta_priv-&gt;lq_sta;</div><div class='del'>-</div><div class='del'>-	return lq_sta;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Called after adding a new station to initialize rate scaling</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-iwl4965_rs_rate_init(struct iwl_priv *priv,</div><div class='del'>-			struct ieee80211_sta *sta,</div><div class='del'>-			u8 sta_id)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-	struct ieee80211_hw *hw = priv-&gt;hw;</div><div class='del'>-	struct ieee80211_conf *conf = &amp;priv-&gt;hw-&gt;conf;</div><div class='del'>-	struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='del'>-	struct iwl_station_priv *sta_priv;</div><div class='del'>-	struct iwl_lq_sta *lq_sta;</div><div class='del'>-	struct ieee80211_supported_band *sband;</div><div class='del'>-</div><div class='del'>-	sta_priv = (struct iwl_station_priv *) sta-&gt;drv_priv;</div><div class='del'>-	lq_sta = &amp;sta_priv-&gt;lq_sta;</div><div class='del'>-	sband = hw-&gt;wiphy-&gt;bands[conf-&gt;channel-&gt;band];</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	lq_sta-&gt;lq.sta_id = sta_id;</div><div class='del'>-</div><div class='del'>-	for (j = 0; j &lt; LQ_SIZE; j++)</div><div class='del'>-		for (i = 0; i &lt; IWL_RATE_COUNT; i++)</div><div class='del'>-			iwl4965_rs_rate_scale_clear_window(</div><div class='del'>-					&amp;lq_sta-&gt;lq_info[j].win[i]);</div><div class='del'>-</div><div class='del'>-	lq_sta-&gt;flush_timer = 0;</div><div class='del'>-	lq_sta-&gt;supp_rates = sta-&gt;supp_rates[sband-&gt;band];</div><div class='del'>-	for (j = 0; j &lt; LQ_SIZE; j++)</div><div class='del'>-		for (i = 0; i &lt; IWL_RATE_COUNT; i++)</div><div class='del'>-			iwl4965_rs_rate_scale_clear_window(</div><div class='del'>-					&amp;lq_sta-&gt;lq_info[j].win[i]);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "LQ:"</div><div class='del'>-			"*** rate scale station global init for station %d ***\n",</div><div class='del'>-		       sta_id);</div><div class='del'>-	/* TODO: what is a good starting rate for STA? About middle? Maybe not</div><div class='del'>-	 * the lowest or the highest rate.. Could consider using RSSI from</div><div class='del'>-	 * previous packets? Need to have IEEE 802.1X auth succeed immediately</div><div class='del'>-	 * after assoc.. */</div><div class='del'>-</div><div class='del'>-	lq_sta-&gt;is_dup = 0;</div><div class='del'>-	lq_sta-&gt;max_rate_idx = -1;</div><div class='del'>-	lq_sta-&gt;missed_rate_counter = IWL_MISSED_RATE_MAX;</div><div class='del'>-	lq_sta-&gt;is_green = iwl4965_rs_use_green(sta);</div><div class='del'>-	lq_sta-&gt;active_legacy_rate = priv-&gt;active_rate &amp; ~(0x1000);</div><div class='del'>-	lq_sta-&gt;band = priv-&gt;band;</div><div class='del'>-	/*</div><div class='del'>-	 * active_siso_rate mask includes 9 MBits (bit 5), and CCK (bits 0-3),</div><div class='del'>-	 * supp_rates[] does not; shift to convert format, force 9 MBits off.</div><div class='del'>-	 */</div><div class='del'>-	lq_sta-&gt;active_siso_rate = ht_cap-&gt;mcs.rx_mask[0] &lt;&lt; 1;</div><div class='del'>-	lq_sta-&gt;active_siso_rate |= ht_cap-&gt;mcs.rx_mask[0] &amp; 0x1;</div><div class='del'>-	lq_sta-&gt;active_siso_rate &amp;= ~((u16)0x2);</div><div class='del'>-	lq_sta-&gt;active_siso_rate &lt;&lt;= IWL_FIRST_OFDM_RATE;</div><div class='del'>-</div><div class='del'>-	/* Same here */</div><div class='del'>-	lq_sta-&gt;active_mimo2_rate = ht_cap-&gt;mcs.rx_mask[1] &lt;&lt; 1;</div><div class='del'>-	lq_sta-&gt;active_mimo2_rate |= ht_cap-&gt;mcs.rx_mask[1] &amp; 0x1;</div><div class='del'>-	lq_sta-&gt;active_mimo2_rate &amp;= ~((u16)0x2);</div><div class='del'>-	lq_sta-&gt;active_mimo2_rate &lt;&lt;= IWL_FIRST_OFDM_RATE;</div><div class='del'>-</div><div class='del'>-	/* These values will be overridden later */</div><div class='del'>-	lq_sta-&gt;lq.general_params.single_stream_ant_msk =</div><div class='del'>-		iwl4965_first_antenna(priv-&gt;hw_params.valid_tx_ant);</div><div class='del'>-	lq_sta-&gt;lq.general_params.dual_stream_ant_msk =</div><div class='del'>-		priv-&gt;hw_params.valid_tx_ant &amp;</div><div class='del'>-		~iwl4965_first_antenna(priv-&gt;hw_params.valid_tx_ant);</div><div class='del'>-	if (!lq_sta-&gt;lq.general_params.dual_stream_ant_msk) {</div><div class='del'>-		lq_sta-&gt;lq.general_params.dual_stream_ant_msk = ANT_AB;</div><div class='del'>-	} else if (iwl4965_num_of_ant(priv-&gt;hw_params.valid_tx_ant) == 2) {</div><div class='del'>-		lq_sta-&gt;lq.general_params.dual_stream_ant_msk =</div><div class='del'>-			priv-&gt;hw_params.valid_tx_ant;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* as default allow aggregation for all tids */</div><div class='del'>-	lq_sta-&gt;tx_agg_tid_en = IWL_AGG_ALL_TID;</div><div class='del'>-	lq_sta-&gt;drv = priv;</div><div class='del'>-</div><div class='del'>-	/* Set last_txrate_idx to lowest rate */</div><div class='del'>-	lq_sta-&gt;last_txrate_idx = rate_lowest_index(sband, sta);</div><div class='del'>-	if (sband-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='del'>-		lq_sta-&gt;last_txrate_idx += IWL_FIRST_OFDM_RATE;</div><div class='del'>-	lq_sta-&gt;is_agg = 0;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='del'>-	lq_sta-&gt;dbg_fixed_rate = 0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	iwl4965_rs_initialize_lq(priv, conf, sta, lq_sta);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_rs_fill_link_cmd(struct iwl_priv *priv,</div><div class='del'>-			     struct iwl_lq_sta *lq_sta, u32 new_rate)</div><div class='del'>-{</div><div class='del'>-	struct iwl_scale_tbl_info tbl_type;</div><div class='del'>-	int index = 0;</div><div class='del'>-	int rate_idx;</div><div class='del'>-	int repeat_rate = 0;</div><div class='del'>-	u8 ant_toggle_cnt = 0;</div><div class='del'>-	u8 use_ht_possible = 1;</div><div class='del'>-	u8 valid_tx_ant = 0;</div><div class='del'>-	struct iwl_link_quality_cmd *lq_cmd = &amp;lq_sta-&gt;lq;</div><div class='del'>-</div><div class='del'>-	/* Override starting rate (index 0) if needed for debug purposes */</div><div class='del'>-	iwl4965_rs_dbgfs_set_mcs(lq_sta, &amp;new_rate, index);</div><div class='del'>-</div><div class='del'>-	/* Interpret new_rate (rate_n_flags) */</div><div class='del'>-	iwl4965_rs_get_tbl_info_from_mcs(new_rate, lq_sta-&gt;band,</div><div class='del'>-				  &amp;tbl_type, &amp;rate_idx);</div><div class='del'>-</div><div class='del'>-	/* How many times should we repeat the initial rate? */</div><div class='del'>-	if (is_legacy(tbl_type.lq_type)) {</div><div class='del'>-		ant_toggle_cnt = 1;</div><div class='del'>-		repeat_rate = IWL_NUMBER_TRY;</div><div class='del'>-	} else {</div><div class='del'>-		repeat_rate = IWL_HT_NUMBER_TRY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lq_cmd-&gt;general_params.mimo_delimiter =</div><div class='del'>-			is_mimo(tbl_type.lq_type) ? 1 : 0;</div><div class='del'>-</div><div class='del'>-	/* Fill 1st table entry (index 0) */</div><div class='del'>-	lq_cmd-&gt;rs_table[index].rate_n_flags = cpu_to_le32(new_rate);</div><div class='del'>-</div><div class='del'>-	if (iwl4965_num_of_ant(tbl_type.ant_type) == 1) {</div><div class='del'>-		lq_cmd-&gt;general_params.single_stream_ant_msk =</div><div class='del'>-						tbl_type.ant_type;</div><div class='del'>-	} else if (iwl4965_num_of_ant(tbl_type.ant_type) == 2) {</div><div class='del'>-		lq_cmd-&gt;general_params.dual_stream_ant_msk =</div><div class='del'>-						tbl_type.ant_type;</div><div class='del'>-	} /* otherwise we don't modify the existing value */</div><div class='del'>-</div><div class='del'>-	index++;</div><div class='del'>-	repeat_rate--;</div><div class='del'>-	if (priv)</div><div class='del'>-		valid_tx_ant = priv-&gt;hw_params.valid_tx_ant;</div><div class='del'>-</div><div class='del'>-	/* Fill rest of rate table */</div><div class='del'>-	while (index &lt; LINK_QUAL_MAX_RETRY_NUM) {</div><div class='del'>-		/* Repeat initial/next rate.</div><div class='del'>-		 * For legacy IWL_NUMBER_TRY == 1, this loop will not execute.</div><div class='del'>-		 * For HT IWL_HT_NUMBER_TRY == 3, this executes twice. */</div><div class='del'>-		while (repeat_rate &gt; 0 &amp;&amp; (index &lt; LINK_QUAL_MAX_RETRY_NUM)) {</div><div class='del'>-			if (is_legacy(tbl_type.lq_type)) {</div><div class='del'>-				if (ant_toggle_cnt &lt; NUM_TRY_BEFORE_ANT_TOGGLE)</div><div class='del'>-					ant_toggle_cnt++;</div><div class='del'>-				else if (priv &amp;&amp;</div><div class='del'>-					 iwl4965_rs_toggle_antenna(valid_tx_ant,</div><div class='del'>-							&amp;new_rate, &amp;tbl_type))</div><div class='del'>-					ant_toggle_cnt = 1;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Override next rate if needed for debug purposes */</div><div class='del'>-			iwl4965_rs_dbgfs_set_mcs(lq_sta, &amp;new_rate, index);</div><div class='del'>-</div><div class='del'>-			/* Fill next table entry */</div><div class='del'>-			lq_cmd-&gt;rs_table[index].rate_n_flags =</div><div class='del'>-					cpu_to_le32(new_rate);</div><div class='del'>-			repeat_rate--;</div><div class='del'>-			index++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		iwl4965_rs_get_tbl_info_from_mcs(new_rate,</div><div class='del'>-						lq_sta-&gt;band, &amp;tbl_type,</div><div class='del'>-						&amp;rate_idx);</div><div class='del'>-</div><div class='del'>-		/* Indicate to uCode which entries might be MIMO.</div><div class='del'>-		 * If initial rate was MIMO, this will finally end up</div><div class='del'>-		 * as (IWL_HT_NUMBER_TRY * 2), after 2nd pass, otherwise 0. */</div><div class='del'>-		if (is_mimo(tbl_type.lq_type))</div><div class='del'>-			lq_cmd-&gt;general_params.mimo_delimiter = index;</div><div class='del'>-</div><div class='del'>-		/* Get next rate */</div><div class='del'>-		new_rate = iwl4965_rs_get_lower_rate(lq_sta,</div><div class='del'>-					&amp;tbl_type, rate_idx,</div><div class='del'>-					     use_ht_possible);</div><div class='del'>-</div><div class='del'>-		/* How many times should we repeat the next rate? */</div><div class='del'>-		if (is_legacy(tbl_type.lq_type)) {</div><div class='del'>-			if (ant_toggle_cnt &lt; NUM_TRY_BEFORE_ANT_TOGGLE)</div><div class='del'>-				ant_toggle_cnt++;</div><div class='del'>-			else if (priv &amp;&amp;</div><div class='del'>-				 iwl4965_rs_toggle_antenna(valid_tx_ant,</div><div class='del'>-						   &amp;new_rate, &amp;tbl_type))</div><div class='del'>-				ant_toggle_cnt = 1;</div><div class='del'>-</div><div class='del'>-			repeat_rate = IWL_NUMBER_TRY;</div><div class='del'>-		} else {</div><div class='del'>-			repeat_rate = IWL_HT_NUMBER_TRY;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Don't allow HT rates after next pass.</div><div class='del'>-		 * iwl4965_rs_get_lower_rate() will change type to LQ_A or LQ_G. */</div><div class='del'>-		use_ht_possible = 0;</div><div class='del'>-</div><div class='del'>-		/* Override next rate if needed for debug purposes */</div><div class='del'>-		iwl4965_rs_dbgfs_set_mcs(lq_sta, &amp;new_rate, index);</div><div class='del'>-</div><div class='del'>-		/* Fill next table entry */</div><div class='del'>-		lq_cmd-&gt;rs_table[index].rate_n_flags = cpu_to_le32(new_rate);</div><div class='del'>-</div><div class='del'>-		index++;</div><div class='del'>-		repeat_rate--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lq_cmd-&gt;agg_params.agg_frame_cnt_limit = LINK_QUAL_AGG_FRAME_LIMIT_DEF;</div><div class='del'>-	lq_cmd-&gt;agg_params.agg_dis_start_th = LINK_QUAL_AGG_DISABLE_START_DEF;</div><div class='del'>-</div><div class='del'>-	lq_cmd-&gt;agg_params.agg_time_limit =</div><div class='del'>-		cpu_to_le16(LINK_QUAL_AGG_TIME_LIMIT_DEF);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-*iwl4965_rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)</div><div class='del'>-{</div><div class='del'>-	return hw-&gt;priv;</div><div class='del'>-}</div><div class='del'>-/* rate scale requires free function to be implemented */</div><div class='del'>-static void iwl4965_rs_free(void *priv_rate)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_rs_free_sta(void *priv_r, struct ieee80211_sta *sta,</div><div class='del'>-			void *priv_sta)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv __maybe_unused = priv_r;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "enter\n");</div><div class='del'>-	IWL_DEBUG_RATE(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='del'>-static int iwl4965_open_file_generic(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	file-&gt;private_data = inode-&gt;i_private;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static void iwl4965_rs_dbgfs_set_mcs(struct iwl_lq_sta *lq_sta,</div><div class='del'>-			     u32 *rate_n_flags, int index)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv;</div><div class='del'>-	u8 valid_tx_ant;</div><div class='del'>-	u8 ant_sel_tx;</div><div class='del'>-</div><div class='del'>-	priv = lq_sta-&gt;drv;</div><div class='del'>-	valid_tx_ant = priv-&gt;hw_params.valid_tx_ant;</div><div class='del'>-	if (lq_sta-&gt;dbg_fixed_rate) {</div><div class='del'>-		ant_sel_tx =</div><div class='del'>-		  ((lq_sta-&gt;dbg_fixed_rate &amp; RATE_MCS_ANT_ABC_MSK)</div><div class='del'>-		  &gt;&gt; RATE_MCS_ANT_POS);</div><div class='del'>-		if ((valid_tx_ant &amp; ant_sel_tx) == ant_sel_tx) {</div><div class='del'>-			*rate_n_flags = lq_sta-&gt;dbg_fixed_rate;</div><div class='del'>-			IWL_DEBUG_RATE(priv, "Fixed rate ON\n");</div><div class='del'>-		} else {</div><div class='del'>-			lq_sta-&gt;dbg_fixed_rate = 0;</div><div class='del'>-			IWL_ERR(priv,</div><div class='del'>-			    "Invalid antenna selection 0x%X, Valid is 0x%X\n",</div><div class='del'>-			    ant_sel_tx, valid_tx_ant);</div><div class='del'>-			IWL_DEBUG_RATE(priv, "Fixed rate OFF\n");</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		IWL_DEBUG_RATE(priv, "Fixed rate OFF\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl4965_rs_sta_dbgfs_scale_table_write(struct file *file,</div><div class='del'>-			const char __user *user_buf, size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_lq_sta *lq_sta = file-&gt;private_data;</div><div class='del'>-	struct iwl_priv *priv;</div><div class='del'>-	char buf[64];</div><div class='del'>-	size_t buf_size;</div><div class='del'>-	u32 parsed_rate;</div><div class='del'>-	struct iwl_station_priv *sta_priv =</div><div class='del'>-		container_of(lq_sta, struct iwl_station_priv, lq_sta);</div><div class='del'>-	struct iwl_rxon_context *ctx = sta_priv-&gt;common.ctx;</div><div class='del'>-</div><div class='del'>-	priv = lq_sta-&gt;drv;</div><div class='del'>-	memset(buf, 0, sizeof(buf));</div><div class='del'>-	buf_size = min(count, sizeof(buf) -  1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, buf_size))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (sscanf(buf, "%x", &amp;parsed_rate) == 1)</div><div class='del'>-		lq_sta-&gt;dbg_fixed_rate = parsed_rate;</div><div class='del'>-	else</div><div class='del'>-		lq_sta-&gt;dbg_fixed_rate = 0;</div><div class='del'>-</div><div class='del'>-	lq_sta-&gt;active_legacy_rate = 0x0FFF;	/* 1 - 54 MBits, includes CCK */</div><div class='del'>-	lq_sta-&gt;active_siso_rate   = 0x1FD0;	/* 6 - 60 MBits, no 9, no CCK */</div><div class='del'>-	lq_sta-&gt;active_mimo2_rate  = 0x1FD0;	/* 6 - 60 MBits, no 9, no CCK */</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "sta_id %d rate 0x%X\n",</div><div class='del'>-		lq_sta-&gt;lq.sta_id, lq_sta-&gt;dbg_fixed_rate);</div><div class='del'>-</div><div class='del'>-	if (lq_sta-&gt;dbg_fixed_rate) {</div><div class='del'>-		iwl4965_rs_fill_link_cmd(NULL, lq_sta, lq_sta-&gt;dbg_fixed_rate);</div><div class='del'>-		iwl_legacy_send_lq_cmd(lq_sta-&gt;drv, ctx, &amp;lq_sta-&gt;lq, CMD_ASYNC,</div><div class='del'>-				false);</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 ssize_t iwl4965_rs_sta_dbgfs_scale_table_read(struct file *file,</div><div class='del'>-			char __user *user_buf, size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	char *buff;</div><div class='del'>-	int desc = 0;</div><div class='del'>-	int i = 0;</div><div class='del'>-	int index = 0;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	struct iwl_lq_sta *lq_sta = file-&gt;private_data;</div><div class='del'>-	struct iwl_priv *priv;</div><div class='del'>-	struct iwl_scale_tbl_info *tbl = &amp;(lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl]);</div><div class='del'>-</div><div class='del'>-	priv = lq_sta-&gt;drv;</div><div class='del'>-	buff = kmalloc(1024, GFP_KERNEL);</div><div class='del'>-	if (!buff)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	desc += sprintf(buff+desc, "sta_id %d\n", lq_sta-&gt;lq.sta_id);</div><div class='del'>-	desc += sprintf(buff+desc, "failed=%d success=%d rate=0%X\n",</div><div class='del'>-			lq_sta-&gt;total_failed, lq_sta-&gt;total_success,</div><div class='del'>-			lq_sta-&gt;active_legacy_rate);</div><div class='del'>-	desc += sprintf(buff+desc, "fixed rate 0x%X\n",</div><div class='del'>-			lq_sta-&gt;dbg_fixed_rate);</div><div class='del'>-	desc += sprintf(buff+desc, "valid_tx_ant %s%s%s\n",</div><div class='del'>-	    (priv-&gt;hw_params.valid_tx_ant &amp; ANT_A) ? "ANT_A," : "",</div><div class='del'>-	    (priv-&gt;hw_params.valid_tx_ant &amp; ANT_B) ? "ANT_B," : "",</div><div class='del'>-	    (priv-&gt;hw_params.valid_tx_ant &amp; ANT_C) ? "ANT_C" : "");</div><div class='del'>-	desc += sprintf(buff+desc, "lq type %s\n",</div><div class='del'>-	   (is_legacy(tbl-&gt;lq_type)) ? "legacy" : "HT");</div><div class='del'>-	if (is_Ht(tbl-&gt;lq_type)) {</div><div class='del'>-		desc += sprintf(buff+desc, " %s",</div><div class='del'>-		   (is_siso(tbl-&gt;lq_type)) ? "SISO" : "MIMO2");</div><div class='del'>-		   desc += sprintf(buff+desc, " %s",</div><div class='del'>-		   (tbl-&gt;is_ht40) ? "40MHz" : "20MHz");</div><div class='del'>-		   desc += sprintf(buff+desc, " %s %s %s\n",</div><div class='del'>-			(tbl-&gt;is_SGI) ? "SGI" : "",</div><div class='del'>-		   (lq_sta-&gt;is_green) ? "GF enabled" : "",</div><div class='del'>-		   (lq_sta-&gt;is_agg) ? "AGG on" : "");</div><div class='del'>-	}</div><div class='del'>-	desc += sprintf(buff+desc, "last tx rate=0x%X\n",</div><div class='del'>-		lq_sta-&gt;last_rate_n_flags);</div><div class='del'>-	desc += sprintf(buff+desc, "general:"</div><div class='del'>-		"flags=0x%X mimo-d=%d s-ant0x%x d-ant=0x%x\n",</div><div class='del'>-		lq_sta-&gt;lq.general_params.flags,</div><div class='del'>-		lq_sta-&gt;lq.general_params.mimo_delimiter,</div><div class='del'>-		lq_sta-&gt;lq.general_params.single_stream_ant_msk,</div><div class='del'>-		lq_sta-&gt;lq.general_params.dual_stream_ant_msk);</div><div class='del'>-</div><div class='del'>-	desc += sprintf(buff+desc, "agg:"</div><div class='del'>-			"time_limit=%d dist_start_th=%d frame_cnt_limit=%d\n",</div><div class='del'>-			le16_to_cpu(lq_sta-&gt;lq.agg_params.agg_time_limit),</div><div class='del'>-			lq_sta-&gt;lq.agg_params.agg_dis_start_th,</div><div class='del'>-			lq_sta-&gt;lq.agg_params.agg_frame_cnt_limit);</div><div class='del'>-</div><div class='del'>-	desc += sprintf(buff+desc,</div><div class='del'>-			"Start idx [0]=0x%x [1]=0x%x [2]=0x%x [3]=0x%x\n",</div><div class='del'>-			lq_sta-&gt;lq.general_params.start_rate_index[0],</div><div class='del'>-			lq_sta-&gt;lq.general_params.start_rate_index[1],</div><div class='del'>-			lq_sta-&gt;lq.general_params.start_rate_index[2],</div><div class='del'>-			lq_sta-&gt;lq.general_params.start_rate_index[3]);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; LINK_QUAL_MAX_RETRY_NUM; i++) {</div><div class='del'>-		index = iwl4965_hwrate_to_plcp_idx(</div><div class='del'>-			le32_to_cpu(lq_sta-&gt;lq.rs_table[i].rate_n_flags));</div><div class='del'>-		if (is_legacy(tbl-&gt;lq_type)) {</div><div class='del'>-			desc += sprintf(buff+desc, " rate[%d] 0x%X %smbps\n",</div><div class='del'>-			i,</div><div class='del'>-			le32_to_cpu(lq_sta-&gt;lq.rs_table[i].rate_n_flags),</div><div class='del'>-			iwl_rate_mcs[index].mbps);</div><div class='del'>-		} else {</div><div class='del'>-			desc += sprintf(buff+desc,</div><div class='del'>-			" rate[%d] 0x%X %smbps (%s)\n",</div><div class='del'>-			i,</div><div class='del'>-			le32_to_cpu(lq_sta-&gt;lq.rs_table[i].rate_n_flags),</div><div class='del'>-			iwl_rate_mcs[index].mbps, iwl_rate_mcs[index].mcs);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);</div><div class='del'>-	kfree(buff);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations rs_sta_dbgfs_scale_table_ops = {</div><div class='del'>-	.write = iwl4965_rs_sta_dbgfs_scale_table_write,</div><div class='del'>-	.read = iwl4965_rs_sta_dbgfs_scale_table_read,</div><div class='del'>-	.open = iwl4965_open_file_generic,</div><div class='del'>-	.llseek = default_llseek,</div><div class='del'>-};</div><div class='del'>-static ssize_t iwl4965_rs_sta_dbgfs_stats_table_read(struct file *file,</div><div class='del'>-			char __user *user_buf, size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	char *buff;</div><div class='del'>-	int desc = 0;</div><div class='del'>-	int i, j;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	struct iwl_lq_sta *lq_sta = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	buff = kmalloc(1024, GFP_KERNEL);</div><div class='del'>-	if (!buff)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; LQ_SIZE; i++) {</div><div class='del'>-		desc += sprintf(buff+desc,</div><div class='del'>-				"%s type=%d SGI=%d HT40=%d DUP=%d GF=%d\n"</div><div class='del'>-				"rate=0x%X\n",</div><div class='del'>-				lq_sta-&gt;active_tbl == i ? "*" : "x",</div><div class='del'>-				lq_sta-&gt;lq_info[i].lq_type,</div><div class='del'>-				lq_sta-&gt;lq_info[i].is_SGI,</div><div class='del'>-				lq_sta-&gt;lq_info[i].is_ht40,</div><div class='del'>-				lq_sta-&gt;lq_info[i].is_dup,</div><div class='del'>-				lq_sta-&gt;is_green,</div><div class='del'>-				lq_sta-&gt;lq_info[i].current_rate);</div><div class='del'>-		for (j = 0; j &lt; IWL_RATE_COUNT; j++) {</div><div class='del'>-			desc += sprintf(buff+desc,</div><div class='del'>-				"counter=%d success=%d %%=%d\n",</div><div class='del'>-				lq_sta-&gt;lq_info[i].win[j].counter,</div><div class='del'>-				lq_sta-&gt;lq_info[i].win[j].success_counter,</div><div class='del'>-				lq_sta-&gt;lq_info[i].win[j].success_ratio);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);</div><div class='del'>-	kfree(buff);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations rs_sta_dbgfs_stats_table_ops = {</div><div class='del'>-	.read = iwl4965_rs_sta_dbgfs_stats_table_read,</div><div class='del'>-	.open = iwl4965_open_file_generic,</div><div class='del'>-	.llseek = default_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t iwl4965_rs_sta_dbgfs_rate_scale_data_read(struct file *file,</div><div class='del'>-			char __user *user_buf, size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	char buff[120];</div><div class='del'>-	int desc = 0;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	struct iwl_lq_sta *lq_sta = file-&gt;private_data;</div><div class='del'>-	struct iwl_priv *priv;</div><div class='del'>-	struct iwl_scale_tbl_info *tbl = &amp;lq_sta-&gt;lq_info[lq_sta-&gt;active_tbl];</div><div class='del'>-</div><div class='del'>-	priv = lq_sta-&gt;drv;</div><div class='del'>-</div><div class='del'>-	if (is_Ht(tbl-&gt;lq_type))</div><div class='del'>-		desc += sprintf(buff+desc,</div><div class='del'>-				"Bit Rate= %d Mb/s\n",</div><div class='del'>-				tbl-&gt;expected_tpt[lq_sta-&gt;last_txrate_idx]);</div><div class='del'>-	else</div><div class='del'>-		desc += sprintf(buff+desc,</div><div class='del'>-				"Bit Rate= %d Mb/s\n",</div><div class='del'>-				iwlegacy_rates[lq_sta-&gt;last_txrate_idx].ieee &gt;&gt; 1);</div><div class='del'>-</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations rs_sta_dbgfs_rate_scale_data_ops = {</div><div class='del'>-	.read = iwl4965_rs_sta_dbgfs_rate_scale_data_read,</div><div class='del'>-	.open = iwl4965_open_file_generic,</div><div class='del'>-	.llseek = default_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void iwl4965_rs_add_debugfs(void *priv, void *priv_sta,</div><div class='del'>-					struct dentry *dir)</div><div class='del'>-{</div><div class='del'>-	struct iwl_lq_sta *lq_sta = priv_sta;</div><div class='del'>-	lq_sta-&gt;rs_sta_dbgfs_scale_table_file =</div><div class='del'>-		debugfs_create_file("rate_scale_table", S_IRUSR | S_IWUSR, dir,</div><div class='del'>-				lq_sta, &amp;rs_sta_dbgfs_scale_table_ops);</div><div class='del'>-	lq_sta-&gt;rs_sta_dbgfs_stats_table_file =</div><div class='del'>-		debugfs_create_file("rate_stats_table", S_IRUSR, dir,</div><div class='del'>-			lq_sta, &amp;rs_sta_dbgfs_stats_table_ops);</div><div class='del'>-	lq_sta-&gt;rs_sta_dbgfs_rate_scale_data_file =</div><div class='del'>-		debugfs_create_file("rate_scale_data", S_IRUSR, dir,</div><div class='del'>-			lq_sta, &amp;rs_sta_dbgfs_rate_scale_data_ops);</div><div class='del'>-	lq_sta-&gt;rs_sta_dbgfs_tx_agg_tid_en_file =</div><div class='del'>-		debugfs_create_u8("tx_agg_tid_enable", S_IRUSR | S_IWUSR, dir,</div><div class='del'>-		&amp;lq_sta-&gt;tx_agg_tid_en);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_rs_remove_debugfs(void *priv, void *priv_sta)</div><div class='del'>-{</div><div class='del'>-	struct iwl_lq_sta *lq_sta = priv_sta;</div><div class='del'>-	debugfs_remove(lq_sta-&gt;rs_sta_dbgfs_scale_table_file);</div><div class='del'>-	debugfs_remove(lq_sta-&gt;rs_sta_dbgfs_stats_table_file);</div><div class='del'>-	debugfs_remove(lq_sta-&gt;rs_sta_dbgfs_rate_scale_data_file);</div><div class='del'>-	debugfs_remove(lq_sta-&gt;rs_sta_dbgfs_tx_agg_tid_en_file);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initialization of rate scaling information is done by driver after</div><div class='del'>- * the station is added. Since mac80211 calls this function before a</div><div class='del'>- * station is added we ignore it.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-iwl4965_rs_rate_init_stub(void *priv_r, struct ieee80211_supported_band *sband,</div><div class='del'>-			 struct ieee80211_sta *sta, void *priv_sta)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static struct rate_control_ops rs_4965_ops = {</div><div class='del'>-	.module = NULL,</div><div class='del'>-	.name = IWL4965_RS_NAME,</div><div class='del'>-	.tx_status = iwl4965_rs_tx_status,</div><div class='del'>-	.get_rate = iwl4965_rs_get_rate,</div><div class='del'>-	.rate_init = iwl4965_rs_rate_init_stub,</div><div class='del'>-	.alloc = iwl4965_rs_alloc,</div><div class='del'>-	.free = iwl4965_rs_free,</div><div class='del'>-	.alloc_sta = iwl4965_rs_alloc_sta,</div><div class='del'>-	.free_sta = iwl4965_rs_free_sta,</div><div class='del'>-#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='del'>-	.add_sta_debugfs = iwl4965_rs_add_debugfs,</div><div class='del'>-	.remove_sta_debugfs = iwl4965_rs_remove_debugfs,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int iwl4965_rate_control_register(void)</div><div class='del'>-{</div><div class='del'>-	return ieee80211_rate_control_register(&amp;rs_4965_ops);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl4965_rate_control_unregister(void)</div><div class='del'>-{</div><div class='del'>-	ieee80211_rate_control_unregister(&amp;rs_4965_ops);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-rx.c b/drivers/net/wireless/iwlegacy/iwl-4965-rx.c<br/>deleted file mode 100644<br/>index 2b144bbfc3c5..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-4965-rx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-rx.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,215 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * GPL LICENSE SUMMARY</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2008 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-4965-calib.h"</div><div class='del'>-#include "iwl-sta.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-#include "iwl-helpers.h"</div><div class='del'>-#include "iwl-4965-hw.h"</div><div class='del'>-#include "iwl-4965.h"</div><div class='del'>-</div><div class='del'>-void iwl4965_rx_missed_beacon_notif(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_missed_beacon_notif *missed_beacon;</div><div class='del'>-</div><div class='del'>-	missed_beacon = &amp;pkt-&gt;u.missed_beacon;</div><div class='del'>-	if (le32_to_cpu(missed_beacon-&gt;consecutive_missed_beacons) &gt;</div><div class='del'>-	    priv-&gt;missed_beacon_threshold) {</div><div class='del'>-		IWL_DEBUG_CALIB(priv,</div><div class='del'>-		    "missed bcn cnsq %d totl %d rcd %d expctd %d\n",</div><div class='del'>-		    le32_to_cpu(missed_beacon-&gt;consecutive_missed_beacons),</div><div class='del'>-		    le32_to_cpu(missed_beacon-&gt;total_missed_becons),</div><div class='del'>-		    le32_to_cpu(missed_beacon-&gt;num_recvd_beacons),</div><div class='del'>-		    le32_to_cpu(missed_beacon-&gt;num_expected_beacons));</div><div class='del'>-		if (!test_bit(STATUS_SCANNING, &amp;priv-&gt;status))</div><div class='del'>-			iwl4965_init_sensitivity(priv);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Calculate noise level, based on measurements during network silence just</div><div class='del'>- *   before arriving beacon.  This measurement can be done only if we know</div><div class='del'>- *   exactly when to expect beacons, therefore only when we're associated. */</div><div class='del'>-static void iwl4965_rx_calc_noise(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct statistics_rx_non_phy *rx_info;</div><div class='del'>-	int num_active_rx = 0;</div><div class='del'>-	int total_silence = 0;</div><div class='del'>-	int bcn_silence_a, bcn_silence_b, bcn_silence_c;</div><div class='del'>-	int last_rx_noise;</div><div class='del'>-</div><div class='del'>-	rx_info = &amp;(priv-&gt;_4965.statistics.rx.general);</div><div class='del'>-	bcn_silence_a =</div><div class='del'>-		le32_to_cpu(rx_info-&gt;beacon_silence_rssi_a) &amp; IN_BAND_FILTER;</div><div class='del'>-	bcn_silence_b =</div><div class='del'>-		le32_to_cpu(rx_info-&gt;beacon_silence_rssi_b) &amp; IN_BAND_FILTER;</div><div class='del'>-	bcn_silence_c =</div><div class='del'>-		le32_to_cpu(rx_info-&gt;beacon_silence_rssi_c) &amp; IN_BAND_FILTER;</div><div class='del'>-</div><div class='del'>-	if (bcn_silence_a) {</div><div class='del'>-		total_silence += bcn_silence_a;</div><div class='del'>-		num_active_rx++;</div><div class='del'>-	}</div><div class='del'>-	if (bcn_silence_b) {</div><div class='del'>-		total_silence += bcn_silence_b;</div><div class='del'>-		num_active_rx++;</div><div class='del'>-	}</div><div class='del'>-	if (bcn_silence_c) {</div><div class='del'>-		total_silence += bcn_silence_c;</div><div class='del'>-		num_active_rx++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Average among active antennas */</div><div class='del'>-	if (num_active_rx)</div><div class='del'>-		last_rx_noise = (total_silence / num_active_rx) - 107;</div><div class='del'>-	else</div><div class='del'>-		last_rx_noise = IWL_NOISE_MEAS_NOT_AVAILABLE;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_CALIB(priv, "inband silence a %u, b %u, c %u, dBm %d\n",</div><div class='del'>-			bcn_silence_a, bcn_silence_b, bcn_silence_c,</div><div class='del'>-			last_rx_noise);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS</div><div class='del'>-/*</div><div class='del'>- *  based on the assumption of all statistics counter are in DWORD</div><div class='del'>- *  FIXME: This function is for debugging, do not deal with</div><div class='del'>- *  the case of counters roll-over.</div><div class='del'>- */</div><div class='del'>-static void iwl4965_accumulative_statistics(struct iwl_priv *priv,</div><div class='del'>-					__le32 *stats)</div><div class='del'>-{</div><div class='del'>-	int i, size;</div><div class='del'>-	__le32 *prev_stats;</div><div class='del'>-	u32 *accum_stats;</div><div class='del'>-	u32 *delta, *max_delta;</div><div class='del'>-	struct statistics_general_common *general, *accum_general;</div><div class='del'>-	struct statistics_tx *tx, *accum_tx;</div><div class='del'>-</div><div class='del'>-	prev_stats = (__le32 *)&amp;priv-&gt;_4965.statistics;</div><div class='del'>-	accum_stats = (u32 *)&amp;priv-&gt;_4965.accum_statistics;</div><div class='del'>-	size = sizeof(struct iwl_notif_statistics);</div><div class='del'>-	general = &amp;priv-&gt;_4965.statistics.general.common;</div><div class='del'>-	accum_general = &amp;priv-&gt;_4965.accum_statistics.general.common;</div><div class='del'>-	tx = &amp;priv-&gt;_4965.statistics.tx;</div><div class='del'>-	accum_tx = &amp;priv-&gt;_4965.accum_statistics.tx;</div><div class='del'>-	delta = (u32 *)&amp;priv-&gt;_4965.delta_statistics;</div><div class='del'>-	max_delta = (u32 *)&amp;priv-&gt;_4965.max_delta;</div><div class='del'>-</div><div class='del'>-	for (i = sizeof(__le32); i &lt; size;</div><div class='del'>-	     i += sizeof(__le32), stats++, prev_stats++, delta++,</div><div class='del'>-	     max_delta++, accum_stats++) {</div><div class='del'>-		if (le32_to_cpu(*stats) &gt; le32_to_cpu(*prev_stats)) {</div><div class='del'>-			*delta = (le32_to_cpu(*stats) -</div><div class='del'>-				le32_to_cpu(*prev_stats));</div><div class='del'>-			*accum_stats += *delta;</div><div class='del'>-			if (*delta &gt; *max_delta)</div><div class='del'>-				*max_delta = *delta;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* reset accumulative statistics for "no-counter" type statistics */</div><div class='del'>-	accum_general-&gt;temperature = general-&gt;temperature;</div><div class='del'>-	accum_general-&gt;ttl_timestamp = general-&gt;ttl_timestamp;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define REG_RECALIB_PERIOD (60)</div><div class='del'>-</div><div class='del'>-void iwl4965_rx_statistics(struct iwl_priv *priv,</div><div class='del'>-			      struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	int change;</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RX(priv,</div><div class='del'>-		     "Statistics notification received (%d vs %d).\n",</div><div class='del'>-		     (int)sizeof(struct iwl_notif_statistics),</div><div class='del'>-		     le32_to_cpu(pkt-&gt;len_n_flags) &amp;</div><div class='del'>-		     FH_RSCSR_FRAME_SIZE_MSK);</div><div class='del'>-</div><div class='del'>-	change = ((priv-&gt;_4965.statistics.general.common.temperature !=</div><div class='del'>-		   pkt-&gt;u.stats.general.common.temperature) ||</div><div class='del'>-		   ((priv-&gt;_4965.statistics.flag &amp;</div><div class='del'>-		   STATISTICS_REPLY_FLG_HT40_MODE_MSK) !=</div><div class='del'>-		   (pkt-&gt;u.stats.flag &amp;</div><div class='del'>-		   STATISTICS_REPLY_FLG_HT40_MODE_MSK)));</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS</div><div class='del'>-	iwl4965_accumulative_statistics(priv, (__le32 *)&amp;pkt-&gt;u.stats);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* TODO: reading some of statistics is unneeded */</div><div class='del'>-	memcpy(&amp;priv-&gt;_4965.statistics, &amp;pkt-&gt;u.stats,</div><div class='del'>-		sizeof(priv-&gt;_4965.statistics));</div><div class='del'>-</div><div class='del'>-	set_bit(STATUS_STATISTICS, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	/* Reschedule the statistics timer to occur in</div><div class='del'>-	 * REG_RECALIB_PERIOD seconds to ensure we get a</div><div class='del'>-	 * thermal update even if the uCode doesn't give</div><div class='del'>-	 * us one */</div><div class='del'>-	mod_timer(&amp;priv-&gt;statistics_periodic, jiffies +</div><div class='del'>-		  msecs_to_jiffies(REG_RECALIB_PERIOD * 1000));</div><div class='del'>-</div><div class='del'>-	if (unlikely(!test_bit(STATUS_SCANNING, &amp;priv-&gt;status)) &amp;&amp;</div><div class='del'>-	    (pkt-&gt;hdr.cmd == STATISTICS_NOTIFICATION)) {</div><div class='del'>-		iwl4965_rx_calc_noise(priv);</div><div class='del'>-		queue_work(priv-&gt;workqueue, &amp;priv-&gt;run_time_calib_work);</div><div class='del'>-	}</div><div class='del'>-	if (priv-&gt;cfg-&gt;ops-&gt;lib-&gt;temp_ops.temperature &amp;&amp; change)</div><div class='del'>-		priv-&gt;cfg-&gt;ops-&gt;lib-&gt;temp_ops.temperature(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl4965_reply_statistics(struct iwl_priv *priv,</div><div class='del'>-			      struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-</div><div class='del'>-	if (le32_to_cpu(pkt-&gt;u.stats.flag) &amp; UCODE_STATISTICS_CLEAR_MSK) {</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS</div><div class='del'>-		memset(&amp;priv-&gt;_4965.accum_statistics, 0,</div><div class='del'>-			sizeof(struct iwl_notif_statistics));</div><div class='del'>-		memset(&amp;priv-&gt;_4965.delta_statistics, 0,</div><div class='del'>-			sizeof(struct iwl_notif_statistics));</div><div class='del'>-		memset(&amp;priv-&gt;_4965.max_delta, 0,</div><div class='del'>-			sizeof(struct iwl_notif_statistics));</div><div class='del'>-#endif</div><div class='del'>-		IWL_DEBUG_RX(priv, "Statistics have been cleared\n");</div><div class='del'>-	}</div><div class='del'>-	iwl4965_rx_statistics(priv, rxb);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-sta.c b/drivers/net/wireless/iwlegacy/iwl-4965-sta.c<br/>deleted file mode 100644<br/>index a262c23553d2..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-4965-sta.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-sta.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,721 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Portions of this file are derived from the ipw3945 project, as well</div><div class='del'>- * as portions of the ieee80211 subsystem header files.</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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-sta.h"</div><div class='del'>-#include "iwl-4965.h"</div><div class='del'>-</div><div class='del'>-static struct iwl_link_quality_cmd *</div><div class='del'>-iwl4965_sta_alloc_lq(struct iwl_priv *priv, u8 sta_id)</div><div class='del'>-{</div><div class='del'>-	int i, r;</div><div class='del'>-	struct iwl_link_quality_cmd *link_cmd;</div><div class='del'>-	u32 rate_flags = 0;</div><div class='del'>-	__le32 rate_n_flags;</div><div class='del'>-</div><div class='del'>-	link_cmd = kzalloc(sizeof(struct iwl_link_quality_cmd), GFP_KERNEL);</div><div class='del'>-	if (!link_cmd) {</div><div class='del'>-		IWL_ERR(priv, "Unable to allocate memory for LQ cmd.\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	/* Set up the rate scaling to start at selected rate, fall back</div><div class='del'>-	 * all the way down to 1M in IEEE order, and then spin on 1M */</div><div class='del'>-	if (priv-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='del'>-		r = IWL_RATE_6M_INDEX;</div><div class='del'>-	else</div><div class='del'>-		r = IWL_RATE_1M_INDEX;</div><div class='del'>-</div><div class='del'>-	if (r &gt;= IWL_FIRST_CCK_RATE &amp;&amp; r &lt;= IWL_LAST_CCK_RATE)</div><div class='del'>-		rate_flags |= RATE_MCS_CCK_MSK;</div><div class='del'>-</div><div class='del'>-	rate_flags |= iwl4965_first_antenna(priv-&gt;hw_params.valid_tx_ant) &lt;&lt;</div><div class='del'>-				RATE_MCS_ANT_POS;</div><div class='del'>-	rate_n_flags = iwl4965_hw_set_rate_n_flags(iwlegacy_rates[r].plcp,</div><div class='del'>-						   rate_flags);</div><div class='del'>-	for (i = 0; i &lt; LINK_QUAL_MAX_RETRY_NUM; i++)</div><div class='del'>-		link_cmd-&gt;rs_table[i].rate_n_flags = rate_n_flags;</div><div class='del'>-</div><div class='del'>-	link_cmd-&gt;general_params.single_stream_ant_msk =</div><div class='del'>-				iwl4965_first_antenna(priv-&gt;hw_params.valid_tx_ant);</div><div class='del'>-</div><div class='del'>-	link_cmd-&gt;general_params.dual_stream_ant_msk =</div><div class='del'>-		priv-&gt;hw_params.valid_tx_ant &amp;</div><div class='del'>-		~iwl4965_first_antenna(priv-&gt;hw_params.valid_tx_ant);</div><div class='del'>-	if (!link_cmd-&gt;general_params.dual_stream_ant_msk) {</div><div class='del'>-		link_cmd-&gt;general_params.dual_stream_ant_msk = ANT_AB;</div><div class='del'>-	} else if (iwl4965_num_of_ant(priv-&gt;hw_params.valid_tx_ant) == 2) {</div><div class='del'>-		link_cmd-&gt;general_params.dual_stream_ant_msk =</div><div class='del'>-			priv-&gt;hw_params.valid_tx_ant;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	link_cmd-&gt;agg_params.agg_dis_start_th = LINK_QUAL_AGG_DISABLE_START_DEF;</div><div class='del'>-	link_cmd-&gt;agg_params.agg_time_limit =</div><div class='del'>-		cpu_to_le16(LINK_QUAL_AGG_TIME_LIMIT_DEF);</div><div class='del'>-</div><div class='del'>-	link_cmd-&gt;sta_id = sta_id;</div><div class='del'>-</div><div class='del'>-	return link_cmd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * iwl4965_add_bssid_station - Add the special IBSS BSSID station</div><div class='del'>- *</div><div class='del'>- * Function sleeps.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-iwl4965_add_bssid_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx,</div><div class='del'>-			     const u8 *addr, u8 *sta_id_r)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	u8 sta_id;</div><div class='del'>-	struct iwl_link_quality_cmd *link_cmd;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (sta_id_r)</div><div class='del'>-		*sta_id_r = IWL_INVALID_STATION;</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_add_station_common(priv, ctx, addr, 0, NULL, &amp;sta_id);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "Unable to add station %pM\n", addr);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sta_id_r)</div><div class='del'>-		*sta_id_r = sta_id;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	priv-&gt;stations[sta_id].used |= IWL_STA_LOCAL;</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Set up default rate scaling table in device's station table */</div><div class='del'>-	link_cmd = iwl4965_sta_alloc_lq(priv, sta_id);</div><div class='del'>-	if (!link_cmd) {</div><div class='del'>-		IWL_ERR(priv,</div><div class='del'>-			"Unable to initialize rate scaling for station %pM.\n",</div><div class='del'>-			addr);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_send_lq_cmd(priv, ctx, link_cmd, CMD_SYNC, true);</div><div class='del'>-	if (ret)</div><div class='del'>-		IWL_ERR(priv, "Link quality command failed (%d)\n", ret);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	priv-&gt;stations[sta_id].lq = link_cmd;</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_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 iwl4965_static_wepkey_cmd(struct iwl_priv *priv,</div><div class='del'>-				      struct iwl_rxon_context *ctx,</div><div class='del'>-				      bool send_if_empty)</div><div class='del'>-{</div><div class='del'>-	int i, not_empty = 0;</div><div class='del'>-	u8 buff[sizeof(struct iwl_wep_cmd) +</div><div class='del'>-		sizeof(struct iwl_wep_key) * WEP_KEYS_MAX];</div><div class='del'>-	struct iwl_wep_cmd *wep_cmd = (struct iwl_wep_cmd *)buff;</div><div class='del'>-	size_t cmd_size  = sizeof(struct iwl_wep_cmd);</div><div class='del'>-	struct iwl_host_cmd cmd = {</div><div class='del'>-		.id = ctx-&gt;wep_key_cmd,</div><div class='del'>-		.data = wep_cmd,</div><div class='del'>-		.flags = CMD_SYNC,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	might_sleep();</div><div class='del'>-</div><div class='del'>-	memset(wep_cmd, 0, cmd_size +</div><div class='del'>-			(sizeof(struct iwl_wep_key) * WEP_KEYS_MAX));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; WEP_KEYS_MAX ; i++) {</div><div class='del'>-		wep_cmd-&gt;key[i].key_index = i;</div><div class='del'>-		if (ctx-&gt;wep_keys[i].key_size) {</div><div class='del'>-			wep_cmd-&gt;key[i].key_offset = i;</div><div class='del'>-			not_empty = 1;</div><div class='del'>-		} else {</div><div class='del'>-			wep_cmd-&gt;key[i].key_offset = WEP_INVALID_OFFSET;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		wep_cmd-&gt;key[i].key_size = ctx-&gt;wep_keys[i].key_size;</div><div class='del'>-		memcpy(&amp;wep_cmd-&gt;key[i].key[3], ctx-&gt;wep_keys[i].key,</div><div class='del'>-				ctx-&gt;wep_keys[i].key_size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wep_cmd-&gt;global_key_type = WEP_KEY_WEP_TYPE;</div><div class='del'>-	wep_cmd-&gt;num_keys = WEP_KEYS_MAX;</div><div class='del'>-</div><div class='del'>-	cmd_size += sizeof(struct iwl_wep_key) * WEP_KEYS_MAX;</div><div class='del'>-</div><div class='del'>-	cmd.len = cmd_size;</div><div class='del'>-</div><div class='del'>-	if (not_empty || send_if_empty)</div><div class='del'>-		return iwl_legacy_send_cmd(priv, &amp;cmd);</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_restore_default_wep_keys(struct iwl_priv *priv,</div><div class='del'>-				 struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	return iwl4965_static_wepkey_cmd(priv, ctx, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_remove_default_wep_key(struct iwl_priv *priv,</div><div class='del'>-			       struct iwl_rxon_context *ctx,</div><div class='del'>-			       struct ieee80211_key_conf *keyconf)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_WEP(priv, "Removing default WEP key: idx=%d\n",</div><div class='del'>-		      keyconf-&gt;keyidx);</div><div class='del'>-</div><div class='del'>-	memset(&amp;ctx-&gt;wep_keys[keyconf-&gt;keyidx], 0, sizeof(ctx-&gt;wep_keys[0]));</div><div class='del'>-	if (iwl_legacy_is_rfkill(priv)) {</div><div class='del'>-		IWL_DEBUG_WEP(priv,</div><div class='del'>-		"Not sending REPLY_WEPKEY command due to RFKILL.\n");</div><div class='del'>-		/* but keys in device are clear anyway so return success */</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	ret = iwl4965_static_wepkey_cmd(priv, ctx, 1);</div><div class='del'>-	IWL_DEBUG_WEP(priv, "Remove default WEP key: idx=%d ret=%d\n",</div><div class='del'>-		      keyconf-&gt;keyidx, ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_set_default_wep_key(struct iwl_priv *priv,</div><div class='del'>-			    struct iwl_rxon_context *ctx,</div><div class='del'>-			    struct ieee80211_key_conf *keyconf)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (keyconf-&gt;keylen != WEP_KEY_LEN_128 &amp;&amp;</div><div class='del'>-	    keyconf-&gt;keylen != WEP_KEY_LEN_64) {</div><div class='del'>-		IWL_DEBUG_WEP(priv, "Bad WEP key length %d\n", keyconf-&gt;keylen);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	keyconf-&gt;flags &amp;= ~IEEE80211_KEY_FLAG_GENERATE_IV;</div><div class='del'>-	keyconf-&gt;hw_key_idx = HW_KEY_DEFAULT;</div><div class='del'>-	priv-&gt;stations[ctx-&gt;ap_sta_id].keyinfo.cipher = keyconf-&gt;cipher;</div><div class='del'>-</div><div class='del'>-	ctx-&gt;wep_keys[keyconf-&gt;keyidx].key_size = keyconf-&gt;keylen;</div><div class='del'>-	memcpy(&amp;ctx-&gt;wep_keys[keyconf-&gt;keyidx].key, &amp;keyconf-&gt;key,</div><div class='del'>-							keyconf-&gt;keylen);</div><div class='del'>-</div><div class='del'>-	ret = iwl4965_static_wepkey_cmd(priv, ctx, false);</div><div class='del'>-	IWL_DEBUG_WEP(priv, "Set default WEP key: len=%d idx=%d ret=%d\n",</div><div class='del'>-		keyconf-&gt;keylen, keyconf-&gt;keyidx, ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl4965_set_wep_dynamic_key_info(struct iwl_priv *priv,</div><div class='del'>-					struct iwl_rxon_context *ctx,</div><div class='del'>-					struct ieee80211_key_conf *keyconf,</div><div class='del'>-					u8 sta_id)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	__le16 key_flags = 0;</div><div class='del'>-	struct iwl_legacy_addsta_cmd sta_cmd;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	keyconf-&gt;flags &amp;= ~IEEE80211_KEY_FLAG_GENERATE_IV;</div><div class='del'>-</div><div class='del'>-	key_flags |= (STA_KEY_FLG_WEP | STA_KEY_FLG_MAP_KEY_MSK);</div><div class='del'>-	key_flags |= cpu_to_le16(keyconf-&gt;keyidx &lt;&lt; STA_KEY_FLG_KEYID_POS);</div><div class='del'>-	key_flags &amp;= ~STA_KEY_FLG_INVALID;</div><div class='del'>-</div><div class='del'>-	if (keyconf-&gt;keylen == WEP_KEY_LEN_128)</div><div class='del'>-		key_flags |= STA_KEY_FLG_KEY_SIZE_MSK;</div><div class='del'>-</div><div class='del'>-	if (sta_id == ctx-&gt;bcast_sta_id)</div><div class='del'>-		key_flags |= STA_KEY_MULTICAST_MSK;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	priv-&gt;stations[sta_id].keyinfo.cipher = keyconf-&gt;cipher;</div><div class='del'>-	priv-&gt;stations[sta_id].keyinfo.keylen = keyconf-&gt;keylen;</div><div class='del'>-	priv-&gt;stations[sta_id].keyinfo.keyidx = keyconf-&gt;keyidx;</div><div class='del'>-</div><div class='del'>-	memcpy(priv-&gt;stations[sta_id].keyinfo.key,</div><div class='del'>-				keyconf-&gt;key, keyconf-&gt;keylen);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;priv-&gt;stations[sta_id].sta.key.key[3],</div><div class='del'>-				keyconf-&gt;key, keyconf-&gt;keylen);</div><div class='del'>-</div><div class='del'>-	if ((priv-&gt;stations[sta_id].sta.key.key_flags &amp; STA_KEY_FLG_ENCRYPT_MSK)</div><div class='del'>-			== STA_KEY_FLG_NO_ENC)</div><div class='del'>-		priv-&gt;stations[sta_id].sta.key.key_offset =</div><div class='del'>-				 iwl_legacy_get_free_ucode_key_index(priv);</div><div class='del'>-	/* else, we are overriding an existing key =&gt; no need to allocated room</div><div class='del'>-	 * in uCode. */</div><div class='del'>-</div><div class='del'>-	WARN(priv-&gt;stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,</div><div class='del'>-		"no space for a new key");</div><div class='del'>-</div><div class='del'>-	priv-&gt;stations[sta_id].sta.key.key_flags = key_flags;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;sta_cmd, &amp;priv-&gt;stations[sta_id].sta,</div><div class='del'>-			sizeof(struct iwl_legacy_addsta_cmd));</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_send_add_sta(priv, &amp;sta_cmd, CMD_SYNC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl4965_set_ccmp_dynamic_key_info(struct iwl_priv *priv,</div><div class='del'>-					 struct iwl_rxon_context *ctx,</div><div class='del'>-					 struct ieee80211_key_conf *keyconf,</div><div class='del'>-					 u8 sta_id)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	__le16 key_flags = 0;</div><div class='del'>-	struct iwl_legacy_addsta_cmd sta_cmd;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	key_flags |= (STA_KEY_FLG_CCMP | STA_KEY_FLG_MAP_KEY_MSK);</div><div class='del'>-	key_flags |= cpu_to_le16(keyconf-&gt;keyidx &lt;&lt; STA_KEY_FLG_KEYID_POS);</div><div class='del'>-	key_flags &amp;= ~STA_KEY_FLG_INVALID;</div><div class='del'>-</div><div class='del'>-	if (sta_id == ctx-&gt;bcast_sta_id)</div><div class='del'>-		key_flags |= STA_KEY_MULTICAST_MSK;</div><div class='del'>-</div><div class='del'>-	keyconf-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	priv-&gt;stations[sta_id].keyinfo.cipher = keyconf-&gt;cipher;</div><div class='del'>-	priv-&gt;stations[sta_id].keyinfo.keylen = keyconf-&gt;keylen;</div><div class='del'>-</div><div class='del'>-	memcpy(priv-&gt;stations[sta_id].keyinfo.key, keyconf-&gt;key,</div><div class='del'>-	       keyconf-&gt;keylen);</div><div class='del'>-</div><div class='del'>-	memcpy(priv-&gt;stations[sta_id].sta.key.key, keyconf-&gt;key,</div><div class='del'>-	       keyconf-&gt;keylen);</div><div class='del'>-</div><div class='del'>-	if ((priv-&gt;stations[sta_id].sta.key.key_flags &amp; STA_KEY_FLG_ENCRYPT_MSK)</div><div class='del'>-			== STA_KEY_FLG_NO_ENC)</div><div class='del'>-		priv-&gt;stations[sta_id].sta.key.key_offset =</div><div class='del'>-				 iwl_legacy_get_free_ucode_key_index(priv);</div><div class='del'>-	/* else, we are overriding an existing key =&gt; no need to allocated room</div><div class='del'>-	 * in uCode. */</div><div class='del'>-</div><div class='del'>-	WARN(priv-&gt;stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,</div><div class='del'>-		"no space for a new key");</div><div class='del'>-</div><div class='del'>-	priv-&gt;stations[sta_id].sta.key.key_flags = key_flags;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;sta_cmd, &amp;priv-&gt;stations[sta_id].sta,</div><div class='del'>-			 sizeof(struct iwl_legacy_addsta_cmd));</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_send_add_sta(priv, &amp;sta_cmd, CMD_SYNC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl4965_set_tkip_dynamic_key_info(struct iwl_priv *priv,</div><div class='del'>-					 struct iwl_rxon_context *ctx,</div><div class='del'>-					 struct ieee80211_key_conf *keyconf,</div><div class='del'>-					 u8 sta_id)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	__le16 key_flags = 0;</div><div class='del'>-</div><div class='del'>-	key_flags |= (STA_KEY_FLG_TKIP | STA_KEY_FLG_MAP_KEY_MSK);</div><div class='del'>-	key_flags |= cpu_to_le16(keyconf-&gt;keyidx &lt;&lt; STA_KEY_FLG_KEYID_POS);</div><div class='del'>-	key_flags &amp;= ~STA_KEY_FLG_INVALID;</div><div class='del'>-</div><div class='del'>-	if (sta_id == ctx-&gt;bcast_sta_id)</div><div class='del'>-		key_flags |= STA_KEY_MULTICAST_MSK;</div><div class='del'>-</div><div class='del'>-	keyconf-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV;</div><div class='del'>-	keyconf-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	priv-&gt;stations[sta_id].keyinfo.cipher = keyconf-&gt;cipher;</div><div class='del'>-	priv-&gt;stations[sta_id].keyinfo.keylen = 16;</div><div class='del'>-</div><div class='del'>-	if ((priv-&gt;stations[sta_id].sta.key.key_flags &amp; STA_KEY_FLG_ENCRYPT_MSK)</div><div class='del'>-			== STA_KEY_FLG_NO_ENC)</div><div class='del'>-		priv-&gt;stations[sta_id].sta.key.key_offset =</div><div class='del'>-				 iwl_legacy_get_free_ucode_key_index(priv);</div><div class='del'>-	/* else, we are overriding an existing key =&gt; no need to allocated room</div><div class='del'>-	 * in uCode. */</div><div class='del'>-</div><div class='del'>-	WARN(priv-&gt;stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,</div><div class='del'>-		"no space for a new key");</div><div class='del'>-</div><div class='del'>-	priv-&gt;stations[sta_id].sta.key.key_flags = key_flags;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* This copy is acutally not needed: we get the key with each TX */</div><div class='del'>-	memcpy(priv-&gt;stations[sta_id].keyinfo.key, keyconf-&gt;key, 16);</div><div class='del'>-</div><div class='del'>-	memcpy(priv-&gt;stations[sta_id].sta.key.key, keyconf-&gt;key, 16);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl4965_update_tkip_key(struct iwl_priv *priv,</div><div class='del'>-			 struct iwl_rxon_context *ctx,</div><div class='del'>-			 struct ieee80211_key_conf *keyconf,</div><div class='del'>-			 struct ieee80211_sta *sta, u32 iv32, u16 *phase1key)</div><div class='del'>-{</div><div class='del'>-	u8 sta_id;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_scan_cancel(priv)) {</div><div class='del'>-		/* cancel scan failed, just live w/ bad key and rely</div><div class='del'>-		   briefly on SW decryption */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sta_id = iwl_legacy_sta_id_or_broadcast(priv, ctx, sta);</div><div class='del'>-	if (sta_id == IWL_INVALID_STATION)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	priv-&gt;stations[sta_id].sta.key.tkip_rx_tsc_byte2 = (u8) iv32;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 5; i++)</div><div class='del'>-		priv-&gt;stations[sta_id].sta.key.tkip_rx_ttak[i] =</div><div class='del'>-			cpu_to_le16(phase1key[i]);</div><div class='del'>-</div><div class='del'>-	priv-&gt;stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_send_add_sta(priv, &amp;priv-&gt;stations[sta_id].sta, CMD_ASYNC);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_remove_dynamic_key(struct iwl_priv *priv,</div><div class='del'>-			   struct iwl_rxon_context *ctx,</div><div class='del'>-			   struct ieee80211_key_conf *keyconf,</div><div class='del'>-			   u8 sta_id)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u16 key_flags;</div><div class='del'>-	u8 keyidx;</div><div class='del'>-	struct iwl_legacy_addsta_cmd sta_cmd;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;key_mapping_keys--;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	key_flags = le16_to_cpu(priv-&gt;stations[sta_id].sta.key.key_flags);</div><div class='del'>-	keyidx = (key_flags &gt;&gt; STA_KEY_FLG_KEYID_POS) &amp; 0x3;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_WEP(priv, "Remove dynamic key: idx=%d sta=%d\n",</div><div class='del'>-		      keyconf-&gt;keyidx, sta_id);</div><div class='del'>-</div><div class='del'>-	if (keyconf-&gt;keyidx != keyidx) {</div><div class='del'>-		/* We need to remove a key with index different that the one</div><div class='del'>-		 * in the uCode. This means that the key we need to remove has</div><div class='del'>-		 * been replaced by another one with different index.</div><div class='del'>-		 * Don't do anything and return ok</div><div class='del'>-		 */</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET) {</div><div class='del'>-		IWL_WARN(priv, "Removing wrong key %d 0x%x\n",</div><div class='del'>-			    keyconf-&gt;keyidx, key_flags);</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!test_and_clear_bit(priv-&gt;stations[sta_id].sta.key.key_offset,</div><div class='del'>-		&amp;priv-&gt;ucode_key_table))</div><div class='del'>-		IWL_ERR(priv, "index %d not used in uCode key table.\n",</div><div class='del'>-			priv-&gt;stations[sta_id].sta.key.key_offset);</div><div class='del'>-	memset(&amp;priv-&gt;stations[sta_id].keyinfo, 0,</div><div class='del'>-					sizeof(struct iwl_hw_key));</div><div class='del'>-	memset(&amp;priv-&gt;stations[sta_id].sta.key, 0,</div><div class='del'>-					sizeof(struct iwl4965_keyinfo));</div><div class='del'>-	priv-&gt;stations[sta_id].sta.key.key_flags =</div><div class='del'>-			STA_KEY_FLG_NO_ENC | STA_KEY_FLG_INVALID;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.key.key_offset = WEP_INVALID_OFFSET;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_is_rfkill(priv)) {</div><div class='del'>-		IWL_DEBUG_WEP(priv,</div><div class='del'>-		 "Not sending REPLY_ADD_STA command because RFKILL enabled.\n");</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	memcpy(&amp;sta_cmd, &amp;priv-&gt;stations[sta_id].sta,</div><div class='del'>-			sizeof(struct iwl_legacy_addsta_cmd));</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_send_add_sta(priv, &amp;sta_cmd, CMD_SYNC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_set_dynamic_key(struct iwl_priv *priv, struct iwl_rxon_context *ctx,</div><div class='del'>-			struct ieee80211_key_conf *keyconf, u8 sta_id)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;key_mapping_keys++;</div><div class='del'>-	keyconf-&gt;hw_key_idx = HW_KEY_DYNAMIC;</div><div class='del'>-</div><div class='del'>-	switch (keyconf-&gt;cipher) {</div><div class='del'>-	case WLAN_CIPHER_SUITE_CCMP:</div><div class='del'>-		ret = iwl4965_set_ccmp_dynamic_key_info(priv, ctx,</div><div class='del'>-							keyconf, sta_id);</div><div class='del'>-		break;</div><div class='del'>-	case WLAN_CIPHER_SUITE_TKIP:</div><div class='del'>-		ret = iwl4965_set_tkip_dynamic_key_info(priv, ctx,</div><div class='del'>-							keyconf, sta_id);</div><div class='del'>-		break;</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP40:</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP104:</div><div class='del'>-		ret = iwl4965_set_wep_dynamic_key_info(priv, ctx,</div><div class='del'>-							keyconf, sta_id);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		IWL_ERR(priv,</div><div class='del'>-			"Unknown alg: %s cipher = %x\n", __func__,</div><div class='del'>-			keyconf-&gt;cipher);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_WEP(priv,</div><div class='del'>-		"Set dynamic key: cipher=%x len=%d idx=%d sta=%d ret=%d\n",</div><div class='del'>-		      keyconf-&gt;cipher, keyconf-&gt;keylen, keyconf-&gt;keyidx,</div><div class='del'>-		      sta_id, ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_alloc_bcast_station - add broadcast station into driver's station table.</div><div class='del'>- *</div><div class='del'>- * This adds the broadcast station into the driver's station table</div><div class='del'>- * and marks it driver active, so that it will be restored to the</div><div class='del'>- * device at the next best time.</div><div class='del'>- */</div><div class='del'>-int iwl4965_alloc_bcast_station(struct iwl_priv *priv,</div><div class='del'>-			       struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	struct iwl_link_quality_cmd *link_cmd;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u8 sta_id;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	sta_id = iwl_legacy_prep_station(priv, ctx, iwlegacy_bcast_addr,</div><div class='del'>-								false, NULL);</div><div class='del'>-	if (sta_id == IWL_INVALID_STATION) {</div><div class='del'>-		IWL_ERR(priv, "Unable to prepare broadcast station\n");</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;stations[sta_id].used |= IWL_STA_DRIVER_ACTIVE;</div><div class='del'>-	priv-&gt;stations[sta_id].used |= IWL_STA_BCAST;</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	link_cmd = iwl4965_sta_alloc_lq(priv, sta_id);</div><div class='del'>-	if (!link_cmd) {</div><div class='del'>-		IWL_ERR(priv,</div><div class='del'>-			"Unable to initialize rate scaling for bcast station.\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	priv-&gt;stations[sta_id].lq = link_cmd;</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, 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'>- * iwl4965_update_bcast_station - update broadcast station's LQ command</div><div class='del'>- *</div><div class='del'>- * Only used by iwl4965. Placed here to have all bcast station management</div><div class='del'>- * code together.</div><div class='del'>- */</div><div class='del'>-static int iwl4965_update_bcast_station(struct iwl_priv *priv,</div><div class='del'>-				    struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct iwl_link_quality_cmd *link_cmd;</div><div class='del'>-	u8 sta_id = ctx-&gt;bcast_sta_id;</div><div class='del'>-</div><div class='del'>-	link_cmd = iwl4965_sta_alloc_lq(priv, sta_id);</div><div class='del'>-	if (!link_cmd) {</div><div class='del'>-		IWL_ERR(priv,</div><div class='del'>-		"Unable to initialize rate scaling for bcast station.\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	if (priv-&gt;stations[sta_id].lq)</div><div class='del'>-		kfree(priv-&gt;stations[sta_id].lq);</div><div class='del'>-	else</div><div class='del'>-		IWL_DEBUG_INFO(priv,</div><div class='del'>-		"Bcast station rate scaling has not been initialized yet.\n");</div><div class='del'>-	priv-&gt;stations[sta_id].lq = link_cmd;</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_update_bcast_stations(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	for_each_context(priv, ctx) {</div><div class='del'>-		ret = iwl4965_update_bcast_station(priv, ctx);</div><div class='del'>-		if (ret)</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'>-/**</div><div class='del'>- * iwl4965_sta_tx_modify_enable_tid - Enable Tx for this TID in station table</div><div class='del'>- */</div><div class='del'>-int iwl4965_sta_tx_modify_enable_tid(struct iwl_priv *priv, int sta_id, int tid)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct iwl_legacy_addsta_cmd sta_cmd;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	/* Remove "disable" flag, to enable Tx for this TID */</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	priv-&gt;stations[sta_id].sta.sta.modify_mask = STA_MODIFY_TID_DISABLE_TX;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.tid_disable_tx &amp;= cpu_to_le16(~(1 &lt;&lt; tid));</div><div class='del'>-	priv-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='del'>-	memcpy(&amp;sta_cmd, &amp;priv-&gt;stations[sta_id].sta,</div><div class='del'>-					sizeof(struct iwl_legacy_addsta_cmd));</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_send_add_sta(priv, &amp;sta_cmd, CMD_SYNC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_sta_rx_agg_start(struct iwl_priv *priv, struct ieee80211_sta *sta,</div><div class='del'>-			 int tid, u16 ssn)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int sta_id;</div><div class='del'>-	struct iwl_legacy_addsta_cmd sta_cmd;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	sta_id = iwl_legacy_sta_id(sta);</div><div class='del'>-	if (sta_id == IWL_INVALID_STATION)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	priv-&gt;stations[sta_id].sta.station_flags_msk = 0;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.sta.modify_mask = STA_MODIFY_ADDBA_TID_MSK;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.add_immediate_ba_tid = (u8)tid;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.add_immediate_ba_ssn = cpu_to_le16(ssn);</div><div class='del'>-	priv-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='del'>-	memcpy(&amp;sta_cmd, &amp;priv-&gt;stations[sta_id].sta,</div><div class='del'>-					sizeof(struct iwl_legacy_addsta_cmd));</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_send_add_sta(priv, &amp;sta_cmd, CMD_SYNC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_sta_rx_agg_stop(struct iwl_priv *priv, struct ieee80211_sta *sta,</div><div class='del'>-			int tid)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int sta_id;</div><div class='del'>-	struct iwl_legacy_addsta_cmd sta_cmd;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	sta_id = iwl_legacy_sta_id(sta);</div><div class='del'>-	if (sta_id == IWL_INVALID_STATION) {</div><div class='del'>-		IWL_ERR(priv, "Invalid station for AGG tid %d\n", tid);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	priv-&gt;stations[sta_id].sta.station_flags_msk = 0;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.sta.modify_mask = STA_MODIFY_DELBA_TID_MSK;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.remove_immediate_ba_tid = (u8)tid;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='del'>-	memcpy(&amp;sta_cmd, &amp;priv-&gt;stations[sta_id].sta,</div><div class='del'>-				sizeof(struct iwl_legacy_addsta_cmd));</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_send_add_sta(priv, &amp;sta_cmd, CMD_SYNC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-iwl4965_sta_modify_sleep_tx_count(struct iwl_priv *priv, int sta_id, int cnt)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	priv-&gt;stations[sta_id].sta.station_flags |= STA_FLG_PWR_SAVE_MSK;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.station_flags_msk = STA_FLG_PWR_SAVE_MSK;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.sta.modify_mask =</div><div class='del'>-					STA_MODIFY_SLEEP_TX_COUNT_MSK;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.sleep_tx_count = cpu_to_le16(cnt);</div><div class='del'>-	priv-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='del'>-	iwl_legacy_send_add_sta(priv,</div><div class='del'>-				&amp;priv-&gt;stations[sta_id].sta, CMD_ASYNC);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-tx.c b/drivers/net/wireless/iwlegacy/iwl-4965-tx.c<br/>deleted file mode 100644<br/>index 7f12e3638bae..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-4965-tx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-tx.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1378 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * GPL LICENSE SUMMARY</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2008 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-sta.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-#include "iwl-helpers.h"</div><div class='del'>-#include "iwl-4965-hw.h"</div><div class='del'>-#include "iwl-4965.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * mac80211 queues, ACs, hardware queues, FIFOs.</div><div class='del'>- *</div><div class='del'>- * Cf. http://wireless.kernel.org/en/developers/Documentation/mac80211/queues</div><div class='del'>- *</div><div class='del'>- * Mac80211 uses the following numbers, which we get as from it</div><div class='del'>- * by way of skb_get_queue_mapping(skb):</div><div class='del'>- *</div><div class='del'>- *	VO	0</div><div class='del'>- *	VI	1</div><div class='del'>- *	BE	2</div><div class='del'>- *	BK	3</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Regular (not A-MPDU) frames are put into hardware queues corresponding</div><div class='del'>- * to the FIFOs, see comments in iwl-prph.h. Aggregated frames get their</div><div class='del'>- * own queue per aggregation session (RA/TID combination), such queues are</div><div class='del'>- * set up to map into FIFOs too, for which we need an AC-&gt;FIFO mapping. In</div><div class='del'>- * order to map frames to the right queue, we also need an AC-&gt;hw queue</div><div class='del'>- * mapping. This is implemented here.</div><div class='del'>- *</div><div class='del'>- * Due to the way hw queues are set up (by the hw specific modules like</div><div class='del'>- * iwl-4965.c), the AC-&gt;hw queue mapping is the identity</div><div class='del'>- * mapping.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static const u8 tid_to_ac[] = {</div><div class='del'>-	IEEE80211_AC_BE,</div><div class='del'>-	IEEE80211_AC_BK,</div><div class='del'>-	IEEE80211_AC_BK,</div><div class='del'>-	IEEE80211_AC_BE,</div><div class='del'>-	IEEE80211_AC_VI,</div><div class='del'>-	IEEE80211_AC_VI,</div><div class='del'>-	IEEE80211_AC_VO,</div><div class='del'>-	IEEE80211_AC_VO</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline int iwl4965_get_ac_from_tid(u16 tid)</div><div class='del'>-{</div><div class='del'>-	if (likely(tid &lt; ARRAY_SIZE(tid_to_ac)))</div><div class='del'>-		return tid_to_ac[tid];</div><div class='del'>-</div><div class='del'>-	/* no support for TIDs 8-15 yet */</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-iwl4965_get_fifo_from_tid(struct iwl_rxon_context *ctx, u16 tid)</div><div class='del'>-{</div><div class='del'>-	if (likely(tid &lt; ARRAY_SIZE(tid_to_ac)))</div><div class='del'>-		return ctx-&gt;ac_to_fifo[tid_to_ac[tid]];</div><div class='del'>-</div><div class='del'>-	/* no support for TIDs 8-15 yet */</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * handle build REPLY_TX command notification.</div><div class='del'>- */</div><div class='del'>-static void iwl4965_tx_cmd_build_basic(struct iwl_priv *priv,</div><div class='del'>-					struct sk_buff *skb,</div><div class='del'>-					struct iwl_tx_cmd *tx_cmd,</div><div class='del'>-					struct ieee80211_tx_info *info,</div><div class='del'>-					struct ieee80211_hdr *hdr,</div><div class='del'>-					u8 std_id)</div><div class='del'>-{</div><div class='del'>-	__le16 fc = hdr-&gt;frame_control;</div><div class='del'>-	__le32 tx_flags = tx_cmd-&gt;tx_flags;</div><div class='del'>-</div><div class='del'>-	tx_cmd-&gt;stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;</div><div class='del'>-	if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)) {</div><div class='del'>-		tx_flags |= TX_CMD_FLG_ACK_MSK;</div><div class='del'>-		if (ieee80211_is_mgmt(fc))</div><div class='del'>-			tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='del'>-		if (ieee80211_is_probe_resp(fc) &amp;&amp;</div><div class='del'>-		    !(le16_to_cpu(hdr-&gt;seq_ctrl) &amp; 0xf))</div><div class='del'>-			tx_flags |= TX_CMD_FLG_TSF_MSK;</div><div class='del'>-	} else {</div><div class='del'>-		tx_flags &amp;= (~TX_CMD_FLG_ACK_MSK);</div><div class='del'>-		tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ieee80211_is_back_req(fc))</div><div class='del'>-		tx_flags |= TX_CMD_FLG_ACK_MSK | TX_CMD_FLG_IMM_BA_RSP_MASK;</div><div class='del'>-</div><div class='del'>-	tx_cmd-&gt;sta_id = std_id;</div><div class='del'>-	if (ieee80211_has_morefrags(fc))</div><div class='del'>-		tx_flags |= TX_CMD_FLG_MORE_FRAG_MSK;</div><div class='del'>-</div><div class='del'>-	if (ieee80211_is_data_qos(fc)) {</div><div class='del'>-		u8 *qc = ieee80211_get_qos_ctl(hdr);</div><div class='del'>-		tx_cmd-&gt;tid_tspec = qc[0] &amp; 0xf;</div><div class='del'>-		tx_flags &amp;= ~TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='del'>-	} else {</div><div class='del'>-		tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_legacy_tx_cmd_protection(priv, info, fc, &amp;tx_flags);</div><div class='del'>-</div><div class='del'>-	tx_flags &amp;= ~(TX_CMD_FLG_ANT_SEL_MSK);</div><div class='del'>-	if (ieee80211_is_mgmt(fc)) {</div><div class='del'>-		if (ieee80211_is_assoc_req(fc) || ieee80211_is_reassoc_req(fc))</div><div class='del'>-			tx_cmd-&gt;timeout.pm_frame_timeout = cpu_to_le16(3);</div><div class='del'>-		else</div><div class='del'>-			tx_cmd-&gt;timeout.pm_frame_timeout = cpu_to_le16(2);</div><div class='del'>-	} else {</div><div class='del'>-		tx_cmd-&gt;timeout.pm_frame_timeout = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tx_cmd-&gt;driver_txop = 0;</div><div class='del'>-	tx_cmd-&gt;tx_flags = tx_flags;</div><div class='del'>-	tx_cmd-&gt;next_frame_len = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define RTS_DFAULT_RETRY_LIMIT		60</div><div class='del'>-</div><div class='del'>-static void iwl4965_tx_cmd_build_rate(struct iwl_priv *priv,</div><div class='del'>-			      struct iwl_tx_cmd *tx_cmd,</div><div class='del'>-			      struct ieee80211_tx_info *info,</div><div class='del'>-			      __le16 fc)</div><div class='del'>-{</div><div class='del'>-	u32 rate_flags;</div><div class='del'>-	int rate_idx;</div><div class='del'>-	u8 rts_retry_limit;</div><div class='del'>-	u8 data_retry_limit;</div><div class='del'>-	u8 rate_plcp;</div><div class='del'>-</div><div class='del'>-	/* Set retry limit on DATA packets and Probe Responses*/</div><div class='del'>-	if (ieee80211_is_probe_resp(fc))</div><div class='del'>-		data_retry_limit = 3;</div><div class='del'>-	else</div><div class='del'>-		data_retry_limit = IWL4965_DEFAULT_TX_RETRY;</div><div class='del'>-	tx_cmd-&gt;data_retry_limit = data_retry_limit;</div><div class='del'>-</div><div class='del'>-	/* Set retry limit on RTS packets */</div><div class='del'>-	rts_retry_limit = RTS_DFAULT_RETRY_LIMIT;</div><div class='del'>-	if (data_retry_limit &lt; rts_retry_limit)</div><div class='del'>-		rts_retry_limit = data_retry_limit;</div><div class='del'>-	tx_cmd-&gt;rts_retry_limit = rts_retry_limit;</div><div class='del'>-</div><div class='del'>-	/* DATA packets will use the uCode station table for rate/antenna</div><div class='del'>-	 * selection */</div><div class='del'>-	if (ieee80211_is_data(fc)) {</div><div class='del'>-		tx_cmd-&gt;initial_rate_index = 0;</div><div class='del'>-		tx_cmd-&gt;tx_flags |= TX_CMD_FLG_STA_RATE_MSK;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * If the current TX rate stored in mac80211 has the MCS bit set, it's</div><div class='del'>-	 * not really a TX rate.  Thus, we use the lowest supported rate for</div><div class='del'>-	 * this band.  Also use the lowest supported rate if the stored rate</div><div class='del'>-	 * index is invalid.</div><div class='del'>-	 */</div><div class='del'>-	rate_idx = info-&gt;control.rates[0].idx;</div><div class='del'>-	if (info-&gt;control.rates[0].flags &amp; IEEE80211_TX_RC_MCS ||</div><div class='del'>-			(rate_idx &lt; 0) || (rate_idx &gt; IWL_RATE_COUNT_LEGACY))</div><div class='del'>-		rate_idx = rate_lowest_index(&amp;priv-&gt;bands[info-&gt;band],</div><div class='del'>-				info-&gt;control.sta);</div><div class='del'>-	/* For 5 GHZ band, remap mac80211 rate indices into driver indices */</div><div class='del'>-	if (info-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='del'>-		rate_idx += IWL_FIRST_OFDM_RATE;</div><div class='del'>-	/* Get PLCP rate for tx_cmd-&gt;rate_n_flags */</div><div class='del'>-	rate_plcp = iwlegacy_rates[rate_idx].plcp;</div><div class='del'>-	/* Zero out flags for this packet */</div><div class='del'>-	rate_flags = 0;</div><div class='del'>-</div><div class='del'>-	/* Set CCK flag as needed */</div><div class='del'>-	if ((rate_idx &gt;= IWL_FIRST_CCK_RATE) &amp;&amp; (rate_idx &lt;= IWL_LAST_CCK_RATE))</div><div class='del'>-		rate_flags |= RATE_MCS_CCK_MSK;</div><div class='del'>-</div><div class='del'>-	/* Set up antennas */</div><div class='del'>-	priv-&gt;mgmt_tx_ant = iwl4965_toggle_tx_ant(priv, priv-&gt;mgmt_tx_ant,</div><div class='del'>-				      priv-&gt;hw_params.valid_tx_ant);</div><div class='del'>-</div><div class='del'>-	rate_flags |= iwl4965_ant_idx_to_flags(priv-&gt;mgmt_tx_ant);</div><div class='del'>-</div><div class='del'>-	/* Set the rate in the TX cmd */</div><div class='del'>-	tx_cmd-&gt;rate_n_flags = iwl4965_hw_set_rate_n_flags(rate_plcp, rate_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_tx_cmd_build_hwcrypto(struct iwl_priv *priv,</div><div class='del'>-				      struct ieee80211_tx_info *info,</div><div class='del'>-				      struct iwl_tx_cmd *tx_cmd,</div><div class='del'>-				      struct sk_buff *skb_frag,</div><div class='del'>-				      int sta_id)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_key_conf *keyconf = info-&gt;control.hw_key;</div><div class='del'>-</div><div class='del'>-	switch (keyconf-&gt;cipher) {</div><div class='del'>-	case WLAN_CIPHER_SUITE_CCMP:</div><div class='del'>-		tx_cmd-&gt;sec_ctl = TX_CMD_SEC_CCM;</div><div class='del'>-		memcpy(tx_cmd-&gt;key, keyconf-&gt;key, keyconf-&gt;keylen);</div><div class='del'>-		if (info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU)</div><div class='del'>-			tx_cmd-&gt;tx_flags |= TX_CMD_FLG_AGG_CCMP_MSK;</div><div class='del'>-		IWL_DEBUG_TX(priv, "tx_cmd with AES hwcrypto\n");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case WLAN_CIPHER_SUITE_TKIP:</div><div class='del'>-		tx_cmd-&gt;sec_ctl = TX_CMD_SEC_TKIP;</div><div class='del'>-		ieee80211_get_tkip_p2k(keyconf, skb_frag, tx_cmd-&gt;key);</div><div class='del'>-		IWL_DEBUG_TX(priv, "tx_cmd with tkip hwcrypto\n");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP104:</div><div class='del'>-		tx_cmd-&gt;sec_ctl |= TX_CMD_SEC_KEY128;</div><div class='del'>-		/* fall through */</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP40:</div><div class='del'>-		tx_cmd-&gt;sec_ctl |= (TX_CMD_SEC_WEP |</div><div class='del'>-			(keyconf-&gt;keyidx &amp; TX_CMD_SEC_MSK) &lt;&lt; TX_CMD_SEC_SHIFT);</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;tx_cmd-&gt;key[3], keyconf-&gt;key, keyconf-&gt;keylen);</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_TX(priv, "Configuring packet for WEP encryption "</div><div class='del'>-			     "with key %d\n", keyconf-&gt;keyidx);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		IWL_ERR(priv, "Unknown encode cipher %x\n", keyconf-&gt;cipher);</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'>- * start REPLY_TX command process</div><div class='del'>- */</div><div class='del'>-int iwl4965_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='del'>-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	struct ieee80211_sta *sta = info-&gt;control.sta;</div><div class='del'>-	struct iwl_station_priv *sta_priv = NULL;</div><div class='del'>-	struct iwl_tx_queue *txq;</div><div class='del'>-	struct iwl_queue *q;</div><div class='del'>-	struct iwl_device_cmd *out_cmd;</div><div class='del'>-	struct iwl_cmd_meta *out_meta;</div><div class='del'>-	struct iwl_tx_cmd *tx_cmd;</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-	int txq_id;</div><div class='del'>-	dma_addr_t phys_addr;</div><div class='del'>-	dma_addr_t txcmd_phys;</div><div class='del'>-	dma_addr_t scratch_phys;</div><div class='del'>-	u16 len, firstlen, secondlen;</div><div class='del'>-	u16 seq_number = 0;</div><div class='del'>-	__le16 fc;</div><div class='del'>-	u8 hdr_len;</div><div class='del'>-	u8 sta_id;</div><div class='del'>-	u8 wait_write_ptr = 0;</div><div class='del'>-	u8 tid = 0;</div><div class='del'>-	u8 *qc = NULL;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	bool is_agg = false;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;control.vif)</div><div class='del'>-		ctx = iwl_legacy_rxon_ctx_from_vif(info-&gt;control.vif);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	if (iwl_legacy_is_rfkill(priv)) {</div><div class='del'>-		IWL_DEBUG_DROP(priv, "Dropping - RF KILL\n");</div><div class='del'>-		goto drop_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fc = hdr-&gt;frame_control;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	if (ieee80211_is_auth(fc))</div><div class='del'>-		IWL_DEBUG_TX(priv, "Sending AUTH frame\n");</div><div class='del'>-	else if (ieee80211_is_assoc_req(fc))</div><div class='del'>-		IWL_DEBUG_TX(priv, "Sending ASSOC frame\n");</div><div class='del'>-	else if (ieee80211_is_reassoc_req(fc))</div><div class='del'>-		IWL_DEBUG_TX(priv, "Sending REASSOC frame\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	hdr_len = ieee80211_hdrlen(fc);</div><div class='del'>-</div><div class='del'>-	/* For management frames use broadcast id to do not break aggregation */</div><div class='del'>-	if (!ieee80211_is_data(fc))</div><div class='del'>-		sta_id = ctx-&gt;bcast_sta_id;</div><div class='del'>-	else {</div><div class='del'>-		/* Find index into station table for destination station */</div><div class='del'>-		sta_id = iwl_legacy_sta_id_or_broadcast(priv, ctx, info-&gt;control.sta);</div><div class='del'>-</div><div class='del'>-		if (sta_id == IWL_INVALID_STATION) {</div><div class='del'>-			IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",</div><div class='del'>-				       hdr-&gt;addr1);</div><div class='del'>-			goto drop_unlock;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TX(priv, "station Id %d\n", sta_id);</div><div class='del'>-</div><div class='del'>-	if (sta)</div><div class='del'>-		sta_priv = (void *)sta-&gt;drv_priv;</div><div class='del'>-</div><div class='del'>-	if (sta_priv &amp;&amp; sta_priv-&gt;asleep &amp;&amp;</div><div class='del'>-	    (info-&gt;flags &amp; IEEE80211_TX_CTL_POLL_RESPONSE)) {</div><div class='del'>-		/*</div><div class='del'>-		 * This sends an asynchronous command to the device,</div><div class='del'>-		 * but we can rely on it being processed before the</div><div class='del'>-		 * next frame is processed -- and the next frame to</div><div class='del'>-		 * this station is the one that will consume this</div><div class='del'>-		 * counter.</div><div class='del'>-		 * For now set the counter to just 1 since we do not</div><div class='del'>-		 * support uAPSD yet.</div><div class='del'>-		 */</div><div class='del'>-		iwl4965_sta_modify_sleep_tx_count(priv, sta_id, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Send this frame after DTIM -- there's a special queue</div><div class='del'>-	 * reserved for this for contexts that support AP mode.</div><div class='del'>-	 */</div><div class='del'>-	if (info-&gt;flags &amp; IEEE80211_TX_CTL_SEND_AFTER_DTIM) {</div><div class='del'>-		txq_id = ctx-&gt;mcast_queue;</div><div class='del'>-		/*</div><div class='del'>-		 * The microcode will clear the more data</div><div class='del'>-		 * bit in the last frame it transmits.</div><div class='del'>-		 */</div><div class='del'>-		hdr-&gt;frame_control |=</div><div class='del'>-			cpu_to_le16(IEEE80211_FCTL_MOREDATA);</div><div class='del'>-	} else</div><div class='del'>-		txq_id = ctx-&gt;ac_to_queue[skb_get_queue_mapping(skb)];</div><div class='del'>-</div><div class='del'>-	/* irqs already disabled/saved above when locking priv-&gt;lock */</div><div class='del'>-	spin_lock(&amp;priv-&gt;sta_lock);</div><div class='del'>-</div><div class='del'>-	if (ieee80211_is_data_qos(fc)) {</div><div class='del'>-		qc = ieee80211_get_qos_ctl(hdr);</div><div class='del'>-		tid = qc[0] &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='del'>-		if (WARN_ON_ONCE(tid &gt;= MAX_TID_COUNT)) {</div><div class='del'>-			spin_unlock(&amp;priv-&gt;sta_lock);</div><div class='del'>-			goto drop_unlock;</div><div class='del'>-		}</div><div class='del'>-		seq_number = priv-&gt;stations[sta_id].tid[tid].seq_number;</div><div class='del'>-		seq_number &amp;= IEEE80211_SCTL_SEQ;</div><div class='del'>-		hdr-&gt;seq_ctrl = hdr-&gt;seq_ctrl &amp;</div><div class='del'>-				cpu_to_le16(IEEE80211_SCTL_FRAG);</div><div class='del'>-		hdr-&gt;seq_ctrl |= cpu_to_le16(seq_number);</div><div class='del'>-		seq_number += 0x10;</div><div class='del'>-		/* aggregation is on for this &lt;sta,tid&gt; */</div><div class='del'>-		if (info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU &amp;&amp;</div><div class='del'>-		    priv-&gt;stations[sta_id].tid[tid].agg.state == IWL_AGG_ON) {</div><div class='del'>-			txq_id = priv-&gt;stations[sta_id].tid[tid].agg.txq_id;</div><div class='del'>-			is_agg = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	txq = &amp;priv-&gt;txq[txq_id];</div><div class='del'>-	q = &amp;txq-&gt;q;</div><div class='del'>-</div><div class='del'>-	if (unlikely(iwl_legacy_queue_space(q) &lt; q-&gt;high_mark)) {</div><div class='del'>-		spin_unlock(&amp;priv-&gt;sta_lock);</div><div class='del'>-		goto drop_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ieee80211_is_data_qos(fc)) {</div><div class='del'>-		priv-&gt;stations[sta_id].tid[tid].tfds_in_queue++;</div><div class='del'>-		if (!ieee80211_has_morefrags(fc))</div><div class='del'>-			priv-&gt;stations[sta_id].tid[tid].seq_number = seq_number;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;priv-&gt;sta_lock);</div><div class='del'>-</div><div class='del'>-	/* Set up driver data for this TFD */</div><div class='del'>-	memset(&amp;(txq-&gt;txb[q-&gt;write_ptr]), 0, sizeof(struct iwl_tx_info));</div><div class='del'>-	txq-&gt;txb[q-&gt;write_ptr].skb = skb;</div><div class='del'>-	txq-&gt;txb[q-&gt;write_ptr].ctx = ctx;</div><div class='del'>-</div><div class='del'>-	/* Set up first empty entry in queue's array of Tx/cmd buffers */</div><div class='del'>-	out_cmd = txq-&gt;cmd[q-&gt;write_ptr];</div><div class='del'>-	out_meta = &amp;txq-&gt;meta[q-&gt;write_ptr];</div><div class='del'>-	tx_cmd = &amp;out_cmd-&gt;cmd.tx;</div><div class='del'>-	memset(&amp;out_cmd-&gt;hdr, 0, sizeof(out_cmd-&gt;hdr));</div><div class='del'>-	memset(tx_cmd, 0, sizeof(struct iwl_tx_cmd));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set up the Tx-command (not MAC!) header.</div><div class='del'>-	 * Store the chosen Tx queue and TFD index within the sequence field;</div><div class='del'>-	 * after Tx, uCode's Tx response will return this value so driver can</div><div class='del'>-	 * locate the frame within the tx queue and do post-tx processing.</div><div class='del'>-	 */</div><div class='del'>-	out_cmd-&gt;hdr.cmd = REPLY_TX;</div><div class='del'>-	out_cmd-&gt;hdr.sequence = cpu_to_le16((u16)(QUEUE_TO_SEQ(txq_id) |</div><div class='del'>-				INDEX_TO_SEQ(q-&gt;write_ptr)));</div><div class='del'>-</div><div class='del'>-	/* Copy MAC header from skb into command buffer */</div><div class='del'>-	memcpy(tx_cmd-&gt;hdr, hdr, hdr_len);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Total # bytes to be transmitted */</div><div class='del'>-	len = (u16)skb-&gt;len;</div><div class='del'>-	tx_cmd-&gt;len = cpu_to_le16(len);</div><div class='del'>-</div><div class='del'>-	if (info-&gt;control.hw_key)</div><div class='del'>-		iwl4965_tx_cmd_build_hwcrypto(priv, info, tx_cmd, skb, sta_id);</div><div class='del'>-</div><div class='del'>-	/* TODO need this for burst mode later on */</div><div class='del'>-	iwl4965_tx_cmd_build_basic(priv, skb, tx_cmd, info, hdr, sta_id);</div><div class='del'>-	iwl_legacy_dbg_log_tx_data_frame(priv, len, hdr);</div><div class='del'>-</div><div class='del'>-	iwl4965_tx_cmd_build_rate(priv, tx_cmd, info, fc);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_update_stats(priv, true, fc, len);</div><div class='del'>-	/*</div><div class='del'>-	 * Use the first empty entry in this queue's command buffer array</div><div class='del'>-	 * to contain the Tx command and MAC header concatenated together</div><div class='del'>-	 * (payload data will be in another buffer).</div><div class='del'>-	 * Size of this varies, due to varying MAC header length.</div><div class='del'>-	 * If end is not dword aligned, we'll have 2 extra bytes at the end</div><div class='del'>-	 * of the MAC header (device reads on dword boundaries).</div><div class='del'>-	 * We'll tell device about this padding later.</div><div class='del'>-	 */</div><div class='del'>-	len = sizeof(struct iwl_tx_cmd) +</div><div class='del'>-		sizeof(struct iwl_cmd_header) + hdr_len;</div><div class='del'>-	firstlen = (len + 3) &amp; ~3;</div><div class='del'>-</div><div class='del'>-	/* Tell NIC about any 2-byte padding after MAC header */</div><div class='del'>-	if (firstlen != len)</div><div class='del'>-		tx_cmd-&gt;tx_flags |= TX_CMD_FLG_MH_PAD_MSK;</div><div class='del'>-</div><div class='del'>-	/* Physical address of this Tx command's header (not MAC header!),</div><div class='del'>-	 * within command buffer array. */</div><div class='del'>-	txcmd_phys = pci_map_single(priv-&gt;pci_dev,</div><div class='del'>-				    &amp;out_cmd-&gt;hdr, firstlen,</div><div class='del'>-				    PCI_DMA_BIDIRECTIONAL);</div><div class='del'>-	dma_unmap_addr_set(out_meta, mapping, txcmd_phys);</div><div class='del'>-	dma_unmap_len_set(out_meta, len, firstlen);</div><div class='del'>-	/* Add buffer containing Tx command and MAC(!) header to TFD's</div><div class='del'>-	 * first entry */</div><div class='del'>-	priv-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_attach_buf_to_tfd(priv, txq,</div><div class='del'>-						   txcmd_phys, firstlen, 1, 0);</div><div class='del'>-</div><div class='del'>-	if (!ieee80211_has_morefrags(hdr-&gt;frame_control)) {</div><div class='del'>-		txq-&gt;need_update = 1;</div><div class='del'>-	} else {</div><div class='del'>-		wait_write_ptr = 1;</div><div class='del'>-		txq-&gt;need_update = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set up TFD's 2nd entry to point directly to remainder of skb,</div><div class='del'>-	 * if any (802.11 null frames have no payload). */</div><div class='del'>-	secondlen = skb-&gt;len - hdr_len;</div><div class='del'>-	if (secondlen &gt; 0) {</div><div class='del'>-		phys_addr = pci_map_single(priv-&gt;pci_dev, skb-&gt;data + hdr_len,</div><div class='del'>-					   secondlen, PCI_DMA_TODEVICE);</div><div class='del'>-		priv-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_attach_buf_to_tfd(priv, txq,</div><div class='del'>-							   phys_addr, secondlen,</div><div class='del'>-							   0, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	scratch_phys = txcmd_phys + sizeof(struct iwl_cmd_header) +</div><div class='del'>-				offsetof(struct iwl_tx_cmd, scratch);</div><div class='del'>-</div><div class='del'>-	/* take back ownership of DMA buffer to enable update */</div><div class='del'>-	pci_dma_sync_single_for_cpu(priv-&gt;pci_dev, txcmd_phys,</div><div class='del'>-				    firstlen, PCI_DMA_BIDIRECTIONAL);</div><div class='del'>-	tx_cmd-&gt;dram_lsb_ptr = cpu_to_le32(scratch_phys);</div><div class='del'>-	tx_cmd-&gt;dram_msb_ptr = iwl_legacy_get_dma_hi_addr(scratch_phys);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TX(priv, "sequence nr = 0X%x\n",</div><div class='del'>-		     le16_to_cpu(out_cmd-&gt;hdr.sequence));</div><div class='del'>-	IWL_DEBUG_TX(priv, "tx_flags = 0X%x\n", le32_to_cpu(tx_cmd-&gt;tx_flags));</div><div class='del'>-	iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx_cmd, sizeof(*tx_cmd));</div><div class='del'>-	iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx_cmd-&gt;hdr, hdr_len);</div><div class='del'>-</div><div class='del'>-	/* Set up entry for this TFD in Tx byte-count array */</div><div class='del'>-	if (info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU)</div><div class='del'>-		priv-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_update_byte_cnt_tbl(priv, txq,</div><div class='del'>-						     le16_to_cpu(tx_cmd-&gt;len));</div><div class='del'>-</div><div class='del'>-	pci_dma_sync_single_for_device(priv-&gt;pci_dev, txcmd_phys,</div><div class='del'>-				       firstlen, PCI_DMA_BIDIRECTIONAL);</div><div class='del'>-</div><div class='del'>-	trace_iwlwifi_legacy_dev_tx(priv,</div><div class='del'>-			     &amp;((struct iwl_tfd *)txq-&gt;tfds)[txq-&gt;q.write_ptr],</div><div class='del'>-			     sizeof(struct iwl_tfd),</div><div class='del'>-			     &amp;out_cmd-&gt;hdr, firstlen,</div><div class='del'>-			     skb-&gt;data + hdr_len, secondlen);</div><div class='del'>-</div><div class='del'>-	/* Tell device the write index *just past* this latest filled TFD */</div><div class='del'>-	q-&gt;write_ptr = iwl_legacy_queue_inc_wrap(q-&gt;write_ptr, q-&gt;n_bd);</div><div class='del'>-	iwl_legacy_txq_update_write_ptr(priv, txq);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * At this point the frame is "transmitted" successfully</div><div class='del'>-	 * and we will get a TX status notification eventually,</div><div class='del'>-	 * regardless of the value of ret. "ret" only indicates</div><div class='del'>-	 * whether or not we should update the write pointer.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Avoid atomic ops if it isn't an associated client.</div><div class='del'>-	 * Also, if this is a packet for aggregation, don't</div><div class='del'>-	 * increase the counter because the ucode will stop</div><div class='del'>-	 * aggregation queues when their respective station</div><div class='del'>-	 * goes to sleep.</div><div class='del'>-	 */</div><div class='del'>-	if (sta_priv &amp;&amp; sta_priv-&gt;client &amp;&amp; !is_agg)</div><div class='del'>-		atomic_inc(&amp;sta_priv-&gt;pending_frames);</div><div class='del'>-</div><div class='del'>-	if ((iwl_legacy_queue_space(q) &lt; q-&gt;high_mark) &amp;&amp;</div><div class='del'>-			priv-&gt;mac80211_registered) {</div><div class='del'>-		if (wait_write_ptr) {</div><div class='del'>-			spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-			txq-&gt;need_update = 1;</div><div class='del'>-			iwl_legacy_txq_update_write_ptr(priv, txq);</div><div class='del'>-			spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-		} else {</div><div class='del'>-			iwl_legacy_stop_queue(priv, txq);</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'>-drop_unlock:</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int iwl4965_alloc_dma_ptr(struct iwl_priv *priv,</div><div class='del'>-				    struct iwl_dma_ptr *ptr, size_t size)</div><div class='del'>-{</div><div class='del'>-	ptr-&gt;addr = dma_alloc_coherent(&amp;priv-&gt;pci_dev-&gt;dev, size, &amp;ptr-&gt;dma,</div><div class='del'>-				       GFP_KERNEL);</div><div class='del'>-	if (!ptr-&gt;addr)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	ptr-&gt;size = size;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void iwl4965_free_dma_ptr(struct iwl_priv *priv,</div><div class='del'>-				    struct iwl_dma_ptr *ptr)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(!ptr-&gt;addr))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dma_free_coherent(&amp;priv-&gt;pci_dev-&gt;dev, ptr-&gt;size, ptr-&gt;addr, ptr-&gt;dma);</div><div class='del'>-	memset(ptr, 0, sizeof(*ptr));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_hw_txq_ctx_free - Free TXQ Context</div><div class='del'>- *</div><div class='del'>- * Destroy all TX DMA queues and structures</div><div class='del'>- */</div><div class='del'>-void iwl4965_hw_txq_ctx_free(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int txq_id;</div><div class='del'>-</div><div class='del'>-	/* Tx queues */</div><div class='del'>-	if (priv-&gt;txq) {</div><div class='del'>-		for (txq_id = 0; txq_id &lt; priv-&gt;hw_params.max_txq_num; txq_id++)</div><div class='del'>-			if (txq_id == priv-&gt;cmd_queue)</div><div class='del'>-				iwl_legacy_cmd_queue_free(priv);</div><div class='del'>-			else</div><div class='del'>-				iwl_legacy_tx_queue_free(priv, txq_id);</div><div class='del'>-	}</div><div class='del'>-	iwl4965_free_dma_ptr(priv, &amp;priv-&gt;kw);</div><div class='del'>-</div><div class='del'>-	iwl4965_free_dma_ptr(priv, &amp;priv-&gt;scd_bc_tbls);</div><div class='del'>-</div><div class='del'>-	/* free tx queue structure */</div><div class='del'>-	iwl_legacy_txq_mem(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_txq_ctx_alloc - allocate TX queue context</div><div class='del'>- * Allocate all Tx DMA structures and initialize them</div><div class='del'>- *</div><div class='del'>- * @param priv</div><div class='del'>- * @return error code</div><div class='del'>- */</div><div class='del'>-int iwl4965_txq_ctx_alloc(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	int txq_id, slots_num;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* Free all tx/cmd queues and keep-warm buffer */</div><div class='del'>-	iwl4965_hw_txq_ctx_free(priv);</div><div class='del'>-</div><div class='del'>-	ret = iwl4965_alloc_dma_ptr(priv, &amp;priv-&gt;scd_bc_tbls,</div><div class='del'>-				priv-&gt;hw_params.scd_bc_tbls_size);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "Scheduler BC Table allocation failed\n");</div><div class='del'>-		goto error_bc_tbls;</div><div class='del'>-	}</div><div class='del'>-	/* Alloc keep-warm buffer */</div><div class='del'>-	ret = iwl4965_alloc_dma_ptr(priv, &amp;priv-&gt;kw, IWL_KW_SIZE);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "Keep Warm allocation failed\n");</div><div class='del'>-		goto error_kw;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* allocate tx queue structure */</div><div class='del'>-	ret = iwl_legacy_alloc_txq_mem(priv);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Turn off all Tx DMA fifos */</div><div class='del'>-	iwl4965_txq_set_sched(priv, 0);</div><div class='del'>-</div><div class='del'>-	/* Tell NIC where to find the "keep warm" buffer */</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH_KW_MEM_ADDR_REG, priv-&gt;kw.dma &gt;&gt; 4);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Alloc and init all Tx queues, including the command queue (#4/#9) */</div><div class='del'>-	for (txq_id = 0; txq_id &lt; priv-&gt;hw_params.max_txq_num; txq_id++) {</div><div class='del'>-		slots_num = (txq_id == priv-&gt;cmd_queue) ?</div><div class='del'>-					TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;</div><div class='del'>-		ret = iwl_legacy_tx_queue_init(priv,</div><div class='del'>-					&amp;priv-&gt;txq[txq_id], slots_num,</div><div class='del'>-				       txq_id);</div><div class='del'>-		if (ret) {</div><div class='del'>-			IWL_ERR(priv, "Tx %d queue init failed\n", txq_id);</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	iwl4965_hw_txq_ctx_free(priv);</div><div class='del'>-	iwl4965_free_dma_ptr(priv, &amp;priv-&gt;kw);</div><div class='del'>- error_kw:</div><div class='del'>-	iwl4965_free_dma_ptr(priv, &amp;priv-&gt;scd_bc_tbls);</div><div class='del'>- error_bc_tbls:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl4965_txq_ctx_reset(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int txq_id, slots_num;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Turn off all Tx DMA fifos */</div><div class='del'>-	iwl4965_txq_set_sched(priv, 0);</div><div class='del'>-</div><div class='del'>-	/* Tell NIC where to find the "keep warm" buffer */</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH_KW_MEM_ADDR_REG, priv-&gt;kw.dma &gt;&gt; 4);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Alloc and init all Tx queues, including the command queue (#4) */</div><div class='del'>-	for (txq_id = 0; txq_id &lt; priv-&gt;hw_params.max_txq_num; txq_id++) {</div><div class='del'>-		slots_num = txq_id == priv-&gt;cmd_queue ?</div><div class='del'>-			    TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;</div><div class='del'>-		iwl_legacy_tx_queue_reset(priv, &amp;priv-&gt;txq[txq_id],</div><div class='del'>-						slots_num, txq_id);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_txq_ctx_stop - Stop all Tx DMA channels</div><div class='del'>- */</div><div class='del'>-void iwl4965_txq_ctx_stop(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int ch, txq_id;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* Turn off all Tx DMA fifos */</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	iwl4965_txq_set_sched(priv, 0);</div><div class='del'>-</div><div class='del'>-	/* Stop each Tx DMA channel, and wait for it to be idle */</div><div class='del'>-	for (ch = 0; ch &lt; priv-&gt;hw_params.dma_chnl_num; ch++) {</div><div class='del'>-		iwl_legacy_write_direct32(priv,</div><div class='del'>-				FH_TCSR_CHNL_TX_CONFIG_REG(ch), 0x0);</div><div class='del'>-		if (iwl_poll_direct_bit(priv, FH_TSSR_TX_STATUS_REG,</div><div class='del'>-				    FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(ch),</div><div class='del'>-				    1000))</div><div class='del'>-			IWL_ERR(priv, "Failing on timeout while stopping"</div><div class='del'>-			    " DMA channel %d [0x%08x]", ch,</div><div class='del'>-			    iwl_legacy_read_direct32(priv,</div><div class='del'>-					FH_TSSR_TX_STATUS_REG));</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;txq)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Unmap DMA from host system and free skb's */</div><div class='del'>-	for (txq_id = 0; txq_id &lt; priv-&gt;hw_params.max_txq_num; txq_id++)</div><div class='del'>-		if (txq_id == priv-&gt;cmd_queue)</div><div class='del'>-			iwl_legacy_cmd_queue_unmap(priv);</div><div class='del'>-		else</div><div class='del'>-			iwl_legacy_tx_queue_unmap(priv, txq_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Find first available (lowest unused) Tx Queue, mark it "active".</div><div class='del'>- * Called only when finding queue for aggregation.</div><div class='del'>- * Should never return anything &lt; 7, because they should already</div><div class='del'>- * be in use as EDCA AC (0-3), Command (4), reserved (5, 6)</div><div class='del'>- */</div><div class='del'>-static int iwl4965_txq_ctx_activate_free(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int txq_id;</div><div class='del'>-</div><div class='del'>-	for (txq_id = 0; txq_id &lt; priv-&gt;hw_params.max_txq_num; txq_id++)</div><div class='del'>-		if (!test_and_set_bit(txq_id, &amp;priv-&gt;txq_ctx_active_msk))</div><div class='del'>-			return txq_id;</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_tx_queue_stop_scheduler - Stop queue, but keep configuration</div><div class='del'>- */</div><div class='del'>-static void iwl4965_tx_queue_stop_scheduler(struct iwl_priv *priv,</div><div class='del'>-					    u16 txq_id)</div><div class='del'>-{</div><div class='del'>-	/* Simply stop the queue, but don't change any configuration;</div><div class='del'>-	 * the SCD_ACT_EN bit is the write-enable mask for the ACTIVE bit. */</div><div class='del'>-	iwl_legacy_write_prph(priv,</div><div class='del'>-		IWL49_SCD_QUEUE_STATUS_BITS(txq_id),</div><div class='del'>-		(0 &lt;&lt; IWL49_SCD_QUEUE_STTS_REG_POS_ACTIVE)|</div><div class='del'>-		(1 &lt;&lt; IWL49_SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_tx_queue_set_q2ratid - Map unique receiver/tid combination to a queue</div><div class='del'>- */</div><div class='del'>-static int iwl4965_tx_queue_set_q2ratid(struct iwl_priv *priv, u16 ra_tid,</div><div class='del'>-					u16 txq_id)</div><div class='del'>-{</div><div class='del'>-	u32 tbl_dw_addr;</div><div class='del'>-	u32 tbl_dw;</div><div class='del'>-	u16 scd_q2ratid;</div><div class='del'>-</div><div class='del'>-	scd_q2ratid = ra_tid &amp; IWL_SCD_QUEUE_RA_TID_MAP_RATID_MSK;</div><div class='del'>-</div><div class='del'>-	tbl_dw_addr = priv-&gt;scd_base_addr +</div><div class='del'>-			IWL49_SCD_TRANSLATE_TBL_OFFSET_QUEUE(txq_id);</div><div class='del'>-</div><div class='del'>-	tbl_dw = iwl_legacy_read_targ_mem(priv, tbl_dw_addr);</div><div class='del'>-</div><div class='del'>-	if (txq_id &amp; 0x1)</div><div class='del'>-		tbl_dw = (scd_q2ratid &lt;&lt; 16) | (tbl_dw &amp; 0x0000FFFF);</div><div class='del'>-	else</div><div class='del'>-		tbl_dw = scd_q2ratid | (tbl_dw &amp; 0xFFFF0000);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_write_targ_mem(priv, tbl_dw_addr, tbl_dw);</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'>- * iwl4965_tx_queue_agg_enable - Set up &amp; enable aggregation for selected queue</div><div class='del'>- *</div><div class='del'>- * NOTE:  txq_id must be greater than IWL49_FIRST_AMPDU_QUEUE,</div><div class='del'>- *        i.e. it must be one of the higher queues used for aggregation</div><div class='del'>- */</div><div class='del'>-static int iwl4965_txq_agg_enable(struct iwl_priv *priv, int txq_id,</div><div class='del'>-				  int tx_fifo, int sta_id, int tid, u16 ssn_idx)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u16 ra_tid;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if ((IWL49_FIRST_AMPDU_QUEUE &gt; txq_id) ||</div><div class='del'>-	    (IWL49_FIRST_AMPDU_QUEUE +</div><div class='del'>-		priv-&gt;cfg-&gt;base_params-&gt;num_of_ampdu_queues &lt;= txq_id)) {</div><div class='del'>-		IWL_WARN(priv,</div><div class='del'>-			"queue number out of range: %d, must be %d to %d\n",</div><div class='del'>-			txq_id, IWL49_FIRST_AMPDU_QUEUE,</div><div class='del'>-			IWL49_FIRST_AMPDU_QUEUE +</div><div class='del'>-			priv-&gt;cfg-&gt;base_params-&gt;num_of_ampdu_queues - 1);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ra_tid = BUILD_RAxTID(sta_id, tid);</div><div class='del'>-</div><div class='del'>-	/* Modify device's station table to Tx this TID */</div><div class='del'>-	ret = iwl4965_sta_tx_modify_enable_tid(priv, sta_id, tid);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Stop this Tx queue before configuring it */</div><div class='del'>-	iwl4965_tx_queue_stop_scheduler(priv, txq_id);</div><div class='del'>-</div><div class='del'>-	/* Map receiver-address / traffic-ID to this queue */</div><div class='del'>-	iwl4965_tx_queue_set_q2ratid(priv, ra_tid, txq_id);</div><div class='del'>-</div><div class='del'>-	/* Set this queue as a chain-building queue */</div><div class='del'>-	iwl_legacy_set_bits_prph(priv, IWL49_SCD_QUEUECHAIN_SEL, (1 &lt;&lt; txq_id));</div><div class='del'>-</div><div class='del'>-	/* Place first TFD at index corresponding to start sequence number.</div><div class='del'>-	 * Assumes that ssn_idx is valid (!= 0xFFF) */</div><div class='del'>-	priv-&gt;txq[txq_id].q.read_ptr = (ssn_idx &amp; 0xff);</div><div class='del'>-	priv-&gt;txq[txq_id].q.write_ptr = (ssn_idx &amp; 0xff);</div><div class='del'>-	iwl4965_set_wr_ptrs(priv, txq_id, ssn_idx);</div><div class='del'>-</div><div class='del'>-	/* Set up Tx window size and frame limit for this queue */</div><div class='del'>-	iwl_legacy_write_targ_mem(priv,</div><div class='del'>-		priv-&gt;scd_base_addr + IWL49_SCD_CONTEXT_QUEUE_OFFSET(txq_id),</div><div class='del'>-		(SCD_WIN_SIZE &lt;&lt; IWL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_POS) &amp;</div><div class='del'>-		IWL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_write_targ_mem(priv, priv-&gt;scd_base_addr +</div><div class='del'>-		IWL49_SCD_CONTEXT_QUEUE_OFFSET(txq_id) + sizeof(u32),</div><div class='del'>-		(SCD_FRAME_LIMIT &lt;&lt; IWL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS)</div><div class='del'>-		&amp; IWL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_set_bits_prph(priv, IWL49_SCD_INTERRUPT_MASK, (1 &lt;&lt; txq_id));</div><div class='del'>-</div><div class='del'>-	/* Set up Status area in SRAM, map to Tx DMA/FIFO, activate the queue */</div><div class='del'>-	iwl4965_tx_queue_set_status(priv, &amp;priv-&gt;txq[txq_id], tx_fifo, 1);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, 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'>-int iwl4965_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,</div><div class='del'>-			struct ieee80211_sta *sta, u16 tid, u16 *ssn)</div><div class='del'>-{</div><div class='del'>-	int sta_id;</div><div class='del'>-	int tx_fifo;</div><div class='del'>-	int txq_id;</div><div class='del'>-	int ret;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct iwl_tid_data *tid_data;</div><div class='del'>-</div><div class='del'>-	tx_fifo = iwl4965_get_fifo_from_tid(iwl_legacy_rxon_ctx_from_vif(vif), tid);</div><div class='del'>-	if (unlikely(tx_fifo &lt; 0))</div><div class='del'>-		return tx_fifo;</div><div class='del'>-</div><div class='del'>-	IWL_WARN(priv, "%s on ra = %pM tid = %d\n",</div><div class='del'>-			__func__, sta-&gt;addr, tid);</div><div class='del'>-</div><div class='del'>-	sta_id = iwl_legacy_sta_id(sta);</div><div class='del'>-	if (sta_id == IWL_INVALID_STATION) {</div><div class='del'>-		IWL_ERR(priv, "Start AGG on invalid station\n");</div><div class='del'>-		return -ENXIO;</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 (priv-&gt;stations[sta_id].tid[tid].agg.state != IWL_AGG_OFF) {</div><div class='del'>-		IWL_ERR(priv, "Start AGG when state is not IWL_AGG_OFF !\n");</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	txq_id = iwl4965_txq_ctx_activate_free(priv);</div><div class='del'>-	if (txq_id == -1) {</div><div class='del'>-		IWL_ERR(priv, "No free aggregation queue available\n");</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	tid_data = &amp;priv-&gt;stations[sta_id].tid[tid];</div><div class='del'>-	*ssn = SEQ_TO_SN(tid_data-&gt;seq_number);</div><div class='del'>-	tid_data-&gt;agg.txq_id = txq_id;</div><div class='del'>-	iwl_legacy_set_swq_id(&amp;priv-&gt;txq[txq_id],</div><div class='del'>-				iwl4965_get_ac_from_tid(tid), txq_id);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	ret = iwl4965_txq_agg_enable(priv, txq_id, tx_fifo,</div><div class='del'>-						  sta_id, tid, *ssn);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	tid_data = &amp;priv-&gt;stations[sta_id].tid[tid];</div><div class='del'>-	if (tid_data-&gt;tfds_in_queue == 0) {</div><div class='del'>-		IWL_DEBUG_HT(priv, "HW queue is empty\n");</div><div class='del'>-		tid_data-&gt;agg.state = IWL_AGG_ON;</div><div class='del'>-		ieee80211_start_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='del'>-	} else {</div><div class='del'>-		IWL_DEBUG_HT(priv,</div><div class='del'>-			"HW queue is NOT empty: %d packets in HW queue\n",</div><div class='del'>-			     tid_data-&gt;tfds_in_queue);</div><div class='del'>-		tid_data-&gt;agg.state = IWL_EMPTYING_HW_QUEUE_ADDBA;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * txq_id must be greater than IWL49_FIRST_AMPDU_QUEUE</div><div class='del'>- * priv-&gt;lock must be held by the caller</div><div class='del'>- */</div><div class='del'>-static int iwl4965_txq_agg_disable(struct iwl_priv *priv, u16 txq_id,</div><div class='del'>-				   u16 ssn_idx, u8 tx_fifo)</div><div class='del'>-{</div><div class='del'>-	if ((IWL49_FIRST_AMPDU_QUEUE &gt; txq_id) ||</div><div class='del'>-	    (IWL49_FIRST_AMPDU_QUEUE +</div><div class='del'>-		priv-&gt;cfg-&gt;base_params-&gt;num_of_ampdu_queues &lt;= txq_id)) {</div><div class='del'>-		IWL_WARN(priv,</div><div class='del'>-			"queue number out of range: %d, must be %d to %d\n",</div><div class='del'>-			txq_id, IWL49_FIRST_AMPDU_QUEUE,</div><div class='del'>-			IWL49_FIRST_AMPDU_QUEUE +</div><div class='del'>-			priv-&gt;cfg-&gt;base_params-&gt;num_of_ampdu_queues - 1);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl4965_tx_queue_stop_scheduler(priv, txq_id);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_clear_bits_prph(priv,</div><div class='del'>-			IWL49_SCD_QUEUECHAIN_SEL, (1 &lt;&lt; txq_id));</div><div class='del'>-</div><div class='del'>-	priv-&gt;txq[txq_id].q.read_ptr = (ssn_idx &amp; 0xff);</div><div class='del'>-	priv-&gt;txq[txq_id].q.write_ptr = (ssn_idx &amp; 0xff);</div><div class='del'>-	/* supposes that ssn_idx is valid (!= 0xFFF) */</div><div class='del'>-	iwl4965_set_wr_ptrs(priv, txq_id, ssn_idx);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_clear_bits_prph(priv,</div><div class='del'>-			 IWL49_SCD_INTERRUPT_MASK, (1 &lt;&lt; txq_id));</div><div class='del'>-	iwl_txq_ctx_deactivate(priv, txq_id);</div><div class='del'>-	iwl4965_tx_queue_set_status(priv, &amp;priv-&gt;txq[txq_id], tx_fifo, 0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,</div><div class='del'>-		       struct ieee80211_sta *sta, u16 tid)</div><div class='del'>-{</div><div class='del'>-	int tx_fifo_id, txq_id, sta_id, ssn;</div><div class='del'>-	struct iwl_tid_data *tid_data;</div><div class='del'>-	int write_ptr, read_ptr;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	tx_fifo_id = iwl4965_get_fifo_from_tid(iwl_legacy_rxon_ctx_from_vif(vif), tid);</div><div class='del'>-	if (unlikely(tx_fifo_id &lt; 0))</div><div class='del'>-		return tx_fifo_id;</div><div class='del'>-</div><div class='del'>-	sta_id = iwl_legacy_sta_id(sta);</div><div class='del'>-</div><div class='del'>-	if (sta_id == IWL_INVALID_STATION) {</div><div class='del'>-		IWL_ERR(priv, "Invalid station for AGG tid %d\n", tid);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	tid_data = &amp;priv-&gt;stations[sta_id].tid[tid];</div><div class='del'>-	ssn = (tid_data-&gt;seq_number &amp; IEEE80211_SCTL_SEQ) &gt;&gt; 4;</div><div class='del'>-	txq_id = tid_data-&gt;agg.txq_id;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;stations[sta_id].tid[tid].agg.state) {</div><div class='del'>-	case IWL_EMPTYING_HW_QUEUE_ADDBA:</div><div class='del'>-		/*</div><div class='del'>-		 * This can happen if the peer stops aggregation</div><div class='del'>-		 * again before we've had a chance to drain the</div><div class='del'>-		 * queue we selected previously, i.e. before the</div><div class='del'>-		 * session was really started completely.</div><div class='del'>-		 */</div><div class='del'>-		IWL_DEBUG_HT(priv, "AGG stop before setup done\n");</div><div class='del'>-		goto turn_off;</div><div class='del'>-	case IWL_AGG_ON:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		IWL_WARN(priv, "Stopping AGG while state not ON or starting\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	write_ptr = priv-&gt;txq[txq_id].q.write_ptr;</div><div class='del'>-	read_ptr = priv-&gt;txq[txq_id].q.read_ptr;</div><div class='del'>-</div><div class='del'>-	/* The queue is not empty */</div><div class='del'>-	if (write_ptr != read_ptr) {</div><div class='del'>-		IWL_DEBUG_HT(priv, "Stopping a non empty AGG HW QUEUE\n");</div><div class='del'>-		priv-&gt;stations[sta_id].tid[tid].agg.state =</div><div class='del'>-				IWL_EMPTYING_HW_QUEUE_DELBA;</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_HT(priv, "HW queue is empty\n");</div><div class='del'>- turn_off:</div><div class='del'>-	priv-&gt;stations[sta_id].tid[tid].agg.state = IWL_AGG_OFF;</div><div class='del'>-</div><div class='del'>-	/* do not restore/save irqs */</div><div class='del'>-	spin_unlock(&amp;priv-&gt;sta_lock);</div><div class='del'>-	spin_lock(&amp;priv-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * the only reason this call can fail is queue number out of range,</div><div class='del'>-	 * which can happen if uCode is reloaded and all the station</div><div class='del'>-	 * information are lost. if it is outside the range, there is no need</div><div class='del'>-	 * to deactivate the uCode queue, just return "success" to allow</div><div class='del'>-	 *  mac80211 to clean up it own data.</div><div class='del'>-	 */</div><div class='del'>-	iwl4965_txq_agg_disable(priv, txq_id, ssn, tx_fifo_id);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	ieee80211_stop_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_txq_check_empty(struct iwl_priv *priv,</div><div class='del'>-			   int sta_id, u8 tid, int txq_id)</div><div class='del'>-{</div><div class='del'>-	struct iwl_queue *q = &amp;priv-&gt;txq[txq_id].q;</div><div class='del'>-	u8 *addr = priv-&gt;stations[sta_id].sta.sta.addr;</div><div class='del'>-	struct iwl_tid_data *tid_data = &amp;priv-&gt;stations[sta_id].tid[tid];</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-</div><div class='del'>-	ctx = &amp;priv-&gt;contexts[priv-&gt;stations[sta_id].ctxid];</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;sta_lock);</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;stations[sta_id].tid[tid].agg.state) {</div><div class='del'>-	case IWL_EMPTYING_HW_QUEUE_DELBA:</div><div class='del'>-		/* We are reclaiming the last packet of the */</div><div class='del'>-		/* aggregated HW queue */</div><div class='del'>-		if ((txq_id  == tid_data-&gt;agg.txq_id) &amp;&amp;</div><div class='del'>-		    (q-&gt;read_ptr == q-&gt;write_ptr)) {</div><div class='del'>-			u16 ssn = SEQ_TO_SN(tid_data-&gt;seq_number);</div><div class='del'>-			int tx_fifo = iwl4965_get_fifo_from_tid(ctx, tid);</div><div class='del'>-			IWL_DEBUG_HT(priv,</div><div class='del'>-				"HW queue empty: continue DELBA flow\n");</div><div class='del'>-			iwl4965_txq_agg_disable(priv, txq_id, ssn, tx_fifo);</div><div class='del'>-			tid_data-&gt;agg.state = IWL_AGG_OFF;</div><div class='del'>-			ieee80211_stop_tx_ba_cb_irqsafe(ctx-&gt;vif, addr, tid);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case IWL_EMPTYING_HW_QUEUE_ADDBA:</div><div class='del'>-		/* We are reclaiming the last packet of the queue */</div><div class='del'>-		if (tid_data-&gt;tfds_in_queue == 0) {</div><div class='del'>-			IWL_DEBUG_HT(priv,</div><div class='del'>-				"HW queue empty: continue ADDBA flow\n");</div><div class='del'>-			tid_data-&gt;agg.state = IWL_AGG_ON;</div><div class='del'>-			ieee80211_start_tx_ba_cb_irqsafe(ctx-&gt;vif, addr, tid);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_non_agg_tx_status(struct iwl_priv *priv,</div><div class='del'>-				     struct iwl_rxon_context *ctx,</div><div class='del'>-				     const u8 *addr1)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_sta *sta;</div><div class='del'>-	struct iwl_station_priv *sta_priv;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	sta = ieee80211_find_sta(ctx-&gt;vif, addr1);</div><div class='del'>-	if (sta) {</div><div class='del'>-		sta_priv = (void *)sta-&gt;drv_priv;</div><div class='del'>-		/* avoid atomic ops if this isn't a client */</div><div class='del'>-		if (sta_priv-&gt;client &amp;&amp;</div><div class='del'>-		    atomic_dec_return(&amp;sta_priv-&gt;pending_frames) == 0)</div><div class='del'>-			ieee80211_sta_block_awake(priv-&gt;hw, sta, false);</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-iwl4965_tx_status(struct iwl_priv *priv, struct iwl_tx_info *tx_info,</div><div class='del'>-			     bool is_agg)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx_info-&gt;skb-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (!is_agg)</div><div class='del'>-		iwl4965_non_agg_tx_status(priv, tx_info-&gt;ctx, hdr-&gt;addr1);</div><div class='del'>-</div><div class='del'>-	ieee80211_tx_status_irqsafe(priv-&gt;hw, tx_info-&gt;skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tx_queue *txq = &amp;priv-&gt;txq[txq_id];</div><div class='del'>-	struct iwl_queue *q = &amp;txq-&gt;q;</div><div class='del'>-	struct iwl_tx_info *tx_info;</div><div class='del'>-	int nfreed = 0;</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-</div><div class='del'>-	if ((index &gt;= q-&gt;n_bd) || (iwl_legacy_queue_used(q, index) == 0)) {</div><div class='del'>-		IWL_ERR(priv, "Read index for DMA queue txq id (%d), index %d, "</div><div class='del'>-			  "is out of range [0-%d] %d %d.\n", txq_id,</div><div class='del'>-			  index, q-&gt;n_bd, q-&gt;write_ptr, q-&gt;read_ptr);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (index = iwl_legacy_queue_inc_wrap(index, q-&gt;n_bd);</div><div class='del'>-	     q-&gt;read_ptr != index;</div><div class='del'>-	     q-&gt;read_ptr = iwl_legacy_queue_inc_wrap(q-&gt;read_ptr, q-&gt;n_bd)) {</div><div class='del'>-</div><div class='del'>-		tx_info = &amp;txq-&gt;txb[txq-&gt;q.read_ptr];</div><div class='del'>-</div><div class='del'>-		if (WARN_ON_ONCE(tx_info-&gt;skb == NULL))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		hdr = (struct ieee80211_hdr *)tx_info-&gt;skb-&gt;data;</div><div class='del'>-		if (ieee80211_is_data_qos(hdr-&gt;frame_control))</div><div class='del'>-			nfreed++;</div><div class='del'>-</div><div class='del'>-		iwl4965_tx_status(priv, tx_info,</div><div class='del'>-				 txq_id &gt;= IWL4965_FIRST_AMPDU_QUEUE);</div><div class='del'>-		tx_info-&gt;skb = NULL;</div><div class='del'>-</div><div class='del'>-		priv-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_free_tfd(priv, txq);</div><div class='del'>-	}</div><div class='del'>-	return nfreed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_tx_status_reply_compressed_ba - Update tx status from block-ack</div><div class='del'>- *</div><div class='del'>- * Go through block-ack's bitmap of ACK'd frames, update driver's record of</div><div class='del'>- * ACK vs. not.  This gets sent to mac80211, then to rate scaling algo.</div><div class='del'>- */</div><div class='del'>-static int iwl4965_tx_status_reply_compressed_ba(struct iwl_priv *priv,</div><div class='del'>-				 struct iwl_ht_agg *agg,</div><div class='del'>-				 struct iwl_compressed_ba_resp *ba_resp)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	int i, sh, ack;</div><div class='del'>-	u16 seq_ctl = le16_to_cpu(ba_resp-&gt;seq_ctl);</div><div class='del'>-	u16 scd_flow = le16_to_cpu(ba_resp-&gt;scd_flow);</div><div class='del'>-	int successes = 0;</div><div class='del'>-	struct ieee80211_tx_info *info;</div><div class='del'>-	u64 bitmap, sent_bitmap;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!agg-&gt;wait_for_ba))  {</div><div class='del'>-		if (unlikely(ba_resp-&gt;bitmap))</div><div class='del'>-			IWL_ERR(priv, "Received BA when not expected\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Mark that the expected block-ack response arrived */</div><div class='del'>-	agg-&gt;wait_for_ba = 0;</div><div class='del'>-	IWL_DEBUG_TX_REPLY(priv, "BA %d %d\n", agg-&gt;start_idx,</div><div class='del'>-							ba_resp-&gt;seq_ctl);</div><div class='del'>-</div><div class='del'>-	/* Calculate shift to align block-ack bits with our Tx window bits */</div><div class='del'>-	sh = agg-&gt;start_idx - SEQ_TO_INDEX(seq_ctl &gt;&gt; 4);</div><div class='del'>-	if (sh &lt; 0) /* tbw something is wrong with indices */</div><div class='del'>-		sh += 0x100;</div><div class='del'>-</div><div class='del'>-	if (agg-&gt;frame_count &gt; (64 - sh)) {</div><div class='del'>-		IWL_DEBUG_TX_REPLY(priv, "more frames than bitmap size");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* don't use 64-bit values for now */</div><div class='del'>-	bitmap = le64_to_cpu(ba_resp-&gt;bitmap) &gt;&gt; sh;</div><div class='del'>-</div><div class='del'>-	/* check for success or failure according to the</div><div class='del'>-	 * transmitted bitmap and block-ack bitmap */</div><div class='del'>-	sent_bitmap = bitmap &amp; agg-&gt;bitmap;</div><div class='del'>-</div><div class='del'>-	/* For each frame attempted in aggregation,</div><div class='del'>-	 * update driver's record of tx frame's status. */</div><div class='del'>-	i = 0;</div><div class='del'>-	while (sent_bitmap) {</div><div class='del'>-		ack = sent_bitmap &amp; 1ULL;</div><div class='del'>-		successes += ack;</div><div class='del'>-		IWL_DEBUG_TX_REPLY(priv, "%s ON i=%d idx=%d raw=%d\n",</div><div class='del'>-			ack ? "ACK" : "NACK", i,</div><div class='del'>-			(agg-&gt;start_idx + i) &amp; 0xff,</div><div class='del'>-			agg-&gt;start_idx + i);</div><div class='del'>-		sent_bitmap &gt;&gt;= 1;</div><div class='del'>-		++i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TX_REPLY(priv, "Bitmap %llx\n",</div><div class='del'>-				   (unsigned long long)bitmap);</div><div class='del'>-</div><div class='del'>-	info = IEEE80211_SKB_CB(priv-&gt;txq[scd_flow].txb[agg-&gt;start_idx].skb);</div><div class='del'>-	memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='del'>-	info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='del'>-	info-&gt;flags |= IEEE80211_TX_STAT_AMPDU;</div><div class='del'>-	info-&gt;status.ampdu_ack_len = successes;</div><div class='del'>-	info-&gt;status.ampdu_len = agg-&gt;frame_count;</div><div class='del'>-	iwl4965_hwrate_to_tx_control(priv, agg-&gt;rate_n_flags, info);</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'>- * translate ucode response to mac80211 tx status control values</div><div class='del'>- */</div><div class='del'>-void iwl4965_hwrate_to_tx_control(struct iwl_priv *priv, u32 rate_n_flags,</div><div class='del'>-				  struct ieee80211_tx_info *info)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_tx_rate *r = &amp;info-&gt;control.rates[0];</div><div class='del'>-</div><div class='del'>-	info-&gt;antenna_sel_tx =</div><div class='del'>-		((rate_n_flags &amp; RATE_MCS_ANT_ABC_MSK) &gt;&gt; RATE_MCS_ANT_POS);</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_HT_MSK)</div><div class='del'>-		r-&gt;flags |= IEEE80211_TX_RC_MCS;</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_GF_MSK)</div><div class='del'>-		r-&gt;flags |= IEEE80211_TX_RC_GREEN_FIELD;</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_HT40_MSK)</div><div class='del'>-		r-&gt;flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_DUP_MSK)</div><div class='del'>-		r-&gt;flags |= IEEE80211_TX_RC_DUP_DATA;</div><div class='del'>-	if (rate_n_flags &amp; RATE_MCS_SGI_MSK)</div><div class='del'>-		r-&gt;flags |= IEEE80211_TX_RC_SHORT_GI;</div><div class='del'>-	r-&gt;idx = iwl4965_hwrate_to_mac80211_idx(rate_n_flags, info-&gt;band);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_rx_reply_compressed_ba - Handler for REPLY_COMPRESSED_BA</div><div class='del'>- *</div><div class='del'>- * Handles block-acknowledge notification from device, which reports success</div><div class='del'>- * of frames sent via aggregation.</div><div class='del'>- */</div><div class='del'>-void iwl4965_rx_reply_compressed_ba(struct iwl_priv *priv,</div><div class='del'>-					   struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_compressed_ba_resp *ba_resp = &amp;pkt-&gt;u.compressed_ba;</div><div class='del'>-	struct iwl_tx_queue *txq = NULL;</div><div class='del'>-	struct iwl_ht_agg *agg;</div><div class='del'>-	int index;</div><div class='del'>-	int sta_id;</div><div class='del'>-	int tid;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* "flow" corresponds to Tx queue */</div><div class='del'>-	u16 scd_flow = le16_to_cpu(ba_resp-&gt;scd_flow);</div><div class='del'>-</div><div class='del'>-	/* "ssn" is start of block-ack Tx window, corresponds to index</div><div class='del'>-	 * (in Tx queue's circular buffer) of first TFD/frame in window */</div><div class='del'>-	u16 ba_resp_scd_ssn = le16_to_cpu(ba_resp-&gt;scd_ssn);</div><div class='del'>-</div><div class='del'>-	if (scd_flow &gt;= priv-&gt;hw_params.max_txq_num) {</div><div class='del'>-		IWL_ERR(priv,</div><div class='del'>-			"BUG_ON scd_flow is bigger than number of queues\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	txq = &amp;priv-&gt;txq[scd_flow];</div><div class='del'>-	sta_id = ba_resp-&gt;sta_id;</div><div class='del'>-	tid = ba_resp-&gt;tid;</div><div class='del'>-	agg = &amp;priv-&gt;stations[sta_id].tid[tid].agg;</div><div class='del'>-	if (unlikely(agg-&gt;txq_id != scd_flow)) {</div><div class='del'>-		/*</div><div class='del'>-		 * FIXME: this is a uCode bug which need to be addressed,</div><div class='del'>-		 * log the information and return for now!</div><div class='del'>-		 * since it is possible happen very often and in order</div><div class='del'>-		 * not to fill the syslog, don't enable the logging by default</div><div class='del'>-		 */</div><div class='del'>-		IWL_DEBUG_TX_REPLY(priv,</div><div class='del'>-			"BA scd_flow %d does not match txq_id %d\n",</div><div class='del'>-			scd_flow, agg-&gt;txq_id);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Find index just before block-ack window */</div><div class='del'>-	index = iwl_legacy_queue_dec_wrap(ba_resp_scd_ssn &amp; 0xff, txq-&gt;q.n_bd);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TX_REPLY(priv, "REPLY_COMPRESSED_BA [%d] Received from %pM, "</div><div class='del'>-			   "sta_id = %d\n",</div><div class='del'>-			   agg-&gt;wait_for_ba,</div><div class='del'>-			   (u8 *) &amp;ba_resp-&gt;sta_addr_lo32,</div><div class='del'>-			   ba_resp-&gt;sta_id);</div><div class='del'>-	IWL_DEBUG_TX_REPLY(priv, "TID = %d, SeqCtl = %d, bitmap = 0x%llx,"</div><div class='del'>-			"scd_flow = "</div><div class='del'>-			   "%d, scd_ssn = %d\n",</div><div class='del'>-			   ba_resp-&gt;tid,</div><div class='del'>-			   ba_resp-&gt;seq_ctl,</div><div class='del'>-			   (unsigned long long)le64_to_cpu(ba_resp-&gt;bitmap),</div><div class='del'>-			   ba_resp-&gt;scd_flow,</div><div class='del'>-			   ba_resp-&gt;scd_ssn);</div><div class='del'>-	IWL_DEBUG_TX_REPLY(priv, "DAT start_idx = %d, bitmap = 0x%llx\n",</div><div class='del'>-			   agg-&gt;start_idx,</div><div class='del'>-			   (unsigned long long)agg-&gt;bitmap);</div><div class='del'>-</div><div class='del'>-	/* Update driver's record of ACK vs. not for each frame in window */</div><div class='del'>-	iwl4965_tx_status_reply_compressed_ba(priv, agg, ba_resp);</div><div class='del'>-</div><div class='del'>-	/* Release all TFDs before the SSN, i.e. all TFDs in front of</div><div class='del'>-	 * block-ack window (we assume that they've been successfully</div><div class='del'>-	 * transmitted ... if not, it's too late anyway). */</div><div class='del'>-	if (txq-&gt;q.read_ptr != (ba_resp_scd_ssn &amp; 0xff)) {</div><div class='del'>-		/* calculate mac80211 ampdu sw queue to wake */</div><div class='del'>-		int freed = iwl4965_tx_queue_reclaim(priv, scd_flow, index);</div><div class='del'>-		iwl4965_free_tfds_in_queue(priv, sta_id, tid, freed);</div><div class='del'>-</div><div class='del'>-		if ((iwl_legacy_queue_space(&amp;txq-&gt;q) &gt; txq-&gt;q.low_mark) &amp;&amp;</div><div class='del'>-		    priv-&gt;mac80211_registered &amp;&amp;</div><div class='del'>-		    (agg-&gt;state != IWL_EMPTYING_HW_QUEUE_DELBA))</div><div class='del'>-			iwl_legacy_wake_queue(priv, txq);</div><div class='del'>-</div><div class='del'>-		iwl4965_txq_check_empty(priv, sta_id, tid, scd_flow);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-const char *iwl4965_get_tx_fail_reason(u32 status)</div><div class='del'>-{</div><div class='del'>-#define TX_STATUS_FAIL(x) case TX_STATUS_FAIL_ ## x: return #x</div><div class='del'>-#define TX_STATUS_POSTPONE(x) case TX_STATUS_POSTPONE_ ## x: return #x</div><div class='del'>-</div><div class='del'>-	switch (status &amp; TX_STATUS_MSK) {</div><div class='del'>-	case TX_STATUS_SUCCESS:</div><div class='del'>-		return "SUCCESS";</div><div class='del'>-	TX_STATUS_POSTPONE(DELAY);</div><div class='del'>-	TX_STATUS_POSTPONE(FEW_BYTES);</div><div class='del'>-	TX_STATUS_POSTPONE(QUIET_PERIOD);</div><div class='del'>-	TX_STATUS_POSTPONE(CALC_TTAK);</div><div class='del'>-	TX_STATUS_FAIL(INTERNAL_CROSSED_RETRY);</div><div class='del'>-	TX_STATUS_FAIL(SHORT_LIMIT);</div><div class='del'>-	TX_STATUS_FAIL(LONG_LIMIT);</div><div class='del'>-	TX_STATUS_FAIL(FIFO_UNDERRUN);</div><div class='del'>-	TX_STATUS_FAIL(DRAIN_FLOW);</div><div class='del'>-	TX_STATUS_FAIL(RFKILL_FLUSH);</div><div class='del'>-	TX_STATUS_FAIL(LIFE_EXPIRE);</div><div class='del'>-	TX_STATUS_FAIL(DEST_PS);</div><div class='del'>-	TX_STATUS_FAIL(HOST_ABORTED);</div><div class='del'>-	TX_STATUS_FAIL(BT_RETRY);</div><div class='del'>-	TX_STATUS_FAIL(STA_INVALID);</div><div class='del'>-	TX_STATUS_FAIL(FRAG_DROPPED);</div><div class='del'>-	TX_STATUS_FAIL(TID_DISABLE);</div><div class='del'>-	TX_STATUS_FAIL(FIFO_FLUSHED);</div><div class='del'>-	TX_STATUS_FAIL(INSUFFICIENT_CF_POLL);</div><div class='del'>-	TX_STATUS_FAIL(PASSIVE_NO_RX);</div><div class='del'>-	TX_STATUS_FAIL(NO_BEACON_ON_RADAR);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return "UNKNOWN";</div><div class='del'>-</div><div class='del'>-#undef TX_STATUS_FAIL</div><div class='del'>-#undef TX_STATUS_POSTPONE</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_IWLWIFI_LEGACY_DEBUG */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-ucode.c b/drivers/net/wireless/iwlegacy/iwl-4965-ucode.c<br/>deleted file mode 100644<br/>index 001d148feb94..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-4965-ucode.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-ucode.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,166 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * GPL LICENSE SUMMARY</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2008 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-#include "iwl-helpers.h"</div><div class='del'>-#include "iwl-4965-hw.h"</div><div class='del'>-#include "iwl-4965.h"</div><div class='del'>-#include "iwl-4965-calib.h"</div><div class='del'>-</div><div class='del'>-#define IWL_AC_UNSET -1</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_verify_inst_sparse - verify runtime uCode image in card vs. host,</div><div class='del'>- *   using sample data 100 bytes apart.  If these sample points are good,</div><div class='del'>- *   it's a pretty good bet that everything between them is good, too.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-iwl4965_verify_inst_sparse(struct iwl_priv *priv, __le32 *image, u32 len)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u32 errcnt = 0;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "ucode inst image size is %u\n", len);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i += 100, image += 100/sizeof(u32)) {</div><div class='del'>-		/* read data comes through single port, auto-incr addr */</div><div class='del'>-		/* NOTE: Use the debugless read so we don't flood kernel log</div><div class='del'>-		 * if IWL_DL_IO is set */</div><div class='del'>-		iwl_legacy_write_direct32(priv, HBUS_TARG_MEM_RADDR,</div><div class='del'>-			i + IWL4965_RTC_INST_LOWER_BOUND);</div><div class='del'>-		val = _iwl_legacy_read_direct32(priv, HBUS_TARG_MEM_RDAT);</div><div class='del'>-		if (val != le32_to_cpu(*image)) {</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			errcnt++;</div><div class='del'>-			if (errcnt &gt;= 3)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_verify_inst_full - verify runtime uCode image in card vs. host,</div><div class='del'>- *     looking at all data.</div><div class='del'>- */</div><div class='del'>-static int iwl4965_verify_inst_full(struct iwl_priv *priv, __le32 *image,</div><div class='del'>-				 u32 len)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-	u32 save_len = len;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u32 errcnt;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "ucode inst image size is %u\n", len);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_write_direct32(priv, HBUS_TARG_MEM_RADDR,</div><div class='del'>-			   IWL4965_RTC_INST_LOWER_BOUND);</div><div class='del'>-</div><div class='del'>-	errcnt = 0;</div><div class='del'>-	for (; len &gt; 0; len -= sizeof(u32), image++) {</div><div class='del'>-		/* read data comes through single port, auto-incr addr */</div><div class='del'>-		/* NOTE: Use the debugless read so we don't flood kernel log</div><div class='del'>-		 * if IWL_DL_IO is set */</div><div class='del'>-		val = _iwl_legacy_read_direct32(priv, HBUS_TARG_MEM_RDAT);</div><div class='del'>-		if (val != le32_to_cpu(*image)) {</div><div class='del'>-			IWL_ERR(priv, "uCode INST section is invalid at "</div><div class='del'>-				  "offset 0x%x, is 0x%x, s/b 0x%x\n",</div><div class='del'>-				  save_len - len, val, le32_to_cpu(*image));</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			errcnt++;</div><div class='del'>-			if (errcnt &gt;= 20)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!errcnt)</div><div class='del'>-		IWL_DEBUG_INFO(priv,</div><div class='del'>-		    "ucode image in INSTRUCTION memory is good\n");</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_verify_ucode - determine which instruction image is in SRAM,</div><div class='del'>- *    and verify its contents</div><div class='del'>- */</div><div class='del'>-int iwl4965_verify_ucode(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	__le32 *image;</div><div class='del'>-	u32 len;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* Try bootstrap */</div><div class='del'>-	image = (__le32 *)priv-&gt;ucode_boot.v_addr;</div><div class='del'>-	len = priv-&gt;ucode_boot.len;</div><div class='del'>-	ret = iwl4965_verify_inst_sparse(priv, image, len);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Bootstrap uCode is good in inst SRAM\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Try initialize */</div><div class='del'>-	image = (__le32 *)priv-&gt;ucode_init.v_addr;</div><div class='del'>-	len = priv-&gt;ucode_init.len;</div><div class='del'>-	ret = iwl4965_verify_inst_sparse(priv, image, len);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Initialize uCode is good in inst SRAM\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Try runtime/protocol */</div><div class='del'>-	image = (__le32 *)priv-&gt;ucode_code.v_addr;</div><div class='del'>-	len = priv-&gt;ucode_code.len;</div><div class='del'>-	ret = iwl4965_verify_inst_sparse(priv, image, len);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Runtime uCode is good in inst SRAM\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_ERR(priv, "NO VALID UCODE IMAGE IN INSTRUCTION SRAM!!\n");</div><div class='del'>-</div><div class='del'>-	/* Since nothing seems to match, show first several data entries in</div><div class='del'>-	 * instruction SRAM, so maybe visual inspection will give a clue.</div><div class='del'>-	 * Selection of bootstrap image (vs. other images) is arbitrary. */</div><div class='del'>-	image = (__le32 *)priv-&gt;ucode_boot.v_addr;</div><div class='del'>-	len = priv-&gt;ucode_boot.len;</div><div class='del'>-	ret = iwl4965_verify_inst_full(priv, image, len);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-4965.c b/drivers/net/wireless/iwlegacy/iwl-4965.c<br/>deleted file mode 100644<br/>index 86f4fce193e4..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-4965.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2183 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-eeprom.h"</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-#include "iwl-helpers.h"</div><div class='del'>-#include "iwl-4965-calib.h"</div><div class='del'>-#include "iwl-sta.h"</div><div class='del'>-#include "iwl-4965-led.h"</div><div class='del'>-#include "iwl-4965.h"</div><div class='del'>-#include "iwl-4965-debugfs.h"</div><div class='del'>-</div><div class='del'>-static int iwl4965_send_tx_power(struct iwl_priv *priv);</div><div class='del'>-static int iwl4965_hw_get_temperature(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-/* Highest firmware API version supported */</div><div class='del'>-#define IWL4965_UCODE_API_MAX 2</div><div class='del'>-</div><div class='del'>-/* Lowest firmware API version supported */</div><div class='del'>-#define IWL4965_UCODE_API_MIN 2</div><div class='del'>-</div><div class='del'>-#define IWL4965_FW_PRE "iwlwifi-4965-"</div><div class='del'>-#define _IWL4965_MODULE_FIRMWARE(api) IWL4965_FW_PRE #api ".ucode"</div><div class='del'>-#define IWL4965_MODULE_FIRMWARE(api) _IWL4965_MODULE_FIRMWARE(api)</div><div class='del'>-</div><div class='del'>-/* check contents of special bootstrap uCode SRAM */</div><div class='del'>-static int iwl4965_verify_bsm(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	__le32 *image = priv-&gt;ucode_boot.v_addr;</div><div class='del'>-	u32 len = priv-&gt;ucode_boot.len;</div><div class='del'>-	u32 reg;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Begin verify bsm\n");</div><div class='del'>-</div><div class='del'>-	/* verify BSM SRAM contents */</div><div class='del'>-	val = iwl_legacy_read_prph(priv, BSM_WR_DWCOUNT_REG);</div><div class='del'>-	for (reg = BSM_SRAM_LOWER_BOUND;</div><div class='del'>-	     reg &lt; BSM_SRAM_LOWER_BOUND + len;</div><div class='del'>-	     reg += sizeof(u32), image++) {</div><div class='del'>-		val = iwl_legacy_read_prph(priv, reg);</div><div class='del'>-		if (val != le32_to_cpu(*image)) {</div><div class='del'>-			IWL_ERR(priv, "BSM uCode verification failed at "</div><div class='del'>-				  "addr 0x%08X+%u (of %u), is 0x%x, s/b 0x%x\n",</div><div class='del'>-				  BSM_SRAM_LOWER_BOUND,</div><div class='del'>-				  reg - BSM_SRAM_LOWER_BOUND, len,</div><div class='del'>-				  val, le32_to_cpu(*image));</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "BSM bootstrap uCode image OK\n");</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'>- * iwl4965_load_bsm - Load bootstrap instructions</div><div class='del'>- *</div><div class='del'>- * BSM operation:</div><div class='del'>- *</div><div class='del'>- * The Bootstrap State Machine (BSM) stores a short bootstrap uCode program</div><div class='del'>- * in special SRAM that does not power down during RFKILL.  When powering back</div><div class='del'>- * up after power-saving sleeps (or during initial uCode load), the BSM loads</div><div class='del'>- * the bootstrap program into the on-board processor, and starts it.</div><div class='del'>- *</div><div class='del'>- * The bootstrap program loads (via DMA) instructions and data for a new</div><div class='del'>- * program from host DRAM locations indicated by the host driver in the</div><div class='del'>- * BSM_DRAM_* registers.  Once the new program is loaded, it starts</div><div class='del'>- * automatically.</div><div class='del'>- *</div><div class='del'>- * When initializing the NIC, the host driver points the BSM to the</div><div class='del'>- * "initialize" uCode image.  This uCode sets up some internal data, then</div><div class='del'>- * notifies host via "initialize alive" that it is complete.</div><div class='del'>- *</div><div class='del'>- * The host then replaces the BSM_DRAM_* pointer values to point to the</div><div class='del'>- * normal runtime uCode instructions and a backup uCode data cache buffer</div><div class='del'>- * (filled initially with starting data values for the on-board processor),</div><div class='del'>- * then triggers the "initialize" uCode to load and launch the runtime uCode,</div><div class='del'>- * which begins normal operation.</div><div class='del'>- *</div><div class='del'>- * When doing a power-save shutdown, runtime uCode saves data SRAM into</div><div class='del'>- * the backup data cache in DRAM before SRAM is powered down.</div><div class='del'>- *</div><div class='del'>- * When powering back up, the BSM loads the bootstrap program.  This reloads</div><div class='del'>- * the runtime uCode instructions and the backup data cache into SRAM,</div><div class='del'>- * and re-launches the runtime uCode from where it left off.</div><div class='del'>- */</div><div class='del'>-static int iwl4965_load_bsm(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	__le32 *image = priv-&gt;ucode_boot.v_addr;</div><div class='del'>-	u32 len = priv-&gt;ucode_boot.len;</div><div class='del'>-	dma_addr_t pinst;</div><div class='del'>-	dma_addr_t pdata;</div><div class='del'>-	u32 inst_len;</div><div class='del'>-	u32 data_len;</div><div class='del'>-	int i;</div><div class='del'>-	u32 done;</div><div class='del'>-	u32 reg_offset;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Begin load bsm\n");</div><div class='del'>-</div><div class='del'>-	priv-&gt;ucode_type = UCODE_RT;</div><div class='del'>-</div><div class='del'>-	/* make sure bootstrap program is no larger than BSM's SRAM size */</div><div class='del'>-	if (len &gt; IWL49_MAX_BSM_SIZE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Tell bootstrap uCode where to find the "Initialize" uCode</div><div class='del'>-	 *   in host DRAM ... host DRAM physical address bits 35:4 for 4965.</div><div class='del'>-	 * NOTE:  iwl_init_alive_start() will replace these values,</div><div class='del'>-	 *        after the "initialize" uCode has run, to point to</div><div class='del'>-	 *        runtime/protocol instructions and backup data cache.</div><div class='del'>-	 */</div><div class='del'>-	pinst = priv-&gt;ucode_init.p_addr &gt;&gt; 4;</div><div class='del'>-	pdata = priv-&gt;ucode_init_data.p_addr &gt;&gt; 4;</div><div class='del'>-	inst_len = priv-&gt;ucode_init.len;</div><div class='del'>-	data_len = priv-&gt;ucode_init_data.len;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_DRAM_INST_PTR_REG, pinst);</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_DRAM_DATA_PTR_REG, pdata);</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_DRAM_INST_BYTECOUNT_REG, inst_len);</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_DRAM_DATA_BYTECOUNT_REG, data_len);</div><div class='del'>-</div><div class='del'>-	/* Fill BSM memory with bootstrap instructions */</div><div class='del'>-	for (reg_offset = BSM_SRAM_LOWER_BOUND;</div><div class='del'>-	     reg_offset &lt; BSM_SRAM_LOWER_BOUND + len;</div><div class='del'>-	     reg_offset += sizeof(u32), image++)</div><div class='del'>-		_iwl_legacy_write_prph(priv, reg_offset, le32_to_cpu(*image));</div><div class='del'>-</div><div class='del'>-	ret = iwl4965_verify_bsm(priv);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Tell BSM to copy from BSM SRAM into instruction SRAM, when asked */</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_WR_MEM_SRC_REG, 0x0);</div><div class='del'>-	iwl_legacy_write_prph(priv,</div><div class='del'>-			BSM_WR_MEM_DST_REG, IWL49_RTC_INST_LOWER_BOUND);</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_WR_DWCOUNT_REG, len / sizeof(u32));</div><div class='del'>-</div><div class='del'>-	/* Load bootstrap code into instruction SRAM now,</div><div class='del'>-	 *   to prepare to load "initialize" uCode */</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_WR_CTRL_REG, BSM_WR_CTRL_REG_BIT_START);</div><div class='del'>-</div><div class='del'>-	/* Wait for load of bootstrap uCode to finish */</div><div class='del'>-	for (i = 0; i &lt; 100; i++) {</div><div class='del'>-		done = iwl_legacy_read_prph(priv, BSM_WR_CTRL_REG);</div><div class='del'>-		if (!(done &amp; BSM_WR_CTRL_REG_BIT_START))</div><div class='del'>-			break;</div><div class='del'>-		udelay(10);</div><div class='del'>-	}</div><div class='del'>-	if (i &lt; 100)</div><div class='del'>-		IWL_DEBUG_INFO(priv, "BSM write complete, poll %d iterations\n", i);</div><div class='del'>-	else {</div><div class='del'>-		IWL_ERR(priv, "BSM write did not complete!\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Enable future boot loads whenever power management unit triggers it</div><div class='del'>-	 *   (e.g. when powering back up after power-save shutdown) */</div><div class='del'>-	iwl_legacy_write_prph(priv,</div><div class='del'>-			BSM_WR_CTRL_REG, BSM_WR_CTRL_REG_BIT_START_EN);</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'>- * iwl4965_set_ucode_ptrs - Set uCode address location</div><div class='del'>- *</div><div class='del'>- * Tell initialization uCode where to find runtime uCode.</div><div class='del'>- *</div><div class='del'>- * BSM registers initially contain pointers to initialization uCode.</div><div class='del'>- * We need to replace them to load runtime uCode inst and data,</div><div class='del'>- * and to save runtime data when powering down.</div><div class='del'>- */</div><div class='del'>-static int iwl4965_set_ucode_ptrs(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	dma_addr_t pinst;</div><div class='del'>-	dma_addr_t pdata;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/* bits 35:4 for 4965 */</div><div class='del'>-	pinst = priv-&gt;ucode_code.p_addr &gt;&gt; 4;</div><div class='del'>-	pdata = priv-&gt;ucode_data_backup.p_addr &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	/* Tell bootstrap uCode where to find image to load */</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_DRAM_INST_PTR_REG, pinst);</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_DRAM_DATA_PTR_REG, pdata);</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_DRAM_DATA_BYTECOUNT_REG,</div><div class='del'>-				 priv-&gt;ucode_data.len);</div><div class='del'>-</div><div class='del'>-	/* Inst byte count must be last to set up, bit 31 signals uCode</div><div class='del'>-	 *   that all new ptr/size info is in place */</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_DRAM_INST_BYTECOUNT_REG,</div><div class='del'>-				 priv-&gt;ucode_code.len | BSM_DRAM_INST_LOAD);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Runtime uCode pointers are set.\n");</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_init_alive_start - Called after REPLY_ALIVE notification received</div><div class='del'>- *</div><div class='del'>- * Called after REPLY_ALIVE notification received from "initialize" uCode.</div><div class='del'>- *</div><div class='del'>- * The 4965 "initialize" ALIVE reply contains calibration data for:</div><div class='del'>- *   Voltage, temperature, and MIMO tx gain correction, now stored in priv</div><div class='del'>- *   (3945 does not contain this data).</div><div class='del'>- *</div><div class='del'>- * Tell "initialize" uCode to go ahead and load the runtime uCode.</div><div class='del'>-*/</div><div class='del'>-static void iwl4965_init_alive_start(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	/* Bootstrap uCode has loaded initialize uCode ... verify inst image.</div><div class='del'>-	 * This is a paranoid check, because we would not have gotten the</div><div class='del'>-	 * "initialize" alive if code weren't properly loaded.  */</div><div class='del'>-	if (iwl4965_verify_ucode(priv)) {</div><div class='del'>-		/* Runtime instruction load was bad;</div><div class='del'>-		 * take it all the way back down so we can try again */</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Bad \"initialize\" uCode load.\n");</div><div class='del'>-		goto restart;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate temperature */</div><div class='del'>-	priv-&gt;temperature = iwl4965_hw_get_temperature(priv);</div><div class='del'>-</div><div class='del'>-	/* Send pointers to protocol/runtime uCode image ... init code will</div><div class='del'>-	 * load and launch runtime uCode, which will send us another "Alive"</div><div class='del'>-	 * notification. */</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Initialization Alive received.\n");</div><div class='del'>-	if (iwl4965_set_ucode_ptrs(priv)) {</div><div class='del'>-		/* Runtime instruction load won't happen;</div><div class='del'>-		 * take it all the way back down so we can try again */</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Couldn't set up uCode pointers.\n");</div><div class='del'>-		goto restart;</div><div class='del'>-	}</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-restart:</div><div class='del'>-	queue_work(priv-&gt;workqueue, &amp;priv-&gt;restart);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool iw4965_is_ht40_channel(__le32 rxon_flags)</div><div class='del'>-{</div><div class='del'>-	int chan_mod = le32_to_cpu(rxon_flags &amp; RXON_FLG_CHANNEL_MODE_MSK)</div><div class='del'>-				    &gt;&gt; RXON_FLG_CHANNEL_MODE_POS;</div><div class='del'>-	return ((chan_mod == CHANNEL_MODE_PURE_40) ||</div><div class='del'>-		  (chan_mod == CHANNEL_MODE_MIXED));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_nic_config(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u16 radio_cfg;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	radio_cfg = iwl_legacy_eeprom_query16(priv, EEPROM_RADIO_CONFIG);</div><div class='del'>-</div><div class='del'>-	/* write radio config values to register */</div><div class='del'>-	if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) == EEPROM_4965_RF_CFG_TYPE_MAX)</div><div class='del'>-		iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-			    EEPROM_RF_CFG_TYPE_MSK(radio_cfg) |</div><div class='del'>-			    EEPROM_RF_CFG_STEP_MSK(radio_cfg) |</div><div class='del'>-			    EEPROM_RF_CFG_DASH_MSK(radio_cfg));</div><div class='del'>-</div><div class='del'>-	/* set CSR_HW_CONFIG_REG for uCode use */</div><div class='del'>-	iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-		    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |</div><div class='del'>-		    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);</div><div class='del'>-</div><div class='del'>-	priv-&gt;calib_info = (struct iwl_eeprom_calib_info *)</div><div class='del'>-		iwl_legacy_eeprom_query_addr(priv,</div><div class='del'>-				EEPROM_4965_CALIB_TXPOWER_OFFSET);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Reset differential Rx gains in NIC to prepare for chain noise calibration.</div><div class='del'>- * Called after every association, but this runs only once!</div><div class='del'>- *  ... once chain noise is calibrated the first time, it's good forever.  */</div><div class='del'>-static void iwl4965_chain_noise_reset(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_chain_noise_data *data = &amp;(priv-&gt;chain_noise_data);</div><div class='del'>-</div><div class='del'>-	if ((data-&gt;state == IWL_CHAIN_NOISE_ALIVE) &amp;&amp;</div><div class='del'>-	    iwl_legacy_is_any_associated(priv)) {</div><div class='del'>-		struct iwl_calib_diff_gain_cmd cmd;</div><div class='del'>-</div><div class='del'>-		/* clear data for chain noise calibration algorithm */</div><div class='del'>-		data-&gt;chain_noise_a = 0;</div><div class='del'>-		data-&gt;chain_noise_b = 0;</div><div class='del'>-		data-&gt;chain_noise_c = 0;</div><div class='del'>-		data-&gt;chain_signal_a = 0;</div><div class='del'>-		data-&gt;chain_signal_b = 0;</div><div class='del'>-		data-&gt;chain_signal_c = 0;</div><div class='del'>-		data-&gt;beacon_count = 0;</div><div class='del'>-</div><div class='del'>-		memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-		cmd.hdr.op_code = IWL_PHY_CALIBRATE_DIFF_GAIN_CMD;</div><div class='del'>-		cmd.diff_gain_a = 0;</div><div class='del'>-		cmd.diff_gain_b = 0;</div><div class='del'>-		cmd.diff_gain_c = 0;</div><div class='del'>-		if (iwl_legacy_send_cmd_pdu(priv, REPLY_PHY_CALIBRATION_CMD,</div><div class='del'>-				 sizeof(cmd), &amp;cmd))</div><div class='del'>-			IWL_ERR(priv,</div><div class='del'>-				"Could not send REPLY_PHY_CALIBRATION_CMD\n");</div><div class='del'>-		data-&gt;state = IWL_CHAIN_NOISE_ACCUMULATE;</div><div class='del'>-		IWL_DEBUG_CALIB(priv, "Run chain_noise_calibrate\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct iwl_sensitivity_ranges iwl4965_sensitivity = {</div><div class='del'>-	.min_nrg_cck = 97,</div><div class='del'>-	.max_nrg_cck = 0, /* not used, set to 0 */</div><div class='del'>-</div><div class='del'>-	.auto_corr_min_ofdm = 85,</div><div class='del'>-	.auto_corr_min_ofdm_mrc = 170,</div><div class='del'>-	.auto_corr_min_ofdm_x1 = 105,</div><div class='del'>-	.auto_corr_min_ofdm_mrc_x1 = 220,</div><div class='del'>-</div><div class='del'>-	.auto_corr_max_ofdm = 120,</div><div class='del'>-	.auto_corr_max_ofdm_mrc = 210,</div><div class='del'>-	.auto_corr_max_ofdm_x1 = 140,</div><div class='del'>-	.auto_corr_max_ofdm_mrc_x1 = 270,</div><div class='del'>-</div><div class='del'>-	.auto_corr_min_cck = 125,</div><div class='del'>-	.auto_corr_max_cck = 200,</div><div class='del'>-	.auto_corr_min_cck_mrc = 200,</div><div class='del'>-	.auto_corr_max_cck_mrc = 400,</div><div class='del'>-</div><div class='del'>-	.nrg_th_cck = 100,</div><div class='del'>-	.nrg_th_ofdm = 100,</div><div class='del'>-</div><div class='del'>-	.barker_corr_th_min = 190,</div><div class='del'>-	.barker_corr_th_min_mrc = 390,</div><div class='del'>-	.nrg_th_cca = 62,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void iwl4965_set_ct_threshold(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	/* want Kelvin */</div><div class='del'>-	priv-&gt;hw_params.ct_kill_threshold =</div><div class='del'>-		CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD_LEGACY);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_hw_set_hw_params</div><div class='del'>- *</div><div class='del'>- * Called when initializing driver</div><div class='del'>- */</div><div class='del'>-static int iwl4965_hw_set_hw_params(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	if (priv-&gt;cfg-&gt;mod_params-&gt;num_of_queues &gt;= IWL_MIN_NUM_QUEUES &amp;&amp;</div><div class='del'>-	    priv-&gt;cfg-&gt;mod_params-&gt;num_of_queues &lt;= IWL49_NUM_QUEUES)</div><div class='del'>-		priv-&gt;cfg-&gt;base_params-&gt;num_of_queues =</div><div class='del'>-			priv-&gt;cfg-&gt;mod_params-&gt;num_of_queues;</div><div class='del'>-</div><div class='del'>-	priv-&gt;hw_params.max_txq_num = priv-&gt;cfg-&gt;base_params-&gt;num_of_queues;</div><div class='del'>-	priv-&gt;hw_params.dma_chnl_num = FH49_TCSR_CHNL_NUM;</div><div class='del'>-	priv-&gt;hw_params.scd_bc_tbls_size =</div><div class='del'>-			priv-&gt;cfg-&gt;base_params-&gt;num_of_queues *</div><div class='del'>-			sizeof(struct iwl4965_scd_bc_tbl);</div><div class='del'>-	priv-&gt;hw_params.tfd_size = sizeof(struct iwl_tfd);</div><div class='del'>-	priv-&gt;hw_params.max_stations = IWL4965_STATION_COUNT;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWL4965_BROADCAST_ID;</div><div class='del'>-	priv-&gt;hw_params.max_data_size = IWL49_RTC_DATA_SIZE;</div><div class='del'>-	priv-&gt;hw_params.max_inst_size = IWL49_RTC_INST_SIZE;</div><div class='del'>-	priv-&gt;hw_params.max_bsm_size = BSM_SRAM_SIZE;</div><div class='del'>-	priv-&gt;hw_params.ht40_channel = BIT(IEEE80211_BAND_5GHZ);</div><div class='del'>-</div><div class='del'>-	priv-&gt;hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR;</div><div class='del'>-</div><div class='del'>-	priv-&gt;hw_params.tx_chains_num = iwl4965_num_of_ant(priv-&gt;cfg-&gt;valid_tx_ant);</div><div class='del'>-	priv-&gt;hw_params.rx_chains_num = iwl4965_num_of_ant(priv-&gt;cfg-&gt;valid_rx_ant);</div><div class='del'>-	priv-&gt;hw_params.valid_tx_ant = priv-&gt;cfg-&gt;valid_tx_ant;</div><div class='del'>-	priv-&gt;hw_params.valid_rx_ant = priv-&gt;cfg-&gt;valid_rx_ant;</div><div class='del'>-</div><div class='del'>-	iwl4965_set_ct_threshold(priv);</div><div class='del'>-</div><div class='del'>-	priv-&gt;hw_params.sens = &amp;iwl4965_sensitivity;</div><div class='del'>-	priv-&gt;hw_params.beacon_time_tsf_bits = IWL4965_EXT_BEACON_TIME_POS;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static s32 iwl4965_math_div_round(s32 num, s32 denom, s32 *res)</div><div class='del'>-{</div><div class='del'>-	s32 sign = 1;</div><div class='del'>-</div><div class='del'>-	if (num &lt; 0) {</div><div class='del'>-		sign = -sign;</div><div class='del'>-		num = -num;</div><div class='del'>-	}</div><div class='del'>-	if (denom &lt; 0) {</div><div class='del'>-		sign = -sign;</div><div class='del'>-		denom = -denom;</div><div class='del'>-	}</div><div class='del'>-	*res = 1;</div><div class='del'>-	*res = ((num * 2 + denom) / (denom * 2)) * sign;</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'>- * iwl4965_get_voltage_compensation - Power supply voltage comp for txpower</div><div class='del'>- *</div><div class='del'>- * Determines power supply voltage compensation for txpower calculations.</div><div class='del'>- * Returns number of 1/2-dB steps to subtract from gain table index,</div><div class='del'>- * to compensate for difference between power supply voltage during</div><div class='del'>- * factory measurements, vs. current power supply voltage.</div><div class='del'>- *</div><div class='del'>- * Voltage indication is higher for lower voltage.</div><div class='del'>- * Lower voltage requires more gain (lower gain table index).</div><div class='del'>- */</div><div class='del'>-static s32 iwl4965_get_voltage_compensation(s32 eeprom_voltage,</div><div class='del'>-					    s32 current_voltage)</div><div class='del'>-{</div><div class='del'>-	s32 comp = 0;</div><div class='del'>-</div><div class='del'>-	if ((TX_POWER_IWL_ILLEGAL_VOLTAGE == eeprom_voltage) ||</div><div class='del'>-	    (TX_POWER_IWL_ILLEGAL_VOLTAGE == current_voltage))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	iwl4965_math_div_round(current_voltage - eeprom_voltage,</div><div class='del'>-			       TX_POWER_IWL_VOLTAGE_CODES_PER_03V, &amp;comp);</div><div class='del'>-</div><div class='del'>-	if (current_voltage &gt; eeprom_voltage)</div><div class='del'>-		comp *= 2;</div><div class='del'>-	if ((comp &lt; -2) || (comp &gt; 2))</div><div class='del'>-		comp = 0;</div><div class='del'>-</div><div class='del'>-	return comp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static s32 iwl4965_get_tx_atten_grp(u16 channel)</div><div class='del'>-{</div><div class='del'>-	if (channel &gt;= CALIB_IWL_TX_ATTEN_GR5_FCH &amp;&amp;</div><div class='del'>-	    channel &lt;= CALIB_IWL_TX_ATTEN_GR5_LCH)</div><div class='del'>-		return CALIB_CH_GROUP_5;</div><div class='del'>-</div><div class='del'>-	if (channel &gt;= CALIB_IWL_TX_ATTEN_GR1_FCH &amp;&amp;</div><div class='del'>-	    channel &lt;= CALIB_IWL_TX_ATTEN_GR1_LCH)</div><div class='del'>-		return CALIB_CH_GROUP_1;</div><div class='del'>-</div><div class='del'>-	if (channel &gt;= CALIB_IWL_TX_ATTEN_GR2_FCH &amp;&amp;</div><div class='del'>-	    channel &lt;= CALIB_IWL_TX_ATTEN_GR2_LCH)</div><div class='del'>-		return CALIB_CH_GROUP_2;</div><div class='del'>-</div><div class='del'>-	if (channel &gt;= CALIB_IWL_TX_ATTEN_GR3_FCH &amp;&amp;</div><div class='del'>-	    channel &lt;= CALIB_IWL_TX_ATTEN_GR3_LCH)</div><div class='del'>-		return CALIB_CH_GROUP_3;</div><div class='del'>-</div><div class='del'>-	if (channel &gt;= CALIB_IWL_TX_ATTEN_GR4_FCH &amp;&amp;</div><div class='del'>-	    channel &lt;= CALIB_IWL_TX_ATTEN_GR4_LCH)</div><div class='del'>-		return CALIB_CH_GROUP_4;</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 iwl4965_get_sub_band(const struct iwl_priv *priv, u32 channel)</div><div class='del'>-{</div><div class='del'>-	s32 b = -1;</div><div class='del'>-</div><div class='del'>-	for (b = 0; b &lt; EEPROM_TX_POWER_BANDS; b++) {</div><div class='del'>-		if (priv-&gt;calib_info-&gt;band_info[b].ch_from == 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if ((channel &gt;= priv-&gt;calib_info-&gt;band_info[b].ch_from)</div><div class='del'>-		    &amp;&amp; (channel &lt;= priv-&gt;calib_info-&gt;band_info[b].ch_to))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static s32 iwl4965_interpolate_value(s32 x, s32 x1, s32 y1, s32 x2, s32 y2)</div><div class='del'>-{</div><div class='del'>-	s32 val;</div><div class='del'>-</div><div class='del'>-	if (x2 == x1)</div><div class='del'>-		return y1;</div><div class='del'>-	else {</div><div class='del'>-		iwl4965_math_div_round((x2 - x) * (y1 - y2), (x2 - x1), &amp;val);</div><div class='del'>-		return val + y2;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_interpolate_chan - Interpolate factory measurements for one channel</div><div class='del'>- *</div><div class='del'>- * Interpolates factory measurements from the two sample channels within a</div><div class='del'>- * sub-band, to apply to channel of interest.  Interpolation is proportional to</div><div class='del'>- * differences in channel frequencies, which is proportional to differences</div><div class='del'>- * in channel number.</div><div class='del'>- */</div><div class='del'>-static int iwl4965_interpolate_chan(struct iwl_priv *priv, u32 channel,</div><div class='del'>-				    struct iwl_eeprom_calib_ch_info *chan_info)</div><div class='del'>-{</div><div class='del'>-	s32 s = -1;</div><div class='del'>-	u32 c;</div><div class='del'>-	u32 m;</div><div class='del'>-	const struct iwl_eeprom_calib_measure *m1;</div><div class='del'>-	const struct iwl_eeprom_calib_measure *m2;</div><div class='del'>-	struct iwl_eeprom_calib_measure *omeas;</div><div class='del'>-	u32 ch_i1;</div><div class='del'>-	u32 ch_i2;</div><div class='del'>-</div><div class='del'>-	s = iwl4965_get_sub_band(priv, channel);</div><div class='del'>-	if (s &gt;= EEPROM_TX_POWER_BANDS) {</div><div class='del'>-		IWL_ERR(priv, "Tx Power can not find channel %d\n", channel);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ch_i1 = priv-&gt;calib_info-&gt;band_info[s].ch1.ch_num;</div><div class='del'>-	ch_i2 = priv-&gt;calib_info-&gt;band_info[s].ch2.ch_num;</div><div class='del'>-	chan_info-&gt;ch_num = (u8) channel;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TXPOWER(priv, "channel %d subband %d factory cal ch %d &amp; %d\n",</div><div class='del'>-			  channel, s, ch_i1, ch_i2);</div><div class='del'>-</div><div class='del'>-	for (c = 0; c &lt; EEPROM_TX_POWER_TX_CHAINS; c++) {</div><div class='del'>-		for (m = 0; m &lt; EEPROM_TX_POWER_MEASUREMENTS; m++) {</div><div class='del'>-			m1 = &amp;(priv-&gt;calib_info-&gt;band_info[s].ch1.</div><div class='del'>-			       measurements[c][m]);</div><div class='del'>-			m2 = &amp;(priv-&gt;calib_info-&gt;band_info[s].ch2.</div><div class='del'>-			       measurements[c][m]);</div><div class='del'>-			omeas = &amp;(chan_info-&gt;measurements[c][m]);</div><div class='del'>-</div><div class='del'>-			omeas-&gt;actual_pow =</div><div class='del'>-			    (u8) iwl4965_interpolate_value(channel, ch_i1,</div><div class='del'>-							   m1-&gt;actual_pow,</div><div class='del'>-							   ch_i2,</div><div class='del'>-							   m2-&gt;actual_pow);</div><div class='del'>-			omeas-&gt;gain_idx =</div><div class='del'>-			    (u8) iwl4965_interpolate_value(channel, ch_i1,</div><div class='del'>-							   m1-&gt;gain_idx, ch_i2,</div><div class='del'>-							   m2-&gt;gain_idx);</div><div class='del'>-			omeas-&gt;temperature =</div><div class='del'>-			    (u8) iwl4965_interpolate_value(channel, ch_i1,</div><div class='del'>-							   m1-&gt;temperature,</div><div class='del'>-							   ch_i2,</div><div class='del'>-							   m2-&gt;temperature);</div><div class='del'>-			omeas-&gt;pa_det =</div><div class='del'>-			    (s8) iwl4965_interpolate_value(channel, ch_i1,</div><div class='del'>-							   m1-&gt;pa_det, ch_i2,</div><div class='del'>-							   m2-&gt;pa_det);</div><div class='del'>-</div><div class='del'>-			IWL_DEBUG_TXPOWER(priv,</div><div class='del'>-				"chain %d meas %d AP1=%d AP2=%d AP=%d\n", c, m,</div><div class='del'>-				m1-&gt;actual_pow, m2-&gt;actual_pow, omeas-&gt;actual_pow);</div><div class='del'>-			IWL_DEBUG_TXPOWER(priv,</div><div class='del'>-				"chain %d meas %d NI1=%d NI2=%d NI=%d\n", c, m,</div><div class='del'>-				m1-&gt;gain_idx, m2-&gt;gain_idx, omeas-&gt;gain_idx);</div><div class='del'>-			IWL_DEBUG_TXPOWER(priv,</div><div class='del'>-				"chain %d meas %d PA1=%d PA2=%d PA=%d\n", c, m,</div><div class='del'>-				m1-&gt;pa_det, m2-&gt;pa_det, omeas-&gt;pa_det);</div><div class='del'>-			IWL_DEBUG_TXPOWER(priv,</div><div class='del'>-				"chain %d meas %d  T1=%d  T2=%d  T=%d\n", c, m,</div><div class='del'>-				m1-&gt;temperature, m2-&gt;temperature,</div><div class='del'>-				omeas-&gt;temperature);</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'>-/* bit-rate-dependent table to prevent Tx distortion, in half-dB units,</div><div class='del'>- * for OFDM 6, 12, 18, 24, 36, 48, 54, 60 MBit, and CCK all rates. */</div><div class='del'>-static s32 back_off_table[] = {</div><div class='del'>-	10, 10, 10, 10, 10, 15, 17, 20,	/* OFDM SISO 20 MHz */</div><div class='del'>-	10, 10, 10, 10, 10, 15, 17, 20,	/* OFDM MIMO 20 MHz */</div><div class='del'>-	10, 10, 10, 10, 10, 15, 17, 20,	/* OFDM SISO 40 MHz */</div><div class='del'>-	10, 10, 10, 10, 10, 15, 17, 20,	/* OFDM MIMO 40 MHz */</div><div class='del'>-	10			/* CCK */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Thermal compensation values for txpower for various frequency ranges ...</div><div class='del'>- *   ratios from 3:1 to 4.5:1 of degrees (Celsius) per half-dB gain adjust */</div><div class='del'>-static struct iwl4965_txpower_comp_entry {</div><div class='del'>-	s32 degrees_per_05db_a;</div><div class='del'>-	s32 degrees_per_05db_a_denom;</div><div class='del'>-} tx_power_cmp_tble[CALIB_CH_GROUP_MAX] = {</div><div class='del'>-	{9, 2},			/* group 0 5.2, ch  34-43 */</div><div class='del'>-	{4, 1},			/* group 1 5.2, ch  44-70 */</div><div class='del'>-	{4, 1},			/* group 2 5.2, ch  71-124 */</div><div class='del'>-	{4, 1},			/* group 3 5.2, ch 125-200 */</div><div class='del'>-	{3, 1}			/* group 4 2.4, ch   all */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static s32 get_min_power_index(s32 rate_power_index, u32 band)</div><div class='del'>-{</div><div class='del'>-	if (!band) {</div><div class='del'>-		if ((rate_power_index &amp; 7) &lt;= 4)</div><div class='del'>-			return MIN_TX_GAIN_INDEX_52GHZ_EXT;</div><div class='del'>-	}</div><div class='del'>-	return MIN_TX_GAIN_INDEX;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct gain_entry {</div><div class='del'>-	u8 dsp;</div><div class='del'>-	u8 radio;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct gain_entry gain_table[2][108] = {</div><div class='del'>-	/* 5.2GHz power gain index table */</div><div class='del'>-	{</div><div class='del'>-	 {123, 0x3F},		/* highest txpower */</div><div class='del'>-	 {117, 0x3F},</div><div class='del'>-	 {110, 0x3F},</div><div class='del'>-	 {104, 0x3F},</div><div class='del'>-	 {98, 0x3F},</div><div class='del'>-	 {110, 0x3E},</div><div class='del'>-	 {104, 0x3E},</div><div class='del'>-	 {98, 0x3E},</div><div class='del'>-	 {110, 0x3D},</div><div class='del'>-	 {104, 0x3D},</div><div class='del'>-	 {98, 0x3D},</div><div class='del'>-	 {110, 0x3C},</div><div class='del'>-	 {104, 0x3C},</div><div class='del'>-	 {98, 0x3C},</div><div class='del'>-	 {110, 0x3B},</div><div class='del'>-	 {104, 0x3B},</div><div class='del'>-	 {98, 0x3B},</div><div class='del'>-	 {110, 0x3A},</div><div class='del'>-	 {104, 0x3A},</div><div class='del'>-	 {98, 0x3A},</div><div class='del'>-	 {110, 0x39},</div><div class='del'>-	 {104, 0x39},</div><div class='del'>-	 {98, 0x39},</div><div class='del'>-	 {110, 0x38},</div><div class='del'>-	 {104, 0x38},</div><div class='del'>-	 {98, 0x38},</div><div class='del'>-	 {110, 0x37},</div><div class='del'>-	 {104, 0x37},</div><div class='del'>-	 {98, 0x37},</div><div class='del'>-	 {110, 0x36},</div><div class='del'>-	 {104, 0x36},</div><div class='del'>-	 {98, 0x36},</div><div class='del'>-	 {110, 0x35},</div><div class='del'>-	 {104, 0x35},</div><div class='del'>-	 {98, 0x35},</div><div class='del'>-	 {110, 0x34},</div><div class='del'>-	 {104, 0x34},</div><div class='del'>-	 {98, 0x34},</div><div class='del'>-	 {110, 0x33},</div><div class='del'>-	 {104, 0x33},</div><div class='del'>-	 {98, 0x33},</div><div class='del'>-	 {110, 0x32},</div><div class='del'>-	 {104, 0x32},</div><div class='del'>-	 {98, 0x32},</div><div class='del'>-	 {110, 0x31},</div><div class='del'>-	 {104, 0x31},</div><div class='del'>-	 {98, 0x31},</div><div class='del'>-	 {110, 0x30},</div><div class='del'>-	 {104, 0x30},</div><div class='del'>-	 {98, 0x30},</div><div class='del'>-	 {110, 0x25},</div><div class='del'>-	 {104, 0x25},</div><div class='del'>-	 {98, 0x25},</div><div class='del'>-	 {110, 0x24},</div><div class='del'>-	 {104, 0x24},</div><div class='del'>-	 {98, 0x24},</div><div class='del'>-	 {110, 0x23},</div><div class='del'>-	 {104, 0x23},</div><div class='del'>-	 {98, 0x23},</div><div class='del'>-	 {110, 0x22},</div><div class='del'>-	 {104, 0x18},</div><div class='del'>-	 {98, 0x18},</div><div class='del'>-	 {110, 0x17},</div><div class='del'>-	 {104, 0x17},</div><div class='del'>-	 {98, 0x17},</div><div class='del'>-	 {110, 0x16},</div><div class='del'>-	 {104, 0x16},</div><div class='del'>-	 {98, 0x16},</div><div class='del'>-	 {110, 0x15},</div><div class='del'>-	 {104, 0x15},</div><div class='del'>-	 {98, 0x15},</div><div class='del'>-	 {110, 0x14},</div><div class='del'>-	 {104, 0x14},</div><div class='del'>-	 {98, 0x14},</div><div class='del'>-	 {110, 0x13},</div><div class='del'>-	 {104, 0x13},</div><div class='del'>-	 {98, 0x13},</div><div class='del'>-	 {110, 0x12},</div><div class='del'>-	 {104, 0x08},</div><div class='del'>-	 {98, 0x08},</div><div class='del'>-	 {110, 0x07},</div><div class='del'>-	 {104, 0x07},</div><div class='del'>-	 {98, 0x07},</div><div class='del'>-	 {110, 0x06},</div><div class='del'>-	 {104, 0x06},</div><div class='del'>-	 {98, 0x06},</div><div class='del'>-	 {110, 0x05},</div><div class='del'>-	 {104, 0x05},</div><div class='del'>-	 {98, 0x05},</div><div class='del'>-	 {110, 0x04},</div><div class='del'>-	 {104, 0x04},</div><div class='del'>-	 {98, 0x04},</div><div class='del'>-	 {110, 0x03},</div><div class='del'>-	 {104, 0x03},</div><div class='del'>-	 {98, 0x03},</div><div class='del'>-	 {110, 0x02},</div><div class='del'>-	 {104, 0x02},</div><div class='del'>-	 {98, 0x02},</div><div class='del'>-	 {110, 0x01},</div><div class='del'>-	 {104, 0x01},</div><div class='del'>-	 {98, 0x01},</div><div class='del'>-	 {110, 0x00},</div><div class='del'>-	 {104, 0x00},</div><div class='del'>-	 {98, 0x00},</div><div class='del'>-	 {93, 0x00},</div><div class='del'>-	 {88, 0x00},</div><div class='del'>-	 {83, 0x00},</div><div class='del'>-	 {78, 0x00},</div><div class='del'>-	 },</div><div class='del'>-	/* 2.4GHz power gain index table */</div><div class='del'>-	{</div><div class='del'>-	 {110, 0x3f},		/* highest txpower */</div><div class='del'>-	 {104, 0x3f},</div><div class='del'>-	 {98, 0x3f},</div><div class='del'>-	 {110, 0x3e},</div><div class='del'>-	 {104, 0x3e},</div><div class='del'>-	 {98, 0x3e},</div><div class='del'>-	 {110, 0x3d},</div><div class='del'>-	 {104, 0x3d},</div><div class='del'>-	 {98, 0x3d},</div><div class='del'>-	 {110, 0x3c},</div><div class='del'>-	 {104, 0x3c},</div><div class='del'>-	 {98, 0x3c},</div><div class='del'>-	 {110, 0x3b},</div><div class='del'>-	 {104, 0x3b},</div><div class='del'>-	 {98, 0x3b},</div><div class='del'>-	 {110, 0x3a},</div><div class='del'>-	 {104, 0x3a},</div><div class='del'>-	 {98, 0x3a},</div><div class='del'>-	 {110, 0x39},</div><div class='del'>-	 {104, 0x39},</div><div class='del'>-	 {98, 0x39},</div><div class='del'>-	 {110, 0x38},</div><div class='del'>-	 {104, 0x38},</div><div class='del'>-	 {98, 0x38},</div><div class='del'>-	 {110, 0x37},</div><div class='del'>-	 {104, 0x37},</div><div class='del'>-	 {98, 0x37},</div><div class='del'>-	 {110, 0x36},</div><div class='del'>-	 {104, 0x36},</div><div class='del'>-	 {98, 0x36},</div><div class='del'>-	 {110, 0x35},</div><div class='del'>-	 {104, 0x35},</div><div class='del'>-	 {98, 0x35},</div><div class='del'>-	 {110, 0x34},</div><div class='del'>-	 {104, 0x34},</div><div class='del'>-	 {98, 0x34},</div><div class='del'>-	 {110, 0x33},</div><div class='del'>-	 {104, 0x33},</div><div class='del'>-	 {98, 0x33},</div><div class='del'>-	 {110, 0x32},</div><div class='del'>-	 {104, 0x32},</div><div class='del'>-	 {98, 0x32},</div><div class='del'>-	 {110, 0x31},</div><div class='del'>-	 {104, 0x31},</div><div class='del'>-	 {98, 0x31},</div><div class='del'>-	 {110, 0x30},</div><div class='del'>-	 {104, 0x30},</div><div class='del'>-	 {98, 0x30},</div><div class='del'>-	 {110, 0x6},</div><div class='del'>-	 {104, 0x6},</div><div class='del'>-	 {98, 0x6},</div><div class='del'>-	 {110, 0x5},</div><div class='del'>-	 {104, 0x5},</div><div class='del'>-	 {98, 0x5},</div><div class='del'>-	 {110, 0x4},</div><div class='del'>-	 {104, 0x4},</div><div class='del'>-	 {98, 0x4},</div><div class='del'>-	 {110, 0x3},</div><div class='del'>-	 {104, 0x3},</div><div class='del'>-	 {98, 0x3},</div><div class='del'>-	 {110, 0x2},</div><div class='del'>-	 {104, 0x2},</div><div class='del'>-	 {98, 0x2},</div><div class='del'>-	 {110, 0x1},</div><div class='del'>-	 {104, 0x1},</div><div class='del'>-	 {98, 0x1},</div><div class='del'>-	 {110, 0x0},</div><div class='del'>-	 {104, 0x0},</div><div class='del'>-	 {98, 0x0},</div><div class='del'>-	 {97, 0},</div><div class='del'>-	 {96, 0},</div><div class='del'>-	 {95, 0},</div><div class='del'>-	 {94, 0},</div><div class='del'>-	 {93, 0},</div><div class='del'>-	 {92, 0},</div><div class='del'>-	 {91, 0},</div><div class='del'>-	 {90, 0},</div><div class='del'>-	 {89, 0},</div><div class='del'>-	 {88, 0},</div><div class='del'>-	 {87, 0},</div><div class='del'>-	 {86, 0},</div><div class='del'>-	 {85, 0},</div><div class='del'>-	 {84, 0},</div><div class='del'>-	 {83, 0},</div><div class='del'>-	 {82, 0},</div><div class='del'>-	 {81, 0},</div><div class='del'>-	 {80, 0},</div><div class='del'>-	 {79, 0},</div><div class='del'>-	 {78, 0},</div><div class='del'>-	 {77, 0},</div><div class='del'>-	 {76, 0},</div><div class='del'>-	 {75, 0},</div><div class='del'>-	 {74, 0},</div><div class='del'>-	 {73, 0},</div><div class='del'>-	 {72, 0},</div><div class='del'>-	 {71, 0},</div><div class='del'>-	 {70, 0},</div><div class='del'>-	 {69, 0},</div><div class='del'>-	 {68, 0},</div><div class='del'>-	 {67, 0},</div><div class='del'>-	 {66, 0},</div><div class='del'>-	 {65, 0},</div><div class='del'>-	 {64, 0},</div><div class='del'>-	 {63, 0},</div><div class='del'>-	 {62, 0},</div><div class='del'>-	 {61, 0},</div><div class='del'>-	 {60, 0},</div><div class='del'>-	 {59, 0},</div><div class='del'>-	 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int iwl4965_fill_txpower_tbl(struct iwl_priv *priv, u8 band, u16 channel,</div><div class='del'>-				    u8 is_ht40, u8 ctrl_chan_high,</div><div class='del'>-				    struct iwl4965_tx_power_db *tx_power_tbl)</div><div class='del'>-{</div><div class='del'>-	u8 saturation_power;</div><div class='del'>-	s32 target_power;</div><div class='del'>-	s32 user_target_power;</div><div class='del'>-	s32 power_limit;</div><div class='del'>-	s32 current_temp;</div><div class='del'>-	s32 reg_limit;</div><div class='del'>-	s32 current_regulatory;</div><div class='del'>-	s32 txatten_grp = CALIB_CH_GROUP_MAX;</div><div class='del'>-	int i;</div><div class='del'>-	int c;</div><div class='del'>-	const struct iwl_channel_info *ch_info = NULL;</div><div class='del'>-	struct iwl_eeprom_calib_ch_info ch_eeprom_info;</div><div class='del'>-	const struct iwl_eeprom_calib_measure *measurement;</div><div class='del'>-	s16 voltage;</div><div class='del'>-	s32 init_voltage;</div><div class='del'>-	s32 voltage_compensation;</div><div class='del'>-	s32 degrees_per_05db_num;</div><div class='del'>-	s32 degrees_per_05db_denom;</div><div class='del'>-	s32 factory_temp;</div><div class='del'>-	s32 temperature_comp[2];</div><div class='del'>-	s32 factory_gain_index[2];</div><div class='del'>-	s32 factory_actual_pwr[2];</div><div class='del'>-	s32 power_index;</div><div class='del'>-</div><div class='del'>-	/* tx_power_user_lmt is in dBm, convert to half-dBm (half-dB units</div><div class='del'>-	 *   are used for indexing into txpower table) */</div><div class='del'>-	user_target_power = 2 * priv-&gt;tx_power_user_lmt;</div><div class='del'>-</div><div class='del'>-	/* Get current (RXON) channel, band, width */</div><div class='del'>-	IWL_DEBUG_TXPOWER(priv, "chan %d band %d is_ht40 %d\n", channel, band,</div><div class='del'>-			  is_ht40);</div><div class='del'>-</div><div class='del'>-	ch_info = iwl_legacy_get_channel_info(priv, priv-&gt;band, channel);</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_channel_valid(ch_info))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* get txatten group, used to select 1) thermal txpower adjustment</div><div class='del'>-	 *   and 2) mimo txpower balance between Tx chains. */</div><div class='del'>-	txatten_grp = iwl4965_get_tx_atten_grp(channel);</div><div class='del'>-	if (txatten_grp &lt; 0) {</div><div class='del'>-		IWL_ERR(priv, "Can't find txatten group for channel %d.\n",</div><div class='del'>-			  channel);</div><div class='del'>-		return txatten_grp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TXPOWER(priv, "channel %d belongs to txatten group %d\n",</div><div class='del'>-			  channel, txatten_grp);</div><div class='del'>-</div><div class='del'>-	if (is_ht40) {</div><div class='del'>-		if (ctrl_chan_high)</div><div class='del'>-			channel -= 2;</div><div class='del'>-		else</div><div class='del'>-			channel += 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* hardware txpower limits ...</div><div class='del'>-	 * saturation (clipping distortion) txpowers are in half-dBm */</div><div class='del'>-	if (band)</div><div class='del'>-		saturation_power = priv-&gt;calib_info-&gt;saturation_power24;</div><div class='del'>-	else</div><div class='del'>-		saturation_power = priv-&gt;calib_info-&gt;saturation_power52;</div><div class='del'>-</div><div class='del'>-	if (saturation_power &lt; IWL_TX_POWER_SATURATION_MIN ||</div><div class='del'>-	    saturation_power &gt; IWL_TX_POWER_SATURATION_MAX) {</div><div class='del'>-		if (band)</div><div class='del'>-			saturation_power = IWL_TX_POWER_DEFAULT_SATURATION_24;</div><div class='del'>-		else</div><div class='del'>-			saturation_power = IWL_TX_POWER_DEFAULT_SATURATION_52;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* regulatory txpower limits ... reg_limit values are in half-dBm,</div><div class='del'>-	 *   max_power_avg values are in dBm, convert * 2 */</div><div class='del'>-	if (is_ht40)</div><div class='del'>-		reg_limit = ch_info-&gt;ht40_max_power_avg * 2;</div><div class='del'>-	else</div><div class='del'>-		reg_limit = ch_info-&gt;max_power_avg * 2;</div><div class='del'>-</div><div class='del'>-	if ((reg_limit &lt; IWL_TX_POWER_REGULATORY_MIN) ||</div><div class='del'>-	    (reg_limit &gt; IWL_TX_POWER_REGULATORY_MAX)) {</div><div class='del'>-		if (band)</div><div class='del'>-			reg_limit = IWL_TX_POWER_DEFAULT_REGULATORY_24;</div><div class='del'>-		else</div><div class='del'>-			reg_limit = IWL_TX_POWER_DEFAULT_REGULATORY_52;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Interpolate txpower calibration values for this channel,</div><div class='del'>-	 *   based on factory calibration tests on spaced channels. */</div><div class='del'>-	iwl4965_interpolate_chan(priv, channel, &amp;ch_eeprom_info);</div><div class='del'>-</div><div class='del'>-	/* calculate tx gain adjustment based on power supply voltage */</div><div class='del'>-	voltage = le16_to_cpu(priv-&gt;calib_info-&gt;voltage);</div><div class='del'>-	init_voltage = (s32)le32_to_cpu(priv-&gt;card_alive_init.voltage);</div><div class='del'>-	voltage_compensation =</div><div class='del'>-	    iwl4965_get_voltage_compensation(voltage, init_voltage);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TXPOWER(priv, "curr volt %d eeprom volt %d volt comp %d\n",</div><div class='del'>-			  init_voltage,</div><div class='del'>-			  voltage, voltage_compensation);</div><div class='del'>-</div><div class='del'>-	/* get current temperature (Celsius) */</div><div class='del'>-	current_temp = max(priv-&gt;temperature, IWL_TX_POWER_TEMPERATURE_MIN);</div><div class='del'>-	current_temp = min(priv-&gt;temperature, IWL_TX_POWER_TEMPERATURE_MAX);</div><div class='del'>-	current_temp = KELVIN_TO_CELSIUS(current_temp);</div><div class='del'>-</div><div class='del'>-	/* select thermal txpower adjustment params, based on channel group</div><div class='del'>-	 *   (same frequency group used for mimo txatten adjustment) */</div><div class='del'>-	degrees_per_05db_num =</div><div class='del'>-	    tx_power_cmp_tble[txatten_grp].degrees_per_05db_a;</div><div class='del'>-	degrees_per_05db_denom =</div><div class='del'>-	    tx_power_cmp_tble[txatten_grp].degrees_per_05db_a_denom;</div><div class='del'>-</div><div class='del'>-	/* get per-chain txpower values from factory measurements */</div><div class='del'>-	for (c = 0; c &lt; 2; c++) {</div><div class='del'>-		measurement = &amp;ch_eeprom_info.measurements[c][1];</div><div class='del'>-</div><div class='del'>-		/* txgain adjustment (in half-dB steps) based on difference</div><div class='del'>-		 *   between factory and current temperature */</div><div class='del'>-		factory_temp = measurement-&gt;temperature;</div><div class='del'>-		iwl4965_math_div_round((current_temp - factory_temp) *</div><div class='del'>-				       degrees_per_05db_denom,</div><div class='del'>-				       degrees_per_05db_num,</div><div class='del'>-				       &amp;temperature_comp[c]);</div><div class='del'>-</div><div class='del'>-		factory_gain_index[c] = measurement-&gt;gain_idx;</div><div class='del'>-		factory_actual_pwr[c] = measurement-&gt;actual_pow;</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_TXPOWER(priv, "chain = %d\n", c);</div><div class='del'>-		IWL_DEBUG_TXPOWER(priv, "fctry tmp %d, "</div><div class='del'>-				  "curr tmp %d, comp %d steps\n",</div><div class='del'>-				  factory_temp, current_temp,</div><div class='del'>-				  temperature_comp[c]);</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_TXPOWER(priv, "fctry idx %d, fctry pwr %d\n",</div><div class='del'>-				  factory_gain_index[c],</div><div class='del'>-				  factory_actual_pwr[c]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* for each of 33 bit-rates (including 1 for CCK) */</div><div class='del'>-	for (i = 0; i &lt; POWER_TABLE_NUM_ENTRIES; i++) {</div><div class='del'>-		u8 is_mimo_rate;</div><div class='del'>-		union iwl4965_tx_power_dual_stream tx_power;</div><div class='del'>-</div><div class='del'>-		/* for mimo, reduce each chain's txpower by half</div><div class='del'>-		 * (3dB, 6 steps), so total output power is regulatory</div><div class='del'>-		 * compliant. */</div><div class='del'>-		if (i &amp; 0x8) {</div><div class='del'>-			current_regulatory = reg_limit -</div><div class='del'>-			    IWL_TX_POWER_MIMO_REGULATORY_COMPENSATION;</div><div class='del'>-			is_mimo_rate = 1;</div><div class='del'>-		} else {</div><div class='del'>-			current_regulatory = reg_limit;</div><div class='del'>-			is_mimo_rate = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* find txpower limit, either hardware or regulatory */</div><div class='del'>-		power_limit = saturation_power - back_off_table[i];</div><div class='del'>-		if (power_limit &gt; current_regulatory)</div><div class='del'>-			power_limit = current_regulatory;</div><div class='del'>-</div><div class='del'>-		/* reduce user's txpower request if necessary</div><div class='del'>-		 * for this rate on this channel */</div><div class='del'>-		target_power = user_target_power;</div><div class='del'>-		if (target_power &gt; power_limit)</div><div class='del'>-			target_power = power_limit;</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_TXPOWER(priv, "rate %d sat %d reg %d usr %d tgt %d\n",</div><div class='del'>-				  i, saturation_power - back_off_table[i],</div><div class='del'>-				  current_regulatory, user_target_power,</div><div class='del'>-				  target_power);</div><div class='del'>-</div><div class='del'>-		/* for each of 2 Tx chains (radio transmitters) */</div><div class='del'>-		for (c = 0; c &lt; 2; c++) {</div><div class='del'>-			s32 atten_value;</div><div class='del'>-</div><div class='del'>-			if (is_mimo_rate)</div><div class='del'>-				atten_value =</div><div class='del'>-				    (s32)le32_to_cpu(priv-&gt;card_alive_init.</div><div class='del'>-				    tx_atten[txatten_grp][c]);</div><div class='del'>-			else</div><div class='del'>-				atten_value = 0;</div><div class='del'>-</div><div class='del'>-			/* calculate index; higher index means lower txpower */</div><div class='del'>-			power_index = (u8) (factory_gain_index[c] -</div><div class='del'>-					    (target_power -</div><div class='del'>-					     factory_actual_pwr[c]) -</div><div class='del'>-					    temperature_comp[c] -</div><div class='del'>-					    voltage_compensation +</div><div class='del'>-					    atten_value);</div><div class='del'>-</div><div class='del'>-/*			IWL_DEBUG_TXPOWER(priv, "calculated txpower index %d\n",</div><div class='del'>-						power_index); */</div><div class='del'>-</div><div class='del'>-			if (power_index &lt; get_min_power_index(i, band))</div><div class='del'>-				power_index = get_min_power_index(i, band);</div><div class='del'>-</div><div class='del'>-			/* adjust 5 GHz index to support negative indexes */</div><div class='del'>-			if (!band)</div><div class='del'>-				power_index += 9;</div><div class='del'>-</div><div class='del'>-			/* CCK, rate 32, reduce txpower for CCK */</div><div class='del'>-			if (i == POWER_TABLE_CCK_ENTRY)</div><div class='del'>-				power_index +=</div><div class='del'>-				    IWL_TX_POWER_CCK_COMPENSATION_C_STEP;</div><div class='del'>-</div><div class='del'>-			/* stay within the table! */</div><div class='del'>-			if (power_index &gt; 107) {</div><div class='del'>-				IWL_WARN(priv, "txpower index %d &gt; 107\n",</div><div class='del'>-					    power_index);</div><div class='del'>-				power_index = 107;</div><div class='del'>-			}</div><div class='del'>-			if (power_index &lt; 0) {</div><div class='del'>-				IWL_WARN(priv, "txpower index %d &lt; 0\n",</div><div class='del'>-					    power_index);</div><div class='del'>-				power_index = 0;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* fill txpower command for this rate/chain */</div><div class='del'>-			tx_power.s.radio_tx_gain[c] =</div><div class='del'>-				gain_table[band][power_index].radio;</div><div class='del'>-			tx_power.s.dsp_predis_atten[c] =</div><div class='del'>-				gain_table[band][power_index].dsp;</div><div class='del'>-</div><div class='del'>-			IWL_DEBUG_TXPOWER(priv, "chain %d mimo %d index %d "</div><div class='del'>-					  "gain 0x%02x dsp %d\n",</div><div class='del'>-					  c, atten_value, power_index,</div><div class='del'>-					tx_power.s.radio_tx_gain[c],</div><div class='del'>-					tx_power.s.dsp_predis_atten[c]);</div><div class='del'>-		} /* for each chain */</div><div class='del'>-</div><div class='del'>-		tx_power_tbl-&gt;power_tbl[i].dw = cpu_to_le32(tx_power.dw);</div><div class='del'>-</div><div class='del'>-	} /* for each rate */</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'>- * iwl4965_send_tx_power - Configure the TXPOWER level user limit</div><div class='del'>- *</div><div class='del'>- * Uses the active RXON for channel, band, and characteristics (ht40, high)</div><div class='del'>- * The power limit is taken from priv-&gt;tx_power_user_lmt.</div><div class='del'>- */</div><div class='del'>-static int iwl4965_send_tx_power(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl4965_txpowertable_cmd cmd = { 0 };</div><div class='del'>-	int ret;</div><div class='del'>-	u8 band = 0;</div><div class='del'>-	bool is_ht40 = false;</div><div class='del'>-	u8 ctrl_chan_high = 0;</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-</div><div class='del'>-	if (WARN_ONCE(test_bit(STATUS_SCAN_HW, &amp;priv-&gt;status),</div><div class='del'>-		      "TX Power requested while scanning!\n"))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	band = priv-&gt;band == IEEE80211_BAND_2GHZ;</div><div class='del'>-</div><div class='del'>-	is_ht40 = iw4965_is_ht40_channel(ctx-&gt;active.flags);</div><div class='del'>-</div><div class='del'>-	if (is_ht40 &amp;&amp; (ctx-&gt;active.flags &amp; RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK))</div><div class='del'>-		ctrl_chan_high = 1;</div><div class='del'>-</div><div class='del'>-	cmd.band = band;</div><div class='del'>-	cmd.channel = ctx-&gt;active.channel;</div><div class='del'>-</div><div class='del'>-	ret = iwl4965_fill_txpower_tbl(priv, band,</div><div class='del'>-				le16_to_cpu(ctx-&gt;active.channel),</div><div class='del'>-				is_ht40, ctrl_chan_high, &amp;cmd.tx_power);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_send_cmd_pdu(priv,</div><div class='del'>-			 REPLY_TX_PWR_TABLE_CMD, sizeof(cmd), &amp;cmd);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl4965_send_rxon_assoc(struct iwl_priv *priv,</div><div class='del'>-				   struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	struct iwl4965_rxon_assoc_cmd rxon_assoc;</div><div class='del'>-	const struct iwl_legacy_rxon_cmd *rxon1 = &amp;ctx-&gt;staging;</div><div class='del'>-	const struct iwl_legacy_rxon_cmd *rxon2 = &amp;ctx-&gt;active;</div><div class='del'>-</div><div class='del'>-	if ((rxon1-&gt;flags == rxon2-&gt;flags) &amp;&amp;</div><div class='del'>-	    (rxon1-&gt;filter_flags == rxon2-&gt;filter_flags) &amp;&amp;</div><div class='del'>-	    (rxon1-&gt;cck_basic_rates == rxon2-&gt;cck_basic_rates) &amp;&amp;</div><div class='del'>-	    (rxon1-&gt;ofdm_ht_single_stream_basic_rates ==</div><div class='del'>-	     rxon2-&gt;ofdm_ht_single_stream_basic_rates) &amp;&amp;</div><div class='del'>-	    (rxon1-&gt;ofdm_ht_dual_stream_basic_rates ==</div><div class='del'>-	     rxon2-&gt;ofdm_ht_dual_stream_basic_rates) &amp;&amp;</div><div class='del'>-	    (rxon1-&gt;rx_chain == rxon2-&gt;rx_chain) &amp;&amp;</div><div class='del'>-	    (rxon1-&gt;ofdm_basic_rates == rxon2-&gt;ofdm_basic_rates)) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Using current RXON_ASSOC.  Not resending.\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rxon_assoc.flags = ctx-&gt;staging.flags;</div><div class='del'>-	rxon_assoc.filter_flags = ctx-&gt;staging.filter_flags;</div><div class='del'>-	rxon_assoc.ofdm_basic_rates = ctx-&gt;staging.ofdm_basic_rates;</div><div class='del'>-	rxon_assoc.cck_basic_rates = ctx-&gt;staging.cck_basic_rates;</div><div class='del'>-	rxon_assoc.reserved = 0;</div><div class='del'>-	rxon_assoc.ofdm_ht_single_stream_basic_rates =</div><div class='del'>-	    ctx-&gt;staging.ofdm_ht_single_stream_basic_rates;</div><div class='del'>-	rxon_assoc.ofdm_ht_dual_stream_basic_rates =</div><div class='del'>-	    ctx-&gt;staging.ofdm_ht_dual_stream_basic_rates;</div><div class='del'>-	rxon_assoc.rx_chain_select_flags = ctx-&gt;staging.rx_chain;</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_send_cmd_pdu_async(priv, REPLY_RXON_ASSOC,</div><div class='del'>-				     sizeof(rxon_assoc), &amp;rxon_assoc, NULL);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl4965_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	/* cast away the const for active_rxon in this function */</div><div class='del'>-	struct iwl_legacy_rxon_cmd *active_rxon = (void *)&amp;ctx-&gt;active;</div><div class='del'>-	int ret;</div><div class='del'>-	bool new_assoc =</div><div class='del'>-		!!(ctx-&gt;staging.filter_flags &amp; RXON_FILTER_ASSOC_MSK);</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_alive(priv))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	if (!ctx-&gt;is_active)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* always get timestamp with Rx frame */</div><div class='del'>-	ctx-&gt;staging.flags |= RXON_FLG_TSF2HOST_MSK;</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_check_rxon_cmd(priv, ctx);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "Invalid RXON configuration.  Not committing.\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * receive commit_rxon request</div><div class='del'>-	 * abort any previous channel switch if still in process</div><div class='del'>-	 */</div><div class='del'>-	if (test_bit(STATUS_CHANNEL_SWITCH_PENDING, &amp;priv-&gt;status) &amp;&amp;</div><div class='del'>-	    (priv-&gt;switch_channel != ctx-&gt;staging.channel)) {</div><div class='del'>-		IWL_DEBUG_11H(priv, "abort channel switch on %d\n",</div><div class='del'>-		      le16_to_cpu(priv-&gt;switch_channel));</div><div class='del'>-		iwl_legacy_chswitch_done(priv, false);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we don't need to send a full RXON, we can use</div><div class='del'>-	 * iwl_rxon_assoc_cmd which is used to reconfigure filter</div><div class='del'>-	 * and other flags for the current radio configuration. */</div><div class='del'>-	if (!iwl_legacy_full_rxon_required(priv, ctx)) {</div><div class='del'>-		ret = iwl_legacy_send_rxon_assoc(priv, ctx);</div><div class='del'>-		if (ret) {</div><div class='del'>-			IWL_ERR(priv, "Error setting RXON_ASSOC (%d)\n", ret);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy(active_rxon, &amp;ctx-&gt;staging, sizeof(*active_rxon));</div><div class='del'>-		iwl_legacy_print_rx_config_cmd(priv, ctx);</div><div class='del'>-		/*</div><div class='del'>-		 * We do not commit tx power settings while channel changing,</div><div class='del'>-		 * do it now if tx power changed.</div><div class='del'>-		 */</div><div class='del'>-		iwl_legacy_set_tx_power(priv, priv-&gt;tx_power_next, false);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we are currently associated and the new config requires</div><div class='del'>-	 * an RXON_ASSOC and the new config wants the associated mask enabled,</div><div class='del'>-	 * we must clear the associated from the active configuration</div><div class='del'>-	 * before we apply the new config */</div><div class='del'>-	if (iwl_legacy_is_associated_ctx(ctx) &amp;&amp; new_assoc) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Toggling associated bit on current RXON\n");</div><div class='del'>-		active_rxon-&gt;filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='del'>-</div><div class='del'>-		ret = iwl_legacy_send_cmd_pdu(priv, ctx-&gt;rxon_cmd,</div><div class='del'>-				       sizeof(struct iwl_legacy_rxon_cmd),</div><div class='del'>-				       active_rxon);</div><div class='del'>-</div><div class='del'>-		/* If the mask clearing failed then we set</div><div class='del'>-		 * active_rxon back to what it was previously */</div><div class='del'>-		if (ret) {</div><div class='del'>-			active_rxon-&gt;filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='del'>-			IWL_ERR(priv, "Error clearing ASSOC_MSK (%d)\n", ret);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-		iwl_legacy_clear_ucode_stations(priv, ctx);</div><div class='del'>-		iwl_legacy_restore_stations(priv, ctx);</div><div class='del'>-		ret = iwl4965_restore_default_wep_keys(priv, ctx);</div><div class='del'>-		if (ret) {</div><div class='del'>-			IWL_ERR(priv, "Failed to restore WEP keys (%d)\n", ret);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Sending RXON\n"</div><div class='del'>-		       "* with%s RXON_FILTER_ASSOC_MSK\n"</div><div class='del'>-		       "* channel = %d\n"</div><div class='del'>-		       "* bssid = %pM\n",</div><div class='del'>-		       (new_assoc ? "" : "out"),</div><div class='del'>-		       le16_to_cpu(ctx-&gt;staging.channel),</div><div class='del'>-		       ctx-&gt;staging.bssid_addr);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_set_rxon_hwcrypto(priv, ctx,</div><div class='del'>-				!priv-&gt;cfg-&gt;mod_params-&gt;sw_crypto);</div><div class='del'>-</div><div class='del'>-	/* Apply the new configuration</div><div class='del'>-	 * RXON unassoc clears the station table in uCode so restoration of</div><div class='del'>-	 * stations is needed after it (the RXON command) completes</div><div class='del'>-	 */</div><div class='del'>-	if (!new_assoc) {</div><div class='del'>-		ret = iwl_legacy_send_cmd_pdu(priv, ctx-&gt;rxon_cmd,</div><div class='del'>-			      sizeof(struct iwl_legacy_rxon_cmd), &amp;ctx-&gt;staging);</div><div class='del'>-		if (ret) {</div><div class='del'>-			IWL_ERR(priv, "Error setting new RXON (%d)\n", ret);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Return from !new_assoc RXON.\n");</div><div class='del'>-		memcpy(active_rxon, &amp;ctx-&gt;staging, sizeof(*active_rxon));</div><div class='del'>-		iwl_legacy_clear_ucode_stations(priv, ctx);</div><div class='del'>-		iwl_legacy_restore_stations(priv, ctx);</div><div class='del'>-		ret = iwl4965_restore_default_wep_keys(priv, ctx);</div><div class='del'>-		if (ret) {</div><div class='del'>-			IWL_ERR(priv, "Failed to restore WEP keys (%d)\n", ret);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (new_assoc) {</div><div class='del'>-		priv-&gt;start_calib = 0;</div><div class='del'>-		/* Apply the new configuration</div><div class='del'>-		 * RXON assoc doesn't clear the station table in uCode,</div><div class='del'>-		 */</div><div class='del'>-		ret = iwl_legacy_send_cmd_pdu(priv, ctx-&gt;rxon_cmd,</div><div class='del'>-			      sizeof(struct iwl_legacy_rxon_cmd), &amp;ctx-&gt;staging);</div><div class='del'>-		if (ret) {</div><div class='del'>-			IWL_ERR(priv, "Error setting new RXON (%d)\n", ret);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-		memcpy(active_rxon, &amp;ctx-&gt;staging, sizeof(*active_rxon));</div><div class='del'>-	}</div><div class='del'>-	iwl_legacy_print_rx_config_cmd(priv, ctx);</div><div class='del'>-</div><div class='del'>-	iwl4965_init_sensitivity(priv);</div><div class='del'>-</div><div class='del'>-	/* If we issue a new RXON command which required a tune then we must</div><div class='del'>-	 * send a new TXPOWER command or we won't be able to Tx any frames */</div><div class='del'>-	ret = iwl_legacy_set_tx_power(priv, priv-&gt;tx_power_next, true);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "Error sending TX power (%d)\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl4965_hw_channel_switch(struct iwl_priv *priv,</div><div class='del'>-				     struct ieee80211_channel_switch *ch_switch)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-	int rc;</div><div class='del'>-	u8 band = 0;</div><div class='del'>-	bool is_ht40 = false;</div><div class='del'>-	u8 ctrl_chan_high = 0;</div><div class='del'>-	struct iwl4965_channel_switch_cmd cmd;</div><div class='del'>-	const struct iwl_channel_info *ch_info;</div><div class='del'>-	u32 switch_time_in_usec, ucode_switch_time;</div><div class='del'>-	u16 ch;</div><div class='del'>-	u32 tsf_low;</div><div class='del'>-	u8 switch_count;</div><div class='del'>-	u16 beacon_interval = le16_to_cpu(ctx-&gt;timing.beacon_interval);</div><div class='del'>-	struct ieee80211_vif *vif = ctx-&gt;vif;</div><div class='del'>-	band = priv-&gt;band == IEEE80211_BAND_2GHZ;</div><div class='del'>-</div><div class='del'>-	is_ht40 = iw4965_is_ht40_channel(ctx-&gt;staging.flags);</div><div class='del'>-</div><div class='del'>-	if (is_ht40 &amp;&amp;</div><div class='del'>-	    (ctx-&gt;staging.flags &amp; RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK))</div><div class='del'>-		ctrl_chan_high = 1;</div><div class='del'>-</div><div class='del'>-	cmd.band = band;</div><div class='del'>-	cmd.expect_beacon = 0;</div><div class='del'>-	ch = ch_switch-&gt;channel-&gt;hw_value;</div><div class='del'>-	cmd.channel = cpu_to_le16(ch);</div><div class='del'>-	cmd.rxon_flags = ctx-&gt;staging.flags;</div><div class='del'>-	cmd.rxon_filter_flags = ctx-&gt;staging.filter_flags;</div><div class='del'>-	switch_count = ch_switch-&gt;count;</div><div class='del'>-	tsf_low = ch_switch-&gt;timestamp &amp; 0x0ffffffff;</div><div class='del'>-	/*</div><div class='del'>-	 * calculate the ucode channel switch time</div><div class='del'>-	 * adding TSF as one of the factor for when to switch</div><div class='del'>-	 */</div><div class='del'>-	if ((priv-&gt;ucode_beacon_time &gt; tsf_low) &amp;&amp; beacon_interval) {</div><div class='del'>-		if (switch_count &gt; ((priv-&gt;ucode_beacon_time - tsf_low) /</div><div class='del'>-		    beacon_interval)) {</div><div class='del'>-			switch_count -= (priv-&gt;ucode_beacon_time -</div><div class='del'>-				tsf_low) / beacon_interval;</div><div class='del'>-		} else</div><div class='del'>-			switch_count = 0;</div><div class='del'>-	}</div><div class='del'>-	if (switch_count &lt;= 1)</div><div class='del'>-		cmd.switch_time = cpu_to_le32(priv-&gt;ucode_beacon_time);</div><div class='del'>-	else {</div><div class='del'>-		switch_time_in_usec =</div><div class='del'>-			vif-&gt;bss_conf.beacon_int * switch_count * TIME_UNIT;</div><div class='del'>-		ucode_switch_time = iwl_legacy_usecs_to_beacons(priv,</div><div class='del'>-							 switch_time_in_usec,</div><div class='del'>-							 beacon_interval);</div><div class='del'>-		cmd.switch_time = iwl_legacy_add_beacon_time(priv,</div><div class='del'>-						      priv-&gt;ucode_beacon_time,</div><div class='del'>-						      ucode_switch_time,</div><div class='del'>-						      beacon_interval);</div><div class='del'>-	}</div><div class='del'>-	IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n",</div><div class='del'>-		      cmd.switch_time);</div><div class='del'>-	ch_info = iwl_legacy_get_channel_info(priv, priv-&gt;band, ch);</div><div class='del'>-	if (ch_info)</div><div class='del'>-		cmd.expect_beacon = iwl_legacy_is_channel_radar(ch_info);</div><div class='del'>-	else {</div><div class='del'>-		IWL_ERR(priv, "invalid channel switch from %u to %u\n",</div><div class='del'>-			ctx-&gt;active.channel, ch);</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = iwl4965_fill_txpower_tbl(priv, band, ch, is_ht40,</div><div class='del'>-				      ctrl_chan_high, &amp;cmd.tx_power);</div><div class='del'>-	if (rc) {</div><div class='del'>-		IWL_DEBUG_11H(priv, "error:%d  fill txpower_tbl\n", rc);</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_send_cmd_pdu(priv,</div><div class='del'>-			 REPLY_CHANNEL_SWITCH, sizeof(cmd), &amp;cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array</div><div class='del'>- */</div><div class='del'>-static void iwl4965_txq_update_byte_cnt_tbl(struct iwl_priv *priv,</div><div class='del'>-					    struct iwl_tx_queue *txq,</div><div class='del'>-					    u16 byte_cnt)</div><div class='del'>-{</div><div class='del'>-	struct iwl4965_scd_bc_tbl *scd_bc_tbl = priv-&gt;scd_bc_tbls.addr;</div><div class='del'>-	int txq_id = txq-&gt;q.id;</div><div class='del'>-	int write_ptr = txq-&gt;q.write_ptr;</div><div class='del'>-	int len = byte_cnt + IWL_TX_CRC_SIZE + IWL_TX_DELIMITER_SIZE;</div><div class='del'>-	__le16 bc_ent;</div><div class='del'>-</div><div class='del'>-	WARN_ON(len &gt; 0xFFF || write_ptr &gt;= TFD_QUEUE_SIZE_MAX);</div><div class='del'>-</div><div class='del'>-	bc_ent = cpu_to_le16(len &amp; 0xFFF);</div><div class='del'>-	/* Set up byte count within first 256 entries */</div><div class='del'>-	scd_bc_tbl[txq_id].tfd_offset[write_ptr] = bc_ent;</div><div class='del'>-</div><div class='del'>-	/* If within first 64 entries, duplicate at end */</div><div class='del'>-	if (write_ptr &lt; TFD_QUEUE_SIZE_BC_DUP)</div><div class='del'>-		scd_bc_tbl[txq_id].</div><div class='del'>-			tfd_offset[TFD_QUEUE_SIZE_MAX + write_ptr] = bc_ent;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_hw_get_temperature - return the calibrated temperature (in Kelvin)</div><div class='del'>- * @statistics: Provides the temperature reading from the uCode</div><div class='del'>- *</div><div class='del'>- * A return of &lt;0 indicates bogus data in the statistics</div><div class='del'>- */</div><div class='del'>-static int iwl4965_hw_get_temperature(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	s32 temperature;</div><div class='del'>-	s32 vt;</div><div class='del'>-	s32 R1, R2, R3;</div><div class='del'>-	u32 R4;</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_TEMPERATURE, &amp;priv-&gt;status) &amp;&amp;</div><div class='del'>-	    (priv-&gt;_4965.statistics.flag &amp;</div><div class='del'>-			STATISTICS_REPLY_FLG_HT40_MODE_MSK)) {</div><div class='del'>-		IWL_DEBUG_TEMP(priv, "Running HT40 temperature calibration\n");</div><div class='del'>-		R1 = (s32)le32_to_cpu(priv-&gt;card_alive_init.therm_r1[1]);</div><div class='del'>-		R2 = (s32)le32_to_cpu(priv-&gt;card_alive_init.therm_r2[1]);</div><div class='del'>-		R3 = (s32)le32_to_cpu(priv-&gt;card_alive_init.therm_r3[1]);</div><div class='del'>-		R4 = le32_to_cpu(priv-&gt;card_alive_init.therm_r4[1]);</div><div class='del'>-	} else {</div><div class='del'>-		IWL_DEBUG_TEMP(priv, "Running temperature calibration\n");</div><div class='del'>-		R1 = (s32)le32_to_cpu(priv-&gt;card_alive_init.therm_r1[0]);</div><div class='del'>-		R2 = (s32)le32_to_cpu(priv-&gt;card_alive_init.therm_r2[0]);</div><div class='del'>-		R3 = (s32)le32_to_cpu(priv-&gt;card_alive_init.therm_r3[0]);</div><div class='del'>-		R4 = le32_to_cpu(priv-&gt;card_alive_init.therm_r4[0]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Temperature is only 23 bits, so sign extend out to 32.</div><div class='del'>-	 *</div><div class='del'>-	 * NOTE If we haven't received a statistics notification yet</div><div class='del'>-	 * with an updated temperature, use R4 provided to us in the</div><div class='del'>-	 * "initialize" ALIVE response.</div><div class='del'>-	 */</div><div class='del'>-	if (!test_bit(STATUS_TEMPERATURE, &amp;priv-&gt;status))</div><div class='del'>-		vt = sign_extend32(R4, 23);</div><div class='del'>-	else</div><div class='del'>-		vt = sign_extend32(le32_to_cpu(priv-&gt;_4965.statistics.</div><div class='del'>-				 general.common.temperature), 23);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TEMP(priv, "Calib values R[1-3]: %d %d %d R4: %d\n", R1, R2, R3, vt);</div><div class='del'>-</div><div class='del'>-	if (R3 == R1) {</div><div class='del'>-		IWL_ERR(priv, "Calibration conflict R1 == R3\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate temperature in degrees Kelvin, adjust by 97%.</div><div class='del'>-	 * Add offset to center the adjustment around 0 degrees Centigrade. */</div><div class='del'>-	temperature = TEMPERATURE_CALIB_A_VAL * (vt - R2);</div><div class='del'>-	temperature /= (R3 - R1);</div><div class='del'>-	temperature = (temperature * 97) / 100 + TEMPERATURE_CALIB_KELVIN_OFFSET;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TEMP(priv, "Calibrated temperature: %dK, %dC\n",</div><div class='del'>-			temperature, KELVIN_TO_CELSIUS(temperature));</div><div class='del'>-</div><div class='del'>-	return temperature;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adjust Txpower only if temperature variance is greater than threshold. */</div><div class='del'>-#define IWL_TEMPERATURE_THRESHOLD   3</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_is_temp_calib_needed - determines if new calibration is needed</div><div class='del'>- *</div><div class='del'>- * If the temperature changed has changed sufficiently, then a recalibration</div><div class='del'>- * is needed.</div><div class='del'>- *</div><div class='del'>- * Assumes caller will replace priv-&gt;last_temperature once calibration</div><div class='del'>- * executed.</div><div class='del'>- */</div><div class='del'>-static int iwl4965_is_temp_calib_needed(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int temp_diff;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(STATUS_STATISTICS, &amp;priv-&gt;status)) {</div><div class='del'>-		IWL_DEBUG_TEMP(priv, "Temperature not updated -- no statistics.\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	temp_diff = priv-&gt;temperature - priv-&gt;last_temperature;</div><div class='del'>-</div><div class='del'>-	/* get absolute value */</div><div class='del'>-	if (temp_diff &lt; 0) {</div><div class='del'>-		IWL_DEBUG_POWER(priv, "Getting cooler, delta %d\n", temp_diff);</div><div class='del'>-		temp_diff = -temp_diff;</div><div class='del'>-	} else if (temp_diff == 0)</div><div class='del'>-		IWL_DEBUG_POWER(priv, "Temperature unchanged\n");</div><div class='del'>-	else</div><div class='del'>-		IWL_DEBUG_POWER(priv, "Getting warmer, delta %d\n", temp_diff);</div><div class='del'>-</div><div class='del'>-	if (temp_diff &lt; IWL_TEMPERATURE_THRESHOLD) {</div><div class='del'>-		IWL_DEBUG_POWER(priv, " =&gt; thermal txpower calib not needed\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_POWER(priv, " =&gt; thermal txpower calib needed\n");</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_temperature_calib(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	s32 temp;</div><div class='del'>-</div><div class='del'>-	temp = iwl4965_hw_get_temperature(priv);</div><div class='del'>-	if (IWL_TX_POWER_TEMPERATURE_OUT_OF_RANGE(temp))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;temperature != temp) {</div><div class='del'>-		if (priv-&gt;temperature)</div><div class='del'>-			IWL_DEBUG_TEMP(priv, "Temperature changed "</div><div class='del'>-				       "from %dC to %dC\n",</div><div class='del'>-				       KELVIN_TO_CELSIUS(priv-&gt;temperature),</div><div class='del'>-				       KELVIN_TO_CELSIUS(temp));</div><div class='del'>-		else</div><div class='del'>-			IWL_DEBUG_TEMP(priv, "Temperature "</div><div class='del'>-				       "initialized to %dC\n",</div><div class='del'>-				       KELVIN_TO_CELSIUS(temp));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;temperature = temp;</div><div class='del'>-	set_bit(STATUS_TEMPERATURE, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;disable_tx_power_cal &amp;&amp;</div><div class='del'>-	     unlikely(!test_bit(STATUS_SCANNING, &amp;priv-&gt;status)) &amp;&amp;</div><div class='del'>-	     iwl4965_is_temp_calib_needed(priv))</div><div class='del'>-		queue_work(priv-&gt;workqueue, &amp;priv-&gt;txpower_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u16 iwl4965_get_hcmd_size(u8 cmd_id, u16 len)</div><div class='del'>-{</div><div class='del'>-	switch (cmd_id) {</div><div class='del'>-	case REPLY_RXON:</div><div class='del'>-		return (u16) sizeof(struct iwl4965_rxon_cmd);</div><div class='del'>-	default:</div><div class='del'>-		return len;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u16 iwl4965_build_addsta_hcmd(const struct iwl_legacy_addsta_cmd *cmd,</div><div class='del'>-								u8 *data)</div><div class='del'>-{</div><div class='del'>-	struct iwl4965_addsta_cmd *addsta = (struct iwl4965_addsta_cmd *)data;</div><div class='del'>-	addsta-&gt;mode = cmd-&gt;mode;</div><div class='del'>-	memcpy(&amp;addsta-&gt;sta, &amp;cmd-&gt;sta, sizeof(struct sta_id_modify));</div><div class='del'>-	memcpy(&amp;addsta-&gt;key, &amp;cmd-&gt;key, sizeof(struct iwl4965_keyinfo));</div><div class='del'>-	addsta-&gt;station_flags = cmd-&gt;station_flags;</div><div class='del'>-	addsta-&gt;station_flags_msk = cmd-&gt;station_flags_msk;</div><div class='del'>-	addsta-&gt;tid_disable_tx = cmd-&gt;tid_disable_tx;</div><div class='del'>-	addsta-&gt;add_immediate_ba_tid = cmd-&gt;add_immediate_ba_tid;</div><div class='del'>-	addsta-&gt;remove_immediate_ba_tid = cmd-&gt;remove_immediate_ba_tid;</div><div class='del'>-	addsta-&gt;add_immediate_ba_ssn = cmd-&gt;add_immediate_ba_ssn;</div><div class='del'>-	addsta-&gt;sleep_tx_count = cmd-&gt;sleep_tx_count;</div><div class='del'>-	addsta-&gt;reserved1 = cpu_to_le16(0);</div><div class='del'>-	addsta-&gt;reserved2 = cpu_to_le16(0);</div><div class='del'>-</div><div class='del'>-	return (u16)sizeof(struct iwl4965_addsta_cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 iwl4965_get_scd_ssn(struct iwl4965_tx_resp *tx_resp)</div><div class='del'>-{</div><div class='del'>-	return le32_to_cpup(&amp;tx_resp-&gt;u.status + tx_resp-&gt;frame_count) &amp; MAX_SN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_tx_status_reply_tx - Handle Tx response for frames in aggregation queue</div><div class='del'>- */</div><div class='del'>-static int iwl4965_tx_status_reply_tx(struct iwl_priv *priv,</div><div class='del'>-				      struct iwl_ht_agg *agg,</div><div class='del'>-				      struct iwl4965_tx_resp *tx_resp,</div><div class='del'>-				      int txq_id, u16 start_idx)</div><div class='del'>-{</div><div class='del'>-	u16 status;</div><div class='del'>-	struct agg_tx_status *frame_status = tx_resp-&gt;u.agg_status;</div><div class='del'>-	struct ieee80211_tx_info *info = NULL;</div><div class='del'>-	struct ieee80211_hdr *hdr = NULL;</div><div class='del'>-	u32 rate_n_flags = le32_to_cpu(tx_resp-&gt;rate_n_flags);</div><div class='del'>-	int i, sh, idx;</div><div class='del'>-	u16 seq;</div><div class='del'>-	if (agg-&gt;wait_for_ba)</div><div class='del'>-		IWL_DEBUG_TX_REPLY(priv, "got tx response w/o block-ack\n");</div><div class='del'>-</div><div class='del'>-	agg-&gt;frame_count = tx_resp-&gt;frame_count;</div><div class='del'>-	agg-&gt;start_idx = start_idx;</div><div class='del'>-	agg-&gt;rate_n_flags = rate_n_flags;</div><div class='del'>-	agg-&gt;bitmap = 0;</div><div class='del'>-</div><div class='del'>-	/* num frames attempted by Tx command */</div><div class='del'>-	if (agg-&gt;frame_count == 1) {</div><div class='del'>-		/* Only one frame was attempted; no block-ack will arrive */</div><div class='del'>-		status = le16_to_cpu(frame_status[0].status);</div><div class='del'>-		idx = start_idx;</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_TX_REPLY(priv, "FrameCnt = %d, StartIdx=%d idx=%d\n",</div><div class='del'>-				   agg-&gt;frame_count, agg-&gt;start_idx, idx);</div><div class='del'>-</div><div class='del'>-		info = IEEE80211_SKB_CB(priv-&gt;txq[txq_id].txb[idx].skb);</div><div class='del'>-		info-&gt;status.rates[0].count = tx_resp-&gt;failure_frame + 1;</div><div class='del'>-		info-&gt;flags &amp;= ~IEEE80211_TX_CTL_AMPDU;</div><div class='del'>-		info-&gt;flags |= iwl4965_tx_status_to_mac80211(status);</div><div class='del'>-		iwl4965_hwrate_to_tx_control(priv, rate_n_flags, info);</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_TX_REPLY(priv, "1 Frame 0x%x failure :%d\n",</div><div class='del'>-				    status &amp; 0xff, tx_resp-&gt;failure_frame);</div><div class='del'>-		IWL_DEBUG_TX_REPLY(priv, "Rate Info rate_n_flags=%x\n", rate_n_flags);</div><div class='del'>-</div><div class='del'>-		agg-&gt;wait_for_ba = 0;</div><div class='del'>-	} else {</div><div class='del'>-		/* Two or more frames were attempted; expect block-ack */</div><div class='del'>-		u64 bitmap = 0;</div><div class='del'>-		int start = agg-&gt;start_idx;</div><div class='del'>-</div><div class='del'>-		/* Construct bit-map of pending frames within Tx window */</div><div class='del'>-		for (i = 0; i &lt; agg-&gt;frame_count; i++) {</div><div class='del'>-			u16 sc;</div><div class='del'>-			status = le16_to_cpu(frame_status[i].status);</div><div class='del'>-			seq  = le16_to_cpu(frame_status[i].sequence);</div><div class='del'>-			idx = SEQ_TO_INDEX(seq);</div><div class='del'>-			txq_id = SEQ_TO_QUEUE(seq);</div><div class='del'>-</div><div class='del'>-			if (status &amp; (AGG_TX_STATE_FEW_BYTES_MSK |</div><div class='del'>-				      AGG_TX_STATE_ABORT_MSK))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			IWL_DEBUG_TX_REPLY(priv, "FrameCnt = %d, txq_id=%d idx=%d\n",</div><div class='del'>-					   agg-&gt;frame_count, txq_id, idx);</div><div class='del'>-</div><div class='del'>-			hdr = iwl_legacy_tx_queue_get_hdr(priv, txq_id, idx);</div><div class='del'>-			if (!hdr) {</div><div class='del'>-				IWL_ERR(priv,</div><div class='del'>-					"BUG_ON idx doesn't point to valid skb"</div><div class='del'>-					" idx=%d, txq_id=%d\n", idx, txq_id);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			sc = le16_to_cpu(hdr-&gt;seq_ctrl);</div><div class='del'>-			if (idx != (SEQ_TO_SN(sc) &amp; 0xff)) {</div><div class='del'>-				IWL_ERR(priv,</div><div class='del'>-					"BUG_ON idx doesn't match seq control"</div><div class='del'>-					" idx=%d, seq_idx=%d, seq=%d\n",</div><div class='del'>-					idx, SEQ_TO_SN(sc), hdr-&gt;seq_ctrl);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			IWL_DEBUG_TX_REPLY(priv, "AGG Frame i=%d idx %d seq=%d\n",</div><div class='del'>-					   i, idx, SEQ_TO_SN(sc));</div><div class='del'>-</div><div class='del'>-			sh = idx - start;</div><div class='del'>-			if (sh &gt; 64) {</div><div class='del'>-				sh = (start - idx) + 0xff;</div><div class='del'>-				bitmap = bitmap &lt;&lt; sh;</div><div class='del'>-				sh = 0;</div><div class='del'>-				start = idx;</div><div class='del'>-			} else if (sh &lt; -64)</div><div class='del'>-				sh  = 0xff - (start - idx);</div><div class='del'>-			else if (sh &lt; 0) {</div><div class='del'>-				sh = start - idx;</div><div class='del'>-				start = idx;</div><div class='del'>-				bitmap = bitmap &lt;&lt; sh;</div><div class='del'>-				sh = 0;</div><div class='del'>-			}</div><div class='del'>-			bitmap |= 1ULL &lt;&lt; sh;</div><div class='del'>-			IWL_DEBUG_TX_REPLY(priv, "start=%d bitmap=0x%llx\n",</div><div class='del'>-					   start, (unsigned long long)bitmap);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		agg-&gt;bitmap = bitmap;</div><div class='del'>-		agg-&gt;start_idx = start;</div><div class='del'>-		IWL_DEBUG_TX_REPLY(priv, "Frames %d start_idx=%d bitmap=0x%llx\n",</div><div class='del'>-				   agg-&gt;frame_count, agg-&gt;start_idx,</div><div class='del'>-				   (unsigned long long)agg-&gt;bitmap);</div><div class='del'>-</div><div class='del'>-		if (bitmap)</div><div class='del'>-			agg-&gt;wait_for_ba = 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 iwl4965_find_station(struct iwl_priv *priv, const u8 *addr)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int start = 0;</div><div class='del'>-	int ret = IWL_INVALID_STATION;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if ((priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC))</div><div class='del'>-		start = IWL_STA_ID;</div><div class='del'>-</div><div class='del'>-	if (is_broadcast_ether_addr(addr))</div><div class='del'>-		return priv-&gt;contexts[IWL_RXON_CTX_BSS].bcast_sta_id;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	for (i = start; i &lt; priv-&gt;hw_params.max_stations; i++)</div><div class='del'>-		if (priv-&gt;stations[i].used &amp;&amp;</div><div class='del'>-		    (!compare_ether_addr(priv-&gt;stations[i].sta.sta.addr,</div><div class='del'>-					 addr))) {</div><div class='del'>-			ret = i;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_ASSOC_LIMIT(priv, "can not find STA %pM total %d\n",</div><div class='del'>-			      addr, priv-&gt;num_stations);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	/*</div><div class='del'>-	 * It may be possible that more commands interacting with stations</div><div class='del'>-	 * arrive before we completed processing the adding of</div><div class='del'>-	 * station</div><div class='del'>-	 */</div><div class='del'>-	if (ret != IWL_INVALID_STATION &amp;&amp;</div><div class='del'>-	    (!(priv-&gt;stations[ret].used &amp; IWL_STA_UCODE_ACTIVE) ||</div><div class='del'>-	     ((priv-&gt;stations[ret].used &amp; IWL_STA_UCODE_ACTIVE) &amp;&amp;</div><div class='del'>-	      (priv-&gt;stations[ret].used &amp; IWL_STA_UCODE_INPROGRESS)))) {</div><div class='del'>-		IWL_ERR(priv, "Requested station info for sta %d before ready.\n",</div><div class='del'>-			ret);</div><div class='del'>-		ret = IWL_INVALID_STATION;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl4965_get_ra_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)</div><div class='del'>-{</div><div class='del'>-	if (priv-&gt;iw_mode == NL80211_IFTYPE_STATION) {</div><div class='del'>-		return IWL_AP_ID;</div><div class='del'>-	} else {</div><div class='del'>-		u8 *da = ieee80211_get_DA(hdr);</div><div class='del'>-		return iwl4965_find_station(priv, da);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_rx_reply_tx - Handle standard (non-aggregation) Tx response</div><div class='del'>- */</div><div class='del'>-static void iwl4965_rx_reply_tx(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	u16 sequence = le16_to_cpu(pkt-&gt;hdr.sequence);</div><div class='del'>-	int txq_id = SEQ_TO_QUEUE(sequence);</div><div class='del'>-	int index = SEQ_TO_INDEX(sequence);</div><div class='del'>-	struct iwl_tx_queue *txq = &amp;priv-&gt;txq[txq_id];</div><div class='del'>-	struct ieee80211_hdr *hdr;</div><div class='del'>-	struct ieee80211_tx_info *info;</div><div class='del'>-	struct iwl4965_tx_resp *tx_resp = (void *)&amp;pkt-&gt;u.raw[0];</div><div class='del'>-	u32  status = le32_to_cpu(tx_resp-&gt;u.status);</div><div class='del'>-	int uninitialized_var(tid);</div><div class='del'>-	int sta_id;</div><div class='del'>-	int freed;</div><div class='del'>-	u8 *qc = NULL;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if ((index &gt;= txq-&gt;q.n_bd) || (iwl_legacy_queue_used(&amp;txq-&gt;q, index) == 0)) {</div><div class='del'>-		IWL_ERR(priv, "Read index for DMA queue txq_id (%d) index %d "</div><div class='del'>-			  "is out of range [0-%d] %d %d\n", txq_id,</div><div class='del'>-			  index, txq-&gt;q.n_bd, txq-&gt;q.write_ptr,</div><div class='del'>-			  txq-&gt;q.read_ptr);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	txq-&gt;time_stamp = jiffies;</div><div class='del'>-	info = IEEE80211_SKB_CB(txq-&gt;txb[txq-&gt;q.read_ptr].skb);</div><div class='del'>-	memset(&amp;info-&gt;status, 0, sizeof(info-&gt;status));</div><div class='del'>-</div><div class='del'>-	hdr = iwl_legacy_tx_queue_get_hdr(priv, txq_id, index);</div><div class='del'>-	if (ieee80211_is_data_qos(hdr-&gt;frame_control)) {</div><div class='del'>-		qc = ieee80211_get_qos_ctl(hdr);</div><div class='del'>-		tid = qc[0] &amp; 0xf;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sta_id = iwl4965_get_ra_sta_id(priv, hdr);</div><div class='del'>-	if (txq-&gt;sched_retry &amp;&amp; unlikely(sta_id == IWL_INVALID_STATION)) {</div><div class='del'>-		IWL_ERR(priv, "Station not known\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	if (txq-&gt;sched_retry) {</div><div class='del'>-		const u32 scd_ssn = iwl4965_get_scd_ssn(tx_resp);</div><div class='del'>-		struct iwl_ht_agg *agg = NULL;</div><div class='del'>-		WARN_ON(!qc);</div><div class='del'>-</div><div class='del'>-		agg = &amp;priv-&gt;stations[sta_id].tid[tid].agg;</div><div class='del'>-</div><div class='del'>-		iwl4965_tx_status_reply_tx(priv, agg, tx_resp, txq_id, index);</div><div class='del'>-</div><div class='del'>-		/* check if BAR is needed */</div><div class='del'>-		if ((tx_resp-&gt;frame_count == 1) &amp;&amp; !iwl4965_is_tx_success(status))</div><div class='del'>-			info-&gt;flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;</div><div class='del'>-</div><div class='del'>-		if (txq-&gt;q.read_ptr != (scd_ssn &amp; 0xff)) {</div><div class='del'>-			index = iwl_legacy_queue_dec_wrap(scd_ssn &amp; 0xff,</div><div class='del'>-								txq-&gt;q.n_bd);</div><div class='del'>-			IWL_DEBUG_TX_REPLY(priv, "Retry scheduler reclaim scd_ssn "</div><div class='del'>-					   "%d index %d\n", scd_ssn , index);</div><div class='del'>-			freed = iwl4965_tx_queue_reclaim(priv, txq_id, index);</div><div class='del'>-			if (qc)</div><div class='del'>-				iwl4965_free_tfds_in_queue(priv, sta_id,</div><div class='del'>-						       tid, freed);</div><div class='del'>-</div><div class='del'>-			if (priv-&gt;mac80211_registered &amp;&amp;</div><div class='del'>-			    (iwl_legacy_queue_space(&amp;txq-&gt;q) &gt; txq-&gt;q.low_mark)</div><div class='del'>-				 &amp;&amp; (agg-&gt;state != IWL_EMPTYING_HW_QUEUE_DELBA))</div><div class='del'>-				iwl_legacy_wake_queue(priv, txq);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		info-&gt;status.rates[0].count = tx_resp-&gt;failure_frame + 1;</div><div class='del'>-		info-&gt;flags |= iwl4965_tx_status_to_mac80211(status);</div><div class='del'>-		iwl4965_hwrate_to_tx_control(priv,</div><div class='del'>-					le32_to_cpu(tx_resp-&gt;rate_n_flags),</div><div class='del'>-					info);</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_TX_REPLY(priv, "TXQ %d status %s (0x%08x) "</div><div class='del'>-				   "rate_n_flags 0x%x retries %d\n",</div><div class='del'>-				   txq_id,</div><div class='del'>-				   iwl4965_get_tx_fail_reason(status), status,</div><div class='del'>-				   le32_to_cpu(tx_resp-&gt;rate_n_flags),</div><div class='del'>-				   tx_resp-&gt;failure_frame);</div><div class='del'>-</div><div class='del'>-		freed = iwl4965_tx_queue_reclaim(priv, txq_id, index);</div><div class='del'>-		if (qc &amp;&amp; likely(sta_id != IWL_INVALID_STATION))</div><div class='del'>-			iwl4965_free_tfds_in_queue(priv, sta_id, tid, freed);</div><div class='del'>-		else if (sta_id == IWL_INVALID_STATION)</div><div class='del'>-			IWL_DEBUG_TX_REPLY(priv, "Station not known\n");</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;mac80211_registered &amp;&amp;</div><div class='del'>-		    (iwl_legacy_queue_space(&amp;txq-&gt;q) &gt; txq-&gt;q.low_mark))</div><div class='del'>-			iwl_legacy_wake_queue(priv, txq);</div><div class='del'>-	}</div><div class='del'>-	if (qc &amp;&amp; likely(sta_id != IWL_INVALID_STATION))</div><div class='del'>-		iwl4965_txq_check_empty(priv, sta_id, tid, txq_id);</div><div class='del'>-</div><div class='del'>-	iwl4965_check_abort_status(priv, tx_resp-&gt;frame_count, status);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_rx_beacon_notif(struct iwl_priv *priv,</div><div class='del'>-				    struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl4965_beacon_notif *beacon = (void *)pkt-&gt;u.raw;</div><div class='del'>-	u8 rate __maybe_unused =</div><div class='del'>-		iwl4965_hw_get_rate(beacon-&gt;beacon_notify_hdr.rate_n_flags);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RX(priv, "beacon status %#x, retries:%d ibssmgr:%d "</div><div class='del'>-		"tsf:0x%.8x%.8x rate:%d\n",</div><div class='del'>-		le32_to_cpu(beacon-&gt;beacon_notify_hdr.u.status) &amp; TX_STATUS_MSK,</div><div class='del'>-		beacon-&gt;beacon_notify_hdr.failure_frame,</div><div class='del'>-		le32_to_cpu(beacon-&gt;ibss_mgr_status),</div><div class='del'>-		le32_to_cpu(beacon-&gt;high_tsf),</div><div class='del'>-		le32_to_cpu(beacon-&gt;low_tsf), rate);</div><div class='del'>-</div><div class='del'>-	priv-&gt;ibss_manager = le32_to_cpu(beacon-&gt;ibss_mgr_status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set up 4965-specific Rx frame reply handlers */</div><div class='del'>-static void iwl4965_rx_handler_setup(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	/* Legacy Rx frames */</div><div class='del'>-	priv-&gt;rx_handlers[REPLY_RX] = iwl4965_rx_reply_rx;</div><div class='del'>-	/* Tx response */</div><div class='del'>-	priv-&gt;rx_handlers[REPLY_TX] = iwl4965_rx_reply_tx;</div><div class='del'>-	priv-&gt;rx_handlers[BEACON_NOTIFICATION] = iwl4965_rx_beacon_notif;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct iwl_hcmd_ops iwl4965_hcmd = {</div><div class='del'>-	.rxon_assoc = iwl4965_send_rxon_assoc,</div><div class='del'>-	.commit_rxon = iwl4965_commit_rxon,</div><div class='del'>-	.set_rxon_chain = iwl4965_set_rxon_chain,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void iwl4965_post_scan(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Since setting the RXON may have been deferred while</div><div class='del'>-	 * performing the scan, fire one off if needed</div><div class='del'>-	 */</div><div class='del'>-	if (memcmp(&amp;ctx-&gt;staging, &amp;ctx-&gt;active, sizeof(ctx-&gt;staging)))</div><div class='del'>-		iwl_legacy_commit_rxon(priv, ctx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_post_associate(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-	struct ieee80211_vif *vif = ctx-&gt;vif;</div><div class='del'>-	struct ieee80211_conf *conf = NULL;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (!vif || !priv-&gt;is_open)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_scan_cancel_timeout(priv, 200);</div><div class='del'>-</div><div class='del'>-	conf = iwl_legacy_ieee80211_get_hw_conf(priv-&gt;hw);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;staging.filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='del'>-	iwl_legacy_commit_rxon(priv, ctx);</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_send_rxon_timing(priv, ctx);</div><div class='del'>-	if (ret)</div><div class='del'>-		IWL_WARN(priv, "RXON timing - "</div><div class='del'>-			    "Attempting to continue.\n");</div><div class='del'>-</div><div class='del'>-	ctx-&gt;staging.filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_set_rxon_ht(priv, &amp;priv-&gt;current_ht_config);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain)</div><div class='del'>-		priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain(priv, ctx);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;staging.assoc_id = cpu_to_le16(vif-&gt;bss_conf.aid);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_ASSOC(priv, "assoc id %d beacon interval %d\n",</div><div class='del'>-			vif-&gt;bss_conf.aid, vif-&gt;bss_conf.beacon_int);</div><div class='del'>-</div><div class='del'>-	if (vif-&gt;bss_conf.use_short_preamble)</div><div class='del'>-		ctx-&gt;staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='del'>-	else</div><div class='del'>-		ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;staging.flags &amp; RXON_FLG_BAND_24G_MSK) {</div><div class='del'>-		if (vif-&gt;bss_conf.use_short_slot)</div><div class='del'>-			ctx-&gt;staging.flags |= RXON_FLG_SHORT_SLOT_MSK;</div><div class='del'>-		else</div><div class='del'>-			ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_SLOT_MSK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_legacy_commit_rxon(priv, ctx);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_ASSOC(priv, "Associated as %d to: %pM\n",</div><div class='del'>-			vif-&gt;bss_conf.aid, ctx-&gt;active.bssid_addr);</div><div class='del'>-</div><div class='del'>-	switch (vif-&gt;type) {</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		iwl4965_send_beacon_cmd(priv);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		IWL_ERR(priv, "%s Should not be called in %d mode\n",</div><div class='del'>-			  __func__, vif-&gt;type);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* the chain noise calibration will enabled PM upon completion</div><div class='del'>-	 * If chain noise has already been run, then we need to enable</div><div class='del'>-	 * power management here */</div><div class='del'>-	if (priv-&gt;chain_noise_data.state == IWL_CHAIN_NOISE_DONE)</div><div class='del'>-		iwl_legacy_power_update_mode(priv, false);</div><div class='del'>-</div><div class='del'>-	/* Enable Rx differential gain and sensitivity calibrations */</div><div class='del'>-	iwl4965_chain_noise_reset(priv);</div><div class='del'>-	priv-&gt;start_calib = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_config_ap(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-	struct ieee80211_vif *vif = ctx-&gt;vif;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* The following should be done only at AP bring up */</div><div class='del'>-	if (!iwl_legacy_is_associated_ctx(ctx)) {</div><div class='del'>-</div><div class='del'>-		/* RXON - unassoc (to set timing command) */</div><div class='del'>-		ctx-&gt;staging.filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='del'>-		iwl_legacy_commit_rxon(priv, ctx);</div><div class='del'>-</div><div class='del'>-		/* RXON Timing */</div><div class='del'>-		ret = iwl_legacy_send_rxon_timing(priv, ctx);</div><div class='del'>-		if (ret)</div><div class='del'>-			IWL_WARN(priv, "RXON timing failed - "</div><div class='del'>-					"Attempting to continue.\n");</div><div class='del'>-</div><div class='del'>-		/* AP has all antennas */</div><div class='del'>-		priv-&gt;chain_noise_data.active_chains =</div><div class='del'>-			priv-&gt;hw_params.valid_rx_ant;</div><div class='del'>-		iwl_legacy_set_rxon_ht(priv, &amp;priv-&gt;current_ht_config);</div><div class='del'>-		if (priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain)</div><div class='del'>-			priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain(priv, ctx);</div><div class='del'>-</div><div class='del'>-		ctx-&gt;staging.assoc_id = 0;</div><div class='del'>-</div><div class='del'>-		if (vif-&gt;bss_conf.use_short_preamble)</div><div class='del'>-			ctx-&gt;staging.flags |=</div><div class='del'>-				RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='del'>-		else</div><div class='del'>-			ctx-&gt;staging.flags &amp;=</div><div class='del'>-				~RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='del'>-</div><div class='del'>-		if (ctx-&gt;staging.flags &amp; RXON_FLG_BAND_24G_MSK) {</div><div class='del'>-			if (vif-&gt;bss_conf.use_short_slot)</div><div class='del'>-				ctx-&gt;staging.flags |=</div><div class='del'>-					RXON_FLG_SHORT_SLOT_MSK;</div><div class='del'>-			else</div><div class='del'>-				ctx-&gt;staging.flags &amp;=</div><div class='del'>-					~RXON_FLG_SHORT_SLOT_MSK;</div><div class='del'>-		}</div><div class='del'>-		/* need to send beacon cmd before committing assoc RXON! */</div><div class='del'>-		iwl4965_send_beacon_cmd(priv);</div><div class='del'>-		/* restore RXON assoc */</div><div class='del'>-		ctx-&gt;staging.filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='del'>-		iwl_legacy_commit_rxon(priv, ctx);</div><div class='del'>-	}</div><div class='del'>-	iwl4965_send_beacon_cmd(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct iwl_hcmd_utils_ops iwl4965_hcmd_utils = {</div><div class='del'>-	.get_hcmd_size = iwl4965_get_hcmd_size,</div><div class='del'>-	.build_addsta_hcmd = iwl4965_build_addsta_hcmd,</div><div class='del'>-	.request_scan = iwl4965_request_scan,</div><div class='del'>-	.post_scan = iwl4965_post_scan,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct iwl_lib_ops iwl4965_lib = {</div><div class='del'>-	.set_hw_params = iwl4965_hw_set_hw_params,</div><div class='del'>-	.txq_update_byte_cnt_tbl = iwl4965_txq_update_byte_cnt_tbl,</div><div class='del'>-	.txq_attach_buf_to_tfd = iwl4965_hw_txq_attach_buf_to_tfd,</div><div class='del'>-	.txq_free_tfd = iwl4965_hw_txq_free_tfd,</div><div class='del'>-	.txq_init = iwl4965_hw_tx_queue_init,</div><div class='del'>-	.rx_handler_setup = iwl4965_rx_handler_setup,</div><div class='del'>-	.is_valid_rtc_data_addr = iwl4965_hw_valid_rtc_data_addr,</div><div class='del'>-	.init_alive_start = iwl4965_init_alive_start,</div><div class='del'>-	.load_ucode = iwl4965_load_bsm,</div><div class='del'>-	.dump_nic_error_log = iwl4965_dump_nic_error_log,</div><div class='del'>-	.dump_fh = iwl4965_dump_fh,</div><div class='del'>-	.set_channel_switch = iwl4965_hw_channel_switch,</div><div class='del'>-	.apm_ops = {</div><div class='del'>-		.init = iwl_legacy_apm_init,</div><div class='del'>-		.config = iwl4965_nic_config,</div><div class='del'>-	},</div><div class='del'>-	.eeprom_ops = {</div><div class='del'>-		.regulatory_bands = {</div><div class='del'>-			EEPROM_REGULATORY_BAND_1_CHANNELS,</div><div class='del'>-			EEPROM_REGULATORY_BAND_2_CHANNELS,</div><div class='del'>-			EEPROM_REGULATORY_BAND_3_CHANNELS,</div><div class='del'>-			EEPROM_REGULATORY_BAND_4_CHANNELS,</div><div class='del'>-			EEPROM_REGULATORY_BAND_5_CHANNELS,</div><div class='del'>-			EEPROM_4965_REGULATORY_BAND_24_HT40_CHANNELS,</div><div class='del'>-			EEPROM_4965_REGULATORY_BAND_52_HT40_CHANNELS</div><div class='del'>-		},</div><div class='del'>-		.acquire_semaphore = iwl4965_eeprom_acquire_semaphore,</div><div class='del'>-		.release_semaphore = iwl4965_eeprom_release_semaphore,</div><div class='del'>-	},</div><div class='del'>-	.send_tx_power	= iwl4965_send_tx_power,</div><div class='del'>-	.update_chain_flags = iwl4965_update_chain_flags,</div><div class='del'>-	.temp_ops = {</div><div class='del'>-		.temperature = iwl4965_temperature_calib,</div><div class='del'>-	},</div><div class='del'>-	.debugfs_ops = {</div><div class='del'>-		.rx_stats_read = iwl4965_ucode_rx_stats_read,</div><div class='del'>-		.tx_stats_read = iwl4965_ucode_tx_stats_read,</div><div class='del'>-		.general_stats_read = iwl4965_ucode_general_stats_read,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct iwl_legacy_ops iwl4965_legacy_ops = {</div><div class='del'>-	.post_associate = iwl4965_post_associate,</div><div class='del'>-	.config_ap = iwl4965_config_ap,</div><div class='del'>-	.manage_ibss_station = iwl4965_manage_ibss_station,</div><div class='del'>-	.update_bcast_stations = iwl4965_update_bcast_stations,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ieee80211_ops iwl4965_hw_ops = {</div><div class='del'>-	.tx = iwl4965_mac_tx,</div><div class='del'>-	.start = iwl4965_mac_start,</div><div class='del'>-	.stop = iwl4965_mac_stop,</div><div class='del'>-	.add_interface = iwl_legacy_mac_add_interface,</div><div class='del'>-	.remove_interface = iwl_legacy_mac_remove_interface,</div><div class='del'>-	.change_interface = iwl_legacy_mac_change_interface,</div><div class='del'>-	.config = iwl_legacy_mac_config,</div><div class='del'>-	.configure_filter = iwl4965_configure_filter,</div><div class='del'>-	.set_key = iwl4965_mac_set_key,</div><div class='del'>-	.update_tkip_key = iwl4965_mac_update_tkip_key,</div><div class='del'>-	.conf_tx = iwl_legacy_mac_conf_tx,</div><div class='del'>-	.reset_tsf = iwl_legacy_mac_reset_tsf,</div><div class='del'>-	.bss_info_changed = iwl_legacy_mac_bss_info_changed,</div><div class='del'>-	.ampdu_action = iwl4965_mac_ampdu_action,</div><div class='del'>-	.hw_scan = iwl_legacy_mac_hw_scan,</div><div class='del'>-	.sta_add = iwl4965_mac_sta_add,</div><div class='del'>-	.sta_remove = iwl_legacy_mac_sta_remove,</div><div class='del'>-	.channel_switch = iwl4965_mac_channel_switch,</div><div class='del'>-	.tx_last_beacon = iwl_legacy_mac_tx_last_beacon,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct iwl_ops iwl4965_ops = {</div><div class='del'>-	.lib = &amp;iwl4965_lib,</div><div class='del'>-	.hcmd = &amp;iwl4965_hcmd,</div><div class='del'>-	.utils = &amp;iwl4965_hcmd_utils,</div><div class='del'>-	.led = &amp;iwl4965_led_ops,</div><div class='del'>-	.legacy = &amp;iwl4965_legacy_ops,</div><div class='del'>-	.ieee80211_ops = &amp;iwl4965_hw_ops,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct iwl_base_params iwl4965_base_params = {</div><div class='del'>-	.eeprom_size = IWL4965_EEPROM_IMG_SIZE,</div><div class='del'>-	.num_of_queues = IWL49_NUM_QUEUES,</div><div class='del'>-	.num_of_ampdu_queues = IWL49_NUM_AMPDU_QUEUES,</div><div class='del'>-	.pll_cfg_val = 0,</div><div class='del'>-	.set_l0s = true,</div><div class='del'>-	.use_bsm = true,</div><div class='del'>-	.led_compensation = 61,</div><div class='del'>-	.chain_noise_num_beacons = IWL4965_CAL_NUM_BEACONS,</div><div class='del'>-	.wd_timeout = IWL_DEF_WD_TIMEOUT,</div><div class='del'>-	.temperature_kelvin = true,</div><div class='del'>-	.ucode_tracing = true,</div><div class='del'>-	.sensitivity_calib_by_driver = true,</div><div class='del'>-	.chain_noise_calib_by_driver = true,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl_cfg iwl4965_cfg = {</div><div class='del'>-	.name = "Intel(R) Wireless WiFi Link 4965AGN",</div><div class='del'>-	.fw_name_pre = IWL4965_FW_PRE,</div><div class='del'>-	.ucode_api_max = IWL4965_UCODE_API_MAX,</div><div class='del'>-	.ucode_api_min = IWL4965_UCODE_API_MIN,</div><div class='del'>-	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,</div><div class='del'>-	.valid_tx_ant = ANT_AB,</div><div class='del'>-	.valid_rx_ant = ANT_ABC,</div><div class='del'>-	.eeprom_ver = EEPROM_4965_EEPROM_VERSION,</div><div class='del'>-	.eeprom_calib_ver = EEPROM_4965_TX_POWER_VERSION,</div><div class='del'>-	.ops = &amp;iwl4965_ops,</div><div class='del'>-	.mod_params = &amp;iwl4965_mod_params,</div><div class='del'>-	.base_params = &amp;iwl4965_base_params,</div><div class='del'>-	.led_mode = IWL_LED_BLINK,</div><div class='del'>-	/*</div><div class='del'>-	 * Force use of chains B and C for scan RX on 5 GHz band</div><div class='del'>-	 * because the device has off-channel reception on chain A.</div><div class='del'>-	 */</div><div class='del'>-	.scan_rx_antennas[IEEE80211_BAND_5GHZ] = ANT_BC,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Module firmware */</div><div class='del'>-MODULE_FIRMWARE(IWL4965_MODULE_FIRMWARE(IWL4965_UCODE_API_MAX));</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-4965.h b/drivers/net/wireless/iwlegacy/iwl-4965.h<br/>deleted file mode 100644<br/>index 01f8163daf16..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-4965.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,282 +0,0 @@</div><div class='del'>-/******************************************************************************</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) 2008 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- * BSD LICENSE</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2005 - 2011 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='del'>-#ifndef __iwl_4965_h__</div><div class='del'>-#define __iwl_4965_h__</div><div class='del'>-</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-</div><div class='del'>-/* configuration for the _4965 devices */</div><div class='del'>-extern struct iwl_cfg iwl4965_cfg;</div><div class='del'>-</div><div class='del'>-extern struct iwl_mod_params iwl4965_mod_params;</div><div class='del'>-</div><div class='del'>-extern struct ieee80211_ops iwl4965_hw_ops;</div><div class='del'>-</div><div class='del'>-/* tx queue */</div><div class='del'>-void iwl4965_free_tfds_in_queue(struct iwl_priv *priv,</div><div class='del'>-			    int sta_id, int tid, int freed);</div><div class='del'>-</div><div class='del'>-/* RXON */</div><div class='del'>-void iwl4965_set_rxon_chain(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_rxon_context *ctx);</div><div class='del'>-</div><div class='del'>-/* uCode */</div><div class='del'>-int iwl4965_verify_ucode(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-/* lib */</div><div class='del'>-void iwl4965_check_abort_status(struct iwl_priv *priv,</div><div class='del'>-			    u8 frame_count, u32 status);</div><div class='del'>-</div><div class='del'>-void iwl4965_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq);</div><div class='del'>-int iwl4965_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq);</div><div class='del'>-int iwl4965_hw_nic_init(struct iwl_priv *priv);</div><div class='del'>-int iwl4965_dump_fh(struct iwl_priv *priv, char **buf, bool display);</div><div class='del'>-</div><div class='del'>-/* rx */</div><div class='del'>-void iwl4965_rx_queue_restock(struct iwl_priv *priv);</div><div class='del'>-void iwl4965_rx_replenish(struct iwl_priv *priv);</div><div class='del'>-void iwl4965_rx_replenish_now(struct iwl_priv *priv);</div><div class='del'>-void iwl4965_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq);</div><div class='del'>-int iwl4965_rxq_stop(struct iwl_priv *priv);</div><div class='del'>-int iwl4965_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band);</div><div class='del'>-void iwl4965_rx_reply_rx(struct iwl_priv *priv,</div><div class='del'>-		     struct iwl_rx_mem_buffer *rxb);</div><div class='del'>-void iwl4965_rx_reply_rx_phy(struct iwl_priv *priv,</div><div class='del'>-			 struct iwl_rx_mem_buffer *rxb);</div><div class='del'>-void iwl4965_rx_handle(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-/* tx */</div><div class='del'>-void iwl4965_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq);</div><div class='del'>-int iwl4965_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv,</div><div class='del'>-				 struct iwl_tx_queue *txq,</div><div class='del'>-				 dma_addr_t addr, u16 len, u8 reset, u8 pad);</div><div class='del'>-int iwl4965_hw_tx_queue_init(struct iwl_priv *priv,</div><div class='del'>-			 struct iwl_tx_queue *txq);</div><div class='del'>-void iwl4965_hwrate_to_tx_control(struct iwl_priv *priv, u32 rate_n_flags,</div><div class='del'>-			      struct ieee80211_tx_info *info);</div><div class='del'>-int iwl4965_tx_skb(struct iwl_priv *priv, struct sk_buff *skb);</div><div class='del'>-int iwl4965_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,</div><div class='del'>-			struct ieee80211_sta *sta, u16 tid, u16 *ssn);</div><div class='del'>-int iwl4965_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,</div><div class='del'>-		       struct ieee80211_sta *sta, u16 tid);</div><div class='del'>-int iwl4965_txq_check_empty(struct iwl_priv *priv,</div><div class='del'>-			   int sta_id, u8 tid, int txq_id);</div><div class='del'>-void iwl4965_rx_reply_compressed_ba(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_rx_mem_buffer *rxb);</div><div class='del'>-int iwl4965_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index);</div><div class='del'>-void iwl4965_hw_txq_ctx_free(struct iwl_priv *priv);</div><div class='del'>-int iwl4965_txq_ctx_alloc(struct iwl_priv *priv);</div><div class='del'>-void iwl4965_txq_ctx_reset(struct iwl_priv *priv);</div><div class='del'>-void iwl4965_txq_ctx_stop(struct iwl_priv *priv);</div><div class='del'>-void iwl4965_txq_set_sched(struct iwl_priv *priv, u32 mask);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Acquire priv-&gt;lock before calling this function !</div><div class='del'>- */</div><div class='del'>-void iwl4965_set_wr_ptrs(struct iwl_priv *priv, int txq_id, u32 index);</div><div class='del'>-/**</div><div class='del'>- * iwl4965_tx_queue_set_status - (optionally) start Tx/Cmd queue</div><div class='del'>- * @tx_fifo_id: Tx DMA/FIFO channel (range 0-7) that the queue will feed</div><div class='del'>- * @scd_retry: (1) Indicates queue will be used in aggregation mode</div><div class='del'>- *</div><div class='del'>- * NOTE:  Acquire priv-&gt;lock before calling this function !</div><div class='del'>- */</div><div class='del'>-void iwl4965_tx_queue_set_status(struct iwl_priv *priv,</div><div class='del'>-					struct iwl_tx_queue *txq,</div><div class='del'>-					int tx_fifo_id, int scd_retry);</div><div class='del'>-</div><div class='del'>-static inline u32 iwl4965_tx_status_to_mac80211(u32 status)</div><div class='del'>-{</div><div class='del'>-	status &amp;= TX_STATUS_MSK;</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case TX_STATUS_SUCCESS:</div><div class='del'>-	case TX_STATUS_DIRECT_DONE:</div><div class='del'>-		return IEEE80211_TX_STAT_ACK;</div><div class='del'>-	case TX_STATUS_FAIL_DEST_PS:</div><div class='del'>-		return IEEE80211_TX_STAT_TX_FILTERED;</div><div class='del'>-	default:</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool iwl4965_is_tx_success(u32 status)</div><div class='del'>-{</div><div class='del'>-	status &amp;= TX_STATUS_MSK;</div><div class='del'>-	return (status == TX_STATUS_SUCCESS) ||</div><div class='del'>-	       (status == TX_STATUS_DIRECT_DONE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 iwl4965_toggle_tx_ant(struct iwl_priv *priv, u8 ant_idx, u8 valid);</div><div class='del'>-</div><div class='del'>-/* rx */</div><div class='del'>-void iwl4965_rx_missed_beacon_notif(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_rx_mem_buffer *rxb);</div><div class='del'>-bool iwl4965_good_plcp_health(struct iwl_priv *priv,</div><div class='del'>-			  struct iwl_rx_packet *pkt);</div><div class='del'>-void iwl4965_rx_statistics(struct iwl_priv *priv,</div><div class='del'>-		       struct iwl_rx_mem_buffer *rxb);</div><div class='del'>-void iwl4965_reply_statistics(struct iwl_priv *priv,</div><div class='del'>-			  struct iwl_rx_mem_buffer *rxb);</div><div class='del'>-</div><div class='del'>-/* scan */</div><div class='del'>-int iwl4965_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif);</div><div class='del'>-</div><div class='del'>-/* station mgmt */</div><div class='del'>-int iwl4965_manage_ibss_station(struct iwl_priv *priv,</div><div class='del'>-			       struct ieee80211_vif *vif, bool add);</div><div class='del'>-</div><div class='del'>-/* hcmd */</div><div class='del'>-int iwl4965_send_beacon_cmd(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-const char *iwl4965_get_tx_fail_reason(u32 status);</div><div class='del'>-#else</div><div class='del'>-static inline const char *</div><div class='del'>-iwl4965_get_tx_fail_reason(u32 status) { return ""; }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* station management */</div><div class='del'>-int iwl4965_alloc_bcast_station(struct iwl_priv *priv,</div><div class='del'>-			       struct iwl_rxon_context *ctx);</div><div class='del'>-int iwl4965_add_bssid_station(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_rxon_context *ctx,</div><div class='del'>-			     const u8 *addr, u8 *sta_id_r);</div><div class='del'>-int iwl4965_remove_default_wep_key(struct iwl_priv *priv,</div><div class='del'>-			       struct iwl_rxon_context *ctx,</div><div class='del'>-			       struct ieee80211_key_conf *key);</div><div class='del'>-int iwl4965_set_default_wep_key(struct iwl_priv *priv,</div><div class='del'>-			    struct iwl_rxon_context *ctx,</div><div class='del'>-			    struct ieee80211_key_conf *key);</div><div class='del'>-int iwl4965_restore_default_wep_keys(struct iwl_priv *priv,</div><div class='del'>-				 struct iwl_rxon_context *ctx);</div><div class='del'>-int iwl4965_set_dynamic_key(struct iwl_priv *priv,</div><div class='del'>-			struct iwl_rxon_context *ctx,</div><div class='del'>-			struct ieee80211_key_conf *key, u8 sta_id);</div><div class='del'>-int iwl4965_remove_dynamic_key(struct iwl_priv *priv,</div><div class='del'>-			struct iwl_rxon_context *ctx,</div><div class='del'>-			struct ieee80211_key_conf *key, u8 sta_id);</div><div class='del'>-void iwl4965_update_tkip_key(struct iwl_priv *priv,</div><div class='del'>-			 struct iwl_rxon_context *ctx,</div><div class='del'>-			 struct ieee80211_key_conf *keyconf,</div><div class='del'>-			 struct ieee80211_sta *sta, u32 iv32, u16 *phase1key);</div><div class='del'>-int iwl4965_sta_tx_modify_enable_tid(struct iwl_priv *priv,</div><div class='del'>-			int sta_id, int tid);</div><div class='del'>-int iwl4965_sta_rx_agg_start(struct iwl_priv *priv, struct ieee80211_sta *sta,</div><div class='del'>-			 int tid, u16 ssn);</div><div class='del'>-int iwl4965_sta_rx_agg_stop(struct iwl_priv *priv, struct ieee80211_sta *sta,</div><div class='del'>-			int tid);</div><div class='del'>-void iwl4965_sta_modify_sleep_tx_count(struct iwl_priv *priv,</div><div class='del'>-			int sta_id, int cnt);</div><div class='del'>-int iwl4965_update_bcast_stations(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-/* rate */</div><div class='del'>-static inline u32 iwl4965_ant_idx_to_flags(u8 ant_idx)</div><div class='del'>-{</div><div class='del'>-	return BIT(ant_idx) &lt;&lt; RATE_MCS_ANT_POS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 iwl4965_hw_get_rate(__le32 rate_n_flags)</div><div class='del'>-{</div><div class='del'>-	return le32_to_cpu(rate_n_flags) &amp; 0xFF;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __le32 iwl4965_hw_set_rate_n_flags(u8 rate, u32 flags)</div><div class='del'>-{</div><div class='del'>-	return cpu_to_le32(flags|(u32)rate);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* eeprom */</div><div class='del'>-void iwl4965_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac);</div><div class='del'>-int iwl4965_eeprom_acquire_semaphore(struct iwl_priv *priv);</div><div class='del'>-void iwl4965_eeprom_release_semaphore(struct iwl_priv *priv);</div><div class='del'>-int  iwl4965_eeprom_check_version(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-/* mac80211 handlers (for 4965) */</div><div class='del'>-void iwl4965_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb);</div><div class='del'>-int iwl4965_mac_start(struct ieee80211_hw *hw);</div><div class='del'>-void iwl4965_mac_stop(struct ieee80211_hw *hw);</div><div class='del'>-void iwl4965_configure_filter(struct ieee80211_hw *hw,</div><div class='del'>-			     unsigned int changed_flags,</div><div class='del'>-			     unsigned int *total_flags,</div><div class='del'>-			     u64 multicast);</div><div class='del'>-int iwl4965_mac_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'>-void iwl4965_mac_update_tkip_key(struct ieee80211_hw *hw,</div><div class='del'>-				struct ieee80211_vif *vif,</div><div class='del'>-				struct ieee80211_key_conf *keyconf,</div><div class='del'>-				struct ieee80211_sta *sta,</div><div class='del'>-				u32 iv32, u16 *phase1key);</div><div class='del'>-int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,</div><div class='del'>-			    struct ieee80211_vif *vif,</div><div class='del'>-			    enum ieee80211_ampdu_mlme_action action,</div><div class='del'>-			    struct ieee80211_sta *sta, u16 tid, u16 *ssn,</div><div class='del'>-			    u8 buf_size);</div><div class='del'>-int iwl4965_mac_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'>-void iwl4965_mac_channel_switch(struct ieee80211_hw *hw,</div><div class='del'>-			       struct ieee80211_channel_switch *ch_switch);</div><div class='del'>-</div><div class='del'>-#endif /* __iwl_4965_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-core.c b/drivers/net/wireless/iwlegacy/iwl-core.c<br/>deleted file mode 100644<br/>index 2bd5659310d7..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-core.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2661 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * GPL LICENSE SUMMARY</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2008 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-eeprom.h"</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-debug.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-#include "iwl-power.h"</div><div class='del'>-#include "iwl-sta.h"</div><div class='del'>-#include "iwl-helpers.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("iwl-legacy: common functions for 3945 and 4965");</div><div class='del'>-MODULE_VERSION(IWLWIFI_VERSION);</div><div class='del'>-MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * set bt_coex_active to true, uCode will do kill/defer</div><div class='del'>- * every time the priority line is asserted (BT is sending signals on the</div><div class='del'>- * priority line in the PCIx).</div><div class='del'>- * set bt_coex_active to false, uCode will ignore the BT activity and</div><div class='del'>- * perform the normal operation</div><div class='del'>- *</div><div class='del'>- * User might experience transmit issue on some platform due to WiFi/BT</div><div class='del'>- * co-exist problem. The possible behaviors are:</div><div class='del'>- *   Able to scan and finding all the available AP</div><div class='del'>- *   Not able to associate with any AP</div><div class='del'>- * On those platforms, WiFi communication can be restored by set</div><div class='del'>- * "bt_coex_active" module parameter to "false"</div><div class='del'>- *</div><div class='del'>- * default: bt_coex_active = true (BT_COEX_ENABLE)</div><div class='del'>- */</div><div class='del'>-static bool bt_coex_active = true;</div><div class='del'>-module_param(bt_coex_active, bool, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(bt_coex_active, "enable wifi/bluetooth co-exist");</div><div class='del'>-</div><div class='del'>-u32 iwlegacy_debug_level;</div><div class='del'>-EXPORT_SYMBOL(iwlegacy_debug_level);</div><div class='del'>-</div><div class='del'>-const u8 iwlegacy_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };</div><div class='del'>-EXPORT_SYMBOL(iwlegacy_bcast_addr);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This function both allocates and initializes hw and priv. */</div><div class='del'>-struct ieee80211_hw *iwl_legacy_alloc_all(struct iwl_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv;</div><div class='del'>-	/* mac80211 allocates memory for this device instance, including</div><div class='del'>-	 *   space for this driver's private structure */</div><div class='del'>-	struct ieee80211_hw *hw;</div><div class='del'>-</div><div class='del'>-	hw = ieee80211_alloc_hw(sizeof(struct iwl_priv),</div><div class='del'>-				cfg-&gt;ops-&gt;ieee80211_ops);</div><div class='del'>-	if (hw == NULL) {</div><div class='del'>-		pr_err("%s: Can not allocate network device\n",</div><div class='del'>-		       cfg-&gt;name);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv = hw-&gt;priv;</div><div class='del'>-	priv-&gt;hw = hw;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return hw;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_alloc_all);</div><div class='del'>-</div><div class='del'>-#define MAX_BIT_RATE_40_MHZ 150 /* Mbps */</div><div class='del'>-#define MAX_BIT_RATE_20_MHZ 72 /* Mbps */</div><div class='del'>-static void iwl_legacy_init_ht_hw_capab(const struct iwl_priv *priv,</div><div class='del'>-			      struct ieee80211_sta_ht_cap *ht_info,</div><div class='del'>-			      enum ieee80211_band band)</div><div class='del'>-{</div><div class='del'>-	u16 max_bit_rate = 0;</div><div class='del'>-	u8 rx_chains_num = priv-&gt;hw_params.rx_chains_num;</div><div class='del'>-	u8 tx_chains_num = priv-&gt;hw_params.tx_chains_num;</div><div class='del'>-</div><div class='del'>-	ht_info-&gt;cap = 0;</div><div class='del'>-	memset(&amp;ht_info-&gt;mcs, 0, sizeof(ht_info-&gt;mcs));</div><div class='del'>-</div><div class='del'>-	ht_info-&gt;ht_supported = true;</div><div class='del'>-</div><div class='del'>-	ht_info-&gt;cap |= IEEE80211_HT_CAP_SGI_20;</div><div class='del'>-	max_bit_rate = MAX_BIT_RATE_20_MHZ;</div><div class='del'>-	if (priv-&gt;hw_params.ht40_channel &amp; BIT(band)) {</div><div class='del'>-		ht_info-&gt;cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;</div><div class='del'>-		ht_info-&gt;cap |= IEEE80211_HT_CAP_SGI_40;</div><div class='del'>-		ht_info-&gt;mcs.rx_mask[4] = 0x01;</div><div class='del'>-		max_bit_rate = MAX_BIT_RATE_40_MHZ;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cfg-&gt;mod_params-&gt;amsdu_size_8K)</div><div class='del'>-		ht_info-&gt;cap |= IEEE80211_HT_CAP_MAX_AMSDU;</div><div class='del'>-</div><div class='del'>-	ht_info-&gt;ampdu_factor = CFG_HT_RX_AMPDU_FACTOR_DEF;</div><div class='del'>-	ht_info-&gt;ampdu_density = CFG_HT_MPDU_DENSITY_DEF;</div><div class='del'>-</div><div class='del'>-	ht_info-&gt;mcs.rx_mask[0] = 0xFF;</div><div class='del'>-	if (rx_chains_num &gt;= 2)</div><div class='del'>-		ht_info-&gt;mcs.rx_mask[1] = 0xFF;</div><div class='del'>-	if (rx_chains_num &gt;= 3)</div><div class='del'>-		ht_info-&gt;mcs.rx_mask[2] = 0xFF;</div><div class='del'>-</div><div class='del'>-	/* Highest supported Rx data rate */</div><div class='del'>-	max_bit_rate *= rx_chains_num;</div><div class='del'>-	WARN_ON(max_bit_rate &amp; ~IEEE80211_HT_MCS_RX_HIGHEST_MASK);</div><div class='del'>-	ht_info-&gt;mcs.rx_highest = cpu_to_le16(max_bit_rate);</div><div class='del'>-</div><div class='del'>-	/* Tx MCS capabilities */</div><div class='del'>-	ht_info-&gt;mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;</div><div class='del'>-	if (tx_chains_num != rx_chains_num) {</div><div class='del'>-		ht_info-&gt;mcs.tx_params |= IEEE80211_HT_MCS_TX_RX_DIFF;</div><div class='del'>-		ht_info-&gt;mcs.tx_params |= ((tx_chains_num - 1) &lt;&lt;</div><div class='del'>-				IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_init_geos - Initialize mac80211's geo/channel info based from eeprom</div><div class='del'>- */</div><div class='del'>-int iwl_legacy_init_geos(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_channel_info *ch;</div><div class='del'>-	struct ieee80211_supported_band *sband;</div><div class='del'>-	struct ieee80211_channel *channels;</div><div class='del'>-	struct ieee80211_channel *geo_ch;</div><div class='del'>-	struct ieee80211_rate *rates;</div><div class='del'>-	int i = 0;</div><div class='del'>-	s8 max_tx_power = 0;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;bands[IEEE80211_BAND_2GHZ].n_bitrates ||</div><div class='del'>-	    priv-&gt;bands[IEEE80211_BAND_5GHZ].n_bitrates) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Geography modes already initialized.\n");</div><div class='del'>-		set_bit(STATUS_GEO_CONFIGURED, &amp;priv-&gt;status);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	channels = kzalloc(sizeof(struct ieee80211_channel) *</div><div class='del'>-			   priv-&gt;channel_count, GFP_KERNEL);</div><div class='del'>-	if (!channels)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	rates = kzalloc((sizeof(struct ieee80211_rate) * IWL_RATE_COUNT_LEGACY),</div><div class='del'>-			GFP_KERNEL);</div><div class='del'>-	if (!rates) {</div><div class='del'>-		kfree(channels);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 5.2GHz channels start after the 2.4GHz channels */</div><div class='del'>-	sband = &amp;priv-&gt;bands[IEEE80211_BAND_5GHZ];</div><div class='del'>-	sband-&gt;channels = &amp;channels[ARRAY_SIZE(iwlegacy_eeprom_band_1)];</div><div class='del'>-	/* just OFDM */</div><div class='del'>-	sband-&gt;bitrates = &amp;rates[IWL_FIRST_OFDM_RATE];</div><div class='del'>-	sband-&gt;n_bitrates = IWL_RATE_COUNT_LEGACY - IWL_FIRST_OFDM_RATE;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cfg-&gt;sku &amp; IWL_SKU_N)</div><div class='del'>-		iwl_legacy_init_ht_hw_capab(priv, &amp;sband-&gt;ht_cap,</div><div class='del'>-					 IEEE80211_BAND_5GHZ);</div><div class='del'>-</div><div class='del'>-	sband = &amp;priv-&gt;bands[IEEE80211_BAND_2GHZ];</div><div class='del'>-	sband-&gt;channels = channels;</div><div class='del'>-	/* OFDM &amp; CCK */</div><div class='del'>-	sband-&gt;bitrates = rates;</div><div class='del'>-	sband-&gt;n_bitrates = IWL_RATE_COUNT_LEGACY;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cfg-&gt;sku &amp; IWL_SKU_N)</div><div class='del'>-		iwl_legacy_init_ht_hw_capab(priv, &amp;sband-&gt;ht_cap,</div><div class='del'>-					 IEEE80211_BAND_2GHZ);</div><div class='del'>-</div><div class='del'>-	priv-&gt;ieee_channels = channels;</div><div class='del'>-	priv-&gt;ieee_rates = rates;</div><div class='del'>-</div><div class='del'>-	for (i = 0;  i &lt; priv-&gt;channel_count; i++) {</div><div class='del'>-		ch = &amp;priv-&gt;channel_info[i];</div><div class='del'>-</div><div class='del'>-		if (!iwl_legacy_is_channel_valid(ch))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		sband = &amp;priv-&gt;bands[ch-&gt;band];</div><div class='del'>-</div><div class='del'>-		geo_ch = &amp;sband-&gt;channels[sband-&gt;n_channels++];</div><div class='del'>-</div><div class='del'>-		geo_ch-&gt;center_freq =</div><div class='del'>-			ieee80211_channel_to_frequency(ch-&gt;channel, ch-&gt;band);</div><div class='del'>-		geo_ch-&gt;max_power = ch-&gt;max_power_avg;</div><div class='del'>-		geo_ch-&gt;max_antenna_gain = 0xff;</div><div class='del'>-		geo_ch-&gt;hw_value = ch-&gt;channel;</div><div class='del'>-</div><div class='del'>-		if (iwl_legacy_is_channel_valid(ch)) {</div><div class='del'>-			if (!(ch-&gt;flags &amp; EEPROM_CHANNEL_IBSS))</div><div class='del'>-				geo_ch-&gt;flags |= IEEE80211_CHAN_NO_IBSS;</div><div class='del'>-</div><div class='del'>-			if (!(ch-&gt;flags &amp; EEPROM_CHANNEL_ACTIVE))</div><div class='del'>-				geo_ch-&gt;flags |= IEEE80211_CHAN_PASSIVE_SCAN;</div><div class='del'>-</div><div class='del'>-			if (ch-&gt;flags &amp; EEPROM_CHANNEL_RADAR)</div><div class='del'>-				geo_ch-&gt;flags |= IEEE80211_CHAN_RADAR;</div><div class='del'>-</div><div class='del'>-			geo_ch-&gt;flags |= ch-&gt;ht40_extension_channel;</div><div class='del'>-</div><div class='del'>-			if (ch-&gt;max_power_avg &gt; max_tx_power)</div><div class='del'>-				max_tx_power = ch-&gt;max_power_avg;</div><div class='del'>-		} else {</div><div class='del'>-			geo_ch-&gt;flags |= IEEE80211_CHAN_DISABLED;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Channel %d Freq=%d[%sGHz] %s flag=0x%X\n",</div><div class='del'>-				ch-&gt;channel, geo_ch-&gt;center_freq,</div><div class='del'>-				iwl_legacy_is_channel_a_band(ch) ?  "5.2" : "2.4",</div><div class='del'>-				geo_ch-&gt;flags &amp; IEEE80211_CHAN_DISABLED ?</div><div class='del'>-				"restricted" : "valid",</div><div class='del'>-				 geo_ch-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;tx_power_device_lmt = max_tx_power;</div><div class='del'>-	priv-&gt;tx_power_user_lmt = max_tx_power;</div><div class='del'>-	priv-&gt;tx_power_next = max_tx_power;</div><div class='del'>-</div><div class='del'>-	if ((priv-&gt;bands[IEEE80211_BAND_5GHZ].n_channels == 0) &amp;&amp;</div><div class='del'>-	     priv-&gt;cfg-&gt;sku &amp; IWL_SKU_A) {</div><div class='del'>-		IWL_INFO(priv, "Incorrectly detected BG card as ABG. "</div><div class='del'>-			"Please send your PCI ID 0x%04X:0x%04X to maintainer.\n",</div><div class='del'>-			   priv-&gt;pci_dev-&gt;device,</div><div class='del'>-			   priv-&gt;pci_dev-&gt;subsystem_device);</div><div class='del'>-		priv-&gt;cfg-&gt;sku &amp;= ~IWL_SKU_A;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_INFO(priv, "Tunable channels: %d 802.11bg, %d 802.11a channels\n",</div><div class='del'>-		   priv-&gt;bands[IEEE80211_BAND_2GHZ].n_channels,</div><div class='del'>-		   priv-&gt;bands[IEEE80211_BAND_5GHZ].n_channels);</div><div class='del'>-</div><div class='del'>-	set_bit(STATUS_GEO_CONFIGURED, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_init_geos);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * iwl_legacy_free_geos - undo allocations in iwl_legacy_init_geos</div><div class='del'>- */</div><div class='del'>-void iwl_legacy_free_geos(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	kfree(priv-&gt;ieee_channels);</div><div class='del'>-	kfree(priv-&gt;ieee_rates);</div><div class='del'>-	clear_bit(STATUS_GEO_CONFIGURED, &amp;priv-&gt;status);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_free_geos);</div><div class='del'>-</div><div class='del'>-static bool iwl_legacy_is_channel_extension(struct iwl_priv *priv,</div><div class='del'>-				     enum ieee80211_band band,</div><div class='del'>-				     u16 channel, u8 extension_chan_offset)</div><div class='del'>-{</div><div class='del'>-	const struct iwl_channel_info *ch_info;</div><div class='del'>-</div><div class='del'>-	ch_info = iwl_legacy_get_channel_info(priv, band, channel);</div><div class='del'>-	if (!iwl_legacy_is_channel_valid(ch_info))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_ABOVE)</div><div class='del'>-		return !(ch_info-&gt;ht40_extension_channel &amp;</div><div class='del'>-					IEEE80211_CHAN_NO_HT40PLUS);</div><div class='del'>-	else if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_BELOW)</div><div class='del'>-		return !(ch_info-&gt;ht40_extension_channel &amp;</div><div class='del'>-					IEEE80211_CHAN_NO_HT40MINUS);</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool iwl_legacy_is_ht40_tx_allowed(struct iwl_priv *priv,</div><div class='del'>-			    struct iwl_rxon_context *ctx,</div><div class='del'>-			    struct ieee80211_sta_ht_cap *ht_cap)</div><div class='del'>-{</div><div class='del'>-	if (!ctx-&gt;ht.enabled || !ctx-&gt;ht.is_40mhz)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We do not check for IEEE80211_HT_CAP_SUP_WIDTH_20_40</div><div class='del'>-	 * the bit will not set if it is pure 40MHz case</div><div class='del'>-	 */</div><div class='del'>-	if (ht_cap &amp;&amp; !ht_cap-&gt;ht_supported)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS</div><div class='del'>-	if (priv-&gt;disable_ht40)</div><div class='del'>-		return false;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_is_channel_extension(priv, priv-&gt;band,</div><div class='del'>-			le16_to_cpu(ctx-&gt;staging.channel),</div><div class='del'>-			ctx-&gt;ht.extension_chan_offset);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_is_ht40_tx_allowed);</div><div class='del'>-</div><div class='del'>-static u16 iwl_legacy_adjust_beacon_interval(u16 beacon_val, u16 max_beacon_val)</div><div class='del'>-{</div><div class='del'>-	u16 new_val;</div><div class='del'>-	u16 beacon_factor;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If mac80211 hasn't given us a beacon interval, program</div><div class='del'>-	 * the default into the device.</div><div class='del'>-	 */</div><div class='del'>-	if (!beacon_val)</div><div class='del'>-		return DEFAULT_BEACON_INTERVAL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the beacon interval we obtained from the peer</div><div class='del'>-	 * is too large, we'll have to wake up more often</div><div class='del'>-	 * (and in IBSS case, we'll beacon too much)</div><div class='del'>-	 *</div><div class='del'>-	 * For example, if max_beacon_val is 4096, and the</div><div class='del'>-	 * requested beacon interval is 7000, we'll have to</div><div class='del'>-	 * use 3500 to be able to wake up on the beacons.</div><div class='del'>-	 *</div><div class='del'>-	 * This could badly influence beacon detection stats.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	beacon_factor = (beacon_val + max_beacon_val) / max_beacon_val;</div><div class='del'>-	new_val = beacon_val / beacon_factor;</div><div class='del'>-</div><div class='del'>-	if (!new_val)</div><div class='del'>-		new_val = max_beacon_val;</div><div class='del'>-</div><div class='del'>-	return new_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-iwl_legacy_send_rxon_timing(struct iwl_priv *priv, struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	u64 tsf;</div><div class='del'>-	s32 interval_tm, rem;</div><div class='del'>-	struct ieee80211_conf *conf = NULL;</div><div class='del'>-	u16 beacon_int;</div><div class='del'>-	struct ieee80211_vif *vif = ctx-&gt;vif;</div><div class='del'>-</div><div class='del'>-	conf = iwl_legacy_ieee80211_get_hw_conf(priv-&gt;hw);</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	memset(&amp;ctx-&gt;timing, 0, sizeof(struct iwl_rxon_time_cmd));</div><div class='del'>-</div><div class='del'>-	ctx-&gt;timing.timestamp = cpu_to_le64(priv-&gt;timestamp);</div><div class='del'>-	ctx-&gt;timing.listen_interval = cpu_to_le16(conf-&gt;listen_interval);</div><div class='del'>-</div><div class='del'>-	beacon_int = vif ? vif-&gt;bss_conf.beacon_int : 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * TODO: For IBSS we need to get atim_window from mac80211,</div><div class='del'>-	 *	 for now just always use 0</div><div class='del'>-	 */</div><div class='del'>-	ctx-&gt;timing.atim_window = 0;</div><div class='del'>-</div><div class='del'>-	beacon_int = iwl_legacy_adjust_beacon_interval(beacon_int,</div><div class='del'>-			priv-&gt;hw_params.max_beacon_itrvl * TIME_UNIT);</div><div class='del'>-	ctx-&gt;timing.beacon_interval = cpu_to_le16(beacon_int);</div><div class='del'>-</div><div class='del'>-	tsf = priv-&gt;timestamp; /* tsf is modifed by do_div: copy it */</div><div class='del'>-	interval_tm = beacon_int * TIME_UNIT;</div><div class='del'>-	rem = do_div(tsf, interval_tm);</div><div class='del'>-	ctx-&gt;timing.beacon_init_val = cpu_to_le32(interval_tm - rem);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;timing.dtim_period = vif ? (vif-&gt;bss_conf.dtim_period ?: 1) : 1;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_ASSOC(priv,</div><div class='del'>-			"beacon interval %d beacon timer %d beacon tim %d\n",</div><div class='del'>-			le16_to_cpu(ctx-&gt;timing.beacon_interval),</div><div class='del'>-			le32_to_cpu(ctx-&gt;timing.beacon_init_val),</div><div class='del'>-			le16_to_cpu(ctx-&gt;timing.atim_window));</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_send_cmd_pdu(priv, ctx-&gt;rxon_timing_cmd,</div><div class='del'>-				sizeof(ctx-&gt;timing), &amp;ctx-&gt;timing);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_send_rxon_timing);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-iwl_legacy_set_rxon_hwcrypto(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_rxon_context *ctx,</div><div class='del'>-				int hw_decrypt)</div><div class='del'>-{</div><div class='del'>-	struct iwl_legacy_rxon_cmd *rxon = &amp;ctx-&gt;staging;</div><div class='del'>-</div><div class='del'>-	if (hw_decrypt)</div><div class='del'>-		rxon-&gt;filter_flags &amp;= ~RXON_FILTER_DIS_DECRYPT_MSK;</div><div class='del'>-	else</div><div class='del'>-		rxon-&gt;filter_flags |= RXON_FILTER_DIS_DECRYPT_MSK;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_set_rxon_hwcrypto);</div><div class='del'>-</div><div class='del'>-/* validate RXON structure is valid */</div><div class='del'>-int</div><div class='del'>-iwl_legacy_check_rxon_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	struct iwl_legacy_rxon_cmd *rxon = &amp;ctx-&gt;staging;</div><div class='del'>-	bool error = false;</div><div class='del'>-</div><div class='del'>-	if (rxon-&gt;flags &amp; RXON_FLG_BAND_24G_MSK) {</div><div class='del'>-		if (rxon-&gt;flags &amp; RXON_FLG_TGJ_NARROW_BAND_MSK) {</div><div class='del'>-			IWL_WARN(priv, "check 2.4G: wrong narrow\n");</div><div class='del'>-			error = true;</div><div class='del'>-		}</div><div class='del'>-		if (rxon-&gt;flags &amp; RXON_FLG_RADAR_DETECT_MSK) {</div><div class='del'>-			IWL_WARN(priv, "check 2.4G: wrong radar\n");</div><div class='del'>-			error = true;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (!(rxon-&gt;flags &amp; RXON_FLG_SHORT_SLOT_MSK)) {</div><div class='del'>-			IWL_WARN(priv, "check 5.2G: not short slot!\n");</div><div class='del'>-			error = true;</div><div class='del'>-		}</div><div class='del'>-		if (rxon-&gt;flags &amp; RXON_FLG_CCK_MSK) {</div><div class='del'>-			IWL_WARN(priv, "check 5.2G: CCK!\n");</div><div class='del'>-			error = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if ((rxon-&gt;node_addr[0] | rxon-&gt;bssid_addr[0]) &amp; 0x1) {</div><div class='del'>-		IWL_WARN(priv, "mac/bssid mcast!\n");</div><div class='del'>-		error = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* make sure basic rates 6Mbps and 1Mbps are supported */</div><div class='del'>-	if ((rxon-&gt;ofdm_basic_rates &amp; IWL_RATE_6M_MASK) == 0 &amp;&amp;</div><div class='del'>-	    (rxon-&gt;cck_basic_rates &amp; IWL_RATE_1M_MASK) == 0) {</div><div class='del'>-		IWL_WARN(priv, "neither 1 nor 6 are basic\n");</div><div class='del'>-		error = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(rxon-&gt;assoc_id) &gt; 2007) {</div><div class='del'>-		IWL_WARN(priv, "aid &gt; 2007\n");</div><div class='del'>-		error = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((rxon-&gt;flags &amp; (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK))</div><div class='del'>-			== (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)) {</div><div class='del'>-		IWL_WARN(priv, "CCK and short slot\n");</div><div class='del'>-		error = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((rxon-&gt;flags &amp; (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK))</div><div class='del'>-			== (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)) {</div><div class='del'>-		IWL_WARN(priv, "CCK and auto detect");</div><div class='del'>-		error = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((rxon-&gt;flags &amp; (RXON_FLG_AUTO_DETECT_MSK |</div><div class='del'>-			    RXON_FLG_TGG_PROTECT_MSK)) ==</div><div class='del'>-			    RXON_FLG_TGG_PROTECT_MSK) {</div><div class='del'>-		IWL_WARN(priv, "TGg but no auto-detect\n");</div><div class='del'>-		error = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (error)</div><div class='del'>-		IWL_WARN(priv, "Tuning to channel %d\n",</div><div class='del'>-			    le16_to_cpu(rxon-&gt;channel));</div><div class='del'>-</div><div class='del'>-	if (error) {</div><div class='del'>-		IWL_ERR(priv, "Invalid RXON\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_check_rxon_cmd);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_full_rxon_required - check if full RXON (vs RXON_ASSOC) cmd is needed</div><div class='del'>- * @priv: staging_rxon is compared to active_rxon</div><div class='del'>- *</div><div class='del'>- * If the RXON structure is changing enough to require a new tune,</div><div class='del'>- * or is clearing the RXON_FILTER_ASSOC_MSK, then return 1 to indicate that</div><div class='del'>- * a new tune (full RXON command, rather than RXON_ASSOC cmd) is required.</div><div class='del'>- */</div><div class='del'>-int iwl_legacy_full_rxon_required(struct iwl_priv *priv,</div><div class='del'>-			   struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	const struct iwl_legacy_rxon_cmd *staging = &amp;ctx-&gt;staging;</div><div class='del'>-	const struct iwl_legacy_rxon_cmd *active = &amp;ctx-&gt;active;</div><div class='del'>-</div><div class='del'>-#define CHK(cond)							\</div><div class='del'>-	if ((cond)) {							\</div><div class='del'>-		IWL_DEBUG_INFO(priv, "need full RXON - " #cond "\n");	\</div><div class='del'>-		return 1;						\</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#define CHK_NEQ(c1, c2)						\</div><div class='del'>-	if ((c1) != (c2)) {					\</div><div class='del'>-		IWL_DEBUG_INFO(priv, "need full RXON - "	\</div><div class='del'>-			       #c1 " != " #c2 " - %d != %d\n",	\</div><div class='del'>-			       (c1), (c2));			\</div><div class='del'>-		return 1;					\</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* These items are only settable from the full RXON command */</div><div class='del'>-	CHK(!iwl_legacy_is_associated_ctx(ctx));</div><div class='del'>-	CHK(compare_ether_addr(staging-&gt;bssid_addr, active-&gt;bssid_addr));</div><div class='del'>-	CHK(compare_ether_addr(staging-&gt;node_addr, active-&gt;node_addr));</div><div class='del'>-	CHK(compare_ether_addr(staging-&gt;wlap_bssid_addr,</div><div class='del'>-				active-&gt;wlap_bssid_addr));</div><div class='del'>-	CHK_NEQ(staging-&gt;dev_type, active-&gt;dev_type);</div><div class='del'>-	CHK_NEQ(staging-&gt;channel, active-&gt;channel);</div><div class='del'>-	CHK_NEQ(staging-&gt;air_propagation, active-&gt;air_propagation);</div><div class='del'>-	CHK_NEQ(staging-&gt;ofdm_ht_single_stream_basic_rates,</div><div class='del'>-		active-&gt;ofdm_ht_single_stream_basic_rates);</div><div class='del'>-	CHK_NEQ(staging-&gt;ofdm_ht_dual_stream_basic_rates,</div><div class='del'>-		active-&gt;ofdm_ht_dual_stream_basic_rates);</div><div class='del'>-	CHK_NEQ(staging-&gt;assoc_id, active-&gt;assoc_id);</div><div class='del'>-</div><div class='del'>-	/* flags, filter_flags, ofdm_basic_rates, and cck_basic_rates can</div><div class='del'>-	 * be updated with the RXON_ASSOC command -- however only some</div><div class='del'>-	 * flag transitions are allowed using RXON_ASSOC */</div><div class='del'>-</div><div class='del'>-	/* Check if we are not switching bands */</div><div class='del'>-	CHK_NEQ(staging-&gt;flags &amp; RXON_FLG_BAND_24G_MSK,</div><div class='del'>-		active-&gt;flags &amp; RXON_FLG_BAND_24G_MSK);</div><div class='del'>-</div><div class='del'>-	/* Check if we are switching association toggle */</div><div class='del'>-	CHK_NEQ(staging-&gt;filter_flags &amp; RXON_FILTER_ASSOC_MSK,</div><div class='del'>-		active-&gt;filter_flags &amp; RXON_FILTER_ASSOC_MSK);</div><div class='del'>-</div><div class='del'>-#undef CHK</div><div class='del'>-#undef CHK_NEQ</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_full_rxon_required);</div><div class='del'>-</div><div class='del'>-u8 iwl_legacy_get_lowest_plcp(struct iwl_priv *priv,</div><div class='del'>-			    struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Assign the lowest rate -- should really get this from</div><div class='del'>-	 * the beacon skb from mac80211.</div><div class='del'>-	 */</div><div class='del'>-	if (ctx-&gt;staging.flags &amp; RXON_FLG_BAND_24G_MSK)</div><div class='del'>-		return IWL_RATE_1M_PLCP;</div><div class='del'>-	else</div><div class='del'>-		return IWL_RATE_6M_PLCP;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_get_lowest_plcp);</div><div class='del'>-</div><div class='del'>-static void _iwl_legacy_set_rxon_ht(struct iwl_priv *priv,</div><div class='del'>-			     struct iwl_ht_config *ht_conf,</div><div class='del'>-			     struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	struct iwl_legacy_rxon_cmd *rxon = &amp;ctx-&gt;staging;</div><div class='del'>-</div><div class='del'>-	if (!ctx-&gt;ht.enabled) {</div><div class='del'>-		rxon-&gt;flags &amp;= ~(RXON_FLG_CHANNEL_MODE_MSK |</div><div class='del'>-			RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK |</div><div class='del'>-			RXON_FLG_HT40_PROT_MSK |</div><div class='del'>-			RXON_FLG_HT_PROT_MSK);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rxon-&gt;flags |= cpu_to_le32(ctx-&gt;ht.protection &lt;&lt;</div><div class='del'>-					RXON_FLG_HT_OPERATING_MODE_POS);</div><div class='del'>-</div><div class='del'>-	/* Set up channel bandwidth:</div><div class='del'>-	 * 20 MHz only, 20/40 mixed or pure 40 if ht40 ok */</div><div class='del'>-	/* clear the HT channel mode before set the mode */</div><div class='del'>-	rxon-&gt;flags &amp;= ~(RXON_FLG_CHANNEL_MODE_MSK |</div><div class='del'>-			 RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK);</div><div class='del'>-	if (iwl_legacy_is_ht40_tx_allowed(priv, ctx, NULL)) {</div><div class='del'>-		/* pure ht40 */</div><div class='del'>-		if (ctx-&gt;ht.protection ==</div><div class='del'>-				IEEE80211_HT_OP_MODE_PROTECTION_20MHZ) {</div><div class='del'>-			rxon-&gt;flags |= RXON_FLG_CHANNEL_MODE_PURE_40;</div><div class='del'>-			/* Note: control channel is opposite of extension channel */</div><div class='del'>-			switch (ctx-&gt;ht.extension_chan_offset) {</div><div class='del'>-			case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:</div><div class='del'>-				rxon-&gt;flags &amp;=</div><div class='del'>-					~RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;</div><div class='del'>-				break;</div><div class='del'>-			case IEEE80211_HT_PARAM_CHA_SEC_BELOW:</div><div class='del'>-				rxon-&gt;flags |=</div><div class='del'>-					RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/* Note: control channel is opposite of extension channel */</div><div class='del'>-			switch (ctx-&gt;ht.extension_chan_offset) {</div><div class='del'>-			case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:</div><div class='del'>-				rxon-&gt;flags &amp;=</div><div class='del'>-					~(RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK);</div><div class='del'>-				rxon-&gt;flags |= RXON_FLG_CHANNEL_MODE_MIXED;</div><div class='del'>-				break;</div><div class='del'>-			case IEEE80211_HT_PARAM_CHA_SEC_BELOW:</div><div class='del'>-				rxon-&gt;flags |=</div><div class='del'>-					RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;</div><div class='del'>-				rxon-&gt;flags |= RXON_FLG_CHANNEL_MODE_MIXED;</div><div class='del'>-				break;</div><div class='del'>-			case IEEE80211_HT_PARAM_CHA_SEC_NONE:</div><div class='del'>-			default:</div><div class='del'>-				/* channel location only valid if in Mixed mode */</div><div class='del'>-				IWL_ERR(priv,</div><div class='del'>-					"invalid extension channel offset\n");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		rxon-&gt;flags |= RXON_FLG_CHANNEL_MODE_LEGACY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain)</div><div class='del'>-		priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain(priv, ctx);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_ASSOC(priv, "rxon flags 0x%X operation mode :0x%X "</div><div class='del'>-			"extension channel offset 0x%x\n",</div><div class='del'>-			le32_to_cpu(rxon-&gt;flags), ctx-&gt;ht.protection,</div><div class='del'>-			ctx-&gt;ht.extension_chan_offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_legacy_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_config *ht_conf)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-</div><div class='del'>-	for_each_context(priv, ctx)</div><div class='del'>-		_iwl_legacy_set_rxon_ht(priv, ht_conf, ctx);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_set_rxon_ht);</div><div class='del'>-</div><div class='del'>-/* Return valid, unused, channel for a passive scan to reset the RF */</div><div class='del'>-u8 iwl_legacy_get_single_channel_number(struct iwl_priv *priv,</div><div class='del'>-				 enum ieee80211_band band)</div><div class='del'>-{</div><div class='del'>-	const struct iwl_channel_info *ch_info;</div><div class='del'>-	int i;</div><div class='del'>-	u8 channel = 0;</div><div class='del'>-	u8 min, max;</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-</div><div class='del'>-	if (band == IEEE80211_BAND_5GHZ) {</div><div class='del'>-		min = 14;</div><div class='del'>-		max = priv-&gt;channel_count;</div><div class='del'>-	} else {</div><div class='del'>-		min = 0;</div><div class='del'>-		max = 14;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = min; i &lt; max; i++) {</div><div class='del'>-		bool busy = false;</div><div class='del'>-</div><div class='del'>-		for_each_context(priv, ctx) {</div><div class='del'>-			busy = priv-&gt;channel_info[i].channel ==</div><div class='del'>-				le16_to_cpu(ctx-&gt;staging.channel);</div><div class='del'>-			if (busy)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (busy)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		channel = priv-&gt;channel_info[i].channel;</div><div class='del'>-		ch_info = iwl_legacy_get_channel_info(priv, band, channel);</div><div class='del'>-		if (iwl_legacy_is_channel_valid(ch_info))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return channel;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_get_single_channel_number);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_set_rxon_channel - Set the band and channel values in staging RXON</div><div class='del'>- * @ch: requested channel as a pointer to struct ieee80211_channel</div><div class='del'>-</div><div class='del'>- * NOTE:  Does not commit to the hardware; it sets appropriate bit fields</div><div class='del'>- * in the staging RXON flag structure based on the ch-&gt;band</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-iwl_legacy_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch,</div><div class='del'>-			 struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	enum ieee80211_band band = ch-&gt;band;</div><div class='del'>-	u16 channel = ch-&gt;hw_value;</div><div class='del'>-</div><div class='del'>-	if ((le16_to_cpu(ctx-&gt;staging.channel) == channel) &amp;&amp;</div><div class='del'>-	    (priv-&gt;band == band))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ctx-&gt;staging.channel = cpu_to_le16(channel);</div><div class='del'>-	if (band == IEEE80211_BAND_5GHZ)</div><div class='del'>-		ctx-&gt;staging.flags &amp;= ~RXON_FLG_BAND_24G_MSK;</div><div class='del'>-	else</div><div class='del'>-		ctx-&gt;staging.flags |= RXON_FLG_BAND_24G_MSK;</div><div class='del'>-</div><div class='del'>-	priv-&gt;band = band;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Staging channel set to %d [%d]\n", channel, band);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_set_rxon_channel);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_set_flags_for_band(struct iwl_priv *priv,</div><div class='del'>-			    struct iwl_rxon_context *ctx,</div><div class='del'>-			    enum ieee80211_band band,</div><div class='del'>-			    struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	if (band == IEEE80211_BAND_5GHZ) {</div><div class='del'>-		ctx-&gt;staging.flags &amp;=</div><div class='del'>-		    ~(RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK</div><div class='del'>-		      | RXON_FLG_CCK_MSK);</div><div class='del'>-		ctx-&gt;staging.flags |= RXON_FLG_SHORT_SLOT_MSK;</div><div class='del'>-	} else {</div><div class='del'>-		/* Copied from iwl_post_associate() */</div><div class='del'>-		if (vif &amp;&amp; vif-&gt;bss_conf.use_short_slot)</div><div class='del'>-			ctx-&gt;staging.flags |= RXON_FLG_SHORT_SLOT_MSK;</div><div class='del'>-		else</div><div class='del'>-			ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_SLOT_MSK;</div><div class='del'>-</div><div class='del'>-		ctx-&gt;staging.flags |= RXON_FLG_BAND_24G_MSK;</div><div class='del'>-		ctx-&gt;staging.flags |= RXON_FLG_AUTO_DETECT_MSK;</div><div class='del'>-		ctx-&gt;staging.flags &amp;= ~RXON_FLG_CCK_MSK;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_set_flags_for_band);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * initialize rxon structure with default values from eeprom</div><div class='del'>- */</div><div class='del'>-void iwl_legacy_connection_init_rx_config(struct iwl_priv *priv,</div><div class='del'>-				   struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	const struct iwl_channel_info *ch_info;</div><div class='del'>-</div><div class='del'>-	memset(&amp;ctx-&gt;staging, 0, sizeof(ctx-&gt;staging));</div><div class='del'>-</div><div class='del'>-	if (!ctx-&gt;vif) {</div><div class='del'>-		ctx-&gt;staging.dev_type = ctx-&gt;unused_devtype;</div><div class='del'>-	} else</div><div class='del'>-	switch (ctx-&gt;vif-&gt;type) {</div><div class='del'>-</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		ctx-&gt;staging.dev_type = ctx-&gt;station_devtype;</div><div class='del'>-		ctx-&gt;staging.filter_flags = RXON_FILTER_ACCEPT_GRP_MSK;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		ctx-&gt;staging.dev_type = ctx-&gt;ibss_devtype;</div><div class='del'>-		ctx-&gt;staging.flags = RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='del'>-		ctx-&gt;staging.filter_flags = RXON_FILTER_BCON_AWARE_MSK |</div><div class='del'>-						  RXON_FILTER_ACCEPT_GRP_MSK;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		IWL_ERR(priv, "Unsupported interface type %d\n",</div><div class='del'>-			ctx-&gt;vif-&gt;type);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* TODO:  Figure out when short_preamble would be set and cache from</div><div class='del'>-	 * that */</div><div class='del'>-	if (!hw_to_local(priv-&gt;hw)-&gt;short_preamble)</div><div class='del'>-		ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='del'>-	else</div><div class='del'>-		ctx-&gt;staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	ch_info = iwl_legacy_get_channel_info(priv, priv-&gt;band,</div><div class='del'>-				       le16_to_cpu(ctx-&gt;active.channel));</div><div class='del'>-</div><div class='del'>-	if (!ch_info)</div><div class='del'>-		ch_info = &amp;priv-&gt;channel_info[0];</div><div class='del'>-</div><div class='del'>-	ctx-&gt;staging.channel = cpu_to_le16(ch_info-&gt;channel);</div><div class='del'>-	priv-&gt;band = ch_info-&gt;band;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_set_flags_for_band(priv, ctx, priv-&gt;band, ctx-&gt;vif);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;staging.ofdm_basic_rates =</div><div class='del'>-	    (IWL_OFDM_RATES_MASK &gt;&gt; IWL_FIRST_OFDM_RATE) &amp; 0xFF;</div><div class='del'>-	ctx-&gt;staging.cck_basic_rates =</div><div class='del'>-	    (IWL_CCK_RATES_MASK &gt;&gt; IWL_FIRST_CCK_RATE) &amp; 0xF;</div><div class='del'>-</div><div class='del'>-	/* clear both MIX and PURE40 mode flag */</div><div class='del'>-	ctx-&gt;staging.flags &amp;= ~(RXON_FLG_CHANNEL_MODE_MIXED |</div><div class='del'>-					RXON_FLG_CHANNEL_MODE_PURE_40);</div><div class='del'>-	if (ctx-&gt;vif)</div><div class='del'>-		memcpy(ctx-&gt;staging.node_addr, ctx-&gt;vif-&gt;addr, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;staging.ofdm_ht_single_stream_basic_rates = 0xff;</div><div class='del'>-	ctx-&gt;staging.ofdm_ht_dual_stream_basic_rates = 0xff;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_connection_init_rx_config);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_set_rate(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_supported_band *hw = NULL;</div><div class='del'>-	struct ieee80211_rate *rate;</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	hw = iwl_get_hw_mode(priv, priv-&gt;band);</div><div class='del'>-	if (!hw) {</div><div class='del'>-		IWL_ERR(priv, "Failed to set rate: unable to get hw mode\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;active_rate = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; hw-&gt;n_bitrates; i++) {</div><div class='del'>-		rate = &amp;(hw-&gt;bitrates[i]);</div><div class='del'>-		if (rate-&gt;hw_value &lt; IWL_RATE_COUNT_LEGACY)</div><div class='del'>-			priv-&gt;active_rate |= (1 &lt;&lt; rate-&gt;hw_value);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "Set active_rate = %0x\n", priv-&gt;active_rate);</div><div class='del'>-</div><div class='del'>-	for_each_context(priv, ctx) {</div><div class='del'>-		ctx-&gt;staging.cck_basic_rates =</div><div class='del'>-		    (IWL_CCK_BASIC_RATES_MASK &gt;&gt; IWL_FIRST_CCK_RATE) &amp; 0xF;</div><div class='del'>-</div><div class='del'>-		ctx-&gt;staging.ofdm_basic_rates =</div><div class='del'>-		   (IWL_OFDM_BASIC_RATES_MASK &gt;&gt; IWL_FIRST_OFDM_RATE) &amp; 0xFF;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_set_rate);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_chswitch_done(struct iwl_priv *priv, bool is_success)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (test_and_clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		ieee80211_chswitch_done(ctx-&gt;vif, is_success);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_chswitch_done);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_rx_csa(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_csa_notification *csa = &amp;(pkt-&gt;u.csa_notif);</div><div class='del'>-</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-	struct iwl_legacy_rxon_cmd *rxon = (void *)&amp;ctx-&gt;active;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(STATUS_CHANNEL_SWITCH_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!le32_to_cpu(csa-&gt;status) &amp;&amp; csa-&gt;channel == priv-&gt;switch_channel) {</div><div class='del'>-		rxon-&gt;channel = csa-&gt;channel;</div><div class='del'>-		ctx-&gt;staging.channel = csa-&gt;channel;</div><div class='del'>-		IWL_DEBUG_11H(priv, "CSA notif: channel %d\n",</div><div class='del'>-			      le16_to_cpu(csa-&gt;channel));</div><div class='del'>-		iwl_legacy_chswitch_done(priv, true);</div><div class='del'>-	} else {</div><div class='del'>-		IWL_ERR(priv, "CSA notif (fail) : channel %d\n",</div><div class='del'>-			le16_to_cpu(csa-&gt;channel));</div><div class='del'>-		iwl_legacy_chswitch_done(priv, false);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_rx_csa);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-void iwl_legacy_print_rx_config_cmd(struct iwl_priv *priv,</div><div class='del'>-			     struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	struct iwl_legacy_rxon_cmd *rxon = &amp;ctx-&gt;staging;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RADIO(priv, "RX CONFIG:\n");</div><div class='del'>-	iwl_print_hex_dump(priv, IWL_DL_RADIO, (u8 *) rxon, sizeof(*rxon));</div><div class='del'>-	IWL_DEBUG_RADIO(priv, "u16 channel: 0x%x\n",</div><div class='del'>-				le16_to_cpu(rxon-&gt;channel));</div><div class='del'>-	IWL_DEBUG_RADIO(priv, "u32 flags: 0x%08X\n", le32_to_cpu(rxon-&gt;flags));</div><div class='del'>-	IWL_DEBUG_RADIO(priv, "u32 filter_flags: 0x%08x\n",</div><div class='del'>-				le32_to_cpu(rxon-&gt;filter_flags));</div><div class='del'>-	IWL_DEBUG_RADIO(priv, "u8 dev_type: 0x%x\n", rxon-&gt;dev_type);</div><div class='del'>-	IWL_DEBUG_RADIO(priv, "u8 ofdm_basic_rates: 0x%02x\n",</div><div class='del'>-			rxon-&gt;ofdm_basic_rates);</div><div class='del'>-	IWL_DEBUG_RADIO(priv, "u8 cck_basic_rates: 0x%02x\n",</div><div class='del'>-				rxon-&gt;cck_basic_rates);</div><div class='del'>-	IWL_DEBUG_RADIO(priv, "u8[6] node_addr: %pM\n", rxon-&gt;node_addr);</div><div class='del'>-	IWL_DEBUG_RADIO(priv, "u8[6] bssid_addr: %pM\n", rxon-&gt;bssid_addr);</div><div class='del'>-	IWL_DEBUG_RADIO(priv, "u16 assoc_id: 0x%x\n",</div><div class='del'>-				le16_to_cpu(rxon-&gt;assoc_id));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_print_rx_config_cmd);</div><div class='del'>-#endif</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_irq_handle_error - called for HW or SW error interrupt from card</div><div class='del'>- */</div><div class='del'>-void iwl_legacy_irq_handle_error(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	/* Set the FW error flag -- cleared on iwl_down */</div><div class='del'>-	set_bit(STATUS_FW_ERROR, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	/* Cancel currently queued command. */</div><div class='del'>-	clear_bit(STATUS_HCMD_ACTIVE, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	IWL_ERR(priv, "Loaded firmware version: %s\n",</div><div class='del'>-		priv-&gt;hw-&gt;wiphy-&gt;fw_version);</div><div class='del'>-</div><div class='del'>-	priv-&gt;cfg-&gt;ops-&gt;lib-&gt;dump_nic_error_log(priv);</div><div class='del'>-	if (priv-&gt;cfg-&gt;ops-&gt;lib-&gt;dump_fh)</div><div class='del'>-		priv-&gt;cfg-&gt;ops-&gt;lib-&gt;dump_fh(priv, NULL, false);</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	if (iwl_legacy_get_debug_level(priv) &amp; IWL_DL_FW_ERRORS)</div><div class='del'>-		iwl_legacy_print_rx_config_cmd(priv,</div><div class='del'>-					&amp;priv-&gt;contexts[IWL_RXON_CTX_BSS]);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	wake_up(&amp;priv-&gt;wait_command_queue);</div><div class='del'>-</div><div class='del'>-	/* Keep the restart process from trying to send host</div><div class='del'>-	 * commands by clearing the INIT status bit */</div><div class='del'>-	clear_bit(STATUS_READY, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	if (!test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status)) {</div><div class='del'>-		IWL_DEBUG(priv, IWL_DL_FW_ERRORS,</div><div class='del'>-			  "Restarting adapter due to uCode error.\n");</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;cfg-&gt;mod_params-&gt;restart_fw)</div><div class='del'>-			queue_work(priv-&gt;workqueue, &amp;priv-&gt;restart);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_irq_handle_error);</div><div class='del'>-</div><div class='del'>-static int iwl_legacy_apm_stop_master(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/* stop device's busmaster DMA activity */</div><div class='del'>-	iwl_legacy_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER);</div><div class='del'>-</div><div class='del'>-	ret = iwl_poll_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_MASTER_DISABLED,</div><div class='del'>-			CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);</div><div class='del'>-	if (ret)</div><div class='del'>-		IWL_WARN(priv, "Master Disable Timed Out, 100 usec\n");</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "stop master\n");</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_legacy_apm_stop(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Stop card, put in low power state\n");</div><div class='del'>-</div><div class='del'>-	/* Stop device's DMA activity */</div><div class='del'>-	iwl_legacy_apm_stop_master(priv);</div><div class='del'>-</div><div class='del'>-	/* Reset the entire device */</div><div class='del'>-	iwl_legacy_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET);</div><div class='del'>-</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Clear "initialization complete" bit to move adapter from</div><div class='del'>-	 * D0A* (powered-up Active) --&gt; D0U* (Uninitialized) state.</div><div class='del'>-	 */</div><div class='del'>-	iwl_legacy_clear_bit(priv, CSR_GP_CNTRL,</div><div class='del'>-				CSR_GP_CNTRL_REG_FLAG_INIT_DONE);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_apm_stop);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Start up NIC's basic functionality after it has been reset</div><div class='del'>- * (e.g. after platform boot, or shutdown via iwl_legacy_apm_stop())</div><div class='del'>- * NOTE:  This does not load uCode nor start the embedded processor</div><div class='del'>- */</div><div class='del'>-int iwl_legacy_apm_init(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u16 lctl;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Init card's basic functions\n");</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Use "set_bit" below rather than "write", to preserve any hardware</div><div class='del'>-	 * bits already set by default after reset.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Disable L0S exit timer (platform NMI Work/Around) */</div><div class='del'>-	iwl_legacy_set_bit(priv, CSR_GIO_CHICKEN_BITS,</div><div class='del'>-			  CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Disable L0s without affecting L1;</div><div class='del'>-	 *  don't wait for ICH L0s (ICH bug W/A)</div><div class='del'>-	 */</div><div class='del'>-	iwl_legacy_set_bit(priv, CSR_GIO_CHICKEN_BITS,</div><div class='del'>-			  CSR_GIO_CHICKEN_BITS_REG_BIT_L1A_NO_L0S_RX);</div><div class='del'>-</div><div class='del'>-	/* Set FH wait threshold to maximum (HW error during stress W/A) */</div><div class='del'>-	iwl_legacy_set_bit(priv, CSR_DBG_HPET_MEM_REG,</div><div class='del'>-					CSR_DBG_HPET_MEM_REG_VAL);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Enable HAP INTA (interrupt from management bus) to</div><div class='del'>-	 * wake device's PCI Express link L1a -&gt; L0s</div><div class='del'>-	 * NOTE:  This is no-op for 3945 (non-existent bit)</div><div class='del'>-	 */</div><div class='del'>-	iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-				    CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * HW bug W/A for instability in PCIe bus L0-&gt;L0S-&gt;L1 transition.</div><div class='del'>-	 * Check if BIOS (or OS) enabled L1-ASPM on this device.</div><div class='del'>-	 * If so (likely), disable L0S, so device moves directly L0-&gt;L1;</div><div class='del'>-	 *    costs negligible amount of power savings.</div><div class='del'>-	 * If not (unlikely), enable L0S, so there is at least some</div><div class='del'>-	 *    power savings, even without L1.</div><div class='del'>-	 */</div><div class='del'>-	if (priv-&gt;cfg-&gt;base_params-&gt;set_l0s) {</div><div class='del'>-		lctl = iwl_legacy_pcie_link_ctl(priv);</div><div class='del'>-		if ((lctl &amp; PCI_CFG_LINK_CTRL_VAL_L1_EN) ==</div><div class='del'>-					PCI_CFG_LINK_CTRL_VAL_L1_EN) {</div><div class='del'>-			/* L1-ASPM enabled; disable(!) L0S  */</div><div class='del'>-			iwl_legacy_set_bit(priv, CSR_GIO_REG,</div><div class='del'>-					CSR_GIO_REG_VAL_L0S_ENABLED);</div><div class='del'>-			IWL_DEBUG_POWER(priv, "L1 Enabled; Disabling L0S\n");</div><div class='del'>-		} else {</div><div class='del'>-			/* L1-ASPM disabled; enable(!) L0S */</div><div class='del'>-			iwl_legacy_clear_bit(priv, CSR_GIO_REG,</div><div class='del'>-					CSR_GIO_REG_VAL_L0S_ENABLED);</div><div class='del'>-			IWL_DEBUG_POWER(priv, "L1 Disabled; Enabling L0S\n");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Configure analog phase-lock-loop before activating to D0A */</div><div class='del'>-	if (priv-&gt;cfg-&gt;base_params-&gt;pll_cfg_val)</div><div class='del'>-		iwl_legacy_set_bit(priv, CSR_ANA_PLL_CFG,</div><div class='del'>-			    priv-&gt;cfg-&gt;base_params-&gt;pll_cfg_val);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set "initialization complete" bit to move adapter from</div><div class='del'>-	 * D0U* --&gt; D0A* (powered-up active) state.</div><div class='del'>-	 */</div><div class='del'>-	iwl_legacy_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Wait for clock stabilization; once stabilized, access to</div><div class='del'>-	 * device-internal resources is supported, e.g. iwl_legacy_write_prph()</div><div class='del'>-	 * and accesses to uCode SRAM.</div><div class='del'>-	 */</div><div class='del'>-	ret = iwl_poll_bit(priv, CSR_GP_CNTRL,</div><div class='del'>-			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,</div><div class='del'>-			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Failed to init the card\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Enable DMA and BSM (if used) clocks, wait for them to stabilize.</div><div class='del'>-	 * BSM (Boostrap State Machine) is only in 3945 and 4965.</div><div class='del'>-	 *</div><div class='del'>-	 * Write to "CLK_EN_REG"; "1" bits enable clocks, while "0" bits</div><div class='del'>-	 * do not disable clocks.  This preserves any hardware bits already</div><div class='del'>-	 * set by default in "CLK_CTRL_REG" after reset.</div><div class='del'>-	 */</div><div class='del'>-	if (priv-&gt;cfg-&gt;base_params-&gt;use_bsm)</div><div class='del'>-		iwl_legacy_write_prph(priv, APMG_CLK_EN_REG,</div><div class='del'>-			APMG_CLK_VAL_DMA_CLK_RQT | APMG_CLK_VAL_BSM_CLK_RQT);</div><div class='del'>-	else</div><div class='del'>-		iwl_legacy_write_prph(priv, APMG_CLK_EN_REG,</div><div class='del'>-			APMG_CLK_VAL_DMA_CLK_RQT);</div><div class='del'>-	udelay(20);</div><div class='del'>-</div><div class='del'>-	/* Disable L1-Active */</div><div class='del'>-	iwl_legacy_set_bits_prph(priv, APMG_PCIDEV_STT_REG,</div><div class='del'>-			  APMG_PCIDEV_STT_VAL_L1_ACT_DIS);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_apm_init);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int iwl_legacy_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	s8 prev_tx_power;</div><div class='del'>-	bool defer;</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;tx_power_user_lmt == tx_power &amp;&amp; !force)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;cfg-&gt;ops-&gt;lib-&gt;send_tx_power)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	/* 0 dBm mean 1 milliwatt */</div><div class='del'>-	if (tx_power &lt; 0) {</div><div class='del'>-		IWL_WARN(priv,</div><div class='del'>-			 "Requested user TXPOWER %d below 1 mW.\n",</div><div class='del'>-			 tx_power);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (tx_power &gt; priv-&gt;tx_power_device_lmt) {</div><div class='del'>-		IWL_WARN(priv,</div><div class='del'>-			"Requested user TXPOWER %d above upper limit %d.\n",</div><div class='del'>-			 tx_power, priv-&gt;tx_power_device_lmt);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_ready_rf(priv))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	/* scan complete and commit_rxon use tx_power_next value,</div><div class='del'>-	 * it always need to be updated for newest request */</div><div class='del'>-	priv-&gt;tx_power_next = tx_power;</div><div class='del'>-</div><div class='del'>-	/* do not set tx power when scanning or channel changing */</div><div class='del'>-	defer = test_bit(STATUS_SCANNING, &amp;priv-&gt;status) ||</div><div class='del'>-		memcmp(&amp;ctx-&gt;active, &amp;ctx-&gt;staging, sizeof(ctx-&gt;staging));</div><div class='del'>-	if (defer &amp;&amp; !force) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Deferring tx power set\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prev_tx_power = priv-&gt;tx_power_user_lmt;</div><div class='del'>-	priv-&gt;tx_power_user_lmt = tx_power;</div><div class='del'>-</div><div class='del'>-	ret = priv-&gt;cfg-&gt;ops-&gt;lib-&gt;send_tx_power(priv);</div><div class='del'>-</div><div class='del'>-	/* if fail to set tx_power, restore the orig. tx power */</div><div class='del'>-	if (ret) {</div><div class='del'>-		priv-&gt;tx_power_user_lmt = prev_tx_power;</div><div class='del'>-		priv-&gt;tx_power_next = prev_tx_power;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_set_tx_power);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_send_bt_config(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_bt_cmd bt_cmd = {</div><div class='del'>-		.lead_time = BT_LEAD_TIME_DEF,</div><div class='del'>-		.max_kill = BT_MAX_KILL_DEF,</div><div class='del'>-		.kill_ack_mask = 0,</div><div class='del'>-		.kill_cts_mask = 0,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (!bt_coex_active)</div><div class='del'>-		bt_cmd.flags = BT_COEX_DISABLE;</div><div class='del'>-	else</div><div class='del'>-		bt_cmd.flags = BT_COEX_ENABLE;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "BT coex %s\n",</div><div class='del'>-		(bt_cmd.flags == BT_COEX_DISABLE) ? "disable" : "active");</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_send_cmd_pdu(priv, REPLY_BT_CONFIG,</div><div class='del'>-			     sizeof(struct iwl_bt_cmd), &amp;bt_cmd))</div><div class='del'>-		IWL_ERR(priv, "failed to send BT Coex Config\n");</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_send_bt_config);</div><div class='del'>-</div><div class='del'>-int iwl_legacy_send_statistics_request(struct iwl_priv *priv, u8 flags, bool clear)</div><div class='del'>-{</div><div class='del'>-	struct iwl_statistics_cmd statistics_cmd = {</div><div class='del'>-		.configuration_flags =</div><div class='del'>-			clear ? IWL_STATS_CONF_CLEAR_STATS : 0,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (flags &amp; CMD_ASYNC)</div><div class='del'>-		return iwl_legacy_send_cmd_pdu_async(priv, REPLY_STATISTICS_CMD,</div><div class='del'>-					sizeof(struct iwl_statistics_cmd),</div><div class='del'>-					&amp;statistics_cmd, NULL);</div><div class='del'>-	else</div><div class='del'>-		return iwl_legacy_send_cmd_pdu(priv, REPLY_STATISTICS_CMD,</div><div class='del'>-					sizeof(struct iwl_statistics_cmd),</div><div class='del'>-					&amp;statistics_cmd);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_send_statistics_request);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_rx_pm_sleep_notif(struct iwl_priv *priv,</div><div class='del'>-			   struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_sleep_notification *sleep = &amp;(pkt-&gt;u.sleep_notif);</div><div class='del'>-	IWL_DEBUG_RX(priv, "sleep mode: %d, src: %d\n",</div><div class='del'>-		     sleep-&gt;pm_sleep_mode, sleep-&gt;pm_wakeup_src);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_rx_pm_sleep_notif);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_rx_pm_debug_statistics_notif(struct iwl_priv *priv,</div><div class='del'>-				      struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	u32 len = le32_to_cpu(pkt-&gt;len_n_flags) &amp; FH_RSCSR_FRAME_SIZE_MSK;</div><div class='del'>-	IWL_DEBUG_RADIO(priv, "Dumping %d bytes of unhandled "</div><div class='del'>-			"notification for %s:\n", len,</div><div class='del'>-			iwl_legacy_get_cmd_string(pkt-&gt;hdr.cmd));</div><div class='del'>-	iwl_print_hex_dump(priv, IWL_DL_RADIO, pkt-&gt;u.raw, len);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_rx_pm_debug_statistics_notif);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_rx_reply_error(struct iwl_priv *priv,</div><div class='del'>-			struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-</div><div class='del'>-	IWL_ERR(priv, "Error Reply type 0x%08X cmd %s (0x%02X) "</div><div class='del'>-		"seq 0x%04X ser 0x%08X\n",</div><div class='del'>-		le32_to_cpu(pkt-&gt;u.err_resp.error_type),</div><div class='del'>-		iwl_legacy_get_cmd_string(pkt-&gt;u.err_resp.cmd_id),</div><div class='del'>-		pkt-&gt;u.err_resp.cmd_id,</div><div class='del'>-		le16_to_cpu(pkt-&gt;u.err_resp.bad_cmd_seq_num),</div><div class='del'>-		le32_to_cpu(pkt-&gt;u.err_resp.error_info));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_rx_reply_error);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_clear_isr_stats(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	memset(&amp;priv-&gt;isr_stats, 0, sizeof(priv-&gt;isr_stats));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_legacy_mac_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 *params)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int q;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_ready_rf(priv)) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (queue &gt;= AC_NUM) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "leave - queue &gt;= AC_NUM %d\n", queue);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	q = AC_NUM - 1 - queue;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	for_each_context(priv, ctx) {</div><div class='del'>-		ctx-&gt;qos_data.def_qos_parm.ac[q].cw_min =</div><div class='del'>-			cpu_to_le16(params-&gt;cw_min);</div><div class='del'>-		ctx-&gt;qos_data.def_qos_parm.ac[q].cw_max =</div><div class='del'>-			cpu_to_le16(params-&gt;cw_max);</div><div class='del'>-		ctx-&gt;qos_data.def_qos_parm.ac[q].aifsn = params-&gt;aifs;</div><div class='del'>-		ctx-&gt;qos_data.def_qos_parm.ac[q].edca_txop =</div><div class='del'>-				cpu_to_le16((params-&gt;txop * 32));</div><div class='del'>-</div><div class='del'>-		ctx-&gt;qos_data.def_qos_parm.ac[q].reserved1 = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_mac_conf_tx);</div><div class='del'>-</div><div class='del'>-int iwl_legacy_mac_tx_last_beacon(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;ibss_manager == IWL_IBSS_MANAGER;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(iwl_legacy_mac_tx_last_beacon);</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-iwl_legacy_set_mode(struct iwl_priv *priv, struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	iwl_legacy_connection_init_rx_config(priv, ctx);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain)</div><div class='del'>-		priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain(priv, ctx);</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_commit_rxon(priv, ctx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_legacy_setup_interface(struct iwl_priv *priv,</div><div class='del'>-			       struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_vif *vif = ctx-&gt;vif;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This variable will be correct only when there's just</div><div class='del'>-	 * a single context, but all code using it is for hardware</div><div class='del'>-	 * that supports only one context.</div><div class='del'>-	 */</div><div class='del'>-	priv-&gt;iw_mode = vif-&gt;type;</div><div class='del'>-</div><div class='del'>-	ctx-&gt;is_active = true;</div><div class='del'>-</div><div class='del'>-	err = iwl_legacy_set_mode(priv, ctx);</div><div class='del'>-	if (err) {</div><div class='del'>-		if (!ctx-&gt;always_active)</div><div class='del'>-			ctx-&gt;is_active = false;</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'>-int</div><div class='del'>-iwl_legacy_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='del'>-	struct iwl_rxon_context *tmp, *ctx = NULL;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter: type %d, addr %pM\n",</div><div class='del'>-			   vif-&gt;type, vif-&gt;addr);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_ready_rf(priv)) {</div><div class='del'>-		IWL_WARN(priv, "Try to add interface when device not ready\n");</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_context(priv, tmp) {</div><div class='del'>-		u32 possible_modes =</div><div class='del'>-			tmp-&gt;interface_modes | tmp-&gt;exclusive_interface_modes;</div><div class='del'>-</div><div class='del'>-		if (tmp-&gt;vif) {</div><div class='del'>-			/* check if this busy context is exclusive */</div><div class='del'>-			if (tmp-&gt;exclusive_interface_modes &amp;</div><div class='del'>-						BIT(tmp-&gt;vif-&gt;type)) {</div><div class='del'>-				err = -EINVAL;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!(possible_modes &amp; BIT(vif-&gt;type)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* have maybe usable context w/o interface */</div><div class='del'>-		ctx = tmp;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ctx) {</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vif_priv-&gt;ctx = ctx;</div><div class='del'>-	ctx-&gt;vif = vif;</div><div class='del'>-</div><div class='del'>-	err = iwl_legacy_setup_interface(priv, ctx);</div><div class='del'>-	if (!err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ctx-&gt;vif = NULL;</div><div class='del'>-	priv-&gt;iw_mode = NL80211_IFTYPE_STATION;</div><div class='del'>- out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_mac_add_interface);</div><div class='del'>-</div><div class='del'>-static void iwl_legacy_teardown_interface(struct iwl_priv *priv,</div><div class='del'>-				   struct ieee80211_vif *vif,</div><div class='del'>-				   bool mode_change)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rxon_context *ctx = iwl_legacy_rxon_ctx_from_vif(vif);</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;scan_vif == vif) {</div><div class='del'>-		iwl_legacy_scan_cancel_timeout(priv, 200);</div><div class='del'>-		iwl_legacy_force_scan_end(priv);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!mode_change) {</div><div class='del'>-		iwl_legacy_set_mode(priv, ctx);</div><div class='del'>-		if (!ctx-&gt;always_active)</div><div class='del'>-			ctx-&gt;is_active = false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_legacy_mac_remove_interface(struct ieee80211_hw *hw,</div><div class='del'>-			      struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_rxon_context *ctx = iwl_legacy_rxon_ctx_from_vif(vif);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	WARN_ON(ctx-&gt;vif != vif);</div><div class='del'>-	ctx-&gt;vif = NULL;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_teardown_interface(priv, vif, false);</div><div class='del'>-</div><div class='del'>-	memset(priv-&gt;bssid, 0, ETH_ALEN);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_mac_remove_interface);</div><div class='del'>-</div><div class='del'>-int iwl_legacy_alloc_txq_mem(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	if (!priv-&gt;txq)</div><div class='del'>-		priv-&gt;txq = kzalloc(</div><div class='del'>-			sizeof(struct iwl_tx_queue) *</div><div class='del'>-				priv-&gt;cfg-&gt;base_params-&gt;num_of_queues,</div><div class='del'>-			GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;txq) {</div><div class='del'>-		IWL_ERR(priv, "Not enough memory for txq\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_alloc_txq_mem);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_txq_mem(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	kfree(priv-&gt;txq);</div><div class='del'>-	priv-&gt;txq = NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_txq_mem);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS</div><div class='del'>-</div><div class='del'>-#define IWL_TRAFFIC_DUMP_SIZE	(IWL_TRAFFIC_ENTRY_SIZE * IWL_TRAFFIC_ENTRIES)</div><div class='del'>-</div><div class='del'>-void iwl_legacy_reset_traffic_log(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	priv-&gt;tx_traffic_idx = 0;</div><div class='del'>-	priv-&gt;rx_traffic_idx = 0;</div><div class='del'>-	if (priv-&gt;tx_traffic)</div><div class='del'>-		memset(priv-&gt;tx_traffic, 0, IWL_TRAFFIC_DUMP_SIZE);</div><div class='del'>-	if (priv-&gt;rx_traffic)</div><div class='del'>-		memset(priv-&gt;rx_traffic, 0, IWL_TRAFFIC_DUMP_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_legacy_alloc_traffic_mem(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	u32 traffic_size = IWL_TRAFFIC_DUMP_SIZE;</div><div class='del'>-</div><div class='del'>-	if (iwlegacy_debug_level &amp; IWL_DL_TX) {</div><div class='del'>-		if (!priv-&gt;tx_traffic) {</div><div class='del'>-			priv-&gt;tx_traffic =</div><div class='del'>-				kzalloc(traffic_size, GFP_KERNEL);</div><div class='del'>-			if (!priv-&gt;tx_traffic)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (iwlegacy_debug_level &amp; IWL_DL_RX) {</div><div class='del'>-		if (!priv-&gt;rx_traffic) {</div><div class='del'>-			priv-&gt;rx_traffic =</div><div class='del'>-				kzalloc(traffic_size, GFP_KERNEL);</div><div class='del'>-			if (!priv-&gt;rx_traffic)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	iwl_legacy_reset_traffic_log(priv);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_alloc_traffic_mem);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_free_traffic_mem(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	kfree(priv-&gt;tx_traffic);</div><div class='del'>-	priv-&gt;tx_traffic = NULL;</div><div class='del'>-</div><div class='del'>-	kfree(priv-&gt;rx_traffic);</div><div class='del'>-	priv-&gt;rx_traffic = NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_free_traffic_mem);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_dbg_log_tx_data_frame(struct iwl_priv *priv,</div><div class='del'>-		      u16 length, struct ieee80211_hdr *header)</div><div class='del'>-{</div><div class='del'>-	__le16 fc;</div><div class='del'>-	u16 len;</div><div class='del'>-</div><div class='del'>-	if (likely(!(iwlegacy_debug_level &amp; IWL_DL_TX)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;tx_traffic)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	fc = header-&gt;frame_control;</div><div class='del'>-	if (ieee80211_is_data(fc)) {</div><div class='del'>-		len = (length &gt; IWL_TRAFFIC_ENTRY_SIZE)</div><div class='del'>-		       ? IWL_TRAFFIC_ENTRY_SIZE : length;</div><div class='del'>-		memcpy((priv-&gt;tx_traffic +</div><div class='del'>-		       (priv-&gt;tx_traffic_idx * IWL_TRAFFIC_ENTRY_SIZE)),</div><div class='del'>-		       header, len);</div><div class='del'>-		priv-&gt;tx_traffic_idx =</div><div class='del'>-			(priv-&gt;tx_traffic_idx + 1) % IWL_TRAFFIC_ENTRIES;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_dbg_log_tx_data_frame);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_dbg_log_rx_data_frame(struct iwl_priv *priv,</div><div class='del'>-		      u16 length, struct ieee80211_hdr *header)</div><div class='del'>-{</div><div class='del'>-	__le16 fc;</div><div class='del'>-	u16 len;</div><div class='del'>-</div><div class='del'>-	if (likely(!(iwlegacy_debug_level &amp; IWL_DL_RX)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;rx_traffic)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	fc = header-&gt;frame_control;</div><div class='del'>-	if (ieee80211_is_data(fc)) {</div><div class='del'>-		len = (length &gt; IWL_TRAFFIC_ENTRY_SIZE)</div><div class='del'>-		       ? IWL_TRAFFIC_ENTRY_SIZE : length;</div><div class='del'>-		memcpy((priv-&gt;rx_traffic +</div><div class='del'>-		       (priv-&gt;rx_traffic_idx * IWL_TRAFFIC_ENTRY_SIZE)),</div><div class='del'>-		       header, len);</div><div class='del'>-		priv-&gt;rx_traffic_idx =</div><div class='del'>-			(priv-&gt;rx_traffic_idx + 1) % IWL_TRAFFIC_ENTRIES;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_dbg_log_rx_data_frame);</div><div class='del'>-</div><div class='del'>-const char *iwl_legacy_get_mgmt_string(int cmd)</div><div class='del'>-{</div><div class='del'>-	switch (cmd) {</div><div class='del'>-		IWL_CMD(MANAGEMENT_ASSOC_REQ);</div><div class='del'>-		IWL_CMD(MANAGEMENT_ASSOC_RESP);</div><div class='del'>-		IWL_CMD(MANAGEMENT_REASSOC_REQ);</div><div class='del'>-		IWL_CMD(MANAGEMENT_REASSOC_RESP);</div><div class='del'>-		IWL_CMD(MANAGEMENT_PROBE_REQ);</div><div class='del'>-		IWL_CMD(MANAGEMENT_PROBE_RESP);</div><div class='del'>-		IWL_CMD(MANAGEMENT_BEACON);</div><div class='del'>-		IWL_CMD(MANAGEMENT_ATIM);</div><div class='del'>-		IWL_CMD(MANAGEMENT_DISASSOC);</div><div class='del'>-		IWL_CMD(MANAGEMENT_AUTH);</div><div class='del'>-		IWL_CMD(MANAGEMENT_DEAUTH);</div><div class='del'>-		IWL_CMD(MANAGEMENT_ACTION);</div><div class='del'>-	default:</div><div class='del'>-		return "UNKNOWN";</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *iwl_legacy_get_ctrl_string(int cmd)</div><div class='del'>-{</div><div class='del'>-	switch (cmd) {</div><div class='del'>-		IWL_CMD(CONTROL_BACK_REQ);</div><div class='del'>-		IWL_CMD(CONTROL_BACK);</div><div class='del'>-		IWL_CMD(CONTROL_PSPOLL);</div><div class='del'>-		IWL_CMD(CONTROL_RTS);</div><div class='del'>-		IWL_CMD(CONTROL_CTS);</div><div class='del'>-		IWL_CMD(CONTROL_ACK);</div><div class='del'>-		IWL_CMD(CONTROL_CFEND);</div><div class='del'>-		IWL_CMD(CONTROL_CFENDACK);</div><div class='del'>-	default:</div><div class='del'>-		return "UNKNOWN";</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_legacy_clear_traffic_stats(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	memset(&amp;priv-&gt;tx_stats, 0, sizeof(struct traffic_stats));</div><div class='del'>-	memset(&amp;priv-&gt;rx_stats, 0, sizeof(struct traffic_stats));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * if CONFIG_IWLWIFI_LEGACY_DEBUGFS defined,</div><div class='del'>- * iwl_legacy_update_stats function will</div><div class='del'>- * record all the MGMT, CTRL and DATA pkt for both TX and Rx pass</div><div class='del'>- * Use debugFs to display the rx/rx_statistics</div><div class='del'>- * if CONFIG_IWLWIFI_LEGACY_DEBUGFS not being defined, then no MGMT and CTRL</div><div class='del'>- * information will be recorded, but DATA pkt still will be recorded</div><div class='del'>- * for the reason of iwl_led.c need to control the led blinking based on</div><div class='del'>- * number of tx and rx data.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-iwl_legacy_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc, u16 len)</div><div class='del'>-{</div><div class='del'>-	struct traffic_stats	*stats;</div><div class='del'>-</div><div class='del'>-	if (is_tx)</div><div class='del'>-		stats = &amp;priv-&gt;tx_stats;</div><div class='del'>-	else</div><div class='del'>-		stats = &amp;priv-&gt;rx_stats;</div><div class='del'>-</div><div class='del'>-	if (ieee80211_is_mgmt(fc)) {</div><div class='del'>-		switch (fc &amp; cpu_to_le16(IEEE80211_FCTL_STYPE)) {</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_ASSOC_REQ):</div><div class='del'>-			stats-&gt;mgmt[MANAGEMENT_ASSOC_REQ]++;</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):</div><div class='del'>-			stats-&gt;mgmt[MANAGEMENT_ASSOC_RESP]++;</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_REASSOC_REQ):</div><div class='del'>-			stats-&gt;mgmt[MANAGEMENT_REASSOC_REQ]++;</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):</div><div class='del'>-			stats-&gt;mgmt[MANAGEMENT_REASSOC_RESP]++;</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_PROBE_REQ):</div><div class='del'>-			stats-&gt;mgmt[MANAGEMENT_PROBE_REQ]++;</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):</div><div class='del'>-			stats-&gt;mgmt[MANAGEMENT_PROBE_RESP]++;</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_BEACON):</div><div class='del'>-			stats-&gt;mgmt[MANAGEMENT_BEACON]++;</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_ATIM):</div><div class='del'>-			stats-&gt;mgmt[MANAGEMENT_ATIM]++;</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_DISASSOC):</div><div class='del'>-			stats-&gt;mgmt[MANAGEMENT_DISASSOC]++;</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_AUTH):</div><div class='del'>-			stats-&gt;mgmt[MANAGEMENT_AUTH]++;</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_DEAUTH):</div><div class='del'>-			stats-&gt;mgmt[MANAGEMENT_DEAUTH]++;</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_ACTION):</div><div class='del'>-			stats-&gt;mgmt[MANAGEMENT_ACTION]++;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else if (ieee80211_is_ctl(fc)) {</div><div class='del'>-		switch (fc &amp; cpu_to_le16(IEEE80211_FCTL_STYPE)) {</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_BACK_REQ):</div><div class='del'>-			stats-&gt;ctrl[CONTROL_BACK_REQ]++;</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_BACK):</div><div class='del'>-			stats-&gt;ctrl[CONTROL_BACK]++;</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_PSPOLL):</div><div class='del'>-			stats-&gt;ctrl[CONTROL_PSPOLL]++;</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_RTS):</div><div class='del'>-			stats-&gt;ctrl[CONTROL_RTS]++;</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_CTS):</div><div class='del'>-			stats-&gt;ctrl[CONTROL_CTS]++;</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_ACK):</div><div class='del'>-			stats-&gt;ctrl[CONTROL_ACK]++;</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_CFEND):</div><div class='del'>-			stats-&gt;ctrl[CONTROL_CFEND]++;</div><div class='del'>-			break;</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_CFENDACK):</div><div class='del'>-			stats-&gt;ctrl[CONTROL_CFENDACK]++;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* data */</div><div class='del'>-		stats-&gt;data_cnt++;</div><div class='del'>-		stats-&gt;data_bytes += len;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_update_stats);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int iwl_legacy_force_reset(struct iwl_priv *priv, bool external)</div><div class='del'>-{</div><div class='del'>-	struct iwl_force_reset *force_reset;</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	force_reset = &amp;priv-&gt;force_reset;</div><div class='del'>-	force_reset-&gt;reset_request_count++;</div><div class='del'>-	if (!external) {</div><div class='del'>-		if (force_reset-&gt;last_force_reset_jiffies &amp;&amp;</div><div class='del'>-		    time_after(force_reset-&gt;last_force_reset_jiffies +</div><div class='del'>-		    force_reset-&gt;reset_duration, jiffies)) {</div><div class='del'>-			IWL_DEBUG_INFO(priv, "force reset rejected\n");</div><div class='del'>-			force_reset-&gt;reset_reject_count++;</div><div class='del'>-			return -EAGAIN;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	force_reset-&gt;reset_success_count++;</div><div class='del'>-	force_reset-&gt;last_force_reset_jiffies = jiffies;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if the request is from external(ex: debugfs),</div><div class='del'>-	 * then always perform the request in regardless the module</div><div class='del'>-	 * parameter setting</div><div class='del'>-	 * if the request is from internal (uCode error or driver</div><div class='del'>-	 * detect failure), then fw_restart module parameter</div><div class='del'>-	 * need to be check before performing firmware reload</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (!external &amp;&amp; !priv-&gt;cfg-&gt;mod_params-&gt;restart_fw) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Cancel firmware reload based on "</div><div class='del'>-			       "module parameter setting\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_ERR(priv, "On demand firmware reload\n");</div><div class='del'>-</div><div class='del'>-	/* Set the FW error flag -- cleared on iwl_down */</div><div class='del'>-	set_bit(STATUS_FW_ERROR, &amp;priv-&gt;status);</div><div class='del'>-	wake_up(&amp;priv-&gt;wait_command_queue);</div><div class='del'>-	/*</div><div class='del'>-	 * Keep the restart process from trying to send host</div><div class='del'>-	 * commands by clearing the INIT status bit</div><div class='del'>-	 */</div><div class='del'>-	clear_bit(STATUS_READY, &amp;priv-&gt;status);</div><div class='del'>-	queue_work(priv-&gt;workqueue, &amp;priv-&gt;restart);</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'>-iwl_legacy_mac_change_interface(struct ieee80211_hw *hw,</div><div class='del'>-			struct ieee80211_vif *vif,</div><div class='del'>-			enum nl80211_iftype newtype, bool newp2p)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_rxon_context *ctx = iwl_legacy_rxon_ctx_from_vif(vif);</div><div class='del'>-	struct iwl_rxon_context *tmp;</div><div class='del'>-	u32 interface_modes;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	newtype = ieee80211_iftype_p2p(newtype, newp2p);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (!ctx-&gt;vif || !iwl_legacy_is_ready_rf(priv)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Huh? But wait ... this can maybe happen when</div><div class='del'>-		 * we're in the middle of a firmware restart!</div><div class='del'>-		 */</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	interface_modes = ctx-&gt;interface_modes | ctx-&gt;exclusive_interface_modes;</div><div class='del'>-</div><div class='del'>-	if (!(interface_modes &amp; BIT(newtype))) {</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;exclusive_interface_modes &amp; BIT(newtype)) {</div><div class='del'>-		for_each_context(priv, tmp) {</div><div class='del'>-			if (ctx == tmp)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (!tmp-&gt;vif)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * The current mode switch would be exclusive, but</div><div class='del'>-			 * another context is active ... refuse the switch.</div><div class='del'>-			 */</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* success */</div><div class='del'>-	iwl_legacy_teardown_interface(priv, vif, true);</div><div class='del'>-	vif-&gt;type = newtype;</div><div class='del'>-	vif-&gt;p2p = newp2p;</div><div class='del'>-	err = iwl_legacy_setup_interface(priv, ctx);</div><div class='del'>-	WARN_ON(err);</div><div class='del'>-	/*</div><div class='del'>-	 * We've switched internally, but submitting to the</div><div class='del'>-	 * device may have failed for some reason. Mask this</div><div class='del'>-	 * error, because otherwise mac80211 will not switch</div><div class='del'>-	 * (and set the interface type back) and we'll be</div><div class='del'>-	 * out of sync with it.</div><div class='del'>-	 */</div><div class='del'>-	err = 0;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_mac_change_interface);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * On every watchdog tick we check (latest) time stamp. If it does not</div><div class='del'>- * change during timeout period and queue is not empty we reset firmware.</div><div class='del'>- */</div><div class='del'>-static int iwl_legacy_check_stuck_queue(struct iwl_priv *priv, int cnt)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tx_queue *txq = &amp;priv-&gt;txq[cnt];</div><div class='del'>-	struct iwl_queue *q = &amp;txq-&gt;q;</div><div class='del'>-	unsigned long timeout;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (q-&gt;read_ptr == q-&gt;write_ptr) {</div><div class='del'>-		txq-&gt;time_stamp = jiffies;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	timeout = txq-&gt;time_stamp +</div><div class='del'>-		  msecs_to_jiffies(priv-&gt;cfg-&gt;base_params-&gt;wd_timeout);</div><div class='del'>-</div><div class='del'>-	if (time_after(jiffies, timeout)) {</div><div class='del'>-		IWL_ERR(priv, "Queue %d stuck for %u ms.\n",</div><div class='del'>-				q-&gt;id, priv-&gt;cfg-&gt;base_params-&gt;wd_timeout);</div><div class='del'>-		ret = iwl_legacy_force_reset(priv, false);</div><div class='del'>-		return (ret == -EAGAIN) ? 0 : 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'>- * Making watchdog tick be a quarter of timeout assure we will</div><div class='del'>- * discover the queue hung between timeout and 1.25*timeout</div><div class='del'>- */</div><div class='del'>-#define IWL_WD_TICK(timeout) ((timeout) / 4)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Watchdog timer callback, we check each tx queue for stuck, if if hung</div><div class='del'>- * we reset the firmware. If everything is fine just rearm the timer.</div><div class='del'>- */</div><div class='del'>-void iwl_legacy_bg_watchdog(unsigned long data)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = (struct iwl_priv *)data;</div><div class='del'>-	int cnt;</div><div class='del'>-	unsigned long timeout;</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	timeout = priv-&gt;cfg-&gt;base_params-&gt;wd_timeout;</div><div class='del'>-	if (timeout == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* monitor and check for stuck cmd queue */</div><div class='del'>-	if (iwl_legacy_check_stuck_queue(priv, priv-&gt;cmd_queue))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* monitor and check for other stuck queues */</div><div class='del'>-	if (iwl_legacy_is_any_associated(priv)) {</div><div class='del'>-		for (cnt = 0; cnt &lt; priv-&gt;hw_params.max_txq_num; cnt++) {</div><div class='del'>-			/* skip as we already checked the command queue */</div><div class='del'>-			if (cnt == priv-&gt;cmd_queue)</div><div class='del'>-				continue;</div><div class='del'>-			if (iwl_legacy_check_stuck_queue(priv, cnt))</div><div class='del'>-				return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mod_timer(&amp;priv-&gt;watchdog, jiffies +</div><div class='del'>-		  msecs_to_jiffies(IWL_WD_TICK(timeout)));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_bg_watchdog);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_setup_watchdog(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	unsigned int timeout = priv-&gt;cfg-&gt;base_params-&gt;wd_timeout;</div><div class='del'>-</div><div class='del'>-	if (timeout)</div><div class='del'>-		mod_timer(&amp;priv-&gt;watchdog,</div><div class='del'>-			  jiffies + msecs_to_jiffies(IWL_WD_TICK(timeout)));</div><div class='del'>-	else</div><div class='del'>-		del_timer(&amp;priv-&gt;watchdog);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_setup_watchdog);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * extended beacon time format</div><div class='del'>- * time in usec will be changed into a 32-bit value in extended:internal format</div><div class='del'>- * the extended part is the beacon counts</div><div class='del'>- * the internal part is the time in usec within one beacon interval</div><div class='del'>- */</div><div class='del'>-u32</div><div class='del'>-iwl_legacy_usecs_to_beacons(struct iwl_priv *priv,</div><div class='del'>-					u32 usec, u32 beacon_interval)</div><div class='del'>-{</div><div class='del'>-	u32 quot;</div><div class='del'>-	u32 rem;</div><div class='del'>-	u32 interval = beacon_interval * TIME_UNIT;</div><div class='del'>-</div><div class='del'>-	if (!interval || !usec)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	quot = (usec / interval) &amp;</div><div class='del'>-		(iwl_legacy_beacon_time_mask_high(priv,</div><div class='del'>-		priv-&gt;hw_params.beacon_time_tsf_bits) &gt;&gt;</div><div class='del'>-		priv-&gt;hw_params.beacon_time_tsf_bits);</div><div class='del'>-	rem = (usec % interval) &amp; iwl_legacy_beacon_time_mask_low(priv,</div><div class='del'>-				   priv-&gt;hw_params.beacon_time_tsf_bits);</div><div class='del'>-</div><div class='del'>-	return (quot &lt;&lt; priv-&gt;hw_params.beacon_time_tsf_bits) + rem;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_usecs_to_beacons);</div><div class='del'>-</div><div class='del'>-/* base is usually what we get from ucode with each received frame,</div><div class='del'>- * the same as HW timer counter counting down</div><div class='del'>- */</div><div class='del'>-__le32 iwl_legacy_add_beacon_time(struct iwl_priv *priv, u32 base,</div><div class='del'>-			   u32 addon, u32 beacon_interval)</div><div class='del'>-{</div><div class='del'>-	u32 base_low = base &amp; iwl_legacy_beacon_time_mask_low(priv,</div><div class='del'>-					priv-&gt;hw_params.beacon_time_tsf_bits);</div><div class='del'>-	u32 addon_low = addon &amp; iwl_legacy_beacon_time_mask_low(priv,</div><div class='del'>-					priv-&gt;hw_params.beacon_time_tsf_bits);</div><div class='del'>-	u32 interval = beacon_interval * TIME_UNIT;</div><div class='del'>-	u32 res = (base &amp; iwl_legacy_beacon_time_mask_high(priv,</div><div class='del'>-				priv-&gt;hw_params.beacon_time_tsf_bits)) +</div><div class='del'>-				(addon &amp; iwl_legacy_beacon_time_mask_high(priv,</div><div class='del'>-				priv-&gt;hw_params.beacon_time_tsf_bits));</div><div class='del'>-</div><div class='del'>-	if (base_low &gt; addon_low)</div><div class='del'>-		res += base_low - addon_low;</div><div class='del'>-	else if (base_low &lt; addon_low) {</div><div class='del'>-		res += interval + base_low - addon_low;</div><div class='del'>-		res += (1 &lt;&lt; priv-&gt;hw_params.beacon_time_tsf_bits);</div><div class='del'>-	} else</div><div class='del'>-		res += (1 &lt;&lt; priv-&gt;hw_params.beacon_time_tsf_bits);</div><div class='del'>-</div><div class='del'>-	return cpu_to_le32(res);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_add_beacon_time);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-</div><div class='del'>-int iwl_legacy_pci_suspend(struct device *device)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(device);</div><div class='del'>-	struct iwl_priv *priv = pci_get_drvdata(pdev);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This function is called when system goes into suspend state</div><div class='del'>-	 * mac80211 will call iwl_mac_stop() from the mac80211 suspend function</div><div class='del'>-	 * first but since iwl_mac_stop() has no knowledge of who the caller is,</div><div class='del'>-	 * it will not call apm_ops.stop() to stop the DMA operation.</div><div class='del'>-	 * Calling apm_ops.stop here to make sure we stop the DMA.</div><div class='del'>-	 */</div><div class='del'>-	iwl_legacy_apm_stop(priv);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_pci_suspend);</div><div class='del'>-</div><div class='del'>-int iwl_legacy_pci_resume(struct device *device)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(device);</div><div class='del'>-	struct iwl_priv *priv = pci_get_drvdata(pdev);</div><div class='del'>-	bool hw_rfkill = false;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We disable the RETRY_TIMEOUT register (0x41) to keep</div><div class='del'>-	 * PCI Tx retries from interfering with C3 CPU state.</div><div class='del'>-	 */</div><div class='del'>-	pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_enable_interrupts(priv);</div><div class='del'>-</div><div class='del'>-	if (!(iwl_read32(priv, CSR_GP_CNTRL) &amp;</div><div class='del'>-				CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW))</div><div class='del'>-		hw_rfkill = true;</div><div class='del'>-</div><div class='del'>-	if (hw_rfkill)</div><div class='del'>-		set_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-	else</div><div class='del'>-		clear_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	wiphy_rfkill_set_hw_state(priv-&gt;hw-&gt;wiphy, hw_rfkill);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_pci_resume);</div><div class='del'>-</div><div class='del'>-const struct dev_pm_ops iwl_legacy_pm_ops = {</div><div class='del'>-	.suspend = iwl_legacy_pci_suspend,</div><div class='del'>-	.resume = iwl_legacy_pci_resume,</div><div class='del'>-	.freeze = iwl_legacy_pci_suspend,</div><div class='del'>-	.thaw = iwl_legacy_pci_resume,</div><div class='del'>-	.poweroff = iwl_legacy_pci_suspend,</div><div class='del'>-	.restore = iwl_legacy_pci_resume,</div><div class='del'>-};</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_pm_ops);</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-iwl_legacy_update_qos(struct iwl_priv *priv, struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!ctx-&gt;is_active)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ctx-&gt;qos_data.def_qos_parm.qos_flags = 0;</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;qos_data.qos_active)</div><div class='del'>-		ctx-&gt;qos_data.def_qos_parm.qos_flags |=</div><div class='del'>-			QOS_PARAM_FLG_UPDATE_EDCA_MSK;</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;ht.enabled)</div><div class='del'>-		ctx-&gt;qos_data.def_qos_parm.qos_flags |= QOS_PARAM_FLG_TGN_MSK;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_QOS(priv, "send QoS cmd with Qos active=%d FLAGS=0x%X\n",</div><div class='del'>-		      ctx-&gt;qos_data.qos_active,</div><div class='del'>-		      ctx-&gt;qos_data.def_qos_parm.qos_flags);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_send_cmd_pdu_async(priv, ctx-&gt;qos_cmd,</div><div class='del'>-			       sizeof(struct iwl_qosparam_cmd),</div><div class='del'>-			       &amp;ctx-&gt;qos_data.def_qos_parm, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_mac_config - mac80211 config callback</div><div class='del'>- */</div><div class='del'>-int iwl_legacy_mac_config(struct ieee80211_hw *hw, u32 changed)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	const struct iwl_channel_info *ch_info;</div><div class='del'>-	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</div><div class='del'>-	struct ieee80211_channel *channel = conf-&gt;channel;</div><div class='del'>-	struct iwl_ht_config *ht_conf = &amp;priv-&gt;current_ht_config;</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-	unsigned long flags = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u16 ch;</div><div class='del'>-	int scan_active = 0;</div><div class='del'>-	bool ht_changed[NUM_IWL_RXON_CTX] = {};</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(!priv-&gt;cfg-&gt;ops-&gt;legacy))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter to channel %d changed 0x%X\n",</div><div class='del'>-					channel-&gt;hw_value, changed);</div><div class='del'>-</div><div class='del'>-	if (unlikely(test_bit(STATUS_SCANNING, &amp;priv-&gt;status))) {</div><div class='del'>-		scan_active = 1;</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "scan active\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed &amp; (IEEE80211_CONF_CHANGE_SMPS |</div><div class='del'>-		       IEEE80211_CONF_CHANGE_CHANNEL)) {</div><div class='del'>-		/* mac80211 uses static for non-HT which is what we want */</div><div class='del'>-		priv-&gt;current_ht_config.smps = conf-&gt;smps_mode;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Recalculate chain counts.</div><div class='del'>-		 *</div><div class='del'>-		 * If monitor mode is enabled then mac80211 will</div><div class='del'>-		 * set up the SM PS mode to OFF if an HT channel is</div><div class='del'>-		 * configured.</div><div class='del'>-		 */</div><div class='del'>-		if (priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain)</div><div class='del'>-			for_each_context(priv, ctx)</div><div class='del'>-				priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain(priv, ctx);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* during scanning mac80211 will delay channel setting until</div><div class='del'>-	 * scan finish with changed = 0</div><div class='del'>-	 */</div><div class='del'>-	if (!changed || (changed &amp; IEEE80211_CONF_CHANGE_CHANNEL)) {</div><div class='del'>-		if (scan_active)</div><div class='del'>-			goto set_ch_out;</div><div class='del'>-</div><div class='del'>-		ch = channel-&gt;hw_value;</div><div class='del'>-		ch_info = iwl_legacy_get_channel_info(priv, channel-&gt;band, ch);</div><div class='del'>-		if (!iwl_legacy_is_channel_valid(ch_info)) {</div><div class='del'>-			IWL_DEBUG_MAC80211(priv, "leave - invalid channel\n");</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto set_ch_out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;iw_mode == NL80211_IFTYPE_ADHOC &amp;&amp;</div><div class='del'>-		    !iwl_legacy_is_channel_ibss(ch_info)) {</div><div class='del'>-			IWL_DEBUG_MAC80211(priv, "leave - not IBSS channel\n");</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			goto set_ch_out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-		for_each_context(priv, ctx) {</div><div class='del'>-			/* Configure HT40 channels */</div><div class='del'>-			if (ctx-&gt;ht.enabled != conf_is_ht(conf)) {</div><div class='del'>-				ctx-&gt;ht.enabled = conf_is_ht(conf);</div><div class='del'>-				ht_changed[ctx-&gt;ctxid] = true;</div><div class='del'>-			}</div><div class='del'>-			if (ctx-&gt;ht.enabled) {</div><div class='del'>-				if (conf_is_ht40_minus(conf)) {</div><div class='del'>-					ctx-&gt;ht.extension_chan_offset =</div><div class='del'>-					IEEE80211_HT_PARAM_CHA_SEC_BELOW;</div><div class='del'>-					ctx-&gt;ht.is_40mhz = true;</div><div class='del'>-				} else if (conf_is_ht40_plus(conf)) {</div><div class='del'>-					ctx-&gt;ht.extension_chan_offset =</div><div class='del'>-					IEEE80211_HT_PARAM_CHA_SEC_ABOVE;</div><div class='del'>-					ctx-&gt;ht.is_40mhz = true;</div><div class='del'>-				} else {</div><div class='del'>-					ctx-&gt;ht.extension_chan_offset =</div><div class='del'>-					IEEE80211_HT_PARAM_CHA_SEC_NONE;</div><div class='del'>-					ctx-&gt;ht.is_40mhz = false;</div><div class='del'>-				}</div><div class='del'>-			} else</div><div class='del'>-				ctx-&gt;ht.is_40mhz = false;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Default to no protection. Protection mode will</div><div class='del'>-			 * later be set from BSS config in iwl_ht_conf</div><div class='del'>-			 */</div><div class='del'>-			ctx-&gt;ht.protection =</div><div class='del'>-					IEEE80211_HT_OP_MODE_PROTECTION_NONE;</div><div class='del'>-</div><div class='del'>-			/* if we are switching from ht to 2.4 clear flags</div><div class='del'>-			 * from any ht related info since 2.4 does not</div><div class='del'>-			 * support ht */</div><div class='del'>-			if ((le16_to_cpu(ctx-&gt;staging.channel) != ch))</div><div class='del'>-				ctx-&gt;staging.flags = 0;</div><div class='del'>-</div><div class='del'>-			iwl_legacy_set_rxon_channel(priv, channel, ctx);</div><div class='del'>-			iwl_legacy_set_rxon_ht(priv, ht_conf);</div><div class='del'>-</div><div class='del'>-			iwl_legacy_set_flags_for_band(priv, ctx, channel-&gt;band,</div><div class='del'>-					       ctx-&gt;vif);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;cfg-&gt;ops-&gt;legacy-&gt;update_bcast_stations)</div><div class='del'>-			ret =</div><div class='del'>-			priv-&gt;cfg-&gt;ops-&gt;legacy-&gt;update_bcast_stations(priv);</div><div class='del'>-</div><div class='del'>- set_ch_out:</div><div class='del'>-		/* The list of supported rates and rate mask can be different</div><div class='del'>-		 * for each band; since the band may have changed, reset</div><div class='del'>-		 * the rate mask to what mac80211 lists */</div><div class='del'>-		iwl_legacy_set_rate(priv);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed &amp; (IEEE80211_CONF_CHANGE_PS |</div><div class='del'>-			IEEE80211_CONF_CHANGE_IDLE)) {</div><div class='del'>-		ret = iwl_legacy_power_update_mode(priv, false);</div><div class='del'>-		if (ret)</div><div class='del'>-			IWL_DEBUG_MAC80211(priv, "Error setting sleep level\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed &amp; IEEE80211_CONF_CHANGE_POWER) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "TX Power old=%d new=%d\n",</div><div class='del'>-			priv-&gt;tx_power_user_lmt, conf-&gt;power_level);</div><div class='del'>-</div><div class='del'>-		iwl_legacy_set_tx_power(priv, conf-&gt;power_level, false);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_ready(priv)) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "leave - not ready\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (scan_active)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	for_each_context(priv, ctx) {</div><div class='del'>-		if (memcmp(&amp;ctx-&gt;active, &amp;ctx-&gt;staging, sizeof(ctx-&gt;staging)))</div><div class='del'>-			iwl_legacy_commit_rxon(priv, ctx);</div><div class='del'>-		else</div><div class='del'>-			IWL_DEBUG_INFO(priv,</div><div class='del'>-				"Not re-sending same RXON configuration.\n");</div><div class='del'>-		if (ht_changed[ctx-&gt;ctxid])</div><div class='del'>-			iwl_legacy_update_qos(priv, ctx);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_mac_config);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_mac_reset_tsf(struct ieee80211_hw *hw,</div><div class='del'>-			      struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	/* IBSS can only be the IWL_RXON_CTX_BSS context */</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(!priv-&gt;cfg-&gt;ops-&gt;legacy))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	memset(&amp;priv-&gt;current_ht_config, 0, sizeof(struct iwl_ht_config));</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* new association get rid of ibss beacon skb */</div><div class='del'>-	if (priv-&gt;beacon_skb)</div><div class='del'>-		dev_kfree_skb(priv-&gt;beacon_skb);</div><div class='del'>-</div><div class='del'>-	priv-&gt;beacon_skb = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;timestamp = 0;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_scan_cancel_timeout(priv, 100);</div><div class='del'>-	if (!iwl_legacy_is_ready_rf(priv)) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "leave - not ready\n");</div><div class='del'>-		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* we are restarting association process</div><div class='del'>-	 * clear RXON_FILTER_ASSOC_MSK bit</div><div class='del'>-	 */</div><div class='del'>-	ctx-&gt;staging.filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='del'>-	iwl_legacy_commit_rxon(priv, ctx);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_set_rate(priv);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_mac_reset_tsf);</div><div class='del'>-</div><div class='del'>-static void iwl_legacy_ht_conf(struct iwl_priv *priv,</div><div class='del'>-			struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct iwl_ht_config *ht_conf = &amp;priv-&gt;current_ht_config;</div><div class='del'>-	struct ieee80211_sta *sta;</div><div class='del'>-	struct ieee80211_bss_conf *bss_conf = &amp;vif-&gt;bss_conf;</div><div class='del'>-	struct iwl_rxon_context *ctx = iwl_legacy_rxon_ctx_from_vif(vif);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_ASSOC(priv, "enter:\n");</div><div class='del'>-</div><div class='del'>-	if (!ctx-&gt;ht.enabled)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ctx-&gt;ht.protection =</div><div class='del'>-		bss_conf-&gt;ht_operation_mode &amp; IEEE80211_HT_OP_MODE_PROTECTION;</div><div class='del'>-	ctx-&gt;ht.non_gf_sta_present =</div><div class='del'>-		!!(bss_conf-&gt;ht_operation_mode &amp;</div><div class='del'>-				IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);</div><div class='del'>-</div><div class='del'>-	ht_conf-&gt;single_chain_sufficient = false;</div><div class='del'>-</div><div class='del'>-	switch (vif-&gt;type) {</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		sta = ieee80211_find_sta(vif, bss_conf-&gt;bssid);</div><div class='del'>-		if (sta) {</div><div class='del'>-			struct ieee80211_sta_ht_cap *ht_cap = &amp;sta-&gt;ht_cap;</div><div class='del'>-			int maxstreams;</div><div class='del'>-</div><div class='del'>-			maxstreams = (ht_cap-&gt;mcs.tx_params &amp;</div><div class='del'>-			      IEEE80211_HT_MCS_TX_MAX_STREAMS_MASK)</div><div class='del'>-				&gt;&gt; IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT;</div><div class='del'>-			maxstreams += 1;</div><div class='del'>-</div><div class='del'>-			if ((ht_cap-&gt;mcs.rx_mask[1] == 0) &amp;&amp;</div><div class='del'>-			    (ht_cap-&gt;mcs.rx_mask[2] == 0))</div><div class='del'>-				ht_conf-&gt;single_chain_sufficient = true;</div><div class='del'>-			if (maxstreams &lt;= 1)</div><div class='del'>-				ht_conf-&gt;single_chain_sufficient = true;</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * If at all, this can only happen through a race</div><div class='del'>-			 * when the AP disconnects us while we're still</div><div class='del'>-			 * setting up the connection, in that case mac80211</div><div class='del'>-			 * will soon tell us about that.</div><div class='del'>-			 */</div><div class='del'>-			ht_conf-&gt;single_chain_sufficient = true;</div><div class='del'>-		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		ht_conf-&gt;single_chain_sufficient = true;</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'>-	IWL_DEBUG_ASSOC(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void iwl_legacy_set_no_assoc(struct iwl_priv *priv,</div><div class='del'>-				    struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rxon_context *ctx = iwl_legacy_rxon_ctx_from_vif(vif);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * inform the ucode that there is no longer an</div><div class='del'>-	 * association and that no more packets should be</div><div class='del'>-	 * sent</div><div class='del'>-	 */</div><div class='del'>-	ctx-&gt;staging.filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='del'>-	ctx-&gt;staging.assoc_id = 0;</div><div class='del'>-	iwl_legacy_commit_rxon(priv, ctx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_legacy_beacon_update(struct ieee80211_hw *hw,</div><div class='del'>-				  struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	__le64 timestamp;</div><div class='del'>-	struct sk_buff *skb = ieee80211_beacon_get(hw, vif);</div><div class='del'>-</div><div class='del'>-	if (!skb)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;beacon_ctx) {</div><div class='del'>-		IWL_ERR(priv, "update beacon but no beacon context!\n");</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;beacon_skb)</div><div class='del'>-		dev_kfree_skb(priv-&gt;beacon_skb);</div><div class='del'>-</div><div class='del'>-	priv-&gt;beacon_skb = skb;</div><div class='del'>-</div><div class='del'>-	timestamp = ((struct ieee80211_mgmt *)skb-&gt;data)-&gt;u.beacon.timestamp;</div><div class='del'>-	priv-&gt;timestamp = le64_to_cpu(timestamp);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_ready_rf(priv)) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;cfg-&gt;ops-&gt;legacy-&gt;post_associate(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_legacy_mac_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 changes)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_rxon_context *ctx = iwl_legacy_rxon_ctx_from_vif(vif);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(!priv-&gt;cfg-&gt;ops-&gt;legacy))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "changes = 0x%X\n", changes);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_alive(priv)) {</div><div class='del'>-		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changes &amp; BSS_CHANGED_QOS) {</div><div class='del'>-		unsigned long flags;</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-		ctx-&gt;qos_data.qos_active = bss_conf-&gt;qos;</div><div class='del'>-		iwl_legacy_update_qos(priv, ctx);</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changes &amp; BSS_CHANGED_BEACON_ENABLED) {</div><div class='del'>-		/*</div><div class='del'>-		 * the add_interface code must make sure we only ever</div><div class='del'>-		 * have a single interface that could be beaconing at</div><div class='del'>-		 * any time.</div><div class='del'>-		 */</div><div class='del'>-		if (vif-&gt;bss_conf.enable_beacon)</div><div class='del'>-			priv-&gt;beacon_ctx = ctx;</div><div class='del'>-		else</div><div class='del'>-			priv-&gt;beacon_ctx = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changes &amp; BSS_CHANGED_BSSID) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "BSSID %pM\n", bss_conf-&gt;bssid);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If there is currently a HW scan going on in the</div><div class='del'>-		 * background then we need to cancel it else the RXON</div><div class='del'>-		 * below/in post_associate will fail.</div><div class='del'>-		 */</div><div class='del'>-		if (iwl_legacy_scan_cancel_timeout(priv, 100)) {</div><div class='del'>-			IWL_WARN(priv,</div><div class='del'>-				"Aborted scan still in progress after 100ms\n");</div><div class='del'>-			IWL_DEBUG_MAC80211(priv,</div><div class='del'>-				"leaving - scan abort failed.\n");</div><div class='del'>-			mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* mac80211 only sets assoc when in STATION mode */</div><div class='del'>-		if (vif-&gt;type == NL80211_IFTYPE_ADHOC || bss_conf-&gt;assoc) {</div><div class='del'>-			memcpy(ctx-&gt;staging.bssid_addr,</div><div class='del'>-			       bss_conf-&gt;bssid, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-			/* currently needed in a few places */</div><div class='del'>-			memcpy(priv-&gt;bssid, bss_conf-&gt;bssid, ETH_ALEN);</div><div class='del'>-		} else {</div><div class='del'>-			ctx-&gt;staging.filter_flags &amp;=</div><div class='del'>-				~RXON_FILTER_ASSOC_MSK;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This needs to be after setting the BSSID in case</div><div class='del'>-	 * mac80211 decides to do both changes at once because</div><div class='del'>-	 * it will invoke post_associate.</div><div class='del'>-	 */</div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_ADHOC &amp;&amp; changes &amp; BSS_CHANGED_BEACON)</div><div class='del'>-		iwl_legacy_beacon_update(hw, vif);</div><div class='del'>-</div><div class='del'>-	if (changes &amp; BSS_CHANGED_ERP_PREAMBLE) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "ERP_PREAMBLE %d\n",</div><div class='del'>-				   bss_conf-&gt;use_short_preamble);</div><div class='del'>-		if (bss_conf-&gt;use_short_preamble)</div><div class='del'>-			ctx-&gt;staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='del'>-		else</div><div class='del'>-			ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changes &amp; BSS_CHANGED_ERP_CTS_PROT) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv,</div><div class='del'>-			"ERP_CTS %d\n", bss_conf-&gt;use_cts_prot);</div><div class='del'>-		if (bss_conf-&gt;use_cts_prot &amp;&amp;</div><div class='del'>-			(priv-&gt;band != IEEE80211_BAND_5GHZ))</div><div class='del'>-			ctx-&gt;staging.flags |= RXON_FLG_TGG_PROTECT_MSK;</div><div class='del'>-		else</div><div class='del'>-			ctx-&gt;staging.flags &amp;= ~RXON_FLG_TGG_PROTECT_MSK;</div><div class='del'>-		if (bss_conf-&gt;use_cts_prot)</div><div class='del'>-			ctx-&gt;staging.flags |= RXON_FLG_SELF_CTS_EN;</div><div class='del'>-		else</div><div class='del'>-			ctx-&gt;staging.flags &amp;= ~RXON_FLG_SELF_CTS_EN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changes &amp; BSS_CHANGED_BASIC_RATES) {</div><div class='del'>-		/* XXX use this information</div><div class='del'>-		 *</div><div class='del'>-		 * To do that, remove code from iwl_legacy_set_rate() and put something</div><div class='del'>-		 * like this here:</div><div class='del'>-		 *</div><div class='del'>-		if (A-band)</div><div class='del'>-			ctx-&gt;staging.ofdm_basic_rates =</div><div class='del'>-				bss_conf-&gt;basic_rates;</div><div class='del'>-		else</div><div class='del'>-			ctx-&gt;staging.ofdm_basic_rates =</div><div class='del'>-				bss_conf-&gt;basic_rates &gt;&gt; 4;</div><div class='del'>-			ctx-&gt;staging.cck_basic_rates =</div><div class='del'>-				bss_conf-&gt;basic_rates &amp; 0xF;</div><div class='del'>-		 */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changes &amp; BSS_CHANGED_HT) {</div><div class='del'>-		iwl_legacy_ht_conf(priv, vif);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain)</div><div class='del'>-			priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain(priv, ctx);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changes &amp; BSS_CHANGED_ASSOC) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "ASSOC %d\n", bss_conf-&gt;assoc);</div><div class='del'>-		if (bss_conf-&gt;assoc) {</div><div class='del'>-			priv-&gt;timestamp = bss_conf-&gt;timestamp;</div><div class='del'>-</div><div class='del'>-			if (!iwl_legacy_is_rfkill(priv))</div><div class='del'>-				priv-&gt;cfg-&gt;ops-&gt;legacy-&gt;post_associate(priv);</div><div class='del'>-		} else</div><div class='del'>-			iwl_legacy_set_no_assoc(priv, vif);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changes &amp;&amp; iwl_legacy_is_associated_ctx(ctx) &amp;&amp; bss_conf-&gt;aid) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "Changes (%#x) while associated\n",</div><div class='del'>-				   changes);</div><div class='del'>-		ret = iwl_legacy_send_rxon_assoc(priv, ctx);</div><div class='del'>-		if (!ret) {</div><div class='del'>-			/* Sync active_rxon with latest change. */</div><div class='del'>-			memcpy((void *)&amp;ctx-&gt;active,</div><div class='del'>-				&amp;ctx-&gt;staging,</div><div class='del'>-				sizeof(struct iwl_legacy_rxon_cmd));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changes &amp; BSS_CHANGED_BEACON_ENABLED) {</div><div class='del'>-		if (vif-&gt;bss_conf.enable_beacon) {</div><div class='del'>-			memcpy(ctx-&gt;staging.bssid_addr,</div><div class='del'>-			       bss_conf-&gt;bssid, ETH_ALEN);</div><div class='del'>-			memcpy(priv-&gt;bssid, bss_conf-&gt;bssid, ETH_ALEN);</div><div class='del'>-			priv-&gt;cfg-&gt;ops-&gt;legacy-&gt;config_ap(priv);</div><div class='del'>-		} else</div><div class='del'>-			iwl_legacy_set_no_assoc(priv, vif);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changes &amp; BSS_CHANGED_IBSS) {</div><div class='del'>-		ret = priv-&gt;cfg-&gt;ops-&gt;legacy-&gt;manage_ibss_station(priv, vif,</div><div class='del'>-							bss_conf-&gt;ibss_joined);</div><div class='del'>-		if (ret)</div><div class='del'>-			IWL_ERR(priv, "failed to %s IBSS station %pM\n",</div><div class='del'>-				bss_conf-&gt;ibss_joined ? "add" : "remove",</div><div class='del'>-				bss_conf-&gt;bssid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_mac_bss_info_changed);</div><div class='del'>-</div><div class='del'>-irqreturn_t iwl_legacy_isr(int irq, void *data)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = data;</div><div class='del'>-	u32 inta, inta_mask;</div><div class='del'>-	u32 inta_fh;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	if (!priv)</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Disable (but don't clear!) interrupts here to avoid</div><div class='del'>-	 *    back-to-back ISRs and sporadic interrupts from our NIC.</div><div class='del'>-	 * If we have something to service, the tasklet will re-enable ints.</div><div class='del'>-	 * If we *don't* have something, we'll re-enable before leaving here. */</div><div class='del'>-	inta_mask = iwl_read32(priv, CSR_INT_MASK);  /* just for debug */</div><div class='del'>-	iwl_write32(priv, CSR_INT_MASK, 0x00000000);</div><div class='del'>-</div><div class='del'>-	/* Discover which interrupts are active/pending */</div><div class='del'>-	inta = iwl_read32(priv, CSR_INT);</div><div class='del'>-	inta_fh = iwl_read32(priv, CSR_FH_INT_STATUS);</div><div class='del'>-</div><div class='del'>-	/* Ignore interrupt if there's nothing in NIC to service.</div><div class='del'>-	 * This may be due to IRQ shared with another device,</div><div class='del'>-	 * or due to sporadic interrupts thrown from our NIC. */</div><div class='del'>-	if (!inta &amp;&amp; !inta_fh) {</div><div class='del'>-		IWL_DEBUG_ISR(priv,</div><div class='del'>-			"Ignore interrupt, inta == 0, inta_fh == 0\n");</div><div class='del'>-		goto none;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((inta == 0xFFFFFFFF) || ((inta &amp; 0xFFFFFFF0) == 0xa5a5a5a0)) {</div><div class='del'>-		/* Hardware disappeared. It might have already raised</div><div class='del'>-		 * an interrupt */</div><div class='del'>-		IWL_WARN(priv, "HARDWARE GONE?? INTA == 0x%08x\n", inta);</div><div class='del'>-		goto unplugged;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_ISR(priv, "ISR inta 0x%08x, enabled 0x%08x, fh 0x%08x\n",</div><div class='del'>-		      inta, inta_mask, inta_fh);</div><div class='del'>-</div><div class='del'>-	inta &amp;= ~CSR_INT_BIT_SCD;</div><div class='del'>-</div><div class='del'>-	/* iwl_irq_tasklet() will service interrupts and re-enable them */</div><div class='del'>-	if (likely(inta || inta_fh))</div><div class='del'>-		tasklet_schedule(&amp;priv-&gt;irq_tasklet);</div><div class='del'>-</div><div class='del'>-unplugged:</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-</div><div class='del'>-none:</div><div class='del'>-	/* re-enable interrupts here since we don't have anything to service. */</div><div class='del'>-	/* only Re-enable if disabled by irq */</div><div class='del'>-	if (test_bit(STATUS_INT_ENABLED, &amp;priv-&gt;status))</div><div class='del'>-		iwl_legacy_enable_interrupts(priv);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-	return IRQ_NONE;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_isr);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  iwl_legacy_tx_cmd_protection: Set rts/cts. 3945 and 4965 only share this</div><div class='del'>- *  function.</div><div class='del'>- */</div><div class='del'>-void iwl_legacy_tx_cmd_protection(struct iwl_priv *priv,</div><div class='del'>-			       struct ieee80211_tx_info *info,</div><div class='del'>-			       __le16 fc, __le32 *tx_flags)</div><div class='del'>-{</div><div class='del'>-	if (info-&gt;control.rates[0].flags &amp; IEEE80211_TX_RC_USE_RTS_CTS) {</div><div class='del'>-		*tx_flags |= TX_CMD_FLG_RTS_MSK;</div><div class='del'>-		*tx_flags &amp;= ~TX_CMD_FLG_CTS_MSK;</div><div class='del'>-		*tx_flags |= TX_CMD_FLG_FULL_TXOP_PROT_MSK;</div><div class='del'>-</div><div class='del'>-		if (!ieee80211_is_mgmt(fc))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		switch (fc &amp; cpu_to_le16(IEEE80211_FCTL_STYPE)) {</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_AUTH):</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_DEAUTH):</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_ASSOC_REQ):</div><div class='del'>-		case cpu_to_le16(IEEE80211_STYPE_REASSOC_REQ):</div><div class='del'>-			*tx_flags &amp;= ~TX_CMD_FLG_RTS_MSK;</div><div class='del'>-			*tx_flags |= TX_CMD_FLG_CTS_MSK;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else if (info-&gt;control.rates[0].flags &amp;</div><div class='del'>-		   IEEE80211_TX_RC_USE_CTS_PROTECT) {</div><div class='del'>-		*tx_flags &amp;= ~TX_CMD_FLG_RTS_MSK;</div><div class='del'>-		*tx_flags |= TX_CMD_FLG_CTS_MSK;</div><div class='del'>-		*tx_flags |= TX_CMD_FLG_FULL_TXOP_PROT_MSK;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_tx_cmd_protection);</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-core.h b/drivers/net/wireless/iwlegacy/iwl-core.h<br/>deleted file mode 100644<br/>index d1271fe07d4b..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-core.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-core.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,636 +0,0 @@</div><div class='del'>-/******************************************************************************</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) 2008 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- * BSD LICENSE</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2005 - 2011 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='del'>-#ifndef __iwl_legacy_core_h__</div><div class='del'>-#define __iwl_legacy_core_h__</div><div class='del'>-</div><div class='del'>-/************************</div><div class='del'>- * forward declarations *</div><div class='del'>- ************************/</div><div class='del'>-struct iwl_host_cmd;</div><div class='del'>-struct iwl_cmd;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define IWLWIFI_VERSION "in-tree:"</div><div class='del'>-#define DRV_COPYRIGHT	"Copyright(c) 2003-2011 Intel Corporation"</div><div class='del'>-#define DRV_AUTHOR     "&lt;ilw@linux.intel.com&gt;"</div><div class='del'>-</div><div class='del'>-#define IWL_PCI_DEVICE(dev, subdev, cfg) \</div><div class='del'>-	.vendor = PCI_VENDOR_ID_INTEL,  .device = (dev), \</div><div class='del'>-	.subvendor = PCI_ANY_ID, .subdevice = (subdev), \</div><div class='del'>-	.driver_data = (kernel_ulong_t)&amp;(cfg)</div><div class='del'>-</div><div class='del'>-#define TIME_UNIT		1024</div><div class='del'>-</div><div class='del'>-#define IWL_SKU_G       0x1</div><div class='del'>-#define IWL_SKU_A       0x2</div><div class='del'>-#define IWL_SKU_N       0x8</div><div class='del'>-</div><div class='del'>-#define IWL_CMD(x) case x: return #x</div><div class='del'>-</div><div class='del'>-struct iwl_hcmd_ops {</div><div class='del'>-	int (*rxon_assoc)(struct iwl_priv *priv, struct iwl_rxon_context *ctx);</div><div class='del'>-	int (*commit_rxon)(struct iwl_priv *priv, struct iwl_rxon_context *ctx);</div><div class='del'>-	void (*set_rxon_chain)(struct iwl_priv *priv,</div><div class='del'>-			       struct iwl_rxon_context *ctx);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl_hcmd_utils_ops {</div><div class='del'>-	u16 (*get_hcmd_size)(u8 cmd_id, u16 len);</div><div class='del'>-	u16 (*build_addsta_hcmd)(const struct iwl_legacy_addsta_cmd *cmd,</div><div class='del'>-								u8 *data);</div><div class='del'>-	int (*request_scan)(struct iwl_priv *priv, struct ieee80211_vif *vif);</div><div class='del'>-	void (*post_scan)(struct iwl_priv *priv);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl_apm_ops {</div><div class='del'>-	int (*init)(struct iwl_priv *priv);</div><div class='del'>-	void (*config)(struct iwl_priv *priv);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl_debugfs_ops {</div><div class='del'>-	ssize_t (*rx_stats_read)(struct file *file, char __user *user_buf,</div><div class='del'>-				 size_t count, loff_t *ppos);</div><div class='del'>-	ssize_t (*tx_stats_read)(struct file *file, char __user *user_buf,</div><div class='del'>-				 size_t count, loff_t *ppos);</div><div class='del'>-	ssize_t (*general_stats_read)(struct file *file, char __user *user_buf,</div><div class='del'>-				      size_t count, loff_t *ppos);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl_temp_ops {</div><div class='del'>-	void (*temperature)(struct iwl_priv *priv);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl_lib_ops {</div><div class='del'>-	/* set hw dependent parameters */</div><div class='del'>-	int (*set_hw_params)(struct iwl_priv *priv);</div><div class='del'>-	/* Handling TX */</div><div class='del'>-	void (*txq_update_byte_cnt_tbl)(struct iwl_priv *priv,</div><div class='del'>-					struct iwl_tx_queue *txq,</div><div class='del'>-					u16 byte_cnt);</div><div class='del'>-	int (*txq_attach_buf_to_tfd)(struct iwl_priv *priv,</div><div class='del'>-				     struct iwl_tx_queue *txq,</div><div class='del'>-				     dma_addr_t addr,</div><div class='del'>-				     u16 len, u8 reset, u8 pad);</div><div class='del'>-	void (*txq_free_tfd)(struct iwl_priv *priv,</div><div class='del'>-			     struct iwl_tx_queue *txq);</div><div class='del'>-	int (*txq_init)(struct iwl_priv *priv,</div><div class='del'>-			struct iwl_tx_queue *txq);</div><div class='del'>-	/* setup Rx handler */</div><div class='del'>-	void (*rx_handler_setup)(struct iwl_priv *priv);</div><div class='del'>-	/* alive notification after init uCode load */</div><div class='del'>-	void (*init_alive_start)(struct iwl_priv *priv);</div><div class='del'>-	/* check validity of rtc data address */</div><div class='del'>-	int (*is_valid_rtc_data_addr)(u32 addr);</div><div class='del'>-	/* 1st ucode load */</div><div class='del'>-	int (*load_ucode)(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-	void (*dump_nic_error_log)(struct iwl_priv *priv);</div><div class='del'>-	int (*dump_fh)(struct iwl_priv *priv, char **buf, bool display);</div><div class='del'>-	int (*set_channel_switch)(struct iwl_priv *priv,</div><div class='del'>-				  struct ieee80211_channel_switch *ch_switch);</div><div class='del'>-	/* power management */</div><div class='del'>-	struct iwl_apm_ops apm_ops;</div><div class='del'>-</div><div class='del'>-	/* power */</div><div class='del'>-	int (*send_tx_power) (struct iwl_priv *priv);</div><div class='del'>-	void (*update_chain_flags)(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-	/* eeprom operations (as defined in iwl-eeprom.h) */</div><div class='del'>-	struct iwl_eeprom_ops eeprom_ops;</div><div class='del'>-</div><div class='del'>-	/* temperature */</div><div class='del'>-	struct iwl_temp_ops temp_ops;</div><div class='del'>-</div><div class='del'>-	struct iwl_debugfs_ops debugfs_ops;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl_led_ops {</div><div class='del'>-	int (*cmd)(struct iwl_priv *priv, struct iwl_led_cmd *led_cmd);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl_legacy_ops {</div><div class='del'>-	void (*post_associate)(struct iwl_priv *priv);</div><div class='del'>-	void (*config_ap)(struct iwl_priv *priv);</div><div class='del'>-	/* station management */</div><div class='del'>-	int (*update_bcast_stations)(struct iwl_priv *priv);</div><div class='del'>-	int (*manage_ibss_station)(struct iwl_priv *priv,</div><div class='del'>-				   struct ieee80211_vif *vif, bool add);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl_ops {</div><div class='del'>-	const struct iwl_lib_ops *lib;</div><div class='del'>-	const struct iwl_hcmd_ops *hcmd;</div><div class='del'>-	const struct iwl_hcmd_utils_ops *utils;</div><div class='del'>-	const struct iwl_led_ops *led;</div><div class='del'>-	const struct iwl_nic_ops *nic;</div><div class='del'>-	const struct iwl_legacy_ops *legacy;</div><div class='del'>-	const struct ieee80211_ops *ieee80211_ops;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl_mod_params {</div><div class='del'>-	int sw_crypto;		/* def: 0 = using hardware encryption */</div><div class='del'>-	int disable_hw_scan;	/* def: 0 = use h/w scan */</div><div class='del'>-	int num_of_queues;	/* def: HW dependent */</div><div class='del'>-	int disable_11n;	/* def: 0 = 11n capabilities enabled */</div><div class='del'>-	int amsdu_size_8K;	/* def: 1 = enable 8K amsdu size */</div><div class='del'>-	int antenna;  		/* def: 0 = both antennas (use diversity) */</div><div class='del'>-	int restart_fw;		/* def: 1 = restart firmware */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * @led_compensation: compensate on the led on/off time per HW according</div><div class='del'>- *	to the deviation to achieve the desired led frequency.</div><div class='del'>- *	The detail algorithm is described in iwl-led.c</div><div class='del'>- * @chain_noise_num_beacons: number of beacons used to compute chain noise</div><div class='del'>- * @wd_timeout: TX queues watchdog timeout</div><div class='del'>- * @temperature_kelvin: temperature report by uCode in kelvin</div><div class='del'>- * @ucode_tracing: support ucode continuous tracing</div><div class='del'>- * @sensitivity_calib_by_driver: driver has the capability to perform</div><div class='del'>- *	sensitivity calibration operation</div><div class='del'>- * @chain_noise_calib_by_driver: driver has the capability to perform</div><div class='del'>- *	chain noise calibration operation</div><div class='del'>- */</div><div class='del'>-struct iwl_base_params {</div><div class='del'>-	int eeprom_size;</div><div class='del'>-	int num_of_queues;	/* def: HW dependent */</div><div class='del'>-	int num_of_ampdu_queues;/* def: HW dependent */</div><div class='del'>-	/* for iwl_legacy_apm_init() */</div><div class='del'>-	u32 pll_cfg_val;</div><div class='del'>-	bool set_l0s;</div><div class='del'>-	bool use_bsm;</div><div class='del'>-</div><div class='del'>-	u16 led_compensation;</div><div class='del'>-	int chain_noise_num_beacons;</div><div class='del'>-	unsigned int wd_timeout;</div><div class='del'>-	bool temperature_kelvin;</div><div class='del'>-	const bool ucode_tracing;</div><div class='del'>-	const bool sensitivity_calib_by_driver;</div><div class='del'>-	const bool chain_noise_calib_by_driver;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_cfg</div><div class='del'>- * @fw_name_pre: Firmware filename prefix. The api version and extension</div><div class='del'>- *	(.ucode) will be added to filename before loading from disk. The</div><div class='del'>- *	filename is constructed as fw_name_pre&lt;api&gt;.ucode.</div><div class='del'>- * @ucode_api_max: Highest version of uCode API supported by driver.</div><div class='del'>- * @ucode_api_min: Lowest version of uCode API supported by driver.</div><div class='del'>- * @scan_antennas: available antenna for scan operation</div><div class='del'>- * @led_mode: 0=blinking, 1=On(RF On)/Off(RF Off)</div><div class='del'>- *</div><div class='del'>- * We enable the driver to be backward compatible wrt API version. The</div><div class='del'>- * driver specifies which APIs it supports (with @ucode_api_max being the</div><div class='del'>- * highest and @ucode_api_min the lowest). Firmware will only be loaded if</div><div class='del'>- * it has a supported API version. The firmware's API version will be</div><div class='del'>- * stored in @iwl_priv, enabling the driver to make runtime changes based</div><div class='del'>- * on firmware version used.</div><div class='del'>- *</div><div class='del'>- * For example,</div><div class='del'>- * if (IWL_UCODE_API(priv-&gt;ucode_ver) &gt;= 2) {</div><div class='del'>- *	Driver interacts with Firmware API version &gt;= 2.</div><div class='del'>- * } else {</div><div class='del'>- *	Driver interacts with Firmware API version 1.</div><div class='del'>- * }</div><div class='del'>- *</div><div class='del'>- * The ideal usage of this infrastructure is to treat a new ucode API</div><div class='del'>- * release as a new hardware revision. That is, through utilizing the</div><div class='del'>- * iwl_hcmd_utils_ops etc. we accommodate different command structures</div><div class='del'>- * and flows between hardware versions as well as their API</div><div class='del'>- * versions.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-struct iwl_cfg {</div><div class='del'>-	/* params specific to an individual device within a device family */</div><div class='del'>-	const char *name;</div><div class='del'>-	const char *fw_name_pre;</div><div class='del'>-	const unsigned int ucode_api_max;</div><div class='del'>-	const unsigned int ucode_api_min;</div><div class='del'>-	u8   valid_tx_ant;</div><div class='del'>-	u8   valid_rx_ant;</div><div class='del'>-	unsigned int sku;</div><div class='del'>-	u16  eeprom_ver;</div><div class='del'>-	u16  eeprom_calib_ver;</div><div class='del'>-	const struct iwl_ops *ops;</div><div class='del'>-	/* module based parameters which can be set from modprobe cmd */</div><div class='del'>-	const struct iwl_mod_params *mod_params;</div><div class='del'>-	/* params not likely to change within a device family */</div><div class='del'>-	struct iwl_base_params *base_params;</div><div class='del'>-	/* params likely to change within a device family */</div><div class='del'>-	u8 scan_rx_antennas[IEEE80211_NUM_BANDS];</div><div class='del'>-	enum iwl_led_mode led_mode;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/***************************</div><div class='del'>- *   L i b                 *</div><div class='del'>- ***************************/</div><div class='del'>-</div><div class='del'>-struct ieee80211_hw *iwl_legacy_alloc_all(struct iwl_cfg *cfg);</div><div class='del'>-int iwl_legacy_mac_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 *params);</div><div class='del'>-int iwl_legacy_mac_tx_last_beacon(struct ieee80211_hw *hw);</div><div class='del'>-void iwl_legacy_set_rxon_hwcrypto(struct iwl_priv *priv,</div><div class='del'>-			struct iwl_rxon_context *ctx,</div><div class='del'>-			int hw_decrypt);</div><div class='del'>-int iwl_legacy_check_rxon_cmd(struct iwl_priv *priv,</div><div class='del'>-			struct iwl_rxon_context *ctx);</div><div class='del'>-int iwl_legacy_full_rxon_required(struct iwl_priv *priv,</div><div class='del'>-			struct iwl_rxon_context *ctx);</div><div class='del'>-int iwl_legacy_set_rxon_channel(struct iwl_priv *priv,</div><div class='del'>-			struct ieee80211_channel *ch,</div><div class='del'>-			struct iwl_rxon_context *ctx);</div><div class='del'>-void iwl_legacy_set_flags_for_band(struct iwl_priv *priv,</div><div class='del'>-			    struct iwl_rxon_context *ctx,</div><div class='del'>-			    enum ieee80211_band band,</div><div class='del'>-			    struct ieee80211_vif *vif);</div><div class='del'>-u8 iwl_legacy_get_single_channel_number(struct iwl_priv *priv,</div><div class='del'>-				  enum ieee80211_band band);</div><div class='del'>-void iwl_legacy_set_rxon_ht(struct iwl_priv *priv,</div><div class='del'>-			struct iwl_ht_config *ht_conf);</div><div class='del'>-bool iwl_legacy_is_ht40_tx_allowed(struct iwl_priv *priv,</div><div class='del'>-			    struct iwl_rxon_context *ctx,</div><div class='del'>-			    struct ieee80211_sta_ht_cap *ht_cap);</div><div class='del'>-void iwl_legacy_connection_init_rx_config(struct iwl_priv *priv,</div><div class='del'>-				   struct iwl_rxon_context *ctx);</div><div class='del'>-void iwl_legacy_set_rate(struct iwl_priv *priv);</div><div class='del'>-int iwl_legacy_set_decrypted_flag(struct iwl_priv *priv,</div><div class='del'>-			   struct ieee80211_hdr *hdr,</div><div class='del'>-			   u32 decrypt_res,</div><div class='del'>-			   struct ieee80211_rx_status *stats);</div><div class='del'>-void iwl_legacy_irq_handle_error(struct iwl_priv *priv);</div><div class='del'>-int iwl_legacy_mac_add_interface(struct ieee80211_hw *hw,</div><div class='del'>-			  struct ieee80211_vif *vif);</div><div class='del'>-void iwl_legacy_mac_remove_interface(struct ieee80211_hw *hw,</div><div class='del'>-			      struct ieee80211_vif *vif);</div><div class='del'>-int iwl_legacy_mac_change_interface(struct ieee80211_hw *hw,</div><div class='del'>-			     struct ieee80211_vif *vif,</div><div class='del'>-			     enum nl80211_iftype newtype, bool newp2p);</div><div class='del'>-int iwl_legacy_alloc_txq_mem(struct iwl_priv *priv);</div><div class='del'>-void iwl_legacy_txq_mem(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS</div><div class='del'>-int iwl_legacy_alloc_traffic_mem(struct iwl_priv *priv);</div><div class='del'>-void iwl_legacy_free_traffic_mem(struct iwl_priv *priv);</div><div class='del'>-void iwl_legacy_reset_traffic_log(struct iwl_priv *priv);</div><div class='del'>-void iwl_legacy_dbg_log_tx_data_frame(struct iwl_priv *priv,</div><div class='del'>-				u16 length, struct ieee80211_hdr *header);</div><div class='del'>-void iwl_legacy_dbg_log_rx_data_frame(struct iwl_priv *priv,</div><div class='del'>-				u16 length, struct ieee80211_hdr *header);</div><div class='del'>-const char *iwl_legacy_get_mgmt_string(int cmd);</div><div class='del'>-const char *iwl_legacy_get_ctrl_string(int cmd);</div><div class='del'>-void iwl_legacy_clear_traffic_stats(struct iwl_priv *priv);</div><div class='del'>-void iwl_legacy_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc,</div><div class='del'>-		      u16 len);</div><div class='del'>-#else</div><div class='del'>-static inline int iwl_legacy_alloc_traffic_mem(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static inline void iwl_legacy_free_traffic_mem(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static inline void iwl_legacy_reset_traffic_log(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static inline void iwl_legacy_dbg_log_tx_data_frame(struct iwl_priv *priv,</div><div class='del'>-		      u16 length, struct ieee80211_hdr *header)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static inline void iwl_legacy_dbg_log_rx_data_frame(struct iwl_priv *priv,</div><div class='del'>-		      u16 length, struct ieee80211_hdr *header)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static inline void iwl_legacy_update_stats(struct iwl_priv *priv, bool is_tx,</div><div class='del'>-				    __le16 fc, u16 len)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-/*****************************************************</div><div class='del'>- * RX handlers.</div><div class='del'>- * **************************************************/</div><div class='del'>-void iwl_legacy_rx_pm_sleep_notif(struct iwl_priv *priv,</div><div class='del'>-			   struct iwl_rx_mem_buffer *rxb);</div><div class='del'>-void iwl_legacy_rx_pm_debug_statistics_notif(struct iwl_priv *priv,</div><div class='del'>-				      struct iwl_rx_mem_buffer *rxb);</div><div class='del'>-void iwl_legacy_rx_reply_error(struct iwl_priv *priv,</div><div class='del'>-			struct iwl_rx_mem_buffer *rxb);</div><div class='del'>-</div><div class='del'>-/*****************************************************</div><div class='del'>-* RX</div><div class='del'>-******************************************************/</div><div class='del'>-void iwl_legacy_cmd_queue_unmap(struct iwl_priv *priv);</div><div class='del'>-void iwl_legacy_cmd_queue_free(struct iwl_priv *priv);</div><div class='del'>-int iwl_legacy_rx_queue_alloc(struct iwl_priv *priv);</div><div class='del'>-void iwl_legacy_rx_queue_update_write_ptr(struct iwl_priv *priv,</div><div class='del'>-				  struct iwl_rx_queue *q);</div><div class='del'>-int iwl_legacy_rx_queue_space(const struct iwl_rx_queue *q);</div><div class='del'>-void iwl_legacy_tx_cmd_complete(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_rx_mem_buffer *rxb);</div><div class='del'>-/* Handlers */</div><div class='del'>-void iwl_legacy_rx_spectrum_measure_notif(struct iwl_priv *priv,</div><div class='del'>-					  struct iwl_rx_mem_buffer *rxb);</div><div class='del'>-void iwl_legacy_recover_from_statistics(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_rx_packet *pkt);</div><div class='del'>-void iwl_legacy_chswitch_done(struct iwl_priv *priv, bool is_success);</div><div class='del'>-void iwl_legacy_rx_csa(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb);</div><div class='del'>-</div><div class='del'>-/* TX helpers */</div><div class='del'>-</div><div class='del'>-/*****************************************************</div><div class='del'>-* TX</div><div class='del'>-******************************************************/</div><div class='del'>-void iwl_legacy_txq_update_write_ptr(struct iwl_priv *priv,</div><div class='del'>-					struct iwl_tx_queue *txq);</div><div class='del'>-int iwl_legacy_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,</div><div class='del'>-		      int slots_num, u32 txq_id);</div><div class='del'>-void iwl_legacy_tx_queue_reset(struct iwl_priv *priv,</div><div class='del'>-			struct iwl_tx_queue *txq,</div><div class='del'>-			int slots_num, u32 txq_id);</div><div class='del'>-void iwl_legacy_tx_queue_unmap(struct iwl_priv *priv, int txq_id);</div><div class='del'>-void iwl_legacy_tx_queue_free(struct iwl_priv *priv, int txq_id);</div><div class='del'>-void iwl_legacy_setup_watchdog(struct iwl_priv *priv);</div><div class='del'>-/*****************************************************</div><div class='del'>- * TX power</div><div class='del'>- ****************************************************/</div><div class='del'>-int iwl_legacy_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force);</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- * Rate</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-u8 iwl_legacy_get_lowest_plcp(struct iwl_priv *priv,</div><div class='del'>-			    struct iwl_rxon_context *ctx);</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- * Scanning</div><div class='del'>- ******************************************************************************/</div><div class='del'>-void iwl_legacy_init_scan_params(struct iwl_priv *priv);</div><div class='del'>-int iwl_legacy_scan_cancel(struct iwl_priv *priv);</div><div class='del'>-int iwl_legacy_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms);</div><div class='del'>-void iwl_legacy_force_scan_end(struct iwl_priv *priv);</div><div class='del'>-int iwl_legacy_mac_hw_scan(struct ieee80211_hw *hw,</div><div class='del'>-		    struct ieee80211_vif *vif,</div><div class='del'>-		    struct cfg80211_scan_request *req);</div><div class='del'>-void iwl_legacy_internal_short_hw_scan(struct iwl_priv *priv);</div><div class='del'>-int iwl_legacy_force_reset(struct iwl_priv *priv, bool external);</div><div class='del'>-u16 iwl_legacy_fill_probe_req(struct iwl_priv *priv,</div><div class='del'>-			struct ieee80211_mgmt *frame,</div><div class='del'>-		       const u8 *ta, const u8 *ie, int ie_len, int left);</div><div class='del'>-void iwl_legacy_setup_rx_scan_handlers(struct iwl_priv *priv);</div><div class='del'>-u16 iwl_legacy_get_active_dwell_time(struct iwl_priv *priv,</div><div class='del'>-			      enum ieee80211_band band,</div><div class='del'>-			      u8 n_probes);</div><div class='del'>-u16 iwl_legacy_get_passive_dwell_time(struct iwl_priv *priv,</div><div class='del'>-			       enum ieee80211_band band,</div><div class='del'>-			       struct ieee80211_vif *vif);</div><div class='del'>-void iwl_legacy_setup_scan_deferred_work(struct iwl_priv *priv);</div><div class='del'>-void iwl_legacy_cancel_scan_deferred_work(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-/* For faster active scanning, scan will move to the next channel if fewer than</div><div class='del'>- * PLCP_QUIET_THRESH packets are heard on this channel within</div><div class='del'>- * ACTIVE_QUIET_TIME after sending probe request.  This shortens the dwell</div><div class='del'>- * time if it's a quiet channel (nothing responded to our probe, and there's</div><div class='del'>- * no other traffic).</div><div class='del'>- * Disable "quiet" feature by setting PLCP_QUIET_THRESH to 0. */</div><div class='del'>-#define IWL_ACTIVE_QUIET_TIME       cpu_to_le16(10)  /* msec */</div><div class='del'>-#define IWL_PLCP_QUIET_THRESH       cpu_to_le16(1)  /* packets */</div><div class='del'>-</div><div class='del'>-#define IWL_SCAN_CHECK_WATCHDOG		(HZ * 7)</div><div class='del'>-</div><div class='del'>-/*****************************************************</div><div class='del'>- *   S e n d i n g     H o s t     C o m m a n d s   *</div><div class='del'>- *****************************************************/</div><div class='del'>-</div><div class='del'>-const char *iwl_legacy_get_cmd_string(u8 cmd);</div><div class='del'>-int __must_check iwl_legacy_send_cmd_sync(struct iwl_priv *priv,</div><div class='del'>-				   struct iwl_host_cmd *cmd);</div><div class='del'>-int iwl_legacy_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd);</div><div class='del'>-int __must_check iwl_legacy_send_cmd_pdu(struct iwl_priv *priv, u8 id,</div><div class='del'>-				  u16 len, const void *data);</div><div class='del'>-int iwl_legacy_send_cmd_pdu_async(struct iwl_priv *priv, u8 id, u16 len,</div><div class='del'>-			   const void *data,</div><div class='del'>-			   void (*callback)(struct iwl_priv *priv,</div><div class='del'>-					    struct iwl_device_cmd *cmd,</div><div class='del'>-					    struct iwl_rx_packet *pkt));</div><div class='del'>-</div><div class='del'>-int iwl_legacy_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*****************************************************</div><div class='del'>- * PCI						     *</div><div class='del'>- *****************************************************/</div><div class='del'>-</div><div class='del'>-static inline u16 iwl_legacy_pcie_link_ctl(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int pos;</div><div class='del'>-	u16 pci_lnk_ctl;</div><div class='del'>-	pos = pci_pcie_cap(priv-&gt;pci_dev);</div><div class='del'>-	pci_read_config_word(priv-&gt;pci_dev, pos + PCI_EXP_LNKCTL, &amp;pci_lnk_ctl);</div><div class='del'>-	return pci_lnk_ctl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_legacy_bg_watchdog(unsigned long data);</div><div class='del'>-u32 iwl_legacy_usecs_to_beacons(struct iwl_priv *priv,</div><div class='del'>-					u32 usec, u32 beacon_interval);</div><div class='del'>-__le32 iwl_legacy_add_beacon_time(struct iwl_priv *priv, u32 base,</div><div class='del'>-			   u32 addon, u32 beacon_interval);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-int iwl_legacy_pci_suspend(struct device *device);</div><div class='del'>-int iwl_legacy_pci_resume(struct device *device);</div><div class='del'>-extern const struct dev_pm_ops iwl_legacy_pm_ops;</div><div class='del'>-</div><div class='del'>-#define IWL_LEGACY_PM_OPS	(&amp;iwl_legacy_pm_ops)</div><div class='del'>-</div><div class='del'>-#else /* !CONFIG_PM */</div><div class='del'>-</div><div class='del'>-#define IWL_LEGACY_PM_OPS	NULL</div><div class='del'>-</div><div class='del'>-#endif /* !CONFIG_PM */</div><div class='del'>-</div><div class='del'>-/*****************************************************</div><div class='del'>-*  Error Handling Debugging</div><div class='del'>-******************************************************/</div><div class='del'>-void iwl4965_dump_nic_error_log(struct iwl_priv *priv);</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-void iwl_legacy_print_rx_config_cmd(struct iwl_priv *priv,</div><div class='del'>-			     struct iwl_rxon_context *ctx);</div><div class='del'>-#else</div><div class='del'>-static inline void iwl_legacy_print_rx_config_cmd(struct iwl_priv *priv,</div><div class='del'>-					   struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void iwl_legacy_clear_isr_stats(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-/*****************************************************</div><div class='del'>-*  GEOS</div><div class='del'>-******************************************************/</div><div class='del'>-int iwl_legacy_init_geos(struct iwl_priv *priv);</div><div class='del'>-void iwl_legacy_free_geos(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-/*************** DRIVER STATUS FUNCTIONS   *****/</div><div class='del'>-</div><div class='del'>-#define STATUS_HCMD_ACTIVE	0	/* host command in progress */</div><div class='del'>-/* 1 is unused (used to be STATUS_HCMD_SYNC_ACTIVE) */</div><div class='del'>-#define STATUS_INT_ENABLED	2</div><div class='del'>-#define STATUS_RF_KILL_HW	3</div><div class='del'>-#define STATUS_CT_KILL		4</div><div class='del'>-#define STATUS_INIT		5</div><div class='del'>-#define STATUS_ALIVE		6</div><div class='del'>-#define STATUS_READY		7</div><div class='del'>-#define STATUS_TEMPERATURE	8</div><div class='del'>-#define STATUS_GEO_CONFIGURED	9</div><div class='del'>-#define STATUS_EXIT_PENDING	10</div><div class='del'>-#define STATUS_STATISTICS	12</div><div class='del'>-#define STATUS_SCANNING		13</div><div class='del'>-#define STATUS_SCAN_ABORTING	14</div><div class='del'>-#define STATUS_SCAN_HW		15</div><div class='del'>-#define STATUS_POWER_PMI	16</div><div class='del'>-#define STATUS_FW_ERROR		17</div><div class='del'>-#define STATUS_CHANNEL_SWITCH_PENDING 18</div><div class='del'>-</div><div class='del'>-static inline int iwl_legacy_is_ready(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	/* The adapter is 'ready' if READY and GEO_CONFIGURED bits are</div><div class='del'>-	 * set but EXIT_PENDING is not */</div><div class='del'>-	return test_bit(STATUS_READY, &amp;priv-&gt;status) &amp;&amp;</div><div class='del'>-	       test_bit(STATUS_GEO_CONFIGURED, &amp;priv-&gt;status) &amp;&amp;</div><div class='del'>-	       !test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int iwl_legacy_is_alive(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	return test_bit(STATUS_ALIVE, &amp;priv-&gt;status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int iwl_legacy_is_init(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	return test_bit(STATUS_INIT, &amp;priv-&gt;status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int iwl_legacy_is_rfkill_hw(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	return test_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int iwl_legacy_is_rfkill(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	return iwl_legacy_is_rfkill_hw(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int iwl_legacy_is_ctkill(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	return test_bit(STATUS_CT_KILL, &amp;priv-&gt;status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int iwl_legacy_is_ready_rf(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_is_rfkill(priv))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_is_ready(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern void iwl_legacy_send_bt_config(struct iwl_priv *priv);</div><div class='del'>-extern int iwl_legacy_send_statistics_request(struct iwl_priv *priv,</div><div class='del'>-				       u8 flags, bool clear);</div><div class='del'>-void iwl_legacy_apm_stop(struct iwl_priv *priv);</div><div class='del'>-int iwl_legacy_apm_init(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-int iwl_legacy_send_rxon_timing(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_rxon_context *ctx);</div><div class='del'>-static inline int iwl_legacy_send_rxon_assoc(struct iwl_priv *priv,</div><div class='del'>-				      struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	return priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;rxon_assoc(priv, ctx);</div><div class='del'>-}</div><div class='del'>-static inline int iwl_legacy_commit_rxon(struct iwl_priv *priv,</div><div class='del'>-				      struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	return priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;commit_rxon(priv, ctx);</div><div class='del'>-}</div><div class='del'>-static inline const struct ieee80211_supported_band *iwl_get_hw_mode(</div><div class='del'>-			struct iwl_priv *priv, enum ieee80211_band band)</div><div class='del'>-{</div><div class='del'>-	return priv-&gt;hw-&gt;wiphy-&gt;bands[band];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* mac80211 handlers */</div><div class='del'>-int iwl_legacy_mac_config(struct ieee80211_hw *hw, u32 changed);</div><div class='del'>-void iwl_legacy_mac_reset_tsf(struct ieee80211_hw *hw,</div><div class='del'>-			      struct ieee80211_vif *vif);</div><div class='del'>-void iwl_legacy_mac_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 changes);</div><div class='del'>-void iwl_legacy_tx_cmd_protection(struct iwl_priv *priv,</div><div class='del'>-				struct ieee80211_tx_info *info,</div><div class='del'>-				__le16 fc, __le32 *tx_flags);</div><div class='del'>-</div><div class='del'>-irqreturn_t iwl_legacy_isr(int irq, void *data);</div><div class='del'>-</div><div class='del'>-#endif /* __iwl_legacy_core_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-debug.h b/drivers/net/wireless/iwlegacy/iwl-debug.h<br/>deleted file mode 100644<br/>index ae13112701bf..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-debug.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-debug.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,198 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Portions of this file are derived from the ipw3945 project.</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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifndef __iwl_legacy_debug_h__</div><div class='del'>-#define __iwl_legacy_debug_h__</div><div class='del'>-</div><div class='del'>-struct iwl_priv;</div><div class='del'>-extern u32 iwlegacy_debug_level;</div><div class='del'>-</div><div class='del'>-#define IWL_ERR(p, f, a...) dev_err(&amp;((p)-&gt;pci_dev-&gt;dev), f, ## a)</div><div class='del'>-#define IWL_WARN(p, f, a...) dev_warn(&amp;((p)-&gt;pci_dev-&gt;dev), f, ## a)</div><div class='del'>-#define IWL_INFO(p, f, a...) dev_info(&amp;((p)-&gt;pci_dev-&gt;dev), f, ## a)</div><div class='del'>-#define IWL_CRIT(p, f, a...) dev_crit(&amp;((p)-&gt;pci_dev-&gt;dev), f, ## a)</div><div class='del'>-</div><div class='del'>-#define iwl_print_hex_error(priv, p, len)				 \</div><div class='del'>-do {									\</div><div class='del'>-	print_hex_dump(KERN_ERR, "iwl data: ",				\</div><div class='del'>-		       DUMP_PREFIX_OFFSET, 16, 1, p, len, 1);		\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-#define IWL_DEBUG(__priv, level, fmt, args...)				\</div><div class='del'>-do {									\</div><div class='del'>-	if (iwl_legacy_get_debug_level(__priv) &amp; (level))			\</div><div class='del'>-		dev_printk(KERN_ERR, &amp;(__priv-&gt;hw-&gt;wiphy-&gt;dev),		\</div><div class='del'>-			 "%c %s " fmt, in_interrupt() ? 'I' : 'U',	\</div><div class='del'>-			__func__ , ## args);				\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...)			\</div><div class='del'>-do {									\</div><div class='del'>-	if ((iwl_legacy_get_debug_level(__priv) &amp; (level)) &amp;&amp; net_ratelimit())	\</div><div class='del'>-		dev_printk(KERN_ERR, &amp;(__priv-&gt;hw-&gt;wiphy-&gt;dev),		\</div><div class='del'>-			"%c %s " fmt, in_interrupt() ? 'I' : 'U',	\</div><div class='del'>-			 __func__ , ## args);				\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define iwl_print_hex_dump(priv, level, p, len) 			\</div><div class='del'>-do {									\</div><div class='del'>-	if (iwl_legacy_get_debug_level(priv) &amp; level)				\</div><div class='del'>-		print_hex_dump(KERN_DEBUG, "iwl data: ",		\</div><div class='del'>-			       DUMP_PREFIX_OFFSET, 16, 1, p, len, 1);	\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-#define IWL_DEBUG(__priv, level, fmt, args...)</div><div class='del'>-#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...)</div><div class='del'>-static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,</div><div class='del'>-				      const void *p, u32 len)</div><div class='del'>-{}</div><div class='del'>-#endif				/* CONFIG_IWLWIFI_LEGACY_DEBUG */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS</div><div class='del'>-int iwl_legacy_dbgfs_register(struct iwl_priv *priv, const char *name);</div><div class='del'>-void iwl_legacy_dbgfs_unregister(struct iwl_priv *priv);</div><div class='del'>-#else</div><div class='del'>-static inline int</div><div class='del'>-iwl_legacy_dbgfs_register(struct iwl_priv *priv, const char *name)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static inline void iwl_legacy_dbgfs_unregister(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif				/* CONFIG_IWLWIFI_LEGACY_DEBUGFS */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * To use the debug system:</div><div class='del'>- *</div><div class='del'>- * If you are defining a new debug classification, simply add it to the #define</div><div class='del'>- * list here in the form of</div><div class='del'>- *</div><div class='del'>- * #define IWL_DL_xxxx VALUE</div><div class='del'>- *</div><div class='del'>- * where xxxx should be the name of the classification (for example, WEP).</div><div class='del'>- *</div><div class='del'>- * You then need to either add a IWL_xxxx_DEBUG() macro definition for your</div><div class='del'>- * classification, or use IWL_DEBUG(IWL_DL_xxxx, ...) whenever you want</div><div class='del'>- * to send output to that classification.</div><div class='del'>- *</div><div class='del'>- * The active debug levels can be accessed via files</div><div class='del'>- *</div><div class='del'>- * 	/sys/module/iwl4965/parameters/debug{50}</div><div class='del'>- *	/sys/module/iwl3945/parameters/debug</div><div class='del'>- * 	/sys/class/net/wlan0/device/debug_level</div><div class='del'>- *</div><div class='del'>- * when CONFIG_IWLWIFI_LEGACY_DEBUG=y.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* 0x0000000F - 0x00000001 */</div><div class='del'>-#define IWL_DL_INFO		(1 &lt;&lt; 0)</div><div class='del'>-#define IWL_DL_MAC80211		(1 &lt;&lt; 1)</div><div class='del'>-#define IWL_DL_HCMD		(1 &lt;&lt; 2)</div><div class='del'>-#define IWL_DL_STATE		(1 &lt;&lt; 3)</div><div class='del'>-/* 0x000000F0 - 0x00000010 */</div><div class='del'>-#define IWL_DL_MACDUMP		(1 &lt;&lt; 4)</div><div class='del'>-#define IWL_DL_HCMD_DUMP	(1 &lt;&lt; 5)</div><div class='del'>-#define IWL_DL_EEPROM		(1 &lt;&lt; 6)</div><div class='del'>-#define IWL_DL_RADIO		(1 &lt;&lt; 7)</div><div class='del'>-/* 0x00000F00 - 0x00000100 */</div><div class='del'>-#define IWL_DL_POWER		(1 &lt;&lt; 8)</div><div class='del'>-#define IWL_DL_TEMP		(1 &lt;&lt; 9)</div><div class='del'>-#define IWL_DL_NOTIF		(1 &lt;&lt; 10)</div><div class='del'>-#define IWL_DL_SCAN		(1 &lt;&lt; 11)</div><div class='del'>-/* 0x0000F000 - 0x00001000 */</div><div class='del'>-#define IWL_DL_ASSOC		(1 &lt;&lt; 12)</div><div class='del'>-#define IWL_DL_DROP		(1 &lt;&lt; 13)</div><div class='del'>-#define IWL_DL_TXPOWER		(1 &lt;&lt; 14)</div><div class='del'>-#define IWL_DL_AP		(1 &lt;&lt; 15)</div><div class='del'>-/* 0x000F0000 - 0x00010000 */</div><div class='del'>-#define IWL_DL_FW		(1 &lt;&lt; 16)</div><div class='del'>-#define IWL_DL_RF_KILL		(1 &lt;&lt; 17)</div><div class='del'>-#define IWL_DL_FW_ERRORS	(1 &lt;&lt; 18)</div><div class='del'>-#define IWL_DL_LED		(1 &lt;&lt; 19)</div><div class='del'>-/* 0x00F00000 - 0x00100000 */</div><div class='del'>-#define IWL_DL_RATE		(1 &lt;&lt; 20)</div><div class='del'>-#define IWL_DL_CALIB		(1 &lt;&lt; 21)</div><div class='del'>-#define IWL_DL_WEP		(1 &lt;&lt; 22)</div><div class='del'>-#define IWL_DL_TX		(1 &lt;&lt; 23)</div><div class='del'>-/* 0x0F000000 - 0x01000000 */</div><div class='del'>-#define IWL_DL_RX		(1 &lt;&lt; 24)</div><div class='del'>-#define IWL_DL_ISR		(1 &lt;&lt; 25)</div><div class='del'>-#define IWL_DL_HT		(1 &lt;&lt; 26)</div><div class='del'>-#define IWL_DL_IO		(1 &lt;&lt; 27)</div><div class='del'>-/* 0xF0000000 - 0x10000000 */</div><div class='del'>-#define IWL_DL_11H		(1 &lt;&lt; 28)</div><div class='del'>-#define IWL_DL_STATS		(1 &lt;&lt; 29)</div><div class='del'>-#define IWL_DL_TX_REPLY		(1 &lt;&lt; 30)</div><div class='del'>-#define IWL_DL_QOS		(1 &lt;&lt; 31)</div><div class='del'>-</div><div class='del'>-#define IWL_DEBUG_INFO(p, f, a...)	IWL_DEBUG(p, IWL_DL_INFO, f, ## a)</div><div class='del'>-#define IWL_DEBUG_MAC80211(p, f, a...)	IWL_DEBUG(p, IWL_DL_MAC80211, f, ## a)</div><div class='del'>-#define IWL_DEBUG_MACDUMP(p, f, a...)	IWL_DEBUG(p, IWL_DL_MACDUMP, f, ## a)</div><div class='del'>-#define IWL_DEBUG_TEMP(p, f, a...)	IWL_DEBUG(p, IWL_DL_TEMP, f, ## a)</div><div class='del'>-#define IWL_DEBUG_SCAN(p, f, a...)	IWL_DEBUG(p, IWL_DL_SCAN, f, ## a)</div><div class='del'>-#define IWL_DEBUG_RX(p, f, a...)	IWL_DEBUG(p, IWL_DL_RX, f, ## a)</div><div class='del'>-#define IWL_DEBUG_TX(p, f, a...)	IWL_DEBUG(p, IWL_DL_TX, f, ## a)</div><div class='del'>-#define IWL_DEBUG_ISR(p, f, a...)	IWL_DEBUG(p, IWL_DL_ISR, f, ## a)</div><div class='del'>-#define IWL_DEBUG_LED(p, f, a...)	IWL_DEBUG(p, IWL_DL_LED, f, ## a)</div><div class='del'>-#define IWL_DEBUG_WEP(p, f, a...)	IWL_DEBUG(p, IWL_DL_WEP, f, ## a)</div><div class='del'>-#define IWL_DEBUG_HC(p, f, a...)	IWL_DEBUG(p, IWL_DL_HCMD, f, ## a)</div><div class='del'>-#define IWL_DEBUG_HC_DUMP(p, f, a...)	IWL_DEBUG(p, IWL_DL_HCMD_DUMP, f, ## a)</div><div class='del'>-#define IWL_DEBUG_EEPROM(p, f, a...)	IWL_DEBUG(p, IWL_DL_EEPROM, f, ## a)</div><div class='del'>-#define IWL_DEBUG_CALIB(p, f, a...)	IWL_DEBUG(p, IWL_DL_CALIB, f, ## a)</div><div class='del'>-#define IWL_DEBUG_FW(p, f, a...)	IWL_DEBUG(p, IWL_DL_FW, f, ## a)</div><div class='del'>-#define IWL_DEBUG_RF_KILL(p, f, a...)	IWL_DEBUG(p, IWL_DL_RF_KILL, f, ## a)</div><div class='del'>-#define IWL_DEBUG_DROP(p, f, a...)	IWL_DEBUG(p, IWL_DL_DROP, f, ## a)</div><div class='del'>-#define IWL_DEBUG_DROP_LIMIT(p, f, a...)	\</div><div class='del'>-		IWL_DEBUG_LIMIT(p, IWL_DL_DROP, f, ## a)</div><div class='del'>-#define IWL_DEBUG_AP(p, f, a...)	IWL_DEBUG(p, IWL_DL_AP, f, ## a)</div><div class='del'>-#define IWL_DEBUG_TXPOWER(p, f, a...)	IWL_DEBUG(p, IWL_DL_TXPOWER, f, ## a)</div><div class='del'>-#define IWL_DEBUG_IO(p, f, a...)	IWL_DEBUG(p, IWL_DL_IO, f, ## a)</div><div class='del'>-#define IWL_DEBUG_RATE(p, f, a...)	IWL_DEBUG(p, IWL_DL_RATE, f, ## a)</div><div class='del'>-#define IWL_DEBUG_RATE_LIMIT(p, f, a...)	\</div><div class='del'>-		IWL_DEBUG_LIMIT(p, IWL_DL_RATE, f, ## a)</div><div class='del'>-#define IWL_DEBUG_NOTIF(p, f, a...)	IWL_DEBUG(p, IWL_DL_NOTIF, f, ## a)</div><div class='del'>-#define IWL_DEBUG_ASSOC(p, f, a...)	\</div><div class='del'>-		IWL_DEBUG(p, IWL_DL_ASSOC | IWL_DL_INFO, f, ## a)</div><div class='del'>-#define IWL_DEBUG_ASSOC_LIMIT(p, f, a...)	\</div><div class='del'>-		IWL_DEBUG_LIMIT(p, IWL_DL_ASSOC | IWL_DL_INFO, f, ## a)</div><div class='del'>-#define IWL_DEBUG_HT(p, f, a...)	IWL_DEBUG(p, IWL_DL_HT, f, ## a)</div><div class='del'>-#define IWL_DEBUG_STATS(p, f, a...)	IWL_DEBUG(p, IWL_DL_STATS, f, ## a)</div><div class='del'>-#define IWL_DEBUG_STATS_LIMIT(p, f, a...)	\</div><div class='del'>-		IWL_DEBUG_LIMIT(p, IWL_DL_STATS, f, ## a)</div><div class='del'>-#define IWL_DEBUG_TX_REPLY(p, f, a...)	IWL_DEBUG(p, IWL_DL_TX_REPLY, f, ## a)</div><div class='del'>-#define IWL_DEBUG_TX_REPLY_LIMIT(p, f, a...) \</div><div class='del'>-		IWL_DEBUG_LIMIT(p, IWL_DL_TX_REPLY, f, ## a)</div><div class='del'>-#define IWL_DEBUG_QOS(p, f, a...)	IWL_DEBUG(p, IWL_DL_QOS, f, ## a)</div><div class='del'>-#define IWL_DEBUG_RADIO(p, f, a...)	IWL_DEBUG(p, IWL_DL_RADIO, f, ## a)</div><div class='del'>-#define IWL_DEBUG_POWER(p, f, a...)	IWL_DEBUG(p, IWL_DL_POWER, f, ## a)</div><div class='del'>-#define IWL_DEBUG_11H(p, f, a...)	IWL_DEBUG(p, IWL_DL_11H, f, ## a)</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-debugfs.c b/drivers/net/wireless/iwlegacy/iwl-debugfs.c<br/>deleted file mode 100644<br/>index 1407dca70def..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-debugfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-debugfs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1314 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * GPL LICENSE SUMMARY</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2008 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include &lt;linux/ieee80211.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-debug.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-</div><div class='del'>-/* create and remove of files */</div><div class='del'>-#define DEBUGFS_ADD_FILE(name, parent, mode) do {			\</div><div class='del'>-	if (!debugfs_create_file(#name, mode, parent, priv,		\</div><div class='del'>-			 &amp;iwl_legacy_dbgfs_##name##_ops))		\</div><div class='del'>-		goto err;						\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define DEBUGFS_ADD_BOOL(name, parent, ptr) do {			\</div><div class='del'>-	struct dentry *__tmp;						\</div><div class='del'>-	__tmp = debugfs_create_bool(#name, S_IWUSR | S_IRUSR,		\</div><div class='del'>-				    parent, ptr);			\</div><div class='del'>-	if (IS_ERR(__tmp) || !__tmp)					\</div><div class='del'>-		goto err;						\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define DEBUGFS_ADD_X32(name, parent, ptr) do {				\</div><div class='del'>-	struct dentry *__tmp;						\</div><div class='del'>-	__tmp = debugfs_create_x32(#name, S_IWUSR | S_IRUSR,		\</div><div class='del'>-				   parent, ptr);			\</div><div class='del'>-	if (IS_ERR(__tmp) || !__tmp)					\</div><div class='del'>-		goto err;						\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-/* file operation */</div><div class='del'>-#define DEBUGFS_READ_FUNC(name)                                         \</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_##name##_read(struct file *file,               \</div><div class='del'>-					char __user *user_buf,          \</div><div class='del'>-					size_t count, loff_t *ppos);</div><div class='del'>-</div><div class='del'>-#define DEBUGFS_WRITE_FUNC(name)                                        \</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_##name##_write(struct file *file,              \</div><div class='del'>-					const char __user *user_buf,    \</div><div class='del'>-					size_t count, loff_t *ppos);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-iwl_legacy_dbgfs_open_file_generic(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	file-&gt;private_data = inode-&gt;i_private;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define DEBUGFS_READ_FILE_OPS(name) 				\</div><div class='del'>-	DEBUGFS_READ_FUNC(name);                                        \</div><div class='del'>-static const struct file_operations iwl_legacy_dbgfs_##name##_ops = {	\</div><div class='del'>-	.read = iwl_legacy_dbgfs_##name##_read,				\</div><div class='del'>-	.open = iwl_legacy_dbgfs_open_file_generic,                    	\</div><div class='del'>-	.llseek = generic_file_llseek,					\</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DEBUGFS_WRITE_FILE_OPS(name) 				\</div><div class='del'>-	DEBUGFS_WRITE_FUNC(name);                                       \</div><div class='del'>-static const struct file_operations iwl_legacy_dbgfs_##name##_ops = {	\</div><div class='del'>-	.write = iwl_legacy_dbgfs_##name##_write,			\</div><div class='del'>-	.open = iwl_legacy_dbgfs_open_file_generic,                    	\</div><div class='del'>-	.llseek = generic_file_llseek,					\</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DEBUGFS_READ_WRITE_FILE_OPS(name)                           \</div><div class='del'>-	DEBUGFS_READ_FUNC(name);                                        \</div><div class='del'>-	DEBUGFS_WRITE_FUNC(name);                                       \</div><div class='del'>-static const struct file_operations iwl_legacy_dbgfs_##name##_ops = {	\</div><div class='del'>-	.write = iwl_legacy_dbgfs_##name##_write,			\</div><div class='del'>-	.read = iwl_legacy_dbgfs_##name##_read,				\</div><div class='del'>-	.open = iwl_legacy_dbgfs_open_file_generic,			\</div><div class='del'>-	.llseek = generic_file_llseek,					\</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_tx_statistics_read(struct file *file,</div><div class='del'>-						char __user *user_buf,</div><div class='del'>-						size_t count, loff_t *ppos) {</div><div class='del'>-</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	char *buf;</div><div class='del'>-	int pos = 0;</div><div class='del'>-</div><div class='del'>-	int cnt;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	const size_t bufsz = 100 +</div><div class='del'>-		sizeof(char) * 50 * (MANAGEMENT_MAX + CONTROL_MAX);</div><div class='del'>-	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "Management:\n");</div><div class='del'>-	for (cnt = 0; cnt &lt; MANAGEMENT_MAX; cnt++) {</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				 "\t%25s\t\t: %u\n",</div><div class='del'>-				 iwl_legacy_get_mgmt_string(cnt),</div><div class='del'>-				 priv-&gt;tx_stats.mgmt[cnt]);</div><div class='del'>-	}</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "Control\n");</div><div class='del'>-	for (cnt = 0; cnt &lt; CONTROL_MAX; cnt++) {</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				 "\t%25s\t\t: %u\n",</div><div class='del'>-				 iwl_legacy_get_ctrl_string(cnt),</div><div class='del'>-				 priv-&gt;tx_stats.ctrl[cnt]);</div><div class='del'>-	}</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "Data:\n");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "\tcnt: %u\n",</div><div class='del'>-			 priv-&gt;tx_stats.data_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "\tbytes: %llu\n",</div><div class='del'>-			 priv-&gt;tx_stats.data_bytes);</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</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'>-iwl_legacy_dbgfs_clear_traffic_statistics_write(struct file *file,</div><div class='del'>-					const char __user *user_buf,</div><div class='del'>-					size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	u32 clear_flag;</div><div class='del'>-	char buf[8];</div><div class='del'>-	int buf_size;</div><div class='del'>-</div><div class='del'>-	memset(buf, 0, sizeof(buf));</div><div class='del'>-	buf_size = min(count, sizeof(buf) -  1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, buf_size))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (sscanf(buf, "%x", &amp;clear_flag) != 1)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	iwl_legacy_clear_traffic_stats(priv);</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 iwl_legacy_dbgfs_rx_statistics_read(struct file *file,</div><div class='del'>-						char __user *user_buf,</div><div class='del'>-						size_t count, loff_t *ppos) {</div><div class='del'>-</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	char *buf;</div><div class='del'>-	int pos = 0;</div><div class='del'>-	int cnt;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	const size_t bufsz = 100 +</div><div class='del'>-		sizeof(char) * 50 * (MANAGEMENT_MAX + CONTROL_MAX);</div><div class='del'>-	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "Management:\n");</div><div class='del'>-	for (cnt = 0; cnt &lt; MANAGEMENT_MAX; cnt++) {</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				 "\t%25s\t\t: %u\n",</div><div class='del'>-				 iwl_legacy_get_mgmt_string(cnt),</div><div class='del'>-				 priv-&gt;rx_stats.mgmt[cnt]);</div><div class='del'>-	}</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "Control:\n");</div><div class='del'>-	for (cnt = 0; cnt &lt; CONTROL_MAX; cnt++) {</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				 "\t%25s\t\t: %u\n",</div><div class='del'>-				 iwl_legacy_get_ctrl_string(cnt),</div><div class='del'>-				 priv-&gt;rx_stats.ctrl[cnt]);</div><div class='del'>-	}</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "Data:\n");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "\tcnt: %u\n",</div><div class='del'>-			 priv-&gt;rx_stats.data_cnt);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "\tbytes: %llu\n",</div><div class='del'>-			 priv-&gt;rx_stats.data_bytes);</div><div class='del'>-</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BYTE1_MASK 0x000000ff;</div><div class='del'>-#define BYTE2_MASK 0x0000ffff;</div><div class='del'>-#define BYTE3_MASK 0x00ffffff;</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_sram_read(struct file *file,</div><div class='del'>-					char __user *user_buf,</div><div class='del'>-					size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-	char *buf;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	int i;</div><div class='del'>-	int pos = 0;</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	size_t bufsz;</div><div class='del'>-</div><div class='del'>-	/* default is to dump the entire data segment */</div><div class='del'>-	if (!priv-&gt;dbgfs_sram_offset &amp;&amp; !priv-&gt;dbgfs_sram_len) {</div><div class='del'>-		priv-&gt;dbgfs_sram_offset = 0x800000;</div><div class='del'>-		if (priv-&gt;ucode_type == UCODE_INIT)</div><div class='del'>-			priv-&gt;dbgfs_sram_len = priv-&gt;ucode_init_data.len;</div><div class='del'>-		else</div><div class='del'>-			priv-&gt;dbgfs_sram_len = priv-&gt;ucode_data.len;</div><div class='del'>-	}</div><div class='del'>-	bufsz =  30 + priv-&gt;dbgfs_sram_len * sizeof(char) * 10;</div><div class='del'>-	buf = kmalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "sram_len: 0x%x\n",</div><div class='del'>-			priv-&gt;dbgfs_sram_len);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "sram_offset: 0x%x\n",</div><div class='del'>-			priv-&gt;dbgfs_sram_offset);</div><div class='del'>-	for (i = priv-&gt;dbgfs_sram_len; i &gt; 0; i -= 4) {</div><div class='del'>-		val = iwl_legacy_read_targ_mem(priv, priv-&gt;dbgfs_sram_offset + \</div><div class='del'>-					priv-&gt;dbgfs_sram_len - i);</div><div class='del'>-		if (i &lt; 4) {</div><div class='del'>-			switch (i) {</div><div class='del'>-			case 1:</div><div class='del'>-				val &amp;= BYTE1_MASK;</div><div class='del'>-				break;</div><div class='del'>-			case 2:</div><div class='del'>-				val &amp;= BYTE2_MASK;</div><div class='del'>-				break;</div><div class='del'>-			case 3:</div><div class='del'>-				val &amp;= BYTE3_MASK;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (!(i % 16))</div><div class='del'>-			pos += scnprintf(buf + pos, bufsz - pos, "\n");</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos, "0x%08x ", val);</div><div class='del'>-	}</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "\n");</div><div class='del'>-</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_sram_write(struct file *file,</div><div class='del'>-					const char __user *user_buf,</div><div class='del'>-					size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	char buf[64];</div><div class='del'>-	int buf_size;</div><div class='del'>-	u32 offset, len;</div><div class='del'>-</div><div class='del'>-	memset(buf, 0, sizeof(buf));</div><div class='del'>-	buf_size = min(count, sizeof(buf) -  1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, buf_size))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (sscanf(buf, "%x,%x", &amp;offset, &amp;len) == 2) {</div><div class='del'>-		priv-&gt;dbgfs_sram_offset = offset;</div><div class='del'>-		priv-&gt;dbgfs_sram_len = len;</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;dbgfs_sram_offset = 0;</div><div class='del'>-		priv-&gt;dbgfs_sram_len = 0;</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 ssize_t</div><div class='del'>-iwl_legacy_dbgfs_stations_read(struct file *file, char __user *user_buf,</div><div class='del'>-					size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	struct iwl_station_entry *station;</div><div class='del'>-	int max_sta = priv-&gt;hw_params.max_stations;</div><div class='del'>-	char *buf;</div><div class='del'>-	int i, j, pos = 0;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	/* Add 30 for initial string */</div><div class='del'>-	const size_t bufsz = 30 + sizeof(char) * 500 * (priv-&gt;num_stations);</div><div class='del'>-</div><div class='del'>-	buf = kmalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "num of stations: %d\n\n",</div><div class='del'>-			priv-&gt;num_stations);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; max_sta; i++) {</div><div class='del'>-		station = &amp;priv-&gt;stations[i];</div><div class='del'>-		if (!station-&gt;used)</div><div class='del'>-			continue;</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				 "station %d - addr: %pM, flags: %#x\n",</div><div class='del'>-				 i, station-&gt;sta.sta.addr,</div><div class='del'>-				 station-&gt;sta.station_flags_msk);</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				"TID\tseq_num\ttxq_id\tframes\ttfds\t");</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				"start_idx\tbitmap\t\t\trate_n_flags\n");</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; MAX_TID_COUNT; j++) {</div><div class='del'>-			pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				"%d:\t%#x\t%#x\t%u\t%u\t%u\t\t%#.16llx\t%#x",</div><div class='del'>-				j, station-&gt;tid[j].seq_number,</div><div class='del'>-				station-&gt;tid[j].agg.txq_id,</div><div class='del'>-				station-&gt;tid[j].agg.frame_count,</div><div class='del'>-				station-&gt;tid[j].tfds_in_queue,</div><div class='del'>-				station-&gt;tid[j].agg.start_idx,</div><div class='del'>-				station-&gt;tid[j].agg.bitmap,</div><div class='del'>-				station-&gt;tid[j].agg.rate_n_flags);</div><div class='del'>-</div><div class='del'>-			if (station-&gt;tid[j].agg.wait_for_ba)</div><div class='del'>-				pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-						 " - waitforba");</div><div class='del'>-			pos += scnprintf(buf + pos, bufsz - pos, "\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos, "\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_nvm_read(struct file *file,</div><div class='del'>-				       char __user *user_buf,</div><div class='del'>-				       size_t count,</div><div class='del'>-				       loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	int pos = 0, ofs = 0, buf_size = 0;</div><div class='del'>-	const u8 *ptr;</div><div class='del'>-	char *buf;</div><div class='del'>-	u16 eeprom_ver;</div><div class='del'>-	size_t eeprom_len = priv-&gt;cfg-&gt;base_params-&gt;eeprom_size;</div><div class='del'>-	buf_size = 4 * eeprom_len + 256;</div><div class='del'>-</div><div class='del'>-	if (eeprom_len % 16) {</div><div class='del'>-		IWL_ERR(priv, "NVM size is not multiple of 16.\n");</div><div class='del'>-		return -ENODATA;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ptr = priv-&gt;eeprom;</div><div class='del'>-	if (!ptr) {</div><div class='del'>-		IWL_ERR(priv, "Invalid EEPROM memory\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 4 characters for byte 0xYY */</div><div class='del'>-	buf = kzalloc(buf_size, GFP_KERNEL);</div><div class='del'>-	if (!buf) {</div><div class='del'>-		IWL_ERR(priv, "Can not allocate Buffer\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	eeprom_ver = iwl_legacy_eeprom_query16(priv, EEPROM_VERSION);</div><div class='del'>-	pos += scnprintf(buf + pos, buf_size - pos, "EEPROM "</div><div class='del'>-			"version: 0x%x\n", eeprom_ver);</div><div class='del'>-	for (ofs = 0 ; ofs &lt; eeprom_len ; ofs += 16) {</div><div class='del'>-		pos += scnprintf(buf + pos, buf_size - pos, "0x%.4x ", ofs);</div><div class='del'>-		hex_dump_to_buffer(ptr + ofs, 16 , 16, 2, buf + pos,</div><div class='del'>-				   buf_size - pos, 0);</div><div class='del'>-		pos += strlen(buf + pos);</div><div class='del'>-		if (buf_size - pos &gt; 0)</div><div class='del'>-			buf[pos++] = '\n';</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</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'>-iwl_legacy_dbgfs_channels_read(struct file *file, char __user *user_buf,</div><div class='del'>-				       size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	struct ieee80211_channel *channels = NULL;</div><div class='del'>-	const struct ieee80211_supported_band *supp_band = NULL;</div><div class='del'>-	int pos = 0, i, bufsz = PAGE_SIZE;</div><div class='del'>-	char *buf;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(STATUS_GEO_CONFIGURED, &amp;priv-&gt;status))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf) {</div><div class='del'>-		IWL_ERR(priv, "Can not allocate Buffer\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	supp_band = iwl_get_hw_mode(priv, IEEE80211_BAND_2GHZ);</div><div class='del'>-	if (supp_band) {</div><div class='del'>-		channels = supp_band-&gt;channels;</div><div class='del'>-</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				"Displaying %d channels in 2.4GHz band 802.11bg):\n",</div><div class='del'>-				supp_band-&gt;n_channels);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; supp_band-&gt;n_channels; i++)</div><div class='del'>-			pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				"%d: %ddBm: BSS%s%s, %s.\n",</div><div class='del'>-				channels[i].hw_value,</div><div class='del'>-				channels[i].max_power,</div><div class='del'>-				channels[i].flags &amp; IEEE80211_CHAN_RADAR ?</div><div class='del'>-				" (IEEE 802.11h required)" : "",</div><div class='del'>-				((channels[i].flags &amp; IEEE80211_CHAN_NO_IBSS)</div><div class='del'>-				|| (channels[i].flags &amp;</div><div class='del'>-				IEEE80211_CHAN_RADAR)) ? "" :</div><div class='del'>-				", IBSS",</div><div class='del'>-				channels[i].flags &amp;</div><div class='del'>-				IEEE80211_CHAN_PASSIVE_SCAN ?</div><div class='del'>-				"passive only" : "active/passive");</div><div class='del'>-	}</div><div class='del'>-	supp_band = iwl_get_hw_mode(priv, IEEE80211_BAND_5GHZ);</div><div class='del'>-	if (supp_band) {</div><div class='del'>-		channels = supp_band-&gt;channels;</div><div class='del'>-</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				"Displaying %d channels in 5.2GHz band (802.11a)\n",</div><div class='del'>-				supp_band-&gt;n_channels);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; supp_band-&gt;n_channels; i++)</div><div class='del'>-			pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				"%d: %ddBm: BSS%s%s, %s.\n",</div><div class='del'>-				channels[i].hw_value,</div><div class='del'>-				channels[i].max_power,</div><div class='del'>-				channels[i].flags &amp; IEEE80211_CHAN_RADAR ?</div><div class='del'>-				" (IEEE 802.11h required)" : "",</div><div class='del'>-				((channels[i].flags &amp; IEEE80211_CHAN_NO_IBSS)</div><div class='del'>-				|| (channels[i].flags &amp;</div><div class='del'>-				IEEE80211_CHAN_RADAR)) ? "" :</div><div class='del'>-				", IBSS",</div><div class='del'>-				channels[i].flags &amp;</div><div class='del'>-				IEEE80211_CHAN_PASSIVE_SCAN ?</div><div class='del'>-				"passive only" : "active/passive");</div><div class='del'>-	}</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_status_read(struct file *file,</div><div class='del'>-						char __user *user_buf,</div><div class='del'>-						size_t count, loff_t *ppos) {</div><div class='del'>-</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	char buf[512];</div><div class='del'>-	int pos = 0;</div><div class='del'>-	const size_t bufsz = sizeof(buf);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_HCMD_ACTIVE:\t %d\n",</div><div class='del'>-		test_bit(STATUS_HCMD_ACTIVE, &amp;priv-&gt;status));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_INT_ENABLED:\t %d\n",</div><div class='del'>-		test_bit(STATUS_INT_ENABLED, &amp;priv-&gt;status));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_RF_KILL_HW:\t %d\n",</div><div class='del'>-		test_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_CT_KILL:\t\t %d\n",</div><div class='del'>-		test_bit(STATUS_CT_KILL, &amp;priv-&gt;status));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_INIT:\t\t %d\n",</div><div class='del'>-		test_bit(STATUS_INIT, &amp;priv-&gt;status));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_ALIVE:\t\t %d\n",</div><div class='del'>-		test_bit(STATUS_ALIVE, &amp;priv-&gt;status));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_READY:\t\t %d\n",</div><div class='del'>-		test_bit(STATUS_READY, &amp;priv-&gt;status));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_TEMPERATURE:\t %d\n",</div><div class='del'>-		test_bit(STATUS_TEMPERATURE, &amp;priv-&gt;status));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_GEO_CONFIGURED:\t %d\n",</div><div class='del'>-		test_bit(STATUS_GEO_CONFIGURED, &amp;priv-&gt;status));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_EXIT_PENDING:\t %d\n",</div><div class='del'>-		test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_STATISTICS:\t %d\n",</div><div class='del'>-		test_bit(STATUS_STATISTICS, &amp;priv-&gt;status));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_SCANNING:\t %d\n",</div><div class='del'>-		test_bit(STATUS_SCANNING, &amp;priv-&gt;status));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_SCAN_ABORTING:\t %d\n",</div><div class='del'>-		test_bit(STATUS_SCAN_ABORTING, &amp;priv-&gt;status));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_SCAN_HW:\t\t %d\n",</div><div class='del'>-		test_bit(STATUS_SCAN_HW, &amp;priv-&gt;status));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_POWER_PMI:\t %d\n",</div><div class='del'>-		test_bit(STATUS_POWER_PMI, &amp;priv-&gt;status));</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_FW_ERROR:\t %d\n",</div><div class='del'>-		test_bit(STATUS_FW_ERROR, &amp;priv-&gt;status));</div><div class='del'>-	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_interrupt_read(struct file *file,</div><div class='del'>-					char __user *user_buf,</div><div class='del'>-					size_t count, loff_t *ppos) {</div><div class='del'>-</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	int pos = 0;</div><div class='del'>-	int cnt = 0;</div><div class='del'>-	char *buf;</div><div class='del'>-	int bufsz = 24 * 64; /* 24 items * 64 char per item */</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf) {</div><div class='del'>-		IWL_ERR(priv, "Can not allocate Buffer\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			"Interrupt Statistics Report:\n");</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "HW Error:\t\t\t %u\n",</div><div class='del'>-		priv-&gt;isr_stats.hw);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "SW Error:\t\t\t %u\n",</div><div class='del'>-		priv-&gt;isr_stats.sw);</div><div class='del'>-	if (priv-&gt;isr_stats.sw || priv-&gt;isr_stats.hw) {</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			"\tLast Restarting Code:  0x%X\n",</div><div class='del'>-			priv-&gt;isr_stats.err_code);</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "Frame transmitted:\t\t %u\n",</div><div class='del'>-		priv-&gt;isr_stats.sch);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "Alive interrupt:\t\t %u\n",</div><div class='del'>-		priv-&gt;isr_stats.alive);</div><div class='del'>-#endif</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-		"HW RF KILL switch toggled:\t %u\n",</div><div class='del'>-		priv-&gt;isr_stats.rfkill);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "CT KILL:\t\t\t %u\n",</div><div class='del'>-		priv-&gt;isr_stats.ctkill);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "Wakeup Interrupt:\t\t %u\n",</div><div class='del'>-		priv-&gt;isr_stats.wakeup);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-		"Rx command responses:\t\t %u\n",</div><div class='del'>-		priv-&gt;isr_stats.rx);</div><div class='del'>-	for (cnt = 0; cnt &lt; REPLY_MAX; cnt++) {</div><div class='del'>-		if (priv-&gt;isr_stats.rx_handlers[cnt] &gt; 0)</div><div class='del'>-			pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				"\tRx handler[%36s]:\t\t %u\n",</div><div class='del'>-				iwl_legacy_get_cmd_string(cnt),</div><div class='del'>-				priv-&gt;isr_stats.rx_handlers[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "Tx/FH interrupt:\t\t %u\n",</div><div class='del'>-		priv-&gt;isr_stats.tx);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "Unexpected INTA:\t\t %u\n",</div><div class='del'>-		priv-&gt;isr_stats.unhandled);</div><div class='del'>-</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_interrupt_write(struct file *file,</div><div class='del'>-					 const char __user *user_buf,</div><div class='del'>-					 size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	char buf[8];</div><div class='del'>-	int buf_size;</div><div class='del'>-	u32 reset_flag;</div><div class='del'>-</div><div class='del'>-	memset(buf, 0, sizeof(buf));</div><div class='del'>-	buf_size = min(count, sizeof(buf) -  1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, buf_size))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (sscanf(buf, "%x", &amp;reset_flag) != 1)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (reset_flag == 0)</div><div class='del'>-		iwl_legacy_clear_isr_stats(priv);</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</div><div class='del'>-iwl_legacy_dbgfs_qos_read(struct file *file, char __user *user_buf,</div><div class='del'>-				       size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-	int pos = 0, i;</div><div class='del'>-	char buf[256 * NUM_IWL_RXON_CTX];</div><div class='del'>-	const size_t bufsz = sizeof(buf);</div><div class='del'>-</div><div class='del'>-	for_each_context(priv, ctx) {</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n",</div><div class='del'>-				 ctx-&gt;ctxid);</div><div class='del'>-		for (i = 0; i &lt; AC_NUM; i++) {</div><div class='del'>-			pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				"\tcw_min\tcw_max\taifsn\ttxop\n");</div><div class='del'>-			pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				"AC[%d]\t%u\t%u\t%u\t%u\n", i,</div><div class='del'>-				ctx-&gt;qos_data.def_qos_parm.ac[i].cw_min,</div><div class='del'>-				ctx-&gt;qos_data.def_qos_parm.ac[i].cw_max,</div><div class='del'>-				ctx-&gt;qos_data.def_qos_parm.ac[i].aifsn,</div><div class='del'>-				ctx-&gt;qos_data.def_qos_parm.ac[i].edca_txop);</div><div class='del'>-		}</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos, "\n");</div><div class='del'>-	}</div><div class='del'>-	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_disable_ht40_write(struct file *file,</div><div class='del'>-					 const char __user *user_buf,</div><div class='del'>-					 size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	char buf[8];</div><div class='del'>-	int buf_size;</div><div class='del'>-	int ht40;</div><div class='del'>-</div><div class='del'>-	memset(buf, 0, sizeof(buf));</div><div class='del'>-	buf_size = min(count, sizeof(buf) -  1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, buf_size))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (sscanf(buf, "%d", &amp;ht40) != 1)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (!iwl_legacy_is_any_associated(priv))</div><div class='del'>-		priv-&gt;disable_ht40 = ht40 ? true : false;</div><div class='del'>-	else {</div><div class='del'>-		IWL_ERR(priv, "Sta associated with AP - "</div><div class='del'>-			"Change to 40MHz channel support is not allowed\n");</div><div class='del'>-		return -EINVAL;</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 ssize_t iwl_legacy_dbgfs_disable_ht40_read(struct file *file,</div><div class='del'>-					 char __user *user_buf,</div><div class='del'>-					 size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	char buf[100];</div><div class='del'>-	int pos = 0;</div><div class='del'>-	const size_t bufsz = sizeof(buf);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			"11n 40MHz Mode: %s\n",</div><div class='del'>-			priv-&gt;disable_ht40 ? "Disabled" : "Enabled");</div><div class='del'>-	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-DEBUGFS_READ_WRITE_FILE_OPS(sram);</div><div class='del'>-DEBUGFS_READ_FILE_OPS(nvm);</div><div class='del'>-DEBUGFS_READ_FILE_OPS(stations);</div><div class='del'>-DEBUGFS_READ_FILE_OPS(channels);</div><div class='del'>-DEBUGFS_READ_FILE_OPS(status);</div><div class='del'>-DEBUGFS_READ_WRITE_FILE_OPS(interrupt);</div><div class='del'>-DEBUGFS_READ_FILE_OPS(qos);</div><div class='del'>-DEBUGFS_READ_WRITE_FILE_OPS(disable_ht40);</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_traffic_log_read(struct file *file,</div><div class='del'>-					 char __user *user_buf,</div><div class='del'>-					 size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	int pos = 0, ofs = 0;</div><div class='del'>-	int cnt = 0, entry;</div><div class='del'>-	struct iwl_tx_queue *txq;</div><div class='del'>-	struct iwl_queue *q;</div><div class='del'>-	struct iwl_rx_queue *rxq = &amp;priv-&gt;rxq;</div><div class='del'>-	char *buf;</div><div class='del'>-	int bufsz = ((IWL_TRAFFIC_ENTRIES * IWL_TRAFFIC_ENTRY_SIZE * 64) * 2) +</div><div class='del'>-		(priv-&gt;cfg-&gt;base_params-&gt;num_of_queues * 32 * 8) + 400;</div><div class='del'>-	const u8 *ptr;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;txq) {</div><div class='del'>-		IWL_ERR(priv, "txq not ready\n");</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf) {</div><div class='del'>-		IWL_ERR(priv, "Can not allocate buffer\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "Tx Queue\n");</div><div class='del'>-	for (cnt = 0; cnt &lt; priv-&gt;hw_params.max_txq_num; cnt++) {</div><div class='del'>-		txq = &amp;priv-&gt;txq[cnt];</div><div class='del'>-		q = &amp;txq-&gt;q;</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				"q[%d]: read_ptr: %u, write_ptr: %u\n",</div><div class='del'>-				cnt, q-&gt;read_ptr, q-&gt;write_ptr);</div><div class='del'>-	}</div><div class='del'>-	if (priv-&gt;tx_traffic &amp;&amp; (iwlegacy_debug_level &amp; IWL_DL_TX)) {</div><div class='del'>-		ptr = priv-&gt;tx_traffic;</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				"Tx Traffic idx: %u\n",	priv-&gt;tx_traffic_idx);</div><div class='del'>-		for (cnt = 0, ofs = 0; cnt &lt; IWL_TRAFFIC_ENTRIES; cnt++) {</div><div class='del'>-			for (entry = 0; entry &lt; IWL_TRAFFIC_ENTRY_SIZE / 16;</div><div class='del'>-			     entry++,  ofs += 16) {</div><div class='del'>-				pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-						"0x%.4x ", ofs);</div><div class='del'>-				hex_dump_to_buffer(ptr + ofs, 16, 16, 2,</div><div class='del'>-						   buf + pos, bufsz - pos, 0);</div><div class='del'>-				pos += strlen(buf + pos);</div><div class='del'>-				if (bufsz - pos &gt; 0)</div><div class='del'>-					buf[pos++] = '\n';</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "Rx Queue\n");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			"read: %u, write: %u\n",</div><div class='del'>-			 rxq-&gt;read, rxq-&gt;write);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;rx_traffic &amp;&amp; (iwlegacy_debug_level &amp; IWL_DL_RX)) {</div><div class='del'>-		ptr = priv-&gt;rx_traffic;</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				"Rx Traffic idx: %u\n",	priv-&gt;rx_traffic_idx);</div><div class='del'>-		for (cnt = 0, ofs = 0; cnt &lt; IWL_TRAFFIC_ENTRIES; cnt++) {</div><div class='del'>-			for (entry = 0; entry &lt; IWL_TRAFFIC_ENTRY_SIZE / 16;</div><div class='del'>-			     entry++,  ofs += 16) {</div><div class='del'>-				pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-						"0x%.4x ", ofs);</div><div class='del'>-				hex_dump_to_buffer(ptr + ofs, 16, 16, 2,</div><div class='del'>-						   buf + pos, bufsz - pos, 0);</div><div class='del'>-				pos += strlen(buf + pos);</div><div class='del'>-				if (bufsz - pos &gt; 0)</div><div class='del'>-					buf[pos++] = '\n';</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_traffic_log_write(struct file *file,</div><div class='del'>-					 const char __user *user_buf,</div><div class='del'>-					 size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	char buf[8];</div><div class='del'>-	int buf_size;</div><div class='del'>-	int traffic_log;</div><div class='del'>-</div><div class='del'>-	memset(buf, 0, sizeof(buf));</div><div class='del'>-	buf_size = min(count, sizeof(buf) -  1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, buf_size))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (sscanf(buf, "%d", &amp;traffic_log) != 1)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (traffic_log == 0)</div><div class='del'>-		iwl_legacy_reset_traffic_log(priv);</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 iwl_legacy_dbgfs_tx_queue_read(struct file *file,</div><div class='del'>-						char __user *user_buf,</div><div class='del'>-						size_t count, loff_t *ppos) {</div><div class='del'>-</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	struct iwl_tx_queue *txq;</div><div class='del'>-	struct iwl_queue *q;</div><div class='del'>-	char *buf;</div><div class='del'>-	int pos = 0;</div><div class='del'>-	int cnt;</div><div class='del'>-	int ret;</div><div class='del'>-	const size_t bufsz = sizeof(char) * 64 *</div><div class='del'>-				priv-&gt;cfg-&gt;base_params-&gt;num_of_queues;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;txq) {</div><div class='del'>-		IWL_ERR(priv, "txq not ready\n");</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	for (cnt = 0; cnt &lt; priv-&gt;hw_params.max_txq_num; cnt++) {</div><div class='del'>-		txq = &amp;priv-&gt;txq[cnt];</div><div class='del'>-		q = &amp;txq-&gt;q;</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				"hwq %.2d: read=%u write=%u stop=%d"</div><div class='del'>-				" swq_id=%#.2x (ac %d/hwq %d)\n",</div><div class='del'>-				cnt, q-&gt;read_ptr, q-&gt;write_ptr,</div><div class='del'>-				!!test_bit(cnt, priv-&gt;queue_stopped),</div><div class='del'>-				txq-&gt;swq_id, txq-&gt;swq_id &amp; 3,</div><div class='del'>-				(txq-&gt;swq_id &gt;&gt; 2) &amp; 0x1f);</div><div class='del'>-		if (cnt &gt;= 4)</div><div class='del'>-			continue;</div><div class='del'>-		/* for the ACs, display the stop count too */</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				"        stop-count: %d\n",</div><div class='del'>-				atomic_read(&amp;priv-&gt;queue_stop_count[cnt]));</div><div class='del'>-	}</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_rx_queue_read(struct file *file,</div><div class='del'>-						char __user *user_buf,</div><div class='del'>-						size_t count, loff_t *ppos) {</div><div class='del'>-</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	struct iwl_rx_queue *rxq = &amp;priv-&gt;rxq;</div><div class='del'>-	char buf[256];</div><div class='del'>-	int pos = 0;</div><div class='del'>-	const size_t bufsz = sizeof(buf);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "read: %u\n",</div><div class='del'>-						rxq-&gt;read);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "write: %u\n",</div><div class='del'>-						rxq-&gt;write);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "free_count: %u\n",</div><div class='del'>-						rxq-&gt;free_count);</div><div class='del'>-	if (rxq-&gt;rb_stts) {</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos, "closed_rb_num: %u\n",</div><div class='del'>-			 le16_to_cpu(rxq-&gt;rb_stts-&gt;closed_rb_num) &amp;  0x0FFF);</div><div class='del'>-	} else {</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-					"closed_rb_num: Not Allocated\n");</div><div class='del'>-	}</div><div class='del'>-	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_ucode_rx_stats_read(struct file *file,</div><div class='del'>-					char __user *user_buf,</div><div class='del'>-					size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	return priv-&gt;cfg-&gt;ops-&gt;lib-&gt;debugfs_ops.rx_stats_read(file,</div><div class='del'>-			user_buf, count, ppos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_ucode_tx_stats_read(struct file *file,</div><div class='del'>-					char __user *user_buf,</div><div class='del'>-					size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	return priv-&gt;cfg-&gt;ops-&gt;lib-&gt;debugfs_ops.tx_stats_read(file,</div><div class='del'>-			user_buf, count, ppos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_ucode_general_stats_read(struct file *file,</div><div class='del'>-					char __user *user_buf,</div><div class='del'>-					size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	return priv-&gt;cfg-&gt;ops-&gt;lib-&gt;debugfs_ops.general_stats_read(file,</div><div class='del'>-			user_buf, count, ppos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_sensitivity_read(struct file *file,</div><div class='del'>-					char __user *user_buf,</div><div class='del'>-					size_t count, loff_t *ppos) {</div><div class='del'>-</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	int pos = 0;</div><div class='del'>-	int cnt = 0;</div><div class='del'>-	char *buf;</div><div class='del'>-	int bufsz = sizeof(struct iwl_sensitivity_data) * 4 + 100;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	struct iwl_sensitivity_data *data;</div><div class='del'>-</div><div class='del'>-	data = &amp;priv-&gt;sensitivity_data;</div><div class='del'>-	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf) {</div><div class='del'>-		IWL_ERR(priv, "Can not allocate Buffer\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "auto_corr_ofdm:\t\t\t %u\n",</div><div class='del'>-			data-&gt;auto_corr_ofdm);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			"auto_corr_ofdm_mrc:\t\t %u\n",</div><div class='del'>-			data-&gt;auto_corr_ofdm_mrc);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "auto_corr_ofdm_x1:\t\t %u\n",</div><div class='del'>-			data-&gt;auto_corr_ofdm_x1);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			"auto_corr_ofdm_mrc_x1:\t\t %u\n",</div><div class='del'>-			data-&gt;auto_corr_ofdm_mrc_x1);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "auto_corr_cck:\t\t\t %u\n",</div><div class='del'>-			data-&gt;auto_corr_cck);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "auto_corr_cck_mrc:\t\t %u\n",</div><div class='del'>-			data-&gt;auto_corr_cck_mrc);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			"last_bad_plcp_cnt_ofdm:\t\t %u\n",</div><div class='del'>-			data-&gt;last_bad_plcp_cnt_ofdm);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "last_fa_cnt_ofdm:\t\t %u\n",</div><div class='del'>-			data-&gt;last_fa_cnt_ofdm);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			"last_bad_plcp_cnt_cck:\t\t %u\n",</div><div class='del'>-			data-&gt;last_bad_plcp_cnt_cck);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "last_fa_cnt_cck:\t\t %u\n",</div><div class='del'>-			data-&gt;last_fa_cnt_cck);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "nrg_curr_state:\t\t\t %u\n",</div><div class='del'>-			data-&gt;nrg_curr_state);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "nrg_prev_state:\t\t\t %u\n",</div><div class='del'>-			data-&gt;nrg_prev_state);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "nrg_value:\t\t\t");</div><div class='del'>-	for (cnt = 0; cnt &lt; 10; cnt++) {</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos, " %u",</div><div class='del'>-				data-&gt;nrg_value[cnt]);</div><div class='del'>-	}</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "\n");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "nrg_silence_rssi:\t\t");</div><div class='del'>-	for (cnt = 0; cnt &lt; NRG_NUM_PREV_STAT_L; cnt++) {</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos, " %u",</div><div class='del'>-				data-&gt;nrg_silence_rssi[cnt]);</div><div class='del'>-	}</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "\n");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "nrg_silence_ref:\t\t %u\n",</div><div class='del'>-			data-&gt;nrg_silence_ref);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "nrg_energy_idx:\t\t\t %u\n",</div><div class='del'>-			data-&gt;nrg_energy_idx);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "nrg_silence_idx:\t\t %u\n",</div><div class='del'>-			data-&gt;nrg_silence_idx);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "nrg_th_cck:\t\t\t %u\n",</div><div class='del'>-			data-&gt;nrg_th_cck);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			"nrg_auto_corr_silence_diff:\t %u\n",</div><div class='del'>-			data-&gt;nrg_auto_corr_silence_diff);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "num_in_cck_no_fa:\t\t %u\n",</div><div class='del'>-			data-&gt;num_in_cck_no_fa);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "nrg_th_ofdm:\t\t\t %u\n",</div><div class='del'>-			data-&gt;nrg_th_ofdm);</div><div class='del'>-</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_chain_noise_read(struct file *file,</div><div class='del'>-					char __user *user_buf,</div><div class='del'>-					size_t count, loff_t *ppos) {</div><div class='del'>-</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	int pos = 0;</div><div class='del'>-	int cnt = 0;</div><div class='del'>-	char *buf;</div><div class='del'>-	int bufsz = sizeof(struct iwl_chain_noise_data) * 4 + 100;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	struct iwl_chain_noise_data *data;</div><div class='del'>-</div><div class='del'>-	data = &amp;priv-&gt;chain_noise_data;</div><div class='del'>-	buf = kzalloc(bufsz, GFP_KERNEL);</div><div class='del'>-	if (!buf) {</div><div class='del'>-		IWL_ERR(priv, "Can not allocate Buffer\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "active_chains:\t\t\t %u\n",</div><div class='del'>-			data-&gt;active_chains);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "chain_noise_a:\t\t\t %u\n",</div><div class='del'>-			data-&gt;chain_noise_a);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "chain_noise_b:\t\t\t %u\n",</div><div class='del'>-			data-&gt;chain_noise_b);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "chain_noise_c:\t\t\t %u\n",</div><div class='del'>-			data-&gt;chain_noise_c);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "chain_signal_a:\t\t\t %u\n",</div><div class='del'>-			data-&gt;chain_signal_a);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "chain_signal_b:\t\t\t %u\n",</div><div class='del'>-			data-&gt;chain_signal_b);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "chain_signal_c:\t\t\t %u\n",</div><div class='del'>-			data-&gt;chain_signal_c);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "beacon_count:\t\t\t %u\n",</div><div class='del'>-			data-&gt;beacon_count);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "disconn_array:\t\t\t");</div><div class='del'>-	for (cnt = 0; cnt &lt; NUM_RX_CHAINS; cnt++) {</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos, " %u",</div><div class='del'>-				data-&gt;disconn_array[cnt]);</div><div class='del'>-	}</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "\n");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "delta_gain_code:\t\t");</div><div class='del'>-	for (cnt = 0; cnt &lt; NUM_RX_CHAINS; cnt++) {</div><div class='del'>-		pos += scnprintf(buf + pos, bufsz - pos, " %u",</div><div class='del'>-				data-&gt;delta_gain_code[cnt]);</div><div class='del'>-	}</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "\n");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "radio_write:\t\t\t %u\n",</div><div class='del'>-			data-&gt;radio_write);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "state:\t\t\t\t %u\n",</div><div class='del'>-			data-&gt;state);</div><div class='del'>-</div><div class='del'>-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_power_save_status_read(struct file *file,</div><div class='del'>-						    char __user *user_buf,</div><div class='del'>-						    size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	char buf[60];</div><div class='del'>-	int pos = 0;</div><div class='del'>-	const size_t bufsz = sizeof(buf);</div><div class='del'>-	u32 pwrsave_status;</div><div class='del'>-</div><div class='del'>-	pwrsave_status = iwl_read32(priv, CSR_GP_CNTRL) &amp;</div><div class='del'>-			CSR_GP_REG_POWER_SAVE_STATUS_MSK;</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "Power Save Status: ");</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "%s\n",</div><div class='del'>-		(pwrsave_status == CSR_GP_REG_NO_POWER_SAVE) ? "none" :</div><div class='del'>-		(pwrsave_status == CSR_GP_REG_MAC_POWER_SAVE) ? "MAC" :</div><div class='del'>-		(pwrsave_status == CSR_GP_REG_PHY_POWER_SAVE) ? "PHY" :</div><div class='del'>-		"error");</div><div class='del'>-</div><div class='del'>-	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_clear_ucode_statistics_write(struct file *file,</div><div class='del'>-					 const char __user *user_buf,</div><div class='del'>-					 size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	char buf[8];</div><div class='del'>-	int buf_size;</div><div class='del'>-	int clear;</div><div class='del'>-</div><div class='del'>-	memset(buf, 0, sizeof(buf));</div><div class='del'>-	buf_size = min(count, sizeof(buf) -  1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, buf_size))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (sscanf(buf, "%d", &amp;clear) != 1)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	/* make request to uCode to retrieve statistics information */</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	iwl_legacy_send_statistics_request(priv, CMD_SYNC, true);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</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 iwl_legacy_dbgfs_rxon_flags_read(struct file *file,</div><div class='del'>-					 char __user *user_buf,</div><div class='del'>-					 size_t count, loff_t *ppos) {</div><div class='del'>-</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	int len = 0;</div><div class='del'>-	char buf[20];</div><div class='del'>-</div><div class='del'>-	len = sprintf(buf, "0x%04X\n",</div><div class='del'>-		le32_to_cpu(priv-&gt;contexts[IWL_RXON_CTX_BSS].active.flags));</div><div class='del'>-	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_rxon_filter_flags_read(struct file *file,</div><div class='del'>-						char __user *user_buf,</div><div class='del'>-						size_t count, loff_t *ppos) {</div><div class='del'>-</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	int len = 0;</div><div class='del'>-	char buf[20];</div><div class='del'>-</div><div class='del'>-	len = sprintf(buf, "0x%04X\n",</div><div class='del'>-	le32_to_cpu(priv-&gt;contexts[IWL_RXON_CTX_BSS].active.filter_flags));</div><div class='del'>-	return simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_fh_reg_read(struct file *file,</div><div class='del'>-					 char __user *user_buf,</div><div class='del'>-					 size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	char *buf;</div><div class='del'>-	int pos = 0;</div><div class='del'>-	ssize_t ret = -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cfg-&gt;ops-&gt;lib-&gt;dump_fh) {</div><div class='del'>-		ret = pos = priv-&gt;cfg-&gt;ops-&gt;lib-&gt;dump_fh(priv, &amp;buf, true);</div><div class='del'>-		if (buf) {</div><div class='del'>-			ret = simple_read_from_buffer(user_buf,</div><div class='del'>-						      count, ppos, buf, pos);</div><div class='del'>-			kfree(buf);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_missed_beacon_read(struct file *file,</div><div class='del'>-					char __user *user_buf,</div><div class='del'>-					size_t count, loff_t *ppos) {</div><div class='del'>-</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	int pos = 0;</div><div class='del'>-	char buf[12];</div><div class='del'>-	const size_t bufsz = sizeof(buf);</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos, "%d\n",</div><div class='del'>-			priv-&gt;missed_beacon_threshold);</div><div class='del'>-</div><div class='del'>-	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_missed_beacon_write(struct file *file,</div><div class='del'>-					 const char __user *user_buf,</div><div class='del'>-					 size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	char buf[8];</div><div class='del'>-	int buf_size;</div><div class='del'>-	int missed;</div><div class='del'>-</div><div class='del'>-	memset(buf, 0, sizeof(buf));</div><div class='del'>-	buf_size = min(count, sizeof(buf) -  1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, buf_size))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (sscanf(buf, "%d", &amp;missed) != 1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (missed &lt; IWL_MISSED_BEACON_THRESHOLD_MIN ||</div><div class='del'>-	    missed &gt; IWL_MISSED_BEACON_THRESHOLD_MAX)</div><div class='del'>-		priv-&gt;missed_beacon_threshold =</div><div class='del'>-			IWL_MISSED_BEACON_THRESHOLD_DEF;</div><div class='del'>-	else</div><div class='del'>-		priv-&gt;missed_beacon_threshold = missed;</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 iwl_legacy_dbgfs_force_reset_read(struct file *file,</div><div class='del'>-					char __user *user_buf,</div><div class='del'>-					size_t count, loff_t *ppos) {</div><div class='del'>-</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	int pos = 0;</div><div class='del'>-	char buf[300];</div><div class='del'>-	const size_t bufsz = sizeof(buf);</div><div class='del'>-	struct iwl_force_reset *force_reset;</div><div class='del'>-</div><div class='del'>-	force_reset = &amp;priv-&gt;force_reset;</div><div class='del'>-</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			"\tnumber of reset request: %d\n",</div><div class='del'>-			force_reset-&gt;reset_request_count);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			"\tnumber of reset request success: %d\n",</div><div class='del'>-			force_reset-&gt;reset_success_count);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			"\tnumber of reset request reject: %d\n",</div><div class='del'>-			force_reset-&gt;reset_reject_count);</div><div class='del'>-	pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-			"\treset duration: %lu\n",</div><div class='del'>-			force_reset-&gt;reset_duration);</div><div class='del'>-</div><div class='del'>-	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_force_reset_write(struct file *file,</div><div class='del'>-					const char __user *user_buf,</div><div class='del'>-					size_t count, loff_t *ppos) {</div><div class='del'>-</div><div class='del'>-	int ret;</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_force_reset(priv, true);</div><div class='del'>-</div><div class='del'>-	return ret ? ret : count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl_legacy_dbgfs_wd_timeout_write(struct file *file,</div><div class='del'>-					const char __user *user_buf,</div><div class='del'>-					size_t count, loff_t *ppos) {</div><div class='del'>-</div><div class='del'>-	struct iwl_priv *priv = file-&gt;private_data;</div><div class='del'>-	char buf[8];</div><div class='del'>-	int buf_size;</div><div class='del'>-	int timeout;</div><div class='del'>-</div><div class='del'>-	memset(buf, 0, sizeof(buf));</div><div class='del'>-	buf_size = min(count, sizeof(buf) -  1);</div><div class='del'>-	if (copy_from_user(buf, user_buf, buf_size))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (sscanf(buf, "%d", &amp;timeout) != 1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (timeout &lt; 0 || timeout &gt; IWL_MAX_WD_TIMEOUT)</div><div class='del'>-		timeout = IWL_DEF_WD_TIMEOUT;</div><div class='del'>-</div><div class='del'>-	priv-&gt;cfg-&gt;base_params-&gt;wd_timeout = timeout;</div><div class='del'>-	iwl_legacy_setup_watchdog(priv);</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-DEBUGFS_READ_FILE_OPS(rx_statistics);</div><div class='del'>-DEBUGFS_READ_FILE_OPS(tx_statistics);</div><div class='del'>-DEBUGFS_READ_WRITE_FILE_OPS(traffic_log);</div><div class='del'>-DEBUGFS_READ_FILE_OPS(rx_queue);</div><div class='del'>-DEBUGFS_READ_FILE_OPS(tx_queue);</div><div class='del'>-DEBUGFS_READ_FILE_OPS(ucode_rx_stats);</div><div class='del'>-DEBUGFS_READ_FILE_OPS(ucode_tx_stats);</div><div class='del'>-DEBUGFS_READ_FILE_OPS(ucode_general_stats);</div><div class='del'>-DEBUGFS_READ_FILE_OPS(sensitivity);</div><div class='del'>-DEBUGFS_READ_FILE_OPS(chain_noise);</div><div class='del'>-DEBUGFS_READ_FILE_OPS(power_save_status);</div><div class='del'>-DEBUGFS_WRITE_FILE_OPS(clear_ucode_statistics);</div><div class='del'>-DEBUGFS_WRITE_FILE_OPS(clear_traffic_statistics);</div><div class='del'>-DEBUGFS_READ_FILE_OPS(fh_reg);</div><div class='del'>-DEBUGFS_READ_WRITE_FILE_OPS(missed_beacon);</div><div class='del'>-DEBUGFS_READ_WRITE_FILE_OPS(force_reset);</div><div class='del'>-DEBUGFS_READ_FILE_OPS(rxon_flags);</div><div class='del'>-DEBUGFS_READ_FILE_OPS(rxon_filter_flags);</div><div class='del'>-DEBUGFS_WRITE_FILE_OPS(wd_timeout);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Create the debugfs files and directories</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-int iwl_legacy_dbgfs_register(struct iwl_priv *priv, const char *name)</div><div class='del'>-{</div><div class='del'>-	struct dentry *phyd = priv-&gt;hw-&gt;wiphy-&gt;debugfsdir;</div><div class='del'>-	struct dentry *dir_drv, *dir_data, *dir_rf, *dir_debug;</div><div class='del'>-</div><div class='del'>-	dir_drv = debugfs_create_dir(name, phyd);</div><div class='del'>-	if (!dir_drv)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	priv-&gt;debugfs_dir = dir_drv;</div><div class='del'>-</div><div class='del'>-	dir_data = debugfs_create_dir("data", dir_drv);</div><div class='del'>-	if (!dir_data)</div><div class='del'>-		goto err;</div><div class='del'>-	dir_rf = debugfs_create_dir("rf", dir_drv);</div><div class='del'>-	if (!dir_rf)</div><div class='del'>-		goto err;</div><div class='del'>-	dir_debug = debugfs_create_dir("debug", dir_drv);</div><div class='del'>-	if (!dir_debug)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	DEBUGFS_ADD_FILE(nvm, dir_data, S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(sram, dir_data, S_IWUSR | S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(stations, dir_data, S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(channels, dir_data, S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(status, dir_data, S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(interrupt, dir_data, S_IWUSR | S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(qos, dir_data, S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(disable_ht40, dir_data, S_IWUSR | S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(rx_statistics, dir_debug, S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(tx_statistics, dir_debug, S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(traffic_log, dir_debug, S_IWUSR | S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(rx_queue, dir_debug, S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(tx_queue, dir_debug, S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(power_save_status, dir_debug, S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(clear_ucode_statistics, dir_debug, S_IWUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(clear_traffic_statistics, dir_debug, S_IWUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(fh_reg, dir_debug, S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(missed_beacon, dir_debug, S_IWUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(force_reset, dir_debug, S_IWUSR | S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(ucode_rx_stats, dir_debug, S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(ucode_tx_stats, dir_debug, S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(ucode_general_stats, dir_debug, S_IRUSR);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cfg-&gt;base_params-&gt;sensitivity_calib_by_driver)</div><div class='del'>-		DEBUGFS_ADD_FILE(sensitivity, dir_debug, S_IRUSR);</div><div class='del'>-	if (priv-&gt;cfg-&gt;base_params-&gt;chain_noise_calib_by_driver)</div><div class='del'>-		DEBUGFS_ADD_FILE(chain_noise, dir_debug, S_IRUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(rxon_filter_flags, dir_debug, S_IWUSR);</div><div class='del'>-	DEBUGFS_ADD_FILE(wd_timeout, dir_debug, S_IWUSR);</div><div class='del'>-	if (priv-&gt;cfg-&gt;base_params-&gt;sensitivity_calib_by_driver)</div><div class='del'>-		DEBUGFS_ADD_BOOL(disable_sensitivity, dir_rf,</div><div class='del'>-				 &amp;priv-&gt;disable_sens_cal);</div><div class='del'>-	if (priv-&gt;cfg-&gt;base_params-&gt;chain_noise_calib_by_driver)</div><div class='del'>-		DEBUGFS_ADD_BOOL(disable_chain_noise, dir_rf,</div><div class='del'>-				 &amp;priv-&gt;disable_chain_noise_cal);</div><div class='del'>-	DEBUGFS_ADD_BOOL(disable_tx_power, dir_rf,</div><div class='del'>-				&amp;priv-&gt;disable_tx_power_cal);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	IWL_ERR(priv, "Can't create the debugfs directory\n");</div><div class='del'>-	iwl_legacy_dbgfs_unregister(priv);</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_dbgfs_register);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Remove the debugfs files and directories</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-void iwl_legacy_dbgfs_unregister(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	if (!priv-&gt;debugfs_dir)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	debugfs_remove_recursive(priv-&gt;debugfs_dir);</div><div class='del'>-	priv-&gt;debugfs_dir = NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_dbgfs_unregister);</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-dev.h b/drivers/net/wireless/iwlegacy/iwl-dev.h<br/>deleted file mode 100644<br/>index 9c786edf56fd..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-dev.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-dev.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1364 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-/*</div><div class='del'>- * Please use this file (iwl-dev.h) for driver implementation definitions.</div><div class='del'>- * Please use iwl-commands.h for uCode API definitions.</div><div class='del'>- * Please use iwl-4965-hw.h for hardware-related definitions.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __iwl_legacy_dev_h__</div><div class='del'>-#define __iwl_legacy_dev_h__</div><div class='del'>-</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt; /* for struct pci_device_id */</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/leds.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;net/ieee80211_radiotap.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-eeprom.h"</div><div class='del'>-#include "iwl-csr.h"</div><div class='del'>-#include "iwl-prph.h"</div><div class='del'>-#include "iwl-fh.h"</div><div class='del'>-#include "iwl-debug.h"</div><div class='del'>-#include "iwl-4965-hw.h"</div><div class='del'>-#include "iwl-3945-hw.h"</div><div class='del'>-#include "iwl-led.h"</div><div class='del'>-#include "iwl-power.h"</div><div class='del'>-#include "iwl-legacy-rs.h"</div><div class='del'>-</div><div class='del'>-struct iwl_tx_queue;</div><div class='del'>-</div><div class='del'>-/* CT-KILL constants */</div><div class='del'>-#define CT_KILL_THRESHOLD_LEGACY   110 /* in Celsius */</div><div class='del'>-</div><div class='del'>-/* Default noise level to report when noise measurement is not available.</div><div class='del'>- *   This may be because we're:</div><div class='del'>- *   1)  Not associated (4965, no beacon statistics being sent to driver)</div><div class='del'>- *   2)  Scanning (noise measurement does not apply to associated channel)</div><div class='del'>- *   3)  Receiving CCK (3945 delivers noise info only for OFDM frames)</div><div class='del'>- * Use default noise value of -127 ... this is below the range of measurable</div><div class='del'>- *   Rx dBm for either 3945 or 4965, so it can indicate "unmeasurable" to user.</div><div class='del'>- *   Also, -127 works better than 0 when averaging frames with/without</div><div class='del'>- *   noise info (e.g. averaging might be done in app); measured dBm values are</div><div class='del'>- *   always negative ... using a negative value as the default keeps all</div><div class='del'>- *   averages within an s8's (used in some apps) range of negative values. */</div><div class='del'>-#define IWL_NOISE_MEAS_NOT_AVAILABLE (-127)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * RTS threshold here is total size [2347] minus 4 FCS bytes</div><div class='del'>- * Per spec:</div><div class='del'>- *   a value of 0 means RTS on all data/management packets</div><div class='del'>- *   a value &gt; max MSDU size means no RTS</div><div class='del'>- * else RTS for data/management frames where MPDU is larger</div><div class='del'>- *   than RTS value.</div><div class='del'>- */</div><div class='del'>-#define DEFAULT_RTS_THRESHOLD     2347U</div><div class='del'>-#define MIN_RTS_THRESHOLD         0U</div><div class='del'>-#define MAX_RTS_THRESHOLD         2347U</div><div class='del'>-#define MAX_MSDU_SIZE		  2304U</div><div class='del'>-#define MAX_MPDU_SIZE		  2346U</div><div class='del'>-#define DEFAULT_BEACON_INTERVAL   100U</div><div class='del'>-#define	DEFAULT_SHORT_RETRY_LIMIT 7U</div><div class='del'>-#define	DEFAULT_LONG_RETRY_LIMIT  4U</div><div class='del'>-</div><div class='del'>-struct iwl_rx_mem_buffer {</div><div class='del'>-	dma_addr_t page_dma;</div><div class='del'>-	struct page *page;</div><div class='del'>-	struct list_head list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define rxb_addr(r) page_address(r-&gt;page)</div><div class='del'>-</div><div class='del'>-/* defined below */</div><div class='del'>-struct iwl_device_cmd;</div><div class='del'>-</div><div class='del'>-struct iwl_cmd_meta {</div><div class='del'>-	/* only for SYNC commands, iff the reply skb is wanted */</div><div class='del'>-	struct iwl_host_cmd *source;</div><div class='del'>-	/*</div><div class='del'>-	 * only for ASYNC commands</div><div class='del'>-	 * (which is somewhat stupid -- look at iwl-sta.c for instance</div><div class='del'>-	 * which duplicates a bunch of code because the callback isn't</div><div class='del'>-	 * invoked for SYNC commands, if it were and its result passed</div><div class='del'>-	 * through it would be simpler...)</div><div class='del'>-	 */</div><div class='del'>-	void (*callback)(struct iwl_priv *priv,</div><div class='del'>-			 struct iwl_device_cmd *cmd,</div><div class='del'>-			 struct iwl_rx_packet *pkt);</div><div class='del'>-</div><div class='del'>-	/* The CMD_SIZE_HUGE flag bit indicates that the command</div><div class='del'>-	 * structure is stored at the end of the shared queue memory. */</div><div class='del'>-	u32 flags;</div><div class='del'>-</div><div class='del'>-	DEFINE_DMA_UNMAP_ADDR(mapping);</div><div class='del'>-	DEFINE_DMA_UNMAP_LEN(len);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Generic queue structure</div><div class='del'>- *</div><div class='del'>- * Contains common data for Rx and Tx queues</div><div class='del'>- */</div><div class='del'>-struct iwl_queue {</div><div class='del'>-	int n_bd;              /* number of BDs in this queue */</div><div class='del'>-	int write_ptr;       /* 1-st empty entry (index) host_w*/</div><div class='del'>-	int read_ptr;         /* last used entry (index) host_r*/</div><div class='del'>-	/* use for monitoring and recovering the stuck queue */</div><div class='del'>-	dma_addr_t dma_addr;   /* physical addr for BD's */</div><div class='del'>-	int n_window;	       /* safe queue window */</div><div class='del'>-	u32 id;</div><div class='del'>-	int low_mark;	       /* low watermark, resume queue if free</div><div class='del'>-				* space more than this */</div><div class='del'>-	int high_mark;         /* high watermark, stop queue if free</div><div class='del'>-				* space less than this */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* One for each TFD */</div><div class='del'>-struct iwl_tx_info {</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_tx_queue - Tx Queue for DMA</div><div class='del'>- * @q: generic Rx/Tx queue descriptor</div><div class='del'>- * @bd: base of circular buffer of TFDs</div><div class='del'>- * @cmd: array of command/TX buffer pointers</div><div class='del'>- * @meta: array of meta data for each command/tx buffer</div><div class='del'>- * @dma_addr_cmd: physical address of cmd/tx buffer array</div><div class='del'>- * @txb: array of per-TFD driver data</div><div class='del'>- * @time_stamp: time (in jiffies) of last read_ptr change</div><div class='del'>- * @need_update: indicates need to update read/write index</div><div class='del'>- * @sched_retry: indicates queue is high-throughput aggregation (HT AGG) enabled</div><div class='del'>- *</div><div class='del'>- * A Tx queue consists of circular buffer of BDs (a.k.a. TFDs, transmit frame</div><div class='del'>- * descriptors) and required locking structures.</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='del'>-struct iwl_tx_queue {</div><div class='del'>-	struct iwl_queue q;</div><div class='del'>-	void *tfds;</div><div class='del'>-	struct iwl_device_cmd **cmd;</div><div class='del'>-	struct iwl_cmd_meta *meta;</div><div class='del'>-	struct iwl_tx_info *txb;</div><div class='del'>-	unsigned long time_stamp;</div><div class='del'>-	u8 need_update;</div><div class='del'>-	u8 sched_retry;</div><div class='del'>-	u8 active;</div><div class='del'>-	u8 swq_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IWL_NUM_SCAN_RATES         (2)</div><div class='del'>-</div><div class='del'>-struct iwl4965_channel_tgd_info {</div><div class='del'>-	u8 type;</div><div class='del'>-	s8 max_power;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl4965_channel_tgh_info {</div><div class='del'>-	s64 last_radar_time;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IWL4965_MAX_RATE (33)</div><div class='del'>-</div><div class='del'>-struct iwl3945_clip_group {</div><div class='del'>-	/* maximum power level to prevent clipping for each rate, derived by</div><div class='del'>-	 *   us from this band's saturation power in EEPROM */</div><div class='del'>-	const s8 clip_powers[IWL_MAX_RATES];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* current Tx power values to use, one for each rate for each channel.</div><div class='del'>- * requested power is limited by:</div><div class='del'>- * -- regulatory EEPROM limits for this channel</div><div class='del'>- * -- hardware capabilities (clip-powers)</div><div class='del'>- * -- spectrum management</div><div class='del'>- * -- user preference (e.g. iwconfig)</div><div class='del'>- * when requested power is set, base power index must also be set. */</div><div class='del'>-struct iwl3945_channel_power_info {</div><div class='del'>-	struct iwl3945_tx_power tpc;	/* actual radio and DSP gain settings */</div><div class='del'>-	s8 power_table_index;	/* actual (compenst'd) index into gain table */</div><div class='del'>-	s8 base_power_index;	/* gain index for power at factory temp. */</div><div class='del'>-	s8 requested_power;	/* power (dBm) requested for this chnl/rate */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* current scan Tx power values to use, one for each scan rate for each</div><div class='del'>- * channel. */</div><div class='del'>-struct iwl3945_scan_power_info {</div><div class='del'>-	struct iwl3945_tx_power tpc;	/* actual radio and DSP gain settings */</div><div class='del'>-	s8 power_table_index;	/* actual (compenst'd) index into gain table */</div><div class='del'>-	s8 requested_power;	/* scan pwr (dBm) requested for chnl/rate */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * One for each channel, holds all channel setup data</div><div class='del'>- * Some of the fields (e.g. eeprom and flags/max_power_avg) are redundant</div><div class='del'>- *     with one another!</div><div class='del'>- */</div><div class='del'>-struct iwl_channel_info {</div><div class='del'>-	struct iwl4965_channel_tgd_info tgd;</div><div class='del'>-	struct iwl4965_channel_tgh_info tgh;</div><div class='del'>-	struct iwl_eeprom_channel eeprom;	/* EEPROM regulatory limit */</div><div class='del'>-	struct iwl_eeprom_channel ht40_eeprom;	/* EEPROM regulatory limit for</div><div class='del'>-						 * HT40 channel */</div><div class='del'>-</div><div class='del'>-	u8 channel;	  /* channel number */</div><div class='del'>-	u8 flags;	  /* flags copied from EEPROM */</div><div class='del'>-	s8 max_power_avg; /* (dBm) regul. eeprom, normal Tx, any rate */</div><div class='del'>-	s8 curr_txpow;	  /* (dBm) regulatory/spectrum/user (not h/w) limit */</div><div class='del'>-	s8 min_power;	  /* always 0 */</div><div class='del'>-	s8 scan_power;	  /* (dBm) regul. eeprom, direct scans, any rate */</div><div class='del'>-</div><div class='del'>-	u8 group_index;	  /* 0-4, maps channel to group1/2/3/4/5 */</div><div class='del'>-	u8 band_index;	  /* 0-4, maps channel to band1/2/3/4/5 */</div><div class='del'>-	enum ieee80211_band band;</div><div class='del'>-</div><div class='del'>-	/* HT40 channel info */</div><div class='del'>-	s8 ht40_max_power_avg;	/* (dBm) regul. eeprom, normal Tx, any rate */</div><div class='del'>-	u8 ht40_flags;		/* flags copied from EEPROM */</div><div class='del'>-	u8 ht40_extension_channel; /* HT_IE_EXT_CHANNEL_* */</div><div class='del'>-</div><div class='del'>-	/* Radio/DSP gain settings for each "normal" data Tx rate.</div><div class='del'>-	 * These include, in addition to RF and DSP gain, a few fields for</div><div class='del'>-	 *   remembering/modifying gain settings (indexes). */</div><div class='del'>-	struct iwl3945_channel_power_info power_info[IWL4965_MAX_RATE];</div><div class='del'>-</div><div class='del'>-	/* Radio/DSP gain settings for each scan rate, for directed scans. */</div><div class='del'>-	struct iwl3945_scan_power_info scan_pwr_info[IWL_NUM_SCAN_RATES];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IWL_TX_FIFO_BK		0	/* shared */</div><div class='del'>-#define IWL_TX_FIFO_BE		1</div><div class='del'>-#define IWL_TX_FIFO_VI		2	/* shared */</div><div class='del'>-#define IWL_TX_FIFO_VO		3</div><div class='del'>-#define IWL_TX_FIFO_UNUSED	-1</div><div class='del'>-</div><div class='del'>-/* Minimum number of queues. MAX_NUM is defined in hw specific files.</div><div class='del'>- * Set the minimum to accommodate the 4 standard TX queues, 1 command</div><div class='del'>- * queue, 2 (unused) HCCA queues, and 4 HT queues (one for each AC) */</div><div class='del'>-#define IWL_MIN_NUM_QUEUES	10</div><div class='del'>-</div><div class='del'>-#define IWL_DEFAULT_CMD_QUEUE_NUM	4</div><div class='del'>-</div><div class='del'>-#define IEEE80211_DATA_LEN              2304</div><div class='del'>-#define IEEE80211_4ADDR_LEN             30</div><div class='del'>-#define IEEE80211_HLEN                  (IEEE80211_4ADDR_LEN)</div><div class='del'>-#define IEEE80211_FRAME_LEN             (IEEE80211_DATA_LEN + IEEE80211_HLEN)</div><div class='del'>-</div><div class='del'>-struct iwl_frame {</div><div class='del'>-	union {</div><div class='del'>-		struct ieee80211_hdr frame;</div><div class='del'>-		struct iwl_tx_beacon_cmd beacon;</div><div class='del'>-		u8 raw[IEEE80211_FRAME_LEN];</div><div class='del'>-		u8 cmd[360];</div><div class='del'>-	} u;</div><div class='del'>-	struct list_head list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define SEQ_TO_SN(seq) (((seq) &amp; IEEE80211_SCTL_SEQ) &gt;&gt; 4)</div><div class='del'>-#define SN_TO_SEQ(ssn) (((ssn) &lt;&lt; 4) &amp; IEEE80211_SCTL_SEQ)</div><div class='del'>-#define MAX_SN ((IEEE80211_SCTL_SEQ) &gt;&gt; 4)</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CMD_SYNC = 0,</div><div class='del'>-	CMD_SIZE_NORMAL = 0,</div><div class='del'>-	CMD_NO_SKB = 0,</div><div class='del'>-	CMD_SIZE_HUGE = (1 &lt;&lt; 0),</div><div class='del'>-	CMD_ASYNC = (1 &lt;&lt; 1),</div><div class='del'>-	CMD_WANT_SKB = (1 &lt;&lt; 2),</div><div class='del'>-	CMD_MAPPED = (1 &lt;&lt; 3),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DEF_CMD_PAYLOAD_SIZE 320</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_device_cmd</div><div class='del'>- *</div><div class='del'>- * For allocation of the command and tx queues, this establishes the overall</div><div class='del'>- * size of the largest command we send to uCode, except for a scan command</div><div class='del'>- * (which is relatively huge; space is allocated separately).</div><div class='del'>- */</div><div class='del'>-struct iwl_device_cmd {</div><div class='del'>-	struct iwl_cmd_header hdr;	/* uCode API */</div><div class='del'>-	union {</div><div class='del'>-		u32 flags;</div><div class='del'>-		u8 val8;</div><div class='del'>-		u16 val16;</div><div class='del'>-		u32 val32;</div><div class='del'>-		struct iwl_tx_cmd tx;</div><div class='del'>-		u8 payload[DEF_CMD_PAYLOAD_SIZE];</div><div class='del'>-	} __packed cmd;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define TFD_MAX_PAYLOAD_SIZE (sizeof(struct iwl_device_cmd))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct iwl_host_cmd {</div><div class='del'>-	const void *data;</div><div class='del'>-	unsigned long reply_page;</div><div class='del'>-	void (*callback)(struct iwl_priv *priv,</div><div class='del'>-			 struct iwl_device_cmd *cmd,</div><div class='del'>-			 struct iwl_rx_packet *pkt);</div><div class='del'>-	u32 flags;</div><div class='del'>-	u16 len;</div><div class='del'>-	u8 id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define SUP_RATE_11A_MAX_NUM_CHANNELS  8</div><div class='del'>-#define SUP_RATE_11B_MAX_NUM_CHANNELS  4</div><div class='del'>-#define SUP_RATE_11G_MAX_NUM_CHANNELS  12</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_rx_queue - Rx queue</div><div class='del'>- * @bd: driver's pointer to buffer of receive buffer descriptors (rbd)</div><div class='del'>- * @bd_dma: bus address of buffer of receive buffer descriptors (rbd)</div><div class='del'>- * @read: Shared index to newest available Rx buffer</div><div class='del'>- * @write: Shared index to oldest written Rx packet</div><div class='del'>- * @free_count: Number of pre-allocated buffers in rx_free</div><div class='del'>- * @rx_free: list of free SKBs for use</div><div class='del'>- * @rx_used: List of Rx buffers with no SKB</div><div class='del'>- * @need_update: flag to indicate we need to update read/write index</div><div class='del'>- * @rb_stts: driver's pointer to receive buffer status</div><div class='del'>- * @rb_stts_dma: bus address of receive buffer status</div><div class='del'>- *</div><div class='del'>- * NOTE:  rx_free and rx_used are used as a FIFO for iwl_rx_mem_buffers</div><div class='del'>- */</div><div class='del'>-struct iwl_rx_queue {</div><div class='del'>-	__le32 *bd;</div><div class='del'>-	dma_addr_t bd_dma;</div><div class='del'>-	struct iwl_rx_mem_buffer pool[RX_QUEUE_SIZE + RX_FREE_BUFFERS];</div><div class='del'>-	struct iwl_rx_mem_buffer *queue[RX_QUEUE_SIZE];</div><div class='del'>-	u32 read;</div><div class='del'>-	u32 write;</div><div class='del'>-	u32 free_count;</div><div class='del'>-	u32 write_actual;</div><div class='del'>-	struct list_head rx_free;</div><div class='del'>-	struct list_head rx_used;</div><div class='del'>-	int need_update;</div><div class='del'>-	struct iwl_rb_status *rb_stts;</div><div class='del'>-	dma_addr_t rb_stts_dma;</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IWL_SUPPORTED_RATES_IE_LEN         8</div><div class='del'>-</div><div class='del'>-#define MAX_TID_COUNT        9</div><div class='del'>-</div><div class='del'>-#define IWL_INVALID_RATE     0xFF</div><div class='del'>-#define IWL_INVALID_VALUE    -1</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_ht_agg -- aggregation status while waiting for block-ack</div><div class='del'>- * @txq_id: Tx queue used for Tx attempt</div><div class='del'>- * @frame_count: # frames attempted by Tx command</div><div class='del'>- * @wait_for_ba: Expect block-ack before next Tx reply</div><div class='del'>- * @start_idx: Index of 1st Transmit Frame Descriptor (TFD) in Tx window</div><div class='del'>- * @bitmap0: Low order bitmap, one bit for each frame pending ACK in Tx window</div><div class='del'>- * @bitmap1: High order, one bit for each frame pending ACK in Tx window</div><div class='del'>- * @rate_n_flags: Rate at which Tx was attempted</div><div class='del'>- *</div><div class='del'>- * If REPLY_TX indicates that aggregation was attempted, driver must wait</div><div class='del'>- * for block ack (REPLY_COMPRESSED_BA).  This struct stores tx reply info</div><div class='del'>- * until block ack arrives.</div><div class='del'>- */</div><div class='del'>-struct iwl_ht_agg {</div><div class='del'>-	u16 txq_id;</div><div class='del'>-	u16 frame_count;</div><div class='del'>-	u16 wait_for_ba;</div><div class='del'>-	u16 start_idx;</div><div class='del'>-	u64 bitmap;</div><div class='del'>-	u32 rate_n_flags;</div><div class='del'>-#define IWL_AGG_OFF 0</div><div class='del'>-#define IWL_AGG_ON 1</div><div class='del'>-#define IWL_EMPTYING_HW_QUEUE_ADDBA 2</div><div class='del'>-#define IWL_EMPTYING_HW_QUEUE_DELBA 3</div><div class='del'>-	u8 state;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct iwl_tid_data {</div><div class='del'>-	u16 seq_number; /* 4965 only */</div><div class='del'>-	u16 tfds_in_queue;</div><div class='del'>-	struct iwl_ht_agg agg;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl_hw_key {</div><div class='del'>-	u32 cipher;</div><div class='del'>-	int keylen;</div><div class='del'>-	u8 keyidx;</div><div class='del'>-	u8 key[32];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-union iwl_ht_rate_supp {</div><div class='del'>-	u16 rates;</div><div class='del'>-	struct {</div><div class='del'>-		u8 siso_rate;</div><div class='del'>-		u8 mimo_rate;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CFG_HT_RX_AMPDU_FACTOR_8K   (0x0)</div><div class='del'>-#define CFG_HT_RX_AMPDU_FACTOR_16K  (0x1)</div><div class='del'>-#define CFG_HT_RX_AMPDU_FACTOR_32K  (0x2)</div><div class='del'>-#define CFG_HT_RX_AMPDU_FACTOR_64K  (0x3)</div><div class='del'>-#define CFG_HT_RX_AMPDU_FACTOR_DEF  CFG_HT_RX_AMPDU_FACTOR_64K</div><div class='del'>-#define CFG_HT_RX_AMPDU_FACTOR_MAX  CFG_HT_RX_AMPDU_FACTOR_64K</div><div class='del'>-#define CFG_HT_RX_AMPDU_FACTOR_MIN  CFG_HT_RX_AMPDU_FACTOR_8K</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Maximal MPDU density for TX aggregation</div><div class='del'>- * 4 - 2us density</div><div class='del'>- * 5 - 4us density</div><div class='del'>- * 6 - 8us density</div><div class='del'>- * 7 - 16us density</div><div class='del'>- */</div><div class='del'>-#define CFG_HT_MPDU_DENSITY_2USEC   (0x4)</div><div class='del'>-#define CFG_HT_MPDU_DENSITY_4USEC   (0x5)</div><div class='del'>-#define CFG_HT_MPDU_DENSITY_8USEC   (0x6)</div><div class='del'>-#define CFG_HT_MPDU_DENSITY_16USEC  (0x7)</div><div class='del'>-#define CFG_HT_MPDU_DENSITY_DEF CFG_HT_MPDU_DENSITY_4USEC</div><div class='del'>-#define CFG_HT_MPDU_DENSITY_MAX CFG_HT_MPDU_DENSITY_16USEC</div><div class='del'>-#define CFG_HT_MPDU_DENSITY_MIN     (0x1)</div><div class='del'>-</div><div class='del'>-struct iwl_ht_config {</div><div class='del'>-	bool single_chain_sufficient;</div><div class='del'>-	enum ieee80211_smps_mode smps; /* current smps mode */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* QoS structures */</div><div class='del'>-struct iwl_qos_info {</div><div class='del'>-	int qos_active;</div><div class='del'>-	struct iwl_qosparam_cmd def_qos_parm;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Structure should be accessed with sta_lock held. When station addition</div><div class='del'>- * is in progress (IWL_STA_UCODE_INPROGRESS) it is possible to access only</div><div class='del'>- * the commands (iwl_legacy_addsta_cmd and iwl_link_quality_cmd) without</div><div class='del'>- * sta_lock held.</div><div class='del'>- */</div><div class='del'>-struct iwl_station_entry {</div><div class='del'>-	struct iwl_legacy_addsta_cmd sta;</div><div class='del'>-	struct iwl_tid_data tid[MAX_TID_COUNT];</div><div class='del'>-	u8 used, ctxid;</div><div class='del'>-	struct iwl_hw_key keyinfo;</div><div class='del'>-	struct iwl_link_quality_cmd *lq;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl_station_priv_common {</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-	u8 sta_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * iwl_station_priv: Driver's private station information</div><div class='del'>- *</div><div class='del'>- * When mac80211 creates a station it reserves some space (hw-&gt;sta_data_size)</div><div class='del'>- * in the structure for use by driver. This structure is places in that</div><div class='del'>- * space.</div><div class='del'>- *</div><div class='del'>- * The common struct MUST be first because it is shared between</div><div class='del'>- * 3945 and 4965!</div><div class='del'>- */</div><div class='del'>-struct iwl_station_priv {</div><div class='del'>-	struct iwl_station_priv_common common;</div><div class='del'>-	struct iwl_lq_sta lq_sta;</div><div class='del'>-	atomic_t pending_frames;</div><div class='del'>-	bool client;</div><div class='del'>-	bool asleep;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_vif_priv - driver's private per-interface information</div><div class='del'>- *</div><div class='del'>- * When mac80211 allocates a virtual interface, it can allocate</div><div class='del'>- * space for us to put data into.</div><div class='del'>- */</div><div class='del'>-struct iwl_vif_priv {</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-	u8 ibss_bssid_sta_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* one for each uCode image (inst/data, boot/init/runtime) */</div><div class='del'>-struct fw_desc {</div><div class='del'>-	void *v_addr;		/* access by driver */</div><div class='del'>-	dma_addr_t p_addr;	/* access by card's busmaster DMA */</div><div class='del'>-	u32 len;		/* bytes */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* uCode file layout */</div><div class='del'>-struct iwl_ucode_header {</div><div class='del'>-	__le32 ver;	/* major/minor/API/serial */</div><div class='del'>-	struct {</div><div class='del'>-		__le32 inst_size;	/* bytes of runtime code */</div><div class='del'>-		__le32 data_size;	/* bytes of runtime data */</div><div class='del'>-		__le32 init_size;	/* bytes of init code */</div><div class='del'>-		__le32 init_data_size;	/* bytes of init data */</div><div class='del'>-		__le32 boot_size;	/* bytes of bootstrap code */</div><div class='del'>-		u8 data[0];		/* in same order as sizes */</div><div class='del'>-	} v1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl4965_ibss_seq {</div><div class='del'>-	u8 mac[ETH_ALEN];</div><div class='del'>-	u16 seq_num;</div><div class='del'>-	u16 frag_num;</div><div class='del'>-	unsigned long packet_time;</div><div class='del'>-	struct list_head list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl_sensitivity_ranges {</div><div class='del'>-	u16 min_nrg_cck;</div><div class='del'>-	u16 max_nrg_cck;</div><div class='del'>-</div><div class='del'>-	u16 nrg_th_cck;</div><div class='del'>-	u16 nrg_th_ofdm;</div><div class='del'>-</div><div class='del'>-	u16 auto_corr_min_ofdm;</div><div class='del'>-	u16 auto_corr_min_ofdm_mrc;</div><div class='del'>-	u16 auto_corr_min_ofdm_x1;</div><div class='del'>-	u16 auto_corr_min_ofdm_mrc_x1;</div><div class='del'>-</div><div class='del'>-	u16 auto_corr_max_ofdm;</div><div class='del'>-	u16 auto_corr_max_ofdm_mrc;</div><div class='del'>-	u16 auto_corr_max_ofdm_x1;</div><div class='del'>-	u16 auto_corr_max_ofdm_mrc_x1;</div><div class='del'>-</div><div class='del'>-	u16 auto_corr_max_cck;</div><div class='del'>-	u16 auto_corr_max_cck_mrc;</div><div class='del'>-	u16 auto_corr_min_cck;</div><div class='del'>-	u16 auto_corr_min_cck_mrc;</div><div class='del'>-</div><div class='del'>-	u16 barker_corr_th_min;</div><div class='del'>-	u16 barker_corr_th_min_mrc;</div><div class='del'>-	u16 nrg_th_cca;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define KELVIN_TO_CELSIUS(x) ((x)-273)</div><div class='del'>-#define CELSIUS_TO_KELVIN(x) ((x)+273)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_hw_params</div><div class='del'>- * @max_txq_num: Max # Tx queues supported</div><div class='del'>- * @dma_chnl_num: Number of Tx DMA/FIFO channels</div><div class='del'>- * @scd_bc_tbls_size: size of scheduler byte count tables</div><div class='del'>- * @tfd_size: TFD size</div><div class='del'>- * @tx/rx_chains_num: Number of TX/RX chains</div><div class='del'>- * @valid_tx/rx_ant: usable antennas</div><div class='del'>- * @max_rxq_size: Max # Rx frames in Rx queue (must be power-of-2)</div><div class='del'>- * @max_rxq_log: Log-base-2 of max_rxq_size</div><div class='del'>- * @rx_page_order: Rx buffer page order</div><div class='del'>- * @rx_wrt_ptr_reg: FH{39}_RSCSR_CHNL0_WPTR</div><div class='del'>- * @max_stations:</div><div class='del'>- * @ht40_channel: is 40MHz width possible in band 2.4</div><div class='del'>- * BIT(IEEE80211_BAND_5GHZ) BIT(IEEE80211_BAND_5GHZ)</div><div class='del'>- * @sw_crypto: 0 for hw, 1 for sw</div><div class='del'>- * @max_xxx_size: for ucode uses</div><div class='del'>- * @ct_kill_threshold: temperature threshold</div><div class='del'>- * @beacon_time_tsf_bits: number of valid tsf bits for beacon time</div><div class='del'>- * @struct iwl_sensitivity_ranges: range of sensitivity values</div><div class='del'>- */</div><div class='del'>-struct iwl_hw_params {</div><div class='del'>-	u8 max_txq_num;</div><div class='del'>-	u8 dma_chnl_num;</div><div class='del'>-	u16 scd_bc_tbls_size;</div><div class='del'>-	u32 tfd_size;</div><div class='del'>-	u8  tx_chains_num;</div><div class='del'>-	u8  rx_chains_num;</div><div class='del'>-	u8  valid_tx_ant;</div><div class='del'>-	u8  valid_rx_ant;</div><div class='del'>-	u16 max_rxq_size;</div><div class='del'>-	u16 max_rxq_log;</div><div class='del'>-	u32 rx_page_order;</div><div class='del'>-	u32 rx_wrt_ptr_reg;</div><div class='del'>-	u8  max_stations;</div><div class='del'>-	u8  ht40_channel;</div><div class='del'>-	u8  max_beacon_itrvl;	/* in 1024 ms */</div><div class='del'>-	u32 max_inst_size;</div><div class='del'>-	u32 max_data_size;</div><div class='del'>-	u32 max_bsm_size;</div><div class='del'>-	u32 ct_kill_threshold; /* value in hw-dependent units */</div><div class='del'>-	u16 beacon_time_tsf_bits;</div><div class='del'>-	const struct iwl_sensitivity_ranges *sens;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Functions implemented in core module which are forward declared here</div><div class='del'>- * for use by iwl-[4-5].c</div><div class='del'>- *</div><div class='del'>- * NOTE:  The implementation of these functions are not hardware specific</div><div class='del'>- * which is why they are in the core module files.</div><div class='del'>- *</div><div class='del'>- * Naming convention --</div><div class='del'>- * iwl_         &lt;-- Is part of iwlwifi</div><div class='del'>- * iwlXXXX_     &lt;-- Hardware specific (implemented in iwl-XXXX.c for XXXX)</div><div class='del'>- * iwl4965_bg_      &lt;-- Called from work queue context</div><div class='del'>- * iwl4965_mac_     &lt;-- mac80211 callback</div><div class='del'>- *</div><div class='del'>- ****************************************************************************/</div><div class='del'>-extern void iwl4965_update_chain_flags(struct iwl_priv *priv);</div><div class='del'>-extern const u8 iwlegacy_bcast_addr[ETH_ALEN];</div><div class='del'>-extern int iwl_legacy_queue_space(const struct iwl_queue *q);</div><div class='del'>-static inline int iwl_legacy_queue_used(const struct iwl_queue *q, int i)</div><div class='del'>-{</div><div class='del'>-	return q-&gt;write_ptr &gt;= q-&gt;read_ptr ?</div><div class='del'>-		(i &gt;= q-&gt;read_ptr &amp;&amp; i &lt; q-&gt;write_ptr) :</div><div class='del'>-		!(i &lt; q-&gt;read_ptr &amp;&amp; i &gt;= q-&gt;write_ptr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline u8 iwl_legacy_get_cmd_index(struct iwl_queue *q, u32 index,</div><div class='del'>-								int is_huge)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * This is for init calibration result and scan command which</div><div class='del'>-	 * required buffer &gt; TFD_MAX_PAYLOAD_SIZE,</div><div class='del'>-	 * the big buffer at end of command array</div><div class='del'>-	 */</div><div class='del'>-	if (is_huge)</div><div class='del'>-		return q-&gt;n_window;	/* must be power of 2 */</div><div class='del'>-</div><div class='del'>-	/* Otherwise, use normal size buffers */</div><div class='del'>-	return index &amp; (q-&gt;n_window - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct iwl_dma_ptr {</div><div class='del'>-	dma_addr_t dma;</div><div class='del'>-	void *addr;</div><div class='del'>-	size_t size;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IWL_OPERATION_MODE_AUTO     0</div><div class='del'>-#define IWL_OPERATION_MODE_HT_ONLY  1</div><div class='del'>-#define IWL_OPERATION_MODE_MIXED    2</div><div class='del'>-#define IWL_OPERATION_MODE_20MHZ    3</div><div class='del'>-</div><div class='del'>-#define IWL_TX_CRC_SIZE 4</div><div class='del'>-#define IWL_TX_DELIMITER_SIZE 4</div><div class='del'>-</div><div class='del'>-#define TX_POWER_IWL_ILLEGAL_VOLTAGE -10000</div><div class='del'>-</div><div class='del'>-/* Sensitivity and chain noise calibration */</div><div class='del'>-#define INITIALIZATION_VALUE		0xFFFF</div><div class='del'>-#define IWL4965_CAL_NUM_BEACONS		20</div><div class='del'>-#define IWL_CAL_NUM_BEACONS		16</div><div class='del'>-#define MAXIMUM_ALLOWED_PATHLOSS	15</div><div class='del'>-</div><div class='del'>-#define CHAIN_NOISE_MAX_DELTA_GAIN_CODE 3</div><div class='del'>-</div><div class='del'>-#define MAX_FA_OFDM  50</div><div class='del'>-#define MIN_FA_OFDM  5</div><div class='del'>-#define MAX_FA_CCK   50</div><div class='del'>-#define MIN_FA_CCK   5</div><div class='del'>-</div><div class='del'>-#define AUTO_CORR_STEP_OFDM       1</div><div class='del'>-</div><div class='del'>-#define AUTO_CORR_STEP_CCK     3</div><div class='del'>-#define AUTO_CORR_MAX_TH_CCK   160</div><div class='del'>-</div><div class='del'>-#define NRG_DIFF               2</div><div class='del'>-#define NRG_STEP_CCK           2</div><div class='del'>-#define NRG_MARGIN             8</div><div class='del'>-#define MAX_NUMBER_CCK_NO_FA 100</div><div class='del'>-</div><div class='del'>-#define AUTO_CORR_CCK_MIN_VAL_DEF    (125)</div><div class='del'>-</div><div class='del'>-#define CHAIN_A             0</div><div class='del'>-#define CHAIN_B             1</div><div class='del'>-#define CHAIN_C             2</div><div class='del'>-#define CHAIN_NOISE_DELTA_GAIN_INIT_VAL 4</div><div class='del'>-#define ALL_BAND_FILTER			0xFF00</div><div class='del'>-#define IN_BAND_FILTER			0xFF</div><div class='del'>-#define MIN_AVERAGE_NOISE_MAX_VALUE	0xFFFFFFFF</div><div class='del'>-</div><div class='del'>-#define NRG_NUM_PREV_STAT_L     20</div><div class='del'>-#define NUM_RX_CHAINS           3</div><div class='del'>-</div><div class='del'>-enum iwl4965_false_alarm_state {</div><div class='del'>-	IWL_FA_TOO_MANY = 0,</div><div class='del'>-	IWL_FA_TOO_FEW = 1,</div><div class='del'>-	IWL_FA_GOOD_RANGE = 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum iwl4965_chain_noise_state {</div><div class='del'>-	IWL_CHAIN_NOISE_ALIVE = 0,  /* must be 0 */</div><div class='del'>-	IWL_CHAIN_NOISE_ACCUMULATE,</div><div class='del'>-	IWL_CHAIN_NOISE_CALIBRATED,</div><div class='del'>-	IWL_CHAIN_NOISE_DONE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum iwl4965_calib_enabled_state {</div><div class='del'>-	IWL_CALIB_DISABLED = 0,  /* must be 0 */</div><div class='del'>-	IWL_CALIB_ENABLED = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * enum iwl_calib</div><div class='del'>- * defines the order in which results of initial calibrations</div><div class='del'>- * should be sent to the runtime uCode</div><div class='del'>- */</div><div class='del'>-enum iwl_calib {</div><div class='del'>-	IWL_CALIB_MAX,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Opaque calibration results */</div><div class='del'>-struct iwl_calib_result {</div><div class='del'>-	void *buf;</div><div class='del'>-	size_t buf_len;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum ucode_type {</div><div class='del'>-	UCODE_NONE = 0,</div><div class='del'>-	UCODE_INIT,</div><div class='del'>-	UCODE_RT</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Sensitivity calib data */</div><div class='del'>-struct iwl_sensitivity_data {</div><div class='del'>-	u32 auto_corr_ofdm;</div><div class='del'>-	u32 auto_corr_ofdm_mrc;</div><div class='del'>-	u32 auto_corr_ofdm_x1;</div><div class='del'>-	u32 auto_corr_ofdm_mrc_x1;</div><div class='del'>-	u32 auto_corr_cck;</div><div class='del'>-	u32 auto_corr_cck_mrc;</div><div class='del'>-</div><div class='del'>-	u32 last_bad_plcp_cnt_ofdm;</div><div class='del'>-	u32 last_fa_cnt_ofdm;</div><div class='del'>-	u32 last_bad_plcp_cnt_cck;</div><div class='del'>-	u32 last_fa_cnt_cck;</div><div class='del'>-</div><div class='del'>-	u32 nrg_curr_state;</div><div class='del'>-	u32 nrg_prev_state;</div><div class='del'>-	u32 nrg_value[10];</div><div class='del'>-	u8  nrg_silence_rssi[NRG_NUM_PREV_STAT_L];</div><div class='del'>-	u32 nrg_silence_ref;</div><div class='del'>-	u32 nrg_energy_idx;</div><div class='del'>-	u32 nrg_silence_idx;</div><div class='del'>-	u32 nrg_th_cck;</div><div class='del'>-	s32 nrg_auto_corr_silence_diff;</div><div class='del'>-	u32 num_in_cck_no_fa;</div><div class='del'>-	u32 nrg_th_ofdm;</div><div class='del'>-</div><div class='del'>-	u16 barker_corr_th_min;</div><div class='del'>-	u16 barker_corr_th_min_mrc;</div><div class='del'>-	u16 nrg_th_cca;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Chain noise (differential Rx gain) calib data */</div><div class='del'>-struct iwl_chain_noise_data {</div><div class='del'>-	u32 active_chains;</div><div class='del'>-	u32 chain_noise_a;</div><div class='del'>-	u32 chain_noise_b;</div><div class='del'>-	u32 chain_noise_c;</div><div class='del'>-	u32 chain_signal_a;</div><div class='del'>-	u32 chain_signal_b;</div><div class='del'>-	u32 chain_signal_c;</div><div class='del'>-	u16 beacon_count;</div><div class='del'>-	u8 disconn_array[NUM_RX_CHAINS];</div><div class='del'>-	u8 delta_gain_code[NUM_RX_CHAINS];</div><div class='del'>-	u8 radio_write;</div><div class='del'>-	u8 state;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define	EEPROM_SEM_TIMEOUT 10		/* milliseconds */</div><div class='del'>-#define EEPROM_SEM_RETRY_LIMIT 1000	/* number of attempts (not time) */</div><div class='del'>-</div><div class='del'>-#define IWL_TRAFFIC_ENTRIES	(256)</div><div class='del'>-#define IWL_TRAFFIC_ENTRY_SIZE  (64)</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	MEASUREMENT_READY = (1 &lt;&lt; 0),</div><div class='del'>-	MEASUREMENT_ACTIVE = (1 &lt;&lt; 1),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* interrupt statistics */</div><div class='del'>-struct isr_statistics {</div><div class='del'>-	u32 hw;</div><div class='del'>-	u32 sw;</div><div class='del'>-	u32 err_code;</div><div class='del'>-	u32 sch;</div><div class='del'>-	u32 alive;</div><div class='del'>-	u32 rfkill;</div><div class='del'>-	u32 ctkill;</div><div class='del'>-	u32 wakeup;</div><div class='del'>-	u32 rx;</div><div class='del'>-	u32 rx_handlers[REPLY_MAX];</div><div class='del'>-	u32 tx;</div><div class='del'>-	u32 unhandled;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* management statistics */</div><div class='del'>-enum iwl_mgmt_stats {</div><div class='del'>-	MANAGEMENT_ASSOC_REQ = 0,</div><div class='del'>-	MANAGEMENT_ASSOC_RESP,</div><div class='del'>-	MANAGEMENT_REASSOC_REQ,</div><div class='del'>-	MANAGEMENT_REASSOC_RESP,</div><div class='del'>-	MANAGEMENT_PROBE_REQ,</div><div class='del'>-	MANAGEMENT_PROBE_RESP,</div><div class='del'>-	MANAGEMENT_BEACON,</div><div class='del'>-	MANAGEMENT_ATIM,</div><div class='del'>-	MANAGEMENT_DISASSOC,</div><div class='del'>-	MANAGEMENT_AUTH,</div><div class='del'>-	MANAGEMENT_DEAUTH,</div><div class='del'>-	MANAGEMENT_ACTION,</div><div class='del'>-	MANAGEMENT_MAX,</div><div class='del'>-};</div><div class='del'>-/* control statistics */</div><div class='del'>-enum iwl_ctrl_stats {</div><div class='del'>-	CONTROL_BACK_REQ =  0,</div><div class='del'>-	CONTROL_BACK,</div><div class='del'>-	CONTROL_PSPOLL,</div><div class='del'>-	CONTROL_RTS,</div><div class='del'>-	CONTROL_CTS,</div><div class='del'>-	CONTROL_ACK,</div><div class='del'>-	CONTROL_CFEND,</div><div class='del'>-	CONTROL_CFENDACK,</div><div class='del'>-	CONTROL_MAX,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct traffic_stats {</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS</div><div class='del'>-	u32 mgmt[MANAGEMENT_MAX];</div><div class='del'>-	u32 ctrl[CONTROL_MAX];</div><div class='del'>-	u32 data_cnt;</div><div class='del'>-	u64 data_bytes;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * host interrupt timeout value</div><div class='del'>- * used with setting interrupt coalescing timer</div><div class='del'>- * the CSR_INT_COALESCING is an 8 bit register in 32-usec unit</div><div class='del'>- *</div><div class='del'>- * default interrupt coalescing timer is 64 x 32 = 2048 usecs</div><div class='del'>- * default interrupt coalescing calibration timer is 16 x 32 = 512 usecs</div><div class='del'>- */</div><div class='del'>-#define IWL_HOST_INT_TIMEOUT_MAX	(0xFF)</div><div class='del'>-#define IWL_HOST_INT_TIMEOUT_DEF	(0x40)</div><div class='del'>-#define IWL_HOST_INT_TIMEOUT_MIN	(0x0)</div><div class='del'>-#define IWL_HOST_INT_CALIB_TIMEOUT_MAX	(0xFF)</div><div class='del'>-#define IWL_HOST_INT_CALIB_TIMEOUT_DEF	(0x10)</div><div class='del'>-#define IWL_HOST_INT_CALIB_TIMEOUT_MIN	(0x0)</div><div class='del'>-</div><div class='del'>-#define IWL_DELAY_NEXT_FORCE_FW_RELOAD (HZ*5)</div><div class='del'>-</div><div class='del'>-/* TX queue watchdog timeouts in mSecs */</div><div class='del'>-#define IWL_DEF_WD_TIMEOUT	(2000)</div><div class='del'>-#define IWL_LONG_WD_TIMEOUT	(10000)</div><div class='del'>-#define IWL_MAX_WD_TIMEOUT	(120000)</div><div class='del'>-</div><div class='del'>-struct iwl_force_reset {</div><div class='del'>-	int reset_request_count;</div><div class='del'>-	int reset_success_count;</div><div class='del'>-	int reset_reject_count;</div><div class='del'>-	unsigned long reset_duration;</div><div class='del'>-	unsigned long last_force_reset_jiffies;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* extend beacon time format bit shifting  */</div><div class='del'>-/*</div><div class='del'>- * for _3945 devices</div><div class='del'>- * bits 31:24 - extended</div><div class='del'>- * bits 23:0  - interval</div><div class='del'>- */</div><div class='del'>-#define IWL3945_EXT_BEACON_TIME_POS	24</div><div class='del'>-/*</div><div class='del'>- * for _4965 devices</div><div class='del'>- * bits 31:22 - extended</div><div class='del'>- * bits 21:0  - interval</div><div class='del'>- */</div><div class='del'>-#define IWL4965_EXT_BEACON_TIME_POS	22</div><div class='del'>-</div><div class='del'>-enum iwl_rxon_context_id {</div><div class='del'>-	IWL_RXON_CTX_BSS,</div><div class='del'>-</div><div class='del'>-	NUM_IWL_RXON_CTX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl_rxon_context {</div><div class='del'>-	struct ieee80211_vif *vif;</div><div class='del'>-</div><div class='del'>-	const u8 *ac_to_fifo;</div><div class='del'>-	const u8 *ac_to_queue;</div><div class='del'>-	u8 mcast_queue;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We could use the vif to indicate active, but we</div><div class='del'>-	 * also need it to be active during disabling when</div><div class='del'>-	 * we already removed the vif for type setting.</div><div class='del'>-	 */</div><div class='del'>-	bool always_active, is_active;</div><div class='del'>-</div><div class='del'>-	bool ht_need_multiple_chains;</div><div class='del'>-</div><div class='del'>-	enum iwl_rxon_context_id ctxid;</div><div class='del'>-</div><div class='del'>-	u32 interface_modes, exclusive_interface_modes;</div><div class='del'>-	u8 unused_devtype, ap_devtype, ibss_devtype, station_devtype;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We declare this const so it can only be</div><div class='del'>-	 * changed via explicit cast within the</div><div class='del'>-	 * routines that actually update the physical</div><div class='del'>-	 * hardware.</div><div class='del'>-	 */</div><div class='del'>-	const struct iwl_legacy_rxon_cmd active;</div><div class='del'>-	struct iwl_legacy_rxon_cmd staging;</div><div class='del'>-</div><div class='del'>-	struct iwl_rxon_time_cmd timing;</div><div class='del'>-</div><div class='del'>-	struct iwl_qos_info qos_data;</div><div class='del'>-</div><div class='del'>-	u8 bcast_sta_id, ap_sta_id;</div><div class='del'>-</div><div class='del'>-	u8 rxon_cmd, rxon_assoc_cmd, rxon_timing_cmd;</div><div class='del'>-	u8 qos_cmd;</div><div class='del'>-	u8 wep_key_cmd;</div><div class='del'>-</div><div class='del'>-	struct iwl_wep_key wep_keys[WEP_KEYS_MAX];</div><div class='del'>-	u8 key_mapping_keys;</div><div class='del'>-</div><div class='del'>-	__le32 station_flags;</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		bool non_gf_sta_present;</div><div class='del'>-		u8 protection;</div><div class='del'>-		bool enabled, is_40mhz;</div><div class='del'>-		u8 extension_chan_offset;</div><div class='del'>-	} ht;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl_priv {</div><div class='del'>-</div><div class='del'>-	/* ieee device used by generic ieee processing code */</div><div class='del'>-	struct ieee80211_hw *hw;</div><div class='del'>-	struct ieee80211_channel *ieee_channels;</div><div class='del'>-	struct ieee80211_rate *ieee_rates;</div><div class='del'>-	struct iwl_cfg *cfg;</div><div class='del'>-</div><div class='del'>-	/* temporary frame storage list */</div><div class='del'>-	struct list_head free_frames;</div><div class='del'>-	int frames_count;</div><div class='del'>-</div><div class='del'>-	enum ieee80211_band band;</div><div class='del'>-	int alloc_rxb_page;</div><div class='del'>-</div><div class='del'>-	void (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,</div><div class='del'>-				       struct iwl_rx_mem_buffer *rxb);</div><div class='del'>-</div><div class='del'>-	struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];</div><div class='del'>-</div><div class='del'>-	/* spectrum measurement report caching */</div><div class='del'>-	struct iwl_spectrum_notification measure_report;</div><div class='del'>-	u8 measurement_status;</div><div class='del'>-</div><div class='del'>-	/* ucode beacon time */</div><div class='del'>-	u32 ucode_beacon_time;</div><div class='del'>-	int missed_beacon_threshold;</div><div class='del'>-</div><div class='del'>-	/* track IBSS manager (last beacon) status */</div><div class='del'>-	u32 ibss_manager;</div><div class='del'>-</div><div class='del'>-	/* force reset */</div><div class='del'>-	struct iwl_force_reset force_reset;</div><div class='del'>-</div><div class='del'>-	/* we allocate array of iwl_channel_info for NIC's valid channels.</div><div class='del'>-	 *    Access via channel # using indirect index array */</div><div class='del'>-	struct iwl_channel_info *channel_info;	/* channel info array */</div><div class='del'>-	u8 channel_count;	/* # of channels */</div><div class='del'>-</div><div class='del'>-	/* thermal calibration */</div><div class='del'>-	s32 temperature;	/* degrees Kelvin */</div><div class='del'>-	s32 last_temperature;</div><div class='del'>-</div><div class='del'>-	/* init calibration results */</div><div class='del'>-	struct iwl_calib_result calib_results[IWL_CALIB_MAX];</div><div class='del'>-</div><div class='del'>-	/* Scan related variables */</div><div class='del'>-	unsigned long scan_start;</div><div class='del'>-	unsigned long scan_start_tsf;</div><div class='del'>-	void *scan_cmd;</div><div class='del'>-	enum ieee80211_band scan_band;</div><div class='del'>-	struct cfg80211_scan_request *scan_request;</div><div class='del'>-	struct ieee80211_vif *scan_vif;</div><div class='del'>-	u8 scan_tx_ant[IEEE80211_NUM_BANDS];</div><div class='del'>-	u8 mgmt_tx_ant;</div><div class='del'>-</div><div class='del'>-	/* spinlock */</div><div class='del'>-	spinlock_t lock;	/* protect general shared data */</div><div class='del'>-	spinlock_t hcmd_lock;	/* protect hcmd */</div><div class='del'>-	spinlock_t reg_lock;	/* protect hw register access */</div><div class='del'>-	struct mutex mutex;</div><div class='del'>-</div><div class='del'>-	/* basic pci-network driver stuff */</div><div class='del'>-	struct pci_dev *pci_dev;</div><div class='del'>-</div><div class='del'>-	/* pci hardware address support */</div><div class='del'>-	void __iomem *hw_base;</div><div class='del'>-	u32  hw_rev;</div><div class='del'>-	u32  hw_wa_rev;</div><div class='del'>-	u8   rev_id;</div><div class='del'>-</div><div class='del'>-	/* microcode/device supports multiple contexts */</div><div class='del'>-	u8 valid_contexts;</div><div class='del'>-</div><div class='del'>-	/* command queue number */</div><div class='del'>-	u8 cmd_queue;</div><div class='del'>-</div><div class='del'>-	/* max number of station keys */</div><div class='del'>-	u8 sta_key_max_num;</div><div class='del'>-</div><div class='del'>-	/* EEPROM MAC addresses */</div><div class='del'>-	struct mac_address addresses[1];</div><div class='del'>-</div><div class='del'>-	/* uCode images, save to reload in case of failure */</div><div class='del'>-	int fw_index;			/* firmware we're trying to load */</div><div class='del'>-	u32 ucode_ver;			/* version of ucode, copy of</div><div class='del'>-					   iwl_ucode.ver */</div><div class='del'>-	struct fw_desc ucode_code;	/* runtime inst */</div><div class='del'>-	struct fw_desc ucode_data;	/* runtime data original */</div><div class='del'>-	struct fw_desc ucode_data_backup;	/* runtime data save/restore */</div><div class='del'>-	struct fw_desc ucode_init;	/* initialization inst */</div><div class='del'>-	struct fw_desc ucode_init_data;	/* initialization data */</div><div class='del'>-	struct fw_desc ucode_boot;	/* bootstrap inst */</div><div class='del'>-	enum ucode_type ucode_type;</div><div class='del'>-	u8 ucode_write_complete;	/* the image write is complete */</div><div class='del'>-	char firmware_name[25];</div><div class='del'>-</div><div class='del'>-	struct iwl_rxon_context contexts[NUM_IWL_RXON_CTX];</div><div class='del'>-</div><div class='del'>-	__le16 switch_channel;</div><div class='del'>-</div><div class='del'>-	/* 1st responses from initialize and runtime uCode images.</div><div class='del'>-	 * _4965's initialize alive response contains some calibration data. */</div><div class='del'>-	struct iwl_init_alive_resp card_alive_init;</div><div class='del'>-	struct iwl_alive_resp card_alive;</div><div class='del'>-</div><div class='del'>-	u16 active_rate;</div><div class='del'>-</div><div class='del'>-	u8 start_calib;</div><div class='del'>-	struct iwl_sensitivity_data sensitivity_data;</div><div class='del'>-	struct iwl_chain_noise_data chain_noise_data;</div><div class='del'>-	__le16 sensitivity_tbl[HD_TABLE_SIZE];</div><div class='del'>-</div><div class='del'>-	struct iwl_ht_config current_ht_config;</div><div class='del'>-</div><div class='del'>-	/* Rate scaling data */</div><div class='del'>-	u8 retry_rate;</div><div class='del'>-</div><div class='del'>-	wait_queue_head_t wait_command_queue;</div><div class='del'>-</div><div class='del'>-	int activity_timer_active;</div><div class='del'>-</div><div class='del'>-	/* Rx and Tx DMA processing queues */</div><div class='del'>-	struct iwl_rx_queue rxq;</div><div class='del'>-	struct iwl_tx_queue *txq;</div><div class='del'>-	unsigned long txq_ctx_active_msk;</div><div class='del'>-	struct iwl_dma_ptr  kw;	/* keep warm address */</div><div class='del'>-	struct iwl_dma_ptr  scd_bc_tbls;</div><div class='del'>-</div><div class='del'>-	u32 scd_base_addr;	/* scheduler sram base address */</div><div class='del'>-</div><div class='del'>-	unsigned long status;</div><div class='del'>-</div><div class='del'>-	/* counts mgmt, ctl, and data packets */</div><div class='del'>-	struct traffic_stats tx_stats;</div><div class='del'>-	struct traffic_stats rx_stats;</div><div class='del'>-</div><div class='del'>-	/* counts interrupts */</div><div class='del'>-	struct isr_statistics isr_stats;</div><div class='del'>-</div><div class='del'>-	struct iwl_power_mgr power_data;</div><div class='del'>-</div><div class='del'>-	/* context information */</div><div class='del'>-	u8 bssid[ETH_ALEN]; /* used only on 3945 but filled by core */</div><div class='del'>-</div><div class='del'>-	/* station table variables */</div><div class='del'>-</div><div class='del'>-	/* Note: if lock and sta_lock are needed, lock must be acquired first */</div><div class='del'>-	spinlock_t sta_lock;</div><div class='del'>-	int num_stations;</div><div class='del'>-	struct iwl_station_entry stations[IWL_STATION_COUNT];</div><div class='del'>-	unsigned long ucode_key_table;</div><div class='del'>-</div><div class='del'>-	/* queue refcounts */</div><div class='del'>-#define IWL_MAX_HW_QUEUES	32</div><div class='del'>-	unsigned long queue_stopped[BITS_TO_LONGS(IWL_MAX_HW_QUEUES)];</div><div class='del'>-	/* for each AC */</div><div class='del'>-	atomic_t queue_stop_count[4];</div><div class='del'>-</div><div class='del'>-	/* Indication if ieee80211_ops-&gt;open has been called */</div><div class='del'>-	u8 is_open;</div><div class='del'>-</div><div class='del'>-	u8 mac80211_registered;</div><div class='del'>-</div><div class='del'>-	/* eeprom -- this is in the card's little endian byte order */</div><div class='del'>-	u8 *eeprom;</div><div class='del'>-	struct iwl_eeprom_calib_info *calib_info;</div><div class='del'>-</div><div class='del'>-	enum nl80211_iftype iw_mode;</div><div class='del'>-</div><div class='del'>-	/* Last Rx'd beacon timestamp */</div><div class='del'>-	u64 timestamp;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-#if defined(CONFIG_IWL3945) || defined(CONFIG_IWL3945_MODULE)</div><div class='del'>-		struct {</div><div class='del'>-			void *shared_virt;</div><div class='del'>-			dma_addr_t shared_phys;</div><div class='del'>-</div><div class='del'>-			struct delayed_work thermal_periodic;</div><div class='del'>-			struct delayed_work rfkill_poll;</div><div class='del'>-</div><div class='del'>-			struct iwl3945_notif_statistics statistics;</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS</div><div class='del'>-			struct iwl3945_notif_statistics accum_statistics;</div><div class='del'>-			struct iwl3945_notif_statistics delta_statistics;</div><div class='del'>-			struct iwl3945_notif_statistics max_delta;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-			u32 sta_supp_rates;</div><div class='del'>-			int last_rx_rssi;	/* From Rx packet statistics */</div><div class='del'>-</div><div class='del'>-			/* Rx'd packet timing information */</div><div class='del'>-			u32 last_beacon_time;</div><div class='del'>-			u64 last_tsf;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * each calibration channel group in the</div><div class='del'>-			 * EEPROM has a derived clip setting for</div><div class='del'>-			 * each rate.</div><div class='del'>-			 */</div><div class='del'>-			const struct iwl3945_clip_group clip_groups[5];</div><div class='del'>-</div><div class='del'>-		} _3945;</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_IWL4965) || defined(CONFIG_IWL4965_MODULE)</div><div class='del'>-		struct {</div><div class='del'>-			struct iwl_rx_phy_res last_phy_res;</div><div class='del'>-			bool last_phy_res_valid;</div><div class='del'>-</div><div class='del'>-			struct completion firmware_loading_complete;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * chain noise reset and gain commands are the</div><div class='del'>-			 * two extra calibration commands follows the standard</div><div class='del'>-			 * phy calibration commands</div><div class='del'>-			 */</div><div class='del'>-			u8 phy_calib_chain_noise_reset_cmd;</div><div class='del'>-			u8 phy_calib_chain_noise_gain_cmd;</div><div class='del'>-</div><div class='del'>-			struct iwl_notif_statistics statistics;</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS</div><div class='del'>-			struct iwl_notif_statistics accum_statistics;</div><div class='del'>-			struct iwl_notif_statistics delta_statistics;</div><div class='del'>-			struct iwl_notif_statistics max_delta;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		} _4965;</div><div class='del'>-#endif</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	struct iwl_hw_params hw_params;</div><div class='del'>-</div><div class='del'>-	u32 inta_mask;</div><div class='del'>-</div><div class='del'>-	struct workqueue_struct *workqueue;</div><div class='del'>-</div><div class='del'>-	struct work_struct restart;</div><div class='del'>-	struct work_struct scan_completed;</div><div class='del'>-	struct work_struct rx_replenish;</div><div class='del'>-	struct work_struct abort_scan;</div><div class='del'>-</div><div class='del'>-	struct iwl_rxon_context *beacon_ctx;</div><div class='del'>-	struct sk_buff *beacon_skb;</div><div class='del'>-</div><div class='del'>-	struct work_struct tx_flush;</div><div class='del'>-</div><div class='del'>-	struct tasklet_struct irq_tasklet;</div><div class='del'>-</div><div class='del'>-	struct delayed_work init_alive_start;</div><div class='del'>-	struct delayed_work alive_start;</div><div class='del'>-	struct delayed_work scan_check;</div><div class='del'>-</div><div class='del'>-	/* TX Power */</div><div class='del'>-	s8 tx_power_user_lmt;</div><div class='del'>-	s8 tx_power_device_lmt;</div><div class='del'>-	s8 tx_power_next;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	/* debugging info */</div><div class='del'>-	u32 debug_level; /* per device debugging will override global</div><div class='del'>-			    iwlegacy_debug_level if set */</div><div class='del'>-#endif /* CONFIG_IWLWIFI_LEGACY_DEBUG */</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS</div><div class='del'>-	/* debugfs */</div><div class='del'>-	u16 tx_traffic_idx;</div><div class='del'>-	u16 rx_traffic_idx;</div><div class='del'>-	u8 *tx_traffic;</div><div class='del'>-	u8 *rx_traffic;</div><div class='del'>-	struct dentry *debugfs_dir;</div><div class='del'>-	u32 dbgfs_sram_offset, dbgfs_sram_len;</div><div class='del'>-	bool disable_ht40;</div><div class='del'>-#endif /* CONFIG_IWLWIFI_LEGACY_DEBUGFS */</div><div class='del'>-</div><div class='del'>-	struct work_struct txpower_work;</div><div class='del'>-	u32 disable_sens_cal;</div><div class='del'>-	u32 disable_chain_noise_cal;</div><div class='del'>-	u32 disable_tx_power_cal;</div><div class='del'>-	struct work_struct run_time_calib_work;</div><div class='del'>-	struct timer_list statistics_periodic;</div><div class='del'>-	struct timer_list watchdog;</div><div class='del'>-	bool hw_ready;</div><div class='del'>-</div><div class='del'>-	struct led_classdev led;</div><div class='del'>-	unsigned long blink_on, blink_off;</div><div class='del'>-	bool led_registered;</div><div class='del'>-}; /*iwl_priv */</div><div class='del'>-</div><div class='del'>-static inline void iwl_txq_ctx_activate(struct iwl_priv *priv, int txq_id)</div><div class='del'>-{</div><div class='del'>-	set_bit(txq_id, &amp;priv-&gt;txq_ctx_active_msk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void iwl_txq_ctx_deactivate(struct iwl_priv *priv, int txq_id)</div><div class='del'>-{</div><div class='del'>-	clear_bit(txq_id, &amp;priv-&gt;txq_ctx_active_msk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-/*</div><div class='del'>- * iwl_legacy_get_debug_level: Return active debug level for device</div><div class='del'>- *</div><div class='del'>- * Using sysfs it is possible to set per device debug level. This debug</div><div class='del'>- * level will be used if set, otherwise the global debug level which can be</div><div class='del'>- * set via module parameter is used.</div><div class='del'>- */</div><div class='del'>-static inline u32 iwl_legacy_get_debug_level(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	if (priv-&gt;debug_level)</div><div class='del'>-		return priv-&gt;debug_level;</div><div class='del'>-	else</div><div class='del'>-		return iwlegacy_debug_level;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline u32 iwl_legacy_get_debug_level(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	return iwlegacy_debug_level;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline struct ieee80211_hdr *</div><div class='del'>-iwl_legacy_tx_queue_get_hdr(struct iwl_priv *priv,</div><div class='del'>-						 int txq_id, int idx)</div><div class='del'>-{</div><div class='del'>-	if (priv-&gt;txq[txq_id].txb[idx].skb)</div><div class='del'>-		return (struct ieee80211_hdr *)priv-&gt;txq[txq_id].</div><div class='del'>-				txb[idx].skb-&gt;data;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct iwl_rxon_context *</div><div class='del'>-iwl_legacy_rxon_ctx_from_vif(struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='del'>-</div><div class='del'>-	return vif_priv-&gt;ctx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define for_each_context(priv, ctx)				\</div><div class='del'>-	for (ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];		\</div><div class='del'>-	     ctx &lt; &amp;priv-&gt;contexts[NUM_IWL_RXON_CTX]; ctx++)	\</div><div class='del'>-		if (priv-&gt;valid_contexts &amp; BIT(ctx-&gt;ctxid))</div><div class='del'>-</div><div class='del'>-static inline int iwl_legacy_is_associated(struct iwl_priv *priv,</div><div class='del'>-				    enum iwl_rxon_context_id ctxid)</div><div class='del'>-{</div><div class='del'>-	return (priv-&gt;contexts[ctxid].active.filter_flags &amp;</div><div class='del'>-			RXON_FILTER_ASSOC_MSK) ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int iwl_legacy_is_any_associated(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	return iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int iwl_legacy_is_associated_ctx(struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	return (ctx-&gt;active.filter_flags &amp; RXON_FILTER_ASSOC_MSK) ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int iwl_legacy_is_channel_valid(const struct iwl_channel_info *ch_info)</div><div class='del'>-{</div><div class='del'>-	if (ch_info == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	return (ch_info-&gt;flags &amp; EEPROM_CHANNEL_VALID) ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int iwl_legacy_is_channel_radar(const struct iwl_channel_info *ch_info)</div><div class='del'>-{</div><div class='del'>-	return (ch_info-&gt;flags &amp; EEPROM_CHANNEL_RADAR) ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 iwl_legacy_is_channel_a_band(const struct iwl_channel_info *ch_info)</div><div class='del'>-{</div><div class='del'>-	return ch_info-&gt;band == IEEE80211_BAND_5GHZ;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-iwl_legacy_is_channel_passive(const struct iwl_channel_info *ch)</div><div class='del'>-{</div><div class='del'>-	return (!(ch-&gt;flags &amp; EEPROM_CHANNEL_ACTIVE)) ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-iwl_legacy_is_channel_ibss(const struct iwl_channel_info *ch)</div><div class='del'>-{</div><div class='del'>-	return (ch-&gt;flags &amp; EEPROM_CHANNEL_IBSS) ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-__iwl_legacy_free_pages(struct iwl_priv *priv, struct page *page)</div><div class='del'>-{</div><div class='del'>-	__free_pages(page, priv-&gt;hw_params.rx_page_order);</div><div class='del'>-	priv-&gt;alloc_rxb_page--;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void iwl_legacy_free_pages(struct iwl_priv *priv, unsigned long page)</div><div class='del'>-{</div><div class='del'>-	free_pages(page, priv-&gt;hw_params.rx_page_order);</div><div class='del'>-	priv-&gt;alloc_rxb_page--;</div><div class='del'>-}</div><div class='del'>-#endif				/* __iwl_legacy_dev_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-devtrace.c b/drivers/net/wireless/iwlegacy/iwl-devtrace.c<br/>deleted file mode 100644<br/>index acec99197ce0..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-devtrace.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-devtrace.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2009 - 2011 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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='del'>-/* sparse doesn't like tracepoint macros */</div><div class='del'>-#ifndef __CHECKER__</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-</div><div class='del'>-#define CREATE_TRACE_POINTS</div><div class='del'>-#include "iwl-devtrace.h"</div><div class='del'>-</div><div class='del'>-EXPORT_TRACEPOINT_SYMBOL(iwlwifi_legacy_dev_iowrite8);</div><div class='del'>-EXPORT_TRACEPOINT_SYMBOL(iwlwifi_legacy_dev_ioread32);</div><div class='del'>-EXPORT_TRACEPOINT_SYMBOL(iwlwifi_legacy_dev_iowrite32);</div><div class='del'>-EXPORT_TRACEPOINT_SYMBOL(iwlwifi_legacy_dev_rx);</div><div class='del'>-EXPORT_TRACEPOINT_SYMBOL(iwlwifi_legacy_dev_tx);</div><div class='del'>-EXPORT_TRACEPOINT_SYMBOL(iwlwifi_legacy_dev_ucode_error);</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-devtrace.h b/drivers/net/wireless/iwlegacy/iwl-devtrace.h<br/>deleted file mode 100644<br/>index a443725ba6be..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-devtrace.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-devtrace.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,210 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2009 - 2011 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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#if !defined(__IWLWIFI_LEGACY_DEVICE_TRACE) || defined(TRACE_HEADER_MULTI_READ)</div><div class='del'>-#define __IWLWIFI_LEGACY_DEVICE_TRACE</div><div class='del'>-</div><div class='del'>-#include &lt;linux/tracepoint.h&gt;</div><div class='del'>-</div><div class='del'>-#if !defined(CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING) || defined(__CHECKER__)</div><div class='del'>-#undef TRACE_EVENT</div><div class='del'>-#define TRACE_EVENT(name, proto, ...) \</div><div class='del'>-static inline void trace_ ## name(proto) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define PRIV_ENTRY	__field(struct iwl_priv *, priv)</div><div class='del'>-#define PRIV_ASSIGN	(__entry-&gt;priv = priv)</div><div class='del'>-</div><div class='del'>-#undef TRACE_SYSTEM</div><div class='del'>-#define TRACE_SYSTEM iwlwifi_legacy_io</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(iwlwifi_legacy_dev_ioread32,</div><div class='del'>-	TP_PROTO(struct iwl_priv *priv, u32 offs, u32 val),</div><div class='del'>-	TP_ARGS(priv, offs, val),</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		PRIV_ENTRY</div><div class='del'>-		__field(u32, offs)</div><div class='del'>-		__field(u32, val)</div><div class='del'>-	),</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		PRIV_ASSIGN;</div><div class='del'>-		__entry-&gt;offs = offs;</div><div class='del'>-		__entry-&gt;val = val;</div><div class='del'>-	),</div><div class='del'>-	TP_printk("[%p] read io[%#x] = %#x", __entry-&gt;priv,</div><div class='del'>-					__entry-&gt;offs, __entry-&gt;val)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(iwlwifi_legacy_dev_iowrite8,</div><div class='del'>-	TP_PROTO(struct iwl_priv *priv, u32 offs, u8 val),</div><div class='del'>-	TP_ARGS(priv, offs, val),</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		PRIV_ENTRY</div><div class='del'>-		__field(u32, offs)</div><div class='del'>-		__field(u8, val)</div><div class='del'>-	),</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		PRIV_ASSIGN;</div><div class='del'>-		__entry-&gt;offs = offs;</div><div class='del'>-		__entry-&gt;val = val;</div><div class='del'>-	),</div><div class='del'>-	TP_printk("[%p] write io[%#x] = %#x)", __entry-&gt;priv,</div><div class='del'>-					__entry-&gt;offs, __entry-&gt;val)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(iwlwifi_legacy_dev_iowrite32,</div><div class='del'>-	TP_PROTO(struct iwl_priv *priv, u32 offs, u32 val),</div><div class='del'>-	TP_ARGS(priv, offs, val),</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		PRIV_ENTRY</div><div class='del'>-		__field(u32, offs)</div><div class='del'>-		__field(u32, val)</div><div class='del'>-	),</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		PRIV_ASSIGN;</div><div class='del'>-		__entry-&gt;offs = offs;</div><div class='del'>-		__entry-&gt;val = val;</div><div class='del'>-	),</div><div class='del'>-	TP_printk("[%p] write io[%#x] = %#x)", __entry-&gt;priv,</div><div class='del'>-					__entry-&gt;offs, __entry-&gt;val)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-#undef TRACE_SYSTEM</div><div class='del'>-#define TRACE_SYSTEM iwlwifi_legacy_ucode</div><div class='del'>-</div><div class='del'>-#undef TRACE_SYSTEM</div><div class='del'>-#define TRACE_SYSTEM iwlwifi</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(iwlwifi_legacy_dev_hcmd,</div><div class='del'>-	TP_PROTO(struct iwl_priv *priv, void *hcmd, size_t len, u32 flags),</div><div class='del'>-	TP_ARGS(priv, hcmd, len, flags),</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		PRIV_ENTRY</div><div class='del'>-		__dynamic_array(u8, hcmd, len)</div><div class='del'>-		__field(u32, flags)</div><div class='del'>-	),</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		PRIV_ASSIGN;</div><div class='del'>-		memcpy(__get_dynamic_array(hcmd), hcmd, len);</div><div class='del'>-		__entry-&gt;flags = flags;</div><div class='del'>-	),</div><div class='del'>-	TP_printk("[%p] hcmd %#.2x (%ssync)",</div><div class='del'>-		  __entry-&gt;priv, ((u8 *)__get_dynamic_array(hcmd))[0],</div><div class='del'>-		  __entry-&gt;flags &amp; CMD_ASYNC ? "a" : "")</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(iwlwifi_legacy_dev_rx,</div><div class='del'>-	TP_PROTO(struct iwl_priv *priv, void *rxbuf, size_t len),</div><div class='del'>-	TP_ARGS(priv, rxbuf, len),</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		PRIV_ENTRY</div><div class='del'>-		__dynamic_array(u8, rxbuf, len)</div><div class='del'>-	),</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		PRIV_ASSIGN;</div><div class='del'>-		memcpy(__get_dynamic_array(rxbuf), rxbuf, len);</div><div class='del'>-	),</div><div class='del'>-	TP_printk("[%p] RX cmd %#.2x",</div><div class='del'>-		  __entry-&gt;priv, ((u8 *)__get_dynamic_array(rxbuf))[4])</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(iwlwifi_legacy_dev_tx,</div><div class='del'>-	TP_PROTO(struct iwl_priv *priv, void *tfd, size_t tfdlen,</div><div class='del'>-		 void *buf0, size_t buf0_len,</div><div class='del'>-		 void *buf1, size_t buf1_len),</div><div class='del'>-	TP_ARGS(priv, tfd, tfdlen, buf0, buf0_len, buf1, buf1_len),</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		PRIV_ENTRY</div><div class='del'>-</div><div class='del'>-		__field(size_t, framelen)</div><div class='del'>-		__dynamic_array(u8, tfd, tfdlen)</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Do not insert between or below these items,</div><div class='del'>-		 * we want to keep the frame together (except</div><div class='del'>-		 * for the possible padding).</div><div class='del'>-		 */</div><div class='del'>-		__dynamic_array(u8, buf0, buf0_len)</div><div class='del'>-		__dynamic_array(u8, buf1, buf1_len)</div><div class='del'>-	),</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		PRIV_ASSIGN;</div><div class='del'>-		__entry-&gt;framelen = buf0_len + buf1_len;</div><div class='del'>-		memcpy(__get_dynamic_array(tfd), tfd, tfdlen);</div><div class='del'>-		memcpy(__get_dynamic_array(buf0), buf0, buf0_len);</div><div class='del'>-		memcpy(__get_dynamic_array(buf1), buf1, buf1_len);</div><div class='del'>-	),</div><div class='del'>-	TP_printk("[%p] TX %.2x (%zu bytes)",</div><div class='del'>-		  __entry-&gt;priv,</div><div class='del'>-		  ((u8 *)__get_dynamic_array(buf0))[0],</div><div class='del'>-		  __entry-&gt;framelen)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-TRACE_EVENT(iwlwifi_legacy_dev_ucode_error,</div><div class='del'>-	TP_PROTO(struct iwl_priv *priv, u32 desc, u32 time,</div><div class='del'>-		 u32 data1, u32 data2, u32 line, u32 blink1,</div><div class='del'>-		 u32 blink2, u32 ilink1, u32 ilink2),</div><div class='del'>-	TP_ARGS(priv, desc, time, data1, data2, line,</div><div class='del'>-		blink1, blink2, ilink1, ilink2),</div><div class='del'>-	TP_STRUCT__entry(</div><div class='del'>-		PRIV_ENTRY</div><div class='del'>-		__field(u32, desc)</div><div class='del'>-		__field(u32, time)</div><div class='del'>-		__field(u32, data1)</div><div class='del'>-		__field(u32, data2)</div><div class='del'>-		__field(u32, line)</div><div class='del'>-		__field(u32, blink1)</div><div class='del'>-		__field(u32, blink2)</div><div class='del'>-		__field(u32, ilink1)</div><div class='del'>-		__field(u32, ilink2)</div><div class='del'>-	),</div><div class='del'>-	TP_fast_assign(</div><div class='del'>-		PRIV_ASSIGN;</div><div class='del'>-		__entry-&gt;desc = desc;</div><div class='del'>-		__entry-&gt;time = time;</div><div class='del'>-		__entry-&gt;data1 = data1;</div><div class='del'>-		__entry-&gt;data2 = data2;</div><div class='del'>-		__entry-&gt;line = line;</div><div class='del'>-		__entry-&gt;blink1 = blink1;</div><div class='del'>-		__entry-&gt;blink2 = blink2;</div><div class='del'>-		__entry-&gt;ilink1 = ilink1;</div><div class='del'>-		__entry-&gt;ilink2 = ilink2;</div><div class='del'>-	),</div><div class='del'>-	TP_printk("[%p] #%02d %010u data 0x%08X 0x%08X line %u, "</div><div class='del'>-		  "blink 0x%05X 0x%05X ilink 0x%05X 0x%05X",</div><div class='del'>-		  __entry-&gt;priv, __entry-&gt;desc, __entry-&gt;time, __entry-&gt;data1,</div><div class='del'>-		  __entry-&gt;data2, __entry-&gt;line, __entry-&gt;blink1,</div><div class='del'>-		  __entry-&gt;blink2, __entry-&gt;ilink1, __entry-&gt;ilink2)</div><div class='del'>-);</div><div class='del'>-</div><div class='del'>-#endif /* __IWLWIFI_DEVICE_TRACE */</div><div class='del'>-</div><div class='del'>-#undef TRACE_INCLUDE_PATH</div><div class='del'>-#define TRACE_INCLUDE_PATH .</div><div class='del'>-#undef TRACE_INCLUDE_FILE</div><div class='del'>-#define TRACE_INCLUDE_FILE iwl-devtrace</div><div class='del'>-#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-eeprom.c b/drivers/net/wireless/iwlegacy/iwl-eeprom.c<br/>deleted file mode 100644<br/>index 5bf3f49b74ab..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-eeprom.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-eeprom.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,553 +0,0 @@</div><div class='del'>-/******************************************************************************</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) 2008 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- * BSD LICENSE</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2005 - 2011 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='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/slab.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-commands.h"</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-debug.h"</div><div class='del'>-#include "iwl-eeprom.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-</div><div class='del'>-/************************** EEPROM BANDS ****************************</div><div class='del'>- *</div><div class='del'>- * The iwlegacy_eeprom_band definitions below provide the mapping from the</div><div class='del'>- * EEPROM contents to the specific channel number supported for each</div><div class='del'>- * band.</div><div class='del'>- *</div><div class='del'>- * For example, iwl_priv-&gt;eeprom.band_3_channels[4] from the band_3</div><div class='del'>- * definition below maps to physical channel 42 in the 5.2GHz spectrum.</div><div class='del'>- * The specific geography and calibration information for that channel</div><div class='del'>- * is contained in the eeprom map itself.</div><div class='del'>- *</div><div class='del'>- * During init, we copy the eeprom information and channel map</div><div class='del'>- * information into priv-&gt;channel_info_24/52 and priv-&gt;channel_map_24/52</div><div class='del'>- *</div><div class='del'>- * channel_map_24/52 provides the index in the channel_info array for a</div><div class='del'>- * given channel.  We have to have two separate maps as there is channel</div><div class='del'>- * overlap with the 2.4GHz and 5.2GHz spectrum as seen in band_1 and</div><div class='del'>- * band_2</div><div class='del'>- *</div><div class='del'>- * A value of 0xff stored in the channel_map indicates that the channel</div><div class='del'>- * is not supported by the hardware at all.</div><div class='del'>- *</div><div class='del'>- * A value of 0xfe in the channel_map indicates that the channel is not</div><div class='del'>- * valid for Tx with the current hardware.  This means that</div><div class='del'>- * while the system can tune and receive on a given channel, it may not</div><div class='del'>- * be able to associate or transmit any frames on that</div><div class='del'>- * channel.  There is no corresponding channel information for that</div><div class='del'>- * entry.</div><div class='del'>- *</div><div class='del'>- *********************************************************************/</div><div class='del'>-</div><div class='del'>-/* 2.4 GHz */</div><div class='del'>-const u8 iwlegacy_eeprom_band_1[14] = {</div><div class='del'>-	1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* 5.2 GHz bands */</div><div class='del'>-static const u8 iwlegacy_eeprom_band_2[] = {	/* 4915-5080MHz */</div><div class='del'>-	183, 184, 185, 187, 188, 189, 192, 196, 7, 8, 11, 12, 16</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u8 iwlegacy_eeprom_band_3[] = {	/* 5170-5320MHz */</div><div class='del'>-	34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u8 iwlegacy_eeprom_band_4[] = {	/* 5500-5700MHz */</div><div class='del'>-	100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u8 iwlegacy_eeprom_band_5[] = {	/* 5725-5825MHz */</div><div class='del'>-	145, 149, 153, 157, 161, 165</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u8 iwlegacy_eeprom_band_6[] = {       /* 2.4 ht40 channel */</div><div class='del'>-	1, 2, 3, 4, 5, 6, 7</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u8 iwlegacy_eeprom_band_7[] = {       /* 5.2 ht40 channel */</div><div class='del'>-	36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * EEPROM related functions</div><div class='del'>- *</div><div class='del'>-******************************************************************************/</div><div class='del'>-</div><div class='del'>-static int iwl_legacy_eeprom_verify_signature(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	u32 gp = iwl_read32(priv, CSR_EEPROM_GP) &amp; CSR_EEPROM_GP_VALID_MSK;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_EEPROM(priv, "EEPROM signature=0x%08x\n", gp);</div><div class='del'>-	switch (gp) {</div><div class='del'>-	case CSR_EEPROM_GP_GOOD_SIG_EEP_LESS_THAN_4K:</div><div class='del'>-	case CSR_EEPROM_GP_GOOD_SIG_EEP_MORE_THAN_4K:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		IWL_ERR(priv, "bad EEPROM signature,"</div><div class='del'>-			"EEPROM_GP=0x%08x\n", gp);</div><div class='del'>-		ret = -ENOENT;</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'>-const u8</div><div class='del'>-*iwl_legacy_eeprom_query_addr(const struct iwl_priv *priv, size_t offset)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(offset &gt;= priv-&gt;cfg-&gt;base_params-&gt;eeprom_size);</div><div class='del'>-	return &amp;priv-&gt;eeprom[offset];</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_eeprom_query_addr);</div><div class='del'>-</div><div class='del'>-u16 iwl_legacy_eeprom_query16(const struct iwl_priv *priv, size_t offset)</div><div class='del'>-{</div><div class='del'>-	if (!priv-&gt;eeprom)</div><div class='del'>-		return 0;</div><div class='del'>-	return (u16)priv-&gt;eeprom[offset] | ((u16)priv-&gt;eeprom[offset + 1] &lt;&lt; 8);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_eeprom_query16);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_eeprom_init - read EEPROM contents</div><div class='del'>- *</div><div class='del'>- * Load the EEPROM contents from adapter into priv-&gt;eeprom</div><div class='del'>- *</div><div class='del'>- * NOTE:  This routine uses the non-debug IO access functions.</div><div class='del'>- */</div><div class='del'>-int iwl_legacy_eeprom_init(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	__le16 *e;</div><div class='del'>-	u32 gp = iwl_read32(priv, CSR_EEPROM_GP);</div><div class='del'>-	int sz;</div><div class='del'>-	int ret;</div><div class='del'>-	u16 addr;</div><div class='del'>-</div><div class='del'>-	/* allocate eeprom */</div><div class='del'>-	sz = priv-&gt;cfg-&gt;base_params-&gt;eeprom_size;</div><div class='del'>-	IWL_DEBUG_EEPROM(priv, "NVM size = %d\n", sz);</div><div class='del'>-	priv-&gt;eeprom = kzalloc(sz, GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;eeprom) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto alloc_err;</div><div class='del'>-	}</div><div class='del'>-	e = (__le16 *)priv-&gt;eeprom;</div><div class='del'>-</div><div class='del'>-	priv-&gt;cfg-&gt;ops-&gt;lib-&gt;apm_ops.init(priv);</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_eeprom_verify_signature(priv);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		IWL_ERR(priv, "EEPROM not found, EEPROM_GP=0x%08x\n", gp);</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Make sure driver (instead of uCode) is allowed to read EEPROM */</div><div class='del'>-	ret = priv-&gt;cfg-&gt;ops-&gt;lib-&gt;eeprom_ops.acquire_semaphore(priv);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		IWL_ERR(priv, "Failed to acquire EEPROM semaphore.\n");</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* eeprom is an array of 16bit values */</div><div class='del'>-	for (addr = 0; addr &lt; sz; addr += sizeof(u16)) {</div><div class='del'>-		u32 r;</div><div class='del'>-</div><div class='del'>-		_iwl_legacy_write32(priv, CSR_EEPROM_REG,</div><div class='del'>-			     CSR_EEPROM_REG_MSK_ADDR &amp; (addr &lt;&lt; 1));</div><div class='del'>-</div><div class='del'>-		ret = iwl_poll_bit(priv, CSR_EEPROM_REG,</div><div class='del'>-					  CSR_EEPROM_REG_READ_VALID_MSK,</div><div class='del'>-					  CSR_EEPROM_REG_READ_VALID_MSK,</div><div class='del'>-					  IWL_EEPROM_ACCESS_TIMEOUT);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			IWL_ERR(priv, "Time out reading EEPROM[%d]\n",</div><div class='del'>-							addr);</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-		r = _iwl_legacy_read_direct32(priv, CSR_EEPROM_REG);</div><div class='del'>-		e[addr / 2] = cpu_to_le16(r &gt;&gt; 16);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_EEPROM(priv, "NVM Type: %s, version: 0x%x\n",</div><div class='del'>-		       "EEPROM",</div><div class='del'>-		       iwl_legacy_eeprom_query16(priv, EEPROM_VERSION));</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-done:</div><div class='del'>-	priv-&gt;cfg-&gt;ops-&gt;lib-&gt;eeprom_ops.release_semaphore(priv);</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	if (ret)</div><div class='del'>-		iwl_legacy_eeprom_free(priv);</div><div class='del'>-	/* Reset chip to save power until we load uCode during "up". */</div><div class='del'>-	iwl_legacy_apm_stop(priv);</div><div class='del'>-alloc_err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_eeprom_init);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_eeprom_free(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	kfree(priv-&gt;eeprom);</div><div class='del'>-	priv-&gt;eeprom = NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_eeprom_free);</div><div class='del'>-</div><div class='del'>-static void iwl_legacy_init_band_reference(const struct iwl_priv *priv,</div><div class='del'>-			int eep_band, int *eeprom_ch_count,</div><div class='del'>-			const struct iwl_eeprom_channel **eeprom_ch_info,</div><div class='del'>-			const u8 **eeprom_ch_index)</div><div class='del'>-{</div><div class='del'>-	u32 offset = priv-&gt;cfg-&gt;ops-&gt;lib-&gt;</div><div class='del'>-			eeprom_ops.regulatory_bands[eep_band - 1];</div><div class='del'>-	switch (eep_band) {</div><div class='del'>-	case 1:		/* 2.4GHz band */</div><div class='del'>-		*eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_1);</div><div class='del'>-		*eeprom_ch_info = (struct iwl_eeprom_channel *)</div><div class='del'>-				iwl_legacy_eeprom_query_addr(priv, offset);</div><div class='del'>-		*eeprom_ch_index = iwlegacy_eeprom_band_1;</div><div class='del'>-		break;</div><div class='del'>-	case 2:		/* 4.9GHz band */</div><div class='del'>-		*eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_2);</div><div class='del'>-		*eeprom_ch_info = (struct iwl_eeprom_channel *)</div><div class='del'>-				iwl_legacy_eeprom_query_addr(priv, offset);</div><div class='del'>-		*eeprom_ch_index = iwlegacy_eeprom_band_2;</div><div class='del'>-		break;</div><div class='del'>-	case 3:		/* 5.2GHz band */</div><div class='del'>-		*eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_3);</div><div class='del'>-		*eeprom_ch_info = (struct iwl_eeprom_channel *)</div><div class='del'>-				iwl_legacy_eeprom_query_addr(priv, offset);</div><div class='del'>-		*eeprom_ch_index = iwlegacy_eeprom_band_3;</div><div class='del'>-		break;</div><div class='del'>-	case 4:		/* 5.5GHz band */</div><div class='del'>-		*eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_4);</div><div class='del'>-		*eeprom_ch_info = (struct iwl_eeprom_channel *)</div><div class='del'>-				iwl_legacy_eeprom_query_addr(priv, offset);</div><div class='del'>-		*eeprom_ch_index = iwlegacy_eeprom_band_4;</div><div class='del'>-		break;</div><div class='del'>-	case 5:		/* 5.7GHz band */</div><div class='del'>-		*eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_5);</div><div class='del'>-		*eeprom_ch_info = (struct iwl_eeprom_channel *)</div><div class='del'>-				iwl_legacy_eeprom_query_addr(priv, offset);</div><div class='del'>-		*eeprom_ch_index = iwlegacy_eeprom_band_5;</div><div class='del'>-		break;</div><div class='del'>-	case 6:		/* 2.4GHz ht40 channels */</div><div class='del'>-		*eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_6);</div><div class='del'>-		*eeprom_ch_info = (struct iwl_eeprom_channel *)</div><div class='del'>-				iwl_legacy_eeprom_query_addr(priv, offset);</div><div class='del'>-		*eeprom_ch_index = iwlegacy_eeprom_band_6;</div><div class='del'>-		break;</div><div class='del'>-	case 7:		/* 5 GHz ht40 channels */</div><div class='del'>-		*eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_7);</div><div class='del'>-		*eeprom_ch_info = (struct iwl_eeprom_channel *)</div><div class='del'>-				iwl_legacy_eeprom_query_addr(priv, offset);</div><div class='del'>-		*eeprom_ch_index = iwlegacy_eeprom_band_7;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define CHECK_AND_PRINT(x) ((eeprom_ch-&gt;flags &amp; EEPROM_CHANNEL_##x) \</div><div class='del'>-			    ? # x " " : "")</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_mod_ht40_chan_info - Copy ht40 channel info into driver's priv.</div><div class='del'>- *</div><div class='del'>- * Does not set up a command, or touch hardware.</div><div class='del'>- */</div><div class='del'>-static int iwl_legacy_mod_ht40_chan_info(struct iwl_priv *priv,</div><div class='del'>-			      enum ieee80211_band band, u16 channel,</div><div class='del'>-			      const struct iwl_eeprom_channel *eeprom_ch,</div><div class='del'>-			      u8 clear_ht40_extension_channel)</div><div class='del'>-{</div><div class='del'>-	struct iwl_channel_info *ch_info;</div><div class='del'>-</div><div class='del'>-	ch_info = (struct iwl_channel_info *)</div><div class='del'>-			iwl_legacy_get_channel_info(priv, band, channel);</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_channel_valid(ch_info))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_EEPROM(priv, "HT40 Ch. %d [%sGHz] %s%s%s%s%s(0x%02x %ddBm):"</div><div class='del'>-			" Ad-Hoc %ssupported\n",</div><div class='del'>-			ch_info-&gt;channel,</div><div class='del'>-			iwl_legacy_is_channel_a_band(ch_info) ?</div><div class='del'>-			"5.2" : "2.4",</div><div class='del'>-			CHECK_AND_PRINT(IBSS),</div><div class='del'>-			CHECK_AND_PRINT(ACTIVE),</div><div class='del'>-			CHECK_AND_PRINT(RADAR),</div><div class='del'>-			CHECK_AND_PRINT(WIDE),</div><div class='del'>-			CHECK_AND_PRINT(DFS),</div><div class='del'>-			eeprom_ch-&gt;flags,</div><div class='del'>-			eeprom_ch-&gt;max_power_avg,</div><div class='del'>-			((eeprom_ch-&gt;flags &amp; EEPROM_CHANNEL_IBSS)</div><div class='del'>-			 &amp;&amp; !(eeprom_ch-&gt;flags &amp; EEPROM_CHANNEL_RADAR)) ?</div><div class='del'>-			"" : "not ");</div><div class='del'>-</div><div class='del'>-	ch_info-&gt;ht40_eeprom = *eeprom_ch;</div><div class='del'>-	ch_info-&gt;ht40_max_power_avg = eeprom_ch-&gt;max_power_avg;</div><div class='del'>-	ch_info-&gt;ht40_flags = eeprom_ch-&gt;flags;</div><div class='del'>-	if (eeprom_ch-&gt;flags &amp; EEPROM_CHANNEL_VALID)</div><div class='del'>-		ch_info-&gt;ht40_extension_channel &amp;=</div><div class='del'>-					~clear_ht40_extension_channel;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define CHECK_AND_PRINT_I(x) ((eeprom_ch_info[ch].flags &amp; EEPROM_CHANNEL_##x) \</div><div class='del'>-			    ? # x " " : "")</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_init_channel_map - Set up driver's info for all possible channels</div><div class='del'>- */</div><div class='del'>-int iwl_legacy_init_channel_map(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int eeprom_ch_count = 0;</div><div class='del'>-	const u8 *eeprom_ch_index = NULL;</div><div class='del'>-	const struct iwl_eeprom_channel *eeprom_ch_info = NULL;</div><div class='del'>-	int band, ch;</div><div class='del'>-	struct iwl_channel_info *ch_info;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;channel_count) {</div><div class='del'>-		IWL_DEBUG_EEPROM(priv, "Channel map already initialized.\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_EEPROM(priv, "Initializing regulatory info from EEPROM\n");</div><div class='del'>-</div><div class='del'>-	priv-&gt;channel_count =</div><div class='del'>-	    ARRAY_SIZE(iwlegacy_eeprom_band_1) +</div><div class='del'>-	    ARRAY_SIZE(iwlegacy_eeprom_band_2) +</div><div class='del'>-	    ARRAY_SIZE(iwlegacy_eeprom_band_3) +</div><div class='del'>-	    ARRAY_SIZE(iwlegacy_eeprom_band_4) +</div><div class='del'>-	    ARRAY_SIZE(iwlegacy_eeprom_band_5);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_EEPROM(priv, "Parsing data for %d channels.\n",</div><div class='del'>-			priv-&gt;channel_count);</div><div class='del'>-</div><div class='del'>-	priv-&gt;channel_info = kzalloc(sizeof(struct iwl_channel_info) *</div><div class='del'>-				     priv-&gt;channel_count, GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;channel_info) {</div><div class='del'>-		IWL_ERR(priv, "Could not allocate channel_info\n");</div><div class='del'>-		priv-&gt;channel_count = 0;</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ch_info = priv-&gt;channel_info;</div><div class='del'>-</div><div class='del'>-	/* Loop through the 5 EEPROM bands adding them in order to the</div><div class='del'>-	 * channel map we maintain (that contains additional information than</div><div class='del'>-	 * what just in the EEPROM) */</div><div class='del'>-	for (band = 1; band &lt;= 5; band++) {</div><div class='del'>-</div><div class='del'>-		iwl_legacy_init_band_reference(priv, band, &amp;eeprom_ch_count,</div><div class='del'>-					&amp;eeprom_ch_info, &amp;eeprom_ch_index);</div><div class='del'>-</div><div class='del'>-		/* Loop through each band adding each of the channels */</div><div class='del'>-		for (ch = 0; ch &lt; eeprom_ch_count; ch++) {</div><div class='del'>-			ch_info-&gt;channel = eeprom_ch_index[ch];</div><div class='del'>-			ch_info-&gt;band = (band == 1) ? IEEE80211_BAND_2GHZ :</div><div class='del'>-			    IEEE80211_BAND_5GHZ;</div><div class='del'>-</div><div class='del'>-			/* permanently store EEPROM's channel regulatory flags</div><div class='del'>-			 *   and max power in channel info database. */</div><div class='del'>-			ch_info-&gt;eeprom = eeprom_ch_info[ch];</div><div class='del'>-</div><div class='del'>-			/* Copy the run-time flags so they are there even on</div><div class='del'>-			 * invalid channels */</div><div class='del'>-			ch_info-&gt;flags = eeprom_ch_info[ch].flags;</div><div class='del'>-			/* First write that ht40 is not enabled, and then enable</div><div class='del'>-			 * one by one */</div><div class='del'>-			ch_info-&gt;ht40_extension_channel =</div><div class='del'>-					IEEE80211_CHAN_NO_HT40;</div><div class='del'>-</div><div class='del'>-			if (!(iwl_legacy_is_channel_valid(ch_info))) {</div><div class='del'>-				IWL_DEBUG_EEPROM(priv,</div><div class='del'>-					       "Ch. %d Flags %x [%sGHz] - "</div><div class='del'>-					       "No traffic\n",</div><div class='del'>-					       ch_info-&gt;channel,</div><div class='del'>-					       ch_info-&gt;flags,</div><div class='del'>-					       iwl_legacy_is_channel_a_band(ch_info) ?</div><div class='del'>-					       "5.2" : "2.4");</div><div class='del'>-				ch_info++;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Initialize regulatory-based run-time data */</div><div class='del'>-			ch_info-&gt;max_power_avg = ch_info-&gt;curr_txpow =</div><div class='del'>-			    eeprom_ch_info[ch].max_power_avg;</div><div class='del'>-			ch_info-&gt;scan_power = eeprom_ch_info[ch].max_power_avg;</div><div class='del'>-			ch_info-&gt;min_power = 0;</div><div class='del'>-</div><div class='del'>-			IWL_DEBUG_EEPROM(priv, "Ch. %d [%sGHz] "</div><div class='del'>-				       "%s%s%s%s%s%s(0x%02x %ddBm):"</div><div class='del'>-				       " Ad-Hoc %ssupported\n",</div><div class='del'>-				       ch_info-&gt;channel,</div><div class='del'>-				       iwl_legacy_is_channel_a_band(ch_info) ?</div><div class='del'>-				       "5.2" : "2.4",</div><div class='del'>-				       CHECK_AND_PRINT_I(VALID),</div><div class='del'>-				       CHECK_AND_PRINT_I(IBSS),</div><div class='del'>-				       CHECK_AND_PRINT_I(ACTIVE),</div><div class='del'>-				       CHECK_AND_PRINT_I(RADAR),</div><div class='del'>-				       CHECK_AND_PRINT_I(WIDE),</div><div class='del'>-				       CHECK_AND_PRINT_I(DFS),</div><div class='del'>-				       eeprom_ch_info[ch].flags,</div><div class='del'>-				       eeprom_ch_info[ch].max_power_avg,</div><div class='del'>-				       ((eeprom_ch_info[ch].</div><div class='del'>-					 flags &amp; EEPROM_CHANNEL_IBSS)</div><div class='del'>-					&amp;&amp; !(eeprom_ch_info[ch].</div><div class='del'>-					     flags &amp; EEPROM_CHANNEL_RADAR))</div><div class='del'>-				       ? "" : "not ");</div><div class='del'>-</div><div class='del'>-			ch_info++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check if we do have HT40 channels */</div><div class='del'>-	if (priv-&gt;cfg-&gt;ops-&gt;lib-&gt;eeprom_ops.regulatory_bands[5] ==</div><div class='del'>-	    EEPROM_REGULATORY_BAND_NO_HT40 &amp;&amp;</div><div class='del'>-	    priv-&gt;cfg-&gt;ops-&gt;lib-&gt;eeprom_ops.regulatory_bands[6] ==</div><div class='del'>-	    EEPROM_REGULATORY_BAND_NO_HT40)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Two additional EEPROM bands for 2.4 and 5 GHz HT40 channels */</div><div class='del'>-	for (band = 6; band &lt;= 7; band++) {</div><div class='del'>-		enum ieee80211_band ieeeband;</div><div class='del'>-</div><div class='del'>-		iwl_legacy_init_band_reference(priv, band, &amp;eeprom_ch_count,</div><div class='del'>-					&amp;eeprom_ch_info, &amp;eeprom_ch_index);</div><div class='del'>-</div><div class='del'>-		/* EEPROM band 6 is 2.4, band 7 is 5 GHz */</div><div class='del'>-		ieeeband =</div><div class='del'>-			(band == 6) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;</div><div class='del'>-</div><div class='del'>-		/* Loop through each band adding each of the channels */</div><div class='del'>-		for (ch = 0; ch &lt; eeprom_ch_count; ch++) {</div><div class='del'>-			/* Set up driver's info for lower half */</div><div class='del'>-			iwl_legacy_mod_ht40_chan_info(priv, ieeeband,</div><div class='del'>-						eeprom_ch_index[ch],</div><div class='del'>-						&amp;eeprom_ch_info[ch],</div><div class='del'>-						IEEE80211_CHAN_NO_HT40PLUS);</div><div class='del'>-</div><div class='del'>-			/* Set up driver's info for upper half */</div><div class='del'>-			iwl_legacy_mod_ht40_chan_info(priv, ieeeband,</div><div class='del'>-						eeprom_ch_index[ch] + 4,</div><div class='del'>-						&amp;eeprom_ch_info[ch],</div><div class='del'>-						IEEE80211_CHAN_NO_HT40MINUS);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_init_channel_map);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * iwl_legacy_free_channel_map - undo allocations in iwl_legacy_init_channel_map</div><div class='del'>- */</div><div class='del'>-void iwl_legacy_free_channel_map(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	kfree(priv-&gt;channel_info);</div><div class='del'>-	priv-&gt;channel_count = 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_free_channel_map);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_get_channel_info - Find driver's private channel info</div><div class='del'>- *</div><div class='del'>- * Based on band and channel number.</div><div class='del'>- */</div><div class='del'>-const struct</div><div class='del'>-iwl_channel_info *iwl_legacy_get_channel_info(const struct iwl_priv *priv,</div><div class='del'>-					enum ieee80211_band band, u16 channel)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	switch (band) {</div><div class='del'>-	case IEEE80211_BAND_5GHZ:</div><div class='del'>-		for (i = 14; i &lt; priv-&gt;channel_count; i++) {</div><div class='del'>-			if (priv-&gt;channel_info[i].channel == channel)</div><div class='del'>-				return &amp;priv-&gt;channel_info[i];</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_BAND_2GHZ:</div><div class='del'>-		if (channel &gt;= 1 &amp;&amp; channel &lt;= 14)</div><div class='del'>-			return &amp;priv-&gt;channel_info[channel - 1];</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_get_channel_info);</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-eeprom.h b/drivers/net/wireless/iwlegacy/iwl-eeprom.h<br/>deleted file mode 100644<br/>index c59c81002022..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-eeprom.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-eeprom.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,344 +0,0 @@</div><div class='del'>-/******************************************************************************</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) 2008 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- * BSD LICENSE</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2005 - 2011 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='del'>-#ifndef __iwl_legacy_eeprom_h__</div><div class='del'>-#define __iwl_legacy_eeprom_h__</div><div class='del'>-</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-</div><div class='del'>-struct iwl_priv;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EEPROM access time values:</div><div class='del'>- *</div><div class='del'>- * Driver initiates EEPROM read by writing byte address &lt;&lt; 1 to CSR_EEPROM_REG.</div><div class='del'>- * Driver then polls CSR_EEPROM_REG for CSR_EEPROM_REG_READ_VALID_MSK (0x1).</div><div class='del'>- * When polling, wait 10 uSec between polling loops, up to a maximum 5000 uSec.</div><div class='del'>- * Driver reads 16-bit value from bits 31-16 of CSR_EEPROM_REG.</div><div class='del'>- */</div><div class='del'>-#define IWL_EEPROM_ACCESS_TIMEOUT	5000 /* uSec */</div><div class='del'>-</div><div class='del'>-#define IWL_EEPROM_SEM_TIMEOUT		10   /* microseconds */</div><div class='del'>-#define IWL_EEPROM_SEM_RETRY_LIMIT	1000 /* number of attempts (not time) */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Regulatory channel usage flags in EEPROM struct iwl4965_eeprom_channel.flags.</div><div class='del'>- *</div><div class='del'>- * IBSS and/or AP operation is allowed *only* on those channels with</div><div class='del'>- * (VALID &amp;&amp; IBSS &amp;&amp; ACTIVE &amp;&amp; !RADAR).  This restriction is in place because</div><div class='del'>- * RADAR detection is not supported by the 4965 driver, but is a</div><div class='del'>- * requirement for establishing a new network for legal operation on channels</div><div class='del'>- * requiring RADAR detection or restricting ACTIVE scanning.</div><div class='del'>- *</div><div class='del'>- * NOTE:  "WIDE" flag does not indicate anything about "HT40" 40 MHz channels.</div><div class='del'>- *        It only indicates that 20 MHz channel use is supported; HT40 channel</div><div class='del'>- *        usage is indicated by a separate set of regulatory flags for each</div><div class='del'>- *        HT40 channel pair.</div><div class='del'>- *</div><div class='del'>- * NOTE:  Using a channel inappropriately will result in a uCode error!</div><div class='del'>- */</div><div class='del'>-#define IWL_NUM_TX_CALIB_GROUPS 5</div><div class='del'>-enum {</div><div class='del'>-	EEPROM_CHANNEL_VALID = (1 &lt;&lt; 0),	/* usable for this SKU/geo */</div><div class='del'>-	EEPROM_CHANNEL_IBSS = (1 &lt;&lt; 1),		/* usable as an IBSS channel */</div><div class='del'>-	/* Bit 2 Reserved */</div><div class='del'>-	EEPROM_CHANNEL_ACTIVE = (1 &lt;&lt; 3),	/* active scanning allowed */</div><div class='del'>-	EEPROM_CHANNEL_RADAR = (1 &lt;&lt; 4),	/* radar detection required */</div><div class='del'>-	EEPROM_CHANNEL_WIDE = (1 &lt;&lt; 5),		/* 20 MHz channel okay */</div><div class='del'>-	/* Bit 6 Reserved (was Narrow Channel) */</div><div class='del'>-	EEPROM_CHANNEL_DFS = (1 &lt;&lt; 7),	/* dynamic freq selection candidate */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* SKU Capabilities */</div><div class='del'>-/* 3945 only */</div><div class='del'>-#define EEPROM_SKU_CAP_SW_RF_KILL_ENABLE                (1 &lt;&lt; 0)</div><div class='del'>-#define EEPROM_SKU_CAP_HW_RF_KILL_ENABLE                (1 &lt;&lt; 1)</div><div class='del'>-</div><div class='del'>-/* *regulatory* channel data format in eeprom, one for each channel.</div><div class='del'>- * There are separate entries for HT40 (40 MHz) vs. normal (20 MHz) channels. */</div><div class='del'>-struct iwl_eeprom_channel {</div><div class='del'>-	u8 flags;		/* EEPROM_CHANNEL_* flags copied from EEPROM */</div><div class='del'>-	s8 max_power_avg;	/* max power (dBm) on this chnl, limit 31 */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* 3945 Specific */</div><div class='del'>-#define EEPROM_3945_EEPROM_VERSION	(0x2f)</div><div class='del'>-</div><div class='del'>-/* 4965 has two radio transmitters (and 3 radio receivers) */</div><div class='del'>-#define EEPROM_TX_POWER_TX_CHAINS      (2)</div><div class='del'>-</div><div class='del'>-/* 4965 has room for up to 8 sets of txpower calibration data */</div><div class='del'>-#define EEPROM_TX_POWER_BANDS          (8)</div><div class='del'>-</div><div class='del'>-/* 4965 factory calibration measures txpower gain settings for</div><div class='del'>- * each of 3 target output levels */</div><div class='del'>-#define EEPROM_TX_POWER_MEASUREMENTS   (3)</div><div class='del'>-</div><div class='del'>-/* 4965 Specific */</div><div class='del'>-/* 4965 driver does not work with txpower calibration version &lt; 5 */</div><div class='del'>-#define EEPROM_4965_TX_POWER_VERSION    (5)</div><div class='del'>-#define EEPROM_4965_EEPROM_VERSION	(0x2f)</div><div class='del'>-#define EEPROM_4965_CALIB_VERSION_OFFSET       (2*0xB6) /* 2 bytes */</div><div class='del'>-#define EEPROM_4965_CALIB_TXPOWER_OFFSET       (2*0xE8) /* 48  bytes */</div><div class='del'>-#define EEPROM_4965_BOARD_REVISION             (2*0x4F) /* 2 bytes */</div><div class='del'>-#define EEPROM_4965_BOARD_PBA                  (2*0x56+1) /* 9 bytes */</div><div class='del'>-</div><div class='del'>-/* 2.4 GHz */</div><div class='del'>-extern const u8 iwlegacy_eeprom_band_1[14];</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * factory calibration data for one txpower level, on one channel,</div><div class='del'>- * measured on one of the 2 tx chains (radio transmitter and associated</div><div class='del'>- * antenna).  EEPROM contains:</div><div class='del'>- *</div><div class='del'>- * 1)  Temperature (degrees Celsius) of device when measurement was made.</div><div class='del'>- *</div><div class='del'>- * 2)  Gain table index used to achieve the target measurement power.</div><div class='del'>- *     This refers to the "well-known" gain tables (see iwl-4965-hw.h).</div><div class='del'>- *</div><div class='del'>- * 3)  Actual measured output power, in half-dBm ("34" = 17 dBm).</div><div class='del'>- *</div><div class='del'>- * 4)  RF power amplifier detector level measurement (not used).</div><div class='del'>- */</div><div class='del'>-struct iwl_eeprom_calib_measure {</div><div class='del'>-	u8 temperature;		/* Device temperature (Celsius) */</div><div class='del'>-	u8 gain_idx;		/* Index into gain table */</div><div class='del'>-	u8 actual_pow;		/* Measured RF output power, half-dBm */</div><div class='del'>-	s8 pa_det;		/* Power amp detector level (not used) */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * measurement set for one channel.  EEPROM contains:</div><div class='del'>- *</div><div class='del'>- * 1)  Channel number measured</div><div class='del'>- *</div><div class='del'>- * 2)  Measurements for each of 3 power levels for each of 2 radio transmitters</div><div class='del'>- *     (a.k.a. "tx chains") (6 measurements altogether)</div><div class='del'>- */</div><div class='del'>-struct iwl_eeprom_calib_ch_info {</div><div class='del'>-	u8 ch_num;</div><div class='del'>-	struct iwl_eeprom_calib_measure</div><div class='del'>-		measurements[EEPROM_TX_POWER_TX_CHAINS]</div><div class='del'>-			[EEPROM_TX_POWER_MEASUREMENTS];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * txpower subband info.</div><div class='del'>- *</div><div class='del'>- * For each frequency subband, EEPROM contains the following:</div><div class='del'>- *</div><div class='del'>- * 1)  First and last channels within range of the subband.  "0" values</div><div class='del'>- *     indicate that this sample set is not being used.</div><div class='del'>- *</div><div class='del'>- * 2)  Sample measurement sets for 2 channels close to the range endpoints.</div><div class='del'>- */</div><div class='del'>-struct iwl_eeprom_calib_subband_info {</div><div class='del'>-	u8 ch_from;	/* channel number of lowest channel in subband */</div><div class='del'>-	u8 ch_to;	/* channel number of highest channel in subband */</div><div class='del'>-	struct iwl_eeprom_calib_ch_info ch1;</div><div class='del'>-	struct iwl_eeprom_calib_ch_info ch2;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * txpower calibration info.  EEPROM contains:</div><div class='del'>- *</div><div class='del'>- * 1)  Factory-measured saturation power levels (maximum levels at which</div><div class='del'>- *     tx power amplifier can output a signal without too much distortion).</div><div class='del'>- *     There is one level for 2.4 GHz band and one for 5 GHz band.  These</div><div class='del'>- *     values apply to all channels within each of the bands.</div><div class='del'>- *</div><div class='del'>- * 2)  Factory-measured power supply voltage level.  This is assumed to be</div><div class='del'>- *     constant (i.e. same value applies to all channels/bands) while the</div><div class='del'>- *     factory measurements are being made.</div><div class='del'>- *</div><div class='del'>- * 3)  Up to 8 sets of factory-measured txpower calibration values.</div><div class='del'>- *     These are for different frequency ranges, since txpower gain</div><div class='del'>- *     characteristics of the analog radio circuitry vary with frequency.</div><div class='del'>- *</div><div class='del'>- *     Not all sets need to be filled with data;</div><div class='del'>- *     struct iwl_eeprom_calib_subband_info contains range of channels</div><div class='del'>- *     (0 if unused) for each set of data.</div><div class='del'>- */</div><div class='del'>-struct iwl_eeprom_calib_info {</div><div class='del'>-	u8 saturation_power24;	/* half-dBm (e.g. "34" = 17 dBm) */</div><div class='del'>-	u8 saturation_power52;	/* half-dBm */</div><div class='del'>-	__le16 voltage;		/* signed */</div><div class='del'>-	struct iwl_eeprom_calib_subband_info</div><div class='del'>-		band_info[EEPROM_TX_POWER_BANDS];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* General */</div><div class='del'>-#define EEPROM_DEVICE_ID                    (2*0x08)	/* 2 bytes */</div><div class='del'>-#define EEPROM_MAC_ADDRESS                  (2*0x15)	/* 6  bytes */</div><div class='del'>-#define EEPROM_BOARD_REVISION               (2*0x35)	/* 2  bytes */</div><div class='del'>-#define EEPROM_BOARD_PBA_NUMBER             (2*0x3B+1)	/* 9  bytes */</div><div class='del'>-#define EEPROM_VERSION                      (2*0x44)	/* 2  bytes */</div><div class='del'>-#define EEPROM_SKU_CAP                      (2*0x45)	/* 2  bytes */</div><div class='del'>-#define EEPROM_OEM_MODE                     (2*0x46)	/* 2  bytes */</div><div class='del'>-#define EEPROM_WOWLAN_MODE                  (2*0x47)	/* 2  bytes */</div><div class='del'>-#define EEPROM_RADIO_CONFIG                 (2*0x48)	/* 2  bytes */</div><div class='del'>-#define EEPROM_NUM_MAC_ADDRESS              (2*0x4C)	/* 2  bytes */</div><div class='del'>-</div><div class='del'>-/* The following masks are to be applied on EEPROM_RADIO_CONFIG */</div><div class='del'>-#define EEPROM_RF_CFG_TYPE_MSK(x)   (x &amp; 0x3)         /* bits 0-1   */</div><div class='del'>-#define EEPROM_RF_CFG_STEP_MSK(x)   ((x &gt;&gt; 2)  &amp; 0x3) /* bits 2-3   */</div><div class='del'>-#define EEPROM_RF_CFG_DASH_MSK(x)   ((x &gt;&gt; 4)  &amp; 0x3) /* bits 4-5   */</div><div class='del'>-#define EEPROM_RF_CFG_PNUM_MSK(x)   ((x &gt;&gt; 6)  &amp; 0x3) /* bits 6-7   */</div><div class='del'>-#define EEPROM_RF_CFG_TX_ANT_MSK(x) ((x &gt;&gt; 8)  &amp; 0xF) /* bits 8-11  */</div><div class='del'>-#define EEPROM_RF_CFG_RX_ANT_MSK(x) ((x &gt;&gt; 12) &amp; 0xF) /* bits 12-15 */</div><div class='del'>-</div><div class='del'>-#define EEPROM_3945_RF_CFG_TYPE_MAX  0x0</div><div class='del'>-#define EEPROM_4965_RF_CFG_TYPE_MAX  0x1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Per-channel regulatory data.</div><div class='del'>- *</div><div class='del'>- * Each channel that *might* be supported by iwl has a fixed location</div><div class='del'>- * in EEPROM containing EEPROM_CHANNEL_* usage flags (LSB) and max regulatory</div><div class='del'>- * txpower (MSB).</div><div class='del'>- *</div><div class='del'>- * Entries immediately below are for 20 MHz channel width.  HT40 (40 MHz)</div><div class='del'>- * channels (only for 4965, not supported by 3945) appear later in the EEPROM.</div><div class='del'>- *</div><div class='del'>- * 2.4 GHz channels 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14</div><div class='del'>- */</div><div class='del'>-#define EEPROM_REGULATORY_SKU_ID            (2*0x60)    /* 4  bytes */</div><div class='del'>-#define EEPROM_REGULATORY_BAND_1            (2*0x62)	/* 2  bytes */</div><div class='del'>-#define EEPROM_REGULATORY_BAND_1_CHANNELS   (2*0x63)	/* 28 bytes */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 4.9 GHz channels 183, 184, 185, 187, 188, 189, 192, 196,</div><div class='del'>- * 5.0 GHz channels 7, 8, 11, 12, 16</div><div class='del'>- * (4915-5080MHz) (none of these is ever supported)</div><div class='del'>- */</div><div class='del'>-#define EEPROM_REGULATORY_BAND_2            (2*0x71)	/* 2  bytes */</div><div class='del'>-#define EEPROM_REGULATORY_BAND_2_CHANNELS   (2*0x72)	/* 26 bytes */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 5.2 GHz channels 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64</div><div class='del'>- * (5170-5320MHz)</div><div class='del'>- */</div><div class='del'>-#define EEPROM_REGULATORY_BAND_3            (2*0x7F)	/* 2  bytes */</div><div class='del'>-#define EEPROM_REGULATORY_BAND_3_CHANNELS   (2*0x80)	/* 24 bytes */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 5.5 GHz channels 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140</div><div class='del'>- * (5500-5700MHz)</div><div class='del'>- */</div><div class='del'>-#define EEPROM_REGULATORY_BAND_4            (2*0x8C)	/* 2  bytes */</div><div class='del'>-#define EEPROM_REGULATORY_BAND_4_CHANNELS   (2*0x8D)	/* 22 bytes */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 5.7 GHz channels 145, 149, 153, 157, 161, 165</div><div class='del'>- * (5725-5825MHz)</div><div class='del'>- */</div><div class='del'>-#define EEPROM_REGULATORY_BAND_5            (2*0x98)	/* 2  bytes */</div><div class='del'>-#define EEPROM_REGULATORY_BAND_5_CHANNELS   (2*0x99)	/* 12 bytes */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 2.4 GHz HT40 channels 1 (5), 2 (6), 3 (7), 4 (8), 5 (9), 6 (10), 7 (11)</div><div class='del'>- *</div><div class='del'>- * The channel listed is the center of the lower 20 MHz half of the channel.</div><div class='del'>- * The overall center frequency is actually 2 channels (10 MHz) above that,</div><div class='del'>- * and the upper half of each HT40 channel is centered 4 channels (20 MHz) away</div><div class='del'>- * from the lower half; e.g. the upper half of HT40 channel 1 is channel 5,</div><div class='del'>- * and the overall HT40 channel width centers on channel 3.</div><div class='del'>- *</div><div class='del'>- * NOTE:  The RXON command uses 20 MHz channel numbers to specify the</div><div class='del'>- *        control channel to which to tune.  RXON also specifies whether the</div><div class='del'>- *        control channel is the upper or lower half of a HT40 channel.</div><div class='del'>- *</div><div class='del'>- * NOTE:  4965 does not support HT40 channels on 2.4 GHz.</div><div class='del'>- */</div><div class='del'>-#define EEPROM_4965_REGULATORY_BAND_24_HT40_CHANNELS (2*0xA0)	/* 14 bytes */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 5.2 GHz HT40 channels 36 (40), 44 (48), 52 (56), 60 (64),</div><div class='del'>- * 100 (104), 108 (112), 116 (120), 124 (128), 132 (136), 149 (153), 157 (161)</div><div class='del'>- */</div><div class='del'>-#define EEPROM_4965_REGULATORY_BAND_52_HT40_CHANNELS (2*0xA8)	/* 22 bytes */</div><div class='del'>-</div><div class='del'>-#define EEPROM_REGULATORY_BAND_NO_HT40			(0)</div><div class='del'>-</div><div class='del'>-struct iwl_eeprom_ops {</div><div class='del'>-	const u32 regulatory_bands[7];</div><div class='del'>-	int (*acquire_semaphore) (struct iwl_priv *priv);</div><div class='del'>-	void (*release_semaphore) (struct iwl_priv *priv);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int iwl_legacy_eeprom_init(struct iwl_priv *priv);</div><div class='del'>-void iwl_legacy_eeprom_free(struct iwl_priv *priv);</div><div class='del'>-const u8 *iwl_legacy_eeprom_query_addr(const struct iwl_priv *priv,</div><div class='del'>-					size_t offset);</div><div class='del'>-u16 iwl_legacy_eeprom_query16(const struct iwl_priv *priv, size_t offset);</div><div class='del'>-int iwl_legacy_init_channel_map(struct iwl_priv *priv);</div><div class='del'>-void iwl_legacy_free_channel_map(struct iwl_priv *priv);</div><div class='del'>-const struct iwl_channel_info *iwl_legacy_get_channel_info(</div><div class='del'>-		const struct iwl_priv *priv,</div><div class='del'>-		enum ieee80211_band band, u16 channel);</div><div class='del'>-</div><div class='del'>-#endif  /* __iwl_legacy_eeprom_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-fh.h b/drivers/net/wireless/iwlegacy/iwl-fh.h<br/>deleted file mode 100644<br/>index 6e6091816e36..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-fh.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-fh.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,513 +0,0 @@</div><div class='del'>-/******************************************************************************</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) 2005 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- * BSD LICENSE</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2005 - 2011 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='del'>-#ifndef __iwl_legacy_fh_h__</div><div class='del'>-#define __iwl_legacy_fh_h__</div><div class='del'>-</div><div class='del'>-/****************************/</div><div class='del'>-/* Flow Handler Definitions */</div><div class='del'>-/****************************/</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * This I/O area is directly read/writable by driver (e.g. Linux uses writel())</div><div class='del'>- * Addresses are offsets from device's PCI hardware base address.</div><div class='del'>- */</div><div class='del'>-#define FH_MEM_LOWER_BOUND                   (0x1000)</div><div class='del'>-#define FH_MEM_UPPER_BOUND                   (0x2000)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Keep-Warm (KW) buffer base address.</div><div class='del'>- *</div><div class='del'>- * Driver must allocate a 4KByte buffer that is used by 4965 for keeping the</div><div class='del'>- * host DRAM powered on (via dummy accesses to DRAM) to maintain low-latency</div><div class='del'>- * DRAM access when 4965 is Txing or Rxing.  The dummy accesses prevent host</div><div class='del'>- * from going into a power-savings mode that would cause higher DRAM latency,</div><div class='del'>- * and possible data over/under-runs, before all Tx/Rx is complete.</div><div class='del'>- *</div><div class='del'>- * Driver loads FH_KW_MEM_ADDR_REG with the physical address (bits 35:4)</div><div class='del'>- * of the buffer, which must be 4K aligned.  Once this is set up, the 4965</div><div class='del'>- * automatically invokes keep-warm accesses when normal accesses might not</div><div class='del'>- * be sufficient to maintain fast DRAM response.</div><div class='del'>- *</div><div class='del'>- * Bit fields:</div><div class='del'>- *  31-0:  Keep-warm buffer physical base address [35:4], must be 4K aligned</div><div class='del'>- */</div><div class='del'>-#define FH_KW_MEM_ADDR_REG		     (FH_MEM_LOWER_BOUND + 0x97C)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * TFD Circular Buffers Base (CBBC) addresses</div><div class='del'>- *</div><div class='del'>- * 4965 has 16 base pointer registers, one for each of 16 host-DRAM-resident</div><div class='del'>- * circular buffers (CBs/queues) containing Transmit Frame Descriptors (TFDs)</div><div class='del'>- * (see struct iwl_tfd_frame).  These 16 pointer registers are offset by 0x04</div><div class='del'>- * bytes from one another.  Each TFD circular buffer in DRAM must be 256-byte</div><div class='del'>- * aligned (address bits 0-7 must be 0).</div><div class='del'>- *</div><div class='del'>- * Bit fields in each pointer register:</div><div class='del'>- *  27-0: TFD CB physical base address [35:8], must be 256-byte aligned</div><div class='del'>- */</div><div class='del'>-#define FH_MEM_CBBC_LOWER_BOUND          (FH_MEM_LOWER_BOUND + 0x9D0)</div><div class='del'>-#define FH_MEM_CBBC_UPPER_BOUND          (FH_MEM_LOWER_BOUND + 0xA10)</div><div class='del'>-</div><div class='del'>-/* Find TFD CB base pointer for given queue (range 0-15). */</div><div class='del'>-#define FH_MEM_CBBC_QUEUE(x)  (FH_MEM_CBBC_LOWER_BOUND + (x) * 0x4)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Rx SRAM Control and Status Registers (RSCSR)</div><div class='del'>- *</div><div class='del'>- * These registers provide handshake between driver and 4965 for the Rx queue</div><div class='del'>- * (this queue handles *all* command responses, notifications, Rx data, etc.</div><div class='del'>- * sent from 4965 uCode to host driver).  Unlike Tx, there is only one Rx</div><div class='del'>- * queue, and only one Rx DMA/FIFO channel.  Also unlike Tx, which can</div><div class='del'>- * concatenate up to 20 DRAM buffers to form a Tx frame, each Receive Buffer</div><div class='del'>- * Descriptor (RBD) points to only one Rx Buffer (RB); there is a 1:1</div><div class='del'>- * mapping between RBDs and RBs.</div><div class='del'>- *</div><div class='del'>- * Driver must allocate host DRAM memory for the following, and set the</div><div class='del'>- * physical address of each into 4965 registers:</div><div class='del'>- *</div><div class='del'>- * 1)  Receive Buffer Descriptor (RBD) circular buffer (CB), typically with 256</div><div class='del'>- *     entries (although any power of 2, up to 4096, is selectable by driver).</div><div class='del'>- *     Each entry (1 dword) points to a receive buffer (RB) of consistent size</div><div class='del'>- *     (typically 4K, although 8K or 16K are also selectable by driver).</div><div class='del'>- *     Driver sets up RB size and number of RBDs in the CB via Rx config</div><div class='del'>- *     register FH_MEM_RCSR_CHNL0_CONFIG_REG.</div><div class='del'>- *</div><div class='del'>- *     Bit fields within one RBD:</div><div class='del'>- *     27-0:  Receive Buffer physical address bits [35:8], 256-byte aligned</div><div class='del'>- *</div><div class='del'>- *     Driver sets physical address [35:8] of base of RBD circular buffer</div><div class='del'>- *     into FH_RSCSR_CHNL0_RBDCB_BASE_REG [27:0].</div><div class='del'>- *</div><div class='del'>- * 2)  Rx status buffer, 8 bytes, in which 4965 indicates which Rx Buffers</div><div class='del'>- *     (RBs) have been filled, via a "write pointer", actually the index of</div><div class='del'>- *     the RB's corresponding RBD within the circular buffer.  Driver sets</div><div class='del'>- *     physical address [35:4] into FH_RSCSR_CHNL0_STTS_WPTR_REG [31:0].</div><div class='del'>- *</div><div class='del'>- *     Bit fields in lower dword of Rx status buffer (upper dword not used</div><div class='del'>- *     by driver; see struct iwl4965_shared, val0):</div><div class='del'>- *     31-12:  Not used by driver</div><div class='del'>- *     11- 0:  Index of last filled Rx buffer descriptor</div><div class='del'>- *             (4965 writes, driver reads this value)</div><div class='del'>- *</div><div class='del'>- * As the driver prepares Receive Buffers (RBs) for 4965 to fill, driver must</div><div class='del'>- * enter pointers to these RBs into contiguous RBD circular buffer entries,</div><div class='del'>- * and update the 4965's "write" index register,</div><div class='del'>- * FH_RSCSR_CHNL0_RBDCB_WPTR_REG.</div><div class='del'>- *</div><div class='del'>- * This "write" index corresponds to the *next* RBD that the driver will make</div><div class='del'>- * available, i.e. one RBD past the tail of the ready-to-fill RBDs within</div><div class='del'>- * the circular buffer.  This value should initially be 0 (before preparing any</div><div class='del'>- * RBs), should be 8 after preparing the first 8 RBs (for example), and must</div><div class='del'>- * wrap back to 0 at the end of the circular buffer (but don't wrap before</div><div class='del'>- * "read" index has advanced past 1!  See below).</div><div class='del'>- * NOTE:  4965 EXPECTS THE WRITE INDEX TO BE INCREMENTED IN MULTIPLES OF 8.</div><div class='del'>- *</div><div class='del'>- * As the 4965 fills RBs (referenced from contiguous RBDs within the circular</div><div class='del'>- * buffer), it updates the Rx status buffer in host DRAM, 2) described above,</div><div class='del'>- * to tell the driver the index of the latest filled RBD.  The driver must</div><div class='del'>- * read this "read" index from DRAM after receiving an Rx interrupt from 4965.</div><div class='del'>- *</div><div class='del'>- * The driver must also internally keep track of a third index, which is the</div><div class='del'>- * next RBD to process.  When receiving an Rx interrupt, driver should process</div><div class='del'>- * all filled but unprocessed RBs up to, but not including, the RB</div><div class='del'>- * corresponding to the "read" index.  For example, if "read" index becomes "1",</div><div class='del'>- * driver may process the RB pointed to by RBD 0.  Depending on volume of</div><div class='del'>- * traffic, there may be many RBs to process.</div><div class='del'>- *</div><div class='del'>- * If read index == write index, 4965 thinks there is no room to put new data.</div><div class='del'>- * Due to this, the maximum number of filled RBs is 255, instead of 256.  To</div><div class='del'>- * be safe, make sure that there is a gap of at least 2 RBDs between "write"</div><div class='del'>- * and "read" indexes; that is, make sure that there are no more than 254</div><div class='del'>- * buffers waiting to be filled.</div><div class='del'>- */</div><div class='del'>-#define FH_MEM_RSCSR_LOWER_BOUND	(FH_MEM_LOWER_BOUND + 0xBC0)</div><div class='del'>-#define FH_MEM_RSCSR_UPPER_BOUND	(FH_MEM_LOWER_BOUND + 0xC00)</div><div class='del'>-#define FH_MEM_RSCSR_CHNL0		(FH_MEM_RSCSR_LOWER_BOUND)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Physical base address of 8-byte Rx Status buffer.</div><div class='del'>- * Bit fields:</div><div class='del'>- *  31-0: Rx status buffer physical base address [35:4], must 16-byte aligned.</div><div class='del'>- */</div><div class='del'>-#define FH_RSCSR_CHNL0_STTS_WPTR_REG	(FH_MEM_RSCSR_CHNL0)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Physical base address of Rx Buffer Descriptor Circular Buffer.</div><div class='del'>- * Bit fields:</div><div class='del'>- *  27-0:  RBD CD physical base address [35:8], must be 256-byte aligned.</div><div class='del'>- */</div><div class='del'>-#define FH_RSCSR_CHNL0_RBDCB_BASE_REG	(FH_MEM_RSCSR_CHNL0 + 0x004)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Rx write pointer (index, really!).</div><div class='del'>- * Bit fields:</div><div class='del'>- *  11-0:  Index of driver's most recent prepared-to-be-filled RBD, + 1.</div><div class='del'>- *         NOTE:  For 256-entry circular buffer, use only bits [7:0].</div><div class='del'>- */</div><div class='del'>-#define FH_RSCSR_CHNL0_RBDCB_WPTR_REG	(FH_MEM_RSCSR_CHNL0 + 0x008)</div><div class='del'>-#define FH_RSCSR_CHNL0_WPTR        (FH_RSCSR_CHNL0_RBDCB_WPTR_REG)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Rx Config/Status Registers (RCSR)</div><div class='del'>- * Rx Config Reg for channel 0 (only channel used)</div><div class='del'>- *</div><div class='del'>- * Driver must initialize FH_MEM_RCSR_CHNL0_CONFIG_REG as follows for</div><div class='del'>- * normal operation (see bit fields).</div><div class='del'>- *</div><div class='del'>- * Clearing FH_MEM_RCSR_CHNL0_CONFIG_REG to 0 turns off Rx DMA.</div><div class='del'>- * Driver should poll FH_MEM_RSSR_RX_STATUS_REG	for</div><div class='del'>- * FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE (bit 24) before continuing.</div><div class='del'>- *</div><div class='del'>- * Bit fields:</div><div class='del'>- * 31-30: Rx DMA channel enable: '00' off/pause, '01' pause at end of frame,</div><div class='del'>- *        '10' operate normally</div><div class='del'>- * 29-24: reserved</div><div class='del'>- * 23-20: # RBDs in circular buffer = 2^value; use "8" for 256 RBDs (normal),</div><div class='del'>- *        min "5" for 32 RBDs, max "12" for 4096 RBDs.</div><div class='del'>- * 19-18: reserved</div><div class='del'>- * 17-16: size of each receive buffer; '00' 4K (normal), '01' 8K,</div><div class='del'>- *        '10' 12K, '11' 16K.</div><div class='del'>- * 15-14: reserved</div><div class='del'>- * 13-12: IRQ destination; '00' none, '01' host driver (normal operation)</div><div class='del'>- * 11- 4: timeout for closing Rx buffer and interrupting host (units 32 usec)</div><div class='del'>- *        typical value 0x10 (about 1/2 msec)</div><div class='del'>- *  3- 0: reserved</div><div class='del'>- */</div><div class='del'>-#define FH_MEM_RCSR_LOWER_BOUND      (FH_MEM_LOWER_BOUND + 0xC00)</div><div class='del'>-#define FH_MEM_RCSR_UPPER_BOUND      (FH_MEM_LOWER_BOUND + 0xCC0)</div><div class='del'>-#define FH_MEM_RCSR_CHNL0            (FH_MEM_RCSR_LOWER_BOUND)</div><div class='del'>-</div><div class='del'>-#define FH_MEM_RCSR_CHNL0_CONFIG_REG	(FH_MEM_RCSR_CHNL0)</div><div class='del'>-</div><div class='del'>-#define FH_RCSR_CHNL0_RX_CONFIG_RB_TIMEOUT_MSK (0x00000FF0) /* bits 4-11 */</div><div class='del'>-#define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_MSK   (0x00001000) /* bits 12 */</div><div class='del'>-#define FH_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME_MSK (0x00008000) /* bit 15 */</div><div class='del'>-#define FH_RCSR_CHNL0_RX_CONFIG_RB_SIZE_MSK   (0x00030000) /* bits 16-17 */</div><div class='del'>-#define FH_RCSR_CHNL0_RX_CONFIG_RBDBC_SIZE_MSK (0x00F00000) /* bits 20-23 */</div><div class='del'>-#define FH_RCSR_CHNL0_RX_CONFIG_DMA_CHNL_EN_MSK (0xC0000000) /* bits 30-31*/</div><div class='del'>-</div><div class='del'>-#define FH_RCSR_RX_CONFIG_RBDCB_SIZE_POS	(20)</div><div class='del'>-#define FH_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS	(4)</div><div class='del'>-#define RX_RB_TIMEOUT	(0x10)</div><div class='del'>-</div><div class='del'>-#define FH_RCSR_RX_CONFIG_CHNL_EN_PAUSE_VAL         (0x00000000)</div><div class='del'>-#define FH_RCSR_RX_CONFIG_CHNL_EN_PAUSE_EOF_VAL     (0x40000000)</div><div class='del'>-#define FH_RCSR_RX_CONFIG_CHNL_EN_ENABLE_VAL        (0x80000000)</div><div class='del'>-</div><div class='del'>-#define FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_4K    (0x00000000)</div><div class='del'>-#define FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_8K    (0x00010000)</div><div class='del'>-#define FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_12K   (0x00020000)</div><div class='del'>-#define FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_16K   (0x00030000)</div><div class='del'>-</div><div class='del'>-#define FH_RCSR_CHNL0_RX_IGNORE_RXF_EMPTY              (0x00000004)</div><div class='del'>-#define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_NO_INT_VAL    (0x00000000)</div><div class='del'>-#define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL  (0x00001000)</div><div class='del'>-</div><div class='del'>-#define FH_RSCSR_FRAME_SIZE_MSK	(0x00003FFF)	/* bits 0-13 */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Rx Shared Status Registers (RSSR)</div><div class='del'>- *</div><div class='del'>- * After stopping Rx DMA channel (writing 0 to</div><div class='del'>- * FH_MEM_RCSR_CHNL0_CONFIG_REG), driver must poll</div><div class='del'>- * FH_MEM_RSSR_RX_STATUS_REG until Rx channel is idle.</div><div class='del'>- *</div><div class='del'>- * Bit fields:</div><div class='del'>- *  24:  1 = Channel 0 is idle</div><div class='del'>- *</div><div class='del'>- * FH_MEM_RSSR_SHARED_CTRL_REG and FH_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV</div><div class='del'>- * contain default values that should not be altered by the driver.</div><div class='del'>- */</div><div class='del'>-#define FH_MEM_RSSR_LOWER_BOUND           (FH_MEM_LOWER_BOUND + 0xC40)</div><div class='del'>-#define FH_MEM_RSSR_UPPER_BOUND           (FH_MEM_LOWER_BOUND + 0xD00)</div><div class='del'>-</div><div class='del'>-#define FH_MEM_RSSR_SHARED_CTRL_REG       (FH_MEM_RSSR_LOWER_BOUND)</div><div class='del'>-#define FH_MEM_RSSR_RX_STATUS_REG	(FH_MEM_RSSR_LOWER_BOUND + 0x004)</div><div class='del'>-#define FH_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV\</div><div class='del'>-					(FH_MEM_RSSR_LOWER_BOUND + 0x008)</div><div class='del'>-</div><div class='del'>-#define FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE	(0x01000000)</div><div class='del'>-</div><div class='del'>-#define FH_MEM_TFDIB_REG1_ADDR_BITSHIFT	28</div><div class='del'>-</div><div class='del'>-/* TFDB  Area - TFDs buffer table */</div><div class='del'>-#define FH_MEM_TFDIB_DRAM_ADDR_LSB_MSK      (0xFFFFFFFF)</div><div class='del'>-#define FH_TFDIB_LOWER_BOUND       (FH_MEM_LOWER_BOUND + 0x900)</div><div class='del'>-#define FH_TFDIB_UPPER_BOUND       (FH_MEM_LOWER_BOUND + 0x958)</div><div class='del'>-#define FH_TFDIB_CTRL0_REG(_chnl)  (FH_TFDIB_LOWER_BOUND + 0x8 * (_chnl))</div><div class='del'>-#define FH_TFDIB_CTRL1_REG(_chnl)  (FH_TFDIB_LOWER_BOUND + 0x8 * (_chnl) + 0x4)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Transmit DMA Channel Control/Status Registers (TCSR)</div><div class='del'>- *</div><div class='del'>- * 4965 has one configuration register for each of 8 Tx DMA/FIFO channels</div><div class='del'>- * supported in hardware (don't confuse these with the 16 Tx queues in DRAM,</div><div class='del'>- * which feed the DMA/FIFO channels); config regs are separated by 0x20 bytes.</div><div class='del'>- *</div><div class='del'>- * To use a Tx DMA channel, driver must initialize its</div><div class='del'>- * FH_TCSR_CHNL_TX_CONFIG_REG(chnl) with:</div><div class='del'>- *</div><div class='del'>- * FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE |</div><div class='del'>- * FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE_VAL</div><div class='del'>- *</div><div class='del'>- * All other bits should be 0.</div><div class='del'>- *</div><div class='del'>- * Bit fields:</div><div class='del'>- * 31-30: Tx DMA channel enable: '00' off/pause, '01' pause at end of frame,</div><div class='del'>- *        '10' operate normally</div><div class='del'>- * 29- 4: Reserved, set to "0"</div><div class='del'>- *     3: Enable internal DMA requests (1, normal operation), disable (0)</div><div class='del'>- *  2- 0: Reserved, set to "0"</div><div class='del'>- */</div><div class='del'>-#define FH_TCSR_LOWER_BOUND  (FH_MEM_LOWER_BOUND + 0xD00)</div><div class='del'>-#define FH_TCSR_UPPER_BOUND  (FH_MEM_LOWER_BOUND + 0xE60)</div><div class='del'>-</div><div class='del'>-/* Find Control/Status reg for given Tx DMA/FIFO channel */</div><div class='del'>-#define FH49_TCSR_CHNL_NUM                            (7)</div><div class='del'>-#define FH50_TCSR_CHNL_NUM                            (8)</div><div class='del'>-</div><div class='del'>-/* TCSR: tx_config register values */</div><div class='del'>-#define FH_TCSR_CHNL_TX_CONFIG_REG(_chnl)	\</div><div class='del'>-		(FH_TCSR_LOWER_BOUND + 0x20 * (_chnl))</div><div class='del'>-#define FH_TCSR_CHNL_TX_CREDIT_REG(_chnl)	\</div><div class='del'>-		(FH_TCSR_LOWER_BOUND + 0x20 * (_chnl) + 0x4)</div><div class='del'>-#define FH_TCSR_CHNL_TX_BUF_STS_REG(_chnl)	\</div><div class='del'>-		(FH_TCSR_LOWER_BOUND + 0x20 * (_chnl) + 0x8)</div><div class='del'>-</div><div class='del'>-#define FH_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_TXF		(0x00000000)</div><div class='del'>-#define FH_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_DRV		(0x00000001)</div><div class='del'>-</div><div class='del'>-#define FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE	(0x00000000)</div><div class='del'>-#define FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE	(0x00000008)</div><div class='del'>-</div><div class='del'>-#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_NOINT	(0x00000000)</div><div class='del'>-#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD	(0x00100000)</div><div class='del'>-#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_IFTFD	(0x00200000)</div><div class='del'>-</div><div class='del'>-#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_NOINT	(0x00000000)</div><div class='del'>-#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_ENDTFD	(0x00400000)</div><div class='del'>-#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_IFTFD	(0x00800000)</div><div class='del'>-</div><div class='del'>-#define FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE	(0x00000000)</div><div class='del'>-#define FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE_EOF	(0x40000000)</div><div class='del'>-#define FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE	(0x80000000)</div><div class='del'>-</div><div class='del'>-#define FH_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_EMPTY	(0x00000000)</div><div class='del'>-#define FH_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_WAIT	(0x00002000)</div><div class='del'>-#define FH_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_VALID	(0x00000003)</div><div class='del'>-</div><div class='del'>-#define FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_NUM		(20)</div><div class='del'>-#define FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_IDX		(12)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Tx Shared Status Registers (TSSR)</div><div class='del'>- *</div><div class='del'>- * After stopping Tx DMA channel (writing 0 to</div><div class='del'>- * FH_TCSR_CHNL_TX_CONFIG_REG(chnl)), driver must poll</div><div class='del'>- * FH_TSSR_TX_STATUS_REG until selected Tx channel is idle</div><div class='del'>- * (channel's buffers empty | no pending requests).</div><div class='del'>- *</div><div class='del'>- * Bit fields:</div><div class='del'>- * 31-24:  1 = Channel buffers empty (channel 7:0)</div><div class='del'>- * 23-16:  1 = No pending requests (channel 7:0)</div><div class='del'>- */</div><div class='del'>-#define FH_TSSR_LOWER_BOUND		(FH_MEM_LOWER_BOUND + 0xEA0)</div><div class='del'>-#define FH_TSSR_UPPER_BOUND		(FH_MEM_LOWER_BOUND + 0xEC0)</div><div class='del'>-</div><div class='del'>-#define FH_TSSR_TX_STATUS_REG		(FH_TSSR_LOWER_BOUND + 0x010)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Bit fields for TSSR(Tx Shared Status &amp; Control) error status register:</div><div class='del'>- * 31:  Indicates an address error when accessed to internal memory</div><div class='del'>- *	uCode/driver must write "1" in order to clear this flag</div><div class='del'>- * 30:  Indicates that Host did not send the expected number of dwords to FH</div><div class='del'>- *	uCode/driver must write "1" in order to clear this flag</div><div class='del'>- * 16-9:Each status bit is for one channel. Indicates that an (Error) ActDMA</div><div class='del'>- *	command was received from the scheduler while the TRB was already full</div><div class='del'>- *	with previous command</div><div class='del'>- *	uCode/driver must write "1" in order to clear this flag</div><div class='del'>- * 7-0: Each status bit indicates a channel's TxCredit error. When an error</div><div class='del'>- *	bit is set, it indicates that the FH has received a full indication</div><div class='del'>- *	from the RTC TxFIFO and the current value of the TxCredit counter was</div><div class='del'>- *	not equal to zero. This mean that the credit mechanism was not</div><div class='del'>- *	synchronized to the TxFIFO status</div><div class='del'>- *	uCode/driver must write "1" in order to clear this flag</div><div class='del'>- */</div><div class='del'>-#define FH_TSSR_TX_ERROR_REG		(FH_TSSR_LOWER_BOUND + 0x018)</div><div class='del'>-</div><div class='del'>-#define FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(_chnl) ((1 &lt;&lt; (_chnl)) &lt;&lt; 16)</div><div class='del'>-</div><div class='del'>-/* Tx service channels */</div><div class='del'>-#define FH_SRVC_CHNL		(9)</div><div class='del'>-#define FH_SRVC_LOWER_BOUND	(FH_MEM_LOWER_BOUND + 0x9C8)</div><div class='del'>-#define FH_SRVC_UPPER_BOUND	(FH_MEM_LOWER_BOUND + 0x9D0)</div><div class='del'>-#define FH_SRVC_CHNL_SRAM_ADDR_REG(_chnl) \</div><div class='del'>-		(FH_SRVC_LOWER_BOUND + ((_chnl) - 9) * 0x4)</div><div class='del'>-</div><div class='del'>-#define FH_TX_CHICKEN_BITS_REG	(FH_MEM_LOWER_BOUND + 0xE98)</div><div class='del'>-/* Instruct FH to increment the retry count of a packet when</div><div class='del'>- * it is brought from the memory to TX-FIFO</div><div class='del'>- */</div><div class='del'>-#define FH_TX_CHICKEN_BITS_SCD_AUTO_RETRY_EN	(0x00000002)</div><div class='del'>-</div><div class='del'>-#define RX_QUEUE_SIZE                         256</div><div class='del'>-#define RX_QUEUE_MASK                         255</div><div class='del'>-#define RX_QUEUE_SIZE_LOG                     8</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * RX related structures and functions</div><div class='del'>- */</div><div class='del'>-#define RX_FREE_BUFFERS 64</div><div class='del'>-#define RX_LOW_WATERMARK 8</div><div class='del'>-</div><div class='del'>-/* Size of one Rx buffer in host DRAM */</div><div class='del'>-#define IWL_RX_BUF_SIZE_3K (3 * 1000) /* 3945 only */</div><div class='del'>-#define IWL_RX_BUF_SIZE_4K (4 * 1024)</div><div class='del'>-#define IWL_RX_BUF_SIZE_8K (8 * 1024)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_rb_status - reseve buffer status</div><div class='del'>- * 	host memory mapped FH registers</div><div class='del'>- * @closed_rb_num [0:11] - Indicates the index of the RB which was closed</div><div class='del'>- * @closed_fr_num [0:11] - Indicates the index of the RX Frame which was closed</div><div class='del'>- * @finished_rb_num [0:11] - Indicates the index of the current RB</div><div class='del'>- * 	in which the last frame was written to</div><div class='del'>- * @finished_fr_num [0:11] - Indicates the index of the RX Frame</div><div class='del'>- * 	which was transferred</div><div class='del'>- */</div><div class='del'>-struct iwl_rb_status {</div><div class='del'>-	__le16 closed_rb_num;</div><div class='del'>-	__le16 closed_fr_num;</div><div class='del'>-	__le16 finished_rb_num;</div><div class='del'>-	__le16 finished_fr_nam;</div><div class='del'>-	__le32 __unused; /* 3945 only */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TFD_QUEUE_SIZE_MAX      (256)</div><div class='del'>-#define TFD_QUEUE_SIZE_BC_DUP	(64)</div><div class='del'>-#define TFD_QUEUE_BC_SIZE	(TFD_QUEUE_SIZE_MAX + TFD_QUEUE_SIZE_BC_DUP)</div><div class='del'>-#define IWL_TX_DMA_MASK        DMA_BIT_MASK(36)</div><div class='del'>-#define IWL_NUM_OF_TBS		20</div><div class='del'>-</div><div class='del'>-static inline u8 iwl_legacy_get_dma_hi_addr(dma_addr_t addr)</div><div class='del'>-{</div><div class='del'>-	return (sizeof(addr) &gt; sizeof(u32) ? (addr &gt;&gt; 16) &gt;&gt; 16 : 0) &amp; 0xF;</div><div class='del'>-}</div><div class='del'>-/**</div><div class='del'>- * struct iwl_tfd_tb transmit buffer descriptor within transmit frame descriptor</div><div class='del'>- *</div><div class='del'>- * This structure contains dma address and length of transmission address</div><div class='del'>- *</div><div class='del'>- * @lo: low [31:0] portion of the dma address of TX buffer</div><div class='del'>- * 	every even is unaligned on 16 bit boundary</div><div class='del'>- * @hi_n_len 0-3 [35:32] portion of dma</div><div class='del'>- *	     4-15 length of the tx buffer</div><div class='del'>- */</div><div class='del'>-struct iwl_tfd_tb {</div><div class='del'>-	__le32 lo;</div><div class='del'>-	__le16 hi_n_len;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_tfd</div><div class='del'>- *</div><div class='del'>- * Transmit Frame Descriptor (TFD)</div><div class='del'>- *</div><div class='del'>- * @ __reserved1[3] reserved</div><div class='del'>- * @ num_tbs 0-4 number of active tbs</div><div class='del'>- *	     5   reserved</div><div class='del'>- * 	     6-7 padding (not used)</div><div class='del'>- * @ tbs[20]	transmit frame buffer descriptors</div><div class='del'>- * @ __pad 	padding</div><div class='del'>- *</div><div class='del'>- * Each Tx queue uses a circular buffer of 256 TFDs stored in host DRAM.</div><div class='del'>- * Both driver and device share these circular buffers, each of which must be</div><div class='del'>- * contiguous 256 TFDs x 128 bytes-per-TFD = 32 KBytes</div><div class='del'>- *</div><div class='del'>- * Driver must indicate the physical address of the base of each</div><div class='del'>- * circular buffer via the FH_MEM_CBBC_QUEUE registers.</div><div class='del'>- *</div><div class='del'>- * Each TFD contains pointer/size information for up to 20 data buffers</div><div class='del'>- * in host DRAM.  These buffers collectively contain the (one) frame described</div><div class='del'>- * by the TFD.  Each buffer must be a single contiguous block of memory within</div><div class='del'>- * itself, but buffers may be scattered in host DRAM.  Each buffer has max size</div><div class='del'>- * of (4K - 4).  The concatenates all of a TFD's buffers into a single</div><div class='del'>- * Tx frame, up to 8 KBytes in size.</div><div class='del'>- *</div><div class='del'>- * A maximum of 255 (not 256!) TFDs may be on a queue waiting for Tx.</div><div class='del'>- */</div><div class='del'>-struct iwl_tfd {</div><div class='del'>-	u8 __reserved1[3];</div><div class='del'>-	u8 num_tbs;</div><div class='del'>-	struct iwl_tfd_tb tbs[IWL_NUM_OF_TBS];</div><div class='del'>-	__le32 __pad;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* Keep Warm Size */</div><div class='del'>-#define IWL_KW_SIZE 0x1000	/* 4k */</div><div class='del'>-</div><div class='del'>-#endif /* !__iwl_legacy_fh_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-hcmd.c b/drivers/net/wireless/iwlegacy/iwl-hcmd.c<br/>deleted file mode 100644<br/>index ce1fc9feb61f..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-hcmd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-hcmd.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,271 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * GPL LICENSE SUMMARY</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2008 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-debug.h"</div><div class='del'>-#include "iwl-eeprom.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-const char *iwl_legacy_get_cmd_string(u8 cmd)</div><div class='del'>-{</div><div class='del'>-	switch (cmd) {</div><div class='del'>-		IWL_CMD(REPLY_ALIVE);</div><div class='del'>-		IWL_CMD(REPLY_ERROR);</div><div class='del'>-		IWL_CMD(REPLY_RXON);</div><div class='del'>-		IWL_CMD(REPLY_RXON_ASSOC);</div><div class='del'>-		IWL_CMD(REPLY_QOS_PARAM);</div><div class='del'>-		IWL_CMD(REPLY_RXON_TIMING);</div><div class='del'>-		IWL_CMD(REPLY_ADD_STA);</div><div class='del'>-		IWL_CMD(REPLY_REMOVE_STA);</div><div class='del'>-		IWL_CMD(REPLY_WEPKEY);</div><div class='del'>-		IWL_CMD(REPLY_3945_RX);</div><div class='del'>-		IWL_CMD(REPLY_TX);</div><div class='del'>-		IWL_CMD(REPLY_RATE_SCALE);</div><div class='del'>-		IWL_CMD(REPLY_LEDS_CMD);</div><div class='del'>-		IWL_CMD(REPLY_TX_LINK_QUALITY_CMD);</div><div class='del'>-		IWL_CMD(REPLY_CHANNEL_SWITCH);</div><div class='del'>-		IWL_CMD(CHANNEL_SWITCH_NOTIFICATION);</div><div class='del'>-		IWL_CMD(REPLY_SPECTRUM_MEASUREMENT_CMD);</div><div class='del'>-		IWL_CMD(SPECTRUM_MEASURE_NOTIFICATION);</div><div class='del'>-		IWL_CMD(POWER_TABLE_CMD);</div><div class='del'>-		IWL_CMD(PM_SLEEP_NOTIFICATION);</div><div class='del'>-		IWL_CMD(PM_DEBUG_STATISTIC_NOTIFIC);</div><div class='del'>-		IWL_CMD(REPLY_SCAN_CMD);</div><div class='del'>-		IWL_CMD(REPLY_SCAN_ABORT_CMD);</div><div class='del'>-		IWL_CMD(SCAN_START_NOTIFICATION);</div><div class='del'>-		IWL_CMD(SCAN_RESULTS_NOTIFICATION);</div><div class='del'>-		IWL_CMD(SCAN_COMPLETE_NOTIFICATION);</div><div class='del'>-		IWL_CMD(BEACON_NOTIFICATION);</div><div class='del'>-		IWL_CMD(REPLY_TX_BEACON);</div><div class='del'>-		IWL_CMD(REPLY_TX_PWR_TABLE_CMD);</div><div class='del'>-		IWL_CMD(REPLY_BT_CONFIG);</div><div class='del'>-		IWL_CMD(REPLY_STATISTICS_CMD);</div><div class='del'>-		IWL_CMD(STATISTICS_NOTIFICATION);</div><div class='del'>-		IWL_CMD(CARD_STATE_NOTIFICATION);</div><div class='del'>-		IWL_CMD(MISSED_BEACONS_NOTIFICATION);</div><div class='del'>-		IWL_CMD(REPLY_CT_KILL_CONFIG_CMD);</div><div class='del'>-		IWL_CMD(SENSITIVITY_CMD);</div><div class='del'>-		IWL_CMD(REPLY_PHY_CALIBRATION_CMD);</div><div class='del'>-		IWL_CMD(REPLY_RX_PHY_CMD);</div><div class='del'>-		IWL_CMD(REPLY_RX_MPDU_CMD);</div><div class='del'>-		IWL_CMD(REPLY_RX);</div><div class='del'>-		IWL_CMD(REPLY_COMPRESSED_BA);</div><div class='del'>-	default:</div><div class='del'>-		return "UNKNOWN";</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_get_cmd_string);</div><div class='del'>-</div><div class='del'>-#define HOST_COMPLETE_TIMEOUT (HZ / 2)</div><div class='del'>-</div><div class='del'>-static void iwl_legacy_generic_cmd_callback(struct iwl_priv *priv,</div><div class='del'>-				     struct iwl_device_cmd *cmd,</div><div class='del'>-				     struct iwl_rx_packet *pkt)</div><div class='del'>-{</div><div class='del'>-	if (pkt-&gt;hdr.flags &amp; IWL_CMD_FAILED_MSK) {</div><div class='del'>-		IWL_ERR(priv, "Bad return from %s (0x%08X)\n",</div><div class='del'>-		iwl_legacy_get_cmd_string(cmd-&gt;hdr.cmd), pkt-&gt;hdr.flags);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	switch (cmd-&gt;hdr.cmd) {</div><div class='del'>-	case REPLY_TX_LINK_QUALITY_CMD:</div><div class='del'>-	case SENSITIVITY_CMD:</div><div class='del'>-		IWL_DEBUG_HC_DUMP(priv, "back from %s (0x%08X)\n",</div><div class='del'>-		iwl_legacy_get_cmd_string(cmd-&gt;hdr.cmd), pkt-&gt;hdr.flags);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		IWL_DEBUG_HC(priv, "back from %s (0x%08X)\n",</div><div class='del'>-		iwl_legacy_get_cmd_string(cmd-&gt;hdr.cmd), pkt-&gt;hdr.flags);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-iwl_legacy_send_cmd_async(struct iwl_priv *priv, struct iwl_host_cmd *cmd)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!(cmd-&gt;flags &amp; CMD_ASYNC));</div><div class='del'>-</div><div class='del'>-	/* An asynchronous command can not expect an SKB to be set. */</div><div class='del'>-	BUG_ON(cmd-&gt;flags &amp; CMD_WANT_SKB);</div><div class='del'>-</div><div class='del'>-	/* Assign a generic callback if one is not provided */</div><div class='del'>-	if (!cmd-&gt;callback)</div><div class='del'>-		cmd-&gt;callback = iwl_legacy_generic_cmd_callback;</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_enqueue_hcmd(priv, cmd);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		IWL_ERR(priv, "Error sending %s: enqueue_hcmd failed: %d\n",</div><div class='del'>-			  iwl_legacy_get_cmd_string(cmd-&gt;id), 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'>-int iwl_legacy_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)</div><div class='del'>-{</div><div class='del'>-	int cmd_idx;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	BUG_ON(cmd-&gt;flags &amp; CMD_ASYNC);</div><div class='del'>-</div><div class='del'>-	 /* A synchronous command can not have a callback set. */</div><div class='del'>-	BUG_ON(cmd-&gt;callback);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Attempting to send sync command %s\n",</div><div class='del'>-			iwl_legacy_get_cmd_string(cmd-&gt;id));</div><div class='del'>-</div><div class='del'>-	set_bit(STATUS_HCMD_ACTIVE, &amp;priv-&gt;status);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Setting HCMD_ACTIVE for command %s\n",</div><div class='del'>-			iwl_legacy_get_cmd_string(cmd-&gt;id));</div><div class='del'>-</div><div class='del'>-	cmd_idx = iwl_legacy_enqueue_hcmd(priv, cmd);</div><div class='del'>-	if (cmd_idx &lt; 0) {</div><div class='del'>-		ret = cmd_idx;</div><div class='del'>-		IWL_ERR(priv, "Error sending %s: enqueue_hcmd failed: %d\n",</div><div class='del'>-			  iwl_legacy_get_cmd_string(cmd-&gt;id), ret);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = wait_event_timeout(priv-&gt;wait_command_queue,</div><div class='del'>-			!test_bit(STATUS_HCMD_ACTIVE, &amp;priv-&gt;status),</div><div class='del'>-			HOST_COMPLETE_TIMEOUT);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		if (test_bit(STATUS_HCMD_ACTIVE, &amp;priv-&gt;status)) {</div><div class='del'>-			IWL_ERR(priv,</div><div class='del'>-				"Error sending %s: time out after %dms.\n",</div><div class='del'>-				iwl_legacy_get_cmd_string(cmd-&gt;id),</div><div class='del'>-				jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));</div><div class='del'>-</div><div class='del'>-			clear_bit(STATUS_HCMD_ACTIVE, &amp;priv-&gt;status);</div><div class='del'>-			IWL_DEBUG_INFO(priv,</div><div class='del'>-				"Clearing HCMD_ACTIVE for command %s\n",</div><div class='del'>-				       iwl_legacy_get_cmd_string(cmd-&gt;id));</div><div class='del'>-			ret = -ETIMEDOUT;</div><div class='del'>-			goto cancel;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status)) {</div><div class='del'>-		IWL_ERR(priv, "Command %s aborted: RF KILL Switch\n",</div><div class='del'>-			       iwl_legacy_get_cmd_string(cmd-&gt;id));</div><div class='del'>-		ret = -ECANCELED;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	if (test_bit(STATUS_FW_ERROR, &amp;priv-&gt;status)) {</div><div class='del'>-		IWL_ERR(priv, "Command %s failed: FW Error\n",</div><div class='del'>-			       iwl_legacy_get_cmd_string(cmd-&gt;id));</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	if ((cmd-&gt;flags &amp; CMD_WANT_SKB) &amp;&amp; !cmd-&gt;reply_page) {</div><div class='del'>-		IWL_ERR(priv, "Error: Response NULL in '%s'\n",</div><div class='del'>-			  iwl_legacy_get_cmd_string(cmd-&gt;id));</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto cancel;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-	goto out;</div><div class='del'>-</div><div class='del'>-cancel:</div><div class='del'>-	if (cmd-&gt;flags &amp; CMD_WANT_SKB) {</div><div class='del'>-		/*</div><div class='del'>-		 * Cancel the CMD_WANT_SKB flag for the cmd in the</div><div class='del'>-		 * TX cmd queue. Otherwise in case the cmd comes</div><div class='del'>-		 * in later, it will possibly set an invalid</div><div class='del'>-		 * address (cmd-&gt;meta.source).</div><div class='del'>-		 */</div><div class='del'>-		priv-&gt;txq[priv-&gt;cmd_queue].meta[cmd_idx].flags &amp;=</div><div class='del'>-							~CMD_WANT_SKB;</div><div class='del'>-	}</div><div class='del'>-fail:</div><div class='del'>-	if (cmd-&gt;reply_page) {</div><div class='del'>-		iwl_legacy_free_pages(priv, cmd-&gt;reply_page);</div><div class='del'>-		cmd-&gt;reply_page = 0;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_send_cmd_sync);</div><div class='del'>-</div><div class='del'>-int iwl_legacy_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)</div><div class='del'>-{</div><div class='del'>-	if (cmd-&gt;flags &amp; CMD_ASYNC)</div><div class='del'>-		return iwl_legacy_send_cmd_async(priv, cmd);</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_send_cmd_sync(priv, cmd);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_send_cmd);</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-iwl_legacy_send_cmd_pdu(struct iwl_priv *priv, u8 id, u16 len, const void *data)</div><div class='del'>-{</div><div class='del'>-	struct iwl_host_cmd cmd = {</div><div class='del'>-		.id = id,</div><div class='del'>-		.len = len,</div><div class='del'>-		.data = data,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_send_cmd_sync(priv, &amp;cmd);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_send_cmd_pdu);</div><div class='del'>-</div><div class='del'>-int iwl_legacy_send_cmd_pdu_async(struct iwl_priv *priv,</div><div class='del'>-			   u8 id, u16 len, const void *data,</div><div class='del'>-			   void (*callback)(struct iwl_priv *priv,</div><div class='del'>-					    struct iwl_device_cmd *cmd,</div><div class='del'>-					    struct iwl_rx_packet *pkt))</div><div class='del'>-{</div><div class='del'>-	struct iwl_host_cmd cmd = {</div><div class='del'>-		.id = id,</div><div class='del'>-		.len = len,</div><div class='del'>-		.data = data,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	cmd.flags |= CMD_ASYNC;</div><div class='del'>-	cmd.callback = callback;</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_send_cmd_async(priv, &amp;cmd);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_send_cmd_pdu_async);</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-helpers.h b/drivers/net/wireless/iwlegacy/iwl-helpers.h<br/>deleted file mode 100644<br/>index 5cf23eaecbbb..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-helpers.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-helpers.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,196 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Portions of this file are derived from the ipw3945 project, as well</div><div class='del'>- * as portions of the ieee80211 subsystem header files.</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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifndef __iwl_legacy_helpers_h__</div><div class='del'>-#define __iwl_legacy_helpers_h__</div><div class='del'>-</div><div class='del'>-#include &lt;linux/ctype.h&gt;</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-</div><div class='del'>-#define IWL_MASK(lo, hi) ((1 &lt;&lt; (hi)) | ((1 &lt;&lt; (hi)) - (1 &lt;&lt; (lo))))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline struct ieee80211_conf *iwl_legacy_ieee80211_get_hw_conf(</div><div class='del'>-	struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	return &amp;hw-&gt;conf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_queue_inc_wrap - increment queue index, wrap back to beginning</div><div class='del'>- * @index -- current index</div><div class='del'>- * @n_bd -- total number of entries in queue (must be power of 2)</div><div class='del'>- */</div><div class='del'>-static inline int iwl_legacy_queue_inc_wrap(int index, int n_bd)</div><div class='del'>-{</div><div class='del'>-	return ++index &amp; (n_bd - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_queue_dec_wrap - decrement queue index, wrap back to end</div><div class='del'>- * @index -- current index</div><div class='del'>- * @n_bd -- total number of entries in queue (must be power of 2)</div><div class='del'>- */</div><div class='del'>-static inline int iwl_legacy_queue_dec_wrap(int index, int n_bd)</div><div class='del'>-{</div><div class='del'>-	return --index &amp; (n_bd - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* TODO: Move fw_desc functions to iwl-pci.ko */</div><div class='del'>-static inline void iwl_legacy_free_fw_desc(struct pci_dev *pci_dev,</div><div class='del'>-				    struct fw_desc *desc)</div><div class='del'>-{</div><div class='del'>-	if (desc-&gt;v_addr)</div><div class='del'>-		dma_free_coherent(&amp;pci_dev-&gt;dev, desc-&gt;len,</div><div class='del'>-				  desc-&gt;v_addr, desc-&gt;p_addr);</div><div class='del'>-	desc-&gt;v_addr = NULL;</div><div class='del'>-	desc-&gt;len = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int iwl_legacy_alloc_fw_desc(struct pci_dev *pci_dev,</div><div class='del'>-				    struct fw_desc *desc)</div><div class='del'>-{</div><div class='del'>-	if (!desc-&gt;len) {</div><div class='del'>-		desc-&gt;v_addr = NULL;</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	desc-&gt;v_addr = dma_alloc_coherent(&amp;pci_dev-&gt;dev, desc-&gt;len,</div><div class='del'>-					  &amp;desc-&gt;p_addr, GFP_KERNEL);</div><div class='del'>-	return (desc-&gt;v_addr != NULL) ? 0 : -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * we have 8 bits used like this:</div><div class='del'>- *</div><div class='del'>- * 7 6 5 4 3 2 1 0</div><div class='del'>- * | | | | | | | |</div><div class='del'>- * | | | | | | +-+-------- AC queue (0-3)</div><div class='del'>- * | | | | | |</div><div class='del'>- * | +-+-+-+-+------------ HW queue ID</div><div class='del'>- * |</div><div class='del'>- * +---------------------- unused</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-iwl_legacy_set_swq_id(struct iwl_tx_queue *txq, u8 ac, u8 hwq)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(ac &gt; 3);   /* only have 2 bits */</div><div class='del'>-	BUG_ON(hwq &gt; 31); /* only use 5 bits */</div><div class='del'>-</div><div class='del'>-	txq-&gt;swq_id = (hwq &lt;&lt; 2) | ac;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void iwl_legacy_wake_queue(struct iwl_priv *priv,</div><div class='del'>-				  struct iwl_tx_queue *txq)</div><div class='del'>-{</div><div class='del'>-	u8 queue = txq-&gt;swq_id;</div><div class='del'>-	u8 ac = queue &amp; 3;</div><div class='del'>-	u8 hwq = (queue &gt;&gt; 2) &amp; 0x1f;</div><div class='del'>-</div><div class='del'>-	if (test_and_clear_bit(hwq, priv-&gt;queue_stopped))</div><div class='del'>-		if (atomic_dec_return(&amp;priv-&gt;queue_stop_count[ac]) &lt;= 0)</div><div class='del'>-			ieee80211_wake_queue(priv-&gt;hw, ac);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void iwl_legacy_stop_queue(struct iwl_priv *priv,</div><div class='del'>-				  struct iwl_tx_queue *txq)</div><div class='del'>-{</div><div class='del'>-	u8 queue = txq-&gt;swq_id;</div><div class='del'>-	u8 ac = queue &amp; 3;</div><div class='del'>-	u8 hwq = (queue &gt;&gt; 2) &amp; 0x1f;</div><div class='del'>-</div><div class='del'>-	if (!test_and_set_bit(hwq, priv-&gt;queue_stopped))</div><div class='del'>-		if (atomic_inc_return(&amp;priv-&gt;queue_stop_count[ac]) &gt; 0)</div><div class='del'>-			ieee80211_stop_queue(priv-&gt;hw, ac);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef ieee80211_stop_queue</div><div class='del'>-#undef ieee80211_stop_queue</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define ieee80211_stop_queue DO_NOT_USE_ieee80211_stop_queue</div><div class='del'>-</div><div class='del'>-#ifdef ieee80211_wake_queue</div><div class='del'>-#undef ieee80211_wake_queue</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define ieee80211_wake_queue DO_NOT_USE_ieee80211_wake_queue</div><div class='del'>-</div><div class='del'>-static inline void iwl_legacy_disable_interrupts(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	clear_bit(STATUS_INT_ENABLED, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	/* disable interrupts from uCode/NIC to host */</div><div class='del'>-	iwl_write32(priv, CSR_INT_MASK, 0x00000000);</div><div class='del'>-</div><div class='del'>-	/* acknowledge/clear/reset any interrupts still pending</div><div class='del'>-	 * from uCode or flow handler (Rx/Tx DMA) */</div><div class='del'>-	iwl_write32(priv, CSR_INT, 0xffffffff);</div><div class='del'>-	iwl_write32(priv, CSR_FH_INT_STATUS, 0xffffffff);</div><div class='del'>-	IWL_DEBUG_ISR(priv, "Disabled interrupts\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void iwl_legacy_enable_rfkill_int(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	IWL_DEBUG_ISR(priv, "Enabling rfkill interrupt\n");</div><div class='del'>-	iwl_write32(priv, CSR_INT_MASK, CSR_INT_BIT_RF_KILL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void iwl_legacy_enable_interrupts(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	IWL_DEBUG_ISR(priv, "Enabling interrupts\n");</div><div class='del'>-	set_bit(STATUS_INT_ENABLED, &amp;priv-&gt;status);</div><div class='del'>-	iwl_write32(priv, CSR_INT_MASK, priv-&gt;inta_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_beacon_time_mask_low - mask of lower 32 bit of beacon time</div><div class='del'>- * @priv -- pointer to iwl_priv data structure</div><div class='del'>- * @tsf_bits -- number of bits need to shift for masking)</div><div class='del'>- */</div><div class='del'>-static inline u32 iwl_legacy_beacon_time_mask_low(struct iwl_priv *priv,</div><div class='del'>-					   u16 tsf_bits)</div><div class='del'>-{</div><div class='del'>-	return (1 &lt;&lt; tsf_bits) - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_beacon_time_mask_high - mask of higher 32 bit of beacon time</div><div class='del'>- * @priv -- pointer to iwl_priv data structure</div><div class='del'>- * @tsf_bits -- number of bits need to shift for masking)</div><div class='del'>- */</div><div class='del'>-static inline u32 iwl_legacy_beacon_time_mask_high(struct iwl_priv *priv,</div><div class='del'>-					    u16 tsf_bits)</div><div class='del'>-{</div><div class='del'>-	return ((1 &lt;&lt; (32 - tsf_bits)) - 1) &lt;&lt; tsf_bits;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif				/* __iwl_legacy_helpers_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-io.h b/drivers/net/wireless/iwlegacy/iwl-io.h<br/>deleted file mode 100644<br/>index 5cc5d342914f..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-io.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,545 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Portions of this file are derived from the ipw3945 project.</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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifndef __iwl_legacy_io_h__</div><div class='del'>-#define __iwl_legacy_io_h__</div><div class='del'>-</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-debug.h"</div><div class='del'>-#include "iwl-devtrace.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * IO, register, and NIC memory access functions</div><div class='del'>- *</div><div class='del'>- * NOTE on naming convention and macro usage for these</div><div class='del'>- *</div><div class='del'>- * A single _ prefix before a an access function means that no state</div><div class='del'>- * check or debug information is printed when that function is called.</div><div class='del'>- *</div><div class='del'>- * A double __ prefix before an access function means that state is checked</div><div class='del'>- * and the current line number and caller function name are printed in addition</div><div class='del'>- * to any other debug output.</div><div class='del'>- *</div><div class='del'>- * The non-prefixed name is the #define that maps the caller into a</div><div class='del'>- * #define that provides the caller's name and __LINE__ to the double</div><div class='del'>- * prefix version.</div><div class='del'>- *</div><div class='del'>- * If you wish to call the function without any debug or state checking,</div><div class='del'>- * you should use the single _ prefix version (as is used by dependent IO</div><div class='del'>- * routines, for example _iwl_legacy_read_direct32 calls the non-check version of</div><div class='del'>- * _iwl_legacy_read32.)</div><div class='del'>- *</div><div class='del'>- * These declarations are *extremely* useful in quickly isolating code deltas</div><div class='del'>- * which result in misconfiguration of the hardware I/O.  In combination with</div><div class='del'>- * git-bisect and the IO debug level you can quickly determine the specific</div><div class='del'>- * commit which breaks the IO sequence to the hardware.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline void _iwl_legacy_write8(struct iwl_priv *priv, u32 ofs, u8 val)</div><div class='del'>-{</div><div class='del'>-	trace_iwlwifi_legacy_dev_iowrite8(priv, ofs, val);</div><div class='del'>-	iowrite8(val, priv-&gt;hw_base + ofs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-static inline void</div><div class='del'>-__iwl_legacy_write8(const char *f, u32 l, struct iwl_priv *priv,</div><div class='del'>-				 u32 ofs, u8 val)</div><div class='del'>-{</div><div class='del'>-	IWL_DEBUG_IO(priv, "write8(0x%08X, 0x%02X) - %s %d\n", ofs, val, f, l);</div><div class='del'>-	_iwl_legacy_write8(priv, ofs, val);</div><div class='del'>-}</div><div class='del'>-#define iwl_write8(priv, ofs, val) \</div><div class='del'>-	__iwl_legacy_write8(__FILE__, __LINE__, priv, ofs, val)</div><div class='del'>-#else</div><div class='del'>-#define iwl_write8(priv, ofs, val) _iwl_legacy_write8(priv, ofs, val)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline void _iwl_legacy_write32(struct iwl_priv *priv, u32 ofs, u32 val)</div><div class='del'>-{</div><div class='del'>-	trace_iwlwifi_legacy_dev_iowrite32(priv, ofs, val);</div><div class='del'>-	iowrite32(val, priv-&gt;hw_base + ofs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-static inline void</div><div class='del'>-__iwl_legacy_write32(const char *f, u32 l, struct iwl_priv *priv,</div><div class='del'>-				 u32 ofs, u32 val)</div><div class='del'>-{</div><div class='del'>-	IWL_DEBUG_IO(priv, "write32(0x%08X, 0x%08X) - %s %d\n", ofs, val, f, l);</div><div class='del'>-	_iwl_legacy_write32(priv, ofs, val);</div><div class='del'>-}</div><div class='del'>-#define iwl_write32(priv, ofs, val) \</div><div class='del'>-	__iwl_legacy_write32(__FILE__, __LINE__, priv, ofs, val)</div><div class='del'>-#else</div><div class='del'>-#define iwl_write32(priv, ofs, val) _iwl_legacy_write32(priv, ofs, val)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline u32 _iwl_legacy_read32(struct iwl_priv *priv, u32 ofs)</div><div class='del'>-{</div><div class='del'>-	u32 val = ioread32(priv-&gt;hw_base + ofs);</div><div class='del'>-	trace_iwlwifi_legacy_dev_ioread32(priv, ofs, val);</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-static inline u32</div><div class='del'>-__iwl_legacy_read32(char *f, u32 l, struct iwl_priv *priv, u32 ofs)</div><div class='del'>-{</div><div class='del'>-	IWL_DEBUG_IO(priv, "read_direct32(0x%08X) - %s %d\n", ofs, f, l);</div><div class='del'>-	return _iwl_legacy_read32(priv, ofs);</div><div class='del'>-}</div><div class='del'>-#define iwl_read32(priv, ofs) __iwl_legacy_read32(__FILE__, __LINE__, priv, ofs)</div><div class='del'>-#else</div><div class='del'>-#define iwl_read32(p, o) _iwl_legacy_read32(p, o)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define IWL_POLL_INTERVAL 10	/* microseconds */</div><div class='del'>-static inline int</div><div class='del'>-_iwl_legacy_poll_bit(struct iwl_priv *priv, u32 addr,</div><div class='del'>-				u32 bits, u32 mask, int timeout)</div><div class='del'>-{</div><div class='del'>-	int t = 0;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		if ((_iwl_legacy_read32(priv, addr) &amp; mask) == (bits &amp; mask))</div><div class='del'>-			return t;</div><div class='del'>-		udelay(IWL_POLL_INTERVAL);</div><div class='del'>-		t += IWL_POLL_INTERVAL;</div><div class='del'>-	} while (t &lt; timeout);</div><div class='del'>-</div><div class='del'>-	return -ETIMEDOUT;</div><div class='del'>-}</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-static inline int __iwl_legacy_poll_bit(const char *f, u32 l,</div><div class='del'>-				 struct iwl_priv *priv, u32 addr,</div><div class='del'>-				 u32 bits, u32 mask, int timeout)</div><div class='del'>-{</div><div class='del'>-	int ret = _iwl_legacy_poll_bit(priv, addr, bits, mask, timeout);</div><div class='del'>-	IWL_DEBUG_IO(priv, "poll_bit(0x%08X, 0x%08X, 0x%08X) - %s- %s %d\n",</div><div class='del'>-		     addr, bits, mask,</div><div class='del'>-		     unlikely(ret  == -ETIMEDOUT) ? "timeout" : "", f, l);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#define iwl_poll_bit(priv, addr, bits, mask, timeout) \</div><div class='del'>-	__iwl_legacy_poll_bit(__FILE__, __LINE__, priv, addr, \</div><div class='del'>-	bits, mask, timeout)</div><div class='del'>-#else</div><div class='del'>-#define iwl_poll_bit(p, a, b, m, t) _iwl_legacy_poll_bit(p, a, b, m, t)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline void _iwl_legacy_set_bit(struct iwl_priv *priv, u32 reg, u32 mask)</div><div class='del'>-{</div><div class='del'>-	_iwl_legacy_write32(priv, reg, _iwl_legacy_read32(priv, reg) | mask);</div><div class='del'>-}</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-static inline void __iwl_legacy_set_bit(const char *f, u32 l,</div><div class='del'>-				 struct iwl_priv *priv, u32 reg, u32 mask)</div><div class='del'>-{</div><div class='del'>-	u32 val = _iwl_legacy_read32(priv, reg) | mask;</div><div class='del'>-	IWL_DEBUG_IO(priv, "set_bit(0x%08X, 0x%08X) = 0x%08X\n", reg,</div><div class='del'>-							mask, val);</div><div class='del'>-	_iwl_legacy_write32(priv, reg, val);</div><div class='del'>-}</div><div class='del'>-static inline void iwl_legacy_set_bit(struct iwl_priv *p, u32 r, u32 m)</div><div class='del'>-{</div><div class='del'>-	unsigned long reg_flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;p-&gt;reg_lock, reg_flags);</div><div class='del'>-	__iwl_legacy_set_bit(__FILE__, __LINE__, p, r, m);</div><div class='del'>-	spin_unlock_irqrestore(&amp;p-&gt;reg_lock, reg_flags);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void iwl_legacy_set_bit(struct iwl_priv *p, u32 r, u32 m)</div><div class='del'>-{</div><div class='del'>-	unsigned long reg_flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;p-&gt;reg_lock, reg_flags);</div><div class='del'>-	_iwl_legacy_set_bit(p, r, m);</div><div class='del'>-	spin_unlock_irqrestore(&amp;p-&gt;reg_lock, reg_flags);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-_iwl_legacy_clear_bit(struct iwl_priv *priv, u32 reg, u32 mask)</div><div class='del'>-{</div><div class='del'>-	_iwl_legacy_write32(priv, reg, _iwl_legacy_read32(priv, reg) &amp; ~mask);</div><div class='del'>-}</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-static inline void</div><div class='del'>-__iwl_legacy_clear_bit(const char *f, u32 l,</div><div class='del'>-				   struct iwl_priv *priv, u32 reg, u32 mask)</div><div class='del'>-{</div><div class='del'>-	u32 val = _iwl_legacy_read32(priv, reg) &amp; ~mask;</div><div class='del'>-	IWL_DEBUG_IO(priv, "clear_bit(0x%08X, 0x%08X) = 0x%08X\n", reg, mask, val);</div><div class='del'>-	_iwl_legacy_write32(priv, reg, val);</div><div class='del'>-}</div><div class='del'>-static inline void iwl_legacy_clear_bit(struct iwl_priv *p, u32 r, u32 m)</div><div class='del'>-{</div><div class='del'>-	unsigned long reg_flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;p-&gt;reg_lock, reg_flags);</div><div class='del'>-	__iwl_legacy_clear_bit(__FILE__, __LINE__, p, r, m);</div><div class='del'>-	spin_unlock_irqrestore(&amp;p-&gt;reg_lock, reg_flags);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void iwl_legacy_clear_bit(struct iwl_priv *p, u32 r, u32 m)</div><div class='del'>-{</div><div class='del'>-	unsigned long reg_flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;p-&gt;reg_lock, reg_flags);</div><div class='del'>-	_iwl_legacy_clear_bit(p, r, m);</div><div class='del'>-	spin_unlock_irqrestore(&amp;p-&gt;reg_lock, reg_flags);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline int _iwl_legacy_grab_nic_access(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	/* this bit wakes up the NIC */</div><div class='del'>-	_iwl_legacy_set_bit(priv, CSR_GP_CNTRL,</div><div class='del'>-				CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * These bits say the device is running, and should keep running for</div><div class='del'>-	 * at least a short while (at least as long as MAC_ACCESS_REQ stays 1),</div><div class='del'>-	 * but they do not indicate that embedded SRAM is restored yet;</div><div class='del'>-	 * 3945 and 4965 have volatile SRAM, and must save/restore contents</div><div class='del'>-	 * to/from host DRAM when sleeping/waking for power-saving.</div><div class='del'>-	 * Each direction takes approximately 1/4 millisecond; with this</div><div class='del'>-	 * overhead, it's a good idea to grab and hold MAC_ACCESS_REQUEST if a</div><div class='del'>-	 * series of register accesses are expected (e.g. reading Event Log),</div><div class='del'>-	 * to keep device from sleeping.</div><div class='del'>-	 *</div><div class='del'>-	 * CSR_UCODE_DRV_GP1 register bit MAC_SLEEP == 0 indicates that</div><div class='del'>-	 * SRAM is okay/restored.  We don't check that here because this call</div><div class='del'>-	 * is just for hardware register access; but GP1 MAC_SLEEP check is a</div><div class='del'>-	 * good idea before accessing 3945/4965 SRAM (e.g. reading Event Log).</div><div class='del'>-	 *</div><div class='del'>-	 */</div><div class='del'>-	ret = _iwl_legacy_poll_bit(priv, CSR_GP_CNTRL,</div><div class='del'>-			   CSR_GP_CNTRL_REG_VAL_MAC_ACCESS_EN,</div><div class='del'>-			   (CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY |</div><div class='del'>-			    CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP), 15000);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		val = _iwl_legacy_read32(priv, CSR_GP_CNTRL);</div><div class='del'>-		IWL_ERR(priv,</div><div class='del'>-			"MAC is in deep sleep!.  CSR_GP_CNTRL = 0x%08X\n", val);</div><div class='del'>-		_iwl_legacy_write32(priv, CSR_RESET,</div><div class='del'>-				CSR_RESET_REG_FLAG_FORCE_NMI);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-static inline int __iwl_legacy_grab_nic_access(const char *f, u32 l,</div><div class='del'>-					       struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	IWL_DEBUG_IO(priv, "grabbing nic access - %s %d\n", f, l);</div><div class='del'>-	return _iwl_legacy_grab_nic_access(priv);</div><div class='del'>-}</div><div class='del'>-#define iwl_grab_nic_access(priv) \</div><div class='del'>-	__iwl_legacy_grab_nic_access(__FILE__, __LINE__, priv)</div><div class='del'>-#else</div><div class='del'>-#define iwl_grab_nic_access(priv) \</div><div class='del'>-	_iwl_legacy_grab_nic_access(priv)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline void _iwl_legacy_release_nic_access(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	_iwl_legacy_clear_bit(priv, CSR_GP_CNTRL,</div><div class='del'>-			CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='del'>-}</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-static inline void __iwl_legacy_release_nic_access(const char *f, u32 l,</div><div class='del'>-					    struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_IO(priv, "releasing nic access - %s %d\n", f, l);</div><div class='del'>-	_iwl_legacy_release_nic_access(priv);</div><div class='del'>-}</div><div class='del'>-#define iwl_release_nic_access(priv) \</div><div class='del'>-	__iwl_legacy_release_nic_access(__FILE__, __LINE__, priv)</div><div class='del'>-#else</div><div class='del'>-#define iwl_release_nic_access(priv) \</div><div class='del'>-	_iwl_legacy_release_nic_access(priv)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline u32 _iwl_legacy_read_direct32(struct iwl_priv *priv, u32 reg)</div><div class='del'>-{</div><div class='del'>-	return _iwl_legacy_read32(priv, reg);</div><div class='del'>-}</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-static inline u32 __iwl_legacy_read_direct32(const char *f, u32 l,</div><div class='del'>-					struct iwl_priv *priv, u32 reg)</div><div class='del'>-{</div><div class='del'>-	u32 value = _iwl_legacy_read_direct32(priv, reg);</div><div class='del'>-	IWL_DEBUG_IO(priv,</div><div class='del'>-			"read_direct32(0x%4X) = 0x%08x - %s %d\n", reg, value,</div><div class='del'>-		     f, l);</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-static inline u32 iwl_legacy_read_direct32(struct iwl_priv *priv, u32 reg)</div><div class='del'>-{</div><div class='del'>-	u32 value;</div><div class='del'>-	unsigned long reg_flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-	iwl_grab_nic_access(priv);</div><div class='del'>-	value = __iwl_legacy_read_direct32(__FILE__, __LINE__, priv, reg);</div><div class='del'>-	iwl_release_nic_access(priv);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-static inline u32 iwl_legacy_read_direct32(struct iwl_priv *priv, u32 reg)</div><div class='del'>-{</div><div class='del'>-	u32 value;</div><div class='del'>-	unsigned long reg_flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-	iwl_grab_nic_access(priv);</div><div class='del'>-	value = _iwl_legacy_read_direct32(priv, reg);</div><div class='del'>-	iwl_release_nic_access(priv);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-	return value;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline void _iwl_legacy_write_direct32(struct iwl_priv *priv,</div><div class='del'>-					 u32 reg, u32 value)</div><div class='del'>-{</div><div class='del'>-	_iwl_legacy_write32(priv, reg, value);</div><div class='del'>-}</div><div class='del'>-static inline void</div><div class='del'>-iwl_legacy_write_direct32(struct iwl_priv *priv, u32 reg, u32 value)</div><div class='del'>-{</div><div class='del'>-	unsigned long reg_flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-	if (!iwl_grab_nic_access(priv)) {</div><div class='del'>-		_iwl_legacy_write_direct32(priv, reg, value);</div><div class='del'>-		iwl_release_nic_access(priv);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void iwl_legacy_write_reg_buf(struct iwl_priv *priv,</div><div class='del'>-					       u32 reg, u32 len, u32 *values)</div><div class='del'>-{</div><div class='del'>-	u32 count = sizeof(u32);</div><div class='del'>-</div><div class='del'>-	if ((priv != NULL) &amp;&amp; (values != NULL)) {</div><div class='del'>-		for (; 0 &lt; len; len -= count, reg += count, values++)</div><div class='del'>-			iwl_legacy_write_direct32(priv, reg, *values);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int _iwl_legacy_poll_direct_bit(struct iwl_priv *priv, u32 addr,</div><div class='del'>-				       u32 mask, int timeout)</div><div class='del'>-{</div><div class='del'>-	int t = 0;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		if ((iwl_legacy_read_direct32(priv, addr) &amp; mask) == mask)</div><div class='del'>-			return t;</div><div class='del'>-		udelay(IWL_POLL_INTERVAL);</div><div class='del'>-		t += IWL_POLL_INTERVAL;</div><div class='del'>-	} while (t &lt; timeout);</div><div class='del'>-</div><div class='del'>-	return -ETIMEDOUT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-static inline int __iwl_legacy_poll_direct_bit(const char *f, u32 l,</div><div class='del'>-					    struct iwl_priv *priv,</div><div class='del'>-					    u32 addr, u32 mask, int timeout)</div><div class='del'>-{</div><div class='del'>-	int ret  = _iwl_legacy_poll_direct_bit(priv, addr, mask, timeout);</div><div class='del'>-</div><div class='del'>-	if (unlikely(ret == -ETIMEDOUT))</div><div class='del'>-		IWL_DEBUG_IO(priv, "poll_direct_bit(0x%08X, 0x%08X) - "</div><div class='del'>-			     "timedout - %s %d\n", addr, mask, f, l);</div><div class='del'>-	else</div><div class='del'>-		IWL_DEBUG_IO(priv, "poll_direct_bit(0x%08X, 0x%08X) = 0x%08X "</div><div class='del'>-			     "- %s %d\n", addr, mask, ret, f, l);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#define iwl_poll_direct_bit(priv, addr, mask, timeout) \</div><div class='del'>-__iwl_legacy_poll_direct_bit(__FILE__, __LINE__, priv, addr, mask, timeout)</div><div class='del'>-#else</div><div class='del'>-#define iwl_poll_direct_bit _iwl_legacy_poll_direct_bit</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline u32 _iwl_legacy_read_prph(struct iwl_priv *priv, u32 reg)</div><div class='del'>-{</div><div class='del'>-	_iwl_legacy_write_direct32(priv, HBUS_TARG_PRPH_RADDR, reg | (3 &lt;&lt; 24));</div><div class='del'>-	rmb();</div><div class='del'>-	return _iwl_legacy_read_direct32(priv, HBUS_TARG_PRPH_RDAT);</div><div class='del'>-}</div><div class='del'>-static inline u32 iwl_legacy_read_prph(struct iwl_priv *priv, u32 reg)</div><div class='del'>-{</div><div class='del'>-	unsigned long reg_flags;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-	iwl_grab_nic_access(priv);</div><div class='del'>-	val = _iwl_legacy_read_prph(priv, reg);</div><div class='del'>-	iwl_release_nic_access(priv);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void _iwl_legacy_write_prph(struct iwl_priv *priv,</div><div class='del'>-					     u32 addr, u32 val)</div><div class='del'>-{</div><div class='del'>-	_iwl_legacy_write_direct32(priv, HBUS_TARG_PRPH_WADDR,</div><div class='del'>-			      ((addr &amp; 0x0000FFFF) | (3 &lt;&lt; 24)));</div><div class='del'>-	wmb();</div><div class='del'>-	_iwl_legacy_write_direct32(priv, HBUS_TARG_PRPH_WDAT, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-iwl_legacy_write_prph(struct iwl_priv *priv, u32 addr, u32 val)</div><div class='del'>-{</div><div class='del'>-	unsigned long reg_flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-	if (!iwl_grab_nic_access(priv)) {</div><div class='del'>-		_iwl_legacy_write_prph(priv, addr, val);</div><div class='del'>-		iwl_release_nic_access(priv);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define _iwl_legacy_set_bits_prph(priv, reg, mask) \</div><div class='del'>-_iwl_legacy_write_prph(priv, reg, (_iwl_legacy_read_prph(priv, reg) | mask))</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-iwl_legacy_set_bits_prph(struct iwl_priv *priv, u32 reg, u32 mask)</div><div class='del'>-{</div><div class='del'>-	unsigned long reg_flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-	iwl_grab_nic_access(priv);</div><div class='del'>-	_iwl_legacy_set_bits_prph(priv, reg, mask);</div><div class='del'>-	iwl_release_nic_access(priv);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define _iwl_legacy_set_bits_mask_prph(priv, reg, bits, mask) \</div><div class='del'>-_iwl_legacy_write_prph(priv, reg,				\</div><div class='del'>-		 ((_iwl_legacy_read_prph(priv, reg) &amp; mask) | bits))</div><div class='del'>-</div><div class='del'>-static inline void iwl_legacy_set_bits_mask_prph(struct iwl_priv *priv, u32 reg,</div><div class='del'>-				u32 bits, u32 mask)</div><div class='del'>-{</div><div class='del'>-	unsigned long reg_flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-	iwl_grab_nic_access(priv);</div><div class='del'>-	_iwl_legacy_set_bits_mask_prph(priv, reg, bits, mask);</div><div class='del'>-	iwl_release_nic_access(priv);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void iwl_legacy_clear_bits_prph(struct iwl_priv</div><div class='del'>-						 *priv, u32 reg, u32 mask)</div><div class='del'>-{</div><div class='del'>-	unsigned long reg_flags;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-	iwl_grab_nic_access(priv);</div><div class='del'>-	val = _iwl_legacy_read_prph(priv, reg);</div><div class='del'>-	_iwl_legacy_write_prph(priv, reg, (val &amp; ~mask));</div><div class='del'>-	iwl_release_nic_access(priv);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 iwl_legacy_read_targ_mem(struct iwl_priv *priv, u32 addr)</div><div class='del'>-{</div><div class='del'>-	unsigned long reg_flags;</div><div class='del'>-	u32 value;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-	iwl_grab_nic_access(priv);</div><div class='del'>-</div><div class='del'>-	_iwl_legacy_write_direct32(priv, HBUS_TARG_MEM_RADDR, addr);</div><div class='del'>-	rmb();</div><div class='del'>-	value = _iwl_legacy_read_direct32(priv, HBUS_TARG_MEM_RDAT);</div><div class='del'>-</div><div class='del'>-	iwl_release_nic_access(priv);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-iwl_legacy_write_targ_mem(struct iwl_priv *priv, u32 addr, u32 val)</div><div class='del'>-{</div><div class='del'>-	unsigned long reg_flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-	if (!iwl_grab_nic_access(priv)) {</div><div class='del'>-		_iwl_legacy_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);</div><div class='del'>-		wmb();</div><div class='del'>-		_iwl_legacy_write_direct32(priv, HBUS_TARG_MEM_WDAT, val);</div><div class='del'>-		iwl_release_nic_access(priv);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-iwl_legacy_write_targ_mem_buf(struct iwl_priv *priv, u32 addr,</div><div class='del'>-					  u32 len, u32 *values)</div><div class='del'>-{</div><div class='del'>-	unsigned long reg_flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-	if (!iwl_grab_nic_access(priv)) {</div><div class='del'>-		_iwl_legacy_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);</div><div class='del'>-		wmb();</div><div class='del'>-		for (; 0 &lt; len; len -= sizeof(u32), values++)</div><div class='del'>-			_iwl_legacy_write_direct32(priv,</div><div class='del'>-					HBUS_TARG_MEM_WDAT, *values);</div><div class='del'>-</div><div class='del'>-		iwl_release_nic_access(priv);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;reg_lock, reg_flags);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-led.c b/drivers/net/wireless/iwlegacy/iwl-led.c<br/>deleted file mode 100644<br/>index dc568a474c5d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-led.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-led.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,205 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-</div><div class='del'>-/* default: IWL_LED_BLINK(0) using blinking index table */</div><div class='del'>-static int led_mode;</div><div class='del'>-module_param(led_mode, int, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(led_mode, "0=system default, "</div><div class='del'>-		"1=On(RF On)/Off(RF Off), 2=blinking");</div><div class='del'>-</div><div class='del'>-/* Throughput		OFF time(ms)	ON time (ms)</div><div class='del'>- *	&gt;300			25		25</div><div class='del'>- *	&gt;200 to 300		40		40</div><div class='del'>- *	&gt;100 to 200		55		55</div><div class='del'>- *	&gt;70 to 100		65		65</div><div class='del'>- *	&gt;50 to 70		75		75</div><div class='del'>- *	&gt;20 to 50		85		85</div><div class='del'>- *	&gt;10 to 20		95		95</div><div class='del'>- *	&gt;5 to 10		110		110</div><div class='del'>- *	&gt;1 to 5			130		130</div><div class='del'>- *	&gt;0 to 1			167		167</div><div class='del'>- *	&lt;=0					SOLID ON</div><div class='del'>- */</div><div class='del'>-static const struct ieee80211_tpt_blink iwl_blink[] = {</div><div class='del'>-	{ .throughput = 0, .blink_time = 334 },</div><div class='del'>-	{ .throughput = 1 * 1024 - 1, .blink_time = 260 },</div><div class='del'>-	{ .throughput = 5 * 1024 - 1, .blink_time = 220 },</div><div class='del'>-	{ .throughput = 10 * 1024 - 1, .blink_time = 190 },</div><div class='del'>-	{ .throughput = 20 * 1024 - 1, .blink_time = 170 },</div><div class='del'>-	{ .throughput = 50 * 1024 - 1, .blink_time = 150 },</div><div class='del'>-	{ .throughput = 70 * 1024 - 1, .blink_time = 130 },</div><div class='del'>-	{ .throughput = 100 * 1024 - 1, .blink_time = 110 },</div><div class='del'>-	{ .throughput = 200 * 1024 - 1, .blink_time = 80 },</div><div class='del'>-	{ .throughput = 300 * 1024 - 1, .blink_time = 50 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Adjust led blink rate to compensate on a MAC Clock difference on every HW</div><div class='del'>- * Led blink rate analysis showed an average deviation of 0% on 3945,</div><div class='del'>- * 5% on 4965 HW.</div><div class='del'>- * Need to compensate on the led on/off time per HW according to the deviation</div><div class='del'>- * to achieve the desired led frequency</div><div class='del'>- * The calculation is: (100-averageDeviation)/100 * blinkTime</div><div class='del'>- * For code efficiency the calculation will be:</div><div class='del'>- *     compensation = (100 - averageDeviation) * 64 / 100</div><div class='del'>- *     NewBlinkTime = (compensation * BlinkTime) / 64</div><div class='del'>- */</div><div class='del'>-static inline u8 iwl_legacy_blink_compensation(struct iwl_priv *priv,</div><div class='del'>-				    u8 time, u16 compensation)</div><div class='del'>-{</div><div class='del'>-	if (!compensation) {</div><div class='del'>-		IWL_ERR(priv, "undefined blink compensation: "</div><div class='del'>-			"use pre-defined blinking time\n");</div><div class='del'>-		return time;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (u8)((time * compensation) &gt;&gt; 6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set led pattern command */</div><div class='del'>-static int iwl_legacy_led_cmd(struct iwl_priv *priv,</div><div class='del'>-		       unsigned long on,</div><div class='del'>-		       unsigned long off)</div><div class='del'>-{</div><div class='del'>-	struct iwl_led_cmd led_cmd = {</div><div class='del'>-		.id = IWL_LED_LINK,</div><div class='del'>-		.interval = IWL_DEF_LED_INTRVL</div><div class='del'>-	};</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(STATUS_READY, &amp;priv-&gt;status))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;blink_on == on &amp;&amp; priv-&gt;blink_off == off)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (off == 0) {</div><div class='del'>-		/* led is SOLID_ON */</div><div class='del'>-		on = IWL_LED_SOLID;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_LED(priv, "Led blink time compensation=%u\n",</div><div class='del'>-			priv-&gt;cfg-&gt;base_params-&gt;led_compensation);</div><div class='del'>-	led_cmd.on = iwl_legacy_blink_compensation(priv, on,</div><div class='del'>-				priv-&gt;cfg-&gt;base_params-&gt;led_compensation);</div><div class='del'>-	led_cmd.off = iwl_legacy_blink_compensation(priv, off,</div><div class='del'>-				priv-&gt;cfg-&gt;base_params-&gt;led_compensation);</div><div class='del'>-</div><div class='del'>-	ret = priv-&gt;cfg-&gt;ops-&gt;led-&gt;cmd(priv, &amp;led_cmd);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		priv-&gt;blink_on = on;</div><div class='del'>-		priv-&gt;blink_off = off;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_legacy_led_brightness_set(struct led_classdev *led_cdev,</div><div class='del'>-				   enum led_brightness brightness)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = container_of(led_cdev, struct iwl_priv, led);</div><div class='del'>-	unsigned long on = 0;</div><div class='del'>-</div><div class='del'>-	if (brightness &gt; 0)</div><div class='del'>-		on = IWL_LED_SOLID;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_led_cmd(priv, on, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_legacy_led_blink_set(struct led_classdev *led_cdev,</div><div class='del'>-			     unsigned long *delay_on,</div><div class='del'>-			     unsigned long *delay_off)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = container_of(led_cdev, struct iwl_priv, led);</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_led_cmd(priv, *delay_on, *delay_off);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_legacy_leds_init(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int mode = led_mode;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (mode == IWL_LED_DEFAULT)</div><div class='del'>-		mode = priv-&gt;cfg-&gt;led_mode;</div><div class='del'>-</div><div class='del'>-	priv-&gt;led.name = kasprintf(GFP_KERNEL, "%s-led",</div><div class='del'>-				   wiphy_name(priv-&gt;hw-&gt;wiphy));</div><div class='del'>-	priv-&gt;led.brightness_set = iwl_legacy_led_brightness_set;</div><div class='del'>-	priv-&gt;led.blink_set = iwl_legacy_led_blink_set;</div><div class='del'>-	priv-&gt;led.max_brightness = 1;</div><div class='del'>-</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case IWL_LED_DEFAULT:</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		break;</div><div class='del'>-	case IWL_LED_BLINK:</div><div class='del'>-		priv-&gt;led.default_trigger =</div><div class='del'>-			ieee80211_create_tpt_led_trigger(priv-&gt;hw,</div><div class='del'>-					IEEE80211_TPT_LEDTRIG_FL_CONNECTED,</div><div class='del'>-					iwl_blink, ARRAY_SIZE(iwl_blink));</div><div class='del'>-		break;</div><div class='del'>-	case IWL_LED_RF_STATE:</div><div class='del'>-		priv-&gt;led.default_trigger =</div><div class='del'>-			ieee80211_get_radio_led_name(priv-&gt;hw);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = led_classdev_register(&amp;priv-&gt;pci_dev-&gt;dev, &amp;priv-&gt;led);</div><div class='del'>-	if (ret) {</div><div class='del'>-		kfree(priv-&gt;led.name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;led_registered = true;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_leds_init);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_leds_exit(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	if (!priv-&gt;led_registered)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	led_classdev_unregister(&amp;priv-&gt;led);</div><div class='del'>-	kfree(priv-&gt;led.name);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_leds_exit);</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-led.h b/drivers/net/wireless/iwlegacy/iwl-led.h<br/>deleted file mode 100644<br/>index f0791f70f79d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-led.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-led.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifndef __iwl_legacy_leds_h__</div><div class='del'>-#define __iwl_legacy_leds_h__</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct iwl_priv;</div><div class='del'>-</div><div class='del'>-#define IWL_LED_SOLID 11</div><div class='del'>-#define IWL_DEF_LED_INTRVL cpu_to_le32(1000)</div><div class='del'>-</div><div class='del'>-#define IWL_LED_ACTIVITY       (0&lt;&lt;1)</div><div class='del'>-#define IWL_LED_LINK           (1&lt;&lt;1)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * LED mode</div><div class='del'>- *    IWL_LED_DEFAULT:  use device default</div><div class='del'>- *    IWL_LED_RF_STATE: turn LED on/off based on RF state</div><div class='del'>- *			LED ON  = RF ON</div><div class='del'>- *			LED OFF = RF OFF</div><div class='del'>- *    IWL_LED_BLINK:    adjust led blink rate based on blink table</div><div class='del'>- */</div><div class='del'>-enum iwl_led_mode {</div><div class='del'>-	IWL_LED_DEFAULT,</div><div class='del'>-	IWL_LED_RF_STATE,</div><div class='del'>-	IWL_LED_BLINK,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void iwl_legacy_leds_init(struct iwl_priv *priv);</div><div class='del'>-void iwl_legacy_leds_exit(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-#endif /* __iwl_legacy_leds_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-legacy-rs.h b/drivers/net/wireless/iwlegacy/iwl-legacy-rs.h<br/>deleted file mode 100644<br/>index 38647e481eb0..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-legacy-rs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-legacy-rs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,456 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifndef __iwl_legacy_rs_h__</div><div class='del'>-#define __iwl_legacy_rs_h__</div><div class='del'>-</div><div class='del'>-struct iwl_rate_info {</div><div class='del'>-	u8 plcp;	/* uCode API:  IWL_RATE_6M_PLCP, etc. */</div><div class='del'>-	u8 plcp_siso;	/* uCode API:  IWL_RATE_SISO_6M_PLCP, etc. */</div><div class='del'>-	u8 plcp_mimo2;	/* uCode API:  IWL_RATE_MIMO2_6M_PLCP, etc. */</div><div class='del'>-	u8 ieee;	/* MAC header:  IWL_RATE_6M_IEEE, etc. */</div><div class='del'>-	u8 prev_ieee;    /* previous rate in IEEE speeds */</div><div class='del'>-	u8 next_ieee;    /* next rate in IEEE speeds */</div><div class='del'>-	u8 prev_rs;      /* previous rate used in rs algo */</div><div class='del'>-	u8 next_rs;      /* next rate used in rs algo */</div><div class='del'>-	u8 prev_rs_tgg;  /* previous rate used in TGG rs algo */</div><div class='del'>-	u8 next_rs_tgg;  /* next rate used in TGG rs algo */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl3945_rate_info {</div><div class='del'>-	u8 plcp;		/* uCode API:  IWL_RATE_6M_PLCP, etc. */</div><div class='del'>-	u8 ieee;		/* MAC header:  IWL_RATE_6M_IEEE, etc. */</div><div class='del'>-	u8 prev_ieee;		/* previous rate in IEEE speeds */</div><div class='del'>-	u8 next_ieee;		/* next rate in IEEE speeds */</div><div class='del'>-	u8 prev_rs;		/* previous rate used in rs algo */</div><div class='del'>-	u8 next_rs;		/* next rate used in rs algo */</div><div class='del'>-	u8 prev_rs_tgg;		/* previous rate used in TGG rs algo */</div><div class='del'>-	u8 next_rs_tgg;		/* next rate used in TGG rs algo */</div><div class='del'>-	u8 table_rs_index;	/* index in rate scale table cmd */</div><div class='del'>-	u8 prev_table_rs;	/* prev in rate table cmd */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * These serve as indexes into</div><div class='del'>- * struct iwl_rate_info iwlegacy_rates[IWL_RATE_COUNT];</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	IWL_RATE_1M_INDEX = 0,</div><div class='del'>-	IWL_RATE_2M_INDEX,</div><div class='del'>-	IWL_RATE_5M_INDEX,</div><div class='del'>-	IWL_RATE_11M_INDEX,</div><div class='del'>-	IWL_RATE_6M_INDEX,</div><div class='del'>-	IWL_RATE_9M_INDEX,</div><div class='del'>-	IWL_RATE_12M_INDEX,</div><div class='del'>-	IWL_RATE_18M_INDEX,</div><div class='del'>-	IWL_RATE_24M_INDEX,</div><div class='del'>-	IWL_RATE_36M_INDEX,</div><div class='del'>-	IWL_RATE_48M_INDEX,</div><div class='del'>-	IWL_RATE_54M_INDEX,</div><div class='del'>-	IWL_RATE_60M_INDEX,</div><div class='del'>-	IWL_RATE_COUNT,</div><div class='del'>-	IWL_RATE_COUNT_LEGACY = IWL_RATE_COUNT - 1,	/* Excluding 60M */</div><div class='del'>-	IWL_RATE_COUNT_3945 = IWL_RATE_COUNT - 1,</div><div class='del'>-	IWL_RATE_INVM_INDEX = IWL_RATE_COUNT,</div><div class='del'>-	IWL_RATE_INVALID = IWL_RATE_COUNT,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	IWL_RATE_6M_INDEX_TABLE = 0,</div><div class='del'>-	IWL_RATE_9M_INDEX_TABLE,</div><div class='del'>-	IWL_RATE_12M_INDEX_TABLE,</div><div class='del'>-	IWL_RATE_18M_INDEX_TABLE,</div><div class='del'>-	IWL_RATE_24M_INDEX_TABLE,</div><div class='del'>-	IWL_RATE_36M_INDEX_TABLE,</div><div class='del'>-	IWL_RATE_48M_INDEX_TABLE,</div><div class='del'>-	IWL_RATE_54M_INDEX_TABLE,</div><div class='del'>-	IWL_RATE_1M_INDEX_TABLE,</div><div class='del'>-	IWL_RATE_2M_INDEX_TABLE,</div><div class='del'>-	IWL_RATE_5M_INDEX_TABLE,</div><div class='del'>-	IWL_RATE_11M_INDEX_TABLE,</div><div class='del'>-	IWL_RATE_INVM_INDEX_TABLE = IWL_RATE_INVM_INDEX - 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	IWL_FIRST_OFDM_RATE = IWL_RATE_6M_INDEX,</div><div class='del'>-	IWL39_LAST_OFDM_RATE = IWL_RATE_54M_INDEX,</div><div class='del'>-	IWL_LAST_OFDM_RATE = IWL_RATE_60M_INDEX,</div><div class='del'>-	IWL_FIRST_CCK_RATE = IWL_RATE_1M_INDEX,</div><div class='del'>-	IWL_LAST_CCK_RATE = IWL_RATE_11M_INDEX,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* #define vs. enum to keep from defaulting to 'large integer' */</div><div class='del'>-#define	IWL_RATE_6M_MASK   (1 &lt;&lt; IWL_RATE_6M_INDEX)</div><div class='del'>-#define	IWL_RATE_9M_MASK   (1 &lt;&lt; IWL_RATE_9M_INDEX)</div><div class='del'>-#define	IWL_RATE_12M_MASK  (1 &lt;&lt; IWL_RATE_12M_INDEX)</div><div class='del'>-#define	IWL_RATE_18M_MASK  (1 &lt;&lt; IWL_RATE_18M_INDEX)</div><div class='del'>-#define	IWL_RATE_24M_MASK  (1 &lt;&lt; IWL_RATE_24M_INDEX)</div><div class='del'>-#define	IWL_RATE_36M_MASK  (1 &lt;&lt; IWL_RATE_36M_INDEX)</div><div class='del'>-#define	IWL_RATE_48M_MASK  (1 &lt;&lt; IWL_RATE_48M_INDEX)</div><div class='del'>-#define	IWL_RATE_54M_MASK  (1 &lt;&lt; IWL_RATE_54M_INDEX)</div><div class='del'>-#define IWL_RATE_60M_MASK  (1 &lt;&lt; IWL_RATE_60M_INDEX)</div><div class='del'>-#define	IWL_RATE_1M_MASK   (1 &lt;&lt; IWL_RATE_1M_INDEX)</div><div class='del'>-#define	IWL_RATE_2M_MASK   (1 &lt;&lt; IWL_RATE_2M_INDEX)</div><div class='del'>-#define	IWL_RATE_5M_MASK   (1 &lt;&lt; IWL_RATE_5M_INDEX)</div><div class='del'>-#define	IWL_RATE_11M_MASK  (1 &lt;&lt; IWL_RATE_11M_INDEX)</div><div class='del'>-</div><div class='del'>-/* uCode API values for legacy bit rates, both OFDM and CCK */</div><div class='del'>-enum {</div><div class='del'>-	IWL_RATE_6M_PLCP  = 13,</div><div class='del'>-	IWL_RATE_9M_PLCP  = 15,</div><div class='del'>-	IWL_RATE_12M_PLCP = 5,</div><div class='del'>-	IWL_RATE_18M_PLCP = 7,</div><div class='del'>-	IWL_RATE_24M_PLCP = 9,</div><div class='del'>-	IWL_RATE_36M_PLCP = 11,</div><div class='del'>-	IWL_RATE_48M_PLCP = 1,</div><div class='del'>-	IWL_RATE_54M_PLCP = 3,</div><div class='del'>-	IWL_RATE_60M_PLCP = 3,/*FIXME:RS:should be removed*/</div><div class='del'>-	IWL_RATE_1M_PLCP  = 10,</div><div class='del'>-	IWL_RATE_2M_PLCP  = 20,</div><div class='del'>-	IWL_RATE_5M_PLCP  = 55,</div><div class='del'>-	IWL_RATE_11M_PLCP = 110,</div><div class='del'>-	/*FIXME:RS:add IWL_RATE_LEGACY_INVM_PLCP = 0,*/</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* uCode API values for OFDM high-throughput (HT) bit rates */</div><div class='del'>-enum {</div><div class='del'>-	IWL_RATE_SISO_6M_PLCP = 0,</div><div class='del'>-	IWL_RATE_SISO_12M_PLCP = 1,</div><div class='del'>-	IWL_RATE_SISO_18M_PLCP = 2,</div><div class='del'>-	IWL_RATE_SISO_24M_PLCP = 3,</div><div class='del'>-	IWL_RATE_SISO_36M_PLCP = 4,</div><div class='del'>-	IWL_RATE_SISO_48M_PLCP = 5,</div><div class='del'>-	IWL_RATE_SISO_54M_PLCP = 6,</div><div class='del'>-	IWL_RATE_SISO_60M_PLCP = 7,</div><div class='del'>-	IWL_RATE_MIMO2_6M_PLCP  = 0x8,</div><div class='del'>-	IWL_RATE_MIMO2_12M_PLCP = 0x9,</div><div class='del'>-	IWL_RATE_MIMO2_18M_PLCP = 0xa,</div><div class='del'>-	IWL_RATE_MIMO2_24M_PLCP = 0xb,</div><div class='del'>-	IWL_RATE_MIMO2_36M_PLCP = 0xc,</div><div class='del'>-	IWL_RATE_MIMO2_48M_PLCP = 0xd,</div><div class='del'>-	IWL_RATE_MIMO2_54M_PLCP = 0xe,</div><div class='del'>-	IWL_RATE_MIMO2_60M_PLCP = 0xf,</div><div class='del'>-	IWL_RATE_SISO_INVM_PLCP,</div><div class='del'>-	IWL_RATE_MIMO2_INVM_PLCP = IWL_RATE_SISO_INVM_PLCP,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* MAC header values for bit rates */</div><div class='del'>-enum {</div><div class='del'>-	IWL_RATE_6M_IEEE  = 12,</div><div class='del'>-	IWL_RATE_9M_IEEE  = 18,</div><div class='del'>-	IWL_RATE_12M_IEEE = 24,</div><div class='del'>-	IWL_RATE_18M_IEEE = 36,</div><div class='del'>-	IWL_RATE_24M_IEEE = 48,</div><div class='del'>-	IWL_RATE_36M_IEEE = 72,</div><div class='del'>-	IWL_RATE_48M_IEEE = 96,</div><div class='del'>-	IWL_RATE_54M_IEEE = 108,</div><div class='del'>-	IWL_RATE_60M_IEEE = 120,</div><div class='del'>-	IWL_RATE_1M_IEEE  = 2,</div><div class='del'>-	IWL_RATE_2M_IEEE  = 4,</div><div class='del'>-	IWL_RATE_5M_IEEE  = 11,</div><div class='del'>-	IWL_RATE_11M_IEEE = 22,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IWL_CCK_BASIC_RATES_MASK    \</div><div class='del'>-	(IWL_RATE_1M_MASK          | \</div><div class='del'>-	IWL_RATE_2M_MASK)</div><div class='del'>-</div><div class='del'>-#define IWL_CCK_RATES_MASK          \</div><div class='del'>-	(IWL_CCK_BASIC_RATES_MASK  | \</div><div class='del'>-	IWL_RATE_5M_MASK          | \</div><div class='del'>-	IWL_RATE_11M_MASK)</div><div class='del'>-</div><div class='del'>-#define IWL_OFDM_BASIC_RATES_MASK   \</div><div class='del'>-	(IWL_RATE_6M_MASK         | \</div><div class='del'>-	IWL_RATE_12M_MASK         | \</div><div class='del'>-	IWL_RATE_24M_MASK)</div><div class='del'>-</div><div class='del'>-#define IWL_OFDM_RATES_MASK         \</div><div class='del'>-	(IWL_OFDM_BASIC_RATES_MASK | \</div><div class='del'>-	IWL_RATE_9M_MASK          | \</div><div class='del'>-	IWL_RATE_18M_MASK         | \</div><div class='del'>-	IWL_RATE_36M_MASK         | \</div><div class='del'>-	IWL_RATE_48M_MASK         | \</div><div class='del'>-	IWL_RATE_54M_MASK)</div><div class='del'>-</div><div class='del'>-#define IWL_BASIC_RATES_MASK         \</div><div class='del'>-	(IWL_OFDM_BASIC_RATES_MASK | \</div><div class='del'>-	 IWL_CCK_BASIC_RATES_MASK)</div><div class='del'>-</div><div class='del'>-#define IWL_RATES_MASK ((1 &lt;&lt; IWL_RATE_COUNT) - 1)</div><div class='del'>-#define IWL_RATES_MASK_3945 ((1 &lt;&lt; IWL_RATE_COUNT_3945) - 1)</div><div class='del'>-</div><div class='del'>-#define IWL_INVALID_VALUE    -1</div><div class='del'>-</div><div class='del'>-#define IWL_MIN_RSSI_VAL                 -100</div><div class='del'>-#define IWL_MAX_RSSI_VAL                    0</div><div class='del'>-</div><div class='del'>-/* These values specify how many Tx frame attempts before</div><div class='del'>- * searching for a new modulation mode */</div><div class='del'>-#define IWL_LEGACY_FAILURE_LIMIT	160</div><div class='del'>-#define IWL_LEGACY_SUCCESS_LIMIT	480</div><div class='del'>-#define IWL_LEGACY_TABLE_COUNT		160</div><div class='del'>-</div><div class='del'>-#define IWL_NONE_LEGACY_FAILURE_LIMIT	400</div><div class='del'>-#define IWL_NONE_LEGACY_SUCCESS_LIMIT	4500</div><div class='del'>-#define IWL_NONE_LEGACY_TABLE_COUNT	1500</div><div class='del'>-</div><div class='del'>-/* Success ratio (ACKed / attempted tx frames) values (perfect is 128 * 100) */</div><div class='del'>-#define IWL_RS_GOOD_RATIO		12800	/* 100% */</div><div class='del'>-#define IWL_RATE_SCALE_SWITCH		10880	/*  85% */</div><div class='del'>-#define IWL_RATE_HIGH_TH		10880	/*  85% */</div><div class='del'>-#define IWL_RATE_INCREASE_TH		6400	/*  50% */</div><div class='del'>-#define IWL_RATE_DECREASE_TH		1920	/*  15% */</div><div class='del'>-</div><div class='del'>-/* possible actions when in legacy mode */</div><div class='del'>-#define IWL_LEGACY_SWITCH_ANTENNA1      0</div><div class='del'>-#define IWL_LEGACY_SWITCH_ANTENNA2      1</div><div class='del'>-#define IWL_LEGACY_SWITCH_SISO          2</div><div class='del'>-#define IWL_LEGACY_SWITCH_MIMO2_AB      3</div><div class='del'>-#define IWL_LEGACY_SWITCH_MIMO2_AC      4</div><div class='del'>-#define IWL_LEGACY_SWITCH_MIMO2_BC      5</div><div class='del'>-</div><div class='del'>-/* possible actions when in siso mode */</div><div class='del'>-#define IWL_SISO_SWITCH_ANTENNA1        0</div><div class='del'>-#define IWL_SISO_SWITCH_ANTENNA2        1</div><div class='del'>-#define IWL_SISO_SWITCH_MIMO2_AB        2</div><div class='del'>-#define IWL_SISO_SWITCH_MIMO2_AC        3</div><div class='del'>-#define IWL_SISO_SWITCH_MIMO2_BC        4</div><div class='del'>-#define IWL_SISO_SWITCH_GI              5</div><div class='del'>-</div><div class='del'>-/* possible actions when in mimo mode */</div><div class='del'>-#define IWL_MIMO2_SWITCH_ANTENNA1       0</div><div class='del'>-#define IWL_MIMO2_SWITCH_ANTENNA2       1</div><div class='del'>-#define IWL_MIMO2_SWITCH_SISO_A         2</div><div class='del'>-#define IWL_MIMO2_SWITCH_SISO_B         3</div><div class='del'>-#define IWL_MIMO2_SWITCH_SISO_C         4</div><div class='del'>-#define IWL_MIMO2_SWITCH_GI             5</div><div class='del'>-</div><div class='del'>-#define IWL_MAX_SEARCH IWL_MIMO2_SWITCH_GI</div><div class='del'>-</div><div class='del'>-#define IWL_ACTION_LIMIT		3	/* # possible actions */</div><div class='del'>-</div><div class='del'>-#define LQ_SIZE		2	/* 2 mode tables:  "Active" and "Search" */</div><div class='del'>-</div><div class='del'>-/* load per tid defines for A-MPDU activation */</div><div class='del'>-#define IWL_AGG_TPT_THREHOLD	0</div><div class='del'>-#define IWL_AGG_LOAD_THRESHOLD	10</div><div class='del'>-#define IWL_AGG_ALL_TID		0xff</div><div class='del'>-#define TID_QUEUE_CELL_SPACING	50	/*mS */</div><div class='del'>-#define TID_QUEUE_MAX_SIZE	20</div><div class='del'>-#define TID_ROUND_VALUE		5	/* mS */</div><div class='del'>-#define TID_MAX_LOAD_COUNT	8</div><div class='del'>-</div><div class='del'>-#define TID_MAX_TIME_DIFF ((TID_QUEUE_MAX_SIZE - 1) * TID_QUEUE_CELL_SPACING)</div><div class='del'>-#define TIME_WRAP_AROUND(x, y) (((y) &gt; (x)) ? (y) - (x) : (0-(x)) + (y))</div><div class='del'>-</div><div class='del'>-extern const struct iwl_rate_info iwlegacy_rates[IWL_RATE_COUNT];</div><div class='del'>-</div><div class='del'>-enum iwl_table_type {</div><div class='del'>-	LQ_NONE,</div><div class='del'>-	LQ_G,		/* legacy types */</div><div class='del'>-	LQ_A,</div><div class='del'>-	LQ_SISO,	/* high-throughput types */</div><div class='del'>-	LQ_MIMO2,</div><div class='del'>-	LQ_MAX,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define is_legacy(tbl) (((tbl) == LQ_G) || ((tbl) == LQ_A))</div><div class='del'>-#define is_siso(tbl) ((tbl) == LQ_SISO)</div><div class='del'>-#define is_mimo2(tbl) ((tbl) == LQ_MIMO2)</div><div class='del'>-#define is_mimo(tbl) (is_mimo2(tbl))</div><div class='del'>-#define is_Ht(tbl) (is_siso(tbl) || is_mimo(tbl))</div><div class='del'>-#define is_a_band(tbl) ((tbl) == LQ_A)</div><div class='del'>-#define is_g_and(tbl) ((tbl) == LQ_G)</div><div class='del'>-</div><div class='del'>-#define	ANT_NONE	0x0</div><div class='del'>-#define	ANT_A		BIT(0)</div><div class='del'>-#define	ANT_B		BIT(1)</div><div class='del'>-#define	ANT_AB		(ANT_A | ANT_B)</div><div class='del'>-#define ANT_C		BIT(2)</div><div class='del'>-#define	ANT_AC		(ANT_A | ANT_C)</div><div class='del'>-#define ANT_BC		(ANT_B | ANT_C)</div><div class='del'>-#define ANT_ABC		(ANT_AB | ANT_C)</div><div class='del'>-</div><div class='del'>-#define IWL_MAX_MCS_DISPLAY_SIZE	12</div><div class='del'>-</div><div class='del'>-struct iwl_rate_mcs_info {</div><div class='del'>-	char	mbps[IWL_MAX_MCS_DISPLAY_SIZE];</div><div class='del'>-	char	mcs[IWL_MAX_MCS_DISPLAY_SIZE];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_rate_scale_data -- tx success history for one rate</div><div class='del'>- */</div><div class='del'>-struct iwl_rate_scale_data {</div><div class='del'>-	u64 data;		/* bitmap of successful frames */</div><div class='del'>-	s32 success_counter;	/* number of frames successful */</div><div class='del'>-	s32 success_ratio;	/* per-cent * 128  */</div><div class='del'>-	s32 counter;		/* number of frames attempted */</div><div class='del'>-	s32 average_tpt;	/* success ratio * expected throughput */</div><div class='del'>-	unsigned long stamp;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_scale_tbl_info -- tx params and success history for all rates</div><div class='del'>- *</div><div class='del'>- * There are two of these in struct iwl_lq_sta,</div><div class='del'>- * one for "active", and one for "search".</div><div class='del'>- */</div><div class='del'>-struct iwl_scale_tbl_info {</div><div class='del'>-	enum iwl_table_type lq_type;</div><div class='del'>-	u8 ant_type;</div><div class='del'>-	u8 is_SGI;	/* 1 = short guard interval */</div><div class='del'>-	u8 is_ht40;	/* 1 = 40 MHz channel width */</div><div class='del'>-	u8 is_dup;	/* 1 = duplicated data streams */</div><div class='del'>-	u8 action;	/* change modulation; IWL_[LEGACY/SISO/MIMO]_SWITCH_* */</div><div class='del'>-	u8 max_search;	/* maximun number of tables we can search */</div><div class='del'>-	s32 *expected_tpt;	/* throughput metrics; expected_tpt_G, etc. */</div><div class='del'>-	u32 current_rate;  /* rate_n_flags, uCode API format */</div><div class='del'>-	struct iwl_rate_scale_data win[IWL_RATE_COUNT]; /* rate histories */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl_traffic_load {</div><div class='del'>-	unsigned long time_stamp;	/* age of the oldest statistics */</div><div class='del'>-	u32 packet_count[TID_QUEUE_MAX_SIZE];   /* packet count in this time</div><div class='del'>-						 * slice */</div><div class='del'>-	u32 total;			/* total num of packets during the</div><div class='del'>-					 * last TID_MAX_TIME_DIFF */</div><div class='del'>-	u8 queue_count;			/* number of queues that has</div><div class='del'>-					 * been used since the last cleanup */</div><div class='del'>-	u8 head;			/* start of the circular buffer */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iwl_lq_sta -- driver's rate scaling private structure</div><div class='del'>- *</div><div class='del'>- * Pointer to this gets passed back and forth between driver and mac80211.</div><div class='del'>- */</div><div class='del'>-struct iwl_lq_sta {</div><div class='del'>-	u8 active_tbl;		/* index of active table, range 0-1 */</div><div class='del'>-	u8 enable_counter;	/* indicates HT mode */</div><div class='del'>-	u8 stay_in_tbl;		/* 1: disallow, 0: allow search for new mode */</div><div class='del'>-	u8 search_better_tbl;	/* 1: currently trying alternate mode */</div><div class='del'>-	s32 last_tpt;</div><div class='del'>-</div><div class='del'>-	/* The following determine when to search for a new mode */</div><div class='del'>-	u32 table_count_limit;</div><div class='del'>-	u32 max_failure_limit;	/* # failed frames before new search */</div><div class='del'>-	u32 max_success_limit;	/* # successful frames before new search */</div><div class='del'>-	u32 table_count;</div><div class='del'>-	u32 total_failed;	/* total failed frames, any/all rates */</div><div class='del'>-	u32 total_success;	/* total successful frames, any/all rates */</div><div class='del'>-	u64 flush_timer;	/* time staying in mode before new search */</div><div class='del'>-</div><div class='del'>-	u8 action_counter;	/* # mode-switch actions tried */</div><div class='del'>-	u8 is_green;</div><div class='del'>-	u8 is_dup;</div><div class='del'>-	enum ieee80211_band band;</div><div class='del'>-</div><div class='del'>-	/* The following are bitmaps of rates; IWL_RATE_6M_MASK, etc. */</div><div class='del'>-	u32 supp_rates;</div><div class='del'>-	u16 active_legacy_rate;</div><div class='del'>-	u16 active_siso_rate;</div><div class='del'>-	u16 active_mimo2_rate;</div><div class='del'>-	s8 max_rate_idx;     /* Max rate set by user */</div><div class='del'>-	u8 missed_rate_counter;</div><div class='del'>-</div><div class='del'>-	struct iwl_link_quality_cmd lq;</div><div class='del'>-	struct iwl_scale_tbl_info lq_info[LQ_SIZE]; /* "active", "search" */</div><div class='del'>-	struct iwl_traffic_load load[TID_MAX_LOAD_COUNT];</div><div class='del'>-	u8 tx_agg_tid_en;</div><div class='del'>-#ifdef CONFIG_MAC80211_DEBUGFS</div><div class='del'>-	struct dentry *rs_sta_dbgfs_scale_table_file;</div><div class='del'>-	struct dentry *rs_sta_dbgfs_stats_table_file;</div><div class='del'>-	struct dentry *rs_sta_dbgfs_rate_scale_data_file;</div><div class='del'>-	struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file;</div><div class='del'>-	u32 dbg_fixed_rate;</div><div class='del'>-#endif</div><div class='del'>-	struct iwl_priv *drv;</div><div class='del'>-</div><div class='del'>-	/* used to be in sta_info */</div><div class='del'>-	int last_txrate_idx;</div><div class='del'>-	/* last tx rate_n_flags */</div><div class='del'>-	u32 last_rate_n_flags;</div><div class='del'>-	/* packets destined for this STA are aggregated */</div><div class='del'>-	u8 is_agg;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline u8 iwl4965_num_of_ant(u8 mask)</div><div class='del'>-{</div><div class='del'>-	return  !!((mask) &amp; ANT_A) +</div><div class='del'>-		!!((mask) &amp; ANT_B) +</div><div class='del'>-		!!((mask) &amp; ANT_C);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 iwl4965_first_antenna(u8 mask)</div><div class='del'>-{</div><div class='del'>-	if (mask &amp; ANT_A)</div><div class='del'>-		return ANT_A;</div><div class='del'>-	if (mask &amp; ANT_B)</div><div class='del'>-		return ANT_B;</div><div class='del'>-	return ANT_C;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_rate_scale_init - Initialize the rate scale table based on assoc info</div><div class='del'>- *</div><div class='del'>- * The specific throughput table used is based on the type of network</div><div class='del'>- * the associated with, including A, B, G, and G w/ TGG protection</div><div class='del'>- */</div><div class='del'>-extern void iwl3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id);</div><div class='del'>-</div><div class='del'>-/* Initialize station's rate scaling information after adding station */</div><div class='del'>-extern void iwl4965_rs_rate_init(struct iwl_priv *priv,</div><div class='del'>-			     struct ieee80211_sta *sta, u8 sta_id);</div><div class='del'>-extern void iwl3945_rs_rate_init(struct iwl_priv *priv,</div><div class='del'>-				 struct ieee80211_sta *sta, u8 sta_id);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_rate_control_register - Register the rate control algorithm callbacks</div><div class='del'>- *</div><div class='del'>- * Since the rate control algorithm is hardware specific, there is no need</div><div class='del'>- * or reason to place it as a stand alone module.  The driver can call</div><div class='del'>- * iwl_rate_control_register in order to register the rate control callbacks</div><div class='del'>- * with the mac80211 subsystem.  This should be performed prior to calling</div><div class='del'>- * ieee80211_register_hw</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-extern int iwl4965_rate_control_register(void);</div><div class='del'>-extern int iwl3945_rate_control_register(void);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_rate_control_unregister - Unregister the rate control callbacks</div><div class='del'>- *</div><div class='del'>- * This should be called after calling ieee80211_unregister_hw, but before</div><div class='del'>- * the driver is unloaded.</div><div class='del'>- */</div><div class='del'>-extern void iwl4965_rate_control_unregister(void);</div><div class='del'>-extern void iwl3945_rate_control_unregister(void);</div><div class='del'>-</div><div class='del'>-#endif /* __iwl_legacy_rs__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-power.c b/drivers/net/wireless/iwlegacy/iwl-power.c<br/>deleted file mode 100644<br/>index 903ef0d6d6cb..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-power.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-power.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,165 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Portions of this file are derived from the ipw3945 project, as well</div><div class='del'>- * as portions of the ieee80211 subsystem header files.</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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-eeprom.h"</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-#include "iwl-commands.h"</div><div class='del'>-#include "iwl-debug.h"</div><div class='del'>-#include "iwl-power.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Setting power level allows the card to go to sleep when not busy.</div><div class='del'>- *</div><div class='del'>- * We calculate a sleep command based on the required latency, which</div><div class='del'>- * we get from mac80211. In order to handle thermal throttling, we can</div><div class='del'>- * also use pre-defined power levels.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This defines the old power levels. They are still used by default</div><div class='del'>- * (level 1) and for thermal throttle (levels 3 through 5)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct iwl_power_vec_entry {</div><div class='del'>-	struct iwl_powertable_cmd cmd;</div><div class='del'>-	u8 no_dtim;	/* number of skip dtim */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void iwl_legacy_power_sleep_cam_cmd(struct iwl_priv *priv,</div><div class='del'>-				    struct iwl_powertable_cmd *cmd)</div><div class='del'>-{</div><div class='del'>-	memset(cmd, 0, sizeof(*cmd));</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;power_data.pci_pm)</div><div class='del'>-		cmd-&gt;flags |= IWL_POWER_PCI_PM_MSK;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_POWER(priv, "Sleep command for CAM\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-iwl_legacy_set_power(struct iwl_priv *priv, struct iwl_powertable_cmd *cmd)</div><div class='del'>-{</div><div class='del'>-	IWL_DEBUG_POWER(priv, "Sending power/sleep command\n");</div><div class='del'>-	IWL_DEBUG_POWER(priv, "Flags value = 0x%08X\n", cmd-&gt;flags);</div><div class='del'>-	IWL_DEBUG_POWER(priv, "Tx timeout = %u\n",</div><div class='del'>-					le32_to_cpu(cmd-&gt;tx_data_timeout));</div><div class='del'>-	IWL_DEBUG_POWER(priv, "Rx timeout = %u\n",</div><div class='del'>-					le32_to_cpu(cmd-&gt;rx_data_timeout));</div><div class='del'>-	IWL_DEBUG_POWER(priv,</div><div class='del'>-			"Sleep interval vector = { %d , %d , %d , %d , %d }\n",</div><div class='del'>-			le32_to_cpu(cmd-&gt;sleep_interval[0]),</div><div class='del'>-			le32_to_cpu(cmd-&gt;sleep_interval[1]),</div><div class='del'>-			le32_to_cpu(cmd-&gt;sleep_interval[2]),</div><div class='del'>-			le32_to_cpu(cmd-&gt;sleep_interval[3]),</div><div class='del'>-			le32_to_cpu(cmd-&gt;sleep_interval[4]));</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_send_cmd_pdu(priv, POWER_TABLE_CMD,</div><div class='del'>-				sizeof(struct iwl_powertable_cmd), cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-iwl_legacy_power_set_mode(struct iwl_priv *priv, struct iwl_powertable_cmd *cmd,</div><div class='del'>-		       bool force)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	bool update_chains;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	/* Don't update the RX chain when chain noise calibration is running */</div><div class='del'>-	update_chains = priv-&gt;chain_noise_data.state == IWL_CHAIN_NOISE_DONE ||</div><div class='del'>-			priv-&gt;chain_noise_data.state == IWL_CHAIN_NOISE_ALIVE;</div><div class='del'>-</div><div class='del'>-	if (!memcmp(&amp;priv-&gt;power_data.sleep_cmd, cmd, sizeof(*cmd)) &amp;&amp; !force)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_ready_rf(priv))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	/* scan complete use sleep_power_next, need to be updated */</div><div class='del'>-	memcpy(&amp;priv-&gt;power_data.sleep_cmd_next, cmd, sizeof(*cmd));</div><div class='del'>-	if (test_bit(STATUS_SCANNING, &amp;priv-&gt;status) &amp;&amp; !force) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Defer power set mode while scanning\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cmd-&gt;flags &amp; IWL_POWER_DRIVER_ALLOW_SLEEP_MSK)</div><div class='del'>-		set_bit(STATUS_POWER_PMI, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_set_power(priv, cmd);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		if (!(cmd-&gt;flags &amp; IWL_POWER_DRIVER_ALLOW_SLEEP_MSK))</div><div class='del'>-			clear_bit(STATUS_POWER_PMI, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;cfg-&gt;ops-&gt;lib-&gt;update_chain_flags &amp;&amp; update_chains)</div><div class='del'>-			priv-&gt;cfg-&gt;ops-&gt;lib-&gt;update_chain_flags(priv);</div><div class='del'>-		else if (priv-&gt;cfg-&gt;ops-&gt;lib-&gt;update_chain_flags)</div><div class='del'>-			IWL_DEBUG_POWER(priv,</div><div class='del'>-					"Cannot update the power, chain noise "</div><div class='del'>-					"calibration running: %d\n",</div><div class='del'>-					priv-&gt;chain_noise_data.state);</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;priv-&gt;power_data.sleep_cmd, cmd, sizeof(*cmd));</div><div class='del'>-	} else</div><div class='del'>-		IWL_ERR(priv, "set power fail, ret = %d", ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_legacy_power_update_mode(struct iwl_priv *priv, bool force)</div><div class='del'>-{</div><div class='del'>-	struct iwl_powertable_cmd cmd;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_power_sleep_cam_cmd(priv, &amp;cmd);</div><div class='del'>-	return iwl_legacy_power_set_mode(priv, &amp;cmd, force);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_power_update_mode);</div><div class='del'>-</div><div class='del'>-/* initialize to default */</div><div class='del'>-void iwl_legacy_power_initialize(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	u16 lctl = iwl_legacy_pcie_link_ctl(priv);</div><div class='del'>-</div><div class='del'>-	priv-&gt;power_data.pci_pm = !(lctl &amp; PCI_CFG_LINK_CTRL_VAL_L0S_EN);</div><div class='del'>-</div><div class='del'>-	priv-&gt;power_data.debug_sleep_level_override = -1;</div><div class='del'>-</div><div class='del'>-	memset(&amp;priv-&gt;power_data.sleep_cmd, 0,</div><div class='del'>-		sizeof(priv-&gt;power_data.sleep_cmd));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_power_initialize);</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-power.h b/drivers/net/wireless/iwlegacy/iwl-power.h<br/>deleted file mode 100644<br/>index d30b36acdc4a..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-power.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-power.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Portions of this file are derived from the ipw3945 project, as well</div><div class='del'>- * as portions of the ieee80211 subsystem header files.</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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef __iwl_legacy_power_setting_h__</div><div class='del'>-#define __iwl_legacy_power_setting_h__</div><div class='del'>-</div><div class='del'>-#include "iwl-commands.h"</div><div class='del'>-</div><div class='del'>-enum iwl_power_level {</div><div class='del'>-	IWL_POWER_INDEX_1,</div><div class='del'>-	IWL_POWER_INDEX_2,</div><div class='del'>-	IWL_POWER_INDEX_3,</div><div class='del'>-	IWL_POWER_INDEX_4,</div><div class='del'>-	IWL_POWER_INDEX_5,</div><div class='del'>-	IWL_POWER_NUM</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl_power_mgr {</div><div class='del'>-	struct iwl_powertable_cmd sleep_cmd;</div><div class='del'>-	struct iwl_powertable_cmd sleep_cmd_next;</div><div class='del'>-	int debug_sleep_level_override;</div><div class='del'>-	bool pci_pm;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-iwl_legacy_power_set_mode(struct iwl_priv *priv, struct iwl_powertable_cmd *cmd,</div><div class='del'>-		       bool force);</div><div class='del'>-int iwl_legacy_power_update_mode(struct iwl_priv *priv, bool force);</div><div class='del'>-void iwl_legacy_power_initialize(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-#endif  /* __iwl_legacy_power_setting_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-rx.c b/drivers/net/wireless/iwlegacy/iwl-rx.c<br/>deleted file mode 100644<br/>index f4d21ec22497..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-rx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-rx.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,282 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Portions of this file are derived from the ipw3945 project, as well</div><div class='del'>- * as portions of the ieee80211 subsystem header files.</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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-#include "iwl-eeprom.h"</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-sta.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-#include "iwl-helpers.h"</div><div class='del'>-/************************** RX-FUNCTIONS ****************************/</div><div class='del'>-/*</div><div class='del'>- * Rx theory of operation</div><div class='del'>- *</div><div class='del'>- * Driver allocates a circular buffer of Receive Buffer Descriptors (RBDs),</div><div class='del'>- * each of which point to Receive Buffers to be filled by the NIC.  These get</div><div class='del'>- * used not only for Rx frames, but for any command response or notification</div><div class='del'>- * from the NIC.  The driver and NIC manage the Rx buffers by means</div><div class='del'>- * of indexes into the circular buffer.</div><div class='del'>- *</div><div class='del'>- * Rx Queue Indexes</div><div class='del'>- * The host/firmware share two index registers for managing the Rx buffers.</div><div class='del'>- *</div><div class='del'>- * The READ index maps to the first position that the firmware may be writing</div><div class='del'>- * to -- the driver can read up to (but not including) this position and get</div><div class='del'>- * good data.</div><div class='del'>- * The READ index is managed by the firmware once the card is enabled.</div><div class='del'>- *</div><div class='del'>- * The WRITE index maps to the last position the driver has read from -- the</div><div class='del'>- * position preceding WRITE is the last slot the firmware can place a packet.</div><div class='del'>- *</div><div class='del'>- * The queue is empty (no good data) if WRITE = READ - 1, and is full if</div><div class='del'>- * WRITE = READ.</div><div class='del'>- *</div><div class='del'>- * During initialization, the host sets up the READ queue position to the first</div><div class='del'>- * INDEX position, and WRITE to the last (READ - 1 wrapped)</div><div class='del'>- *</div><div class='del'>- * When the firmware places a packet in a buffer, it will advance the READ index</div><div class='del'>- * and fire the RX interrupt.  The driver can then query the READ index and</div><div class='del'>- * process as many packets as possible, moving the WRITE index forward as it</div><div class='del'>- * resets the Rx queue buffers with new memory.</div><div class='del'>- *</div><div class='del'>- * The management in the driver is as follows:</div><div class='del'>- * + A list of pre-allocated SKBs is stored in iwl-&gt;rxq-&gt;rx_free.  When</div><div class='del'>- *   iwl-&gt;rxq-&gt;free_count drops to or below RX_LOW_WATERMARK, work is scheduled</div><div class='del'>- *   to replenish the iwl-&gt;rxq-&gt;rx_free.</div><div class='del'>- * + In iwl_rx_replenish (scheduled) if 'processed' != 'read' then the</div><div class='del'>- *   iwl-&gt;rxq is replenished and the READ INDEX is updated (updating the</div><div class='del'>- *   'processed' and 'read' driver indexes as well)</div><div class='del'>- * + A received packet is processed and handed to the kernel network stack,</div><div class='del'>- *   detached from the iwl-&gt;rxq.  The driver 'processed' index is updated.</div><div class='del'>- * + The Host/Firmware iwl-&gt;rxq is replenished at tasklet time from the rx_free</div><div class='del'>- *   list. If there are no allocated buffers in iwl-&gt;rxq-&gt;rx_free, the READ</div><div class='del'>- *   INDEX is not incremented and iwl-&gt;status(RX_STALLED) is set.  If there</div><div class='del'>- *   were enough free buffers and RX_STALLED is set it is cleared.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Driver sequence:</div><div class='del'>- *</div><div class='del'>- * iwl_legacy_rx_queue_alloc()   Allocates rx_free</div><div class='del'>- * iwl_rx_replenish()     Replenishes rx_free list from rx_used, and calls</div><div class='del'>- *                            iwl_rx_queue_restock</div><div class='del'>- * iwl_rx_queue_restock() Moves available buffers from rx_free into Rx</div><div class='del'>- *                            queue, updates firmware pointers, and updates</div><div class='del'>- *                            the WRITE index.  If insufficient rx_free buffers</div><div class='del'>- *                            are available, schedules iwl_rx_replenish</div><div class='del'>- *</div><div class='del'>- * -- enable interrupts --</div><div class='del'>- * ISR - iwl_rx()         Detach iwl_rx_mem_buffers from pool up to the</div><div class='del'>- *                            READ INDEX, detaching the SKB from the pool.</div><div class='del'>- *                            Moves the packet buffer from queue to rx_used.</div><div class='del'>- *                            Calls iwl_rx_queue_restock to refill any empty</div><div class='del'>- *                            slots.</div><div class='del'>- * ...</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_rx_queue_space - Return number of free slots available in queue.</div><div class='del'>- */</div><div class='del'>-int iwl_legacy_rx_queue_space(const struct iwl_rx_queue *q)</div><div class='del'>-{</div><div class='del'>-	int s = q-&gt;read - q-&gt;write;</div><div class='del'>-	if (s &lt;= 0)</div><div class='del'>-		s += RX_QUEUE_SIZE;</div><div class='del'>-	/* keep some buffer to not confuse full and empty queue */</div><div class='del'>-	s -= 2;</div><div class='del'>-	if (s &lt; 0)</div><div class='del'>-		s = 0;</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_rx_queue_space);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_rx_queue_update_write_ptr - Update the write pointer for the RX queue</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-iwl_legacy_rx_queue_update_write_ptr(struct iwl_priv *priv,</div><div class='del'>-					struct iwl_rx_queue *q)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u32 rx_wrt_ptr_reg = priv-&gt;hw_params.rx_wrt_ptr_reg;</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;q-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	if (q-&gt;need_update == 0)</div><div class='del'>-		goto exit_unlock;</div><div class='del'>-</div><div class='del'>-	/* If power-saving is in use, make sure device is awake */</div><div class='del'>-	if (test_bit(STATUS_POWER_PMI, &amp;priv-&gt;status)) {</div><div class='del'>-		reg = iwl_read32(priv, CSR_UCODE_DRV_GP1);</div><div class='del'>-</div><div class='del'>-		if (reg &amp; CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {</div><div class='del'>-			IWL_DEBUG_INFO(priv,</div><div class='del'>-				"Rx queue requesting wakeup,"</div><div class='del'>-				" GP1 = 0x%x\n", reg);</div><div class='del'>-			iwl_legacy_set_bit(priv, CSR_GP_CNTRL,</div><div class='del'>-				CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='del'>-			goto exit_unlock;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		q-&gt;write_actual = (q-&gt;write &amp; ~0x7);</div><div class='del'>-		iwl_legacy_write_direct32(priv, rx_wrt_ptr_reg,</div><div class='del'>-				q-&gt;write_actual);</div><div class='del'>-</div><div class='del'>-	/* Else device is assumed to be awake */</div><div class='del'>-	} else {</div><div class='del'>-		/* Device expects a multiple of 8 */</div><div class='del'>-		q-&gt;write_actual = (q-&gt;write &amp; ~0x7);</div><div class='del'>-		iwl_legacy_write_direct32(priv, rx_wrt_ptr_reg,</div><div class='del'>-			q-&gt;write_actual);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	q-&gt;need_update = 0;</div><div class='del'>-</div><div class='del'>- exit_unlock:</div><div class='del'>-	spin_unlock_irqrestore(&amp;q-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_rx_queue_update_write_ptr);</div><div class='del'>-</div><div class='del'>-int iwl_legacy_rx_queue_alloc(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_queue *rxq = &amp;priv-&gt;rxq;</div><div class='del'>-	struct device *dev = &amp;priv-&gt;pci_dev-&gt;dev;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;rxq-&gt;lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;rxq-&gt;rx_free);</div><div class='del'>-	INIT_LIST_HEAD(&amp;rxq-&gt;rx_used);</div><div class='del'>-</div><div class='del'>-	/* Alloc the circular buffer of Read Buffer Descriptors (RBDs) */</div><div class='del'>-	rxq-&gt;bd = dma_alloc_coherent(dev, 4 * RX_QUEUE_SIZE, &amp;rxq-&gt;bd_dma,</div><div class='del'>-				     GFP_KERNEL);</div><div class='del'>-	if (!rxq-&gt;bd)</div><div class='del'>-		goto err_bd;</div><div class='del'>-</div><div class='del'>-	rxq-&gt;rb_stts = dma_alloc_coherent(dev, sizeof(struct iwl_rb_status),</div><div class='del'>-					  &amp;rxq-&gt;rb_stts_dma, GFP_KERNEL);</div><div class='del'>-	if (!rxq-&gt;rb_stts)</div><div class='del'>-		goto err_rb;</div><div class='del'>-</div><div class='del'>-	/* Fill the rx_used queue with _all_ of the Rx buffers */</div><div class='del'>-	for (i = 0; i &lt; RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++)</div><div class='del'>-		list_add_tail(&amp;rxq-&gt;pool[i].list, &amp;rxq-&gt;rx_used);</div><div class='del'>-</div><div class='del'>-	/* Set us so that we have processed and used all buffers, but have</div><div class='del'>-	 * not restocked the Rx queue with fresh buffers */</div><div class='del'>-	rxq-&gt;read = rxq-&gt;write = 0;</div><div class='del'>-	rxq-&gt;write_actual = 0;</div><div class='del'>-	rxq-&gt;free_count = 0;</div><div class='del'>-	rxq-&gt;need_update = 0;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_rb:</div><div class='del'>-	dma_free_coherent(&amp;priv-&gt;pci_dev-&gt;dev, 4 * RX_QUEUE_SIZE, rxq-&gt;bd,</div><div class='del'>-			  rxq-&gt;bd_dma);</div><div class='del'>-err_bd:</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_rx_queue_alloc);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void iwl_legacy_rx_spectrum_measure_notif(struct iwl_priv *priv,</div><div class='del'>-					  struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_spectrum_notification *report = &amp;(pkt-&gt;u.spectrum_notif);</div><div class='del'>-</div><div class='del'>-	if (!report-&gt;state) {</div><div class='del'>-		IWL_DEBUG_11H(priv,</div><div class='del'>-			"Spectrum Measure Notification: Start\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;priv-&gt;measure_report, report, sizeof(*report));</div><div class='del'>-	priv-&gt;measurement_status |= MEASUREMENT_READY;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_rx_spectrum_measure_notif);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * returns non-zero if packet should be dropped</div><div class='del'>- */</div><div class='del'>-int iwl_legacy_set_decrypted_flag(struct iwl_priv *priv,</div><div class='del'>-			   struct ieee80211_hdr *hdr,</div><div class='del'>-			   u32 decrypt_res,</div><div class='del'>-			   struct ieee80211_rx_status *stats)</div><div class='del'>-{</div><div class='del'>-	u16 fc = le16_to_cpu(hdr-&gt;frame_control);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * All contexts have the same setting here due to it being</div><div class='del'>-	 * a module parameter, so OK to check any context.</div><div class='del'>-	 */</div><div class='del'>-	if (priv-&gt;contexts[IWL_RXON_CTX_BSS].active.filter_flags &amp;</div><div class='del'>-						RXON_FILTER_DIS_DECRYPT_MSK)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!(fc &amp; IEEE80211_FCTL_PROTECTED))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RX(priv, "decrypt_res:0x%x\n", decrypt_res);</div><div class='del'>-	switch (decrypt_res &amp; RX_RES_STATUS_SEC_TYPE_MSK) {</div><div class='del'>-	case RX_RES_STATUS_SEC_TYPE_TKIP:</div><div class='del'>-		/* The uCode has got a bad phase 1 Key, pushes the packet.</div><div class='del'>-		 * Decryption will be done in SW. */</div><div class='del'>-		if ((decrypt_res &amp; RX_RES_STATUS_DECRYPT_TYPE_MSK) ==</div><div class='del'>-		    RX_RES_STATUS_BAD_KEY_TTAK)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	case RX_RES_STATUS_SEC_TYPE_WEP:</div><div class='del'>-		if ((decrypt_res &amp; RX_RES_STATUS_DECRYPT_TYPE_MSK) ==</div><div class='del'>-		    RX_RES_STATUS_BAD_ICV_MIC) {</div><div class='del'>-			/* bad ICV, the packet is destroyed since the</div><div class='del'>-			 * decryption is inplace, drop it */</div><div class='del'>-			IWL_DEBUG_RX(priv, "Packet destroyed\n");</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	case RX_RES_STATUS_SEC_TYPE_CCMP:</div><div class='del'>-		if ((decrypt_res &amp; RX_RES_STATUS_DECRYPT_TYPE_MSK) ==</div><div class='del'>-		    RX_RES_STATUS_DECRYPT_OK) {</div><div class='del'>-			IWL_DEBUG_RX(priv, "hw decrypt successfully!!!\n");</div><div class='del'>-			stats-&gt;flag |= RX_FLAG_DECRYPTED;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_set_decrypted_flag);</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-scan.c b/drivers/net/wireless/iwlegacy/iwl-scan.c<br/>deleted file mode 100644<br/>index 521b73b527d3..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-scan.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-scan.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,550 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * GPL LICENSE SUMMARY</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2008 - 2011 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 Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-eeprom.h"</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-sta.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-#include "iwl-helpers.h"</div><div class='del'>-</div><div class='del'>-/* For active scan, listen ACTIVE_DWELL_TIME (msec) on each channel after</div><div class='del'>- * sending probe req.  This should be set long enough to hear probe responses</div><div class='del'>- * from more than one AP.  */</div><div class='del'>-#define IWL_ACTIVE_DWELL_TIME_24    (30)       /* all times in msec */</div><div class='del'>-#define IWL_ACTIVE_DWELL_TIME_52    (20)</div><div class='del'>-</div><div class='del'>-#define IWL_ACTIVE_DWELL_FACTOR_24GHZ (3)</div><div class='del'>-#define IWL_ACTIVE_DWELL_FACTOR_52GHZ (2)</div><div class='del'>-</div><div class='del'>-/* For passive scan, listen PASSIVE_DWELL_TIME (msec) on each channel.</div><div class='del'>- * Must be set longer than active dwell time.</div><div class='del'>- * For the most reliable scan, set &gt; AP beacon interval (typically 100msec). */</div><div class='del'>-#define IWL_PASSIVE_DWELL_TIME_24   (20)       /* all times in msec */</div><div class='del'>-#define IWL_PASSIVE_DWELL_TIME_52   (10)</div><div class='del'>-#define IWL_PASSIVE_DWELL_BASE      (100)</div><div class='del'>-#define IWL_CHANNEL_TUNE_TIME       5</div><div class='del'>-</div><div class='del'>-static int iwl_legacy_send_scan_abort(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct iwl_rx_packet *pkt;</div><div class='del'>-	struct iwl_host_cmd cmd = {</div><div class='del'>-		.id = REPLY_SCAN_ABORT_CMD,</div><div class='del'>-		.flags = CMD_WANT_SKB,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* Exit instantly with error when device is not ready</div><div class='del'>-	 * to receive scan abort command or it does not perform</div><div class='del'>-	 * hardware scan currently */</div><div class='del'>-	if (!test_bit(STATUS_READY, &amp;priv-&gt;status) ||</div><div class='del'>-	    !test_bit(STATUS_GEO_CONFIGURED, &amp;priv-&gt;status) ||</div><div class='del'>-	    !test_bit(STATUS_SCAN_HW, &amp;priv-&gt;status) ||</div><div class='del'>-	    test_bit(STATUS_FW_ERROR, &amp;priv-&gt;status) ||</div><div class='del'>-	    test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_send_cmd_sync(priv, &amp;cmd);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	pkt = (struct iwl_rx_packet *)cmd.reply_page;</div><div class='del'>-	if (pkt-&gt;u.status != CAN_ABORT_STATUS) {</div><div class='del'>-		/* The scan abort will return 1 for success or</div><div class='del'>-		 * 2 for "failure".  A failure condition can be</div><div class='del'>-		 * due to simply not being in an active scan which</div><div class='del'>-		 * can occur if we send the scan abort before we</div><div class='del'>-		 * the microcode has notified us that a scan is</div><div class='del'>-		 * completed. */</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "SCAN_ABORT ret %d.\n", pkt-&gt;u.status);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_legacy_free_pages(priv, cmd.reply_page);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_legacy_complete_scan(struct iwl_priv *priv, bool aborted)</div><div class='del'>-{</div><div class='del'>-	/* check if scan was requested from mac80211 */</div><div class='del'>-	if (priv-&gt;scan_request) {</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "Complete scan in mac80211\n");</div><div class='del'>-		ieee80211_scan_completed(priv-&gt;hw, aborted);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;scan_vif = NULL;</div><div class='del'>-	priv-&gt;scan_request = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_legacy_force_scan_end(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (!test_bit(STATUS_SCANNING, &amp;priv-&gt;status)) {</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "Forcing scan end while not scanning\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_SCAN(priv, "Forcing scan end\n");</div><div class='del'>-	clear_bit(STATUS_SCANNING, &amp;priv-&gt;status);</div><div class='del'>-	clear_bit(STATUS_SCAN_HW, &amp;priv-&gt;status);</div><div class='del'>-	clear_bit(STATUS_SCAN_ABORTING, &amp;priv-&gt;status);</div><div class='del'>-	iwl_legacy_complete_scan(priv, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_legacy_do_scan_abort(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (!test_bit(STATUS_SCANNING, &amp;priv-&gt;status)) {</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "Not performing scan to abort\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (test_and_set_bit(STATUS_SCAN_ABORTING, &amp;priv-&gt;status)) {</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "Scan abort in progress\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_send_scan_abort(priv);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "Send scan abort failed %d\n", ret);</div><div class='del'>-		iwl_legacy_force_scan_end(priv);</div><div class='del'>-	} else</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "Successfully send scan abort\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_scan_cancel - Cancel any currently executing HW scan</div><div class='del'>- */</div><div class='del'>-int iwl_legacy_scan_cancel(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	IWL_DEBUG_SCAN(priv, "Queuing abort scan\n");</div><div class='del'>-	queue_work(priv-&gt;workqueue, &amp;priv-&gt;abort_scan);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_scan_cancel);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_scan_cancel_timeout - Cancel any currently executing HW scan</div><div class='del'>- * @ms: amount of time to wait (in milliseconds) for scan to abort</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-int iwl_legacy_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms)</div><div class='del'>-{</div><div class='del'>-	unsigned long timeout = jiffies + msecs_to_jiffies(ms);</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_SCAN(priv, "Scan cancel timeout\n");</div><div class='del'>-</div><div class='del'>-	iwl_legacy_do_scan_abort(priv);</div><div class='del'>-</div><div class='del'>-	while (time_before_eq(jiffies, timeout)) {</div><div class='del'>-		if (!test_bit(STATUS_SCAN_HW, &amp;priv-&gt;status))</div><div class='del'>-			break;</div><div class='del'>-		msleep(20);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return test_bit(STATUS_SCAN_HW, &amp;priv-&gt;status);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_scan_cancel_timeout);</div><div class='del'>-</div><div class='del'>-/* Service response to REPLY_SCAN_CMD (0x80) */</div><div class='del'>-static void iwl_legacy_rx_reply_scan(struct iwl_priv *priv,</div><div class='del'>-			      struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_scanreq_notification *notif =</div><div class='del'>-	    (struct iwl_scanreq_notification *)pkt-&gt;u.raw;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_SCAN(priv, "Scan request status = 0x%x\n", notif-&gt;status);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Service SCAN_START_NOTIFICATION (0x82) */</div><div class='del'>-static void iwl_legacy_rx_scan_start_notif(struct iwl_priv *priv,</div><div class='del'>-				    struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_scanstart_notification *notif =</div><div class='del'>-	    (struct iwl_scanstart_notification *)pkt-&gt;u.raw;</div><div class='del'>-	priv-&gt;scan_start_tsf = le32_to_cpu(notif-&gt;tsf_low);</div><div class='del'>-	IWL_DEBUG_SCAN(priv, "Scan start: "</div><div class='del'>-		       "%d [802.11%s] "</div><div class='del'>-		       "(TSF: 0x%08X:%08X) - %d (beacon timer %u)\n",</div><div class='del'>-		       notif-&gt;channel,</div><div class='del'>-		       notif-&gt;band ? "bg" : "a",</div><div class='del'>-		       le32_to_cpu(notif-&gt;tsf_high),</div><div class='del'>-		       le32_to_cpu(notif-&gt;tsf_low),</div><div class='del'>-		       notif-&gt;status, notif-&gt;beacon_timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Service SCAN_RESULTS_NOTIFICATION (0x83) */</div><div class='del'>-static void iwl_legacy_rx_scan_results_notif(struct iwl_priv *priv,</div><div class='del'>-				      struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_scanresults_notification *notif =</div><div class='del'>-	    (struct iwl_scanresults_notification *)pkt-&gt;u.raw;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_SCAN(priv, "Scan ch.res: "</div><div class='del'>-		       "%d [802.11%s] "</div><div class='del'>-		       "(TSF: 0x%08X:%08X) - %d "</div><div class='del'>-		       "elapsed=%lu usec\n",</div><div class='del'>-		       notif-&gt;channel,</div><div class='del'>-		       notif-&gt;band ? "bg" : "a",</div><div class='del'>-		       le32_to_cpu(notif-&gt;tsf_high),</div><div class='del'>-		       le32_to_cpu(notif-&gt;tsf_low),</div><div class='del'>-		       le32_to_cpu(notif-&gt;statistics[0]),</div><div class='del'>-		       le32_to_cpu(notif-&gt;tsf_low) - priv-&gt;scan_start_tsf);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Service SCAN_COMPLETE_NOTIFICATION (0x84) */</div><div class='del'>-static void iwl_legacy_rx_scan_complete_notif(struct iwl_priv *priv,</div><div class='del'>-				       struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_scancomplete_notification *scan_notif = (void *)pkt-&gt;u.raw;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_SCAN(priv,</div><div class='del'>-			"Scan complete: %d channels (TSF 0x%08X:%08X) - %d\n",</div><div class='del'>-		       scan_notif-&gt;scanned_channels,</div><div class='del'>-		       scan_notif-&gt;tsf_low,</div><div class='del'>-		       scan_notif-&gt;tsf_high, scan_notif-&gt;status);</div><div class='del'>-</div><div class='del'>-	/* The HW is no longer scanning */</div><div class='del'>-	clear_bit(STATUS_SCAN_HW, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_SCAN(priv, "Scan on %sGHz took %dms\n",</div><div class='del'>-		       (priv-&gt;scan_band == IEEE80211_BAND_2GHZ) ? "2.4" : "5.2",</div><div class='del'>-		       jiffies_to_msecs(jiffies - priv-&gt;scan_start));</div><div class='del'>-</div><div class='del'>-	queue_work(priv-&gt;workqueue, &amp;priv-&gt;scan_completed);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_legacy_setup_rx_scan_handlers(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	/* scan handlers */</div><div class='del'>-	priv-&gt;rx_handlers[REPLY_SCAN_CMD] = iwl_legacy_rx_reply_scan;</div><div class='del'>-	priv-&gt;rx_handlers[SCAN_START_NOTIFICATION] =</div><div class='del'>-					iwl_legacy_rx_scan_start_notif;</div><div class='del'>-	priv-&gt;rx_handlers[SCAN_RESULTS_NOTIFICATION] =</div><div class='del'>-					iwl_legacy_rx_scan_results_notif;</div><div class='del'>-	priv-&gt;rx_handlers[SCAN_COMPLETE_NOTIFICATION] =</div><div class='del'>-					iwl_legacy_rx_scan_complete_notif;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_setup_rx_scan_handlers);</div><div class='del'>-</div><div class='del'>-inline u16 iwl_legacy_get_active_dwell_time(struct iwl_priv *priv,</div><div class='del'>-				     enum ieee80211_band band,</div><div class='del'>-				     u8 n_probes)</div><div class='del'>-{</div><div class='del'>-	if (band == IEEE80211_BAND_5GHZ)</div><div class='del'>-		return IWL_ACTIVE_DWELL_TIME_52 +</div><div class='del'>-			IWL_ACTIVE_DWELL_FACTOR_52GHZ * (n_probes + 1);</div><div class='del'>-	else</div><div class='del'>-		return IWL_ACTIVE_DWELL_TIME_24 +</div><div class='del'>-			IWL_ACTIVE_DWELL_FACTOR_24GHZ * (n_probes + 1);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_get_active_dwell_time);</div><div class='del'>-</div><div class='del'>-u16 iwl_legacy_get_passive_dwell_time(struct iwl_priv *priv,</div><div class='del'>-			       enum ieee80211_band band,</div><div class='del'>-			       struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-	u16 passive = (band == IEEE80211_BAND_2GHZ) ?</div><div class='del'>-	    IWL_PASSIVE_DWELL_BASE + IWL_PASSIVE_DWELL_TIME_24 :</div><div class='del'>-	    IWL_PASSIVE_DWELL_BASE + IWL_PASSIVE_DWELL_TIME_52;</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_is_any_associated(priv)) {</div><div class='del'>-		/*</div><div class='del'>-		 * If we're associated, we clamp the maximum passive</div><div class='del'>-		 * dwell time to be 98% of the smallest beacon interval</div><div class='del'>-		 * (minus 2 * channel tune time)</div><div class='del'>-		 */</div><div class='del'>-		for_each_context(priv, ctx) {</div><div class='del'>-			u16 value;</div><div class='del'>-</div><div class='del'>-			if (!iwl_legacy_is_associated_ctx(ctx))</div><div class='del'>-				continue;</div><div class='del'>-			value = ctx-&gt;vif ? ctx-&gt;vif-&gt;bss_conf.beacon_int : 0;</div><div class='del'>-			if ((value &gt; IWL_PASSIVE_DWELL_BASE) || !value)</div><div class='del'>-				value = IWL_PASSIVE_DWELL_BASE;</div><div class='del'>-			value = (value * 98) / 100 - IWL_CHANNEL_TUNE_TIME * 2;</div><div class='del'>-			passive = min(value, passive);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return passive;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_get_passive_dwell_time);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_init_scan_params(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	u8 ant_idx = fls(priv-&gt;hw_params.valid_tx_ant) - 1;</div><div class='del'>-	if (!priv-&gt;scan_tx_ant[IEEE80211_BAND_5GHZ])</div><div class='del'>-		priv-&gt;scan_tx_ant[IEEE80211_BAND_5GHZ] = ant_idx;</div><div class='del'>-	if (!priv-&gt;scan_tx_ant[IEEE80211_BAND_2GHZ])</div><div class='del'>-		priv-&gt;scan_tx_ant[IEEE80211_BAND_2GHZ] = ant_idx;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_init_scan_params);</div><div class='del'>-</div><div class='del'>-static int iwl_legacy_scan_initiate(struct iwl_priv *priv,</div><div class='del'>-				    struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(!priv-&gt;cfg-&gt;ops-&gt;utils-&gt;request_scan))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	cancel_delayed_work(&amp;priv-&gt;scan_check);</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_ready_rf(priv)) {</div><div class='del'>-		IWL_WARN(priv, "Request scan called when driver not ready.\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_SCAN_HW, &amp;priv-&gt;status)) {</div><div class='del'>-		IWL_DEBUG_SCAN(priv,</div><div class='del'>-			"Multiple concurrent scan requests in parallel.\n");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_SCAN_ABORTING, &amp;priv-&gt;status)) {</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "Scan request while abort pending.\n");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_SCAN(priv, "Starting scan...\n");</div><div class='del'>-</div><div class='del'>-	set_bit(STATUS_SCANNING, &amp;priv-&gt;status);</div><div class='del'>-	priv-&gt;scan_start = jiffies;</div><div class='del'>-</div><div class='del'>-	ret = priv-&gt;cfg-&gt;ops-&gt;utils-&gt;request_scan(priv, vif);</div><div class='del'>-	if (ret) {</div><div class='del'>-		clear_bit(STATUS_SCANNING, &amp;priv-&gt;status);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	queue_delayed_work(priv-&gt;workqueue, &amp;priv-&gt;scan_check,</div><div class='del'>-			   IWL_SCAN_CHECK_WATCHDOG);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_legacy_mac_hw_scan(struct ieee80211_hw *hw,</div><div class='del'>-		    struct ieee80211_vif *vif,</div><div class='del'>-		    struct cfg80211_scan_request *req)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	if (req-&gt;n_channels == 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_SCANNING, &amp;priv-&gt;status)) {</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "Scan already in progress.\n");</div><div class='del'>-		ret = -EAGAIN;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* mac80211 will only ask for one band at a time */</div><div class='del'>-	priv-&gt;scan_request = req;</div><div class='del'>-	priv-&gt;scan_vif = vif;</div><div class='del'>-	priv-&gt;scan_band = req-&gt;channels[0]-&gt;band;</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_scan_initiate(priv, vif);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-</div><div class='del'>-out_unlock:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_mac_hw_scan);</div><div class='del'>-</div><div class='del'>-static void iwl_legacy_bg_scan_check(struct work_struct *data)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv =</div><div class='del'>-	    container_of(data, struct iwl_priv, scan_check.work);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_SCAN(priv, "Scan check work\n");</div><div class='del'>-</div><div class='del'>-	/* Since we are here firmware does not finish scan and</div><div class='del'>-	 * most likely is in bad shape, so we don't bother to</div><div class='del'>-	 * send abort command, just force scan complete to mac80211 */</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	iwl_legacy_force_scan_end(priv);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_fill_probe_req - fill in all required fields and IE for probe request</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-u16</div><div class='del'>-iwl_legacy_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame,</div><div class='del'>-		       const u8 *ta, const u8 *ies, int ie_len, int left)</div><div class='del'>-{</div><div class='del'>-	int len = 0;</div><div class='del'>-	u8 *pos = NULL;</div><div class='del'>-</div><div class='del'>-	/* Make sure there is enough space for the probe request,</div><div class='del'>-	 * two mandatory IEs and the data */</div><div class='del'>-	left -= 24;</div><div class='del'>-	if (left &lt; 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	frame-&gt;frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ);</div><div class='del'>-	memcpy(frame-&gt;da, iwlegacy_bcast_addr, ETH_ALEN);</div><div class='del'>-	memcpy(frame-&gt;sa, ta, ETH_ALEN);</div><div class='del'>-	memcpy(frame-&gt;bssid, iwlegacy_bcast_addr, ETH_ALEN);</div><div class='del'>-	frame-&gt;seq_ctrl = 0;</div><div class='del'>-</div><div class='del'>-	len += 24;</div><div class='del'>-</div><div class='del'>-	/* ...next IE... */</div><div class='del'>-	pos = &amp;frame-&gt;u.probe_req.variable[0];</div><div class='del'>-</div><div class='del'>-	/* fill in our indirect SSID IE */</div><div class='del'>-	left -= 2;</div><div class='del'>-	if (left &lt; 0)</div><div class='del'>-		return 0;</div><div class='del'>-	*pos++ = WLAN_EID_SSID;</div><div class='del'>-	*pos++ = 0;</div><div class='del'>-</div><div class='del'>-	len += 2;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(left &lt; ie_len))</div><div class='del'>-		return len;</div><div class='del'>-</div><div class='del'>-	if (ies &amp;&amp; ie_len) {</div><div class='del'>-		memcpy(pos, ies, ie_len);</div><div class='del'>-		len += ie_len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (u16)len;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_fill_probe_req);</div><div class='del'>-</div><div class='del'>-static void iwl_legacy_bg_abort_scan(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = container_of(work, struct iwl_priv, abort_scan);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_SCAN(priv, "Abort scan work\n");</div><div class='del'>-</div><div class='del'>-	/* We keep scan_check work queued in case when firmware will not</div><div class='del'>-	 * report back scan completed notification */</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	iwl_legacy_scan_cancel_timeout(priv, 200);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_legacy_bg_scan_completed(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv =</div><div class='del'>-	    container_of(work, struct iwl_priv, scan_completed);</div><div class='del'>-	bool aborted;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_SCAN(priv, "Completed scan.\n");</div><div class='del'>-</div><div class='del'>-	cancel_delayed_work(&amp;priv-&gt;scan_check);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	aborted = test_and_clear_bit(STATUS_SCAN_ABORTING, &amp;priv-&gt;status);</div><div class='del'>-	if (aborted)</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "Aborted scan completed.\n");</div><div class='del'>-</div><div class='del'>-	if (!test_and_clear_bit(STATUS_SCANNING, &amp;priv-&gt;status)) {</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "Scan already completed.\n");</div><div class='del'>-		goto out_settings;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_legacy_complete_scan(priv, aborted);</div><div class='del'>-</div><div class='del'>-out_settings:</div><div class='del'>-	/* Can we still talk to firmware ? */</div><div class='del'>-	if (!iwl_legacy_is_ready_rf(priv))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We do not commit power settings while scan is pending,</div><div class='del'>-	 * do it now if the settings changed.</div><div class='del'>-	 */</div><div class='del'>-	iwl_legacy_power_set_mode(priv, &amp;priv-&gt;power_data.sleep_cmd_next, false);</div><div class='del'>-	iwl_legacy_set_tx_power(priv, priv-&gt;tx_power_next, false);</div><div class='del'>-</div><div class='del'>-	priv-&gt;cfg-&gt;ops-&gt;utils-&gt;post_scan(priv);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_legacy_setup_scan_deferred_work(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;scan_completed, iwl_legacy_bg_scan_completed);</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;abort_scan, iwl_legacy_bg_abort_scan);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;priv-&gt;scan_check, iwl_legacy_bg_scan_check);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_setup_scan_deferred_work);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_cancel_scan_deferred_work(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	cancel_work_sync(&amp;priv-&gt;abort_scan);</div><div class='del'>-	cancel_work_sync(&amp;priv-&gt;scan_completed);</div><div class='del'>-</div><div class='del'>-	if (cancel_delayed_work_sync(&amp;priv-&gt;scan_check)) {</div><div class='del'>-		mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-		iwl_legacy_force_scan_end(priv);</div><div class='del'>-		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_cancel_scan_deferred_work);</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-spectrum.h b/drivers/net/wireless/iwlegacy/iwl-spectrum.h<br/>index 9f70a4723103..85fe48e520f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-spectrum.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-spectrum.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-spectrum.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/iwl-spectrum.h</a></div><div class='hunk'>@@ -26,8 +26,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#ifndef __iwl_legacy_spectrum_h__</div><div class='del'>-#define __iwl_legacy_spectrum_h__</div><div class='add'>+#ifndef __il_spectrum_h__</div><div class='add'>+#define __il_spectrum_h__</div><div class='ctx'> enum {				/* ieee80211_basic_report.map */</div><div class='ctx'> 	IEEE80211_BASIC_MAP_BSS = (1 &lt;&lt; 0),</div><div class='ctx'> 	IEEE80211_BASIC_MAP_OFDM = (1 &lt;&lt; 1),</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-sta.c b/drivers/net/wireless/iwlegacy/iwl-sta.c<br/>deleted file mode 100644<br/>index f10df3e2813a..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-sta.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-sta.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,817 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Portions of this file are derived from the ipw3945 project, as well</div><div class='del'>- * as portions of the ieee80211 subsystem header files.</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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/lockdep.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-sta.h"</div><div class='del'>-</div><div class='del'>-/* priv-&gt;sta_lock must be held */</div><div class='del'>-static void iwl_legacy_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	if (!(priv-&gt;stations[sta_id].used &amp; IWL_STA_DRIVER_ACTIVE))</div><div class='del'>-		IWL_ERR(priv,</div><div class='del'>-			"ACTIVATE a non DRIVER active station id %u addr %pM\n",</div><div class='del'>-			sta_id, priv-&gt;stations[sta_id].sta.sta.addr);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;stations[sta_id].used &amp; IWL_STA_UCODE_ACTIVE) {</div><div class='del'>-		IWL_DEBUG_ASSOC(priv,</div><div class='del'>-			"STA id %u addr %pM already present"</div><div class='del'>-			" in uCode (according to driver)\n",</div><div class='del'>-			sta_id, priv-&gt;stations[sta_id].sta.sta.addr);</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;stations[sta_id].used |= IWL_STA_UCODE_ACTIVE;</div><div class='del'>-		IWL_DEBUG_ASSOC(priv, "Added STA id %u addr %pM to uCode\n",</div><div class='del'>-				sta_id, priv-&gt;stations[sta_id].sta.sta.addr);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_legacy_process_add_sta_resp(struct iwl_priv *priv,</div><div class='del'>-				    struct iwl_legacy_addsta_cmd *addsta,</div><div class='del'>-				    struct iwl_rx_packet *pkt,</div><div class='del'>-				    bool sync)</div><div class='del'>-{</div><div class='del'>-	u8 sta_id = addsta-&gt;sta.sta_id;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret = -EIO;</div><div class='del'>-</div><div class='del'>-	if (pkt-&gt;hdr.flags &amp; IWL_CMD_FAILED_MSK) {</div><div class='del'>-		IWL_ERR(priv, "Bad return from REPLY_ADD_STA (0x%08X)\n",</div><div class='del'>-			pkt-&gt;hdr.flags);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Processing response for adding station %u\n",</div><div class='del'>-		       sta_id);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	switch (pkt-&gt;u.add_sta.status) {</div><div class='del'>-	case ADD_STA_SUCCESS_MSK:</div><div class='del'>-		IWL_DEBUG_INFO(priv, "REPLY_ADD_STA PASSED\n");</div><div class='del'>-		iwl_legacy_sta_ucode_activate(priv, sta_id);</div><div class='del'>-		ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	case ADD_STA_NO_ROOM_IN_TABLE:</div><div class='del'>-		IWL_ERR(priv, "Adding station %d failed, no room in table.\n",</div><div class='del'>-			sta_id);</div><div class='del'>-		break;</div><div class='del'>-	case ADD_STA_NO_BLOCK_ACK_RESOURCE:</div><div class='del'>-		IWL_ERR(priv,</div><div class='del'>-			"Adding station %d failed, no block ack resource.\n",</div><div class='del'>-			sta_id);</div><div class='del'>-		break;</div><div class='del'>-	case ADD_STA_MODIFY_NON_EXIST_STA:</div><div class='del'>-		IWL_ERR(priv, "Attempting to modify non-existing station %d\n",</div><div class='del'>-			sta_id);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		IWL_DEBUG_ASSOC(priv, "Received REPLY_ADD_STA:(0x%08X)\n",</div><div class='del'>-				pkt-&gt;u.add_sta.status);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "%s station id %u addr %pM\n",</div><div class='del'>-		       priv-&gt;stations[sta_id].sta.mode ==</div><div class='del'>-		       STA_CONTROL_MODIFY_MSK ?  "Modified" : "Added",</div><div class='del'>-		       sta_id, priv-&gt;stations[sta_id].sta.sta.addr);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * XXX: The MAC address in the command buffer is often changed from</div><div class='del'>-	 * the original sent to the device. That is, the MAC address</div><div class='del'>-	 * written to the command buffer often is not the same MAC address</div><div class='del'>-	 * read from the command buffer when the command returns. This</div><div class='del'>-	 * issue has not yet been resolved and this debugging is left to</div><div class='del'>-	 * observe the problem.</div><div class='del'>-	 */</div><div class='del'>-	IWL_DEBUG_INFO(priv, "%s station according to cmd buffer %pM\n",</div><div class='del'>-		       priv-&gt;stations[sta_id].sta.mode ==</div><div class='del'>-		       STA_CONTROL_MODIFY_MSK ? "Modified" : "Added",</div><div class='del'>-		       addsta-&gt;sta.addr);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_legacy_add_sta_callback(struct iwl_priv *priv,</div><div class='del'>-				 struct iwl_device_cmd *cmd,</div><div class='del'>-				 struct iwl_rx_packet *pkt)</div><div class='del'>-{</div><div class='del'>-	struct iwl_legacy_addsta_cmd *addsta =</div><div class='del'>-		(struct iwl_legacy_addsta_cmd *)cmd-&gt;cmd.payload;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_process_add_sta_resp(priv, addsta, pkt, false);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_legacy_send_add_sta(struct iwl_priv *priv,</div><div class='del'>-		     struct iwl_legacy_addsta_cmd *sta, u8 flags)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = NULL;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u8 data[sizeof(*sta)];</div><div class='del'>-	struct iwl_host_cmd cmd = {</div><div class='del'>-		.id = REPLY_ADD_STA,</div><div class='del'>-		.flags = flags,</div><div class='del'>-		.data = data,</div><div class='del'>-	};</div><div class='del'>-	u8 sta_id __maybe_unused = sta-&gt;sta.sta_id;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Adding sta %u (%pM) %ssynchronously\n",</div><div class='del'>-		       sta_id, sta-&gt;sta.addr, flags &amp; CMD_ASYNC ?  "a" : "");</div><div class='del'>-</div><div class='del'>-	if (flags &amp; CMD_ASYNC)</div><div class='del'>-		cmd.callback = iwl_legacy_add_sta_callback;</div><div class='del'>-	else {</div><div class='del'>-		cmd.flags |= CMD_WANT_SKB;</div><div class='del'>-		might_sleep();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd.len = priv-&gt;cfg-&gt;ops-&gt;utils-&gt;build_addsta_hcmd(sta, data);</div><div class='del'>-	ret = iwl_legacy_send_cmd(priv, &amp;cmd);</div><div class='del'>-</div><div class='del'>-	if (ret || (flags &amp; CMD_ASYNC))</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (ret == 0) {</div><div class='del'>-		pkt = (struct iwl_rx_packet *)cmd.reply_page;</div><div class='del'>-		ret = iwl_legacy_process_add_sta_resp(priv, sta, pkt, true);</div><div class='del'>-	}</div><div class='del'>-	iwl_legacy_free_pages(priv, cmd.reply_page);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_send_add_sta);</div><div class='del'>-</div><div class='del'>-static void iwl_legacy_set_ht_add_station(struct iwl_priv *priv, u8 index,</div><div class='del'>-				   struct ieee80211_sta *sta,</div><div class='del'>-				   struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_sta_ht_cap *sta_ht_inf = &amp;sta-&gt;ht_cap;</div><div class='del'>-	__le32 sta_flags;</div><div class='del'>-	u8 mimo_ps_mode;</div><div class='del'>-</div><div class='del'>-	if (!sta || !sta_ht_inf-&gt;ht_supported)</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	mimo_ps_mode = (sta_ht_inf-&gt;cap &amp; IEEE80211_HT_CAP_SM_PS) &gt;&gt; 2;</div><div class='del'>-	IWL_DEBUG_ASSOC(priv, "spatial multiplexing power save mode: %s\n",</div><div class='del'>-			(mimo_ps_mode == WLAN_HT_CAP_SM_PS_STATIC) ?</div><div class='del'>-			"static" :</div><div class='del'>-			(mimo_ps_mode == WLAN_HT_CAP_SM_PS_DYNAMIC) ?</div><div class='del'>-			"dynamic" : "disabled");</div><div class='del'>-</div><div class='del'>-	sta_flags = priv-&gt;stations[index].sta.station_flags;</div><div class='del'>-</div><div class='del'>-	sta_flags &amp;= ~(STA_FLG_RTS_MIMO_PROT_MSK | STA_FLG_MIMO_DIS_MSK);</div><div class='del'>-</div><div class='del'>-	switch (mimo_ps_mode) {</div><div class='del'>-	case WLAN_HT_CAP_SM_PS_STATIC:</div><div class='del'>-		sta_flags |= STA_FLG_MIMO_DIS_MSK;</div><div class='del'>-		break;</div><div class='del'>-	case WLAN_HT_CAP_SM_PS_DYNAMIC:</div><div class='del'>-		sta_flags |= STA_FLG_RTS_MIMO_PROT_MSK;</div><div class='del'>-		break;</div><div class='del'>-	case WLAN_HT_CAP_SM_PS_DISABLED:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		IWL_WARN(priv, "Invalid MIMO PS mode %d\n", mimo_ps_mode);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sta_flags |= cpu_to_le32(</div><div class='del'>-	      (u32)sta_ht_inf-&gt;ampdu_factor &lt;&lt; STA_FLG_MAX_AGG_SIZE_POS);</div><div class='del'>-</div><div class='del'>-	sta_flags |= cpu_to_le32(</div><div class='del'>-	      (u32)sta_ht_inf-&gt;ampdu_density &lt;&lt; STA_FLG_AGG_MPDU_DENSITY_POS);</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_is_ht40_tx_allowed(priv, ctx, &amp;sta-&gt;ht_cap))</div><div class='del'>-		sta_flags |= STA_FLG_HT40_EN_MSK;</div><div class='del'>-	else</div><div class='del'>-		sta_flags &amp;= ~STA_FLG_HT40_EN_MSK;</div><div class='del'>-</div><div class='del'>-	priv-&gt;stations[index].sta.station_flags = sta_flags;</div><div class='del'>- done:</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_prep_station - Prepare station information for addition</div><div class='del'>- *</div><div class='del'>- * should be called with sta_lock held</div><div class='del'>- */</div><div class='del'>-u8 iwl_legacy_prep_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx,</div><div class='del'>-		    const u8 *addr, bool is_ap, struct ieee80211_sta *sta)</div><div class='del'>-{</div><div class='del'>-	struct iwl_station_entry *station;</div><div class='del'>-	int i;</div><div class='del'>-	u8 sta_id = IWL_INVALID_STATION;</div><div class='del'>-	u16 rate;</div><div class='del'>-</div><div class='del'>-	if (is_ap)</div><div class='del'>-		sta_id = ctx-&gt;ap_sta_id;</div><div class='del'>-	else if (is_broadcast_ether_addr(addr))</div><div class='del'>-		sta_id = ctx-&gt;bcast_sta_id;</div><div class='del'>-	else</div><div class='del'>-		for (i = IWL_STA_ID; i &lt; priv-&gt;hw_params.max_stations; i++) {</div><div class='del'>-			if (!compare_ether_addr(priv-&gt;stations[i].sta.sta.addr,</div><div class='del'>-						addr)) {</div><div class='del'>-				sta_id = i;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (!priv-&gt;stations[i].used &amp;&amp;</div><div class='del'>-			    sta_id == IWL_INVALID_STATION)</div><div class='del'>-				sta_id = i;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * These two conditions have the same outcome, but keep them</div><div class='del'>-	 * separate</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(sta_id == IWL_INVALID_STATION))</div><div class='del'>-		return sta_id;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * uCode is not able to deal with multiple requests to add a</div><div class='del'>-	 * station. Keep track if one is in progress so that we do not send</div><div class='del'>-	 * another.</div><div class='del'>-	 */</div><div class='del'>-	if (priv-&gt;stations[sta_id].used &amp; IWL_STA_UCODE_INPROGRESS) {</div><div class='del'>-		IWL_DEBUG_INFO(priv,</div><div class='del'>-				"STA %d already in process of being added.\n",</div><div class='del'>-				sta_id);</div><div class='del'>-		return sta_id;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((priv-&gt;stations[sta_id].used &amp; IWL_STA_DRIVER_ACTIVE) &amp;&amp;</div><div class='del'>-	    (priv-&gt;stations[sta_id].used &amp; IWL_STA_UCODE_ACTIVE) &amp;&amp;</div><div class='del'>-	    !compare_ether_addr(priv-&gt;stations[sta_id].sta.sta.addr, addr)) {</div><div class='del'>-		IWL_DEBUG_ASSOC(priv,</div><div class='del'>-				"STA %d (%pM) already added, not adding again.\n",</div><div class='del'>-				sta_id, addr);</div><div class='del'>-		return sta_id;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	station = &amp;priv-&gt;stations[sta_id];</div><div class='del'>-	station-&gt;used = IWL_STA_DRIVER_ACTIVE;</div><div class='del'>-	IWL_DEBUG_ASSOC(priv, "Add STA to driver ID %d: %pM\n",</div><div class='del'>-			sta_id, addr);</div><div class='del'>-	priv-&gt;num_stations++;</div><div class='del'>-</div><div class='del'>-	/* Set up the REPLY_ADD_STA command to send to device */</div><div class='del'>-	memset(&amp;station-&gt;sta, 0, sizeof(struct iwl_legacy_addsta_cmd));</div><div class='del'>-	memcpy(station-&gt;sta.sta.addr, addr, ETH_ALEN);</div><div class='del'>-	station-&gt;sta.mode = 0;</div><div class='del'>-	station-&gt;sta.sta.sta_id = sta_id;</div><div class='del'>-	station-&gt;sta.station_flags = ctx-&gt;station_flags;</div><div class='del'>-	station-&gt;ctxid = ctx-&gt;ctxid;</div><div class='del'>-</div><div class='del'>-	if (sta) {</div><div class='del'>-		struct iwl_station_priv_common *sta_priv;</div><div class='del'>-</div><div class='del'>-		sta_priv = (void *)sta-&gt;drv_priv;</div><div class='del'>-		sta_priv-&gt;ctx = ctx;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * OK to call unconditionally, since local stations (IBSS BSSID</div><div class='del'>-	 * STA and broadcast STA) pass in a NULL sta, and mac80211</div><div class='del'>-	 * doesn't allow HT IBSS.</div><div class='del'>-	 */</div><div class='del'>-	iwl_legacy_set_ht_add_station(priv, sta_id, sta, ctx);</div><div class='del'>-</div><div class='del'>-	/* 3945 only */</div><div class='del'>-	rate = (priv-&gt;band == IEEE80211_BAND_5GHZ) ?</div><div class='del'>-		IWL_RATE_6M_PLCP : IWL_RATE_1M_PLCP;</div><div class='del'>-	/* Turn on both antennas for the station... */</div><div class='del'>-	station-&gt;sta.rate_n_flags = cpu_to_le16(rate | RATE_MCS_ANT_AB_MSK);</div><div class='del'>-</div><div class='del'>-	return sta_id;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(iwl_legacy_prep_station);</div><div class='del'>-</div><div class='del'>-#define STA_WAIT_TIMEOUT (HZ/2)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_add_station_common -</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-iwl_legacy_add_station_common(struct iwl_priv *priv,</div><div class='del'>-			struct iwl_rxon_context *ctx,</div><div class='del'>-			   const u8 *addr, bool is_ap,</div><div class='del'>-			   struct ieee80211_sta *sta, u8 *sta_id_r)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags_spin;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u8 sta_id;</div><div class='del'>-	struct iwl_legacy_addsta_cmd sta_cmd;</div><div class='del'>-</div><div class='del'>-	*sta_id_r = 0;</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-	sta_id = iwl_legacy_prep_station(priv, ctx, addr, is_ap, sta);</div><div class='del'>-	if (sta_id == IWL_INVALID_STATION) {</div><div class='del'>-		IWL_ERR(priv, "Unable to prepare station %pM for addition\n",</div><div class='del'>-			addr);</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * uCode is not able to deal with multiple requests to add a</div><div class='del'>-	 * station. Keep track if one is in progress so that we do not send</div><div class='del'>-	 * another.</div><div class='del'>-	 */</div><div class='del'>-	if (priv-&gt;stations[sta_id].used &amp; IWL_STA_UCODE_INPROGRESS) {</div><div class='del'>-		IWL_DEBUG_INFO(priv,</div><div class='del'>-			"STA %d already in process of being added.\n",</div><div class='del'>-		       sta_id);</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-		return -EEXIST;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((priv-&gt;stations[sta_id].used &amp; IWL_STA_DRIVER_ACTIVE) &amp;&amp;</div><div class='del'>-	    (priv-&gt;stations[sta_id].used &amp; IWL_STA_UCODE_ACTIVE)) {</div><div class='del'>-		IWL_DEBUG_ASSOC(priv,</div><div class='del'>-			"STA %d (%pM) already added, not adding again.\n",</div><div class='del'>-			sta_id, addr);</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-		return -EEXIST;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;stations[sta_id].used |= IWL_STA_UCODE_INPROGRESS;</div><div class='del'>-	memcpy(&amp;sta_cmd, &amp;priv-&gt;stations[sta_id].sta,</div><div class='del'>-				sizeof(struct iwl_legacy_addsta_cmd));</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-</div><div class='del'>-	/* Add station to device's station table */</div><div class='del'>-	ret = iwl_legacy_send_add_sta(priv, &amp;sta_cmd, CMD_SYNC);</div><div class='del'>-	if (ret) {</div><div class='del'>-		spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-		IWL_ERR(priv, "Adding station %pM failed.\n",</div><div class='del'>-			priv-&gt;stations[sta_id].sta.sta.addr);</div><div class='del'>-		priv-&gt;stations[sta_id].used &amp;= ~IWL_STA_DRIVER_ACTIVE;</div><div class='del'>-		priv-&gt;stations[sta_id].used &amp;= ~IWL_STA_UCODE_INPROGRESS;</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-	}</div><div class='del'>-	*sta_id_r = sta_id;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_add_station_common);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_sta_ucode_deactivate - deactivate ucode status for a station</div><div class='del'>- *</div><div class='del'>- * priv-&gt;sta_lock must be held</div><div class='del'>- */</div><div class='del'>-static void iwl_legacy_sta_ucode_deactivate(struct iwl_priv *priv, u8 sta_id)</div><div class='del'>-{</div><div class='del'>-	/* Ucode must be active and driver must be non active */</div><div class='del'>-	if ((priv-&gt;stations[sta_id].used &amp;</div><div class='del'>-	     (IWL_STA_UCODE_ACTIVE | IWL_STA_DRIVER_ACTIVE)) !=</div><div class='del'>-						IWL_STA_UCODE_ACTIVE)</div><div class='del'>-		IWL_ERR(priv, "removed non active STA %u\n", sta_id);</div><div class='del'>-</div><div class='del'>-	priv-&gt;stations[sta_id].used &amp;= ~IWL_STA_UCODE_ACTIVE;</div><div class='del'>-</div><div class='del'>-	memset(&amp;priv-&gt;stations[sta_id], 0, sizeof(struct iwl_station_entry));</div><div class='del'>-	IWL_DEBUG_ASSOC(priv, "Removed STA %u\n", sta_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_legacy_send_remove_station(struct iwl_priv *priv,</div><div class='del'>-				   const u8 *addr, int sta_id,</div><div class='del'>-				   bool temporary)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	unsigned long flags_spin;</div><div class='del'>-	struct iwl_rem_sta_cmd rm_sta_cmd;</div><div class='del'>-</div><div class='del'>-	struct iwl_host_cmd cmd = {</div><div class='del'>-		.id = REPLY_REMOVE_STA,</div><div class='del'>-		.len = sizeof(struct iwl_rem_sta_cmd),</div><div class='del'>-		.flags = CMD_SYNC,</div><div class='del'>-		.data = &amp;rm_sta_cmd,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	memset(&amp;rm_sta_cmd, 0, sizeof(rm_sta_cmd));</div><div class='del'>-	rm_sta_cmd.num_sta = 1;</div><div class='del'>-	memcpy(&amp;rm_sta_cmd.addr, addr, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	cmd.flags |= CMD_WANT_SKB;</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_send_cmd(priv, &amp;cmd);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	pkt = (struct iwl_rx_packet *)cmd.reply_page;</div><div class='del'>-	if (pkt-&gt;hdr.flags &amp; IWL_CMD_FAILED_MSK) {</div><div class='del'>-		IWL_ERR(priv, "Bad return from REPLY_REMOVE_STA (0x%08X)\n",</div><div class='del'>-			  pkt-&gt;hdr.flags);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ret) {</div><div class='del'>-		switch (pkt-&gt;u.rem_sta.status) {</div><div class='del'>-		case REM_STA_SUCCESS_MSK:</div><div class='del'>-			if (!temporary) {</div><div class='del'>-				spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-				iwl_legacy_sta_ucode_deactivate(priv, sta_id);</div><div class='del'>-				spin_unlock_irqrestore(&amp;priv-&gt;sta_lock,</div><div class='del'>-								flags_spin);</div><div class='del'>-			}</div><div class='del'>-			IWL_DEBUG_ASSOC(priv, "REPLY_REMOVE_STA PASSED\n");</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			IWL_ERR(priv, "REPLY_REMOVE_STA failed\n");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	iwl_legacy_free_pages(priv, cmd.reply_page);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_remove_station - Remove driver's knowledge of station.</div><div class='del'>- */</div><div class='del'>-int iwl_legacy_remove_station(struct iwl_priv *priv, const u8 sta_id,</div><div class='del'>-		       const u8 *addr)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_ready(priv)) {</div><div class='del'>-		IWL_DEBUG_INFO(priv,</div><div class='del'>-			"Unable to remove station %pM, device not ready.\n",</div><div class='del'>-			addr);</div><div class='del'>-		/*</div><div class='del'>-		 * It is typical for stations to be removed when we are</div><div class='del'>-		 * going down. Return success since device will be down</div><div class='del'>-		 * soon anyway</div><div class='del'>-		 */</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_ASSOC(priv, "Removing STA from driver:%d  %pM\n",</div><div class='del'>-			sta_id, addr);</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(sta_id == IWL_INVALID_STATION))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	if (!(priv-&gt;stations[sta_id].used &amp; IWL_STA_DRIVER_ACTIVE)) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Removing %pM but non DRIVER active\n",</div><div class='del'>-				addr);</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(priv-&gt;stations[sta_id].used &amp; IWL_STA_UCODE_ACTIVE)) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Removing %pM but non UCODE active\n",</div><div class='del'>-				addr);</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;stations[sta_id].used &amp; IWL_STA_LOCAL) {</div><div class='del'>-		kfree(priv-&gt;stations[sta_id].lq);</div><div class='del'>-		priv-&gt;stations[sta_id].lq = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;stations[sta_id].used &amp;= ~IWL_STA_DRIVER_ACTIVE;</div><div class='del'>-</div><div class='del'>-	priv-&gt;num_stations--;</div><div class='del'>-</div><div class='del'>-	BUG_ON(priv-&gt;num_stations &lt; 0);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	return iwl_legacy_send_remove_station(priv, addr, sta_id, false);</div><div class='del'>-out_err:</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(iwl_legacy_remove_station);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_clear_ucode_stations - clear ucode station table bits</div><div class='del'>- *</div><div class='del'>- * This function clears all the bits in the driver indicating</div><div class='del'>- * which stations are active in the ucode. Call when something</div><div class='del'>- * other than explicit station management would cause this in</div><div class='del'>- * the ucode, e.g. unassociated RXON.</div><div class='del'>- */</div><div class='del'>-void iwl_legacy_clear_ucode_stations(struct iwl_priv *priv,</div><div class='del'>-			      struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	unsigned long flags_spin;</div><div class='del'>-	bool cleared = false;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Clearing ucode stations in driver\n");</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params.max_stations; i++) {</div><div class='del'>-		if (ctx &amp;&amp; ctx-&gt;ctxid != priv-&gt;stations[i].ctxid)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;stations[i].used &amp; IWL_STA_UCODE_ACTIVE) {</div><div class='del'>-			IWL_DEBUG_INFO(priv,</div><div class='del'>-				"Clearing ucode active for station %d\n", i);</div><div class='del'>-			priv-&gt;stations[i].used &amp;= ~IWL_STA_UCODE_ACTIVE;</div><div class='del'>-			cleared = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-</div><div class='del'>-	if (!cleared)</div><div class='del'>-		IWL_DEBUG_INFO(priv,</div><div class='del'>-			"No active stations found to be cleared\n");</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_clear_ucode_stations);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_restore_stations() - Restore driver known stations to device</div><div class='del'>- *</div><div class='del'>- * All stations considered active by driver, but not present in ucode, is</div><div class='del'>- * restored.</div><div class='del'>- *</div><div class='del'>- * Function sleeps.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-iwl_legacy_restore_stations(struct iwl_priv *priv, struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	struct iwl_legacy_addsta_cmd sta_cmd;</div><div class='del'>-	struct iwl_link_quality_cmd lq;</div><div class='del'>-	unsigned long flags_spin;</div><div class='del'>-	int i;</div><div class='del'>-	bool found = false;</div><div class='del'>-	int ret;</div><div class='del'>-	bool send_lq;</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_ready(priv)) {</div><div class='del'>-		IWL_DEBUG_INFO(priv,</div><div class='del'>-			"Not ready yet, not restoring any stations.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_ASSOC(priv, "Restoring all known stations ... start.\n");</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params.max_stations; i++) {</div><div class='del'>-		if (ctx-&gt;ctxid != priv-&gt;stations[i].ctxid)</div><div class='del'>-			continue;</div><div class='del'>-		if ((priv-&gt;stations[i].used &amp; IWL_STA_DRIVER_ACTIVE) &amp;&amp;</div><div class='del'>-			    !(priv-&gt;stations[i].used &amp; IWL_STA_UCODE_ACTIVE)) {</div><div class='del'>-			IWL_DEBUG_ASSOC(priv, "Restoring sta %pM\n",</div><div class='del'>-					priv-&gt;stations[i].sta.sta.addr);</div><div class='del'>-			priv-&gt;stations[i].sta.mode = 0;</div><div class='del'>-			priv-&gt;stations[i].used |= IWL_STA_UCODE_INPROGRESS;</div><div class='del'>-			found = true;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params.max_stations; i++) {</div><div class='del'>-		if ((priv-&gt;stations[i].used &amp; IWL_STA_UCODE_INPROGRESS)) {</div><div class='del'>-			memcpy(&amp;sta_cmd, &amp;priv-&gt;stations[i].sta,</div><div class='del'>-			       sizeof(struct iwl_legacy_addsta_cmd));</div><div class='del'>-			send_lq = false;</div><div class='del'>-			if (priv-&gt;stations[i].lq) {</div><div class='del'>-				memcpy(&amp;lq, priv-&gt;stations[i].lq,</div><div class='del'>-				       sizeof(struct iwl_link_quality_cmd));</div><div class='del'>-				send_lq = true;</div><div class='del'>-			}</div><div class='del'>-			spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-			ret = iwl_legacy_send_add_sta(priv, &amp;sta_cmd, CMD_SYNC);</div><div class='del'>-			if (ret) {</div><div class='del'>-				spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-				IWL_ERR(priv, "Adding station %pM failed.\n",</div><div class='del'>-					priv-&gt;stations[i].sta.sta.addr);</div><div class='del'>-				priv-&gt;stations[i].used &amp;=</div><div class='del'>-						~IWL_STA_DRIVER_ACTIVE;</div><div class='del'>-				priv-&gt;stations[i].used &amp;=</div><div class='del'>-						~IWL_STA_UCODE_INPROGRESS;</div><div class='del'>-				spin_unlock_irqrestore(&amp;priv-&gt;sta_lock,</div><div class='del'>-								flags_spin);</div><div class='del'>-			}</div><div class='del'>-			/*</div><div class='del'>-			 * Rate scaling has already been initialized, send</div><div class='del'>-			 * current LQ command</div><div class='del'>-			 */</div><div class='del'>-			if (send_lq)</div><div class='del'>-				iwl_legacy_send_lq_cmd(priv, ctx, &amp;lq,</div><div class='del'>-								CMD_SYNC, true);</div><div class='del'>-			spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-			priv-&gt;stations[i].used &amp;= ~IWL_STA_UCODE_INPROGRESS;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-	if (!found)</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Restoring all known stations"</div><div class='del'>-				" .... no stations to be restored.\n");</div><div class='del'>-	else</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Restoring all known stations"</div><div class='del'>-				" .... complete.\n");</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_restore_stations);</div><div class='del'>-</div><div class='del'>-int iwl_legacy_get_free_ucode_key_index(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;sta_key_max_num; i++)</div><div class='del'>-		if (!test_and_set_bit(i, &amp;priv-&gt;ucode_key_table))</div><div class='del'>-			return i;</div><div class='del'>-</div><div class='del'>-	return WEP_INVALID_OFFSET;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_get_free_ucode_key_index);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_dealloc_bcast_stations(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params.max_stations; i++) {</div><div class='del'>-		if (!(priv-&gt;stations[i].used &amp; IWL_STA_BCAST))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		priv-&gt;stations[i].used &amp;= ~IWL_STA_UCODE_ACTIVE;</div><div class='del'>-		priv-&gt;num_stations--;</div><div class='del'>-		BUG_ON(priv-&gt;num_stations &lt; 0);</div><div class='del'>-		kfree(priv-&gt;stations[i].lq);</div><div class='del'>-		priv-&gt;stations[i].lq = NULL;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(iwl_legacy_dealloc_bcast_stations);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-static void iwl_legacy_dump_lq_cmd(struct iwl_priv *priv,</div><div class='del'>-			   struct iwl_link_quality_cmd *lq)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	IWL_DEBUG_RATE(priv, "lq station id 0x%x\n", lq-&gt;sta_id);</div><div class='del'>-	IWL_DEBUG_RATE(priv, "lq ant 0x%X 0x%X\n",</div><div class='del'>-		       lq-&gt;general_params.single_stream_ant_msk,</div><div class='del'>-		       lq-&gt;general_params.dual_stream_ant_msk);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; LINK_QUAL_MAX_RETRY_NUM; i++)</div><div class='del'>-		IWL_DEBUG_RATE(priv, "lq index %d 0x%X\n",</div><div class='del'>-			       i, lq-&gt;rs_table[i].rate_n_flags);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void iwl_legacy_dump_lq_cmd(struct iwl_priv *priv,</div><div class='del'>-				   struct iwl_link_quality_cmd *lq)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_is_lq_table_valid() - Test one aspect of LQ cmd for validity</div><div class='del'>- *</div><div class='del'>- * It sometimes happens when a HT rate has been in use and we</div><div class='del'>- * loose connectivity with AP then mac80211 will first tell us that the</div><div class='del'>- * current channel is not HT anymore before removing the station. In such a</div><div class='del'>- * scenario the RXON flags will be updated to indicate we are not</div><div class='del'>- * communicating HT anymore, but the LQ command may still contain HT rates.</div><div class='del'>- * Test for this to prevent driver from sending LQ command between the time</div><div class='del'>- * RXON flags are updated and when LQ command is updated.</div><div class='del'>- */</div><div class='del'>-static bool iwl_legacy_is_lq_table_valid(struct iwl_priv *priv,</div><div class='del'>-			      struct iwl_rxon_context *ctx,</div><div class='del'>-			      struct iwl_link_quality_cmd *lq)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;ht.enabled)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Channel %u is not an HT channel\n",</div><div class='del'>-		       ctx-&gt;active.channel);</div><div class='del'>-	for (i = 0; i &lt; LINK_QUAL_MAX_RETRY_NUM; i++) {</div><div class='del'>-		if (le32_to_cpu(lq-&gt;rs_table[i].rate_n_flags) &amp;</div><div class='del'>-						RATE_MCS_HT_MSK) {</div><div class='del'>-			IWL_DEBUG_INFO(priv,</div><div class='del'>-				       "index %d of LQ expects HT channel\n",</div><div class='del'>-				       i);</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'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_send_lq_cmd() - Send link quality command</div><div class='del'>- * @init: This command is sent as part of station initialization right</div><div class='del'>- *        after station has been added.</div><div class='del'>- *</div><div class='del'>- * The link quality command is sent as the last step of station creation.</div><div class='del'>- * This is the special case in which init is set and we call a callback in</div><div class='del'>- * this case to clear the state indicating that station creation is in</div><div class='del'>- * progress.</div><div class='del'>- */</div><div class='del'>-int iwl_legacy_send_lq_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx,</div><div class='del'>-		    struct iwl_link_quality_cmd *lq, u8 flags, bool init)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	unsigned long flags_spin;</div><div class='del'>-</div><div class='del'>-	struct iwl_host_cmd cmd = {</div><div class='del'>-		.id = REPLY_TX_LINK_QUALITY_CMD,</div><div class='del'>-		.len = sizeof(struct iwl_link_quality_cmd),</div><div class='del'>-		.flags = flags,</div><div class='del'>-		.data = lq,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(lq-&gt;sta_id == IWL_INVALID_STATION))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-	if (!(priv-&gt;stations[lq-&gt;sta_id].used &amp; IWL_STA_DRIVER_ACTIVE)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_dump_lq_cmd(priv, lq);</div><div class='del'>-	BUG_ON(init &amp;&amp; (cmd.flags &amp; CMD_ASYNC));</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_is_lq_table_valid(priv, ctx, lq))</div><div class='del'>-		ret = iwl_legacy_send_cmd(priv, &amp;cmd);</div><div class='del'>-	else</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (cmd.flags &amp; CMD_ASYNC)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (init) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "init LQ command complete,"</div><div class='del'>-				" clearing sta addition status for sta %d\n",</div><div class='del'>-			       lq-&gt;sta_id);</div><div class='del'>-		spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-		priv-&gt;stations[lq-&gt;sta_id].used &amp;= ~IWL_STA_UCODE_INPROGRESS;</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags_spin);</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_send_lq_cmd);</div><div class='del'>-</div><div class='del'>-int iwl_legacy_mac_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 iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_station_priv_common *sta_common = (void *)sta-&gt;drv_priv;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "received request to remove station %pM\n",</div><div class='del'>-			sta-&gt;addr);</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "proceeding to remove station %pM\n",</div><div class='del'>-			sta-&gt;addr);</div><div class='del'>-	ret = iwl_legacy_remove_station(priv, sta_common-&gt;sta_id, sta-&gt;addr);</div><div class='del'>-	if (ret)</div><div class='del'>-		IWL_ERR(priv, "Error removing station %pM\n",</div><div class='del'>-			sta-&gt;addr);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_mac_sta_remove);</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-sta.h b/drivers/net/wireless/iwlegacy/iwl-sta.h<br/>deleted file mode 100644<br/>index 67bd75fe01a1..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-sta.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-sta.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,148 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Portions of this file are derived from the ipw3945 project, as well</div><div class='del'>- * as portions of the ieee80211 subsystem header files.</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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-#ifndef __iwl_legacy_sta_h__</div><div class='del'>-#define __iwl_legacy_sta_h__</div><div class='del'>-</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-</div><div class='del'>-#define HW_KEY_DYNAMIC 0</div><div class='del'>-#define HW_KEY_DEFAULT 1</div><div class='del'>-</div><div class='del'>-#define IWL_STA_DRIVER_ACTIVE BIT(0) /* driver entry is active */</div><div class='del'>-#define IWL_STA_UCODE_ACTIVE  BIT(1) /* ucode entry is active */</div><div class='del'>-#define IWL_STA_UCODE_INPROGRESS  BIT(2) /* ucode entry is in process of</div><div class='del'>-					    being activated */</div><div class='del'>-#define IWL_STA_LOCAL BIT(3) /* station state not directed by mac80211;</div><div class='del'>-				(this is for the IBSS BSSID stations) */</div><div class='del'>-#define IWL_STA_BCAST BIT(4) /* this station is the special bcast station */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void iwl_legacy_restore_stations(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_rxon_context *ctx);</div><div class='del'>-void iwl_legacy_clear_ucode_stations(struct iwl_priv *priv,</div><div class='del'>-			      struct iwl_rxon_context *ctx);</div><div class='del'>-void iwl_legacy_dealloc_bcast_stations(struct iwl_priv *priv);</div><div class='del'>-int iwl_legacy_get_free_ucode_key_index(struct iwl_priv *priv);</div><div class='del'>-int iwl_legacy_send_add_sta(struct iwl_priv *priv,</div><div class='del'>-			struct iwl_legacy_addsta_cmd *sta, u8 flags);</div><div class='del'>-int iwl_legacy_add_station_common(struct iwl_priv *priv,</div><div class='del'>-			struct iwl_rxon_context *ctx,</div><div class='del'>-			const u8 *addr, bool is_ap,</div><div class='del'>-			struct ieee80211_sta *sta, u8 *sta_id_r);</div><div class='del'>-int iwl_legacy_remove_station(struct iwl_priv *priv,</div><div class='del'>-			const u8 sta_id,</div><div class='del'>-			const u8 *addr);</div><div class='del'>-int iwl_legacy_mac_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'>-u8 iwl_legacy_prep_station(struct iwl_priv *priv,</div><div class='del'>-			struct iwl_rxon_context *ctx,</div><div class='del'>-			const u8 *addr, bool is_ap,</div><div class='del'>-			struct ieee80211_sta *sta);</div><div class='del'>-</div><div class='del'>-int iwl_legacy_send_lq_cmd(struct iwl_priv *priv,</div><div class='del'>-			struct iwl_rxon_context *ctx,</div><div class='del'>-			struct iwl_link_quality_cmd *lq,</div><div class='del'>-			u8 flags, bool init);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_clear_driver_stations - clear knowledge of all stations from driver</div><div class='del'>- * @priv: iwl priv struct</div><div class='del'>- *</div><div class='del'>- * This is called during iwl_down() to make sure that in the case</div><div class='del'>- * we're coming there from a hardware restart mac80211 will be</div><div class='del'>- * able to reconfigure stations -- if we're getting there in the</div><div class='del'>- * normal down flow then the stations will already be cleared.</div><div class='del'>- */</div><div class='del'>-static inline void iwl_legacy_clear_driver_stations(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	memset(priv-&gt;stations, 0, sizeof(priv-&gt;stations));</div><div class='del'>-	priv-&gt;num_stations = 0;</div><div class='del'>-</div><div class='del'>-	priv-&gt;ucode_key_table = 0;</div><div class='del'>-</div><div class='del'>-	for_each_context(priv, ctx) {</div><div class='del'>-		/*</div><div class='del'>-		 * Remove all key information that is not stored as part</div><div class='del'>-		 * of station information since mac80211 may not have had</div><div class='del'>-		 * a chance to remove all the keys. When device is</div><div class='del'>-		 * reconfigured by mac80211 after an error all keys will</div><div class='del'>-		 * be reconfigured.</div><div class='del'>-		 */</div><div class='del'>-		memset(ctx-&gt;wep_keys, 0, sizeof(ctx-&gt;wep_keys));</div><div class='del'>-		ctx-&gt;key_mapping_keys = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int iwl_legacy_sta_id(struct ieee80211_sta *sta)</div><div class='del'>-{</div><div class='del'>-	if (WARN_ON(!sta))</div><div class='del'>-		return IWL_INVALID_STATION;</div><div class='del'>-</div><div class='del'>-	return ((struct iwl_station_priv_common *)sta-&gt;drv_priv)-&gt;sta_id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_sta_id_or_broadcast - return sta_id or broadcast sta</div><div class='del'>- * @priv: iwl priv</div><div class='del'>- * @context: the current context</div><div class='del'>- * @sta: mac80211 station</div><div class='del'>- *</div><div class='del'>- * In certain circumstances mac80211 passes a station pointer</div><div class='del'>- * that may be %NULL, for example during TX or key setup. In</div><div class='del'>- * that case, we need to use the broadcast station, so this</div><div class='del'>- * inline wraps that pattern.</div><div class='del'>- */</div><div class='del'>-static inline int iwl_legacy_sta_id_or_broadcast(struct iwl_priv *priv,</div><div class='del'>-					  struct iwl_rxon_context *context,</div><div class='del'>-					  struct ieee80211_sta *sta)</div><div class='del'>-{</div><div class='del'>-	int sta_id;</div><div class='del'>-</div><div class='del'>-	if (!sta)</div><div class='del'>-		return context-&gt;bcast_sta_id;</div><div class='del'>-</div><div class='del'>-	sta_id = iwl_legacy_sta_id(sta);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * mac80211 should not be passing a partially</div><div class='del'>-	 * initialised station!</div><div class='del'>-	 */</div><div class='del'>-	WARN_ON(sta_id == IWL_INVALID_STATION);</div><div class='del'>-</div><div class='del'>-	return sta_id;</div><div class='del'>-}</div><div class='del'>-#endif /* __iwl_legacy_sta_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-tx.c b/drivers/net/wireless/iwlegacy/iwl-tx.c<br/>deleted file mode 100644<br/>index c0dfb1a4e968..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-tx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-tx.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,659 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Portions of this file are derived from the ipw3945 project, as well</div><div class='del'>- * as portions of the ieee80211 subsystem header files.</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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-#include "iwl-eeprom.h"</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-sta.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-#include "iwl-helpers.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_txq_update_write_ptr - Send new write index to hardware</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-iwl_legacy_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq)</div><div class='del'>-{</div><div class='del'>-	u32 reg = 0;</div><div class='del'>-	int txq_id = txq-&gt;q.id;</div><div class='del'>-</div><div class='del'>-	if (txq-&gt;need_update == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* if we're trying to save power */</div><div class='del'>-	if (test_bit(STATUS_POWER_PMI, &amp;priv-&gt;status)) {</div><div class='del'>-		/* wake up nic if it's powered down ...</div><div class='del'>-		 * uCode will wake up, and interrupt us again, so next</div><div class='del'>-		 * time we'll skip this part. */</div><div class='del'>-		reg = iwl_read32(priv, CSR_UCODE_DRV_GP1);</div><div class='del'>-</div><div class='del'>-		if (reg &amp; CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {</div><div class='del'>-			IWL_DEBUG_INFO(priv,</div><div class='del'>-					"Tx queue %d requesting wakeup,"</div><div class='del'>-					" GP1 = 0x%x\n", txq_id, reg);</div><div class='del'>-			iwl_legacy_set_bit(priv, CSR_GP_CNTRL,</div><div class='del'>-					CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		iwl_legacy_write_direct32(priv, HBUS_TARG_WRPTR,</div><div class='del'>-				txq-&gt;q.write_ptr | (txq_id &lt;&lt; 8));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * else not in power-save mode,</div><div class='del'>-		 * uCode will never sleep when we're</div><div class='del'>-		 * trying to tx (during RFKILL, we're not trying to tx).</div><div class='del'>-		 */</div><div class='del'>-	} else</div><div class='del'>-		iwl_write32(priv, HBUS_TARG_WRPTR,</div><div class='del'>-			    txq-&gt;q.write_ptr | (txq_id &lt;&lt; 8));</div><div class='del'>-	txq-&gt;need_update = 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_txq_update_write_ptr);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_tx_queue_unmap -  Unmap any remaining DMA mappings and free skb's</div><div class='del'>- */</div><div class='del'>-void iwl_legacy_tx_queue_unmap(struct iwl_priv *priv, int txq_id)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tx_queue *txq = &amp;priv-&gt;txq[txq_id];</div><div class='del'>-	struct iwl_queue *q = &amp;txq-&gt;q;</div><div class='del'>-</div><div class='del'>-	if (q-&gt;n_bd == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	while (q-&gt;write_ptr != q-&gt;read_ptr) {</div><div class='del'>-		priv-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_free_tfd(priv, txq);</div><div class='del'>-		q-&gt;read_ptr = iwl_legacy_queue_inc_wrap(q-&gt;read_ptr, q-&gt;n_bd);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_tx_queue_unmap);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_tx_queue_free - Deallocate DMA queue.</div><div class='del'>- * @txq: Transmit queue to deallocate.</div><div class='del'>- *</div><div class='del'>- * Empty queue by removing and destroying all BD's.</div><div class='del'>- * Free all buffers.</div><div class='del'>- * 0-fill, but do not free "txq" descriptor structure.</div><div class='del'>- */</div><div class='del'>-void iwl_legacy_tx_queue_free(struct iwl_priv *priv, int txq_id)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tx_queue *txq = &amp;priv-&gt;txq[txq_id];</div><div class='del'>-	struct device *dev = &amp;priv-&gt;pci_dev-&gt;dev;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_tx_queue_unmap(priv, txq_id);</div><div class='del'>-</div><div class='del'>-	/* De-alloc array of command/tx buffers */</div><div class='del'>-	for (i = 0; i &lt; TFD_TX_CMD_SLOTS; i++)</div><div class='del'>-		kfree(txq-&gt;cmd[i]);</div><div class='del'>-</div><div class='del'>-	/* De-alloc circular buffer of TFDs */</div><div class='del'>-	if (txq-&gt;q.n_bd)</div><div class='del'>-		dma_free_coherent(dev, priv-&gt;hw_params.tfd_size *</div><div class='del'>-				  txq-&gt;q.n_bd, txq-&gt;tfds, txq-&gt;q.dma_addr);</div><div class='del'>-</div><div class='del'>-	/* De-alloc array of per-TFD driver data */</div><div class='del'>-	kfree(txq-&gt;txb);</div><div class='del'>-	txq-&gt;txb = NULL;</div><div class='del'>-</div><div class='del'>-	/* deallocate arrays */</div><div class='del'>-	kfree(txq-&gt;cmd);</div><div class='del'>-	kfree(txq-&gt;meta);</div><div class='del'>-	txq-&gt;cmd = NULL;</div><div class='del'>-	txq-&gt;meta = NULL;</div><div class='del'>-</div><div class='del'>-	/* 0-fill queue descriptor structure */</div><div class='del'>-	memset(txq, 0, sizeof(*txq));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_tx_queue_free);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_cmd_queue_unmap - Unmap any remaining DMA mappings from command queue</div><div class='del'>- */</div><div class='del'>-void iwl_legacy_cmd_queue_unmap(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tx_queue *txq = &amp;priv-&gt;txq[priv-&gt;cmd_queue];</div><div class='del'>-	struct iwl_queue *q = &amp;txq-&gt;q;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (q-&gt;n_bd == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	while (q-&gt;read_ptr != q-&gt;write_ptr) {</div><div class='del'>-		i = iwl_legacy_get_cmd_index(q, q-&gt;read_ptr, 0);</div><div class='del'>-</div><div class='del'>-		if (txq-&gt;meta[i].flags &amp; CMD_MAPPED) {</div><div class='del'>-			pci_unmap_single(priv-&gt;pci_dev,</div><div class='del'>-					 dma_unmap_addr(&amp;txq-&gt;meta[i], mapping),</div><div class='del'>-					 dma_unmap_len(&amp;txq-&gt;meta[i], len),</div><div class='del'>-					 PCI_DMA_BIDIRECTIONAL);</div><div class='del'>-			txq-&gt;meta[i].flags = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		q-&gt;read_ptr = iwl_legacy_queue_inc_wrap(q-&gt;read_ptr, q-&gt;n_bd);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	i = q-&gt;n_window;</div><div class='del'>-	if (txq-&gt;meta[i].flags &amp; CMD_MAPPED) {</div><div class='del'>-		pci_unmap_single(priv-&gt;pci_dev,</div><div class='del'>-				 dma_unmap_addr(&amp;txq-&gt;meta[i], mapping),</div><div class='del'>-				 dma_unmap_len(&amp;txq-&gt;meta[i], len),</div><div class='del'>-				 PCI_DMA_BIDIRECTIONAL);</div><div class='del'>-		txq-&gt;meta[i].flags = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_cmd_queue_unmap);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_cmd_queue_free - Deallocate DMA queue.</div><div class='del'>- * @txq: Transmit queue to deallocate.</div><div class='del'>- *</div><div class='del'>- * Empty queue by removing and destroying all BD's.</div><div class='del'>- * Free all buffers.</div><div class='del'>- * 0-fill, but do not free "txq" descriptor structure.</div><div class='del'>- */</div><div class='del'>-void iwl_legacy_cmd_queue_free(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tx_queue *txq = &amp;priv-&gt;txq[priv-&gt;cmd_queue];</div><div class='del'>-	struct device *dev = &amp;priv-&gt;pci_dev-&gt;dev;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_cmd_queue_unmap(priv);</div><div class='del'>-</div><div class='del'>-	/* De-alloc array of command/tx buffers */</div><div class='del'>-	for (i = 0; i &lt;= TFD_CMD_SLOTS; i++)</div><div class='del'>-		kfree(txq-&gt;cmd[i]);</div><div class='del'>-</div><div class='del'>-	/* De-alloc circular buffer of TFDs */</div><div class='del'>-	if (txq-&gt;q.n_bd)</div><div class='del'>-		dma_free_coherent(dev, priv-&gt;hw_params.tfd_size * txq-&gt;q.n_bd,</div><div class='del'>-				  txq-&gt;tfds, txq-&gt;q.dma_addr);</div><div class='del'>-</div><div class='del'>-	/* deallocate arrays */</div><div class='del'>-	kfree(txq-&gt;cmd);</div><div class='del'>-	kfree(txq-&gt;meta);</div><div class='del'>-	txq-&gt;cmd = NULL;</div><div class='del'>-	txq-&gt;meta = NULL;</div><div class='del'>-</div><div class='del'>-	/* 0-fill queue descriptor structure */</div><div class='del'>-	memset(txq, 0, sizeof(*txq));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_cmd_queue_free);</div><div class='del'>-</div><div class='del'>-/*************** DMA-QUEUE-GENERAL-FUNCTIONS  *****</div><div class='del'>- * DMA services</div><div class='del'>- *</div><div class='del'>- * Theory of operation</div><div class='del'>- *</div><div class='del'>- * A Tx or Rx queue resides in host DRAM, and is comprised of a circular buffer</div><div class='del'>- * of buffer descriptors, each of which points to one or more data buffers for</div><div class='del'>- * the device to read from or fill.  Driver and device exchange status of each</div><div class='del'>- * queue via "read" and "write" pointers.  Driver keeps minimum of 2 empty</div><div class='del'>- * entries in each circular buffer, to protect against confusing empty and full</div><div class='del'>- * queue states.</div><div class='del'>- *</div><div class='del'>- * The device reads or writes the data in the queues via the device's several</div><div class='del'>- * DMA/FIFO channels.  Each queue is mapped to a single DMA channel.</div><div class='del'>- *</div><div class='del'>- * For Tx queue, there are low mark and high mark limits. If, after queuing</div><div class='del'>- * the packet for Tx, free space become &lt; low mark, Tx queue stopped. When</div><div class='del'>- * reclaiming packets (on 'tx done IRQ), if free space become &gt; high mark,</div><div class='del'>- * Tx queue resumed.</div><div class='del'>- *</div><div class='del'>- * See more detailed info in iwl-4965-hw.h.</div><div class='del'>- ***************************************************/</div><div class='del'>-</div><div class='del'>-int iwl_legacy_queue_space(const struct iwl_queue *q)</div><div class='del'>-{</div><div class='del'>-	int s = q-&gt;read_ptr - q-&gt;write_ptr;</div><div class='del'>-</div><div class='del'>-	if (q-&gt;read_ptr &gt; q-&gt;write_ptr)</div><div class='del'>-		s -= q-&gt;n_bd;</div><div class='del'>-</div><div class='del'>-	if (s &lt;= 0)</div><div class='del'>-		s += q-&gt;n_window;</div><div class='del'>-	/* keep some reserve to not confuse empty and full situations */</div><div class='del'>-	s -= 2;</div><div class='del'>-	if (s &lt; 0)</div><div class='del'>-		s = 0;</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_queue_space);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_queue_init - Initialize queue's high/low-water and read/write indexes</div><div class='del'>- */</div><div class='del'>-static int iwl_legacy_queue_init(struct iwl_priv *priv, struct iwl_queue *q,</div><div class='del'>-			  int count, int slots_num, u32 id)</div><div class='del'>-{</div><div class='del'>-	q-&gt;n_bd = count;</div><div class='del'>-	q-&gt;n_window = slots_num;</div><div class='del'>-	q-&gt;id = id;</div><div class='del'>-</div><div class='del'>-	/* count must be power-of-two size, otherwise iwl_legacy_queue_inc_wrap</div><div class='del'>-	 * and iwl_legacy_queue_dec_wrap are broken. */</div><div class='del'>-	BUG_ON(!is_power_of_2(count));</div><div class='del'>-</div><div class='del'>-	/* slots_num must be power-of-two size, otherwise</div><div class='del'>-	 * iwl_legacy_get_cmd_index is broken. */</div><div class='del'>-	BUG_ON(!is_power_of_2(slots_num));</div><div class='del'>-</div><div class='del'>-	q-&gt;low_mark = q-&gt;n_window / 4;</div><div class='del'>-	if (q-&gt;low_mark &lt; 4)</div><div class='del'>-		q-&gt;low_mark = 4;</div><div class='del'>-</div><div class='del'>-	q-&gt;high_mark = q-&gt;n_window / 8;</div><div class='del'>-	if (q-&gt;high_mark &lt; 2)</div><div class='del'>-		q-&gt;high_mark = 2;</div><div class='del'>-</div><div class='del'>-	q-&gt;write_ptr = q-&gt;read_ptr = 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'>- * iwl_legacy_tx_queue_alloc - Alloc driver data and TFD CB for one Tx/cmd queue</div><div class='del'>- */</div><div class='del'>-static int iwl_legacy_tx_queue_alloc(struct iwl_priv *priv,</div><div class='del'>-			      struct iwl_tx_queue *txq, u32 id)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = &amp;priv-&gt;pci_dev-&gt;dev;</div><div class='del'>-	size_t tfd_sz = priv-&gt;hw_params.tfd_size * TFD_QUEUE_SIZE_MAX;</div><div class='del'>-</div><div class='del'>-	/* Driver private data, only for Tx (not command) queues,</div><div class='del'>-	 * not shared with device. */</div><div class='del'>-	if (id != priv-&gt;cmd_queue) {</div><div class='del'>-		txq-&gt;txb = kzalloc(sizeof(txq-&gt;txb[0]) *</div><div class='del'>-				   TFD_QUEUE_SIZE_MAX, GFP_KERNEL);</div><div class='del'>-		if (!txq-&gt;txb) {</div><div class='del'>-			IWL_ERR(priv, "kmalloc for auxiliary BD "</div><div class='del'>-				  "structures failed\n");</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		txq-&gt;txb = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Circular buffer of transmit frame descriptors (TFDs),</div><div class='del'>-	 * shared with device */</div><div class='del'>-	txq-&gt;tfds = dma_alloc_coherent(dev, tfd_sz, &amp;txq-&gt;q.dma_addr,</div><div class='del'>-				       GFP_KERNEL);</div><div class='del'>-	if (!txq-&gt;tfds) {</div><div class='del'>-		IWL_ERR(priv, "pci_alloc_consistent(%zd) failed\n", tfd_sz);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	txq-&gt;q.id = id;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	kfree(txq-&gt;txb);</div><div class='del'>-	txq-&gt;txb = NULL;</div><div class='del'>-</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_tx_queue_init - Allocate and initialize one tx/cmd queue</div><div class='del'>- */</div><div class='del'>-int iwl_legacy_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,</div><div class='del'>-		      int slots_num, u32 txq_id)</div><div class='del'>-{</div><div class='del'>-	int i, len;</div><div class='del'>-	int ret;</div><div class='del'>-	int actual_slots = slots_num;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Alloc buffer array for commands (Tx or other types of commands).</div><div class='del'>-	 * For the command queue (#4/#9), allocate command space + one big</div><div class='del'>-	 * command for scan, since scan command is very huge; the system will</div><div class='del'>-	 * not have two scans at the same time, so only one is needed.</div><div class='del'>-	 * For normal Tx queues (all other queues), no super-size command</div><div class='del'>-	 * space is needed.</div><div class='del'>-	 */</div><div class='del'>-	if (txq_id == priv-&gt;cmd_queue)</div><div class='del'>-		actual_slots++;</div><div class='del'>-</div><div class='del'>-	txq-&gt;meta = kzalloc(sizeof(struct iwl_cmd_meta) * actual_slots,</div><div class='del'>-			    GFP_KERNEL);</div><div class='del'>-	txq-&gt;cmd = kzalloc(sizeof(struct iwl_device_cmd *) * actual_slots,</div><div class='del'>-			   GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!txq-&gt;meta || !txq-&gt;cmd)</div><div class='del'>-		goto out_free_arrays;</div><div class='del'>-</div><div class='del'>-	len = sizeof(struct iwl_device_cmd);</div><div class='del'>-	for (i = 0; i &lt; actual_slots; i++) {</div><div class='del'>-		/* only happens for cmd queue */</div><div class='del'>-		if (i == slots_num)</div><div class='del'>-			len = IWL_MAX_CMD_SIZE;</div><div class='del'>-</div><div class='del'>-		txq-&gt;cmd[i] = kmalloc(len, GFP_KERNEL);</div><div class='del'>-		if (!txq-&gt;cmd[i])</div><div class='del'>-			goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Alloc driver data array and TFD circular buffer */</div><div class='del'>-	ret = iwl_legacy_tx_queue_alloc(priv, txq, txq_id);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	txq-&gt;need_update = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For the default queues 0-3, set up the swq_id</div><div class='del'>-	 * already -- all others need to get one later</div><div class='del'>-	 * (if they need one at all).</div><div class='del'>-	 */</div><div class='del'>-	if (txq_id &lt; 4)</div><div class='del'>-		iwl_legacy_set_swq_id(txq, txq_id, txq_id);</div><div class='del'>-</div><div class='del'>-	/* TFD_QUEUE_SIZE_MAX must be power-of-two size, otherwise</div><div class='del'>-	 * iwl_legacy_queue_inc_wrap and iwl_legacy_queue_dec_wrap are broken. */</div><div class='del'>-	BUILD_BUG_ON(TFD_QUEUE_SIZE_MAX &amp; (TFD_QUEUE_SIZE_MAX - 1));</div><div class='del'>-</div><div class='del'>-	/* Initialize queue's high/low-water marks, and head/tail indexes */</div><div class='del'>-	iwl_legacy_queue_init(priv, &amp;txq-&gt;q,</div><div class='del'>-				TFD_QUEUE_SIZE_MAX, slots_num, txq_id);</div><div class='del'>-</div><div class='del'>-	/* Tell device where to find queue */</div><div class='del'>-	priv-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_init(priv, txq);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	for (i = 0; i &lt; actual_slots; i++)</div><div class='del'>-		kfree(txq-&gt;cmd[i]);</div><div class='del'>-out_free_arrays:</div><div class='del'>-	kfree(txq-&gt;meta);</div><div class='del'>-	kfree(txq-&gt;cmd);</div><div class='del'>-</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_tx_queue_init);</div><div class='del'>-</div><div class='del'>-void iwl_legacy_tx_queue_reset(struct iwl_priv *priv, struct iwl_tx_queue *txq,</div><div class='del'>-			int slots_num, u32 txq_id)</div><div class='del'>-{</div><div class='del'>-	int actual_slots = slots_num;</div><div class='del'>-</div><div class='del'>-	if (txq_id == priv-&gt;cmd_queue)</div><div class='del'>-		actual_slots++;</div><div class='del'>-</div><div class='del'>-	memset(txq-&gt;meta, 0, sizeof(struct iwl_cmd_meta) * actual_slots);</div><div class='del'>-</div><div class='del'>-	txq-&gt;need_update = 0;</div><div class='del'>-</div><div class='del'>-	/* Initialize queue's high/low-water marks, and head/tail indexes */</div><div class='del'>-	iwl_legacy_queue_init(priv, &amp;txq-&gt;q,</div><div class='del'>-				TFD_QUEUE_SIZE_MAX, slots_num, txq_id);</div><div class='del'>-</div><div class='del'>-	/* Tell device where to find queue */</div><div class='del'>-	priv-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_init(priv, txq);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_tx_queue_reset);</div><div class='del'>-</div><div class='del'>-/*************** HOST COMMAND QUEUE FUNCTIONS   *****/</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_enqueue_hcmd - enqueue a uCode command</div><div class='del'>- * @priv: device private data point</div><div class='del'>- * @cmd: a point to the ucode command structure</div><div class='del'>- *</div><div class='del'>- * The function returns &lt; 0 values to indicate the operation is</div><div class='del'>- * failed. On success, it turns the index (&gt; 0) of command in the</div><div class='del'>- * command queue.</div><div class='del'>- */</div><div class='del'>-int iwl_legacy_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tx_queue *txq = &amp;priv-&gt;txq[priv-&gt;cmd_queue];</div><div class='del'>-	struct iwl_queue *q = &amp;txq-&gt;q;</div><div class='del'>-	struct iwl_device_cmd *out_cmd;</div><div class='del'>-	struct iwl_cmd_meta *out_meta;</div><div class='del'>-	dma_addr_t phys_addr;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int len;</div><div class='del'>-	u32 idx;</div><div class='del'>-	u16 fix_size;</div><div class='del'>-</div><div class='del'>-	cmd-&gt;len = priv-&gt;cfg-&gt;ops-&gt;utils-&gt;get_hcmd_size(cmd-&gt;id, cmd-&gt;len);</div><div class='del'>-	fix_size = (u16)(cmd-&gt;len + sizeof(out_cmd-&gt;hdr));</div><div class='del'>-</div><div class='del'>-	/* If any of the command structures end up being larger than</div><div class='del'>-	 * the TFD_MAX_PAYLOAD_SIZE, and it sent as a 'small' command then</div><div class='del'>-	 * we will need to increase the size of the TFD entries</div><div class='del'>-	 * Also, check to see if command buffer should not exceed the size</div><div class='del'>-	 * of device_cmd and max_cmd_size. */</div><div class='del'>-	BUG_ON((fix_size &gt; TFD_MAX_PAYLOAD_SIZE) &amp;&amp;</div><div class='del'>-	       !(cmd-&gt;flags &amp; CMD_SIZE_HUGE));</div><div class='del'>-	BUG_ON(fix_size &gt; IWL_MAX_CMD_SIZE);</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_is_rfkill(priv) || iwl_legacy_is_ctkill(priv)) {</div><div class='del'>-		IWL_WARN(priv, "Not sending command - %s KILL\n",</div><div class='del'>-			 iwl_legacy_is_rfkill(priv) ? "RF" : "CT");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;hcmd_lock, flags);</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_queue_space(q) &lt; ((cmd-&gt;flags &amp; CMD_ASYNC) ? 2 : 1)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;hcmd_lock, flags);</div><div class='del'>-</div><div class='del'>-		IWL_ERR(priv, "Restarting adapter due to command queue full\n");</div><div class='del'>-		queue_work(priv-&gt;workqueue, &amp;priv-&gt;restart);</div><div class='del'>-		return -ENOSPC;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	idx = iwl_legacy_get_cmd_index(q, q-&gt;write_ptr, cmd-&gt;flags &amp; CMD_SIZE_HUGE);</div><div class='del'>-	out_cmd = txq-&gt;cmd[idx];</div><div class='del'>-	out_meta = &amp;txq-&gt;meta[idx];</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(out_meta-&gt;flags &amp; CMD_MAPPED)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;hcmd_lock, flags);</div><div class='del'>-		return -ENOSPC;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(out_meta, 0, sizeof(*out_meta));	/* re-initialize to NULL */</div><div class='del'>-	out_meta-&gt;flags = cmd-&gt;flags | CMD_MAPPED;</div><div class='del'>-	if (cmd-&gt;flags &amp; CMD_WANT_SKB)</div><div class='del'>-		out_meta-&gt;source = cmd;</div><div class='del'>-	if (cmd-&gt;flags &amp; CMD_ASYNC)</div><div class='del'>-		out_meta-&gt;callback = cmd-&gt;callback;</div><div class='del'>-</div><div class='del'>-	out_cmd-&gt;hdr.cmd = cmd-&gt;id;</div><div class='del'>-	memcpy(&amp;out_cmd-&gt;cmd.payload, cmd-&gt;data, cmd-&gt;len);</div><div class='del'>-</div><div class='del'>-	/* At this point, the out_cmd now has all of the incoming cmd</div><div class='del'>-	 * information */</div><div class='del'>-</div><div class='del'>-	out_cmd-&gt;hdr.flags = 0;</div><div class='del'>-	out_cmd-&gt;hdr.sequence = cpu_to_le16(QUEUE_TO_SEQ(priv-&gt;cmd_queue) |</div><div class='del'>-			INDEX_TO_SEQ(q-&gt;write_ptr));</div><div class='del'>-	if (cmd-&gt;flags &amp; CMD_SIZE_HUGE)</div><div class='del'>-		out_cmd-&gt;hdr.sequence |= SEQ_HUGE_FRAME;</div><div class='del'>-	len = sizeof(struct iwl_device_cmd);</div><div class='del'>-	if (idx == TFD_CMD_SLOTS)</div><div class='del'>-		len = IWL_MAX_CMD_SIZE;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	switch (out_cmd-&gt;hdr.cmd) {</div><div class='del'>-	case REPLY_TX_LINK_QUALITY_CMD:</div><div class='del'>-	case SENSITIVITY_CMD:</div><div class='del'>-		IWL_DEBUG_HC_DUMP(priv,</div><div class='del'>-				"Sending command %s (#%x), seq: 0x%04X, "</div><div class='del'>-				"%d bytes at %d[%d]:%d\n",</div><div class='del'>-				iwl_legacy_get_cmd_string(out_cmd-&gt;hdr.cmd),</div><div class='del'>-				out_cmd-&gt;hdr.cmd,</div><div class='del'>-				le16_to_cpu(out_cmd-&gt;hdr.sequence), fix_size,</div><div class='del'>-				q-&gt;write_ptr, idx, priv-&gt;cmd_queue);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		IWL_DEBUG_HC(priv, "Sending command %s (#%x), seq: 0x%04X, "</div><div class='del'>-				"%d bytes at %d[%d]:%d\n",</div><div class='del'>-				iwl_legacy_get_cmd_string(out_cmd-&gt;hdr.cmd),</div><div class='del'>-				out_cmd-&gt;hdr.cmd,</div><div class='del'>-				le16_to_cpu(out_cmd-&gt;hdr.sequence), fix_size,</div><div class='del'>-				q-&gt;write_ptr, idx, priv-&gt;cmd_queue);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	txq-&gt;need_update = 1;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_update_byte_cnt_tbl)</div><div class='del'>-		/* Set up entry in queue's byte count circular buffer */</div><div class='del'>-		priv-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_update_byte_cnt_tbl(priv, txq, 0);</div><div class='del'>-</div><div class='del'>-	phys_addr = pci_map_single(priv-&gt;pci_dev, &amp;out_cmd-&gt;hdr,</div><div class='del'>-				   fix_size, PCI_DMA_BIDIRECTIONAL);</div><div class='del'>-	dma_unmap_addr_set(out_meta, mapping, phys_addr);</div><div class='del'>-	dma_unmap_len_set(out_meta, len, fix_size);</div><div class='del'>-</div><div class='del'>-	trace_iwlwifi_legacy_dev_hcmd(priv, &amp;out_cmd-&gt;hdr,</div><div class='del'>-						fix_size, cmd-&gt;flags);</div><div class='del'>-</div><div class='del'>-	priv-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_attach_buf_to_tfd(priv, txq,</div><div class='del'>-						   phys_addr, fix_size, 1,</div><div class='del'>-						   U32_PAD(cmd-&gt;len));</div><div class='del'>-</div><div class='del'>-	/* Increment and update queue's write index */</div><div class='del'>-	q-&gt;write_ptr = iwl_legacy_queue_inc_wrap(q-&gt;write_ptr, q-&gt;n_bd);</div><div class='del'>-	iwl_legacy_txq_update_write_ptr(priv, txq);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;hcmd_lock, flags);</div><div class='del'>-	return idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl_legacy_hcmd_queue_reclaim - Reclaim TX command queue entries already Tx'd</div><div class='del'>- *</div><div class='del'>- * When FW advances 'R' index, all entries between old and new 'R' index</div><div class='del'>- * need to be reclaimed. As result, some free space forms.  If there is</div><div class='del'>- * enough free space (&gt; low mark), wake the stack that feeds us.</div><div class='del'>- */</div><div class='del'>-static void iwl_legacy_hcmd_queue_reclaim(struct iwl_priv *priv, int txq_id,</div><div class='del'>-				   int idx, int cmd_idx)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tx_queue *txq = &amp;priv-&gt;txq[txq_id];</div><div class='del'>-	struct iwl_queue *q = &amp;txq-&gt;q;</div><div class='del'>-	int nfreed = 0;</div><div class='del'>-</div><div class='del'>-	if ((idx &gt;= q-&gt;n_bd) || (iwl_legacy_queue_used(q, idx) == 0)) {</div><div class='del'>-		IWL_ERR(priv, "Read index for DMA queue txq id (%d), index %d, "</div><div class='del'>-			  "is out of range [0-%d] %d %d.\n", txq_id,</div><div class='del'>-			  idx, q-&gt;n_bd, q-&gt;write_ptr, q-&gt;read_ptr);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (idx = iwl_legacy_queue_inc_wrap(idx, q-&gt;n_bd); q-&gt;read_ptr != idx;</div><div class='del'>-	     q-&gt;read_ptr = iwl_legacy_queue_inc_wrap(q-&gt;read_ptr, q-&gt;n_bd)) {</div><div class='del'>-</div><div class='del'>-		if (nfreed++ &gt; 0) {</div><div class='del'>-			IWL_ERR(priv, "HCMD skipped: index (%d) %d %d\n", idx,</div><div class='del'>-					q-&gt;write_ptr, q-&gt;read_ptr);</div><div class='del'>-			queue_work(priv-&gt;workqueue, &amp;priv-&gt;restart);</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'>- * iwl_legacy_tx_cmd_complete - Pull unused buffers off the queue and reclaim them</div><div class='del'>- * @rxb: Rx buffer to reclaim</div><div class='del'>- *</div><div class='del'>- * If an Rx buffer has an async callback associated with it the callback</div><div class='del'>- * will be executed.  The attached skb (if present) will only be freed</div><div class='del'>- * if the callback returns 1</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-iwl_legacy_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	u16 sequence = le16_to_cpu(pkt-&gt;hdr.sequence);</div><div class='del'>-	int txq_id = SEQ_TO_QUEUE(sequence);</div><div class='del'>-	int index = SEQ_TO_INDEX(sequence);</div><div class='del'>-	int cmd_index;</div><div class='del'>-	bool huge = !!(pkt-&gt;hdr.sequence &amp; SEQ_HUGE_FRAME);</div><div class='del'>-	struct iwl_device_cmd *cmd;</div><div class='del'>-	struct iwl_cmd_meta *meta;</div><div class='del'>-	struct iwl_tx_queue *txq = &amp;priv-&gt;txq[priv-&gt;cmd_queue];</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* If a Tx command is being handled and it isn't in the actual</div><div class='del'>-	 * command queue then there a command routing bug has been introduced</div><div class='del'>-	 * in the queue management code. */</div><div class='del'>-	if (WARN(txq_id != priv-&gt;cmd_queue,</div><div class='del'>-		 "wrong command queue %d (should be %d), sequence 0x%X readp=%d writep=%d\n",</div><div class='del'>-		  txq_id, priv-&gt;cmd_queue, sequence,</div><div class='del'>-		  priv-&gt;txq[priv-&gt;cmd_queue].q.read_ptr,</div><div class='del'>-		  priv-&gt;txq[priv-&gt;cmd_queue].q.write_ptr)) {</div><div class='del'>-		iwl_print_hex_error(priv, pkt, 32);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd_index = iwl_legacy_get_cmd_index(&amp;txq-&gt;q, index, huge);</div><div class='del'>-	cmd = txq-&gt;cmd[cmd_index];</div><div class='del'>-	meta = &amp;txq-&gt;meta[cmd_index];</div><div class='del'>-</div><div class='del'>-	txq-&gt;time_stamp = jiffies;</div><div class='del'>-</div><div class='del'>-	pci_unmap_single(priv-&gt;pci_dev,</div><div class='del'>-			 dma_unmap_addr(meta, mapping),</div><div class='del'>-			 dma_unmap_len(meta, len),</div><div class='del'>-			 PCI_DMA_BIDIRECTIONAL);</div><div class='del'>-</div><div class='del'>-	/* Input error checking is done when commands are added to queue. */</div><div class='del'>-	if (meta-&gt;flags &amp; CMD_WANT_SKB) {</div><div class='del'>-		meta-&gt;source-&gt;reply_page = (unsigned long)rxb_addr(rxb);</div><div class='del'>-		rxb-&gt;page = NULL;</div><div class='del'>-	} else if (meta-&gt;callback)</div><div class='del'>-		meta-&gt;callback(priv, cmd, pkt);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;hcmd_lock, flags);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_hcmd_queue_reclaim(priv, txq_id, index, cmd_index);</div><div class='del'>-</div><div class='del'>-	if (!(meta-&gt;flags &amp; CMD_ASYNC)) {</div><div class='del'>-		clear_bit(STATUS_HCMD_ACTIVE, &amp;priv-&gt;status);</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Clearing HCMD_ACTIVE for command %s\n",</div><div class='del'>-			       iwl_legacy_get_cmd_string(cmd-&gt;hdr.cmd));</div><div class='del'>-		wake_up(&amp;priv-&gt;wait_command_queue);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Mark as unmapped */</div><div class='del'>-	meta-&gt;flags = 0;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;hcmd_lock, flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(iwl_legacy_tx_cmd_complete);</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl3945-base.c b/drivers/net/wireless/iwlegacy/iwl3945-base.c<br/>deleted file mode 100644<br/>index b282d869a546..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl3945-base.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl3945-base.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4016 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Portions of this file are derived from the ipw3945 project, as well</div><div class='del'>- * as portions of the ieee80211 subsystem header files.</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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='del'>-</div><div class='del'>-#include &lt;linux/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/pci.h&gt;</div><div class='del'>-#include &lt;linux/pci-aspm.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/ieee80211_radiotap.h&gt;</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/div64.h&gt;</div><div class='del'>-</div><div class='del'>-#define DRV_NAME	"iwl3945"</div><div class='del'>-</div><div class='del'>-#include "iwl-fh.h"</div><div class='del'>-#include "iwl-3945-fh.h"</div><div class='del'>-#include "iwl-commands.h"</div><div class='del'>-#include "iwl-sta.h"</div><div class='del'>-#include "iwl-3945.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-helpers.h"</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-spectrum.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * module name, copyright, version, etc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define DRV_DESCRIPTION	\</div><div class='del'>-"Intel(R) PRO/Wireless 3945ABG/BG Network Connection driver for Linux"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-#define VD "d"</div><div class='del'>-#else</div><div class='del'>-#define VD</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * add "s" to indicate spectrum measurement included.</div><div class='del'>- * we add it here to be consistent with previous releases in which</div><div class='del'>- * this was configurable.</div><div class='del'>- */</div><div class='del'>-#define DRV_VERSION  IWLWIFI_VERSION VD "s"</div><div class='del'>-#define DRV_COPYRIGHT	"Copyright(c) 2003-2011 Intel Corporation"</div><div class='del'>-#define DRV_AUTHOR     "&lt;ilw@linux.intel.com&gt;"</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION(DRV_DESCRIPTION);</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='del'>-MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>- /* module parameters */</div><div class='del'>-struct iwl_mod_params iwl3945_mod_params = {</div><div class='del'>-	.sw_crypto = 1,</div><div class='del'>-	.restart_fw = 1,</div><div class='del'>-	.disable_hw_scan = 1,</div><div class='del'>-	/* the rest are 0 by default */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_get_antenna_flags - Get antenna flags for RXON command</div><div class='del'>- * @priv: eeprom and antenna fields are used to determine antenna flags</div><div class='del'>- *</div><div class='del'>- * priv-&gt;eeprom39  is used to determine if antenna AUX/MAIN are reversed</div><div class='del'>- * iwl3945_mod_params.antenna specifies the antenna diversity mode:</div><div class='del'>- *</div><div class='del'>- * IWL_ANTENNA_DIVERSITY - NIC selects best antenna by itself</div><div class='del'>- * IWL_ANTENNA_MAIN      - Force MAIN antenna</div><div class='del'>- * IWL_ANTENNA_AUX       - Force AUX antenna</div><div class='del'>- */</div><div class='del'>-__le32 iwl3945_get_antenna_flags(const struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv-&gt;eeprom;</div><div class='del'>-</div><div class='del'>-	switch (iwl3945_mod_params.antenna) {</div><div class='del'>-	case IWL_ANTENNA_DIVERSITY:</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case IWL_ANTENNA_MAIN:</div><div class='del'>-		if (eeprom-&gt;antenna_switch_type)</div><div class='del'>-			return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_B_MSK;</div><div class='del'>-		return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_A_MSK;</div><div class='del'>-</div><div class='del'>-	case IWL_ANTENNA_AUX:</div><div class='del'>-		if (eeprom-&gt;antenna_switch_type)</div><div class='del'>-			return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_A_MSK;</div><div class='del'>-		return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_B_MSK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* bad antenna selector value */</div><div class='del'>-	IWL_ERR(priv, "Bad antenna selector value (0x%x)\n",</div><div class='del'>-		iwl3945_mod_params.antenna);</div><div class='del'>-</div><div class='del'>-	return 0;		/* "diversity" is default if error */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl3945_set_ccmp_dynamic_key_info(struct iwl_priv *priv,</div><div class='del'>-				   struct ieee80211_key_conf *keyconf,</div><div class='del'>-				   u8 sta_id)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	__le16 key_flags = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	key_flags |= (STA_KEY_FLG_CCMP | STA_KEY_FLG_MAP_KEY_MSK);</div><div class='del'>-	key_flags |= cpu_to_le16(keyconf-&gt;keyidx &lt;&lt; STA_KEY_FLG_KEYID_POS);</div><div class='del'>-</div><div class='del'>-	if (sta_id == priv-&gt;contexts[IWL_RXON_CTX_BSS].bcast_sta_id)</div><div class='del'>-		key_flags |= STA_KEY_MULTICAST_MSK;</div><div class='del'>-</div><div class='del'>-	keyconf-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV;</div><div class='del'>-	keyconf-&gt;hw_key_idx = keyconf-&gt;keyidx;</div><div class='del'>-	key_flags &amp;= ~STA_KEY_FLG_INVALID;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	priv-&gt;stations[sta_id].keyinfo.cipher = keyconf-&gt;cipher;</div><div class='del'>-	priv-&gt;stations[sta_id].keyinfo.keylen = keyconf-&gt;keylen;</div><div class='del'>-	memcpy(priv-&gt;stations[sta_id].keyinfo.key, keyconf-&gt;key,</div><div class='del'>-	       keyconf-&gt;keylen);</div><div class='del'>-</div><div class='del'>-	memcpy(priv-&gt;stations[sta_id].sta.key.key, keyconf-&gt;key,</div><div class='del'>-	       keyconf-&gt;keylen);</div><div class='del'>-</div><div class='del'>-	if ((priv-&gt;stations[sta_id].sta.key.key_flags &amp; STA_KEY_FLG_ENCRYPT_MSK)</div><div class='del'>-			== STA_KEY_FLG_NO_ENC)</div><div class='del'>-		priv-&gt;stations[sta_id].sta.key.key_offset =</div><div class='del'>-				 iwl_legacy_get_free_ucode_key_index(priv);</div><div class='del'>-	/* else, we are overriding an existing key =&gt; no need to allocated room</div><div class='del'>-	* in uCode. */</div><div class='del'>-</div><div class='del'>-	WARN(priv-&gt;stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,</div><div class='del'>-		"no space for a new key");</div><div class='del'>-</div><div class='del'>-	priv-&gt;stations[sta_id].sta.key.key_flags = key_flags;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "hwcrypto: modify ucode station key info\n");</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_send_add_sta(priv,</div><div class='del'>-				&amp;priv-&gt;stations[sta_id].sta, CMD_ASYNC);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl3945_set_tkip_dynamic_key_info(struct iwl_priv *priv,</div><div class='del'>-				  struct ieee80211_key_conf *keyconf,</div><div class='del'>-				  u8 sta_id)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl3945_set_wep_dynamic_key_info(struct iwl_priv *priv,</div><div class='del'>-				  struct ieee80211_key_conf *keyconf,</div><div class='del'>-				  u8 sta_id)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl3945_clear_sta_key_info(struct iwl_priv *priv, u8 sta_id)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct iwl_legacy_addsta_cmd sta_cmd;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	memset(&amp;priv-&gt;stations[sta_id].keyinfo, 0, sizeof(struct iwl_hw_key));</div><div class='del'>-	memset(&amp;priv-&gt;stations[sta_id].sta.key, 0,</div><div class='del'>-		sizeof(struct iwl4965_keyinfo));</div><div class='del'>-	priv-&gt;stations[sta_id].sta.key.key_flags = STA_KEY_FLG_NO_ENC;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='del'>-	memcpy(&amp;sta_cmd, &amp;priv-&gt;stations[sta_id].sta, sizeof(struct iwl_legacy_addsta_cmd));</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "hwcrypto: clear ucode station key info\n");</div><div class='del'>-	return iwl_legacy_send_add_sta(priv, &amp;sta_cmd, CMD_SYNC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl3945_set_dynamic_key(struct iwl_priv *priv,</div><div class='del'>-			struct ieee80211_key_conf *keyconf, u8 sta_id)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	keyconf-&gt;hw_key_idx = HW_KEY_DYNAMIC;</div><div class='del'>-</div><div class='del'>-	switch (keyconf-&gt;cipher) {</div><div class='del'>-	case WLAN_CIPHER_SUITE_CCMP:</div><div class='del'>-		ret = iwl3945_set_ccmp_dynamic_key_info(priv, keyconf, sta_id);</div><div class='del'>-		break;</div><div class='del'>-	case WLAN_CIPHER_SUITE_TKIP:</div><div class='del'>-		ret = iwl3945_set_tkip_dynamic_key_info(priv, keyconf, sta_id);</div><div class='del'>-		break;</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP40:</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP104:</div><div class='del'>-		ret = iwl3945_set_wep_dynamic_key_info(priv, keyconf, sta_id);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		IWL_ERR(priv, "Unknown alg: %s alg=%x\n", __func__,</div><div class='del'>-			keyconf-&gt;cipher);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_WEP(priv, "Set dynamic key: alg=%x len=%d idx=%d sta=%d ret=%d\n",</div><div class='del'>-		      keyconf-&gt;cipher, keyconf-&gt;keylen, keyconf-&gt;keyidx,</div><div class='del'>-		      sta_id, ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl3945_remove_static_key(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int ret = -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl3945_set_static_key(struct iwl_priv *priv,</div><div class='del'>-				struct ieee80211_key_conf *key)</div><div class='del'>-{</div><div class='del'>-	if (key-&gt;cipher == WLAN_CIPHER_SUITE_WEP40 ||</div><div class='del'>-	    key-&gt;cipher == WLAN_CIPHER_SUITE_WEP104)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	IWL_ERR(priv, "Static key invalid: cipher %x\n", key-&gt;cipher);</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_clear_free_frames(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct list_head *element;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "%d frames on pre-allocated heap on clear.\n",</div><div class='del'>-		       priv-&gt;frames_count);</div><div class='del'>-</div><div class='del'>-	while (!list_empty(&amp;priv-&gt;free_frames)) {</div><div class='del'>-		element = priv-&gt;free_frames.next;</div><div class='del'>-		list_del(element);</div><div class='del'>-		kfree(list_entry(element, struct iwl3945_frame, list));</div><div class='del'>-		priv-&gt;frames_count--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;frames_count) {</div><div class='del'>-		IWL_WARN(priv, "%d frames still in use.  Did we lose one?\n",</div><div class='del'>-			    priv-&gt;frames_count);</div><div class='del'>-		priv-&gt;frames_count = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct iwl3945_frame *iwl3945_get_free_frame(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_frame *frame;</div><div class='del'>-	struct list_head *element;</div><div class='del'>-	if (list_empty(&amp;priv-&gt;free_frames)) {</div><div class='del'>-		frame = kzalloc(sizeof(*frame), GFP_KERNEL);</div><div class='del'>-		if (!frame) {</div><div class='del'>-			IWL_ERR(priv, "Could not allocate frame!\n");</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		priv-&gt;frames_count++;</div><div class='del'>-		return frame;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	element = priv-&gt;free_frames.next;</div><div class='del'>-	list_del(element);</div><div class='del'>-	return list_entry(element, struct iwl3945_frame, list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_free_frame(struct iwl_priv *priv, struct iwl3945_frame *frame)</div><div class='del'>-{</div><div class='del'>-	memset(frame, 0, sizeof(*frame));</div><div class='del'>-	list_add(&amp;frame-&gt;list, &amp;priv-&gt;free_frames);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,</div><div class='del'>-				struct ieee80211_hdr *hdr,</div><div class='del'>-				int left)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS) || !priv-&gt;beacon_skb)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;beacon_skb-&gt;len &gt; left)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	memcpy(hdr, priv-&gt;beacon_skb-&gt;data, priv-&gt;beacon_skb-&gt;len);</div><div class='del'>-</div><div class='del'>-	return priv-&gt;beacon_skb-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl3945_send_beacon_cmd(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_frame *frame;</div><div class='del'>-	unsigned int frame_size;</div><div class='del'>-	int rc;</div><div class='del'>-	u8 rate;</div><div class='del'>-</div><div class='del'>-	frame = iwl3945_get_free_frame(priv);</div><div class='del'>-</div><div class='del'>-	if (!frame) {</div><div class='del'>-		IWL_ERR(priv, "Could not obtain free frame buffer for beacon "</div><div class='del'>-			  "command.\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rate = iwl_legacy_get_lowest_plcp(priv,</div><div class='del'>-				&amp;priv-&gt;contexts[IWL_RXON_CTX_BSS]);</div><div class='del'>-</div><div class='del'>-	frame_size = iwl3945_hw_get_beacon_cmd(priv, frame, rate);</div><div class='del'>-</div><div class='del'>-	rc = iwl_legacy_send_cmd_pdu(priv, REPLY_TX_BEACON, frame_size,</div><div class='del'>-			      &amp;frame-&gt;u.cmd[0]);</div><div class='del'>-</div><div class='del'>-	iwl3945_free_frame(priv, frame);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_unset_hw_params(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	if (priv-&gt;_3945.shared_virt)</div><div class='del'>-		dma_free_coherent(&amp;priv-&gt;pci_dev-&gt;dev,</div><div class='del'>-				  sizeof(struct iwl3945_shared),</div><div class='del'>-				  priv-&gt;_3945.shared_virt,</div><div class='del'>-				  priv-&gt;_3945.shared_phys);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_build_tx_cmd_hwcrypto(struct iwl_priv *priv,</div><div class='del'>-				      struct ieee80211_tx_info *info,</div><div class='del'>-				      struct iwl_device_cmd *cmd,</div><div class='del'>-				      struct sk_buff *skb_frag,</div><div class='del'>-				      int sta_id)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_tx_cmd *tx_cmd = (struct iwl3945_tx_cmd *)cmd-&gt;cmd.payload;</div><div class='del'>-	struct iwl_hw_key *keyinfo = &amp;priv-&gt;stations[sta_id].keyinfo;</div><div class='del'>-</div><div class='del'>-	tx_cmd-&gt;sec_ctl = 0;</div><div class='del'>-</div><div class='del'>-	switch (keyinfo-&gt;cipher) {</div><div class='del'>-	case WLAN_CIPHER_SUITE_CCMP:</div><div class='del'>-		tx_cmd-&gt;sec_ctl = TX_CMD_SEC_CCM;</div><div class='del'>-		memcpy(tx_cmd-&gt;key, keyinfo-&gt;key, keyinfo-&gt;keylen);</div><div class='del'>-		IWL_DEBUG_TX(priv, "tx_cmd with AES hwcrypto\n");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case WLAN_CIPHER_SUITE_TKIP:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP104:</div><div class='del'>-		tx_cmd-&gt;sec_ctl |= TX_CMD_SEC_KEY128;</div><div class='del'>-		/* fall through */</div><div class='del'>-	case WLAN_CIPHER_SUITE_WEP40:</div><div class='del'>-		tx_cmd-&gt;sec_ctl |= TX_CMD_SEC_WEP |</div><div class='del'>-		    (info-&gt;control.hw_key-&gt;hw_key_idx &amp; TX_CMD_SEC_MSK) &lt;&lt; TX_CMD_SEC_SHIFT;</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;tx_cmd-&gt;key[3], keyinfo-&gt;key, keyinfo-&gt;keylen);</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_TX(priv, "Configuring packet for WEP encryption "</div><div class='del'>-			     "with key %d\n", info-&gt;control.hw_key-&gt;hw_key_idx);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		IWL_ERR(priv, "Unknown encode cipher %x\n", keyinfo-&gt;cipher);</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'>- * handle build REPLY_TX command notification.</div><div class='del'>- */</div><div class='del'>-static void iwl3945_build_tx_cmd_basic(struct iwl_priv *priv,</div><div class='del'>-				  struct iwl_device_cmd *cmd,</div><div class='del'>-				  struct ieee80211_tx_info *info,</div><div class='del'>-				  struct ieee80211_hdr *hdr, u8 std_id)</div><div class='del'>-{</div><div class='del'>-	struct iwl3945_tx_cmd *tx_cmd = (struct iwl3945_tx_cmd *)cmd-&gt;cmd.payload;</div><div class='del'>-	__le32 tx_flags = tx_cmd-&gt;tx_flags;</div><div class='del'>-	__le16 fc = hdr-&gt;frame_control;</div><div class='del'>-</div><div class='del'>-	tx_cmd-&gt;stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;</div><div class='del'>-	if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK)) {</div><div class='del'>-		tx_flags |= TX_CMD_FLG_ACK_MSK;</div><div class='del'>-		if (ieee80211_is_mgmt(fc))</div><div class='del'>-			tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='del'>-		if (ieee80211_is_probe_resp(fc) &amp;&amp;</div><div class='del'>-		    !(le16_to_cpu(hdr-&gt;seq_ctrl) &amp; 0xf))</div><div class='del'>-			tx_flags |= TX_CMD_FLG_TSF_MSK;</div><div class='del'>-	} else {</div><div class='del'>-		tx_flags &amp;= (~TX_CMD_FLG_ACK_MSK);</div><div class='del'>-		tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tx_cmd-&gt;sta_id = std_id;</div><div class='del'>-	if (ieee80211_has_morefrags(fc))</div><div class='del'>-		tx_flags |= TX_CMD_FLG_MORE_FRAG_MSK;</div><div class='del'>-</div><div class='del'>-	if (ieee80211_is_data_qos(fc)) {</div><div class='del'>-		u8 *qc = ieee80211_get_qos_ctl(hdr);</div><div class='del'>-		tx_cmd-&gt;tid_tspec = qc[0] &amp; 0xf;</div><div class='del'>-		tx_flags &amp;= ~TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='del'>-	} else {</div><div class='del'>-		tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_legacy_tx_cmd_protection(priv, info, fc, &amp;tx_flags);</div><div class='del'>-</div><div class='del'>-	tx_flags &amp;= ~(TX_CMD_FLG_ANT_SEL_MSK);</div><div class='del'>-	if (ieee80211_is_mgmt(fc)) {</div><div class='del'>-		if (ieee80211_is_assoc_req(fc) || ieee80211_is_reassoc_req(fc))</div><div class='del'>-			tx_cmd-&gt;timeout.pm_frame_timeout = cpu_to_le16(3);</div><div class='del'>-		else</div><div class='del'>-			tx_cmd-&gt;timeout.pm_frame_timeout = cpu_to_le16(2);</div><div class='del'>-	} else {</div><div class='del'>-		tx_cmd-&gt;timeout.pm_frame_timeout = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tx_cmd-&gt;driver_txop = 0;</div><div class='del'>-	tx_cmd-&gt;tx_flags = tx_flags;</div><div class='del'>-	tx_cmd-&gt;next_frame_len = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * start REPLY_TX command process</div><div class='del'>- */</div><div class='del'>-static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='del'>-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='del'>-	struct iwl3945_tx_cmd *tx_cmd;</div><div class='del'>-	struct iwl_tx_queue *txq = NULL;</div><div class='del'>-	struct iwl_queue *q = NULL;</div><div class='del'>-	struct iwl_device_cmd *out_cmd;</div><div class='del'>-	struct iwl_cmd_meta *out_meta;</div><div class='del'>-	dma_addr_t phys_addr;</div><div class='del'>-	dma_addr_t txcmd_phys;</div><div class='del'>-	int txq_id = skb_get_queue_mapping(skb);</div><div class='del'>-	u16 len, idx, hdr_len;</div><div class='del'>-	u8 id;</div><div class='del'>-	u8 unicast;</div><div class='del'>-	u8 sta_id;</div><div class='del'>-	u8 tid = 0;</div><div class='del'>-	__le16 fc;</div><div class='del'>-	u8 wait_write_ptr = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	if (iwl_legacy_is_rfkill(priv)) {</div><div class='del'>-		IWL_DEBUG_DROP(priv, "Dropping - RF KILL\n");</div><div class='del'>-		goto drop_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((ieee80211_get_tx_rate(priv-&gt;hw, info)-&gt;hw_value &amp; 0xFF) == IWL_INVALID_RATE) {</div><div class='del'>-		IWL_ERR(priv, "ERROR: No TX rate available.\n");</div><div class='del'>-		goto drop_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	unicast = !is_multicast_ether_addr(hdr-&gt;addr1);</div><div class='del'>-	id = 0;</div><div class='del'>-</div><div class='del'>-	fc = hdr-&gt;frame_control;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	if (ieee80211_is_auth(fc))</div><div class='del'>-		IWL_DEBUG_TX(priv, "Sending AUTH frame\n");</div><div class='del'>-	else if (ieee80211_is_assoc_req(fc))</div><div class='del'>-		IWL_DEBUG_TX(priv, "Sending ASSOC frame\n");</div><div class='del'>-	else if (ieee80211_is_reassoc_req(fc))</div><div class='del'>-		IWL_DEBUG_TX(priv, "Sending REASSOC frame\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	hdr_len = ieee80211_hdrlen(fc);</div><div class='del'>-</div><div class='del'>-	/* Find index into station table for destination station */</div><div class='del'>-	sta_id = iwl_legacy_sta_id_or_broadcast(</div><div class='del'>-			priv, &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS],</div><div class='del'>-			info-&gt;control.sta);</div><div class='del'>-	if (sta_id == IWL_INVALID_STATION) {</div><div class='del'>-		IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",</div><div class='del'>-			       hdr-&gt;addr1);</div><div class='del'>-		goto drop;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RATE(priv, "station Id %d\n", sta_id);</div><div class='del'>-</div><div class='del'>-	if (ieee80211_is_data_qos(fc)) {</div><div class='del'>-		u8 *qc = ieee80211_get_qos_ctl(hdr);</div><div class='del'>-		tid = qc[0] &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='del'>-		if (unlikely(tid &gt;= MAX_TID_COUNT))</div><div class='del'>-			goto drop;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Descriptor for chosen Tx queue */</div><div class='del'>-	txq = &amp;priv-&gt;txq[txq_id];</div><div class='del'>-	q = &amp;txq-&gt;q;</div><div class='del'>-</div><div class='del'>-	if ((iwl_legacy_queue_space(q) &lt; q-&gt;high_mark))</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	idx = iwl_legacy_get_cmd_index(q, q-&gt;write_ptr, 0);</div><div class='del'>-</div><div class='del'>-	/* Set up driver data for this TFD */</div><div class='del'>-	memset(&amp;(txq-&gt;txb[q-&gt;write_ptr]), 0, sizeof(struct iwl_tx_info));</div><div class='del'>-	txq-&gt;txb[q-&gt;write_ptr].skb = skb;</div><div class='del'>-	txq-&gt;txb[q-&gt;write_ptr].ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-</div><div class='del'>-	/* Init first empty entry in queue's array of Tx/cmd buffers */</div><div class='del'>-	out_cmd = txq-&gt;cmd[idx];</div><div class='del'>-	out_meta = &amp;txq-&gt;meta[idx];</div><div class='del'>-	tx_cmd = (struct iwl3945_tx_cmd *)out_cmd-&gt;cmd.payload;</div><div class='del'>-	memset(&amp;out_cmd-&gt;hdr, 0, sizeof(out_cmd-&gt;hdr));</div><div class='del'>-	memset(tx_cmd, 0, sizeof(*tx_cmd));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set up the Tx-command (not MAC!) header.</div><div class='del'>-	 * Store the chosen Tx queue and TFD index within the sequence field;</div><div class='del'>-	 * after Tx, uCode's Tx response will return this value so driver can</div><div class='del'>-	 * locate the frame within the tx queue and do post-tx processing.</div><div class='del'>-	 */</div><div class='del'>-	out_cmd-&gt;hdr.cmd = REPLY_TX;</div><div class='del'>-	out_cmd-&gt;hdr.sequence = cpu_to_le16((u16)(QUEUE_TO_SEQ(txq_id) |</div><div class='del'>-				INDEX_TO_SEQ(q-&gt;write_ptr)));</div><div class='del'>-</div><div class='del'>-	/* Copy MAC header from skb into command buffer */</div><div class='del'>-	memcpy(tx_cmd-&gt;hdr, hdr, hdr_len);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (info-&gt;control.hw_key)</div><div class='del'>-		iwl3945_build_tx_cmd_hwcrypto(priv, info, out_cmd, skb, sta_id);</div><div class='del'>-</div><div class='del'>-	/* TODO need this for burst mode later on */</div><div class='del'>-	iwl3945_build_tx_cmd_basic(priv, out_cmd, info, hdr, sta_id);</div><div class='del'>-</div><div class='del'>-	/* set is_hcca to 0; it probably will never be implemented */</div><div class='del'>-	iwl3945_hw_build_tx_cmd_rate(priv, out_cmd, info, hdr, sta_id, 0);</div><div class='del'>-</div><div class='del'>-	/* Total # bytes to be transmitted */</div><div class='del'>-	len = (u16)skb-&gt;len;</div><div class='del'>-	tx_cmd-&gt;len = cpu_to_le16(len);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_dbg_log_tx_data_frame(priv, len, hdr);</div><div class='del'>-	iwl_legacy_update_stats(priv, true, fc, len);</div><div class='del'>-	tx_cmd-&gt;tx_flags &amp;= ~TX_CMD_FLG_ANT_A_MSK;</div><div class='del'>-	tx_cmd-&gt;tx_flags &amp;= ~TX_CMD_FLG_ANT_B_MSK;</div><div class='del'>-</div><div class='del'>-	if (!ieee80211_has_morefrags(hdr-&gt;frame_control)) {</div><div class='del'>-		txq-&gt;need_update = 1;</div><div class='del'>-	} else {</div><div class='del'>-		wait_write_ptr = 1;</div><div class='del'>-		txq-&gt;need_update = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TX(priv, "sequence nr = 0X%x\n",</div><div class='del'>-		     le16_to_cpu(out_cmd-&gt;hdr.sequence));</div><div class='del'>-	IWL_DEBUG_TX(priv, "tx_flags = 0X%x\n", le32_to_cpu(tx_cmd-&gt;tx_flags));</div><div class='del'>-	iwl_print_hex_dump(priv, IWL_DL_TX, tx_cmd, sizeof(*tx_cmd));</div><div class='del'>-	iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx_cmd-&gt;hdr,</div><div class='del'>-			   ieee80211_hdrlen(fc));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Use the first empty entry in this queue's command buffer array</div><div class='del'>-	 * to contain the Tx command and MAC header concatenated together</div><div class='del'>-	 * (payload data will be in another buffer).</div><div class='del'>-	 * Size of this varies, due to varying MAC header length.</div><div class='del'>-	 * If end is not dword aligned, we'll have 2 extra bytes at the end</div><div class='del'>-	 * of the MAC header (device reads on dword boundaries).</div><div class='del'>-	 * We'll tell device about this padding later.</div><div class='del'>-	 */</div><div class='del'>-	len = sizeof(struct iwl3945_tx_cmd) +</div><div class='del'>-			sizeof(struct iwl_cmd_header) + hdr_len;</div><div class='del'>-	len = (len + 3) &amp; ~3;</div><div class='del'>-</div><div class='del'>-	/* Physical address of this Tx command's header (not MAC header!),</div><div class='del'>-	 * within command buffer array. */</div><div class='del'>-	txcmd_phys = pci_map_single(priv-&gt;pci_dev, &amp;out_cmd-&gt;hdr,</div><div class='del'>-				    len, PCI_DMA_TODEVICE);</div><div class='del'>-	/* we do not map meta data ... so we can safely access address to</div><div class='del'>-	 * provide to unmap command*/</div><div class='del'>-	dma_unmap_addr_set(out_meta, mapping, txcmd_phys);</div><div class='del'>-	dma_unmap_len_set(out_meta, len, len);</div><div class='del'>-</div><div class='del'>-	/* Add buffer containing Tx command and MAC(!) header to TFD's</div><div class='del'>-	 * first entry */</div><div class='del'>-	priv-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_attach_buf_to_tfd(priv, txq,</div><div class='del'>-						   txcmd_phys, len, 1, 0);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Set up TFD's 2nd entry to point directly to remainder of skb,</div><div class='del'>-	 * if any (802.11 null frames have no payload). */</div><div class='del'>-	len = skb-&gt;len - hdr_len;</div><div class='del'>-	if (len) {</div><div class='del'>-		phys_addr = pci_map_single(priv-&gt;pci_dev, skb-&gt;data + hdr_len,</div><div class='del'>-					   len, PCI_DMA_TODEVICE);</div><div class='del'>-		priv-&gt;cfg-&gt;ops-&gt;lib-&gt;txq_attach_buf_to_tfd(priv, txq,</div><div class='del'>-							   phys_addr, len,</div><div class='del'>-							   0, U32_PAD(len));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Tell device the write index *just past* this latest filled TFD */</div><div class='del'>-	q-&gt;write_ptr = iwl_legacy_queue_inc_wrap(q-&gt;write_ptr, q-&gt;n_bd);</div><div class='del'>-	iwl_legacy_txq_update_write_ptr(priv, txq);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	if ((iwl_legacy_queue_space(q) &lt; q-&gt;high_mark)</div><div class='del'>-	    &amp;&amp; priv-&gt;mac80211_registered) {</div><div class='del'>-		if (wait_write_ptr) {</div><div class='del'>-			spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-			txq-&gt;need_update = 1;</div><div class='del'>-			iwl_legacy_txq_update_write_ptr(priv, txq);</div><div class='del'>-			spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		iwl_legacy_stop_queue(priv, txq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-drop_unlock:</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-drop:</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl3945_get_measurement(struct iwl_priv *priv,</div><div class='del'>-			       struct ieee80211_measurement_params *params,</div><div class='del'>-			       u8 type)</div><div class='del'>-{</div><div class='del'>-	struct iwl_spectrum_cmd spectrum;</div><div class='del'>-	struct iwl_rx_packet *pkt;</div><div class='del'>-	struct iwl_host_cmd cmd = {</div><div class='del'>-		.id = REPLY_SPECTRUM_MEASUREMENT_CMD,</div><div class='del'>-		.data = (void *)&amp;spectrum,</div><div class='del'>-		.flags = CMD_WANT_SKB,</div><div class='del'>-	};</div><div class='del'>-	u32 add_time = le64_to_cpu(params-&gt;start_time);</div><div class='del'>-	int rc;</div><div class='del'>-	int spectrum_resp_status;</div><div class='del'>-	int duration = le16_to_cpu(params-&gt;duration);</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS))</div><div class='del'>-		add_time = iwl_legacy_usecs_to_beacons(priv,</div><div class='del'>-			le64_to_cpu(params-&gt;start_time) - priv-&gt;_3945.last_tsf,</div><div class='del'>-			le16_to_cpu(ctx-&gt;timing.beacon_interval));</div><div class='del'>-</div><div class='del'>-	memset(&amp;spectrum, 0, sizeof(spectrum));</div><div class='del'>-</div><div class='del'>-	spectrum.channel_count = cpu_to_le16(1);</div><div class='del'>-	spectrum.flags =</div><div class='del'>-	    RXON_FLG_TSF2HOST_MSK | RXON_FLG_ANT_A_MSK | RXON_FLG_DIS_DIV_MSK;</div><div class='del'>-	spectrum.filter_flags = MEASUREMENT_FILTER_FLAG;</div><div class='del'>-	cmd.len = sizeof(spectrum);</div><div class='del'>-	spectrum.len = cpu_to_le16(cmd.len - sizeof(spectrum.len));</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS))</div><div class='del'>-		spectrum.start_time =</div><div class='del'>-			iwl_legacy_add_beacon_time(priv,</div><div class='del'>-				priv-&gt;_3945.last_beacon_time, add_time,</div><div class='del'>-				le16_to_cpu(ctx-&gt;timing.beacon_interval));</div><div class='del'>-	else</div><div class='del'>-		spectrum.start_time = 0;</div><div class='del'>-</div><div class='del'>-	spectrum.channels[0].duration = cpu_to_le32(duration * TIME_UNIT);</div><div class='del'>-	spectrum.channels[0].channel = params-&gt;channel;</div><div class='del'>-	spectrum.channels[0].type = type;</div><div class='del'>-	if (ctx-&gt;active.flags &amp; RXON_FLG_BAND_24G_MSK)</div><div class='del'>-		spectrum.flags |= RXON_FLG_BAND_24G_MSK |</div><div class='del'>-		    RXON_FLG_AUTO_DETECT_MSK | RXON_FLG_TGG_PROTECT_MSK;</div><div class='del'>-</div><div class='del'>-	rc = iwl_legacy_send_cmd_sync(priv, &amp;cmd);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	pkt = (struct iwl_rx_packet *)cmd.reply_page;</div><div class='del'>-	if (pkt-&gt;hdr.flags &amp; IWL_CMD_FAILED_MSK) {</div><div class='del'>-		IWL_ERR(priv, "Bad return from REPLY_RX_ON_ASSOC command\n");</div><div class='del'>-		rc = -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spectrum_resp_status = le16_to_cpu(pkt-&gt;u.spectrum.status);</div><div class='del'>-	switch (spectrum_resp_status) {</div><div class='del'>-	case 0:		/* Command will be handled */</div><div class='del'>-		if (pkt-&gt;u.spectrum.id != 0xff) {</div><div class='del'>-			IWL_DEBUG_INFO(priv, "Replaced existing measurement: %d\n",</div><div class='del'>-						pkt-&gt;u.spectrum.id);</div><div class='del'>-			priv-&gt;measurement_status &amp;= ~MEASUREMENT_READY;</div><div class='del'>-		}</div><div class='del'>-		priv-&gt;measurement_status |= MEASUREMENT_ACTIVE;</div><div class='del'>-		rc = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 1:		/* Command will not be handled */</div><div class='del'>-		rc = -EAGAIN;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_legacy_free_pages(priv, cmd.reply_page);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_rx_reply_alive(struct iwl_priv *priv,</div><div class='del'>-			       struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_alive_resp *palive;</div><div class='del'>-	struct delayed_work *pwork;</div><div class='del'>-</div><div class='del'>-	palive = &amp;pkt-&gt;u.alive_frame;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Alive ucode status 0x%08X revision "</div><div class='del'>-		       "0x%01X 0x%01X\n",</div><div class='del'>-		       palive-&gt;is_valid, palive-&gt;ver_type,</div><div class='del'>-		       palive-&gt;ver_subtype);</div><div class='del'>-</div><div class='del'>-	if (palive-&gt;ver_subtype == INITIALIZE_SUBTYPE) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Initialization Alive received.\n");</div><div class='del'>-		memcpy(&amp;priv-&gt;card_alive_init, &amp;pkt-&gt;u.alive_frame,</div><div class='del'>-		       sizeof(struct iwl_alive_resp));</div><div class='del'>-		pwork = &amp;priv-&gt;init_alive_start;</div><div class='del'>-	} else {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Runtime Alive received.\n");</div><div class='del'>-		memcpy(&amp;priv-&gt;card_alive, &amp;pkt-&gt;u.alive_frame,</div><div class='del'>-		       sizeof(struct iwl_alive_resp));</div><div class='del'>-		pwork = &amp;priv-&gt;alive_start;</div><div class='del'>-		iwl3945_disable_events(priv);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We delay the ALIVE response by 5ms to</div><div class='del'>-	 * give the HW RF Kill time to activate... */</div><div class='del'>-	if (palive-&gt;is_valid == UCODE_VALID_OK)</div><div class='del'>-		queue_delayed_work(priv-&gt;workqueue, pwork,</div><div class='del'>-				   msecs_to_jiffies(5));</div><div class='del'>-	else</div><div class='del'>-		IWL_WARN(priv, "uCode did not respond OK.\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_rx_reply_add_sta(struct iwl_priv *priv,</div><div class='del'>-				 struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RX(priv, "Received REPLY_ADD_STA: 0x%02X\n", pkt-&gt;u.status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_rx_beacon_notif(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl3945_beacon_notif *beacon = &amp;(pkt-&gt;u.beacon_status);</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	u8 rate = beacon-&gt;beacon_notify_hdr.rate;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RX(priv, "beacon status %x retries %d iss %d "</div><div class='del'>-		"tsf %d %d rate %d\n",</div><div class='del'>-		le32_to_cpu(beacon-&gt;beacon_notify_hdr.status) &amp; TX_STATUS_MSK,</div><div class='del'>-		beacon-&gt;beacon_notify_hdr.failure_frame,</div><div class='del'>-		le32_to_cpu(beacon-&gt;ibss_mgr_status),</div><div class='del'>-		le32_to_cpu(beacon-&gt;high_tsf),</div><div class='del'>-		le32_to_cpu(beacon-&gt;low_tsf), rate);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	priv-&gt;ibss_manager = le32_to_cpu(beacon-&gt;ibss_mgr_status);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Handle notification from uCode that card's power state is changing</div><div class='del'>- * due to software, hardware, or critical temperature RFKILL */</div><div class='del'>-static void iwl3945_rx_card_state_notif(struct iwl_priv *priv,</div><div class='del'>-				    struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	u32 flags = le32_to_cpu(pkt-&gt;u.card_state_notif.flags);</div><div class='del'>-	unsigned long status = priv-&gt;status;</div><div class='del'>-</div><div class='del'>-	IWL_WARN(priv, "Card state received: HW:%s SW:%s\n",</div><div class='del'>-			  (flags &amp; HW_CARD_DISABLED) ? "Kill" : "On",</div><div class='del'>-			  (flags &amp; SW_CARD_DISABLED) ? "Kill" : "On");</div><div class='del'>-</div><div class='del'>-	iwl_write32(priv, CSR_UCODE_DRV_GP1_SET,</div><div class='del'>-		    CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);</div><div class='del'>-</div><div class='del'>-	if (flags &amp; HW_CARD_DISABLED)</div><div class='del'>-		set_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-	else</div><div class='del'>-		clear_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	iwl_legacy_scan_cancel(priv);</div><div class='del'>-</div><div class='del'>-	if ((test_bit(STATUS_RF_KILL_HW, &amp;status) !=</div><div class='del'>-	     test_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status)))</div><div class='del'>-		wiphy_rfkill_set_hw_state(priv-&gt;hw-&gt;wiphy,</div><div class='del'>-				test_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status));</div><div class='del'>-	else</div><div class='del'>-		wake_up(&amp;priv-&gt;wait_command_queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_setup_rx_handlers - Initialize Rx handler callbacks</div><div class='del'>- *</div><div class='del'>- * Setup the RX handlers for each of the reply types sent from the uCode</div><div class='del'>- * to the host.</div><div class='del'>- *</div><div class='del'>- * This function chains into the hardware specific files for them to setup</div><div class='del'>- * any hardware specific handlers as well.</div><div class='del'>- */</div><div class='del'>-static void iwl3945_setup_rx_handlers(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	priv-&gt;rx_handlers[REPLY_ALIVE] = iwl3945_rx_reply_alive;</div><div class='del'>-	priv-&gt;rx_handlers[REPLY_ADD_STA] = iwl3945_rx_reply_add_sta;</div><div class='del'>-	priv-&gt;rx_handlers[REPLY_ERROR] = iwl_legacy_rx_reply_error;</div><div class='del'>-	priv-&gt;rx_handlers[CHANNEL_SWITCH_NOTIFICATION] = iwl_legacy_rx_csa;</div><div class='del'>-	priv-&gt;rx_handlers[SPECTRUM_MEASURE_NOTIFICATION] =</div><div class='del'>-			iwl_legacy_rx_spectrum_measure_notif;</div><div class='del'>-	priv-&gt;rx_handlers[PM_SLEEP_NOTIFICATION] = iwl_legacy_rx_pm_sleep_notif;</div><div class='del'>-	priv-&gt;rx_handlers[PM_DEBUG_STATISTIC_NOTIFIC] =</div><div class='del'>-	    iwl_legacy_rx_pm_debug_statistics_notif;</div><div class='del'>-	priv-&gt;rx_handlers[BEACON_NOTIFICATION] = iwl3945_rx_beacon_notif;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The same handler is used for both the REPLY to a discrete</div><div class='del'>-	 * statistics request from the host as well as for the periodic</div><div class='del'>-	 * statistics notifications (after received beacons) from the uCode.</div><div class='del'>-	 */</div><div class='del'>-	priv-&gt;rx_handlers[REPLY_STATISTICS_CMD] = iwl3945_reply_statistics;</div><div class='del'>-	priv-&gt;rx_handlers[STATISTICS_NOTIFICATION] = iwl3945_hw_rx_statistics;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_setup_rx_scan_handlers(priv);</div><div class='del'>-	priv-&gt;rx_handlers[CARD_STATE_NOTIFICATION] = iwl3945_rx_card_state_notif;</div><div class='del'>-</div><div class='del'>-	/* Set up hardware specific Rx handlers */</div><div class='del'>-	iwl3945_hw_rx_handler_setup(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/************************** RX-FUNCTIONS ****************************/</div><div class='del'>-/*</div><div class='del'>- * Rx theory of operation</div><div class='del'>- *</div><div class='del'>- * The host allocates 32 DMA target addresses and passes the host address</div><div class='del'>- * to the firmware at register IWL_RFDS_TABLE_LOWER + N * RFD_SIZE where N is</div><div class='del'>- * 0 to 31</div><div class='del'>- *</div><div class='del'>- * Rx Queue Indexes</div><div class='del'>- * The host/firmware share two index registers for managing the Rx buffers.</div><div class='del'>- *</div><div class='del'>- * The READ index maps to the first position that the firmware may be writing</div><div class='del'>- * to -- the driver can read up to (but not including) this position and get</div><div class='del'>- * good data.</div><div class='del'>- * The READ index is managed by the firmware once the card is enabled.</div><div class='del'>- *</div><div class='del'>- * The WRITE index maps to the last position the driver has read from -- the</div><div class='del'>- * position preceding WRITE is the last slot the firmware can place a packet.</div><div class='del'>- *</div><div class='del'>- * The queue is empty (no good data) if WRITE = READ - 1, and is full if</div><div class='del'>- * WRITE = READ.</div><div class='del'>- *</div><div class='del'>- * During initialization, the host sets up the READ queue position to the first</div><div class='del'>- * INDEX position, and WRITE to the last (READ - 1 wrapped)</div><div class='del'>- *</div><div class='del'>- * When the firmware places a packet in a buffer, it will advance the READ index</div><div class='del'>- * and fire the RX interrupt.  The driver can then query the READ index and</div><div class='del'>- * process as many packets as possible, moving the WRITE index forward as it</div><div class='del'>- * resets the Rx queue buffers with new memory.</div><div class='del'>- *</div><div class='del'>- * The management in the driver is as follows:</div><div class='del'>- * + A list of pre-allocated SKBs is stored in iwl-&gt;rxq-&gt;rx_free.  When</div><div class='del'>- *   iwl-&gt;rxq-&gt;free_count drops to or below RX_LOW_WATERMARK, work is scheduled</div><div class='del'>- *   to replenish the iwl-&gt;rxq-&gt;rx_free.</div><div class='del'>- * + In iwl3945_rx_replenish (scheduled) if 'processed' != 'read' then the</div><div class='del'>- *   iwl-&gt;rxq is replenished and the READ INDEX is updated (updating the</div><div class='del'>- *   'processed' and 'read' driver indexes as well)</div><div class='del'>- * + A received packet is processed and handed to the kernel network stack,</div><div class='del'>- *   detached from the iwl-&gt;rxq.  The driver 'processed' index is updated.</div><div class='del'>- * + The Host/Firmware iwl-&gt;rxq is replenished at tasklet time from the rx_free</div><div class='del'>- *   list. If there are no allocated buffers in iwl-&gt;rxq-&gt;rx_free, the READ</div><div class='del'>- *   INDEX is not incremented and iwl-&gt;status(RX_STALLED) is set.  If there</div><div class='del'>- *   were enough free buffers and RX_STALLED is set it is cleared.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Driver sequence:</div><div class='del'>- *</div><div class='del'>- * iwl3945_rx_replenish()     Replenishes rx_free list from rx_used, and calls</div><div class='del'>- *                            iwl3945_rx_queue_restock</div><div class='del'>- * iwl3945_rx_queue_restock() Moves available buffers from rx_free into Rx</div><div class='del'>- *                            queue, updates firmware pointers, and updates</div><div class='del'>- *                            the WRITE index.  If insufficient rx_free buffers</div><div class='del'>- *                            are available, schedules iwl3945_rx_replenish</div><div class='del'>- *</div><div class='del'>- * -- enable interrupts --</div><div class='del'>- * ISR - iwl3945_rx()         Detach iwl_rx_mem_buffers from pool up to the</div><div class='del'>- *                            READ INDEX, detaching the SKB from the pool.</div><div class='del'>- *                            Moves the packet buffer from queue to rx_used.</div><div class='del'>- *                            Calls iwl3945_rx_queue_restock to refill any empty</div><div class='del'>- *                            slots.</div><div class='del'>- * ...</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_dma_addr2rbd_ptr - convert a DMA address to a uCode read buffer ptr</div><div class='del'>- */</div><div class='del'>-static inline __le32 iwl3945_dma_addr2rbd_ptr(struct iwl_priv *priv,</div><div class='del'>-					  dma_addr_t dma_addr)</div><div class='del'>-{</div><div class='del'>-	return cpu_to_le32((u32)dma_addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_rx_queue_restock - refill RX queue from pre-allocated pool</div><div class='del'>- *</div><div class='del'>- * If there are slots in the RX queue that need to be restocked,</div><div class='del'>- * and we have free pre-allocated buffers, fill the ranks as much</div><div class='del'>- * as we can, pulling from rx_free.</div><div class='del'>- *</div><div class='del'>- * This moves the 'write' index forward to catch up with 'processed', and</div><div class='del'>- * also updates the memory address in the firmware to reference the new</div><div class='del'>- * target buffer.</div><div class='del'>- */</div><div class='del'>-static void iwl3945_rx_queue_restock(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_queue *rxq = &amp;priv-&gt;rxq;</div><div class='del'>-	struct list_head *element;</div><div class='del'>-	struct iwl_rx_mem_buffer *rxb;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int write;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='del'>-	write = rxq-&gt;write &amp; ~0x7;</div><div class='del'>-	while ((iwl_legacy_rx_queue_space(rxq) &gt; 0) &amp;&amp; (rxq-&gt;free_count)) {</div><div class='del'>-		/* Get next free Rx buffer, remove from free list */</div><div class='del'>-		element = rxq-&gt;rx_free.next;</div><div class='del'>-		rxb = list_entry(element, struct iwl_rx_mem_buffer, list);</div><div class='del'>-		list_del(element);</div><div class='del'>-</div><div class='del'>-		/* Point to Rx buffer via next RBD in circular buffer */</div><div class='del'>-		rxq-&gt;bd[rxq-&gt;write] = iwl3945_dma_addr2rbd_ptr(priv, rxb-&gt;page_dma);</div><div class='del'>-		rxq-&gt;queue[rxq-&gt;write] = rxb;</div><div class='del'>-		rxq-&gt;write = (rxq-&gt;write + 1) &amp; RX_QUEUE_MASK;</div><div class='del'>-		rxq-&gt;free_count--;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-	/* If the pre-allocated buffer pool is dropping low, schedule to</div><div class='del'>-	 * refill it */</div><div class='del'>-	if (rxq-&gt;free_count &lt;= RX_LOW_WATERMARK)</div><div class='del'>-		queue_work(priv-&gt;workqueue, &amp;priv-&gt;rx_replenish);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* If we've added more space for the firmware to place data, tell it.</div><div class='del'>-	 * Increment device's write pointer in multiples of 8. */</div><div class='del'>-	if ((rxq-&gt;write_actual != (rxq-&gt;write &amp; ~0x7))</div><div class='del'>-	    || (abs(rxq-&gt;write - rxq-&gt;read) &gt; 7)) {</div><div class='del'>-		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='del'>-		rxq-&gt;need_update = 1;</div><div class='del'>-		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-		iwl_legacy_rx_queue_update_write_ptr(priv, rxq);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_rx_replenish - Move all used packet from rx_used to rx_free</div><div class='del'>- *</div><div class='del'>- * When moving to rx_free an SKB is allocated for the slot.</div><div class='del'>- *</div><div class='del'>- * Also restock the Rx queue via iwl3945_rx_queue_restock.</div><div class='del'>- * This is called as a scheduled work item (except for during initialization)</div><div class='del'>- */</div><div class='del'>-static void iwl3945_rx_allocate(struct iwl_priv *priv, gfp_t priority)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_queue *rxq = &amp;priv-&gt;rxq;</div><div class='del'>-	struct list_head *element;</div><div class='del'>-	struct iwl_rx_mem_buffer *rxb;</div><div class='del'>-	struct page *page;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	gfp_t gfp_mask = priority;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-		if (list_empty(&amp;rxq-&gt;rx_used)) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-		if (rxq-&gt;free_count &gt; RX_LOW_WATERMARK)</div><div class='del'>-			gfp_mask |= __GFP_NOWARN;</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;hw_params.rx_page_order &gt; 0)</div><div class='del'>-			gfp_mask |= __GFP_COMP;</div><div class='del'>-</div><div class='del'>-		/* Alloc a new receive buffer */</div><div class='del'>-		page = alloc_pages(gfp_mask, priv-&gt;hw_params.rx_page_order);</div><div class='del'>-		if (!page) {</div><div class='del'>-			if (net_ratelimit())</div><div class='del'>-				IWL_DEBUG_INFO(priv, "Failed to allocate SKB buffer.\n");</div><div class='del'>-			if ((rxq-&gt;free_count &lt;= RX_LOW_WATERMARK) &amp;&amp;</div><div class='del'>-			    net_ratelimit())</div><div class='del'>-				IWL_CRIT(priv, "Failed to allocate SKB buffer with %s. Only %u free buffers remaining.\n",</div><div class='del'>-					 priority == GFP_ATOMIC ?  "GFP_ATOMIC" : "GFP_KERNEL",</div><div class='del'>-					 rxq-&gt;free_count);</div><div class='del'>-			/* We don't reschedule replenish work here -- we will</div><div class='del'>-			 * call the restock method and if it still needs</div><div class='del'>-			 * more buffers it will schedule replenish */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='del'>-		if (list_empty(&amp;rxq-&gt;rx_used)) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-			__free_pages(page, priv-&gt;hw_params.rx_page_order);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		element = rxq-&gt;rx_used.next;</div><div class='del'>-		rxb = list_entry(element, struct iwl_rx_mem_buffer, list);</div><div class='del'>-		list_del(element);</div><div class='del'>-		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-		rxb-&gt;page = page;</div><div class='del'>-		/* Get physical address of RB/SKB */</div><div class='del'>-		rxb-&gt;page_dma = pci_map_page(priv-&gt;pci_dev, page, 0,</div><div class='del'>-				PAGE_SIZE &lt;&lt; priv-&gt;hw_params.rx_page_order,</div><div class='del'>-				PCI_DMA_FROMDEVICE);</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-		list_add_tail(&amp;rxb-&gt;list, &amp;rxq-&gt;rx_free);</div><div class='del'>-		rxq-&gt;free_count++;</div><div class='del'>-		priv-&gt;alloc_rxb_page++;</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl3945_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int i;</div><div class='del'>-	spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='del'>-	INIT_LIST_HEAD(&amp;rxq-&gt;rx_free);</div><div class='del'>-	INIT_LIST_HEAD(&amp;rxq-&gt;rx_used);</div><div class='del'>-	/* Fill the rx_used queue with _all_ of the Rx buffers */</div><div class='del'>-	for (i = 0; i &lt; RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++) {</div><div class='del'>-		/* In the reset function, these buffers may have been allocated</div><div class='del'>-		 * to an SKB, so we need to unmap and free potential storage */</div><div class='del'>-		if (rxq-&gt;pool[i].page != NULL) {</div><div class='del'>-			pci_unmap_page(priv-&gt;pci_dev, rxq-&gt;pool[i].page_dma,</div><div class='del'>-				PAGE_SIZE &lt;&lt; priv-&gt;hw_params.rx_page_order,</div><div class='del'>-				PCI_DMA_FROMDEVICE);</div><div class='del'>-			__iwl_legacy_free_pages(priv, rxq-&gt;pool[i].page);</div><div class='del'>-			rxq-&gt;pool[i].page = NULL;</div><div class='del'>-		}</div><div class='del'>-		list_add_tail(&amp;rxq-&gt;pool[i].list, &amp;rxq-&gt;rx_used);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set us so that we have processed and used all buffers, but have</div><div class='del'>-	 * not restocked the Rx queue with fresh buffers */</div><div class='del'>-	rxq-&gt;read = rxq-&gt;write = 0;</div><div class='del'>-	rxq-&gt;write_actual = 0;</div><div class='del'>-	rxq-&gt;free_count = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl3945_rx_replenish(void *data)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = data;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	iwl3945_rx_allocate(priv, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	iwl3945_rx_queue_restock(priv);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_rx_replenish_now(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	iwl3945_rx_allocate(priv, GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-	iwl3945_rx_queue_restock(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Assumes that the skb field of the buffers in 'pool' is kept accurate.</div><div class='del'>- * If an SKB has been detached, the POOL needs to have its SKB set to NULL</div><div class='del'>- * This free routine walks the list of POOL entries and if SKB is set to</div><div class='del'>- * non NULL it is unmapped and freed</div><div class='del'>- */</div><div class='del'>-static void iwl3945_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {</div><div class='del'>-		if (rxq-&gt;pool[i].page != NULL) {</div><div class='del'>-			pci_unmap_page(priv-&gt;pci_dev, rxq-&gt;pool[i].page_dma,</div><div class='del'>-				PAGE_SIZE &lt;&lt; priv-&gt;hw_params.rx_page_order,</div><div class='del'>-				PCI_DMA_FROMDEVICE);</div><div class='del'>-			__iwl_legacy_free_pages(priv, rxq-&gt;pool[i].page);</div><div class='del'>-			rxq-&gt;pool[i].page = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dma_free_coherent(&amp;priv-&gt;pci_dev-&gt;dev, 4 * RX_QUEUE_SIZE, rxq-&gt;bd,</div><div class='del'>-			  rxq-&gt;bd_dma);</div><div class='del'>-	dma_free_coherent(&amp;priv-&gt;pci_dev-&gt;dev, sizeof(struct iwl_rb_status),</div><div class='del'>-			  rxq-&gt;rb_stts, rxq-&gt;rb_stts_dma);</div><div class='del'>-	rxq-&gt;bd = NULL;</div><div class='del'>-	rxq-&gt;rb_stts  = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Convert linear signal-to-noise ratio into dB */</div><div class='del'>-static u8 ratio2dB[100] = {</div><div class='del'>-/*	 0   1   2   3   4   5   6   7   8   9 */</div><div class='del'>-	 0,  0,  6, 10, 12, 14, 16, 17, 18, 19, /* 00 - 09 */</div><div class='del'>-	20, 21, 22, 22, 23, 23, 24, 25, 26, 26, /* 10 - 19 */</div><div class='del'>-	26, 26, 26, 27, 27, 28, 28, 28, 29, 29, /* 20 - 29 */</div><div class='del'>-	29, 30, 30, 30, 31, 31, 31, 31, 32, 32, /* 30 - 39 */</div><div class='del'>-	32, 32, 32, 33, 33, 33, 33, 33, 34, 34, /* 40 - 49 */</div><div class='del'>-	34, 34, 34, 34, 35, 35, 35, 35, 35, 35, /* 50 - 59 */</div><div class='del'>-	36, 36, 36, 36, 36, 36, 36, 37, 37, 37, /* 60 - 69 */</div><div class='del'>-	37, 37, 37, 37, 37, 38, 38, 38, 38, 38, /* 70 - 79 */</div><div class='del'>-	38, 38, 38, 38, 38, 39, 39, 39, 39, 39, /* 80 - 89 */</div><div class='del'>-	39, 39, 39, 39, 39, 40, 40, 40, 40, 40  /* 90 - 99 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Calculates a relative dB value from a ratio of linear</div><div class='del'>- *   (i.e. not dB) signal levels.</div><div class='del'>- * Conversion assumes that levels are voltages (20*log), not powers (10*log). */</div><div class='del'>-int iwl3945_calc_db_from_ratio(int sig_ratio)</div><div class='del'>-{</div><div class='del'>-	/* 1000:1 or higher just report as 60 dB */</div><div class='del'>-	if (sig_ratio &gt;= 1000)</div><div class='del'>-		return 60;</div><div class='del'>-</div><div class='del'>-	/* 100:1 or higher, divide by 10 and use table,</div><div class='del'>-	 *   add 20 dB to make up for divide by 10 */</div><div class='del'>-	if (sig_ratio &gt;= 100)</div><div class='del'>-		return 20 + (int)ratio2dB[sig_ratio/10];</div><div class='del'>-</div><div class='del'>-	/* We shouldn't see this */</div><div class='del'>-	if (sig_ratio &lt; 1)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Use table for ratios 1:1 - 99:1 */</div><div class='del'>-	return (int)ratio2dB[sig_ratio];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_rx_handle - Main entry function for receiving responses from uCode</div><div class='del'>- *</div><div class='del'>- * Uses the priv-&gt;rx_handlers callback function array to invoke</div><div class='del'>- * the appropriate handlers, including command responses,</div><div class='del'>- * frame-received notifications, and other notifications.</div><div class='del'>- */</div><div class='del'>-static void iwl3945_rx_handle(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_mem_buffer *rxb;</div><div class='del'>-	struct iwl_rx_packet *pkt;</div><div class='del'>-	struct iwl_rx_queue *rxq = &amp;priv-&gt;rxq;</div><div class='del'>-	u32 r, i;</div><div class='del'>-	int reclaim;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u8 fill_rx = 0;</div><div class='del'>-	u32 count = 8;</div><div class='del'>-	int total_empty = 0;</div><div class='del'>-</div><div class='del'>-	/* uCode's read index (stored in shared DRAM) indicates the last Rx</div><div class='del'>-	 * buffer that the driver may process (last buffer filled by ucode). */</div><div class='del'>-	r = le16_to_cpu(rxq-&gt;rb_stts-&gt;closed_rb_num) &amp;  0x0FFF;</div><div class='del'>-	i = rxq-&gt;read;</div><div class='del'>-</div><div class='del'>-	/* calculate total frames need to be restock after handling RX */</div><div class='del'>-	total_empty = r - rxq-&gt;write_actual;</div><div class='del'>-	if (total_empty &lt; 0)</div><div class='del'>-		total_empty += RX_QUEUE_SIZE;</div><div class='del'>-</div><div class='del'>-	if (total_empty &gt; (RX_QUEUE_SIZE / 2))</div><div class='del'>-		fill_rx = 1;</div><div class='del'>-	/* Rx interrupt, but nothing sent from uCode */</div><div class='del'>-	if (i == r)</div><div class='del'>-		IWL_DEBUG_RX(priv, "r = %d, i = %d\n", r, i);</div><div class='del'>-</div><div class='del'>-	while (i != r) {</div><div class='del'>-		int len;</div><div class='del'>-</div><div class='del'>-		rxb = rxq-&gt;queue[i];</div><div class='del'>-</div><div class='del'>-		/* If an RXB doesn't have a Rx queue slot associated with it,</div><div class='del'>-		 * then a bug has been introduced in the queue refilling</div><div class='del'>-		 * routines -- catch it here */</div><div class='del'>-		BUG_ON(rxb == NULL);</div><div class='del'>-</div><div class='del'>-		rxq-&gt;queue[i] = NULL;</div><div class='del'>-</div><div class='del'>-		pci_unmap_page(priv-&gt;pci_dev, rxb-&gt;page_dma,</div><div class='del'>-			       PAGE_SIZE &lt;&lt; priv-&gt;hw_params.rx_page_order,</div><div class='del'>-			       PCI_DMA_FROMDEVICE);</div><div class='del'>-		pkt = rxb_addr(rxb);</div><div class='del'>-</div><div class='del'>-		len = le32_to_cpu(pkt-&gt;len_n_flags) &amp; FH_RSCSR_FRAME_SIZE_MSK;</div><div class='del'>-		len += sizeof(u32); /* account for status word */</div><div class='del'>-		trace_iwlwifi_legacy_dev_rx(priv, pkt, len);</div><div class='del'>-</div><div class='del'>-		/* Reclaim a command buffer only if this packet is a response</div><div class='del'>-		 *   to a (driver-originated) command.</div><div class='del'>-		 * If the packet (e.g. Rx frame) originated from uCode,</div><div class='del'>-		 *   there is no command buffer to reclaim.</div><div class='del'>-		 * Ucode should set SEQ_RX_FRAME bit if ucode-originated,</div><div class='del'>-		 *   but apparently a few don't get set; catch them here. */</div><div class='del'>-		reclaim = !(pkt-&gt;hdr.sequence &amp; SEQ_RX_FRAME) &amp;&amp;</div><div class='del'>-			(pkt-&gt;hdr.cmd != STATISTICS_NOTIFICATION) &amp;&amp;</div><div class='del'>-			(pkt-&gt;hdr.cmd != REPLY_TX);</div><div class='del'>-</div><div class='del'>-		/* Based on type of command response or notification,</div><div class='del'>-		 *   handle those that need handling via function in</div><div class='del'>-		 *   rx_handlers table.  See iwl3945_setup_rx_handlers() */</div><div class='del'>-		if (priv-&gt;rx_handlers[pkt-&gt;hdr.cmd]) {</div><div class='del'>-			IWL_DEBUG_RX(priv, "r = %d, i = %d, %s, 0x%02x\n", r, i,</div><div class='del'>-			iwl_legacy_get_cmd_string(pkt-&gt;hdr.cmd), pkt-&gt;hdr.cmd);</div><div class='del'>-			priv-&gt;isr_stats.rx_handlers[pkt-&gt;hdr.cmd]++;</div><div class='del'>-			priv-&gt;rx_handlers[pkt-&gt;hdr.cmd] (priv, rxb);</div><div class='del'>-		} else {</div><div class='del'>-			/* No handling needed */</div><div class='del'>-			IWL_DEBUG_RX(priv,</div><div class='del'>-				"r %d i %d No handler needed for %s, 0x%02x\n",</div><div class='del'>-				r, i, iwl_legacy_get_cmd_string(pkt-&gt;hdr.cmd),</div><div class='del'>-				pkt-&gt;hdr.cmd);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * XXX: After here, we should always check rxb-&gt;page</div><div class='del'>-		 * against NULL before touching it or its virtual</div><div class='del'>-		 * memory (pkt). Because some rx_handler might have</div><div class='del'>-		 * already taken or freed the pages.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (reclaim) {</div><div class='del'>-			/* Invoke any callbacks, transfer the buffer to caller,</div><div class='del'>-			 * and fire off the (possibly) blocking iwl_legacy_send_cmd()</div><div class='del'>-			 * as we reclaim the driver command queue */</div><div class='del'>-			if (rxb-&gt;page)</div><div class='del'>-				iwl_legacy_tx_cmd_complete(priv, rxb);</div><div class='del'>-			else</div><div class='del'>-				IWL_WARN(priv, "Claim null rxb?\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Reuse the page if possible. For notification packets and</div><div class='del'>-		 * SKBs that fail to Rx correctly, add them back into the</div><div class='del'>-		 * rx_free list for reuse later. */</div><div class='del'>-		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='del'>-		if (rxb-&gt;page != NULL) {</div><div class='del'>-			rxb-&gt;page_dma = pci_map_page(priv-&gt;pci_dev, rxb-&gt;page,</div><div class='del'>-				0, PAGE_SIZE &lt;&lt; priv-&gt;hw_params.rx_page_order,</div><div class='del'>-				PCI_DMA_FROMDEVICE);</div><div class='del'>-			list_add_tail(&amp;rxb-&gt;list, &amp;rxq-&gt;rx_free);</div><div class='del'>-			rxq-&gt;free_count++;</div><div class='del'>-		} else</div><div class='del'>-			list_add_tail(&amp;rxb-&gt;list, &amp;rxq-&gt;rx_used);</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-		i = (i + 1) &amp; RX_QUEUE_MASK;</div><div class='del'>-		/* If there are a lot of unused frames,</div><div class='del'>-		 * restock the Rx queue so ucode won't assert. */</div><div class='del'>-		if (fill_rx) {</div><div class='del'>-			count++;</div><div class='del'>-			if (count &gt;= 8) {</div><div class='del'>-				rxq-&gt;read = i;</div><div class='del'>-				iwl3945_rx_replenish_now(priv);</div><div class='del'>-				count = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Backtrack one entry */</div><div class='del'>-	rxq-&gt;read = i;</div><div class='del'>-	if (fill_rx)</div><div class='del'>-		iwl3945_rx_replenish_now(priv);</div><div class='del'>-	else</div><div class='del'>-		iwl3945_rx_queue_restock(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* call this function to flush any scheduled tasklet */</div><div class='del'>-static inline void iwl3945_synchronize_irq(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	/* wait to make sure we flush pending tasklet*/</div><div class='del'>-	synchronize_irq(priv-&gt;pci_dev-&gt;irq);</div><div class='del'>-	tasklet_kill(&amp;priv-&gt;irq_tasklet);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *iwl3945_desc_lookup(int i)</div><div class='del'>-{</div><div class='del'>-	switch (i) {</div><div class='del'>-	case 1:</div><div class='del'>-		return "FAIL";</div><div class='del'>-	case 2:</div><div class='del'>-		return "BAD_PARAM";</div><div class='del'>-	case 3:</div><div class='del'>-		return "BAD_CHECKSUM";</div><div class='del'>-	case 4:</div><div class='del'>-		return "NMI_INTERRUPT";</div><div class='del'>-	case 5:</div><div class='del'>-		return "SYSASSERT";</div><div class='del'>-	case 6:</div><div class='del'>-		return "FATAL_ERROR";</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return "UNKNOWN";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define ERROR_START_OFFSET  (1 * sizeof(u32))</div><div class='del'>-#define ERROR_ELEM_SIZE     (7 * sizeof(u32))</div><div class='del'>-</div><div class='del'>-void iwl3945_dump_nic_error_log(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	u32 i;</div><div class='del'>-	u32 desc, time, count, base, data1;</div><div class='del'>-	u32 blink1, blink2, ilink1, ilink2;</div><div class='del'>-</div><div class='del'>-	base = le32_to_cpu(priv-&gt;card_alive.error_event_table_ptr);</div><div class='del'>-</div><div class='del'>-	if (!iwl3945_hw_valid_rtc_data_addr(base)) {</div><div class='del'>-		IWL_ERR(priv, "Not valid error log pointer 0x%08X\n", base);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	count = iwl_legacy_read_targ_mem(priv, base);</div><div class='del'>-</div><div class='del'>-	if (ERROR_START_OFFSET &lt;= count * ERROR_ELEM_SIZE) {</div><div class='del'>-		IWL_ERR(priv, "Start IWL Error Log Dump:\n");</div><div class='del'>-		IWL_ERR(priv, "Status: 0x%08lX, count: %d\n",</div><div class='del'>-			priv-&gt;status, count);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_ERR(priv, "Desc       Time       asrtPC  blink2 "</div><div class='del'>-		  "ilink1  nmiPC   Line\n");</div><div class='del'>-	for (i = ERROR_START_OFFSET;</div><div class='del'>-	     i &lt; (count * ERROR_ELEM_SIZE) + ERROR_START_OFFSET;</div><div class='del'>-	     i += ERROR_ELEM_SIZE) {</div><div class='del'>-		desc = iwl_legacy_read_targ_mem(priv, base + i);</div><div class='del'>-		time =</div><div class='del'>-		    iwl_legacy_read_targ_mem(priv, base + i + 1 * sizeof(u32));</div><div class='del'>-		blink1 =</div><div class='del'>-		    iwl_legacy_read_targ_mem(priv, base + i + 2 * sizeof(u32));</div><div class='del'>-		blink2 =</div><div class='del'>-		    iwl_legacy_read_targ_mem(priv, base + i + 3 * sizeof(u32));</div><div class='del'>-		ilink1 =</div><div class='del'>-		    iwl_legacy_read_targ_mem(priv, base + i + 4 * sizeof(u32));</div><div class='del'>-		ilink2 =</div><div class='del'>-		    iwl_legacy_read_targ_mem(priv, base + i + 5 * sizeof(u32));</div><div class='del'>-		data1 =</div><div class='del'>-		    iwl_legacy_read_targ_mem(priv, base + i + 6 * sizeof(u32));</div><div class='del'>-</div><div class='del'>-		IWL_ERR(priv,</div><div class='del'>-			"%-13s (0x%X) %010u 0x%05X 0x%05X 0x%05X 0x%05X %u\n\n",</div><div class='del'>-			iwl3945_desc_lookup(desc), desc, time, blink1, blink2,</div><div class='del'>-			ilink1, ilink2, data1);</div><div class='del'>-		trace_iwlwifi_legacy_dev_ucode_error(priv, desc, time, data1, 0,</div><div class='del'>-					0, blink1, blink2, ilink1, ilink2);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_irq_tasklet(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	u32 inta, handled = 0;</div><div class='del'>-	u32 inta_fh;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	u32 inta_mask;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Ack/clear/reset pending uCode interrupts.</div><div class='del'>-	 * Note:  Some bits in CSR_INT are "OR" of bits in CSR_FH_INT_STATUS,</div><div class='del'>-	 *  and will clear only when CSR_FH_INT_STATUS gets cleared. */</div><div class='del'>-	inta = iwl_read32(priv, CSR_INT);</div><div class='del'>-	iwl_write32(priv, CSR_INT, inta);</div><div class='del'>-</div><div class='del'>-	/* Ack/clear/reset pending flow-handler (DMA) interrupts.</div><div class='del'>-	 * Any new interrupts that happen after this, either while we're</div><div class='del'>-	 * in this tasklet, or later, will show up in next ISR/tasklet. */</div><div class='del'>-	inta_fh = iwl_read32(priv, CSR_FH_INT_STATUS);</div><div class='del'>-	iwl_write32(priv, CSR_FH_INT_STATUS, inta_fh);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	if (iwl_legacy_get_debug_level(priv) &amp; IWL_DL_ISR) {</div><div class='del'>-		/* just for debug */</div><div class='del'>-		inta_mask = iwl_read32(priv, CSR_INT_MASK);</div><div class='del'>-		IWL_DEBUG_ISR(priv, "inta 0x%08x, enabled 0x%08x, fh 0x%08x\n",</div><div class='del'>-			      inta, inta_mask, inta_fh);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Since CSR_INT and CSR_FH_INT_STATUS reads and clears are not</div><div class='del'>-	 * atomic, make sure that inta covers all the interrupts that</div><div class='del'>-	 * we've discovered, even if FH interrupt came in just after</div><div class='del'>-	 * reading CSR_INT. */</div><div class='del'>-	if (inta_fh &amp; CSR39_FH_INT_RX_MASK)</div><div class='del'>-		inta |= CSR_INT_BIT_FH_RX;</div><div class='del'>-	if (inta_fh &amp; CSR39_FH_INT_TX_MASK)</div><div class='del'>-		inta |= CSR_INT_BIT_FH_TX;</div><div class='del'>-</div><div class='del'>-	/* Now service all interrupt bits discovered above. */</div><div class='del'>-	if (inta &amp; CSR_INT_BIT_HW_ERR) {</div><div class='del'>-		IWL_ERR(priv, "Hardware error detected.  Restarting.\n");</div><div class='del'>-</div><div class='del'>-		/* Tell the device to stop sending interrupts */</div><div class='del'>-		iwl_legacy_disable_interrupts(priv);</div><div class='del'>-</div><div class='del'>-		priv-&gt;isr_stats.hw++;</div><div class='del'>-		iwl_legacy_irq_handle_error(priv);</div><div class='del'>-</div><div class='del'>-		handled |= CSR_INT_BIT_HW_ERR;</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	if (iwl_legacy_get_debug_level(priv) &amp; (IWL_DL_ISR)) {</div><div class='del'>-		/* NIC fires this, but we don't use it, redundant with WAKEUP */</div><div class='del'>-		if (inta &amp; CSR_INT_BIT_SCD) {</div><div class='del'>-			IWL_DEBUG_ISR(priv, "Scheduler finished to transmit "</div><div class='del'>-				      "the frame/frames.\n");</div><div class='del'>-			priv-&gt;isr_stats.sch++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Alive notification via Rx interrupt will do the real work */</div><div class='del'>-		if (inta &amp; CSR_INT_BIT_ALIVE) {</div><div class='del'>-			IWL_DEBUG_ISR(priv, "Alive interrupt\n");</div><div class='del'>-			priv-&gt;isr_stats.alive++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	/* Safely ignore these bits for debug checks below */</div><div class='del'>-	inta &amp;= ~(CSR_INT_BIT_SCD | CSR_INT_BIT_ALIVE);</div><div class='del'>-</div><div class='del'>-	/* Error detected by uCode */</div><div class='del'>-	if (inta &amp; CSR_INT_BIT_SW_ERR) {</div><div class='del'>-		IWL_ERR(priv, "Microcode SW error detected. "</div><div class='del'>-			"Restarting 0x%X.\n", inta);</div><div class='del'>-		priv-&gt;isr_stats.sw++;</div><div class='del'>-		iwl_legacy_irq_handle_error(priv);</div><div class='del'>-		handled |= CSR_INT_BIT_SW_ERR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* uCode wakes up after power-down sleep */</div><div class='del'>-	if (inta &amp; CSR_INT_BIT_WAKEUP) {</div><div class='del'>-		IWL_DEBUG_ISR(priv, "Wakeup interrupt\n");</div><div class='del'>-		iwl_legacy_rx_queue_update_write_ptr(priv, &amp;priv-&gt;rxq);</div><div class='del'>-		iwl_legacy_txq_update_write_ptr(priv, &amp;priv-&gt;txq[0]);</div><div class='del'>-		iwl_legacy_txq_update_write_ptr(priv, &amp;priv-&gt;txq[1]);</div><div class='del'>-		iwl_legacy_txq_update_write_ptr(priv, &amp;priv-&gt;txq[2]);</div><div class='del'>-		iwl_legacy_txq_update_write_ptr(priv, &amp;priv-&gt;txq[3]);</div><div class='del'>-		iwl_legacy_txq_update_write_ptr(priv, &amp;priv-&gt;txq[4]);</div><div class='del'>-		iwl_legacy_txq_update_write_ptr(priv, &amp;priv-&gt;txq[5]);</div><div class='del'>-</div><div class='del'>-		priv-&gt;isr_stats.wakeup++;</div><div class='del'>-		handled |= CSR_INT_BIT_WAKEUP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* All uCode command responses, including Tx command responses,</div><div class='del'>-	 * Rx "responses" (frame-received notification), and other</div><div class='del'>-	 * notifications from uCode come through here*/</div><div class='del'>-	if (inta &amp; (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX)) {</div><div class='del'>-		iwl3945_rx_handle(priv);</div><div class='del'>-		priv-&gt;isr_stats.rx++;</div><div class='del'>-		handled |= (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (inta &amp; CSR_INT_BIT_FH_TX) {</div><div class='del'>-		IWL_DEBUG_ISR(priv, "Tx interrupt\n");</div><div class='del'>-		priv-&gt;isr_stats.tx++;</div><div class='del'>-</div><div class='del'>-		iwl_write32(priv, CSR_FH_INT_STATUS, (1 &lt;&lt; 6));</div><div class='del'>-		iwl_legacy_write_direct32(priv, FH39_TCSR_CREDIT</div><div class='del'>-					(FH39_SRVC_CHNL), 0x0);</div><div class='del'>-		handled |= CSR_INT_BIT_FH_TX;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (inta &amp; ~handled) {</div><div class='del'>-		IWL_ERR(priv, "Unhandled INTA bits 0x%08x\n", inta &amp; ~handled);</div><div class='del'>-		priv-&gt;isr_stats.unhandled++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (inta &amp; ~priv-&gt;inta_mask) {</div><div class='del'>-		IWL_WARN(priv, "Disabled INTA bits 0x%08x were pending\n",</div><div class='del'>-			 inta &amp; ~priv-&gt;inta_mask);</div><div class='del'>-		IWL_WARN(priv, "   with FH_INT = 0x%08x\n", inta_fh);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Re-enable all interrupts */</div><div class='del'>-	/* only Re-enable if disabled by irq */</div><div class='del'>-	if (test_bit(STATUS_INT_ENABLED, &amp;priv-&gt;status))</div><div class='del'>-		iwl_legacy_enable_interrupts(priv);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	if (iwl_legacy_get_debug_level(priv) &amp; (IWL_DL_ISR)) {</div><div class='del'>-		inta = iwl_read32(priv, CSR_INT);</div><div class='del'>-		inta_mask = iwl_read32(priv, CSR_INT_MASK);</div><div class='del'>-		inta_fh = iwl_read32(priv, CSR_FH_INT_STATUS);</div><div class='del'>-		IWL_DEBUG_ISR(priv, "End inta 0x%08x, enabled 0x%08x, fh 0x%08x, "</div><div class='del'>-			"flags 0x%08lx\n", inta, inta_mask, inta_fh, flags);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl3945_get_channels_for_scan(struct iwl_priv *priv,</div><div class='del'>-					 enum ieee80211_band band,</div><div class='del'>-				     u8 is_active, u8 n_probes,</div><div class='del'>-				     struct iwl3945_scan_channel *scan_ch,</div><div class='del'>-				     struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_channel *chan;</div><div class='del'>-	const struct ieee80211_supported_band *sband;</div><div class='del'>-	const struct iwl_channel_info *ch_info;</div><div class='del'>-	u16 passive_dwell = 0;</div><div class='del'>-	u16 active_dwell = 0;</div><div class='del'>-	int added, i;</div><div class='del'>-</div><div class='del'>-	sband = iwl_get_hw_mode(priv, band);</div><div class='del'>-	if (!sband)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	active_dwell = iwl_legacy_get_active_dwell_time(priv, band, n_probes);</div><div class='del'>-	passive_dwell = iwl_legacy_get_passive_dwell_time(priv, band, vif);</div><div class='del'>-</div><div class='del'>-	if (passive_dwell &lt;= active_dwell)</div><div class='del'>-		passive_dwell = active_dwell + 1;</div><div class='del'>-</div><div class='del'>-	for (i = 0, added = 0; i &lt; priv-&gt;scan_request-&gt;n_channels; i++) {</div><div class='del'>-		chan = priv-&gt;scan_request-&gt;channels[i];</div><div class='del'>-</div><div class='del'>-		if (chan-&gt;band != band)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		scan_ch-&gt;channel = chan-&gt;hw_value;</div><div class='del'>-</div><div class='del'>-		ch_info = iwl_legacy_get_channel_info(priv, band,</div><div class='del'>-							scan_ch-&gt;channel);</div><div class='del'>-		if (!iwl_legacy_is_channel_valid(ch_info)) {</div><div class='del'>-			IWL_DEBUG_SCAN(priv,</div><div class='del'>-				"Channel %d is INVALID for this band.\n",</div><div class='del'>-			       scan_ch-&gt;channel);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		scan_ch-&gt;active_dwell = cpu_to_le16(active_dwell);</div><div class='del'>-		scan_ch-&gt;passive_dwell = cpu_to_le16(passive_dwell);</div><div class='del'>-		/* If passive , set up for auto-switch</div><div class='del'>-		 *  and use long active_dwell time.</div><div class='del'>-		 */</div><div class='del'>-		if (!is_active || iwl_legacy_is_channel_passive(ch_info) ||</div><div class='del'>-		    (chan-&gt;flags &amp; IEEE80211_CHAN_PASSIVE_SCAN)) {</div><div class='del'>-			scan_ch-&gt;type = 0;	/* passive */</div><div class='del'>-			if (IWL_UCODE_API(priv-&gt;ucode_ver) == 1)</div><div class='del'>-				scan_ch-&gt;active_dwell = cpu_to_le16(passive_dwell - 1);</div><div class='del'>-		} else {</div><div class='del'>-			scan_ch-&gt;type = 1;	/* active */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Set direct probe bits. These may be used both for active</div><div class='del'>-		 * scan channels (probes gets sent right away),</div><div class='del'>-		 * or for passive channels (probes get se sent only after</div><div class='del'>-		 * hearing clear Rx packet).*/</div><div class='del'>-		if (IWL_UCODE_API(priv-&gt;ucode_ver) &gt;= 2) {</div><div class='del'>-			if (n_probes)</div><div class='del'>-				scan_ch-&gt;type |= IWL39_SCAN_PROBE_MASK(n_probes);</div><div class='del'>-		} else {</div><div class='del'>-			/* uCode v1 does not allow setting direct probe bits on</div><div class='del'>-			 * passive channel. */</div><div class='del'>-			if ((scan_ch-&gt;type &amp; 1) &amp;&amp; n_probes)</div><div class='del'>-				scan_ch-&gt;type |= IWL39_SCAN_PROBE_MASK(n_probes);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Set txpower levels to defaults */</div><div class='del'>-		scan_ch-&gt;tpc.dsp_atten = 110;</div><div class='del'>-		/* scan_pwr_info-&gt;tpc.dsp_atten; */</div><div class='del'>-</div><div class='del'>-		/*scan_pwr_info-&gt;tpc.tx_gain; */</div><div class='del'>-		if (band == IEEE80211_BAND_5GHZ)</div><div class='del'>-			scan_ch-&gt;tpc.tx_gain = ((1 &lt;&lt; 5) | (3 &lt;&lt; 3)) | 3;</div><div class='del'>-		else {</div><div class='del'>-			scan_ch-&gt;tpc.tx_gain = ((1 &lt;&lt; 5) | (5 &lt;&lt; 3));</div><div class='del'>-			/* NOTE: if we were doing 6Mb OFDM for scans we'd use</div><div class='del'>-			 * power level:</div><div class='del'>-			 * scan_ch-&gt;tpc.tx_gain = ((1 &lt;&lt; 5) | (2 &lt;&lt; 3)) | 3;</div><div class='del'>-			 */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "Scanning %d [%s %d]\n",</div><div class='del'>-			       scan_ch-&gt;channel,</div><div class='del'>-			       (scan_ch-&gt;type &amp; 1) ? "ACTIVE" : "PASSIVE",</div><div class='del'>-			       (scan_ch-&gt;type &amp; 1) ?</div><div class='del'>-			       active_dwell : passive_dwell);</div><div class='del'>-</div><div class='del'>-		scan_ch++;</div><div class='del'>-		added++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_SCAN(priv, "total channels to scan %d\n", added);</div><div class='del'>-	return added;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_init_hw_rates(struct iwl_priv *priv,</div><div class='del'>-			      struct ieee80211_rate *rates)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; IWL_RATE_COUNT_LEGACY; i++) {</div><div class='del'>-		rates[i].bitrate = iwl3945_rates[i].ieee * 5;</div><div class='del'>-		rates[i].hw_value = i; /* Rate scaling will work on indexes */</div><div class='del'>-		rates[i].hw_value_short = i;</div><div class='del'>-		rates[i].flags = 0;</div><div class='del'>-		if ((i &gt; IWL39_LAST_OFDM_RATE) || (i &lt; IWL_FIRST_OFDM_RATE)) {</div><div class='del'>-			/*</div><div class='del'>-			 * If CCK != 1M then set short preamble rate flag.</div><div class='del'>-			 */</div><div class='del'>-			rates[i].flags |= (iwl3945_rates[i].plcp == 10) ?</div><div class='del'>-				0 : IEEE80211_RATE_SHORT_PREAMBLE;</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'>- * uCode download functions</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-static void iwl3945_dealloc_ucode_pci(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	iwl_legacy_free_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_code);</div><div class='del'>-	iwl_legacy_free_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_data);</div><div class='del'>-	iwl_legacy_free_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_data_backup);</div><div class='del'>-	iwl_legacy_free_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_init);</div><div class='del'>-	iwl_legacy_free_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_init_data);</div><div class='del'>-	iwl_legacy_free_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_boot);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_verify_inst_full - verify runtime uCode image in card vs. host,</div><div class='del'>- *     looking at all data.</div><div class='del'>- */</div><div class='del'>-static int iwl3945_verify_inst_full(struct iwl_priv *priv, __le32 *image, u32 len)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-	u32 save_len = len;</div><div class='del'>-	int rc = 0;</div><div class='del'>-	u32 errcnt;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "ucode inst image size is %u\n", len);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_write_direct32(priv, HBUS_TARG_MEM_RADDR,</div><div class='del'>-			       IWL39_RTC_INST_LOWER_BOUND);</div><div class='del'>-</div><div class='del'>-	errcnt = 0;</div><div class='del'>-	for (; len &gt; 0; len -= sizeof(u32), image++) {</div><div class='del'>-		/* read data comes through single port, auto-incr addr */</div><div class='del'>-		/* NOTE: Use the debugless read so we don't flood kernel log</div><div class='del'>-		 * if IWL_DL_IO is set */</div><div class='del'>-		val = _iwl_legacy_read_direct32(priv, HBUS_TARG_MEM_RDAT);</div><div class='del'>-		if (val != le32_to_cpu(*image)) {</div><div class='del'>-			IWL_ERR(priv, "uCode INST section is invalid at "</div><div class='del'>-				  "offset 0x%x, is 0x%x, s/b 0x%x\n",</div><div class='del'>-				  save_len - len, val, le32_to_cpu(*image));</div><div class='del'>-			rc = -EIO;</div><div class='del'>-			errcnt++;</div><div class='del'>-			if (errcnt &gt;= 20)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (!errcnt)</div><div class='del'>-		IWL_DEBUG_INFO(priv,</div><div class='del'>-			"ucode image in INSTRUCTION memory is good\n");</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'>-/**</div><div class='del'>- * iwl3945_verify_inst_sparse - verify runtime uCode image in card vs. host,</div><div class='del'>- *   using sample data 100 bytes apart.  If these sample points are good,</div><div class='del'>- *   it's a pretty good bet that everything between them is good, too.</div><div class='del'>- */</div><div class='del'>-static int iwl3945_verify_inst_sparse(struct iwl_priv *priv, __le32 *image, u32 len)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-	int rc = 0;</div><div class='del'>-	u32 errcnt = 0;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "ucode inst image size is %u\n", len);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i += 100, image += 100/sizeof(u32)) {</div><div class='del'>-		/* read data comes through single port, auto-incr addr */</div><div class='del'>-		/* NOTE: Use the debugless read so we don't flood kernel log</div><div class='del'>-		 * if IWL_DL_IO is set */</div><div class='del'>-		iwl_legacy_write_direct32(priv, HBUS_TARG_MEM_RADDR,</div><div class='del'>-			i + IWL39_RTC_INST_LOWER_BOUND);</div><div class='del'>-		val = _iwl_legacy_read_direct32(priv, HBUS_TARG_MEM_RDAT);</div><div class='del'>-		if (val != le32_to_cpu(*image)) {</div><div class='del'>-#if 0 /* Enable this if you want to see details */</div><div class='del'>-			IWL_ERR(priv, "uCode INST section is invalid at "</div><div class='del'>-				  "offset 0x%x, is 0x%x, s/b 0x%x\n",</div><div class='del'>-				  i, val, *image);</div><div class='del'>-#endif</div><div class='del'>-			rc = -EIO;</div><div class='del'>-			errcnt++;</div><div class='del'>-			if (errcnt &gt;= 3)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_verify_ucode - determine which instruction image is in SRAM,</div><div class='del'>- *    and verify its contents</div><div class='del'>- */</div><div class='del'>-static int iwl3945_verify_ucode(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	__le32 *image;</div><div class='del'>-	u32 len;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	/* Try bootstrap */</div><div class='del'>-	image = (__le32 *)priv-&gt;ucode_boot.v_addr;</div><div class='del'>-	len = priv-&gt;ucode_boot.len;</div><div class='del'>-	rc = iwl3945_verify_inst_sparse(priv, image, len);</div><div class='del'>-	if (rc == 0) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Bootstrap uCode is good in inst SRAM\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Try initialize */</div><div class='del'>-	image = (__le32 *)priv-&gt;ucode_init.v_addr;</div><div class='del'>-	len = priv-&gt;ucode_init.len;</div><div class='del'>-	rc = iwl3945_verify_inst_sparse(priv, image, len);</div><div class='del'>-	if (rc == 0) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Initialize uCode is good in inst SRAM\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Try runtime/protocol */</div><div class='del'>-	image = (__le32 *)priv-&gt;ucode_code.v_addr;</div><div class='del'>-	len = priv-&gt;ucode_code.len;</div><div class='del'>-	rc = iwl3945_verify_inst_sparse(priv, image, len);</div><div class='del'>-	if (rc == 0) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Runtime uCode is good in inst SRAM\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_ERR(priv, "NO VALID UCODE IMAGE IN INSTRUCTION SRAM!!\n");</div><div class='del'>-</div><div class='del'>-	/* Since nothing seems to match, show first several data entries in</div><div class='del'>-	 * instruction SRAM, so maybe visual inspection will give a clue.</div><div class='del'>-	 * Selection of bootstrap image (vs. other images) is arbitrary. */</div><div class='del'>-	image = (__le32 *)priv-&gt;ucode_boot.v_addr;</div><div class='del'>-	len = priv-&gt;ucode_boot.len;</div><div class='del'>-	rc = iwl3945_verify_inst_full(priv, image, len);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_nic_start(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	/* Remove all resets to allow NIC to operate */</div><div class='del'>-	iwl_write32(priv, CSR_RESET, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define IWL3945_UCODE_GET(item)						\</div><div class='del'>-static u32 iwl3945_ucode_get_##item(const struct iwl_ucode_header *ucode)\</div><div class='del'>-{									\</div><div class='del'>-	return le32_to_cpu(ucode-&gt;v1.item);				\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 iwl3945_ucode_get_header_size(u32 api_ver)</div><div class='del'>-{</div><div class='del'>-	return 24;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 *iwl3945_ucode_get_data(const struct iwl_ucode_header *ucode)</div><div class='del'>-{</div><div class='del'>-	return (u8 *) ucode-&gt;v1.data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-IWL3945_UCODE_GET(inst_size);</div><div class='del'>-IWL3945_UCODE_GET(data_size);</div><div class='del'>-IWL3945_UCODE_GET(init_size);</div><div class='del'>-IWL3945_UCODE_GET(init_data_size);</div><div class='del'>-IWL3945_UCODE_GET(boot_size);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_read_ucode - Read uCode images from disk file.</div><div class='del'>- *</div><div class='del'>- * Copy into buffers for card to fetch via bus-mastering</div><div class='del'>- */</div><div class='del'>-static int iwl3945_read_ucode(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	const struct iwl_ucode_header *ucode;</div><div class='del'>-	int ret = -EINVAL, index;</div><div class='del'>-	const struct firmware *ucode_raw;</div><div class='del'>-	/* firmware file name contains uCode/driver compatibility version */</div><div class='del'>-	const char *name_pre = priv-&gt;cfg-&gt;fw_name_pre;</div><div class='del'>-	const unsigned int api_max = priv-&gt;cfg-&gt;ucode_api_max;</div><div class='del'>-	const unsigned int api_min = priv-&gt;cfg-&gt;ucode_api_min;</div><div class='del'>-	char buf[25];</div><div class='del'>-	u8 *src;</div><div class='del'>-	size_t len;</div><div class='del'>-	u32 api_ver, inst_size, data_size, init_size, init_data_size, boot_size;</div><div class='del'>-</div><div class='del'>-	/* Ask kernel firmware_class module to get the boot firmware off disk.</div><div class='del'>-	 * request_firmware() is synchronous, file is in memory on return. */</div><div class='del'>-	for (index = api_max; index &gt;= api_min; index--) {</div><div class='del'>-		sprintf(buf, "%s%u%s", name_pre, index, ".ucode");</div><div class='del'>-		ret = request_firmware(&amp;ucode_raw, buf, &amp;priv-&gt;pci_dev-&gt;dev);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			IWL_ERR(priv, "%s firmware file req failed: %d\n",</div><div class='del'>-				  buf, ret);</div><div class='del'>-			if (ret == -ENOENT)</div><div class='del'>-				continue;</div><div class='del'>-			else</div><div class='del'>-				goto error;</div><div class='del'>-		} else {</div><div class='del'>-			if (index &lt; api_max)</div><div class='del'>-				IWL_ERR(priv, "Loaded firmware %s, "</div><div class='del'>-					"which is deprecated. "</div><div class='del'>-					" Please use API v%u instead.\n",</div><div class='del'>-					  buf, api_max);</div><div class='del'>-			IWL_DEBUG_INFO(priv, "Got firmware '%s' file "</div><div class='del'>-				       "(%zd bytes) from disk\n",</div><div class='del'>-				       buf, ucode_raw-&gt;size);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	/* Make sure that we got at least our header! */</div><div class='del'>-	if (ucode_raw-&gt;size &lt;  iwl3945_ucode_get_header_size(1)) {</div><div class='del'>-		IWL_ERR(priv, "File size way too small!\n");</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err_release;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Data from ucode file:  header followed by uCode images */</div><div class='del'>-	ucode = (struct iwl_ucode_header *)ucode_raw-&gt;data;</div><div class='del'>-</div><div class='del'>-	priv-&gt;ucode_ver = le32_to_cpu(ucode-&gt;ver);</div><div class='del'>-	api_ver = IWL_UCODE_API(priv-&gt;ucode_ver);</div><div class='del'>-	inst_size = iwl3945_ucode_get_inst_size(ucode);</div><div class='del'>-	data_size = iwl3945_ucode_get_data_size(ucode);</div><div class='del'>-	init_size = iwl3945_ucode_get_init_size(ucode);</div><div class='del'>-	init_data_size = iwl3945_ucode_get_init_data_size(ucode);</div><div class='del'>-	boot_size = iwl3945_ucode_get_boot_size(ucode);</div><div class='del'>-	src = iwl3945_ucode_get_data(ucode);</div><div class='del'>-</div><div class='del'>-	/* api_ver should match the api version forming part of the</div><div class='del'>-	 * firmware filename ... but we don't check for that and only rely</div><div class='del'>-	 * on the API version read from firmware header from here on forward */</div><div class='del'>-</div><div class='del'>-	if (api_ver &lt; api_min || api_ver &gt; api_max) {</div><div class='del'>-		IWL_ERR(priv, "Driver unable to support your firmware API. "</div><div class='del'>-			  "Driver supports v%u, firmware is v%u.\n",</div><div class='del'>-			  api_max, api_ver);</div><div class='del'>-		priv-&gt;ucode_ver = 0;</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err_release;</div><div class='del'>-	}</div><div class='del'>-	if (api_ver != api_max)</div><div class='del'>-		IWL_ERR(priv, "Firmware has old API version. Expected %u, "</div><div class='del'>-			  "got %u. New firmware can be obtained "</div><div class='del'>-			  "from http://www.intellinuxwireless.org.\n",</div><div class='del'>-			  api_max, api_ver);</div><div class='del'>-</div><div class='del'>-	IWL_INFO(priv, "loaded firmware version %u.%u.%u.%u\n",</div><div class='del'>-		IWL_UCODE_MAJOR(priv-&gt;ucode_ver),</div><div class='del'>-		IWL_UCODE_MINOR(priv-&gt;ucode_ver),</div><div class='del'>-		IWL_UCODE_API(priv-&gt;ucode_ver),</div><div class='del'>-		IWL_UCODE_SERIAL(priv-&gt;ucode_ver));</div><div class='del'>-</div><div class='del'>-	snprintf(priv-&gt;hw-&gt;wiphy-&gt;fw_version,</div><div class='del'>-		 sizeof(priv-&gt;hw-&gt;wiphy-&gt;fw_version),</div><div class='del'>-		 "%u.%u.%u.%u",</div><div class='del'>-		 IWL_UCODE_MAJOR(priv-&gt;ucode_ver),</div><div class='del'>-		 IWL_UCODE_MINOR(priv-&gt;ucode_ver),</div><div class='del'>-		 IWL_UCODE_API(priv-&gt;ucode_ver),</div><div class='del'>-		 IWL_UCODE_SERIAL(priv-&gt;ucode_ver));</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "f/w package hdr ucode version raw = 0x%x\n",</div><div class='del'>-		       priv-&gt;ucode_ver);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "f/w package hdr runtime inst size = %u\n",</div><div class='del'>-		       inst_size);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "f/w package hdr runtime data size = %u\n",</div><div class='del'>-		       data_size);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "f/w package hdr init inst size = %u\n",</div><div class='del'>-		       init_size);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "f/w package hdr init data size = %u\n",</div><div class='del'>-		       init_data_size);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "f/w package hdr boot inst size = %u\n",</div><div class='del'>-		       boot_size);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Verify size of file vs. image size info in file's header */</div><div class='del'>-	if (ucode_raw-&gt;size != iwl3945_ucode_get_header_size(api_ver) +</div><div class='del'>-		inst_size + data_size + init_size +</div><div class='del'>-		init_data_size + boot_size) {</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_INFO(priv,</div><div class='del'>-			"uCode file size %zd does not match expected size\n",</div><div class='del'>-			ucode_raw-&gt;size);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err_release;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Verify that uCode images will fit in card's SRAM */</div><div class='del'>-	if (inst_size &gt; IWL39_MAX_INST_SIZE) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "uCode instr len %d too large to fit in\n",</div><div class='del'>-			       inst_size);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err_release;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data_size &gt; IWL39_MAX_DATA_SIZE) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "uCode data len %d too large to fit in\n",</div><div class='del'>-			       data_size);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err_release;</div><div class='del'>-	}</div><div class='del'>-	if (init_size &gt; IWL39_MAX_INST_SIZE) {</div><div class='del'>-		IWL_DEBUG_INFO(priv,</div><div class='del'>-				"uCode init instr len %d too large to fit in\n",</div><div class='del'>-				init_size);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err_release;</div><div class='del'>-	}</div><div class='del'>-	if (init_data_size &gt; IWL39_MAX_DATA_SIZE) {</div><div class='del'>-		IWL_DEBUG_INFO(priv,</div><div class='del'>-				"uCode init data len %d too large to fit in\n",</div><div class='del'>-				init_data_size);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err_release;</div><div class='del'>-	}</div><div class='del'>-	if (boot_size &gt; IWL39_MAX_BSM_SIZE) {</div><div class='del'>-		IWL_DEBUG_INFO(priv,</div><div class='del'>-				"uCode boot instr len %d too large to fit in\n",</div><div class='del'>-				boot_size);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err_release;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Allocate ucode buffers for card's bus-master loading ... */</div><div class='del'>-</div><div class='del'>-	/* Runtime instructions and 2 copies of data:</div><div class='del'>-	 * 1) unmodified from disk</div><div class='del'>-	 * 2) backup cache for save/restore during power-downs */</div><div class='del'>-	priv-&gt;ucode_code.len = inst_size;</div><div class='del'>-	iwl_legacy_alloc_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_code);</div><div class='del'>-</div><div class='del'>-	priv-&gt;ucode_data.len = data_size;</div><div class='del'>-	iwl_legacy_alloc_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_data);</div><div class='del'>-</div><div class='del'>-	priv-&gt;ucode_data_backup.len = data_size;</div><div class='del'>-	iwl_legacy_alloc_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_data_backup);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;ucode_code.v_addr || !priv-&gt;ucode_data.v_addr ||</div><div class='del'>-	    !priv-&gt;ucode_data_backup.v_addr)</div><div class='del'>-		goto err_pci_alloc;</div><div class='del'>-</div><div class='del'>-	/* Initialization instructions and data */</div><div class='del'>-	if (init_size &amp;&amp; init_data_size) {</div><div class='del'>-		priv-&gt;ucode_init.len = init_size;</div><div class='del'>-		iwl_legacy_alloc_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_init);</div><div class='del'>-</div><div class='del'>-		priv-&gt;ucode_init_data.len = init_data_size;</div><div class='del'>-		iwl_legacy_alloc_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_init_data);</div><div class='del'>-</div><div class='del'>-		if (!priv-&gt;ucode_init.v_addr || !priv-&gt;ucode_init_data.v_addr)</div><div class='del'>-			goto err_pci_alloc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Bootstrap (instructions only, no data) */</div><div class='del'>-	if (boot_size) {</div><div class='del'>-		priv-&gt;ucode_boot.len = boot_size;</div><div class='del'>-		iwl_legacy_alloc_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_boot);</div><div class='del'>-</div><div class='del'>-		if (!priv-&gt;ucode_boot.v_addr)</div><div class='del'>-			goto err_pci_alloc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Copy images into buffers for card's bus-master reads ... */</div><div class='del'>-</div><div class='del'>-	/* Runtime instructions (first block of data in file) */</div><div class='del'>-	len = inst_size;</div><div class='del'>-	IWL_DEBUG_INFO(priv,</div><div class='del'>-		"Copying (but not loading) uCode instr len %zd\n", len);</div><div class='del'>-	memcpy(priv-&gt;ucode_code.v_addr, src, len);</div><div class='del'>-	src += len;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "uCode instr buf vaddr = 0x%p, paddr = 0x%08x\n",</div><div class='del'>-		priv-&gt;ucode_code.v_addr, (u32)priv-&gt;ucode_code.p_addr);</div><div class='del'>-</div><div class='del'>-	/* Runtime data (2nd block)</div><div class='del'>-	 * NOTE:  Copy into backup buffer will be done in iwl3945_up()  */</div><div class='del'>-	len = data_size;</div><div class='del'>-	IWL_DEBUG_INFO(priv,</div><div class='del'>-		"Copying (but not loading) uCode data len %zd\n", len);</div><div class='del'>-	memcpy(priv-&gt;ucode_data.v_addr, src, len);</div><div class='del'>-	memcpy(priv-&gt;ucode_data_backup.v_addr, src, len);</div><div class='del'>-	src += len;</div><div class='del'>-</div><div class='del'>-	/* Initialization instructions (3rd block) */</div><div class='del'>-	if (init_size) {</div><div class='del'>-		len = init_size;</div><div class='del'>-		IWL_DEBUG_INFO(priv,</div><div class='del'>-			"Copying (but not loading) init instr len %zd\n", len);</div><div class='del'>-		memcpy(priv-&gt;ucode_init.v_addr, src, len);</div><div class='del'>-		src += len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Initialization data (4th block) */</div><div class='del'>-	if (init_data_size) {</div><div class='del'>-		len = init_data_size;</div><div class='del'>-		IWL_DEBUG_INFO(priv,</div><div class='del'>-			"Copying (but not loading) init data len %zd\n", len);</div><div class='del'>-		memcpy(priv-&gt;ucode_init_data.v_addr, src, len);</div><div class='del'>-		src += len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Bootstrap instructions (5th block) */</div><div class='del'>-	len = boot_size;</div><div class='del'>-	IWL_DEBUG_INFO(priv,</div><div class='del'>-		"Copying (but not loading) boot instr len %zd\n", len);</div><div class='del'>-	memcpy(priv-&gt;ucode_boot.v_addr, src, len);</div><div class='del'>-</div><div class='del'>-	/* We have our copies now, allow OS release its copies */</div><div class='del'>-	release_firmware(ucode_raw);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- err_pci_alloc:</div><div class='del'>-	IWL_ERR(priv, "failed to allocate pci memory\n");</div><div class='del'>-	ret = -ENOMEM;</div><div class='del'>-	iwl3945_dealloc_ucode_pci(priv);</div><div class='del'>-</div><div class='del'>- err_release:</div><div class='del'>-	release_firmware(ucode_raw);</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_set_ucode_ptrs - Set uCode address location</div><div class='del'>- *</div><div class='del'>- * Tell initialization uCode where to find runtime uCode.</div><div class='del'>- *</div><div class='del'>- * BSM registers initially contain pointers to initialization uCode.</div><div class='del'>- * We need to replace them to load runtime uCode inst and data,</div><div class='del'>- * and to save runtime data when powering down.</div><div class='del'>- */</div><div class='del'>-static int iwl3945_set_ucode_ptrs(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	dma_addr_t pinst;</div><div class='del'>-	dma_addr_t pdata;</div><div class='del'>-</div><div class='del'>-	/* bits 31:0 for 3945 */</div><div class='del'>-	pinst = priv-&gt;ucode_code.p_addr;</div><div class='del'>-	pdata = priv-&gt;ucode_data_backup.p_addr;</div><div class='del'>-</div><div class='del'>-	/* Tell bootstrap uCode where to find image to load */</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_DRAM_INST_PTR_REG, pinst);</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_DRAM_DATA_PTR_REG, pdata);</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_DRAM_DATA_BYTECOUNT_REG,</div><div class='del'>-				 priv-&gt;ucode_data.len);</div><div class='del'>-</div><div class='del'>-	/* Inst byte count must be last to set up, bit 31 signals uCode</div><div class='del'>-	 *   that all new ptr/size info is in place */</div><div class='del'>-	iwl_legacy_write_prph(priv, BSM_DRAM_INST_BYTECOUNT_REG,</div><div class='del'>-				 priv-&gt;ucode_code.len | BSM_DRAM_INST_LOAD);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Runtime uCode pointers are set.\n");</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'>- * iwl3945_init_alive_start - Called after REPLY_ALIVE notification received</div><div class='del'>- *</div><div class='del'>- * Called after REPLY_ALIVE notification received from "initialize" uCode.</div><div class='del'>- *</div><div class='del'>- * Tell "initialize" uCode to go ahead and load the runtime uCode.</div><div class='del'>- */</div><div class='del'>-static void iwl3945_init_alive_start(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	/* Check alive response for "valid" sign from uCode */</div><div class='del'>-	if (priv-&gt;card_alive_init.is_valid != UCODE_VALID_OK) {</div><div class='del'>-		/* We had an error bringing up the hardware, so take it</div><div class='del'>-		 * all the way back down so we can try again */</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Initialize Alive failed.\n");</div><div class='del'>-		goto restart;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Bootstrap uCode has loaded initialize uCode ... verify inst image.</div><div class='del'>-	 * This is a paranoid check, because we would not have gotten the</div><div class='del'>-	 * "initialize" alive if code weren't properly loaded.  */</div><div class='del'>-	if (iwl3945_verify_ucode(priv)) {</div><div class='del'>-		/* Runtime instruction load was bad;</div><div class='del'>-		 * take it all the way back down so we can try again */</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Bad \"initialize\" uCode load.\n");</div><div class='del'>-		goto restart;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Send pointers to protocol/runtime uCode image ... init code will</div><div class='del'>-	 * load and launch runtime uCode, which will send us another "Alive"</div><div class='del'>-	 * notification. */</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Initialization Alive received.\n");</div><div class='del'>-	if (iwl3945_set_ucode_ptrs(priv)) {</div><div class='del'>-		/* Runtime instruction load won't happen;</div><div class='del'>-		 * take it all the way back down so we can try again */</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Couldn't set up uCode pointers.\n");</div><div class='del'>-		goto restart;</div><div class='del'>-	}</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>- restart:</div><div class='del'>-	queue_work(priv-&gt;workqueue, &amp;priv-&gt;restart);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl3945_alive_start - called after REPLY_ALIVE notification received</div><div class='del'>- *                   from protocol/runtime uCode (initialization uCode's</div><div class='del'>- *                   Alive gets handled by iwl3945_init_alive_start()).</div><div class='del'>- */</div><div class='del'>-static void iwl3945_alive_start(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int thermal_spin = 0;</div><div class='del'>-	u32 rfkill;</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Runtime Alive received.\n");</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;card_alive.is_valid != UCODE_VALID_OK) {</div><div class='del'>-		/* We had an error bringing up the hardware, so take it</div><div class='del'>-		 * all the way back down so we can try again */</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Alive failed.\n");</div><div class='del'>-		goto restart;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Initialize uCode has loaded Runtime uCode ... verify inst image.</div><div class='del'>-	 * This is a paranoid check, because we would not have gotten the</div><div class='del'>-	 * "runtime" alive if code weren't properly loaded.  */</div><div class='del'>-	if (iwl3945_verify_ucode(priv)) {</div><div class='del'>-		/* Runtime instruction load was bad;</div><div class='del'>-		 * take it all the way back down so we can try again */</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Bad runtime uCode load.\n");</div><div class='del'>-		goto restart;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rfkill = iwl_legacy_read_prph(priv, APMG_RFKILL_REG);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "RFKILL status: 0x%x\n", rfkill);</div><div class='del'>-</div><div class='del'>-	if (rfkill &amp; 0x1) {</div><div class='del'>-		clear_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-		/* if RFKILL is not on, then wait for thermal</div><div class='del'>-		 * sensor in adapter to kick in */</div><div class='del'>-		while (iwl3945_hw_get_temperature(priv) == 0) {</div><div class='del'>-			thermal_spin++;</div><div class='del'>-			udelay(10);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (thermal_spin)</div><div class='del'>-			IWL_DEBUG_INFO(priv, "Thermal calibration took %dus\n",</div><div class='del'>-				       thermal_spin * 10);</div><div class='del'>-	} else</div><div class='del'>-		set_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	/* After the ALIVE response, we can send commands to 3945 uCode */</div><div class='del'>-	set_bit(STATUS_ALIVE, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	/* Enable watchdog to monitor the driver tx queues */</div><div class='del'>-	iwl_legacy_setup_watchdog(priv);</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_is_rfkill(priv))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ieee80211_wake_queues(priv-&gt;hw);</div><div class='del'>-</div><div class='del'>-	priv-&gt;active_rate = IWL_RATES_MASK_3945;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_power_update_mode(priv, true);</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS)) {</div><div class='del'>-		struct iwl3945_rxon_cmd *active_rxon =</div><div class='del'>-				(struct iwl3945_rxon_cmd *)(&amp;ctx-&gt;active);</div><div class='del'>-</div><div class='del'>-		ctx-&gt;staging.filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='del'>-		active_rxon-&gt;filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='del'>-	} else {</div><div class='del'>-		/* Initialize our rx_config data */</div><div class='del'>-		iwl_legacy_connection_init_rx_config(priv, ctx);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Configure Bluetooth device coexistence support */</div><div class='del'>-	iwl_legacy_send_bt_config(priv);</div><div class='del'>-</div><div class='del'>-	set_bit(STATUS_READY, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	/* Configure the adapter for unassociated operation */</div><div class='del'>-	iwl3945_commit_rxon(priv, ctx);</div><div class='del'>-</div><div class='del'>-	iwl3945_reg_txpower_periodic(priv);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "ALIVE processing complete.\n");</div><div class='del'>-	wake_up(&amp;priv-&gt;wait_command_queue);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>- restart:</div><div class='del'>-	queue_work(priv-&gt;workqueue, &amp;priv-&gt;restart);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_cancel_deferred_work(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-static void __iwl3945_down(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int exit_pending;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, DRV_NAME " is going down\n");</div><div class='del'>-</div><div class='del'>-	iwl_legacy_scan_cancel_timeout(priv, 200);</div><div class='del'>-</div><div class='del'>-	exit_pending = test_and_set_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	/* Stop TX queues watchdog. We need to have STATUS_EXIT_PENDING bit set</div><div class='del'>-	 * to prevent rearm timer */</div><div class='del'>-	del_timer_sync(&amp;priv-&gt;watchdog);</div><div class='del'>-</div><div class='del'>-	/* Station information will now be cleared in device */</div><div class='del'>-	iwl_legacy_clear_ucode_stations(priv, NULL);</div><div class='del'>-	iwl_legacy_dealloc_bcast_stations(priv);</div><div class='del'>-	iwl_legacy_clear_driver_stations(priv);</div><div class='del'>-</div><div class='del'>-	/* Unblock any waiting calls */</div><div class='del'>-	wake_up_all(&amp;priv-&gt;wait_command_queue);</div><div class='del'>-</div><div class='del'>-	/* Wipe out the EXIT_PENDING status bit if we are not actually</div><div class='del'>-	 * exiting the module */</div><div class='del'>-	if (!exit_pending)</div><div class='del'>-		clear_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	/* stop and reset the on-board processor */</div><div class='del'>-	iwl_write32(priv, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);</div><div class='del'>-</div><div class='del'>-	/* tell the device to stop sending interrupts */</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	iwl_legacy_disable_interrupts(priv);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-	iwl3945_synchronize_irq(priv);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;mac80211_registered)</div><div class='del'>-		ieee80211_stop_queues(priv-&gt;hw);</div><div class='del'>-</div><div class='del'>-	/* If we have not previously called iwl3945_init() then</div><div class='del'>-	 * clear all bits but the RF Kill bits and return */</div><div class='del'>-	if (!iwl_legacy_is_init(priv)) {</div><div class='del'>-		priv-&gt;status = test_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status) &lt;&lt;</div><div class='del'>-					STATUS_RF_KILL_HW |</div><div class='del'>-			       test_bit(STATUS_GEO_CONFIGURED, &amp;priv-&gt;status) &lt;&lt;</div><div class='del'>-					STATUS_GEO_CONFIGURED |</div><div class='del'>-				test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status) &lt;&lt;</div><div class='del'>-					STATUS_EXIT_PENDING;</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* ...otherwise clear out all the status bits but the RF Kill</div><div class='del'>-	 * bit and continue taking the NIC down. */</div><div class='del'>-	priv-&gt;status &amp;= test_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status) &lt;&lt;</div><div class='del'>-				STATUS_RF_KILL_HW |</div><div class='del'>-			test_bit(STATUS_GEO_CONFIGURED, &amp;priv-&gt;status) &lt;&lt;</div><div class='del'>-				STATUS_GEO_CONFIGURED |</div><div class='del'>-			test_bit(STATUS_FW_ERROR, &amp;priv-&gt;status) &lt;&lt;</div><div class='del'>-				STATUS_FW_ERROR |</div><div class='del'>-			test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status) &lt;&lt;</div><div class='del'>-				STATUS_EXIT_PENDING;</div><div class='del'>-</div><div class='del'>-	iwl3945_hw_txq_ctx_stop(priv);</div><div class='del'>-	iwl3945_hw_rxq_stop(priv);</div><div class='del'>-</div><div class='del'>-	/* Power-down device's busmaster DMA clocks */</div><div class='del'>-	iwl_legacy_write_prph(priv, APMG_CLK_DIS_REG, APMG_CLK_VAL_DMA_CLK_RQT);</div><div class='del'>-	udelay(5);</div><div class='del'>-</div><div class='del'>-	/* Stop the device, and put it in low power state */</div><div class='del'>-	iwl_legacy_apm_stop(priv);</div><div class='del'>-</div><div class='del'>- exit:</div><div class='del'>-	memset(&amp;priv-&gt;card_alive, 0, sizeof(struct iwl_alive_resp));</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;beacon_skb)</div><div class='del'>-		dev_kfree_skb(priv-&gt;beacon_skb);</div><div class='del'>-	priv-&gt;beacon_skb = NULL;</div><div class='del'>-</div><div class='del'>-	/* clear out any free frames */</div><div class='del'>-	iwl3945_clear_free_frames(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_down(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	__iwl3945_down(priv);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	iwl3945_cancel_deferred_work(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define MAX_HW_RESTARTS 5</div><div class='del'>-</div><div class='del'>-static int iwl3945_alloc_bcast_station(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u8 sta_id;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-	sta_id = iwl_legacy_prep_station(priv, ctx,</div><div class='del'>-					iwlegacy_bcast_addr, false, NULL);</div><div class='del'>-	if (sta_id == IWL_INVALID_STATION) {</div><div class='del'>-		IWL_ERR(priv, "Unable to prepare broadcast station\n");</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;stations[sta_id].used |= IWL_STA_DRIVER_ACTIVE;</div><div class='del'>-	priv-&gt;stations[sta_id].used |= IWL_STA_BCAST;</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;sta_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 __iwl3945_up(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int rc, i;</div><div class='del'>-</div><div class='del'>-	rc = iwl3945_alloc_bcast_station(priv);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status)) {</div><div class='del'>-		IWL_WARN(priv, "Exit pending; will not bring the NIC up\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;ucode_data_backup.v_addr || !priv-&gt;ucode_data.v_addr) {</div><div class='del'>-		IWL_ERR(priv, "ucode not available for device bring up\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If platform's RF_KILL switch is NOT set to KILL */</div><div class='del'>-	if (iwl_read32(priv, CSR_GP_CNTRL) &amp;</div><div class='del'>-				CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)</div><div class='del'>-		clear_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-	else {</div><div class='del'>-		set_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-		IWL_WARN(priv, "Radio disabled by HW RF Kill switch\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_write32(priv, CSR_INT, 0xFFFFFFFF);</div><div class='del'>-</div><div class='del'>-	rc = iwl3945_hw_nic_init(priv);</div><div class='del'>-	if (rc) {</div><div class='del'>-		IWL_ERR(priv, "Unable to int nic\n");</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* make sure rfkill handshake bits are cleared */</div><div class='del'>-	iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);</div><div class='del'>-	iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR,</div><div class='del'>-		    CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);</div><div class='del'>-</div><div class='del'>-	/* clear (again), then enable host interrupts */</div><div class='del'>-	iwl_write32(priv, CSR_INT, 0xFFFFFFFF);</div><div class='del'>-	iwl_legacy_enable_interrupts(priv);</div><div class='del'>-</div><div class='del'>-	/* really make sure rfkill handshake bits are cleared */</div><div class='del'>-	iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);</div><div class='del'>-	iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);</div><div class='del'>-</div><div class='del'>-	/* Copy original ucode data image from disk into backup cache.</div><div class='del'>-	 * This will be used to initialize the on-board processor's</div><div class='del'>-	 * data SRAM for a clean start when the runtime program first loads. */</div><div class='del'>-	memcpy(priv-&gt;ucode_data_backup.v_addr, priv-&gt;ucode_data.v_addr,</div><div class='del'>-	       priv-&gt;ucode_data.len);</div><div class='del'>-</div><div class='del'>-	/* We return success when we resume from suspend and rf_kill is on. */</div><div class='del'>-	if (test_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_HW_RESTARTS; i++) {</div><div class='del'>-</div><div class='del'>-		/* load bootstrap state machine,</div><div class='del'>-		 * load bootstrap program into processor's memory,</div><div class='del'>-		 * prepare to load the "initialize" uCode */</div><div class='del'>-		rc = priv-&gt;cfg-&gt;ops-&gt;lib-&gt;load_ucode(priv);</div><div class='del'>-</div><div class='del'>-		if (rc) {</div><div class='del'>-			IWL_ERR(priv,</div><div class='del'>-				"Unable to set up bootstrap uCode: %d\n", rc);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* start card; "initialize" will load runtime ucode */</div><div class='del'>-		iwl3945_nic_start(priv);</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_INFO(priv, DRV_NAME " is coming up\n");</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status);</div><div class='del'>-	__iwl3945_down(priv);</div><div class='del'>-	clear_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	/* tried to restart and config the device for as long as our</div><div class='del'>-	 * patience could withstand */</div><div class='del'>-	IWL_ERR(priv, "Unable to initialize device after %d attempts.\n", i);</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>- *</div><div class='del'>- * Workqueue callbacks</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-static void iwl3945_bg_init_alive_start(struct work_struct *data)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv =</div><div class='del'>-	    container_of(data, struct iwl_priv, init_alive_start.work);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	iwl3945_init_alive_start(priv);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_bg_alive_start(struct work_struct *data)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv =</div><div class='del'>-	    container_of(data, struct iwl_priv, alive_start.work);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	iwl3945_alive_start(priv);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 3945 cannot interrupt driver when hardware rf kill switch toggles;</div><div class='del'>- * driver must poll CSR_GP_CNTRL_REG register for change.  This register</div><div class='del'>- * *is* readable even when device has been SW_RESET into low power mode</div><div class='del'>- * (e.g. during RF KILL).</div><div class='del'>- */</div><div class='del'>-static void iwl3945_rfkill_poll(struct work_struct *data)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv =</div><div class='del'>-	    container_of(data, struct iwl_priv, _3945.rfkill_poll.work);</div><div class='del'>-	bool old_rfkill = test_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-	bool new_rfkill = !(iwl_read32(priv, CSR_GP_CNTRL)</div><div class='del'>-			&amp; CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW);</div><div class='del'>-</div><div class='del'>-	if (new_rfkill != old_rfkill) {</div><div class='del'>-		if (new_rfkill)</div><div class='del'>-			set_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-		else</div><div class='del'>-			clear_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-		wiphy_rfkill_set_hw_state(priv-&gt;hw-&gt;wiphy, new_rfkill);</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_RF_KILL(priv, "RF_KILL bit toggled to %s.\n",</div><div class='del'>-				new_rfkill ? "disable radio" : "enable radio");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Keep this running, even if radio now enabled.  This will be</div><div class='del'>-	 * cancelled in mac_start() if system decides to start again */</div><div class='del'>-	queue_delayed_work(priv-&gt;workqueue, &amp;priv-&gt;_3945.rfkill_poll,</div><div class='del'>-			   round_jiffies_relative(2 * HZ));</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct iwl_host_cmd cmd = {</div><div class='del'>-		.id = REPLY_SCAN_CMD,</div><div class='del'>-		.len = sizeof(struct iwl3945_scan_cmd),</div><div class='del'>-		.flags = CMD_SIZE_HUGE,</div><div class='del'>-	};</div><div class='del'>-	struct iwl3945_scan_cmd *scan;</div><div class='del'>-	u8 n_probes = 0;</div><div class='del'>-	enum ieee80211_band band;</div><div class='del'>-	bool is_active = false;</div><div class='del'>-	int ret;</div><div class='del'>-	u16 len;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;scan_cmd) {</div><div class='del'>-		priv-&gt;scan_cmd = kmalloc(sizeof(struct iwl3945_scan_cmd) +</div><div class='del'>-					 IWL_MAX_SCAN_SIZE, GFP_KERNEL);</div><div class='del'>-		if (!priv-&gt;scan_cmd) {</div><div class='del'>-			IWL_DEBUG_SCAN(priv, "Fail to allocate scan memory\n");</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	scan = priv-&gt;scan_cmd;</div><div class='del'>-	memset(scan, 0, sizeof(struct iwl3945_scan_cmd) + IWL_MAX_SCAN_SIZE);</div><div class='del'>-</div><div class='del'>-	scan-&gt;quiet_plcp_th = IWL_PLCP_QUIET_THRESH;</div><div class='del'>-	scan-&gt;quiet_time = IWL_ACTIVE_QUIET_TIME;</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS)) {</div><div class='del'>-		u16 interval;</div><div class='del'>-		u32 extra;</div><div class='del'>-		u32 suspend_time = 100;</div><div class='del'>-		u32 scan_suspend_time = 100;</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Scanning while associated...\n");</div><div class='del'>-</div><div class='del'>-		interval = vif-&gt;bss_conf.beacon_int;</div><div class='del'>-</div><div class='del'>-		scan-&gt;suspend_time = 0;</div><div class='del'>-		scan-&gt;max_out_time = cpu_to_le32(200 * 1024);</div><div class='del'>-		if (!interval)</div><div class='del'>-			interval = suspend_time;</div><div class='del'>-		/*</div><div class='del'>-		 * suspend time format:</div><div class='del'>-		 *  0-19: beacon interval in usec (time before exec.)</div><div class='del'>-		 * 20-23: 0</div><div class='del'>-		 * 24-31: number of beacons (suspend between channels)</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		extra = (suspend_time / interval) &lt;&lt; 24;</div><div class='del'>-		scan_suspend_time = 0xFF0FFFFF &amp;</div><div class='del'>-		    (extra | ((suspend_time % interval) * 1024));</div><div class='del'>-</div><div class='del'>-		scan-&gt;suspend_time = cpu_to_le32(scan_suspend_time);</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "suspend_time 0x%X beacon interval %d\n",</div><div class='del'>-			       scan_suspend_time, interval);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;scan_request-&gt;n_ssids) {</div><div class='del'>-		int i, p = 0;</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "Kicking off active scan\n");</div><div class='del'>-		for (i = 0; i &lt; priv-&gt;scan_request-&gt;n_ssids; i++) {</div><div class='del'>-			/* always does wildcard anyway */</div><div class='del'>-			if (!priv-&gt;scan_request-&gt;ssids[i].ssid_len)</div><div class='del'>-				continue;</div><div class='del'>-			scan-&gt;direct_scan[p].id = WLAN_EID_SSID;</div><div class='del'>-			scan-&gt;direct_scan[p].len =</div><div class='del'>-				priv-&gt;scan_request-&gt;ssids[i].ssid_len;</div><div class='del'>-			memcpy(scan-&gt;direct_scan[p].ssid,</div><div class='del'>-			       priv-&gt;scan_request-&gt;ssids[i].ssid,</div><div class='del'>-			       priv-&gt;scan_request-&gt;ssids[i].ssid_len);</div><div class='del'>-			n_probes++;</div><div class='del'>-			p++;</div><div class='del'>-		}</div><div class='del'>-		is_active = true;</div><div class='del'>-	} else</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "Kicking off passive scan.\n");</div><div class='del'>-</div><div class='del'>-	/* We don't build a direct scan probe request; the uCode will do</div><div class='del'>-	 * that based on the direct_mask added to each channel entry */</div><div class='del'>-	scan-&gt;tx_cmd.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK;</div><div class='del'>-	scan-&gt;tx_cmd.sta_id = priv-&gt;contexts[IWL_RXON_CTX_BSS].bcast_sta_id;</div><div class='del'>-	scan-&gt;tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;</div><div class='del'>-</div><div class='del'>-	/* flags + rate selection */</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;scan_band) {</div><div class='del'>-	case IEEE80211_BAND_2GHZ:</div><div class='del'>-		scan-&gt;flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK;</div><div class='del'>-		scan-&gt;tx_cmd.rate = IWL_RATE_1M_PLCP;</div><div class='del'>-		band = IEEE80211_BAND_2GHZ;</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_BAND_5GHZ:</div><div class='del'>-		scan-&gt;tx_cmd.rate = IWL_RATE_6M_PLCP;</div><div class='del'>-		band = IEEE80211_BAND_5GHZ;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		IWL_WARN(priv, "Invalid scan band\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If active scaning is requested but a certain channel</div><div class='del'>-	 * is marked passive, we can do active scanning if we</div><div class='del'>-	 * detect transmissions.</div><div class='del'>-	 */</div><div class='del'>-	scan-&gt;good_CRC_th = is_active ? IWL_GOOD_CRC_TH_DEFAULT :</div><div class='del'>-					IWL_GOOD_CRC_TH_DISABLED;</div><div class='del'>-</div><div class='del'>-	len = iwl_legacy_fill_probe_req(priv, (struct ieee80211_mgmt *)scan-&gt;data,</div><div class='del'>-					vif-&gt;addr, priv-&gt;scan_request-&gt;ie,</div><div class='del'>-					priv-&gt;scan_request-&gt;ie_len,</div><div class='del'>-					IWL_MAX_SCAN_SIZE - sizeof(*scan));</div><div class='del'>-	scan-&gt;tx_cmd.len = cpu_to_le16(len);</div><div class='del'>-</div><div class='del'>-	/* select Rx antennas */</div><div class='del'>-	scan-&gt;flags |= iwl3945_get_antenna_flags(priv);</div><div class='del'>-</div><div class='del'>-	scan-&gt;channel_count = iwl3945_get_channels_for_scan(priv, band, is_active, n_probes,</div><div class='del'>-							    (void *)&amp;scan-&gt;data[len], vif);</div><div class='del'>-	if (scan-&gt;channel_count == 0) {</div><div class='del'>-		IWL_DEBUG_SCAN(priv, "channel count %d\n", scan-&gt;channel_count);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd.len += le16_to_cpu(scan-&gt;tx_cmd.len) +</div><div class='del'>-	    scan-&gt;channel_count * sizeof(struct iwl3945_scan_channel);</div><div class='del'>-	cmd.data = scan;</div><div class='del'>-	scan-&gt;len = cpu_to_le16(cmd.len);</div><div class='del'>-</div><div class='del'>-	set_bit(STATUS_SCAN_HW, &amp;priv-&gt;status);</div><div class='del'>-	ret = iwl_legacy_send_cmd_sync(priv, &amp;cmd);</div><div class='del'>-	if (ret)</div><div class='del'>-		clear_bit(STATUS_SCAN_HW, &amp;priv-&gt;status);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl3945_post_scan(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Since setting the RXON may have been deferred while</div><div class='del'>-	 * performing the scan, fire one off if needed</div><div class='del'>-	 */</div><div class='del'>-	if (memcmp(&amp;ctx-&gt;staging, &amp;ctx-&gt;active, sizeof(ctx-&gt;staging)))</div><div class='del'>-		iwl3945_commit_rxon(priv, ctx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_bg_restart(struct work_struct *data)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = container_of(data, struct iwl_priv, restart);</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (test_and_clear_bit(STATUS_FW_ERROR, &amp;priv-&gt;status)) {</div><div class='del'>-		struct iwl_rxon_context *ctx;</div><div class='del'>-		mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-		for_each_context(priv, ctx)</div><div class='del'>-			ctx-&gt;vif = NULL;</div><div class='del'>-		priv-&gt;is_open = 0;</div><div class='del'>-		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-		iwl3945_down(priv);</div><div class='del'>-		ieee80211_restart_hw(priv-&gt;hw);</div><div class='del'>-	} else {</div><div class='del'>-		iwl3945_down(priv);</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-		if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status)) {</div><div class='del'>-			mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		__iwl3945_up(priv);</div><div class='del'>-		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_bg_rx_replenish(struct work_struct *data)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv =</div><div class='del'>-	    container_of(data, struct iwl_priv, rx_replenish);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	iwl3945_rx_replenish(priv);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl3945_post_associate(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int rc = 0;</div><div class='del'>-	struct ieee80211_conf *conf = NULL;</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-</div><div class='del'>-	if (!ctx-&gt;vif || !priv-&gt;is_open)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_ASSOC(priv, "Associated as %d to: %pM\n",</div><div class='del'>-			ctx-&gt;vif-&gt;bss_conf.aid, ctx-&gt;active.bssid_addr);</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_scan_cancel_timeout(priv, 200);</div><div class='del'>-</div><div class='del'>-	conf = iwl_legacy_ieee80211_get_hw_conf(priv-&gt;hw);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;staging.filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='del'>-	iwl3945_commit_rxon(priv, ctx);</div><div class='del'>-</div><div class='del'>-	rc = iwl_legacy_send_rxon_timing(priv, ctx);</div><div class='del'>-	if (rc)</div><div class='del'>-		IWL_WARN(priv, "REPLY_RXON_TIMING failed - "</div><div class='del'>-			    "Attempting to continue.\n");</div><div class='del'>-</div><div class='del'>-	ctx-&gt;staging.filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='del'>-</div><div class='del'>-	ctx-&gt;staging.assoc_id = cpu_to_le16(ctx-&gt;vif-&gt;bss_conf.aid);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_ASSOC(priv, "assoc id %d beacon interval %d\n",</div><div class='del'>-			ctx-&gt;vif-&gt;bss_conf.aid, ctx-&gt;vif-&gt;bss_conf.beacon_int);</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;vif-&gt;bss_conf.use_short_preamble)</div><div class='del'>-		ctx-&gt;staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='del'>-	else</div><div class='del'>-		ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;staging.flags &amp; RXON_FLG_BAND_24G_MSK) {</div><div class='del'>-		if (ctx-&gt;vif-&gt;bss_conf.use_short_slot)</div><div class='del'>-			ctx-&gt;staging.flags |= RXON_FLG_SHORT_SLOT_MSK;</div><div class='del'>-		else</div><div class='del'>-			ctx-&gt;staging.flags &amp;= ~RXON_FLG_SHORT_SLOT_MSK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl3945_commit_rxon(priv, ctx);</div><div class='del'>-</div><div class='del'>-	switch (ctx-&gt;vif-&gt;type) {</div><div class='del'>-	case NL80211_IFTYPE_STATION:</div><div class='del'>-		iwl3945_rate_scale_init(priv-&gt;hw, IWL_AP_ID);</div><div class='del'>-		break;</div><div class='del'>-	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		iwl3945_send_beacon_cmd(priv);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		IWL_ERR(priv, "%s Should not be called in %d mode\n",</div><div class='del'>-			__func__, ctx-&gt;vif-&gt;type);</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'>- * mac80211 entry point functions</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#define UCODE_READY_TIMEOUT	(2 * HZ)</div><div class='del'>-</div><div class='del'>-static int iwl3945_mac_start(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	/* we should be verifying the device is ready to be opened */</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	/* fetch ucode file from disk, alloc and copy to bus-master buffers ...</div><div class='del'>-	 * ucode filename and max sizes are card-specific. */</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;ucode_code.len) {</div><div class='del'>-		ret = iwl3945_read_ucode(priv);</div><div class='del'>-		if (ret) {</div><div class='del'>-			IWL_ERR(priv, "Could not read microcode: %d\n", ret);</div><div class='del'>-			mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-			goto out_release_irq;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = __iwl3945_up(priv);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_release_irq;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Start UP work.\n");</div><div class='del'>-</div><div class='del'>-	/* Wait for START_ALIVE from ucode. Otherwise callbacks from</div><div class='del'>-	 * mac80211 will not be run successfully. */</div><div class='del'>-	ret = wait_event_timeout(priv-&gt;wait_command_queue,</div><div class='del'>-			test_bit(STATUS_READY, &amp;priv-&gt;status),</div><div class='del'>-			UCODE_READY_TIMEOUT);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		if (!test_bit(STATUS_READY, &amp;priv-&gt;status)) {</div><div class='del'>-			IWL_ERR(priv,</div><div class='del'>-				"Wait for START_ALIVE timeout after %dms.\n",</div><div class='del'>-				jiffies_to_msecs(UCODE_READY_TIMEOUT));</div><div class='del'>-			ret = -ETIMEDOUT;</div><div class='del'>-			goto out_release_irq;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* ucode is running and will send rfkill notifications,</div><div class='del'>-	 * no need to poll the killswitch state anymore */</div><div class='del'>-	cancel_delayed_work(&amp;priv-&gt;_3945.rfkill_poll);</div><div class='del'>-</div><div class='del'>-	priv-&gt;is_open = 1;</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_release_irq:</div><div class='del'>-	priv-&gt;is_open = 0;</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave - failed\n");</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_mac_stop(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;is_open) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "leave - skip\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;is_open = 0;</div><div class='del'>-</div><div class='del'>-	iwl3945_down(priv);</div><div class='del'>-</div><div class='del'>-	flush_workqueue(priv-&gt;workqueue);</div><div class='del'>-</div><div class='del'>-	/* start polling the killswitch state again */</div><div class='del'>-	queue_delayed_work(priv-&gt;workqueue, &amp;priv-&gt;_3945.rfkill_poll,</div><div class='del'>-			   round_jiffies_relative(2 * HZ));</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TX(priv, "dev-&gt;xmit(%d bytes) at rate 0x%02x\n", skb-&gt;len,</div><div class='del'>-		     ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))-&gt;bitrate);</div><div class='del'>-</div><div class='del'>-	if (iwl3945_tx_skb(priv, skb))</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl3945_config_ap(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-	struct ieee80211_vif *vif = ctx-&gt;vif;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* The following should be done only at AP bring up */</div><div class='del'>-	if (!(iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS))) {</div><div class='del'>-</div><div class='del'>-		/* RXON - unassoc (to set timing command) */</div><div class='del'>-		ctx-&gt;staging.filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='del'>-		iwl3945_commit_rxon(priv, ctx);</div><div class='del'>-</div><div class='del'>-		/* RXON Timing */</div><div class='del'>-		rc = iwl_legacy_send_rxon_timing(priv, ctx);</div><div class='del'>-		if (rc)</div><div class='del'>-			IWL_WARN(priv, "REPLY_RXON_TIMING failed - "</div><div class='del'>-					"Attempting to continue.\n");</div><div class='del'>-</div><div class='del'>-		ctx-&gt;staging.assoc_id = 0;</div><div class='del'>-</div><div class='del'>-		if (vif-&gt;bss_conf.use_short_preamble)</div><div class='del'>-			ctx-&gt;staging.flags |=</div><div class='del'>-				RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='del'>-		else</div><div class='del'>-			ctx-&gt;staging.flags &amp;=</div><div class='del'>-				~RXON_FLG_SHORT_PREAMBLE_MSK;</div><div class='del'>-</div><div class='del'>-		if (ctx-&gt;staging.flags &amp; RXON_FLG_BAND_24G_MSK) {</div><div class='del'>-			if (vif-&gt;bss_conf.use_short_slot)</div><div class='del'>-				ctx-&gt;staging.flags |=</div><div class='del'>-					RXON_FLG_SHORT_SLOT_MSK;</div><div class='del'>-			else</div><div class='del'>-				ctx-&gt;staging.flags &amp;=</div><div class='del'>-					~RXON_FLG_SHORT_SLOT_MSK;</div><div class='del'>-		}</div><div class='del'>-		/* restore RXON assoc */</div><div class='del'>-		ctx-&gt;staging.filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='del'>-		iwl3945_commit_rxon(priv, ctx);</div><div class='del'>-	}</div><div class='del'>-	iwl3945_send_beacon_cmd(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='del'>-			       struct ieee80211_vif *vif,</div><div class='del'>-			       struct ieee80211_sta *sta,</div><div class='del'>-			       struct ieee80211_key_conf *key)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u8 sta_id = IWL_INVALID_STATION;</div><div class='del'>-	u8 static_key;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	if (iwl3945_mod_params.sw_crypto) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "leave - hwcrypto disabled\n");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * To support IBSS RSN, don't program group keys in IBSS, the</div><div class='del'>-	 * hardware will then not attempt to decrypt the frames.</div><div class='del'>-	 */</div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_ADHOC &amp;&amp;</div><div class='del'>-	    !(key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	static_key = !iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS);</div><div class='del'>-</div><div class='del'>-	if (!static_key) {</div><div class='del'>-		sta_id = iwl_legacy_sta_id_or_broadcast(</div><div class='del'>-				priv, &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS], sta);</div><div class='del'>-		if (sta_id == IWL_INVALID_STATION)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	iwl_legacy_scan_cancel_timeout(priv, 100);</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SET_KEY:</div><div class='del'>-		if (static_key)</div><div class='del'>-			ret = iwl3945_set_static_key(priv, key);</div><div class='del'>-		else</div><div class='del'>-			ret = iwl3945_set_dynamic_key(priv, key, sta_id);</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "enable hwcrypto key\n");</div><div class='del'>-		break;</div><div class='del'>-	case DISABLE_KEY:</div><div class='del'>-		if (static_key)</div><div class='del'>-			ret = iwl3945_remove_static_key(priv);</div><div class='del'>-		else</div><div class='del'>-			ret = iwl3945_clear_sta_key_info(priv, sta_id);</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "disable hwcrypto key\n");</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl3945_mac_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 iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl3945_sta_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='del'>-	int ret;</div><div class='del'>-	bool is_ap = vif-&gt;type == NL80211_IFTYPE_STATION;</div><div class='del'>-	u8 sta_id;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "received request to add station %pM\n",</div><div class='del'>-			sta-&gt;addr);</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "proceeding to add station %pM\n",</div><div class='del'>-			sta-&gt;addr);</div><div class='del'>-	sta_priv-&gt;common.sta_id = IWL_INVALID_STATION;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_add_station_common(priv,</div><div class='del'>-				&amp;priv-&gt;contexts[IWL_RXON_CTX_BSS],</div><div class='del'>-				     sta-&gt;addr, is_ap, sta, &amp;sta_id);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "Unable to add station %pM (%d)\n",</div><div class='del'>-			sta-&gt;addr, ret);</div><div class='del'>-		/* Should we return success if return code is EEXIST ? */</div><div class='del'>-		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sta_priv-&gt;common.sta_id = sta_id;</div><div class='del'>-</div><div class='del'>-	/* Initialize rate scaling */</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Initializing rate scaling for station %pM\n",</div><div class='del'>-		       sta-&gt;addr);</div><div class='del'>-	iwl3945_rs_rate_init(priv, sta, sta_id);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;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 iwl3945_configure_filter(struct ieee80211_hw *hw,</div><div class='del'>-				     unsigned int changed_flags,</div><div class='del'>-				     unsigned int *total_flags,</div><div class='del'>-				     u64 multicast)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	__le32 filter_or = 0, filter_nand = 0;</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-</div><div class='del'>-#define CHK(test, flag)	do { \</div><div class='del'>-	if (*total_flags &amp; (test))		\</div><div class='del'>-		filter_or |= (flag);		\</div><div class='del'>-	else					\</div><div class='del'>-		filter_nand |= (flag);		\</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "Enter: changed: 0x%x, total: 0x%x\n",</div><div class='del'>-			changed_flags, *total_flags);</div><div class='del'>-</div><div class='del'>-	CHK(FIF_OTHER_BSS | FIF_PROMISC_IN_BSS, RXON_FILTER_PROMISC_MSK);</div><div class='del'>-	CHK(FIF_CONTROL, RXON_FILTER_CTL2HOST_MSK);</div><div class='del'>-	CHK(FIF_BCN_PRBRESP_PROMISC, RXON_FILTER_BCON_AWARE_MSK);</div><div class='del'>-</div><div class='del'>-#undef CHK</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	ctx-&gt;staging.filter_flags &amp;= ~filter_nand;</div><div class='del'>-	ctx-&gt;staging.filter_flags |= filter_or;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Not committing directly because hardware can perform a scan,</div><div class='del'>-	 * but even if hw is ready, committing here breaks for some reason,</div><div class='del'>-	 * we'll eventually commit the filter flags change anyway.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Receiving all multicast frames is always enabled by the</div><div class='del'>-	 * default flags setup in iwl_legacy_connection_init_rx_config()</div><div class='del'>-	 * since we currently do not support programming multicast</div><div class='del'>-	 * filters into the device.</div><div class='del'>-	 */</div><div class='del'>-	*total_flags &amp;= FIF_OTHER_BSS | FIF_ALLMULTI | FIF_PROMISC_IN_BSS |</div><div class='del'>-			FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>- *</div><div class='del'>- * sysfs attributes</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The following adds a new attribute to the sysfs representation</div><div class='del'>- * of this device driver (i.e. a new file in /sys/bus/pci/drivers/iwl/)</div><div class='del'>- * used for controlling the debug level.</div><div class='del'>- *</div><div class='del'>- * See the level definitions in iwl for details.</div><div class='del'>- *</div><div class='del'>- * The debug_level being managed using sysfs below is a per device debug</div><div class='del'>- * level that is used instead of the global debug level if it (the per</div><div class='del'>- * device debug level) is set.</div><div class='del'>- */</div><div class='del'>-static ssize_t iwl3945_show_debug_level(struct device *d,</div><div class='del'>-				struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-	return sprintf(buf, "0x%08X\n", iwl_legacy_get_debug_level(priv));</div><div class='del'>-}</div><div class='del'>-static ssize_t iwl3945_store_debug_level(struct device *d,</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 iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-	unsigned long val;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = strict_strtoul(buf, 0, &amp;val);</div><div class='del'>-	if (ret)</div><div class='del'>-		IWL_INFO(priv, "%s is not in hex or decimal form.\n", buf);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;debug_level = val;</div><div class='del'>-		if (iwl_legacy_alloc_traffic_mem(priv))</div><div class='del'>-			IWL_ERR(priv,</div><div class='del'>-				"Not enough memory to generate traffic log\n");</div><div class='del'>-	}</div><div class='del'>-	return strnlen(buf, count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEVICE_ATTR(debug_level, S_IWUSR | S_IRUGO,</div><div class='del'>-			iwl3945_show_debug_level, iwl3945_store_debug_level);</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_IWLWIFI_LEGACY_DEBUG */</div><div class='del'>-</div><div class='del'>-static ssize_t iwl3945_show_temperature(struct device *d,</div><div class='del'>-				struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_alive(priv))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "%d\n", iwl3945_hw_get_temperature(priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEVICE_ATTR(temperature, S_IRUGO, iwl3945_show_temperature, NULL);</div><div class='del'>-</div><div class='del'>-static ssize_t iwl3945_show_tx_power(struct device *d,</div><div class='del'>-			     struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-	return sprintf(buf, "%d\n", priv-&gt;tx_power_user_lmt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl3945_store_tx_power(struct device *d,</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 iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-	char *p = (char *)buf;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	val = simple_strtoul(p, &amp;p, 10);</div><div class='del'>-	if (p == buf)</div><div class='del'>-		IWL_INFO(priv, ": %s is not in decimal form.\n", buf);</div><div class='del'>-	else</div><div class='del'>-		iwl3945_hw_reg_set_txpower(priv, val);</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(tx_power, S_IWUSR | S_IRUGO, iwl3945_show_tx_power, iwl3945_store_tx_power);</div><div class='del'>-</div><div class='del'>-static ssize_t iwl3945_show_flags(struct device *d,</div><div class='del'>-			  struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "0x%04X\n", ctx-&gt;active.flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl3945_store_flags(struct device *d,</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 iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-	u32 flags = simple_strtoul(buf, NULL, 0);</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	if (le32_to_cpu(ctx-&gt;staging.flags) != flags) {</div><div class='del'>-		/* Cancel any currently running scans... */</div><div class='del'>-		if (iwl_legacy_scan_cancel_timeout(priv, 100))</div><div class='del'>-			IWL_WARN(priv, "Could not cancel scan.\n");</div><div class='del'>-		else {</div><div class='del'>-			IWL_DEBUG_INFO(priv, "Committing rxon.flags = 0x%04X\n",</div><div class='del'>-				       flags);</div><div class='del'>-			ctx-&gt;staging.flags = cpu_to_le32(flags);</div><div class='del'>-			iwl3945_commit_rxon(priv, ctx);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</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(flags, S_IWUSR | S_IRUGO, iwl3945_show_flags, iwl3945_store_flags);</div><div class='del'>-</div><div class='del'>-static ssize_t iwl3945_show_filter_flags(struct device *d,</div><div class='del'>-				 struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "0x%04X\n",</div><div class='del'>-		le32_to_cpu(ctx-&gt;active.filter_flags));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl3945_store_filter_flags(struct device *d,</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 iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-	u32 filter_flags = simple_strtoul(buf, NULL, 0);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	if (le32_to_cpu(ctx-&gt;staging.filter_flags) != filter_flags) {</div><div class='del'>-		/* Cancel any currently running scans... */</div><div class='del'>-		if (iwl_legacy_scan_cancel_timeout(priv, 100))</div><div class='del'>-			IWL_WARN(priv, "Could not cancel scan.\n");</div><div class='del'>-		else {</div><div class='del'>-			IWL_DEBUG_INFO(priv, "Committing rxon.filter_flags = "</div><div class='del'>-				       "0x%04X\n", filter_flags);</div><div class='del'>-			ctx-&gt;staging.filter_flags =</div><div class='del'>-				cpu_to_le32(filter_flags);</div><div class='del'>-			iwl3945_commit_rxon(priv, ctx);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</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(filter_flags, S_IWUSR | S_IRUGO, iwl3945_show_filter_flags,</div><div class='del'>-		   iwl3945_store_filter_flags);</div><div class='del'>-</div><div class='del'>-static ssize_t iwl3945_show_measurement(struct device *d,</div><div class='del'>-				struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-	struct iwl_spectrum_notification measure_report;</div><div class='del'>-	u32 size = sizeof(measure_report), len = 0, ofs = 0;</div><div class='del'>-	u8 *data = (u8 *)&amp;measure_report;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	if (!(priv-&gt;measurement_status &amp; MEASUREMENT_READY)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	memcpy(&amp;measure_report, &amp;priv-&gt;measure_report, size);</div><div class='del'>-	priv-&gt;measurement_status = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	while (size &amp;&amp; (PAGE_SIZE - len)) {</div><div class='del'>-		hex_dump_to_buffer(data + ofs, size, 16, 1, buf + len,</div><div class='del'>-				   PAGE_SIZE - len, 1);</div><div class='del'>-		len = strlen(buf);</div><div class='del'>-		if (PAGE_SIZE - len)</div><div class='del'>-			buf[len++] = '\n';</div><div class='del'>-</div><div class='del'>-		ofs += 16;</div><div class='del'>-		size -= min(size, 16U);</div><div class='del'>-	}</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 iwl3945_store_measurement(struct device *d,</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 iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-	struct ieee80211_measurement_params params = {</div><div class='del'>-		.channel = le16_to_cpu(ctx-&gt;active.channel),</div><div class='del'>-		.start_time = cpu_to_le64(priv-&gt;_3945.last_tsf),</div><div class='del'>-		.duration = cpu_to_le16(1),</div><div class='del'>-	};</div><div class='del'>-	u8 type = IWL_MEASURE_BASIC;</div><div class='del'>-	u8 buffer[32];</div><div class='del'>-	u8 channel;</div><div class='del'>-</div><div class='del'>-	if (count) {</div><div class='del'>-		char *p = buffer;</div><div class='del'>-		strncpy(buffer, buf, min(sizeof(buffer), count));</div><div class='del'>-		channel = simple_strtoul(p, NULL, 0);</div><div class='del'>-		if (channel)</div><div class='del'>-			params.channel = channel;</div><div class='del'>-</div><div class='del'>-		p = buffer;</div><div class='del'>-		while (*p &amp;&amp; *p != ' ')</div><div class='del'>-			p++;</div><div class='del'>-		if (*p)</div><div class='del'>-			type = simple_strtoul(p + 1, NULL, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Invoking measurement of type %d on "</div><div class='del'>-		       "channel %d (for '%s')\n", type, params.channel, buf);</div><div class='del'>-	iwl3945_get_measurement(priv, &amp;params, type);</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(measurement, S_IRUSR | S_IWUSR,</div><div class='del'>-		   iwl3945_show_measurement, iwl3945_store_measurement);</div><div class='del'>-</div><div class='del'>-static ssize_t iwl3945_store_retry_rate(struct device *d,</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 iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-</div><div class='del'>-	priv-&gt;retry_rate = simple_strtoul(buf, NULL, 0);</div><div class='del'>-	if (priv-&gt;retry_rate &lt;= 0)</div><div class='del'>-		priv-&gt;retry_rate = 1;</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 iwl3945_show_retry_rate(struct device *d,</div><div class='del'>-			       struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-	return sprintf(buf, "%d", priv-&gt;retry_rate);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEVICE_ATTR(retry_rate, S_IWUSR | S_IRUSR, iwl3945_show_retry_rate,</div><div class='del'>-		   iwl3945_store_retry_rate);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static ssize_t iwl3945_show_channels(struct device *d,</div><div class='del'>-			     struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	/* all this shit doesn't belong into sysfs anyway */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEVICE_ATTR(channels, S_IRUSR, iwl3945_show_channels, NULL);</div><div class='del'>-</div><div class='del'>-static ssize_t iwl3945_show_antenna(struct device *d,</div><div class='del'>-			    struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_alive(priv))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "%d\n", iwl3945_mod_params.antenna);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl3945_store_antenna(struct device *d,</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 iwl_priv *priv __maybe_unused = dev_get_drvdata(d);</div><div class='del'>-	int ant;</div><div class='del'>-</div><div class='del'>-	if (count == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (sscanf(buf, "%1i", &amp;ant) != 1) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "not in hex or decimal form.\n");</div><div class='del'>-		return count;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((ant &gt;= 0) &amp;&amp; (ant &lt;= 2)) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Setting antenna select to %d.\n", ant);</div><div class='del'>-		iwl3945_mod_params.antenna = (enum iwl3945_antenna)ant;</div><div class='del'>-	} else</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Bad antenna select value %d.\n", ant);</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 DEVICE_ATTR(antenna, S_IWUSR | S_IRUGO, iwl3945_show_antenna, iwl3945_store_antenna);</div><div class='del'>-</div><div class='del'>-static ssize_t iwl3945_show_status(struct device *d,</div><div class='del'>-			   struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-	if (!iwl_legacy_is_alive(priv))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	return sprintf(buf, "0x%08x\n", (int)priv-&gt;status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEVICE_ATTR(status, S_IRUGO, iwl3945_show_status, NULL);</div><div class='del'>-</div><div class='del'>-static ssize_t iwl3945_dump_error_log(struct device *d,</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 iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-	char *p = (char *)buf;</div><div class='del'>-</div><div class='del'>-	if (p[0] == '1')</div><div class='del'>-		iwl3945_dump_nic_error_log(priv);</div><div class='del'>-</div><div class='del'>-	return strnlen(buf, count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEVICE_ATTR(dump_errors, S_IWUSR, NULL, iwl3945_dump_error_log);</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>- *</div><div class='del'>- * driver setup and tear down</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-static void iwl3945_setup_deferred_work(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	priv-&gt;workqueue = create_singlethread_workqueue(DRV_NAME);</div><div class='del'>-</div><div class='del'>-	init_waitqueue_head(&amp;priv-&gt;wait_command_queue);</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;restart, iwl3945_bg_restart);</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;rx_replenish, iwl3945_bg_rx_replenish);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;priv-&gt;init_alive_start, iwl3945_bg_init_alive_start);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;priv-&gt;alive_start, iwl3945_bg_alive_start);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;priv-&gt;_3945.rfkill_poll, iwl3945_rfkill_poll);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_setup_scan_deferred_work(priv);</div><div class='del'>-</div><div class='del'>-	iwl3945_hw_setup_deferred_work(priv);</div><div class='del'>-</div><div class='del'>-	init_timer(&amp;priv-&gt;watchdog);</div><div class='del'>-	priv-&gt;watchdog.data = (unsigned long)priv;</div><div class='del'>-	priv-&gt;watchdog.function = iwl_legacy_bg_watchdog;</div><div class='del'>-</div><div class='del'>-	tasklet_init(&amp;priv-&gt;irq_tasklet, (void (*)(unsigned long))</div><div class='del'>-		     iwl3945_irq_tasklet, (unsigned long)priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl3945_cancel_deferred_work(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	iwl3945_hw_cancel_deferred_work(priv);</div><div class='del'>-</div><div class='del'>-	cancel_delayed_work_sync(&amp;priv-&gt;init_alive_start);</div><div class='del'>-	cancel_delayed_work(&amp;priv-&gt;alive_start);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_cancel_scan_deferred_work(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct attribute *iwl3945_sysfs_entries[] = {</div><div class='del'>-	&amp;dev_attr_antenna.attr,</div><div class='del'>-	&amp;dev_attr_channels.attr,</div><div class='del'>-	&amp;dev_attr_dump_errors.attr,</div><div class='del'>-	&amp;dev_attr_flags.attr,</div><div class='del'>-	&amp;dev_attr_filter_flags.attr,</div><div class='del'>-	&amp;dev_attr_measurement.attr,</div><div class='del'>-	&amp;dev_attr_retry_rate.attr,</div><div class='del'>-	&amp;dev_attr_status.attr,</div><div class='del'>-	&amp;dev_attr_temperature.attr,</div><div class='del'>-	&amp;dev_attr_tx_power.attr,</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	&amp;dev_attr_debug_level.attr,</div><div class='del'>-#endif</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct attribute_group iwl3945_attribute_group = {</div><div class='del'>-	.name = NULL,		/* put in device directory */</div><div class='del'>-	.attrs = iwl3945_sysfs_entries,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ieee80211_ops iwl3945_hw_ops = {</div><div class='del'>-	.tx = iwl3945_mac_tx,</div><div class='del'>-	.start = iwl3945_mac_start,</div><div class='del'>-	.stop = iwl3945_mac_stop,</div><div class='del'>-	.add_interface = iwl_legacy_mac_add_interface,</div><div class='del'>-	.remove_interface = iwl_legacy_mac_remove_interface,</div><div class='del'>-	.change_interface = iwl_legacy_mac_change_interface,</div><div class='del'>-	.config = iwl_legacy_mac_config,</div><div class='del'>-	.configure_filter = iwl3945_configure_filter,</div><div class='del'>-	.set_key = iwl3945_mac_set_key,</div><div class='del'>-	.conf_tx = iwl_legacy_mac_conf_tx,</div><div class='del'>-	.reset_tsf = iwl_legacy_mac_reset_tsf,</div><div class='del'>-	.bss_info_changed = iwl_legacy_mac_bss_info_changed,</div><div class='del'>-	.hw_scan = iwl_legacy_mac_hw_scan,</div><div class='del'>-	.sta_add = iwl3945_mac_sta_add,</div><div class='del'>-	.sta_remove = iwl_legacy_mac_sta_remove,</div><div class='del'>-	.tx_last_beacon = iwl_legacy_mac_tx_last_beacon,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int iwl3945_init_drv(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv-&gt;eeprom;</div><div class='del'>-</div><div class='del'>-	priv-&gt;retry_rate = 1;</div><div class='del'>-	priv-&gt;beacon_skb = NULL;</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;sta_lock);</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;hcmd_lock);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;priv-&gt;free_frames);</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	priv-&gt;ieee_channels = NULL;</div><div class='del'>-	priv-&gt;ieee_rates = NULL;</div><div class='del'>-	priv-&gt;band = IEEE80211_BAND_2GHZ;</div><div class='del'>-</div><div class='del'>-	priv-&gt;iw_mode = NL80211_IFTYPE_STATION;</div><div class='del'>-	priv-&gt;missed_beacon_threshold = IWL_MISSED_BEACON_THRESHOLD_DEF;</div><div class='del'>-</div><div class='del'>-	/* initialize force reset */</div><div class='del'>-	priv-&gt;force_reset.reset_duration = IWL_DELAY_NEXT_FORCE_FW_RELOAD;</div><div class='del'>-</div><div class='del'>-	if (eeprom-&gt;version &lt; EEPROM_3945_EEPROM_VERSION) {</div><div class='del'>-		IWL_WARN(priv, "Unsupported EEPROM version: 0x%04X\n",</div><div class='del'>-			 eeprom-&gt;version);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-	ret = iwl_legacy_init_channel_map(priv);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "initializing regulatory failed: %d\n", ret);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set up txpower settings in driver for all channels */</div><div class='del'>-	if (iwl3945_txpower_set_from_eeprom(priv)) {</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto err_free_channel_map;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_init_geos(priv);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "initializing geos failed: %d\n", ret);</div><div class='del'>-		goto err_free_channel_map;</div><div class='del'>-	}</div><div class='del'>-	iwl3945_init_hw_rates(priv, priv-&gt;ieee_rates);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_free_channel_map:</div><div class='del'>-	iwl_legacy_free_channel_map(priv);</div><div class='del'>-err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define IWL3945_MAX_PROBE_REQUEST	200</div><div class='del'>-</div><div class='del'>-static int iwl3945_setup_mac(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct ieee80211_hw *hw = priv-&gt;hw;</div><div class='del'>-</div><div class='del'>-	hw-&gt;rate_control_algorithm = "iwl-3945-rs";</div><div class='del'>-	hw-&gt;sta_data_size = sizeof(struct iwl3945_sta_priv);</div><div class='del'>-	hw-&gt;vif_data_size = sizeof(struct iwl_vif_priv);</div><div class='del'>-</div><div class='del'>-	/* Tell mac80211 our characteristics */</div><div class='del'>-	hw-&gt;flags = IEEE80211_HW_SIGNAL_DBM |</div><div class='del'>-		    IEEE80211_HW_SPECTRUM_MGMT;</div><div class='del'>-</div><div class='del'>-	hw-&gt;wiphy-&gt;interface_modes =</div><div class='del'>-		priv-&gt;contexts[IWL_RXON_CTX_BSS].interface_modes;</div><div class='del'>-</div><div class='del'>-	hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_CUSTOM_REGULATORY |</div><div class='del'>-			    WIPHY_FLAG_DISABLE_BEACON_HINTS |</div><div class='del'>-			    WIPHY_FLAG_IBSS_RSN;</div><div class='del'>-</div><div class='del'>-	hw-&gt;wiphy-&gt;max_scan_ssids = PROBE_OPTION_MAX_3945;</div><div class='del'>-	/* we create the 802.11 header and a zero-length SSID element */</div><div class='del'>-	hw-&gt;wiphy-&gt;max_scan_ie_len = IWL3945_MAX_PROBE_REQUEST - 24 - 2;</div><div class='del'>-</div><div class='del'>-	/* Default value; 4 EDCA QOS priorities */</div><div class='del'>-	hw-&gt;queues = 4;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;bands[IEEE80211_BAND_2GHZ].n_channels)</div><div class='del'>-		priv-&gt;hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] =</div><div class='del'>-			&amp;priv-&gt;bands[IEEE80211_BAND_2GHZ];</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;bands[IEEE80211_BAND_5GHZ].n_channels)</div><div class='del'>-		priv-&gt;hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_5GHZ] =</div><div class='del'>-			&amp;priv-&gt;bands[IEEE80211_BAND_5GHZ];</div><div class='del'>-</div><div class='del'>-	iwl_legacy_leds_init(priv);</div><div class='del'>-</div><div class='del'>-	ret = ieee80211_register_hw(priv-&gt;hw);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "Failed to register hw (error %d)\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	priv-&gt;mac80211_registered = 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 iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='del'>-{</div><div class='del'>-	int err = 0, i;</div><div class='del'>-	struct iwl_priv *priv;</div><div class='del'>-	struct ieee80211_hw *hw;</div><div class='del'>-	struct iwl_cfg *cfg = (struct iwl_cfg *)(ent-&gt;driver_data);</div><div class='del'>-	struct iwl3945_eeprom *eeprom;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/***********************</div><div class='del'>-	 * 1. Allocating HW data</div><div class='del'>-	 * ********************/</div><div class='del'>-</div><div class='del'>-	/* mac80211 allocates memory for this device instance, including</div><div class='del'>-	 *   space for this driver's private structure */</div><div class='del'>-	hw = iwl_legacy_alloc_all(cfg);</div><div class='del'>-	if (hw == NULL) {</div><div class='del'>-		pr_err("Can not allocate network device\n");</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	priv = hw-&gt;priv;</div><div class='del'>-	SET_IEEE80211_DEV(hw, &amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	priv-&gt;cmd_queue = IWL39_CMD_QUEUE_NUM;</div><div class='del'>-</div><div class='del'>-	/* 3945 has only one valid context */</div><div class='del'>-	priv-&gt;valid_contexts = BIT(IWL_RXON_CTX_BSS);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_IWL_RXON_CTX; i++)</div><div class='del'>-		priv-&gt;contexts[i].ctxid = i;</div><div class='del'>-</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].rxon_cmd = REPLY_RXON;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].rxon_timing_cmd = REPLY_RXON_TIMING;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].rxon_assoc_cmd = REPLY_RXON_ASSOC;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].qos_cmd = REPLY_QOS_PARAM;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].ap_sta_id = IWL_AP_ID;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].wep_key_cmd = REPLY_WEPKEY;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].interface_modes =</div><div class='del'>-		BIT(NL80211_IFTYPE_STATION) |</div><div class='del'>-		BIT(NL80211_IFTYPE_ADHOC);</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].ibss_devtype = RXON_DEV_TYPE_IBSS;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].station_devtype = RXON_DEV_TYPE_ESS;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].unused_devtype = RXON_DEV_TYPE_ESS;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Disabling hardware scan means that mac80211 will perform scans</div><div class='del'>-	 * "the hard way", rather than using device's scan.</div><div class='del'>-	 */</div><div class='del'>-	if (iwl3945_mod_params.disable_hw_scan) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");</div><div class='del'>-		iwl3945_hw_ops.hw_scan = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");</div><div class='del'>-	priv-&gt;cfg = cfg;</div><div class='del'>-	priv-&gt;pci_dev = pdev;</div><div class='del'>-	priv-&gt;inta_mask = CSR_INI_SET_MASK;</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_alloc_traffic_mem(priv))</div><div class='del'>-		IWL_ERR(priv, "Not enough memory to generate traffic log\n");</div><div class='del'>-</div><div class='del'>-	/***************************</div><div class='del'>-	 * 2. Initializing PCI bus</div><div class='del'>-	 * *************************/</div><div class='del'>-	pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |</div><div class='del'>-				PCIE_LINK_STATE_CLKPM);</div><div class='del'>-</div><div class='del'>-	if (pci_enable_device(pdev)) {</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto out_ieee80211_free_hw;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_set_master(pdev);</div><div class='del'>-</div><div class='del'>-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='del'>-	if (!err)</div><div class='del'>-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='del'>-	if (err) {</div><div class='del'>-		IWL_WARN(priv, "No suitable DMA available.\n");</div><div class='del'>-		goto out_pci_disable_device;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_set_drvdata(pdev, priv);</div><div class='del'>-	err = pci_request_regions(pdev, DRV_NAME);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_pci_disable_device;</div><div class='del'>-</div><div class='del'>-	/***********************</div><div class='del'>-	 * 3. Read REV Register</div><div class='del'>-	 * ********************/</div><div class='del'>-	priv-&gt;hw_base = pci_iomap(pdev, 0, 0);</div><div class='del'>-	if (!priv-&gt;hw_base) {</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto out_pci_release_regions;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "pci_resource_len = 0x%08llx\n",</div><div class='del'>-			(unsigned long long) pci_resource_len(pdev, 0));</div><div class='del'>-	IWL_DEBUG_INFO(priv, "pci_resource_base = %p\n", priv-&gt;hw_base);</div><div class='del'>-</div><div class='del'>-	/* We disable the RETRY_TIMEOUT register (0x41) to keep</div><div class='del'>-	 * PCI Tx retries from interfering with C3 CPU state */</div><div class='del'>-	pci_write_config_byte(pdev, 0x41, 0x00);</div><div class='del'>-</div><div class='del'>-	/* these spin locks will be used in apm_ops.init and EEPROM access</div><div class='del'>-	 * we should init now</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;reg_lock);</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * stop and reset the on-board processor just in case it is in a</div><div class='del'>-	 * strange state ... like being left stranded by a primary kernel</div><div class='del'>-	 * and this is now the kdump kernel trying to start up</div><div class='del'>-	 */</div><div class='del'>-	iwl_write32(priv, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);</div><div class='del'>-</div><div class='del'>-	/***********************</div><div class='del'>-	 * 4. Read EEPROM</div><div class='del'>-	 * ********************/</div><div class='del'>-</div><div class='del'>-	/* Read the EEPROM */</div><div class='del'>-	err = iwl_legacy_eeprom_init(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		IWL_ERR(priv, "Unable to init EEPROM\n");</div><div class='del'>-		goto out_iounmap;</div><div class='del'>-	}</div><div class='del'>-	/* MAC Address location in EEPROM same for 3945/4965 */</div><div class='del'>-	eeprom = (struct iwl3945_eeprom *)priv-&gt;eeprom;</div><div class='del'>-	IWL_DEBUG_INFO(priv, "MAC address: %pM\n", eeprom-&gt;mac_address);</div><div class='del'>-	SET_IEEE80211_PERM_ADDR(priv-&gt;hw, eeprom-&gt;mac_address);</div><div class='del'>-</div><div class='del'>-	/***********************</div><div class='del'>-	 * 5. Setup HW Constants</div><div class='del'>-	 * ********************/</div><div class='del'>-	/* Device-specific setup */</div><div class='del'>-	if (iwl3945_hw_set_hw_params(priv)) {</div><div class='del'>-		IWL_ERR(priv, "failed to set hw settings\n");</div><div class='del'>-		goto out_eeprom_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/***********************</div><div class='del'>-	 * 6. Setup priv</div><div class='del'>-	 * ********************/</div><div class='del'>-</div><div class='del'>-	err = iwl3945_init_drv(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		IWL_ERR(priv, "initializing driver failed\n");</div><div class='del'>-		goto out_unset_hw_params;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_INFO(priv, "Detected Intel Wireless WiFi Link %s\n",</div><div class='del'>-		priv-&gt;cfg-&gt;name);</div><div class='del'>-</div><div class='del'>-	/***********************</div><div class='del'>-	 * 7. Setup Services</div><div class='del'>-	 * ********************/</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	iwl_legacy_disable_interrupts(priv);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	pci_enable_msi(priv-&gt;pci_dev);</div><div class='del'>-</div><div class='del'>-	err = request_irq(priv-&gt;pci_dev-&gt;irq, iwl_legacy_isr,</div><div class='del'>-			  IRQF_SHARED, DRV_NAME, priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		IWL_ERR(priv, "Error allocating IRQ %d\n", priv-&gt;pci_dev-&gt;irq);</div><div class='del'>-		goto out_disable_msi;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = sysfs_create_group(&amp;pdev-&gt;dev.kobj, &amp;iwl3945_attribute_group);</div><div class='del'>-	if (err) {</div><div class='del'>-		IWL_ERR(priv, "failed to create sysfs device attributes\n");</div><div class='del'>-		goto out_release_irq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_legacy_set_rxon_channel(priv,</div><div class='del'>-			     &amp;priv-&gt;bands[IEEE80211_BAND_2GHZ].channels[5],</div><div class='del'>-			     &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS]);</div><div class='del'>-	iwl3945_setup_deferred_work(priv);</div><div class='del'>-	iwl3945_setup_rx_handlers(priv);</div><div class='del'>-	iwl_legacy_power_initialize(priv);</div><div class='del'>-</div><div class='del'>-	/*********************************</div><div class='del'>-	 * 8. Setup and Register mac80211</div><div class='del'>-	 * *******************************/</div><div class='del'>-</div><div class='del'>-	iwl_legacy_enable_interrupts(priv);</div><div class='del'>-</div><div class='del'>-	err = iwl3945_setup_mac(priv);</div><div class='del'>-	if (err)</div><div class='del'>-		goto  out_remove_sysfs;</div><div class='del'>-</div><div class='del'>-	err = iwl_legacy_dbgfs_register(priv, DRV_NAME);</div><div class='del'>-	if (err)</div><div class='del'>-		IWL_ERR(priv, "failed to create debugfs files. Ignoring error: %d\n", err);</div><div class='del'>-</div><div class='del'>-	/* Start monitoring the killswitch */</div><div class='del'>-	queue_delayed_work(priv-&gt;workqueue, &amp;priv-&gt;_3945.rfkill_poll,</div><div class='del'>-			   2 * HZ);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- out_remove_sysfs:</div><div class='del'>-	destroy_workqueue(priv-&gt;workqueue);</div><div class='del'>-	priv-&gt;workqueue = NULL;</div><div class='del'>-	sysfs_remove_group(&amp;pdev-&gt;dev.kobj, &amp;iwl3945_attribute_group);</div><div class='del'>- out_release_irq:</div><div class='del'>-	free_irq(priv-&gt;pci_dev-&gt;irq, priv);</div><div class='del'>- out_disable_msi:</div><div class='del'>-	pci_disable_msi(priv-&gt;pci_dev);</div><div class='del'>-	iwl_legacy_free_geos(priv);</div><div class='del'>-	iwl_legacy_free_channel_map(priv);</div><div class='del'>- out_unset_hw_params:</div><div class='del'>-	iwl3945_unset_hw_params(priv);</div><div class='del'>- out_eeprom_free:</div><div class='del'>-	iwl_legacy_eeprom_free(priv);</div><div class='del'>- out_iounmap:</div><div class='del'>-	pci_iounmap(pdev, priv-&gt;hw_base);</div><div class='del'>- out_pci_release_regions:</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>- out_pci_disable_device:</div><div class='del'>-	pci_set_drvdata(pdev, NULL);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>- out_ieee80211_free_hw:</div><div class='del'>-	iwl_legacy_free_traffic_mem(priv);</div><div class='del'>-	ieee80211_free_hw(priv-&gt;hw);</div><div class='del'>- out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = pci_get_drvdata(pdev);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (!priv)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "*** UNLOAD DRIVER ***\n");</div><div class='del'>-</div><div class='del'>-	iwl_legacy_dbgfs_unregister(priv);</div><div class='del'>-</div><div class='del'>-	set_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_leds_exit(priv);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;mac80211_registered) {</div><div class='del'>-		ieee80211_unregister_hw(priv-&gt;hw);</div><div class='del'>-		priv-&gt;mac80211_registered = 0;</div><div class='del'>-	} else {</div><div class='del'>-		iwl3945_down(priv);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure device is reset to low power before unloading driver.</div><div class='del'>-	 * This may be redundant with iwl_down(), but there are paths to</div><div class='del'>-	 * run iwl_down() without calling apm_ops.stop(), and there are</div><div class='del'>-	 * paths to avoid running iwl_down() at all before leaving driver.</div><div class='del'>-	 * This (inexpensive) call *makes sure* device is reset.</div><div class='del'>-	 */</div><div class='del'>-	iwl_legacy_apm_stop(priv);</div><div class='del'>-</div><div class='del'>-	/* make sure we flush any pending irq or</div><div class='del'>-	 * tasklet for the driver</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	iwl_legacy_disable_interrupts(priv);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	iwl3945_synchronize_irq(priv);</div><div class='del'>-</div><div class='del'>-	sysfs_remove_group(&amp;pdev-&gt;dev.kobj, &amp;iwl3945_attribute_group);</div><div class='del'>-</div><div class='del'>-	cancel_delayed_work_sync(&amp;priv-&gt;_3945.rfkill_poll);</div><div class='del'>-</div><div class='del'>-	iwl3945_dealloc_ucode_pci(priv);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;rxq.bd)</div><div class='del'>-		iwl3945_rx_queue_free(priv, &amp;priv-&gt;rxq);</div><div class='del'>-	iwl3945_hw_txq_ctx_free(priv);</div><div class='del'>-</div><div class='del'>-	iwl3945_unset_hw_params(priv);</div><div class='del'>-</div><div class='del'>-	/*netif_stop_queue(dev); */</div><div class='del'>-	flush_workqueue(priv-&gt;workqueue);</div><div class='del'>-</div><div class='del'>-	/* ieee80211_unregister_hw calls iwl3945_mac_stop, which flushes</div><div class='del'>-	 * priv-&gt;workqueue... so we can't take down the workqueue</div><div class='del'>-	 * until now... */</div><div class='del'>-	destroy_workqueue(priv-&gt;workqueue);</div><div class='del'>-	priv-&gt;workqueue = NULL;</div><div class='del'>-	iwl_legacy_free_traffic_mem(priv);</div><div class='del'>-</div><div class='del'>-	free_irq(pdev-&gt;irq, priv);</div><div class='del'>-	pci_disable_msi(pdev);</div><div class='del'>-</div><div class='del'>-	pci_iounmap(pdev, priv-&gt;hw_base);</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-	pci_set_drvdata(pdev, NULL);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_free_channel_map(priv);</div><div class='del'>-	iwl_legacy_free_geos(priv);</div><div class='del'>-	kfree(priv-&gt;scan_cmd);</div><div class='del'>-	if (priv-&gt;beacon_skb)</div><div class='del'>-		dev_kfree_skb(priv-&gt;beacon_skb);</div><div class='del'>-</div><div class='del'>-	ieee80211_free_hw(priv-&gt;hw);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>- *</div><div class='del'>- * driver and module entry point</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-static struct pci_driver iwl3945_driver = {</div><div class='del'>-	.name = DRV_NAME,</div><div class='del'>-	.id_table = iwl3945_hw_card_ids,</div><div class='del'>-	.probe = iwl3945_pci_probe,</div><div class='del'>-	.remove = __devexit_p(iwl3945_pci_remove),</div><div class='del'>-	.driver.pm = IWL_LEGACY_PM_OPS,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init iwl3945_init(void)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	int ret;</div><div class='del'>-	pr_info(DRV_DESCRIPTION ", " DRV_VERSION "\n");</div><div class='del'>-	pr_info(DRV_COPYRIGHT "\n");</div><div class='del'>-</div><div class='del'>-	ret = iwl3945_rate_control_register();</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("Unable to register rate control algorithm: %d\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = pci_register_driver(&amp;iwl3945_driver);</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("Unable to initialize PCI module\n");</div><div class='del'>-		goto error_register;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='del'>-error_register:</div><div class='del'>-	iwl3945_rate_control_unregister();</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit iwl3945_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;iwl3945_driver);</div><div class='del'>-	iwl3945_rate_control_unregister();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-MODULE_FIRMWARE(IWL3945_MODULE_FIRMWARE(IWL3945_UCODE_API_MAX));</div><div class='del'>-</div><div class='del'>-module_param_named(antenna, iwl3945_mod_params.antenna, int, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])");</div><div class='del'>-module_param_named(swcrypto, iwl3945_mod_params.sw_crypto, int, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(swcrypto,</div><div class='del'>-		"using software crypto (default 1 [software])");</div><div class='del'>-module_param_named(disable_hw_scan, iwl3945_mod_params.disable_hw_scan,</div><div class='del'>-		int, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 1)");</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-module_param_named(debug, iwlegacy_debug_level, uint, S_IRUGO | S_IWUSR);</div><div class='del'>-MODULE_PARM_DESC(debug, "debug output mask");</div><div class='del'>-#endif</div><div class='del'>-module_param_named(fw_restart, iwl3945_mod_params.restart_fw, int, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(fw_restart, "restart firmware in case of error");</div><div class='del'>-</div><div class='del'>-module_exit(iwl3945_exit);</div><div class='del'>-module_init(iwl3945_init);</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl4965-base.c b/drivers/net/wireless/iwlegacy/iwl4965-base.c<br/>deleted file mode 100644<br/>index d2fba9eae153..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl4965-base.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl4965-base.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3281 +0,0 @@</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Portions of this file are derived from the ipw3945 project, as well</div><div class='del'>- * as portions of the ieee80211 subsystem header files.</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 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='del'>- *</div><div class='del'>- * Contact Information:</div><div class='del'>- *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='del'>- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='del'>-</div><div class='del'>-#include &lt;linux/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/pci.h&gt;</div><div class='del'>-#include &lt;linux/pci-aspm.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/mac80211.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/div64.h&gt;</div><div class='del'>-</div><div class='del'>-#define DRV_NAME        "iwl4965"</div><div class='del'>-</div><div class='del'>-#include "iwl-eeprom.h"</div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-io.h"</div><div class='del'>-#include "iwl-helpers.h"</div><div class='del'>-#include "iwl-sta.h"</div><div class='del'>-#include "iwl-4965-calib.h"</div><div class='del'>-#include "iwl-4965.h"</div><div class='del'>-#include "iwl-4965-led.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * module boiler plate</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * module name, copyright, version, etc.</div><div class='del'>- */</div><div class='del'>-#define DRV_DESCRIPTION	"Intel(R) Wireless WiFi 4965 driver for Linux"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-#define VD "d"</div><div class='del'>-#else</div><div class='del'>-#define VD</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define DRV_VERSION     IWLWIFI_VERSION VD</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION(DRV_DESCRIPTION);</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='del'>-MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS("iwl4965");</div><div class='del'>-</div><div class='del'>-void iwl4965_update_chain_flags(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain) {</div><div class='del'>-		for_each_context(priv, ctx) {</div><div class='del'>-			priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain(priv, ctx);</div><div class='del'>-			if (ctx-&gt;active.rx_chain != ctx-&gt;staging.rx_chain)</div><div class='del'>-				iwl_legacy_commit_rxon(priv, ctx);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_clear_free_frames(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct list_head *element;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "%d frames on pre-allocated heap on clear.\n",</div><div class='del'>-		       priv-&gt;frames_count);</div><div class='del'>-</div><div class='del'>-	while (!list_empty(&amp;priv-&gt;free_frames)) {</div><div class='del'>-		element = priv-&gt;free_frames.next;</div><div class='del'>-		list_del(element);</div><div class='del'>-		kfree(list_entry(element, struct iwl_frame, list));</div><div class='del'>-		priv-&gt;frames_count--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;frames_count) {</div><div class='del'>-		IWL_WARN(priv, "%d frames still in use.  Did we lose one?\n",</div><div class='del'>-			    priv-&gt;frames_count);</div><div class='del'>-		priv-&gt;frames_count = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct iwl_frame *iwl4965_get_free_frame(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_frame *frame;</div><div class='del'>-	struct list_head *element;</div><div class='del'>-	if (list_empty(&amp;priv-&gt;free_frames)) {</div><div class='del'>-		frame = kzalloc(sizeof(*frame), GFP_KERNEL);</div><div class='del'>-		if (!frame) {</div><div class='del'>-			IWL_ERR(priv, "Could not allocate frame!\n");</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		priv-&gt;frames_count++;</div><div class='del'>-		return frame;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	element = priv-&gt;free_frames.next;</div><div class='del'>-	list_del(element);</div><div class='del'>-	return list_entry(element, struct iwl_frame, list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_free_frame(struct iwl_priv *priv, struct iwl_frame *frame)</div><div class='del'>-{</div><div class='del'>-	memset(frame, 0, sizeof(*frame));</div><div class='del'>-	list_add(&amp;frame-&gt;list, &amp;priv-&gt;free_frames);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 iwl4965_fill_beacon_frame(struct iwl_priv *priv,</div><div class='del'>-				 struct ieee80211_hdr *hdr,</div><div class='del'>-				 int left)</div><div class='del'>-{</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;beacon_skb)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;beacon_skb-&gt;len &gt; left)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	memcpy(hdr, priv-&gt;beacon_skb-&gt;data, priv-&gt;beacon_skb-&gt;len);</div><div class='del'>-</div><div class='del'>-	return priv-&gt;beacon_skb-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Parse the beacon frame to find the TIM element and set tim_idx &amp; tim_size */</div><div class='del'>-static void iwl4965_set_beacon_tim(struct iwl_priv *priv,</div><div class='del'>-			       struct iwl_tx_beacon_cmd *tx_beacon_cmd,</div><div class='del'>-			       u8 *beacon, u32 frame_size)</div><div class='del'>-{</div><div class='del'>-	u16 tim_idx;</div><div class='del'>-	struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)beacon;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The index is relative to frame start but we start looking at the</div><div class='del'>-	 * variable-length part of the beacon.</div><div class='del'>-	 */</div><div class='del'>-	tim_idx = mgmt-&gt;u.beacon.variable - beacon;</div><div class='del'>-</div><div class='del'>-	/* Parse variable-length elements of beacon to find WLAN_EID_TIM */</div><div class='del'>-	while ((tim_idx &lt; (frame_size - 2)) &amp;&amp;</div><div class='del'>-			(beacon[tim_idx] != WLAN_EID_TIM))</div><div class='del'>-		tim_idx += beacon[tim_idx+1] + 2;</div><div class='del'>-</div><div class='del'>-	/* If TIM field was found, set variables */</div><div class='del'>-	if ((tim_idx &lt; (frame_size - 1)) &amp;&amp; (beacon[tim_idx] == WLAN_EID_TIM)) {</div><div class='del'>-		tx_beacon_cmd-&gt;tim_idx = cpu_to_le16(tim_idx);</div><div class='del'>-		tx_beacon_cmd-&gt;tim_size = beacon[tim_idx+1];</div><div class='del'>-	} else</div><div class='del'>-		IWL_WARN(priv, "Unable to find TIM Element in beacon\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,</div><div class='del'>-				       struct iwl_frame *frame)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tx_beacon_cmd *tx_beacon_cmd;</div><div class='del'>-	u32 frame_size;</div><div class='del'>-	u32 rate_flags;</div><div class='del'>-	u32 rate;</div><div class='del'>-	/*</div><div class='del'>-	 * We have to set up the TX command, the TX Beacon command, and the</div><div class='del'>-	 * beacon contents.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;beacon_ctx) {</div><div class='del'>-		IWL_ERR(priv, "trying to build beacon w/o beacon context!\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Initialize memory */</div><div class='del'>-	tx_beacon_cmd = &amp;frame-&gt;u.beacon;</div><div class='del'>-	memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd));</div><div class='del'>-</div><div class='del'>-	/* Set up TX beacon contents */</div><div class='del'>-	frame_size = iwl4965_fill_beacon_frame(priv, tx_beacon_cmd-&gt;frame,</div><div class='del'>-				sizeof(frame-&gt;u) - sizeof(*tx_beacon_cmd));</div><div class='del'>-	if (WARN_ON_ONCE(frame_size &gt; MAX_MPDU_SIZE))</div><div class='del'>-		return 0;</div><div class='del'>-	if (!frame_size)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Set up TX command fields */</div><div class='del'>-	tx_beacon_cmd-&gt;tx.len = cpu_to_le16((u16)frame_size);</div><div class='del'>-	tx_beacon_cmd-&gt;tx.sta_id = priv-&gt;beacon_ctx-&gt;bcast_sta_id;</div><div class='del'>-	tx_beacon_cmd-&gt;tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;</div><div class='del'>-	tx_beacon_cmd-&gt;tx.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK |</div><div class='del'>-		TX_CMD_FLG_TSF_MSK | TX_CMD_FLG_STA_RATE_MSK;</div><div class='del'>-</div><div class='del'>-	/* Set up TX beacon command fields */</div><div class='del'>-	iwl4965_set_beacon_tim(priv, tx_beacon_cmd, (u8 *)tx_beacon_cmd-&gt;frame,</div><div class='del'>-			   frame_size);</div><div class='del'>-</div><div class='del'>-	/* Set up packet rate and flags */</div><div class='del'>-	rate = iwl_legacy_get_lowest_plcp(priv, priv-&gt;beacon_ctx);</div><div class='del'>-	priv-&gt;mgmt_tx_ant = iwl4965_toggle_tx_ant(priv, priv-&gt;mgmt_tx_ant,</div><div class='del'>-					      priv-&gt;hw_params.valid_tx_ant);</div><div class='del'>-	rate_flags = iwl4965_ant_idx_to_flags(priv-&gt;mgmt_tx_ant);</div><div class='del'>-	if ((rate &gt;= IWL_FIRST_CCK_RATE) &amp;&amp; (rate &lt;= IWL_LAST_CCK_RATE))</div><div class='del'>-		rate_flags |= RATE_MCS_CCK_MSK;</div><div class='del'>-	tx_beacon_cmd-&gt;tx.rate_n_flags = iwl4965_hw_set_rate_n_flags(rate,</div><div class='del'>-			rate_flags);</div><div class='del'>-</div><div class='del'>-	return sizeof(*tx_beacon_cmd) + frame_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_send_beacon_cmd(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_frame *frame;</div><div class='del'>-	unsigned int frame_size;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	frame = iwl4965_get_free_frame(priv);</div><div class='del'>-	if (!frame) {</div><div class='del'>-		IWL_ERR(priv, "Could not obtain free frame buffer for beacon "</div><div class='del'>-			  "command.\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	frame_size = iwl4965_hw_get_beacon_cmd(priv, frame);</div><div class='del'>-	if (!frame_size) {</div><div class='del'>-		IWL_ERR(priv, "Error configuring the beacon command\n");</div><div class='del'>-		iwl4965_free_frame(priv, frame);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = iwl_legacy_send_cmd_pdu(priv, REPLY_TX_BEACON, frame_size,</div><div class='del'>-			      &amp;frame-&gt;u.cmd[0]);</div><div class='del'>-</div><div class='del'>-	iwl4965_free_frame(priv, frame);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline dma_addr_t iwl4965_tfd_tb_get_addr(struct iwl_tfd *tfd, u8 idx)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tfd_tb *tb = &amp;tfd-&gt;tbs[idx];</div><div class='del'>-</div><div class='del'>-	dma_addr_t addr = get_unaligned_le32(&amp;tb-&gt;lo);</div><div class='del'>-	if (sizeof(dma_addr_t) &gt; sizeof(u32))</div><div class='del'>-		addr |=</div><div class='del'>-		((dma_addr_t)(le16_to_cpu(tb-&gt;hi_n_len) &amp; 0xF) &lt;&lt; 16) &lt;&lt; 16;</div><div class='del'>-</div><div class='del'>-	return addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 iwl4965_tfd_tb_get_len(struct iwl_tfd *tfd, u8 idx)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tfd_tb *tb = &amp;tfd-&gt;tbs[idx];</div><div class='del'>-</div><div class='del'>-	return le16_to_cpu(tb-&gt;hi_n_len) &gt;&gt; 4;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void iwl4965_tfd_set_tb(struct iwl_tfd *tfd, u8 idx,</div><div class='del'>-				  dma_addr_t addr, u16 len)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tfd_tb *tb = &amp;tfd-&gt;tbs[idx];</div><div class='del'>-	u16 hi_n_len = len &lt;&lt; 4;</div><div class='del'>-</div><div class='del'>-	put_unaligned_le32(addr, &amp;tb-&gt;lo);</div><div class='del'>-	if (sizeof(dma_addr_t) &gt; sizeof(u32))</div><div class='del'>-		hi_n_len |= ((addr &gt;&gt; 16) &gt;&gt; 16) &amp; 0xF;</div><div class='del'>-</div><div class='del'>-	tb-&gt;hi_n_len = cpu_to_le16(hi_n_len);</div><div class='del'>-</div><div class='del'>-	tfd-&gt;num_tbs = idx + 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 iwl4965_tfd_get_num_tbs(struct iwl_tfd *tfd)</div><div class='del'>-{</div><div class='del'>-	return tfd-&gt;num_tbs &amp; 0x1f;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_hw_txq_free_tfd - Free all chunks referenced by TFD [txq-&gt;q.read_ptr]</div><div class='del'>- * @priv - driver private data</div><div class='del'>- * @txq - tx queue</div><div class='del'>- *</div><div class='del'>- * Does NOT advance any TFD circular buffer read/write indexes</div><div class='del'>- * Does NOT free the TFD itself (which is within circular buffer)</div><div class='del'>- */</div><div class='del'>-void iwl4965_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq)</div><div class='del'>-{</div><div class='del'>-	struct iwl_tfd *tfd_tmp = (struct iwl_tfd *)txq-&gt;tfds;</div><div class='del'>-	struct iwl_tfd *tfd;</div><div class='del'>-	struct pci_dev *dev = priv-&gt;pci_dev;</div><div class='del'>-	int index = txq-&gt;q.read_ptr;</div><div class='del'>-	int i;</div><div class='del'>-	int num_tbs;</div><div class='del'>-</div><div class='del'>-	tfd = &amp;tfd_tmp[index];</div><div class='del'>-</div><div class='del'>-	/* Sanity check on number of chunks */</div><div class='del'>-	num_tbs = iwl4965_tfd_get_num_tbs(tfd);</div><div class='del'>-</div><div class='del'>-	if (num_tbs &gt;= IWL_NUM_OF_TBS) {</div><div class='del'>-		IWL_ERR(priv, "Too many chunks: %i\n", num_tbs);</div><div class='del'>-		/* @todo issue fatal error, it is quite serious situation */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Unmap tx_cmd */</div><div class='del'>-	if (num_tbs)</div><div class='del'>-		pci_unmap_single(dev,</div><div class='del'>-				dma_unmap_addr(&amp;txq-&gt;meta[index], mapping),</div><div class='del'>-				dma_unmap_len(&amp;txq-&gt;meta[index], len),</div><div class='del'>-				PCI_DMA_BIDIRECTIONAL);</div><div class='del'>-</div><div class='del'>-	/* Unmap chunks, if any. */</div><div class='del'>-	for (i = 1; i &lt; num_tbs; i++)</div><div class='del'>-		pci_unmap_single(dev, iwl4965_tfd_tb_get_addr(tfd, i),</div><div class='del'>-				iwl4965_tfd_tb_get_len(tfd, i),</div><div class='del'>-				PCI_DMA_TODEVICE);</div><div class='del'>-</div><div class='del'>-	/* free SKB */</div><div class='del'>-	if (txq-&gt;txb) {</div><div class='del'>-		struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-		skb = txq-&gt;txb[txq-&gt;q.read_ptr].skb;</div><div class='del'>-</div><div class='del'>-		/* can be called from irqs-disabled context */</div><div class='del'>-		if (skb) {</div><div class='del'>-			dev_kfree_skb_any(skb);</div><div class='del'>-			txq-&gt;txb[txq-&gt;q.read_ptr].skb = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv,</div><div class='del'>-				 struct iwl_tx_queue *txq,</div><div class='del'>-				 dma_addr_t addr, u16 len,</div><div class='del'>-				 u8 reset, u8 pad)</div><div class='del'>-{</div><div class='del'>-	struct iwl_queue *q;</div><div class='del'>-	struct iwl_tfd *tfd, *tfd_tmp;</div><div class='del'>-	u32 num_tbs;</div><div class='del'>-</div><div class='del'>-	q = &amp;txq-&gt;q;</div><div class='del'>-	tfd_tmp = (struct iwl_tfd *)txq-&gt;tfds;</div><div class='del'>-	tfd = &amp;tfd_tmp[q-&gt;write_ptr];</div><div class='del'>-</div><div class='del'>-	if (reset)</div><div class='del'>-		memset(tfd, 0, sizeof(*tfd));</div><div class='del'>-</div><div class='del'>-	num_tbs = iwl4965_tfd_get_num_tbs(tfd);</div><div class='del'>-</div><div class='del'>-	/* Each TFD can point to a maximum 20 Tx buffers */</div><div class='del'>-	if (num_tbs &gt;= IWL_NUM_OF_TBS) {</div><div class='del'>-		IWL_ERR(priv, "Error can not send more than %d chunks\n",</div><div class='del'>-			  IWL_NUM_OF_TBS);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUG_ON(addr &amp; ~DMA_BIT_MASK(36));</div><div class='del'>-	if (unlikely(addr &amp; ~IWL_TX_DMA_MASK))</div><div class='del'>-		IWL_ERR(priv, "Unaligned address = %llx\n",</div><div class='del'>-			  (unsigned long long)addr);</div><div class='del'>-</div><div class='del'>-	iwl4965_tfd_set_tb(tfd, num_tbs, addr, len);</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'>- * Tell nic where to find circular buffer of Tx Frame Descriptors for</div><div class='del'>- * given Tx queue, and enable the DMA channel used for that queue.</div><div class='del'>- *</div><div class='del'>- * 4965 supports up to 16 Tx queues in DRAM, mapped to up to 8 Tx DMA</div><div class='del'>- * channels supported in hardware.</div><div class='del'>- */</div><div class='del'>-int iwl4965_hw_tx_queue_init(struct iwl_priv *priv,</div><div class='del'>-			 struct iwl_tx_queue *txq)</div><div class='del'>-{</div><div class='del'>-	int txq_id = txq-&gt;q.id;</div><div class='del'>-</div><div class='del'>-	/* Circular buffer (TFD queue in DRAM) physical base address */</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH_MEM_CBBC_QUEUE(txq_id),</div><div class='del'>-			     txq-&gt;q.dma_addr &gt;&gt; 8);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * Generic RX handler implementations</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-static void iwl4965_rx_reply_alive(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl_alive_resp *palive;</div><div class='del'>-	struct delayed_work *pwork;</div><div class='del'>-</div><div class='del'>-	palive = &amp;pkt-&gt;u.alive_frame;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Alive ucode status 0x%08X revision "</div><div class='del'>-		       "0x%01X 0x%01X\n",</div><div class='del'>-		       palive-&gt;is_valid, palive-&gt;ver_type,</div><div class='del'>-		       palive-&gt;ver_subtype);</div><div class='del'>-</div><div class='del'>-	if (palive-&gt;ver_subtype == INITIALIZE_SUBTYPE) {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Initialization Alive received.\n");</div><div class='del'>-		memcpy(&amp;priv-&gt;card_alive_init,</div><div class='del'>-		       &amp;pkt-&gt;u.alive_frame,</div><div class='del'>-		       sizeof(struct iwl_init_alive_resp));</div><div class='del'>-		pwork = &amp;priv-&gt;init_alive_start;</div><div class='del'>-	} else {</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Runtime Alive received.\n");</div><div class='del'>-		memcpy(&amp;priv-&gt;card_alive, &amp;pkt-&gt;u.alive_frame,</div><div class='del'>-		       sizeof(struct iwl_alive_resp));</div><div class='del'>-		pwork = &amp;priv-&gt;alive_start;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We delay the ALIVE response by 5ms to</div><div class='del'>-	 * give the HW RF Kill time to activate... */</div><div class='del'>-	if (palive-&gt;is_valid == UCODE_VALID_OK)</div><div class='del'>-		queue_delayed_work(priv-&gt;workqueue, pwork,</div><div class='del'>-				   msecs_to_jiffies(5));</div><div class='del'>-	else</div><div class='del'>-		IWL_WARN(priv, "uCode did not respond OK.\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_bg_statistics_periodic - Timer callback to queue statistics</div><div class='del'>- *</div><div class='del'>- * This callback is provided in order to send a statistics request.</div><div class='del'>- *</div><div class='del'>- * This timer function is continually reset to execute within</div><div class='del'>- * REG_RECALIB_PERIOD seconds since the last STATISTICS_NOTIFICATION</div><div class='del'>- * was received.  We need to ensure we receive the statistics in order</div><div class='del'>- * to update the temperature used for calibrating the TXPOWER.</div><div class='del'>- */</div><div class='del'>-static void iwl4965_bg_statistics_periodic(unsigned long data)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = (struct iwl_priv *)data;</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* dont send host command if rf-kill is on */</div><div class='del'>-	if (!iwl_legacy_is_ready_rf(priv))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_send_statistics_request(priv, CMD_ASYNC, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_rx_beacon_notif(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	struct iwl4965_beacon_notif *beacon =</div><div class='del'>-		(struct iwl4965_beacon_notif *)pkt-&gt;u.raw;</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	u8 rate = iwl4965_hw_get_rate(beacon-&gt;beacon_notify_hdr.rate_n_flags);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RX(priv, "beacon status %x retries %d iss %d "</div><div class='del'>-		"tsf %d %d rate %d\n",</div><div class='del'>-		le32_to_cpu(beacon-&gt;beacon_notify_hdr.u.status) &amp; TX_STATUS_MSK,</div><div class='del'>-		beacon-&gt;beacon_notify_hdr.failure_frame,</div><div class='del'>-		le32_to_cpu(beacon-&gt;ibss_mgr_status),</div><div class='del'>-		le32_to_cpu(beacon-&gt;high_tsf),</div><div class='del'>-		le32_to_cpu(beacon-&gt;low_tsf), rate);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	priv-&gt;ibss_manager = le32_to_cpu(beacon-&gt;ibss_mgr_status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_perform_ct_kill_task(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_POWER(priv, "Stop all queues\n");</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;mac80211_registered)</div><div class='del'>-		ieee80211_stop_queues(priv-&gt;hw);</div><div class='del'>-</div><div class='del'>-	iwl_write32(priv, CSR_UCODE_DRV_GP1_SET,</div><div class='del'>-			CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);</div><div class='del'>-	iwl_read32(priv, CSR_UCODE_DRV_GP1);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;reg_lock, flags);</div><div class='del'>-	if (!iwl_grab_nic_access(priv))</div><div class='del'>-		iwl_release_nic_access(priv);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;reg_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Handle notification from uCode that card's power state is changing</div><div class='del'>- * due to software, hardware, or critical temperature RFKILL */</div><div class='del'>-static void iwl4965_rx_card_state_notif(struct iwl_priv *priv,</div><div class='del'>-				    struct iwl_rx_mem_buffer *rxb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='del'>-	u32 flags = le32_to_cpu(pkt-&gt;u.card_state_notif.flags);</div><div class='del'>-	unsigned long status = priv-&gt;status;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_RF_KILL(priv, "Card state received: HW:%s SW:%s CT:%s\n",</div><div class='del'>-			  (flags &amp; HW_CARD_DISABLED) ? "Kill" : "On",</div><div class='del'>-			  (flags &amp; SW_CARD_DISABLED) ? "Kill" : "On",</div><div class='del'>-			  (flags &amp; CT_CARD_DISABLED) ?</div><div class='del'>-			  "Reached" : "Not reached");</div><div class='del'>-</div><div class='del'>-	if (flags &amp; (SW_CARD_DISABLED | HW_CARD_DISABLED |</div><div class='del'>-		     CT_CARD_DISABLED)) {</div><div class='del'>-</div><div class='del'>-		iwl_write32(priv, CSR_UCODE_DRV_GP1_SET,</div><div class='del'>-			    CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);</div><div class='del'>-</div><div class='del'>-		iwl_legacy_write_direct32(priv, HBUS_TARG_MBX_C,</div><div class='del'>-					HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED);</div><div class='del'>-</div><div class='del'>-		if (!(flags &amp; RXON_CARD_DISABLED)) {</div><div class='del'>-			iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR,</div><div class='del'>-				    CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);</div><div class='del'>-			iwl_legacy_write_direct32(priv, HBUS_TARG_MBX_C,</div><div class='del'>-					HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (flags &amp; CT_CARD_DISABLED)</div><div class='del'>-		iwl4965_perform_ct_kill_task(priv);</div><div class='del'>-</div><div class='del'>-	if (flags &amp; HW_CARD_DISABLED)</div><div class='del'>-		set_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-	else</div><div class='del'>-		clear_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; RXON_CARD_DISABLED))</div><div class='del'>-		iwl_legacy_scan_cancel(priv);</div><div class='del'>-</div><div class='del'>-	if ((test_bit(STATUS_RF_KILL_HW, &amp;status) !=</div><div class='del'>-	     test_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status)))</div><div class='del'>-		wiphy_rfkill_set_hw_state(priv-&gt;hw-&gt;wiphy,</div><div class='del'>-			test_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status));</div><div class='del'>-	else</div><div class='del'>-		wake_up(&amp;priv-&gt;wait_command_queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_setup_rx_handlers - Initialize Rx handler callbacks</div><div class='del'>- *</div><div class='del'>- * Setup the RX handlers for each of the reply types sent from the uCode</div><div class='del'>- * to the host.</div><div class='del'>- *</div><div class='del'>- * This function chains into the hardware specific files for them to setup</div><div class='del'>- * any hardware specific handlers as well.</div><div class='del'>- */</div><div class='del'>-static void iwl4965_setup_rx_handlers(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	priv-&gt;rx_handlers[REPLY_ALIVE] = iwl4965_rx_reply_alive;</div><div class='del'>-	priv-&gt;rx_handlers[REPLY_ERROR] = iwl_legacy_rx_reply_error;</div><div class='del'>-	priv-&gt;rx_handlers[CHANNEL_SWITCH_NOTIFICATION] = iwl_legacy_rx_csa;</div><div class='del'>-	priv-&gt;rx_handlers[SPECTRUM_MEASURE_NOTIFICATION] =</div><div class='del'>-			iwl_legacy_rx_spectrum_measure_notif;</div><div class='del'>-	priv-&gt;rx_handlers[PM_SLEEP_NOTIFICATION] = iwl_legacy_rx_pm_sleep_notif;</div><div class='del'>-	priv-&gt;rx_handlers[PM_DEBUG_STATISTIC_NOTIFIC] =</div><div class='del'>-	    iwl_legacy_rx_pm_debug_statistics_notif;</div><div class='del'>-	priv-&gt;rx_handlers[BEACON_NOTIFICATION] = iwl4965_rx_beacon_notif;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The same handler is used for both the REPLY to a discrete</div><div class='del'>-	 * statistics request from the host as well as for the periodic</div><div class='del'>-	 * statistics notifications (after received beacons) from the uCode.</div><div class='del'>-	 */</div><div class='del'>-	priv-&gt;rx_handlers[REPLY_STATISTICS_CMD] = iwl4965_reply_statistics;</div><div class='del'>-	priv-&gt;rx_handlers[STATISTICS_NOTIFICATION] = iwl4965_rx_statistics;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_setup_rx_scan_handlers(priv);</div><div class='del'>-</div><div class='del'>-	/* status change handler */</div><div class='del'>-	priv-&gt;rx_handlers[CARD_STATE_NOTIFICATION] =</div><div class='del'>-					iwl4965_rx_card_state_notif;</div><div class='del'>-</div><div class='del'>-	priv-&gt;rx_handlers[MISSED_BEACONS_NOTIFICATION] =</div><div class='del'>-	    iwl4965_rx_missed_beacon_notif;</div><div class='del'>-	/* Rx handlers */</div><div class='del'>-	priv-&gt;rx_handlers[REPLY_RX_PHY_CMD] = iwl4965_rx_reply_rx_phy;</div><div class='del'>-	priv-&gt;rx_handlers[REPLY_RX_MPDU_CMD] = iwl4965_rx_reply_rx;</div><div class='del'>-	/* block ack */</div><div class='del'>-	priv-&gt;rx_handlers[REPLY_COMPRESSED_BA] = iwl4965_rx_reply_compressed_ba;</div><div class='del'>-	/* Set up hardware specific Rx handlers */</div><div class='del'>-	priv-&gt;cfg-&gt;ops-&gt;lib-&gt;rx_handler_setup(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iwl4965_rx_handle - Main entry function for receiving responses from uCode</div><div class='del'>- *</div><div class='del'>- * Uses the priv-&gt;rx_handlers callback function array to invoke</div><div class='del'>- * the appropriate handlers, including command responses,</div><div class='del'>- * frame-received notifications, and other notifications.</div><div class='del'>- */</div><div class='del'>-void iwl4965_rx_handle(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rx_mem_buffer *rxb;</div><div class='del'>-	struct iwl_rx_packet *pkt;</div><div class='del'>-	struct iwl_rx_queue *rxq = &amp;priv-&gt;rxq;</div><div class='del'>-	u32 r, i;</div><div class='del'>-	int reclaim;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u8 fill_rx = 0;</div><div class='del'>-	u32 count = 8;</div><div class='del'>-	int total_empty;</div><div class='del'>-</div><div class='del'>-	/* uCode's read index (stored in shared DRAM) indicates the last Rx</div><div class='del'>-	 * buffer that the driver may process (last buffer filled by ucode). */</div><div class='del'>-	r = le16_to_cpu(rxq-&gt;rb_stts-&gt;closed_rb_num) &amp;  0x0FFF;</div><div class='del'>-	i = rxq-&gt;read;</div><div class='del'>-</div><div class='del'>-	/* Rx interrupt, but nothing sent from uCode */</div><div class='del'>-	if (i == r)</div><div class='del'>-		IWL_DEBUG_RX(priv, "r = %d, i = %d\n", r, i);</div><div class='del'>-</div><div class='del'>-	/* calculate total frames need to be restock after handling RX */</div><div class='del'>-	total_empty = r - rxq-&gt;write_actual;</div><div class='del'>-	if (total_empty &lt; 0)</div><div class='del'>-		total_empty += RX_QUEUE_SIZE;</div><div class='del'>-</div><div class='del'>-	if (total_empty &gt; (RX_QUEUE_SIZE / 2))</div><div class='del'>-		fill_rx = 1;</div><div class='del'>-</div><div class='del'>-	while (i != r) {</div><div class='del'>-		int len;</div><div class='del'>-</div><div class='del'>-		rxb = rxq-&gt;queue[i];</div><div class='del'>-</div><div class='del'>-		/* If an RXB doesn't have a Rx queue slot associated with it,</div><div class='del'>-		 * then a bug has been introduced in the queue refilling</div><div class='del'>-		 * routines -- catch it here */</div><div class='del'>-		BUG_ON(rxb == NULL);</div><div class='del'>-</div><div class='del'>-		rxq-&gt;queue[i] = NULL;</div><div class='del'>-</div><div class='del'>-		pci_unmap_page(priv-&gt;pci_dev, rxb-&gt;page_dma,</div><div class='del'>-			       PAGE_SIZE &lt;&lt; priv-&gt;hw_params.rx_page_order,</div><div class='del'>-			       PCI_DMA_FROMDEVICE);</div><div class='del'>-		pkt = rxb_addr(rxb);</div><div class='del'>-</div><div class='del'>-		len = le32_to_cpu(pkt-&gt;len_n_flags) &amp; FH_RSCSR_FRAME_SIZE_MSK;</div><div class='del'>-		len += sizeof(u32); /* account for status word */</div><div class='del'>-		trace_iwlwifi_legacy_dev_rx(priv, pkt, len);</div><div class='del'>-</div><div class='del'>-		/* Reclaim a command buffer only if this packet is a response</div><div class='del'>-		 *   to a (driver-originated) command.</div><div class='del'>-		 * If the packet (e.g. Rx frame) originated from uCode,</div><div class='del'>-		 *   there is no command buffer to reclaim.</div><div class='del'>-		 * Ucode should set SEQ_RX_FRAME bit if ucode-originated,</div><div class='del'>-		 *   but apparently a few don't get set; catch them here. */</div><div class='del'>-		reclaim = !(pkt-&gt;hdr.sequence &amp; SEQ_RX_FRAME) &amp;&amp;</div><div class='del'>-			(pkt-&gt;hdr.cmd != REPLY_RX_PHY_CMD) &amp;&amp;</div><div class='del'>-			(pkt-&gt;hdr.cmd != REPLY_RX) &amp;&amp;</div><div class='del'>-			(pkt-&gt;hdr.cmd != REPLY_RX_MPDU_CMD) &amp;&amp;</div><div class='del'>-			(pkt-&gt;hdr.cmd != REPLY_COMPRESSED_BA) &amp;&amp;</div><div class='del'>-			(pkt-&gt;hdr.cmd != STATISTICS_NOTIFICATION) &amp;&amp;</div><div class='del'>-			(pkt-&gt;hdr.cmd != REPLY_TX);</div><div class='del'>-</div><div class='del'>-		/* Based on type of command response or notification,</div><div class='del'>-		 *   handle those that need handling via function in</div><div class='del'>-		 *   rx_handlers table.  See iwl4965_setup_rx_handlers() */</div><div class='del'>-		if (priv-&gt;rx_handlers[pkt-&gt;hdr.cmd]) {</div><div class='del'>-			IWL_DEBUG_RX(priv, "r = %d, i = %d, %s, 0x%02x\n", r,</div><div class='del'>-				i, iwl_legacy_get_cmd_string(pkt-&gt;hdr.cmd),</div><div class='del'>-				pkt-&gt;hdr.cmd);</div><div class='del'>-			priv-&gt;isr_stats.rx_handlers[pkt-&gt;hdr.cmd]++;</div><div class='del'>-			priv-&gt;rx_handlers[pkt-&gt;hdr.cmd] (priv, rxb);</div><div class='del'>-		} else {</div><div class='del'>-			/* No handling needed */</div><div class='del'>-			IWL_DEBUG_RX(priv,</div><div class='del'>-				"r %d i %d No handler needed for %s, 0x%02x\n",</div><div class='del'>-				r, i, iwl_legacy_get_cmd_string(pkt-&gt;hdr.cmd),</div><div class='del'>-				pkt-&gt;hdr.cmd);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * XXX: After here, we should always check rxb-&gt;page</div><div class='del'>-		 * against NULL before touching it or its virtual</div><div class='del'>-		 * memory (pkt). Because some rx_handler might have</div><div class='del'>-		 * already taken or freed the pages.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (reclaim) {</div><div class='del'>-			/* Invoke any callbacks, transfer the buffer to caller,</div><div class='del'>-			 * and fire off the (possibly) blocking iwl_legacy_send_cmd()</div><div class='del'>-			 * as we reclaim the driver command queue */</div><div class='del'>-			if (rxb-&gt;page)</div><div class='del'>-				iwl_legacy_tx_cmd_complete(priv, rxb);</div><div class='del'>-			else</div><div class='del'>-				IWL_WARN(priv, "Claim null rxb?\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Reuse the page if possible. For notification packets and</div><div class='del'>-		 * SKBs that fail to Rx correctly, add them back into the</div><div class='del'>-		 * rx_free list for reuse later. */</div><div class='del'>-		spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='del'>-		if (rxb-&gt;page != NULL) {</div><div class='del'>-			rxb-&gt;page_dma = pci_map_page(priv-&gt;pci_dev, rxb-&gt;page,</div><div class='del'>-				0, PAGE_SIZE &lt;&lt; priv-&gt;hw_params.rx_page_order,</div><div class='del'>-				PCI_DMA_FROMDEVICE);</div><div class='del'>-			list_add_tail(&amp;rxb-&gt;list, &amp;rxq-&gt;rx_free);</div><div class='del'>-			rxq-&gt;free_count++;</div><div class='del'>-		} else</div><div class='del'>-			list_add_tail(&amp;rxb-&gt;list, &amp;rxq-&gt;rx_used);</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-		i = (i + 1) &amp; RX_QUEUE_MASK;</div><div class='del'>-		/* If there are a lot of unused frames,</div><div class='del'>-		 * restock the Rx queue so ucode wont assert. */</div><div class='del'>-		if (fill_rx) {</div><div class='del'>-			count++;</div><div class='del'>-			if (count &gt;= 8) {</div><div class='del'>-				rxq-&gt;read = i;</div><div class='del'>-				iwl4965_rx_replenish_now(priv);</div><div class='del'>-				count = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Backtrack one entry */</div><div class='del'>-	rxq-&gt;read = i;</div><div class='del'>-	if (fill_rx)</div><div class='del'>-		iwl4965_rx_replenish_now(priv);</div><div class='del'>-	else</div><div class='del'>-		iwl4965_rx_queue_restock(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* call this function to flush any scheduled tasklet */</div><div class='del'>-static inline void iwl4965_synchronize_irq(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	/* wait to make sure we flush pending tasklet*/</div><div class='del'>-	synchronize_irq(priv-&gt;pci_dev-&gt;irq);</div><div class='del'>-	tasklet_kill(&amp;priv-&gt;irq_tasklet);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_irq_tasklet(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	u32 inta, handled = 0;</div><div class='del'>-	u32 inta_fh;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u32 i;</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	u32 inta_mask;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Ack/clear/reset pending uCode interrupts.</div><div class='del'>-	 * Note:  Some bits in CSR_INT are "OR" of bits in CSR_FH_INT_STATUS,</div><div class='del'>-	 *  and will clear only when CSR_FH_INT_STATUS gets cleared. */</div><div class='del'>-	inta = iwl_read32(priv, CSR_INT);</div><div class='del'>-	iwl_write32(priv, CSR_INT, inta);</div><div class='del'>-</div><div class='del'>-	/* Ack/clear/reset pending flow-handler (DMA) interrupts.</div><div class='del'>-	 * Any new interrupts that happen after this, either while we're</div><div class='del'>-	 * in this tasklet, or later, will show up in next ISR/tasklet. */</div><div class='del'>-	inta_fh = iwl_read32(priv, CSR_FH_INT_STATUS);</div><div class='del'>-	iwl_write32(priv, CSR_FH_INT_STATUS, inta_fh);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	if (iwl_legacy_get_debug_level(priv) &amp; IWL_DL_ISR) {</div><div class='del'>-		/* just for debug */</div><div class='del'>-		inta_mask = iwl_read32(priv, CSR_INT_MASK);</div><div class='del'>-		IWL_DEBUG_ISR(priv, "inta 0x%08x, enabled 0x%08x, fh 0x%08x\n",</div><div class='del'>-			      inta, inta_mask, inta_fh);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Since CSR_INT and CSR_FH_INT_STATUS reads and clears are not</div><div class='del'>-	 * atomic, make sure that inta covers all the interrupts that</div><div class='del'>-	 * we've discovered, even if FH interrupt came in just after</div><div class='del'>-	 * reading CSR_INT. */</div><div class='del'>-	if (inta_fh &amp; CSR49_FH_INT_RX_MASK)</div><div class='del'>-		inta |= CSR_INT_BIT_FH_RX;</div><div class='del'>-	if (inta_fh &amp; CSR49_FH_INT_TX_MASK)</div><div class='del'>-		inta |= CSR_INT_BIT_FH_TX;</div><div class='del'>-</div><div class='del'>-	/* Now service all interrupt bits discovered above. */</div><div class='del'>-	if (inta &amp; CSR_INT_BIT_HW_ERR) {</div><div class='del'>-		IWL_ERR(priv, "Hardware error detected.  Restarting.\n");</div><div class='del'>-</div><div class='del'>-		/* Tell the device to stop sending interrupts */</div><div class='del'>-		iwl_legacy_disable_interrupts(priv);</div><div class='del'>-</div><div class='del'>-		priv-&gt;isr_stats.hw++;</div><div class='del'>-		iwl_legacy_irq_handle_error(priv);</div><div class='del'>-</div><div class='del'>-		handled |= CSR_INT_BIT_HW_ERR;</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	if (iwl_legacy_get_debug_level(priv) &amp; (IWL_DL_ISR)) {</div><div class='del'>-		/* NIC fires this, but we don't use it, redundant with WAKEUP */</div><div class='del'>-		if (inta &amp; CSR_INT_BIT_SCD) {</div><div class='del'>-			IWL_DEBUG_ISR(priv, "Scheduler finished to transmit "</div><div class='del'>-				      "the frame/frames.\n");</div><div class='del'>-			priv-&gt;isr_stats.sch++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Alive notification via Rx interrupt will do the real work */</div><div class='del'>-		if (inta &amp; CSR_INT_BIT_ALIVE) {</div><div class='del'>-			IWL_DEBUG_ISR(priv, "Alive interrupt\n");</div><div class='del'>-			priv-&gt;isr_stats.alive++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	/* Safely ignore these bits for debug checks below */</div><div class='del'>-	inta &amp;= ~(CSR_INT_BIT_SCD | CSR_INT_BIT_ALIVE);</div><div class='del'>-</div><div class='del'>-	/* HW RF KILL switch toggled */</div><div class='del'>-	if (inta &amp; CSR_INT_BIT_RF_KILL) {</div><div class='del'>-		int hw_rf_kill = 0;</div><div class='del'>-		if (!(iwl_read32(priv, CSR_GP_CNTRL) &amp;</div><div class='del'>-				CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW))</div><div class='del'>-			hw_rf_kill = 1;</div><div class='del'>-</div><div class='del'>-		IWL_WARN(priv, "RF_KILL bit toggled to %s.\n",</div><div class='del'>-				hw_rf_kill ? "disable radio" : "enable radio");</div><div class='del'>-</div><div class='del'>-		priv-&gt;isr_stats.rfkill++;</div><div class='del'>-</div><div class='del'>-		/* driver only loads ucode once setting the interface up.</div><div class='del'>-		 * the driver allows loading the ucode even if the radio</div><div class='del'>-		 * is killed. Hence update the killswitch state here. The</div><div class='del'>-		 * rfkill handler will care about restarting if needed.</div><div class='del'>-		 */</div><div class='del'>-		if (!test_bit(STATUS_ALIVE, &amp;priv-&gt;status)) {</div><div class='del'>-			if (hw_rf_kill)</div><div class='del'>-				set_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-			else</div><div class='del'>-				clear_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-			wiphy_rfkill_set_hw_state(priv-&gt;hw-&gt;wiphy, hw_rf_kill);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		handled |= CSR_INT_BIT_RF_KILL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Chip got too hot and stopped itself */</div><div class='del'>-	if (inta &amp; CSR_INT_BIT_CT_KILL) {</div><div class='del'>-		IWL_ERR(priv, "Microcode CT kill error detected.\n");</div><div class='del'>-		priv-&gt;isr_stats.ctkill++;</div><div class='del'>-		handled |= CSR_INT_BIT_CT_KILL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Error detected by uCode */</div><div class='del'>-	if (inta &amp; CSR_INT_BIT_SW_ERR) {</div><div class='del'>-		IWL_ERR(priv, "Microcode SW error detected. "</div><div class='del'>-			" Restarting 0x%X.\n", inta);</div><div class='del'>-		priv-&gt;isr_stats.sw++;</div><div class='del'>-		iwl_legacy_irq_handle_error(priv);</div><div class='del'>-		handled |= CSR_INT_BIT_SW_ERR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * uCode wakes up after power-down sleep.</div><div class='del'>-	 * Tell device about any new tx or host commands enqueued,</div><div class='del'>-	 * and about any Rx buffers made available while asleep.</div><div class='del'>-	 */</div><div class='del'>-	if (inta &amp; CSR_INT_BIT_WAKEUP) {</div><div class='del'>-		IWL_DEBUG_ISR(priv, "Wakeup interrupt\n");</div><div class='del'>-		iwl_legacy_rx_queue_update_write_ptr(priv, &amp;priv-&gt;rxq);</div><div class='del'>-		for (i = 0; i &lt; priv-&gt;hw_params.max_txq_num; i++)</div><div class='del'>-			iwl_legacy_txq_update_write_ptr(priv, &amp;priv-&gt;txq[i]);</div><div class='del'>-		priv-&gt;isr_stats.wakeup++;</div><div class='del'>-		handled |= CSR_INT_BIT_WAKEUP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* All uCode command responses, including Tx command responses,</div><div class='del'>-	 * Rx "responses" (frame-received notification), and other</div><div class='del'>-	 * notifications from uCode come through here*/</div><div class='del'>-	if (inta &amp; (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX)) {</div><div class='del'>-		iwl4965_rx_handle(priv);</div><div class='del'>-		priv-&gt;isr_stats.rx++;</div><div class='del'>-		handled |= (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* This "Tx" DMA channel is used only for loading uCode */</div><div class='del'>-	if (inta &amp; CSR_INT_BIT_FH_TX) {</div><div class='del'>-		IWL_DEBUG_ISR(priv, "uCode load interrupt\n");</div><div class='del'>-		priv-&gt;isr_stats.tx++;</div><div class='del'>-		handled |= CSR_INT_BIT_FH_TX;</div><div class='del'>-		/* Wake up uCode load routine, now that load is complete */</div><div class='del'>-		priv-&gt;ucode_write_complete = 1;</div><div class='del'>-		wake_up(&amp;priv-&gt;wait_command_queue);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (inta &amp; ~handled) {</div><div class='del'>-		IWL_ERR(priv, "Unhandled INTA bits 0x%08x\n", inta &amp; ~handled);</div><div class='del'>-		priv-&gt;isr_stats.unhandled++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (inta &amp; ~(priv-&gt;inta_mask)) {</div><div class='del'>-		IWL_WARN(priv, "Disabled INTA bits 0x%08x were pending\n",</div><div class='del'>-			 inta &amp; ~priv-&gt;inta_mask);</div><div class='del'>-		IWL_WARN(priv, "   with FH_INT = 0x%08x\n", inta_fh);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Re-enable all interrupts */</div><div class='del'>-	/* only Re-enable if disabled by irq */</div><div class='del'>-	if (test_bit(STATUS_INT_ENABLED, &amp;priv-&gt;status))</div><div class='del'>-		iwl_legacy_enable_interrupts(priv);</div><div class='del'>-	/* Re-enable RF_KILL if it occurred */</div><div class='del'>-	else if (handled &amp; CSR_INT_BIT_RF_KILL)</div><div class='del'>-		iwl_legacy_enable_rfkill_int(priv);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	if (iwl_legacy_get_debug_level(priv) &amp; (IWL_DL_ISR)) {</div><div class='del'>-		inta = iwl_read32(priv, CSR_INT);</div><div class='del'>-		inta_mask = iwl_read32(priv, CSR_INT_MASK);</div><div class='del'>-		inta_fh = iwl_read32(priv, CSR_FH_INT_STATUS);</div><div class='del'>-		IWL_DEBUG_ISR(priv,</div><div class='del'>-			"End inta 0x%08x, enabled 0x%08x, fh 0x%08x, "</div><div class='del'>-			"flags 0x%08lx\n", inta, inta_mask, inta_fh, flags);</div><div class='del'>-	}</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'>- * sysfs attributes</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The following adds a new attribute to the sysfs representation</div><div class='del'>- * of this device driver (i.e. a new file in /sys/class/net/wlan0/device/)</div><div class='del'>- * used for controlling the debug level.</div><div class='del'>- *</div><div class='del'>- * See the level definitions in iwl for details.</div><div class='del'>- *</div><div class='del'>- * The debug_level being managed using sysfs below is a per device debug</div><div class='del'>- * level that is used instead of the global debug level if it (the per</div><div class='del'>- * device debug level) is set.</div><div class='del'>- */</div><div class='del'>-static ssize_t iwl4965_show_debug_level(struct device *d,</div><div class='del'>-				struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-	return sprintf(buf, "0x%08X\n", iwl_legacy_get_debug_level(priv));</div><div class='del'>-}</div><div class='del'>-static ssize_t iwl4965_store_debug_level(struct device *d,</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 iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-	unsigned long val;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = strict_strtoul(buf, 0, &amp;val);</div><div class='del'>-	if (ret)</div><div class='del'>-		IWL_ERR(priv, "%s is not in hex or decimal form.\n", buf);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;debug_level = val;</div><div class='del'>-		if (iwl_legacy_alloc_traffic_mem(priv))</div><div class='del'>-			IWL_ERR(priv,</div><div class='del'>-				"Not enough memory to generate traffic log\n");</div><div class='del'>-	}</div><div class='del'>-	return strnlen(buf, count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEVICE_ATTR(debug_level, S_IWUSR | S_IRUGO,</div><div class='del'>-			iwl4965_show_debug_level, iwl4965_store_debug_level);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_IWLWIFI_LEGACY_DEBUG */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static ssize_t iwl4965_show_temperature(struct device *d,</div><div class='del'>-				struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_alive(priv))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "%d\n", priv-&gt;temperature);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEVICE_ATTR(temperature, S_IRUGO, iwl4965_show_temperature, NULL);</div><div class='del'>-</div><div class='del'>-static ssize_t iwl4965_show_tx_power(struct device *d,</div><div class='del'>-			     struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_ready_rf(priv))</div><div class='del'>-		return sprintf(buf, "off\n");</div><div class='del'>-	else</div><div class='del'>-		return sprintf(buf, "%d\n", priv-&gt;tx_power_user_lmt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t iwl4965_store_tx_power(struct device *d,</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 iwl_priv *priv = dev_get_drvdata(d);</div><div class='del'>-	unsigned long val;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = strict_strtoul(buf, 10, &amp;val);</div><div class='del'>-	if (ret)</div><div class='del'>-		IWL_INFO(priv, "%s is not in decimal form.\n", buf);</div><div class='del'>-	else {</div><div class='del'>-		ret = iwl_legacy_set_tx_power(priv, val, false);</div><div class='del'>-		if (ret)</div><div class='del'>-			IWL_ERR(priv, "failed setting tx power (0x%d).\n",</div><div class='del'>-				ret);</div><div class='del'>-		else</div><div class='del'>-			ret = count;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEVICE_ATTR(tx_power, S_IWUSR | S_IRUGO,</div><div class='del'>-			iwl4965_show_tx_power, iwl4965_store_tx_power);</div><div class='del'>-</div><div class='del'>-static struct attribute *iwl_sysfs_entries[] = {</div><div class='del'>-	&amp;dev_attr_temperature.attr,</div><div class='del'>-	&amp;dev_attr_tx_power.attr,</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-	&amp;dev_attr_debug_level.attr,</div><div class='del'>-#endif</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct attribute_group iwl_attribute_group = {</div><div class='del'>-	.name = NULL,		/* put in device directory */</div><div class='del'>-	.attrs = iwl_sysfs_entries,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * uCode download functions</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-static void iwl4965_dealloc_ucode_pci(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	iwl_legacy_free_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_code);</div><div class='del'>-	iwl_legacy_free_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_data);</div><div class='del'>-	iwl_legacy_free_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_data_backup);</div><div class='del'>-	iwl_legacy_free_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_init);</div><div class='del'>-	iwl_legacy_free_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_init_data);</div><div class='del'>-	iwl_legacy_free_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_boot);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_nic_start(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	/* Remove all resets to allow NIC to operate */</div><div class='del'>-	iwl_write32(priv, CSR_RESET, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_ucode_callback(const struct firmware *ucode_raw,</div><div class='del'>-					void *context);</div><div class='del'>-static int iwl4965_mac_setup_register(struct iwl_priv *priv,</div><div class='del'>-						u32 max_probe_length);</div><div class='del'>-</div><div class='del'>-static int __must_check iwl4965_request_firmware(struct iwl_priv *priv, bool first)</div><div class='del'>-{</div><div class='del'>-	const char *name_pre = priv-&gt;cfg-&gt;fw_name_pre;</div><div class='del'>-	char tag[8];</div><div class='del'>-</div><div class='del'>-	if (first) {</div><div class='del'>-		priv-&gt;fw_index = priv-&gt;cfg-&gt;ucode_api_max;</div><div class='del'>-		sprintf(tag, "%d", priv-&gt;fw_index);</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;fw_index--;</div><div class='del'>-		sprintf(tag, "%d", priv-&gt;fw_index);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;fw_index &lt; priv-&gt;cfg-&gt;ucode_api_min) {</div><div class='del'>-		IWL_ERR(priv, "no suitable firmware found!\n");</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sprintf(priv-&gt;firmware_name, "%s%s%s", name_pre, tag, ".ucode");</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "attempting to load firmware '%s'\n",</div><div class='del'>-		       priv-&gt;firmware_name);</div><div class='del'>-</div><div class='del'>-	return request_firmware_nowait(THIS_MODULE, 1, priv-&gt;firmware_name,</div><div class='del'>-				       &amp;priv-&gt;pci_dev-&gt;dev, GFP_KERNEL, priv,</div><div class='del'>-				       iwl4965_ucode_callback);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct iwl4965_firmware_pieces {</div><div class='del'>-	const void *inst, *data, *init, *init_data, *boot;</div><div class='del'>-	size_t inst_size, data_size, init_size, init_data_size, boot_size;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int iwl4965_load_firmware(struct iwl_priv *priv,</div><div class='del'>-				       const struct firmware *ucode_raw,</div><div class='del'>-				       struct iwl4965_firmware_pieces *pieces)</div><div class='del'>-{</div><div class='del'>-	struct iwl_ucode_header *ucode = (void *)ucode_raw-&gt;data;</div><div class='del'>-	u32 api_ver, hdr_size;</div><div class='del'>-	const u8 *src;</div><div class='del'>-</div><div class='del'>-	priv-&gt;ucode_ver = le32_to_cpu(ucode-&gt;ver);</div><div class='del'>-	api_ver = IWL_UCODE_API(priv-&gt;ucode_ver);</div><div class='del'>-</div><div class='del'>-	switch (api_ver) {</div><div class='del'>-	default:</div><div class='del'>-	case 0:</div><div class='del'>-	case 1:</div><div class='del'>-	case 2:</div><div class='del'>-		hdr_size = 24;</div><div class='del'>-		if (ucode_raw-&gt;size &lt; hdr_size) {</div><div class='del'>-			IWL_ERR(priv, "File size too small!\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		pieces-&gt;inst_size = le32_to_cpu(ucode-&gt;v1.inst_size);</div><div class='del'>-		pieces-&gt;data_size = le32_to_cpu(ucode-&gt;v1.data_size);</div><div class='del'>-		pieces-&gt;init_size = le32_to_cpu(ucode-&gt;v1.init_size);</div><div class='del'>-		pieces-&gt;init_data_size =</div><div class='del'>-				le32_to_cpu(ucode-&gt;v1.init_data_size);</div><div class='del'>-		pieces-&gt;boot_size = le32_to_cpu(ucode-&gt;v1.boot_size);</div><div class='del'>-		src = ucode-&gt;v1.data;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Verify size of file vs. image size info in file's header */</div><div class='del'>-	if (ucode_raw-&gt;size != hdr_size + pieces-&gt;inst_size +</div><div class='del'>-				pieces-&gt;data_size + pieces-&gt;init_size +</div><div class='del'>-				pieces-&gt;init_data_size + pieces-&gt;boot_size) {</div><div class='del'>-</div><div class='del'>-		IWL_ERR(priv,</div><div class='del'>-			"uCode file size %d does not match expected size\n",</div><div class='del'>-			(int)ucode_raw-&gt;size);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pieces-&gt;inst = src;</div><div class='del'>-	src += pieces-&gt;inst_size;</div><div class='del'>-	pieces-&gt;data = src;</div><div class='del'>-	src += pieces-&gt;data_size;</div><div class='del'>-	pieces-&gt;init = src;</div><div class='del'>-	src += pieces-&gt;init_size;</div><div class='del'>-	pieces-&gt;init_data = src;</div><div class='del'>-	src += pieces-&gt;init_data_size;</div><div class='del'>-	pieces-&gt;boot = src;</div><div class='del'>-	src += pieces-&gt;boot_size;</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'>- * iwl4965_ucode_callback - callback when firmware was loaded</div><div class='del'>- *</div><div class='del'>- * If loaded successfully, copies the firmware into buffers</div><div class='del'>- * for the card to fetch (via DMA).</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-iwl4965_ucode_callback(const struct firmware *ucode_raw, void *context)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = context;</div><div class='del'>-	struct iwl_ucode_header *ucode;</div><div class='del'>-	int err;</div><div class='del'>-	struct iwl4965_firmware_pieces pieces;</div><div class='del'>-	const unsigned int api_max = priv-&gt;cfg-&gt;ucode_api_max;</div><div class='del'>-	const unsigned int api_min = priv-&gt;cfg-&gt;ucode_api_min;</div><div class='del'>-	u32 api_ver;</div><div class='del'>-</div><div class='del'>-	u32 max_probe_length = 200;</div><div class='del'>-	u32 standard_phy_calibration_size =</div><div class='del'>-			IWL_DEFAULT_STANDARD_PHY_CALIBRATE_TBL_SIZE;</div><div class='del'>-</div><div class='del'>-	memset(&amp;pieces, 0, sizeof(pieces));</div><div class='del'>-</div><div class='del'>-	if (!ucode_raw) {</div><div class='del'>-		if (priv-&gt;fw_index &lt;= priv-&gt;cfg-&gt;ucode_api_max)</div><div class='del'>-			IWL_ERR(priv,</div><div class='del'>-				"request for firmware file '%s' failed.\n",</div><div class='del'>-				priv-&gt;firmware_name);</div><div class='del'>-		goto try_again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Loaded firmware file '%s' (%zd bytes).\n",</div><div class='del'>-		       priv-&gt;firmware_name, ucode_raw-&gt;size);</div><div class='del'>-</div><div class='del'>-	/* Make sure that we got at least the API version number */</div><div class='del'>-	if (ucode_raw-&gt;size &lt; 4) {</div><div class='del'>-		IWL_ERR(priv, "File size way too small!\n");</div><div class='del'>-		goto try_again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Data from ucode file:  header followed by uCode images */</div><div class='del'>-	ucode = (struct iwl_ucode_header *)ucode_raw-&gt;data;</div><div class='del'>-</div><div class='del'>-	err = iwl4965_load_firmware(priv, ucode_raw, &amp;pieces);</div><div class='del'>-</div><div class='del'>-	if (err)</div><div class='del'>-		goto try_again;</div><div class='del'>-</div><div class='del'>-	api_ver = IWL_UCODE_API(priv-&gt;ucode_ver);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * api_ver should match the api version forming part of the</div><div class='del'>-	 * firmware filename ... but we don't check for that and only rely</div><div class='del'>-	 * on the API version read from firmware header from here on forward</div><div class='del'>-	 */</div><div class='del'>-	if (api_ver &lt; api_min || api_ver &gt; api_max) {</div><div class='del'>-		IWL_ERR(priv,</div><div class='del'>-			"Driver unable to support your firmware API. "</div><div class='del'>-			"Driver supports v%u, firmware is v%u.\n",</div><div class='del'>-			api_max, api_ver);</div><div class='del'>-		goto try_again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (api_ver != api_max)</div><div class='del'>-		IWL_ERR(priv,</div><div class='del'>-			"Firmware has old API version. Expected v%u, "</div><div class='del'>-			"got v%u. New firmware can be obtained "</div><div class='del'>-			"from http://www.intellinuxwireless.org.\n",</div><div class='del'>-			api_max, api_ver);</div><div class='del'>-</div><div class='del'>-	IWL_INFO(priv, "loaded firmware version %u.%u.%u.%u\n",</div><div class='del'>-		 IWL_UCODE_MAJOR(priv-&gt;ucode_ver),</div><div class='del'>-		 IWL_UCODE_MINOR(priv-&gt;ucode_ver),</div><div class='del'>-		 IWL_UCODE_API(priv-&gt;ucode_ver),</div><div class='del'>-		 IWL_UCODE_SERIAL(priv-&gt;ucode_ver));</div><div class='del'>-</div><div class='del'>-	snprintf(priv-&gt;hw-&gt;wiphy-&gt;fw_version,</div><div class='del'>-		 sizeof(priv-&gt;hw-&gt;wiphy-&gt;fw_version),</div><div class='del'>-		 "%u.%u.%u.%u",</div><div class='del'>-		 IWL_UCODE_MAJOR(priv-&gt;ucode_ver),</div><div class='del'>-		 IWL_UCODE_MINOR(priv-&gt;ucode_ver),</div><div class='del'>-		 IWL_UCODE_API(priv-&gt;ucode_ver),</div><div class='del'>-		 IWL_UCODE_SERIAL(priv-&gt;ucode_ver));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For any of the failures below (before allocating pci memory)</div><div class='del'>-	 * we will try to load a version with a smaller API -- maybe the</div><div class='del'>-	 * user just got a corrupted version of the latest API.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "f/w package hdr ucode version raw = 0x%x\n",</div><div class='del'>-		       priv-&gt;ucode_ver);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "f/w package hdr runtime inst size = %Zd\n",</div><div class='del'>-		       pieces.inst_size);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "f/w package hdr runtime data size = %Zd\n",</div><div class='del'>-		       pieces.data_size);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "f/w package hdr init inst size = %Zd\n",</div><div class='del'>-		       pieces.init_size);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "f/w package hdr init data size = %Zd\n",</div><div class='del'>-		       pieces.init_data_size);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "f/w package hdr boot inst size = %Zd\n",</div><div class='del'>-		       pieces.boot_size);</div><div class='del'>-</div><div class='del'>-	/* Verify that uCode images will fit in card's SRAM */</div><div class='del'>-	if (pieces.inst_size &gt; priv-&gt;hw_params.max_inst_size) {</div><div class='del'>-		IWL_ERR(priv, "uCode instr len %Zd too large to fit in\n",</div><div class='del'>-			pieces.inst_size);</div><div class='del'>-		goto try_again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pieces.data_size &gt; priv-&gt;hw_params.max_data_size) {</div><div class='del'>-		IWL_ERR(priv, "uCode data len %Zd too large to fit in\n",</div><div class='del'>-			pieces.data_size);</div><div class='del'>-		goto try_again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pieces.init_size &gt; priv-&gt;hw_params.max_inst_size) {</div><div class='del'>-		IWL_ERR(priv, "uCode init instr len %Zd too large to fit in\n",</div><div class='del'>-			pieces.init_size);</div><div class='del'>-		goto try_again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pieces.init_data_size &gt; priv-&gt;hw_params.max_data_size) {</div><div class='del'>-		IWL_ERR(priv, "uCode init data len %Zd too large to fit in\n",</div><div class='del'>-			pieces.init_data_size);</div><div class='del'>-		goto try_again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pieces.boot_size &gt; priv-&gt;hw_params.max_bsm_size) {</div><div class='del'>-		IWL_ERR(priv, "uCode boot instr len %Zd too large to fit in\n",</div><div class='del'>-			pieces.boot_size);</div><div class='del'>-		goto try_again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Allocate ucode buffers for card's bus-master loading ... */</div><div class='del'>-</div><div class='del'>-	/* Runtime instructions and 2 copies of data:</div><div class='del'>-	 * 1) unmodified from disk</div><div class='del'>-	 * 2) backup cache for save/restore during power-downs */</div><div class='del'>-	priv-&gt;ucode_code.len = pieces.inst_size;</div><div class='del'>-	iwl_legacy_alloc_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_code);</div><div class='del'>-</div><div class='del'>-	priv-&gt;ucode_data.len = pieces.data_size;</div><div class='del'>-	iwl_legacy_alloc_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_data);</div><div class='del'>-</div><div class='del'>-	priv-&gt;ucode_data_backup.len = pieces.data_size;</div><div class='del'>-	iwl_legacy_alloc_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_data_backup);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;ucode_code.v_addr || !priv-&gt;ucode_data.v_addr ||</div><div class='del'>-	    !priv-&gt;ucode_data_backup.v_addr)</div><div class='del'>-		goto err_pci_alloc;</div><div class='del'>-</div><div class='del'>-	/* Initialization instructions and data */</div><div class='del'>-	if (pieces.init_size &amp;&amp; pieces.init_data_size) {</div><div class='del'>-		priv-&gt;ucode_init.len = pieces.init_size;</div><div class='del'>-		iwl_legacy_alloc_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_init);</div><div class='del'>-</div><div class='del'>-		priv-&gt;ucode_init_data.len = pieces.init_data_size;</div><div class='del'>-		iwl_legacy_alloc_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_init_data);</div><div class='del'>-</div><div class='del'>-		if (!priv-&gt;ucode_init.v_addr || !priv-&gt;ucode_init_data.v_addr)</div><div class='del'>-			goto err_pci_alloc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Bootstrap (instructions only, no data) */</div><div class='del'>-	if (pieces.boot_size) {</div><div class='del'>-		priv-&gt;ucode_boot.len = pieces.boot_size;</div><div class='del'>-		iwl_legacy_alloc_fw_desc(priv-&gt;pci_dev, &amp;priv-&gt;ucode_boot);</div><div class='del'>-</div><div class='del'>-		if (!priv-&gt;ucode_boot.v_addr)</div><div class='del'>-			goto err_pci_alloc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now that we can no longer fail, copy information */</div><div class='del'>-</div><div class='del'>-	priv-&gt;sta_key_max_num = STA_KEY_MAX_NUM;</div><div class='del'>-</div><div class='del'>-	/* Copy images into buffers for card's bus-master reads ... */</div><div class='del'>-</div><div class='del'>-	/* Runtime instructions (first block of data in file) */</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Copying (but not loading) uCode instr len %Zd\n",</div><div class='del'>-			pieces.inst_size);</div><div class='del'>-	memcpy(priv-&gt;ucode_code.v_addr, pieces.inst, pieces.inst_size);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "uCode instr buf vaddr = 0x%p, paddr = 0x%08x\n",</div><div class='del'>-		priv-&gt;ucode_code.v_addr, (u32)priv-&gt;ucode_code.p_addr);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Runtime data</div><div class='del'>-	 * NOTE:  Copy into backup buffer will be done in iwl_up()</div><div class='del'>-	 */</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Copying (but not loading) uCode data len %Zd\n",</div><div class='del'>-			pieces.data_size);</div><div class='del'>-	memcpy(priv-&gt;ucode_data.v_addr, pieces.data, pieces.data_size);</div><div class='del'>-	memcpy(priv-&gt;ucode_data_backup.v_addr, pieces.data, pieces.data_size);</div><div class='del'>-</div><div class='del'>-	/* Initialization instructions */</div><div class='del'>-	if (pieces.init_size) {</div><div class='del'>-		IWL_DEBUG_INFO(priv,</div><div class='del'>-				"Copying (but not loading) init instr len %Zd\n",</div><div class='del'>-				pieces.init_size);</div><div class='del'>-		memcpy(priv-&gt;ucode_init.v_addr, pieces.init, pieces.init_size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Initialization data */</div><div class='del'>-	if (pieces.init_data_size) {</div><div class='del'>-		IWL_DEBUG_INFO(priv,</div><div class='del'>-				"Copying (but not loading) init data len %Zd\n",</div><div class='del'>-			       pieces.init_data_size);</div><div class='del'>-		memcpy(priv-&gt;ucode_init_data.v_addr, pieces.init_data,</div><div class='del'>-		       pieces.init_data_size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Bootstrap instructions */</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Copying (but not loading) boot instr len %Zd\n",</div><div class='del'>-			pieces.boot_size);</div><div class='del'>-	memcpy(priv-&gt;ucode_boot.v_addr, pieces.boot, pieces.boot_size);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * figure out the offset of chain noise reset and gain commands</div><div class='del'>-	 * base on the size of standard phy calibration commands table size</div><div class='del'>-	 */</div><div class='del'>-	priv-&gt;_4965.phy_calib_chain_noise_reset_cmd =</div><div class='del'>-		standard_phy_calibration_size;</div><div class='del'>-	priv-&gt;_4965.phy_calib_chain_noise_gain_cmd =</div><div class='del'>-		standard_phy_calibration_size + 1;</div><div class='del'>-</div><div class='del'>-	/**************************************************</div><div class='del'>-	 * This is still part of probe() in a sense...</div><div class='del'>-	 *</div><div class='del'>-	 * 9. Setup and register with mac80211 and debugfs</div><div class='del'>-	 **************************************************/</div><div class='del'>-	err = iwl4965_mac_setup_register(priv, max_probe_length);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_unbind;</div><div class='del'>-</div><div class='del'>-	err = iwl_legacy_dbgfs_register(priv, DRV_NAME);</div><div class='del'>-	if (err)</div><div class='del'>-		IWL_ERR(priv,</div><div class='del'>-		"failed to create debugfs files. Ignoring error: %d\n", err);</div><div class='del'>-</div><div class='del'>-	err = sysfs_create_group(&amp;priv-&gt;pci_dev-&gt;dev.kobj,</div><div class='del'>-					&amp;iwl_attribute_group);</div><div class='del'>-	if (err) {</div><div class='del'>-		IWL_ERR(priv, "failed to create sysfs device attributes\n");</div><div class='del'>-		goto out_unbind;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We have our copies now, allow OS release its copies */</div><div class='del'>-	release_firmware(ucode_raw);</div><div class='del'>-	complete(&amp;priv-&gt;_4965.firmware_loading_complete);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>- try_again:</div><div class='del'>-	/* try next, if any */</div><div class='del'>-	if (iwl4965_request_firmware(priv, false))</div><div class='del'>-		goto out_unbind;</div><div class='del'>-	release_firmware(ucode_raw);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>- err_pci_alloc:</div><div class='del'>-	IWL_ERR(priv, "failed to allocate pci memory\n");</div><div class='del'>-	iwl4965_dealloc_ucode_pci(priv);</div><div class='del'>- out_unbind:</div><div class='del'>-	complete(&amp;priv-&gt;_4965.firmware_loading_complete);</div><div class='del'>-	device_release_driver(&amp;priv-&gt;pci_dev-&gt;dev);</div><div class='del'>-	release_firmware(ucode_raw);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char * const desc_lookup_text[] = {</div><div class='del'>-	"OK",</div><div class='del'>-	"FAIL",</div><div class='del'>-	"BAD_PARAM",</div><div class='del'>-	"BAD_CHECKSUM",</div><div class='del'>-	"NMI_INTERRUPT_WDG",</div><div class='del'>-	"SYSASSERT",</div><div class='del'>-	"FATAL_ERROR",</div><div class='del'>-	"BAD_COMMAND",</div><div class='del'>-	"HW_ERROR_TUNE_LOCK",</div><div class='del'>-	"HW_ERROR_TEMPERATURE",</div><div class='del'>-	"ILLEGAL_CHAN_FREQ",</div><div class='del'>-	"VCC_NOT_STABLE",</div><div class='del'>-	"FH_ERROR",</div><div class='del'>-	"NMI_INTERRUPT_HOST",</div><div class='del'>-	"NMI_INTERRUPT_ACTION_PT",</div><div class='del'>-	"NMI_INTERRUPT_UNKNOWN",</div><div class='del'>-	"UCODE_VERSION_MISMATCH",</div><div class='del'>-	"HW_ERROR_ABS_LOCK",</div><div class='del'>-	"HW_ERROR_CAL_LOCK_FAIL",</div><div class='del'>-	"NMI_INTERRUPT_INST_ACTION_PT",</div><div class='del'>-	"NMI_INTERRUPT_DATA_ACTION_PT",</div><div class='del'>-	"NMI_TRM_HW_ER",</div><div class='del'>-	"NMI_INTERRUPT_TRM",</div><div class='del'>-	"NMI_INTERRUPT_BREAK_POINT",</div><div class='del'>-	"DEBUG_0",</div><div class='del'>-	"DEBUG_1",</div><div class='del'>-	"DEBUG_2",</div><div class='del'>-	"DEBUG_3",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct { char *name; u8 num; } advanced_lookup[] = {</div><div class='del'>-	{ "NMI_INTERRUPT_WDG", 0x34 },</div><div class='del'>-	{ "SYSASSERT", 0x35 },</div><div class='del'>-	{ "UCODE_VERSION_MISMATCH", 0x37 },</div><div class='del'>-	{ "BAD_COMMAND", 0x38 },</div><div class='del'>-	{ "NMI_INTERRUPT_DATA_ACTION_PT", 0x3C },</div><div class='del'>-	{ "FATAL_ERROR", 0x3D },</div><div class='del'>-	{ "NMI_TRM_HW_ERR", 0x46 },</div><div class='del'>-	{ "NMI_INTERRUPT_TRM", 0x4C },</div><div class='del'>-	{ "NMI_INTERRUPT_BREAK_POINT", 0x54 },</div><div class='del'>-	{ "NMI_INTERRUPT_WDG_RXF_FULL", 0x5C },</div><div class='del'>-	{ "NMI_INTERRUPT_WDG_NO_RBD_RXF_FULL", 0x64 },</div><div class='del'>-	{ "NMI_INTERRUPT_HOST", 0x66 },</div><div class='del'>-	{ "NMI_INTERRUPT_ACTION_PT", 0x7C },</div><div class='del'>-	{ "NMI_INTERRUPT_UNKNOWN", 0x84 },</div><div class='del'>-	{ "NMI_INTERRUPT_INST_ACTION_PT", 0x86 },</div><div class='del'>-	{ "ADVANCED_SYSASSERT", 0 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *iwl4965_desc_lookup(u32 num)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int max = ARRAY_SIZE(desc_lookup_text);</div><div class='del'>-</div><div class='del'>-	if (num &lt; max)</div><div class='del'>-		return desc_lookup_text[num];</div><div class='del'>-</div><div class='del'>-	max = ARRAY_SIZE(advanced_lookup) - 1;</div><div class='del'>-	for (i = 0; i &lt; max; i++) {</div><div class='del'>-		if (advanced_lookup[i].num == num)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	return advanced_lookup[i].name;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define ERROR_START_OFFSET  (1 * sizeof(u32))</div><div class='del'>-#define ERROR_ELEM_SIZE     (7 * sizeof(u32))</div><div class='del'>-</div><div class='del'>-void iwl4965_dump_nic_error_log(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	u32 data2, line;</div><div class='del'>-	u32 desc, time, count, base, data1;</div><div class='del'>-	u32 blink1, blink2, ilink1, ilink2;</div><div class='del'>-	u32 pc, hcmd;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;ucode_type == UCODE_INIT) {</div><div class='del'>-		base = le32_to_cpu(priv-&gt;card_alive_init.error_event_table_ptr);</div><div class='del'>-	} else {</div><div class='del'>-		base = le32_to_cpu(priv-&gt;card_alive.error_event_table_ptr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;cfg-&gt;ops-&gt;lib-&gt;is_valid_rtc_data_addr(base)) {</div><div class='del'>-		IWL_ERR(priv,</div><div class='del'>-			"Not valid error log pointer 0x%08X for %s uCode\n",</div><div class='del'>-			base, (priv-&gt;ucode_type == UCODE_INIT) ? "Init" : "RT");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	count = iwl_legacy_read_targ_mem(priv, base);</div><div class='del'>-</div><div class='del'>-	if (ERROR_START_OFFSET &lt;= count * ERROR_ELEM_SIZE) {</div><div class='del'>-		IWL_ERR(priv, "Start IWL Error Log Dump:\n");</div><div class='del'>-		IWL_ERR(priv, "Status: 0x%08lX, count: %d\n",</div><div class='del'>-			priv-&gt;status, count);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	desc = iwl_legacy_read_targ_mem(priv, base + 1 * sizeof(u32));</div><div class='del'>-	priv-&gt;isr_stats.err_code = desc;</div><div class='del'>-	pc = iwl_legacy_read_targ_mem(priv, base + 2 * sizeof(u32));</div><div class='del'>-	blink1 = iwl_legacy_read_targ_mem(priv, base + 3 * sizeof(u32));</div><div class='del'>-	blink2 = iwl_legacy_read_targ_mem(priv, base + 4 * sizeof(u32));</div><div class='del'>-	ilink1 = iwl_legacy_read_targ_mem(priv, base + 5 * sizeof(u32));</div><div class='del'>-	ilink2 = iwl_legacy_read_targ_mem(priv, base + 6 * sizeof(u32));</div><div class='del'>-	data1 = iwl_legacy_read_targ_mem(priv, base + 7 * sizeof(u32));</div><div class='del'>-	data2 = iwl_legacy_read_targ_mem(priv, base + 8 * sizeof(u32));</div><div class='del'>-	line = iwl_legacy_read_targ_mem(priv, base + 9 * sizeof(u32));</div><div class='del'>-	time = iwl_legacy_read_targ_mem(priv, base + 11 * sizeof(u32));</div><div class='del'>-	hcmd = iwl_legacy_read_targ_mem(priv, base + 22 * sizeof(u32));</div><div class='del'>-</div><div class='del'>-	trace_iwlwifi_legacy_dev_ucode_error(priv, desc,</div><div class='del'>-					time, data1, data2, line,</div><div class='del'>-				      blink1, blink2, ilink1, ilink2);</div><div class='del'>-</div><div class='del'>-	IWL_ERR(priv, "Desc                                  Time       "</div><div class='del'>-		"data1      data2      line\n");</div><div class='del'>-	IWL_ERR(priv, "%-28s (0x%04X) %010u 0x%08X 0x%08X %u\n",</div><div class='del'>-		iwl4965_desc_lookup(desc), desc, time, data1, data2, line);</div><div class='del'>-	IWL_ERR(priv, "pc      blink1  blink2  ilink1  ilink2  hcmd\n");</div><div class='del'>-	IWL_ERR(priv, "0x%05X 0x%05X 0x%05X 0x%05X 0x%05X 0x%05X\n",</div><div class='del'>-		pc, blink1, blink2, ilink1, ilink2, hcmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_rf_kill_ct_config(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_ct_kill_config cmd;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR,</div><div class='del'>-		    CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	cmd.critical_temperature_R =</div><div class='del'>-		cpu_to_le32(priv-&gt;hw_params.ct_kill_threshold);</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_send_cmd_pdu(priv, REPLY_CT_KILL_CONFIG_CMD,</div><div class='del'>-			       sizeof(cmd), &amp;cmd);</div><div class='del'>-	if (ret)</div><div class='del'>-		IWL_ERR(priv, "REPLY_CT_KILL_CONFIG_CMD failed\n");</div><div class='del'>-	else</div><div class='del'>-		IWL_DEBUG_INFO(priv, "REPLY_CT_KILL_CONFIG_CMD "</div><div class='del'>-				"succeeded, "</div><div class='del'>-				"critical temperature is %d\n",</div><div class='del'>-				priv-&gt;hw_params.ct_kill_threshold);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const s8 default_queue_to_tx_fifo[] = {</div><div class='del'>-	IWL_TX_FIFO_VO,</div><div class='del'>-	IWL_TX_FIFO_VI,</div><div class='del'>-	IWL_TX_FIFO_BE,</div><div class='del'>-	IWL_TX_FIFO_BK,</div><div class='del'>-	IWL49_CMD_FIFO_NUM,</div><div class='del'>-	IWL_TX_FIFO_UNUSED,</div><div class='del'>-	IWL_TX_FIFO_UNUSED,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int iwl4965_alive_notify(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	u32 a;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int i, chan;</div><div class='del'>-	u32 reg_val;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Clear 4965's internal Tx Scheduler data base */</div><div class='del'>-	priv-&gt;scd_base_addr = iwl_legacy_read_prph(priv,</div><div class='del'>-					IWL49_SCD_SRAM_BASE_ADDR);</div><div class='del'>-	a = priv-&gt;scd_base_addr + IWL49_SCD_CONTEXT_DATA_OFFSET;</div><div class='del'>-	for (; a &lt; priv-&gt;scd_base_addr + IWL49_SCD_TX_STTS_BITMAP_OFFSET; a += 4)</div><div class='del'>-		iwl_legacy_write_targ_mem(priv, a, 0);</div><div class='del'>-	for (; a &lt; priv-&gt;scd_base_addr + IWL49_SCD_TRANSLATE_TBL_OFFSET; a += 4)</div><div class='del'>-		iwl_legacy_write_targ_mem(priv, a, 0);</div><div class='del'>-	for (; a &lt; priv-&gt;scd_base_addr +</div><div class='del'>-	       IWL49_SCD_TRANSLATE_TBL_OFFSET_QUEUE(priv-&gt;hw_params.max_txq_num); a += 4)</div><div class='del'>-		iwl_legacy_write_targ_mem(priv, a, 0);</div><div class='del'>-</div><div class='del'>-	/* Tel 4965 where to find Tx byte count tables */</div><div class='del'>-	iwl_legacy_write_prph(priv, IWL49_SCD_DRAM_BASE_ADDR,</div><div class='del'>-			priv-&gt;scd_bc_tbls.dma &gt;&gt; 10);</div><div class='del'>-</div><div class='del'>-	/* Enable DMA channel */</div><div class='del'>-	for (chan = 0; chan &lt; FH49_TCSR_CHNL_NUM ; chan++)</div><div class='del'>-		iwl_legacy_write_direct32(priv,</div><div class='del'>-				FH_TCSR_CHNL_TX_CONFIG_REG(chan),</div><div class='del'>-				FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE |</div><div class='del'>-				FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE);</div><div class='del'>-</div><div class='del'>-	/* Update FH chicken bits */</div><div class='del'>-	reg_val = iwl_legacy_read_direct32(priv, FH_TX_CHICKEN_BITS_REG);</div><div class='del'>-	iwl_legacy_write_direct32(priv, FH_TX_CHICKEN_BITS_REG,</div><div class='del'>-			   reg_val | FH_TX_CHICKEN_BITS_SCD_AUTO_RETRY_EN);</div><div class='del'>-</div><div class='del'>-	/* Disable chain mode for all queues */</div><div class='del'>-	iwl_legacy_write_prph(priv, IWL49_SCD_QUEUECHAIN_SEL, 0);</div><div class='del'>-</div><div class='del'>-	/* Initialize each Tx queue (including the command queue) */</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params.max_txq_num; i++) {</div><div class='del'>-</div><div class='del'>-		/* TFD circular buffer read/write indexes */</div><div class='del'>-		iwl_legacy_write_prph(priv, IWL49_SCD_QUEUE_RDPTR(i), 0);</div><div class='del'>-		iwl_legacy_write_direct32(priv, HBUS_TARG_WRPTR, 0 | (i &lt;&lt; 8));</div><div class='del'>-</div><div class='del'>-		/* Max Tx Window size for Scheduler-ACK mode */</div><div class='del'>-		iwl_legacy_write_targ_mem(priv, priv-&gt;scd_base_addr +</div><div class='del'>-				IWL49_SCD_CONTEXT_QUEUE_OFFSET(i),</div><div class='del'>-				(SCD_WIN_SIZE &lt;&lt;</div><div class='del'>-				IWL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_POS) &amp;</div><div class='del'>-				IWL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK);</div><div class='del'>-</div><div class='del'>-		/* Frame limit */</div><div class='del'>-		iwl_legacy_write_targ_mem(priv, priv-&gt;scd_base_addr +</div><div class='del'>-				IWL49_SCD_CONTEXT_QUEUE_OFFSET(i) +</div><div class='del'>-				sizeof(u32),</div><div class='del'>-				(SCD_FRAME_LIMIT &lt;&lt;</div><div class='del'>-				IWL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) &amp;</div><div class='del'>-				IWL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	iwl_legacy_write_prph(priv, IWL49_SCD_INTERRUPT_MASK,</div><div class='del'>-				 (1 &lt;&lt; priv-&gt;hw_params.max_txq_num) - 1);</div><div class='del'>-</div><div class='del'>-	/* Activate all Tx DMA/FIFO channels */</div><div class='del'>-	iwl4965_txq_set_sched(priv, IWL_MASK(0, 6));</div><div class='del'>-</div><div class='del'>-	iwl4965_set_wr_ptrs(priv, IWL_DEFAULT_CMD_QUEUE_NUM, 0);</div><div class='del'>-</div><div class='del'>-	/* make sure all queue are not stopped */</div><div class='del'>-	memset(&amp;priv-&gt;queue_stopped[0], 0, sizeof(priv-&gt;queue_stopped));</div><div class='del'>-	for (i = 0; i &lt; 4; i++)</div><div class='del'>-		atomic_set(&amp;priv-&gt;queue_stop_count[i], 0);</div><div class='del'>-</div><div class='del'>-	/* reset to 0 to enable all the queue first */</div><div class='del'>-	priv-&gt;txq_ctx_active_msk = 0;</div><div class='del'>-	/* Map each Tx/cmd queue to its corresponding fifo */</div><div class='del'>-	BUILD_BUG_ON(ARRAY_SIZE(default_queue_to_tx_fifo) != 7);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(default_queue_to_tx_fifo); i++) {</div><div class='del'>-		int ac = default_queue_to_tx_fifo[i];</div><div class='del'>-</div><div class='del'>-		iwl_txq_ctx_activate(priv, i);</div><div class='del'>-</div><div class='del'>-		if (ac == IWL_TX_FIFO_UNUSED)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		iwl4965_tx_queue_set_status(priv, &amp;priv-&gt;txq[i], ac, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, 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'>- * iwl4965_alive_start - called after REPLY_ALIVE notification received</div><div class='del'>- *                   from protocol/runtime uCode (initialization uCode's</div><div class='del'>- *                   Alive gets handled by iwl_init_alive_start()).</div><div class='del'>- */</div><div class='del'>-static void iwl4965_alive_start(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Runtime Alive received.\n");</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;card_alive.is_valid != UCODE_VALID_OK) {</div><div class='del'>-		/* We had an error bringing up the hardware, so take it</div><div class='del'>-		 * all the way back down so we can try again */</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Alive failed.\n");</div><div class='del'>-		goto restart;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Initialize uCode has loaded Runtime uCode ... verify inst image.</div><div class='del'>-	 * This is a paranoid check, because we would not have gotten the</div><div class='del'>-	 * "runtime" alive if code weren't properly loaded.  */</div><div class='del'>-	if (iwl4965_verify_ucode(priv)) {</div><div class='del'>-		/* Runtime instruction load was bad;</div><div class='del'>-		 * take it all the way back down so we can try again */</div><div class='del'>-		IWL_DEBUG_INFO(priv, "Bad runtime uCode load.\n");</div><div class='del'>-		goto restart;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = iwl4965_alive_notify(priv);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_WARN(priv,</div><div class='del'>-			"Could not complete ALIVE transition [ntf]: %d\n", ret);</div><div class='del'>-		goto restart;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* After the ALIVE response, we can send host commands to the uCode */</div><div class='del'>-	set_bit(STATUS_ALIVE, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	/* Enable watchdog to monitor the driver tx queues */</div><div class='del'>-	iwl_legacy_setup_watchdog(priv);</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_is_rfkill(priv))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ieee80211_wake_queues(priv-&gt;hw);</div><div class='del'>-</div><div class='del'>-	priv-&gt;active_rate = IWL_RATES_MASK;</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_is_associated_ctx(ctx)) {</div><div class='del'>-		struct iwl_legacy_rxon_cmd *active_rxon =</div><div class='del'>-				(struct iwl_legacy_rxon_cmd *)&amp;ctx-&gt;active;</div><div class='del'>-		/* apply any changes in staging */</div><div class='del'>-		ctx-&gt;staging.filter_flags |= RXON_FILTER_ASSOC_MSK;</div><div class='del'>-		active_rxon-&gt;filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='del'>-	} else {</div><div class='del'>-		struct iwl_rxon_context *tmp;</div><div class='del'>-		/* Initialize our rx_config data */</div><div class='del'>-		for_each_context(priv, tmp)</div><div class='del'>-			iwl_legacy_connection_init_rx_config(priv, tmp);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain)</div><div class='del'>-			priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain(priv, ctx);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Configure bluetooth coexistence if enabled */</div><div class='del'>-	iwl_legacy_send_bt_config(priv);</div><div class='del'>-</div><div class='del'>-	iwl4965_reset_run_time_calib(priv);</div><div class='del'>-</div><div class='del'>-	set_bit(STATUS_READY, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	/* Configure the adapter for unassociated operation */</div><div class='del'>-	iwl_legacy_commit_rxon(priv, ctx);</div><div class='del'>-</div><div class='del'>-	/* At this point, the NIC is initialized and operational */</div><div class='del'>-	iwl4965_rf_kill_ct_config(priv);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "ALIVE processing complete.\n");</div><div class='del'>-	wake_up(&amp;priv-&gt;wait_command_queue);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_power_update_mode(priv, true);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Updated power mode\n");</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>- restart:</div><div class='del'>-	queue_work(priv-&gt;workqueue, &amp;priv-&gt;restart);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_cancel_deferred_work(struct iwl_priv *priv);</div><div class='del'>-</div><div class='del'>-static void __iwl4965_down(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int exit_pending;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, DRV_NAME " is going down\n");</div><div class='del'>-</div><div class='del'>-	iwl_legacy_scan_cancel_timeout(priv, 200);</div><div class='del'>-</div><div class='del'>-	exit_pending = test_and_set_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	/* Stop TX queues watchdog. We need to have STATUS_EXIT_PENDING bit set</div><div class='del'>-	 * to prevent rearm timer */</div><div class='del'>-	del_timer_sync(&amp;priv-&gt;watchdog);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_clear_ucode_stations(priv, NULL);</div><div class='del'>-	iwl_legacy_dealloc_bcast_stations(priv);</div><div class='del'>-	iwl_legacy_clear_driver_stations(priv);</div><div class='del'>-</div><div class='del'>-	/* Unblock any waiting calls */</div><div class='del'>-	wake_up_all(&amp;priv-&gt;wait_command_queue);</div><div class='del'>-</div><div class='del'>-	/* Wipe out the EXIT_PENDING status bit if we are not actually</div><div class='del'>-	 * exiting the module */</div><div class='del'>-	if (!exit_pending)</div><div class='del'>-		clear_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	/* stop and reset the on-board processor */</div><div class='del'>-	iwl_write32(priv, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);</div><div class='del'>-</div><div class='del'>-	/* tell the device to stop sending interrupts */</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	iwl_legacy_disable_interrupts(priv);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-	iwl4965_synchronize_irq(priv);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;mac80211_registered)</div><div class='del'>-		ieee80211_stop_queues(priv-&gt;hw);</div><div class='del'>-</div><div class='del'>-	/* If we have not previously called iwl_init() then</div><div class='del'>-	 * clear all bits but the RF Kill bit and return */</div><div class='del'>-	if (!iwl_legacy_is_init(priv)) {</div><div class='del'>-		priv-&gt;status = test_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status) &lt;&lt;</div><div class='del'>-					STATUS_RF_KILL_HW |</div><div class='del'>-			       test_bit(STATUS_GEO_CONFIGURED, &amp;priv-&gt;status) &lt;&lt;</div><div class='del'>-					STATUS_GEO_CONFIGURED |</div><div class='del'>-			       test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status) &lt;&lt;</div><div class='del'>-					STATUS_EXIT_PENDING;</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* ...otherwise clear out all the status bits but the RF Kill</div><div class='del'>-	 * bit and continue taking the NIC down. */</div><div class='del'>-	priv-&gt;status &amp;= test_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status) &lt;&lt;</div><div class='del'>-				STATUS_RF_KILL_HW |</div><div class='del'>-			test_bit(STATUS_GEO_CONFIGURED, &amp;priv-&gt;status) &lt;&lt;</div><div class='del'>-				STATUS_GEO_CONFIGURED |</div><div class='del'>-			test_bit(STATUS_FW_ERROR, &amp;priv-&gt;status) &lt;&lt;</div><div class='del'>-				STATUS_FW_ERROR |</div><div class='del'>-		       test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status) &lt;&lt;</div><div class='del'>-				STATUS_EXIT_PENDING;</div><div class='del'>-</div><div class='del'>-	iwl4965_txq_ctx_stop(priv);</div><div class='del'>-	iwl4965_rxq_stop(priv);</div><div class='del'>-</div><div class='del'>-	/* Power-down device's busmaster DMA clocks */</div><div class='del'>-	iwl_legacy_write_prph(priv, APMG_CLK_DIS_REG, APMG_CLK_VAL_DMA_CLK_RQT);</div><div class='del'>-	udelay(5);</div><div class='del'>-</div><div class='del'>-	/* Make sure (redundant) we've released our request to stay awake */</div><div class='del'>-	iwl_legacy_clear_bit(priv, CSR_GP_CNTRL,</div><div class='del'>-				CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);</div><div class='del'>-</div><div class='del'>-	/* Stop the device, and put it in low power state */</div><div class='del'>-	iwl_legacy_apm_stop(priv);</div><div class='del'>-</div><div class='del'>- exit:</div><div class='del'>-	memset(&amp;priv-&gt;card_alive, 0, sizeof(struct iwl_alive_resp));</div><div class='del'>-</div><div class='del'>-	dev_kfree_skb(priv-&gt;beacon_skb);</div><div class='del'>-	priv-&gt;beacon_skb = NULL;</div><div class='del'>-</div><div class='del'>-	/* clear out any free frames */</div><div class='del'>-	iwl4965_clear_free_frames(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_down(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	__iwl4965_down(priv);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	iwl4965_cancel_deferred_work(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define HW_READY_TIMEOUT (50)</div><div class='del'>-</div><div class='del'>-static int iwl4965_set_hw_ready(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-		CSR_HW_IF_CONFIG_REG_BIT_NIC_READY);</div><div class='del'>-</div><div class='del'>-	/* See if we got it */</div><div class='del'>-	ret = iwl_poll_bit(priv, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-				CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,</div><div class='del'>-				CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,</div><div class='del'>-				HW_READY_TIMEOUT);</div><div class='del'>-	if (ret != -ETIMEDOUT)</div><div class='del'>-		priv-&gt;hw_ready = true;</div><div class='del'>-	else</div><div class='del'>-		priv-&gt;hw_ready = false;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "hardware %s\n",</div><div class='del'>-		      (priv-&gt;hw_ready == 1) ? "ready" : "not ready");</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl4965_prepare_card_hw(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "iwl4965_prepare_card_hw enter\n");</div><div class='del'>-</div><div class='del'>-	ret = iwl4965_set_hw_ready(priv);</div><div class='del'>-	if (priv-&gt;hw_ready)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* If HW is not ready, prepare the conditions to check again */</div><div class='del'>-	iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-			CSR_HW_IF_CONFIG_REG_PREPARE);</div><div class='del'>-</div><div class='del'>-	ret = iwl_poll_bit(priv, CSR_HW_IF_CONFIG_REG,</div><div class='del'>-			~CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE,</div><div class='del'>-			CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE, 150000);</div><div class='del'>-</div><div class='del'>-	/* HW should be ready by now, check again. */</div><div class='del'>-	if (ret != -ETIMEDOUT)</div><div class='del'>-		iwl4965_set_hw_ready(priv);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define MAX_HW_RESTARTS 5</div><div class='del'>-</div><div class='del'>-static int __iwl4965_up(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-	int i;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status)) {</div><div class='del'>-		IWL_WARN(priv, "Exit pending; will not bring the NIC up\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;ucode_data_backup.v_addr || !priv-&gt;ucode_data.v_addr) {</div><div class='del'>-		IWL_ERR(priv, "ucode not available for device bringup\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_context(priv, ctx) {</div><div class='del'>-		ret = iwl4965_alloc_bcast_station(priv, ctx);</div><div class='del'>-		if (ret) {</div><div class='del'>-			iwl_legacy_dealloc_bcast_stations(priv);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl4965_prepare_card_hw(priv);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;hw_ready) {</div><div class='del'>-		IWL_WARN(priv, "Exit HW not ready\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If platform's RF_KILL switch is NOT set to KILL */</div><div class='del'>-	if (iwl_read32(priv,</div><div class='del'>-		CSR_GP_CNTRL) &amp; CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)</div><div class='del'>-		clear_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-	else</div><div class='del'>-		set_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_is_rfkill(priv)) {</div><div class='del'>-		wiphy_rfkill_set_hw_state(priv-&gt;hw-&gt;wiphy, true);</div><div class='del'>-</div><div class='del'>-		iwl_legacy_enable_interrupts(priv);</div><div class='del'>-		IWL_WARN(priv, "Radio disabled by HW RF Kill switch\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_write32(priv, CSR_INT, 0xFFFFFFFF);</div><div class='del'>-</div><div class='del'>-	/* must be initialised before iwl_hw_nic_init */</div><div class='del'>-	priv-&gt;cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;</div><div class='del'>-</div><div class='del'>-	ret = iwl4965_hw_nic_init(priv);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "Unable to init nic\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* make sure rfkill handshake bits are cleared */</div><div class='del'>-	iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);</div><div class='del'>-	iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR,</div><div class='del'>-		    CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);</div><div class='del'>-</div><div class='del'>-	/* clear (again), then enable host interrupts */</div><div class='del'>-	iwl_write32(priv, CSR_INT, 0xFFFFFFFF);</div><div class='del'>-	iwl_legacy_enable_interrupts(priv);</div><div class='del'>-</div><div class='del'>-	/* really make sure rfkill handshake bits are cleared */</div><div class='del'>-	iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);</div><div class='del'>-	iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);</div><div class='del'>-</div><div class='del'>-	/* Copy original ucode data image from disk into backup cache.</div><div class='del'>-	 * This will be used to initialize the on-board processor's</div><div class='del'>-	 * data SRAM for a clean start when the runtime program first loads. */</div><div class='del'>-	memcpy(priv-&gt;ucode_data_backup.v_addr, priv-&gt;ucode_data.v_addr,</div><div class='del'>-	       priv-&gt;ucode_data.len);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_HW_RESTARTS; i++) {</div><div class='del'>-</div><div class='del'>-		/* load bootstrap state machine,</div><div class='del'>-		 * load bootstrap program into processor's memory,</div><div class='del'>-		 * prepare to load the "initialize" uCode */</div><div class='del'>-		ret = priv-&gt;cfg-&gt;ops-&gt;lib-&gt;load_ucode(priv);</div><div class='del'>-</div><div class='del'>-		if (ret) {</div><div class='del'>-			IWL_ERR(priv, "Unable to set up bootstrap uCode: %d\n",</div><div class='del'>-				ret);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* start card; "initialize" will load runtime ucode */</div><div class='del'>-		iwl4965_nic_start(priv);</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_INFO(priv, DRV_NAME " is coming up\n");</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status);</div><div class='del'>-	__iwl4965_down(priv);</div><div class='del'>-	clear_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	/* tried to restart and config the device for as long as our</div><div class='del'>-	 * patience could withstand */</div><div class='del'>-	IWL_ERR(priv, "Unable to initialize device after %d attempts.\n", i);</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>- *</div><div class='del'>- * Workqueue callbacks</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-static void iwl4965_bg_init_alive_start(struct work_struct *data)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv =</div><div class='del'>-	    container_of(data, struct iwl_priv, init_alive_start.work);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	priv-&gt;cfg-&gt;ops-&gt;lib-&gt;init_alive_start(priv);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_bg_alive_start(struct work_struct *data)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv =</div><div class='del'>-	    container_of(data, struct iwl_priv, alive_start.work);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	iwl4965_alive_start(priv);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_bg_run_time_calib_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = container_of(work, struct iwl_priv,</div><div class='del'>-			run_time_calib_work);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status) ||</div><div class='del'>-	    test_bit(STATUS_SCANNING, &amp;priv-&gt;status)) {</div><div class='del'>-		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;start_calib) {</div><div class='del'>-		iwl4965_chain_noise_calibration(priv,</div><div class='del'>-				(void *)&amp;priv-&gt;_4965.statistics);</div><div class='del'>-		iwl4965_sensitivity_calibration(priv,</div><div class='del'>-				(void *)&amp;priv-&gt;_4965.statistics);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_bg_restart(struct work_struct *data)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = container_of(data, struct iwl_priv, restart);</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (test_and_clear_bit(STATUS_FW_ERROR, &amp;priv-&gt;status)) {</div><div class='del'>-		struct iwl_rxon_context *ctx;</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-		for_each_context(priv, ctx)</div><div class='del'>-			ctx-&gt;vif = NULL;</div><div class='del'>-		priv-&gt;is_open = 0;</div><div class='del'>-</div><div class='del'>-		__iwl4965_down(priv);</div><div class='del'>-</div><div class='del'>-		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-		iwl4965_cancel_deferred_work(priv);</div><div class='del'>-		ieee80211_restart_hw(priv-&gt;hw);</div><div class='del'>-	} else {</div><div class='del'>-		iwl4965_down(priv);</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-		if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status)) {</div><div class='del'>-			mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		__iwl4965_up(priv);</div><div class='del'>-		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_bg_rx_replenish(struct work_struct *data)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv =</div><div class='del'>-	    container_of(data, struct iwl_priv, rx_replenish);</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	iwl4965_rx_replenish(priv);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>- *</div><div class='del'>- * mac80211 entry point functions</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#define UCODE_READY_TIMEOUT	(4 * HZ)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Not a mac80211 entry point function, but it fits in with all the</div><div class='del'>- * other mac80211 functions grouped here.</div><div class='del'>- */</div><div class='del'>-static int iwl4965_mac_setup_register(struct iwl_priv *priv,</div><div class='del'>-				  u32 max_probe_length)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct ieee80211_hw *hw = priv-&gt;hw;</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-</div><div class='del'>-	hw-&gt;rate_control_algorithm = "iwl-4965-rs";</div><div class='del'>-</div><div class='del'>-	/* Tell mac80211 our characteristics */</div><div class='del'>-	hw-&gt;flags = IEEE80211_HW_SIGNAL_DBM |</div><div class='del'>-		    IEEE80211_HW_AMPDU_AGGREGATION |</div><div class='del'>-		    IEEE80211_HW_NEED_DTIM_PERIOD |</div><div class='del'>-		    IEEE80211_HW_SPECTRUM_MGMT |</div><div class='del'>-		    IEEE80211_HW_REPORTS_TX_ACK_STATUS;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cfg-&gt;sku &amp; IWL_SKU_N)</div><div class='del'>-		hw-&gt;flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |</div><div class='del'>-			     IEEE80211_HW_SUPPORTS_STATIC_SMPS;</div><div class='del'>-</div><div class='del'>-	hw-&gt;sta_data_size = sizeof(struct iwl_station_priv);</div><div class='del'>-	hw-&gt;vif_data_size = sizeof(struct iwl_vif_priv);</div><div class='del'>-</div><div class='del'>-	for_each_context(priv, ctx) {</div><div class='del'>-		hw-&gt;wiphy-&gt;interface_modes |= ctx-&gt;interface_modes;</div><div class='del'>-		hw-&gt;wiphy-&gt;interface_modes |= ctx-&gt;exclusive_interface_modes;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_CUSTOM_REGULATORY |</div><div class='del'>-			    WIPHY_FLAG_DISABLE_BEACON_HINTS;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For now, disable PS by default because it affects</div><div class='del'>-	 * RX performance significantly.</div><div class='del'>-	 */</div><div class='del'>-	hw-&gt;wiphy-&gt;flags &amp;= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;</div><div class='del'>-</div><div class='del'>-	hw-&gt;wiphy-&gt;max_scan_ssids = PROBE_OPTION_MAX;</div><div class='del'>-	/* we create the 802.11 header and a zero-length SSID element */</div><div class='del'>-	hw-&gt;wiphy-&gt;max_scan_ie_len = max_probe_length - 24 - 2;</div><div class='del'>-</div><div class='del'>-	/* Default value; 4 EDCA QOS priorities */</div><div class='del'>-	hw-&gt;queues = 4;</div><div class='del'>-</div><div class='del'>-	hw-&gt;max_listen_interval = IWL_CONN_MAX_LISTEN_INTERVAL;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;bands[IEEE80211_BAND_2GHZ].n_channels)</div><div class='del'>-		priv-&gt;hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] =</div><div class='del'>-			&amp;priv-&gt;bands[IEEE80211_BAND_2GHZ];</div><div class='del'>-	if (priv-&gt;bands[IEEE80211_BAND_5GHZ].n_channels)</div><div class='del'>-		priv-&gt;hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_5GHZ] =</div><div class='del'>-			&amp;priv-&gt;bands[IEEE80211_BAND_5GHZ];</div><div class='del'>-</div><div class='del'>-	iwl_legacy_leds_init(priv);</div><div class='del'>-</div><div class='del'>-	ret = ieee80211_register_hw(priv-&gt;hw);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "Failed to register hw (error %d)\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	priv-&gt;mac80211_registered = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int iwl4965_mac_start(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	/* we should be verifying the device is ready to be opened */</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	ret = __iwl4965_up(priv);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</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 (iwl_legacy_is_rfkill(priv))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Start UP work done.\n");</div><div class='del'>-</div><div class='del'>-	/* Wait for START_ALIVE from Run Time ucode. Otherwise callbacks from</div><div class='del'>-	 * mac80211 will not be run successfully. */</div><div class='del'>-	ret = wait_event_timeout(priv-&gt;wait_command_queue,</div><div class='del'>-			test_bit(STATUS_READY, &amp;priv-&gt;status),</div><div class='del'>-			UCODE_READY_TIMEOUT);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		if (!test_bit(STATUS_READY, &amp;priv-&gt;status)) {</div><div class='del'>-			IWL_ERR(priv, "START_ALIVE timeout after %dms.\n",</div><div class='del'>-				jiffies_to_msecs(UCODE_READY_TIMEOUT));</div><div class='del'>-			return -ETIMEDOUT;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl4965_led_enable(priv);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	priv-&gt;is_open = 1;</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl4965_mac_stop(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;is_open)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	priv-&gt;is_open = 0;</div><div class='del'>-</div><div class='del'>-	iwl4965_down(priv);</div><div class='del'>-</div><div class='del'>-	flush_workqueue(priv-&gt;workqueue);</div><div class='del'>-</div><div class='del'>-	/* User space software may expect getting rfkill changes</div><div class='del'>-	 * even if interface is down */</div><div class='del'>-	iwl_write32(priv, CSR_INT, 0xFFFFFFFF);</div><div class='del'>-	iwl_legacy_enable_rfkill_int(priv);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl4965_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MACDUMP(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TX(priv, "dev-&gt;xmit(%d bytes) at rate 0x%02x\n", skb-&gt;len,</div><div class='del'>-		     ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))-&gt;bitrate);</div><div class='del'>-</div><div class='del'>-	if (iwl4965_tx_skb(priv, skb))</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MACDUMP(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl4965_mac_update_tkip_key(struct ieee80211_hw *hw,</div><div class='del'>-				struct ieee80211_vif *vif,</div><div class='del'>-				struct ieee80211_key_conf *keyconf,</div><div class='del'>-				struct ieee80211_sta *sta,</div><div class='del'>-				u32 iv32, u16 *phase1key)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	iwl4965_update_tkip_key(priv, vif_priv-&gt;ctx, keyconf, sta,</div><div class='del'>-			    iv32, phase1key);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_mac_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 iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='del'>-	struct iwl_rxon_context *ctx = vif_priv-&gt;ctx;</div><div class='del'>-	int ret;</div><div class='del'>-	u8 sta_id;</div><div class='del'>-	bool is_default_wep_key = false;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cfg-&gt;mod_params-&gt;sw_crypto) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "leave - hwcrypto disabled\n");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sta_id = iwl_legacy_sta_id_or_broadcast(priv, vif_priv-&gt;ctx, sta);</div><div class='del'>-	if (sta_id == IWL_INVALID_STATION)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	iwl_legacy_scan_cancel_timeout(priv, 100);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we are getting WEP group key and we didn't receive any key mapping</div><div class='del'>-	 * so far, we are in legacy wep mode (group key only), otherwise we are</div><div class='del'>-	 * in 1X mode.</div><div class='del'>-	 * In legacy wep mode, we use another host command to the uCode.</div><div class='del'>-	 */</div><div class='del'>-	if ((key-&gt;cipher == WLAN_CIPHER_SUITE_WEP40 ||</div><div class='del'>-	     key-&gt;cipher == WLAN_CIPHER_SUITE_WEP104) &amp;&amp;</div><div class='del'>-	    !sta) {</div><div class='del'>-		if (cmd == SET_KEY)</div><div class='del'>-			is_default_wep_key = !ctx-&gt;key_mapping_keys;</div><div class='del'>-		else</div><div class='del'>-			is_default_wep_key =</div><div class='del'>-					(key-&gt;hw_key_idx == HW_KEY_DEFAULT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SET_KEY:</div><div class='del'>-		if (is_default_wep_key)</div><div class='del'>-			ret = iwl4965_set_default_wep_key(priv,</div><div class='del'>-							vif_priv-&gt;ctx, key);</div><div class='del'>-		else</div><div class='del'>-			ret = iwl4965_set_dynamic_key(priv, vif_priv-&gt;ctx,</div><div class='del'>-						  key, sta_id);</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "enable hwcrypto key\n");</div><div class='del'>-		break;</div><div class='del'>-	case DISABLE_KEY:</div><div class='del'>-		if (is_default_wep_key)</div><div class='del'>-			ret = iwl4965_remove_default_wep_key(priv, ctx, key);</div><div class='del'>-		else</div><div class='del'>-			ret = iwl4965_remove_dynamic_key(priv, ctx,</div><div class='del'>-							key, sta_id);</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "disable hwcrypto key\n");</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,</div><div class='del'>-			    struct ieee80211_vif *vif,</div><div class='del'>-			    enum ieee80211_ampdu_mlme_action action,</div><div class='del'>-			    struct ieee80211_sta *sta, u16 tid, u16 *ssn,</div><div class='del'>-			    u8 buf_size)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	int ret = -EINVAL;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_HT(priv, "A-MPDU action on addr %pM tid %d\n",</div><div class='del'>-		     sta-&gt;addr, tid);</div><div class='del'>-</div><div class='del'>-	if (!(priv-&gt;cfg-&gt;sku &amp; IWL_SKU_N))</div><div class='del'>-		return -EACCES;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case IEEE80211_AMPDU_RX_START:</div><div class='del'>-		IWL_DEBUG_HT(priv, "start Rx\n");</div><div class='del'>-		ret = iwl4965_sta_rx_agg_start(priv, sta, tid, *ssn);</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_AMPDU_RX_STOP:</div><div class='del'>-		IWL_DEBUG_HT(priv, "stop Rx\n");</div><div class='del'>-		ret = iwl4965_sta_rx_agg_stop(priv, sta, tid);</div><div class='del'>-		if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-			ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_AMPDU_TX_START:</div><div class='del'>-		IWL_DEBUG_HT(priv, "start Tx\n");</div><div class='del'>-		ret = iwl4965_tx_agg_start(priv, vif, sta, tid, ssn);</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_AMPDU_TX_STOP:</div><div class='del'>-		IWL_DEBUG_HT(priv, "stop Tx\n");</div><div class='del'>-		ret = iwl4965_tx_agg_stop(priv, vif, sta, tid);</div><div class='del'>-		if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status))</div><div class='del'>-			ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_AMPDU_TX_OPERATIONAL:</div><div class='del'>-		ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl4965_mac_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 iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='del'>-	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='del'>-	bool is_ap = vif-&gt;type == NL80211_IFTYPE_STATION;</div><div class='del'>-	int ret;</div><div class='del'>-	u8 sta_id;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "received request to add station %pM\n",</div><div class='del'>-			sta-&gt;addr);</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "proceeding to add station %pM\n",</div><div class='del'>-			sta-&gt;addr);</div><div class='del'>-	sta_priv-&gt;common.sta_id = IWL_INVALID_STATION;</div><div class='del'>-</div><div class='del'>-	atomic_set(&amp;sta_priv-&gt;pending_frames, 0);</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_add_station_common(priv, vif_priv-&gt;ctx, sta-&gt;addr,</div><div class='del'>-				     is_ap, sta, &amp;sta_id);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "Unable to add station %pM (%d)\n",</div><div class='del'>-			sta-&gt;addr, ret);</div><div class='del'>-		/* Should we return success if return code is EEXIST ? */</div><div class='del'>-		mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sta_priv-&gt;common.sta_id = sta_id;</div><div class='del'>-</div><div class='del'>-	/* Initialize rate scaling */</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Initializing rate scaling for station %pM\n",</div><div class='del'>-		       sta-&gt;addr);</div><div class='del'>-	iwl4965_rs_rate_init(priv, sta, sta_id);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl4965_mac_channel_switch(struct ieee80211_hw *hw,</div><div class='del'>-			       struct ieee80211_channel_switch *ch_switch)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	const struct iwl_channel_info *ch_info;</div><div class='del'>-	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</div><div class='del'>-	struct ieee80211_channel *channel = ch_switch-&gt;channel;</div><div class='del'>-	struct iwl_ht_config *ht_conf = &amp;priv-&gt;current_ht_config;</div><div class='del'>-</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-	u16 ch;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_is_rfkill(priv))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status) ||</div><div class='del'>-	    test_bit(STATUS_SCANNING, &amp;priv-&gt;status) ||</div><div class='del'>-	    test_bit(STATUS_CHANNEL_SWITCH_PENDING, &amp;priv-&gt;status))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (!iwl_legacy_is_associated_ctx(ctx))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;cfg-&gt;ops-&gt;lib-&gt;set_channel_switch)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ch = channel-&gt;hw_value;</div><div class='del'>-	if (le16_to_cpu(ctx-&gt;active.channel) == ch)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ch_info = iwl_legacy_get_channel_info(priv, channel-&gt;band, ch);</div><div class='del'>-	if (!iwl_legacy_is_channel_valid(ch_info)) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "invalid channel\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;priv-&gt;lock);</div><div class='del'>-</div><div class='del'>-	priv-&gt;current_ht_config.smps = conf-&gt;smps_mode;</div><div class='del'>-</div><div class='del'>-	/* Configure HT40 channels */</div><div class='del'>-	ctx-&gt;ht.enabled = conf_is_ht(conf);</div><div class='del'>-	if (ctx-&gt;ht.enabled) {</div><div class='del'>-		if (conf_is_ht40_minus(conf)) {</div><div class='del'>-			ctx-&gt;ht.extension_chan_offset =</div><div class='del'>-				IEEE80211_HT_PARAM_CHA_SEC_BELOW;</div><div class='del'>-			ctx-&gt;ht.is_40mhz = true;</div><div class='del'>-		} else if (conf_is_ht40_plus(conf)) {</div><div class='del'>-			ctx-&gt;ht.extension_chan_offset =</div><div class='del'>-				IEEE80211_HT_PARAM_CHA_SEC_ABOVE;</div><div class='del'>-			ctx-&gt;ht.is_40mhz = true;</div><div class='del'>-		} else {</div><div class='del'>-			ctx-&gt;ht.extension_chan_offset =</div><div class='del'>-				IEEE80211_HT_PARAM_CHA_SEC_NONE;</div><div class='del'>-			ctx-&gt;ht.is_40mhz = false;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		ctx-&gt;ht.is_40mhz = false;</div><div class='del'>-</div><div class='del'>-	if ((le16_to_cpu(ctx-&gt;staging.channel) != ch))</div><div class='del'>-		ctx-&gt;staging.flags = 0;</div><div class='del'>-</div><div class='del'>-	iwl_legacy_set_rxon_channel(priv, channel, ctx);</div><div class='del'>-	iwl_legacy_set_rxon_ht(priv, ht_conf);</div><div class='del'>-	iwl_legacy_set_flags_for_band(priv, ctx, channel-&gt;band, ctx-&gt;vif);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;priv-&gt;lock);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_set_rate(priv);</div><div class='del'>-	/*</div><div class='del'>-	 * at this point, staging_rxon has the</div><div class='del'>-	 * configuration for channel switch</div><div class='del'>-	 */</div><div class='del'>-	set_bit(STATUS_CHANNEL_SWITCH_PENDING, &amp;priv-&gt;status);</div><div class='del'>-	priv-&gt;switch_channel = cpu_to_le16(ch);</div><div class='del'>-	if (priv-&gt;cfg-&gt;ops-&gt;lib-&gt;set_channel_switch(priv, ch_switch)) {</div><div class='del'>-		clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &amp;priv-&gt;status);</div><div class='del'>-		priv-&gt;switch_channel = 0;</div><div class='del'>-		ieee80211_chswitch_done(ctx-&gt;vif, false);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl4965_configure_filter(struct ieee80211_hw *hw,</div><div class='del'>-			     unsigned int changed_flags,</div><div class='del'>-			     unsigned int *total_flags,</div><div class='del'>-			     u64 multicast)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	__le32 filter_or = 0, filter_nand = 0;</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-</div><div class='del'>-#define CHK(test, flag)	do { \</div><div class='del'>-	if (*total_flags &amp; (test))		\</div><div class='del'>-		filter_or |= (flag);		\</div><div class='del'>-	else					\</div><div class='del'>-		filter_nand |= (flag);		\</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "Enter: changed: 0x%x, total: 0x%x\n",</div><div class='del'>-			changed_flags, *total_flags);</div><div class='del'>-</div><div class='del'>-	CHK(FIF_OTHER_BSS | FIF_PROMISC_IN_BSS, RXON_FILTER_PROMISC_MSK);</div><div class='del'>-	/* Setting _just_ RXON_FILTER_CTL2HOST_MSK causes FH errors */</div><div class='del'>-	CHK(FIF_CONTROL, RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_PROMISC_MSK);</div><div class='del'>-	CHK(FIF_BCN_PRBRESP_PROMISC, RXON_FILTER_BCON_AWARE_MSK);</div><div class='del'>-</div><div class='del'>-#undef CHK</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	for_each_context(priv, ctx) {</div><div class='del'>-		ctx-&gt;staging.filter_flags &amp;= ~filter_nand;</div><div class='del'>-		ctx-&gt;staging.filter_flags |= filter_or;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Not committing directly because hardware can perform a scan,</div><div class='del'>-		 * but we'll eventually commit the filter flags change anyway.</div><div class='del'>-		 */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Receiving all multicast frames is always enabled by the</div><div class='del'>-	 * default flags setup in iwl_legacy_connection_init_rx_config()</div><div class='del'>-	 * since we currently do not support programming multicast</div><div class='del'>-	 * filters into the device.</div><div class='del'>-	 */</div><div class='del'>-	*total_flags &amp;= FIF_OTHER_BSS | FIF_ALLMULTI | FIF_PROMISC_IN_BSS |</div><div class='del'>-			FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>- *</div><div class='del'>- * driver setup and teardown</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-static void iwl4965_bg_txpower_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = container_of(work, struct iwl_priv,</div><div class='del'>-			txpower_work);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	/* If a scan happened to start before we got here</div><div class='del'>-	 * then just return; the statistics notification will</div><div class='del'>-	 * kick off another scheduled work to compensate for</div><div class='del'>-	 * any temperature delta we missed here. */</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status) ||</div><div class='del'>-	    test_bit(STATUS_SCANNING, &amp;priv-&gt;status))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Regardless of if we are associated, we must reconfigure the</div><div class='del'>-	 * TX power since frames can be sent on non-radar channels while</div><div class='del'>-	 * not associated */</div><div class='del'>-	priv-&gt;cfg-&gt;ops-&gt;lib-&gt;send_tx_power(priv);</div><div class='del'>-</div><div class='del'>-	/* Update last_temperature to keep is_calib_needed from running</div><div class='del'>-	 * when it isn't needed... */</div><div class='del'>-	priv-&gt;last_temperature = priv-&gt;temperature;</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_setup_deferred_work(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	priv-&gt;workqueue = create_singlethread_workqueue(DRV_NAME);</div><div class='del'>-</div><div class='del'>-	init_waitqueue_head(&amp;priv-&gt;wait_command_queue);</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;restart, iwl4965_bg_restart);</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;rx_replenish, iwl4965_bg_rx_replenish);</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;run_time_calib_work, iwl4965_bg_run_time_calib_work);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;priv-&gt;init_alive_start, iwl4965_bg_init_alive_start);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;priv-&gt;alive_start, iwl4965_bg_alive_start);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_setup_scan_deferred_work(priv);</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;txpower_work, iwl4965_bg_txpower_work);</div><div class='del'>-</div><div class='del'>-	init_timer(&amp;priv-&gt;statistics_periodic);</div><div class='del'>-	priv-&gt;statistics_periodic.data = (unsigned long)priv;</div><div class='del'>-	priv-&gt;statistics_periodic.function = iwl4965_bg_statistics_periodic;</div><div class='del'>-</div><div class='del'>-	init_timer(&amp;priv-&gt;watchdog);</div><div class='del'>-	priv-&gt;watchdog.data = (unsigned long)priv;</div><div class='del'>-	priv-&gt;watchdog.function = iwl_legacy_bg_watchdog;</div><div class='del'>-</div><div class='del'>-	tasklet_init(&amp;priv-&gt;irq_tasklet, (void (*)(unsigned long))</div><div class='del'>-		iwl4965_irq_tasklet, (unsigned long)priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_cancel_deferred_work(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	cancel_work_sync(&amp;priv-&gt;txpower_work);</div><div class='del'>-	cancel_delayed_work_sync(&amp;priv-&gt;init_alive_start);</div><div class='del'>-	cancel_delayed_work(&amp;priv-&gt;alive_start);</div><div class='del'>-	cancel_work_sync(&amp;priv-&gt;run_time_calib_work);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_cancel_scan_deferred_work(priv);</div><div class='del'>-</div><div class='del'>-	del_timer_sync(&amp;priv-&gt;statistics_periodic);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_init_hw_rates(struct iwl_priv *priv,</div><div class='del'>-			      struct ieee80211_rate *rates)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; IWL_RATE_COUNT_LEGACY; i++) {</div><div class='del'>-		rates[i].bitrate = iwlegacy_rates[i].ieee * 5;</div><div class='del'>-		rates[i].hw_value = i; /* Rate scaling will work on indexes */</div><div class='del'>-		rates[i].hw_value_short = i;</div><div class='del'>-		rates[i].flags = 0;</div><div class='del'>-		if ((i &gt;= IWL_FIRST_CCK_RATE) &amp;&amp; (i &lt;= IWL_LAST_CCK_RATE)) {</div><div class='del'>-			/*</div><div class='del'>-			 * If CCK != 1M then set short preamble rate flag.</div><div class='del'>-			 */</div><div class='del'>-			rates[i].flags |=</div><div class='del'>-				(iwlegacy_rates[i].plcp == IWL_RATE_1M_PLCP) ?</div><div class='del'>-					0 : IEEE80211_RATE_SHORT_PREAMBLE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-/*</div><div class='del'>- * Acquire priv-&gt;lock before calling this function !</div><div class='del'>- */</div><div class='del'>-void iwl4965_set_wr_ptrs(struct iwl_priv *priv, int txq_id, u32 index)</div><div class='del'>-{</div><div class='del'>-	iwl_legacy_write_direct32(priv, HBUS_TARG_WRPTR,</div><div class='del'>-			     (index &amp; 0xff) | (txq_id &lt;&lt; 8));</div><div class='del'>-	iwl_legacy_write_prph(priv, IWL49_SCD_QUEUE_RDPTR(txq_id), index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl4965_tx_queue_set_status(struct iwl_priv *priv,</div><div class='del'>-					struct iwl_tx_queue *txq,</div><div class='del'>-					int tx_fifo_id, int scd_retry)</div><div class='del'>-{</div><div class='del'>-	int txq_id = txq-&gt;q.id;</div><div class='del'>-</div><div class='del'>-	/* Find out whether to activate Tx queue */</div><div class='del'>-	int active = test_bit(txq_id, &amp;priv-&gt;txq_ctx_active_msk) ? 1 : 0;</div><div class='del'>-</div><div class='del'>-	/* Set up and activate */</div><div class='del'>-	iwl_legacy_write_prph(priv, IWL49_SCD_QUEUE_STATUS_BITS(txq_id),</div><div class='del'>-			 (active &lt;&lt; IWL49_SCD_QUEUE_STTS_REG_POS_ACTIVE) |</div><div class='del'>-			 (tx_fifo_id &lt;&lt; IWL49_SCD_QUEUE_STTS_REG_POS_TXF) |</div><div class='del'>-			 (scd_retry &lt;&lt; IWL49_SCD_QUEUE_STTS_REG_POS_WSL) |</div><div class='del'>-			 (scd_retry &lt;&lt; IWL49_SCD_QUEUE_STTS_REG_POS_SCD_ACK) |</div><div class='del'>-			 IWL49_SCD_QUEUE_STTS_REG_MSK);</div><div class='del'>-</div><div class='del'>-	txq-&gt;sched_retry = scd_retry;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "%s %s Queue %d on AC %d\n",</div><div class='del'>-		       active ? "Activate" : "Deactivate",</div><div class='del'>-		       scd_retry ? "BA" : "AC", txq_id, tx_fifo_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int iwl4965_init_drv(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;sta_lock);</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;hcmd_lock);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;priv-&gt;free_frames);</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;priv-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	priv-&gt;ieee_channels = NULL;</div><div class='del'>-	priv-&gt;ieee_rates = NULL;</div><div class='del'>-	priv-&gt;band = IEEE80211_BAND_2GHZ;</div><div class='del'>-</div><div class='del'>-	priv-&gt;iw_mode = NL80211_IFTYPE_STATION;</div><div class='del'>-	priv-&gt;current_ht_config.smps = IEEE80211_SMPS_STATIC;</div><div class='del'>-	priv-&gt;missed_beacon_threshold = IWL_MISSED_BEACON_THRESHOLD_DEF;</div><div class='del'>-</div><div class='del'>-	/* initialize force reset */</div><div class='del'>-	priv-&gt;force_reset.reset_duration = IWL_DELAY_NEXT_FORCE_FW_RELOAD;</div><div class='del'>-</div><div class='del'>-	/* Choose which receivers/antennas to use */</div><div class='del'>-	if (priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain)</div><div class='del'>-		priv-&gt;cfg-&gt;ops-&gt;hcmd-&gt;set_rxon_chain(priv,</div><div class='del'>-					&amp;priv-&gt;contexts[IWL_RXON_CTX_BSS]);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_init_scan_params(priv);</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_init_channel_map(priv);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "initializing regulatory failed: %d\n", ret);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = iwl_legacy_init_geos(priv);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "initializing geos failed: %d\n", ret);</div><div class='del'>-		goto err_free_channel_map;</div><div class='del'>-	}</div><div class='del'>-	iwl4965_init_hw_rates(priv, priv-&gt;ieee_rates);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_free_channel_map:</div><div class='del'>-	iwl_legacy_free_channel_map(priv);</div><div class='del'>-err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_uninit_drv(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	iwl4965_calib_free_results(priv);</div><div class='del'>-	iwl_legacy_free_geos(priv);</div><div class='del'>-	iwl_legacy_free_channel_map(priv);</div><div class='del'>-	kfree(priv-&gt;scan_cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl4965_hw_detect(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	priv-&gt;hw_rev = _iwl_legacy_read32(priv, CSR_HW_REV);</div><div class='del'>-	priv-&gt;hw_wa_rev = _iwl_legacy_read32(priv, CSR_HW_REV_WA_REG);</div><div class='del'>-	priv-&gt;rev_id = priv-&gt;pci_dev-&gt;revision;</div><div class='del'>-	IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", priv-&gt;rev_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl4965_set_hw_params(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	priv-&gt;hw_params.max_rxq_size = RX_QUEUE_SIZE;</div><div class='del'>-	priv-&gt;hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG;</div><div class='del'>-	if (priv-&gt;cfg-&gt;mod_params-&gt;amsdu_size_8K)</div><div class='del'>-		priv-&gt;hw_params.rx_page_order = get_order(IWL_RX_BUF_SIZE_8K);</div><div class='del'>-	else</div><div class='del'>-		priv-&gt;hw_params.rx_page_order = get_order(IWL_RX_BUF_SIZE_4K);</div><div class='del'>-</div><div class='del'>-	priv-&gt;hw_params.max_beacon_itrvl = IWL_MAX_UCODE_BEACON_INTERVAL;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cfg-&gt;mod_params-&gt;disable_11n)</div><div class='del'>-		priv-&gt;cfg-&gt;sku &amp;= ~IWL_SKU_N;</div><div class='del'>-</div><div class='del'>-	/* Device-specific setup */</div><div class='del'>-	return priv-&gt;cfg-&gt;ops-&gt;lib-&gt;set_hw_params(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const u8 iwl4965_bss_ac_to_fifo[] = {</div><div class='del'>-	IWL_TX_FIFO_VO,</div><div class='del'>-	IWL_TX_FIFO_VI,</div><div class='del'>-	IWL_TX_FIFO_BE,</div><div class='del'>-	IWL_TX_FIFO_BK,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u8 iwl4965_bss_ac_to_queue[] = {</div><div class='del'>-	0, 1, 2, 3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='del'>-{</div><div class='del'>-	int err = 0, i;</div><div class='del'>-	struct iwl_priv *priv;</div><div class='del'>-	struct ieee80211_hw *hw;</div><div class='del'>-	struct iwl_cfg *cfg = (struct iwl_cfg *)(ent-&gt;driver_data);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u16 pci_cmd;</div><div class='del'>-</div><div class='del'>-	/************************</div><div class='del'>-	 * 1. Allocating HW data</div><div class='del'>-	 ************************/</div><div class='del'>-</div><div class='del'>-	hw = iwl_legacy_alloc_all(cfg);</div><div class='del'>-	if (!hw) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	priv = hw-&gt;priv;</div><div class='del'>-	/* At this point both hw and priv are allocated. */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The default context is always valid,</div><div class='del'>-	 * more may be discovered when firmware</div><div class='del'>-	 * is loaded.</div><div class='del'>-	 */</div><div class='del'>-	priv-&gt;valid_contexts = BIT(IWL_RXON_CTX_BSS);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_IWL_RXON_CTX; i++)</div><div class='del'>-		priv-&gt;contexts[i].ctxid = i;</div><div class='del'>-</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].always_active = true;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].is_active = true;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].rxon_cmd = REPLY_RXON;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].rxon_timing_cmd = REPLY_RXON_TIMING;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].rxon_assoc_cmd = REPLY_RXON_ASSOC;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].qos_cmd = REPLY_QOS_PARAM;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].ap_sta_id = IWL_AP_ID;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].wep_key_cmd = REPLY_WEPKEY;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].ac_to_fifo = iwl4965_bss_ac_to_fifo;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].ac_to_queue = iwl4965_bss_ac_to_queue;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].exclusive_interface_modes =</div><div class='del'>-		BIT(NL80211_IFTYPE_ADHOC);</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].interface_modes =</div><div class='del'>-		BIT(NL80211_IFTYPE_STATION);</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].ap_devtype = RXON_DEV_TYPE_AP;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].ibss_devtype = RXON_DEV_TYPE_IBSS;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].station_devtype = RXON_DEV_TYPE_ESS;</div><div class='del'>-	priv-&gt;contexts[IWL_RXON_CTX_BSS].unused_devtype = RXON_DEV_TYPE_ESS;</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(NUM_IWL_RXON_CTX != 1);</div><div class='del'>-</div><div class='del'>-	SET_IEEE80211_DEV(hw, &amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");</div><div class='del'>-	priv-&gt;cfg = cfg;</div><div class='del'>-	priv-&gt;pci_dev = pdev;</div><div class='del'>-	priv-&gt;inta_mask = CSR_INI_SET_MASK;</div><div class='del'>-</div><div class='del'>-	if (iwl_legacy_alloc_traffic_mem(priv))</div><div class='del'>-		IWL_ERR(priv, "Not enough memory to generate traffic log\n");</div><div class='del'>-</div><div class='del'>-	/**************************</div><div class='del'>-	 * 2. Initializing PCI bus</div><div class='del'>-	 **************************/</div><div class='del'>-	pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |</div><div class='del'>-				PCIE_LINK_STATE_CLKPM);</div><div class='del'>-</div><div class='del'>-	if (pci_enable_device(pdev)) {</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto out_ieee80211_free_hw;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_set_master(pdev);</div><div class='del'>-</div><div class='del'>-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));</div><div class='del'>-	if (!err)</div><div class='del'>-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(36));</div><div class='del'>-	if (err) {</div><div class='del'>-		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='del'>-		if (!err)</div><div class='del'>-			err = pci_set_consistent_dma_mask(pdev,</div><div class='del'>-							DMA_BIT_MASK(32));</div><div class='del'>-		/* both attempts failed: */</div><div class='del'>-		if (err) {</div><div class='del'>-			IWL_WARN(priv, "No suitable DMA available.\n");</div><div class='del'>-			goto out_pci_disable_device;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = pci_request_regions(pdev, DRV_NAME);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_pci_disable_device;</div><div class='del'>-</div><div class='del'>-	pci_set_drvdata(pdev, priv);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/***********************</div><div class='del'>-	 * 3. Read REV register</div><div class='del'>-	 ***********************/</div><div class='del'>-	priv-&gt;hw_base = pci_iomap(pdev, 0, 0);</div><div class='del'>-	if (!priv-&gt;hw_base) {</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto out_pci_release_regions;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "pci_resource_len = 0x%08llx\n",</div><div class='del'>-		(unsigned long long) pci_resource_len(pdev, 0));</div><div class='del'>-	IWL_DEBUG_INFO(priv, "pci_resource_base = %p\n", priv-&gt;hw_base);</div><div class='del'>-</div><div class='del'>-	/* these spin locks will be used in apm_ops.init and EEPROM access</div><div class='del'>-	 * we should init now</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;reg_lock);</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * stop and reset the on-board processor just in case it is in a</div><div class='del'>-	 * strange state ... like being left stranded by a primary kernel</div><div class='del'>-	 * and this is now the kdump kernel trying to start up</div><div class='del'>-	 */</div><div class='del'>-	iwl_write32(priv, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);</div><div class='del'>-</div><div class='del'>-	iwl4965_hw_detect(priv);</div><div class='del'>-	IWL_INFO(priv, "Detected %s, REV=0x%X\n",</div><div class='del'>-		priv-&gt;cfg-&gt;name, priv-&gt;hw_rev);</div><div class='del'>-</div><div class='del'>-	/* We disable the RETRY_TIMEOUT register (0x41) to keep</div><div class='del'>-	 * PCI Tx retries from interfering with C3 CPU state */</div><div class='del'>-	pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);</div><div class='del'>-</div><div class='del'>-	iwl4965_prepare_card_hw(priv);</div><div class='del'>-	if (!priv-&gt;hw_ready) {</div><div class='del'>-		IWL_WARN(priv, "Failed, HW not ready\n");</div><div class='del'>-		goto out_iounmap;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*****************</div><div class='del'>-	 * 4. Read EEPROM</div><div class='del'>-	 *****************/</div><div class='del'>-	/* Read the EEPROM */</div><div class='del'>-	err = iwl_legacy_eeprom_init(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		IWL_ERR(priv, "Unable to init EEPROM\n");</div><div class='del'>-		goto out_iounmap;</div><div class='del'>-	}</div><div class='del'>-	err = iwl4965_eeprom_check_version(priv);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_free_eeprom;</div><div class='del'>-</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_free_eeprom;</div><div class='del'>-</div><div class='del'>-	/* extract MAC Address */</div><div class='del'>-	iwl4965_eeprom_get_mac(priv, priv-&gt;addresses[0].addr);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "MAC address: %pM\n", priv-&gt;addresses[0].addr);</div><div class='del'>-	priv-&gt;hw-&gt;wiphy-&gt;addresses = priv-&gt;addresses;</div><div class='del'>-	priv-&gt;hw-&gt;wiphy-&gt;n_addresses = 1;</div><div class='del'>-</div><div class='del'>-	/************************</div><div class='del'>-	 * 5. Setup HW constants</div><div class='del'>-	 ************************/</div><div class='del'>-	if (iwl4965_set_hw_params(priv)) {</div><div class='del'>-		IWL_ERR(priv, "failed to set hw parameters\n");</div><div class='del'>-		goto out_free_eeprom;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*******************</div><div class='del'>-	 * 6. Setup priv</div><div class='del'>-	 *******************/</div><div class='del'>-</div><div class='del'>-	err = iwl4965_init_drv(priv);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_free_eeprom;</div><div class='del'>-	/* At this point both hw and priv are initialized. */</div><div class='del'>-</div><div class='del'>-	/********************</div><div class='del'>-	 * 7. Setup services</div><div class='del'>-	 ********************/</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	iwl_legacy_disable_interrupts(priv);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	pci_enable_msi(priv-&gt;pci_dev);</div><div class='del'>-</div><div class='del'>-	err = request_irq(priv-&gt;pci_dev-&gt;irq, iwl_legacy_isr,</div><div class='del'>-			  IRQF_SHARED, DRV_NAME, priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		IWL_ERR(priv, "Error allocating IRQ %d\n", priv-&gt;pci_dev-&gt;irq);</div><div class='del'>-		goto out_disable_msi;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl4965_setup_deferred_work(priv);</div><div class='del'>-	iwl4965_setup_rx_handlers(priv);</div><div class='del'>-</div><div class='del'>-	/*********************************************</div><div class='del'>-	 * 8. Enable interrupts and read RFKILL state</div><div class='del'>-	 *********************************************/</div><div class='del'>-</div><div class='del'>-	/* enable rfkill interrupt: hw bug w/a */</div><div class='del'>-	pci_read_config_word(priv-&gt;pci_dev, PCI_COMMAND, &amp;pci_cmd);</div><div class='del'>-	if (pci_cmd &amp; PCI_COMMAND_INTX_DISABLE) {</div><div class='del'>-		pci_cmd &amp;= ~PCI_COMMAND_INTX_DISABLE;</div><div class='del'>-		pci_write_config_word(priv-&gt;pci_dev, PCI_COMMAND, pci_cmd);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iwl_legacy_enable_rfkill_int(priv);</div><div class='del'>-</div><div class='del'>-	/* If platform's RF_KILL switch is NOT set to KILL */</div><div class='del'>-	if (iwl_read32(priv, CSR_GP_CNTRL) &amp;</div><div class='del'>-		CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)</div><div class='del'>-		clear_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-	else</div><div class='del'>-		set_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	wiphy_rfkill_set_hw_state(priv-&gt;hw-&gt;wiphy,</div><div class='del'>-		test_bit(STATUS_RF_KILL_HW, &amp;priv-&gt;status));</div><div class='del'>-</div><div class='del'>-	iwl_legacy_power_initialize(priv);</div><div class='del'>-</div><div class='del'>-	init_completion(&amp;priv-&gt;_4965.firmware_loading_complete);</div><div class='del'>-</div><div class='del'>-	err = iwl4965_request_firmware(priv, true);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_destroy_workqueue;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- out_destroy_workqueue:</div><div class='del'>-	destroy_workqueue(priv-&gt;workqueue);</div><div class='del'>-	priv-&gt;workqueue = NULL;</div><div class='del'>-	free_irq(priv-&gt;pci_dev-&gt;irq, priv);</div><div class='del'>- out_disable_msi:</div><div class='del'>-	pci_disable_msi(priv-&gt;pci_dev);</div><div class='del'>-	iwl4965_uninit_drv(priv);</div><div class='del'>- out_free_eeprom:</div><div class='del'>-	iwl_legacy_eeprom_free(priv);</div><div class='del'>- out_iounmap:</div><div class='del'>-	pci_iounmap(pdev, priv-&gt;hw_base);</div><div class='del'>- out_pci_release_regions:</div><div class='del'>-	pci_set_drvdata(pdev, NULL);</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>- out_pci_disable_device:</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>- out_ieee80211_free_hw:</div><div class='del'>-	iwl_legacy_free_traffic_mem(priv);</div><div class='del'>-	ieee80211_free_hw(priv-&gt;hw);</div><div class='del'>- out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devexit iwl4965_pci_remove(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = pci_get_drvdata(pdev);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (!priv)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	wait_for_completion(&amp;priv-&gt;_4965.firmware_loading_complete);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "*** UNLOAD DRIVER ***\n");</div><div class='del'>-</div><div class='del'>-	iwl_legacy_dbgfs_unregister(priv);</div><div class='del'>-	sysfs_remove_group(&amp;pdev-&gt;dev.kobj, &amp;iwl_attribute_group);</div><div class='del'>-</div><div class='del'>-	/* ieee80211_unregister_hw call wil cause iwl_mac_stop to</div><div class='del'>-	 * to be called and iwl4965_down since we are removing the device</div><div class='del'>-	 * we need to set STATUS_EXIT_PENDING bit.</div><div class='del'>-	 */</div><div class='del'>-	set_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;status);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_leds_exit(priv);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;mac80211_registered) {</div><div class='del'>-		ieee80211_unregister_hw(priv-&gt;hw);</div><div class='del'>-		priv-&gt;mac80211_registered = 0;</div><div class='del'>-	} else {</div><div class='del'>-		iwl4965_down(priv);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure device is reset to low power before unloading driver.</div><div class='del'>-	 * This may be redundant with iwl4965_down(), but there are paths to</div><div class='del'>-	 * run iwl4965_down() without calling apm_ops.stop(), and there are</div><div class='del'>-	 * paths to avoid running iwl4965_down() at all before leaving driver.</div><div class='del'>-	 * This (inexpensive) call *makes sure* device is reset.</div><div class='del'>-	 */</div><div class='del'>-	iwl_legacy_apm_stop(priv);</div><div class='del'>-</div><div class='del'>-	/* make sure we flush any pending irq or</div><div class='del'>-	 * tasklet for the driver</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-	iwl_legacy_disable_interrupts(priv);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	iwl4965_synchronize_irq(priv);</div><div class='del'>-</div><div class='del'>-	iwl4965_dealloc_ucode_pci(priv);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;rxq.bd)</div><div class='del'>-		iwl4965_rx_queue_free(priv, &amp;priv-&gt;rxq);</div><div class='del'>-	iwl4965_hw_txq_ctx_free(priv);</div><div class='del'>-</div><div class='del'>-	iwl_legacy_eeprom_free(priv);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*netif_stop_queue(dev); */</div><div class='del'>-	flush_workqueue(priv-&gt;workqueue);</div><div class='del'>-</div><div class='del'>-	/* ieee80211_unregister_hw calls iwl_mac_stop, which flushes</div><div class='del'>-	 * priv-&gt;workqueue... so we can't take down the workqueue</div><div class='del'>-	 * until now... */</div><div class='del'>-	destroy_workqueue(priv-&gt;workqueue);</div><div class='del'>-	priv-&gt;workqueue = NULL;</div><div class='del'>-	iwl_legacy_free_traffic_mem(priv);</div><div class='del'>-</div><div class='del'>-	free_irq(priv-&gt;pci_dev-&gt;irq, priv);</div><div class='del'>-	pci_disable_msi(priv-&gt;pci_dev);</div><div class='del'>-	pci_iounmap(pdev, priv-&gt;hw_base);</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-	pci_set_drvdata(pdev, NULL);</div><div class='del'>-</div><div class='del'>-	iwl4965_uninit_drv(priv);</div><div class='del'>-</div><div class='del'>-	dev_kfree_skb(priv-&gt;beacon_skb);</div><div class='del'>-</div><div class='del'>-	ieee80211_free_hw(priv-&gt;hw);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Activate/Deactivate Tx DMA/FIFO channels according tx fifos mask</div><div class='del'>- * must be called under priv-&gt;lock and mac access</div><div class='del'>- */</div><div class='del'>-void iwl4965_txq_set_sched(struct iwl_priv *priv, u32 mask)</div><div class='del'>-{</div><div class='del'>-	iwl_legacy_write_prph(priv, IWL49_SCD_TXFACT, mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>- *</div><div class='del'>- * driver and module entry point</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-/* Hardware specific file defines the PCI IDs table for that hardware module */</div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(iwl4965_hw_card_ids) = {</div><div class='del'>-#if defined(CONFIG_IWL4965_MODULE) || defined(CONFIG_IWL4965)</div><div class='del'>-	{IWL_PCI_DEVICE(0x4229, PCI_ANY_ID, iwl4965_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x4230, PCI_ANY_ID, iwl4965_cfg)},</div><div class='del'>-#endif /* CONFIG_IWL4965 */</div><div class='del'>-</div><div class='del'>-	{0}</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(pci, iwl4965_hw_card_ids);</div><div class='del'>-</div><div class='del'>-static struct pci_driver iwl4965_driver = {</div><div class='del'>-	.name = DRV_NAME,</div><div class='del'>-	.id_table = iwl4965_hw_card_ids,</div><div class='del'>-	.probe = iwl4965_pci_probe,</div><div class='del'>-	.remove = __devexit_p(iwl4965_pci_remove),</div><div class='del'>-	.driver.pm = IWL_LEGACY_PM_OPS,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init iwl4965_init(void)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	int ret;</div><div class='del'>-	pr_info(DRV_DESCRIPTION ", " DRV_VERSION "\n");</div><div class='del'>-	pr_info(DRV_COPYRIGHT "\n");</div><div class='del'>-</div><div class='del'>-	ret = iwl4965_rate_control_register();</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("Unable to register rate control algorithm: %d\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = pci_register_driver(&amp;iwl4965_driver);</div><div class='del'>-	if (ret) {</div><div class='del'>-		pr_err("Unable to initialize PCI module\n");</div><div class='del'>-		goto error_register;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='del'>-error_register:</div><div class='del'>-	iwl4965_rate_control_unregister();</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit iwl4965_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;iwl4965_driver);</div><div class='del'>-	iwl4965_rate_control_unregister();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_exit(iwl4965_exit);</div><div class='del'>-module_init(iwl4965_init);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG</div><div class='del'>-module_param_named(debug, iwlegacy_debug_level, uint, S_IRUGO | S_IWUSR);</div><div class='del'>-MODULE_PARM_DESC(debug, "debug output mask");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-module_param_named(swcrypto, iwl4965_mod_params.sw_crypto, int, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])");</div><div class='del'>-module_param_named(queues_num, iwl4965_mod_params.num_of_queues, int, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(queues_num, "number of hw queues.");</div><div class='del'>-module_param_named(11n_disable, iwl4965_mod_params.disable_11n, int, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(11n_disable, "disable 11n functionality");</div><div class='del'>-module_param_named(amsdu_size_8K, iwl4965_mod_params.amsdu_size_8K,</div><div class='del'>-		   int, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size");</div><div class='del'>-module_param_named(fw_restart, iwl4965_mod_params.restart_fw, int, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(fw_restart, "restart firmware in case of error");</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-prph.h b/drivers/net/wireless/iwlegacy/prph.h<br/>index 30a493003ab0..ffec4b4a248a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-prph.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-prph.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/prph.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlegacy/prph.h</a></div><div class='hunk'>@@ -60,8 +60,8 @@</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='del'>-#ifndef	__iwl_legacy_prph_h__</div><div class='del'>-#define __iwl_legacy_prph_h__</div><div class='add'>+#ifndef	__il_prph_h__</div><div class='add'>+#define __il_prph_h__</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Registers in this file are internal, not PCI bus memory mapped.</div><div class='hunk'>@@ -91,9 +91,9 @@</div><div class='ctx'> #define APMG_PS_CTRL_VAL_RESET_REQ		(0x04000000)</div><div class='ctx'> #define APMG_PS_CTRL_MSK_PWR_SRC		(0x03000000)</div><div class='ctx'> #define APMG_PS_CTRL_VAL_PWR_SRC_VMAIN		(0x00000000)</div><div class='del'>-#define APMG_PS_CTRL_VAL_PWR_SRC_MAX		(0x01000000) /* 3945 only */</div><div class='add'>+#define APMG_PS_CTRL_VAL_PWR_SRC_MAX		(0x01000000)	/* 3945 only */</div><div class='ctx'> #define APMG_PS_CTRL_VAL_PWR_SRC_VAUX		(0x02000000)</div><div class='del'>-#define APMG_SVR_VOLTAGE_CONFIG_BIT_MSK	(0x000001E0) /* bit 8:5 */</div><div class='add'>+#define APMG_SVR_VOLTAGE_CONFIG_BIT_MSK	(0x000001E0)	/* bit 8:5 */</div><div class='ctx'> #define APMG_SVR_DIGITAL_VOLTAGE_1_32		(0x00000060)</div><div class='ctx'> </div><div class='ctx'> #define APMG_PCIDEV_STT_VAL_L1_ACT_DIS		(0x00000800)</div><div class='hunk'>@@ -120,13 +120,13 @@</div><div class='ctx'>  *</div><div class='ctx'>  * 1)  Initialization -- performs hardware calibration and sets up some</div><div class='ctx'>  *     internal data, then notifies host via "initialize alive" notification</div><div class='del'>- *     (struct iwl_init_alive_resp) that it has completed all of its work.</div><div class='add'>+ *     (struct il_init_alive_resp) that it has completed all of its work.</div><div class='ctx'>  *     After signal from host, it then loads and starts the runtime program.</div><div class='ctx'>  *     The initialization program must be used when initially setting up the</div><div class='ctx'>  *     NIC after loading the driver.</div><div class='ctx'>  *</div><div class='ctx'>  * 2)  Runtime/Protocol -- performs all normal runtime operations.  This</div><div class='del'>- *     notifies host via "alive" notification (struct iwl_alive_resp) that it</div><div class='add'>+ *     notifies host via "alive" notification (struct il_alive_resp) that it</div><div class='ctx'>  *     is ready to be used.</div><div class='ctx'>  *</div><div class='ctx'>  * When initializing the NIC, the host driver does the following procedure:</div><div class='hunk'>@@ -189,7 +189,7 @@</div><div class='ctx'>  *        procedure.</div><div class='ctx'>  *</div><div class='ctx'>  * This save/restore method is mostly for autonomous power management during</div><div class='del'>- * normal operation (result of POWER_TABLE_CMD).  Platform suspend/resume and</div><div class='add'>+ * normal operation (result of C_POWER_TBL).  Platform suspend/resume and</div><div class='ctx'>  * RFKILL should use complete restarts (with total re-initialization) of uCode,</div><div class='ctx'>  * allowing total shutdown (including BSM memory).</div><div class='ctx'>  *</div><div class='hunk'>@@ -202,19 +202,19 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* BSM bit fields */</div><div class='del'>-#define BSM_WR_CTRL_REG_BIT_START     (0x80000000) /* start boot load now */</div><div class='del'>-#define BSM_WR_CTRL_REG_BIT_START_EN  (0x40000000) /* enable boot after pwrup*/</div><div class='del'>-#define BSM_DRAM_INST_LOAD            (0x80000000) /* start program load now */</div><div class='add'>+#define BSM_WR_CTRL_REG_BIT_START     (0x80000000)	/* start boot load now */</div><div class='add'>+#define BSM_WR_CTRL_REG_BIT_START_EN  (0x40000000)	/* enable boot after pwrup */</div><div class='add'>+#define BSM_DRAM_INST_LOAD            (0x80000000)	/* start program load now */</div><div class='ctx'> </div><div class='ctx'> /* BSM addresses */</div><div class='ctx'> #define BSM_BASE                     (PRPH_BASE + 0x3400)</div><div class='ctx'> #define BSM_END                      (PRPH_BASE + 0x3800)</div><div class='ctx'> </div><div class='del'>-#define BSM_WR_CTRL_REG              (BSM_BASE + 0x000) /* ctl and status */</div><div class='del'>-#define BSM_WR_MEM_SRC_REG           (BSM_BASE + 0x004) /* source in BSM mem */</div><div class='del'>-#define BSM_WR_MEM_DST_REG           (BSM_BASE + 0x008) /* dest in SRAM mem */</div><div class='del'>-#define BSM_WR_DWCOUNT_REG           (BSM_BASE + 0x00C) /* bytes */</div><div class='del'>-#define BSM_WR_STATUS_REG            (BSM_BASE + 0x010) /* bit 0:  1 == done */</div><div class='add'>+#define BSM_WR_CTRL_REG              (BSM_BASE + 0x000)	/* ctl and status */</div><div class='add'>+#define BSM_WR_MEM_SRC_REG           (BSM_BASE + 0x004)	/* source in BSM mem */</div><div class='add'>+#define BSM_WR_MEM_DST_REG           (BSM_BASE + 0x008)	/* dest in SRAM mem */</div><div class='add'>+#define BSM_WR_DWCOUNT_REG           (BSM_BASE + 0x00C)	/* bytes */</div><div class='add'>+#define BSM_WR_STATUS_REG            (BSM_BASE + 0x010)	/* bit 0:  1 == done */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Pointers and size regs for bootstrap load and data SRAM save/restore.</div><div class='hunk'>@@ -231,8 +231,7 @@</div><div class='ctx'>  * Read/write, address range from LOWER_BOUND to (LOWER_BOUND + SIZE -1)</div><div class='ctx'>  */</div><div class='ctx'> #define BSM_SRAM_LOWER_BOUND         (PRPH_BASE + 0x3800)</div><div class='del'>-#define BSM_SRAM_SIZE			(1024) /* bytes */</div><div class='del'>-</div><div class='add'>+#define BSM_SRAM_SIZE			(1024)	/* bytes */</div><div class='ctx'> </div><div class='ctx'> /* 3945 Tx scheduler registers */</div><div class='ctx'> #define ALM_SCD_BASE                        (PRPH_BASE + 0x2E00)</div><div class='hunk'>@@ -255,7 +254,7 @@</div><div class='ctx'>  * but one DMA channel may take input from several queues.</div><div class='ctx'>  *</div><div class='ctx'>  * Tx DMA FIFOs have dedicated purposes.  For 4965, they are used as follows</div><div class='del'>- * (cf. default_queue_to_tx_fifo in iwl-4965.c):</div><div class='add'>+ * (cf. default_queue_to_tx_fifo in 4965.c):</div><div class='ctx'>  *</div><div class='ctx'>  * 0 -- EDCA BK (background) frames, lowest priority</div><div class='ctx'>  * 1 -- EDCA BE (best effort) frames, normal priority</div><div class='hunk'>@@ -274,20 +273,20 @@</div><div class='ctx'>  * The driver sets up each queue to work in one of two modes:</div><div class='ctx'>  *</div><div class='ctx'>  * 1)  Scheduler-Ack, in which the scheduler automatically supports a</div><div class='del'>- *     block-ack (BA) window of up to 64 TFDs.  In this mode, each queue</div><div class='add'>+ *     block-ack (BA) win of up to 64 TFDs.  In this mode, each queue</div><div class='ctx'>  *     contains TFDs for a unique combination of Recipient Address (RA)</div><div class='ctx'>  *     and Traffic Identifier (TID), that is, traffic of a given</div><div class='ctx'>  *     Quality-Of-Service (QOS) priority, destined for a single station.</div><div class='ctx'>  *</div><div class='ctx'>  *     In scheduler-ack mode, the scheduler keeps track of the Tx status of</div><div class='del'>- *     each frame within the BA window, including whether it's been transmitted,</div><div class='add'>+ *     each frame within the BA win, including whether it's been transmitted,</div><div class='ctx'>  *     and whether it's been acknowledged by the receiving station.  The device</div><div class='ctx'>  *     automatically processes block-acks received from the receiving STA,</div><div class='ctx'>  *     and reschedules un-acked frames to be retransmitted (successful</div><div class='ctx'>  *     Tx completion may end up being out-of-order).</div><div class='ctx'>  *</div><div class='ctx'>  *     The driver must maintain the queue's Byte Count table in host DRAM</div><div class='del'>- *     (struct iwl4965_sched_queue_byte_cnt_tbl) for this mode.</div><div class='add'>+ *     (struct il4965_sched_queue_byte_cnt_tbl) for this mode.</div><div class='ctx'>  *     This mode does not support fragmentation.</div><div class='ctx'>  *</div><div class='ctx'>  * 2)  FIFO (a.k.a. non-Scheduler-ACK), in which each TFD is processed in order.</div><div class='hunk'>@@ -316,34 +315,34 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Max Tx window size is the max number of contiguous TFDs that the scheduler</div><div class='add'>+ * Max Tx win size is the max number of contiguous TFDs that the scheduler</div><div class='ctx'>  * can keep track of at one time when creating block-ack chains of frames.</div><div class='ctx'>  * Note that "64" matches the number of ack bits in a block-ack packet.</div><div class='ctx'>  * Driver should use SCD_WIN_SIZE and SCD_FRAME_LIMIT values to initialize</div><div class='del'>- * IWL49_SCD_CONTEXT_QUEUE_OFFSET(x) values.</div><div class='add'>+ * IL49_SCD_CONTEXT_QUEUE_OFFSET(x) values.</div><div class='ctx'>  */</div><div class='ctx'> #define SCD_WIN_SIZE				64</div><div class='ctx'> #define SCD_FRAME_LIMIT				64</div><div class='ctx'> </div><div class='ctx'> /* SCD registers are internal, must be accessed via HBUS_TARG_PRPH regs */</div><div class='del'>-#define IWL49_SCD_START_OFFSET		0xa02c00</div><div class='add'>+#define IL49_SCD_START_OFFSET		0xa02c00</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * 4965 tells driver SRAM address for internal scheduler structs via this reg.</div><div class='ctx'>  * Value is valid only after "Alive" response from uCode.</div><div class='ctx'>  */</div><div class='del'>-#define IWL49_SCD_SRAM_BASE_ADDR           (IWL49_SCD_START_OFFSET + 0x0)</div><div class='add'>+#define IL49_SCD_SRAM_BASE_ADDR           (IL49_SCD_START_OFFSET + 0x0)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Driver may need to update queue-empty bits after changing queue's</div><div class='del'>- * write and read pointers (indexes) during (re-)initialization (i.e. when</div><div class='add'>+ * write and read pointers (idxes) during (re-)initialization (i.e. when</div><div class='ctx'>  * scheduler is not tracking what's happening).</div><div class='ctx'>  * Bit fields:</div><div class='ctx'>  * 31-16:  Write mask -- 1: update empty bit, 0: don't change empty bit</div><div class='ctx'>  * 15-00:  Empty state, one for each queue -- 1: empty, 0: non-empty</div><div class='ctx'>  * NOTE:  This register is not used by Linux driver.</div><div class='ctx'>  */</div><div class='del'>-#define IWL49_SCD_EMPTY_BITS               (IWL49_SCD_START_OFFSET + 0x4)</div><div class='add'>+#define IL49_SCD_EMPTY_BITS               (IL49_SCD_START_OFFSET + 0x4)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Physical base address of array of byte count (BC) circular buffers (CBs).</div><div class='hunk'>@@ -351,11 +350,11 @@</div><div class='ctx'>  * This register points to BC CB for queue 0, must be on 1024-byte boundary.</div><div class='ctx'>  * Others are spaced by 1024 bytes.</div><div class='ctx'>  * Each BC CB is 2 bytes * (256 + 64) = 740 bytes, followed by 384 bytes pad.</div><div class='del'>- * (Index into a queue's BC CB) = (index into queue's TFD CB) = (SSN &amp; 0xff).</div><div class='add'>+ * (Index into a queue's BC CB) = (idx into queue's TFD CB) = (SSN &amp; 0xff).</div><div class='ctx'>  * Bit fields:</div><div class='ctx'>  * 25-00:  Byte Count CB physical address [35:10], must be 1024-byte aligned.</div><div class='ctx'>  */</div><div class='del'>-#define IWL49_SCD_DRAM_BASE_ADDR           (IWL49_SCD_START_OFFSET + 0x10)</div><div class='add'>+#define IL49_SCD_DRAM_BASE_ADDR           (IL49_SCD_START_OFFSET + 0x10)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Enables any/all Tx DMA/FIFO channels.</div><div class='hunk'>@@ -364,23 +363,23 @@</div><div class='ctx'>  * Bit fields:</div><div class='ctx'>  *  7- 0:  Enable (1), disable (0), one bit for each channel 0-7</div><div class='ctx'>  */</div><div class='del'>-#define IWL49_SCD_TXFACT                   (IWL49_SCD_START_OFFSET + 0x1c)</div><div class='add'>+#define IL49_SCD_TXFACT                   (IL49_SCD_START_OFFSET + 0x1c)</div><div class='ctx'> /*</div><div class='del'>- * Queue (x) Write Pointers (indexes, really!), one for each Tx queue.</div><div class='add'>+ * Queue (x) Write Pointers (idxes, really!), one for each Tx queue.</div><div class='ctx'>  * Initialized and updated by driver as new TFDs are added to queue.</div><div class='del'>- * NOTE:  If using Block Ack, index must correspond to frame's</div><div class='del'>- *        Start Sequence Number; index = (SSN &amp; 0xff)</div><div class='add'>+ * NOTE:  If using Block Ack, idx must correspond to frame's</div><div class='add'>+ *        Start Sequence Number; idx = (SSN &amp; 0xff)</div><div class='ctx'>  * NOTE:  Alternative to HBUS_TARG_WRPTR, which is what Linux driver uses?</div><div class='ctx'>  */</div><div class='del'>-#define IWL49_SCD_QUEUE_WRPTR(x)  (IWL49_SCD_START_OFFSET + 0x24 + (x) * 4)</div><div class='add'>+#define IL49_SCD_QUEUE_WRPTR(x)  (IL49_SCD_START_OFFSET + 0x24 + (x) * 4)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Queue (x) Read Pointers (indexes, really!), one for each Tx queue.</div><div class='del'>- * For FIFO mode, index indicates next frame to transmit.</div><div class='del'>- * For Scheduler-ACK mode, index indicates first frame in Tx window.</div><div class='add'>+ * Queue (x) Read Pointers (idxes, really!), one for each Tx queue.</div><div class='add'>+ * For FIFO mode, idx indicates next frame to transmit.</div><div class='add'>+ * For Scheduler-ACK mode, idx indicates first frame in Tx win.</div><div class='ctx'>  * Initialized by driver, updated by scheduler.</div><div class='ctx'>  */</div><div class='del'>-#define IWL49_SCD_QUEUE_RDPTR(x)  (IWL49_SCD_START_OFFSET + 0x64 + (x) * 4)</div><div class='add'>+#define IL49_SCD_QUEUE_RDPTR(x)  (IL49_SCD_START_OFFSET + 0x64 + (x) * 4)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Select which queues work in chain mode (1) vs. not (0).</div><div class='hunk'>@@ -391,18 +390,18 @@</div><div class='ctx'>  * NOTE:  If driver sets up queue for chain mode, it should be also set up</div><div class='ctx'>  *        Scheduler-ACK mode as well, via SCD_QUEUE_STATUS_BITS(x).</div><div class='ctx'>  */</div><div class='del'>-#define IWL49_SCD_QUEUECHAIN_SEL  (IWL49_SCD_START_OFFSET + 0xd0)</div><div class='add'>+#define IL49_SCD_QUEUECHAIN_SEL  (IL49_SCD_START_OFFSET + 0xd0)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Select which queues interrupt driver when scheduler increments</div><div class='del'>- * a queue's read pointer (index).</div><div class='add'>+ * a queue's read pointer (idx).</div><div class='ctx'>  * Bit fields:</div><div class='ctx'>  * 31-16:  Reserved</div><div class='ctx'>  * 15-00:  Interrupt enable, one bit for each queue -- 1: enabled, 0: disabled</div><div class='ctx'>  * NOTE:  This functionality is apparently a no-op; driver relies on interrupts</div><div class='ctx'>  *        from Rx queue to read Tx command responses and update Tx queues.</div><div class='ctx'>  */</div><div class='del'>-#define IWL49_SCD_INTERRUPT_MASK  (IWL49_SCD_START_OFFSET + 0xe4)</div><div class='add'>+#define IL49_SCD_INTERRUPT_MASK  (IL49_SCD_START_OFFSET + 0xe4)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Queue search status registers.  One for each queue.</div><div class='hunk'>@@ -414,7 +413,7 @@</div><div class='ctx'>  *        Driver should init to "1" for aggregation mode, or "0" otherwise.</div><div class='ctx'>  *   7-6: Driver should init to "0"</div><div class='ctx'>  *     5: Window Size Left; indicates whether scheduler can request</div><div class='del'>- *        another TFD, based on window size, etc.  Driver should init</div><div class='add'>+ *        another TFD, based on win size, etc.  Driver should init</div><div class='ctx'>  *        this bit to "1" for aggregation mode, or "0" for non-agg.</div><div class='ctx'>  *   4-1: Tx FIFO to use (range 0-7).</div><div class='ctx'>  *     0: Queue is active (1), not active (0).</div><div class='hunk'>@@ -423,18 +422,18 @@</div><div class='ctx'>  * NOTE:  If enabling Scheduler-ACK mode, chain mode should also be enabled</div><div class='ctx'>  *        via SCD_QUEUECHAIN_SEL.</div><div class='ctx'>  */</div><div class='del'>-#define IWL49_SCD_QUEUE_STATUS_BITS(x)\</div><div class='del'>-	(IWL49_SCD_START_OFFSET + 0x104 + (x) * 4)</div><div class='add'>+#define IL49_SCD_QUEUE_STATUS_BITS(x)\</div><div class='add'>+	(IL49_SCD_START_OFFSET + 0x104 + (x) * 4)</div><div class='ctx'> </div><div class='ctx'> /* Bit field positions */</div><div class='del'>-#define IWL49_SCD_QUEUE_STTS_REG_POS_ACTIVE	(0)</div><div class='del'>-#define IWL49_SCD_QUEUE_STTS_REG_POS_TXF	(1)</div><div class='del'>-#define IWL49_SCD_QUEUE_STTS_REG_POS_WSL	(5)</div><div class='del'>-#define IWL49_SCD_QUEUE_STTS_REG_POS_SCD_ACK	(8)</div><div class='add'>+#define IL49_SCD_QUEUE_STTS_REG_POS_ACTIVE	(0)</div><div class='add'>+#define IL49_SCD_QUEUE_STTS_REG_POS_TXF	(1)</div><div class='add'>+#define IL49_SCD_QUEUE_STTS_REG_POS_WSL	(5)</div><div class='add'>+#define IL49_SCD_QUEUE_STTS_REG_POS_SCD_ACK	(8)</div><div class='ctx'> </div><div class='ctx'> /* Write masks */</div><div class='del'>-#define IWL49_SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN	(10)</div><div class='del'>-#define IWL49_SCD_QUEUE_STTS_REG_MSK		(0x0007FC00)</div><div class='add'>+#define IL49_SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN	(10)</div><div class='add'>+#define IL49_SCD_QUEUE_STTS_REG_MSK		(0x0007FC00)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * 4965 internal SRAM structures for scheduler, shared with driver ...</div><div class='hunk'>@@ -460,7 +459,7 @@</div><div class='ctx'>  * each queue's entry as follows:</div><div class='ctx'>  *</div><div class='ctx'>  * LS Dword bit fields:</div><div class='del'>- *  0-06:  Max Tx window size for Scheduler-ACK.  Driver should init to 64.</div><div class='add'>+ *  0-06:  Max Tx win size for Scheduler-ACK.  Driver should init to 64.</div><div class='ctx'>  *</div><div class='ctx'>  * MS Dword bit fields:</div><div class='ctx'>  * 16-22:  Frame limit.  Driver should init to 10 (0xa).</div><div class='hunk'>@@ -470,14 +469,14 @@</div><div class='ctx'>  * Init must be done after driver receives "Alive" response from 4965 uCode,</div><div class='ctx'>  * and when setting up queue for aggregation.</div><div class='ctx'>  */</div><div class='del'>-#define IWL49_SCD_CONTEXT_DATA_OFFSET			0x380</div><div class='del'>-#define IWL49_SCD_CONTEXT_QUEUE_OFFSET(x) \</div><div class='del'>-			(IWL49_SCD_CONTEXT_DATA_OFFSET + ((x) * 8))</div><div class='add'>+#define IL49_SCD_CONTEXT_DATA_OFFSET			0x380</div><div class='add'>+#define IL49_SCD_CONTEXT_QUEUE_OFFSET(x) \</div><div class='add'>+			(IL49_SCD_CONTEXT_DATA_OFFSET + ((x) * 8))</div><div class='ctx'> </div><div class='del'>-#define IWL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_POS		(0)</div><div class='del'>-#define IWL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK		(0x0000007F)</div><div class='del'>-#define IWL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS	(16)</div><div class='del'>-#define IWL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK	(0x007F0000)</div><div class='add'>+#define IL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_POS		(0)</div><div class='add'>+#define IL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK		(0x0000007F)</div><div class='add'>+#define IL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS	(16)</div><div class='add'>+#define IL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK	(0x007F0000)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Tx Status Bitmap</div><div class='hunk'>@@ -486,7 +485,7 @@</div><div class='ctx'>  * "Alive" notification from uCode.  Area is used only by device itself;</div><div class='ctx'>  * no other support (besides clearing) is required from driver.</div><div class='ctx'>  */</div><div class='del'>-#define IWL49_SCD_TX_STTS_BITMAP_OFFSET		0x400</div><div class='add'>+#define IL49_SCD_TX_STTS_BITMAP_OFFSET		0x400</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * RAxTID to queue translation mapping.</div><div class='hunk'>@@ -494,7 +493,7 @@</div><div class='ctx'>  * When queue is in Scheduler-ACK mode, frames placed in a that queue must be</div><div class='ctx'>  * for only one combination of receiver address (RA) and traffic ID (TID), i.e.</div><div class='ctx'>  * one QOS priority level destined for one station (for this wireless link,</div><div class='del'>- * not final destination).  The SCD_TRANSLATE_TABLE area provides 16 16-bit</div><div class='add'>+ * not final destination).  The SCD_TRANSLATE_TBL area provides 16 16-bit</div><div class='ctx'>  * mappings, one for each of the 16 queues.  If queue is not in Scheduler-ACK</div><div class='ctx'>  * mode, the device ignores the mapping value.</div><div class='ctx'>  *</div><div class='hunk'>@@ -508,16 +507,16 @@</div><div class='ctx'>  * must read a dword-aligned value from device SRAM, replace the 16-bit map</div><div class='ctx'>  * value of interest, and write the dword value back into device SRAM.</div><div class='ctx'>  */</div><div class='del'>-#define IWL49_SCD_TRANSLATE_TBL_OFFSET		0x500</div><div class='add'>+#define IL49_SCD_TRANSLATE_TBL_OFFSET		0x500</div><div class='ctx'> </div><div class='ctx'> /* Find translation table dword to read/write for given queue */</div><div class='del'>-#define IWL49_SCD_TRANSLATE_TBL_OFFSET_QUEUE(x) \</div><div class='del'>-	((IWL49_SCD_TRANSLATE_TBL_OFFSET + ((x) * 2)) &amp; 0xfffffffc)</div><div class='add'>+#define IL49_SCD_TRANSLATE_TBL_OFFSET_QUEUE(x) \</div><div class='add'>+	((IL49_SCD_TRANSLATE_TBL_OFFSET + ((x) * 2)) &amp; 0xfffffffc)</div><div class='ctx'> </div><div class='del'>-#define IWL_SCD_TXFIFO_POS_TID			(0)</div><div class='del'>-#define IWL_SCD_TXFIFO_POS_RA			(4)</div><div class='del'>-#define IWL_SCD_QUEUE_RA_TID_MAP_RATID_MSK	(0x01FF)</div><div class='add'>+#define IL_SCD_TXFIFO_POS_TID			(0)</div><div class='add'>+#define IL_SCD_TXFIFO_POS_RA			(4)</div><div class='add'>+#define IL_SCD_QUEUE_RA_TID_MAP_RATID_MSK	(0x01FF)</div><div class='ctx'> </div><div class='ctx'> /*********************** END TX SCHEDULER *************************************/</div><div class='ctx'> </div><div class='del'>-#endif				/* __iwl_legacy_prph_h__ */</div><div class='add'>+#endif /* __il_prph_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig<br/>index 57703d5209d7..ae08498dfcad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/Kconfig</a></div><div class='hunk'>@@ -102,12 +102,28 @@ config IWLWIFI_DEVICE_TRACING</div><div class='ctx'> 	  occur.</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='del'>-config IWLWIFI_DEVICE_SVTOOL</div><div class='del'>-	bool "iwlwifi device svtool support"</div><div class='add'>+config IWLWIFI_DEVICE_TESTMODE</div><div class='add'>+	def_bool y</div><div class='ctx'> 	depends on IWLWIFI</div><div class='del'>-	select NL80211_TESTMODE</div><div class='add'>+	depends on NL80211_TESTMODE</div><div class='ctx'> 	help</div><div class='del'>-	  This option enables the svtool support for iwlwifi device through</div><div class='del'>-	  NL80211_TESTMODE. svtool is a software validation tool that runs in</div><div class='del'>-	  the user space and interacts with the device in the kernel space</div><div class='del'>-	  through the generic netlink message via NL80211_TESTMODE channel.</div><div class='add'>+	  This option enables the testmode support for iwlwifi device through</div><div class='add'>+	  NL80211_TESTMODE. This provide the capabilities of enable user space</div><div class='add'>+	  validation applications to interacts with the device through the</div><div class='add'>+	  generic netlink message via NL80211_TESTMODE channel.</div><div class='add'>+</div><div class='add'>+config IWLWIFI_P2P</div><div class='add'>+       bool "iwlwifi experimental P2P support"</div><div class='add'>+       depends on IWLWIFI</div><div class='add'>+       help</div><div class='add'>+         This option enables experimental P2P support for some devices</div><div class='add'>+         based on microcode support. Since P2P support is still under</div><div class='add'>+         development, this option may even enable it for some devices</div><div class='add'>+         now that turn out to not support it in the future due to</div><div class='add'>+         microcode restrictions.</div><div class='add'>+</div><div class='add'>+         To determine if your microcode supports the experimental P2P</div><div class='add'>+         offered by this option, check if the driver advertises AP</div><div class='add'>+         support when it is loaded.</div><div class='add'>+</div><div class='add'>+         Say Y only if you want to experiment with P2P.</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile<br/>index c73e5ed8db5e..9dc84a7354db 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/Makefile</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> # WIFI</div><div class='ctx'> obj-$(CONFIG_IWLWIFI)	+= iwlwifi.o</div><div class='del'>-iwlwifi-objs		:= iwl-agn.o iwl-agn-rs.o</div><div class='del'>-iwlwifi-objs		+= iwl-agn-ucode.o iwl-agn-tx.o</div><div class='add'>+iwlwifi-objs		:= iwl-agn.o iwl-agn-rs.o iwl-mac80211.o</div><div class='add'>+iwlwifi-objs		+= iwl-ucode.o iwl-agn-tx.o</div><div class='ctx'> iwlwifi-objs		+= iwl-agn-lib.o iwl-agn-calib.o iwl-io.o</div><div class='ctx'> iwlwifi-objs		+= iwl-agn-tt.o iwl-agn-sta.o iwl-agn-rx.o</div><div class='ctx'> </div><div class='hunk'>@@ -18,7 +18,7 @@ iwlwifi-objs		+= iwl-trans-pcie.o iwl-trans-pcie-rx.o iwl-trans-pcie-tx.o</div><div class='ctx'> </div><div class='ctx'> iwlwifi-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o</div><div class='ctx'> iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o</div><div class='del'>-iwlwifi-$(CONFIG_IWLWIFI_DEVICE_SVTOOL) += iwl-sv-open.o</div><div class='add'>+iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += iwl-testmode.o</div><div class='ctx'> </div><div class='ctx'> CFLAGS_iwl-devtrace.o := -I$(src)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c<br/>index dd008b0e6417..1ef7bfc2ab25 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-1000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-1000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-1000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-1000.c</a></div><div class='hunk'>@@ -124,10 +124,10 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	if (iwlagn_mod_params.num_of_queues &gt;= IWL_MIN_NUM_QUEUES &amp;&amp;</div><div class='ctx'> 	    iwlagn_mod_params.num_of_queues &lt;= IWLAGN_NUM_QUEUES)</div><div class='del'>-		priv-&gt;cfg-&gt;base_params-&gt;num_of_queues =</div><div class='add'>+		cfg(priv)-&gt;base_params-&gt;num_of_queues =</div><div class='ctx'> 			iwlagn_mod_params.num_of_queues;</div><div class='ctx'> </div><div class='del'>-	hw_params(priv).max_txq_num = priv-&gt;cfg-&gt;base_params-&gt;num_of_queues;</div><div class='add'>+	hw_params(priv).max_txq_num = cfg(priv)-&gt;base_params-&gt;num_of_queues;</div><div class='ctx'> 	priv-&gt;contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;</div><div class='ctx'> </div><div class='ctx'> 	hw_params(priv).max_data_size = IWLAGN_RTC_DATA_SIZE;</div><div class='hunk'>@@ -135,28 +135,19 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ);</div><div class='ctx'> </div><div class='del'>-	hw_params(priv).tx_chains_num = num_of_ant(priv-&gt;cfg-&gt;valid_tx_ant);</div><div class='del'>-	if (priv-&gt;cfg-&gt;rx_with_siso_diversity)</div><div class='add'>+	hw_params(priv).tx_chains_num = num_of_ant(cfg(priv)-&gt;valid_tx_ant);</div><div class='add'>+	if (cfg(priv)-&gt;rx_with_siso_diversity)</div><div class='ctx'> 		hw_params(priv).rx_chains_num = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		hw_params(priv).rx_chains_num =</div><div class='del'>-			num_of_ant(priv-&gt;cfg-&gt;valid_rx_ant);</div><div class='del'>-	hw_params(priv).valid_tx_ant = priv-&gt;cfg-&gt;valid_tx_ant;</div><div class='del'>-	hw_params(priv).valid_rx_ant = priv-&gt;cfg-&gt;valid_rx_ant;</div><div class='add'>+			num_of_ant(cfg(priv)-&gt;valid_rx_ant);</div><div class='add'>+	hw_params(priv).valid_tx_ant = cfg(priv)-&gt;valid_tx_ant;</div><div class='add'>+	hw_params(priv).valid_rx_ant = cfg(priv)-&gt;valid_rx_ant;</div><div class='ctx'> </div><div class='ctx'> 	iwl1000_set_ct_threshold(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* Set initial sensitivity parameters */</div><div class='del'>-	/* Set initial calibration set */</div><div class='ctx'> 	hw_params(priv).sens = &amp;iwl1000_sensitivity;</div><div class='del'>-	hw_params(priv).calib_init_cfg =</div><div class='del'>-			BIT(IWL_CALIB_XTAL)		|</div><div class='del'>-			BIT(IWL_CALIB_LO)		|</div><div class='del'>-			BIT(IWL_CALIB_TX_IQ) 		|</div><div class='del'>-			BIT(IWL_CALIB_TX_IQ_PERD)	|</div><div class='del'>-			BIT(IWL_CALIB_BASE_BAND);</div><div class='del'>-	if (priv-&gt;cfg-&gt;need_dc_calib)</div><div class='del'>-		hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_DC);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c<br/>index 79431977a968..094693328dbb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-2000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-2000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-2000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-2000.c</a></div><div class='hunk'>@@ -86,7 +86,7 @@ static void iwl2000_nic_config(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	iwl_rf_config(priv);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;iq_invert)</div><div class='add'>+	if (cfg(priv)-&gt;iq_invert)</div><div class='ctx'> 		iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,</div><div class='ctx'> 			    CSR_GP_DRIVER_REG_BIT_RADIO_IQ_INVER);</div><div class='ctx'> }</div><div class='hunk'>@@ -120,10 +120,10 @@ static int iwl2000_hw_set_hw_params(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	if (iwlagn_mod_params.num_of_queues &gt;= IWL_MIN_NUM_QUEUES &amp;&amp;</div><div class='ctx'> 	    iwlagn_mod_params.num_of_queues &lt;= IWLAGN_NUM_QUEUES)</div><div class='del'>-		priv-&gt;cfg-&gt;base_params-&gt;num_of_queues =</div><div class='add'>+		cfg(priv)-&gt;base_params-&gt;num_of_queues =</div><div class='ctx'> 			iwlagn_mod_params.num_of_queues;</div><div class='ctx'> </div><div class='del'>-	hw_params(priv).max_txq_num = priv-&gt;cfg-&gt;base_params-&gt;num_of_queues;</div><div class='add'>+	hw_params(priv).max_txq_num = cfg(priv)-&gt;base_params-&gt;num_of_queues;</div><div class='ctx'> 	priv-&gt;contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;</div><div class='ctx'> </div><div class='ctx'> 	hw_params(priv).max_data_size = IWL60_RTC_DATA_SIZE;</div><div class='hunk'>@@ -131,29 +131,19 @@ static int iwl2000_hw_set_hw_params(struct iwl_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ);</div><div class='ctx'> </div><div class='del'>-	hw_params(priv).tx_chains_num = num_of_ant(priv-&gt;cfg-&gt;valid_tx_ant);</div><div class='del'>-	if (priv-&gt;cfg-&gt;rx_with_siso_diversity)</div><div class='add'>+	hw_params(priv).tx_chains_num = num_of_ant(cfg(priv)-&gt;valid_tx_ant);</div><div class='add'>+	if (cfg(priv)-&gt;rx_with_siso_diversity)</div><div class='ctx'> 		hw_params(priv).rx_chains_num = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		hw_params(priv).rx_chains_num =</div><div class='del'>-			num_of_ant(priv-&gt;cfg-&gt;valid_rx_ant);</div><div class='del'>-	hw_params(priv).valid_tx_ant = priv-&gt;cfg-&gt;valid_tx_ant;</div><div class='del'>-	hw_params(priv).valid_rx_ant = priv-&gt;cfg-&gt;valid_rx_ant;</div><div class='add'>+			num_of_ant(cfg(priv)-&gt;valid_rx_ant);</div><div class='add'>+	hw_params(priv).valid_tx_ant = cfg(priv)-&gt;valid_tx_ant;</div><div class='add'>+	hw_params(priv).valid_rx_ant = cfg(priv)-&gt;valid_rx_ant;</div><div class='ctx'> </div><div class='ctx'> 	iwl2000_set_ct_threshold(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* Set initial sensitivity parameters */</div><div class='del'>-	/* Set initial calibration set */</div><div class='ctx'> 	hw_params(priv).sens = &amp;iwl2000_sensitivity;</div><div class='del'>-	hw_params(priv).calib_init_cfg =</div><div class='del'>-		BIT(IWL_CALIB_XTAL)             |</div><div class='del'>-		BIT(IWL_CALIB_LO)               |</div><div class='del'>-		BIT(IWL_CALIB_TX_IQ)            |</div><div class='del'>-		BIT(IWL_CALIB_BASE_BAND);</div><div class='del'>-	if (priv-&gt;cfg-&gt;need_dc_calib)</div><div class='del'>-		hw_params(priv).calib_rt_cfg |= IWL_CALIB_CFG_DC_IDX;</div><div class='del'>-	if (priv-&gt;cfg-&gt;need_temp_offset_calib)</div><div class='del'>-		hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_TEMP_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -258,25 +248,19 @@ static struct iwl_bt_params iwl2030_bt_params = {</div><div class='ctx'> 	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\</div><div class='ctx'> 	.lib = &amp;iwl2000_lib,					\</div><div class='ctx'> 	.base_params = &amp;iwl2000_base_params,			\</div><div class='del'>-	.need_dc_calib = true,					\</div><div class='ctx'> 	.need_temp_offset_calib = true,				\</div><div class='ctx'> 	.temp_offset_v2 = true,					\</div><div class='ctx'> 	.led_mode = IWL_LED_RF_STATE,				\</div><div class='ctx'> 	.iq_invert = true					\</div><div class='ctx'> </div><div class='ctx'> struct iwl_cfg iwl2000_2bgn_cfg = {</div><div class='del'>-	.name = "2000 Series 2x2 BGN",</div><div class='add'>+	.name = "Intel(R) Centrino(R) Wireless-N 2200 BGN",</div><div class='ctx'> 	IWL_DEVICE_2000,</div><div class='ctx'> 	.ht_params = &amp;iwl2000_ht_params,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct iwl_cfg iwl2000_2bg_cfg = {</div><div class='del'>-	.name = "2000 Series 2x2 BG",</div><div class='del'>-	IWL_DEVICE_2000,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct iwl_cfg iwl2000_2bgn_d_cfg = {</div><div class='del'>-	.name = "2000D Series 2x2 BGN",</div><div class='add'>+	.name = "Intel(R) Centrino(R) Wireless-N 2200D BGN",</div><div class='ctx'> 	IWL_DEVICE_2000,</div><div class='ctx'> 	.ht_params = &amp;iwl2000_ht_params,</div><div class='ctx'> };</div><div class='hunk'>@@ -291,7 +275,6 @@ struct iwl_cfg iwl2000_2bgn_d_cfg = {</div><div class='ctx'> 	.lib = &amp;iwl2030_lib,					\</div><div class='ctx'> 	.base_params = &amp;iwl2030_base_params,			\</div><div class='ctx'> 	.bt_params = &amp;iwl2030_bt_params,			\</div><div class='del'>-	.need_dc_calib = true,					\</div><div class='ctx'> 	.need_temp_offset_calib = true,				\</div><div class='ctx'> 	.temp_offset_v2 = true,					\</div><div class='ctx'> 	.led_mode = IWL_LED_RF_STATE,				\</div><div class='hunk'>@@ -299,16 +282,11 @@ struct iwl_cfg iwl2000_2bgn_d_cfg = {</div><div class='ctx'> 	.iq_invert = true					\</div><div class='ctx'> </div><div class='ctx'> struct iwl_cfg iwl2030_2bgn_cfg = {</div><div class='del'>-	.name = "2000 Series 2x2 BGN/BT",</div><div class='add'>+	.name = "Intel(R) Centrino(R) Wireless-N 2230 BGN",</div><div class='ctx'> 	IWL_DEVICE_2030,</div><div class='ctx'> 	.ht_params = &amp;iwl2000_ht_params,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct iwl_cfg iwl2030_2bg_cfg = {</div><div class='del'>-	.name = "2000 Series 2x2 BG/BT",</div><div class='del'>-	IWL_DEVICE_2030,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define IWL_DEVICE_105						\</div><div class='ctx'> 	.fw_name_pre = IWL105_FW_PRE,				\</div><div class='ctx'> 	.ucode_api_max = IWL105_UCODE_API_MAX,			\</div><div class='hunk'>@@ -318,7 +296,6 @@ struct iwl_cfg iwl2030_2bg_cfg = {</div><div class='ctx'> 	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\</div><div class='ctx'> 	.lib = &amp;iwl2000_lib,					\</div><div class='ctx'> 	.base_params = &amp;iwl2000_base_params,			\</div><div class='del'>-	.need_dc_calib = true,					\</div><div class='ctx'> 	.need_temp_offset_calib = true,				\</div><div class='ctx'> 	.temp_offset_v2 = true,					\</div><div class='ctx'> 	.led_mode = IWL_LED_RF_STATE,				\</div><div class='hunk'>@@ -326,19 +303,14 @@ struct iwl_cfg iwl2030_2bg_cfg = {</div><div class='ctx'> 	.rx_with_siso_diversity = true,				\</div><div class='ctx'> 	.iq_invert = true					\</div><div class='ctx'> </div><div class='del'>-struct iwl_cfg iwl105_bg_cfg = {</div><div class='del'>-	.name = "105 Series 1x1 BG",</div><div class='del'>-	IWL_DEVICE_105,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct iwl_cfg iwl105_bgn_cfg = {</div><div class='del'>-	.name = "105 Series 1x1 BGN",</div><div class='add'>+	.name = "Intel(R) Centrino(R) Wireless-N 105 BGN",</div><div class='ctx'> 	IWL_DEVICE_105,</div><div class='ctx'> 	.ht_params = &amp;iwl2000_ht_params,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct iwl_cfg iwl105_bgn_d_cfg = {</div><div class='del'>-	.name = "105D Series 1x1 BGN",</div><div class='add'>+	.name = "Intel(R) Centrino(R) Wireless-N 105D BGN",</div><div class='ctx'> 	IWL_DEVICE_105,</div><div class='ctx'> 	.ht_params = &amp;iwl2000_ht_params,</div><div class='ctx'> };</div><div class='hunk'>@@ -353,7 +325,6 @@ struct iwl_cfg iwl105_bgn_d_cfg = {</div><div class='ctx'> 	.lib = &amp;iwl2030_lib,					\</div><div class='ctx'> 	.base_params = &amp;iwl2030_base_params,			\</div><div class='ctx'> 	.bt_params = &amp;iwl2030_bt_params,			\</div><div class='del'>-	.need_dc_calib = true,					\</div><div class='ctx'> 	.need_temp_offset_calib = true,				\</div><div class='ctx'> 	.temp_offset_v2 = true,					\</div><div class='ctx'> 	.led_mode = IWL_LED_RF_STATE,				\</div><div class='hunk'>@@ -361,13 +332,8 @@ struct iwl_cfg iwl105_bgn_d_cfg = {</div><div class='ctx'> 	.rx_with_siso_diversity = true,				\</div><div class='ctx'> 	.iq_invert = true					\</div><div class='ctx'> </div><div class='del'>-struct iwl_cfg iwl135_bg_cfg = {</div><div class='del'>-	.name = "135 Series 1x1 BG/BT",</div><div class='del'>-	IWL_DEVICE_135,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct iwl_cfg iwl135_bgn_cfg = {</div><div class='del'>-	.name = "135 Series 1x1 BGN/BT",</div><div class='add'>+	.name = "Intel(R) Centrino(R) Wireless-N 135 BGN",</div><div class='ctx'> 	IWL_DEVICE_135,</div><div class='ctx'> 	.ht_params = &amp;iwl2000_ht_params,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c<br/>index f55fb2d1af52..b3a365fea7bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-5000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-5000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-5000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-5000.c</a></div><div class='hunk'>@@ -134,10 +134,10 @@ static struct iwl_sensitivity_ranges iwl5150_sensitivity = {</div><div class='ctx'> </div><div class='ctx'> #define IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF	(-5)</div><div class='ctx'> </div><div class='del'>-static s32 iwl_temp_calib_to_offset(struct iwl_priv *priv)</div><div class='add'>+static s32 iwl_temp_calib_to_offset(struct iwl_shared *shrd)</div><div class='ctx'> {</div><div class='ctx'> 	u16 temperature, voltage;</div><div class='del'>-	__le16 *temp_calib = (__le16 *)iwl_eeprom_query_addr(priv,</div><div class='add'>+	__le16 *temp_calib = (__le16 *)iwl_eeprom_query_addr(shrd,</div><div class='ctx'> 				EEPROM_KELVIN_TEMPERATURE);</div><div class='ctx'> </div><div class='ctx'> 	temperature = le16_to_cpu(temp_calib[0]);</div><div class='hunk'>@@ -151,7 +151,7 @@ static void iwl5150_set_ct_threshold(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	const s32 volt2temp_coef = IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF;</div><div class='ctx'> 	s32 threshold = (s32)CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD_LEGACY) -</div><div class='del'>-			iwl_temp_calib_to_offset(priv);</div><div class='add'>+			iwl_temp_calib_to_offset(priv-&gt;shrd);</div><div class='ctx'> </div><div class='ctx'> 	hw_params(priv).ct_kill_threshold = threshold * volt2temp_coef;</div><div class='ctx'> }</div><div class='hunk'>@@ -166,10 +166,10 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	if (iwlagn_mod_params.num_of_queues &gt;= IWL_MIN_NUM_QUEUES &amp;&amp;</div><div class='ctx'> 	    iwlagn_mod_params.num_of_queues &lt;= IWLAGN_NUM_QUEUES)</div><div class='del'>-		priv-&gt;cfg-&gt;base_params-&gt;num_of_queues =</div><div class='add'>+		cfg(priv)-&gt;base_params-&gt;num_of_queues =</div><div class='ctx'> 			iwlagn_mod_params.num_of_queues;</div><div class='ctx'> </div><div class='del'>-	hw_params(priv).max_txq_num = priv-&gt;cfg-&gt;base_params-&gt;num_of_queues;</div><div class='add'>+	hw_params(priv).max_txq_num = cfg(priv)-&gt;base_params-&gt;num_of_queues;</div><div class='ctx'> 	priv-&gt;contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;</div><div class='ctx'> </div><div class='ctx'> 	hw_params(priv).max_data_size = IWLAGN_RTC_DATA_SIZE;</div><div class='hunk'>@@ -178,22 +178,15 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)</div><div class='ctx'> 	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |</div><div class='ctx'> 					BIT(IEEE80211_BAND_5GHZ);</div><div class='ctx'> </div><div class='del'>-	hw_params(priv).tx_chains_num = num_of_ant(priv-&gt;cfg-&gt;valid_tx_ant);</div><div class='del'>-	hw_params(priv).rx_chains_num = num_of_ant(priv-&gt;cfg-&gt;valid_rx_ant);</div><div class='del'>-	hw_params(priv).valid_tx_ant = priv-&gt;cfg-&gt;valid_tx_ant;</div><div class='del'>-	hw_params(priv).valid_rx_ant = priv-&gt;cfg-&gt;valid_rx_ant;</div><div class='add'>+	hw_params(priv).tx_chains_num = num_of_ant(cfg(priv)-&gt;valid_tx_ant);</div><div class='add'>+	hw_params(priv).rx_chains_num = num_of_ant(cfg(priv)-&gt;valid_rx_ant);</div><div class='add'>+	hw_params(priv).valid_tx_ant = cfg(priv)-&gt;valid_tx_ant;</div><div class='add'>+	hw_params(priv).valid_rx_ant = cfg(priv)-&gt;valid_rx_ant;</div><div class='ctx'> </div><div class='ctx'> 	iwl5000_set_ct_threshold(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* Set initial sensitivity parameters */</div><div class='del'>-	/* Set initial calibration set */</div><div class='ctx'> 	hw_params(priv).sens = &amp;iwl5000_sensitivity;</div><div class='del'>-	hw_params(priv).calib_init_cfg =</div><div class='del'>-		BIT(IWL_CALIB_XTAL)		|</div><div class='del'>-		BIT(IWL_CALIB_LO)		|</div><div class='del'>-		BIT(IWL_CALIB_TX_IQ)		|</div><div class='del'>-		BIT(IWL_CALIB_TX_IQ_PERD)	|</div><div class='del'>-		BIT(IWL_CALIB_BASE_BAND);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -202,10 +195,10 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	if (iwlagn_mod_params.num_of_queues &gt;= IWL_MIN_NUM_QUEUES &amp;&amp;</div><div class='ctx'> 	    iwlagn_mod_params.num_of_queues &lt;= IWLAGN_NUM_QUEUES)</div><div class='del'>-		priv-&gt;cfg-&gt;base_params-&gt;num_of_queues =</div><div class='add'>+		cfg(priv)-&gt;base_params-&gt;num_of_queues =</div><div class='ctx'> 			iwlagn_mod_params.num_of_queues;</div><div class='ctx'> </div><div class='del'>-	hw_params(priv).max_txq_num = priv-&gt;cfg-&gt;base_params-&gt;num_of_queues;</div><div class='add'>+	hw_params(priv).max_txq_num = cfg(priv)-&gt;base_params-&gt;num_of_queues;</div><div class='ctx'> 	priv-&gt;contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;</div><div class='ctx'> </div><div class='ctx'> 	hw_params(priv).max_data_size = IWLAGN_RTC_DATA_SIZE;</div><div class='hunk'>@@ -214,22 +207,15 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv)</div><div class='ctx'> 	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |</div><div class='ctx'> 					BIT(IEEE80211_BAND_5GHZ);</div><div class='ctx'> </div><div class='del'>-	hw_params(priv).tx_chains_num = num_of_ant(priv-&gt;cfg-&gt;valid_tx_ant);</div><div class='del'>-	hw_params(priv).rx_chains_num = num_of_ant(priv-&gt;cfg-&gt;valid_rx_ant);</div><div class='del'>-	hw_params(priv).valid_tx_ant = priv-&gt;cfg-&gt;valid_tx_ant;</div><div class='del'>-	hw_params(priv).valid_rx_ant = priv-&gt;cfg-&gt;valid_rx_ant;</div><div class='add'>+	hw_params(priv).tx_chains_num = num_of_ant(cfg(priv)-&gt;valid_tx_ant);</div><div class='add'>+	hw_params(priv).rx_chains_num = num_of_ant(cfg(priv)-&gt;valid_rx_ant);</div><div class='add'>+	hw_params(priv).valid_tx_ant = cfg(priv)-&gt;valid_tx_ant;</div><div class='add'>+	hw_params(priv).valid_rx_ant = cfg(priv)-&gt;valid_rx_ant;</div><div class='ctx'> </div><div class='ctx'> 	iwl5150_set_ct_threshold(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* Set initial sensitivity parameters */</div><div class='del'>-	/* Set initial calibration set */</div><div class='ctx'> 	hw_params(priv).sens = &amp;iwl5150_sensitivity;</div><div class='del'>-	hw_params(priv).calib_init_cfg =</div><div class='del'>-		BIT(IWL_CALIB_LO)		|</div><div class='del'>-		BIT(IWL_CALIB_TX_IQ)		|</div><div class='del'>-		BIT(IWL_CALIB_BASE_BAND);</div><div class='del'>-	if (priv-&gt;cfg-&gt;need_dc_calib)</div><div class='del'>-		hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_DC);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -237,7 +223,7 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv)</div><div class='ctx'> static void iwl5150_temperature(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	u32 vt = 0;</div><div class='del'>-	s32 offset =  iwl_temp_calib_to_offset(priv);</div><div class='add'>+	s32 offset =  iwl_temp_calib_to_offset(priv-&gt;shrd);</div><div class='ctx'> </div><div class='ctx'> 	vt = le32_to_cpu(priv-&gt;statistics.common.temperature);</div><div class='ctx'> 	vt = vt / IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF + offset;</div><div class='hunk'>@@ -434,7 +420,7 @@ struct iwl_cfg iwl5350_agn_cfg = {</div><div class='ctx'> 	.eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,	\</div><div class='ctx'> 	.lib = &amp;iwl5150_lib,					\</div><div class='ctx'> 	.base_params = &amp;iwl5000_base_params,			\</div><div class='del'>-	.need_dc_calib = true,					\</div><div class='add'>+	.no_xtal_calib = true,					\</div><div class='ctx'> 	.led_mode = IWL_LED_BLINK,				\</div><div class='ctx'> 	.internal_wimax_coex = true</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c<br/>index c840c78278db..54b753399e6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-6000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-6000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-6000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-6000.c</a></div><div class='hunk'>@@ -46,11 +46,12 @@</div><div class='ctx'> #include "iwl-cfg.h"</div><div class='ctx'> </div><div class='ctx'> /* Highest firmware API version supported */</div><div class='del'>-#define IWL6000_UCODE_API_MAX 4</div><div class='add'>+#define IWL6000_UCODE_API_MAX 6</div><div class='ctx'> #define IWL6050_UCODE_API_MAX 5</div><div class='ctx'> #define IWL6000G2_UCODE_API_MAX 6</div><div class='ctx'> </div><div class='ctx'> /* Oldest version we won't warn about */</div><div class='add'>+#define IWL6000_UCODE_API_OK 4</div><div class='ctx'> #define IWL6000G2_UCODE_API_OK 5</div><div class='ctx'> </div><div class='ctx'> /* Lowest firmware API version supported */</div><div class='hunk'>@@ -80,7 +81,7 @@ static void iwl6000_set_ct_threshold(struct iwl_priv *priv)</div><div class='ctx'> static void iwl6050_additional_nic_config(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	/* Indicate calibration version to uCode. */</div><div class='del'>-	if (iwlagn_eeprom_calib_version(priv) &gt;= 6)</div><div class='add'>+	if (iwl_eeprom_calib_version(priv-&gt;shrd) &gt;= 6)</div><div class='ctx'> 		iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,</div><div class='ctx'> 				CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);</div><div class='ctx'> }</div><div class='hunk'>@@ -88,7 +89,7 @@ static void iwl6050_additional_nic_config(struct iwl_priv *priv)</div><div class='ctx'> static void iwl6150_additional_nic_config(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	/* Indicate calibration version to uCode. */</div><div class='del'>-	if (iwlagn_eeprom_calib_version(priv) &gt;= 6)</div><div class='add'>+	if (iwl_eeprom_calib_version(priv-&gt;shrd) &gt;= 6)</div><div class='ctx'> 		iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,</div><div class='ctx'> 				CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);</div><div class='ctx'> 	iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,</div><div class='hunk'>@@ -101,14 +102,14 @@ static void iwl6000_nic_config(struct iwl_priv *priv)</div><div class='ctx'> 	iwl_rf_config(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* no locking required for register write */</div><div class='del'>-	if (priv-&gt;cfg-&gt;pa_type == IWL_PA_INTERNAL) {</div><div class='add'>+	if (cfg(priv)-&gt;pa_type == IWL_PA_INTERNAL) {</div><div class='ctx'> 		/* 2x2 IPA phy type */</div><div class='ctx'> 		iwl_write32(bus(priv), CSR_GP_DRIVER_REG,</div><div class='ctx'> 			     CSR_GP_DRIVER_REG_BIT_RADIO_SKU_2x2_IPA);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* do additional nic configuration if needed */</div><div class='del'>-	if (priv-&gt;cfg-&gt;additional_nic_config)</div><div class='del'>-			priv-&gt;cfg-&gt;additional_nic_config(priv);</div><div class='add'>+	if (cfg(priv)-&gt;additional_nic_config)</div><div class='add'>+			cfg(priv)-&gt;additional_nic_config(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct iwl_sensitivity_ranges iwl6000_sensitivity = {</div><div class='hunk'>@@ -140,10 +141,10 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	if (iwlagn_mod_params.num_of_queues &gt;= IWL_MIN_NUM_QUEUES &amp;&amp;</div><div class='ctx'> 	    iwlagn_mod_params.num_of_queues &lt;= IWLAGN_NUM_QUEUES)</div><div class='del'>-		priv-&gt;cfg-&gt;base_params-&gt;num_of_queues =</div><div class='add'>+		cfg(priv)-&gt;base_params-&gt;num_of_queues =</div><div class='ctx'> 			iwlagn_mod_params.num_of_queues;</div><div class='ctx'> </div><div class='del'>-	hw_params(priv).max_txq_num = priv-&gt;cfg-&gt;base_params-&gt;num_of_queues;</div><div class='add'>+	hw_params(priv).max_txq_num = cfg(priv)-&gt;base_params-&gt;num_of_queues;</div><div class='ctx'> 	priv-&gt;contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;</div><div class='ctx'> </div><div class='ctx'> 	hw_params(priv).max_data_size = IWL60_RTC_DATA_SIZE;</div><div class='hunk'>@@ -152,29 +153,19 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv)</div><div class='ctx'> 	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |</div><div class='ctx'> 					BIT(IEEE80211_BAND_5GHZ);</div><div class='ctx'> </div><div class='del'>-	hw_params(priv).tx_chains_num = num_of_ant(priv-&gt;cfg-&gt;valid_tx_ant);</div><div class='del'>-	if (priv-&gt;cfg-&gt;rx_with_siso_diversity)</div><div class='add'>+	hw_params(priv).tx_chains_num = num_of_ant(cfg(priv)-&gt;valid_tx_ant);</div><div class='add'>+	if (cfg(priv)-&gt;rx_with_siso_diversity)</div><div class='ctx'> 		hw_params(priv).rx_chains_num = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		hw_params(priv).rx_chains_num =</div><div class='del'>-			num_of_ant(priv-&gt;cfg-&gt;valid_rx_ant);</div><div class='del'>-	hw_params(priv).valid_tx_ant = priv-&gt;cfg-&gt;valid_tx_ant;</div><div class='del'>-	hw_params(priv).valid_rx_ant = priv-&gt;cfg-&gt;valid_rx_ant;</div><div class='add'>+			num_of_ant(cfg(priv)-&gt;valid_rx_ant);</div><div class='add'>+	hw_params(priv).valid_tx_ant = cfg(priv)-&gt;valid_tx_ant;</div><div class='add'>+	hw_params(priv).valid_rx_ant = cfg(priv)-&gt;valid_rx_ant;</div><div class='ctx'> </div><div class='ctx'> 	iwl6000_set_ct_threshold(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* Set initial sensitivity parameters */</div><div class='del'>-	/* Set initial calibration set */</div><div class='ctx'> 	hw_params(priv).sens = &amp;iwl6000_sensitivity;</div><div class='del'>-	hw_params(priv).calib_init_cfg =</div><div class='del'>-		BIT(IWL_CALIB_XTAL)		|</div><div class='del'>-		BIT(IWL_CALIB_LO)		|</div><div class='del'>-		BIT(IWL_CALIB_TX_IQ)		|</div><div class='del'>-		BIT(IWL_CALIB_BASE_BAND);</div><div class='del'>-	if (priv-&gt;cfg-&gt;need_dc_calib)</div><div class='del'>-		hw_params(priv).calib_rt_cfg |= IWL_CALIB_CFG_DC_IDX;</div><div class='del'>-	if (priv-&gt;cfg-&gt;need_temp_offset_calib)</div><div class='del'>-		hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_TEMP_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -364,7 +355,6 @@ static struct iwl_bt_params iwl6000_bt_params = {</div><div class='ctx'> 	.eeprom_calib_ver = EEPROM_6005_TX_POWER_VERSION,	\</div><div class='ctx'> 	.lib = &amp;iwl6000_lib,					\</div><div class='ctx'> 	.base_params = &amp;iwl6000_g2_base_params,			\</div><div class='del'>-	.need_dc_calib = true,					\</div><div class='ctx'> 	.need_temp_offset_calib = true,				\</div><div class='ctx'> 	.led_mode = IWL_LED_RF_STATE</div><div class='ctx'> </div><div class='hunk'>@@ -406,7 +396,6 @@ struct iwl_cfg iwl6005_2agn_d_cfg = {</div><div class='ctx'> 	.lib = &amp;iwl6030_lib,					\</div><div class='ctx'> 	.base_params = &amp;iwl6000_g2_base_params,			\</div><div class='ctx'> 	.bt_params = &amp;iwl6000_bt_params,			\</div><div class='del'>-	.need_dc_calib = true,					\</div><div class='ctx'> 	.need_temp_offset_calib = true,				\</div><div class='ctx'> 	.led_mode = IWL_LED_RF_STATE,				\</div><div class='ctx'> 	.adv_pm = true						\</div><div class='hunk'>@@ -434,21 +423,11 @@ struct iwl_cfg iwl6030_2bg_cfg = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct iwl_cfg iwl6035_2agn_cfg = {</div><div class='del'>-	.name = "6035 Series 2x2 AGN/BT",</div><div class='add'>+	.name = "Intel(R) Centrino(R) Advanced-N 6235 AGN",</div><div class='ctx'> 	IWL_DEVICE_6030,</div><div class='ctx'> 	.ht_params = &amp;iwl6000_ht_params,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct iwl_cfg iwl6035_2abg_cfg = {</div><div class='del'>-	.name = "6035 Series 2x2 ABG/BT",</div><div class='del'>-	IWL_DEVICE_6030,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iwl_cfg iwl6035_2bg_cfg = {</div><div class='del'>-	.name = "6035 Series 2x2 BG/BT",</div><div class='del'>-	IWL_DEVICE_6030,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct iwl_cfg iwl1030_bgn_cfg = {</div><div class='ctx'> 	.name = "Intel(R) Centrino(R) Wireless-N 1030 BGN",</div><div class='ctx'> 	IWL_DEVICE_6030,</div><div class='hunk'>@@ -479,6 +458,7 @@ struct iwl_cfg iwl130_bg_cfg = {</div><div class='ctx'> #define IWL_DEVICE_6000i					\</div><div class='ctx'> 	.fw_name_pre = IWL6000_FW_PRE,				\</div><div class='ctx'> 	.ucode_api_max = IWL6000_UCODE_API_MAX,			\</div><div class='add'>+	.ucode_api_ok = IWL6000_UCODE_API_OK,			\</div><div class='ctx'> 	.ucode_api_min = IWL6000_UCODE_API_MIN,			\</div><div class='ctx'> 	.valid_tx_ant = ANT_BC,		/* .cfg overwrite */	\</div><div class='ctx'> 	.valid_rx_ant = ANT_BC,		/* .cfg overwrite */	\</div><div class='hunk'>@@ -516,7 +496,6 @@ struct iwl_cfg iwl6000i_2bg_cfg = {</div><div class='ctx'> 	.eeprom_ver = EEPROM_6050_EEPROM_VERSION,		\</div><div class='ctx'> 	.eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,	\</div><div class='ctx'> 	.base_params = &amp;iwl6050_base_params,			\</div><div class='del'>-	.need_dc_calib = true,					\</div><div class='ctx'> 	.led_mode = IWL_LED_BLINK,				\</div><div class='ctx'> 	.internal_wimax_coex = true</div><div class='ctx'> </div><div class='hunk'>@@ -540,7 +519,6 @@ struct iwl_cfg iwl6050_2abg_cfg = {</div><div class='ctx'> 	.eeprom_ver = EEPROM_6150_EEPROM_VERSION,		\</div><div class='ctx'> 	.eeprom_calib_ver = EEPROM_6150_TX_POWER_VERSION,	\</div><div class='ctx'> 	.base_params = &amp;iwl6050_base_params,			\</div><div class='del'>-	.need_dc_calib = true,					\</div><div class='ctx'> 	.led_mode = IWL_LED_BLINK,				\</div><div class='ctx'> 	.internal_wimax_coex = true</div><div class='ctx'> </div><div class='hunk'>@@ -559,17 +537,17 @@ struct iwl_cfg iwl6000_3agn_cfg = {</div><div class='ctx'> 	.name = "Intel(R) Centrino(R) Ultimate-N 6300 AGN",</div><div class='ctx'> 	.fw_name_pre = IWL6000_FW_PRE,</div><div class='ctx'> 	.ucode_api_max = IWL6000_UCODE_API_MAX,</div><div class='add'>+	.ucode_api_ok = IWL6000_UCODE_API_OK,</div><div class='ctx'> 	.ucode_api_min = IWL6000_UCODE_API_MIN,</div><div class='ctx'> 	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,</div><div class='ctx'> 	.eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,</div><div class='ctx'> 	.lib = &amp;iwl6000_lib,</div><div class='ctx'> 	.base_params = &amp;iwl6000_base_params,</div><div class='ctx'> 	.ht_params = &amp;iwl6000_ht_params,</div><div class='del'>-	.need_dc_calib = true,</div><div class='ctx'> 	.led_mode = IWL_LED_BLINK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));</div><div class='add'>+MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_OK));</div><div class='ctx'> MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));</div><div class='ctx'> MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));</div><div class='ctx'> MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c<br/>index 03bac48558b2..50ff849c9f67 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-calib.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-calib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-calib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-agn-calib.c</a></div><div class='hunk'>@@ -82,56 +82,64 @@ struct statistics_general_data {</div><div class='ctx'> 	u32 beacon_energy_c;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int iwl_send_calib_results(struct iwl_priv *priv)</div><div class='add'>+int iwl_send_calib_results(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='ctx'> 	struct iwl_host_cmd hcmd = {</div><div class='ctx'> 		.id = REPLY_PHY_CALIBRATION_CMD,</div><div class='ctx'> 		.flags = CMD_SYNC,</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; IWL_CALIB_MAX; i++) {</div><div class='del'>-		if ((BIT(i) &amp; hw_params(priv).calib_init_cfg) &amp;&amp;</div><div class='del'>-		    priv-&gt;calib_results[i].buf) {</div><div class='del'>-			hcmd.len[0] = priv-&gt;calib_results[i].buf_len;</div><div class='del'>-			hcmd.data[0] = priv-&gt;calib_results[i].buf;</div><div class='del'>-			hcmd.dataflags[0] = IWL_HCMD_DFL_NOCOPY;</div><div class='del'>-			ret = iwl_trans_send_cmd(trans(priv), &amp;hcmd);</div><div class='del'>-			if (ret) {</div><div class='del'>-				IWL_ERR(priv, "Error %d iteration %d\n",</div><div class='del'>-					ret, i);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+	struct iwl_calib_result *res;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(res, &amp;trans-&gt;calib_results, list) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		hcmd.len[0] = res-&gt;cmd_len;</div><div class='add'>+		hcmd.data[0] = &amp;res-&gt;hdr;</div><div class='add'>+		hcmd.dataflags[0] = IWL_HCMD_DFL_NOCOPY;</div><div class='add'>+		ret = iwl_trans_send_cmd(trans, &amp;hcmd);</div><div class='add'>+		if (ret) {</div><div class='add'>+			IWL_ERR(trans, "Error %d on calib cmd %d\n",</div><div class='add'>+				ret, res-&gt;hdr.op_code);</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</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='del'>-int iwl_calib_set(struct iwl_calib_result *res, const u8 *buf, int len)</div><div class='add'>+int iwl_calib_set(struct iwl_trans *trans,</div><div class='add'>+		  const struct iwl_calib_hdr *cmd, int len)</div><div class='ctx'> {</div><div class='del'>-	if (res-&gt;buf_len != len) {</div><div class='del'>-		kfree(res-&gt;buf);</div><div class='del'>-		res-&gt;buf = kzalloc(len, GFP_ATOMIC);</div><div class='del'>-	}</div><div class='del'>-	if (unlikely(res-&gt;buf == NULL))</div><div class='add'>+	struct iwl_calib_result *res, *tmp;</div><div class='add'>+</div><div class='add'>+	res = kmalloc(sizeof(*res) + len - sizeof(struct iwl_calib_hdr),</div><div class='add'>+		      GFP_ATOMIC);</div><div class='add'>+	if (!res)</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	memcpy(&amp;res-&gt;hdr, cmd, len);</div><div class='add'>+	res-&gt;cmd_len = len;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(tmp, &amp;trans-&gt;calib_results, list) {</div><div class='add'>+		if (tmp-&gt;hdr.op_code == res-&gt;hdr.op_code) {</div><div class='add'>+			list_replace(&amp;tmp-&gt;list, &amp;res-&gt;list);</div><div class='add'>+			kfree(tmp);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* wasn't in list already */</div><div class='add'>+	list_add_tail(&amp;res-&gt;list, &amp;trans-&gt;calib_results);</div><div class='ctx'> </div><div class='del'>-	res-&gt;buf_len = len;</div><div class='del'>-	memcpy(res-&gt;buf, buf, len);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_calib_free_results(struct iwl_priv *priv)</div><div class='add'>+void iwl_calib_free_results(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	struct iwl_calib_result *res, *tmp;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; IWL_CALIB_MAX; i++) {</div><div class='del'>-		kfree(priv-&gt;calib_results[i].buf);</div><div class='del'>-		priv-&gt;calib_results[i].buf = NULL;</div><div class='del'>-		priv-&gt;calib_results[i].buf_len = 0;</div><div class='add'>+	list_for_each_entry_safe(res, tmp, &amp;trans-&gt;calib_results, list) {</div><div class='add'>+		list_del(&amp;res-&gt;list);</div><div class='add'>+		kfree(res);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -505,7 +513,7 @@ static int iwl_enhance_sensitivity_write(struct iwl_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	iwl_prepare_legacy_sensitivity_tbl(priv, data, &amp;cmd.enhance_table[0]);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;base_params-&gt;hd_v2) {</div><div class='add'>+	if (cfg(priv)-&gt;base_params-&gt;hd_v2) {</div><div class='ctx'> 		cmd.enhance_table[HD_INA_NON_SQUARE_DET_OFDM_INDEX] =</div><div class='ctx'> 			HD_INA_NON_SQUARE_DET_OFDM_DATA_V2;</div><div class='ctx'> 		cmd.enhance_table[HD_INA_NON_SQUARE_DET_CCK_INDEX] =</div><div class='hunk'>@@ -839,7 +847,7 @@ static void iwl_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,</div><div class='ctx'> 			 * connect the first valid tx chain</div><div class='ctx'> 			 */</div><div class='ctx'> 			first_chain =</div><div class='del'>-				find_first_chain(priv-&gt;cfg-&gt;valid_tx_ant);</div><div class='add'>+				find_first_chain(cfg(priv)-&gt;valid_tx_ant);</div><div class='ctx'> 			data-&gt;disconn_array[first_chain] = 0;</div><div class='ctx'> 			active_chains |= BIT(first_chain);</div><div class='ctx'> 			IWL_DEBUG_CALIB(priv,</div><div class='hunk'>@@ -882,7 +890,7 @@ static void iwlagn_gain_computation(struct iwl_priv *priv,</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		delta_g = (priv-&gt;cfg-&gt;base_params-&gt;chain_noise_scale *</div><div class='add'>+		delta_g = (cfg(priv)-&gt;base_params-&gt;chain_noise_scale *</div><div class='ctx'> 			((s32)average_noise[default_chain] -</div><div class='ctx'> 			(s32)average_noise[i])) / 1500;</div><div class='ctx'> </div><div class='hunk'>@@ -1039,8 +1047,8 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Analyze signal for disconnected antenna */</div><div class='del'>-	if (priv-&gt;cfg-&gt;bt_params &amp;&amp;</div><div class='del'>-	    priv-&gt;cfg-&gt;bt_params-&gt;advanced_bt_coexist) {</div><div class='add'>+	if (cfg(priv)-&gt;bt_params &amp;&amp;</div><div class='add'>+	    cfg(priv)-&gt;bt_params-&gt;advanced_bt_coexist) {</div><div class='ctx'> 		/* Disable disconnected antenna algorithm for advanced</div><div class='ctx'> 		   bt coex, assuming valid antennas are connected */</div><div class='ctx'> 		data-&gt;active_chains = hw_params(priv).valid_rx_ant;</div><div class='hunk'>@@ -1074,7 +1082,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	iwlagn_gain_computation(priv, average_noise,</div><div class='ctx'> 				min_average_noise_antenna_i, min_average_noise,</div><div class='del'>-				find_first_chain(priv-&gt;cfg-&gt;valid_rx_ant));</div><div class='add'>+				find_first_chain(cfg(priv)-&gt;valid_rx_ant));</div><div class='ctx'> </div><div class='ctx'> 	/* Some power changes may have been made during the calibration.</div><div class='ctx'> 	 * Update and commit the RXON</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-calib.h b/drivers/net/wireless/iwlwifi/iwl-agn-calib.h<br/>index a869fc9205d2..10275ce92bde 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-calib.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-calib.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-calib.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-agn-calib.h</a></div><div class='hunk'>@@ -72,8 +72,4 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv);</div><div class='ctx'> void iwl_init_sensitivity(struct iwl_priv *priv);</div><div class='ctx'> void iwl_reset_run_time_calib(struct iwl_priv *priv);</div><div class='ctx'> </div><div class='del'>-int iwl_send_calib_results(struct iwl_priv *priv);</div><div class='del'>-int iwl_calib_set(struct iwl_calib_result *res, const u8 *buf, int len);</div><div class='del'>-void iwl_calib_free_results(struct iwl_priv *priv);</div><div class='del'>-</div><div class='ctx'> #endif /* __iwl_calib_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c<br/>index 1a52ed29f2d6..64cf439035c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-lib.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-lib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-lib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-agn-lib.c</a></div><div class='hunk'>@@ -32,6 +32,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "iwl-wifi.h"</div><div class='ctx'> #include "iwl-dev.h"</div><div class='ctx'> #include "iwl-core.h"</div><div class='ctx'> #include "iwl-io.h"</div><div class='hunk'>@@ -92,11 +93,11 @@ void iwlagn_temperature(struct iwl_priv *priv)</div><div class='ctx'> 	iwl_tt_handler(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 iwlagn_eeprom_calib_version(struct iwl_priv *priv)</div><div class='add'>+u16 iwl_eeprom_calib_version(struct iwl_shared *shrd)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_eeprom_calib_hdr *hdr;</div><div class='ctx'> </div><div class='del'>-	hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(priv,</div><div class='add'>+	hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(shrd,</div><div class='ctx'> 							EEPROM_CALIB_ALL);</div><div class='ctx'> 	return hdr-&gt;version;</div><div class='ctx'> </div><div class='hunk'>@@ -105,7 +106,7 @@ u16 iwlagn_eeprom_calib_version(struct iwl_priv *priv)</div><div class='ctx'> /*</div><div class='ctx'>  * EEPROM</div><div class='ctx'>  */</div><div class='del'>-static u32 eeprom_indirect_address(const struct iwl_priv *priv, u32 address)</div><div class='add'>+static u32 eeprom_indirect_address(const struct iwl_shared *shrd, u32 address)</div><div class='ctx'> {</div><div class='ctx'> 	u16 offset = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -114,31 +115,31 @@ static u32 eeprom_indirect_address(const struct iwl_priv *priv, u32 address)</div><div class='ctx'> </div><div class='ctx'> 	switch (address &amp; INDIRECT_TYPE_MSK) {</div><div class='ctx'> 	case INDIRECT_HOST:</div><div class='del'>-		offset = iwl_eeprom_query16(priv, EEPROM_LINK_HOST);</div><div class='add'>+		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_HOST);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case INDIRECT_GENERAL:</div><div class='del'>-		offset = iwl_eeprom_query16(priv, EEPROM_LINK_GENERAL);</div><div class='add'>+		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_GENERAL);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case INDIRECT_REGULATORY:</div><div class='del'>-		offset = iwl_eeprom_query16(priv, EEPROM_LINK_REGULATORY);</div><div class='add'>+		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_REGULATORY);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case INDIRECT_TXP_LIMIT:</div><div class='del'>-		offset = iwl_eeprom_query16(priv, EEPROM_LINK_TXP_LIMIT);</div><div class='add'>+		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_TXP_LIMIT);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case INDIRECT_TXP_LIMIT_SIZE:</div><div class='del'>-		offset = iwl_eeprom_query16(priv, EEPROM_LINK_TXP_LIMIT_SIZE);</div><div class='add'>+		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_TXP_LIMIT_SIZE);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case INDIRECT_CALIBRATION:</div><div class='del'>-		offset = iwl_eeprom_query16(priv, EEPROM_LINK_CALIBRATION);</div><div class='add'>+		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_CALIBRATION);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case INDIRECT_PROCESS_ADJST:</div><div class='del'>-		offset = iwl_eeprom_query16(priv, EEPROM_LINK_PROCESS_ADJST);</div><div class='add'>+		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_PROCESS_ADJST);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case INDIRECT_OTHERS:</div><div class='del'>-		offset = iwl_eeprom_query16(priv, EEPROM_LINK_OTHERS);</div><div class='add'>+		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_OTHERS);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		IWL_ERR(priv, "illegal indirect type: 0x%X\n",</div><div class='add'>+		IWL_ERR(shrd-&gt;trans, "illegal indirect type: 0x%X\n",</div><div class='ctx'> 		address &amp; INDIRECT_TYPE_MSK);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -147,11 +148,11 @@ static u32 eeprom_indirect_address(const struct iwl_priv *priv, u32 address)</div><div class='ctx'> 	return (address &amp; ADDRESS_MSK) + (offset &lt;&lt; 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const u8 *iwl_eeprom_query_addr(const struct iwl_priv *priv, size_t offset)</div><div class='add'>+const u8 *iwl_eeprom_query_addr(const struct iwl_shared *shrd, size_t offset)</div><div class='ctx'> {</div><div class='del'>-	u32 address = eeprom_indirect_address(priv, offset);</div><div class='del'>-	BUG_ON(address &gt;= priv-&gt;cfg-&gt;base_params-&gt;eeprom_size);</div><div class='del'>-	return &amp;priv-&gt;eeprom[address];</div><div class='add'>+	u32 address = eeprom_indirect_address(shrd, offset);</div><div class='add'>+	BUG_ON(address &gt;= shrd-&gt;cfg-&gt;base_params-&gt;eeprom_size);</div><div class='add'>+	return &amp;shrd-&gt;eeprom[address];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct iwl_mod_params iwlagn_mod_params = {</div><div class='hunk'>@@ -232,7 +233,7 @@ int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control)</div><div class='ctx'> 				IWL_PAN_SCD_BK_MSK | IWL_PAN_SCD_MGMT_MSK |</div><div class='ctx'> 				IWL_PAN_SCD_MULTICAST_MSK;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;sku &amp; EEPROM_SKU_CAP_11N_ENABLE)</div><div class='add'>+	if (cfg(priv)-&gt;sku &amp; EEPROM_SKU_CAP_11N_ENABLE)</div><div class='ctx'> 		flush_cmd.fifo_control |= IWL_AGG_TX_QUEUE_MSK;</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_INFO(priv, "fifo queue control: 0X%x\n",</div><div class='hunk'>@@ -374,15 +375,15 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv)</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(iwlagn_def_3w_lookup) !=</div><div class='ctx'> 			sizeof(basic.bt3_lookup_table));</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;bt_params) {</div><div class='del'>-		if (priv-&gt;cfg-&gt;bt_params-&gt;bt_session_2) {</div><div class='add'>+	if (cfg(priv)-&gt;bt_params) {</div><div class='add'>+		if (cfg(priv)-&gt;bt_params-&gt;bt_session_2) {</div><div class='ctx'> 			bt_cmd_2000.prio_boost = cpu_to_le32(</div><div class='del'>-				priv-&gt;cfg-&gt;bt_params-&gt;bt_prio_boost);</div><div class='add'>+				cfg(priv)-&gt;bt_params-&gt;bt_prio_boost);</div><div class='ctx'> 			bt_cmd_2000.tx_prio_boost = 0;</div><div class='ctx'> 			bt_cmd_2000.rx_prio_boost = 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			bt_cmd_6000.prio_boost =</div><div class='del'>-				priv-&gt;cfg-&gt;bt_params-&gt;bt_prio_boost;</div><div class='add'>+				cfg(priv)-&gt;bt_params-&gt;bt_prio_boost;</div><div class='ctx'> 			bt_cmd_6000.tx_prio_boost = 0;</div><div class='ctx'> 			bt_cmd_6000.rx_prio_boost = 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -430,7 +431,7 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv)</div><div class='ctx'> 		       priv-&gt;bt_full_concurrent ?</div><div class='ctx'> 		       "full concurrency" : "3-wire");</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;bt_params-&gt;bt_session_2) {</div><div class='add'>+	if (cfg(priv)-&gt;bt_params-&gt;bt_session_2) {</div><div class='ctx'> 		memcpy(&amp;bt_cmd_2000.basic, &amp;basic,</div><div class='ctx'> 			sizeof(basic));</div><div class='ctx'> 		ret = iwl_trans_send_cmd_pdu(trans(priv), REPLY_BT_CONFIG,</div><div class='hunk'>@@ -799,8 +800,8 @@ static bool is_single_rx_stream(struct iwl_priv *priv)</div><div class='ctx'>  */</div><div class='ctx'> static int iwl_get_active_rx_chain_count(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	if (priv-&gt;cfg-&gt;bt_params &amp;&amp;</div><div class='del'>-	    priv-&gt;cfg-&gt;bt_params-&gt;advanced_bt_coexist &amp;&amp;</div><div class='add'>+	if (cfg(priv)-&gt;bt_params &amp;&amp;</div><div class='add'>+	    cfg(priv)-&gt;bt_params-&gt;advanced_bt_coexist &amp;&amp;</div><div class='ctx'> 	    (priv-&gt;bt_full_concurrent ||</div><div class='ctx'> 	     priv-&gt;bt_traffic_load &gt;= IWL_BT_COEX_TRAFFIC_LOAD_HIGH)) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -827,6 +828,7 @@ static int iwl_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt)</div><div class='ctx'> 	case IEEE80211_SMPS_STATIC:</div><div class='ctx'> 	case IEEE80211_SMPS_DYNAMIC:</div><div class='ctx'> 		return IWL_NUM_IDLE_CHAINS_SINGLE;</div><div class='add'>+	case IEEE80211_SMPS_AUTOMATIC:</div><div class='ctx'> 	case IEEE80211_SMPS_OFF:</div><div class='ctx'> 		return active_cnt;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -870,8 +872,8 @@ void iwlagn_set_rxon_chain(struct iwl_priv *priv, struct iwl_rxon_context *ctx)</div><div class='ctx'> 	else</div><div class='ctx'> 		active_chains = hw_params(priv).valid_rx_ant;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;bt_params &amp;&amp;</div><div class='del'>-	    priv-&gt;cfg-&gt;bt_params-&gt;advanced_bt_coexist &amp;&amp;</div><div class='add'>+	if (cfg(priv)-&gt;bt_params &amp;&amp;</div><div class='add'>+	    cfg(priv)-&gt;bt_params-&gt;advanced_bt_coexist &amp;&amp;</div><div class='ctx'> 	    (priv-&gt;bt_full_concurrent ||</div><div class='ctx'> 	     priv-&gt;bt_traffic_load &gt;= IWL_BT_COEX_TRAFFIC_LOAD_HIGH)) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -933,53 +935,359 @@ u8 iwl_toggle_tx_ant(struct iwl_priv *priv, u8 ant, u8 valid)</div><div class='ctx'> 	return ant;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* notification wait support */</div><div class='del'>-void iwlagn_init_notification_wait(struct iwl_priv *priv,</div><div class='del'>-				   struct iwl_notification_wait *wait_entry,</div><div class='del'>-				   u8 cmd,</div><div class='del'>-				   void (*fn)(struct iwl_priv *priv,</div><div class='del'>-					      struct iwl_rx_packet *pkt,</div><div class='del'>-					      void *data),</div><div class='del'>-				   void *fn_data)</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static void iwlagn_convert_p1k(u16 *p1k, __le16 *out)</div><div class='ctx'> {</div><div class='del'>-	wait_entry-&gt;fn = fn;</div><div class='del'>-	wait_entry-&gt;fn_data = fn_data;</div><div class='del'>-	wait_entry-&gt;cmd = cmd;</div><div class='del'>-	wait_entry-&gt;triggered = false;</div><div class='del'>-	wait_entry-&gt;aborted = false;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;priv-&gt;notif_wait_lock);</div><div class='del'>-	list_add(&amp;wait_entry-&gt;list, &amp;priv-&gt;notif_waits);</div><div class='del'>-	spin_unlock_bh(&amp;priv-&gt;notif_wait_lock);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IWLAGN_P1K_SIZE; i++)</div><div class='add'>+		out[i] = cpu_to_le16(p1k[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwlagn_wait_notification(struct iwl_priv *priv,</div><div class='del'>-			     struct iwl_notification_wait *wait_entry,</div><div class='del'>-			     unsigned long timeout)</div><div class='add'>+struct wowlan_key_data {</div><div class='add'>+	struct iwl_rxon_context *ctx;</div><div class='add'>+	struct iwlagn_wowlan_rsc_tsc_params_cmd *rsc_tsc;</div><div class='add'>+	struct iwlagn_wowlan_tkip_params_cmd *tkip;</div><div class='add'>+	const u8 *bssid;</div><div class='add'>+	bool error, use_rsc_tsc, use_tkip;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void iwlagn_wowlan_program_keys(struct ieee80211_hw *hw,</div><div class='add'>+			       struct ieee80211_vif *vif,</div><div class='add'>+			       struct ieee80211_sta *sta,</div><div class='add'>+			       struct ieee80211_key_conf *key,</div><div class='add'>+			       void *_data)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	struct wowlan_key_data *data = _data;</div><div class='add'>+	struct iwl_rxon_context *ctx = data-&gt;ctx;</div><div class='add'>+	struct aes_sc *aes_sc, *aes_tx_sc = NULL;</div><div class='add'>+	struct tkip_sc *tkip_sc, *tkip_tx_sc = NULL;</div><div class='add'>+	struct iwlagn_p1k_cache *rx_p1ks;</div><div class='add'>+	u8 *rx_mic_key;</div><div class='add'>+	struct ieee80211_key_seq seq;</div><div class='add'>+	u32 cur_rx_iv32 = 0;</div><div class='add'>+	u16 p1k[IWLAGN_P1K_SIZE];</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	ret = wait_event_timeout(priv-&gt;notif_waitq,</div><div class='del'>-				 wait_entry-&gt;triggered || wait_entry-&gt;aborted,</div><div class='del'>-				 timeout);</div><div class='add'>+	if ((key-&gt;cipher == WLAN_CIPHER_SUITE_WEP40 ||</div><div class='add'>+	     key-&gt;cipher == WLAN_CIPHER_SUITE_WEP104) &amp;&amp;</div><div class='add'>+	     !sta &amp;&amp; !ctx-&gt;key_mapping_keys)</div><div class='add'>+		ret = iwl_set_default_wep_key(priv, ctx, key);</div><div class='add'>+	else</div><div class='add'>+		ret = iwl_set_dynamic_key(priv, ctx, key, sta);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;priv-&gt;notif_wait_lock);</div><div class='del'>-	list_del(&amp;wait_entry-&gt;list);</div><div class='del'>-	spin_unlock_bh(&amp;priv-&gt;notif_wait_lock);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(priv, "Error setting key during suspend!\n");</div><div class='add'>+		data-&gt;error = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (wait_entry-&gt;aborted)</div><div class='del'>-		return -EIO;</div><div class='add'>+	switch (key-&gt;cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		if (sta) {</div><div class='add'>+			tkip_sc = data-&gt;rsc_tsc-&gt;all_tsc_rsc.tkip.unicast_rsc;</div><div class='add'>+			tkip_tx_sc = &amp;data-&gt;rsc_tsc-&gt;all_tsc_rsc.tkip.tsc;</div><div class='ctx'> </div><div class='del'>-	/* return value is always &gt;= 0 */</div><div class='del'>-	if (ret &lt;= 0)</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-	return 0;</div><div class='add'>+			rx_p1ks = data-&gt;tkip-&gt;rx_uni;</div><div class='add'>+</div><div class='add'>+			ieee80211_get_key_tx_seq(key, &amp;seq);</div><div class='add'>+			tkip_tx_sc-&gt;iv16 = cpu_to_le16(seq.tkip.iv16);</div><div class='add'>+			tkip_tx_sc-&gt;iv32 = cpu_to_le32(seq.tkip.iv32);</div><div class='add'>+</div><div class='add'>+			ieee80211_get_tkip_p1k_iv(key, seq.tkip.iv32, p1k);</div><div class='add'>+			iwlagn_convert_p1k(p1k, data-&gt;tkip-&gt;tx.p1k);</div><div class='add'>+</div><div class='add'>+			memcpy(data-&gt;tkip-&gt;mic_keys.tx,</div><div class='add'>+			       &amp;key-&gt;key[NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY],</div><div class='add'>+			       IWLAGN_MIC_KEY_SIZE);</div><div class='add'>+</div><div class='add'>+			rx_mic_key = data-&gt;tkip-&gt;mic_keys.rx_unicast;</div><div class='add'>+		} else {</div><div class='add'>+			tkip_sc =</div><div class='add'>+				data-&gt;rsc_tsc-&gt;all_tsc_rsc.tkip.multicast_rsc;</div><div class='add'>+			rx_p1ks = data-&gt;tkip-&gt;rx_multi;</div><div class='add'>+			rx_mic_key = data-&gt;tkip-&gt;mic_keys.rx_mcast;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * For non-QoS this relies on the fact that both the uCode and</div><div class='add'>+		 * mac80211 use TID 0 (as they need to to avoid replay attacks)</div><div class='add'>+		 * for checking the IV in the frames.</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; IWLAGN_NUM_RSC; i++) {</div><div class='add'>+			ieee80211_get_key_rx_seq(key, i, &amp;seq);</div><div class='add'>+			tkip_sc[i].iv16 = cpu_to_le16(seq.tkip.iv16);</div><div class='add'>+			tkip_sc[i].iv32 = cpu_to_le32(seq.tkip.iv32);</div><div class='add'>+			/* wrapping isn't allowed, AP must rekey */</div><div class='add'>+			if (seq.tkip.iv32 &gt; cur_rx_iv32)</div><div class='add'>+				cur_rx_iv32 = seq.tkip.iv32;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ieee80211_get_tkip_rx_p1k(key, data-&gt;bssid, cur_rx_iv32, p1k);</div><div class='add'>+		iwlagn_convert_p1k(p1k, rx_p1ks[0].p1k);</div><div class='add'>+		ieee80211_get_tkip_rx_p1k(key, data-&gt;bssid,</div><div class='add'>+					  cur_rx_iv32 + 1, p1k);</div><div class='add'>+		iwlagn_convert_p1k(p1k, rx_p1ks[1].p1k);</div><div class='add'>+</div><div class='add'>+		memcpy(rx_mic_key,</div><div class='add'>+		       &amp;key-&gt;key[NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY],</div><div class='add'>+		       IWLAGN_MIC_KEY_SIZE);</div><div class='add'>+</div><div class='add'>+		data-&gt;use_tkip = true;</div><div class='add'>+		data-&gt;use_rsc_tsc = true;</div><div class='add'>+		break;</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		if (sta) {</div><div class='add'>+			u8 *pn = seq.ccmp.pn;</div><div class='add'>+</div><div class='add'>+			aes_sc = data-&gt;rsc_tsc-&gt;all_tsc_rsc.aes.unicast_rsc;</div><div class='add'>+			aes_tx_sc = &amp;data-&gt;rsc_tsc-&gt;all_tsc_rsc.aes.tsc;</div><div class='add'>+</div><div class='add'>+			ieee80211_get_key_tx_seq(key, &amp;seq);</div><div class='add'>+			aes_tx_sc-&gt;pn = cpu_to_le64(</div><div class='add'>+					(u64)pn[5] |</div><div class='add'>+					((u64)pn[4] &lt;&lt; 8) |</div><div class='add'>+					((u64)pn[3] &lt;&lt; 16) |</div><div class='add'>+					((u64)pn[2] &lt;&lt; 24) |</div><div class='add'>+					((u64)pn[1] &lt;&lt; 32) |</div><div class='add'>+					((u64)pn[0] &lt;&lt; 40));</div><div class='add'>+		} else</div><div class='add'>+			aes_sc = data-&gt;rsc_tsc-&gt;all_tsc_rsc.aes.multicast_rsc;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * For non-QoS this relies on the fact that both the uCode and</div><div class='add'>+		 * mac80211 use TID 0 for checking the IV in the frames.</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; IWLAGN_NUM_RSC; i++) {</div><div class='add'>+			u8 *pn = seq.ccmp.pn;</div><div class='add'>+</div><div class='add'>+			ieee80211_get_key_rx_seq(key, i, &amp;seq);</div><div class='add'>+			aes_sc-&gt;pn = cpu_to_le64(</div><div class='add'>+					(u64)pn[5] |</div><div class='add'>+					((u64)pn[4] &lt;&lt; 8) |</div><div class='add'>+					((u64)pn[3] &lt;&lt; 16) |</div><div class='add'>+					((u64)pn[2] &lt;&lt; 24) |</div><div class='add'>+					((u64)pn[1] &lt;&lt; 32) |</div><div class='add'>+					((u64)pn[0] &lt;&lt; 40));</div><div class='add'>+		}</div><div class='add'>+		data-&gt;use_rsc_tsc = true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwlagn_send_patterns(struct iwl_priv *priv,</div><div class='add'>+			struct cfg80211_wowlan *wowlan)</div><div class='add'>+{</div><div class='add'>+	struct iwlagn_wowlan_patterns_cmd *pattern_cmd;</div><div class='add'>+	struct iwl_host_cmd cmd = {</div><div class='add'>+		.id = REPLY_WOWLAN_PATTERNS,</div><div class='add'>+		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,</div><div class='add'>+		.flags = CMD_SYNC,</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 iwlagn_wowlan_pattern);</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'>+		memcpy(&amp;pattern_cmd-&gt;patterns[i].mask,</div><div class='add'>+			wowlan-&gt;patterns[i].mask, mask_len);</div><div class='add'>+		memcpy(&amp;pattern_cmd-&gt;patterns[i].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].mask_size = mask_len;</div><div class='add'>+		pattern_cmd-&gt;patterns[i].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_trans_send_cmd(trans(priv), &amp;cmd);</div><div class='add'>+	kfree(pattern_cmd);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwlagn_remove_notification(struct iwl_priv *priv,</div><div class='del'>-				struct iwl_notification_wait *wait_entry)</div><div class='add'>+int iwlagn_suspend(struct iwl_priv *priv,</div><div class='add'>+		struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)</div><div class='ctx'> {</div><div class='del'>-	spin_lock_bh(&amp;priv-&gt;notif_wait_lock);</div><div class='del'>-	list_del(&amp;wait_entry-&gt;list);</div><div class='del'>-	spin_unlock_bh(&amp;priv-&gt;notif_wait_lock);</div><div class='add'>+	struct iwlagn_wowlan_wakeup_filter_cmd wakeup_filter_cmd;</div><div class='add'>+	struct iwl_rxon_cmd rxon;</div><div class='add'>+	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='add'>+	struct iwlagn_wowlan_kek_kck_material_cmd kek_kck_cmd;</div><div class='add'>+	struct iwlagn_wowlan_tkip_params_cmd tkip_cmd = {};</div><div class='add'>+	struct iwlagn_d3_config_cmd d3_cfg_cmd = {};</div><div class='add'>+	struct wowlan_key_data key_data = {</div><div class='add'>+		.ctx = ctx,</div><div class='add'>+		.bssid = ctx-&gt;active.bssid_addr,</div><div class='add'>+		.use_rsc_tsc = false,</div><div class='add'>+		.tkip = &amp;tkip_cmd,</div><div class='add'>+		.use_tkip = false,</div><div class='add'>+	};</div><div class='add'>+	int ret, i;</div><div class='add'>+	u16 seq;</div><div class='add'>+</div><div class='add'>+	key_data.rsc_tsc = kzalloc(sizeof(*key_data.rsc_tsc), GFP_KERNEL);</div><div class='add'>+	if (!key_data.rsc_tsc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memset(&amp;wakeup_filter_cmd, 0, sizeof(wakeup_filter_cmd));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We know the last used seqno, and the uCode expects to know that</div><div class='add'>+	 * one, it will increment before TX.</div><div class='add'>+	 */</div><div class='add'>+	seq = le16_to_cpu(priv-&gt;last_seq_ctl) &amp; IEEE80211_SCTL_SEQ;</div><div class='add'>+	wakeup_filter_cmd.non_qos_seq = cpu_to_le16(seq);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For QoS counters, we store the one to use next, so subtract 0x10</div><div class='add'>+	 * since the uCode will add 0x10 before using the value.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; IWL_MAX_TID_COUNT; i++) {</div><div class='add'>+		seq = priv-&gt;tid_data[IWL_AP_ID][i].seq_number;</div><div class='add'>+		seq -= 0x10;</div><div class='add'>+		wakeup_filter_cmd.qos_seq[i] = cpu_to_le16(seq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wowlan-&gt;disconnect)</div><div class='add'>+		wakeup_filter_cmd.enabled |=</div><div class='add'>+			cpu_to_le32(IWLAGN_WOWLAN_WAKEUP_BEACON_MISS |</div><div class='add'>+				    IWLAGN_WOWLAN_WAKEUP_LINK_CHANGE);</div><div class='add'>+	if (wowlan-&gt;magic_pkt)</div><div class='add'>+		wakeup_filter_cmd.enabled |=</div><div class='add'>+			cpu_to_le32(IWLAGN_WOWLAN_WAKEUP_MAGIC_PACKET);</div><div class='add'>+	if (wowlan-&gt;gtk_rekey_failure)</div><div class='add'>+		wakeup_filter_cmd.enabled |=</div><div class='add'>+			cpu_to_le32(IWLAGN_WOWLAN_WAKEUP_GTK_REKEY_FAIL);</div><div class='add'>+	if (wowlan-&gt;eap_identity_req)</div><div class='add'>+		wakeup_filter_cmd.enabled |=</div><div class='add'>+			cpu_to_le32(IWLAGN_WOWLAN_WAKEUP_EAP_IDENT_REQ);</div><div class='add'>+	if (wowlan-&gt;four_way_handshake)</div><div class='add'>+		wakeup_filter_cmd.enabled |=</div><div class='add'>+			cpu_to_le32(IWLAGN_WOWLAN_WAKEUP_4WAY_HANDSHAKE);</div><div class='add'>+	if (wowlan-&gt;n_patterns)</div><div class='add'>+		wakeup_filter_cmd.enabled |=</div><div class='add'>+			cpu_to_le32(IWLAGN_WOWLAN_WAKEUP_PATTERN_MATCH);</div><div class='add'>+</div><div class='add'>+	if (wowlan-&gt;rfkill_release)</div><div class='add'>+		d3_cfg_cmd.wakeup_flags |=</div><div class='add'>+			cpu_to_le32(IWLAGN_D3_WAKEUP_RFKILL);</div><div class='add'>+</div><div class='add'>+	iwl_scan_cancel_timeout(priv, 200);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;rxon, &amp;ctx-&gt;active, sizeof(rxon));</div><div class='add'>+</div><div class='add'>+	iwl_trans_stop_device(trans(priv));</div><div class='add'>+</div><div class='add'>+	priv-&gt;shrd-&gt;wowlan = true;</div><div class='add'>+</div><div class='add'>+	ret = iwl_load_ucode_wait_alive(trans(priv), IWL_UCODE_WOWLAN);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* now configure WoWLAN ucode */</div><div class='add'>+	ret = iwl_alive_start(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;ctx-&gt;staging, &amp;rxon, sizeof(rxon));</div><div class='add'>+	ret = iwlagn_commit_rxon(priv, ctx);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = iwl_power_update_mode(priv, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!iwlagn_mod_params.sw_crypto) {</div><div class='add'>+		/* mark all keys clear */</div><div class='add'>+		priv-&gt;ucode_key_table = 0;</div><div class='add'>+		ctx-&gt;key_mapping_keys = 0;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * This needs to be unlocked due to lock ordering</div><div class='add'>+		 * constraints. Since we're in the suspend path</div><div class='add'>+		 * that isn't really a problem though.</div><div class='add'>+		 */</div><div class='add'>+		mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+		ieee80211_iter_keys(priv-&gt;hw, ctx-&gt;vif,</div><div class='add'>+				    iwlagn_wowlan_program_keys,</div><div class='add'>+				    &amp;key_data);</div><div class='add'>+		mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+		if (key_data.error) {</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (key_data.use_rsc_tsc) {</div><div class='add'>+			struct iwl_host_cmd rsc_tsc_cmd = {</div><div class='add'>+				.id = REPLY_WOWLAN_TSC_RSC_PARAMS,</div><div class='add'>+				.flags = CMD_SYNC,</div><div class='add'>+				.data[0] = key_data.rsc_tsc,</div><div class='add'>+				.dataflags[0] = IWL_HCMD_DFL_NOCOPY,</div><div class='add'>+				.len[0] = sizeof(key_data.rsc_tsc),</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			ret = iwl_trans_send_cmd(trans(priv), &amp;rsc_tsc_cmd);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (key_data.use_tkip) {</div><div class='add'>+			ret = iwl_trans_send_cmd_pdu(trans(priv),</div><div class='add'>+						 REPLY_WOWLAN_TKIP_PARAMS,</div><div class='add'>+						 CMD_SYNC, sizeof(tkip_cmd),</div><div class='add'>+						 &amp;tkip_cmd);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;have_rekey_data) {</div><div class='add'>+			memset(&amp;kek_kck_cmd, 0, sizeof(kek_kck_cmd));</div><div class='add'>+			memcpy(kek_kck_cmd.kck, priv-&gt;kck, NL80211_KCK_LEN);</div><div class='add'>+			kek_kck_cmd.kck_len = cpu_to_le16(NL80211_KCK_LEN);</div><div class='add'>+			memcpy(kek_kck_cmd.kek, priv-&gt;kek, NL80211_KEK_LEN);</div><div class='add'>+			kek_kck_cmd.kek_len = cpu_to_le16(NL80211_KEK_LEN);</div><div class='add'>+			kek_kck_cmd.replay_ctr = priv-&gt;replay_ctr;</div><div class='add'>+</div><div class='add'>+			ret = iwl_trans_send_cmd_pdu(trans(priv),</div><div class='add'>+						 REPLY_WOWLAN_KEK_KCK_MATERIAL,</div><div class='add'>+						 CMD_SYNC, sizeof(kek_kck_cmd),</div><div class='add'>+						 &amp;kek_kck_cmd);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_trans_send_cmd_pdu(trans(priv), REPLY_D3_CONFIG, CMD_SYNC,</div><div class='add'>+				     sizeof(d3_cfg_cmd), &amp;d3_cfg_cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = iwl_trans_send_cmd_pdu(trans(priv), REPLY_WOWLAN_WAKEUP_FILTER,</div><div class='add'>+				 CMD_SYNC, sizeof(wakeup_filter_cmd),</div><div class='add'>+				 &amp;wakeup_filter_cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = iwlagn_send_patterns(priv, wowlan);</div><div class='add'>+ out:</div><div class='add'>+	kfree(key_data.rsc_tsc);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c<br/>index 66118cea2af3..334b5ae8fdd4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-rs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-rs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-rs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-agn-rs.c</a></div><div class='hunk'>@@ -298,7 +298,7 @@ static u8 rs_tl_add_packet(struct iwl_lq_sta *lq_data,</div><div class='ctx'> 	} else</div><div class='ctx'> 		return IWL_MAX_TID_COUNT;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(tid &gt;= TID_MAX_LOAD_COUNT))</div><div class='add'>+	if (unlikely(tid &gt;= IWL_MAX_TID_COUNT))</div><div class='ctx'> 		return IWL_MAX_TID_COUNT;</div><div class='ctx'> </div><div class='ctx'> 	tl = &amp;lq_data-&gt;load[tid];</div><div class='hunk'>@@ -352,7 +352,7 @@ static void rs_program_fix_rate(struct iwl_priv *priv,</div><div class='ctx'> 	lq_sta-&gt;active_mimo2_rate  = 0x1FD0;	/* 6 - 60 MBits, no 9, no CCK */</div><div class='ctx'> 	lq_sta-&gt;active_mimo3_rate  = 0x1FD0;	/* 6 - 60 MBits, no 9, no CCK */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE</div><div class='ctx'> 	/* testmode has higher priority to overwirte the fixed rate */</div><div class='ctx'> 	if (priv-&gt;tm_fixed_rate)</div><div class='ctx'> 		lq_sta-&gt;dbg_fixed_rate = priv-&gt;tm_fixed_rate;</div><div class='hunk'>@@ -379,7 +379,7 @@ static u32 rs_tl_get_load(struct iwl_lq_sta *lq_data, u8 tid)</div><div class='ctx'> 	s32 index;</div><div class='ctx'> 	struct iwl_traffic_load *tl = NULL;</div><div class='ctx'> </div><div class='del'>-	if (tid &gt;= TID_MAX_LOAD_COUNT)</div><div class='add'>+	if (tid &gt;= IWL_MAX_TID_COUNT)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	tl = &amp;(lq_data-&gt;load[tid]);</div><div class='hunk'>@@ -444,11 +444,11 @@ static void rs_tl_turn_on_agg(struct iwl_priv *priv, u8 tid,</div><div class='ctx'> 			      struct iwl_lq_sta *lq_data,</div><div class='ctx'> 			      struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='del'>-	if (tid &lt; TID_MAX_LOAD_COUNT)</div><div class='add'>+	if (tid &lt; IWL_MAX_TID_COUNT)</div><div class='ctx'> 		rs_tl_turn_on_agg_for_tid(priv, lq_data, tid, sta);</div><div class='ctx'> 	else</div><div class='del'>-		IWL_ERR(priv, "tid exceeds max load count: %d/%d\n",</div><div class='del'>-			tid, TID_MAX_LOAD_COUNT);</div><div class='add'>+		IWL_ERR(priv, "tid exceeds max TID count: %d/%d\n",</div><div class='add'>+			tid, IWL_MAX_TID_COUNT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int get_num_of_ant_from_rate(u32 rate_n_flags)</div><div class='hunk'>@@ -1081,12 +1081,12 @@ done:</div><div class='ctx'> 	if (sta &amp;&amp; sta-&gt;supp_rates[sband-&gt;band])</div><div class='ctx'> 		rs_rate_scale_perform(priv, skb, sta, lq_sta);</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_MAC80211_DEBUGFS) &amp;&amp; defined(CONFIG_IWLWIFI_DEVICE_SVTOOL)</div><div class='add'>+#if defined(CONFIG_MAC80211_DEBUGFS) &amp;&amp; defined(CONFIG_IWLWIFI_DEVICE_TESTMODE)</div><div class='ctx'> 	if ((priv-&gt;tm_fixed_rate) &amp;&amp;</div><div class='ctx'> 	    (priv-&gt;tm_fixed_rate != lq_sta-&gt;dbg_fixed_rate))</div><div class='ctx'> 		rs_program_fix_rate(priv, lq_sta);</div><div class='ctx'> #endif</div><div class='del'>-	if (priv-&gt;cfg-&gt;bt_params &amp;&amp; priv-&gt;cfg-&gt;bt_params-&gt;advanced_bt_coexist)</div><div class='add'>+	if (cfg(priv)-&gt;bt_params &amp;&amp; cfg(priv)-&gt;bt_params-&gt;advanced_bt_coexist)</div><div class='ctx'> 		rs_bt_update_lq(priv, ctx, lq_sta);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1458,10 +1458,8 @@ static int rs_move_legacy_other(struct iwl_priv *priv,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IWL_BT_COEX_TRAFFIC_LOAD_LOW:</div><div class='ctx'> 		/* avoid antenna B unless MIMO */</div><div class='del'>-		valid_tx_ant =</div><div class='del'>-			first_antenna(hw_params(priv).valid_tx_ant);</div><div class='ctx'> 		if (tbl-&gt;action == IWL_LEGACY_SWITCH_ANTENNA2)</div><div class='del'>-			tbl-&gt;action = IWL_LEGACY_SWITCH_ANTENNA1;</div><div class='add'>+			tbl-&gt;action = IWL_LEGACY_SWITCH_SISO;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IWL_BT_COEX_TRAFFIC_LOAD_HIGH:</div><div class='ctx'> 	case IWL_BT_COEX_TRAFFIC_LOAD_CONTINUOUS:</div><div class='hunk'>@@ -1636,10 +1634,8 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IWL_BT_COEX_TRAFFIC_LOAD_LOW:</div><div class='ctx'> 		/* avoid antenna B unless MIMO */</div><div class='del'>-		valid_tx_ant =</div><div class='del'>-			first_antenna(hw_params(priv).valid_tx_ant);</div><div class='ctx'> 		if (tbl-&gt;action == IWL_SISO_SWITCH_ANTENNA2)</div><div class='del'>-			tbl-&gt;action = IWL_SISO_SWITCH_ANTENNA1;</div><div class='add'>+			tbl-&gt;action = IWL_SISO_SWITCH_MIMO2_AB;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IWL_BT_COEX_TRAFFIC_LOAD_HIGH:</div><div class='ctx'> 	case IWL_BT_COEX_TRAFFIC_LOAD_CONTINUOUS:</div><div class='hunk'>@@ -2277,7 +2273,7 @@ static void rs_rate_scale_perform(struct iwl_priv *priv,</div><div class='ctx'> 	tid = rs_tl_add_packet(lq_sta, hdr);</div><div class='ctx'> 	if ((tid != IWL_MAX_TID_COUNT) &amp;&amp;</div><div class='ctx'> 	    (lq_sta-&gt;tx_agg_tid_en &amp; (1 &lt;&lt; tid))) {</div><div class='del'>-		tid_data = &amp;priv-&gt;shrd-&gt;tid_data[lq_sta-&gt;lq.sta_id][tid];</div><div class='add'>+		tid_data = &amp;priv-&gt;tid_data[lq_sta-&gt;lq.sta_id][tid];</div><div class='ctx'> 		if (tid_data-&gt;agg.state == IWL_AGG_OFF)</div><div class='ctx'> 			lq_sta-&gt;is_agg = 0;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -2649,8 +2645,7 @@ lq_update:</div><div class='ctx'> 			    (lq_sta-&gt;tx_agg_tid_en &amp; (1 &lt;&lt; tid)) &amp;&amp;</div><div class='ctx'> 			    (tid != IWL_MAX_TID_COUNT)) {</div><div class='ctx'> 				u8 sta_id = lq_sta-&gt;lq.sta_id;</div><div class='del'>-				tid_data =</div><div class='del'>-				   &amp;priv-&gt;shrd-&gt;tid_data[sta_id][tid];</div><div class='add'>+				tid_data = &amp;priv-&gt;tid_data[sta_id][tid];</div><div class='ctx'> 				if (tid_data-&gt;agg.state == IWL_AGG_OFF) {</div><div class='ctx'> 					IWL_DEBUG_RATE(priv,</div><div class='ctx'> 						       "try to aggregate tid %d\n",</div><div class='hunk'>@@ -2908,7 +2903,7 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i</div><div class='ctx'> 	if (sband-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='ctx'> 		lq_sta-&gt;last_txrate_idx += IWL_FIRST_OFDM_RATE;</div><div class='ctx'> 	lq_sta-&gt;is_agg = 0;</div><div class='del'>-#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE</div><div class='ctx'> 	priv-&gt;tm_fixed_rate = 0;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_MAC80211_DEBUGFS</div><div class='hunk'>@@ -3059,11 +3054,11 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,</div><div class='ctx'> 	 * overwrite if needed, pass aggregation time limit</div><div class='ctx'> 	 * to uCode in uSec</div><div class='ctx'> 	 */</div><div class='del'>-	if (priv &amp;&amp; priv-&gt;cfg-&gt;bt_params &amp;&amp;</div><div class='del'>-	    priv-&gt;cfg-&gt;bt_params-&gt;agg_time_limit &amp;&amp;</div><div class='add'>+	if (priv &amp;&amp; cfg(priv)-&gt;bt_params &amp;&amp;</div><div class='add'>+	    cfg(priv)-&gt;bt_params-&gt;agg_time_limit &amp;&amp;</div><div class='ctx'> 	    priv-&gt;bt_traffic_load &gt;= IWL_BT_COEX_TRAFFIC_LOAD_HIGH)</div><div class='ctx'> 		lq_cmd-&gt;agg_params.agg_time_limit =</div><div class='del'>-			cpu_to_le16(priv-&gt;cfg-&gt;bt_params-&gt;agg_time_limit);</div><div class='add'>+			cpu_to_le16(cfg(priv)-&gt;bt_params-&gt;agg_time_limit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h<br/>index f4f6deb829ae..6675b3c816d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-rs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-rs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-rs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-agn-rs.h</a></div><div class='hunk'>@@ -281,7 +281,6 @@ enum {</div><div class='ctx'> #define TID_QUEUE_CELL_SPACING	50	/*mS */</div><div class='ctx'> #define TID_QUEUE_MAX_SIZE	20</div><div class='ctx'> #define TID_ROUND_VALUE		5	/* mS */</div><div class='del'>-#define TID_MAX_LOAD_COUNT	8</div><div class='ctx'> </div><div class='ctx'> #define TID_MAX_TIME_DIFF ((TID_QUEUE_MAX_SIZE - 1) * TID_QUEUE_CELL_SPACING)</div><div class='ctx'> #define TIME_WRAP_AROUND(x, y) (((y) &gt; (x)) ? (y) - (x) : (0-(x)) + (y))</div><div class='hunk'>@@ -402,7 +401,7 @@ struct iwl_lq_sta {</div><div class='ctx'> </div><div class='ctx'> 	struct iwl_link_quality_cmd lq;</div><div class='ctx'> 	struct iwl_scale_tbl_info lq_info[LQ_SIZE]; /* "active", "search" */</div><div class='del'>-	struct iwl_traffic_load load[TID_MAX_LOAD_COUNT];</div><div class='add'>+	struct iwl_traffic_load load[IWL_MAX_TID_COUNT];</div><div class='ctx'> 	u8 tx_agg_tid_en;</div><div class='ctx'> #ifdef CONFIG_MAC80211_DEBUGFS</div><div class='ctx'> 	struct dentry *rs_sta_dbgfs_scale_table_file;</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c<br/>index 5af9e6258a16..b22b2976f899 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-rx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-rx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-agn-rx.c</a></div><div class='hunk'>@@ -117,6 +117,7 @@ const char *get_cmd_string(u8 cmd)</div><div class='ctx'> 		IWL_CMD(REPLY_WOWLAN_TKIP_PARAMS);</div><div class='ctx'> 		IWL_CMD(REPLY_WOWLAN_KEK_KCK_MATERIAL);</div><div class='ctx'> 		IWL_CMD(REPLY_WOWLAN_GET_STATUS);</div><div class='add'>+		IWL_CMD(REPLY_D3_CONFIG);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return "UNKNOWN";</div><div class='ctx'> </div><div class='hunk'>@@ -317,7 +318,7 @@ static bool iwlagn_good_plcp_health(struct iwl_priv *priv,</div><div class='ctx'> 				 unsigned int msecs)</div><div class='ctx'> {</div><div class='ctx'> 	int delta;</div><div class='del'>-	int threshold = priv-&gt;cfg-&gt;base_params-&gt;plcp_delta_threshold;</div><div class='add'>+	int threshold = cfg(priv)-&gt;base_params-&gt;plcp_delta_threshold;</div><div class='ctx'> </div><div class='ctx'> 	if (threshold == IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE) {</div><div class='ctx'> 		IWL_DEBUG_RADIO(priv, "plcp_err check disabled\n");</div><div class='hunk'>@@ -582,8 +583,8 @@ static int iwlagn_rx_statistics(struct iwl_priv *priv,</div><div class='ctx'> 		iwlagn_rx_calc_noise(priv);</div><div class='ctx'> 		queue_work(priv-&gt;shrd-&gt;workqueue, &amp;priv-&gt;run_time_calib_work);</div><div class='ctx'> 	}</div><div class='del'>-	if (priv-&gt;cfg-&gt;lib-&gt;temperature &amp;&amp; change)</div><div class='del'>-		priv-&gt;cfg-&gt;lib-&gt;temperature(priv);</div><div class='add'>+	if (cfg(priv)-&gt;lib-&gt;temperature &amp;&amp; change)</div><div class='add'>+		cfg(priv)-&gt;lib-&gt;temperature(priv);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -800,7 +801,8 @@ static void iwlagn_pass_packet_to_mac80211(struct iwl_priv *priv,</div><div class='ctx'> 					       ctx-&gt;active.bssid_addr))</div><div class='ctx'> 				continue;</div><div class='ctx'> 			ctx-&gt;last_tx_rejected = false;</div><div class='del'>-			iwl_trans_wake_any_queue(trans(priv), ctx-&gt;ctxid);</div><div class='add'>+			iwl_trans_wake_any_queue(trans(priv), ctx-&gt;ctxid,</div><div class='add'>+				"channel got active");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1032,6 +1034,50 @@ static int iwlagn_rx_reply_rx(struct iwl_priv *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int iwlagn_rx_noa_notification(struct iwl_priv *priv,</div><div class='add'>+				      struct iwl_rx_mem_buffer *rxb,</div><div class='add'>+				      struct iwl_device_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct iwl_wipan_noa_data *new_data, *old_data;</div><div class='add'>+	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='add'>+	struct iwl_wipan_noa_notification *noa_notif = (void *)pkt-&gt;u.raw;</div><div class='add'>+</div><div class='add'>+	/* no condition -- we're in softirq */</div><div class='add'>+	old_data = rcu_dereference_protected(priv-&gt;noa_data, true);</div><div class='add'>+</div><div class='add'>+	if (noa_notif-&gt;noa_active) {</div><div class='add'>+		u32 len = le16_to_cpu(noa_notif-&gt;noa_attribute.length);</div><div class='add'>+		u32 copylen = len;</div><div class='add'>+</div><div class='add'>+		/* EID, len, OUI, subtype */</div><div class='add'>+		len += 1 + 1 + 3 + 1;</div><div class='add'>+		/* P2P id, P2P length */</div><div class='add'>+		len += 1 + 2;</div><div class='add'>+		copylen += 1 + 2;</div><div class='add'>+</div><div class='add'>+		new_data = kmalloc(sizeof(*new_data) + len, GFP_ATOMIC);</div><div class='add'>+		if (new_data) {</div><div class='add'>+			new_data-&gt;length = len;</div><div class='add'>+			new_data-&gt;data[0] = WLAN_EID_VENDOR_SPECIFIC;</div><div class='add'>+			new_data-&gt;data[1] = len - 2; /* not counting EID, len */</div><div class='add'>+			new_data-&gt;data[2] = (WLAN_OUI_WFA &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+			new_data-&gt;data[3] = (WLAN_OUI_WFA &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+			new_data-&gt;data[4] = (WLAN_OUI_WFA &gt;&gt; 0) &amp; 0xff;</div><div class='add'>+			new_data-&gt;data[5] = WLAN_OUI_TYPE_WFA_P2P;</div><div class='add'>+			memcpy(&amp;new_data-&gt;data[6], &amp;noa_notif-&gt;noa_attribute,</div><div class='add'>+			       copylen);</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		new_data = NULL;</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(priv-&gt;noa_data, new_data);</div><div class='add'>+</div><div class='add'>+	if (old_data)</div><div class='add'>+		kfree_rcu(old_data, rcu_head);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * iwl_setup_rx_handlers - Initialize Rx handler callbacks</div><div class='ctx'>  *</div><div class='hunk'>@@ -1055,6 +1101,8 @@ void iwl_setup_rx_handlers(struct iwl_priv *priv)</div><div class='ctx'> 	handlers[BEACON_NOTIFICATION]		= iwlagn_rx_beacon_notif;</div><div class='ctx'> 	handlers[REPLY_ADD_STA]			= iwl_add_sta_callback;</div><div class='ctx'> </div><div class='add'>+	handlers[REPLY_WIPAN_NOA_NOTIFICATION]	= iwlagn_rx_noa_notification;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The same handler is used for both the REPLY to a discrete</div><div class='ctx'> 	 * statistics request from the host as well as for the periodic</div><div class='hunk'>@@ -1083,13 +1131,13 @@ void iwl_setup_rx_handlers(struct iwl_priv *priv)</div><div class='ctx'> 	priv-&gt;rx_handlers[REPLY_TX] = iwlagn_rx_reply_tx;</div><div class='ctx'> </div><div class='ctx'> 	/* set up notification wait support */</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;notif_wait_lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;priv-&gt;notif_waits);</div><div class='del'>-	init_waitqueue_head(&amp;priv-&gt;notif_waitq);</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;shrd-&gt;notif_wait_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;priv-&gt;shrd-&gt;notif_waits);</div><div class='add'>+	init_waitqueue_head(&amp;priv-&gt;shrd-&gt;notif_waitq);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up BT Rx handlers */</div><div class='del'>-	if (priv-&gt;cfg-&gt;lib-&gt;bt_rx_handler_setup)</div><div class='del'>-		priv-&gt;cfg-&gt;lib-&gt;bt_rx_handler_setup(priv);</div><div class='add'>+	if (cfg(priv)-&gt;lib-&gt;bt_rx_handler_setup)</div><div class='add'>+		cfg(priv)-&gt;lib-&gt;bt_rx_handler_setup(priv);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1104,11 +1152,11 @@ int iwl_rx_dispatch(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,</div><div class='ctx'> 	 * even if the RX handler consumes the RXB we have</div><div class='ctx'> 	 * access to it in the notification wait entry.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!list_empty(&amp;priv-&gt;notif_waits)) {</div><div class='add'>+	if (!list_empty(&amp;priv-&gt;shrd-&gt;notif_waits)) {</div><div class='ctx'> 		struct iwl_notification_wait *w;</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;priv-&gt;notif_wait_lock);</div><div class='del'>-		list_for_each_entry(w, &amp;priv-&gt;notif_waits, list) {</div><div class='add'>+		spin_lock(&amp;priv-&gt;shrd-&gt;notif_wait_lock);</div><div class='add'>+		list_for_each_entry(w, &amp;priv-&gt;shrd-&gt;notif_waits, list) {</div><div class='ctx'> 			if (w-&gt;cmd != pkt-&gt;hdr.cmd)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			IWL_DEBUG_RX(priv,</div><div class='hunk'>@@ -1117,11 +1165,11 @@ int iwl_rx_dispatch(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,</div><div class='ctx'> 				pkt-&gt;hdr.cmd);</div><div class='ctx'> 			w-&gt;triggered = true;</div><div class='ctx'> 			if (w-&gt;fn)</div><div class='del'>-				w-&gt;fn(priv, pkt, w-&gt;fn_data);</div><div class='add'>+				w-&gt;fn(trans(priv), pkt, w-&gt;fn_data);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;priv-&gt;notif_wait_lock);</div><div class='add'>+		spin_unlock(&amp;priv-&gt;shrd-&gt;notif_wait_lock);</div><div class='ctx'> </div><div class='del'>-		wake_up_all(&amp;priv-&gt;notif_waitq);</div><div class='add'>+		wake_up_all(&amp;priv-&gt;shrd-&gt;notif_waitq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;pre_rx_handler)</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c<br/>index 5c7c17c7166a..1c6659416621 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-rxon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-agn-rxon.c</a></div><div class='hunk'>@@ -45,7 +45,8 @@ static int iwlagn_disable_bss(struct iwl_priv *priv,</div><div class='ctx'> 	send-&gt;filter_flags = old_filter;</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='del'>-		IWL_ERR(priv, "Error clearing ASSOC_MSK on BSS (%d)\n", ret);</div><div class='add'>+		IWL_DEBUG_QUIET_RFKILL(priv,</div><div class='add'>+			"Error clearing ASSOC_MSK on BSS (%d)\n", ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -59,7 +60,7 @@ static int iwlagn_disable_pan(struct iwl_priv *priv,</div><div class='ctx'> 	u8 old_dev_type = send-&gt;dev_type;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	iwlagn_init_notification_wait(priv, &amp;disable_wait,</div><div class='add'>+	iwl_init_notification_wait(priv-&gt;shrd, &amp;disable_wait,</div><div class='ctx'> 				      REPLY_WIPAN_DEACTIVATION_COMPLETE,</div><div class='ctx'> 				      NULL, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -73,9 +74,9 @@ static int iwlagn_disable_pan(struct iwl_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		IWL_ERR(priv, "Error disabling PAN (%d)\n", ret);</div><div class='del'>-		iwlagn_remove_notification(priv, &amp;disable_wait);</div><div class='add'>+		iwl_remove_notification(priv-&gt;shrd, &amp;disable_wait);</div><div class='ctx'> 	} else {</div><div class='del'>-		ret = iwlagn_wait_notification(priv, &amp;disable_wait, HZ);</div><div class='add'>+		ret = iwl_wait_notification(priv-&gt;shrd, &amp;disable_wait, HZ);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			IWL_ERR(priv, "Timed out waiting for PAN disable\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -116,7 +117,7 @@ static void iwlagn_update_qos(struct iwl_priv *priv,</div><div class='ctx'> 	if (ctx-&gt;ht.enabled)</div><div class='ctx'> 		ctx-&gt;qos_data.def_qos_parm.qos_flags |= QOS_PARAM_FLG_TGN_MSK;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_QOS(priv, "send QoS cmd with Qos active=%d FLAGS=0x%X\n",</div><div class='add'>+	IWL_DEBUG_INFO(priv, "send QoS cmd with Qos active=%d FLAGS=0x%X\n",</div><div class='ctx'> 		      ctx-&gt;qos_data.qos_active,</div><div class='ctx'> 		      ctx-&gt;qos_data.def_qos_parm.qos_flags);</div><div class='ctx'> </div><div class='hunk'>@@ -124,7 +125,7 @@ static void iwlagn_update_qos(struct iwl_priv *priv,</div><div class='ctx'> 			       sizeof(struct iwl_qosparam_cmd),</div><div class='ctx'> 			       &amp;ctx-&gt;qos_data.def_qos_parm);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		IWL_ERR(priv, "Failed to update QoS\n");</div><div class='add'>+		IWL_DEBUG_QUIET_RFKILL(priv, "Failed to update QoS\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iwlagn_update_beacon(struct iwl_priv *priv,</div><div class='hunk'>@@ -295,9 +296,9 @@ static int iwlagn_rxon_connect(struct iwl_priv *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;vif &amp;&amp; ctx-&gt;vif-&gt;type == NL80211_IFTYPE_STATION &amp;&amp;</div><div class='del'>-	    priv-&gt;cfg-&gt;ht_params &amp;&amp; priv-&gt;cfg-&gt;ht_params-&gt;smps_mode)</div><div class='add'>+	    cfg(priv)-&gt;ht_params &amp;&amp; cfg(priv)-&gt;ht_params-&gt;smps_mode)</div><div class='ctx'> 		ieee80211_request_smps(ctx-&gt;vif,</div><div class='del'>-				       priv-&gt;cfg-&gt;ht_params-&gt;smps_mode);</div><div class='add'>+				       cfg(priv)-&gt;ht_params-&gt;smps_mode);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -444,8 +445,8 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)</div><div class='ctx'> 	 * force CTS-to-self frames protection if RTS-CTS is not preferred</div><div class='ctx'> 	 * one aggregation protection method</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(priv-&gt;cfg-&gt;ht_params &amp;&amp;</div><div class='del'>-	      priv-&gt;cfg-&gt;ht_params-&gt;use_rts_for_aggregation))</div><div class='add'>+	if (!(cfg(priv)-&gt;ht_params &amp;&amp;</div><div class='add'>+	      cfg(priv)-&gt;ht_params-&gt;use_rts_for_aggregation))</div><div class='ctx'> 		ctx-&gt;staging.flags |= RXON_FLG_SELF_CTS_EN;</div><div class='ctx'> </div><div class='ctx'> 	if ((ctx-&gt;vif &amp;&amp; ctx-&gt;vif-&gt;bss_conf.use_short_slot) ||</div><div class='hunk'>@@ -559,6 +560,9 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;shrd-&gt;status))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(test_bit(STATUS_SCANNING, &amp;priv-&gt;shrd-&gt;status))) {</div><div class='ctx'> 		IWL_DEBUG_MAC80211(priv, "leave - scanning\n");</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -850,7 +854,8 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 			if (ctx-&gt;last_tx_rejected) {</div><div class='ctx'> 				ctx-&gt;last_tx_rejected = false;</div><div class='ctx'> 				iwl_trans_wake_any_queue(trans(priv),</div><div class='del'>-							 ctx-&gt;ctxid);</div><div class='add'>+							 ctx-&gt;ctxid,</div><div class='add'>+							 "Disassoc: flush queue");</div><div class='ctx'> 			}</div><div class='ctx'> 			ctx-&gt;staging.filter_flags &amp;= ~RXON_FILTER_ASSOC_MSK;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c<br/>index 4b2aa1da0953..7353826095f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-sta.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-sta.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-sta.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-agn-sta.c</a></div><div class='hunk'>@@ -130,25 +130,15 @@ int iwl_add_sta_callback(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,</div><div class='ctx'> 	return iwl_process_add_sta_resp(priv, addsta, pkt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u16 iwlagn_build_addsta_hcmd(const struct iwl_addsta_cmd *cmd, u8 *data)</div><div class='del'>-{</div><div class='del'>-	u16 size = (u16)sizeof(struct iwl_addsta_cmd);</div><div class='del'>-	struct iwl_addsta_cmd *addsta = (struct iwl_addsta_cmd *)data;</div><div class='del'>-	memcpy(addsta, cmd, size);</div><div class='del'>-	/* resrved in 5000 */</div><div class='del'>-	addsta-&gt;rate_n_flags = cpu_to_le16(0);</div><div class='del'>-	return size;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int iwl_send_add_sta(struct iwl_priv *priv,</div><div class='ctx'> 		     struct iwl_addsta_cmd *sta, u8 flags)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	u8 data[sizeof(*sta)];</div><div class='ctx'> 	struct iwl_host_cmd cmd = {</div><div class='ctx'> 		.id = REPLY_ADD_STA,</div><div class='ctx'> 		.flags = flags,</div><div class='del'>-		.data = { data, },</div><div class='add'>+		.data = { sta, },</div><div class='add'>+		.len = { sizeof(*sta), },</div><div class='ctx'> 	};</div><div class='ctx'> 	u8 sta_id __maybe_unused = sta-&gt;sta.sta_id;</div><div class='ctx'> </div><div class='hunk'>@@ -160,7 +150,6 @@ int iwl_send_add_sta(struct iwl_priv *priv,</div><div class='ctx'> 		might_sleep();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd.len[0] = iwlagn_build_addsta_hcmd(sta, data);</div><div class='ctx'> 	ret = iwl_trans_send_cmd(trans(priv), &amp;cmd);</div><div class='ctx'> </div><div class='ctx'> 	if (ret || (flags &amp; CMD_ASYNC))</div><div class='hunk'>@@ -463,6 +452,7 @@ int iwl_remove_station(struct iwl_priv *priv, const u8 sta_id,</div><div class='ctx'> 		       const u8 *addr)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	u8 tid;</div><div class='ctx'> </div><div class='ctx'> 	if (!iwl_is_ready(priv-&gt;shrd)) {</div><div class='ctx'> 		IWL_DEBUG_INFO(priv,</div><div class='hunk'>@@ -501,6 +491,10 @@ int iwl_remove_station(struct iwl_priv *priv, const u8 sta_id,</div><div class='ctx'> 		priv-&gt;stations[sta_id].lq = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	for (tid = 0; tid &lt; IWL_MAX_TID_COUNT; tid++)</div><div class='add'>+		memset(&amp;priv-&gt;tid_data[sta_id][tid], 0,</div><div class='add'>+			sizeof(priv-&gt;tid_data[sta_id][tid]));</div><div class='add'>+</div><div class='ctx'> 	priv-&gt;stations[sta_id].used &amp;= ~IWL_STA_DRIVER_ACTIVE;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;num_stations--;</div><div class='hunk'>@@ -647,7 +641,7 @@ void iwl_reprogram_ap_sta(struct iwl_priv *priv, struct iwl_rxon_context *ctx)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct iwl_addsta_cmd sta_cmd;</div><div class='ctx'> 	struct iwl_link_quality_cmd lq;</div><div class='del'>-	bool active;</div><div class='add'>+	bool active, have_lq = false;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;shrd-&gt;sta_lock, flags);</div><div class='ctx'> 	if (!(priv-&gt;stations[sta_id].used &amp; IWL_STA_DRIVER_ACTIVE)) {</div><div class='hunk'>@@ -657,7 +651,10 @@ void iwl_reprogram_ap_sta(struct iwl_priv *priv, struct iwl_rxon_context *ctx)</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;sta_cmd, &amp;priv-&gt;stations[sta_id].sta, sizeof(sta_cmd));</div><div class='ctx'> 	sta_cmd.mode = 0;</div><div class='del'>-	memcpy(&amp;lq, priv-&gt;stations[sta_id].lq, sizeof(lq));</div><div class='add'>+	if (priv-&gt;stations[sta_id].lq) {</div><div class='add'>+		memcpy(&amp;lq, priv-&gt;stations[sta_id].lq, sizeof(lq));</div><div class='add'>+		have_lq = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	active = priv-&gt;stations[sta_id].used &amp; IWL_STA_UCODE_ACTIVE;</div><div class='ctx'> 	priv-&gt;stations[sta_id].used &amp;= ~IWL_STA_DRIVER_ACTIVE;</div><div class='hunk'>@@ -679,7 +676,8 @@ void iwl_reprogram_ap_sta(struct iwl_priv *priv, struct iwl_rxon_context *ctx)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		IWL_ERR(priv, "failed to re-add STA %pM (%d)\n",</div><div class='ctx'> 			priv-&gt;stations[sta_id].sta.sta.addr, ret);</div><div class='del'>-	iwl_send_lq_cmd(priv, ctx, &amp;lq, CMD_SYNC, true);</div><div class='add'>+	if (have_lq)</div><div class='add'>+		iwl_send_lq_cmd(priv, ctx, &amp;lq, CMD_SYNC, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_get_free_ucode_key_offset(struct iwl_priv *priv)</div><div class='hunk'>@@ -825,28 +823,6 @@ int iwl_send_lq_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwlagn_mac_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 iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter: received request to remove "</div><div class='del'>-			   "station %pM\n", sta-&gt;addr);</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "proceeding to remove station %pM\n",</div><div class='del'>-			sta-&gt;addr);</div><div class='del'>-	ret = iwl_remove_station(priv, sta_priv-&gt;sta_id, sta-&gt;addr);</div><div class='del'>-	if (ret)</div><div class='del'>-		IWL_ERR(priv, "Error removing station %pM\n",</div><div class='del'>-			sta-&gt;addr);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> void iwl_sta_fill_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx,</div><div class='ctx'> 		     u8 sta_id, struct iwl_link_quality_cmd *link_cmd)</div><div class='hunk'>@@ -1459,20 +1435,7 @@ int iwl_sta_rx_agg_stop(struct iwl_priv *priv, struct ieee80211_sta *sta,</div><div class='ctx'> 	return iwl_send_add_sta(priv, &amp;sta_cmd, CMD_SYNC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_sta_modify_ps_wake(struct iwl_priv *priv, int sta_id)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;shrd-&gt;sta_lock, flags);</div><div class='del'>-	priv-&gt;stations[sta_id].sta.station_flags &amp;= ~STA_FLG_PWR_SAVE_MSK;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.station_flags_msk = STA_FLG_PWR_SAVE_MSK;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.sta.modify_mask = 0;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.sleep_tx_count = 0;</div><div class='del'>-	priv-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='del'>-	iwl_send_add_sta(priv, &amp;priv-&gt;stations[sta_id].sta, CMD_ASYNC);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;shrd-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> void iwl_sta_modify_sleep_tx_count(struct iwl_priv *priv, int sta_id, int cnt)</div><div class='ctx'> {</div><div class='hunk'>@@ -1489,36 +1452,3 @@ void iwl_sta_modify_sleep_tx_count(struct iwl_priv *priv, int sta_id, int cnt)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;shrd-&gt;sta_lock, flags);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-void iwlagn_mac_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'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='del'>-	int sta_id;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case STA_NOTIFY_SLEEP:</div><div class='del'>-		WARN_ON(!sta_priv-&gt;client);</div><div class='del'>-		sta_priv-&gt;asleep = true;</div><div class='del'>-		if (atomic_read(&amp;sta_priv-&gt;pending_frames) &gt; 0)</div><div class='del'>-			ieee80211_sta_block_awake(hw, sta, true);</div><div class='del'>-		break;</div><div class='del'>-	case STA_NOTIFY_AWAKE:</div><div class='del'>-		WARN_ON(!sta_priv-&gt;client);</div><div class='del'>-		if (!sta_priv-&gt;asleep)</div><div class='del'>-			break;</div><div class='del'>-		sta_priv-&gt;asleep = false;</div><div class='del'>-		sta_id = iwl_sta_id(sta);</div><div class='del'>-		if (sta_id != IWL_INVALID_STATION)</div><div class='del'>-			iwl_sta_modify_ps_wake(priv, sta_id);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tt.c b/drivers/net/wireless/iwlwifi/iwl-agn-tt.c<br/>index c27180a73351..b0dff7a753a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-tt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-tt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-tt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-agn-tt.c</a></div><div class='hunk'>@@ -633,7 +633,7 @@ void iwl_tt_initialize(struct iwl_priv *priv)</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;ct_enter, iwl_bg_ct_enter);</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;ct_exit, iwl_bg_ct_exit);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;base_params-&gt;adv_thermal_throttle) {</div><div class='add'>+	if (cfg(priv)-&gt;base_params-&gt;adv_thermal_throttle) {</div><div class='ctx'> 		IWL_DEBUG_TEMP(priv, "Advanced Thermal Throttling\n");</div><div class='ctx'> 		tt-&gt;restriction = kcalloc(IWL_TI_STATE_MAX,</div><div class='ctx'> 					  sizeof(struct iwl_tt_restriction),</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c<br/>index df1540ca6102..c664c2726553 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-tx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-tx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-agn-tx.c</a></div><div class='hunk'>@@ -74,8 +74,8 @@ static void iwlagn_tx_cmd_build_basic(struct iwl_priv *priv,</div><div class='ctx'> 	else if (ieee80211_is_back_req(fc))</div><div class='ctx'> 		tx_flags |= TX_CMD_FLG_ACK_MSK | TX_CMD_FLG_IMM_BA_RSP_MASK;</div><div class='ctx'> 	else if (info-&gt;band == IEEE80211_BAND_2GHZ &amp;&amp;</div><div class='del'>-		 priv-&gt;cfg-&gt;bt_params &amp;&amp;</div><div class='del'>-		 priv-&gt;cfg-&gt;bt_params-&gt;advanced_bt_coexist &amp;&amp;</div><div class='add'>+		 cfg(priv)-&gt;bt_params &amp;&amp;</div><div class='add'>+		 cfg(priv)-&gt;bt_params-&gt;advanced_bt_coexist &amp;&amp;</div><div class='ctx'> 		 (ieee80211_is_auth(fc) || ieee80211_is_assoc_req(fc) ||</div><div class='ctx'> 		 ieee80211_is_reassoc_req(fc) ||</div><div class='ctx'> 		 skb-&gt;protocol == cpu_to_be16(ETH_P_PAE)))</div><div class='hunk'>@@ -151,7 +151,7 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv,</div><div class='ctx'> 	if (ieee80211_is_data(fc)) {</div><div class='ctx'> 		tx_cmd-&gt;initial_rate_index = 0;</div><div class='ctx'> 		tx_cmd-&gt;tx_flags |= TX_CMD_FLG_STA_RATE_MSK;</div><div class='del'>-#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE</div><div class='ctx'> 		if (priv-&gt;tm_fixed_rate) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * rate overwrite by testmode</div><div class='hunk'>@@ -164,7 +164,8 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv,</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='add'>+	} else if (ieee80211_is_back_req(fc))</div><div class='add'>+		tx_cmd-&gt;tx_flags |= TX_CMD_FLG_STA_RATE_MSK;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * If the current TX rate stored in mac80211 has the MCS bit set, it's</div><div class='hunk'>@@ -190,8 +191,8 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv,</div><div class='ctx'> 		rate_flags |= RATE_MCS_CCK_MSK;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up antennas */</div><div class='del'>-	 if (priv-&gt;cfg-&gt;bt_params &amp;&amp;</div><div class='del'>-	     priv-&gt;cfg-&gt;bt_params-&gt;advanced_bt_coexist &amp;&amp;</div><div class='add'>+	 if (cfg(priv)-&gt;bt_params &amp;&amp;</div><div class='add'>+	     cfg(priv)-&gt;bt_params-&gt;advanced_bt_coexist &amp;&amp;</div><div class='ctx'> 	     priv-&gt;bt_full_concurrent) {</div><div class='ctx'> 		/* operated as 1x1 in full concurrency mode */</div><div class='ctx'> 		priv-&gt;mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv-&gt;mgmt_tx_ant,</div><div class='hunk'>@@ -261,8 +262,8 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	__le16 fc;</div><div class='ctx'> 	u8 hdr_len;</div><div class='del'>-	u16 len;</div><div class='del'>-	u8 sta_id;</div><div class='add'>+	u16 len, seq_number = 0;</div><div class='add'>+	u8 sta_id, tid = IWL_MAX_TID_COUNT;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	bool is_agg = false;</div><div class='ctx'> </div><div class='hunk'>@@ -286,6 +287,19 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)</div><div class='ctx'> 		IWL_DEBUG_TX(priv, "Sending REASSOC frame\n");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	if (unlikely(ieee80211_is_probe_resp(fc))) {</div><div class='add'>+		struct iwl_wipan_noa_data *noa_data =</div><div class='add'>+			rcu_dereference(priv-&gt;noa_data);</div><div class='add'>+</div><div class='add'>+		if (noa_data &amp;&amp;</div><div class='add'>+		    pskb_expand_head(skb, 0, noa_data-&gt;length,</div><div class='add'>+				     GFP_ATOMIC) == 0) {</div><div class='add'>+			memcpy(skb_put(skb, noa_data-&gt;length),</div><div class='add'>+			       noa_data-&gt;data, noa_data-&gt;length);</div><div class='add'>+			hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	hdr_len = ieee80211_hdrlen(fc);</div><div class='ctx'> </div><div class='ctx'> 	/* For management frames use broadcast id to do not break aggregation */</div><div class='hunk'>@@ -354,9 +368,51 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)</div><div class='ctx'> 	info-&gt;driver_data[0] = ctx;</div><div class='ctx'> 	info-&gt;driver_data[1] = dev_cmd;</div><div class='ctx'> </div><div class='del'>-	if (iwl_trans_tx(trans(priv), skb, dev_cmd, ctx-&gt;ctxid, sta_id))</div><div class='add'>+	if (ieee80211_is_data_qos(fc) &amp;&amp; !ieee80211_is_qos_nullfunc(fc)) {</div><div class='add'>+		u8 *qc = NULL;</div><div class='add'>+		struct iwl_tid_data *tid_data;</div><div class='add'>+		qc = ieee80211_get_qos_ctl(hdr);</div><div class='add'>+		tid = qc[0] &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='add'>+		if (WARN_ON_ONCE(tid &gt;= IWL_MAX_TID_COUNT))</div><div class='add'>+			goto drop_unlock_sta;</div><div class='add'>+		tid_data = &amp;priv-&gt;tid_data[sta_id][tid];</div><div class='add'>+</div><div class='add'>+		/* aggregation is on for this &lt;sta,tid&gt; */</div><div class='add'>+		if (info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU &amp;&amp;</div><div class='add'>+		    tid_data-&gt;agg.state != IWL_AGG_ON) {</div><div class='add'>+			IWL_ERR(priv, "TX_CTL_AMPDU while not in AGG:"</div><div class='add'>+				" Tx flags = 0x%08x, agg.state = %d",</div><div class='add'>+				info-&gt;flags, tid_data-&gt;agg.state);</div><div class='add'>+			IWL_ERR(priv, "sta_id = %d, tid = %d seq_num = %d",</div><div class='add'>+				sta_id, tid, SEQ_TO_SN(tid_data-&gt;seq_number));</div><div class='add'>+			goto drop_unlock_sta;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* We can receive packets from the stack in IWL_AGG_{ON,OFF}</div><div class='add'>+		 * only. Check this here.</div><div class='add'>+		 */</div><div class='add'>+		if (WARN_ONCE(tid_data-&gt;agg.state != IWL_AGG_ON &amp;&amp;</div><div class='add'>+		    tid_data-&gt;agg.state != IWL_AGG_OFF,</div><div class='add'>+		    "Tx while agg.state = %d", tid_data-&gt;agg.state))</div><div class='add'>+			goto drop_unlock_sta;</div><div class='add'>+</div><div class='add'>+		seq_number = tid_data-&gt;seq_number;</div><div class='add'>+		seq_number &amp;= IEEE80211_SCTL_SEQ;</div><div class='add'>+		hdr-&gt;seq_ctrl &amp;= cpu_to_le16(IEEE80211_SCTL_FRAG);</div><div class='add'>+		hdr-&gt;seq_ctrl |= cpu_to_le16(seq_number);</div><div class='add'>+		seq_number += 0x10;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy MAC header from skb into command buffer */</div><div class='add'>+	memcpy(tx_cmd-&gt;hdr, hdr, hdr_len);</div><div class='add'>+</div><div class='add'>+	if (iwl_trans_tx(trans(priv), skb, dev_cmd, ctx-&gt;ctxid, sta_id, tid))</div><div class='ctx'> 		goto drop_unlock_sta;</div><div class='ctx'> </div><div class='add'>+	if (ieee80211_is_data_qos(fc) &amp;&amp; !ieee80211_is_qos_nullfunc(fc) &amp;&amp;</div><div class='add'>+	    !ieee80211_has_morefrags(fc))</div><div class='add'>+		priv-&gt;tid_data[sta_id][tid].seq_number = seq_number;</div><div class='add'>+</div><div class='ctx'> 	spin_unlock(&amp;priv-&gt;shrd-&gt;sta_lock);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;shrd-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -381,10 +437,81 @@ drop_unlock_priv:</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta, u16 tid)</div><div class='add'>+{</div><div class='add'>+	struct iwl_tid_data *tid_data;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int sta_id;</div><div class='add'>+</div><div class='add'>+	sta_id = iwl_sta_id(sta);</div><div class='add'>+</div><div class='add'>+	if (sta_id == IWL_INVALID_STATION) {</div><div class='add'>+		IWL_ERR(priv, "Invalid station for AGG tid %d\n", tid);</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;shrd-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	tid_data = &amp;priv-&gt;tid_data[sta_id][tid];</div><div class='add'>+</div><div class='add'>+	switch (priv-&gt;tid_data[sta_id][tid].agg.state) {</div><div class='add'>+	case IWL_EMPTYING_HW_QUEUE_ADDBA:</div><div class='add'>+		/*</div><div class='add'>+		* This can happen if the peer stops aggregation</div><div class='add'>+		* again before we've had a chance to drain the</div><div class='add'>+		* queue we selected previously, i.e. before the</div><div class='add'>+		* session was really started completely.</div><div class='add'>+		*/</div><div class='add'>+		IWL_DEBUG_HT(priv, "AGG stop before setup done\n");</div><div class='add'>+		goto turn_off;</div><div class='add'>+	case IWL_AGG_ON:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		IWL_WARN(priv, "Stopping AGG while state not ON "</div><div class='add'>+			 "or starting for %d on %d (%d)\n", sta_id, tid,</div><div class='add'>+			 priv-&gt;tid_data[sta_id][tid].agg.state);</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;shrd-&gt;sta_lock, flags);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tid_data-&gt;agg.ssn = SEQ_TO_SN(tid_data-&gt;seq_number);</div><div class='add'>+</div><div class='add'>+	/* There are still packets for this RA / TID in the HW */</div><div class='add'>+	if (tid_data-&gt;agg.ssn != tid_data-&gt;next_reclaimed) {</div><div class='add'>+		IWL_DEBUG_TX_QUEUES(priv, "Can't proceed: ssn %d, "</div><div class='add'>+				    "next_recl = %d",</div><div class='add'>+				    tid_data-&gt;agg.ssn,</div><div class='add'>+				    tid_data-&gt;next_reclaimed);</div><div class='add'>+		priv-&gt;tid_data[sta_id][tid].agg.state =</div><div class='add'>+			IWL_EMPTYING_HW_QUEUE_DELBA;</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;shrd-&gt;sta_lock, flags);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TX_QUEUES(priv, "Can proceed: ssn = next_recl = %d",</div><div class='add'>+			    tid_data-&gt;agg.ssn);</div><div class='add'>+turn_off:</div><div class='add'>+	priv-&gt;tid_data[sta_id][tid].agg.state = IWL_AGG_OFF;</div><div class='add'>+</div><div class='add'>+	/* do not restore/save irqs */</div><div class='add'>+	spin_unlock(&amp;priv-&gt;shrd-&gt;sta_lock);</div><div class='add'>+	spin_lock(&amp;priv-&gt;shrd-&gt;lock);</div><div class='add'>+</div><div class='add'>+	iwl_trans_tx_agg_disable(trans(priv), sta_id, tid);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;shrd-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	ieee80211_stop_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,</div><div class='ctx'> 			struct ieee80211_sta *sta, u16 tid, u16 *ssn)</div><div class='ctx'> {</div><div class='del'>-	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct iwl_tid_data *tid_data;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int sta_id;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -399,7 +526,7 @@ int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,</div><div class='ctx'> 	if (unlikely(tid &gt;= IWL_MAX_TID_COUNT))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;shrd-&gt;tid_data[sta_id][tid].agg.state != IWL_AGG_OFF) {</div><div class='add'>+	if (priv-&gt;tid_data[sta_id][tid].agg.state != IWL_AGG_OFF) {</div><div class='ctx'> 		IWL_ERR(priv, "Start AGG when state is not IWL_AGG_OFF !\n");</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -408,27 +535,136 @@ int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_trans_tx_agg_alloc(trans(priv), vif_priv-&gt;ctx-&gt;ctxid, sta_id,</div><div class='del'>-				     tid, ssn);</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;shrd-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	tid_data = &amp;priv-&gt;tid_data[sta_id][tid];</div><div class='add'>+	tid_data-&gt;agg.ssn = SEQ_TO_SN(tid_data-&gt;seq_number);</div><div class='add'>+</div><div class='add'>+	*ssn = tid_data-&gt;agg.ssn;</div><div class='add'>+</div><div class='add'>+	ret = iwl_trans_tx_agg_alloc(trans(priv), sta_id, tid);</div><div class='add'>+	if (ret) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;shrd-&gt;sta_lock, flags);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (*ssn == tid_data-&gt;next_reclaimed) {</div><div class='add'>+		IWL_DEBUG_TX_QUEUES(priv, "Can proceed: ssn = next_recl = %d",</div><div class='add'>+				    tid_data-&gt;agg.ssn);</div><div class='add'>+		tid_data-&gt;agg.state = IWL_AGG_ON;</div><div class='add'>+		ieee80211_start_tx_ba_cb_irqsafe(vif, sta-&gt;addr, tid);</div><div class='add'>+	} else {</div><div class='add'>+		IWL_DEBUG_TX_QUEUES(priv, "Can't proceed: ssn %d, "</div><div class='add'>+				    "next_reclaimed = %d",</div><div class='add'>+				    tid_data-&gt;agg.ssn,</div><div class='add'>+				    tid_data-&gt;next_reclaimed);</div><div class='add'>+		tid_data-&gt;agg.state = IWL_EMPTYING_HW_QUEUE_ADDBA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;shrd-&gt;sta_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,</div><div class='del'>-		       struct ieee80211_sta *sta, u16 tid)</div><div class='add'>+int iwlagn_tx_agg_oper(struct iwl_priv *priv, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta, u16 tid, u8 buf_size)</div><div class='ctx'> {</div><div class='del'>-	int sta_id;</div><div class='del'>-	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct iwl_station_priv *sta_priv = (void *) sta-&gt;drv_priv;</div><div class='add'>+	struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 ssn;</div><div class='ctx'> </div><div class='del'>-	sta_id = iwl_sta_id(sta);</div><div class='add'>+	buf_size = min_t(int, buf_size, LINK_QUAL_AGG_FRAME_LIMIT_DEF);</div><div class='ctx'> </div><div class='del'>-	if (sta_id == IWL_INVALID_STATION) {</div><div class='del'>-		IWL_ERR(priv, "Invalid station for AGG tid %d\n", tid);</div><div class='del'>-		return -ENXIO;</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;shrd-&gt;sta_lock, flags);</div><div class='add'>+	ssn = priv-&gt;tid_data[sta_priv-&gt;sta_id][tid].agg.ssn;</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;shrd-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+	iwl_trans_tx_agg_setup(trans(priv), ctx-&gt;ctxid, sta_priv-&gt;sta_id, tid,</div><div class='add'>+			       buf_size, ssn);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the limit is 0, then it wasn't initialised yet,</div><div class='add'>+	 * use the default. We can do that since we take the</div><div class='add'>+	 * minimum below, and we don't want to go above our</div><div class='add'>+	 * default due to hardware restrictions.</div><div class='add'>+	 */</div><div class='add'>+	if (sta_priv-&gt;max_agg_bufsize == 0)</div><div class='add'>+		sta_priv-&gt;max_agg_bufsize =</div><div class='add'>+			LINK_QUAL_AGG_FRAME_LIMIT_DEF;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Even though in theory the peer could have different</div><div class='add'>+	 * aggregation reorder buffer sizes for different sessions,</div><div class='add'>+	 * our ucode doesn't allow for that and has a global limit</div><div class='add'>+	 * for each station. Therefore, use the minimum of all the</div><div class='add'>+	 * aggregation sessions and our default value.</div><div class='add'>+	 */</div><div class='add'>+	sta_priv-&gt;max_agg_bufsize =</div><div class='add'>+		min(sta_priv-&gt;max_agg_bufsize, buf_size);</div><div class='add'>+</div><div class='add'>+	if (cfg(priv)-&gt;ht_params &amp;&amp;</div><div class='add'>+	    cfg(priv)-&gt;ht_params-&gt;use_rts_for_aggregation) {</div><div class='add'>+		/*</div><div class='add'>+		 * switch to RTS/CTS if it is the prefer protection</div><div class='add'>+		 * method for HT traffic</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		sta_priv-&gt;lq_sta.lq.general_params.flags |=</div><div class='add'>+			LINK_QUAL_FLAGS_SET_STA_TLC_RTS_MSK;</div><div class='ctx'> 	}</div><div class='add'>+	priv-&gt;agg_tids_count++;</div><div class='add'>+	IWL_DEBUG_HT(priv, "priv-&gt;agg_tids_count = %u\n",</div><div class='add'>+		     priv-&gt;agg_tids_count);</div><div class='add'>+</div><div class='add'>+	sta_priv-&gt;lq_sta.lq.agg_params.agg_frame_cnt_limit =</div><div class='add'>+		sta_priv-&gt;max_agg_bufsize;</div><div class='ctx'> </div><div class='del'>-	return iwl_trans_tx_agg_disable(trans(priv), vif_priv-&gt;ctx-&gt;ctxid,</div><div class='del'>-					sta_id, tid);</div><div class='add'>+	IWL_INFO(priv, "Tx aggregation enabled on ra = %pM tid = %d\n",</div><div class='add'>+		 sta-&gt;addr, tid);</div><div class='add'>+</div><div class='add'>+	return iwl_send_lq_cmd(priv, ctx,</div><div class='add'>+			&amp;sta_priv-&gt;lq_sta.lq, CMD_ASYNC, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwlagn_check_ratid_empty(struct iwl_priv *priv, int sta_id, u8 tid)</div><div class='add'>+{</div><div class='add'>+	struct iwl_tid_data *tid_data = &amp;priv-&gt;tid_data[sta_id][tid];</div><div class='add'>+	enum iwl_rxon_context_id ctx;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	u8 *addr;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;priv-&gt;shrd-&gt;sta_lock);</div><div class='add'>+</div><div class='add'>+	addr = priv-&gt;stations[sta_id].sta.sta.addr;</div><div class='add'>+	ctx = priv-&gt;stations[sta_id].ctxid;</div><div class='add'>+	vif = priv-&gt;contexts[ctx].vif;</div><div class='add'>+</div><div class='add'>+	switch (priv-&gt;tid_data[sta_id][tid].agg.state) {</div><div class='add'>+	case IWL_EMPTYING_HW_QUEUE_DELBA:</div><div class='add'>+		/* There are no packets for this RA / TID in the HW any more */</div><div class='add'>+		if (tid_data-&gt;agg.ssn == tid_data-&gt;next_reclaimed) {</div><div class='add'>+			IWL_DEBUG_TX_QUEUES(priv,</div><div class='add'>+				"Can continue DELBA flow ssn = next_recl ="</div><div class='add'>+				" %d", tid_data-&gt;next_reclaimed);</div><div class='add'>+			iwl_trans_tx_agg_disable(trans(priv), sta_id, tid);</div><div class='add'>+			tid_data-&gt;agg.state = IWL_AGG_OFF;</div><div class='add'>+			ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case IWL_EMPTYING_HW_QUEUE_ADDBA:</div><div class='add'>+		/* There are no packets for this RA / TID in the HW any more */</div><div class='add'>+		if (tid_data-&gt;agg.ssn == tid_data-&gt;next_reclaimed) {</div><div class='add'>+			IWL_DEBUG_TX_QUEUES(priv,</div><div class='add'>+				"Can continue ADDBA flow ssn = next_recl ="</div><div class='add'>+				" %d", tid_data-&gt;next_reclaimed);</div><div class='add'>+			tid_data-&gt;agg.state = IWL_AGG_ON;</div><div class='add'>+			ieee80211_start_tx_ba_cb_irqsafe(vif, addr, tid);</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='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwlagn_non_agg_tx_status(struct iwl_priv *priv,</div><div class='hunk'>@@ -568,7 +804,7 @@ static void iwl_rx_reply_tx_agg(struct iwl_priv *priv,</div><div class='ctx'> 		IWLAGN_TX_RES_TID_POS;</div><div class='ctx'> 	int sta_id = (tx_resp-&gt;ra_tid &amp; IWLAGN_TX_RES_RA_MSK) &gt;&gt;</div><div class='ctx'> 		IWLAGN_TX_RES_RA_POS;</div><div class='del'>-	struct iwl_ht_agg *agg = &amp;priv-&gt;shrd-&gt;tid_data[sta_id][tid].agg;</div><div class='add'>+	struct iwl_ht_agg *agg = &amp;priv-&gt;tid_data[sta_id][tid].agg;</div><div class='ctx'> 	u32 status = le16_to_cpu(tx_resp-&gt;status.status);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -584,8 +820,8 @@ static void iwl_rx_reply_tx_agg(struct iwl_priv *priv,</div><div class='ctx'> 	 * notification again.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (tx_resp-&gt;bt_kill_count &amp;&amp; tx_resp-&gt;frame_count == 1 &amp;&amp;</div><div class='del'>-	    priv-&gt;cfg-&gt;bt_params &amp;&amp;</div><div class='del'>-	    priv-&gt;cfg-&gt;bt_params-&gt;advanced_bt_coexist) {</div><div class='add'>+	    cfg(priv)-&gt;bt_params &amp;&amp;</div><div class='add'>+	    cfg(priv)-&gt;bt_params-&gt;advanced_bt_coexist) {</div><div class='ctx'> 		IWL_DEBUG_COEX(priv, "receive reply tx w/ bt_kill\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -758,7 +994,7 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,</div><div class='ctx'> 	struct iwlagn_tx_resp *tx_resp = (void *)&amp;pkt-&gt;u.raw[0];</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='ctx'> 	u32 status = le16_to_cpu(tx_resp-&gt;status.status);</div><div class='del'>-	u32 ssn = iwlagn_get_scd_ssn(tx_resp);</div><div class='add'>+	u16 ssn = iwlagn_get_scd_ssn(tx_resp);</div><div class='ctx'> 	int tid;</div><div class='ctx'> 	int sta_id;</div><div class='ctx'> 	int freed;</div><div class='hunk'>@@ -780,10 +1016,34 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,</div><div class='ctx'> 		iwl_rx_reply_tx_agg(priv, tx_resp);</div><div class='ctx'> </div><div class='ctx'> 	if (tx_resp-&gt;frame_count == 1) {</div><div class='add'>+		u16 next_reclaimed = le16_to_cpu(tx_resp-&gt;seq_ctl);</div><div class='add'>+		next_reclaimed = SEQ_TO_SN(next_reclaimed + 0x10);</div><div class='add'>+</div><div class='add'>+		if (is_agg) {</div><div class='add'>+			/* If this is an aggregation queue, we can rely on the</div><div class='add'>+			 * ssn since the wifi sequence number corresponds to</div><div class='add'>+			 * the index in the TFD ring (%256).</div><div class='add'>+			 * The seq_ctl is the sequence control of the packet</div><div class='add'>+			 * to which this Tx response relates. But if there is a</div><div class='add'>+			 * hole in the bitmap of the BA we received, this Tx</div><div class='add'>+			 * response may allow to reclaim the hole and all the</div><div class='add'>+			 * subsequent packets that were already acked.</div><div class='add'>+			 * In that case, seq_ctl != ssn, and the next packet</div><div class='add'>+			 * to be reclaimed will be ssn and not seq_ctl.</div><div class='add'>+			 */</div><div class='add'>+			next_reclaimed = ssn;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		__skb_queue_head_init(&amp;skbs);</div><div class='add'>+		priv-&gt;tid_data[sta_id][tid].next_reclaimed = next_reclaimed;</div><div class='add'>+</div><div class='add'>+		IWL_DEBUG_TX_REPLY(priv, "Next reclaimed packet:%d",</div><div class='add'>+					  next_reclaimed);</div><div class='add'>+</div><div class='ctx'> 		/*we can free until ssn % q.n_bd not inclusive */</div><div class='del'>-		iwl_trans_reclaim(trans(priv), sta_id, tid, txq_id,</div><div class='del'>-				  ssn, status, &amp;skbs);</div><div class='add'>+		WARN_ON(iwl_trans_reclaim(trans(priv), sta_id, tid, txq_id,</div><div class='add'>+				  ssn, status, &amp;skbs));</div><div class='add'>+		iwlagn_check_ratid_empty(priv, sta_id, tid);</div><div class='ctx'> 		freed = 0;</div><div class='ctx'> 		while (!skb_queue_empty(&amp;skbs)) {</div><div class='ctx'> 			skb = __skb_dequeue(&amp;skbs);</div><div class='hunk'>@@ -803,7 +1063,8 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,</div><div class='ctx'> 			    iwl_is_associated_ctx(ctx) &amp;&amp; ctx-&gt;vif &amp;&amp;</div><div class='ctx'> 			    ctx-&gt;vif-&gt;type == NL80211_IFTYPE_STATION) {</div><div class='ctx'> 				ctx-&gt;last_tx_rejected = true;</div><div class='del'>-				iwl_trans_stop_queue(trans(priv), txq_id);</div><div class='add'>+				iwl_trans_stop_queue(trans(priv), txq_id,</div><div class='add'>+					"Tx on passive channel");</div><div class='ctx'> </div><div class='ctx'> 				IWL_DEBUG_TX_REPLY(priv,</div><div class='ctx'> 					   "TXQ %d status %s (0x%08x) "</div><div class='hunk'>@@ -877,27 +1138,24 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	sta_id = ba_resp-&gt;sta_id;</div><div class='ctx'> 	tid = ba_resp-&gt;tid;</div><div class='del'>-	agg = &amp;priv-&gt;shrd-&gt;tid_data[sta_id][tid].agg;</div><div class='add'>+	agg = &amp;priv-&gt;tid_data[sta_id][tid].agg;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;shrd-&gt;sta_lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(agg-&gt;txq_id != scd_flow)) {</div><div class='del'>-		/*</div><div class='del'>-		 * FIXME: this is a uCode bug which need to be addressed,</div><div class='del'>-		 * log the information and return for now!</div><div class='del'>-		 * since it is possible happen very often and in order</div><div class='del'>-		 * not to fill the syslog, don't enable the logging by default</div><div class='del'>-		 */</div><div class='del'>-		IWL_DEBUG_TX_REPLY(priv,</div><div class='del'>-			"BA scd_flow %d does not match txq_id %d\n",</div><div class='del'>-			scd_flow, agg-&gt;txq_id);</div><div class='add'>+	if (unlikely(!agg-&gt;wait_for_ba)) {</div><div class='add'>+		if (unlikely(ba_resp-&gt;bitmap))</div><div class='add'>+			IWL_ERR(priv, "Received BA when not expected\n");</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;priv-&gt;shrd-&gt;sta_lock, flags);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!agg-&gt;wait_for_ba)) {</div><div class='del'>-		if (unlikely(ba_resp-&gt;bitmap))</div><div class='del'>-			IWL_ERR(priv, "Received BA when not expected\n");</div><div class='add'>+	__skb_queue_head_init(&amp;reclaimed_skbs);</div><div class='add'>+</div><div class='add'>+	/* Release all TFDs before the SSN, i.e. all TFDs in front of</div><div class='add'>+	 * block-ack window (we assume that they've been successfully</div><div class='add'>+	 * transmitted ... if not, it's too late anyway). */</div><div class='add'>+	if (iwl_trans_reclaim(trans(priv), sta_id, tid, scd_flow,</div><div class='add'>+			      ba_resp_scd_ssn, 0, &amp;reclaimed_skbs)) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;priv-&gt;shrd-&gt;sta_lock, flags);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -909,11 +1167,9 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,</div><div class='ctx'> 			   ba_resp-&gt;sta_id);</div><div class='ctx'> 	IWL_DEBUG_TX_REPLY(priv, "TID = %d, SeqCtl = %d, bitmap = 0x%llx, "</div><div class='ctx'> 			   "scd_flow = %d, scd_ssn = %d\n",</div><div class='del'>-			   ba_resp-&gt;tid,</div><div class='del'>-			   ba_resp-&gt;seq_ctl,</div><div class='add'>+			   ba_resp-&gt;tid, le16_to_cpu(ba_resp-&gt;seq_ctl),</div><div class='ctx'> 			   (unsigned long long)le64_to_cpu(ba_resp-&gt;bitmap),</div><div class='del'>-			   ba_resp-&gt;scd_flow,</div><div class='del'>-			   ba_resp-&gt;scd_ssn);</div><div class='add'>+			   scd_flow, ba_resp_scd_ssn);</div><div class='ctx'> </div><div class='ctx'> 	/* Mark that the expected block-ack response arrived */</div><div class='ctx'> 	agg-&gt;wait_for_ba = false;</div><div class='hunk'>@@ -932,13 +1188,9 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,</div><div class='ctx'> 	IWL_DEBUG_HT(priv, "agg frames sent:%d, acked:%d\n",</div><div class='ctx'> 			ba_resp-&gt;txed, ba_resp-&gt;txed_2_done);</div><div class='ctx'> </div><div class='del'>-	__skb_queue_head_init(&amp;reclaimed_skbs);</div><div class='add'>+	priv-&gt;tid_data[sta_id][tid].next_reclaimed = ba_resp_scd_ssn;</div><div class='ctx'> </div><div class='del'>-	/* Release all TFDs before the SSN, i.e. all TFDs in front of</div><div class='del'>-	 * block-ack window (we assume that they've been successfully</div><div class='del'>-	 * transmitted ... if not, it's too late anyway). */</div><div class='del'>-	iwl_trans_reclaim(trans(priv), sta_id, tid, scd_flow, ba_resp_scd_ssn,</div><div class='del'>-			  0, &amp;reclaimed_skbs);</div><div class='add'>+	iwlagn_check_ratid_empty(priv, sta_id, tid);</div><div class='ctx'> 	freed = 0;</div><div class='ctx'> 	while (!skb_queue_empty(&amp;reclaimed_skbs)) {</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c<br/>index e0e9a3dfbc00..b5c7c5f0a753 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-agn.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='hunk'>@@ -44,6 +43,7 @@</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "iwl-eeprom.h"</div><div class='add'>+#include "iwl-wifi.h"</div><div class='ctx'> #include "iwl-dev.h"</div><div class='ctx'> #include "iwl-core.h"</div><div class='ctx'> #include "iwl-io.h"</div><div class='hunk'>@@ -367,7 +367,7 @@ static void iwl_continuous_event_trace(struct iwl_priv *priv)</div><div class='ctx'> 	u32 num_wraps;  /* # times uCode wrapped to top of log */</div><div class='ctx'> 	u32 next_entry; /* index of next entry to be written by uCode */</div><div class='ctx'> </div><div class='del'>-	base = priv-&gt;device_pointers.error_event_table;</div><div class='add'>+	base = priv-&gt;shrd-&gt;device_pointers.error_event_table;</div><div class='ctx'> 	if (iwlagn_hw_valid_rtc_data_addr(base)) {</div><div class='ctx'> 		capacity = iwl_read_targ_mem(bus(priv), base);</div><div class='ctx'> 		num_wraps = iwl_read_targ_mem(bus(priv),</div><div class='hunk'>@@ -452,52 +452,6 @@ static void iwl_bg_tx_flush(struct work_struct *work)</div><div class='ctx'> 	iwlagn_dev_txfifo_flush(priv, IWL_DROP_ALL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- * uCode download functions</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-static void iwl_free_fw_desc(struct iwl_priv *priv, struct fw_desc *desc)</div><div class='del'>-{</div><div class='del'>-	if (desc-&gt;v_addr)</div><div class='del'>-		dma_free_coherent(bus(priv)-&gt;dev, desc-&gt;len,</div><div class='del'>-				  desc-&gt;v_addr, desc-&gt;p_addr);</div><div class='del'>-	desc-&gt;v_addr = NULL;</div><div class='del'>-	desc-&gt;len = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_free_fw_img(struct iwl_priv *priv, struct fw_img *img)</div><div class='del'>-{</div><div class='del'>-	iwl_free_fw_desc(priv, &amp;img-&gt;code);</div><div class='del'>-	iwl_free_fw_desc(priv, &amp;img-&gt;data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_dealloc_ucode(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	iwl_free_fw_img(priv, &amp;priv-&gt;ucode_rt);</div><div class='del'>-	iwl_free_fw_img(priv, &amp;priv-&gt;ucode_init);</div><div class='del'>-	iwl_free_fw_img(priv, &amp;priv-&gt;ucode_wowlan);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_alloc_fw_desc(struct iwl_priv *priv, struct fw_desc *desc,</div><div class='del'>-			     const void *data, size_t len)</div><div class='del'>-{</div><div class='del'>-	if (!len) {</div><div class='del'>-		desc-&gt;v_addr = NULL;</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	desc-&gt;v_addr = dma_alloc_coherent(bus(priv)-&gt;dev, len,</div><div class='del'>-					  &amp;desc-&gt;p_addr, GFP_KERNEL);</div><div class='del'>-	if (!desc-&gt;v_addr)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	desc-&gt;len = len;</div><div class='del'>-	memcpy(desc-&gt;v_addr, data, len);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -555,23 +509,14 @@ static void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)</div><div class='ctx'> 	BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-struct iwlagn_ucode_capabilities {</div><div class='del'>-	u32 max_probe_length;</div><div class='del'>-	u32 standard_phy_calibration_size;</div><div class='del'>-	u32 flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context);</div><div class='del'>-static int iwlagn_mac_setup_register(struct iwl_priv *priv,</div><div class='del'>-				  struct iwlagn_ucode_capabilities *capa);</div><div class='ctx'> </div><div class='ctx'> #define UCODE_EXPERIMENTAL_INDEX	100</div><div class='ctx'> #define UCODE_EXPERIMENTAL_TAG		"exp"</div><div class='ctx'> </div><div class='ctx'> static int __must_check iwl_request_firmware(struct iwl_priv *priv, bool first)</div><div class='ctx'> {</div><div class='del'>-	const char *name_pre = priv-&gt;cfg-&gt;fw_name_pre;</div><div class='add'>+	const char *name_pre = cfg(priv)-&gt;fw_name_pre;</div><div class='ctx'> 	char tag[8];</div><div class='ctx'> </div><div class='ctx'> 	if (first) {</div><div class='hunk'>@@ -580,14 +525,14 @@ static int __must_check iwl_request_firmware(struct iwl_priv *priv, bool first)</div><div class='ctx'> 		strcpy(tag, UCODE_EXPERIMENTAL_TAG);</div><div class='ctx'> 	} else if (priv-&gt;fw_index == UCODE_EXPERIMENTAL_INDEX) {</div><div class='ctx'> #endif</div><div class='del'>-		priv-&gt;fw_index = priv-&gt;cfg-&gt;ucode_api_max;</div><div class='add'>+		priv-&gt;fw_index = cfg(priv)-&gt;ucode_api_max;</div><div class='ctx'> 		sprintf(tag, "%d", priv-&gt;fw_index);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		priv-&gt;fw_index--;</div><div class='ctx'> 		sprintf(tag, "%d", priv-&gt;fw_index);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;fw_index &lt; priv-&gt;cfg-&gt;ucode_api_min) {</div><div class='add'>+	if (priv-&gt;fw_index &lt; cfg(priv)-&gt;ucode_api_min) {</div><div class='ctx'> 		IWL_ERR(priv, "no suitable firmware found!\n");</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -892,9 +837,9 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)</div><div class='ctx'> 	struct iwl_ucode_header *ucode;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct iwlagn_firmware_pieces pieces;</div><div class='del'>-	const unsigned int api_max = priv-&gt;cfg-&gt;ucode_api_max;</div><div class='del'>-	unsigned int api_ok = priv-&gt;cfg-&gt;ucode_api_ok;</div><div class='del'>-	const unsigned int api_min = priv-&gt;cfg-&gt;ucode_api_min;</div><div class='add'>+	const unsigned int api_max = cfg(priv)-&gt;ucode_api_max;</div><div class='add'>+	unsigned int api_ok = cfg(priv)-&gt;ucode_api_ok;</div><div class='add'>+	const unsigned int api_min = cfg(priv)-&gt;ucode_api_min;</div><div class='ctx'> 	u32 api_ver;</div><div class='ctx'> 	char buildstr[25];</div><div class='ctx'> 	u32 build;</div><div class='hunk'>@@ -1040,30 +985,32 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)</div><div class='ctx'> 	/* Runtime instructions and 2 copies of data:</div><div class='ctx'> 	 * 1) unmodified from disk</div><div class='ctx'> 	 * 2) backup cache for save/restore during power-downs */</div><div class='del'>-	if (iwl_alloc_fw_desc(priv, &amp;priv-&gt;ucode_rt.code,</div><div class='add'>+	if (iwl_alloc_fw_desc(bus(priv), &amp;trans(priv)-&gt;ucode_rt.code,</div><div class='ctx'> 			      pieces.inst, pieces.inst_size))</div><div class='ctx'> 		goto err_pci_alloc;</div><div class='del'>-	if (iwl_alloc_fw_desc(priv, &amp;priv-&gt;ucode_rt.data,</div><div class='add'>+	if (iwl_alloc_fw_desc(bus(priv), &amp;trans(priv)-&gt;ucode_rt.data,</div><div class='ctx'> 			      pieces.data, pieces.data_size))</div><div class='ctx'> 		goto err_pci_alloc;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialization instructions and data */</div><div class='ctx'> 	if (pieces.init_size &amp;&amp; pieces.init_data_size) {</div><div class='del'>-		if (iwl_alloc_fw_desc(priv, &amp;priv-&gt;ucode_init.code,</div><div class='add'>+		if (iwl_alloc_fw_desc(bus(priv), &amp;trans(priv)-&gt;ucode_init.code,</div><div class='ctx'> 				      pieces.init, pieces.init_size))</div><div class='ctx'> 			goto err_pci_alloc;</div><div class='del'>-		if (iwl_alloc_fw_desc(priv, &amp;priv-&gt;ucode_init.data,</div><div class='add'>+		if (iwl_alloc_fw_desc(bus(priv), &amp;trans(priv)-&gt;ucode_init.data,</div><div class='ctx'> 				      pieces.init_data, pieces.init_data_size))</div><div class='ctx'> 			goto err_pci_alloc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* WoWLAN instructions and data */</div><div class='ctx'> 	if (pieces.wowlan_inst_size &amp;&amp; pieces.wowlan_data_size) {</div><div class='del'>-		if (iwl_alloc_fw_desc(priv, &amp;priv-&gt;ucode_wowlan.code,</div><div class='add'>+		if (iwl_alloc_fw_desc(bus(priv),</div><div class='add'>+				      &amp;trans(priv)-&gt;ucode_wowlan.code,</div><div class='ctx'> 				      pieces.wowlan_inst,</div><div class='ctx'> 				      pieces.wowlan_inst_size))</div><div class='ctx'> 			goto err_pci_alloc;</div><div class='del'>-		if (iwl_alloc_fw_desc(priv, &amp;priv-&gt;ucode_wowlan.data,</div><div class='add'>+		if (iwl_alloc_fw_desc(bus(priv),</div><div class='add'>+				      &amp;trans(priv)-&gt;ucode_wowlan.data,</div><div class='ctx'> 				      pieces.wowlan_data,</div><div class='ctx'> 				      pieces.wowlan_data_size))</div><div class='ctx'> 			goto err_pci_alloc;</div><div class='hunk'>@@ -1081,20 +1028,23 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)</div><div class='ctx'> 		priv-&gt;init_evtlog_size = (pieces.init_evtlog_size - 16)/12;</div><div class='ctx'> 	else</div><div class='ctx'> 		priv-&gt;init_evtlog_size =</div><div class='del'>-			priv-&gt;cfg-&gt;base_params-&gt;max_event_log_size;</div><div class='add'>+			cfg(priv)-&gt;base_params-&gt;max_event_log_size;</div><div class='ctx'> 	priv-&gt;init_errlog_ptr = pieces.init_errlog_ptr;</div><div class='ctx'> 	priv-&gt;inst_evtlog_ptr = pieces.inst_evtlog_ptr;</div><div class='ctx'> 	if (pieces.inst_evtlog_size)</div><div class='ctx'> 		priv-&gt;inst_evtlog_size = (pieces.inst_evtlog_size - 16)/12;</div><div class='ctx'> 	else</div><div class='ctx'> 		priv-&gt;inst_evtlog_size =</div><div class='del'>-			priv-&gt;cfg-&gt;base_params-&gt;max_event_log_size;</div><div class='add'>+			cfg(priv)-&gt;base_params-&gt;max_event_log_size;</div><div class='ctx'> 	priv-&gt;inst_errlog_ptr = pieces.inst_errlog_ptr;</div><div class='add'>+#ifndef CONFIG_IWLWIFI_P2P</div><div class='add'>+	ucode_capa.flags &amp;= ~IWL_UCODE_TLV_FLAGS_PAN;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;new_scan_threshold_behaviour =</div><div class='ctx'> 		!!(ucode_capa.flags &amp; IWL_UCODE_TLV_FLAGS_NEWSCAN);</div><div class='ctx'> </div><div class='del'>-	if (!(priv-&gt;cfg-&gt;sku &amp; EEPROM_SKU_CAP_IPAN_ENABLE))</div><div class='add'>+	if (!(cfg(priv)-&gt;sku &amp; EEPROM_SKU_CAP_IPAN_ENABLE))</div><div class='ctx'> 		ucode_capa.flags &amp;= ~IWL_UCODE_TLV_FLAGS_PAN;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1111,7 +1061,6 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)</div><div class='ctx'> 		priv-&gt;sta_key_max_num = STA_KEY_MAX_NUM;</div><div class='ctx'> 		priv-&gt;shrd-&gt;cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * figure out the offset of chain noise reset and gain commands</div><div class='ctx'> 	 * base on the size of standard phy calibration commands table size</div><div class='hunk'>@@ -1156,7 +1105,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)</div><div class='ctx'> </div><div class='ctx'>  err_pci_alloc:</div><div class='ctx'> 	IWL_ERR(priv, "failed to allocate pci memory\n");</div><div class='del'>-	iwl_dealloc_ucode(priv);</div><div class='add'>+	iwl_dealloc_ucode(trans(priv));</div><div class='ctx'>  out_unbind:</div><div class='ctx'> 	complete(&amp;priv-&gt;firmware_loading_complete);</div><div class='ctx'> 	device_release_driver(bus(priv)-&gt;dev);</div><div class='hunk'>@@ -1176,7 +1125,7 @@ static void iwl_rf_kill_ct_config(struct iwl_priv *priv)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;shrd-&gt;lock, flags);</div><div class='ctx'> 	priv-&gt;thermal_throttle.ct_kill_toggle = false;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;base_params-&gt;support_ct_kill_exit) {</div><div class='add'>+	if (cfg(priv)-&gt;base_params-&gt;support_ct_kill_exit) {</div><div class='ctx'> 		adv_cmd.critical_temperature_enter =</div><div class='ctx'> 			cpu_to_le32(hw_params(priv).ct_kill_threshold);</div><div class='ctx'> 		adv_cmd.critical_temperature_exit =</div><div class='hunk'>@@ -1271,10 +1220,10 @@ int iwl_alive_start(struct iwl_priv *priv)</div><div class='ctx'> 		return -ERFKILL;</div><div class='ctx'> </div><div class='ctx'> 	/* download priority table before any calibration request */</div><div class='del'>-	if (priv-&gt;cfg-&gt;bt_params &amp;&amp;</div><div class='del'>-	    priv-&gt;cfg-&gt;bt_params-&gt;advanced_bt_coexist) {</div><div class='add'>+	if (cfg(priv)-&gt;bt_params &amp;&amp;</div><div class='add'>+	    cfg(priv)-&gt;bt_params-&gt;advanced_bt_coexist) {</div><div class='ctx'> 		/* Configure Bluetooth device coexistence support */</div><div class='del'>-		if (priv-&gt;cfg-&gt;bt_params-&gt;bt_sco_disable)</div><div class='add'>+		if (cfg(priv)-&gt;bt_params-&gt;bt_sco_disable)</div><div class='ctx'> 			priv-&gt;bt_enable_pspoll = false;</div><div class='ctx'> 		else</div><div class='ctx'> 			priv-&gt;bt_enable_pspoll = true;</div><div class='hunk'>@@ -1286,14 +1235,14 @@ int iwl_alive_start(struct iwl_priv *priv)</div><div class='ctx'> 		priv-&gt;bt_valid = IWLAGN_BT_VALID_ENABLE_FLAGS;</div><div class='ctx'> 		priv-&gt;cur_rssi_ctx = NULL;</div><div class='ctx'> </div><div class='del'>-		iwlagn_send_prio_tbl(priv);</div><div class='add'>+		iwl_send_prio_tbl(trans(priv));</div><div class='ctx'> </div><div class='ctx'> 		/* FIXME: w/a to force change uCode BT state machine */</div><div class='del'>-		ret = iwlagn_send_bt_env(priv, IWL_BT_COEX_ENV_OPEN,</div><div class='add'>+		ret = iwl_send_bt_env(trans(priv), IWL_BT_COEX_ENV_OPEN,</div><div class='ctx'> 					 BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='del'>-		ret = iwlagn_send_bt_env(priv, IWL_BT_COEX_ENV_CLOSE,</div><div class='add'>+		ret = iwl_send_bt_env(trans(priv), IWL_BT_COEX_ENV_CLOSE,</div><div class='ctx'> 					 BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -1304,16 +1253,17 @@ int iwl_alive_start(struct iwl_priv *priv)</div><div class='ctx'> 		iwl_send_bt_config(priv);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hw_params(priv).calib_rt_cfg)</div><div class='del'>-		iwlagn_send_calib_cfg_rt(priv,</div><div class='del'>-					 hw_params(priv).calib_rt_cfg);</div><div class='add'>+	/*</div><div class='add'>+	 * Perform runtime calibrations, including DC calibration.</div><div class='add'>+	 */</div><div class='add'>+	iwlagn_send_calib_cfg_rt(priv, IWL_CALIB_CFG_DC_IDX);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_wake_queues(priv-&gt;hw);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;active_rate = IWL_RATES_MASK;</div><div class='ctx'> </div><div class='ctx'> 	/* Configure Tx antenna selection based on H/W config */</div><div class='del'>-	iwlagn_send_tx_ant_config(priv, priv-&gt;cfg-&gt;valid_tx_ant);</div><div class='add'>+	iwlagn_send_tx_ant_config(priv, cfg(priv)-&gt;valid_tx_ant);</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_is_associated_ctx(ctx) &amp;&amp; !priv-&gt;shrd-&gt;wowlan) {</div><div class='ctx'> 		struct iwl_rxon_cmd *active_rxon =</div><div class='hunk'>@@ -1352,7 +1302,7 @@ int iwl_alive_start(struct iwl_priv *priv)</div><div class='ctx'> </div><div class='ctx'> static void iwl_cancel_deferred_work(struct iwl_priv *priv);</div><div class='ctx'> </div><div class='del'>-static void __iwl_down(struct iwl_priv *priv)</div><div class='add'>+void __iwl_down(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int exit_pending;</div><div class='ctx'> </div><div class='hunk'>@@ -1382,9 +1332,9 @@ static void __iwl_down(struct iwl_priv *priv)</div><div class='ctx'> 	priv-&gt;bt_status = 0;</div><div class='ctx'> 	priv-&gt;cur_rssi_ctx = NULL;</div><div class='ctx'> 	priv-&gt;bt_is_sco = 0;</div><div class='del'>-	if (priv-&gt;cfg-&gt;bt_params)</div><div class='add'>+	if (cfg(priv)-&gt;bt_params)</div><div class='ctx'> 		priv-&gt;bt_traffic_load =</div><div class='del'>-			 priv-&gt;cfg-&gt;bt_params-&gt;bt_init_traffic_load;</div><div class='add'>+			 cfg(priv)-&gt;bt_params-&gt;bt_init_traffic_load;</div><div class='ctx'> 	else</div><div class='ctx'> 		priv-&gt;bt_traffic_load = 0;</div><div class='ctx'> 	priv-&gt;bt_full_concurrent = false;</div><div class='hunk'>@@ -1415,7 +1365,7 @@ static void __iwl_down(struct iwl_priv *priv)</div><div class='ctx'> 	priv-&gt;beacon_skb = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_down(struct iwl_priv *priv)</div><div class='add'>+void iwl_down(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='ctx'> 	__iwl_down(priv);</div><div class='hunk'>@@ -1424,57 +1374,6 @@ static void iwl_down(struct iwl_priv *priv)</div><div class='ctx'> 	iwl_cancel_deferred_work(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define MAX_HW_RESTARTS 5</div><div class='del'>-</div><div class='del'>-static int __iwl_up(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;shrd-&gt;status)) {</div><div class='del'>-		IWL_WARN(priv, "Exit pending; will not bring the NIC up\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_context(priv, ctx) {</div><div class='del'>-		ret = iwlagn_alloc_bcast_station(priv, ctx);</div><div class='del'>-		if (ret) {</div><div class='del'>-			iwl_dealloc_bcast_stations(priv);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = iwlagn_run_init_ucode(priv);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "Failed to run INIT ucode: %d\n", ret);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = iwlagn_load_ucode_wait_alive(priv,</div><div class='del'>-					   &amp;priv-&gt;ucode_rt,</div><div class='del'>-					   IWL_UCODE_REGULAR);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "Failed to start RT ucode: %d\n", ret);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = iwl_alive_start(priv);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	set_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;shrd-&gt;status);</div><div class='del'>-	__iwl_down(priv);</div><div class='del'>-	clear_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;shrd-&gt;status);</div><div class='del'>-</div><div class='del'>-	IWL_ERR(priv, "Unable to initialize device.\n");</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Workqueue callbacks</div><div class='hunk'>@@ -1502,7 +1401,7 @@ static void iwl_bg_run_time_calib_work(struct work_struct *work)</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwlagn_prepare_restart(struct iwl_priv *priv)</div><div class='add'>+void iwlagn_prepare_restart(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_rxon_context *ctx;</div><div class='ctx'> 	bool bt_full_concurrent;</div><div class='hunk'>@@ -1559,1172 +1458,8 @@ static void iwl_bg_restart(struct work_struct *data)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*****************************************************************************</div><div class='del'>- *</div><div class='del'>- * mac80211 entry point functions</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-static const struct ieee80211_iface_limit iwlagn_sta_ap_limits[] = {</div><div class='del'>-	{</div><div class='del'>-		.max = 1,</div><div class='del'>-		.types = BIT(NL80211_IFTYPE_STATION),</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.max = 1,</div><div class='del'>-		.types = BIT(NL80211_IFTYPE_AP),</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct ieee80211_iface_limit iwlagn_2sta_limits[] = {</div><div class='del'>-	{</div><div class='del'>-		.max = 2,</div><div class='del'>-		.types = BIT(NL80211_IFTYPE_STATION),</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct ieee80211_iface_limit iwlagn_p2p_sta_go_limits[] = {</div><div class='del'>-	{</div><div class='del'>-		.max = 1,</div><div class='del'>-		.types = BIT(NL80211_IFTYPE_STATION),</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.max = 1,</div><div class='del'>-		.types = BIT(NL80211_IFTYPE_P2P_GO) |</div><div class='del'>-			 BIT(NL80211_IFTYPE_AP),</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct ieee80211_iface_limit iwlagn_p2p_2sta_limits[] = {</div><div class='del'>-	{</div><div class='del'>-		.max = 2,</div><div class='del'>-		.types = BIT(NL80211_IFTYPE_STATION),</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.max = 1,</div><div class='del'>-		.types = BIT(NL80211_IFTYPE_P2P_CLIENT),</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct ieee80211_iface_combination</div><div class='del'>-iwlagn_iface_combinations_dualmode[] = {</div><div class='del'>-	{ .num_different_channels = 1,</div><div class='del'>-	  .max_interfaces = 2,</div><div class='del'>-	  .beacon_int_infra_match = true,</div><div class='del'>-	  .limits = iwlagn_sta_ap_limits,</div><div class='del'>-	  .n_limits = ARRAY_SIZE(iwlagn_sta_ap_limits),</div><div class='del'>-	},</div><div class='del'>-	{ .num_different_channels = 1,</div><div class='del'>-	  .max_interfaces = 2,</div><div class='del'>-	  .limits = iwlagn_2sta_limits,</div><div class='del'>-	  .n_limits = ARRAY_SIZE(iwlagn_2sta_limits),</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct ieee80211_iface_combination</div><div class='del'>-iwlagn_iface_combinations_p2p[] = {</div><div class='del'>-	{ .num_different_channels = 1,</div><div class='del'>-	  .max_interfaces = 2,</div><div class='del'>-	  .beacon_int_infra_match = true,</div><div class='del'>-	  .limits = iwlagn_p2p_sta_go_limits,</div><div class='del'>-	  .n_limits = ARRAY_SIZE(iwlagn_p2p_sta_go_limits),</div><div class='del'>-	},</div><div class='del'>-	{ .num_different_channels = 1,</div><div class='del'>-	  .max_interfaces = 2,</div><div class='del'>-	  .limits = iwlagn_p2p_2sta_limits,</div><div class='del'>-	  .n_limits = ARRAY_SIZE(iwlagn_p2p_2sta_limits),</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Not a mac80211 entry point function, but it fits in with all the</div><div class='del'>- * other mac80211 functions grouped here.</div><div class='del'>- */</div><div class='del'>-static int iwlagn_mac_setup_register(struct iwl_priv *priv,</div><div class='del'>-				  struct iwlagn_ucode_capabilities *capa)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct ieee80211_hw *hw = priv-&gt;hw;</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-</div><div class='del'>-	hw-&gt;rate_control_algorithm = "iwl-agn-rs";</div><div class='del'>-</div><div class='del'>-	/* Tell mac80211 our characteristics */</div><div class='del'>-	hw-&gt;flags = IEEE80211_HW_SIGNAL_DBM |</div><div class='del'>-		    IEEE80211_HW_AMPDU_AGGREGATION |</div><div class='del'>-		    IEEE80211_HW_NEED_DTIM_PERIOD |</div><div class='del'>-		    IEEE80211_HW_SPECTRUM_MGMT |</div><div class='del'>-		    IEEE80211_HW_REPORTS_TX_ACK_STATUS;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Including the following line will crash some AP's.  This</div><div class='del'>-	 * workaround removes the stimulus which causes the crash until</div><div class='del'>-	 * the AP software can be fixed.</div><div class='del'>-	hw-&gt;max_tx_aggregation_subframes = LINK_QUAL_AGG_FRAME_LIMIT_DEF;</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	hw-&gt;flags |= IEEE80211_HW_SUPPORTS_PS |</div><div class='del'>-		     IEEE80211_HW_SUPPORTS_DYNAMIC_PS;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cfg-&gt;sku &amp; EEPROM_SKU_CAP_11N_ENABLE)</div><div class='del'>-		hw-&gt;flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |</div><div class='del'>-			     IEEE80211_HW_SUPPORTS_STATIC_SMPS;</div><div class='del'>-</div><div class='del'>-	if (capa-&gt;flags &amp; IWL_UCODE_TLV_FLAGS_MFP)</div><div class='del'>-		hw-&gt;flags |= IEEE80211_HW_MFP_CAPABLE;</div><div class='del'>-</div><div class='del'>-	hw-&gt;sta_data_size = sizeof(struct iwl_station_priv);</div><div class='del'>-	hw-&gt;vif_data_size = sizeof(struct iwl_vif_priv);</div><div class='del'>-</div><div class='del'>-	for_each_context(priv, ctx) {</div><div class='del'>-		hw-&gt;wiphy-&gt;interface_modes |= ctx-&gt;interface_modes;</div><div class='del'>-		hw-&gt;wiphy-&gt;interface_modes |= ctx-&gt;exclusive_interface_modes;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);</div><div class='del'>-</div><div class='del'>-	if (hw-&gt;wiphy-&gt;interface_modes &amp; BIT(NL80211_IFTYPE_P2P_CLIENT)) {</div><div class='del'>-		hw-&gt;wiphy-&gt;iface_combinations = iwlagn_iface_combinations_p2p;</div><div class='del'>-		hw-&gt;wiphy-&gt;n_iface_combinations =</div><div class='del'>-			ARRAY_SIZE(iwlagn_iface_combinations_p2p);</div><div class='del'>-	} else if (hw-&gt;wiphy-&gt;interface_modes &amp; BIT(NL80211_IFTYPE_AP)) {</div><div class='del'>-		hw-&gt;wiphy-&gt;iface_combinations = iwlagn_iface_combinations_dualmode;</div><div class='del'>-		hw-&gt;wiphy-&gt;n_iface_combinations =</div><div class='del'>-			ARRAY_SIZE(iwlagn_iface_combinations_dualmode);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hw-&gt;wiphy-&gt;max_remain_on_channel_duration = 1000;</div><div class='del'>-</div><div class='del'>-	hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_CUSTOM_REGULATORY |</div><div class='del'>-			    WIPHY_FLAG_DISABLE_BEACON_HINTS |</div><div class='del'>-			    WIPHY_FLAG_IBSS_RSN;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;ucode_wowlan.code.len &amp;&amp; device_can_wakeup(bus(priv)-&gt;dev)) {</div><div class='del'>-		hw-&gt;wiphy-&gt;wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT |</div><div class='del'>-					  WIPHY_WOWLAN_DISCONNECT |</div><div class='del'>-					  WIPHY_WOWLAN_EAP_IDENTITY_REQ |</div><div class='del'>-					  WIPHY_WOWLAN_RFKILL_RELEASE;</div><div class='del'>-		if (!iwlagn_mod_params.sw_crypto)</div><div class='del'>-			hw-&gt;wiphy-&gt;wowlan.flags |=</div><div class='del'>-				WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |</div><div class='del'>-				WIPHY_WOWLAN_GTK_REKEY_FAILURE;</div><div class='del'>-</div><div class='del'>-		hw-&gt;wiphy-&gt;wowlan.n_patterns = IWLAGN_WOWLAN_MAX_PATTERNS;</div><div class='del'>-		hw-&gt;wiphy-&gt;wowlan.pattern_min_len =</div><div class='del'>-					IWLAGN_WOWLAN_MIN_PATTERN_LEN;</div><div class='del'>-		hw-&gt;wiphy-&gt;wowlan.pattern_max_len =</div><div class='del'>-					IWLAGN_WOWLAN_MAX_PATTERN_LEN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (iwlagn_mod_params.power_save)</div><div class='del'>-		hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT;</div><div class='del'>-	else</div><div class='del'>-		hw-&gt;wiphy-&gt;flags &amp;= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;</div><div class='del'>-</div><div class='del'>-	hw-&gt;wiphy-&gt;max_scan_ssids = PROBE_OPTION_MAX;</div><div class='del'>-	/* we create the 802.11 header and a zero-length SSID element */</div><div class='del'>-	hw-&gt;wiphy-&gt;max_scan_ie_len = capa-&gt;max_probe_length - 24 - 2;</div><div class='del'>-</div><div class='del'>-	/* Default value; 4 EDCA QOS priorities */</div><div class='del'>-	hw-&gt;queues = 4;</div><div class='del'>-</div><div class='del'>-	hw-&gt;max_listen_interval = IWL_CONN_MAX_LISTEN_INTERVAL;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;bands[IEEE80211_BAND_2GHZ].n_channels)</div><div class='del'>-		priv-&gt;hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] =</div><div class='del'>-			&amp;priv-&gt;bands[IEEE80211_BAND_2GHZ];</div><div class='del'>-	if (priv-&gt;bands[IEEE80211_BAND_5GHZ].n_channels)</div><div class='del'>-		priv-&gt;hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_5GHZ] =</div><div class='del'>-			&amp;priv-&gt;bands[IEEE80211_BAND_5GHZ];</div><div class='del'>-</div><div class='del'>-	iwl_leds_init(priv);</div><div class='del'>-</div><div class='del'>-	ret = ieee80211_register_hw(priv-&gt;hw);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "Failed to register hw (error %d)\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	priv-&gt;mac80211_registered = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int iwlagn_mac_start(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	/* we should be verifying the device is ready to be opened */</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	ret = __iwl_up(priv);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Start UP work done.\n");</div><div class='del'>-</div><div class='del'>-	/* Now we should be done, and the READY bit should be set. */</div><div class='del'>-	if (WARN_ON(!test_bit(STATUS_READY, &amp;priv-&gt;shrd-&gt;status)))</div><div class='del'>-		ret = -EIO;</div><div class='del'>-</div><div class='del'>-	iwlagn_led_enable(priv);</div><div class='del'>-</div><div class='del'>-	priv-&gt;is_open = 1;</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwlagn_mac_stop(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;is_open)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	priv-&gt;is_open = 0;</div><div class='del'>-</div><div class='del'>-	iwl_down(priv);</div><div class='del'>-</div><div class='del'>-	flush_workqueue(priv-&gt;shrd-&gt;workqueue);</div><div class='del'>-</div><div class='del'>-	/* User space software may expect getting rfkill changes</div><div class='del'>-	 * even if interface is down */</div><div class='del'>-	iwl_write32(bus(priv), CSR_INT, 0xFFFFFFFF);</div><div class='del'>-	iwl_enable_rfkill_int(priv);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM_SLEEP</div><div class='del'>-static int iwlagn_send_patterns(struct iwl_priv *priv,</div><div class='del'>-				struct cfg80211_wowlan *wowlan)</div><div class='del'>-{</div><div class='del'>-	struct iwlagn_wowlan_patterns_cmd *pattern_cmd;</div><div class='del'>-	struct iwl_host_cmd cmd = {</div><div class='del'>-		.id = REPLY_WOWLAN_PATTERNS,</div><div class='del'>-		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,</div><div class='del'>-		.flags = CMD_SYNC,</div><div class='del'>-	};</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	if (!wowlan-&gt;n_patterns)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	cmd.len[0] = sizeof(*pattern_cmd) +</div><div class='del'>-			wowlan-&gt;n_patterns * sizeof(struct iwlagn_wowlan_pattern);</div><div class='del'>-</div><div class='del'>-	pattern_cmd = kmalloc(cmd.len[0], GFP_KERNEL);</div><div class='del'>-	if (!pattern_cmd)</div><div class='del'>-		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	pattern_cmd-&gt;n_patterns = cpu_to_le32(wowlan-&gt;n_patterns);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; wowlan-&gt;n_patterns; i++) {</div><div class='del'>-		int mask_len = DIV_ROUND_UP(wowlan-&gt;patterns[i].pattern_len, 8);</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;pattern_cmd-&gt;patterns[i].mask,</div><div class='del'>-			wowlan-&gt;patterns[i].mask, mask_len);</div><div class='del'>-		memcpy(&amp;pattern_cmd-&gt;patterns[i].pattern,</div><div class='del'>-			wowlan-&gt;patterns[i].pattern,</div><div class='del'>-			wowlan-&gt;patterns[i].pattern_len);</div><div class='del'>-		pattern_cmd-&gt;patterns[i].mask_size = mask_len;</div><div class='del'>-		pattern_cmd-&gt;patterns[i].pattern_size =</div><div class='del'>-			wowlan-&gt;patterns[i].pattern_len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd.data[0] = pattern_cmd;</div><div class='del'>-	err = iwl_trans_send_cmd(trans(priv), &amp;cmd);</div><div class='del'>-	kfree(pattern_cmd);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw,</div><div class='del'>-				      struct ieee80211_vif *vif,</div><div class='del'>-				      struct cfg80211_gtk_rekey_data *data)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (iwlagn_mod_params.sw_crypto)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;contexts[IWL_RXON_CTX_BSS].vif != vif)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	memcpy(priv-&gt;kek, data-&gt;kek, NL80211_KEK_LEN);</div><div class='del'>-	memcpy(priv-&gt;kck, data-&gt;kck, NL80211_KCK_LEN);</div><div class='del'>-	priv-&gt;replay_ctr = cpu_to_le64(be64_to_cpup((__be64 *)&amp;data-&gt;replay_ctr));</div><div class='del'>-	priv-&gt;have_rekey_data = true;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct wowlan_key_data {</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-	struct iwlagn_wowlan_rsc_tsc_params_cmd *rsc_tsc;</div><div class='del'>-	struct iwlagn_wowlan_tkip_params_cmd *tkip;</div><div class='del'>-	const u8 *bssid;</div><div class='del'>-	bool error, use_rsc_tsc, use_tkip;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM_SLEEP</div><div class='del'>-static void iwlagn_convert_p1k(u16 *p1k, __le16 *out)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; IWLAGN_P1K_SIZE; i++)</div><div class='del'>-		out[i] = cpu_to_le16(p1k[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwlagn_wowlan_program_keys(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 ieee80211_key_conf *key,</div><div class='del'>-				       void *_data)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct wowlan_key_data *data = _data;</div><div class='del'>-	struct iwl_rxon_context *ctx = data-&gt;ctx;</div><div class='del'>-	struct aes_sc *aes_sc, *aes_tx_sc = NULL;</div><div class='del'>-	struct tkip_sc *tkip_sc, *tkip_tx_sc = NULL;</div><div class='del'>-	struct iwlagn_p1k_cache *rx_p1ks;</div><div class='del'>-	u8 *rx_mic_key;</div><div class='del'>-	struct ieee80211_key_seq seq;</div><div class='del'>-	u32 cur_rx_iv32 = 0;</div><div class='del'>-	u16 p1k[IWLAGN_P1K_SIZE];</div><div class='del'>-	int ret, i;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if ((key-&gt;cipher == WLAN_CIPHER_SUITE_WEP40 ||</div><div class='del'>-	     key-&gt;cipher == WLAN_CIPHER_SUITE_WEP104) &amp;&amp;</div><div class='del'>-	     !sta &amp;&amp; !ctx-&gt;key_mapping_keys)</div><div class='del'>-		ret = iwl_set_default_wep_key(priv, ctx, key);</div><div class='del'>-	else</div><div class='del'>-		ret = iwl_set_dynamic_key(priv, ctx, key, sta);</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "Error setting key during suspend!\n");</div><div class='del'>-		data-&gt;error = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (key-&gt;cipher) {</div><div class='del'>-	case WLAN_CIPHER_SUITE_TKIP:</div><div class='del'>-		if (sta) {</div><div class='del'>-			tkip_sc = data-&gt;rsc_tsc-&gt;all_tsc_rsc.tkip.unicast_rsc;</div><div class='del'>-			tkip_tx_sc = &amp;data-&gt;rsc_tsc-&gt;all_tsc_rsc.tkip.tsc;</div><div class='del'>-</div><div class='del'>-			rx_p1ks = data-&gt;tkip-&gt;rx_uni;</div><div class='del'>-</div><div class='del'>-			ieee80211_get_key_tx_seq(key, &amp;seq);</div><div class='del'>-			tkip_tx_sc-&gt;iv16 = cpu_to_le16(seq.tkip.iv16);</div><div class='del'>-			tkip_tx_sc-&gt;iv32 = cpu_to_le32(seq.tkip.iv32);</div><div class='del'>-</div><div class='del'>-			ieee80211_get_tkip_p1k_iv(key, seq.tkip.iv32, p1k);</div><div class='del'>-			iwlagn_convert_p1k(p1k, data-&gt;tkip-&gt;tx.p1k);</div><div class='del'>-</div><div class='del'>-			memcpy(data-&gt;tkip-&gt;mic_keys.tx,</div><div class='del'>-			       &amp;key-&gt;key[NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY],</div><div class='del'>-			       IWLAGN_MIC_KEY_SIZE);</div><div class='del'>-</div><div class='del'>-			rx_mic_key = data-&gt;tkip-&gt;mic_keys.rx_unicast;</div><div class='del'>-		} else {</div><div class='del'>-			tkip_sc = data-&gt;rsc_tsc-&gt;all_tsc_rsc.tkip.multicast_rsc;</div><div class='del'>-			rx_p1ks = data-&gt;tkip-&gt;rx_multi;</div><div class='del'>-			rx_mic_key = data-&gt;tkip-&gt;mic_keys.rx_mcast;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * For non-QoS this relies on the fact that both the uCode and</div><div class='del'>-		 * mac80211 use TID 0 (as they need to to avoid replay attacks)</div><div class='del'>-		 * for checking the IV in the frames.</div><div class='del'>-		 */</div><div class='del'>-		for (i = 0; i &lt; IWLAGN_NUM_RSC; i++) {</div><div class='del'>-			ieee80211_get_key_rx_seq(key, i, &amp;seq);</div><div class='del'>-			tkip_sc[i].iv16 = cpu_to_le16(seq.tkip.iv16);</div><div class='del'>-			tkip_sc[i].iv32 = cpu_to_le32(seq.tkip.iv32);</div><div class='del'>-			/* wrapping isn't allowed, AP must rekey */</div><div class='del'>-			if (seq.tkip.iv32 &gt; cur_rx_iv32)</div><div class='del'>-				cur_rx_iv32 = seq.tkip.iv32;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ieee80211_get_tkip_rx_p1k(key, data-&gt;bssid, cur_rx_iv32, p1k);</div><div class='del'>-		iwlagn_convert_p1k(p1k, rx_p1ks[0].p1k);</div><div class='del'>-		ieee80211_get_tkip_rx_p1k(key, data-&gt;bssid,</div><div class='del'>-					  cur_rx_iv32 + 1, p1k);</div><div class='del'>-		iwlagn_convert_p1k(p1k, rx_p1ks[1].p1k);</div><div class='del'>-</div><div class='del'>-		memcpy(rx_mic_key,</div><div class='del'>-		       &amp;key-&gt;key[NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY],</div><div class='del'>-		       IWLAGN_MIC_KEY_SIZE);</div><div class='del'>-</div><div class='del'>-		data-&gt;use_tkip = true;</div><div class='del'>-		data-&gt;use_rsc_tsc = true;</div><div class='del'>-		break;</div><div class='del'>-	case WLAN_CIPHER_SUITE_CCMP:</div><div class='del'>-		if (sta) {</div><div class='del'>-			u8 *pn = seq.ccmp.pn;</div><div class='del'>-</div><div class='del'>-			aes_sc = data-&gt;rsc_tsc-&gt;all_tsc_rsc.aes.unicast_rsc;</div><div class='del'>-			aes_tx_sc = &amp;data-&gt;rsc_tsc-&gt;all_tsc_rsc.aes.tsc;</div><div class='del'>-</div><div class='del'>-			ieee80211_get_key_tx_seq(key, &amp;seq);</div><div class='del'>-			aes_tx_sc-&gt;pn = cpu_to_le64(</div><div class='del'>-					(u64)pn[5] |</div><div class='del'>-					((u64)pn[4] &lt;&lt; 8) |</div><div class='del'>-					((u64)pn[3] &lt;&lt; 16) |</div><div class='del'>-					((u64)pn[2] &lt;&lt; 24) |</div><div class='del'>-					((u64)pn[1] &lt;&lt; 32) |</div><div class='del'>-					((u64)pn[0] &lt;&lt; 40));</div><div class='del'>-		} else</div><div class='del'>-			aes_sc = data-&gt;rsc_tsc-&gt;all_tsc_rsc.aes.multicast_rsc;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * For non-QoS this relies on the fact that both the uCode and</div><div class='del'>-		 * mac80211 use TID 0 for checking the IV in the frames.</div><div class='del'>-		 */</div><div class='del'>-		for (i = 0; i &lt; IWLAGN_NUM_RSC; i++) {</div><div class='del'>-			u8 *pn = seq.ccmp.pn;</div><div class='del'>-</div><div class='del'>-			ieee80211_get_key_rx_seq(key, i, &amp;seq);</div><div class='del'>-			aes_sc-&gt;pn = cpu_to_le64(</div><div class='del'>-					(u64)pn[5] |</div><div class='del'>-					((u64)pn[4] &lt;&lt; 8) |</div><div class='del'>-					((u64)pn[3] &lt;&lt; 16) |</div><div class='del'>-					((u64)pn[2] &lt;&lt; 24) |</div><div class='del'>-					((u64)pn[1] &lt;&lt; 32) |</div><div class='del'>-					((u64)pn[0] &lt;&lt; 40));</div><div class='del'>-		}</div><div class='del'>-		data-&gt;use_rsc_tsc = true;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwlagn_mac_suspend(struct ieee80211_hw *hw,</div><div class='del'>-			      struct cfg80211_wowlan *wowlan)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwlagn_wowlan_wakeup_filter_cmd wakeup_filter_cmd;</div><div class='del'>-	struct iwl_rxon_cmd rxon;</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-	struct iwlagn_wowlan_kek_kck_material_cmd kek_kck_cmd;</div><div class='del'>-	struct iwlagn_wowlan_tkip_params_cmd tkip_cmd = {};</div><div class='del'>-	struct wowlan_key_data key_data = {</div><div class='del'>-		.ctx = ctx,</div><div class='del'>-		.bssid = ctx-&gt;active.bssid_addr,</div><div class='del'>-		.use_rsc_tsc = false,</div><div class='del'>-		.tkip = &amp;tkip_cmd,</div><div class='del'>-		.use_tkip = false,</div><div class='del'>-	};</div><div class='del'>-	int ret, i;</div><div class='del'>-	u16 seq;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(!wowlan))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	/* Don't attempt WoWLAN when not associated, tear down instead. */</div><div class='del'>-	if (!ctx-&gt;vif || ctx-&gt;vif-&gt;type != NL80211_IFTYPE_STATION ||</div><div class='del'>-	    !iwl_is_associated_ctx(ctx)) {</div><div class='del'>-		ret = 1;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	key_data.rsc_tsc = kzalloc(sizeof(*key_data.rsc_tsc), GFP_KERNEL);</div><div class='del'>-	if (!key_data.rsc_tsc) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(&amp;wakeup_filter_cmd, 0, sizeof(wakeup_filter_cmd));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We know the last used seqno, and the uCode expects to know that</div><div class='del'>-	 * one, it will increment before TX.</div><div class='del'>-	 */</div><div class='del'>-	seq = le16_to_cpu(priv-&gt;last_seq_ctl) &amp; IEEE80211_SCTL_SEQ;</div><div class='del'>-	wakeup_filter_cmd.non_qos_seq = cpu_to_le16(seq);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For QoS counters, we store the one to use next, so subtract 0x10</div><div class='del'>-	 * since the uCode will add 0x10 before using the value.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		seq = priv-&gt;shrd-&gt;tid_data[IWL_AP_ID][i].seq_number;</div><div class='del'>-		seq -= 0x10;</div><div class='del'>-		wakeup_filter_cmd.qos_seq[i] = cpu_to_le16(seq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wowlan-&gt;disconnect)</div><div class='del'>-		wakeup_filter_cmd.enabled |=</div><div class='del'>-			cpu_to_le32(IWLAGN_WOWLAN_WAKEUP_BEACON_MISS |</div><div class='del'>-				    IWLAGN_WOWLAN_WAKEUP_LINK_CHANGE);</div><div class='del'>-	if (wowlan-&gt;magic_pkt)</div><div class='del'>-		wakeup_filter_cmd.enabled |=</div><div class='del'>-			cpu_to_le32(IWLAGN_WOWLAN_WAKEUP_MAGIC_PACKET);</div><div class='del'>-	if (wowlan-&gt;gtk_rekey_failure)</div><div class='del'>-		wakeup_filter_cmd.enabled |=</div><div class='del'>-			cpu_to_le32(IWLAGN_WOWLAN_WAKEUP_GTK_REKEY_FAIL);</div><div class='del'>-	if (wowlan-&gt;eap_identity_req)</div><div class='del'>-		wakeup_filter_cmd.enabled |=</div><div class='del'>-			cpu_to_le32(IWLAGN_WOWLAN_WAKEUP_EAP_IDENT_REQ);</div><div class='del'>-	if (wowlan-&gt;four_way_handshake)</div><div class='del'>-		wakeup_filter_cmd.enabled |=</div><div class='del'>-			cpu_to_le32(IWLAGN_WOWLAN_WAKEUP_4WAY_HANDSHAKE);</div><div class='del'>-	if (wowlan-&gt;rfkill_release)</div><div class='del'>-		wakeup_filter_cmd.enabled |=</div><div class='del'>-			cpu_to_le32(IWLAGN_WOWLAN_WAKEUP_RFKILL);</div><div class='del'>-	if (wowlan-&gt;n_patterns)</div><div class='del'>-		wakeup_filter_cmd.enabled |=</div><div class='del'>-			cpu_to_le32(IWLAGN_WOWLAN_WAKEUP_PATTERN_MATCH);</div><div class='del'>-</div><div class='del'>-	iwl_scan_cancel_timeout(priv, 200);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;rxon, &amp;ctx-&gt;active, sizeof(rxon));</div><div class='del'>-</div><div class='del'>-	iwl_trans_stop_device(trans(priv));</div><div class='del'>-</div><div class='del'>-	priv-&gt;shrd-&gt;wowlan = true;</div><div class='del'>-</div><div class='del'>-	ret = iwlagn_load_ucode_wait_alive(priv, &amp;priv-&gt;ucode_wowlan,</div><div class='del'>-					   IWL_UCODE_WOWLAN);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	/* now configure WoWLAN ucode */</div><div class='del'>-	ret = iwl_alive_start(priv);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;ctx-&gt;staging, &amp;rxon, sizeof(rxon));</div><div class='del'>-	ret = iwlagn_commit_rxon(priv, ctx);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	ret = iwl_power_update_mode(priv, true);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	if (!iwlagn_mod_params.sw_crypto) {</div><div class='del'>-		/* mark all keys clear */</div><div class='del'>-		priv-&gt;ucode_key_table = 0;</div><div class='del'>-		ctx-&gt;key_mapping_keys = 0;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * This needs to be unlocked due to lock ordering</div><div class='del'>-		 * constraints. Since we're in the suspend path</div><div class='del'>-		 * that isn't really a problem though.</div><div class='del'>-		 */</div><div class='del'>-		mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-		ieee80211_iter_keys(priv-&gt;hw, ctx-&gt;vif,</div><div class='del'>-				    iwlagn_wowlan_program_keys,</div><div class='del'>-				    &amp;key_data);</div><div class='del'>-		mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-		if (key_data.error) {</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (key_data.use_rsc_tsc) {</div><div class='del'>-			struct iwl_host_cmd rsc_tsc_cmd = {</div><div class='del'>-				.id = REPLY_WOWLAN_TSC_RSC_PARAMS,</div><div class='del'>-				.flags = CMD_SYNC,</div><div class='del'>-				.data[0] = key_data.rsc_tsc,</div><div class='del'>-				.dataflags[0] = IWL_HCMD_DFL_NOCOPY,</div><div class='del'>-				.len[0] = sizeof(*key_data.rsc_tsc),</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			ret = iwl_trans_send_cmd(trans(priv), &amp;rsc_tsc_cmd);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (key_data.use_tkip) {</div><div class='del'>-			ret = iwl_trans_send_cmd_pdu(trans(priv),</div><div class='del'>-						 REPLY_WOWLAN_TKIP_PARAMS,</div><div class='del'>-						 CMD_SYNC, sizeof(tkip_cmd),</div><div class='del'>-						 &amp;tkip_cmd);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;have_rekey_data) {</div><div class='del'>-			memset(&amp;kek_kck_cmd, 0, sizeof(kek_kck_cmd));</div><div class='del'>-			memcpy(kek_kck_cmd.kck, priv-&gt;kck, NL80211_KCK_LEN);</div><div class='del'>-			kek_kck_cmd.kck_len = cpu_to_le16(NL80211_KCK_LEN);</div><div class='del'>-			memcpy(kek_kck_cmd.kek, priv-&gt;kek, NL80211_KEK_LEN);</div><div class='del'>-			kek_kck_cmd.kek_len = cpu_to_le16(NL80211_KEK_LEN);</div><div class='del'>-			kek_kck_cmd.replay_ctr = priv-&gt;replay_ctr;</div><div class='del'>-</div><div class='del'>-			ret = iwl_trans_send_cmd_pdu(trans(priv),</div><div class='del'>-						 REPLY_WOWLAN_KEK_KCK_MATERIAL,</div><div class='del'>-						 CMD_SYNC, sizeof(kek_kck_cmd),</div><div class='del'>-						 &amp;kek_kck_cmd);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto error;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = iwl_trans_send_cmd_pdu(trans(priv), REPLY_WOWLAN_WAKEUP_FILTER,</div><div class='del'>-				 CMD_SYNC, sizeof(wakeup_filter_cmd),</div><div class='del'>-				 &amp;wakeup_filter_cmd);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	ret = iwlagn_send_patterns(priv, wowlan);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	device_set_wakeup_enable(bus(priv)-&gt;dev, true);</div><div class='del'>-</div><div class='del'>-	/* Now let the ucode operate on its own */</div><div class='del'>-	iwl_write32(bus(priv), CSR_UCODE_DRV_GP1_SET,</div><div class='del'>-			  CSR_UCODE_DRV_GP1_BIT_D3_CFG_COMPLETE);</div><div class='del'>-</div><div class='del'>-	goto out;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	priv-&gt;shrd-&gt;wowlan = false;</div><div class='del'>-	iwlagn_prepare_restart(priv);</div><div class='del'>-	ieee80211_restart_hw(priv-&gt;hw);</div><div class='del'>- out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	kfree(key_data.rsc_tsc);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwlagn_mac_resume(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-	struct ieee80211_vif *vif;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u32 base, status = 0xffffffff;</div><div class='del'>-	int ret = -EIO;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	iwl_write32(bus(priv), CSR_UCODE_DRV_GP1_CLR,</div><div class='del'>-			  CSR_UCODE_DRV_GP1_BIT_D3_CFG_COMPLETE);</div><div class='del'>-</div><div class='del'>-	base = priv-&gt;device_pointers.error_event_table;</div><div class='del'>-	if (iwlagn_hw_valid_rtc_data_addr(base)) {</div><div class='del'>-		spin_lock_irqsave(&amp;bus(priv)-&gt;reg_lock, flags);</div><div class='del'>-		ret = iwl_grab_nic_access_silent(bus(priv));</div><div class='del'>-		if (ret == 0) {</div><div class='del'>-			iwl_write32(bus(priv), HBUS_TARG_MEM_RADDR, base);</div><div class='del'>-			status = iwl_read32(bus(priv), HBUS_TARG_MEM_RDAT);</div><div class='del'>-			iwl_release_nic_access(bus(priv));</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;bus(priv)-&gt;reg_lock, flags);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='del'>-		if (ret == 0) {</div><div class='del'>-			if (!priv-&gt;wowlan_sram)</div><div class='del'>-				priv-&gt;wowlan_sram =</div><div class='del'>-					kzalloc(priv-&gt;ucode_wowlan.data.len,</div><div class='del'>-						GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-			if (priv-&gt;wowlan_sram)</div><div class='del'>-				_iwl_read_targ_mem_words(</div><div class='del'>-					bus(priv), 0x800000, priv-&gt;wowlan_sram,</div><div class='del'>-					priv-&gt;ucode_wowlan.data.len / 4);</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* we'll clear ctx-&gt;vif during iwlagn_prepare_restart() */</div><div class='del'>-	vif = ctx-&gt;vif;</div><div class='del'>-</div><div class='del'>-	priv-&gt;shrd-&gt;wowlan = false;</div><div class='del'>-</div><div class='del'>-	device_set_wakeup_enable(bus(priv)-&gt;dev, false);</div><div class='del'>-</div><div class='del'>-	iwlagn_prepare_restart(priv);</div><div class='del'>-</div><div class='del'>-	memset((void *)&amp;ctx-&gt;active, 0, sizeof(ctx-&gt;active));</div><div class='del'>-	iwl_connection_init_rx_config(priv, ctx);</div><div class='del'>-	iwlagn_set_rxon_chain(priv, ctx);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-</div><div class='del'>-	ieee80211_resume_disconnect(vif);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MACDUMP(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_TX(priv, "dev-&gt;xmit(%d bytes) at rate 0x%02x\n", skb-&gt;len,</div><div class='del'>-		     ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))-&gt;bitrate);</div><div class='del'>-</div><div class='del'>-	if (iwlagn_tx_skb(priv, skb))</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MACDUMP(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,</div><div class='del'>-				       struct ieee80211_vif *vif,</div><div class='del'>-				       struct ieee80211_key_conf *keyconf,</div><div class='del'>-				       struct ieee80211_sta *sta,</div><div class='del'>-				       u32 iv32, u16 *phase1key)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-</div><div class='del'>-	iwl_update_tkip_key(priv, vif, keyconf, sta, iv32, phase1key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='del'>-			      struct ieee80211_vif *vif,</div><div class='del'>-			      struct ieee80211_sta *sta,</div><div class='del'>-			      struct ieee80211_key_conf *key)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='del'>-	struct iwl_rxon_context *ctx = vif_priv-&gt;ctx;</div><div class='del'>-	int ret;</div><div class='del'>-	bool is_default_wep_key = false;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	if (iwlagn_mod_params.sw_crypto) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "leave - hwcrypto disabled\n");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (key-&gt;cipher) {</div><div class='del'>-	case WLAN_CIPHER_SUITE_TKIP:</div><div class='del'>-		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;</div><div class='del'>-		/* fall through */</div><div class='del'>-	case WLAN_CIPHER_SUITE_CCMP:</div><div class='del'>-		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV;</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'>-	 * We could program these keys into the hardware as well, but we</div><div class='del'>-	 * don't expect much multicast traffic in IBSS and having keys</div><div class='del'>-	 * for more stations is probably more useful.</div><div class='del'>-	 *</div><div class='del'>-	 * Mark key TX-only and return 0.</div><div class='del'>-	 */</div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_ADHOC &amp;&amp;</div><div class='del'>-	    !(key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE)) {</div><div class='del'>-		key-&gt;hw_key_idx = WEP_INVALID_OFFSET;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If they key was TX-only, accept deletion */</div><div class='del'>-	if (cmd == DISABLE_KEY &amp;&amp; key-&gt;hw_key_idx == WEP_INVALID_OFFSET)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	iwl_scan_cancel_timeout(priv, 100);</div><div class='del'>-</div><div class='del'>-	BUILD_BUG_ON(WEP_INVALID_OFFSET == IWLAGN_HW_KEY_DEFAULT);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we are getting WEP group key and we didn't receive any key mapping</div><div class='del'>-	 * so far, we are in legacy wep mode (group key only), otherwise we are</div><div class='del'>-	 * in 1X mode.</div><div class='del'>-	 * In legacy wep mode, we use another host command to the uCode.</div><div class='del'>-	 */</div><div class='del'>-	if ((key-&gt;cipher == WLAN_CIPHER_SUITE_WEP40 ||</div><div class='del'>-	     key-&gt;cipher == WLAN_CIPHER_SUITE_WEP104) &amp;&amp; !sta) {</div><div class='del'>-		if (cmd == SET_KEY)</div><div class='del'>-			is_default_wep_key = !ctx-&gt;key_mapping_keys;</div><div class='del'>-		else</div><div class='del'>-			is_default_wep_key =</div><div class='del'>-				key-&gt;hw_key_idx == IWLAGN_HW_KEY_DEFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SET_KEY:</div><div class='del'>-		if (is_default_wep_key) {</div><div class='del'>-			ret = iwl_set_default_wep_key(priv, vif_priv-&gt;ctx, key);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		ret = iwl_set_dynamic_key(priv, vif_priv-&gt;ctx, key, sta);</div><div class='del'>-		if (ret) {</div><div class='del'>-			/*</div><div class='del'>-			 * 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='del'>-			 */</div><div class='del'>-			ret = 0;</div><div class='del'>-			key-&gt;hw_key_idx = WEP_INVALID_OFFSET;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "enable hwcrypto key\n");</div><div class='del'>-		break;</div><div class='del'>-	case DISABLE_KEY:</div><div class='del'>-		if (is_default_wep_key)</div><div class='del'>-			ret = iwl_remove_default_wep_key(priv, ctx, key);</div><div class='del'>-		else</div><div class='del'>-			ret = iwl_remove_dynamic_key(priv, ctx, key, sta);</div><div class='del'>-</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "disable hwcrypto key\n");</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,</div><div class='del'>-				   struct ieee80211_vif *vif,</div><div class='del'>-				   enum ieee80211_ampdu_mlme_action action,</div><div class='del'>-				   struct ieee80211_sta *sta, u16 tid, u16 *ssn,</div><div class='del'>-				   u8 buf_size)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	int ret = -EINVAL;</div><div class='del'>-	struct iwl_station_priv *sta_priv = (void *) sta-&gt;drv_priv;</div><div class='del'>-	struct iwl_rxon_context *ctx =  iwl_rxon_ctx_from_vif(vif);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_HT(priv, "A-MPDU action on addr %pM tid %d\n",</div><div class='del'>-		     sta-&gt;addr, tid);</div><div class='del'>-</div><div class='del'>-	if (!(priv-&gt;cfg-&gt;sku &amp; EEPROM_SKU_CAP_11N_ENABLE))</div><div class='del'>-		return -EACCES;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case IEEE80211_AMPDU_RX_START:</div><div class='del'>-		IWL_DEBUG_HT(priv, "start Rx\n");</div><div class='del'>-		ret = iwl_sta_rx_agg_start(priv, sta, tid, *ssn);</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_AMPDU_RX_STOP:</div><div class='del'>-		IWL_DEBUG_HT(priv, "stop Rx\n");</div><div class='del'>-		ret = iwl_sta_rx_agg_stop(priv, sta, tid);</div><div class='del'>-		if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;shrd-&gt;status))</div><div class='del'>-			ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_AMPDU_TX_START:</div><div class='del'>-		IWL_DEBUG_HT(priv, "start Tx\n");</div><div class='del'>-		ret = iwlagn_tx_agg_start(priv, vif, sta, tid, ssn);</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_AMPDU_TX_STOP:</div><div class='del'>-		IWL_DEBUG_HT(priv, "stop Tx\n");</div><div class='del'>-		ret = iwlagn_tx_agg_stop(priv, vif, sta, tid);</div><div class='del'>-		if ((ret == 0) &amp;&amp; (priv-&gt;agg_tids_count &gt; 0)) {</div><div class='del'>-			priv-&gt;agg_tids_count--;</div><div class='del'>-			IWL_DEBUG_HT(priv, "priv-&gt;agg_tids_count = %u\n",</div><div class='del'>-				     priv-&gt;agg_tids_count);</div><div class='del'>-		}</div><div class='del'>-		if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;shrd-&gt;status))</div><div class='del'>-			ret = 0;</div><div class='del'>-		if (!priv-&gt;agg_tids_count &amp;&amp; priv-&gt;cfg-&gt;ht_params &amp;&amp;</div><div class='del'>-		    priv-&gt;cfg-&gt;ht_params-&gt;use_rts_for_aggregation) {</div><div class='del'>-			/*</div><div class='del'>-			 * switch off RTS/CTS if it was previously enabled</div><div class='del'>-			 */</div><div class='del'>-			sta_priv-&gt;lq_sta.lq.general_params.flags &amp;=</div><div class='del'>-				~LINK_QUAL_FLAGS_SET_STA_TLC_RTS_MSK;</div><div class='del'>-			iwl_send_lq_cmd(priv, iwl_rxon_ctx_from_vif(vif),</div><div class='del'>-					&amp;sta_priv-&gt;lq_sta.lq, CMD_ASYNC, false);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_AMPDU_TX_OPERATIONAL:</div><div class='del'>-		buf_size = min_t(int, buf_size, LINK_QUAL_AGG_FRAME_LIMIT_DEF);</div><div class='del'>-</div><div class='del'>-		iwl_trans_tx_agg_setup(trans(priv), ctx-&gt;ctxid, iwl_sta_id(sta),</div><div class='del'>-				tid, buf_size);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If the limit is 0, then it wasn't initialised yet,</div><div class='del'>-		 * use the default. We can do that since we take the</div><div class='del'>-		 * minimum below, and we don't want to go above our</div><div class='del'>-		 * default due to hardware restrictions.</div><div class='del'>-		 */</div><div class='del'>-		if (sta_priv-&gt;max_agg_bufsize == 0)</div><div class='del'>-			sta_priv-&gt;max_agg_bufsize =</div><div class='del'>-				LINK_QUAL_AGG_FRAME_LIMIT_DEF;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Even though in theory the peer could have different</div><div class='del'>-		 * aggregation reorder buffer sizes for different sessions,</div><div class='del'>-		 * our ucode doesn't allow for that and has a global limit</div><div class='del'>-		 * for each station. Therefore, use the minimum of all the</div><div class='del'>-		 * aggregation sessions and our default value.</div><div class='del'>-		 */</div><div class='del'>-		sta_priv-&gt;max_agg_bufsize =</div><div class='del'>-			min(sta_priv-&gt;max_agg_bufsize, buf_size);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;cfg-&gt;ht_params &amp;&amp;</div><div class='del'>-		    priv-&gt;cfg-&gt;ht_params-&gt;use_rts_for_aggregation) {</div><div class='del'>-			/*</div><div class='del'>-			 * switch to RTS/CTS if it is the prefer protection</div><div class='del'>-			 * method for HT traffic</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			sta_priv-&gt;lq_sta.lq.general_params.flags |=</div><div class='del'>-				LINK_QUAL_FLAGS_SET_STA_TLC_RTS_MSK;</div><div class='del'>-		}</div><div class='del'>-		priv-&gt;agg_tids_count++;</div><div class='del'>-		IWL_DEBUG_HT(priv, "priv-&gt;agg_tids_count = %u\n",</div><div class='del'>-			     priv-&gt;agg_tids_count);</div><div class='del'>-</div><div class='del'>-		sta_priv-&gt;lq_sta.lq.agg_params.agg_frame_cnt_limit =</div><div class='del'>-			sta_priv-&gt;max_agg_bufsize;</div><div class='del'>-</div><div class='del'>-		iwl_send_lq_cmd(priv, iwl_rxon_ctx_from_vif(vif),</div><div class='del'>-				&amp;sta_priv-&gt;lq_sta.lq, CMD_ASYNC, false);</div><div class='del'>-</div><div class='del'>-		IWL_INFO(priv, "Tx aggregation enabled on ra = %pM tid = %d\n",</div><div class='del'>-			 sta-&gt;addr, tid);</div><div class='del'>-		ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwlagn_mac_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 iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='del'>-	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='del'>-	bool is_ap = vif-&gt;type == NL80211_IFTYPE_STATION;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u8 sta_id;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "received request to add station %pM\n",</div><div class='del'>-			sta-&gt;addr);</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_INFO(priv, "proceeding to add station %pM\n",</div><div class='del'>-			sta-&gt;addr);</div><div class='del'>-	sta_priv-&gt;sta_id = IWL_INVALID_STATION;</div><div class='del'>-</div><div class='del'>-	atomic_set(&amp;sta_priv-&gt;pending_frames, 0);</div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='del'>-		sta_priv-&gt;client = true;</div><div class='del'>-</div><div class='del'>-	ret = iwl_add_station_common(priv, vif_priv-&gt;ctx, sta-&gt;addr,</div><div class='del'>-				     is_ap, sta, &amp;sta_id);</div><div class='del'>-	if (ret) {</div><div class='del'>-		IWL_ERR(priv, "Unable to add station %pM (%d)\n",</div><div class='del'>-			sta-&gt;addr, ret);</div><div class='del'>-		/* Should we return success if return code is EEXIST ? */</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sta_priv-&gt;sta_id = sta_id;</div><div class='del'>-</div><div class='del'>-	/* Initialize rate scaling */</div><div class='del'>-	IWL_DEBUG_INFO(priv, "Initializing rate scaling for station %pM\n",</div><div class='del'>-		       sta-&gt;addr);</div><div class='del'>-	iwl_rs_rate_init(priv, sta, sta_id);</div><div class='del'>- out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,</div><div class='del'>-				struct ieee80211_channel_switch *ch_switch)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	const struct iwl_channel_info *ch_info;</div><div class='del'>-	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</div><div class='del'>-	struct ieee80211_channel *channel = ch_switch-&gt;channel;</div><div class='del'>-	struct iwl_ht_config *ht_conf = &amp;priv-&gt;current_ht_config;</div><div class='del'>-	/*</div><div class='del'>-	 * MULTI-FIXME</div><div class='del'>-	 * When we add support for multiple interfaces, we need to</div><div class='del'>-	 * revisit this. The channel switch command in the device</div><div class='del'>-	 * only affects the BSS context, but what does that really</div><div class='del'>-	 * mean? And what if we get a CSA on the second interface?</div><div class='del'>-	 * This needs a lot of work.</div><div class='del'>-	 */</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-	u16 ch;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (iwl_is_rfkill(priv-&gt;shrd))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;shrd-&gt;status) ||</div><div class='del'>-	    test_bit(STATUS_SCANNING, &amp;priv-&gt;shrd-&gt;status) ||</div><div class='del'>-	    test_bit(STATUS_CHANNEL_SWITCH_PENDING, &amp;priv-&gt;shrd-&gt;status))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (!iwl_is_associated_ctx(ctx))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;cfg-&gt;lib-&gt;set_channel_switch)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ch = channel-&gt;hw_value;</div><div class='del'>-	if (le16_to_cpu(ctx-&gt;active.channel) == ch)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ch_info = iwl_get_channel_info(priv, channel-&gt;band, ch);</div><div class='del'>-	if (!is_channel_valid(ch_info)) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "invalid channel\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;priv-&gt;shrd-&gt;lock);</div><div class='del'>-</div><div class='del'>-	priv-&gt;current_ht_config.smps = conf-&gt;smps_mode;</div><div class='del'>-</div><div class='del'>-	/* Configure HT40 channels */</div><div class='del'>-	ctx-&gt;ht.enabled = conf_is_ht(conf);</div><div class='del'>-	if (ctx-&gt;ht.enabled)</div><div class='del'>-		iwlagn_config_ht40(conf, ctx);</div><div class='del'>-	else</div><div class='del'>-		ctx-&gt;ht.is_40mhz = false;</div><div class='del'>-</div><div class='del'>-	if ((le16_to_cpu(ctx-&gt;staging.channel) != ch))</div><div class='del'>-		ctx-&gt;staging.flags = 0;</div><div class='del'>-</div><div class='del'>-	iwl_set_rxon_channel(priv, channel, ctx);</div><div class='del'>-	iwl_set_rxon_ht(priv, ht_conf);</div><div class='del'>-	iwl_set_flags_for_band(priv, ctx, channel-&gt;band, ctx-&gt;vif);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;priv-&gt;shrd-&gt;lock);</div><div class='del'>-</div><div class='del'>-	iwl_set_rate(priv);</div><div class='del'>-	/*</div><div class='del'>-	 * at this point, staging_rxon has the</div><div class='del'>-	 * configuration for channel switch</div><div class='del'>-	 */</div><div class='del'>-	set_bit(STATUS_CHANNEL_SWITCH_PENDING, &amp;priv-&gt;shrd-&gt;status);</div><div class='del'>-	priv-&gt;switch_channel = cpu_to_le16(ch);</div><div class='del'>-	if (priv-&gt;cfg-&gt;lib-&gt;set_channel_switch(priv, ch_switch)) {</div><div class='del'>-		clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &amp;priv-&gt;shrd-&gt;status);</div><div class='del'>-		priv-&gt;switch_channel = 0;</div><div class='del'>-		ieee80211_chswitch_done(ctx-&gt;vif, false);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwlagn_configure_filter(struct ieee80211_hw *hw,</div><div class='del'>-				    unsigned int changed_flags,</div><div class='del'>-				    unsigned int *total_flags,</div><div class='del'>-				    u64 multicast)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	__le32 filter_or = 0, filter_nand = 0;</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-</div><div class='del'>-#define CHK(test, flag)	do { \</div><div class='del'>-	if (*total_flags &amp; (test))		\</div><div class='del'>-		filter_or |= (flag);		\</div><div class='del'>-	else					\</div><div class='del'>-		filter_nand |= (flag);		\</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "Enter: changed: 0x%x, total: 0x%x\n",</div><div class='del'>-			changed_flags, *total_flags);</div><div class='del'>-</div><div class='del'>-	CHK(FIF_OTHER_BSS | FIF_PROMISC_IN_BSS, RXON_FILTER_PROMISC_MSK);</div><div class='del'>-	/* Setting _just_ RXON_FILTER_CTL2HOST_MSK causes FH errors */</div><div class='del'>-	CHK(FIF_CONTROL, RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_PROMISC_MSK);</div><div class='del'>-	CHK(FIF_BCN_PRBRESP_PROMISC, RXON_FILTER_BCON_AWARE_MSK);</div><div class='del'>-</div><div class='del'>-#undef CHK</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	for_each_context(priv, ctx) {</div><div class='del'>-		ctx-&gt;staging.filter_flags &amp;= ~filter_nand;</div><div class='del'>-		ctx-&gt;staging.filter_flags |= filter_or;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Not committing directly because hardware can perform a scan,</div><div class='del'>-		 * but we'll eventually commit the filter flags change anyway.</div><div class='del'>-		 */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Receiving all multicast frames is always enabled by the</div><div class='del'>-	 * default flags setup in iwl_connection_init_rx_config()</div><div class='del'>-	 * since we currently do not support programming multicast</div><div class='del'>-	 * filters into the device.</div><div class='del'>-	 */</div><div class='del'>-	*total_flags &amp;= FIF_OTHER_BSS | FIF_ALLMULTI | FIF_PROMISC_IN_BSS |</div><div class='del'>-			FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;shrd-&gt;status)) {</div><div class='del'>-		IWL_DEBUG_TX(priv, "Aborting flush due to device shutdown\n");</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	if (iwl_is_rfkill(priv-&gt;shrd)) {</div><div class='del'>-		IWL_DEBUG_TX(priv, "Aborting flush due to RF Kill\n");</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * mac80211 will not push any more frames for transmit</div><div class='del'>-	 * until the flush is completed</div><div class='del'>-	 */</div><div class='del'>-	if (drop) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "send flush command\n");</div><div class='del'>-		if (iwlagn_txfifo_flush(priv, IWL_DROP_ALL)) {</div><div class='del'>-			IWL_ERR(priv, "flush request fail\n");</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "wait transmit/flush all frames\n");</div><div class='del'>-	iwl_trans_wait_tx_queue_empty(trans(priv));</div><div class='del'>-done:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> void iwlagn_disable_roc(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -2758,166 +1493,6 @@ static void iwlagn_disable_roc_work(struct work_struct *work)</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwlagn_mac_remain_on_channel(struct ieee80211_hw *hw,</div><div class='del'>-				     struct ieee80211_channel *channel,</div><div class='del'>-				     enum nl80211_channel_type channel_type,</div><div class='del'>-				     int duration)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_PAN];</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (!(priv-&gt;shrd-&gt;valid_contexts &amp; BIT(IWL_RXON_CTX_PAN)))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (!(ctx-&gt;interface_modes &amp; BIT(NL80211_IFTYPE_P2P_CLIENT)))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (test_bit(STATUS_SCAN_HW, &amp;priv-&gt;shrd-&gt;status)) {</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;hw_roc_channel = channel;</div><div class='del'>-	priv-&gt;hw_roc_chantype = channel_type;</div><div class='del'>-	priv-&gt;hw_roc_duration = duration;</div><div class='del'>-	priv-&gt;hw_roc_start_notified = false;</div><div class='del'>-	cancel_delayed_work(&amp;priv-&gt;hw_roc_disable_work);</div><div class='del'>-</div><div class='del'>-	if (!ctx-&gt;is_active) {</div><div class='del'>-		ctx-&gt;is_active = true;</div><div class='del'>-		ctx-&gt;staging.dev_type = RXON_DEV_TYPE_P2P;</div><div class='del'>-		memcpy(ctx-&gt;staging.node_addr,</div><div class='del'>-		       priv-&gt;contexts[IWL_RXON_CTX_BSS].staging.node_addr,</div><div class='del'>-		       ETH_ALEN);</div><div class='del'>-		memcpy(ctx-&gt;staging.bssid_addr,</div><div class='del'>-		       priv-&gt;contexts[IWL_RXON_CTX_BSS].staging.node_addr,</div><div class='del'>-		       ETH_ALEN);</div><div class='del'>-		err = iwlagn_commit_rxon(priv, ctx);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-		ctx-&gt;staging.filter_flags |= RXON_FILTER_ASSOC_MSK |</div><div class='del'>-					     RXON_FILTER_PROMISC_MSK |</div><div class='del'>-					     RXON_FILTER_CTL2HOST_MSK;</div><div class='del'>-</div><div class='del'>-		err = iwlagn_commit_rxon(priv, ctx);</div><div class='del'>-		if (err) {</div><div class='del'>-			iwlagn_disable_roc(priv);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		priv-&gt;hw_roc_setup = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = iwl_scan_initiate(priv, ctx-&gt;vif, IWL_SCAN_ROC, channel-&gt;band);</div><div class='del'>-	if (err)</div><div class='del'>-		iwlagn_disable_roc(priv);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!(priv-&gt;shrd-&gt;valid_contexts &amp; BIT(IWL_RXON_CTX_PAN)))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	iwl_scan_cancel_timeout(priv, priv-&gt;hw_roc_duration);</div><div class='del'>-	iwlagn_disable_roc(priv);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwlagn_mac_tx_sync(struct ieee80211_hw *hw,</div><div class='del'>-			      struct ieee80211_vif *vif,</div><div class='del'>-			      const u8 *bssid,</div><div class='del'>-			      enum ieee80211_tx_sync_type type)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='del'>-	struct iwl_rxon_context *ctx = vif_priv-&gt;ctx;</div><div class='del'>-	int ret;</div><div class='del'>-	u8 sta_id;</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;ctxid != IWL_RXON_CTX_PAN)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (iwl_is_associated_ctx(ctx)) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;preauth_bssid || test_bit(STATUS_SCAN_HW, &amp;priv-&gt;shrd-&gt;status)) {</div><div class='del'>-		ret = -EBUSY;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = iwl_add_station_common(priv, ctx, bssid, true, NULL, &amp;sta_id);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(sta_id != ctx-&gt;ap_sta_id)) {</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out_remove_sta;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(ctx-&gt;bssid, bssid, ETH_ALEN);</div><div class='del'>-	ctx-&gt;preauth_bssid = true;</div><div class='del'>-</div><div class='del'>-	ret = iwlagn_commit_rxon(priv, ctx);</div><div class='del'>-</div><div class='del'>-	if (ret == 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>- out_remove_sta:</div><div class='del'>-	iwl_remove_station(priv, sta_id, bssid);</div><div class='del'>- out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwlagn_mac_finish_tx_sync(struct ieee80211_hw *hw,</div><div class='del'>-				   struct ieee80211_vif *vif,</div><div class='del'>-				   const u8 *bssid,</div><div class='del'>-				   enum ieee80211_tx_sync_type type)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='del'>-	struct iwl_rxon_context *ctx = vif_priv-&gt;ctx;</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;ctxid != IWL_RXON_CTX_PAN)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (iwl_is_associated_ctx(ctx))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	iwl_remove_station(priv, ctx-&gt;ap_sta_id, bssid);</div><div class='del'>-	ctx-&gt;preauth_bssid = false;</div><div class='del'>-	/* no need to commit */</div><div class='del'>- out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * driver setup and teardown</div><div class='hunk'>@@ -2941,8 +1516,8 @@ static void iwl_setup_deferred_work(struct iwl_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	iwl_setup_scan_deferred_work(priv);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;lib-&gt;bt_setup_deferred_work)</div><div class='del'>-		priv-&gt;cfg-&gt;lib-&gt;bt_setup_deferred_work(priv);</div><div class='add'>+	if (cfg(priv)-&gt;lib-&gt;bt_setup_deferred_work)</div><div class='add'>+		cfg(priv)-&gt;lib-&gt;bt_setup_deferred_work(priv);</div><div class='ctx'> </div><div class='ctx'> 	init_timer(&amp;priv-&gt;statistics_periodic);</div><div class='ctx'> 	priv-&gt;statistics_periodic.data = (unsigned long)priv;</div><div class='hunk'>@@ -2959,8 +1534,8 @@ static void iwl_setup_deferred_work(struct iwl_priv *priv)</div><div class='ctx'> </div><div class='ctx'> static void iwl_cancel_deferred_work(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	if (priv-&gt;cfg-&gt;lib-&gt;cancel_deferred_work)</div><div class='del'>-		priv-&gt;cfg-&gt;lib-&gt;cancel_deferred_work(priv);</div><div class='add'>+	if (cfg(priv)-&gt;lib-&gt;cancel_deferred_work)</div><div class='add'>+		cfg(priv)-&gt;lib-&gt;cancel_deferred_work(priv);</div><div class='ctx'> </div><div class='ctx'> 	cancel_work_sync(&amp;priv-&gt;run_time_calib_work);</div><div class='ctx'> 	cancel_work_sync(&amp;priv-&gt;beacon_update);</div><div class='hunk'>@@ -3004,6 +1579,8 @@ static int iwl_init_drv(struct iwl_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	INIT_LIST_HEAD(&amp;trans(priv)-&gt;calib_results);</div><div class='add'>+</div><div class='ctx'> 	priv-&gt;ieee_channels = NULL;</div><div class='ctx'> 	priv-&gt;ieee_rates = NULL;</div><div class='ctx'> 	priv-&gt;band = IEEE80211_BAND_2GHZ;</div><div class='hunk'>@@ -3027,8 +1604,8 @@ static int iwl_init_drv(struct iwl_priv *priv)</div><div class='ctx'> 	iwl_init_scan_params(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* init bt coex */</div><div class='del'>-	if (priv-&gt;cfg-&gt;bt_params &amp;&amp;</div><div class='del'>-	    priv-&gt;cfg-&gt;bt_params-&gt;advanced_bt_coexist) {</div><div class='add'>+	if (cfg(priv)-&gt;bt_params &amp;&amp;</div><div class='add'>+	    cfg(priv)-&gt;bt_params-&gt;advanced_bt_coexist) {</div><div class='ctx'> 		priv-&gt;kill_ack_mask = IWLAGN_BT_KILL_ACK_MASK_DEFAULT;</div><div class='ctx'> 		priv-&gt;kill_cts_mask = IWLAGN_BT_KILL_CTS_MASK_DEFAULT;</div><div class='ctx'> 		priv-&gt;bt_valid = IWLAGN_BT_ALL_VALID_MSK;</div><div class='hunk'>@@ -3060,88 +1637,19 @@ err:</div><div class='ctx'> </div><div class='ctx'> static void iwl_uninit_drv(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	iwl_calib_free_results(priv);</div><div class='ctx'> 	iwl_free_geos(priv);</div><div class='ctx'> 	iwl_free_channel_map(priv);</div><div class='ctx'> 	if (priv-&gt;tx_cmd_pool)</div><div class='ctx'> 		kmem_cache_destroy(priv-&gt;tx_cmd_pool);</div><div class='ctx'> 	kfree(priv-&gt;scan_cmd);</div><div class='ctx'> 	kfree(priv-&gt;beacon_cmd);</div><div class='add'>+	kfree(rcu_dereference_raw(priv-&gt;noa_data));</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> 	kfree(priv-&gt;wowlan_sram);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,</div><div class='del'>-			   enum ieee80211_rssi_event rssi_event)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cfg-&gt;bt_params &amp;&amp;</div><div class='del'>-			priv-&gt;cfg-&gt;bt_params-&gt;advanced_bt_coexist) {</div><div class='del'>-		if (rssi_event == RSSI_EVENT_LOW)</div><div class='del'>-			priv-&gt;bt_enable_pspoll = true;</div><div class='del'>-		else if (rssi_event == RSSI_EVENT_HIGH)</div><div class='del'>-			priv-&gt;bt_enable_pspoll = false;</div><div class='del'>-</div><div class='del'>-		iwlagn_send_advance_bt_config(priv);</div><div class='del'>-	} else {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "Advanced BT coex disabled,"</div><div class='del'>-				"ignoring RSSI callback\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwlagn_mac_set_tim(struct ieee80211_hw *hw,</div><div class='del'>-			   struct ieee80211_sta *sta, bool set)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	queue_work(priv-&gt;shrd-&gt;workqueue, &amp;priv-&gt;beacon_update);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct ieee80211_ops iwlagn_hw_ops = {</div><div class='del'>-	.tx = iwlagn_mac_tx,</div><div class='del'>-	.start = iwlagn_mac_start,</div><div class='del'>-	.stop = iwlagn_mac_stop,</div><div class='del'>-#ifdef CONFIG_PM_SLEEP</div><div class='del'>-	.suspend = iwlagn_mac_suspend,</div><div class='del'>-	.resume = iwlagn_mac_resume,</div><div class='del'>-#endif</div><div class='del'>-	.add_interface = iwlagn_mac_add_interface,</div><div class='del'>-	.remove_interface = iwlagn_mac_remove_interface,</div><div class='del'>-	.change_interface = iwlagn_mac_change_interface,</div><div class='del'>-	.config = iwlagn_mac_config,</div><div class='del'>-	.configure_filter = iwlagn_configure_filter,</div><div class='del'>-	.set_key = iwlagn_mac_set_key,</div><div class='del'>-	.update_tkip_key = iwlagn_mac_update_tkip_key,</div><div class='del'>-	.set_rekey_data = iwlagn_mac_set_rekey_data,</div><div class='del'>-	.conf_tx = iwlagn_mac_conf_tx,</div><div class='del'>-	.bss_info_changed = iwlagn_bss_info_changed,</div><div class='del'>-	.ampdu_action = iwlagn_mac_ampdu_action,</div><div class='del'>-	.hw_scan = iwlagn_mac_hw_scan,</div><div class='del'>-	.sta_notify = iwlagn_mac_sta_notify,</div><div class='del'>-	.sta_add = iwlagn_mac_sta_add,</div><div class='del'>-	.sta_remove = iwlagn_mac_sta_remove,</div><div class='del'>-	.channel_switch = iwlagn_mac_channel_switch,</div><div class='del'>-	.flush = iwlagn_mac_flush,</div><div class='del'>-	.tx_last_beacon = iwlagn_mac_tx_last_beacon,</div><div class='del'>-	.remain_on_channel = iwlagn_mac_remain_on_channel,</div><div class='del'>-	.cancel_remain_on_channel = iwlagn_mac_cancel_remain_on_channel,</div><div class='del'>-	.rssi_callback = iwlagn_mac_rssi_callback,</div><div class='del'>-	CFG80211_TESTMODE_CMD(iwlagn_mac_testmode_cmd)</div><div class='del'>-	CFG80211_TESTMODE_DUMP(iwlagn_mac_testmode_dump)</div><div class='del'>-	.tx_sync = iwlagn_mac_tx_sync,</div><div class='del'>-	.finish_tx_sync = iwlagn_mac_finish_tx_sync,</div><div class='del'>-	.set_tim = iwlagn_mac_set_tim,</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> static u32 iwl_hw_detect(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -3161,40 +1669,55 @@ static int iwl_set_hw_params(struct iwl_priv *priv)</div><div class='ctx'> 		hw_params(priv).rx_page_order =</div><div class='ctx'> 			get_order(IWL_RX_BUF_SIZE_4K);</div><div class='ctx'> </div><div class='del'>-	if (iwlagn_mod_params.disable_11n)</div><div class='del'>-		priv-&gt;cfg-&gt;sku &amp;= ~EEPROM_SKU_CAP_11N_ENABLE;</div><div class='add'>+	if (iwlagn_mod_params.disable_11n &amp; IWL_DISABLE_HT_ALL)</div><div class='add'>+		cfg(priv)-&gt;sku &amp;= ~EEPROM_SKU_CAP_11N_ENABLE;</div><div class='ctx'> </div><div class='ctx'> 	hw_params(priv).num_ampdu_queues =</div><div class='del'>-		priv-&gt;cfg-&gt;base_params-&gt;num_of_ampdu_queues;</div><div class='add'>+		cfg(priv)-&gt;base_params-&gt;num_of_ampdu_queues;</div><div class='ctx'> 	hw_params(priv).shadow_reg_enable =</div><div class='del'>-		priv-&gt;cfg-&gt;base_params-&gt;shadow_reg_enable;</div><div class='del'>-	hw_params(priv).sku = priv-&gt;cfg-&gt;sku;</div><div class='del'>-	hw_params(priv).wd_timeout = priv-&gt;cfg-&gt;base_params-&gt;wd_timeout;</div><div class='add'>+		cfg(priv)-&gt;base_params-&gt;shadow_reg_enable;</div><div class='add'>+	hw_params(priv).sku = cfg(priv)-&gt;sku;</div><div class='add'>+	hw_params(priv).wd_timeout = cfg(priv)-&gt;base_params-&gt;wd_timeout;</div><div class='ctx'> </div><div class='ctx'> 	/* Device-specific setup */</div><div class='del'>-	return priv-&gt;cfg-&gt;lib-&gt;set_hw_params(priv);</div><div class='add'>+	return cfg(priv)-&gt;lib-&gt;set_hw_params(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* This function both allocates and initializes hw and priv. */</div><div class='del'>-static struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv;</div><div class='del'>-	/* mac80211 allocates memory for this device instance, including</div><div class='del'>-	 *   space for this driver's private structure */</div><div class='del'>-	struct ieee80211_hw *hw;</div><div class='ctx'> </div><div class='del'>-	hw = ieee80211_alloc_hw(sizeof(struct iwl_priv), &amp;iwlagn_hw_ops);</div><div class='del'>-	if (hw == NULL) {</div><div class='del'>-		pr_err("%s: Can not allocate network device\n",</div><div class='del'>-		       cfg-&gt;name);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	priv = hw-&gt;priv;</div><div class='del'>-	priv-&gt;hw = hw;</div><div class='add'>+static void iwl_debug_config(struct iwl_priv *priv)</div><div class='add'>+{</div><div class='add'>+	dev_printk(KERN_INFO, bus(priv)-&gt;dev, "CONFIG_IWLWIFI_DEBUG "</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUG</div><div class='add'>+		"enabled\n");</div><div class='add'>+#else</div><div class='add'>+		"disabled\n");</div><div class='add'>+#endif</div><div class='add'>+	dev_printk(KERN_INFO, bus(priv)-&gt;dev, "CONFIG_IWLWIFI_DEBUGFS "</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+		"enabled\n");</div><div class='add'>+#else</div><div class='add'>+		"disabled\n");</div><div class='add'>+#endif</div><div class='add'>+	dev_printk(KERN_INFO, bus(priv)-&gt;dev, "CONFIG_IWLWIFI_DEVICE_TRACING "</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEVICE_TRACING</div><div class='add'>+		"enabled\n");</div><div class='add'>+#else</div><div class='add'>+		"disabled\n");</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return hw;</div><div class='add'>+	dev_printk(KERN_INFO, bus(priv)-&gt;dev, "CONFIG_IWLWIFI_DEVICE_TESTMODE "</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE</div><div class='add'>+		"enabled\n");</div><div class='add'>+#else</div><div class='add'>+		"disabled\n");</div><div class='add'>+#endif</div><div class='add'>+	dev_printk(KERN_INFO, bus(priv)-&gt;dev, "CONFIG_IWLWIFI_P2P "</div><div class='add'>+#ifdef CONFIG_IWLWIFI_P2P</div><div class='add'>+		"enabled\n");</div><div class='add'>+#else</div><div class='add'>+		"disabled\n");</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops,</div><div class='hunk'>@@ -3209,8 +1732,9 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops,</div><div class='ctx'> 	/************************</div><div class='ctx'> 	 * 1. Allocating HW data</div><div class='ctx'> 	 ************************/</div><div class='del'>-	hw = iwl_alloc_all(cfg);</div><div class='add'>+	hw = iwl_alloc_all();</div><div class='ctx'> 	if (!hw) {</div><div class='add'>+		pr_err("%s: Cannot allocate network device\n", cfg-&gt;name);</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3231,8 +1755,11 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops,</div><div class='ctx'> </div><div class='ctx'> 	SET_IEEE80211_DEV(hw, bus(priv)-&gt;dev);</div><div class='ctx'> </div><div class='add'>+	/* what debugging capabilities we have */</div><div class='add'>+	iwl_debug_config(priv);</div><div class='add'>+</div><div class='ctx'> 	IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");</div><div class='del'>-	priv-&gt;cfg = cfg;</div><div class='add'>+	cfg(priv) = cfg;</div><div class='ctx'> </div><div class='ctx'> 	/* is antenna coupling more than 35dB ? */</div><div class='ctx'> 	priv-&gt;bt_ant_couple_ok =</div><div class='hunk'>@@ -3266,7 +1793,7 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops,</div><div class='ctx'> 	 ***********************/</div><div class='ctx'> 	hw_rev = iwl_hw_detect(priv);</div><div class='ctx'> 	IWL_INFO(priv, "Detected %s, REV=0x%X\n",</div><div class='del'>-		priv-&gt;cfg-&gt;name, hw_rev);</div><div class='add'>+		cfg(priv)-&gt;name, hw_rev);</div><div class='ctx'> </div><div class='ctx'> 	err = iwl_trans_request_irq(trans(priv));</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -3296,11 +1823,11 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops,</div><div class='ctx'> 		goto out_free_eeprom;</div><div class='ctx'> </div><div class='ctx'> 	/* extract MAC Address */</div><div class='del'>-	iwl_eeprom_get_mac(priv, priv-&gt;addresses[0].addr);</div><div class='add'>+	iwl_eeprom_get_mac(priv-&gt;shrd, priv-&gt;addresses[0].addr);</div><div class='ctx'> 	IWL_DEBUG_INFO(priv, "MAC address: %pM\n", priv-&gt;addresses[0].addr);</div><div class='ctx'> 	priv-&gt;hw-&gt;wiphy-&gt;addresses = priv-&gt;addresses;</div><div class='ctx'> 	priv-&gt;hw-&gt;wiphy-&gt;n_addresses = 1;</div><div class='del'>-	num_mac = iwl_eeprom_query16(priv, EEPROM_NUM_MAC_ADDRESS);</div><div class='add'>+	num_mac = iwl_eeprom_query16(priv-&gt;shrd, EEPROM_NUM_MAC_ADDRESS);</div><div class='ctx'> 	if (num_mac &gt; 1) {</div><div class='ctx'> 		memcpy(priv-&gt;addresses[1].addr, priv-&gt;addresses[0].addr,</div><div class='ctx'> 		       ETH_ALEN);</div><div class='hunk'>@@ -3365,7 +1892,7 @@ out_destroy_workqueue:</div><div class='ctx'> 	priv-&gt;shrd-&gt;workqueue = NULL;</div><div class='ctx'> 	iwl_uninit_drv(priv);</div><div class='ctx'> out_free_eeprom:</div><div class='del'>-	iwl_eeprom_free(priv);</div><div class='add'>+	iwl_eeprom_free(priv-&gt;shrd);</div><div class='ctx'> out_free_trans:</div><div class='ctx'> 	iwl_trans_free(trans(priv));</div><div class='ctx'> out_free_traffic_mem:</div><div class='hunk'>@@ -3390,21 +1917,16 @@ void __devexit iwl_remove(struct iwl_priv * priv)</div><div class='ctx'> 	set_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;shrd-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	iwl_testmode_cleanup(priv);</div><div class='del'>-	iwl_leds_exit(priv);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;mac80211_registered) {</div><div class='del'>-		ieee80211_unregister_hw(priv-&gt;hw);</div><div class='del'>-		priv-&gt;mac80211_registered = 0;</div><div class='del'>-	}</div><div class='add'>+	iwlagn_mac_unregister(priv);</div><div class='ctx'> </div><div class='ctx'> 	iwl_tt_exit(priv);</div><div class='ctx'> </div><div class='ctx'> 	/*This will stop the queues, move the device to low power state */</div><div class='ctx'> 	iwl_trans_stop_device(trans(priv));</div><div class='ctx'> </div><div class='del'>-	iwl_dealloc_ucode(priv);</div><div class='add'>+	iwl_dealloc_ucode(trans(priv));</div><div class='ctx'> </div><div class='del'>-	iwl_eeprom_free(priv);</div><div class='add'>+	iwl_eeprom_free(priv-&gt;shrd);</div><div class='ctx'> </div><div class='ctx'> 	/*netif_stop_queue(dev); */</div><div class='ctx'> 	flush_workqueue(priv-&gt;shrd-&gt;workqueue);</div><div class='hunk'>@@ -3474,8 +1996,9 @@ module_param_named(swcrypto, iwlagn_mod_params.sw_crypto, int, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])");</div><div class='ctx'> module_param_named(queues_num, iwlagn_mod_params.num_of_queues, int, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(queues_num, "number of hw queues.");</div><div class='del'>-module_param_named(11n_disable, iwlagn_mod_params.disable_11n, int, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(11n_disable, "disable 11n functionality");</div><div class='add'>+module_param_named(11n_disable, iwlagn_mod_params.disable_11n, uint, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(11n_disable,</div><div class='add'>+	"disable 11n functionality, bitmap: 1: full, 2: agg TX, 4: agg RX");</div><div class='ctx'> module_param_named(amsdu_size_8K, iwlagn_mod_params.amsdu_size_8K,</div><div class='ctx'> 		   int, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size");</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h<br/>index 3856abaea507..f84fb3c53563 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-agn.h</a></div><div class='hunk'>@@ -65,6 +65,12 @@</div><div class='ctx'> </div><div class='ctx'> #include "iwl-dev.h"</div><div class='ctx'> </div><div class='add'>+struct iwlagn_ucode_capabilities {</div><div class='add'>+	u32 max_probe_length;</div><div class='add'>+	u32 standard_phy_calibration_size;</div><div class='add'>+	u32 flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> extern struct ieee80211_ops iwlagn_hw_ops;</div><div class='ctx'> </div><div class='ctx'> int iwl_reset_ict(struct iwl_trans *trans);</div><div class='hunk'>@@ -77,6 +83,16 @@ static inline void iwl_set_calib_hdr(struct iwl_calib_hdr *hdr, u8 cmd)</div><div class='ctx'> 	hdr-&gt;data_valid = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __iwl_down(struct iwl_priv *priv);</div><div class='add'>+void iwl_down(struct iwl_priv *priv);</div><div class='add'>+void iwlagn_prepare_restart(struct iwl_priv *priv);</div><div class='add'>+</div><div class='add'>+/* MAC80211 */</div><div class='add'>+struct ieee80211_hw *iwl_alloc_all(void);</div><div class='add'>+int iwlagn_mac_setup_register(struct iwl_priv *priv,</div><div class='add'>+			      struct iwlagn_ucode_capabilities *capa);</div><div class='add'>+void iwlagn_mac_unregister(struct iwl_priv *priv);</div><div class='add'>+</div><div class='ctx'> /* RXON */</div><div class='ctx'> int iwlagn_set_pan_params(struct iwl_priv *priv);</div><div class='ctx'> int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx);</div><div class='hunk'>@@ -93,20 +109,20 @@ void iwlagn_config_ht40(struct ieee80211_conf *conf,</div><div class='ctx'> int iwlagn_rx_calib_result(struct iwl_priv *priv,</div><div class='ctx'> 			    struct iwl_rx_mem_buffer *rxb,</div><div class='ctx'> 			    struct iwl_device_cmd *cmd);</div><div class='del'>-int iwlagn_send_bt_env(struct iwl_priv *priv, u8 action, u8 type);</div><div class='del'>-void iwlagn_send_prio_tbl(struct iwl_priv *priv);</div><div class='del'>-int iwlagn_run_init_ucode(struct iwl_priv *priv);</div><div class='del'>-int iwlagn_load_ucode_wait_alive(struct iwl_priv *priv,</div><div class='del'>-				 struct fw_img *image,</div><div class='del'>-				 enum iwlagn_ucode_type ucode_type);</div><div class='ctx'> </div><div class='ctx'> /* lib */</div><div class='ctx'> int iwlagn_send_tx_power(struct iwl_priv *priv);</div><div class='ctx'> void iwlagn_temperature(struct iwl_priv *priv);</div><div class='del'>-u16 iwlagn_eeprom_calib_version(struct iwl_priv *priv);</div><div class='add'>+u16 iwl_eeprom_calib_version(struct iwl_shared *shrd);</div><div class='ctx'> int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control);</div><div class='ctx'> void iwlagn_dev_txfifo_flush(struct iwl_priv *priv, u16 flush_control);</div><div class='ctx'> int iwlagn_send_beacon_cmd(struct iwl_priv *priv);</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+int iwlagn_send_patterns(struct iwl_priv *priv,</div><div class='add'>+			 struct cfg80211_wowlan *wowlan);</div><div class='add'>+int iwlagn_suspend(struct iwl_priv *priv,</div><div class='add'>+		   struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* rx */</div><div class='ctx'> int iwlagn_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band);</div><div class='hunk'>@@ -117,6 +133,8 @@ void iwl_setup_rx_handlers(struct iwl_priv *priv);</div><div class='ctx'> int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb);</div><div class='ctx'> int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,</div><div class='ctx'> 			struct ieee80211_sta *sta, u16 tid, u16 *ssn);</div><div class='add'>+int iwlagn_tx_agg_oper(struct iwl_priv *priv, struct ieee80211_vif *vif,</div><div class='add'>+			struct ieee80211_sta *sta, u16 tid, u8 buf_size);</div><div class='ctx'> int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,</div><div class='ctx'> 		       struct ieee80211_sta *sta, u16 tid);</div><div class='ctx'> int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,</div><div class='hunk'>@@ -198,9 +216,6 @@ int iwl_add_station_common(struct iwl_priv *priv, struct iwl_rxon_context *ctx,</div><div class='ctx'> 			   struct ieee80211_sta *sta, u8 *sta_id_r);</div><div class='ctx'> int iwl_remove_station(struct iwl_priv *priv, const u8 sta_id,</div><div class='ctx'> 		       const u8 *addr);</div><div class='del'>-int iwlagn_mac_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='del'>-		       struct ieee80211_sta *sta);</div><div class='del'>-</div><div class='ctx'> u8 iwl_prep_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx,</div><div class='ctx'> 		    const u8 *addr, bool is_ap, struct ieee80211_sta *sta);</div><div class='ctx'> </div><div class='hunk'>@@ -318,10 +333,6 @@ void iwl_sta_modify_sleep_tx_count(struct iwl_priv *priv, int sta_id, int cnt);</div><div class='ctx'> int iwl_update_bcast_station(struct iwl_priv *priv,</div><div class='ctx'> 			     struct iwl_rxon_context *ctx);</div><div class='ctx'> int iwl_update_bcast_stations(struct iwl_priv *priv);</div><div class='del'>-void iwlagn_mac_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='ctx'> </div><div class='ctx'> /* rate */</div><div class='ctx'> static inline u32 iwl_ant_idx_to_flags(u8 ant_idx)</div><div class='hunk'>@@ -341,28 +352,11 @@ static inline __le32 iwl_hw_set_rate_n_flags(u8 rate, u32 flags)</div><div class='ctx'> </div><div class='ctx'> /* eeprom */</div><div class='ctx'> void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv);</div><div class='del'>-void iwl_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac);</div><div class='del'>-</div><div class='del'>-/* notification wait support */</div><div class='del'>-void __acquires(wait_entry)</div><div class='del'>-iwlagn_init_notification_wait(struct iwl_priv *priv,</div><div class='del'>-			      struct iwl_notification_wait *wait_entry,</div><div class='del'>-			      u8 cmd,</div><div class='del'>-			      void (*fn)(struct iwl_priv *priv,</div><div class='del'>-					 struct iwl_rx_packet *pkt,</div><div class='del'>-					 void *data),</div><div class='del'>-			      void *fn_data);</div><div class='del'>-int __must_check __releases(wait_entry)</div><div class='del'>-iwlagn_wait_notification(struct iwl_priv *priv,</div><div class='del'>-			 struct iwl_notification_wait *wait_entry,</div><div class='del'>-			 unsigned long timeout);</div><div class='del'>-void __releases(wait_entry)</div><div class='del'>-iwlagn_remove_notification(struct iwl_priv *priv,</div><div class='del'>-			   struct iwl_notification_wait *wait_entry);</div><div class='del'>-extern int iwlagn_init_alive_start(struct iwl_priv *priv);</div><div class='add'>+void iwl_eeprom_get_mac(const struct iwl_shared *shrd, u8 *mac);</div><div class='add'>+</div><div class='ctx'> extern int iwl_alive_start(struct iwl_priv *priv);</div><div class='ctx'> /* svtool */</div><div class='del'>-#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE</div><div class='ctx'> extern int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data,</div><div class='ctx'> 				   int len);</div><div class='ctx'> extern int iwlagn_mac_testmode_dump(struct ieee80211_hw *hw,</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-bus.h b/drivers/net/wireless/iwlwifi/iwl-bus.h<br/>index 08b97594e305..940d5038b39c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-bus.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-bus.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-bus.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-bus.h</a></div><div class='hunk'>@@ -122,7 +122,8 @@ struct iwl_bus;</div><div class='ctx'>  * struct iwl_bus_ops - bus specific operations</div><div class='ctx'>  * @get_pm_support: must returns true if the bus can go to sleep</div><div class='ctx'>  * @apm_config: will be called during the config of the APM</div><div class='del'>- * @get_hw_id: prints the hw_id in the provided buffer</div><div class='add'>+ * @get_hw_id_string: prints the hw_id in the provided buffer</div><div class='add'>+ * @get_hw_id: get hw_id in u32</div><div class='ctx'>  * @write8: write a byte to register at offset ofs</div><div class='ctx'>  * @write32: write a dword to register at offset ofs</div><div class='ctx'>  * @wread32: read a dword at register at offset ofs</div><div class='hunk'>@@ -130,7 +131,8 @@ struct iwl_bus;</div><div class='ctx'> struct iwl_bus_ops {</div><div class='ctx'> 	bool (*get_pm_support)(struct iwl_bus *bus);</div><div class='ctx'> 	void (*apm_config)(struct iwl_bus *bus);</div><div class='del'>-	void (*get_hw_id)(struct iwl_bus *bus, char buf[], int buf_len);</div><div class='add'>+	void (*get_hw_id_string)(struct iwl_bus *bus, char buf[], int buf_len);</div><div class='add'>+	u32 (*get_hw_id)(struct iwl_bus *bus);</div><div class='ctx'> 	void (*write8)(struct iwl_bus *bus, u32 ofs, u8 val);</div><div class='ctx'> 	void (*write32)(struct iwl_bus *bus, u32 ofs, u32 val);</div><div class='ctx'> 	u32 (*read32)(struct iwl_bus *bus, u32 ofs);</div><div class='hunk'>@@ -172,9 +174,15 @@ static inline void bus_apm_config(struct iwl_bus *bus)</div><div class='ctx'> 	bus-&gt;ops-&gt;apm_config(bus);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void bus_get_hw_id(struct iwl_bus *bus, char buf[], int buf_len)</div><div class='add'>+static inline void bus_get_hw_id_string(struct iwl_bus *bus, char buf[],</div><div class='add'>+		int buf_len)</div><div class='ctx'> {</div><div class='del'>-	bus-&gt;ops-&gt;get_hw_id(bus, buf, buf_len);</div><div class='add'>+	bus-&gt;ops-&gt;get_hw_id_string(bus, buf, buf_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 bus_get_hw_id(struct iwl_bus *bus)</div><div class='add'>+{</div><div class='add'>+	return bus-&gt;ops-&gt;get_hw_id(bus);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void bus_write8(struct iwl_bus *bus, u32 ofs, u8 val)</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-cfg.h b/drivers/net/wireless/iwlwifi/iwl-cfg.h<br/>index 2a2dc4597ba1..e1d78257e4a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-cfg.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-cfg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-cfg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-cfg.h</a></div><div class='hunk'>@@ -101,17 +101,11 @@ extern struct iwl_cfg iwl100_bg_cfg;</div><div class='ctx'> extern struct iwl_cfg iwl130_bgn_cfg;</div><div class='ctx'> extern struct iwl_cfg iwl130_bg_cfg;</div><div class='ctx'> extern struct iwl_cfg iwl2000_2bgn_cfg;</div><div class='del'>-extern struct iwl_cfg iwl2000_2bg_cfg;</div><div class='ctx'> extern struct iwl_cfg iwl2000_2bgn_d_cfg;</div><div class='ctx'> extern struct iwl_cfg iwl2030_2bgn_cfg;</div><div class='del'>-extern struct iwl_cfg iwl2030_2bg_cfg;</div><div class='ctx'> extern struct iwl_cfg iwl6035_2agn_cfg;</div><div class='del'>-extern struct iwl_cfg iwl6035_2abg_cfg;</div><div class='del'>-extern struct iwl_cfg iwl6035_2bg_cfg;</div><div class='del'>-extern struct iwl_cfg iwl105_bg_cfg;</div><div class='ctx'> extern struct iwl_cfg iwl105_bgn_cfg;</div><div class='ctx'> extern struct iwl_cfg iwl105_bgn_d_cfg;</div><div class='del'>-extern struct iwl_cfg iwl135_bg_cfg;</div><div class='ctx'> extern struct iwl_cfg iwl135_bgn_cfg;</div><div class='ctx'> </div><div class='ctx'> #endif /* __iwl_pci_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h<br/>index 69d5f85d11e2..265de39d394c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-commands.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-commands.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-commands.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-commands.h</a></div><div class='hunk'>@@ -109,10 +109,10 @@ enum {</div><div class='ctx'> 	/* RX, TX, LEDs */</div><div class='ctx'> 	REPLY_TX = 0x1c,</div><div class='ctx'> 	REPLY_LEDS_CMD = 0x48,</div><div class='del'>-	REPLY_TX_LINK_QUALITY_CMD = 0x4e, /* for 4965 and up */</div><div class='add'>+	REPLY_TX_LINK_QUALITY_CMD = 0x4e,</div><div class='ctx'> </div><div class='ctx'> 	/* WiMAX coexistence */</div><div class='del'>-	COEX_PRIORITY_TABLE_CMD = 0x5a,	/* for 5000 series and up */</div><div class='add'>+	COEX_PRIORITY_TABLE_CMD = 0x5a,</div><div class='ctx'> 	COEX_MEDIUM_NOTIFICATION = 0x5b,</div><div class='ctx'> 	COEX_EVENT_CMD = 0x5c,</div><div class='ctx'> </div><div class='hunk'>@@ -198,6 +198,7 @@ enum {</div><div class='ctx'> 	REPLY_WOWLAN_TKIP_PARAMS = 0xe3,</div><div class='ctx'> 	REPLY_WOWLAN_KEK_KCK_MATERIAL = 0xe4,</div><div class='ctx'> 	REPLY_WOWLAN_GET_STATUS = 0xe5,</div><div class='add'>+	REPLY_D3_CONFIG = 0xd3,</div><div class='ctx'> </div><div class='ctx'> 	REPLY_MAX = 0xff</div><div class='ctx'> };</div><div class='hunk'>@@ -465,23 +466,27 @@ struct iwl_error_event_table {</div><div class='ctx'> 	u32 frame_ptr;		/* frame pointer */</div><div class='ctx'> 	u32 stack_ptr;		/* stack pointer */</div><div class='ctx'> 	u32 hcmd;		/* last host command header */</div><div class='del'>-#if 0</div><div class='del'>-	/* no need to read the remainder, we don't use the values */</div><div class='del'>-	u32 isr0;		/* isr status register LMPM_NIC_ISR0: rxtx_flag */</div><div class='del'>-	u32 isr1;		/* isr status register LMPM_NIC_ISR1: host_flag */</div><div class='del'>-	u32 isr2;		/* isr status register LMPM_NIC_ISR2: enc_flag */</div><div class='del'>-	u32 isr3;		/* isr status register LMPM_NIC_ISR3: time_flag */</div><div class='del'>-	u32 isr4;		/* isr status register LMPM_NIC_ISR4: wico interrupt */</div><div class='add'>+	u32 isr0;		/* isr status register LMPM_NIC_ISR0:</div><div class='add'>+				 * rxtx_flag */</div><div class='add'>+	u32 isr1;		/* isr status register LMPM_NIC_ISR1:</div><div class='add'>+				 * host_flag */</div><div class='add'>+	u32 isr2;		/* isr status register LMPM_NIC_ISR2:</div><div class='add'>+				 * enc_flag */</div><div class='add'>+	u32 isr3;		/* isr status register LMPM_NIC_ISR3:</div><div class='add'>+				 * time_flag */</div><div class='add'>+	u32 isr4;		/* isr status register LMPM_NIC_ISR4:</div><div class='add'>+				 * wico interrupt */</div><div class='ctx'> 	u32 isr_pref;		/* isr status register LMPM_NIC_PREF_STAT */</div><div class='ctx'> 	u32 wait_event;		/* wait event() caller address */</div><div class='ctx'> 	u32 l2p_control;	/* L2pControlField */</div><div class='ctx'> 	u32 l2p_duration;	/* L2pDurationField */</div><div class='ctx'> 	u32 l2p_mhvalid;	/* L2pMhValidBits */</div><div class='ctx'> 	u32 l2p_addr_match;	/* L2pAddrMatchStat */</div><div class='del'>-	u32 lmpm_pmg_sel;	/* indicate which clocks are turned on (LMPM_PMG_SEL) */</div><div class='del'>-	u32 u_timestamp;	/* indicate when the date and time of the compilation */</div><div class='add'>+	u32 lmpm_pmg_sel;	/* indicate which clocks are turned on</div><div class='add'>+				 * (LMPM_PMG_SEL) */</div><div class='add'>+	u32 u_timestamp;	/* indicate when the date and time of the</div><div class='add'>+				 * compilation */</div><div class='ctx'> 	u32 flow_handler;	/* FH read/write pointers, RX credit */</div><div class='del'>-#endif</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct iwl_alive_resp {</div><div class='hunk'>@@ -809,7 +814,7 @@ struct iwl_qosparam_cmd {</div><div class='ctx'> #define	IWLAGN_STATION_COUNT	16</div><div class='ctx'> </div><div class='ctx'> #define	IWL_INVALID_STATION 	255</div><div class='del'>-#define IWL_MAX_TID_COUNT	9</div><div class='add'>+#define IWL_MAX_TID_COUNT	8</div><div class='ctx'> </div><div class='ctx'> #define STA_FLG_TX_RATE_MSK		cpu_to_le32(1 &lt;&lt; 2)</div><div class='ctx'> #define STA_FLG_PWR_SAVE_MSK		cpu_to_le32(1 &lt;&lt; 8)</div><div class='hunk'>@@ -930,8 +935,7 @@ struct iwl_addsta_cmd {</div><div class='ctx'> 	 * corresponding to bit (e.g. bit 5 controls TID 5).</div><div class='ctx'> 	 * Set modify_mask bit STA_MODIFY_TID_DISABLE_TX to use this field. */</div><div class='ctx'> 	__le16 tid_disable_tx;</div><div class='del'>-</div><div class='del'>-	__le16	rate_n_flags;		/* 3945 only */</div><div class='add'>+	__le16 legacy_reserved;</div><div class='ctx'> </div><div class='ctx'> 	/* TID for which to add block-ack support.</div><div class='ctx'> 	 * Set modify_mask bit STA_MODIFY_ADDBA_TID_MSK to use this field. */</div><div class='hunk'>@@ -1161,8 +1165,7 @@ struct iwl_rx_mpdu_res_start {</div><div class='ctx'>  *</div><div class='ctx'>  * uCode handles retrying Tx when an ACK is expected but not received.</div><div class='ctx'>  * This includes trying lower data rates than the one requested in the Tx</div><div class='del'>- * command, as set up by the REPLY_RATE_SCALE (for 3945) or</div><div class='del'>- * REPLY_TX_LINK_QUALITY_CMD (agn).</div><div class='add'>+ * command, as set up by the REPLY_TX_LINK_QUALITY_CMD (agn).</div><div class='ctx'>  *</div><div class='ctx'>  * Driver sets up transmit power for various rates via REPLY_TX_PWR_TABLE_CMD.</div><div class='ctx'>  * This command must be executed after every RXON command, before Tx can occur.</div><div class='hunk'>@@ -1174,25 +1177,9 @@ struct iwl_rx_mpdu_res_start {</div><div class='ctx'>  * 1: Use RTS/CTS protocol or CTS-to-self if spec allows it</div><div class='ctx'>  * before this frame. if CTS-to-self required check</div><div class='ctx'>  * RXON_FLG_SELF_CTS_EN status.</div><div class='del'>- * unused in 3945/4965, used in 5000 series and after</div><div class='ctx'>  */</div><div class='ctx'> #define TX_CMD_FLG_PROT_REQUIRE_MSK cpu_to_le32(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * 1: Use Request-To-Send protocol before this frame.</div><div class='del'>- * Mutually exclusive vs. TX_CMD_FLG_CTS_MSK.</div><div class='del'>- * used in 3945/4965, unused in 5000 series and after</div><div class='del'>- */</div><div class='del'>-#define TX_CMD_FLG_RTS_MSK cpu_to_le32(1 &lt;&lt; 1)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 1: Transmit Clear-To-Send to self before this frame.</div><div class='del'>- * Driver should set this for AUTH/DEAUTH/ASSOC-REQ/REASSOC mgmnt frames.</div><div class='del'>- * Mutually exclusive vs. TX_CMD_FLG_RTS_MSK.</div><div class='del'>- * used in 3945/4965, unused in 5000 series and after</div><div class='del'>- */</div><div class='del'>-#define TX_CMD_FLG_CTS_MSK cpu_to_le32(1 &lt;&lt; 2)</div><div class='del'>-</div><div class='ctx'> /* 1: Expect ACK from receiving station</div><div class='ctx'>  * 0: Don't expect ACK (MAC header's duration field s/b 0)</div><div class='ctx'>  * Set this for unicast frames, but not broadcast/multicast. */</div><div class='hunk'>@@ -1210,18 +1197,8 @@ struct iwl_rx_mpdu_res_start {</div><div class='ctx'>  * Set when Txing a block-ack request frame.  Also set TX_CMD_FLG_ACK_MSK. */</div><div class='ctx'> #define TX_CMD_FLG_IMM_BA_RSP_MASK  cpu_to_le32(1 &lt;&lt; 6)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * 1: Frame requires full Tx-Op protection.</div><div class='del'>- * Set this if either RTS or CTS Tx Flag gets set.</div><div class='del'>- * used in 3945/4965, unused in 5000 series and after</div><div class='del'>- */</div><div class='del'>-#define TX_CMD_FLG_FULL_TXOP_PROT_MSK cpu_to_le32(1 &lt;&lt; 7)</div><div class='del'>-</div><div class='del'>-/* Tx antenna selection field; used only for 3945, reserved (0) for agn devices.</div><div class='del'>- * Set field to "0" to allow 3945 uCode to select antenna (normal usage). */</div><div class='add'>+/* Tx antenna selection field; reserved (0) for agn devices. */</div><div class='ctx'> #define TX_CMD_FLG_ANT_SEL_MSK cpu_to_le32(0xf00)</div><div class='del'>-#define TX_CMD_FLG_ANT_A_MSK cpu_to_le32(1 &lt;&lt; 8)</div><div class='del'>-#define TX_CMD_FLG_ANT_B_MSK cpu_to_le32(1 &lt;&lt; 9)</div><div class='ctx'> </div><div class='ctx'> /* 1: Ignore Bluetooth priority for this frame.</div><div class='ctx'>  * 0: Delay Tx until Bluetooth device is done (normal usage). */</div><div class='hunk'>@@ -1567,7 +1544,6 @@ struct iwl_compressed_ba_resp {</div><div class='ctx'> 	__le64 bitmap;</div><div class='ctx'> 	__le16 scd_flow;</div><div class='ctx'> 	__le16 scd_ssn;</div><div class='del'>-	/* following only for 5000 series and up */</div><div class='ctx'> 	u8 txed;	/* number of frames sent */</div><div class='ctx'> 	u8 txed_2_done; /* number of frames acked */</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -1669,7 +1645,7 @@ struct iwl_link_qual_agg_params {</div><div class='ctx'> /*</div><div class='ctx'>  * REPLY_TX_LINK_QUALITY_CMD = 0x4e (command, has simple generic response)</div><div class='ctx'>  *</div><div class='del'>- * For agn devices only; 3945 uses REPLY_RATE_SCALE.</div><div class='add'>+ * For agn devices</div><div class='ctx'>  *</div><div class='ctx'>  * Each station in the agn device's internal station table has its own table</div><div class='ctx'>  * of 16</div><div class='hunk'>@@ -1918,7 +1894,7 @@ struct iwl_link_quality_cmd {</div><div class='ctx'> /*</div><div class='ctx'>  * REPLY_BT_CONFIG = 0x9b (command, has simple generic response)</div><div class='ctx'>  *</div><div class='del'>- * 3945 and agn devices support hardware handshake with Bluetooth device on</div><div class='add'>+ * agn devices support hardware handshake with Bluetooth device on</div><div class='ctx'>  * same platform.  Bluetooth device alerts wireless device when it will Tx;</div><div class='ctx'>  * wireless device can delay or kill its own Tx to accommodate.</div><div class='ctx'>  */</div><div class='hunk'>@@ -2202,8 +2178,8 @@ struct iwl_spectrum_notification {</div><div class='ctx'> </div><div class='ctx'> struct iwl_powertable_cmd {</div><div class='ctx'> 	__le16 flags;</div><div class='del'>-	u8 keep_alive_seconds;		/* 3945 reserved */</div><div class='del'>-	u8 debug_flags;			/* 3945 reserved */</div><div class='add'>+	u8 keep_alive_seconds;</div><div class='add'>+	u8 debug_flags;</div><div class='ctx'> 	__le32 rx_data_timeout;</div><div class='ctx'> 	__le32 tx_data_timeout;</div><div class='ctx'> 	__le32 sleep_interval[IWL_POWER_VEC_SIZE];</div><div class='hunk'>@@ -2324,9 +2300,9 @@ struct iwl_scan_channel {</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_ssid_ie - directed scan network information element</div><div class='ctx'>  *</div><div class='del'>- * Up to 20 of these may appear in REPLY_SCAN_CMD (Note: Only 4 are in</div><div class='del'>- * 3945 SCAN api), selected by "type" bit field in struct iwl_scan_channel;</div><div class='del'>- * each channel may select different ssids from among the 20 (4) entries.</div><div class='add'>+ * Up to 20 of these may appear in REPLY_SCAN_CMD,</div><div class='add'>+ * selected by "type" bit field in struct iwl_scan_channel;</div><div class='add'>+ * each channel may select different ssids from among the 20 entries.</div><div class='ctx'>  * SSID IEs get transmitted in reverse order of entry.</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_ssid_ie {</div><div class='hunk'>@@ -2335,7 +2311,6 @@ struct iwl_ssid_ie {</div><div class='ctx'> 	u8 ssid[32];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-#define PROBE_OPTION_MAX_3945		4</div><div class='ctx'> #define PROBE_OPTION_MAX		20</div><div class='ctx'> #define TX_CMD_LIFE_TIME_INFINITE	cpu_to_le32(0xFFFFFFFF)</div><div class='ctx'> #define IWL_GOOD_CRC_TH_DISABLED	0</div><div class='hunk'>@@ -2416,8 +2391,6 @@ struct iwl_scan_cmd {</div><div class='ctx'> 				 * channel */</div><div class='ctx'> 	__le32 suspend_time;	/* pause scan this long (in "extended beacon</div><div class='ctx'> 				 * format") when returning to service chnl:</div><div class='del'>-				 * 3945; 31:24 # beacons, 19:0 additional usec,</div><div class='del'>-				 * 4965; 31:22 # beacons, 21:0 additional usec.</div><div class='ctx'> 				 */</div><div class='ctx'> 	__le32 flags;		/* RXON_FLG_* */</div><div class='ctx'> 	__le32 filter_flags;	/* RXON_FILTER_* */</div><div class='hunk'>@@ -2733,7 +2706,7 @@ struct statistics_div {</div><div class='ctx'> </div><div class='ctx'> struct statistics_general_common {</div><div class='ctx'> 	__le32 temperature;   /* radio temperature */</div><div class='del'>-	__le32 temperature_m; /* for 5000 and up, this is radio voltage */</div><div class='add'>+	__le32 temperature_m; /* radio voltage */</div><div class='ctx'> 	struct statistics_dbg dbg;</div><div class='ctx'> 	__le32 sleep_time;</div><div class='ctx'> 	__le32 slots_out;</div><div class='hunk'>@@ -3801,6 +3774,19 @@ struct iwl_bt_coex_prot_env_cmd {</div><div class='ctx'> } __attribute__((packed));</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * REPLY_D3_CONFIG</div><div class='add'>+ */</div><div class='add'>+enum iwlagn_d3_wakeup_filters {</div><div class='add'>+	IWLAGN_D3_WAKEUP_RFKILL		= BIT(0),</div><div class='add'>+	IWLAGN_D3_WAKEUP_SYSASSERT	= BIT(1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iwlagn_d3_config_cmd {</div><div class='add'>+	__le32 min_sleep_time;</div><div class='add'>+	__le32 wakeup_flags;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * REPLY_WOWLAN_PATTERNS</div><div class='ctx'>  */</div><div class='ctx'> #define IWLAGN_WOWLAN_MIN_PATTERN_LEN	16</div><div class='hunk'>@@ -3830,19 +3816,16 @@ enum iwlagn_wowlan_wakeup_filters {</div><div class='ctx'> 	IWLAGN_WOWLAN_WAKEUP_BEACON_MISS	= BIT(2),</div><div class='ctx'> 	IWLAGN_WOWLAN_WAKEUP_LINK_CHANGE	= BIT(3),</div><div class='ctx'> 	IWLAGN_WOWLAN_WAKEUP_GTK_REKEY_FAIL	= BIT(4),</div><div class='del'>-	IWLAGN_WOWLAN_WAKEUP_RFKILL		= BIT(5),</div><div class='del'>-	IWLAGN_WOWLAN_WAKEUP_UCODE_ERROR	= BIT(6),</div><div class='del'>-	IWLAGN_WOWLAN_WAKEUP_EAP_IDENT_REQ	= BIT(7),</div><div class='del'>-	IWLAGN_WOWLAN_WAKEUP_4WAY_HANDSHAKE	= BIT(8),</div><div class='del'>-	IWLAGN_WOWLAN_WAKEUP_ALWAYS		= BIT(9),</div><div class='del'>-	IWLAGN_WOWLAN_WAKEUP_ENABLE_NET_DETECT	= BIT(10),</div><div class='add'>+	IWLAGN_WOWLAN_WAKEUP_EAP_IDENT_REQ	= BIT(5),</div><div class='add'>+	IWLAGN_WOWLAN_WAKEUP_4WAY_HANDSHAKE	= BIT(6),</div><div class='add'>+	IWLAGN_WOWLAN_WAKEUP_ALWAYS		= BIT(7),</div><div class='add'>+	IWLAGN_WOWLAN_WAKEUP_ENABLE_NET_DETECT	= BIT(8),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct iwlagn_wowlan_wakeup_filter_cmd {</div><div class='ctx'> 	__le32 enabled;</div><div class='ctx'> 	__le16 non_qos_seq;</div><div class='del'>-	u8 min_sleep_seconds;</div><div class='del'>-	u8 reserved;</div><div class='add'>+	__le16 reserved;</div><div class='ctx'> 	__le16 qos_seq[8];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c<br/>index fcf54160e4ed..7bcfa781e0b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-core.c</a></div><div class='hunk'>@@ -60,8 +60,8 @@ static void iwl_init_ht_hw_capab(const struct iwl_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	ht_info-&gt;ht_supported = true;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;ht_params &amp;&amp;</div><div class='del'>-	    priv-&gt;cfg-&gt;ht_params-&gt;ht_greenfield_support)</div><div class='add'>+	if (cfg(priv)-&gt;ht_params &amp;&amp;</div><div class='add'>+	    cfg(priv)-&gt;ht_params-&gt;ht_greenfield_support)</div><div class='ctx'> 		ht_info-&gt;cap |= IEEE80211_HT_CAP_GRN_FLD;</div><div class='ctx'> 	ht_info-&gt;cap |= IEEE80211_HT_CAP_SGI_20;</div><div class='ctx'> 	max_bit_rate = MAX_BIT_RATE_20_MHZ;</div><div class='hunk'>@@ -76,11 +76,7 @@ static void iwl_init_ht_hw_capab(const struct iwl_priv *priv,</div><div class='ctx'> 		ht_info-&gt;cap |= IEEE80211_HT_CAP_MAX_AMSDU;</div><div class='ctx'> </div><div class='ctx'> 	ht_info-&gt;ampdu_factor = CFG_HT_RX_AMPDU_FACTOR_DEF;</div><div class='del'>-	if (priv-&gt;cfg-&gt;bt_params &amp;&amp; priv-&gt;cfg-&gt;bt_params-&gt;ampdu_factor)</div><div class='del'>-		ht_info-&gt;ampdu_factor = priv-&gt;cfg-&gt;bt_params-&gt;ampdu_factor;</div><div class='ctx'> 	ht_info-&gt;ampdu_density = CFG_HT_MPDU_DENSITY_DEF;</div><div class='del'>-	if (priv-&gt;cfg-&gt;bt_params &amp;&amp; priv-&gt;cfg-&gt;bt_params-&gt;ampdu_density)</div><div class='del'>-		ht_info-&gt;ampdu_density = priv-&gt;cfg-&gt;bt_params-&gt;ampdu_density;</div><div class='ctx'> </div><div class='ctx'> 	ht_info-&gt;mcs.rx_mask[0] = 0xFF;</div><div class='ctx'> 	if (rx_chains_num &gt;= 2)</div><div class='hunk'>@@ -141,7 +137,7 @@ int iwl_init_geos(struct iwl_priv *priv)</div><div class='ctx'> 	sband-&gt;bitrates = &amp;rates[IWL_FIRST_OFDM_RATE];</div><div class='ctx'> 	sband-&gt;n_bitrates = IWL_RATE_COUNT_LEGACY - IWL_FIRST_OFDM_RATE;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;sku &amp; EEPROM_SKU_CAP_11N_ENABLE)</div><div class='add'>+	if (cfg(priv)-&gt;sku &amp; EEPROM_SKU_CAP_11N_ENABLE)</div><div class='ctx'> 		iwl_init_ht_hw_capab(priv, &amp;sband-&gt;ht_cap,</div><div class='ctx'> 					 IEEE80211_BAND_5GHZ);</div><div class='ctx'> </div><div class='hunk'>@@ -151,7 +147,7 @@ int iwl_init_geos(struct iwl_priv *priv)</div><div class='ctx'> 	sband-&gt;bitrates = rates;</div><div class='ctx'> 	sband-&gt;n_bitrates = IWL_RATE_COUNT_LEGACY;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;sku &amp; EEPROM_SKU_CAP_11N_ENABLE)</div><div class='add'>+	if (cfg(priv)-&gt;sku &amp; EEPROM_SKU_CAP_11N_ENABLE)</div><div class='ctx'> 		iwl_init_ht_hw_capab(priv, &amp;sband-&gt;ht_cap,</div><div class='ctx'> 					 IEEE80211_BAND_2GHZ);</div><div class='ctx'> </div><div class='hunk'>@@ -206,12 +202,12 @@ int iwl_init_geos(struct iwl_priv *priv)</div><div class='ctx'> 	priv-&gt;tx_power_next = max_tx_power;</div><div class='ctx'> </div><div class='ctx'> 	if ((priv-&gt;bands[IEEE80211_BAND_5GHZ].n_channels == 0) &amp;&amp;</div><div class='del'>-	     priv-&gt;cfg-&gt;sku &amp; EEPROM_SKU_CAP_BAND_52GHZ) {</div><div class='add'>+	     cfg(priv)-&gt;sku &amp; EEPROM_SKU_CAP_BAND_52GHZ) {</div><div class='ctx'> 		char buf[32];</div><div class='del'>-		bus_get_hw_id(bus(priv), buf, sizeof(buf));</div><div class='add'>+		bus_get_hw_id_string(bus(priv), buf, sizeof(buf));</div><div class='ctx'> 		IWL_INFO(priv, "Incorrectly detected BG card as ABG. "</div><div class='ctx'> 			"Please send your %s to maintainer.\n", buf);</div><div class='del'>-		priv-&gt;cfg-&gt;sku &amp;= ~EEPROM_SKU_CAP_BAND_52GHZ;</div><div class='add'>+		cfg(priv)-&gt;sku &amp;= ~EEPROM_SKU_CAP_BAND_52GHZ;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	IWL_INFO(priv, "Tunable channels: %d 802.11bg, %d 802.11a channels\n",</div><div class='hunk'>@@ -836,19 +832,6 @@ void iwl_print_rx_config_cmd(struct iwl_priv *priv,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void iwlagn_abort_notification_waits(struct iwl_priv *priv)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct iwl_notification_wait *wait_entry;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;notif_wait_lock, flags);</div><div class='del'>-	list_for_each_entry(wait_entry, &amp;priv-&gt;notif_waits, list)</div><div class='del'>-		wait_entry-&gt;aborted = true;</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;notif_wait_lock, flags);</div><div class='del'>-</div><div class='del'>-	wake_up_all(&amp;priv-&gt;notif_waitq);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int reload_msec;</div><div class='hunk'>@@ -860,7 +843,7 @@ void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)</div><div class='ctx'> 	/* Cancel currently queued command. */</div><div class='ctx'> 	clear_bit(STATUS_HCMD_ACTIVE, &amp;priv-&gt;shrd-&gt;status);</div><div class='ctx'> </div><div class='del'>-	iwlagn_abort_notification_waits(priv);</div><div class='add'>+	iwl_abort_notification_waits(priv-&gt;shrd);</div><div class='ctx'> </div><div class='ctx'> 	/* Keep the restart process from trying to send host</div><div class='ctx'> 	 * commands by clearing the ready bit */</div><div class='hunk'>@@ -979,9 +962,9 @@ int iwl_apm_init(struct iwl_priv *priv)</div><div class='ctx'> 	bus_apm_config(bus(priv));</div><div class='ctx'> </div><div class='ctx'> 	/* Configure analog phase-lock-loop before activating to D0A */</div><div class='del'>-	if (priv-&gt;cfg-&gt;base_params-&gt;pll_cfg_val)</div><div class='add'>+	if (cfg(priv)-&gt;base_params-&gt;pll_cfg_val)</div><div class='ctx'> 		iwl_set_bit(bus(priv), CSR_ANA_PLL_CFG,</div><div class='del'>-			    priv-&gt;cfg-&gt;base_params-&gt;pll_cfg_val);</div><div class='add'>+			    cfg(priv)-&gt;base_params-&gt;pll_cfg_val);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set "initialization complete" bit to move adapter from</div><div class='hunk'>@@ -1120,229 +1103,8 @@ int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags, bool clear)</div><div class='ctx'> 					&amp;statistics_cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwlagn_mac_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 *params)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_rxon_context *ctx;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int q;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='ctx'> </div><div class='del'>-	if (!iwl_is_ready_rf(priv-&gt;shrd)) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (queue &gt;= AC_NUM) {</div><div class='del'>-		IWL_DEBUG_MAC80211(priv, "leave - queue &gt;= AC_NUM %d\n", queue);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	q = AC_NUM - 1 - queue;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;shrd-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * MULTI-FIXME</div><div class='del'>-	 * This may need to be done per interface in nl80211/cfg80211/mac80211.</div><div class='del'>-	 */</div><div class='del'>-	for_each_context(priv, ctx) {</div><div class='del'>-		ctx-&gt;qos_data.def_qos_parm.ac[q].cw_min =</div><div class='del'>-			cpu_to_le16(params-&gt;cw_min);</div><div class='del'>-		ctx-&gt;qos_data.def_qos_parm.ac[q].cw_max =</div><div class='del'>-			cpu_to_le16(params-&gt;cw_max);</div><div class='del'>-		ctx-&gt;qos_data.def_qos_parm.ac[q].aifsn = params-&gt;aifs;</div><div class='del'>-		ctx-&gt;qos_data.def_qos_parm.ac[q].edca_txop =</div><div class='del'>-				cpu_to_le16((params-&gt;txop * 32));</div><div class='del'>-</div><div class='del'>-		ctx-&gt;qos_data.def_qos_parm.ac[q].reserved1 = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;shrd-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwlagn_mac_tx_last_beacon(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;ibss_manager == IWL_IBSS_MANAGER;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_set_mode(struct iwl_priv *priv, struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	iwl_connection_init_rx_config(priv, ctx);</div><div class='del'>-</div><div class='del'>-	iwlagn_set_rxon_chain(priv, ctx);</div><div class='del'>-</div><div class='del'>-	return iwlagn_commit_rxon(priv, ctx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int iwl_setup_interface(struct iwl_priv *priv,</div><div class='del'>-			       struct iwl_rxon_context *ctx)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_vif *vif = ctx-&gt;vif;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This variable will be correct only when there's just</div><div class='del'>-	 * a single context, but all code using it is for hardware</div><div class='del'>-	 * that supports only one context.</div><div class='del'>-	 */</div><div class='del'>-	priv-&gt;iw_mode = vif-&gt;type;</div><div class='del'>-</div><div class='del'>-	ctx-&gt;is_active = true;</div><div class='del'>-</div><div class='del'>-	err = iwl_set_mode(priv, ctx);</div><div class='del'>-	if (err) {</div><div class='del'>-		if (!ctx-&gt;always_active)</div><div class='del'>-			ctx-&gt;is_active = false;</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cfg-&gt;bt_params &amp;&amp; priv-&gt;cfg-&gt;bt_params-&gt;advanced_bt_coexist &amp;&amp;</div><div class='del'>-	    vif-&gt;type == NL80211_IFTYPE_ADHOC) {</div><div class='del'>-		/*</div><div class='del'>-		 * pretend to have high BT traffic as long as we</div><div class='del'>-		 * are operating in IBSS mode, as this will cause</div><div class='del'>-		 * the rate scaling etc. to behave as intended.</div><div class='del'>-		 */</div><div class='del'>-		priv-&gt;bt_traffic_load = IWL_BT_COEX_TRAFFIC_LOAD_HIGH;</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 iwlagn_mac_add_interface(struct ieee80211_hw *hw,</div><div class='del'>-			     struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='del'>-	struct iwl_rxon_context *tmp, *ctx = NULL;</div><div class='del'>-	int err;</div><div class='del'>-	enum nl80211_iftype viftype = ieee80211_vif_type_p2p(vif);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter: type %d, addr %pM\n",</div><div class='del'>-			   viftype, vif-&gt;addr);</div><div class='del'>-</div><div class='del'>-	cancel_delayed_work_sync(&amp;priv-&gt;hw_roc_disable_work);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	iwlagn_disable_roc(priv);</div><div class='del'>-</div><div class='del'>-	if (!iwl_is_ready_rf(priv-&gt;shrd)) {</div><div class='del'>-		IWL_WARN(priv, "Try to add interface when device not ready\n");</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for_each_context(priv, tmp) {</div><div class='del'>-		u32 possible_modes =</div><div class='del'>-			tmp-&gt;interface_modes | tmp-&gt;exclusive_interface_modes;</div><div class='del'>-</div><div class='del'>-		if (tmp-&gt;vif) {</div><div class='del'>-			/* check if this busy context is exclusive */</div><div class='del'>-			if (tmp-&gt;exclusive_interface_modes &amp;</div><div class='del'>-						BIT(tmp-&gt;vif-&gt;type)) {</div><div class='del'>-				err = -EINVAL;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!(possible_modes &amp; BIT(viftype)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* have maybe usable context w/o interface */</div><div class='del'>-		ctx = tmp;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ctx) {</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vif_priv-&gt;ctx = ctx;</div><div class='del'>-	ctx-&gt;vif = vif;</div><div class='del'>-</div><div class='del'>-	err = iwl_setup_interface(priv, ctx);</div><div class='del'>-	if (!err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ctx-&gt;vif = NULL;</div><div class='del'>-	priv-&gt;iw_mode = NL80211_IFTYPE_STATION;</div><div class='del'>- out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_teardown_interface(struct iwl_priv *priv,</div><div class='del'>-				   struct ieee80211_vif *vif,</div><div class='del'>-				   bool mode_change)</div><div class='del'>-{</div><div class='del'>-	struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;scan_vif == vif) {</div><div class='del'>-		iwl_scan_cancel_timeout(priv, 200);</div><div class='del'>-		iwl_force_scan_end(priv);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!mode_change) {</div><div class='del'>-		iwl_set_mode(priv, ctx);</div><div class='del'>-		if (!ctx-&gt;always_active)</div><div class='del'>-			ctx-&gt;is_active = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * When removing the IBSS interface, overwrite the</div><div class='del'>-	 * BT traffic load with the stored one from the last</div><div class='del'>-	 * notification, if any. If this is a device that</div><div class='del'>-	 * doesn't implement this, this has no effect since</div><div class='del'>-	 * both values are the same and zero.</div><div class='del'>-	 */</div><div class='del'>-	if (vif-&gt;type == NL80211_IFTYPE_ADHOC)</div><div class='del'>-		priv-&gt;bt_traffic_load = priv-&gt;last_bt_traffic_load;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwlagn_mac_remove_interface(struct ieee80211_hw *hw,</div><div class='del'>-			      struct ieee80211_vif *vif)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(ctx-&gt;vif != vif)) {</div><div class='del'>-		struct iwl_rxon_context *tmp;</div><div class='del'>-		IWL_ERR(priv, "ctx-&gt;vif = %p, vif = %p\n", ctx-&gt;vif, vif);</div><div class='del'>-		for_each_context(priv, tmp)</div><div class='del'>-			IWL_ERR(priv, "\tID = %d:\tctx = %p\tctx-&gt;vif = %p\n",</div><div class='del'>-				tmp-&gt;ctxid, tmp, tmp-&gt;vif);</div><div class='del'>-	}</div><div class='del'>-	ctx-&gt;vif = NULL;</div><div class='del'>-</div><div class='del'>-	iwl_teardown_interface(priv, vif, false);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> </div><div class='hunk'>@@ -1649,97 +1411,13 @@ int iwl_force_reset(struct iwl_priv *priv, int mode, bool external)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwlagn_mac_change_interface(struct ieee80211_hw *hw,</div><div class='del'>-				struct ieee80211_vif *vif,</div><div class='del'>-				enum nl80211_iftype newtype, bool newp2p)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);</div><div class='del'>-	struct iwl_rxon_context *bss_ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='del'>-	struct iwl_rxon_context *tmp;</div><div class='del'>-	enum nl80211_iftype newviftype = newtype;</div><div class='del'>-	u32 interface_modes;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	newtype = ieee80211_iftype_p2p(newtype, newp2p);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (!ctx-&gt;vif || !iwl_is_ready_rf(priv-&gt;shrd)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Huh? But wait ... this can maybe happen when</div><div class='del'>-		 * we're in the middle of a firmware restart!</div><div class='del'>-		 */</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	interface_modes = ctx-&gt;interface_modes | ctx-&gt;exclusive_interface_modes;</div><div class='del'>-</div><div class='del'>-	if (!(interface_modes &amp; BIT(newtype))) {</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Refuse a change that should be done by moving from the PAN</div><div class='del'>-	 * context to the BSS context instead, if the BSS context is</div><div class='del'>-	 * available and can support the new interface type.</div><div class='del'>-	 */</div><div class='del'>-	if (ctx-&gt;ctxid == IWL_RXON_CTX_PAN &amp;&amp; !bss_ctx-&gt;vif &amp;&amp;</div><div class='del'>-	    (bss_ctx-&gt;interface_modes &amp; BIT(newtype) ||</div><div class='del'>-	     bss_ctx-&gt;exclusive_interface_modes &amp; BIT(newtype))) {</div><div class='del'>-		BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ctx-&gt;exclusive_interface_modes &amp; BIT(newtype)) {</div><div class='del'>-		for_each_context(priv, tmp) {</div><div class='del'>-			if (ctx == tmp)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (!tmp-&gt;vif)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * The current mode switch would be exclusive, but</div><div class='del'>-			 * another context is active ... refuse the switch.</div><div class='del'>-			 */</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* success */</div><div class='del'>-	iwl_teardown_interface(priv, vif, true);</div><div class='del'>-	vif-&gt;type = newviftype;</div><div class='del'>-	vif-&gt;p2p = newp2p;</div><div class='del'>-	err = iwl_setup_interface(priv, ctx);</div><div class='del'>-	WARN_ON(err);</div><div class='del'>-	/*</div><div class='del'>-	 * We've switched internally, but submitting to the</div><div class='del'>-	 * device may have failed for some reason. Mask this</div><div class='del'>-	 * error, because otherwise mac80211 will not switch</div><div class='del'>-	 * (and set the interface type back) and we'll be</div><div class='del'>-	 * out of sync with it.</div><div class='del'>-	 */</div><div class='del'>-	err = 0;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> int iwl_cmd_echo_test(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct iwl_host_cmd cmd = {</div><div class='ctx'> 		.id = REPLY_ECHO,</div><div class='add'>+		.len = { 0 },</div><div class='ctx'> 		.flags = CMD_SYNC,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -1783,7 +1461,7 @@ void iwl_bg_watchdog(unsigned long data)</div><div class='ctx'> 	if (iwl_is_rfkill(priv-&gt;shrd))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	timeout = priv-&gt;cfg-&gt;base_params-&gt;wd_timeout;</div><div class='add'>+	timeout = cfg(priv)-&gt;base_params-&gt;wd_timeout;</div><div class='ctx'> 	if (timeout == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -1808,11 +1486,11 @@ void iwl_bg_watchdog(unsigned long data)</div><div class='ctx'> </div><div class='ctx'> void iwl_setup_watchdog(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	unsigned int timeout = priv-&gt;cfg-&gt;base_params-&gt;wd_timeout;</div><div class='add'>+	unsigned int timeout = cfg(priv)-&gt;base_params-&gt;wd_timeout;</div><div class='ctx'> </div><div class='ctx'> 	if (!iwlagn_mod_params.wd_disable) {</div><div class='ctx'> 		/* use system default */</div><div class='del'>-		if (timeout &amp;&amp; !priv-&gt;cfg-&gt;base_params-&gt;wd_disable)</div><div class='add'>+		if (timeout &amp;&amp; !cfg(priv)-&gt;base_params-&gt;wd_disable)</div><div class='ctx'> 			mod_timer(&amp;priv-&gt;watchdog,</div><div class='ctx'> 				jiffies +</div><div class='ctx'> 				msecs_to_jiffies(IWL_WD_TICK(timeout)));</div><div class='hunk'>@@ -1902,34 +1580,6 @@ __le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base,</div><div class='ctx'> 	return cpu_to_le32(res);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_start_tx_ba_trans_ready(struct iwl_priv *priv,</div><div class='del'>-				 enum iwl_rxon_context_id ctx,</div><div class='del'>-				 u8 sta_id, u8 tid)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_vif *vif;</div><div class='del'>-	u8 *addr = priv-&gt;stations[sta_id].sta.sta.addr;</div><div class='del'>-</div><div class='del'>-	if (ctx == NUM_IWL_RXON_CTX)</div><div class='del'>-		ctx = priv-&gt;stations[sta_id].ctxid;</div><div class='del'>-	vif = priv-&gt;contexts[ctx].vif;</div><div class='del'>-</div><div class='del'>-	ieee80211_start_tx_ba_cb_irqsafe(vif, addr, tid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void iwl_stop_tx_ba_trans_ready(struct iwl_priv *priv,</div><div class='del'>-				enum iwl_rxon_context_id ctx,</div><div class='del'>-				u8 sta_id, u8 tid)</div><div class='del'>-{</div><div class='del'>-	struct ieee80211_vif *vif;</div><div class='del'>-	u8 *addr = priv-&gt;stations[sta_id].sta.sta.addr;</div><div class='del'>-</div><div class='del'>-	if (ctx == NUM_IWL_RXON_CTX)</div><div class='del'>-		ctx = priv-&gt;stations[sta_id].ctxid;</div><div class='del'>-	vif = priv-&gt;contexts[ctx].vif;</div><div class='del'>-</div><div class='del'>-	ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void iwl_set_hw_rfkill_state(struct iwl_priv *priv, bool state)</div><div class='ctx'> {</div><div class='ctx'> 	wiphy_rfkill_set_hw_state(priv-&gt;hw-&gt;wiphy, state);</div><div class='hunk'>@@ -1937,8 +1587,7 @@ void iwl_set_hw_rfkill_state(struct iwl_priv *priv, bool state)</div><div class='ctx'> </div><div class='ctx'> void iwl_nic_config(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	priv-&gt;cfg-&gt;lib-&gt;nic_config(priv);</div><div class='del'>-</div><div class='add'>+	cfg(priv)-&gt;lib-&gt;nic_config(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iwl_free_skb(struct iwl_priv *priv, struct sk_buff *skb)</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h<br/>index f2fc288f3dd3..7bf76ab94dd2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-core.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-core.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-core.h</a></div><div class='hunk'>@@ -142,8 +142,6 @@ struct iwl_base_params {</div><div class='ctx'>  * @bt_init_traffic_load: specify initial bt traffic load</div><div class='ctx'>  * @bt_prio_boost: default bt priority boost value</div><div class='ctx'>  * @agg_time_limit: maximum number of uSec in aggregation</div><div class='del'>- * @ampdu_factor: Maximum A-MPDU length factor</div><div class='del'>- * @ampdu_density: Minimum A-MPDU spacing</div><div class='ctx'>  * @bt_sco_disable: uCode should not response to BT in SCO/ESCO mode</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_bt_params {</div><div class='hunk'>@@ -151,8 +149,6 @@ struct iwl_bt_params {</div><div class='ctx'> 	u8 bt_init_traffic_load;</div><div class='ctx'> 	u8 bt_prio_boost;</div><div class='ctx'> 	u16 agg_time_limit;</div><div class='del'>-	u8 ampdu_factor;</div><div class='del'>-	u8 ampdu_density;</div><div class='ctx'> 	bool bt_sco_disable;</div><div class='ctx'> 	bool bt_session_2;</div><div class='ctx'> };</div><div class='hunk'>@@ -165,84 +161,10 @@ struct iwl_ht_params {</div><div class='ctx'> 	enum ieee80211_smps_mode smps_mode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct iwl_cfg</div><div class='del'>- * @name: Offical name of the device</div><div class='del'>- * @fw_name_pre: Firmware filename prefix. The api version and extension</div><div class='del'>- *	(.ucode) will be added to filename before loading from disk. The</div><div class='del'>- *	filename is constructed as fw_name_pre&lt;api&gt;.ucode.</div><div class='del'>- * @ucode_api_max: Highest version of uCode API supported by driver.</div><div class='del'>- * @ucode_api_ok: oldest version of the uCode API that is OK to load</div><div class='del'>- *	without a warning, for use in transitions</div><div class='del'>- * @ucode_api_min: Lowest version of uCode API supported by driver.</div><div class='del'>- * @valid_tx_ant: valid transmit antenna</div><div class='del'>- * @valid_rx_ant: valid receive antenna</div><div class='del'>- * @sku: sku information from EEPROM</div><div class='del'>- * @eeprom_ver: EEPROM version</div><div class='del'>- * @eeprom_calib_ver: EEPROM calibration version</div><div class='del'>- * @lib: pointer to the lib ops</div><div class='del'>- * @additional_nic_config: additional nic configuration</div><div class='del'>- * @base_params: pointer to basic parameters</div><div class='del'>- * @ht_params: point to ht patameters</div><div class='del'>- * @bt_params: pointer to bt parameters</div><div class='del'>- * @pa_type: used by 6000 series only to identify the type of Power Amplifier</div><div class='del'>- * @need_dc_calib: need to perform init dc calibration</div><div class='del'>- * @need_temp_offset_calib: need to perform temperature offset calibration</div><div class='del'>- * @scan_antennas: available antenna for scan operation</div><div class='del'>- * @led_mode: 0=blinking, 1=On(RF On)/Off(RF Off)</div><div class='del'>- * @adv_pm: advance power management</div><div class='del'>- * @rx_with_siso_diversity: 1x1 device with rx antenna diversity</div><div class='del'>- * @internal_wimax_coex: internal wifi/wimax combo device</div><div class='del'>- * @iq_invert: I/Q inversion</div><div class='del'>- * @temp_offset_v2: support v2 of temperature offset calibration</div><div class='del'>- *</div><div class='del'>- * We enable the driver to be backward compatible wrt API version. The</div><div class='del'>- * driver specifies which APIs it supports (with @ucode_api_max being the</div><div class='del'>- * highest and @ucode_api_min the lowest). Firmware will only be loaded if</div><div class='del'>- * it has a supported API version.</div><div class='del'>- *</div><div class='del'>- * The ideal usage of this infrastructure is to treat a new ucode API</div><div class='del'>- * release as a new hardware revision.</div><div class='del'>- */</div><div class='del'>-struct iwl_cfg {</div><div class='del'>-	/* params specific to an individual device within a device family */</div><div class='del'>-	const char *name;</div><div class='del'>-	const char *fw_name_pre;</div><div class='del'>-	const unsigned int ucode_api_max;</div><div class='del'>-	const unsigned int ucode_api_ok;</div><div class='del'>-	const unsigned int ucode_api_min;</div><div class='del'>-	u8   valid_tx_ant;</div><div class='del'>-	u8   valid_rx_ant;</div><div class='del'>-	u16  sku;</div><div class='del'>-	u16  eeprom_ver;</div><div class='del'>-	u16  eeprom_calib_ver;</div><div class='del'>-	const struct iwl_lib_ops *lib;</div><div class='del'>-	void (*additional_nic_config)(struct iwl_priv *priv);</div><div class='del'>-	/* params not likely to change within a device family */</div><div class='del'>-	struct iwl_base_params *base_params;</div><div class='del'>-	/* params likely to change within a device family */</div><div class='del'>-	struct iwl_ht_params *ht_params;</div><div class='del'>-	struct iwl_bt_params *bt_params;</div><div class='del'>-	enum iwl_pa_type pa_type;	  /* if used set to IWL_PA_SYSTEM */</div><div class='del'>-	const bool need_dc_calib;	  /* if used set to true */</div><div class='del'>-	const bool need_temp_offset_calib; /* if used set to true */</div><div class='del'>-	u8 scan_rx_antennas[IEEE80211_NUM_BANDS];</div><div class='del'>-	enum iwl_led_mode led_mode;</div><div class='del'>-	const bool adv_pm;</div><div class='del'>-	const bool rx_with_siso_diversity;</div><div class='del'>-	const bool internal_wimax_coex;</div><div class='del'>-	const bool iq_invert;</div><div class='del'>-	const bool temp_offset_v2;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /***************************</div><div class='ctx'>  *   L i b                 *</div><div class='ctx'>  ***************************/</div><div class='ctx'> </div><div class='del'>-int iwlagn_mac_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 *params);</div><div class='del'>-int iwlagn_mac_tx_last_beacon(struct ieee80211_hw *hw);</div><div class='ctx'> void iwl_set_rxon_hwcrypto(struct iwl_priv *priv, struct iwl_rxon_context *ctx,</div><div class='ctx'> 			   int hw_decrypt);</div><div class='ctx'> int iwl_check_rxon_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx);</div><div class='hunk'>@@ -262,13 +184,6 @@ bool iwl_is_ht40_tx_allowed(struct iwl_priv *priv,</div><div class='ctx'> void iwl_connection_init_rx_config(struct iwl_priv *priv,</div><div class='ctx'> 				   struct iwl_rxon_context *ctx);</div><div class='ctx'> void iwl_set_rate(struct iwl_priv *priv);</div><div class='del'>-int iwlagn_mac_add_interface(struct ieee80211_hw *hw,</div><div class='del'>-			  struct ieee80211_vif *vif);</div><div class='del'>-void iwlagn_mac_remove_interface(struct ieee80211_hw *hw,</div><div class='del'>-			      struct ieee80211_vif *vif);</div><div class='del'>-int iwlagn_mac_change_interface(struct ieee80211_hw *hw,</div><div class='del'>-			     struct ieee80211_vif *vif,</div><div class='del'>-			     enum nl80211_iftype newtype, bool newp2p);</div><div class='ctx'> int iwl_cmd_echo_test(struct iwl_priv *priv);</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> int iwl_alloc_traffic_mem(struct iwl_priv *priv);</div><div class='hunk'>@@ -325,9 +240,6 @@ void iwl_init_scan_params(struct iwl_priv *priv);</div><div class='ctx'> int iwl_scan_cancel(struct iwl_priv *priv);</div><div class='ctx'> void iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms);</div><div class='ctx'> void iwl_force_scan_end(struct iwl_priv *priv);</div><div class='del'>-int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,</div><div class='del'>-		    struct ieee80211_vif *vif,</div><div class='del'>-		    struct cfg80211_scan_request *req);</div><div class='ctx'> void iwl_internal_short_hw_scan(struct iwl_priv *priv);</div><div class='ctx'> int iwl_force_reset(struct iwl_priv *priv, int mode, bool external);</div><div class='ctx'> u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame,</div><div class='hunk'>@@ -381,8 +293,8 @@ static inline const struct ieee80211_supported_band *iwl_get_hw_mode(</div><div class='ctx'> </div><div class='ctx'> static inline bool iwl_advanced_bt_coexist(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	return priv-&gt;cfg-&gt;bt_params &amp;&amp;</div><div class='del'>-	       priv-&gt;cfg-&gt;bt_params-&gt;advanced_bt_coexist;</div><div class='add'>+	return cfg(priv)-&gt;bt_params &amp;&amp;</div><div class='add'>+	       cfg(priv)-&gt;bt_params-&gt;advanced_bt_coexist;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_enable_rfkill_int(struct iwl_priv *priv)</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/iwlwifi/iwl-csr.h<br/>index b9f3267e720c..fbc3095c7b44 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-csr.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-csr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-csr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-csr.h</a></div><div class='hunk'>@@ -284,8 +284,8 @@</div><div class='ctx'> #define CSR_HW_REV_TYPE_6x35	       CSR_HW_REV_TYPE_6x05</div><div class='ctx'> #define CSR_HW_REV_TYPE_2x30	       (0x00000C0)</div><div class='ctx'> #define CSR_HW_REV_TYPE_2x00	       (0x0000100)</div><div class='del'>-#define CSR_HW_REV_TYPE_200	       (0x0000110)</div><div class='del'>-#define CSR_HW_REV_TYPE_230	       (0x0000120)</div><div class='add'>+#define CSR_HW_REV_TYPE_105	       (0x0000110)</div><div class='add'>+#define CSR_HW_REV_TYPE_135	       (0x0000120)</div><div class='ctx'> #define CSR_HW_REV_TYPE_NONE           (0x00001F0)</div><div class='ctx'> </div><div class='ctx'> /* EEPROM REG */</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h<br/>index 69a77e24d229..f8fc2393dd4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-debug.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-debug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-debug.h</a></div><div class='hunk'>@@ -47,20 +47,21 @@ do {									\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUG</div><div class='del'>-#define IWL_DEBUG(m, level, fmt, args...)				\</div><div class='add'>+#define IWL_DEBUG(m, level, fmt, ...)					\</div><div class='ctx'> do {									\</div><div class='ctx'> 	if (iwl_get_debug_level((m)-&gt;shrd) &amp; (level))			\</div><div class='del'>-		dev_printk(KERN_ERR, bus(m)-&gt;dev,			\</div><div class='del'>-			 "%c %s " fmt, in_interrupt() ? 'I' : 'U',	\</div><div class='del'>-			__func__ , ## args);				\</div><div class='add'>+		dev_err(bus(m)-&gt;dev, "%c %s " fmt,			\</div><div class='add'>+			in_interrupt() ? 'I' : 'U', __func__,		\</div><div class='add'>+			##__VA_ARGS__);					\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-#define IWL_DEBUG_LIMIT(m, level, fmt, args...)				\</div><div class='add'>+#define IWL_DEBUG_LIMIT(m, level, fmt, ...)				\</div><div class='ctx'> do {									\</div><div class='del'>-	if (iwl_get_debug_level((m)-&gt;shrd) &amp; (level) &amp;&amp; net_ratelimit())\</div><div class='del'>-		dev_printk(KERN_ERR, bus(m)-&gt;dev,			\</div><div class='del'>-			"%c %s " fmt, in_interrupt() ? 'I' : 'U',	\</div><div class='del'>-			 __func__ , ## args);				\</div><div class='add'>+	if (iwl_get_debug_level((m)-&gt;shrd) &amp; (level) &amp;&amp;			\</div><div class='add'>+	    net_ratelimit())						\</div><div class='add'>+		dev_err(bus(m)-&gt;dev, "%c %s " fmt,			\</div><div class='add'>+			in_interrupt() ? 'I' : 'U', __func__,		\</div><div class='add'>+			##__VA_ARGS__);					\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> #define iwl_print_hex_dump(m, level, p, len)				\</div><div class='hunk'>@@ -70,10 +71,29 @@ do {                                            			\</div><div class='ctx'> 			       DUMP_PREFIX_OFFSET, 16, 1, p, len, 1);	\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='add'>+#define IWL_DEBUG_QUIET_RFKILL(p, fmt, ...)				\</div><div class='add'>+do {									\</div><div class='add'>+	if (!iwl_is_rfkill(p-&gt;shrd))					\</div><div class='add'>+		dev_err(bus(p)-&gt;dev, "%s%c %s " fmt,			\</div><div class='add'>+			"",						\</div><div class='add'>+			in_interrupt() ? 'I' : 'U', __func__,		\</div><div class='add'>+			##__VA_ARGS__);					\</div><div class='add'>+	else if	(iwl_get_debug_level(p-&gt;shrd) &amp; IWL_DL_RADIO)		\</div><div class='add'>+		dev_err(bus(p)-&gt;dev, "%s%c %s " fmt,			\</div><div class='add'>+			"(RFKILL) ",					\</div><div class='add'>+			in_interrupt() ? 'I' : 'U', __func__,		\</div><div class='add'>+			##__VA_ARGS__);					\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> #define IWL_DEBUG(m, level, fmt, args...)</div><div class='ctx'> #define IWL_DEBUG_LIMIT(m, level, fmt, args...)</div><div class='ctx'> #define iwl_print_hex_dump(m, level, p, len)</div><div class='add'>+#define IWL_DEBUG_QUIET_RFKILL(p, fmt, args...)	\</div><div class='add'>+do {							\</div><div class='add'>+	if (!iwl_is_rfkill(p-&gt;shrd))			\</div><div class='add'>+		IWL_ERR(p, fmt, ##args);		\</div><div class='add'>+} while (0)</div><div class='ctx'> #endif				/* CONFIG_IWLWIFI_DEBUG */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='hunk'>@@ -114,48 +134,43 @@ static inline void iwl_dbgfs_unregister(struct iwl_priv *priv)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* 0x0000000F - 0x00000001 */</div><div class='del'>-#define IWL_DL_INFO		(1 &lt;&lt; 0)</div><div class='del'>-#define IWL_DL_MAC80211		(1 &lt;&lt; 1)</div><div class='del'>-#define IWL_DL_HCMD		(1 &lt;&lt; 2)</div><div class='del'>-#define IWL_DL_STATE		(1 &lt;&lt; 3)</div><div class='add'>+#define IWL_DL_INFO		0x00000001</div><div class='add'>+#define IWL_DL_MAC80211		0x00000002</div><div class='add'>+#define IWL_DL_HCMD		0x00000004</div><div class='add'>+#define IWL_DL_STATE		0x00000008</div><div class='ctx'> /* 0x000000F0 - 0x00000010 */</div><div class='del'>-#define IWL_DL_MACDUMP		(1 &lt;&lt; 4)</div><div class='del'>-#define IWL_DL_HCMD_DUMP	(1 &lt;&lt; 5)</div><div class='del'>-#define IWL_DL_EEPROM		(1 &lt;&lt; 6)</div><div class='del'>-#define IWL_DL_RADIO		(1 &lt;&lt; 7)</div><div class='add'>+#define IWL_DL_EEPROM		0x00000040</div><div class='add'>+#define IWL_DL_RADIO		0x00000080</div><div class='ctx'> /* 0x00000F00 - 0x00000100 */</div><div class='del'>-#define IWL_DL_POWER		(1 &lt;&lt; 8)</div><div class='del'>-#define IWL_DL_TEMP		(1 &lt;&lt; 9)</div><div class='del'>-/* reserved (1 &lt;&lt; 10) */</div><div class='del'>-#define IWL_DL_SCAN		(1 &lt;&lt; 11)</div><div class='add'>+#define IWL_DL_POWER		0x00000100</div><div class='add'>+#define IWL_DL_TEMP		0x00000200</div><div class='add'>+#define IWL_DL_SCAN		0x00000800</div><div class='ctx'> /* 0x0000F000 - 0x00001000 */</div><div class='del'>-#define IWL_DL_ASSOC		(1 &lt;&lt; 12)</div><div class='del'>-#define IWL_DL_DROP		(1 &lt;&lt; 13)</div><div class='del'>-/* reserved (1 &lt;&lt; 14) */</div><div class='del'>-#define IWL_DL_COEX		(1 &lt;&lt; 15)</div><div class='add'>+#define IWL_DL_ASSOC		0x00001000</div><div class='add'>+#define IWL_DL_DROP		0x00002000</div><div class='add'>+#define IWL_DL_COEX		0x00008000</div><div class='ctx'> /* 0x000F0000 - 0x00010000 */</div><div class='del'>-#define IWL_DL_FW		(1 &lt;&lt; 16)</div><div class='del'>-#define IWL_DL_RF_KILL		(1 &lt;&lt; 17)</div><div class='del'>-#define IWL_DL_FW_ERRORS	(1 &lt;&lt; 18)</div><div class='del'>-#define IWL_DL_LED		(1 &lt;&lt; 19)</div><div class='add'>+#define IWL_DL_FW		0x00010000</div><div class='add'>+#define IWL_DL_RF_KILL		0x00020000</div><div class='add'>+#define IWL_DL_FW_ERRORS	0x00040000</div><div class='add'>+#define IWL_DL_LED		0x00080000</div><div class='ctx'> /* 0x00F00000 - 0x00100000 */</div><div class='del'>-#define IWL_DL_RATE		(1 &lt;&lt; 20)</div><div class='del'>-#define IWL_DL_CALIB		(1 &lt;&lt; 21)</div><div class='del'>-#define IWL_DL_WEP		(1 &lt;&lt; 22)</div><div class='del'>-#define IWL_DL_TX		(1 &lt;&lt; 23)</div><div class='add'>+#define IWL_DL_RATE		0x00100000</div><div class='add'>+#define IWL_DL_CALIB		0x00200000</div><div class='add'>+#define IWL_DL_WEP		0x00400000</div><div class='add'>+#define IWL_DL_TX		0x00800000</div><div class='ctx'> /* 0x0F000000 - 0x01000000 */</div><div class='del'>-#define IWL_DL_RX		(1 &lt;&lt; 24)</div><div class='del'>-#define IWL_DL_ISR		(1 &lt;&lt; 25)</div><div class='del'>-#define IWL_DL_HT		(1 &lt;&lt; 26)</div><div class='add'>+#define IWL_DL_RX		0x01000000</div><div class='add'>+#define IWL_DL_ISR		0x02000000</div><div class='add'>+#define IWL_DL_HT		0x04000000</div><div class='ctx'> /* 0xF0000000 - 0x10000000 */</div><div class='del'>-#define IWL_DL_11H		(1 &lt;&lt; 28)</div><div class='del'>-#define IWL_DL_STATS		(1 &lt;&lt; 29)</div><div class='del'>-#define IWL_DL_TX_REPLY		(1 &lt;&lt; 30)</div><div class='del'>-#define IWL_DL_QOS		(1 &lt;&lt; 31)</div><div class='add'>+#define IWL_DL_11H		0x10000000</div><div class='add'>+#define IWL_DL_STATS		0x20000000</div><div class='add'>+#define IWL_DL_TX_REPLY		0x40000000</div><div class='add'>+#define IWL_DL_TX_QUEUES	0x80000000</div><div class='ctx'> </div><div class='ctx'> #define IWL_DEBUG_INFO(p, f, a...)	IWL_DEBUG(p, IWL_DL_INFO, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_MAC80211(p, f, a...)	IWL_DEBUG(p, IWL_DL_MAC80211, f, ## a)</div><div class='del'>-#define IWL_DEBUG_MACDUMP(p, f, a...)	IWL_DEBUG(p, IWL_DL_MACDUMP, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_TEMP(p, f, a...)	IWL_DEBUG(p, IWL_DL_TEMP, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_SCAN(p, f, a...)	IWL_DEBUG(p, IWL_DL_SCAN, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_RX(p, f, a...)	IWL_DEBUG(p, IWL_DL_RX, f, ## a)</div><div class='hunk'>@@ -164,7 +179,6 @@ static inline void iwl_dbgfs_unregister(struct iwl_priv *priv)</div><div class='ctx'> #define IWL_DEBUG_LED(p, f, a...)	IWL_DEBUG(p, IWL_DL_LED, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_WEP(p, f, a...)	IWL_DEBUG(p, IWL_DL_WEP, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_HC(p, f, a...)	IWL_DEBUG(p, IWL_DL_HCMD, f, ## a)</div><div class='del'>-#define IWL_DEBUG_HC_DUMP(p, f, a...)	IWL_DEBUG(p, IWL_DL_HCMD_DUMP, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_EEPROM(p, f, a...)	IWL_DEBUG(p, IWL_DL_EEPROM, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_CALIB(p, f, a...)	IWL_DEBUG(p, IWL_DL_CALIB, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_FW(p, f, a...)	IWL_DEBUG(p, IWL_DL_FW, f, ## a)</div><div class='hunk'>@@ -186,9 +200,7 @@ static inline void iwl_dbgfs_unregister(struct iwl_priv *priv)</div><div class='ctx'> #define IWL_DEBUG_STATS_LIMIT(p, f, a...)	\</div><div class='ctx'> 		IWL_DEBUG_LIMIT(p, IWL_DL_STATS, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_TX_REPLY(p, f, a...)	IWL_DEBUG(p, IWL_DL_TX_REPLY, f, ## a)</div><div class='del'>-#define IWL_DEBUG_TX_REPLY_LIMIT(p, f, a...) \</div><div class='del'>-		IWL_DEBUG_LIMIT(p, IWL_DL_TX_REPLY, f, ## a)</div><div class='del'>-#define IWL_DEBUG_QOS(p, f, a...)	IWL_DEBUG(p, IWL_DL_QOS, f, ## a)</div><div class='add'>+#define IWL_DEBUG_TX_QUEUES(p, f, a...)	IWL_DEBUG(p, IWL_DL_TX_QUEUES, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_RADIO(p, f, a...)	IWL_DEBUG(p, IWL_DL_RADIO, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_POWER(p, f, a...)	IWL_DEBUG(p, IWL_DL_POWER, f, ## a)</div><div class='ctx'> #define IWL_DEBUG_11H(p, f, a...)	IWL_DEBUG(p, IWL_DL_11H, f, ## a)</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c<br/>index a1670e3f8bfa..04a3343f4610 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-debugfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-debugfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-debugfs.c</a></div><div class='hunk'>@@ -234,11 +234,12 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	/* default is to dump the entire data segment */</div><div class='ctx'> 	if (!priv-&gt;dbgfs_sram_offset &amp;&amp; !priv-&gt;dbgfs_sram_len) {</div><div class='add'>+		struct iwl_trans *trans = trans(priv);</div><div class='ctx'> 		priv-&gt;dbgfs_sram_offset = 0x800000;</div><div class='del'>-		if (priv-&gt;ucode_type == IWL_UCODE_INIT)</div><div class='del'>-			priv-&gt;dbgfs_sram_len = priv-&gt;ucode_init.data.len;</div><div class='add'>+		if (trans-&gt;shrd-&gt;ucode_type == IWL_UCODE_INIT)</div><div class='add'>+			priv-&gt;dbgfs_sram_len = trans-&gt;ucode_init.data.len;</div><div class='ctx'> 		else</div><div class='del'>-			priv-&gt;dbgfs_sram_len = priv-&gt;ucode_rt.data.len;</div><div class='add'>+			priv-&gt;dbgfs_sram_len = trans-&gt;ucode_rt.data.len;</div><div class='ctx'> 	}</div><div class='ctx'> 	len = priv-&gt;dbgfs_sram_len;</div><div class='ctx'> </div><div class='hunk'>@@ -341,7 +342,7 @@ static ssize_t iwl_dbgfs_wowlan_sram_read(struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos,</div><div class='ctx'> 				       priv-&gt;wowlan_sram,</div><div class='del'>-				       priv-&gt;ucode_wowlan.data.len);</div><div class='add'>+				       trans(priv)-&gt;ucode_wowlan.data.len);</div><div class='ctx'> }</div><div class='ctx'> static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 					size_t count, loff_t *ppos)</div><div class='hunk'>@@ -371,15 +372,13 @@ static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 				 i, station-&gt;sta.sta.addr,</div><div class='ctx'> 				 station-&gt;sta.station_flags_msk);</div><div class='ctx'> 		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				"TID\tseq_num\ttxq_id\ttfds\trate_n_flags\n");</div><div class='add'>+				"TID\tseq_num\trate_n_flags\n");</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; IWL_MAX_TID_COUNT; j++) {</div><div class='del'>-			tid_data = &amp;priv-&gt;shrd-&gt;tid_data[i][j];</div><div class='add'>+			tid_data = &amp;priv-&gt;tid_data[i][j];</div><div class='ctx'> 			pos += scnprintf(buf + pos, bufsz - pos,</div><div class='del'>-				"%d:\t%#x\t%#x\t%u\t%#x",</div><div class='add'>+				"%d:\t%#x\t%#x",</div><div class='ctx'> 				j, tid_data-&gt;seq_number,</div><div class='del'>-				tid_data-&gt;agg.txq_id,</div><div class='del'>-				tid_data-&gt;tfds_in_queue,</div><div class='ctx'> 				tid_data-&gt;agg.rate_n_flags);</div><div class='ctx'> </div><div class='ctx'> 			if (tid_data-&gt;agg.wait_for_ba)</div><div class='hunk'>@@ -407,7 +406,7 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file,</div><div class='ctx'> 	const u8 *ptr;</div><div class='ctx'> 	char *buf;</div><div class='ctx'> 	u16 eeprom_ver;</div><div class='del'>-	size_t eeprom_len = priv-&gt;cfg-&gt;base_params-&gt;eeprom_size;</div><div class='add'>+	size_t eeprom_len = cfg(priv)-&gt;base_params-&gt;eeprom_size;</div><div class='ctx'> 	buf_size = 4 * eeprom_len + 256;</div><div class='ctx'> </div><div class='ctx'> 	if (eeprom_len % 16) {</div><div class='hunk'>@@ -415,7 +414,7 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file,</div><div class='ctx'> 		return -ENODATA;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ptr = priv-&gt;eeprom;</div><div class='add'>+	ptr = priv-&gt;shrd-&gt;eeprom;</div><div class='ctx'> 	if (!ptr) {</div><div class='ctx'> 		IWL_ERR(priv, "Invalid EEPROM/OTP memory\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -427,10 +426,10 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file,</div><div class='ctx'> 		IWL_ERR(priv, "Can not allocate Buffer\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	eeprom_ver = iwl_eeprom_query16(priv, EEPROM_VERSION);</div><div class='add'>+	eeprom_ver = iwl_eeprom_query16(priv-&gt;shrd, EEPROM_VERSION);</div><div class='ctx'> 	pos += scnprintf(buf + pos, buf_size - pos, "NVM Type: %s, "</div><div class='ctx'> 			"version: 0x%x\n",</div><div class='del'>-			(priv-&gt;nvm_device_type == NVM_DEVICE_TYPE_OTP)</div><div class='add'>+			(trans(priv)-&gt;nvm_device_type == NVM_DEVICE_TYPE_OTP)</div><div class='ctx'> 			 ? "OTP" : "EEPROM", eeprom_ver);</div><div class='ctx'> 	for (ofs = 0 ; ofs &lt; eeprom_len ; ofs += 16) {</div><div class='ctx'> 		pos += scnprintf(buf + pos, buf_size - pos, "0x%.4x ", ofs);</div><div class='hunk'>@@ -1541,15 +1540,15 @@ static ssize_t iwl_dbgfs_ucode_tx_stats_read(struct file *file,</div><div class='ctx'> 	if (tx-&gt;tx_power.ant_a || tx-&gt;tx_power.ant_b || tx-&gt;tx_power.ant_c) {</div><div class='ctx'> 		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='ctx'> 			"tx power: (1/2 dB step)\n");</div><div class='del'>-		if ((priv-&gt;cfg-&gt;valid_tx_ant &amp; ANT_A) &amp;&amp; tx-&gt;tx_power.ant_a)</div><div class='add'>+		if ((cfg(priv)-&gt;valid_tx_ant &amp; ANT_A) &amp;&amp; tx-&gt;tx_power.ant_a)</div><div class='ctx'> 			pos += scnprintf(buf + pos, bufsz - pos,</div><div class='ctx'> 					fmt_hex, "antenna A:",</div><div class='ctx'> 					tx-&gt;tx_power.ant_a);</div><div class='del'>-		if ((priv-&gt;cfg-&gt;valid_tx_ant &amp; ANT_B) &amp;&amp; tx-&gt;tx_power.ant_b)</div><div class='add'>+		if ((cfg(priv)-&gt;valid_tx_ant &amp; ANT_B) &amp;&amp; tx-&gt;tx_power.ant_b)</div><div class='ctx'> 			pos += scnprintf(buf + pos, bufsz - pos,</div><div class='ctx'> 					fmt_hex, "antenna B:",</div><div class='ctx'> 					tx-&gt;tx_power.ant_b);</div><div class='del'>-		if ((priv-&gt;cfg-&gt;valid_tx_ant &amp; ANT_C) &amp;&amp; tx-&gt;tx_power.ant_c)</div><div class='add'>+		if ((cfg(priv)-&gt;valid_tx_ant &amp; ANT_C) &amp;&amp; tx-&gt;tx_power.ant_c)</div><div class='ctx'> 			pos += scnprintf(buf + pos, bufsz - pos,</div><div class='ctx'> 					fmt_hex, "antenna C:",</div><div class='ctx'> 					tx-&gt;tx_power.ant_c);</div><div class='hunk'>@@ -2220,7 +2219,7 @@ static ssize_t iwl_dbgfs_plcp_delta_read(struct file *file,</div><div class='ctx'> 	const size_t bufsz = sizeof(buf);</div><div class='ctx'> </div><div class='ctx'> 	pos += scnprintf(buf + pos, bufsz - pos, "%u\n",</div><div class='del'>-			priv-&gt;cfg-&gt;base_params-&gt;plcp_delta_threshold);</div><div class='add'>+			cfg(priv)-&gt;base_params-&gt;plcp_delta_threshold);</div><div class='ctx'> </div><div class='ctx'> 	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);</div><div class='ctx'> }</div><div class='hunk'>@@ -2242,10 +2241,10 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if ((plcp &lt; IWL_MAX_PLCP_ERR_THRESHOLD_MIN) ||</div><div class='ctx'> 		(plcp &gt; IWL_MAX_PLCP_ERR_THRESHOLD_MAX))</div><div class='del'>-		priv-&gt;cfg-&gt;base_params-&gt;plcp_delta_threshold =</div><div class='add'>+		cfg(priv)-&gt;base_params-&gt;plcp_delta_threshold =</div><div class='ctx'> 			IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE;</div><div class='ctx'> 	else</div><div class='del'>-		priv-&gt;cfg-&gt;base_params-&gt;plcp_delta_threshold = plcp;</div><div class='add'>+		cfg(priv)-&gt;base_params-&gt;plcp_delta_threshold = plcp;</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2347,7 +2346,7 @@ static ssize_t iwl_dbgfs_wd_timeout_write(struct file *file,</div><div class='ctx'> 	if (timeout &lt; 0 || timeout &gt; IWL_MAX_WD_TIMEOUT)</div><div class='ctx'> 		timeout = IWL_DEF_WD_TIMEOUT;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;cfg-&gt;base_params-&gt;wd_timeout = timeout;</div><div class='add'>+	cfg(priv)-&gt;base_params-&gt;wd_timeout = timeout;</div><div class='ctx'> 	iwl_setup_watchdog(priv);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -2407,10 +2406,10 @@ static ssize_t iwl_dbgfs_protection_mode_read(struct file *file,</div><div class='ctx'> 	char buf[40];</div><div class='ctx'> 	const size_t bufsz = sizeof(buf);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;ht_params)</div><div class='add'>+	if (cfg(priv)-&gt;ht_params)</div><div class='ctx'> 		pos += scnprintf(buf + pos, bufsz - pos,</div><div class='ctx'> 			 "use %s for aggregation\n",</div><div class='del'>-			 (priv-&gt;cfg-&gt;ht_params-&gt;use_rts_for_aggregation) ?</div><div class='add'>+			 (cfg(priv)-&gt;ht_params-&gt;use_rts_for_aggregation) ?</div><div class='ctx'> 				"rts/cts" : "cts-to-self");</div><div class='ctx'> 	else</div><div class='ctx'> 		pos += scnprintf(buf + pos, bufsz - pos, "N/A");</div><div class='hunk'>@@ -2427,7 +2426,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,</div><div class='ctx'> 	int buf_size;</div><div class='ctx'> 	int rts;</div><div class='ctx'> </div><div class='del'>-	if (!priv-&gt;cfg-&gt;ht_params)</div><div class='add'>+	if (!cfg(priv)-&gt;ht_params)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	memset(buf, 0, sizeof(buf));</div><div class='hunk'>@@ -2437,9 +2436,9 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,</div><div class='ctx'> 	if (sscanf(buf, "%d", &amp;rts) != 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (rts)</div><div class='del'>-		priv-&gt;cfg-&gt;ht_params-&gt;use_rts_for_aggregation = true;</div><div class='add'>+		cfg(priv)-&gt;ht_params-&gt;use_rts_for_aggregation = true;</div><div class='ctx'> 	else</div><div class='del'>-		priv-&gt;cfg-&gt;ht_params-&gt;use_rts_for_aggregation = false;</div><div class='add'>+		cfg(priv)-&gt;ht_params-&gt;use_rts_for_aggregation = false;</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h<br/>index 6c00a447963d..e54a4d11e584 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-dev.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-dev.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-dev.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-dev.h</a></div><div class='hunk'>@@ -60,11 +60,10 @@ struct iwl_tx_queue;</div><div class='ctx'> </div><div class='ctx'> /* Default noise level to report when noise measurement is not available.</div><div class='ctx'>  *   This may be because we're:</div><div class='del'>- *   1)  Not associated (4965, no beacon statistics being sent to driver)</div><div class='add'>+ *   1)  Not associated  no beacon statistics being sent to driver)</div><div class='ctx'>  *   2)  Scanning (noise measurement does not apply to associated channel)</div><div class='del'>- *   3)  Receiving CCK (3945 delivers noise info only for OFDM frames)</div><div class='ctx'>  * Use default noise value of -127 ... this is below the range of measurable</div><div class='del'>- *   Rx dBm for either 3945 or 4965, so it can indicate "unmeasurable" to user.</div><div class='add'>+ *   Rx dBm for all agn devices, so it can indicate "unmeasurable" to user.</div><div class='ctx'>  *   Also, -127 works better than 0 when averaging frames with/without</div><div class='ctx'>  *   noise info (e.g. averaging might be done in app); measured dBm values are</div><div class='ctx'>  *   always negative ... using a negative value as the default keeps all</div><div class='hunk'>@@ -190,6 +189,69 @@ struct iwl_qos_info {</div><div class='ctx'> 	struct iwl_qosparam_cmd def_qos_parm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * enum iwl_agg_state</div><div class='add'>+ *</div><div class='add'>+ * The state machine of the BA agreement establishment / tear down.</div><div class='add'>+ * These states relate to a specific RA / TID.</div><div class='add'>+ *</div><div class='add'>+ * @IWL_AGG_OFF: aggregation is not used</div><div class='add'>+ * @IWL_AGG_ON: aggregation session is up</div><div class='add'>+ * @IWL_EMPTYING_HW_QUEUE_ADDBA: establishing a BA session - waiting for the</div><div class='add'>+ *	HW queue to be empty from packets for this RA /TID.</div><div class='add'>+ * @IWL_EMPTYING_HW_QUEUE_DELBA: tearing down a BA session - waiting for the</div><div class='add'>+ *	HW queue to be empty from packets for this RA /TID.</div><div class='add'>+ */</div><div class='add'>+enum iwl_agg_state {</div><div class='add'>+	IWL_AGG_OFF = 0,</div><div class='add'>+	IWL_AGG_ON,</div><div class='add'>+	IWL_EMPTYING_HW_QUEUE_ADDBA,</div><div class='add'>+	IWL_EMPTYING_HW_QUEUE_DELBA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_ht_agg - aggregation state machine</div><div class='add'>+</div><div class='add'>+ * This structs holds the states for the BA agreement establishment and tear</div><div class='add'>+ * down. It also holds the state during the BA session itself. This struct is</div><div class='add'>+ * duplicated for each RA / TID.</div><div class='add'>+</div><div class='add'>+ * @rate_n_flags: Rate at which Tx was attempted. Holds the data between the</div><div class='add'>+ *	Tx response (REPLY_TX), and the block ack notification</div><div class='add'>+ *	(REPLY_COMPRESSED_BA).</div><div class='add'>+ * @state: state of the BA agreement establishment / tear down.</div><div class='add'>+ * @txq_id: Tx queue used by the BA session - used by the transport layer.</div><div class='add'>+ *	Needed by the upper layer for debugfs only.</div><div class='add'>+ * @ssn: the first packet to be sent in AGG HW queue in Tx AGG start flow, or</div><div class='add'>+ *	the first packet to be sent in legacy HW queue in Tx AGG stop flow.</div><div class='add'>+ *	Basically when next_reclaimed reaches ssn, we can tell mac80211 that</div><div class='add'>+ *	we are ready to finish the Tx AGG stop / start flow.</div><div class='add'>+ * @wait_for_ba: Expect block-ack before next Tx reply</div><div class='add'>+ */</div><div class='add'>+struct iwl_ht_agg {</div><div class='add'>+	u32 rate_n_flags;</div><div class='add'>+	enum iwl_agg_state state;</div><div class='add'>+	u16 txq_id;</div><div class='add'>+	u16 ssn;</div><div class='add'>+	bool wait_for_ba;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_tid_data - one for each RA / TID</div><div class='add'>+</div><div class='add'>+ * This structs holds the states for each RA / TID.</div><div class='add'>+</div><div class='add'>+ * @seq_number: the next WiFi sequence number to use</div><div class='add'>+ * @next_reclaimed: the WiFi sequence number of the next packet to be acked.</div><div class='add'>+ *	This is basically (last acked packet++).</div><div class='add'>+ * @agg: aggregation state machine</div><div class='add'>+ */</div><div class='add'>+struct iwl_tid_data {</div><div class='add'>+	u16 seq_number;</div><div class='add'>+	u16 next_reclaimed;</div><div class='add'>+	struct iwl_ht_agg agg;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Structure should be accessed with sta_lock held. When station addition</div><div class='ctx'>  * is in progress (IWL_STA_UCODE_INPROGRESS) it is possible to access only</div><div class='hunk'>@@ -230,17 +292,6 @@ struct iwl_vif_priv {</div><div class='ctx'> 	u8 ibss_bssid_sta_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* one for each uCode image (inst/data, boot/init/runtime) */</div><div class='del'>-struct fw_desc {</div><div class='del'>-	void *v_addr;		/* access by driver */</div><div class='del'>-	dma_addr_t p_addr;	/* access by card's busmaster DMA */</div><div class='del'>-	u32 len;		/* bytes */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct fw_img {</div><div class='del'>-	struct fw_desc code, data;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* v1/v2 uCode file layout */</div><div class='ctx'> struct iwl_ucode_header {</div><div class='ctx'> 	__le32 ver;	/* major/minor/API/serial */</div><div class='hunk'>@@ -452,29 +503,6 @@ enum iwlagn_chain_noise_state {</div><div class='ctx'> 	IWL_CHAIN_NOISE_DONE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * enum iwl_calib</div><div class='del'>- * defines the order in which results of initial calibrations</div><div class='del'>- * should be sent to the runtime uCode</div><div class='del'>- */</div><div class='del'>-enum iwl_calib {</div><div class='del'>-	IWL_CALIB_XTAL,</div><div class='del'>-	IWL_CALIB_DC,</div><div class='del'>-	IWL_CALIB_LO,</div><div class='del'>-	IWL_CALIB_TX_IQ,</div><div class='del'>-	IWL_CALIB_TX_IQ_PERD,</div><div class='del'>-	IWL_CALIB_BASE_BAND,</div><div class='del'>-	IWL_CALIB_TEMP_OFFSET,</div><div class='del'>-	IWL_CALIB_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Opaque calibration results */</div><div class='del'>-struct iwl_calib_result {</div><div class='del'>-	void *buf;</div><div class='del'>-	size_t buf_len;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Sensitivity calib data */</div><div class='ctx'> struct iwl_sensitivity_data {</div><div class='ctx'> 	u32 auto_corr_ofdm;</div><div class='hunk'>@@ -547,16 +575,6 @@ enum iwl_access_mode {</div><div class='ctx'> 	IWL_OTP_ACCESS_RELATIVE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * enum iwl_pa_type - Power Amplifier type</div><div class='del'>- * @IWL_PA_SYSTEM:  based on uCode configuration</div><div class='del'>- * @IWL_PA_INTERNAL: use Internal only</div><div class='del'>- */</div><div class='del'>-enum iwl_pa_type {</div><div class='del'>-	IWL_PA_SYSTEM = 0,</div><div class='del'>-	IWL_PA_INTERNAL = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* reply_tx_statistics (for _agn devices) */</div><div class='ctx'> struct reply_tx_error_statistics {</div><div class='ctx'> 	u32 pp_delay;</div><div class='hunk'>@@ -714,35 +732,6 @@ struct iwl_force_reset {</div><div class='ctx'>  */</div><div class='ctx'> #define IWLAGN_EXT_BEACON_TIME_POS	22</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct iwl_notification_wait - notification wait entry</div><div class='del'>- * @list: list head for global list</div><div class='del'>- * @fn: function called with the notification</div><div class='del'>- * @cmd: command ID</div><div class='del'>- *</div><div class='del'>- * This structure is not used directly, to wait for a</div><div class='del'>- * notification declare it on the stack, and call</div><div class='del'>- * iwlagn_init_notification_wait() with appropriate</div><div class='del'>- * parameters. Then do whatever will cause the ucode</div><div class='del'>- * to notify the driver, and to wait for that then</div><div class='del'>- * call iwlagn_wait_notification().</div><div class='del'>- *</div><div class='del'>- * Each notification is one-shot. If at some point we</div><div class='del'>- * need to support multi-shot notifications (which</div><div class='del'>- * can't be allocated on the stack) we need to modify</div><div class='del'>- * the code for them.</div><div class='del'>- */</div><div class='del'>-struct iwl_notification_wait {</div><div class='del'>-	struct list_head list;</div><div class='del'>-</div><div class='del'>-	void (*fn)(struct iwl_priv *priv, struct iwl_rx_packet *pkt,</div><div class='del'>-		   void *data);</div><div class='del'>-	void *fn_data;</div><div class='del'>-</div><div class='del'>-	u8 cmd;</div><div class='del'>-	bool triggered, aborted;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct iwl_rxon_context {</div><div class='ctx'> 	struct ieee80211_vif *vif;</div><div class='ctx'> </div><div class='hunk'>@@ -805,14 +794,7 @@ enum iwl_scan_type {</div><div class='ctx'> 	IWL_SCAN_ROC,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum iwlagn_ucode_type {</div><div class='del'>-	IWL_UCODE_NONE,</div><div class='del'>-	IWL_UCODE_REGULAR,</div><div class='del'>-	IWL_UCODE_INIT,</div><div class='del'>-	IWL_UCODE_WOWLAN,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE</div><div class='ctx'> struct iwl_testmode_trace {</div><div class='ctx'> 	u32 buff_size;</div><div class='ctx'> 	u32 total_size;</div><div class='hunk'>@@ -822,8 +804,20 @@ struct iwl_testmode_trace {</div><div class='ctx'> 	dma_addr_t dma_addr;</div><div class='ctx'> 	bool trace_enabled;</div><div class='ctx'> };</div><div class='add'>+struct iwl_testmode_sram {</div><div class='add'>+	u32 buff_size;</div><div class='add'>+	u32 num_chunks;</div><div class='add'>+	u8 *buff_addr;</div><div class='add'>+	bool sram_readed;</div><div class='add'>+};</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+struct iwl_wipan_noa_data {</div><div class='add'>+	struct rcu_head rcu_head;</div><div class='add'>+	u32 length;</div><div class='add'>+	u8 data[];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct iwl_priv {</div><div class='ctx'> </div><div class='ctx'> 	/*data shared among all the driver's layers */</div><div class='hunk'>@@ -835,7 +829,6 @@ struct iwl_priv {</div><div class='ctx'> 	struct ieee80211_channel *ieee_channels;</div><div class='ctx'> 	struct ieee80211_rate *ieee_rates;</div><div class='ctx'> 	struct kmem_cache *tx_cmd_pool;</div><div class='del'>-	struct iwl_cfg *cfg;</div><div class='ctx'> </div><div class='ctx'> 	enum ieee80211_band band;</div><div class='ctx'> </div><div class='hunk'>@@ -880,8 +873,7 @@ struct iwl_priv {</div><div class='ctx'> 	s32 temperature;	/* Celsius */</div><div class='ctx'> 	s32 last_temperature;</div><div class='ctx'> </div><div class='del'>-	/* init calibration results */</div><div class='del'>-	struct iwl_calib_result calib_results[IWL_CALIB_MAX];</div><div class='add'>+	struct iwl_wipan_noa_data __rcu *noa_data;</div><div class='ctx'> </div><div class='ctx'> 	/* Scan related variables */</div><div class='ctx'> 	unsigned long scan_start;</div><div class='hunk'>@@ -907,23 +899,12 @@ struct iwl_priv {</div><div class='ctx'> 	u32 ucode_ver;			/* version of ucode, copy of</div><div class='ctx'> 					   iwl_ucode.ver */</div><div class='ctx'> </div><div class='del'>-	struct fw_img ucode_rt;</div><div class='del'>-	struct fw_img ucode_init;</div><div class='del'>-	struct fw_img ucode_wowlan;</div><div class='del'>-</div><div class='del'>-	enum iwlagn_ucode_type ucode_type;</div><div class='del'>-	u8 ucode_write_complete;	/* the image write is complete */</div><div class='ctx'> 	char firmware_name[25];</div><div class='ctx'> </div><div class='ctx'> 	struct iwl_rxon_context contexts[NUM_IWL_RXON_CTX];</div><div class='ctx'> </div><div class='ctx'> 	__le16 switch_channel;</div><div class='ctx'> </div><div class='del'>-	struct {</div><div class='del'>-		u32 error_event_table;</div><div class='del'>-		u32 log_event_table;</div><div class='del'>-	} device_pointers;</div><div class='del'>-</div><div class='ctx'> 	u16 active_rate;</div><div class='ctx'> </div><div class='ctx'> 	u8 start_calib;</div><div class='hunk'>@@ -951,17 +932,13 @@ struct iwl_priv {</div><div class='ctx'> 	int num_stations;</div><div class='ctx'> 	struct iwl_station_entry stations[IWLAGN_STATION_COUNT];</div><div class='ctx'> 	unsigned long ucode_key_table;</div><div class='add'>+	struct iwl_tid_data tid_data[IWLAGN_STATION_COUNT][IWL_MAX_TID_COUNT];</div><div class='ctx'> </div><div class='ctx'> 	u8 mac80211_registered;</div><div class='ctx'> </div><div class='ctx'> 	/* Indication if ieee80211_ops-&gt;open has been called */</div><div class='ctx'> 	u8 is_open;</div><div class='ctx'> </div><div class='del'>-	/* eeprom -- this is in the card's little endian byte order */</div><div class='del'>-	u8 *eeprom;</div><div class='del'>-	int    nvm_device_type;</div><div class='del'>-	struct iwl_eeprom_calib_info *calib_info;</div><div class='del'>-</div><div class='ctx'> 	enum nl80211_iftype iw_mode;</div><div class='ctx'> </div><div class='ctx'> 	/* Last Rx'd beacon timestamp */</div><div class='hunk'>@@ -1017,10 +994,6 @@ struct iwl_priv {</div><div class='ctx'> 	/* counts reply_tx error */</div><div class='ctx'> 	struct reply_tx_error_statistics reply_tx_stats;</div><div class='ctx'> 	struct reply_agg_tx_error_statistics reply_agg_tx_stats;</div><div class='del'>-	/* notification wait support */</div><div class='del'>-	struct list_head notif_waits;</div><div class='del'>-	spinlock_t notif_wait_lock;</div><div class='del'>-	wait_queue_head_t notif_waitq;</div><div class='ctx'> </div><div class='ctx'> 	/* remain-on-channel offload support */</div><div class='ctx'> 	struct ieee80211_channel *hw_roc_channel;</div><div class='hunk'>@@ -1098,8 +1071,9 @@ struct iwl_priv {</div><div class='ctx'> 	struct led_classdev led;</div><div class='ctx'> 	unsigned long blink_on, blink_off;</div><div class='ctx'> 	bool led_registered;</div><div class='del'>-#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE</div><div class='ctx'> 	struct iwl_testmode_trace testmode_trace;</div><div class='add'>+	struct iwl_testmode_sram testmode_sram;</div><div class='ctx'> 	u32 tm_fixed_rate;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.c b/drivers/net/wireless/iwlwifi/iwl-devtrace.c<br/>index a635a7e75447..2a2c8de64a04 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-devtrace.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-devtrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-devtrace.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-devtrace.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> </div><div class='ctx'> /* sparse doesn't like tracepoint macros */</div><div class='ctx'> #ifndef __CHECKER__</div><div class='del'>-#include "iwl-dev.h"</div><div class='add'>+#include "iwl-trans.h"</div><div class='ctx'> </div><div class='ctx'> #define CREATE_TRACE_POINTS</div><div class='ctx'> #include "iwl-devtrace.h"</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.h b/drivers/net/wireless/iwlwifi/iwl-devtrace.h<br/>index 8a51c5ccda1e..9b212a8f30bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-devtrace.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-devtrace.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-devtrace.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-devtrace.h</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/tracepoint.h&gt;</div><div class='ctx'> </div><div class='del'>-struct iwl_priv;</div><div class='ctx'> </div><div class='ctx'> #if !defined(CONFIG_IWLWIFI_DEVICE_TRACING) || defined(__CHECKER__)</div><div class='ctx'> #undef TRACE_EVENT</div><div class='hunk'>@@ -37,14 +36,14 @@ struct iwl_priv;</div><div class='ctx'> static inline void trace_ ## name(proto) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define PRIV_ENTRY	__field(struct iwl_priv *, priv)</div><div class='add'>+#define PRIV_ENTRY	__field(void *, priv)</div><div class='ctx'> #define PRIV_ASSIGN	__entry-&gt;priv = priv</div><div class='ctx'> </div><div class='ctx'> #undef TRACE_SYSTEM</div><div class='ctx'> #define TRACE_SYSTEM iwlwifi_io</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(iwlwifi_dev_ioread32,</div><div class='del'>-	TP_PROTO(struct iwl_priv *priv, u32 offs, u32 val),</div><div class='add'>+	TP_PROTO(void *priv, u32 offs, u32 val),</div><div class='ctx'> 	TP_ARGS(priv, offs, val),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		PRIV_ENTRY</div><div class='hunk'>@@ -60,7 +59,7 @@ TRACE_EVENT(iwlwifi_dev_ioread32,</div><div class='ctx'> );</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(iwlwifi_dev_iowrite8,</div><div class='del'>-	TP_PROTO(struct iwl_priv *priv, u32 offs, u8 val),</div><div class='add'>+	TP_PROTO(void *priv, u32 offs, u8 val),</div><div class='ctx'> 	TP_ARGS(priv, offs, val),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		PRIV_ENTRY</div><div class='hunk'>@@ -76,7 +75,7 @@ TRACE_EVENT(iwlwifi_dev_iowrite8,</div><div class='ctx'> );</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(iwlwifi_dev_iowrite32,</div><div class='del'>-	TP_PROTO(struct iwl_priv *priv, u32 offs, u32 val),</div><div class='add'>+	TP_PROTO(void *priv, u32 offs, u32 val),</div><div class='ctx'> 	TP_ARGS(priv, offs, val),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		PRIV_ENTRY</div><div class='hunk'>@@ -91,11 +90,40 @@ TRACE_EVENT(iwlwifi_dev_iowrite32,</div><div class='ctx'> 	TP_printk("[%p] write io[%#x] = %#x)", __entry-&gt;priv, __entry-&gt;offs, __entry-&gt;val)</div><div class='ctx'> );</div><div class='ctx'> </div><div class='add'>+TRACE_EVENT(iwlwifi_dev_irq,</div><div class='add'>+	TP_PROTO(void *priv),</div><div class='add'>+	TP_ARGS(priv),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		PRIV_ENTRY</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		PRIV_ASSIGN;</div><div class='add'>+	),</div><div class='add'>+	/* TP_printk("") doesn't compile */</div><div class='add'>+	TP_printk("%d", 0)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(iwlwifi_dev_ict_read,</div><div class='add'>+	TP_PROTO(void *priv, u32 index, u32 value),</div><div class='add'>+	TP_ARGS(priv, index, value),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		PRIV_ENTRY</div><div class='add'>+		__field(u32, index)</div><div class='add'>+		__field(u32, value)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		PRIV_ASSIGN;</div><div class='add'>+		__entry-&gt;index = index;</div><div class='add'>+		__entry-&gt;value = value;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("read ict[%d] = %#.8x", __entry-&gt;index, __entry-&gt;value)</div><div class='add'>+);</div><div class='add'>+</div><div class='ctx'> #undef TRACE_SYSTEM</div><div class='ctx'> #define TRACE_SYSTEM iwlwifi_ucode</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(iwlwifi_dev_ucode_cont_event,</div><div class='del'>-	TP_PROTO(struct iwl_priv *priv, u32 time, u32 data, u32 ev),</div><div class='add'>+	TP_PROTO(void *priv, u32 time, u32 data, u32 ev),</div><div class='ctx'> 	TP_ARGS(priv, time, data, ev),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		PRIV_ENTRY</div><div class='hunk'>@@ -115,7 +143,7 @@ TRACE_EVENT(iwlwifi_dev_ucode_cont_event,</div><div class='ctx'> );</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(iwlwifi_dev_ucode_wrap_event,</div><div class='del'>-	TP_PROTO(struct iwl_priv *priv, u32 wraps, u32 n_entry, u32 p_entry),</div><div class='add'>+	TP_PROTO(void *priv, u32 wraps, u32 n_entry, u32 p_entry),</div><div class='ctx'> 	TP_ARGS(priv, wraps, n_entry, p_entry),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		PRIV_ENTRY</div><div class='hunk'>@@ -139,7 +167,7 @@ TRACE_EVENT(iwlwifi_dev_ucode_wrap_event,</div><div class='ctx'> #define TRACE_SYSTEM iwlwifi</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(iwlwifi_dev_hcmd,</div><div class='del'>-	TP_PROTO(struct iwl_priv *priv, u32 flags,</div><div class='add'>+	TP_PROTO(void *priv, u32 flags,</div><div class='ctx'> 		 const void *hcmd0, size_t len0,</div><div class='ctx'> 		 const void *hcmd1, size_t len1,</div><div class='ctx'> 		 const void *hcmd2, size_t len2),</div><div class='hunk'>@@ -164,7 +192,7 @@ TRACE_EVENT(iwlwifi_dev_hcmd,</div><div class='ctx'> );</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(iwlwifi_dev_rx,</div><div class='del'>-	TP_PROTO(struct iwl_priv *priv, void *rxbuf, size_t len),</div><div class='add'>+	TP_PROTO(void *priv, void *rxbuf, size_t len),</div><div class='ctx'> 	TP_ARGS(priv, rxbuf, len),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		PRIV_ENTRY</div><div class='hunk'>@@ -179,7 +207,7 @@ TRACE_EVENT(iwlwifi_dev_rx,</div><div class='ctx'> );</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(iwlwifi_dev_tx,</div><div class='del'>-	TP_PROTO(struct iwl_priv *priv, void *tfd, size_t tfdlen,</div><div class='add'>+	TP_PROTO(void *priv, void *tfd, size_t tfdlen,</div><div class='ctx'> 		 void *buf0, size_t buf0_len,</div><div class='ctx'> 		 void *buf1, size_t buf1_len),</div><div class='ctx'> 	TP_ARGS(priv, tfd, tfdlen, buf0, buf0_len, buf1, buf1_len),</div><div class='hunk'>@@ -211,7 +239,7 @@ TRACE_EVENT(iwlwifi_dev_tx,</div><div class='ctx'> );</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(iwlwifi_dev_ucode_error,</div><div class='del'>-	TP_PROTO(struct iwl_priv *priv, u32 desc, u32 tsf_low,</div><div class='add'>+	TP_PROTO(void *priv, u32 desc, u32 tsf_low,</div><div class='ctx'> 		 u32 data1, u32 data2, u32 line, u32 blink1,</div><div class='ctx'> 		 u32 blink2, u32 ilink1, u32 ilink2, u32 bcon_time,</div><div class='ctx'> 		 u32 gp1, u32 gp2, u32 gp3, u32 ucode_ver, u32 hw_ver,</div><div class='hunk'>@@ -271,7 +299,7 @@ TRACE_EVENT(iwlwifi_dev_ucode_error,</div><div class='ctx'> );</div><div class='ctx'> </div><div class='ctx'> TRACE_EVENT(iwlwifi_dev_ucode_event,</div><div class='del'>-	TP_PROTO(struct iwl_priv *priv, u32 time, u32 data, u32 ev),</div><div class='add'>+	TP_PROTO(void *priv, u32 time, u32 data, u32 ev),</div><div class='ctx'> 	TP_ARGS(priv, time, data, ev),</div><div class='ctx'> 	TP_STRUCT__entry(</div><div class='ctx'> 		PRIV_ENTRY</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c<br/>index a4e43bd4a547..c1eda9724f42 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-eeprom.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-eeprom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-eeprom.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-eeprom.c</a></div><div class='hunk'>@@ -149,23 +149,23 @@ static const u8 iwl_eeprom_band_7[] = {       /* 5.2 ht40 channel */</div><div class='ctx'>  * EEPROM chip, not a single event, so even reads could conflict if they</div><div class='ctx'>  * weren't arbitrated by the semaphore.</div><div class='ctx'>  */</div><div class='del'>-static int iwl_eeprom_acquire_semaphore(struct iwl_priv *priv)</div><div class='add'>+static int iwl_eeprom_acquire_semaphore(struct iwl_bus *bus)</div><div class='ctx'> {</div><div class='ctx'> 	u16 count;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	for (count = 0; count &lt; EEPROM_SEM_RETRY_LIMIT; count++) {</div><div class='ctx'> 		/* Request semaphore */</div><div class='del'>-		iwl_set_bit(bus(priv), CSR_HW_IF_CONFIG_REG,</div><div class='add'>+		iwl_set_bit(bus, CSR_HW_IF_CONFIG_REG,</div><div class='ctx'> 			    CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);</div><div class='ctx'> </div><div class='ctx'> 		/* See if we got it */</div><div class='del'>-		ret = iwl_poll_bit(bus(priv), CSR_HW_IF_CONFIG_REG,</div><div class='add'>+		ret = iwl_poll_bit(bus, CSR_HW_IF_CONFIG_REG,</div><div class='ctx'> 				CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,</div><div class='ctx'> 				CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,</div><div class='ctx'> 				EEPROM_SEM_TIMEOUT);</div><div class='ctx'> 		if (ret &gt;= 0) {</div><div class='del'>-			IWL_DEBUG_EEPROM(priv,</div><div class='add'>+			IWL_DEBUG_EEPROM(bus,</div><div class='ctx'> 				"Acquired semaphore after %d tries.\n",</div><div class='ctx'> 				count+1);</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -175,39 +175,39 @@ static int iwl_eeprom_acquire_semaphore(struct iwl_priv *priv)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_eeprom_release_semaphore(struct iwl_priv *priv)</div><div class='add'>+static void iwl_eeprom_release_semaphore(struct iwl_bus *bus)</div><div class='ctx'> {</div><div class='del'>-	iwl_clear_bit(bus(priv), CSR_HW_IF_CONFIG_REG,</div><div class='add'>+	iwl_clear_bit(bus, CSR_HW_IF_CONFIG_REG,</div><div class='ctx'> 		CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_eeprom_verify_signature(struct iwl_priv *priv)</div><div class='add'>+static int iwl_eeprom_verify_signature(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='del'>-	u32 gp = iwl_read32(bus(priv), CSR_EEPROM_GP) &amp; CSR_EEPROM_GP_VALID_MSK;</div><div class='add'>+	u32 gp = iwl_read32(bus(trans), CSR_EEPROM_GP) &amp; CSR_EEPROM_GP_VALID_MSK;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_EEPROM(priv, "EEPROM signature=0x%08x\n", gp);</div><div class='add'>+	IWL_DEBUG_EEPROM(trans, "EEPROM signature=0x%08x\n", gp);</div><div class='ctx'> 	switch (gp) {</div><div class='ctx'> 	case CSR_EEPROM_GP_BAD_SIG_EEP_GOOD_SIG_OTP:</div><div class='del'>-		if (priv-&gt;nvm_device_type != NVM_DEVICE_TYPE_OTP) {</div><div class='del'>-			IWL_ERR(priv, "EEPROM with bad signature: 0x%08x\n",</div><div class='add'>+		if (trans-&gt;nvm_device_type != NVM_DEVICE_TYPE_OTP) {</div><div class='add'>+			IWL_ERR(trans, "EEPROM with bad signature: 0x%08x\n",</div><div class='ctx'> 				gp);</div><div class='ctx'> 			ret = -ENOENT;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CSR_EEPROM_GP_GOOD_SIG_EEP_LESS_THAN_4K:</div><div class='ctx'> 	case CSR_EEPROM_GP_GOOD_SIG_EEP_MORE_THAN_4K:</div><div class='del'>-		if (priv-&gt;nvm_device_type != NVM_DEVICE_TYPE_EEPROM) {</div><div class='del'>-			IWL_ERR(priv, "OTP with bad signature: 0x%08x\n", gp);</div><div class='add'>+		if (trans-&gt;nvm_device_type != NVM_DEVICE_TYPE_EEPROM) {</div><div class='add'>+			IWL_ERR(trans, "OTP with bad signature: 0x%08x\n", gp);</div><div class='ctx'> 			ret = -ENOENT;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CSR_EEPROM_GP_BAD_SIGNATURE_BOTH_EEP_AND_OTP:</div><div class='ctx'> 	default:</div><div class='del'>-		IWL_ERR(priv, "bad EEPROM/OTP signature, type=%s, "</div><div class='add'>+		IWL_ERR(trans, "bad EEPROM/OTP signature, type=%s, "</div><div class='ctx'> 			"EEPROM_GP=0x%08x\n",</div><div class='del'>-			(priv-&gt;nvm_device_type == NVM_DEVICE_TYPE_OTP)</div><div class='add'>+			(trans-&gt;nvm_device_type == NVM_DEVICE_TYPE_OTP)</div><div class='ctx'> 			? "OTP" : "EEPROM", gp);</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -215,11 +215,11 @@ static int iwl_eeprom_verify_signature(struct iwl_priv *priv)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 iwl_eeprom_query16(const struct iwl_priv *priv, size_t offset)</div><div class='add'>+u16 iwl_eeprom_query16(const struct iwl_shared *shrd, size_t offset)</div><div class='ctx'> {</div><div class='del'>-	if (!priv-&gt;eeprom)</div><div class='add'>+	if (!shrd-&gt;eeprom)</div><div class='ctx'> 		return 0;</div><div class='del'>-	return (u16)priv-&gt;eeprom[offset] | ((u16)priv-&gt;eeprom[offset + 1] &lt;&lt; 8);</div><div class='add'>+	return (u16)shrd-&gt;eeprom[offset] | ((u16)shrd-&gt;eeprom[offset + 1] &lt;&lt; 8);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_eeprom_check_version(struct iwl_priv *priv)</div><div class='hunk'>@@ -227,11 +227,11 @@ int iwl_eeprom_check_version(struct iwl_priv *priv)</div><div class='ctx'> 	u16 eeprom_ver;</div><div class='ctx'> 	u16 calib_ver;</div><div class='ctx'> </div><div class='del'>-	eeprom_ver = iwl_eeprom_query16(priv, EEPROM_VERSION);</div><div class='del'>-	calib_ver = iwlagn_eeprom_calib_version(priv);</div><div class='add'>+	eeprom_ver = iwl_eeprom_query16(priv-&gt;shrd, EEPROM_VERSION);</div><div class='add'>+	calib_ver = iwl_eeprom_calib_version(priv-&gt;shrd);</div><div class='ctx'> </div><div class='del'>-	if (eeprom_ver &lt; priv-&gt;cfg-&gt;eeprom_ver ||</div><div class='del'>-	    calib_ver &lt; priv-&gt;cfg-&gt;eeprom_calib_ver)</div><div class='add'>+	if (eeprom_ver &lt; cfg(priv)-&gt;eeprom_ver ||</div><div class='add'>+	    calib_ver &lt; cfg(priv)-&gt;eeprom_calib_ver)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	IWL_INFO(priv, "device EEPROM VER=0x%x, CALIB=0x%x\n",</div><div class='hunk'>@@ -241,45 +241,46 @@ int iwl_eeprom_check_version(struct iwl_priv *priv)</div><div class='ctx'> err:</div><div class='ctx'> 	IWL_ERR(priv, "Unsupported (too old) EEPROM VER=0x%x &lt; 0x%x "</div><div class='ctx'> 		  "CALIB=0x%x &lt; 0x%x\n",</div><div class='del'>-		  eeprom_ver, priv-&gt;cfg-&gt;eeprom_ver,</div><div class='del'>-		  calib_ver,  priv-&gt;cfg-&gt;eeprom_calib_ver);</div><div class='add'>+		  eeprom_ver, cfg(priv)-&gt;eeprom_ver,</div><div class='add'>+		  calib_ver,  cfg(priv)-&gt;eeprom_calib_ver);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_eeprom_check_sku(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_shared *shrd = priv-&gt;shrd;</div><div class='ctx'> 	u16 radio_cfg;</div><div class='ctx'> </div><div class='del'>-	if (!priv-&gt;cfg-&gt;sku) {</div><div class='add'>+	if (!cfg(priv)-&gt;sku) {</div><div class='ctx'> 		/* not using sku overwrite */</div><div class='del'>-		priv-&gt;cfg-&gt;sku = iwl_eeprom_query16(priv, EEPROM_SKU_CAP);</div><div class='del'>-		if (priv-&gt;cfg-&gt;sku &amp; EEPROM_SKU_CAP_11N_ENABLE &amp;&amp;</div><div class='del'>-		    !priv-&gt;cfg-&gt;ht_params) {</div><div class='add'>+		cfg(priv)-&gt;sku = iwl_eeprom_query16(shrd, EEPROM_SKU_CAP);</div><div class='add'>+		if (cfg(priv)-&gt;sku &amp; EEPROM_SKU_CAP_11N_ENABLE &amp;&amp;</div><div class='add'>+		    !cfg(priv)-&gt;ht_params) {</div><div class='ctx'> 			IWL_ERR(priv, "Invalid 11n configuration\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (!priv-&gt;cfg-&gt;sku) {</div><div class='add'>+	if (!cfg(priv)-&gt;sku) {</div><div class='ctx'> 		IWL_ERR(priv, "Invalid device sku\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	IWL_INFO(priv, "Device SKU: 0X%x\n", priv-&gt;cfg-&gt;sku);</div><div class='add'>+	IWL_INFO(priv, "Device SKU: 0x%X\n", cfg(priv)-&gt;sku);</div><div class='ctx'> </div><div class='del'>-	if (!priv-&gt;cfg-&gt;valid_tx_ant &amp;&amp; !priv-&gt;cfg-&gt;valid_rx_ant) {</div><div class='add'>+	if (!cfg(priv)-&gt;valid_tx_ant &amp;&amp; !cfg(priv)-&gt;valid_rx_ant) {</div><div class='ctx'> 		/* not using .cfg overwrite */</div><div class='del'>-		radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);</div><div class='del'>-		priv-&gt;cfg-&gt;valid_tx_ant = EEPROM_RF_CFG_TX_ANT_MSK(radio_cfg);</div><div class='del'>-		priv-&gt;cfg-&gt;valid_rx_ant = EEPROM_RF_CFG_RX_ANT_MSK(radio_cfg);</div><div class='del'>-		if (!priv-&gt;cfg-&gt;valid_tx_ant || !priv-&gt;cfg-&gt;valid_rx_ant) {</div><div class='del'>-			IWL_ERR(priv, "Invalid chain (0X%x, 0X%x)\n",</div><div class='del'>-				priv-&gt;cfg-&gt;valid_tx_ant,</div><div class='del'>-				priv-&gt;cfg-&gt;valid_rx_ant);</div><div class='add'>+		radio_cfg = iwl_eeprom_query16(shrd, EEPROM_RADIO_CONFIG);</div><div class='add'>+		cfg(priv)-&gt;valid_tx_ant = EEPROM_RF_CFG_TX_ANT_MSK(radio_cfg);</div><div class='add'>+		cfg(priv)-&gt;valid_rx_ant = EEPROM_RF_CFG_RX_ANT_MSK(radio_cfg);</div><div class='add'>+		if (!cfg(priv)-&gt;valid_tx_ant || !cfg(priv)-&gt;valid_rx_ant) {</div><div class='add'>+			IWL_ERR(priv, "Invalid chain (0x%X, 0x%X)\n",</div><div class='add'>+				cfg(priv)-&gt;valid_tx_ant,</div><div class='add'>+				cfg(priv)-&gt;valid_rx_ant);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		IWL_INFO(priv, "Valid Tx ant: 0X%x, Valid Rx ant: 0X%x\n",</div><div class='del'>-			 priv-&gt;cfg-&gt;valid_tx_ant, priv-&gt;cfg-&gt;valid_rx_ant);</div><div class='add'>+		IWL_INFO(priv, "Valid Tx ant: 0x%X, Valid Rx ant: 0x%X\n",</div><div class='add'>+			 cfg(priv)-&gt;valid_tx_ant, cfg(priv)-&gt;valid_rx_ant);</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * for some special cases,</div><div class='hunk'>@@ -289,9 +290,9 @@ int iwl_eeprom_check_sku(struct iwl_priv *priv)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac)</div><div class='add'>+void iwl_eeprom_get_mac(const struct iwl_shared *shrd, u8 *mac)</div><div class='ctx'> {</div><div class='del'>-	const u8 *addr = iwl_eeprom_query_addr(priv,</div><div class='add'>+	const u8 *addr = iwl_eeprom_query_addr(shrd,</div><div class='ctx'> 					EEPROM_MAC_ADDRESS);</div><div class='ctx'> 	memcpy(mac, addr, ETH_ALEN);</div><div class='ctx'> }</div><div class='hunk'>@@ -302,19 +303,19 @@ void iwl_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac)</div><div class='ctx'>  *</div><div class='ctx'> ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-static void iwl_set_otp_access(struct iwl_priv *priv, enum iwl_access_mode mode)</div><div class='add'>+static void iwl_set_otp_access(struct iwl_bus *bus, enum iwl_access_mode mode)</div><div class='ctx'> {</div><div class='del'>-	iwl_read32(bus(priv), CSR_OTP_GP_REG);</div><div class='add'>+	iwl_read32(bus, CSR_OTP_GP_REG);</div><div class='ctx'> </div><div class='ctx'> 	if (mode == IWL_OTP_ACCESS_ABSOLUTE)</div><div class='del'>-		iwl_clear_bit(bus(priv), CSR_OTP_GP_REG,</div><div class='add'>+		iwl_clear_bit(bus, CSR_OTP_GP_REG,</div><div class='ctx'> 			      CSR_OTP_GP_REG_OTP_ACCESS_MODE);</div><div class='ctx'> 	else</div><div class='del'>-		iwl_set_bit(bus(priv), CSR_OTP_GP_REG,</div><div class='add'>+		iwl_set_bit(bus, CSR_OTP_GP_REG,</div><div class='ctx'> 			    CSR_OTP_GP_REG_OTP_ACCESS_MODE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_get_nvm_type(struct iwl_priv *priv, u32 hw_rev)</div><div class='add'>+static int iwl_get_nvm_type(struct iwl_bus *bus, u32 hw_rev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 otpgp;</div><div class='ctx'> 	int nvm_type;</div><div class='hunk'>@@ -322,7 +323,7 @@ static int iwl_get_nvm_type(struct iwl_priv *priv, u32 hw_rev)</div><div class='ctx'> 	/* OTP only valid for CP/PP and after */</div><div class='ctx'> 	switch (hw_rev &amp; CSR_HW_REV_TYPE_MSK) {</div><div class='ctx'> 	case CSR_HW_REV_TYPE_NONE:</div><div class='del'>-		IWL_ERR(priv, "Unknown hardware type\n");</div><div class='add'>+		IWL_ERR(bus, "Unknown hardware type\n");</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	case CSR_HW_REV_TYPE_5300:</div><div class='ctx'> 	case CSR_HW_REV_TYPE_5350:</div><div class='hunk'>@@ -331,7 +332,7 @@ static int iwl_get_nvm_type(struct iwl_priv *priv, u32 hw_rev)</div><div class='ctx'> 		nvm_type = NVM_DEVICE_TYPE_EEPROM;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		otpgp = iwl_read32(bus(priv), CSR_OTP_GP_REG);</div><div class='add'>+		otpgp = iwl_read32(bus, CSR_OTP_GP_REG);</div><div class='ctx'> 		if (otpgp &amp; CSR_OTP_GP_REG_DEVICE_SELECT)</div><div class='ctx'> 			nvm_type = NVM_DEVICE_TYPE_OTP;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -341,73 +342,73 @@ static int iwl_get_nvm_type(struct iwl_priv *priv, u32 hw_rev)</div><div class='ctx'> 	return  nvm_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_init_otp_access(struct iwl_priv *priv)</div><div class='add'>+static int iwl_init_otp_access(struct iwl_bus *bus)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Enable 40MHz radio clock */</div><div class='del'>-	iwl_write32(bus(priv), CSR_GP_CNTRL,</div><div class='del'>-		    iwl_read32(bus(priv), CSR_GP_CNTRL) |</div><div class='add'>+	iwl_write32(bus, CSR_GP_CNTRL,</div><div class='add'>+		    iwl_read32(bus, CSR_GP_CNTRL) |</div><div class='ctx'> 		    CSR_GP_CNTRL_REG_FLAG_INIT_DONE);</div><div class='ctx'> </div><div class='ctx'> 	/* wait for clock to be ready */</div><div class='del'>-	ret = iwl_poll_bit(bus(priv), CSR_GP_CNTRL,</div><div class='add'>+	ret = iwl_poll_bit(bus, CSR_GP_CNTRL,</div><div class='ctx'> 				 CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,</div><div class='ctx'> 				 CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,</div><div class='ctx'> 				 25000);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		IWL_ERR(priv, "Time out access OTP\n");</div><div class='add'>+		IWL_ERR(bus, "Time out access OTP\n");</div><div class='ctx'> 	else {</div><div class='del'>-		iwl_set_bits_prph(bus(priv), APMG_PS_CTRL_REG,</div><div class='add'>+		iwl_set_bits_prph(bus, APMG_PS_CTRL_REG,</div><div class='ctx'> 				  APMG_PS_CTRL_VAL_RESET_REQ);</div><div class='ctx'> 		udelay(5);</div><div class='del'>-		iwl_clear_bits_prph(bus(priv), APMG_PS_CTRL_REG,</div><div class='add'>+		iwl_clear_bits_prph(bus, APMG_PS_CTRL_REG,</div><div class='ctx'> 				    APMG_PS_CTRL_VAL_RESET_REQ);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * CSR auto clock gate disable bit -</div><div class='ctx'> 		 * this is only applicable for HW with OTP shadow RAM</div><div class='ctx'> 		 */</div><div class='del'>-		if (priv-&gt;cfg-&gt;base_params-&gt;shadow_ram_support)</div><div class='del'>-			iwl_set_bit(bus(priv), CSR_DBG_LINK_PWR_MGMT_REG,</div><div class='add'>+		if (cfg(bus)-&gt;base_params-&gt;shadow_ram_support)</div><div class='add'>+			iwl_set_bit(bus, CSR_DBG_LINK_PWR_MGMT_REG,</div><div class='ctx'> 				CSR_RESET_LINK_PWR_MGMT_DISABLED);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwl_read_otp_word(struct iwl_priv *priv, u16 addr, __le16 *eeprom_data)</div><div class='add'>+static int iwl_read_otp_word(struct iwl_bus *bus, u16 addr, __le16 *eeprom_data)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u32 r;</div><div class='ctx'> 	u32 otpgp;</div><div class='ctx'> </div><div class='del'>-	iwl_write32(bus(priv), CSR_EEPROM_REG,</div><div class='add'>+	iwl_write32(bus, CSR_EEPROM_REG,</div><div class='ctx'> 		    CSR_EEPROM_REG_MSK_ADDR &amp; (addr &lt;&lt; 1));</div><div class='del'>-	ret = iwl_poll_bit(bus(priv), CSR_EEPROM_REG,</div><div class='add'>+	ret = iwl_poll_bit(bus, CSR_EEPROM_REG,</div><div class='ctx'> 				 CSR_EEPROM_REG_READ_VALID_MSK,</div><div class='ctx'> 				 CSR_EEPROM_REG_READ_VALID_MSK,</div><div class='ctx'> 				 IWL_EEPROM_ACCESS_TIMEOUT);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		IWL_ERR(priv, "Time out reading OTP[%d]\n", addr);</div><div class='add'>+		IWL_ERR(bus, "Time out reading OTP[%d]\n", addr);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	r = iwl_read32(bus(priv), CSR_EEPROM_REG);</div><div class='add'>+	r = iwl_read32(bus, CSR_EEPROM_REG);</div><div class='ctx'> 	/* check for ECC errors: */</div><div class='del'>-	otpgp = iwl_read32(bus(priv), CSR_OTP_GP_REG);</div><div class='add'>+	otpgp = iwl_read32(bus, CSR_OTP_GP_REG);</div><div class='ctx'> 	if (otpgp &amp; CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK) {</div><div class='ctx'> 		/* stop in this case */</div><div class='ctx'> 		/* set the uncorrectable OTP ECC bit for acknowledgement */</div><div class='del'>-		iwl_set_bit(bus(priv), CSR_OTP_GP_REG,</div><div class='add'>+		iwl_set_bit(bus, CSR_OTP_GP_REG,</div><div class='ctx'> 			CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);</div><div class='del'>-		IWL_ERR(priv, "Uncorrectable OTP ECC error, abort OTP read\n");</div><div class='add'>+		IWL_ERR(bus, "Uncorrectable OTP ECC error, abort OTP read\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (otpgp &amp; CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK) {</div><div class='ctx'> 		/* continue in this case */</div><div class='ctx'> 		/* set the correctable OTP ECC bit for acknowledgement */</div><div class='del'>-		iwl_set_bit(bus(priv), CSR_OTP_GP_REG,</div><div class='add'>+		iwl_set_bit(bus, CSR_OTP_GP_REG,</div><div class='ctx'> 				CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK);</div><div class='del'>-		IWL_ERR(priv, "Correctable OTP ECC error, continue read\n");</div><div class='add'>+		IWL_ERR(bus, "Correctable OTP ECC error, continue read\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	*eeprom_data = cpu_to_le16(r &gt;&gt; 16);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -416,20 +417,20 @@ static int iwl_read_otp_word(struct iwl_priv *priv, u16 addr, __le16 *eeprom_dat</div><div class='ctx'> /*</div><div class='ctx'>  * iwl_is_otp_empty: check for empty OTP</div><div class='ctx'>  */</div><div class='del'>-static bool iwl_is_otp_empty(struct iwl_priv *priv)</div><div class='add'>+static bool iwl_is_otp_empty(struct iwl_bus *bus)</div><div class='ctx'> {</div><div class='ctx'> 	u16 next_link_addr = 0;</div><div class='ctx'> 	__le16 link_value;</div><div class='ctx'> 	bool is_empty = false;</div><div class='ctx'> </div><div class='ctx'> 	/* locate the beginning of OTP link list */</div><div class='del'>-	if (!iwl_read_otp_word(priv, next_link_addr, &amp;link_value)) {</div><div class='add'>+	if (!iwl_read_otp_word(bus, next_link_addr, &amp;link_value)) {</div><div class='ctx'> 		if (!link_value) {</div><div class='del'>-			IWL_ERR(priv, "OTP is empty\n");</div><div class='add'>+			IWL_ERR(bus, "OTP is empty\n");</div><div class='ctx'> 			is_empty = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		IWL_ERR(priv, "Unable to read first block of OTP list.\n");</div><div class='add'>+		IWL_ERR(bus, "Unable to read first block of OTP list.\n");</div><div class='ctx'> 		is_empty = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -446,7 +447,7 @@ static bool iwl_is_otp_empty(struct iwl_priv *priv)</div><div class='ctx'>  *   we should read and used to configure the device.</div><div class='ctx'>  *   only perform this operation if shadow RAM is disabled</div><div class='ctx'>  */</div><div class='del'>-static int iwl_find_otp_image(struct iwl_priv *priv,</div><div class='add'>+static int iwl_find_otp_image(struct iwl_bus *bus,</div><div class='ctx'> 					u16 *validblockaddr)</div><div class='ctx'> {</div><div class='ctx'> 	u16 next_link_addr = 0, valid_addr;</div><div class='hunk'>@@ -454,10 +455,10 @@ static int iwl_find_otp_image(struct iwl_priv *priv,</div><div class='ctx'> 	int usedblocks = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* set addressing mode to absolute to traverse the link list */</div><div class='del'>-	iwl_set_otp_access(priv, IWL_OTP_ACCESS_ABSOLUTE);</div><div class='add'>+	iwl_set_otp_access(bus, IWL_OTP_ACCESS_ABSOLUTE);</div><div class='ctx'> </div><div class='ctx'> 	/* checking for empty OTP or error */</div><div class='del'>-	if (iwl_is_otp_empty(priv))</div><div class='add'>+	if (iwl_is_otp_empty(bus))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -471,9 +472,9 @@ static int iwl_find_otp_image(struct iwl_priv *priv,</div><div class='ctx'> 		 */</div><div class='ctx'> 		valid_addr = next_link_addr;</div><div class='ctx'> 		next_link_addr = le16_to_cpu(link_value) * sizeof(u16);</div><div class='del'>-		IWL_DEBUG_EEPROM(priv, "OTP blocks %d addr 0x%x\n",</div><div class='add'>+		IWL_DEBUG_EEPROM(bus, "OTP blocks %d addr 0x%x\n",</div><div class='ctx'> 			       usedblocks, next_link_addr);</div><div class='del'>-		if (iwl_read_otp_word(priv, next_link_addr, &amp;link_value))</div><div class='add'>+		if (iwl_read_otp_word(bus, next_link_addr, &amp;link_value))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		if (!link_value) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -488,10 +489,10 @@ static int iwl_find_otp_image(struct iwl_priv *priv,</div><div class='ctx'> 		}</div><div class='ctx'> 		/* more in the link list, continue */</div><div class='ctx'> 		usedblocks++;</div><div class='del'>-	} while (usedblocks &lt;= priv-&gt;cfg-&gt;base_params-&gt;max_ll_items);</div><div class='add'>+	} while (usedblocks &lt;= cfg(bus)-&gt;base_params-&gt;max_ll_items);</div><div class='ctx'> </div><div class='ctx'> 	/* OTP has no valid blocks */</div><div class='del'>-	IWL_DEBUG_EEPROM(priv, "OTP has no valid blocks\n");</div><div class='add'>+	IWL_DEBUG_EEPROM(bus, "OTP has no valid blocks\n");</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -504,28 +505,28 @@ static int iwl_find_otp_image(struct iwl_priv *priv,</div><div class='ctx'>  * iwl_get_max_txpower_avg - get the highest tx power from all chains.</div><div class='ctx'>  *     find the highest tx power from all chains for the channel</div><div class='ctx'>  */</div><div class='del'>-static s8 iwl_get_max_txpower_avg(struct iwl_priv *priv,</div><div class='add'>+static s8 iwl_get_max_txpower_avg(struct iwl_cfg *cfg,</div><div class='ctx'> 		struct iwl_eeprom_enhanced_txpwr *enhanced_txpower,</div><div class='ctx'> 		int element, s8 *max_txpower_in_half_dbm)</div><div class='ctx'> {</div><div class='ctx'> 	s8 max_txpower_avg = 0; /* (dBm) */</div><div class='ctx'> </div><div class='ctx'> 	/* Take the highest tx power from any valid chains */</div><div class='del'>-	if ((priv-&gt;cfg-&gt;valid_tx_ant &amp; ANT_A) &amp;&amp;</div><div class='add'>+	if ((cfg-&gt;valid_tx_ant &amp; ANT_A) &amp;&amp;</div><div class='ctx'> 	    (enhanced_txpower[element].chain_a_max &gt; max_txpower_avg))</div><div class='ctx'> 		max_txpower_avg = enhanced_txpower[element].chain_a_max;</div><div class='del'>-	if ((priv-&gt;cfg-&gt;valid_tx_ant &amp; ANT_B) &amp;&amp;</div><div class='add'>+	if ((cfg-&gt;valid_tx_ant &amp; ANT_B) &amp;&amp;</div><div class='ctx'> 	    (enhanced_txpower[element].chain_b_max &gt; max_txpower_avg))</div><div class='ctx'> 		max_txpower_avg = enhanced_txpower[element].chain_b_max;</div><div class='del'>-	if ((priv-&gt;cfg-&gt;valid_tx_ant &amp; ANT_C) &amp;&amp;</div><div class='add'>+	if ((cfg-&gt;valid_tx_ant &amp; ANT_C) &amp;&amp;</div><div class='ctx'> 	    (enhanced_txpower[element].chain_c_max &gt; max_txpower_avg))</div><div class='ctx'> 		max_txpower_avg = enhanced_txpower[element].chain_c_max;</div><div class='del'>-	if (((priv-&gt;cfg-&gt;valid_tx_ant == ANT_AB) |</div><div class='del'>-	    (priv-&gt;cfg-&gt;valid_tx_ant == ANT_BC) |</div><div class='del'>-	    (priv-&gt;cfg-&gt;valid_tx_ant == ANT_AC)) &amp;&amp;</div><div class='add'>+	if (((cfg-&gt;valid_tx_ant == ANT_AB) |</div><div class='add'>+	    (cfg-&gt;valid_tx_ant == ANT_BC) |</div><div class='add'>+	    (cfg-&gt;valid_tx_ant == ANT_AC)) &amp;&amp;</div><div class='ctx'> 	    (enhanced_txpower[element].mimo2_max &gt; max_txpower_avg))</div><div class='ctx'> 		max_txpower_avg =  enhanced_txpower[element].mimo2_max;</div><div class='del'>-	if ((priv-&gt;cfg-&gt;valid_tx_ant == ANT_ABC) &amp;&amp;</div><div class='add'>+	if ((cfg-&gt;valid_tx_ant == ANT_ABC) &amp;&amp;</div><div class='ctx'> 	    (enhanced_txpower[element].mimo3_max &gt; max_txpower_avg))</div><div class='ctx'> 		max_txpower_avg = enhanced_txpower[element].mimo3_max;</div><div class='ctx'> </div><div class='hunk'>@@ -582,6 +583,7 @@ iwl_eeprom_enh_txp_read_element(struct iwl_priv *priv,</div><div class='ctx'> </div><div class='ctx'> void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_shared *shrd = priv-&gt;shrd;</div><div class='ctx'> 	struct iwl_eeprom_enhanced_txpwr *txp_array, *txp;</div><div class='ctx'> 	int idx, entries;</div><div class='ctx'> 	__le16 *txp_len;</div><div class='hunk'>@@ -590,10 +592,10 @@ void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct iwl_eeprom_enhanced_txpwr) != 8);</div><div class='ctx'> </div><div class='ctx'> 	/* the length is in 16-bit words, but we want entries */</div><div class='del'>-	txp_len = (__le16 *) iwl_eeprom_query_addr(priv, EEPROM_TXP_SZ_OFFS);</div><div class='add'>+	txp_len = (__le16 *) iwl_eeprom_query_addr(shrd, EEPROM_TXP_SZ_OFFS);</div><div class='ctx'> 	entries = le16_to_cpup(txp_len) * 2 / EEPROM_TXP_ENTRY_LEN;</div><div class='ctx'> </div><div class='del'>-	txp_array = (void *) iwl_eeprom_query_addr(priv, EEPROM_TXP_OFFS);</div><div class='add'>+	txp_array = (void *) iwl_eeprom_query_addr(shrd, EEPROM_TXP_OFFS);</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; entries; idx++) {</div><div class='ctx'> 		txp = &amp;txp_array[idx];</div><div class='hunk'>@@ -627,7 +629,7 @@ void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)</div><div class='ctx'> 				 ((txp-&gt;delta_20_in_40 &amp; 0xf0) &gt;&gt; 4),</div><div class='ctx'> 				 (txp-&gt;delta_20_in_40 &amp; 0x0f));</div><div class='ctx'> </div><div class='del'>-		max_txp_avg = iwl_get_max_txpower_avg(priv, txp_array, idx,</div><div class='add'>+		max_txp_avg = iwl_get_max_txpower_avg(cfg(priv), txp_array, idx,</div><div class='ctx'> 						      &amp;max_txp_avg_halfdbm);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -646,12 +648,13 @@ void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)</div><div class='ctx'> /**</div><div class='ctx'>  * iwl_eeprom_init - read EEPROM contents</div><div class='ctx'>  *</div><div class='del'>- * Load the EEPROM contents from adapter into priv-&gt;eeprom</div><div class='add'>+ * Load the EEPROM contents from adapter into shrd-&gt;eeprom</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE:  This routine uses the non-debug IO access functions.</div><div class='ctx'>  */</div><div class='ctx'> int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_shared *shrd = priv-&gt;shrd;</div><div class='ctx'> 	__le16 *e;</div><div class='ctx'> 	u32 gp = iwl_read32(bus(priv), CSR_EEPROM_GP);</div><div class='ctx'> 	int sz;</div><div class='hunk'>@@ -660,22 +663,22 @@ int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev)</div><div class='ctx'> 	u16 validblockaddr = 0;</div><div class='ctx'> 	u16 cache_addr = 0;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;nvm_device_type = iwl_get_nvm_type(priv, hw_rev);</div><div class='del'>-	if (priv-&gt;nvm_device_type == -ENOENT)</div><div class='add'>+	trans(priv)-&gt;nvm_device_type = iwl_get_nvm_type(bus(priv), hw_rev);</div><div class='add'>+	if (trans(priv)-&gt;nvm_device_type == -ENOENT)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	/* allocate eeprom */</div><div class='del'>-	sz = priv-&gt;cfg-&gt;base_params-&gt;eeprom_size;</div><div class='add'>+	sz = cfg(priv)-&gt;base_params-&gt;eeprom_size;</div><div class='ctx'> 	IWL_DEBUG_EEPROM(priv, "NVM size = %d\n", sz);</div><div class='del'>-	priv-&gt;eeprom = kzalloc(sz, GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;eeprom) {</div><div class='add'>+	shrd-&gt;eeprom = kzalloc(sz, GFP_KERNEL);</div><div class='add'>+	if (!shrd-&gt;eeprom) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto alloc_err;</div><div class='ctx'> 	}</div><div class='del'>-	e = (__le16 *)priv-&gt;eeprom;</div><div class='add'>+	e = (__le16 *)shrd-&gt;eeprom;</div><div class='ctx'> </div><div class='ctx'> 	iwl_apm_init(priv);</div><div class='ctx'> </div><div class='del'>-	ret = iwl_eeprom_verify_signature(priv);</div><div class='add'>+	ret = iwl_eeprom_verify_signature(trans(priv));</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		IWL_ERR(priv, "EEPROM not found, EEPROM_GP=0x%08x\n", gp);</div><div class='ctx'> 		ret = -ENOENT;</div><div class='hunk'>@@ -683,16 +686,16 @@ int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure driver (instead of uCode) is allowed to read EEPROM */</div><div class='del'>-	ret = iwl_eeprom_acquire_semaphore(priv);</div><div class='add'>+	ret = iwl_eeprom_acquire_semaphore(bus(priv));</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		IWL_ERR(priv, "Failed to acquire EEPROM semaphore.\n");</div><div class='ctx'> 		ret = -ENOENT;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;nvm_device_type == NVM_DEVICE_TYPE_OTP) {</div><div class='add'>+	if (trans(priv)-&gt;nvm_device_type == NVM_DEVICE_TYPE_OTP) {</div><div class='ctx'> </div><div class='del'>-		ret = iwl_init_otp_access(priv);</div><div class='add'>+		ret = iwl_init_otp_access(bus(priv));</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			IWL_ERR(priv, "Failed to initialize OTP access.\n");</div><div class='ctx'> 			ret = -ENOENT;</div><div class='hunk'>@@ -706,8 +709,8 @@ int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev)</div><div class='ctx'> 			     CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK |</div><div class='ctx'> 			     CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);</div><div class='ctx'> 		/* traversing the linked list if no shadow ram supported */</div><div class='del'>-		if (!priv-&gt;cfg-&gt;base_params-&gt;shadow_ram_support) {</div><div class='del'>-			if (iwl_find_otp_image(priv, &amp;validblockaddr)) {</div><div class='add'>+		if (!cfg(priv)-&gt;base_params-&gt;shadow_ram_support) {</div><div class='add'>+			if (iwl_find_otp_image(bus(priv), &amp;validblockaddr)) {</div><div class='ctx'> 				ret = -ENOENT;</div><div class='ctx'> 				goto done;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -716,7 +719,7 @@ int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev)</div><div class='ctx'> 		     addr += sizeof(u16)) {</div><div class='ctx'> 			__le16 eeprom_data;</div><div class='ctx'> </div><div class='del'>-			ret = iwl_read_otp_word(priv, addr, &amp;eeprom_data);</div><div class='add'>+			ret = iwl_read_otp_word(bus(priv), addr, &amp;eeprom_data);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto done;</div><div class='ctx'> 			e[cache_addr / 2] = eeprom_data;</div><div class='hunk'>@@ -744,27 +747,27 @@ int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_EEPROM(priv, "NVM Type: %s, version: 0x%x\n",</div><div class='del'>-		       (priv-&gt;nvm_device_type == NVM_DEVICE_TYPE_OTP)</div><div class='add'>+		       (trans(priv)-&gt;nvm_device_type == NVM_DEVICE_TYPE_OTP)</div><div class='ctx'> 		       ? "OTP" : "EEPROM",</div><div class='del'>-		       iwl_eeprom_query16(priv, EEPROM_VERSION));</div><div class='add'>+		       iwl_eeprom_query16(shrd, EEPROM_VERSION));</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> done:</div><div class='del'>-	iwl_eeprom_release_semaphore(priv);</div><div class='add'>+	iwl_eeprom_release_semaphore(bus(priv));</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='ctx'> 	if (ret)</div><div class='del'>-		iwl_eeprom_free(priv);</div><div class='add'>+		iwl_eeprom_free(priv-&gt;shrd);</div><div class='ctx'> 	/* Reset chip to save power until we load uCode during "up". */</div><div class='ctx'> 	iwl_apm_stop(priv);</div><div class='ctx'> alloc_err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_eeprom_free(struct iwl_priv *priv)</div><div class='add'>+void iwl_eeprom_free(struct iwl_shared *shrd)</div><div class='ctx'> {</div><div class='del'>-	kfree(priv-&gt;eeprom);</div><div class='del'>-	priv-&gt;eeprom = NULL;</div><div class='add'>+	kfree(shrd-&gt;eeprom);</div><div class='add'>+	shrd-&gt;eeprom = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_init_band_reference(const struct iwl_priv *priv,</div><div class='hunk'>@@ -772,49 +775,50 @@ static void iwl_init_band_reference(const struct iwl_priv *priv,</div><div class='ctx'> 			const struct iwl_eeprom_channel **eeprom_ch_info,</div><div class='ctx'> 			const u8 **eeprom_ch_index)</div><div class='ctx'> {</div><div class='del'>-	u32 offset = priv-&gt;cfg-&gt;lib-&gt;</div><div class='add'>+	struct iwl_shared *shrd = priv-&gt;shrd;</div><div class='add'>+	u32 offset = cfg(priv)-&gt;lib-&gt;</div><div class='ctx'> 			eeprom_ops.regulatory_bands[eep_band - 1];</div><div class='ctx'> 	switch (eep_band) {</div><div class='ctx'> 	case 1:		/* 2.4GHz band */</div><div class='ctx'> 		*eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_1);</div><div class='ctx'> 		*eeprom_ch_info = (struct iwl_eeprom_channel *)</div><div class='del'>-				iwl_eeprom_query_addr(priv, offset);</div><div class='add'>+				iwl_eeprom_query_addr(shrd, offset);</div><div class='ctx'> 		*eeprom_ch_index = iwl_eeprom_band_1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:		/* 4.9GHz band */</div><div class='ctx'> 		*eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_2);</div><div class='ctx'> 		*eeprom_ch_info = (struct iwl_eeprom_channel *)</div><div class='del'>-				iwl_eeprom_query_addr(priv, offset);</div><div class='add'>+				iwl_eeprom_query_addr(shrd, offset);</div><div class='ctx'> 		*eeprom_ch_index = iwl_eeprom_band_2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:		/* 5.2GHz band */</div><div class='ctx'> 		*eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_3);</div><div class='ctx'> 		*eeprom_ch_info = (struct iwl_eeprom_channel *)</div><div class='del'>-				iwl_eeprom_query_addr(priv, offset);</div><div class='add'>+				iwl_eeprom_query_addr(shrd, offset);</div><div class='ctx'> 		*eeprom_ch_index = iwl_eeprom_band_3;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4:		/* 5.5GHz band */</div><div class='ctx'> 		*eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_4);</div><div class='ctx'> 		*eeprom_ch_info = (struct iwl_eeprom_channel *)</div><div class='del'>-				iwl_eeprom_query_addr(priv, offset);</div><div class='add'>+				iwl_eeprom_query_addr(shrd, offset);</div><div class='ctx'> 		*eeprom_ch_index = iwl_eeprom_band_4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 5:		/* 5.7GHz band */</div><div class='ctx'> 		*eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_5);</div><div class='ctx'> 		*eeprom_ch_info = (struct iwl_eeprom_channel *)</div><div class='del'>-				iwl_eeprom_query_addr(priv, offset);</div><div class='add'>+				iwl_eeprom_query_addr(shrd, offset);</div><div class='ctx'> 		*eeprom_ch_index = iwl_eeprom_band_5;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 6:		/* 2.4GHz ht40 channels */</div><div class='ctx'> 		*eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_6);</div><div class='ctx'> 		*eeprom_ch_info = (struct iwl_eeprom_channel *)</div><div class='del'>-				iwl_eeprom_query_addr(priv, offset);</div><div class='add'>+				iwl_eeprom_query_addr(shrd, offset);</div><div class='ctx'> 		*eeprom_ch_index = iwl_eeprom_band_6;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 7:		/* 5 GHz ht40 channels */</div><div class='ctx'> 		*eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_7);</div><div class='ctx'> 		*eeprom_ch_info = (struct iwl_eeprom_channel *)</div><div class='del'>-				iwl_eeprom_query_addr(priv, offset);</div><div class='add'>+				iwl_eeprom_query_addr(shrd, offset);</div><div class='ctx'> 		*eeprom_ch_index = iwl_eeprom_band_7;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -979,9 +983,9 @@ int iwl_init_channel_map(struct iwl_priv *priv)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check if we do have HT40 channels */</div><div class='del'>-	if (priv-&gt;cfg-&gt;lib-&gt;eeprom_ops.regulatory_bands[5] ==</div><div class='add'>+	if (cfg(priv)-&gt;lib-&gt;eeprom_ops.regulatory_bands[5] ==</div><div class='ctx'> 	    EEPROM_REGULATORY_BAND_NO_HT40 &amp;&amp;</div><div class='del'>-	    priv-&gt;cfg-&gt;lib-&gt;eeprom_ops.regulatory_bands[6] ==</div><div class='add'>+	    cfg(priv)-&gt;lib-&gt;eeprom_ops.regulatory_bands[6] ==</div><div class='ctx'> 	    EEPROM_REGULATORY_BAND_NO_HT40)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1017,8 +1021,8 @@ int iwl_init_channel_map(struct iwl_priv *priv)</div><div class='ctx'> 	 * driver need to process addition information</div><div class='ctx'> 	 * to determine the max channel tx power limits</div><div class='ctx'> 	 */</div><div class='del'>-	if (priv-&gt;cfg-&gt;lib-&gt;eeprom_ops.update_enhanced_txpower)</div><div class='del'>-		priv-&gt;cfg-&gt;lib-&gt;eeprom_ops.update_enhanced_txpower(priv);</div><div class='add'>+	if (cfg(priv)-&gt;lib-&gt;eeprom_ops.update_enhanced_txpower)</div><div class='add'>+		cfg(priv)-&gt;lib-&gt;eeprom_ops.update_enhanced_txpower(priv);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1064,7 +1068,7 @@ void iwl_rf_config(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	u16 radio_cfg;</div><div class='ctx'> </div><div class='del'>-	radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);</div><div class='add'>+	radio_cfg = iwl_eeprom_query16(priv-&gt;shrd, EEPROM_RADIO_CONFIG);</div><div class='ctx'> </div><div class='ctx'> 	/* write radio config values to register */</div><div class='ctx'> 	if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) &lt;= EEPROM_RF_CONFIG_TYPE_MAX) {</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h<br/>index c94747e7299e..9fa937ec35e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-eeprom.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-eeprom.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-eeprom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-eeprom.h</a></div><div class='hunk'>@@ -66,6 +66,7 @@</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct iwl_priv;</div><div class='add'>+struct iwl_shared;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * EEPROM access time values:</div><div class='hunk'>@@ -305,11 +306,11 @@ struct iwl_eeprom_ops {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev);</div><div class='del'>-void iwl_eeprom_free(struct iwl_priv *priv);</div><div class='add'>+void iwl_eeprom_free(struct iwl_shared *shrd);</div><div class='ctx'> int  iwl_eeprom_check_version(struct iwl_priv *priv);</div><div class='ctx'> int  iwl_eeprom_check_sku(struct iwl_priv *priv);</div><div class='del'>-const u8 *iwl_eeprom_query_addr(const struct iwl_priv *priv, size_t offset);</div><div class='del'>-u16 iwl_eeprom_query16(const struct iwl_priv *priv, size_t offset);</div><div class='add'>+const u8 *iwl_eeprom_query_addr(const struct iwl_shared *shrd, size_t offset);</div><div class='add'>+u16 iwl_eeprom_query16(const struct iwl_shared *shrd, size_t offset);</div><div class='ctx'> int iwl_init_channel_map(struct iwl_priv *priv);</div><div class='ctx'> void iwl_free_channel_map(struct iwl_priv *priv);</div><div class='ctx'> const struct iwl_channel_info *iwl_get_channel_info(</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/iwlwifi/iwl-io.c<br/>index 3ffa8e62b856..d57ea6484bbe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-io.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-io.c</a></div><div class='hunk'>@@ -143,7 +143,7 @@ u32 iwl_read_direct32(struct iwl_bus *bus, u32 reg)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;bus-&gt;reg_lock, flags);</div><div class='ctx'> 	iwl_grab_nic_access(bus);</div><div class='del'>-	value = iwl_read32(bus(bus), reg);</div><div class='add'>+	value = iwl_read32(bus, reg);</div><div class='ctx'> 	iwl_release_nic_access(bus);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bus-&gt;reg_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -283,16 +283,29 @@ u32 iwl_read_targ_mem(struct iwl_bus *bus, u32 addr)</div><div class='ctx'> 	return value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_write_targ_mem(struct iwl_bus *bus, u32 addr, u32 val)</div><div class='add'>+int _iwl_write_targ_mem_words(struct iwl_bus *bus, u32 addr,</div><div class='add'>+				void *buf, int words)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	int offs, result = 0;</div><div class='add'>+	u32 *vals = buf;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;bus-&gt;reg_lock, flags);</div><div class='ctx'> 	if (!iwl_grab_nic_access(bus)) {</div><div class='ctx'> 		iwl_write32(bus, HBUS_TARG_MEM_WADDR, addr);</div><div class='ctx'> 		wmb();</div><div class='del'>-		iwl_write32(bus, HBUS_TARG_MEM_WDAT, val);</div><div class='add'>+</div><div class='add'>+		for (offs = 0; offs &lt; words; offs++)</div><div class='add'>+			iwl_write32(bus, HBUS_TARG_MEM_WDAT, vals[offs]);</div><div class='ctx'> 		iwl_release_nic_access(bus);</div><div class='del'>-	}</div><div class='add'>+	} else</div><div class='add'>+		result = -EBUSY;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bus-&gt;reg_lock, flags);</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_write_targ_mem(struct iwl_bus *bus, u32 addr, u32 val)</div><div class='add'>+{</div><div class='add'>+	return _iwl_write_targ_mem_words(bus, addr, &amp;val, 1);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h<br/>index ced2cbeb6eae..aae2eeb331a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-io.h</a></div><div class='hunk'>@@ -85,6 +85,9 @@ void _iwl_read_targ_mem_words(struct iwl_bus *bus, u32 addr,</div><div class='ctx'> 					 (bufsize) / sizeof(u32));\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='add'>+int _iwl_write_targ_mem_words(struct iwl_bus *bus, u32 addr,</div><div class='add'>+			      void *buf, int words);</div><div class='add'>+</div><div class='ctx'> u32 iwl_read_targ_mem(struct iwl_bus *bus, u32 addr);</div><div class='del'>-void iwl_write_targ_mem(struct iwl_bus *bus, u32 addr, u32 val);</div><div class='add'>+int iwl_write_targ_mem(struct iwl_bus *bus, u32 addr, u32 val);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c<br/>index eb541735296c..14dcbfcdc0fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-led.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-led.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-led.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-led.c</a></div><div class='hunk'>@@ -137,11 +137,11 @@ static int iwl_led_cmd(struct iwl_priv *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	IWL_DEBUG_LED(priv, "Led blink time compensation=%u\n",</div><div class='del'>-			priv-&gt;cfg-&gt;base_params-&gt;led_compensation);</div><div class='add'>+			cfg(priv)-&gt;base_params-&gt;led_compensation);</div><div class='ctx'> 	led_cmd.on = iwl_blink_compensation(priv, on,</div><div class='del'>-				priv-&gt;cfg-&gt;base_params-&gt;led_compensation);</div><div class='add'>+				cfg(priv)-&gt;base_params-&gt;led_compensation);</div><div class='ctx'> 	led_cmd.off = iwl_blink_compensation(priv, off,</div><div class='del'>-				priv-&gt;cfg-&gt;base_params-&gt;led_compensation);</div><div class='add'>+				cfg(priv)-&gt;base_params-&gt;led_compensation);</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_send_led_cmd(priv, &amp;led_cmd);</div><div class='ctx'> 	if (!ret) {</div><div class='hunk'>@@ -178,7 +178,7 @@ void iwl_leds_init(struct iwl_priv *priv)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (mode == IWL_LED_DEFAULT)</div><div class='del'>-		mode = priv-&gt;cfg-&gt;led_mode;</div><div class='add'>+		mode = cfg(priv)-&gt;led_mode;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;led.name = kasprintf(GFP_KERNEL, "%s-led",</div><div class='ctx'> 				   wiphy_name(priv-&gt;hw-&gt;wiphy));</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-led.h b/drivers/net/wireless/iwlwifi/iwl-led.h<br/>index 1c93dfef6933..2550b3c7dcbf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-led.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-led.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-led.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-led.h</a></div><div class='hunk'>@@ -36,20 +36,6 @@ struct iwl_priv;</div><div class='ctx'> #define IWL_LED_ACTIVITY       (0&lt;&lt;1)</div><div class='ctx'> #define IWL_LED_LINK           (1&lt;&lt;1)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * LED mode</div><div class='del'>- *    IWL_LED_DEFAULT:  use device default</div><div class='del'>- *    IWL_LED_RF_STATE: turn LED on/off based on RF state</div><div class='del'>- *			LED ON  = RF ON</div><div class='del'>- *			LED OFF = RF OFF</div><div class='del'>- *    IWL_LED_BLINK:    adjust led blink rate based on blink table</div><div class='del'>- */</div><div class='del'>-enum iwl_led_mode {</div><div class='del'>-	IWL_LED_DEFAULT,</div><div class='del'>-	IWL_LED_RF_STATE,</div><div class='del'>-	IWL_LED_BLINK,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> void iwlagn_led_enable(struct iwl_priv *priv);</div><div class='ctx'> void iwl_leds_init(struct iwl_priv *priv);</div><div class='ctx'> void iwl_leds_exit(struct iwl_priv *priv);</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c<br/>new file mode 100644<br/>index 000000000000..f980e574e1f9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-mac80211.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-mac80211.c</a></div><div class='hunk'>@@ -0,0 +1,1601 @@</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Portions of this file are derived from the ipw3945 project, as well</div><div class='add'>+ * as portions of the ieee80211 subsystem header files.</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 version 2 of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution in the</div><div class='add'>+ * file called LICENSE.</div><div class='add'>+ *</div><div class='add'>+ * Contact Information:</div><div class='add'>+ *  Intel Linux Wireless &lt;ilw@linux.intel.com&gt;</div><div class='add'>+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</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/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/mac80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/div64.h&gt;</div><div class='add'>+</div><div class='add'>+#include "iwl-eeprom.h"</div><div class='add'>+#include "iwl-wifi.h"</div><div class='add'>+#include "iwl-dev.h"</div><div class='add'>+#include "iwl-core.h"</div><div class='add'>+#include "iwl-io.h"</div><div class='add'>+#include "iwl-agn-calib.h"</div><div class='add'>+#include "iwl-agn.h"</div><div class='add'>+#include "iwl-shared.h"</div><div class='add'>+#include "iwl-bus.h"</div><div class='add'>+#include "iwl-trans.h"</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * mac80211 entry point functions</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_iface_limit iwlagn_sta_ap_limits[] = {</div><div class='add'>+	{</div><div class='add'>+		.max = 1,</div><div class='add'>+		.types = BIT(NL80211_IFTYPE_STATION),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.max = 1,</div><div class='add'>+		.types = BIT(NL80211_IFTYPE_AP),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_iface_limit iwlagn_2sta_limits[] = {</div><div class='add'>+	{</div><div class='add'>+		.max = 2,</div><div class='add'>+		.types = 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_limit iwlagn_p2p_sta_go_limits[] = {</div><div class='add'>+	{</div><div class='add'>+		.max = 1,</div><div class='add'>+		.types = BIT(NL80211_IFTYPE_STATION),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.max = 1,</div><div class='add'>+		.types = BIT(NL80211_IFTYPE_P2P_GO) |</div><div class='add'>+			 BIT(NL80211_IFTYPE_AP),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_iface_limit iwlagn_p2p_2sta_limits[] = {</div><div class='add'>+	{</div><div class='add'>+		.max = 2,</div><div class='add'>+		.types = BIT(NL80211_IFTYPE_STATION),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.max = 1,</div><div class='add'>+		.types = BIT(NL80211_IFTYPE_P2P_CLIENT),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_iface_combination</div><div class='add'>+iwlagn_iface_combinations_dualmode[] = {</div><div class='add'>+	{ .num_different_channels = 1,</div><div class='add'>+	  .max_interfaces = 2,</div><div class='add'>+	  .beacon_int_infra_match = true,</div><div class='add'>+	  .limits = iwlagn_sta_ap_limits,</div><div class='add'>+	  .n_limits = ARRAY_SIZE(iwlagn_sta_ap_limits),</div><div class='add'>+	},</div><div class='add'>+	{ .num_different_channels = 1,</div><div class='add'>+	  .max_interfaces = 2,</div><div class='add'>+	  .limits = iwlagn_2sta_limits,</div><div class='add'>+	  .n_limits = ARRAY_SIZE(iwlagn_2sta_limits),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ieee80211_iface_combination</div><div class='add'>+iwlagn_iface_combinations_p2p[] = {</div><div class='add'>+	{ .num_different_channels = 1,</div><div class='add'>+	  .max_interfaces = 2,</div><div class='add'>+	  .beacon_int_infra_match = true,</div><div class='add'>+	  .limits = iwlagn_p2p_sta_go_limits,</div><div class='add'>+	  .n_limits = ARRAY_SIZE(iwlagn_p2p_sta_go_limits),</div><div class='add'>+	},</div><div class='add'>+	{ .num_different_channels = 1,</div><div class='add'>+	  .max_interfaces = 2,</div><div class='add'>+	  .limits = iwlagn_p2p_2sta_limits,</div><div class='add'>+	  .n_limits = ARRAY_SIZE(iwlagn_p2p_2sta_limits),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Not a mac80211 entry point function, but it fits in with all the</div><div class='add'>+ * other mac80211 functions grouped here.</div><div class='add'>+ */</div><div class='add'>+int iwlagn_mac_setup_register(struct iwl_priv *priv,</div><div class='add'>+				  struct iwlagn_ucode_capabilities *capa)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct ieee80211_hw *hw = priv-&gt;hw;</div><div class='add'>+	struct iwl_rxon_context *ctx;</div><div class='add'>+</div><div class='add'>+	hw-&gt;rate_control_algorithm = "iwl-agn-rs";</div><div class='add'>+</div><div class='add'>+	/* Tell mac80211 our characteristics */</div><div class='add'>+	hw-&gt;flags = IEEE80211_HW_SIGNAL_DBM |</div><div class='add'>+		    IEEE80211_HW_AMPDU_AGGREGATION |</div><div class='add'>+		    IEEE80211_HW_NEED_DTIM_PERIOD |</div><div class='add'>+		    IEEE80211_HW_SPECTRUM_MGMT |</div><div class='add'>+		    IEEE80211_HW_REPORTS_TX_ACK_STATUS;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Including the following line will crash some AP's.  This</div><div class='add'>+	 * workaround removes the stimulus which causes the crash until</div><div class='add'>+	 * the AP software can be fixed.</div><div class='add'>+	hw-&gt;max_tx_aggregation_subframes = LINK_QUAL_AGG_FRAME_LIMIT_DEF;</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	hw-&gt;flags |= IEEE80211_HW_SUPPORTS_PS |</div><div class='add'>+		     IEEE80211_HW_SUPPORTS_DYNAMIC_PS;</div><div class='add'>+</div><div class='add'>+	if (cfg(priv)-&gt;sku &amp; EEPROM_SKU_CAP_11N_ENABLE)</div><div class='add'>+		hw-&gt;flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |</div><div class='add'>+			     IEEE80211_HW_SUPPORTS_STATIC_SMPS;</div><div class='add'>+</div><div class='add'>+	if (capa-&gt;flags &amp; IWL_UCODE_TLV_FLAGS_MFP)</div><div class='add'>+		hw-&gt;flags |= IEEE80211_HW_MFP_CAPABLE;</div><div class='add'>+</div><div class='add'>+	hw-&gt;sta_data_size = sizeof(struct iwl_station_priv);</div><div class='add'>+	hw-&gt;vif_data_size = sizeof(struct iwl_vif_priv);</div><div class='add'>+</div><div class='add'>+	for_each_context(priv, ctx) {</div><div class='add'>+		hw-&gt;wiphy-&gt;interface_modes |= ctx-&gt;interface_modes;</div><div class='add'>+		hw-&gt;wiphy-&gt;interface_modes |= ctx-&gt;exclusive_interface_modes;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;wiphy-&gt;interface_modes &amp; BIT(NL80211_IFTYPE_P2P_CLIENT)) {</div><div class='add'>+		hw-&gt;wiphy-&gt;iface_combinations = iwlagn_iface_combinations_p2p;</div><div class='add'>+		hw-&gt;wiphy-&gt;n_iface_combinations =</div><div class='add'>+			ARRAY_SIZE(iwlagn_iface_combinations_p2p);</div><div class='add'>+	} else if (hw-&gt;wiphy-&gt;interface_modes &amp; BIT(NL80211_IFTYPE_AP)) {</div><div class='add'>+		hw-&gt;wiphy-&gt;iface_combinations =</div><div class='add'>+			iwlagn_iface_combinations_dualmode;</div><div class='add'>+		hw-&gt;wiphy-&gt;n_iface_combinations =</div><div class='add'>+			ARRAY_SIZE(iwlagn_iface_combinations_dualmode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw-&gt;wiphy-&gt;max_remain_on_channel_duration = 1000;</div><div class='add'>+</div><div class='add'>+	hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_CUSTOM_REGULATORY |</div><div class='add'>+			    WIPHY_FLAG_DISABLE_BEACON_HINTS |</div><div class='add'>+			    WIPHY_FLAG_IBSS_RSN;</div><div class='add'>+</div><div class='add'>+	if (trans(priv)-&gt;ucode_wowlan.code.len &amp;&amp;</div><div class='add'>+	    device_can_wakeup(bus(priv)-&gt;dev)) {</div><div class='add'>+		hw-&gt;wiphy-&gt;wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT |</div><div class='add'>+					  WIPHY_WOWLAN_DISCONNECT |</div><div class='add'>+					  WIPHY_WOWLAN_EAP_IDENTITY_REQ |</div><div class='add'>+					  WIPHY_WOWLAN_RFKILL_RELEASE;</div><div class='add'>+		if (!iwlagn_mod_params.sw_crypto)</div><div class='add'>+			hw-&gt;wiphy-&gt;wowlan.flags |=</div><div class='add'>+				WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |</div><div class='add'>+				WIPHY_WOWLAN_GTK_REKEY_FAILURE;</div><div class='add'>+</div><div class='add'>+		hw-&gt;wiphy-&gt;wowlan.n_patterns = IWLAGN_WOWLAN_MAX_PATTERNS;</div><div class='add'>+		hw-&gt;wiphy-&gt;wowlan.pattern_min_len =</div><div class='add'>+					IWLAGN_WOWLAN_MIN_PATTERN_LEN;</div><div class='add'>+		hw-&gt;wiphy-&gt;wowlan.pattern_max_len =</div><div class='add'>+					IWLAGN_WOWLAN_MAX_PATTERN_LEN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iwlagn_mod_params.power_save)</div><div class='add'>+		hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT;</div><div class='add'>+	else</div><div class='add'>+		hw-&gt;wiphy-&gt;flags &amp;= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;</div><div class='add'>+</div><div class='add'>+	hw-&gt;wiphy-&gt;max_scan_ssids = PROBE_OPTION_MAX;</div><div class='add'>+	/* we create the 802.11 header and a zero-length SSID element */</div><div class='add'>+	hw-&gt;wiphy-&gt;max_scan_ie_len = capa-&gt;max_probe_length - 24 - 2;</div><div class='add'>+</div><div class='add'>+	/* Default value; 4 EDCA QOS priorities */</div><div class='add'>+	hw-&gt;queues = 4;</div><div class='add'>+</div><div class='add'>+	hw-&gt;max_listen_interval = IWL_CONN_MAX_LISTEN_INTERVAL;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;bands[IEEE80211_BAND_2GHZ].n_channels)</div><div class='add'>+		priv-&gt;hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_2GHZ] =</div><div class='add'>+			&amp;priv-&gt;bands[IEEE80211_BAND_2GHZ];</div><div class='add'>+	if (priv-&gt;bands[IEEE80211_BAND_5GHZ].n_channels)</div><div class='add'>+		priv-&gt;hw-&gt;wiphy-&gt;bands[IEEE80211_BAND_5GHZ] =</div><div class='add'>+			&amp;priv-&gt;bands[IEEE80211_BAND_5GHZ];</div><div class='add'>+</div><div class='add'>+	hw-&gt;wiphy-&gt;hw_version = bus_get_hw_id(bus(priv));</div><div class='add'>+</div><div class='add'>+	iwl_leds_init(priv);</div><div class='add'>+</div><div class='add'>+	ret = ieee80211_register_hw(priv-&gt;hw);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(priv, "Failed to register hw (error %d)\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;mac80211_registered = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwlagn_mac_unregister(struct iwl_priv *priv)</div><div class='add'>+{</div><div class='add'>+	if (!priv-&gt;mac80211_registered)</div><div class='add'>+		return;</div><div class='add'>+	iwl_leds_exit(priv);</div><div class='add'>+	ieee80211_unregister_hw(priv-&gt;hw);</div><div class='add'>+	priv-&gt;mac80211_registered = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __iwl_up(struct iwl_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rxon_context *ctx;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;shrd-&gt;status)) {</div><div class='add'>+		IWL_WARN(priv, "Exit pending; will not bring the NIC up\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_context(priv, ctx) {</div><div class='add'>+		ret = iwlagn_alloc_bcast_station(priv, ctx);</div><div class='add'>+		if (ret) {</div><div class='add'>+			iwl_dealloc_bcast_stations(priv);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_run_init_ucode(trans(priv));</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(priv, "Failed to run INIT ucode: %d\n", ret);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_load_ucode_wait_alive(trans(priv), IWL_UCODE_REGULAR);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(priv, "Failed to start RT ucode: %d\n", ret);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_alive_start(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	set_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;shrd-&gt;status);</div><div class='add'>+	__iwl_down(priv);</div><div class='add'>+	clear_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;shrd-&gt;status);</div><div class='add'>+</div><div class='add'>+	IWL_ERR(priv, "Unable to initialize device.\n");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwlagn_mac_start(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+</div><div class='add'>+	/* we should be verifying the device is ready to be opened */</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	ret = __iwl_up(priv);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_INFO(priv, "Start UP work done.\n");</div><div class='add'>+</div><div class='add'>+	/* Now we should be done, and the READY bit should be set. */</div><div class='add'>+	if (WARN_ON(!test_bit(STATUS_READY, &amp;priv-&gt;shrd-&gt;status)))</div><div class='add'>+		ret = -EIO;</div><div class='add'>+</div><div class='add'>+	iwlagn_led_enable(priv);</div><div class='add'>+</div><div class='add'>+	priv-&gt;is_open = 1;</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwlagn_mac_stop(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;is_open)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	priv-&gt;is_open = 0;</div><div class='add'>+</div><div class='add'>+	iwl_down(priv);</div><div class='add'>+</div><div class='add'>+	flush_workqueue(priv-&gt;shrd-&gt;workqueue);</div><div class='add'>+</div><div class='add'>+	/* User space software may expect getting rfkill changes</div><div class='add'>+	 * even if interface is down */</div><div class='add'>+	iwl_write32(bus(priv), CSR_INT, 0xFFFFFFFF);</div><div class='add'>+	iwl_enable_rfkill_int(priv);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      struct cfg80211_gtk_rekey_data *data)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (iwlagn_mod_params.sw_crypto)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;contexts[IWL_RXON_CTX_BSS].vif != vif)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	memcpy(priv-&gt;kek, data-&gt;kek, NL80211_KEK_LEN);</div><div class='add'>+	memcpy(priv-&gt;kck, data-&gt;kck, NL80211_KCK_LEN);</div><div class='add'>+	priv-&gt;replay_ctr =</div><div class='add'>+		cpu_to_le64(be64_to_cpup((__be64 *)&amp;data-&gt;replay_ctr));</div><div class='add'>+	priv-&gt;have_rekey_data = true;</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+</div><div class='add'>+static int iwlagn_mac_suspend(struct ieee80211_hw *hw,</div><div class='add'>+			      struct cfg80211_wowlan *wowlan)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!wowlan))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* Don't attempt WoWLAN when not associated, tear down instead. */</div><div class='add'>+	if (!ctx-&gt;vif || ctx-&gt;vif-&gt;type != NL80211_IFTYPE_STATION ||</div><div class='add'>+	    !iwl_is_associated_ctx(ctx)) {</div><div class='add'>+		ret = 1;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwlagn_suspend(priv, hw, wowlan);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	device_set_wakeup_enable(bus(priv)-&gt;dev, true);</div><div class='add'>+</div><div class='add'>+	/* Now let the ucode operate on its own */</div><div class='add'>+	iwl_write32(bus(priv), CSR_UCODE_DRV_GP1_SET,</div><div class='add'>+			  CSR_UCODE_DRV_GP1_BIT_D3_CFG_COMPLETE);</div><div class='add'>+</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	priv-&gt;shrd-&gt;wowlan = false;</div><div class='add'>+	iwlagn_prepare_restart(priv);</div><div class='add'>+	ieee80211_restart_hw(priv-&gt;hw);</div><div class='add'>+ out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\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 iwlagn_mac_resume(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 base, status = 0xffffffff;</div><div class='add'>+	int ret = -EIO;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	iwl_write32(bus(priv), CSR_UCODE_DRV_GP1_CLR,</div><div class='add'>+			  CSR_UCODE_DRV_GP1_BIT_D3_CFG_COMPLETE);</div><div class='add'>+</div><div class='add'>+	base = priv-&gt;shrd-&gt;device_pointers.error_event_table;</div><div class='add'>+	if (iwlagn_hw_valid_rtc_data_addr(base)) {</div><div class='add'>+		spin_lock_irqsave(&amp;bus(priv)-&gt;reg_lock, flags);</div><div class='add'>+		ret = iwl_grab_nic_access_silent(bus(priv));</div><div class='add'>+		if (ret == 0) {</div><div class='add'>+			iwl_write32(bus(priv), HBUS_TARG_MEM_RADDR, base);</div><div class='add'>+			status = iwl_read32(bus(priv), HBUS_TARG_MEM_RDAT);</div><div class='add'>+			iwl_release_nic_access(bus(priv));</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;bus(priv)-&gt;reg_lock, flags);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='add'>+		if (ret == 0) {</div><div class='add'>+			struct iwl_trans *trans = trans(priv);</div><div class='add'>+			if (!priv-&gt;wowlan_sram)</div><div class='add'>+				priv-&gt;wowlan_sram =</div><div class='add'>+					kzalloc(trans-&gt;ucode_wowlan.data.len,</div><div class='add'>+						GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+			if (priv-&gt;wowlan_sram)</div><div class='add'>+				_iwl_read_targ_mem_words(</div><div class='add'>+					bus(priv), 0x800000, priv-&gt;wowlan_sram,</div><div class='add'>+					trans-&gt;ucode_wowlan.data.len / 4);</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we'll clear ctx-&gt;vif during iwlagn_prepare_restart() */</div><div class='add'>+	vif = ctx-&gt;vif;</div><div class='add'>+</div><div class='add'>+	priv-&gt;shrd-&gt;wowlan = false;</div><div class='add'>+</div><div class='add'>+	device_set_wakeup_enable(bus(priv)-&gt;dev, false);</div><div class='add'>+</div><div class='add'>+	iwlagn_prepare_restart(priv);</div><div class='add'>+</div><div class='add'>+	memset((void *)&amp;ctx-&gt;active, 0, sizeof(ctx-&gt;active));</div><div class='add'>+	iwl_connection_init_rx_config(priv, ctx);</div><div class='add'>+	iwlagn_set_rxon_chain(priv, ctx);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+</div><div class='add'>+	ieee80211_resume_disconnect(vif);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_TX(priv, "dev-&gt;xmit(%d bytes) at rate 0x%02x\n", skb-&gt;len,</div><div class='add'>+		     ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))-&gt;bitrate);</div><div class='add'>+</div><div class='add'>+	if (iwlagn_tx_skb(priv, skb))</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='add'>+				       struct ieee80211_key_conf *keyconf,</div><div class='add'>+				       struct ieee80211_sta *sta,</div><div class='add'>+				       u32 iv32, u16 *phase1key)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	iwl_update_tkip_key(priv, vif, keyconf, sta, iv32, phase1key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      struct ieee80211_sta *sta,</div><div class='add'>+			      struct ieee80211_key_conf *key)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct iwl_rxon_context *ctx = vif_priv-&gt;ctx;</div><div class='add'>+	int ret;</div><div class='add'>+	bool is_default_wep_key = false;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+</div><div class='add'>+	if (iwlagn_mod_params.sw_crypto) {</div><div class='add'>+		IWL_DEBUG_MAC80211(priv, "leave - hwcrypto disabled\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (key-&gt;cipher) {</div><div class='add'>+	case WLAN_CIPHER_SUITE_TKIP:</div><div class='add'>+		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;</div><div class='add'>+		/* fall through */</div><div class='add'>+	case WLAN_CIPHER_SUITE_CCMP:</div><div class='add'>+		key-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV;</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'>+	 * We could program these keys into the hardware as well, but we</div><div class='add'>+	 * don't expect much multicast traffic in IBSS and having keys</div><div class='add'>+	 * for more stations is probably more useful.</div><div class='add'>+	 *</div><div class='add'>+	 * Mark key TX-only and return 0.</div><div class='add'>+	 */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_ADHOC &amp;&amp;</div><div class='add'>+	    !(key-&gt;flags &amp; IEEE80211_KEY_FLAG_PAIRWISE)) {</div><div class='add'>+		key-&gt;hw_key_idx = WEP_INVALID_OFFSET;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If they key was TX-only, accept deletion */</div><div class='add'>+	if (cmd == DISABLE_KEY &amp;&amp; key-&gt;hw_key_idx == WEP_INVALID_OFFSET)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	iwl_scan_cancel_timeout(priv, 100);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(WEP_INVALID_OFFSET == IWLAGN_HW_KEY_DEFAULT);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we are getting WEP group key and we didn't receive any key mapping</div><div class='add'>+	 * so far, we are in legacy wep mode (group key only), otherwise we are</div><div class='add'>+	 * in 1X mode.</div><div class='add'>+	 * In legacy wep mode, we use another host command to the uCode.</div><div class='add'>+	 */</div><div class='add'>+	if ((key-&gt;cipher == WLAN_CIPHER_SUITE_WEP40 ||</div><div class='add'>+	     key-&gt;cipher == WLAN_CIPHER_SUITE_WEP104) &amp;&amp; !sta) {</div><div class='add'>+		if (cmd == SET_KEY)</div><div class='add'>+			is_default_wep_key = !ctx-&gt;key_mapping_keys;</div><div class='add'>+		else</div><div class='add'>+			is_default_wep_key =</div><div class='add'>+				key-&gt;hw_key_idx == IWLAGN_HW_KEY_DEFAULT;</div><div class='add'>+	}</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'>+		if (is_default_wep_key) {</div><div class='add'>+			ret = iwl_set_default_wep_key(priv, vif_priv-&gt;ctx, key);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ret = iwl_set_dynamic_key(priv, vif_priv-&gt;ctx, key, sta);</div><div class='add'>+		if (ret) {</div><div class='add'>+			/*</div><div class='add'>+			 * can't add key for RX, but we don't need it</div><div class='add'>+			 * in the device for TX so still return 0</div><div class='add'>+			 */</div><div class='add'>+			ret = 0;</div><div class='add'>+			key-&gt;hw_key_idx = WEP_INVALID_OFFSET;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		IWL_DEBUG_MAC80211(priv, "enable hwcrypto key\n");</div><div class='add'>+		break;</div><div class='add'>+	case DISABLE_KEY:</div><div class='add'>+		if (is_default_wep_key)</div><div class='add'>+			ret = iwl_remove_default_wep_key(priv, ctx, key);</div><div class='add'>+		else</div><div class='add'>+			ret = iwl_remove_dynamic_key(priv, ctx, key, sta);</div><div class='add'>+</div><div class='add'>+		IWL_DEBUG_MAC80211(priv, "disable hwcrypto key\n");</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'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\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 iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   enum ieee80211_ampdu_mlme_action action,</div><div class='add'>+				   struct ieee80211_sta *sta, u16 tid, u16 *ssn,</div><div class='add'>+				   u8 buf_size)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	struct iwl_station_priv *sta_priv = (void *) sta-&gt;drv_priv;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_HT(priv, "A-MPDU action on addr %pM tid %d\n",</div><div class='add'>+		     sta-&gt;addr, tid);</div><div class='add'>+</div><div class='add'>+	if (!(cfg(priv)-&gt;sku &amp; EEPROM_SKU_CAP_11N_ENABLE))</div><div class='add'>+		return -EACCES;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case IEEE80211_AMPDU_RX_START:</div><div class='add'>+		if (iwlagn_mod_params.disable_11n &amp; IWL_DISABLE_HT_RXAGG)</div><div class='add'>+			break;</div><div class='add'>+		IWL_DEBUG_HT(priv, "start Rx\n");</div><div class='add'>+		ret = iwl_sta_rx_agg_start(priv, sta, tid, *ssn);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_RX_STOP:</div><div class='add'>+		IWL_DEBUG_HT(priv, "stop Rx\n");</div><div class='add'>+		ret = iwl_sta_rx_agg_stop(priv, sta, tid);</div><div class='add'>+		if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;shrd-&gt;status))</div><div class='add'>+			ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_TX_START:</div><div class='add'>+		if (iwlagn_mod_params.disable_11n &amp; IWL_DISABLE_HT_TXAGG)</div><div class='add'>+			break;</div><div class='add'>+		IWL_DEBUG_HT(priv, "start Tx\n");</div><div class='add'>+		ret = iwlagn_tx_agg_start(priv, vif, sta, tid, ssn);</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_TX_STOP:</div><div class='add'>+		IWL_DEBUG_HT(priv, "stop Tx\n");</div><div class='add'>+		ret = iwlagn_tx_agg_stop(priv, vif, sta, tid);</div><div class='add'>+		if ((ret == 0) &amp;&amp; (priv-&gt;agg_tids_count &gt; 0)) {</div><div class='add'>+			priv-&gt;agg_tids_count--;</div><div class='add'>+			IWL_DEBUG_HT(priv, "priv-&gt;agg_tids_count = %u\n",</div><div class='add'>+				     priv-&gt;agg_tids_count);</div><div class='add'>+		}</div><div class='add'>+		if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;shrd-&gt;status))</div><div class='add'>+			ret = 0;</div><div class='add'>+		if (!priv-&gt;agg_tids_count &amp;&amp; cfg(priv)-&gt;ht_params &amp;&amp;</div><div class='add'>+		    cfg(priv)-&gt;ht_params-&gt;use_rts_for_aggregation) {</div><div class='add'>+			/*</div><div class='add'>+			 * switch off RTS/CTS if it was previously enabled</div><div class='add'>+			 */</div><div class='add'>+			sta_priv-&gt;lq_sta.lq.general_params.flags &amp;=</div><div class='add'>+				~LINK_QUAL_FLAGS_SET_STA_TLC_RTS_MSK;</div><div class='add'>+			iwl_send_lq_cmd(priv, iwl_rxon_ctx_from_vif(vif),</div><div class='add'>+					&amp;sta_priv-&gt;lq_sta.lq, CMD_ASYNC, false);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_AMPDU_TX_OPERATIONAL:</div><div class='add'>+		ret = iwlagn_tx_agg_oper(priv, vif, sta, tid, buf_size);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwlagn_mac_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 iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	struct iwl_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='add'>+	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='add'>+	bool is_ap = vif-&gt;type == NL80211_IFTYPE_STATION;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "received request to add station %pM\n",</div><div class='add'>+			sta-&gt;addr);</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	IWL_DEBUG_INFO(priv, "proceeding to add station %pM\n",</div><div class='add'>+			sta-&gt;addr);</div><div class='add'>+	sta_priv-&gt;sta_id = IWL_INVALID_STATION;</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;sta_priv-&gt;pending_frames, 0);</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_AP)</div><div class='add'>+		sta_priv-&gt;client = true;</div><div class='add'>+</div><div class='add'>+	ret = iwl_add_station_common(priv, vif_priv-&gt;ctx, sta-&gt;addr,</div><div class='add'>+				     is_ap, sta, &amp;sta_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		IWL_ERR(priv, "Unable to add station %pM (%d)\n",</div><div class='add'>+			sta-&gt;addr, ret);</div><div class='add'>+		/* Should we return success if return code is EEXIST ? */</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sta_priv-&gt;sta_id = sta_id;</div><div class='add'>+</div><div class='add'>+	/* Initialize rate scaling */</div><div class='add'>+	IWL_DEBUG_INFO(priv, "Initializing rate scaling for station %pM\n",</div><div class='add'>+		       sta-&gt;addr);</div><div class='add'>+	iwl_rs_rate_init(priv, sta, sta_id);</div><div class='add'>+ out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_channel_switch *ch_switch)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	const struct iwl_channel_info *ch_info;</div><div class='add'>+	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</div><div class='add'>+	struct ieee80211_channel *channel = ch_switch-&gt;channel;</div><div class='add'>+	struct iwl_ht_config *ht_conf = &amp;priv-&gt;current_ht_config;</div><div class='add'>+	/*</div><div class='add'>+	 * MULTI-FIXME</div><div class='add'>+	 * When we add support for multiple interfaces, we need to</div><div class='add'>+	 * revisit this. The channel switch command in the device</div><div class='add'>+	 * only affects the BSS context, but what does that really</div><div class='add'>+	 * mean? And what if we get a CSA on the second interface?</div><div class='add'>+	 * This needs a lot of work.</div><div class='add'>+	 */</div><div class='add'>+	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='add'>+	u16 ch;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (iwl_is_rfkill(priv-&gt;shrd))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;shrd-&gt;status) ||</div><div class='add'>+	    test_bit(STATUS_SCANNING, &amp;priv-&gt;shrd-&gt;status) ||</div><div class='add'>+	    test_bit(STATUS_CHANNEL_SWITCH_PENDING, &amp;priv-&gt;shrd-&gt;status))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!iwl_is_associated_ctx(ctx))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!cfg(priv)-&gt;lib-&gt;set_channel_switch)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ch = channel-&gt;hw_value;</div><div class='add'>+	if (le16_to_cpu(ctx-&gt;active.channel) == ch)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ch_info = iwl_get_channel_info(priv, channel-&gt;band, ch);</div><div class='add'>+	if (!is_channel_valid(ch_info)) {</div><div class='add'>+		IWL_DEBUG_MAC80211(priv, "invalid channel\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;priv-&gt;shrd-&gt;lock);</div><div class='add'>+</div><div class='add'>+	priv-&gt;current_ht_config.smps = conf-&gt;smps_mode;</div><div class='add'>+</div><div class='add'>+	/* Configure HT40 channels */</div><div class='add'>+	ctx-&gt;ht.enabled = conf_is_ht(conf);</div><div class='add'>+	if (ctx-&gt;ht.enabled)</div><div class='add'>+		iwlagn_config_ht40(conf, ctx);</div><div class='add'>+	else</div><div class='add'>+		ctx-&gt;ht.is_40mhz = false;</div><div class='add'>+</div><div class='add'>+	if ((le16_to_cpu(ctx-&gt;staging.channel) != ch))</div><div class='add'>+		ctx-&gt;staging.flags = 0;</div><div class='add'>+</div><div class='add'>+	iwl_set_rxon_channel(priv, channel, ctx);</div><div class='add'>+	iwl_set_rxon_ht(priv, ht_conf);</div><div class='add'>+	iwl_set_flags_for_band(priv, ctx, channel-&gt;band, ctx-&gt;vif);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;priv-&gt;shrd-&gt;lock);</div><div class='add'>+</div><div class='add'>+	iwl_set_rate(priv);</div><div class='add'>+	/*</div><div class='add'>+	 * at this point, staging_rxon has the</div><div class='add'>+	 * configuration for channel switch</div><div class='add'>+	 */</div><div class='add'>+	set_bit(STATUS_CHANNEL_SWITCH_PENDING, &amp;priv-&gt;shrd-&gt;status);</div><div class='add'>+	priv-&gt;switch_channel = cpu_to_le16(ch);</div><div class='add'>+	if (cfg(priv)-&gt;lib-&gt;set_channel_switch(priv, ch_switch)) {</div><div class='add'>+		clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &amp;priv-&gt;shrd-&gt;status);</div><div class='add'>+		priv-&gt;switch_channel = 0;</div><div class='add'>+		ieee80211_chswitch_done(ctx-&gt;vif, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwlagn_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 iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	__le32 filter_or = 0, filter_nand = 0;</div><div class='add'>+	struct iwl_rxon_context *ctx;</div><div class='add'>+</div><div class='add'>+#define CHK(test, flag)	do { \</div><div class='add'>+	if (*total_flags &amp; (test))		\</div><div class='add'>+		filter_or |= (flag);		\</div><div class='add'>+	else					\</div><div class='add'>+		filter_nand |= (flag);		\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "Enter: changed: 0x%x, total: 0x%x\n",</div><div class='add'>+			changed_flags, *total_flags);</div><div class='add'>+</div><div class='add'>+	CHK(FIF_OTHER_BSS | FIF_PROMISC_IN_BSS, RXON_FILTER_PROMISC_MSK);</div><div class='add'>+	/* Setting _just_ RXON_FILTER_CTL2HOST_MSK causes FH errors */</div><div class='add'>+	CHK(FIF_CONTROL, RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_PROMISC_MSK);</div><div class='add'>+	CHK(FIF_BCN_PRBRESP_PROMISC, RXON_FILTER_BCON_AWARE_MSK);</div><div class='add'>+</div><div class='add'>+#undef CHK</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	for_each_context(priv, ctx) {</div><div class='add'>+		ctx-&gt;staging.filter_flags &amp;= ~filter_nand;</div><div class='add'>+		ctx-&gt;staging.filter_flags |= filter_or;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Not committing directly because hardware can perform a scan,</div><div class='add'>+		 * but we'll eventually commit the filter flags change anyway.</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Receiving all multicast frames is always enabled by the</div><div class='add'>+	 * default flags setup in iwl_connection_init_rx_config()</div><div class='add'>+	 * since we currently do not support programming multicast</div><div class='add'>+	 * filters into the device.</div><div class='add'>+	 */</div><div class='add'>+	*total_flags &amp;= FIF_OTHER_BSS | FIF_ALLMULTI | FIF_PROMISC_IN_BSS |</div><div class='add'>+			FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+</div><div class='add'>+	if (test_bit(STATUS_EXIT_PENDING, &amp;priv-&gt;shrd-&gt;status)) {</div><div class='add'>+		IWL_DEBUG_TX(priv, "Aborting flush due to device shutdown\n");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	if (iwl_is_rfkill(priv-&gt;shrd)) {</div><div class='add'>+		IWL_DEBUG_TX(priv, "Aborting flush due to RF Kill\n");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * mac80211 will not push any more frames for transmit</div><div class='add'>+	 * until the flush is completed</div><div class='add'>+	 */</div><div class='add'>+	if (drop) {</div><div class='add'>+		IWL_DEBUG_MAC80211(priv, "send flush command\n");</div><div class='add'>+		if (iwlagn_txfifo_flush(priv, IWL_DROP_ALL)) {</div><div class='add'>+			IWL_ERR(priv, "flush request fail\n");</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "wait transmit/flush all frames\n");</div><div class='add'>+	iwl_trans_wait_tx_queue_empty(trans(priv));</div><div class='add'>+done:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwlagn_mac_remain_on_channel(struct ieee80211_hw *hw,</div><div class='add'>+				     struct ieee80211_channel *channel,</div><div class='add'>+				     enum nl80211_channel_type channel_type,</div><div class='add'>+				     int duration)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_PAN];</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;shrd-&gt;valid_contexts &amp; BIT(IWL_RXON_CTX_PAN)))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!(ctx-&gt;interface_modes &amp; BIT(NL80211_IFTYPE_P2P_CLIENT)))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (test_bit(STATUS_SCAN_HW, &amp;priv-&gt;shrd-&gt;status)) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;hw_roc_channel = channel;</div><div class='add'>+	priv-&gt;hw_roc_chantype = channel_type;</div><div class='add'>+	/* convert from ms to TU */</div><div class='add'>+	priv-&gt;hw_roc_duration = DIV_ROUND_UP(1000 * duration, 1024);</div><div class='add'>+	priv-&gt;hw_roc_start_notified = false;</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;hw_roc_disable_work);</div><div class='add'>+</div><div class='add'>+	if (!ctx-&gt;is_active) {</div><div class='add'>+		static const struct iwl_qos_info default_qos_data = {</div><div class='add'>+			.def_qos_parm = {</div><div class='add'>+				.ac[0] = {</div><div class='add'>+					.cw_min = cpu_to_le16(3),</div><div class='add'>+					.cw_max = cpu_to_le16(7),</div><div class='add'>+					.aifsn = 2,</div><div class='add'>+					.edca_txop = cpu_to_le16(1504),</div><div class='add'>+				},</div><div class='add'>+				.ac[1] = {</div><div class='add'>+					.cw_min = cpu_to_le16(7),</div><div class='add'>+					.cw_max = cpu_to_le16(15),</div><div class='add'>+					.aifsn = 2,</div><div class='add'>+					.edca_txop = cpu_to_le16(3008),</div><div class='add'>+				},</div><div class='add'>+				.ac[2] = {</div><div class='add'>+					.cw_min = cpu_to_le16(15),</div><div class='add'>+					.cw_max = cpu_to_le16(1023),</div><div class='add'>+					.aifsn = 3,</div><div class='add'>+				},</div><div class='add'>+				.ac[3] = {</div><div class='add'>+					.cw_min = cpu_to_le16(15),</div><div class='add'>+					.cw_max = cpu_to_le16(1023),</div><div class='add'>+					.aifsn = 7,</div><div class='add'>+				},</div><div class='add'>+			},</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ctx-&gt;is_active = true;</div><div class='add'>+		ctx-&gt;qos_data = default_qos_data;</div><div class='add'>+		ctx-&gt;staging.dev_type = RXON_DEV_TYPE_P2P;</div><div class='add'>+		memcpy(ctx-&gt;staging.node_addr,</div><div class='add'>+		       priv-&gt;contexts[IWL_RXON_CTX_BSS].staging.node_addr,</div><div class='add'>+		       ETH_ALEN);</div><div class='add'>+		memcpy(ctx-&gt;staging.bssid_addr,</div><div class='add'>+		       priv-&gt;contexts[IWL_RXON_CTX_BSS].staging.node_addr,</div><div class='add'>+		       ETH_ALEN);</div><div class='add'>+		err = iwlagn_commit_rxon(priv, ctx);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+		ctx-&gt;staging.filter_flags |= RXON_FILTER_ASSOC_MSK |</div><div class='add'>+					     RXON_FILTER_PROMISC_MSK |</div><div class='add'>+					     RXON_FILTER_CTL2HOST_MSK;</div><div class='add'>+</div><div class='add'>+		err = iwlagn_commit_rxon(priv, ctx);</div><div class='add'>+		if (err) {</div><div class='add'>+			iwlagn_disable_roc(priv);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		priv-&gt;hw_roc_setup = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = iwl_scan_initiate(priv, ctx-&gt;vif, IWL_SCAN_ROC, channel-&gt;band);</div><div class='add'>+	if (err)</div><div class='add'>+		iwlagn_disable_roc(priv);</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;shrd-&gt;valid_contexts &amp; BIT(IWL_RXON_CTX_PAN)))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	iwl_scan_cancel_timeout(priv, priv-&gt;hw_roc_duration);</div><div class='add'>+	iwlagn_disable_roc(priv);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwlagn_mac_tx_sync(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_vif *vif,</div><div class='add'>+			      const u8 *bssid,</div><div class='add'>+			      enum ieee80211_tx_sync_type type)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct iwl_rxon_context *ctx = vif_priv-&gt;ctx;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 sta_id;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;ctxid != IWL_RXON_CTX_PAN)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (iwl_is_associated_ctx(ctx)) {</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;preauth_bssid || test_bit(STATUS_SCAN_HW,</div><div class='add'>+	    &amp;priv-&gt;shrd-&gt;status)) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_add_station_common(priv, ctx, bssid, true, NULL, &amp;sta_id);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(sta_id != ctx-&gt;ap_sta_id)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out_remove_sta;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(ctx-&gt;bssid, bssid, ETH_ALEN);</div><div class='add'>+	ctx-&gt;preauth_bssid = true;</div><div class='add'>+</div><div class='add'>+	ret = iwlagn_commit_rxon(priv, ctx);</div><div class='add'>+</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+ out_remove_sta:</div><div class='add'>+	iwl_remove_station(priv, sta_id, bssid);</div><div class='add'>+ out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwlagn_mac_finish_tx_sync(struct ieee80211_hw *hw,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   const u8 *bssid,</div><div class='add'>+				   enum ieee80211_tx_sync_type type)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct iwl_rxon_context *ctx = vif_priv-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;ctxid != IWL_RXON_CTX_PAN)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (iwl_is_associated_ctx(ctx))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	iwl_remove_station(priv, ctx-&gt;ap_sta_id, bssid);</div><div class='add'>+	ctx-&gt;preauth_bssid = false;</div><div class='add'>+	/* no need to commit */</div><div class='add'>+ out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,</div><div class='add'>+			   enum ieee80211_rssi_event rssi_event)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (cfg(priv)-&gt;bt_params &amp;&amp;</div><div class='add'>+			cfg(priv)-&gt;bt_params-&gt;advanced_bt_coexist) {</div><div class='add'>+		if (rssi_event == RSSI_EVENT_LOW)</div><div class='add'>+			priv-&gt;bt_enable_pspoll = true;</div><div class='add'>+		else if (rssi_event == RSSI_EVENT_HIGH)</div><div class='add'>+			priv-&gt;bt_enable_pspoll = false;</div><div class='add'>+</div><div class='add'>+		iwlagn_send_advance_bt_config(priv);</div><div class='add'>+	} else {</div><div class='add'>+		IWL_DEBUG_MAC80211(priv, "Advanced BT coex disabled,"</div><div class='add'>+				"ignoring RSSI callback\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwlagn_mac_set_tim(struct ieee80211_hw *hw,</div><div class='add'>+			   struct ieee80211_sta *sta, bool set)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	queue_work(priv-&gt;shrd-&gt;workqueue, &amp;priv-&gt;beacon_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 iwlagn_mac_conf_tx(struct ieee80211_hw *hw,</div><div class='add'>+		    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 iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct iwl_rxon_context *ctx = vif_priv-&gt;ctx;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int q;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!ctx))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+</div><div class='add'>+	if (!iwl_is_ready_rf(priv-&gt;shrd)) {</div><div class='add'>+		IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (queue &gt;= AC_NUM) {</div><div class='add'>+		IWL_DEBUG_MAC80211(priv, "leave - queue &gt;= AC_NUM %d\n", queue);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	q = AC_NUM - 1 - queue;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;shrd-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;qos_data.def_qos_parm.ac[q].cw_min =</div><div class='add'>+		cpu_to_le16(params-&gt;cw_min);</div><div class='add'>+	ctx-&gt;qos_data.def_qos_parm.ac[q].cw_max =</div><div class='add'>+		cpu_to_le16(params-&gt;cw_max);</div><div class='add'>+	ctx-&gt;qos_data.def_qos_parm.ac[q].aifsn = params-&gt;aifs;</div><div class='add'>+	ctx-&gt;qos_data.def_qos_parm.ac[q].edca_txop =</div><div class='add'>+			cpu_to_le16((params-&gt;txop * 32));</div><div class='add'>+</div><div class='add'>+	ctx-&gt;qos_data.def_qos_parm.ac[q].reserved1 = 0;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;shrd-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwlagn_mac_tx_last_beacon(struct ieee80211_hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return priv-&gt;ibss_manager == IWL_IBSS_MANAGER;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_set_mode(struct iwl_priv *priv, struct iwl_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	iwl_connection_init_rx_config(priv, ctx);</div><div class='add'>+</div><div class='add'>+	iwlagn_set_rxon_chain(priv, ctx);</div><div class='add'>+</div><div class='add'>+	return iwlagn_commit_rxon(priv, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_setup_interface(struct iwl_priv *priv,</div><div class='add'>+			       struct iwl_rxon_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_vif *vif = ctx-&gt;vif;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This variable will be correct only when there's just</div><div class='add'>+	 * a single context, but all code using it is for hardware</div><div class='add'>+	 * that supports only one context.</div><div class='add'>+	 */</div><div class='add'>+	priv-&gt;iw_mode = vif-&gt;type;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;is_active = true;</div><div class='add'>+</div><div class='add'>+	err = iwl_set_mode(priv, ctx);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (!ctx-&gt;always_active)</div><div class='add'>+			ctx-&gt;is_active = false;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg(priv)-&gt;bt_params &amp;&amp; cfg(priv)-&gt;bt_params-&gt;advanced_bt_coexist &amp;&amp;</div><div class='add'>+	    vif-&gt;type == NL80211_IFTYPE_ADHOC) {</div><div class='add'>+		/*</div><div class='add'>+		 * pretend to have high BT traffic as long as we</div><div class='add'>+		 * are operating in IBSS mode, as this will cause</div><div class='add'>+		 * the rate scaling etc. to behave as intended.</div><div class='add'>+		 */</div><div class='add'>+		priv-&gt;bt_traffic_load = IWL_BT_COEX_TRAFFIC_LOAD_HIGH;</div><div 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 iwlagn_mac_add_interface(struct ieee80211_hw *hw,</div><div class='add'>+			     struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	struct iwl_vif_priv *vif_priv = (void *)vif-&gt;drv_priv;</div><div class='add'>+	struct iwl_rxon_context *tmp, *ctx = NULL;</div><div class='add'>+	int err;</div><div class='add'>+	enum nl80211_iftype viftype = ieee80211_vif_type_p2p(vif);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter: type %d, addr %pM\n",</div><div class='add'>+			   viftype, vif-&gt;addr);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;priv-&gt;hw_roc_disable_work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	iwlagn_disable_roc(priv);</div><div class='add'>+</div><div class='add'>+	if (!iwl_is_ready_rf(priv-&gt;shrd)) {</div><div class='add'>+		IWL_WARN(priv, "Try to add interface when device not ready\n");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_context(priv, tmp) {</div><div class='add'>+		u32 possible_modes =</div><div class='add'>+			tmp-&gt;interface_modes | tmp-&gt;exclusive_interface_modes;</div><div class='add'>+</div><div class='add'>+		if (tmp-&gt;vif) {</div><div class='add'>+			/* check if this busy context is exclusive */</div><div class='add'>+			if (tmp-&gt;exclusive_interface_modes &amp;</div><div class='add'>+						BIT(tmp-&gt;vif-&gt;type)) {</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(possible_modes &amp; BIT(viftype)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* have maybe usable context w/o interface */</div><div class='add'>+		ctx = tmp;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ctx) {</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vif_priv-&gt;ctx = ctx;</div><div class='add'>+	ctx-&gt;vif = vif;</div><div class='add'>+</div><div class='add'>+	err = iwl_setup_interface(priv, ctx);</div><div class='add'>+	if (!err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;vif = NULL;</div><div class='add'>+	priv-&gt;iw_mode = NL80211_IFTYPE_STATION;</div><div class='add'>+ out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_teardown_interface(struct iwl_priv *priv,</div><div class='add'>+				   struct ieee80211_vif *vif,</div><div class='add'>+				   bool mode_change)</div><div class='add'>+{</div><div class='add'>+	struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;scan_vif == vif) {</div><div class='add'>+		iwl_scan_cancel_timeout(priv, 200);</div><div class='add'>+		iwl_force_scan_end(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mode_change) {</div><div class='add'>+		iwl_set_mode(priv, ctx);</div><div class='add'>+		if (!ctx-&gt;always_active)</div><div class='add'>+			ctx-&gt;is_active = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When removing the IBSS interface, overwrite the</div><div class='add'>+	 * BT traffic load with the stored one from the last</div><div class='add'>+	 * notification, if any. If this is a device that</div><div class='add'>+	 * doesn't implement this, this has no effect since</div><div class='add'>+	 * both values are the same and zero.</div><div class='add'>+	 */</div><div class='add'>+	if (vif-&gt;type == NL80211_IFTYPE_ADHOC)</div><div class='add'>+		priv-&gt;bt_traffic_load = priv-&gt;last_bt_traffic_load;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwlagn_mac_remove_interface(struct ieee80211_hw *hw,</div><div class='add'>+			      struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ctx-&gt;vif != vif)) {</div><div class='add'>+		struct iwl_rxon_context *tmp;</div><div class='add'>+		IWL_ERR(priv, "ctx-&gt;vif = %p, vif = %p\n", ctx-&gt;vif, vif);</div><div class='add'>+		for_each_context(priv, tmp)</div><div class='add'>+			IWL_ERR(priv, "\tID = %d:\tctx = %p\tctx-&gt;vif = %p\n",</div><div class='add'>+				tmp-&gt;ctxid, tmp, tmp-&gt;vif);</div><div class='add'>+	}</div><div class='add'>+	ctx-&gt;vif = NULL;</div><div class='add'>+</div><div class='add'>+	iwl_teardown_interface(priv, vif, false);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwlagn_mac_change_interface(struct ieee80211_hw *hw,</div><div class='add'>+				struct ieee80211_vif *vif,</div><div class='add'>+				enum nl80211_iftype newtype, bool newp2p)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);</div><div class='add'>+	struct iwl_rxon_context *bss_ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='add'>+	struct iwl_rxon_context *tmp;</div><div class='add'>+	enum nl80211_iftype newviftype = newtype;</div><div class='add'>+	u32 interface_modes;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+</div><div class='add'>+	newtype = ieee80211_iftype_p2p(newtype, newp2p);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!ctx-&gt;vif || !iwl_is_ready_rf(priv-&gt;shrd)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Huh? But wait ... this can maybe happen when</div><div class='add'>+		 * we're in the middle of a firmware restart!</div><div class='add'>+		 */</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	interface_modes = ctx-&gt;interface_modes | ctx-&gt;exclusive_interface_modes;</div><div class='add'>+</div><div class='add'>+	if (!(interface_modes &amp; BIT(newtype))) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Refuse a change that should be done by moving from the PAN</div><div class='add'>+	 * context to the BSS context instead, if the BSS context is</div><div class='add'>+	 * available and can support the new interface type.</div><div class='add'>+	 */</div><div class='add'>+	if (ctx-&gt;ctxid == IWL_RXON_CTX_PAN &amp;&amp; !bss_ctx-&gt;vif &amp;&amp;</div><div class='add'>+	    (bss_ctx-&gt;interface_modes &amp; BIT(newtype) ||</div><div class='add'>+	     bss_ctx-&gt;exclusive_interface_modes &amp; BIT(newtype))) {</div><div class='add'>+		BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;exclusive_interface_modes &amp; BIT(newtype)) {</div><div class='add'>+		for_each_context(priv, tmp) {</div><div class='add'>+			if (ctx == tmp)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (!tmp-&gt;vif)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * The current mode switch would be exclusive, but</div><div class='add'>+			 * another context is active ... refuse the switch.</div><div class='add'>+			 */</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* success */</div><div class='add'>+	iwl_teardown_interface(priv, vif, true);</div><div class='add'>+	vif-&gt;type = newviftype;</div><div class='add'>+	vif-&gt;p2p = newp2p;</div><div class='add'>+	err = iwl_setup_interface(priv, ctx);</div><div class='add'>+	WARN_ON(err);</div><div class='add'>+	/*</div><div class='add'>+	 * We've switched internally, but submitting to the</div><div class='add'>+	 * device may have failed for some reason. Mask this</div><div class='add'>+	 * error, because otherwise mac80211 will not switch</div><div class='add'>+	 * (and set the interface type back) and we'll be</div><div class='add'>+	 * out of sync with it.</div><div class='add'>+	 */</div><div class='add'>+	err = 0;</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,</div><div class='add'>+		    struct ieee80211_vif *vif,</div><div class='add'>+		    struct cfg80211_scan_request *req)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+</div><div class='add'>+	if (req-&gt;n_channels == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If an internal scan is in progress, just set</div><div class='add'>+	 * up the scan_request as per above.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;scan_type != IWL_SCAN_NORMAL) {</div><div class='add'>+		IWL_DEBUG_SCAN(priv,</div><div class='add'>+			       "SCAN request during internal scan - defer\n");</div><div class='add'>+		priv-&gt;scan_request = req;</div><div class='add'>+		priv-&gt;scan_vif = vif;</div><div class='add'>+		ret = 0;</div><div class='add'>+	} else {</div><div class='add'>+		priv-&gt;scan_request = req;</div><div class='add'>+		priv-&gt;scan_vif = vif;</div><div class='add'>+		/*</div><div class='add'>+		 * mac80211 will only ask for one band at a time</div><div class='add'>+		 * so using channels[0] here is ok</div><div class='add'>+		 */</div><div class='add'>+		ret = iwl_scan_initiate(priv, vif, IWL_SCAN_NORMAL,</div><div class='add'>+					req-&gt;channels[0]-&gt;band);</div><div class='add'>+		if (ret) {</div><div class='add'>+			priv-&gt;scan_request = NULL;</div><div class='add'>+			priv-&gt;scan_vif = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&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 iwlagn_mac_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 iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	struct iwl_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter: received request to remove "</div><div class='add'>+			   "station %pM\n", sta-&gt;addr);</div><div class='add'>+	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	IWL_DEBUG_INFO(priv, "proceeding to remove station %pM\n",</div><div class='add'>+			sta-&gt;addr);</div><div class='add'>+	ret = iwl_remove_station(priv, sta_priv-&gt;sta_id, sta-&gt;addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		IWL_DEBUG_QUIET_RFKILL(priv, "Error removing station %pM\n",</div><div class='add'>+			sta-&gt;addr);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_sta_modify_ps_wake(struct iwl_priv *priv, int sta_id)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;shrd-&gt;sta_lock, flags);</div><div class='add'>+	priv-&gt;stations[sta_id].sta.station_flags &amp;= ~STA_FLG_PWR_SAVE_MSK;</div><div class='add'>+	priv-&gt;stations[sta_id].sta.station_flags_msk = STA_FLG_PWR_SAVE_MSK;</div><div class='add'>+	priv-&gt;stations[sta_id].sta.sta.modify_mask = 0;</div><div class='add'>+	priv-&gt;stations[sta_id].sta.sleep_tx_count = 0;</div><div class='add'>+	priv-&gt;stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;</div><div class='add'>+	iwl_send_add_sta(priv, &amp;priv-&gt;stations[sta_id].sta, CMD_ASYNC);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;shrd-&gt;sta_lock, flags);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwlagn_mac_sta_notify(struct ieee80211_hw *hw,</div><div class='add'>+			   struct ieee80211_vif *vif,</div><div class='add'>+			   enum sta_notify_cmd cmd,</div><div class='add'>+			   struct ieee80211_sta *sta)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	struct iwl_station_priv *sta_priv = (void *)sta-&gt;drv_priv;</div><div class='add'>+	int sta_id;</div><div class='add'>+</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case STA_NOTIFY_SLEEP:</div><div class='add'>+		WARN_ON(!sta_priv-&gt;client);</div><div class='add'>+		sta_priv-&gt;asleep = true;</div><div class='add'>+		if (atomic_read(&amp;sta_priv-&gt;pending_frames) &gt; 0)</div><div class='add'>+			ieee80211_sta_block_awake(hw, sta, true);</div><div class='add'>+		break;</div><div class='add'>+	case STA_NOTIFY_AWAKE:</div><div class='add'>+		WARN_ON(!sta_priv-&gt;client);</div><div class='add'>+		if (!sta_priv-&gt;asleep)</div><div class='add'>+			break;</div><div class='add'>+		sta_priv-&gt;asleep = false;</div><div class='add'>+		sta_id = iwl_sta_id(sta);</div><div class='add'>+		if (sta_id != IWL_INVALID_STATION)</div><div class='add'>+			iwl_sta_modify_ps_wake(priv, sta_id);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ieee80211_ops iwlagn_hw_ops = {</div><div class='add'>+	.tx = iwlagn_mac_tx,</div><div class='add'>+	.start = iwlagn_mac_start,</div><div class='add'>+	.stop = iwlagn_mac_stop,</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	.suspend = iwlagn_mac_suspend,</div><div class='add'>+	.resume = iwlagn_mac_resume,</div><div class='add'>+#endif</div><div class='add'>+	.add_interface = iwlagn_mac_add_interface,</div><div class='add'>+	.remove_interface = iwlagn_mac_remove_interface,</div><div class='add'>+	.change_interface = iwlagn_mac_change_interface,</div><div class='add'>+	.config = iwlagn_mac_config,</div><div class='add'>+	.configure_filter = iwlagn_configure_filter,</div><div class='add'>+	.set_key = iwlagn_mac_set_key,</div><div class='add'>+	.update_tkip_key = iwlagn_mac_update_tkip_key,</div><div class='add'>+	.set_rekey_data = iwlagn_mac_set_rekey_data,</div><div class='add'>+	.conf_tx = iwlagn_mac_conf_tx,</div><div class='add'>+	.bss_info_changed = iwlagn_bss_info_changed,</div><div class='add'>+	.ampdu_action = iwlagn_mac_ampdu_action,</div><div class='add'>+	.hw_scan = iwlagn_mac_hw_scan,</div><div class='add'>+	.sta_notify = iwlagn_mac_sta_notify,</div><div class='add'>+	.sta_add = iwlagn_mac_sta_add,</div><div class='add'>+	.sta_remove = iwlagn_mac_sta_remove,</div><div class='add'>+	.channel_switch = iwlagn_mac_channel_switch,</div><div class='add'>+	.flush = iwlagn_mac_flush,</div><div class='add'>+	.tx_last_beacon = iwlagn_mac_tx_last_beacon,</div><div class='add'>+	.remain_on_channel = iwlagn_mac_remain_on_channel,</div><div class='add'>+	.cancel_remain_on_channel = iwlagn_mac_cancel_remain_on_channel,</div><div class='add'>+	.rssi_callback = iwlagn_mac_rssi_callback,</div><div class='add'>+	CFG80211_TESTMODE_CMD(iwlagn_mac_testmode_cmd)</div><div class='add'>+	CFG80211_TESTMODE_DUMP(iwlagn_mac_testmode_dump)</div><div class='add'>+	.tx_sync = iwlagn_mac_tx_sync,</div><div class='add'>+	.finish_tx_sync = iwlagn_mac_finish_tx_sync,</div><div class='add'>+	.set_tim = iwlagn_mac_set_tim,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This function both allocates and initializes hw and priv. */</div><div class='add'>+struct ieee80211_hw *iwl_alloc_all(void)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv;</div><div class='add'>+	/* mac80211 allocates memory for this device instance, including</div><div class='add'>+	 *   space for this driver's private structure */</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+</div><div class='add'>+	hw = ieee80211_alloc_hw(sizeof(struct iwl_priv), &amp;iwlagn_hw_ops);</div><div class='add'>+	if (!hw)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	priv = hw-&gt;priv;</div><div class='add'>+	priv-&gt;hw = hw;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return hw;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c<br/>index 1800029911ad..fb30ea7ca96b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-pci.c</a></div><div class='hunk'>@@ -135,7 +135,7 @@ static void iwl_pci_apm_config(struct iwl_bus *bus)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_pci_get_hw_id(struct iwl_bus *bus, char buf[],</div><div class='add'>+static void iwl_pci_get_hw_id_string(struct iwl_bus *bus, char buf[],</div><div class='ctx'> 			      int buf_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pci_dev = IWL_BUS_GET_PCI_DEV(bus);</div><div class='hunk'>@@ -144,6 +144,13 @@ static void iwl_pci_get_hw_id(struct iwl_bus *bus, char buf[],</div><div class='ctx'> 		 pci_dev-&gt;subsystem_device);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 iwl_pci_get_hw_id(struct iwl_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pci_dev = IWL_BUS_GET_PCI_DEV(bus);</div><div class='add'>+</div><div class='add'>+	return (pci_dev-&gt;device &lt;&lt; 16) + pci_dev-&gt;subsystem_device;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void iwl_pci_write8(struct iwl_bus *bus, u32 ofs, u8 val)</div><div class='ctx'> {</div><div class='ctx'> 	iowrite8(val, IWL_BUS_GET_PCI_BUS(bus)-&gt;hw_base + ofs);</div><div class='hunk'>@@ -163,6 +170,7 @@ static u32 iwl_pci_read32(struct iwl_bus *bus, u32 ofs)</div><div class='ctx'> static const struct iwl_bus_ops bus_ops_pci = {</div><div class='ctx'> 	.get_pm_support = iwl_pci_is_pm_supported,</div><div class='ctx'> 	.apm_config = iwl_pci_apm_config,</div><div class='add'>+	.get_hw_id_string = iwl_pci_get_hw_id_string,</div><div class='ctx'> 	.get_hw_id = iwl_pci_get_hw_id,</div><div class='ctx'> 	.write8 = iwl_pci_write8,</div><div class='ctx'> 	.write32 = iwl_pci_write32,</div><div class='hunk'>@@ -256,6 +264,8 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x0082, 0xC020, iwl6005_2agn_sff_cfg)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x0085, 0xC220, iwl6005_2agn_sff_cfg)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x0082, 0x1341, iwl6005_2agn_d_cfg)},</div><div class='add'>+	{IWL_PCI_DEVICE(0x0082, 0x1304, iwl6005_2agn_cfg)},/* low 5GHz active */</div><div class='add'>+	{IWL_PCI_DEVICE(0x0082, 0x1305, iwl6005_2agn_cfg)},/* high 5GHz active */</div><div class='ctx'> </div><div class='ctx'> /* 6x30 Series */</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x008A, 0x5305, iwl1030_bgn_cfg)},</div><div class='hunk'>@@ -325,46 +335,28 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x0890, 0x4022, iwl2000_2bgn_cfg)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x0891, 0x4222, iwl2000_2bgn_cfg)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x0890, 0x4422, iwl2000_2bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0890, 0x4026, iwl2000_2bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0891, 0x4226, iwl2000_2bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0890, 0x4426, iwl2000_2bg_cfg)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x0890, 0x4822, iwl2000_2bgn_d_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 2x30 Series */</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x0887, 0x4062, iwl2030_2bgn_cfg)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x0888, 0x4262, iwl2030_2bgn_cfg)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x0887, 0x4462, iwl2030_2bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0887, 0x4066, iwl2030_2bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0888, 0x4266, iwl2030_2bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0887, 0x4466, iwl2030_2bg_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 6x35 Series */</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x088E, 0x4060, iwl6035_2agn_cfg)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x088F, 0x4260, iwl6035_2agn_cfg)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x088E, 0x4460, iwl6035_2agn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x088E, 0x4064, iwl6035_2abg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x088F, 0x4264, iwl6035_2abg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x088E, 0x4464, iwl6035_2abg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x088E, 0x4066, iwl6035_2bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x088F, 0x4266, iwl6035_2bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x088E, 0x4466, iwl6035_2bg_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 105 Series */</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x0894, 0x0022, iwl105_bgn_cfg)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x0895, 0x0222, iwl105_bgn_cfg)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x0894, 0x0422, iwl105_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0894, 0x0026, iwl105_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0895, 0x0226, iwl105_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0894, 0x0426, iwl105_bg_cfg)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x0894, 0x0822, iwl105_bgn_d_cfg)},</div><div class='ctx'> </div><div class='ctx'> /* 135 Series */</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x0892, 0x0062, iwl135_bgn_cfg)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x0893, 0x0262, iwl135_bgn_cfg)},</div><div class='ctx'> 	{IWL_PCI_DEVICE(0x0892, 0x0462, iwl135_bgn_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0892, 0x0066, iwl135_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0893, 0x0266, iwl135_bg_cfg)},</div><div class='del'>-	{IWL_PCI_DEVICE(0x0892, 0x0466, iwl135_bg_cfg)},</div><div class='ctx'> </div><div class='ctx'> 	{0}</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c<br/>index 4eaab204322d..2b188a6025b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-power.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-power.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-power.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-power.c</a></div><div class='hunk'>@@ -167,7 +167,7 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv,</div><div class='ctx'> 	u8 skip;</div><div class='ctx'> 	u32 slp_itrvl;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;adv_pm) {</div><div class='add'>+	if (cfg(priv)-&gt;adv_pm) {</div><div class='ctx'> 		table = apm_range_2;</div><div class='ctx'> 		if (period &lt;= IWL_DTIM_RANGE_1_MAX)</div><div class='ctx'> 			table = apm_range_1;</div><div class='hunk'>@@ -221,7 +221,7 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv,</div><div class='ctx'> 		cmd-&gt;flags &amp;= ~IWL_POWER_SHADOW_REG_ENA;</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_advanced_bt_coexist(priv)) {</div><div class='del'>-		if (!priv-&gt;cfg-&gt;bt_params-&gt;bt_sco_disable)</div><div class='add'>+		if (!cfg(priv)-&gt;bt_params-&gt;bt_sco_disable)</div><div class='ctx'> 			cmd-&gt;flags |= IWL_POWER_BT_SCO_ENA;</div><div class='ctx'> 		else</div><div class='ctx'> 			cmd-&gt;flags &amp;= ~IWL_POWER_BT_SCO_ENA;</div><div class='hunk'>@@ -307,7 +307,7 @@ static void iwl_power_fill_sleep_cmd(struct iwl_priv *priv,</div><div class='ctx'> 		cmd-&gt;flags &amp;= ~IWL_POWER_SHADOW_REG_ENA;</div><div class='ctx'> </div><div class='ctx'> 	if (iwl_advanced_bt_coexist(priv)) {</div><div class='del'>-		if (!priv-&gt;cfg-&gt;bt_params-&gt;bt_sco_disable)</div><div class='add'>+		if (!cfg(priv)-&gt;bt_params-&gt;bt_sco_disable)</div><div class='ctx'> 			cmd-&gt;flags |= IWL_POWER_BT_SCO_ENA;</div><div class='ctx'> 		else</div><div class='ctx'> 			cmd-&gt;flags &amp;= ~IWL_POWER_BT_SCO_ENA;</div><div class='hunk'>@@ -350,7 +350,7 @@ static void iwl_power_build_cmd(struct iwl_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;shrd-&gt;wowlan)</div><div class='ctx'> 		iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, dtimper);</div><div class='del'>-	else if (!priv-&gt;cfg-&gt;base_params-&gt;no_idle_support &amp;&amp;</div><div class='add'>+	else if (!cfg(priv)-&gt;base_params-&gt;no_idle_support &amp;&amp;</div><div class='ctx'> 		 priv-&gt;hw-&gt;conf.flags &amp; IEEE80211_CONF_IDLE)</div><div class='ctx'> 		iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, 20);</div><div class='ctx'> 	else if (iwl_tt_is_low_power_state(priv)) {</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c<br/>index e5d727f537d0..a6454726737e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-scan.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-scan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-scan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-scan.c</a></div><div class='hunk'>@@ -416,6 +416,8 @@ static u16 iwl_limit_dwell(struct iwl_priv *priv, u16 dwell_time)</div><div class='ctx'> </div><div class='ctx'> 		if (!iwl_is_associated_ctx(ctx))</div><div class='ctx'> 			continue;</div><div class='add'>+		if (ctx-&gt;staging.dev_type == RXON_DEV_TYPE_P2P)</div><div class='add'>+			continue;</div><div class='ctx'> 		value = ctx-&gt;beacon_int;</div><div class='ctx'> 		if (!value)</div><div class='ctx'> 			value = IWL_PASSIVE_DWELL_BASE;</div><div class='hunk'>@@ -567,7 +569,7 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)</div><div class='ctx'> 	struct iwl_scan_cmd *scan;</div><div class='ctx'> 	struct iwl_rxon_context *ctx = &amp;priv-&gt;contexts[IWL_RXON_CTX_BSS];</div><div class='ctx'> 	u32 rate_flags = 0;</div><div class='del'>-	u16 cmd_len;</div><div class='add'>+	u16 cmd_len = 0;</div><div class='ctx'> 	u16 rx_chain = 0;</div><div class='ctx'> 	enum ieee80211_band band;</div><div class='ctx'> 	u8 n_probes = 0;</div><div class='hunk'>@@ -678,7 +680,8 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)</div><div class='ctx'> 			priv-&gt;contexts[IWL_RXON_CTX_BSS].active.flags &amp;</div><div class='ctx'> 						RXON_FLG_CHANNEL_MODE_MSK)</div><div class='ctx'> 				       &gt;&gt; RXON_FLG_CHANNEL_MODE_POS;</div><div class='del'>-		if (chan_mod == CHANNEL_MODE_PURE_40) {</div><div class='add'>+		if ((priv-&gt;scan_request &amp;&amp; priv-&gt;scan_request-&gt;no_cck) ||</div><div class='add'>+		    chan_mod == CHANNEL_MODE_PURE_40) {</div><div class='ctx'> 			rate = IWL_RATE_6M_PLCP;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			rate = IWL_RATE_1M_PLCP;</div><div class='hunk'>@@ -688,8 +691,8 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)</div><div class='ctx'> 		 * Internal scans are passive, so we can indiscriminately set</div><div class='ctx'> 		 * the BT ignore flag on 2.4 GHz since it applies to TX only.</div><div class='ctx'> 		 */</div><div class='del'>-		if (priv-&gt;cfg-&gt;bt_params &amp;&amp;</div><div class='del'>-		    priv-&gt;cfg-&gt;bt_params-&gt;advanced_bt_coexist)</div><div class='add'>+		if (cfg(priv)-&gt;bt_params &amp;&amp;</div><div class='add'>+		    cfg(priv)-&gt;bt_params-&gt;advanced_bt_coexist)</div><div class='ctx'> 			scan-&gt;tx_cmd.tx_flags |= TX_CMD_FLG_IGNORE_BT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_BAND_5GHZ:</div><div class='hunk'>@@ -730,12 +733,12 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> 	band = priv-&gt;scan_band;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;scan_rx_antennas[band])</div><div class='del'>-		rx_ant = priv-&gt;cfg-&gt;scan_rx_antennas[band];</div><div class='add'>+	if (cfg(priv)-&gt;scan_rx_antennas[band])</div><div class='add'>+		rx_ant = cfg(priv)-&gt;scan_rx_antennas[band];</div><div class='ctx'> </div><div class='ctx'> 	if (band == IEEE80211_BAND_2GHZ &amp;&amp;</div><div class='del'>-	    priv-&gt;cfg-&gt;bt_params &amp;&amp;</div><div class='del'>-	    priv-&gt;cfg-&gt;bt_params-&gt;advanced_bt_coexist) {</div><div class='add'>+	    cfg(priv)-&gt;bt_params &amp;&amp;</div><div class='add'>+	    cfg(priv)-&gt;bt_params-&gt;advanced_bt_coexist) {</div><div class='ctx'> 		/* transmit 2.4 GHz probes only on first antenna */</div><div class='ctx'> 		scan_tx_antennas = first_antenna(scan_tx_antennas);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -759,8 +762,8 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)</div><div class='ctx'> </div><div class='ctx'> 		rx_ant = first_antenna(active_chains);</div><div class='ctx'> 	}</div><div class='del'>-	if (priv-&gt;cfg-&gt;bt_params &amp;&amp;</div><div class='del'>-	    priv-&gt;cfg-&gt;bt_params-&gt;advanced_bt_coexist &amp;&amp;</div><div class='add'>+	if (cfg(priv)-&gt;bt_params &amp;&amp;</div><div class='add'>+	    cfg(priv)-&gt;bt_params-&gt;advanced_bt_coexist &amp;&amp;</div><div class='ctx'> 	    priv-&gt;bt_full_concurrent) {</div><div class='ctx'> 		/* operated as 1x1 in full concurrency mode */</div><div class='ctx'> 		rx_ant = first_antenna(rx_ant);</div><div class='hunk'>@@ -938,51 +941,6 @@ int __must_check iwl_scan_initiate(struct iwl_priv *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,</div><div class='del'>-		    struct ieee80211_vif *vif,</div><div class='del'>-		    struct cfg80211_scan_request *req)</div><div class='del'>-{</div><div class='del'>-	struct iwl_priv *priv = hw-&gt;priv;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "enter\n");</div><div class='del'>-</div><div class='del'>-	if (req-&gt;n_channels == 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If an internal scan is in progress, just set</div><div class='del'>-	 * up the scan_request as per above.</div><div class='del'>-	 */</div><div class='del'>-	if (priv-&gt;scan_type != IWL_SCAN_NORMAL) {</div><div class='del'>-		IWL_DEBUG_SCAN(priv,</div><div class='del'>-			       "SCAN request during internal scan - defer\n");</div><div class='del'>-		priv-&gt;scan_request = req;</div><div class='del'>-		priv-&gt;scan_vif = vif;</div><div class='del'>-		ret = 0;</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;scan_request = req;</div><div class='del'>-		priv-&gt;scan_vif = vif;</div><div class='del'>-		/*</div><div class='del'>-		 * mac80211 will only ask for one band at a time</div><div class='del'>-		 * so using channels[0] here is ok</div><div class='del'>-		 */</div><div class='del'>-		ret = iwl_scan_initiate(priv, vif, IWL_SCAN_NORMAL,</div><div class='del'>-					req-&gt;channels[0]-&gt;band);</div><div class='del'>-		if (ret) {</div><div class='del'>-			priv-&gt;scan_request = NULL;</div><div class='del'>-			priv-&gt;scan_vif = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_MAC80211(priv, "leave\n");</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * internal short scan, this function should only been called while associated.</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h<br/>index 14eaf37ce3b1..dc55cc4a8108 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-shared.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-shared.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-shared.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-shared.h</a></div><div class='hunk'>@@ -94,9 +94,9 @@</div><div class='ctx'>  * This implementation is iwl-pci.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-struct iwl_cfg;</div><div class='ctx'> struct iwl_bus;</div><div class='ctx'> struct iwl_priv;</div><div class='add'>+struct iwl_trans;</div><div class='ctx'> struct iwl_sensitivity_ranges;</div><div class='ctx'> struct iwl_trans_ops;</div><div class='ctx'> </div><div class='hunk'>@@ -107,6 +107,10 @@ struct iwl_trans_ops;</div><div class='ctx'> </div><div class='ctx'> extern struct iwl_mod_params iwlagn_mod_params;</div><div class='ctx'> </div><div class='add'>+#define IWL_DISABLE_HT_ALL	BIT(0)</div><div class='add'>+#define IWL_DISABLE_HT_TXAGG	BIT(1)</div><div class='add'>+#define IWL_DISABLE_HT_RXAGG	BIT(2)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_mod_params</div><div class='ctx'>  *</div><div class='hunk'>@@ -114,7 +118,8 @@ extern struct iwl_mod_params iwlagn_mod_params;</div><div class='ctx'>  *</div><div class='ctx'>  * @sw_crypto: using hardware encryption, default = 0</div><div class='ctx'>  * @num_of_queues: number of tx queue, HW dependent</div><div class='del'>- * @disable_11n: 11n capabilities enabled, default = 0</div><div class='add'>+ * @disable_11n: disable 11n capabilities, default = 0,</div><div class='add'>+ *	use IWL_DISABLE_HT_* constants</div><div class='ctx'>  * @amsdu_size_8K: enable 8K amsdu size, default = 1</div><div class='ctx'>  * @antenna: both antennas (use diversity), default = 0</div><div class='ctx'>  * @restart_fw: restart firmware, default = 1</div><div class='hunk'>@@ -135,7 +140,7 @@ extern struct iwl_mod_params iwlagn_mod_params;</div><div class='ctx'> struct iwl_mod_params {</div><div class='ctx'> 	int sw_crypto;</div><div class='ctx'> 	int num_of_queues;</div><div class='del'>-	int disable_11n;</div><div class='add'>+	unsigned int disable_11n;</div><div class='ctx'> 	int amsdu_size_8K;</div><div class='ctx'> 	int antenna;</div><div class='ctx'> 	int restart_fw;</div><div class='hunk'>@@ -174,8 +179,6 @@ struct iwl_mod_params {</div><div class='ctx'>  * @ct_kill_exit_threshold: when to reeable the device - in hw dependent unit</div><div class='ctx'>  *	relevant for 1000, 6000 and up</div><div class='ctx'>  * @wd_timeout: TX queues watchdog timeout</div><div class='del'>- * @calib_init_cfg: setup initial calibrations for the hw</div><div class='del'>- * @calib_rt_cfg: setup runtime calibrations for the hw</div><div class='ctx'>  * @struct iwl_sensitivity_ranges: range of sensitivity values</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_hw_params {</div><div class='hunk'>@@ -195,67 +198,148 @@ struct iwl_hw_params {</div><div class='ctx'> 	u32 ct_kill_exit_threshold;</div><div class='ctx'> 	unsigned int wd_timeout;</div><div class='ctx'> </div><div class='del'>-	u32 calib_init_cfg;</div><div class='del'>-	u32 calib_rt_cfg;</div><div class='ctx'> 	const struct iwl_sensitivity_ranges *sens;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum iwl_agg_state</div><div class='add'>+ * enum iwl_ucode_type</div><div class='ctx'>  *</div><div class='del'>- * The state machine of the BA agreement establishment / tear down.</div><div class='del'>- * These states relate to a specific RA / TID.</div><div class='add'>+ * The type of ucode currently loaded on the hardware.</div><div class='ctx'>  *</div><div class='del'>- * @IWL_AGG_OFF: aggregation is not used</div><div class='del'>- * @IWL_AGG_ON: aggregation session is up</div><div class='del'>- * @IWL_EMPTYING_HW_QUEUE_ADDBA: establishing a BA session - waiting for the</div><div class='del'>- *	HW queue to be empty from packets for this RA /TID.</div><div class='del'>- * @IWL_EMPTYING_HW_QUEUE_DELBA: tearing down a BA session - waiting for the</div><div class='del'>- *	HW queue to be empty from packets for this RA /TID.</div><div class='add'>+ * @IWL_UCODE_NONE: No ucode loaded</div><div class='add'>+ * @IWL_UCODE_REGULAR: Normal runtime ucode</div><div class='add'>+ * @IWL_UCODE_INIT: Initial ucode</div><div class='add'>+ * @IWL_UCODE_WOWLAN: Wake on Wireless enabled ucode</div><div class='ctx'>  */</div><div class='del'>-enum iwl_agg_state {</div><div class='del'>-	IWL_AGG_OFF = 0,</div><div class='del'>-	IWL_AGG_ON,</div><div class='del'>-	IWL_EMPTYING_HW_QUEUE_ADDBA,</div><div class='del'>-	IWL_EMPTYING_HW_QUEUE_DELBA,</div><div class='add'>+enum iwl_ucode_type {</div><div class='add'>+	IWL_UCODE_NONE,</div><div class='add'>+	IWL_UCODE_REGULAR,</div><div class='add'>+	IWL_UCODE_INIT,</div><div class='add'>+	IWL_UCODE_WOWLAN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_ht_agg - aggregation state machine</div><div class='del'>-</div><div class='del'>- * This structs holds the states for the BA agreement establishment and tear</div><div class='del'>- * down. It also holds the state during the BA session itself. This struct is</div><div class='del'>- * duplicated for each RA / TID.</div><div class='del'>-</div><div class='del'>- * @rate_n_flags: Rate at which Tx was attempted. Holds the data between the</div><div class='del'>- *	Tx response (REPLY_TX), and the block ack notification</div><div class='del'>- *	(REPLY_COMPRESSED_BA).</div><div class='del'>- * @state: state of the BA agreement establishment / tear down.</div><div class='del'>- * @txq_id: Tx queue used by the BA session - used by the transport layer.</div><div class='del'>- *	Needed by the upper layer for debugfs only.</div><div class='del'>- * @wait_for_ba: Expect block-ack before next Tx reply</div><div class='add'>+ * struct iwl_notification_wait - notification wait entry</div><div class='add'>+ * @list: list head for global list</div><div class='add'>+ * @fn: function called with the notification</div><div class='add'>+ * @cmd: command ID</div><div class='add'>+ *</div><div class='add'>+ * This structure is not used directly, to wait for a</div><div class='add'>+ * notification declare it on the stack, and call</div><div class='add'>+ * iwlagn_init_notification_wait() with appropriate</div><div class='add'>+ * parameters. Then do whatever will cause the ucode</div><div class='add'>+ * to notify the driver, and to wait for that then</div><div class='add'>+ * call iwlagn_wait_notification().</div><div class='add'>+ *</div><div class='add'>+ * Each notification is one-shot. If at some point we</div><div class='add'>+ * need to support multi-shot notifications (which</div><div class='add'>+ * can't be allocated on the stack) we need to modify</div><div class='add'>+ * the code for them.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_ht_agg {</div><div class='del'>-	u32 rate_n_flags;</div><div class='del'>-	enum iwl_agg_state state;</div><div class='del'>-	u16 txq_id;</div><div class='del'>-	bool wait_for_ba;</div><div class='add'>+struct iwl_notification_wait {</div><div class='add'>+	struct list_head list;</div><div class='add'>+</div><div class='add'>+	void (*fn)(struct iwl_trans *trans, struct iwl_rx_packet *pkt,</div><div class='add'>+		   void *data);</div><div class='add'>+	void *fn_data;</div><div class='add'>+</div><div class='add'>+	u8 cmd;</div><div class='add'>+	bool triggered, aborted;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct iwl_tid_data - one for each RA / TID</div><div class='add'>+ * enum iwl_pa_type - Power Amplifier type</div><div class='add'>+ * @IWL_PA_SYSTEM:  based on uCode configuration</div><div class='add'>+ * @IWL_PA_INTERNAL: use Internal only</div><div class='add'>+ */</div><div class='add'>+enum iwl_pa_type {</div><div class='add'>+	IWL_PA_SYSTEM = 0,</div><div class='add'>+	IWL_PA_INTERNAL = 1,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>- * This structs holds the states for each RA / TID.</div><div class='add'>+/*</div><div class='add'>+ * LED mode</div><div class='add'>+ *    IWL_LED_DEFAULT:  use device default</div><div class='add'>+ *    IWL_LED_RF_STATE: turn LED on/off based on RF state</div><div class='add'>+ *			LED ON  = RF ON</div><div class='add'>+ *			LED OFF = RF OFF</div><div class='add'>+ *    IWL_LED_BLINK:    adjust led blink rate based on blink table</div><div class='add'>+ */</div><div class='add'>+enum iwl_led_mode {</div><div class='add'>+	IWL_LED_DEFAULT,</div><div class='add'>+	IWL_LED_RF_STATE,</div><div class='add'>+	IWL_LED_BLINK,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>- * @seq_number: the next WiFi sequence number to use</div><div class='del'>- * @tfds_in_queue: number of packets sent to the HW queues.</div><div class='del'>- *	Exported for debugfs only</div><div class='del'>- * @agg: aggregation state machine</div><div class='add'>+/**</div><div class='add'>+ * struct iwl_cfg</div><div class='add'>+ * @name: Offical name of the device</div><div class='add'>+ * @fw_name_pre: Firmware filename prefix. The api version and extension</div><div class='add'>+ *	(.ucode) will be added to filename before loading from disk. The</div><div class='add'>+ *	filename is constructed as fw_name_pre&lt;api&gt;.ucode.</div><div class='add'>+ * @ucode_api_max: Highest version of uCode API supported by driver.</div><div class='add'>+ * @ucode_api_ok: oldest version of the uCode API that is OK to load</div><div class='add'>+ *	without a warning, for use in transitions</div><div class='add'>+ * @ucode_api_min: Lowest version of uCode API supported by driver.</div><div class='add'>+ * @valid_tx_ant: valid transmit antenna</div><div class='add'>+ * @valid_rx_ant: valid receive antenna</div><div class='add'>+ * @sku: sku information from EEPROM</div><div class='add'>+ * @eeprom_ver: EEPROM version</div><div class='add'>+ * @eeprom_calib_ver: EEPROM calibration version</div><div class='add'>+ * @lib: pointer to the lib ops</div><div class='add'>+ * @additional_nic_config: additional nic configuration</div><div class='add'>+ * @base_params: pointer to basic parameters</div><div class='add'>+ * @ht_params: point to ht patameters</div><div class='add'>+ * @bt_params: pointer to bt parameters</div><div class='add'>+ * @pa_type: used by 6000 series only to identify the type of Power Amplifier</div><div class='add'>+ * @need_temp_offset_calib: need to perform temperature offset calibration</div><div class='add'>+ * @no_xtal_calib: some devices do not need crystal calibration data,</div><div class='add'>+ *	don't send it to those</div><div class='add'>+ * @scan_rx_antennas: available antenna for scan operation</div><div class='add'>+ * @led_mode: 0=blinking, 1=On(RF On)/Off(RF Off)</div><div class='add'>+ * @adv_pm: advance power management</div><div class='add'>+ * @rx_with_siso_diversity: 1x1 device with rx antenna diversity</div><div class='add'>+ * @internal_wimax_coex: internal wifi/wimax combo device</div><div class='add'>+ * @iq_invert: I/Q inversion</div><div class='add'>+ * @temp_offset_v2: support v2 of temperature offset calibration</div><div class='add'>+ *</div><div class='add'>+ * We enable the driver to be backward compatible wrt API version. The</div><div class='add'>+ * driver specifies which APIs it supports (with @ucode_api_max being the</div><div class='add'>+ * highest and @ucode_api_min the lowest). Firmware will only be loaded if</div><div class='add'>+ * it has a supported API version.</div><div class='add'>+ *</div><div class='add'>+ * The ideal usage of this infrastructure is to treat a new ucode API</div><div class='add'>+ * release as a new hardware revision.</div><div class='ctx'>  */</div><div class='del'>-struct iwl_tid_data {</div><div class='del'>-	u16 seq_number;</div><div class='del'>-	u16 tfds_in_queue;</div><div class='del'>-	struct iwl_ht_agg agg;</div><div class='add'>+struct iwl_cfg {</div><div class='add'>+	/* params specific to an individual device within a device family */</div><div class='add'>+	const char *name;</div><div class='add'>+	const char *fw_name_pre;</div><div class='add'>+	const unsigned int ucode_api_max;</div><div class='add'>+	const unsigned int ucode_api_ok;</div><div class='add'>+	const unsigned int ucode_api_min;</div><div class='add'>+	u8   valid_tx_ant;</div><div class='add'>+	u8   valid_rx_ant;</div><div class='add'>+	u16  sku;</div><div class='add'>+	u16  eeprom_ver;</div><div class='add'>+	u16  eeprom_calib_ver;</div><div class='add'>+	const struct iwl_lib_ops *lib;</div><div class='add'>+	void (*additional_nic_config)(struct iwl_priv *priv);</div><div class='add'>+	/* params not likely to change within a device family */</div><div class='add'>+	struct iwl_base_params *base_params;</div><div class='add'>+	/* params likely to change within a device family */</div><div class='add'>+	struct iwl_ht_params *ht_params;</div><div class='add'>+	struct iwl_bt_params *bt_params;</div><div class='add'>+	enum iwl_pa_type pa_type;	  /* if used set to IWL_PA_SYSTEM */</div><div class='add'>+	const bool need_temp_offset_calib; /* if used set to true */</div><div class='add'>+	const bool no_xtal_calib;</div><div class='add'>+	u8 scan_rx_antennas[IEEE80211_NUM_BANDS];</div><div class='add'>+	enum iwl_led_mode led_mode;</div><div class='add'>+	const bool adv_pm;</div><div class='add'>+	const bool rx_with_siso_diversity;</div><div class='add'>+	const bool internal_wimax_coex;</div><div class='add'>+	const bool iq_invert;</div><div class='add'>+	const bool temp_offset_v2;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -266,15 +350,25 @@ struct iwl_tid_data {</div><div class='ctx'>  * @ucode_owner: IWL_OWNERSHIP_*</div><div class='ctx'>  * @cmd_queue: command queue number</div><div class='ctx'>  * @status: STATUS_*</div><div class='add'>+ * @wowlan: are we running wowlan uCode</div><div class='ctx'>  * @valid_contexts: microcode/device supports multiple contexts</div><div class='ctx'>  * @bus: pointer to the bus layer data</div><div class='add'>+ * @cfg: see struct iwl_cfg</div><div class='ctx'>  * @priv: pointer to the upper layer data</div><div class='add'>+ * @trans: pointer to the transport layer data</div><div class='ctx'>  * @hw_params: see struct iwl_hw_params</div><div class='ctx'>  * @workqueue: the workqueue used by all the layers of the driver</div><div class='ctx'>  * @lock: protect general shared data</div><div class='ctx'>  * @sta_lock: protects the station table.</div><div class='ctx'>  *	If lock and sta_lock are needed, lock must be acquired first.</div><div class='ctx'>  * @mutex:</div><div class='add'>+ * @wait_command_queue: the wait_queue for SYNC host command nad uCode load</div><div class='add'>+ * @eeprom: pointer to the eeprom/OTP image</div><div class='add'>+ * @ucode_type: indicator of loaded ucode image</div><div class='add'>+ * @notif_waits: things waiting for notification</div><div class='add'>+ * @notif_wait_lock: lock protecting notification</div><div class='add'>+ * @notif_waitq: head of notification wait queue</div><div class='add'>+ * @device_pointers: pointers to ucode event tables</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_shared {</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUG</div><div class='hunk'>@@ -290,6 +384,7 @@ struct iwl_shared {</div><div class='ctx'> 	u8 valid_contexts;</div><div class='ctx'> </div><div class='ctx'> 	struct iwl_bus *bus;</div><div class='add'>+	struct iwl_cfg *cfg;</div><div class='ctx'> 	struct iwl_priv *priv;</div><div class='ctx'> 	struct iwl_trans *trans;</div><div class='ctx'> 	struct iwl_hw_params hw_params;</div><div class='hunk'>@@ -299,13 +394,29 @@ struct iwl_shared {</div><div class='ctx'> 	spinlock_t sta_lock;</div><div class='ctx'> 	struct mutex mutex;</div><div class='ctx'> </div><div class='del'>-	struct iwl_tid_data tid_data[IWLAGN_STATION_COUNT][IWL_MAX_TID_COUNT];</div><div class='del'>-</div><div class='ctx'> 	wait_queue_head_t wait_command_queue;</div><div class='add'>+</div><div class='add'>+	/* eeprom -- this is in the card's little endian byte order */</div><div class='add'>+	u8 *eeprom;</div><div class='add'>+</div><div class='add'>+	/* ucode related variables */</div><div class='add'>+	enum iwl_ucode_type ucode_type;</div><div class='add'>+</div><div class='add'>+	/* notification wait support */</div><div class='add'>+	struct list_head notif_waits;</div><div class='add'>+	spinlock_t notif_wait_lock;</div><div class='add'>+	wait_queue_head_t notif_waitq;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 error_event_table;</div><div class='add'>+		u32 log_event_table;</div><div class='add'>+	} device_pointers;</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*Whatever _m is (iwl_trans, iwl_priv, iwl_bus, these macros will work */</div><div class='ctx'> #define priv(_m)	((_m)-&gt;shrd-&gt;priv)</div><div class='add'>+#define cfg(_m)		((_m)-&gt;shrd-&gt;cfg)</div><div class='ctx'> #define bus(_m)		((_m)-&gt;shrd-&gt;bus)</div><div class='ctx'> #define trans(_m)	((_m)-&gt;shrd-&gt;trans)</div><div class='ctx'> #define hw_params(_m)	((_m)-&gt;shrd-&gt;hw_params)</div><div class='hunk'>@@ -427,12 +538,6 @@ int __must_check iwl_rx_dispatch(struct iwl_priv *priv,</div><div class='ctx'> 				 struct iwl_device_cmd *cmd);</div><div class='ctx'> </div><div class='ctx'> int iwlagn_hw_valid_rtc_data_addr(u32 addr);</div><div class='del'>-void iwl_start_tx_ba_trans_ready(struct iwl_priv *priv,</div><div class='del'>-				 enum iwl_rxon_context_id ctx,</div><div class='del'>-				 u8 sta_id, u8 tid);</div><div class='del'>-void iwl_stop_tx_ba_trans_ready(struct iwl_priv *priv,</div><div class='del'>-				enum iwl_rxon_context_id ctx,</div><div class='del'>-				u8 sta_id, u8 tid);</div><div class='ctx'> void iwl_set_hw_rfkill_state(struct iwl_priv *priv, bool state);</div><div class='ctx'> void iwl_nic_config(struct iwl_priv *priv);</div><div class='ctx'> void iwl_free_skb(struct iwl_priv *priv, struct sk_buff *skb);</div><div class='hunk'>@@ -445,6 +550,24 @@ bool iwl_check_for_ct_kill(struct iwl_priv *priv);</div><div class='ctx'> void iwl_stop_sw_queue(struct iwl_priv *priv, u8 ac);</div><div class='ctx'> void iwl_wake_sw_queue(struct iwl_priv *priv, u8 ac);</div><div class='ctx'> </div><div class='add'>+/* notification wait support */</div><div class='add'>+void iwl_abort_notification_waits(struct iwl_shared *shrd);</div><div class='add'>+void __acquires(wait_entry)</div><div class='add'>+iwl_init_notification_wait(struct iwl_shared *shrd,</div><div class='add'>+			      struct iwl_notification_wait *wait_entry,</div><div class='add'>+			      u8 cmd,</div><div class='add'>+			      void (*fn)(struct iwl_trans *trans,</div><div class='add'>+					 struct iwl_rx_packet *pkt,</div><div class='add'>+					 void *data),</div><div class='add'>+			      void *fn_data);</div><div class='add'>+int __must_check __releases(wait_entry)</div><div class='add'>+iwl_wait_notification(struct iwl_shared *shrd,</div><div class='add'>+			 struct iwl_notification_wait *wait_entry,</div><div class='add'>+			 unsigned long timeout);</div><div class='add'>+void __releases(wait_entry)</div><div class='add'>+iwl_remove_notification(struct iwl_shared *shrd,</div><div class='add'>+			   struct iwl_notification_wait *wait_entry);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IWLWIFI_DEBUGFS</div><div class='ctx'> void iwl_reset_traffic_log(struct iwl_priv *priv);</div><div class='ctx'> #endif /* CONFIG_IWLWIFI_DEBUGFS */</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-sv-open.c b/drivers/net/wireless/iwlwifi/iwl-testmode.c<br/>index 5e50d88f302b..4a5cddd2d56b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-sv-open.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-sv-open.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-testmode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-testmode.c</a></div><div class='hunk'>@@ -70,6 +70,7 @@</div><div class='ctx'> #include &lt;net/mac80211.h&gt;</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "iwl-wifi.h"</div><div class='ctx'> #include "iwl-dev.h"</div><div class='ctx'> #include "iwl-core.h"</div><div class='ctx'> #include "iwl-debug.h"</div><div class='hunk'>@@ -77,6 +78,7 @@</div><div class='ctx'> #include "iwl-agn.h"</div><div class='ctx'> #include "iwl-testmode.h"</div><div class='ctx'> #include "iwl-trans.h"</div><div class='add'>+#include "iwl-bus.h"</div><div class='ctx'> </div><div class='ctx'> /* The TLVs used in the gnl message policy between the kernel module and</div><div class='ctx'>  * user space application. iwl_testmode_gnl_msg_policy is to be carried</div><div class='hunk'>@@ -106,6 +108,13 @@ struct nla_policy iwl_testmode_gnl_msg_policy[IWL_TM_ATTR_MAX] = {</div><div class='ctx'> 	[IWL_TM_ATTR_FIXRATE] = { .type = NLA_U32, },</div><div class='ctx'> </div><div class='ctx'> 	[IWL_TM_ATTR_UCODE_OWNER] = { .type = NLA_U8, },</div><div class='add'>+</div><div class='add'>+	[IWL_TM_ATTR_SRAM_ADDR] = { .type = NLA_U32, },</div><div class='add'>+	[IWL_TM_ATTR_SRAM_SIZE] = { .type = NLA_U32, },</div><div class='add'>+	[IWL_TM_ATTR_SRAM_DUMP] = { .type = NLA_UNSPEC, },</div><div class='add'>+</div><div class='add'>+	[IWL_TM_ATTR_FW_VERSION] = { .type = NLA_U32, },</div><div class='add'>+	[IWL_TM_ATTR_DEVICE_ID] = { .type = NLA_U32, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -177,6 +186,18 @@ void iwl_testmode_init(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	priv-&gt;pre_rx_handler = iwl_testmode_ucode_rx_pkt;</div><div class='ctx'> 	priv-&gt;testmode_trace.trace_enabled = false;</div><div class='add'>+	priv-&gt;testmode_sram.sram_readed = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_sram_cleanup(struct iwl_priv *priv)</div><div class='add'>+{</div><div class='add'>+	if (priv-&gt;testmode_sram.sram_readed) {</div><div class='add'>+		kfree(priv-&gt;testmode_sram.buff_addr);</div><div class='add'>+		priv-&gt;testmode_sram.buff_addr = NULL;</div><div class='add'>+		priv-&gt;testmode_sram.buff_size = 0;</div><div class='add'>+		priv-&gt;testmode_sram.num_chunks = 0;</div><div class='add'>+		priv-&gt;testmode_sram.sram_readed = false;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_trace_cleanup(struct iwl_priv *priv)</div><div class='hunk'>@@ -201,6 +222,7 @@ static void iwl_trace_cleanup(struct iwl_priv *priv)</div><div class='ctx'> void iwl_testmode_cleanup(struct iwl_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	iwl_trace_cleanup(priv);</div><div class='add'>+	iwl_sram_cleanup(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -276,7 +298,7 @@ static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)</div><div class='ctx'> 	IWL_INFO(priv, "testmode register access command offset 0x%x\n", ofs);</div><div class='ctx'> </div><div class='ctx'> 	switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {</div><div class='del'>-	case IWL_TM_CMD_APP2DEV_REG_READ32:</div><div class='add'>+	case IWL_TM_CMD_APP2DEV_DIRECT_REG_READ32:</div><div class='ctx'> 		val32 = iwl_read32(bus(priv), ofs);</div><div class='ctx'> 		IWL_INFO(priv, "32bit value to read 0x%x\n", val32);</div><div class='ctx'> </div><div class='hunk'>@@ -291,7 +313,7 @@ static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)</div><div class='ctx'> 			IWL_DEBUG_INFO(priv,</div><div class='ctx'> 				       "Error sending msg : %d\n", status);</div><div class='ctx'> 		break;</div><div class='del'>-	case IWL_TM_CMD_APP2DEV_REG_WRITE32:</div><div class='add'>+	case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE32:</div><div class='ctx'> 		if (!tb[IWL_TM_ATTR_REG_VALUE32]) {</div><div class='ctx'> 			IWL_DEBUG_INFO(priv,</div><div class='ctx'> 				       "Error finding value to write\n");</div><div class='hunk'>@@ -302,7 +324,7 @@ static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)</div><div class='ctx'> 			iwl_write32(bus(priv), ofs, val32);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-	case IWL_TM_CMD_APP2DEV_REG_WRITE8:</div><div class='add'>+	case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE8:</div><div class='ctx'> 		if (!tb[IWL_TM_ATTR_REG_VALUE8]) {</div><div class='ctx'> 			IWL_DEBUG_INFO(priv, "Error finding value to write\n");</div><div class='ctx'> 			return -ENOMSG;</div><div class='hunk'>@@ -312,6 +334,32 @@ static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)</div><div class='ctx'> 			iwl_write8(bus(priv), ofs, val8);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case IWL_TM_CMD_APP2DEV_INDIRECT_REG_READ32:</div><div class='add'>+		val32 = iwl_read_prph(bus(priv), ofs);</div><div class='add'>+		IWL_INFO(priv, "32bit value to read 0x%x\n", val32);</div><div class='add'>+</div><div class='add'>+		skb = cfg80211_testmode_alloc_reply_skb(hw-&gt;wiphy, 20);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			IWL_DEBUG_INFO(priv, "Error allocating memory\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		NLA_PUT_U32(skb, IWL_TM_ATTR_REG_VALUE32, val32);</div><div class='add'>+		status = cfg80211_testmode_reply(skb);</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			IWL_DEBUG_INFO(priv,</div><div class='add'>+					"Error sending msg : %d\n", status);</div><div class='add'>+		break;</div><div class='add'>+	case IWL_TM_CMD_APP2DEV_INDIRECT_REG_WRITE32:</div><div class='add'>+		if (!tb[IWL_TM_ATTR_REG_VALUE32]) {</div><div class='add'>+			IWL_DEBUG_INFO(priv,</div><div class='add'>+					"Error finding value to write\n");</div><div class='add'>+			return -ENOMSG;</div><div class='add'>+		} else {</div><div class='add'>+			val32 = nla_get_u32(tb[IWL_TM_ATTR_REG_VALUE32]);</div><div class='add'>+			IWL_INFO(priv, "32bit value to write 0x%x\n", val32);</div><div class='add'>+			iwl_write_prph(bus(priv), ofs, val32);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		IWL_DEBUG_INFO(priv, "Unknown testmode register command ID\n");</div><div class='ctx'> 		return -ENOSYS;</div><div class='hunk'>@@ -330,24 +378,24 @@ static int iwl_testmode_cfg_init_calib(struct iwl_priv *priv)</div><div class='ctx'> 	struct iwl_notification_wait calib_wait;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	iwlagn_init_notification_wait(priv, &amp;calib_wait,</div><div class='add'>+	iwl_init_notification_wait(priv-&gt;shrd, &amp;calib_wait,</div><div class='ctx'> 				      CALIBRATION_COMPLETE_NOTIFICATION,</div><div class='ctx'> 				      NULL, NULL);</div><div class='del'>-	ret = iwlagn_init_alive_start(priv);</div><div class='add'>+	ret = iwl_init_alive_start(trans(priv));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		IWL_DEBUG_INFO(priv,</div><div class='ctx'> 			"Error configuring init calibration: %d\n", ret);</div><div class='ctx'> 		goto cfg_init_calib_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iwlagn_wait_notification(priv, &amp;calib_wait, 2 * HZ);</div><div class='add'>+	ret = iwl_wait_notification(priv-&gt;shrd, &amp;calib_wait, 2 * HZ);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		IWL_DEBUG_INFO(priv, "Error detecting"</div><div class='ctx'> 			" CALIBRATION_COMPLETE_NOTIFICATION: %d\n", ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> cfg_init_calib_error:</div><div class='del'>-	iwlagn_remove_notification(priv, &amp;calib_wait);</div><div class='add'>+	iwl_remove_notification(priv-&gt;shrd, &amp;calib_wait);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -370,14 +418,16 @@ cfg_init_calib_error:</div><div class='ctx'> static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	struct iwl_trans *trans = trans(priv);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	unsigned char *rsp_data_ptr = NULL;</div><div class='ctx'> 	int status = 0, rsp_data_len = 0;</div><div class='add'>+	u32 devid;</div><div class='ctx'> </div><div class='ctx'> 	switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {</div><div class='ctx'> 	case IWL_TM_CMD_APP2DEV_GET_DEVICENAME:</div><div class='del'>-		rsp_data_ptr = (unsigned char *)priv-&gt;cfg-&gt;name;</div><div class='del'>-		rsp_data_len = strlen(priv-&gt;cfg-&gt;name);</div><div class='add'>+		rsp_data_ptr = (unsigned char *)cfg(priv)-&gt;name;</div><div class='add'>+		rsp_data_len = strlen(cfg(priv)-&gt;name);</div><div class='ctx'> 		skb = cfg80211_testmode_alloc_reply_skb(hw-&gt;wiphy,</div><div class='ctx'> 							rsp_data_len + 20);</div><div class='ctx'> 		if (!skb) {</div><div class='hunk'>@@ -396,8 +446,7 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IWL_TM_CMD_APP2DEV_LOAD_INIT_FW:</div><div class='del'>-		status = iwlagn_load_ucode_wait_alive(priv, &amp;priv-&gt;ucode_init,</div><div class='del'>-						      IWL_UCODE_INIT);</div><div class='add'>+		status = iwl_load_ucode_wait_alive(trans, IWL_UCODE_INIT);</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			IWL_DEBUG_INFO(priv,</div><div class='ctx'> 				"Error loading init ucode: %d\n", status);</div><div class='hunk'>@@ -405,13 +454,11 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)</div><div class='ctx'> </div><div class='ctx'> 	case IWL_TM_CMD_APP2DEV_CFG_INIT_CALIB:</div><div class='ctx'> 		iwl_testmode_cfg_init_calib(priv);</div><div class='del'>-		iwl_trans_stop_device(trans(priv));</div><div class='add'>+		iwl_trans_stop_device(trans);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IWL_TM_CMD_APP2DEV_LOAD_RUNTIME_FW:</div><div class='del'>-		status = iwlagn_load_ucode_wait_alive(priv,</div><div class='del'>-					   &amp;priv-&gt;ucode_rt,</div><div class='del'>-					   IWL_UCODE_REGULAR);</div><div class='add'>+		status = iwl_load_ucode_wait_alive(trans, IWL_UCODE_REGULAR);</div><div class='ctx'> 		if (status) {</div><div class='ctx'> 			IWL_DEBUG_INFO(priv,</div><div class='ctx'> 				"Error loading runtime ucode: %d\n", status);</div><div class='hunk'>@@ -423,10 +470,25 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)</div><div class='ctx'> 				"Error starting the device: %d\n", status);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW:</div><div class='add'>+		iwl_scan_cancel_timeout(priv, 200);</div><div class='add'>+		iwl_trans_stop_device(trans);</div><div class='add'>+		status = iwl_load_ucode_wait_alive(trans, IWL_UCODE_WOWLAN);</div><div class='add'>+		if (status) {</div><div class='add'>+			IWL_DEBUG_INFO(priv,</div><div class='add'>+				"Error loading WOWLAN ucode: %d\n", status);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		status = iwl_alive_start(priv);</div><div class='add'>+		if (status)</div><div class='add'>+			IWL_DEBUG_INFO(priv,</div><div class='add'>+				"Error starting the device: %d\n", status);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case IWL_TM_CMD_APP2DEV_GET_EEPROM:</div><div class='del'>-		if (priv-&gt;eeprom) {</div><div class='add'>+		if (priv-&gt;shrd-&gt;eeprom) {</div><div class='ctx'> 			skb = cfg80211_testmode_alloc_reply_skb(hw-&gt;wiphy,</div><div class='del'>-				priv-&gt;cfg-&gt;base_params-&gt;eeprom_size + 20);</div><div class='add'>+				cfg(priv)-&gt;base_params-&gt;eeprom_size + 20);</div><div class='ctx'> 			if (!skb) {</div><div class='ctx'> 				IWL_DEBUG_INFO(priv,</div><div class='ctx'> 				       "Error allocating memory\n");</div><div class='hunk'>@@ -435,8 +497,8 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)</div><div class='ctx'> 			NLA_PUT_U32(skb, IWL_TM_ATTR_COMMAND,</div><div class='ctx'> 				IWL_TM_CMD_DEV2APP_EEPROM_RSP);</div><div class='ctx'> 			NLA_PUT(skb, IWL_TM_ATTR_EEPROM,</div><div class='del'>-				priv-&gt;cfg-&gt;base_params-&gt;eeprom_size,</div><div class='del'>-				priv-&gt;eeprom);</div><div class='add'>+				cfg(priv)-&gt;base_params-&gt;eeprom_size,</div><div class='add'>+				priv-&gt;shrd-&gt;eeprom);</div><div class='ctx'> 			status = cfg80211_testmode_reply(skb);</div><div class='ctx'> 			if (status &lt; 0)</div><div class='ctx'> 				IWL_DEBUG_INFO(priv,</div><div class='hunk'>@@ -455,6 +517,37 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)</div><div class='ctx'> 		priv-&gt;tm_fixed_rate = nla_get_u32(tb[IWL_TM_ATTR_FIXRATE]);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case IWL_TM_CMD_APP2DEV_GET_FW_VERSION:</div><div class='add'>+		IWL_INFO(priv, "uCode version raw: 0x%x\n", priv-&gt;ucode_ver);</div><div class='add'>+</div><div class='add'>+		skb = cfg80211_testmode_alloc_reply_skb(hw-&gt;wiphy, 20);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			IWL_DEBUG_INFO(priv, "Error allocating memory\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		NLA_PUT_U32(skb, IWL_TM_ATTR_FW_VERSION, priv-&gt;ucode_ver);</div><div class='add'>+		status = cfg80211_testmode_reply(skb);</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			IWL_DEBUG_INFO(priv,</div><div class='add'>+					"Error sending msg : %d\n", status);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IWL_TM_CMD_APP2DEV_GET_DEVICE_ID:</div><div class='add'>+		devid = bus_get_hw_id(bus(priv));</div><div class='add'>+		IWL_INFO(priv, "hw version: 0x%x\n", devid);</div><div class='add'>+</div><div class='add'>+		skb = cfg80211_testmode_alloc_reply_skb(hw-&gt;wiphy, 20);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			IWL_DEBUG_INFO(priv, "Error allocating memory\n");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		NLA_PUT_U32(skb, IWL_TM_ATTR_DEVICE_ID, devid);</div><div class='add'>+		status = cfg80211_testmode_reply(skb);</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			IWL_DEBUG_INFO(priv,</div><div class='add'>+					"Error sending msg : %d\n", status);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		IWL_DEBUG_INFO(priv, "Unknown testmode driver command ID\n");</div><div class='ctx'> 		return -ENOSYS;</div><div class='hunk'>@@ -535,7 +628,7 @@ static int iwl_testmode_trace(struct ieee80211_hw *hw, struct nlattr **tb)</div><div class='ctx'> 		}</div><div class='ctx'> 		priv-&gt;testmode_trace.num_chunks =</div><div class='ctx'> 			DIV_ROUND_UP(priv-&gt;testmode_trace.buff_size,</div><div class='del'>-				     TRACE_CHUNK_SIZE);</div><div class='add'>+				     DUMP_CHUNK_SIZE);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IWL_TM_CMD_APP2DEV_END_TRACE:</div><div class='hunk'>@@ -567,15 +660,15 @@ static int iwl_testmode_trace_dump(struct ieee80211_hw *hw, struct nlattr **tb,</div><div class='ctx'> 		idx = cb-&gt;args[4];</div><div class='ctx'> 		if (idx &gt;= priv-&gt;testmode_trace.num_chunks)</div><div class='ctx'> 			return -ENOENT;</div><div class='del'>-		length = TRACE_CHUNK_SIZE;</div><div class='add'>+		length = DUMP_CHUNK_SIZE;</div><div class='ctx'> 		if (((idx + 1) == priv-&gt;testmode_trace.num_chunks) &amp;&amp;</div><div class='del'>-		    (priv-&gt;testmode_trace.buff_size % TRACE_CHUNK_SIZE))</div><div class='add'>+		    (priv-&gt;testmode_trace.buff_size % DUMP_CHUNK_SIZE))</div><div class='ctx'> 			length = priv-&gt;testmode_trace.buff_size %</div><div class='del'>-				TRACE_CHUNK_SIZE;</div><div class='add'>+				DUMP_CHUNK_SIZE;</div><div class='ctx'> </div><div class='ctx'> 		NLA_PUT(skb, IWL_TM_ATTR_TRACE_DUMP, length,</div><div class='ctx'> 			priv-&gt;testmode_trace.trace_addr +</div><div class='del'>-			(TRACE_CHUNK_SIZE * idx));</div><div class='add'>+			(DUMP_CHUNK_SIZE * idx));</div><div class='ctx'> 		idx++;</div><div class='ctx'> 		cb-&gt;args[4] = idx;</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -621,6 +714,110 @@ static int iwl_testmode_ownership(struct ieee80211_hw *hw, struct nlattr **tb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This function handles the user application commands for SRAM data dump</div><div class='add'>+ *</div><div class='add'>+ * It retrieves the mandatory fields IWL_TM_ATTR_SRAM_ADDR and</div><div class='add'>+ * IWL_TM_ATTR_SRAM_SIZE to decide the memory area for SRAM data reading</div><div class='add'>+ *</div><div class='add'>+ * Several error will be retured, -EBUSY if the SRAM data retrieved by</div><div class='add'>+ * previous command has not been delivered to userspace, or -ENOMSG if</div><div class='add'>+ * the mandatory fields (IWL_TM_ATTR_SRAM_ADDR,IWL_TM_ATTR_SRAM_SIZE)</div><div class='add'>+ * are missing, or -ENOMEM if the buffer allocation fails.</div><div class='add'>+ *</div><div class='add'>+ * Otherwise 0 is replied indicating the success of the SRAM reading.</div><div class='add'>+ *</div><div class='add'>+ * @hw: ieee80211_hw object that represents the device</div><div class='add'>+ * @tb: gnl message fields from the user space</div><div class='add'>+ */</div><div class='add'>+static int iwl_testmode_sram(struct ieee80211_hw *hw, struct nlattr **tb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	u32 base, ofs, size, maxsize;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;testmode_sram.sram_readed)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (!tb[IWL_TM_ATTR_SRAM_ADDR]) {</div><div class='add'>+		IWL_DEBUG_INFO(priv, "Error finding SRAM offset address\n");</div><div class='add'>+		return -ENOMSG;</div><div class='add'>+	}</div><div class='add'>+	ofs = nla_get_u32(tb[IWL_TM_ATTR_SRAM_ADDR]);</div><div class='add'>+	if (!tb[IWL_TM_ATTR_SRAM_SIZE]) {</div><div class='add'>+		IWL_DEBUG_INFO(priv, "Error finding size for SRAM reading\n");</div><div class='add'>+		return -ENOMSG;</div><div class='add'>+	}</div><div class='add'>+	size = nla_get_u32(tb[IWL_TM_ATTR_SRAM_SIZE]);</div><div class='add'>+	switch (priv-&gt;shrd-&gt;ucode_type) {</div><div class='add'>+	case IWL_UCODE_REGULAR:</div><div class='add'>+		maxsize = trans(priv)-&gt;ucode_rt.data.len;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_UCODE_INIT:</div><div class='add'>+		maxsize = trans(priv)-&gt;ucode_init.data.len;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_UCODE_WOWLAN:</div><div class='add'>+		maxsize = trans(priv)-&gt;ucode_wowlan.data.len;</div><div class='add'>+		break;</div><div class='add'>+	case IWL_UCODE_NONE:</div><div class='add'>+		IWL_DEBUG_INFO(priv, "Error, uCode does not been loaded\n");</div><div class='add'>+		return -ENOSYS;</div><div class='add'>+	default:</div><div class='add'>+		IWL_DEBUG_INFO(priv, "Error, unsupported uCode type\n");</div><div class='add'>+		return -ENOSYS;</div><div class='add'>+	}</div><div class='add'>+	if ((ofs + size) &gt; maxsize) {</div><div class='add'>+		IWL_DEBUG_INFO(priv, "Invalid offset/size: out of range\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;testmode_sram.buff_size = (size / 4) * 4;</div><div class='add'>+	priv-&gt;testmode_sram.buff_addr =</div><div class='add'>+		kmalloc(priv-&gt;testmode_sram.buff_size, GFP_KERNEL);</div><div class='add'>+	if (priv-&gt;testmode_sram.buff_addr == NULL) {</div><div class='add'>+		IWL_DEBUG_INFO(priv, "Error allocating memory\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	base = 0x800000;</div><div class='add'>+	_iwl_read_targ_mem_words(bus(priv), base + ofs,</div><div class='add'>+					priv-&gt;testmode_sram.buff_addr,</div><div class='add'>+					priv-&gt;testmode_sram.buff_size / 4);</div><div class='add'>+	priv-&gt;testmode_sram.num_chunks =</div><div class='add'>+		DIV_ROUND_UP(priv-&gt;testmode_sram.buff_size, DUMP_CHUNK_SIZE);</div><div class='add'>+	priv-&gt;testmode_sram.sram_readed = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_testmode_sram_dump(struct ieee80211_hw *hw, struct nlattr **tb,</div><div class='add'>+				   struct sk_buff *skb,</div><div class='add'>+				   struct netlink_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct iwl_priv *priv = hw-&gt;priv;</div><div class='add'>+	int idx, length;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;testmode_sram.sram_readed) {</div><div class='add'>+		idx = cb-&gt;args[4];</div><div class='add'>+		if (idx &gt;= priv-&gt;testmode_sram.num_chunks) {</div><div class='add'>+			iwl_sram_cleanup(priv);</div><div class='add'>+			return -ENOENT;</div><div class='add'>+		}</div><div class='add'>+		length = DUMP_CHUNK_SIZE;</div><div class='add'>+		if (((idx + 1) == priv-&gt;testmode_sram.num_chunks) &amp;&amp;</div><div class='add'>+		    (priv-&gt;testmode_sram.buff_size % DUMP_CHUNK_SIZE))</div><div class='add'>+			length = priv-&gt;testmode_sram.buff_size %</div><div class='add'>+				DUMP_CHUNK_SIZE;</div><div class='add'>+</div><div class='add'>+		NLA_PUT(skb, IWL_TM_ATTR_SRAM_DUMP, length,</div><div class='add'>+			priv-&gt;testmode_sram.buff_addr +</div><div class='add'>+			(DUMP_CHUNK_SIZE * idx));</div><div class='add'>+		idx++;</div><div class='add'>+		cb-&gt;args[4] = idx;</div><div class='add'>+		return 0;</div><div class='add'>+	} else</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+ nla_put_failure:</div><div class='add'>+	return -ENOBUFS;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* The testmode gnl message handler that takes the gnl message from the</div><div class='ctx'>  * user space and parses it per the policy iwl_testmode_gnl_msg_policy, then</div><div class='hunk'>@@ -668,9 +865,11 @@ int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, int len)</div><div class='ctx'> 		IWL_DEBUG_INFO(priv, "testmode cmd to uCode\n");</div><div class='ctx'> 		result = iwl_testmode_ucode(hw, tb);</div><div class='ctx'> 		break;</div><div class='del'>-	case IWL_TM_CMD_APP2DEV_REG_READ32:</div><div class='del'>-	case IWL_TM_CMD_APP2DEV_REG_WRITE32:</div><div class='del'>-	case IWL_TM_CMD_APP2DEV_REG_WRITE8:</div><div class='add'>+	case IWL_TM_CMD_APP2DEV_DIRECT_REG_READ32:</div><div class='add'>+	case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE32:</div><div class='add'>+	case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE8:</div><div class='add'>+	case IWL_TM_CMD_APP2DEV_INDIRECT_REG_READ32:</div><div class='add'>+	case IWL_TM_CMD_APP2DEV_INDIRECT_REG_WRITE32:</div><div class='ctx'> 		IWL_DEBUG_INFO(priv, "testmode cmd to register\n");</div><div class='ctx'> 		result = iwl_testmode_reg(hw, tb);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -680,6 +879,9 @@ int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, int len)</div><div class='ctx'> 	case IWL_TM_CMD_APP2DEV_LOAD_RUNTIME_FW:</div><div class='ctx'> 	case IWL_TM_CMD_APP2DEV_GET_EEPROM:</div><div class='ctx'> 	case IWL_TM_CMD_APP2DEV_FIXRATE_REQ:</div><div class='add'>+	case IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW:</div><div class='add'>+	case IWL_TM_CMD_APP2DEV_GET_FW_VERSION:</div><div class='add'>+	case IWL_TM_CMD_APP2DEV_GET_DEVICE_ID:</div><div class='ctx'> 		IWL_DEBUG_INFO(priv, "testmode cmd to driver\n");</div><div class='ctx'> 		result = iwl_testmode_driver(hw, tb);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -696,6 +898,11 @@ int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, int len)</div><div class='ctx'> 		result = iwl_testmode_ownership(hw, tb);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case IWL_TM_CMD_APP2DEV_READ_SRAM:</div><div class='add'>+		IWL_DEBUG_INFO(priv, "testmode sram read cmd to driver\n");</div><div class='add'>+		result = iwl_testmode_sram(hw, tb);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		IWL_DEBUG_INFO(priv, "Unknown testmode command\n");</div><div class='ctx'> 		result = -ENOSYS;</div><div class='hunk'>@@ -744,6 +951,10 @@ int iwlagn_mac_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb,</div><div class='ctx'> 		IWL_DEBUG_INFO(priv, "uCode trace cmd to driver\n");</div><div class='ctx'> 		result = iwl_testmode_trace_dump(hw, tb, skb, cb);</div><div class='ctx'> 		break;</div><div class='add'>+	case IWL_TM_CMD_APP2DEV_DUMP_SRAM:</div><div class='add'>+		IWL_DEBUG_INFO(priv, "testmode sram dump cmd to driver\n");</div><div class='add'>+		result = iwl_testmode_sram_dump(hw, tb, skb, cb);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		result = -EINVAL;</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.h b/drivers/net/wireless/iwlwifi/iwl-testmode.h<br/>index b980bda4b0f8..26138f110340 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-testmode.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-testmode.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-testmode.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-testmode.h</a></div><div class='hunk'>@@ -76,9 +76,9 @@</div><div class='ctx'>  *	the actual uCode host command ID is carried with</div><div class='ctx'>  *	IWL_TM_ATTR_UCODE_CMD_ID</div><div class='ctx'>  *</div><div class='del'>- * @IWL_TM_CMD_APP2DEV_REG_READ32:</div><div class='del'>- * @IWL_TM_CMD_APP2DEV_REG_WRITE32:</div><div class='del'>- * @IWL_TM_CMD_APP2DEV_REG_WRITE8:</div><div class='add'>+ * @IWL_TM_CMD_APP2DEV_DIRECT_REG_READ32:</div><div class='add'>+ * @IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE32:</div><div class='add'>+ * @IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE8:</div><div class='ctx'>  *	commands from user applicaiton to access register</div><div class='ctx'>  *</div><div class='ctx'>  * @IWL_TM_CMD_APP2DEV_GET_DEVICENAME: retrieve device name</div><div class='hunk'>@@ -103,16 +103,30 @@</div><div class='ctx'>  * @IWL_TM_CMD_DEV2APP_EEPROM_RSP:</div><div class='ctx'>  *	commands from kernel space to carry the eeprom response</div><div class='ctx'>  *	to user application</div><div class='add'>+ *</div><div class='ctx'>  * @IWL_TM_CMD_APP2DEV_OWNERSHIP:</div><div class='ctx'>  *	commands from user application to own change the ownership of the uCode</div><div class='ctx'>  *	if application has the ownership, the only host command from</div><div class='ctx'>  *	testmode will deliver to uCode. Default owner is driver</div><div class='add'>+ *</div><div class='add'>+ * @IWL_TM_CMD_APP2DEV_INDIRECT_REG_READ32:</div><div class='add'>+ * @IWL_TM_CMD_APP2DEV_INDIRECT_REG_WRITE32:</div><div class='add'>+ *	commands from user applicaiton to indirectly access peripheral register</div><div class='add'>+ *</div><div class='add'>+ * @IWL_TM_CMD_APP2DEV_READ_SRAM:</div><div class='add'>+ * @IWL_TM_CMD_APP2DEV_DUMP_SRAM:</div><div class='add'>+ *	commands from user applicaiton to read data in sram</div><div class='add'>+ *</div><div class='add'>+ * @IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW: load Weak On Wireless LAN uCode image</div><div class='add'>+ * @IWL_TM_CMD_APP2DEV_GET_FW_VERSION: retrieve uCode version</div><div class='add'>+ * @IWL_TM_CMD_APP2DEV_GET_DEVICE_ID: retrieve ID information in device</div><div class='add'>+ *</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_tm_cmd_t {</div><div class='ctx'> 	IWL_TM_CMD_APP2DEV_UCODE		= 1,</div><div class='del'>-	IWL_TM_CMD_APP2DEV_REG_READ32		= 2,</div><div class='del'>-	IWL_TM_CMD_APP2DEV_REG_WRITE32		= 3,</div><div class='del'>-	IWL_TM_CMD_APP2DEV_REG_WRITE8		= 4,</div><div class='add'>+	IWL_TM_CMD_APP2DEV_DIRECT_REG_READ32	= 2,</div><div class='add'>+	IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE32	= 3,</div><div class='add'>+	IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE8	= 4,</div><div class='ctx'> 	IWL_TM_CMD_APP2DEV_GET_DEVICENAME	= 5,</div><div class='ctx'> 	IWL_TM_CMD_APP2DEV_LOAD_INIT_FW		= 6,</div><div class='ctx'> 	IWL_TM_CMD_APP2DEV_CFG_INIT_CALIB	= 7,</div><div class='hunk'>@@ -126,7 +140,14 @@ enum iwl_tm_cmd_t {</div><div class='ctx'> 	IWL_TM_CMD_DEV2APP_UCODE_RX_PKT		= 15,</div><div class='ctx'> 	IWL_TM_CMD_DEV2APP_EEPROM_RSP		= 16,</div><div class='ctx'> 	IWL_TM_CMD_APP2DEV_OWNERSHIP		= 17,</div><div class='del'>-	IWL_TM_CMD_MAX				= 18,</div><div class='add'>+	IWL_TM_CMD_APP2DEV_INDIRECT_REG_READ32	= 18,</div><div class='add'>+	IWL_TM_CMD_APP2DEV_INDIRECT_REG_WRITE32	= 19,</div><div class='add'>+	IWL_TM_CMD_APP2DEV_READ_SRAM		= 20,</div><div class='add'>+	IWL_TM_CMD_APP2DEV_DUMP_SRAM		= 21,</div><div class='add'>+	IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW	= 22,</div><div class='add'>+	IWL_TM_CMD_APP2DEV_GET_FW_VERSION	= 23,</div><div class='add'>+	IWL_TM_CMD_APP2DEV_GET_DEVICE_ID	= 24,</div><div class='add'>+	IWL_TM_CMD_MAX				= 25,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -196,6 +217,26 @@ enum iwl_tm_cmd_t {</div><div class='ctx'>  *	When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_OWNERSHIP,</div><div class='ctx'>  *	The mandatory fields are:</div><div class='ctx'>  *	IWL_TM_ATTR_UCODE_OWNER for the new owner</div><div class='add'>+ *</div><div class='add'>+ * @IWL_TM_ATTR_SRAM_ADDR:</div><div class='add'>+ * @IWL_TM_ATTR_SRAM_SIZE:</div><div class='add'>+ *	When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_READ_SRAM,</div><div class='add'>+ *	The mandatory fields are:</div><div class='add'>+ *	IWL_TM_ATTR_SRAM_ADDR for the address in sram</div><div class='add'>+ *	IWL_TM_ATTR_SRAM_SIZE for the buffer size of data reading</div><div class='add'>+ *</div><div class='add'>+ * @IWL_TM_ATTR_SRAM_DUMP:</div><div class='add'>+ *	When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_DUMP_SRAM,</div><div class='add'>+ *	IWL_TM_ATTR_SRAM_DUMP for the data in sram</div><div class='add'>+ *</div><div class='add'>+ * @IWL_TM_ATTR_FW_VERSION:</div><div class='add'>+ *	When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_GET_FW_VERSION,</div><div class='add'>+ *	IWL_TM_ATTR_FW_VERSION for the uCode version</div><div class='add'>+ *</div><div class='add'>+ * @IWL_TM_ATTR_DEVICE_ID:</div><div class='add'>+ *	When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_GET_DEVICE_ID,</div><div class='add'>+ *	IWL_TM_ATTR_DEVICE_ID for the device ID information</div><div class='add'>+ *</div><div class='ctx'>  */</div><div class='ctx'> enum iwl_tm_attr_t {</div><div class='ctx'> 	IWL_TM_ATTR_NOT_APPLICABLE		= 0,</div><div class='hunk'>@@ -213,7 +254,12 @@ enum iwl_tm_attr_t {</div><div class='ctx'> 	IWL_TM_ATTR_TRACE_DUMP			= 12,</div><div class='ctx'> 	IWL_TM_ATTR_FIXRATE			= 13,</div><div class='ctx'> 	IWL_TM_ATTR_UCODE_OWNER			= 14,</div><div class='del'>-	IWL_TM_ATTR_MAX				= 15,</div><div class='add'>+	IWL_TM_ATTR_SRAM_ADDR			= 15,</div><div class='add'>+	IWL_TM_ATTR_SRAM_SIZE			= 16,</div><div class='add'>+	IWL_TM_ATTR_SRAM_DUMP			= 17,</div><div class='add'>+	IWL_TM_ATTR_FW_VERSION			= 18,</div><div class='add'>+	IWL_TM_ATTR_DEVICE_ID			= 19,</div><div class='add'>+	IWL_TM_ATTR_MAX				= 20,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* uCode trace buffer */</div><div class='hunk'>@@ -221,6 +267,8 @@ enum iwl_tm_attr_t {</div><div class='ctx'> #define TRACE_BUFF_SIZE_MIN	0x20000</div><div class='ctx'> #define TRACE_BUFF_SIZE_DEF	TRACE_BUFF_SIZE_MIN</div><div class='ctx'> #define TRACE_BUFF_PADD		0x2000</div><div class='del'>-#define TRACE_CHUNK_SIZE	(PAGE_SIZE - 1024)</div><div class='add'>+</div><div class='add'>+/* Maximum data size of each dump it packet */</div><div class='add'>+#define DUMP_CHUNK_SIZE		(PAGE_SIZE - 1024)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h<br/>index 2b6756e8b8f9..f6debf91d7b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h</a></div><div class='hunk'>@@ -219,9 +219,7 @@ struct iwl_trans_pcie {</div><div class='ctx'> </div><div class='ctx'> 	/* INT ICT Table */</div><div class='ctx'> 	__le32 *ict_tbl;</div><div class='del'>-	void *ict_tbl_vir;</div><div class='ctx'> 	dma_addr_t ict_tbl_dma;</div><div class='del'>-	dma_addr_t aligned_ict_tbl_dma;</div><div class='ctx'> 	int ict_index;</div><div class='ctx'> 	u32 inta;</div><div class='ctx'> 	bool use_ict;</div><div class='hunk'>@@ -236,6 +234,7 @@ struct iwl_trans_pcie {</div><div class='ctx'> 	const u8 *ac_to_fifo[NUM_IWL_RXON_CTX];</div><div class='ctx'> 	const u8 *ac_to_queue[NUM_IWL_RXON_CTX];</div><div class='ctx'> 	u8 mcast_queue[NUM_IWL_RXON_CTX];</div><div class='add'>+	u8 agg_txq[IWLAGN_STATION_COUNT][IWL_MAX_TID_COUNT];</div><div class='ctx'> </div><div class='ctx'> 	struct iwl_tx_queue *txq;</div><div class='ctx'> 	unsigned long txq_ctx_active_msk;</div><div class='hunk'>@@ -280,20 +279,16 @@ void iwl_tx_cmd_complete(struct iwl_trans *trans,</div><div class='ctx'> void iwl_trans_txq_update_byte_cnt_tbl(struct iwl_trans *trans,</div><div class='ctx'> 					   struct iwl_tx_queue *txq,</div><div class='ctx'> 					   u16 byte_cnt);</div><div class='del'>-void iwl_trans_pcie_txq_agg_disable(struct iwl_trans *trans, int txq_id);</div><div class='ctx'> int iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans,</div><div class='del'>-				  enum iwl_rxon_context_id ctx, int sta_id,</div><div class='del'>-				  int tid);</div><div class='add'>+				  int sta_id, int tid);</div><div class='ctx'> void iwl_trans_set_wr_ptrs(struct iwl_trans *trans, int txq_id, u32 index);</div><div class='ctx'> void iwl_trans_tx_queue_set_status(struct iwl_trans *trans,</div><div class='ctx'> 			     struct iwl_tx_queue *txq,</div><div class='ctx'> 			     int tx_fifo_id, int scd_retry);</div><div class='del'>-int iwl_trans_pcie_tx_agg_alloc(struct iwl_trans *trans,</div><div class='del'>-				enum iwl_rxon_context_id ctx, int sta_id,</div><div class='del'>-				int tid, u16 *ssn);</div><div class='add'>+int iwl_trans_pcie_tx_agg_alloc(struct iwl_trans *trans, int sta_id, int tid);</div><div class='ctx'> void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans,</div><div class='ctx'> 				 enum iwl_rxon_context_id ctx,</div><div class='del'>-				 int sta_id, int tid, int frame_limit);</div><div class='add'>+				 int sta_id, int tid, int frame_limit, u16 ssn);</div><div class='ctx'> void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,</div><div class='ctx'> 	int index, enum dma_data_direction dma_dir);</div><div class='ctx'> int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,</div><div class='hunk'>@@ -354,8 +349,13 @@ static inline void iwl_set_swq_id(struct iwl_tx_queue *txq, u8 ac, u8 hwq)</div><div class='ctx'> 	txq-&gt;swq_id = (hwq &lt;&lt; 2) | ac;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u8 iwl_get_queue_ac(struct iwl_tx_queue *txq)</div><div class='add'>+{</div><div class='add'>+	return txq-&gt;swq_id &amp; 0x3;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void iwl_wake_queue(struct iwl_trans *trans,</div><div class='del'>-				  struct iwl_tx_queue *txq)</div><div class='add'>+				  struct iwl_tx_queue *txq, const char *msg)</div><div class='ctx'> {</div><div class='ctx'> 	u8 queue = txq-&gt;swq_id;</div><div class='ctx'> 	u8 ac = queue &amp; 3;</div><div class='hunk'>@@ -363,13 +363,22 @@ static inline void iwl_wake_queue(struct iwl_trans *trans,</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie =</div><div class='ctx'> 		IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='del'>-	if (test_and_clear_bit(hwq, trans_pcie-&gt;queue_stopped))</div><div class='del'>-		if (atomic_dec_return(&amp;trans_pcie-&gt;queue_stop_count[ac]) &lt;= 0)</div><div class='add'>+	if (test_and_clear_bit(hwq, trans_pcie-&gt;queue_stopped)) {</div><div class='add'>+		if (atomic_dec_return(&amp;trans_pcie-&gt;queue_stop_count[ac]) &lt;= 0) {</div><div class='ctx'> 			iwl_wake_sw_queue(priv(trans), ac);</div><div class='add'>+			IWL_DEBUG_TX_QUEUES(trans, "Wake hwq %d ac %d. %s",</div><div class='add'>+					    hwq, ac, msg);</div><div class='add'>+		} else {</div><div class='add'>+			IWL_DEBUG_TX_QUEUES(trans, "Don't wake hwq %d ac %d"</div><div class='add'>+					    " stop count %d. %s",</div><div class='add'>+					    hwq, ac, atomic_read(&amp;trans_pcie-&gt;</div><div class='add'>+					    queue_stop_count[ac]), msg);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_stop_queue(struct iwl_trans *trans,</div><div class='del'>-				  struct iwl_tx_queue *txq)</div><div class='add'>+				  struct iwl_tx_queue *txq, const char *msg)</div><div class='ctx'> {</div><div class='ctx'> 	u8 queue = txq-&gt;swq_id;</div><div class='ctx'> 	u8 ac = queue &amp; 3;</div><div class='hunk'>@@ -377,9 +386,23 @@ static inline void iwl_stop_queue(struct iwl_trans *trans,</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie =</div><div class='ctx'> 		IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='del'>-	if (!test_and_set_bit(hwq, trans_pcie-&gt;queue_stopped))</div><div class='del'>-		if (atomic_inc_return(&amp;trans_pcie-&gt;queue_stop_count[ac]) &gt; 0)</div><div class='add'>+	if (!test_and_set_bit(hwq, trans_pcie-&gt;queue_stopped)) {</div><div class='add'>+		if (atomic_inc_return(&amp;trans_pcie-&gt;queue_stop_count[ac]) &gt; 0) {</div><div class='ctx'> 			iwl_stop_sw_queue(priv(trans), ac);</div><div class='add'>+			IWL_DEBUG_TX_QUEUES(trans, "Stop hwq %d ac %d"</div><div class='add'>+					    " stop count %d. %s",</div><div class='add'>+					    hwq, ac, atomic_read(&amp;trans_pcie-&gt;</div><div class='add'>+					    queue_stop_count[ac]), msg);</div><div class='add'>+		} else {</div><div class='add'>+			IWL_DEBUG_TX_QUEUES(trans, "Don't stop hwq %d ac %d"</div><div class='add'>+					    " stop count %d. %s",</div><div class='add'>+					    hwq, ac, atomic_read(&amp;trans_pcie-&gt;</div><div class='add'>+					    queue_stop_count[ac]), msg);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		IWL_DEBUG_TX_QUEUES(trans, "stop hwq %d, but it is stopped/ %s",</div><div class='add'>+				    hwq, msg);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef ieee80211_stop_queue</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c<br/>index 374c68cc1d70..752493f00406 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c</a></div><div class='hunk'>@@ -594,8 +594,8 @@ static void iwl_dump_nic_error_log(struct iwl_trans *trans)</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie =</div><div class='ctx'> 		IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='del'>-	base = priv-&gt;device_pointers.error_event_table;</div><div class='del'>-	if (priv-&gt;ucode_type == IWL_UCODE_INIT) {</div><div class='add'>+	base = trans-&gt;shrd-&gt;device_pointers.error_event_table;</div><div class='add'>+	if (trans-&gt;shrd-&gt;ucode_type == IWL_UCODE_INIT) {</div><div class='ctx'> 		if (!base)</div><div class='ctx'> 			base = priv-&gt;init_errlog_ptr;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -607,7 +607,7 @@ static void iwl_dump_nic_error_log(struct iwl_trans *trans)</div><div class='ctx'> 		IWL_ERR(trans,</div><div class='ctx'> 			"Not valid error log pointer 0x%08X for %s uCode\n",</div><div class='ctx'> 			base,</div><div class='del'>-			(priv-&gt;ucode_type == IWL_UCODE_INIT)</div><div class='add'>+			(trans-&gt;shrd-&gt;ucode_type == IWL_UCODE_INIT)</div><div class='ctx'> 					? "Init" : "RT");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -648,6 +648,21 @@ static void iwl_dump_nic_error_log(struct iwl_trans *trans)</div><div class='ctx'> 	IWL_ERR(trans, "0x%08X | hw version\n", table.hw_ver);</div><div class='ctx'> 	IWL_ERR(trans, "0x%08X | board version\n", table.brd_ver);</div><div class='ctx'> 	IWL_ERR(trans, "0x%08X | hcmd\n", table.hcmd);</div><div class='add'>+</div><div class='add'>+	IWL_ERR(trans, "0x%08X | isr0\n", table.isr0);</div><div class='add'>+	IWL_ERR(trans, "0x%08X | isr1\n", table.isr1);</div><div class='add'>+	IWL_ERR(trans, "0x%08X | isr2\n", table.isr2);</div><div class='add'>+	IWL_ERR(trans, "0x%08X | isr3\n", table.isr3);</div><div class='add'>+	IWL_ERR(trans, "0x%08X | isr4\n", table.isr4);</div><div class='add'>+	IWL_ERR(trans, "0x%08X | isr_pref\n", table.isr_pref);</div><div class='add'>+	IWL_ERR(trans, "0x%08X | wait_event\n", table.wait_event);</div><div class='add'>+	IWL_ERR(trans, "0x%08X | l2p_control\n", table.l2p_control);</div><div class='add'>+	IWL_ERR(trans, "0x%08X | l2p_duration\n", table.l2p_duration);</div><div class='add'>+	IWL_ERR(trans, "0x%08X | l2p_mhvalid\n", table.l2p_mhvalid);</div><div class='add'>+	IWL_ERR(trans, "0x%08X | l2p_addr_match\n", table.l2p_addr_match);</div><div class='add'>+	IWL_ERR(trans, "0x%08X | lmpm_pmg_sel\n", table.lmpm_pmg_sel);</div><div class='add'>+	IWL_ERR(trans, "0x%08X | timestamp\n", table.u_timestamp);</div><div class='add'>+	IWL_ERR(trans, "0x%08X | flow_handler\n", table.flow_handler);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -657,7 +672,7 @@ static void iwl_irq_handle_error(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_priv *priv = priv(trans);</div><div class='ctx'> 	/* W/A for WiFi/WiMAX coex and WiMAX own the RF */</div><div class='del'>-	if (priv-&gt;cfg-&gt;internal_wimax_coex &amp;&amp;</div><div class='add'>+	if (cfg(priv)-&gt;internal_wimax_coex &amp;&amp;</div><div class='ctx'> 	    (!(iwl_read_prph(bus(trans), APMG_CLK_CTRL_REG) &amp;</div><div class='ctx'> 			APMS_CLK_VAL_MRB_FUNC_MODE) ||</div><div class='ctx'> 	     (iwl_read_prph(bus(trans), APMG_PS_CTRL_REG) &amp;</div><div class='hunk'>@@ -709,8 +724,8 @@ static int iwl_print_event_log(struct iwl_trans *trans, u32 start_idx,</div><div class='ctx'> 	if (num_events == 0)</div><div class='ctx'> 		return pos;</div><div class='ctx'> </div><div class='del'>-	base = priv-&gt;device_pointers.log_event_table;</div><div class='del'>-	if (priv-&gt;ucode_type == IWL_UCODE_INIT) {</div><div class='add'>+	base = trans-&gt;shrd-&gt;device_pointers.log_event_table;</div><div class='add'>+	if (trans-&gt;shrd-&gt;ucode_type == IWL_UCODE_INIT) {</div><div class='ctx'> 		if (!base)</div><div class='ctx'> 			base = priv-&gt;init_evtlog_ptr;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -823,8 +838,8 @@ int iwl_dump_nic_event_log(struct iwl_trans *trans, bool full_log,</div><div class='ctx'> 	size_t bufsz = 0;</div><div class='ctx'> 	struct iwl_priv *priv = priv(trans);</div><div class='ctx'> </div><div class='del'>-	base = priv-&gt;device_pointers.log_event_table;</div><div class='del'>-	if (priv-&gt;ucode_type == IWL_UCODE_INIT) {</div><div class='add'>+	base = trans-&gt;shrd-&gt;device_pointers.log_event_table;</div><div class='add'>+	if (trans-&gt;shrd-&gt;ucode_type == IWL_UCODE_INIT) {</div><div class='ctx'> 		logsize = priv-&gt;init_evtlog_size;</div><div class='ctx'> 		if (!base)</div><div class='ctx'> 			base = priv-&gt;init_evtlog_ptr;</div><div class='hunk'>@@ -838,7 +853,7 @@ int iwl_dump_nic_event_log(struct iwl_trans *trans, bool full_log,</div><div class='ctx'> 		IWL_ERR(trans,</div><div class='ctx'> 			"Invalid event log pointer 0x%08X for %s uCode\n",</div><div class='ctx'> 			base,</div><div class='del'>-			(priv-&gt;ucode_type == IWL_UCODE_INIT)</div><div class='add'>+			(trans-&gt;shrd-&gt;ucode_type == IWL_UCODE_INIT)</div><div class='ctx'> 					? "Init" : "RT");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1108,7 +1123,7 @@ void iwl_irq_tasklet(struct iwl_trans *trans)</div><div class='ctx'> 		isr_stats-&gt;tx++;</div><div class='ctx'> 		handled |= CSR_INT_BIT_FH_TX;</div><div class='ctx'> 		/* Wake up uCode load routine, now that load is complete */</div><div class='del'>-		priv(trans)-&gt;ucode_write_complete = 1;</div><div class='add'>+		trans-&gt;ucode_write_complete = 1;</div><div class='ctx'> 		wake_up(&amp;trans-&gt;shrd-&gt;wait_command_queue);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1136,7 +1151,11 @@ void iwl_irq_tasklet(struct iwl_trans *trans)</div><div class='ctx'>  * ICT functions</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-#define ICT_COUNT (PAGE_SIZE/sizeof(u32))</div><div class='add'>+</div><div class='add'>+/* a device (PCI-E) page is 4096 bytes long */</div><div class='add'>+#define ICT_SHIFT	12</div><div class='add'>+#define ICT_SIZE	(1 &lt;&lt; ICT_SHIFT)</div><div class='add'>+#define ICT_COUNT	(ICT_SIZE / sizeof(u32))</div><div class='ctx'> </div><div class='ctx'> /* Free dram table */</div><div class='ctx'> void iwl_free_isr_ict(struct iwl_trans *trans)</div><div class='hunk'>@@ -1144,21 +1163,19 @@ void iwl_free_isr_ict(struct iwl_trans *trans)</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie =</div><div class='ctx'> 		IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='del'>-	if (trans_pcie-&gt;ict_tbl_vir) {</div><div class='del'>-		dma_free_coherent(bus(trans)-&gt;dev,</div><div class='del'>-				  (sizeof(u32) * ICT_COUNT) + PAGE_SIZE,</div><div class='del'>-				  trans_pcie-&gt;ict_tbl_vir,</div><div class='add'>+	if (trans_pcie-&gt;ict_tbl) {</div><div class='add'>+		dma_free_coherent(bus(trans)-&gt;dev, ICT_SIZE,</div><div class='add'>+				  trans_pcie-&gt;ict_tbl,</div><div class='ctx'> 				  trans_pcie-&gt;ict_tbl_dma);</div><div class='del'>-		trans_pcie-&gt;ict_tbl_vir = NULL;</div><div class='del'>-		memset(&amp;trans_pcie-&gt;ict_tbl_dma, 0,</div><div class='del'>-			sizeof(trans_pcie-&gt;ict_tbl_dma));</div><div class='del'>-		memset(&amp;trans_pcie-&gt;aligned_ict_tbl_dma, 0,</div><div class='del'>-			sizeof(trans_pcie-&gt;aligned_ict_tbl_dma));</div><div class='add'>+		trans_pcie-&gt;ict_tbl = NULL;</div><div class='add'>+		trans_pcie-&gt;ict_tbl_dma = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* allocate dram shared table it is a PAGE_SIZE aligned</div><div class='add'>+/*</div><div class='add'>+ * allocate dram shared table, it is an aligned memory</div><div class='add'>+ * block of ICT_SIZE.</div><div class='ctx'>  * also reset all data related to ICT table interrupt.</div><div class='ctx'>  */</div><div class='ctx'> int iwl_alloc_isr_ict(struct iwl_trans *trans)</div><div class='hunk'>@@ -1166,36 +1183,26 @@ int iwl_alloc_isr_ict(struct iwl_trans *trans)</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie =</div><div class='ctx'> 		IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='del'>-	/* allocate shrared data table */</div><div class='del'>-	trans_pcie-&gt;ict_tbl_vir =</div><div class='del'>-		dma_alloc_coherent(bus(trans)-&gt;dev,</div><div class='del'>-				   (sizeof(u32) * ICT_COUNT) + PAGE_SIZE,</div><div class='del'>-				   &amp;trans_pcie-&gt;ict_tbl_dma, GFP_KERNEL);</div><div class='del'>-	if (!trans_pcie-&gt;ict_tbl_vir)</div><div class='add'>+	trans_pcie-&gt;ict_tbl =</div><div class='add'>+		dma_alloc_coherent(bus(trans)-&gt;dev, ICT_SIZE,</div><div class='add'>+				   &amp;trans_pcie-&gt;ict_tbl_dma,</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+	if (!trans_pcie-&gt;ict_tbl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* align table to PAGE_SIZE boundary */</div><div class='del'>-	trans_pcie-&gt;aligned_ict_tbl_dma =</div><div class='del'>-		ALIGN(trans_pcie-&gt;ict_tbl_dma, PAGE_SIZE);</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_ISR(trans, "ict dma addr %Lx dma aligned %Lx diff %d\n",</div><div class='del'>-			   (unsigned long long)trans_pcie-&gt;ict_tbl_dma,</div><div class='del'>-			   (unsigned long long)trans_pcie-&gt;aligned_ict_tbl_dma,</div><div class='del'>-			   (int)(trans_pcie-&gt;aligned_ict_tbl_dma -</div><div class='del'>-			   trans_pcie-&gt;ict_tbl_dma));</div><div class='add'>+	/* just an API sanity check ... it is guaranteed to be aligned */</div><div class='add'>+	if (WARN_ON(trans_pcie-&gt;ict_tbl_dma &amp; (ICT_SIZE - 1))) {</div><div class='add'>+		iwl_free_isr_ict(trans);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	trans_pcie-&gt;ict_tbl =  trans_pcie-&gt;ict_tbl_vir +</div><div class='del'>-			  (trans_pcie-&gt;aligned_ict_tbl_dma -</div><div class='del'>-			  trans_pcie-&gt;ict_tbl_dma);</div><div class='add'>+	IWL_DEBUG_ISR(trans, "ict dma addr %Lx\n",</div><div class='add'>+		      (unsigned long long)trans_pcie-&gt;ict_tbl_dma);</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_ISR(trans, "ict vir addr %p vir aligned %p diff %d\n",</div><div class='del'>-			     trans_pcie-&gt;ict_tbl, trans_pcie-&gt;ict_tbl_vir,</div><div class='del'>-			(int)(trans_pcie-&gt;aligned_ict_tbl_dma -</div><div class='del'>-			    trans_pcie-&gt;ict_tbl_dma));</div><div class='add'>+	IWL_DEBUG_ISR(trans, "ict vir addr %p\n", trans_pcie-&gt;ict_tbl);</div><div class='ctx'> </div><div class='ctx'> 	/* reset table and index to all 0 */</div><div class='del'>-	memset(trans_pcie-&gt;ict_tbl_vir, 0,</div><div class='del'>-		(sizeof(u32) * ICT_COUNT) + PAGE_SIZE);</div><div class='add'>+	memset(trans_pcie-&gt;ict_tbl, 0, ICT_SIZE);</div><div class='ctx'> 	trans_pcie-&gt;ict_index = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* add periodic RX interrupt */</div><div class='hunk'>@@ -1213,23 +1220,20 @@ int iwl_reset_ict(struct iwl_trans *trans)</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie =</div><div class='ctx'> 		IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='del'>-	if (!trans_pcie-&gt;ict_tbl_vir)</div><div class='add'>+	if (!trans_pcie-&gt;ict_tbl)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;trans-&gt;shrd-&gt;lock, flags);</div><div class='ctx'> 	iwl_disable_interrupts(trans);</div><div class='ctx'> </div><div class='del'>-	memset(&amp;trans_pcie-&gt;ict_tbl[0], 0, sizeof(u32) * ICT_COUNT);</div><div class='add'>+	memset(trans_pcie-&gt;ict_tbl, 0, ICT_SIZE);</div><div class='ctx'> </div><div class='del'>-	val = trans_pcie-&gt;aligned_ict_tbl_dma &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	val = trans_pcie-&gt;ict_tbl_dma &gt;&gt; ICT_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	val |= CSR_DRAM_INT_TBL_ENABLE;</div><div class='ctx'> 	val |= CSR_DRAM_INIT_TBL_WRAP_CHECK;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_ISR(trans, "CSR_DRAM_INT_TBL_REG =0x%X "</div><div class='del'>-			"aligned dma address %Lx\n",</div><div class='del'>-			val,</div><div class='del'>-			(unsigned long long)trans_pcie-&gt;aligned_ict_tbl_dma);</div><div class='add'>+	IWL_DEBUG_ISR(trans, "CSR_DRAM_INT_TBL_REG =0x%x\n", val);</div><div class='ctx'> </div><div class='ctx'> 	iwl_write32(bus(trans), CSR_DRAM_INT_TBL_REG, val);</div><div class='ctx'> 	trans_pcie-&gt;use_ict = true;</div><div class='hunk'>@@ -1266,6 +1270,8 @@ static irqreturn_t iwl_isr(int irq, void *data)</div><div class='ctx'> 	if (!trans)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='add'>+	trace_iwlwifi_dev_irq(priv(trans));</div><div class='add'>+</div><div class='ctx'> 	trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;trans-&gt;shrd-&gt;lock, flags);</div><div class='hunk'>@@ -1340,6 +1346,7 @@ irqreturn_t iwl_isr_ict(int irq, void *data)</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie;</div><div class='ctx'> 	u32 inta, inta_mask;</div><div class='ctx'> 	u32 val = 0;</div><div class='add'>+	u32 read;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!trans)</div><div class='hunk'>@@ -1353,6 +1360,8 @@ irqreturn_t iwl_isr_ict(int irq, void *data)</div><div class='ctx'> 	if (!trans_pcie-&gt;use_ict)</div><div class='ctx'> 		return iwl_isr(irq, data);</div><div class='ctx'> </div><div class='add'>+	trace_iwlwifi_dev_irq(priv(trans));</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;trans-&gt;shrd-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable (but don't clear!) interrupts here to avoid</div><div class='hunk'>@@ -1367,24 +1376,29 @@ irqreturn_t iwl_isr_ict(int irq, void *data)</div><div class='ctx'> 	/* Ignore interrupt if there's nothing in NIC to service.</div><div class='ctx'> 	 * This may be due to IRQ shared with another device,</div><div class='ctx'> 	 * or due to sporadic interrupts thrown from our NIC. */</div><div class='del'>-	if (!trans_pcie-&gt;ict_tbl[trans_pcie-&gt;ict_index]) {</div><div class='add'>+	read = le32_to_cpu(trans_pcie-&gt;ict_tbl[trans_pcie-&gt;ict_index]);</div><div class='add'>+	trace_iwlwifi_dev_ict_read(priv(trans), trans_pcie-&gt;ict_index, read);</div><div class='add'>+	if (!read) {</div><div class='ctx'> 		IWL_DEBUG_ISR(trans, "Ignore interrupt, inta == 0\n");</div><div class='ctx'> 		goto none;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* read all entries that not 0 start with ict_index */</div><div class='del'>-	while (trans_pcie-&gt;ict_tbl[trans_pcie-&gt;ict_index]) {</div><div class='del'>-</div><div class='del'>-		val |= le32_to_cpu(trans_pcie-&gt;ict_tbl[trans_pcie-&gt;ict_index]);</div><div class='add'>+	/*</div><div class='add'>+	 * Collect all entries up to the first 0, starting from ict_index;</div><div class='add'>+	 * note we already read at ict_index.</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		val |= read;</div><div class='ctx'> 		IWL_DEBUG_ISR(trans, "ICT index %d value 0x%08X\n",</div><div class='del'>-				trans_pcie-&gt;ict_index,</div><div class='del'>-				le32_to_cpu(</div><div class='del'>-				  trans_pcie-&gt;ict_tbl[trans_pcie-&gt;ict_index]));</div><div class='add'>+				trans_pcie-&gt;ict_index, read);</div><div class='ctx'> 		trans_pcie-&gt;ict_tbl[trans_pcie-&gt;ict_index] = 0;</div><div class='ctx'> 		trans_pcie-&gt;ict_index =</div><div class='ctx'> 			iwl_queue_inc_wrap(trans_pcie-&gt;ict_index, ICT_COUNT);</div><div class='ctx'> </div><div class='del'>-	}</div><div class='add'>+		read = le32_to_cpu(trans_pcie-&gt;ict_tbl[trans_pcie-&gt;ict_index]);</div><div class='add'>+		trace_iwlwifi_dev_ict_read(priv(trans), trans_pcie-&gt;ict_index,</div><div class='add'>+					   read);</div><div class='add'>+	} while (read);</div><div class='ctx'> </div><div class='ctx'> 	/* We should not get this value, just ignore it. */</div><div class='ctx'> 	if (val == 0xffffffff)</div><div class='hunk'>@@ -1411,7 +1425,7 @@ irqreturn_t iwl_isr_ict(int irq, void *data)</div><div class='ctx'> 	if (likely(inta))</div><div class='ctx'> 		tasklet_schedule(&amp;trans_pcie-&gt;irq_tasklet);</div><div class='ctx'> 	else if (test_bit(STATUS_INT_ENABLED, &amp;trans-&gt;shrd-&gt;status) &amp;&amp;</div><div class='del'>-			!trans_pcie-&gt;inta) {</div><div class='add'>+		 !trans_pcie-&gt;inta) {</div><div class='ctx'> 		/* Allow interrupt if was disabled by this handler and</div><div class='ctx'> 		 * no tasklet was schedules, We should not enable interrupt,</div><div class='ctx'> 		 * tasklet will enable it.</div><div class='hunk'>@@ -1427,7 +1441,7 @@ irqreturn_t iwl_isr_ict(int irq, void *data)</div><div class='ctx'> 	 * only Re-enable if disabled by irq.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (test_bit(STATUS_INT_ENABLED, &amp;trans-&gt;shrd-&gt;status) &amp;&amp;</div><div class='del'>-		!trans_pcie-&gt;inta)</div><div class='add'>+	    !trans_pcie-&gt;inta)</div><div class='ctx'> 		iwl_enable_interrupts(trans);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;trans-&gt;shrd-&gt;lock, flags);</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c<br/>index 4a0c95302a7e..bd29568177e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c</a></div><div class='hunk'>@@ -408,6 +408,7 @@ static void iwlagn_tx_queue_stop_scheduler(struct iwl_trans *trans, u16 txq_id)</div><div class='ctx'> void iwl_trans_set_wr_ptrs(struct iwl_trans *trans,</div><div class='ctx'> 				int txq_id, u32 index)</div><div class='ctx'> {</div><div class='add'>+	IWL_DEBUG_TX_QUEUES(trans, "Q %d  WrPtr: %d", txq_id, index &amp; 0xff);</div><div class='ctx'> 	iwl_write_direct32(bus(trans), HBUS_TARG_WRPTR,</div><div class='ctx'> 			(index &amp; 0xff) | (txq_id &lt;&lt; 8));</div><div class='ctx'> 	iwl_write_prph(bus(trans), SCD_QUEUE_RDPTR(txq_id), index);</div><div class='hunk'>@@ -430,7 +431,7 @@ void iwl_trans_tx_queue_set_status(struct iwl_trans *trans,</div><div class='ctx'> </div><div class='ctx'> 	txq-&gt;sched_retry = scd_retry;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_INFO(trans, "%s %s Queue %d on FIFO %d\n",</div><div class='add'>+	IWL_DEBUG_TX_QUEUES(trans, "%s %s Queue %d on FIFO %d\n",</div><div class='ctx'> 		       active ? "Activate" : "Deactivate",</div><div class='ctx'> 		       scd_retry ? "BA" : "AC/CMD", txq_id, tx_fifo_id);</div><div class='ctx'> }</div><div class='hunk'>@@ -446,14 +447,21 @@ static inline int get_fifo_from_tid(struct iwl_trans_pcie *trans_pcie,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool is_agg_txqid_valid(struct iwl_trans *trans, int txq_id)</div><div class='add'>+{</div><div class='add'>+	if (txq_id &lt; IWLAGN_FIRST_AMPDU_QUEUE)</div><div class='add'>+		return false;</div><div class='add'>+	return txq_id &lt; (IWLAGN_FIRST_AMPDU_QUEUE +</div><div class='add'>+		hw_params(trans).num_ampdu_queues);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans,</div><div class='ctx'> 				 enum iwl_rxon_context_id ctx, int sta_id,</div><div class='del'>-				 int tid, int frame_limit)</div><div class='add'>+				 int tid, int frame_limit, u16 ssn)</div><div class='ctx'> {</div><div class='del'>-	int tx_fifo, txq_id, ssn_idx;</div><div class='add'>+	int tx_fifo, txq_id;</div><div class='ctx'> 	u16 ra_tid;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	struct iwl_tid_data *tid_data;</div><div class='ctx'> </div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie =</div><div class='ctx'> 		IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='hunk'>@@ -469,11 +477,15 @@ void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;trans-&gt;shrd-&gt;sta_lock, flags);</div><div class='del'>-	tid_data = &amp;trans-&gt;shrd-&gt;tid_data[sta_id][tid];</div><div class='del'>-	ssn_idx = SEQ_TO_SN(tid_data-&gt;seq_number);</div><div class='del'>-	txq_id = tid_data-&gt;agg.txq_id;</div><div class='del'>-	spin_unlock_irqrestore(&amp;trans-&gt;shrd-&gt;sta_lock, flags);</div><div class='add'>+	txq_id = trans_pcie-&gt;agg_txq[sta_id][tid];</div><div class='add'>+	if (WARN_ON_ONCE(is_agg_txqid_valid(trans, txq_id) == false)) {</div><div class='add'>+		IWL_ERR(trans,</div><div class='add'>+			"queue number out of range: %d, must be %d to %d\n",</div><div class='add'>+			txq_id, IWLAGN_FIRST_AMPDU_QUEUE,</div><div class='add'>+			IWLAGN_FIRST_AMPDU_QUEUE +</div><div class='add'>+			hw_params(trans).num_ampdu_queues - 1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ra_tid = BUILD_RAxTID(sta_id, tid);</div><div class='ctx'> </div><div class='hunk'>@@ -493,9 +505,9 @@ void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans,</div><div class='ctx'> </div><div class='ctx'> 	/* Place first TFD at index corresponding to start sequence number.</div><div class='ctx'> 	 * Assumes that ssn_idx is valid (!= 0xFFF) */</div><div class='del'>-	trans_pcie-&gt;txq[txq_id].q.read_ptr = (ssn_idx &amp; 0xff);</div><div class='del'>-	trans_pcie-&gt;txq[txq_id].q.write_ptr = (ssn_idx &amp; 0xff);</div><div class='del'>-	iwl_trans_set_wr_ptrs(trans, txq_id, ssn_idx);</div><div class='add'>+	trans_pcie-&gt;txq[txq_id].q.read_ptr = (ssn &amp; 0xff);</div><div class='add'>+	trans_pcie-&gt;txq[txq_id].q.write_ptr = (ssn &amp; 0xff);</div><div class='add'>+	iwl_trans_set_wr_ptrs(trans, txq_id, ssn);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up Tx window size and frame limit for this queue */</div><div class='ctx'> 	iwl_write_targ_mem(bus(trans), trans_pcie-&gt;scd_base_addr +</div><div class='hunk'>@@ -539,12 +551,9 @@ static int iwlagn_txq_ctx_activate_free(struct iwl_trans *trans)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwl_trans_pcie_tx_agg_alloc(struct iwl_trans *trans,</div><div class='del'>-				enum iwl_rxon_context_id ctx, int sta_id,</div><div class='del'>-				int tid, u16 *ssn)</div><div class='add'>+				int sta_id, int tid)</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_tid_data *tid_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int txq_id;</div><div class='ctx'> </div><div class='ctx'> 	txq_id = iwlagn_txq_ctx_activate_free(trans);</div><div class='hunk'>@@ -553,117 +562,39 @@ int iwl_trans_pcie_tx_agg_alloc(struct iwl_trans *trans,</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;trans-&gt;shrd-&gt;sta_lock, flags);</div><div class='del'>-	tid_data = &amp;trans-&gt;shrd-&gt;tid_data[sta_id][tid];</div><div class='del'>-	*ssn = SEQ_TO_SN(tid_data-&gt;seq_number);</div><div class='del'>-	tid_data-&gt;agg.txq_id = txq_id;</div><div class='add'>+	trans_pcie-&gt;agg_txq[sta_id][tid] = txq_id;</div><div class='ctx'> 	iwl_set_swq_id(&amp;trans_pcie-&gt;txq[txq_id], get_ac_from_tid(tid), txq_id);</div><div class='ctx'> </div><div class='del'>-	tid_data = &amp;trans-&gt;shrd-&gt;tid_data[sta_id][tid];</div><div class='del'>-	if (tid_data-&gt;tfds_in_queue == 0) {</div><div class='del'>-		IWL_DEBUG_HT(trans, "HW queue is empty\n");</div><div class='del'>-		tid_data-&gt;agg.state = IWL_AGG_ON;</div><div class='del'>-		iwl_start_tx_ba_trans_ready(priv(trans), ctx, sta_id, tid);</div><div class='del'>-	} else {</div><div class='del'>-		IWL_DEBUG_HT(trans, "HW queue is NOT empty: %d packets in HW"</div><div class='del'>-			     "queue\n", tid_data-&gt;tfds_in_queue);</div><div class='del'>-		tid_data-&gt;agg.state = IWL_EMPTYING_HW_QUEUE_ADDBA;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;trans-&gt;shrd-&gt;sta_lock, flags);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iwl_trans_pcie_txq_agg_disable(struct iwl_trans *trans, int txq_id)</div><div class='del'>-{</div><div class='del'>-	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	iwlagn_tx_queue_stop_scheduler(trans, txq_id);</div><div class='del'>-</div><div class='del'>-	iwl_clear_bits_prph(bus(trans), SCD_AGGR_SEL, (1 &lt;&lt; txq_id));</div><div class='del'>-</div><div class='del'>-	trans_pcie-&gt;txq[txq_id].q.read_ptr = 0;</div><div class='del'>-	trans_pcie-&gt;txq[txq_id].q.write_ptr = 0;</div><div class='del'>-	/* supposes that ssn_idx is valid (!= 0xFFF) */</div><div class='del'>-	iwl_trans_set_wr_ptrs(trans, txq_id, 0);</div><div class='del'>-</div><div class='del'>-	iwl_clear_bits_prph(bus(trans), SCD_INTERRUPT_MASK, (1 &lt;&lt; txq_id));</div><div class='del'>-	iwl_txq_ctx_deactivate(trans_pcie, txq_id);</div><div class='del'>-	iwl_trans_tx_queue_set_status(trans, &amp;trans_pcie-&gt;txq[txq_id], 0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans,</div><div class='del'>-				  enum iwl_rxon_context_id ctx, int sta_id,</div><div class='del'>-				  int tid)</div><div class='add'>+int iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans, int sta_id, int tid)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int read_ptr, write_ptr;</div><div class='del'>-	struct iwl_tid_data *tid_data;</div><div class='del'>-	int txq_id;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;trans-&gt;shrd-&gt;sta_lock, flags);</div><div class='add'>+	u8 txq_id = trans_pcie-&gt;agg_txq[sta_id][tid];</div><div class='ctx'> </div><div class='del'>-	tid_data = &amp;trans-&gt;shrd-&gt;tid_data[sta_id][tid];</div><div class='del'>-	txq_id = tid_data-&gt;agg.txq_id;</div><div class='del'>-</div><div class='del'>-	if ((IWLAGN_FIRST_AMPDU_QUEUE &gt; txq_id) ||</div><div class='del'>-	    (IWLAGN_FIRST_AMPDU_QUEUE +</div><div class='del'>-		hw_params(trans).num_ampdu_queues &lt;= txq_id)) {</div><div class='add'>+	if (WARN_ON_ONCE(is_agg_txqid_valid(trans, txq_id) == false)) {</div><div class='ctx'> 		IWL_ERR(trans,</div><div class='ctx'> 			"queue number out of range: %d, must be %d to %d\n",</div><div class='ctx'> 			txq_id, IWLAGN_FIRST_AMPDU_QUEUE,</div><div class='ctx'> 			IWLAGN_FIRST_AMPDU_QUEUE +</div><div class='ctx'> 			hw_params(trans).num_ampdu_queues - 1);</div><div class='del'>-		spin_unlock_irqrestore(&amp;trans-&gt;shrd-&gt;sta_lock, flags);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (trans-&gt;shrd-&gt;tid_data[sta_id][tid].agg.state) {</div><div class='del'>-	case IWL_EMPTYING_HW_QUEUE_ADDBA:</div><div class='del'>-		/*</div><div class='del'>-		* This can happen if the peer stops aggregation</div><div class='del'>-		* again before we've had a chance to drain the</div><div class='del'>-		* queue we selected previously, i.e. before the</div><div class='del'>-		* session was really started completely.</div><div class='del'>-		*/</div><div class='del'>-		IWL_DEBUG_HT(trans, "AGG stop before setup done\n");</div><div class='del'>-		goto turn_off;</div><div class='del'>-	case IWL_AGG_ON:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		IWL_WARN(trans, "Stopping AGG while state not ON "</div><div class='del'>-			 "or starting for %d on %d (%d)\n", sta_id, tid,</div><div class='del'>-			 trans-&gt;shrd-&gt;tid_data[sta_id][tid].agg.state);</div><div class='del'>-		spin_unlock_irqrestore(&amp;trans-&gt;shrd-&gt;sta_lock, flags);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	write_ptr = trans_pcie-&gt;txq[txq_id].q.write_ptr;</div><div class='del'>-	read_ptr = trans_pcie-&gt;txq[txq_id].q.read_ptr;</div><div class='del'>-</div><div class='del'>-	/* The queue is not empty */</div><div class='del'>-	if (write_ptr != read_ptr) {</div><div class='del'>-		IWL_DEBUG_HT(trans, "Stopping a non empty AGG HW QUEUE\n");</div><div class='del'>-		trans-&gt;shrd-&gt;tid_data[sta_id][tid].agg.state =</div><div class='del'>-			IWL_EMPTYING_HW_QUEUE_DELBA;</div><div class='del'>-		spin_unlock_irqrestore(&amp;trans-&gt;shrd-&gt;sta_lock, flags);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IWL_DEBUG_HT(trans, "HW queue is empty\n");</div><div class='del'>-turn_off:</div><div class='del'>-	trans-&gt;shrd-&gt;tid_data[sta_id][tid].agg.state = IWL_AGG_OFF;</div><div class='del'>-</div><div class='del'>-	/* do not restore/save irqs */</div><div class='del'>-	spin_unlock(&amp;trans-&gt;shrd-&gt;sta_lock);</div><div class='del'>-	spin_lock(&amp;trans-&gt;shrd-&gt;lock);</div><div class='del'>-</div><div class='del'>-	iwl_trans_pcie_txq_agg_disable(trans, txq_id);</div><div class='add'>+	iwlagn_tx_queue_stop_scheduler(trans, txq_id);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;trans-&gt;shrd-&gt;lock, flags);</div><div class='add'>+	iwl_clear_bits_prph(bus(trans), SCD_AGGR_SEL, (1 &lt;&lt; txq_id));</div><div class='ctx'> </div><div class='del'>-	iwl_stop_tx_ba_trans_ready(priv(trans), ctx, sta_id, tid);</div><div class='add'>+	trans_pcie-&gt;agg_txq[sta_id][tid] = 0;</div><div class='add'>+	trans_pcie-&gt;txq[txq_id].q.read_ptr = 0;</div><div class='add'>+	trans_pcie-&gt;txq[txq_id].q.write_ptr = 0;</div><div class='add'>+	/* supposes that ssn_idx is valid (!= 0xFFF) */</div><div class='add'>+	iwl_trans_set_wr_ptrs(trans, txq_id, 0);</div><div class='ctx'> </div><div class='add'>+	iwl_clear_bits_prph(bus(trans), SCD_INTERRUPT_MASK, (1 &lt;&lt; txq_id));</div><div class='add'>+	iwl_txq_ctx_deactivate(trans_pcie, txq_id);</div><div class='add'>+	iwl_trans_tx_queue_set_status(trans, &amp;trans_pcie-&gt;txq[txq_id], 0, 0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -982,7 +913,8 @@ static int iwl_send_cmd_async(struct iwl_trans *trans, struct iwl_host_cmd *cmd)</div><div class='ctx'> </div><div class='ctx'> 	ret = iwl_enqueue_hcmd(trans, cmd);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		IWL_ERR(trans, "Error sending %s: enqueue_hcmd failed: %d\n",</div><div class='add'>+		IWL_DEBUG_QUIET_RFKILL(trans,</div><div class='add'>+			"Error sending %s: enqueue_hcmd failed: %d\n",</div><div class='ctx'> 			  get_cmd_string(cmd-&gt;id), ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1000,6 +932,20 @@ static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd)</div><div class='ctx'> 	IWL_DEBUG_INFO(trans, "Attempting to send sync command %s\n",</div><div class='ctx'> 			get_cmd_string(cmd-&gt;id));</div><div class='ctx'> </div><div class='add'>+	if (test_bit(STATUS_EXIT_PENDING, &amp;trans-&gt;shrd-&gt;status))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (test_bit(STATUS_RF_KILL_HW, &amp;trans-&gt;shrd-&gt;status)) {</div><div class='add'>+		IWL_ERR(trans, "Command %s aborted: RF KILL Switch\n",</div><div class='add'>+			       get_cmd_string(cmd-&gt;id));</div><div class='add'>+		return -ECANCELED;</div><div class='add'>+	}</div><div class='add'>+	if (test_bit(STATUS_FW_ERROR, &amp;trans-&gt;shrd-&gt;status)) {</div><div class='add'>+		IWL_ERR(trans, "Command %s failed: FW Error\n",</div><div class='add'>+			       get_cmd_string(cmd-&gt;id));</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> 	set_bit(STATUS_HCMD_ACTIVE, &amp;trans-&gt;shrd-&gt;status);</div><div class='ctx'> 	IWL_DEBUG_INFO(trans, "Setting HCMD_ACTIVE for command %s\n",</div><div class='ctx'> 			get_cmd_string(cmd-&gt;id));</div><div class='hunk'>@@ -1008,7 +954,8 @@ static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd)</div><div class='ctx'> 	if (cmd_idx &lt; 0) {</div><div class='ctx'> 		ret = cmd_idx;</div><div class='ctx'> 		clear_bit(STATUS_HCMD_ACTIVE, &amp;trans-&gt;shrd-&gt;status);</div><div class='del'>-		IWL_ERR(trans, "Error sending %s: enqueue_hcmd failed: %d\n",</div><div class='add'>+		IWL_DEBUG_QUIET_RFKILL(trans,</div><div class='add'>+			"Error sending %s: enqueue_hcmd failed: %d\n",</div><div class='ctx'> 			  get_cmd_string(cmd-&gt;id), ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1022,12 +969,12 @@ static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd)</div><div class='ctx'> 				&amp;trans_pcie-&gt;txq[trans-&gt;shrd-&gt;cmd_queue];</div><div class='ctx'> 			struct iwl_queue *q = &amp;txq-&gt;q;</div><div class='ctx'> </div><div class='del'>-			IWL_ERR(trans,</div><div class='add'>+			IWL_DEBUG_QUIET_RFKILL(trans,</div><div class='ctx'> 				"Error sending %s: time out after %dms.\n",</div><div class='ctx'> 				get_cmd_string(cmd-&gt;id),</div><div class='ctx'> 				jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));</div><div class='ctx'> </div><div class='del'>-			IWL_ERR(trans,</div><div class='add'>+			IWL_DEBUG_QUIET_RFKILL(trans,</div><div class='ctx'> 				"Current CMD queue read_ptr %d write_ptr %d\n",</div><div class='ctx'> 				q-&gt;read_ptr, q-&gt;write_ptr);</div><div class='ctx'> </div><div class='hunk'>@@ -1039,18 +986,6 @@ static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (test_bit(STATUS_RF_KILL_HW, &amp;trans-&gt;shrd-&gt;status)) {</div><div class='del'>-		IWL_ERR(trans, "Command %s aborted: RF KILL Switch\n",</div><div class='del'>-			       get_cmd_string(cmd-&gt;id));</div><div class='del'>-		ret = -ECANCELED;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	if (test_bit(STATUS_FW_ERROR, &amp;trans-&gt;shrd-&gt;status)) {</div><div class='del'>-		IWL_ERR(trans, "Command %s failed: FW Error\n",</div><div class='del'>-			       get_cmd_string(cmd-&gt;id));</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='ctx'> 	if ((cmd-&gt;flags &amp; CMD_WANT_SKB) &amp;&amp; !cmd-&gt;reply_page) {</div><div class='ctx'> 		IWL_ERR(trans, "Error: Response NULL in '%s'\n",</div><div class='ctx'> 			  get_cmd_string(cmd-&gt;id));</div><div class='hunk'>@@ -1071,7 +1006,7 @@ cancel:</div><div class='ctx'> 		trans_pcie-&gt;txq[trans-&gt;shrd-&gt;cmd_queue].meta[cmd_idx].flags &amp;=</div><div class='ctx'> 							~CMD_WANT_SKB;</div><div class='ctx'> 	}</div><div class='del'>-fail:</div><div class='add'>+</div><div class='ctx'> 	if (cmd-&gt;reply_page) {</div><div class='ctx'> 		iwl_free_pages(trans-&gt;shrd, cmd-&gt;reply_page);</div><div class='ctx'> 		cmd-&gt;reply_page = 0;</div><div class='hunk'>@@ -1115,9 +1050,6 @@ int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_TX_REPLY(trans, "reclaim: [%d, %d, %d]\n", txq_id,</div><div class='del'>-			   q-&gt;read_ptr, index);</div><div class='del'>-</div><div class='ctx'> 	if (WARN_ON(!skb_queue_empty(skbs)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c<br/>index 5f17ab8e76ba..67d6e324e26f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-trans-pcie.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-trans-pcie.c</a></div><div class='hunk'>@@ -88,18 +88,16 @@ static int iwl_trans_rx_alloc(struct iwl_trans *trans)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate the circular buffer of Read Buffer Descriptors (RBDs) */</div><div class='del'>-	rxq-&gt;bd = dma_alloc_coherent(dev, sizeof(__le32) * RX_QUEUE_SIZE,</div><div class='del'>-				     &amp;rxq-&gt;bd_dma, GFP_KERNEL);</div><div class='add'>+	rxq-&gt;bd = dma_zalloc_coherent(dev, sizeof(__le32) * RX_QUEUE_SIZE,</div><div class='add'>+				      &amp;rxq-&gt;bd_dma, GFP_KERNEL);</div><div class='ctx'> 	if (!rxq-&gt;bd)</div><div class='ctx'> 		goto err_bd;</div><div class='del'>-	memset(rxq-&gt;bd, 0, sizeof(__le32) * RX_QUEUE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/*Allocate the driver's pointer to receive buffer status */</div><div class='del'>-	rxq-&gt;rb_stts = dma_alloc_coherent(dev, sizeof(*rxq-&gt;rb_stts),</div><div class='del'>-					  &amp;rxq-&gt;rb_stts_dma, GFP_KERNEL);</div><div class='add'>+	rxq-&gt;rb_stts = dma_zalloc_coherent(dev, sizeof(*rxq-&gt;rb_stts),</div><div class='add'>+					   &amp;rxq-&gt;rb_stts_dma, GFP_KERNEL);</div><div class='ctx'> 	if (!rxq-&gt;rb_stts)</div><div class='ctx'> 		goto err_rb_stts;</div><div class='del'>-	memset(rxq-&gt;rb_stts, 0, sizeof(*rxq-&gt;rb_stts));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1044,7 +1042,7 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)</div><div class='ctx'> </div><div class='ctx'> static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 		struct iwl_device_cmd *dev_cmd, enum iwl_rxon_context_id ctx,</div><div class='del'>-		u8 sta_id)</div><div class='add'>+		u8 sta_id, u8 tid)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='hunk'>@@ -1058,13 +1056,12 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 	dma_addr_t txcmd_phys;</div><div class='ctx'> 	dma_addr_t scratch_phys;</div><div class='ctx'> 	u16 len, firstlen, secondlen;</div><div class='del'>-	u16 seq_number = 0;</div><div class='ctx'> 	u8 wait_write_ptr = 0;</div><div class='ctx'> 	u8 txq_id;</div><div class='del'>-	u8 tid = 0;</div><div class='ctx'> 	bool is_agg = false;</div><div class='ctx'> 	__le16 fc = hdr-&gt;frame_control;</div><div class='ctx'> 	u8 hdr_len = ieee80211_hdrlen(fc);</div><div class='add'>+	u16 __maybe_unused wifi_seq;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Send this frame after DTIM -- there's a special queue</div><div class='hunk'>@@ -1085,36 +1082,28 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 		txq_id =</div><div class='ctx'> 		    trans_pcie-&gt;ac_to_queue[ctx][skb_get_queue_mapping(skb)];</div><div class='ctx'> </div><div class='del'>-	if (ieee80211_is_data_qos(fc) &amp;&amp; !ieee80211_is_qos_nullfunc(fc)) {</div><div class='del'>-		u8 *qc = NULL;</div><div class='del'>-		struct iwl_tid_data *tid_data;</div><div class='del'>-		qc = ieee80211_get_qos_ctl(hdr);</div><div class='del'>-		tid = qc[0] &amp; IEEE80211_QOS_CTL_TID_MASK;</div><div class='del'>-		tid_data = &amp;trans-&gt;shrd-&gt;tid_data[sta_id][tid];</div><div class='del'>-</div><div class='del'>-		if (WARN_ON_ONCE(tid &gt;= IWL_MAX_TID_COUNT))</div><div class='del'>-			return -1;</div><div class='del'>-</div><div class='del'>-		seq_number = tid_data-&gt;seq_number;</div><div class='del'>-		seq_number &amp;= IEEE80211_SCTL_SEQ;</div><div class='del'>-		hdr-&gt;seq_ctrl = hdr-&gt;seq_ctrl &amp;</div><div class='del'>-				cpu_to_le16(IEEE80211_SCTL_FRAG);</div><div class='del'>-		hdr-&gt;seq_ctrl |= cpu_to_le16(seq_number);</div><div class='del'>-		seq_number += 0x10;</div><div class='del'>-		/* aggregation is on for this &lt;sta,tid&gt; */</div><div class='del'>-		if (info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU) {</div><div class='del'>-			WARN_ON_ONCE(tid_data-&gt;agg.state != IWL_AGG_ON);</div><div class='del'>-			txq_id = tid_data-&gt;agg.txq_id;</div><div class='del'>-			is_agg = true;</div><div class='del'>-		}</div><div class='add'>+	/* aggregation is on for this &lt;sta,tid&gt; */</div><div class='add'>+	if (info-&gt;flags &amp; IEEE80211_TX_CTL_AMPDU) {</div><div class='add'>+		WARN_ON(tid &gt;= IWL_MAX_TID_COUNT);</div><div class='add'>+		txq_id = trans_pcie-&gt;agg_txq[sta_id][tid];</div><div class='add'>+		is_agg = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Copy MAC header from skb into command buffer */</div><div class='del'>-	memcpy(tx_cmd-&gt;hdr, hdr, hdr_len);</div><div class='del'>-</div><div class='ctx'> 	txq = &amp;trans_pcie-&gt;txq[txq_id];</div><div class='ctx'> 	q = &amp;txq-&gt;q;</div><div class='ctx'> </div><div class='add'>+	/* In AGG mode, the index in the ring must correspond to the WiFi</div><div class='add'>+	 * sequence number. This is a HW requirements to help the SCD to parse</div><div class='add'>+	 * the BA.</div><div class='add'>+	 * Check here that the packets are in the right place on the ring.</div><div class='add'>+	 */</div><div class='add'>+#ifdef CONFIG_IWLWIFI_DEBUG</div><div class='add'>+	wifi_seq = SEQ_TO_SN(le16_to_cpu(hdr-&gt;seq_ctrl));</div><div class='add'>+	WARN_ONCE(is_agg &amp;&amp; ((wifi_seq &amp; 0xff) != q-&gt;write_ptr),</div><div class='add'>+		  "Q: %d WiFi Seq %d tfdNum %d",</div><div class='add'>+		  txq_id, wifi_seq, q-&gt;write_ptr);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/* Set up driver data for this TFD */</div><div class='ctx'> 	txq-&gt;skbs[q-&gt;write_ptr] = skb;</div><div class='ctx'> 	txq-&gt;cmd[q-&gt;write_ptr] = dev_cmd;</div><div class='hunk'>@@ -1212,13 +1201,6 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 	q-&gt;write_ptr = iwl_queue_inc_wrap(q-&gt;write_ptr, q-&gt;n_bd);</div><div class='ctx'> 	iwl_txq_update_write_ptr(trans, txq);</div><div class='ctx'> </div><div class='del'>-	if (ieee80211_is_data_qos(fc) &amp;&amp; !ieee80211_is_qos_nullfunc(fc)) {</div><div class='del'>-		trans-&gt;shrd-&gt;tid_data[sta_id][tid].tfds_in_queue++;</div><div class='del'>-		if (!ieee80211_has_morefrags(fc))</div><div class='del'>-			trans-&gt;shrd-&gt;tid_data[sta_id][tid].seq_number =</div><div class='del'>-				seq_number;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * At this point the frame is "transmitted" successfully</div><div class='ctx'> 	 * and we will get a TX status notification eventually,</div><div class='hunk'>@@ -1230,7 +1212,7 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 			txq-&gt;need_update = 1;</div><div class='ctx'> 			iwl_txq_update_write_ptr(trans, txq);</div><div class='ctx'> 		} else {</div><div class='del'>-			iwl_stop_queue(trans, txq);</div><div class='add'>+			iwl_stop_queue(trans, txq, "Queue is full");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1267,101 +1249,48 @@ static int iwl_trans_pcie_request_irq(struct iwl_trans *trans)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwlagn_txq_check_empty(struct iwl_trans *trans,</div><div class='del'>-			   int sta_id, u8 tid, int txq_id)</div><div class='del'>-{</div><div class='del'>-	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='del'>-	struct iwl_queue *q = &amp;trans_pcie-&gt;txq[txq_id].q;</div><div class='del'>-	struct iwl_tid_data *tid_data = &amp;trans-&gt;shrd-&gt;tid_data[sta_id][tid];</div><div class='del'>-</div><div class='del'>-	lockdep_assert_held(&amp;trans-&gt;shrd-&gt;sta_lock);</div><div class='del'>-</div><div class='del'>-	switch (trans-&gt;shrd-&gt;tid_data[sta_id][tid].agg.state) {</div><div class='del'>-	case IWL_EMPTYING_HW_QUEUE_DELBA:</div><div class='del'>-		/* We are reclaiming the last packet of the */</div><div class='del'>-		/* aggregated HW queue */</div><div class='del'>-		if ((txq_id  == tid_data-&gt;agg.txq_id) &amp;&amp;</div><div class='del'>-		    (q-&gt;read_ptr == q-&gt;write_ptr)) {</div><div class='del'>-			IWL_DEBUG_HT(trans,</div><div class='del'>-				"HW queue empty: continue DELBA flow\n");</div><div class='del'>-			iwl_trans_pcie_txq_agg_disable(trans, txq_id);</div><div class='del'>-			tid_data-&gt;agg.state = IWL_AGG_OFF;</div><div class='del'>-			iwl_stop_tx_ba_trans_ready(priv(trans),</div><div class='del'>-						   NUM_IWL_RXON_CTX,</div><div class='del'>-						   sta_id, tid);</div><div class='del'>-			iwl_wake_queue(trans, &amp;trans_pcie-&gt;txq[txq_id]);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case IWL_EMPTYING_HW_QUEUE_ADDBA:</div><div class='del'>-		/* We are reclaiming the last packet of the queue */</div><div class='del'>-		if (tid_data-&gt;tfds_in_queue == 0) {</div><div class='del'>-			IWL_DEBUG_HT(trans,</div><div class='del'>-				"HW queue empty: continue ADDBA flow\n");</div><div class='del'>-			tid_data-&gt;agg.state = IWL_AGG_ON;</div><div class='del'>-			iwl_start_tx_ba_trans_ready(priv(trans),</div><div class='del'>-						    NUM_IWL_RXON_CTX,</div><div class='del'>-						    sta_id, tid);</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 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_free_tfds_in_queue(struct iwl_trans *trans,</div><div class='del'>-			    int sta_id, int tid, int freed)</div><div class='del'>-{</div><div class='del'>-	lockdep_assert_held(&amp;trans-&gt;shrd-&gt;sta_lock);</div><div class='del'>-</div><div class='del'>-	if (trans-&gt;shrd-&gt;tid_data[sta_id][tid].tfds_in_queue &gt;= freed)</div><div class='del'>-		trans-&gt;shrd-&gt;tid_data[sta_id][tid].tfds_in_queue -= freed;</div><div class='del'>-	else {</div><div class='del'>-		IWL_DEBUG_TX(trans, "free more than tfds_in_queue (%u:%d)\n",</div><div class='del'>-			trans-&gt;shrd-&gt;tid_data[sta_id][tid].tfds_in_queue,</div><div class='del'>-			freed);</div><div class='del'>-		trans-&gt;shrd-&gt;tid_data[sta_id][tid].tfds_in_queue = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int sta_id, int tid,</div><div class='add'>+static int iwl_trans_pcie_reclaim(struct iwl_trans *trans, int sta_id, int tid,</div><div class='ctx'> 		      int txq_id, int ssn, u32 status,</div><div class='ctx'> 		      struct sk_buff_head *skbs)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> 	struct iwl_tx_queue *txq = &amp;trans_pcie-&gt;txq[txq_id];</div><div class='del'>-	enum iwl_agg_state agg_state;</div><div class='ctx'> 	/* n_bd is usually 256 =&gt; n_bd - 1 = 0xff */</div><div class='ctx'> 	int tfd_num = ssn &amp; (txq-&gt;q.n_bd - 1);</div><div class='ctx'> 	int freed = 0;</div><div class='del'>-	bool cond;</div><div class='ctx'> </div><div class='ctx'> 	txq-&gt;time_stamp = jiffies;</div><div class='ctx'> </div><div class='del'>-	if (txq-&gt;sched_retry) {</div><div class='del'>-		agg_state =</div><div class='del'>-			trans-&gt;shrd-&gt;tid_data[txq-&gt;sta_id][txq-&gt;tid].agg.state;</div><div class='del'>-		cond = (agg_state != IWL_EMPTYING_HW_QUEUE_DELBA);</div><div class='del'>-	} else {</div><div class='del'>-		cond = (status != TX_STATUS_FAIL_PASSIVE_NO_RX);</div><div class='add'>+	if (unlikely(txq_id &gt;= IWLAGN_FIRST_AMPDU_QUEUE &amp;&amp;</div><div class='add'>+		     txq_id != trans_pcie-&gt;agg_txq[sta_id][tid])) {</div><div class='add'>+		/*</div><div class='add'>+		 * FIXME: this is a uCode bug which need to be addressed,</div><div class='add'>+		 * log the information and return for now.</div><div class='add'>+		 * Since it is can possibly happen very often and in order</div><div class='add'>+		 * not to fill the syslog, don't use IWL_ERR or IWL_WARN</div><div class='add'>+		 */</div><div class='add'>+		IWL_DEBUG_TX_QUEUES(trans, "Bad queue mapping txq_id %d, "</div><div class='add'>+			"agg_txq[sta_id[tid] %d", txq_id,</div><div class='add'>+			trans_pcie-&gt;agg_txq[sta_id][tid]);</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (txq-&gt;q.read_ptr != tfd_num) {</div><div class='del'>-		IWL_DEBUG_TX_REPLY(trans, "Retry scheduler reclaim "</div><div class='del'>-				"scd_ssn=%d idx=%d txq=%d swq=%d\n",</div><div class='del'>-				ssn , tfd_num, txq_id, txq-&gt;swq_id);</div><div class='add'>+		IWL_DEBUG_TX_REPLY(trans, "[Q %d | AC %d] %d -&gt; %d (%d)\n",</div><div class='add'>+				txq_id, iwl_get_queue_ac(txq), txq-&gt;q.read_ptr,</div><div class='add'>+				tfd_num, ssn);</div><div class='ctx'> 		freed = iwl_tx_queue_reclaim(trans, txq_id, tfd_num, skbs);</div><div class='del'>-		if (iwl_queue_space(&amp;txq-&gt;q) &gt; txq-&gt;q.low_mark &amp;&amp; cond)</div><div class='del'>-			iwl_wake_queue(trans, txq);</div><div class='add'>+		if (iwl_queue_space(&amp;txq-&gt;q) &gt; txq-&gt;q.low_mark &amp;&amp;</div><div class='add'>+		   (!txq-&gt;sched_retry ||</div><div class='add'>+		   status != TX_STATUS_FAIL_PASSIVE_NO_RX))</div><div class='add'>+			iwl_wake_queue(trans, txq, "Packets reclaimed");</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	iwl_free_tfds_in_queue(trans, sta_id, tid, freed);</div><div class='del'>-	iwlagn_txq_check_empty(trans, sta_id, tid, txq_id);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iwl_trans_pcie_free(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='add'>+	iwl_calib_free_results(trans);</div><div class='ctx'> 	iwl_trans_pcie_tx_free(trans);</div><div class='ctx'> 	iwl_trans_pcie_rx_free(trans);</div><div class='ctx'> 	free_irq(bus(trans)-&gt;irq, trans);</div><div class='hunk'>@@ -1417,7 +1346,8 @@ static int iwl_trans_pcie_resume(struct iwl_trans *trans)</div><div class='ctx'> #endif /* CONFIG_PM_SLEEP */</div><div class='ctx'> </div><div class='ctx'> static void iwl_trans_pcie_wake_any_queue(struct iwl_trans *trans,</div><div class='del'>-					  enum iwl_rxon_context_id ctx)</div><div class='add'>+					  enum iwl_rxon_context_id ctx,</div><div class='add'>+					  const char *msg)</div><div class='ctx'> {</div><div class='ctx'> 	u8 ac, txq_id;</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie =</div><div class='hunk'>@@ -1425,11 +1355,11 @@ static void iwl_trans_pcie_wake_any_queue(struct iwl_trans *trans,</div><div class='ctx'> </div><div class='ctx'> 	for (ac = 0; ac &lt; AC_NUM; ac++) {</div><div class='ctx'> 		txq_id = trans_pcie-&gt;ac_to_queue[ctx][ac];</div><div class='del'>-		IWL_DEBUG_INFO(trans, "Queue Status: Q[%d] %s\n",</div><div class='add'>+		IWL_DEBUG_TX_QUEUES(trans, "Queue Status: Q[%d] %s\n",</div><div class='ctx'> 			ac,</div><div class='ctx'> 			(atomic_read(&amp;trans_pcie-&gt;queue_stop_count[ac]) &gt; 0)</div><div class='ctx'> 			      ? "stopped" : "awake");</div><div class='del'>-		iwl_wake_queue(trans, &amp;trans_pcie-&gt;txq[txq_id]);</div><div class='add'>+		iwl_wake_queue(trans, &amp;trans_pcie-&gt;txq[txq_id], msg);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1452,11 +1382,12 @@ static struct iwl_trans *iwl_trans_pcie_alloc(struct iwl_shared *shrd)</div><div class='ctx'> 	return iwl_trans;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_trans_pcie_stop_queue(struct iwl_trans *trans, int txq_id)</div><div class='add'>+static void iwl_trans_pcie_stop_queue(struct iwl_trans *trans, int txq_id,</div><div class='add'>+				      const char *msg)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);</div><div class='ctx'> </div><div class='del'>-	iwl_stop_queue(trans, &amp;trans_pcie-&gt;txq[txq_id]);</div><div class='add'>+	iwl_stop_queue(trans, &amp;trans_pcie-&gt;txq[txq_id], msg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define IWL_FLUSH_WAIT_MS	2000</div><div class='hunk'>@@ -1511,8 +1442,12 @@ static int iwl_trans_pcie_check_stuck_queue(struct iwl_trans *trans, int cnt)</div><div class='ctx'> 	if (time_after(jiffies, timeout)) {</div><div class='ctx'> 		IWL_ERR(trans, "Queue %d stuck for %u ms.\n", q-&gt;id,</div><div class='ctx'> 			hw_params(trans).wd_timeout);</div><div class='del'>-		IWL_ERR(trans, "Current read_ptr %d write_ptr %d\n",</div><div class='add'>+		IWL_ERR(trans, "Current SW read_ptr %d write_ptr %d\n",</div><div class='ctx'> 			q-&gt;read_ptr, q-&gt;write_ptr);</div><div class='add'>+		IWL_ERR(trans, "Current HW read_ptr %d write_ptr %d\n",</div><div class='add'>+			iwl_read_prph(bus(trans), SCD_QUEUE_RDPTR(cnt))</div><div class='add'>+				&amp; (TFD_QUEUE_SIZE_MAX - 1),</div><div class='add'>+			iwl_read_prph(bus(trans), SCD_QUEUE_WRPTR(cnt)));</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h<br/>index c5923125c3f9..e6bf3f554772 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-trans.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-trans.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-trans.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-trans.h</a></div><div class='hunk'>@@ -171,32 +171,31 @@ struct iwl_trans_ops {</div><div class='ctx'> 	void (*tx_start)(struct iwl_trans *trans);</div><div class='ctx'> </div><div class='ctx'> 	void (*wake_any_queue)(struct iwl_trans *trans,</div><div class='del'>-			       enum iwl_rxon_context_id ctx);</div><div class='add'>+			       enum iwl_rxon_context_id ctx,</div><div class='add'>+			       const char *msg);</div><div class='ctx'> </div><div class='ctx'> 	int (*send_cmd)(struct iwl_trans *trans, struct iwl_host_cmd *cmd);</div><div class='ctx'> </div><div class='ctx'> 	int (*tx)(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 		struct iwl_device_cmd *dev_cmd, enum iwl_rxon_context_id ctx,</div><div class='del'>-		u8 sta_id);</div><div class='del'>-	void (*reclaim)(struct iwl_trans *trans, int sta_id, int tid,</div><div class='add'>+		u8 sta_id, u8 tid);</div><div class='add'>+	int (*reclaim)(struct iwl_trans *trans, int sta_id, int tid,</div><div class='ctx'> 			int txq_id, int ssn, u32 status,</div><div class='ctx'> 			struct sk_buff_head *skbs);</div><div class='ctx'> </div><div class='ctx'> 	int (*tx_agg_disable)(struct iwl_trans *trans,</div><div class='del'>-			      enum iwl_rxon_context_id ctx, int sta_id,</div><div class='del'>-			      int tid);</div><div class='add'>+			      int sta_id, int tid);</div><div class='ctx'> 	int (*tx_agg_alloc)(struct iwl_trans *trans,</div><div class='del'>-			    enum iwl_rxon_context_id ctx, int sta_id, int tid,</div><div class='del'>-			    u16 *ssn);</div><div class='add'>+			    int sta_id, int tid);</div><div class='ctx'> 	void (*tx_agg_setup)(struct iwl_trans *trans,</div><div class='ctx'> 			     enum iwl_rxon_context_id ctx, int sta_id, int tid,</div><div class='del'>-			     int frame_limit);</div><div class='add'>+			     int frame_limit, u16 ssn);</div><div class='ctx'> </div><div class='ctx'> 	void (*kick_nic)(struct iwl_trans *trans);</div><div class='ctx'> </div><div class='ctx'> 	void (*free)(struct iwl_trans *trans);</div><div class='ctx'> </div><div class='del'>-	void (*stop_queue)(struct iwl_trans *trans, int q);</div><div class='add'>+	void (*stop_queue)(struct iwl_trans *trans, int q, const char *msg);</div><div class='ctx'> </div><div class='ctx'> 	int (*dbgfs_register)(struct iwl_trans *trans, struct dentry* dir);</div><div class='ctx'> 	int (*check_stuck_queue)(struct iwl_trans *trans, int q);</div><div class='hunk'>@@ -207,17 +206,54 @@ struct iwl_trans_ops {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* one for each uCode image (inst/data, boot/init/runtime) */</div><div class='add'>+struct fw_desc {</div><div class='add'>+	dma_addr_t p_addr;	/* hardware address */</div><div class='add'>+	void *v_addr;		/* software address */</div><div class='add'>+	u32 len;		/* size in bytes */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fw_img {</div><div class='add'>+	struct fw_desc code;	/* firmware code image */</div><div class='add'>+	struct fw_desc data;	/* firmware data image */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Opaque calibration results */</div><div class='add'>+struct iwl_calib_result {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	size_t cmd_len;</div><div class='add'>+	struct iwl_calib_hdr hdr;</div><div class='add'>+	/* data follows */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct iwl_trans - transport common data</div><div class='ctx'>  * @ops - pointer to iwl_trans_ops</div><div class='ctx'>  * @shrd - pointer to iwl_shared which holds shared data from the upper layer</div><div class='ctx'>  * @hcmd_lock: protects HCMD</div><div class='add'>+ * @ucode_write_complete: indicates that the ucode has been copied.</div><div class='add'>+ * @ucode_rt: run time ucode image</div><div class='add'>+ * @ucode_init: init ucode image</div><div class='add'>+ * @ucode_wowlan: wake on wireless ucode image (optional)</div><div class='add'>+ * @nvm_device_type: indicates OTP or eeprom</div><div class='add'>+ * @calib_results: list head for init calibration results</div><div class='ctx'>  */</div><div class='ctx'> struct iwl_trans {</div><div class='ctx'> 	const struct iwl_trans_ops *ops;</div><div class='ctx'> 	struct iwl_shared *shrd;</div><div class='ctx'> 	spinlock_t hcmd_lock;</div><div class='ctx'> </div><div class='add'>+	u8 ucode_write_complete;	/* the image write is complete */</div><div class='add'>+	struct fw_img ucode_rt;</div><div class='add'>+	struct fw_img ucode_init;</div><div class='add'>+	struct fw_img ucode_wowlan;</div><div class='add'>+</div><div class='add'>+	/* eeprom related variables */</div><div class='add'>+	int    nvm_device_type;</div><div class='add'>+</div><div class='add'>+	/* init calibration results */</div><div class='add'>+	struct list_head calib_results;</div><div class='add'>+</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='ctx'> 	char trans_specific[0] __attribute__((__aligned__(sizeof(void *))));</div><div class='hunk'>@@ -249,9 +285,10 @@ static inline void iwl_trans_tx_start(struct iwl_trans *trans)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_trans_wake_any_queue(struct iwl_trans *trans,</div><div class='del'>-					    enum iwl_rxon_context_id ctx)</div><div class='add'>+					    enum iwl_rxon_context_id ctx,</div><div class='add'>+					    const char *msg)</div><div class='ctx'> {</div><div class='del'>-	trans-&gt;ops-&gt;wake_any_queue(trans, ctx);</div><div class='add'>+	trans-&gt;ops-&gt;wake_any_queue(trans, ctx, msg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -266,39 +303,38 @@ int iwl_trans_send_cmd_pdu(struct iwl_trans *trans, u8 id,</div><div class='ctx'> </div><div class='ctx'> static inline int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb,</div><div class='ctx'> 		struct iwl_device_cmd *dev_cmd, enum iwl_rxon_context_id ctx,</div><div class='del'>-		u8 sta_id)</div><div class='add'>+		u8 sta_id, u8 tid)</div><div class='ctx'> {</div><div class='del'>-	return trans-&gt;ops-&gt;tx(trans, skb, dev_cmd, ctx, sta_id);</div><div class='add'>+	return trans-&gt;ops-&gt;tx(trans, skb, dev_cmd, ctx, sta_id, tid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void iwl_trans_reclaim(struct iwl_trans *trans, int sta_id,</div><div class='add'>+static inline int iwl_trans_reclaim(struct iwl_trans *trans, int sta_id,</div><div class='ctx'> 				 int tid, int txq_id, int ssn, u32 status,</div><div class='ctx'> 				 struct sk_buff_head *skbs)</div><div class='ctx'> {</div><div class='del'>-	trans-&gt;ops-&gt;reclaim(trans, sta_id, tid, txq_id, ssn, status, skbs);</div><div class='add'>+	return trans-&gt;ops-&gt;reclaim(trans, sta_id, tid, txq_id, ssn,</div><div class='add'>+				   status, skbs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int iwl_trans_tx_agg_disable(struct iwl_trans *trans,</div><div class='del'>-					    enum iwl_rxon_context_id ctx,</div><div class='ctx'> 					    int sta_id, int tid)</div><div class='ctx'> {</div><div class='del'>-	return trans-&gt;ops-&gt;tx_agg_disable(trans, ctx, sta_id, tid);</div><div class='add'>+	return trans-&gt;ops-&gt;tx_agg_disable(trans, sta_id, tid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int iwl_trans_tx_agg_alloc(struct iwl_trans *trans,</div><div class='del'>-					 enum iwl_rxon_context_id ctx,</div><div class='del'>-					 int sta_id, int tid, u16 *ssn)</div><div class='add'>+					 int sta_id, int tid)</div><div class='ctx'> {</div><div class='del'>-	return trans-&gt;ops-&gt;tx_agg_alloc(trans, ctx, sta_id, tid, ssn);</div><div class='add'>+	return trans-&gt;ops-&gt;tx_agg_alloc(trans, sta_id, tid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static inline void iwl_trans_tx_agg_setup(struct iwl_trans *trans,</div><div class='ctx'> 					   enum iwl_rxon_context_id ctx,</div><div class='ctx'> 					   int sta_id, int tid,</div><div class='del'>-					   int frame_limit)</div><div class='add'>+					   int frame_limit, u16 ssn)</div><div class='ctx'> {</div><div class='del'>-	trans-&gt;ops-&gt;tx_agg_setup(trans, ctx, sta_id, tid, frame_limit);</div><div class='add'>+	trans-&gt;ops-&gt;tx_agg_setup(trans, ctx, sta_id, tid, frame_limit, ssn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void iwl_trans_kick_nic(struct iwl_trans *trans)</div><div class='hunk'>@@ -311,9 +347,10 @@ static inline void iwl_trans_free(struct iwl_trans *trans)</div><div class='ctx'> 	trans-&gt;ops-&gt;free(trans);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void iwl_trans_stop_queue(struct iwl_trans *trans, int q)</div><div class='add'>+static inline void iwl_trans_stop_queue(struct iwl_trans *trans, int q,</div><div class='add'>+					const char *msg)</div><div class='ctx'> {</div><div class='del'>-	trans-&gt;ops-&gt;stop_queue(trans, q);</div><div class='add'>+	trans-&gt;ops-&gt;stop_queue(trans, q, msg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int iwl_trans_wait_tx_queue_empty(struct iwl_trans *trans)</div><div class='hunk'>@@ -348,4 +385,13 @@ static inline int iwl_trans_resume(struct iwl_trans *trans)</div><div class='ctx'> ******************************************************/</div><div class='ctx'> extern const struct iwl_trans_ops trans_ops_pcie;</div><div class='ctx'> </div><div class='add'>+int iwl_alloc_fw_desc(struct iwl_bus *bus, struct fw_desc *desc,</div><div class='add'>+		      const void *data, size_t len);</div><div class='add'>+void iwl_dealloc_ucode(struct iwl_trans *trans);</div><div class='add'>+</div><div class='add'>+int iwl_send_calib_results(struct iwl_trans *trans);</div><div class='add'>+int iwl_calib_set(struct iwl_trans *trans,</div><div class='add'>+		  const struct iwl_calib_hdr *cmd, int len);</div><div class='add'>+void iwl_calib_free_results(struct iwl_trans *trans);</div><div class='add'>+</div><div class='ctx'> #endif /* __iwl_trans_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c b/drivers/net/wireless/iwlwifi/iwl-ucode.c<br/>index 8ba0dd54e37d..36a1b5b25858 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlwifi/iwl-agn-ucode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-ucode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-ucode.c</a></div><div class='hunk'>@@ -31,7 +31,9 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "iwl-wifi.h"</div><div class='ctx'> #include "iwl-dev.h"</div><div class='ctx'> #include "iwl-core.h"</div><div class='ctx'> #include "iwl-io.h"</div><div class='hunk'>@@ -72,51 +74,98 @@ static struct iwl_wimax_coex_event_entry cu_priorities[COEX_NUM_OF_EVENTS] = {</div><div class='ctx'> 	{COEX_CU_RSRVD2_RP, COEX_CU_RSRVD2_WP, 0, COEX_RSRVD2_FLAGS}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * uCode download functions</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+static void iwl_free_fw_desc(struct iwl_bus *bus, struct fw_desc *desc)</div><div class='add'>+{</div><div class='add'>+	if (desc-&gt;v_addr)</div><div class='add'>+		dma_free_coherent(bus-&gt;dev, desc-&gt;len,</div><div class='add'>+				  desc-&gt;v_addr, desc-&gt;p_addr);</div><div class='add'>+	desc-&gt;v_addr = NULL;</div><div class='add'>+	desc-&gt;len = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iwl_free_fw_img(struct iwl_bus *bus, struct fw_img *img)</div><div class='add'>+{</div><div class='add'>+	iwl_free_fw_desc(bus, &amp;img-&gt;code);</div><div class='add'>+	iwl_free_fw_desc(bus, &amp;img-&gt;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_dealloc_ucode(struct iwl_trans *trans)</div><div class='add'>+{</div><div class='add'>+	iwl_free_fw_img(bus(trans), &amp;trans-&gt;ucode_rt);</div><div class='add'>+	iwl_free_fw_img(bus(trans), &amp;trans-&gt;ucode_init);</div><div class='add'>+	iwl_free_fw_img(bus(trans), &amp;trans-&gt;ucode_wowlan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_alloc_fw_desc(struct iwl_bus *bus, struct fw_desc *desc,</div><div class='add'>+		      const void *data, size_t len)</div><div class='add'>+{</div><div class='add'>+	if (!len) {</div><div class='add'>+		desc-&gt;v_addr = NULL;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc-&gt;v_addr = dma_alloc_coherent(bus-&gt;dev, len,</div><div class='add'>+					  &amp;desc-&gt;p_addr, GFP_KERNEL);</div><div class='add'>+	if (!desc-&gt;v_addr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	desc-&gt;len = len;</div><div class='add'>+	memcpy(desc-&gt;v_addr, data, len);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * ucode</div><div class='ctx'>  */</div><div class='del'>-static int iwlagn_load_section(struct iwl_priv *priv, const char *name,</div><div class='add'>+static int iwl_load_section(struct iwl_trans *trans, const char *name,</div><div class='ctx'> 				struct fw_desc *image, u32 dst_addr)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_bus *bus = bus(trans);</div><div class='ctx'> 	dma_addr_t phy_addr = image-&gt;p_addr;</div><div class='ctx'> 	u32 byte_cnt = image-&gt;len;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;ucode_write_complete = 0;</div><div class='add'>+	trans-&gt;ucode_write_complete = 0;</div><div class='ctx'> </div><div class='del'>-	iwl_write_direct32(bus(priv),</div><div class='add'>+	iwl_write_direct32(bus,</div><div class='ctx'> 		FH_TCSR_CHNL_TX_CONFIG_REG(FH_SRVC_CHNL),</div><div class='ctx'> 		FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE);</div><div class='ctx'> </div><div class='del'>-	iwl_write_direct32(bus(priv),</div><div class='add'>+	iwl_write_direct32(bus,</div><div class='ctx'> 		FH_SRVC_CHNL_SRAM_ADDR_REG(FH_SRVC_CHNL), dst_addr);</div><div class='ctx'> </div><div class='del'>-	iwl_write_direct32(bus(priv),</div><div class='add'>+	iwl_write_direct32(bus,</div><div class='ctx'> 		FH_TFDIB_CTRL0_REG(FH_SRVC_CHNL),</div><div class='ctx'> 		phy_addr &amp; FH_MEM_TFDIB_DRAM_ADDR_LSB_MSK);</div><div class='ctx'> </div><div class='del'>-	iwl_write_direct32(bus(priv),</div><div class='add'>+	iwl_write_direct32(bus,</div><div class='ctx'> 		FH_TFDIB_CTRL1_REG(FH_SRVC_CHNL),</div><div class='ctx'> 		(iwl_get_dma_hi_addr(phy_addr)</div><div class='ctx'> 			&lt;&lt; FH_MEM_TFDIB_REG1_ADDR_BITSHIFT) | byte_cnt);</div><div class='ctx'> </div><div class='del'>-	iwl_write_direct32(bus(priv),</div><div class='add'>+	iwl_write_direct32(bus,</div><div class='ctx'> 		FH_TCSR_CHNL_TX_BUF_STS_REG(FH_SRVC_CHNL),</div><div class='ctx'> 		1 &lt;&lt; FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_NUM |</div><div class='ctx'> 		1 &lt;&lt; FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_IDX |</div><div class='ctx'> 		FH_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_VALID);</div><div class='ctx'> </div><div class='del'>-	iwl_write_direct32(bus(priv),</div><div class='add'>+	iwl_write_direct32(bus,</div><div class='ctx'> 		FH_TCSR_CHNL_TX_CONFIG_REG(FH_SRVC_CHNL),</div><div class='ctx'> 		FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE	|</div><div class='ctx'> 		FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE	|</div><div class='ctx'> 		FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD);</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_FW(priv, "%s uCode section being loaded...\n", name);</div><div class='del'>-	ret = wait_event_timeout(priv-&gt;shrd-&gt;wait_command_queue,</div><div class='del'>-				 priv-&gt;ucode_write_complete, 5 * HZ);</div><div class='add'>+	IWL_DEBUG_FW(bus, "%s uCode section being loaded...\n", name);</div><div class='add'>+	ret = wait_event_timeout(trans-&gt;shrd-&gt;wait_command_queue,</div><div class='add'>+				 trans-&gt;ucode_write_complete, 5 * HZ);</div><div class='ctx'> 	if (!ret) {</div><div class='del'>-		IWL_ERR(priv, "Could not load the %s uCode section\n",</div><div class='add'>+		IWL_ERR(trans, "Could not load the %s uCode section\n",</div><div class='ctx'> 			name);</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -124,41 +173,65 @@ static int iwlagn_load_section(struct iwl_priv *priv, const char *name,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwlagn_load_given_ucode(struct iwl_priv *priv,</div><div class='del'>-				   struct fw_img *image)</div><div class='add'>+static inline struct fw_img *iwl_get_ucode_image(struct iwl_trans *trans,</div><div class='add'>+					enum iwl_ucode_type ucode_type)</div><div class='add'>+{</div><div class='add'>+	switch (ucode_type) {</div><div class='add'>+	case IWL_UCODE_INIT:</div><div class='add'>+		return &amp;trans-&gt;ucode_init;</div><div class='add'>+	case IWL_UCODE_WOWLAN:</div><div class='add'>+		return &amp;trans-&gt;ucode_wowlan;</div><div class='add'>+	case IWL_UCODE_REGULAR:</div><div class='add'>+		return &amp;trans-&gt;ucode_rt;</div><div class='add'>+	case IWL_UCODE_NONE:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iwl_load_given_ucode(struct iwl_trans *trans,</div><div class='add'>+				   enum iwl_ucode_type ucode_type)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	struct fw_img *image = iwl_get_ucode_image(trans, ucode_type);</div><div class='ctx'> </div><div class='del'>-	ret = iwlagn_load_section(priv, "INST", &amp;image-&gt;code,</div><div class='add'>+</div><div class='add'>+	if (!image) {</div><div class='add'>+		IWL_ERR(trans, "Invalid ucode requested (%d)\n",</div><div class='add'>+			ucode_type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = iwl_load_section(trans, "INST", &amp;image-&gt;code,</div><div class='ctx'> 				   IWLAGN_RTC_INST_LOWER_BOUND);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	return iwlagn_load_section(priv, "DATA", &amp;image-&gt;data,</div><div class='add'>+	return iwl_load_section(trans, "DATA", &amp;image-&gt;data,</div><div class='ctx'> 				    IWLAGN_RTC_DATA_LOWER_BOUND);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Calibration</div><div class='ctx'>  */</div><div class='del'>-static int iwlagn_set_Xtal_calib(struct iwl_priv *priv)</div><div class='add'>+static int iwl_set_Xtal_calib(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_calib_xtal_freq_cmd cmd;</div><div class='ctx'> 	__le16 *xtal_calib =</div><div class='del'>-		(__le16 *)iwl_eeprom_query_addr(priv, EEPROM_XTAL);</div><div class='add'>+		(__le16 *)iwl_eeprom_query_addr(trans-&gt;shrd, EEPROM_XTAL);</div><div class='ctx'> </div><div class='ctx'> 	iwl_set_calib_hdr(&amp;cmd.hdr, IWL_PHY_CALIBRATE_CRYSTAL_FRQ_CMD);</div><div class='ctx'> 	cmd.cap_pin1 = le16_to_cpu(xtal_calib[0]);</div><div class='ctx'> 	cmd.cap_pin2 = le16_to_cpu(xtal_calib[1]);</div><div class='del'>-	return iwl_calib_set(&amp;priv-&gt;calib_results[IWL_CALIB_XTAL],</div><div class='del'>-			     (u8 *)&amp;cmd, sizeof(cmd));</div><div class='add'>+	return iwl_calib_set(trans, (void *)&amp;cmd, sizeof(cmd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwlagn_set_temperature_offset_calib(struct iwl_priv *priv)</div><div class='add'>+static int iwl_set_temperature_offset_calib(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_calib_temperature_offset_cmd cmd;</div><div class='ctx'> 	__le16 *offset_calib =</div><div class='del'>-		(__le16 *)iwl_eeprom_query_addr(priv, EEPROM_RAW_TEMPERATURE);</div><div class='add'>+		(__le16 *)iwl_eeprom_query_addr(trans-&gt;shrd,</div><div class='add'>+						EEPROM_RAW_TEMPERATURE);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='ctx'> 	iwl_set_calib_hdr(&amp;cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD);</div><div class='hunk'>@@ -166,49 +239,48 @@ static int iwlagn_set_temperature_offset_calib(struct iwl_priv *priv)</div><div class='ctx'> 	if (!(cmd.radio_sensor_offset))</div><div class='ctx'> 		cmd.radio_sensor_offset = DEFAULT_RADIO_SENSOR_OFFSET;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_CALIB(priv, "Radio sensor offset: %d\n",</div><div class='add'>+	IWL_DEBUG_CALIB(trans, "Radio sensor offset: %d\n",</div><div class='ctx'> 			le16_to_cpu(cmd.radio_sensor_offset));</div><div class='del'>-	return iwl_calib_set(&amp;priv-&gt;calib_results[IWL_CALIB_TEMP_OFFSET],</div><div class='del'>-			     (u8 *)&amp;cmd, sizeof(cmd));</div><div class='add'>+	return iwl_calib_set(trans, (void *)&amp;cmd, sizeof(cmd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwlagn_set_temperature_offset_calib_v2(struct iwl_priv *priv)</div><div class='add'>+static int iwl_set_temperature_offset_calib_v2(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_calib_temperature_offset_v2_cmd cmd;</div><div class='del'>-	__le16 *offset_calib_high = (__le16 *)iwl_eeprom_query_addr(priv,</div><div class='add'>+	__le16 *offset_calib_high = (__le16 *)iwl_eeprom_query_addr(trans-&gt;shrd,</div><div class='ctx'> 				     EEPROM_KELVIN_TEMPERATURE);</div><div class='ctx'> 	__le16 *offset_calib_low =</div><div class='del'>-		(__le16 *)iwl_eeprom_query_addr(priv, EEPROM_RAW_TEMPERATURE);</div><div class='add'>+		(__le16 *)iwl_eeprom_query_addr(trans-&gt;shrd,</div><div class='add'>+						EEPROM_RAW_TEMPERATURE);</div><div class='ctx'> 	struct iwl_eeprom_calib_hdr *hdr;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='ctx'> 	iwl_set_calib_hdr(&amp;cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD);</div><div class='del'>-	hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(priv,</div><div class='add'>+	hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(trans-&gt;shrd,</div><div class='ctx'> 							EEPROM_CALIB_ALL);</div><div class='ctx'> 	memcpy(&amp;cmd.radio_sensor_offset_high, offset_calib_high,</div><div class='ctx'> 		sizeof(*offset_calib_high));</div><div class='ctx'> 	memcpy(&amp;cmd.radio_sensor_offset_low, offset_calib_low,</div><div class='ctx'> 		sizeof(*offset_calib_low));</div><div class='ctx'> 	if (!(cmd.radio_sensor_offset_low)) {</div><div class='del'>-		IWL_DEBUG_CALIB(priv, "no info in EEPROM, use default\n");</div><div class='add'>+		IWL_DEBUG_CALIB(trans, "no info in EEPROM, use default\n");</div><div class='ctx'> 		cmd.radio_sensor_offset_low = DEFAULT_RADIO_SENSOR_OFFSET;</div><div class='ctx'> 		cmd.radio_sensor_offset_high = DEFAULT_RADIO_SENSOR_OFFSET;</div><div class='ctx'> 	}</div><div class='ctx'> 	memcpy(&amp;cmd.burntVoltageRef, &amp;hdr-&gt;voltage,</div><div class='ctx'> 		sizeof(hdr-&gt;voltage));</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_CALIB(priv, "Radio sensor offset high: %d\n",</div><div class='add'>+	IWL_DEBUG_CALIB(trans, "Radio sensor offset high: %d\n",</div><div class='ctx'> 			le16_to_cpu(cmd.radio_sensor_offset_high));</div><div class='del'>-	IWL_DEBUG_CALIB(priv, "Radio sensor offset low: %d\n",</div><div class='add'>+	IWL_DEBUG_CALIB(trans, "Radio sensor offset low: %d\n",</div><div class='ctx'> 			le16_to_cpu(cmd.radio_sensor_offset_low));</div><div class='del'>-	IWL_DEBUG_CALIB(priv, "Voltage Ref: %d\n",</div><div class='add'>+	IWL_DEBUG_CALIB(trans, "Voltage Ref: %d\n",</div><div class='ctx'> 			le16_to_cpu(cmd.burntVoltageRef));</div><div class='ctx'> </div><div class='del'>-	return iwl_calib_set(&amp;priv-&gt;calib_results[IWL_CALIB_TEMP_OFFSET],</div><div class='del'>-			     (u8 *)&amp;cmd, sizeof(cmd));</div><div class='add'>+	return iwl_calib_set(trans, (void *)&amp;cmd, sizeof(cmd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int iwlagn_send_calib_cfg(struct iwl_priv *priv)</div><div class='add'>+static int iwl_send_calib_cfg(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_calib_cfg_cmd calib_cfg_cmd;</div><div class='ctx'> 	struct iwl_host_cmd cmd = {</div><div class='hunk'>@@ -224,7 +296,7 @@ static int iwlagn_send_calib_cfg(struct iwl_priv *priv)</div><div class='ctx'> 	calib_cfg_cmd.ucd_calib_cfg.flags =</div><div class='ctx'> 		IWL_CALIB_CFG_FLAG_SEND_COMPLETE_NTFY_MSK;</div><div class='ctx'> </div><div class='del'>-	return iwl_trans_send_cmd(trans(priv), &amp;cmd);</div><div class='add'>+	return iwl_trans_send_cmd(trans, &amp;cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int iwlagn_rx_calib_result(struct iwl_priv *priv,</div><div class='hunk'>@@ -234,60 +306,37 @@ int iwlagn_rx_calib_result(struct iwl_priv *priv,</div><div class='ctx'> 	struct iwl_rx_packet *pkt = rxb_addr(rxb);</div><div class='ctx'> 	struct iwl_calib_hdr *hdr = (struct iwl_calib_hdr *)pkt-&gt;u.raw;</div><div class='ctx'> 	int len = le32_to_cpu(pkt-&gt;len_n_flags) &amp; FH_RSCSR_FRAME_SIZE_MSK;</div><div class='del'>-	int index;</div><div class='ctx'> </div><div class='ctx'> 	/* reduce the size of the length field itself */</div><div class='ctx'> 	len -= 4;</div><div class='ctx'> </div><div class='del'>-	/* Define the order in which the results will be sent to the runtime</div><div class='del'>-	 * uCode. iwl_send_calib_results sends them in a row according to</div><div class='del'>-	 * their index. We sort them here</div><div class='del'>-	 */</div><div class='del'>-	switch (hdr-&gt;op_code) {</div><div class='del'>-	case IWL_PHY_CALIBRATE_DC_CMD:</div><div class='del'>-		index = IWL_CALIB_DC;</div><div class='del'>-		break;</div><div class='del'>-	case IWL_PHY_CALIBRATE_LO_CMD:</div><div class='del'>-		index = IWL_CALIB_LO;</div><div class='del'>-		break;</div><div class='del'>-	case IWL_PHY_CALIBRATE_TX_IQ_CMD:</div><div class='del'>-		index = IWL_CALIB_TX_IQ;</div><div class='del'>-		break;</div><div class='del'>-	case IWL_PHY_CALIBRATE_TX_IQ_PERD_CMD:</div><div class='del'>-		index = IWL_CALIB_TX_IQ_PERD;</div><div class='del'>-		break;</div><div class='del'>-	case IWL_PHY_CALIBRATE_BASE_BAND_CMD:</div><div class='del'>-		index = IWL_CALIB_BASE_BAND;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		IWL_ERR(priv, "Unknown calibration notification %d\n",</div><div class='del'>-			  hdr-&gt;op_code);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	iwl_calib_set(&amp;priv-&gt;calib_results[index], pkt-&gt;u.raw, len);</div><div class='add'>+	if (iwl_calib_set(trans(priv), hdr, len))</div><div class='add'>+		IWL_ERR(priv, "Failed to record calibration data %d\n",</div><div class='add'>+			hdr-&gt;op_code);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwlagn_init_alive_start(struct iwl_priv *priv)</div><div class='add'>+int iwl_init_alive_start(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;bt_params &amp;&amp;</div><div class='del'>-	    priv-&gt;cfg-&gt;bt_params-&gt;advanced_bt_coexist) {</div><div class='add'>+	if (cfg(trans)-&gt;bt_params &amp;&amp;</div><div class='add'>+	    cfg(trans)-&gt;bt_params-&gt;advanced_bt_coexist) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Tell uCode we are ready to perform calibration</div><div class='ctx'> 		 * need to perform this before any calibration</div><div class='ctx'> 		 * no need to close the envlope since we are going</div><div class='ctx'> 		 * to load the runtime uCode later.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = iwlagn_send_bt_env(priv, IWL_BT_COEX_ENV_OPEN,</div><div class='add'>+		ret = iwl_send_bt_env(trans, IWL_BT_COEX_ENV_OPEN,</div><div class='ctx'> 			BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iwlagn_send_calib_cfg(priv);</div><div class='add'>+	ret = iwl_send_calib_cfg(trans);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -295,21 +344,21 @@ int iwlagn_init_alive_start(struct iwl_priv *priv)</div><div class='ctx'> 	 * temperature offset calibration is only needed for runtime ucode,</div><div class='ctx'> 	 * so prepare the value now.</div><div class='ctx'> 	 */</div><div class='del'>-	if (priv-&gt;cfg-&gt;need_temp_offset_calib) {</div><div class='del'>-		if (priv-&gt;cfg-&gt;temp_offset_v2)</div><div class='del'>-			return iwlagn_set_temperature_offset_calib_v2(priv);</div><div class='add'>+	if (cfg(trans)-&gt;need_temp_offset_calib) {</div><div class='add'>+		if (cfg(trans)-&gt;temp_offset_v2)</div><div class='add'>+			return iwl_set_temperature_offset_calib_v2(trans);</div><div class='ctx'> 		else</div><div class='del'>-			return iwlagn_set_temperature_offset_calib(priv);</div><div class='add'>+			return iwl_set_temperature_offset_calib(trans);</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 iwlagn_send_wimax_coex(struct iwl_priv *priv)</div><div class='add'>+static int iwl_send_wimax_coex(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_wimax_coex_cmd coex_cmd;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;cfg-&gt;base_params-&gt;support_wimax_coexist) {</div><div class='add'>+	if (cfg(trans)-&gt;base_params-&gt;support_wimax_coexist) {</div><div class='ctx'> 		/* UnMask wake up src at associated sleep */</div><div class='ctx'> 		coex_cmd.flags = COEX_FLAGS_ASSOC_WA_UNMASK_MSK;</div><div class='ctx'> </div><div class='hunk'>@@ -328,12 +377,12 @@ static int iwlagn_send_wimax_coex(struct iwl_priv *priv)</div><div class='ctx'> 		/* coexistence is disabled */</div><div class='ctx'> 		memset(&amp;coex_cmd, 0, sizeof(coex_cmd));</div><div class='ctx'> 	}</div><div class='del'>-	return iwl_trans_send_cmd_pdu(trans(priv),</div><div class='add'>+	return iwl_trans_send_cmd_pdu(trans,</div><div class='ctx'> 				COEX_PRIORITY_TABLE_CMD, CMD_SYNC,</div><div class='ctx'> 				sizeof(coex_cmd), &amp;coex_cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const u8 iwlagn_bt_prio_tbl[BT_COEX_PRIO_TBL_EVT_MAX] = {</div><div class='add'>+static const u8 iwl_bt_prio_tbl[BT_COEX_PRIO_TBL_EVT_MAX] = {</div><div class='ctx'> 	((BT_COEX_PRIO_TBL_PRIO_BYPASS &lt;&lt; IWL_BT_COEX_PRIO_TBL_PRIO_POS) |</div><div class='ctx'> 		(0 &lt;&lt; IWL_BT_COEX_PRIO_TBL_SHARED_ANTENNA_POS)),</div><div class='ctx'> 	((BT_COEX_PRIO_TBL_PRIO_BYPASS &lt;&lt; IWL_BT_COEX_PRIO_TBL_PRIO_POS) |</div><div class='hunk'>@@ -355,61 +404,64 @@ static const u8 iwlagn_bt_prio_tbl[BT_COEX_PRIO_TBL_EVT_MAX] = {</div><div class='ctx'> 	0, 0, 0, 0, 0, 0, 0</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void iwlagn_send_prio_tbl(struct iwl_priv *priv)</div><div class='add'>+void iwl_send_prio_tbl(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_bt_coex_prio_table_cmd prio_tbl_cmd;</div><div class='ctx'> </div><div class='del'>-	memcpy(prio_tbl_cmd.prio_tbl, iwlagn_bt_prio_tbl,</div><div class='del'>-		sizeof(iwlagn_bt_prio_tbl));</div><div class='del'>-	if (iwl_trans_send_cmd_pdu(trans(priv),</div><div class='add'>+	memcpy(prio_tbl_cmd.prio_tbl, iwl_bt_prio_tbl,</div><div class='add'>+		sizeof(iwl_bt_prio_tbl));</div><div class='add'>+	if (iwl_trans_send_cmd_pdu(trans,</div><div class='ctx'> 				REPLY_BT_COEX_PRIO_TABLE, CMD_SYNC,</div><div class='ctx'> 				sizeof(prio_tbl_cmd), &amp;prio_tbl_cmd))</div><div class='del'>-		IWL_ERR(priv, "failed to send BT prio tbl command\n");</div><div class='add'>+		IWL_ERR(trans, "failed to send BT prio tbl command\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwlagn_send_bt_env(struct iwl_priv *priv, u8 action, u8 type)</div><div class='add'>+int iwl_send_bt_env(struct iwl_trans *trans, u8 action, u8 type)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_bt_coex_prot_env_cmd env_cmd;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	env_cmd.action = action;</div><div class='ctx'> 	env_cmd.type = type;</div><div class='del'>-	ret = iwl_trans_send_cmd_pdu(trans(priv),</div><div class='add'>+	ret = iwl_trans_send_cmd_pdu(trans,</div><div class='ctx'> 			       REPLY_BT_COEX_PROT_ENV, CMD_SYNC,</div><div class='ctx'> 			       sizeof(env_cmd), &amp;env_cmd);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		IWL_ERR(priv, "failed to send BT env command\n");</div><div class='add'>+		IWL_ERR(trans, "failed to send BT env command\n");</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int iwlagn_alive_notify(struct iwl_priv *priv)</div><div class='add'>+static int iwl_alive_notify(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='add'>+	struct iwl_priv *priv = priv(trans);</div><div class='ctx'> 	struct iwl_rxon_context *ctx;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!priv-&gt;tx_cmd_pool)</div><div class='ctx'> 		priv-&gt;tx_cmd_pool =</div><div class='del'>-			kmem_cache_create("iwlagn_dev_cmd",</div><div class='add'>+			kmem_cache_create("iwl_dev_cmd",</div><div class='ctx'> 					  sizeof(struct iwl_device_cmd),</div><div class='ctx'> 					  sizeof(void *), 0, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (!priv-&gt;tx_cmd_pool)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	iwl_trans_tx_start(trans(priv));</div><div class='add'>+	iwl_trans_tx_start(trans);</div><div class='ctx'> 	for_each_context(priv, ctx)</div><div class='ctx'> 		ctx-&gt;last_tx_rejected = false;</div><div class='ctx'> </div><div class='del'>-	ret = iwlagn_send_wimax_coex(priv);</div><div class='add'>+	ret = iwl_send_wimax_coex(trans);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = iwlagn_set_Xtal_calib(priv);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	if (!cfg(priv)-&gt;no_xtal_calib) {</div><div class='add'>+		ret = iwl_set_Xtal_calib(trans);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return iwl_send_calib_results(priv);</div><div class='add'>+	return iwl_send_calib_results(trans);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -418,7 +470,7 @@ static int iwlagn_alive_notify(struct iwl_priv *priv)</div><div class='ctx'>  *   using sample data 100 bytes apart.  If these sample points are good,</div><div class='ctx'>  *   it's a pretty good bet that everything between them is good, too.</div><div class='ctx'>  */</div><div class='del'>-static int iwl_verify_inst_sparse(struct iwl_priv *priv,</div><div class='add'>+static int iwl_verify_inst_sparse(struct iwl_bus *bus,</div><div class='ctx'> 				      struct fw_desc *fw_desc)</div><div class='ctx'> {</div><div class='ctx'> 	__le32 *image = (__le32 *)fw_desc-&gt;v_addr;</div><div class='hunk'>@@ -426,15 +478,15 @@ static int iwl_verify_inst_sparse(struct iwl_priv *priv,</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_FW(priv, "ucode inst image size is %u\n", len);</div><div class='add'>+	IWL_DEBUG_FW(bus, "ucode inst image size is %u\n", len);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; len; i += 100, image += 100/sizeof(u32)) {</div><div class='ctx'> 		/* read data comes through single port, auto-incr addr */</div><div class='ctx'> 		/* NOTE: Use the debugless read so we don't flood kernel log</div><div class='ctx'> 		 * if IWL_DL_IO is set */</div><div class='del'>-		iwl_write_direct32(bus(priv), HBUS_TARG_MEM_RADDR,</div><div class='add'>+		iwl_write_direct32(bus, HBUS_TARG_MEM_RADDR,</div><div class='ctx'> 			i + IWLAGN_RTC_INST_LOWER_BOUND);</div><div class='del'>-		val = iwl_read32(bus(priv), HBUS_TARG_MEM_RDAT);</div><div class='add'>+		val = iwl_read32(bus, HBUS_TARG_MEM_RDAT);</div><div class='ctx'> 		if (val != le32_to_cpu(*image))</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -442,7 +494,7 @@ static int iwl_verify_inst_sparse(struct iwl_priv *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iwl_print_mismatch_inst(struct iwl_priv *priv,</div><div class='add'>+static void iwl_print_mismatch_inst(struct iwl_bus *bus,</div><div class='ctx'> 				    struct fw_desc *fw_desc)</div><div class='ctx'> {</div><div class='ctx'> 	__le32 *image = (__le32 *)fw_desc-&gt;v_addr;</div><div class='hunk'>@@ -451,18 +503,18 @@ static void iwl_print_mismatch_inst(struct iwl_priv *priv,</div><div class='ctx'> 	u32 offs;</div><div class='ctx'> 	int errors = 0;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_FW(priv, "ucode inst image size is %u\n", len);</div><div class='add'>+	IWL_DEBUG_FW(bus, "ucode inst image size is %u\n", len);</div><div class='ctx'> </div><div class='del'>-	iwl_write_direct32(bus(priv), HBUS_TARG_MEM_RADDR,</div><div class='add'>+	iwl_write_direct32(bus, HBUS_TARG_MEM_RADDR,</div><div class='ctx'> 			   IWLAGN_RTC_INST_LOWER_BOUND);</div><div class='ctx'> </div><div class='ctx'> 	for (offs = 0;</div><div class='ctx'> 	     offs &lt; len &amp;&amp; errors &lt; 20;</div><div class='ctx'> 	     offs += sizeof(u32), image++) {</div><div class='ctx'> 		/* read data comes through single port, auto-incr addr */</div><div class='del'>-		val = iwl_read32(bus(priv), HBUS_TARG_MEM_RDAT);</div><div class='add'>+		val = iwl_read32(bus, HBUS_TARG_MEM_RDAT);</div><div class='ctx'> 		if (val != le32_to_cpu(*image)) {</div><div class='del'>-			IWL_ERR(priv, "uCode INST section at "</div><div class='add'>+			IWL_ERR(bus, "uCode INST section at "</div><div class='ctx'> 				"offset 0x%x, is 0x%x, s/b 0x%x\n",</div><div class='ctx'> 				offs, val, le32_to_cpu(*image));</div><div class='ctx'> 			errors++;</div><div class='hunk'>@@ -474,91 +526,163 @@ static void iwl_print_mismatch_inst(struct iwl_priv *priv,</div><div class='ctx'>  * iwl_verify_ucode - determine which instruction image is in SRAM,</div><div class='ctx'>  *    and verify its contents</div><div class='ctx'>  */</div><div class='del'>-static int iwl_verify_ucode(struct iwl_priv *priv, struct fw_img *img)</div><div class='add'>+static int iwl_verify_ucode(struct iwl_trans *trans,</div><div class='add'>+			    enum iwl_ucode_type ucode_type)</div><div class='ctx'> {</div><div class='del'>-	if (!iwl_verify_inst_sparse(priv, &amp;img-&gt;code)) {</div><div class='del'>-		IWL_DEBUG_FW(priv, "uCode is good in inst SRAM\n");</div><div class='add'>+	struct fw_img *img = iwl_get_ucode_image(trans, ucode_type);</div><div class='add'>+</div><div class='add'>+	if (!img) {</div><div class='add'>+		IWL_ERR(trans, "Invalid ucode requested (%d)\n", ucode_type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!iwl_verify_inst_sparse(bus(trans), &amp;img-&gt;code)) {</div><div class='add'>+		IWL_DEBUG_FW(trans, "uCode is good in inst SRAM\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	IWL_ERR(priv, "UCODE IMAGE IN INSTRUCTION SRAM NOT VALID!!\n");</div><div class='add'>+	IWL_ERR(trans, "UCODE IMAGE IN INSTRUCTION SRAM NOT VALID!!\n");</div><div class='ctx'> </div><div class='del'>-	iwl_print_mismatch_inst(priv, &amp;img-&gt;code);</div><div class='add'>+	iwl_print_mismatch_inst(bus(trans), &amp;img-&gt;code);</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct iwlagn_alive_data {</div><div class='add'>+struct iwl_alive_data {</div><div class='ctx'> 	bool valid;</div><div class='ctx'> 	u8 subtype;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void iwlagn_alive_fn(struct iwl_priv *priv,</div><div class='add'>+static void iwl_alive_fn(struct iwl_trans *trans,</div><div class='ctx'> 			    struct iwl_rx_packet *pkt,</div><div class='ctx'> 			    void *data)</div><div class='ctx'> {</div><div class='del'>-	struct iwlagn_alive_data *alive_data = data;</div><div class='add'>+	struct iwl_alive_data *alive_data = data;</div><div class='ctx'> 	struct iwl_alive_resp *palive;</div><div class='ctx'> </div><div class='ctx'> 	palive = &amp;pkt-&gt;u.alive_frame;</div><div class='ctx'> </div><div class='del'>-	IWL_DEBUG_FW(priv, "Alive ucode status 0x%08X revision "</div><div class='add'>+	IWL_DEBUG_FW(trans, "Alive ucode status 0x%08X revision "</div><div class='ctx'> 		       "0x%01X 0x%01X\n",</div><div class='ctx'> 		       palive-&gt;is_valid, palive-&gt;ver_type,</div><div class='ctx'> 		       palive-&gt;ver_subtype);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;device_pointers.error_event_table =</div><div class='add'>+	trans-&gt;shrd-&gt;device_pointers.error_event_table =</div><div class='ctx'> 		le32_to_cpu(palive-&gt;error_event_table_ptr);</div><div class='del'>-	priv-&gt;device_pointers.log_event_table =</div><div class='add'>+	trans-&gt;shrd-&gt;device_pointers.log_event_table =</div><div class='ctx'> 		le32_to_cpu(palive-&gt;log_event_table_ptr);</div><div class='ctx'> </div><div class='ctx'> 	alive_data-&gt;subtype = palive-&gt;ver_subtype;</div><div class='ctx'> 	alive_data-&gt;valid = palive-&gt;is_valid == UCODE_VALID_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* notification wait support */</div><div class='add'>+void iwl_init_notification_wait(struct iwl_shared *shrd,</div><div class='add'>+				   struct iwl_notification_wait *wait_entry,</div><div class='add'>+				   u8 cmd,</div><div class='add'>+				   void (*fn)(struct iwl_trans *trans,</div><div class='add'>+					      struct iwl_rx_packet *pkt,</div><div class='add'>+					      void *data),</div><div class='add'>+				   void *fn_data)</div><div class='add'>+{</div><div class='add'>+	wait_entry-&gt;fn = fn;</div><div class='add'>+	wait_entry-&gt;fn_data = fn_data;</div><div class='add'>+	wait_entry-&gt;cmd = cmd;</div><div class='add'>+	wait_entry-&gt;triggered = false;</div><div class='add'>+	wait_entry-&gt;aborted = false;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;shrd-&gt;notif_wait_lock);</div><div class='add'>+	list_add(&amp;wait_entry-&gt;list, &amp;shrd-&gt;notif_waits);</div><div class='add'>+	spin_unlock_bh(&amp;shrd-&gt;notif_wait_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iwl_wait_notification(struct iwl_shared *shrd,</div><div class='add'>+			     struct iwl_notification_wait *wait_entry,</div><div class='add'>+			     unsigned long timeout)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = wait_event_timeout(shrd-&gt;notif_waitq,</div><div class='add'>+				 wait_entry-&gt;triggered || wait_entry-&gt;aborted,</div><div class='add'>+				 timeout);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;shrd-&gt;notif_wait_lock);</div><div class='add'>+	list_del(&amp;wait_entry-&gt;list);</div><div class='add'>+	spin_unlock_bh(&amp;shrd-&gt;notif_wait_lock);</div><div class='add'>+</div><div class='add'>+	if (wait_entry-&gt;aborted)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* return value is always &gt;= 0 */</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_remove_notification(struct iwl_shared *shrd,</div><div class='add'>+				struct iwl_notification_wait *wait_entry)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;shrd-&gt;notif_wait_lock);</div><div class='add'>+	list_del(&amp;wait_entry-&gt;list);</div><div class='add'>+	spin_unlock_bh(&amp;shrd-&gt;notif_wait_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iwl_abort_notification_waits(struct iwl_shared *shrd)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct iwl_notification_wait *wait_entry;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;shrd-&gt;notif_wait_lock, flags);</div><div class='add'>+	list_for_each_entry(wait_entry, &amp;shrd-&gt;notif_waits, list)</div><div class='add'>+		wait_entry-&gt;aborted = true;</div><div class='add'>+	spin_unlock_irqrestore(&amp;shrd-&gt;notif_wait_lock, flags);</div><div class='add'>+</div><div class='add'>+	wake_up_all(&amp;shrd-&gt;notif_waitq);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define UCODE_ALIVE_TIMEOUT	HZ</div><div class='ctx'> #define UCODE_CALIB_TIMEOUT	(2*HZ)</div><div class='ctx'> </div><div class='del'>-int iwlagn_load_ucode_wait_alive(struct iwl_priv *priv,</div><div class='del'>-				 struct fw_img *image,</div><div class='del'>-				 enum iwlagn_ucode_type ucode_type)</div><div class='add'>+int iwl_load_ucode_wait_alive(struct iwl_trans *trans,</div><div class='add'>+				 enum iwl_ucode_type ucode_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_notification_wait alive_wait;</div><div class='del'>-	struct iwlagn_alive_data alive_data;</div><div class='add'>+	struct iwl_alive_data alive_data;</div><div class='ctx'> 	int ret;</div><div class='del'>-	enum iwlagn_ucode_type old_type;</div><div class='add'>+	enum iwl_ucode_type old_type;</div><div class='ctx'> </div><div class='del'>-	ret = iwl_trans_start_device(trans(priv));</div><div class='add'>+	ret = iwl_trans_start_device(trans);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	iwlagn_init_notification_wait(priv, &amp;alive_wait, REPLY_ALIVE,</div><div class='del'>-				      iwlagn_alive_fn, &amp;alive_data);</div><div class='add'>+	iwl_init_notification_wait(trans-&gt;shrd, &amp;alive_wait, REPLY_ALIVE,</div><div class='add'>+				      iwl_alive_fn, &amp;alive_data);</div><div class='ctx'> </div><div class='del'>-	old_type = priv-&gt;ucode_type;</div><div class='del'>-	priv-&gt;ucode_type = ucode_type;</div><div class='add'>+	old_type = trans-&gt;shrd-&gt;ucode_type;</div><div class='add'>+	trans-&gt;shrd-&gt;ucode_type = ucode_type;</div><div class='ctx'> </div><div class='del'>-	ret = iwlagn_load_given_ucode(priv, image);</div><div class='add'>+	ret = iwl_load_given_ucode(trans, ucode_type);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		priv-&gt;ucode_type = old_type;</div><div class='del'>-		iwlagn_remove_notification(priv, &amp;alive_wait);</div><div class='add'>+		trans-&gt;shrd-&gt;ucode_type = old_type;</div><div class='add'>+		iwl_remove_notification(trans-&gt;shrd, &amp;alive_wait);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	iwl_trans_kick_nic(trans(priv));</div><div class='add'>+	iwl_trans_kick_nic(trans);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Some things may run in the background now, but we</div><div class='ctx'> 	 * just wait for the ALIVE notification here.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = iwlagn_wait_notification(priv, &amp;alive_wait, UCODE_ALIVE_TIMEOUT);</div><div class='add'>+	ret = iwl_wait_notification(trans-&gt;shrd, &amp;alive_wait,</div><div class='add'>+					UCODE_ALIVE_TIMEOUT);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		priv-&gt;ucode_type = old_type;</div><div class='add'>+		trans-&gt;shrd-&gt;ucode_type = old_type;</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!alive_data.valid) {</div><div class='del'>-		IWL_ERR(priv, "Loaded ucode is not valid!\n");</div><div class='del'>-		priv-&gt;ucode_type = old_type;</div><div class='add'>+		IWL_ERR(trans, "Loaded ucode is not valid!\n");</div><div class='add'>+		trans-&gt;shrd-&gt;ucode_type = old_type;</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -568,9 +692,9 @@ int iwlagn_load_ucode_wait_alive(struct iwl_priv *priv,</div><div class='ctx'> 	 * skip it for WoWLAN.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ucode_type != IWL_UCODE_WOWLAN) {</div><div class='del'>-		ret = iwl_verify_ucode(priv, image);</div><div class='add'>+		ret = iwl_verify_ucode(trans, ucode_type);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			priv-&gt;ucode_type = old_type;</div><div class='add'>+			trans-&gt;shrd-&gt;ucode_type = old_type;</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -578,42 +702,41 @@ int iwlagn_load_ucode_wait_alive(struct iwl_priv *priv,</div><div class='ctx'> 		msleep(5);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = iwlagn_alive_notify(priv);</div><div class='add'>+	ret = iwl_alive_notify(trans);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		IWL_WARN(priv,</div><div class='add'>+		IWL_WARN(trans,</div><div class='ctx'> 			"Could not complete ALIVE transition: %d\n", ret);</div><div class='del'>-		priv-&gt;ucode_type = old_type;</div><div class='add'>+		trans-&gt;shrd-&gt;ucode_type = old_type;</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int iwlagn_run_init_ucode(struct iwl_priv *priv)</div><div class='add'>+int iwl_run_init_ucode(struct iwl_trans *trans)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwl_notification_wait calib_wait;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	lockdep_assert_held(&amp;priv-&gt;shrd-&gt;mutex);</div><div class='add'>+	lockdep_assert_held(&amp;trans-&gt;shrd-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* No init ucode required? Curious, but maybe ok */</div><div class='del'>-	if (!priv-&gt;ucode_init.code.len)</div><div class='add'>+	if (!trans-&gt;ucode_init.code.len)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;ucode_type != IWL_UCODE_NONE)</div><div class='add'>+	if (trans-&gt;shrd-&gt;ucode_type != IWL_UCODE_NONE)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	iwlagn_init_notification_wait(priv, &amp;calib_wait,</div><div class='add'>+	iwl_init_notification_wait(trans-&gt;shrd, &amp;calib_wait,</div><div class='ctx'> 				      CALIBRATION_COMPLETE_NOTIFICATION,</div><div class='ctx'> 				      NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* Will also start the device */</div><div class='del'>-	ret = iwlagn_load_ucode_wait_alive(priv, &amp;priv-&gt;ucode_init,</div><div class='del'>-					   IWL_UCODE_INIT);</div><div class='add'>+	ret = iwl_load_ucode_wait_alive(trans, IWL_UCODE_INIT);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	ret = iwlagn_init_alive_start(priv);</div><div class='add'>+	ret = iwl_init_alive_start(trans);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -621,14 +744,15 @@ int iwlagn_run_init_ucode(struct iwl_priv *priv)</div><div class='ctx'> 	 * Some things may run in the background now, but we</div><div class='ctx'> 	 * just wait for the calibration complete notification.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = iwlagn_wait_notification(priv, &amp;calib_wait, UCODE_CALIB_TIMEOUT);</div><div class='add'>+	ret = iwl_wait_notification(trans-&gt;shrd, &amp;calib_wait,</div><div class='add'>+					UCODE_CALIB_TIMEOUT);</div><div class='ctx'> </div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='ctx'>  error:</div><div class='del'>-	iwlagn_remove_notification(priv, &amp;calib_wait);</div><div class='add'>+	iwl_remove_notification(trans-&gt;shrd, &amp;calib_wait);</div><div class='ctx'>  out:</div><div class='ctx'> 	/* Whatever happened, stop the device */</div><div class='del'>-	iwl_trans_stop_device(trans(priv));</div><div class='add'>+	iwl_trans_stop_device(trans);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-calib.h b/drivers/net/wireless/iwlwifi/iwl-wifi.h<br/>index f46c80e6e005..18501101a530 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlegacy/iwl-4965-calib.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwlegacy/iwl-4965-calib.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwlwifi/iwl-wifi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwlwifi/iwl-wifi.h</a></div><div class='hunk'>@@ -59,17 +59,16 @@</div><div class='ctx'>  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</div><div class='ctx'>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='ctx'>  *****************************************************************************/</div><div class='del'>-#ifndef __iwl_4965_calib_h__</div><div class='del'>-#define __iwl_4965_calib_h__</div><div class='ctx'> </div><div class='del'>-#include "iwl-dev.h"</div><div class='del'>-#include "iwl-core.h"</div><div class='del'>-#include "iwl-commands.h"</div><div class='add'>+#ifndef __iwl_wifi_h__</div><div class='add'>+#define __iwl_wifi_h__</div><div class='ctx'> </div><div class='del'>-void iwl4965_chain_noise_calibration(struct iwl_priv *priv, void *stat_resp);</div><div class='del'>-void iwl4965_sensitivity_calibration(struct iwl_priv *priv, void *resp);</div><div class='del'>-void iwl4965_init_sensitivity(struct iwl_priv *priv);</div><div class='del'>-void iwl4965_reset_run_time_calib(struct iwl_priv *priv);</div><div class='del'>-void iwl4965_calib_free_results(struct iwl_priv *priv);</div><div class='add'>+#include "iwl-shared.h"</div><div class='ctx'> </div><div class='del'>-#endif /* __iwl_4965_calib_h__ */</div><div class='add'>+int iwl_send_bt_env(struct iwl_trans *trans, u8 action, u8 type);</div><div class='add'>+void iwl_send_prio_tbl(struct iwl_trans *trans);</div><div class='add'>+int iwl_init_alive_start(struct iwl_trans *trans);</div><div class='add'>+int iwl_run_init_ucode(struct iwl_trans *trans);</div><div class='add'>+int iwl_load_ucode_wait_alive(struct iwl_trans *trans,</div><div class='add'>+				 enum iwl_ucode_type ucode_type);</div><div class='add'>+#endif  /* __iwl_wifi_h__ */</div><div class='head'>diff --git a/drivers/net/wireless/iwmc3200wifi/cfg80211.c b/drivers/net/wireless/iwmc3200wifi/cfg80211.c<br/>index c42be81e979e..48e8218fd23b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwmc3200wifi/cfg80211.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwmc3200wifi/cfg80211.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwmc3200wifi/cfg80211.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwmc3200wifi/cfg80211.c</a></div><div class='hunk'>@@ -165,11 +165,15 @@ static int iwm_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 				struct key_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwm_priv *iwm = ndev_to_iwm(ndev);</div><div class='del'>-	struct iwm_key *key = &amp;iwm-&gt;keys[key_index];</div><div class='add'>+	struct iwm_key *key;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	IWM_DBG_WEXT(iwm, DBG, "Adding key for %pM\n", mac_addr);</div><div class='ctx'> </div><div class='add'>+	if (key_index &gt;= IWM_NUM_KEYS)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	key = &amp;iwm-&gt;keys[key_index];</div><div class='ctx'> 	memset(key, 0, sizeof(struct iwm_key));</div><div class='ctx'> 	ret = iwm_key_init(key, key_index, mac_addr, params);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -214,8 +218,12 @@ static int iwm_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,</div><div class='ctx'> 				u8 key_index, bool pairwise, const u8 *mac_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct iwm_priv *iwm = ndev_to_iwm(ndev);</div><div class='del'>-	struct iwm_key *key = &amp;iwm-&gt;keys[key_index];</div><div class='add'>+	struct iwm_key *key;</div><div class='ctx'> </div><div class='add'>+	if (key_index &gt;= IWM_NUM_KEYS)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	key = &amp;iwm-&gt;keys[key_index];</div><div class='ctx'> 	if (!iwm-&gt;keys[key_index].key_len) {</div><div class='ctx'> 		IWM_DBG_WEXT(iwm, DBG, "Key %d not used\n", key_index);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -236,6 +244,9 @@ static int iwm_cfg80211_set_default_key(struct wiphy *wiphy,</div><div class='ctx'> </div><div class='ctx'> 	IWM_DBG_WEXT(iwm, DBG, "Default key index is: %d\n", key_index);</div><div class='ctx'> </div><div class='add'>+	if (key_index &gt;= IWM_NUM_KEYS)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='ctx'> 	if (!iwm-&gt;keys[key_index].key_len) {</div><div class='ctx'> 		IWM_ERR(iwm, "Key %d not used\n", key_index);</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/net/wireless/iwmc3200wifi/main.c b/drivers/net/wireless/iwmc3200wifi/main.c<br/>index 98a179f98ea1..1f868b166d10 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwmc3200wifi/main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwmc3200wifi/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwmc3200wifi/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwmc3200wifi/main.c</a></div><div class='hunk'>@@ -91,11 +91,11 @@ static struct iwm_conf def_iwm_conf = {</div><div class='ctx'> 	.mac_addr		= {0x00, 0x02, 0xb3, 0x01, 0x02, 0x03},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int modparam_reset;</div><div class='add'>+static bool modparam_reset;</div><div class='ctx'> module_param_named(reset, modparam_reset, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(reset, "reset on firmware errors (default 0 [not reset])");</div><div class='ctx'> </div><div class='del'>-static int modparam_wimax_enable = 1;</div><div class='add'>+static bool modparam_wimax_enable = true;</div><div class='ctx'> module_param_named(wimax_enable, modparam_wimax_enable, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(wimax_enable, "Enable wimax core (default 1 [wimax enabled])");</div><div class='ctx'> </div><div class='hunk'>@@ -130,7 +130,7 @@ static void iwm_disconnect_work(struct work_struct *work)</div><div class='ctx'> 		iwm_invalidate_mlme_profile(iwm);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(IWM_STATUS_ASSOCIATED, &amp;iwm-&gt;status);</div><div class='del'>-	iwm-&gt;umac_profile_active = 0;</div><div class='add'>+	iwm-&gt;umac_profile_active = false;</div><div class='ctx'> 	memset(iwm-&gt;bssid, 0, ETH_ALEN);</div><div class='ctx'> 	iwm-&gt;channel = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c<br/>index a414768f40f1..7d708f4395f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwmc3200wifi/rx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/iwmc3200wifi/rx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/iwmc3200wifi/rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/iwmc3200wifi/rx.c</a></div><div class='hunk'>@@ -660,7 +660,7 @@ static int iwm_mlme_profile_invalidate(struct iwm_priv *iwm, u8 *buf,</div><div class='ctx'> 	clear_bit(IWM_STATUS_SME_CONNECTING, &amp;iwm-&gt;status);</div><div class='ctx'> 	clear_bit(IWM_STATUS_ASSOCIATED, &amp;iwm-&gt;status);</div><div class='ctx'> </div><div class='del'>-	iwm-&gt;umac_profile_active = 0;</div><div class='add'>+	iwm-&gt;umac_profile_active = false;</div><div class='ctx'> 	memset(iwm-&gt;bssid, 0, ETH_ALEN);</div><div class='ctx'> 	iwm-&gt;channel = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -735,7 +735,7 @@ static int iwm_mlme_update_sta_table(struct iwm_priv *iwm, u8 *buf,</div><div class='ctx'> 			     umac_sta-&gt;mac_addr,</div><div class='ctx'> 			     umac_sta-&gt;flags &amp; UMAC_STA_FLAG_QOS);</div><div class='ctx'> </div><div class='del'>-		sta-&gt;valid = 1;</div><div class='add'>+		sta-&gt;valid = true;</div><div class='ctx'> 		sta-&gt;qos = umac_sta-&gt;flags &amp; UMAC_STA_FLAG_QOS;</div><div class='ctx'> 		sta-&gt;color = GET_VAL8(umac_sta-&gt;sta_id, LMAC_STA_COLOR);</div><div class='ctx'> 		memcpy(sta-&gt;addr, umac_sta-&gt;mac_addr, ETH_ALEN);</div><div class='hunk'>@@ -750,12 +750,12 @@ static int iwm_mlme_update_sta_table(struct iwm_priv *iwm, u8 *buf,</div><div class='ctx'> 		sta = &amp;iwm-&gt;sta_table[GET_VAL8(umac_sta-&gt;sta_id, LMAC_STA_ID)];</div><div class='ctx'> </div><div class='ctx'> 		if (!memcmp(sta-&gt;addr, umac_sta-&gt;mac_addr, ETH_ALEN))</div><div class='del'>-			sta-&gt;valid = 0;</div><div class='add'>+			sta-&gt;valid = false;</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> 	case UMAC_OPCODE_CLEAR_ALL:</div><div class='ctx'> 		for (i = 0; i &lt; IWM_STA_TABLE_NUM; i++)</div><div class='del'>-			iwm-&gt;sta_table[i].valid = 0;</div><div class='add'>+			iwm-&gt;sta_table[i].valid = false;</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1203,7 +1203,7 @@ static int iwm_ntf_wifi_if_wrapper(struct iwm_priv *iwm, u8 *buf,</div><div class='ctx'> </div><div class='ctx'> 	switch (hdr-&gt;oid) {</div><div class='ctx'> 	case UMAC_WIFI_IF_CMD_SET_PROFILE:</div><div class='del'>-		iwm-&gt;umac_profile_active = 1;</div><div class='add'>+		iwm-&gt;umac_profile_active = true;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1363,7 +1363,7 @@ static int iwm_rx_handle_nonwifi(struct iwm_priv *iwm, u8 *buf,</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_for_each_entry(cmd, &amp;iwm-&gt;nonwifi_pending_cmd, pending)</div><div class='ctx'> 		if (cmd-&gt;seq_num == seq_num) {</div><div class='del'>-			cmd-&gt;resp_received = 1;</div><div class='add'>+			cmd-&gt;resp_received = true;</div><div class='ctx'> 			cmd-&gt;buf.len = buf_size;</div><div class='ctx'> 			memcpy(cmd-&gt;buf.hdr, buf, buf_size);</div><div class='ctx'> 			wake_up_interruptible(&amp;iwm-&gt;nonwifi_queue);</div><div class='head'>diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c<br/>index a7f1ab28940d..a7cd311cb1b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/libertas/cfg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/libertas/cfg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/libertas/cfg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/libertas/cfg.c</a></div><div class='hunk'>@@ -485,6 +485,7 @@ static int lbs_cfg_set_channel(struct wiphy *wiphy,</div><div class='ctx'> static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy,</div><div class='ctx'> 	struct cmd_header *resp)</div><div class='ctx'> {</div><div class='add'>+	struct cfg80211_bss *bss;</div><div class='ctx'> 	struct cmd_ds_802_11_scan_rsp *scanresp = (void *)resp;</div><div class='ctx'> 	int bsssize;</div><div class='ctx'> 	const u8 *pos;</div><div class='hunk'>@@ -632,12 +633,14 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy,</div><div class='ctx'> 				     LBS_SCAN_RSSI_TO_MBM(rssi)/100);</div><div class='ctx'> </div><div class='ctx'> 			if (channel &amp;&amp;</div><div class='del'>-			    !(channel-&gt;flags &amp; IEEE80211_CHAN_DISABLED))</div><div class='del'>-				cfg80211_inform_bss(wiphy, channel,</div><div class='add'>+			    !(channel-&gt;flags &amp; IEEE80211_CHAN_DISABLED)) {</div><div class='add'>+				bss = cfg80211_inform_bss(wiphy, channel,</div><div class='ctx'> 					bssid, get_unaligned_le64(tsfdesc),</div><div class='ctx'> 					capa, intvl, ie, ielen,</div><div class='ctx'> 					LBS_SCAN_RSSI_TO_MBM(rssi),</div><div class='ctx'> 					GFP_KERNEL);</div><div class='add'>+				cfg80211_put_bss(bss);</div><div class='add'>+			}</div><div class='ctx'> 		} else</div><div class='ctx'> 			lbs_deb_scan("scan response: missing BSS channel IE\n");</div><div class='ctx'> </div><div class='hunk'>@@ -728,9 +731,11 @@ static void lbs_scan_worker(struct work_struct *work)</div><div class='ctx'> 		le16_to_cpu(scan_cmd-&gt;hdr.size),</div><div class='ctx'> 		lbs_ret_scan, 0);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;scan_channel &gt;= priv-&gt;scan_req-&gt;n_channels)</div><div class='add'>+	if (priv-&gt;scan_channel &gt;= priv-&gt;scan_req-&gt;n_channels) {</div><div class='ctx'> 		/* Mark scan done */</div><div class='add'>+		cancel_delayed_work(&amp;priv-&gt;scan_work);</div><div class='ctx'> 		lbs_scan_done(priv);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Restart network */</div><div class='ctx'> 	if (carrier)</div><div class='hunk'>@@ -759,12 +764,12 @@ static void _internal_start_scan(struct lbs_private *priv, bool internal,</div><div class='ctx'> 		request-&gt;n_ssids, request-&gt;n_channels, request-&gt;ie_len);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;scan_channel = 0;</div><div class='del'>-	queue_delayed_work(priv-&gt;work_thread, &amp;priv-&gt;scan_work,</div><div class='del'>-		msecs_to_jiffies(50));</div><div class='del'>-</div><div class='ctx'> 	priv-&gt;scan_req = request;</div><div class='ctx'> 	priv-&gt;internal_scan = internal;</div><div class='ctx'> </div><div class='add'>+	queue_delayed_work(priv-&gt;work_thread, &amp;priv-&gt;scan_work,</div><div class='add'>+		msecs_to_jiffies(50));</div><div class='add'>+</div><div class='ctx'> 	lbs_deb_leave(LBS_DEB_CFG80211);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1720,6 +1725,7 @@ static void lbs_join_post(struct lbs_private *priv,</div><div class='ctx'> 		   2 + 2 +                      /* atim */</div><div class='ctx'> 		   2 + 8];                      /* extended rates */</div><div class='ctx'> 	u8 *fake = fake_ie;</div><div class='add'>+	struct cfg80211_bss *bss;</div><div class='ctx'> </div><div class='ctx'> 	lbs_deb_enter(LBS_DEB_CFG80211);</div><div class='ctx'> </div><div class='hunk'>@@ -1763,14 +1769,15 @@ static void lbs_join_post(struct lbs_private *priv,</div><div class='ctx'> 	*fake++ = 0x6c;</div><div class='ctx'> 	lbs_deb_hex(LBS_DEB_CFG80211, "IE", fake_ie, fake - fake_ie);</div><div class='ctx'> </div><div class='del'>-	cfg80211_inform_bss(priv-&gt;wdev-&gt;wiphy,</div><div class='del'>-			    params-&gt;channel,</div><div class='del'>-			    bssid,</div><div class='del'>-			    0,</div><div class='del'>-			    capability,</div><div class='del'>-			    params-&gt;beacon_interval,</div><div class='del'>-			    fake_ie, fake - fake_ie,</div><div class='del'>-			    0, GFP_KERNEL);</div><div class='add'>+	bss = cfg80211_inform_bss(priv-&gt;wdev-&gt;wiphy,</div><div class='add'>+				  params-&gt;channel,</div><div class='add'>+				  bssid,</div><div class='add'>+				  0,</div><div class='add'>+				  capability,</div><div class='add'>+				  params-&gt;beacon_interval,</div><div class='add'>+				  fake_ie, fake - fake_ie,</div><div class='add'>+				  0, GFP_KERNEL);</div><div class='add'>+	cfg80211_put_bss(bss);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(priv-&gt;wdev-&gt;ssid, params-&gt;ssid, params-&gt;ssid_len);</div><div class='ctx'> 	priv-&gt;wdev-&gt;ssid_len = params-&gt;ssid_len;</div><div class='head'>diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c<br/>index d8d8f0d0899f..c192671610fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/libertas/debugfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/libertas/debugfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/libertas/debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/libertas/debugfs.c</a></div><div class='hunk'>@@ -704,7 +704,7 @@ out_unlock:</div><div class='ctx'> </div><div class='ctx'> struct lbs_debugfs_files {</div><div class='ctx'> 	const char *name;</div><div class='del'>-	int perm;</div><div class='add'>+	umode_t perm;</div><div class='ctx'> 	struct file_operations fops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/libertas/ethtool.c<br/>index 885ddc1c4fed..f955b2d66ed6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/libertas/ethtool.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/libertas/ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/libertas/ethtool.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/libertas/ethtool.c</a></div><div class='hunk'>@@ -13,13 +13,14 @@ static void lbs_ethtool_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct lbs_private *priv = dev-&gt;ml_priv;</div><div class='ctx'> </div><div class='del'>-	snprintf(info-&gt;fw_version, 32, "%u.%u.%u.p%u",</div><div class='add'>+	snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version),</div><div class='add'>+		"%u.%u.%u.p%u",</div><div class='ctx'> 		priv-&gt;fwrelease &gt;&gt; 24 &amp; 0xff,</div><div class='ctx'> 		priv-&gt;fwrelease &gt;&gt; 16 &amp; 0xff,</div><div class='ctx'> 		priv-&gt;fwrelease &gt;&gt;  8 &amp; 0xff,</div><div class='ctx'> 		priv-&gt;fwrelease       &amp; 0xff);</div><div class='del'>-	strcpy(info-&gt;driver, "libertas");</div><div class='del'>-	strcpy(info-&gt;version, lbs_driver_version);</div><div class='add'>+	strlcpy(info-&gt;driver, "libertas", sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, lbs_driver_version, sizeof(info-&gt;version));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c<br/>index e26935179861..3f7bf4d912b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/libertas/if_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/libertas/if_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/libertas/if_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/libertas/if_cs.c</a></div><div class='hunk'>@@ -859,7 +859,7 @@ static int if_cs_probe(struct pcmcia_device *p_dev)</div><div class='ctx'> 	 * Most of the libertas cards can do unaligned register access, but some</div><div class='ctx'> 	 * weird ones cannot. That's especially true for the CF8305 card.</div><div class='ctx'> 	 */</div><div class='del'>-	card-&gt;align_regs = 0;</div><div class='add'>+	card-&gt;align_regs = false;</div><div class='ctx'> </div><div class='ctx'> 	card-&gt;model = get_model(p_dev-&gt;manf_id, p_dev-&gt;card_id);</div><div class='ctx'> 	if (card-&gt;model == MODEL_UNKNOWN) {</div><div class='hunk'>@@ -871,7 +871,7 @@ static int if_cs_probe(struct pcmcia_device *p_dev)</div><div class='ctx'> 	/* Check if we have a current silicon */</div><div class='ctx'> 	prod_id = if_cs_read8(card, IF_CS_PRODUCT_ID);</div><div class='ctx'> 	if (card-&gt;model == MODEL_8305) {</div><div class='del'>-		card-&gt;align_regs = 1;</div><div class='add'>+		card-&gt;align_regs = true;</div><div class='ctx'> 		if (prod_id &lt; IF_CS_CF8305_B1_REV) {</div><div class='ctx'> 			pr_err("8305 rev B0 and older are not supported\n");</div><div class='ctx'> 			ret = -ENODEV;</div><div class='head'>diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c<br/>index 728baa445259..50b1ee7721e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/libertas/if_spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/libertas/if_spi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/libertas/if_spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/libertas/if_spi.c</a></div><div class='hunk'>@@ -1291,7 +1291,6 @@ static struct spi_driver libertas_spi_driver = {</div><div class='ctx'> 	.remove = __devexit_p(libertas_spi_remove),</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "libertas_spi",</div><div class='del'>-		.bus	= &amp;spi_bus_type,</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 		.pm	= &amp;if_spi_pm_ops,</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c<br/>index db879c364ebf..b5fbbc7947df 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/libertas/if_usb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/libertas/if_usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/libertas/if_usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/libertas/if_usb.c</a></div><div class='hunk'>@@ -1184,29 +1184,7 @@ static struct usb_driver if_usb_driver = {</div><div class='ctx'> 	.reset_resume = if_usb_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init if_usb_init_module(void)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	lbs_deb_enter(LBS_DEB_MAIN);</div><div class='del'>-</div><div class='del'>-	ret = usb_register(&amp;if_usb_driver);</div><div class='del'>-</div><div class='del'>-	lbs_deb_leave_args(LBS_DEB_MAIN, "ret %d", ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit if_usb_exit_module(void)</div><div class='del'>-{</div><div class='del'>-	lbs_deb_enter(LBS_DEB_MAIN);</div><div class='del'>-</div><div class='del'>-	usb_deregister(&amp;if_usb_driver);</div><div class='del'>-</div><div class='del'>-	lbs_deb_leave(LBS_DEB_MAIN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(if_usb_init_module);</div><div class='del'>-module_exit(if_usb_exit_module);</div><div class='add'>+module_usb_driver(if_usb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("8388 USB WLAN Driver");</div><div class='ctx'> MODULE_AUTHOR("Marvell International Ltd. and Red Hat, Inc.");</div><div class='head'>diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c<br/>index 68202e63873a..aff8b5743af0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/libertas_tf/if_usb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/libertas_tf/if_usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/libertas_tf/if_usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/libertas_tf/if_usb.c</a></div><div class='hunk'>@@ -924,27 +924,7 @@ static struct usb_driver if_usb_driver = {</div><div class='ctx'> 	.resume = if_usb_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init if_usb_init_module(void)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	lbtf_deb_enter(LBTF_DEB_MAIN);</div><div class='del'>-</div><div class='del'>-	ret = usb_register(&amp;if_usb_driver);</div><div class='del'>-</div><div class='del'>-	lbtf_deb_leave_args(LBTF_DEB_MAIN, "ret %d", ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit if_usb_exit_module(void)</div><div class='del'>-{</div><div class='del'>-	lbtf_deb_enter(LBTF_DEB_MAIN);</div><div class='del'>-	usb_deregister(&amp;if_usb_driver);</div><div class='del'>-	lbtf_deb_leave(LBTF_DEB_MAIN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(if_usb_init_module);</div><div class='del'>-module_exit(if_usb_exit_module);</div><div class='add'>+module_usb_driver(if_usb_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("8388 USB WLAN Thinfirm Driver");</div><div class='ctx'> MODULE_AUTHOR("Cozybit Inc.");</div><div class='head'>diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c<br/>index ceb51b6e6702..a03457292c88 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/libertas_tf/main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/libertas_tf/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/libertas_tf/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/libertas_tf/main.c</a></div><div class='hunk'>@@ -719,11 +719,11 @@ void lbtf_bcn_sent(struct lbtf_private *priv)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_queue_empty(&amp;priv-&gt;bc_ps_buf)) {</div><div class='del'>-		bool tx_buff_bc = 0;</div><div class='add'>+		bool tx_buff_bc = false;</div><div class='ctx'> </div><div class='ctx'> 		while ((skb = ieee80211_get_buffered_bc(priv-&gt;hw, priv-&gt;vif))) {</div><div class='ctx'> 			skb_queue_tail(&amp;priv-&gt;bc_ps_buf, skb);</div><div class='del'>-			tx_buff_bc = 1;</div><div class='add'>+			tx_buff_bc = true;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (tx_buff_bc) {</div><div class='ctx'> 			ieee80211_stop_queues(priv-&gt;hw);</div><div class='head'>diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c<br/>index 523ad55a2885..4b9e730d2c8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mac80211_hwsim.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mac80211_hwsim.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mac80211_hwsim.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mac80211_hwsim.c</a></div><div class='hunk'>@@ -37,7 +37,8 @@ MODULE_AUTHOR("Jouni Malinen");</div><div class='ctx'> MODULE_DESCRIPTION("Software simulator of 802.11 radio(s) for mac80211");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-int wmediumd_pid;</div><div class='add'>+static u32 wmediumd_pid;</div><div class='add'>+</div><div class='ctx'> static int radios = 2;</div><div class='ctx'> module_param(radios, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(radios, "Number of simulated radios");</div><div class='hunk'>@@ -665,7 +666,7 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	bool ack;</div><div class='ctx'> 	struct ieee80211_tx_info *txi;</div><div class='del'>-	int _pid;</div><div class='add'>+	u32 _pid;</div><div class='ctx'> </div><div class='ctx'> 	mac80211_hwsim_monitor_rx(hw, skb);</div><div class='ctx'> </div><div class='hunk'>@@ -676,7 +677,7 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* wmediumd mode check */</div><div class='del'>-	_pid = wmediumd_pid;</div><div class='add'>+	_pid = ACCESS_ONCE(wmediumd_pid);</div><div class='ctx'> </div><div class='ctx'> 	if (_pid)</div><div class='ctx'> 		return mac80211_hwsim_tx_frame_nl(hw, skb, _pid);</div><div class='hunk'>@@ -707,7 +708,7 @@ static int mac80211_hwsim_start(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct mac80211_hwsim_data *data = hw-&gt;priv;</div><div class='ctx'> 	wiphy_debug(hw-&gt;wiphy, "%s\n", __func__);</div><div class='del'>-	data-&gt;started = 1;</div><div class='add'>+	data-&gt;started = true;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -715,7 +716,7 @@ static int mac80211_hwsim_start(struct ieee80211_hw *hw)</div><div class='ctx'> 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='del'>-	data-&gt;started = 0;</div><div class='add'>+	data-&gt;started = false;</div><div class='ctx'> 	del_timer(&amp;data-&gt;beacon_timer);</div><div class='ctx'> 	wiphy_debug(hw-&gt;wiphy, "%s\n", __func__);</div><div class='ctx'> }</div><div class='hunk'>@@ -764,7 +765,7 @@ static void mac80211_hwsim_beacon_tx(void *arg, u8 *mac,</div><div class='ctx'> 	struct ieee80211_hw *hw = arg;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='del'>-	int _pid;</div><div class='add'>+	u32 _pid;</div><div class='ctx'> </div><div class='ctx'> 	hwsim_check_magic(vif);</div><div class='ctx'> </div><div class='hunk'>@@ -781,7 +782,7 @@ static void mac80211_hwsim_beacon_tx(void *arg, u8 *mac,</div><div class='ctx'> 	mac80211_hwsim_monitor_rx(hw, skb);</div><div class='ctx'> </div><div class='ctx'> 	/* wmediumd mode check */</div><div class='del'>-	_pid = wmediumd_pid;</div><div class='add'>+	_pid = ACCESS_ONCE(wmediumd_pid);</div><div class='ctx'> </div><div class='ctx'> 	if (_pid)</div><div class='ctx'> 		return mac80211_hwsim_tx_frame_nl(hw, skb, _pid);</div><div class='hunk'>@@ -1254,7 +1255,7 @@ static void hwsim_send_ps_poll(void *dat, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> 	struct hwsim_vif_priv *vp = (void *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct ieee80211_pspoll *pspoll;</div><div class='del'>-	int _pid;</div><div class='add'>+	u32 _pid;</div><div class='ctx'> </div><div class='ctx'> 	if (!vp-&gt;assoc)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1275,7 +1276,7 @@ static void hwsim_send_ps_poll(void *dat, u8 *mac, struct ieee80211_vif *vif)</div><div class='ctx'> 	memcpy(pspoll-&gt;ta, mac, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	/* wmediumd mode check */</div><div class='del'>-	_pid = wmediumd_pid;</div><div class='add'>+	_pid = ACCESS_ONCE(wmediumd_pid);</div><div class='ctx'> </div><div class='ctx'> 	if (_pid)</div><div class='ctx'> 		return mac80211_hwsim_tx_frame_nl(data-&gt;hw, skb, _pid);</div><div class='hunk'>@@ -1292,7 +1293,7 @@ static void hwsim_send_nullfunc(struct mac80211_hwsim_data *data, u8 *mac,</div><div class='ctx'> 	struct hwsim_vif_priv *vp = (void *)vif-&gt;drv_priv;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='del'>-	int _pid;</div><div class='add'>+	u32 _pid;</div><div class='ctx'> </div><div class='ctx'> 	if (!vp-&gt;assoc)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1314,7 +1315,7 @@ static void hwsim_send_nullfunc(struct mac80211_hwsim_data *data, u8 *mac,</div><div class='ctx'> 	memcpy(hdr-&gt;addr3, vp-&gt;bssid, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	/* wmediumd mode check */</div><div class='del'>-	_pid = wmediumd_pid;</div><div class='add'>+	_pid = ACCESS_ONCE(wmediumd_pid);</div><div class='ctx'> </div><div class='ctx'> 	if (_pid)</div><div class='ctx'> 		return mac80211_hwsim_tx_frame_nl(data-&gt;hw, skb, _pid);</div><div class='hunk'>@@ -1634,8 +1635,6 @@ static int hwsim_init_netlink(void)</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	printk(KERN_INFO "mac80211_hwsim: initializing netlink\n");</div><div class='ctx'> </div><div class='del'>-	wmediumd_pid = 0;</div><div class='del'>-</div><div class='ctx'> 	rc = genl_register_family_with_ops(&amp;hwsim_genl_family,</div><div class='ctx'> 		hwsim_ops, ARRAY_SIZE(hwsim_ops));</div><div class='ctx'> 	if (rc)</div><div class='hunk'>@@ -1748,6 +1747,8 @@ static int __init init_mac80211_hwsim(void)</div><div class='ctx'> 			    IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |</div><div class='ctx'> 			    IEEE80211_HW_AMPDU_AGGREGATION;</div><div class='ctx'> </div><div class='add'>+		hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_SUPPORTS_TDLS;</div><div class='add'>+</div><div class='ctx'> 		/* ask mac80211 to reserve space for magic */</div><div class='ctx'> 		hw-&gt;vif_data_size = sizeof(struct hwsim_vif_priv);</div><div class='ctx'> 		hw-&gt;sta_data_size = sizeof(struct hwsim_sta_priv);</div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/11n_rxreorder.c b/drivers/net/wireless/mwifiex/11n_rxreorder.c<br/>index 7aa9aa0ac958..681d3f2a4c28 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/11n_rxreorder.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/11n_rxreorder.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/11n_rxreorder.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/11n_rxreorder.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'>  * Since the buffer is linear, the function uses rotation to simulate</div><div class='ctx'>  * circular buffer.</div><div class='ctx'>  */</div><div class='del'>-static int</div><div class='add'>+static void</div><div class='ctx'> mwifiex_11n_dispatch_pkt_until_start_win(struct mwifiex_private *priv,</div><div class='ctx'> 					 struct mwifiex_rx_reorder_tbl</div><div class='ctx'> 					 *rx_reor_tbl_ptr, int start_win)</div><div class='hunk'>@@ -71,8 +71,6 @@ mwifiex_11n_dispatch_pkt_until_start_win(struct mwifiex_private *priv,</div><div class='ctx'> </div><div class='ctx'> 	rx_reor_tbl_ptr-&gt;start_win = start_win;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;rx_pkt_lock, flags);</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'>@@ -83,7 +81,7 @@ mwifiex_11n_dispatch_pkt_until_start_win(struct mwifiex_private *priv,</div><div class='ctx'>  * Since the buffer is linear, the function uses rotation to simulate</div><div class='ctx'>  * circular buffer.</div><div class='ctx'>  */</div><div class='del'>-static int</div><div class='add'>+static void</div><div class='ctx'> mwifiex_11n_scan_and_dispatch(struct mwifiex_private *priv,</div><div class='ctx'> 			      struct mwifiex_rx_reorder_tbl *rx_reor_tbl_ptr)</div><div class='ctx'> {</div><div class='hunk'>@@ -119,7 +117,6 @@ mwifiex_11n_scan_and_dispatch(struct mwifiex_private *priv,</div><div class='ctx'> 	rx_reor_tbl_ptr-&gt;start_win = (rx_reor_tbl_ptr-&gt;start_win + i)</div><div class='ctx'> 		&amp;(MAX_TID_VALUE - 1);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;rx_pkt_lock, flags);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -405,7 +402,7 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv,</div><div class='ctx'> 				u8 *ta, u8 pkt_type, void *payload)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_rx_reorder_tbl *rx_reor_tbl_ptr;</div><div class='del'>-	int start_win, end_win, win_size, ret;</div><div class='add'>+	int start_win, end_win, win_size;</div><div class='ctx'> 	u16 pkt_index;</div><div class='ctx'> </div><div class='ctx'> 	rx_reor_tbl_ptr =</div><div class='hunk'>@@ -452,11 +449,8 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv,</div><div class='ctx'> 			start_win = (end_win - win_size) + 1;</div><div class='ctx'> 		else</div><div class='ctx'> 			start_win = (MAX_TID_VALUE - (win_size - seq_num)) + 1;</div><div class='del'>-		ret = mwifiex_11n_dispatch_pkt_until_start_win(priv,</div><div class='add'>+		mwifiex_11n_dispatch_pkt_until_start_win(priv,</div><div class='ctx'> 						rx_reor_tbl_ptr, start_win);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pkt_type != PKT_TYPE_BAR) {</div><div class='hunk'>@@ -475,9 +469,9 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv,</div><div class='ctx'> 	 * Dispatch all packets sequentially from start_win until a</div><div class='ctx'> 	 * hole is found and adjust the start_win appropriately</div><div class='ctx'> 	 */</div><div class='del'>-	ret = mwifiex_11n_scan_and_dispatch(priv, rx_reor_tbl_ptr);</div><div class='add'>+	mwifiex_11n_scan_and_dispatch(priv, rx_reor_tbl_ptr);</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/wireless/mwifiex/Kconfig b/drivers/net/wireless/mwifiex/Kconfig<br/>index 8f2797aa0c60..2a078cea830a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/Kconfig</a></div><div class='hunk'>@@ -10,12 +10,12 @@ 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 SD8787"</div><div class='add'>+	tristate "Marvell WiFi-Ex Driver for SD8787/SD8797"</div><div class='ctx'> 	depends on MWIFIEX &amp;&amp; MMC</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This adds support for wireless adapters based on Marvell</div><div class='del'>-	  8787 chipset with SDIO interface.</div><div class='add'>+	  8787/8797 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/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c<br/>index 462c71067bfb..c3b6c4652cd6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/cfg80211.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/cfg80211.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/cfg80211.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/cfg80211.c</a></div><div class='hunk'>@@ -24,50 +24,26 @@</div><div class='ctx'>  * This function maps the nl802.11 channel type into driver channel type.</div><div class='ctx'>  *</div><div class='ctx'>  * The mapping is as follows -</div><div class='del'>- *      NL80211_CHAN_NO_HT     -&gt; NO_SEC_CHANNEL</div><div class='del'>- *      NL80211_CHAN_HT20      -&gt; NO_SEC_CHANNEL</div><div class='del'>- *      NL80211_CHAN_HT40PLUS  -&gt; SEC_CHANNEL_ABOVE</div><div class='del'>- *      NL80211_CHAN_HT40MINUS -&gt; SEC_CHANNEL_BELOW</div><div class='del'>- *      Others                 -&gt; NO_SEC_CHANNEL</div><div class='add'>+ *      NL80211_CHAN_NO_HT     -&gt; IEEE80211_HT_PARAM_CHA_SEC_NONE</div><div class='add'>+ *      NL80211_CHAN_HT20      -&gt; IEEE80211_HT_PARAM_CHA_SEC_NONE</div><div class='add'>+ *      NL80211_CHAN_HT40PLUS  -&gt; IEEE80211_HT_PARAM_CHA_SEC_ABOVE</div><div class='add'>+ *      NL80211_CHAN_HT40MINUS -&gt; IEEE80211_HT_PARAM_CHA_SEC_BELOW</div><div class='add'>+ *      Others                 -&gt; IEEE80211_HT_PARAM_CHA_SEC_NONE</div><div class='ctx'>  */</div><div class='del'>-static int</div><div class='del'>-mwifiex_cfg80211_channel_type_to_mwifiex_channels(enum nl80211_channel_type</div><div class='del'>-						  channel_type)</div><div class='add'>+static u8</div><div class='add'>+mwifiex_cfg80211_channel_type_to_sec_chan_offset(enum nl80211_channel_type</div><div class='add'>+						 channel_type)</div><div class='ctx'> {</div><div class='ctx'> 	switch (channel_type) {</div><div class='ctx'> 	case NL80211_CHAN_NO_HT:</div><div class='ctx'> 	case NL80211_CHAN_HT20:</div><div class='del'>-		return NO_SEC_CHANNEL;</div><div class='add'>+		return IEEE80211_HT_PARAM_CHA_SEC_NONE;</div><div class='ctx'> 	case NL80211_CHAN_HT40PLUS:</div><div class='del'>-		return SEC_CHANNEL_ABOVE;</div><div class='add'>+		return IEEE80211_HT_PARAM_CHA_SEC_ABOVE;</div><div class='ctx'> 	case NL80211_CHAN_HT40MINUS:</div><div class='del'>-		return SEC_CHANNEL_BELOW;</div><div class='del'>-	default:</div><div class='del'>-		return NO_SEC_CHANNEL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function maps the driver channel type into nl802.11 channel type.</div><div class='del'>- *</div><div class='del'>- * The mapping is as follows -</div><div class='del'>- *      NO_SEC_CHANNEL      -&gt; NL80211_CHAN_HT20</div><div class='del'>- *      SEC_CHANNEL_ABOVE   -&gt; NL80211_CHAN_HT40PLUS</div><div class='del'>- *      SEC_CHANNEL_BELOW   -&gt; NL80211_CHAN_HT40MINUS</div><div class='del'>- *      Others              -&gt; NL80211_CHAN_HT20</div><div class='del'>- */</div><div class='del'>-static enum nl80211_channel_type</div><div class='del'>-mwifiex_channels_to_cfg80211_channel_type(int channel_type)</div><div class='del'>-{</div><div class='del'>-	switch (channel_type) {</div><div class='del'>-	case NO_SEC_CHANNEL:</div><div class='del'>-		return NL80211_CHAN_HT20;</div><div class='del'>-	case SEC_CHANNEL_ABOVE:</div><div class='del'>-		return NL80211_CHAN_HT40PLUS;</div><div class='del'>-	case SEC_CHANNEL_BELOW:</div><div class='del'>-		return NL80211_CHAN_HT40MINUS;</div><div class='add'>+		return IEEE80211_HT_PARAM_CHA_SEC_BELOW;</div><div class='ctx'> 	default:</div><div class='del'>-		return NL80211_CHAN_HT20;</div><div class='add'>+		return IEEE80211_HT_PARAM_CHA_SEC_NONE;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -120,10 +96,11 @@ mwifiex_cfg80211_del_key(struct wiphy *wiphy, struct net_device *netdev,</div><div class='ctx'> static int</div><div class='ctx'> mwifiex_cfg80211_set_tx_power(struct wiphy *wiphy,</div><div class='ctx'> 			      enum nl80211_tx_power_setting type,</div><div class='del'>-			      int dbm)</div><div class='add'>+			      int mbm)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);</div><div class='ctx'> 	struct mwifiex_power_cfg power_cfg;</div><div class='add'>+	int dbm = MBM_TO_DBM(mbm);</div><div class='ctx'> </div><div class='ctx'> 	if (type == NL80211_TX_POWER_FIXED) {</div><div class='ctx'> 		power_cfg.is_power_auto = 0;</div><div class='hunk'>@@ -330,37 +307,51 @@ mwifiex_set_rf_channel(struct mwifiex_private *priv,</div><div class='ctx'> 		       enum nl80211_channel_type channel_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_chan_freq_power cfp;</div><div class='del'>-	struct mwifiex_ds_band_cfg band_cfg;</div><div class='ctx'> 	u32 config_bands = 0;</div><div class='ctx'> 	struct wiphy *wiphy = priv-&gt;wdev-&gt;wiphy;</div><div class='add'>+	struct mwifiex_adapter *adapter = priv-&gt;adapter;</div><div class='ctx'> </div><div class='ctx'> 	if (chan) {</div><div class='del'>-		memset(&amp;band_cfg, 0, sizeof(band_cfg));</div><div class='ctx'> 		/* Set appropriate bands */</div><div class='del'>-		if (chan-&gt;band == IEEE80211_BAND_2GHZ)</div><div class='del'>-			config_bands = BAND_B | BAND_G | BAND_GN;</div><div class='del'>-		else</div><div class='del'>-			config_bands = BAND_AN | BAND_A;</div><div class='del'>-		if (priv-&gt;bss_mode == NL80211_IFTYPE_STATION</div><div class='del'>-		    || priv-&gt;bss_mode == NL80211_IFTYPE_UNSPECIFIED) {</div><div class='del'>-			band_cfg.config_bands = config_bands;</div><div class='del'>-		} else if (priv-&gt;bss_mode == NL80211_IFTYPE_ADHOC) {</div><div class='del'>-			band_cfg.config_bands = config_bands;</div><div class='del'>-			band_cfg.adhoc_start_band = config_bands;</div><div class='add'>+		if (chan-&gt;band == IEEE80211_BAND_2GHZ) {</div><div class='add'>+			if (channel_type == NL80211_CHAN_NO_HT)</div><div class='add'>+				if (priv-&gt;adapter-&gt;config_bands == BAND_B ||</div><div class='add'>+					  priv-&gt;adapter-&gt;config_bands == BAND_G)</div><div class='add'>+					config_bands =</div><div class='add'>+						priv-&gt;adapter-&gt;config_bands;</div><div class='add'>+				else</div><div class='add'>+					config_bands = BAND_B | BAND_G;</div><div class='add'>+			else</div><div class='add'>+				config_bands = BAND_B | BAND_G | BAND_GN;</div><div class='add'>+		} else {</div><div class='add'>+			if (channel_type == NL80211_CHAN_NO_HT)</div><div class='add'>+				config_bands = BAND_A;</div><div class='add'>+			else</div><div class='add'>+				config_bands = BAND_AN | BAND_A;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		band_cfg.sec_chan_offset =</div><div class='del'>-			mwifiex_cfg80211_channel_type_to_mwifiex_channels</div><div class='add'>+		if (!((config_bands | adapter-&gt;fw_bands) &amp;</div><div class='add'>+						~adapter-&gt;fw_bands)) {</div><div class='add'>+			adapter-&gt;config_bands = config_bands;</div><div class='add'>+			if (priv-&gt;bss_mode == NL80211_IFTYPE_ADHOC) {</div><div class='add'>+				adapter-&gt;adhoc_start_band = config_bands;</div><div class='add'>+				if ((config_bands &amp; BAND_GN) ||</div><div class='add'>+						(config_bands &amp; BAND_AN))</div><div class='add'>+					adapter-&gt;adhoc_11n_enabled = true;</div><div class='add'>+				else</div><div class='add'>+					adapter-&gt;adhoc_11n_enabled = false;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		adapter-&gt;sec_chan_offset =</div><div class='add'>+			mwifiex_cfg80211_channel_type_to_sec_chan_offset</div><div class='ctx'> 			(channel_type);</div><div class='del'>-</div><div class='del'>-		if (mwifiex_set_radio_band_cfg(priv, &amp;band_cfg))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		adapter-&gt;channel_type = channel_type;</div><div class='ctx'> </div><div class='ctx'> 		mwifiex_send_domain_info_cmd_fw(wiphy);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wiphy_dbg(wiphy, "info: setting band %d, channel offset %d and "</div><div class='del'>-		"mode %d\n", config_bands, band_cfg.sec_chan_offset,</div><div class='add'>+		"mode %d\n", config_bands, adapter-&gt;sec_chan_offset,</div><div class='ctx'> 		priv-&gt;bss_mode);</div><div class='ctx'> 	if (!chan)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -696,9 +687,9 @@ static int mwifiex_cfg80211_set_bitrate_mask(struct wiphy *wiphy,</div><div class='ctx'> 				const u8 *peer,</div><div class='ctx'> 				const struct cfg80211_bitrate_mask *mask)</div><div class='ctx'> {</div><div class='del'>-	struct mwifiex_ds_band_cfg band_cfg;</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);</div><div class='ctx'> 	int index = 0, mode = 0, i;</div><div class='add'>+	struct mwifiex_adapter *adapter = priv-&gt;adapter;</div><div class='ctx'> </div><div class='ctx'> 	/* Currently only 2.4GHz is supported */</div><div class='ctx'> 	for (i = 0; i &lt; mwifiex_band_2ghz.n_bitrates; i++) {</div><div class='hunk'>@@ -720,16 +711,15 @@ static int mwifiex_cfg80211_set_bitrate_mask(struct wiphy *wiphy,</div><div class='ctx'> 			mode |=  BAND_B;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(&amp;band_cfg, 0, sizeof(band_cfg));</div><div class='del'>-	band_cfg.config_bands = mode;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;bss_mode == NL80211_IFTYPE_ADHOC)</div><div class='del'>-		band_cfg.adhoc_start_band = mode;</div><div class='del'>-</div><div class='del'>-	band_cfg.sec_chan_offset = NO_SEC_CHANNEL;</div><div class='del'>-</div><div class='del'>-	if (mwifiex_set_radio_band_cfg(priv, &amp;band_cfg))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	if (!((mode | adapter-&gt;fw_bands) &amp; ~adapter-&gt;fw_bands)) {</div><div class='add'>+		adapter-&gt;config_bands = mode;</div><div class='add'>+		if (priv-&gt;bss_mode == NL80211_IFTYPE_ADHOC) {</div><div class='add'>+			adapter-&gt;adhoc_start_band = mode;</div><div class='add'>+			adapter-&gt;adhoc_11n_enabled = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	adapter-&gt;sec_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_NONE;</div><div class='add'>+	adapter-&gt;channel_type = NL80211_CHAN_NO_HT;</div><div class='ctx'> </div><div class='ctx'> 	wiphy_debug(wiphy, "info: device configured in 802.11%s%s mode\n",</div><div class='ctx'> 				(mode &amp; BAND_B) ? "b" : "",</div><div class='hunk'>@@ -750,17 +740,13 @@ mwifiex_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;disconnect)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	priv-&gt;disconnect = 1;</div><div class='ctx'> 	if (mwifiex_deauthenticate(priv, NULL))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	wiphy_dbg(wiphy, "info: successfully disconnected from %pM:"</div><div class='ctx'> 		" reason code %d\n", priv-&gt;cfg_bssid, reason_code);</div><div class='ctx'> </div><div class='del'>-	queue_work(priv-&gt;workqueue, &amp;priv-&gt;cfg_workqueue);</div><div class='add'>+	memset(priv-&gt;cfg_bssid, 0, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -780,6 +766,7 @@ static int mwifiex_cfg80211_inform_ibss_bss(struct mwifiex_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_channel *chan;</div><div class='ctx'> 	struct mwifiex_bss_info bss_info;</div><div class='add'>+	struct cfg80211_bss *bss;</div><div class='ctx'> 	int ie_len;</div><div class='ctx'> 	u8 ie_buf[IEEE80211_MAX_SSID_LEN + sizeof(struct ieee_types_header)];</div><div class='ctx'> 	enum ieee80211_band band;</div><div class='hunk'>@@ -800,9 +787,10 @@ static int mwifiex_cfg80211_inform_ibss_bss(struct mwifiex_private *priv)</div><div class='ctx'> 			ieee80211_channel_to_frequency(bss_info.bss_chan,</div><div class='ctx'> 						       band));</div><div class='ctx'> </div><div class='del'>-	cfg80211_inform_bss(priv-&gt;wdev-&gt;wiphy, chan,</div><div class='add'>+	bss = cfg80211_inform_bss(priv-&gt;wdev-&gt;wiphy, chan,</div><div class='ctx'> 		bss_info.bssid, 0, WLAN_CAPABILITY_IBSS,</div><div class='ctx'> 		0, ie_buf, ie_len, 0, GFP_KERNEL);</div><div class='add'>+	cfg80211_put_bss(bss);</div><div class='ctx'> 	memcpy(priv-&gt;cfg_bssid, bss_info.bssid, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -851,8 +839,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,</div><div class='ctx'> </div><div class='ctx'> 	if (channel)</div><div class='ctx'> 		ret = mwifiex_set_rf_channel(priv, channel,</div><div class='del'>-				mwifiex_channels_to_cfg80211_channel_type</div><div class='del'>-				(priv-&gt;adapter-&gt;chan_offset));</div><div class='add'>+						priv-&gt;adapter-&gt;channel_type);</div><div class='ctx'> </div><div class='ctx'> 	ret = mwifiex_set_encode(priv, NULL, 0, 0, 1);	/* Disable keys */</div><div class='ctx'> </div><div class='hunk'>@@ -978,27 +965,32 @@ mwifiex_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;assoc_request)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='ctx'> 	if (priv-&gt;bss_mode == NL80211_IFTYPE_ADHOC) {</div><div class='ctx'> 		wiphy_err(wiphy, "received infra assoc request "</div><div class='ctx'> 				"when station is in ibss mode\n");</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;assoc_request = -EINPROGRESS;</div><div class='del'>-</div><div class='ctx'> 	wiphy_dbg(wiphy, "info: Trying to associate to %s and bssid %pM\n",</div><div class='ctx'> 	       (char *) sme-&gt;ssid, sme-&gt;bssid);</div><div class='ctx'> </div><div class='ctx'> 	ret = mwifiex_cfg80211_assoc(priv, sme-&gt;ssid_len, sme-&gt;ssid, sme-&gt;bssid,</div><div class='ctx'> 				     priv-&gt;bss_mode, sme-&gt;channel, sme, 0);</div><div class='del'>-</div><div class='del'>-	priv-&gt;assoc_request = 1;</div><div class='ctx'> done:</div><div class='del'>-	priv-&gt;assoc_result = ret;</div><div class='del'>-	queue_work(priv-&gt;workqueue, &amp;priv-&gt;cfg_workqueue);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		cfg80211_connect_result(priv-&gt;netdev, priv-&gt;cfg_bssid, NULL, 0,</div><div class='add'>+					NULL, 0, WLAN_STATUS_SUCCESS,</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+		dev_dbg(priv-&gt;adapter-&gt;dev,</div><div class='add'>+			"info: associated to bssid %pM successfully\n",</div><div class='add'>+			priv-&gt;cfg_bssid);</div><div class='add'>+	} else {</div><div class='add'>+		dev_dbg(priv-&gt;adapter-&gt;dev,</div><div class='add'>+			"info: association to bssid %pM failed\n",</div><div class='add'>+			priv-&gt;cfg_bssid);</div><div class='add'>+		memset(priv-&gt;cfg_bssid, 0, ETH_ALEN);</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'>@@ -1015,28 +1007,29 @@ mwifiex_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;ibss_join_request)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='ctx'> 	if (priv-&gt;bss_mode != NL80211_IFTYPE_ADHOC) {</div><div class='ctx'> 		wiphy_err(wiphy, "request to join ibss received "</div><div class='ctx'> 				"when station is not in ibss mode\n");</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;ibss_join_request = -EINPROGRESS;</div><div class='del'>-</div><div class='ctx'> 	wiphy_dbg(wiphy, "info: trying to join to %s and bssid %pM\n",</div><div class='ctx'> 	       (char *) params-&gt;ssid, params-&gt;bssid);</div><div class='ctx'> </div><div class='ctx'> 	ret = mwifiex_cfg80211_assoc(priv, params-&gt;ssid_len, params-&gt;ssid,</div><div class='ctx'> 				params-&gt;bssid, priv-&gt;bss_mode,</div><div class='ctx'> 				params-&gt;channel, NULL, params-&gt;privacy);</div><div class='del'>-</div><div class='del'>-	priv-&gt;ibss_join_request = 1;</div><div class='ctx'> done:</div><div class='del'>-	priv-&gt;ibss_join_result = ret;</div><div class='del'>-	queue_work(priv-&gt;workqueue, &amp;priv-&gt;cfg_workqueue);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		cfg80211_ibss_joined(priv-&gt;netdev, priv-&gt;cfg_bssid, GFP_KERNEL);</div><div class='add'>+		dev_dbg(priv-&gt;adapter-&gt;dev,</div><div class='add'>+			"info: joined/created adhoc network with bssid"</div><div class='add'>+			" %pM successfully\n", priv-&gt;cfg_bssid);</div><div class='add'>+	} else {</div><div class='add'>+		dev_dbg(priv-&gt;adapter-&gt;dev,</div><div class='add'>+			"info: failed creating/joining adhoc network\n");</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'>@@ -1051,17 +1044,12 @@ mwifiex_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;disconnect)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	priv-&gt;disconnect = 1;</div><div class='del'>-</div><div class='ctx'> 	wiphy_dbg(wiphy, "info: disconnecting from essid %pM\n",</div><div class='ctx'> 			priv-&gt;cfg_bssid);</div><div class='ctx'> 	if (mwifiex_deauthenticate(priv, NULL))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	queue_work(priv-&gt;workqueue, &amp;priv-&gt;cfg_workqueue);</div><div class='add'>+	memset(priv-&gt;cfg_bssid, 0, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1078,15 +1066,42 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 		      struct cfg80211_scan_request *request)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);</div><div class='add'>+	int i;</div><div class='add'>+	struct ieee80211_channel *chan;</div><div class='ctx'> </div><div class='ctx'> 	wiphy_dbg(wiphy, "info: received scan request on %s\n", dev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;scan_request &amp;&amp; priv-&gt;scan_request != request)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='ctx'> 	priv-&gt;scan_request = request;</div><div class='ctx'> </div><div class='del'>-	queue_work(priv-&gt;workqueue, &amp;priv-&gt;cfg_workqueue);</div><div class='add'>+	priv-&gt;user_scan_cfg = kzalloc(sizeof(struct mwifiex_user_scan_cfg),</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;user_scan_cfg) {</div><div class='add'>+		dev_err(priv-&gt;adapter-&gt;dev, "failed to alloc scan_req\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; request-&gt;n_ssids; i++) {</div><div class='add'>+		memcpy(priv-&gt;user_scan_cfg-&gt;ssid_list[i].ssid,</div><div class='add'>+			request-&gt;ssids[i].ssid, request-&gt;ssids[i].ssid_len);</div><div class='add'>+		priv-&gt;user_scan_cfg-&gt;ssid_list[i].max_len =</div><div class='add'>+			request-&gt;ssids[i].ssid_len;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; request-&gt;n_channels; i++) {</div><div class='add'>+		chan = request-&gt;channels[i];</div><div class='add'>+		priv-&gt;user_scan_cfg-&gt;chan_list[i].chan_number = chan-&gt;hw_value;</div><div class='add'>+		priv-&gt;user_scan_cfg-&gt;chan_list[i].radio_type = chan-&gt;band;</div><div class='add'>+</div><div class='add'>+		if (chan-&gt;flags &amp; IEEE80211_CHAN_PASSIVE_SCAN)</div><div class='add'>+			priv-&gt;user_scan_cfg-&gt;chan_list[i].scan_type =</div><div class='add'>+				MWIFIEX_SCAN_TYPE_PASSIVE;</div><div class='add'>+		else</div><div class='add'>+			priv-&gt;user_scan_cfg-&gt;chan_list[i].scan_type =</div><div class='add'>+				MWIFIEX_SCAN_TYPE_ACTIVE;</div><div class='add'>+</div><div class='add'>+		priv-&gt;user_scan_cfg-&gt;chan_list[i].scan_time = 0;</div><div class='add'>+	}</div><div class='add'>+	if (mwifiex_set_user_scan_ioctl(priv, priv-&gt;user_scan_cfg))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1292,10 +1307,6 @@ int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;media_connected = false;</div><div class='ctx'> </div><div class='del'>-	cancel_work_sync(&amp;priv-&gt;cfg_workqueue);</div><div class='del'>-	flush_workqueue(priv-&gt;workqueue);</div><div class='del'>-	destroy_workqueue(priv-&gt;workqueue);</div><div class='del'>-</div><div class='ctx'> 	priv-&gt;bss_mode = NL80211_IFTYPE_UNSPECIFIED;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1373,9 +1384,6 @@ int mwifiex_register_cfg80211(struct mwifiex_private *priv)</div><div class='ctx'> 	memcpy(wdev-&gt;wiphy-&gt;perm_addr, priv-&gt;curr_addr, ETH_ALEN);</div><div class='ctx'> 	wdev-&gt;wiphy-&gt;signal_type = CFG80211_SIGNAL_TYPE_MBM;</div><div class='ctx'> </div><div class='del'>-	/* We are using custom domains */</div><div class='del'>-	wdev-&gt;wiphy-&gt;flags |= WIPHY_FLAG_CUSTOM_REGULATORY;</div><div class='del'>-</div><div class='ctx'> 	/* Reserve space for bss band information */</div><div class='ctx'> 	wdev-&gt;wiphy-&gt;bss_priv_size = sizeof(u8);</div><div class='ctx'> </div><div class='hunk'>@@ -1404,100 +1412,3 @@ int mwifiex_register_cfg80211(struct mwifiex_private *priv)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function handles the result of different pending network operations.</div><div class='del'>- *</div><div class='del'>- * The following operations are handled and CFG802.11 subsystem is</div><div class='del'>- * notified accordingly -</div><div class='del'>- *      - Scan request completion</div><div class='del'>- *      - Association request completion</div><div class='del'>- *      - IBSS join request completion</div><div class='del'>- *      - Disconnect request completion</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-mwifiex_cfg80211_results(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct mwifiex_private *priv =</div><div class='del'>-		container_of(work, struct mwifiex_private, cfg_workqueue);</div><div class='del'>-	struct mwifiex_user_scan_cfg *scan_req;</div><div class='del'>-	int ret = 0, i;</div><div class='del'>-	struct ieee80211_channel *chan;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;scan_request) {</div><div class='del'>-		scan_req = kzalloc(sizeof(struct mwifiex_user_scan_cfg),</div><div class='del'>-				   GFP_KERNEL);</div><div class='del'>-		if (!scan_req) {</div><div class='del'>-			dev_err(priv-&gt;adapter-&gt;dev, "failed to alloc "</div><div class='del'>-						    "scan_req\n");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; i &lt; priv-&gt;scan_request-&gt;n_ssids; i++) {</div><div class='del'>-			memcpy(scan_req-&gt;ssid_list[i].ssid,</div><div class='del'>-					priv-&gt;scan_request-&gt;ssids[i].ssid,</div><div class='del'>-					priv-&gt;scan_request-&gt;ssids[i].ssid_len);</div><div class='del'>-			scan_req-&gt;ssid_list[i].max_len =</div><div class='del'>-					priv-&gt;scan_request-&gt;ssids[i].ssid_len;</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; i &lt; priv-&gt;scan_request-&gt;n_channels; i++) {</div><div class='del'>-			chan = priv-&gt;scan_request-&gt;channels[i];</div><div class='del'>-			scan_req-&gt;chan_list[i].chan_number = chan-&gt;hw_value;</div><div class='del'>-			scan_req-&gt;chan_list[i].radio_type = chan-&gt;band;</div><div class='del'>-			if (chan-&gt;flags &amp; IEEE80211_CHAN_DISABLED)</div><div class='del'>-				scan_req-&gt;chan_list[i].scan_type =</div><div class='del'>-					MWIFIEX_SCAN_TYPE_PASSIVE;</div><div class='del'>-			else</div><div class='del'>-				scan_req-&gt;chan_list[i].scan_type =</div><div class='del'>-					MWIFIEX_SCAN_TYPE_ACTIVE;</div><div class='del'>-			scan_req-&gt;chan_list[i].scan_time = 0;</div><div class='del'>-		}</div><div class='del'>-		if (mwifiex_set_user_scan_ioctl(priv, scan_req))</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-		priv-&gt;scan_result_status = ret;</div><div class='del'>-		dev_dbg(priv-&gt;adapter-&gt;dev, "info: %s: sending scan results\n",</div><div class='del'>-							__func__);</div><div class='del'>-		cfg80211_scan_done(priv-&gt;scan_request,</div><div class='del'>-				(priv-&gt;scan_result_status &lt; 0));</div><div class='del'>-		priv-&gt;scan_request = NULL;</div><div class='del'>-		kfree(scan_req);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;assoc_request == 1) {</div><div class='del'>-		if (!priv-&gt;assoc_result) {</div><div class='del'>-			cfg80211_connect_result(priv-&gt;netdev, priv-&gt;cfg_bssid,</div><div class='del'>-						NULL, 0, NULL, 0,</div><div class='del'>-						WLAN_STATUS_SUCCESS,</div><div class='del'>-						GFP_KERNEL);</div><div class='del'>-			dev_dbg(priv-&gt;adapter-&gt;dev,</div><div class='del'>-				"info: associated to bssid %pM successfully\n",</div><div class='del'>-			       priv-&gt;cfg_bssid);</div><div class='del'>-		} else {</div><div class='del'>-			dev_dbg(priv-&gt;adapter-&gt;dev,</div><div class='del'>-				"info: association to bssid %pM failed\n",</div><div class='del'>-			       priv-&gt;cfg_bssid);</div><div class='del'>-			memset(priv-&gt;cfg_bssid, 0, ETH_ALEN);</div><div class='del'>-		}</div><div class='del'>-		priv-&gt;assoc_request = 0;</div><div class='del'>-		priv-&gt;assoc_result = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;ibss_join_request == 1) {</div><div class='del'>-		if (!priv-&gt;ibss_join_result) {</div><div class='del'>-			cfg80211_ibss_joined(priv-&gt;netdev, priv-&gt;cfg_bssid,</div><div class='del'>-					     GFP_KERNEL);</div><div class='del'>-			dev_dbg(priv-&gt;adapter-&gt;dev,</div><div class='del'>-				"info: joined/created adhoc network with bssid"</div><div class='del'>-					" %pM successfully\n", priv-&gt;cfg_bssid);</div><div class='del'>-		} else {</div><div class='del'>-			dev_dbg(priv-&gt;adapter-&gt;dev,</div><div class='del'>-				"info: failed creating/joining adhoc network\n");</div><div class='del'>-		}</div><div class='del'>-		priv-&gt;ibss_join_request = 0;</div><div class='del'>-		priv-&gt;ibss_join_result = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;disconnect) {</div><div class='del'>-		memset(priv-&gt;cfg_bssid, 0, ETH_ALEN);</div><div class='del'>-		priv-&gt;disconnect = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/cfg80211.h b/drivers/net/wireless/mwifiex/cfg80211.h<br/>index 8d010f2500c5..76c76c60438b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/cfg80211.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/cfg80211.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/cfg80211.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/cfg80211.h</a></div><div class='hunk'>@@ -26,5 +26,4 @@</div><div class='ctx'> </div><div class='ctx'> int mwifiex_register_cfg80211(struct mwifiex_private *);</div><div class='ctx'> </div><div class='del'>-void mwifiex_cfg80211_results(struct work_struct *work);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/cfp.c b/drivers/net/wireless/mwifiex/cfp.c<br/>index f2e6de03805c..1782a77f15dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/cfp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/cfp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/cfp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/cfp.c</a></div><div class='hunk'>@@ -75,18 +75,32 @@ static u8 supported_rates_n[N_SUPPORTED_RATES] = { 0x02, 0x04, 0 };</div><div class='ctx'>  * This function maps an index in supported rates table into</div><div class='ctx'>  * the corresponding data rate.</div><div class='ctx'>  */</div><div class='del'>-u32 mwifiex_index_to_data_rate(u8 index, u8 ht_info)</div><div class='add'>+u32 mwifiex_index_to_data_rate(struct mwifiex_private *priv, u8 index,</div><div class='add'>+							u8 ht_info)</div><div class='ctx'> {</div><div class='del'>-	u16 mcs_rate[4][8] = {</div><div class='del'>-		{0x1b, 0x36, 0x51, 0x6c, 0xa2, 0xd8, 0xf3, 0x10e}</div><div class='del'>-	,			/* LG 40M */</div><div class='del'>-	{0x1e, 0x3c, 0x5a, 0x78, 0xb4, 0xf0, 0x10e, 0x12c}</div><div class='del'>-	,			/* SG 40M */</div><div class='del'>-	{0x0d, 0x1a, 0x27, 0x34, 0x4e, 0x68, 0x75, 0x82}</div><div class='del'>-	,			/* LG 20M */</div><div class='del'>-	{0x0e, 0x1c, 0x2b, 0x39, 0x56, 0x73, 0x82, 0x90}</div><div class='del'>-	};			/* SG 20M */</div><div class='del'>-</div><div class='add'>+	/*</div><div class='add'>+	 * For every mcs_rate line, the first 8 bytes are for stream 1x1,</div><div class='add'>+	 * and all 16 bytes are for stream 2x2.</div><div class='add'>+	 */</div><div class='add'>+	u16  mcs_rate[4][16] = {</div><div class='add'>+		/* LGI 40M */</div><div class='add'>+		{ 0x1b, 0x36, 0x51, 0x6c, 0xa2, 0xd8, 0xf3, 0x10e,</div><div class='add'>+		  0x36, 0x6c, 0xa2, 0xd8, 0x144, 0x1b0, 0x1e6, 0x21c },</div><div class='add'>+</div><div class='add'>+		/* SGI 40M */</div><div class='add'>+		{ 0x1e, 0x3c, 0x5a, 0x78, 0xb4, 0xf0, 0x10e, 0x12c,</div><div class='add'>+		  0x3c, 0x78, 0xb4, 0xf0, 0x168, 0x1e0, 0x21c, 0x258 },</div><div class='add'>+</div><div class='add'>+		/* LGI 20M */</div><div class='add'>+		{ 0x0d, 0x1a, 0x27, 0x34, 0x4e, 0x68, 0x75, 0x82,</div><div class='add'>+		  0x1a, 0x34, 0x4e, 0x68, 0x9c, 0xd0, 0xea, 0x104 },</div><div class='add'>+</div><div class='add'>+		/* SGI 20M */</div><div class='add'>+		{ 0x0e, 0x1c, 0x2b, 0x39, 0x56, 0x73, 0x82, 0x90,</div><div class='add'>+		  0x1c, 0x39, 0x56, 0x73, 0xad, 0xe7, 0x104, 0x120 }</div><div class='add'>+	};</div><div class='add'>+	u32 mcs_num_supp =</div><div class='add'>+		(priv-&gt;adapter-&gt;hw_dev_mcs_support == HT_STREAM_2X2) ? 16 : 8;</div><div class='ctx'> 	u32 rate;</div><div class='ctx'> </div><div class='ctx'> 	if (ht_info &amp; BIT(0)) {</div><div class='hunk'>@@ -95,7 +109,7 @@ u32 mwifiex_index_to_data_rate(u8 index, u8 ht_info)</div><div class='ctx'> 				rate = 0x0D;	/* MCS 32 SGI rate */</div><div class='ctx'> 			else</div><div class='ctx'> 				rate = 0x0C;	/* MCS 32 LGI rate */</div><div class='del'>-		} else if (index &lt; 8) {</div><div class='add'>+		} else if (index &lt; mcs_num_supp) {</div><div class='ctx'> 			if (ht_info &amp; BIT(1)) {</div><div class='ctx'> 				if (ht_info &amp; BIT(2))</div><div class='ctx'> 					/* SGI, 40M */</div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h<br/>index 0cc5d73cb0c1..51c5417c569c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/fw.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/fw.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/fw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/fw.h</a></div><div class='hunk'>@@ -165,6 +165,7 @@ enum MWIFIEX_802_11_WEP_STATUS {</div><div class='ctx'> </div><div class='ctx'> #define GET_RXMCSSUPP(DevMCSSupported) (DevMCSSupported &amp; 0x0f)</div><div class='ctx'> #define SETHT_MCS32(x) (x[4] |= 1)</div><div class='add'>+#define HT_STREAM_2X2	0x22</div><div class='ctx'> </div><div class='ctx'> #define SET_SECONDARYCHAN(RadioType, SECCHAN) (RadioType |= (SECCHAN &lt;&lt; 4))</div><div class='ctx'> </div><div class='hunk'>@@ -375,8 +376,6 @@ enum mwifiex_chan_scan_mode_bitmasks {</div><div class='ctx'> 	MWIFIEX_DISABLE_CHAN_FILT = BIT(1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define SECOND_CHANNEL_BELOW    0x30</div><div class='del'>-#define SECOND_CHANNEL_ABOVE    0x10</div><div class='ctx'> struct mwifiex_chan_scan_param_set {</div><div class='ctx'> 	u8 radio_type;</div><div class='ctx'> 	u8 chan_number;</div><div class='hunk'>@@ -673,7 +672,7 @@ struct host_cmd_ds_802_11_ad_hoc_start {</div><div class='ctx'> 	union ieee_types_phy_param_set phy_param_set;</div><div class='ctx'> 	u16 reserved1;</div><div class='ctx'> 	__le16 cap_info_bitmap;</div><div class='del'>-	u8 DataRate[HOSTCMD_SUPPORTED_RATES];</div><div class='add'>+	u8 data_rate[HOSTCMD_SUPPORTED_RATES];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct host_cmd_ds_802_11_ad_hoc_result {</div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c<br/>index d792b3fb7c16..e05b417a3fae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/init.c</a></div><div class='hunk'>@@ -187,8 +187,6 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	struct mwifiex_opt_sleep_confirm *sleep_cfm_buf = NULL;</div><div class='ctx'> </div><div class='ctx'> 	skb_put(adapter-&gt;sleep_cfm, sizeof(struct mwifiex_opt_sleep_confirm));</div><div class='del'>-	sleep_cfm_buf = (struct mwifiex_opt_sleep_confirm *)</div><div class='del'>-						(adapter-&gt;sleep_cfm-&gt;data);</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;cmd_sent = false;</div><div class='ctx'> </div><div class='hunk'>@@ -248,12 +246,14 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	memset(adapter-&gt;event_body, 0, sizeof(adapter-&gt;event_body));</div><div class='ctx'> 	adapter-&gt;hw_dot_11n_dev_cap = 0;</div><div class='ctx'> 	adapter-&gt;hw_dev_mcs_support = 0;</div><div class='del'>-	adapter-&gt;chan_offset = 0;</div><div class='add'>+	adapter-&gt;sec_chan_offset = 0;</div><div class='ctx'> 	adapter-&gt;adhoc_11n_enabled = false;</div><div class='ctx'> </div><div class='ctx'> 	mwifiex_wmm_init(adapter);</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;sleep_cfm) {</div><div class='add'>+		sleep_cfm_buf = (struct mwifiex_opt_sleep_confirm *)</div><div class='add'>+						adapter-&gt;sleep_cfm-&gt;data;</div><div class='ctx'> 		memset(sleep_cfm_buf, 0, adapter-&gt;sleep_cfm-&gt;len);</div><div class='ctx'> 		sleep_cfm_buf-&gt;command =</div><div class='ctx'> 				cpu_to_le16(HostCmd_CMD_802_11_PS_MODE_ENH);</div><div class='hunk'>@@ -283,6 +283,45 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * This function sets trans_start per tx_queue</div><div class='add'>+ */</div><div class='add'>+void mwifiex_set_trans_start(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;num_tx_queues; i++)</div><div class='add'>+		netdev_get_tx_queue(dev, i)-&gt;trans_start = jiffies;</div><div class='add'>+</div><div class='add'>+	dev-&gt;trans_start = jiffies;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function wakes up all queues in net_device</div><div class='add'>+ */</div><div class='add'>+void mwifiex_wake_up_net_dev_queue(struct net_device *netdev,</div><div class='add'>+					struct mwifiex_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	unsigned long dev_queue_flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;adapter-&gt;queue_lock, dev_queue_flags);</div><div class='add'>+	netif_tx_wake_all_queues(netdev);</div><div class='add'>+	spin_unlock_irqrestore(&amp;adapter-&gt;queue_lock, dev_queue_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function stops all queues in net_device</div><div class='add'>+ */</div><div class='add'>+void mwifiex_stop_net_dev_queue(struct net_device *netdev,</div><div class='add'>+					struct mwifiex_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	unsigned long dev_queue_flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;adapter-&gt;queue_lock, dev_queue_flags);</div><div class='add'>+	netif_tx_stop_all_queues(netdev);</div><div class='add'>+	spin_unlock_irqrestore(&amp;adapter-&gt;queue_lock, dev_queue_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  *  This function releases the lock variables and frees the locks and</div><div class='ctx'>  *  associated locks.</div><div class='ctx'>  */</div><div class='hunk'>@@ -359,6 +398,7 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	spin_lock_init(&amp;adapter-&gt;int_lock);</div><div class='ctx'> 	spin_lock_init(&amp;adapter-&gt;main_proc_lock);</div><div class='ctx'> 	spin_lock_init(&amp;adapter-&gt;mwifiex_cmd_lock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;queue_lock);</div><div class='ctx'> 	for (i = 0; i &lt; adapter-&gt;priv_num; i++) {</div><div class='ctx'> 		if (adapter-&gt;priv[i]) {</div><div class='ctx'> 			priv = adapter-&gt;priv[i];</div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/ioctl.h b/drivers/net/wireless/mwifiex/ioctl.h<br/>index e0b68e7c8ca2..d5d81f1fe41c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/ioctl.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/ioctl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/ioctl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/ioctl.h</a></div><div class='hunk'>@@ -62,17 +62,6 @@ enum {</div><div class='ctx'> 	BAND_AN = 16,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define NO_SEC_CHANNEL               0</div><div class='del'>-#define SEC_CHANNEL_ABOVE            1</div><div class='del'>-#define SEC_CHANNEL_BELOW            3</div><div class='del'>-</div><div class='del'>-struct mwifiex_ds_band_cfg {</div><div class='del'>-	u32 config_bands;</div><div class='del'>-	u32 adhoc_start_band;</div><div class='del'>-	u32 adhoc_channel;</div><div class='del'>-	u32 sec_chan_offset;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum {</div><div class='ctx'> 	ADHOC_IDLE,</div><div class='ctx'> 	ADHOC_STARTED,</div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c<br/>index 62b4c2938608..0b0eb5efba9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/join.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/join.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/join.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/join.c</a></div><div class='hunk'>@@ -724,8 +724,8 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,</div><div class='ctx'> 	u32 cmd_append_size = 0;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> 	u16 tmp_cap;</div><div class='del'>-	uint16_t ht_cap_info;</div><div class='ctx'> 	struct mwifiex_ie_types_chan_list_param_set *chan_tlv;</div><div class='add'>+	u8 radio_type;</div><div class='ctx'> </div><div class='ctx'> 	struct mwifiex_ie_types_htcap *ht_cap;</div><div class='ctx'> 	struct mwifiex_ie_types_htinfo *ht_info;</div><div class='hunk'>@@ -837,8 +837,8 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,</div><div class='ctx'> 		bss_desc-&gt;privacy = MWIFIEX_802_11_PRIV_FILTER_ACCEPT_ALL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(adhoc_start-&gt;DataRate, 0, sizeof(adhoc_start-&gt;DataRate));</div><div class='del'>-	mwifiex_get_active_data_rates(priv, adhoc_start-&gt;DataRate);</div><div class='add'>+	memset(adhoc_start-&gt;data_rate, 0, sizeof(adhoc_start-&gt;data_rate));</div><div class='add'>+	mwifiex_get_active_data_rates(priv, adhoc_start-&gt;data_rate);</div><div class='ctx'> 	if ((adapter-&gt;adhoc_start_band &amp; BAND_G) &amp;&amp;</div><div class='ctx'> 	    (priv-&gt;curr_pkt_filter &amp; HostCmd_ACT_MAC_ADHOC_G_PROTECTION_ON)) {</div><div class='ctx'> 		if (mwifiex_send_cmd_async(priv, HostCmd_CMD_MAC_CONTROL,</div><div class='hunk'>@@ -850,20 +850,19 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Find the last non zero */</div><div class='del'>-	for (i = 0; i &lt; sizeof(adhoc_start-&gt;DataRate) &amp;&amp;</div><div class='del'>-			adhoc_start-&gt;DataRate[i];</div><div class='del'>-			i++)</div><div class='del'>-			;</div><div class='add'>+	for (i = 0; i &lt; sizeof(adhoc_start-&gt;data_rate); i++)</div><div class='add'>+		if (!adhoc_start-&gt;data_rate[i])</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;curr_bss_params.num_of_rates = i;</div><div class='ctx'> </div><div class='ctx'> 	/* Copy the ad-hoc creating rates into Current BSS rate structure */</div><div class='ctx'> 	memcpy(&amp;priv-&gt;curr_bss_params.data_rates,</div><div class='del'>-	       &amp;adhoc_start-&gt;DataRate, priv-&gt;curr_bss_params.num_of_rates);</div><div class='add'>+	       &amp;adhoc_start-&gt;data_rate, priv-&gt;curr_bss_params.num_of_rates);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(adapter-&gt;dev, "info: ADHOC_S_CMD: rates=%02x %02x %02x %02x\n",</div><div class='del'>-	       adhoc_start-&gt;DataRate[0], adhoc_start-&gt;DataRate[1],</div><div class='del'>-	       adhoc_start-&gt;DataRate[2], adhoc_start-&gt;DataRate[3]);</div><div class='add'>+	       adhoc_start-&gt;data_rate[0], adhoc_start-&gt;data_rate[1],</div><div class='add'>+	       adhoc_start-&gt;data_rate[2], adhoc_start-&gt;data_rate[3]);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(adapter-&gt;dev, "info: ADHOC_S_CMD: AD-HOC Start command is ready\n");</div><div class='ctx'> </div><div class='hunk'>@@ -886,12 +885,14 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,</div><div class='ctx'> 		       = mwifiex_band_to_radio_type(priv-&gt;curr_bss_params.band);</div><div class='ctx'> 		if (adapter-&gt;adhoc_start_band &amp; BAND_GN</div><div class='ctx'> 		    || adapter-&gt;adhoc_start_band &amp; BAND_AN) {</div><div class='del'>-			if (adapter-&gt;chan_offset == SEC_CHANNEL_ABOVE)</div><div class='add'>+			if (adapter-&gt;sec_chan_offset ==</div><div class='add'>+					    IEEE80211_HT_PARAM_CHA_SEC_ABOVE)</div><div class='ctx'> 				chan_tlv-&gt;chan_scan_param[0].radio_type |=</div><div class='del'>-					SECOND_CHANNEL_ABOVE;</div><div class='del'>-			else if (adapter-&gt;chan_offset == SEC_CHANNEL_BELOW)</div><div class='add'>+					(IEEE80211_HT_PARAM_CHA_SEC_ABOVE &lt;&lt; 4);</div><div class='add'>+			else if (adapter-&gt;sec_chan_offset ==</div><div class='add'>+					    IEEE80211_HT_PARAM_CHA_SEC_ABOVE)</div><div class='ctx'> 				chan_tlv-&gt;chan_scan_param[0].radio_type |=</div><div class='del'>-					SECOND_CHANNEL_BELOW;</div><div class='add'>+					(IEEE80211_HT_PARAM_CHA_SEC_BELOW &lt;&lt; 4);</div><div class='ctx'> 		}</div><div class='ctx'> 		dev_dbg(adapter-&gt;dev, "info: ADHOC_S_CMD: TLV Band = %d\n",</div><div class='ctx'> 		       chan_tlv-&gt;chan_scan_param[0].radio_type);</div><div class='hunk'>@@ -914,55 +915,40 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;adhoc_11n_enabled) {</div><div class='del'>-		{</div><div class='del'>-			ht_cap = (struct mwifiex_ie_types_htcap *) pos;</div><div class='del'>-			memset(ht_cap, 0,</div><div class='del'>-			       sizeof(struct mwifiex_ie_types_htcap));</div><div class='del'>-			ht_cap-&gt;header.type =</div><div class='del'>-				cpu_to_le16(WLAN_EID_HT_CAPABILITY);</div><div class='del'>-			ht_cap-&gt;header.len =</div><div class='del'>-			       cpu_to_le16(sizeof(struct ieee80211_ht_cap));</div><div class='del'>-			ht_cap_info = le16_to_cpu(ht_cap-&gt;ht_cap.cap_info);</div><div class='del'>-</div><div class='del'>-			ht_cap_info |= IEEE80211_HT_CAP_SGI_20;</div><div class='del'>-			if (adapter-&gt;chan_offset) {</div><div class='del'>-				ht_cap_info |= IEEE80211_HT_CAP_SGI_40;</div><div class='del'>-				ht_cap_info |= IEEE80211_HT_CAP_DSSSCCK40;</div><div class='del'>-				ht_cap_info |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;</div><div class='del'>-				SETHT_MCS32(ht_cap-&gt;ht_cap.mcs.rx_mask);</div><div class='del'>-			}</div><div class='add'>+		/* Fill HT CAPABILITY */</div><div class='add'>+		ht_cap = (struct mwifiex_ie_types_htcap *) pos;</div><div class='add'>+		memset(ht_cap, 0, sizeof(struct mwifiex_ie_types_htcap));</div><div class='add'>+		ht_cap-&gt;header.type = cpu_to_le16(WLAN_EID_HT_CAPABILITY);</div><div class='add'>+		ht_cap-&gt;header.len =</div><div class='add'>+		       cpu_to_le16(sizeof(struct ieee80211_ht_cap));</div><div class='add'>+		radio_type = mwifiex_band_to_radio_type(</div><div class='add'>+					priv-&gt;adapter-&gt;config_bands);</div><div class='add'>+		mwifiex_fill_cap_info(priv, radio_type, ht_cap);</div><div class='add'>+</div><div class='add'>+		pos += sizeof(struct mwifiex_ie_types_htcap);</div><div class='add'>+		cmd_append_size +=</div><div class='add'>+			sizeof(struct mwifiex_ie_types_htcap);</div><div class='ctx'> </div><div class='del'>-			ht_cap-&gt;ht_cap.ampdu_params_info</div><div class='del'>-					= IEEE80211_HT_MAX_AMPDU_64K;</div><div class='del'>-			ht_cap-&gt;ht_cap.mcs.rx_mask[0] = 0xff;</div><div class='del'>-			pos += sizeof(struct mwifiex_ie_types_htcap);</div><div class='del'>-			cmd_append_size +=</div><div class='del'>-				sizeof(struct mwifiex_ie_types_htcap);</div><div class='del'>-		}</div><div class='del'>-		{</div><div class='del'>-			ht_info = (struct mwifiex_ie_types_htinfo *) pos;</div><div class='del'>-			memset(ht_info, 0,</div><div class='del'>-			       sizeof(struct mwifiex_ie_types_htinfo));</div><div class='del'>-			ht_info-&gt;header.type =</div><div class='del'>-				cpu_to_le16(WLAN_EID_HT_INFORMATION);</div><div class='del'>-			ht_info-&gt;header.len =</div><div class='del'>-				cpu_to_le16(sizeof(struct ieee80211_ht_info));</div><div class='del'>-			ht_info-&gt;ht_info.control_chan =</div><div class='del'>-				(u8) priv-&gt;curr_bss_params.bss_descriptor.</div><div class='del'>-				channel;</div><div class='del'>-			if (adapter-&gt;chan_offset) {</div><div class='del'>-				ht_info-&gt;ht_info.ht_param =</div><div class='del'>-					adapter-&gt;chan_offset;</div><div class='del'>-				ht_info-&gt;ht_info.ht_param |=</div><div class='add'>+		/* Fill HT INFORMATION */</div><div class='add'>+		ht_info = (struct mwifiex_ie_types_htinfo *) pos;</div><div class='add'>+		memset(ht_info, 0, sizeof(struct mwifiex_ie_types_htinfo));</div><div class='add'>+		ht_info-&gt;header.type = cpu_to_le16(WLAN_EID_HT_INFORMATION);</div><div class='add'>+		ht_info-&gt;header.len =</div><div class='add'>+			cpu_to_le16(sizeof(struct ieee80211_ht_info));</div><div class='add'>+</div><div class='add'>+		ht_info-&gt;ht_info.control_chan =</div><div class='add'>+			(u8) priv-&gt;curr_bss_params.bss_descriptor.channel;</div><div class='add'>+		if (adapter-&gt;sec_chan_offset) {</div><div class='add'>+			ht_info-&gt;ht_info.ht_param = adapter-&gt;sec_chan_offset;</div><div class='add'>+			ht_info-&gt;ht_info.ht_param |=</div><div class='ctx'> 					IEEE80211_HT_PARAM_CHAN_WIDTH_ANY;</div><div class='del'>-			}</div><div class='del'>-			ht_info-&gt;ht_info.operation_mode =</div><div class='del'>-			     cpu_to_le16(IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);</div><div class='del'>-			ht_info-&gt;ht_info.basic_set[0] = 0xff;</div><div class='del'>-			pos += sizeof(struct mwifiex_ie_types_htinfo);</div><div class='del'>-			cmd_append_size +=</div><div class='del'>-				sizeof(struct mwifiex_ie_types_htinfo);</div><div class='ctx'> 		}</div><div class='add'>+		ht_info-&gt;ht_info.operation_mode =</div><div class='add'>+		     cpu_to_le16(IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);</div><div class='add'>+		ht_info-&gt;ht_info.basic_set[0] = 0xff;</div><div class='add'>+		pos += sizeof(struct mwifiex_ie_types_htinfo);</div><div class='add'>+		cmd_append_size +=</div><div class='add'>+			sizeof(struct mwifiex_ie_types_htinfo);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;size = cpu_to_le16((u16)</div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c<br/>index 67e6db7d672d..84be196188cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/main.c</a></div><div class='hunk'>@@ -401,7 +401,7 @@ mwifiex_fill_buffer(struct sk_buff *skb)</div><div class='ctx'> static int</div><div class='ctx'> mwifiex_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	netif_start_queue(dev);</div><div class='add'>+	netif_tx_start_all_queues(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -465,8 +465,8 @@ mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	atomic_inc(&amp;priv-&gt;adapter-&gt;tx_pending);</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;priv-&gt;adapter-&gt;tx_pending) &gt;= MAX_TX_PENDING) {</div><div class='del'>-		netif_stop_queue(priv-&gt;netdev);</div><div class='del'>-		dev-&gt;trans_start = jiffies;</div><div class='add'>+		mwifiex_set_trans_start(dev);</div><div class='add'>+		mwifiex_stop_net_dev_queue(priv-&gt;netdev, priv-&gt;adapter);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	queue_work(priv-&gt;adapter-&gt;workqueue, &amp;priv-&gt;adapter-&gt;main_work);</div><div class='hunk'>@@ -533,7 +533,7 @@ mwifiex_tx_timeout(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	dev_err(priv-&gt;adapter-&gt;dev, "%lu : Tx timeout, bss_index=%d\n",</div><div class='ctx'> 				jiffies, priv-&gt;bss_index);</div><div class='del'>-	dev-&gt;trans_start = jiffies;</div><div class='add'>+	mwifiex_set_trans_start(dev);</div><div class='ctx'> 	priv-&gt;num_tx_timeout++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -586,8 +586,6 @@ void mwifiex_init_priv_params(struct mwifiex_private *priv,</div><div class='ctx'> 	priv-&gt;media_connected = false;</div><div class='ctx'> 	memset(&amp;priv-&gt;nick_name, 0, sizeof(priv-&gt;nick_name));</div><div class='ctx'> 	priv-&gt;num_tx_timeout = 0;</div><div class='del'>-	priv-&gt;workqueue = create_singlethread_workqueue("cfg80211_wq");</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;cfg_workqueue, mwifiex_cfg80211_results);</div><div class='ctx'> 	memcpy(dev-&gt;dev_addr, priv-&gt;curr_addr, ETH_ALEN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -793,7 +791,8 @@ int mwifiex_remove_card(struct mwifiex_adapter *adapter, struct semaphore *sem)</div><div class='ctx'> 		priv = adapter-&gt;priv[i];</div><div class='ctx'> 		if (priv &amp;&amp; priv-&gt;netdev) {</div><div class='ctx'> 			if (!netif_queue_stopped(priv-&gt;netdev))</div><div class='del'>-				netif_stop_queue(priv-&gt;netdev);</div><div class='add'>+				mwifiex_stop_net_dev_queue(priv-&gt;netdev,</div><div class='add'>+								adapter);</div><div class='ctx'> 			if (netif_carrier_ok(priv-&gt;netdev))</div><div class='ctx'> 				netif_carrier_off(priv-&gt;netdev);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h<br/>index 30f138b6fa4c..3186aa437f42 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/main.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/main.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/main.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/main.h</a></div><div class='hunk'>@@ -453,15 +453,8 @@ struct mwifiex_private {</div><div class='ctx'> 	u8 scan_pending_on_block;</div><div class='ctx'> 	u8 report_scan_result;</div><div class='ctx'> 	struct cfg80211_scan_request *scan_request;</div><div class='del'>-	int scan_result_status;</div><div class='del'>-	int assoc_request;</div><div class='del'>-	u16 assoc_result;</div><div class='del'>-	int ibss_join_request;</div><div class='del'>-	u16 ibss_join_result;</div><div class='del'>-	bool disconnect;</div><div class='add'>+	struct mwifiex_user_scan_cfg *user_scan_cfg;</div><div class='ctx'> 	u8 cfg_bssid[6];</div><div class='del'>-	struct workqueue_struct *workqueue;</div><div class='del'>-	struct work_struct cfg_workqueue;</div><div class='ctx'> 	u8 country_code[IEEE80211_COUNTRY_STRING_LEN];</div><div class='ctx'> 	struct wps wps;</div><div class='ctx'> 	u8 scan_block;</div><div class='hunk'>@@ -647,7 +640,8 @@ struct mwifiex_adapter {</div><div class='ctx'> 	u32 hw_dot_11n_dev_cap;</div><div class='ctx'> 	u8 hw_dev_mcs_support;</div><div class='ctx'> 	u8 adhoc_11n_enabled;</div><div class='del'>-	u8 chan_offset;</div><div class='add'>+	u8 sec_chan_offset;</div><div class='add'>+	enum nl80211_channel_type channel_type;</div><div class='ctx'> 	struct mwifiex_dbg dbg;</div><div class='ctx'> 	u8 arp_filter[ARP_FILTER_MAX_BUF_SIZE];</div><div class='ctx'> 	u32 arp_filter_size;</div><div class='hunk'>@@ -655,10 +649,19 @@ struct mwifiex_adapter {</div><div class='ctx'> 	struct mwifiex_wait_queue cmd_wait_q;</div><div class='ctx'> 	u8 scan_wait_q_woken;</div><div class='ctx'> 	struct cmd_ctrl_node *cmd_queued;</div><div class='add'>+	spinlock_t queue_lock;		/* lock for tx queues */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int mwifiex_init_lock_list(struct mwifiex_adapter *adapter);</div><div class='ctx'> </div><div class='add'>+void mwifiex_set_trans_start(struct net_device *dev);</div><div class='add'>+</div><div class='add'>+void mwifiex_stop_net_dev_queue(struct net_device *netdev,</div><div class='add'>+		struct mwifiex_adapter *adapter);</div><div class='add'>+</div><div class='add'>+void mwifiex_wake_up_net_dev_queue(struct net_device *netdev,</div><div class='add'>+		struct mwifiex_adapter *adapter);</div><div class='add'>+</div><div class='ctx'> int mwifiex_init_fw(struct mwifiex_adapter *adapter);</div><div class='ctx'> </div><div class='ctx'> int mwifiex_init_fw_complete(struct mwifiex_adapter *adapter);</div><div class='hunk'>@@ -775,7 +778,8 @@ struct mwifiex_chan_freq_power *</div><div class='ctx'> struct mwifiex_chan_freq_power *mwifiex_get_cfp_by_band_and_freq_from_cfg80211(</div><div class='ctx'> 						struct mwifiex_private *priv,</div><div class='ctx'> 						u8 band, u32 freq);</div><div class='del'>-u32 mwifiex_index_to_data_rate(u8 index, u8 ht_info);</div><div class='add'>+u32 mwifiex_index_to_data_rate(struct mwifiex_private *priv, u8 index,</div><div class='add'>+							u8 ht_info);</div><div class='ctx'> u32 mwifiex_find_freq_from_band_chan(u8, u8);</div><div class='ctx'> int mwifiex_cmd_append_vsie_tlv(struct mwifiex_private *priv, u16 vsie_mask,</div><div class='ctx'> 				u8 **buffer);</div><div class='hunk'>@@ -951,8 +955,6 @@ int mwifiex_main_process(struct mwifiex_adapter *);</div><div class='ctx'> </div><div class='ctx'> int mwifiex_bss_set_channel(struct mwifiex_private *,</div><div class='ctx'> 			    struct mwifiex_chan_freq_power *cfp);</div><div class='del'>-int mwifiex_set_radio_band_cfg(struct mwifiex_private *,</div><div class='del'>-			 struct mwifiex_ds_band_cfg *);</div><div class='ctx'> int mwifiex_get_bss_info(struct mwifiex_private *,</div><div class='ctx'> 			 struct mwifiex_bss_info *);</div><div class='ctx'> int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv,</div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c<br/>index d34acf082d3a..405350940a45 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/pcie.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/pcie.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/pcie.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/pcie.c</a></div><div class='hunk'>@@ -386,8 +386,7 @@ static int mwifiex_pcie_create_txbd_ring(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	card-&gt;txbd_ring_vbase = kzalloc(card-&gt;txbd_ring_size, GFP_KERNEL);</div><div class='ctx'> 	if (!card-&gt;txbd_ring_vbase) {</div><div class='ctx'> 		dev_err(adapter-&gt;dev, "Unable to allocate buffer for txbd ring.\n");</div><div class='del'>-		kfree(card-&gt;txbd_ring_vbase);</div><div class='del'>-		return -1;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	card-&gt;txbd_ring_pbase = virt_to_phys(card-&gt;txbd_ring_vbase);</div><div class='ctx'> </div><div class='hunk'>@@ -477,7 +476,7 @@ static int mwifiex_pcie_create_rxbd_ring(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	if (!card-&gt;rxbd_ring_vbase) {</div><div class='ctx'> 		dev_err(adapter-&gt;dev, "Unable to allocate buffer for "</div><div class='ctx'> 				"rxbd_ring.\n");</div><div class='del'>-		return -1;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	card-&gt;rxbd_ring_pbase = virt_to_phys(card-&gt;rxbd_ring_vbase);</div><div class='ctx'> </div><div class='hunk'>@@ -570,7 +569,7 @@ static int mwifiex_pcie_create_evtbd_ring(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	if (!card-&gt;evtbd_ring_vbase) {</div><div class='ctx'> 		dev_err(adapter-&gt;dev, "Unable to allocate buffer. "</div><div class='ctx'> 				"Terminating download\n");</div><div class='del'>-		return -1;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	card-&gt;evtbd_ring_pbase = virt_to_phys(card-&gt;evtbd_ring_vbase);</div><div class='ctx'> </div><div class='hunk'>@@ -1229,15 +1228,16 @@ static int mwifiex_pcie_event_complete(struct mwifiex_adapter *adapter,</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (rdptr &gt;= MWIFIEX_MAX_EVT_BD)</div><div class='add'>+	if (rdptr &gt;= MWIFIEX_MAX_EVT_BD) {</div><div class='ctx'> 		dev_err(adapter-&gt;dev, "event_complete: Invalid rdptr 0x%x\n",</div><div class='ctx'> 					rdptr);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Read the event ring write pointer set by firmware */</div><div class='ctx'> 	if (mwifiex_read_reg(adapter, REG_EVTBD_WRPTR, &amp;wrptr)) {</div><div class='ctx'> 		dev_err(adapter-&gt;dev, "event_complete: failed to read REG_EVTBD_WRPTR\n");</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto done;</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!card-&gt;evt_buf_list[rdptr]) {</div><div class='hunk'>@@ -1266,15 +1266,9 @@ static int mwifiex_pcie_event_complete(struct mwifiex_adapter *adapter,</div><div class='ctx'> 	/* Write the event ring read pointer in to REG_EVTBD_RDPTR */</div><div class='ctx'> 	if (mwifiex_write_reg(adapter, REG_EVTBD_RDPTR, card-&gt;evtbd_rdptr)) {</div><div class='ctx'> 		dev_err(adapter-&gt;dev, "event_complete: failed to read REG_EVTBD_RDPTR\n");</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto done;</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-done:</div><div class='del'>-	/* Free the buffer for failure case */</div><div class='del'>-	if (ret &amp;&amp; skb)</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-</div><div class='ctx'> 	dev_dbg(adapter-&gt;dev, "info: Check Events Again\n");</div><div class='ctx'> 	ret = mwifiex_pcie_process_event_ready(adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -1672,9 +1666,8 @@ static int mwifiex_pcie_host_to_card(struct mwifiex_adapter *adapter, u8 type,</div><div class='ctx'> 				     struct sk_buff *skb,</div><div class='ctx'> 				     struct mwifiex_tx_param *tx_param)</div><div class='ctx'> {</div><div class='del'>-	if (!adapter || !skb) {</div><div class='del'>-		dev_err(adapter-&gt;dev, "Invalid parameter in %s &lt;%p, %p&gt;\n",</div><div class='del'>-				__func__, adapter, skb);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		dev_err(adapter-&gt;dev, "Passed NULL skb to %s\n", __func__);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c<br/>index 8d3ab378662b..6396d3318ead 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/scan.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/scan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/scan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/scan.c</a></div><div class='hunk'>@@ -500,7 +500,6 @@ mwifiex_scan_create_channel_list(struct mwifiex_private *priv,</div><div class='ctx'> 	struct ieee80211_channel *ch;</div><div class='ctx'> 	struct mwifiex_adapter *adapter = priv-&gt;adapter;</div><div class='ctx'> 	int chan_idx = 0, i;</div><div class='del'>-	u8 scan_type;</div><div class='ctx'> </div><div class='ctx'> 	for (band = 0; (band &lt; IEEE80211_NUM_BANDS) ; band++) {</div><div class='ctx'> </div><div class='hunk'>@@ -514,19 +513,20 @@ mwifiex_scan_create_channel_list(struct mwifiex_private *priv,</div><div class='ctx'> 			if (ch-&gt;flags &amp; IEEE80211_CHAN_DISABLED)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			scan_chan_list[chan_idx].radio_type = band;</div><div class='del'>-			scan_type = ch-&gt;flags &amp; IEEE80211_CHAN_PASSIVE_SCAN;</div><div class='add'>+</div><div class='ctx'> 			if (user_scan_in &amp;&amp;</div><div class='ctx'> 				user_scan_in-&gt;chan_list[0].scan_time)</div><div class='ctx'> 				scan_chan_list[chan_idx].max_scan_time =</div><div class='ctx'> 					cpu_to_le16((u16) user_scan_in-&gt;</div><div class='ctx'> 					chan_list[0].scan_time);</div><div class='del'>-			else if (scan_type == MWIFIEX_SCAN_TYPE_PASSIVE)</div><div class='add'>+			else if (ch-&gt;flags &amp; IEEE80211_CHAN_PASSIVE_SCAN)</div><div class='ctx'> 				scan_chan_list[chan_idx].max_scan_time =</div><div class='ctx'> 					cpu_to_le16(adapter-&gt;passive_scan_time);</div><div class='ctx'> 			else</div><div class='ctx'> 				scan_chan_list[chan_idx].max_scan_time =</div><div class='ctx'> 					cpu_to_le16(adapter-&gt;active_scan_time);</div><div class='del'>-			if (scan_type == MWIFIEX_SCAN_TYPE_PASSIVE)</div><div class='add'>+</div><div class='add'>+			if (ch-&gt;flags &amp; IEEE80211_CHAN_PASSIVE_SCAN)</div><div class='ctx'> 				scan_chan_list[chan_idx].chan_scan_mode_bitmap</div><div class='ctx'> 					|= MWIFIEX_PASSIVE_SCAN;</div><div class='ctx'> 			else</div><div class='hunk'>@@ -1391,11 +1391,8 @@ int mwifiex_set_user_scan_ioctl(struct mwifiex_private *priv,</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;adapter-&gt;scan_wait_q_woken = false;</div><div class='del'>-</div><div class='ctx'> 	status = mwifiex_scan_networks(priv, scan_req);</div><div class='del'>-	if (!status)</div><div class='del'>-		status = mwifiex_wait_queue_complete(priv-&gt;adapter);</div><div class='add'>+	queue_work(priv-&gt;adapter-&gt;workqueue, &amp;priv-&gt;adapter-&gt;main_work);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -1537,11 +1534,6 @@ done:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mwifiex_free_bss_priv(struct cfg80211_bss *bss)</div><div class='del'>-{</div><div class='del'>-	kfree(bss-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * This function handles the command response of scan.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1767,7 +1759,7 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,</div><div class='ctx'> 					      cap_info_bitmap, beacon_period,</div><div class='ctx'> 					      ie_buf, ie_len, rssi, GFP_KERNEL);</div><div class='ctx'> 				*(u8 *)bss-&gt;priv = band;</div><div class='del'>-				bss-&gt;free_priv = mwifiex_free_bss_priv;</div><div class='add'>+				cfg80211_put_bss(bss);</div><div class='ctx'> </div><div class='ctx'> 				if (priv-&gt;media_connected &amp;&amp; !memcmp(bssid,</div><div class='ctx'> 					priv-&gt;curr_bss_params.bss_descriptor</div><div class='hunk'>@@ -1801,6 +1793,14 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,</div><div class='ctx'> 			up(&amp;priv-&gt;async_sem);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (priv-&gt;user_scan_cfg) {</div><div class='add'>+			dev_dbg(priv-&gt;adapter-&gt;dev, "info: %s: sending scan "</div><div class='add'>+							"results\n", __func__);</div><div class='add'>+			cfg80211_scan_done(priv-&gt;scan_request, 0);</div><div class='add'>+			priv-&gt;scan_request = NULL;</div><div class='add'>+			kfree(priv-&gt;user_scan_cfg);</div><div class='add'>+			priv-&gt;user_scan_cfg = NULL;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Get scan command from scan_pending_q and put to</div><div class='ctx'> 		   cmd_pending_q */</div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c<br/>index 283171bbcedf..d39d8457f252 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/sdio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/sdio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/sdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/sdio.c</a></div><div class='hunk'>@@ -256,10 +256,13 @@ static int mwifiex_sdio_resume(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> /* Device ID for SD8787 */</div><div class='ctx'> #define SDIO_DEVICE_ID_MARVELL_8787   (0x9119)</div><div class='add'>+/* Device ID for SD8797 */</div><div class='add'>+#define SDIO_DEVICE_ID_MARVELL_8797   (0x9129)</div><div class='ctx'> </div><div class='ctx'> /* WLAN IDs */</div><div class='ctx'> static const struct sdio_device_id mwifiex_ids[] = {</div><div class='ctx'> 	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787)},</div><div class='add'>+	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797)},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1084,7 +1087,7 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,</div><div class='ctx'> 					   (adapter-&gt;ioport | 0x1000 |</div><div class='ctx'> 					    (card-&gt;mpa_rx.ports &lt;&lt; 4)) +</div><div class='ctx'> 					   card-&gt;mpa_rx.start_port, 1))</div><div class='del'>-			return -1;</div><div class='add'>+			goto error;</div><div class='ctx'> </div><div class='ctx'> 		curr_ptr = card-&gt;mpa_rx.buf;</div><div class='ctx'> </div><div class='hunk'>@@ -1127,12 +1130,29 @@ rx_curr_single:</div><div class='ctx'> 		if (mwifiex_sdio_card_to_host(adapter, &amp;pkt_type,</div><div class='ctx'> 					      skb-&gt;data, skb-&gt;len,</div><div class='ctx'> 					      adapter-&gt;ioport + port))</div><div class='del'>-			return -1;</div><div class='add'>+			goto error;</div><div class='ctx'> </div><div class='ctx'> 		mwifiex_decode_rx_packet(adapter, skb, pkt_type);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	if (MP_RX_AGGR_IN_PROGRESS(card)) {</div><div class='add'>+		/* Multiport-aggregation transfer failed - cleanup */</div><div class='add'>+		for (pind = 0; pind &lt; card-&gt;mpa_rx.pkt_cnt; pind++) {</div><div class='add'>+			/* copy pkt to deaggr buf */</div><div class='add'>+			skb_deaggr = card-&gt;mpa_rx.skb_arr[pind];</div><div class='add'>+			dev_kfree_skb_any(skb_deaggr);</div><div class='add'>+		}</div><div class='add'>+		MP_RX_AGGR_BUF_RESET(card);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (f_do_rx_cur)</div><div class='add'>+		/* Single transfer pending. Free curr buff also */</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1268,7 +1288,6 @@ static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 				dev_dbg(adapter-&gt;dev,</div><div class='ctx'> 						"info: CFG reg val =%x\n", cr);</div><div class='del'>-				dev_kfree_skb_any(skb);</div><div class='ctx'> 				return -1;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1573,7 +1592,16 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	sdio_set_drvdata(func, card);</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;dev = &amp;func-&gt;dev;</div><div class='del'>-	strcpy(adapter-&gt;fw_name, SD8787_DEFAULT_FW_NAME);</div><div class='add'>+</div><div class='add'>+	switch (func-&gt;device) {</div><div class='add'>+	case SDIO_DEVICE_ID_MARVELL_8797:</div><div class='add'>+		strcpy(adapter-&gt;fw_name, SD8797_DEFAULT_FW_NAME);</div><div class='add'>+		break;</div><div class='add'>+	case SDIO_DEVICE_ID_MARVELL_8787:</div><div class='add'>+	default:</div><div class='add'>+		strcpy(adapter-&gt;fw_name, SD8787_DEFAULT_FW_NAME);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1630,14 +1658,14 @@ static int mwifiex_init_sdio(struct mwifiex_adapter *adapter)</div><div class='ctx'> 	card-&gt;mpa_tx.pkt_cnt = 0;</div><div class='ctx'> 	card-&gt;mpa_tx.start_port = 0;</div><div class='ctx'> </div><div class='del'>-	card-&gt;mpa_tx.enabled = 0;</div><div class='add'>+	card-&gt;mpa_tx.enabled = 1;</div><div class='ctx'> 	card-&gt;mpa_tx.pkt_aggr_limit = SDIO_MP_AGGR_DEF_PKT_LIMIT;</div><div class='ctx'> </div><div class='ctx'> 	card-&gt;mpa_rx.buf_len = 0;</div><div class='ctx'> 	card-&gt;mpa_rx.pkt_cnt = 0;</div><div class='ctx'> 	card-&gt;mpa_rx.start_port = 0;</div><div class='ctx'> </div><div class='del'>-	card-&gt;mpa_rx.enabled = 0;</div><div class='add'>+	card-&gt;mpa_rx.enabled = 1;</div><div class='ctx'> 	card-&gt;mpa_rx.pkt_aggr_limit = SDIO_MP_AGGR_DEF_PKT_LIMIT;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate buffers for SDIO MP-A */</div><div class='hunk'>@@ -1774,4 +1802,5 @@ MODULE_AUTHOR("Marvell International Ltd.");</div><div class='ctx'> MODULE_DESCRIPTION("Marvell WiFi-Ex SDIO Driver version " SDIO_VERSION);</div><div class='ctx'> MODULE_VERSION(SDIO_VERSION);</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='del'>-MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");</div><div class='add'>+MODULE_FIRMWARE(SD8787_DEFAULT_FW_NAME);</div><div class='add'>+MODULE_FIRMWARE(SD8797_DEFAULT_FW_NAME);</div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h<br/>index 3f711801e58a..a3fb322205b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/sdio.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/sdio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/sdio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/sdio.h</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='ctx'> #define SD8787_DEFAULT_FW_NAME "mrvl/sd8787_uapsta.bin"</div><div class='add'>+#define SD8797_DEFAULT_FW_NAME "mrvl/sd8797_uapsta.bin"</div><div class='ctx'> </div><div class='ctx'> #define BLOCK_MODE	1</div><div class='ctx'> #define BYTE_MODE	0</div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c<br/>index ea6518d1c9e3..6e443ffa0465 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/sta_cmd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/sta_cmd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/sta_cmd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/sta_cmd.c</a></div><div class='hunk'>@@ -748,7 +748,7 @@ static int mwifiex_cmd_802_11_rf_channel(struct mwifiex_private *priv,</div><div class='ctx'> 				cpu_to_le16(HostCmd_SCAN_RADIO_TYPE_A);</div><div class='ctx'> </div><div class='ctx'> 		rf_type = le16_to_cpu(rf_chan-&gt;rf_type);</div><div class='del'>-		SET_SECONDARYCHAN(rf_type, priv-&gt;adapter-&gt;chan_offset);</div><div class='add'>+		SET_SECONDARYCHAN(rf_type, priv-&gt;adapter-&gt;sec_chan_offset);</div><div class='ctx'> 		rf_chan-&gt;current_channel = cpu_to_le16(*channel);</div><div class='ctx'> 	}</div><div class='ctx'> 	rf_chan-&gt;action = cpu_to_le16(cmd_action);</div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/sta_cmdresp.c b/drivers/net/wireless/mwifiex/sta_cmdresp.c<br/>index 7a16b0c417af..e812db8b695c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/sta_cmdresp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/sta_cmdresp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/sta_cmdresp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/sta_cmdresp.c</a></div><div class='hunk'>@@ -508,7 +508,7 @@ static int mwifiex_ret_802_11_tx_rate_query(struct mwifiex_private *priv,</div><div class='ctx'> 	priv-&gt;tx_htinfo = resp-&gt;params.tx_rate.ht_info;</div><div class='ctx'> 	if (!priv-&gt;is_data_rate_auto)</div><div class='ctx'> 		priv-&gt;data_rate =</div><div class='del'>-			mwifiex_index_to_data_rate(priv-&gt;tx_rate,</div><div class='add'>+			mwifiex_index_to_data_rate(priv, priv-&gt;tx_rate,</div><div class='ctx'> 						   priv-&gt;tx_htinfo);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c<br/>index f204810e8338..d7aa21da84d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/sta_event.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/sta_event.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/sta_event.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/sta_event.c</a></div><div class='hunk'>@@ -115,18 +115,17 @@ mwifiex_reset_connect_state(struct mwifiex_private *priv)</div><div class='ctx'> 	if (adapter-&gt;num_cmd_timeout &amp;&amp; adapter-&gt;curr_cmd)</div><div class='ctx'> 		return;</div><div class='ctx'> 	priv-&gt;media_connected = false;</div><div class='del'>-	if (!priv-&gt;disconnect) {</div><div class='del'>-		priv-&gt;disconnect = 1;</div><div class='del'>-		dev_dbg(adapter-&gt;dev, "info: successfully disconnected from"</div><div class='del'>-				" %pM: reason code %d\n", priv-&gt;cfg_bssid,</div><div class='del'>-				WLAN_REASON_DEAUTH_LEAVING);</div><div class='del'>-		cfg80211_disconnected(priv-&gt;netdev,</div><div class='del'>-				WLAN_REASON_DEAUTH_LEAVING, NULL, 0,</div><div class='del'>-				GFP_KERNEL);</div><div class='del'>-		queue_work(priv-&gt;workqueue, &amp;priv-&gt;cfg_workqueue);</div><div class='add'>+	dev_dbg(adapter-&gt;dev, "info: successfully disconnected from"</div><div class='add'>+			" %pM: reason code %d\n", priv-&gt;cfg_bssid,</div><div class='add'>+			WLAN_REASON_DEAUTH_LEAVING);</div><div class='add'>+	if (priv-&gt;bss_mode == NL80211_IFTYPE_STATION) {</div><div class='add'>+		cfg80211_disconnected(priv-&gt;netdev, WLAN_REASON_DEAUTH_LEAVING,</div><div class='add'>+				      NULL, 0, GFP_KERNEL);</div><div class='ctx'> 	}</div><div class='add'>+	memset(priv-&gt;cfg_bssid, 0, ETH_ALEN);</div><div class='add'>+</div><div class='ctx'> 	if (!netif_queue_stopped(priv-&gt;netdev))</div><div class='del'>-		netif_stop_queue(priv-&gt;netdev);</div><div class='add'>+		mwifiex_stop_net_dev_queue(priv-&gt;netdev, adapter);</div><div class='ctx'> 	if (netif_carrier_ok(priv-&gt;netdev))</div><div class='ctx'> 		netif_carrier_off(priv-&gt;netdev);</div><div class='ctx'> 	/* Reset wireless stats signal info */</div><div class='hunk'>@@ -201,7 +200,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)</div><div class='ctx'> 		if (!netif_carrier_ok(priv-&gt;netdev))</div><div class='ctx'> 			netif_carrier_on(priv-&gt;netdev);</div><div class='ctx'> 		if (netif_queue_stopped(priv-&gt;netdev))</div><div class='del'>-			netif_wake_queue(priv-&gt;netdev);</div><div class='add'>+			mwifiex_wake_up_net_dev_queue(priv-&gt;netdev, adapter);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case EVENT_DEAUTHENTICATED:</div><div class='hunk'>@@ -292,7 +291,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)</div><div class='ctx'> 		priv-&gt;adhoc_is_link_sensed = false;</div><div class='ctx'> 		mwifiex_clean_txrx(priv);</div><div class='ctx'> 		if (!netif_queue_stopped(priv-&gt;netdev))</div><div class='del'>-			netif_stop_queue(priv-&gt;netdev);</div><div class='add'>+			mwifiex_stop_net_dev_queue(priv-&gt;netdev, adapter);</div><div class='ctx'> 		if (netif_carrier_ok(priv-&gt;netdev))</div><div class='ctx'> 			netif_carrier_off(priv-&gt;netdev);</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c<br/>index 1679c2593b7b..470ca75ec250 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/sta_ioctl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/sta_ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/sta_ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/sta_ioctl.c</a></div><div class='hunk'>@@ -239,7 +239,7 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,</div><div class='ctx'> 				      "associating...\n");</div><div class='ctx'> </div><div class='ctx'> 		if (!netif_queue_stopped(priv-&gt;netdev))</div><div class='del'>-			netif_stop_queue(priv-&gt;netdev);</div><div class='add'>+			mwifiex_stop_net_dev_queue(priv-&gt;netdev, adapter);</div><div class='ctx'> </div><div class='ctx'> 		/* Clear any past association response stored for</div><div class='ctx'> 		 * application retrieval */</div><div class='hunk'>@@ -270,7 +270,7 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,</div><div class='ctx'> 		ret = mwifiex_check_network_compatibility(priv, bss_desc);</div><div class='ctx'> </div><div class='ctx'> 		if (!netif_queue_stopped(priv-&gt;netdev))</div><div class='del'>-			netif_stop_queue(priv-&gt;netdev);</div><div class='add'>+			mwifiex_stop_net_dev_queue(priv-&gt;netdev, adapter);</div><div class='ctx'> </div><div class='ctx'> 		if (!ret) {</div><div class='ctx'> 			dev_dbg(adapter-&gt;dev, "info: network found in scan"</div><div class='hunk'>@@ -477,67 +477,6 @@ int mwifiex_get_bss_info(struct mwifiex_private *priv,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The function sets band configurations.</div><div class='del'>- *</div><div class='del'>- * it performs extra checks to make sure the Ad-Hoc</div><div class='del'>- * band and channel are compatible. Otherwise it returns an error.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-int mwifiex_set_radio_band_cfg(struct mwifiex_private *priv,</div><div class='del'>-			       struct mwifiex_ds_band_cfg *radio_cfg)</div><div class='del'>-{</div><div class='del'>-	struct mwifiex_adapter *adapter = priv-&gt;adapter;</div><div class='del'>-	u8 infra_band, adhoc_band;</div><div class='del'>-	u32 adhoc_channel;</div><div class='del'>-</div><div class='del'>-	infra_band = (u8) radio_cfg-&gt;config_bands;</div><div class='del'>-	adhoc_band = (u8) radio_cfg-&gt;adhoc_start_band;</div><div class='del'>-	adhoc_channel = radio_cfg-&gt;adhoc_channel;</div><div class='del'>-</div><div class='del'>-	/* SET Infra band */</div><div class='del'>-	if ((infra_band | adapter-&gt;fw_bands) &amp; ~adapter-&gt;fw_bands)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	adapter-&gt;config_bands = infra_band;</div><div class='del'>-</div><div class='del'>-	/* SET Ad-hoc Band */</div><div class='del'>-	if ((adhoc_band | adapter-&gt;fw_bands) &amp; ~adapter-&gt;fw_bands)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (adhoc_band)</div><div class='del'>-		adapter-&gt;adhoc_start_band = adhoc_band;</div><div class='del'>-	adapter-&gt;chan_offset = (u8) radio_cfg-&gt;sec_chan_offset;</div><div class='del'>-	/*</div><div class='del'>-	 * If no adhoc_channel is supplied verify if the existing adhoc</div><div class='del'>-	 * channel compiles with new adhoc_band</div><div class='del'>-	 */</div><div class='del'>-	if (!adhoc_channel) {</div><div class='del'>-		if (!mwifiex_get_cfp_by_band_and_channel_from_cfg80211</div><div class='del'>-		     (priv, adapter-&gt;adhoc_start_band,</div><div class='del'>-		     priv-&gt;adhoc_channel)) {</div><div class='del'>-			/* Pass back the default channel */</div><div class='del'>-			radio_cfg-&gt;adhoc_channel = DEFAULT_AD_HOC_CHANNEL;</div><div class='del'>-			if ((adapter-&gt;adhoc_start_band &amp; BAND_A)</div><div class='del'>-			    || (adapter-&gt;adhoc_start_band &amp; BAND_AN))</div><div class='del'>-				radio_cfg-&gt;adhoc_channel =</div><div class='del'>-					DEFAULT_AD_HOC_CHANNEL_A;</div><div class='del'>-		}</div><div class='del'>-	} else {	/* Retrurn error if adhoc_band and</div><div class='del'>-			   adhoc_channel combination is invalid */</div><div class='del'>-		if (!mwifiex_get_cfp_by_band_and_channel_from_cfg80211</div><div class='del'>-		    (priv, adapter-&gt;adhoc_start_band, (u16) adhoc_channel))</div><div class='del'>-			return -1;</div><div class='del'>-		priv-&gt;adhoc_channel = (u8) adhoc_channel;</div><div class='del'>-	}</div><div class='del'>-	if ((adhoc_band &amp; BAND_GN) || (adhoc_band &amp; BAND_AN))</div><div class='del'>-		adapter-&gt;adhoc_11n_enabled = true;</div><div class='del'>-	else</div><div class='del'>-		adapter-&gt;adhoc_11n_enabled = false;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * The function disables auto deep sleep mode.</div><div class='ctx'>  */</div><div class='ctx'> int mwifiex_disable_auto_ds(struct mwifiex_private *priv)</div><div class='hunk'>@@ -837,8 +776,8 @@ int mwifiex_drv_get_data_rate(struct mwifiex_private *priv,</div><div class='ctx'> </div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		if (rate-&gt;is_rate_auto)</div><div class='del'>-			rate-&gt;rate = mwifiex_index_to_data_rate(priv-&gt;tx_rate,</div><div class='del'>-							priv-&gt;tx_htinfo);</div><div class='add'>+			rate-&gt;rate = mwifiex_index_to_data_rate(priv,</div><div class='add'>+					priv-&gt;tx_rate, priv-&gt;tx_htinfo);</div><div class='ctx'> 		else</div><div class='ctx'> 			rate-&gt;rate = priv-&gt;data_rate;</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/sta_rx.c b/drivers/net/wireless/mwifiex/sta_rx.c<br/>index 27430512f7cd..5e1ef7e5da4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/sta_rx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/sta_rx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/sta_rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/sta_rx.c</a></div><div class='hunk'>@@ -126,6 +126,9 @@ int mwifiex_process_sta_rx_packet(struct mwifiex_adapter *adapter,</div><div class='ctx'> 	u16 rx_pkt_type;</div><div class='ctx'> 	struct mwifiex_private *priv = adapter-&gt;priv[rx_info-&gt;bss_index];</div><div class='ctx'> </div><div class='add'>+	if (!priv)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='ctx'> 	local_rx_pd = (struct rxpd *) (skb-&gt;data);</div><div class='ctx'> 	rx_pkt_type = local_rx_pd-&gt;rx_pkt_type;</div><div class='ctx'> </div><div class='hunk'>@@ -189,12 +192,11 @@ int mwifiex_process_sta_rx_packet(struct mwifiex_adapter *adapter,</div><div class='ctx'> 					     (u8) local_rx_pd-&gt;rx_pkt_type,</div><div class='ctx'> 					     skb);</div><div class='ctx'> </div><div class='del'>-	if (ret || (rx_pkt_type == PKT_TYPE_BAR)) {</div><div class='del'>-		if (priv &amp;&amp; (ret == -1))</div><div class='del'>-			priv-&gt;stats.rx_dropped++;</div><div class='del'>-</div><div class='add'>+	if (ret || (rx_pkt_type == PKT_TYPE_BAR))</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		priv-&gt;stats.rx_dropped++;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/mwifiex/txrx.c b/drivers/net/wireless/mwifiex/txrx.c<br/>index a206f412875f..d9274a1b77ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/txrx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwifiex/txrx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwifiex/txrx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwifiex/txrx.c</a></div><div class='hunk'>@@ -134,7 +134,7 @@ int mwifiex_write_data_complete(struct mwifiex_adapter *adapter,</div><div class='ctx'> 	if (!priv)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;netdev-&gt;trans_start = jiffies;</div><div class='add'>+	mwifiex_set_trans_start(priv-&gt;netdev);</div><div class='ctx'> 	if (!status) {</div><div class='ctx'> 		priv-&gt;stats.tx_packets++;</div><div class='ctx'> 		priv-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='hunk'>@@ -152,7 +152,8 @@ int mwifiex_write_data_complete(struct mwifiex_adapter *adapter,</div><div class='ctx'> 		if ((GET_BSS_ROLE(tpriv) == MWIFIEX_BSS_ROLE_STA)</div><div class='ctx'> 				&amp;&amp; (tpriv-&gt;media_connected)) {</div><div class='ctx'> 			if (netif_queue_stopped(tpriv-&gt;netdev))</div><div class='del'>-				netif_wake_queue(tpriv-&gt;netdev);</div><div class='add'>+				mwifiex_wake_up_net_dev_queue(tpriv-&gt;netdev,</div><div class='add'>+								adapter);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> done:</div><div class='head'>diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c<br/>index 995695c28d5c..dd5aeaff44ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwl8k.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/mwl8k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/mwl8k.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/mwl8k.c</a></div><div class='hunk'>@@ -28,10 +28,10 @@</div><div class='ctx'> </div><div class='ctx'> #define MWL8K_DESC	"Marvell TOPDOG(R) 802.11 Wireless Network Driver"</div><div class='ctx'> #define MWL8K_NAME	KBUILD_MODNAME</div><div class='del'>-#define MWL8K_VERSION	"0.12"</div><div class='add'>+#define MWL8K_VERSION	"0.13"</div><div class='ctx'> </div><div class='ctx'> /* Module parameters */</div><div class='del'>-static unsigned ap_mode_default;</div><div class='add'>+static bool ap_mode_default;</div><div class='ctx'> module_param(ap_mode_default, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(ap_mode_default,</div><div class='ctx'> 		 "Set to 1 to make ap mode the default instead of sta mode");</div><div class='hunk'>@@ -198,6 +198,7 @@ struct mwl8k_priv {</div><div class='ctx'> 	/* firmware access */</div><div class='ctx'> 	struct mutex fw_mutex;</div><div class='ctx'> 	struct task_struct *fw_mutex_owner;</div><div class='add'>+	struct task_struct *hw_restart_owner;</div><div class='ctx'> 	int fw_mutex_depth;</div><div class='ctx'> 	struct completion *hostcmd_wait;</div><div class='ctx'> </div><div class='hunk'>@@ -262,6 +263,10 @@ struct mwl8k_priv {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct ieee80211_tx_queue_params wmm_params[MWL8K_TX_WMM_QUEUES];</div><div class='ctx'> </div><div class='add'>+	/* To perform the task of reloading the firmware */</div><div class='add'>+	struct work_struct fw_reload;</div><div class='add'>+	bool hw_restart_in_progress;</div><div class='add'>+</div><div class='ctx'> 	/* async firmware loading state */</div><div class='ctx'> 	unsigned fw_state;</div><div class='ctx'> 	char *fw_pref;</div><div class='hunk'>@@ -738,10 +743,10 @@ static int mwl8k_load_firmware(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 		ready_code = ioread32(priv-&gt;regs + MWL8K_HIU_INT_CODE);</div><div class='ctx'> 		if (ready_code == MWL8K_FWAP_READY) {</div><div class='del'>-			priv-&gt;ap_fw = 1;</div><div class='add'>+			priv-&gt;ap_fw = true;</div><div class='ctx'> 			break;</div><div class='ctx'> 		} else if (ready_code == MWL8K_FWSTA_READY) {</div><div class='del'>-			priv-&gt;ap_fw = 0;</div><div class='add'>+			priv-&gt;ap_fw = false;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1498,6 +1503,18 @@ static int mwl8k_tx_wait_empty(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	might_sleep();</div><div class='ctx'> </div><div class='add'>+	/* Since fw restart is in progress, allow only the firmware</div><div class='add'>+	 * commands from the restart code and block the other</div><div class='add'>+	 * commands since they are going to fail in any case since</div><div class='add'>+	 * the firmware has crashed</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;hw_restart_in_progress) {</div><div class='add'>+		if (priv-&gt;hw_restart_owner == current)</div><div class='add'>+			return 0;</div><div class='add'>+		else</div><div class='add'>+			return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The TX queues are stopped at this point, so this test</div><div class='ctx'> 	 * doesn't need to take -&gt;tx_lock.</div><div class='hunk'>@@ -1541,6 +1558,8 @@ static int mwl8k_tx_wait_empty(struct ieee80211_hw *hw)</div><div class='ctx'> 		wiphy_err(hw-&gt;wiphy, "tx rings stuck for %d ms\n",</div><div class='ctx'> 			  MWL8K_TX_WAIT_TIMEOUT_MS);</div><div class='ctx'> 		mwl8k_dump_tx_rings(hw);</div><div class='add'>+		priv-&gt;hw_restart_in_progress = true;</div><div class='add'>+		ieee80211_queue_work(hw, &amp;priv-&gt;fw_reload);</div><div class='ctx'> </div><div class='ctx'> 		rc = -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2058,7 +2077,9 @@ static int mwl8k_fw_lock(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 		rc = mwl8k_tx_wait_empty(hw);</div><div class='ctx'> 		if (rc) {</div><div class='del'>-			ieee80211_wake_queues(hw);</div><div class='add'>+			if (!priv-&gt;hw_restart_in_progress)</div><div class='add'>+				ieee80211_wake_queues(hw);</div><div class='add'>+</div><div class='ctx'> 			mutex_unlock(&amp;priv-&gt;fw_mutex);</div><div class='ctx'> </div><div class='ctx'> 			return rc;</div><div class='hunk'>@@ -2077,7 +2098,9 @@ static void mwl8k_fw_unlock(struct ieee80211_hw *hw)</div><div class='ctx'> 	struct mwl8k_priv *priv = hw-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	if (!--priv-&gt;fw_mutex_depth) {</div><div class='del'>-		ieee80211_wake_queues(hw);</div><div class='add'>+		if (!priv-&gt;hw_restart_in_progress)</div><div class='add'>+			ieee80211_wake_queues(hw);</div><div class='add'>+</div><div class='ctx'> 		priv-&gt;fw_mutex_owner = NULL;</div><div class='ctx'> 		mutex_unlock(&amp;priv-&gt;fw_mutex);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2754,7 +2777,7 @@ static int mwl8k_cmd_tx_power(struct ieee80211_hw *hw,</div><div class='ctx'> 	else if (channel-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='ctx'> 		cmd-&gt;band = cpu_to_le16(0x4);</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;channel = channel-&gt;hw_value;</div><div class='add'>+	cmd-&gt;channel = cpu_to_le16(channel-&gt;hw_value);</div><div class='ctx'> </div><div class='ctx'> 	if (conf-&gt;channel_type == NL80211_CHAN_NO_HT ||</div><div class='ctx'> 	    conf-&gt;channel_type == NL80211_CHAN_HT20) {</div><div class='hunk'>@@ -4043,7 +4066,7 @@ static int mwl8k_cmd_encryption_remove_key(struct ieee80211_hw *hw,</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	if (key-&gt;cipher == WLAN_CIPHER_SUITE_WEP40 ||</div><div class='del'>-			WLAN_CIPHER_SUITE_WEP104)</div><div class='add'>+			key-&gt;cipher == WLAN_CIPHER_SUITE_WEP104)</div><div class='ctx'> 		mwl8k_vif-&gt;wep_key_conf[key-&gt;keyidx].enabled = 0;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;action = cpu_to_le32(MWL8K_ENCR_REMOVE_KEY);</div><div class='hunk'>@@ -4398,7 +4421,8 @@ static void mwl8k_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 	struct mwl8k_priv *priv = hw-&gt;priv;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	mwl8k_cmd_radio_disable(hw);</div><div class='add'>+	if (!priv-&gt;hw_restart_in_progress)</div><div class='add'>+		mwl8k_cmd_radio_disable(hw);</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_stop_queues(hw);</div><div class='ctx'> </div><div class='hunk'>@@ -4499,6 +4523,16 @@ static int mwl8k_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mwl8k_remove_vif(struct mwl8k_priv *priv, struct mwl8k_vif *vif)</div><div class='add'>+{</div><div class='add'>+	/* Has ieee80211_restart_hw re-added the removed interfaces? */</div><div class='add'>+	if (!priv-&gt;macids_used)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	priv-&gt;macids_used &amp;= ~(1 &lt;&lt; vif-&gt;macid);</div><div class='add'>+	list_del(&amp;vif-&gt;list);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void mwl8k_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 				   struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='hunk'>@@ -4510,8 +4544,54 @@ static void mwl8k_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	mwl8k_cmd_set_mac_addr(hw, vif, "\x00\x00\x00\x00\x00\x00");</div><div class='ctx'> </div><div class='del'>-	priv-&gt;macids_used &amp;= ~(1 &lt;&lt; mwl8k_vif-&gt;macid);</div><div class='del'>-	list_del(&amp;mwl8k_vif-&gt;list);</div><div class='add'>+	mwl8k_remove_vif(priv, mwl8k_vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mwl8k_hw_restart_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mwl8k_priv *priv =</div><div class='add'>+		container_of(work, struct mwl8k_priv, fw_reload);</div><div class='add'>+	struct ieee80211_hw *hw = priv-&gt;hw;</div><div class='add'>+	struct mwl8k_device_info *di;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* If some command is waiting for a response, clear it */</div><div class='add'>+	if (priv-&gt;hostcmd_wait != NULL) {</div><div class='add'>+		complete(priv-&gt;hostcmd_wait);</div><div class='add'>+		priv-&gt;hostcmd_wait = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;hw_restart_owner = current;</div><div class='add'>+	di = priv-&gt;device_info;</div><div class='add'>+	mwl8k_fw_lock(hw);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;ap_fw)</div><div class='add'>+		rc = mwl8k_reload_firmware(hw, di-&gt;fw_image_ap);</div><div class='add'>+	else</div><div class='add'>+		rc = mwl8k_reload_firmware(hw, di-&gt;fw_image_sta);</div><div class='add'>+</div><div class='add'>+	if (rc)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	priv-&gt;hw_restart_owner = NULL;</div><div class='add'>+	priv-&gt;hw_restart_in_progress = false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This unlock will wake up the queues and</div><div class='add'>+	 * also opens the command path for other</div><div class='add'>+	 * commands</div><div class='add'>+	 */</div><div class='add'>+	mwl8k_fw_unlock(hw);</div><div class='add'>+</div><div class='add'>+	ieee80211_restart_hw(hw);</div><div class='add'>+</div><div class='add'>+	wiphy_err(hw-&gt;wiphy, "Firmware restarted successfully\n");</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+fail:</div><div class='add'>+	mwl8k_fw_unlock(hw);</div><div class='add'>+</div><div class='add'>+	wiphy_err(hw-&gt;wiphy, "Firmware restart failed\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mwl8k_config(struct ieee80211_hw *hw, u32 changed)</div><div class='hunk'>@@ -5024,7 +5104,11 @@ mwl8k_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 		for (i = 0; i &lt; MAX_AMPDU_ATTEMPTS; i++) {</div><div class='ctx'> 			rc = mwl8k_check_ba(hw, stream);</div><div class='ctx'> </div><div class='del'>-			if (!rc)</div><div class='add'>+			/* If HW restart is in progress mwl8k_post_cmd will</div><div class='add'>+			 * return -EBUSY. Avoid retrying mwl8k_check_ba in</div><div class='add'>+			 * such cases</div><div class='add'>+			 */</div><div class='add'>+			if (!rc || rc == -EBUSY)</div><div class='ctx'> 				break;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * HW queues take time to be flushed, give them</div><div class='hunk'>@@ -5044,14 +5128,14 @@ mwl8k_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,</div><div class='ctx'> 		ieee80211_start_tx_ba_cb_irqsafe(vif, addr, tid);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_STOP:</div><div class='del'>-		if (stream == NULL)</div><div class='del'>-			break;</div><div class='del'>-		if (stream-&gt;state == AMPDU_STREAM_ACTIVE) {</div><div class='del'>-			spin_unlock(&amp;priv-&gt;stream_lock);</div><div class='del'>-			mwl8k_destroy_ba(hw, stream);</div><div class='del'>-			spin_lock(&amp;priv-&gt;stream_lock);</div><div class='add'>+		if (stream) {</div><div class='add'>+			if (stream-&gt;state == AMPDU_STREAM_ACTIVE) {</div><div class='add'>+				spin_unlock(&amp;priv-&gt;stream_lock);</div><div class='add'>+				mwl8k_destroy_ba(hw, stream);</div><div class='add'>+				spin_lock(&amp;priv-&gt;stream_lock);</div><div class='add'>+			}</div><div class='add'>+			mwl8k_remove_stream(hw, stream);</div><div class='ctx'> 		}</div><div class='del'>-		mwl8k_remove_stream(hw, stream);</div><div class='ctx'> 		ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IEEE80211_AMPDU_TX_OPERATIONAL:</div><div class='hunk'>@@ -5263,12 +5347,15 @@ fail:</div><div class='ctx'> 	mwl8k_release_firmware(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define MAX_RESTART_ATTEMPTS 1</div><div class='ctx'> static int mwl8k_init_firmware(struct ieee80211_hw *hw, char *fw_image,</div><div class='ctx'> 			       bool nowait)</div><div class='ctx'> {</div><div class='ctx'> 	struct mwl8k_priv *priv = hw-&gt;priv;</div><div class='ctx'> 	int rc;</div><div class='add'>+	int count = MAX_RESTART_ATTEMPTS;</div><div class='ctx'> </div><div class='add'>+retry:</div><div class='ctx'> 	/* Reset firmware and hardware */</div><div class='ctx'> 	mwl8k_hw_reset(priv);</div><div class='ctx'> </div><div class='hunk'>@@ -5290,6 +5377,16 @@ static int mwl8k_init_firmware(struct ieee80211_hw *hw, char *fw_image,</div><div class='ctx'> 	/* Reclaim memory once firmware is successfully loaded */</div><div class='ctx'> 	mwl8k_release_firmware(priv);</div><div class='ctx'> </div><div class='add'>+	if (rc &amp;&amp; count) {</div><div class='add'>+		/* FW did not start successfully;</div><div class='add'>+		 * lets try one more time</div><div class='add'>+		 */</div><div class='add'>+		count--;</div><div class='add'>+		wiphy_err(hw-&gt;wiphy, "Trying to reload the firmware again\n");</div><div class='add'>+		msleep(20);</div><div class='add'>+		goto retry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5365,7 +5462,14 @@ static int mwl8k_probe_hw(struct ieee80211_hw *hw)</div><div class='ctx'> 		goto err_free_queues;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(priv-&gt;ampdu, 0, sizeof(priv-&gt;ampdu));</div><div class='add'>+	/*</div><div class='add'>+	 * When hw restart is requested,</div><div class='add'>+	 * mac80211 will take care of clearing</div><div class='add'>+	 * the ampdu streams, so do not clear</div><div class='add'>+	 * the ampdu state here</div><div class='add'>+	 */</div><div class='add'>+	if (!priv-&gt;hw_restart_in_progress)</div><div class='add'>+		memset(priv-&gt;ampdu, 0, sizeof(priv-&gt;ampdu));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Temporarily enable interrupts.  Initial firmware host</div><div class='hunk'>@@ -5439,10 +5543,20 @@ static int mwl8k_reload_firmware(struct ieee80211_hw *hw, char *fw_image)</div><div class='ctx'> {</div><div class='ctx'> 	int i, rc = 0;</div><div class='ctx'> 	struct mwl8k_priv *priv = hw-&gt;priv;</div><div class='add'>+	struct mwl8k_vif *vif, *tmp_vif;</div><div class='ctx'> </div><div class='ctx'> 	mwl8k_stop(hw);</div><div class='ctx'> 	mwl8k_rxq_deinit(hw, 0);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * All the existing interfaces are re-added by the ieee80211_reconfig;</div><div class='add'>+	 * which means driver should remove existing interfaces before calling</div><div class='add'>+	 * ieee80211_restart_hw</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;hw_restart_in_progress)</div><div class='add'>+		list_for_each_entry_safe(vif, tmp_vif, &amp;priv-&gt;vif_list, list)</div><div class='add'>+			mwl8k_remove_vif(priv, vif);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; mwl8k_tx_queues(priv); i++)</div><div class='ctx'> 		mwl8k_txq_deinit(hw, i);</div><div class='ctx'> </div><div class='hunk'>@@ -5454,6 +5568,9 @@ static int mwl8k_reload_firmware(struct ieee80211_hw *hw, char *fw_image)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;hw_restart_in_progress)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='ctx'> 	rc = mwl8k_start(hw);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -5517,13 +5634,15 @@ static int mwl8k_firmware_load_success(struct mwl8k_priv *priv)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;priv-&gt;vif_list);</div><div class='ctx'> </div><div class='ctx'> 	/* Set default radio state and preamble */</div><div class='del'>-	priv-&gt;radio_on = 0;</div><div class='del'>-	priv-&gt;radio_short_preamble = 0;</div><div class='add'>+	priv-&gt;radio_on = false;</div><div class='add'>+	priv-&gt;radio_short_preamble = false;</div><div class='ctx'> </div><div class='ctx'> 	/* Finalize join worker */</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;finalize_join_worker, mwl8k_finalize_join_worker);</div><div class='ctx'> 	/* Handle watchdog ba events */</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;watchdog_ba_handle, mwl8k_watchdog_ba_events);</div><div class='add'>+	/* To reload the firmware if it crashes */</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;fw_reload, mwl8k_hw_restart_work);</div><div class='ctx'> </div><div class='ctx'> 	/* TX reclaim and RX tasklets.  */</div><div class='ctx'> 	tasklet_init(&amp;priv-&gt;poll_tx_task, mwl8k_tx_poll, (unsigned long)hw);</div><div class='hunk'>@@ -5667,6 +5786,9 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,</div><div class='ctx'> 	rc = mwl8k_init_firmware(hw, priv-&gt;fw_pref, true);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_stop_firmware;</div><div class='add'>+</div><div class='add'>+	priv-&gt;hw_restart_in_progress = false;</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> </div><div class='ctx'> err_stop_firmware:</div><div class='head'>diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c<br/>index b52acc4b4086..9fb77d0319f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco/main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/orinoco/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/orinoco/main.c</a></div><div class='hunk'>@@ -121,7 +121,7 @@ module_param(orinoco_debug, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(orinoco_debug, "Debug level");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int suppress_linkstatus; /* = 0 */</div><div class='add'>+static bool suppress_linkstatus; /* = 0 */</div><div class='ctx'> module_param(suppress_linkstatus, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(suppress_linkstatus, "Don't log link status changes");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c<br/>index 0793e4265b43..ae8ce56670b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco/orinoco_usb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/orinoco/orinoco_usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco/orinoco_usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/orinoco/orinoco_usb.c</a></div><div class='hunk'>@@ -1759,32 +1759,7 @@ static struct usb_driver orinoco_driver = {</div><div class='ctx'> static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION</div><div class='ctx'> 	" (Manuel Estrada Sainz)";</div><div class='ctx'> </div><div class='del'>-static int __init ezusb_module_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s\n", version);</div><div class='del'>-</div><div class='del'>-	/* register this driver with the USB subsystem */</div><div class='del'>-	err = usb_register(&amp;orinoco_driver);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR PFX "usb_register failed, error %d\n",</div><div class='del'>-		       err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ezusb_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	/* deregister this driver with the USB subsystem */</div><div class='del'>-	usb_deregister(&amp;orinoco_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-module_init(ezusb_module_init);</div><div class='del'>-module_exit(ezusb_module_exit);</div><div class='add'>+module_usb_driver(orinoco_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Manuel Estrada Sainz");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for Orinoco wireless LAN cards using EZUSB bridge");</div><div class='head'>diff --git a/drivers/net/wireless/orinoco/scan.c b/drivers/net/wireless/orinoco/scan.c<br/>index e99ca1c1e0d8..96e39edfec77 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco/scan.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/orinoco/scan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco/scan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/orinoco/scan.c</a></div><div class='hunk'>@@ -76,6 +76,7 @@ static void orinoco_add_hostscan_result(struct orinoco_private *priv,</div><div class='ctx'> {</div><div class='ctx'> 	struct wiphy *wiphy = priv_to_wiphy(priv);</div><div class='ctx'> 	struct ieee80211_channel *channel;</div><div class='add'>+	struct cfg80211_bss *cbss;</div><div class='ctx'> 	u8 *ie;</div><div class='ctx'> 	u8 ie_buf[46];</div><div class='ctx'> 	u64 timestamp;</div><div class='hunk'>@@ -121,9 +122,10 @@ static void orinoco_add_hostscan_result(struct orinoco_private *priv,</div><div class='ctx'> 	beacon_interval = le16_to_cpu(bss-&gt;a.beacon_interv);</div><div class='ctx'> 	signal = SIGNAL_TO_MBM(le16_to_cpu(bss-&gt;a.level));</div><div class='ctx'> </div><div class='del'>-	cfg80211_inform_bss(wiphy, channel, bss-&gt;a.bssid, timestamp,</div><div class='del'>-			    capability, beacon_interval, ie_buf, ie_len,</div><div class='del'>-			    signal, GFP_KERNEL);</div><div class='add'>+	cbss = cfg80211_inform_bss(wiphy, channel, bss-&gt;a.bssid, timestamp,</div><div class='add'>+				   capability, beacon_interval, ie_buf, ie_len,</div><div class='add'>+				   signal, GFP_KERNEL);</div><div class='add'>+	cfg80211_put_bss(cbss);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void orinoco_add_extscan_result(struct orinoco_private *priv,</div><div class='hunk'>@@ -132,6 +134,7 @@ void orinoco_add_extscan_result(struct orinoco_private *priv,</div><div class='ctx'> {</div><div class='ctx'> 	struct wiphy *wiphy = priv_to_wiphy(priv);</div><div class='ctx'> 	struct ieee80211_channel *channel;</div><div class='add'>+	struct cfg80211_bss *cbss;</div><div class='ctx'> 	const u8 *ie;</div><div class='ctx'> 	u64 timestamp;</div><div class='ctx'> 	s32 signal;</div><div class='hunk'>@@ -152,9 +155,10 @@ void orinoco_add_extscan_result(struct orinoco_private *priv,</div><div class='ctx'> 	ie = bss-&gt;data;</div><div class='ctx'> 	signal = SIGNAL_TO_MBM(bss-&gt;level);</div><div class='ctx'> </div><div class='del'>-	cfg80211_inform_bss(wiphy, channel, bss-&gt;bssid, timestamp,</div><div class='del'>-			    capability, beacon_interval, ie, ie_len,</div><div class='del'>-			    signal, GFP_KERNEL);</div><div class='add'>+	cbss = cfg80211_inform_bss(wiphy, channel, bss-&gt;bssid, timestamp,</div><div class='add'>+				   capability, beacon_interval, ie, ie_len,</div><div class='add'>+				   signal, GFP_KERNEL);</div><div class='add'>+	cfg80211_put_bss(cbss);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void orinoco_add_hostscan_results(struct orinoco_private *priv,</div><div class='head'>diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c<br/>index db4d9a02f264..af2ca1a9c7d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/p54/main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/p54/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/p54/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/p54/main.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include "p54.h"</div><div class='ctx'> #include "lmac.h"</div><div class='ctx'> </div><div class='del'>-static int modparam_nohwcrypt;</div><div class='add'>+static bool modparam_nohwcrypt;</div><div class='ctx'> module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");</div><div class='ctx'> MODULE_AUTHOR("Michael Wu &lt;flamingice@sourmilk.net&gt;");</div><div class='head'>diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c<br/>index 78d0d6988553..7faed62c6378 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/p54/p54spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/p54/p54spi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/p54/p54spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/p54/p54spi.c</a></div><div class='hunk'>@@ -581,11 +581,7 @@ static void p54spi_op_stop(struct ieee80211_hw *dev)</div><div class='ctx'> 	struct p54s_priv *priv = dev-&gt;priv;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (mutex_lock_interruptible(&amp;priv-&gt;mutex)) {</div><div class='del'>-		/* FIXME: how to handle this error? */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mutex);</div><div class='ctx'> 	WARN_ON(priv-&gt;fw_state != FW_STATE_READY);</div><div class='ctx'> </div><div class='ctx'> 	p54spi_power_off(priv);</div><div class='hunk'>@@ -704,7 +700,6 @@ static int __devexit p54spi_remove(struct spi_device *spi)</div><div class='ctx'> static struct spi_driver p54spi_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name		= "p54spi",</div><div class='del'>-		.bus		= &amp;spi_bus_type,</div><div class='ctx'> 		.owner		= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c<br/>index 9b6096866427..f4d28c39aac7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/p54/p54usb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/p54/p54usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/p54/p54usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/p54/p54usb.c</a></div><div class='hunk'>@@ -1083,15 +1083,4 @@ static struct usb_driver p54u_driver = {</div><div class='ctx'> 	.soft_unbind = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init p54u_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;p54u_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit p54u_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;p54u_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(p54u_init);</div><div class='del'>-module_exit(p54u_exit);</div><div class='add'>+module_usb_driver(p54u_driver);</div><div class='head'>diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c<br/>index 6ed9c323e3cb..42b97bc38477 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/p54/txrx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/p54/txrx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/p54/txrx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/p54/txrx.c</a></div><div class='hunk'>@@ -242,7 +242,7 @@ void p54_free_skb(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	skb_unlink(skb, &amp;priv-&gt;tx_queue);</div><div class='ctx'> 	p54_tx_qos_accounting_free(priv, skb);</div><div class='del'>-	dev_kfree_skb_any(skb);</div><div class='add'>+	ieee80211_free_txskb(dev, skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(p54_free_skb);</div><div class='ctx'> </div><div class='hunk'>@@ -788,7 +788,7 @@ void p54_tx_80211(struct ieee80211_hw *dev, struct sk_buff *skb)</div><div class='ctx'> 			    &amp;hdr_flags, &amp;aid, &amp;burst_allowed);</div><div class='ctx'> </div><div class='ctx'> 	if (p54_tx_qos_accounting_alloc(priv, skb, queue)) {</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='add'>+		ieee80211_free_txskb(dev, skb);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c<br/>index bc2ba80c47bb..4e44b1af119a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/prism54/isl_ioctl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/prism54/isl_ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/prism54/isl_ioctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/prism54/isl_ioctl.c</a></div><div class='hunk'>@@ -2493,323 +2493,7 @@ prism54_set_mac_address(struct net_device *ndev, void *addr)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Note: currently, use hostapd ioctl from the Host AP driver for WPA</div><div class='del'>- * support. This is to be replaced with Linux wireless extensions once they</div><div class='del'>- * get WPA support. */</div><div class='del'>-</div><div class='del'>-/* Note II: please leave all this together as it will be easier to remove later,</div><div class='del'>- * once wireless extensions add WPA support -mcgrof */</div><div class='del'>-</div><div class='del'>-/* PRISM54_HOSTAPD ioctl() cmd: */</div><div class='del'>-enum {</div><div class='del'>-	PRISM2_SET_ENCRYPTION = 6,</div><div class='del'>-	PRISM2_HOSTAPD_SET_GENERIC_ELEMENT = 12,</div><div class='del'>-	PRISM2_HOSTAPD_MLME = 13,</div><div class='del'>-	PRISM2_HOSTAPD_SCAN_REQ = 14,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define PRISM54_SET_WPA			SIOCIWFIRSTPRIV+12</div><div class='del'>-#define PRISM54_HOSTAPD			SIOCIWFIRSTPRIV+25</div><div class='del'>-#define PRISM54_DROP_UNENCRYPTED	SIOCIWFIRSTPRIV+26</div><div class='del'>-</div><div class='del'>-#define PRISM2_HOSTAPD_MAX_BUF_SIZE 1024</div><div class='del'>-#define PRISM2_HOSTAPD_GENERIC_ELEMENT_HDR_LEN \</div><div class='del'>-	offsetof(struct prism2_hostapd_param, u.generic_elem.data)</div><div class='del'>-</div><div class='del'>-/* Maximum length for algorithm names (-1 for nul termination)</div><div class='del'>- * used in ioctl() */</div><div class='del'>-#define HOSTAP_CRYPT_ALG_NAME_LEN 16</div><div class='del'>-</div><div class='del'>-struct prism2_hostapd_param {</div><div class='del'>-	u32 cmd;</div><div class='del'>-	u8 sta_addr[ETH_ALEN];</div><div class='del'>-	union {</div><div class='del'>-	       struct {</div><div class='del'>-		       u8 alg[HOSTAP_CRYPT_ALG_NAME_LEN];</div><div class='del'>-		       u32 flags;</div><div class='del'>-		       u32 err;</div><div class='del'>-		       u8 idx;</div><div class='del'>-		       u8 seq[8]; /* sequence counter (set: RX, get: TX) */</div><div class='del'>-		       u16 key_len;</div><div class='del'>-		       u8 key[0];</div><div class='del'>-		       } crypt;</div><div class='del'>-               struct {</div><div class='del'>-                       u8 len;</div><div class='del'>-                       u8 data[0];</div><div class='del'>-               } generic_elem;</div><div class='del'>-               struct {</div><div class='del'>-#define MLME_STA_DEAUTH 0</div><div class='del'>-#define MLME_STA_DISASSOC 1</div><div class='del'>-                       u16 cmd;</div><div class='del'>-                       u16 reason_code;</div><div class='del'>-               } mlme;</div><div class='del'>-               struct {</div><div class='del'>-                       u8 ssid_len;</div><div class='del'>-                       u8 ssid[32];</div><div class='del'>-               } scan_req;</div><div class='del'>-       } u;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism2_ioctl_set_encryption(struct net_device *dev,</div><div class='del'>-	struct prism2_hostapd_param *param,</div><div class='del'>-	int param_len)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(dev);</div><div class='del'>-	int rvalue = 0, force = 0;</div><div class='del'>-	int authen = DOT11_AUTH_OS, invoke = 0, exunencrypt = 0;</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-</div><div class='del'>-	/* with the new API, it's impossible to get a NULL pointer.</div><div class='del'>-	 * New version of iwconfig set the IW_ENCODE_NOKEY flag</div><div class='del'>-	 * when no key is given, but older versions don't. */</div><div class='del'>-</div><div class='del'>-	if (param-&gt;u.crypt.key_len &gt; 0) {</div><div class='del'>-		/* we have a key to set */</div><div class='del'>-		int index = param-&gt;u.crypt.idx;</div><div class='del'>-		int current_index;</div><div class='del'>-		struct obj_key key = { DOT11_PRIV_TKIP, 0, "" };</div><div class='del'>-</div><div class='del'>-		/* get the current key index */</div><div class='del'>-		rvalue = mgt_get_request(priv, DOT11_OID_DEFKEYID, 0, NULL, &amp;r);</div><div class='del'>-		current_index = r.u;</div><div class='del'>-		/* Verify that the key is not marked as invalid */</div><div class='del'>-		if (!(param-&gt;u.crypt.flags &amp; IW_ENCODE_NOKEY)) {</div><div class='del'>-			key.length = param-&gt;u.crypt.key_len &gt; sizeof (param-&gt;u.crypt.key) ?</div><div class='del'>-			    sizeof (param-&gt;u.crypt.key) : param-&gt;u.crypt.key_len;</div><div class='del'>-			memcpy(key.key, param-&gt;u.crypt.key, key.length);</div><div class='del'>-			if (key.length == 32)</div><div class='del'>-				/* we want WPA-PSK */</div><div class='del'>-				key.type = DOT11_PRIV_TKIP;</div><div class='del'>-			if ((index &lt; 0) || (index &gt; 3))</div><div class='del'>-				/* no index provided use the current one */</div><div class='del'>-				index = current_index;</div><div class='del'>-</div><div class='del'>-			/* now send the key to the card  */</div><div class='del'>-			rvalue |=</div><div class='del'>-			    mgt_set_request(priv, DOT11_OID_DEFKEYX, index,</div><div class='del'>-					    &amp;key);</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * If a valid key is set, encryption should be enabled</div><div class='del'>-		 * (user may turn it off later).</div><div class='del'>-		 * This is also how "iwconfig ethX key on" works</div><div class='del'>-		 */</div><div class='del'>-		if ((index == current_index) &amp;&amp; (key.length &gt; 0))</div><div class='del'>-			force = 1;</div><div class='del'>-	} else {</div><div class='del'>-		int index = (param-&gt;u.crypt.flags &amp; IW_ENCODE_INDEX) - 1;</div><div class='del'>-		if ((index &gt;= 0) &amp;&amp; (index &lt;= 3)) {</div><div class='del'>-			/* we want to set the key index */</div><div class='del'>-			rvalue |=</div><div class='del'>-			    mgt_set_request(priv, DOT11_OID_DEFKEYID, 0,</div><div class='del'>-					    &amp;index);</div><div class='del'>-		} else {</div><div class='del'>-			if (!(param-&gt;u.crypt.flags &amp; IW_ENCODE_MODE)) {</div><div class='del'>-				/* we cannot do anything. Complain. */</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* now read the flags */</div><div class='del'>-	if (param-&gt;u.crypt.flags &amp; IW_ENCODE_DISABLED) {</div><div class='del'>-		/* Encoding disabled,</div><div class='del'>-		 * authen = DOT11_AUTH_OS;</div><div class='del'>-		 * invoke = 0;</div><div class='del'>-		 * exunencrypt = 0; */</div><div class='del'>-	}</div><div class='del'>-	if (param-&gt;u.crypt.flags &amp; IW_ENCODE_OPEN)</div><div class='del'>-		/* Encode but accept non-encoded packets. No auth */</div><div class='del'>-		invoke = 1;</div><div class='del'>-	if ((param-&gt;u.crypt.flags &amp; IW_ENCODE_RESTRICTED) || force) {</div><div class='del'>-		/* Refuse non-encoded packets. Auth */</div><div class='del'>-		authen = DOT11_AUTH_BOTH;</div><div class='del'>-		invoke = 1;</div><div class='del'>-		exunencrypt = 1;</div><div class='del'>-	}</div><div class='del'>-	/* do the change if requested  */</div><div class='del'>-	if ((param-&gt;u.crypt.flags &amp; IW_ENCODE_MODE) || force) {</div><div class='del'>-		rvalue |=</div><div class='del'>-		    mgt_set_request(priv, DOT11_OID_AUTHENABLE, 0, &amp;authen);</div><div class='del'>-		rvalue |=</div><div class='del'>-		    mgt_set_request(priv, DOT11_OID_PRIVACYINVOKED, 0, &amp;invoke);</div><div class='del'>-		rvalue |=</div><div class='del'>-		    mgt_set_request(priv, DOT11_OID_EXUNENCRYPTED, 0,</div><div class='del'>-				    &amp;exunencrypt);</div><div class='del'>-	}</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism2_ioctl_set_generic_element(struct net_device *ndev,</div><div class='del'>-	struct prism2_hostapd_param *param,</div><div class='del'>-	int param_len)</div><div class='del'>-{</div><div class='del'>-       islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-       int max_len, len, alen, ret=0;</div><div class='del'>-       struct obj_attachment *attach;</div><div class='del'>-</div><div class='del'>-       len = param-&gt;u.generic_elem.len;</div><div class='del'>-       max_len = param_len - PRISM2_HOSTAPD_GENERIC_ELEMENT_HDR_LEN;</div><div class='del'>-       if (max_len &lt; 0 || max_len &lt; len)</div><div class='del'>-               return -EINVAL;</div><div class='del'>-</div><div class='del'>-       alen = sizeof(*attach) + len;</div><div class='del'>-       attach = kzalloc(alen, GFP_KERNEL);</div><div class='del'>-       if (attach == NULL)</div><div class='del'>-               return -ENOMEM;</div><div class='del'>-</div><div class='del'>-#define WLAN_FC_TYPE_MGMT 0</div><div class='del'>-#define WLAN_FC_STYPE_ASSOC_REQ 0</div><div class='del'>-#define WLAN_FC_STYPE_REASSOC_REQ 2</div><div class='del'>-</div><div class='del'>-       /* Note: endianness is covered by mgt_set_varlen */</div><div class='del'>-</div><div class='del'>-       attach-&gt;type = (WLAN_FC_TYPE_MGMT &lt;&lt; 2) |</div><div class='del'>-               (WLAN_FC_STYPE_ASSOC_REQ &lt;&lt; 4);</div><div class='del'>-       attach-&gt;id = -1;</div><div class='del'>-       attach-&gt;size = len;</div><div class='del'>-       memcpy(attach-&gt;data, param-&gt;u.generic_elem.data, len);</div><div class='del'>-</div><div class='del'>-       ret = mgt_set_varlen(priv, DOT11_OID_ATTACHMENT, attach, len);</div><div class='del'>-</div><div class='del'>-       if (ret == 0) {</div><div class='del'>-               attach-&gt;type = (WLAN_FC_TYPE_MGMT &lt;&lt; 2) |</div><div class='del'>-                       (WLAN_FC_STYPE_REASSOC_REQ &lt;&lt; 4);</div><div class='del'>-</div><div class='del'>-	       ret = mgt_set_varlen(priv, DOT11_OID_ATTACHMENT, attach, len);</div><div class='del'>-</div><div class='del'>-	       if (ret == 0)</div><div class='del'>-		       printk(KERN_DEBUG "%s: WPA IE Attachment was set\n",</div><div class='del'>-				       ndev-&gt;name);</div><div class='del'>-       }</div><div class='del'>-</div><div class='del'>-       kfree(attach);</div><div class='del'>-       return ret;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism2_ioctl_mlme(struct net_device *dev, struct prism2_hostapd_param *param)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism2_ioctl_scan_req(struct net_device *ndev,</div><div class='del'>-                     struct prism2_hostapd_param *param)</div><div class='del'>-{</div><div class='del'>-	islpci_private *priv = netdev_priv(ndev);</div><div class='del'>-	struct iw_request_info info;</div><div class='del'>-	int i, rvalue;</div><div class='del'>-	struct obj_bsslist *bsslist;</div><div class='del'>-	u32 noise = 0;</div><div class='del'>-	char *extra = "";</div><div class='del'>-	char *current_ev = "foo";</div><div class='del'>-	union oid_res_t r;</div><div class='del'>-</div><div class='del'>-	if (islpci_get_state(priv) &lt; PRV_STATE_INIT) {</div><div class='del'>-		/* device is not ready, fail gently */</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* first get the noise value. We will use it to report the link quality */</div><div class='del'>-	rvalue = mgt_get_request(priv, DOT11_OID_NOISEFLOOR, 0, NULL, &amp;r);</div><div class='del'>-	noise = r.u;</div><div class='del'>-</div><div class='del'>-	/* Ask the device for a list of known bss. We can report at most</div><div class='del'>-	 * IW_MAX_AP=64 to the range struct. But the device won't repport anything</div><div class='del'>-	 * if you change the value of IWMAX_BSS=24.</div><div class='del'>-	 */</div><div class='del'>-	rvalue |= mgt_get_request(priv, DOT11_OID_BSSLIST, 0, NULL, &amp;r);</div><div class='del'>-	bsslist = r.ptr;</div><div class='del'>-</div><div class='del'>-	info.cmd = PRISM54_HOSTAPD;</div><div class='del'>-	info.flags = 0;</div><div class='del'>-</div><div class='del'>-	/* ok now, scan the list and translate its info */</div><div class='del'>-	for (i = 0; i &lt; min(IW_MAX_AP, (int) bsslist-&gt;nr); i++)</div><div class='del'>-		current_ev = prism54_translate_bss(ndev, &amp;info, current_ev,</div><div class='del'>-						   extra + IW_SCAN_MAX_DATA,</div><div class='del'>-						   &amp;(bsslist-&gt;bsslist[i]),</div><div class='del'>-						   noise);</div><div class='del'>-	kfree(bsslist);</div><div class='del'>-</div><div class='del'>-	return rvalue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prism54_hostapd(struct net_device *ndev, struct iw_point *p)</div><div class='del'>-{</div><div class='del'>-       struct prism2_hostapd_param *param;</div><div class='del'>-       int ret = 0;</div><div class='del'>-       u32 uwrq;</div><div class='del'>-</div><div class='del'>-       printk(KERN_DEBUG "prism54_hostapd - len=%d\n", p-&gt;length);</div><div class='del'>-       if (p-&gt;length &lt; sizeof(struct prism2_hostapd_param) ||</div><div class='del'>-           p-&gt;length &gt; PRISM2_HOSTAPD_MAX_BUF_SIZE || !p-&gt;pointer)</div><div class='del'>-               return -EINVAL;</div><div class='del'>-</div><div class='del'>-	param = memdup_user(p-&gt;pointer, p-&gt;length);</div><div class='del'>-	if (IS_ERR(param))</div><div class='del'>-		return PTR_ERR(param);</div><div class='del'>-</div><div class='del'>-       switch (param-&gt;cmd) {</div><div class='del'>-       case PRISM2_SET_ENCRYPTION:</div><div class='del'>-	       printk(KERN_DEBUG "%s: Caught WPA supplicant set encryption request\n",</div><div class='del'>-			       ndev-&gt;name);</div><div class='del'>-               ret = prism2_ioctl_set_encryption(ndev, param, p-&gt;length);</div><div class='del'>-               break;</div><div class='del'>-       case PRISM2_HOSTAPD_SET_GENERIC_ELEMENT:</div><div class='del'>-	       printk(KERN_DEBUG "%s: Caught WPA supplicant set WPA IE request\n",</div><div class='del'>-			       ndev-&gt;name);</div><div class='del'>-               ret = prism2_ioctl_set_generic_element(ndev, param,</div><div class='del'>-                                                      p-&gt;length);</div><div class='del'>-               break;</div><div class='del'>-       case PRISM2_HOSTAPD_MLME:</div><div class='del'>-	       printk(KERN_DEBUG "%s: Caught WPA supplicant MLME request\n",</div><div class='del'>-			       ndev-&gt;name);</div><div class='del'>-               ret = prism2_ioctl_mlme(ndev, param);</div><div class='del'>-               break;</div><div class='del'>-       case PRISM2_HOSTAPD_SCAN_REQ:</div><div class='del'>-	       printk(KERN_DEBUG "%s: Caught WPA supplicant scan request\n",</div><div class='del'>-			       ndev-&gt;name);</div><div class='del'>-               ret = prism2_ioctl_scan_req(ndev, param);</div><div class='del'>-               break;</div><div class='del'>-	case PRISM54_SET_WPA:</div><div class='del'>-	       printk(KERN_DEBUG "%s: Caught WPA supplicant wpa init request\n",</div><div class='del'>-			       ndev-&gt;name);</div><div class='del'>-	       uwrq = 1;</div><div class='del'>-	       ret = prism54_set_wpa(ndev, NULL, &amp;uwrq, NULL);</div><div class='del'>-	       break;</div><div class='del'>-	case PRISM54_DROP_UNENCRYPTED:</div><div class='del'>-	       printk(KERN_DEBUG "%s: Caught WPA drop unencrypted request\n",</div><div class='del'>-			       ndev-&gt;name);</div><div class='del'>-#if 0</div><div class='del'>-	       uwrq = 0x01;</div><div class='del'>-	       mgt_set(priv, DOT11_OID_EXUNENCRYPTED, &amp;uwrq);</div><div class='del'>-	       down_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-	       mgt_commit(priv);</div><div class='del'>-	       up_write(&amp;priv-&gt;mib_sem);</div><div class='del'>-#endif</div><div class='del'>-	       /* Not necessary, as set_wpa does it, should we just do it here though? */</div><div class='del'>-	       ret = 0;</div><div class='del'>-	       break;</div><div class='del'>-       default:</div><div class='del'>-	       printk(KERN_DEBUG "%s: Caught a WPA supplicant request that is not supported\n",</div><div class='del'>-			       ndev-&gt;name);</div><div class='del'>-               ret = -EOPNOTSUPP;</div><div class='del'>-               break;</div><div class='del'>-       }</div><div class='del'>-</div><div class='del'>-       if (ret == 0 &amp;&amp; copy_to_user(p-&gt;pointer, param, p-&gt;length))</div><div class='del'>-               ret = -EFAULT;</div><div class='del'>-</div><div class='del'>-       kfree(param);</div><div class='del'>-</div><div class='del'>-       return ret;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> prism54_set_wpa(struct net_device *ndev, struct iw_request_info *info,</div><div class='hunk'>@@ -3223,20 +2907,3 @@ const struct iw_handler_def prism54_handler_def = {</div><div class='ctx'> 	.private_args = (struct iw_priv_args *) prism54_private_args,</div><div class='ctx'> 	.get_wireless_stats = prism54_get_wireless_stats,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-/* For wpa_supplicant */</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-prism54_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)</div><div class='del'>-{</div><div class='del'>-	struct iwreq *wrq = (struct iwreq *) rq;</div><div class='del'>-	int ret = -1;</div><div class='del'>-	switch (cmd) {</div><div class='del'>-		case PRISM54_HOSTAPD:</div><div class='del'>-		if (!capable(CAP_NET_ADMIN))</div><div class='del'>-			return -EPERM;</div><div class='del'>-		ret = prism54_hostapd(ndev, &amp;wrq-&gt;u.data);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/wireless/prism54/isl_ioctl.h b/drivers/net/wireless/prism54/isl_ioctl.h<br/>index bcfbfb9281d2..a34bceb6e3cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/prism54/isl_ioctl.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/prism54/isl_ioctl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/prism54/isl_ioctl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/prism54/isl_ioctl.h</a></div><div class='hunk'>@@ -43,8 +43,6 @@ void prism54_wpa_bss_ie_clean(islpci_private *priv);</div><div class='ctx'> </div><div class='ctx'> int prism54_set_mac_address(struct net_device *, void *);</div><div class='ctx'> </div><div class='del'>-int prism54_ioctl(struct net_device *, struct ifreq *, int);</div><div class='del'>-</div><div class='ctx'> extern const struct iw_handler_def prism54_handler_def;</div><div class='ctx'> </div><div class='ctx'> #endif				/* _ISL_IOCTL_H */</div><div class='head'>diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c<br/>index 5d0f61508a2e..5970ff6f40cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/prism54/islpci_dev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/prism54/islpci_dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/prism54/islpci_dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/prism54/islpci_dev.c</a></div><div class='hunk'>@@ -793,8 +793,8 @@ islpci_set_multicast_list(struct net_device *dev)</div><div class='ctx'> static void islpci_ethtool_get_drvinfo(struct net_device *dev,</div><div class='ctx'>                                        struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strcpy(info-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='add'>+	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops islpci_ethtool_ops = {</div><div class='hunk'>@@ -804,7 +804,6 @@ static const struct ethtool_ops islpci_ethtool_ops = {</div><div class='ctx'> static const struct net_device_ops islpci_netdev_ops = {</div><div class='ctx'> 	.ndo_open 		= islpci_open,</div><div class='ctx'> 	.ndo_stop		= islpci_close,</div><div class='del'>-	.ndo_do_ioctl		= prism54_ioctl,</div><div class='ctx'> 	.ndo_start_xmit		= islpci_eth_transmit,</div><div class='ctx'> 	.ndo_tx_timeout		= islpci_eth_tx_timeout,</div><div class='ctx'> 	.ndo_set_mac_address 	= prism54_set_mac_address,</div><div class='head'>diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c<br/>index 0021e4948512..04fec1fa6e0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ray_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/ray_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ray_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/ray_cs.c</a></div><div class='hunk'>@@ -2426,7 +2426,7 @@ static void rx_authenticate(ray_dev_t *local, struct rcs __iomem *prcs,</div><div class='ctx'> 			    unsigned int pkt_addr, int rx_len)</div><div class='ctx'> {</div><div class='ctx'> 	UCHAR buff[256];</div><div class='del'>-	struct rx_msg *msg = (struct rx_msg *)buff;</div><div class='add'>+	struct ray_rx_msg *msg = (struct ray_rx_msg *) buff;</div><div class='ctx'> </div><div class='ctx'> 	del_timer(&amp;local-&gt;timer);</div><div class='ctx'> </div><div class='hunk'>@@ -2513,7 +2513,7 @@ static void rx_deauthenticate(ray_dev_t *local, struct rcs __iomem *prcs,</div><div class='ctx'> 			      unsigned int pkt_addr, int rx_len)</div><div class='ctx'> {</div><div class='ctx'> /*  UCHAR buff[256];</div><div class='del'>-    struct rx_msg *msg = (struct rx_msg *)buff;</div><div class='add'>+    struct ray_rx_msg *msg = (struct ray_rx_msg *) buff;</div><div class='ctx'> */</div><div class='ctx'> 	pr_debug("Deauthentication frame received\n");</div><div class='ctx'> 	local-&gt;authentication_state = UNAUTHENTICATED;</div><div class='head'>diff --git a/drivers/net/wireless/rayctl.h b/drivers/net/wireless/rayctl.h<br/>index d7646f299bd3..3c3b98b152c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rayctl.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rayctl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rayctl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rayctl.h</a></div><div class='hunk'>@@ -566,9 +566,9 @@ struct phy_header {</div><div class='ctx'>     UCHAR hdr_3;</div><div class='ctx'>     UCHAR hdr_4;</div><div class='ctx'> };</div><div class='del'>-struct rx_msg {</div><div class='add'>+struct ray_rx_msg {</div><div class='ctx'>     struct mac_header mac;</div><div class='del'>-    UCHAR  var[1];</div><div class='add'>+    UCHAR  var[0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct tx_msg {</div><div class='head'>diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c<br/>index 0c13840a7de5..a330c69583d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rndis_wlan.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rndis_wlan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rndis_wlan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rndis_wlan.c</a></div><div class='hunk'>@@ -244,6 +244,10 @@ enum ndis_80211_power_mode {</div><div class='ctx'> 	NDIS_80211_POWER_MODE_FAST_PSP,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum ndis_80211_pmkid_cand_list_flag_bits {</div><div class='add'>+	NDIS_80211_PMKID_CAND_PREAUTH = cpu_to_le32(1 &lt;&lt; 0)</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ndis_80211_auth_request {</div><div class='ctx'> 	__le32 length;</div><div class='ctx'> 	u8 bssid[6];</div><div class='hunk'>@@ -387,19 +391,17 @@ struct ndis_80211_capability {</div><div class='ctx'> struct ndis_80211_bssid_info {</div><div class='ctx'> 	u8 bssid[6];</div><div class='ctx'> 	u8 pmkid[16];</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct ndis_80211_pmkid {</div><div class='ctx'> 	__le32 length;</div><div class='ctx'> 	__le32 bssid_info_count;</div><div class='ctx'> 	struct ndis_80211_bssid_info bssid_info[0];</div><div class='del'>-};</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  private data</div><div class='ctx'>  */</div><div class='del'>-#define NET_TYPE_11FB	0</div><div class='del'>-</div><div class='ctx'> #define CAP_MODE_80211A		1</div><div class='ctx'> #define CAP_MODE_80211B		2</div><div class='ctx'> #define CAP_MODE_80211G		4</div><div class='hunk'>@@ -414,6 +416,7 @@ struct ndis_80211_pmkid {</div><div class='ctx'> #define RNDIS_WLAN_ALG_TKIP	(1&lt;&lt;1)</div><div class='ctx'> #define RNDIS_WLAN_ALG_CCMP	(1&lt;&lt;2)</div><div class='ctx'> </div><div class='add'>+#define RNDIS_WLAN_NUM_KEYS		4</div><div class='ctx'> #define RNDIS_WLAN_KEY_MGMT_NONE	0</div><div class='ctx'> #define RNDIS_WLAN_KEY_MGMT_802_1X	(1&lt;&lt;0)</div><div class='ctx'> #define RNDIS_WLAN_KEY_MGMT_PSK		(1&lt;&lt;1)</div><div class='hunk'>@@ -516,7 +519,7 @@ struct rndis_wlan_private {</div><div class='ctx'> </div><div class='ctx'> 	/* encryption stuff */</div><div class='ctx'> 	int  encr_tx_key_index;</div><div class='del'>-	struct rndis_wlan_encr_key encr_keys[4];</div><div class='add'>+	struct rndis_wlan_encr_key encr_keys[RNDIS_WLAN_NUM_KEYS];</div><div class='ctx'> 	int  wpa_version;</div><div class='ctx'> </div><div class='ctx'> 	u8 command_buffer[COMMAND_BUFFER_SIZE];</div><div class='hunk'>@@ -1346,6 +1349,32 @@ static int set_channel(struct usbnet *usbdev, int channel)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct ieee80211_channel *get_current_channel(struct usbnet *usbdev,</div><div class='add'>+						     u16 *beacon_interval)</div><div class='add'>+{</div><div class='add'>+	struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);</div><div class='add'>+	struct ieee80211_channel *channel;</div><div class='add'>+	struct ndis_80211_conf config;</div><div class='add'>+	int len, ret;</div><div class='add'>+</div><div class='add'>+	/* Get channel and beacon interval */</div><div class='add'>+	len = sizeof(config);</div><div class='add'>+	ret = rndis_query_oid(usbdev, OID_802_11_CONFIGURATION, &amp;config, &amp;len);</div><div class='add'>+	netdev_dbg(usbdev-&gt;net, "%s(): OID_802_11_CONFIGURATION -&gt; %d\n",</div><div class='add'>+				__func__, ret);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	channel = ieee80211_get_channel(priv-&gt;wdev.wiphy,</div><div class='add'>+				KHZ_TO_MHZ(le32_to_cpu(config.ds_config)));</div><div class='add'>+	if (!channel)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (beacon_interval)</div><div class='add'>+		*beacon_interval = le16_to_cpu(config.beacon_period);</div><div class='add'>+	return channel;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* index must be 0 - N, as per NDIS  */</div><div class='ctx'> static int add_wep_key(struct usbnet *usbdev, const u8 *key, int key_len,</div><div class='ctx'> 								int index)</div><div class='hunk'>@@ -1535,6 +1564,9 @@ static int remove_key(struct usbnet *usbdev, int index, const u8 *bssid)</div><div class='ctx'> 	bool is_wpa;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (index &gt;= RNDIS_WLAN_NUM_KEYS)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='ctx'> 	if (priv-&gt;encr_keys[index].len == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1972,11 +2004,12 @@ static int rndis_scan(struct wiphy *wiphy, struct net_device *dev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct cfg80211_bss *rndis_bss_info_update(struct usbnet *usbdev,</div><div class='del'>-					struct ndis_80211_bssid_ex *bssid)</div><div class='add'>+static bool rndis_bss_info_update(struct usbnet *usbdev,</div><div class='add'>+				  struct ndis_80211_bssid_ex *bssid)</div><div class='ctx'> {</div><div class='ctx'> 	struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);</div><div class='ctx'> 	struct ieee80211_channel *channel;</div><div class='add'>+	struct cfg80211_bss *bss;</div><div class='ctx'> 	s32 signal;</div><div class='ctx'> 	u64 timestamp;</div><div class='ctx'> 	u16 capability;</div><div class='hunk'>@@ -2015,9 +2048,12 @@ static struct cfg80211_bss *rndis_bss_info_update(struct usbnet *usbdev,</div><div class='ctx'> 	capability = le16_to_cpu(fixed-&gt;capabilities);</div><div class='ctx'> 	beacon_interval = le16_to_cpu(fixed-&gt;beacon_interval);</div><div class='ctx'> </div><div class='del'>-	return cfg80211_inform_bss(priv-&gt;wdev.wiphy, channel, bssid-&gt;mac,</div><div class='add'>+	bss = cfg80211_inform_bss(priv-&gt;wdev.wiphy, channel, bssid-&gt;mac,</div><div class='ctx'> 		timestamp, capability, beacon_interval, ie, ie_len, signal,</div><div class='ctx'> 		GFP_KERNEL);</div><div class='add'>+	cfg80211_put_bss(bss);</div><div class='add'>+</div><div class='add'>+	return (bss != NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ndis_80211_bssid_ex *next_bssid_list_item(</div><div class='hunk'>@@ -2451,6 +2487,9 @@ static int rndis_set_default_key(struct wiphy *wiphy, struct net_device *netdev,</div><div class='ctx'> </div><div class='ctx'> 	netdev_dbg(usbdev-&gt;net, "%s(%i)\n", __func__, key_index);</div><div class='ctx'> </div><div class='add'>+	if (key_index &gt;= RNDIS_WLAN_NUM_KEYS)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='ctx'> 	priv-&gt;encr_tx_key_index = key_index;</div><div class='ctx'> </div><div class='ctx'> 	if (is_wpa_key(priv, key_index))</div><div class='hunk'>@@ -2639,12 +2678,12 @@ static void rndis_wlan_craft_connected_bss(struct usbnet *usbdev, u8 *bssid,</div><div class='ctx'> {</div><div class='ctx'> 	struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);</div><div class='ctx'> 	struct ieee80211_channel *channel;</div><div class='del'>-	struct ndis_80211_conf config;</div><div class='ctx'> 	struct ndis_80211_ssid ssid;</div><div class='add'>+	struct cfg80211_bss *bss;</div><div class='ctx'> 	s32 signal;</div><div class='ctx'> 	u64 timestamp;</div><div class='ctx'> 	u16 capability;</div><div class='del'>-	u16 beacon_interval;</div><div class='add'>+	u16 beacon_interval = 0;</div><div class='ctx'> 	__le32 rssi;</div><div class='ctx'> 	u8 ie_buf[34];</div><div class='ctx'> 	int len, ret, ie_len;</div><div class='hunk'>@@ -2669,22 +2708,10 @@ static void rndis_wlan_craft_connected_bss(struct usbnet *usbdev, u8 *bssid,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get channel and beacon interval */</div><div class='del'>-	len = sizeof(config);</div><div class='del'>-	ret = rndis_query_oid(usbdev, OID_802_11_CONFIGURATION, &amp;config, &amp;len);</div><div class='del'>-	netdev_dbg(usbdev-&gt;net, "%s(): OID_802_11_CONFIGURATION -&gt; %d\n",</div><div class='del'>-				__func__, ret);</div><div class='del'>-	if (ret &gt;= 0) {</div><div class='del'>-		beacon_interval = le16_to_cpu(config.beacon_period);</div><div class='del'>-		channel = ieee80211_get_channel(priv-&gt;wdev.wiphy,</div><div class='del'>-				KHZ_TO_MHZ(le32_to_cpu(config.ds_config)));</div><div class='del'>-		if (!channel) {</div><div class='del'>-			netdev_warn(usbdev-&gt;net, "%s(): could not get channel."</div><div class='del'>-						 "\n", __func__);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		netdev_warn(usbdev-&gt;net, "%s(): could not get configuration.\n",</div><div class='del'>-					 __func__);</div><div class='add'>+	channel = get_current_channel(usbdev, &amp;beacon_interval);</div><div class='add'>+	if (!channel) {</div><div class='add'>+		netdev_warn(usbdev-&gt;net, "%s(): could not get channel.\n",</div><div class='add'>+					__func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2714,9 +2741,10 @@ static void rndis_wlan_craft_connected_bss(struct usbnet *usbdev, u8 *bssid,</div><div class='ctx'> 		bssid, (u32)timestamp, capability, beacon_interval, ie_len,</div><div class='ctx'> 		ssid.essid, signal);</div><div class='ctx'> </div><div class='del'>-	cfg80211_inform_bss(priv-&gt;wdev.wiphy, channel, bssid,</div><div class='add'>+	bss = cfg80211_inform_bss(priv-&gt;wdev.wiphy, channel, bssid,</div><div class='ctx'> 		timestamp, capability, beacon_interval, ie_buf, ie_len,</div><div class='ctx'> 		signal, GFP_KERNEL);</div><div class='add'>+	cfg80211_put_bss(bss);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2828,8 +2856,9 @@ static void rndis_wlan_do_link_up_work(struct usbnet *usbdev)</div><div class='ctx'> 						req_ie_len, resp_ie,</div><div class='ctx'> 						resp_ie_len, 0, GFP_KERNEL);</div><div class='ctx'> 		else</div><div class='del'>-			cfg80211_roamed(usbdev-&gt;net, NULL, bssid,</div><div class='del'>-					req_ie, req_ie_len,</div><div class='add'>+			cfg80211_roamed(usbdev-&gt;net,</div><div class='add'>+					get_current_channel(usbdev, NULL),</div><div class='add'>+					bssid, req_ie, req_ie_len,</div><div class='ctx'> 					resp_ie, resp_ie_len, GFP_KERNEL);</div><div class='ctx'> 	} else if (priv-&gt;infra_mode == NDIS_80211_INFRA_ADHOC)</div><div class='ctx'> 		cfg80211_ibss_joined(usbdev-&gt;net, bssid, GFP_KERNEL);</div><div class='hunk'>@@ -2995,25 +3024,13 @@ static void rndis_wlan_pmkid_cand_list_indication(struct usbnet *usbdev,</div><div class='ctx'> 	for (i = 0; i &lt; le32_to_cpu(cand_list-&gt;num_candidates); i++) {</div><div class='ctx'> 		struct ndis_80211_pmkid_candidate *cand =</div><div class='ctx'> 						&amp;cand_list-&gt;candidate_list[i];</div><div class='add'>+		bool preauth = !!(cand-&gt;flags &amp; NDIS_80211_PMKID_CAND_PREAUTH);</div><div class='ctx'> </div><div class='del'>-		netdev_dbg(usbdev-&gt;net, "cand[%i]: flags: 0x%08x, bssid: %pM\n",</div><div class='del'>-			   i, le32_to_cpu(cand-&gt;flags), cand-&gt;bssid);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-		struct iw_pmkid_cand pcand;</div><div class='del'>-		union iwreq_data wrqu;</div><div class='del'>-</div><div class='del'>-		memset(&amp;pcand, 0, sizeof(pcand));</div><div class='del'>-		if (le32_to_cpu(cand-&gt;flags) &amp; 0x01)</div><div class='del'>-			pcand.flags |= IW_PMKID_CAND_PREAUTH;</div><div class='del'>-		pcand.index = i;</div><div class='del'>-		memcpy(pcand.bssid.sa_data, cand-&gt;bssid, ETH_ALEN);</div><div class='add'>+		netdev_dbg(usbdev-&gt;net, "cand[%i]: flags: 0x%08x, preauth: %d, bssid: %pM\n",</div><div class='add'>+			   i, le32_to_cpu(cand-&gt;flags), preauth, cand-&gt;bssid);</div><div class='ctx'> </div><div class='del'>-		memset(&amp;wrqu, 0, sizeof(wrqu));</div><div class='del'>-		wrqu.data.length = sizeof(pcand);</div><div class='del'>-		wireless_send_event(usbdev-&gt;net, IWEVPMKIDCAND, &amp;wrqu,</div><div class='del'>-								(u8 *)&amp;pcand);</div><div class='del'>-#endif</div><div class='add'>+		cfg80211_pmksa_candidate_notify(usbdev-&gt;net, i, cand-&gt;bssid,</div><div class='add'>+						preauth, GFP_ATOMIC);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3754,17 +3771,7 @@ static struct usb_driver rndis_wlan_driver = {</div><div class='ctx'> 	.resume =	usbnet_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init rndis_wlan_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;rndis_wlan_driver);</div><div class='del'>-}</div><div class='del'>-module_init(rndis_wlan_init);</div><div class='del'>-</div><div class='del'>-static void __exit rndis_wlan_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;rndis_wlan_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(rndis_wlan_exit);</div><div class='add'>+module_usb_driver(rndis_wlan_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Bjorge Dijkstra");</div><div class='ctx'> MODULE_AUTHOR("Jussi Kivilinna");</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c<br/>index 53c5f878f61d..1de9c752c88b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt2500usb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt2500usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt2500usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rt2x00/rt2500usb.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Allow hardware encryption to be disabled.</div><div class='ctx'>  */</div><div class='del'>-static int modparam_nohwcrypt;</div><div class='add'>+static bool modparam_nohwcrypt;</div><div class='ctx'> module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");</div><div class='ctx'> </div><div class='hunk'>@@ -1982,15 +1982,4 @@ static struct usb_driver rt2500usb_driver = {</div><div class='ctx'> 	.resume		= rt2x00usb_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init rt2500usb_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;rt2500usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit rt2500usb_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;rt2500usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(rt2500usb_init);</div><div class='del'>-module_exit(rt2500usb_exit);</div><div class='add'>+module_usb_driver(rt2500usb_driver);</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h<br/>index 4778620347c4..2571a2fa3d09 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt2800.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt2800.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt2800.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rt2x00/rt2800.h</a></div><div class='hunk'>@@ -50,7 +50,7 @@</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'>- * RF3853 2.4G/5G 3T3R(RT3883/RT3563/RT3573/RT3593/RT3662)</div><div class='add'>+ * RF3053 2.4G/5G 3T3R(RT3883/RT3563/RT3573/RT3593/RT3662)</div><div class='ctx'>  * RF5370 2.4G 1T1R</div><div class='ctx'>  * RF5390 2.4G 1T1R</div><div class='ctx'>  */</div><div class='hunk'>@@ -66,7 +66,7 @@</div><div class='ctx'> #define RF2853				0x000a</div><div class='ctx'> #define RF3320				0x000b</div><div class='ctx'> #define RF3322				0x000c</div><div class='del'>-#define RF3853				0x000d</div><div class='add'>+#define RF3053				0x000d</div><div class='ctx'> #define RF5370				0x5370</div><div class='ctx'> #define RF5390				0x5390</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c<br/>index 1ba079dffb11..22a1a8fc6e02 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt2800lib.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt2800lib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt2800lib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rt2x00/rt2800lib.c</a></div><div class='hunk'>@@ -1203,8 +1203,10 @@ void rt2800_config_filter(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 			   !(filter_flags &amp; FIF_CONTROL));</div><div class='ctx'> 	rt2x00_set_field32(&amp;reg, RX_FILTER_CFG_DROP_PSPOLL,</div><div class='ctx'> 			   !(filter_flags &amp; FIF_PSPOLL));</div><div class='del'>-	rt2x00_set_field32(&amp;reg, RX_FILTER_CFG_DROP_BA, 1);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, RX_FILTER_CFG_DROP_BAR, 0);</div><div class='add'>+	rt2x00_set_field32(&amp;reg, RX_FILTER_CFG_DROP_BA,</div><div class='add'>+			   !(filter_flags &amp; FIF_CONTROL));</div><div class='add'>+	rt2x00_set_field32(&amp;reg, RX_FILTER_CFG_DROP_BAR,</div><div class='add'>+			   !(filter_flags &amp; FIF_CONTROL));</div><div class='ctx'> 	rt2x00_set_field32(&amp;reg, RX_FILTER_CFG_DROP_CNTL,</div><div class='ctx'> 			   !(filter_flags &amp; FIF_CONTROL));</div><div class='ctx'> 	rt2800_register_write(rt2x00dev, RX_FILTER_CFG, reg);</div><div class='hunk'>@@ -1942,19 +1944,24 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 		info-&gt;default_power2 = TXPOWER_A_TO_DEV(info-&gt;default_power2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (rt2x00_rf(rt2x00dev, RF2020) ||</div><div class='del'>-	    rt2x00_rf(rt2x00dev, RF3020) ||</div><div class='del'>-	    rt2x00_rf(rt2x00dev, RF3021) ||</div><div class='del'>-	    rt2x00_rf(rt2x00dev, RF3022) ||</div><div class='del'>-	    rt2x00_rf(rt2x00dev, RF3320))</div><div class='add'>+	switch (rt2x00dev-&gt;chip.rf) {</div><div class='add'>+	case RF2020:</div><div class='add'>+	case RF3020:</div><div class='add'>+	case RF3021:</div><div class='add'>+	case RF3022:</div><div class='add'>+	case RF3320:</div><div class='ctx'> 		rt2800_config_channel_rf3xxx(rt2x00dev, conf, rf, info);</div><div class='del'>-	else if (rt2x00_rf(rt2x00dev, RF3052))</div><div class='add'>+		break;</div><div class='add'>+	case RF3052:</div><div class='ctx'> 		rt2800_config_channel_rf3052(rt2x00dev, conf, rf, info);</div><div class='del'>-	else if (rt2x00_rf(rt2x00dev, RF5370) ||</div><div class='del'>-		 rt2x00_rf(rt2x00dev, RF5390))</div><div class='add'>+		break;</div><div class='add'>+	case RF5370:</div><div class='add'>+	case RF5390:</div><div class='ctx'> 		rt2800_config_channel_rf53xx(rt2x00dev, conf, rf, info);</div><div class='del'>-	else</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Change BBP settings</div><div class='hunk'>@@ -3930,15 +3937,18 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> 	rt2x00_set_chip(rt2x00dev, rt2x00_get_field32(reg, MAC_CSR0_CHIPSET),</div><div class='ctx'> 			value, rt2x00_get_field32(reg, MAC_CSR0_REVISION));</div><div class='ctx'> </div><div class='del'>-	if (!rt2x00_rt(rt2x00dev, RT2860) &amp;&amp;</div><div class='del'>-	    !rt2x00_rt(rt2x00dev, RT2872) &amp;&amp;</div><div class='del'>-	    !rt2x00_rt(rt2x00dev, RT2883) &amp;&amp;</div><div class='del'>-	    !rt2x00_rt(rt2x00dev, RT3070) &amp;&amp;</div><div class='del'>-	    !rt2x00_rt(rt2x00dev, RT3071) &amp;&amp;</div><div class='del'>-	    !rt2x00_rt(rt2x00dev, RT3090) &amp;&amp;</div><div class='del'>-	    !rt2x00_rt(rt2x00dev, RT3390) &amp;&amp;</div><div class='del'>-	    !rt2x00_rt(rt2x00dev, RT3572) &amp;&amp;</div><div class='del'>-	    !rt2x00_rt(rt2x00dev, RT5390)) {</div><div class='add'>+	switch (rt2x00dev-&gt;chip.rt) {</div><div class='add'>+	case RT2860:</div><div class='add'>+	case RT2872:</div><div class='add'>+	case RT2883:</div><div class='add'>+	case RT3070:</div><div class='add'>+	case RT3071:</div><div class='add'>+	case RT3090:</div><div class='add'>+	case RT3390:</div><div class='add'>+	case RT3572:</div><div class='add'>+	case RT5390:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		ERROR(rt2x00dev, "Invalid RT chipset detected.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4552,6 +4562,9 @@ int rt2800_get_survey(struct ieee80211_hw *hw, int idx,</div><div class='ctx'> 		survey-&gt;channel_time_ext_busy = busy_ext / 1000;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!(hw-&gt;conf.flags &amp; IEEE80211_CONF_OFFCHANNEL))</div><div class='add'>+		survey-&gt;filled |= SURVEY_INFO_IN_USE;</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/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c<br/>index da48c8ac27bd..dc88baefa72e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt2800pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt2800pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt2800pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rt2x00/rt2800pci.c</a></div><div class='hunk'>@@ -50,7 +50,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Allow hardware encryption to be disabled.</div><div class='ctx'>  */</div><div class='del'>-static int modparam_nohwcrypt = 0;</div><div class='add'>+static bool modparam_nohwcrypt = false;</div><div class='ctx'> module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");</div><div class='ctx'> </div><div class='hunk'>@@ -422,7 +422,6 @@ static int rt2800pci_init_queues(struct rt2x00_dev *rt2x00dev)</div><div class='ctx'> static void rt2800pci_toggle_irq(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 				 enum dev_state state)</div><div class='ctx'> {</div><div class='del'>-	int mask = (state == STATE_RADIO_IRQ_ON);</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -436,25 +435,14 @@ static void rt2800pci_toggle_irq(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;rt2x00dev-&gt;irqmask_lock, flags);</div><div class='del'>-	rt2x00pci_register_read(rt2x00dev, INT_MASK_CSR, &amp;reg);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, INT_MASK_CSR_RXDELAYINT, 0);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, INT_MASK_CSR_TXDELAYINT, 0);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, INT_MASK_CSR_RX_DONE, mask);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, INT_MASK_CSR_AC0_DMA_DONE, 0);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, INT_MASK_CSR_AC1_DMA_DONE, 0);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, INT_MASK_CSR_AC2_DMA_DONE, 0);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, INT_MASK_CSR_AC3_DMA_DONE, 0);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, INT_MASK_CSR_HCCA_DMA_DONE, 0);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, INT_MASK_CSR_MGMT_DMA_DONE, 0);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, INT_MASK_CSR_MCU_COMMAND, 0);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, INT_MASK_CSR_RXTX_COHERENT, 0);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, INT_MASK_CSR_TBTT, mask);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, INT_MASK_CSR_PRE_TBTT, mask);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, INT_MASK_CSR_TX_FIFO_STATUS, mask);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, INT_MASK_CSR_AUTO_WAKEUP, mask);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, INT_MASK_CSR_GPTIMER, 0);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, INT_MASK_CSR_RX_COHERENT, 0);</div><div class='del'>-	rt2x00_set_field32(&amp;reg, INT_MASK_CSR_TX_COHERENT, 0);</div><div class='add'>+	reg = 0;</div><div class='add'>+	if (state == STATE_RADIO_IRQ_ON) {</div><div class='add'>+		rt2x00_set_field32(&amp;reg, INT_MASK_CSR_RX_DONE, 1);</div><div class='add'>+		rt2x00_set_field32(&amp;reg, INT_MASK_CSR_TBTT, 1);</div><div class='add'>+		rt2x00_set_field32(&amp;reg, INT_MASK_CSR_PRE_TBTT, 1);</div><div class='add'>+		rt2x00_set_field32(&amp;reg, INT_MASK_CSR_TX_FIFO_STATUS, 1);</div><div class='add'>+		rt2x00_set_field32(&amp;reg, INT_MASK_CSR_AUTO_WAKEUP, 1);</div><div class='add'>+	}</div><div class='ctx'> 	rt2x00pci_register_write(rt2x00dev, INT_MASK_CSR, reg);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;rt2x00dev-&gt;irqmask_lock, flags);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c<br/>index 377876315b8d..262ee9eefb6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt2800usb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt2800usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt2800usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rt2x00/rt2800usb.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Allow hardware encryption to be disabled.</div><div class='ctx'>  */</div><div class='del'>-static int modparam_nohwcrypt;</div><div class='add'>+static bool modparam_nohwcrypt;</div><div class='ctx'> module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");</div><div class='ctx'> </div><div class='hunk'>@@ -400,10 +400,10 @@ static void rt2800usb_write_tx_desc(struct queue_entry *entry,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The size of TXINFO_W0_USB_DMA_TX_PKT_LEN is</div><div class='ctx'> 	 * TXWI + 802.11 header + L2 pad + payload + pad,</div><div class='del'>-	 * so need to decrease size of TXINFO and USB end pad.</div><div class='add'>+	 * so need to decrease size of TXINFO.</div><div class='ctx'> 	 */</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXINFO_W0_USB_DMA_TX_PKT_LEN,</div><div class='del'>-			   entry-&gt;skb-&gt;len - TXINFO_DESC_SIZE - 4);</div><div class='add'>+			   roundup(entry-&gt;skb-&gt;len, 4) - TXINFO_DESC_SIZE);</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXINFO_W0_WIV,</div><div class='ctx'> 			   !test_bit(ENTRY_TXD_ENCRYPT_IV, &amp;txdesc-&gt;flags));</div><div class='ctx'> 	rt2x00_set_field32(&amp;word, TXINFO_W0_QSEL, 2);</div><div class='hunk'>@@ -421,37 +421,20 @@ static void rt2800usb_write_tx_desc(struct queue_entry *entry,</div><div class='ctx'> 	skbdesc-&gt;desc_len = TXINFO_DESC_SIZE + TXWI_DESC_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rt2800usb_write_tx_data(struct queue_entry *entry,</div><div class='del'>-					struct txentry_desc *txdesc)</div><div class='add'>+/*</div><div class='add'>+ * TX data initialization</div><div class='add'>+ */</div><div class='add'>+static int rt2800usb_get_tx_data_len(struct queue_entry *entry)</div><div class='ctx'> {</div><div class='del'>-	unsigned int len;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	rt2800_write_tx_data(entry, txdesc);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='del'>-	 * pad(1~3 bytes) is added after each 802.11 payload.</div><div class='del'>-	 * USB end pad(4 bytes) is added at each USB bulk out packet end.</div><div class='add'>+	 * pad(1~3 bytes) is needed after each 802.11 payload.</div><div class='add'>+	 * USB end pad(4 bytes) is needed at each USB bulk out packet end.</div><div class='ctx'> 	 * TX frame format is :</div><div class='ctx'> 	 * | TXINFO | TXWI | 802.11 header | L2 pad | payload | pad | USB end pad |</div><div class='ctx'> 	 *                 |&lt;------------- tx_pkt_len -------------&gt;|</div><div class='ctx'> 	 */</div><div class='del'>-	len = roundup(entry-&gt;skb-&gt;len, 4) + 4;</div><div class='del'>-	err = skb_padto(entry-&gt;skb, len);</div><div class='del'>-	if (unlikely(err)) {</div><div class='del'>-		WARNING(entry-&gt;queue-&gt;rt2x00dev, "TX SKB padding error, out of memory\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	entry-&gt;skb-&gt;len = len;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * TX data initialization</div><div class='del'>- */</div><div class='del'>-static int rt2800usb_get_tx_data_len(struct queue_entry *entry)</div><div class='del'>-{</div><div class='del'>-	return entry-&gt;skb-&gt;len;</div><div class='add'>+	return roundup(entry-&gt;skb-&gt;len, 4) + 4;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -807,7 +790,7 @@ static const struct rt2x00lib_ops rt2800usb_rt2x00_ops = {</div><div class='ctx'> 	.flush_queue		= rt2x00usb_flush_queue,</div><div class='ctx'> 	.tx_dma_done		= rt2800usb_tx_dma_done,</div><div class='ctx'> 	.write_tx_desc		= rt2800usb_write_tx_desc,</div><div class='del'>-	.write_tx_data		= rt2800usb_write_tx_data,</div><div class='add'>+	.write_tx_data		= rt2800_write_tx_data,</div><div class='ctx'> 	.write_beacon		= rt2800_write_beacon,</div><div class='ctx'> 	.clear_beacon		= rt2800_clear_beacon,</div><div class='ctx'> 	.get_tx_data_len	= rt2800usb_get_tx_data_len,</div><div class='hunk'>@@ -914,12 +897,14 @@ static struct usb_device_id rt2800usb_device_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x050d, 0x8053) },</div><div class='ctx'> 	{ USB_DEVICE(0x050d, 0x805c) },</div><div class='ctx'> 	{ USB_DEVICE(0x050d, 0x815c) },</div><div class='add'>+	{ USB_DEVICE(0x050d, 0x825a) },</div><div class='ctx'> 	{ USB_DEVICE(0x050d, 0x825b) },</div><div class='ctx'> 	{ USB_DEVICE(0x050d, 0x935a) },</div><div class='ctx'> 	{ USB_DEVICE(0x050d, 0x935b) },</div><div class='ctx'> 	/* Buffalo */</div><div class='ctx'> 	{ USB_DEVICE(0x0411, 0x00e8) },</div><div class='ctx'> 	{ USB_DEVICE(0x0411, 0x0158) },</div><div class='add'>+	{ USB_DEVICE(0x0411, 0x015d) },</div><div class='ctx'> 	{ USB_DEVICE(0x0411, 0x016f) },</div><div class='ctx'> 	{ USB_DEVICE(0x0411, 0x01a2) },</div><div class='ctx'> 	/* Corega */</div><div class='hunk'>@@ -934,6 +919,8 @@ static struct usb_device_id rt2800usb_device_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x07d1, 0x3c0e) },</div><div class='ctx'> 	{ USB_DEVICE(0x07d1, 0x3c0f) },</div><div class='ctx'> 	{ USB_DEVICE(0x07d1, 0x3c11) },</div><div class='add'>+	{ USB_DEVICE(0x07d1, 0x3c13) },</div><div class='add'>+	{ USB_DEVICE(0x07d1, 0x3c15) },</div><div class='ctx'> 	{ USB_DEVICE(0x07d1, 0x3c16) },</div><div class='ctx'> 	/* Draytek */</div><div class='ctx'> 	{ USB_DEVICE(0x07fa, 0x7712) },</div><div class='hunk'>@@ -943,6 +930,7 @@ static struct usb_device_id rt2800usb_device_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x7392, 0x7711) },</div><div class='ctx'> 	{ USB_DEVICE(0x7392, 0x7717) },</div><div class='ctx'> 	{ USB_DEVICE(0x7392, 0x7718) },</div><div class='add'>+	{ USB_DEVICE(0x7392, 0x7722) },</div><div class='ctx'> 	/* Encore */</div><div class='ctx'> 	{ USB_DEVICE(0x203d, 0x1480) },</div><div class='ctx'> 	{ USB_DEVICE(0x203d, 0x14a9) },</div><div class='hunk'>@@ -976,6 +964,8 @@ static struct usb_device_id rt2800usb_device_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x13b1, 0x0031) },</div><div class='ctx'> 	{ USB_DEVICE(0x1737, 0x0070) },</div><div class='ctx'> 	{ USB_DEVICE(0x1737, 0x0071) },</div><div class='add'>+	{ USB_DEVICE(0x1737, 0x0077) },</div><div class='add'>+	{ USB_DEVICE(0x1737, 0x0078) },</div><div class='ctx'> 	/* Logitec */</div><div class='ctx'> 	{ USB_DEVICE(0x0789, 0x0162) },</div><div class='ctx'> 	{ USB_DEVICE(0x0789, 0x0163) },</div><div class='hunk'>@@ -999,9 +989,13 @@ static struct usb_device_id rt2800usb_device_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x0db0, 0x871b) },</div><div class='ctx'> 	{ USB_DEVICE(0x0db0, 0x871c) },</div><div class='ctx'> 	{ USB_DEVICE(0x0db0, 0x899a) },</div><div class='add'>+	/* Ovislink */</div><div class='add'>+	{ USB_DEVICE(0x1b75, 0x3071) },</div><div class='add'>+	{ USB_DEVICE(0x1b75, 0x3072) },</div><div class='ctx'> 	/* Para */</div><div class='ctx'> 	{ USB_DEVICE(0x20b8, 0x8888) },</div><div class='ctx'> 	/* Pegatron */</div><div class='add'>+	{ USB_DEVICE(0x1d4d, 0x0002) },</div><div class='ctx'> 	{ USB_DEVICE(0x1d4d, 0x000c) },</div><div class='ctx'> 	{ USB_DEVICE(0x1d4d, 0x000e) },</div><div class='ctx'> 	{ USB_DEVICE(0x1d4d, 0x0011) },</div><div class='hunk'>@@ -1054,7 +1048,9 @@ static struct usb_device_id rt2800usb_device_table[] = {</div><div class='ctx'> 	/* Sparklan */</div><div class='ctx'> 	{ USB_DEVICE(0x15a9, 0x0006) },</div><div class='ctx'> 	/* Sweex */</div><div class='add'>+	{ USB_DEVICE(0x177f, 0x0153) },</div><div class='ctx'> 	{ USB_DEVICE(0x177f, 0x0302) },</div><div class='add'>+	{ USB_DEVICE(0x177f, 0x0313) },</div><div class='ctx'> 	/* U-Media */</div><div class='ctx'> 	{ USB_DEVICE(0x157e, 0x300e) },</div><div class='ctx'> 	{ USB_DEVICE(0x157e, 0x3013) },</div><div class='hunk'>@@ -1138,27 +1134,24 @@ static struct usb_device_id rt2800usb_device_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x13d3, 0x3322) },</div><div class='ctx'> 	/* Belkin */</div><div class='ctx'> 	{ USB_DEVICE(0x050d, 0x1003) },</div><div class='del'>-	{ USB_DEVICE(0x050d, 0x825a) },</div><div class='ctx'> 	/* Buffalo */</div><div class='ctx'> 	{ USB_DEVICE(0x0411, 0x012e) },</div><div class='ctx'> 	{ USB_DEVICE(0x0411, 0x0148) },</div><div class='ctx'> 	{ USB_DEVICE(0x0411, 0x0150) },</div><div class='del'>-	{ USB_DEVICE(0x0411, 0x015d) },</div><div class='ctx'> 	/* Corega */</div><div class='ctx'> 	{ USB_DEVICE(0x07aa, 0x0041) },</div><div class='ctx'> 	{ USB_DEVICE(0x07aa, 0x0042) },</div><div class='ctx'> 	{ USB_DEVICE(0x18c5, 0x0008) },</div><div class='ctx'> 	/* D-Link */</div><div class='ctx'> 	{ USB_DEVICE(0x07d1, 0x3c0b) },</div><div class='del'>-	{ USB_DEVICE(0x07d1, 0x3c13) },</div><div class='del'>-	{ USB_DEVICE(0x07d1, 0x3c15) },</div><div class='ctx'> 	{ USB_DEVICE(0x07d1, 0x3c17) },</div><div class='ctx'> 	{ USB_DEVICE(0x2001, 0x3c17) },</div><div class='ctx'> 	/* Edimax */</div><div class='ctx'> 	{ USB_DEVICE(0x7392, 0x4085) },</div><div class='del'>-	{ USB_DEVICE(0x7392, 0x7722) },</div><div class='ctx'> 	/* Encore */</div><div class='ctx'> 	{ USB_DEVICE(0x203d, 0x14a1) },</div><div class='add'>+	/* Fujitsu Stylistic 550 */</div><div class='add'>+	{ USB_DEVICE(0x1690, 0x0761) },</div><div class='ctx'> 	/* Gemtek */</div><div class='ctx'> 	{ USB_DEVICE(0x15a9, 0x0010) },</div><div class='ctx'> 	/* Gigabyte */</div><div class='hunk'>@@ -1170,20 +1163,13 @@ static struct usb_device_id rt2800usb_device_table[] = {</div><div class='ctx'> 	/* LevelOne */</div><div class='ctx'> 	{ USB_DEVICE(0x1740, 0x0605) },</div><div class='ctx'> 	{ USB_DEVICE(0x1740, 0x0615) },</div><div class='del'>-	/* Linksys */</div><div class='del'>-	{ USB_DEVICE(0x1737, 0x0077) },</div><div class='del'>-	{ USB_DEVICE(0x1737, 0x0078) },</div><div class='ctx'> 	/* Logitec */</div><div class='ctx'> 	{ USB_DEVICE(0x0789, 0x0168) },</div><div class='ctx'> 	{ USB_DEVICE(0x0789, 0x0169) },</div><div class='ctx'> 	/* Motorola */</div><div class='ctx'> 	{ USB_DEVICE(0x100d, 0x9032) },</div><div class='del'>-	/* Ovislink */</div><div class='del'>-	{ USB_DEVICE(0x1b75, 0x3071) },</div><div class='del'>-	{ USB_DEVICE(0x1b75, 0x3072) },</div><div class='ctx'> 	/* Pegatron */</div><div class='ctx'> 	{ USB_DEVICE(0x05a6, 0x0101) },</div><div class='del'>-	{ USB_DEVICE(0x1d4d, 0x0002) },</div><div class='ctx'> 	{ USB_DEVICE(0x1d4d, 0x0010) },</div><div class='ctx'> 	/* Planex */</div><div class='ctx'> 	{ USB_DEVICE(0x2019, 0x5201) },</div><div class='hunk'>@@ -1202,9 +1188,6 @@ static struct usb_device_id rt2800usb_device_table[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x083a, 0xc522) },</div><div class='ctx'> 	{ USB_DEVICE(0x083a, 0xd522) },</div><div class='ctx'> 	{ USB_DEVICE(0x083a, 0xf511) },</div><div class='del'>-	/* Sweex */</div><div class='del'>-	{ USB_DEVICE(0x177f, 0x0153) },</div><div class='del'>-	{ USB_DEVICE(0x177f, 0x0313) },</div><div class='ctx'> 	/* Zyxel */</div><div class='ctx'> 	{ USB_DEVICE(0x0586, 0x341a) },</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1234,15 +1217,4 @@ static struct usb_driver rt2800usb_driver = {</div><div class='ctx'> 	.resume		= rt2x00usb_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init rt2800usb_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;rt2800usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit rt2800usb_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;rt2800usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(rt2800usb_init);</div><div class='del'>-module_exit(rt2800usb_exit);</div><div class='add'>+module_usb_driver(rt2800usb_driver);</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h<br/>index 99ff12d0c29d..b03b22c47b18 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt2x00.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rt2x00/rt2x00.h</a></div><div class='hunk'>@@ -189,9 +189,9 @@ struct rt2x00_chip {</div><div class='ctx'> #define RT3090		0x3090	/* 2.4GHz PCIe */</div><div class='ctx'> #define RT3390		0x3390</div><div class='ctx'> #define RT3572		0x3572</div><div class='del'>-#define RT3593		0x3593	/* PCIe */</div><div class='add'>+#define RT3593		0x3593</div><div class='ctx'> #define RT3883		0x3883	/* WSOC */</div><div class='del'>-#define RT5390         0x5390  /* 2.4GHz */</div><div class='add'>+#define RT5390		0x5390  /* 2.4GHz */</div><div class='ctx'> </div><div class='ctx'> 	u16 rf;</div><div class='ctx'> 	u16 rev;</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c<br/>index edd317fa7c0a..c3e1aa7c1a80 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00dev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt2x00dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rt2x00/rt2x00dev.c</a></div><div class='hunk'>@@ -831,11 +831,11 @@ static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,</div><div class='ctx'> 	if (spec-&gt;supported_rates &amp; SUPPORT_RATE_OFDM)</div><div class='ctx'> 		num_rates += 8;</div><div class='ctx'> </div><div class='del'>-	channels = kzalloc(sizeof(*channels) * spec-&gt;num_channels, GFP_KERNEL);</div><div class='add'>+	channels = kcalloc(spec-&gt;num_channels, sizeof(*channels), GFP_KERNEL);</div><div class='ctx'> 	if (!channels)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	rates = kzalloc(sizeof(*rates) * num_rates, GFP_KERNEL);</div><div class='add'>+	rates = kcalloc(num_rates, sizeof(*rates), GFP_KERNEL);</div><div class='ctx'> 	if (!rates)</div><div class='ctx'> 		goto exit_free_channels;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c<br/>index bf0acff07807..ede3c58e6783 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00mac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt2x00mac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rt2x00/rt2x00mac.c</a></div><div class='hunk'>@@ -160,7 +160,7 @@ void rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'>  exit_fail:</div><div class='ctx'> 	rt2x00queue_pause_queue(queue);</div><div class='ctx'>  exit_free_skb:</div><div class='del'>-	dev_kfree_skb_any(skb);</div><div class='add'>+	ieee80211_free_txskb(hw, skb);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(rt2x00mac_tx);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c<br/>index 1e31050dafc9..2eea3866504d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00usb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt2x00usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt2x00usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rt2x00/rt2x00usb.c</a></div><div class='hunk'>@@ -298,12 +298,22 @@ static bool rt2x00usb_kick_tx_entry(struct queue_entry *entry, void* data)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * USB devices cannot blindly pass the skb-&gt;len as the</div><div class='del'>-	 * length of the data to usb_fill_bulk_urb. Pass the skb</div><div class='del'>-	 * to the driver to determine what the length should be.</div><div class='add'>+	 * USB devices require certain padding at the end of each frame</div><div class='add'>+	 * and urb. Those paddings are not included in skbs. Pass entry</div><div class='add'>+	 * to the driver to determine what the overall length should be.</div><div class='ctx'> 	 */</div><div class='ctx'> 	length = rt2x00dev-&gt;ops-&gt;lib-&gt;get_tx_data_len(entry);</div><div class='ctx'> </div><div class='add'>+	status = skb_padto(entry-&gt;skb, length);</div><div class='add'>+	if (unlikely(status)) {</div><div class='add'>+		/* TODO: report something more appropriate than IO_FAILED. */</div><div class='add'>+		WARNING(rt2x00dev, "TX SKB padding error, out of memory\n");</div><div class='add'>+		set_bit(ENTRY_DATA_IO_FAILED, &amp;entry-&gt;flags);</div><div class='add'>+		rt2x00lib_dmadone(entry);</div><div class='add'>+</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	usb_fill_bulk_urb(entry_priv-&gt;urb, usb_dev,</div><div class='ctx'> 			  usb_sndbulkpipe(usb_dev, entry-&gt;queue-&gt;usb_endpoint),</div><div class='ctx'> 			  entry-&gt;skb-&gt;data, length,</div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c<br/>index bf55b4a311e3..e0c6d117429d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt61pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt61pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt61pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rt2x00/rt61pci.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Allow hardware encryption to be disabled.</div><div class='ctx'>  */</div><div class='del'>-static int modparam_nohwcrypt = 0;</div><div class='add'>+static bool modparam_nohwcrypt = false;</div><div class='ctx'> module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c<br/>index cfb19dbb0a67..e477a964081d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt73usb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rt2x00/rt73usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rt2x00/rt73usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rt2x00/rt73usb.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Allow hardware encryption to be disabled.</div><div class='ctx'>  */</div><div class='del'>-static int modparam_nohwcrypt;</div><div class='add'>+static bool modparam_nohwcrypt;</div><div class='ctx'> module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");</div><div class='ctx'> </div><div class='hunk'>@@ -2528,15 +2528,4 @@ static struct usb_driver rt73usb_driver = {</div><div class='ctx'> 	.resume		= rt2x00usb_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init rt73usb_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;rt73usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit rt73usb_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;rt73usb_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(rt73usb_init);</div><div class='del'>-module_exit(rt73usb_exit);</div><div class='add'>+module_usb_driver(rt73usb_driver);</div><div class='head'>diff --git a/drivers/net/wireless/rtl818x/rtl8187/dev.c b/drivers/net/wireless/rtl818x/rtl8187/dev.c<br/>index 4a78f9e39dfa..638fbef693e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtl818x/rtl8187/dev.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtl818x/rtl8187/dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtl818x/rtl8187/dev.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rtl818x/rtl8187/dev.c</a></div><div class='hunk'>@@ -1592,15 +1592,4 @@ static struct usb_driver rtl8187_driver = {</div><div class='ctx'> 	.disconnect	= __devexit_p(rtl8187_disconnect),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init rtl8187_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;rtl8187_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit rtl8187_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;rtl8187_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(rtl8187_init);</div><div class='del'>-module_exit(rtl8187_exit);</div><div class='add'>+module_usb_driver(rtl8187_driver);</div><div class='head'>diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c<br/>index b4ce93436d2e..8d6eb0f56c03 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/base.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rtlwifi/base.c</a></div><div class='hunk'>@@ -345,9 +345,9 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)</div><div class='ctx'> 	if (is_valid_ether_addr(rtlefuse-&gt;dev_addr)) {</div><div class='ctx'> 		SET_IEEE80211_PERM_ADDR(hw, rtlefuse-&gt;dev_addr);</div><div class='ctx'> 	} else {</div><div class='del'>-		u8 rtlmac[] = { 0x00, 0xe0, 0x4c, 0x81, 0x92, 0x00 };</div><div class='del'>-		get_random_bytes((rtlmac + (ETH_ALEN - 1)), 1);</div><div class='del'>-		SET_IEEE80211_PERM_ADDR(hw, rtlmac);</div><div class='add'>+		u8 rtlmac1[] = { 0x00, 0xe0, 0x4c, 0x81, 0x92, 0x00 };</div><div class='add'>+		get_random_bytes((rtlmac1 + (ETH_ALEN - 1)), 1);</div><div class='add'>+		SET_IEEE80211_PERM_ADDR(hw, rtlmac1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -396,7 +396,7 @@ void rtl_init_rfkill(struct ieee80211_hw *hw)</div><div class='ctx'> 	u8 valid = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*set init state to on */</div><div class='del'>-	rtlpriv-&gt;rfkill.rfkill_state = 1;</div><div class='add'>+	rtlpriv-&gt;rfkill.rfkill_state = true;</div><div class='ctx'> 	wiphy_rfkill_set_hw_state(hw-&gt;wiphy, 0);</div><div class='ctx'> </div><div class='ctx'> 	radio_state = rtlpriv-&gt;cfg-&gt;ops-&gt;radio_onoff_checking(hw, &amp;valid);</div><div class='hunk'>@@ -448,12 +448,12 @@ int rtl_init_core(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	/* &lt;4&gt; locks */</div><div class='ctx'> 	mutex_init(&amp;rtlpriv-&gt;locks.conf_mutex);</div><div class='add'>+	mutex_init(&amp;rtlpriv-&gt;locks.ps_mutex);</div><div class='ctx'> 	spin_lock_init(&amp;rtlpriv-&gt;locks.ips_lock);</div><div class='ctx'> 	spin_lock_init(&amp;rtlpriv-&gt;locks.irq_th_lock);</div><div class='ctx'> 	spin_lock_init(&amp;rtlpriv-&gt;locks.h2c_lock);</div><div class='ctx'> 	spin_lock_init(&amp;rtlpriv-&gt;locks.rf_ps_lock);</div><div class='ctx'> 	spin_lock_init(&amp;rtlpriv-&gt;locks.rf_lock);</div><div class='del'>-	spin_lock_init(&amp;rtlpriv-&gt;locks.lps_lock);</div><div class='ctx'> 	spin_lock_init(&amp;rtlpriv-&gt;locks.waitq_lock);</div><div class='ctx'> 	spin_lock_init(&amp;rtlpriv-&gt;locks.cck_and_rw_pagea_lock);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/rtlwifi/base.h b/drivers/net/wireless/rtlwifi/base.h<br/>index 4ae905983d0d..f66b5757f6b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/base.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/base.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/base.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rtlwifi/base.h</a></div><div class='hunk'>@@ -76,7 +76,7 @@ enum ap_peer {</div><div class='ctx'> 	SET_BITS_TO_LE_2BYTE(_hdr, 8, 1, _val)</div><div class='ctx'> </div><div class='ctx'> #define SET_80211_PS_POLL_AID(_hdr, _val)		\</div><div class='del'>-	(*(u16 *)((u8 *)(_hdr) + 2) = le16_to_cpu(_val))</div><div class='add'>+	(*(u16 *)((u8 *)(_hdr) + 2) = _val)</div><div class='ctx'> #define SET_80211_PS_POLL_BSSID(_hdr, _val)		\</div><div class='ctx'> 	memcpy(((u8 *)(_hdr)) + 4, (u8 *)(_val), ETH_ALEN)</div><div class='ctx'> #define SET_80211_PS_POLL_TA(_hdr, _val)		\</div><div class='head'>diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c<br/>index eb61061821e4..39e0907a3c4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rtlwifi/pci.c</a></div><div class='hunk'>@@ -78,7 +78,7 @@ static void _rtl_pci_update_default_setting(struct ieee80211_hw *hw)</div><div class='ctx'> 	u8 init_aspm;</div><div class='ctx'> </div><div class='ctx'> 	ppsc-&gt;reg_rfps_level = 0;</div><div class='del'>-	ppsc-&gt;support_aspm = 0;</div><div class='add'>+	ppsc-&gt;support_aspm = false;</div><div class='ctx'> </div><div class='ctx'> 	/*Update PCI ASPM setting */</div><div class='ctx'> 	ppsc-&gt;const_amdpci_aspm = rtlpci-&gt;const_amdpci_aspm;</div><div class='hunk'>@@ -570,9 +570,9 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)</div><div class='ctx'> 		if (ieee80211_is_nullfunc(fc)) {</div><div class='ctx'> 			if (ieee80211_has_pm(fc)) {</div><div class='ctx'> 				rtlpriv-&gt;mac80211.offchan_delay = true;</div><div class='del'>-				rtlpriv-&gt;psc.state_inap = 1;</div><div class='add'>+				rtlpriv-&gt;psc.state_inap = true;</div><div class='ctx'> 			} else {</div><div class='del'>-				rtlpriv-&gt;psc.state_inap = 0;</div><div class='add'>+				rtlpriv-&gt;psc.state_inap = false;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -610,7 +610,7 @@ tx_status_ok:</div><div class='ctx'> 	if (((rtlpriv-&gt;link_info.num_rx_inperiod +</div><div class='ctx'> 		rtlpriv-&gt;link_info.num_tx_inperiod) &gt; 8) ||</div><div class='ctx'> 		(rtlpriv-&gt;link_info.num_rx_inperiod &gt; 2)) {</div><div class='del'>-		tasklet_schedule(&amp;rtlpriv-&gt;works.ips_leave_tasklet);</div><div class='add'>+		schedule_work(&amp;rtlpriv-&gt;works.lps_leave_work);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -736,7 +736,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)</div><div class='ctx'> 		if (((rtlpriv-&gt;link_info.num_rx_inperiod +</div><div class='ctx'> 			rtlpriv-&gt;link_info.num_tx_inperiod) &gt; 8) ||</div><div class='ctx'> 			(rtlpriv-&gt;link_info.num_rx_inperiod &gt; 2)) {</div><div class='del'>-			tasklet_schedule(&amp;rtlpriv-&gt;works.ips_leave_tasklet);</div><div class='add'>+			schedule_work(&amp;rtlpriv-&gt;works.lps_leave_work);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='hunk'>@@ -780,6 +780,7 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 inta = 0;</div><div class='ctx'> 	u32 intb = 0;</div><div class='add'>+	irqreturn_t ret = IRQ_HANDLED;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;rtlpriv-&gt;locks.irq_th_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -787,8 +788,10 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	rtlpriv-&gt;cfg-&gt;ops-&gt;interrupt_recognized(hw, &amp;inta, &amp;intb);</div><div class='ctx'> </div><div class='ctx'> 	/*Shared IRQ or HW disappared */</div><div class='del'>-	if (!inta || inta == 0xffff)</div><div class='add'>+	if (!inta || inta == 0xffff) {</div><div class='add'>+		ret = IRQ_NONE;</div><div class='ctx'> 		goto done;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*&lt;1&gt; beacon related */</div><div class='ctx'> 	if (inta &amp; rtlpriv-&gt;cfg-&gt;maps[RTL_IMR_TBDOK]) {</div><div class='hunk'>@@ -890,12 +893,9 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	if (rtlpriv-&gt;rtlhal.earlymode_enable)</div><div class='ctx'> 		tasklet_schedule(&amp;rtlpriv-&gt;works.irq_tasklet);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;rtlpriv-&gt;locks.irq_th_lock, flags);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-</div><div class='ctx'> done:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;rtlpriv-&gt;locks.irq_th_lock, flags);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void _rtl_pci_irq_tasklet(struct ieee80211_hw *hw)</div><div class='hunk'>@@ -903,11 +903,6 @@ static void _rtl_pci_irq_tasklet(struct ieee80211_hw *hw)</div><div class='ctx'> 	_rtl_pci_tx_chk_waitq(hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void _rtl_pci_ips_leave_tasklet(struct ieee80211_hw *hw)</div><div class='del'>-{</div><div class='del'>-	rtl_lps_leave(hw);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='hunk'>@@ -945,6 +940,15 @@ static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void rtl_lps_leave_work_callback(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct rtl_works *rtlworks =</div><div class='add'>+	    container_of(work, struct rtl_works, lps_leave_work);</div><div class='add'>+	struct ieee80211_hw *hw = rtlworks-&gt;hw;</div><div class='add'>+</div><div class='add'>+	rtl_lps_leave(hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void _rtl_pci_init_trx_var(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));</div><div class='hunk'>@@ -1006,9 +1010,7 @@ static void _rtl_pci_init_struct(struct ieee80211_hw *hw,</div><div class='ctx'> 	tasklet_init(&amp;rtlpriv-&gt;works.irq_prepare_bcn_tasklet,</div><div class='ctx'> 		     (void (*)(unsigned long))_rtl_pci_prepare_bcn_tasklet,</div><div class='ctx'> 		     (unsigned long)hw);</div><div class='del'>-	tasklet_init(&amp;rtlpriv-&gt;works.ips_leave_tasklet,</div><div class='del'>-		     (void (*)(unsigned long))_rtl_pci_ips_leave_tasklet,</div><div class='del'>-		     (unsigned long)hw);</div><div class='add'>+	INIT_WORK(&amp;rtlpriv-&gt;works.lps_leave_work, rtl_lps_leave_work_callback);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw,</div><div class='hunk'>@@ -1478,7 +1480,7 @@ static void rtl_pci_deinit(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	synchronize_irq(rtlpci-&gt;pdev-&gt;irq);</div><div class='ctx'> 	tasklet_kill(&amp;rtlpriv-&gt;works.irq_tasklet);</div><div class='del'>-	tasklet_kill(&amp;rtlpriv-&gt;works.ips_leave_tasklet);</div><div class='add'>+	cancel_work_sync(&amp;rtlpriv-&gt;works.lps_leave_work);</div><div class='ctx'> </div><div class='ctx'> 	flush_workqueue(rtlpriv-&gt;works.rtl_wq);</div><div class='ctx'> 	destroy_workqueue(rtlpriv-&gt;works.rtl_wq);</div><div class='hunk'>@@ -1553,7 +1555,7 @@ static void rtl_pci_stop(struct ieee80211_hw *hw)</div><div class='ctx'> 	set_hal_stop(rtlhal);</div><div class='ctx'> </div><div class='ctx'> 	rtlpriv-&gt;cfg-&gt;ops-&gt;disable_interrupt(hw);</div><div class='del'>-	tasklet_kill(&amp;rtlpriv-&gt;works.ips_leave_tasklet);</div><div class='add'>+	cancel_work_sync(&amp;rtlpriv-&gt;works.lps_leave_work);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;rtlpriv-&gt;locks.rf_ps_lock, flags);</div><div class='ctx'> 	while (ppsc-&gt;rfchange_inprogress) {</div><div class='head'>diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c<br/>index 55c8e50f45fd..130fdd99d573 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/ps.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/ps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/ps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rtlwifi/ps.c</a></div><div class='hunk'>@@ -237,11 +237,12 @@ void rtl_ips_nic_on(struct ieee80211_hw *hw)</div><div class='ctx'> 	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));</div><div class='ctx'> 	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));</div><div class='ctx'> 	enum rf_pwrstate rtstate;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (mac-&gt;opmode != NL80211_IFTYPE_STATION)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;rtlpriv-&gt;locks.ips_lock);</div><div class='add'>+	spin_lock_irqsave(&amp;rtlpriv-&gt;locks.ips_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (ppsc-&gt;inactiveps) {</div><div class='ctx'> 		rtstate = ppsc-&gt;rfpwr_state;</div><div class='hunk'>@@ -257,7 +258,7 @@ void rtl_ips_nic_on(struct ieee80211_hw *hw)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;rtlpriv-&gt;locks.ips_lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;rtlpriv-&gt;locks.ips_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*for FW LPS*/</div><div class='hunk'>@@ -395,7 +396,7 @@ void rtl_lps_enter(struct ieee80211_hw *hw)</div><div class='ctx'> 	if (mac-&gt;link_state != MAC80211_LINKED)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;rtlpriv-&gt;locks.lps_lock);</div><div class='add'>+	mutex_lock(&amp;rtlpriv-&gt;locks.ps_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* Idle for a while if we connect to AP a while ago. */</div><div class='ctx'> 	if (mac-&gt;cnt_after_linked &gt;= 2) {</div><div class='hunk'>@@ -407,7 +408,7 @@ void rtl_lps_enter(struct ieee80211_hw *hw)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;rtlpriv-&gt;locks.lps_lock);</div><div class='add'>+	mutex_unlock(&amp;rtlpriv-&gt;locks.ps_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*Leave the leisure power save mode.*/</div><div class='hunk'>@@ -416,9 +417,8 @@ void rtl_lps_leave(struct ieee80211_hw *hw)</div><div class='ctx'> 	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='ctx'> 	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));</div><div class='ctx'> 	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;rtlpriv-&gt;locks.lps_lock, flags);</div><div class='add'>+	mutex_lock(&amp;rtlpriv-&gt;locks.ps_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (ppsc-&gt;fwctrl_lps) {</div><div class='ctx'> 		if (ppsc-&gt;dot11_psmode != EACTIVE) {</div><div class='hunk'>@@ -439,7 +439,7 @@ void rtl_lps_leave(struct ieee80211_hw *hw)</div><div class='ctx'> 			rtl_lps_set_psmode(hw, EACTIVE);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;rtlpriv-&gt;locks.lps_lock, flags);</div><div class='add'>+	mutex_unlock(&amp;rtlpriv-&gt;locks.ps_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* For sw LPS*/</div><div class='hunk'>@@ -540,9 +540,9 @@ void rtl_swlps_rf_awake(struct ieee80211_hw *hw)</div><div class='ctx'> 		RT_CLEAR_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;rtlpriv-&gt;locks.lps_lock);</div><div class='add'>+	mutex_lock(&amp;rtlpriv-&gt;locks.ps_mutex);</div><div class='ctx'> 	rtl_ps_set_rf_state(hw, ERFON, RF_CHANGE_BY_PS);</div><div class='del'>-	spin_unlock_irq(&amp;rtlpriv-&gt;locks.lps_lock);</div><div class='add'>+	mutex_unlock(&amp;rtlpriv-&gt;locks.ps_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rtl_swlps_rfon_wq_callback(void *data)</div><div class='hunk'>@@ -575,9 +575,9 @@ void rtl_swlps_rf_sleep(struct ieee80211_hw *hw)</div><div class='ctx'> 	if (rtlpriv-&gt;link_info.busytraffic)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;rtlpriv-&gt;locks.lps_lock);</div><div class='add'>+	mutex_lock(&amp;rtlpriv-&gt;locks.ps_mutex);</div><div class='ctx'> 	rtl_ps_set_rf_state(hw, ERFSLEEP, RF_CHANGE_BY_PS);</div><div class='del'>-	spin_unlock_irq(&amp;rtlpriv-&gt;locks.lps_lock);</div><div class='add'>+	mutex_unlock(&amp;rtlpriv-&gt;locks.ps_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (ppsc-&gt;reg_rfps_level &amp; RT_RF_OFF_LEVL_ASPM &amp;&amp;</div><div class='ctx'> 		!RT_IN_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM)) {</div><div class='head'>diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c<br/>index 950c65a15b8a..931d97979b04 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c</a></div><div class='hunk'>@@ -73,6 +73,34 @@ static void _rtl92c_enable_fw_download(struct ieee80211_hw *hw, bool enable)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void rtl_block_fw_writeN(struct ieee80211_hw *hw, const u8 *buffer,</div><div class='add'>+				u32 size)</div><div class='add'>+{</div><div class='add'>+	struct rtl_priv *rtlpriv = rtl_priv(hw);</div><div class='add'>+	u32 blockSize = REALTEK_USB_VENQT_MAX_BUF_SIZE - 20;</div><div class='add'>+	u8 *bufferPtr = (u8 *) buffer;</div><div class='add'>+	u32 i, offset, blockCount, remainSize;</div><div class='add'>+</div><div class='add'>+	blockCount = size / blockSize;</div><div class='add'>+	remainSize = size % blockSize;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; blockCount; i++) {</div><div class='add'>+		offset = i * blockSize;</div><div class='add'>+		rtlpriv-&gt;io.writeN_sync(rtlpriv,</div><div class='add'>+					(FW_8192C_START_ADDRESS + offset),</div><div class='add'>+					(void *)(bufferPtr + offset),</div><div class='add'>+					blockSize);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (remainSize) {</div><div class='add'>+		offset = blockCount * blockSize;</div><div class='add'>+		rtlpriv-&gt;io.writeN_sync(rtlpriv,</div><div class='add'>+					(FW_8192C_START_ADDRESS + offset),</div><div class='add'>+					(void *)(bufferPtr + offset),</div><div class='add'>+					remainSize);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void _rtl92c_fw_block_write(struct ieee80211_hw *hw,</div><div class='ctx'> 				   const u8 *buffer, u32 size)</div><div class='ctx'> {</div><div class='hunk'>@@ -81,23 +109,30 @@ static void _rtl92c_fw_block_write(struct ieee80211_hw *hw,</div><div class='ctx'> 	u8 *bufferPtr = (u8 *) buffer;</div><div class='ctx'> 	u32 *pu4BytePtr = (u32 *) buffer;</div><div class='ctx'> 	u32 i, offset, blockCount, remainSize;</div><div class='add'>+	u32 data;</div><div class='ctx'> </div><div class='add'>+	if (rtlpriv-&gt;io.writeN_sync) {</div><div class='add'>+		rtl_block_fw_writeN(hw, buffer, size);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	blockCount = size / blockSize;</div><div class='ctx'> 	remainSize = size % blockSize;</div><div class='add'>+	if (remainSize) {</div><div class='add'>+		/* the last word is &lt; 4 bytes - pad it with zeros */</div><div class='add'>+		for (i = 0; i &lt; 4 - remainSize; i++)</div><div class='add'>+			*(bufferPtr + size + i) = 0;</div><div class='add'>+		blockCount++;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; blockCount; i++) {</div><div class='ctx'> 		offset = i * blockSize;</div><div class='add'>+		/* for big-endian platforms, the firmware data need to be byte</div><div class='add'>+		 * swapped as it was read as a byte string and will be written</div><div class='add'>+		 * as 32-bit dwords and byte swapped when written</div><div class='add'>+		 */</div><div class='add'>+		data = le32_to_cpu(*(__le32 *)(pu4BytePtr + i));</div><div class='ctx'> 		rtl_write_dword(rtlpriv, (FW_8192C_START_ADDRESS + offset),</div><div class='del'>-				*(pu4BytePtr + i));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (remainSize) {</div><div class='del'>-		offset = blockCount * blockSize;</div><div class='del'>-		bufferPtr += offset;</div><div class='del'>-		for (i = 0; i &lt; remainSize; i++) {</div><div class='del'>-			rtl_write_byte(rtlpriv, (FW_8192C_START_ADDRESS +</div><div class='del'>-						 offset + i), *(bufferPtr + i));</div><div class='del'>-		}</div><div class='add'>+				data);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -227,10 +262,10 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)</div><div class='ctx'> 	u32 fwsize;</div><div class='ctx'> 	enum version_8192c version = rtlhal-&gt;version;</div><div class='ctx'> </div><div class='del'>-	pr_info("Loading firmware file %s\n", rtlpriv-&gt;cfg-&gt;fw_name);</div><div class='ctx'> 	if (!rtlhal-&gt;pfirmware)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='add'>+	pr_info("Loading firmware file %s\n", rtlpriv-&gt;cfg-&gt;fw_name);</div><div class='ctx'> 	pfwheader = (struct rtl92c_firmware_header *)rtlhal-&gt;pfirmware;</div><div class='ctx'> 	pfwdata = (u8 *) rtlhal-&gt;pfirmware;</div><div class='ctx'> 	fwsize = rtlhal-&gt;fwsize;</div><div class='hunk'>@@ -238,8 +273,9 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)</div><div class='ctx'> 	if (IS_FW_HEADER_EXIST(pfwheader)) {</div><div class='ctx'> 		RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,</div><div class='ctx'> 			 ("Firmware Version(%d), Signature(%#x),Size(%d)\n",</div><div class='del'>-			  pfwheader-&gt;version, pfwheader-&gt;signature,</div><div class='del'>-			  (uint)sizeof(struct rtl92c_firmware_header)));</div><div class='add'>+			 le16_to_cpu(pfwheader-&gt;version),</div><div class='add'>+			 le16_to_cpu(pfwheader-&gt;signature),</div><div class='add'>+			 (uint)sizeof(struct rtl92c_firmware_header)));</div><div class='ctx'> </div><div class='ctx'> 		pfwdata = pfwdata + sizeof(struct rtl92c_firmware_header);</div><div class='ctx'> 		fwsize = fwsize - sizeof(struct rtl92c_firmware_header);</div><div class='head'>diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h<br/>index 3d5823c12621..cec5a3a1cc53 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h</a></div><div class='hunk'>@@ -32,32 +32,32 @@</div><div class='ctx'> </div><div class='ctx'> #define FW_8192C_SIZE				0x3000</div><div class='ctx'> #define FW_8192C_START_ADDRESS			0x1000</div><div class='del'>-#define FW_8192C_END_ADDRESS			0x3FFF</div><div class='add'>+#define FW_8192C_END_ADDRESS			0x1FFF</div><div class='ctx'> #define FW_8192C_PAGE_SIZE			4096</div><div class='ctx'> #define FW_8192C_POLLING_DELAY			5</div><div class='ctx'> #define FW_8192C_POLLING_TIMEOUT_COUNT		100</div><div class='ctx'> </div><div class='ctx'> #define IS_FW_HEADER_EXIST(_pfwhdr)	\</div><div class='del'>-	((_pfwhdr-&gt;signature&amp;0xFFF0) == 0x92C0 ||\</div><div class='del'>-	(_pfwhdr-&gt;signature&amp;0xFFF0) == 0x88C0)</div><div class='add'>+	((le16_to_cpu(_pfwhdr-&gt;signature)&amp;0xFFF0) == 0x92C0 ||\</div><div class='add'>+	(le16_to_cpu(_pfwhdr-&gt;signature)&amp;0xFFF0) == 0x88C0)</div><div class='ctx'> </div><div class='ctx'> struct rtl92c_firmware_header {</div><div class='del'>-	u16 signature;</div><div class='add'>+	__le16 signature;</div><div class='ctx'> 	u8 category;</div><div class='ctx'> 	u8 function;</div><div class='del'>-	u16 version;</div><div class='add'>+	__le16 version;</div><div class='ctx'> 	u8 subversion;</div><div class='ctx'> 	u8 rsvd1;</div><div class='ctx'> 	u8 month;</div><div class='ctx'> 	u8 date;</div><div class='ctx'> 	u8 hour;</div><div class='ctx'> 	u8 minute;</div><div class='del'>-	u16 ramcodeSize;</div><div class='del'>-	u16 rsvd2;</div><div class='del'>-	u32 svnindex;</div><div class='del'>-	u32 rsvd3;</div><div class='del'>-	u32 rsvd4;</div><div class='del'>-	u32 rsvd5;</div><div class='add'>+	__le16 ramcodeSize;</div><div class='add'>+	__le16 rsvd2;</div><div class='add'>+	__le32 svnindex;</div><div class='add'>+	__le32 rsvd3;</div><div class='add'>+	__le32 rsvd4;</div><div class='add'>+	__le32 rsvd5;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum rtl8192c_h2c_cmd {</div><div class='hunk'>@@ -94,5 +94,6 @@ void rtl92c_firmware_selfreset(struct ieee80211_hw *hw);</div><div class='ctx'> void rtl92c_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode);</div><div class='ctx'> void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished);</div><div class='ctx'> void rtl92c_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus);</div><div class='add'>+void usb_writeN_async(struct rtl_priv *rtlpriv, u32 addr, void *data, u16 len);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c<br/>index f2aa33dc4d78..89ef6982ce50 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192ce/sw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rtlwifi/rtl8192ce/sw.c</a></div><div class='hunk'>@@ -98,9 +98,9 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	rtl8192ce_bt_reg_init(hw);</div><div class='ctx'> </div><div class='del'>-	rtlpriv-&gt;dm.dm_initialgain_enable = 1;</div><div class='add'>+	rtlpriv-&gt;dm.dm_initialgain_enable = true;</div><div class='ctx'> 	rtlpriv-&gt;dm.dm_flag = 0;</div><div class='del'>-	rtlpriv-&gt;dm.disable_framebursting = 0;</div><div class='add'>+	rtlpriv-&gt;dm.disable_framebursting = false;</div><div class='ctx'> 	rtlpriv-&gt;dm.thermalvalue = 0;</div><div class='ctx'> 	rtlpci-&gt;transmit_config = CFENDFORM | BIT(12) | BIT(13);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c<br/>index 814c05df51e8..124cf633861c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192cu/hw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rtlwifi/rtl8192cu/hw.c</a></div><div class='hunk'>@@ -498,7 +498,7 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)</div><div class='ctx'> 	}</div><div class='ctx'> 	RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_LOUD, ("MAP\n"),</div><div class='ctx'> 		      hwinfo, HWSET_MAX_SIZE);</div><div class='del'>-	eeprom_id = *((u16 *)&amp;hwinfo[0]);</div><div class='add'>+	eeprom_id = le16_to_cpu(*((__le16 *)&amp;hwinfo[0]));</div><div class='ctx'> 	if (eeprom_id != RTL8190_EEPROM_ID) {</div><div class='ctx'> 		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,</div><div class='ctx'> 			 ("EEPROM ID(%#x) is invalid!!\n", eeprom_id));</div><div class='hunk'>@@ -516,13 +516,14 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)</div><div class='ctx'> 	pr_info("MAC address: %pM\n", rtlefuse-&gt;dev_addr);</div><div class='ctx'> 	_rtl92cu_read_txpower_info_from_hwpg(hw,</div><div class='ctx'> 					   rtlefuse-&gt;autoload_failflag, hwinfo);</div><div class='del'>-	rtlefuse-&gt;eeprom_vid = *(u16 *)&amp;hwinfo[EEPROM_VID];</div><div class='del'>-	rtlefuse-&gt;eeprom_did = *(u16 *)&amp;hwinfo[EEPROM_DID];</div><div class='add'>+	rtlefuse-&gt;eeprom_vid = le16_to_cpu(*(__le16 *)&amp;hwinfo[EEPROM_VID]);</div><div class='add'>+	rtlefuse-&gt;eeprom_did = le16_to_cpu(*(__le16 *)&amp;hwinfo[EEPROM_DID]);</div><div class='ctx'> 	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,</div><div class='ctx'> 		 (" VID = 0x%02x PID = 0x%02x\n",</div><div class='ctx'> 		 rtlefuse-&gt;eeprom_vid, rtlefuse-&gt;eeprom_did));</div><div class='ctx'> 	rtlefuse-&gt;eeprom_channelplan = *(u8 *)&amp;hwinfo[EEPROM_CHANNELPLAN];</div><div class='del'>-	rtlefuse-&gt;eeprom_version = *(u16 *)&amp;hwinfo[EEPROM_VERSION];</div><div class='add'>+	rtlefuse-&gt;eeprom_version =</div><div class='add'>+			 le16_to_cpu(*(__le16 *)&amp;hwinfo[EEPROM_VERSION]);</div><div class='ctx'> 	rtlefuse-&gt;txpwr_fromeprom = true;</div><div class='ctx'> 	rtlefuse-&gt;eeprom_oemid = *(u8 *)&amp;hwinfo[EEPROM_CUSTOMER_ID];</div><div class='ctx'> 	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,</div><div class='hunk'>@@ -2435,7 +2436,7 @@ bool rtl92cu_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 * valid)</div><div class='ctx'> 			 "%x\n", ppsc-&gt;hwradiooff, e_rfpowerstate_toset));</div><div class='ctx'> 	}</div><div class='ctx'> 	if (actuallyset) {</div><div class='del'>-		ppsc-&gt;hwradiooff = 1;</div><div class='add'>+		ppsc-&gt;hwradiooff = true;</div><div class='ctx'> 		if (e_rfpowerstate_toset == ERFON) {</div><div class='ctx'> 			if ((ppsc-&gt;reg_rfps_level  &amp; RT_RF_OFF_LEVL_ASPM) &amp;&amp;</div><div class='ctx'> 			     RT_IN_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_ASPM))</div><div class='head'>diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c<br/>index 060a06f4a885..9e0c8fcdf90f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192cu/mac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rtlwifi/rtl8192cu/mac.c</a></div><div class='hunk'>@@ -84,6 +84,7 @@ void rtl92c_read_chip_version(struct ieee80211_hw *hw)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	rtlhal-&gt;version  = (enum version_8192c)chip_version;</div><div class='add'>+	pr_info("rtl8192cu: Chip version 0x%x\n", chip_version);</div><div class='ctx'> 	switch (rtlhal-&gt;version) {</div><div class='ctx'> 	case VERSION_NORMAL_TSMC_CHIP_92C_1T2R:</div><div class='ctx'> 		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,</div><div class='head'>diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c<br/>index c244f2f1b83f..6d2ca773bbc7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192cu/sw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rtlwifi/rtl8192cu/sw.c</a></div><div class='hunk'>@@ -57,9 +57,9 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)</div><div class='ctx'> 	const struct firmware *firmware;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	rtlpriv-&gt;dm.dm_initialgain_enable = 1;</div><div class='add'>+	rtlpriv-&gt;dm.dm_initialgain_enable = true;</div><div class='ctx'> 	rtlpriv-&gt;dm.dm_flag = 0;</div><div class='del'>-	rtlpriv-&gt;dm.disable_framebursting = 0;</div><div class='add'>+	rtlpriv-&gt;dm.disable_framebursting = false;</div><div class='ctx'> 	rtlpriv-&gt;dm.thermalvalue = 0;</div><div class='ctx'> 	rtlpriv-&gt;dbg.global_debuglevel = rtlpriv-&gt;cfg-&gt;mod_params-&gt;debug;</div><div class='ctx'> 	rtlpriv-&gt;rtlhal.pfirmware = vmalloc(0x4000);</div><div class='hunk'>@@ -275,6 +275,8 @@ static struct usb_device_id rtl8192c_usb_ids[] = {</div><div class='ctx'> 	{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8191, rtl92cu_hal_cfg)},</div><div class='ctx'> </div><div class='ctx'> 	/****** 8188CU ********/</div><div class='add'>+	/* RTL8188CTV */</div><div class='add'>+	{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x018a, rtl92cu_hal_cfg)},</div><div class='ctx'> 	/* 8188CE-VAU USB minCard */</div><div class='ctx'> 	{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8170, rtl92cu_hal_cfg)},</div><div class='ctx'> 	/* 8188cu 1*1 dongle */</div><div class='hunk'>@@ -291,14 +293,14 @@ static struct usb_device_id rtl8192c_usb_ids[] = {</div><div class='ctx'> 	{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817e, rtl92cu_hal_cfg)},</div><div class='ctx'> 	/* 8188RU in Alfa AWUS036NHR */</div><div class='ctx'> 	{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817f, rtl92cu_hal_cfg)},</div><div class='add'>+	/* RTL8188CUS-VL */</div><div class='add'>+	{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x818a, rtl92cu_hal_cfg)},</div><div class='ctx'> 	/* 8188 Combo for BC4 */</div><div class='ctx'> 	{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8754, rtl92cu_hal_cfg)},</div><div class='ctx'> </div><div class='ctx'> 	/****** 8192CU ********/</div><div class='del'>-	/* 8191cu 1*2 */</div><div class='del'>-	{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8177, rtl92cu_hal_cfg)},</div><div class='ctx'> 	/* 8192cu 2*2 */</div><div class='del'>-	{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817b, rtl92cu_hal_cfg)},</div><div class='add'>+	{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8178, rtl92cu_hal_cfg)},</div><div class='ctx'> 	/* 8192CE-VAU USB minCard */</div><div class='ctx'> 	{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817c, rtl92cu_hal_cfg)},</div><div class='ctx'> </div><div class='hunk'>@@ -309,13 +311,17 @@ static struct usb_device_id rtl8192c_usb_ids[] = {</div><div class='ctx'> 	{RTL_USB_DEVICE(0x07b8, 0x8188, rtl92cu_hal_cfg)}, /*Abocom - Abocom*/</div><div class='ctx'> 	{RTL_USB_DEVICE(0x07b8, 0x8189, rtl92cu_hal_cfg)}, /*Funai - Abocom*/</div><div class='ctx'> 	{RTL_USB_DEVICE(0x0846, 0x9041, rtl92cu_hal_cfg)}, /*NetGear WNA1000M*/</div><div class='del'>-	{RTL_USB_DEVICE(0x0Df6, 0x0052, rtl92cu_hal_cfg)}, /*Sitecom - Edimax*/</div><div class='add'>+	{RTL_USB_DEVICE(0x0df6, 0x0052, rtl92cu_hal_cfg)}, /*Sitecom - Edimax*/</div><div class='add'>+	{RTL_USB_DEVICE(0x0df6, 0x005c, rtl92cu_hal_cfg)}, /*Sitecom - Edimax*/</div><div class='ctx'> 	{RTL_USB_DEVICE(0x0eb0, 0x9071, rtl92cu_hal_cfg)}, /*NO Brand - Etop*/</div><div class='ctx'> 	/* HP - Lite-On ,8188CUS Slim Combo */</div><div class='ctx'> 	{RTL_USB_DEVICE(0x103c, 0x1629, rtl92cu_hal_cfg)},</div><div class='ctx'> 	{RTL_USB_DEVICE(0x13d3, 0x3357, rtl92cu_hal_cfg)}, /* AzureWave */</div><div class='ctx'> 	{RTL_USB_DEVICE(0x2001, 0x3308, rtl92cu_hal_cfg)}, /*D-Link - Alpha*/</div><div class='add'>+	{RTL_USB_DEVICE(0x2019, 0x4902, rtl92cu_hal_cfg)}, /*Planex - Etop*/</div><div class='ctx'> 	{RTL_USB_DEVICE(0x2019, 0xab2a, rtl92cu_hal_cfg)}, /*Planex - Abocom*/</div><div class='add'>+	/*SW-WF02-AD15 -Abocom*/</div><div class='add'>+	{RTL_USB_DEVICE(0x2019, 0xab2e, rtl92cu_hal_cfg)},</div><div class='ctx'> 	{RTL_USB_DEVICE(0x2019, 0xed17, rtl92cu_hal_cfg)}, /*PCI - Edimax*/</div><div class='ctx'> 	{RTL_USB_DEVICE(0x20f4, 0x648b, rtl92cu_hal_cfg)}, /*TRENDnet - Cameo*/</div><div class='ctx'> 	{RTL_USB_DEVICE(0x7392, 0x7811, rtl92cu_hal_cfg)}, /*Edimax - Edimax*/</div><div class='hunk'>@@ -326,14 +332,36 @@ static struct usb_device_id rtl8192c_usb_ids[] = {</div><div class='ctx'> 	{RTL_USB_DEVICE(0x4855, 0x0091, rtl92cu_hal_cfg)}, /* NetweeN-Feixun */</div><div class='ctx'> 	{RTL_USB_DEVICE(0x9846, 0x9041, rtl92cu_hal_cfg)}, /* Netgear Cameo */</div><div class='ctx'> </div><div class='add'>+	/****** 8188 RU ********/</div><div class='add'>+	/* Netcore */</div><div class='add'>+	{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x317f, rtl92cu_hal_cfg)},</div><div class='add'>+</div><div class='add'>+	/****** 8188CUS Slim Solo********/</div><div class='add'>+	{RTL_USB_DEVICE(0x04f2, 0xaff7, rtl92cu_hal_cfg)}, /*Xavi*/</div><div class='add'>+	{RTL_USB_DEVICE(0x04f2, 0xaff9, rtl92cu_hal_cfg)}, /*Xavi*/</div><div class='add'>+	{RTL_USB_DEVICE(0x04f2, 0xaffa, rtl92cu_hal_cfg)}, /*Xavi*/</div><div class='add'>+</div><div class='add'>+	/****** 8188CUS Slim Combo ********/</div><div class='add'>+	{RTL_USB_DEVICE(0x04f2, 0xaff8, rtl92cu_hal_cfg)}, /*Xavi*/</div><div class='add'>+	{RTL_USB_DEVICE(0x04f2, 0xaffb, rtl92cu_hal_cfg)}, /*Xavi*/</div><div class='add'>+	{RTL_USB_DEVICE(0x04f2, 0xaffc, rtl92cu_hal_cfg)}, /*Xavi*/</div><div class='add'>+	{RTL_USB_DEVICE(0x2019, 0x1201, rtl92cu_hal_cfg)}, /*Planex-Vencer*/</div><div class='add'>+</div><div class='ctx'> 	/****** 8192CU ********/</div><div class='add'>+	{RTL_USB_DEVICE(0x050d, 0x2102, rtl92cu_hal_cfg)}, /*Belcom-Sercomm*/</div><div class='add'>+	{RTL_USB_DEVICE(0x050d, 0x2103, rtl92cu_hal_cfg)}, /*Belcom-Edimax*/</div><div class='ctx'> 	{RTL_USB_DEVICE(0x0586, 0x341f, rtl92cu_hal_cfg)}, /*Zyxel -Abocom*/</div><div class='ctx'> 	{RTL_USB_DEVICE(0x07aa, 0x0056, rtl92cu_hal_cfg)}, /*ATKK-Gemtek*/</div><div class='ctx'> 	{RTL_USB_DEVICE(0x07b8, 0x8178, rtl92cu_hal_cfg)}, /*Funai -Abocom*/</div><div class='add'>+	{RTL_USB_DEVICE(0x0846, 0x9021, rtl92cu_hal_cfg)}, /*Netgear-Sercomm*/</div><div class='add'>+	{RTL_USB_DEVICE(0x0b05, 0x17ab, rtl92cu_hal_cfg)}, /*ASUS-Edimax*/</div><div class='add'>+	{RTL_USB_DEVICE(0x0df6, 0x0061, rtl92cu_hal_cfg)}, /*Sitecom-Edimax*/</div><div class='add'>+	{RTL_USB_DEVICE(0x0e66, 0x0019, rtl92cu_hal_cfg)}, /*Hawking-Edimax*/</div><div class='ctx'> 	{RTL_USB_DEVICE(0x2001, 0x3307, rtl92cu_hal_cfg)}, /*D-Link-Cameo*/</div><div class='ctx'> 	{RTL_USB_DEVICE(0x2001, 0x3309, rtl92cu_hal_cfg)}, /*D-Link-Alpha*/</div><div class='ctx'> 	{RTL_USB_DEVICE(0x2001, 0x330a, rtl92cu_hal_cfg)}, /*D-Link-Alpha*/</div><div class='ctx'> 	{RTL_USB_DEVICE(0x2019, 0xab2b, rtl92cu_hal_cfg)}, /*Planex -Abocom*/</div><div class='add'>+	{RTL_USB_DEVICE(0x20f4, 0x624d, rtl92cu_hal_cfg)}, /*TRENDNet*/</div><div class='ctx'> 	{RTL_USB_DEVICE(0x7392, 0x7822, rtl92cu_hal_cfg)}, /*Edimax -Edimax*/</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='hunk'>@@ -356,15 +384,4 @@ static struct usb_driver rtl8192cu_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init rtl8192cu_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;rtl8192cu_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit rtl8192cu_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;rtl8192cu_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(rtl8192cu_init);</div><div class='del'>-module_exit(rtl8192cu_exit);</div><div class='add'>+module_usb_driver(rtl8192cu_driver);</div><div class='head'>diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c<br/>index bc33b147f44f..b3cc7b949992 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192cu/trx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rtlwifi/rtl8192cu/trx.c</a></div><div class='hunk'>@@ -491,7 +491,7 @@ static void _rtl_tx_desc_checksum(u8 *txdesc)</div><div class='ctx'> 	SET_TX_DESC_TX_DESC_CHECKSUM(txdesc, 0);</div><div class='ctx'> 	for (index = 0; index &lt; 16; index++)</div><div class='ctx'> 		checksum = checksum ^ (*(ptr + index));</div><div class='del'>-	SET_TX_DESC_TX_DESC_CHECKSUM(txdesc, checksum);</div><div class='add'>+	SET_TX_DESC_TX_DESC_CHECKSUM(txdesc, cpu_to_le16(checksum));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,</div><div class='head'>diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c<br/>index f5bd3a3cd34a..9d89d7ccdafb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192de/hw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192de/hw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192de/hw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rtlwifi/rtl8192de/hw.c</a></div><div class='hunk'>@@ -466,8 +466,8 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)</div><div class='ctx'> 		bool int_migration = *(bool *) (val);</div><div class='ctx'> </div><div class='ctx'> 		if (int_migration) {</div><div class='del'>-			/* Set interrrupt migration timer and</div><div class='del'>-			 * corresponging Tx/Rx counter.</div><div class='add'>+			/* Set interrupt migration timer and</div><div class='add'>+			 * corresponding Tx/Rx counter.</div><div class='ctx'> 			 * timer 25ns*0xfa0=100us for 0xf packets.</div><div class='ctx'> 			 * 0x306:Rx, 0x307:Tx */</div><div class='ctx'> 			rtl_write_dword(rtlpriv, REG_INT_MIG, 0xfe000fa0);</div><div class='head'>diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c<br/>index 149493f4c25c..7911c9c87085 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192de/sw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192de/sw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192de/sw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rtlwifi/rtl8192de/sw.c</a></div><div class='hunk'>@@ -99,9 +99,9 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	rtlpriv-&gt;dm.dm_initialgain_enable = true;</div><div class='ctx'> 	rtlpriv-&gt;dm.dm_flag = 0;</div><div class='del'>-	rtlpriv-&gt;dm.disable_framebursting = 0;</div><div class='add'>+	rtlpriv-&gt;dm.disable_framebursting = false;</div><div class='ctx'> 	rtlpriv-&gt;dm.thermalvalue = 0;</div><div class='del'>-	rtlpriv-&gt;dm.useramask = 1;</div><div class='add'>+	rtlpriv-&gt;dm.useramask = true;</div><div class='ctx'> </div><div class='ctx'> 	/* dual mac */</div><div class='ctx'> 	if (rtlpriv-&gt;rtlhal.current_bandtype == BAND_ON_5G)</div><div class='head'>diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/fw.c b/drivers/net/wireless/rtlwifi/rtl8192se/fw.c<br/>index 6f91a148c222..3fda6b1dcf46 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192se/fw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192se/fw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192se/fw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rtlwifi/rtl8192se/fw.c</a></div><div class='hunk'>@@ -196,6 +196,8 @@ static bool _rtl92s_firmware_downloadcode(struct ieee80211_hw *hw,</div><div class='ctx'> 		/* Allocate skb buffer to contain firmware */</div><div class='ctx'> 		/* info and tx descriptor info. */</div><div class='ctx'> 		skb = dev_alloc_skb(frag_length);</div><div class='add'>+		if (!skb)</div><div class='add'>+			return false;</div><div class='ctx'> 		skb_reserve(skb, extra_descoffset);</div><div class='ctx'> 		seg_ptr = (u8 *)skb_put(skb, (u32)(frag_length -</div><div class='ctx'> 					extra_descoffset));</div><div class='hunk'>@@ -573,6 +575,8 @@ static bool _rtl92s_firmware_set_h2c_cmd(struct ieee80211_hw *hw, u8 h2c_cmd,</div><div class='ctx'> </div><div class='ctx'> 	len = _rtl92s_get_h2c_cmdlen(MAX_TRANSMIT_BUFFER_SIZE, 1, &amp;cmd_len);</div><div class='ctx'> 	skb = dev_alloc_skb(len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return false;</div><div class='ctx'> 	cb_desc = (struct rtl_tcb_desc *)(skb-&gt;cb);</div><div class='ctx'> 	cb_desc-&gt;queue_index = TXCMD_QUEUE;</div><div class='ctx'> 	cb_desc-&gt;cmd_or_init = DESC_PACKET_TYPE_NORMAL;</div><div class='head'>diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c<br/>index 92f49d522c56..78723cf59491 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192se/sw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/rtl8192se/sw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/rtl8192se/sw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rtlwifi/rtl8192se/sw.c</a></div><div class='hunk'>@@ -98,9 +98,9 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	u16 earlyrxthreshold = 7;</div><div class='ctx'> </div><div class='del'>-	rtlpriv-&gt;dm.dm_initialgain_enable = 1;</div><div class='add'>+	rtlpriv-&gt;dm.dm_initialgain_enable = true;</div><div class='ctx'> 	rtlpriv-&gt;dm.dm_flag = 0;</div><div class='del'>-	rtlpriv-&gt;dm.disable_framebursting = 0;</div><div class='add'>+	rtlpriv-&gt;dm.disable_framebursting = false;</div><div class='ctx'> 	rtlpriv-&gt;dm.thermalvalue = 0;</div><div class='ctx'> 	rtlpriv-&gt;dm.useramask = true;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c<br/>index 54cb8a60514d..e956fa71d040 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/usb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/usb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rtlwifi/usb.c</a></div><div class='hunk'>@@ -34,13 +34,14 @@</div><div class='ctx'> #include "usb.h"</div><div class='ctx'> #include "base.h"</div><div class='ctx'> #include "ps.h"</div><div class='add'>+#include "rtl8192c/fw_common.h"</div><div class='ctx'> </div><div class='ctx'> #define	REALTEK_USB_VENQT_READ			0xC0</div><div class='ctx'> #define	REALTEK_USB_VENQT_WRITE			0x40</div><div class='ctx'> #define REALTEK_USB_VENQT_CMD_REQ		0x05</div><div class='ctx'> #define	REALTEK_USB_VENQT_CMD_IDX		0x00</div><div class='ctx'> </div><div class='del'>-#define REALTEK_USB_VENQT_MAX_BUF_SIZE		254</div><div class='add'>+#define MAX_USBCTRL_VENDORREQ_TIMES		10</div><div class='ctx'> </div><div class='ctx'> static void usbctrl_async_callback(struct urb *urb)</div><div class='ctx'> {</div><div class='hunk'>@@ -82,6 +83,7 @@ static int _usbctrl_vendorreq_async_write(struct usb_device *udev, u8 request,</div><div class='ctx'> 	dr-&gt;wValue = cpu_to_le16(value);</div><div class='ctx'> 	dr-&gt;wIndex = cpu_to_le16(index);</div><div class='ctx'> 	dr-&gt;wLength = cpu_to_le16(len);</div><div class='add'>+	/* data are already in little-endian order */</div><div class='ctx'> 	memcpy(buf, pdata, len);</div><div class='ctx'> 	usb_fill_control_urb(urb, udev, pipe,</div><div class='ctx'> 			     (unsigned char *)dr, buf, len,</div><div class='hunk'>@@ -100,16 +102,28 @@ static int _usbctrl_vendorreq_sync_read(struct usb_device *udev, u8 request,</div><div class='ctx'> 	unsigned int pipe;</div><div class='ctx'> 	int status;</div><div class='ctx'> 	u8 reqtype;</div><div class='add'>+	int vendorreq_times = 0;</div><div class='add'>+	static int count;</div><div class='ctx'> </div><div class='ctx'> 	pipe = usb_rcvctrlpipe(udev, 0); /* read_in */</div><div class='ctx'> 	reqtype =  REALTEK_USB_VENQT_READ;</div><div class='ctx'> </div><div class='del'>-	status = usb_control_msg(udev, pipe, request, reqtype, value, index,</div><div class='del'>-				 pdata, len, 0); /* max. timeout */</div><div class='add'>+	do {</div><div class='add'>+		status = usb_control_msg(udev, pipe, request, reqtype, value,</div><div class='add'>+					 index, pdata, len, 0); /*max. timeout*/</div><div class='add'>+		if (status &lt; 0) {</div><div class='add'>+			/* firmware download is checksumed, don't retry */</div><div class='add'>+			if ((value &gt;= FW_8192C_START_ADDRESS &amp;&amp;</div><div class='add'>+			    value &lt;= FW_8192C_END_ADDRESS))</div><div class='add'>+				break;</div><div class='add'>+		} else {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} while (++vendorreq_times &lt; MAX_USBCTRL_VENDORREQ_TIMES);</div><div class='ctx'> </div><div class='del'>-	if (status &lt; 0)</div><div class='add'>+	if (status &lt; 0 &amp;&amp; count++ &lt; 4)</div><div class='ctx'> 		pr_err("reg 0x%x, usbctrl_vendorreq TimeOut! status:0x%x value=0x%x\n",</div><div class='del'>-		       value, status, *(u32 *)pdata);</div><div class='add'>+		       value, status, le32_to_cpu(*(u32 *)pdata));</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -129,7 +143,7 @@ static u32 _usb_read_sync(struct usb_device *udev, u32 addr, u16 len)</div><div class='ctx'> </div><div class='ctx'> 	wvalue = (u16)addr;</div><div class='ctx'> 	_usbctrl_vendorreq_sync_read(udev, request, wvalue, index, data, len);</div><div class='del'>-	ret = *data;</div><div class='add'>+	ret = le32_to_cpu(*data);</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -161,12 +175,12 @@ static void _usb_write_async(struct usb_device *udev, u32 addr, u32 val,</div><div class='ctx'> 	u8 request;</div><div class='ctx'> 	u16 wvalue;</div><div class='ctx'> 	u16 index;</div><div class='del'>-	u32 data;</div><div class='add'>+	__le32 data;</div><div class='ctx'> </div><div class='ctx'> 	request = REALTEK_USB_VENQT_CMD_REQ;</div><div class='ctx'> 	index = REALTEK_USB_VENQT_CMD_IDX; /* n/a */</div><div class='ctx'> 	wvalue = (u16)(addr&amp;0x0000ffff);</div><div class='del'>-	data = val;</div><div class='add'>+	data = cpu_to_le32(val);</div><div class='ctx'> 	_usbctrl_vendorreq_async_write(udev, request, wvalue, index, &amp;data,</div><div class='ctx'> 				       len);</div><div class='ctx'> }</div><div class='hunk'>@@ -192,6 +206,30 @@ static void _usb_write32_async(struct rtl_priv *rtlpriv, u32 addr, u32 val)</div><div class='ctx'> 	_usb_write_async(to_usb_device(dev), addr, val, 4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void _usb_writeN_sync(struct rtl_priv *rtlpriv, u32 addr, void *data,</div><div class='add'>+			     u16 len)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = rtlpriv-&gt;io.dev;</div><div class='add'>+	struct usb_device *udev = to_usb_device(dev);</div><div class='add'>+	u8 request = REALTEK_USB_VENQT_CMD_REQ;</div><div class='add'>+	u8 reqtype =  REALTEK_USB_VENQT_WRITE;</div><div class='add'>+	u16 wvalue;</div><div class='add'>+	u16 index = REALTEK_USB_VENQT_CMD_IDX;</div><div class='add'>+	int pipe = usb_sndctrlpipe(udev, 0); /* write_out */</div><div class='add'>+	u8 *buffer;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+</div><div class='add'>+	wvalue = (u16)(addr&amp;0x0000ffff);</div><div class='add'>+	buffer = usb_alloc_coherent(udev, (size_t)len, GFP_ATOMIC, &amp;dma_addr);</div><div class='add'>+	if (!buffer)</div><div class='add'>+		return;</div><div class='add'>+	memcpy(buffer, data, len);</div><div class='add'>+	usb_control_msg(udev, pipe, request, reqtype, wvalue,</div><div class='add'>+			index, buffer, len, 50);</div><div class='add'>+</div><div class='add'>+	usb_free_coherent(udev, (size_t)len, buffer, dma_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void _rtl_usb_io_handler_init(struct device *dev,</div><div class='ctx'> 				     struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='hunk'>@@ -205,6 +243,7 @@ static void _rtl_usb_io_handler_init(struct device *dev,</div><div class='ctx'> 	rtlpriv-&gt;io.read8_sync		= _usb_read8_sync;</div><div class='ctx'> 	rtlpriv-&gt;io.read16_sync		= _usb_read16_sync;</div><div class='ctx'> 	rtlpriv-&gt;io.read32_sync		= _usb_read32_sync;</div><div class='add'>+	rtlpriv-&gt;io.writeN_sync		= _usb_writeN_sync;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void _rtl_usb_io_handler_release(struct ieee80211_hw *hw)</div><div class='head'>diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h<br/>index 713c7ddba8eb..cdaf1429fa0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/wifi.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/rtlwifi/wifi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/rtlwifi/wifi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/rtlwifi/wifi.h</a></div><div class='hunk'>@@ -63,6 +63,7 @@</div><div class='ctx'> #define AC_MAX					4</div><div class='ctx'> #define QOS_QUEUE_NUM				4</div><div class='ctx'> #define RTL_MAC80211_NUM_QUEUE			5</div><div class='add'>+#define REALTEK_USB_VENQT_MAX_BUF_SIZE		254</div><div class='ctx'> </div><div class='ctx'> #define QBSS_LOAD_SIZE				5</div><div class='ctx'> #define MAX_WMMELE_LENGTH			64</div><div class='hunk'>@@ -943,8 +944,10 @@ struct rtl_io {</div><div class='ctx'> 	unsigned long pci_base_addr;	/*device I/O address */</div><div class='ctx'> </div><div class='ctx'> 	void (*write8_async) (struct rtl_priv *rtlpriv, u32 addr, u8 val);</div><div class='del'>-	void (*write16_async) (struct rtl_priv *rtlpriv, u32 addr, __le16 val);</div><div class='del'>-	void (*write32_async) (struct rtl_priv *rtlpriv, u32 addr, __le32 val);</div><div class='add'>+	void (*write16_async) (struct rtl_priv *rtlpriv, u32 addr, u16 val);</div><div class='add'>+	void (*write32_async) (struct rtl_priv *rtlpriv, u32 addr, u32 val);</div><div class='add'>+	void (*writeN_sync) (struct rtl_priv *rtlpriv, u32 addr, void *buf,</div><div class='add'>+			     u16 len);</div><div class='ctx'> </div><div class='ctx'> 	u8(*read8_sync) (struct rtl_priv *rtlpriv, u32 addr);</div><div class='ctx'> 	u16(*read16_sync) (struct rtl_priv *rtlpriv, u32 addr);</div><div class='hunk'>@@ -1485,7 +1488,7 @@ struct rtl_intf_ops {</div><div class='ctx'> </div><div class='ctx'> struct rtl_mod_params {</div><div class='ctx'> 	/* default: 0 = using hardware encryption */</div><div class='del'>-	int sw_crypto;</div><div class='add'>+	bool sw_crypto;</div><div class='ctx'> </div><div class='ctx'> 	/* default: 0 = DBG_EMERG (0)*/</div><div class='ctx'> 	int debug;</div><div class='hunk'>@@ -1541,6 +1544,7 @@ struct rtl_hal_cfg {</div><div class='ctx'> struct rtl_locks {</div><div class='ctx'> 	/* mutex */</div><div class='ctx'> 	struct mutex conf_mutex;</div><div class='add'>+	struct mutex ps_mutex;</div><div class='ctx'> </div><div class='ctx'> 	/*spin lock */</div><div class='ctx'> 	spinlock_t ips_lock;</div><div class='hunk'>@@ -1548,7 +1552,6 @@ struct rtl_locks {</div><div class='ctx'> 	spinlock_t h2c_lock;</div><div class='ctx'> 	spinlock_t rf_ps_lock;</div><div class='ctx'> 	spinlock_t rf_lock;</div><div class='del'>-	spinlock_t lps_lock;</div><div class='ctx'> 	spinlock_t waitq_lock;</div><div class='ctx'> </div><div class='ctx'> 	/*Dual mac*/</div><div class='hunk'>@@ -1573,7 +1576,8 @@ struct rtl_works {</div><div class='ctx'> 	/* For SW LPS */</div><div class='ctx'> 	struct delayed_work ps_work;</div><div class='ctx'> 	struct delayed_work ps_rfon_wq;</div><div class='del'>-	struct tasklet_struct ips_leave_tasklet;</div><div class='add'>+</div><div class='add'>+	struct work_struct lps_leave_work;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct rtl_debug {</div><div class='head'>diff --git a/drivers/net/wireless/wl1251/spi.c b/drivers/net/wireless/wl1251/spi.c<br/>index eaa5f9556200..6248c354fc5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl1251/spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl1251/spi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl1251/spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl1251/spi.c</a></div><div class='hunk'>@@ -319,7 +319,6 @@ static int __devexit wl1251_spi_remove(struct spi_device *spi)</div><div class='ctx'> static struct spi_driver wl1251_spi_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name		= DRIVER_NAME,</div><div class='del'>-		.bus		= &amp;spi_bus_type,</div><div class='ctx'> 		.owner		= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig<br/>index 3fe388b87c2e..af08c8609c63 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/Kconfig</a></div><div class='hunk'>@@ -42,16 +42,6 @@ config WL12XX_SDIO</div><div class='ctx'> 	  If you choose to build a module, it'll be called wl12xx_sdio.</div><div class='ctx'> 	  Say N if unsure.</div><div class='ctx'> </div><div class='del'>-config WL12XX_SDIO_TEST</div><div class='del'>-	tristate "TI wl12xx SDIO testing support"</div><div class='del'>-	depends on WL12XX &amp;&amp; MMC &amp;&amp; WL12XX_SDIO</div><div class='del'>-	default n</div><div class='del'>-	---help---</div><div class='del'>-	  This module adds support for the SDIO bus testing with the</div><div class='del'>-	  TI wl12xx chipsets.  You probably don't want this unless you are</div><div class='del'>-	  testing a new hardware platform.  Select this if you want to test the</div><div class='del'>-	  SDIO bus which is connected to the wl12xx chip.</div><div class='del'>-</div><div class='ctx'> config WL12XX_PLATFORM_DATA</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on WL12XX_SDIO != n || WL1251_SDIO != n</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/Makefile b/drivers/net/wireless/wl12xx/Makefile<br/>index 621b3483ca2c..fe67262ba19f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/Makefile</a></div><div class='hunk'>@@ -3,14 +3,11 @@ wl12xx-objs		= main.o cmd.o io.o event.o tx.o rx.o ps.o acx.o \</div><div class='ctx'> </div><div class='ctx'> wl12xx_spi-objs 	= spi.o</div><div class='ctx'> wl12xx_sdio-objs	= sdio.o</div><div class='del'>-wl12xx_sdio_test-objs	= sdio_test.o</div><div class='ctx'> </div><div class='ctx'> wl12xx-$(CONFIG_NL80211_TESTMODE)	+= testmode.o</div><div class='ctx'> obj-$(CONFIG_WL12XX)			+= wl12xx.o</div><div class='ctx'> obj-$(CONFIG_WL12XX_SPI)		+= wl12xx_spi.o</div><div class='ctx'> obj-$(CONFIG_WL12XX_SDIO)		+= wl12xx_sdio.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_WL12XX_SDIO_TEST)		+= wl12xx_sdio_test.o</div><div class='del'>-</div><div class='ctx'> # small builtin driver bit</div><div class='ctx'> obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wl12xx_platform_data.o</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/acx.c b/drivers/net/wireless/wl12xx/acx.c<br/>index ca044a743191..7537c401a448 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/acx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/acx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/acx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/acx.c</a></div><div class='hunk'>@@ -29,11 +29,12 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "wl12xx.h"</div><div class='add'>+#include "debug.h"</div><div class='ctx'> #include "wl12xx_80211.h"</div><div class='ctx'> #include "reg.h"</div><div class='ctx'> #include "ps.h"</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_wake_up_conditions(struct wl1271 *wl)</div><div class='add'>+int wl1271_acx_wake_up_conditions(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct acx_wake_up_condition *wake_up;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -46,7 +47,7 @@ int wl1271_acx_wake_up_conditions(struct wl1271 *wl)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wake_up-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	wake_up-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	wake_up-&gt;wake_up_event = wl-&gt;conf.conn.wake_up_event;</div><div class='ctx'> 	wake_up-&gt;listen_interval = wl-&gt;conf.conn.listen_interval;</div><div class='ctx'> </div><div class='hunk'>@@ -84,7 +85,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_tx_power(struct wl1271 *wl, int power)</div><div class='add'>+int wl1271_acx_tx_power(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			int power)</div><div class='ctx'> {</div><div class='ctx'> 	struct acx_current_tx_power *acx;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -100,7 +102,7 @@ int wl1271_acx_tx_power(struct wl1271 *wl, int power)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acx-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	acx-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	acx-&gt;current_tx_power = power * 10;</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_cmd_configure(wl, DOT11_CUR_TX_PWR, acx, sizeof(*acx));</div><div class='hunk'>@@ -114,7 +116,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_feature_cfg(struct wl1271 *wl)</div><div class='add'>+int wl1271_acx_feature_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct acx_feature_config *feature;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -128,7 +130,7 @@ int wl1271_acx_feature_cfg(struct wl1271 *wl)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* DF_ENCRYPTION_DISABLE and DF_SNIFF_MODE_ENABLE are disabled */</div><div class='del'>-	feature-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	feature-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	feature-&gt;data_flow_options = 0;</div><div class='ctx'> 	feature-&gt;options = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -184,33 +186,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_pd_threshold(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-	struct acx_packet_detection *pd;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	wl1271_debug(DEBUG_ACX, "acx data pd threshold");</div><div class='del'>-</div><div class='del'>-	pd = kzalloc(sizeof(*pd), GFP_KERNEL);</div><div class='del'>-	if (!pd) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pd-&gt;threshold = cpu_to_le32(wl-&gt;conf.rx.packet_detection_threshold);</div><div class='del'>-</div><div class='del'>-	ret = wl1271_cmd_configure(wl, ACX_PD_THRESHOLD, pd, sizeof(*pd));</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		wl1271_warning("failed to set pd threshold: %d", ret);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	kfree(pd);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int wl1271_acx_slot(struct wl1271 *wl, enum acx_slot_type slot_time)</div><div class='add'>+int wl1271_acx_slot(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+		    enum acx_slot_type slot_time)</div><div class='ctx'> {</div><div class='ctx'> 	struct acx_slot *slot;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -223,7 +200,7 @@ int wl1271_acx_slot(struct wl1271 *wl, enum acx_slot_type slot_time)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	slot-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	slot-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	slot-&gt;wone_index = STATION_WONE_INDEX;</div><div class='ctx'> 	slot-&gt;slot_time = slot_time;</div><div class='ctx'> </div><div class='hunk'>@@ -238,8 +215,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_group_address_tbl(struct wl1271 *wl, bool enable,</div><div class='del'>-				 void *mc_list, u32 mc_list_len)</div><div class='add'>+int wl1271_acx_group_address_tbl(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+				 bool enable, void *mc_list, u32 mc_list_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct acx_dot11_grp_addr_tbl *acx;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -253,7 +230,7 @@ int wl1271_acx_group_address_tbl(struct wl1271 *wl, bool enable,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* MAC filtering */</div><div class='del'>-	acx-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	acx-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	acx-&gt;enabled = enable;</div><div class='ctx'> 	acx-&gt;num_groups = mc_list_len;</div><div class='ctx'> 	memcpy(acx-&gt;mac_table, mc_list, mc_list_len * ETH_ALEN);</div><div class='hunk'>@@ -270,7 +247,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_service_period_timeout(struct wl1271 *wl)</div><div class='add'>+int wl1271_acx_service_period_timeout(struct wl1271 *wl,</div><div class='add'>+				      struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct acx_rx_timeout *rx_timeout;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -283,7 +261,7 @@ int wl1271_acx_service_period_timeout(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_ACX, "acx service period timeout");</div><div class='ctx'> </div><div class='del'>-	rx_timeout-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	rx_timeout-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	rx_timeout-&gt;ps_poll_timeout = cpu_to_le16(wl-&gt;conf.rx.ps_poll_timeout);</div><div class='ctx'> 	rx_timeout-&gt;upsd_timeout = cpu_to_le16(wl-&gt;conf.rx.upsd_timeout);</div><div class='ctx'> </div><div class='hunk'>@@ -300,7 +278,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_rts_threshold(struct wl1271 *wl, u32 rts_threshold)</div><div class='add'>+int wl1271_acx_rts_threshold(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			     u32 rts_threshold)</div><div class='ctx'> {</div><div class='ctx'> 	struct acx_rts_threshold *rts;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -320,7 +299,7 @@ int wl1271_acx_rts_threshold(struct wl1271 *wl, u32 rts_threshold)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rts-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	rts-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	rts-&gt;threshold = cpu_to_le16((u16)rts_threshold);</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_cmd_configure(wl, DOT11_RTS_THRESHOLD, rts, sizeof(*rts));</div><div class='hunk'>@@ -363,7 +342,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, bool enable_filter)</div><div class='add'>+int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+				 bool enable_filter)</div><div class='ctx'> {</div><div class='ctx'> 	struct acx_beacon_filter_option *beacon_filter = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -380,7 +360,7 @@ int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, bool enable_filter)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	beacon_filter-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	beacon_filter-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	beacon_filter-&gt;enable = enable_filter;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -401,7 +381,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_beacon_filter_table(struct wl1271 *wl)</div><div class='add'>+int wl1271_acx_beacon_filter_table(struct wl1271 *wl,</div><div class='add'>+				   struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct acx_beacon_filter_ie_table *ie_table;</div><div class='ctx'> 	int i, idx = 0;</div><div class='hunk'>@@ -417,7 +398,7 @@ int wl1271_acx_beacon_filter_table(struct wl1271 *wl)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* configure default beacon pass-through rules */</div><div class='del'>-	ie_table-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	ie_table-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	ie_table-&gt;num_ie = 0;</div><div class='ctx'> 	for (i = 0; i &lt; wl-&gt;conf.conn.bcn_filt_ie_count; i++) {</div><div class='ctx'> 		struct conf_bcn_filt_rule *r = &amp;(wl-&gt;conf.conn.bcn_filt_ie[i]);</div><div class='hunk'>@@ -458,7 +439,8 @@ out:</div><div class='ctx'> </div><div class='ctx'> #define ACX_CONN_MONIT_DISABLE_VALUE  0xffffffff</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_conn_monit_params(struct wl1271 *wl, bool enable)</div><div class='add'>+int wl1271_acx_conn_monit_params(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+				 bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct acx_conn_monit_params *acx;</div><div class='ctx'> 	u32 threshold = ACX_CONN_MONIT_DISABLE_VALUE;</div><div class='hunk'>@@ -479,7 +461,7 @@ int wl1271_acx_conn_monit_params(struct wl1271 *wl, bool enable)</div><div class='ctx'> 		timeout = wl-&gt;conf.conn.bss_lose_timeout;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acx-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	acx-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	acx-&gt;synch_fail_thold = cpu_to_le32(threshold);</div><div class='ctx'> 	acx-&gt;bss_lose_timeout = cpu_to_le32(timeout);</div><div class='ctx'> </div><div class='hunk'>@@ -582,7 +564,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_bcn_dtim_options(struct wl1271 *wl)</div><div class='add'>+int wl1271_acx_bcn_dtim_options(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct acx_beacon_broadcast *bb;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -595,7 +577,7 @@ int wl1271_acx_bcn_dtim_options(struct wl1271 *wl)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bb-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	bb-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	bb-&gt;beacon_rx_timeout = cpu_to_le16(wl-&gt;conf.conn.beacon_rx_timeout);</div><div class='ctx'> 	bb-&gt;broadcast_timeout = cpu_to_le16(wl-&gt;conf.conn.broadcast_timeout);</div><div class='ctx'> 	bb-&gt;rx_broadcast_in_ps = wl-&gt;conf.conn.rx_broadcast_in_ps;</div><div class='hunk'>@@ -612,7 +594,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_aid(struct wl1271 *wl, u16 aid)</div><div class='add'>+int wl1271_acx_aid(struct wl1271 *wl, struct wl12xx_vif *wlvif, u16 aid)</div><div class='ctx'> {</div><div class='ctx'> 	struct acx_aid *acx_aid;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -625,7 +607,7 @@ int wl1271_acx_aid(struct wl1271 *wl, u16 aid)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acx_aid-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	acx_aid-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	acx_aid-&gt;aid = cpu_to_le16(aid);</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_cmd_configure(wl, ACX_AID, acx_aid, sizeof(*acx_aid));</div><div class='hunk'>@@ -668,7 +650,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_set_preamble(struct wl1271 *wl, enum acx_preamble_type preamble)</div><div class='add'>+int wl1271_acx_set_preamble(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			    enum acx_preamble_type preamble)</div><div class='ctx'> {</div><div class='ctx'> 	struct acx_preamble *acx;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -681,7 +664,7 @@ int wl1271_acx_set_preamble(struct wl1271 *wl, enum acx_preamble_type preamble)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acx-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	acx-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	acx-&gt;preamble = preamble;</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_cmd_configure(wl, ACX_PREAMBLE_TYPE, acx, sizeof(*acx));</div><div class='hunk'>@@ -695,7 +678,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_cts_protect(struct wl1271 *wl,</div><div class='add'>+int wl1271_acx_cts_protect(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='ctx'> 			   enum acx_ctsprotect_type ctsprotect)</div><div class='ctx'> {</div><div class='ctx'> 	struct acx_ctsprotect *acx;</div><div class='hunk'>@@ -709,7 +692,7 @@ int wl1271_acx_cts_protect(struct wl1271 *wl,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acx-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	acx-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	acx-&gt;ctsprotect = ctsprotect;</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_cmd_configure(wl, ACX_CTS_PROTECTION, acx, sizeof(*acx));</div><div class='hunk'>@@ -739,7 +722,7 @@ int wl1271_acx_statistics(struct wl1271 *wl, struct acx_statistics *stats)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_sta_rate_policies(struct wl1271 *wl)</div><div class='add'>+int wl1271_acx_sta_rate_policies(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct acx_rate_policy *acx;</div><div class='ctx'> 	struct conf_tx_rate_class *c = &amp;wl-&gt;conf.tx.sta_rc_conf;</div><div class='hunk'>@@ -755,11 +738,11 @@ int wl1271_acx_sta_rate_policies(struct wl1271 *wl)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_ACX, "basic_rate: 0x%x, full_rate: 0x%x",</div><div class='del'>-		wl-&gt;basic_rate, wl-&gt;rate_set);</div><div class='add'>+		wlvif-&gt;basic_rate, wlvif-&gt;rate_set);</div><div class='ctx'> </div><div class='ctx'> 	/* configure one basic rate class */</div><div class='del'>-	acx-&gt;rate_policy_idx = cpu_to_le32(ACX_TX_BASIC_RATE);</div><div class='del'>-	acx-&gt;rate_policy.enabled_rates = cpu_to_le32(wl-&gt;basic_rate);</div><div class='add'>+	acx-&gt;rate_policy_idx = cpu_to_le32(wlvif-&gt;sta.basic_rate_idx);</div><div class='add'>+	acx-&gt;rate_policy.enabled_rates = cpu_to_le32(wlvif-&gt;basic_rate);</div><div class='ctx'> 	acx-&gt;rate_policy.short_retry_limit = c-&gt;short_retry_limit;</div><div class='ctx'> 	acx-&gt;rate_policy.long_retry_limit = c-&gt;long_retry_limit;</div><div class='ctx'> 	acx-&gt;rate_policy.aflags = c-&gt;aflags;</div><div class='hunk'>@@ -771,8 +754,8 @@ int wl1271_acx_sta_rate_policies(struct wl1271 *wl)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* configure one AP supported rate class */</div><div class='del'>-	acx-&gt;rate_policy_idx = cpu_to_le32(ACX_TX_AP_FULL_RATE);</div><div class='del'>-	acx-&gt;rate_policy.enabled_rates = cpu_to_le32(wl-&gt;rate_set);</div><div class='add'>+	acx-&gt;rate_policy_idx = cpu_to_le32(wlvif-&gt;sta.ap_rate_idx);</div><div class='add'>+	acx-&gt;rate_policy.enabled_rates = cpu_to_le32(wlvif-&gt;rate_set);</div><div class='ctx'> 	acx-&gt;rate_policy.short_retry_limit = c-&gt;short_retry_limit;</div><div class='ctx'> 	acx-&gt;rate_policy.long_retry_limit = c-&gt;long_retry_limit;</div><div class='ctx'> 	acx-&gt;rate_policy.aflags = c-&gt;aflags;</div><div class='hunk'>@@ -788,7 +771,7 @@ int wl1271_acx_sta_rate_policies(struct wl1271 *wl)</div><div class='ctx'> 	 * (p2p packets should always go out with OFDM rates, even</div><div class='ctx'> 	 * if we are currently connected to 11b AP)</div><div class='ctx'> 	 */</div><div class='del'>-	acx-&gt;rate_policy_idx = cpu_to_le32(ACX_TX_BASIC_RATE_P2P);</div><div class='add'>+	acx-&gt;rate_policy_idx = cpu_to_le32(wlvif-&gt;sta.p2p_rate_idx);</div><div class='ctx'> 	acx-&gt;rate_policy.enabled_rates =</div><div class='ctx'> 				cpu_to_le32(CONF_TX_RATE_MASK_BASIC_P2P);</div><div class='ctx'> 	acx-&gt;rate_policy.short_retry_limit = c-&gt;short_retry_limit;</div><div class='hunk'>@@ -839,8 +822,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_ac_cfg(struct wl1271 *wl, u8 ac, u8 cw_min, u16 cw_max,</div><div class='del'>-		      u8 aifsn, u16 txop)</div><div class='add'>+int wl1271_acx_ac_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+		      u8 ac, u8 cw_min, u16 cw_max, u8 aifsn, u16 txop)</div><div class='ctx'> {</div><div class='ctx'> 	struct acx_ac_cfg *acx;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -855,7 +838,7 @@ int wl1271_acx_ac_cfg(struct wl1271 *wl, u8 ac, u8 cw_min, u16 cw_max,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acx-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	acx-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	acx-&gt;ac = ac;</div><div class='ctx'> 	acx-&gt;cw_min = cw_min;</div><div class='ctx'> 	acx-&gt;cw_max = cpu_to_le16(cw_max);</div><div class='hunk'>@@ -873,7 +856,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_tid_cfg(struct wl1271 *wl, u8 queue_id, u8 channel_type,</div><div class='add'>+int wl1271_acx_tid_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+		       u8 queue_id, u8 channel_type,</div><div class='ctx'> 		       u8 tsid, u8 ps_scheme, u8 ack_policy,</div><div class='ctx'> 		       u32 apsd_conf0, u32 apsd_conf1)</div><div class='ctx'> {</div><div class='hunk'>@@ -889,7 +873,7 @@ int wl1271_acx_tid_cfg(struct wl1271 *wl, u8 queue_id, u8 channel_type,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acx-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	acx-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	acx-&gt;queue_id = queue_id;</div><div class='ctx'> 	acx-&gt;channel_type = channel_type;</div><div class='ctx'> 	acx-&gt;tsid = tsid;</div><div class='hunk'>@@ -1098,7 +1082,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_bet_enable(struct wl1271 *wl, bool enable)</div><div class='add'>+int wl1271_acx_bet_enable(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			  bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_acx_bet_enable *acx = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -1114,7 +1099,7 @@ int wl1271_acx_bet_enable(struct wl1271 *wl, bool enable)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acx-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	acx-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	acx-&gt;enable = enable ? CONF_BET_MODE_ENABLE : CONF_BET_MODE_DISABLE;</div><div class='ctx'> 	acx-&gt;max_consecutive = wl-&gt;conf.conn.bet_max_consecutive;</div><div class='ctx'> </div><div class='hunk'>@@ -1129,7 +1114,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_arp_ip_filter(struct wl1271 *wl, u8 enable, __be32 address)</div><div class='add'>+int wl1271_acx_arp_ip_filter(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			     u8 enable, __be32 address)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_acx_arp_filter *acx;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1142,7 +1128,7 @@ int wl1271_acx_arp_ip_filter(struct wl1271 *wl, u8 enable, __be32 address)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acx-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	acx-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	acx-&gt;version = ACX_IPV4_VERSION;</div><div class='ctx'> 	acx-&gt;enable = enable;</div><div class='ctx'> </div><div class='hunk'>@@ -1189,7 +1175,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_keep_alive_mode(struct wl1271 *wl, bool enable)</div><div class='add'>+int wl1271_acx_keep_alive_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			       bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_acx_keep_alive_mode *acx = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -1202,7 +1189,7 @@ int wl1271_acx_keep_alive_mode(struct wl1271 *wl, bool enable)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acx-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	acx-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	acx-&gt;enabled = enable;</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_cmd_configure(wl, ACX_KEEP_ALIVE_MODE, acx, sizeof(*acx));</div><div class='hunk'>@@ -1216,7 +1203,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_keep_alive_config(struct wl1271 *wl, u8 index, u8 tpl_valid)</div><div class='add'>+int wl1271_acx_keep_alive_config(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+				 u8 index, u8 tpl_valid)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_acx_keep_alive_config *acx = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -1229,7 +1217,7 @@ int wl1271_acx_keep_alive_config(struct wl1271 *wl, u8 index, u8 tpl_valid)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acx-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	acx-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	acx-&gt;period = cpu_to_le32(wl-&gt;conf.conn.keep_alive_interval);</div><div class='ctx'> 	acx-&gt;index = index;</div><div class='ctx'> 	acx-&gt;tpl_validation = tpl_valid;</div><div class='hunk'>@@ -1247,8 +1235,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, bool enable,</div><div class='del'>-				s16 thold, u8 hyst)</div><div class='add'>+int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+				bool enable, s16 thold, u8 hyst)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_acx_rssi_snr_trigger *acx = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -1261,9 +1249,9 @@ int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, bool enable,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wl-&gt;last_rssi_event = -1;</div><div class='add'>+	wlvif-&gt;last_rssi_event = -1;</div><div class='ctx'> </div><div class='del'>-	acx-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	acx-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	acx-&gt;pacing = cpu_to_le16(wl-&gt;conf.roam_trigger.trigger_pacing);</div><div class='ctx'> 	acx-&gt;metric = WL1271_ACX_TRIG_METRIC_RSSI_BEACON;</div><div class='ctx'> 	acx-&gt;type = WL1271_ACX_TRIG_TYPE_EDGE;</div><div class='hunk'>@@ -1288,7 +1276,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl)</div><div class='add'>+int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl,</div><div class='add'>+				    struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_acx_rssi_snr_avg_weights *acx = NULL;</div><div class='ctx'> 	struct conf_roam_trigger_settings *c = &amp;wl-&gt;conf.roam_trigger;</div><div class='hunk'>@@ -1302,7 +1291,7 @@ int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acx-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	acx-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	acx-&gt;rssi_beacon = c-&gt;avg_weight_rssi_beacon;</div><div class='ctx'> 	acx-&gt;rssi_data = c-&gt;avg_weight_rssi_data;</div><div class='ctx'> 	acx-&gt;snr_beacon = c-&gt;avg_weight_snr_beacon;</div><div class='hunk'>@@ -1367,6 +1356,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int wl1271_acx_set_ht_information(struct wl1271 *wl,</div><div class='add'>+				   struct wl12xx_vif *wlvif,</div><div class='ctx'> 				   u16 ht_operation_mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_acx_ht_information *acx;</div><div class='hunk'>@@ -1380,7 +1370,7 @@ int wl1271_acx_set_ht_information(struct wl1271 *wl,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acx-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	acx-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	acx-&gt;ht_protection =</div><div class='ctx'> 		(u8)(ht_operation_mode &amp; IEEE80211_HT_OP_MODE_PROTECTION);</div><div class='ctx'> 	acx-&gt;rifs_mode = 0;</div><div class='hunk'>@@ -1402,7 +1392,8 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Configure BA session initiator/receiver parameters setting in the FW. */</div><div class='del'>-int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl)</div><div class='add'>+int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl,</div><div class='add'>+				       struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_acx_ba_initiator_policy *acx;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1416,7 +1407,7 @@ int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set for the current role */</div><div class='del'>-	acx-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	acx-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	acx-&gt;tid_bitmap = wl-&gt;conf.ht.tx_ba_tid_bitmap;</div><div class='ctx'> 	acx-&gt;win_size = wl-&gt;conf.ht.tx_ba_win_size;</div><div class='ctx'> 	acx-&gt;inactivity_timeout = wl-&gt;conf.ht.inactivity_timeout;</div><div class='hunk'>@@ -1494,7 +1485,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, bool enable)</div><div class='add'>+int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			       bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_acx_ps_rx_streaming *rx_streaming;</div><div class='ctx'> 	u32 conf_queues, enable_queues;</div><div class='hunk'>@@ -1523,7 +1515,7 @@ int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, bool enable)</div><div class='ctx'> 		if (!(conf_queues &amp; BIT(i)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		rx_streaming-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+		rx_streaming-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 		rx_streaming-&gt;tid = i;</div><div class='ctx'> 		rx_streaming-&gt;enable = enable_queues &amp; BIT(i);</div><div class='ctx'> 		rx_streaming-&gt;period = wl-&gt;conf.rx_streaming.interval;</div><div class='hunk'>@@ -1542,7 +1534,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl)</div><div class='add'>+int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_acx_ap_max_tx_retry *acx = NULL;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1553,7 +1545,7 @@ int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl)</div><div class='ctx'> 	if (!acx)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	acx-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	acx-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	acx-&gt;max_tx_retry = cpu_to_le16(wl-&gt;conf.tx.max_tx_retries);</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_cmd_configure(wl, ACX_MAX_TX_FAILURE, acx, sizeof(*acx));</div><div class='hunk'>@@ -1567,7 +1559,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_acx_config_ps(struct wl1271 *wl)</div><div class='add'>+int wl12xx_acx_config_ps(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_acx_config_ps *config_ps;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1582,7 +1574,7 @@ int wl1271_acx_config_ps(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> 	config_ps-&gt;exit_retries = wl-&gt;conf.conn.psm_exit_retries;</div><div class='ctx'> 	config_ps-&gt;enter_retries = wl-&gt;conf.conn.psm_entry_retries;</div><div class='del'>-	config_ps-&gt;null_data_rate = cpu_to_le32(wl-&gt;basic_rate);</div><div class='add'>+	config_ps-&gt;null_data_rate = cpu_to_le32(wlvif-&gt;basic_rate);</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_cmd_configure(wl, ACX_CONFIG_PS, config_ps,</div><div class='ctx'> 				   sizeof(*config_ps));</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/acx.h b/drivers/net/wireless/wl12xx/acx.h<br/>index e3f93b4b3429..69892b40c2df 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/acx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/acx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/acx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/acx.h</a></div><div class='hunk'>@@ -171,13 +171,6 @@ struct acx_rx_msdu_lifetime {</div><div class='ctx'> 	__le32 lifetime;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct acx_packet_detection {</div><div class='del'>-	struct acx_header header;</div><div class='del'>-</div><div class='del'>-	__le32 threshold;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> enum acx_slot_type {</div><div class='ctx'> 	SLOT_TIME_LONG = 0,</div><div class='ctx'> 	SLOT_TIME_SHORT = 1,</div><div class='hunk'>@@ -654,11 +647,6 @@ struct acx_rate_class {</div><div class='ctx'> 	u8 reserved;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define ACX_TX_BASIC_RATE      0</div><div class='del'>-#define ACX_TX_AP_FULL_RATE    1</div><div class='del'>-#define ACX_TX_BASIC_RATE_P2P  2</div><div class='del'>-#define ACX_TX_AP_MODE_MGMT_RATE 4</div><div class='del'>-#define ACX_TX_AP_MODE_BCST_RATE 5</div><div class='ctx'> struct acx_rate_policy {</div><div class='ctx'> 	struct acx_header header;</div><div class='ctx'> </div><div class='hunk'>@@ -1234,39 +1222,48 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int wl1271_acx_wake_up_conditions(struct wl1271 *wl);</div><div class='add'>+int wl1271_acx_wake_up_conditions(struct wl1271 *wl,</div><div class='add'>+				  struct wl12xx_vif *wlvif);</div><div class='ctx'> int wl1271_acx_sleep_auth(struct wl1271 *wl, u8 sleep_auth);</div><div class='del'>-int wl1271_acx_tx_power(struct wl1271 *wl, int power);</div><div class='del'>-int wl1271_acx_feature_cfg(struct wl1271 *wl);</div><div class='add'>+int wl1271_acx_tx_power(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			int power);</div><div class='add'>+int wl1271_acx_feature_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif);</div><div class='ctx'> int wl1271_acx_mem_map(struct wl1271 *wl,</div><div class='ctx'> 		       struct acx_header *mem_map, size_t len);</div><div class='ctx'> int wl1271_acx_rx_msdu_life_time(struct wl1271 *wl);</div><div class='del'>-int wl1271_acx_pd_threshold(struct wl1271 *wl);</div><div class='del'>-int wl1271_acx_slot(struct wl1271 *wl, enum acx_slot_type slot_time);</div><div class='del'>-int wl1271_acx_group_address_tbl(struct wl1271 *wl, bool enable,</div><div class='del'>-				 void *mc_list, u32 mc_list_len);</div><div class='del'>-int wl1271_acx_service_period_timeout(struct wl1271 *wl);</div><div class='del'>-int wl1271_acx_rts_threshold(struct wl1271 *wl, u32 rts_threshold);</div><div class='add'>+int wl1271_acx_slot(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+		    enum acx_slot_type slot_time);</div><div class='add'>+int wl1271_acx_group_address_tbl(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+				 bool enable, void *mc_list, u32 mc_list_len);</div><div class='add'>+int wl1271_acx_service_period_timeout(struct wl1271 *wl,</div><div class='add'>+				      struct wl12xx_vif *wlvif);</div><div class='add'>+int wl1271_acx_rts_threshold(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			     u32 rts_threshold);</div><div class='ctx'> int wl1271_acx_dco_itrim_params(struct wl1271 *wl);</div><div class='del'>-int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, bool enable_filter);</div><div class='del'>-int wl1271_acx_beacon_filter_table(struct wl1271 *wl);</div><div class='del'>-int wl1271_acx_conn_monit_params(struct wl1271 *wl, bool enable);</div><div class='add'>+int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+				 bool enable_filter);</div><div class='add'>+int wl1271_acx_beacon_filter_table(struct wl1271 *wl,</div><div class='add'>+				   struct wl12xx_vif *wlvif);</div><div class='add'>+int wl1271_acx_conn_monit_params(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+				 bool enable);</div><div class='ctx'> int wl1271_acx_sg_enable(struct wl1271 *wl, bool enable);</div><div class='ctx'> int wl12xx_acx_sg_cfg(struct wl1271 *wl);</div><div class='ctx'> int wl1271_acx_cca_threshold(struct wl1271 *wl);</div><div class='del'>-int wl1271_acx_bcn_dtim_options(struct wl1271 *wl);</div><div class='del'>-int wl1271_acx_aid(struct wl1271 *wl, u16 aid);</div><div class='add'>+int wl1271_acx_bcn_dtim_options(struct wl1271 *wl, struct wl12xx_vif *wlvif);</div><div class='add'>+int wl1271_acx_aid(struct wl1271 *wl, struct wl12xx_vif *wlvif, u16 aid);</div><div class='ctx'> int wl1271_acx_event_mbox_mask(struct wl1271 *wl, u32 event_mask);</div><div class='del'>-int wl1271_acx_set_preamble(struct wl1271 *wl, enum acx_preamble_type preamble);</div><div class='del'>-int wl1271_acx_cts_protect(struct wl1271 *wl,</div><div class='add'>+int wl1271_acx_set_preamble(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			    enum acx_preamble_type preamble);</div><div class='add'>+int wl1271_acx_cts_protect(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='ctx'> 			   enum acx_ctsprotect_type ctsprotect);</div><div class='ctx'> int wl1271_acx_statistics(struct wl1271 *wl, struct acx_statistics *stats);</div><div class='del'>-int wl1271_acx_sta_rate_policies(struct wl1271 *wl);</div><div class='add'>+int wl1271_acx_sta_rate_policies(struct wl1271 *wl, struct wl12xx_vif *wlvif);</div><div class='ctx'> int wl1271_acx_ap_rate_policy(struct wl1271 *wl, struct conf_tx_rate_class *c,</div><div class='ctx'> 		      u8 idx);</div><div class='del'>-int wl1271_acx_ac_cfg(struct wl1271 *wl, u8 ac, u8 cw_min, u16 cw_max,</div><div class='del'>-		      u8 aifsn, u16 txop);</div><div class='del'>-int wl1271_acx_tid_cfg(struct wl1271 *wl, u8 queue_id, u8 channel_type,</div><div class='add'>+int wl1271_acx_ac_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+		      u8 ac, u8 cw_min, u16 cw_max, u8 aifsn, u16 txop);</div><div class='add'>+int wl1271_acx_tid_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+		       u8 queue_id, u8 channel_type,</div><div class='ctx'> 		       u8 tsid, u8 ps_scheme, u8 ack_policy,</div><div class='ctx'> 		       u32 apsd_conf0, u32 apsd_conf1);</div><div class='ctx'> int wl1271_acx_frag_threshold(struct wl1271 *wl, u32 frag_threshold);</div><div class='hunk'>@@ -1276,26 +1273,34 @@ int wl1271_acx_init_mem_config(struct wl1271 *wl);</div><div class='ctx'> int wl1271_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap);</div><div class='ctx'> int wl1271_acx_init_rx_interrupt(struct wl1271 *wl);</div><div class='ctx'> int wl1271_acx_smart_reflex(struct wl1271 *wl);</div><div class='del'>-int wl1271_acx_bet_enable(struct wl1271 *wl, bool enable);</div><div class='del'>-int wl1271_acx_arp_ip_filter(struct wl1271 *wl, u8 enable, __be32 address);</div><div class='add'>+int wl1271_acx_bet_enable(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			  bool enable);</div><div class='add'>+int wl1271_acx_arp_ip_filter(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			     u8 enable, __be32 address);</div><div class='ctx'> int wl1271_acx_pm_config(struct wl1271 *wl);</div><div class='del'>-int wl1271_acx_keep_alive_mode(struct wl1271 *wl, bool enable);</div><div class='del'>-int wl1271_acx_keep_alive_config(struct wl1271 *wl, u8 index, u8 tpl_valid);</div><div class='del'>-int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, bool enable,</div><div class='del'>-				s16 thold, u8 hyst);</div><div class='del'>-int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl);</div><div class='add'>+int wl1271_acx_keep_alive_mode(struct wl1271 *wl, struct wl12xx_vif *vif,</div><div class='add'>+			       bool enable);</div><div class='add'>+int wl1271_acx_keep_alive_config(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+				 u8 index, u8 tpl_valid);</div><div class='add'>+int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+				bool enable, s16 thold, u8 hyst);</div><div class='add'>+int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl,</div><div class='add'>+				    struct wl12xx_vif *wlvif);</div><div class='ctx'> int wl1271_acx_set_ht_capabilities(struct wl1271 *wl,</div><div class='ctx'> 				    struct ieee80211_sta_ht_cap *ht_cap,</div><div class='ctx'> 				    bool allow_ht_operation, u8 hlid);</div><div class='ctx'> int wl1271_acx_set_ht_information(struct wl1271 *wl,</div><div class='add'>+				   struct wl12xx_vif *wlvif,</div><div class='ctx'> 				   u16 ht_operation_mode);</div><div class='del'>-int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl);</div><div class='add'>+int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl,</div><div class='add'>+				       struct wl12xx_vif *wlvif);</div><div class='ctx'> int wl12xx_acx_set_ba_receiver_session(struct wl1271 *wl, u8 tid_index,</div><div class='ctx'> 				       u16 ssn, bool enable, u8 peer_hlid);</div><div class='ctx'> int wl1271_acx_tsf_info(struct wl1271 *wl, u64 *mactime);</div><div class='del'>-int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, bool enable);</div><div class='del'>-int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl);</div><div class='del'>-int wl1271_acx_config_ps(struct wl1271 *wl);</div><div class='add'>+int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			       bool enable);</div><div class='add'>+int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl, struct wl12xx_vif *wlvif);</div><div class='add'>+int wl12xx_acx_config_ps(struct wl1271 *wl, struct wl12xx_vif *wlvif);</div><div class='ctx'> int wl1271_acx_set_inconnection_sta(struct wl1271 *wl, u8 *addr);</div><div class='ctx'> int wl1271_acx_fm_coex(struct wl1271 *wl);</div><div class='ctx'> int wl12xx_acx_set_rate_mgmt_params(struct wl1271 *wl);</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/wl12xx/boot.c<br/>index 681337914976..8f9cf5a816ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/boot.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/boot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/boot.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/boot.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/wl12xx.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "debug.h"</div><div class='ctx'> #include "acx.h"</div><div class='ctx'> #include "reg.h"</div><div class='ctx'> #include "boot.h"</div><div class='hunk'>@@ -347,6 +348,9 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl)</div><div class='ctx'> 		nvs_ptr += 3;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; burst_len; i++) {</div><div class='add'>+			if (nvs_ptr + 3 &gt;= (u8 *) wl-&gt;nvs + nvs_len)</div><div class='add'>+				goto out_badnvs;</div><div class='add'>+</div><div class='ctx'> 			val = (nvs_ptr[0] | (nvs_ptr[1] &lt;&lt; 8)</div><div class='ctx'> 			       | (nvs_ptr[2] &lt;&lt; 16) | (nvs_ptr[3] &lt;&lt; 24));</div><div class='ctx'> </div><div class='hunk'>@@ -358,6 +362,9 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl)</div><div class='ctx'> 			nvs_ptr += 4;</div><div class='ctx'> 			dest_addr += 4;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (nvs_ptr &gt;= (u8 *) wl-&gt;nvs + nvs_len)</div><div class='add'>+			goto out_badnvs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -369,6 +376,10 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl)</div><div class='ctx'> 	 */</div><div class='ctx'> 	nvs_ptr = (u8 *)wl-&gt;nvs +</div><div class='ctx'> 			ALIGN(nvs_ptr - (u8 *)wl-&gt;nvs + 7, 4);</div><div class='add'>+</div><div class='add'>+	if (nvs_ptr &gt;= (u8 *) wl-&gt;nvs + nvs_len)</div><div class='add'>+		goto out_badnvs;</div><div class='add'>+</div><div class='ctx'> 	nvs_len -= nvs_ptr - (u8 *)wl-&gt;nvs;</div><div class='ctx'> </div><div class='ctx'> 	/* Now we must set the partition correctly */</div><div class='hunk'>@@ -384,6 +395,10 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> 	kfree(nvs_aligned);</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+out_badnvs:</div><div class='add'>+	wl1271_error("nvs data is malformed");</div><div class='add'>+	return -EILSEQ;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void wl1271_boot_enable_interrupts(struct wl1271 *wl)</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/wl12xx/cmd.c<br/>index a52299e548fa..25990bd38be6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/cmd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/cmd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/cmd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/cmd.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "wl12xx.h"</div><div class='add'>+#include "debug.h"</div><div class='ctx'> #include "reg.h"</div><div class='ctx'> #include "io.h"</div><div class='ctx'> #include "acx.h"</div><div class='hunk'>@@ -120,6 +121,11 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)</div><div class='ctx'> 	if (!wl-&gt;nvs)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='add'>+	if (gp-&gt;tx_bip_fem_manufacturer &gt;= WL1271_INI_FEM_MODULE_COUNT) {</div><div class='add'>+		wl1271_warning("FEM index from INI out of bounds");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	gen_parms = kzalloc(sizeof(*gen_parms), GFP_KERNEL);</div><div class='ctx'> 	if (!gen_parms)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -143,6 +149,12 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)</div><div class='ctx'> 	gp-&gt;tx_bip_fem_manufacturer =</div><div class='ctx'> 		gen_parms-&gt;general_params.tx_bip_fem_manufacturer;</div><div class='ctx'> </div><div class='add'>+	if (gp-&gt;tx_bip_fem_manufacturer &gt;= WL1271_INI_FEM_MODULE_COUNT) {</div><div class='add'>+		wl1271_warning("FEM index from FW out of bounds");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	wl1271_debug(DEBUG_CMD, "FEM autodetect: %s, manufacturer: %d\n",</div><div class='ctx'> 		     answer ? "auto" : "manual", gp-&gt;tx_bip_fem_manufacturer);</div><div class='ctx'> </div><div class='hunk'>@@ -162,6 +174,11 @@ int wl128x_cmd_general_parms(struct wl1271 *wl)</div><div class='ctx'> 	if (!wl-&gt;nvs)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='add'>+	if (gp-&gt;tx_bip_fem_manufacturer &gt;= WL1271_INI_FEM_MODULE_COUNT) {</div><div class='add'>+		wl1271_warning("FEM index from ini out of bounds");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	gen_parms = kzalloc(sizeof(*gen_parms), GFP_KERNEL);</div><div class='ctx'> 	if (!gen_parms)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -186,6 +203,12 @@ int wl128x_cmd_general_parms(struct wl1271 *wl)</div><div class='ctx'> 	gp-&gt;tx_bip_fem_manufacturer =</div><div class='ctx'> 		gen_parms-&gt;general_params.tx_bip_fem_manufacturer;</div><div class='ctx'> </div><div class='add'>+	if (gp-&gt;tx_bip_fem_manufacturer &gt;= WL1271_INI_FEM_MODULE_COUNT) {</div><div class='add'>+		wl1271_warning("FEM index from FW out of bounds");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	wl1271_debug(DEBUG_CMD, "FEM autodetect: %s, manufacturer: %d\n",</div><div class='ctx'> 		     answer ? "auto" : "manual", gp-&gt;tx_bip_fem_manufacturer);</div><div class='ctx'> </div><div class='hunk'>@@ -358,7 +381,8 @@ static int wl1271_cmd_wait_for_event(struct wl1271 *wl, u32 mask)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 role_type, u8 *role_id)</div><div class='add'>+int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 *addr, u8 role_type,</div><div class='add'>+			   u8 *role_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl12xx_cmd_role_enable *cmd;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -381,7 +405,7 @@ int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 role_type, u8 *role_id)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(cmd-&gt;mac_address, wl-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	memcpy(cmd-&gt;mac_address, addr, ETH_ALEN);</div><div class='ctx'> 	cmd-&gt;role_type = role_type;</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_cmd_send(wl, CMD_ROLE_ENABLE, cmd, sizeof(*cmd), 0);</div><div class='hunk'>@@ -433,37 +457,41 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl12xx_allocate_link(struct wl1271 *wl, u8 *hlid)</div><div class='add'>+int wl12xx_allocate_link(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 *hlid)</div><div class='ctx'> {</div><div class='ctx'> 	u8 link = find_first_zero_bit(wl-&gt;links_map, WL12XX_MAX_LINKS);</div><div class='ctx'> 	if (link &gt;= WL12XX_MAX_LINKS)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	__set_bit(link, wl-&gt;links_map);</div><div class='add'>+	__set_bit(link, wlvif-&gt;links_map);</div><div class='ctx'> 	*hlid = link;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wl12xx_free_link(struct wl1271 *wl, u8 *hlid)</div><div class='add'>+void wl12xx_free_link(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 *hlid)</div><div class='ctx'> {</div><div class='ctx'> 	if (*hlid == WL12XX_INVALID_LINK_ID)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	__clear_bit(*hlid, wl-&gt;links_map);</div><div class='add'>+	__clear_bit(*hlid, wlvif-&gt;links_map);</div><div class='ctx'> 	*hlid = WL12XX_INVALID_LINK_ID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl12xx_get_new_session_id(struct wl1271 *wl)</div><div class='add'>+static int wl12xx_get_new_session_id(struct wl1271 *wl,</div><div class='add'>+				     struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='del'>-	if (wl-&gt;session_counter &gt;= SESSION_COUNTER_MAX)</div><div class='del'>-		wl-&gt;session_counter = 0;</div><div class='add'>+	if (wlvif-&gt;session_counter &gt;= SESSION_COUNTER_MAX)</div><div class='add'>+		wlvif-&gt;session_counter = 0;</div><div class='ctx'> </div><div class='del'>-	wl-&gt;session_counter++;</div><div class='add'>+	wlvif-&gt;session_counter++;</div><div class='ctx'> </div><div class='del'>-	return wl-&gt;session_counter;</div><div class='add'>+	return wlvif-&gt;session_counter;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl12xx_cmd_role_start_dev(struct wl1271 *wl)</div><div class='add'>+static int wl12xx_cmd_role_start_dev(struct wl1271 *wl,</div><div class='add'>+				     struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl12xx_cmd_role_start *cmd;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -474,20 +502,20 @@ int wl12xx_cmd_role_start_dev(struct wl1271 *wl)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wl1271_debug(DEBUG_CMD, "cmd role start dev %d", wl-&gt;dev_role_id);</div><div class='add'>+	wl1271_debug(DEBUG_CMD, "cmd role start dev %d", wlvif-&gt;dev_role_id);</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;role_id = wl-&gt;dev_role_id;</div><div class='del'>-	if (wl-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='add'>+	cmd-&gt;role_id = wlvif-&gt;dev_role_id;</div><div class='add'>+	if (wlvif-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='ctx'> 		cmd-&gt;band = WL12XX_BAND_5GHZ;</div><div class='del'>-	cmd-&gt;channel = wl-&gt;channel;</div><div class='add'>+	cmd-&gt;channel = wlvif-&gt;channel;</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;dev_hlid == WL12XX_INVALID_LINK_ID) {</div><div class='del'>-		ret = wl12xx_allocate_link(wl, &amp;wl-&gt;dev_hlid);</div><div class='add'>+	if (wlvif-&gt;dev_hlid == WL12XX_INVALID_LINK_ID) {</div><div class='add'>+		ret = wl12xx_allocate_link(wl, wlvif, &amp;wlvif-&gt;dev_hlid);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> 	}</div><div class='del'>-	cmd-&gt;device.hlid = wl-&gt;dev_hlid;</div><div class='del'>-	cmd-&gt;device.session = wl-&gt;session_counter;</div><div class='add'>+	cmd-&gt;device.hlid = wlvif-&gt;dev_hlid;</div><div class='add'>+	cmd-&gt;device.session = wlvif-&gt;session_counter;</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_CMD, "role start: roleid=%d, hlid=%d, session=%d",</div><div class='ctx'> 		     cmd-&gt;role_id, cmd-&gt;device.hlid, cmd-&gt;device.session);</div><div class='hunk'>@@ -502,9 +530,7 @@ int wl12xx_cmd_role_start_dev(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> err_hlid:</div><div class='ctx'> 	/* clear links on error */</div><div class='del'>-	__clear_bit(wl-&gt;dev_hlid, wl-&gt;links_map);</div><div class='del'>-	wl-&gt;dev_hlid = WL12XX_INVALID_LINK_ID;</div><div class='del'>-</div><div class='add'>+	wl12xx_free_link(wl, wlvif, &amp;wlvif-&gt;dev_hlid);</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(cmd);</div><div class='hunk'>@@ -513,12 +539,13 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl12xx_cmd_role_stop_dev(struct wl1271 *wl)</div><div class='add'>+static int wl12xx_cmd_role_stop_dev(struct wl1271 *wl,</div><div class='add'>+				    struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl12xx_cmd_role_stop *cmd;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(wl-&gt;dev_hlid == WL12XX_INVALID_LINK_ID))</div><div class='add'>+	if (WARN_ON(wlvif-&gt;dev_hlid == WL12XX_INVALID_LINK_ID))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='hunk'>@@ -529,7 +556,7 @@ int wl12xx_cmd_role_stop_dev(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_CMD, "cmd role stop dev");</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;role_id = wl-&gt;dev_role_id;</div><div class='add'>+	cmd-&gt;role_id = wlvif-&gt;dev_role_id;</div><div class='ctx'> 	cmd-&gt;disc_type = DISCONNECT_IMMEDIATE;</div><div class='ctx'> 	cmd-&gt;reason = cpu_to_le16(WLAN_REASON_UNSPECIFIED);</div><div class='ctx'> </div><div class='hunk'>@@ -545,7 +572,7 @@ int wl12xx_cmd_role_stop_dev(struct wl1271 *wl)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wl12xx_free_link(wl, &amp;wl-&gt;dev_hlid);</div><div class='add'>+	wl12xx_free_link(wl, wlvif, &amp;wlvif-&gt;dev_hlid);</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(cmd);</div><div class='hunk'>@@ -554,8 +581,9 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl12xx_cmd_role_start_sta(struct wl1271 *wl)</div><div class='add'>+int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='ctx'> 	struct wl12xx_cmd_role_start *cmd;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -565,33 +593,33 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wl1271_debug(DEBUG_CMD, "cmd role start sta %d", wl-&gt;role_id);</div><div class='add'>+	wl1271_debug(DEBUG_CMD, "cmd role start sta %d", wlvif-&gt;role_id);</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;role_id = wl-&gt;role_id;</div><div class='del'>-	if (wl-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='add'>+	cmd-&gt;role_id = wlvif-&gt;role_id;</div><div class='add'>+	if (wlvif-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='ctx'> 		cmd-&gt;band = WL12XX_BAND_5GHZ;</div><div class='del'>-	cmd-&gt;channel = wl-&gt;channel;</div><div class='del'>-	cmd-&gt;sta.basic_rate_set = cpu_to_le32(wl-&gt;basic_rate_set);</div><div class='del'>-	cmd-&gt;sta.beacon_interval = cpu_to_le16(wl-&gt;beacon_int);</div><div class='add'>+	cmd-&gt;channel = wlvif-&gt;channel;</div><div class='add'>+	cmd-&gt;sta.basic_rate_set = cpu_to_le32(wlvif-&gt;basic_rate_set);</div><div class='add'>+	cmd-&gt;sta.beacon_interval = cpu_to_le16(wlvif-&gt;beacon_int);</div><div class='ctx'> 	cmd-&gt;sta.ssid_type = WL12XX_SSID_TYPE_ANY;</div><div class='del'>-	cmd-&gt;sta.ssid_len = wl-&gt;ssid_len;</div><div class='del'>-	memcpy(cmd-&gt;sta.ssid, wl-&gt;ssid, wl-&gt;ssid_len);</div><div class='del'>-	memcpy(cmd-&gt;sta.bssid, wl-&gt;bssid, ETH_ALEN);</div><div class='del'>-	cmd-&gt;sta.local_rates = cpu_to_le32(wl-&gt;rate_set);</div><div class='add'>+	cmd-&gt;sta.ssid_len = wlvif-&gt;ssid_len;</div><div class='add'>+	memcpy(cmd-&gt;sta.ssid, wlvif-&gt;ssid, wlvif-&gt;ssid_len);</div><div class='add'>+	memcpy(cmd-&gt;sta.bssid, vif-&gt;bss_conf.bssid, ETH_ALEN);</div><div class='add'>+	cmd-&gt;sta.local_rates = cpu_to_le32(wlvif-&gt;rate_set);</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;sta_hlid == WL12XX_INVALID_LINK_ID) {</div><div class='del'>-		ret = wl12xx_allocate_link(wl, &amp;wl-&gt;sta_hlid);</div><div class='add'>+	if (wlvif-&gt;sta.hlid == WL12XX_INVALID_LINK_ID) {</div><div class='add'>+		ret = wl12xx_allocate_link(wl, wlvif, &amp;wlvif-&gt;sta.hlid);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> 	}</div><div class='del'>-	cmd-&gt;sta.hlid = wl-&gt;sta_hlid;</div><div class='del'>-	cmd-&gt;sta.session = wl12xx_get_new_session_id(wl);</div><div class='del'>-	cmd-&gt;sta.remote_rates = cpu_to_le32(wl-&gt;rate_set);</div><div class='add'>+	cmd-&gt;sta.hlid = wlvif-&gt;sta.hlid;</div><div class='add'>+	cmd-&gt;sta.session = wl12xx_get_new_session_id(wl, wlvif);</div><div class='add'>+	cmd-&gt;sta.remote_rates = cpu_to_le32(wlvif-&gt;rate_set);</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_CMD, "role start: roleid=%d, hlid=%d, session=%d "</div><div class='ctx'> 		     "basic_rate_set: 0x%x, remote_rates: 0x%x",</div><div class='del'>-		     wl-&gt;role_id, cmd-&gt;sta.hlid, cmd-&gt;sta.session,</div><div class='del'>-		     wl-&gt;basic_rate_set, wl-&gt;rate_set);</div><div class='add'>+		     wlvif-&gt;role_id, cmd-&gt;sta.hlid, cmd-&gt;sta.session,</div><div class='add'>+		     wlvif-&gt;basic_rate_set, wlvif-&gt;rate_set);</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_cmd_send(wl, CMD_ROLE_START, cmd, sizeof(*cmd), 0);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -603,7 +631,7 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> err_hlid:</div><div class='ctx'> 	/* clear links on error. */</div><div class='del'>-	wl12xx_free_link(wl, &amp;wl-&gt;sta_hlid);</div><div class='add'>+	wl12xx_free_link(wl, wlvif, &amp;wlvif-&gt;sta.hlid);</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(cmd);</div><div class='hunk'>@@ -613,12 +641,12 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* use this function to stop ibss as well */</div><div class='del'>-int wl12xx_cmd_role_stop_sta(struct wl1271 *wl)</div><div class='add'>+int wl12xx_cmd_role_stop_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl12xx_cmd_role_stop *cmd;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(wl-&gt;sta_hlid == WL12XX_INVALID_LINK_ID))</div><div class='add'>+	if (WARN_ON(wlvif-&gt;sta.hlid == WL12XX_INVALID_LINK_ID))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='hunk'>@@ -627,9 +655,9 @@ int wl12xx_cmd_role_stop_sta(struct wl1271 *wl)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wl1271_debug(DEBUG_CMD, "cmd role stop sta %d", wl-&gt;role_id);</div><div class='add'>+	wl1271_debug(DEBUG_CMD, "cmd role stop sta %d", wlvif-&gt;role_id);</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	cmd-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	cmd-&gt;disc_type = DISCONNECT_IMMEDIATE;</div><div class='ctx'> 	cmd-&gt;reason = cpu_to_le16(WLAN_REASON_UNSPECIFIED);</div><div class='ctx'> </div><div class='hunk'>@@ -639,7 +667,7 @@ int wl12xx_cmd_role_stop_sta(struct wl1271 *wl)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wl12xx_free_link(wl, &amp;wl-&gt;sta_hlid);</div><div class='add'>+	wl12xx_free_link(wl, wlvif, &amp;wlvif-&gt;sta.hlid);</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(cmd);</div><div class='hunk'>@@ -648,16 +676,17 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl12xx_cmd_role_start_ap(struct wl1271 *wl)</div><div class='add'>+int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl12xx_cmd_role_start *cmd;</div><div class='del'>-	struct ieee80211_bss_conf *bss_conf = &amp;wl-&gt;vif-&gt;bss_conf;</div><div class='add'>+	struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf = &amp;vif-&gt;bss_conf;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	wl1271_debug(DEBUG_CMD, "cmd role start ap %d", wl-&gt;role_id);</div><div class='add'>+	wl1271_debug(DEBUG_CMD, "cmd role start ap %d", wlvif-&gt;role_id);</div><div class='ctx'> </div><div class='ctx'> 	/* trying to use hidden SSID with an old hostapd version */</div><div class='del'>-	if (wl-&gt;ssid_len == 0 &amp;&amp; !bss_conf-&gt;hidden_ssid) {</div><div class='add'>+	if (wlvif-&gt;ssid_len == 0 &amp;&amp; !bss_conf-&gt;hidden_ssid) {</div><div class='ctx'> 		wl1271_error("got a null SSID from beacon/bss");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -669,30 +698,30 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = wl12xx_allocate_link(wl, &amp;wl-&gt;ap_global_hlid);</div><div class='add'>+	ret = wl12xx_allocate_link(wl, wlvif, &amp;wlvif-&gt;ap.global_hlid);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='del'>-	ret = wl12xx_allocate_link(wl, &amp;wl-&gt;ap_bcast_hlid);</div><div class='add'>+	ret = wl12xx_allocate_link(wl, wlvif, &amp;wlvif-&gt;ap.bcast_hlid);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_free_global;</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	cmd-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	cmd-&gt;ap.aging_period = cpu_to_le16(wl-&gt;conf.tx.ap_aging_period);</div><div class='ctx'> 	cmd-&gt;ap.bss_index = WL1271_AP_BSS_INDEX;</div><div class='del'>-	cmd-&gt;ap.global_hlid = wl-&gt;ap_global_hlid;</div><div class='del'>-	cmd-&gt;ap.broadcast_hlid = wl-&gt;ap_bcast_hlid;</div><div class='del'>-	cmd-&gt;ap.basic_rate_set = cpu_to_le32(wl-&gt;basic_rate_set);</div><div class='del'>-	cmd-&gt;ap.beacon_interval = cpu_to_le16(wl-&gt;beacon_int);</div><div class='add'>+	cmd-&gt;ap.global_hlid = wlvif-&gt;ap.global_hlid;</div><div class='add'>+	cmd-&gt;ap.broadcast_hlid = wlvif-&gt;ap.bcast_hlid;</div><div class='add'>+	cmd-&gt;ap.basic_rate_set = cpu_to_le32(wlvif-&gt;basic_rate_set);</div><div class='add'>+	cmd-&gt;ap.beacon_interval = cpu_to_le16(wlvif-&gt;beacon_int);</div><div class='ctx'> 	cmd-&gt;ap.dtim_interval = bss_conf-&gt;dtim_period;</div><div class='ctx'> 	cmd-&gt;ap.beacon_expiry = WL1271_AP_DEF_BEACON_EXP;</div><div class='del'>-	cmd-&gt;channel = wl-&gt;channel;</div><div class='add'>+	cmd-&gt;channel = wlvif-&gt;channel;</div><div class='ctx'> </div><div class='ctx'> 	if (!bss_conf-&gt;hidden_ssid) {</div><div class='ctx'> 		/* take the SSID from the beacon for backward compatibility */</div><div class='ctx'> 		cmd-&gt;ap.ssid_type = WL12XX_SSID_TYPE_PUBLIC;</div><div class='del'>-		cmd-&gt;ap.ssid_len = wl-&gt;ssid_len;</div><div class='del'>-		memcpy(cmd-&gt;ap.ssid, wl-&gt;ssid, wl-&gt;ssid_len);</div><div class='add'>+		cmd-&gt;ap.ssid_len = wlvif-&gt;ssid_len;</div><div class='add'>+		memcpy(cmd-&gt;ap.ssid, wlvif-&gt;ssid, wlvif-&gt;ssid_len);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		cmd-&gt;ap.ssid_type = WL12XX_SSID_TYPE_HIDDEN;</div><div class='ctx'> 		cmd-&gt;ap.ssid_len = bss_conf-&gt;ssid_len;</div><div class='hunk'>@@ -701,7 +730,7 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;ap.local_rates = cpu_to_le32(0xffffffff);</div><div class='ctx'> </div><div class='del'>-	switch (wl-&gt;band) {</div><div class='add'>+	switch (wlvif-&gt;band) {</div><div class='ctx'> 	case IEEE80211_BAND_2GHZ:</div><div class='ctx'> 		cmd-&gt;band = RADIO_BAND_2_4GHZ;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -709,7 +738,7 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl)</div><div class='ctx'> 		cmd-&gt;band = RADIO_BAND_5GHZ;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		wl1271_warning("ap start - unknown band: %d", (int)wl-&gt;band);</div><div class='add'>+		wl1271_warning("ap start - unknown band: %d", (int)wlvif-&gt;band);</div><div class='ctx'> 		cmd-&gt;band = RADIO_BAND_2_4GHZ;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -723,10 +752,10 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl)</div><div class='ctx'> 	goto out_free;</div><div class='ctx'> </div><div class='ctx'> out_free_bcast:</div><div class='del'>-	wl12xx_free_link(wl, &amp;wl-&gt;ap_bcast_hlid);</div><div class='add'>+	wl12xx_free_link(wl, wlvif, &amp;wlvif-&gt;ap.bcast_hlid);</div><div class='ctx'> </div><div class='ctx'> out_free_global:</div><div class='del'>-	wl12xx_free_link(wl, &amp;wl-&gt;ap_global_hlid);</div><div class='add'>+	wl12xx_free_link(wl, wlvif, &amp;wlvif-&gt;ap.global_hlid);</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(cmd);</div><div class='hunk'>@@ -735,7 +764,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl12xx_cmd_role_stop_ap(struct wl1271 *wl)</div><div class='add'>+int wl12xx_cmd_role_stop_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl12xx_cmd_role_stop *cmd;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -746,9 +775,9 @@ int wl12xx_cmd_role_stop_ap(struct wl1271 *wl)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wl1271_debug(DEBUG_CMD, "cmd role stop ap %d", wl-&gt;role_id);</div><div class='add'>+	wl1271_debug(DEBUG_CMD, "cmd role stop ap %d", wlvif-&gt;role_id);</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	cmd-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_cmd_send(wl, CMD_ROLE_STOP, cmd, sizeof(*cmd), 0);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -756,8 +785,8 @@ int wl12xx_cmd_role_stop_ap(struct wl1271 *wl)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wl12xx_free_link(wl, &amp;wl-&gt;ap_bcast_hlid);</div><div class='del'>-	wl12xx_free_link(wl, &amp;wl-&gt;ap_global_hlid);</div><div class='add'>+	wl12xx_free_link(wl, wlvif, &amp;wlvif-&gt;ap.bcast_hlid);</div><div class='add'>+	wl12xx_free_link(wl, wlvif, &amp;wlvif-&gt;ap.global_hlid);</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(cmd);</div><div class='hunk'>@@ -766,10 +795,11 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl12xx_cmd_role_start_ibss(struct wl1271 *wl)</div><div class='add'>+int wl12xx_cmd_role_start_ibss(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='ctx'> 	struct wl12xx_cmd_role_start *cmd;</div><div class='del'>-	struct ieee80211_bss_conf *bss_conf = &amp;wl-&gt;vif-&gt;bss_conf;</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf = &amp;vif-&gt;bss_conf;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='hunk'>@@ -778,35 +808,36 @@ int wl12xx_cmd_role_start_ibss(struct wl1271 *wl)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wl1271_debug(DEBUG_CMD, "cmd role start ibss %d", wl-&gt;role_id);</div><div class='add'>+	wl1271_debug(DEBUG_CMD, "cmd role start ibss %d", wlvif-&gt;role_id);</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;role_id = wl-&gt;role_id;</div><div class='del'>-	if (wl-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='add'>+	cmd-&gt;role_id = wlvif-&gt;role_id;</div><div class='add'>+	if (wlvif-&gt;band == IEEE80211_BAND_5GHZ)</div><div class='ctx'> 		cmd-&gt;band = WL12XX_BAND_5GHZ;</div><div class='del'>-	cmd-&gt;channel = wl-&gt;channel;</div><div class='del'>-	cmd-&gt;ibss.basic_rate_set = cpu_to_le32(wl-&gt;basic_rate_set);</div><div class='del'>-	cmd-&gt;ibss.beacon_interval = cpu_to_le16(wl-&gt;beacon_int);</div><div class='add'>+	cmd-&gt;channel = wlvif-&gt;channel;</div><div class='add'>+	cmd-&gt;ibss.basic_rate_set = cpu_to_le32(wlvif-&gt;basic_rate_set);</div><div class='add'>+	cmd-&gt;ibss.beacon_interval = cpu_to_le16(wlvif-&gt;beacon_int);</div><div class='ctx'> 	cmd-&gt;ibss.dtim_interval = bss_conf-&gt;dtim_period;</div><div class='ctx'> 	cmd-&gt;ibss.ssid_type = WL12XX_SSID_TYPE_ANY;</div><div class='del'>-	cmd-&gt;ibss.ssid_len = wl-&gt;ssid_len;</div><div class='del'>-	memcpy(cmd-&gt;ibss.ssid, wl-&gt;ssid, wl-&gt;ssid_len);</div><div class='del'>-	memcpy(cmd-&gt;ibss.bssid, wl-&gt;bssid, ETH_ALEN);</div><div class='del'>-	cmd-&gt;sta.local_rates = cpu_to_le32(wl-&gt;rate_set);</div><div class='add'>+	cmd-&gt;ibss.ssid_len = wlvif-&gt;ssid_len;</div><div class='add'>+	memcpy(cmd-&gt;ibss.ssid, wlvif-&gt;ssid, wlvif-&gt;ssid_len);</div><div class='add'>+	memcpy(cmd-&gt;ibss.bssid, vif-&gt;bss_conf.bssid, ETH_ALEN);</div><div class='add'>+	cmd-&gt;sta.local_rates = cpu_to_le32(wlvif-&gt;rate_set);</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;sta_hlid == WL12XX_INVALID_LINK_ID) {</div><div class='del'>-		ret = wl12xx_allocate_link(wl, &amp;wl-&gt;sta_hlid);</div><div class='add'>+	if (wlvif-&gt;sta.hlid == WL12XX_INVALID_LINK_ID) {</div><div class='add'>+		ret = wl12xx_allocate_link(wl, wlvif, &amp;wlvif-&gt;sta.hlid);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> 	}</div><div class='del'>-	cmd-&gt;ibss.hlid = wl-&gt;sta_hlid;</div><div class='del'>-	cmd-&gt;ibss.remote_rates = cpu_to_le32(wl-&gt;rate_set);</div><div class='add'>+	cmd-&gt;ibss.hlid = wlvif-&gt;sta.hlid;</div><div class='add'>+	cmd-&gt;ibss.remote_rates = cpu_to_le32(wlvif-&gt;rate_set);</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_CMD, "role start: roleid=%d, hlid=%d, session=%d "</div><div class='ctx'> 		     "basic_rate_set: 0x%x, remote_rates: 0x%x",</div><div class='del'>-		     wl-&gt;role_id, cmd-&gt;sta.hlid, cmd-&gt;sta.session,</div><div class='del'>-		     wl-&gt;basic_rate_set, wl-&gt;rate_set);</div><div class='add'>+		     wlvif-&gt;role_id, cmd-&gt;sta.hlid, cmd-&gt;sta.session,</div><div class='add'>+		     wlvif-&gt;basic_rate_set, wlvif-&gt;rate_set);</div><div class='ctx'> </div><div class='del'>-	wl1271_debug(DEBUG_CMD, "wl-&gt;bssid = %pM", wl-&gt;bssid);</div><div class='add'>+	wl1271_debug(DEBUG_CMD, "vif-&gt;bss_conf.bssid = %pM",</div><div class='add'>+		     vif-&gt;bss_conf.bssid);</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_cmd_send(wl, CMD_ROLE_START, cmd, sizeof(*cmd), 0);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -818,7 +849,7 @@ int wl12xx_cmd_role_start_ibss(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> err_hlid:</div><div class='ctx'> 	/* clear links on error. */</div><div class='del'>-	wl12xx_free_link(wl, &amp;wl-&gt;sta_hlid);</div><div class='add'>+	wl12xx_free_link(wl, wlvif, &amp;wlvif-&gt;sta.hlid);</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(cmd);</div><div class='hunk'>@@ -962,7 +993,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_cmd_ps_mode(struct wl1271 *wl, u8 ps_mode)</div><div class='add'>+int wl1271_cmd_ps_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+		       u8 ps_mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_cmd_ps_params *ps_params = NULL;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -975,7 +1007,7 @@ int wl1271_cmd_ps_mode(struct wl1271 *wl, u8 ps_mode)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ps_params-&gt;role_id = wl-&gt;role_id;</div><div class='add'>+	ps_params-&gt;role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	ps_params-&gt;ps_mode = ps_mode;</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_cmd_send(wl, CMD_SET_PS_MODE, ps_params,</div><div class='hunk'>@@ -1030,7 +1062,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_cmd_build_null_data(struct wl1271 *wl)</div><div class='add'>+int wl12xx_cmd_build_null_data(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='ctx'> 	int size;</div><div class='hunk'>@@ -1038,11 +1070,12 @@ int wl1271_cmd_build_null_data(struct wl1271 *wl)</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;bss_type == BSS_TYPE_IBSS) {</div><div class='add'>+	if (wlvif-&gt;bss_type == BSS_TYPE_IBSS) {</div><div class='ctx'> 		size = sizeof(struct wl12xx_null_data_template);</div><div class='ctx'> 		ptr = NULL;</div><div class='ctx'> 	} else {</div><div class='del'>-		skb = ieee80211_nullfunc_get(wl-&gt;hw, wl-&gt;vif);</div><div class='add'>+		skb = ieee80211_nullfunc_get(wl-&gt;hw,</div><div class='add'>+					     wl12xx_wlvif_to_vif(wlvif));</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		size = skb-&gt;len;</div><div class='hunk'>@@ -1050,7 +1083,7 @@ int wl1271_cmd_build_null_data(struct wl1271 *wl)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_NULL_DATA, ptr, size, 0,</div><div class='del'>-				      wl-&gt;basic_rate);</div><div class='add'>+				      wlvif-&gt;basic_rate);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='hunk'>@@ -1061,19 +1094,21 @@ out:</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_cmd_build_klv_null_data(struct wl1271 *wl)</div><div class='add'>+int wl12xx_cmd_build_klv_null_data(struct wl1271 *wl,</div><div class='add'>+				   struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	skb = ieee80211_nullfunc_get(wl-&gt;hw, wl-&gt;vif);</div><div class='add'>+	skb = ieee80211_nullfunc_get(wl-&gt;hw, vif);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_KLV,</div><div class='ctx'> 				      skb-&gt;data, skb-&gt;len,</div><div class='ctx'> 				      CMD_TEMPL_KLV_IDX_NULL_DATA,</div><div class='del'>-				      wl-&gt;basic_rate);</div><div class='add'>+				      wlvif-&gt;basic_rate);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='hunk'>@@ -1084,32 +1119,35 @@ out:</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_cmd_build_ps_poll(struct wl1271 *wl, u16 aid)</div><div class='add'>+int wl1271_cmd_build_ps_poll(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			     u16 aid)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	skb = ieee80211_pspoll_get(wl-&gt;hw, wl-&gt;vif);</div><div class='add'>+	skb = ieee80211_pspoll_get(wl-&gt;hw, vif);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_PS_POLL, skb-&gt;data,</div><div class='del'>-				      skb-&gt;len, 0, wl-&gt;basic_rate_set);</div><div class='add'>+				      skb-&gt;len, 0, wlvif-&gt;basic_rate_set);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_cmd_build_probe_req(struct wl1271 *wl,</div><div class='add'>+int wl1271_cmd_build_probe_req(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='ctx'> 			       const u8 *ssid, size_t ssid_len,</div><div class='ctx'> 			       const u8 *ie, size_t ie_len, u8 band)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 rate;</div><div class='ctx'> </div><div class='del'>-	skb = ieee80211_probereq_get(wl-&gt;hw, wl-&gt;vif, ssid, ssid_len,</div><div class='add'>+	skb = ieee80211_probereq_get(wl-&gt;hw, vif, ssid, ssid_len,</div><div class='ctx'> 				     ie, ie_len);</div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -1118,7 +1156,7 @@ int wl1271_cmd_build_probe_req(struct wl1271 *wl,</div><div class='ctx'> </div><div class='ctx'> 	wl1271_dump(DEBUG_SCAN, "PROBE REQ: ", skb-&gt;data, skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	rate = wl1271_tx_min_rate_get(wl, wl-&gt;bitrate_masks[band]);</div><div class='add'>+	rate = wl1271_tx_min_rate_get(wl, wlvif-&gt;bitrate_masks[band]);</div><div class='ctx'> 	if (band == IEEE80211_BAND_2GHZ)</div><div class='ctx'> 		ret = wl1271_cmd_template_set(wl, CMD_TEMPL_CFG_PROBE_REQ_2_4,</div><div class='ctx'> 					      skb-&gt;data, skb-&gt;len, 0, rate);</div><div class='hunk'>@@ -1132,20 +1170,22 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *wl1271_cmd_build_ap_probe_req(struct wl1271 *wl,</div><div class='add'>+					      struct wl12xx_vif *wlvif,</div><div class='ctx'> 					      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 rate;</div><div class='ctx'> </div><div class='ctx'> 	if (!skb)</div><div class='del'>-		skb = ieee80211_ap_probereq_get(wl-&gt;hw, wl-&gt;vif);</div><div class='add'>+		skb = ieee80211_ap_probereq_get(wl-&gt;hw, vif);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	wl1271_dump(DEBUG_SCAN, "AP PROBE REQ: ", skb-&gt;data, skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	rate = wl1271_tx_min_rate_get(wl, wl-&gt;bitrate_masks[wl-&gt;band]);</div><div class='del'>-	if (wl-&gt;band == IEEE80211_BAND_2GHZ)</div><div class='add'>+	rate = wl1271_tx_min_rate_get(wl, wlvif-&gt;bitrate_masks[wlvif-&gt;band]);</div><div class='add'>+	if (wlvif-&gt;band == IEEE80211_BAND_2GHZ)</div><div class='ctx'> 		ret = wl1271_cmd_template_set(wl, CMD_TEMPL_CFG_PROBE_REQ_2_4,</div><div class='ctx'> 					      skb-&gt;data, skb-&gt;len, 0, rate);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1159,9 +1199,11 @@ out:</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, __be32 ip_addr)</div><div class='add'>+int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			     __be32 ip_addr)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='ctx'> 	struct wl12xx_arp_rsp_template tmpl;</div><div class='ctx'> 	struct ieee80211_hdr_3addr *hdr;</div><div class='ctx'> 	struct arphdr *arp_hdr;</div><div class='hunk'>@@ -1173,8 +1215,8 @@ int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, __be32 ip_addr)</div><div class='ctx'> 	hdr-&gt;frame_control = cpu_to_le16(IEEE80211_FTYPE_DATA |</div><div class='ctx'> 					 IEEE80211_STYPE_DATA |</div><div class='ctx'> 					 IEEE80211_FCTL_TODS);</div><div class='del'>-	memcpy(hdr-&gt;addr1, wl-&gt;vif-&gt;bss_conf.bssid, ETH_ALEN);</div><div class='del'>-	memcpy(hdr-&gt;addr2, wl-&gt;vif-&gt;addr, ETH_ALEN);</div><div class='add'>+	memcpy(hdr-&gt;addr1, vif-&gt;bss_conf.bssid, ETH_ALEN);</div><div class='add'>+	memcpy(hdr-&gt;addr2, vif-&gt;addr, ETH_ALEN);</div><div class='ctx'> 	memset(hdr-&gt;addr3, 0xff, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	/* llc layer */</div><div class='hunk'>@@ -1190,25 +1232,26 @@ int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, __be32 ip_addr)</div><div class='ctx'> 	arp_hdr-&gt;ar_op = cpu_to_be16(ARPOP_REPLY);</div><div class='ctx'> </div><div class='ctx'> 	/* arp payload */</div><div class='del'>-	memcpy(tmpl.sender_hw, wl-&gt;vif-&gt;addr, ETH_ALEN);</div><div class='add'>+	memcpy(tmpl.sender_hw, vif-&gt;addr, ETH_ALEN);</div><div class='ctx'> 	tmpl.sender_ip = ip_addr;</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_ARP_RSP,</div><div class='ctx'> 				      &amp;tmpl, sizeof(tmpl), 0,</div><div class='del'>-				      wl-&gt;basic_rate);</div><div class='add'>+				      wlvif-&gt;basic_rate);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_build_qos_null_data(struct wl1271 *wl)</div><div class='add'>+int wl1271_build_qos_null_data(struct wl1271 *wl, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> 	struct ieee80211_qos_hdr template;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;template, 0, sizeof(template));</div><div class='ctx'> </div><div class='del'>-	memcpy(template.addr1, wl-&gt;bssid, ETH_ALEN);</div><div class='del'>-	memcpy(template.addr2, wl-&gt;mac_addr, ETH_ALEN);</div><div class='del'>-	memcpy(template.addr3, wl-&gt;bssid, ETH_ALEN);</div><div class='add'>+	memcpy(template.addr1, vif-&gt;bss_conf.bssid, ETH_ALEN);</div><div class='add'>+	memcpy(template.addr2, vif-&gt;addr, ETH_ALEN);</div><div class='add'>+	memcpy(template.addr3, vif-&gt;bss_conf.bssid, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	template.frame_control = cpu_to_le16(IEEE80211_FTYPE_DATA |</div><div class='ctx'> 					     IEEE80211_STYPE_QOS_NULLFUNC |</div><div class='hunk'>@@ -1219,7 +1262,7 @@ int wl1271_build_qos_null_data(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> 	return wl1271_cmd_template_set(wl, CMD_TEMPL_QOS_NULL_DATA, &amp;template,</div><div class='ctx'> 				       sizeof(template), 0,</div><div class='del'>-				       wl-&gt;basic_rate);</div><div class='add'>+				       wlvif-&gt;basic_rate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int wl12xx_cmd_set_default_wep_key(struct wl1271 *wl, u8 id, u8 hlid)</div><div class='hunk'>@@ -1253,7 +1296,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_cmd_set_sta_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,</div><div class='add'>+int wl1271_cmd_set_sta_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+		       u16 action, u8 id, u8 key_type,</div><div class='ctx'> 		       u8 key_size, const u8 *key, const u8 *addr,</div><div class='ctx'> 		       u32 tx_seq_32, u16 tx_seq_16)</div><div class='ctx'> {</div><div class='hunk'>@@ -1261,7 +1305,7 @@ int wl1271_cmd_set_sta_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* hlid might have already been deleted */</div><div class='del'>-	if (wl-&gt;sta_hlid == WL12XX_INVALID_LINK_ID)</div><div class='add'>+	if (wlvif-&gt;sta.hlid == WL12XX_INVALID_LINK_ID)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='hunk'>@@ -1270,7 +1314,7 @@ int wl1271_cmd_set_sta_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;hlid = wl-&gt;sta_hlid;</div><div class='add'>+	cmd-&gt;hlid = wlvif-&gt;sta.hlid;</div><div class='ctx'> </div><div class='ctx'> 	if (key_type == KEY_WEP)</div><div class='ctx'> 		cmd-&gt;lid_key_type = WEP_DEFAULT_LID_TYPE;</div><div class='hunk'>@@ -1321,9 +1365,10 @@ out:</div><div class='ctx'>  * TODO: merge with sta/ibss into 1 set_key function.</div><div class='ctx'>  * note there are slight diffs</div><div class='ctx'>  */</div><div class='del'>-int wl1271_cmd_set_ap_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,</div><div class='del'>-			u8 key_size, const u8 *key, u8 hlid, u32 tx_seq_32,</div><div class='del'>-			u16 tx_seq_16)</div><div class='add'>+int wl1271_cmd_set_ap_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			  u16 action, u8 id, u8 key_type,</div><div class='add'>+			  u8 key_size, const u8 *key, u8 hlid, u32 tx_seq_32,</div><div class='add'>+			  u16 tx_seq_16)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_cmd_set_keys *cmd;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -1333,7 +1378,7 @@ int wl1271_cmd_set_ap_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,</div><div class='ctx'> 	if (!cmd)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (hlid == wl-&gt;ap_bcast_hlid) {</div><div class='add'>+	if (hlid == wlvif-&gt;ap.bcast_hlid) {</div><div class='ctx'> 		if (key_type == KEY_WEP)</div><div class='ctx'> 			lid_type = WEP_DEFAULT_LID_TYPE;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1411,7 +1456,8 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl12xx_cmd_add_peer(struct wl1271 *wl, struct ieee80211_sta *sta, u8 hlid)</div><div class='add'>+int wl12xx_cmd_add_peer(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			struct ieee80211_sta *sta, u8 hlid)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl12xx_cmd_add_peer *cmd;</div><div class='ctx'> 	int i, ret;</div><div class='hunk'>@@ -1438,13 +1484,13 @@ int wl12xx_cmd_add_peer(struct wl1271 *wl, struct ieee80211_sta *sta, u8 hlid)</div><div class='ctx'> 		else</div><div class='ctx'> 			cmd-&gt;psd_type[i] = WL1271_PSD_LEGACY;</div><div class='ctx'> </div><div class='del'>-	sta_rates = sta-&gt;supp_rates[wl-&gt;band];</div><div class='add'>+	sta_rates = sta-&gt;supp_rates[wlvif-&gt;band];</div><div class='ctx'> 	if (sta-&gt;ht_cap.ht_supported)</div><div class='ctx'> 		sta_rates |= sta-&gt;ht_cap.mcs.rx_mask[0] &lt;&lt; HW_HT_RATES_OFFSET;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;supported_rates =</div><div class='ctx'> 		cpu_to_le32(wl1271_tx_enabled_rates_get(wl, sta_rates,</div><div class='del'>-							wl-&gt;band));</div><div class='add'>+							wlvif-&gt;band));</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_CMD, "new peer rates=0x%x queues=0x%x",</div><div class='ctx'> 		     cmd-&gt;supported_rates, sta-&gt;uapsd_queues);</div><div class='hunk'>@@ -1584,12 +1630,13 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl12xx_cmd_roc(struct wl1271 *wl, u8 role_id)</div><div class='add'>+static int wl12xx_cmd_roc(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			  u8 role_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl12xx_cmd_roc *cmd;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	wl1271_debug(DEBUG_CMD, "cmd roc %d (%d)", wl-&gt;channel, role_id);</div><div class='add'>+	wl1271_debug(DEBUG_CMD, "cmd roc %d (%d)", wlvif-&gt;channel, role_id);</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(role_id == WL12XX_INVALID_ROLE_ID))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1601,8 +1648,8 @@ static int wl12xx_cmd_roc(struct wl1271 *wl, u8 role_id)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;role_id = role_id;</div><div class='del'>-	cmd-&gt;channel = wl-&gt;channel;</div><div class='del'>-	switch (wl-&gt;band) {</div><div class='add'>+	cmd-&gt;channel = wlvif-&gt;channel;</div><div class='add'>+	switch (wlvif-&gt;band) {</div><div class='ctx'> 	case IEEE80211_BAND_2GHZ:</div><div class='ctx'> 		cmd-&gt;band = RADIO_BAND_2_4GHZ;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1610,7 +1657,7 @@ static int wl12xx_cmd_roc(struct wl1271 *wl, u8 role_id)</div><div class='ctx'> 		cmd-&gt;band = RADIO_BAND_5GHZ;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		wl1271_error("roc - unknown band: %d", (int)wl-&gt;band);</div><div class='add'>+		wl1271_error("roc - unknown band: %d", (int)wlvif-&gt;band);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1657,14 +1704,14 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl12xx_roc(struct wl1271 *wl, u8 role_id)</div><div class='add'>+int wl12xx_roc(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 role_id)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ON(test_bit(role_id, wl-&gt;roc_map)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = wl12xx_cmd_roc(wl, role_id);</div><div class='add'>+	ret = wl12xx_cmd_roc(wl, wlvif, role_id);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1753,3 +1800,53 @@ out_free:</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* start dev role and roc on its channel */</div><div class='add'>+int wl12xx_start_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!(wlvif-&gt;bss_type == BSS_TYPE_STA_BSS ||</div><div class='add'>+		      wlvif-&gt;bss_type == BSS_TYPE_IBSS)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = wl12xx_cmd_role_start_dev(wl, wlvif);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = wl12xx_roc(wl, wlvif, wlvif-&gt;dev_role_id);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_stop;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_stop:</div><div class='add'>+	wl12xx_cmd_role_stop_dev(wl, wlvif);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* croc dev hlid, and stop the role */</div><div class='add'>+int wl12xx_stop_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!(wlvif-&gt;bss_type == BSS_TYPE_STA_BSS ||</div><div class='add'>+		      wlvif-&gt;bss_type == BSS_TYPE_IBSS)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* flush all pending packets */</div><div class='add'>+	wl1271_tx_work_locked(wl);</div><div class='add'>+</div><div class='add'>+	if (test_bit(wlvif-&gt;dev_role_id, wl-&gt;roc_map)) {</div><div class='add'>+		ret = wl12xx_croc(wl, wlvif-&gt;dev_role_id);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wl12xx_cmd_role_stop_dev(wl, wlvif);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/cmd.h b/drivers/net/wireless/wl12xx/cmd.h<br/>index b7bd42769aa7..3f7d0b93c24d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/cmd.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/cmd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/cmd.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/cmd.h</a></div><div class='hunk'>@@ -36,45 +36,54 @@ int wl128x_cmd_general_parms(struct wl1271 *wl);</div><div class='ctx'> int wl1271_cmd_radio_parms(struct wl1271 *wl);</div><div class='ctx'> int wl128x_cmd_radio_parms(struct wl1271 *wl);</div><div class='ctx'> int wl1271_cmd_ext_radio_parms(struct wl1271 *wl);</div><div class='del'>-int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 role_type, u8 *role_id);</div><div class='add'>+int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 *addr, u8 role_type,</div><div class='add'>+			   u8 *role_id);</div><div class='ctx'> int wl12xx_cmd_role_disable(struct wl1271 *wl, u8 *role_id);</div><div class='del'>-int wl12xx_cmd_role_start_dev(struct wl1271 *wl);</div><div class='del'>-int wl12xx_cmd_role_stop_dev(struct wl1271 *wl);</div><div class='del'>-int wl12xx_cmd_role_start_sta(struct wl1271 *wl);</div><div class='del'>-int wl12xx_cmd_role_stop_sta(struct wl1271 *wl);</div><div class='del'>-int wl12xx_cmd_role_start_ap(struct wl1271 *wl);</div><div class='del'>-int wl12xx_cmd_role_stop_ap(struct wl1271 *wl);</div><div class='del'>-int wl12xx_cmd_role_start_ibss(struct wl1271 *wl);</div><div class='add'>+int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif);</div><div class='add'>+int wl12xx_cmd_role_stop_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif);</div><div class='add'>+int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif);</div><div class='add'>+int wl12xx_cmd_role_stop_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif);</div><div class='add'>+int wl12xx_cmd_role_start_ibss(struct wl1271 *wl, struct wl12xx_vif *wlvif);</div><div class='add'>+int wl12xx_start_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif);</div><div class='add'>+int wl12xx_stop_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif);</div><div class='ctx'> int wl1271_cmd_test(struct wl1271 *wl, void *buf, size_t buf_len, u8 answer);</div><div class='ctx'> int wl1271_cmd_interrogate(struct wl1271 *wl, u16 id, void *buf, size_t len);</div><div class='ctx'> int wl1271_cmd_configure(struct wl1271 *wl, u16 id, void *buf, size_t len);</div><div class='ctx'> int wl1271_cmd_data_path(struct wl1271 *wl, bool enable);</div><div class='del'>-int wl1271_cmd_ps_mode(struct wl1271 *wl, u8 ps_mode);</div><div class='add'>+int wl1271_cmd_ps_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+		       u8 ps_mode);</div><div class='ctx'> int wl1271_cmd_read_memory(struct wl1271 *wl, u32 addr, void *answer,</div><div class='ctx'> 			   size_t len);</div><div class='ctx'> int wl1271_cmd_template_set(struct wl1271 *wl, u16 template_id,</div><div class='ctx'> 			    void *buf, size_t buf_len, int index, u32 rates);</div><div class='del'>-int wl1271_cmd_build_null_data(struct wl1271 *wl);</div><div class='del'>-int wl1271_cmd_build_ps_poll(struct wl1271 *wl, u16 aid);</div><div class='del'>-int wl1271_cmd_build_probe_req(struct wl1271 *wl,</div><div class='add'>+int wl12xx_cmd_build_null_data(struct wl1271 *wl, struct wl12xx_vif *wlvif);</div><div class='add'>+int wl1271_cmd_build_ps_poll(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			     u16 aid);</div><div class='add'>+int wl1271_cmd_build_probe_req(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='ctx'> 			       const u8 *ssid, size_t ssid_len,</div><div class='ctx'> 			       const u8 *ie, size_t ie_len, u8 band);</div><div class='ctx'> struct sk_buff *wl1271_cmd_build_ap_probe_req(struct wl1271 *wl,</div><div class='add'>+					      struct wl12xx_vif *wlvif,</div><div class='ctx'> 					      struct sk_buff *skb);</div><div class='del'>-int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, __be32 ip_addr);</div><div class='del'>-int wl1271_build_qos_null_data(struct wl1271 *wl);</div><div class='del'>-int wl1271_cmd_build_klv_null_data(struct wl1271 *wl);</div><div class='add'>+int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			     __be32 ip_addr);</div><div class='add'>+int wl1271_build_qos_null_data(struct wl1271 *wl, struct ieee80211_vif *vif);</div><div class='add'>+int wl12xx_cmd_build_klv_null_data(struct wl1271 *wl,</div><div class='add'>+				   struct wl12xx_vif *wlvif);</div><div class='ctx'> int wl12xx_cmd_set_default_wep_key(struct wl1271 *wl, u8 id, u8 hlid);</div><div class='del'>-int wl1271_cmd_set_sta_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,</div><div class='add'>+int wl1271_cmd_set_sta_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			   u16 action, u8 id, u8 key_type,</div><div class='ctx'> 			   u8 key_size, const u8 *key, const u8 *addr,</div><div class='ctx'> 			   u32 tx_seq_32, u16 tx_seq_16);</div><div class='del'>-int wl1271_cmd_set_ap_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,</div><div class='add'>+int wl1271_cmd_set_ap_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			  u16 action, u8 id, u8 key_type,</div><div class='ctx'> 			  u8 key_size, const u8 *key, u8 hlid, u32 tx_seq_32,</div><div class='ctx'> 			  u16 tx_seq_16);</div><div class='ctx'> int wl12xx_cmd_set_peer_state(struct wl1271 *wl, u8 hlid);</div><div class='del'>-int wl12xx_roc(struct wl1271 *wl, u8 role_id);</div><div class='add'>+int wl12xx_roc(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 role_id);</div><div class='ctx'> int wl12xx_croc(struct wl1271 *wl, u8 role_id);</div><div class='del'>-int wl12xx_cmd_add_peer(struct wl1271 *wl, struct ieee80211_sta *sta, u8 hlid);</div><div class='add'>+int wl12xx_cmd_add_peer(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			struct ieee80211_sta *sta, u8 hlid);</div><div class='ctx'> int wl12xx_cmd_remove_peer(struct wl1271 *wl, u8 hlid);</div><div class='ctx'> int wl12xx_cmd_config_fwlog(struct wl1271 *wl);</div><div class='ctx'> int wl12xx_cmd_start_fwlog(struct wl1271 *wl);</div><div class='hunk'>@@ -82,6 +91,9 @@ int wl12xx_cmd_stop_fwlog(struct wl1271 *wl);</div><div class='ctx'> int wl12xx_cmd_channel_switch(struct wl1271 *wl,</div><div class='ctx'> 			      struct ieee80211_channel_switch *ch_switch);</div><div class='ctx'> int wl12xx_cmd_stop_channel_switch(struct wl1271 *wl);</div><div class='add'>+int wl12xx_allocate_link(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			 u8 *hlid);</div><div class='add'>+void wl12xx_free_link(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 *hlid);</div><div class='ctx'> </div><div class='ctx'> enum wl1271_commands {</div><div class='ctx'> 	CMD_INTERROGATE     = 1,    /*use this to read information elements*/</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/conf.h b/drivers/net/wireless/wl12xx/conf.h<br/>index 04bb8fbf93f9..1bcfb017058d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/conf.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/conf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/conf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/conf.h</a></div><div class='hunk'>@@ -440,6 +440,10 @@ struct conf_rx_settings {</div><div class='ctx'> 	CONF_HW_BIT_RATE_36MBPS | CONF_HW_BIT_RATE_48MBPS |      \</div><div class='ctx'> 	CONF_HW_BIT_RATE_54MBPS)</div><div class='ctx'> </div><div class='add'>+#define CONF_TX_CCK_RATES  (CONF_HW_BIT_RATE_1MBPS |		\</div><div class='add'>+	CONF_HW_BIT_RATE_2MBPS | CONF_HW_BIT_RATE_5_5MBPS |	\</div><div class='add'>+	CONF_HW_BIT_RATE_11MBPS)</div><div class='add'>+</div><div class='ctx'> #define CONF_TX_OFDM_RATES (CONF_HW_BIT_RATE_6MBPS |             \</div><div class='ctx'> 	CONF_HW_BIT_RATE_12MBPS | CONF_HW_BIT_RATE_24MBPS |      \</div><div class='ctx'> 	CONF_HW_BIT_RATE_36MBPS | CONF_HW_BIT_RATE_48MBPS |      \</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/debug.h b/drivers/net/wireless/wl12xx/debug.h<br/>new file mode 100644<br/>index 000000000000..b85fd8c41e8f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/debug.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/debug.h</a></div><div class='hunk'>@@ -0,0 +1,101 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is part of wl12xx</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments. All rights reserved.</div><div class='add'>+ * Copyright (C) 2008-2009 Nokia Corporation</div><div class='add'>+ *</div><div class='add'>+ * Contact: Luciano Coelho &lt;coelho@ti.com&gt;</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'>+ * version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA</div><div class='add'>+ * 02110-1301 USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DEBUG_H__</div><div class='add'>+#define __DEBUG_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/printk.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRIVER_NAME "wl12xx"</div><div class='add'>+#define DRIVER_PREFIX DRIVER_NAME ": "</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	DEBUG_NONE	= 0,</div><div class='add'>+	DEBUG_IRQ	= BIT(0),</div><div class='add'>+	DEBUG_SPI	= BIT(1),</div><div class='add'>+	DEBUG_BOOT	= BIT(2),</div><div class='add'>+	DEBUG_MAILBOX	= BIT(3),</div><div class='add'>+	DEBUG_TESTMODE	= BIT(4),</div><div class='add'>+	DEBUG_EVENT	= BIT(5),</div><div class='add'>+	DEBUG_TX	= BIT(6),</div><div class='add'>+	DEBUG_RX	= BIT(7),</div><div class='add'>+	DEBUG_SCAN	= BIT(8),</div><div class='add'>+	DEBUG_CRYPT	= BIT(9),</div><div class='add'>+	DEBUG_PSM	= BIT(10),</div><div class='add'>+	DEBUG_MAC80211	= BIT(11),</div><div class='add'>+	DEBUG_CMD	= BIT(12),</div><div class='add'>+	DEBUG_ACX	= BIT(13),</div><div class='add'>+	DEBUG_SDIO	= BIT(14),</div><div class='add'>+	DEBUG_FILTERS   = BIT(15),</div><div class='add'>+	DEBUG_ADHOC     = BIT(16),</div><div class='add'>+	DEBUG_AP	= BIT(17),</div><div class='add'>+	DEBUG_MASTER	= (DEBUG_ADHOC | DEBUG_AP),</div><div class='add'>+	DEBUG_ALL	= ~0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern u32 wl12xx_debug_level;</div><div class='add'>+</div><div class='add'>+#define DEBUG_DUMP_LIMIT 1024</div><div class='add'>+</div><div class='add'>+#define wl1271_error(fmt, arg...) \</div><div class='add'>+	pr_err(DRIVER_PREFIX "ERROR " fmt "\n", ##arg)</div><div class='add'>+</div><div class='add'>+#define wl1271_warning(fmt, arg...) \</div><div class='add'>+	pr_warning(DRIVER_PREFIX "WARNING " fmt "\n", ##arg)</div><div class='add'>+</div><div class='add'>+#define wl1271_notice(fmt, arg...) \</div><div class='add'>+	pr_info(DRIVER_PREFIX fmt "\n", ##arg)</div><div class='add'>+</div><div class='add'>+#define wl1271_info(fmt, arg...) \</div><div class='add'>+	pr_info(DRIVER_PREFIX fmt "\n", ##arg)</div><div class='add'>+</div><div class='add'>+#define wl1271_debug(level, fmt, arg...) \</div><div class='add'>+	do { \</div><div class='add'>+		if (level &amp; wl12xx_debug_level) \</div><div class='add'>+			pr_debug(DRIVER_PREFIX fmt "\n", ##arg); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+/* TODO: use pr_debug_hex_dump when it becomes available */</div><div class='add'>+#define wl1271_dump(level, prefix, buf, len)	\</div><div class='add'>+	do { \</div><div class='add'>+		if (level &amp; wl12xx_debug_level) \</div><div class='add'>+			print_hex_dump(KERN_DEBUG, DRIVER_PREFIX prefix, \</div><div class='add'>+				       DUMP_PREFIX_OFFSET, 16, 1,	\</div><div class='add'>+				       buf,				\</div><div class='add'>+				       min_t(size_t, len, DEBUG_DUMP_LIMIT), \</div><div class='add'>+				       0);				\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define wl1271_dump_ascii(level, prefix, buf, len)	\</div><div class='add'>+	do { \</div><div class='add'>+		if (level &amp; wl12xx_debug_level) \</div><div class='add'>+			print_hex_dump(KERN_DEBUG, DRIVER_PREFIX prefix, \</div><div class='add'>+				       DUMP_PREFIX_OFFSET, 16, 1,	\</div><div class='add'>+				       buf,				\</div><div class='add'>+				       min_t(size_t, len, DEBUG_DUMP_LIMIT), \</div><div class='add'>+				       true);				\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#endif /* __DEBUG_H__ */</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/debugfs.c b/drivers/net/wireless/wl12xx/debugfs.c<br/>index 3999fd528302..15eb3a9c30ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/debugfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/debugfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/debugfs.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "wl12xx.h"</div><div class='add'>+#include "debug.h"</div><div class='ctx'> #include "acx.h"</div><div class='ctx'> #include "ps.h"</div><div class='ctx'> #include "io.h"</div><div class='hunk'>@@ -316,12 +317,19 @@ static ssize_t driver_state_read(struct file *file, char __user *user_buf,</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl = file-&gt;private_data;</div><div class='ctx'> 	int res = 0;</div><div class='del'>-	char buf[1024];</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	char *buf;</div><div class='add'>+</div><div class='add'>+#define DRIVER_STATE_BUF_LEN 1024</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(DRIVER_STATE_BUF_LEN, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_STATE_PRINT(x, fmt)   \</div><div class='del'>-	(res += scnprintf(buf + res, sizeof(buf) - res,\</div><div class='add'>+	(res += scnprintf(buf + res, DRIVER_STATE_BUF_LEN - res,\</div><div class='ctx'> 			  #x " = " fmt "\n", wl-&gt;x))</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_STATE_PRINT_LONG(x) DRIVER_STATE_PRINT(x, "%ld")</div><div class='hunk'>@@ -346,29 +354,14 @@ static ssize_t driver_state_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 	DRIVER_STATE_PRINT_INT(tx_results_count);</div><div class='ctx'> 	DRIVER_STATE_PRINT_LHEX(flags);</div><div class='ctx'> 	DRIVER_STATE_PRINT_INT(tx_blocks_freed);</div><div class='del'>-	DRIVER_STATE_PRINT_INT(tx_security_last_seq_lsb);</div><div class='ctx'> 	DRIVER_STATE_PRINT_INT(rx_counter);</div><div class='del'>-	DRIVER_STATE_PRINT_INT(session_counter);</div><div class='ctx'> 	DRIVER_STATE_PRINT_INT(state);</div><div class='del'>-	DRIVER_STATE_PRINT_INT(bss_type);</div><div class='ctx'> 	DRIVER_STATE_PRINT_INT(channel);</div><div class='del'>-	DRIVER_STATE_PRINT_HEX(rate_set);</div><div class='del'>-	DRIVER_STATE_PRINT_HEX(basic_rate_set);</div><div class='del'>-	DRIVER_STATE_PRINT_HEX(basic_rate);</div><div class='ctx'> 	DRIVER_STATE_PRINT_INT(band);</div><div class='del'>-	DRIVER_STATE_PRINT_INT(beacon_int);</div><div class='del'>-	DRIVER_STATE_PRINT_INT(psm_entry_retry);</div><div class='del'>-	DRIVER_STATE_PRINT_INT(ps_poll_failures);</div><div class='ctx'> 	DRIVER_STATE_PRINT_INT(power_level);</div><div class='del'>-	DRIVER_STATE_PRINT_INT(rssi_thold);</div><div class='del'>-	DRIVER_STATE_PRINT_INT(last_rssi_event);</div><div class='ctx'> 	DRIVER_STATE_PRINT_INT(sg_enabled);</div><div class='ctx'> 	DRIVER_STATE_PRINT_INT(enable_11a);</div><div class='ctx'> 	DRIVER_STATE_PRINT_INT(noise);</div><div class='del'>-	DRIVER_STATE_PRINT_LHEX(ap_hlid_map[0]);</div><div class='del'>-	DRIVER_STATE_PRINT_INT(last_tx_hlid);</div><div class='del'>-	DRIVER_STATE_PRINT_INT(ba_support);</div><div class='del'>-	DRIVER_STATE_PRINT_HEX(ba_rx_bitmap);</div><div class='ctx'> 	DRIVER_STATE_PRINT_HEX(ap_fw_ps_map);</div><div class='ctx'> 	DRIVER_STATE_PRINT_LHEX(ap_ps_map);</div><div class='ctx'> 	DRIVER_STATE_PRINT_HEX(quirks);</div><div class='hunk'>@@ -387,10 +380,13 @@ static ssize_t driver_state_read(struct file *file, char __user *user_buf,</div><div class='ctx'> #undef DRIVER_STATE_PRINT_LHEX</div><div class='ctx'> #undef DRIVER_STATE_PRINT_STR</div><div class='ctx'> #undef DRIVER_STATE_PRINT</div><div class='add'>+#undef DRIVER_STATE_BUF_LEN</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	return simple_read_from_buffer(user_buf, count, ppos, buf, res);</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, res);</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct file_operations driver_state_ops = {</div><div class='hunk'>@@ -399,6 +395,115 @@ static const struct file_operations driver_state_ops = {</div><div class='ctx'> 	.llseek = default_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static ssize_t vifs_state_read(struct file *file, char __user *user_buf,</div><div class='add'>+				 size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct wl1271 *wl = file-&gt;private_data;</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='add'>+	int ret, res = 0;</div><div class='add'>+	const int buf_size = 4096;</div><div class='add'>+	char *buf;</div><div class='add'>+	char tmp_buf[64];</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(buf_size, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wl-&gt;mutex);</div><div class='add'>+</div><div class='add'>+#define VIF_STATE_PRINT(x, fmt)				\</div><div class='add'>+	(res += scnprintf(buf + res, buf_size - res,	\</div><div class='add'>+			  #x " = " fmt "\n", wlvif-&gt;x))</div><div class='add'>+</div><div class='add'>+#define VIF_STATE_PRINT_LONG(x)  VIF_STATE_PRINT(x, "%ld")</div><div class='add'>+#define VIF_STATE_PRINT_INT(x)   VIF_STATE_PRINT(x, "%d")</div><div class='add'>+#define VIF_STATE_PRINT_STR(x)   VIF_STATE_PRINT(x, "%s")</div><div class='add'>+#define VIF_STATE_PRINT_LHEX(x)  VIF_STATE_PRINT(x, "0x%lx")</div><div class='add'>+#define VIF_STATE_PRINT_LLHEX(x) VIF_STATE_PRINT(x, "0x%llx")</div><div class='add'>+#define VIF_STATE_PRINT_HEX(x)   VIF_STATE_PRINT(x, "0x%x")</div><div class='add'>+</div><div class='add'>+#define VIF_STATE_PRINT_NSTR(x, len)				\</div><div class='add'>+	do {							\</div><div class='add'>+		memset(tmp_buf, 0, sizeof(tmp_buf));		\</div><div class='add'>+		memcpy(tmp_buf, wlvif-&gt;x,			\</div><div class='add'>+		       min_t(u8, len, sizeof(tmp_buf) - 1));	\</div><div class='add'>+		res += scnprintf(buf + res, buf_size - res,	\</div><div class='add'>+				 #x " = %s\n", tmp_buf);	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+	wl12xx_for_each_wlvif(wl, wlvif) {</div><div class='add'>+		VIF_STATE_PRINT_INT(role_id);</div><div class='add'>+		VIF_STATE_PRINT_INT(bss_type);</div><div class='add'>+		VIF_STATE_PRINT_LHEX(flags);</div><div class='add'>+		VIF_STATE_PRINT_INT(p2p);</div><div class='add'>+		VIF_STATE_PRINT_INT(dev_role_id);</div><div class='add'>+		VIF_STATE_PRINT_INT(dev_hlid);</div><div class='add'>+</div><div class='add'>+		if (wlvif-&gt;bss_type == BSS_TYPE_STA_BSS ||</div><div class='add'>+		    wlvif-&gt;bss_type == BSS_TYPE_IBSS) {</div><div class='add'>+			VIF_STATE_PRINT_INT(sta.hlid);</div><div class='add'>+			VIF_STATE_PRINT_INT(sta.ba_rx_bitmap);</div><div class='add'>+			VIF_STATE_PRINT_INT(sta.basic_rate_idx);</div><div class='add'>+			VIF_STATE_PRINT_INT(sta.ap_rate_idx);</div><div class='add'>+			VIF_STATE_PRINT_INT(sta.p2p_rate_idx);</div><div class='add'>+		} else {</div><div class='add'>+			VIF_STATE_PRINT_INT(ap.global_hlid);</div><div class='add'>+			VIF_STATE_PRINT_INT(ap.bcast_hlid);</div><div class='add'>+			VIF_STATE_PRINT_LHEX(ap.sta_hlid_map[0]);</div><div class='add'>+			VIF_STATE_PRINT_INT(ap.mgmt_rate_idx);</div><div class='add'>+			VIF_STATE_PRINT_INT(ap.bcast_rate_idx);</div><div class='add'>+			VIF_STATE_PRINT_INT(ap.ucast_rate_idx[0]);</div><div class='add'>+			VIF_STATE_PRINT_INT(ap.ucast_rate_idx[1]);</div><div class='add'>+			VIF_STATE_PRINT_INT(ap.ucast_rate_idx[2]);</div><div class='add'>+			VIF_STATE_PRINT_INT(ap.ucast_rate_idx[3]);</div><div class='add'>+		}</div><div class='add'>+		VIF_STATE_PRINT_INT(last_tx_hlid);</div><div class='add'>+		VIF_STATE_PRINT_LHEX(links_map[0]);</div><div class='add'>+		VIF_STATE_PRINT_NSTR(ssid, wlvif-&gt;ssid_len);</div><div class='add'>+		VIF_STATE_PRINT_INT(band);</div><div class='add'>+		VIF_STATE_PRINT_INT(channel);</div><div class='add'>+		VIF_STATE_PRINT_HEX(bitrate_masks[0]);</div><div class='add'>+		VIF_STATE_PRINT_HEX(bitrate_masks[1]);</div><div class='add'>+		VIF_STATE_PRINT_HEX(basic_rate_set);</div><div class='add'>+		VIF_STATE_PRINT_HEX(basic_rate);</div><div class='add'>+		VIF_STATE_PRINT_HEX(rate_set);</div><div class='add'>+		VIF_STATE_PRINT_INT(beacon_int);</div><div class='add'>+		VIF_STATE_PRINT_INT(default_key);</div><div class='add'>+		VIF_STATE_PRINT_INT(aid);</div><div class='add'>+		VIF_STATE_PRINT_INT(session_counter);</div><div class='add'>+		VIF_STATE_PRINT_INT(ps_poll_failures);</div><div class='add'>+		VIF_STATE_PRINT_INT(psm_entry_retry);</div><div class='add'>+		VIF_STATE_PRINT_INT(power_level);</div><div class='add'>+		VIF_STATE_PRINT_INT(rssi_thold);</div><div class='add'>+		VIF_STATE_PRINT_INT(last_rssi_event);</div><div class='add'>+		VIF_STATE_PRINT_INT(ba_support);</div><div class='add'>+		VIF_STATE_PRINT_INT(ba_allowed);</div><div class='add'>+		VIF_STATE_PRINT_LLHEX(tx_security_seq);</div><div class='add'>+		VIF_STATE_PRINT_INT(tx_security_last_seq_lsb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#undef VIF_STATE_PRINT_INT</div><div class='add'>+#undef VIF_STATE_PRINT_LONG</div><div class='add'>+#undef VIF_STATE_PRINT_HEX</div><div class='add'>+#undef VIF_STATE_PRINT_LHEX</div><div class='add'>+#undef VIF_STATE_PRINT_LLHEX</div><div class='add'>+#undef VIF_STATE_PRINT_STR</div><div class='add'>+#undef VIF_STATE_PRINT_NSTR</div><div class='add'>+#undef VIF_STATE_PRINT</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, res);</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 const struct file_operations vifs_state_ops = {</div><div class='add'>+	.read = vifs_state_read,</div><div class='add'>+	.open = wl1271_open_file_generic,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static ssize_t dtim_interval_read(struct file *file, char __user *user_buf,</div><div class='ctx'> 				  size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='hunk'>@@ -520,6 +625,7 @@ static ssize_t rx_streaming_interval_write(struct file *file,</div><div class='ctx'> 			   size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl = file-&gt;private_data;</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='ctx'> 	unsigned long value;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -543,7 +649,9 @@ static ssize_t rx_streaming_interval_write(struct file *file,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	wl1271_recalc_rx_streaming(wl);</div><div class='add'>+	wl12xx_for_each_wlvif_sta(wl, wlvif) {</div><div class='add'>+		wl1271_recalc_rx_streaming(wl, wlvif);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	wl1271_ps_elp_sleep(wl);</div><div class='ctx'> out:</div><div class='hunk'>@@ -572,6 +680,7 @@ static ssize_t rx_streaming_always_write(struct file *file,</div><div class='ctx'> 			   size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl = file-&gt;private_data;</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='ctx'> 	unsigned long value;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -595,7 +704,9 @@ static ssize_t rx_streaming_always_write(struct file *file,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	wl1271_recalc_rx_streaming(wl);</div><div class='add'>+	wl12xx_for_each_wlvif_sta(wl, wlvif) {</div><div class='add'>+		wl1271_recalc_rx_streaming(wl, wlvif);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	wl1271_ps_elp_sleep(wl);</div><div class='ctx'> out:</div><div class='hunk'>@@ -624,6 +735,7 @@ static ssize_t beacon_filtering_write(struct file *file,</div><div class='ctx'> 				      size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl = file-&gt;private_data;</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='ctx'> 	char buf[10];</div><div class='ctx'> 	size_t len;</div><div class='ctx'> 	unsigned long value;</div><div class='hunk'>@@ -646,7 +758,9 @@ static ssize_t beacon_filtering_write(struct file *file,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_acx_beacon_filter_opt(wl, !!value);</div><div class='add'>+	wl12xx_for_each_wlvif(wl, wlvif) {</div><div class='add'>+		ret = wl1271_acx_beacon_filter_opt(wl, wlvif, !!value);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	wl1271_ps_elp_sleep(wl);</div><div class='ctx'> out:</div><div class='hunk'>@@ -770,6 +884,7 @@ static int wl1271_debugfs_add_files(struct wl1271 *wl,</div><div class='ctx'> 	DEBUGFS_ADD(gpio_power, rootdir);</div><div class='ctx'> 	DEBUGFS_ADD(start_recovery, rootdir);</div><div class='ctx'> 	DEBUGFS_ADD(driver_state, rootdir);</div><div class='add'>+	DEBUGFS_ADD(vifs_state, rootdir);</div><div class='ctx'> 	DEBUGFS_ADD(dtim_interval, rootdir);</div><div class='ctx'> 	DEBUGFS_ADD(beacon_interval, rootdir);</div><div class='ctx'> 	DEBUGFS_ADD(beacon_filtering, rootdir);</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/event.c b/drivers/net/wireless/wl12xx/event.c<br/>index 674ad2a9e409..d3280df68f5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/event.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/event.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/event.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/event.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "wl12xx.h"</div><div class='add'>+#include "debug.h"</div><div class='ctx'> #include "reg.h"</div><div class='ctx'> #include "io.h"</div><div class='ctx'> #include "event.h"</div><div class='hunk'>@@ -31,12 +32,16 @@</div><div class='ctx'> </div><div class='ctx'> void wl1271_pspoll_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='ctx'> 	struct delayed_work *dwork;</div><div class='ctx'> 	struct wl1271 *wl;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dwork = container_of(work, struct delayed_work, work);</div><div class='del'>-	wl = container_of(dwork, struct wl1271, pspoll_work);</div><div class='add'>+	wlvif = container_of(dwork, struct wl12xx_vif, pspoll_work);</div><div class='add'>+	vif = container_of((void *)wlvif, struct ieee80211_vif, drv_priv);</div><div class='add'>+	wl = wlvif-&gt;wl;</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_EVENT, "pspoll work");</div><div class='ctx'> </div><div class='hunk'>@@ -45,10 +50,10 @@ void wl1271_pspoll_work(struct work_struct *work)</div><div class='ctx'> 	if (unlikely(wl-&gt;state == WL1271_STATE_OFF))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (!test_and_clear_bit(WL1271_FLAG_PSPOLL_FAILURE, &amp;wl-&gt;flags))</div><div class='add'>+	if (!test_and_clear_bit(WLVIF_FLAG_PSPOLL_FAILURE, &amp;wlvif-&gt;flags))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(WL1271_FLAG_STA_ASSOCIATED, &amp;wl-&gt;flags))</div><div class='add'>+	if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &amp;wlvif-&gt;flags))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -60,31 +65,33 @@ void wl1271_pspoll_work(struct work_struct *work)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	wl1271_ps_set_mode(wl, STATION_POWER_SAVE_MODE, wl-&gt;basic_rate, true);</div><div class='add'>+	wl1271_ps_set_mode(wl, wlvif, STATION_POWER_SAVE_MODE,</div><div class='add'>+			   wlvif-&gt;basic_rate, true);</div><div class='ctx'> </div><div class='ctx'> 	wl1271_ps_elp_sleep(wl);</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void wl1271_event_pspoll_delivery_fail(struct wl1271 *wl)</div><div class='add'>+static void wl1271_event_pspoll_delivery_fail(struct wl1271 *wl,</div><div class='add'>+					      struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	int delay = wl-&gt;conf.conn.ps_poll_recovery_period;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	wl-&gt;ps_poll_failures++;</div><div class='del'>-	if (wl-&gt;ps_poll_failures == 1)</div><div class='add'>+	wlvif-&gt;ps_poll_failures++;</div><div class='add'>+	if (wlvif-&gt;ps_poll_failures == 1)</div><div class='ctx'> 		wl1271_info("AP with dysfunctional ps-poll, "</div><div class='ctx'> 			    "trying to work around it.");</div><div class='ctx'> </div><div class='ctx'> 	/* force active mode receive data from the AP */</div><div class='del'>-	if (test_bit(WL1271_FLAG_PSM, &amp;wl-&gt;flags)) {</div><div class='del'>-		ret = wl1271_ps_set_mode(wl, STATION_ACTIVE_MODE,</div><div class='del'>-					 wl-&gt;basic_rate, true);</div><div class='add'>+	if (test_bit(WLVIF_FLAG_PSM, &amp;wlvif-&gt;flags)) {</div><div class='add'>+		ret = wl1271_ps_set_mode(wl, wlvif, STATION_ACTIVE_MODE,</div><div class='add'>+					 wlvif-&gt;basic_rate, true);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return;</div><div class='del'>-		set_bit(WL1271_FLAG_PSPOLL_FAILURE, &amp;wl-&gt;flags);</div><div class='del'>-		ieee80211_queue_delayed_work(wl-&gt;hw, &amp;wl-&gt;pspoll_work,</div><div class='add'>+		set_bit(WLVIF_FLAG_PSPOLL_FAILURE, &amp;wlvif-&gt;flags);</div><div class='add'>+		ieee80211_queue_delayed_work(wl-&gt;hw, &amp;wlvif-&gt;pspoll_work,</div><div class='ctx'> 					     msecs_to_jiffies(delay));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -97,6 +104,7 @@ static void wl1271_event_pspoll_delivery_fail(struct wl1271 *wl)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int wl1271_event_ps_report(struct wl1271 *wl,</div><div class='add'>+				  struct wl12xx_vif *wlvif,</div><div class='ctx'> 				  struct event_mailbox *mbox,</div><div class='ctx'> 				  bool *beacon_loss)</div><div class='ctx'> {</div><div class='hunk'>@@ -109,41 +117,37 @@ static int wl1271_event_ps_report(struct wl1271 *wl,</div><div class='ctx'> 	case EVENT_ENTER_POWER_SAVE_FAIL:</div><div class='ctx'> 		wl1271_debug(DEBUG_PSM, "PSM entry failed");</div><div class='ctx'> </div><div class='del'>-		if (!test_bit(WL1271_FLAG_PSM, &amp;wl-&gt;flags)) {</div><div class='add'>+		if (!test_bit(WLVIF_FLAG_PSM, &amp;wlvif-&gt;flags)) {</div><div class='ctx'> 			/* remain in active mode */</div><div class='del'>-			wl-&gt;psm_entry_retry = 0;</div><div class='add'>+			wlvif-&gt;psm_entry_retry = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (wl-&gt;psm_entry_retry &lt; total_retries) {</div><div class='del'>-			wl-&gt;psm_entry_retry++;</div><div class='del'>-			ret = wl1271_ps_set_mode(wl, STATION_POWER_SAVE_MODE,</div><div class='del'>-						 wl-&gt;basic_rate, true);</div><div class='add'>+		if (wlvif-&gt;psm_entry_retry &lt; total_retries) {</div><div class='add'>+			wlvif-&gt;psm_entry_retry++;</div><div class='add'>+			ret = wl1271_ps_set_mode(wl, wlvif,</div><div class='add'>+						 STATION_POWER_SAVE_MODE,</div><div class='add'>+						 wlvif-&gt;basic_rate, true);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			wl1271_info("No ack to nullfunc from AP.");</div><div class='del'>-			wl-&gt;psm_entry_retry = 0;</div><div class='add'>+			wlvif-&gt;psm_entry_retry = 0;</div><div class='ctx'> 			*beacon_loss = true;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case EVENT_ENTER_POWER_SAVE_SUCCESS:</div><div class='del'>-		wl-&gt;psm_entry_retry = 0;</div><div class='del'>-</div><div class='del'>-		/* enable beacon filtering */</div><div class='del'>-		ret = wl1271_acx_beacon_filter_opt(wl, true);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			break;</div><div class='add'>+		wlvif-&gt;psm_entry_retry = 0;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * BET has only a minor effect in 5GHz and masks</div><div class='ctx'> 		 * channel switch IEs, so we only enable BET on 2.4GHz</div><div class='ctx'> 		*/</div><div class='del'>-		if (wl-&gt;band == IEEE80211_BAND_2GHZ)</div><div class='add'>+		if (wlvif-&gt;band == IEEE80211_BAND_2GHZ)</div><div class='ctx'> 			/* enable beacon early termination */</div><div class='del'>-			ret = wl1271_acx_bet_enable(wl, true);</div><div class='add'>+			ret = wl1271_acx_bet_enable(wl, wlvif, true);</div><div class='ctx'> </div><div class='del'>-		if (wl-&gt;ps_compl) {</div><div class='del'>-			complete(wl-&gt;ps_compl);</div><div class='del'>-			wl-&gt;ps_compl = NULL;</div><div class='add'>+		if (wlvif-&gt;ps_compl) {</div><div class='add'>+			complete(wlvif-&gt;ps_compl);</div><div class='add'>+			wlvif-&gt;ps_compl = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -154,39 +158,44 @@ static int wl1271_event_ps_report(struct wl1271 *wl,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void wl1271_event_rssi_trigger(struct wl1271 *wl,</div><div class='add'>+				      struct wl12xx_vif *wlvif,</div><div class='ctx'> 				      struct event_mailbox *mbox)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='ctx'> 	enum nl80211_cqm_rssi_threshold_event event;</div><div class='ctx'> 	s8 metric = mbox-&gt;rssi_snr_trigger_metric[0];</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_EVENT, "RSSI trigger metric: %d", metric);</div><div class='ctx'> </div><div class='del'>-	if (metric &lt;= wl-&gt;rssi_thold)</div><div class='add'>+	if (metric &lt;= wlvif-&gt;rssi_thold)</div><div class='ctx'> 		event = NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW;</div><div class='ctx'> 	else</div><div class='ctx'> 		event = NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH;</div><div class='ctx'> </div><div class='del'>-	if (event != wl-&gt;last_rssi_event)</div><div class='del'>-		ieee80211_cqm_rssi_notify(wl-&gt;vif, event, GFP_KERNEL);</div><div class='del'>-	wl-&gt;last_rssi_event = event;</div><div class='add'>+	if (event != wlvif-&gt;last_rssi_event)</div><div class='add'>+		ieee80211_cqm_rssi_notify(vif, event, GFP_KERNEL);</div><div class='add'>+	wlvif-&gt;last_rssi_event = event;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wl1271_stop_ba_event(struct wl1271 *wl)</div><div class='add'>+static void wl1271_stop_ba_event(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='del'>-	if (wl-&gt;bss_type != BSS_TYPE_AP_BSS) {</div><div class='del'>-		if (!wl-&gt;ba_rx_bitmap)</div><div class='add'>+	struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='add'>+</div><div class='add'>+	if (wlvif-&gt;bss_type != BSS_TYPE_AP_BSS) {</div><div class='add'>+		if (!wlvif-&gt;sta.ba_rx_bitmap)</div><div class='ctx'> 			return;</div><div class='del'>-		ieee80211_stop_rx_ba_session(wl-&gt;vif, wl-&gt;ba_rx_bitmap,</div><div class='del'>-					     wl-&gt;bssid);</div><div class='add'>+		ieee80211_stop_rx_ba_session(vif, wlvif-&gt;sta.ba_rx_bitmap,</div><div class='add'>+					     vif-&gt;bss_conf.bssid);</div><div class='ctx'> 	} else {</div><div class='del'>-		int i;</div><div class='add'>+		u8 hlid;</div><div class='ctx'> 		struct wl1271_link *lnk;</div><div class='del'>-		for (i = WL1271_AP_STA_HLID_START; i &lt; AP_MAX_LINKS; i++) {</div><div class='del'>-			lnk = &amp;wl-&gt;links[i];</div><div class='del'>-			if (!wl1271_is_active_sta(wl, i) || !lnk-&gt;ba_bitmap)</div><div class='add'>+		for_each_set_bit(hlid, wlvif-&gt;ap.sta_hlid_map,</div><div class='add'>+				 WL12XX_MAX_LINKS) {</div><div class='add'>+			lnk = &amp;wl-&gt;links[hlid];</div><div class='add'>+			if (!lnk-&gt;ba_bitmap)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			ieee80211_stop_rx_ba_session(wl-&gt;vif,</div><div class='add'>+			ieee80211_stop_rx_ba_session(vif,</div><div class='ctx'> 						     lnk-&gt;ba_bitmap,</div><div class='ctx'> 						     lnk-&gt;addr);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -196,14 +205,23 @@ static void wl1271_stop_ba_event(struct wl1271 *wl)</div><div class='ctx'> static void wl12xx_event_soft_gemini_sense(struct wl1271 *wl,</div><div class='ctx'> 					       u8 enable)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='add'>+</div><div class='ctx'> 	if (enable) {</div><div class='ctx'> 		/* disable dynamic PS when requested by the firmware */</div><div class='del'>-		ieee80211_disable_dyn_ps(wl-&gt;vif);</div><div class='add'>+		wl12xx_for_each_wlvif_sta(wl, wlvif) {</div><div class='add'>+			vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='add'>+			ieee80211_disable_dyn_ps(vif);</div><div class='add'>+		}</div><div class='ctx'> 		set_bit(WL1271_FLAG_SOFT_GEMINI, &amp;wl-&gt;flags);</div><div class='ctx'> 	} else {</div><div class='del'>-		ieee80211_enable_dyn_ps(wl-&gt;vif);</div><div class='ctx'> 		clear_bit(WL1271_FLAG_SOFT_GEMINI, &amp;wl-&gt;flags);</div><div class='del'>-		wl1271_recalc_rx_streaming(wl);</div><div class='add'>+		wl12xx_for_each_wlvif_sta(wl, wlvif) {</div><div class='add'>+			vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='add'>+			ieee80211_enable_dyn_ps(vif);</div><div class='add'>+			wl1271_recalc_rx_streaming(wl, wlvif);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -217,10 +235,11 @@ static void wl1271_event_mbox_dump(struct event_mailbox *mbox)</div><div class='ctx'> </div><div class='ctx'> static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox)</div><div class='ctx'> {</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 vector;</div><div class='ctx'> 	bool beacon_loss = false;</div><div class='del'>-	bool is_ap = (wl-&gt;bss_type == BSS_TYPE_AP_BSS);</div><div class='ctx'> 	bool disconnect_sta = false;</div><div class='ctx'> 	unsigned long sta_bitmap = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -234,7 +253,7 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox)</div><div class='ctx'> 		wl1271_debug(DEBUG_EVENT, "status: 0x%x",</div><div class='ctx'> 			     mbox-&gt;scheduled_scan_status);</div><div class='ctx'> </div><div class='del'>-		wl1271_scan_stm(wl);</div><div class='add'>+		wl1271_scan_stm(wl, wl-&gt;scan_vif);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vector &amp; PERIODIC_SCAN_REPORT_EVENT_ID) {</div><div class='hunk'>@@ -248,13 +267,12 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox)</div><div class='ctx'> 		wl1271_debug(DEBUG_EVENT, "PERIODIC_SCAN_COMPLETE_EVENT "</div><div class='ctx'> 			     "(status 0x%0x)", mbox-&gt;scheduled_scan_status);</div><div class='ctx'> 		if (wl-&gt;sched_scanning) {</div><div class='del'>-			wl1271_scan_sched_scan_stop(wl);</div><div class='ctx'> 			ieee80211_sched_scan_stopped(wl-&gt;hw);</div><div class='add'>+			wl-&gt;sched_scanning = false;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (vector &amp; SOFT_GEMINI_SENSE_EVENT_ID &amp;&amp;</div><div class='del'>-	    wl-&gt;bss_type == BSS_TYPE_STA_BSS)</div><div class='add'>+	if (vector &amp; SOFT_GEMINI_SENSE_EVENT_ID)</div><div class='ctx'> 		wl12xx_event_soft_gemini_sense(wl,</div><div class='ctx'> 					       mbox-&gt;soft_gemini_sense_info);</div><div class='ctx'> </div><div class='hunk'>@@ -267,40 +285,54 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox)</div><div class='ctx'> 	 * BSS_LOSE_EVENT, beacon loss has to be reported to the stack.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 */</div><div class='del'>-	if ((vector &amp; BSS_LOSE_EVENT_ID) &amp;&amp; !is_ap) {</div><div class='add'>+	if (vector &amp; BSS_LOSE_EVENT_ID) {</div><div class='add'>+		/* TODO: check for multi-role */</div><div class='ctx'> 		wl1271_info("Beacon loss detected.");</div><div class='ctx'> </div><div class='ctx'> 		/* indicate to the stack, that beacons have been lost */</div><div class='ctx'> 		beacon_loss = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((vector &amp; PS_REPORT_EVENT_ID) &amp;&amp; !is_ap) {</div><div class='add'>+	if (vector &amp; PS_REPORT_EVENT_ID) {</div><div class='ctx'> 		wl1271_debug(DEBUG_EVENT, "PS_REPORT_EVENT");</div><div class='del'>-		ret = wl1271_event_ps_report(wl, mbox, &amp;beacon_loss);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='add'>+		wl12xx_for_each_wlvif_sta(wl, wlvif) {</div><div class='add'>+			ret = wl1271_event_ps_report(wl, wlvif,</div><div class='add'>+						     mbox, &amp;beacon_loss);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((vector &amp; PSPOLL_DELIVERY_FAILURE_EVENT_ID) &amp;&amp; !is_ap)</div><div class='del'>-		wl1271_event_pspoll_delivery_fail(wl);</div><div class='add'>+	if (vector &amp; PSPOLL_DELIVERY_FAILURE_EVENT_ID)</div><div class='add'>+		wl12xx_for_each_wlvif_sta(wl, wlvif) {</div><div class='add'>+			wl1271_event_pspoll_delivery_fail(wl, wlvif);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 	if (vector &amp; RSSI_SNR_TRIGGER_0_EVENT_ID) {</div><div class='add'>+		/* TODO: check actual multi-role support */</div><div class='ctx'> 		wl1271_debug(DEBUG_EVENT, "RSSI_SNR_TRIGGER_0_EVENT");</div><div class='del'>-		if (wl-&gt;vif)</div><div class='del'>-			wl1271_event_rssi_trigger(wl, mbox);</div><div class='add'>+		wl12xx_for_each_wlvif_sta(wl, wlvif) {</div><div class='add'>+			wl1271_event_rssi_trigger(wl, wlvif, mbox);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((vector &amp; BA_SESSION_RX_CONSTRAINT_EVENT_ID)) {</div><div class='add'>+	if (vector &amp; BA_SESSION_RX_CONSTRAINT_EVENT_ID) {</div><div class='add'>+		u8 role_id = mbox-&gt;role_id;</div><div class='ctx'> 		wl1271_debug(DEBUG_EVENT, "BA_SESSION_RX_CONSTRAINT_EVENT_ID. "</div><div class='del'>-			     "ba_allowed = 0x%x", mbox-&gt;rx_ba_allowed);</div><div class='add'>+			     "ba_allowed = 0x%x, role_id=%d",</div><div class='add'>+			     mbox-&gt;rx_ba_allowed, role_id);</div><div class='ctx'> </div><div class='del'>-		wl-&gt;ba_allowed = !!mbox-&gt;rx_ba_allowed;</div><div class='add'>+		wl12xx_for_each_wlvif(wl, wlvif) {</div><div class='add'>+			if (role_id != 0xff &amp;&amp; role_id != wlvif-&gt;role_id)</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-		if (wl-&gt;vif &amp;&amp; !wl-&gt;ba_allowed)</div><div class='del'>-			wl1271_stop_ba_event(wl);</div><div class='add'>+			wlvif-&gt;ba_allowed = !!mbox-&gt;rx_ba_allowed;</div><div class='add'>+			if (!wlvif-&gt;ba_allowed)</div><div class='add'>+				wl1271_stop_ba_event(wl, wlvif);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((vector &amp; CHANNEL_SWITCH_COMPLETE_EVENT_ID) &amp;&amp; !is_ap) {</div><div class='add'>+	if (vector &amp; CHANNEL_SWITCH_COMPLETE_EVENT_ID) {</div><div class='ctx'> 		wl1271_debug(DEBUG_EVENT, "CHANNEL_SWITCH_COMPLETE_EVENT_ID. "</div><div class='ctx'> 					  "status = 0x%x",</div><div class='ctx'> 					  mbox-&gt;channel_switch_status);</div><div class='hunk'>@@ -309,50 +341,65 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox)</div><div class='ctx'> 		 * 1) channel switch complete with status=0</div><div class='ctx'> 		 * 2) channel switch failed status=1</div><div class='ctx'> 		 */</div><div class='del'>-		if (test_and_clear_bit(WL1271_FLAG_CS_PROGRESS, &amp;wl-&gt;flags) &amp;&amp;</div><div class='del'>-		    (wl-&gt;vif))</div><div class='del'>-			ieee80211_chswitch_done(wl-&gt;vif,</div><div class='del'>-				mbox-&gt;channel_switch_status ? false : true);</div><div class='add'>+</div><div class='add'>+		/* TODO: configure only the relevant vif */</div><div class='add'>+		wl12xx_for_each_wlvif_sta(wl, wlvif) {</div><div class='add'>+			struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='add'>+			bool success;</div><div class='add'>+</div><div class='add'>+			if (!test_and_clear_bit(WLVIF_FLAG_CS_PROGRESS,</div><div class='add'>+						&amp;wl-&gt;flags))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			success = mbox-&gt;channel_switch_status ? false : true;</div><div class='add'>+			ieee80211_chswitch_done(vif, success);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((vector &amp; DUMMY_PACKET_EVENT_ID)) {</div><div class='ctx'> 		wl1271_debug(DEBUG_EVENT, "DUMMY_PACKET_ID_EVENT_ID");</div><div class='del'>-		if (wl-&gt;vif)</div><div class='del'>-			wl1271_tx_dummy_packet(wl);</div><div class='add'>+		wl1271_tx_dummy_packet(wl);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * "TX retries exceeded" has a different meaning according to mode.</div><div class='ctx'> 	 * In AP mode the offending station is disconnected.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((vector &amp; MAX_TX_RETRY_EVENT_ID) &amp;&amp; is_ap) {</div><div class='add'>+	if (vector &amp; MAX_TX_RETRY_EVENT_ID) {</div><div class='ctx'> 		wl1271_debug(DEBUG_EVENT, "MAX_TX_RETRY_EVENT_ID");</div><div class='ctx'> 		sta_bitmap |= le16_to_cpu(mbox-&gt;sta_tx_retry_exceeded);</div><div class='ctx'> 		disconnect_sta = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((vector &amp; INACTIVE_STA_EVENT_ID) &amp;&amp; is_ap) {</div><div class='add'>+	if (vector &amp; INACTIVE_STA_EVENT_ID) {</div><div class='ctx'> 		wl1271_debug(DEBUG_EVENT, "INACTIVE_STA_EVENT_ID");</div><div class='ctx'> 		sta_bitmap |= le16_to_cpu(mbox-&gt;sta_aging_status);</div><div class='ctx'> 		disconnect_sta = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (is_ap &amp;&amp; disconnect_sta) {</div><div class='add'>+	if (disconnect_sta) {</div><div class='ctx'> 		u32 num_packets = wl-&gt;conf.tx.max_tx_retries;</div><div class='ctx'> 		struct ieee80211_sta *sta;</div><div class='ctx'> 		const u8 *addr;</div><div class='ctx'> 		int h;</div><div class='ctx'> </div><div class='del'>-		for (h = find_first_bit(&amp;sta_bitmap, AP_MAX_LINKS);</div><div class='del'>-		     h &lt; AP_MAX_LINKS;</div><div class='del'>-		     h = find_next_bit(&amp;sta_bitmap, AP_MAX_LINKS, h+1)) {</div><div class='del'>-			if (!wl1271_is_active_sta(wl, h))</div><div class='add'>+		for_each_set_bit(h, &amp;sta_bitmap, WL12XX_MAX_LINKS) {</div><div class='add'>+			bool found = false;</div><div class='add'>+			/* find the ap vif connected to this sta */</div><div class='add'>+			wl12xx_for_each_wlvif_ap(wl, wlvif) {</div><div class='add'>+				if (!test_bit(h, wlvif-&gt;ap.sta_hlid_map))</div><div class='add'>+					continue;</div><div class='add'>+				found = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (!found)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='add'>+			vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='ctx'> 			addr = wl-&gt;links[h].addr;</div><div class='ctx'> </div><div class='ctx'> 			rcu_read_lock();</div><div class='del'>-			sta = ieee80211_find_sta(wl-&gt;vif, addr);</div><div class='add'>+			sta = ieee80211_find_sta(vif, addr);</div><div class='ctx'> 			if (sta) {</div><div class='ctx'> 				wl1271_debug(DEBUG_EVENT, "remove sta %d", h);</div><div class='ctx'> 				ieee80211_report_low_ack(sta, num_packets);</div><div class='hunk'>@@ -361,8 +408,11 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;vif &amp;&amp; beacon_loss)</div><div class='del'>-		ieee80211_connection_loss(wl-&gt;vif);</div><div class='add'>+	if (beacon_loss)</div><div class='add'>+		wl12xx_for_each_wlvif_sta(wl, wlvif) {</div><div class='add'>+			vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='add'>+			ieee80211_connection_loss(vif);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/event.h b/drivers/net/wireless/wl12xx/event.h<br/>index 49c1a0ede5b1..1d878ba47bf4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/event.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/event.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/event.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/event.h</a></div><div class='hunk'>@@ -132,7 +132,4 @@ void wl1271_event_mbox_config(struct wl1271 *wl);</div><div class='ctx'> int wl1271_event_handle(struct wl1271 *wl, u8 mbox);</div><div class='ctx'> void wl1271_pspoll_work(struct work_struct *work);</div><div class='ctx'> </div><div class='del'>-/* Functions from main.c */</div><div class='del'>-bool wl1271_is_active_sta(struct wl1271 *wl, u8 hlid);</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/init.c b/drivers/net/wireless/wl12xx/init.c<br/>index 04db64c94e9a..ca7ee59e4505 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/init.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</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='add'>+#include "debug.h"</div><div class='ctx'> #include "init.h"</div><div class='ctx'> #include "wl12xx_80211.h"</div><div class='ctx'> #include "acx.h"</div><div class='hunk'>@@ -33,7 +34,7 @@</div><div class='ctx'> #include "tx.h"</div><div class='ctx'> #include "io.h"</div><div class='ctx'> </div><div class='del'>-int wl1271_sta_init_templates_config(struct wl1271 *wl)</div><div class='add'>+int wl1271_init_templates_config(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> </div><div class='hunk'>@@ -64,7 +65,7 @@ int wl1271_sta_init_templates_config(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_QOS_NULL_DATA, NULL,</div><div class='ctx'> 				      sizeof</div><div class='del'>-				      (struct wl12xx_qos_null_data_template),</div><div class='add'>+				      (struct ieee80211_qos_hdr),</div><div class='ctx'> 				      0, WL1271_RATE_AUTOMATIC);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -88,10 +89,33 @@ int wl1271_sta_init_templates_config(struct wl1271 *wl)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Put very large empty placeholders for all templates. These</div><div class='add'>+	 * reserve memory for later.</div><div class='add'>+	 */</div><div class='add'>+	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_AP_PROBE_RESPONSE, NULL,</div><div class='add'>+				      WL1271_CMD_TEMPL_MAX_SIZE,</div><div class='add'>+				      0, WL1271_RATE_AUTOMATIC);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_AP_BEACON, NULL,</div><div class='add'>+				      WL1271_CMD_TEMPL_MAX_SIZE,</div><div class='add'>+				      0, WL1271_RATE_AUTOMATIC);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_DEAUTH_AP, NULL,</div><div class='add'>+				      sizeof</div><div class='add'>+				      (struct wl12xx_disconn_template),</div><div class='add'>+				      0, WL1271_RATE_AUTOMATIC);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; CMD_TEMPL_KLV_IDX_MAX; i++) {</div><div class='ctx'> 		ret = wl1271_cmd_template_set(wl, CMD_TEMPL_KLV, NULL,</div><div class='del'>-					      WL1271_CMD_TEMPL_DFLT_SIZE, i,</div><div class='del'>-					      WL1271_RATE_AUTOMATIC);</div><div class='add'>+					      sizeof(struct ieee80211_qos_hdr),</div><div class='add'>+					      i, WL1271_RATE_AUTOMATIC);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -99,7 +123,8 @@ int wl1271_sta_init_templates_config(struct wl1271 *wl)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_ap_init_deauth_template(struct wl1271 *wl)</div><div class='add'>+static int wl1271_ap_init_deauth_template(struct wl1271 *wl,</div><div class='add'>+					  struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl12xx_disconn_template *tmpl;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -114,7 +139,7 @@ static int wl1271_ap_init_deauth_template(struct wl1271 *wl)</div><div class='ctx'> 	tmpl-&gt;header.frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT |</div><div class='ctx'> 					     IEEE80211_STYPE_DEAUTH);</div><div class='ctx'> </div><div class='del'>-	rate = wl1271_tx_min_rate_get(wl, wl-&gt;basic_rate_set);</div><div class='add'>+	rate = wl1271_tx_min_rate_get(wl, wlvif-&gt;basic_rate_set);</div><div class='ctx'> 	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_DEAUTH_AP,</div><div class='ctx'> 				      tmpl, sizeof(*tmpl), 0, rate);</div><div class='ctx'> </div><div class='hunk'>@@ -123,8 +148,10 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_ap_init_null_template(struct wl1271 *wl)</div><div class='add'>+static int wl1271_ap_init_null_template(struct wl1271 *wl,</div><div class='add'>+					struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> 	struct ieee80211_hdr_3addr *nullfunc;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 rate;</div><div class='hunk'>@@ -141,10 +168,10 @@ static int wl1271_ap_init_null_template(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> 	/* nullfunc-&gt;addr1 is filled by FW */</div><div class='ctx'> </div><div class='del'>-	memcpy(nullfunc-&gt;addr2, wl-&gt;mac_addr, ETH_ALEN);</div><div class='del'>-	memcpy(nullfunc-&gt;addr3, wl-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	memcpy(nullfunc-&gt;addr2, vif-&gt;addr, ETH_ALEN);</div><div class='add'>+	memcpy(nullfunc-&gt;addr3, vif-&gt;addr, ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-	rate = wl1271_tx_min_rate_get(wl, wl-&gt;basic_rate_set);</div><div class='add'>+	rate = wl1271_tx_min_rate_get(wl, wlvif-&gt;basic_rate_set);</div><div class='ctx'> 	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_NULL_DATA, nullfunc,</div><div class='ctx'> 				      sizeof(*nullfunc), 0, rate);</div><div class='ctx'> </div><div class='hunk'>@@ -153,8 +180,10 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_ap_init_qos_null_template(struct wl1271 *wl)</div><div class='add'>+static int wl1271_ap_init_qos_null_template(struct wl1271 *wl,</div><div class='add'>+					    struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> 	struct ieee80211_qos_hdr *qosnull;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 rate;</div><div class='hunk'>@@ -171,10 +200,10 @@ static int wl1271_ap_init_qos_null_template(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> 	/* qosnull-&gt;addr1 is filled by FW */</div><div class='ctx'> </div><div class='del'>-	memcpy(qosnull-&gt;addr2, wl-&gt;mac_addr, ETH_ALEN);</div><div class='del'>-	memcpy(qosnull-&gt;addr3, wl-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	memcpy(qosnull-&gt;addr2, vif-&gt;addr, ETH_ALEN);</div><div class='add'>+	memcpy(qosnull-&gt;addr3, vif-&gt;addr, ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-	rate = wl1271_tx_min_rate_get(wl, wl-&gt;basic_rate_set);</div><div class='add'>+	rate = wl1271_tx_min_rate_get(wl, wlvif-&gt;basic_rate_set);</div><div class='ctx'> 	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_QOS_NULL_DATA, qosnull,</div><div class='ctx'> 				      sizeof(*qosnull), 0, rate);</div><div class='ctx'> </div><div class='hunk'>@@ -183,49 +212,6 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_ap_init_templates_config(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Put very large empty placeholders for all templates. These</div><div class='del'>-	 * reserve memory for later.</div><div class='del'>-	 */</div><div class='del'>-	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_AP_PROBE_RESPONSE, NULL,</div><div class='del'>-				      WL1271_CMD_TEMPL_MAX_SIZE,</div><div class='del'>-				      0, WL1271_RATE_AUTOMATIC);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_AP_BEACON, NULL,</div><div class='del'>-				      WL1271_CMD_TEMPL_MAX_SIZE,</div><div class='del'>-				      0, WL1271_RATE_AUTOMATIC);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_DEAUTH_AP, NULL,</div><div class='del'>-				      sizeof</div><div class='del'>-				      (struct wl12xx_disconn_template),</div><div class='del'>-				      0, WL1271_RATE_AUTOMATIC);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_NULL_DATA, NULL,</div><div class='del'>-				      sizeof(struct wl12xx_null_data_template),</div><div class='del'>-				      0, WL1271_RATE_AUTOMATIC);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_QOS_NULL_DATA, NULL,</div><div class='del'>-				      sizeof</div><div class='del'>-				      (struct wl12xx_qos_null_data_template),</div><div class='del'>-				      0, WL1271_RATE_AUTOMATIC);</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='ctx'> static int wl12xx_init_rx_config(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -237,39 +223,37 @@ static int wl12xx_init_rx_config(struct wl1271 *wl)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_init_phy_config(struct wl1271 *wl)</div><div class='add'>+static int wl12xx_init_phy_vif_config(struct wl1271 *wl,</div><div class='add'>+					    struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_acx_pd_threshold(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = wl1271_acx_slot(wl, DEFAULT_SLOT_TIME);</div><div class='add'>+	ret = wl1271_acx_slot(wl, wlvif, DEFAULT_SLOT_TIME);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_acx_service_period_timeout(wl);</div><div class='add'>+	ret = wl1271_acx_service_period_timeout(wl, wlvif);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_acx_rts_threshold(wl, wl-&gt;hw-&gt;wiphy-&gt;rts_threshold);</div><div class='add'>+	ret = wl1271_acx_rts_threshold(wl, wlvif, wl-&gt;hw-&gt;wiphy-&gt;rts_threshold);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_init_beacon_filter(struct wl1271 *wl)</div><div class='add'>+static int wl1271_init_sta_beacon_filter(struct wl1271 *wl,</div><div class='add'>+					 struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* disable beacon filtering at this stage */</div><div class='del'>-	ret = wl1271_acx_beacon_filter_opt(wl, false);</div><div class='add'>+	ret = wl1271_acx_beacon_filter_table(wl, wlvif);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_acx_beacon_filter_table(wl);</div><div class='add'>+	/* enable beacon filtering */</div><div class='add'>+	ret = wl1271_acx_beacon_filter_opt(wl, wlvif, true);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -302,11 +286,12 @@ int wl1271_init_energy_detection(struct wl1271 *wl)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_init_beacon_broadcast(struct wl1271 *wl)</div><div class='add'>+static int wl1271_init_beacon_broadcast(struct wl1271 *wl,</div><div class='add'>+					struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_acx_bcn_dtim_options(wl);</div><div class='add'>+	ret = wl1271_acx_bcn_dtim_options(wl, wlvif);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -327,36 +312,13 @@ static int wl12xx_init_fwlog(struct wl1271 *wl)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_sta_hw_init(struct wl1271 *wl)</div><div class='add'>+/* generic sta initialization (non vif-specific) */</div><div class='add'>+static int wl1271_sta_hw_init(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;chip.id != CHIP_ID_1283_PG20) {</div><div class='del'>-		ret = wl1271_cmd_ext_radio_parms(wl);</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'> 	/* PS config */</div><div class='del'>-	ret = wl1271_acx_config_ps(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = wl1271_sta_init_templates_config(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = wl1271_acx_group_address_tbl(wl, true, NULL, 0);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Initialize connection monitoring thresholds */</div><div class='del'>-	ret = wl1271_acx_conn_monit_params(wl, false);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Beacon filtering */</div><div class='del'>-	ret = wl1271_init_beacon_filter(wl);</div><div class='add'>+	ret = wl12xx_acx_config_ps(wl, wlvif);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -365,103 +327,61 @@ static int wl1271_sta_hw_init(struct wl1271 *wl)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/* Beacons and broadcast settings */</div><div class='del'>-	ret = wl1271_init_beacon_broadcast(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Configure for ELP power saving */</div><div class='del'>-	ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_ELP);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Configure rssi/snr averaging weights */</div><div class='del'>-	ret = wl1271_acx_rssi_snr_avg_weights(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = wl1271_acx_sta_rate_policies(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = wl12xx_acx_mem_cfg(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Configure the FW logger */</div><div class='del'>-	ret = wl12xx_init_fwlog(wl);</div><div class='add'>+	ret = wl1271_acx_sta_rate_policies(wl, wlvif);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_sta_hw_init_post_mem(struct wl1271 *wl)</div><div class='add'>+static int wl1271_sta_hw_init_post_mem(struct wl1271 *wl,</div><div class='add'>+				       struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> </div><div class='ctx'> 	/* disable all keep-alive templates */</div><div class='ctx'> 	for (i = 0; i &lt; CMD_TEMPL_KLV_IDX_MAX; i++) {</div><div class='del'>-		ret = wl1271_acx_keep_alive_config(wl, i,</div><div class='add'>+		ret = wl1271_acx_keep_alive_config(wl, wlvif, i,</div><div class='ctx'> 						   ACX_KEEP_ALIVE_TPL_INVALID);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* disable the keep-alive feature */</div><div class='del'>-	ret = wl1271_acx_keep_alive_mode(wl, false);</div><div class='add'>+	ret = wl1271_acx_keep_alive_mode(wl, wlvif, false);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_ap_hw_init(struct wl1271 *wl)</div><div class='add'>+/* generic ap initialization (non vif-specific) */</div><div class='add'>+static int wl1271_ap_hw_init(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_ap_init_templates_config(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Configure for power always on */</div><div class='del'>-	ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = wl1271_init_ap_rates(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = wl1271_acx_ap_max_tx_retry(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = wl12xx_acx_mem_cfg(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* initialize Tx power */</div><div class='del'>-	ret = wl1271_acx_tx_power(wl, wl-&gt;power_level);</div><div class='add'>+	ret = wl1271_init_ap_rates(wl, wlvif);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_ap_init_templates(struct wl1271 *wl)</div><div class='add'>+int wl1271_ap_init_templates(struct wl1271 *wl, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_ap_init_deauth_template(wl);</div><div class='add'>+	ret = wl1271_ap_init_deauth_template(wl, wlvif);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_ap_init_null_template(wl);</div><div class='add'>+	ret = wl1271_ap_init_null_template(wl, vif);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_ap_init_qos_null_template(wl);</div><div class='add'>+	ret = wl1271_ap_init_qos_null_template(wl, vif);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -469,43 +389,45 @@ int wl1271_ap_init_templates(struct wl1271 *wl)</div><div class='ctx'> 	 * when operating as AP we want to receive external beacons for</div><div class='ctx'> 	 * configuring ERP protection.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = wl1271_acx_beacon_filter_opt(wl, false);</div><div class='add'>+	ret = wl1271_acx_beacon_filter_opt(wl, wlvif, false);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_ap_hw_init_post_mem(struct wl1271 *wl)</div><div class='add'>+static int wl1271_ap_hw_init_post_mem(struct wl1271 *wl,</div><div class='add'>+				      struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	return wl1271_ap_init_templates(wl);</div><div class='add'>+	return wl1271_ap_init_templates(wl, vif);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_init_ap_rates(struct wl1271 *wl)</div><div class='add'>+int wl1271_init_ap_rates(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> 	struct conf_tx_rate_class rc;</div><div class='ctx'> 	u32 supported_rates;</div><div class='ctx'> </div><div class='del'>-	wl1271_debug(DEBUG_AP, "AP basic rate set: 0x%x", wl-&gt;basic_rate_set);</div><div class='add'>+	wl1271_debug(DEBUG_AP, "AP basic rate set: 0x%x",</div><div class='add'>+		     wlvif-&gt;basic_rate_set);</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;basic_rate_set == 0)</div><div class='add'>+	if (wlvif-&gt;basic_rate_set == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	rc.enabled_rates = wl-&gt;basic_rate_set;</div><div class='add'>+	rc.enabled_rates = wlvif-&gt;basic_rate_set;</div><div class='ctx'> 	rc.long_retry_limit = 10;</div><div class='ctx'> 	rc.short_retry_limit = 10;</div><div class='ctx'> 	rc.aflags = 0;</div><div class='del'>-	ret = wl1271_acx_ap_rate_policy(wl, &amp;rc, ACX_TX_AP_MODE_MGMT_RATE);</div><div class='add'>+	ret = wl1271_acx_ap_rate_policy(wl, &amp;rc, wlvif-&gt;ap.mgmt_rate_idx);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* use the min basic rate for AP broadcast/multicast */</div><div class='del'>-	rc.enabled_rates = wl1271_tx_min_rate_get(wl, wl-&gt;basic_rate_set);</div><div class='add'>+	rc.enabled_rates = wl1271_tx_min_rate_get(wl, wlvif-&gt;basic_rate_set);</div><div class='ctx'> 	rc.short_retry_limit = 10;</div><div class='ctx'> 	rc.long_retry_limit = 10;</div><div class='ctx'> 	rc.aflags = 0;</div><div class='del'>-	ret = wl1271_acx_ap_rate_policy(wl, &amp;rc, ACX_TX_AP_MODE_BCST_RATE);</div><div class='add'>+	ret = wl1271_acx_ap_rate_policy(wl, &amp;rc, wlvif-&gt;ap.bcast_rate_idx);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -513,7 +435,7 @@ int wl1271_init_ap_rates(struct wl1271 *wl)</div><div class='ctx'> 	 * If the basic rates contain OFDM rates, use OFDM only</div><div class='ctx'> 	 * rates for unicast TX as well. Else use all supported rates.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((wl-&gt;basic_rate_set &amp; CONF_TX_OFDM_RATES))</div><div class='add'>+	if ((wlvif-&gt;basic_rate_set &amp; CONF_TX_OFDM_RATES))</div><div class='ctx'> 		supported_rates = CONF_TX_OFDM_RATES;</div><div class='ctx'> 	else</div><div class='ctx'> 		supported_rates = CONF_TX_AP_ENABLED_RATES;</div><div class='hunk'>@@ -527,7 +449,8 @@ int wl1271_init_ap_rates(struct wl1271 *wl)</div><div class='ctx'> 		rc.short_retry_limit = 10;</div><div class='ctx'> 		rc.long_retry_limit = 10;</div><div class='ctx'> 		rc.aflags = 0;</div><div class='del'>-		ret = wl1271_acx_ap_rate_policy(wl, &amp;rc, i);</div><div class='add'>+		ret = wl1271_acx_ap_rate_policy(wl, &amp;rc,</div><div class='add'>+						wlvif-&gt;ap.ucast_rate_idx[i]);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -535,24 +458,23 @@ int wl1271_init_ap_rates(struct wl1271 *wl)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_set_ba_policies(struct wl1271 *wl)</div><div class='add'>+static int wl1271_set_ba_policies(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	/* Reset the BA RX indicators */</div><div class='del'>-	wl-&gt;ba_rx_bitmap = 0;</div><div class='del'>-	wl-&gt;ba_allowed = true;</div><div class='add'>+	wlvif-&gt;ba_allowed = true;</div><div class='ctx'> 	wl-&gt;ba_rx_session_count = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* BA is supported in STA/AP modes */</div><div class='del'>-	if (wl-&gt;bss_type != BSS_TYPE_AP_BSS &amp;&amp;</div><div class='del'>-	    wl-&gt;bss_type != BSS_TYPE_STA_BSS) {</div><div class='del'>-		wl-&gt;ba_support = false;</div><div class='add'>+	if (wlvif-&gt;bss_type != BSS_TYPE_AP_BSS &amp;&amp;</div><div class='add'>+	    wlvif-&gt;bss_type != BSS_TYPE_STA_BSS) {</div><div class='add'>+		wlvif-&gt;ba_support = false;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wl-&gt;ba_support = true;</div><div class='add'>+	wlvif-&gt;ba_support = true;</div><div class='ctx'> </div><div class='ctx'> 	/* 802.11n initiator BA session setting */</div><div class='del'>-	return wl12xx_acx_set_ba_initiator_policy(wl);</div><div class='add'>+	return wl12xx_acx_set_ba_initiator_policy(wl, wlvif);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int wl1271_chip_specific_init(struct wl1271 *wl)</div><div class='hunk'>@@ -562,7 +484,7 @@ int wl1271_chip_specific_init(struct wl1271 *wl)</div><div class='ctx'> 	if (wl-&gt;chip.id == CHIP_ID_1283_PG20) {</div><div class='ctx'> 		u32 host_cfg_bitmap = HOST_IF_CFG_RX_FIFO_ENABLE;</div><div class='ctx'> </div><div class='del'>-		if (wl-&gt;quirks &amp; WL12XX_QUIRK_BLOCKSIZE_ALIGNMENT)</div><div class='add'>+		if (!(wl-&gt;quirks &amp; WL12XX_QUIRK_NO_BLOCKSIZE_ALIGNMENT))</div><div class='ctx'> 			/* Enable SDIO padding */</div><div class='ctx'> 			host_cfg_bitmap |= HOST_IF_CFG_TX_PAD_TO_SDIO_BLK;</div><div class='ctx'> </div><div class='hunk'>@@ -575,39 +497,186 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* vif-specifc initialization */</div><div class='add'>+static int wl12xx_init_sta_role(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-int wl1271_hw_init(struct wl1271 *wl)</div><div class='add'>+	ret = wl1271_acx_group_address_tbl(wl, wlvif, true, NULL, 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Initialize connection monitoring thresholds */</div><div class='add'>+	ret = wl1271_acx_conn_monit_params(wl, wlvif, false);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Beacon filtering */</div><div class='add'>+	ret = wl1271_init_sta_beacon_filter(wl, wlvif);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Beacons and broadcast settings */</div><div class='add'>+	ret = wl1271_init_beacon_broadcast(wl, wlvif);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Configure rssi/snr averaging weights */</div><div class='add'>+	ret = wl1271_acx_rssi_snr_avg_weights(wl, wlvif);</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'>+/* vif-specific intialization */</div><div class='add'>+static int wl12xx_init_ap_role(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = wl1271_acx_ap_max_tx_retry(wl, wlvif);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* initialize Tx power */</div><div class='add'>+	ret = wl1271_acx_tx_power(wl, wlvif, wlvif-&gt;power_level);</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'>+int wl1271_init_vif_specific(struct wl1271 *wl, struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> 	struct conf_tx_ac_category *conf_ac;</div><div class='ctx'> 	struct conf_tx_tid *conf_tid;</div><div class='add'>+	bool is_ap = (wlvif-&gt;bss_type == BSS_TYPE_AP_BSS);</div><div class='ctx'> 	int ret, i;</div><div class='del'>-	bool is_ap = (wl-&gt;bss_type == BSS_TYPE_AP_BSS);</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;chip.id == CHIP_ID_1283_PG20)</div><div class='del'>-		ret = wl128x_cmd_general_parms(wl);</div><div class='del'>-	else</div><div class='del'>-		ret = wl1271_cmd_general_parms(wl);</div><div class='add'>+	/*</div><div class='add'>+	 * consider all existing roles before configuring psm.</div><div class='add'>+	 * TODO: reconfigure on interface removal.</div><div class='add'>+	 */</div><div class='add'>+	if (!wl-&gt;ap_count) {</div><div class='add'>+		if (is_ap) {</div><div class='add'>+			/* Configure for power always on */</div><div class='add'>+			ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+		} else if (!wl-&gt;sta_count) {</div><div class='add'>+			/* Configure for ELP power saving */</div><div class='add'>+			ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_ELP);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Mode specific init */</div><div class='add'>+	if (is_ap) {</div><div class='add'>+		ret = wl1271_ap_hw_init(wl, wlvif);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = wl12xx_init_ap_role(wl, wlvif);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	} else {</div><div class='add'>+		ret = wl1271_sta_hw_init(wl, wlvif);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = wl12xx_init_sta_role(wl, wlvif);</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'>+	wl12xx_init_phy_vif_config(wl, wlvif);</div><div class='add'>+</div><div class='add'>+	/* Default TID/AC configuration */</div><div class='add'>+	BUG_ON(wl-&gt;conf.tx.tid_conf_count != wl-&gt;conf.tx.ac_conf_count);</div><div class='add'>+	for (i = 0; i &lt; wl-&gt;conf.tx.tid_conf_count; i++) {</div><div class='add'>+		conf_ac = &amp;wl-&gt;conf.tx.ac_conf[i];</div><div class='add'>+		ret = wl1271_acx_ac_cfg(wl, wlvif, conf_ac-&gt;ac,</div><div class='add'>+					conf_ac-&gt;cw_min, conf_ac-&gt;cw_max,</div><div class='add'>+					conf_ac-&gt;aifsn, conf_ac-&gt;tx_op_limit);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		conf_tid = &amp;wl-&gt;conf.tx.tid_conf[i];</div><div class='add'>+		ret = wl1271_acx_tid_cfg(wl, wlvif,</div><div class='add'>+					 conf_tid-&gt;queue_id,</div><div class='add'>+					 conf_tid-&gt;channel_type,</div><div class='add'>+					 conf_tid-&gt;tsid,</div><div class='add'>+					 conf_tid-&gt;ps_scheme,</div><div class='add'>+					 conf_tid-&gt;ack_policy,</div><div class='add'>+					 conf_tid-&gt;apsd_conf[0],</div><div class='add'>+					 conf_tid-&gt;apsd_conf[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'>+	/* Configure HW encryption */</div><div class='add'>+	ret = wl1271_acx_feature_cfg(wl, wlvif);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;chip.id == CHIP_ID_1283_PG20)</div><div class='del'>-		ret = wl128x_cmd_radio_parms(wl);</div><div class='add'>+	/* Mode specific init - post mem init */</div><div class='add'>+	if (is_ap)</div><div class='add'>+		ret = wl1271_ap_hw_init_post_mem(wl, vif);</div><div class='ctx'> 	else</div><div class='del'>-		ret = wl1271_cmd_radio_parms(wl);</div><div class='add'>+		ret = wl1271_sta_hw_init_post_mem(wl, vif);</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'>+	/* Configure initiator BA sessions policies */</div><div class='add'>+	ret = wl1271_set_ba_policies(wl, wlvif);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int wl1271_hw_init(struct wl1271 *wl)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (wl-&gt;chip.id == CHIP_ID_1283_PG20) {</div><div class='add'>+		ret = wl128x_cmd_general_parms(wl);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		ret = wl128x_cmd_radio_parms(wl);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	} else {</div><div class='add'>+		ret = wl1271_cmd_general_parms(wl);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		ret = wl1271_cmd_radio_parms(wl);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		ret = wl1271_cmd_ext_radio_parms(wl);</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'> 	/* Chip-specific init */</div><div class='ctx'> 	ret = wl1271_chip_specific_init(wl);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/* Mode specific init */</div><div class='del'>-	if (is_ap)</div><div class='del'>-		ret = wl1271_ap_hw_init(wl);</div><div class='del'>-	else</div><div class='del'>-		ret = wl1271_sta_hw_init(wl);</div><div class='add'>+	/* Init templates */</div><div class='add'>+	ret = wl1271_init_templates_config(wl);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = wl12xx_acx_mem_cfg(wl);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='add'>+	/* Configure the FW logger */</div><div class='add'>+	ret = wl12xx_init_fwlog(wl);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -626,11 +695,6 @@ int wl1271_hw_init(struct wl1271 *wl)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_free_memmap;</div><div class='ctx'> </div><div class='del'>-	/* PHY layer config */</div><div class='del'>-	ret = wl1271_init_phy_config(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_free_memmap;</div><div class='del'>-</div><div class='ctx'> 	ret = wl1271_acx_dco_itrim_params(wl);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_free_memmap;</div><div class='hunk'>@@ -655,61 +719,20 @@ int wl1271_hw_init(struct wl1271 *wl)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_free_memmap;</div><div class='ctx'> </div><div class='del'>-	/* Default TID/AC configuration */</div><div class='del'>-	BUG_ON(wl-&gt;conf.tx.tid_conf_count != wl-&gt;conf.tx.ac_conf_count);</div><div class='del'>-	for (i = 0; i &lt; wl-&gt;conf.tx.tid_conf_count; i++) {</div><div class='del'>-		conf_ac = &amp;wl-&gt;conf.tx.ac_conf[i];</div><div class='del'>-		ret = wl1271_acx_ac_cfg(wl, conf_ac-&gt;ac, conf_ac-&gt;cw_min,</div><div class='del'>-					conf_ac-&gt;cw_max, conf_ac-&gt;aifsn,</div><div class='del'>-					conf_ac-&gt;tx_op_limit);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out_free_memmap;</div><div class='del'>-</div><div class='del'>-		conf_tid = &amp;wl-&gt;conf.tx.tid_conf[i];</div><div class='del'>-		ret = wl1271_acx_tid_cfg(wl, conf_tid-&gt;queue_id,</div><div class='del'>-					 conf_tid-&gt;channel_type,</div><div class='del'>-					 conf_tid-&gt;tsid,</div><div class='del'>-					 conf_tid-&gt;ps_scheme,</div><div class='del'>-					 conf_tid-&gt;ack_policy,</div><div class='del'>-					 conf_tid-&gt;apsd_conf[0],</div><div class='del'>-					 conf_tid-&gt;apsd_conf[1]);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out_free_memmap;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Enable data path */</div><div class='ctx'> 	ret = wl1271_cmd_data_path(wl, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_free_memmap;</div><div class='ctx'> </div><div class='del'>-	/* Configure HW encryption */</div><div class='del'>-	ret = wl1271_acx_feature_cfg(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_free_memmap;</div><div class='del'>-</div><div class='ctx'> 	/* configure PM */</div><div class='ctx'> 	ret = wl1271_acx_pm_config(wl);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_free_memmap;</div><div class='ctx'> </div><div class='del'>-	/* Mode specific init - post mem init */</div><div class='del'>-	if (is_ap)</div><div class='del'>-		ret = wl1271_ap_hw_init_post_mem(wl);</div><div class='del'>-	else</div><div class='del'>-		ret = wl1271_sta_hw_init_post_mem(wl);</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_free_memmap;</div><div class='del'>-</div><div class='ctx'> 	ret = wl12xx_acx_set_rate_mgmt_params(wl);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_free_memmap;</div><div class='ctx'> </div><div class='del'>-	/* Configure initiator BA sessions policies */</div><div class='del'>-	ret = wl1271_set_ba_policies(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_free_memmap;</div><div class='del'>-</div><div class='ctx'> 	/* configure hangover */</div><div class='ctx'> 	ret = wl12xx_acx_config_hangover(wl);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/init.h b/drivers/net/wireless/wl12xx/init.h<br/>index 3a3c230fd292..2da0f404ef6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/init.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/init.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/init.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/init.h</a></div><div class='hunk'>@@ -27,13 +27,13 @@</div><div class='ctx'> #include "wl12xx.h"</div><div class='ctx'> </div><div class='ctx'> int wl1271_hw_init_power_auth(struct wl1271 *wl);</div><div class='del'>-int wl1271_sta_init_templates_config(struct wl1271 *wl);</div><div class='del'>-int wl1271_init_phy_config(struct wl1271 *wl);</div><div class='add'>+int wl1271_init_templates_config(struct wl1271 *wl);</div><div class='ctx'> int wl1271_init_pta(struct wl1271 *wl);</div><div class='ctx'> int wl1271_init_energy_detection(struct wl1271 *wl);</div><div class='ctx'> int wl1271_chip_specific_init(struct wl1271 *wl);</div><div class='ctx'> int wl1271_hw_init(struct wl1271 *wl);</div><div class='del'>-int wl1271_init_ap_rates(struct wl1271 *wl);</div><div class='del'>-int wl1271_ap_init_templates(struct wl1271 *wl);</div><div class='add'>+int wl1271_init_vif_specific(struct wl1271 *wl, struct ieee80211_vif *vif);</div><div class='add'>+int wl1271_init_ap_rates(struct wl1271 *wl, struct wl12xx_vif *wlvif);</div><div class='add'>+int wl1271_ap_init_templates(struct wl1271 *wl, struct ieee80211_vif *vif);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/io.c b/drivers/net/wireless/wl12xx/io.c<br/>index c2da66f45046..079ad380e8ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/io.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/io.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/io.c</a></div><div class='hunk'>@@ -24,8 +24,10 @@</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/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "wl12xx.h"</div><div class='add'>+#include "debug.h"</div><div class='ctx'> #include "wl12xx_80211.h"</div><div class='ctx'> #include "io.h"</div><div class='ctx'> #include "tx.h"</div><div class='hunk'>@@ -46,7 +48,7 @@</div><div class='ctx'> bool wl1271_set_block_size(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='ctx'> 	if (wl-&gt;if_ops-&gt;set_block_size) {</div><div class='del'>-		wl-&gt;if_ops-&gt;set_block_size(wl, WL12XX_BUS_BLOCK_SIZE);</div><div class='add'>+		wl-&gt;if_ops-&gt;set_block_size(wl-&gt;dev, WL12XX_BUS_BLOCK_SIZE);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -55,12 +57,12 @@ bool wl1271_set_block_size(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> void wl1271_disable_interrupts(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='del'>-	wl-&gt;if_ops-&gt;disable_irq(wl);</div><div class='add'>+	disable_irq(wl-&gt;irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void wl1271_enable_interrupts(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='del'>-	wl-&gt;if_ops-&gt;enable_irq(wl);</div><div class='add'>+	enable_irq(wl-&gt;irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set the SPI partitions to access the chip addresses</div><div class='hunk'>@@ -128,13 +130,13 @@ EXPORT_SYMBOL_GPL(wl1271_set_partition);</div><div class='ctx'> void wl1271_io_reset(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='ctx'> 	if (wl-&gt;if_ops-&gt;reset)</div><div class='del'>-		wl-&gt;if_ops-&gt;reset(wl);</div><div class='add'>+		wl-&gt;if_ops-&gt;reset(wl-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void wl1271_io_init(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='ctx'> 	if (wl-&gt;if_ops-&gt;init)</div><div class='del'>-		wl-&gt;if_ops-&gt;init(wl);</div><div class='add'>+		wl-&gt;if_ops-&gt;init(wl-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void wl1271_top_reg_write(struct wl1271 *wl, int addr, u16 val)</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/io.h b/drivers/net/wireless/wl12xx/io.h<br/>index e839341dfafe..d398cbcea986 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/io.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/io.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/io.h</a></div><div class='hunk'>@@ -51,23 +51,17 @@ void wl1271_enable_interrupts(struct wl1271 *wl);</div><div class='ctx'> void wl1271_io_reset(struct wl1271 *wl);</div><div class='ctx'> void wl1271_io_init(struct wl1271 *wl);</div><div class='ctx'> </div><div class='del'>-static inline struct device *wl1271_wl_to_dev(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-	return wl-&gt;if_ops-&gt;dev(wl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* Raw target IO, address is not translated */</div><div class='ctx'> static inline void wl1271_raw_write(struct wl1271 *wl, int addr, void *buf,</div><div class='ctx'> 				    size_t len, bool fixed)</div><div class='ctx'> {</div><div class='del'>-	wl-&gt;if_ops-&gt;write(wl, addr, buf, len, fixed);</div><div class='add'>+	wl-&gt;if_ops-&gt;write(wl-&gt;dev, addr, buf, len, fixed);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void wl1271_raw_read(struct wl1271 *wl, int addr, void *buf,</div><div class='ctx'> 				   size_t len, bool fixed)</div><div class='ctx'> {</div><div class='del'>-	wl-&gt;if_ops-&gt;read(wl, addr, buf, len, fixed);</div><div class='add'>+	wl-&gt;if_ops-&gt;read(wl-&gt;dev, addr, buf, len, fixed);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32 wl1271_raw_read32(struct wl1271 *wl, int addr)</div><div class='hunk'>@@ -155,13 +149,13 @@ static inline void wl1271_write32(struct wl1271 *wl, int addr, u32 val)</div><div class='ctx'> </div><div class='ctx'> static inline void wl1271_power_off(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='del'>-	wl-&gt;if_ops-&gt;power(wl, false);</div><div class='add'>+	wl-&gt;if_ops-&gt;power(wl-&gt;dev, false);</div><div class='ctx'> 	clear_bit(WL1271_FLAG_GPIO_POWER, &amp;wl-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int wl1271_power_on(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='del'>-	int ret = wl-&gt;if_ops-&gt;power(wl, true);</div><div class='add'>+	int ret = wl-&gt;if_ops-&gt;power(wl-&gt;dev, true);</div><div class='ctx'> 	if (ret == 0)</div><div class='ctx'> 		set_bit(WL1271_FLAG_GPIO_POWER, &amp;wl-&gt;flags);</div><div class='ctx'> </div><div class='hunk'>@@ -176,15 +170,10 @@ u16 wl1271_top_reg_read(struct wl1271 *wl, int addr);</div><div class='ctx'> int wl1271_set_partition(struct wl1271 *wl,</div><div class='ctx'> 			 struct wl1271_partition_set *p);</div><div class='ctx'> </div><div class='add'>+bool wl1271_set_block_size(struct wl1271 *wl);</div><div class='add'>+</div><div class='ctx'> /* Functions from wl1271_main.c */</div><div class='ctx'> </div><div class='del'>-int wl1271_register_hw(struct wl1271 *wl);</div><div class='del'>-void wl1271_unregister_hw(struct wl1271 *wl);</div><div class='del'>-int wl1271_init_ieee80211(struct wl1271 *wl);</div><div class='del'>-struct ieee80211_hw *wl1271_alloc_hw(void);</div><div class='del'>-int wl1271_free_hw(struct wl1271 *wl);</div><div class='del'>-irqreturn_t wl1271_irq(int irq, void *data);</div><div class='del'>-bool wl1271_set_block_size(struct wl1271 *wl);</div><div class='ctx'> int wl1271_tx_dummy_packet(struct wl1271 *wl);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c<br/>index 884f82b63219..d5f55a149de5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/main.c</a></div><div class='hunk'>@@ -32,8 +32,10 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/wl12xx.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "wl12xx.h"</div><div class='add'>+#include "debug.h"</div><div class='ctx'> #include "wl12xx_80211.h"</div><div class='ctx'> #include "reg.h"</div><div class='ctx'> #include "io.h"</div><div class='hunk'>@@ -377,42 +379,30 @@ static char *fwlog_param;</div><div class='ctx'> static bool bug_on_recovery;</div><div class='ctx'> </div><div class='ctx'> static void __wl1271_op_remove_interface(struct wl1271 *wl,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='ctx'> 					 bool reset_tx_queues);</div><div class='del'>-static void wl1271_free_ap_keys(struct wl1271 *wl);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void wl1271_device_release(struct device *dev)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct platform_device wl1271_device = {</div><div class='del'>-	.name           = "wl1271",</div><div class='del'>-	.id             = -1,</div><div class='del'>-</div><div class='del'>-	/* device model insists to have a release function */</div><div class='del'>-	.dev            = {</div><div class='del'>-		.release = wl1271_device_release,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='add'>+static void wl1271_op_stop(struct ieee80211_hw *hw);</div><div class='add'>+static void wl1271_free_ap_keys(struct wl1271 *wl, struct wl12xx_vif *wlvif);</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(wl_list_mutex);</div><div class='ctx'> static LIST_HEAD(wl_list);</div><div class='ctx'> </div><div class='del'>-static int wl1271_check_operstate(struct wl1271 *wl, unsigned char operstate)</div><div class='add'>+static int wl1271_check_operstate(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+				  unsigned char operstate)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+</div><div class='ctx'> 	if (operstate != IF_OPER_UP)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (test_and_set_bit(WL1271_FLAG_STA_STATE_SENT, &amp;wl-&gt;flags))</div><div class='add'>+	if (test_and_set_bit(WLVIF_FLAG_STA_STATE_SENT, &amp;wlvif-&gt;flags))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ret = wl12xx_cmd_set_peer_state(wl, wl-&gt;sta_hlid);</div><div class='add'>+	ret = wl12xx_cmd_set_peer_state(wl, wlvif-&gt;sta.hlid);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	wl12xx_croc(wl, wl-&gt;role_id);</div><div class='add'>+	wl12xx_croc(wl, wlvif-&gt;role_id);</div><div class='ctx'> </div><div class='ctx'> 	wl1271_info("Association completed.");</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -426,6 +416,7 @@ static int wl1271_dev_notify(struct notifier_block *me, unsigned long what,</div><div class='ctx'> 	struct ieee80211_hw *hw;</div><div class='ctx'> 	struct wl1271 *wl;</div><div class='ctx'> 	struct wl1271 *wl_temp;</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Check that this notification is for us. */</div><div class='hunk'>@@ -459,17 +450,28 @@ static int wl1271_dev_notify(struct notifier_block *me, unsigned long what,</div><div class='ctx'> 	if (wl-&gt;state == WL1271_STATE_OFF)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(WL1271_FLAG_STA_ASSOCIATED, &amp;wl-&gt;flags))</div><div class='add'>+	if (dev-&gt;operstate != IF_OPER_UP)</div><div class='ctx'> 		goto out;</div><div class='add'>+	/*</div><div class='add'>+	 * The correct behavior should be just getting the appropriate wlvif</div><div class='add'>+	 * from the given dev, but currently we don't have a mac80211</div><div class='add'>+	 * interface for it.</div><div class='add'>+	 */</div><div class='add'>+	wl12xx_for_each_wlvif_sta(wl, wlvif) {</div><div class='add'>+		struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_ps_elp_wakeup(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &amp;wlvif-&gt;flags))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	wl1271_check_operstate(wl, dev-&gt;operstate);</div><div class='add'>+		ret = wl1271_ps_elp_wakeup(wl);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out;</div><div class='ctx'> </div><div class='del'>-	wl1271_ps_elp_sleep(wl);</div><div class='add'>+		wl1271_check_operstate(wl, wlvif,</div><div class='add'>+				       ieee80211_get_operstate(vif));</div><div class='ctx'> </div><div class='add'>+		wl1271_ps_elp_sleep(wl);</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -498,19 +500,20 @@ static int wl1271_reg_notify(struct wiphy *wiphy,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_set_rx_streaming(struct wl1271 *wl, bool enable)</div><div class='add'>+static int wl1271_set_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+				   bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* we should hold wl-&gt;mutex */</div><div class='del'>-	ret = wl1271_acx_ps_rx_streaming(wl, enable);</div><div class='add'>+	ret = wl1271_acx_ps_rx_streaming(wl, wlvif, enable);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (enable)</div><div class='del'>-		set_bit(WL1271_FLAG_RX_STREAMING_STARTED, &amp;wl-&gt;flags);</div><div class='add'>+		set_bit(WLVIF_FLAG_RX_STREAMING_STARTED, &amp;wlvif-&gt;flags);</div><div class='ctx'> 	else</div><div class='del'>-		clear_bit(WL1271_FLAG_RX_STREAMING_STARTED, &amp;wl-&gt;flags);</div><div class='add'>+		clear_bit(WLVIF_FLAG_RX_STREAMING_STARTED, &amp;wlvif-&gt;flags);</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -519,25 +522,25 @@ out:</div><div class='ctx'>  * this function is being called when the rx_streaming interval</div><div class='ctx'>  * has beed changed or rx_streaming should be disabled</div><div class='ctx'>  */</div><div class='del'>-int wl1271_recalc_rx_streaming(struct wl1271 *wl)</div><div class='add'>+int wl1271_recalc_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int period = wl-&gt;conf.rx_streaming.interval;</div><div class='ctx'> </div><div class='ctx'> 	/* don't reconfigure if rx_streaming is disabled */</div><div class='del'>-	if (!test_bit(WL1271_FLAG_RX_STREAMING_STARTED, &amp;wl-&gt;flags))</div><div class='add'>+	if (!test_bit(WLVIF_FLAG_RX_STREAMING_STARTED, &amp;wlvif-&gt;flags))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* reconfigure/disable according to new streaming_period */</div><div class='ctx'> 	if (period &amp;&amp;</div><div class='del'>-	    test_bit(WL1271_FLAG_STA_ASSOCIATED, &amp;wl-&gt;flags) &amp;&amp;</div><div class='add'>+	    test_bit(WLVIF_FLAG_STA_ASSOCIATED, &amp;wlvif-&gt;flags) &amp;&amp;</div><div class='ctx'> 	    (wl-&gt;conf.rx_streaming.always ||</div><div class='ctx'> 	     test_bit(WL1271_FLAG_SOFT_GEMINI, &amp;wl-&gt;flags)))</div><div class='del'>-		ret = wl1271_set_rx_streaming(wl, true);</div><div class='add'>+		ret = wl1271_set_rx_streaming(wl, wlvif, true);</div><div class='ctx'> 	else {</div><div class='del'>-		ret = wl1271_set_rx_streaming(wl, false);</div><div class='add'>+		ret = wl1271_set_rx_streaming(wl, wlvif, false);</div><div class='ctx'> 		/* don't cancel_work_sync since we might deadlock */</div><div class='del'>-		del_timer_sync(&amp;wl-&gt;rx_streaming_timer);</div><div class='add'>+		del_timer_sync(&amp;wlvif-&gt;rx_streaming_timer);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -546,13 +549,14 @@ out:</div><div class='ctx'> static void wl1271_rx_streaming_enable_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct wl1271 *wl =</div><div class='del'>-		container_of(work, struct wl1271, rx_streaming_enable_work);</div><div class='add'>+	struct wl12xx_vif *wlvif = container_of(work, struct wl12xx_vif,</div><div class='add'>+						rx_streaming_enable_work);</div><div class='add'>+	struct wl1271 *wl = wlvif-&gt;wl;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (test_bit(WL1271_FLAG_RX_STREAMING_STARTED, &amp;wl-&gt;flags) ||</div><div class='del'>-	    !test_bit(WL1271_FLAG_STA_ASSOCIATED, &amp;wl-&gt;flags) ||</div><div class='add'>+	if (test_bit(WLVIF_FLAG_RX_STREAMING_STARTED, &amp;wlvif-&gt;flags) ||</div><div class='add'>+	    !test_bit(WLVIF_FLAG_STA_ASSOCIATED, &amp;wlvif-&gt;flags) ||</div><div class='ctx'> 	    (!wl-&gt;conf.rx_streaming.always &amp;&amp;</div><div class='ctx'> 	     !test_bit(WL1271_FLAG_SOFT_GEMINI, &amp;wl-&gt;flags)))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -564,12 +568,12 @@ static void wl1271_rx_streaming_enable_work(struct work_struct *work)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_set_rx_streaming(wl, true);</div><div class='add'>+	ret = wl1271_set_rx_streaming(wl, wlvif, true);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_sleep;</div><div class='ctx'> </div><div class='ctx'> 	/* stop it after some time of inactivity */</div><div class='del'>-	mod_timer(&amp;wl-&gt;rx_streaming_timer,</div><div class='add'>+	mod_timer(&amp;wlvif-&gt;rx_streaming_timer,</div><div class='ctx'> 		  jiffies + msecs_to_jiffies(wl-&gt;conf.rx_streaming.duration));</div><div class='ctx'> </div><div class='ctx'> out_sleep:</div><div class='hunk'>@@ -581,19 +585,20 @@ out:</div><div class='ctx'> static void wl1271_rx_streaming_disable_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct wl1271 *wl =</div><div class='del'>-		container_of(work, struct wl1271, rx_streaming_disable_work);</div><div class='add'>+	struct wl12xx_vif *wlvif = container_of(work, struct wl12xx_vif,</div><div class='add'>+						rx_streaming_disable_work);</div><div class='add'>+	struct wl1271 *wl = wlvif-&gt;wl;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(WL1271_FLAG_RX_STREAMING_STARTED, &amp;wl-&gt;flags))</div><div class='add'>+	if (!test_bit(WLVIF_FLAG_RX_STREAMING_STARTED, &amp;wlvif-&gt;flags))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_ps_elp_wakeup(wl);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_set_rx_streaming(wl, false);</div><div class='add'>+	ret = wl1271_set_rx_streaming(wl, wlvif, false);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_sleep;</div><div class='ctx'> </div><div class='hunk'>@@ -605,8 +610,9 @@ out:</div><div class='ctx'> </div><div class='ctx'> static void wl1271_rx_streaming_timer(unsigned long data)</div><div class='ctx'> {</div><div class='del'>-	struct wl1271 *wl = (struct wl1271 *)data;</div><div class='del'>-	ieee80211_queue_work(wl-&gt;hw, &amp;wl-&gt;rx_streaming_disable_work);</div><div class='add'>+	struct wl12xx_vif *wlvif = (struct wl12xx_vif *)data;</div><div class='add'>+	struct wl1271 *wl = wlvif-&gt;wl;</div><div class='add'>+	ieee80211_queue_work(wl-&gt;hw, &amp;wlvif-&gt;rx_streaming_disable_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void wl1271_conf_init(struct wl1271 *wl)</div><div class='hunk'>@@ -645,9 +651,7 @@ static void wl1271_conf_init(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> static int wl1271_plt_init(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='del'>-	struct conf_tx_ac_category *conf_ac;</div><div class='del'>-	struct conf_tx_tid *conf_tid;</div><div class='del'>-	int ret, i;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (wl-&gt;chip.id == CHIP_ID_1283_PG20)</div><div class='ctx'> 		ret = wl128x_cmd_general_parms(wl);</div><div class='hunk'>@@ -676,74 +680,14 @@ static int wl1271_plt_init(struct wl1271 *wl)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_sta_init_templates_config(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='ctx'> 	ret = wl1271_acx_init_mem_config(wl);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/* PHY layer config */</div><div class='del'>-	ret = wl1271_init_phy_config(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_free_memmap;</div><div class='del'>-</div><div class='del'>-	ret = wl1271_acx_dco_itrim_params(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_free_memmap;</div><div class='del'>-</div><div class='del'>-	/* Initialize connection monitoring thresholds */</div><div class='del'>-	ret = wl1271_acx_conn_monit_params(wl, false);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_free_memmap;</div><div class='del'>-</div><div class='del'>-	/* Bluetooth WLAN coexistence */</div><div class='del'>-	ret = wl1271_init_pta(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_free_memmap;</div><div class='del'>-</div><div class='del'>-	/* FM WLAN coexistence */</div><div class='del'>-	ret = wl1271_acx_fm_coex(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_free_memmap;</div><div class='del'>-</div><div class='del'>-	/* Energy detection */</div><div class='del'>-	ret = wl1271_init_energy_detection(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_free_memmap;</div><div class='del'>-</div><div class='ctx'> 	ret = wl12xx_acx_mem_cfg(wl);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_free_memmap;</div><div class='ctx'> </div><div class='del'>-	/* Default fragmentation threshold */</div><div class='del'>-	ret = wl1271_acx_frag_threshold(wl, wl-&gt;conf.tx.frag_threshold);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out_free_memmap;</div><div class='del'>-</div><div class='del'>-	/* Default TID/AC configuration */</div><div class='del'>-	BUG_ON(wl-&gt;conf.tx.tid_conf_count != wl-&gt;conf.tx.ac_conf_count);</div><div class='del'>-	for (i = 0; i &lt; wl-&gt;conf.tx.tid_conf_count; i++) {</div><div class='del'>-		conf_ac = &amp;wl-&gt;conf.tx.ac_conf[i];</div><div class='del'>-		ret = wl1271_acx_ac_cfg(wl, conf_ac-&gt;ac, conf_ac-&gt;cw_min,</div><div class='del'>-					conf_ac-&gt;cw_max, conf_ac-&gt;aifsn,</div><div class='del'>-					conf_ac-&gt;tx_op_limit);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out_free_memmap;</div><div class='del'>-</div><div class='del'>-		conf_tid = &amp;wl-&gt;conf.tx.tid_conf[i];</div><div class='del'>-		ret = wl1271_acx_tid_cfg(wl, conf_tid-&gt;queue_id,</div><div class='del'>-					 conf_tid-&gt;channel_type,</div><div class='del'>-					 conf_tid-&gt;tsid,</div><div class='del'>-					 conf_tid-&gt;ps_scheme,</div><div class='del'>-					 conf_tid-&gt;ack_policy,</div><div class='del'>-					 conf_tid-&gt;apsd_conf[0],</div><div class='del'>-					 conf_tid-&gt;apsd_conf[1]);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out_free_memmap;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Enable data path */</div><div class='ctx'> 	ret = wl1271_cmd_data_path(wl, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -768,14 +712,12 @@ static int wl1271_plt_init(struct wl1271 *wl)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wl12xx_irq_ps_regulate_link(struct wl1271 *wl, u8 hlid, u8 tx_pkts)</div><div class='add'>+static void wl12xx_irq_ps_regulate_link(struct wl1271 *wl,</div><div class='add'>+					struct wl12xx_vif *wlvif,</div><div class='add'>+					u8 hlid, u8 tx_pkts)</div><div class='ctx'> {</div><div class='ctx'> 	bool fw_ps, single_sta;</div><div class='ctx'> </div><div class='del'>-	/* only regulate station links */</div><div class='del'>-	if (hlid &lt; WL1271_AP_STA_HLID_START)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	fw_ps = test_bit(hlid, (unsigned long *)&amp;wl-&gt;ap_fw_ps_map);</div><div class='ctx'> 	single_sta = (wl-&gt;active_sta_count == 1);</div><div class='ctx'> </div><div class='hunk'>@@ -784,7 +726,7 @@ static void wl12xx_irq_ps_regulate_link(struct wl1271 *wl, u8 hlid, u8 tx_pkts)</div><div class='ctx'> 	 * packets in FW or if the STA is awake.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!fw_ps || tx_pkts &lt; WL1271_PS_STA_MAX_PACKETS)</div><div class='del'>-		wl1271_ps_link_end(wl, hlid);</div><div class='add'>+		wl12xx_ps_link_end(wl, wlvif, hlid);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Start high-level PS if the STA is asleep with enough blocks in FW.</div><div class='hunk'>@@ -792,24 +734,14 @@ static void wl12xx_irq_ps_regulate_link(struct wl1271 *wl, u8 hlid, u8 tx_pkts)</div><div class='ctx'> 	 * case FW-memory congestion is not a problem.</div><div class='ctx'> 	 */</div><div class='ctx'> 	else if (!single_sta &amp;&amp; fw_ps &amp;&amp; tx_pkts &gt;= WL1271_PS_STA_MAX_PACKETS)</div><div class='del'>-		wl1271_ps_link_start(wl, hlid, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool wl1271_is_active_sta(struct wl1271 *wl, u8 hlid)</div><div class='del'>-{</div><div class='del'>-	int id;</div><div class='del'>-</div><div class='del'>-	/* global/broadcast "stations" are always active */</div><div class='del'>-	if (hlid &lt; WL1271_AP_STA_HLID_START)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	id = hlid - WL1271_AP_STA_HLID_START;</div><div class='del'>-	return test_bit(id, wl-&gt;ap_hlid_map);</div><div class='add'>+		wl12xx_ps_link_start(wl, wlvif, hlid, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void wl12xx_irq_update_links_status(struct wl1271 *wl,</div><div class='add'>+					   struct wl12xx_vif *wlvif,</div><div class='ctx'> 					   struct wl12xx_fw_status *status)</div><div class='ctx'> {</div><div class='add'>+	struct wl1271_link *lnk;</div><div class='ctx'> 	u32 cur_fw_ps_map;</div><div class='ctx'> 	u8 hlid, cnt;</div><div class='ctx'> </div><div class='hunk'>@@ -825,25 +757,22 @@ static void wl12xx_irq_update_links_status(struct wl1271 *wl,</div><div class='ctx'> 		wl-&gt;ap_fw_ps_map = cur_fw_ps_map;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (hlid = WL1271_AP_STA_HLID_START; hlid &lt; AP_MAX_LINKS; hlid++) {</div><div class='del'>-		if (!wl1271_is_active_sta(wl, hlid))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		cnt = status-&gt;tx_lnk_free_pkts[hlid] -</div><div class='del'>-		      wl-&gt;links[hlid].prev_freed_pkts;</div><div class='add'>+	for_each_set_bit(hlid, wlvif-&gt;ap.sta_hlid_map, WL12XX_MAX_LINKS) {</div><div class='add'>+		lnk = &amp;wl-&gt;links[hlid];</div><div class='add'>+		cnt = status-&gt;tx_lnk_free_pkts[hlid] - lnk-&gt;prev_freed_pkts;</div><div class='ctx'> </div><div class='del'>-		wl-&gt;links[hlid].prev_freed_pkts =</div><div class='del'>-			status-&gt;tx_lnk_free_pkts[hlid];</div><div class='del'>-		wl-&gt;links[hlid].allocated_pkts -= cnt;</div><div class='add'>+		lnk-&gt;prev_freed_pkts = status-&gt;tx_lnk_free_pkts[hlid];</div><div class='add'>+		lnk-&gt;allocated_pkts -= cnt;</div><div class='ctx'> </div><div class='del'>-		wl12xx_irq_ps_regulate_link(wl, hlid,</div><div class='del'>-					    wl-&gt;links[hlid].allocated_pkts);</div><div class='add'>+		wl12xx_irq_ps_regulate_link(wl, wlvif, hlid,</div><div class='add'>+					    lnk-&gt;allocated_pkts);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void wl12xx_fw_status(struct wl1271 *wl,</div><div class='ctx'> 			     struct wl12xx_fw_status *status)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='ctx'> 	struct timespec ts;</div><div class='ctx'> 	u32 old_tx_blk_count = wl-&gt;tx_blocks_available;</div><div class='ctx'> 	int avail, freed_blocks;</div><div class='hunk'>@@ -898,8 +827,9 @@ static void wl12xx_fw_status(struct wl1271 *wl,</div><div class='ctx'> 		clear_bit(WL1271_FLAG_FW_TX_BUSY, &amp;wl-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	/* for AP update num of allocated TX blocks per link and ps status */</div><div class='del'>-	if (wl-&gt;bss_type == BSS_TYPE_AP_BSS)</div><div class='del'>-		wl12xx_irq_update_links_status(wl, status);</div><div class='add'>+	wl12xx_for_each_wlvif_ap(wl, wlvif) {</div><div class='add'>+		wl12xx_irq_update_links_status(wl, wlvif, status);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* update the host-chipset time offset */</div><div class='ctx'> 	getnstimeofday(&amp;ts);</div><div class='hunk'>@@ -932,7 +862,7 @@ static void wl1271_netstack_work(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> #define WL1271_IRQ_MAX_LOOPS 256</div><div class='ctx'> </div><div class='del'>-irqreturn_t wl1271_irq(int irq, void *cookie)</div><div class='add'>+static irqreturn_t wl1271_irq(int irq, void *cookie)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 intr;</div><div class='hunk'>@@ -1054,7 +984,6 @@ out:</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(wl1271_irq);</div><div class='ctx'> </div><div class='ctx'> static int wl1271_fetch_firmware(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='hunk'>@@ -1069,10 +998,10 @@ static int wl1271_fetch_firmware(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_BOOT, "booting firmware %s", fw_name);</div><div class='ctx'> </div><div class='del'>-	ret = request_firmware(&amp;fw, fw_name, wl1271_wl_to_dev(wl));</div><div class='add'>+	ret = request_firmware(&amp;fw, fw_name, wl-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		wl1271_error("could not get firmware: %d", ret);</div><div class='add'>+		wl1271_error("could not get firmware %s: %d", fw_name, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1107,10 +1036,11 @@ static int wl1271_fetch_nvs(struct wl1271 *wl)</div><div class='ctx'> 	const struct firmware *fw;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = request_firmware(&amp;fw, WL12XX_NVS_NAME, wl1271_wl_to_dev(wl));</div><div class='add'>+	ret = request_firmware(&amp;fw, WL12XX_NVS_NAME, wl-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		wl1271_error("could not get nvs file: %d", ret);</div><div class='add'>+		wl1271_error("could not get nvs file %s: %d", WL12XX_NVS_NAME,</div><div class='add'>+			     ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1217,11 +1147,13 @@ static void wl1271_recovery_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl =</div><div class='ctx'> 		container_of(work, struct wl1271, recovery_work);</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (wl-&gt;state != WL1271_STATE_ON)</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	/* Avoid a recursive recovery */</div><div class='ctx'> 	set_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &amp;wl-&gt;flags);</div><div class='hunk'>@@ -1238,9 +1170,12 @@ static void wl1271_recovery_work(struct work_struct *work)</div><div class='ctx'> 	 * in the firmware during recovery. This doens't hurt if the network is</div><div class='ctx'> 	 * not encrypted.</div><div class='ctx'> 	 */</div><div class='del'>-	if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &amp;wl-&gt;flags) ||</div><div class='del'>-	    test_bit(WL1271_FLAG_AP_STARTED, &amp;wl-&gt;flags))</div><div class='del'>-		wl-&gt;tx_security_seq += WL1271_TX_SQN_POST_RECOVERY_PADDING;</div><div class='add'>+	wl12xx_for_each_wlvif(wl, wlvif) {</div><div class='add'>+		if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &amp;wlvif-&gt;flags) ||</div><div class='add'>+		    test_bit(WLVIF_FLAG_AP_STARTED, &amp;wlvif-&gt;flags))</div><div class='add'>+			wlvif-&gt;tx_security_seq +=</div><div class='add'>+				WL1271_TX_SQN_POST_RECOVERY_PADDING;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Prevent spurious TX during FW restart */</div><div class='ctx'> 	ieee80211_stop_queues(wl-&gt;hw);</div><div class='hunk'>@@ -1251,7 +1186,14 @@ static void wl1271_recovery_work(struct work_struct *work)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* reboot the chipset */</div><div class='del'>-	__wl1271_op_remove_interface(wl, false);</div><div class='add'>+	while (!list_empty(&amp;wl-&gt;wlvif_list)) {</div><div class='add'>+		wlvif = list_first_entry(&amp;wl-&gt;wlvif_list,</div><div class='add'>+				       struct wl12xx_vif, list);</div><div class='add'>+		vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='add'>+		__wl1271_op_remove_interface(wl, vif, false);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='add'>+	wl1271_op_stop(wl-&gt;hw);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &amp;wl-&gt;flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1262,8 +1204,8 @@ static void wl1271_recovery_work(struct work_struct *work)</div><div class='ctx'> 	 * to restart the HW.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ieee80211_wake_queues(wl-&gt;hw);</div><div class='del'>-</div><div class='del'>-out:</div><div class='add'>+	return;</div><div class='add'>+out_unlock:</div><div class='ctx'> 	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1318,7 +1260,16 @@ static int wl1271_chip_wakeup(struct wl1271 *wl)</div><div class='ctx'> 	/* 0. read chip id from CHIP_ID */</div><div class='ctx'> 	wl-&gt;chip.id = wl1271_read32(wl, CHIP_ID_B);</div><div class='ctx'> </div><div class='del'>-	/* 1. check if chip id is valid */</div><div class='add'>+	/*</div><div class='add'>+	 * For wl127x based devices we could use the default block</div><div class='add'>+	 * size (512 bytes), but due to a bug in the sdio driver, we</div><div class='add'>+	 * need to set it explicitly after the chip is powered on.  To</div><div class='add'>+	 * simplify the code and since the performance impact is</div><div class='add'>+	 * negligible, we use the same block size for all different</div><div class='add'>+	 * chip types.</div><div class='add'>+	 */</div><div class='add'>+	if (!wl1271_set_block_size(wl))</div><div class='add'>+		wl-&gt;quirks |= WL12XX_QUIRK_NO_BLOCKSIZE_ALIGNMENT;</div><div class='ctx'> </div><div class='ctx'> 	switch (wl-&gt;chip.id) {</div><div class='ctx'> 	case CHIP_ID_1271_PG10:</div><div class='hunk'>@@ -1328,7 +1279,9 @@ static int wl1271_chip_wakeup(struct wl1271 *wl)</div><div class='ctx'> 		ret = wl1271_setup(wl);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='add'>+		wl-&gt;quirks |= WL12XX_QUIRK_NO_BLOCKSIZE_ALIGNMENT;</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='ctx'> 	case CHIP_ID_1271_PG20:</div><div class='ctx'> 		wl1271_debug(DEBUG_BOOT, "chip id 0x%x (1271 PG20)",</div><div class='ctx'> 			     wl-&gt;chip.id);</div><div class='hunk'>@@ -1336,7 +1289,9 @@ static int wl1271_chip_wakeup(struct wl1271 *wl)</div><div class='ctx'> 		ret = wl1271_setup(wl);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='add'>+		wl-&gt;quirks |= WL12XX_QUIRK_NO_BLOCKSIZE_ALIGNMENT;</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='ctx'> 	case CHIP_ID_1283_PG20:</div><div class='ctx'> 		wl1271_debug(DEBUG_BOOT, "chip id 0x%x (1283 PG20)",</div><div class='ctx'> 			     wl-&gt;chip.id);</div><div class='hunk'>@@ -1344,9 +1299,6 @@ static int wl1271_chip_wakeup(struct wl1271 *wl)</div><div class='ctx'> 		ret = wl1271_setup(wl);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='del'>-</div><div class='del'>-		if (wl1271_set_block_size(wl))</div><div class='del'>-			wl-&gt;quirks |= WL12XX_QUIRK_BLOCKSIZE_ALIGNMENT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CHIP_ID_1283_PG10:</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1389,8 +1341,6 @@ int wl1271_plt_start(struct wl1271 *wl)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wl-&gt;bss_type = BSS_TYPE_STA_BSS;</div><div class='del'>-</div><div class='ctx'> 	while (retries) {</div><div class='ctx'> 		retries--;</div><div class='ctx'> 		ret = wl1271_chip_wakeup(wl);</div><div class='hunk'>@@ -1482,33 +1432,34 @@ int wl1271_plt_stop(struct wl1271 *wl)</div><div class='ctx'> static void wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl = 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 wl12xx_vif *wlvif = NULL;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int q, mapping;</div><div class='del'>-	u8 hlid = 0;</div><div class='add'>+	u8 hlid;</div><div class='add'>+</div><div class='add'>+	if (vif)</div><div class='add'>+		wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> </div><div class='ctx'> 	mapping = skb_get_queue_mapping(skb);</div><div class='ctx'> 	q = wl1271_tx_get_queue(mapping);</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;bss_type == BSS_TYPE_AP_BSS)</div><div class='del'>-		hlid = wl12xx_tx_get_hlid_ap(wl, skb);</div><div class='add'>+	hlid = wl12xx_tx_get_hlid(wl, wlvif, skb);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;wl-&gt;wl_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* queue the packet */</div><div class='del'>-	if (wl-&gt;bss_type == BSS_TYPE_AP_BSS) {</div><div class='del'>-		if (!wl1271_is_active_sta(wl, hlid)) {</div><div class='del'>-			wl1271_debug(DEBUG_TX, "DROP skb hlid %d q %d",</div><div class='del'>-				     hlid, q);</div><div class='del'>-			dev_kfree_skb(skb);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		wl1271_debug(DEBUG_TX, "queue skb hlid %d q %d", hlid, q);</div><div class='del'>-		skb_queue_tail(&amp;wl-&gt;links[hlid].tx_queue[q], skb);</div><div class='del'>-	} else {</div><div class='del'>-		skb_queue_tail(&amp;wl-&gt;tx_queue[q], skb);</div><div class='add'>+	if (hlid == WL12XX_INVALID_LINK_ID ||</div><div class='add'>+	    (wlvif &amp;&amp; !test_bit(hlid, wlvif-&gt;links_map))) {</div><div class='add'>+		wl1271_debug(DEBUG_TX, "DROP skb hlid %d q %d", hlid, q);</div><div class='add'>+		ieee80211_free_txskb(hw, skb);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	wl1271_debug(DEBUG_TX, "queue skb hlid %d q %d", hlid, q);</div><div class='add'>+	skb_queue_tail(&amp;wl-&gt;links[hlid].tx_queue[q], skb);</div><div class='add'>+</div><div class='ctx'> 	wl-&gt;tx_queue_count[q]++;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1609,13 +1560,14 @@ static struct notifier_block wl1271_dev_notifier = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='del'>-static int wl1271_configure_suspend_sta(struct wl1271 *wl)</div><div class='add'>+static int wl1271_configure_suspend_sta(struct wl1271 *wl,</div><div class='add'>+					struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(WL1271_FLAG_STA_ASSOCIATED, &amp;wl-&gt;flags))</div><div class='add'>+	if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &amp;wlvif-&gt;flags))</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_ps_elp_wakeup(wl);</div><div class='hunk'>@@ -1623,12 +1575,12 @@ static int wl1271_configure_suspend_sta(struct wl1271 *wl)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	/* enter psm if needed*/</div><div class='del'>-	if (!test_bit(WL1271_FLAG_PSM, &amp;wl-&gt;flags)) {</div><div class='add'>+	if (!test_bit(WLVIF_FLAG_PSM, &amp;wlvif-&gt;flags)) {</div><div class='ctx'> 		DECLARE_COMPLETION_ONSTACK(compl);</div><div class='ctx'> </div><div class='del'>-		wl-&gt;ps_compl = &amp;compl;</div><div class='del'>-		ret = wl1271_ps_set_mode(wl, STATION_POWER_SAVE_MODE,</div><div class='del'>-				   wl-&gt;basic_rate, true);</div><div class='add'>+		wlvif-&gt;ps_compl = &amp;compl;</div><div class='add'>+		ret = wl1271_ps_set_mode(wl, wlvif, STATION_POWER_SAVE_MODE,</div><div class='add'>+				   wlvif-&gt;basic_rate, true);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out_sleep;</div><div class='ctx'> </div><div class='hunk'>@@ -1638,42 +1590,43 @@ static int wl1271_configure_suspend_sta(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> 		ret = wait_for_completion_timeout(</div><div class='ctx'> 			&amp;compl, msecs_to_jiffies(WL1271_PS_COMPLETE_TIMEOUT));</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;wl-&gt;mutex);</div><div class='ctx'> 		if (ret &lt;= 0) {</div><div class='ctx'> 			wl1271_warning("couldn't enter ps mode!");</div><div class='ctx'> 			ret = -EBUSY;</div><div class='del'>-			goto out;</div><div class='add'>+			goto out_cleanup;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* take mutex again, and wakeup */</div><div class='del'>-		mutex_lock(&amp;wl-&gt;mutex);</div><div class='del'>-</div><div class='ctx'> 		ret = wl1271_ps_elp_wakeup(wl);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out_unlock;</div><div class='add'>+			goto out_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> out_sleep:</div><div class='ctx'> 	wl1271_ps_elp_sleep(wl);</div><div class='add'>+out_cleanup:</div><div class='add'>+	wlvif-&gt;ps_compl = NULL;</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='del'>-out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_configure_suspend_ap(struct wl1271 *wl)</div><div class='add'>+static int wl1271_configure_suspend_ap(struct wl1271 *wl,</div><div class='add'>+				       struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(WL1271_FLAG_AP_STARTED, &amp;wl-&gt;flags))</div><div class='add'>+	if (!test_bit(WLVIF_FLAG_AP_STARTED, &amp;wlvif-&gt;flags))</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_ps_elp_wakeup(wl);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_acx_beacon_filter_opt(wl, true);</div><div class='add'>+	ret = wl1271_acx_beacon_filter_opt(wl, wlvif, true);</div><div class='ctx'> </div><div class='ctx'> 	wl1271_ps_elp_sleep(wl);</div><div class='ctx'> out_unlock:</div><div class='hunk'>@@ -1682,20 +1635,22 @@ out_unlock:</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_configure_suspend(struct wl1271 *wl)</div><div class='add'>+static int wl1271_configure_suspend(struct wl1271 *wl,</div><div class='add'>+				    struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='del'>-	if (wl-&gt;bss_type == BSS_TYPE_STA_BSS)</div><div class='del'>-		return wl1271_configure_suspend_sta(wl);</div><div class='del'>-	if (wl-&gt;bss_type == BSS_TYPE_AP_BSS)</div><div class='del'>-		return wl1271_configure_suspend_ap(wl);</div><div class='add'>+	if (wlvif-&gt;bss_type == BSS_TYPE_STA_BSS)</div><div class='add'>+		return wl1271_configure_suspend_sta(wl, wlvif);</div><div class='add'>+	if (wlvif-&gt;bss_type == BSS_TYPE_AP_BSS)</div><div class='add'>+		return wl1271_configure_suspend_ap(wl, wlvif);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wl1271_configure_resume(struct wl1271 *wl)</div><div class='add'>+static void wl1271_configure_resume(struct wl1271 *wl,</div><div class='add'>+				    struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	bool is_sta = wl-&gt;bss_type == BSS_TYPE_STA_BSS;</div><div class='del'>-	bool is_ap = wl-&gt;bss_type == BSS_TYPE_AP_BSS;</div><div class='add'>+	bool is_sta = wlvif-&gt;bss_type == BSS_TYPE_STA_BSS;</div><div class='add'>+	bool is_ap = wlvif-&gt;bss_type == BSS_TYPE_AP_BSS;</div><div class='ctx'> </div><div class='ctx'> 	if (!is_sta &amp;&amp; !is_ap)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1707,11 +1662,11 @@ static void wl1271_configure_resume(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> 	if (is_sta) {</div><div class='ctx'> 		/* exit psm if it wasn't configured */</div><div class='del'>-		if (!test_bit(WL1271_FLAG_PSM_REQUESTED, &amp;wl-&gt;flags))</div><div class='del'>-			wl1271_ps_set_mode(wl, STATION_ACTIVE_MODE,</div><div class='del'>-					   wl-&gt;basic_rate, true);</div><div class='add'>+		if (!test_bit(WLVIF_FLAG_PSM_REQUESTED, &amp;wlvif-&gt;flags))</div><div class='add'>+			wl1271_ps_set_mode(wl, wlvif, STATION_ACTIVE_MODE,</div><div class='add'>+					   wlvif-&gt;basic_rate, true);</div><div class='ctx'> 	} else if (is_ap) {</div><div class='del'>-		wl1271_acx_beacon_filter_opt(wl, false);</div><div class='add'>+		wl1271_acx_beacon_filter_opt(wl, wlvif, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wl1271_ps_elp_sleep(wl);</div><div class='hunk'>@@ -1723,16 +1678,19 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw,</div><div class='ctx'> 			    struct cfg80211_wowlan *wow)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl = hw-&gt;priv;</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_MAC80211, "mac80211 suspend wow=%d", !!wow);</div><div class='ctx'> 	WARN_ON(!wow || !wow-&gt;any);</div><div class='ctx'> </div><div class='ctx'> 	wl-&gt;wow_enabled = true;</div><div class='del'>-	ret = wl1271_configure_suspend(wl);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		wl1271_warning("couldn't prepare device to suspend");</div><div class='del'>-		return ret;</div><div class='add'>+	wl12xx_for_each_wlvif(wl, wlvif) {</div><div class='add'>+		ret = wl1271_configure_suspend(wl, wlvif);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			wl1271_warning("couldn't prepare device to suspend");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* flush any remaining work */</div><div class='ctx'> 	wl1271_debug(DEBUG_MAC80211, "flushing remaining works");</div><div class='hunk'>@@ -1751,7 +1709,9 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	wl1271_enable_interrupts(wl);</div><div class='ctx'> 	flush_work(&amp;wl-&gt;tx_work);</div><div class='del'>-	flush_delayed_work(&amp;wl-&gt;pspoll_work);</div><div class='add'>+	wl12xx_for_each_wlvif(wl, wlvif) {</div><div class='add'>+		flush_delayed_work(&amp;wlvif-&gt;pspoll_work);</div><div class='add'>+	}</div><div class='ctx'> 	flush_delayed_work(&amp;wl-&gt;elp_work);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1760,6 +1720,7 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw,</div><div class='ctx'> static int wl1271_op_resume(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl = hw-&gt;priv;</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	bool run_irq_work = false;</div><div class='ctx'> </div><div class='hunk'>@@ -1783,7 +1744,9 @@ static int wl1271_op_resume(struct ieee80211_hw *hw)</div><div class='ctx'> 		wl1271_irq(0, wl);</div><div class='ctx'> 		wl1271_enable_interrupts(wl);</div><div class='ctx'> 	}</div><div class='del'>-	wl1271_configure_resume(wl);</div><div class='add'>+	wl12xx_for_each_wlvif(wl, wlvif) {</div><div class='add'>+		wl1271_configure_resume(wl, wlvif);</div><div class='add'>+	}</div><div class='ctx'> 	wl-&gt;wow_enabled = false;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1810,20 +1773,119 @@ static int wl1271_op_start(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> static void wl1271_op_stop(struct ieee80211_hw *hw)</div><div class='ctx'> {</div><div class='add'>+	struct wl1271 *wl = hw-&gt;priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='ctx'> 	wl1271_debug(DEBUG_MAC80211, "mac80211 stop");</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wl-&gt;mutex);</div><div class='add'>+	if (wl-&gt;state == WL1271_STATE_OFF) {</div><div class='add'>+		mutex_unlock(&amp;wl-&gt;mutex);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * this must be before the cancel_work calls below, so that the work</div><div class='add'>+	 * functions don't perform further work.</div><div class='add'>+	 */</div><div class='add'>+	wl-&gt;state = WL1271_STATE_OFF;</div><div class='add'>+	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wl_list_mutex);</div><div class='add'>+	list_del(&amp;wl-&gt;list);</div><div class='add'>+	mutex_unlock(&amp;wl_list_mutex);</div><div class='add'>+</div><div class='add'>+	wl1271_disable_interrupts(wl);</div><div class='add'>+	wl1271_flush_deferred_work(wl);</div><div class='add'>+	cancel_delayed_work_sync(&amp;wl-&gt;scan_complete_work);</div><div class='add'>+	cancel_work_sync(&amp;wl-&gt;netstack_work);</div><div class='add'>+	cancel_work_sync(&amp;wl-&gt;tx_work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;wl-&gt;elp_work);</div><div class='add'>+</div><div class='add'>+	/* let's notify MAC80211 about the remaining pending TX frames */</div><div class='add'>+	wl12xx_tx_reset(wl, true);</div><div class='add'>+	mutex_lock(&amp;wl-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	wl1271_power_off(wl);</div><div class='add'>+</div><div class='add'>+	wl-&gt;band = IEEE80211_BAND_2GHZ;</div><div class='add'>+</div><div class='add'>+	wl-&gt;rx_counter = 0;</div><div class='add'>+	wl-&gt;power_level = WL1271_DEFAULT_POWER_LEVEL;</div><div class='add'>+	wl-&gt;tx_blocks_available = 0;</div><div class='add'>+	wl-&gt;tx_allocated_blocks = 0;</div><div class='add'>+	wl-&gt;tx_results_count = 0;</div><div class='add'>+	wl-&gt;tx_packets_count = 0;</div><div class='add'>+	wl-&gt;time_offset = 0;</div><div class='add'>+	wl-&gt;tx_spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;</div><div class='add'>+	wl-&gt;ap_fw_ps_map = 0;</div><div class='add'>+	wl-&gt;ap_ps_map = 0;</div><div class='add'>+	wl-&gt;sched_scanning = false;</div><div class='add'>+	memset(wl-&gt;roles_map, 0, sizeof(wl-&gt;roles_map));</div><div class='add'>+	memset(wl-&gt;links_map, 0, sizeof(wl-&gt;links_map));</div><div class='add'>+	memset(wl-&gt;roc_map, 0, sizeof(wl-&gt;roc_map));</div><div class='add'>+	wl-&gt;active_sta_count = 0;</div><div class='add'>+</div><div class='add'>+	/* The system link is always allocated */</div><div class='add'>+	__set_bit(WL12XX_SYSTEM_HLID, wl-&gt;links_map);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * this is performed after the cancel_work calls and the associated</div><div class='add'>+	 * mutex_lock, so that wl1271_op_add_interface does not accidentally</div><div class='add'>+	 * get executed before all these vars have been reset.</div><div class='add'>+	 */</div><div class='add'>+	wl-&gt;flags = 0;</div><div class='add'>+</div><div class='add'>+	wl-&gt;tx_blocks_freed = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_TX_QUEUES; i++) {</div><div class='add'>+		wl-&gt;tx_pkts_freed[i] = 0;</div><div class='add'>+		wl-&gt;tx_allocated_pkts[i] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wl1271_debugfs_reset(wl);</div><div class='add'>+</div><div class='add'>+	kfree(wl-&gt;fw_status);</div><div class='add'>+	wl-&gt;fw_status = NULL;</div><div class='add'>+	kfree(wl-&gt;tx_res_if);</div><div class='add'>+	wl-&gt;tx_res_if = NULL;</div><div class='add'>+	kfree(wl-&gt;target_mem_map);</div><div class='add'>+	wl-&gt;target_mem_map = NULL;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 wl12xx_get_role_type(struct wl1271 *wl)</div><div class='add'>+static int wl12xx_allocate_rate_policy(struct wl1271 *wl, u8 *idx)</div><div class='ctx'> {</div><div class='del'>-	switch (wl-&gt;bss_type) {</div><div class='add'>+	u8 policy = find_first_zero_bit(wl-&gt;rate_policies_map,</div><div class='add'>+					WL12XX_MAX_RATE_POLICIES);</div><div class='add'>+	if (policy &gt;= WL12XX_MAX_RATE_POLICIES)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	__set_bit(policy, wl-&gt;rate_policies_map);</div><div class='add'>+	*idx = policy;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wl12xx_free_rate_policy(struct wl1271 *wl, u8 *idx)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(*idx &gt;= WL12XX_MAX_RATE_POLICIES))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__clear_bit(*idx, wl-&gt;rate_policies_map);</div><div class='add'>+	*idx = WL12XX_MAX_RATE_POLICIES;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 wl12xx_get_role_type(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='add'>+{</div><div class='add'>+	switch (wlvif-&gt;bss_type) {</div><div class='ctx'> 	case BSS_TYPE_AP_BSS:</div><div class='del'>-		if (wl-&gt;p2p)</div><div class='add'>+		if (wlvif-&gt;p2p)</div><div class='ctx'> 			return WL1271_ROLE_P2P_GO;</div><div class='ctx'> 		else</div><div class='ctx'> 			return WL1271_ROLE_AP;</div><div class='ctx'> </div><div class='ctx'> 	case BSS_TYPE_STA_BSS:</div><div class='del'>-		if (wl-&gt;p2p)</div><div class='add'>+		if (wlvif-&gt;p2p)</div><div class='ctx'> 			return WL1271_ROLE_P2P_CL;</div><div class='ctx'> 		else</div><div class='ctx'> 			return WL1271_ROLE_STA;</div><div class='hunk'>@@ -1832,78 +1894,95 @@ static u8 wl12xx_get_role_type(struct wl1271 *wl)</div><div class='ctx'> 		return WL1271_ROLE_IBSS;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		wl1271_error("invalid bss_type: %d", wl-&gt;bss_type);</div><div class='add'>+		wl1271_error("invalid bss_type: %d", wlvif-&gt;bss_type);</div><div class='ctx'> 	}</div><div class='ctx'> 	return WL12XX_INVALID_ROLE_TYPE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_op_add_interface(struct ieee80211_hw *hw,</div><div class='del'>-				   struct ieee80211_vif *vif)</div><div class='add'>+static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct wl1271 *wl = hw-&gt;priv;</div><div class='del'>-	struct wiphy *wiphy = hw-&gt;wiphy;</div><div class='del'>-	int retries = WL1271_BOOT_RETRIES;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u8 role_type;</div><div class='del'>-	bool booted = false;</div><div class='del'>-</div><div class='del'>-	wl1271_debug(DEBUG_MAC80211, "mac80211 add interface type %d mac %pM",</div><div class='del'>-		     ieee80211_vif_type_p2p(vif), vif-&gt;addr);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;wl-&gt;mutex);</div><div class='del'>-	if (wl-&gt;vif) {</div><div class='del'>-		wl1271_debug(DEBUG_MAC80211,</div><div class='del'>-			     "multiple vifs are not supported yet");</div><div class='del'>-		ret = -EBUSY;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * in some very corner case HW recovery scenarios its possible to</div><div class='del'>-	 * get here before __wl1271_op_remove_interface is complete, so</div><div class='del'>-	 * opt out if that is the case.</div><div class='del'>-	 */</div><div class='del'>-	if (test_bit(WL1271_FLAG_IF_INITIALIZED, &amp;wl-&gt;flags)) {</div><div class='del'>-		ret = -EBUSY;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	/* clear everything but the persistent data */</div><div class='add'>+	memset(wlvif, 0, offsetof(struct wl12xx_vif, persistent));</div><div class='ctx'> </div><div class='ctx'> 	switch (ieee80211_vif_type_p2p(vif)) {</div><div class='ctx'> 	case NL80211_IFTYPE_P2P_CLIENT:</div><div class='del'>-		wl-&gt;p2p = 1;</div><div class='add'>+		wlvif-&gt;p2p = 1;</div><div class='ctx'> 		/* fall-through */</div><div class='ctx'> 	case NL80211_IFTYPE_STATION:</div><div class='del'>-		wl-&gt;bss_type = BSS_TYPE_STA_BSS;</div><div class='del'>-		wl-&gt;set_bss_type = BSS_TYPE_STA_BSS;</div><div class='add'>+		wlvif-&gt;bss_type = BSS_TYPE_STA_BSS;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_ADHOC:</div><div class='del'>-		wl-&gt;bss_type = BSS_TYPE_IBSS;</div><div class='del'>-		wl-&gt;set_bss_type = BSS_TYPE_STA_BSS;</div><div class='add'>+		wlvif-&gt;bss_type = BSS_TYPE_IBSS;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NL80211_IFTYPE_P2P_GO:</div><div class='del'>-		wl-&gt;p2p = 1;</div><div class='add'>+		wlvif-&gt;p2p = 1;</div><div class='ctx'> 		/* fall-through */</div><div class='ctx'> 	case NL80211_IFTYPE_AP:</div><div class='del'>-		wl-&gt;bss_type = BSS_TYPE_AP_BSS;</div><div class='add'>+		wlvif-&gt;bss_type = BSS_TYPE_AP_BSS;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-		goto out;</div><div class='add'>+		wlvif-&gt;bss_type = MAX_BSS_TYPE;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	role_type = wl12xx_get_role_type(wl);</div><div class='del'>-	if (role_type == WL12XX_INVALID_ROLE_TYPE) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='add'>+	wlvif-&gt;role_id = WL12XX_INVALID_ROLE_ID;</div><div class='add'>+	wlvif-&gt;dev_role_id = WL12XX_INVALID_ROLE_ID;</div><div class='add'>+	wlvif-&gt;dev_hlid = WL12XX_INVALID_LINK_ID;</div><div class='add'>+</div><div class='add'>+	if (wlvif-&gt;bss_type == BSS_TYPE_STA_BSS ||</div><div class='add'>+	    wlvif-&gt;bss_type == BSS_TYPE_IBSS) {</div><div class='add'>+		/* init sta/ibss data */</div><div class='add'>+		wlvif-&gt;sta.hlid = WL12XX_INVALID_LINK_ID;</div><div class='add'>+		wl12xx_allocate_rate_policy(wl, &amp;wlvif-&gt;sta.basic_rate_idx);</div><div class='add'>+		wl12xx_allocate_rate_policy(wl, &amp;wlvif-&gt;sta.ap_rate_idx);</div><div class='add'>+		wl12xx_allocate_rate_policy(wl, &amp;wlvif-&gt;sta.p2p_rate_idx);</div><div class='add'>+	} else {</div><div class='add'>+		/* init ap data */</div><div class='add'>+		wlvif-&gt;ap.bcast_hlid = WL12XX_INVALID_LINK_ID;</div><div class='add'>+		wlvif-&gt;ap.global_hlid = WL12XX_INVALID_LINK_ID;</div><div class='add'>+		wl12xx_allocate_rate_policy(wl, &amp;wlvif-&gt;ap.mgmt_rate_idx);</div><div class='add'>+		wl12xx_allocate_rate_policy(wl, &amp;wlvif-&gt;ap.bcast_rate_idx);</div><div class='add'>+		for (i = 0; i &lt; CONF_TX_MAX_AC_COUNT; i++)</div><div class='add'>+			wl12xx_allocate_rate_policy(wl,</div><div class='add'>+						&amp;wlvif-&gt;ap.ucast_rate_idx[i]);</div><div class='ctx'> 	}</div><div class='del'>-	memcpy(wl-&gt;mac_addr, vif-&gt;addr, ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;state != WL1271_STATE_OFF) {</div><div class='del'>-		wl1271_error("cannot start because not in off state: %d",</div><div class='del'>-			     wl-&gt;state);</div><div class='del'>-		ret = -EBUSY;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	wlvif-&gt;bitrate_masks[IEEE80211_BAND_2GHZ] = wl-&gt;conf.tx.basic_rate;</div><div class='add'>+	wlvif-&gt;bitrate_masks[IEEE80211_BAND_5GHZ] = wl-&gt;conf.tx.basic_rate_5;</div><div class='add'>+	wlvif-&gt;basic_rate_set = CONF_TX_RATE_MASK_BASIC;</div><div class='add'>+	wlvif-&gt;basic_rate = CONF_TX_RATE_MASK_BASIC;</div><div class='add'>+	wlvif-&gt;rate_set = CONF_TX_RATE_MASK_BASIC;</div><div class='add'>+	wlvif-&gt;beacon_int = WL1271_DEFAULT_BEACON_INT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * mac80211 configures some values globally, while we treat them</div><div class='add'>+	 * per-interface. thus, on init, we have to copy them from wl</div><div class='add'>+	 */</div><div class='add'>+	wlvif-&gt;band = wl-&gt;band;</div><div class='add'>+	wlvif-&gt;channel = wl-&gt;channel;</div><div class='add'>+	wlvif-&gt;power_level = wl-&gt;power_level;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;wlvif-&gt;rx_streaming_enable_work,</div><div class='add'>+		  wl1271_rx_streaming_enable_work);</div><div class='add'>+	INIT_WORK(&amp;wlvif-&gt;rx_streaming_disable_work,</div><div class='add'>+		  wl1271_rx_streaming_disable_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;wlvif-&gt;pspoll_work, wl1271_pspoll_work);</div><div class='add'>+	INIT_LIST_HEAD(&amp;wlvif-&gt;list);</div><div class='add'>+</div><div class='add'>+	setup_timer(&amp;wlvif-&gt;rx_streaming_timer, wl1271_rx_streaming_timer,</div><div class='add'>+		    (unsigned long) wlvif);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool wl12xx_init_fw(struct wl1271 *wl)</div><div class='add'>+{</div><div class='add'>+	int retries = WL1271_BOOT_RETRIES;</div><div class='add'>+	bool booted = false;</div><div class='add'>+	struct wiphy *wiphy = wl-&gt;hw-&gt;wiphy;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	while (retries) {</div><div class='ctx'> 		retries--;</div><div class='hunk'>@@ -1915,25 +1994,6 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto power_off;</div><div class='ctx'> </div><div class='del'>-		if (wl-&gt;bss_type == BSS_TYPE_STA_BSS ||</div><div class='del'>-		    wl-&gt;bss_type == BSS_TYPE_IBSS) {</div><div class='del'>-			/*</div><div class='del'>-			 * The device role is a special role used for</div><div class='del'>-			 * rx and tx frames prior to association (as</div><div class='del'>-			 * the STA role can get packets only from</div><div class='del'>-			 * its associated bssid)</div><div class='del'>-			 */</div><div class='del'>-			ret = wl12xx_cmd_role_enable(wl,</div><div class='del'>-							 WL1271_ROLE_DEVICE,</div><div class='del'>-							 &amp;wl-&gt;dev_role_id);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				goto irq_disable;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = wl12xx_cmd_role_enable(wl, role_type, &amp;wl-&gt;role_id);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto irq_disable;</div><div class='del'>-</div><div class='ctx'> 		ret = wl1271_hw_init(wl);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto irq_disable;</div><div class='hunk'>@@ -1964,9 +2024,6 @@ power_off:</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wl-&gt;vif = vif;</div><div class='del'>-	wl-&gt;state = WL1271_STATE_ON;</div><div class='del'>-	set_bit(WL1271_FLAG_IF_INITIALIZED, &amp;wl-&gt;flags);</div><div class='ctx'> 	wl1271_info("firmware booted (%s)", wl-&gt;chip.fw_ver_str);</div><div class='ctx'> </div><div class='ctx'> 	/* update hw/fw version info in wiphy struct */</div><div class='hunk'>@@ -1984,7 +2041,115 @@ power_off:</div><div class='ctx'> 	wl1271_debug(DEBUG_MAC80211, "11a is %ssupported",</div><div class='ctx'> 		     wl-&gt;enable_11a ? "" : "not ");</div><div class='ctx'> </div><div class='add'>+	wl-&gt;state = WL1271_STATE_ON;</div><div class='add'>+out:</div><div class='add'>+	return booted;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool wl12xx_dev_role_started(struct wl12xx_vif *wlvif)</div><div class='add'>+{</div><div class='add'>+	return wlvif-&gt;dev_hlid != WL12XX_INVALID_LINK_ID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wl1271_op_add_interface(struct ieee80211_hw *hw,</div><div class='add'>+				   struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	struct wl1271 *wl = hw-&gt;priv;</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u8 role_type;</div><div class='add'>+	bool booted = false;</div><div class='add'>+</div><div class='add'>+	wl1271_debug(DEBUG_MAC80211, "mac80211 add interface type %d mac %pM",</div><div class='add'>+		     ieee80211_vif_type_p2p(vif), vif-&gt;addr);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wl-&gt;mutex);</div><div class='add'>+	ret = wl1271_ps_elp_wakeup(wl);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	if (wl-&gt;vif) {</div><div class='add'>+		wl1271_debug(DEBUG_MAC80211,</div><div class='add'>+			     "multiple vifs are not supported yet");</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * in some very corner case HW recovery scenarios its possible to</div><div class='add'>+	 * get here before __wl1271_op_remove_interface is complete, so</div><div class='add'>+	 * opt out if that is the case.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &amp;wl-&gt;flags) ||</div><div class='add'>+	    test_bit(WLVIF_FLAG_INITIALIZED, &amp;wlvif-&gt;flags)) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wl12xx_init_vif_data(wl, vif);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	wlvif-&gt;wl = wl;</div><div class='add'>+	role_type = wl12xx_get_role_type(wl, wlvif);</div><div class='add'>+	if (role_type == WL12XX_INVALID_ROLE_TYPE) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * TODO: after the nvs issue will be solved, move this block</div><div class='add'>+	 * to start(), and make sure here the driver is ON.</div><div class='add'>+	 */</div><div class='add'>+	if (wl-&gt;state == WL1271_STATE_OFF) {</div><div class='add'>+		/*</div><div class='add'>+		 * we still need this in order to configure the fw</div><div class='add'>+		 * while uploading the nvs</div><div class='add'>+		 */</div><div class='add'>+		memcpy(wl-&gt;mac_addr, vif-&gt;addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+		booted = wl12xx_init_fw(wl);</div><div class='add'>+		if (!booted) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wlvif-&gt;bss_type == BSS_TYPE_STA_BSS ||</div><div class='add'>+	    wlvif-&gt;bss_type == BSS_TYPE_IBSS) {</div><div class='add'>+		/*</div><div class='add'>+		 * The device role is a special role used for</div><div class='add'>+		 * rx and tx frames prior to association (as</div><div class='add'>+		 * the STA role can get packets only from</div><div class='add'>+		 * its associated bssid)</div><div class='add'>+		 */</div><div class='add'>+		ret = wl12xx_cmd_role_enable(wl, vif-&gt;addr,</div><div class='add'>+						 WL1271_ROLE_DEVICE,</div><div class='add'>+						 &amp;wlvif-&gt;dev_role_id);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wl12xx_cmd_role_enable(wl, vif-&gt;addr,</div><div class='add'>+				     role_type, &amp;wlvif-&gt;role_id);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = wl1271_init_vif_specific(wl, vif);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	wl-&gt;vif = vif;</div><div class='add'>+	list_add(&amp;wlvif-&gt;list, &amp;wl-&gt;wlvif_list);</div><div class='add'>+	set_bit(WLVIF_FLAG_INITIALIZED, &amp;wlvif-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if (wlvif-&gt;bss_type == BSS_TYPE_AP_BSS)</div><div class='add'>+		wl-&gt;ap_count++;</div><div class='add'>+	else</div><div class='add'>+		wl-&gt;sta_count++;</div><div class='ctx'> out:</div><div class='add'>+	wl1271_ps_elp_sleep(wl);</div><div class='add'>+out_unlock:</div><div class='ctx'> 	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wl_list_mutex);</div><div class='hunk'>@@ -1996,29 +2161,34 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __wl1271_op_remove_interface(struct wl1271 *wl,</div><div class='add'>+					 struct ieee80211_vif *vif,</div><div class='ctx'> 					 bool reset_tx_queues)</div><div class='ctx'> {</div><div class='del'>-	int ret, i;</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='add'>+	int i, ret;</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_MAC80211, "mac80211 remove interface");</div><div class='ctx'> </div><div class='add'>+	if (!test_and_clear_bit(WLVIF_FLAG_INITIALIZED, &amp;wlvif-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	wl-&gt;vif = NULL;</div><div class='add'>+</div><div class='ctx'> 	/* because of hardware recovery, we may get here twice */</div><div class='ctx'> 	if (wl-&gt;state != WL1271_STATE_ON)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	wl1271_info("down");</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;wl_list_mutex);</div><div class='del'>-	list_del(&amp;wl-&gt;list);</div><div class='del'>-	mutex_unlock(&amp;wl_list_mutex);</div><div class='del'>-</div><div class='ctx'> 	/* enable dyn ps just in case (if left on due to fw crash etc) */</div><div class='del'>-	if (wl-&gt;bss_type == BSS_TYPE_STA_BSS)</div><div class='del'>-		ieee80211_enable_dyn_ps(wl-&gt;vif);</div><div class='add'>+	if (wlvif-&gt;bss_type == BSS_TYPE_STA_BSS)</div><div class='add'>+		ieee80211_enable_dyn_ps(vif);</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;scan.state != WL1271_SCAN_STATE_IDLE) {</div><div class='add'>+	if (wl-&gt;scan.state != WL1271_SCAN_STATE_IDLE &amp;&amp;</div><div class='add'>+	    wl-&gt;scan_vif == vif) {</div><div class='ctx'> 		wl-&gt;scan.state = WL1271_SCAN_STATE_IDLE;</div><div class='ctx'> 		memset(wl-&gt;scan.scanned_ch, 0, sizeof(wl-&gt;scan.scanned_ch));</div><div class='add'>+		wl-&gt;scan_vif = NULL;</div><div class='ctx'> 		wl-&gt;scan.req = NULL;</div><div class='ctx'> 		ieee80211_scan_completed(wl-&gt;hw, true);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2029,13 +2199,17 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto deinit;</div><div class='ctx'> </div><div class='del'>-		if (wl-&gt;bss_type == BSS_TYPE_STA_BSS) {</div><div class='del'>-			ret = wl12xx_cmd_role_disable(wl, &amp;wl-&gt;dev_role_id);</div><div class='add'>+		if (wlvif-&gt;bss_type == BSS_TYPE_STA_BSS ||</div><div class='add'>+		    wlvif-&gt;bss_type == BSS_TYPE_IBSS) {</div><div class='add'>+			if (wl12xx_dev_role_started(wlvif))</div><div class='add'>+				wl12xx_stop_dev(wl, wlvif);</div><div class='add'>+</div><div class='add'>+			ret = wl12xx_cmd_role_disable(wl, &amp;wlvif-&gt;dev_role_id);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto deinit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = wl12xx_cmd_role_disable(wl, &amp;wl-&gt;role_id);</div><div class='add'>+		ret = wl12xx_cmd_role_disable(wl, &amp;wlvif-&gt;role_id);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto deinit;</div><div class='ctx'> </div><div class='hunk'>@@ -2043,120 +2217,93 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,</div><div class='ctx'> 	}</div><div class='ctx'> deinit:</div><div class='ctx'> 	/* clear all hlids (except system_hlid) */</div><div class='del'>-	wl-&gt;sta_hlid = WL12XX_INVALID_LINK_ID;</div><div class='del'>-	wl-&gt;dev_hlid = WL12XX_INVALID_LINK_ID;</div><div class='del'>-	wl-&gt;ap_bcast_hlid = WL12XX_INVALID_LINK_ID;</div><div class='del'>-	wl-&gt;ap_global_hlid = WL12XX_INVALID_LINK_ID;</div><div class='add'>+	wlvif-&gt;dev_hlid = WL12XX_INVALID_LINK_ID;</div><div class='add'>+</div><div class='add'>+	if (wlvif-&gt;bss_type == BSS_TYPE_STA_BSS ||</div><div class='add'>+	    wlvif-&gt;bss_type == BSS_TYPE_IBSS) {</div><div class='add'>+		wlvif-&gt;sta.hlid = WL12XX_INVALID_LINK_ID;</div><div class='add'>+		wl12xx_free_rate_policy(wl, &amp;wlvif-&gt;sta.basic_rate_idx);</div><div class='add'>+		wl12xx_free_rate_policy(wl, &amp;wlvif-&gt;sta.ap_rate_idx);</div><div class='add'>+		wl12xx_free_rate_policy(wl, &amp;wlvif-&gt;sta.p2p_rate_idx);</div><div class='add'>+	} else {</div><div class='add'>+		wlvif-&gt;ap.bcast_hlid = WL12XX_INVALID_LINK_ID;</div><div class='add'>+		wlvif-&gt;ap.global_hlid = WL12XX_INVALID_LINK_ID;</div><div class='add'>+		wl12xx_free_rate_policy(wl, &amp;wlvif-&gt;ap.mgmt_rate_idx);</div><div class='add'>+		wl12xx_free_rate_policy(wl, &amp;wlvif-&gt;ap.bcast_rate_idx);</div><div class='add'>+		for (i = 0; i &lt; CONF_TX_MAX_AC_COUNT; i++)</div><div class='add'>+			wl12xx_free_rate_policy(wl,</div><div class='add'>+						&amp;wlvif-&gt;ap.ucast_rate_idx[i]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * this must be before the cancel_work calls below, so that the work</div><div class='del'>-	 * functions don't perform further work.</div><div class='del'>-	 */</div><div class='del'>-	wl-&gt;state = WL1271_STATE_OFF;</div><div class='add'>+	wl12xx_tx_reset_wlvif(wl, wlvif);</div><div class='add'>+	wl1271_free_ap_keys(wl, wlvif);</div><div class='add'>+	if (wl-&gt;last_wlvif == wlvif)</div><div class='add'>+		wl-&gt;last_wlvif = NULL;</div><div class='add'>+	list_del(&amp;wlvif-&gt;list);</div><div class='add'>+	memset(wlvif-&gt;ap.sta_hlid_map, 0, sizeof(wlvif-&gt;ap.sta_hlid_map));</div><div class='add'>+	wlvif-&gt;role_id = WL12XX_INVALID_ROLE_ID;</div><div class='add'>+	wlvif-&gt;dev_role_id = WL12XX_INVALID_ROLE_ID;</div><div class='add'>+</div><div class='add'>+	if (wlvif-&gt;bss_type == BSS_TYPE_AP_BSS)</div><div class='add'>+		wl-&gt;ap_count--;</div><div class='add'>+	else</div><div class='add'>+		wl-&gt;sta_count--;</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	wl1271_disable_interrupts(wl);</div><div class='del'>-	wl1271_flush_deferred_work(wl);</div><div class='del'>-	cancel_delayed_work_sync(&amp;wl-&gt;scan_complete_work);</div><div class='del'>-	cancel_work_sync(&amp;wl-&gt;netstack_work);</div><div class='del'>-	cancel_work_sync(&amp;wl-&gt;tx_work);</div><div class='del'>-	del_timer_sync(&amp;wl-&gt;rx_streaming_timer);</div><div class='del'>-	cancel_work_sync(&amp;wl-&gt;rx_streaming_enable_work);</div><div class='del'>-	cancel_work_sync(&amp;wl-&gt;rx_streaming_disable_work);</div><div class='del'>-	cancel_delayed_work_sync(&amp;wl-&gt;pspoll_work);</div><div class='del'>-	cancel_delayed_work_sync(&amp;wl-&gt;elp_work);</div><div class='add'>+	del_timer_sync(&amp;wlvif-&gt;rx_streaming_timer);</div><div class='add'>+	cancel_work_sync(&amp;wlvif-&gt;rx_streaming_enable_work);</div><div class='add'>+	cancel_work_sync(&amp;wlvif-&gt;rx_streaming_disable_work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;wlvif-&gt;pspoll_work);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	/* let's notify MAC80211 about the remaining pending TX frames */</div><div class='del'>-	wl1271_tx_reset(wl, reset_tx_queues);</div><div class='del'>-	wl1271_power_off(wl);</div><div class='del'>-</div><div class='del'>-	memset(wl-&gt;bssid, 0, ETH_ALEN);</div><div class='del'>-	memset(wl-&gt;ssid, 0, IEEE80211_MAX_SSID_LEN + 1);</div><div class='del'>-	wl-&gt;ssid_len = 0;</div><div class='del'>-	wl-&gt;bss_type = MAX_BSS_TYPE;</div><div class='del'>-	wl-&gt;set_bss_type = MAX_BSS_TYPE;</div><div class='del'>-	wl-&gt;p2p = 0;</div><div class='del'>-	wl-&gt;band = IEEE80211_BAND_2GHZ;</div><div class='del'>-</div><div class='del'>-	wl-&gt;rx_counter = 0;</div><div class='del'>-	wl-&gt;psm_entry_retry = 0;</div><div class='del'>-	wl-&gt;power_level = WL1271_DEFAULT_POWER_LEVEL;</div><div class='del'>-	wl-&gt;tx_blocks_available = 0;</div><div class='del'>-	wl-&gt;tx_allocated_blocks = 0;</div><div class='del'>-	wl-&gt;tx_results_count = 0;</div><div class='del'>-	wl-&gt;tx_packets_count = 0;</div><div class='del'>-	wl-&gt;time_offset = 0;</div><div class='del'>-	wl-&gt;session_counter = 0;</div><div class='del'>-	wl-&gt;rate_set = CONF_TX_RATE_MASK_BASIC;</div><div class='del'>-	wl-&gt;bitrate_masks[IEEE80211_BAND_2GHZ] = wl-&gt;conf.tx.basic_rate;</div><div class='del'>-	wl-&gt;bitrate_masks[IEEE80211_BAND_5GHZ] = wl-&gt;conf.tx.basic_rate_5;</div><div class='del'>-	wl-&gt;vif = NULL;</div><div class='del'>-	wl-&gt;tx_spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;</div><div class='del'>-	wl1271_free_ap_keys(wl);</div><div class='del'>-	memset(wl-&gt;ap_hlid_map, 0, sizeof(wl-&gt;ap_hlid_map));</div><div class='del'>-	wl-&gt;ap_fw_ps_map = 0;</div><div class='del'>-	wl-&gt;ap_ps_map = 0;</div><div class='del'>-	wl-&gt;sched_scanning = false;</div><div class='del'>-	wl-&gt;role_id = WL12XX_INVALID_ROLE_ID;</div><div class='del'>-	wl-&gt;dev_role_id = WL12XX_INVALID_ROLE_ID;</div><div class='del'>-	memset(wl-&gt;roles_map, 0, sizeof(wl-&gt;roles_map));</div><div class='del'>-	memset(wl-&gt;links_map, 0, sizeof(wl-&gt;links_map));</div><div class='del'>-	memset(wl-&gt;roc_map, 0, sizeof(wl-&gt;roc_map));</div><div class='del'>-	wl-&gt;active_sta_count = 0;</div><div class='del'>-</div><div class='del'>-	/* The system link is always allocated */</div><div class='del'>-	__set_bit(WL12XX_SYSTEM_HLID, wl-&gt;links_map);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * this is performed after the cancel_work calls and the associated</div><div class='del'>-	 * mutex_lock, so that wl1271_op_add_interface does not accidentally</div><div class='del'>-	 * get executed before all these vars have been reset.</div><div class='del'>-	 */</div><div class='del'>-	wl-&gt;flags = 0;</div><div class='del'>-</div><div class='del'>-	wl-&gt;tx_blocks_freed = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_TX_QUEUES; i++) {</div><div class='del'>-		wl-&gt;tx_pkts_freed[i] = 0;</div><div class='del'>-		wl-&gt;tx_allocated_pkts[i] = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wl1271_debugfs_reset(wl);</div><div class='del'>-</div><div class='del'>-	kfree(wl-&gt;fw_status);</div><div class='del'>-	wl-&gt;fw_status = NULL;</div><div class='del'>-	kfree(wl-&gt;tx_res_if);</div><div class='del'>-	wl-&gt;tx_res_if = NULL;</div><div class='del'>-	kfree(wl-&gt;target_mem_map);</div><div class='del'>-	wl-&gt;target_mem_map = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void wl1271_op_remove_interface(struct ieee80211_hw *hw,</div><div class='ctx'> 				       struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl = hw-&gt;priv;</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='add'>+	struct wl12xx_vif *iter;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (wl-&gt;state == WL1271_STATE_OFF ||</div><div class='add'>+	    !test_bit(WLVIF_FLAG_INITIALIZED, &amp;wlvif-&gt;flags))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * wl-&gt;vif can be null here if someone shuts down the interface</div><div class='ctx'> 	 * just when hardware recovery has been started.</div><div class='ctx'> 	 */</div><div class='del'>-	if (wl-&gt;vif) {</div><div class='del'>-		WARN_ON(wl-&gt;vif != vif);</div><div class='del'>-		__wl1271_op_remove_interface(wl, true);</div><div class='del'>-	}</div><div class='add'>+	wl12xx_for_each_wlvif(wl, iter) {</div><div class='add'>+		if (iter != wlvif)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='add'>+		__wl1271_op_remove_interface(wl, vif, true);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	WARN_ON(iter != wlvif);</div><div class='add'>+out:</div><div class='ctx'> 	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='ctx'> 	cancel_work_sync(&amp;wl-&gt;recovery_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_join(struct wl1271 *wl, bool set_assoc)</div><div class='add'>+static int wl12xx_op_change_interface(struct ieee80211_hw *hw,</div><div class='add'>+				      struct ieee80211_vif *vif,</div><div class='add'>+				      enum nl80211_iftype new_type, bool p2p)</div><div class='add'>+{</div><div class='add'>+	wl1271_op_remove_interface(hw, vif);</div><div class='add'>+</div><div class='add'>+	vif-&gt;type = ieee80211_iftype_p2p(new_type, p2p);</div><div class='add'>+	vif-&gt;p2p = p2p;</div><div class='add'>+	return wl1271_op_add_interface(hw, vif);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wl1271_join(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			  bool set_assoc)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	bool is_ibss = (wl-&gt;bss_type == BSS_TYPE_IBSS);</div><div class='add'>+	bool is_ibss = (wlvif-&gt;bss_type == BSS_TYPE_IBSS);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * One of the side effects of the JOIN command is that is clears</div><div class='hunk'>@@ -2167,20 +2314,20 @@ static int wl1271_join(struct wl1271 *wl, bool set_assoc)</div><div class='ctx'> 	 * Keep the below message for now, unless it starts bothering</div><div class='ctx'> 	 * users who really like to roam a lot :)</div><div class='ctx'> 	 */</div><div class='del'>-	if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &amp;wl-&gt;flags))</div><div class='add'>+	if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &amp;wlvif-&gt;flags))</div><div class='ctx'> 		wl1271_info("JOIN while associated.");</div><div class='ctx'> </div><div class='ctx'> 	if (set_assoc)</div><div class='del'>-		set_bit(WL1271_FLAG_STA_ASSOCIATED, &amp;wl-&gt;flags);</div><div class='add'>+		set_bit(WLVIF_FLAG_STA_ASSOCIATED, &amp;wlvif-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	if (is_ibss)</div><div class='del'>-		ret = wl12xx_cmd_role_start_ibss(wl);</div><div class='add'>+		ret = wl12xx_cmd_role_start_ibss(wl, wlvif);</div><div class='ctx'> 	else</div><div class='del'>-		ret = wl12xx_cmd_role_start_sta(wl);</div><div class='add'>+		ret = wl12xx_cmd_role_start_sta(wl, wlvif);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(WL1271_FLAG_STA_ASSOCIATED, &amp;wl-&gt;flags))</div><div class='add'>+	if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &amp;wlvif-&gt;flags))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2189,19 +2336,20 @@ static int wl1271_join(struct wl1271 *wl, bool set_assoc)</div><div class='ctx'> 	 * the join. The acx_aid starts the keep-alive process, and the order</div><div class='ctx'> 	 * of the commands below is relevant.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = wl1271_acx_keep_alive_mode(wl, true);</div><div class='add'>+	ret = wl1271_acx_keep_alive_mode(wl, wlvif, true);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_acx_aid(wl, wl-&gt;aid);</div><div class='add'>+	ret = wl1271_acx_aid(wl, wlvif, wlvif-&gt;aid);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_cmd_build_klv_null_data(wl);</div><div class='add'>+	ret = wl12xx_cmd_build_klv_null_data(wl, wlvif);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_acx_keep_alive_config(wl, CMD_TEMPL_KLV_IDX_NULL_DATA,</div><div class='add'>+	ret = wl1271_acx_keep_alive_config(wl, wlvif,</div><div class='add'>+					   CMD_TEMPL_KLV_IDX_NULL_DATA,</div><div class='ctx'> 					   ACX_KEEP_ALIVE_TPL_VALID);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -2210,72 +2358,63 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_unjoin(struct wl1271 *wl)</div><div class='add'>+static int wl1271_unjoin(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (test_and_clear_bit(WL1271_FLAG_CS_PROGRESS, &amp;wl-&gt;flags)) {</div><div class='add'>+	if (test_and_clear_bit(WLVIF_FLAG_CS_PROGRESS, &amp;wlvif-&gt;flags)) {</div><div class='add'>+		struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='add'>+</div><div class='ctx'> 		wl12xx_cmd_stop_channel_switch(wl);</div><div class='del'>-		ieee80211_chswitch_done(wl-&gt;vif, false);</div><div class='add'>+		ieee80211_chswitch_done(vif, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* to stop listening to a channel, we disconnect */</div><div class='del'>-	ret = wl12xx_cmd_role_stop_sta(wl);</div><div class='add'>+	ret = wl12xx_cmd_role_stop_sta(wl, wlvif);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	memset(wl-&gt;bssid, 0, ETH_ALEN);</div><div class='del'>-</div><div class='ctx'> 	/* reset TX security counters on a clean disconnect */</div><div class='del'>-	wl-&gt;tx_security_last_seq_lsb = 0;</div><div class='del'>-	wl-&gt;tx_security_seq = 0;</div><div class='add'>+	wlvif-&gt;tx_security_last_seq_lsb = 0;</div><div class='add'>+	wlvif-&gt;tx_security_seq = 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wl1271_set_band_rate(struct wl1271 *wl)</div><div class='add'>+static void wl1271_set_band_rate(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='del'>-	wl-&gt;basic_rate_set = wl-&gt;bitrate_masks[wl-&gt;band];</div><div class='del'>-	wl-&gt;rate_set = wl-&gt;basic_rate_set;</div><div class='add'>+	wlvif-&gt;basic_rate_set = wlvif-&gt;bitrate_masks[wlvif-&gt;band];</div><div class='add'>+	wlvif-&gt;rate_set = wlvif-&gt;basic_rate_set;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool wl12xx_is_roc(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-	u8 role_id;</div><div class='del'>-</div><div class='del'>-	role_id = find_first_bit(wl-&gt;roc_map, WL12XX_MAX_ROLES);</div><div class='del'>-	if (role_id &gt;= WL12XX_MAX_ROLES)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int wl1271_sta_handle_idle(struct wl1271 *wl, bool idle)</div><div class='add'>+static int wl1271_sta_handle_idle(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+				  bool idle)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	bool cur_idle = !test_bit(WLVIF_FLAG_IN_USE, &amp;wlvif-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if (idle == cur_idle)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (idle) {</div><div class='ctx'> 		/* no need to croc if we weren't busy (e.g. during boot) */</div><div class='del'>-		if (wl12xx_is_roc(wl)) {</div><div class='del'>-			ret = wl12xx_croc(wl, wl-&gt;dev_role_id);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				goto out;</div><div class='del'>-</div><div class='del'>-			ret = wl12xx_cmd_role_stop_dev(wl);</div><div class='add'>+		if (wl12xx_dev_role_started(wlvif)) {</div><div class='add'>+			ret = wl12xx_stop_dev(wl, wlvif);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='del'>-		wl-&gt;rate_set = wl1271_tx_min_rate_get(wl, wl-&gt;basic_rate_set);</div><div class='del'>-		ret = wl1271_acx_sta_rate_policies(wl);</div><div class='add'>+		wlvif-&gt;rate_set =</div><div class='add'>+			wl1271_tx_min_rate_get(wl, wlvif-&gt;basic_rate_set);</div><div class='add'>+		ret = wl1271_acx_sta_rate_policies(wl, wlvif);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		ret = wl1271_acx_keep_alive_config(</div><div class='del'>-			wl, CMD_TEMPL_KLV_IDX_NULL_DATA,</div><div class='add'>+			wl, wlvif, CMD_TEMPL_KLV_IDX_NULL_DATA,</div><div class='ctx'> 			ACX_KEEP_ALIVE_TPL_INVALID);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='del'>-		set_bit(WL1271_FLAG_IDLE, &amp;wl-&gt;flags);</div><div class='add'>+		clear_bit(WLVIF_FLAG_IN_USE, &amp;wlvif-&gt;flags);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* The current firmware only supports sched_scan in idle */</div><div class='ctx'> 		if (wl-&gt;sched_scanning) {</div><div class='hunk'>@@ -2283,75 +2422,32 @@ static int wl1271_sta_handle_idle(struct wl1271 *wl, bool idle)</div><div class='ctx'> 			ieee80211_sched_scan_stopped(wl-&gt;hw);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = wl12xx_cmd_role_start_dev(wl);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		ret = wl12xx_roc(wl, wl-&gt;dev_role_id);</div><div class='add'>+		ret = wl12xx_start_dev(wl, wlvif);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='del'>-		clear_bit(WL1271_FLAG_IDLE, &amp;wl-&gt;flags);</div><div class='add'>+		set_bit(WLVIF_FLAG_IN_USE, &amp;wlvif-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+static int wl12xx_config_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			     struct ieee80211_conf *conf, u32 changed)</div><div class='ctx'> {</div><div class='del'>-	struct wl1271 *wl = hw-&gt;priv;</div><div class='del'>-	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</div><div class='del'>-	int channel, ret = 0;</div><div class='del'>-	bool is_ap;</div><div class='add'>+	bool is_ap = (wlvif-&gt;bss_type == BSS_TYPE_AP_BSS);</div><div class='add'>+	int channel, ret;</div><div class='ctx'> </div><div class='ctx'> 	channel = ieee80211_frequency_to_channel(conf-&gt;channel-&gt;center_freq);</div><div class='ctx'> </div><div class='del'>-	wl1271_debug(DEBUG_MAC80211, "mac80211 config ch %d psm %s power %d %s"</div><div class='del'>-		     " changed 0x%x",</div><div class='del'>-		     channel,</div><div class='del'>-		     conf-&gt;flags &amp; IEEE80211_CONF_PS ? "on" : "off",</div><div class='del'>-		     conf-&gt;power_level,</div><div class='del'>-		     conf-&gt;flags &amp; IEEE80211_CONF_IDLE ? "idle" : "in use",</div><div class='del'>-			 changed);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * mac80211 will go to idle nearly immediately after transmitting some</div><div class='del'>-	 * frames, such as the deauth. To make sure those frames reach the air,</div><div class='del'>-	 * wait here until the TX queue is fully flushed.</div><div class='del'>-	 */</div><div class='del'>-	if ((changed &amp; IEEE80211_CONF_CHANGE_IDLE) &amp;&amp;</div><div class='del'>-	    (conf-&gt;flags &amp; IEEE80211_CONF_IDLE))</div><div class='del'>-		wl1271_tx_flush(wl);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;wl-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (unlikely(wl-&gt;state == WL1271_STATE_OFF)) {</div><div class='del'>-		/* we support configuring the channel and band while off */</div><div class='del'>-		if ((changed &amp; IEEE80211_CONF_CHANGE_CHANNEL)) {</div><div class='del'>-			wl-&gt;band = conf-&gt;channel-&gt;band;</div><div class='del'>-			wl-&gt;channel = channel;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((changed &amp; IEEE80211_CONF_CHANGE_POWER))</div><div class='del'>-			wl-&gt;power_level = conf-&gt;power_level;</div><div class='del'>-</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	is_ap = (wl-&gt;bss_type == BSS_TYPE_AP_BSS);</div><div class='del'>-</div><div class='del'>-	ret = wl1271_ps_elp_wakeup(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	/* if the channel changes while joined, join again */</div><div class='ctx'> 	if (changed &amp; IEEE80211_CONF_CHANGE_CHANNEL &amp;&amp;</div><div class='del'>-	    ((wl-&gt;band != conf-&gt;channel-&gt;band) ||</div><div class='del'>-	     (wl-&gt;channel != channel))) {</div><div class='add'>+	    ((wlvif-&gt;band != conf-&gt;channel-&gt;band) ||</div><div class='add'>+	     (wlvif-&gt;channel != channel))) {</div><div class='ctx'> 		/* send all pending packets */</div><div class='ctx'> 		wl1271_tx_work_locked(wl);</div><div class='del'>-		wl-&gt;band = conf-&gt;channel-&gt;band;</div><div class='del'>-		wl-&gt;channel = channel;</div><div class='add'>+		wlvif-&gt;band = conf-&gt;channel-&gt;band;</div><div class='add'>+		wlvif-&gt;channel = channel;</div><div class='ctx'> </div><div class='ctx'> 		if (!is_ap) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -2360,24 +2456,27 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 			 * possible rate for the band as a fixed rate for</div><div class='ctx'> 			 * association frames and other control messages.</div><div class='ctx'> 			 */</div><div class='del'>-			if (!test_bit(WL1271_FLAG_STA_ASSOCIATED, &amp;wl-&gt;flags))</div><div class='del'>-				wl1271_set_band_rate(wl);</div><div class='add'>+			if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &amp;wlvif-&gt;flags))</div><div class='add'>+				wl1271_set_band_rate(wl, wlvif);</div><div class='ctx'> </div><div class='del'>-			wl-&gt;basic_rate =</div><div class='del'>-				wl1271_tx_min_rate_get(wl, wl-&gt;basic_rate_set);</div><div class='del'>-			ret = wl1271_acx_sta_rate_policies(wl);</div><div class='add'>+			wlvif-&gt;basic_rate =</div><div class='add'>+				wl1271_tx_min_rate_get(wl,</div><div class='add'>+						       wlvif-&gt;basic_rate_set);</div><div class='add'>+			ret = wl1271_acx_sta_rate_policies(wl, wlvif);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				wl1271_warning("rate policy for channel "</div><div class='ctx'> 					       "failed %d", ret);</div><div class='ctx'> </div><div class='del'>-			if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &amp;wl-&gt;flags)) {</div><div class='del'>-				if (wl12xx_is_roc(wl)) {</div><div class='add'>+			if (test_bit(WLVIF_FLAG_STA_ASSOCIATED,</div><div class='add'>+				     &amp;wlvif-&gt;flags)) {</div><div class='add'>+				if (wl12xx_dev_role_started(wlvif)) {</div><div class='ctx'> 					/* roaming */</div><div class='del'>-					ret = wl12xx_croc(wl, wl-&gt;dev_role_id);</div><div class='add'>+					ret = wl12xx_croc(wl,</div><div class='add'>+							  wlvif-&gt;dev_role_id);</div><div class='ctx'> 					if (ret &lt; 0)</div><div class='del'>-						goto out_sleep;</div><div class='add'>+						return ret;</div><div class='ctx'> 				}</div><div class='del'>-				ret = wl1271_join(wl, false);</div><div class='add'>+				ret = wl1271_join(wl, wlvif, false);</div><div class='ctx'> 				if (ret &lt; 0)</div><div class='ctx'> 					wl1271_warning("cmd join on channel "</div><div class='ctx'> 						       "failed %d", ret);</div><div class='hunk'>@@ -2387,66 +2486,114 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)</div><div class='ctx'> 				 * not idle. otherwise, CROC will be called</div><div class='ctx'> 				 * anyway.</div><div class='ctx'> 				 */</div><div class='del'>-				if (wl12xx_is_roc(wl) &amp;&amp;</div><div class='add'>+				if (wl12xx_dev_role_started(wlvif) &amp;&amp;</div><div class='ctx'> 				    !(conf-&gt;flags &amp; IEEE80211_CONF_IDLE)) {</div><div class='del'>-					ret = wl12xx_croc(wl, wl-&gt;dev_role_id);</div><div class='add'>+					ret = wl12xx_stop_dev(wl, wlvif);</div><div class='ctx'> 					if (ret &lt; 0)</div><div class='del'>-						goto out_sleep;</div><div class='add'>+						return ret;</div><div class='ctx'> </div><div class='del'>-					ret = wl12xx_roc(wl, wl-&gt;dev_role_id);</div><div class='add'>+					ret = wl12xx_start_dev(wl, wlvif);</div><div class='ctx'> 					if (ret &lt; 0)</div><div class='del'>-						wl1271_warning("roc failed %d",</div><div class='del'>-							       ret);</div><div class='add'>+						return ret;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (changed &amp; IEEE80211_CONF_CHANGE_IDLE &amp;&amp; !is_ap) {</div><div class='del'>-		ret = wl1271_sta_handle_idle(wl,</div><div class='del'>-					conf-&gt;flags &amp; IEEE80211_CONF_IDLE);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			wl1271_warning("idle mode change failed %d", ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if mac80211 changes the PSM mode, make sure the mode is not</div><div class='ctx'> 	 * incorrectly changed after the pspoll failure active window.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (changed &amp; IEEE80211_CONF_CHANGE_PS)</div><div class='del'>-		clear_bit(WL1271_FLAG_PSPOLL_FAILURE, &amp;wl-&gt;flags);</div><div class='add'>+		clear_bit(WLVIF_FLAG_PSPOLL_FAILURE, &amp;wlvif-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	if (conf-&gt;flags &amp; IEEE80211_CONF_PS &amp;&amp;</div><div class='del'>-	    !test_bit(WL1271_FLAG_PSM_REQUESTED, &amp;wl-&gt;flags)) {</div><div class='del'>-		set_bit(WL1271_FLAG_PSM_REQUESTED, &amp;wl-&gt;flags);</div><div class='add'>+	    !test_bit(WLVIF_FLAG_PSM_REQUESTED, &amp;wlvif-&gt;flags)) {</div><div class='add'>+		set_bit(WLVIF_FLAG_PSM_REQUESTED, &amp;wlvif-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We enter PSM only if we're already associated.</div><div class='ctx'> 		 * If we're not, we'll enter it when joining an SSID,</div><div class='ctx'> 		 * through the bss_info_changed() hook.</div><div class='ctx'> 		 */</div><div class='del'>-		if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &amp;wl-&gt;flags)) {</div><div class='add'>+		if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &amp;wlvif-&gt;flags)) {</div><div class='ctx'> 			wl1271_debug(DEBUG_PSM, "psm enabled");</div><div class='del'>-			ret = wl1271_ps_set_mode(wl, STATION_POWER_SAVE_MODE,</div><div class='del'>-						 wl-&gt;basic_rate, true);</div><div class='add'>+			ret = wl1271_ps_set_mode(wl, wlvif,</div><div class='add'>+						 STATION_POWER_SAVE_MODE,</div><div class='add'>+						 wlvif-&gt;basic_rate, true);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (!(conf-&gt;flags &amp; IEEE80211_CONF_PS) &amp;&amp;</div><div class='del'>-		   test_bit(WL1271_FLAG_PSM_REQUESTED, &amp;wl-&gt;flags)) {</div><div class='add'>+		   test_bit(WLVIF_FLAG_PSM_REQUESTED, &amp;wlvif-&gt;flags)) {</div><div class='ctx'> 		wl1271_debug(DEBUG_PSM, "psm disabled");</div><div class='ctx'> </div><div class='del'>-		clear_bit(WL1271_FLAG_PSM_REQUESTED, &amp;wl-&gt;flags);</div><div class='add'>+		clear_bit(WLVIF_FLAG_PSM_REQUESTED, &amp;wlvif-&gt;flags);</div><div class='ctx'> </div><div class='del'>-		if (test_bit(WL1271_FLAG_PSM, &amp;wl-&gt;flags))</div><div class='del'>-			ret = wl1271_ps_set_mode(wl, STATION_ACTIVE_MODE,</div><div class='del'>-						 wl-&gt;basic_rate, true);</div><div class='add'>+		if (test_bit(WLVIF_FLAG_PSM, &amp;wlvif-&gt;flags))</div><div class='add'>+			ret = wl1271_ps_set_mode(wl, wlvif,</div><div class='add'>+						 STATION_ACTIVE_MODE,</div><div class='add'>+						 wlvif-&gt;basic_rate, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (conf-&gt;power_level != wl-&gt;power_level) {</div><div class='del'>-		ret = wl1271_acx_tx_power(wl, conf-&gt;power_level);</div><div class='add'>+	if (conf-&gt;power_level != wlvif-&gt;power_level) {</div><div class='add'>+		ret = wl1271_acx_tx_power(wl, wlvif, conf-&gt;power_level);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto out_sleep;</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		wlvif-&gt;power_level = conf-&gt;power_level;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)</div><div class='add'>+{</div><div class='add'>+	struct wl1271 *wl = hw-&gt;priv;</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='add'>+	struct ieee80211_conf *conf = &amp;hw-&gt;conf;</div><div class='add'>+	int channel, ret = 0;</div><div class='add'>+</div><div class='add'>+	channel = ieee80211_frequency_to_channel(conf-&gt;channel-&gt;center_freq);</div><div class='add'>+</div><div class='add'>+	wl1271_debug(DEBUG_MAC80211, "mac80211 config ch %d psm %s power %d %s"</div><div class='add'>+		     " changed 0x%x",</div><div class='add'>+		     channel,</div><div class='add'>+		     conf-&gt;flags &amp; IEEE80211_CONF_PS ? "on" : "off",</div><div class='add'>+		     conf-&gt;power_level,</div><div class='add'>+		     conf-&gt;flags &amp; IEEE80211_CONF_IDLE ? "idle" : "in use",</div><div class='add'>+			 changed);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * mac80211 will go to idle nearly immediately after transmitting some</div><div class='add'>+	 * frames, such as the deauth. To make sure those frames reach the air,</div><div class='add'>+	 * wait here until the TX queue is fully flushed.</div><div class='add'>+	 */</div><div class='add'>+	if ((changed &amp; IEEE80211_CONF_CHANGE_IDLE) &amp;&amp;</div><div class='add'>+	    (conf-&gt;flags &amp; IEEE80211_CONF_IDLE))</div><div class='add'>+		wl1271_tx_flush(wl);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;wl-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* we support configuring the channel and band even while off */</div><div class='add'>+	if (changed &amp; IEEE80211_CONF_CHANGE_CHANNEL) {</div><div class='add'>+		wl-&gt;band = conf-&gt;channel-&gt;band;</div><div class='add'>+		wl-&gt;channel = channel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (changed &amp; IEEE80211_CONF_CHANGE_POWER)</div><div class='ctx'> 		wl-&gt;power_level = conf-&gt;power_level;</div><div class='add'>+</div><div class='add'>+	if (unlikely(wl-&gt;state == WL1271_STATE_OFF))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = wl1271_ps_elp_wakeup(wl);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* configure each interface */</div><div class='add'>+	wl12xx_for_each_wlvif(wl, wlvif) {</div><div class='add'>+		ret = wl12xx_config_vif(wl, wlvif, conf, changed);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out_sleep;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_sleep:</div><div class='hunk'>@@ -2509,6 +2656,8 @@ static void wl1271_op_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_filter_params *fp = (void *)(unsigned long)multicast;</div><div class='ctx'> 	struct wl1271 *wl = hw-&gt;priv;</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='add'>+</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_MAC80211, "mac80211 configure filter changed %x"</div><div class='hunk'>@@ -2526,15 +2675,20 @@ static void wl1271_op_configure_filter(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;bss_type != BSS_TYPE_AP_BSS) {</div><div class='del'>-		if (*total &amp; FIF_ALLMULTI)</div><div class='del'>-			ret = wl1271_acx_group_address_tbl(wl, false, NULL, 0);</div><div class='del'>-		else if (fp)</div><div class='del'>-			ret = wl1271_acx_group_address_tbl(wl, fp-&gt;enabled,</div><div class='del'>-							   fp-&gt;mc_list,</div><div class='del'>-							   fp-&gt;mc_list_length);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out_sleep;</div><div class='add'>+	wl12xx_for_each_wlvif(wl, wlvif) {</div><div class='add'>+		if (wlvif-&gt;bss_type != BSS_TYPE_AP_BSS) {</div><div class='add'>+			if (*total &amp; FIF_ALLMULTI)</div><div class='add'>+				ret = wl1271_acx_group_address_tbl(wl, wlvif,</div><div class='add'>+								   false,</div><div class='add'>+								   NULL, 0);</div><div class='add'>+			else if (fp)</div><div class='add'>+				ret = wl1271_acx_group_address_tbl(wl, wlvif,</div><div class='add'>+							fp-&gt;enabled,</div><div class='add'>+							fp-&gt;mc_list,</div><div class='add'>+							fp-&gt;mc_list_length);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				goto out_sleep;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2551,9 +2705,10 @@ out:</div><div class='ctx'> 	kfree(fp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_record_ap_key(struct wl1271 *wl, u8 id, u8 key_type,</div><div class='del'>-			u8 key_size, const u8 *key, u8 hlid, u32 tx_seq_32,</div><div class='del'>-			u16 tx_seq_16)</div><div class='add'>+static int wl1271_record_ap_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+				u8 id, u8 key_type, u8 key_size,</div><div class='add'>+				const u8 *key, u8 hlid, u32 tx_seq_32,</div><div class='add'>+				u16 tx_seq_16)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_ap_key *ap_key;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -2568,10 +2723,10 @@ static int wl1271_record_ap_key(struct wl1271 *wl, u8 id, u8 key_type,</div><div class='ctx'> 	 * an existing key.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; MAX_NUM_KEYS; i++) {</div><div class='del'>-		if (wl-&gt;recorded_ap_keys[i] == NULL)</div><div class='add'>+		if (wlvif-&gt;ap.recorded_keys[i] == NULL)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (wl-&gt;recorded_ap_keys[i]-&gt;id == id) {</div><div class='add'>+		if (wlvif-&gt;ap.recorded_keys[i]-&gt;id == id) {</div><div class='ctx'> 			wl1271_warning("trying to record key replacement");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2592,21 +2747,21 @@ static int wl1271_record_ap_key(struct wl1271 *wl, u8 id, u8 key_type,</div><div class='ctx'> 	ap_key-&gt;tx_seq_32 = tx_seq_32;</div><div class='ctx'> 	ap_key-&gt;tx_seq_16 = tx_seq_16;</div><div class='ctx'> </div><div class='del'>-	wl-&gt;recorded_ap_keys[i] = ap_key;</div><div class='add'>+	wlvif-&gt;ap.recorded_keys[i] = ap_key;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wl1271_free_ap_keys(struct wl1271 *wl)</div><div class='add'>+static void wl1271_free_ap_keys(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MAX_NUM_KEYS; i++) {</div><div class='del'>-		kfree(wl-&gt;recorded_ap_keys[i]);</div><div class='del'>-		wl-&gt;recorded_ap_keys[i] = NULL;</div><div class='add'>+		kfree(wlvif-&gt;ap.recorded_keys[i]);</div><div class='add'>+		wlvif-&gt;ap.recorded_keys[i] = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_ap_init_hwenc(struct wl1271 *wl)</div><div class='add'>+static int wl1271_ap_init_hwenc(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret = 0;</div><div class='ctx'> 	struct wl1271_ap_key *key;</div><div class='hunk'>@@ -2614,15 +2769,15 @@ static int wl1271_ap_init_hwenc(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MAX_NUM_KEYS; i++) {</div><div class='ctx'> 		u8 hlid;</div><div class='del'>-		if (wl-&gt;recorded_ap_keys[i] == NULL)</div><div class='add'>+		if (wlvif-&gt;ap.recorded_keys[i] == NULL)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		key = wl-&gt;recorded_ap_keys[i];</div><div class='add'>+		key = wlvif-&gt;ap.recorded_keys[i];</div><div class='ctx'> 		hlid = key-&gt;hlid;</div><div class='ctx'> 		if (hlid == WL12XX_INVALID_LINK_ID)</div><div class='del'>-			hlid = wl-&gt;ap_bcast_hlid;</div><div class='add'>+			hlid = wlvif-&gt;ap.bcast_hlid;</div><div class='ctx'> </div><div class='del'>-		ret = wl1271_cmd_set_ap_key(wl, KEY_ADD_OR_REPLACE,</div><div class='add'>+		ret = wl1271_cmd_set_ap_key(wl, wlvif, KEY_ADD_OR_REPLACE,</div><div class='ctx'> 					    key-&gt;id, key-&gt;key_type,</div><div class='ctx'> 					    key-&gt;key_size, key-&gt;key,</div><div class='ctx'> 					    hlid, key-&gt;tx_seq_32,</div><div class='hunk'>@@ -2635,23 +2790,24 @@ static int wl1271_ap_init_hwenc(struct wl1271 *wl)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (wep_key_added) {</div><div class='del'>-		ret = wl12xx_cmd_set_default_wep_key(wl, wl-&gt;default_key,</div><div class='del'>-						     wl-&gt;ap_bcast_hlid);</div><div class='add'>+		ret = wl12xx_cmd_set_default_wep_key(wl, wlvif-&gt;default_key,</div><div class='add'>+						     wlvif-&gt;ap.bcast_hlid);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	wl1271_free_ap_keys(wl);</div><div class='add'>+	wl1271_free_ap_keys(wl, wlvif);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_set_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,</div><div class='add'>+static int wl1271_set_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+		       u16 action, u8 id, u8 key_type,</div><div class='ctx'> 		       u8 key_size, const u8 *key, u32 tx_seq_32,</div><div class='ctx'> 		       u16 tx_seq_16, struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	bool is_ap = (wl-&gt;bss_type == BSS_TYPE_AP_BSS);</div><div class='add'>+	bool is_ap = (wlvif-&gt;bss_type == BSS_TYPE_AP_BSS);</div><div class='ctx'> </div><div class='ctx'> 	if (is_ap) {</div><div class='ctx'> 		struct wl1271_station *wl_sta;</div><div class='hunk'>@@ -2661,10 +2817,10 @@ static int wl1271_set_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,</div><div class='ctx'> 			wl_sta = (struct wl1271_station *)sta-&gt;drv_priv;</div><div class='ctx'> 			hlid = wl_sta-&gt;hlid;</div><div class='ctx'> 		} else {</div><div class='del'>-			hlid = wl-&gt;ap_bcast_hlid;</div><div class='add'>+			hlid = wlvif-&gt;ap.bcast_hlid;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!test_bit(WL1271_FLAG_AP_STARTED, &amp;wl-&gt;flags)) {</div><div class='add'>+		if (!test_bit(WLVIF_FLAG_AP_STARTED, &amp;wlvif-&gt;flags)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * We do not support removing keys after AP shutdown.</div><div class='ctx'> 			 * Pretend we do to make mac80211 happy.</div><div class='hunk'>@@ -2672,12 +2828,12 @@ static int wl1271_set_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,</div><div class='ctx'> 			if (action != KEY_ADD_OR_REPLACE)</div><div class='ctx'> 				return 0;</div><div class='ctx'> </div><div class='del'>-			ret = wl1271_record_ap_key(wl, id,</div><div class='add'>+			ret = wl1271_record_ap_key(wl, wlvif, id,</div><div class='ctx'> 					     key_type, key_size,</div><div class='ctx'> 					     key, hlid, tx_seq_32,</div><div class='ctx'> 					     tx_seq_16);</div><div class='ctx'> 		} else {</div><div class='del'>-			ret = wl1271_cmd_set_ap_key(wl, action,</div><div class='add'>+			ret = wl1271_cmd_set_ap_key(wl, wlvif, action,</div><div class='ctx'> 					     id, key_type, key_size,</div><div class='ctx'> 					     key, hlid, tx_seq_32,</div><div class='ctx'> 					     tx_seq_16);</div><div class='hunk'>@@ -2718,10 +2874,10 @@ static int wl1271_set_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,</div><div class='ctx'> </div><div class='ctx'> 		/* don't remove key if hlid was already deleted */</div><div class='ctx'> 		if (action == KEY_REMOVE &amp;&amp;</div><div class='del'>-		    wl-&gt;sta_hlid == WL12XX_INVALID_LINK_ID)</div><div class='add'>+		    wlvif-&gt;sta.hlid == WL12XX_INVALID_LINK_ID)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		ret = wl1271_cmd_set_sta_key(wl, action,</div><div class='add'>+		ret = wl1271_cmd_set_sta_key(wl, wlvif, action,</div><div class='ctx'> 					     id, key_type, key_size,</div><div class='ctx'> 					     key, addr, tx_seq_32,</div><div class='ctx'> 					     tx_seq_16);</div><div class='hunk'>@@ -2731,8 +2887,8 @@ static int wl1271_set_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,</div><div class='ctx'> 		/* the default WEP key needs to be configured at least once */</div><div class='ctx'> 		if (key_type == KEY_WEP) {</div><div class='ctx'> 			ret = wl12xx_cmd_set_default_wep_key(wl,</div><div class='del'>-							     wl-&gt;default_key,</div><div class='del'>-							     wl-&gt;sta_hlid);</div><div class='add'>+							wlvif-&gt;default_key,</div><div class='add'>+							wlvif-&gt;sta.hlid);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				return ret;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2747,6 +2903,7 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 			     struct ieee80211_key_conf *key_conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl = hw-&gt;priv;</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 tx_seq_32 = 0;</div><div class='ctx'> 	u16 tx_seq_16 = 0;</div><div class='hunk'>@@ -2782,20 +2939,20 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 		key_type = KEY_TKIP;</div><div class='ctx'> </div><div class='ctx'> 		key_conf-&gt;hw_key_idx = key_conf-&gt;keyidx;</div><div class='del'>-		tx_seq_32 = WL1271_TX_SECURITY_HI32(wl-&gt;tx_security_seq);</div><div class='del'>-		tx_seq_16 = WL1271_TX_SECURITY_LO16(wl-&gt;tx_security_seq);</div><div class='add'>+		tx_seq_32 = WL1271_TX_SECURITY_HI32(wlvif-&gt;tx_security_seq);</div><div class='add'>+		tx_seq_16 = WL1271_TX_SECURITY_LO16(wlvif-&gt;tx_security_seq);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WLAN_CIPHER_SUITE_CCMP:</div><div class='ctx'> 		key_type = KEY_AES;</div><div class='ctx'> </div><div class='del'>-		key_conf-&gt;flags |= IEEE80211_KEY_FLAG_GENERATE_IV;</div><div class='del'>-		tx_seq_32 = WL1271_TX_SECURITY_HI32(wl-&gt;tx_security_seq);</div><div class='del'>-		tx_seq_16 = WL1271_TX_SECURITY_LO16(wl-&gt;tx_security_seq);</div><div class='add'>+		key_conf-&gt;flags |= IEEE80211_KEY_FLAG_PUT_IV_SPACE;</div><div class='add'>+		tx_seq_32 = WL1271_TX_SECURITY_HI32(wlvif-&gt;tx_security_seq);</div><div class='add'>+		tx_seq_16 = WL1271_TX_SECURITY_LO16(wlvif-&gt;tx_security_seq);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WL1271_CIPHER_SUITE_GEM:</div><div class='ctx'> 		key_type = KEY_GEM;</div><div class='del'>-		tx_seq_32 = WL1271_TX_SECURITY_HI32(wl-&gt;tx_security_seq);</div><div class='del'>-		tx_seq_16 = WL1271_TX_SECURITY_LO16(wl-&gt;tx_security_seq);</div><div class='add'>+		tx_seq_32 = WL1271_TX_SECURITY_HI32(wlvif-&gt;tx_security_seq);</div><div class='add'>+		tx_seq_16 = WL1271_TX_SECURITY_LO16(wlvif-&gt;tx_security_seq);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		wl1271_error("Unknown key algo 0x%x", key_conf-&gt;cipher);</div><div class='hunk'>@@ -2806,7 +2963,7 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SET_KEY:</div><div class='del'>-		ret = wl1271_set_key(wl, KEY_ADD_OR_REPLACE,</div><div class='add'>+		ret = wl1271_set_key(wl, wlvif, KEY_ADD_OR_REPLACE,</div><div class='ctx'> 				 key_conf-&gt;keyidx, key_type,</div><div class='ctx'> 				 key_conf-&gt;keylen, key_conf-&gt;key,</div><div class='ctx'> 				 tx_seq_32, tx_seq_16, sta);</div><div class='hunk'>@@ -2817,7 +2974,7 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case DISABLE_KEY:</div><div class='del'>-		ret = wl1271_set_key(wl, KEY_REMOVE,</div><div class='add'>+		ret = wl1271_set_key(wl, wlvif, KEY_REMOVE,</div><div class='ctx'> 				     key_conf-&gt;keyidx, key_type,</div><div class='ctx'> 				     key_conf-&gt;keylen, key_conf-&gt;key,</div><div class='ctx'> 				     0, 0, sta);</div><div class='hunk'>@@ -2847,6 +3004,8 @@ static int wl1271_op_hw_scan(struct ieee80211_hw *hw,</div><div class='ctx'> 			     struct cfg80211_scan_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl = hw-&gt;priv;</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='add'>+</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 *ssid = NULL;</div><div class='ctx'> 	size_t len = 0;</div><div class='hunk'>@@ -2874,18 +3033,18 @@ static int wl1271_op_hw_scan(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* cancel ROC before scanning */</div><div class='del'>-	if (wl12xx_is_roc(wl)) {</div><div class='del'>-		if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &amp;wl-&gt;flags)) {</div><div class='del'>-			/* don't allow scanning right now */</div><div class='del'>-			ret = -EBUSY;</div><div class='del'>-			goto out_sleep;</div><div class='del'>-		}</div><div class='del'>-		wl12xx_croc(wl, wl-&gt;dev_role_id);</div><div class='del'>-		wl12xx_cmd_role_stop_dev(wl);</div><div class='add'>+	if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &amp;wlvif-&gt;flags) &amp;&amp;</div><div class='add'>+	    test_bit(wlvif-&gt;role_id, wl-&gt;roc_map)) {</div><div class='add'>+		/* don't allow scanning right now */</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out_sleep;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_scan(hw-&gt;priv, ssid, len, req);</div><div class='add'>+	/* cancel ROC before scanning */</div><div class='add'>+	if (wl12xx_dev_role_started(wlvif))</div><div class='add'>+		wl12xx_stop_dev(wl, wlvif);</div><div class='add'>+</div><div class='add'>+	ret = wl1271_scan(hw-&gt;priv, vif, ssid, len, req);</div><div class='ctx'> out_sleep:</div><div class='ctx'> 	wl1271_ps_elp_sleep(wl);</div><div class='ctx'> out:</div><div class='hunk'>@@ -2921,6 +3080,7 @@ static void wl1271_op_cancel_hw_scan(struct ieee80211_hw *hw,</div><div class='ctx'> 	}</div><div class='ctx'> 	wl-&gt;scan.state = WL1271_SCAN_STATE_IDLE;</div><div class='ctx'> 	memset(wl-&gt;scan.scanned_ch, 0, sizeof(wl-&gt;scan.scanned_ch));</div><div class='add'>+	wl-&gt;scan_vif = NULL;</div><div class='ctx'> 	wl-&gt;scan.req = NULL;</div><div class='ctx'> 	ieee80211_scan_completed(wl-&gt;hw, true);</div><div class='ctx'> </div><div class='hunk'>@@ -2938,6 +3098,7 @@ static int wl1271_op_sched_scan_start(struct ieee80211_hw *hw,</div><div class='ctx'> 				      struct ieee80211_sched_scan_ies *ies)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl = hw-&gt;priv;</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_MAC80211, "wl1271_op_sched_scan_start");</div><div class='hunk'>@@ -2948,11 +3109,11 @@ static int wl1271_op_sched_scan_start(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_scan_sched_scan_config(wl, req, ies);</div><div class='add'>+	ret = wl1271_scan_sched_scan_config(wl, wlvif, req, ies);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_sleep;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_scan_sched_scan_start(wl);</div><div class='add'>+	ret = wl1271_scan_sched_scan_start(wl, wlvif);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_sleep;</div><div class='ctx'> </div><div class='hunk'>@@ -3017,6 +3178,7 @@ out:</div><div class='ctx'> static int wl1271_op_set_rts_threshold(struct ieee80211_hw *hw, u32 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl = hw-&gt;priv;</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='hunk'>@@ -3030,10 +3192,11 @@ static int wl1271_op_set_rts_threshold(struct ieee80211_hw *hw, u32 value)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_acx_rts_threshold(wl, value);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		wl1271_warning("wl1271_op_set_rts_threshold failed: %d", ret);</div><div class='del'>-</div><div class='add'>+	wl12xx_for_each_wlvif(wl, wlvif) {</div><div class='add'>+		ret = wl1271_acx_rts_threshold(wl, wlvif, value);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			wl1271_warning("set rts threshold failed: %d", ret);</div><div class='add'>+	}</div><div class='ctx'> 	wl1271_ps_elp_sleep(wl);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -3042,9 +3205,10 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_ssid_set(struct wl1271 *wl, struct sk_buff *skb,</div><div class='add'>+static int wl1271_ssid_set(struct ieee80211_vif *vif, struct sk_buff *skb,</div><div class='ctx'> 			    int offset)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> 	u8 ssid_len;</div><div class='ctx'> 	const u8 *ptr = cfg80211_find_ie(WLAN_EID_SSID, skb-&gt;data + offset,</div><div class='ctx'> 					 skb-&gt;len - offset);</div><div class='hunk'>@@ -3060,8 +3224,8 @@ static int wl1271_ssid_set(struct wl1271 *wl, struct sk_buff *skb,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wl-&gt;ssid_len = ssid_len;</div><div class='del'>-	memcpy(wl-&gt;ssid, ptr+2, ssid_len);</div><div class='add'>+	wlvif-&gt;ssid_len = ssid_len;</div><div class='add'>+	memcpy(wlvif-&gt;ssid, ptr+2, ssid_len);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3096,18 +3260,40 @@ static void wl12xx_remove_vendor_ie(struct sk_buff *skb,</div><div class='ctx'> 	skb_trim(skb, skb-&gt;len - len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_ap_set_probe_resp_tmpl(struct wl1271 *wl,</div><div class='del'>-					 u8 *probe_rsp_data,</div><div class='del'>-					 size_t probe_rsp_len,</div><div class='del'>-					 u32 rates)</div><div class='add'>+static int wl1271_ap_set_probe_resp_tmpl(struct wl1271 *wl, u32 rates,</div><div class='add'>+					 struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_bss_conf *bss_conf = &amp;wl-&gt;vif-&gt;bss_conf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = ieee80211_proberesp_get(wl-&gt;hw, vif);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ret = wl1271_cmd_template_set(wl,</div><div class='add'>+				      CMD_TEMPL_AP_PROBE_RESPONSE,</div><div class='add'>+				      skb-&gt;data,</div><div class='add'>+				      skb-&gt;len, 0,</div><div class='add'>+				      rates);</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wl1271_ap_set_probe_resp_tmpl_legacy(struct wl1271 *wl,</div><div class='add'>+					     struct ieee80211_vif *vif,</div><div class='add'>+					     u8 *probe_rsp_data,</div><div class='add'>+					     size_t probe_rsp_len,</div><div class='add'>+					     u32 rates)</div><div class='add'>+{</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='add'>+	struct ieee80211_bss_conf *bss_conf = &amp;vif-&gt;bss_conf;</div><div class='ctx'> 	u8 probe_rsp_templ[WL1271_CMD_TEMPL_MAX_SIZE];</div><div class='ctx'> 	int ssid_ie_offset, ie_offset, templ_len;</div><div class='ctx'> 	const u8 *ptr;</div><div class='ctx'> </div><div class='ctx'> 	/* no need to change probe response if the SSID is set correctly */</div><div class='del'>-	if (wl-&gt;ssid_len &gt; 0)</div><div class='add'>+	if (wlvif-&gt;ssid_len &gt; 0)</div><div class='ctx'> 		return wl1271_cmd_template_set(wl,</div><div class='ctx'> 					       CMD_TEMPL_AP_PROBE_RESPONSE,</div><div class='ctx'> 					       probe_rsp_data,</div><div class='hunk'>@@ -3153,16 +3339,18 @@ static int wl1271_ap_set_probe_resp_tmpl(struct wl1271 *wl,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int wl1271_bss_erp_info_changed(struct wl1271 *wl,</div><div class='add'>+				       struct ieee80211_vif *vif,</div><div class='ctx'> 				       struct ieee80211_bss_conf *bss_conf,</div><div class='ctx'> 				       u32 changed)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ERP_SLOT) {</div><div class='ctx'> 		if (bss_conf-&gt;use_short_slot)</div><div class='del'>-			ret = wl1271_acx_slot(wl, SLOT_TIME_SHORT);</div><div class='add'>+			ret = wl1271_acx_slot(wl, wlvif, SLOT_TIME_SHORT);</div><div class='ctx'> 		else</div><div class='del'>-			ret = wl1271_acx_slot(wl, SLOT_TIME_LONG);</div><div class='add'>+			ret = wl1271_acx_slot(wl, wlvif, SLOT_TIME_LONG);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			wl1271_warning("Set slot time failed %d", ret);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -3171,16 +3359,18 @@ static int wl1271_bss_erp_info_changed(struct wl1271 *wl,</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ERP_PREAMBLE) {</div><div class='ctx'> 		if (bss_conf-&gt;use_short_preamble)</div><div class='del'>-			wl1271_acx_set_preamble(wl, ACX_PREAMBLE_SHORT);</div><div class='add'>+			wl1271_acx_set_preamble(wl, wlvif, ACX_PREAMBLE_SHORT);</div><div class='ctx'> 		else</div><div class='del'>-			wl1271_acx_set_preamble(wl, ACX_PREAMBLE_LONG);</div><div class='add'>+			wl1271_acx_set_preamble(wl, wlvif, ACX_PREAMBLE_LONG);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ERP_CTS_PROT) {</div><div class='ctx'> 		if (bss_conf-&gt;use_cts_prot)</div><div class='del'>-			ret = wl1271_acx_cts_protect(wl, CTSPROTECT_ENABLE);</div><div class='add'>+			ret = wl1271_acx_cts_protect(wl, wlvif,</div><div class='add'>+						     CTSPROTECT_ENABLE);</div><div class='ctx'> 		else</div><div class='del'>-			ret = wl1271_acx_cts_protect(wl, CTSPROTECT_DISABLE);</div><div class='add'>+			ret = wl1271_acx_cts_protect(wl, wlvif,</div><div class='add'>+						     CTSPROTECT_DISABLE);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			wl1271_warning("Set ctsprotect failed %d", ret);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -3196,14 +3386,23 @@ static int wl1271_bss_beacon_info_changed(struct wl1271 *wl,</div><div class='ctx'> 					  struct ieee80211_bss_conf *bss_conf,</div><div class='ctx'> 					  u32 changed)</div><div class='ctx'> {</div><div class='del'>-	bool is_ap = (wl-&gt;bss_type == BSS_TYPE_AP_BSS);</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='add'>+	bool is_ap = (wlvif-&gt;bss_type == BSS_TYPE_AP_BSS);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((changed &amp; BSS_CHANGED_BEACON_INT)) {</div><div class='ctx'> 		wl1271_debug(DEBUG_MASTER, "beacon interval updated: %d",</div><div class='ctx'> 			bss_conf-&gt;beacon_int);</div><div class='ctx'> </div><div class='del'>-		wl-&gt;beacon_int = bss_conf-&gt;beacon_int;</div><div class='add'>+		wlvif-&gt;beacon_int = bss_conf-&gt;beacon_int;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((changed &amp; BSS_CHANGED_AP_PROBE_RESP) &amp;&amp; is_ap) {</div><div class='add'>+		u32 rate = wl1271_tx_min_rate_get(wl, wlvif-&gt;basic_rate_set);</div><div class='add'>+		if (!wl1271_ap_set_probe_resp_tmpl(wl, rate, vif)) {</div><div class='add'>+			wl1271_debug(DEBUG_AP, "probe response updated");</div><div class='add'>+			set_bit(WLVIF_FLAG_AP_PROBE_RESP_SET, &amp;wlvif-&gt;flags);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((changed &amp; BSS_CHANGED_BEACON)) {</div><div class='hunk'>@@ -3214,17 +3413,19 @@ static int wl1271_bss_beacon_info_changed(struct wl1271 *wl,</div><div class='ctx'> 		struct sk_buff *beacon = ieee80211_beacon_get(wl-&gt;hw, vif);</div><div class='ctx'> 		u16 tmpl_id;</div><div class='ctx'> </div><div class='del'>-		if (!beacon)</div><div class='add'>+		if (!beacon) {</div><div class='add'>+			ret = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		wl1271_debug(DEBUG_MASTER, "beacon updated");</div><div class='ctx'> </div><div class='del'>-		ret = wl1271_ssid_set(wl, beacon, ieoffset);</div><div class='add'>+		ret = wl1271_ssid_set(vif, beacon, ieoffset);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			dev_kfree_skb(beacon);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		min_rate = wl1271_tx_min_rate_get(wl, wl-&gt;basic_rate_set);</div><div class='add'>+		min_rate = wl1271_tx_min_rate_get(wl, wlvif-&gt;basic_rate_set);</div><div class='ctx'> 		tmpl_id = is_ap ? CMD_TEMPL_AP_BEACON :</div><div class='ctx'> 				  CMD_TEMPL_BEACON;</div><div class='ctx'> 		ret = wl1271_cmd_template_set(wl, tmpl_id,</div><div class='hunk'>@@ -3236,6 +3437,13 @@ static int wl1271_bss_beacon_info_changed(struct wl1271 *wl,</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * In case we already have a probe-resp beacon set explicitly</div><div class='add'>+		 * by usermode, don't use the beacon data.</div><div class='add'>+		 */</div><div class='add'>+		if (test_bit(WLVIF_FLAG_AP_PROBE_RESP_SET, &amp;wlvif-&gt;flags))</div><div class='add'>+			goto end_bcn;</div><div class='add'>+</div><div class='ctx'> 		/* remove TIM ie from probe response */</div><div class='ctx'> 		wl12xx_remove_ie(beacon, WLAN_EID_TIM, ieoffset);</div><div class='ctx'> </div><div class='hunk'>@@ -3254,7 +3462,7 @@ static int wl1271_bss_beacon_info_changed(struct wl1271 *wl,</div><div class='ctx'> 		hdr-&gt;frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |</div><div class='ctx'> 						 IEEE80211_STYPE_PROBE_RESP);</div><div class='ctx'> 		if (is_ap)</div><div class='del'>-			ret = wl1271_ap_set_probe_resp_tmpl(wl,</div><div class='add'>+			ret = wl1271_ap_set_probe_resp_tmpl_legacy(wl, vif,</div><div class='ctx'> 						beacon-&gt;data,</div><div class='ctx'> 						beacon-&gt;len,</div><div class='ctx'> 						min_rate);</div><div class='hunk'>@@ -3264,12 +3472,15 @@ static int wl1271_bss_beacon_info_changed(struct wl1271 *wl,</div><div class='ctx'> 						beacon-&gt;data,</div><div class='ctx'> 						beacon-&gt;len, 0,</div><div class='ctx'> 						min_rate);</div><div class='add'>+end_bcn:</div><div class='ctx'> 		dev_kfree_skb(beacon);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		wl1271_error("beacon info change failed: %d", ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3279,23 +3490,24 @@ static void wl1271_bss_info_changed_ap(struct wl1271 *wl,</div><div class='ctx'> 				       struct ieee80211_bss_conf *bss_conf,</div><div class='ctx'> 				       u32 changed)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((changed &amp; BSS_CHANGED_BASIC_RATES)) {</div><div class='ctx'> 		u32 rates = bss_conf-&gt;basic_rates;</div><div class='ctx'> </div><div class='del'>-		wl-&gt;basic_rate_set = wl1271_tx_enabled_rates_get(wl, rates,</div><div class='del'>-								 wl-&gt;band);</div><div class='del'>-		wl-&gt;basic_rate = wl1271_tx_min_rate_get(wl,</div><div class='del'>-							wl-&gt;basic_rate_set);</div><div class='add'>+		wlvif-&gt;basic_rate_set = wl1271_tx_enabled_rates_get(wl, rates,</div><div class='add'>+								 wlvif-&gt;band);</div><div class='add'>+		wlvif-&gt;basic_rate = wl1271_tx_min_rate_get(wl,</div><div class='add'>+							wlvif-&gt;basic_rate_set);</div><div class='ctx'> </div><div class='del'>-		ret = wl1271_init_ap_rates(wl);</div><div class='add'>+		ret = wl1271_init_ap_rates(wl, wlvif);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			wl1271_error("AP rate policy change failed %d", ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = wl1271_ap_init_templates(wl);</div><div class='add'>+		ret = wl1271_ap_init_templates(wl, vif);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3306,38 +3518,40 @@ static void wl1271_bss_info_changed_ap(struct wl1271 *wl,</div><div class='ctx'> </div><div class='ctx'> 	if ((changed &amp; BSS_CHANGED_BEACON_ENABLED)) {</div><div class='ctx'> 		if (bss_conf-&gt;enable_beacon) {</div><div class='del'>-			if (!test_bit(WL1271_FLAG_AP_STARTED, &amp;wl-&gt;flags)) {</div><div class='del'>-				ret = wl12xx_cmd_role_start_ap(wl);</div><div class='add'>+			if (!test_bit(WLVIF_FLAG_AP_STARTED, &amp;wlvif-&gt;flags)) {</div><div class='add'>+				ret = wl12xx_cmd_role_start_ap(wl, wlvif);</div><div class='ctx'> 				if (ret &lt; 0)</div><div class='ctx'> 					goto out;</div><div class='ctx'> </div><div class='del'>-				ret = wl1271_ap_init_hwenc(wl);</div><div class='add'>+				ret = wl1271_ap_init_hwenc(wl, wlvif);</div><div class='ctx'> 				if (ret &lt; 0)</div><div class='ctx'> 					goto out;</div><div class='ctx'> </div><div class='del'>-				set_bit(WL1271_FLAG_AP_STARTED, &amp;wl-&gt;flags);</div><div class='add'>+				set_bit(WLVIF_FLAG_AP_STARTED, &amp;wlvif-&gt;flags);</div><div class='ctx'> 				wl1271_debug(DEBUG_AP, "started AP");</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			if (test_bit(WL1271_FLAG_AP_STARTED, &amp;wl-&gt;flags)) {</div><div class='del'>-				ret = wl12xx_cmd_role_stop_ap(wl);</div><div class='add'>+			if (test_bit(WLVIF_FLAG_AP_STARTED, &amp;wlvif-&gt;flags)) {</div><div class='add'>+				ret = wl12xx_cmd_role_stop_ap(wl, wlvif);</div><div class='ctx'> 				if (ret &lt; 0)</div><div class='ctx'> 					goto out;</div><div class='ctx'> </div><div class='del'>-				clear_bit(WL1271_FLAG_AP_STARTED, &amp;wl-&gt;flags);</div><div class='add'>+				clear_bit(WLVIF_FLAG_AP_STARTED, &amp;wlvif-&gt;flags);</div><div class='add'>+				clear_bit(WLVIF_FLAG_AP_PROBE_RESP_SET,</div><div class='add'>+					  &amp;wlvif-&gt;flags);</div><div class='ctx'> 				wl1271_debug(DEBUG_AP, "stopped AP");</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_bss_erp_info_changed(wl, bss_conf, changed);</div><div class='add'>+	ret = wl1271_bss_erp_info_changed(wl, vif, bss_conf, changed);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Handle HT information change */</div><div class='ctx'> 	if ((changed &amp; BSS_CHANGED_HT) &amp;&amp;</div><div class='ctx'> 	    (bss_conf-&gt;channel_type != NL80211_CHAN_NO_HT)) {</div><div class='del'>-		ret = wl1271_acx_set_ht_information(wl,</div><div class='add'>+		ret = wl1271_acx_set_ht_information(wl, wlvif,</div><div class='ctx'> 					bss_conf-&gt;ht_operation_mode);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			wl1271_warning("Set ht information failed %d", ret);</div><div class='hunk'>@@ -3355,8 +3569,9 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,</div><div class='ctx'> 					struct ieee80211_bss_conf *bss_conf,</div><div class='ctx'> 					u32 changed)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> 	bool do_join = false, set_assoc = false;</div><div class='del'>-	bool is_ibss = (wl-&gt;bss_type == BSS_TYPE_IBSS);</div><div class='add'>+	bool is_ibss = (wlvif-&gt;bss_type == BSS_TYPE_IBSS);</div><div class='ctx'> 	bool ibss_joined = false;</div><div class='ctx'> 	u32 sta_rate_set = 0;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -3373,14 +3588,13 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_IBSS) {</div><div class='ctx'> 		if (bss_conf-&gt;ibss_joined) {</div><div class='del'>-			set_bit(WL1271_FLAG_IBSS_JOINED, &amp;wl-&gt;flags);</div><div class='add'>+			set_bit(WLVIF_FLAG_IBSS_JOINED, &amp;wlvif-&gt;flags);</div><div class='ctx'> 			ibss_joined = true;</div><div class='ctx'> 		} else {</div><div class='del'>-			if (test_and_clear_bit(WL1271_FLAG_IBSS_JOINED,</div><div class='del'>-					       &amp;wl-&gt;flags)) {</div><div class='del'>-				wl1271_unjoin(wl);</div><div class='del'>-				wl12xx_cmd_role_start_dev(wl);</div><div class='del'>-				wl12xx_roc(wl, wl-&gt;dev_role_id);</div><div class='add'>+			if (test_and_clear_bit(WLVIF_FLAG_IBSS_JOINED,</div><div class='add'>+					       &amp;wlvif-&gt;flags)) {</div><div class='add'>+				wl1271_unjoin(wl, wlvif);</div><div class='add'>+				wl12xx_start_dev(wl, wlvif);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3396,46 +3610,40 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,</div><div class='ctx'> 		wl1271_debug(DEBUG_ADHOC, "ad-hoc beaconing: %s",</div><div class='ctx'> 			     bss_conf-&gt;enable_beacon ? "enabled" : "disabled");</div><div class='ctx'> </div><div class='del'>-		if (bss_conf-&gt;enable_beacon)</div><div class='del'>-			wl-&gt;set_bss_type = BSS_TYPE_IBSS;</div><div class='del'>-		else</div><div class='del'>-			wl-&gt;set_bss_type = BSS_TYPE_STA_BSS;</div><div class='ctx'> 		do_join = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (changed &amp; BSS_CHANGED_IDLE) {</div><div class='add'>+		ret = wl1271_sta_handle_idle(wl, wlvif, bss_conf-&gt;idle);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			wl1271_warning("idle mode change failed %d", ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if ((changed &amp; BSS_CHANGED_CQM)) {</div><div class='ctx'> 		bool enable = false;</div><div class='ctx'> 		if (bss_conf-&gt;cqm_rssi_thold)</div><div class='ctx'> 			enable = true;</div><div class='del'>-		ret = wl1271_acx_rssi_snr_trigger(wl, enable,</div><div class='add'>+		ret = wl1271_acx_rssi_snr_trigger(wl, wlvif, enable,</div><div class='ctx'> 						  bss_conf-&gt;cqm_rssi_thold,</div><div class='ctx'> 						  bss_conf-&gt;cqm_rssi_hyst);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='del'>-		wl-&gt;rssi_thold = bss_conf-&gt;cqm_rssi_thold;</div><div class='add'>+		wlvif-&gt;rssi_thold = bss_conf-&gt;cqm_rssi_thold;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((changed &amp; BSS_CHANGED_BSSID) &amp;&amp;</div><div class='del'>-	    /*</div><div class='del'>-	     * Now we know the correct bssid, so we send a new join command</div><div class='del'>-	     * and enable the BSSID filter</div><div class='del'>-	     */</div><div class='del'>-	    memcmp(wl-&gt;bssid, bss_conf-&gt;bssid, ETH_ALEN)) {</div><div class='del'>-		memcpy(wl-&gt;bssid, bss_conf-&gt;bssid, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-		if (!is_zero_ether_addr(wl-&gt;bssid)) {</div><div class='del'>-			ret = wl1271_cmd_build_null_data(wl);</div><div class='add'>+	if (changed &amp; BSS_CHANGED_BSSID)</div><div class='add'>+		if (!is_zero_ether_addr(bss_conf-&gt;bssid)) {</div><div class='add'>+			ret = wl12xx_cmd_build_null_data(wl, wlvif);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='del'>-			ret = wl1271_build_qos_null_data(wl);</div><div class='add'>+			ret = wl1271_build_qos_null_data(wl, vif);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='ctx'> 			/* Need to update the BSSID (for filtering etc) */</div><div class='ctx'> 			do_join = true;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; (BSS_CHANGED_ASSOC | BSS_CHANGED_HT)) {</div><div class='ctx'> 		rcu_read_lock();</div><div class='hunk'>@@ -3459,26 +3667,28 @@ sta_not_found:</div><div class='ctx'> 		if (bss_conf-&gt;assoc) {</div><div class='ctx'> 			u32 rates;</div><div class='ctx'> 			int ieoffset;</div><div class='del'>-			wl-&gt;aid = bss_conf-&gt;aid;</div><div class='add'>+			wlvif-&gt;aid = bss_conf-&gt;aid;</div><div class='ctx'> 			set_assoc = true;</div><div class='ctx'> </div><div class='del'>-			wl-&gt;ps_poll_failures = 0;</div><div class='add'>+			wlvif-&gt;ps_poll_failures = 0;</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * use basic rates from AP, and determine lowest rate</div><div class='ctx'> 			 * to use with control frames.</div><div class='ctx'> 			 */</div><div class='ctx'> 			rates = bss_conf-&gt;basic_rates;</div><div class='del'>-			wl-&gt;basic_rate_set =</div><div class='add'>+			wlvif-&gt;basic_rate_set =</div><div class='ctx'> 				wl1271_tx_enabled_rates_get(wl, rates,</div><div class='del'>-							    wl-&gt;band);</div><div class='del'>-			wl-&gt;basic_rate =</div><div class='del'>-				wl1271_tx_min_rate_get(wl, wl-&gt;basic_rate_set);</div><div class='add'>+							    wlvif-&gt;band);</div><div class='add'>+			wlvif-&gt;basic_rate =</div><div class='add'>+				wl1271_tx_min_rate_get(wl,</div><div class='add'>+						       wlvif-&gt;basic_rate_set);</div><div class='ctx'> 			if (sta_rate_set)</div><div class='del'>-				wl-&gt;rate_set = wl1271_tx_enabled_rates_get(wl,</div><div class='add'>+				wlvif-&gt;rate_set =</div><div class='add'>+					wl1271_tx_enabled_rates_get(wl,</div><div class='ctx'> 								sta_rate_set,</div><div class='del'>-								wl-&gt;band);</div><div class='del'>-			ret = wl1271_acx_sta_rate_policies(wl);</div><div class='add'>+								wlvif-&gt;band);</div><div class='add'>+			ret = wl1271_acx_sta_rate_policies(wl, wlvif);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -3488,53 +3698,56 @@ sta_not_found:</div><div class='ctx'> 			 * updates it by itself when the first beacon is</div><div class='ctx'> 			 * received after a join.</div><div class='ctx'> 			 */</div><div class='del'>-			ret = wl1271_cmd_build_ps_poll(wl, wl-&gt;aid);</div><div class='add'>+			ret = wl1271_cmd_build_ps_poll(wl, wlvif, wlvif-&gt;aid);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Get a template for hardware connection maintenance</div><div class='ctx'> 			 */</div><div class='del'>-			dev_kfree_skb(wl-&gt;probereq);</div><div class='del'>-			wl-&gt;probereq = wl1271_cmd_build_ap_probe_req(wl, NULL);</div><div class='add'>+			dev_kfree_skb(wlvif-&gt;probereq);</div><div class='add'>+			wlvif-&gt;probereq = wl1271_cmd_build_ap_probe_req(wl,</div><div class='add'>+									wlvif,</div><div class='add'>+									NULL);</div><div class='ctx'> 			ieoffset = offsetof(struct ieee80211_mgmt,</div><div class='ctx'> 					    u.probe_req.variable);</div><div class='del'>-			wl1271_ssid_set(wl, wl-&gt;probereq, ieoffset);</div><div class='add'>+			wl1271_ssid_set(vif, wlvif-&gt;probereq, ieoffset);</div><div class='ctx'> </div><div class='ctx'> 			/* enable the connection monitoring feature */</div><div class='del'>-			ret = wl1271_acx_conn_monit_params(wl, true);</div><div class='add'>+			ret = wl1271_acx_conn_monit_params(wl, wlvif, true);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* use defaults when not associated */</div><div class='ctx'> 			bool was_assoc =</div><div class='del'>-			    !!test_and_clear_bit(WL1271_FLAG_STA_ASSOCIATED,</div><div class='del'>-						 &amp;wl-&gt;flags);</div><div class='add'>+			    !!test_and_clear_bit(WLVIF_FLAG_STA_ASSOCIATED,</div><div class='add'>+						 &amp;wlvif-&gt;flags);</div><div class='ctx'> 			bool was_ifup =</div><div class='del'>-			    !!test_and_clear_bit(WL1271_FLAG_STA_STATE_SENT,</div><div class='del'>-						 &amp;wl-&gt;flags);</div><div class='del'>-			wl-&gt;aid = 0;</div><div class='add'>+			    !!test_and_clear_bit(WLVIF_FLAG_STA_STATE_SENT,</div><div class='add'>+						 &amp;wlvif-&gt;flags);</div><div class='add'>+			wlvif-&gt;aid = 0;</div><div class='ctx'> </div><div class='ctx'> 			/* free probe-request template */</div><div class='del'>-			dev_kfree_skb(wl-&gt;probereq);</div><div class='del'>-			wl-&gt;probereq = NULL;</div><div class='add'>+			dev_kfree_skb(wlvif-&gt;probereq);</div><div class='add'>+			wlvif-&gt;probereq = NULL;</div><div class='ctx'> </div><div class='ctx'> 			/* re-enable dynamic ps - just in case */</div><div class='del'>-			ieee80211_enable_dyn_ps(wl-&gt;vif);</div><div class='add'>+			ieee80211_enable_dyn_ps(vif);</div><div class='ctx'> </div><div class='ctx'> 			/* revert back to minimum rates for the current band */</div><div class='del'>-			wl1271_set_band_rate(wl);</div><div class='del'>-			wl-&gt;basic_rate =</div><div class='del'>-				wl1271_tx_min_rate_get(wl, wl-&gt;basic_rate_set);</div><div class='del'>-			ret = wl1271_acx_sta_rate_policies(wl);</div><div class='add'>+			wl1271_set_band_rate(wl, wlvif);</div><div class='add'>+			wlvif-&gt;basic_rate =</div><div class='add'>+				wl1271_tx_min_rate_get(wl,</div><div class='add'>+						       wlvif-&gt;basic_rate_set);</div><div class='add'>+			ret = wl1271_acx_sta_rate_policies(wl, wlvif);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='ctx'> 			/* disable connection monitor features */</div><div class='del'>-			ret = wl1271_acx_conn_monit_params(wl, false);</div><div class='add'>+			ret = wl1271_acx_conn_monit_params(wl, wlvif, false);</div><div class='ctx'> </div><div class='ctx'> 			/* Disable the keep-alive feature */</div><div class='del'>-			ret = wl1271_acx_keep_alive_mode(wl, false);</div><div class='add'>+			ret = wl1271_acx_keep_alive_mode(wl, wlvif, false);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -3546,7 +3759,7 @@ sta_not_found:</div><div class='ctx'> 				 * no IF_OPER_UP notification.</div><div class='ctx'> 				 */</div><div class='ctx'> 				if (!was_ifup) {</div><div class='del'>-					ret = wl12xx_croc(wl, wl-&gt;role_id);</div><div class='add'>+					ret = wl12xx_croc(wl, wlvif-&gt;role_id);</div><div class='ctx'> 					if (ret &lt; 0)</div><div class='ctx'> 						goto out;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -3555,17 +3768,16 @@ sta_not_found:</div><div class='ctx'> 				 * roaming on the same channel. until we will</div><div class='ctx'> 				 * have a better flow...)</div><div class='ctx'> 				 */</div><div class='del'>-				if (test_bit(wl-&gt;dev_role_id, wl-&gt;roc_map)) {</div><div class='del'>-					ret = wl12xx_croc(wl, wl-&gt;dev_role_id);</div><div class='add'>+				if (test_bit(wlvif-&gt;dev_role_id, wl-&gt;roc_map)) {</div><div class='add'>+					ret = wl12xx_croc(wl,</div><div class='add'>+							  wlvif-&gt;dev_role_id);</div><div class='ctx'> 					if (ret &lt; 0)</div><div class='ctx'> 						goto out;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='del'>-				wl1271_unjoin(wl);</div><div class='del'>-				if (!(conf_flags &amp; IEEE80211_CONF_IDLE)) {</div><div class='del'>-					wl12xx_cmd_role_start_dev(wl);</div><div class='del'>-					wl12xx_roc(wl, wl-&gt;dev_role_id);</div><div class='del'>-				}</div><div class='add'>+				wl1271_unjoin(wl, wlvif);</div><div class='add'>+				if (!(conf_flags &amp; IEEE80211_CONF_IDLE))</div><div class='add'>+					wl12xx_start_dev(wl, wlvif);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3576,27 +3788,28 @@ sta_not_found:</div><div class='ctx'> </div><div class='ctx'> 		if (bss_conf-&gt;ibss_joined) {</div><div class='ctx'> 			u32 rates = bss_conf-&gt;basic_rates;</div><div class='del'>-			wl-&gt;basic_rate_set =</div><div class='add'>+			wlvif-&gt;basic_rate_set =</div><div class='ctx'> 				wl1271_tx_enabled_rates_get(wl, rates,</div><div class='del'>-							    wl-&gt;band);</div><div class='del'>-			wl-&gt;basic_rate =</div><div class='del'>-				wl1271_tx_min_rate_get(wl, wl-&gt;basic_rate_set);</div><div class='add'>+							    wlvif-&gt;band);</div><div class='add'>+			wlvif-&gt;basic_rate =</div><div class='add'>+				wl1271_tx_min_rate_get(wl,</div><div class='add'>+						       wlvif-&gt;basic_rate_set);</div><div class='ctx'> </div><div class='ctx'> 			/* by default, use 11b + OFDM rates */</div><div class='del'>-			wl-&gt;rate_set = CONF_TX_IBSS_DEFAULT_RATES;</div><div class='del'>-			ret = wl1271_acx_sta_rate_policies(wl);</div><div class='add'>+			wlvif-&gt;rate_set = CONF_TX_IBSS_DEFAULT_RATES;</div><div class='add'>+			ret = wl1271_acx_sta_rate_policies(wl, wlvif);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_bss_erp_info_changed(wl, bss_conf, changed);</div><div class='add'>+	ret = wl1271_bss_erp_info_changed(wl, vif, bss_conf, changed);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; BSS_CHANGED_ARP_FILTER) {</div><div class='ctx'> 		__be32 addr = bss_conf-&gt;arp_addr_list[0];</div><div class='del'>-		WARN_ON(wl-&gt;bss_type != BSS_TYPE_STA_BSS);</div><div class='add'>+		WARN_ON(wlvif-&gt;bss_type != BSS_TYPE_STA_BSS);</div><div class='ctx'> </div><div class='ctx'> 		if (bss_conf-&gt;arp_addr_cnt == 1 &amp;&amp;</div><div class='ctx'> 		    bss_conf-&gt;arp_filter_enabled) {</div><div class='hunk'>@@ -3606,24 +3819,24 @@ sta_not_found:</div><div class='ctx'> 			 * isn't being set (when sending), so we have to</div><div class='ctx'> 			 * reconfigure the template upon every ip change.</div><div class='ctx'> 			 */</div><div class='del'>-			ret = wl1271_cmd_build_arp_rsp(wl, addr);</div><div class='add'>+			ret = wl1271_cmd_build_arp_rsp(wl, wlvif, addr);</div><div class='ctx'> 			if (ret &lt; 0) {</div><div class='ctx'> 				wl1271_warning("build arp rsp failed: %d", ret);</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			ret = wl1271_acx_arp_ip_filter(wl,</div><div class='add'>+			ret = wl1271_acx_arp_ip_filter(wl, wlvif,</div><div class='ctx'> 				ACX_ARP_FILTER_ARP_FILTERING,</div><div class='ctx'> 				addr);</div><div class='ctx'> 		} else</div><div class='del'>-			ret = wl1271_acx_arp_ip_filter(wl, 0, addr);</div><div class='add'>+			ret = wl1271_acx_arp_ip_filter(wl, wlvif, 0, addr);</div><div class='ctx'> </div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (do_join) {</div><div class='del'>-		ret = wl1271_join(wl, set_assoc);</div><div class='add'>+		ret = wl1271_join(wl, wlvif, set_assoc);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			wl1271_warning("cmd join failed %d", ret);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -3631,35 +3844,31 @@ sta_not_found:</div><div class='ctx'> </div><div class='ctx'> 		/* ROC until connected (after EAPOL exchange) */</div><div class='ctx'> 		if (!is_ibss) {</div><div class='del'>-			ret = wl12xx_roc(wl, wl-&gt;role_id);</div><div class='add'>+			ret = wl12xx_roc(wl, wlvif, wlvif-&gt;role_id);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='del'>-			wl1271_check_operstate(wl,</div><div class='add'>+			wl1271_check_operstate(wl, wlvif,</div><div class='ctx'> 					       ieee80211_get_operstate(vif));</div><div class='ctx'> 		}</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * stop device role if started (we might already be in</div><div class='del'>-		 * STA role). TODO: make it better.</div><div class='add'>+		 * STA/IBSS role).</div><div class='ctx'> 		 */</div><div class='del'>-		if (wl-&gt;dev_role_id != WL12XX_INVALID_ROLE_ID) {</div><div class='del'>-			ret = wl12xx_croc(wl, wl-&gt;dev_role_id);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				goto out;</div><div class='del'>-</div><div class='del'>-			ret = wl12xx_cmd_role_stop_dev(wl);</div><div class='add'>+		if (wl12xx_dev_role_started(wlvif)) {</div><div class='add'>+			ret = wl12xx_stop_dev(wl, wlvif);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* If we want to go in PSM but we're not there yet */</div><div class='del'>-		if (test_bit(WL1271_FLAG_PSM_REQUESTED, &amp;wl-&gt;flags) &amp;&amp;</div><div class='del'>-		    !test_bit(WL1271_FLAG_PSM, &amp;wl-&gt;flags)) {</div><div class='add'>+		if (test_bit(WLVIF_FLAG_PSM_REQUESTED, &amp;wlvif-&gt;flags) &amp;&amp;</div><div class='add'>+		    !test_bit(WLVIF_FLAG_PSM, &amp;wlvif-&gt;flags)) {</div><div class='ctx'> 			enum wl1271_cmd_ps_mode mode;</div><div class='ctx'> </div><div class='ctx'> 			mode = STATION_POWER_SAVE_MODE;</div><div class='del'>-			ret = wl1271_ps_set_mode(wl, mode,</div><div class='del'>-						 wl-&gt;basic_rate,</div><div class='add'>+			ret = wl1271_ps_set_mode(wl, wlvif, mode,</div><div class='add'>+						 wlvif-&gt;basic_rate,</div><div class='ctx'> 						 true);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto out;</div><div class='hunk'>@@ -3673,7 +3882,7 @@ sta_not_found:</div><div class='ctx'> 			ret = wl1271_acx_set_ht_capabilities(wl,</div><div class='ctx'> 							     &amp;sta_ht_cap,</div><div class='ctx'> 							     true,</div><div class='del'>-							     wl-&gt;sta_hlid);</div><div class='add'>+							     wlvif-&gt;sta.hlid);</div><div class='ctx'> 			if (ret &lt; 0) {</div><div class='ctx'> 				wl1271_warning("Set ht cap true failed %d",</div><div class='ctx'> 					       ret);</div><div class='hunk'>@@ -3685,7 +3894,7 @@ sta_not_found:</div><div class='ctx'> 			ret = wl1271_acx_set_ht_capabilities(wl,</div><div class='ctx'> 							     &amp;sta_ht_cap,</div><div class='ctx'> 							     false,</div><div class='del'>-							     wl-&gt;sta_hlid);</div><div class='add'>+							     wlvif-&gt;sta.hlid);</div><div class='ctx'> 			if (ret &lt; 0) {</div><div class='ctx'> 				wl1271_warning("Set ht cap false failed %d",</div><div class='ctx'> 					       ret);</div><div class='hunk'>@@ -3697,7 +3906,7 @@ sta_not_found:</div><div class='ctx'> 	/* Handle HT information change. Done after join. */</div><div class='ctx'> 	if ((changed &amp; BSS_CHANGED_HT) &amp;&amp;</div><div class='ctx'> 	    (bss_conf-&gt;channel_type != NL80211_CHAN_NO_HT)) {</div><div class='del'>-		ret = wl1271_acx_set_ht_information(wl,</div><div class='add'>+		ret = wl1271_acx_set_ht_information(wl, wlvif,</div><div class='ctx'> 					bss_conf-&gt;ht_operation_mode);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			wl1271_warning("Set ht information failed %d", ret);</div><div class='hunk'>@@ -3715,7 +3924,8 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 				       u32 changed)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl = hw-&gt;priv;</div><div class='del'>-	bool is_ap = (wl-&gt;bss_type == BSS_TYPE_AP_BSS);</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='add'>+	bool is_ap = (wlvif-&gt;bss_type == BSS_TYPE_AP_BSS);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_MAC80211, "mac80211 bss info changed 0x%x",</div><div class='hunk'>@@ -3726,6 +3936,9 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (unlikely(wl-&gt;state == WL1271_STATE_OFF))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(!test_bit(WLVIF_FLAG_INITIALIZED, &amp;wlvif-&gt;flags)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	ret = wl1271_ps_elp_wakeup(wl);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -3746,6 +3959,7 @@ static int wl1271_op_conf_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 			     const struct ieee80211_tx_queue_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl = hw-&gt;priv;</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> 	u8 ps_scheme;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3758,31 +3972,8 @@ static int wl1271_op_conf_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 	else</div><div class='ctx'> 		ps_scheme = CONF_PS_SCHEME_LEGACY;</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;state == WL1271_STATE_OFF) {</div><div class='del'>-		/*</div><div class='del'>-		 * If the state is off, the parameters will be recorded and</div><div class='del'>-		 * configured on init. This happens in AP-mode.</div><div class='del'>-		 */</div><div class='del'>-		struct conf_tx_ac_category *conf_ac =</div><div class='del'>-			&amp;wl-&gt;conf.tx.ac_conf[wl1271_tx_get_queue(queue)];</div><div class='del'>-		struct conf_tx_tid *conf_tid =</div><div class='del'>-			&amp;wl-&gt;conf.tx.tid_conf[wl1271_tx_get_queue(queue)];</div><div class='del'>-</div><div class='del'>-		conf_ac-&gt;ac = wl1271_tx_get_queue(queue);</div><div class='del'>-		conf_ac-&gt;cw_min = (u8)params-&gt;cw_min;</div><div class='del'>-		conf_ac-&gt;cw_max = params-&gt;cw_max;</div><div class='del'>-		conf_ac-&gt;aifsn = params-&gt;aifs;</div><div class='del'>-		conf_ac-&gt;tx_op_limit = params-&gt;txop &lt;&lt; 5;</div><div class='del'>-</div><div class='del'>-		conf_tid-&gt;queue_id = wl1271_tx_get_queue(queue);</div><div class='del'>-		conf_tid-&gt;channel_type = CONF_CHANNEL_TYPE_EDCF;</div><div class='del'>-		conf_tid-&gt;tsid = wl1271_tx_get_queue(queue);</div><div class='del'>-		conf_tid-&gt;ps_scheme = ps_scheme;</div><div class='del'>-		conf_tid-&gt;ack_policy = CONF_ACK_POLICY_LEGACY;</div><div class='del'>-		conf_tid-&gt;apsd_conf[0] = 0;</div><div class='del'>-		conf_tid-&gt;apsd_conf[1] = 0;</div><div class='add'>+	if (!test_bit(WLVIF_FLAG_INITIALIZED, &amp;wlvif-&gt;flags))</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_ps_elp_wakeup(wl);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -3792,13 +3983,13 @@ static int wl1271_op_conf_tx(struct ieee80211_hw *hw,</div><div class='ctx'> 	 * the txop is confed in units of 32us by the mac80211,</div><div class='ctx'> 	 * we need us</div><div class='ctx'> 	 */</div><div class='del'>-	ret = wl1271_acx_ac_cfg(wl, wl1271_tx_get_queue(queue),</div><div class='add'>+	ret = wl1271_acx_ac_cfg(wl, wlvif, wl1271_tx_get_queue(queue),</div><div class='ctx'> 				params-&gt;cw_min, params-&gt;cw_max,</div><div class='ctx'> 				params-&gt;aifs, params-&gt;txop &lt;&lt; 5);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_sleep;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_acx_tid_cfg(wl, wl1271_tx_get_queue(queue),</div><div class='add'>+	ret = wl1271_acx_tid_cfg(wl, wlvif, wl1271_tx_get_queue(queue),</div><div class='ctx'> 				 CONF_CHANNEL_TYPE_EDCF,</div><div class='ctx'> 				 wl1271_tx_get_queue(queue),</div><div class='ctx'> 				 ps_scheme, CONF_ACK_POLICY_LEGACY,</div><div class='hunk'>@@ -3861,43 +4052,43 @@ static int wl1271_op_get_survey(struct ieee80211_hw *hw, int idx,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int wl1271_allocate_sta(struct wl1271 *wl,</div><div class='del'>-			     struct ieee80211_sta *sta,</div><div class='del'>-			     u8 *hlid)</div><div class='add'>+			     struct wl12xx_vif *wlvif,</div><div class='add'>+			     struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_station *wl_sta;</div><div class='del'>-	int id;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	id = find_first_zero_bit(wl-&gt;ap_hlid_map, AP_MAX_STATIONS);</div><div class='del'>-	if (id &gt;= AP_MAX_STATIONS) {</div><div class='add'>+</div><div class='add'>+	if (wl-&gt;active_sta_count &gt;= AP_MAX_STATIONS) {</div><div class='ctx'> 		wl1271_warning("could not allocate HLID - too much stations");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wl_sta = (struct wl1271_station *)sta-&gt;drv_priv;</div><div class='del'>-	set_bit(id, wl-&gt;ap_hlid_map);</div><div class='del'>-	wl_sta-&gt;hlid = WL1271_AP_STA_HLID_START + id;</div><div class='del'>-	*hlid = wl_sta-&gt;hlid;</div><div class='add'>+	ret = wl12xx_allocate_link(wl, wlvif, &amp;wl_sta-&gt;hlid);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		wl1271_warning("could not allocate HLID - too many links");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_bit(wl_sta-&gt;hlid, wlvif-&gt;ap.sta_hlid_map);</div><div class='ctx'> 	memcpy(wl-&gt;links[wl_sta-&gt;hlid].addr, sta-&gt;addr, ETH_ALEN);</div><div class='ctx'> 	wl-&gt;active_sta_count++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void wl1271_free_sta(struct wl1271 *wl, u8 hlid)</div><div class='add'>+void wl1271_free_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 hlid)</div><div class='ctx'> {</div><div class='del'>-	int id = hlid - WL1271_AP_STA_HLID_START;</div><div class='del'>-</div><div class='del'>-	if (hlid &lt; WL1271_AP_STA_HLID_START)</div><div class='add'>+	if (!test_bit(hlid, wlvif-&gt;ap.sta_hlid_map))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(id, wl-&gt;ap_hlid_map))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	clear_bit(id, wl-&gt;ap_hlid_map);</div><div class='add'>+	clear_bit(hlid, wlvif-&gt;ap.sta_hlid_map);</div><div class='ctx'> 	memset(wl-&gt;links[hlid].addr, 0, ETH_ALEN);</div><div class='ctx'> 	wl-&gt;links[hlid].ba_bitmap = 0;</div><div class='ctx'> 	wl1271_tx_reset_link_queues(wl, hlid);</div><div class='ctx'> 	__clear_bit(hlid, &amp;wl-&gt;ap_ps_map);</div><div class='ctx'> 	__clear_bit(hlid, (unsigned long *)&amp;wl-&gt;ap_fw_ps_map);</div><div class='add'>+	wl12xx_free_link(wl, wlvif, &amp;hlid);</div><div class='ctx'> 	wl-&gt;active_sta_count--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3906,6 +4097,8 @@ static int wl1271_op_sta_add(struct ieee80211_hw *hw,</div><div class='ctx'> 			     struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl = hw-&gt;priv;</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='add'>+	struct wl1271_station *wl_sta;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u8 hlid;</div><div class='ctx'> </div><div class='hunk'>@@ -3914,20 +4107,23 @@ static int wl1271_op_sta_add(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (unlikely(wl-&gt;state == WL1271_STATE_OFF))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;bss_type != BSS_TYPE_AP_BSS)</div><div class='add'>+	if (wlvif-&gt;bss_type != BSS_TYPE_AP_BSS)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_MAC80211, "mac80211 add sta %d", (int)sta-&gt;aid);</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_allocate_sta(wl, sta, &amp;hlid);</div><div class='add'>+	ret = wl1271_allocate_sta(wl, wlvif, sta);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	wl_sta = (struct wl1271_station *)sta-&gt;drv_priv;</div><div class='add'>+	hlid = wl_sta-&gt;hlid;</div><div class='add'>+</div><div class='ctx'> 	ret = wl1271_ps_elp_wakeup(wl);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_free_sta;</div><div class='ctx'> </div><div class='del'>-	ret = wl12xx_cmd_add_peer(wl, sta, hlid);</div><div class='add'>+	ret = wl12xx_cmd_add_peer(wl, wlvif, sta, hlid);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_sleep;</div><div class='ctx'> </div><div class='hunk'>@@ -3944,7 +4140,7 @@ out_sleep:</div><div class='ctx'> </div><div class='ctx'> out_free_sta:</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		wl1271_free_sta(wl, hlid);</div><div class='add'>+		wl1271_free_sta(wl, wlvif, hlid);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='hunk'>@@ -3956,6 +4152,7 @@ static int wl1271_op_sta_remove(struct ieee80211_hw *hw,</div><div class='ctx'> 				struct ieee80211_sta *sta)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl = hw-&gt;priv;</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> 	struct wl1271_station *wl_sta;</div><div class='ctx'> 	int ret = 0, id;</div><div class='ctx'> </div><div class='hunk'>@@ -3964,14 +4161,14 @@ static int wl1271_op_sta_remove(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (unlikely(wl-&gt;state == WL1271_STATE_OFF))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;bss_type != BSS_TYPE_AP_BSS)</div><div class='add'>+	if (wlvif-&gt;bss_type != BSS_TYPE_AP_BSS)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_MAC80211, "mac80211 remove sta %d", (int)sta-&gt;aid);</div><div class='ctx'> </div><div class='ctx'> 	wl_sta = (struct wl1271_station *)sta-&gt;drv_priv;</div><div class='del'>-	id = wl_sta-&gt;hlid - WL1271_AP_STA_HLID_START;</div><div class='del'>-	if (WARN_ON(!test_bit(id, wl-&gt;ap_hlid_map)))</div><div class='add'>+	id = wl_sta-&gt;hlid;</div><div class='add'>+	if (WARN_ON(!test_bit(id, wlvif-&gt;ap.sta_hlid_map)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_ps_elp_wakeup(wl);</div><div class='hunk'>@@ -3982,7 +4179,7 @@ static int wl1271_op_sta_remove(struct ieee80211_hw *hw,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out_sleep;</div><div class='ctx'> </div><div class='del'>-	wl1271_free_sta(wl, wl_sta-&gt;hlid);</div><div class='add'>+	wl1271_free_sta(wl, wlvif, wl_sta-&gt;hlid);</div><div class='ctx'> </div><div class='ctx'> out_sleep:</div><div class='ctx'> 	wl1271_ps_elp_sleep(wl);</div><div class='hunk'>@@ -3999,6 +4196,7 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> 				  u8 buf_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl = hw-&gt;priv;</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 hlid, *ba_bitmap;</div><div class='ctx'> </div><div class='hunk'>@@ -4016,10 +4214,10 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;bss_type == BSS_TYPE_STA_BSS) {</div><div class='del'>-		hlid = wl-&gt;sta_hlid;</div><div class='del'>-		ba_bitmap = &amp;wl-&gt;ba_rx_bitmap;</div><div class='del'>-	} else if (wl-&gt;bss_type == BSS_TYPE_AP_BSS) {</div><div class='add'>+	if (wlvif-&gt;bss_type == BSS_TYPE_STA_BSS) {</div><div class='add'>+		hlid = wlvif-&gt;sta.hlid;</div><div class='add'>+		ba_bitmap = &amp;wlvif-&gt;sta.ba_rx_bitmap;</div><div class='add'>+	} else if (wlvif-&gt;bss_type == BSS_TYPE_AP_BSS) {</div><div class='ctx'> 		struct wl1271_station *wl_sta;</div><div class='ctx'> </div><div class='ctx'> 		wl_sta = (struct wl1271_station *)sta-&gt;drv_priv;</div><div class='hunk'>@@ -4039,7 +4237,7 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw,</div><div class='ctx'> </div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case IEEE80211_AMPDU_RX_START:</div><div class='del'>-		if (!wl-&gt;ba_support || !wl-&gt;ba_allowed) {</div><div class='add'>+		if (!wlvif-&gt;ba_support || !wlvif-&gt;ba_allowed) {</div><div class='ctx'> 			ret = -ENOTSUPP;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4108,8 +4306,9 @@ static int wl12xx_set_bitrate_mask(struct ieee80211_hw *hw,</div><div class='ctx'> 				   struct ieee80211_vif *vif,</div><div class='ctx'> 				   const struct cfg80211_bitrate_mask *mask)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> 	struct wl1271 *wl = hw-&gt;priv;</div><div class='del'>-	int i;</div><div class='add'>+	int i, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_MAC80211, "mac80211 set_bitrate_mask 0x%x 0x%x",</div><div class='ctx'> 		mask-&gt;control[NL80211_BAND_2GHZ].legacy,</div><div class='hunk'>@@ -4118,19 +4317,39 @@ static int wl12xx_set_bitrate_mask(struct ieee80211_hw *hw,</div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; IEEE80211_NUM_BANDS; i++)</div><div class='del'>-		wl-&gt;bitrate_masks[i] =</div><div class='add'>+		wlvif-&gt;bitrate_masks[i] =</div><div class='ctx'> 			wl1271_tx_enabled_rates_get(wl,</div><div class='ctx'> 						    mask-&gt;control[i].legacy,</div><div class='ctx'> 						    i);</div><div class='add'>+</div><div class='add'>+	if (unlikely(wl-&gt;state == WL1271_STATE_OFF))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (wlvif-&gt;bss_type == BSS_TYPE_STA_BSS &amp;&amp;</div><div class='add'>+	    !test_bit(WLVIF_FLAG_STA_ASSOCIATED, &amp;wlvif-&gt;flags)) {</div><div class='add'>+</div><div class='add'>+		ret = wl1271_ps_elp_wakeup(wl);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		wl1271_set_band_rate(wl, wlvif);</div><div class='add'>+		wlvif-&gt;basic_rate =</div><div class='add'>+			wl1271_tx_min_rate_get(wl, wlvif-&gt;basic_rate_set);</div><div class='add'>+		ret = wl1271_acx_sta_rate_policies(wl, wlvif);</div><div class='add'>+</div><div class='add'>+		wl1271_ps_elp_sleep(wl);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='ctx'> 	mutex_unlock(&amp;wl-&gt;mutex);</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 void wl12xx_op_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 				     struct ieee80211_channel_switch *ch_switch)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271 *wl = hw-&gt;priv;</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_MAC80211, "mac80211 channel switch");</div><div class='hunk'>@@ -4138,19 +4357,24 @@ static void wl12xx_op_channel_switch(struct ieee80211_hw *hw,</div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(wl-&gt;state == WL1271_STATE_OFF)) {</div><div class='del'>-		mutex_unlock(&amp;wl-&gt;mutex);</div><div class='del'>-		ieee80211_chswitch_done(wl-&gt;vif, false);</div><div class='del'>-		return;</div><div class='add'>+		wl12xx_for_each_wlvif_sta(wl, wlvif) {</div><div class='add'>+			struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='add'>+			ieee80211_chswitch_done(vif, false);</div><div class='add'>+		}</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_ps_elp_wakeup(wl);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ret = wl12xx_cmd_channel_switch(wl, ch_switch);</div><div class='add'>+	/* TODO: change mac80211 to pass vif as param */</div><div class='add'>+	wl12xx_for_each_wlvif_sta(wl, wlvif) {</div><div class='add'>+		ret = wl12xx_cmd_channel_switch(wl, ch_switch);</div><div class='ctx'> </div><div class='del'>-	if (!ret)</div><div class='del'>-		set_bit(WL1271_FLAG_CS_PROGRESS, &amp;wl-&gt;flags);</div><div class='add'>+		if (!ret)</div><div class='add'>+			set_bit(WLVIF_FLAG_CS_PROGRESS, &amp;wlvif-&gt;flags);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	wl1271_ps_elp_sleep(wl);</div><div class='ctx'> </div><div class='hunk'>@@ -4170,10 +4394,6 @@ static bool wl1271_tx_frames_pending(struct ieee80211_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	/* packets are considered pending if in the TX queue or the FW */</div><div class='ctx'> 	ret = (wl1271_tx_total_queue_count(wl) &gt; 0) || (wl-&gt;tx_frames_cnt &gt; 0);</div><div class='del'>-</div><div class='del'>-	/* the above is appropriate for STA mode for PS purposes */</div><div class='del'>-	WARN_ON(wl-&gt;bss_type != BSS_TYPE_STA_BSS);</div><div class='del'>-</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -4410,6 +4630,7 @@ static const struct ieee80211_ops wl1271_ops = {</div><div class='ctx'> 	.stop = wl1271_op_stop,</div><div class='ctx'> 	.add_interface = wl1271_op_add_interface,</div><div class='ctx'> 	.remove_interface = wl1271_op_remove_interface,</div><div class='add'>+	.change_interface = wl12xx_op_change_interface,</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend = wl1271_op_suspend,</div><div class='ctx'> 	.resume = wl1271_op_resume,</div><div class='hunk'>@@ -4604,7 +4825,7 @@ static struct bin_attribute fwlog_attr = {</div><div class='ctx'> 	.read = wl1271_sysfs_read_fwlog,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int wl1271_register_hw(struct wl1271 *wl)</div><div class='add'>+static int wl1271_register_hw(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -4645,9 +4866,8 @@ int wl1271_register_hw(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(wl1271_register_hw);</div><div class='ctx'> </div><div class='del'>-void wl1271_unregister_hw(struct wl1271 *wl)</div><div class='add'>+static void wl1271_unregister_hw(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='ctx'> 	if (wl-&gt;state == WL1271_STATE_PLT)</div><div class='ctx'> 		__wl1271_plt_stop(wl);</div><div class='hunk'>@@ -4657,9 +4877,8 @@ void wl1271_unregister_hw(struct wl1271 *wl)</div><div class='ctx'> 	wl-&gt;mac80211_registered = false;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(wl1271_unregister_hw);</div><div class='ctx'> </div><div class='del'>-int wl1271_init_ieee80211(struct wl1271 *wl)</div><div class='add'>+static int wl1271_init_ieee80211(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='ctx'> 	static const u32 cipher_suites[] = {</div><div class='ctx'> 		WLAN_CIPHER_SUITE_WEP40,</div><div class='hunk'>@@ -4736,27 +4955,33 @@ int wl1271_init_ieee80211(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> 	wl-&gt;hw-&gt;wiphy-&gt;reg_notifier = wl1271_reg_notify;</div><div class='ctx'> </div><div class='del'>-	SET_IEEE80211_DEV(wl-&gt;hw, wl1271_wl_to_dev(wl));</div><div class='add'>+	/* the FW answers probe-requests in AP-mode */</div><div class='add'>+	wl-&gt;hw-&gt;wiphy-&gt;flags |= WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD;</div><div class='add'>+	wl-&gt;hw-&gt;wiphy-&gt;probe_resp_offload =</div><div class='add'>+		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS |</div><div class='add'>+		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2 |</div><div class='add'>+		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P;</div><div class='add'>+</div><div class='add'>+	SET_IEEE80211_DEV(wl-&gt;hw, wl-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	wl-&gt;hw-&gt;sta_data_size = sizeof(struct wl1271_station);</div><div class='add'>+	wl-&gt;hw-&gt;vif_data_size = sizeof(struct wl12xx_vif);</div><div class='ctx'> </div><div class='ctx'> 	wl-&gt;hw-&gt;max_rx_aggregation_subframes = 8;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(wl1271_init_ieee80211);</div><div class='ctx'> </div><div class='ctx'> #define WL1271_DEFAULT_CHANNEL 0</div><div class='ctx'> </div><div class='del'>-struct ieee80211_hw *wl1271_alloc_hw(void)</div><div class='add'>+static struct ieee80211_hw *wl1271_alloc_hw(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hw *hw;</div><div class='del'>-	struct platform_device *plat_dev = NULL;</div><div class='ctx'> 	struct wl1271 *wl;</div><div class='ctx'> 	int i, j, ret;</div><div class='ctx'> 	unsigned int order;</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(AP_MAX_LINKS &gt; WL12XX_MAX_LINKS);</div><div class='add'>+	BUILD_BUG_ON(AP_MAX_STATIONS &gt; WL12XX_MAX_LINKS);</div><div class='ctx'> </div><div class='ctx'> 	hw = ieee80211_alloc_hw(sizeof(*wl), &amp;wl1271_ops);</div><div class='ctx'> 	if (!hw) {</div><div class='hunk'>@@ -4765,41 +4990,26 @@ struct ieee80211_hw *wl1271_alloc_hw(void)</div><div class='ctx'> 		goto err_hw_alloc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	plat_dev = kmemdup(&amp;wl1271_device, sizeof(wl1271_device), GFP_KERNEL);</div><div class='del'>-	if (!plat_dev) {</div><div class='del'>-		wl1271_error("could not allocate platform_device");</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_plat_alloc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	wl = hw-&gt;priv;</div><div class='ctx'> 	memset(wl, 0, sizeof(*wl));</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;wl-&gt;list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;wl-&gt;wlvif_list);</div><div class='ctx'> </div><div class='ctx'> 	wl-&gt;hw = hw;</div><div class='del'>-	wl-&gt;plat_dev = plat_dev;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_TX_QUEUES; i++)</div><div class='del'>-		skb_queue_head_init(&amp;wl-&gt;tx_queue[i]);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NUM_TX_QUEUES; i++)</div><div class='del'>-		for (j = 0; j &lt; AP_MAX_LINKS; j++)</div><div class='add'>+		for (j = 0; j &lt; WL12XX_MAX_LINKS; j++)</div><div class='ctx'> 			skb_queue_head_init(&amp;wl-&gt;links[j].tx_queue[i]);</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_head_init(&amp;wl-&gt;deferred_rx_queue);</div><div class='ctx'> 	skb_queue_head_init(&amp;wl-&gt;deferred_tx_queue);</div><div class='ctx'> </div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;wl-&gt;elp_work, wl1271_elp_work);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;wl-&gt;pspoll_work, wl1271_pspoll_work);</div><div class='ctx'> 	INIT_WORK(&amp;wl-&gt;netstack_work, wl1271_netstack_work);</div><div class='ctx'> 	INIT_WORK(&amp;wl-&gt;tx_work, wl1271_tx_work);</div><div class='ctx'> 	INIT_WORK(&amp;wl-&gt;recovery_work, wl1271_recovery_work);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;wl-&gt;scan_complete_work, wl1271_scan_complete_work);</div><div class='del'>-	INIT_WORK(&amp;wl-&gt;rx_streaming_enable_work,</div><div class='del'>-		  wl1271_rx_streaming_enable_work);</div><div class='del'>-	INIT_WORK(&amp;wl-&gt;rx_streaming_disable_work,</div><div class='del'>-		  wl1271_rx_streaming_disable_work);</div><div class='ctx'> </div><div class='ctx'> 	wl-&gt;freezable_wq = create_freezable_workqueue("wl12xx_wq");</div><div class='ctx'> 	if (!wl-&gt;freezable_wq) {</div><div class='hunk'>@@ -4808,41 +5018,21 @@ struct ieee80211_hw *wl1271_alloc_hw(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wl-&gt;channel = WL1271_DEFAULT_CHANNEL;</div><div class='del'>-	wl-&gt;beacon_int = WL1271_DEFAULT_BEACON_INT;</div><div class='del'>-	wl-&gt;default_key = 0;</div><div class='ctx'> 	wl-&gt;rx_counter = 0;</div><div class='del'>-	wl-&gt;psm_entry_retry = 0;</div><div class='ctx'> 	wl-&gt;power_level = WL1271_DEFAULT_POWER_LEVEL;</div><div class='del'>-	wl-&gt;basic_rate_set = CONF_TX_RATE_MASK_BASIC;</div><div class='del'>-	wl-&gt;basic_rate = CONF_TX_RATE_MASK_BASIC;</div><div class='del'>-	wl-&gt;rate_set = CONF_TX_RATE_MASK_BASIC;</div><div class='ctx'> 	wl-&gt;band = IEEE80211_BAND_2GHZ;</div><div class='ctx'> 	wl-&gt;vif = NULL;</div><div class='ctx'> 	wl-&gt;flags = 0;</div><div class='ctx'> 	wl-&gt;sg_enabled = true;</div><div class='ctx'> 	wl-&gt;hw_pg_ver = -1;</div><div class='del'>-	wl-&gt;bss_type = MAX_BSS_TYPE;</div><div class='del'>-	wl-&gt;set_bss_type = MAX_BSS_TYPE;</div><div class='del'>-	wl-&gt;last_tx_hlid = 0;</div><div class='ctx'> 	wl-&gt;ap_ps_map = 0;</div><div class='ctx'> 	wl-&gt;ap_fw_ps_map = 0;</div><div class='ctx'> 	wl-&gt;quirks = 0;</div><div class='ctx'> 	wl-&gt;platform_quirks = 0;</div><div class='ctx'> 	wl-&gt;sched_scanning = false;</div><div class='del'>-	wl-&gt;tx_security_seq = 0;</div><div class='del'>-	wl-&gt;tx_security_last_seq_lsb = 0;</div><div class='ctx'> 	wl-&gt;tx_spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;</div><div class='del'>-	wl-&gt;role_id = WL12XX_INVALID_ROLE_ID;</div><div class='ctx'> 	wl-&gt;system_hlid = WL12XX_SYSTEM_HLID;</div><div class='del'>-	wl-&gt;sta_hlid = WL12XX_INVALID_LINK_ID;</div><div class='del'>-	wl-&gt;dev_role_id = WL12XX_INVALID_ROLE_ID;</div><div class='del'>-	wl-&gt;dev_hlid = WL12XX_INVALID_LINK_ID;</div><div class='del'>-	wl-&gt;session_counter = 0;</div><div class='del'>-	wl-&gt;ap_bcast_hlid = WL12XX_INVALID_LINK_ID;</div><div class='del'>-	wl-&gt;ap_global_hlid = WL12XX_INVALID_LINK_ID;</div><div class='ctx'> 	wl-&gt;active_sta_count = 0;</div><div class='del'>-	setup_timer(&amp;wl-&gt;rx_streaming_timer, wl1271_rx_streaming_timer,</div><div class='del'>-		    (unsigned long) wl);</div><div class='ctx'> 	wl-&gt;fwlog_size = 0;</div><div class='ctx'> 	init_waitqueue_head(&amp;wl-&gt;fwlog_waitq);</div><div class='ctx'> </div><div class='hunk'>@@ -4860,8 +5050,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Apply default driver configuration. */</div><div class='ctx'> 	wl1271_conf_init(wl);</div><div class='del'>-	wl-&gt;bitrate_masks[IEEE80211_BAND_2GHZ] = wl-&gt;conf.tx.basic_rate;</div><div class='del'>-	wl-&gt;bitrate_masks[IEEE80211_BAND_5GHZ] = wl-&gt;conf.tx.basic_rate_5;</div><div class='ctx'> </div><div class='ctx'> 	order = get_order(WL1271_AGGR_BUFFER_SIZE);</div><div class='ctx'> 	wl-&gt;aggr_buf = (u8 *)__get_free_pages(GFP_KERNEL, order);</div><div class='hunk'>@@ -4883,49 +5071,8 @@ struct ieee80211_hw *wl1271_alloc_hw(void)</div><div class='ctx'> 		goto err_dummy_packet;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Register platform device */</div><div class='del'>-	ret = platform_device_register(wl-&gt;plat_dev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		wl1271_error("couldn't register platform device");</div><div class='del'>-		goto err_fwlog;</div><div class='del'>-	}</div><div class='del'>-	dev_set_drvdata(&amp;wl-&gt;plat_dev-&gt;dev, wl);</div><div class='del'>-</div><div class='del'>-	/* Create sysfs file to control bt coex state */</div><div class='del'>-	ret = device_create_file(&amp;wl-&gt;plat_dev-&gt;dev, &amp;dev_attr_bt_coex_state);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		wl1271_error("failed to create sysfs file bt_coex_state");</div><div class='del'>-		goto err_platform;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create sysfs file to get HW PG version */</div><div class='del'>-	ret = device_create_file(&amp;wl-&gt;plat_dev-&gt;dev, &amp;dev_attr_hw_pg_ver);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		wl1271_error("failed to create sysfs file hw_pg_ver");</div><div class='del'>-		goto err_bt_coex_state;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create sysfs file for the FW log */</div><div class='del'>-	ret = device_create_bin_file(&amp;wl-&gt;plat_dev-&gt;dev, &amp;fwlog_attr);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		wl1271_error("failed to create sysfs file fwlog");</div><div class='del'>-		goto err_hw_pg_ver;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return hw;</div><div class='ctx'> </div><div class='del'>-err_hw_pg_ver:</div><div class='del'>-	device_remove_file(&amp;wl-&gt;plat_dev-&gt;dev, &amp;dev_attr_hw_pg_ver);</div><div class='del'>-</div><div class='del'>-err_bt_coex_state:</div><div class='del'>-	device_remove_file(&amp;wl-&gt;plat_dev-&gt;dev, &amp;dev_attr_bt_coex_state);</div><div class='del'>-</div><div class='del'>-err_platform:</div><div class='del'>-	platform_device_unregister(wl-&gt;plat_dev);</div><div class='del'>-</div><div class='del'>-err_fwlog:</div><div class='del'>-	free_page((unsigned long)wl-&gt;fwlog);</div><div class='del'>-</div><div class='ctx'> err_dummy_packet:</div><div class='ctx'> 	dev_kfree_skb(wl-&gt;dummy_packet);</div><div class='ctx'> </div><div class='hunk'>@@ -4937,18 +5084,14 @@ err_wq:</div><div class='ctx'> </div><div class='ctx'> err_hw:</div><div class='ctx'> 	wl1271_debugfs_exit(wl);</div><div class='del'>-	kfree(plat_dev);</div><div class='del'>-</div><div class='del'>-err_plat_alloc:</div><div class='ctx'> 	ieee80211_free_hw(hw);</div><div class='ctx'> </div><div class='ctx'> err_hw_alloc:</div><div class='ctx'> </div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(wl1271_alloc_hw);</div><div class='ctx'> </div><div class='del'>-int wl1271_free_hw(struct wl1271 *wl)</div><div class='add'>+static int wl1271_free_hw(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='ctx'> 	/* Unblock any fwlog readers */</div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='hunk'>@@ -4956,17 +5099,15 @@ int wl1271_free_hw(struct wl1271 *wl)</div><div class='ctx'> 	wake_up_interruptible_all(&amp;wl-&gt;fwlog_waitq);</div><div class='ctx'> 	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	device_remove_bin_file(&amp;wl-&gt;plat_dev-&gt;dev, &amp;fwlog_attr);</div><div class='add'>+	device_remove_bin_file(wl-&gt;dev, &amp;fwlog_attr);</div><div class='ctx'> </div><div class='del'>-	device_remove_file(&amp;wl-&gt;plat_dev-&gt;dev, &amp;dev_attr_hw_pg_ver);</div><div class='add'>+	device_remove_file(wl-&gt;dev, &amp;dev_attr_hw_pg_ver);</div><div class='ctx'> </div><div class='del'>-	device_remove_file(&amp;wl-&gt;plat_dev-&gt;dev, &amp;dev_attr_bt_coex_state);</div><div class='del'>-	platform_device_unregister(wl-&gt;plat_dev);</div><div class='add'>+	device_remove_file(wl-&gt;dev, &amp;dev_attr_bt_coex_state);</div><div class='ctx'> 	free_page((unsigned long)wl-&gt;fwlog);</div><div class='ctx'> 	dev_kfree_skb(wl-&gt;dummy_packet);</div><div class='ctx'> 	free_pages((unsigned long)wl-&gt;aggr_buf,</div><div class='ctx'> 			get_order(WL1271_AGGR_BUFFER_SIZE));</div><div class='del'>-	kfree(wl-&gt;plat_dev);</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debugfs_exit(wl);</div><div class='ctx'> </div><div class='hunk'>@@ -4983,7 +5124,174 @@ int wl1271_free_hw(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(wl1271_free_hw);</div><div class='add'>+</div><div class='add'>+static irqreturn_t wl12xx_hardirq(int irq, void *cookie)</div><div class='add'>+{</div><div class='add'>+	struct wl1271 *wl = cookie;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	wl1271_debug(DEBUG_IRQ, "IRQ");</div><div class='add'>+</div><div class='add'>+	/* complete the ELP completion */</div><div class='add'>+	spin_lock_irqsave(&amp;wl-&gt;wl_lock, flags);</div><div class='add'>+	set_bit(WL1271_FLAG_IRQ_RUNNING, &amp;wl-&gt;flags);</div><div class='add'>+	if (wl-&gt;elp_compl) {</div><div class='add'>+		complete(wl-&gt;elp_compl);</div><div class='add'>+		wl-&gt;elp_compl = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(WL1271_FLAG_SUSPENDED, &amp;wl-&gt;flags)) {</div><div class='add'>+		/* don't enqueue a work right now. mark it as pending */</div><div class='add'>+		set_bit(WL1271_FLAG_PENDING_WORK, &amp;wl-&gt;flags);</div><div class='add'>+		wl1271_debug(DEBUG_IRQ, "should not enqueue work");</div><div class='add'>+		disable_irq_nosync(wl-&gt;irq);</div><div class='add'>+		pm_wakeup_event(wl-&gt;dev, 0);</div><div class='add'>+		spin_unlock_irqrestore(&amp;wl-&gt;wl_lock, flags);</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;wl-&gt;wl_lock, flags);</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 int __devinit wl12xx_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct wl12xx_platform_data *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	struct ieee80211_hw *hw;</div><div class='add'>+	struct wl1271 *wl;</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+	int ret = -ENODEV;</div><div class='add'>+</div><div class='add'>+	hw = wl1271_alloc_hw();</div><div class='add'>+	if (IS_ERR(hw)) {</div><div class='add'>+		wl1271_error("can't allocate hw");</div><div class='add'>+		ret = PTR_ERR(hw);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wl = hw-&gt;priv;</div><div class='add'>+	wl-&gt;irq = platform_get_irq(pdev, 0);</div><div class='add'>+	wl-&gt;ref_clock = pdata-&gt;board_ref_clock;</div><div class='add'>+	wl-&gt;tcxo_clock = pdata-&gt;board_tcxo_clock;</div><div class='add'>+	wl-&gt;platform_quirks = pdata-&gt;platform_quirks;</div><div class='add'>+	wl-&gt;set_power = pdata-&gt;set_power;</div><div class='add'>+	wl-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	wl-&gt;if_ops = pdata-&gt;ops;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, wl);</div><div class='add'>+</div><div class='add'>+	if (wl-&gt;platform_quirks &amp; WL12XX_PLATFORM_QUIRK_EDGE_IRQ)</div><div class='add'>+		irqflags = IRQF_TRIGGER_RISING;</div><div class='add'>+	else</div><div class='add'>+		irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;</div><div class='add'>+</div><div class='add'>+	ret = request_threaded_irq(wl-&gt;irq, wl12xx_hardirq, wl1271_irq,</div><div class='add'>+				   irqflags,</div><div class='add'>+				   pdev-&gt;name, wl);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		wl1271_error("request_irq() failed: %d", ret);</div><div class='add'>+		goto out_free_hw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = enable_irq_wake(wl-&gt;irq);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		wl-&gt;irq_wake_enabled = true;</div><div class='add'>+		device_init_wakeup(wl-&gt;dev, 1);</div><div class='add'>+		if (pdata-&gt;pwr_in_suspend)</div><div class='add'>+			hw-&gt;wiphy-&gt;wowlan.flags = WIPHY_WOWLAN_ANY;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	disable_irq(wl-&gt;irq);</div><div class='add'>+</div><div class='add'>+	ret = wl1271_init_ieee80211(wl);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_irq;</div><div class='add'>+</div><div class='add'>+	ret = wl1271_register_hw(wl);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_irq;</div><div class='add'>+</div><div class='add'>+	/* Create sysfs file to control bt coex state */</div><div class='add'>+	ret = device_create_file(wl-&gt;dev, &amp;dev_attr_bt_coex_state);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		wl1271_error("failed to create sysfs file bt_coex_state");</div><div class='add'>+		goto out_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Create sysfs file to get HW PG version */</div><div class='add'>+	ret = device_create_file(wl-&gt;dev, &amp;dev_attr_hw_pg_ver);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		wl1271_error("failed to create sysfs file hw_pg_ver");</div><div class='add'>+		goto out_bt_coex_state;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Create sysfs file for the FW log */</div><div class='add'>+	ret = device_create_bin_file(wl-&gt;dev, &amp;fwlog_attr);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		wl1271_error("failed to create sysfs file fwlog");</div><div class='add'>+		goto out_hw_pg_ver;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_hw_pg_ver:</div><div class='add'>+	device_remove_file(wl-&gt;dev, &amp;dev_attr_hw_pg_ver);</div><div class='add'>+</div><div class='add'>+out_bt_coex_state:</div><div class='add'>+	device_remove_file(wl-&gt;dev, &amp;dev_attr_bt_coex_state);</div><div class='add'>+</div><div class='add'>+out_irq:</div><div class='add'>+	free_irq(wl-&gt;irq, wl);</div><div class='add'>+</div><div class='add'>+out_free_hw:</div><div class='add'>+	wl1271_free_hw(wl);</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 __devexit wl12xx_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct wl1271 *wl = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (wl-&gt;irq_wake_enabled) {</div><div class='add'>+		device_init_wakeup(wl-&gt;dev, 0);</div><div class='add'>+		disable_irq_wake(wl-&gt;irq);</div><div class='add'>+	}</div><div class='add'>+	wl1271_unregister_hw(wl);</div><div class='add'>+	free_irq(wl-&gt;irq, wl);</div><div class='add'>+	wl1271_free_hw(wl);</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 wl12xx_id_table[] __devinitconst = {</div><div class='add'>+	{ "wl12xx", 0 },</div><div class='add'>+	{  } /* Terminating Entry */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(platform, wl12xx_id_table);</div><div class='add'>+</div><div class='add'>+static struct platform_driver wl12xx_driver = {</div><div class='add'>+	.probe		= wl12xx_probe,</div><div class='add'>+	.remove		= __devexit_p(wl12xx_remove),</div><div class='add'>+	.id_table	= wl12xx_id_table,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "wl12xx_driver",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init wl12xx_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;wl12xx_driver);</div><div class='add'>+}</div><div class='add'>+module_init(wl12xx_init);</div><div class='add'>+</div><div class='add'>+static void __exit wl12xx_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;wl12xx_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(wl12xx_exit);</div><div class='ctx'> </div><div class='ctx'> u32 wl12xx_debug_level = DEBUG_NONE;</div><div class='ctx'> EXPORT_SYMBOL_GPL(wl12xx_debug_level);</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/ps.c b/drivers/net/wireless/wl12xx/ps.c<br/>index c15ebf2efd40..a2bdacdd7e1d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/ps.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/ps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/ps.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/ps.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include "ps.h"</div><div class='ctx'> #include "io.h"</div><div class='ctx'> #include "tx.h"</div><div class='add'>+#include "debug.h"</div><div class='ctx'> </div><div class='ctx'> #define WL1271_WAKEUP_TIMEOUT 500</div><div class='ctx'> </div><div class='hunk'>@@ -32,6 +33,7 @@ void wl1271_elp_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct delayed_work *dwork;</div><div class='ctx'> 	struct wl1271 *wl;</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='ctx'> </div><div class='ctx'> 	dwork = container_of(work, struct delayed_work, work);</div><div class='ctx'> 	wl = container_of(dwork, struct wl1271, elp_work);</div><div class='hunk'>@@ -47,11 +49,18 @@ void wl1271_elp_work(struct work_struct *work)</div><div class='ctx'> 	if (unlikely(!test_bit(WL1271_FLAG_ELP_REQUESTED, &amp;wl-&gt;flags)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(WL1271_FLAG_IN_ELP, &amp;wl-&gt;flags) ||</div><div class='del'>-	    (!test_bit(WL1271_FLAG_PSM, &amp;wl-&gt;flags) &amp;&amp;</div><div class='del'>-	     !test_bit(WL1271_FLAG_IDLE, &amp;wl-&gt;flags)))</div><div class='add'>+	if (test_bit(WL1271_FLAG_IN_ELP, &amp;wl-&gt;flags))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	wl12xx_for_each_wlvif(wl, wlvif) {</div><div class='add'>+		if (wlvif-&gt;bss_type == BSS_TYPE_AP_BSS)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (!test_bit(WLVIF_FLAG_PSM, &amp;wlvif-&gt;flags) &amp;&amp;</div><div class='add'>+		    test_bit(WLVIF_FLAG_IN_USE, &amp;wlvif-&gt;flags))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	wl1271_debug(DEBUG_PSM, "chip to elp");</div><div class='ctx'> 	wl1271_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG_ADDR, ELPCTRL_SLEEP);</div><div class='ctx'> 	set_bit(WL1271_FLAG_IN_ELP, &amp;wl-&gt;flags);</div><div class='hunk'>@@ -65,13 +74,20 @@ out:</div><div class='ctx'> /* Routines to toggle sleep mode while in ELP */</div><div class='ctx'> void wl1271_ps_elp_sleep(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='add'>+</div><div class='ctx'> 	/* we shouldn't get consecutive sleep requests */</div><div class='ctx'> 	if (WARN_ON(test_and_set_bit(WL1271_FLAG_ELP_REQUESTED, &amp;wl-&gt;flags)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(WL1271_FLAG_PSM, &amp;wl-&gt;flags) &amp;&amp;</div><div class='del'>-	    !test_bit(WL1271_FLAG_IDLE, &amp;wl-&gt;flags))</div><div class='del'>-		return;</div><div class='add'>+	wl12xx_for_each_wlvif(wl, wlvif) {</div><div class='add'>+		if (wlvif-&gt;bss_type == BSS_TYPE_AP_BSS)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		if (!test_bit(WLVIF_FLAG_PSM, &amp;wlvif-&gt;flags) &amp;&amp;</div><div class='add'>+		    test_bit(WLVIF_FLAG_IN_USE, &amp;wlvif-&gt;flags))</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ieee80211_queue_delayed_work(wl-&gt;hw, &amp;wl-&gt;elp_work,</div><div class='ctx'> 				     msecs_to_jiffies(ELP_ENTRY_DELAY));</div><div class='hunk'>@@ -143,8 +159,8 @@ out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode,</div><div class='del'>-		       u32 rates, bool send)</div><div class='add'>+int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+		       enum wl1271_cmd_ps_mode mode, u32 rates, bool send)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -152,39 +168,34 @@ int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode,</div><div class='ctx'> 	case STATION_POWER_SAVE_MODE:</div><div class='ctx'> 		wl1271_debug(DEBUG_PSM, "entering psm");</div><div class='ctx'> </div><div class='del'>-		ret = wl1271_acx_wake_up_conditions(wl);</div><div class='add'>+		ret = wl1271_acx_wake_up_conditions(wl, wlvif);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			wl1271_error("couldn't set wake up conditions");</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = wl1271_cmd_ps_mode(wl, STATION_POWER_SAVE_MODE);</div><div class='add'>+		ret = wl1271_cmd_ps_mode(wl, wlvif, STATION_POWER_SAVE_MODE);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		set_bit(WL1271_FLAG_PSM, &amp;wl-&gt;flags);</div><div class='add'>+		set_bit(WLVIF_FLAG_PSM, &amp;wlvif-&gt;flags);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case STATION_ACTIVE_MODE:</div><div class='ctx'> 	default:</div><div class='ctx'> 		wl1271_debug(DEBUG_PSM, "leaving psm");</div><div class='ctx'> </div><div class='ctx'> 		/* disable beacon early termination */</div><div class='del'>-		if (wl-&gt;band == IEEE80211_BAND_2GHZ) {</div><div class='del'>-			ret = wl1271_acx_bet_enable(wl, false);</div><div class='add'>+		if (wlvif-&gt;band == IEEE80211_BAND_2GHZ) {</div><div class='add'>+			ret = wl1271_acx_bet_enable(wl, wlvif, false);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* disable beacon filtering */</div><div class='del'>-		ret = wl1271_acx_beacon_filter_opt(wl, false);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		ret = wl1271_cmd_ps_mode(wl, STATION_ACTIVE_MODE);</div><div class='add'>+		ret = wl1271_cmd_ps_mode(wl, wlvif, STATION_ACTIVE_MODE);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		clear_bit(WL1271_FLAG_PSM, &amp;wl-&gt;flags);</div><div class='add'>+		clear_bit(WLVIF_FLAG_PSM, &amp;wlvif-&gt;flags);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -223,9 +234,11 @@ static void wl1271_ps_filter_frames(struct wl1271 *wl, u8 hlid)</div><div class='ctx'> 	wl1271_handle_tx_low_watermark(wl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void wl1271_ps_link_start(struct wl1271 *wl, u8 hlid, bool clean_queues)</div><div class='add'>+void wl12xx_ps_link_start(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			  u8 hlid, bool clean_queues)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sta *sta;</div><div class='add'>+	struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(hlid, &amp;wl-&gt;ap_ps_map))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -235,7 +248,7 @@ void wl1271_ps_link_start(struct wl1271 *wl, u8 hlid, bool clean_queues)</div><div class='ctx'> 		     clean_queues);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	sta = ieee80211_find_sta(wl-&gt;vif, wl-&gt;links[hlid].addr);</div><div class='add'>+	sta = ieee80211_find_sta(vif, wl-&gt;links[hlid].addr);</div><div class='ctx'> 	if (!sta) {</div><div class='ctx'> 		wl1271_error("could not find sta %pM for starting ps",</div><div class='ctx'> 			     wl-&gt;links[hlid].addr);</div><div class='hunk'>@@ -253,9 +266,10 @@ void wl1271_ps_link_start(struct wl1271 *wl, u8 hlid, bool clean_queues)</div><div class='ctx'> 	__set_bit(hlid, &amp;wl-&gt;ap_ps_map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void wl1271_ps_link_end(struct wl1271 *wl, u8 hlid)</div><div class='add'>+void wl12xx_ps_link_end(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 hlid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_sta *sta;</div><div class='add'>+	struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(hlid, &amp;wl-&gt;ap_ps_map))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -265,7 +279,7 @@ void wl1271_ps_link_end(struct wl1271 *wl, u8 hlid)</div><div class='ctx'> 	__clear_bit(hlid, &amp;wl-&gt;ap_ps_map);</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	sta = ieee80211_find_sta(wl-&gt;vif, wl-&gt;links[hlid].addr);</div><div class='add'>+	sta = ieee80211_find_sta(vif, wl-&gt;links[hlid].addr);</div><div class='ctx'> 	if (!sta) {</div><div class='ctx'> 		wl1271_error("could not find sta %pM for ending ps",</div><div class='ctx'> 			     wl-&gt;links[hlid].addr);</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/ps.h b/drivers/net/wireless/wl12xx/ps.h<br/>index 25eb9bc9b628..a12052f02026 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/ps.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/ps.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/ps.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/ps.h</a></div><div class='hunk'>@@ -27,13 +27,14 @@</div><div class='ctx'> #include "wl12xx.h"</div><div class='ctx'> #include "acx.h"</div><div class='ctx'> </div><div class='del'>-int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode,</div><div class='del'>-		       u32 rates, bool send);</div><div class='add'>+int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+		       enum wl1271_cmd_ps_mode mode, u32 rates, bool send);</div><div class='ctx'> void wl1271_ps_elp_sleep(struct wl1271 *wl);</div><div class='ctx'> int wl1271_ps_elp_wakeup(struct wl1271 *wl);</div><div class='ctx'> void wl1271_elp_work(struct work_struct *work);</div><div class='del'>-void wl1271_ps_link_start(struct wl1271 *wl, u8 hlid, bool clean_queues);</div><div class='del'>-void wl1271_ps_link_end(struct wl1271 *wl, u8 hlid);</div><div class='add'>+void wl12xx_ps_link_start(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			  u8 hlid, bool clean_queues);</div><div class='add'>+void wl12xx_ps_link_end(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 hlid);</div><div class='ctx'> </div><div class='ctx'> #define WL1271_PS_COMPLETE_TIMEOUT 500</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/reg.h b/drivers/net/wireless/wl12xx/reg.h<br/>index 3f570f397586..df34d5977b98 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/reg.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/reg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/reg.h</a></div><div class='hunk'>@@ -408,7 +408,7 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Firmware image load chunk size */</div><div class='del'>-#define CHUNK_SIZE          512</div><div class='add'>+#define CHUNK_SIZE	16384</div><div class='ctx'> </div><div class='ctx'> /* Firmware image header size */</div><div class='ctx'> #define FW_HDR_SIZE 8</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/rx.c b/drivers/net/wireless/wl12xx/rx.c<br/>index dee4cfe9ccc1..4fbd2a722ffa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/rx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/rx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/rx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/rx.c</a></div><div class='hunk'>@@ -25,9 +25,11 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "wl12xx.h"</div><div class='add'>+#include "debug.h"</div><div class='ctx'> #include "acx.h"</div><div class='ctx'> #include "reg.h"</div><div class='ctx'> #include "rx.h"</div><div class='add'>+#include "tx.h"</div><div class='ctx'> #include "io.h"</div><div class='ctx'> </div><div class='ctx'> static u8 wl12xx_rx_get_mem_block(struct wl12xx_fw_status *status,</div><div class='hunk'>@@ -96,7 +98,7 @@ static void wl1271_rx_status(struct wl1271 *wl,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,</div><div class='del'>-				 bool unaligned)</div><div class='add'>+				 bool unaligned, u8 *hlid)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_rx_descriptor *desc;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -159,6 +161,7 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,</div><div class='ctx'> 	 * payload aligned to 4 bytes.</div><div class='ctx'> 	 */</div><div class='ctx'> 	memcpy(buf, data + sizeof(*desc), length - sizeof(*desc));</div><div class='add'>+	*hlid = desc-&gt;hlid;</div><div class='ctx'> </div><div class='ctx'> 	hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='ctx'> 	if (ieee80211_is_beacon(hdr-&gt;frame_control))</div><div class='hunk'>@@ -169,10 +172,10 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,</div><div class='ctx'> 	wl1271_rx_status(wl, desc, IEEE80211_SKB_RXCB(skb), beacon);</div><div class='ctx'> </div><div class='ctx'> 	seq_num = (le16_to_cpu(hdr-&gt;seq_ctrl) &amp; IEEE80211_SCTL_SEQ) &gt;&gt; 4;</div><div class='del'>-	wl1271_debug(DEBUG_RX, "rx skb 0x%p: %d B %s seq %d", skb,</div><div class='add'>+	wl1271_debug(DEBUG_RX, "rx skb 0x%p: %d B %s seq %d hlid %d", skb,</div><div class='ctx'> 		     skb-&gt;len - desc-&gt;pad_len,</div><div class='ctx'> 		     beacon ? "beacon" : "",</div><div class='del'>-		     seq_num);</div><div class='add'>+		     seq_num, *hlid);</div><div class='ctx'> </div><div class='ctx'> 	skb_trim(skb, skb-&gt;len - desc-&gt;pad_len);</div><div class='ctx'> </div><div class='hunk'>@@ -185,6 +188,7 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,</div><div class='ctx'> void wl12xx_rx(struct wl1271 *wl, struct wl12xx_fw_status *status)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_acx_mem_map *wl_mem_map = wl-&gt;target_mem_map;</div><div class='add'>+	unsigned long active_hlids[BITS_TO_LONGS(WL12XX_MAX_LINKS)] = {0};</div><div class='ctx'> 	u32 buf_size;</div><div class='ctx'> 	u32 fw_rx_counter  = status-&gt;fw_rx_counter &amp; NUM_RX_PKT_DESC_MOD_MASK;</div><div class='ctx'> 	u32 drv_rx_counter = wl-&gt;rx_counter &amp; NUM_RX_PKT_DESC_MOD_MASK;</div><div class='hunk'>@@ -192,8 +196,7 @@ void wl12xx_rx(struct wl1271 *wl, struct wl12xx_fw_status *status)</div><div class='ctx'> 	u32 mem_block;</div><div class='ctx'> 	u32 pkt_length;</div><div class='ctx'> 	u32 pkt_offset;</div><div class='del'>-	bool is_ap = (wl-&gt;bss_type == BSS_TYPE_AP_BSS);</div><div class='del'>-	bool had_data = false;</div><div class='add'>+	u8 hlid;</div><div class='ctx'> 	bool unaligned = false;</div><div class='ctx'> </div><div class='ctx'> 	while (drv_rx_counter != fw_rx_counter) {</div><div class='hunk'>@@ -253,8 +256,15 @@ void wl12xx_rx(struct wl1271 *wl, struct wl12xx_fw_status *status)</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (wl1271_rx_handle_data(wl,</div><div class='ctx'> 						  wl-&gt;aggr_buf + pkt_offset,</div><div class='del'>-						  pkt_length, unaligned) == 1)</div><div class='del'>-				had_data = true;</div><div class='add'>+						  pkt_length, unaligned,</div><div class='add'>+						  &amp;hlid) == 1) {</div><div class='add'>+				if (hlid &lt; WL12XX_MAX_LINKS)</div><div class='add'>+					__set_bit(hlid, active_hlids);</div><div class='add'>+				else</div><div class='add'>+					WARN(1,</div><div class='add'>+					     "hlid exceeded WL12XX_MAX_LINKS "</div><div class='add'>+					     "(%d)\n", hlid);</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			wl-&gt;rx_counter++;</div><div class='ctx'> 			drv_rx_counter++;</div><div class='hunk'>@@ -270,17 +280,5 @@ void wl12xx_rx(struct wl1271 *wl, struct wl12xx_fw_status *status)</div><div class='ctx'> 	if (wl-&gt;quirks &amp; WL12XX_QUIRK_END_OF_TRANSACTION)</div><div class='ctx'> 		wl1271_write32(wl, RX_DRIVER_COUNTER_ADDRESS, wl-&gt;rx_counter);</div><div class='ctx'> </div><div class='del'>-	if (!is_ap &amp;&amp; wl-&gt;conf.rx_streaming.interval &amp;&amp; had_data &amp;&amp;</div><div class='del'>-	    (wl-&gt;conf.rx_streaming.always ||</div><div class='del'>-	     test_bit(WL1271_FLAG_SOFT_GEMINI, &amp;wl-&gt;flags))) {</div><div class='del'>-		u32 timeout = wl-&gt;conf.rx_streaming.duration;</div><div class='del'>-</div><div class='del'>-		/* restart rx streaming */</div><div class='del'>-		if (!test_bit(WL1271_FLAG_RX_STREAMING_STARTED, &amp;wl-&gt;flags))</div><div class='del'>-			ieee80211_queue_work(wl-&gt;hw,</div><div class='del'>-					     &amp;wl-&gt;rx_streaming_enable_work);</div><div class='del'>-</div><div class='del'>-		mod_timer(&amp;wl-&gt;rx_streaming_timer,</div><div class='del'>-			  jiffies + msecs_to_jiffies(timeout));</div><div class='del'>-	}</div><div class='add'>+	wl12xx_rearm_rx_streaming(wl, active_hlids);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c<br/>index fc29c671cf3b..e24111ececc5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/scan.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/scan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/scan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/scan.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/ieee80211.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "wl12xx.h"</div><div class='add'>+#include "debug.h"</div><div class='ctx'> #include "cmd.h"</div><div class='ctx'> #include "scan.h"</div><div class='ctx'> #include "acx.h"</div><div class='hunk'>@@ -34,6 +35,8 @@ void wl1271_scan_complete_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct delayed_work *dwork;</div><div class='ctx'> 	struct wl1271 *wl;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	bool is_sta, is_ibss;</div><div class='ctx'> </div><div class='hunk'>@@ -50,28 +53,31 @@ void wl1271_scan_complete_work(struct work_struct *work)</div><div class='ctx'> 	if (wl-&gt;scan.state == WL1271_SCAN_STATE_IDLE)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	vif = wl-&gt;scan_vif;</div><div class='add'>+	wlvif = wl12xx_vif_to_data(vif);</div><div class='add'>+</div><div class='ctx'> 	wl-&gt;scan.state = WL1271_SCAN_STATE_IDLE;</div><div class='ctx'> 	memset(wl-&gt;scan.scanned_ch, 0, sizeof(wl-&gt;scan.scanned_ch));</div><div class='ctx'> 	wl-&gt;scan.req = NULL;</div><div class='add'>+	wl-&gt;scan_vif = NULL;</div><div class='ctx'> </div><div class='ctx'> 	ret = wl1271_ps_elp_wakeup(wl);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &amp;wl-&gt;flags)) {</div><div class='add'>+	if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &amp;wlvif-&gt;flags)) {</div><div class='ctx'> 		/* restore hardware connection monitoring template */</div><div class='del'>-		wl1271_cmd_build_ap_probe_req(wl, wl-&gt;probereq);</div><div class='add'>+		wl1271_cmd_build_ap_probe_req(wl, wlvif, wlvif-&gt;probereq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* return to ROC if needed */</div><div class='del'>-	is_sta = (wl-&gt;bss_type == BSS_TYPE_STA_BSS);</div><div class='del'>-	is_ibss = (wl-&gt;bss_type == BSS_TYPE_IBSS);</div><div class='del'>-	if (((is_sta &amp;&amp; !test_bit(WL1271_FLAG_STA_ASSOCIATED, &amp;wl-&gt;flags)) ||</div><div class='del'>-	     (is_ibss &amp;&amp; !test_bit(WL1271_FLAG_IBSS_JOINED, &amp;wl-&gt;flags))) &amp;&amp;</div><div class='del'>-	    !test_bit(wl-&gt;dev_role_id, wl-&gt;roc_map)) {</div><div class='add'>+	is_sta = (wlvif-&gt;bss_type == BSS_TYPE_STA_BSS);</div><div class='add'>+	is_ibss = (wlvif-&gt;bss_type == BSS_TYPE_IBSS);</div><div class='add'>+	if (((is_sta &amp;&amp; !test_bit(WLVIF_FLAG_STA_ASSOCIATED, &amp;wlvif-&gt;flags)) ||</div><div class='add'>+	     (is_ibss &amp;&amp; !test_bit(WLVIF_FLAG_IBSS_JOINED, &amp;wlvif-&gt;flags))) &amp;&amp;</div><div class='add'>+	    !test_bit(wlvif-&gt;dev_role_id, wl-&gt;roc_map)) {</div><div class='ctx'> 		/* restore remain on channel */</div><div class='del'>-		wl12xx_cmd_role_start_dev(wl);</div><div class='del'>-		wl12xx_roc(wl, wl-&gt;dev_role_id);</div><div class='add'>+		wl12xx_start_dev(wl, wlvif);</div><div class='ctx'> 	}</div><div class='ctx'> 	wl1271_ps_elp_sleep(wl);</div><div class='ctx'> </div><div class='hunk'>@@ -155,9 +161,11 @@ static int wl1271_get_scan_channels(struct wl1271 *wl,</div><div class='ctx'> </div><div class='ctx'> #define WL1271_NOTHING_TO_SCAN 1</div><div class='ctx'> </div><div class='del'>-static int wl1271_scan_send(struct wl1271 *wl, enum ieee80211_band band,</div><div class='del'>-			     bool passive, u32 basic_rate)</div><div class='add'>+static int wl1271_scan_send(struct wl1271 *wl, struct ieee80211_vif *vif,</div><div class='add'>+			    enum ieee80211_band band,</div><div class='add'>+			    bool passive, u32 basic_rate)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> 	struct wl1271_cmd_scan *cmd;</div><div class='ctx'> 	struct wl1271_cmd_trigger_scan_to *trigger;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -177,11 +185,11 @@ static int wl1271_scan_send(struct wl1271 *wl, enum ieee80211_band band,</div><div class='ctx'> 	if (passive)</div><div class='ctx'> 		scan_options |= WL1271_SCAN_OPT_PASSIVE;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(wl-&gt;role_id == WL12XX_INVALID_ROLE_ID)) {</div><div class='add'>+	if (WARN_ON(wlvif-&gt;role_id == WL12XX_INVALID_ROLE_ID)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	cmd-&gt;params.role_id = wl-&gt;role_id;</div><div class='add'>+	cmd-&gt;params.role_id = wlvif-&gt;role_id;</div><div class='ctx'> 	cmd-&gt;params.scan_options = cpu_to_le16(scan_options);</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;params.n_ch = wl1271_get_scan_channels(wl, wl-&gt;scan.req,</div><div class='hunk'>@@ -194,7 +202,6 @@ static int wl1271_scan_send(struct wl1271 *wl, enum ieee80211_band band,</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;params.tx_rate = cpu_to_le32(basic_rate);</div><div class='ctx'> 	cmd-&gt;params.n_probe_reqs = wl-&gt;conf.scan.num_probe_reqs;</div><div class='del'>-	cmd-&gt;params.tx_rate = cpu_to_le32(basic_rate);</div><div class='ctx'> 	cmd-&gt;params.tid_trigger = 0;</div><div class='ctx'> 	cmd-&gt;params.scan_tag = WL1271_SCAN_DEFAULT_TAG;</div><div class='ctx'> </div><div class='hunk'>@@ -208,11 +215,11 @@ static int wl1271_scan_send(struct wl1271 *wl, enum ieee80211_band band,</div><div class='ctx'> 		memcpy(cmd-&gt;params.ssid, wl-&gt;scan.ssid, wl-&gt;scan.ssid_len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(cmd-&gt;addr, wl-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	memcpy(cmd-&gt;addr, vif-&gt;addr, ETH_ALEN);</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_cmd_build_probe_req(wl, wl-&gt;scan.ssid, wl-&gt;scan.ssid_len,</div><div class='del'>-					 wl-&gt;scan.req-&gt;ie, wl-&gt;scan.req-&gt;ie_len,</div><div class='del'>-					 band);</div><div class='add'>+	ret = wl1271_cmd_build_probe_req(wl, wlvif, wl-&gt;scan.ssid,</div><div class='add'>+					 wl-&gt;scan.ssid_len, wl-&gt;scan.req-&gt;ie,</div><div class='add'>+					 wl-&gt;scan.req-&gt;ie_len, band);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		wl1271_error("PROBE request template failed");</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -241,11 +248,12 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void wl1271_scan_stm(struct wl1271 *wl)</div><div class='add'>+void wl1271_scan_stm(struct wl1271 *wl, struct ieee80211_vif *vif)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	enum ieee80211_band band;</div><div class='del'>-	u32 rate;</div><div class='add'>+	u32 rate, mask;</div><div class='ctx'> </div><div class='ctx'> 	switch (wl-&gt;scan.state) {</div><div class='ctx'> 	case WL1271_SCAN_STATE_IDLE:</div><div class='hunk'>@@ -253,47 +261,59 @@ void wl1271_scan_stm(struct wl1271 *wl)</div><div class='ctx'> </div><div class='ctx'> 	case WL1271_SCAN_STATE_2GHZ_ACTIVE:</div><div class='ctx'> 		band = IEEE80211_BAND_2GHZ;</div><div class='del'>-		rate = wl1271_tx_min_rate_get(wl, wl-&gt;bitrate_masks[band]);</div><div class='del'>-		ret = wl1271_scan_send(wl, band, false, rate);</div><div class='add'>+		mask = wlvif-&gt;bitrate_masks[band];</div><div class='add'>+		if (wl-&gt;scan.req-&gt;no_cck) {</div><div class='add'>+			mask &amp;= ~CONF_TX_CCK_RATES;</div><div class='add'>+			if (!mask)</div><div class='add'>+				mask = CONF_TX_RATE_MASK_BASIC_P2P;</div><div class='add'>+		}</div><div class='add'>+		rate = wl1271_tx_min_rate_get(wl, mask);</div><div class='add'>+		ret = wl1271_scan_send(wl, vif, band, false, rate);</div><div class='ctx'> 		if (ret == WL1271_NOTHING_TO_SCAN) {</div><div class='ctx'> 			wl-&gt;scan.state = WL1271_SCAN_STATE_2GHZ_PASSIVE;</div><div class='del'>-			wl1271_scan_stm(wl);</div><div class='add'>+			wl1271_scan_stm(wl, vif);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case WL1271_SCAN_STATE_2GHZ_PASSIVE:</div><div class='ctx'> 		band = IEEE80211_BAND_2GHZ;</div><div class='del'>-		rate = wl1271_tx_min_rate_get(wl, wl-&gt;bitrate_masks[band]);</div><div class='del'>-		ret = wl1271_scan_send(wl, band, true, rate);</div><div class='add'>+		mask = wlvif-&gt;bitrate_masks[band];</div><div class='add'>+		if (wl-&gt;scan.req-&gt;no_cck) {</div><div class='add'>+			mask &amp;= ~CONF_TX_CCK_RATES;</div><div class='add'>+			if (!mask)</div><div class='add'>+				mask = CONF_TX_RATE_MASK_BASIC_P2P;</div><div class='add'>+		}</div><div class='add'>+		rate = wl1271_tx_min_rate_get(wl, mask);</div><div class='add'>+		ret = wl1271_scan_send(wl, vif, band, true, rate);</div><div class='ctx'> 		if (ret == WL1271_NOTHING_TO_SCAN) {</div><div class='ctx'> 			if (wl-&gt;enable_11a)</div><div class='ctx'> 				wl-&gt;scan.state = WL1271_SCAN_STATE_5GHZ_ACTIVE;</div><div class='ctx'> 			else</div><div class='ctx'> 				wl-&gt;scan.state = WL1271_SCAN_STATE_DONE;</div><div class='del'>-			wl1271_scan_stm(wl);</div><div class='add'>+			wl1271_scan_stm(wl, vif);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case WL1271_SCAN_STATE_5GHZ_ACTIVE:</div><div class='ctx'> 		band = IEEE80211_BAND_5GHZ;</div><div class='del'>-		rate = wl1271_tx_min_rate_get(wl, wl-&gt;bitrate_masks[band]);</div><div class='del'>-		ret = wl1271_scan_send(wl, band, false, rate);</div><div class='add'>+		rate = wl1271_tx_min_rate_get(wl, wlvif-&gt;bitrate_masks[band]);</div><div class='add'>+		ret = wl1271_scan_send(wl, vif, band, false, rate);</div><div class='ctx'> 		if (ret == WL1271_NOTHING_TO_SCAN) {</div><div class='ctx'> 			wl-&gt;scan.state = WL1271_SCAN_STATE_5GHZ_PASSIVE;</div><div class='del'>-			wl1271_scan_stm(wl);</div><div class='add'>+			wl1271_scan_stm(wl, vif);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case WL1271_SCAN_STATE_5GHZ_PASSIVE:</div><div class='ctx'> 		band = IEEE80211_BAND_5GHZ;</div><div class='del'>-		rate = wl1271_tx_min_rate_get(wl, wl-&gt;bitrate_masks[band]);</div><div class='del'>-		ret = wl1271_scan_send(wl, band, true, rate);</div><div class='add'>+		rate = wl1271_tx_min_rate_get(wl, wlvif-&gt;bitrate_masks[band]);</div><div class='add'>+		ret = wl1271_scan_send(wl, vif, band, true, rate);</div><div class='ctx'> 		if (ret == WL1271_NOTHING_TO_SCAN) {</div><div class='ctx'> 			wl-&gt;scan.state = WL1271_SCAN_STATE_DONE;</div><div class='del'>-			wl1271_scan_stm(wl);</div><div class='add'>+			wl1271_scan_stm(wl, vif);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='hunk'>@@ -317,7 +337,8 @@ void wl1271_scan_stm(struct wl1271 *wl)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,</div><div class='add'>+int wl1271_scan(struct wl1271 *wl, struct ieee80211_vif *vif,</div><div class='add'>+		const u8 *ssid, size_t ssid_len,</div><div class='ctx'> 		struct cfg80211_scan_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -338,6 +359,7 @@ int wl1271_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,</div><div class='ctx'> 		wl-&gt;scan.ssid_len = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	wl-&gt;scan_vif = vif;</div><div class='ctx'> 	wl-&gt;scan.req = req;</div><div class='ctx'> 	memset(wl-&gt;scan.scanned_ch, 0, sizeof(wl-&gt;scan.scanned_ch));</div><div class='ctx'> </div><div class='hunk'>@@ -346,7 +368,7 @@ int wl1271_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,</div><div class='ctx'> 	ieee80211_queue_delayed_work(wl-&gt;hw, &amp;wl-&gt;scan_complete_work,</div><div class='ctx'> 				     msecs_to_jiffies(WL1271_SCAN_TIMEOUT));</div><div class='ctx'> </div><div class='del'>-	wl1271_scan_stm(wl);</div><div class='add'>+	wl1271_scan_stm(wl, vif);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -415,18 +437,19 @@ wl1271_scan_get_sched_scan_channels(struct wl1271 *wl,</div><div class='ctx'> </div><div class='ctx'> 			if (flags &amp; IEEE80211_CHAN_RADAR) {</div><div class='ctx'> 				channels[j].flags |= SCAN_CHANNEL_FLAGS_DFS;</div><div class='add'>+</div><div class='ctx'> 				channels[j].passive_duration =</div><div class='ctx'> 					cpu_to_le16(c-&gt;dwell_time_dfs);</div><div class='del'>-			}</div><div class='del'>-			else if (flags &amp; IEEE80211_CHAN_PASSIVE_SCAN) {</div><div class='add'>+			} else {</div><div class='ctx'> 				channels[j].passive_duration =</div><div class='ctx'> 					cpu_to_le16(c-&gt;dwell_time_passive);</div><div class='del'>-			} else {</div><div class='del'>-				channels[j].min_duration =</div><div class='del'>-					cpu_to_le16(c-&gt;min_dwell_time_active);</div><div class='del'>-				channels[j].max_duration =</div><div class='del'>-					cpu_to_le16(c-&gt;max_dwell_time_active);</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			channels[j].min_duration =</div><div class='add'>+				cpu_to_le16(c-&gt;min_dwell_time_active);</div><div class='add'>+			channels[j].max_duration =</div><div class='add'>+				cpu_to_le16(c-&gt;max_dwell_time_active);</div><div class='add'>+</div><div class='ctx'> 			channels[j].tx_power_att = req-&gt;channels[i]-&gt;max_power;</div><div class='ctx'> 			channels[j].channel = req-&gt;channels[i]-&gt;hw_value;</div><div class='ctx'> </div><div class='hunk'>@@ -550,6 +573,9 @@ wl12xx_scan_sched_scan_ssid_list(struct wl1271 *wl,</div><div class='ctx'> 			 * so they're used in probe requests.</div><div class='ctx'> 			 */</div><div class='ctx'> 			for (i = 0; i &lt; req-&gt;n_ssids; i++) {</div><div class='add'>+				if (!req-&gt;ssids[i].ssid_len)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='ctx'> 				for (j = 0; j &lt; cmd-&gt;n_ssids; j++)</div><div class='ctx'> 					if (!memcmp(req-&gt;ssids[i].ssid,</div><div class='ctx'> 						   cmd-&gt;ssids[j].ssid,</div><div class='hunk'>@@ -585,6 +611,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int wl1271_scan_sched_scan_config(struct wl1271 *wl,</div><div class='add'>+				  struct wl12xx_vif *wlvif,</div><div class='ctx'> 				  struct cfg80211_sched_scan_request *req,</div><div class='ctx'> 				  struct ieee80211_sched_scan_ies *ies)</div><div class='ctx'> {</div><div class='hunk'>@@ -631,7 +658,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!force_passive &amp;&amp; cfg-&gt;active[0]) {</div><div class='del'>-		ret = wl1271_cmd_build_probe_req(wl, req-&gt;ssids[0].ssid,</div><div class='add'>+		ret = wl1271_cmd_build_probe_req(wl, wlvif, req-&gt;ssids[0].ssid,</div><div class='ctx'> 						 req-&gt;ssids[0].ssid_len,</div><div class='ctx'> 						 ies-&gt;ie[IEEE80211_BAND_2GHZ],</div><div class='ctx'> 						 ies-&gt;len[IEEE80211_BAND_2GHZ],</div><div class='hunk'>@@ -643,7 +670,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!force_passive &amp;&amp; cfg-&gt;active[1]) {</div><div class='del'>-		ret = wl1271_cmd_build_probe_req(wl,  req-&gt;ssids[0].ssid,</div><div class='add'>+		ret = wl1271_cmd_build_probe_req(wl, wlvif, req-&gt;ssids[0].ssid,</div><div class='ctx'> 						 req-&gt;ssids[0].ssid_len,</div><div class='ctx'> 						 ies-&gt;ie[IEEE80211_BAND_5GHZ],</div><div class='ctx'> 						 ies-&gt;len[IEEE80211_BAND_5GHZ],</div><div class='hunk'>@@ -667,17 +694,17 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int wl1271_scan_sched_scan_start(struct wl1271 *wl)</div><div class='add'>+int wl1271_scan_sched_scan_start(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_cmd_sched_scan_start *start;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_CMD, "cmd periodic scan start");</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;bss_type != BSS_TYPE_STA_BSS)</div><div class='add'>+	if (wlvif-&gt;bss_type != BSS_TYPE_STA_BSS)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(WL1271_FLAG_IDLE, &amp;wl-&gt;flags))</div><div class='add'>+	if (test_bit(WLVIF_FLAG_IN_USE, &amp;wlvif-&gt;flags))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	start = kzalloc(sizeof(*start), GFP_KERNEL);</div><div class='hunk'>@@ -727,7 +754,6 @@ void wl1271_scan_sched_scan_stop(struct wl1271 *wl)</div><div class='ctx'> 		wl1271_error("failed to send sched scan stop command");</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='del'>-	wl-&gt;sched_scanning = false;</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(stop);</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/scan.h b/drivers/net/wireless/wl12xx/scan.h<br/>index 92115156522f..a7ed43dc08c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/scan.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/scan.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/scan.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/scan.h</a></div><div class='hunk'>@@ -26,18 +26,20 @@</div><div class='ctx'> </div><div class='ctx'> #include "wl12xx.h"</div><div class='ctx'> </div><div class='del'>-int wl1271_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,</div><div class='add'>+int wl1271_scan(struct wl1271 *wl, struct ieee80211_vif *vif,</div><div class='add'>+		const u8 *ssid, size_t ssid_len,</div><div class='ctx'> 		struct cfg80211_scan_request *req);</div><div class='ctx'> int wl1271_scan_stop(struct wl1271 *wl);</div><div class='ctx'> int wl1271_scan_build_probe_req(struct wl1271 *wl,</div><div class='ctx'> 				const u8 *ssid, size_t ssid_len,</div><div class='ctx'> 				const u8 *ie, size_t ie_len, u8 band);</div><div class='del'>-void wl1271_scan_stm(struct wl1271 *wl);</div><div class='add'>+void wl1271_scan_stm(struct wl1271 *wl, struct ieee80211_vif *vif);</div><div class='ctx'> void wl1271_scan_complete_work(struct work_struct *work);</div><div class='ctx'> int wl1271_scan_sched_scan_config(struct wl1271 *wl,</div><div class='add'>+				     struct wl12xx_vif *wlvif,</div><div class='ctx'> 				     struct cfg80211_sched_scan_request *req,</div><div class='ctx'> 				     struct ieee80211_sched_scan_ies *ies);</div><div class='del'>-int wl1271_scan_sched_scan_start(struct wl1271 *wl);</div><div class='add'>+int wl1271_scan_sched_scan_start(struct wl1271 *wl, struct wl12xx_vif *wlvif);</div><div class='ctx'> void wl1271_scan_sched_scan_stop(struct wl1271 *wl);</div><div class='ctx'> void wl1271_scan_sched_scan_results(struct wl1271 *wl);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/sdio.c b/drivers/net/wireless/wl12xx/sdio.c<br/>index 516a8980723c..468a50553fac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/sdio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/sdio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/sdio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/sdio.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/sdio_func.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/sdio_ids.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/card.h&gt;</div><div class='hunk'>@@ -44,107 +45,67 @@</div><div class='ctx'> #define SDIO_DEVICE_ID_TI_WL1271	0x4076</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+struct wl12xx_sdio_glue {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct platform_device *core;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct sdio_device_id wl1271_devices[] __devinitconst = {</div><div class='ctx'> 	{ SDIO_DEVICE(SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1271) },</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(sdio, wl1271_devices);</div><div class='ctx'> </div><div class='del'>-static void wl1271_sdio_set_block_size(struct wl1271 *wl, unsigned int blksz)</div><div class='del'>-{</div><div class='del'>-	sdio_claim_host(wl-&gt;if_priv);</div><div class='del'>-	sdio_set_block_size(wl-&gt;if_priv, blksz);</div><div class='del'>-	sdio_release_host(wl-&gt;if_priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct sdio_func *wl_to_func(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-	return wl-&gt;if_priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct device *wl1271_sdio_wl_to_dev(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-	return &amp;(wl_to_func(wl)-&gt;dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t wl1271_hardirq(int irq, void *cookie)</div><div class='add'>+static void wl1271_sdio_set_block_size(struct device *child,</div><div class='add'>+				       unsigned int blksz)</div><div class='ctx'> {</div><div class='del'>-	struct wl1271 *wl = cookie;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct wl12xx_sdio_glue *glue = dev_get_drvdata(child-&gt;parent);</div><div class='add'>+	struct sdio_func *func = dev_to_sdio_func(glue-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	wl1271_debug(DEBUG_IRQ, "IRQ");</div><div class='del'>-</div><div class='del'>-	/* complete the ELP completion */</div><div class='del'>-	spin_lock_irqsave(&amp;wl-&gt;wl_lock, flags);</div><div class='del'>-	set_bit(WL1271_FLAG_IRQ_RUNNING, &amp;wl-&gt;flags);</div><div class='del'>-	if (wl-&gt;elp_compl) {</div><div class='del'>-		complete(wl-&gt;elp_compl);</div><div class='del'>-		wl-&gt;elp_compl = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (test_bit(WL1271_FLAG_SUSPENDED, &amp;wl-&gt;flags)) {</div><div class='del'>-		/* don't enqueue a work right now. mark it as pending */</div><div class='del'>-		set_bit(WL1271_FLAG_PENDING_WORK, &amp;wl-&gt;flags);</div><div class='del'>-		wl1271_debug(DEBUG_IRQ, "should not enqueue work");</div><div class='del'>-		disable_irq_nosync(wl-&gt;irq);</div><div class='del'>-		pm_wakeup_event(wl1271_sdio_wl_to_dev(wl), 0);</div><div class='del'>-		spin_unlock_irqrestore(&amp;wl-&gt;wl_lock, flags);</div><div class='del'>-		return IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;wl-&gt;wl_lock, flags);</div><div class='del'>-</div><div class='del'>-	return IRQ_WAKE_THREAD;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void wl1271_sdio_disable_interrupts(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-	disable_irq(wl-&gt;irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void wl1271_sdio_enable_interrupts(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-	enable_irq(wl-&gt;irq);</div><div class='add'>+	sdio_claim_host(func);</div><div class='add'>+	sdio_set_block_size(func, blksz);</div><div class='add'>+	sdio_release_host(func);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wl1271_sdio_raw_read(struct wl1271 *wl, int addr, void *buf,</div><div class='add'>+static void wl12xx_sdio_raw_read(struct device *child, int addr, void *buf,</div><div class='ctx'> 				 size_t len, bool fixed)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct sdio_func *func = wl_to_func(wl);</div><div class='add'>+	struct wl12xx_sdio_glue *glue = dev_get_drvdata(child-&gt;parent);</div><div class='add'>+	struct sdio_func *func = dev_to_sdio_func(glue-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG_ADDR)) {</div><div class='ctx'> 		((u8 *)buf)[0] = sdio_f0_readb(func, addr, &amp;ret);</div><div class='del'>-		wl1271_debug(DEBUG_SDIO, "sdio read 52 addr 0x%x, byte 0x%02x",</div><div class='del'>-			     addr, ((u8 *)buf)[0]);</div><div class='add'>+		dev_dbg(child-&gt;parent, "sdio read 52 addr 0x%x, byte 0x%02x\n",</div><div class='add'>+			addr, ((u8 *)buf)[0]);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (fixed)</div><div class='ctx'> 			ret = sdio_readsb(func, buf, addr, len);</div><div class='ctx'> 		else</div><div class='ctx'> 			ret = sdio_memcpy_fromio(func, buf, addr, len);</div><div class='ctx'> </div><div class='del'>-		wl1271_debug(DEBUG_SDIO, "sdio read 53 addr 0x%x, %zu bytes",</div><div class='del'>-			     addr, len);</div><div class='del'>-		wl1271_dump_ascii(DEBUG_SDIO, "data: ", buf, len);</div><div class='add'>+		dev_dbg(child-&gt;parent, "sdio read 53 addr 0x%x, %zu bytes\n",</div><div class='add'>+			addr, len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='del'>-		wl1271_error("sdio read failed (%d)", ret);</div><div class='add'>+		dev_err(child-&gt;parent, "sdio read failed (%d)\n", ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wl1271_sdio_raw_write(struct wl1271 *wl, int addr, void *buf,</div><div class='add'>+static void wl12xx_sdio_raw_write(struct device *child, int addr, void *buf,</div><div class='ctx'> 				  size_t len, bool fixed)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct sdio_func *func = wl_to_func(wl);</div><div class='add'>+	struct wl12xx_sdio_glue *glue = dev_get_drvdata(child-&gt;parent);</div><div class='add'>+	struct sdio_func *func = dev_to_sdio_func(glue-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG_ADDR)) {</div><div class='ctx'> 		sdio_f0_writeb(func, ((u8 *)buf)[0], addr, &amp;ret);</div><div class='del'>-		wl1271_debug(DEBUG_SDIO, "sdio write 52 addr 0x%x, byte 0x%02x",</div><div class='del'>-			     addr, ((u8 *)buf)[0]);</div><div class='add'>+		dev_dbg(child-&gt;parent, "sdio write 52 addr 0x%x, byte 0x%02x\n",</div><div class='add'>+			addr, ((u8 *)buf)[0]);</div><div class='ctx'> 	} else {</div><div class='del'>-		wl1271_debug(DEBUG_SDIO, "sdio write 53 addr 0x%x, %zu bytes",</div><div class='del'>-			     addr, len);</div><div class='del'>-		wl1271_dump_ascii(DEBUG_SDIO, "data: ", buf, len);</div><div class='add'>+		dev_dbg(child-&gt;parent, "sdio write 53 addr 0x%x, %zu bytes\n",</div><div class='add'>+			addr, len);</div><div class='ctx'> </div><div class='ctx'> 		if (fixed)</div><div class='ctx'> 			ret = sdio_writesb(func, addr, buf, len);</div><div class='hunk'>@@ -153,13 +114,13 @@ static void wl1271_sdio_raw_write(struct wl1271 *wl, int addr, void *buf,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='del'>-		wl1271_error("sdio write failed (%d)", ret);</div><div class='add'>+		dev_err(child-&gt;parent, "sdio write failed (%d)\n", ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_sdio_power_on(struct wl1271 *wl)</div><div class='add'>+static int wl12xx_sdio_power_on(struct wl12xx_sdio_glue *glue)</div><div class='ctx'> {</div><div class='del'>-	struct sdio_func *func = wl_to_func(wl);</div><div class='ctx'> 	int ret;</div><div class='add'>+	struct sdio_func *func = dev_to_sdio_func(glue-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	/* If enabled, tell runtime PM not to power off the card */</div><div class='ctx'> 	if (pm_runtime_enabled(&amp;func-&gt;dev)) {</div><div class='hunk'>@@ -180,10 +141,10 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_sdio_power_off(struct wl1271 *wl)</div><div class='add'>+static int wl12xx_sdio_power_off(struct wl12xx_sdio_glue *glue)</div><div class='ctx'> {</div><div class='del'>-	struct sdio_func *func = wl_to_func(wl);</div><div class='ctx'> 	int ret;</div><div class='add'>+	struct sdio_func *func = dev_to_sdio_func(glue-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	sdio_disable_func(func);</div><div class='ctx'> 	sdio_release_host(func);</div><div class='hunk'>@@ -200,46 +161,43 @@ static int wl1271_sdio_power_off(struct wl1271 *wl)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_sdio_set_power(struct wl1271 *wl, bool enable)</div><div class='add'>+static int wl12xx_sdio_set_power(struct device *child, bool enable)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_sdio_glue *glue = dev_get_drvdata(child-&gt;parent);</div><div class='add'>+</div><div class='ctx'> 	if (enable)</div><div class='del'>-		return wl1271_sdio_power_on(wl);</div><div class='add'>+		return wl12xx_sdio_power_on(glue);</div><div class='ctx'> 	else</div><div class='del'>-		return wl1271_sdio_power_off(wl);</div><div class='add'>+		return wl12xx_sdio_power_off(glue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct wl1271_if_operations sdio_ops = {</div><div class='del'>-	.read		= wl1271_sdio_raw_read,</div><div class='del'>-	.write		= wl1271_sdio_raw_write,</div><div class='del'>-	.power		= wl1271_sdio_set_power,</div><div class='del'>-	.dev		= wl1271_sdio_wl_to_dev,</div><div class='del'>-	.enable_irq	= wl1271_sdio_enable_interrupts,</div><div class='del'>-	.disable_irq	= wl1271_sdio_disable_interrupts,</div><div class='add'>+	.read		= wl12xx_sdio_raw_read,</div><div class='add'>+	.write		= wl12xx_sdio_raw_write,</div><div class='add'>+	.power		= wl12xx_sdio_set_power,</div><div class='ctx'> 	.set_block_size = wl1271_sdio_set_block_size,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __devinit wl1271_probe(struct sdio_func *func,</div><div class='ctx'> 				  const struct sdio_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_hw *hw;</div><div class='del'>-	const struct wl12xx_platform_data *wlan_data;</div><div class='del'>-	struct wl1271 *wl;</div><div class='del'>-	unsigned long irqflags;</div><div class='add'>+	struct wl12xx_platform_data *wlan_data;</div><div class='add'>+	struct wl12xx_sdio_glue *glue;</div><div class='add'>+	struct resource res[1];</div><div class='ctx'> 	mmc_pm_flag_t mmcflags;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* We are only able to handle the wlan function */</div><div class='ctx'> 	if (func-&gt;num != 0x02)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	hw = wl1271_alloc_hw();</div><div class='del'>-	if (IS_ERR(hw))</div><div class='del'>-		return PTR_ERR(hw);</div><div class='del'>-</div><div class='del'>-	wl = hw-&gt;priv;</div><div class='add'>+	glue = kzalloc(sizeof(*glue), GFP_KERNEL);</div><div class='add'>+	if (!glue) {</div><div class='add'>+		dev_err(&amp;func-&gt;dev, "can't allocate glue\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	wl-&gt;if_priv = func;</div><div class='del'>-	wl-&gt;if_ops = &amp;sdio_ops;</div><div class='add'>+	glue-&gt;dev = &amp;func-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	/* Grab access to FN0 for ELP reg. */</div><div class='ctx'> 	func-&gt;card-&gt;quirks |= MMC_QUIRK_LENIENT_FN0;</div><div class='hunk'>@@ -250,80 +208,79 @@ static int __devinit wl1271_probe(struct sdio_func *func,</div><div class='ctx'> 	wlan_data = wl12xx_get_platform_data();</div><div class='ctx'> 	if (IS_ERR(wlan_data)) {</div><div class='ctx'> 		ret = PTR_ERR(wlan_data);</div><div class='del'>-		wl1271_error("missing wlan platform data: %d", ret);</div><div class='del'>-		goto out_free;</div><div class='add'>+		dev_err(glue-&gt;dev, "missing wlan platform data: %d\n", ret);</div><div class='add'>+		goto out_free_glue;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wl-&gt;irq = wlan_data-&gt;irq;</div><div class='del'>-	wl-&gt;ref_clock = wlan_data-&gt;board_ref_clock;</div><div class='del'>-	wl-&gt;tcxo_clock = wlan_data-&gt;board_tcxo_clock;</div><div class='del'>-	wl-&gt;platform_quirks = wlan_data-&gt;platform_quirks;</div><div class='add'>+	/* if sdio can keep power while host is suspended, enable wow */</div><div class='add'>+	mmcflags = sdio_get_host_pm_caps(func);</div><div class='add'>+	dev_dbg(glue-&gt;dev, "sdio PM caps = 0x%x\n", mmcflags);</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;platform_quirks &amp; WL12XX_PLATFORM_QUIRK_EDGE_IRQ)</div><div class='del'>-		irqflags = IRQF_TRIGGER_RISING;</div><div class='del'>-	else</div><div class='del'>-		irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;</div><div class='del'>-</div><div class='del'>-	ret = request_threaded_irq(wl-&gt;irq, wl1271_hardirq, wl1271_irq,</div><div class='del'>-				   irqflags,</div><div class='del'>-				   DRIVER_NAME, wl);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		wl1271_error("request_irq() failed: %d", ret);</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='add'>+	if (mmcflags &amp; MMC_PM_KEEP_POWER)</div><div class='add'>+		wlan_data-&gt;pwr_in_suspend = true;</div><div class='add'>+</div><div class='add'>+	wlan_data-&gt;ops = &amp;sdio_ops;</div><div class='ctx'> </div><div class='del'>-	ret = enable_irq_wake(wl-&gt;irq);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		wl-&gt;irq_wake_enabled = true;</div><div class='del'>-		device_init_wakeup(wl1271_sdio_wl_to_dev(wl), 1);</div><div class='add'>+	sdio_set_drvdata(func, glue);</div><div class='ctx'> </div><div class='del'>-		/* if sdio can keep power while host is suspended, enable wow */</div><div class='del'>-		mmcflags = sdio_get_host_pm_caps(func);</div><div class='del'>-		wl1271_debug(DEBUG_SDIO, "sdio PM caps = 0x%x", mmcflags);</div><div class='add'>+	/* Tell PM core that we don't need the card to be powered now */</div><div class='add'>+	pm_runtime_put_noidle(&amp;func-&gt;dev);</div><div class='ctx'> </div><div class='del'>-		if (mmcflags &amp; MMC_PM_KEEP_POWER)</div><div class='del'>-			hw-&gt;wiphy-&gt;wowlan.flags = WIPHY_WOWLAN_ANY;</div><div class='add'>+	glue-&gt;core = platform_device_alloc("wl12xx", -1);</div><div class='add'>+	if (!glue-&gt;core) {</div><div class='add'>+		dev_err(glue-&gt;dev, "can't allocate platform_device");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_free_glue;</div><div class='ctx'> 	}</div><div class='del'>-	disable_irq(wl-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_init_ieee80211(wl);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_irq;</div><div class='add'>+	glue-&gt;core-&gt;dev.parent = &amp;func-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_register_hw(wl);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_irq;</div><div class='add'>+	memset(res, 0x00, sizeof(res));</div><div class='ctx'> </div><div class='del'>-	sdio_set_drvdata(func, wl);</div><div class='add'>+	res[0].start = wlan_data-&gt;irq;</div><div class='add'>+	res[0].flags = IORESOURCE_IRQ;</div><div class='add'>+	res[0].name = "irq";</div><div class='ctx'> </div><div class='del'>-	/* Tell PM core that we don't need the card to be powered now */</div><div class='del'>-	pm_runtime_put_noidle(&amp;func-&gt;dev);</div><div class='add'>+	ret = platform_device_add_resources(glue-&gt;core, res, ARRAY_SIZE(res));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(glue-&gt;dev, "can't add resources\n");</div><div class='add'>+		goto out_dev_put;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	ret = platform_device_add_data(glue-&gt;core, wlan_data,</div><div class='add'>+				       sizeof(*wlan_data));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(glue-&gt;dev, "can't add platform data\n");</div><div class='add'>+		goto out_dev_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = platform_device_add(glue-&gt;core);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(glue-&gt;dev, "can't add platform device\n");</div><div class='add'>+		goto out_dev_put;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- out_irq:</div><div class='del'>-	free_irq(wl-&gt;irq, wl);</div><div class='add'>+out_dev_put:</div><div class='add'>+	platform_device_put(glue-&gt;core);</div><div class='ctx'> </div><div class='del'>- out_free:</div><div class='del'>-	wl1271_free_hw(wl);</div><div class='add'>+out_free_glue:</div><div class='add'>+	kfree(glue);</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __devexit wl1271_remove(struct sdio_func *func)</div><div class='ctx'> {</div><div class='del'>-	struct wl1271 *wl = sdio_get_drvdata(func);</div><div class='add'>+	struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func);</div><div class='ctx'> </div><div class='ctx'> 	/* Undo decrement done above in wl1271_probe */</div><div class='ctx'> 	pm_runtime_get_noresume(&amp;func-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	wl1271_unregister_hw(wl);</div><div class='del'>-	if (wl-&gt;irq_wake_enabled) {</div><div class='del'>-		device_init_wakeup(wl1271_sdio_wl_to_dev(wl), 0);</div><div class='del'>-		disable_irq_wake(wl-&gt;irq);</div><div class='del'>-	}</div><div class='del'>-	free_irq(wl-&gt;irq, wl);</div><div class='del'>-	wl1271_free_hw(wl);</div><div class='add'>+	platform_device_del(glue-&gt;core);</div><div class='add'>+	platform_device_put(glue-&gt;core);</div><div class='add'>+	kfree(glue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -332,20 +289,21 @@ static int wl1271_suspend(struct device *dev)</div><div class='ctx'> 	/* Tell MMC/SDIO core it's OK to power down the card</div><div class='ctx'> 	 * (if it isn't already), but not to remove it completely */</div><div class='ctx'> 	struct sdio_func *func = dev_to_sdio_func(dev);</div><div class='del'>-	struct wl1271 *wl = sdio_get_drvdata(func);</div><div class='add'>+	struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func);</div><div class='add'>+	struct wl1271 *wl = platform_get_drvdata(glue-&gt;core);</div><div class='ctx'> 	mmc_pm_flag_t sdio_flags;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	wl1271_debug(DEBUG_MAC80211, "wl1271 suspend. wow_enabled: %d",</div><div class='del'>-		     wl-&gt;wow_enabled);</div><div class='add'>+	dev_dbg(dev, "wl1271 suspend. wow_enabled: %d\n",</div><div class='add'>+		wl-&gt;wow_enabled);</div><div class='ctx'> </div><div class='ctx'> 	/* check whether sdio should keep power */</div><div class='ctx'> 	if (wl-&gt;wow_enabled) {</div><div class='ctx'> 		sdio_flags = sdio_get_host_pm_caps(func);</div><div class='ctx'> </div><div class='ctx'> 		if (!(sdio_flags &amp; MMC_PM_KEEP_POWER)) {</div><div class='del'>-			wl1271_error("can't keep power while host "</div><div class='del'>-				     "is suspended");</div><div class='add'>+			dev_err(dev, "can't keep power while host "</div><div class='add'>+				     "is suspended\n");</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -353,7 +311,7 @@ static int wl1271_suspend(struct device *dev)</div><div class='ctx'> 		/* keep power while host suspended */</div><div class='ctx'> 		ret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			wl1271_error("error while trying to keep power");</div><div class='add'>+			dev_err(dev, "error while trying to keep power\n");</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -367,9 +325,10 @@ out:</div><div class='ctx'> static int wl1271_resume(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sdio_func *func = dev_to_sdio_func(dev);</div><div class='del'>-	struct wl1271 *wl = sdio_get_drvdata(func);</div><div class='add'>+	struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func);</div><div class='add'>+	struct wl1271 *wl = platform_get_drvdata(glue-&gt;core);</div><div class='ctx'> </div><div class='del'>-	wl1271_debug(DEBUG_MAC80211, "wl1271 resume");</div><div class='add'>+	dev_dbg(dev, "wl1271 resume\n");</div><div class='ctx'> 	if (wl-&gt;wow_enabled) {</div><div class='ctx'> 		/* claim back host */</div><div class='ctx'> 		sdio_claim_host(func);</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/sdio_test.c b/drivers/net/wireless/wl12xx/sdio_test.c<br/>deleted file mode 100644<br/>index f25d5d9212e7..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/sdio_test.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/sdio_test.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,543 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * SDIO testing driver for wl12xx</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2010 Nokia Corporation</div><div class='del'>- *</div><div class='del'>- * Contact: Roger Quadros &lt;roger.quadros@nokia.com&gt;</div><div class='del'>- *</div><div class='del'>- * wl12xx read/write routines taken from the main module</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, 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 St, Fifth Floor, Boston, MA</div><div class='del'>- * 02110-1301 USA</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/crc7.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/mmc/sdio_func.h&gt;</div><div class='del'>-#include &lt;linux/mmc/sdio_ids.h&gt;</div><div class='del'>-#include &lt;linux/mmc/card.h&gt;</div><div class='del'>-#include &lt;linux/mmc/host.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/wl12xx.h&gt;</div><div class='del'>-#include &lt;linux/kthread.h&gt;</div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='del'>-#include &lt;linux/pm_runtime.h&gt;</div><div class='del'>-</div><div class='del'>-#include "wl12xx.h"</div><div class='del'>-#include "io.h"</div><div class='del'>-#include "boot.h"</div><div class='del'>-</div><div class='del'>-#ifndef SDIO_VENDOR_ID_TI</div><div class='del'>-#define SDIO_VENDOR_ID_TI		0x0097</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef SDIO_DEVICE_ID_TI_WL1271</div><div class='del'>-#define SDIO_DEVICE_ID_TI_WL1271	0x4076</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static bool rx, tx;</div><div class='del'>-</div><div class='del'>-module_param(rx, bool, S_IRUGO | S_IWUSR);</div><div class='del'>-MODULE_PARM_DESC(rx, "Perform rx test. Default (0). "</div><div class='del'>-	"This test continuously reads data from the SDIO device.\n");</div><div class='del'>-</div><div class='del'>-module_param(tx, bool, S_IRUGO | S_IWUSR);</div><div class='del'>-MODULE_PARM_DESC(tx, "Perform tx test. Default (0). "</div><div class='del'>-	"This test continuously writes data to the SDIO device.\n");</div><div class='del'>-</div><div class='del'>-struct wl1271_test {</div><div class='del'>-	struct wl1271 wl;</div><div class='del'>-	struct task_struct *test_task;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct sdio_device_id wl1271_devices[] = {</div><div class='del'>-	{ SDIO_DEVICE(SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1271) },</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct sdio_func *wl_to_func(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-	return wl-&gt;if_priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct device *wl1271_sdio_wl_to_dev(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-	return &amp;(wl_to_func(wl)-&gt;dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void wl1271_sdio_raw_read(struct wl1271 *wl, int addr, void *buf,</div><div class='del'>-		size_t len, bool fixed)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	struct sdio_func *func = wl_to_func(wl);</div><div class='del'>-</div><div class='del'>-	if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG_ADDR)) {</div><div class='del'>-		((u8 *)buf)[0] = sdio_f0_readb(func, addr, &amp;ret);</div><div class='del'>-		wl1271_debug(DEBUG_SDIO, "sdio read 52 addr 0x%x, byte 0x%02x",</div><div class='del'>-				addr, ((u8 *)buf)[0]);</div><div class='del'>-	} else {</div><div class='del'>-		if (fixed)</div><div class='del'>-			ret = sdio_readsb(func, buf, addr, len);</div><div class='del'>-		else</div><div class='del'>-			ret = sdio_memcpy_fromio(func, buf, addr, len);</div><div class='del'>-</div><div class='del'>-		wl1271_debug(DEBUG_SDIO, "sdio read 53 addr 0x%x, %zu bytes",</div><div class='del'>-				addr, len);</div><div class='del'>-		wl1271_dump_ascii(DEBUG_SDIO, "data: ", buf, len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		wl1271_error("sdio read failed (%d)", ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void wl1271_sdio_raw_write(struct wl1271 *wl, int addr, void *buf,</div><div class='del'>-		size_t len, bool fixed)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-	struct sdio_func *func = wl_to_func(wl);</div><div class='del'>-</div><div class='del'>-	if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG_ADDR)) {</div><div class='del'>-		sdio_f0_writeb(func, ((u8 *)buf)[0], addr, &amp;ret);</div><div class='del'>-		wl1271_debug(DEBUG_SDIO, "sdio write 52 addr 0x%x, byte 0x%02x",</div><div class='del'>-				addr, ((u8 *)buf)[0]);</div><div class='del'>-	} else {</div><div class='del'>-		wl1271_debug(DEBUG_SDIO, "sdio write 53 addr 0x%x, %zu bytes",</div><div class='del'>-				addr, len);</div><div class='del'>-		wl1271_dump_ascii(DEBUG_SDIO, "data: ", buf, len);</div><div class='del'>-</div><div class='del'>-		if (fixed)</div><div class='del'>-			ret = sdio_writesb(func, addr, buf, len);</div><div class='del'>-		else</div><div class='del'>-			ret = sdio_memcpy_toio(func, addr, buf, len);</div><div class='del'>-	}</div><div class='del'>-	if (ret)</div><div class='del'>-		wl1271_error("sdio write failed (%d)", ret);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int wl1271_sdio_set_power(struct wl1271 *wl, bool enable)</div><div class='del'>-{</div><div class='del'>-	struct sdio_func *func = wl_to_func(wl);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* Let the SDIO stack handle wlan_enable control, so we</div><div class='del'>-	 * keep host claimed while wlan is in use to keep wl1271</div><div class='del'>-	 * alive.</div><div class='del'>-	 */</div><div class='del'>-	if (enable) {</div><div class='del'>-		/* Power up the card */</div><div class='del'>-		ret = pm_runtime_get_sync(&amp;func-&gt;dev);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		/* Runtime PM might be disabled, power up the card manually */</div><div class='del'>-		ret = mmc_power_restore_host(func-&gt;card-&gt;host);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		sdio_claim_host(func);</div><div class='del'>-		sdio_enable_func(func);</div><div class='del'>-	} else {</div><div class='del'>-		sdio_disable_func(func);</div><div class='del'>-		sdio_release_host(func);</div><div class='del'>-</div><div class='del'>-		/* Runtime PM might be disabled, power off the card manually */</div><div class='del'>-		ret = mmc_power_save_host(func-&gt;card-&gt;host);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		/* Power down the card */</div><div class='del'>-		ret = pm_runtime_put_sync(&amp;func-&gt;dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void wl1271_sdio_disable_interrupts(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void wl1271_sdio_enable_interrupts(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct wl1271_if_operations sdio_ops = {</div><div class='del'>-	.read		= wl1271_sdio_raw_read,</div><div class='del'>-	.write		= wl1271_sdio_raw_write,</div><div class='del'>-	.power		= wl1271_sdio_set_power,</div><div class='del'>-	.dev		= wl1271_sdio_wl_to_dev,</div><div class='del'>-	.enable_irq	= wl1271_sdio_enable_interrupts,</div><div class='del'>-	.disable_irq	= wl1271_sdio_disable_interrupts,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void wl1271_fw_wakeup(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-	u32 elp_reg;</div><div class='del'>-</div><div class='del'>-	elp_reg = ELPCTRL_WAKE_UP;</div><div class='del'>-	wl1271_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG_ADDR, elp_reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int wl1271_fetch_firmware(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-	const struct firmware *fw;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (wl-&gt;chip.id == CHIP_ID_1283_PG20)</div><div class='del'>-		ret = request_firmware(&amp;fw, WL128X_FW_NAME,</div><div class='del'>-				       wl1271_wl_to_dev(wl));</div><div class='del'>-	else</div><div class='del'>-		ret = request_firmware(&amp;fw, WL127X_FW_NAME,</div><div class='del'>-				       wl1271_wl_to_dev(wl));</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		wl1271_error("could not get firmware: %d", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fw-&gt;size % 4) {</div><div class='del'>-		wl1271_error("firmware size is not multiple of 32 bits: %zu",</div><div class='del'>-				fw-&gt;size);</div><div class='del'>-		ret = -EILSEQ;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wl-&gt;fw_len = fw-&gt;size;</div><div class='del'>-	wl-&gt;fw = vmalloc(wl-&gt;fw_len);</div><div class='del'>-</div><div class='del'>-	if (!wl-&gt;fw) {</div><div class='del'>-		wl1271_error("could not allocate memory for the firmware");</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(wl-&gt;fw, fw-&gt;data, wl-&gt;fw_len);</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	release_firmware(fw);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int wl1271_fetch_nvs(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-	const struct firmware *fw;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = request_firmware(&amp;fw, WL12XX_NVS_NAME, wl1271_wl_to_dev(wl));</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		wl1271_error("could not get nvs file: %d", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wl-&gt;nvs = kmemdup(fw-&gt;data, fw-&gt;size, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!wl-&gt;nvs) {</div><div class='del'>-		wl1271_error("could not allocate memory for the nvs file");</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wl-&gt;nvs_len = fw-&gt;size;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	release_firmware(fw);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int wl1271_chip_wakeup(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-	struct wl1271_partition_set partition;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	msleep(WL1271_PRE_POWER_ON_SLEEP);</div><div class='del'>-	ret = wl1271_power_on(wl);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	msleep(WL1271_POWER_ON_SLEEP);</div><div class='del'>-</div><div class='del'>-	/* We don't need a real memory partition here, because we only want</div><div class='del'>-	 * to use the registers at this point. */</div><div class='del'>-	memset(&amp;partition, 0, sizeof(partition));</div><div class='del'>-	partition.reg.start = REGISTERS_BASE;</div><div class='del'>-	partition.reg.size = REGISTERS_DOWN_SIZE;</div><div class='del'>-	wl1271_set_partition(wl, &amp;partition);</div><div class='del'>-</div><div class='del'>-	/* ELP module wake up */</div><div class='del'>-	wl1271_fw_wakeup(wl);</div><div class='del'>-</div><div class='del'>-	/* whal_FwCtrl_BootSm() */</div><div class='del'>-</div><div class='del'>-	/* 0. read chip id from CHIP_ID */</div><div class='del'>-	wl-&gt;chip.id = wl1271_read32(wl, CHIP_ID_B);</div><div class='del'>-</div><div class='del'>-	/* 1. check if chip id is valid */</div><div class='del'>-</div><div class='del'>-	switch (wl-&gt;chip.id) {</div><div class='del'>-	case CHIP_ID_1271_PG10:</div><div class='del'>-		wl1271_warning("chip id 0x%x (1271 PG10) support is obsolete",</div><div class='del'>-				wl-&gt;chip.id);</div><div class='del'>-		break;</div><div class='del'>-	case CHIP_ID_1271_PG20:</div><div class='del'>-		wl1271_notice("chip id 0x%x (1271 PG20)",</div><div class='del'>-				wl-&gt;chip.id);</div><div class='del'>-		break;</div><div class='del'>-	case CHIP_ID_1283_PG20:</div><div class='del'>-		wl1271_notice("chip id 0x%x (1283 PG20)",</div><div class='del'>-				wl-&gt;chip.id);</div><div class='del'>-		break;</div><div class='del'>-	case CHIP_ID_1283_PG10:</div><div class='del'>-	default:</div><div class='del'>-		wl1271_warning("unsupported chip id: 0x%x", wl-&gt;chip.id);</div><div class='del'>-		return -ENODEV;</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 struct wl1271_partition_set part_down = {</div><div class='del'>-	.mem = {</div><div class='del'>-		.start = 0x00000000,</div><div class='del'>-		.size  = 0x000177c0</div><div class='del'>-	},</div><div class='del'>-	.reg = {</div><div class='del'>-		.start = REGISTERS_BASE,</div><div class='del'>-		.size  = 0x00008800</div><div class='del'>-	},</div><div class='del'>-	.mem2 = {</div><div class='del'>-		.start = 0x00000000,</div><div class='del'>-		.size  = 0x00000000</div><div class='del'>-	},</div><div class='del'>-	.mem3 = {</div><div class='del'>-		.start = 0x00000000,</div><div class='del'>-		.size  = 0x00000000</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int tester(void *data)</div><div class='del'>-{</div><div class='del'>-	struct wl1271 *wl = data;</div><div class='del'>-	struct sdio_func *func = wl_to_func(wl);</div><div class='del'>-	struct device *pdev = &amp;func-&gt;dev;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	bool rx_started = 0;</div><div class='del'>-	bool tx_started = 0;</div><div class='del'>-	uint8_t *tx_buf, *rx_buf;</div><div class='del'>-	int test_size = PAGE_SIZE;</div><div class='del'>-	u32 addr = 0;</div><div class='del'>-	struct wl1271_partition_set partition;</div><div class='del'>-</div><div class='del'>-	/* We assume chip is powered up and firmware fetched */</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;partition, &amp;part_down, sizeof(partition));</div><div class='del'>-	partition.mem.start = addr;</div><div class='del'>-	wl1271_set_partition(wl, &amp;partition);</div><div class='del'>-</div><div class='del'>-	tx_buf = kmalloc(test_size, GFP_KERNEL);</div><div class='del'>-	rx_buf = kmalloc(test_size, GFP_KERNEL);</div><div class='del'>-	if (!tx_buf || !rx_buf) {</div><div class='del'>-		dev_err(pdev,</div><div class='del'>-			"Could not allocate memory. Test will not run.\n");</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(tx_buf, 0x5a, test_size);</div><div class='del'>-</div><div class='del'>-	/* write something in data area so we can read it back */</div><div class='del'>-	wl1271_write(wl, addr, tx_buf, test_size, false);</div><div class='del'>-</div><div class='del'>-	while (!kthread_should_stop()) {</div><div class='del'>-		if (rx &amp;&amp; !rx_started) {</div><div class='del'>-			dev_info(pdev, "starting rx test\n");</div><div class='del'>-			rx_started = 1;</div><div class='del'>-		} else if (!rx &amp;&amp; rx_started) {</div><div class='del'>-			dev_info(pdev, "stopping rx test\n");</div><div class='del'>-			rx_started = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (tx &amp;&amp; !tx_started) {</div><div class='del'>-			dev_info(pdev, "starting tx test\n");</div><div class='del'>-			tx_started = 1;</div><div class='del'>-		} else if (!tx &amp;&amp; tx_started) {</div><div class='del'>-			dev_info(pdev, "stopping tx test\n");</div><div class='del'>-			tx_started = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (rx_started)</div><div class='del'>-			wl1271_read(wl, addr, rx_buf, test_size, false);</div><div class='del'>-</div><div class='del'>-		if (tx_started)</div><div class='del'>-			wl1271_write(wl, addr, tx_buf, test_size, false);</div><div class='del'>-</div><div class='del'>-		if (!rx_started &amp;&amp; !tx_started)</div><div class='del'>-			msleep(100);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-free:</div><div class='del'>-	kfree(tx_buf);</div><div class='del'>-	kfree(rx_buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit wl1271_probe(struct sdio_func *func,</div><div class='del'>-		const struct sdio_device_id *id)</div><div class='del'>-{</div><div class='del'>-	const struct wl12xx_platform_data *wlan_data;</div><div class='del'>-	struct wl1271 *wl;</div><div class='del'>-	struct wl1271_test *wl_test;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/* wl1271 has 2 sdio functions we handle just the wlan part */</div><div class='del'>-	if (func-&gt;num != 0x02)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	wl_test = kzalloc(sizeof(struct wl1271_test), GFP_KERNEL);</div><div class='del'>-	if (!wl_test) {</div><div class='del'>-		dev_err(&amp;func-&gt;dev, "Could not allocate memory\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wl = &amp;wl_test-&gt;wl;</div><div class='del'>-</div><div class='del'>-	wl-&gt;if_priv = func;</div><div class='del'>-	wl-&gt;if_ops = &amp;sdio_ops;</div><div class='del'>-</div><div class='del'>-	/* Grab access to FN0 for ELP reg. */</div><div class='del'>-	func-&gt;card-&gt;quirks |= MMC_QUIRK_LENIENT_FN0;</div><div class='del'>-</div><div class='del'>-	/* Use block mode for transferring over one block size of data */</div><div class='del'>-	func-&gt;card-&gt;quirks |= MMC_QUIRK_BLKSZ_FOR_BYTE_MODE;</div><div class='del'>-</div><div class='del'>-	wlan_data = wl12xx_get_platform_data();</div><div class='del'>-	if (IS_ERR(wlan_data)) {</div><div class='del'>-		ret = PTR_ERR(wlan_data);</div><div class='del'>-		dev_err(&amp;func-&gt;dev, "missing wlan platform data: %d\n", ret);</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wl-&gt;irq = wlan_data-&gt;irq;</div><div class='del'>-	wl-&gt;ref_clock = wlan_data-&gt;board_ref_clock;</div><div class='del'>-	wl-&gt;tcxo_clock = wlan_data-&gt;board_tcxo_clock;</div><div class='del'>-</div><div class='del'>-	sdio_set_drvdata(func, wl_test);</div><div class='del'>-</div><div class='del'>-	/* power up the device */</div><div class='del'>-	ret = wl1271_chip_wakeup(wl);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(&amp;func-&gt;dev, "could not wake up chip\n");</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (wl-&gt;fw == NULL) {</div><div class='del'>-		ret = wl1271_fetch_firmware(wl);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			dev_err(&amp;func-&gt;dev, "firmware fetch error\n");</div><div class='del'>-			goto out_off;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* fetch NVS */</div><div class='del'>-	if (wl-&gt;nvs == NULL) {</div><div class='del'>-		ret = wl1271_fetch_nvs(wl);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			dev_err(&amp;func-&gt;dev, "NVS fetch error\n");</div><div class='del'>-			goto out_off;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = wl1271_load_firmware(wl);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(&amp;func-&gt;dev, "firmware load error: %d\n", ret);</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_info(&amp;func-&gt;dev, "initialized\n");</div><div class='del'>-</div><div class='del'>-	/* I/O testing will be done in the tester thread */</div><div class='del'>-</div><div class='del'>-	wl_test-&gt;test_task = kthread_run(tester, wl, "sdio_tester");</div><div class='del'>-	if (IS_ERR(wl_test-&gt;test_task)) {</div><div class='del'>-		dev_err(&amp;func-&gt;dev, "unable to create kernel thread\n");</div><div class='del'>-		ret = PTR_ERR(wl_test-&gt;test_task);</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_off:</div><div class='del'>-	/* power off the chip */</div><div class='del'>-	wl1271_power_off(wl);</div><div class='del'>-</div><div class='del'>-out_free:</div><div class='del'>-	kfree(wl_test);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devexit wl1271_remove(struct sdio_func *func)</div><div class='del'>-{</div><div class='del'>-	struct wl1271_test *wl_test = sdio_get_drvdata(func);</div><div class='del'>-</div><div class='del'>-	/* stop the I/O test thread */</div><div class='del'>-	kthread_stop(wl_test-&gt;test_task);</div><div class='del'>-</div><div class='del'>-	/* power off the chip */</div><div class='del'>-	wl1271_power_off(&amp;wl_test-&gt;wl);</div><div class='del'>-</div><div class='del'>-	vfree(wl_test-&gt;wl.fw);</div><div class='del'>-	wl_test-&gt;wl.fw = NULL;</div><div class='del'>-	kfree(wl_test-&gt;wl.nvs);</div><div class='del'>-	wl_test-&gt;wl.nvs = NULL;</div><div class='del'>-</div><div class='del'>-	kfree(wl_test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sdio_driver wl1271_sdio_driver = {</div><div class='del'>-	.name		= "wl12xx_sdio_test",</div><div class='del'>-	.id_table	= wl1271_devices,</div><div class='del'>-	.probe		= wl1271_probe,</div><div class='del'>-	.remove		= __devexit_p(wl1271_remove),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init wl1271_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = sdio_register_driver(&amp;wl1271_sdio_driver);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		pr_err("failed to register sdio driver: %d\n", ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-module_init(wl1271_init);</div><div class='del'>-</div><div class='del'>-static void __exit wl1271_exit(void)</div><div class='del'>-{</div><div class='del'>-	sdio_unregister_driver(&amp;wl1271_sdio_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(wl1271_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Roger Quadros &lt;roger.quadros@nokia.com&gt;");</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/spi.c b/drivers/net/wireless/wl12xx/spi.c<br/>index 0f9718677860..92caa7ce6053 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/spi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/spi.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/crc7.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/wl12xx.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "wl12xx.h"</div><div class='hunk'>@@ -69,35 +70,22 @@</div><div class='ctx'> </div><div class='ctx'> #define WSPI_MAX_NUM_OF_CHUNKS (WL1271_AGGR_BUFFER_SIZE / WSPI_MAX_CHUNK_SIZE)</div><div class='ctx'> </div><div class='del'>-static inline struct spi_device *wl_to_spi(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-	return wl-&gt;if_priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct device *wl1271_spi_wl_to_dev(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-	return &amp;(wl_to_spi(wl)-&gt;dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void wl1271_spi_disable_interrupts(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-	disable_irq(wl-&gt;irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void wl1271_spi_enable_interrupts(struct wl1271 *wl)</div><div class='del'>-{</div><div class='del'>-	enable_irq(wl-&gt;irq);</div><div class='del'>-}</div><div class='add'>+struct wl12xx_spi_glue {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct platform_device *core;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static void wl1271_spi_reset(struct wl1271 *wl)</div><div class='add'>+static void wl12xx_spi_reset(struct device *child)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_spi_glue *glue = dev_get_drvdata(child-&gt;parent);</div><div class='ctx'> 	u8 *cmd;</div><div class='ctx'> 	struct spi_transfer t;</div><div class='ctx'> 	struct spi_message m;</div><div class='ctx'> </div><div class='ctx'> 	cmd = kzalloc(WSPI_INIT_CMD_LEN, GFP_KERNEL);</div><div class='ctx'> 	if (!cmd) {</div><div class='del'>-		wl1271_error("could not allocate cmd for spi reset");</div><div class='add'>+		dev_err(child-&gt;parent,</div><div class='add'>+			"could not allocate cmd for spi reset\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -110,21 +98,22 @@ static void wl1271_spi_reset(struct wl1271 *wl)</div><div class='ctx'> 	t.len = WSPI_INIT_CMD_LEN;</div><div class='ctx'> 	spi_message_add_tail(&amp;t, &amp;m);</div><div class='ctx'> </div><div class='del'>-	spi_sync(wl_to_spi(wl), &amp;m);</div><div class='add'>+	spi_sync(to_spi_device(glue-&gt;dev), &amp;m);</div><div class='ctx'> </div><div class='del'>-	wl1271_dump(DEBUG_SPI, "spi reset -&gt; ", cmd, WSPI_INIT_CMD_LEN);</div><div class='ctx'> 	kfree(cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wl1271_spi_init(struct wl1271 *wl)</div><div class='add'>+static void wl12xx_spi_init(struct device *child)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_spi_glue *glue = dev_get_drvdata(child-&gt;parent);</div><div class='ctx'> 	u8 crc[WSPI_INIT_CMD_CRC_LEN], *cmd;</div><div class='ctx'> 	struct spi_transfer t;</div><div class='ctx'> 	struct spi_message m;</div><div class='ctx'> </div><div class='ctx'> 	cmd = kzalloc(WSPI_INIT_CMD_LEN, GFP_KERNEL);</div><div class='ctx'> 	if (!cmd) {</div><div class='del'>-		wl1271_error("could not allocate cmd for spi init");</div><div class='add'>+		dev_err(child-&gt;parent,</div><div class='add'>+			"could not allocate cmd for spi init\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -165,15 +154,16 @@ static void wl1271_spi_init(struct wl1271 *wl)</div><div class='ctx'> 	t.len = WSPI_INIT_CMD_LEN;</div><div class='ctx'> 	spi_message_add_tail(&amp;t, &amp;m);</div><div class='ctx'> </div><div class='del'>-	spi_sync(wl_to_spi(wl), &amp;m);</div><div class='del'>-	wl1271_dump(DEBUG_SPI, "spi init -&gt; ", cmd, WSPI_INIT_CMD_LEN);</div><div class='add'>+	spi_sync(to_spi_device(glue-&gt;dev), &amp;m);</div><div class='ctx'> 	kfree(cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define WL1271_BUSY_WORD_TIMEOUT 1000</div><div class='ctx'> </div><div class='del'>-static int wl1271_spi_read_busy(struct wl1271 *wl)</div><div class='add'>+static int wl12xx_spi_read_busy(struct device *child)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_spi_glue *glue = dev_get_drvdata(child-&gt;parent);</div><div class='add'>+	struct wl1271 *wl = dev_get_drvdata(child);</div><div class='ctx'> 	struct spi_transfer t[1];</div><div class='ctx'> 	struct spi_message m;</div><div class='ctx'> 	u32 *busy_buf;</div><div class='hunk'>@@ -194,20 +184,22 @@ static int wl1271_spi_read_busy(struct wl1271 *wl)</div><div class='ctx'> 		t[0].len = sizeof(u32);</div><div class='ctx'> 		t[0].cs_change = true;</div><div class='ctx'> 		spi_message_add_tail(&amp;t[0], &amp;m);</div><div class='del'>-		spi_sync(wl_to_spi(wl), &amp;m);</div><div class='add'>+		spi_sync(to_spi_device(glue-&gt;dev), &amp;m);</div><div class='ctx'> </div><div class='ctx'> 		if (*busy_buf &amp; 0x1)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* The SPI bus is unresponsive, the read failed. */</div><div class='del'>-	wl1271_error("SPI read busy-word timeout!\n");</div><div class='add'>+	dev_err(child-&gt;parent, "SPI read busy-word timeout!\n");</div><div class='ctx'> 	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wl1271_spi_raw_read(struct wl1271 *wl, int addr, void *buf,</div><div class='add'>+static void wl12xx_spi_raw_read(struct device *child, int addr, void *buf,</div><div class='ctx'> 				size_t len, bool fixed)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_spi_glue *glue = dev_get_drvdata(child-&gt;parent);</div><div class='add'>+	struct wl1271 *wl = dev_get_drvdata(child);</div><div class='ctx'> 	struct spi_transfer t[2];</div><div class='ctx'> 	struct spi_message m;</div><div class='ctx'> 	u32 *busy_buf;</div><div class='hunk'>@@ -243,10 +235,10 @@ static void wl1271_spi_raw_read(struct wl1271 *wl, int addr, void *buf,</div><div class='ctx'> 		t[1].cs_change = true;</div><div class='ctx'> 		spi_message_add_tail(&amp;t[1], &amp;m);</div><div class='ctx'> </div><div class='del'>-		spi_sync(wl_to_spi(wl), &amp;m);</div><div class='add'>+		spi_sync(to_spi_device(glue-&gt;dev), &amp;m);</div><div class='ctx'> </div><div class='ctx'> 		if (!(busy_buf[WL1271_BUSY_WORD_CNT - 1] &amp; 0x1) &amp;&amp;</div><div class='del'>-		    wl1271_spi_read_busy(wl)) {</div><div class='add'>+		    wl12xx_spi_read_busy(child)) {</div><div class='ctx'> 			memset(buf, 0, chunk_len);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -259,10 +251,7 @@ static void wl1271_spi_raw_read(struct wl1271 *wl, int addr, void *buf,</div><div class='ctx'> 		t[0].cs_change = true;</div><div class='ctx'> 		spi_message_add_tail(&amp;t[0], &amp;m);</div><div class='ctx'> </div><div class='del'>-		spi_sync(wl_to_spi(wl), &amp;m);</div><div class='del'>-</div><div class='del'>-		wl1271_dump(DEBUG_SPI, "spi_read cmd -&gt; ", cmd, sizeof(*cmd));</div><div class='del'>-		wl1271_dump(DEBUG_SPI, "spi_read buf &lt;- ", buf, chunk_len);</div><div class='add'>+		spi_sync(to_spi_device(glue-&gt;dev), &amp;m);</div><div class='ctx'> </div><div class='ctx'> 		if (!fixed)</div><div class='ctx'> 			addr += chunk_len;</div><div class='hunk'>@@ -271,9 +260,10 @@ static void wl1271_spi_raw_read(struct wl1271 *wl, int addr, void *buf,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wl1271_spi_raw_write(struct wl1271 *wl, int addr, void *buf,</div><div class='del'>-			  size_t len, bool fixed)</div><div class='add'>+static void wl12xx_spi_raw_write(struct device *child, int addr, void *buf,</div><div class='add'>+				 size_t len, bool fixed)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_spi_glue *glue = dev_get_drvdata(child-&gt;parent);</div><div class='ctx'> 	struct spi_transfer t[2 * WSPI_MAX_NUM_OF_CHUNKS];</div><div class='ctx'> 	struct spi_message m;</div><div class='ctx'> 	u32 commands[WSPI_MAX_NUM_OF_CHUNKS];</div><div class='hunk'>@@ -308,9 +298,6 @@ static void wl1271_spi_raw_write(struct wl1271 *wl, int addr, void *buf,</div><div class='ctx'> 		t[i].len = chunk_len;</div><div class='ctx'> 		spi_message_add_tail(&amp;t[i++], &amp;m);</div><div class='ctx'> </div><div class='del'>-		wl1271_dump(DEBUG_SPI, "spi_write cmd -&gt; ", cmd, sizeof(*cmd));</div><div class='del'>-		wl1271_dump(DEBUG_SPI, "spi_write buf -&gt; ", buf, chunk_len);</div><div class='del'>-</div><div class='ctx'> 		if (!fixed)</div><div class='ctx'> 			addr += chunk_len;</div><div class='ctx'> 		buf += chunk_len;</div><div class='hunk'>@@ -318,72 +305,41 @@ static void wl1271_spi_raw_write(struct wl1271 *wl, int addr, void *buf,</div><div class='ctx'> 		cmd++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spi_sync(wl_to_spi(wl), &amp;m);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t wl1271_hardirq(int irq, void *cookie)</div><div class='del'>-{</div><div class='del'>-	struct wl1271 *wl = cookie;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	wl1271_debug(DEBUG_IRQ, "IRQ");</div><div class='del'>-</div><div class='del'>-	/* complete the ELP completion */</div><div class='del'>-	spin_lock_irqsave(&amp;wl-&gt;wl_lock, flags);</div><div class='del'>-	set_bit(WL1271_FLAG_IRQ_RUNNING, &amp;wl-&gt;flags);</div><div class='del'>-	if (wl-&gt;elp_compl) {</div><div class='del'>-		complete(wl-&gt;elp_compl);</div><div class='del'>-		wl-&gt;elp_compl = NULL;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;wl-&gt;wl_lock, flags);</div><div class='del'>-</div><div class='del'>-	return IRQ_WAKE_THREAD;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int wl1271_spi_set_power(struct wl1271 *wl, bool enable)</div><div class='del'>-{</div><div class='del'>-	if (wl-&gt;set_power)</div><div class='del'>-		wl-&gt;set_power(enable);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	spi_sync(to_spi_device(glue-&gt;dev), &amp;m);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct wl1271_if_operations spi_ops = {</div><div class='del'>-	.read		= wl1271_spi_raw_read,</div><div class='del'>-	.write		= wl1271_spi_raw_write,</div><div class='del'>-	.reset		= wl1271_spi_reset,</div><div class='del'>-	.init		= wl1271_spi_init,</div><div class='del'>-	.power		= wl1271_spi_set_power,</div><div class='del'>-	.dev		= wl1271_spi_wl_to_dev,</div><div class='del'>-	.enable_irq	= wl1271_spi_enable_interrupts,</div><div class='del'>-	.disable_irq	= wl1271_spi_disable_interrupts,</div><div class='add'>+	.read		= wl12xx_spi_raw_read,</div><div class='add'>+	.write		= wl12xx_spi_raw_write,</div><div class='add'>+	.reset		= wl12xx_spi_reset,</div><div class='add'>+	.init		= wl12xx_spi_init,</div><div class='ctx'> 	.set_block_size = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __devinit wl1271_probe(struct spi_device *spi)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_spi_glue *glue;</div><div class='ctx'> 	struct wl12xx_platform_data *pdata;</div><div class='del'>-	struct ieee80211_hw *hw;</div><div class='del'>-	struct wl1271 *wl;</div><div class='del'>-	unsigned long irqflags;</div><div class='del'>-	int ret;</div><div class='add'>+	struct resource res[1];</div><div class='add'>+	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	pdata = spi-&gt;dev.platform_data;</div><div class='ctx'> 	if (!pdata) {</div><div class='del'>-		wl1271_error("no platform data");</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "no platform data\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hw = wl1271_alloc_hw();</div><div class='del'>-	if (IS_ERR(hw))</div><div class='del'>-		return PTR_ERR(hw);</div><div class='add'>+	pdata-&gt;ops = &amp;spi_ops;</div><div class='ctx'> </div><div class='del'>-	wl = hw-&gt;priv;</div><div class='add'>+	glue = kzalloc(sizeof(*glue), GFP_KERNEL);</div><div class='add'>+	if (!glue) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "can't allocate glue\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(&amp;spi-&gt;dev, wl);</div><div class='del'>-	wl-&gt;if_priv = spi;</div><div class='add'>+	glue-&gt;dev = &amp;spi-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	wl-&gt;if_ops = &amp;spi_ops;</div><div class='add'>+	spi_set_drvdata(spi, glue);</div><div class='ctx'> </div><div class='ctx'> 	/* This is the only SPI value that we need to set here, the rest</div><div class='ctx'> 	 * comes from the board-peripherals file */</div><div class='hunk'>@@ -391,69 +347,61 @@ static int __devinit wl1271_probe(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	ret = spi_setup(spi);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		wl1271_error("spi_setup failed");</div><div class='del'>-		goto out_free;</div><div class='add'>+		dev_err(glue-&gt;dev, "spi_setup failed\n");</div><div class='add'>+		goto out_free_glue;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wl-&gt;set_power = pdata-&gt;set_power;</div><div class='del'>-	if (!wl-&gt;set_power) {</div><div class='del'>-		wl1271_error("set power function missing in platform data");</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto out_free;</div><div class='add'>+	glue-&gt;core = platform_device_alloc("wl12xx", -1);</div><div class='add'>+	if (!glue-&gt;core) {</div><div class='add'>+		dev_err(glue-&gt;dev, "can't allocate platform_device\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_free_glue;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wl-&gt;ref_clock = pdata-&gt;board_ref_clock;</div><div class='del'>-	wl-&gt;tcxo_clock = pdata-&gt;board_tcxo_clock;</div><div class='del'>-	wl-&gt;platform_quirks = pdata-&gt;platform_quirks;</div><div class='add'>+	glue-&gt;core-&gt;dev.parent = &amp;spi-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;platform_quirks &amp; WL12XX_PLATFORM_QUIRK_EDGE_IRQ)</div><div class='del'>-		irqflags = IRQF_TRIGGER_RISING;</div><div class='del'>-	else</div><div class='del'>-		irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;</div><div class='add'>+	memset(res, 0x00, sizeof(res));</div><div class='ctx'> </div><div class='del'>-	wl-&gt;irq = spi-&gt;irq;</div><div class='del'>-	if (wl-&gt;irq &lt; 0) {</div><div class='del'>-		wl1271_error("irq missing in platform data");</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='add'>+	res[0].start = spi-&gt;irq;</div><div class='add'>+	res[0].flags = IORESOURCE_IRQ;</div><div class='add'>+	res[0].name = "irq";</div><div class='ctx'> </div><div class='del'>-	ret = request_threaded_irq(wl-&gt;irq, wl1271_hardirq, wl1271_irq,</div><div class='del'>-				   irqflags,</div><div class='del'>-				   DRIVER_NAME, wl);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		wl1271_error("request_irq() failed: %d", ret);</div><div class='del'>-		goto out_free;</div><div class='add'>+	ret = platform_device_add_resources(glue-&gt;core, res, ARRAY_SIZE(res));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(glue-&gt;dev, "can't add resources\n");</div><div class='add'>+		goto out_dev_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	disable_irq(wl-&gt;irq);</div><div class='del'>-</div><div class='del'>-	ret = wl1271_init_ieee80211(wl);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_irq;</div><div class='add'>+	ret = platform_device_add_data(glue-&gt;core, pdata, sizeof(*pdata));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(glue-&gt;dev, "can't add platform data\n");</div><div class='add'>+		goto out_dev_put;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_register_hw(wl);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out_irq;</div><div class='add'>+	ret = platform_device_add(glue-&gt;core);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(glue-&gt;dev, "can't register platform device\n");</div><div class='add'>+		goto out_dev_put;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- out_irq:</div><div class='del'>-	free_irq(wl-&gt;irq, wl);</div><div class='del'>-</div><div class='del'>- out_free:</div><div class='del'>-	wl1271_free_hw(wl);</div><div class='add'>+out_dev_put:</div><div class='add'>+	platform_device_put(glue-&gt;core);</div><div class='ctx'> </div><div class='add'>+out_free_glue:</div><div class='add'>+	kfree(glue);</div><div class='add'>+out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __devexit wl1271_remove(struct spi_device *spi)</div><div class='ctx'> {</div><div class='del'>-	struct wl1271 *wl = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+	struct wl12xx_spi_glue *glue = spi_get_drvdata(spi);</div><div class='ctx'> </div><div class='del'>-	wl1271_unregister_hw(wl);</div><div class='del'>-	free_irq(wl-&gt;irq, wl);</div><div class='del'>-	wl1271_free_hw(wl);</div><div class='add'>+	platform_device_del(glue-&gt;core);</div><div class='add'>+	platform_device_put(glue-&gt;core);</div><div class='add'>+	kfree(glue);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -462,7 +410,6 @@ static int __devexit wl1271_remove(struct spi_device *spi)</div><div class='ctx'> static struct spi_driver wl1271_spi_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name		= "wl1271_spi",</div><div class='del'>-		.bus		= &amp;spi_bus_type,</div><div class='ctx'> 		.owner		= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/testmode.c b/drivers/net/wireless/wl12xx/testmode.c<br/>index 4ae8effaee22..25093c0cb0ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/testmode.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/testmode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/testmode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/testmode.c</a></div><div class='hunk'>@@ -26,8 +26,10 @@</div><div class='ctx'> #include &lt;net/genetlink.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "wl12xx.h"</div><div class='add'>+#include "debug.h"</div><div class='ctx'> #include "acx.h"</div><div class='ctx'> #include "reg.h"</div><div class='add'>+#include "ps.h"</div><div class='ctx'> </div><div class='ctx'> #define WL1271_TM_MAX_DATA_LENGTH 1024</div><div class='ctx'> </div><div class='hunk'>@@ -36,6 +38,7 @@ enum wl1271_tm_commands {</div><div class='ctx'> 	WL1271_TM_CMD_TEST,</div><div class='ctx'> 	WL1271_TM_CMD_INTERROGATE,</div><div class='ctx'> 	WL1271_TM_CMD_CONFIGURE,</div><div class='add'>+	WL1271_TM_CMD_NVS_PUSH,		/* Not in use. Keep to not break ABI */</div><div class='ctx'> 	WL1271_TM_CMD_SET_PLT_MODE,</div><div class='ctx'> 	WL1271_TM_CMD_RECOVER,</div><div class='ctx'> </div><div class='hunk'>@@ -87,31 +90,47 @@ static int wl1271_tm_cmd_test(struct wl1271 *wl, struct nlattr *tb[])</div><div class='ctx'> 		return -EMSGSIZE;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;wl-&gt;mutex);</div><div class='del'>-	ret = wl1271_cmd_test(wl, buf, buf_len, answer);</div><div class='del'>-	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+	if (wl-&gt;state == WL1271_STATE_OFF) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wl1271_ps_elp_wakeup(wl);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = wl1271_cmd_test(wl, buf, buf_len, answer);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		wl1271_warning("testmode cmd test failed: %d", ret);</div><div class='del'>-		return ret;</div><div class='add'>+		goto out_sleep;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (answer) {</div><div class='ctx'> 		len = nla_total_size(buf_len);</div><div class='ctx'> 		skb = cfg80211_testmode_alloc_reply_skb(wl-&gt;hw-&gt;wiphy, len);</div><div class='del'>-		if (!skb)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+		if (!skb) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out_sleep;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		NLA_PUT(skb, WL1271_TM_ATTR_DATA, buf_len, buf);</div><div class='ctx'> 		ret = cfg80211_testmode_reply(skb);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='add'>+			goto out_sleep;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+out_sleep:</div><div class='add'>+	wl1271_ps_elp_sleep(wl);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'> nla_put_failure:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='del'>-	return -EMSGSIZE;</div><div class='add'>+	ret = -EMSGSIZE;</div><div class='add'>+	goto out_sleep;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int wl1271_tm_cmd_interrogate(struct wl1271 *wl, struct nlattr *tb[])</div><div class='hunk'>@@ -128,33 +147,53 @@ static int wl1271_tm_cmd_interrogate(struct wl1271 *wl, struct nlattr *tb[])</div><div class='ctx'> </div><div class='ctx'> 	ie_id = nla_get_u8(tb[WL1271_TM_ATTR_IE_ID]);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;wl-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (wl-&gt;state == WL1271_STATE_OFF) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = wl1271_ps_elp_wakeup(wl);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='del'>-	if (!cmd)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (!cmd) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_sleep;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;wl-&gt;mutex);</div><div class='ctx'> 	ret = wl1271_cmd_interrogate(wl, ie_id, cmd, sizeof(*cmd));</div><div class='del'>-	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='del'>-</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		wl1271_warning("testmode cmd interrogate failed: %d", ret);</div><div class='del'>-		kfree(cmd);</div><div class='del'>-		return ret;</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb = cfg80211_testmode_alloc_reply_skb(wl-&gt;hw-&gt;wiphy, sizeof(*cmd));</div><div class='ctx'> 	if (!skb) {</div><div class='del'>-		kfree(cmd);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	NLA_PUT(skb, WL1271_TM_ATTR_DATA, sizeof(*cmd), cmd);</div><div class='add'>+	ret = cfg80211_testmode_reply(skb);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(cmd);</div><div class='add'>+out_sleep:</div><div class='add'>+	wl1271_ps_elp_sleep(wl);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;wl-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'> nla_put_failure:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='del'>-	return -EMSGSIZE;</div><div class='add'>+	ret = -EMSGSIZE;</div><div class='add'>+	goto out_free;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int wl1271_tm_cmd_configure(struct wl1271 *wl, struct nlattr *tb[])</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c<br/>index bad9e29d49b0..4508ccd78328 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/tx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/tx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/tx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/tx.c</a></div><div class='hunk'>@@ -26,22 +26,24 @@</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "wl12xx.h"</div><div class='add'>+#include "debug.h"</div><div class='ctx'> #include "io.h"</div><div class='ctx'> #include "reg.h"</div><div class='ctx'> #include "ps.h"</div><div class='ctx'> #include "tx.h"</div><div class='ctx'> #include "event.h"</div><div class='ctx'> </div><div class='del'>-static int wl1271_set_default_wep_key(struct wl1271 *wl, u8 id)</div><div class='add'>+static int wl1271_set_default_wep_key(struct wl1271 *wl,</div><div class='add'>+				      struct wl12xx_vif *wlvif, u8 id)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	bool is_ap = (wl-&gt;bss_type == BSS_TYPE_AP_BSS);</div><div class='add'>+	bool is_ap = (wlvif-&gt;bss_type == BSS_TYPE_AP_BSS);</div><div class='ctx'> </div><div class='ctx'> 	if (is_ap)</div><div class='ctx'> 		ret = wl12xx_cmd_set_default_wep_key(wl, id,</div><div class='del'>-						     wl-&gt;ap_bcast_hlid);</div><div class='add'>+						     wlvif-&gt;ap.bcast_hlid);</div><div class='ctx'> 	else</div><div class='del'>-		ret = wl12xx_cmd_set_default_wep_key(wl, id, wl-&gt;sta_hlid);</div><div class='add'>+		ret = wl12xx_cmd_set_default_wep_key(wl, id, wlvif-&gt;sta.hlid);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -76,7 +78,8 @@ static void wl1271_free_tx_id(struct wl1271 *wl, int id)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int wl1271_tx_update_filters(struct wl1271 *wl,</div><div class='del'>-						 struct sk_buff *skb)</div><div class='add'>+				    struct wl12xx_vif *wlvif,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hdr *hdr;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -92,15 +95,11 @@ static int wl1271_tx_update_filters(struct wl1271 *wl,</div><div class='ctx'> 	if (!ieee80211_is_auth(hdr-&gt;frame_control))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;dev_hlid != WL12XX_INVALID_LINK_ID)</div><div class='add'>+	if (wlvif-&gt;dev_hlid != WL12XX_INVALID_LINK_ID)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	wl1271_debug(DEBUG_CMD, "starting device role for roaming");</div><div class='del'>-	ret = wl12xx_cmd_role_start_dev(wl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = wl12xx_roc(wl, wl-&gt;dev_role_id);</div><div class='add'>+	ret = wl12xx_start_dev(wl, wlvif);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> out:</div><div class='hunk'>@@ -123,18 +122,16 @@ static void wl1271_tx_ap_update_inconnection_sta(struct wl1271 *wl,</div><div class='ctx'> 		wl1271_acx_set_inconnection_sta(wl, hdr-&gt;addr1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wl1271_tx_regulate_link(struct wl1271 *wl, u8 hlid)</div><div class='add'>+static void wl1271_tx_regulate_link(struct wl1271 *wl,</div><div class='add'>+				    struct wl12xx_vif *wlvif,</div><div class='add'>+				    u8 hlid)</div><div class='ctx'> {</div><div class='ctx'> 	bool fw_ps, single_sta;</div><div class='ctx'> 	u8 tx_pkts;</div><div class='ctx'> </div><div class='del'>-	/* only regulate station links */</div><div class='del'>-	if (hlid &lt; WL1271_AP_STA_HLID_START)</div><div class='add'>+	if (WARN_ON(!test_bit(hlid, wlvif-&gt;links_map)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(!wl1271_is_active_sta(wl, hlid)))</div><div class='del'>-	    return;</div><div class='del'>-</div><div class='ctx'> 	fw_ps = test_bit(hlid, (unsigned long *)&amp;wl-&gt;ap_fw_ps_map);</div><div class='ctx'> 	tx_pkts = wl-&gt;links[hlid].allocated_pkts;</div><div class='ctx'> 	single_sta = (wl-&gt;active_sta_count == 1);</div><div class='hunk'>@@ -146,7 +143,7 @@ static void wl1271_tx_regulate_link(struct wl1271 *wl, u8 hlid)</div><div class='ctx'> 	 * case FW-memory congestion is not a problem.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!single_sta &amp;&amp; fw_ps &amp;&amp; tx_pkts &gt;= WL1271_PS_STA_MAX_PACKETS)</div><div class='del'>-		wl1271_ps_link_start(wl, hlid, true);</div><div class='add'>+		wl12xx_ps_link_start(wl, wlvif, hlid, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool wl12xx_is_dummy_packet(struct wl1271 *wl, struct sk_buff *skb)</div><div class='hunk'>@@ -154,7 +151,8 @@ bool wl12xx_is_dummy_packet(struct wl1271 *wl, struct sk_buff *skb)</div><div class='ctx'> 	return wl-&gt;dummy_packet == skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u8 wl12xx_tx_get_hlid_ap(struct wl1271 *wl, struct sk_buff *skb)</div><div class='add'>+u8 wl12xx_tx_get_hlid_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			 struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_tx_info *control = IEEE80211_SKB_CB(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -167,49 +165,51 @@ u8 wl12xx_tx_get_hlid_ap(struct wl1271 *wl, struct sk_buff *skb)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct ieee80211_hdr *hdr;</div><div class='ctx'> </div><div class='del'>-		if (!test_bit(WL1271_FLAG_AP_STARTED, &amp;wl-&gt;flags))</div><div class='add'>+		if (!test_bit(WLVIF_FLAG_AP_STARTED, &amp;wlvif-&gt;flags))</div><div class='ctx'> 			return wl-&gt;system_hlid;</div><div class='ctx'> </div><div class='ctx'> 		hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='ctx'> 		if (ieee80211_is_mgmt(hdr-&gt;frame_control))</div><div class='del'>-			return wl-&gt;ap_global_hlid;</div><div class='add'>+			return wlvif-&gt;ap.global_hlid;</div><div class='ctx'> 		else</div><div class='del'>-			return wl-&gt;ap_bcast_hlid;</div><div class='add'>+			return wlvif-&gt;ap.bcast_hlid;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 wl1271_tx_get_hlid(struct wl1271 *wl, struct sk_buff *skb)</div><div class='add'>+u8 wl12xx_tx_get_hlid(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+		      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if (wl12xx_is_dummy_packet(wl, skb))</div><div class='add'>+	if (!wlvif || wl12xx_is_dummy_packet(wl, skb))</div><div class='ctx'> 		return wl-&gt;system_hlid;</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;bss_type == BSS_TYPE_AP_BSS)</div><div class='del'>-		return wl12xx_tx_get_hlid_ap(wl, skb);</div><div class='add'>+	if (wlvif-&gt;bss_type == BSS_TYPE_AP_BSS)</div><div class='add'>+		return wl12xx_tx_get_hlid_ap(wl, wlvif, skb);</div><div class='ctx'> </div><div class='del'>-	wl1271_tx_update_filters(wl, skb);</div><div class='add'>+	wl1271_tx_update_filters(wl, wlvif, skb);</div><div class='ctx'> </div><div class='del'>-	if ((test_bit(WL1271_FLAG_STA_ASSOCIATED, &amp;wl-&gt;flags) ||</div><div class='del'>-	     test_bit(WL1271_FLAG_IBSS_JOINED, &amp;wl-&gt;flags)) &amp;&amp;</div><div class='add'>+	if ((test_bit(WLVIF_FLAG_STA_ASSOCIATED, &amp;wlvif-&gt;flags) ||</div><div class='add'>+	     test_bit(WLVIF_FLAG_IBSS_JOINED, &amp;wlvif-&gt;flags)) &amp;&amp;</div><div class='ctx'> 	    !ieee80211_is_auth(hdr-&gt;frame_control) &amp;&amp;</div><div class='ctx'> 	    !ieee80211_is_assoc_req(hdr-&gt;frame_control))</div><div class='del'>-		return wl-&gt;sta_hlid;</div><div class='add'>+		return wlvif-&gt;sta.hlid;</div><div class='ctx'> 	else</div><div class='del'>-		return wl-&gt;dev_hlid;</div><div class='add'>+		return wlvif-&gt;dev_hlid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int wl12xx_calc_packet_alignment(struct wl1271 *wl,</div><div class='ctx'> 						unsigned int packet_length)</div><div class='ctx'> {</div><div class='del'>-	if (wl-&gt;quirks &amp; WL12XX_QUIRK_BLOCKSIZE_ALIGNMENT)</div><div class='del'>-		return ALIGN(packet_length, WL12XX_BUS_BLOCK_SIZE);</div><div class='del'>-	else</div><div class='add'>+	if (wl-&gt;quirks &amp; WL12XX_QUIRK_NO_BLOCKSIZE_ALIGNMENT)</div><div class='ctx'> 		return ALIGN(packet_length, WL1271_TX_ALIGN_TO);</div><div class='add'>+	else</div><div class='add'>+		return ALIGN(packet_length, WL12XX_BUS_BLOCK_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra,</div><div class='del'>-				u32 buf_offset, u8 hlid)</div><div class='add'>+static int wl1271_tx_allocate(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			      struct sk_buff *skb, u32 extra, u32 buf_offset,</div><div class='add'>+			      u8 hlid)</div><div class='ctx'> {</div><div class='ctx'> 	struct wl1271_tx_hw_descr *desc;</div><div class='ctx'> 	u32 total_len = skb-&gt;len + sizeof(struct wl1271_tx_hw_descr) + extra;</div><div class='hunk'>@@ -217,6 +217,7 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra,</div><div class='ctx'> 	u32 total_blocks;</div><div class='ctx'> 	int id, ret = -EBUSY, ac;</div><div class='ctx'> 	u32 spare_blocks = wl-&gt;tx_spare_blocks;</div><div class='add'>+	bool is_dummy = false;</div><div class='ctx'> </div><div class='ctx'> 	if (buf_offset + total_len &gt; WL1271_AGGR_BUFFER_SIZE)</div><div class='ctx'> 		return -EAGAIN;</div><div class='hunk'>@@ -231,8 +232,10 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra,</div><div class='ctx'> 	len = wl12xx_calc_packet_alignment(wl, total_len);</div><div class='ctx'> </div><div class='ctx'> 	/* in case of a dummy packet, use default amount of spare mem blocks */</div><div class='del'>-	if (unlikely(wl12xx_is_dummy_packet(wl, skb)))</div><div class='add'>+	if (unlikely(wl12xx_is_dummy_packet(wl, skb))) {</div><div class='add'>+		is_dummy = true;</div><div class='ctx'> 		spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	total_blocks = (len + TX_HW_BLOCK_SIZE - 1) / TX_HW_BLOCK_SIZE +</div><div class='ctx'> 		spare_blocks;</div><div class='hunk'>@@ -257,8 +260,9 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra,</div><div class='ctx'> 		ac = wl1271_tx_get_queue(skb_get_queue_mapping(skb));</div><div class='ctx'> 		wl-&gt;tx_allocated_pkts[ac]++;</div><div class='ctx'> </div><div class='del'>-		if (wl-&gt;bss_type == BSS_TYPE_AP_BSS &amp;&amp;</div><div class='del'>-		    hlid &gt;= WL1271_AP_STA_HLID_START)</div><div class='add'>+		if (!is_dummy &amp;&amp; wlvif &amp;&amp;</div><div class='add'>+		    wlvif-&gt;bss_type == BSS_TYPE_AP_BSS &amp;&amp;</div><div class='add'>+		    test_bit(hlid, wlvif-&gt;ap.sta_hlid_map))</div><div class='ctx'> 			wl-&gt;links[hlid].allocated_pkts++;</div><div class='ctx'> </div><div class='ctx'> 		ret = 0;</div><div class='hunk'>@@ -273,15 +277,16 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct sk_buff *skb,</div><div class='del'>-			      u32 extra, struct ieee80211_tx_info *control,</div><div class='del'>-			      u8 hlid)</div><div class='add'>+static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			       struct sk_buff *skb, u32 extra,</div><div class='add'>+			       struct ieee80211_tx_info *control, u8 hlid)</div><div class='ctx'> {</div><div class='ctx'> 	struct timespec ts;</div><div class='ctx'> 	struct wl1271_tx_hw_descr *desc;</div><div class='ctx'> 	int aligned_len, ac, rate_idx;</div><div class='ctx'> 	s64 hosttime;</div><div class='del'>-	u16 tx_attr;</div><div class='add'>+	u16 tx_attr = 0;</div><div class='add'>+	bool is_dummy;</div><div class='ctx'> </div><div class='ctx'> 	desc = (struct wl1271_tx_hw_descr *) skb-&gt;data;</div><div class='ctx'> </div><div class='hunk'>@@ -298,7 +303,8 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct sk_buff *skb,</div><div class='ctx'> 	hosttime = (timespec_to_ns(&amp;ts) &gt;&gt; 10);</div><div class='ctx'> 	desc-&gt;start_time = cpu_to_le32(hosttime - wl-&gt;time_offset);</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;bss_type != BSS_TYPE_AP_BSS)</div><div class='add'>+	is_dummy = wl12xx_is_dummy_packet(wl, skb);</div><div class='add'>+	if (is_dummy || !wlvif || wlvif-&gt;bss_type != BSS_TYPE_AP_BSS)</div><div class='ctx'> 		desc-&gt;life_time = cpu_to_le16(TX_HW_MGMT_PKT_LIFETIME_TU);</div><div class='ctx'> 	else</div><div class='ctx'> 		desc-&gt;life_time = cpu_to_le16(TX_HW_AP_MODE_PKT_LIFETIME_TU);</div><div class='hunk'>@@ -307,39 +313,42 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct sk_buff *skb,</div><div class='ctx'> 	ac = wl1271_tx_get_queue(skb_get_queue_mapping(skb));</div><div class='ctx'> 	desc-&gt;tid = skb-&gt;priority;</div><div class='ctx'> </div><div class='del'>-	if (wl12xx_is_dummy_packet(wl, skb)) {</div><div class='add'>+	if (is_dummy) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * FW expects the dummy packet to have an invalid session id -</div><div class='ctx'> 		 * any session id that is different than the one set in the join</div><div class='ctx'> 		 */</div><div class='del'>-		tx_attr = ((~wl-&gt;session_counter) &lt;&lt;</div><div class='add'>+		tx_attr = (SESSION_COUNTER_INVALID &lt;&lt;</div><div class='ctx'> 			   TX_HW_ATTR_OFST_SESSION_COUNTER) &amp;</div><div class='ctx'> 			   TX_HW_ATTR_SESSION_COUNTER;</div><div class='ctx'> </div><div class='ctx'> 		tx_attr |= TX_HW_ATTR_TX_DUMMY_REQ;</div><div class='del'>-	} else {</div><div class='add'>+	} else if (wlvif) {</div><div class='ctx'> 		/* configure the tx attributes */</div><div class='del'>-		tx_attr =</div><div class='del'>-			wl-&gt;session_counter &lt;&lt; TX_HW_ATTR_OFST_SESSION_COUNTER;</div><div class='add'>+		tx_attr = wlvif-&gt;session_counter &lt;&lt;</div><div class='add'>+			  TX_HW_ATTR_OFST_SESSION_COUNTER;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;hlid = hlid;</div><div class='del'>-</div><div class='del'>-	if (wl-&gt;bss_type != BSS_TYPE_AP_BSS) {</div><div class='add'>+	if (is_dummy || !wlvif)</div><div class='add'>+		rate_idx = 0;</div><div class='add'>+	else if (wlvif-&gt;bss_type != BSS_TYPE_AP_BSS) {</div><div class='ctx'> 		/* if the packets are destined for AP (have a STA entry)</div><div class='ctx'> 		   send them with AP rate policies, otherwise use default</div><div class='ctx'> 		   basic rates */</div><div class='del'>-		if (control-&gt;control.sta)</div><div class='del'>-			rate_idx = ACX_TX_AP_FULL_RATE;</div><div class='add'>+		if (control-&gt;flags &amp; IEEE80211_TX_CTL_NO_CCK_RATE)</div><div class='add'>+			rate_idx = wlvif-&gt;sta.p2p_rate_idx;</div><div class='add'>+		else if (control-&gt;control.sta)</div><div class='add'>+			rate_idx = wlvif-&gt;sta.ap_rate_idx;</div><div class='ctx'> 		else</div><div class='del'>-			rate_idx = ACX_TX_BASIC_RATE;</div><div class='add'>+			rate_idx = wlvif-&gt;sta.basic_rate_idx;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (hlid == wl-&gt;ap_global_hlid)</div><div class='del'>-			rate_idx = ACX_TX_AP_MODE_MGMT_RATE;</div><div class='del'>-		else if (hlid == wl-&gt;ap_bcast_hlid)</div><div class='del'>-			rate_idx = ACX_TX_AP_MODE_BCST_RATE;</div><div class='add'>+		if (hlid == wlvif-&gt;ap.global_hlid)</div><div class='add'>+			rate_idx = wlvif-&gt;ap.mgmt_rate_idx;</div><div class='add'>+		else if (hlid == wlvif-&gt;ap.bcast_hlid)</div><div class='add'>+			rate_idx = wlvif-&gt;ap.bcast_rate_idx;</div><div class='ctx'> 		else</div><div class='del'>-			rate_idx = ac;</div><div class='add'>+			rate_idx = wlvif-&gt;ap.ucast_rate_idx[ac];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tx_attr |= rate_idx &lt;&lt; TX_HW_ATTR_OFST_RATE_POLICY;</div><div class='hunk'>@@ -379,20 +388,24 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* caller must hold wl-&gt;mutex */</div><div class='del'>-static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct sk_buff *skb,</div><div class='del'>-							u32 buf_offset)</div><div class='add'>+static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+				   struct sk_buff *skb, u32 buf_offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='ctx'> 	u32 extra = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u32 total_len;</div><div class='ctx'> 	u8 hlid;</div><div class='add'>+	bool is_dummy;</div><div class='ctx'> </div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	info = IEEE80211_SKB_CB(skb);</div><div class='ctx'> </div><div class='add'>+	/* TODO: handle dummy packets on multi-vifs */</div><div class='add'>+	is_dummy = wl12xx_is_dummy_packet(wl, skb);</div><div class='add'>+</div><div class='ctx'> 	if (info-&gt;control.hw_key &amp;&amp;</div><div class='ctx'> 	    info-&gt;control.hw_key-&gt;cipher == WLAN_CIPHER_SUITE_TKIP)</div><div class='ctx'> 		extra = WL1271_TKIP_IV_SPACE;</div><div class='hunk'>@@ -405,29 +418,28 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct sk_buff *skb,</div><div class='ctx'> 		is_wep = (cipher == WLAN_CIPHER_SUITE_WEP40) ||</div><div class='ctx'> 			 (cipher == WLAN_CIPHER_SUITE_WEP104);</div><div class='ctx'> </div><div class='del'>-		if (unlikely(is_wep &amp;&amp; wl-&gt;default_key != idx)) {</div><div class='del'>-			ret = wl1271_set_default_wep_key(wl, idx);</div><div class='add'>+		if (unlikely(is_wep &amp;&amp; wlvif-&gt;default_key != idx)) {</div><div class='add'>+			ret = wl1271_set_default_wep_key(wl, wlvif, idx);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				return ret;</div><div class='del'>-			wl-&gt;default_key = idx;</div><div class='add'>+			wlvif-&gt;default_key = idx;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	hlid = wl1271_tx_get_hlid(wl, skb);</div><div class='add'>+	hlid = wl12xx_tx_get_hlid(wl, wlvif, skb);</div><div class='ctx'> 	if (hlid == WL12XX_INVALID_LINK_ID) {</div><div class='ctx'> 		wl1271_error("invalid hlid. dropping skb 0x%p", skb);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = wl1271_tx_allocate(wl, skb, extra, buf_offset, hlid);</div><div class='add'>+	ret = wl1271_tx_allocate(wl, wlvif, skb, extra, buf_offset, hlid);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	wl1271_tx_fill_hdr(wl, skb, extra, info, hlid);</div><div class='add'>+	wl1271_tx_fill_hdr(wl, wlvif, skb, extra, info, hlid);</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;bss_type == BSS_TYPE_AP_BSS) {</div><div class='add'>+	if (!is_dummy &amp;&amp; wlvif &amp;&amp; wlvif-&gt;bss_type == BSS_TYPE_AP_BSS) {</div><div class='ctx'> 		wl1271_tx_ap_update_inconnection_sta(wl, skb);</div><div class='del'>-		wl1271_tx_regulate_link(wl, hlid);</div><div class='add'>+		wl1271_tx_regulate_link(wl, wlvif, hlid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -444,7 +456,7 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct sk_buff *skb,</div><div class='ctx'> 	memset(wl-&gt;aggr_buf + buf_offset + skb-&gt;len, 0, total_len - skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* Revert side effects in the dummy packet skb, so it can be reused */</div><div class='del'>-	if (wl12xx_is_dummy_packet(wl, skb))</div><div class='add'>+	if (is_dummy)</div><div class='ctx'> 		skb_pull(skb, sizeof(struct wl1271_tx_hw_descr));</div><div class='ctx'> </div><div class='ctx'> 	return total_len;</div><div class='hunk'>@@ -522,19 +534,18 @@ static struct sk_buff_head *wl1271_select_queue(struct wl1271 *wl,</div><div class='ctx'> 	return &amp;queues[q];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *wl1271_sta_skb_dequeue(struct wl1271 *wl)</div><div class='add'>+static struct sk_buff *wl12xx_lnk_skb_dequeue(struct wl1271 *wl,</div><div class='add'>+					      struct wl1271_link *lnk)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct sk_buff_head *queue;</div><div class='ctx'> </div><div class='del'>-	queue = wl1271_select_queue(wl, wl-&gt;tx_queue);</div><div class='add'>+	queue = wl1271_select_queue(wl, lnk-&gt;tx_queue);</div><div class='ctx'> 	if (!queue)</div><div class='del'>-		goto out;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	skb = skb_dequeue(queue);</div><div class='del'>-</div><div class='del'>-out:</div><div class='ctx'> 	if (skb) {</div><div class='ctx'> 		int q = wl1271_tx_get_queue(skb_get_queue_mapping(skb));</div><div class='ctx'> 		spin_lock_irqsave(&amp;wl-&gt;wl_lock, flags);</div><div class='hunk'>@@ -545,43 +556,33 @@ out:</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *wl1271_ap_skb_dequeue(struct wl1271 *wl)</div><div class='add'>+static struct sk_buff *wl12xx_vif_skb_dequeue(struct wl1271 *wl,</div><div class='add'>+					      struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i, h, start_hlid;</div><div class='del'>-	struct sk_buff_head *queue;</div><div class='ctx'> </div><div class='ctx'> 	/* start from the link after the last one */</div><div class='del'>-	start_hlid = (wl-&gt;last_tx_hlid + 1) % AP_MAX_LINKS;</div><div class='add'>+	start_hlid = (wlvif-&gt;last_tx_hlid + 1) % WL12XX_MAX_LINKS;</div><div class='ctx'> </div><div class='ctx'> 	/* dequeue according to AC, round robin on each link */</div><div class='del'>-	for (i = 0; i &lt; AP_MAX_LINKS; i++) {</div><div class='del'>-		h = (start_hlid + i) % AP_MAX_LINKS;</div><div class='add'>+	for (i = 0; i &lt; WL12XX_MAX_LINKS; i++) {</div><div class='add'>+		h = (start_hlid + i) % WL12XX_MAX_LINKS;</div><div class='ctx'> </div><div class='ctx'> 		/* only consider connected stations */</div><div class='del'>-		if (h &gt;= WL1271_AP_STA_HLID_START &amp;&amp;</div><div class='del'>-		    !test_bit(h - WL1271_AP_STA_HLID_START, wl-&gt;ap_hlid_map))</div><div class='add'>+		if (!test_bit(h, wlvif-&gt;links_map))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		queue = wl1271_select_queue(wl, wl-&gt;links[h].tx_queue);</div><div class='del'>-		if (!queue)</div><div class='add'>+		skb = wl12xx_lnk_skb_dequeue(wl, &amp;wl-&gt;links[h]);</div><div class='add'>+		if (!skb)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		skb = skb_dequeue(queue);</div><div class='del'>-		if (skb)</div><div class='del'>-			break;</div><div class='add'>+		wlvif-&gt;last_tx_hlid = h;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (skb) {</div><div class='del'>-		int q = wl1271_tx_get_queue(skb_get_queue_mapping(skb));</div><div class='del'>-		wl-&gt;last_tx_hlid = h;</div><div class='del'>-		spin_lock_irqsave(&amp;wl-&gt;wl_lock, flags);</div><div class='del'>-		wl-&gt;tx_queue_count[q]--;</div><div class='del'>-		spin_unlock_irqrestore(&amp;wl-&gt;wl_lock, flags);</div><div class='del'>-	} else {</div><div class='del'>-		wl-&gt;last_tx_hlid = 0;</div><div class='del'>-	}</div><div class='add'>+	if (!skb)</div><div class='add'>+		wlvif-&gt;last_tx_hlid = 0;</div><div class='ctx'> </div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='hunk'>@@ -589,12 +590,32 @@ static struct sk_buff *wl1271_ap_skb_dequeue(struct wl1271 *wl)</div><div class='ctx'> static struct sk_buff *wl1271_skb_dequeue(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	struct wl12xx_vif *wlvif = wl-&gt;last_wlvif;</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='ctx'> </div><div class='del'>-	if (wl-&gt;bss_type == BSS_TYPE_AP_BSS)</div><div class='del'>-		skb = wl1271_ap_skb_dequeue(wl);</div><div class='del'>-	else</div><div class='del'>-		skb = wl1271_sta_skb_dequeue(wl);</div><div class='add'>+	if (wlvif) {</div><div class='add'>+		wl12xx_for_each_wlvif_continue(wl, wlvif) {</div><div class='add'>+			skb = wl12xx_vif_skb_dequeue(wl, wlvif);</div><div class='add'>+			if (skb) {</div><div class='add'>+				wl-&gt;last_wlvif = wlvif;</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'>+	/* do another pass */</div><div class='add'>+	if (!skb) {</div><div class='add'>+		wl12xx_for_each_wlvif(wl, wlvif) {</div><div class='add'>+			skb = wl12xx_vif_skb_dequeue(wl, wlvif);</div><div class='add'>+			if (skb) {</div><div class='add'>+				wl-&gt;last_wlvif = wlvif;</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 (!skb)</div><div class='add'>+		skb = wl12xx_lnk_skb_dequeue(wl, &amp;wl-&gt;links[wl-&gt;system_hlid]);</div><div class='ctx'> </div><div class='ctx'> 	if (!skb &amp;&amp;</div><div class='ctx'> 	    test_and_clear_bit(WL1271_FLAG_DUMMY_PACKET_PENDING, &amp;wl-&gt;flags)) {</div><div class='hunk'>@@ -610,21 +631,21 @@ static struct sk_buff *wl1271_skb_dequeue(struct wl1271 *wl)</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wl1271_skb_queue_head(struct wl1271 *wl, struct sk_buff *skb)</div><div class='add'>+static void wl1271_skb_queue_head(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+				  struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int q = wl1271_tx_get_queue(skb_get_queue_mapping(skb));</div><div class='ctx'> </div><div class='ctx'> 	if (wl12xx_is_dummy_packet(wl, skb)) {</div><div class='ctx'> 		set_bit(WL1271_FLAG_DUMMY_PACKET_PENDING, &amp;wl-&gt;flags);</div><div class='del'>-	} else if (wl-&gt;bss_type == BSS_TYPE_AP_BSS) {</div><div class='del'>-		u8 hlid = wl1271_tx_get_hlid(wl, skb);</div><div class='add'>+	} else {</div><div class='add'>+		u8 hlid = wl12xx_tx_get_hlid(wl, wlvif, skb);</div><div class='ctx'> 		skb_queue_head(&amp;wl-&gt;links[hlid].tx_queue[q], skb);</div><div class='ctx'> </div><div class='ctx'> 		/* make sure we dequeue the same packet next time */</div><div class='del'>-		wl-&gt;last_tx_hlid = (hlid + AP_MAX_LINKS - 1) % AP_MAX_LINKS;</div><div class='del'>-	} else {</div><div class='del'>-		skb_queue_head(&amp;wl-&gt;tx_queue[q], skb);</div><div class='add'>+		wlvif-&gt;last_tx_hlid = (hlid + WL12XX_MAX_LINKS - 1) %</div><div class='add'>+				      WL12XX_MAX_LINKS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;wl-&gt;wl_lock, flags);</div><div class='hunk'>@@ -639,29 +660,71 @@ static bool wl1271_tx_is_data_present(struct sk_buff *skb)</div><div class='ctx'> 	return ieee80211_is_data_present(hdr-&gt;frame_control);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void wl12xx_rearm_rx_streaming(struct wl1271 *wl, unsigned long *active_hlids)</div><div class='add'>+{</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='add'>+	u32 timeout;</div><div class='add'>+	u8 hlid;</div><div class='add'>+</div><div class='add'>+	if (!wl-&gt;conf.rx_streaming.interval)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!wl-&gt;conf.rx_streaming.always &amp;&amp;</div><div class='add'>+	    !test_bit(WL1271_FLAG_SOFT_GEMINI, &amp;wl-&gt;flags))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	timeout = wl-&gt;conf.rx_streaming.duration;</div><div class='add'>+	wl12xx_for_each_wlvif_sta(wl, wlvif) {</div><div class='add'>+		bool found = false;</div><div class='add'>+		for_each_set_bit(hlid, active_hlids, WL12XX_MAX_LINKS) {</div><div class='add'>+			if (test_bit(hlid, wlvif-&gt;links_map)) {</div><div class='add'>+				found  = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!found)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* enable rx streaming */</div><div class='add'>+		if (!test_bit(WLVIF_FLAG_RX_STREAMING_STARTED, &amp;wlvif-&gt;flags))</div><div class='add'>+			ieee80211_queue_work(wl-&gt;hw,</div><div class='add'>+					     &amp;wlvif-&gt;rx_streaming_enable_work);</div><div class='add'>+</div><div class='add'>+		mod_timer(&amp;wlvif-&gt;rx_streaming_timer,</div><div class='add'>+			  jiffies + msecs_to_jiffies(timeout));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void wl1271_tx_work_locked(struct wl1271 *wl)</div><div class='ctx'> {</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	struct wl1271_tx_hw_descr *desc;</div><div class='ctx'> 	u32 buf_offset = 0;</div><div class='ctx'> 	bool sent_packets = false;</div><div class='del'>-	bool had_data = false;</div><div class='del'>-	bool is_ap = (wl-&gt;bss_type == BSS_TYPE_AP_BSS);</div><div class='add'>+	unsigned long active_hlids[BITS_TO_LONGS(WL12XX_MAX_LINKS)] = {0};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(wl-&gt;state == WL1271_STATE_OFF))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	while ((skb = wl1271_skb_dequeue(wl))) {</div><div class='del'>-		if (wl1271_tx_is_data_present(skb))</div><div class='del'>-			had_data = true;</div><div class='add'>+		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);</div><div class='add'>+		bool has_data = false;</div><div class='ctx'> </div><div class='del'>-		ret = wl1271_prepare_tx_frame(wl, skb, buf_offset);</div><div class='add'>+		wlvif = NULL;</div><div class='add'>+		if (!wl12xx_is_dummy_packet(wl, skb) &amp;&amp; info-&gt;control.vif)</div><div class='add'>+			wlvif = wl12xx_vif_to_data(info-&gt;control.vif);</div><div class='add'>+</div><div class='add'>+		has_data = wlvif &amp;&amp; wl1271_tx_is_data_present(skb);</div><div class='add'>+		ret = wl1271_prepare_tx_frame(wl, wlvif, skb, buf_offset);</div><div class='ctx'> 		if (ret == -EAGAIN) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Aggregation buffer is full.</div><div class='ctx'> 			 * Flush buffer and try again.</div><div class='ctx'> 			 */</div><div class='del'>-			wl1271_skb_queue_head(wl, skb);</div><div class='add'>+			wl1271_skb_queue_head(wl, wlvif, skb);</div><div class='ctx'> 			wl1271_write(wl, WL1271_SLV_MEM_DATA, wl-&gt;aggr_buf,</div><div class='ctx'> 				     buf_offset, true);</div><div class='ctx'> 			sent_packets = true;</div><div class='hunk'>@@ -672,16 +735,27 @@ void wl1271_tx_work_locked(struct wl1271 *wl)</div><div class='ctx'> 			 * Firmware buffer is full.</div><div class='ctx'> 			 * Queue back last skb, and stop aggregating.</div><div class='ctx'> 			 */</div><div class='del'>-			wl1271_skb_queue_head(wl, skb);</div><div class='add'>+			wl1271_skb_queue_head(wl, wlvif, skb);</div><div class='ctx'> 			/* No work left, avoid scheduling redundant tx work */</div><div class='ctx'> 			set_bit(WL1271_FLAG_FW_TX_BUSY, &amp;wl-&gt;flags);</div><div class='ctx'> 			goto out_ack;</div><div class='ctx'> 		} else if (ret &lt; 0) {</div><div class='del'>-			dev_kfree_skb(skb);</div><div class='add'>+			if (wl12xx_is_dummy_packet(wl, skb))</div><div class='add'>+				/*</div><div class='add'>+				 * fw still expects dummy packet,</div><div class='add'>+				 * so re-enqueue it</div><div class='add'>+				 */</div><div class='add'>+				wl1271_skb_queue_head(wl, wlvif, skb);</div><div class='add'>+			else</div><div class='add'>+				ieee80211_free_txskb(wl-&gt;hw, skb);</div><div class='ctx'> 			goto out_ack;</div><div class='ctx'> 		}</div><div class='ctx'> 		buf_offset += ret;</div><div class='ctx'> 		wl-&gt;tx_packets_count++;</div><div class='add'>+		if (has_data) {</div><div class='add'>+			desc = (struct wl1271_tx_hw_descr *) skb-&gt;data;</div><div class='add'>+			__set_bit(desc-&gt;hlid, active_hlids);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_ack:</div><div class='hunk'>@@ -701,19 +775,7 @@ out_ack:</div><div class='ctx'> </div><div class='ctx'> 		wl1271_handle_tx_low_watermark(wl);</div><div class='ctx'> 	}</div><div class='del'>-	if (!is_ap &amp;&amp; wl-&gt;conf.rx_streaming.interval &amp;&amp; had_data &amp;&amp;</div><div class='del'>-	    (wl-&gt;conf.rx_streaming.always ||</div><div class='del'>-	     test_bit(WL1271_FLAG_SOFT_GEMINI, &amp;wl-&gt;flags))) {</div><div class='del'>-		u32 timeout = wl-&gt;conf.rx_streaming.duration;</div><div class='del'>-</div><div class='del'>-		/* enable rx streaming */</div><div class='del'>-		if (!test_bit(WL1271_FLAG_RX_STREAMING_STARTED, &amp;wl-&gt;flags))</div><div class='del'>-			ieee80211_queue_work(wl-&gt;hw,</div><div class='del'>-					     &amp;wl-&gt;rx_streaming_enable_work);</div><div class='del'>-</div><div class='del'>-		mod_timer(&amp;wl-&gt;rx_streaming_timer,</div><div class='del'>-			  jiffies + msecs_to_jiffies(timeout));</div><div class='del'>-	}</div><div class='add'>+	wl12xx_rearm_rx_streaming(wl, active_hlids);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void wl1271_tx_work(struct work_struct *work)</div><div class='hunk'>@@ -737,6 +799,8 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,</div><div class='ctx'> 				      struct wl1271_tx_hw_res_descr *result)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_tx_info *info;</div><div class='add'>+	struct ieee80211_vif *vif;</div><div class='add'>+	struct wl12xx_vif *wlvif;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int id = result-&gt;id;</div><div class='ctx'> 	int rate = -1;</div><div class='hunk'>@@ -756,11 +820,16 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* info-&gt;control is valid as long as we don't update info-&gt;status */</div><div class='add'>+	vif = info-&gt;control.vif;</div><div class='add'>+	wlvif = wl12xx_vif_to_data(vif);</div><div class='add'>+</div><div class='ctx'> 	/* update the TX status info */</div><div class='ctx'> 	if (result-&gt;status == TX_SUCCESS) {</div><div class='ctx'> 		if (!(info-&gt;flags &amp; IEEE80211_TX_CTL_NO_ACK))</div><div class='ctx'> 			info-&gt;flags |= IEEE80211_TX_STAT_ACK;</div><div class='del'>-		rate = wl1271_rate_to_idx(result-&gt;rate_class_index, wl-&gt;band);</div><div class='add'>+		rate = wl1271_rate_to_idx(result-&gt;rate_class_index,</div><div class='add'>+					  wlvif-&gt;band);</div><div class='ctx'> 		retries = result-&gt;ack_failures;</div><div class='ctx'> 	} else if (result-&gt;status == TX_RETRY_EXCEEDED) {</div><div class='ctx'> 		wl-&gt;stats.excessive_retries++;</div><div class='hunk'>@@ -783,14 +852,14 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,</div><div class='ctx'> 	     info-&gt;control.hw_key-&gt;cipher == WLAN_CIPHER_SUITE_CCMP ||</div><div class='ctx'> 	     info-&gt;control.hw_key-&gt;cipher == WL1271_CIPHER_SUITE_GEM)) {</div><div class='ctx'> 		u8 fw_lsb = result-&gt;tx_security_sequence_number_lsb;</div><div class='del'>-		u8 cur_lsb = wl-&gt;tx_security_last_seq_lsb;</div><div class='add'>+		u8 cur_lsb = wlvif-&gt;tx_security_last_seq_lsb;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * update security sequence number, taking care of potential</div><div class='ctx'> 		 * wrap-around</div><div class='ctx'> 		 */</div><div class='del'>-		wl-&gt;tx_security_seq += (fw_lsb - cur_lsb + 256) % 256;</div><div class='del'>-		wl-&gt;tx_security_last_seq_lsb = fw_lsb;</div><div class='add'>+		wlvif-&gt;tx_security_seq += (fw_lsb - cur_lsb) &amp; 0xff;</div><div class='add'>+		wlvif-&gt;tx_security_last_seq_lsb = fw_lsb;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* remove private header from packet */</div><div class='hunk'>@@ -886,39 +955,30 @@ void wl1271_tx_reset_link_queues(struct wl1271 *wl, u8 hlid)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* caller must hold wl-&gt;mutex and TX must be stopped */</div><div class='del'>-void wl1271_tx_reset(struct wl1271 *wl, bool reset_tx_queues)</div><div class='add'>+void wl12xx_tx_reset_wlvif(struct wl1271 *wl, struct wl12xx_vif *wlvif)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct ieee80211_tx_info *info;</div><div class='ctx'> </div><div class='ctx'> 	/* TX failure */</div><div class='del'>-	if (wl-&gt;bss_type == BSS_TYPE_AP_BSS) {</div><div class='del'>-		for (i = 0; i &lt; AP_MAX_LINKS; i++) {</div><div class='del'>-			wl1271_free_sta(wl, i);</div><div class='del'>-			wl1271_tx_reset_link_queues(wl, i);</div><div class='del'>-			wl-&gt;links[i].allocated_pkts = 0;</div><div class='del'>-			wl-&gt;links[i].prev_freed_pkts = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		wl-&gt;last_tx_hlid = 0;</div><div class='del'>-	} else {</div><div class='del'>-		for (i = 0; i &lt; NUM_TX_QUEUES; i++) {</div><div class='del'>-			while ((skb = skb_dequeue(&amp;wl-&gt;tx_queue[i]))) {</div><div class='del'>-				wl1271_debug(DEBUG_TX, "freeing skb 0x%p",</div><div class='del'>-					     skb);</div><div class='del'>-</div><div class='del'>-				if (!wl12xx_is_dummy_packet(wl, skb)) {</div><div class='del'>-					info = IEEE80211_SKB_CB(skb);</div><div class='del'>-					info-&gt;status.rates[0].idx = -1;</div><div class='del'>-					info-&gt;status.rates[0].count = 0;</div><div class='del'>-					ieee80211_tx_status_ni(wl-&gt;hw, skb);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	for_each_set_bit(i, wlvif-&gt;links_map, WL12XX_MAX_LINKS) {</div><div class='add'>+		if (wlvif-&gt;bss_type == BSS_TYPE_AP_BSS)</div><div class='add'>+			wl1271_free_sta(wl, wlvif, i);</div><div class='add'>+		else</div><div class='add'>+			wlvif-&gt;sta.ba_rx_bitmap = 0;</div><div class='ctx'> </div><div class='del'>-		wl-&gt;ba_rx_bitmap = 0;</div><div class='add'>+		wl1271_tx_reset_link_queues(wl, i);</div><div class='add'>+		wl-&gt;links[i].allocated_pkts = 0;</div><div class='add'>+		wl-&gt;links[i].prev_freed_pkts = 0;</div><div class='ctx'> 	}</div><div class='add'>+	wlvif-&gt;last_tx_hlid = 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+/* caller must hold wl-&gt;mutex and TX must be stopped */</div><div class='add'>+void wl12xx_tx_reset(struct wl1271 *wl, bool reset_tx_queues)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ieee80211_tx_info *info;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NUM_TX_QUEUES; i++)</div><div class='ctx'> 		wl-&gt;tx_queue_count[i] = 0;</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/tx.h b/drivers/net/wireless/wl12xx/tx.h<br/>index dc4f09adf088..2dbb24e6d541 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/tx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/tx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/tx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/tx.h</a></div><div class='hunk'>@@ -206,18 +206,23 @@ static inline int wl1271_tx_total_queue_count(struct wl1271 *wl)</div><div class='ctx'> void wl1271_tx_work(struct work_struct *work);</div><div class='ctx'> void wl1271_tx_work_locked(struct wl1271 *wl);</div><div class='ctx'> void wl1271_tx_complete(struct wl1271 *wl);</div><div class='del'>-void wl1271_tx_reset(struct wl1271 *wl, bool reset_tx_queues);</div><div class='add'>+void wl12xx_tx_reset_wlvif(struct wl1271 *wl, struct wl12xx_vif *wlvif);</div><div class='add'>+void wl12xx_tx_reset(struct wl1271 *wl, bool reset_tx_queues);</div><div class='ctx'> void wl1271_tx_flush(struct wl1271 *wl);</div><div class='ctx'> u8 wl1271_rate_to_idx(int rate, enum ieee80211_band band);</div><div class='ctx'> u32 wl1271_tx_enabled_rates_get(struct wl1271 *wl, u32 rate_set,</div><div class='ctx'> 				enum ieee80211_band rate_band);</div><div class='ctx'> u32 wl1271_tx_min_rate_get(struct wl1271 *wl, u32 rate_set);</div><div class='del'>-u8 wl12xx_tx_get_hlid_ap(struct wl1271 *wl, struct sk_buff *skb);</div><div class='add'>+u8 wl12xx_tx_get_hlid_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+			 struct sk_buff *skb);</div><div class='add'>+u8 wl12xx_tx_get_hlid(struct wl1271 *wl, struct wl12xx_vif *wlvif,</div><div class='add'>+		      struct sk_buff *skb);</div><div class='ctx'> void wl1271_tx_reset_link_queues(struct wl1271 *wl, u8 hlid);</div><div class='ctx'> void wl1271_handle_tx_low_watermark(struct wl1271 *wl);</div><div class='ctx'> bool wl12xx_is_dummy_packet(struct wl1271 *wl, struct sk_buff *skb);</div><div class='add'>+void wl12xx_rearm_rx_streaming(struct wl1271 *wl, unsigned long *active_hlids);</div><div class='ctx'> </div><div class='ctx'> /* from main.c */</div><div class='del'>-void wl1271_free_sta(struct wl1271 *wl, u8 hlid);</div><div class='add'>+void wl1271_free_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 hlid);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h<br/>index 1ec90fc7505e..b2b09cd02022 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/wl12xx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/wl12xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/wl12xx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/wl12xx.h</a></div><div class='hunk'>@@ -35,83 +35,6 @@</div><div class='ctx'> #include "conf.h"</div><div class='ctx'> #include "ini.h"</div><div class='ctx'> </div><div class='del'>-#define DRIVER_NAME "wl1271"</div><div class='del'>-#define DRIVER_PREFIX DRIVER_NAME ": "</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * FW versions support BA 11n</div><div class='del'>- * versions marks x.x.x.50-60.x</div><div class='del'>- */</div><div class='del'>-#define WL12XX_BA_SUPPORT_FW_COST_VER2_START    50</div><div class='del'>-#define WL12XX_BA_SUPPORT_FW_COST_VER2_END      60</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	DEBUG_NONE	= 0,</div><div class='del'>-	DEBUG_IRQ	= BIT(0),</div><div class='del'>-	DEBUG_SPI	= BIT(1),</div><div class='del'>-	DEBUG_BOOT	= BIT(2),</div><div class='del'>-	DEBUG_MAILBOX	= BIT(3),</div><div class='del'>-	DEBUG_TESTMODE	= BIT(4),</div><div class='del'>-	DEBUG_EVENT	= BIT(5),</div><div class='del'>-	DEBUG_TX	= BIT(6),</div><div class='del'>-	DEBUG_RX	= BIT(7),</div><div class='del'>-	DEBUG_SCAN	= BIT(8),</div><div class='del'>-	DEBUG_CRYPT	= BIT(9),</div><div class='del'>-	DEBUG_PSM	= BIT(10),</div><div class='del'>-	DEBUG_MAC80211	= BIT(11),</div><div class='del'>-	DEBUG_CMD	= BIT(12),</div><div class='del'>-	DEBUG_ACX	= BIT(13),</div><div class='del'>-	DEBUG_SDIO	= BIT(14),</div><div class='del'>-	DEBUG_FILTERS   = BIT(15),</div><div class='del'>-	DEBUG_ADHOC     = BIT(16),</div><div class='del'>-	DEBUG_AP	= BIT(17),</div><div class='del'>-	DEBUG_MASTER	= (DEBUG_ADHOC | DEBUG_AP),</div><div class='del'>-	DEBUG_ALL	= ~0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern u32 wl12xx_debug_level;</div><div class='del'>-</div><div class='del'>-#define DEBUG_DUMP_LIMIT 1024</div><div class='del'>-</div><div class='del'>-#define wl1271_error(fmt, arg...) \</div><div class='del'>-	pr_err(DRIVER_PREFIX "ERROR " fmt "\n", ##arg)</div><div class='del'>-</div><div class='del'>-#define wl1271_warning(fmt, arg...) \</div><div class='del'>-	pr_warning(DRIVER_PREFIX "WARNING " fmt "\n", ##arg)</div><div class='del'>-</div><div class='del'>-#define wl1271_notice(fmt, arg...) \</div><div class='del'>-	pr_info(DRIVER_PREFIX fmt "\n", ##arg)</div><div class='del'>-</div><div class='del'>-#define wl1271_info(fmt, arg...) \</div><div class='del'>-	pr_info(DRIVER_PREFIX fmt "\n", ##arg)</div><div class='del'>-</div><div class='del'>-#define wl1271_debug(level, fmt, arg...) \</div><div class='del'>-	do { \</div><div class='del'>-		if (level &amp; wl12xx_debug_level) \</div><div class='del'>-			pr_debug(DRIVER_PREFIX fmt "\n", ##arg); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-/* TODO: use pr_debug_hex_dump when it will be available */</div><div class='del'>-#define wl1271_dump(level, prefix, buf, len)	\</div><div class='del'>-	do { \</div><div class='del'>-		if (level &amp; wl12xx_debug_level) \</div><div class='del'>-			print_hex_dump(KERN_DEBUG, DRIVER_PREFIX prefix, \</div><div class='del'>-				       DUMP_PREFIX_OFFSET, 16, 1,	\</div><div class='del'>-				       buf,				\</div><div class='del'>-				       min_t(size_t, len, DEBUG_DUMP_LIMIT), \</div><div class='del'>-				       0);				\</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-#define wl1271_dump_ascii(level, prefix, buf, len)	\</div><div class='del'>-	do { \</div><div class='del'>-		if (level &amp; wl12xx_debug_level) \</div><div class='del'>-			print_hex_dump(KERN_DEBUG, DRIVER_PREFIX prefix, \</div><div class='del'>-				       DUMP_PREFIX_OFFSET, 16, 1,	\</div><div class='del'>-				       buf,				\</div><div class='del'>-				       min_t(size_t, len, DEBUG_DUMP_LIMIT), \</div><div class='del'>-				       true);				\</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='ctx'> #define WL127X_FW_NAME "ti-connectivity/wl127x-fw-3.bin"</div><div class='ctx'> #define WL128X_FW_NAME "ti-connectivity/wl128x-fw-3.bin"</div><div class='ctx'> </div><div class='hunk'>@@ -142,16 +65,12 @@ extern u32 wl12xx_debug_level;</div><div class='ctx'> #define WL12XX_INVALID_ROLE_ID     0xff</div><div class='ctx'> #define WL12XX_INVALID_LINK_ID     0xff</div><div class='ctx'> </div><div class='add'>+#define WL12XX_MAX_RATE_POLICIES 16</div><div class='add'>+</div><div class='ctx'> /* Defined by FW as 0. Will not be freed or allocated. */</div><div class='ctx'> #define WL12XX_SYSTEM_HLID         0</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * TODO: we currently don't support multirole. remove</div><div class='del'>- * this constant from the code when we do.</div><div class='del'>- */</div><div class='del'>-#define WL1271_AP_STA_HLID_START   3</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * When in AP-mode, we allow (at least) this number of packets</div><div class='ctx'>  * to be transmitted to FW for a STA in PS-mode. Only when packets are</div><div class='ctx'>  * present in the FW buffers it will wake the sleeping STA. We want to put</div><div class='hunk'>@@ -236,13 +155,6 @@ struct wl1271_stats {</div><div class='ctx'> </div><div class='ctx'> #define AP_MAX_STATIONS            8</div><div class='ctx'> </div><div class='del'>-/* Broadcast and Global links + system link + links to stations */</div><div class='del'>-/*</div><div class='del'>- * TODO: when WL1271_AP_STA_HLID_START is no longer constant, change all</div><div class='del'>- * the places that use this.</div><div class='del'>- */</div><div class='del'>-#define AP_MAX_LINKS               (AP_MAX_STATIONS + WL1271_AP_STA_HLID_START)</div><div class='del'>-</div><div class='ctx'> /* FW status registers */</div><div class='ctx'> struct wl12xx_fw_status {</div><div class='ctx'> 	__le32 intr;</div><div class='hunk'>@@ -299,17 +211,14 @@ struct wl1271_scan {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct wl1271_if_operations {</div><div class='del'>-	void (*read)(struct wl1271 *wl, int addr, void *buf, size_t len,</div><div class='add'>+	void (*read)(struct device *child, int addr, void *buf, size_t len,</div><div class='ctx'> 		     bool fixed);</div><div class='del'>-	void (*write)(struct wl1271 *wl, int addr, void *buf, size_t len,</div><div class='add'>+	void (*write)(struct device *child, int addr, void *buf, size_t len,</div><div class='ctx'> 		     bool fixed);</div><div class='del'>-	void (*reset)(struct wl1271 *wl);</div><div class='del'>-	void (*init)(struct wl1271 *wl);</div><div class='del'>-	int (*power)(struct wl1271 *wl, bool enable);</div><div class='del'>-	struct device* (*dev)(struct wl1271 *wl);</div><div class='del'>-	void (*enable_irq)(struct wl1271 *wl);</div><div class='del'>-	void (*disable_irq)(struct wl1271 *wl);</div><div class='del'>-	void (*set_block_size) (struct wl1271 *wl, unsigned int blksz);</div><div class='add'>+	void (*reset)(struct device *child);</div><div class='add'>+	void (*init)(struct device *child);</div><div class='add'>+	int (*power)(struct device *child, bool enable);</div><div class='add'>+	void (*set_block_size) (struct device *child, unsigned int blksz);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MAX_NUM_KEYS 14</div><div class='hunk'>@@ -326,29 +235,33 @@ struct wl1271_ap_key {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum wl12xx_flags {</div><div class='del'>-	WL1271_FLAG_STA_ASSOCIATED,</div><div class='del'>-	WL1271_FLAG_IBSS_JOINED,</div><div class='ctx'> 	WL1271_FLAG_GPIO_POWER,</div><div class='ctx'> 	WL1271_FLAG_TX_QUEUE_STOPPED,</div><div class='ctx'> 	WL1271_FLAG_TX_PENDING,</div><div class='ctx'> 	WL1271_FLAG_IN_ELP,</div><div class='ctx'> 	WL1271_FLAG_ELP_REQUESTED,</div><div class='del'>-	WL1271_FLAG_PSM,</div><div class='del'>-	WL1271_FLAG_PSM_REQUESTED,</div><div class='ctx'> 	WL1271_FLAG_IRQ_RUNNING,</div><div class='del'>-	WL1271_FLAG_IDLE,</div><div class='del'>-	WL1271_FLAG_PSPOLL_FAILURE,</div><div class='del'>-	WL1271_FLAG_STA_STATE_SENT,</div><div class='ctx'> 	WL1271_FLAG_FW_TX_BUSY,</div><div class='del'>-	WL1271_FLAG_AP_STARTED,</div><div class='del'>-	WL1271_FLAG_IF_INITIALIZED,</div><div class='ctx'> 	WL1271_FLAG_DUMMY_PACKET_PENDING,</div><div class='ctx'> 	WL1271_FLAG_SUSPENDED,</div><div class='ctx'> 	WL1271_FLAG_PENDING_WORK,</div><div class='ctx'> 	WL1271_FLAG_SOFT_GEMINI,</div><div class='del'>-	WL1271_FLAG_RX_STREAMING_STARTED,</div><div class='ctx'> 	WL1271_FLAG_RECOVERY_IN_PROGRESS,</div><div class='del'>-	WL1271_FLAG_CS_PROGRESS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum wl12xx_vif_flags {</div><div class='add'>+	WLVIF_FLAG_INITIALIZED,</div><div class='add'>+	WLVIF_FLAG_STA_ASSOCIATED,</div><div class='add'>+	WLVIF_FLAG_IBSS_JOINED,</div><div class='add'>+	WLVIF_FLAG_AP_STARTED,</div><div class='add'>+	WLVIF_FLAG_PSM,</div><div class='add'>+	WLVIF_FLAG_PSM_REQUESTED,</div><div class='add'>+	WLVIF_FLAG_STA_STATE_SENT,</div><div class='add'>+	WLVIF_FLAG_RX_STREAMING_STARTED,</div><div class='add'>+	WLVIF_FLAG_PSPOLL_FAILURE,</div><div class='add'>+	WLVIF_FLAG_CS_PROGRESS,</div><div class='add'>+	WLVIF_FLAG_AP_PROBE_RESP_SET,</div><div class='add'>+	WLVIF_FLAG_IN_USE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct wl1271_link {</div><div class='hunk'>@@ -366,10 +279,11 @@ struct wl1271_link {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct wl1271 {</div><div class='del'>-	struct platform_device *plat_dev;</div><div class='ctx'> 	struct ieee80211_hw *hw;</div><div class='ctx'> 	bool mac80211_registered;</div><div class='ctx'> </div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='ctx'> 	void *if_priv;</div><div class='ctx'> </div><div class='ctx'> 	struct wl1271_if_operations *if_ops;</div><div class='hunk'>@@ -399,25 +313,20 @@ struct wl1271 {</div><div class='ctx'> </div><div class='ctx'> 	s8 hw_pg_ver;</div><div class='ctx'> </div><div class='del'>-	u8 bssid[ETH_ALEN];</div><div class='ctx'> 	u8 mac_addr[ETH_ALEN];</div><div class='del'>-	u8 bss_type;</div><div class='del'>-	u8 set_bss_type;</div><div class='del'>-	u8 p2p; /* we are using p2p role */</div><div class='del'>-	u8 ssid[IEEE80211_MAX_SSID_LEN + 1];</div><div class='del'>-	u8 ssid_len;</div><div class='ctx'> 	int channel;</div><div class='del'>-	u8 role_id;</div><div class='del'>-	u8 dev_role_id;</div><div class='ctx'> 	u8 system_hlid;</div><div class='del'>-	u8 sta_hlid;</div><div class='del'>-	u8 dev_hlid;</div><div class='del'>-	u8 ap_global_hlid;</div><div class='del'>-	u8 ap_bcast_hlid;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long links_map[BITS_TO_LONGS(WL12XX_MAX_LINKS)];</div><div class='ctx'> 	unsigned long roles_map[BITS_TO_LONGS(WL12XX_MAX_ROLES)];</div><div class='ctx'> 	unsigned long roc_map[BITS_TO_LONGS(WL12XX_MAX_ROLES)];</div><div class='add'>+	unsigned long rate_policies_map[</div><div class='add'>+			BITS_TO_LONGS(WL12XX_MAX_RATE_POLICIES)];</div><div class='add'>+</div><div class='add'>+	struct list_head wlvif_list;</div><div class='add'>+</div><div class='add'>+	u8 sta_count;</div><div class='add'>+	u8 ap_count;</div><div class='ctx'> </div><div class='ctx'> 	struct wl1271_acx_mem_map *target_mem_map;</div><div class='ctx'> </div><div class='hunk'>@@ -440,11 +349,7 @@ struct wl1271 {</div><div class='ctx'> 	/* Time-offset between host and chipset clocks */</div><div class='ctx'> 	s64 time_offset;</div><div class='ctx'> </div><div class='del'>-	/* Session counter for the chipset */</div><div class='del'>-	int session_counter;</div><div class='del'>-</div><div class='ctx'> 	/* Frames scheduled for transmission, not handled yet */</div><div class='del'>-	struct sk_buff_head tx_queue[NUM_TX_QUEUES];</div><div class='ctx'> 	int tx_queue_count[NUM_TX_QUEUES];</div><div class='ctx'> 	long stopped_queues_map;</div><div class='ctx'> </div><div class='hunk'>@@ -462,17 +367,6 @@ struct wl1271 {</div><div class='ctx'> 	struct sk_buff *tx_frames[ACX_TX_DESCRIPTORS];</div><div class='ctx'> 	int tx_frames_cnt;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Security sequence number</div><div class='del'>-	 *     bits 0-15: lower 16 bits part of sequence number</div><div class='del'>-	 *     bits 16-47: higher 32 bits part of sequence number</div><div class='del'>-	 *     bits 48-63: not in use</div><div class='del'>-	 */</div><div class='del'>-	u64 tx_security_seq;</div><div class='del'>-</div><div class='del'>-	/* 8 bits of the last sequence number in use */</div><div class='del'>-	u8 tx_security_last_seq_lsb;</div><div class='del'>-</div><div class='ctx'> 	/* FW Rx counter */</div><div class='ctx'> 	u32 rx_counter;</div><div class='ctx'> </div><div class='hunk'>@@ -507,59 +401,21 @@ struct wl1271 {</div><div class='ctx'> 	u32 mbox_ptr[2];</div><div class='ctx'> </div><div class='ctx'> 	/* Are we currently scanning */</div><div class='add'>+	struct ieee80211_vif *scan_vif;</div><div class='ctx'> 	struct wl1271_scan scan;</div><div class='ctx'> 	struct delayed_work scan_complete_work;</div><div class='ctx'> </div><div class='ctx'> 	bool sched_scanning;</div><div class='ctx'> </div><div class='del'>-	/* probe-req template for the current AP */</div><div class='del'>-	struct sk_buff *probereq;</div><div class='del'>-</div><div class='del'>-	/* Our association ID */</div><div class='del'>-	u16 aid;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * currently configured rate set:</div><div class='del'>-	 *	bits  0-15 - 802.11abg rates</div><div class='del'>-	 *	bits 16-23 - 802.11n   MCS index mask</div><div class='del'>-	 * support only 1 stream, thus only 8 bits for the MCS rates (0-7).</div><div class='del'>-	 */</div><div class='del'>-	u32 basic_rate_set;</div><div class='del'>-	u32 basic_rate;</div><div class='del'>-	u32 rate_set;</div><div class='del'>-	u32 bitrate_masks[IEEE80211_NUM_BANDS];</div><div class='del'>-</div><div class='ctx'> 	/* The current band */</div><div class='ctx'> 	enum ieee80211_band band;</div><div class='ctx'> </div><div class='del'>-	/* Beaconing interval (needed for ad-hoc) */</div><div class='del'>-	u32 beacon_int;</div><div class='del'>-</div><div class='del'>-	/* Default key (for WEP) */</div><div class='del'>-	u32 default_key;</div><div class='del'>-</div><div class='del'>-	/* Rx Streaming */</div><div class='del'>-	struct work_struct rx_streaming_enable_work;</div><div class='del'>-	struct work_struct rx_streaming_disable_work;</div><div class='del'>-	struct timer_list rx_streaming_timer;</div><div class='del'>-</div><div class='ctx'> 	struct completion *elp_compl;</div><div class='del'>-	struct completion *ps_compl;</div><div class='ctx'> 	struct delayed_work elp_work;</div><div class='del'>-	struct delayed_work pspoll_work;</div><div class='del'>-</div><div class='del'>-	/* counter for ps-poll delivery failures */</div><div class='del'>-	int ps_poll_failures;</div><div class='del'>-</div><div class='del'>-	/* retry counter for PSM entries */</div><div class='del'>-	u8 psm_entry_retry;</div><div class='ctx'> </div><div class='ctx'> 	/* in dBm */</div><div class='ctx'> 	int power_level;</div><div class='ctx'> </div><div class='del'>-	int rssi_thold;</div><div class='del'>-	int last_rssi_event;</div><div class='del'>-</div><div class='ctx'> 	struct wl1271_stats stats;</div><div class='ctx'> </div><div class='ctx'> 	__le32 buffer_32;</div><div class='hunk'>@@ -583,20 +439,9 @@ struct wl1271 {</div><div class='ctx'> 	/* Most recently reported noise in dBm */</div><div class='ctx'> 	s8 noise;</div><div class='ctx'> </div><div class='del'>-	/* map for HLIDs of associated stations - when operating in AP mode */</div><div class='del'>-	unsigned long ap_hlid_map[BITS_TO_LONGS(AP_MAX_STATIONS)];</div><div class='del'>-</div><div class='del'>-	/* recoreded keys for AP-mode - set here before AP startup */</div><div class='del'>-	struct wl1271_ap_key *recorded_ap_keys[MAX_NUM_KEYS];</div><div class='del'>-</div><div class='ctx'> 	/* bands supported by this instance of wl12xx */</div><div class='ctx'> 	struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];</div><div class='ctx'> </div><div class='del'>-	/* RX BA constraint value */</div><div class='del'>-	bool ba_support;</div><div class='del'>-	u8 ba_rx_bitmap;</div><div class='del'>-	bool ba_allowed;</div><div class='del'>-</div><div class='ctx'> 	int tcxo_clock;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -610,10 +455,7 @@ struct wl1271 {</div><div class='ctx'> 	 * AP-mode - links indexed by HLID. The global and broadcast links</div><div class='ctx'> 	 * are always active.</div><div class='ctx'> 	 */</div><div class='del'>-	struct wl1271_link links[AP_MAX_LINKS];</div><div class='del'>-</div><div class='del'>-	/* the hlid of the link where the last transmitted skb came from */</div><div class='del'>-	int last_tx_hlid;</div><div class='add'>+	struct wl1271_link links[WL12XX_MAX_LINKS];</div><div class='ctx'> </div><div class='ctx'> 	/* AP-mode - a bitmap of links currently in PS mode according to FW */</div><div class='ctx'> 	u32 ap_fw_ps_map;</div><div class='hunk'>@@ -632,21 +474,173 @@ struct wl1271 {</div><div class='ctx'> </div><div class='ctx'> 	/* AP-mode - number of currently connected stations */</div><div class='ctx'> 	int active_sta_count;</div><div class='add'>+</div><div class='add'>+	/* last wlvif we transmitted from */</div><div class='add'>+	struct wl12xx_vif *last_wlvif;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct wl1271_station {</div><div class='ctx'> 	u8 hlid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct wl12xx_vif {</div><div class='add'>+	struct wl1271 *wl;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 bss_type;</div><div class='add'>+	u8 p2p; /* we are using p2p role */</div><div class='add'>+	u8 role_id;</div><div class='add'>+</div><div class='add'>+	/* sta/ibss specific */</div><div class='add'>+	u8 dev_role_id;</div><div class='add'>+	u8 dev_hlid;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u8 hlid;</div><div class='add'>+			u8 ba_rx_bitmap;</div><div class='add'>+</div><div class='add'>+			u8 basic_rate_idx;</div><div class='add'>+			u8 ap_rate_idx;</div><div class='add'>+			u8 p2p_rate_idx;</div><div class='add'>+		} sta;</div><div class='add'>+		struct {</div><div class='add'>+			u8 global_hlid;</div><div class='add'>+			u8 bcast_hlid;</div><div class='add'>+</div><div class='add'>+			/* HLIDs bitmap of associated stations */</div><div class='add'>+			unsigned long sta_hlid_map[BITS_TO_LONGS(</div><div class='add'>+							WL12XX_MAX_LINKS)];</div><div class='add'>+</div><div class='add'>+			/* recoreded keys - set here before AP startup */</div><div class='add'>+			struct wl1271_ap_key *recorded_keys[MAX_NUM_KEYS];</div><div class='add'>+</div><div class='add'>+			u8 mgmt_rate_idx;</div><div class='add'>+			u8 bcast_rate_idx;</div><div class='add'>+			u8 ucast_rate_idx[CONF_TX_MAX_AC_COUNT];</div><div class='add'>+		} ap;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* the hlid of the last transmitted skb */</div><div class='add'>+	int last_tx_hlid;</div><div class='add'>+</div><div class='add'>+	unsigned long links_map[BITS_TO_LONGS(WL12XX_MAX_LINKS)];</div><div class='add'>+</div><div class='add'>+	u8 ssid[IEEE80211_MAX_SSID_LEN + 1];</div><div class='add'>+	u8 ssid_len;</div><div class='add'>+</div><div class='add'>+	/* The current band */</div><div class='add'>+	enum ieee80211_band band;</div><div class='add'>+	int channel;</div><div class='add'>+</div><div class='add'>+	u32 bitrate_masks[IEEE80211_NUM_BANDS];</div><div class='add'>+	u32 basic_rate_set;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * currently configured rate set:</div><div class='add'>+	 *	bits  0-15 - 802.11abg rates</div><div class='add'>+	 *	bits 16-23 - 802.11n   MCS index mask</div><div class='add'>+	 * support only 1 stream, thus only 8 bits for the MCS rates (0-7).</div><div class='add'>+	 */</div><div class='add'>+	u32 basic_rate;</div><div class='add'>+	u32 rate_set;</div><div class='add'>+</div><div class='add'>+	/* probe-req template for the current AP */</div><div class='add'>+	struct sk_buff *probereq;</div><div class='add'>+</div><div class='add'>+	/* Beaconing interval (needed for ad-hoc) */</div><div class='add'>+	u32 beacon_int;</div><div class='add'>+</div><div class='add'>+	/* Default key (for WEP) */</div><div class='add'>+	u32 default_key;</div><div class='add'>+</div><div class='add'>+	/* Our association ID */</div><div class='add'>+	u16 aid;</div><div class='add'>+</div><div class='add'>+	/* Session counter for the chipset */</div><div class='add'>+	int session_counter;</div><div class='add'>+</div><div class='add'>+	struct completion *ps_compl;</div><div class='add'>+	struct delayed_work pspoll_work;</div><div class='add'>+</div><div class='add'>+	/* counter for ps-poll delivery failures */</div><div class='add'>+	int ps_poll_failures;</div><div class='add'>+</div><div class='add'>+	/* retry counter for PSM entries */</div><div class='add'>+	u8 psm_entry_retry;</div><div class='add'>+</div><div class='add'>+	/* in dBm */</div><div class='add'>+	int power_level;</div><div class='add'>+</div><div class='add'>+	int rssi_thold;</div><div class='add'>+	int last_rssi_event;</div><div class='add'>+</div><div class='add'>+	/* RX BA constraint value */</div><div class='add'>+	bool ba_support;</div><div class='add'>+	bool ba_allowed;</div><div class='add'>+</div><div class='add'>+	/* Rx Streaming */</div><div class='add'>+	struct work_struct rx_streaming_enable_work;</div><div class='add'>+	struct work_struct rx_streaming_disable_work;</div><div class='add'>+	struct timer_list rx_streaming_timer;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This struct must be last!</div><div class='add'>+	 * data that has to be saved acrossed reconfigs (e.g. recovery)</div><div class='add'>+	 * should be declared in this struct.</div><div class='add'>+	 */</div><div class='add'>+	struct {</div><div class='add'>+		u8 persistent[0];</div><div class='add'>+		/*</div><div class='add'>+		 * Security sequence number</div><div class='add'>+		 *     bits 0-15: lower 16 bits part of sequence number</div><div class='add'>+		 *     bits 16-47: higher 32 bits part of sequence number</div><div class='add'>+		 *     bits 48-63: not in use</div><div class='add'>+		 */</div><div class='add'>+		u64 tx_security_seq;</div><div class='add'>+</div><div class='add'>+		/* 8 bits of the last sequence number in use */</div><div class='add'>+		u8 tx_security_last_seq_lsb;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct wl12xx_vif *wl12xx_vif_to_data(struct ieee80211_vif *vif)</div><div class='add'>+{</div><div class='add'>+	return (struct wl12xx_vif *)vif-&gt;drv_priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+struct ieee80211_vif *wl12xx_wlvif_to_vif(struct wl12xx_vif *wlvif)</div><div class='add'>+{</div><div class='add'>+	return container_of((void *)wlvif, struct ieee80211_vif, drv_priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define wl12xx_for_each_wlvif(wl, wlvif) \</div><div class='add'>+		list_for_each_entry(wlvif, &amp;wl-&gt;wlvif_list, list)</div><div class='add'>+</div><div class='add'>+#define wl12xx_for_each_wlvif_continue(wl, wlvif) \</div><div class='add'>+		list_for_each_entry_continue(wlvif, &amp;wl-&gt;wlvif_list, list)</div><div class='add'>+</div><div class='add'>+#define wl12xx_for_each_wlvif_bss_type(wl, wlvif, _bss_type)	\</div><div class='add'>+		wl12xx_for_each_wlvif(wl, wlvif)		\</div><div class='add'>+			if (wlvif-&gt;bss_type == _bss_type)</div><div class='add'>+</div><div class='add'>+#define wl12xx_for_each_wlvif_sta(wl, wlvif)	\</div><div class='add'>+		wl12xx_for_each_wlvif_bss_type(wl, wlvif, BSS_TYPE_STA_BSS)</div><div class='add'>+</div><div class='add'>+#define wl12xx_for_each_wlvif_ap(wl, wlvif)	\</div><div class='add'>+		wl12xx_for_each_wlvif_bss_type(wl, wlvif, BSS_TYPE_AP_BSS)</div><div class='add'>+</div><div class='ctx'> int wl1271_plt_start(struct wl1271 *wl);</div><div class='ctx'> int wl1271_plt_stop(struct wl1271 *wl);</div><div class='del'>-int wl1271_recalc_rx_streaming(struct wl1271 *wl);</div><div class='add'>+int wl1271_recalc_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif);</div><div class='ctx'> void wl12xx_queue_recovery_work(struct wl1271 *wl);</div><div class='ctx'> size_t wl12xx_copy_fwlog(struct wl1271 *wl, u8 *memblock, size_t maxlen);</div><div class='ctx'> </div><div class='ctx'> #define JOIN_TIMEOUT 5000 /* 5000 milliseconds to join */</div><div class='ctx'> </div><div class='del'>-#define SESSION_COUNTER_MAX 7 /* maximum value for the session counter */</div><div class='add'>+#define SESSION_COUNTER_MAX 6 /* maximum value for the session counter */</div><div class='add'>+#define SESSION_COUNTER_INVALID 7 /* used with dummy_packet */</div><div class='ctx'> </div><div class='ctx'> #define WL1271_DEFAULT_POWER_LEVEL 0</div><div class='ctx'> </div><div class='hunk'>@@ -669,8 +663,8 @@ size_t wl12xx_copy_fwlog(struct wl1271 *wl, u8 *memblock, size_t maxlen);</div><div class='ctx'> /* Each RX/TX transaction requires an end-of-transaction transfer */</div><div class='ctx'> #define WL12XX_QUIRK_END_OF_TRANSACTION		BIT(0)</div><div class='ctx'> </div><div class='del'>-/* WL128X requires aggregated packets to be aligned to the SDIO block size */</div><div class='del'>-#define WL12XX_QUIRK_BLOCKSIZE_ALIGNMENT	BIT(2)</div><div class='add'>+/* wl127x and SPI don't support SDIO block size alignment */</div><div class='add'>+#define WL12XX_QUIRK_NO_BLOCKSIZE_ALIGNMENT	BIT(2)</div><div class='ctx'> </div><div class='ctx'> /* Older firmwares did not implement the FW logger over bus feature */</div><div class='ctx'> #define WL12XX_QUIRK_FWLOG_NOT_IMPLEMENTED	BIT(4)</div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/wl12xx_80211.h b/drivers/net/wireless/wl12xx/wl12xx_80211.h<br/>index f7971d3b0898..8f0ffaf62309 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/wl12xx_80211.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/wl12xx_80211.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/wl12xx_80211.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/wl12xx_80211.h</a></div><div class='hunk'>@@ -116,11 +116,6 @@ struct wl12xx_ps_poll_template {</div><div class='ctx'> 	u8 ta[ETH_ALEN];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct wl12xx_qos_null_data_template {</div><div class='del'>-	struct ieee80211_header header;</div><div class='del'>-	__le16 qos_ctl;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> struct wl12xx_arp_rsp_template {</div><div class='ctx'> 	struct ieee80211_hdr_3addr hdr;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/wl12xx/wl12xx_platform_data.c b/drivers/net/wireless/wl12xx/wl12xx_platform_data.c<br/>index 973b11060a8f..998e95895f9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/wl12xx_platform_data.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/wl12xx/wl12xx_platform_data.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl12xx/wl12xx_platform_data.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/wl12xx/wl12xx_platform_data.c</a></div><div class='hunk'>@@ -1,8 +1,29 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is part of wl12xx</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2010-2011 Texas Instruments, 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'>+ * version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA</div><div class='add'>+ * 02110-1301 USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/wl12xx.h&gt;</div><div class='ctx'> </div><div class='del'>-static const struct wl12xx_platform_data *platform_data;</div><div class='add'>+static struct wl12xx_platform_data *platform_data;</div><div class='ctx'> </div><div class='ctx'> int __init wl12xx_set_platform_data(const struct wl12xx_platform_data *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -18,7 +39,7 @@ int __init wl12xx_set_platform_data(const struct wl12xx_platform_data *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct wl12xx_platform_data *wl12xx_get_platform_data(void)</div><div class='add'>+struct wl12xx_platform_data *wl12xx_get_platform_data(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!platform_data)</div><div class='ctx'> 		return ERR_PTR(-ENODEV);</div><div class='head'>diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c<br/>index 8efa2f2d9579..a66b93b7ff9a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1201.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/wireless/zd1201.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1201.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/wireless/zd1201.c</a></div><div class='hunk'>@@ -1907,15 +1907,4 @@ static struct usb_driver zd1201_usb = {</div><div class='ctx'> 	.resume = zd1201_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init zd1201_init(void)</div><div class='del'>-{</div><div class='del'>-	return usb_register(&amp;zd1201_usb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit zd1201_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;zd1201_usb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(zd1201_init);</div><div class='del'>-module_exit(zd1201_cleanup);</div><div class='add'>+module_usb_driver(zd1201_usb);</div><div class='head'>diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c<br/>index 182562952c79..b7d41f8c338a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/xen-netback/interface.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/xen-netback/interface.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/xen-netback/interface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/xen-netback/interface.c</a></div><div class='hunk'>@@ -165,7 +165,8 @@ static int xenvif_change_mtu(struct net_device *dev, int mtu)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 xenvif_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static netdev_features_t xenvif_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct xenvif *vif = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -222,7 +223,7 @@ static void xenvif_get_strings(struct net_device *dev, u32 stringset, u8 * data)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ethtool_ops xenvif_ethtool_ops = {</div><div class='add'>+static const struct ethtool_ops xenvif_ethtool_ops = {</div><div class='ctx'> 	.get_link	= ethtool_op_get_link,</div><div class='ctx'> </div><div class='ctx'> 	.get_sset_count = xenvif_get_sset_count,</div><div class='hunk'>@@ -230,7 +231,7 @@ static struct ethtool_ops xenvif_ethtool_ops = {</div><div class='ctx'> 	.get_strings = xenvif_get_strings,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct net_device_ops xenvif_netdev_ops = {</div><div class='add'>+static const struct net_device_ops xenvif_netdev_ops = {</div><div class='ctx'> 	.ndo_start_xmit	= xenvif_start_xmit,</div><div class='ctx'> 	.ndo_get_stats	= xenvif_get_stats,</div><div class='ctx'> 	.ndo_open	= xenvif_open,</div><div class='head'>diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c<br/>index 15e332d08c8d..59effac15f36 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/xen-netback/netback.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/xen-netback/netback.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/xen-netback/netback.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/xen-netback/netback.c</a></div><div class='hunk'>@@ -395,7 +395,7 @@ static void netbk_gop_frag_copy(struct xenvif *vif, struct sk_buff *skb,</div><div class='ctx'> 	struct gnttab_copy *copy_gop;</div><div class='ctx'> 	struct netbk_rx_meta *meta;</div><div class='ctx'> 	/*</div><div class='del'>-	 * These variables a used iff get_page_ext returns true,</div><div class='add'>+	 * These variables are used iff get_page_ext returns true,</div><div class='ctx'> 	 * in which case they are guaranteed to be initialized.</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned int uninitialized_var(group), uninitialized_var(idx);</div><div class='hunk'>@@ -940,8 +940,6 @@ static struct gnttab_copy *xen_netbk_get_requests(struct xen_netbk *netbk,</div><div class='ctx'> 		if (!page)</div><div class='ctx'> 			return NULL;</div><div class='ctx'> </div><div class='del'>-		netbk-&gt;mmap_pages[pending_idx] = page;</div><div class='del'>-</div><div class='ctx'> 		gop-&gt;source.u.ref = txp-&gt;gref;</div><div class='ctx'> 		gop-&gt;source.domid = vif-&gt;domid;</div><div class='ctx'> 		gop-&gt;source.offset = txp-&gt;offset;</div><div class='hunk'>@@ -1336,8 +1334,6 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		netbk-&gt;mmap_pages[pending_idx] = page;</div><div class='del'>-</div><div class='ctx'> 		gop-&gt;source.u.ref = txreq.gref;</div><div class='ctx'> 		gop-&gt;source.domid = vif-&gt;domid;</div><div class='ctx'> 		gop-&gt;source.offset = txreq.offset;</div><div class='hunk'>@@ -1638,7 +1634,7 @@ static int __init netback_init(void)</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	int group;</div><div class='ctx'> </div><div class='del'>-	if (!xen_pv_domain())</div><div class='add'>+	if (!xen_domain())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	xen_netbk_group_nr = num_online_cpus();</div><div class='head'>diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c<br/>index 1ce729d6af75..410018c4c528 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/xen-netback/xenbus.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/xen-netback/xenbus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/xen-netback/xenbus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/xen-netback/xenbus.c</a></div><div class='hunk'>@@ -474,17 +474,14 @@ static const struct xenbus_device_id netback_ids[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct xenbus_driver netback = {</div><div class='del'>-	.name = "vif",</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.ids = netback_ids,</div><div class='add'>+static DEFINE_XENBUS_DRIVER(netback, ,</div><div class='ctx'> 	.probe = netback_probe,</div><div class='ctx'> 	.remove = netback_remove,</div><div class='ctx'> 	.uevent = netback_uevent,</div><div class='ctx'> 	.otherend_changed = frontend_changed,</div><div class='del'>-};</div><div class='add'>+);</div><div class='ctx'> </div><div class='ctx'> int xenvif_xenbus_init(void)</div><div class='ctx'> {</div><div class='del'>-	return xenbus_register_backend(&amp;netback);</div><div class='add'>+	return xenbus_register_backend(&amp;netback_driver);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c<br/>index 226faab23603..fa679057630f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/xen-netfront.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/net/xen-netfront.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/xen-netfront.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/net/xen-netfront.c</a></div><div class='hunk'>@@ -201,7 +201,7 @@ static void xennet_sysfs_delif(struct net_device *netdev);</div><div class='ctx'> #define xennet_sysfs_delif(dev) do { } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int xennet_can_sg(struct net_device *dev)</div><div class='add'>+static bool xennet_can_sg(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return dev-&gt;features &amp; NETIF_F_SG;</div><div class='ctx'> }</div><div class='hunk'>@@ -1190,7 +1190,8 @@ static void xennet_uninit(struct net_device *dev)</div><div class='ctx'> 	gnttab_free_grant_references(np-&gt;gref_rx_head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 xennet_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static netdev_features_t xennet_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct netfront_info *np = netdev_priv(dev);</div><div class='ctx'> 	int val;</div><div class='hunk'>@@ -1216,7 +1217,8 @@ static u32 xennet_fix_features(struct net_device *dev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xennet_set_features(struct net_device *dev, u32 features)</div><div class='add'>+static int xennet_set_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	if (!(features &amp; NETIF_F_SG) &amp;&amp; dev-&gt;mtu &gt; ETH_DATA_LEN) {</div><div class='ctx'> 		netdev_info(dev, "Reducing MTU because no SG offload");</div><div class='hunk'>@@ -1707,7 +1709,6 @@ static void netback_changed(struct xenbus_device *dev,</div><div class='ctx'> 	case XenbusStateInitialised:</div><div class='ctx'> 	case XenbusStateReconfiguring:</div><div class='ctx'> 	case XenbusStateReconfigured:</div><div class='del'>-	case XenbusStateConnected:</div><div class='ctx'> 	case XenbusStateUnknown:</div><div class='ctx'> 	case XenbusStateClosed:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1718,6 +1719,9 @@ static void netback_changed(struct xenbus_device *dev,</div><div class='ctx'> 		if (xennet_connect(netdev) != 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		xenbus_switch_state(dev, XenbusStateConnected);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case XenbusStateConnected:</div><div class='ctx'> 		netif_notify_peers(netdev);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1910,7 +1914,7 @@ static void xennet_sysfs_delif(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_SYSFS */</div><div class='ctx'> </div><div class='del'>-static struct xenbus_device_id netfront_ids[] = {</div><div class='add'>+static const struct xenbus_device_id netfront_ids[] = {</div><div class='ctx'> 	{ "vif" },</div><div class='ctx'> 	{ "" }</div><div class='ctx'> };</div><div class='hunk'>@@ -1937,15 +1941,12 @@ static int __devexit xennet_remove(struct xenbus_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct xenbus_driver netfront_driver = {</div><div class='del'>-	.name = "vif",</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-	.ids = netfront_ids,</div><div class='add'>+static DEFINE_XENBUS_DRIVER(netfront, ,</div><div class='ctx'> 	.probe = netfront_probe,</div><div class='ctx'> 	.remove = __devexit_p(xennet_remove),</div><div class='ctx'> 	.resume = netfront_resume,</div><div class='ctx'> 	.otherend_changed = netback_changed,</div><div class='del'>-};</div><div class='add'>+);</div><div class='ctx'> </div><div class='ctx'> static int __init netif_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c<br/>index 7bcb1febef0d..1a1500bc8452 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/nfc/pn533.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/nfc/pn533.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/nfc/pn533.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/nfc/pn533.c</a></div><div class='hunk'>@@ -72,6 +72,7 @@ MODULE_DEVICE_TABLE(usb, pn533_table);</div><div class='ctx'> #define PN533_CMD_IN_LIST_PASSIVE_TARGET 0x4A</div><div class='ctx'> #define PN533_CMD_IN_ATR 0x50</div><div class='ctx'> #define PN533_CMD_IN_RELEASE 0x52</div><div class='add'>+#define PN533_CMD_IN_JUMP_FOR_DEP 0x56</div><div class='ctx'> </div><div class='ctx'> #define PN533_CMD_RESPONSE(cmd) (cmd + 1)</div><div class='ctx'> </div><div class='hunk'>@@ -231,6 +232,26 @@ struct pn533_cmd_activate_response {</div><div class='ctx'> 	u8 gt[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/* PN533_CMD_IN_JUMP_FOR_DEP */</div><div class='add'>+struct pn533_cmd_jump_dep {</div><div class='add'>+	u8 active;</div><div class='add'>+	u8 baud;</div><div class='add'>+	u8 next;</div><div class='add'>+	u8 gt[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct pn533_cmd_jump_dep_response {</div><div class='add'>+	u8 status;</div><div class='add'>+	u8 tg;</div><div class='add'>+	u8 nfcid3t[10];</div><div class='add'>+	u8 didt;</div><div class='add'>+	u8 bst;</div><div class='add'>+	u8 brt;</div><div class='add'>+	u8 to;</div><div class='add'>+	u8 ppt;</div><div class='add'>+	/* optional */</div><div class='add'>+	u8 gt[];</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct pn533 {</div><div class='ctx'> 	struct usb_device *udev;</div><div class='hunk'>@@ -1121,6 +1142,7 @@ static int pn533_activate_target_nfcdep(struct pn533 *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pn533_cmd_activate_param param;</div><div class='ctx'> 	struct pn533_cmd_activate_response *resp;</div><div class='add'>+	u16 gt_len;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	nfc_dev_dbg(&amp;dev-&gt;interface-&gt;dev, "%s", __func__);</div><div class='hunk'>@@ -1146,7 +1168,11 @@ static int pn533_activate_target_nfcdep(struct pn533 *dev)</div><div class='ctx'> 	if (rc != PN533_CMD_RET_SUCCESS)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	/* ATR_RES general bytes are located at offset 16 */</div><div class='add'>+	gt_len = PN533_FRAME_CMD_PARAMS_LEN(dev-&gt;in_frame) - 16;</div><div class='add'>+	rc = nfc_set_remote_general_bytes(dev-&gt;nfc_dev, resp-&gt;gt, gt_len);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pn533_activate_target(struct nfc_dev *nfc_dev, u32 target_idx,</div><div class='hunk'>@@ -1239,6 +1265,142 @@ static void pn533_deactivate_target(struct nfc_dev *nfc_dev, u32 target_idx)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static int pn533_in_dep_link_up_complete(struct pn533 *dev, void *arg,</div><div class='add'>+						u8 *params, int params_len)</div><div class='add'>+{</div><div class='add'>+	struct pn533_cmd_jump_dep *cmd;</div><div class='add'>+	struct pn533_cmd_jump_dep_response *resp;</div><div class='add'>+	struct nfc_target nfc_target;</div><div class='add'>+	u8 target_gt_len;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (params_len == -ENOENT) {</div><div class='add'>+		nfc_dev_dbg(&amp;dev-&gt;interface-&gt;dev, "");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (params_len &lt; 0) {</div><div class='add'>+		nfc_dev_err(&amp;dev-&gt;interface-&gt;dev,</div><div class='add'>+				"Error %d when bringing DEP link up",</div><div class='add'>+								params_len);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;tgt_available_prots &amp;&amp;</div><div class='add'>+	    !(dev-&gt;tgt_available_prots &amp; (1 &lt;&lt; NFC_PROTO_NFC_DEP))) {</div><div class='add'>+		nfc_dev_err(&amp;dev-&gt;interface-&gt;dev,</div><div class='add'>+			"The target does not support DEP");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	resp = (struct pn533_cmd_jump_dep_response *) params;</div><div class='add'>+	cmd = (struct pn533_cmd_jump_dep *) arg;</div><div class='add'>+	rc = resp-&gt;status &amp; PN533_CMD_RET_MASK;</div><div class='add'>+	if (rc != PN533_CMD_RET_SUCCESS) {</div><div class='add'>+		nfc_dev_err(&amp;dev-&gt;interface-&gt;dev,</div><div class='add'>+				"Bringing DEP link up failed %d", rc);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;tgt_available_prots) {</div><div class='add'>+		nfc_dev_dbg(&amp;dev-&gt;interface-&gt;dev, "Creating new target");</div><div class='add'>+</div><div class='add'>+		nfc_target.supported_protocols = NFC_PROTO_NFC_DEP_MASK;</div><div class='add'>+		rc = nfc_targets_found(dev-&gt;nfc_dev, &amp;nfc_target, 1);</div><div class='add'>+		if (rc)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		dev-&gt;tgt_available_prots = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;tgt_active_prot = NFC_PROTO_NFC_DEP;</div><div class='add'>+</div><div class='add'>+	/* ATR_RES general bytes are located at offset 17 */</div><div class='add'>+	target_gt_len = PN533_FRAME_CMD_PARAMS_LEN(dev-&gt;in_frame) - 17;</div><div class='add'>+	rc = nfc_set_remote_general_bytes(dev-&gt;nfc_dev,</div><div class='add'>+						resp-&gt;gt, target_gt_len);</div><div class='add'>+	if (rc == 0)</div><div class='add'>+		rc = nfc_dep_link_is_up(dev-&gt;nfc_dev,</div><div class='add'>+						dev-&gt;nfc_dev-&gt;targets[0].idx,</div><div class='add'>+						!cmd-&gt;active, NFC_RF_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 pn533_dep_link_up(struct nfc_dev *nfc_dev, int target_idx,</div><div class='add'>+						u8 comm_mode, u8 rf_mode)</div><div class='add'>+{</div><div class='add'>+	struct pn533 *dev = nfc_get_drvdata(nfc_dev);</div><div class='add'>+	struct pn533_cmd_jump_dep *cmd;</div><div class='add'>+	u8 cmd_len, local_gt_len, *local_gt;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	nfc_dev_dbg(&amp;dev-&gt;interface-&gt;dev, "%s", __func__);</div><div class='add'>+</div><div class='add'>+	if (rf_mode == NFC_RF_TARGET) {</div><div class='add'>+		nfc_dev_err(&amp;dev-&gt;interface-&gt;dev, "Target mode not supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;poll_mod_count) {</div><div class='add'>+		nfc_dev_err(&amp;dev-&gt;interface-&gt;dev,</div><div class='add'>+				"Cannot bring the DEP link up while polling");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;tgt_active_prot) {</div><div class='add'>+		nfc_dev_err(&amp;dev-&gt;interface-&gt;dev,</div><div class='add'>+				"There is already an active target");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_gt = nfc_get_local_general_bytes(dev-&gt;nfc_dev, &amp;local_gt_len);</div><div class='add'>+	if (local_gt_len &gt; NFC_MAX_GT_LEN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cmd_len = sizeof(struct pn533_cmd_jump_dep) + local_gt_len;</div><div class='add'>+	cmd = kzalloc(cmd_len, GFP_KERNEL);</div><div class='add'>+	if (cmd == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pn533_tx_frame_init(dev-&gt;out_frame, PN533_CMD_IN_JUMP_FOR_DEP);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;active = !comm_mode;</div><div class='add'>+	cmd-&gt;baud = 0;</div><div class='add'>+	if (local_gt != NULL) {</div><div class='add'>+		cmd-&gt;next = 4; /* We have some Gi */</div><div class='add'>+		memcpy(cmd-&gt;gt, local_gt, local_gt_len);</div><div class='add'>+	} else {</div><div class='add'>+		cmd-&gt;next = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(PN533_FRAME_CMD_PARAMS_PTR(dev-&gt;out_frame), cmd, cmd_len);</div><div class='add'>+	dev-&gt;out_frame-&gt;datalen += cmd_len;</div><div class='add'>+</div><div class='add'>+	pn533_tx_frame_finish(dev-&gt;out_frame);</div><div class='add'>+</div><div class='add'>+	rc = pn533_send_cmd_frame_async(dev, dev-&gt;out_frame, dev-&gt;in_frame,</div><div class='add'>+				dev-&gt;in_maxlen,	pn533_in_dep_link_up_complete,</div><div class='add'>+				cmd, GFP_KERNEL);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(cmd);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pn533_dep_link_down(struct nfc_dev *nfc_dev)</div><div class='add'>+{</div><div class='add'>+	pn533_deactivate_target(nfc_dev, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define PN533_CMD_DATAEXCH_HEAD_LEN (sizeof(struct pn533_frame) + 3)</div><div class='ctx'> #define PN533_CMD_DATAEXCH_DATA_MAXLEN 262</div><div class='ctx'> </div><div class='hunk'>@@ -1339,7 +1501,7 @@ error:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int pn533_data_exchange(struct nfc_dev *nfc_dev, u32 target_idx,</div><div class='add'>+static int pn533_data_exchange(struct nfc_dev *nfc_dev, u32 target_idx,</div><div class='ctx'> 						struct sk_buff *skb,</div><div class='ctx'> 						data_exchange_cb_t cb,</div><div class='ctx'> 						void *cb_context)</div><div class='hunk'>@@ -1368,7 +1530,7 @@ int pn533_data_exchange(struct nfc_dev *nfc_dev, u32 target_idx,</div><div class='ctx'> 			PN533_CMD_DATAEXCH_DATA_MAXLEN +</div><div class='ctx'> 			PN533_FRAME_TAIL_SIZE;</div><div class='ctx'> </div><div class='del'>-	skb_resp = nfc_alloc_skb(skb_resp_len, GFP_KERNEL);</div><div class='add'>+	skb_resp = nfc_alloc_recv_skb(skb_resp_len, GFP_KERNEL);</div><div class='ctx'> 	if (!skb_resp) {</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -1434,6 +1596,8 @@ static int pn533_set_configuration(struct pn533 *dev, u8 cfgitem, u8 *cfgdata,</div><div class='ctx'> struct nfc_ops pn533_nfc_ops = {</div><div class='ctx'> 	.dev_up = NULL,</div><div class='ctx'> 	.dev_down = NULL,</div><div class='add'>+	.dep_link_up = pn533_dep_link_up,</div><div class='add'>+	.dep_link_down = pn533_dep_link_down,</div><div class='ctx'> 	.start_poll = pn533_start_poll,</div><div class='ctx'> 	.stop_poll = pn533_stop_poll,</div><div class='ctx'> 	.activate_target = pn533_activate_target,</div><div class='hunk'>@@ -1597,24 +1761,7 @@ static struct usb_driver pn533_driver = {</div><div class='ctx'> 	.id_table =	pn533_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pn533_init(void)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	rc = usb_register(&amp;pn533_driver);</div><div class='del'>-	if (rc)</div><div class='del'>-		err("usb_register failed. Error number %d", rc);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit pn533_exit(void)</div><div class='del'>-{</div><div class='del'>-	usb_deregister(&amp;pn533_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(pn533_init);</div><div class='del'>-module_exit(pn533_exit);</div><div class='add'>+module_usb_driver(pn533_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Lauro Ramos Venancio &lt;lauro.venancio@openbossa.org&gt;,"</div><div class='ctx'> 			" Aloisio Almeida Jr &lt;aloisio.almeida@openbossa.org&gt;");</div><div class='head'>diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig<br/>index cac63c9f49ae..268163dd71c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/of/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/of/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/of/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/of/Kconfig</a></div><div class='hunk'>@@ -15,6 +15,15 @@ config PROC_DEVICETREE</div><div class='ctx'> 	  an image of the device tree that the kernel copies from Open</div><div class='ctx'> 	  Firmware or other boot firmware. If unsure, say Y here.</div><div class='ctx'> </div><div class='add'>+config OF_SELFTEST</div><div class='add'>+	bool "Device Tree Runtime self tests"</div><div class='add'>+	help</div><div class='add'>+	  This option builds in test cases for the device tree infrastructure</div><div class='add'>+	  that are executed one at boot time, and the results dumped to the</div><div class='add'>+	  console.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N here, but this option is safe to enable.</div><div class='add'>+</div><div class='ctx'> config OF_FLATTREE</div><div class='ctx'> 	bool</div><div class='ctx'> 	select DTC</div><div class='head'>diff --git a/drivers/of/Makefile b/drivers/of/Makefile<br/>index dccb1176be57..a73f5a51ff4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/of/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/of/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/of/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/of/Makefile</a></div><div class='hunk'>@@ -8,6 +8,7 @@ obj-$(CONFIG_OF_GPIO)   += gpio.o</div><div class='ctx'> obj-$(CONFIG_OF_I2C)	+= of_i2c.o</div><div class='ctx'> obj-$(CONFIG_OF_NET)	+= of_net.o</div><div class='ctx'> obj-$(CONFIG_OF_SPI)	+= of_spi.o</div><div class='add'>+obj-$(CONFIG_OF_SELFTEST) += selftest.o</div><div class='ctx'> obj-$(CONFIG_OF_MDIO)	+= of_mdio.o</div><div class='ctx'> obj-$(CONFIG_OF_PCI)	+= of_pci.o</div><div class='ctx'> obj-$(CONFIG_OF_PCI_IRQ)  += of_pci_irq.o</div><div class='head'>diff --git a/drivers/of/address.c b/drivers/of/address.c<br/>index 72c33fbe451d..66d96f14c274 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/of/address.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/of/address.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/of/address.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/of/address.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> static struct of_bus *of_match_bus(struct device_node *np);</div><div class='ctx'> static int __of_address_to_resource(struct device_node *dev,</div><div class='ctx'> 		const __be32 *addrp, u64 size, unsigned int flags,</div><div class='del'>-				    struct resource *r);</div><div class='add'>+		const char *name, struct resource *r);</div><div class='ctx'> </div><div class='ctx'> /* Debug utility */</div><div class='ctx'> #ifdef DEBUG</div><div class='hunk'>@@ -215,7 +215,7 @@ int of_pci_address_to_resource(struct device_node *dev, int bar,</div><div class='ctx'> 	addrp = of_get_pci_address(dev, bar, &amp;size, &amp;flags);</div><div class='ctx'> 	if (addrp == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	return __of_address_to_resource(dev, addrp, size, flags, r);</div><div class='add'>+	return __of_address_to_resource(dev, addrp, size, flags, NULL, r);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(of_pci_address_to_resource);</div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='hunk'>@@ -529,7 +529,7 @@ EXPORT_SYMBOL(of_get_address);</div><div class='ctx'> </div><div class='ctx'> static int __of_address_to_resource(struct device_node *dev,</div><div class='ctx'> 		const __be32 *addrp, u64 size, unsigned int flags,</div><div class='del'>-				    struct resource *r)</div><div class='add'>+		const char *name, struct resource *r)</div><div class='ctx'> {</div><div class='ctx'> 	u64 taddr;</div><div class='ctx'> </div><div class='hunk'>@@ -551,7 +551,8 @@ static int __of_address_to_resource(struct device_node *dev,</div><div class='ctx'> 		r-&gt;end = taddr + size - 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	r-&gt;flags = flags;</div><div class='del'>-	r-&gt;name = dev-&gt;full_name;</div><div class='add'>+	r-&gt;name = name ? name : dev-&gt;full_name;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -569,11 +570,16 @@ int of_address_to_resource(struct device_node *dev, int index,</div><div class='ctx'> 	const __be32	*addrp;</div><div class='ctx'> 	u64		size;</div><div class='ctx'> 	unsigned int	flags;</div><div class='add'>+	const char	*name = NULL;</div><div class='ctx'> </div><div class='ctx'> 	addrp = of_get_address(dev, index, &amp;size, &amp;flags);</div><div class='ctx'> 	if (addrp == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	return __of_address_to_resource(dev, addrp, size, flags, r);</div><div class='add'>+</div><div class='add'>+	/* Get optional "reg-names" property to add a name to a resource */</div><div class='add'>+	of_property_read_string_index(dev, "reg-names",	index, &amp;name);</div><div class='add'>+</div><div class='add'>+	return __of_address_to_resource(dev, addrp, size, flags, name, r);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(of_address_to_resource);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/of/base.c b/drivers/of/base.c<br/>index 9b6588ef0673..133908a6fd8d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/of/base.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/of/base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/of/base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/of/base.c</a></div><div class='hunk'>@@ -752,7 +752,7 @@ int of_property_read_string_index(struct device_node *np, const char *propname,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; total &lt; prop-&gt;length; total += l, p += l) {</div><div class='ctx'> 		l = strlen(p) + 1;</div><div class='del'>-		if ((*p != 0) &amp;&amp; (i++ == index)) {</div><div class='add'>+		if (i++ == index) {</div><div class='ctx'> 			*output = p;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -790,11 +790,9 @@ int of_property_count_strings(struct device_node *np, const char *propname)</div><div class='ctx'> </div><div class='ctx'> 	p = prop-&gt;value;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; total &lt; prop-&gt;length; total += l, p += l) {</div><div class='add'>+	for (i = 0; total &lt; prop-&gt;length; total += l, p += l, i++)</div><div class='ctx'> 		l = strlen(p) + 1;</div><div class='del'>-		if (*p != 0)</div><div class='del'>-			i++;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(of_property_count_strings);</div><div class='hunk'>@@ -824,17 +822,19 @@ of_parse_phandle(struct device_node *np, const char *phandle_name, int index)</div><div class='ctx'> EXPORT_SYMBOL(of_parse_phandle);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * of_parse_phandles_with_args - Find a node pointed by phandle in a list</div><div class='add'>+ * of_parse_phandle_with_args() - Find a node pointed by phandle in a list</div><div class='ctx'>  * @np:		pointer to a device tree node containing a list</div><div class='ctx'>  * @list_name:	property name that contains a list</div><div class='ctx'>  * @cells_name:	property name that specifies phandles' arguments count</div><div class='ctx'>  * @index:	index of a phandle to parse out</div><div class='del'>- * @out_node:	optional pointer to device_node struct pointer (will be filled)</div><div class='del'>- * @out_args:	optional pointer to arguments pointer (will be filled)</div><div class='add'>+ * @out_args:	optional pointer to output arguments structure (will be filled)</div><div class='ctx'>  *</div><div class='ctx'>  * This function is useful to parse lists of phandles and their arguments.</div><div class='del'>- * Returns 0 on success and fills out_node and out_args, on error returns</div><div class='del'>- * appropriate errno value.</div><div class='add'>+ * Returns 0 on success and fills out_args, on error returns appropriate</div><div class='add'>+ * errno value.</div><div class='add'>+ *</div><div class='add'>+ * Caller is responsible to call of_node_put() on the returned out_args-&gt;node</div><div class='add'>+ * pointer.</div><div class='ctx'>  *</div><div class='ctx'>  * Example:</div><div class='ctx'>  *</div><div class='hunk'>@@ -851,94 +851,96 @@ EXPORT_SYMBOL(of_parse_phandle);</div><div class='ctx'>  * }</div><div class='ctx'>  *</div><div class='ctx'>  * To get a device_node of the `node2' node you may call this:</div><div class='del'>- * of_parse_phandles_with_args(node3, "list", "#list-cells", 2, &amp;node2, &amp;args);</div><div class='add'>+ * of_parse_phandle_with_args(node3, "list", "#list-cells", 1, &amp;args);</div><div class='ctx'>  */</div><div class='del'>-int of_parse_phandles_with_args(struct device_node *np, const char *list_name,</div><div class='add'>+int of_parse_phandle_with_args(struct device_node *np, const char *list_name,</div><div class='ctx'> 				const char *cells_name, int index,</div><div class='del'>-				struct device_node **out_node,</div><div class='del'>-				const void **out_args)</div><div class='add'>+				struct of_phandle_args *out_args)</div><div class='ctx'> {</div><div class='del'>-	int ret = -EINVAL;</div><div class='del'>-	const __be32 *list;</div><div class='del'>-	const __be32 *list_end;</div><div class='del'>-	int size;</div><div class='del'>-	int cur_index = 0;</div><div class='add'>+	const __be32 *list, *list_end;</div><div class='add'>+	int size, cur_index = 0;</div><div class='add'>+	uint32_t count = 0;</div><div class='ctx'> 	struct device_node *node = NULL;</div><div class='del'>-	const void *args = NULL;</div><div class='add'>+	phandle phandle;</div><div class='ctx'> </div><div class='add'>+	/* Retrieve the phandle list property */</div><div class='ctx'> 	list = of_get_property(np, list_name, &amp;size);</div><div class='del'>-	if (!list) {</div><div class='del'>-		ret = -ENOENT;</div><div class='del'>-		goto err0;</div><div class='del'>-	}</div><div class='add'>+	if (!list)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	list_end = list + size / sizeof(*list);</div><div class='ctx'> </div><div class='add'>+	/* Loop over the phandles until all the requested entry is found */</div><div class='ctx'> 	while (list &lt; list_end) {</div><div class='del'>-		const __be32 *cells;</div><div class='del'>-		phandle phandle;</div><div class='add'>+		count = 0;</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * If phandle is 0, then it is an empty entry with no</div><div class='add'>+		 * arguments.  Skip forward to the next entry.</div><div class='add'>+		 */</div><div class='ctx'> 		phandle = be32_to_cpup(list++);</div><div class='del'>-		args = list;</div><div class='del'>-</div><div class='del'>-		/* one cell hole in the list = &lt;&gt;; */</div><div class='del'>-		if (!phandle)</div><div class='del'>-			goto next;</div><div class='del'>-</div><div class='del'>-		node = of_find_node_by_phandle(phandle);</div><div class='del'>-		if (!node) {</div><div class='del'>-			pr_debug("%s: could not find phandle\n",</div><div class='del'>-				 np-&gt;full_name);</div><div class='del'>-			goto err0;</div><div class='del'>-		}</div><div class='add'>+		if (phandle) {</div><div class='add'>+			/*</div><div class='add'>+			 * Find the provider node and parse the #*-cells</div><div class='add'>+			 * property to determine the argument length</div><div class='add'>+			 */</div><div class='add'>+			node = of_find_node_by_phandle(phandle);</div><div class='add'>+			if (!node) {</div><div class='add'>+				pr_err("%s: could not find phandle\n",</div><div class='add'>+					 np-&gt;full_name);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (of_property_read_u32(node, cells_name, &amp;count)) {</div><div class='add'>+				pr_err("%s: could not get %s for %s\n",</div><div class='add'>+					 np-&gt;full_name, cells_name,</div><div class='add'>+					 node-&gt;full_name);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-		cells = of_get_property(node, cells_name, &amp;size);</div><div class='del'>-		if (!cells || size != sizeof(*cells)) {</div><div class='del'>-			pr_debug("%s: could not get %s for %s\n",</div><div class='del'>-				 np-&gt;full_name, cells_name, node-&gt;full_name);</div><div class='del'>-			goto err1;</div><div class='add'>+			/*</div><div class='add'>+			 * Make sure that the arguments actually fit in the</div><div class='add'>+			 * remaining property data length</div><div class='add'>+			 */</div><div class='add'>+			if (list + count &gt; list_end) {</div><div class='add'>+				pr_err("%s: arguments longer than property\n",</div><div class='add'>+					 np-&gt;full_name);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		list += be32_to_cpup(cells);</div><div class='del'>-		if (list &gt; list_end) {</div><div class='del'>-			pr_debug("%s: insufficient arguments length\n",</div><div class='del'>-				 np-&gt;full_name);</div><div class='del'>-			goto err1;</div><div class='add'>+		/*</div><div class='add'>+		 * All of the error cases above bail out of the loop, so at</div><div class='add'>+		 * this point, the parsing is successful. If the requested</div><div class='add'>+		 * index matches, then fill the out_args structure and return,</div><div class='add'>+		 * or return -ENOENT for an empty entry.</div><div class='add'>+		 */</div><div class='add'>+		if (cur_index == index) {</div><div class='add'>+			if (!phandle)</div><div class='add'>+				return -ENOENT;</div><div class='add'>+</div><div class='add'>+			if (out_args) {</div><div class='add'>+				int i;</div><div class='add'>+				if (WARN_ON(count &gt; MAX_PHANDLE_ARGS))</div><div class='add'>+					count = MAX_PHANDLE_ARGS;</div><div class='add'>+				out_args-&gt;np = node;</div><div class='add'>+				out_args-&gt;args_count = count;</div><div class='add'>+				for (i = 0; i &lt; count; i++)</div><div class='add'>+					out_args-&gt;args[i] = be32_to_cpup(list++);</div><div class='add'>+			}</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='del'>-next:</div><div class='del'>-		if (cur_index == index)</div><div class='del'>-			break;</div><div class='ctx'> </div><div class='ctx'> 		of_node_put(node);</div><div class='ctx'> 		node = NULL;</div><div class='del'>-		args = NULL;</div><div class='add'>+		list += count;</div><div class='ctx'> 		cur_index++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!node) {</div><div class='del'>-		/*</div><div class='del'>-		 * args w/o node indicates that the loop above has stopped at</div><div class='del'>-		 * the 'hole' cell. Report this differently.</div><div class='del'>-		 */</div><div class='del'>-		if (args)</div><div class='del'>-			ret = -EEXIST;</div><div class='del'>-		else</div><div class='del'>-			ret = -ENOENT;</div><div class='del'>-		goto err0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (out_node)</div><div class='del'>-		*out_node = node;</div><div class='del'>-	if (out_args)</div><div class='del'>-		*out_args = args;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-err1:</div><div class='del'>-	of_node_put(node);</div><div class='del'>-err0:</div><div class='del'>-	pr_debug("%s failed with status %d\n", __func__, ret);</div><div class='del'>-	return ret;</div><div class='add'>+	/* Loop exited without finding a valid entry; return an error */</div><div class='add'>+	if (node)</div><div class='add'>+		of_node_put(node);</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(of_parse_phandles_with_args);</div><div class='add'>+EXPORT_SYMBOL(of_parse_phandle_with_args);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * prom_add_property - Add a property to a node</div><div class='hunk'>@@ -1159,7 +1161,7 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))</div><div class='ctx'> 	if (!of_aliases)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for_each_property(pp, of_aliases-&gt;properties) {</div><div class='add'>+	for_each_property_of_node(of_aliases, pp) {</div><div class='ctx'> 		const char *start = pp-&gt;name;</div><div class='ctx'> 		const char *end = start + strlen(start);</div><div class='ctx'> 		struct device_node *np;</div><div class='head'>diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c<br/>index fd85fa298e0f..ea2bd1be2640 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/of/fdt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/of/fdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/of/fdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/of/fdt.c</a></div><div class='hunk'>@@ -18,10 +18,12 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/setup.h&gt;  /* for COMMAND_LINE_SIZE */</div><div class='ctx'> #ifdef CONFIG_PPC</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #endif /* CONFIG_PPC */</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='ctx'> char *of_fdt_get_string(struct boot_param_header *blob, u32 offset)</div><div class='hunk'>@@ -107,7 +109,7 @@ int of_fdt_is_compatible(struct boot_param_header *blob,</div><div class='ctx'>  * of_fdt_match - Return true if node matches a list of compatible values</div><div class='ctx'>  */</div><div class='ctx'> int of_fdt_match(struct boot_param_header *blob, unsigned long node,</div><div class='del'>-                 const char **compat)</div><div class='add'>+                 const char *const *compat)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int tmp, score = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -541,7 +543,7 @@ int __init of_flat_dt_is_compatible(unsigned long node, const char *compat)</div><div class='ctx'> /**</div><div class='ctx'>  * of_flat_dt_match - Return true if node matches a list of compatible values</div><div class='ctx'>  */</div><div class='del'>-int __init of_flat_dt_match(unsigned long node, const char **compat)</div><div class='add'>+int __init of_flat_dt_match(unsigned long node, const char *const *compat)</div><div class='ctx'> {</div><div class='ctx'> 	return of_fdt_match(initial_boot_params, node, compat);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/of/gpio.c b/drivers/of/gpio.c<br/>index ef0105fa52b1..7e62d15d60f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/of/gpio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/of/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/of/gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/of/gpio.c</a></div><div class='hunk'>@@ -35,32 +35,27 @@ int of_get_named_gpio_flags(struct device_node *np, const char *propname,</div><div class='ctx'>                            int index, enum of_gpio_flags *flags)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct device_node *gpio_np;</div><div class='ctx'> 	struct gpio_chip *gc;</div><div class='del'>-	int size;</div><div class='del'>-	const void *gpio_spec;</div><div class='del'>-	const __be32 *gpio_cells;</div><div class='add'>+	struct of_phandle_args gpiospec;</div><div class='ctx'> </div><div class='del'>-	ret = of_parse_phandles_with_args(np, propname, "#gpio-cells", index,</div><div class='del'>-					  &amp;gpio_np, &amp;gpio_spec);</div><div class='add'>+	ret = of_parse_phandle_with_args(np, propname, "#gpio-cells", index,</div><div class='add'>+					 &amp;gpiospec);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_debug("%s: can't parse gpios property\n", __func__);</div><div class='ctx'> 		goto err0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	gc = of_node_to_gpiochip(gpio_np);</div><div class='add'>+	gc = of_node_to_gpiochip(gpiospec.np);</div><div class='ctx'> 	if (!gc) {</div><div class='ctx'> 		pr_debug("%s: gpio controller %s isn't registered\n",</div><div class='del'>-			 np-&gt;full_name, gpio_np-&gt;full_name);</div><div class='add'>+			 np-&gt;full_name, gpiospec.np-&gt;full_name);</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		goto err1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	gpio_cells = of_get_property(gpio_np, "#gpio-cells", &amp;size);</div><div class='del'>-	if (!gpio_cells || size != sizeof(*gpio_cells) ||</div><div class='del'>-			be32_to_cpup(gpio_cells) != gc-&gt;of_gpio_n_cells) {</div><div class='add'>+	if (gpiospec.args_count != gc-&gt;of_gpio_n_cells) {</div><div class='ctx'> 		pr_debug("%s: wrong #gpio-cells for %s\n",</div><div class='del'>-			 np-&gt;full_name, gpio_np-&gt;full_name);</div><div class='add'>+			 np-&gt;full_name, gpiospec.np-&gt;full_name);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto err1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -69,13 +64,13 @@ int of_get_named_gpio_flags(struct device_node *np, const char *propname,</div><div class='ctx'> 	if (flags)</div><div class='ctx'> 		*flags = 0;</div><div class='ctx'> </div><div class='del'>-	ret = gc-&gt;of_xlate(gc, np, gpio_spec, flags);</div><div class='add'>+	ret = gc-&gt;of_xlate(gc, &amp;gpiospec, flags);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err1;</div><div class='ctx'> </div><div class='ctx'> 	ret += gc-&gt;base;</div><div class='ctx'> err1:</div><div class='del'>-	of_node_put(gpio_np);</div><div class='add'>+	of_node_put(gpiospec.np);</div><div class='ctx'> err0:</div><div class='ctx'> 	pr_debug("%s exited with status %d\n", __func__, ret);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -105,8 +100,8 @@ unsigned int of_gpio_count(struct device_node *np)</div><div class='ctx'> 	do {</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='del'>-		ret = of_parse_phandles_with_args(np, "gpios", "#gpio-cells",</div><div class='del'>-						  cnt, NULL, NULL);</div><div class='add'>+		ret = of_parse_phandle_with_args(np, "gpios", "#gpio-cells",</div><div class='add'>+						 cnt, NULL);</div><div class='ctx'> 		/* A hole in the gpios = &lt;&gt; counts anyway. */</div><div class='ctx'> 		if (ret &lt; 0 &amp;&amp; ret != -EEXIST)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -127,12 +122,9 @@ EXPORT_SYMBOL(of_gpio_count);</div><div class='ctx'>  * gpio chips. This function performs only one sanity check: whether gpio</div><div class='ctx'>  * is less than ngpios (that is specified in the gpio_chip).</div><div class='ctx'>  */</div><div class='del'>-int of_gpio_simple_xlate(struct gpio_chip *gc, struct device_node *np,</div><div class='del'>-			 const void *gpio_spec, u32 *flags)</div><div class='add'>+int of_gpio_simple_xlate(struct gpio_chip *gc,</div><div class='add'>+			 const struct of_phandle_args *gpiospec, u32 *flags)</div><div class='ctx'> {</div><div class='del'>-	const __be32 *gpio = gpio_spec;</div><div class='del'>-	const u32 n = be32_to_cpup(gpio);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We're discouraging gpio_cells &lt; 2, since that way you'll have to</div><div class='ctx'> 	 * write your own xlate function (that will have to retrive the GPIO</div><div class='hunk'>@@ -144,13 +136,16 @@ int of_gpio_simple_xlate(struct gpio_chip *gc, struct device_node *np,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (n &gt; gc-&gt;ngpio)</div><div class='add'>+	if (WARN_ON(gpiospec-&gt;args_count &lt; gc-&gt;of_gpio_n_cells))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (gpiospec-&gt;args[0] &gt; gc-&gt;ngpio)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (flags)</div><div class='del'>-		*flags = be32_to_cpu(gpio[1]);</div><div class='add'>+		*flags = gpiospec-&gt;args[1];</div><div class='ctx'> </div><div class='del'>-	return n;</div><div class='add'>+	return gpiospec-&gt;args[0];</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(of_gpio_simple_xlate);</div><div class='ctx'> </div><div class='hunk'>@@ -198,8 +193,6 @@ int of_mm_gpiochip_add(struct device_node *np,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err2;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s: registered as generic GPIO chip, base is %d\n",</div><div class='del'>-		 np-&gt;full_name, gc-&gt;base);</div><div class='ctx'> 	return 0;</div><div class='ctx'> err2:</div><div class='ctx'> 	iounmap(mm_gc-&gt;regs);</div><div class='head'>diff --git a/drivers/of/irq.c b/drivers/of/irq.c<br/>index 0f0cfa3bca30..9cf00602f566 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/of/irq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/of/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/of/irq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/of/irq.c</a></div><div class='hunk'>@@ -341,9 +341,18 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)</div><div class='ctx'> 	/* Only dereference the resource if both the</div><div class='ctx'> 	 * resource and the irq are valid. */</div><div class='ctx'> 	if (r &amp;&amp; irq) {</div><div class='add'>+		const char *name = NULL;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Get optional "interrupts-names" property to add a name</div><div class='add'>+		 * to the resource.</div><div class='add'>+		 */</div><div class='add'>+		of_property_read_string_index(dev, "interrupt-names", index,</div><div class='add'>+					      &amp;name);</div><div class='add'>+</div><div class='ctx'> 		r-&gt;start = r-&gt;end = irq;</div><div class='ctx'> 		r-&gt;flags = IORESOURCE_IRQ;</div><div class='del'>-		r-&gt;name = dev-&gt;full_name;</div><div class='add'>+		r-&gt;name = name ? name : dev-&gt;full_name;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return irq;</div><div class='head'>diff --git a/drivers/of/pdt.c b/drivers/of/pdt.c<br/>index bc5b3990f6ed..07cc1d678e4d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/of/pdt.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/of/pdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/of/pdt.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/of/pdt.c</a></div><div class='hunk'>@@ -229,7 +229,7 @@ static struct device_node * __init of_pdt_build_tree(struct device_node *parent,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *kernel_tree_alloc(u64 size, u64 align)</div><div class='add'>+static void * __init kernel_tree_alloc(u64 size, u64 align)</div><div class='ctx'> {</div><div class='ctx'> 	return prom_early_alloc(size);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/of/selftest.c b/drivers/of/selftest.c<br/>new file mode 100644<br/>index 000000000000..9d2b4803a9d6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/of/selftest.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/of/selftest.c</a></div><div class='hunk'>@@ -0,0 +1,139 @@</div><div class='add'>+/*</div><div class='add'>+ * Self tests for device tree subsystem</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) "### %s(): " fmt, __func__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/errno.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/list.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+</div><div class='add'>+static bool selftest_passed = true;</div><div class='add'>+#define selftest(result, fmt, ...) { \</div><div class='add'>+	selftest_passed &amp;= (result); \</div><div class='add'>+	if (!(result)) \</div><div class='add'>+		pr_err("FAIL %s:%i " fmt, __FILE__, __LINE__, ##__VA_ARGS__); \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init of_selftest_parse_phandle_with_args(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	struct of_phandle_args args;</div><div class='add'>+	int rc, i;</div><div class='add'>+	bool passed_all = true;</div><div class='add'>+</div><div class='add'>+	pr_info("start\n");</div><div class='add'>+	np = of_find_node_by_path("/testcase-data/phandle-tests/consumer-a");</div><div class='add'>+	if (!np) {</div><div class='add'>+		pr_err("missing testcase data\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 7; i++) {</div><div class='add'>+		bool passed = true;</div><div class='add'>+		rc = of_parse_phandle_with_args(np, "phandle-list",</div><div class='add'>+						"#phandle-cells", i, &amp;args);</div><div class='add'>+</div><div class='add'>+		/* Test the values from tests-phandle.dtsi */</div><div class='add'>+		switch (i) {</div><div class='add'>+		case 0:</div><div class='add'>+			passed &amp;= !rc;</div><div class='add'>+			passed &amp;= (args.args_count == 1);</div><div class='add'>+			passed &amp;= (args.args[0] == (i + 1));</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			passed &amp;= !rc;</div><div class='add'>+			passed &amp;= (args.args_count == 2);</div><div class='add'>+			passed &amp;= (args.args[0] == (i + 1));</div><div class='add'>+			passed &amp;= (args.args[1] == 0);</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			passed &amp;= (rc == -ENOENT);</div><div class='add'>+			break;</div><div class='add'>+		case 3:</div><div class='add'>+			passed &amp;= !rc;</div><div class='add'>+			passed &amp;= (args.args_count == 3);</div><div class='add'>+			passed &amp;= (args.args[0] == (i + 1));</div><div class='add'>+			passed &amp;= (args.args[1] == 4);</div><div class='add'>+			passed &amp;= (args.args[2] == 3);</div><div class='add'>+			break;</div><div class='add'>+		case 4:</div><div class='add'>+			passed &amp;= !rc;</div><div class='add'>+			passed &amp;= (args.args_count == 2);</div><div class='add'>+			passed &amp;= (args.args[0] == (i + 1));</div><div class='add'>+			passed &amp;= (args.args[1] == 100);</div><div class='add'>+			break;</div><div class='add'>+		case 5:</div><div class='add'>+			passed &amp;= !rc;</div><div class='add'>+			passed &amp;= (args.args_count == 0);</div><div class='add'>+			break;</div><div class='add'>+		case 6:</div><div class='add'>+			passed &amp;= !rc;</div><div class='add'>+			passed &amp;= (args.args_count == 1);</div><div class='add'>+			passed &amp;= (args.args[0] == (i + 1));</div><div class='add'>+			break;</div><div class='add'>+		case 7:</div><div class='add'>+			passed &amp;= (rc == -EINVAL);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			passed = false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!passed) {</div><div class='add'>+			int j;</div><div class='add'>+			pr_err("index %i - data error on node %s rc=%i regs=[",</div><div class='add'>+				i, args.np-&gt;full_name, rc);</div><div class='add'>+			for (j = 0; j &lt; args.args_count; j++)</div><div class='add'>+				printk(" %i", args.args[j]);</div><div class='add'>+			printk(" ]\n");</div><div class='add'>+</div><div class='add'>+			passed_all = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for missing list property */</div><div class='add'>+	rc = of_parse_phandle_with_args(np, "phandle-list-missing",</div><div class='add'>+					"#phandle-cells", 0, &amp;args);</div><div class='add'>+	passed_all &amp;= (rc == -EINVAL);</div><div class='add'>+</div><div class='add'>+	/* Check for missing cells property */</div><div class='add'>+	rc = of_parse_phandle_with_args(np, "phandle-list",</div><div class='add'>+					"#phandle-cells-missing", 0, &amp;args);</div><div class='add'>+	passed_all &amp;= (rc == -EINVAL);</div><div class='add'>+</div><div class='add'>+	/* Check for bad phandle in list */</div><div class='add'>+	rc = of_parse_phandle_with_args(np, "phandle-list-bad-phandle",</div><div class='add'>+					"#phandle-cells", 0, &amp;args);</div><div class='add'>+	passed_all &amp;= (rc == -EINVAL);</div><div class='add'>+</div><div class='add'>+	/* Check for incorrectly formed argument list */</div><div class='add'>+	rc = of_parse_phandle_with_args(np, "phandle-list-bad-args",</div><div class='add'>+					"#phandle-cells", 1, &amp;args);</div><div class='add'>+	passed_all &amp;= (rc == -EINVAL);</div><div class='add'>+</div><div class='add'>+	pr_info("end - %s\n", passed_all ? "PASS" : "FAIL");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init of_selftest(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	np = of_find_node_by_path("/testcase-data/phandle-tests/consumer-a");</div><div class='add'>+	if (!np) {</div><div class='add'>+		pr_info("No testcase data in device tree; not running tests\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	of_node_put(np);</div><div class='add'>+</div><div class='add'>+	pr_info("start of selftest - you will see error messages\n");</div><div class='add'>+	of_selftest_parse_phandle_with_args();</div><div class='add'>+	pr_info("end of selftest - %s\n", selftest_passed ? "PASS" : "FAIL");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+late_initcall(of_selftest);</div><div class='head'>diff --git a/drivers/parisc/Kconfig b/drivers/parisc/Kconfig<br/>index 553a9905299a..620264936341 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parisc/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/parisc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parisc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/parisc/Kconfig</a></div><div class='hunk'>@@ -108,13 +108,6 @@ config IOMMU_HELPER</div><div class='ctx'> 	depends on IOMMU_SBA || IOMMU_CCIO</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-#config PCI_EPIC</div><div class='del'>-#	bool "EPIC/SAGA PCI support"</div><div class='del'>-#	depends on PCI</div><div class='del'>-#	default y</div><div class='del'>-#	help</div><div class='del'>-#	  Say Y here for V-class PCI, DMA/IOMMU, IRQ subsystem support.</div><div class='del'>-</div><div class='ctx'> source "drivers/pcmcia/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/pci/hotplug/Kconfig"</div><div class='head'>diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c<br/>index bcd5d54b7d4d..7ff10c1e8664 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parisc/dino.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/parisc/dino.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parisc/dino.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/parisc/dino.c</a></div><div class='hunk'>@@ -562,19 +562,6 @@ dino_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> 	/* Firmware doesn't set up card-mode dino, so we have to */</div><div class='ctx'> 	if (is_card_dino(&amp;dino_dev-&gt;hba.dev-&gt;id)) {</div><div class='ctx'> 		dino_card_setup(bus, dino_dev-&gt;hba.base_addr);</div><div class='del'>-	} else if(bus-&gt;parent == NULL) {</div><div class='del'>-		/* must have a dino above it, reparent the resources</div><div class='del'>-		 * into the dino window */</div><div class='del'>-		int i;</div><div class='del'>-		struct resource *res = &amp;dino_dev-&gt;hba.lmmio_space;</div><div class='del'>-</div><div class='del'>-		bus-&gt;resource[0] = &amp;(dino_dev-&gt;hba.io_space);</div><div class='del'>-		for(i = 0; i &lt; DINO_MAX_LMMIO_RESOURCES; i++) {</div><div class='del'>-			if(res[i].flags == 0)</div><div class='del'>-				break;</div><div class='del'>-			bus-&gt;resource[i+1] = &amp;res[i];</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 	} else if (bus-&gt;parent) {</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='hunk'>@@ -927,6 +914,7 @@ static int __init dino_probe(struct parisc_device *dev)</div><div class='ctx'> 	const char *version = "unknown";</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	int is_cujo = 0;</div><div class='add'>+	LIST_HEAD(resources);</div><div class='ctx'> 	struct pci_bus *bus;</div><div class='ctx'> 	unsigned long hpa = dev-&gt;hpa.start;</div><div class='ctx'> </div><div class='hunk'>@@ -1003,26 +991,37 @@ static int __init dino_probe(struct parisc_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;dev.platform_data = dino_dev;</div><div class='ctx'> </div><div class='add'>+	pci_add_resource(&amp;resources, &amp;dino_dev-&gt;hba.io_space);</div><div class='add'>+	if (dino_dev-&gt;hba.lmmio_space.flags)</div><div class='add'>+		pci_add_resource(&amp;resources, &amp;dino_dev-&gt;hba.lmmio_space);</div><div class='add'>+	if (dino_dev-&gt;hba.elmmio_space.flags)</div><div class='add'>+		pci_add_resource(&amp;resources, &amp;dino_dev-&gt;hba.elmmio_space);</div><div class='add'>+	if (dino_dev-&gt;hba.gmmio_space.flags)</div><div class='add'>+		pci_add_resource(&amp;resources, &amp;dino_dev-&gt;hba.gmmio_space);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	** It's not used to avoid chicken/egg problems</div><div class='ctx'> 	** with configuration accessor functions.</div><div class='ctx'> 	*/</div><div class='del'>-	dino_dev-&gt;hba.hba_bus = bus = pci_scan_bus_parented(&amp;dev-&gt;dev,</div><div class='del'>-			 dino_current_bus, &amp;dino_cfg_ops, NULL);</div><div class='del'>-</div><div class='del'>-	if(bus) {</div><div class='del'>-		/* This code *depends* on scanning being single threaded</div><div class='del'>-		 * if it isn't, this global bus number count will fail</div><div class='del'>-		 */</div><div class='del'>-		dino_current_bus = bus-&gt;subordinate + 1;</div><div class='del'>-		pci_bus_assign_resources(bus);</div><div class='del'>-		pci_bus_add_devices(bus);</div><div class='del'>-	} else {</div><div class='add'>+	dino_dev-&gt;hba.hba_bus = bus = pci_create_root_bus(&amp;dev-&gt;dev,</div><div class='add'>+			 dino_current_bus, &amp;dino_cfg_ops, NULL, &amp;resources);</div><div class='add'>+	if (!bus) {</div><div class='ctx'> 		printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (duplicate bus number %d?)\n",</div><div class='ctx'> 		       dev_name(&amp;dev-&gt;dev), dino_current_bus);</div><div class='add'>+		pci_free_resource_list(&amp;resources);</div><div class='ctx'> 		/* increment the bus number in case of duplicates */</div><div class='ctx'> 		dino_current_bus++;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	bus-&gt;subordinate = pci_scan_child_bus(bus);</div><div class='add'>+</div><div class='add'>+	/* This code *depends* on scanning being single threaded</div><div class='add'>+	 * if it isn't, this global bus number count will fail</div><div class='add'>+	 */</div><div class='add'>+	dino_current_bus = bus-&gt;subordinate + 1;</div><div class='add'>+	pci_bus_assign_resources(bus);</div><div class='add'>+	pci_bus_add_devices(bus);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c<br/>index 3aeb3279c92a..d5f3d753a108 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parisc/lba_pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/parisc/lba_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parisc/lba_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/parisc/lba_pci.c</a></div><div class='hunk'>@@ -653,7 +653,7 @@ lba_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Host-PCI Bridge */</div><div class='del'>-		int err, i;</div><div class='add'>+		int err;</div><div class='ctx'> </div><div class='ctx'> 		DBG("lba_fixup_bus() %s [%lx/%lx]/%lx\n",</div><div class='ctx'> 			ldev-&gt;hba.io_space.name,</div><div class='hunk'>@@ -669,9 +669,6 @@ lba_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> 			lba_dump_res(&amp;ioport_resource, 2);</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		}</div><div class='del'>-		/* advertize Host bridge resources to PCI bus */</div><div class='del'>-		bus-&gt;resource[0] = &amp;(ldev-&gt;hba.io_space);</div><div class='del'>-		i = 1;</div><div class='ctx'> </div><div class='ctx'> 		if (ldev-&gt;hba.elmmio_space.start) {</div><div class='ctx'> 			err = request_resource(&amp;iomem_resource,</div><div class='hunk'>@@ -685,35 +682,17 @@ lba_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> </div><div class='ctx'> 				/* lba_dump_res(&amp;iomem_resource, 2); */</div><div class='ctx'> 				/* BUG(); */</div><div class='del'>-			} else</div><div class='del'>-				bus-&gt;resource[i++] = &amp;(ldev-&gt;hba.elmmio_space);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-		/*   Overlaps with elmmio can (and should) fail here.</div><div class='del'>-		 *   We will prune (or ignore) the distributed range.</div><div class='del'>-		 *</div><div class='del'>-		 *   FIXME: SBA code should register all elmmio ranges first.</div><div class='del'>-		 *      that would take care of elmmio ranges routed</div><div class='del'>-		 *	to a different rope (already discovered) from</div><div class='del'>-		 *	getting registered *after* LBA code has already</div><div class='del'>-		 *	registered it's distributed lmmio range.</div><div class='del'>-		 */</div><div class='del'>-		if (truncate_pat_collision(&amp;iomem_resource,</div><div class='del'>-				       	&amp;(ldev-&gt;hba.lmmio_space))) {</div><div class='del'>-</div><div class='del'>-			printk(KERN_WARNING "LBA: lmmio_space [%lx/%lx] duplicate!\n",</div><div class='del'>-					(long)ldev-&gt;hba.lmmio_space.start,</div><div class='del'>-					(long)ldev-&gt;hba.lmmio_space.end);</div><div class='del'>-		} else {</div><div class='add'>+		if (ldev-&gt;hba.lmmio_space.flags) {</div><div class='ctx'> 			err = request_resource(&amp;iomem_resource, &amp;(ldev-&gt;hba.lmmio_space));</div><div class='ctx'> 			if (err &lt; 0) {</div><div class='ctx'> 				printk(KERN_ERR "FAILED: lba_fixup_bus() request for "</div><div class='ctx'> 					"lmmio_space [%lx/%lx]\n",</div><div class='ctx'> 					(long)ldev-&gt;hba.lmmio_space.start,</div><div class='ctx'> 					(long)ldev-&gt;hba.lmmio_space.end);</div><div class='del'>-			} else</div><div class='del'>-				bus-&gt;resource[i++] = &amp;(ldev-&gt;hba.lmmio_space);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='hunk'>@@ -728,7 +707,6 @@ lba_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> 				lba_dump_res(&amp;iomem_resource, 2);</div><div class='ctx'> 				BUG();</div><div class='ctx'> 			}</div><div class='del'>-			bus-&gt;resource[i++] = &amp;(ldev-&gt;hba.gmmio_space);</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1404,6 +1382,7 @@ static int __init</div><div class='ctx'> lba_driver_probe(struct parisc_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct lba_device *lba_dev;</div><div class='add'>+	LIST_HEAD(resources);</div><div class='ctx'> 	struct pci_bus *lba_bus;</div><div class='ctx'> 	struct pci_ops *cfg_ops;</div><div class='ctx'> 	u32 func_class;</div><div class='hunk'>@@ -1518,10 +1497,41 @@ lba_driver_probe(struct parisc_device *dev)</div><div class='ctx'> 	if (lba_dev-&gt;hba.bus_num.start &lt; lba_next_bus)</div><div class='ctx'> 		lba_dev-&gt;hba.bus_num.start = lba_next_bus;</div><div class='ctx'> </div><div class='add'>+	/*   Overlaps with elmmio can (and should) fail here.</div><div class='add'>+	 *   We will prune (or ignore) the distributed range.</div><div class='add'>+	 *</div><div class='add'>+	 *   FIXME: SBA code should register all elmmio ranges first.</div><div class='add'>+	 *      that would take care of elmmio ranges routed</div><div class='add'>+	 *	to a different rope (already discovered) from</div><div class='add'>+	 *	getting registered *after* LBA code has already</div><div class='add'>+	 *	registered it's distributed lmmio range.</div><div class='add'>+	 */</div><div class='add'>+	if (truncate_pat_collision(&amp;iomem_resource,</div><div class='add'>+				   &amp;(lba_dev-&gt;hba.lmmio_space))) {</div><div class='add'>+		printk(KERN_WARNING "LBA: lmmio_space [%lx/%lx] duplicate!\n",</div><div class='add'>+				(long)lba_dev-&gt;hba.lmmio_space.start,</div><div class='add'>+				(long)lba_dev-&gt;hba.lmmio_space.end);</div><div class='add'>+		lba_dev-&gt;hba.lmmio_space.flags = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_add_resource(&amp;resources, &amp;lba_dev-&gt;hba.io_space);</div><div class='add'>+	if (lba_dev-&gt;hba.elmmio_space.start)</div><div class='add'>+		pci_add_resource(&amp;resources, &amp;lba_dev-&gt;hba.elmmio_space);</div><div class='add'>+	if (lba_dev-&gt;hba.lmmio_space.flags)</div><div class='add'>+		pci_add_resource(&amp;resources, &amp;lba_dev-&gt;hba.lmmio_space);</div><div class='add'>+	if (lba_dev-&gt;hba.gmmio_space.flags)</div><div class='add'>+		pci_add_resource(&amp;resources, &amp;lba_dev-&gt;hba.gmmio_space);</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;dev.platform_data = lba_dev;</div><div class='ctx'> 	lba_bus = lba_dev-&gt;hba.hba_bus =</div><div class='del'>-		pci_scan_bus_parented(&amp;dev-&gt;dev, lba_dev-&gt;hba.bus_num.start,</div><div class='del'>-				cfg_ops, NULL);</div><div class='add'>+		pci_create_root_bus(&amp;dev-&gt;dev, lba_dev-&gt;hba.bus_num.start,</div><div class='add'>+				    cfg_ops, NULL, &amp;resources);</div><div class='add'>+	if (!lba_bus) {</div><div class='add'>+		pci_free_resource_list(&amp;resources);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lba_bus-&gt;subordinate = pci_scan_child_bus(lba_bus);</div><div class='ctx'> </div><div class='ctx'> 	/* This is in lieu of calling pci_assign_unassigned_resources() */</div><div class='ctx'> 	if (is_pdc_pat()) {</div><div class='hunk'>@@ -1551,10 +1561,8 @@ lba_driver_probe(struct parisc_device *dev)</div><div class='ctx'> 		lba_dev-&gt;flags |= LBA_FLAG_SKIP_PROBE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (lba_bus) {</div><div class='del'>-		lba_next_bus = lba_bus-&gt;subordinate + 1;</div><div class='del'>-		pci_bus_add_devices(lba_bus);</div><div class='del'>-	}</div><div class='add'>+	lba_next_bus = lba_bus-&gt;subordinate + 1;</div><div class='add'>+	pci_bus_add_devices(lba_bus);</div><div class='ctx'> </div><div class='ctx'> 	/* Whew! Finally done! Tell services we got this one covered. */</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/parport/parport_ax88796.c b/drivers/parport/parport_ax88796.c<br/>index 844f6137970a..7c5d86696eed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parport/parport_ax88796.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/parport/parport_ax88796.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parport/parport_ax88796.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/parport/parport_ax88796.c</a></div><div class='hunk'>@@ -420,18 +420,7 @@ static struct platform_driver axdrv = {</div><div class='ctx'> 	.resume		= parport_ax88796_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init parport_ax88796_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;axdrv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit parport_ax88796_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;axdrv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(parport_ax88796_init)</div><div class='del'>-module_exit(parport_ax88796_exit)</div><div class='add'>+module_platform_driver(axdrv);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Ben Dooks &lt;ben@simtec.co.uk&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("AX88796 Parport parallel port driver");</div><div class='head'>diff --git a/drivers/parport/parport_ip32.c b/drivers/parport/parport_ip32.c<br/>index 0dc34f12f92e..d4716273651e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parport/parport_ip32.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/parport/parport_ip32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parport/parport_ip32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/parport/parport_ip32.c</a></div><div class='hunk'>@@ -135,7 +135,7 @@</div><div class='ctx'> #define PARPORT_IP32_ENABLE_EPP	(1U &lt;&lt; 3)</div><div class='ctx'> #define PARPORT_IP32_ENABLE_ECP	(1U &lt;&lt; 4)</div><div class='ctx'> static unsigned int features =	~0U;</div><div class='del'>-static int verbose_probing =	DEFAULT_VERBOSE_PROBING;</div><div class='add'>+static bool verbose_probing =	DEFAULT_VERBOSE_PROBING;</div><div class='ctx'> </div><div class='ctx'> /* We do not support more than one port. */</div><div class='ctx'> static struct parport *this_port = NULL;</div><div class='head'>diff --git a/drivers/parport/parport_mfc3.c b/drivers/parport/parport_mfc3.c<br/>index 362db31d8ca6..1c0c642b3e23 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parport/parport_mfc3.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/parport/parport_mfc3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parport/parport_mfc3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/parport/parport_mfc3.c</a></div><div class='hunk'>@@ -397,7 +397,7 @@ static void __exit parport_mfc3_exit(void)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Joerg Dorchain &lt;joerg@dorchain.net&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Parport Driver for Multiface 3 expansion cards Paralllel Port");</div><div class='add'>+MODULE_DESCRIPTION("Parport Driver for Multiface 3 expansion cards Parallel Port");</div><div class='ctx'> MODULE_SUPPORTED_DEVICE("Multiface 3 Parallel Port");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c<br/>index d0b597b50398..0cb64f50cecd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parport/parport_pc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/parport/parport_pc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parport/parport_pc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/parport/parport_pc.c</a></div><div class='hunk'>@@ -3404,8 +3404,8 @@ static int __init parport_init_mode_setup(char *str)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef MODULE</div><div class='del'>-static const char *irq[PARPORT_PC_MAX_PORTS];</div><div class='del'>-static const char *dma[PARPORT_PC_MAX_PORTS];</div><div class='add'>+static char *irq[PARPORT_PC_MAX_PORTS];</div><div class='add'>+static char *dma[PARPORT_PC_MAX_PORTS];</div><div class='ctx'> </div><div class='ctx'> MODULE_PARM_DESC(io, "Base I/O address (SPP regs)");</div><div class='ctx'> module_param_array(io, int, NULL, 0);</div><div class='head'>diff --git a/drivers/parport/parport_sunbpp.c b/drivers/parport/parport_sunbpp.c<br/>index 910c5a26e347..9390a534a2b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parport/parport_sunbpp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/parport/parport_sunbpp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parport/parport_sunbpp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/parport/parport_sunbpp.c</a></div><div class='hunk'>@@ -391,21 +391,10 @@ static struct platform_driver bpp_sbus_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(bpp_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init parport_sunbpp_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;bpp_sbus_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit parport_sunbpp_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;bpp_sbus_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(bpp_sbus_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Derrick J Brashear");</div><div class='ctx'> MODULE_DESCRIPTION("Parport Driver for Sparc bidirectional Port");</div><div class='ctx'> MODULE_SUPPORTED_DEVICE("Sparc Bidirectional Parallel Port");</div><div class='ctx'> MODULE_VERSION("2.0");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-module_init(parport_sunbpp_init)</div><div class='del'>-module_exit(parport_sunbpp_exit)</div><div class='head'>diff --git a/drivers/pci/access.c b/drivers/pci/access.c<br/>index fdaa42aac7c6..2a581642c237 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/access.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/access.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/access.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/access.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  * configuration space.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static DEFINE_RAW_SPINLOCK(pci_lock);</div><div class='add'>+DEFINE_RAW_SPINLOCK(pci_lock);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Wrappers for all PCI configuration access functions.  They just check</div><div class='hunk'>@@ -127,20 +127,20 @@ EXPORT_SYMBOL(pci_write_vpd);</div><div class='ctx'>  * We have a bit per device to indicate it's blocked and a global wait queue</div><div class='ctx'>  * for callers to sleep on until devices are unblocked.</div><div class='ctx'>  */</div><div class='del'>-static DECLARE_WAIT_QUEUE_HEAD(pci_ucfg_wait);</div><div class='add'>+static DECLARE_WAIT_QUEUE_HEAD(pci_cfg_wait);</div><div class='ctx'> </div><div class='del'>-static noinline void pci_wait_ucfg(struct pci_dev *dev)</div><div class='add'>+static noinline void pci_wait_cfg(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	DECLARE_WAITQUEUE(wait, current);</div><div class='ctx'> </div><div class='del'>-	__add_wait_queue(&amp;pci_ucfg_wait, &amp;wait);</div><div class='add'>+	__add_wait_queue(&amp;pci_cfg_wait, &amp;wait);</div><div class='ctx'> 	do {</div><div class='ctx'> 		set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='ctx'> 		raw_spin_unlock_irq(&amp;pci_lock);</div><div class='ctx'> 		schedule();</div><div class='ctx'> 		raw_spin_lock_irq(&amp;pci_lock);</div><div class='del'>-	} while (dev-&gt;block_ucfg_access);</div><div class='del'>-	__remove_wait_queue(&amp;pci_ucfg_wait, &amp;wait);</div><div class='add'>+	} while (dev-&gt;block_cfg_access);</div><div class='add'>+	__remove_wait_queue(&amp;pci_cfg_wait, &amp;wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns 0 on success, negative values indicate error. */</div><div class='hunk'>@@ -153,7 +153,8 @@ int pci_user_read_config_##size						\</div><div class='ctx'> 	if (PCI_##size##_BAD)						\</div><div class='ctx'> 		return -EINVAL;						\</div><div class='ctx'> 	raw_spin_lock_irq(&amp;pci_lock);				\</div><div class='del'>-	if (unlikely(dev-&gt;block_ucfg_access)) pci_wait_ucfg(dev);	\</div><div class='add'>+	if (unlikely(dev-&gt;block_cfg_access))				\</div><div class='add'>+		pci_wait_cfg(dev);					\</div><div class='ctx'> 	ret = dev-&gt;bus-&gt;ops-&gt;read(dev-&gt;bus, dev-&gt;devfn,			\</div><div class='ctx'> 					pos, sizeof(type), &amp;data);	\</div><div class='ctx'> 	raw_spin_unlock_irq(&amp;pci_lock);				\</div><div class='hunk'>@@ -172,7 +173,8 @@ int pci_user_write_config_##size					\</div><div class='ctx'> 	if (PCI_##size##_BAD)						\</div><div class='ctx'> 		return -EINVAL;						\</div><div class='ctx'> 	raw_spin_lock_irq(&amp;pci_lock);				\</div><div class='del'>-	if (unlikely(dev-&gt;block_ucfg_access)) pci_wait_ucfg(dev);	\</div><div class='add'>+	if (unlikely(dev-&gt;block_cfg_access))				\</div><div class='add'>+		pci_wait_cfg(dev);					\</div><div class='ctx'> 	ret = dev-&gt;bus-&gt;ops-&gt;write(dev-&gt;bus, dev-&gt;devfn,		\</div><div class='ctx'> 					pos, sizeof(type), val);	\</div><div class='ctx'> 	raw_spin_unlock_irq(&amp;pci_lock);				\</div><div class='hunk'>@@ -401,36 +403,56 @@ int pci_vpd_truncate(struct pci_dev *dev, size_t size)</div><div class='ctx'> EXPORT_SYMBOL(pci_vpd_truncate);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * pci_block_user_cfg_access - Block userspace PCI config reads/writes</div><div class='add'>+ * pci_cfg_access_lock - Lock PCI config reads/writes</div><div class='ctx'>  * @dev:	pci device struct</div><div class='ctx'>  *</div><div class='del'>- * When user access is blocked, any reads or writes to config space will</div><div class='del'>- * sleep until access is unblocked again.  We don't allow nesting of</div><div class='del'>- * block/unblock calls.</div><div class='add'>+ * When access is locked, any userspace reads or writes to config</div><div class='add'>+ * space and concurrent lock requests will sleep until access is</div><div class='add'>+ * allowed via pci_cfg_access_unlocked again.</div><div class='ctx'>  */</div><div class='del'>-void pci_block_user_cfg_access(struct pci_dev *dev)</div><div class='add'>+void pci_cfg_access_lock(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	might_sleep();</div><div class='add'>+</div><div class='add'>+	raw_spin_lock_irq(&amp;pci_lock);</div><div class='add'>+	if (dev-&gt;block_cfg_access)</div><div class='add'>+		pci_wait_cfg(dev);</div><div class='add'>+	dev-&gt;block_cfg_access = 1;</div><div class='add'>+	raw_spin_unlock_irq(&amp;pci_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pci_cfg_access_lock);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pci_cfg_access_trylock - try to lock PCI config reads/writes</div><div class='add'>+ * @dev:	pci device struct</div><div class='add'>+ *</div><div class='add'>+ * Same as pci_cfg_access_lock, but will return 0 if access is</div><div class='add'>+ * already locked, 1 otherwise. This function can be used from</div><div class='add'>+ * atomic contexts.</div><div class='add'>+ */</div><div class='add'>+bool pci_cfg_access_trylock(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	int was_blocked;</div><div class='add'>+	bool locked = true;</div><div class='ctx'> </div><div class='ctx'> 	raw_spin_lock_irqsave(&amp;pci_lock, flags);</div><div class='del'>-	was_blocked = dev-&gt;block_ucfg_access;</div><div class='del'>-	dev-&gt;block_ucfg_access = 1;</div><div class='add'>+	if (dev-&gt;block_cfg_access)</div><div class='add'>+		locked = false;</div><div class='add'>+	else</div><div class='add'>+		dev-&gt;block_cfg_access = 1;</div><div class='ctx'> 	raw_spin_unlock_irqrestore(&amp;pci_lock, flags);</div><div class='ctx'> </div><div class='del'>-	/* If we BUG() inside the pci_lock, we're guaranteed to hose</div><div class='del'>-	 * the machine */</div><div class='del'>-	BUG_ON(was_blocked);</div><div class='add'>+	return locked;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(pci_block_user_cfg_access);</div><div class='add'>+EXPORT_SYMBOL_GPL(pci_cfg_access_trylock);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * pci_unblock_user_cfg_access - Unblock userspace PCI config reads/writes</div><div class='add'>+ * pci_cfg_access_unlock - Unlock PCI config reads/writes</div><div class='ctx'>  * @dev:	pci device struct</div><div class='ctx'>  *</div><div class='del'>- * This function allows userspace PCI config accesses to resume.</div><div class='add'>+ * This function allows PCI config accesses to resume.</div><div class='ctx'>  */</div><div class='del'>-void pci_unblock_user_cfg_access(struct pci_dev *dev)</div><div class='add'>+void pci_cfg_access_unlock(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -438,10 +460,10 @@ void pci_unblock_user_cfg_access(struct pci_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* This indicates a problem in the caller, but we don't need</div><div class='ctx'> 	 * to kill them, unlike a double-block above. */</div><div class='del'>-	WARN_ON(!dev-&gt;block_ucfg_access);</div><div class='add'>+	WARN_ON(!dev-&gt;block_cfg_access);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;block_ucfg_access = 0;</div><div class='del'>-	wake_up_all(&amp;pci_ucfg_wait);</div><div class='add'>+	dev-&gt;block_cfg_access = 0;</div><div class='add'>+	wake_up_all(&amp;pci_cfg_wait);</div><div class='ctx'> 	raw_spin_unlock_irqrestore(&amp;pci_lock, flags);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(pci_unblock_user_cfg_access);</div><div class='add'>+EXPORT_SYMBOL_GPL(pci_cfg_access_unlock);</div><div class='head'>diff --git a/drivers/pci/ats.c b/drivers/pci/ats.c<br/>index b0dd08e6a9da..95655d7c0d0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/ats.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/ats.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/ats.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/ats.c</a></div><div class='hunk'>@@ -128,6 +128,23 @@ void pci_disable_ats(struct pci_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pci_disable_ats);</div><div class='ctx'> </div><div class='add'>+void pci_restore_ats_state(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u16 ctrl;</div><div class='add'>+</div><div class='add'>+	if (!pci_ats_enabled(dev))</div><div class='add'>+		return;</div><div class='add'>+	if (!pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ATS))</div><div class='add'>+		BUG();</div><div class='add'>+</div><div class='add'>+	ctrl = PCI_ATS_CTRL_ENABLE;</div><div class='add'>+	if (!dev-&gt;is_virtfn)</div><div class='add'>+		ctrl |= PCI_ATS_CTRL_STU(dev-&gt;ats-&gt;stu - PCI_ATS_MIN_STU);</div><div class='add'>+</div><div class='add'>+	pci_write_config_word(dev, dev-&gt;ats-&gt;pos + PCI_ATS_CTRL, ctrl);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pci_restore_ats_state);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * pci_ats_queue_depth - query the ATS Invalidate Queue Depth</div><div class='ctx'>  * @dev: the PCI device</div><div class='hunk'>@@ -175,21 +192,22 @@ int pci_enable_pri(struct pci_dev *pdev, u32 reqs)</div><div class='ctx'> 	u32 max_requests;</div><div class='ctx'> 	int pos;</div><div class='ctx'> </div><div class='del'>-	pos = pci_find_ext_capability(pdev, PCI_PRI_CAP);</div><div class='add'>+	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI);</div><div class='ctx'> 	if (!pos)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	pci_read_config_word(pdev, pos + PCI_PRI_CONTROL_OFF, &amp;control);</div><div class='del'>-	pci_read_config_word(pdev, pos + PCI_PRI_STATUS_OFF,  &amp;status);</div><div class='del'>-	if ((control &amp; PCI_PRI_ENABLE) || !(status &amp; PCI_PRI_STATUS_STOPPED))</div><div class='add'>+	pci_read_config_word(pdev, pos + PCI_PRI_CTRL, &amp;control);</div><div class='add'>+	pci_read_config_word(pdev, pos + PCI_PRI_STATUS, &amp;status);</div><div class='add'>+	if ((control &amp; PCI_PRI_CTRL_ENABLE) ||</div><div class='add'>+	    !(status &amp; PCI_PRI_STATUS_STOPPED))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	pci_read_config_dword(pdev, pos + PCI_PRI_MAX_REQ_OFF, &amp;max_requests);</div><div class='add'>+	pci_read_config_dword(pdev, pos + PCI_PRI_MAX_REQ, &amp;max_requests);</div><div class='ctx'> 	reqs = min(max_requests, reqs);</div><div class='del'>-	pci_write_config_dword(pdev, pos + PCI_PRI_ALLOC_REQ_OFF, reqs);</div><div class='add'>+	pci_write_config_dword(pdev, pos + PCI_PRI_ALLOC_REQ, reqs);</div><div class='ctx'> </div><div class='del'>-	control |= PCI_PRI_ENABLE;</div><div class='del'>-	pci_write_config_word(pdev, pos + PCI_PRI_CONTROL_OFF, control);</div><div class='add'>+	control |= PCI_PRI_CTRL_ENABLE;</div><div class='add'>+	pci_write_config_word(pdev, pos + PCI_PRI_CTRL, control);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -206,13 +224,13 @@ void pci_disable_pri(struct pci_dev *pdev)</div><div class='ctx'> 	u16 control;</div><div class='ctx'> 	int pos;</div><div class='ctx'> </div><div class='del'>-	pos = pci_find_ext_capability(pdev, PCI_PRI_CAP);</div><div class='add'>+	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI);</div><div class='ctx'> 	if (!pos)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	pci_read_config_word(pdev, pos + PCI_PRI_CONTROL_OFF, &amp;control);</div><div class='del'>-	control &amp;= ~PCI_PRI_ENABLE;</div><div class='del'>-	pci_write_config_word(pdev, pos + PCI_PRI_CONTROL_OFF, control);</div><div class='add'>+	pci_read_config_word(pdev, pos + PCI_PRI_CTRL, &amp;control);</div><div class='add'>+	control &amp;= ~PCI_PRI_CTRL_ENABLE;</div><div class='add'>+	pci_write_config_word(pdev, pos + PCI_PRI_CTRL, control);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pci_disable_pri);</div><div class='ctx'> </div><div class='hunk'>@@ -227,13 +245,13 @@ bool pci_pri_enabled(struct pci_dev *pdev)</div><div class='ctx'> 	u16 control;</div><div class='ctx'> 	int pos;</div><div class='ctx'> </div><div class='del'>-	pos = pci_find_ext_capability(pdev, PCI_PRI_CAP);</div><div class='add'>+	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI);</div><div class='ctx'> 	if (!pos)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	pci_read_config_word(pdev, pos + PCI_PRI_CONTROL_OFF, &amp;control);</div><div class='add'>+	pci_read_config_word(pdev, pos + PCI_PRI_CTRL, &amp;control);</div><div class='ctx'> </div><div class='del'>-	return (control &amp; PCI_PRI_ENABLE) ? true : false;</div><div class='add'>+	return (control &amp; PCI_PRI_CTRL_ENABLE) ? true : false;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pci_pri_enabled);</div><div class='ctx'> </div><div class='hunk'>@@ -249,17 +267,17 @@ int pci_reset_pri(struct pci_dev *pdev)</div><div class='ctx'> 	u16 control;</div><div class='ctx'> 	int pos;</div><div class='ctx'> </div><div class='del'>-	pos = pci_find_ext_capability(pdev, PCI_PRI_CAP);</div><div class='add'>+	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI);</div><div class='ctx'> 	if (!pos)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	pci_read_config_word(pdev, pos + PCI_PRI_CONTROL_OFF, &amp;control);</div><div class='del'>-	if (control &amp; PCI_PRI_ENABLE)</div><div class='add'>+	pci_read_config_word(pdev, pos + PCI_PRI_CTRL, &amp;control);</div><div class='add'>+	if (control &amp; PCI_PRI_CTRL_ENABLE)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	control |= PCI_PRI_RESET;</div><div class='add'>+	control |= PCI_PRI_CTRL_RESET;</div><div class='ctx'> </div><div class='del'>-	pci_write_config_word(pdev, pos + PCI_PRI_CONTROL_OFF, control);</div><div class='add'>+	pci_write_config_word(pdev, pos + PCI_PRI_CTRL, control);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -282,14 +300,14 @@ bool pci_pri_stopped(struct pci_dev *pdev)</div><div class='ctx'> 	u16 control, status;</div><div class='ctx'> 	int pos;</div><div class='ctx'> </div><div class='del'>-	pos = pci_find_ext_capability(pdev, PCI_PRI_CAP);</div><div class='add'>+	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI);</div><div class='ctx'> 	if (!pos)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	pci_read_config_word(pdev, pos + PCI_PRI_CONTROL_OFF, &amp;control);</div><div class='del'>-	pci_read_config_word(pdev, pos + PCI_PRI_STATUS_OFF,  &amp;status);</div><div class='add'>+	pci_read_config_word(pdev, pos + PCI_PRI_CTRL, &amp;control);</div><div class='add'>+	pci_read_config_word(pdev, pos + PCI_PRI_STATUS, &amp;status);</div><div class='ctx'> </div><div class='del'>-	if (control &amp; PCI_PRI_ENABLE)</div><div class='add'>+	if (control &amp; PCI_PRI_CTRL_ENABLE)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	return (status &amp; PCI_PRI_STATUS_STOPPED) ? true : false;</div><div class='hunk'>@@ -311,15 +329,15 @@ int pci_pri_status(struct pci_dev *pdev)</div><div class='ctx'> 	u16 status, control;</div><div class='ctx'> 	int pos;</div><div class='ctx'> </div><div class='del'>-	pos = pci_find_ext_capability(pdev, PCI_PRI_CAP);</div><div class='add'>+	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI);</div><div class='ctx'> 	if (!pos)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	pci_read_config_word(pdev, pos + PCI_PRI_CONTROL_OFF, &amp;control);</div><div class='del'>-	pci_read_config_word(pdev, pos + PCI_PRI_STATUS_OFF,  &amp;status);</div><div class='add'>+	pci_read_config_word(pdev, pos + PCI_PRI_CTRL, &amp;control);</div><div class='add'>+	pci_read_config_word(pdev, pos + PCI_PRI_STATUS, &amp;status);</div><div class='ctx'> </div><div class='ctx'> 	/* Stopped bit is undefined when enable == 1, so clear it */</div><div class='del'>-	if (control &amp; PCI_PRI_ENABLE)</div><div class='add'>+	if (control &amp; PCI_PRI_CTRL_ENABLE)</div><div class='ctx'> 		status &amp;= ~PCI_PRI_STATUS_STOPPED;</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -342,25 +360,25 @@ int pci_enable_pasid(struct pci_dev *pdev, int features)</div><div class='ctx'> 	u16 control, supported;</div><div class='ctx'> 	int pos;</div><div class='ctx'> </div><div class='del'>-	pos = pci_find_ext_capability(pdev, PCI_PASID_CAP);</div><div class='add'>+	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PASID);</div><div class='ctx'> 	if (!pos)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	pci_read_config_word(pdev, pos + PCI_PASID_CONTROL_OFF, &amp;control);</div><div class='del'>-	pci_read_config_word(pdev, pos + PCI_PASID_CAP_OFF,     &amp;supported);</div><div class='add'>+	pci_read_config_word(pdev, pos + PCI_PASID_CTRL, &amp;control);</div><div class='add'>+	pci_read_config_word(pdev, pos + PCI_PASID_CAP, &amp;supported);</div><div class='ctx'> </div><div class='del'>-	if (!(supported &amp; PCI_PASID_ENABLE))</div><div class='add'>+	if (control &amp; PCI_PASID_CTRL_ENABLE)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	supported &amp;= PCI_PASID_EXEC | PCI_PASID_PRIV;</div><div class='add'>+	supported &amp;= PCI_PASID_CAP_EXEC | PCI_PASID_CAP_PRIV;</div><div class='ctx'> </div><div class='ctx'> 	/* User wants to enable anything unsupported? */</div><div class='ctx'> 	if ((supported &amp; features) != features)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	control = PCI_PASID_ENABLE | features;</div><div class='add'>+	control = PCI_PASID_CTRL_ENABLE | features;</div><div class='ctx'> </div><div class='del'>-	pci_write_config_word(pdev, pos + PCI_PASID_CONTROL_OFF, control);</div><div class='add'>+	pci_write_config_word(pdev, pos + PCI_PASID_CTRL, control);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -376,11 +394,11 @@ void pci_disable_pasid(struct pci_dev *pdev)</div><div class='ctx'> 	u16 control = 0;</div><div class='ctx'> 	int pos;</div><div class='ctx'> </div><div class='del'>-	pos = pci_find_ext_capability(pdev, PCI_PASID_CAP);</div><div class='add'>+	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PASID);</div><div class='ctx'> 	if (!pos)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	pci_write_config_word(pdev, pos + PCI_PASID_CONTROL_OFF, control);</div><div class='add'>+	pci_write_config_word(pdev, pos + PCI_PASID_CTRL, control);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pci_disable_pasid);</div><div class='ctx'> </div><div class='hunk'>@@ -391,22 +409,21 @@ EXPORT_SYMBOL_GPL(pci_disable_pasid);</div><div class='ctx'>  * Returns a negative value when no PASI capability is present.</div><div class='ctx'>  * Otherwise is returns a bitmask with supported features. Current</div><div class='ctx'>  * features reported are:</div><div class='del'>- * PCI_PASID_ENABLE - PASID capability can be enabled</div><div class='del'>- * PCI_PASID_EXEC - Execute permission supported</div><div class='del'>- * PCI_PASID_PRIV - Priviledged mode supported</div><div class='add'>+ * PCI_PASID_CAP_EXEC - Execute permission supported</div><div class='add'>+ * PCI_PASID_CAP_PRIV - Priviledged mode supported</div><div class='ctx'>  */</div><div class='ctx'> int pci_pasid_features(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	u16 supported;</div><div class='ctx'> 	int pos;</div><div class='ctx'> </div><div class='del'>-	pos = pci_find_ext_capability(pdev, PCI_PASID_CAP);</div><div class='add'>+	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PASID);</div><div class='ctx'> 	if (!pos)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	pci_read_config_word(pdev, pos + PCI_PASID_CAP_OFF, &amp;supported);</div><div class='add'>+	pci_read_config_word(pdev, pos + PCI_PASID_CAP, &amp;supported);</div><div class='ctx'> </div><div class='del'>-	supported &amp;= PCI_PASID_ENABLE | PCI_PASID_EXEC | PCI_PASID_PRIV;</div><div class='add'>+	supported &amp;= PCI_PASID_CAP_EXEC | PCI_PASID_CAP_PRIV;</div><div class='ctx'> </div><div class='ctx'> 	return supported;</div><div class='ctx'> }</div><div class='hunk'>@@ -426,11 +443,11 @@ int pci_max_pasids(struct pci_dev *pdev)</div><div class='ctx'> 	u16 supported;</div><div class='ctx'> 	int pos;</div><div class='ctx'> </div><div class='del'>-	pos = pci_find_ext_capability(pdev, PCI_PASID_CAP);</div><div class='add'>+	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PASID);</div><div class='ctx'> 	if (!pos)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	pci_read_config_word(pdev, pos + PCI_PASID_CAP_OFF, &amp;supported);</div><div class='add'>+	pci_read_config_word(pdev, pos + PCI_PASID_CAP, &amp;supported);</div><div class='ctx'> </div><div class='ctx'> 	supported = (supported &amp; PASID_NUMBER_MASK) &gt;&gt; PASID_NUMBER_SHIFT;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c<br/>index 1e2ad92a4752..398f5d859791 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/bus.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/bus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/bus.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/bus.c</a></div><div class='hunk'>@@ -18,6 +18,32 @@</div><div class='ctx'> </div><div class='ctx'> #include "pci.h"</div><div class='ctx'> </div><div class='add'>+void pci_add_resource(struct list_head *resources, struct resource *res)</div><div class='add'>+{</div><div class='add'>+	struct pci_bus_resource *bus_res;</div><div class='add'>+</div><div class='add'>+	bus_res = kzalloc(sizeof(struct pci_bus_resource), GFP_KERNEL);</div><div class='add'>+	if (!bus_res) {</div><div class='add'>+		printk(KERN_ERR "PCI: can't add bus resource %pR\n", res);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bus_res-&gt;res = res;</div><div class='add'>+	list_add_tail(&amp;bus_res-&gt;list, resources);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pci_add_resource);</div><div class='add'>+</div><div class='add'>+void pci_free_resource_list(struct list_head *resources)</div><div class='add'>+{</div><div class='add'>+	struct pci_bus_resource *bus_res, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(bus_res, tmp, resources, list) {</div><div class='add'>+		list_del(&amp;bus_res-&gt;list);</div><div class='add'>+		kfree(bus_res);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pci_free_resource_list);</div><div class='add'>+</div><div class='ctx'> void pci_bus_add_resource(struct pci_bus *bus, struct resource *res,</div><div class='ctx'> 			  unsigned int flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -52,16 +78,12 @@ EXPORT_SYMBOL_GPL(pci_bus_resource_n);</div><div class='ctx'> </div><div class='ctx'> void pci_bus_remove_resources(struct pci_bus *bus)</div><div class='ctx'> {</div><div class='del'>-	struct pci_bus_resource *bus_res, *tmp;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; PCI_BRIDGE_RESOURCE_NUM; i++)</div><div class='ctx'> 		bus-&gt;resource[i] = NULL;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(bus_res, tmp, &amp;bus-&gt;resources, list) {</div><div class='del'>-		list_del(&amp;bus_res-&gt;list);</div><div class='del'>-		kfree(bus_res);</div><div class='del'>-	}</div><div class='add'>+	pci_free_resource_list(&amp;bus-&gt;resources);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c<br/>index 095f29e13734..2a47e82821da 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/acpi_pcihp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/acpi_pcihp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/acpi_pcihp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/hotplug/acpi_pcihp.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@</div><div class='ctx'> #define	METHOD_NAME__SUN	"_SUN"</div><div class='ctx'> #define	METHOD_NAME_OSHP	"OSHP"</div><div class='ctx'> </div><div class='del'>-static int debug_acpi;</div><div class='add'>+static bool debug_acpi;</div><div class='ctx'> </div><div class='ctx'> static acpi_status</div><div class='ctx'> decode_type0_hpx_record(union acpi_object *record, struct hotplug_params *hpx)</div><div class='head'>diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c<br/>index efa9f2de51c1..aa41631e9e02 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/acpiphp_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/acpiphp_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/acpiphp_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/hotplug/acpiphp_core.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@</div><div class='ctx'> /* name size which is used for entries in pcihpfs */</div><div class='ctx'> #define SLOT_NAME_SIZE  21              /* {_SUN} */</div><div class='ctx'> </div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> int acpiphp_debug;</div><div class='ctx'> </div><div class='ctx'> /* local variables */</div><div class='head'>diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c<br/>index e525263210ee..c35e8ad6db01 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/acpiphp_ibm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/acpiphp_ibm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/acpiphp_ibm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/hotplug/acpiphp_ibm.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'> #define DRIVER_AUTHOR	"Irene Zubarev &lt;zubarev@us.ibm.com&gt;, Vernon Mauery &lt;vernux@us.ibm.com&gt;"</div><div class='ctx'> #define DRIVER_DESC	"ACPI Hot Plug PCI Controller Driver IBM extension"</div><div class='ctx'> </div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='head'>diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c<br/>index 41f6a8d79c81..6bf8d2ab164f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpcihp_zt5550.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/cpcihp_zt5550.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpcihp_zt5550.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/hotplug/cpcihp_zt5550.c</a></div><div class='hunk'>@@ -57,8 +57,8 @@</div><div class='ctx'> #define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg)</div><div class='ctx'> </div><div class='ctx'> /* local variables */</div><div class='del'>-static int debug;</div><div class='del'>-static int poll;</div><div class='add'>+static bool debug;</div><div class='add'>+static bool poll;</div><div class='ctx'> static struct cpci_hp_controller_ops zt5550_hpc_ops;</div><div class='ctx'> static struct cpci_hp_controller zt5550_hpc;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c<br/>index f1ce99cceac6..187a199da93c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpqphp_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/cpqphp_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpqphp_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/hotplug/cpqphp_core.c</a></div><div class='hunk'>@@ -57,8 +57,8 @@ struct irq_routing_table *cpqhp_routing_table;</div><div class='ctx'> static void __iomem *smbios_table;</div><div class='ctx'> static void __iomem *smbios_start;</div><div class='ctx'> static void __iomem *cpqhp_rom_start;</div><div class='del'>-static int power_mode;</div><div class='del'>-static int debug;</div><div class='add'>+static bool power_mode;</div><div class='add'>+static bool debug;</div><div class='ctx'> static int initialized;</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_VERSION	"0.9.8"</div><div class='head'>diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c<br/>index d934dd4fa873..5506e0e8fbc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/ibmphp_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/ibmphp_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/ibmphp_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/hotplug/ibmphp_core.c</a></div><div class='hunk'>@@ -49,7 +49,7 @@</div><div class='ctx'> </div><div class='ctx'> int ibmphp_debug;</div><div class='ctx'> </div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> module_param(debug, bool, S_IRUGO | S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC (debug, "Debugging mode enabled or not");</div><div class='ctx'> MODULE_LICENSE ("GPL");</div><div class='head'>diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c<br/>index 6d2eea93298f..202f4a969eb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pci_hotplug_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/pci_hotplug_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pci_hotplug_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/hotplug/pci_hotplug_core.c</a></div><div class='hunk'>@@ -51,7 +51,7 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* local variables */</div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_VERSION	"0.5"</div><div class='ctx'> #define DRIVER_AUTHOR	"Greg Kroah-Hartman &lt;greg@kroah.com&gt;, Scott Murray &lt;scottm@somanetworks.com&gt;"</div><div class='head'>diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h<br/>index 838f571027b7..4b7cce1de6ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pciehp.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/pciehp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pciehp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/hotplug/pciehp.h</a></div><div class='hunk'>@@ -40,12 +40,11 @@</div><div class='ctx'> </div><div class='ctx'> #define MY_NAME	"pciehp"</div><div class='ctx'> </div><div class='del'>-extern int pciehp_poll_mode;</div><div class='add'>+extern bool pciehp_poll_mode;</div><div class='ctx'> extern int pciehp_poll_time;</div><div class='del'>-extern int pciehp_debug;</div><div class='del'>-extern int pciehp_force;</div><div class='add'>+extern bool pciehp_debug;</div><div class='add'>+extern bool pciehp_force;</div><div class='ctx'> extern struct workqueue_struct *pciehp_wq;</div><div class='del'>-extern struct workqueue_struct *pciehp_ordered_wq;</div><div class='ctx'> </div><div class='ctx'> #define dbg(format, arg...)						\</div><div class='ctx'> do {									\</div><div class='head'>diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c<br/>index 7ac8358df8fd..365c6b96c642 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pciehp_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/pciehp_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pciehp_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/hotplug/pciehp_core.c</a></div><div class='hunk'>@@ -38,12 +38,11 @@</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Global variables */</div><div class='del'>-int pciehp_debug;</div><div class='del'>-int pciehp_poll_mode;</div><div class='add'>+bool pciehp_debug;</div><div class='add'>+bool pciehp_poll_mode;</div><div class='ctx'> int pciehp_poll_time;</div><div class='del'>-int pciehp_force;</div><div class='add'>+bool pciehp_force;</div><div class='ctx'> struct workqueue_struct *pciehp_wq;</div><div class='del'>-struct workqueue_struct *pciehp_ordered_wq;</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_VERSION	"0.4"</div><div class='ctx'> #define DRIVER_AUTHOR	"Dan Zink &lt;dan.zink@compaq.com&gt;, Greg Kroah-Hartman &lt;greg@kroah.com&gt;, Dely Sy &lt;dely.l.sy@intel.com&gt;"</div><div class='hunk'>@@ -345,18 +344,11 @@ static int __init pcied_init(void)</div><div class='ctx'> 	if (!pciehp_wq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	pciehp_ordered_wq = alloc_ordered_workqueue("pciehp_ordered", 0);</div><div class='del'>-	if (!pciehp_ordered_wq) {</div><div class='del'>-		destroy_workqueue(pciehp_wq);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	pciehp_firmware_init();</div><div class='ctx'> 	retval = pcie_port_service_register(&amp;hpdriver_portdrv);</div><div class='ctx'>  	dbg("pcie_port_service_register = %d\n", retval);</div><div class='ctx'>   	info(DRIVER_DESC " version: " DRIVER_VERSION "\n");</div><div class='ctx'>  	if (retval) {</div><div class='del'>-		destroy_workqueue(pciehp_ordered_wq);</div><div class='ctx'> 		destroy_workqueue(pciehp_wq);</div><div class='ctx'> 		dbg("Failure to register service\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -366,9 +358,8 @@ static int __init pcied_init(void)</div><div class='ctx'> static void __exit pcied_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	dbg("unload_pciehpd()\n");</div><div class='del'>-	destroy_workqueue(pciehp_ordered_wq);</div><div class='del'>-	destroy_workqueue(pciehp_wq);</div><div class='ctx'> 	pcie_port_service_unregister(&amp;hpdriver_portdrv);</div><div class='add'>+	destroy_workqueue(pciehp_wq);</div><div class='ctx'> 	info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c<br/>index 085dbb5fc168..27f44295a657 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pciehp_ctrl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/pciehp_ctrl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pciehp_ctrl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/hotplug/pciehp_ctrl.c</a></div><div class='hunk'>@@ -344,7 +344,7 @@ void pciehp_queue_pushbutton_work(struct work_struct *work)</div><div class='ctx'> 		kfree(info);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	queue_work(pciehp_ordered_wq, &amp;info-&gt;work);</div><div class='add'>+	queue_work(pciehp_wq, &amp;info-&gt;work);</div><div class='ctx'>  out:</div><div class='ctx'> 	mutex_unlock(&amp;p_slot-&gt;lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -439,7 +439,7 @@ static void handle_surprise_event(struct slot *p_slot)</div><div class='ctx'> 	else</div><div class='ctx'> 		p_slot-&gt;state = POWERON_STATE;</div><div class='ctx'> </div><div class='del'>-	queue_work(pciehp_ordered_wq, &amp;info-&gt;work);</div><div class='add'>+	queue_work(pciehp_wq, &amp;info-&gt;work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void interrupt_event_handler(struct work_struct *work)</div><div class='head'>diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c<br/>index 7b1414810ae3..bcdbb1643621 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pciehp_hpc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/pciehp_hpc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pciehp_hpc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/hotplug/pciehp_hpc.c</a></div><div class='hunk'>@@ -806,7 +806,6 @@ static void pcie_cleanup_slot(struct controller *ctrl)</div><div class='ctx'> 	struct slot *slot = ctrl-&gt;slot;</div><div class='ctx'> 	cancel_delayed_work(&amp;slot-&gt;work);</div><div class='ctx'> 	flush_workqueue(pciehp_wq);</div><div class='del'>-	flush_workqueue(pciehp_ordered_wq);</div><div class='ctx'> 	kfree(slot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pci/hotplug/pcihp_skeleton.c b/drivers/pci/hotplug/pcihp_skeleton.c<br/>index 5175d9b26f0b..b20ceaaa31f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pcihp_skeleton.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/pcihp_skeleton.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pcihp_skeleton.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/hotplug/pcihp_skeleton.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@ static LIST_HEAD(slot_list);</div><div class='ctx'> #define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg)</div><div class='ctx'> </div><div class='ctx'> /* local variables */</div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> static int num_slots;</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_VERSION	"0.3"</div><div class='head'>diff --git a/drivers/pci/hotplug/rpaphp.h b/drivers/pci/hotplug/rpaphp.h<br/>index 419919a87b0f..df5677440a08 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/rpaphp.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/rpaphp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/rpaphp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/hotplug/rpaphp.h</a></div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> #define PRESENT         1	/* Card in slot */</div><div class='ctx'> </div><div class='ctx'> #define MY_NAME "rpaphp"</div><div class='del'>-extern int rpaphp_debug;</div><div class='add'>+extern bool rpaphp_debug;</div><div class='ctx'> #define dbg(format, arg...)					\</div><div class='ctx'> 	do {							\</div><div class='ctx'> 		if (rpaphp_debug)					\</div><div class='head'>diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c<br/>index 758adb5f47fd..127d6e600185 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/rpaphp_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/rpaphp_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/rpaphp_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/hotplug/rpaphp_core.c</a></div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'> 				/* and pci_do_scan_bus */</div><div class='ctx'> #include "rpaphp.h"</div><div class='ctx'> </div><div class='del'>-int rpaphp_debug;</div><div class='add'>+bool rpaphp_debug;</div><div class='ctx'> LIST_HEAD(rpaphp_slot_head);</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_VERSION	"0.1"</div><div class='head'>diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h<br/>index e0c90e643b5f..ca64932e658b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/shpchp.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/shpchp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/shpchp.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/hotplug/shpchp.h</a></div><div class='hunk'>@@ -43,9 +43,9 @@</div><div class='ctx'> 	#define MY_NAME	THIS_MODULE-&gt;name</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern int shpchp_poll_mode;</div><div class='add'>+extern bool shpchp_poll_mode;</div><div class='ctx'> extern int shpchp_poll_time;</div><div class='del'>-extern int shpchp_debug;</div><div class='add'>+extern bool shpchp_debug;</div><div class='ctx'> extern struct workqueue_struct *shpchp_wq;</div><div class='ctx'> extern struct workqueue_struct *shpchp_ordered_wq;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c<br/>index dd7e0c51a33e..7414fd9ad1d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/shpchp_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/hotplug/shpchp_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/shpchp_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/hotplug/shpchp_core.c</a></div><div class='hunk'>@@ -36,8 +36,8 @@</div><div class='ctx'> #include "shpchp.h"</div><div class='ctx'> </div><div class='ctx'> /* Global variables */</div><div class='del'>-int shpchp_debug;</div><div class='del'>-int shpchp_poll_mode;</div><div class='add'>+bool shpchp_debug;</div><div class='add'>+bool shpchp_poll_mode;</div><div class='ctx'> int shpchp_poll_time;</div><div class='ctx'> struct workqueue_struct *shpchp_wq;</div><div class='ctx'> struct workqueue_struct *shpchp_ordered_wq;</div><div class='head'>diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c<br/>index 1969a3ee3058..0321fa3b4226 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/iov.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/iov.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/iov.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/iov.c</a></div><div class='hunk'>@@ -347,11 +347,13 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	pci_write_config_dword(dev, iov-&gt;pos + PCI_SRIOV_SYS_PGSIZE, iov-&gt;pgsz);</div><div class='add'>+</div><div class='ctx'> 	iov-&gt;ctrl |= PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE;</div><div class='del'>-	pci_block_user_cfg_access(dev);</div><div class='add'>+	pci_cfg_access_lock(dev);</div><div class='ctx'> 	pci_write_config_word(dev, iov-&gt;pos + PCI_SRIOV_CTRL, iov-&gt;ctrl);</div><div class='ctx'> 	msleep(100);</div><div class='del'>-	pci_unblock_user_cfg_access(dev);</div><div class='add'>+	pci_cfg_access_unlock(dev);</div><div class='ctx'> </div><div class='ctx'> 	iov-&gt;initial = initial;</div><div class='ctx'> 	if (nr_virtfn &lt; initial)</div><div class='hunk'>@@ -379,10 +381,10 @@ failed:</div><div class='ctx'> 		virtfn_remove(dev, j, 0);</div><div class='ctx'> </div><div class='ctx'> 	iov-&gt;ctrl &amp;= ~(PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE);</div><div class='del'>-	pci_block_user_cfg_access(dev);</div><div class='add'>+	pci_cfg_access_lock(dev);</div><div class='ctx'> 	pci_write_config_word(dev, iov-&gt;pos + PCI_SRIOV_CTRL, iov-&gt;ctrl);</div><div class='ctx'> 	ssleep(1);</div><div class='del'>-	pci_unblock_user_cfg_access(dev);</div><div class='add'>+	pci_cfg_access_unlock(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (iov-&gt;link != dev-&gt;devfn)</div><div class='ctx'> 		sysfs_remove_link(&amp;dev-&gt;dev.kobj, "dep_link");</div><div class='hunk'>@@ -405,10 +407,10 @@ static void sriov_disable(struct pci_dev *dev)</div><div class='ctx'> 		virtfn_remove(dev, i, 0);</div><div class='ctx'> </div><div class='ctx'> 	iov-&gt;ctrl &amp;= ~(PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE);</div><div class='del'>-	pci_block_user_cfg_access(dev);</div><div class='add'>+	pci_cfg_access_lock(dev);</div><div class='ctx'> 	pci_write_config_word(dev, iov-&gt;pos + PCI_SRIOV_CTRL, iov-&gt;ctrl);</div><div class='ctx'> 	ssleep(1);</div><div class='del'>-	pci_unblock_user_cfg_access(dev);</div><div class='add'>+	pci_cfg_access_unlock(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (iov-&gt;link != dev-&gt;devfn)</div><div class='ctx'> 		sysfs_remove_link(&amp;dev-&gt;dev.kobj, "dep_link");</div><div class='hunk'>@@ -452,7 +454,6 @@ static int sriov_init(struct pci_dev *dev, int pos)</div><div class='ctx'> </div><div class='ctx'> found:</div><div class='ctx'> 	pci_write_config_word(dev, pos + PCI_SRIOV_CTRL, ctrl);</div><div class='del'>-	pci_write_config_word(dev, pos + PCI_SRIOV_NUM_VF, total);</div><div class='ctx'> 	pci_read_config_word(dev, pos + PCI_SRIOV_VF_OFFSET, &amp;offset);</div><div class='ctx'> 	pci_read_config_word(dev, pos + PCI_SRIOV_VF_STRIDE, &amp;stride);</div><div class='ctx'> 	if (!offset || (total &gt; 1 &amp;&amp; !stride))</div><div class='hunk'>@@ -465,7 +466,6 @@ found:</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	pgsz &amp;= ~(pgsz - 1);</div><div class='del'>-	pci_write_config_dword(dev, pos + PCI_SRIOV_SYS_PGSIZE, pgsz);</div><div class='ctx'> </div><div class='ctx'> 	nres = 0;</div><div class='ctx'> 	for (i = 0; i &lt; PCI_SRIOV_NUM_BARS; i++) {</div><div class='head'>diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c<br/>index 0e6d04d7ba4f..a825d78fd0aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/msi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/msi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/msi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/msi.c</a></div><div class='hunk'>@@ -86,6 +86,31 @@ void default_teardown_msi_irqs(struct pci_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef arch_restore_msi_irqs</div><div class='add'>+# define arch_restore_msi_irqs default_restore_msi_irqs</div><div class='add'>+# define HAVE_DEFAULT_MSI_RESTORE_IRQS</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef HAVE_DEFAULT_MSI_RESTORE_IRQS</div><div class='add'>+void default_restore_msi_irqs(struct pci_dev *dev, int irq)</div><div class='add'>+{</div><div class='add'>+	struct msi_desc *entry;</div><div class='add'>+</div><div class='add'>+	entry = NULL;</div><div class='add'>+	if (dev-&gt;msix_enabled) {</div><div class='add'>+		list_for_each_entry(entry, &amp;dev-&gt;msi_list, list) {</div><div class='add'>+			if (irq == entry-&gt;irq)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	} else if (dev-&gt;msi_enabled)  {</div><div class='add'>+		entry = irq_get_msi_desc(irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (entry)</div><div class='add'>+		write_msi_msg(irq, &amp;entry-&gt;msg);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void msi_set_enable(struct pci_dev *dev, int pos, int enable)</div><div class='ctx'> {</div><div class='ctx'> 	u16 control;</div><div class='hunk'>@@ -323,6 +348,18 @@ static void free_msi_irqs(struct pci_dev *dev)</div><div class='ctx'> 			if (list_is_last(&amp;entry-&gt;list, &amp;dev-&gt;msi_list))</div><div class='ctx'> 				iounmap(entry-&gt;mask_base);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Its possible that we get into this path</div><div class='add'>+		 * When populate_msi_sysfs fails, which means the entries</div><div class='add'>+		 * were not registered with sysfs.  In that case don't</div><div class='add'>+		 * unregister them.</div><div class='add'>+		 */</div><div class='add'>+		if (entry-&gt;kobj.parent) {</div><div class='add'>+			kobject_del(&amp;entry-&gt;kobj);</div><div class='add'>+			kobject_put(&amp;entry-&gt;kobj);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		list_del(&amp;entry-&gt;list);</div><div class='ctx'> 		kfree(entry);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -360,7 +397,7 @@ static void __pci_restore_msi_state(struct pci_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	pci_intx_for_msi(dev, 0);</div><div class='ctx'> 	msi_set_enable(dev, pos, 0);</div><div class='del'>-	write_msi_msg(dev-&gt;irq, &amp;entry-&gt;msg);</div><div class='add'>+	arch_restore_msi_irqs(dev, dev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &amp;control);</div><div class='ctx'> 	msi_mask_irq(entry, msi_capable_mask(control), entry-&gt;masked);</div><div class='hunk'>@@ -388,7 +425,7 @@ static void __pci_restore_msix_state(struct pci_dev *dev)</div><div class='ctx'> 	pci_write_config_word(dev, pos + PCI_MSIX_FLAGS, control);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(entry, &amp;dev-&gt;msi_list, list) {</div><div class='del'>-		write_msi_msg(entry-&gt;irq, &amp;entry-&gt;msg);</div><div class='add'>+		arch_restore_msi_irqs(dev, entry-&gt;irq);</div><div class='ctx'> 		msix_mask_irq(entry, entry-&gt;masked);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -403,6 +440,98 @@ void pci_restore_msi_state(struct pci_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pci_restore_msi_state);</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+#define to_msi_attr(obj) container_of(obj, struct msi_attribute, attr)</div><div class='add'>+#define to_msi_desc(obj) container_of(obj, struct msi_desc, kobj)</div><div class='add'>+</div><div class='add'>+struct msi_attribute {</div><div class='add'>+	struct attribute        attr;</div><div class='add'>+	ssize_t (*show)(struct msi_desc *entry, struct msi_attribute *attr,</div><div class='add'>+			char *buf);</div><div class='add'>+	ssize_t (*store)(struct msi_desc *entry, struct msi_attribute *attr,</div><div class='add'>+			 const char *buf, size_t count);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t show_msi_mode(struct msi_desc *entry, struct msi_attribute *atr,</div><div class='add'>+			     char *buf)</div><div class='add'>+{</div><div class='add'>+	return sprintf(buf, "%s\n", entry-&gt;msi_attrib.is_msix ? "msix" : "msi");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t msi_irq_attr_show(struct kobject *kobj,</div><div class='add'>+				 struct attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct msi_attribute *attribute = to_msi_attr(attr);</div><div class='add'>+	struct msi_desc *entry = to_msi_desc(kobj);</div><div class='add'>+</div><div class='add'>+	if (!attribute-&gt;show)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return attribute-&gt;show(entry, attribute, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct sysfs_ops msi_irq_sysfs_ops = {</div><div class='add'>+	.show = msi_irq_attr_show,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct msi_attribute mode_attribute =</div><div class='add'>+	__ATTR(mode, S_IRUGO, show_msi_mode, NULL);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct attribute *msi_irq_default_attrs[] = {</div><div class='add'>+	&amp;mode_attribute.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void msi_kobj_release(struct kobject *kobj)</div><div class='add'>+{</div><div class='add'>+	struct msi_desc *entry = to_msi_desc(kobj);</div><div class='add'>+</div><div class='add'>+	pci_dev_put(entry-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kobj_type msi_irq_ktype = {</div><div class='add'>+	.release = msi_kobj_release,</div><div class='add'>+	.sysfs_ops = &amp;msi_irq_sysfs_ops,</div><div class='add'>+	.default_attrs = msi_irq_default_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int populate_msi_sysfs(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct msi_desc *entry;</div><div class='add'>+	struct kobject *kobj;</div><div class='add'>+	int ret;</div><div class='add'>+	int count = 0;</div><div class='add'>+</div><div class='add'>+	pdev-&gt;msi_kset = kset_create_and_add("msi_irqs", NULL, &amp;pdev-&gt;dev.kobj);</div><div class='add'>+	if (!pdev-&gt;msi_kset)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(entry, &amp;pdev-&gt;msi_list, list) {</div><div class='add'>+		kobj = &amp;entry-&gt;kobj;</div><div class='add'>+		kobj-&gt;kset = pdev-&gt;msi_kset;</div><div class='add'>+		pci_dev_get(pdev);</div><div class='add'>+		ret = kobject_init_and_add(kobj, &amp;msi_irq_ktype, NULL,</div><div class='add'>+				     "%u", entry-&gt;irq);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_unroll;</div><div class='add'>+</div><div class='add'>+		count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_unroll:</div><div class='add'>+	list_for_each_entry(entry, &amp;pdev-&gt;msi_list, list) {</div><div class='add'>+		if (!count)</div><div class='add'>+			break;</div><div class='add'>+		kobject_del(&amp;entry-&gt;kobj);</div><div class='add'>+		kobject_put(&amp;entry-&gt;kobj);</div><div class='add'>+		count--;</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'>  * msi_capability_init - configure device's MSI capability structure</div><div class='ctx'>  * @dev: pointer to the pci_dev data structure of MSI device function</div><div class='hunk'>@@ -454,6 +583,13 @@ static int msi_capability_init(struct pci_dev *dev, int nvec)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = populate_msi_sysfs(dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		msi_mask_irq(entry, mask, ~mask);</div><div class='add'>+		free_msi_irqs(dev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Set MSI enabled bits	 */</div><div class='ctx'> 	pci_intx_for_msi(dev, 0);</div><div class='ctx'> 	msi_set_enable(dev, pos, 1);</div><div class='hunk'>@@ -574,6 +710,12 @@ static int msix_capability_init(struct pci_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	msix_program_entries(dev, entries);</div><div class='ctx'> </div><div class='add'>+	ret = populate_msi_sysfs(dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Set MSI-X enabled bits and unmask the function */</div><div class='ctx'> 	pci_intx_for_msi(dev, 0);</div><div class='ctx'> 	dev-&gt;msix_enabled = 1;</div><div class='hunk'>@@ -732,6 +874,8 @@ void pci_disable_msi(struct pci_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	pci_msi_shutdown(dev);</div><div class='ctx'> 	free_msi_irqs(dev);</div><div class='add'>+	kset_unregister(dev-&gt;msi_kset);</div><div class='add'>+	dev-&gt;msi_kset = NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pci_disable_msi);</div><div class='ctx'> </div><div class='hunk'>@@ -830,6 +974,8 @@ void pci_disable_msix(struct pci_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	pci_msix_shutdown(dev);</div><div class='ctx'> 	free_msi_irqs(dev);</div><div class='add'>+	kset_unregister(dev-&gt;msi_kset);</div><div class='add'>+	dev-&gt;msi_kset = NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pci_disable_msix);</div><div class='ctx'> </div><div class='hunk'>@@ -870,5 +1016,15 @@ EXPORT_SYMBOL(pci_msi_enabled);</div><div class='ctx'> </div><div class='ctx'> void pci_msi_init_pci_dev(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='add'>+	int pos;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;msi_list);</div><div class='add'>+</div><div class='add'>+	/* Disable the msi hardware to avoid screaming interrupts</div><div class='add'>+	 * during boot.  This is the power on reset default so</div><div class='add'>+	 * usually this should be a noop.</div><div class='add'>+	 */</div><div class='add'>+	pos = pci_find_capability(dev, PCI_CAP_ID_MSI);</div><div class='add'>+	if (pos)</div><div class='add'>+		msi_set_enable(dev, pos, 0);</div><div class='add'>+	msix_set_enable(dev, 0);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c<br/>index 4ecb6408b0d6..060fd22a1103 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/pci-acpi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pci-acpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/pci-acpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/pci-acpi.c</a></div><div class='hunk'>@@ -45,16 +45,20 @@ static void pci_acpi_wake_dev(acpi_handle handle, u32 event, void *context)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pci_dev = context;</div><div class='ctx'> </div><div class='del'>-	if (event == ACPI_NOTIFY_DEVICE_WAKE &amp;&amp; pci_dev) {</div><div class='add'>+	if (event != ACPI_NOTIFY_DEVICE_WAKE || !pci_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!pci_dev-&gt;pm_cap || !pci_dev-&gt;pme_support</div><div class='add'>+	     || pci_check_pme_status(pci_dev)) {</div><div class='ctx'> 		if (pci_dev-&gt;pme_poll)</div><div class='ctx'> 			pci_dev-&gt;pme_poll = false;</div><div class='ctx'> </div><div class='ctx'> 		pci_wakeup_event(pci_dev);</div><div class='del'>-		pci_check_pme_status(pci_dev);</div><div class='ctx'> 		pm_runtime_resume(&amp;pci_dev-&gt;dev);</div><div class='del'>-		if (pci_dev-&gt;subordinate)</div><div class='del'>-			pci_pme_wakeup_bus(pci_dev-&gt;subordinate);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (pci_dev-&gt;subordinate)</div><div class='add'>+		pci_pme_wakeup_bus(pci_dev-&gt;subordinate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -395,7 +399,6 @@ static int __init acpi_pci_init(void)</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_gbl_FADT.boot_flags &amp; ACPI_FADT_NO_ASPM) {</div><div class='ctx'> 		printk(KERN_INFO"ACPI FADT declares the system doesn't support PCIe ASPM, so disable it\n");</div><div class='del'>-		pcie_clear_aspm();</div><div class='ctx'> 		pcie_no_aspm();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c<br/>index 12d1e81a8abe..3623d65f8b86 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/pci-driver.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pci-driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/pci-driver.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/pci-driver.c</a></div><div class='hunk'>@@ -604,7 +604,8 @@ static bool pci_has_legacy_pm_support(struct pci_dev *pci_dev)</div><div class='ctx'> 	 * supported as well.  Drivers are supposed to support either the</div><div class='ctx'> 	 * former, or the latter, but not both at the same time.</div><div class='ctx'> 	 */</div><div class='del'>-	WARN_ON(ret &amp;&amp; drv-&gt;driver.pm);</div><div class='add'>+	WARN(ret &amp;&amp; drv-&gt;driver.pm, "driver %s device %04x:%04x\n",</div><div class='add'>+		drv-&gt;name, pci_dev-&gt;vendor, pci_dev-&gt;device);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/pci/pci-label.c b/drivers/pci/pci-label.c<br/>index 81525ae5d869..edaed6f4da6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/pci-label.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pci-label.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/pci-label.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/pci-label.c</a></div><div class='hunk'>@@ -89,7 +89,7 @@ find_smbios_instance_string(struct pci_dev *pdev, char *buf,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static mode_t</div><div class='add'>+static umode_t</div><div class='ctx'> smbios_instance_string_exist(struct kobject *kobj, struct attribute *attr,</div><div class='ctx'> 			     int n)</div><div class='ctx'> {</div><div class='hunk'>@@ -275,7 +275,7 @@ device_has_dsm(struct device *dev)</div><div class='ctx'> 	return FALSE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static mode_t</div><div class='add'>+static umode_t</div><div class='ctx'> acpi_index_string_exist(struct kobject *kobj, struct attribute *attr, int n)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev;</div><div class='head'>diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c<br/>index 106be0d08f81..a3cd8cad532a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/pci-sysfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pci-sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/pci-sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/pci-sysfs.c</a></div><div class='hunk'>@@ -432,7 +432,7 @@ pci_read_config(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 	u8 *data = (u8*) buf;</div><div class='ctx'> </div><div class='ctx'> 	/* Several chips lock up trying to read undefined config space */</div><div class='del'>-	if (security_capable(&amp;init_user_ns, filp-&gt;f_cred, CAP_SYS_ADMIN) == 0) {</div><div class='add'>+	if (security_capable(filp-&gt;f_cred, &amp;init_user_ns, CAP_SYS_ADMIN) == 0) {</div><div class='ctx'> 		size = dev-&gt;cfg_size;</div><div class='ctx'> 	} else if (dev-&gt;hdr_type == PCI_HEADER_TYPE_CARDBUS) {</div><div class='ctx'> 		size = 128;</div><div class='head'>diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c<br/>index 6d4a5319148d..97fff785e97e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/pci.c</a></div><div class='hunk'>@@ -88,6 +88,12 @@ enum pcie_bus_config_types pcie_bus_config = PCIE_BUS_TUNE_OFF;</div><div class='ctx'> u8 pci_dfl_cache_line_size __devinitdata = L1_CACHE_BYTES &gt;&gt; 2;</div><div class='ctx'> u8 pci_cache_line_size;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * If we set up a device for bus mastering, we need to check the latency</div><div class='add'>+ * timer as certain BIOSes forget to set it properly.</div><div class='add'>+ */</div><div class='add'>+unsigned int pcibios_max_latency = 255;</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * pci_bus_max_busnr - returns maximum PCI bus number of given bus' children</div><div class='ctx'>  * @bus: pointer to PCI bus structure to search</div><div class='hunk'>@@ -959,6 +965,7 @@ void pci_restore_state(struct pci_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* PCI Express register must be restored first */</div><div class='ctx'> 	pci_restore_pcie_state(dev);</div><div class='add'>+	pci_restore_ats_state(dev);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The Base Address register should be programmed before the command</div><div class='hunk'>@@ -967,7 +974,7 @@ void pci_restore_state(struct pci_dev *dev)</div><div class='ctx'> 	for (i = 15; i &gt;= 0; i--) {</div><div class='ctx'> 		pci_read_config_dword(dev, i * 4, &amp;val);</div><div class='ctx'> 		if (val != dev-&gt;saved_config_space[i]) {</div><div class='del'>-			dev_printk(KERN_DEBUG, &amp;dev-&gt;dev, "restoring config "</div><div class='add'>+			dev_dbg(&amp;dev-&gt;dev, "restoring config "</div><div class='ctx'> 				"space at offset %#x (was %#x, writing %#x)\n",</div><div class='ctx'> 				i, val, (int)dev-&gt;saved_config_space[i]);</div><div class='ctx'> 			pci_write_config_dword(dev,i * 4,</div><div class='hunk'>@@ -1536,8 +1543,7 @@ void pci_pme_active(struct pci_dev *dev, bool enable)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	dev_printk(KERN_DEBUG, &amp;dev-&gt;dev, "PME# %s\n",</div><div class='del'>-			enable ? "enabled" : "disabled");</div><div class='add'>+	dev_dbg(&amp;dev-&gt;dev, "PME# %s\n", enable ? "enabled" : "disabled");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2596,6 +2602,33 @@ static void __pci_set_master(struct pci_dev *dev, bool enable)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * pcibios_set_master - enable PCI bus-mastering for device dev</div><div class='add'>+ * @dev: the PCI device to enable</div><div class='add'>+ *</div><div class='add'>+ * Enables PCI bus-mastering for the device.  This is the default</div><div class='add'>+ * implementation.  Architecture specific implementations can override</div><div class='add'>+ * this if necessary.</div><div class='add'>+ */</div><div class='add'>+void __weak pcibios_set_master(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u8 lat;</div><div class='add'>+</div><div class='add'>+	/* The latency timer doesn't apply to PCIe (either Type 0 or Type 1) */</div><div class='add'>+	if (pci_is_pcie(dev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pci_read_config_byte(dev, PCI_LATENCY_TIMER, &amp;lat);</div><div class='add'>+	if (lat &lt; 16)</div><div class='add'>+		lat = (64 &lt;= pcibios_max_latency) ? 64 : pcibios_max_latency;</div><div class='add'>+	else if (lat &gt; pcibios_max_latency)</div><div class='add'>+		lat = pcibios_max_latency;</div><div class='add'>+	else</div><div class='add'>+		return;</div><div class='add'>+	dev_printk(KERN_DEBUG, &amp;dev-&gt;dev, "setting latency timer to %d\n", lat);</div><div class='add'>+	pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * pci_set_master - enables bus-mastering for device dev</div><div class='ctx'>  * @dev: the PCI device to enable</div><div class='ctx'>  *</div><div class='hunk'>@@ -2768,6 +2801,116 @@ pci_intx(struct pci_dev *pdev, int enable)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * pci_intx_mask_supported - probe for INTx masking support</div><div class='add'>+ * @pdev: the PCI device to operate on</div><div class='add'>+ *</div><div class='add'>+ * Check if the device dev support INTx masking via the config space</div><div class='add'>+ * command word.</div><div class='add'>+ */</div><div class='add'>+bool pci_intx_mask_supported(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	bool mask_supported = false;</div><div class='add'>+	u16 orig, new;</div><div class='add'>+</div><div class='add'>+	pci_cfg_access_lock(dev);</div><div class='add'>+</div><div class='add'>+	pci_read_config_word(dev, PCI_COMMAND, &amp;orig);</div><div class='add'>+	pci_write_config_word(dev, PCI_COMMAND,</div><div class='add'>+			      orig ^ PCI_COMMAND_INTX_DISABLE);</div><div class='add'>+	pci_read_config_word(dev, PCI_COMMAND, &amp;new);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * There's no way to protect against hardware bugs or detect them</div><div class='add'>+	 * reliably, but as long as we know what the value should be, let's</div><div class='add'>+	 * go ahead and check it.</div><div class='add'>+	 */</div><div class='add'>+	if ((new ^ orig) &amp; ~PCI_COMMAND_INTX_DISABLE) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Command register changed from "</div><div class='add'>+			"0x%x to 0x%x: driver or hardware bug?\n", orig, new);</div><div class='add'>+	} else if ((new ^ orig) &amp; PCI_COMMAND_INTX_DISABLE) {</div><div class='add'>+		mask_supported = true;</div><div class='add'>+		pci_write_config_word(dev, PCI_COMMAND, orig);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_cfg_access_unlock(dev);</div><div class='add'>+	return mask_supported;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pci_intx_mask_supported);</div><div class='add'>+</div><div class='add'>+static bool pci_check_and_set_intx_mask(struct pci_dev *dev, bool mask)</div><div class='add'>+{</div><div class='add'>+	struct pci_bus *bus = dev-&gt;bus;</div><div class='add'>+	bool mask_updated = true;</div><div class='add'>+	u32 cmd_status_dword;</div><div class='add'>+	u16 origcmd, newcmd;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	bool irq_pending;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We do a single dword read to retrieve both command and status.</div><div class='add'>+	 * Document assumptions that make this possible.</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(PCI_COMMAND % 4);</div><div class='add'>+	BUILD_BUG_ON(PCI_COMMAND + 2 != PCI_STATUS);</div><div class='add'>+</div><div class='add'>+	raw_spin_lock_irqsave(&amp;pci_lock, flags);</div><div class='add'>+</div><div class='add'>+	bus-&gt;ops-&gt;read(bus, dev-&gt;devfn, PCI_COMMAND, 4, &amp;cmd_status_dword);</div><div class='add'>+</div><div class='add'>+	irq_pending = (cmd_status_dword &gt;&gt; 16) &amp; PCI_STATUS_INTERRUPT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check interrupt status register to see whether our device</div><div class='add'>+	 * triggered the interrupt (when masking) or the next IRQ is</div><div class='add'>+	 * already pending (when unmasking).</div><div class='add'>+	 */</div><div class='add'>+	if (mask != irq_pending) {</div><div class='add'>+		mask_updated = false;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	origcmd = cmd_status_dword;</div><div class='add'>+	newcmd = origcmd &amp; ~PCI_COMMAND_INTX_DISABLE;</div><div class='add'>+	if (mask)</div><div class='add'>+		newcmd |= PCI_COMMAND_INTX_DISABLE;</div><div class='add'>+	if (newcmd != origcmd)</div><div class='add'>+		bus-&gt;ops-&gt;write(bus, dev-&gt;devfn, PCI_COMMAND, 2, newcmd);</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	raw_spin_unlock_irqrestore(&amp;pci_lock, flags);</div><div class='add'>+</div><div class='add'>+	return mask_updated;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pci_check_and_mask_intx - mask INTx on pending interrupt</div><div class='add'>+ * @pdev: the PCI device to operate on</div><div class='add'>+ *</div><div class='add'>+ * Check if the device dev has its INTx line asserted, mask it and</div><div class='add'>+ * return true in that case. False is returned if not interrupt was</div><div class='add'>+ * pending.</div><div class='add'>+ */</div><div class='add'>+bool pci_check_and_mask_intx(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return pci_check_and_set_intx_mask(dev, true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pci_check_and_mask_intx);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pci_check_and_mask_intx - unmask INTx of no interrupt is pending</div><div class='add'>+ * @pdev: the PCI device to operate on</div><div class='add'>+ *</div><div class='add'>+ * Check if the device dev has its INTx line asserted, unmask it if not</div><div class='add'>+ * and return true. False is returned and the mask remains active if</div><div class='add'>+ * there was still an interrupt pending.</div><div class='add'>+ */</div><div class='add'>+bool pci_check_and_unmask_intx(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return pci_check_and_set_intx_mask(dev, false);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pci_check_and_unmask_intx);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * pci_msi_off - disables any msi or msix capabilities</div><div class='ctx'>  * @dev: the PCI device to operate on</div><div class='ctx'>  *</div><div class='hunk'>@@ -2965,7 +3108,7 @@ static int pci_dev_reset(struct pci_dev *dev, int probe)</div><div class='ctx'> 	might_sleep();</div><div class='ctx'> </div><div class='ctx'> 	if (!probe) {</div><div class='del'>-		pci_block_user_cfg_access(dev);</div><div class='add'>+		pci_cfg_access_lock(dev);</div><div class='ctx'> 		/* block PM suspend, driver probe, etc. */</div><div class='ctx'> 		device_lock(&amp;dev-&gt;dev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2990,7 +3133,7 @@ static int pci_dev_reset(struct pci_dev *dev, int probe)</div><div class='ctx'> done:</div><div class='ctx'> 	if (!probe) {</div><div class='ctx'> 		device_unlock(&amp;dev-&gt;dev);</div><div class='del'>-		pci_unblock_user_cfg_access(dev);</div><div class='add'>+		pci_cfg_access_unlock(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='head'>diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h<br/>index b74084e9ca12..1009a5e88e53 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/pci.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/pci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/pci.h</a></div><div class='hunk'>@@ -136,6 +136,8 @@ static inline void pci_remove_legacy_files(struct pci_bus *bus) { return; }</div><div class='ctx'> /* Lock for read/write access to pci device and bus lists */</div><div class='ctx'> extern struct rw_semaphore pci_bus_sem;</div><div class='ctx'> </div><div class='add'>+extern raw_spinlock_t pci_lock;</div><div class='add'>+</div><div class='ctx'> extern unsigned int pci_pm_d3_delay;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI_MSI</div><div class='hunk'>@@ -249,6 +251,14 @@ struct pci_sriov {</div><div class='ctx'> 	u8 __iomem *mstate;	/* VF Migration State Array */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PCI_ATS</div><div class='add'>+extern void pci_restore_ats_state(struct pci_dev *dev);</div><div class='add'>+#else</div><div class='add'>+static inline void pci_restore_ats_state(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PCI_ATS */</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PCI_IOV</div><div class='ctx'> extern int pci_iov_init(struct pci_dev *dev);</div><div class='ctx'> extern void pci_iov_release(struct pci_dev *dev);</div><div class='head'>diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig<br/>index dc29348264c6..72962cc92e0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/pcie/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pcie/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/pcie/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/pcie/Kconfig</a></div><div class='hunk'>@@ -39,7 +39,7 @@ config PCIEASPM</div><div class='ctx'> 	  Power Management) and Clock Power Management. ASPM supports</div><div class='ctx'> 	  state L0/L0s/L1.</div><div class='ctx'> </div><div class='del'>-	  ASPM is initially set up the the firmware. With this option enabled,</div><div class='add'>+	  ASPM is initially set up by the firmware. With this option enabled,</div><div class='ctx'> 	  Linux can modify this state in order to disable ASPM on known-bad</div><div class='ctx'> 	  hardware or configurations and enable it when known-safe.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c<br/>index 95489cd9a555..52229863e9fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/pcie/aer/aer_inject.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pcie/aer/aer_inject.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/pcie/aer/aer_inject.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/pcie/aer/aer_inject.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include "aerdrv.h"</div><div class='ctx'> </div><div class='ctx'> /* Override the existing corrected and uncorrected error masks */</div><div class='del'>-static int aer_mask_override;</div><div class='add'>+static bool aer_mask_override;</div><div class='ctx'> module_param(aer_mask_override, bool, 0);</div><div class='ctx'> </div><div class='ctx'> struct aer_error_inj {</div><div class='head'>diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c<br/>index 9674e9f30d49..0ca053538146 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/pcie/aer/aerdrv_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pcie/aer/aerdrv_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/pcie/aer/aerdrv_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/pcie/aer/aerdrv_core.c</a></div><div class='hunk'>@@ -27,8 +27,8 @@</div><div class='ctx'> #include &lt;linux/kfifo.h&gt;</div><div class='ctx'> #include "aerdrv.h"</div><div class='ctx'> </div><div class='del'>-static int forceload;</div><div class='del'>-static int nosourceid;</div><div class='add'>+static bool forceload;</div><div class='add'>+static bool nosourceid;</div><div class='ctx'> module_param(forceload, bool, 0);</div><div class='ctx'> module_param(nosourceid, bool, 0);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c<br/>index cbfbab18be91..1cfbf228fbb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/pcie/aspm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/pcie/aspm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/pcie/aspm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/pcie/aspm.c</a></div><div class='hunk'>@@ -68,7 +68,7 @@ struct pcie_link_state {</div><div class='ctx'> 	struct aspm_latency acceptable[8];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int aspm_disabled, aspm_force, aspm_clear_state;</div><div class='add'>+static int aspm_disabled, aspm_force;</div><div class='ctx'> static bool aspm_support_enabled = true;</div><div class='ctx'> static DEFINE_MUTEX(aspm_lock);</div><div class='ctx'> static LIST_HEAD(link_list);</div><div class='hunk'>@@ -500,9 +500,6 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)</div><div class='ctx'> 	int pos;</div><div class='ctx'> 	u32 reg32;</div><div class='ctx'> </div><div class='del'>-	if (aspm_clear_state)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Some functions in a slot might not all be PCIe functions,</div><div class='ctx'> 	 * very strange. Disable ASPM for the whole slot</div><div class='hunk'>@@ -574,9 +571,6 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev)</div><div class='ctx'> 	    pdev-&gt;pcie_type != PCI_EXP_TYPE_DOWNSTREAM)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (aspm_disabled &amp;&amp; !aspm_clear_state)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	/* VIA has a strange chipset, root port is under a bridge */</div><div class='ctx'> 	if (pdev-&gt;pcie_type == PCI_EXP_TYPE_ROOT_PORT &amp;&amp;</div><div class='ctx'> 	    pdev-&gt;bus-&gt;self)</div><div class='hunk'>@@ -608,7 +602,7 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev)</div><div class='ctx'> 	 * the BIOS's expectation, we'll do so once pci_enable_device() is</div><div class='ctx'> 	 * called.</div><div class='ctx'> 	 */</div><div class='del'>-	if (aspm_policy != POLICY_POWERSAVE || aspm_clear_state) {</div><div class='add'>+	if (aspm_policy != POLICY_POWERSAVE) {</div><div class='ctx'> 		pcie_config_aspm_path(link);</div><div class='ctx'> 		pcie_set_clkpm(link, policy_to_clkpm_state(link));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -649,8 +643,7 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)</div><div class='ctx'> 	struct pci_dev *parent = pdev-&gt;bus-&gt;self;</div><div class='ctx'> 	struct pcie_link_state *link, *root, *parent_link;</div><div class='ctx'> </div><div class='del'>-	if ((aspm_disabled &amp;&amp; !aspm_clear_state) || !pci_is_pcie(pdev) ||</div><div class='del'>-	    !parent || !parent-&gt;link_state)</div><div class='add'>+	if (!pci_is_pcie(pdev) || !parent || !parent-&gt;link_state)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if ((parent-&gt;pcie_type != PCI_EXP_TYPE_ROOT_PORT) &amp;&amp;</div><div class='ctx'> 	    (parent-&gt;pcie_type != PCI_EXP_TYPE_DOWNSTREAM))</div><div class='hunk'>@@ -734,13 +727,18 @@ void pcie_aspm_powersave_config_link(struct pci_dev *pdev)</div><div class='ctx'>  * pci_disable_link_state - disable pci device's link state, so the link will</div><div class='ctx'>  * never enter specific states</div><div class='ctx'>  */</div><div class='del'>-static void __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem)</div><div class='add'>+static void __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem,</div><div class='add'>+				     bool force)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *parent = pdev-&gt;bus-&gt;self;</div><div class='ctx'> 	struct pcie_link_state *link;</div><div class='ctx'> </div><div class='del'>-	if (aspm_disabled || !pci_is_pcie(pdev))</div><div class='add'>+	if (aspm_disabled &amp;&amp; !force)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!pci_is_pcie(pdev))</div><div class='ctx'> 		return;</div><div class='add'>+</div><div class='ctx'> 	if (pdev-&gt;pcie_type == PCI_EXP_TYPE_ROOT_PORT ||</div><div class='ctx'> 	    pdev-&gt;pcie_type == PCI_EXP_TYPE_DOWNSTREAM)</div><div class='ctx'> 		parent = pdev;</div><div class='hunk'>@@ -768,16 +766,31 @@ static void __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem)</div><div class='ctx'> </div><div class='ctx'> void pci_disable_link_state_locked(struct pci_dev *pdev, int state)</div><div class='ctx'> {</div><div class='del'>-	__pci_disable_link_state(pdev, state, false);</div><div class='add'>+	__pci_disable_link_state(pdev, state, false, false);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pci_disable_link_state_locked);</div><div class='ctx'> </div><div class='ctx'> void pci_disable_link_state(struct pci_dev *pdev, int state)</div><div class='ctx'> {</div><div class='del'>-	__pci_disable_link_state(pdev, state, true);</div><div class='add'>+	__pci_disable_link_state(pdev, state, true, false);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pci_disable_link_state);</div><div class='ctx'> </div><div class='add'>+void pcie_clear_aspm(struct pci_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *child;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clear any ASPM setup that the firmware has carried out on this bus</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry(child, &amp;bus-&gt;devices, bus_list) {</div><div class='add'>+		__pci_disable_link_state(child, PCIE_LINK_STATE_L0S |</div><div class='add'>+					 PCIE_LINK_STATE_L1 |</div><div class='add'>+					 PCIE_LINK_STATE_CLKPM,</div><div class='add'>+					 false, true);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int pcie_aspm_set_policy(const char *val, struct kernel_param *kp)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -935,6 +948,7 @@ void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev)</div><div class='ctx'> static int __init pcie_aspm_disable(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	if (!strcmp(str, "off")) {</div><div class='add'>+		aspm_policy = POLICY_DEFAULT;</div><div class='ctx'> 		aspm_disabled = 1;</div><div class='ctx'> 		aspm_support_enabled = false;</div><div class='ctx'> 		printk(KERN_INFO "PCIe ASPM is disabled\n");</div><div class='hunk'>@@ -947,16 +961,18 @@ static int __init pcie_aspm_disable(char *str)</div><div class='ctx'> </div><div class='ctx'> __setup("pcie_aspm=", pcie_aspm_disable);</div><div class='ctx'> </div><div class='del'>-void pcie_clear_aspm(void)</div><div class='del'>-{</div><div class='del'>-	if (!aspm_force)</div><div class='del'>-		aspm_clear_state = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void pcie_no_aspm(void)</div><div class='ctx'> {</div><div class='del'>-	if (!aspm_force)</div><div class='add'>+	/*</div><div class='add'>+	 * Disabling ASPM is intended to prevent the kernel from modifying</div><div class='add'>+	 * existing hardware state, not to clear existing state. To that end:</div><div class='add'>+	 * (a) set policy to POLICY_DEFAULT in order to avoid changing state</div><div class='add'>+	 * (b) prevent userspace from changing policy</div><div class='add'>+	 */</div><div class='add'>+	if (!aspm_force) {</div><div class='add'>+		aspm_policy = POLICY_DEFAULT;</div><div class='ctx'> 		aspm_disabled = 1;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c<br/>index 04e74f485714..7cc9e2f0f47c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/probe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/probe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/probe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/probe.c</a></div><div class='hunk'>@@ -1522,19 +1522,21 @@ unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus)</div><div class='ctx'> 	return max;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct pci_bus * pci_create_bus(struct device *parent,</div><div class='del'>-		int bus, struct pci_ops *ops, void *sysdata)</div><div class='add'>+struct pci_bus *pci_create_root_bus(struct device *parent, int bus,</div><div class='add'>+		struct pci_ops *ops, void *sysdata, struct list_head *resources)</div><div class='ctx'> {</div><div class='del'>-	int error;</div><div class='add'>+	int error, i;</div><div class='ctx'> 	struct pci_bus *b, *b2;</div><div class='ctx'> 	struct device *dev;</div><div class='add'>+	struct pci_bus_resource *bus_res, *n;</div><div class='add'>+	struct resource *res;</div><div class='ctx'> </div><div class='ctx'> 	b = pci_alloc_bus();</div><div class='ctx'> 	if (!b)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='del'>-	if (!dev){</div><div class='add'>+	if (!dev) {</div><div class='ctx'> 		kfree(b);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1577,8 +1579,20 @@ struct pci_bus * pci_create_bus(struct device *parent,</div><div class='ctx'> 	pci_create_legacy_files(b);</div><div class='ctx'> </div><div class='ctx'> 	b-&gt;number = b-&gt;secondary = bus;</div><div class='del'>-	b-&gt;resource[0] = &amp;ioport_resource;</div><div class='del'>-	b-&gt;resource[1] = &amp;iomem_resource;</div><div class='add'>+</div><div class='add'>+	/* Add initial resources to the bus */</div><div class='add'>+	list_for_each_entry_safe(bus_res, n, resources, list)</div><div class='add'>+		list_move_tail(&amp;bus_res-&gt;list, &amp;b-&gt;resources);</div><div class='add'>+</div><div class='add'>+	if (parent)</div><div class='add'>+		dev_info(parent, "PCI host bridge to bus %s\n", dev_name(&amp;b-&gt;dev));</div><div class='add'>+	else</div><div class='add'>+		printk(KERN_INFO "PCI host bridge to bus %s\n", dev_name(&amp;b-&gt;dev));</div><div class='add'>+</div><div class='add'>+	pci_bus_for_each_resource(b, res, i) {</div><div class='add'>+		if (res)</div><div class='add'>+			dev_info(&amp;b-&gt;dev, "root bus resource %pR\n", res);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return b;</div><div class='ctx'> </div><div class='hunk'>@@ -1594,18 +1608,58 @@ err_out:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus,</div><div class='add'>+		struct pci_ops *ops, void *sysdata, struct list_head *resources)</div><div class='add'>+{</div><div class='add'>+	struct pci_bus *b;</div><div class='add'>+</div><div class='add'>+	b = pci_create_root_bus(parent, bus, ops, sysdata, resources);</div><div class='add'>+	if (!b)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	b-&gt;subordinate = pci_scan_child_bus(b);</div><div class='add'>+	pci_bus_add_devices(b);</div><div class='add'>+	return b;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pci_scan_root_bus);</div><div class='add'>+</div><div class='add'>+/* Deprecated; use pci_scan_root_bus() instead */</div><div class='ctx'> struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent,</div><div class='ctx'> 		int bus, struct pci_ops *ops, void *sysdata)</div><div class='ctx'> {</div><div class='add'>+	LIST_HEAD(resources);</div><div class='ctx'> 	struct pci_bus *b;</div><div class='ctx'> </div><div class='del'>-	b = pci_create_bus(parent, bus, ops, sysdata);</div><div class='add'>+	pci_add_resource(&amp;resources, &amp;ioport_resource);</div><div class='add'>+	pci_add_resource(&amp;resources, &amp;iomem_resource);</div><div class='add'>+	b = pci_create_root_bus(parent, bus, ops, sysdata, &amp;resources);</div><div class='ctx'> 	if (b)</div><div class='ctx'> 		b-&gt;subordinate = pci_scan_child_bus(b);</div><div class='add'>+	else</div><div class='add'>+		pci_free_resource_list(&amp;resources);</div><div class='ctx'> 	return b;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pci_scan_bus_parented);</div><div class='ctx'> </div><div class='add'>+struct pci_bus * __devinit pci_scan_bus(int bus, struct pci_ops *ops,</div><div class='add'>+					void *sysdata)</div><div class='add'>+{</div><div class='add'>+	LIST_HEAD(resources);</div><div class='add'>+	struct pci_bus *b;</div><div class='add'>+</div><div class='add'>+	pci_add_resource(&amp;resources, &amp;ioport_resource);</div><div class='add'>+	pci_add_resource(&amp;resources, &amp;iomem_resource);</div><div class='add'>+	b = pci_create_root_bus(NULL, bus, ops, sysdata, &amp;resources);</div><div class='add'>+	if (b) {</div><div class='add'>+		b-&gt;subordinate = pci_scan_child_bus(b);</div><div class='add'>+		pci_bus_add_devices(b);</div><div class='add'>+	} else {</div><div class='add'>+		pci_free_resource_list(&amp;resources);</div><div class='add'>+	}</div><div class='add'>+	return b;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pci_scan_bus);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_HOTPLUG</div><div class='ctx'> /**</div><div class='ctx'>  * pci_rescan_bus - scan a PCI bus for devices.</div><div class='head'>diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c<br/>index 7f87beed35ac..6def3624c688 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/remove.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/remove.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/remove.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/remove.c</a></div><div class='hunk'>@@ -89,9 +89,8 @@ EXPORT_SYMBOL(pci_remove_bus);</div><div class='ctx'>  * device lists, remove the /proc entry, and notify userspace</div><div class='ctx'>  * (/sbin/hotplug).</div><div class='ctx'>  */</div><div class='del'>-void pci_remove_bus_device(struct pci_dev *dev)</div><div class='add'>+static void __pci_remove_bus_device(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	pci_stop_bus_device(dev);</div><div class='ctx'> 	if (dev-&gt;subordinate) {</div><div class='ctx'> 		struct pci_bus *b = dev-&gt;subordinate;</div><div class='ctx'> </div><div class='hunk'>@@ -102,6 +101,11 @@ void pci_remove_bus_device(struct pci_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	pci_destroy_dev(dev);</div><div class='ctx'> }</div><div class='add'>+void pci_remove_bus_device(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	pci_stop_bus_device(dev);</div><div class='add'>+	__pci_remove_bus_device(dev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * pci_remove_behind_bridge - remove all devices behind a PCI bridge</div><div class='hunk'>@@ -117,7 +121,7 @@ void pci_remove_behind_bridge(struct pci_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;subordinate)</div><div class='ctx'> 		list_for_each_safe(l, n, &amp;dev-&gt;subordinate-&gt;devices)</div><div class='del'>-			pci_remove_bus_device(pci_dev_b(l));</div><div class='add'>+			__pci_remove_bus_device(pci_dev_b(l));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pci_stop_bus_devices(struct pci_bus *bus)</div><div class='head'>diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c<br/>index 5717509becbe..b66bfdbd21f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/setup-res.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/setup-res.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/setup-res.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/setup-res.c</a></div><div class='hunk'>@@ -85,9 +85,9 @@ void pci_update_resource(struct pci_dev *dev, int resno)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	res-&gt;flags &amp;= ~IORESOURCE_UNSET;</div><div class='del'>-	dev_info(&amp;dev-&gt;dev, "BAR %d: set to %pR (PCI address [%#llx-%#llx])\n",</div><div class='del'>-		 resno, res, (unsigned long long)region.start,</div><div class='del'>-		 (unsigned long long)region.end);</div><div class='add'>+	dev_dbg(&amp;dev-&gt;dev, "BAR %d: set to %pR (PCI address [%#llx-%#llx])\n",</div><div class='add'>+		resno, res, (unsigned long long)region.start,</div><div class='add'>+		(unsigned long long)region.end);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int pci_claim_resource(struct pci_dev *dev, int resource)</div><div class='head'>diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c<br/>index 90832a955991..7cf3d2fcf56a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/xen-pcifront.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pci/xen-pcifront.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/xen-pcifront.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pci/xen-pcifront.c</a></div><div class='hunk'>@@ -1126,14 +1126,11 @@ static const struct xenbus_device_id xenpci_ids[] = {</div><div class='ctx'> 	{""},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct xenbus_driver xenbus_pcifront_driver = {</div><div class='del'>-	.name			= "pcifront",</div><div class='del'>-	.owner			= THIS_MODULE,</div><div class='del'>-	.ids			= xenpci_ids,</div><div class='add'>+static DEFINE_XENBUS_DRIVER(xenpci, "pcifront",</div><div class='ctx'> 	.probe			= pcifront_xenbus_probe,</div><div class='ctx'> 	.remove			= pcifront_xenbus_remove,</div><div class='ctx'> 	.otherend_changed	= pcifront_backend_changed,</div><div class='del'>-};</div><div class='add'>+);</div><div class='ctx'> </div><div class='ctx'> static int __init pcifront_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -1142,12 +1139,12 @@ static int __init pcifront_init(void)</div><div class='ctx'> </div><div class='ctx'> 	pci_frontend_registrar(1 /* enable */);</div><div class='ctx'> </div><div class='del'>-	return xenbus_register_frontend(&amp;xenbus_pcifront_driver);</div><div class='add'>+	return xenbus_register_frontend(&amp;xenpci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit pcifront_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-	xenbus_unregister_driver(&amp;xenbus_pcifront_driver);</div><div class='add'>+	xenbus_unregister_driver(&amp;xenpci_driver);</div><div class='ctx'> 	pci_frontend_registrar(0 /* disable */);</div><div class='ctx'> }</div><div class='ctx'> module_init(pcifront_init);</div><div class='head'>diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig<br/>index 6e318ce41136..f9e3fb3a285b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pcmcia/Kconfig</a></div><div class='hunk'>@@ -155,18 +155,14 @@ config PCMCIA_M8XX</div><div class='ctx'> </div><div class='ctx'> 	  This driver is also available as a module called m8xx_pcmcia.</div><div class='ctx'> </div><div class='del'>-config PCMCIA_AU1X00</div><div class='del'>-	tristate "Au1x00 pcmcia support"</div><div class='del'>-	depends on MIPS_ALCHEMY &amp;&amp; PCMCIA</div><div class='del'>-</div><div class='ctx'> config PCMCIA_ALCHEMY_DEVBOARD</div><div class='ctx'> 	tristate "Alchemy Db/Pb1xxx PCMCIA socket services"</div><div class='ctx'> 	depends on MIPS_ALCHEMY &amp;&amp; PCMCIA</div><div class='ctx'> 	select 64BIT_PHYS_ADDR</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable this driver of you want PCMCIA support on your Alchemy</div><div class='del'>-	  Db1000, Db/Pb1100, Db/Pb1500, Db/Pb1550, Db/Pb1200 board.</div><div class='del'>-	  NOT suitable for the PB1000!</div><div class='add'>+	  Db1000, Db/Pb1100, Db/Pb1500, Db/Pb1550, Db/Pb1200, DB1300</div><div class='add'>+	  board.  NOT suitable for the PB1000!</div><div class='ctx'> </div><div class='ctx'> 	  This driver is also available as a module called db1xxx_ss.ko</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile<br/>index 29935ea921df..ec543a4ff2e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pcmcia/Makefile</a></div><div class='hunk'>@@ -29,7 +29,6 @@ obj-$(CONFIG_PCMCIA_SA1100)			+= sa11xx_base.o sa1100_cs.o</div><div class='ctx'> obj-$(CONFIG_PCMCIA_SA1111)			+= sa11xx_base.o sa1111_cs.o</div><div class='ctx'> obj-$(CONFIG_M32R_PCC)				+= m32r_pcc.o</div><div class='ctx'> obj-$(CONFIG_M32R_CFC)				+= m32r_cfc.o</div><div class='del'>-obj-$(CONFIG_PCMCIA_AU1X00)			+= au1x00_ss.o</div><div class='ctx'> obj-$(CONFIG_PCMCIA_BCM63XX)			+= bcm63xx_pcmcia.o</div><div class='ctx'> obj-$(CONFIG_PCMCIA_VRC4171)			+= vrc4171_card.o</div><div class='ctx'> obj-$(CONFIG_PCMCIA_VRC4173)			+= vrc4173_cardu.o</div><div class='hunk'>@@ -39,9 +38,6 @@ obj-$(CONFIG_AT91_CF)				+= at91_cf.o</div><div class='ctx'> obj-$(CONFIG_ELECTRA_CF)			+= electra_cf.o</div><div class='ctx'> obj-$(CONFIG_PCMCIA_ALCHEMY_DEVBOARD)		+= db1xxx_ss.o</div><div class='ctx'> </div><div class='del'>-au1x00_ss-y					+= au1000_generic.o</div><div class='del'>-au1x00_ss-$(CONFIG_MIPS_PB1000)			+= au1000_pb1x00.o</div><div class='del'>-</div><div class='ctx'> sa1111_cs-y					+= sa1111_generic.o</div><div class='ctx'> sa1111_cs-$(CONFIG_ASSABET_NEPONSET)		+= sa1100_neponset.o</div><div class='ctx'> sa1111_cs-$(CONFIG_SA1100_BADGE4)		+= sa1100_badge4.o</div><div class='head'>diff --git a/drivers/pcmcia/au1000_generic.c b/drivers/pcmcia/au1000_generic.c<br/>deleted file mode 100644<br/>index 95dd7c62741f..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/au1000_generic.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/au1000_generic.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,545 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Alchemy Semi Au1000 pcmcia driver</div><div class='del'>- *</div><div class='del'>- * Copyright 2001-2003 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc.</div><div class='del'>- *         	ppopov@embeddedalley.com or source@mvista.com</div><div class='del'>- *</div><div class='del'>- * Copyright 2004 Pete Popov, Embedded Alley Solutions, Inc.</div><div class='del'>- * Updated the driver to 2.6. Followed the sa11xx API and largely</div><div class='del'>- * copied many of the hardware independent functions.</div><div class='del'>- *</div><div class='del'>- * ########################################################################</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can distribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License (Version 2) as</div><div class='del'>- *  published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope it will be useful, but WITHOUT</div><div class='del'>- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License</div><div class='del'>- *  for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License along</div><div class='del'>- *  with this program; if not, write to the 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'>- * ########################################################################</div><div class='del'>- *</div><div class='del'>- * </div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/cpufreq.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/notifier.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-#include "au1000_generic.h"</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Pete Popov &lt;ppopov@embeddedalley.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Linux PCMCIA Card Services: Au1x00 Socket Controller");</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-#define debug(x,args...) printk(KERN_DEBUG "%s: " x, __func__ , ##args)</div><div class='del'>-#else</div><div class='del'>-#define debug(x,args...)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define MAP_SIZE 0x100000</div><div class='del'>-extern struct au1000_pcmcia_socket au1000_pcmcia_socket[];</div><div class='del'>-#define PCMCIA_SOCKET(x)	(au1000_pcmcia_socket + (x))</div><div class='del'>-#define to_au1000_socket(x)	container_of(x, struct au1000_pcmcia_socket, socket)</div><div class='del'>-</div><div class='del'>-/* Some boards like to support CF cards as IDE root devices, so they</div><div class='del'>- * grab pcmcia sockets directly.</div><div class='del'>- */</div><div class='del'>-u32 *pcmcia_base_vaddrs[2];</div><div class='del'>-extern const unsigned long mips_io_port_base;</div><div class='del'>-</div><div class='del'>-static DEFINE_MUTEX(pcmcia_sockets_lock);</div><div class='del'>-</div><div class='del'>-static int (*au1x00_pcmcia_hw_init[])(struct device *dev) = {</div><div class='del'>-	au1x_board_init,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-au1x00_pcmcia_skt_state(struct au1000_pcmcia_socket *skt)</div><div class='del'>-{</div><div class='del'>-	struct pcmcia_state state;</div><div class='del'>-	unsigned int stat;</div><div class='del'>-</div><div class='del'>-	memset(&amp;state, 0, sizeof(struct pcmcia_state));</div><div class='del'>-</div><div class='del'>-	skt-&gt;ops-&gt;socket_state(skt, &amp;state);</div><div class='del'>-</div><div class='del'>-	stat = state.detect  ? SS_DETECT : 0;</div><div class='del'>-	stat |= state.ready  ? SS_READY  : 0;</div><div class='del'>-	stat |= state.wrprot ? SS_WRPROT : 0;</div><div class='del'>-	stat |= state.vs_3v  ? SS_3VCARD : 0;</div><div class='del'>-	stat |= state.vs_Xv  ? SS_XVCARD : 0;</div><div class='del'>-	stat |= skt-&gt;cs_state.Vcc ? SS_POWERON : 0;</div><div class='del'>-</div><div class='del'>-	if (skt-&gt;cs_state.flags &amp; SS_IOCARD)</div><div class='del'>-		stat |= state.bvd1 ? SS_STSCHG : 0;</div><div class='del'>-	else {</div><div class='del'>-		if (state.bvd1 == 0)</div><div class='del'>-			stat |= SS_BATDEAD;</div><div class='del'>-		else if (state.bvd2 == 0)</div><div class='del'>-			stat |= SS_BATWARN;</div><div class='del'>-	}</div><div class='del'>-	return stat;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * au100_pcmcia_config_skt</div><div class='del'>- *</div><div class='del'>- * Convert PCMCIA socket state to our socket configure structure.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-au1x00_pcmcia_config_skt(struct au1000_pcmcia_socket *skt, socket_state_t *state)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = skt-&gt;ops-&gt;configure_socket(skt, state);</div><div class='del'>-	if (ret == 0) {</div><div class='del'>-		skt-&gt;cs_state = *state;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		debug("unable to configure socket %d\n", skt-&gt;nr);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* au1x00_pcmcia_sock_init()</div><div class='del'>- *</div><div class='del'>- * (Re-)Initialise the socket, turning on status interrupts</div><div class='del'>- * and PCMCIA bus.  This must wait for power to stabilise</div><div class='del'>- * so that the card status signals report correctly.</div><div class='del'>- *</div><div class='del'>- * Returns: 0</div><div class='del'>- */</div><div class='del'>-static int au1x00_pcmcia_sock_init(struct pcmcia_socket *sock)</div><div class='del'>-{</div><div class='del'>-	struct au1000_pcmcia_socket *skt = to_au1000_socket(sock);</div><div class='del'>-</div><div class='del'>-	debug("initializing socket %u\n", skt-&gt;nr);</div><div class='del'>-</div><div class='del'>-	skt-&gt;ops-&gt;socket_init(skt);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * au1x00_pcmcia_suspend()</div><div class='del'>- *</div><div class='del'>- * Remove power on the socket, disable IRQs from the card.</div><div class='del'>- * Turn off status interrupts, and disable the PCMCIA bus.</div><div class='del'>- *</div><div class='del'>- * Returns: 0</div><div class='del'>- */</div><div class='del'>-static int au1x00_pcmcia_suspend(struct pcmcia_socket *sock)</div><div class='del'>-{</div><div class='del'>-	struct au1000_pcmcia_socket *skt = to_au1000_socket(sock);</div><div class='del'>-</div><div class='del'>-	debug("suspending socket %u\n", skt-&gt;nr);</div><div class='del'>-</div><div class='del'>-	skt-&gt;ops-&gt;socket_suspend(skt);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(status_lock);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * au1x00_check_status()</div><div class='del'>- */</div><div class='del'>-static void au1x00_check_status(struct au1000_pcmcia_socket *skt)</div><div class='del'>-{</div><div class='del'>-	unsigned int events;</div><div class='del'>-</div><div class='del'>-	debug("entering PCMCIA monitoring thread\n");</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		unsigned int status;</div><div class='del'>-		unsigned long flags;</div><div class='del'>-</div><div class='del'>-		status = au1x00_pcmcia_skt_state(skt);</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;status_lock, flags);</div><div class='del'>-		events = (status ^ skt-&gt;status) &amp; skt-&gt;cs_state.csc_mask;</div><div class='del'>-		skt-&gt;status = status;</div><div class='del'>-		spin_unlock_irqrestore(&amp;status_lock, flags);</div><div class='del'>-</div><div class='del'>-		debug("events: %s%s%s%s%s%s\n",</div><div class='del'>-			events == 0         ? "&lt;NONE&gt;"   : "",</div><div class='del'>-			events &amp; SS_DETECT  ? "DETECT "  : "",</div><div class='del'>-			events &amp; SS_READY   ? "READY "   : "",</div><div class='del'>-			events &amp; SS_BATDEAD ? "BATDEAD " : "",</div><div class='del'>-			events &amp; SS_BATWARN ? "BATWARN " : "",</div><div class='del'>-			events &amp; SS_STSCHG  ? "STSCHG "  : "");</div><div class='del'>-</div><div class='del'>-		if (events)</div><div class='del'>-			pcmcia_parse_events(&amp;skt-&gt;socket, events);</div><div class='del'>-	} while (events);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * au1x00_pcmcia_poll_event()</div><div class='del'>- * Let's poll for events in addition to IRQs since IRQ only is unreliable...</div><div class='del'>- */</div><div class='del'>-static void au1x00_pcmcia_poll_event(unsigned long dummy)</div><div class='del'>-{</div><div class='del'>-	struct au1000_pcmcia_socket *skt = (struct au1000_pcmcia_socket *)dummy;</div><div class='del'>-	debug("polling for events\n");</div><div class='del'>-</div><div class='del'>-	mod_timer(&amp;skt-&gt;poll_timer, jiffies + AU1000_PCMCIA_POLL_PERIOD);</div><div class='del'>-</div><div class='del'>-	au1x00_check_status(skt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* au1x00_pcmcia_get_status()</div><div class='del'>- *</div><div class='del'>- * From the sa11xx_core.c:</div><div class='del'>- * Implements the get_status() operation for the in-kernel PCMCIA</div><div class='del'>- * service (formerly SS_GetStatus in Card Services). Essentially just</div><div class='del'>- * fills in bits in `status' according to internal driver state or</div><div class='del'>- * the value of the voltage detect chipselect register.</div><div class='del'>- *</div><div class='del'>- * As a debugging note, during card startup, the PCMCIA core issues</div><div class='del'>- * three set_socket() commands in a row the first with RESET deasserted,</div><div class='del'>- * the second with RESET asserted, and the last with RESET deasserted</div><div class='del'>- * again. Following the third set_socket(), a get_status() command will</div><div class='del'>- * be issued. The kernel is looking for the SS_READY flag (see</div><div class='del'>- * setup_socket(), reset_socket(), and unreset_socket() in cs.c).</div><div class='del'>- *</div><div class='del'>- * Returns: 0</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-au1x00_pcmcia_get_status(struct pcmcia_socket *sock, unsigned int *status)</div><div class='del'>-{</div><div class='del'>-	struct au1000_pcmcia_socket *skt = to_au1000_socket(sock);</div><div class='del'>-</div><div class='del'>-	skt-&gt;status = au1x00_pcmcia_skt_state(skt);</div><div class='del'>-	*status = skt-&gt;status;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* au1x00_pcmcia_set_socket()</div><div class='del'>- * Implements the set_socket() operation for the in-kernel PCMCIA</div><div class='del'>- * service (formerly SS_SetSocket in Card Services). We more or</div><div class='del'>- * less punt all of this work and let the kernel handle the details</div><div class='del'>- * of power configuration, reset, &amp;c. We also record the value of</div><div class='del'>- * `state' in order to regurgitate it to the PCMCIA core later.</div><div class='del'>- *</div><div class='del'>- * Returns: 0</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-au1x00_pcmcia_set_socket(struct pcmcia_socket *sock, socket_state_t *state)</div><div class='del'>-{</div><div class='del'>-  struct au1000_pcmcia_socket *skt = to_au1000_socket(sock);</div><div class='del'>-</div><div class='del'>-  debug("for sock %u\n", skt-&gt;nr);</div><div class='del'>-</div><div class='del'>-  debug("\tmask:  %s%s%s%s%s%s\n\tflags: %s%s%s%s%s%s\n",</div><div class='del'>-	(state-&gt;csc_mask==0)?"&lt;NONE&gt;":"",</div><div class='del'>-	(state-&gt;csc_mask&amp;SS_DETECT)?"DETECT ":"",</div><div class='del'>-	(state-&gt;csc_mask&amp;SS_READY)?"READY ":"",</div><div class='del'>-	(state-&gt;csc_mask&amp;SS_BATDEAD)?"BATDEAD ":"",</div><div class='del'>-	(state-&gt;csc_mask&amp;SS_BATWARN)?"BATWARN ":"",</div><div class='del'>-	(state-&gt;csc_mask&amp;SS_STSCHG)?"STSCHG ":"",</div><div class='del'>-	(state-&gt;flags==0)?"&lt;NONE&gt;":"",</div><div class='del'>-	(state-&gt;flags&amp;SS_PWR_AUTO)?"PWR_AUTO ":"",</div><div class='del'>-	(state-&gt;flags&amp;SS_IOCARD)?"IOCARD ":"",</div><div class='del'>-	(state-&gt;flags&amp;SS_RESET)?"RESET ":"",</div><div class='del'>-	(state-&gt;flags&amp;SS_SPKR_ENA)?"SPKR_ENA ":"",</div><div class='del'>-	(state-&gt;flags&amp;SS_OUTPUT_ENA)?"OUTPUT_ENA ":"");</div><div class='del'>-  debug("\tVcc %d  Vpp %d  irq %d\n",</div><div class='del'>-	state-&gt;Vcc, state-&gt;Vpp, state-&gt;io_irq);</div><div class='del'>-</div><div class='del'>-  return au1x00_pcmcia_config_skt(skt, state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int </div><div class='del'>-au1x00_pcmcia_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *map)</div><div class='del'>-{</div><div class='del'>-	struct au1000_pcmcia_socket *skt = to_au1000_socket(sock);</div><div class='del'>-	unsigned int speed;</div><div class='del'>-</div><div class='del'>-	if(map-&gt;map&gt;=MAX_IO_WIN){</div><div class='del'>-		debug("map (%d) out of range\n", map-&gt;map);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if(map-&gt;flags&amp;MAP_ACTIVE){</div><div class='del'>-		speed=(map-&gt;speed&gt;0)?map-&gt;speed:AU1000_PCMCIA_IO_SPEED;</div><div class='del'>-		skt-&gt;spd_io[map-&gt;map] = speed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	map-&gt;start=(unsigned int)(u32)skt-&gt;virt_io;</div><div class='del'>-	map-&gt;stop=map-&gt;start+MAP_SIZE;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-}  /* au1x00_pcmcia_set_io_map() */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int </div><div class='del'>-au1x00_pcmcia_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *map)</div><div class='del'>-{</div><div class='del'>-	struct au1000_pcmcia_socket *skt = to_au1000_socket(sock);</div><div class='del'>-	unsigned short speed = map-&gt;speed;</div><div class='del'>-</div><div class='del'>-	if(map-&gt;map&gt;=MAX_WIN){</div><div class='del'>-		debug("map (%d) out of range\n", map-&gt;map);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (map-&gt;flags &amp; MAP_ATTRIB) {</div><div class='del'>-		skt-&gt;spd_attr[map-&gt;map] = speed;</div><div class='del'>-		skt-&gt;spd_mem[map-&gt;map] = 0;</div><div class='del'>-	} else {</div><div class='del'>-		skt-&gt;spd_attr[map-&gt;map] = 0;</div><div class='del'>-		skt-&gt;spd_mem[map-&gt;map] = speed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (map-&gt;flags &amp; MAP_ATTRIB) {</div><div class='del'>-		map-&gt;static_start = skt-&gt;phys_attr + map-&gt;card_start;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		map-&gt;static_start = skt-&gt;phys_mem + map-&gt;card_start;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	debug("set_mem_map %d start %08lx card_start %08x\n",</div><div class='del'>-			map-&gt;map, map-&gt;static_start, map-&gt;card_start);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-}  /* au1x00_pcmcia_set_mem_map() */</div><div class='del'>-</div><div class='del'>-static struct pccard_operations au1x00_pcmcia_operations = {</div><div class='del'>-	.init			= au1x00_pcmcia_sock_init,</div><div class='del'>-	.suspend		= au1x00_pcmcia_suspend,</div><div class='del'>-	.get_status		= au1x00_pcmcia_get_status,</div><div class='del'>-	.set_socket		= au1x00_pcmcia_set_socket,</div><div class='del'>-	.set_io_map		= au1x00_pcmcia_set_io_map,</div><div class='del'>-	.set_mem_map		= au1x00_pcmcia_set_mem_map,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *skt_names[] = {</div><div class='del'>-	"PCMCIA socket 0",</div><div class='del'>-	"PCMCIA socket 1",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct skt_dev_info {</div><div class='del'>-	int nskt;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int au1x00_pcmcia_socket_probe(struct device *dev, struct pcmcia_low_level *ops, int first, int nr)</div><div class='del'>-{</div><div class='del'>-	struct skt_dev_info *sinfo;</div><div class='del'>-	struct au1000_pcmcia_socket *skt;</div><div class='del'>-	int ret, i;</div><div class='del'>-</div><div class='del'>-	sinfo = kzalloc(sizeof(struct skt_dev_info), GFP_KERNEL);</div><div class='del'>-	if (!sinfo) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sinfo-&gt;nskt = nr;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Initialise the per-socket structure.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		skt = PCMCIA_SOCKET(i);</div><div class='del'>-		memset(skt, 0, sizeof(*skt));</div><div class='del'>-</div><div class='del'>-		skt-&gt;socket.resource_ops = &amp;pccard_static_ops;</div><div class='del'>-		skt-&gt;socket.ops = &amp;au1x00_pcmcia_operations;</div><div class='del'>-		skt-&gt;socket.owner = ops-&gt;owner;</div><div class='del'>-		skt-&gt;socket.dev.parent = dev;</div><div class='del'>-</div><div class='del'>-		init_timer(&amp;skt-&gt;poll_timer);</div><div class='del'>-		skt-&gt;poll_timer.function = au1x00_pcmcia_poll_event;</div><div class='del'>-		skt-&gt;poll_timer.data = (unsigned long)skt;</div><div class='del'>-		skt-&gt;poll_timer.expires = jiffies + AU1000_PCMCIA_POLL_PERIOD;</div><div class='del'>-</div><div class='del'>-		skt-&gt;nr		= first + i;</div><div class='del'>-		skt-&gt;irq	= 255;</div><div class='del'>-		skt-&gt;dev	= dev;</div><div class='del'>-		skt-&gt;ops	= ops;</div><div class='del'>-</div><div class='del'>-		skt-&gt;res_skt.name	= skt_names[skt-&gt;nr];</div><div class='del'>-		skt-&gt;res_io.name	= "io";</div><div class='del'>-		skt-&gt;res_io.flags	= IORESOURCE_MEM | IORESOURCE_BUSY;</div><div class='del'>-		skt-&gt;res_mem.name	= "memory";</div><div class='del'>-		skt-&gt;res_mem.flags	= IORESOURCE_MEM;</div><div class='del'>-		skt-&gt;res_attr.name	= "attribute";</div><div class='del'>-		skt-&gt;res_attr.flags	= IORESOURCE_MEM;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * PCMCIA client drivers use the inb/outb macros to access the</div><div class='del'>-		 * IO registers. Since mips_io_port_base is added to the</div><div class='del'>-		 * access address of the mips implementation of inb/outb,</div><div class='del'>-		 * we need to subtract it here because we want to access the</div><div class='del'>-		 * I/O or MEM address directly, without going through this</div><div class='del'>-		 * "mips_io_port_base" mechanism.</div><div class='del'>-		 */</div><div class='del'>-		if (i == 0) {</div><div class='del'>-			skt-&gt;virt_io = (void *)</div><div class='del'>-				(ioremap((phys_t)AU1X_SOCK0_IO, 0x1000) -</div><div class='del'>-				(u32)mips_io_port_base);</div><div class='del'>-			skt-&gt;phys_attr = AU1X_SOCK0_PHYS_ATTR;</div><div class='del'>-			skt-&gt;phys_mem = AU1X_SOCK0_PHYS_MEM;</div><div class='del'>-		}</div><div class='del'>-		else  {</div><div class='del'>-			skt-&gt;virt_io = (void *)</div><div class='del'>-				(ioremap((phys_t)AU1X_SOCK1_IO, 0x1000) -</div><div class='del'>-				(u32)mips_io_port_base);</div><div class='del'>-			skt-&gt;phys_attr = AU1X_SOCK1_PHYS_ATTR;</div><div class='del'>-			skt-&gt;phys_mem = AU1X_SOCK1_PHYS_MEM;</div><div class='del'>-		}</div><div class='del'>-		pcmcia_base_vaddrs[i] = (u32 *)skt-&gt;virt_io;</div><div class='del'>-		ret = ops-&gt;hw_init(skt);</div><div class='del'>-</div><div class='del'>-		skt-&gt;socket.features = SS_CAP_STATIC_MAP|SS_CAP_PCCARD;</div><div class='del'>-		skt-&gt;socket.irq_mask = 0;</div><div class='del'>-		skt-&gt;socket.map_size = MAP_SIZE;</div><div class='del'>-		skt-&gt;socket.pci_irq = skt-&gt;irq;</div><div class='del'>-		skt-&gt;socket.io_offset = (unsigned long)skt-&gt;virt_io;</div><div class='del'>-</div><div class='del'>-		skt-&gt;status = au1x00_pcmcia_skt_state(skt);</div><div class='del'>-</div><div class='del'>-		ret = pcmcia_register_socket(&amp;skt-&gt;socket);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_err;</div><div class='del'>-</div><div class='del'>-		WARN_ON(skt-&gt;socket.sock != i);</div><div class='del'>-</div><div class='del'>-		add_timer(&amp;skt-&gt;poll_timer);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_set_drvdata(dev, sinfo);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-out_err:</div><div class='del'>-	ops-&gt;hw_shutdown(skt);</div><div class='del'>-	while (i-- &gt; 0) {</div><div class='del'>-		skt = PCMCIA_SOCKET(i);</div><div class='del'>-</div><div class='del'>-		del_timer_sync(&amp;skt-&gt;poll_timer);</div><div class='del'>-		pcmcia_unregister_socket(&amp;skt-&gt;socket);</div><div class='del'>-		if (i == 0) {</div><div class='del'>-			iounmap(skt-&gt;virt_io + (u32)mips_io_port_base);</div><div class='del'>-			skt-&gt;virt_io = NULL;</div><div class='del'>-		}</div><div class='del'>-#ifndef CONFIG_MIPS_XXS1500</div><div class='del'>-		else {</div><div class='del'>-			iounmap(skt-&gt;virt_io + (u32)mips_io_port_base);</div><div class='del'>-			skt-&gt;virt_io = NULL;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		ops-&gt;hw_shutdown(skt);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	kfree(sinfo);</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int au1x00_drv_pcmcia_remove(struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct skt_dev_info *sinfo = platform_get_drvdata(dev);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;pcmcia_sockets_lock);</div><div class='del'>-	platform_set_drvdata(dev, NULL);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sinfo-&gt;nskt; i++) {</div><div class='del'>-		struct au1000_pcmcia_socket *skt = PCMCIA_SOCKET(i);</div><div class='del'>-</div><div class='del'>-		del_timer_sync(&amp;skt-&gt;poll_timer);</div><div class='del'>-		pcmcia_unregister_socket(&amp;skt-&gt;socket);</div><div class='del'>-		skt-&gt;ops-&gt;hw_shutdown(skt);</div><div class='del'>-		au1x00_pcmcia_config_skt(skt, &amp;dead_socket);</div><div class='del'>-		iounmap(skt-&gt;virt_io + (u32)mips_io_port_base);</div><div class='del'>-		skt-&gt;virt_io = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(sinfo);</div><div class='del'>-	mutex_unlock(&amp;pcmcia_sockets_lock);</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'>- * PCMCIA "Driver" API</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int au1x00_drv_pcmcia_probe(struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	int i, ret = -ENODEV;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;pcmcia_sockets_lock);</div><div class='del'>-	for (i=0; i &lt; ARRAY_SIZE(au1x00_pcmcia_hw_init); i++) {</div><div class='del'>-		ret = au1x00_pcmcia_hw_init[i](&amp;dev-&gt;dev);</div><div class='del'>-		if (ret == 0)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;pcmcia_sockets_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct platform_driver au1x00_pcmcia_driver = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name		= "au1x00-pcmcia",</div><div class='del'>-		.owner		= THIS_MODULE,</div><div class='del'>-	},</div><div class='del'>-	.probe		= au1x00_drv_pcmcia_probe,</div><div class='del'>-	.remove		= au1x00_drv_pcmcia_remove,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* au1x00_pcmcia_init()</div><div class='del'>- *</div><div class='del'>- * This routine performs low-level PCMCIA initialization and then</div><div class='del'>- * registers this socket driver with Card Services.</div><div class='del'>- *</div><div class='del'>- * Returns: 0 on success, -ve error code on failure</div><div class='del'>- */</div><div class='del'>-static int __init au1x00_pcmcia_init(void)</div><div class='del'>-{</div><div class='del'>-	int error = 0;</div><div class='del'>-	error = platform_driver_register(&amp;au1x00_pcmcia_driver);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* au1x00_pcmcia_exit()</div><div class='del'>- * Invokes the low-level kernel service to free IRQs associated with this</div><div class='del'>- * socket controller and reset GPIO edge detection.</div><div class='del'>- */</div><div class='del'>-static void __exit au1x00_pcmcia_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;au1x00_pcmcia_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(au1x00_pcmcia_init);</div><div class='del'>-module_exit(au1x00_pcmcia_exit);</div><div class='head'>diff --git a/drivers/pcmcia/au1000_generic.h b/drivers/pcmcia/au1000_generic.h<br/>deleted file mode 100644<br/>index 5c36bda2963b..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/au1000_generic.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/au1000_generic.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,135 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Alchemy Semi Au1000 pcmcia driver include file</div><div class='del'>- *</div><div class='del'>- * Copyright 2001 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc.</div><div class='del'>- *         	ppopov@mvista.com or source@mvista.com</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can distribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License (Version 2) as</div><div class='del'>- *  published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope it will be useful, but WITHOUT</div><div class='del'>- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License</div><div class='del'>- *  for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License along</div><div class='del'>- *  with this program; if not, write to the 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'>-#ifndef __ASM_AU1000_PCMCIA_H</div><div class='del'>-#define __ASM_AU1000_PCMCIA_H</div><div class='del'>-</div><div class='del'>-/* include the world */</div><div class='del'>-</div><div class='del'>-#include &lt;pcmcia/ss.h&gt;</div><div class='del'>-#include &lt;pcmcia/cistpl.h&gt;</div><div class='del'>-#include "cs_internal.h"</div><div class='del'>-</div><div class='del'>-#define AU1000_PCMCIA_POLL_PERIOD    (2*HZ)</div><div class='del'>-#define AU1000_PCMCIA_IO_SPEED       (255)</div><div class='del'>-#define AU1000_PCMCIA_MEM_SPEED      (300)</div><div class='del'>-</div><div class='del'>-#define AU1X_SOCK0_IO        0xF00000000ULL</div><div class='del'>-#define AU1X_SOCK0_PHYS_ATTR 0xF40000000ULL</div><div class='del'>-#define AU1X_SOCK0_PHYS_MEM  0xF80000000ULL</div><div class='del'>-</div><div class='del'>-/* pcmcia socket 1 needs external glue logic so the memory map</div><div class='del'>- * differs from board to board.</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_MIPS_PB1000)</div><div class='del'>-#define AU1X_SOCK1_IO        0xF08000000ULL</div><div class='del'>-#define AU1X_SOCK1_PHYS_ATTR 0xF48000000ULL</div><div class='del'>-#define AU1X_SOCK1_PHYS_MEM  0xF88000000ULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct pcmcia_state {</div><div class='del'>-  unsigned detect: 1,</div><div class='del'>-            ready: 1,</div><div class='del'>-           wrprot: 1,</div><div class='del'>-	     bvd1: 1,</div><div class='del'>-	     bvd2: 1,</div><div class='del'>-            vs_3v: 1,</div><div class='del'>-            vs_Xv: 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct pcmcia_configure {</div><div class='del'>-  unsigned sock: 8,</div><div class='del'>-            vcc: 8,</div><div class='del'>-            vpp: 8,</div><div class='del'>-         output: 1,</div><div class='del'>-        speaker: 1,</div><div class='del'>-          reset: 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct pcmcia_irqs {</div><div class='del'>-	int sock;</div><div class='del'>-	int irq;</div><div class='del'>-	const char *str;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct au1000_pcmcia_socket {</div><div class='del'>-	struct pcmcia_socket socket;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Info from low level handler</div><div class='del'>-	 */</div><div class='del'>-	struct device		*dev;</div><div class='del'>-	unsigned int		nr;</div><div class='del'>-	unsigned int		irq;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Core PCMCIA state</div><div class='del'>-	 */</div><div class='del'>-	struct pcmcia_low_level *ops;</div><div class='del'>-</div><div class='del'>-	unsigned int 		status;</div><div class='del'>-	socket_state_t		cs_state;</div><div class='del'>-</div><div class='del'>-	unsigned short		spd_io[MAX_IO_WIN];</div><div class='del'>-	unsigned short		spd_mem[MAX_WIN];</div><div class='del'>-	unsigned short		spd_attr[MAX_WIN];</div><div class='del'>-</div><div class='del'>-	struct resource		res_skt;</div><div class='del'>-	struct resource		res_io;</div><div class='del'>-	struct resource		res_mem;</div><div class='del'>-	struct resource		res_attr;</div><div class='del'>-</div><div class='del'>-	void *                 	virt_io;</div><div class='del'>-	unsigned int		phys_io;</div><div class='del'>-	unsigned int           	phys_attr;</div><div class='del'>-	unsigned int           	phys_mem;</div><div class='del'>-	unsigned short        	speed_io, speed_attr, speed_mem;</div><div class='del'>-</div><div class='del'>-	unsigned int		irq_state;</div><div class='del'>-</div><div class='del'>-	struct timer_list	poll_timer;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct pcmcia_low_level {</div><div class='del'>-	struct module *owner;</div><div class='del'>-</div><div class='del'>-	int (*hw_init)(struct au1000_pcmcia_socket *);</div><div class='del'>-	void (*hw_shutdown)(struct au1000_pcmcia_socket *);</div><div class='del'>-</div><div class='del'>-	void (*socket_state)(struct au1000_pcmcia_socket *, struct pcmcia_state *);</div><div class='del'>-	int (*configure_socket)(struct au1000_pcmcia_socket *, struct socket_state_t *);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Enable card status IRQs on (re-)initialisation.  This can</div><div class='del'>-	 * be called at initialisation, power management event, or</div><div class='del'>-	 * pcmcia event.</div><div class='del'>-	 */</div><div class='del'>-	void (*socket_init)(struct au1000_pcmcia_socket *);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Disable card status IRQs and PCMCIA bus on suspend.</div><div class='del'>-	 */</div><div class='del'>-	void (*socket_suspend)(struct au1000_pcmcia_socket *);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern int au1x_board_init(struct device *dev);</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_AU1000_PCMCIA_H */</div><div class='head'>diff --git a/drivers/pcmcia/au1000_pb1x00.c b/drivers/pcmcia/au1000_pb1x00.c<br/>deleted file mode 100644<br/>index b2396647a165..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/au1000_pb1x00.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/au1000_pb1x00.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,294 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Alchemy Semi Pb1000 boards specific pcmcia routines.</div><div class='del'>- *</div><div class='del'>- * Copyright 2002 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc.</div><div class='del'>- *         	ppopov@mvista.com or source@mvista.com</div><div class='del'>- *</div><div class='del'>- * ########################################################################</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can distribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License (Version 2) as</div><div class='del'>- *  published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope it will be useful, but WITHOUT</div><div class='del'>- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License</div><div class='del'>- *  for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License along</div><div class='del'>- *  with this program; if not, write to the 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'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;pcmcia/ss.h&gt;</div><div class='del'>-#include &lt;pcmcia/cistpl.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/au1000.h&gt;</div><div class='del'>-#include &lt;asm/au1000_pcmcia.h&gt;</div><div class='del'>-</div><div class='del'>-#define debug(fmt, arg...) do { } while (0)</div><div class='del'>-</div><div class='del'>-#include &lt;asm/pb1000.h&gt;</div><div class='del'>-#define PCMCIA_IRQ AU1000_GPIO_15</div><div class='del'>-</div><div class='del'>-static int pb1x00_pcmcia_init(struct pcmcia_init *init)</div><div class='del'>-{</div><div class='del'>-	u16 pcr;</div><div class='del'>-	pcr = PCR_SLOT_0_RST | PCR_SLOT_1_RST;</div><div class='del'>-</div><div class='del'>-	au_writel(0x8000, PB1000_MDR); /* clear pcmcia interrupt */</div><div class='del'>-	au_sync_delay(100);</div><div class='del'>-	au_writel(0x4000, PB1000_MDR); /* enable pcmcia interrupt */</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	pcr |= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,0);</div><div class='del'>-	pcr |= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,1);</div><div class='del'>-	au_writel(pcr, PB1000_PCR);</div><div class='del'>-	au_sync_delay(20);</div><div class='del'>-	  </div><div class='del'>-	return PCMCIA_NUM_SOCKS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pb1x00_pcmcia_shutdown(void)</div><div class='del'>-{</div><div class='del'>-	u16 pcr;</div><div class='del'>-	pcr = PCR_SLOT_0_RST | PCR_SLOT_1_RST;</div><div class='del'>-	pcr |= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,0);</div><div class='del'>-	pcr |= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,1);</div><div class='del'>-	au_writel(pcr, PB1000_PCR);</div><div class='del'>-	au_sync_delay(20);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int </div><div class='del'>-pb1x00_pcmcia_socket_state(unsigned sock, struct pcmcia_state *state)</div><div class='del'>-{</div><div class='del'>-	u32 inserted0, inserted1;</div><div class='del'>-	u16 vs0, vs1;</div><div class='del'>-</div><div class='del'>-	vs0 = vs1 = (u16)au_readl(PB1000_ACR1);</div><div class='del'>-	inserted0 = !(vs0 &amp; (ACR1_SLOT_0_CD1 | ACR1_SLOT_0_CD2));</div><div class='del'>-	inserted1 = !(vs1 &amp; (ACR1_SLOT_1_CD1 | ACR1_SLOT_1_CD2));</div><div class='del'>-	vs0 = (vs0 &gt;&gt; 4) &amp; 0x3;</div><div class='del'>-	vs1 = (vs1 &gt;&gt; 12) &amp; 0x3;</div><div class='del'>-</div><div class='del'>-	state-&gt;ready = 0;</div><div class='del'>-	state-&gt;vs_Xv = 0;</div><div class='del'>-	state-&gt;vs_3v = 0;</div><div class='del'>-	state-&gt;detect = 0;</div><div class='del'>-</div><div class='del'>-	if (sock == 0) {</div><div class='del'>-		if (inserted0) {</div><div class='del'>-			switch (vs0) {</div><div class='del'>-				case 0:</div><div class='del'>-				case 2:</div><div class='del'>-					state-&gt;vs_3v=1;</div><div class='del'>-					break;</div><div class='del'>-				case 3: /* 5V */</div><div class='del'>-					break;</div><div class='del'>-				default:</div><div class='del'>-					/* return without setting 'detect' */</div><div class='del'>-					printk(KERN_ERR "pb1x00 bad VS (%d)\n",</div><div class='del'>-							vs0);</div><div class='del'>-					return 0;</div><div class='del'>-			}</div><div class='del'>-			state-&gt;detect = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else  {</div><div class='del'>-		if (inserted1) {</div><div class='del'>-			switch (vs1) {</div><div class='del'>-				case 0:</div><div class='del'>-				case 2:</div><div class='del'>-					state-&gt;vs_3v=1;</div><div class='del'>-					break;</div><div class='del'>-				case 3: /* 5V */</div><div class='del'>-					break;</div><div class='del'>-				default:</div><div class='del'>-					/* return without setting 'detect' */</div><div class='del'>-					printk(KERN_ERR "pb1x00 bad VS (%d)\n",</div><div class='del'>-							vs1);</div><div class='del'>-					return 0;</div><div class='del'>-			}</div><div class='del'>-			state-&gt;detect = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (state-&gt;detect) {</div><div class='del'>-		state-&gt;ready = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	state-&gt;bvd1=1;</div><div class='del'>-	state-&gt;bvd2=1;</div><div class='del'>-	state-&gt;wrprot=0; </div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int pb1x00_pcmcia_get_irq_info(struct pcmcia_irq_info *info)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	if(info-&gt;sock &gt; PCMCIA_MAX_SOCK) return -1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Even in the case of the Pb1000, both sockets are connected</div><div class='del'>-	 * to the same irq line.</div><div class='del'>-	 */</div><div class='del'>-	info-&gt;irq = PCMCIA_IRQ;</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 </div><div class='del'>-pb1x00_pcmcia_configure_socket(const struct pcmcia_configure *configure)</div><div class='del'>-{</div><div class='del'>-	u16 pcr;</div><div class='del'>-</div><div class='del'>-	if(configure-&gt;sock &gt; PCMCIA_MAX_SOCK) return -1;</div><div class='del'>-</div><div class='del'>-	pcr = au_readl(PB1000_PCR);</div><div class='del'>-</div><div class='del'>-	if (configure-&gt;sock == 0) {</div><div class='del'>-		pcr &amp;= ~(PCR_SLOT_0_VCC0 | PCR_SLOT_0_VCC1 | </div><div class='del'>-				PCR_SLOT_0_VPP0 | PCR_SLOT_0_VPP1);</div><div class='del'>-	}</div><div class='del'>-	else  {</div><div class='del'>-		pcr &amp;= ~(PCR_SLOT_1_VCC0 | PCR_SLOT_1_VCC1 | </div><div class='del'>-				PCR_SLOT_1_VPP0 | PCR_SLOT_1_VPP1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pcr &amp;= ~PCR_SLOT_0_RST;</div><div class='del'>-	debug("Vcc %dV Vpp %dV, pcr %x\n", </div><div class='del'>-			configure-&gt;vcc, configure-&gt;vpp, pcr);</div><div class='del'>-	switch(configure-&gt;vcc){</div><div class='del'>-		case 0:  /* Vcc 0 */</div><div class='del'>-			switch(configure-&gt;vpp) {</div><div class='del'>-				case 0:</div><div class='del'>-					pcr |= SET_VCC_VPP(VCC_HIZ,VPP_GND,</div><div class='del'>-							configure-&gt;sock);</div><div class='del'>-					break;</div><div class='del'>-				case 12:</div><div class='del'>-					pcr |= SET_VCC_VPP(VCC_HIZ,VPP_12V,</div><div class='del'>-							configure-&gt;sock);</div><div class='del'>-					break;</div><div class='del'>-				case 50:</div><div class='del'>-					pcr |= SET_VCC_VPP(VCC_HIZ,VPP_5V,</div><div class='del'>-							configure-&gt;sock);</div><div class='del'>-					break;</div><div class='del'>-				case 33:</div><div class='del'>-					pcr |= SET_VCC_VPP(VCC_HIZ,VPP_3V,</div><div class='del'>-							configure-&gt;sock);</div><div class='del'>-					break;</div><div class='del'>-				default:</div><div class='del'>-					pcr |= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,</div><div class='del'>-							configure-&gt;sock);</div><div class='del'>-					printk("%s: bad Vcc/Vpp (%d:%d)\n", </div><div class='del'>-							__func__,</div><div class='del'>-							configure-&gt;vcc, </div><div class='del'>-							configure-&gt;vpp);</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 50: /* Vcc 5V */</div><div class='del'>-			switch(configure-&gt;vpp) {</div><div class='del'>-				case 0:</div><div class='del'>-					pcr |= SET_VCC_VPP(VCC_5V,VPP_GND,</div><div class='del'>-							configure-&gt;sock);</div><div class='del'>-					break;</div><div class='del'>-				case 50:</div><div class='del'>-					pcr |= SET_VCC_VPP(VCC_5V,VPP_5V,</div><div class='del'>-							configure-&gt;sock);</div><div class='del'>-					break;</div><div class='del'>-				case 12:</div><div class='del'>-					pcr |= SET_VCC_VPP(VCC_5V,VPP_12V,</div><div class='del'>-							configure-&gt;sock);</div><div class='del'>-					break;</div><div class='del'>-				case 33:</div><div class='del'>-					pcr |= SET_VCC_VPP(VCC_5V,VPP_3V,</div><div class='del'>-							configure-&gt;sock);</div><div class='del'>-					break;</div><div class='del'>-				default:</div><div class='del'>-					pcr |= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,</div><div class='del'>-							configure-&gt;sock);</div><div class='del'>-					printk("%s: bad Vcc/Vpp (%d:%d)\n", </div><div class='del'>-							__func__,</div><div class='del'>-							configure-&gt;vcc, </div><div class='del'>-							configure-&gt;vpp);</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 33: /* Vcc 3.3V */</div><div class='del'>-			switch(configure-&gt;vpp) {</div><div class='del'>-				case 0:</div><div class='del'>-					pcr |= SET_VCC_VPP(VCC_3V,VPP_GND,</div><div class='del'>-							configure-&gt;sock);</div><div class='del'>-					break;</div><div class='del'>-				case 50:</div><div class='del'>-					pcr |= SET_VCC_VPP(VCC_3V,VPP_5V,</div><div class='del'>-							configure-&gt;sock);</div><div class='del'>-					break;</div><div class='del'>-				case 12:</div><div class='del'>-					pcr |= SET_VCC_VPP(VCC_3V,VPP_12V,</div><div class='del'>-							configure-&gt;sock);</div><div class='del'>-					break;</div><div class='del'>-				case 33:</div><div class='del'>-					pcr |= SET_VCC_VPP(VCC_3V,VPP_3V,</div><div class='del'>-							configure-&gt;sock);</div><div class='del'>-					break;</div><div class='del'>-				default:</div><div class='del'>-					pcr |= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,</div><div class='del'>-							configure-&gt;sock);</div><div class='del'>-					printk("%s: bad Vcc/Vpp (%d:%d)\n", </div><div class='del'>-							__func__,</div><div class='del'>-							configure-&gt;vcc, </div><div class='del'>-							configure-&gt;vpp);</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		default: /* what's this ? */</div><div class='del'>-			pcr |= SET_VCC_VPP(VCC_HIZ,VPP_HIZ,configure-&gt;sock);</div><div class='del'>-			printk(KERN_ERR "%s: bad Vcc %d\n", </div><div class='del'>-					__func__, configure-&gt;vcc);</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (configure-&gt;sock == 0) {</div><div class='del'>-	pcr &amp;= ~(PCR_SLOT_0_RST);</div><div class='del'>-		if (configure-&gt;reset)</div><div class='del'>-		pcr |= PCR_SLOT_0_RST;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		pcr &amp;= ~(PCR_SLOT_1_RST);</div><div class='del'>-		if (configure-&gt;reset)</div><div class='del'>-			pcr |= PCR_SLOT_1_RST;</div><div class='del'>-	}</div><div class='del'>-	au_writel(pcr, PB1000_PCR);</div><div class='del'>-	au_sync_delay(300);</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'>-struct pcmcia_low_level pb1x00_pcmcia_ops = { </div><div class='del'>-	pb1x00_pcmcia_init,</div><div class='del'>-	pb1x00_pcmcia_shutdown,</div><div class='del'>-	pb1x00_pcmcia_socket_state,</div><div class='del'>-	pb1x00_pcmcia_get_irq_info,</div><div class='del'>-	pb1x00_pcmcia_configure_socket</div><div class='del'>-};</div><div class='head'>diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c<br/>index 3e49df6d5e3b..5b7c22784aff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/db1xxx_ss.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/db1xxx_ss.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/db1xxx_ss.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pcmcia/db1xxx_ss.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> /* This is a fairly generic PCMCIA socket driver suitable for the</div><div class='ctx'>  * following Alchemy Development boards:</div><div class='del'>- *  Db1000, Db/Pb1500, Db/Pb1100, Db/Pb1550, Db/Pb1200.</div><div class='add'>+ *  Db1000, Db/Pb1500, Db/Pb1100, Db/Pb1550, Db/Pb1200, Db1300</div><div class='ctx'>  *</div><div class='ctx'>  * The Db1000 is used as a reference:  Per-socket card-, carddetect- and</div><div class='ctx'>  *  statuschange IRQs connected to SoC GPIOs, control and status register</div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'>  *	- Pb1100/Pb1500:  single socket only; voltage key bits VS are</div><div class='ctx'>  *			  at STATUS[5:4] (instead of STATUS[1:0]).</div><div class='ctx'>  *	- Au1200-based:	  additional card-eject irqs, irqs not gpios!</div><div class='add'>+ *	- Db1300:	  Db1200-like, no pwr ctrl, single socket (#1).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -59,11 +60,17 @@ struct db1x_pcmcia_sock {</div><div class='ctx'> #define BOARD_TYPE_DEFAULT	0	/* most boards */</div><div class='ctx'> #define BOARD_TYPE_DB1200	1	/* IRQs aren't gpios */</div><div class='ctx'> #define BOARD_TYPE_PB1100	2	/* VS bits slightly different */</div><div class='add'>+#define BOARD_TYPE_DB1300	3	/* no power control */</div><div class='ctx'> 	int	board_type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define to_db1x_socket(x) container_of(x, struct db1x_pcmcia_sock, socket)</div><div class='ctx'> </div><div class='add'>+static int db1300_card_inserted(struct db1x_pcmcia_sock *sock)</div><div class='add'>+{</div><div class='add'>+	return bcsr_read(BCSR_SIGSTAT) &amp; (1 &lt;&lt; 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* DB/PB1200: check CPLD SIGSTATUS register bit 10/12 */</div><div class='ctx'> static int db1200_card_inserted(struct db1x_pcmcia_sock *sock)</div><div class='ctx'> {</div><div class='hunk'>@@ -84,6 +91,8 @@ static int db1x_card_inserted(struct db1x_pcmcia_sock *sock)</div><div class='ctx'> 	switch (sock-&gt;board_type) {</div><div class='ctx'> 	case BOARD_TYPE_DB1200:</div><div class='ctx'> 		return db1200_card_inserted(sock);</div><div class='add'>+	case BOARD_TYPE_DB1300:</div><div class='add'>+		return db1300_card_inserted(sock);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return db1000_card_inserted(sock);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -160,7 +169,8 @@ static int db1x_pcmcia_setup_irqs(struct db1x_pcmcia_sock *sock)</div><div class='ctx'> 	 * ejection handler have been registered and the currently</div><div class='ctx'> 	 * active one disabled.</div><div class='ctx'> 	 */</div><div class='del'>-	if (sock-&gt;board_type == BOARD_TYPE_DB1200) {</div><div class='add'>+	if ((sock-&gt;board_type == BOARD_TYPE_DB1200) ||</div><div class='add'>+	    (sock-&gt;board_type == BOARD_TYPE_DB1300)) {</div><div class='ctx'> 		ret = request_irq(sock-&gt;insert_irq, db1200_pcmcia_cdirq,</div><div class='ctx'> 				  IRQF_DISABLED, "pcmcia_insert", sock);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -174,7 +184,7 @@ static int db1x_pcmcia_setup_irqs(struct db1x_pcmcia_sock *sock)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* enable the currently silent one */</div><div class='del'>-		if (db1200_card_inserted(sock))</div><div class='add'>+		if (db1x_card_inserted(sock))</div><div class='ctx'> 			enable_irq(sock-&gt;eject_irq);</div><div class='ctx'> 		else</div><div class='ctx'> 			enable_irq(sock-&gt;insert_irq);</div><div class='hunk'>@@ -270,7 +280,8 @@ static int db1x_pcmcia_configure(struct pcmcia_socket *skt,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* create new voltage code */</div><div class='del'>-	cr_set |= ((v &lt;&lt; 2) | p) &lt;&lt; (sock-&gt;nr * 8);</div><div class='add'>+	if (sock-&gt;board_type != BOARD_TYPE_DB1300)</div><div class='add'>+		cr_set |= ((v &lt;&lt; 2) | p) &lt;&lt; (sock-&gt;nr * 8);</div><div class='ctx'> </div><div class='ctx'> 	changed = state-&gt;flags ^ sock-&gt;old_flags;</div><div class='ctx'> </div><div class='hunk'>@@ -343,6 +354,10 @@ static int db1x_pcmcia_get_status(struct pcmcia_socket *skt,</div><div class='ctx'> 	/* if Vcc is not zero, we have applied power to a card */</div><div class='ctx'> 	status |= GET_VCC(cr, sock-&gt;nr) ? SS_POWERON : 0;</div><div class='ctx'> </div><div class='add'>+	/* DB1300: power always on, but don't tell when no card present */</div><div class='add'>+	if ((sock-&gt;board_type == BOARD_TYPE_DB1300) &amp;&amp; (status &amp; SS_DETECT))</div><div class='add'>+		status = SS_POWERON | SS_3VCARD | SS_DETECT;</div><div class='add'>+</div><div class='ctx'> 	/* reset de-asserted? then we're ready */</div><div class='ctx'> 	status |= (GET_RESET(cr, sock-&gt;nr)) ? SS_READY : SS_RESET;</div><div class='ctx'> </div><div class='hunk'>@@ -419,6 +434,9 @@ static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev)</div><div class='ctx'> 	case BCSR_WHOAMI_PB1200 ... BCSR_WHOAMI_DB1200:</div><div class='ctx'> 		sock-&gt;board_type = BOARD_TYPE_DB1200;</div><div class='ctx'> 		break;</div><div class='add'>+	case BCSR_WHOAMI_DB1300:</div><div class='add'>+		sock-&gt;board_type = BOARD_TYPE_DB1300;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_INFO "db1xxx-ss: unknown board %d!\n", bid);</div><div class='ctx'> 		ret = -ENODEV;</div><div class='head'>diff --git a/drivers/pcmcia/pxa2xx_cm_x255.c b/drivers/pcmcia/pxa2xx_cm_x255.c<br/>index 0b4f946cf13a..31ab6ddf52c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/pxa2xx_cm_x255.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/pxa2xx_cm_x255.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/pxa2xx_cm_x255.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pcmcia/pxa2xx_cm_x255.c</a></div><div class='hunk'>@@ -16,8 +16,6 @@</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-</div><div class='ctx'> #include "soc_common.h"</div><div class='ctx'> </div><div class='ctx'> #define GPIO_PCMCIA_SKTSEL	(54)</div><div class='hunk'>@@ -27,15 +25,15 @@</div><div class='ctx'> #define GPIO_PCMCIA_S1_RDYINT	(8)</div><div class='ctx'> #define GPIO_PCMCIA_RESET	(9)</div><div class='ctx'> </div><div class='del'>-#define PCMCIA_S0_CD_VALID	IRQ_GPIO(GPIO_PCMCIA_S0_CD_VALID)</div><div class='del'>-#define PCMCIA_S1_CD_VALID	IRQ_GPIO(GPIO_PCMCIA_S1_CD_VALID)</div><div class='del'>-#define PCMCIA_S0_RDYINT	IRQ_GPIO(GPIO_PCMCIA_S0_RDYINT)</div><div class='del'>-#define PCMCIA_S1_RDYINT	IRQ_GPIO(GPIO_PCMCIA_S1_RDYINT)</div><div class='add'>+#define PCMCIA_S0_CD_VALID	gpio_to_irq(GPIO_PCMCIA_S0_CD_VALID)</div><div class='add'>+#define PCMCIA_S1_CD_VALID	gpio_to_irq(GPIO_PCMCIA_S1_CD_VALID)</div><div class='add'>+#define PCMCIA_S0_RDYINT	gpio_to_irq(GPIO_PCMCIA_S0_RDYINT)</div><div class='add'>+#define PCMCIA_S1_RDYINT	gpio_to_irq(GPIO_PCMCIA_S1_RDYINT)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct pcmcia_irqs irqs[] = {</div><div class='del'>-	{ 0, PCMCIA_S0_CD_VALID, "PCMCIA0 CD" },</div><div class='del'>-	{ 1, PCMCIA_S1_CD_VALID, "PCMCIA1 CD" },</div><div class='add'>+	{ .sock = 0, .str = "PCMCIA0 CD" },</div><div class='add'>+	{ .sock = 1, .str = "PCMCIA1 CD" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int cmx255_pcmcia_hw_init(struct soc_pcmcia_socket *skt)</div><div class='hunk'>@@ -46,6 +44,8 @@ static int cmx255_pcmcia_hw_init(struct soc_pcmcia_socket *skt)</div><div class='ctx'> 	gpio_direction_output(GPIO_PCMCIA_RESET, 0);</div><div class='ctx'> </div><div class='ctx'> 	skt-&gt;socket.pci_irq = skt-&gt;nr == 0 ? PCMCIA_S0_RDYINT : PCMCIA_S1_RDYINT;</div><div class='add'>+	irqs[0].irq = PCMCIA_S0_CD_VALID;</div><div class='add'>+	irqs[1].irq = PCMCIA_S1_CD_VALID;</div><div class='ctx'> 	ret = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		gpio_free(GPIO_PCMCIA_RESET);</div><div class='head'>diff --git a/drivers/pcmcia/pxa2xx_cm_x270.c b/drivers/pcmcia/pxa2xx_cm_x270.c<br/>index 923f315926ef..3dc7621a0767 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/pxa2xx_cm_x270.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/pxa2xx_cm_x270.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/pxa2xx_cm_x270.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pcmcia/pxa2xx_cm_x270.c</a></div><div class='hunk'>@@ -16,20 +16,18 @@</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-</div><div class='ctx'> #include "soc_common.h"</div><div class='ctx'> </div><div class='ctx'> #define GPIO_PCMCIA_S0_CD_VALID	(84)</div><div class='ctx'> #define GPIO_PCMCIA_S0_RDYINT	(82)</div><div class='ctx'> #define GPIO_PCMCIA_RESET	(53)</div><div class='ctx'> </div><div class='del'>-#define PCMCIA_S0_CD_VALID	IRQ_GPIO(GPIO_PCMCIA_S0_CD_VALID)</div><div class='del'>-#define PCMCIA_S0_RDYINT	IRQ_GPIO(GPIO_PCMCIA_S0_RDYINT)</div><div class='add'>+#define PCMCIA_S0_CD_VALID	gpio_to_irq(GPIO_PCMCIA_S0_CD_VALID)</div><div class='add'>+#define PCMCIA_S0_RDYINT	gpio_to_irq(GPIO_PCMCIA_S0_RDYINT)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct pcmcia_irqs irqs[] = {</div><div class='del'>-	{ 0, PCMCIA_S0_CD_VALID, "PCMCIA0 CD" },</div><div class='add'>+	{ .sock = 0, .str = "PCMCIA0 CD" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int cmx270_pcmcia_hw_init(struct soc_pcmcia_socket *skt)</div><div class='hunk'>@@ -40,6 +38,7 @@ static int cmx270_pcmcia_hw_init(struct soc_pcmcia_socket *skt)</div><div class='ctx'> 	gpio_direction_output(GPIO_PCMCIA_RESET, 0);</div><div class='ctx'> </div><div class='ctx'> 	skt-&gt;socket.pci_irq = PCMCIA_S0_RDYINT;</div><div class='add'>+	irqs[0].irq = PCMCIA_S0_CD_VALID;</div><div class='ctx'> 	ret = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		gpio_free(GPIO_PCMCIA_RESET);</div><div class='head'>diff --git a/drivers/pcmcia/pxa2xx_e740.c b/drivers/pcmcia/pxa2xx_e740.c<br/>index 8bfbd4dca131..17cd2ce7428f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/pxa2xx_e740.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/pxa2xx_e740.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/pxa2xx_e740.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pcmcia/pxa2xx_e740.c</a></div><div class='hunk'>@@ -26,20 +26,23 @@</div><div class='ctx'> static struct pcmcia_irqs cd_irqs[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.sock = 0,</div><div class='del'>-		.irq  = IRQ_GPIO(GPIO_E740_PCMCIA_CD0),</div><div class='ctx'> 		.str  = "CF card detect"</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.sock = 1,</div><div class='del'>-		.irq  = IRQ_GPIO(GPIO_E740_PCMCIA_CD1),</div><div class='ctx'> 		.str  = "Wifi switch"</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int e740_pcmcia_hw_init(struct soc_pcmcia_socket *skt)</div><div class='ctx'> {</div><div class='del'>-	skt-&gt;socket.pci_irq = skt-&gt;nr == 0 ? IRQ_GPIO(GPIO_E740_PCMCIA_RDY0) :</div><div class='del'>-				IRQ_GPIO(GPIO_E740_PCMCIA_RDY1);</div><div class='add'>+	if (skt-&gt;nr == 0)</div><div class='add'>+		skt-&gt;socket.pci_irq = gpio_to_irq(GPIO_E740_PCMCIA_RDY0);</div><div class='add'>+	else</div><div class='add'>+		skt-&gt;socket.pci_irq = gpio_to_irq(GPIO_E740_PCMCIA_RDY1);</div><div class='add'>+</div><div class='add'>+	cd_irqs[0].irq = gpio_to_irq(GPIO_E740_PCMCIA_CD0);</div><div class='add'>+	cd_irqs[1].irq = gpio_to_irq(GPIO_E740_PCMCIA_CD1);</div><div class='ctx'> </div><div class='ctx'> 	return soc_pcmcia_request_irqs(skt, &amp;cd_irqs[skt-&gt;nr], 1);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/pcmcia/pxa2xx_palmld.c b/drivers/pcmcia/pxa2xx_palmld.c<br/>index d589ad1dcd4c..6a8e011a8c13 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/pxa2xx_palmld.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/pxa2xx_palmld.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/pxa2xx_palmld.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pcmcia/pxa2xx_palmld.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@ static int palmld_pcmcia_hw_init(struct soc_pcmcia_socket *skt)</div><div class='ctx'> 	ret = gpio_request_array(palmld_pcmcia_gpios,</div><div class='ctx'> 				ARRAY_SIZE(palmld_pcmcia_gpios));</div><div class='ctx'> </div><div class='del'>-	skt-&gt;socket.pci_irq = IRQ_GPIO(GPIO_NR_PALMLD_PCMCIA_READY);</div><div class='add'>+	skt-&gt;socket.pci_irq = gpio_to_irq(GPIO_NR_PALMLD_PCMCIA_READY);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/pcmcia/pxa2xx_palmtc.c b/drivers/pcmcia/pxa2xx_palmtc.c<br/>index 9c6a04b2f71b..9e38de769ba3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/pxa2xx_palmtc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/pxa2xx_palmtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/pxa2xx_palmtc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pcmcia/pxa2xx_palmtc.c</a></div><div class='hunk'>@@ -37,7 +37,7 @@ static int palmtc_pcmcia_hw_init(struct soc_pcmcia_socket *skt)</div><div class='ctx'> 	ret = gpio_request_array(palmtc_pcmcia_gpios,</div><div class='ctx'> 				ARRAY_SIZE(palmtc_pcmcia_gpios));</div><div class='ctx'> </div><div class='del'>-	skt-&gt;socket.pci_irq = IRQ_GPIO(GPIO_NR_PALMTC_PCMCIA_READY);</div><div class='add'>+	skt-&gt;socket.pci_irq = gpio_to_irq(GPIO_NR_PALMTC_PCMCIA_READY);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/pcmcia/pxa2xx_stargate2.c b/drivers/pcmcia/pxa2xx_stargate2.c<br/>index 939622251dfb..6c2366b74a35 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/pxa2xx_stargate2.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/pxa2xx_stargate2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/pxa2xx_stargate2.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pcmcia/pxa2xx_stargate2.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #define SG2_S0_GPIO_READY	81</div><div class='ctx'> </div><div class='ctx'> static struct pcmcia_irqs irqs[] = {</div><div class='del'>-	{ 0, IRQ_GPIO(SG2_S0_GPIO_DETECT), "PCMCIA0 CD" },</div><div class='add'>+	{.sock = 0, .str = "PCMCIA0 CD" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct gpio sg2_pcmcia_gpios[] = {</div><div class='hunk'>@@ -44,7 +44,9 @@ static struct gpio sg2_pcmcia_gpios[] = {</div><div class='ctx'> </div><div class='ctx'> static int sg2_pcmcia_hw_init(struct soc_pcmcia_socket *skt)</div><div class='ctx'> {</div><div class='del'>-	skt-&gt;socket.pci_irq = IRQ_GPIO(SG2_S0_GPIO_READY);</div><div class='add'>+	skt-&gt;socket.pci_irq = gpio_to_irq(SG2_S0_GPIO_READY);</div><div class='add'>+	irqs[0].irq = gpio_to_irq(SG2_S0_GPIO_DETECT);</div><div class='add'>+</div><div class='ctx'> 	return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c<br/>index 57ddb969d888..7c33f898135a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/pxa2xx_trizeps4.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/pxa2xx_trizeps4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/pxa2xx_trizeps4.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pcmcia/pxa2xx_trizeps4.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> extern void board_pcmcia_power(int power);</div><div class='ctx'> </div><div class='ctx'> static struct pcmcia_irqs irqs[] = {</div><div class='del'>-	{ 0, IRQ_GPIO(GPIO_PCD), "cs0_cd" }</div><div class='add'>+	{ .sock = 0, .str = "cs0_cd" }</div><div class='ctx'> 	/* on other baseboards we can have more inputs */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -53,7 +53,8 @@ static int trizeps_pcmcia_hw_init(struct soc_pcmcia_socket *skt)</div><div class='ctx'> 			gpio_free(GPIO_PRDY);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		skt-&gt;socket.pci_irq = IRQ_GPIO(GPIO_PRDY);</div><div class='add'>+		skt-&gt;socket.pci_irq = gpio_to_irq(GPIO_PRDY);</div><div class='add'>+		irqs[0].irq = gpio_to_irq(GPIO_PCD);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/pcmcia/pxa2xx_vpac270.c b/drivers/pcmcia/pxa2xx_vpac270.c<br/>index 66ab92cf3105..61b17d235dbe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/pxa2xx_vpac270.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/pxa2xx_vpac270.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/pxa2xx_vpac270.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pcmcia/pxa2xx_vpac270.c</a></div><div class='hunk'>@@ -38,12 +38,10 @@ static struct gpio vpac270_cf_gpios[] = {</div><div class='ctx'> static struct pcmcia_irqs cd_irqs[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.sock = 0,</div><div class='del'>-		.irq  = IRQ_GPIO(GPIO84_VPAC270_PCMCIA_CD),</div><div class='ctx'> 		.str  = "PCMCIA CD"</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.sock = 1,</div><div class='del'>-		.irq  = IRQ_GPIO(GPIO17_VPAC270_CF_CD),</div><div class='ctx'> 		.str  = "CF CD"</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -57,6 +55,7 @@ static int vpac270_pcmcia_hw_init(struct soc_pcmcia_socket *skt)</div><div class='ctx'> 				ARRAY_SIZE(vpac270_pcmcia_gpios));</div><div class='ctx'> </div><div class='ctx'> 		skt-&gt;socket.pci_irq = gpio_to_irq(GPIO35_VPAC270_PCMCIA_RDY);</div><div class='add'>+		cd_irqs[0].irq = gpio_to_irq(GPIO84_VPAC270_PCMCIA_CD);</div><div class='ctx'> </div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			ret = soc_pcmcia_request_irqs(skt, &amp;cd_irqs[0], 1);</div><div class='hunk'>@@ -65,6 +64,7 @@ static int vpac270_pcmcia_hw_init(struct soc_pcmcia_socket *skt)</div><div class='ctx'> 				ARRAY_SIZE(vpac270_cf_gpios));</div><div class='ctx'> </div><div class='ctx'> 		skt-&gt;socket.pci_irq = gpio_to_irq(GPIO12_VPAC270_CF_RDY);</div><div class='add'>+		cd_irqs[1].irq = gpio_to_irq(GPIO17_VPAC270_CF_CD);</div><div class='ctx'> </div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			ret = soc_pcmcia_request_irqs(skt, &amp;cd_irqs[1], 1);</div><div class='head'>diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c<br/>index 9dc565c615bd..849c0c11d2af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/yenta_socket.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pcmcia/yenta_socket.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/yenta_socket.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pcmcia/yenta_socket.c</a></div><div class='hunk'>@@ -24,15 +24,15 @@</div><div class='ctx'> #include "yenta_socket.h"</div><div class='ctx'> #include "i82365.h"</div><div class='ctx'> </div><div class='del'>-static int disable_clkrun;</div><div class='add'>+static bool disable_clkrun;</div><div class='ctx'> module_param(disable_clkrun, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(disable_clkrun, "If PC card doesn't function properly, please try this option");</div><div class='ctx'> </div><div class='del'>-static int isa_probe = 1;</div><div class='add'>+static bool isa_probe = 1;</div><div class='ctx'> module_param(isa_probe, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(isa_probe, "If set ISA interrupts are probed (default). Set to N to disable probing");</div><div class='ctx'> </div><div class='del'>-static int pwr_irqs_off;</div><div class='add'>+static bool pwr_irqs_off;</div><div class='ctx'> module_param(pwr_irqs_off, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(pwr_irqs_off, "Force IRQs off during power-on of slot. Use only when seeing IRQ storms!");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig<br/>index e17e2f8001d2..afaf88558125 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pinctrl/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pinctrl/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pinctrl/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pinctrl/Kconfig</a></div><div class='hunk'>@@ -12,7 +12,10 @@ menu "Pin controllers"</div><div class='ctx'> 	depends on PINCTRL</div><div class='ctx'> </div><div class='ctx'> config PINMUX</div><div class='del'>-	bool "Support pinmux controllers"</div><div class='add'>+	bool "Support pin multiplexing controllers"</div><div class='add'>+</div><div class='add'>+config PINCONF</div><div class='add'>+	bool "Support pin configuration controllers"</div><div class='ctx'> </div><div class='ctx'> config DEBUG_PINCTRL</div><div class='ctx'> 	bool "Debug PINCTRL calls"</div><div class='hunk'>@@ -20,16 +23,25 @@ config DEBUG_PINCTRL</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to add some extra checks and diagnostics to PINCTRL calls.</div><div class='ctx'> </div><div class='del'>-config PINMUX_SIRF</div><div class='del'>-	bool "CSR SiRFprimaII pinmux driver"</div><div class='add'>+config PINCTRL_SIRF</div><div class='add'>+	bool "CSR SiRFprimaII pin controller driver"</div><div class='ctx'> 	depends on ARCH_PRIMA2</div><div class='ctx'> 	select PINMUX</div><div class='ctx'> </div><div class='del'>-config PINMUX_U300</div><div class='del'>-	bool "U300 pinmux driver"</div><div class='add'>+config PINCTRL_U300</div><div class='add'>+	bool "U300 pin controller driver"</div><div class='ctx'> 	depends on ARCH_U300</div><div class='ctx'> 	select PINMUX</div><div class='ctx'> </div><div class='add'>+config PINCTRL_COH901</div><div class='add'>+	bool "ST-Ericsson U300 COH 901 335/571 GPIO"</div><div class='add'>+	depends on GPIOLIB &amp;&amp; ARCH_U300 &amp;&amp; PINMUX_U300</div><div class='add'>+	help</div><div class='add'>+	  Say yes here to support GPIO interface on ST-Ericsson U300.</div><div class='add'>+	  The names of the two IP block variants supported are</div><div class='add'>+	  COH 901 335 and COH 901 571/3. They contain 3, 5 or 7</div><div class='add'>+	  ports of 8 GPIO pins each.</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/pinctrl/Makefile b/drivers/pinctrl/Makefile<br/>index bdc548a6b7e9..827601cc68f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pinctrl/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pinctrl/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pinctrl/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pinctrl/Makefile</a></div><div class='hunk'>@@ -1,8 +1,10 @@</div><div class='ctx'> # generic pinmux support</div><div class='ctx'> </div><div class='del'>-ccflags-$(CONFIG_DEBUG_PINMUX)	+= -DDEBUG</div><div class='add'>+ccflags-$(CONFIG_DEBUG_PINCTRL)	+= -DDEBUG</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PINCTRL)		+= core.o</div><div class='ctx'> obj-$(CONFIG_PINMUX)		+= pinmux.o</div><div class='del'>-obj-$(CONFIG_PINMUX_SIRF)	+= pinmux-sirf.o</div><div class='del'>-obj-$(CONFIG_PINMUX_U300)	+= pinmux-u300.o</div><div class='add'>+obj-$(CONFIG_PINCONF)		+= pinconf.o</div><div class='add'>+obj-$(CONFIG_PINCTRL_SIRF)	+= pinctrl-sirf.o</div><div class='add'>+obj-$(CONFIG_PINCTRL_U300)	+= pinctrl-u300.o</div><div class='add'>+obj-$(CONFIG_PINCTRL_COH901)	+= pinctrl-coh901.o</div><div class='head'>diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c<br/>index eadef9e191ea..569bdb3ef104 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pinctrl/core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pinctrl/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pinctrl/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pinctrl/core.c</a></div><div class='hunk'>@@ -28,17 +28,12 @@</div><div class='ctx'> #include &lt;linux/pinctrl/machine.h&gt;</div><div class='ctx'> #include "core.h"</div><div class='ctx'> #include "pinmux.h"</div><div class='add'>+#include "pinconf.h"</div><div class='ctx'> </div><div class='ctx'> /* Global list of pin control devices */</div><div class='ctx'> static DEFINE_MUTEX(pinctrldev_list_mutex);</div><div class='ctx'> static LIST_HEAD(pinctrldev_list);</div><div class='ctx'> </div><div class='del'>-static void pinctrl_dev_release(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct pinctrl_dev *pctldev = dev_get_drvdata(dev);</div><div class='del'>-	kfree(pctldev);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> const char *pinctrl_dev_get_name(struct pinctrl_dev *pctldev)</div><div class='ctx'> {</div><div class='ctx'> 	/* We're not allowed to register devices without name */</div><div class='hunk'>@@ -70,14 +65,14 @@ struct pinctrl_dev *get_pinctrl_dev_from_dev(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;pinctrldev_list_mutex);</div><div class='ctx'> 	list_for_each_entry(pctldev, &amp;pinctrldev_list, node) {</div><div class='del'>-		if (dev &amp;&amp;  &amp;pctldev-&gt;dev == dev) {</div><div class='add'>+		if (dev &amp;&amp; pctldev-&gt;dev == dev) {</div><div class='ctx'> 			/* Matched on device pointer */</div><div class='ctx'> 			found = true;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (devname &amp;&amp;</div><div class='del'>-		    !strcmp(dev_name(&amp;pctldev-&gt;dev), devname)) {</div><div class='add'>+		    !strcmp(dev_name(pctldev-&gt;dev), devname)) {</div><div class='ctx'> 			/* Matched on device name */</div><div class='ctx'> 			found = true;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -88,7 +83,7 @@ struct pinctrl_dev *get_pinctrl_dev_from_dev(struct device *dev,</div><div class='ctx'> 	return found ? pctldev : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct pin_desc *pin_desc_get(struct pinctrl_dev *pctldev, int pin)</div><div class='add'>+struct pin_desc *pin_desc_get(struct pinctrl_dev *pctldev, unsigned int pin)</div><div class='ctx'> {</div><div class='ctx'> 	struct pin_desc *pindesc;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -101,6 +96,31 @@ struct pin_desc *pin_desc_get(struct pinctrl_dev *pctldev, int pin)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * pin_get_from_name() - look up a pin number from a name</div><div class='add'>+ * @pctldev: the pin control device to lookup the pin on</div><div class='add'>+ * @name: the name of the pin to look up</div><div class='add'>+ */</div><div class='add'>+int pin_get_from_name(struct pinctrl_dev *pctldev, const char *name)</div><div class='add'>+{</div><div class='add'>+	unsigned i, pin;</div><div class='add'>+</div><div class='add'>+	/* The pin number can be retrived from the pin controller descriptor */</div><div class='add'>+	for (i = 0; i &lt; pctldev-&gt;desc-&gt;npins; i++) {</div><div class='add'>+		struct pin_desc *desc;</div><div class='add'>+</div><div class='add'>+		pin = pctldev-&gt;desc-&gt;pins[i].number;</div><div class='add'>+		desc = pin_desc_get(pctldev, pin);</div><div class='add'>+		/* Pin space may be sparse */</div><div class='add'>+		if (desc == NULL)</div><div class='add'>+			continue;</div><div class='add'>+		if (desc-&gt;name &amp;&amp; !strcmp(name, desc-&gt;name))</div><div class='add'>+			return pin;</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='ctx'>  * pin_is_valid() - check if pin exists on controller</div><div class='ctx'>  * @pctldev: the pin control device to check the pin on</div><div class='ctx'>  * @pin: pin to check, use the local pin controller index number</div><div class='hunk'>@@ -139,6 +159,8 @@ static void pinctrl_free_pindescs(struct pinctrl_dev *pctldev,</div><div class='ctx'> 		if (pindesc != NULL) {</div><div class='ctx'> 			radix_tree_delete(&amp;pctldev-&gt;pin_desc_tree,</div><div class='ctx'> 					  pins[i].number);</div><div class='add'>+			if (pindesc-&gt;dynamic_name)</div><div class='add'>+				kfree(pindesc-&gt;name);</div><div class='ctx'> 		}</div><div class='ctx'> 		kfree(pindesc);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -160,19 +182,27 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev,</div><div class='ctx'> 	pindesc = kzalloc(sizeof(*pindesc), GFP_KERNEL);</div><div class='ctx'> 	if (pindesc == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_init(&amp;pindesc-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Set owner */</div><div class='ctx'> 	pindesc-&gt;pctldev = pctldev;</div><div class='ctx'> </div><div class='ctx'> 	/* Copy basic pin info */</div><div class='del'>-	pindesc-&gt;name = name;</div><div class='add'>+	if (pindesc-&gt;name) {</div><div class='add'>+		pindesc-&gt;name = name;</div><div class='add'>+	} else {</div><div class='add'>+		pindesc-&gt;name = kasprintf(GFP_KERNEL, "PIN%u", number);</div><div class='add'>+		if (pindesc-&gt;name == NULL)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		pindesc-&gt;dynamic_name = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;pctldev-&gt;pin_desc_tree_lock);</div><div class='ctx'> 	radix_tree_insert(&amp;pctldev-&gt;pin_desc_tree, number, pindesc);</div><div class='ctx'> 	spin_unlock(&amp;pctldev-&gt;pin_desc_tree_lock);</div><div class='ctx'> 	pr_debug("registered pin %d (%s) on %s\n",</div><div class='del'>-		 number, name ? name : "(unnamed)", pctldev-&gt;desc-&gt;name);</div><div class='add'>+		 number, pindesc-&gt;name, pctldev-&gt;desc-&gt;name);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -284,21 +314,52 @@ void pinctrl_remove_gpio_range(struct pinctrl_dev *pctldev,</div><div class='ctx'> 	mutex_unlock(&amp;pctldev-&gt;gpio_ranges_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * pinctrl_get_group_selector() - returns the group selector for a group</div><div class='add'>+ * @pctldev: the pin controller handling the group</div><div class='add'>+ * @pin_group: the pin group to look up</div><div class='add'>+ */</div><div class='add'>+int pinctrl_get_group_selector(struct pinctrl_dev *pctldev,</div><div class='add'>+			       const char *pin_group)</div><div class='add'>+{</div><div class='add'>+	const struct pinctrl_ops *pctlops = pctldev-&gt;desc-&gt;pctlops;</div><div class='add'>+	unsigned group_selector = 0;</div><div class='add'>+</div><div class='add'>+	while (pctlops-&gt;list_groups(pctldev, group_selector) &gt;= 0) {</div><div class='add'>+		const char *gname = pctlops-&gt;get_group_name(pctldev,</div><div class='add'>+							    group_selector);</div><div class='add'>+		if (!strcmp(gname, pin_group)) {</div><div class='add'>+			dev_dbg(pctldev-&gt;dev,</div><div class='add'>+				"found group selector %u for %s\n",</div><div class='add'>+				group_selector,</div><div class='add'>+				pin_group);</div><div class='add'>+			return group_selector;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		group_selector++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_err(pctldev-&gt;dev, "does not have pin group %s\n",</div><div class='add'>+		pin_group);</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='ctx'> </div><div class='ctx'> static int pinctrl_pins_show(struct seq_file *s, void *what)</div><div class='ctx'> {</div><div class='ctx'> 	struct pinctrl_dev *pctldev = s-&gt;private;</div><div class='ctx'> 	const struct pinctrl_ops *ops = pctldev-&gt;desc-&gt;pctlops;</div><div class='del'>-	unsigned pin;</div><div class='add'>+	unsigned i, pin;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(s, "registered pins: %d\n", pctldev-&gt;desc-&gt;npins);</div><div class='del'>-	seq_printf(s, "max pin number: %d\n", pctldev-&gt;desc-&gt;maxpin);</div><div class='ctx'> </div><div class='del'>-	/* The highest pin number need to be included in the loop, thus &lt;= */</div><div class='del'>-	for (pin = 0; pin &lt;= pctldev-&gt;desc-&gt;maxpin; pin++) {</div><div class='add'>+	/* The pin number can be retrived from the pin controller descriptor */</div><div class='add'>+	for (i = 0; i &lt; pctldev-&gt;desc-&gt;npins; i++) {</div><div class='ctx'> 		struct pin_desc *desc;</div><div class='ctx'> </div><div class='add'>+		pin = pctldev-&gt;desc-&gt;pins[i].number;</div><div class='ctx'> 		desc = pin_desc_get(pctldev, pin);</div><div class='ctx'> 		/* Pin space may be sparse */</div><div class='ctx'> 		if (desc == NULL)</div><div class='hunk'>@@ -363,8 +424,11 @@ static int pinctrl_gpioranges_show(struct seq_file *s, void *what)</div><div class='ctx'> 	/* Loop over the ranges */</div><div class='ctx'> 	mutex_lock(&amp;pctldev-&gt;gpio_ranges_lock);</div><div class='ctx'> 	list_for_each_entry(range, &amp;pctldev-&gt;gpio_ranges, node) {</div><div class='del'>-		seq_printf(s, "%u: %s [%u - %u]\n", range-&gt;id, range-&gt;name,</div><div class='del'>-			   range-&gt;base, (range-&gt;base + range-&gt;npins - 1));</div><div class='add'>+		seq_printf(s, "%u: %s GPIOS [%u - %u] PINS [%u - %u]\n",</div><div class='add'>+			   range-&gt;id, range-&gt;name,</div><div class='add'>+			   range-&gt;base, (range-&gt;base + range-&gt;npins - 1),</div><div class='add'>+			   range-&gt;pin_base,</div><div class='add'>+			   (range-&gt;pin_base + range-&gt;npins - 1));</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;pctldev-&gt;gpio_ranges_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -375,11 +439,15 @@ static int pinctrl_devices_show(struct seq_file *s, void *what)</div><div class='ctx'> {</div><div class='ctx'> 	struct pinctrl_dev *pctldev;</div><div class='ctx'> </div><div class='del'>-	seq_puts(s, "name [pinmux]\n");</div><div class='add'>+	seq_puts(s, "name [pinmux] [pinconf]\n");</div><div class='ctx'> 	mutex_lock(&amp;pinctrldev_list_mutex);</div><div class='ctx'> 	list_for_each_entry(pctldev, &amp;pinctrldev_list, node) {</div><div class='ctx'> 		seq_printf(s, "%s ", pctldev-&gt;desc-&gt;name);</div><div class='ctx'> 		if (pctldev-&gt;desc-&gt;pmxops)</div><div class='add'>+			seq_puts(s, "yes ");</div><div class='add'>+		else</div><div class='add'>+			seq_puts(s, "no ");</div><div class='add'>+		if (pctldev-&gt;desc-&gt;confops)</div><div class='ctx'> 			seq_puts(s, "yes");</div><div class='ctx'> 		else</div><div class='ctx'> 			seq_puts(s, "no");</div><div class='hunk'>@@ -444,11 +512,11 @@ static void pinctrl_init_device_debugfs(struct pinctrl_dev *pctldev)</div><div class='ctx'> {</div><div class='ctx'> 	static struct dentry *device_root;</div><div class='ctx'> </div><div class='del'>-	device_root = debugfs_create_dir(dev_name(&amp;pctldev-&gt;dev),</div><div class='add'>+	device_root = debugfs_create_dir(dev_name(pctldev-&gt;dev),</div><div class='ctx'> 					 debugfs_root);</div><div class='ctx'> 	if (IS_ERR(device_root) || !device_root) {</div><div class='ctx'> 		pr_warn("failed to create debugfs directory for %s\n",</div><div class='del'>-			dev_name(&amp;pctldev-&gt;dev));</div><div class='add'>+			dev_name(pctldev-&gt;dev));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	debugfs_create_file("pins", S_IFREG | S_IRUGO,</div><div class='hunk'>@@ -458,6 +526,7 @@ static void pinctrl_init_device_debugfs(struct pinctrl_dev *pctldev)</div><div class='ctx'> 	debugfs_create_file("gpio-ranges", S_IFREG | S_IRUGO,</div><div class='ctx'> 			    device_root, pctldev, &amp;pinctrl_gpioranges_ops);</div><div class='ctx'> 	pinmux_init_device_debugfs(device_root, pctldev);</div><div class='add'>+	pinconf_init_device_debugfs(device_root, pctldev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pinctrl_init_debugfs(void)</div><div class='hunk'>@@ -495,7 +564,6 @@ static void pinctrl_init_debugfs(void)</div><div class='ctx'> struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,</div><div class='ctx'> 				    struct device *dev, void *driver_data)</div><div class='ctx'> {</div><div class='del'>-	static atomic_t pinmux_no = ATOMIC_INIT(0);</div><div class='ctx'> 	struct pinctrl_dev *pctldev;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -514,6 +582,16 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* If we're implementing pinconfig, check the ops for sanity */</div><div class='add'>+	if (pctldesc-&gt;confops) {</div><div class='add'>+		ret = pinconf_check_ops(pctldesc-&gt;confops);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_err("%s pin config ops lacks necessary functions\n",</div><div class='add'>+			       pctldesc-&gt;name);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	pctldev = kzalloc(sizeof(struct pinctrl_dev), GFP_KERNEL);</div><div class='ctx'> 	if (pctldev == NULL)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -526,18 +604,7 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,</div><div class='ctx'> 	spin_lock_init(&amp;pctldev-&gt;pin_desc_tree_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;pctldev-&gt;gpio_ranges);</div><div class='ctx'> 	mutex_init(&amp;pctldev-&gt;gpio_ranges_lock);</div><div class='del'>-</div><div class='del'>-	/* Register device */</div><div class='del'>-	pctldev-&gt;dev.parent = dev;</div><div class='del'>-	dev_set_name(&amp;pctldev-&gt;dev, "pinctrl.%d",</div><div class='del'>-		     atomic_inc_return(&amp;pinmux_no) - 1);</div><div class='del'>-	pctldev-&gt;dev.release = pinctrl_dev_release;</div><div class='del'>-	ret = device_register(&amp;pctldev-&gt;dev);</div><div class='del'>-	if (ret != 0) {</div><div class='del'>-		pr_err("error in device registration\n");</div><div class='del'>-		goto out_reg_dev_err;</div><div class='del'>-	}</div><div class='del'>-	dev_set_drvdata(&amp;pctldev-&gt;dev, pctldev);</div><div class='add'>+	pctldev-&gt;dev = dev;</div><div class='ctx'> </div><div class='ctx'> 	/* Register all the pins */</div><div class='ctx'> 	pr_debug("try to register %d pins on %s...\n",</div><div class='hunk'>@@ -547,7 +614,7 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,</div><div class='ctx'> 		pr_err("error during pin registration\n");</div><div class='ctx'> 		pinctrl_free_pindescs(pctldev, pctldesc-&gt;pins,</div><div class='ctx'> 				      pctldesc-&gt;npins);</div><div class='del'>-		goto out_reg_pins_err;</div><div class='add'>+		goto out_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pinctrl_init_device_debugfs(pctldev);</div><div class='hunk'>@@ -557,10 +624,8 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,</div><div class='ctx'> 	pinmux_hog_maps(pctldev);</div><div class='ctx'> 	return pctldev;</div><div class='ctx'> </div><div class='del'>-out_reg_pins_err:</div><div class='del'>-	device_del(&amp;pctldev-&gt;dev);</div><div class='del'>-out_reg_dev_err:</div><div class='del'>-	put_device(&amp;pctldev-&gt;dev);</div><div class='add'>+out_err:</div><div class='add'>+	kfree(pctldev);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pinctrl_register);</div><div class='hunk'>@@ -584,7 +649,7 @@ void pinctrl_unregister(struct pinctrl_dev *pctldev)</div><div class='ctx'> 	/* Destroy descriptor tree */</div><div class='ctx'> 	pinctrl_free_pindescs(pctldev, pctldev-&gt;desc-&gt;pins,</div><div class='ctx'> 			      pctldev-&gt;desc-&gt;npins);</div><div class='del'>-	device_unregister(&amp;pctldev-&gt;dev);</div><div class='add'>+	kfree(pctldev);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pinctrl_unregister);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h<br/>index 472fa1341cc0..177a3310547f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pinctrl/core.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pinctrl/core.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pinctrl/core.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pinctrl/core.h</a></div><div class='hunk'>@@ -9,6 +9,10 @@</div><div class='ctx'>  * License terms: GNU General Public License (GPL) version 2</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/pinctrl/pinconf.h&gt;</div><div class='add'>+</div><div class='add'>+struct pinctrl_gpio_range;</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct pinctrl_dev - pin control class device</div><div class='ctx'>  * @node: node to include this pin controller in the global pin controller list</div><div class='hunk'>@@ -34,7 +38,7 @@ struct pinctrl_dev {</div><div class='ctx'> 	spinlock_t pin_desc_tree_lock;</div><div class='ctx'> 	struct list_head gpio_ranges;</div><div class='ctx'> 	struct mutex gpio_ranges_lock;</div><div class='del'>-	struct device dev;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> 	struct module *owner;</div><div class='ctx'> 	void *driver_data;</div><div class='ctx'> #ifdef CONFIG_PINMUX</div><div class='hunk'>@@ -48,6 +52,7 @@ struct pinctrl_dev {</div><div class='ctx'>  * @pctldev: corresponding pin control device</div><div class='ctx'>  * @name: a name for the pin, e.g. the name of the pin/pad/finger on a</div><div class='ctx'>  *	datasheet or such</div><div class='add'>+ * @dynamic_name: if the name of this pin was dynamically allocated</div><div class='ctx'>  * @lock: a lock to protect the descriptor structure</div><div class='ctx'>  * @mux_requested: whether the pin is already requested by pinmux or not</div><div class='ctx'>  * @mux_function: a named muxing function for the pin that will be passed to</div><div class='hunk'>@@ -56,6 +61,7 @@ struct pinctrl_dev {</div><div class='ctx'> struct pin_desc {</div><div class='ctx'> 	struct pinctrl_dev *pctldev;</div><div class='ctx'> 	const char *name;</div><div class='add'>+	bool dynamic_name;</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	/* These fields only added when supporting pinmux drivers */</div><div class='ctx'> #ifdef CONFIG_PINMUX</div><div class='hunk'>@@ -65,7 +71,10 @@ struct pin_desc {</div><div class='ctx'> </div><div class='ctx'> struct pinctrl_dev *get_pinctrl_dev_from_dev(struct device *dev,</div><div class='ctx'> 					     const char *dev_name);</div><div class='del'>-struct pin_desc *pin_desc_get(struct pinctrl_dev *pctldev, int pin);</div><div class='add'>+struct pin_desc *pin_desc_get(struct pinctrl_dev *pctldev, unsigned int pin);</div><div class='add'>+int pin_get_from_name(struct pinctrl_dev *pctldev, const char *name);</div><div class='ctx'> int pinctrl_get_device_gpio_range(unsigned gpio,</div><div class='ctx'> 				  struct pinctrl_dev **outdev,</div><div class='ctx'> 				  struct pinctrl_gpio_range **outrange);</div><div class='add'>+int pinctrl_get_group_selector(struct pinctrl_dev *pctldev,</div><div class='add'>+			       const char *pin_group);</div><div class='head'>diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c<br/>new file mode 100644<br/>index 000000000000..1259872b0a1d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pinctrl/pinconf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pinctrl/pinconf.c</a></div><div class='hunk'>@@ -0,0 +1,326 @@</div><div class='add'>+/*</div><div class='add'>+ * Core driver for the pin config portions of the pin control subsystem</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 ST-Ericsson SA</div><div class='add'>+ * Written on behalf of Linaro for ST-Ericsson</div><div class='add'>+ *</div><div class='add'>+ * Author: Linus Walleij &lt;linus.walleij@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * License terms: GNU General Public License (GPL) version 2</div><div class='add'>+ */</div><div class='add'>+#define pr_fmt(fmt) "pinconfig core: " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</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 &lt;linux/pinctrl/machine.h&gt;</div><div class='add'>+#include &lt;linux/pinctrl/pinctrl.h&gt;</div><div class='add'>+#include &lt;linux/pinctrl/pinconf.h&gt;</div><div class='add'>+#include "core.h"</div><div class='add'>+#include "pinconf.h"</div><div class='add'>+</div><div class='add'>+int pin_config_get_for_pin(struct pinctrl_dev *pctldev, unsigned pin,</div><div class='add'>+			   unsigned long *config)</div><div class='add'>+{</div><div class='add'>+	const struct pinconf_ops *ops = pctldev-&gt;desc-&gt;confops;</div><div class='add'>+</div><div class='add'>+	if (!ops || !ops-&gt;pin_config_get) {</div><div class='add'>+		dev_err(pctldev-&gt;dev, "cannot get pin configuration, missing "</div><div class='add'>+			"pin_config_get() function in driver\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ops-&gt;pin_config_get(pctldev, pin, config);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pin_config_get() - get the configuration of a single pin parameter</div><div class='add'>+ * @dev_name: name of the pin controller device for this pin</div><div class='add'>+ * @name: name of the pin to get the config for</div><div class='add'>+ * @config: the config pointed to by this argument will be filled in with the</div><div class='add'>+ *	current pin state, it can be used directly by drivers as a numeral, or</div><div class='add'>+ *	it can be dereferenced to any struct.</div><div class='add'>+ */</div><div class='add'>+int pin_config_get(const char *dev_name, const char *name,</div><div class='add'>+			  unsigned long *config)</div><div class='add'>+{</div><div class='add'>+	struct pinctrl_dev *pctldev;</div><div class='add'>+	int pin;</div><div class='add'>+</div><div class='add'>+	pctldev = get_pinctrl_dev_from_dev(NULL, dev_name);</div><div class='add'>+	if (!pctldev)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pin = pin_get_from_name(pctldev, name);</div><div class='add'>+	if (pin &lt; 0)</div><div class='add'>+		return pin;</div><div class='add'>+</div><div class='add'>+	return pin_config_get_for_pin(pctldev, pin, config);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pin_config_get);</div><div class='add'>+</div><div class='add'>+int pin_config_set_for_pin(struct pinctrl_dev *pctldev, unsigned pin,</div><div class='add'>+			   unsigned long config)</div><div class='add'>+{</div><div class='add'>+	const struct pinconf_ops *ops = pctldev-&gt;desc-&gt;confops;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!ops || !ops-&gt;pin_config_set) {</div><div class='add'>+		dev_err(pctldev-&gt;dev, "cannot configure pin, missing "</div><div class='add'>+			"config function in driver\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ops-&gt;pin_config_set(pctldev, pin, config);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(pctldev-&gt;dev,</div><div class='add'>+			"unable to set pin configuration on pin %d\n", pin);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pin_config_set() - set the configuration of a single pin parameter</div><div class='add'>+ * @dev_name: name of pin controller device for this pin</div><div class='add'>+ * @name: name of the pin to set the config for</div><div class='add'>+ * @config: the config in this argument will contain the desired pin state, it</div><div class='add'>+ *	can be used directly by drivers as a numeral, or it can be dereferenced</div><div class='add'>+ *	to any struct.</div><div class='add'>+ */</div><div class='add'>+int pin_config_set(const char *dev_name, const char *name,</div><div class='add'>+		   unsigned long config)</div><div class='add'>+{</div><div class='add'>+	struct pinctrl_dev *pctldev;</div><div class='add'>+	int pin;</div><div class='add'>+</div><div class='add'>+	pctldev = get_pinctrl_dev_from_dev(NULL, dev_name);</div><div class='add'>+	if (!pctldev)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pin = pin_get_from_name(pctldev, name);</div><div class='add'>+	if (pin &lt; 0)</div><div class='add'>+		return pin;</div><div class='add'>+</div><div class='add'>+	return pin_config_set_for_pin(pctldev, pin, config);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pin_config_set);</div><div class='add'>+</div><div class='add'>+int pin_config_group_get(const char *dev_name, const char *pin_group,</div><div class='add'>+			 unsigned long *config)</div><div class='add'>+{</div><div class='add'>+	struct pinctrl_dev *pctldev;</div><div class='add'>+	const struct pinconf_ops *ops;</div><div class='add'>+	int selector;</div><div class='add'>+</div><div class='add'>+	pctldev = get_pinctrl_dev_from_dev(NULL, dev_name);</div><div class='add'>+	if (!pctldev)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	ops = pctldev-&gt;desc-&gt;confops;</div><div class='add'>+</div><div class='add'>+	if (!ops || !ops-&gt;pin_config_group_get) {</div><div class='add'>+		dev_err(pctldev-&gt;dev, "cannot get configuration for pin "</div><div class='add'>+			"group, missing group config get function in "</div><div class='add'>+			"driver\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	selector = pinctrl_get_group_selector(pctldev, pin_group);</div><div class='add'>+	if (selector &lt; 0)</div><div class='add'>+		return selector;</div><div class='add'>+</div><div class='add'>+	return ops-&gt;pin_config_group_get(pctldev, selector, config);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pin_config_group_get);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pin_config_group_set(const char *dev_name, const char *pin_group,</div><div class='add'>+			 unsigned long config)</div><div class='add'>+{</div><div class='add'>+	struct pinctrl_dev *pctldev;</div><div class='add'>+	const struct pinconf_ops *ops;</div><div class='add'>+	const struct pinctrl_ops *pctlops;</div><div class='add'>+	int selector;</div><div class='add'>+	const unsigned *pins;</div><div class='add'>+	unsigned num_pins;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	pctldev = get_pinctrl_dev_from_dev(NULL, dev_name);</div><div class='add'>+	if (!pctldev)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	ops = pctldev-&gt;desc-&gt;confops;</div><div class='add'>+	pctlops = pctldev-&gt;desc-&gt;pctlops;</div><div class='add'>+</div><div class='add'>+	if (!ops || (!ops-&gt;pin_config_group_set &amp;&amp; !ops-&gt;pin_config_set)) {</div><div class='add'>+		dev_err(pctldev-&gt;dev, "cannot configure pin group, missing "</div><div class='add'>+			"config function in driver\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	selector = pinctrl_get_group_selector(pctldev, pin_group);</div><div class='add'>+	if (selector &lt; 0)</div><div class='add'>+		return selector;</div><div class='add'>+</div><div class='add'>+	ret = pctlops-&gt;get_group_pins(pctldev, selector, &amp;pins, &amp;num_pins);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(pctldev-&gt;dev, "cannot configure pin group, error "</div><div class='add'>+			"getting pins\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the pin controller supports handling entire groups we use that</div><div class='add'>+	 * capability.</div><div class='add'>+	 */</div><div class='add'>+	if (ops-&gt;pin_config_group_set) {</div><div class='add'>+		ret = ops-&gt;pin_config_group_set(pctldev, selector, config);</div><div class='add'>+		/*</div><div class='add'>+		 * If the pin controller prefer that a certain group be handled</div><div class='add'>+		 * pin-by-pin as well, it returns -EAGAIN.</div><div class='add'>+		 */</div><div class='add'>+		if (ret != -EAGAIN)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the controller cannot handle entire groups, we configure each pin</div><div class='add'>+	 * individually.</div><div class='add'>+	 */</div><div class='add'>+	if (!ops-&gt;pin_config_set)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_pins; i++) {</div><div class='add'>+		ret = ops-&gt;pin_config_set(pctldev, pins[i], config);</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'>+EXPORT_SYMBOL(pin_config_group_set);</div><div class='add'>+</div><div class='add'>+int pinconf_check_ops(const struct pinconf_ops *ops)</div><div class='add'>+{</div><div class='add'>+	/* We must be able to read out pin status */</div><div class='add'>+	if (!ops-&gt;pin_config_get &amp;&amp; !ops-&gt;pin_config_group_get)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	/* We have to be able to config the pins in SOME way */</div><div class='add'>+	if (!ops-&gt;pin_config_set &amp;&amp; !ops-&gt;pin_config_group_set)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='add'>+</div><div class='add'>+static void pinconf_dump_pin(struct pinctrl_dev *pctldev,</div><div class='add'>+			     struct seq_file *s, int pin)</div><div class='add'>+{</div><div class='add'>+	const struct pinconf_ops *ops = pctldev-&gt;desc-&gt;confops;</div><div class='add'>+</div><div class='add'>+	if (ops &amp;&amp; ops-&gt;pin_config_dbg_show)</div><div class='add'>+		ops-&gt;pin_config_dbg_show(pctldev, s, pin);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pinconf_pins_show(struct seq_file *s, void *what)</div><div class='add'>+{</div><div class='add'>+	struct pinctrl_dev *pctldev = s-&gt;private;</div><div class='add'>+	unsigned i, pin;</div><div class='add'>+</div><div class='add'>+	seq_puts(s, "Pin config settings per pin\n");</div><div class='add'>+	seq_puts(s, "Format: pin (name): pinmux setting array\n");</div><div class='add'>+</div><div class='add'>+	/* The pin number can be retrived from the pin controller descriptor */</div><div class='add'>+	for (i = 0; pin &lt; pctldev-&gt;desc-&gt;npins; i++) {</div><div class='add'>+		struct pin_desc *desc;</div><div class='add'>+</div><div class='add'>+		pin = pctldev-&gt;desc-&gt;pins[i].number;</div><div class='add'>+		desc = pin_desc_get(pctldev, pin);</div><div class='add'>+		/* Skip if we cannot search the pin */</div><div class='add'>+		if (desc == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		seq_printf(s, "pin %d (%s):", pin,</div><div class='add'>+			   desc-&gt;name ? desc-&gt;name : "unnamed");</div><div class='add'>+</div><div class='add'>+		pinconf_dump_pin(pctldev, s, pin);</div><div class='add'>+</div><div class='add'>+		seq_printf(s, "\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'>+static void pinconf_dump_group(struct pinctrl_dev *pctldev,</div><div class='add'>+			       struct seq_file *s, unsigned selector,</div><div class='add'>+			       const char *gname)</div><div class='add'>+{</div><div class='add'>+	const struct pinconf_ops *ops = pctldev-&gt;desc-&gt;confops;</div><div class='add'>+</div><div class='add'>+	if (ops &amp;&amp; ops-&gt;pin_config_group_dbg_show)</div><div class='add'>+		ops-&gt;pin_config_group_dbg_show(pctldev, s, selector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pinconf_groups_show(struct seq_file *s, void *what)</div><div class='add'>+{</div><div class='add'>+	struct pinctrl_dev *pctldev = s-&gt;private;</div><div class='add'>+	const struct pinctrl_ops *pctlops = pctldev-&gt;desc-&gt;pctlops;</div><div class='add'>+	const struct pinconf_ops *ops = pctldev-&gt;desc-&gt;confops;</div><div class='add'>+	unsigned selector = 0;</div><div class='add'>+</div><div class='add'>+	if (!ops || !ops-&gt;pin_config_group_get)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	seq_puts(s, "Pin config settings per pin group\n");</div><div class='add'>+	seq_puts(s, "Format: group (name): pinmux setting array\n");</div><div class='add'>+</div><div class='add'>+	while (pctlops-&gt;list_groups(pctldev, selector) &gt;= 0) {</div><div class='add'>+		const char *gname = pctlops-&gt;get_group_name(pctldev, selector);</div><div class='add'>+</div><div class='add'>+		seq_printf(s, "%u (%s):", selector, gname);</div><div class='add'>+		pinconf_dump_group(pctldev, s, selector, gname);</div><div class='add'>+		selector++;</div><div 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 pinconf_pins_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, pinconf_pins_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pinconf_groups_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, pinconf_groups_show, inode-&gt;i_private);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations pinconf_pins_ops = {</div><div class='add'>+	.open		= pinconf_pins_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations pinconf_groups_ops = {</div><div class='add'>+	.open		= pinconf_groups_open,</div><div class='add'>+	.read		= seq_read,</div><div class='add'>+	.llseek		= seq_lseek,</div><div class='add'>+	.release	= single_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void pinconf_init_device_debugfs(struct dentry *devroot,</div><div class='add'>+			 struct pinctrl_dev *pctldev)</div><div class='add'>+{</div><div class='add'>+	debugfs_create_file("pinconf-pins", S_IFREG | S_IRUGO,</div><div class='add'>+			    devroot, pctldev, &amp;pinconf_pins_ops);</div><div class='add'>+	debugfs_create_file("pinconf-groups", S_IFREG | S_IRUGO,</div><div class='add'>+			    devroot, pctldev, &amp;pinconf_groups_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h<br/>new file mode 100644<br/>index 000000000000..e7dc6165032a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pinctrl/pinconf.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pinctrl/pinconf.h</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+/*</div><div class='add'>+ * Internal interface between the core pin control system and the</div><div class='add'>+ * pin config portions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 ST-Ericsson SA</div><div class='add'>+ * Written on behalf of Linaro for ST-Ericsson</div><div class='add'>+ * Based on bits of regulator core, gpio core and clk core</div><div class='add'>+ *</div><div class='add'>+ * Author: Linus Walleij &lt;linus.walleij@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * License terms: GNU General Public License (GPL) version 2</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PINCONF</div><div class='add'>+</div><div class='add'>+int pinconf_check_ops(const struct pinconf_ops *ops);</div><div class='add'>+void pinconf_init_device_debugfs(struct dentry *devroot,</div><div class='add'>+				 struct pinctrl_dev *pctldev);</div><div class='add'>+int pin_config_get_for_pin(struct pinctrl_dev *pctldev, unsigned pin,</div><div class='add'>+			   unsigned long *config);</div><div class='add'>+int pin_config_set_for_pin(struct pinctrl_dev *pctldev, unsigned pin,</div><div class='add'>+			   unsigned long config);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline int pinconf_check_ops(const struct pinconf_ops *ops)</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 pinconf_init_device_debugfs(struct dentry *devroot,</div><div class='add'>+					       struct pinctrl_dev *pctldev)</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/gpio/gpio-u300.c b/drivers/pinctrl/pinctrl-coh901.c<br/>index 4035778852b0..69fb7072a23e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/gpio/gpio-u300.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/gpio/gpio-u300.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pinctrl/pinctrl-coh901.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pinctrl/pinctrl-coh901.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/gpio.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='add'>+#include &lt;linux/pinctrl/pinmux.h&gt;</div><div class='ctx'> #include &lt;mach/gpio-u300.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -351,6 +352,24 @@ static inline struct u300_gpio *to_u300_gpio(struct gpio_chip *chip)</div><div class='ctx'> 	return container_of(chip, struct u300_gpio, chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int u300_gpio_request(struct gpio_chip *chip, unsigned offset)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Map back to global GPIO space and request muxing, the direction</div><div class='add'>+	 * parameter does not matter for this controller.</div><div class='add'>+	 */</div><div class='add'>+	int gpio = chip-&gt;base + offset;</div><div class='add'>+</div><div class='add'>+	return pinmux_request_gpio(gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void u300_gpio_free(struct gpio_chip *chip, unsigned offset)</div><div class='add'>+{</div><div class='add'>+	int gpio = chip-&gt;base + offset;</div><div class='add'>+</div><div class='add'>+	pinmux_free_gpio(gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int u300_gpio_get(struct gpio_chip *chip, unsigned offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct u300_gpio *gpio = to_u300_gpio(chip);</div><div class='hunk'>@@ -483,6 +502,8 @@ static int u300_gpio_config(struct gpio_chip *chip, unsigned offset,</div><div class='ctx'> static struct gpio_chip u300_gpio_chip = {</div><div class='ctx'> 	.label			= "u300-gpio-chip",</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='add'>+	.request		= u300_gpio_request,</div><div class='add'>+	.free			= u300_gpio_free,</div><div class='ctx'> 	.get			= u300_gpio_get,</div><div class='ctx'> 	.set			= u300_gpio_set,</div><div class='ctx'> 	.direction_input	= u300_gpio_direction_input,</div><div class='head'>diff --git a/drivers/pinctrl/pinmux-sirf.c b/drivers/pinctrl/pinctrl-sirf.c<br/>index d76cae620956..6b3534cc051a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pinctrl/pinmux-sirf.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pinctrl/pinmux-sirf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pinctrl/pinctrl-sirf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pinctrl/pinctrl-sirf.c</a></div><div class='hunk'>@@ -463,7 +463,7 @@ static const struct sirfsoc_padmux spi1_padmux = {</div><div class='ctx'> 	.funcval = BIT(8),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const unsigned spi1_pins[] = { 33, 34, 35, 36 };</div><div class='add'>+static const unsigned spi1_pins[] = { 43, 44, 45, 46 };</div><div class='ctx'> </div><div class='ctx'> static const struct sirfsoc_muxmask sdmmc1_muxmask[] = {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -1067,7 +1067,7 @@ static int sirfsoc_pinmux_request_gpio(struct pinctrl_dev *pmxdev,</div><div class='ctx'> 	spmx = pinctrl_dev_get_drvdata(pmxdev);</div><div class='ctx'> </div><div class='ctx'> 	muxval = readl(spmx-&gt;gpio_virtbase + SIRFSOC_GPIO_PAD_EN(group));</div><div class='del'>-	muxval = muxval | (1 &lt;&lt; offset);</div><div class='add'>+	muxval = muxval | (1 &lt;&lt; (offset - range-&gt;pin_base));</div><div class='ctx'> 	writel(muxval, spmx-&gt;gpio_virtbase + SIRFSOC_GPIO_PAD_EN(group));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1086,7 +1086,6 @@ static struct pinctrl_desc sirfsoc_pinmux_desc = {</div><div class='ctx'> 	.name = DRIVER_NAME,</div><div class='ctx'> 	.pins = sirfsoc_pads,</div><div class='ctx'> 	.npins = ARRAY_SIZE(sirfsoc_pads),</div><div class='del'>-	.maxpin = SIRFSOC_NUM_PADS - 1,</div><div class='ctx'> 	.pctlops = &amp;sirfsoc_pctrl_ops,</div><div class='ctx'> 	.pmxops = &amp;sirfsoc_pinmux_ops,</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='hunk'>@@ -1100,21 +1099,25 @@ static struct pinctrl_gpio_range sirfsoc_gpio_ranges[] = {</div><div class='ctx'> 		.name = "sirfsoc-gpio*",</div><div class='ctx'> 		.id = 0,</div><div class='ctx'> 		.base = 0,</div><div class='add'>+		.pin_base = 0,</div><div class='ctx'> 		.npins = 32,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sirfsoc-gpio*",</div><div class='ctx'> 		.id = 1,</div><div class='ctx'> 		.base = 32,</div><div class='add'>+		.pin_base = 32,</div><div class='ctx'> 		.npins = 32,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sirfsoc-gpio*",</div><div class='ctx'> 		.id = 2,</div><div class='ctx'> 		.base = 64,</div><div class='add'>+		.pin_base = 64,</div><div class='ctx'> 		.npins = 32,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.name = "sirfsoc-gpio*",</div><div class='ctx'> 		.id = 3,</div><div class='ctx'> 		.base = 96,</div><div class='add'>+		.pin_base = 96,</div><div class='ctx'> 		.npins = 19,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/pinctrl/pinmux-u300.c b/drivers/pinctrl/pinctrl-u300.c<br/>index 4858a64131f8..c8d02f1c2b5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pinctrl/pinmux-u300.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pinctrl/pinmux-u300.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pinctrl/pinctrl-u300.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pinctrl/pinctrl-u300.c</a></div><div class='hunk'>@@ -940,20 +940,23 @@ static void u300_pmx_endisable(struct u300_pmx *upmx, unsigned selector,</div><div class='ctx'> {</div><div class='ctx'> 	u16 regval, val, mask;</div><div class='ctx'> 	int i;</div><div class='add'>+	const struct u300_pmx_mask *upmx_mask;</div><div class='ctx'> </div><div class='add'>+	upmx_mask = u300_pmx_functions[selector].mask;</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(u300_pmx_registers); i++) {</div><div class='ctx'> 		if (enable)</div><div class='del'>-			val = u300_pmx_functions[selector].mask-&gt;bits;</div><div class='add'>+			val = upmx_mask-&gt;bits;</div><div class='ctx'> 		else</div><div class='ctx'> 			val = 0;</div><div class='ctx'> </div><div class='del'>-		mask = u300_pmx_functions[selector].mask-&gt;mask;</div><div class='add'>+		mask = upmx_mask-&gt;mask;</div><div class='ctx'> 		if (mask != 0) {</div><div class='ctx'> 			regval = readw(upmx-&gt;virtbase + u300_pmx_registers[i]);</div><div class='ctx'> 			regval &amp;= ~mask;</div><div class='ctx'> 			regval |= val;</div><div class='ctx'> 			writew(regval, upmx-&gt;virtbase + u300_pmx_registers[i]);</div><div class='ctx'> 		}</div><div class='add'>+		upmx_mask++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1016,21 +1019,35 @@ static struct pinmux_ops u300_pmx_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * FIXME: this will be set to sane values as this driver engulfs</div><div class='del'>- * drivers/gpio/gpio-u300.c and we really know this stuff.</div><div class='add'>+ * GPIO ranges handled by the application-side COH901XXX GPIO controller</div><div class='add'>+ * Very many pins can be converted into GPIO pins, but we only list those</div><div class='add'>+ * that are useful in practice to cut down on tables.</div><div class='ctx'>  */</div><div class='del'>-static struct pinctrl_gpio_range u300_gpio_range = {</div><div class='del'>-	.name = "COH901*",</div><div class='del'>-	.id = 0,</div><div class='del'>-	.base = 0,</div><div class='del'>-	.npins = 64,</div><div class='add'>+#define U300_GPIO_RANGE(a, b, c) { .name = "COH901XXX", .id = a, .base= a, \</div><div class='add'>+			.pin_base = b, .npins = c }</div><div class='add'>+</div><div class='add'>+static struct pinctrl_gpio_range u300_gpio_ranges[] = {</div><div class='add'>+	U300_GPIO_RANGE(10, 426, 1),</div><div class='add'>+	U300_GPIO_RANGE(11, 180, 1),</div><div class='add'>+	U300_GPIO_RANGE(12, 165, 1), /* MS/MMC card insertion */</div><div class='add'>+	U300_GPIO_RANGE(13, 179, 1),</div><div class='add'>+	U300_GPIO_RANGE(14, 178, 1),</div><div class='add'>+	U300_GPIO_RANGE(16, 194, 1),</div><div class='add'>+	U300_GPIO_RANGE(17, 193, 1),</div><div class='add'>+	U300_GPIO_RANGE(18, 192, 1),</div><div class='add'>+	U300_GPIO_RANGE(19, 191, 1),</div><div class='add'>+	U300_GPIO_RANGE(20, 186, 1),</div><div class='add'>+	U300_GPIO_RANGE(21, 185, 1),</div><div class='add'>+	U300_GPIO_RANGE(22, 184, 1),</div><div class='add'>+	U300_GPIO_RANGE(23, 183, 1),</div><div class='add'>+	U300_GPIO_RANGE(24, 182, 1),</div><div class='add'>+	U300_GPIO_RANGE(25, 181, 1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pinctrl_desc u300_pmx_desc = {</div><div class='ctx'> 	.name = DRIVER_NAME,</div><div class='ctx'> 	.pins = u300_pads,</div><div class='ctx'> 	.npins = ARRAY_SIZE(u300_pads),</div><div class='del'>-	.maxpin = U300_NUM_PADS-1,</div><div class='ctx'> 	.pctlops = &amp;u300_pctrl_ops,</div><div class='ctx'> 	.pmxops = &amp;u300_pmx_ops,</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='hunk'>@@ -1038,9 +1055,10 @@ static struct pinctrl_desc u300_pmx_desc = {</div><div class='ctx'> </div><div class='ctx'> static int __init u300_pmx_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='ctx'> 	struct u300_pmx *upmx;</div><div class='ctx'> 	struct resource *res;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Create state holders etc for this driver */</div><div class='ctx'> 	upmx = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*upmx), GFP_KERNEL);</div><div class='hunk'>@@ -1077,7 +1095,8 @@ static int __init u300_pmx_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We will handle a range of GPIO pins */</div><div class='del'>-	pinctrl_add_gpio_range(upmx-&gt;pctl, &amp;u300_gpio_range);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(u300_gpio_ranges); i++)</div><div class='add'>+		pinctrl_add_gpio_range(upmx-&gt;pctl, &amp;u300_gpio_ranges[i]);</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, upmx);</div><div class='ctx'> </div><div class='hunk'>@@ -1099,8 +1118,10 @@ out_no_resource:</div><div class='ctx'> static int __exit u300_pmx_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct u300_pmx *upmx = platform_get_drvdata(pdev);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	pinctrl_remove_gpio_range(upmx-&gt;pctl, &amp;u300_gpio_range);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(u300_gpio_ranges); i++)</div><div class='add'>+		pinctrl_remove_gpio_range(upmx-&gt;pctl, &amp;u300_gpio_ranges[i]);</div><div class='ctx'> 	pinctrl_unregister(upmx-&gt;pctl);</div><div class='ctx'> 	iounmap(upmx-&gt;virtbase);</div><div class='ctx'> 	release_mem_region(upmx-&gt;phybase, upmx-&gt;physize);</div><div class='head'>diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c<br/>index a5467f8709e9..a76a348321bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pinctrl/pinmux.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pinctrl/pinmux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pinctrl/pinmux.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pinctrl/pinmux.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='hunk'>@@ -32,12 +33,8 @@</div><div class='ctx'> static DEFINE_MUTEX(pinmux_list_mutex);</div><div class='ctx'> static LIST_HEAD(pinmux_list);</div><div class='ctx'> </div><div class='del'>-/* List of pinmux hogs */</div><div class='del'>-static DEFINE_MUTEX(pinmux_hoglist_mutex);</div><div class='del'>-static LIST_HEAD(pinmux_hoglist);</div><div class='del'>-</div><div class='del'>-/* Global pinmux maps, we allow one set only */</div><div class='del'>-static struct pinmux_map const *pinmux_maps;</div><div class='add'>+/* Global pinmux maps */</div><div class='add'>+static struct pinmux_map *pinmux_maps;</div><div class='ctx'> static unsigned pinmux_maps_num;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -98,41 +95,35 @@ struct pinmux_hog {</div><div class='ctx'>  * @function: a functional name to give to this pin, passed to the driver</div><div class='ctx'>  *	so it knows what function to mux in, e.g. the string "gpioNN"</div><div class='ctx'>  *	means that you want to mux in the pin for use as GPIO number NN</div><div class='del'>- * @gpio: if this request concerns a single GPIO pin</div><div class='ctx'>  * @gpio_range: the range matching the GPIO pin if this is a request for a</div><div class='ctx'>  *	single GPIO pin</div><div class='ctx'>  */</div><div class='ctx'> static int pin_request(struct pinctrl_dev *pctldev,</div><div class='del'>-		       int pin, const char *function, bool gpio,</div><div class='add'>+		       int pin, const char *function,</div><div class='ctx'> 		       struct pinctrl_gpio_range *gpio_range)</div><div class='ctx'> {</div><div class='ctx'> 	struct pin_desc *desc;</div><div class='ctx'> 	const struct pinmux_ops *ops = pctldev-&gt;desc-&gt;pmxops;</div><div class='ctx'> 	int status = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;pctldev-&gt;dev, "request pin %d for %s\n", pin, function);</div><div class='del'>-</div><div class='del'>-	if (!pin_is_valid(pctldev, pin)) {</div><div class='del'>-		dev_err(&amp;pctldev-&gt;dev, "pin is invalid\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!function) {</div><div class='del'>-		dev_err(&amp;pctldev-&gt;dev, "no function name given\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	dev_dbg(pctldev-&gt;dev, "request pin %d for %s\n", pin, function);</div><div class='ctx'> </div><div class='ctx'> 	desc = pin_desc_get(pctldev, pin);</div><div class='ctx'> 	if (desc == NULL) {</div><div class='del'>-		dev_err(&amp;pctldev-&gt;dev,</div><div class='add'>+		dev_err(pctldev-&gt;dev,</div><div class='ctx'> 			"pin is not registered so it cannot be requested\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!function) {</div><div class='add'>+		dev_err(pctldev-&gt;dev, "no function name given\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;desc-&gt;lock);</div><div class='ctx'> 	if (desc-&gt;mux_function) {</div><div class='ctx'> 		spin_unlock(&amp;desc-&gt;lock);</div><div class='del'>-		dev_err(&amp;pctldev-&gt;dev,</div><div class='add'>+		dev_err(pctldev-&gt;dev,</div><div class='ctx'> 			"pin already requested\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -141,7 +132,7 @@ static int pin_request(struct pinctrl_dev *pctldev,</div><div class='ctx'> </div><div class='ctx'> 	/* Let each pin increase references to this module */</div><div class='ctx'> 	if (!try_module_get(pctldev-&gt;owner)) {</div><div class='del'>-		dev_err(&amp;pctldev-&gt;dev,</div><div class='add'>+		dev_err(pctldev-&gt;dev,</div><div class='ctx'> 			"could not increase module refcount for pin %d\n",</div><div class='ctx'> 			pin);</div><div class='ctx'> 		status = -EINVAL;</div><div class='hunk'>@@ -152,7 +143,7 @@ static int pin_request(struct pinctrl_dev *pctldev,</div><div class='ctx'> 	 * If there is no kind of request function for the pin we just assume</div><div class='ctx'> 	 * we got it by default and proceed.</div><div class='ctx'> 	 */</div><div class='del'>-	if (gpio &amp;&amp; ops-&gt;gpio_request_enable)</div><div class='add'>+	if (gpio_range &amp;&amp; ops-&gt;gpio_request_enable)</div><div class='ctx'> 		/* This requests and enables a single GPIO pin */</div><div class='ctx'> 		status = ops-&gt;gpio_request_enable(pctldev, gpio_range, pin);</div><div class='ctx'> 	else if (ops-&gt;request)</div><div class='hunk'>@@ -161,7 +152,7 @@ static int pin_request(struct pinctrl_dev *pctldev,</div><div class='ctx'> 		status = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (status)</div><div class='del'>-		dev_err(&amp;pctldev-&gt;dev, "-&gt;request on device %s failed "</div><div class='add'>+		dev_err(pctldev-&gt;dev, "-&gt;request on device %s failed "</div><div class='ctx'> 		       "for pin %d\n",</div><div class='ctx'> 		       pctldev-&gt;desc-&gt;name, pin);</div><div class='ctx'> out_free_pin:</div><div class='hunk'>@@ -172,7 +163,7 @@ out_free_pin:</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	if (status)</div><div class='del'>-		dev_err(&amp;pctldev-&gt;dev, "pin-%d (%s) status %d\n",</div><div class='add'>+		dev_err(pctldev-&gt;dev, "pin-%d (%s) status %d\n",</div><div class='ctx'> 		       pin, function ? : "?", status);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -182,34 +173,52 @@ out:</div><div class='ctx'>  * pin_free() - release a single muxed in pin so something else can be muxed</div><div class='ctx'>  * @pctldev: pin controller device handling this pin</div><div class='ctx'>  * @pin: the pin to free</div><div class='del'>- * @free_func: whether to free the pin's assigned function name string</div><div class='add'>+ * @gpio_range: the range matching the GPIO pin if this is a request for a</div><div class='add'>+ *	single GPIO pin</div><div class='add'>+ *</div><div class='add'>+ * This function returns a pointer to the function name in use. This is used</div><div class='add'>+ * for callers that dynamically allocate a function name so it can be freed</div><div class='add'>+ * once the pin is free. This is done for GPIO request functions.</div><div class='ctx'>  */</div><div class='del'>-static void pin_free(struct pinctrl_dev *pctldev, int pin, int free_func)</div><div class='add'>+static const char *pin_free(struct pinctrl_dev *pctldev, int pin,</div><div class='add'>+			    struct pinctrl_gpio_range *gpio_range)</div><div class='ctx'> {</div><div class='ctx'> 	const struct pinmux_ops *ops = pctldev-&gt;desc-&gt;pmxops;</div><div class='ctx'> 	struct pin_desc *desc;</div><div class='add'>+	const char *func;</div><div class='ctx'> </div><div class='ctx'> 	desc = pin_desc_get(pctldev, pin);</div><div class='ctx'> 	if (desc == NULL) {</div><div class='del'>-		dev_err(&amp;pctldev-&gt;dev,</div><div class='add'>+		dev_err(pctldev-&gt;dev,</div><div class='ctx'> 			"pin is not registered so it cannot be freed\n");</div><div class='del'>-		return;</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ops-&gt;free)</div><div class='add'>+	/*</div><div class='add'>+	 * If there is no kind of request function for the pin we just assume</div><div class='add'>+	 * we got it by default and proceed.</div><div class='add'>+	 */</div><div class='add'>+	if (gpio_range &amp;&amp; ops-&gt;gpio_disable_free)</div><div class='add'>+		ops-&gt;gpio_disable_free(pctldev, gpio_range, pin);</div><div class='add'>+	else if (ops-&gt;free)</div><div class='ctx'> 		ops-&gt;free(pctldev, pin);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;desc-&gt;lock);</div><div class='del'>-	if (free_func)</div><div class='del'>-		kfree(desc-&gt;mux_function);</div><div class='add'>+	func = desc-&gt;mux_function;</div><div class='ctx'> 	desc-&gt;mux_function = NULL;</div><div class='ctx'> 	spin_unlock(&amp;desc-&gt;lock);</div><div class='ctx'> 	module_put(pctldev-&gt;owner);</div><div class='add'>+</div><div class='add'>+	return func;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * pinmux_request_gpio() - request a single pin to be muxed in as GPIO</div><div class='ctx'>  * @gpio: the GPIO pin number from the GPIO subsystem number space</div><div class='add'>+ *</div><div class='add'>+ * This function should *ONLY* be used from gpiolib-based GPIO drivers,</div><div class='add'>+ * as part of their gpio_request() semantics, platforms and individual drivers</div><div class='add'>+ * shall *NOT* request GPIO pins to be muxed in.</div><div class='ctx'>  */</div><div class='ctx'> int pinmux_request_gpio(unsigned gpio)</div><div class='ctx'> {</div><div class='hunk'>@@ -225,7 +234,7 @@ int pinmux_request_gpio(unsigned gpio)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Convert to the pin controllers number space */</div><div class='del'>-	pin = gpio - range-&gt;base;</div><div class='add'>+	pin = gpio - range-&gt;base + range-&gt;pin_base;</div><div class='ctx'> </div><div class='ctx'> 	/* Conjure some name stating what chip and pin this is taken by */</div><div class='ctx'> 	snprintf(gpiostr, 15, "%s:%d", range-&gt;name, gpio);</div><div class='hunk'>@@ -234,7 +243,7 @@ int pinmux_request_gpio(unsigned gpio)</div><div class='ctx'> 	if (!function)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret = pin_request(pctldev, pin, function, true, range);</div><div class='add'>+	ret = pin_request(pctldev, pin, function, range);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		kfree(function);</div><div class='ctx'> </div><div class='hunk'>@@ -245,6 +254,10 @@ EXPORT_SYMBOL_GPL(pinmux_request_gpio);</div><div class='ctx'> /**</div><div class='ctx'>  * pinmux_free_gpio() - free a single pin, currently used as GPIO</div><div class='ctx'>  * @gpio: the GPIO pin number from the GPIO subsystem number space</div><div class='add'>+ *</div><div class='add'>+ * This function should *ONLY* be used from gpiolib-based GPIO drivers,</div><div class='add'>+ * as part of their gpio_free() semantics, platforms and individual drivers</div><div class='add'>+ * shall *NOT* request GPIO pins to be muxed out.</div><div class='ctx'>  */</div><div class='ctx'> void pinmux_free_gpio(unsigned gpio)</div><div class='ctx'> {</div><div class='hunk'>@@ -252,53 +265,108 @@ void pinmux_free_gpio(unsigned gpio)</div><div class='ctx'> 	struct pinctrl_gpio_range *range;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int pin;</div><div class='add'>+	const char *func;</div><div class='ctx'> </div><div class='ctx'> 	ret = pinctrl_get_device_gpio_range(gpio, &amp;pctldev, &amp;range);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Convert to the pin controllers number space */</div><div class='del'>-	pin = gpio - range-&gt;base;</div><div class='add'>+	pin = gpio - range-&gt;base + range-&gt;pin_base;</div><div class='ctx'> </div><div class='del'>-	pin_free(pctldev, pin, true);</div><div class='add'>+	func = pin_free(pctldev, pin, range);</div><div class='add'>+	kfree(func);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pinmux_free_gpio);</div><div class='ctx'> </div><div class='add'>+static int pinmux_gpio_direction(unsigned gpio, bool input)</div><div class='add'>+{</div><div class='add'>+	struct pinctrl_dev *pctldev;</div><div class='add'>+	struct pinctrl_gpio_range *range;</div><div class='add'>+	const struct pinmux_ops *ops;</div><div class='add'>+	int ret;</div><div class='add'>+	int pin;</div><div class='add'>+</div><div class='add'>+	ret = pinctrl_get_device_gpio_range(gpio, &amp;pctldev, &amp;range);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ops = pctldev-&gt;desc-&gt;pmxops;</div><div class='add'>+</div><div class='add'>+	/* Convert to the pin controllers number space */</div><div class='add'>+	pin = gpio - range-&gt;base + range-&gt;pin_base;</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;gpio_set_direction)</div><div class='add'>+		ret = ops-&gt;gpio_set_direction(pctldev, range, pin, input);</div><div class='add'>+	else</div><div class='add'>+		ret = 0;</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'>+ * pinmux_gpio_direction_input() - request a GPIO pin to go into input mode</div><div class='add'>+ * @gpio: the GPIO pin number from the GPIO subsystem number space</div><div class='add'>+ *</div><div class='add'>+ * This function should *ONLY* be used from gpiolib-based GPIO drivers,</div><div class='add'>+ * as part of their gpio_direction_input() semantics, platforms and individual</div><div class='add'>+ * drivers shall *NOT* touch pinmux GPIO calls.</div><div class='add'>+ */</div><div class='add'>+int pinmux_gpio_direction_input(unsigned gpio)</div><div class='add'>+{</div><div class='add'>+	return pinmux_gpio_direction(gpio, true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pinmux_gpio_direction_input);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pinmux_gpio_direction_output() - request a GPIO pin to go into output mode</div><div class='add'>+ * @gpio: the GPIO pin number from the GPIO subsystem number space</div><div class='add'>+ *</div><div class='add'>+ * This function should *ONLY* be used from gpiolib-based GPIO drivers,</div><div class='add'>+ * as part of their gpio_direction_output() semantics, platforms and individual</div><div class='add'>+ * drivers shall *NOT* touch pinmux GPIO calls.</div><div class='add'>+ */</div><div class='add'>+int pinmux_gpio_direction_output(unsigned gpio)</div><div class='add'>+{</div><div class='add'>+	return pinmux_gpio_direction(gpio, false);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pinmux_gpio_direction_output);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * pinmux_register_mappings() - register a set of pinmux mappings</div><div class='del'>- * @maps: the pinmux mappings table to register</div><div class='add'>+ * @maps: the pinmux mappings table to register, this should be marked with</div><div class='add'>+ *	__initdata so it can be discarded after boot, this function will</div><div class='add'>+ *	perform a shallow copy for the mapping entries.</div><div class='ctx'>  * @num_maps: the number of maps in the mapping table</div><div class='ctx'>  *</div><div class='ctx'>  * Only call this once during initialization of your machine, the function is</div><div class='ctx'>  * tagged as __init and won't be callable after init has completed. The map</div><div class='ctx'>  * passed into this function will be owned by the pinmux core and cannot be</div><div class='del'>- * free:d.</div><div class='add'>+ * freed.</div><div class='ctx'>  */</div><div class='ctx'> int __init pinmux_register_mappings(struct pinmux_map const *maps,</div><div class='ctx'> 				    unsigned num_maps)</div><div class='ctx'> {</div><div class='add'>+	void *tmp_maps;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (pinmux_maps != NULL) {</div><div class='del'>-		pr_err("pinmux mappings already registered, you can only "</div><div class='del'>-		       "register one set of maps\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	pr_debug("add %d pinmux maps\n", num_maps);</div><div class='add'>+</div><div class='add'>+	/* First sanity check the new mapping */</div><div class='ctx'> 	for (i = 0; i &lt; num_maps; i++) {</div><div class='del'>-		/* Sanity check the mapping */</div><div class='ctx'> 		if (!maps[i].name) {</div><div class='ctx'> 			pr_err("failed to register map %d: "</div><div class='ctx'> 			       "no map name given\n", i);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		if (!maps[i].ctrl_dev &amp;&amp; !maps[i].ctrl_dev_name) {</div><div class='ctx'> 			pr_err("failed to register map %s (%d): "</div><div class='ctx'> 			       "no pin control device given\n",</div><div class='ctx'> 			       maps[i].name, i);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		if (!maps[i].function) {</div><div class='ctx'> 			pr_err("failed to register map %s (%d): "</div><div class='ctx'> 			       "no function ID given\n", maps[i].name, i);</div><div class='hunk'>@@ -315,9 +383,30 @@ int __init pinmux_register_mappings(struct pinmux_map const *maps,</div><div class='ctx'> 				 maps[i].function);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pinmux_maps = maps;</div><div class='del'>-	pinmux_maps_num = num_maps;</div><div class='add'>+	/*</div><div class='add'>+	 * Make a copy of the map array - string pointers will end up in the</div><div class='add'>+	 * kernel const section anyway so these do not need to be deep copied.</div><div class='add'>+	 */</div><div class='add'>+	if (!pinmux_maps_num) {</div><div class='add'>+		/* On first call, just copy them */</div><div class='add'>+		tmp_maps = kmemdup(maps,</div><div class='add'>+				   sizeof(struct pinmux_map) * num_maps,</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+		if (!tmp_maps)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	} else {</div><div class='add'>+		/* Subsequent calls, reallocate array to new size */</div><div class='add'>+		size_t oldsize = sizeof(struct pinmux_map) * pinmux_maps_num;</div><div class='add'>+		size_t newsize = sizeof(struct pinmux_map) * num_maps;</div><div class='add'>+</div><div class='add'>+		tmp_maps = krealloc(pinmux_maps, oldsize + newsize, GFP_KERNEL);</div><div class='add'>+		if (!tmp_maps)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		memcpy((tmp_maps + oldsize), maps, newsize);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	pinmux_maps = tmp_maps;</div><div class='add'>+	pinmux_maps_num += num_maps;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -345,14 +434,14 @@ static int acquire_pins(struct pinctrl_dev *pctldev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;pctldev-&gt;dev, "requesting the %u pins from group %u\n",</div><div class='add'>+	dev_dbg(pctldev-&gt;dev, "requesting the %u pins from group %u\n",</div><div class='ctx'> 		num_pins, group_selector);</div><div class='ctx'> </div><div class='ctx'> 	/* Try to allocate all pins in this group, one by one */</div><div class='ctx'> 	for (i = 0; i &lt; num_pins; i++) {</div><div class='del'>-		ret = pin_request(pctldev, pins[i], func, false, NULL);</div><div class='add'>+		ret = pin_request(pctldev, pins[i], func, NULL);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			dev_err(&amp;pctldev-&gt;dev,</div><div class='add'>+			dev_err(pctldev-&gt;dev,</div><div class='ctx'> 				"could not get pin %d for function %s "</div><div class='ctx'> 				"on device %s - conflicting mux mappings?\n",</div><div class='ctx'> 				pins[i], func ? : "(undefined)",</div><div class='hunk'>@@ -360,7 +449,7 @@ static int acquire_pins(struct pinctrl_dev *pctldev,</div><div class='ctx'> 			/* On error release all taken pins */</div><div class='ctx'> 			i--; /* this pin just failed */</div><div class='ctx'> 			for (; i &gt;= 0; i--)</div><div class='del'>-				pin_free(pctldev, pins[i], false);</div><div class='add'>+				pin_free(pctldev, pins[i], NULL);</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -384,44 +473,13 @@ static void release_pins(struct pinctrl_dev *pctldev,</div><div class='ctx'> 	ret = pctlops-&gt;get_group_pins(pctldev, group_selector,</div><div class='ctx'> 				      &amp;pins, &amp;num_pins);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		dev_err(&amp;pctldev-&gt;dev, "could not get pins to release for "</div><div class='add'>+		dev_err(pctldev-&gt;dev, "could not get pins to release for "</div><div class='ctx'> 			"group selector %d\n",</div><div class='ctx'> 			group_selector);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; num_pins; i++)</div><div class='del'>-		pin_free(pctldev, pins[i], false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pinmux_get_group_selector() - returns the group selector for a group</div><div class='del'>- * @pctldev: the pin controller handling the group</div><div class='del'>- * @pin_group: the pin group to look up</div><div class='del'>- */</div><div class='del'>-static int pinmux_get_group_selector(struct pinctrl_dev *pctldev,</div><div class='del'>-				     const char *pin_group)</div><div class='del'>-{</div><div class='del'>-	const struct pinctrl_ops *pctlops = pctldev-&gt;desc-&gt;pctlops;</div><div class='del'>-	unsigned group_selector = 0;</div><div class='del'>-</div><div class='del'>-	while (pctlops-&gt;list_groups(pctldev, group_selector) &gt;= 0) {</div><div class='del'>-		const char *gname = pctlops-&gt;get_group_name(pctldev,</div><div class='del'>-							    group_selector);</div><div class='del'>-		if (!strcmp(gname, pin_group)) {</div><div class='del'>-			dev_dbg(&amp;pctldev-&gt;dev,</div><div class='del'>-				"found group selector %u for %s\n",</div><div class='del'>-				group_selector,</div><div class='del'>-				pin_group);</div><div class='del'>-			return group_selector;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		group_selector++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_err(&amp;pctldev-&gt;dev, "does not have pin group %s\n",</div><div class='del'>-		pin_group);</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='add'>+		pin_free(pctldev, pins[i], NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -465,9 +523,9 @@ static int pinmux_check_pin_group(struct pinctrl_dev *pctldev,</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		if (num_groups &lt; 1)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		ret = pinmux_get_group_selector(pctldev, groups[0]);</div><div class='add'>+		ret = pinctrl_get_group_selector(pctldev, groups[0]);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			dev_err(&amp;pctldev-&gt;dev,</div><div class='add'>+			dev_err(pctldev-&gt;dev,</div><div class='ctx'> 				"function %s wants group %s but the pin "</div><div class='ctx'> 				"controller does not seem to have that group\n",</div><div class='ctx'> 				pmxops-&gt;get_function_name(pctldev, func_selector),</div><div class='hunk'>@@ -476,7 +534,7 @@ static int pinmux_check_pin_group(struct pinctrl_dev *pctldev,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (num_groups &gt; 1)</div><div class='del'>-			dev_dbg(&amp;pctldev-&gt;dev,</div><div class='add'>+			dev_dbg(pctldev-&gt;dev,</div><div class='ctx'> 				"function %s support more than one group, "</div><div class='ctx'> 				"default-selecting first group %s (%d)\n",</div><div class='ctx'> 				pmxops-&gt;get_function_name(pctldev, func_selector),</div><div class='hunk'>@@ -486,13 +544,13 @@ static int pinmux_check_pin_group(struct pinctrl_dev *pctldev,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;pctldev-&gt;dev,</div><div class='add'>+	dev_dbg(pctldev-&gt;dev,</div><div class='ctx'> 		"check if we have pin group %s on controller %s\n",</div><div class='ctx'> 		pin_group, pinctrl_dev_get_name(pctldev));</div><div class='ctx'> </div><div class='del'>-	ret = pinmux_get_group_selector(pctldev, pin_group);</div><div class='add'>+	ret = pinctrl_get_group_selector(pctldev, pin_group);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		dev_dbg(&amp;pctldev-&gt;dev,</div><div class='add'>+		dev_dbg(pctldev-&gt;dev,</div><div class='ctx'> 			"%s does not support pin group %s with function %s\n",</div><div class='ctx'> 			pinctrl_dev_get_name(pctldev),</div><div class='ctx'> 			pin_group,</div><div class='hunk'>@@ -569,7 +627,7 @@ static int pinmux_enable_muxmap(struct pinctrl_dev *pctldev,</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (pmx-&gt;pctldev &amp;&amp; pmx-&gt;pctldev != pctldev) {</div><div class='del'>-		dev_err(&amp;pctldev-&gt;dev,</div><div class='add'>+		dev_err(pctldev-&gt;dev,</div><div class='ctx'> 			"different pin control devices given for device %s, "</div><div class='ctx'> 			"function %s\n",</div><div class='ctx'> 			devname,</div><div class='hunk'>@@ -592,7 +650,7 @@ static int pinmux_enable_muxmap(struct pinctrl_dev *pctldev,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pmx-&gt;func_selector != UINT_MAX &amp;&amp;</div><div class='ctx'> 	    pmx-&gt;func_selector != func_selector) {</div><div class='del'>-		dev_err(&amp;pctldev-&gt;dev,</div><div class='add'>+		dev_err(pctldev-&gt;dev,</div><div class='ctx'> 			"dual function defines in the map for device %s\n",</div><div class='ctx'> 		       devname);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -698,7 +756,7 @@ struct pinmux *pinmux_get(struct device *dev, const char *name)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		pr_debug("in map, found pctldev %s to handle function %s",</div><div class='del'>-			 dev_name(&amp;pctldev-&gt;dev), map-&gt;function);</div><div class='add'>+			 dev_name(pctldev-&gt;dev), map-&gt;function);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -874,7 +932,7 @@ static int pinmux_hog_map(struct pinctrl_dev *pctldev,</div><div class='ctx'> 		 * without any problems, so then we can hog pinmuxes for</div><div class='ctx'> 		 * all devices that just want a static pin mux at this point.</div><div class='ctx'> 		 */</div><div class='del'>-		dev_err(&amp;pctldev-&gt;dev, "map %s wants to hog a non-system "</div><div class='add'>+		dev_err(pctldev-&gt;dev, "map %s wants to hog a non-system "</div><div class='ctx'> 			"pinmux, this is not going to work\n", map-&gt;name);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -886,7 +944,7 @@ static int pinmux_hog_map(struct pinctrl_dev *pctldev,</div><div class='ctx'> 	pmx = pinmux_get(NULL, map-&gt;name);</div><div class='ctx'> 	if (IS_ERR(pmx)) {</div><div class='ctx'> 		kfree(hog);</div><div class='del'>-		dev_err(&amp;pctldev-&gt;dev,</div><div class='add'>+		dev_err(pctldev-&gt;dev,</div><div class='ctx'> 			"could not get the %s pinmux mapping for hogging\n",</div><div class='ctx'> 			map-&gt;name);</div><div class='ctx'> 		return PTR_ERR(pmx);</div><div class='hunk'>@@ -896,7 +954,7 @@ static int pinmux_hog_map(struct pinctrl_dev *pctldev,</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pinmux_put(pmx);</div><div class='ctx'> 		kfree(hog);</div><div class='del'>-		dev_err(&amp;pctldev-&gt;dev,</div><div class='add'>+		dev_err(pctldev-&gt;dev,</div><div class='ctx'> 			"could not enable the %s pinmux mapping for hogging\n",</div><div class='ctx'> 			map-&gt;name);</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -905,7 +963,7 @@ static int pinmux_hog_map(struct pinctrl_dev *pctldev,</div><div class='ctx'> 	hog-&gt;map = map;</div><div class='ctx'> 	hog-&gt;pmx = pmx;</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;pctldev-&gt;dev, "hogged map %s, function %s\n", map-&gt;name,</div><div class='add'>+	dev_info(pctldev-&gt;dev, "hogged map %s, function %s\n", map-&gt;name,</div><div class='ctx'> 		 map-&gt;function);</div><div class='ctx'> 	mutex_lock(&amp;pctldev-&gt;pinmux_hogs_lock);</div><div class='ctx'> 	list_add(&amp;hog-&gt;node, &amp;pctldev-&gt;pinmux_hogs);</div><div class='hunk'>@@ -924,7 +982,7 @@ static int pinmux_hog_map(struct pinctrl_dev *pctldev,</div><div class='ctx'>  */</div><div class='ctx'> int pinmux_hog_maps(struct pinctrl_dev *pctldev)</div><div class='ctx'> {</div><div class='del'>-	struct device *dev = &amp;pctldev-&gt;dev;</div><div class='add'>+	struct device *dev = pctldev-&gt;dev;</div><div class='ctx'> 	const char *devname = dev_name(dev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -948,7 +1006,7 @@ int pinmux_hog_maps(struct pinctrl_dev *pctldev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * pinmux_hog_maps() - unhog specific map entries on controller device</div><div class='add'>+ * pinmux_unhog_maps() - unhog specific map entries on controller device</div><div class='ctx'>  * @pctldev: the pin control device to unhog entries on</div><div class='ctx'>  */</div><div class='ctx'> void pinmux_unhog_maps(struct pinctrl_dev *pctldev)</div><div class='hunk'>@@ -1005,18 +1063,19 @@ static int pinmux_functions_show(struct seq_file *s, void *what)</div><div class='ctx'> static int pinmux_pins_show(struct seq_file *s, void *what)</div><div class='ctx'> {</div><div class='ctx'> 	struct pinctrl_dev *pctldev = s-&gt;private;</div><div class='del'>-	unsigned pin;</div><div class='add'>+	unsigned i, pin;</div><div class='ctx'> </div><div class='ctx'> 	seq_puts(s, "Pinmux settings per pin\n");</div><div class='ctx'> 	seq_puts(s, "Format: pin (name): pinmuxfunction\n");</div><div class='ctx'> </div><div class='del'>-	/* The highest pin number need to be included in the loop, thus &lt;= */</div><div class='del'>-	for (pin = 0; pin &lt;= pctldev-&gt;desc-&gt;maxpin; pin++) {</div><div class='add'>+	/* The pin number can be retrived from the pin controller descriptor */</div><div class='add'>+	for (i = 0; i &lt; pctldev-&gt;desc-&gt;npins; i++) {</div><div class='ctx'> </div><div class='ctx'> 		struct pin_desc *desc;</div><div class='ctx'> </div><div class='add'>+		pin = pctldev-&gt;desc-&gt;pins[i].number;</div><div class='ctx'> 		desc = pin_desc_get(pctldev, pin);</div><div class='del'>-		/* Pin space may be sparse */</div><div class='add'>+		/* Skip if we cannot search the pin */</div><div class='ctx'> 		if (desc == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig<br/>index 7f43cf86d776..f995e6e2f78c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/platform/x86/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/platform/x86/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/platform/x86/Kconfig</a></div><div class='hunk'>@@ -639,7 +639,7 @@ config ACPI_CMPC</div><div class='ctx'> </div><div class='ctx'> config INTEL_SCU_IPC</div><div class='ctx'> 	bool "Intel SCU IPC Support"</div><div class='del'>-	depends on X86_MRST</div><div class='add'>+	depends on X86_INTEL_MID</div><div class='ctx'> 	default y</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  IPC is used to bridge the communications between kernel and SCU on</div><div class='head'>diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c<br/>index edaccad9b5bf..b7944f903886 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/platform/x86/asus-laptop.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/asus-laptop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/platform/x86/asus-laptop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/platform/x86/asus-laptop.c</a></div><div class='hunk'>@@ -1477,7 +1477,7 @@ static struct attribute *asus_attributes[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static mode_t asus_sysfs_is_visible(struct kobject *kobj,</div><div class='add'>+static umode_t asus_sysfs_is_visible(struct kobject *kobj,</div><div class='ctx'> 				    struct attribute *attr,</div><div class='ctx'> 				    int idx)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c<br/>index d1049ee3c9e8..72d731c21d45 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/platform/x86/asus-wmi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/asus-wmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/platform/x86/asus-wmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/platform/x86/asus-wmi.c</a></div><div class='hunk'>@@ -992,7 +992,7 @@ static struct attribute *hwmon_attributes[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static mode_t asus_hwmon_sysfs_is_visible(struct kobject *kobj,</div><div class='add'>+static umode_t asus_hwmon_sysfs_is_visible(struct kobject *kobj,</div><div class='ctx'> 					  struct attribute *attr, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = container_of(kobj, struct device, kobj);</div><div class='hunk'>@@ -1357,7 +1357,7 @@ static struct attribute *platform_attributes[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static mode_t asus_sysfs_is_visible(struct kobject *kobj,</div><div class='add'>+static umode_t asus_sysfs_is_visible(struct kobject *kobj,</div><div class='ctx'> 				    struct attribute *attr, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = container_of(kobj, struct device, kobj);</div><div class='head'>diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c<br/>index d9312b3073e5..6f966d6c062b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/platform/x86/asus_acpi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/asus_acpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/platform/x86/asus_acpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/platform/x86/asus_acpi.c</a></div><div class='hunk'>@@ -1053,7 +1053,7 @@ static const struct file_operations disp_proc_fops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-asus_proc_add(char *name, const struct file_operations *proc_fops, mode_t mode,</div><div class='add'>+asus_proc_add(char *name, const struct file_operations *proc_fops, umode_t mode,</div><div class='ctx'> 		     struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_dir_entry *proc;</div><div class='hunk'>@@ -1072,7 +1072,7 @@ asus_proc_add(char *name, const struct file_operations *proc_fops, mode_t mode,</div><div class='ctx'> static int asus_hotk_add_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_dir_entry *proc;</div><div class='del'>-	mode_t mode;</div><div class='add'>+	umode_t mode;</div><div class='ctx'> </div><div class='ctx'> 	if ((asus_uid == 0) &amp;&amp; (asus_gid == 0)) {</div><div class='ctx'> 		mode = S_IFREG | S_IRUGO | S_IWUSR | S_IWGRP;</div><div class='head'>diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c<br/>index 8877b836d27c..d96734478324 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/platform/x86/compal-laptop.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/compal-laptop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/platform/x86/compal-laptop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/platform/x86/compal-laptop.c</a></div><div class='hunk'>@@ -189,7 +189,7 @@ struct compal_data{</div><div class='ctx'> /* =============== */</div><div class='ctx'> /* General globals */</div><div class='ctx'> /* =============== */</div><div class='del'>-static int force;</div><div class='add'>+static bool force;</div><div class='ctx'> module_param(force, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(force, "Force driver load, ignore DMI data");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c<br/>index 811d436cd677..42a7d603c870 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/platform/x86/ibm_rtl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/ibm_rtl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/platform/x86/ibm_rtl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/platform/x86/ibm_rtl.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/dmi.h&gt;</div><div class='ctx'> #include &lt;linux/efi.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='hunk'>@@ -165,22 +164,22 @@ static int ibm_rtl_write(u8 value)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t rtl_show_version(struct sysdev_class * dev,</div><div class='del'>-                                struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t rtl_show_version(struct device *dev,</div><div class='add'>+                                struct device_attribute *attr,</div><div class='ctx'>                                 char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%d\n", (int)ioread8(&amp;rtl_table-&gt;version));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t rtl_show_state(struct sysdev_class *dev,</div><div class='del'>-                              struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t rtl_show_state(struct device *dev,</div><div class='add'>+                              struct device_attribute *attr,</div><div class='ctx'>                               char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%d\n", ioread8(&amp;rtl_table-&gt;rt_status));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t rtl_set_state(struct sysdev_class *dev,</div><div class='del'>-                             struct sysdev_class_attribute *attr,</div><div class='add'>+static ssize_t rtl_set_state(struct device *dev,</div><div class='add'>+                             struct device_attribute *attr,</div><div class='ctx'>                              const char *buf,</div><div class='ctx'>                              size_t count)</div><div class='ctx'> {</div><div class='hunk'>@@ -205,27 +204,28 @@ static ssize_t rtl_set_state(struct sysdev_class *dev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class class_rtl = {</div><div class='add'>+static struct bus_type rtl_subsys = {</div><div class='ctx'> 	.name = "ibm_rtl",</div><div class='add'>+	.dev_name = "ibm_rtl",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(version, S_IRUGO, rtl_show_version, NULL);</div><div class='del'>-static SYSDEV_CLASS_ATTR(state, 0600, rtl_show_state, rtl_set_state);</div><div class='add'>+static DEVICE_ATTR(version, S_IRUGO, rtl_show_version, NULL);</div><div class='add'>+static DEVICE_ATTR(state, 0600, rtl_show_state, rtl_set_state);</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class_attribute *rtl_attributes[] = {</div><div class='del'>-	&amp;attr_version,</div><div class='del'>-	&amp;attr_state,</div><div class='add'>+static struct device_attribute *rtl_attributes[] = {</div><div class='add'>+	&amp;dev_attr_version,</div><div class='add'>+	&amp;dev_attr_state,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int rtl_setup_sysfs(void) {</div><div class='ctx'> 	int ret, i;</div><div class='del'>-	ret = sysdev_class_register(&amp;class_rtl);</div><div class='ctx'> </div><div class='add'>+	ret = subsys_system_register(&amp;rtl_subsys, NULL);</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		for (i = 0; rtl_attributes[i]; i ++)</div><div class='del'>-			sysdev_class_create_file(&amp;class_rtl, rtl_attributes[i]);</div><div class='add'>+			device_create_file(rtl_subsys.dev_root, rtl_attributes[i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -233,8 +233,8 @@ static int rtl_setup_sysfs(void) {</div><div class='ctx'> static void rtl_teardown_sysfs(void) {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	for (i = 0; rtl_attributes[i]; i ++)</div><div class='del'>-		sysdev_class_remove_file(&amp;class_rtl, rtl_attributes[i]);</div><div class='del'>-	sysdev_class_unregister(&amp;class_rtl);</div><div class='add'>+		device_remove_file(rtl_subsys.dev_root, rtl_attributes[i]);</div><div class='add'>+	bus_unregister(&amp;rtl_subsys);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c<br/>index a36addf106a0..ac902f7a9baa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/platform/x86/ideapad-laptop.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/ideapad-laptop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/platform/x86/ideapad-laptop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/platform/x86/ideapad-laptop.c</a></div><div class='hunk'>@@ -368,7 +368,7 @@ static struct attribute *ideapad_attributes[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static mode_t ideapad_is_visible(struct kobject *kobj,</div><div class='add'>+static umode_t ideapad_is_visible(struct kobject *kobj,</div><div class='ctx'> 				 struct attribute *attr,</div><div class='ctx'> 				 int idx)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel_menlow.c<br/>index abddc83e9fd7..3271ac85115e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/platform/x86/intel_menlow.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/intel_menlow.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/platform/x86/intel_menlow.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/platform/x86/intel_menlow.c</a></div><div class='hunk'>@@ -389,7 +389,7 @@ static ssize_t bios_enabled_show(struct device *dev,</div><div class='ctx'> 	return sprintf(buf, "%s\n", bios_enabled ? "enabled" : "disabled");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int intel_menlow_add_one_attribute(char *name, int mode, void *show,</div><div class='add'>+static int intel_menlow_add_one_attribute(char *name, umode_t mode, void *show,</div><div class='ctx'> 					  void *store, struct device *dev,</div><div class='ctx'> 					  acpi_handle handle)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c<br/>index 7f88c7923fc6..6ee0b5c90933 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/platform/x86/intel_oaktrail.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/intel_oaktrail.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/platform/x86/intel_oaktrail.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/platform/x86/intel_oaktrail.c</a></div><div class='hunk'>@@ -95,7 +95,7 @@</div><div class='ctx'> #define OT_EC_BL_CONTROL_ON_DATA	0x1A</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int force;</div><div class='add'>+static bool force;</div><div class='ctx'> module_param(force, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(force, "Force driver load, ignore DMI data");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c<br/>index 48870e504231..f00d0d1e0653 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/platform/x86/intel_scu_ipc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/intel_scu_ipc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/platform/x86/intel_scu_ipc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/platform/x86/intel_scu_ipc.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</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/init.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c<br/>index f204643c5052..bb5132128b33 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/platform/x86/msi-laptop.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/msi-laptop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/platform/x86/msi-laptop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/platform/x86/msi-laptop.c</a></div><div class='hunk'>@@ -89,7 +89,7 @@ static int msi_laptop_resume(struct platform_device *device);</div><div class='ctx'> </div><div class='ctx'> #define MSI_STANDARD_EC_DEVICES_EXISTS_ADDRESS	0x2f</div><div class='ctx'> </div><div class='del'>-static int force;</div><div class='add'>+static bool force;</div><div class='ctx'> module_param(force, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(force, "Force driver load, ignore DMI data");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c<br/>index 09e26bfd4643..fd73ea89b857 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/platform/x86/samsung-laptop.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/samsung-laptop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/platform/x86/samsung-laptop.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/platform/x86/samsung-laptop.c</a></div><div class='hunk'>@@ -228,12 +228,12 @@ static struct platform_device *sdev;</div><div class='ctx'> static struct rfkill *rfk;</div><div class='ctx'> static bool has_stepping_quirk;</div><div class='ctx'> </div><div class='del'>-static int force;</div><div class='add'>+static bool force;</div><div class='ctx'> module_param(force, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(force,</div><div class='ctx'> 		"Disable the DMI check and forces the driver to be loaded");</div><div class='ctx'> </div><div class='del'>-static int debug;</div><div class='add'>+static bool debug;</div><div class='ctx'> module_param(debug, bool, S_IRUGO | S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC(debug, "Debug enabled or not");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c<br/>index 7b828680b21d..ea0c6075b720 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/platform/x86/thinkpad_acpi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/thinkpad_acpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/platform/x86/thinkpad_acpi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/platform/x86/thinkpad_acpi.c</a></div><div class='hunk'>@@ -297,7 +297,7 @@ struct ibm_init_struct {</div><div class='ctx'> 	char param[32];</div><div class='ctx'> </div><div class='ctx'> 	int (*init) (struct ibm_init_struct *);</div><div class='del'>-	mode_t base_procfs_mode;</div><div class='add'>+	umode_t base_procfs_mode;</div><div class='ctx'> 	struct ibm_struct *data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -378,13 +378,13 @@ static unsigned int bright_maxlvl;	/* 0 = unknown */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_THINKPAD_ACPI_DEBUGFACILITIES</div><div class='ctx'> static int dbg_wlswemul;</div><div class='del'>-static int tpacpi_wlsw_emulstate;</div><div class='add'>+static bool tpacpi_wlsw_emulstate;</div><div class='ctx'> static int dbg_bluetoothemul;</div><div class='del'>-static int tpacpi_bluetooth_emulstate;</div><div class='add'>+static bool tpacpi_bluetooth_emulstate;</div><div class='ctx'> static int dbg_wwanemul;</div><div class='del'>-static int tpacpi_wwan_emulstate;</div><div class='add'>+static bool tpacpi_wwan_emulstate;</div><div class='ctx'> static int dbg_uwbemul;</div><div class='del'>-static int tpacpi_uwb_emulstate;</div><div class='add'>+static bool tpacpi_uwb_emulstate;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2456,8 +2456,9 @@ static int hotkey_kthread(void *data)</div><div class='ctx'> 	u32 poll_mask, event_mask;</div><div class='ctx'> 	unsigned int si, so;</div><div class='ctx'> 	unsigned long t;</div><div class='del'>-	unsigned int change_detector, must_reset;</div><div class='add'>+	unsigned int change_detector;</div><div class='ctx'> 	unsigned int poll_freq;</div><div class='add'>+	bool was_frozen;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;hotkey_thread_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -2488,14 +2489,14 @@ static int hotkey_kthread(void *data)</div><div class='ctx'> 				t = 100;	/* should never happen... */</div><div class='ctx'> 		}</div><div class='ctx'> 		t = msleep_interruptible(t);</div><div class='del'>-		if (unlikely(kthread_should_stop()))</div><div class='add'>+		if (unlikely(kthread_freezable_should_stop(&amp;was_frozen)))</div><div class='ctx'> 			break;</div><div class='del'>-		must_reset = try_to_freeze();</div><div class='del'>-		if (t &gt; 0 &amp;&amp; !must_reset)</div><div class='add'>+</div><div class='add'>+		if (t &gt; 0 &amp;&amp; !was_frozen)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		mutex_lock(&amp;hotkey_thread_data_mutex);</div><div class='del'>-		if (must_reset || hotkey_config_change != change_detector) {</div><div class='add'>+		if (was_frozen || hotkey_config_change != change_detector) {</div><div class='ctx'> 			/* forget old state on thaw or config change */</div><div class='ctx'> 			si = so;</div><div class='ctx'> 			t = 0;</div><div class='hunk'>@@ -2528,10 +2529,6 @@ exit:</div><div class='ctx'> static void hotkey_poll_stop_sync(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (tpacpi_hotkey_task) {</div><div class='del'>-		if (frozen(tpacpi_hotkey_task) ||</div><div class='del'>-		    freezing(tpacpi_hotkey_task))</div><div class='del'>-			thaw_process(tpacpi_hotkey_task);</div><div class='del'>-</div><div class='ctx'> 		kthread_stop(tpacpi_hotkey_task);</div><div class='ctx'> 		tpacpi_hotkey_task = NULL;</div><div class='ctx'> 		mutex_lock(&amp;hotkey_thread_mutex);</div><div class='hunk'>@@ -6447,7 +6444,7 @@ static struct ibm_struct brightness_driver_data = {</div><div class='ctx'> </div><div class='ctx'> static int alsa_index = ~((1 &lt;&lt; (SNDRV_CARDS - 3)) - 1); /* last three slots */</div><div class='ctx'> static char *alsa_id = "ThinkPadEC";</div><div class='del'>-static int alsa_enable = SNDRV_DEFAULT_ENABLE1;</div><div class='add'>+static bool alsa_enable = SNDRV_DEFAULT_ENABLE1;</div><div class='ctx'> </div><div class='ctx'> struct tpacpi_alsa_data {</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -6490,7 +6487,7 @@ static enum tpacpi_volume_access_mode volume_mode =</div><div class='ctx'> 	TPACPI_VOL_MODE_MAX;</div><div class='ctx'> </div><div class='ctx'> static enum tpacpi_volume_capabilities volume_capabilities;</div><div class='del'>-static int volume_control_allowed;</div><div class='add'>+static bool volume_control_allowed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Used to syncronize writers to TP_EC_AUDIO and</div><div class='hunk'>@@ -7268,7 +7265,7 @@ enum fan_control_commands {</div><div class='ctx'> 						 * and also watchdog cmd */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int fan_control_allowed;</div><div class='add'>+static bool fan_control_allowed;</div><div class='ctx'> </div><div class='ctx'> static enum fan_status_access_mode fan_status_access_mode;</div><div class='ctx'> static enum fan_control_access_mode fan_control_access_mode;</div><div class='hunk'>@@ -8440,7 +8437,7 @@ static struct proc_dir_entry *proc_dir;</div><div class='ctx'>  * Module and infrastructure proble, init and exit handling</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int force_load;</div><div class='add'>+static bool force_load;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_THINKPAD_ACPI_DEBUG</div><div class='ctx'> static const char * __init str_supported(int is_supported)</div><div class='hunk'>@@ -8542,7 +8539,7 @@ static int __init ibm_init(struct ibm_init_struct *iibm)</div><div class='ctx'> 		"%s installed\n", ibm-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	if (ibm-&gt;read) {</div><div class='del'>-		mode_t mode = iibm-&gt;base_procfs_mode;</div><div class='add'>+		umode_t mode = iibm-&gt;base_procfs_mode;</div><div class='ctx'> </div><div class='ctx'> 		if (!mode)</div><div class='ctx'> 			mode = S_IRUGO;</div><div class='head'>diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c<br/>index a134c26870b0..42a4dcc25f92 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/platform/x86/wmi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/platform/x86/wmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/platform/x86/wmi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/platform/x86/wmi.c</a></div><div class='hunk'>@@ -82,12 +82,12 @@ struct wmi_block {</div><div class='ctx'> #define ACPI_WMI_STRING      0x4	/* GUID takes &amp; returns a string */</div><div class='ctx'> #define ACPI_WMI_EVENT       0x8	/* GUID is an event */</div><div class='ctx'> </div><div class='del'>-static int debug_event;</div><div class='add'>+static bool debug_event;</div><div class='ctx'> module_param(debug_event, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(debug_event,</div><div class='ctx'> 		 "Log WMI Events [0/1]");</div><div class='ctx'> </div><div class='del'>-static int debug_dump_wdg;</div><div class='add'>+static bool debug_dump_wdg;</div><div class='ctx'> module_param(debug_dump_wdg, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(debug_dump_wdg,</div><div class='ctx'> 		 "Dump available WMI interfaces [0/1]");</div><div class='head'>diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c<br/>index dfbd5a6cc58b..258fef272ea7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pnp/quirks.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/pnp/quirks.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pnp/quirks.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/pnp/quirks.c</a></div><div class='hunk'>@@ -295,6 +295,45 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_AMD_NB</div><div class='add'>+</div><div class='add'>+#include &lt;asm/amd_nb.h&gt;</div><div class='add'>+</div><div class='add'>+static void quirk_amd_mmconfig_area(struct pnp_dev *dev)</div><div class='add'>+{</div><div class='add'>+	resource_size_t start, end;</div><div class='add'>+	struct pnp_resource *pnp_res;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	struct resource mmconfig_res, *mmconfig;</div><div class='add'>+</div><div class='add'>+	mmconfig = amd_get_mmconfig_range(&amp;mmconfig_res);</div><div class='add'>+	if (!mmconfig)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(pnp_res, &amp;dev-&gt;resources, list) {</div><div class='add'>+		res = &amp;pnp_res-&gt;res;</div><div class='add'>+		if (res-&gt;end &lt; mmconfig-&gt;start || res-&gt;start &gt; mmconfig-&gt;end ||</div><div class='add'>+		    (res-&gt;start == mmconfig-&gt;start &amp;&amp; res-&gt;end == mmconfig-&gt;end))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dev_info(&amp;dev-&gt;dev, FW_BUG</div><div class='add'>+			 "%pR covers only part of AMD MMCONFIG area %pR; adding more reservations\n",</div><div class='add'>+			 res, mmconfig);</div><div class='add'>+		if (mmconfig-&gt;start &lt; res-&gt;start) {</div><div class='add'>+			start = mmconfig-&gt;start;</div><div class='add'>+			end = res-&gt;start - 1;</div><div class='add'>+			pnp_add_mem_resource(dev, start, end, 0);</div><div class='add'>+		}</div><div class='add'>+		if (mmconfig-&gt;end &gt; res-&gt;end) {</div><div class='add'>+			start = res-&gt;end + 1;</div><div class='add'>+			end = mmconfig-&gt;end;</div><div class='add'>+			pnp_add_mem_resource(dev, start, end, 0);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *  PnP Quirks</div><div class='ctx'>  *  Cards or devices that need some tweaking due to incomplete resource info</div><div class='hunk'>@@ -322,6 +361,9 @@ static struct pnp_fixup pnp_fixups[] = {</div><div class='ctx'> 	/* PnP resources that might overlap PCI BARs */</div><div class='ctx'> 	{"PNP0c01", quirk_system_pci_resources},</div><div class='ctx'> 	{"PNP0c02", quirk_system_pci_resources},</div><div class='add'>+#ifdef CONFIG_AMD_NB</div><div class='add'>+	{"PNP0c01", quirk_amd_mmconfig_area},</div><div class='add'>+#endif</div><div class='ctx'> 	{""}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig<br/>index 9f88641e67f9..3a8daf858742 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/Kconfig</a></div><div class='hunk'>@@ -116,12 +116,12 @@ config BATTERY_WM97XX</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y to enable support for battery measured by WM97xx aux port.</div><div class='ctx'> </div><div class='del'>-config BATTERY_BQ20Z75</div><div class='del'>-        tristate "TI BQ20z75 gas gauge"</div><div class='add'>+config BATTERY_SBS</div><div class='add'>+        tristate "SBS Compliant gas gauge"</div><div class='ctx'>         depends on I2C</div><div class='ctx'>         help</div><div class='del'>-         Say Y to include support for TI BQ20z75 SBS-compliant</div><div class='del'>-         gas gauge and protection IC.</div><div class='add'>+	  Say Y to include support for SBS battery driver for SBS-compliant</div><div class='add'>+	  gas gauges.</div><div class='ctx'> </div><div class='ctx'> config BATTERY_BQ27x00</div><div class='ctx'> 	tristate "BQ27x00 battery driver"</div><div class='hunk'>@@ -150,6 +150,14 @@ config BATTERY_DA9030</div><div class='ctx'> 	  Say Y here to enable support for batteries charger integrated into</div><div class='ctx'> 	  DA9030 PMIC.</div><div class='ctx'> </div><div class='add'>+config BATTERY_DA9052</div><div class='add'>+	tristate "Dialog DA9052 Battery"</div><div class='add'>+	depends on PMIC_DA9052</div><div class='add'>+	depends on BROKEN</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to enable support for batteries charger integrated into</div><div class='add'>+	  DA9052 PMIC.</div><div class='add'>+</div><div class='ctx'> config BATTERY_MAX17040</div><div class='ctx'> 	tristate "Maxim MAX17040 Fuel Gauge"</div><div class='ctx'> 	depends on I2C</div><div class='hunk'>@@ -226,6 +234,12 @@ config CHARGER_TWL4030</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to enable support for TWL4030 Battery Charge Interface.</div><div class='ctx'> </div><div class='add'>+config CHARGER_LP8727</div><div class='add'>+	tristate "National Semiconductor LP8727 charger driver"</div><div class='add'>+	depends on I2C</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to enable support for LP8727 Charger Driver.</div><div class='add'>+</div><div class='ctx'> config CHARGER_GPIO</div><div class='ctx'> 	tristate "GPIO charger"</div><div class='ctx'> 	depends on GPIOLIB</div><div class='hunk'>@@ -236,6 +250,16 @@ config CHARGER_GPIO</div><div class='ctx'> 	  This driver can be build as a module. If so, the module will be</div><div class='ctx'> 	  called gpio-charger.</div><div class='ctx'> </div><div class='add'>+config CHARGER_MANAGER</div><div class='add'>+	bool "Battery charger manager for multiple chargers"</div><div class='add'>+	depends on REGULATOR &amp;&amp; RTC_CLASS</div><div class='add'>+	help</div><div class='add'>+          Say Y to enable charger-manager support, which allows multiple</div><div class='add'>+          chargers attached to a battery and multiple batteries attached to a</div><div class='add'>+          system. The charger-manager also can monitor charging status in</div><div class='add'>+          runtime and in suspend-to-RAM by waking up the system periodically</div><div class='add'>+          with help of suspend_again support.</div><div class='add'>+</div><div class='ctx'> config CHARGER_MAX8997</div><div class='ctx'> 	tristate "Maxim MAX8997/MAX8966 PMIC battery charger driver"</div><div class='ctx'> 	depends on MFD_MAX8997 &amp;&amp; REGULATOR_MAX8997</div><div class='head'>diff --git a/drivers/power/Makefile b/drivers/power/Makefile<br/>index b4af13dd8b66..e429008eaf10 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/Makefile</a></div><div class='hunk'>@@ -22,9 +22,10 @@ obj-$(CONFIG_BATTERY_OLPC)	+= olpc_battery.o</div><div class='ctx'> obj-$(CONFIG_BATTERY_TOSA)	+= tosa_battery.o</div><div class='ctx'> obj-$(CONFIG_BATTERY_COLLIE)	+= collie_battery.o</div><div class='ctx'> obj-$(CONFIG_BATTERY_WM97XX)	+= wm97xx_battery.o</div><div class='del'>-obj-$(CONFIG_BATTERY_BQ20Z75)	+= bq20z75.o</div><div class='add'>+obj-$(CONFIG_BATTERY_SBS)	+= sbs-battery.o</div><div class='ctx'> obj-$(CONFIG_BATTERY_BQ27x00)	+= bq27x00_battery.o</div><div class='ctx'> obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o</div><div class='add'>+obj-$(CONFIG_BATTERY_DA9052)	+= da9052-battery.o</div><div class='ctx'> obj-$(CONFIG_BATTERY_MAX17040)	+= max17040_battery.o</div><div class='ctx'> obj-$(CONFIG_BATTERY_MAX17042)	+= max17042_battery.o</div><div class='ctx'> obj-$(CONFIG_BATTERY_Z2)	+= z2_battery.o</div><div class='hunk'>@@ -35,6 +36,8 @@ obj-$(CONFIG_BATTERY_INTEL_MID)	+= intel_mid_battery.o</div><div class='ctx'> obj-$(CONFIG_CHARGER_ISP1704)	+= isp1704_charger.o</div><div class='ctx'> obj-$(CONFIG_CHARGER_MAX8903)	+= max8903_charger.o</div><div class='ctx'> obj-$(CONFIG_CHARGER_TWL4030)	+= twl4030_charger.o</div><div class='add'>+obj-$(CONFIG_CHARGER_LP8727)	+= lp8727_charger.o</div><div class='ctx'> obj-$(CONFIG_CHARGER_GPIO)	+= gpio-charger.o</div><div class='add'>+obj-$(CONFIG_CHARGER_MANAGER)	+= charger-manager.o</div><div class='ctx'> obj-$(CONFIG_CHARGER_MAX8997)	+= max8997_charger.o</div><div class='ctx'> obj-$(CONFIG_CHARGER_MAX8998)	+= max8998_charger.o</div><div class='head'>diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c<br/>index bb16f5b7e167..98bf5676318d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/bq27x00_battery.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/bq27x00_battery.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/bq27x00_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/bq27x00_battery.c</a></div><div class='hunk'>@@ -54,13 +54,19 @@</div><div class='ctx'> </div><div class='ctx'> #define BQ27000_REG_RSOC		0x0B /* Relative State-of-Charge */</div><div class='ctx'> #define BQ27000_REG_ILMD		0x76 /* Initial last measured discharge */</div><div class='del'>-#define BQ27000_FLAG_CHGS		BIT(7)</div><div class='add'>+#define BQ27000_FLAG_EDVF		BIT(0) /* Final End-of-Discharge-Voltage flag */</div><div class='add'>+#define BQ27000_FLAG_EDV1		BIT(1) /* First End-of-Discharge-Voltage flag */</div><div class='add'>+#define BQ27000_FLAG_CI			BIT(4) /* Capacity Inaccurate flag */</div><div class='ctx'> #define BQ27000_FLAG_FC			BIT(5)</div><div class='add'>+#define BQ27000_FLAG_CHGS		BIT(7) /* Charge state flag */</div><div class='ctx'> </div><div class='ctx'> #define BQ27500_REG_SOC			0x2C</div><div class='ctx'> #define BQ27500_REG_DCAP		0x3C /* Design capacity */</div><div class='del'>-#define BQ27500_FLAG_DSC		BIT(0)</div><div class='del'>-#define BQ27500_FLAG_FC			BIT(9)</div><div class='add'>+#define BQ27500_FLAG_DSG		BIT(0) /* Discharging */</div><div class='add'>+#define BQ27500_FLAG_SOCF		BIT(1) /* State-of-Charge threshold final */</div><div class='add'>+#define BQ27500_FLAG_SOC1		BIT(2) /* State-of-Charge threshold 1 */</div><div class='add'>+#define BQ27500_FLAG_CHG		BIT(8) /* Charging */</div><div class='add'>+#define BQ27500_FLAG_FC			BIT(9) /* Fully charged */</div><div class='ctx'> </div><div class='ctx'> #define BQ27000_RS			20 /* Resistor sense */</div><div class='ctx'> </div><div class='hunk'>@@ -79,9 +85,8 @@ struct bq27x00_reg_cache {</div><div class='ctx'> 	int charge_full;</div><div class='ctx'> 	int cycle_count;</div><div class='ctx'> 	int capacity;</div><div class='add'>+	int energy;</div><div class='ctx'> 	int flags;</div><div class='del'>-</div><div class='del'>-	int current_now;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bq27x00_device_info {</div><div class='hunk'>@@ -108,6 +113,7 @@ static enum power_supply_property bq27x00_battery_props[] = {</div><div class='ctx'> 	POWER_SUPPLY_PROP_VOLTAGE_NOW,</div><div class='ctx'> 	POWER_SUPPLY_PROP_CURRENT_NOW,</div><div class='ctx'> 	POWER_SUPPLY_PROP_CAPACITY,</div><div class='add'>+	POWER_SUPPLY_PROP_CAPACITY_LEVEL,</div><div class='ctx'> 	POWER_SUPPLY_PROP_TEMP,</div><div class='ctx'> 	POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW,</div><div class='ctx'> 	POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG,</div><div class='hunk'>@@ -149,7 +155,7 @@ static int bq27x00_battery_read_rsoc(struct bq27x00_device_info *di)</div><div class='ctx'> 		rsoc = bq27x00_read(di, BQ27000_REG_RSOC, true);</div><div class='ctx'> </div><div class='ctx'> 	if (rsoc &lt; 0)</div><div class='del'>-		dev_err(di-&gt;dev, "error reading relative State-of-Charge\n");</div><div class='add'>+		dev_dbg(di-&gt;dev, "error reading relative State-of-Charge\n");</div><div class='ctx'> </div><div class='ctx'> 	return rsoc;</div><div class='ctx'> }</div><div class='hunk'>@@ -164,7 +170,8 @@ static int bq27x00_battery_read_charge(struct bq27x00_device_info *di, u8 reg)</div><div class='ctx'> </div><div class='ctx'> 	charge = bq27x00_read(di, reg, false);</div><div class='ctx'> 	if (charge &lt; 0) {</div><div class='del'>-		dev_err(di-&gt;dev, "error reading nominal available capacity\n");</div><div class='add'>+		dev_dbg(di-&gt;dev, "error reading charge register %02x: %d\n",</div><div class='add'>+			reg, charge);</div><div class='ctx'> 		return charge;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -208,7 +215,7 @@ static int bq27x00_battery_read_ilmd(struct bq27x00_device_info *di)</div><div class='ctx'> 		ilmd = bq27x00_read(di, BQ27000_REG_ILMD, true);</div><div class='ctx'> </div><div class='ctx'> 	if (ilmd &lt; 0) {</div><div class='del'>-		dev_err(di-&gt;dev, "error reading initial last measured discharge\n");</div><div class='add'>+		dev_dbg(di-&gt;dev, "error reading initial last measured discharge\n");</div><div class='ctx'> 		return ilmd;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -221,6 +228,50 @@ static int bq27x00_battery_read_ilmd(struct bq27x00_device_info *di)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Return the battery Available energy in µWh</div><div class='add'>+ * Or &lt; 0 if something fails.</div><div class='add'>+ */</div><div class='add'>+static int bq27x00_battery_read_energy(struct bq27x00_device_info *di)</div><div class='add'>+{</div><div class='add'>+	int ae;</div><div class='add'>+</div><div class='add'>+	ae = bq27x00_read(di, BQ27x00_REG_AE, false);</div><div class='add'>+	if (ae &lt; 0) {</div><div class='add'>+		dev_dbg(di-&gt;dev, "error reading available energy\n");</div><div class='add'>+		return ae;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (di-&gt;chip == BQ27500)</div><div class='add'>+		ae *= 1000;</div><div class='add'>+	else</div><div class='add'>+		ae = ae * 29200 / BQ27000_RS;</div><div class='add'>+</div><div class='add'>+	return ae;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Return the battery temperature in tenths of degree Celsius</div><div class='add'>+ * Or &lt; 0 if something fails.</div><div class='add'>+ */</div><div class='add'>+static int bq27x00_battery_read_temperature(struct bq27x00_device_info *di)</div><div class='add'>+{</div><div class='add'>+	int temp;</div><div class='add'>+</div><div class='add'>+	temp = bq27x00_read(di, BQ27x00_REG_TEMP, false);</div><div class='add'>+	if (temp &lt; 0) {</div><div class='add'>+		dev_err(di-&gt;dev, "error reading temperature\n");</div><div class='add'>+		return temp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (di-&gt;chip == BQ27500)</div><div class='add'>+		temp -= 2731;</div><div class='add'>+	else</div><div class='add'>+		temp = ((temp * 5) - 5463) / 2;</div><div class='add'>+</div><div class='add'>+	return temp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Return the battery Cycle count total</div><div class='ctx'>  * Or &lt; 0 if something fails.</div><div class='ctx'>  */</div><div class='hunk'>@@ -245,7 +296,8 @@ static int bq27x00_battery_read_time(struct bq27x00_device_info *di, u8 reg)</div><div class='ctx'> </div><div class='ctx'> 	tval = bq27x00_read(di, reg, false);</div><div class='ctx'> 	if (tval &lt; 0) {</div><div class='del'>-		dev_err(di-&gt;dev, "error reading register %02x: %d\n", reg, tval);</div><div class='add'>+		dev_dbg(di-&gt;dev, "error reading time register %02x: %d\n",</div><div class='add'>+			reg, tval);</div><div class='ctx'> 		return tval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -262,25 +314,31 @@ static void bq27x00_update(struct bq27x00_device_info *di)</div><div class='ctx'> </div><div class='ctx'> 	cache.flags = bq27x00_read(di, BQ27x00_REG_FLAGS, is_bq27500);</div><div class='ctx'> 	if (cache.flags &gt;= 0) {</div><div class='del'>-		cache.capacity = bq27x00_battery_read_rsoc(di);</div><div class='del'>-		cache.temperature = bq27x00_read(di, BQ27x00_REG_TEMP, false);</div><div class='del'>-		cache.time_to_empty = bq27x00_battery_read_time(di, BQ27x00_REG_TTE);</div><div class='del'>-		cache.time_to_empty_avg = bq27x00_battery_read_time(di, BQ27x00_REG_TTECP);</div><div class='del'>-		cache.time_to_full = bq27x00_battery_read_time(di, BQ27x00_REG_TTF);</div><div class='del'>-		cache.charge_full = bq27x00_battery_read_lmd(di);</div><div class='add'>+		if (!is_bq27500 &amp;&amp; (cache.flags &amp; BQ27000_FLAG_CI)) {</div><div class='add'>+			dev_info(di-&gt;dev, "battery is not calibrated! ignoring capacity values\n");</div><div class='add'>+			cache.capacity = -ENODATA;</div><div class='add'>+			cache.energy = -ENODATA;</div><div class='add'>+			cache.time_to_empty = -ENODATA;</div><div class='add'>+			cache.time_to_empty_avg = -ENODATA;</div><div class='add'>+			cache.time_to_full = -ENODATA;</div><div class='add'>+			cache.charge_full = -ENODATA;</div><div class='add'>+		} else {</div><div class='add'>+			cache.capacity = bq27x00_battery_read_rsoc(di);</div><div class='add'>+			cache.energy = bq27x00_battery_read_energy(di);</div><div class='add'>+			cache.time_to_empty = bq27x00_battery_read_time(di, BQ27x00_REG_TTE);</div><div class='add'>+			cache.time_to_empty_avg = bq27x00_battery_read_time(di, BQ27x00_REG_TTECP);</div><div class='add'>+			cache.time_to_full = bq27x00_battery_read_time(di, BQ27x00_REG_TTF);</div><div class='add'>+			cache.charge_full = bq27x00_battery_read_lmd(di);</div><div class='add'>+		}</div><div class='add'>+		cache.temperature = bq27x00_battery_read_temperature(di);</div><div class='ctx'> 		cache.cycle_count = bq27x00_battery_read_cyct(di);</div><div class='ctx'> </div><div class='del'>-		if (!is_bq27500)</div><div class='del'>-			cache.current_now = bq27x00_read(di, BQ27x00_REG_AI, false);</div><div class='del'>-</div><div class='ctx'> 		/* We only have to read charge design full once */</div><div class='ctx'> 		if (di-&gt;charge_design_full &lt;= 0)</div><div class='ctx'> 			di-&gt;charge_design_full = bq27x00_battery_read_ilmd(di);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Ignore current_now which is a snapshot of the current battery state</div><div class='del'>-	 * and is likely to be different even between two consecutive reads */</div><div class='del'>-	if (memcmp(&amp;di-&gt;cache, &amp;cache, sizeof(cache) - sizeof(int)) != 0) {</div><div class='add'>+	if (memcmp(&amp;di-&gt;cache, &amp;cache, sizeof(cache)) != 0) {</div><div class='ctx'> 		di-&gt;cache = cache;</div><div class='ctx'> 		power_supply_changed(&amp;di-&gt;bat);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -302,25 +360,6 @@ static void bq27x00_battery_poll(struct work_struct *work)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Return the battery temperature in tenths of degree Celsius</div><div class='del'>- * Or &lt; 0 if something fails.</div><div class='del'>- */</div><div class='del'>-static int bq27x00_battery_temperature(struct bq27x00_device_info *di,</div><div class='del'>-	union power_supply_propval *val)</div><div class='del'>-{</div><div class='del'>-	if (di-&gt;cache.temperature &lt; 0)</div><div class='del'>-		return di-&gt;cache.temperature;</div><div class='del'>-</div><div class='del'>-	if (di-&gt;chip == BQ27500)</div><div class='del'>-		val-&gt;intval = di-&gt;cache.temperature - 2731;</div><div class='del'>-	else</div><div class='del'>-		val-&gt;intval = ((di-&gt;cache.temperature * 5) - 5463) / 2;</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'>  * Return the battery average current in µA</div><div class='ctx'>  * Note that current can be negative signed as well</div><div class='hunk'>@@ -330,20 +369,20 @@ static int bq27x00_battery_current(struct bq27x00_device_info *di,</div><div class='ctx'> 	union power_supply_propval *val)</div><div class='ctx'> {</div><div class='ctx'> 	int curr;</div><div class='add'>+	int flags;</div><div class='ctx'> </div><div class='del'>-	if (di-&gt;chip == BQ27500)</div><div class='del'>-	    curr = bq27x00_read(di, BQ27x00_REG_AI, false);</div><div class='del'>-	else</div><div class='del'>-	    curr = di-&gt;cache.current_now;</div><div class='del'>-</div><div class='del'>-	if (curr &lt; 0)</div><div class='add'>+	curr = bq27x00_read(di, BQ27x00_REG_AI, false);</div><div class='add'>+	if (curr &lt; 0) {</div><div class='add'>+		dev_err(di-&gt;dev, "error reading current\n");</div><div class='ctx'> 		return curr;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (di-&gt;chip == BQ27500) {</div><div class='ctx'> 		/* bq27500 returns signed value */</div><div class='ctx'> 		val-&gt;intval = (int)((s16)curr) * 1000;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (di-&gt;cache.flags &amp; BQ27000_FLAG_CHGS) {</div><div class='add'>+		flags = bq27x00_read(di, BQ27x00_REG_FLAGS, false);</div><div class='add'>+		if (flags &amp; BQ27000_FLAG_CHGS) {</div><div class='ctx'> 			dev_dbg(di-&gt;dev, "negative current!\n");</div><div class='ctx'> 			curr = -curr;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -362,10 +401,14 @@ static int bq27x00_battery_status(struct bq27x00_device_info *di,</div><div class='ctx'> 	if (di-&gt;chip == BQ27500) {</div><div class='ctx'> 		if (di-&gt;cache.flags &amp; BQ27500_FLAG_FC)</div><div class='ctx'> 			status = POWER_SUPPLY_STATUS_FULL;</div><div class='del'>-		else if (di-&gt;cache.flags &amp; BQ27500_FLAG_DSC)</div><div class='add'>+		else if (di-&gt;cache.flags &amp; BQ27500_FLAG_DSG)</div><div class='ctx'> 			status = POWER_SUPPLY_STATUS_DISCHARGING;</div><div class='del'>-		else</div><div class='add'>+		else if (di-&gt;cache.flags &amp; BQ27500_FLAG_CHG)</div><div class='ctx'> 			status = POWER_SUPPLY_STATUS_CHARGING;</div><div class='add'>+		else if (power_supply_am_i_supplied(&amp;di-&gt;bat))</div><div class='add'>+			status = POWER_SUPPLY_STATUS_NOT_CHARGING;</div><div class='add'>+		else</div><div class='add'>+			status = POWER_SUPPLY_STATUS_UNKNOWN;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (di-&gt;cache.flags &amp; BQ27000_FLAG_FC)</div><div class='ctx'> 			status = POWER_SUPPLY_STATUS_FULL;</div><div class='hunk'>@@ -382,50 +425,56 @@ static int bq27x00_battery_status(struct bq27x00_device_info *di,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Return the battery Voltage in milivolts</div><div class='del'>- * Or &lt; 0 if something fails.</div><div class='del'>- */</div><div class='del'>-static int bq27x00_battery_voltage(struct bq27x00_device_info *di,</div><div class='add'>+static int bq27x00_battery_capacity_level(struct bq27x00_device_info *di,</div><div class='ctx'> 	union power_supply_propval *val)</div><div class='ctx'> {</div><div class='del'>-	int volt;</div><div class='add'>+	int level;</div><div class='ctx'> </div><div class='del'>-	volt = bq27x00_read(di, BQ27x00_REG_VOLT, false);</div><div class='del'>-	if (volt &lt; 0)</div><div class='del'>-		return volt;</div><div class='add'>+	if (di-&gt;chip == BQ27500) {</div><div class='add'>+		if (di-&gt;cache.flags &amp; BQ27500_FLAG_FC)</div><div class='add'>+			level = POWER_SUPPLY_CAPACITY_LEVEL_FULL;</div><div class='add'>+		else if (di-&gt;cache.flags &amp; BQ27500_FLAG_SOC1)</div><div class='add'>+			level = POWER_SUPPLY_CAPACITY_LEVEL_LOW;</div><div class='add'>+		else if (di-&gt;cache.flags &amp; BQ27500_FLAG_SOCF)</div><div class='add'>+			level = POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL;</div><div class='add'>+		else</div><div class='add'>+			level = POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;</div><div class='add'>+	} else {</div><div class='add'>+		if (di-&gt;cache.flags &amp; BQ27000_FLAG_FC)</div><div class='add'>+			level = POWER_SUPPLY_CAPACITY_LEVEL_FULL;</div><div class='add'>+		else if (di-&gt;cache.flags &amp; BQ27000_FLAG_EDV1)</div><div class='add'>+			level = POWER_SUPPLY_CAPACITY_LEVEL_LOW;</div><div class='add'>+		else if (di-&gt;cache.flags &amp; BQ27000_FLAG_EDVF)</div><div class='add'>+			level = POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL;</div><div class='add'>+		else</div><div class='add'>+			level = POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	val-&gt;intval = volt * 1000;</div><div class='add'>+	val-&gt;intval = level;</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'>- * Return the battery Available energy in µWh</div><div class='add'>+ * Return the battery Voltage in milivolts</div><div class='ctx'>  * Or &lt; 0 if something fails.</div><div class='ctx'>  */</div><div class='del'>-static int bq27x00_battery_energy(struct bq27x00_device_info *di,</div><div class='add'>+static int bq27x00_battery_voltage(struct bq27x00_device_info *di,</div><div class='ctx'> 	union power_supply_propval *val)</div><div class='ctx'> {</div><div class='del'>-	int ae;</div><div class='add'>+	int volt;</div><div class='ctx'> </div><div class='del'>-	ae = bq27x00_read(di, BQ27x00_REG_AE, false);</div><div class='del'>-	if (ae &lt; 0) {</div><div class='del'>-		dev_err(di-&gt;dev, "error reading available energy\n");</div><div class='del'>-		return ae;</div><div class='add'>+	volt = bq27x00_read(di, BQ27x00_REG_VOLT, false);</div><div class='add'>+	if (volt &lt; 0) {</div><div class='add'>+		dev_err(di-&gt;dev, "error reading voltage\n");</div><div class='add'>+		return volt;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (di-&gt;chip == BQ27500)</div><div class='del'>-		ae *= 1000;</div><div class='del'>-	else</div><div class='del'>-		ae = ae * 29200 / BQ27000_RS;</div><div class='del'>-</div><div class='del'>-	val-&gt;intval = ae;</div><div class='add'>+	val-&gt;intval = volt * 1000;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int bq27x00_simple_value(int value,</div><div class='ctx'> 	union power_supply_propval *val)</div><div class='ctx'> {</div><div class='hunk'>@@ -473,8 +522,11 @@ static int bq27x00_battery_get_property(struct power_supply *psy,</div><div class='ctx'> 	case POWER_SUPPLY_PROP_CAPACITY:</div><div class='ctx'> 		ret = bq27x00_simple_value(di-&gt;cache.capacity, val);</div><div class='ctx'> 		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_CAPACITY_LEVEL:</div><div class='add'>+		ret = bq27x00_battery_capacity_level(di, val);</div><div class='add'>+		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_TEMP:</div><div class='del'>-		ret = bq27x00_battery_temperature(di, val);</div><div class='add'>+		ret = bq27x00_simple_value(di-&gt;cache.temperature, val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW:</div><div class='ctx'> 		ret = bq27x00_simple_value(di-&gt;cache.time_to_empty, val);</div><div class='hunk'>@@ -501,7 +553,7 @@ static int bq27x00_battery_get_property(struct power_supply *psy,</div><div class='ctx'> 		ret = bq27x00_simple_value(di-&gt;cache.cycle_count, val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_ENERGY_NOW:</div><div class='del'>-		ret = bq27x00_battery_energy(di, val);</div><div class='add'>+		ret = bq27x00_simple_value(di-&gt;cache.energy, val);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -546,6 +598,14 @@ static int bq27x00_powersupply_init(struct bq27x00_device_info *di)</div><div class='ctx'> </div><div class='ctx'> static void bq27x00_powersupply_unregister(struct bq27x00_device_info *di)</div><div class='ctx'> {</div><div class='add'>+	/*</div><div class='add'>+	 * power_supply_unregister call bq27x00_battery_get_property which</div><div class='add'>+	 * call bq27x00_battery_poll.</div><div class='add'>+	 * Make sure that bq27x00_battery_poll will not call</div><div class='add'>+	 * schedule_delayed_work again after unregister (which cause OOPS).</div><div class='add'>+	 */</div><div class='add'>+	poll_interval = 0;</div><div class='add'>+</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;di-&gt;work);</div><div class='ctx'> </div><div class='ctx'> 	power_supply_unregister(&amp;di-&gt;bat);</div><div class='head'>diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c<br/>new file mode 100644<br/>index 000000000000..0378d019efae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/charger-manager.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/charger-manager.c</a></div><div class='hunk'>@@ -0,0 +1,1072 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2011 Samsung Electronics Co., Ltd.</div><div class='add'>+ * MyungJoo Ham &lt;myungjoo.ham@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This driver enables to monitor battery health and control charger</div><div class='add'>+ * during suspend-to-mem.</div><div class='add'>+ * Charger manager depends on other devices. register this later than</div><div class='add'>+ * the depending devices.</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</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/module.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/power/charger-manager.h&gt;</div><div class='add'>+#include &lt;linux/regulator/consumer.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Regard CM_JIFFIES_SMALL jiffies is small enough to ignore for</div><div class='add'>+ * delayed works so that we can run delayed works with CM_JIFFIES_SMALL</div><div class='add'>+ * without any delays.</div><div class='add'>+ */</div><div class='add'>+#define	CM_JIFFIES_SMALL	(2)</div><div class='add'>+</div><div class='add'>+/* If y is valid (&gt; 0) and smaller than x, do x = y */</div><div class='add'>+#define CM_MIN_VALID(x, y)	x = (((y &gt; 0) &amp;&amp; ((x) &gt; (y))) ? (y) : (x))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Regard CM_RTC_SMALL (sec) is small enough to ignore error in invoking</div><div class='add'>+ * rtc alarm. It should be 2 or larger</div><div class='add'>+ */</div><div class='add'>+#define CM_RTC_SMALL		(2)</div><div class='add'>+</div><div class='add'>+#define UEVENT_BUF_SIZE		32</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(cm_list);</div><div class='add'>+static DEFINE_MUTEX(cm_list_mtx);</div><div class='add'>+</div><div class='add'>+/* About in-suspend (suspend-again) monitoring */</div><div class='add'>+static struct rtc_device *rtc_dev;</div><div class='add'>+/*</div><div class='add'>+ * Backup RTC alarm</div><div class='add'>+ * Save the wakeup alarm before entering suspend-to-RAM</div><div class='add'>+ */</div><div class='add'>+static struct rtc_wkalrm rtc_wkalarm_save;</div><div class='add'>+/* Backup RTC alarm time in terms of seconds since 01-01-1970 00:00:00 */</div><div class='add'>+static unsigned long rtc_wkalarm_save_time;</div><div class='add'>+static bool cm_suspended;</div><div class='add'>+static bool cm_rtc_set;</div><div class='add'>+static unsigned long cm_suspend_duration_ms;</div><div class='add'>+</div><div class='add'>+/* Global charger-manager description */</div><div class='add'>+static struct charger_global_desc *g_desc; /* init with setup_charger_manager */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * is_batt_present - See if the battery presents in place.</div><div class='add'>+ * @cm: the Charger Manager representing the battery.</div><div class='add'>+ */</div><div class='add'>+static bool is_batt_present(struct charger_manager *cm)</div><div class='add'>+{</div><div class='add'>+	union power_supply_propval val;</div><div class='add'>+	bool present = false;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	switch (cm-&gt;desc-&gt;battery_present) {</div><div class='add'>+	case CM_FUEL_GAUGE:</div><div class='add'>+		ret = cm-&gt;fuel_gauge-&gt;get_property(cm-&gt;fuel_gauge,</div><div class='add'>+				POWER_SUPPLY_PROP_PRESENT, &amp;val);</div><div class='add'>+		if (ret == 0 &amp;&amp; val.intval)</div><div class='add'>+			present = true;</div><div class='add'>+		break;</div><div class='add'>+	case CM_CHARGER_STAT:</div><div class='add'>+		for (i = 0; cm-&gt;charger_stat[i]; i++) {</div><div class='add'>+			ret = cm-&gt;charger_stat[i]-&gt;get_property(</div><div class='add'>+					cm-&gt;charger_stat[i],</div><div class='add'>+					POWER_SUPPLY_PROP_PRESENT, &amp;val);</div><div class='add'>+			if (ret == 0 &amp;&amp; val.intval) {</div><div class='add'>+				present = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return present;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * is_ext_pwr_online - See if an external power source is attached to charge</div><div class='add'>+ * @cm: the Charger Manager representing the battery.</div><div class='add'>+ *</div><div class='add'>+ * Returns true if at least one of the chargers of the battery has an external</div><div class='add'>+ * power source attached to charge the battery regardless of whether it is</div><div class='add'>+ * actually charging or not.</div><div class='add'>+ */</div><div class='add'>+static bool is_ext_pwr_online(struct charger_manager *cm)</div><div class='add'>+{</div><div class='add'>+	union power_supply_propval val;</div><div class='add'>+	bool online = false;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	/* If at least one of them has one, it's yes. */</div><div class='add'>+	for (i = 0; cm-&gt;charger_stat[i]; i++) {</div><div class='add'>+		ret = cm-&gt;charger_stat[i]-&gt;get_property(</div><div class='add'>+				cm-&gt;charger_stat[i],</div><div class='add'>+				POWER_SUPPLY_PROP_ONLINE, &amp;val);</div><div class='add'>+		if (ret == 0 &amp;&amp; val.intval) {</div><div class='add'>+			online = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return online;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * get_batt_uV - Get the voltage level of the battery</div><div class='add'>+ * @cm: the Charger Manager representing the battery.</div><div class='add'>+ * @uV: the voltage level returned.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if there is no error.</div><div class='add'>+ * Returns a negative value on error.</div><div class='add'>+ */</div><div class='add'>+static int get_batt_uV(struct charger_manager *cm, int *uV)</div><div class='add'>+{</div><div class='add'>+	union power_supply_propval val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (cm-&gt;fuel_gauge)</div><div class='add'>+		ret = cm-&gt;fuel_gauge-&gt;get_property(cm-&gt;fuel_gauge,</div><div class='add'>+				POWER_SUPPLY_PROP_VOLTAGE_NOW, &amp;val);</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'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*uV = val.intval;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * is_charging - Returns true if the battery is being charged.</div><div class='add'>+ * @cm: the Charger Manager representing the battery.</div><div class='add'>+ */</div><div class='add'>+static bool is_charging(struct charger_manager *cm)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+	bool charging = false;</div><div class='add'>+	union power_supply_propval val;</div><div class='add'>+</div><div class='add'>+	/* If there is no battery, it cannot be charged */</div><div class='add'>+	if (!is_batt_present(cm))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* If at least one of the charger is charging, return yes */</div><div class='add'>+	for (i = 0; cm-&gt;charger_stat[i]; i++) {</div><div class='add'>+		/* 1. The charger sholuld not be DISABLED */</div><div class='add'>+		if (cm-&gt;emergency_stop)</div><div class='add'>+			continue;</div><div class='add'>+		if (!cm-&gt;charger_enabled)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* 2. The charger should be online (ext-power) */</div><div class='add'>+		ret = cm-&gt;charger_stat[i]-&gt;get_property(</div><div class='add'>+				cm-&gt;charger_stat[i],</div><div class='add'>+				POWER_SUPPLY_PROP_ONLINE, &amp;val);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_warn(cm-&gt;dev, "Cannot read ONLINE value from %s.\n",</div><div class='add'>+					cm-&gt;desc-&gt;psy_charger_stat[i]);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (val.intval == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * 3. The charger should not be FULL, DISCHARGING,</div><div class='add'>+		 * or NOT_CHARGING.</div><div class='add'>+		 */</div><div class='add'>+		ret = cm-&gt;charger_stat[i]-&gt;get_property(</div><div class='add'>+				cm-&gt;charger_stat[i],</div><div class='add'>+				POWER_SUPPLY_PROP_STATUS, &amp;val);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_warn(cm-&gt;dev, "Cannot read STATUS value from %s.\n",</div><div class='add'>+					cm-&gt;desc-&gt;psy_charger_stat[i]);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (val.intval == POWER_SUPPLY_STATUS_FULL ||</div><div class='add'>+				val.intval == POWER_SUPPLY_STATUS_DISCHARGING ||</div><div class='add'>+				val.intval == POWER_SUPPLY_STATUS_NOT_CHARGING)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Then, this is charging. */</div><div class='add'>+		charging = true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return charging;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * is_polling_required - Return true if need to continue polling for this CM.</div><div class='add'>+ * @cm: the Charger Manager representing the battery.</div><div class='add'>+ */</div><div class='add'>+static bool is_polling_required(struct charger_manager *cm)</div><div class='add'>+{</div><div class='add'>+	switch (cm-&gt;desc-&gt;polling_mode) {</div><div class='add'>+	case CM_POLL_DISABLE:</div><div class='add'>+		return false;</div><div class='add'>+	case CM_POLL_ALWAYS:</div><div class='add'>+		return true;</div><div class='add'>+	case CM_POLL_EXTERNAL_POWER_ONLY:</div><div class='add'>+		return is_ext_pwr_online(cm);</div><div class='add'>+	case CM_POLL_CHARGING_ONLY:</div><div class='add'>+		return is_charging(cm);</div><div class='add'>+	default:</div><div class='add'>+		dev_warn(cm-&gt;dev, "Incorrect polling_mode (%d)\n",</div><div class='add'>+			cm-&gt;desc-&gt;polling_mode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * try_charger_enable - Enable/Disable chargers altogether</div><div class='add'>+ * @cm: the Charger Manager representing the battery.</div><div class='add'>+ * @enable: true: enable / false: disable</div><div class='add'>+ *</div><div class='add'>+ * Note that Charger Manager keeps the charger enabled regardless whether</div><div class='add'>+ * the charger is charging or not (because battery is full or no external</div><div class='add'>+ * power source exists) except when CM needs to disable chargers forcibly</div><div class='add'>+ * bacause of emergency causes; when the battery is overheated or too cold.</div><div class='add'>+ */</div><div class='add'>+static int try_charger_enable(struct charger_manager *cm, bool enable)</div><div class='add'>+{</div><div class='add'>+	int err = 0, i;</div><div class='add'>+	struct charger_desc *desc = cm-&gt;desc;</div><div class='add'>+</div><div class='add'>+	/* Ignore if it's redundent command */</div><div class='add'>+	if (enable &amp;&amp; cm-&gt;charger_enabled)</div><div class='add'>+		return 0;</div><div class='add'>+	if (!enable &amp;&amp; !cm-&gt;charger_enabled)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		if (cm-&gt;emergency_stop)</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+		err = regulator_bulk_enable(desc-&gt;num_charger_regulators,</div><div class='add'>+					desc-&gt;charger_regulators);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Abnormal battery state - Stop charging forcibly,</div><div class='add'>+		 * even if charger was enabled at the other places</div><div class='add'>+		 */</div><div class='add'>+		err = regulator_bulk_disable(desc-&gt;num_charger_regulators,</div><div class='add'>+					desc-&gt;charger_regulators);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; desc-&gt;num_charger_regulators; i++) {</div><div class='add'>+			if (regulator_is_enabled(</div><div class='add'>+				    desc-&gt;charger_regulators[i].consumer)) {</div><div class='add'>+				regulator_force_disable(</div><div class='add'>+					desc-&gt;charger_regulators[i].consumer);</div><div class='add'>+				dev_warn(cm-&gt;dev,</div><div class='add'>+					"Disable regulator(%s) forcibly.\n",</div><div class='add'>+					desc-&gt;charger_regulators[i].supply);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!err)</div><div class='add'>+		cm-&gt;charger_enabled = enable;</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'>+ * uevent_notify - Let users know something has changed.</div><div class='add'>+ * @cm: the Charger Manager representing the battery.</div><div class='add'>+ * @event: the event string.</div><div class='add'>+ *</div><div class='add'>+ * If @event is null, it implies that uevent_notify is called</div><div class='add'>+ * by resume function. When called in the resume function, cm_suspended</div><div class='add'>+ * should be already reset to false in order to let uevent_notify</div><div class='add'>+ * notify the recent event during the suspend to users. While</div><div class='add'>+ * suspended, uevent_notify does not notify users, but tracks</div><div class='add'>+ * events so that uevent_notify can notify users later after resumed.</div><div class='add'>+ */</div><div class='add'>+static void uevent_notify(struct charger_manager *cm, const char *event)</div><div class='add'>+{</div><div class='add'>+	static char env_str[UEVENT_BUF_SIZE + 1] = "";</div><div class='add'>+	static char env_str_save[UEVENT_BUF_SIZE + 1] = "";</div><div class='add'>+</div><div class='add'>+	if (cm_suspended) {</div><div class='add'>+		/* Nothing in suspended-event buffer */</div><div class='add'>+		if (env_str_save[0] == 0) {</div><div class='add'>+			if (!strncmp(env_str, event, UEVENT_BUF_SIZE))</div><div class='add'>+				return; /* status not changed */</div><div class='add'>+			strncpy(env_str_save, event, UEVENT_BUF_SIZE);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!strncmp(env_str_save, event, UEVENT_BUF_SIZE))</div><div class='add'>+			return; /* Duplicated. */</div><div class='add'>+		else</div><div class='add'>+			strncpy(env_str_save, event, UEVENT_BUF_SIZE);</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (event == NULL) {</div><div class='add'>+		/* No messages pending */</div><div class='add'>+		if (!env_str_save[0])</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		strncpy(env_str, env_str_save, UEVENT_BUF_SIZE);</div><div class='add'>+		kobject_uevent(&amp;cm-&gt;dev-&gt;kobj, KOBJ_CHANGE);</div><div class='add'>+		env_str_save[0] = 0;</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* status not changed */</div><div class='add'>+	if (!strncmp(env_str, event, UEVENT_BUF_SIZE))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* save the status and notify the update */</div><div class='add'>+	strncpy(env_str, event, UEVENT_BUF_SIZE);</div><div class='add'>+	kobject_uevent(&amp;cm-&gt;dev-&gt;kobj, KOBJ_CHANGE);</div><div class='add'>+</div><div class='add'>+	dev_info(cm-&gt;dev, event);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * _cm_monitor - Monitor the temperature and return true for exceptions.</div><div class='add'>+ * @cm: the Charger Manager representing the battery.</div><div class='add'>+ *</div><div class='add'>+ * Returns true if there is an event to notify for the battery.</div><div class='add'>+ * (True if the status of "emergency_stop" changes)</div><div class='add'>+ */</div><div class='add'>+static bool _cm_monitor(struct charger_manager *cm)</div><div class='add'>+{</div><div class='add'>+	struct charger_desc *desc = cm-&gt;desc;</div><div class='add'>+	int temp = desc-&gt;temperature_out_of_range(&amp;cm-&gt;last_temp_mC);</div><div class='add'>+</div><div class='add'>+	dev_dbg(cm-&gt;dev, "monitoring (%2.2d.%3.3dC)\n",</div><div class='add'>+		cm-&gt;last_temp_mC / 1000, cm-&gt;last_temp_mC % 1000);</div><div class='add'>+</div><div class='add'>+	/* It has been stopped or charging already */</div><div class='add'>+	if (!!temp == !!cm-&gt;emergency_stop)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (temp) {</div><div class='add'>+		cm-&gt;emergency_stop = temp;</div><div class='add'>+		if (!try_charger_enable(cm, false)) {</div><div class='add'>+			if (temp &gt; 0)</div><div class='add'>+				uevent_notify(cm, "OVERHEAT");</div><div class='add'>+			else</div><div class='add'>+				uevent_notify(cm, "COLD");</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		cm-&gt;emergency_stop = 0;</div><div class='add'>+		if (!try_charger_enable(cm, true))</div><div class='add'>+			uevent_notify(cm, "CHARGING");</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'>+ * cm_monitor - Monitor every battery.</div><div class='add'>+ *</div><div class='add'>+ * Returns true if there is an event to notify from any of the batteries.</div><div class='add'>+ * (True if the status of "emergency_stop" changes)</div><div class='add'>+ */</div><div class='add'>+static bool cm_monitor(void)</div><div class='add'>+{</div><div class='add'>+	bool stop = false;</div><div class='add'>+	struct charger_manager *cm;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;cm_list_mtx);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(cm, &amp;cm_list, entry)</div><div class='add'>+		stop = stop || _cm_monitor(cm);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;cm_list_mtx);</div><div class='add'>+</div><div class='add'>+	return stop;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int charger_get_property(struct power_supply *psy,</div><div class='add'>+		enum power_supply_property psp,</div><div class='add'>+		union power_supply_propval *val)</div><div class='add'>+{</div><div class='add'>+	struct charger_manager *cm = container_of(psy,</div><div class='add'>+			struct charger_manager, charger_psy);</div><div class='add'>+	struct charger_desc *desc = cm-&gt;desc;</div><div class='add'>+	int i, ret = 0, uV;</div><div class='add'>+</div><div class='add'>+	switch (psp) {</div><div class='add'>+	case POWER_SUPPLY_PROP_STATUS:</div><div class='add'>+		if (is_charging(cm))</div><div class='add'>+			val-&gt;intval = POWER_SUPPLY_STATUS_CHARGING;</div><div class='add'>+		else if (is_ext_pwr_online(cm))</div><div class='add'>+			val-&gt;intval = POWER_SUPPLY_STATUS_NOT_CHARGING;</div><div class='add'>+		else</div><div class='add'>+			val-&gt;intval = POWER_SUPPLY_STATUS_DISCHARGING;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_HEALTH:</div><div class='add'>+		if (cm-&gt;emergency_stop &gt; 0)</div><div class='add'>+			val-&gt;intval = POWER_SUPPLY_HEALTH_OVERHEAT;</div><div class='add'>+		else if (cm-&gt;emergency_stop &lt; 0)</div><div class='add'>+			val-&gt;intval = POWER_SUPPLY_HEALTH_COLD;</div><div class='add'>+		else</div><div class='add'>+			val-&gt;intval = POWER_SUPPLY_HEALTH_GOOD;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_PRESENT:</div><div class='add'>+		if (is_batt_present(cm))</div><div class='add'>+			val-&gt;intval = 1;</div><div class='add'>+		else</div><div class='add'>+			val-&gt;intval = 0;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_VOLTAGE_NOW:</div><div class='add'>+		ret = get_batt_uV(cm, &amp;i);</div><div class='add'>+		val-&gt;intval = i;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_CURRENT_NOW:</div><div class='add'>+		ret = cm-&gt;fuel_gauge-&gt;get_property(cm-&gt;fuel_gauge,</div><div class='add'>+				POWER_SUPPLY_PROP_CURRENT_NOW, val);</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_TEMP:</div><div class='add'>+		/* in thenth of centigrade */</div><div class='add'>+		if (cm-&gt;last_temp_mC == INT_MIN)</div><div class='add'>+			desc-&gt;temperature_out_of_range(&amp;cm-&gt;last_temp_mC);</div><div class='add'>+		val-&gt;intval = cm-&gt;last_temp_mC / 100;</div><div class='add'>+		if (!desc-&gt;measure_battery_temp)</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_TEMP_AMBIENT:</div><div class='add'>+		/* in thenth of centigrade */</div><div class='add'>+		if (cm-&gt;last_temp_mC == INT_MIN)</div><div class='add'>+			desc-&gt;temperature_out_of_range(&amp;cm-&gt;last_temp_mC);</div><div class='add'>+		val-&gt;intval = cm-&gt;last_temp_mC / 100;</div><div class='add'>+		if (desc-&gt;measure_battery_temp)</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_CAPACITY:</div><div class='add'>+		if (!cm-&gt;fuel_gauge) {</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!is_batt_present(cm)) {</div><div class='add'>+			/* There is no battery. Assume 100% */</div><div class='add'>+			val-&gt;intval = 100;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = cm-&gt;fuel_gauge-&gt;get_property(cm-&gt;fuel_gauge,</div><div class='add'>+					POWER_SUPPLY_PROP_CAPACITY, val);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (val-&gt;intval &gt; 100) {</div><div class='add'>+			val-&gt;intval = 100;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (val-&gt;intval &lt; 0)</div><div class='add'>+			val-&gt;intval = 0;</div><div class='add'>+</div><div class='add'>+		/* Do not adjust SOC when charging: voltage is overrated */</div><div class='add'>+		if (is_charging(cm))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If the capacity value is inconsistent, calibrate it base on</div><div class='add'>+		 * the battery voltage values and the thresholds given as desc</div><div class='add'>+		 */</div><div class='add'>+		ret = get_batt_uV(cm, &amp;uV);</div><div class='add'>+		if (ret) {</div><div class='add'>+			/* Voltage information not available. No calibration */</div><div class='add'>+			ret = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (desc-&gt;fullbatt_uV &gt; 0 &amp;&amp; uV &gt;= desc-&gt;fullbatt_uV &amp;&amp;</div><div class='add'>+		    !is_charging(cm)) {</div><div class='add'>+			val-&gt;intval = 100;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_ONLINE:</div><div class='add'>+		if (is_ext_pwr_online(cm))</div><div class='add'>+			val-&gt;intval = 1;</div><div class='add'>+		else</div><div class='add'>+			val-&gt;intval = 0;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_CHARGE_FULL:</div><div class='add'>+		if (cm-&gt;fuel_gauge) {</div><div class='add'>+			if (cm-&gt;fuel_gauge-&gt;get_property(cm-&gt;fuel_gauge,</div><div class='add'>+			    POWER_SUPPLY_PROP_CHARGE_FULL, val) == 0)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (is_ext_pwr_online(cm)) {</div><div class='add'>+			/* Not full if it's charging. */</div><div class='add'>+			if (is_charging(cm)) {</div><div class='add'>+				val-&gt;intval = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			/*</div><div class='add'>+			 * Full if it's powered but not charging andi</div><div class='add'>+			 * not forced stop by emergency</div><div class='add'>+			 */</div><div class='add'>+			if (!cm-&gt;emergency_stop) {</div><div class='add'>+				val-&gt;intval = 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Full if it's over the fullbatt voltage */</div><div class='add'>+		ret = get_batt_uV(cm, &amp;uV);</div><div class='add'>+		if (!ret &amp;&amp; desc-&gt;fullbatt_uV &gt; 0 &amp;&amp; uV &gt;= desc-&gt;fullbatt_uV &amp;&amp;</div><div class='add'>+		    !is_charging(cm)) {</div><div class='add'>+			val-&gt;intval = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Full if the cap is 100 */</div><div class='add'>+		if (cm-&gt;fuel_gauge) {</div><div class='add'>+			ret = cm-&gt;fuel_gauge-&gt;get_property(cm-&gt;fuel_gauge,</div><div class='add'>+					POWER_SUPPLY_PROP_CAPACITY, val);</div><div class='add'>+			if (!ret &amp;&amp; val-&gt;intval &gt;= 100 &amp;&amp; !is_charging(cm)) {</div><div class='add'>+				val-&gt;intval = 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		val-&gt;intval = 0;</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_CHARGE_NOW:</div><div class='add'>+		if (is_charging(cm)) {</div><div class='add'>+			ret = cm-&gt;fuel_gauge-&gt;get_property(cm-&gt;fuel_gauge,</div><div class='add'>+						POWER_SUPPLY_PROP_CHARGE_NOW,</div><div class='add'>+						val);</div><div class='add'>+			if (ret) {</div><div class='add'>+				val-&gt;intval = 1;</div><div class='add'>+				ret = 0;</div><div class='add'>+			} else {</div><div class='add'>+				/* If CHARGE_NOW is supplied, use it */</div><div class='add'>+				val-&gt;intval = (val-&gt;intval &gt; 0) ?</div><div class='add'>+						val-&gt;intval : 1;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			val-&gt;intval = 0;</div><div class='add'>+		}</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 ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define NUM_CHARGER_PSY_OPTIONAL	(4)</div><div class='add'>+static enum power_supply_property default_charger_props[] = {</div><div class='add'>+	/* Guaranteed to provide */</div><div class='add'>+	POWER_SUPPLY_PROP_STATUS,</div><div class='add'>+	POWER_SUPPLY_PROP_HEALTH,</div><div class='add'>+	POWER_SUPPLY_PROP_PRESENT,</div><div class='add'>+	POWER_SUPPLY_PROP_VOLTAGE_NOW,</div><div class='add'>+	POWER_SUPPLY_PROP_CAPACITY,</div><div class='add'>+	POWER_SUPPLY_PROP_ONLINE,</div><div class='add'>+	POWER_SUPPLY_PROP_CHARGE_FULL,</div><div class='add'>+	/*</div><div class='add'>+	 * Optional properties are:</div><div class='add'>+	 * POWER_SUPPLY_PROP_CHARGE_NOW,</div><div class='add'>+	 * POWER_SUPPLY_PROP_CURRENT_NOW,</div><div class='add'>+	 * POWER_SUPPLY_PROP_TEMP, and</div><div class='add'>+	 * POWER_SUPPLY_PROP_TEMP_AMBIENT,</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct power_supply psy_default = {</div><div class='add'>+	.name = "battery",</div><div class='add'>+	.type = POWER_SUPPLY_TYPE_BATTERY,</div><div class='add'>+	.properties = default_charger_props,</div><div class='add'>+	.num_properties = ARRAY_SIZE(default_charger_props),</div><div class='add'>+	.get_property = charger_get_property,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cm_setup_timer - For in-suspend monitoring setup wakeup alarm</div><div class='add'>+ *		    for suspend_again.</div><div class='add'>+ *</div><div class='add'>+ * Returns true if the alarm is set for Charger Manager to use.</div><div class='add'>+ * Returns false if</div><div class='add'>+ *	cm_setup_timer fails to set an alarm,</div><div class='add'>+ *	cm_setup_timer does not need to set an alarm for Charger Manager,</div><div class='add'>+ *	or an alarm previously configured is to be used.</div><div class='add'>+ */</div><div class='add'>+static bool cm_setup_timer(void)</div><div class='add'>+{</div><div class='add'>+	struct charger_manager *cm;</div><div class='add'>+	unsigned int wakeup_ms = UINT_MAX;</div><div class='add'>+	bool ret = false;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;cm_list_mtx);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(cm, &amp;cm_list, entry) {</div><div class='add'>+		/* Skip if polling is not required for this CM */</div><div class='add'>+		if (!is_polling_required(cm) &amp;&amp; !cm-&gt;emergency_stop)</div><div class='add'>+			continue;</div><div class='add'>+		if (cm-&gt;desc-&gt;polling_interval_ms == 0)</div><div class='add'>+			continue;</div><div class='add'>+		CM_MIN_VALID(wakeup_ms, cm-&gt;desc-&gt;polling_interval_ms);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;cm_list_mtx);</div><div class='add'>+</div><div class='add'>+	if (wakeup_ms &lt; UINT_MAX &amp;&amp; wakeup_ms &gt; 0) {</div><div class='add'>+		pr_info("Charger Manager wakeup timer: %u ms.\n", wakeup_ms);</div><div class='add'>+		if (rtc_dev) {</div><div class='add'>+			struct rtc_wkalrm tmp;</div><div class='add'>+			unsigned long time, now;</div><div class='add'>+			unsigned long add = DIV_ROUND_UP(wakeup_ms, 1000);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Set alarm with the polling interval (wakeup_ms)</div><div class='add'>+			 * except when rtc_wkalarm_save comes first.</div><div class='add'>+			 * However, the alarm time should be NOW +</div><div class='add'>+			 * CM_RTC_SMALL or later.</div><div class='add'>+			 */</div><div class='add'>+			tmp.enabled = 1;</div><div class='add'>+			rtc_read_time(rtc_dev, &amp;tmp.time);</div><div class='add'>+			rtc_tm_to_time(&amp;tmp.time, &amp;now);</div><div class='add'>+			if (add &lt; CM_RTC_SMALL)</div><div class='add'>+				add = CM_RTC_SMALL;</div><div class='add'>+			time = now + add;</div><div class='add'>+</div><div class='add'>+			ret = true;</div><div class='add'>+</div><div class='add'>+			if (rtc_wkalarm_save.enabled &amp;&amp;</div><div class='add'>+			    rtc_wkalarm_save_time &amp;&amp;</div><div class='add'>+			    rtc_wkalarm_save_time &lt; time) {</div><div class='add'>+				if (rtc_wkalarm_save_time &lt; now + CM_RTC_SMALL)</div><div class='add'>+					time = now + CM_RTC_SMALL;</div><div class='add'>+				else</div><div class='add'>+					time = rtc_wkalarm_save_time;</div><div class='add'>+</div><div class='add'>+				/* The timer is not appointed by CM */</div><div class='add'>+				ret = false;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			pr_info("Waking up after %lu secs.\n",</div><div class='add'>+					time - now);</div><div class='add'>+</div><div class='add'>+			rtc_time_to_tm(time, &amp;tmp.time);</div><div class='add'>+			rtc_set_alarm(rtc_dev, &amp;tmp);</div><div class='add'>+			cm_suspend_duration_ms += wakeup_ms;</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rtc_dev)</div><div class='add'>+		rtc_set_alarm(rtc_dev, &amp;rtc_wkalarm_save);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cm_suspend_again - Determine whether suspend again or not</div><div class='add'>+ *</div><div class='add'>+ * Returns true if the system should be suspended again</div><div class='add'>+ * Returns false if the system should be woken up</div><div class='add'>+ */</div><div class='add'>+bool cm_suspend_again(void)</div><div class='add'>+{</div><div class='add'>+	struct charger_manager *cm;</div><div class='add'>+	bool ret = false;</div><div class='add'>+</div><div class='add'>+	if (!g_desc || !g_desc-&gt;rtc_only_wakeup || !g_desc-&gt;rtc_only_wakeup() ||</div><div class='add'>+	    !cm_rtc_set)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (cm_monitor())</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = true;</div><div class='add'>+	mutex_lock(&amp;cm_list_mtx);</div><div class='add'>+	list_for_each_entry(cm, &amp;cm_list, entry) {</div><div class='add'>+		if (cm-&gt;status_save_ext_pwr_inserted != is_ext_pwr_online(cm) ||</div><div class='add'>+		    cm-&gt;status_save_batt != is_batt_present(cm))</div><div class='add'>+			ret = false;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;cm_list_mtx);</div><div class='add'>+</div><div class='add'>+	cm_rtc_set = cm_setup_timer();</div><div class='add'>+out:</div><div class='add'>+	/* It's about the time when the non-CM appointed timer goes off */</div><div class='add'>+	if (rtc_wkalarm_save.enabled) {</div><div class='add'>+		unsigned long now;</div><div class='add'>+		struct rtc_time tmp;</div><div class='add'>+</div><div class='add'>+		rtc_read_time(rtc_dev, &amp;tmp);</div><div class='add'>+		rtc_tm_to_time(&amp;tmp, &amp;now);</div><div class='add'>+</div><div class='add'>+		if (rtc_wkalarm_save_time &amp;&amp;</div><div class='add'>+		    now + CM_RTC_SMALL &gt;= rtc_wkalarm_save_time)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(cm_suspend_again);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * setup_charger_manager - initialize charger_global_desc data</div><div class='add'>+ * @gd: pointer to instance of charger_global_desc</div><div class='add'>+ */</div><div class='add'>+int setup_charger_manager(struct charger_global_desc *gd)</div><div class='add'>+{</div><div class='add'>+	if (!gd)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (rtc_dev)</div><div class='add'>+		rtc_class_close(rtc_dev);</div><div class='add'>+	rtc_dev = NULL;</div><div class='add'>+	g_desc = NULL;</div><div class='add'>+</div><div class='add'>+	if (!gd-&gt;rtc_only_wakeup) {</div><div class='add'>+		pr_err("The callback rtc_only_wakeup is not given.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (gd-&gt;rtc_name) {</div><div class='add'>+		rtc_dev = rtc_class_open(gd-&gt;rtc_name);</div><div class='add'>+		if (IS_ERR_OR_NULL(rtc_dev)) {</div><div class='add'>+			rtc_dev = NULL;</div><div class='add'>+			/* Retry at probe. RTC may be not registered yet */</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		pr_warn("No wakeup timer is given for charger manager."</div><div class='add'>+			"In-suspend monitoring won't work.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	g_desc = gd;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(setup_charger_manager);</div><div class='add'>+</div><div class='add'>+static int charger_manager_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct charger_desc *desc = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='add'>+	struct charger_manager *cm;</div><div class='add'>+	int ret = 0, i = 0;</div><div class='add'>+	union power_supply_propval val;</div><div class='add'>+</div><div class='add'>+	if (g_desc &amp;&amp; !rtc_dev &amp;&amp; g_desc-&gt;rtc_name) {</div><div class='add'>+		rtc_dev = rtc_class_open(g_desc-&gt;rtc_name);</div><div class='add'>+		if (IS_ERR_OR_NULL(rtc_dev)) {</div><div class='add'>+			rtc_dev = NULL;</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "Cannot get RTC %s.\n",</div><div class='add'>+				g_desc-&gt;rtc_name);</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+			goto err_alloc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!desc) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "No platform data (desc) found.\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err_alloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cm = kzalloc(sizeof(struct charger_manager), GFP_KERNEL);</div><div class='add'>+	if (!cm) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot allocate memory.\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_alloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Basic Values. Unspecified are Null or 0 */</div><div class='add'>+	cm-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	cm-&gt;desc = kzalloc(sizeof(struct charger_desc), GFP_KERNEL);</div><div class='add'>+	if (!cm-&gt;desc) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot allocate memory.\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_alloc_desc;</div><div class='add'>+	}</div><div class='add'>+	memcpy(cm-&gt;desc, desc, sizeof(struct charger_desc));</div><div class='add'>+	cm-&gt;last_temp_mC = INT_MIN; /* denotes "unmeasured, yet" */</div><div class='add'>+</div><div class='add'>+	if (!desc-&gt;charger_regulators || desc-&gt;num_charger_regulators &lt; 1) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "charger_regulators undefined.\n");</div><div class='add'>+		goto err_no_charger;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!desc-&gt;psy_charger_stat || !desc-&gt;psy_charger_stat[0]) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "No power supply defined.\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_no_charger_stat;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Counting index only */</div><div class='add'>+	while (desc-&gt;psy_charger_stat[i])</div><div class='add'>+		i++;</div><div class='add'>+</div><div class='add'>+	cm-&gt;charger_stat = kzalloc(sizeof(struct power_supply *) * (i + 1),</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+	if (!cm-&gt;charger_stat) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_no_charger_stat;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; desc-&gt;psy_charger_stat[i]; i++) {</div><div class='add'>+		cm-&gt;charger_stat[i] = power_supply_get_by_name(</div><div class='add'>+					desc-&gt;psy_charger_stat[i]);</div><div class='add'>+		if (!cm-&gt;charger_stat[i]) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "Cannot find power supply "</div><div class='add'>+					"\"%s\"\n",</div><div class='add'>+					desc-&gt;psy_charger_stat[i]);</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+			goto err_chg_stat;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cm-&gt;fuel_gauge = power_supply_get_by_name(desc-&gt;psy_fuel_gauge);</div><div class='add'>+	if (!cm-&gt;fuel_gauge) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot find power supply \"%s\"\n",</div><div class='add'>+				desc-&gt;psy_fuel_gauge);</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err_chg_stat;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (desc-&gt;polling_interval_ms == 0 ||</div><div class='add'>+	    msecs_to_jiffies(desc-&gt;polling_interval_ms) &lt;= CM_JIFFIES_SMALL) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "polling_interval_ms is too small\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_chg_stat;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!desc-&gt;temperature_out_of_range) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "there is no temperature_out_of_range\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_chg_stat;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, cm);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;cm-&gt;charger_psy, &amp;psy_default,</div><div class='add'>+				sizeof(psy_default));</div><div class='add'>+	if (!desc-&gt;psy_name) {</div><div class='add'>+		strncpy(cm-&gt;psy_name_buf, psy_default.name,</div><div class='add'>+				PSY_NAME_MAX);</div><div class='add'>+	} else {</div><div class='add'>+		strncpy(cm-&gt;psy_name_buf, desc-&gt;psy_name, PSY_NAME_MAX);</div><div class='add'>+	}</div><div class='add'>+	cm-&gt;charger_psy.name = cm-&gt;psy_name_buf;</div><div class='add'>+</div><div class='add'>+	/* Allocate for psy properties because they may vary */</div><div class='add'>+	cm-&gt;charger_psy.properties = kzalloc(sizeof(enum power_supply_property)</div><div class='add'>+				* (ARRAY_SIZE(default_charger_props) +</div><div class='add'>+				NUM_CHARGER_PSY_OPTIONAL),</div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+	if (!cm-&gt;charger_psy.properties) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot allocate for psy properties.\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_chg_stat;</div><div class='add'>+	}</div><div class='add'>+	memcpy(cm-&gt;charger_psy.properties, default_charger_props,</div><div class='add'>+		sizeof(enum power_supply_property) *</div><div class='add'>+		ARRAY_SIZE(default_charger_props));</div><div class='add'>+	cm-&gt;charger_psy.num_properties = psy_default.num_properties;</div><div class='add'>+</div><div class='add'>+	/* Find which optional psy-properties are available */</div><div class='add'>+	if (!cm-&gt;fuel_gauge-&gt;get_property(cm-&gt;fuel_gauge,</div><div class='add'>+					  POWER_SUPPLY_PROP_CHARGE_NOW, &amp;val)) {</div><div class='add'>+		cm-&gt;charger_psy.properties[cm-&gt;charger_psy.num_properties] =</div><div class='add'>+				POWER_SUPPLY_PROP_CHARGE_NOW;</div><div class='add'>+		cm-&gt;charger_psy.num_properties++;</div><div class='add'>+	}</div><div class='add'>+	if (!cm-&gt;fuel_gauge-&gt;get_property(cm-&gt;fuel_gauge,</div><div class='add'>+					  POWER_SUPPLY_PROP_CURRENT_NOW,</div><div class='add'>+					  &amp;val)) {</div><div class='add'>+		cm-&gt;charger_psy.properties[cm-&gt;charger_psy.num_properties] =</div><div class='add'>+				POWER_SUPPLY_PROP_CURRENT_NOW;</div><div class='add'>+		cm-&gt;charger_psy.num_properties++;</div><div class='add'>+	}</div><div class='add'>+	if (!desc-&gt;measure_battery_temp) {</div><div class='add'>+		cm-&gt;charger_psy.properties[cm-&gt;charger_psy.num_properties] =</div><div class='add'>+				POWER_SUPPLY_PROP_TEMP_AMBIENT;</div><div class='add'>+		cm-&gt;charger_psy.num_properties++;</div><div class='add'>+	}</div><div class='add'>+	if (desc-&gt;measure_battery_temp) {</div><div class='add'>+		cm-&gt;charger_psy.properties[cm-&gt;charger_psy.num_properties] =</div><div class='add'>+				POWER_SUPPLY_PROP_TEMP;</div><div class='add'>+		cm-&gt;charger_psy.num_properties++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = power_supply_register(NULL, &amp;cm-&gt;charger_psy);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot register charger-manager with"</div><div class='add'>+				" name \"%s\".\n", cm-&gt;charger_psy.name);</div><div class='add'>+		goto err_register;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regulator_bulk_get(&amp;pdev-&gt;dev, desc-&gt;num_charger_regulators,</div><div class='add'>+				 desc-&gt;charger_regulators);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot get charger regulators.\n");</div><div class='add'>+		goto err_bulk_get;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = try_charger_enable(cm, true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot enable charger regulators\n");</div><div class='add'>+		goto err_chg_enable;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add to the list */</div><div class='add'>+	mutex_lock(&amp;cm_list_mtx);</div><div class='add'>+	list_add(&amp;cm-&gt;entry, &amp;cm_list);</div><div class='add'>+	mutex_unlock(&amp;cm_list_mtx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_chg_enable:</div><div class='add'>+	if (desc-&gt;charger_regulators)</div><div class='add'>+		regulator_bulk_free(desc-&gt;num_charger_regulators,</div><div class='add'>+					desc-&gt;charger_regulators);</div><div class='add'>+err_bulk_get:</div><div class='add'>+	power_supply_unregister(&amp;cm-&gt;charger_psy);</div><div class='add'>+err_register:</div><div class='add'>+	kfree(cm-&gt;charger_psy.properties);</div><div class='add'>+err_chg_stat:</div><div class='add'>+	kfree(cm-&gt;charger_stat);</div><div class='add'>+err_no_charger_stat:</div><div class='add'>+err_no_charger:</div><div class='add'>+	kfree(cm-&gt;desc);</div><div class='add'>+err_alloc_desc:</div><div class='add'>+	kfree(cm);</div><div class='add'>+err_alloc:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit charger_manager_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct charger_manager *cm = platform_get_drvdata(pdev);</div><div class='add'>+	struct charger_desc *desc = cm-&gt;desc;</div><div class='add'>+</div><div class='add'>+	/* Remove from the list */</div><div class='add'>+	mutex_lock(&amp;cm_list_mtx);</div><div class='add'>+	list_del(&amp;cm-&gt;entry);</div><div class='add'>+	mutex_unlock(&amp;cm_list_mtx);</div><div class='add'>+</div><div class='add'>+	if (desc-&gt;charger_regulators)</div><div class='add'>+		regulator_bulk_free(desc-&gt;num_charger_regulators,</div><div class='add'>+					desc-&gt;charger_regulators);</div><div class='add'>+</div><div class='add'>+	power_supply_unregister(&amp;cm-&gt;charger_psy);</div><div class='add'>+	kfree(cm-&gt;charger_psy.properties);</div><div class='add'>+	kfree(cm-&gt;charger_stat);</div><div class='add'>+	kfree(cm-&gt;desc);</div><div class='add'>+	kfree(cm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct platform_device_id charger_manager_id[] = {</div><div class='add'>+	{ "charger-manager", 0 },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cm_suspend_prepare(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = container_of(dev, struct platform_device,</div><div class='add'>+						    dev);</div><div class='add'>+	struct charger_manager *cm = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!cm_suspended) {</div><div class='add'>+		if (rtc_dev) {</div><div class='add'>+			struct rtc_time tmp;</div><div class='add'>+			unsigned long now;</div><div class='add'>+</div><div class='add'>+			rtc_read_alarm(rtc_dev, &amp;rtc_wkalarm_save);</div><div class='add'>+			rtc_read_time(rtc_dev, &amp;tmp);</div><div class='add'>+</div><div class='add'>+			if (rtc_wkalarm_save.enabled) {</div><div class='add'>+				rtc_tm_to_time(&amp;rtc_wkalarm_save.time,</div><div class='add'>+					       &amp;rtc_wkalarm_save_time);</div><div class='add'>+				rtc_tm_to_time(&amp;tmp, &amp;now);</div><div class='add'>+				if (now &gt; rtc_wkalarm_save_time)</div><div class='add'>+					rtc_wkalarm_save_time = 0;</div><div class='add'>+			} else {</div><div class='add'>+				rtc_wkalarm_save_time = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		cm_suspended = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cm-&gt;status_save_ext_pwr_inserted = is_ext_pwr_online(cm);</div><div class='add'>+	cm-&gt;status_save_batt = is_batt_present(cm);</div><div class='add'>+</div><div class='add'>+	if (!cm_rtc_set) {</div><div class='add'>+		cm_suspend_duration_ms = 0;</div><div class='add'>+		cm_rtc_set = cm_setup_timer();</div><div 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 cm_suspend_complete(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = container_of(dev, struct platform_device,</div><div class='add'>+						    dev);</div><div class='add'>+	struct charger_manager *cm = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (cm_suspended) {</div><div class='add'>+		if (rtc_dev) {</div><div class='add'>+			struct rtc_wkalrm tmp;</div><div class='add'>+</div><div class='add'>+			rtc_read_alarm(rtc_dev, &amp;tmp);</div><div class='add'>+			rtc_wkalarm_save.pending = tmp.pending;</div><div class='add'>+			rtc_set_alarm(rtc_dev, &amp;rtc_wkalarm_save);</div><div class='add'>+		}</div><div class='add'>+		cm_suspended = false;</div><div class='add'>+		cm_rtc_set = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uevent_notify(cm, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops charger_manager_pm = {</div><div class='add'>+	.prepare	= cm_suspend_prepare,</div><div class='add'>+	.complete	= cm_suspend_complete,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver charger_manager_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "charger-manager",</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+		.pm = &amp;charger_manager_pm,</div><div class='add'>+	},</div><div class='add'>+	.probe = charger_manager_probe,</div><div class='add'>+	.remove = __devexit_p(charger_manager_remove),</div><div class='add'>+	.id_table = charger_manager_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init charger_manager_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;charger_manager_driver);</div><div class='add'>+}</div><div class='add'>+late_initcall(charger_manager_init);</div><div class='add'>+</div><div class='add'>+static void __exit charger_manager_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;charger_manager_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(charger_manager_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("MyungJoo Ham &lt;myungjoo.ham@samsung.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Charger Manager");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("charger-manager");</div><div class='head'>diff --git a/drivers/power/collie_battery.c b/drivers/power/collie_battery.c<br/>index 548d263b1ad0..74c6b23aeabf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/collie_battery.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/collie_battery.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/collie_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/collie_battery.c</a></div><div class='hunk'>@@ -146,7 +146,7 @@ static void collie_bat_external_power_changed(struct power_supply *psy)</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t collie_bat_gpio_isr(int irq, void *data)</div><div class='ctx'> {</div><div class='del'>-	pr_info("collie_bat_gpio irq: %d\n", gpio_get_value(irq_to_gpio(irq)));</div><div class='add'>+	pr_info("collie_bat_gpio irq\n");</div><div class='ctx'> 	schedule_work(&amp;bat_work);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -277,18 +277,13 @@ static struct collie_bat collie_bat_bu = {</div><div class='ctx'> 	.adc_temp_divider = -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct {</div><div class='del'>-	int gpio;</div><div class='del'>-	char *name;</div><div class='del'>-	bool output;</div><div class='del'>-	int value;</div><div class='del'>-} gpios[] = {</div><div class='del'>-	{ COLLIE_GPIO_CO,		"main battery full",	0, 0 },</div><div class='del'>-	{ COLLIE_GPIO_MAIN_BAT_LOW,	"main battery low",	0, 0 },</div><div class='del'>-	{ COLLIE_GPIO_CHARGE_ON,	"main charge on",	1, 0 },</div><div class='del'>-	{ COLLIE_GPIO_MBAT_ON,		"main battery",		1, 0 },</div><div class='del'>-	{ COLLIE_GPIO_TMP_ON,		"main battery temp",	1, 0 },</div><div class='del'>-	{ COLLIE_GPIO_BBAT_ON,		"backup battery",	1, 0 },</div><div class='add'>+static struct gpio collie_batt_gpios[] = {</div><div class='add'>+	{ COLLIE_GPIO_CO,	    GPIOF_IN,		"main battery full" },</div><div class='add'>+	{ COLLIE_GPIO_MAIN_BAT_LOW, GPIOF_IN,		"main battery low" },</div><div class='add'>+	{ COLLIE_GPIO_CHARGE_ON,    GPIOF_OUT_INIT_LOW,	"main charge on" },</div><div class='add'>+	{ COLLIE_GPIO_MBAT_ON,	    GPIOF_OUT_INIT_LOW,	"main battery" },</div><div class='add'>+	{ COLLIE_GPIO_TMP_ON,	    GPIOF_OUT_INIT_LOW,	"main battery temp" },</div><div class='add'>+	{ COLLIE_GPIO_BBAT_ON,	    GPIOF_OUT_INIT_LOW,	"backup battery" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -313,29 +308,16 @@ static int collie_bat_resume(struct ucb1x00_dev *dev)</div><div class='ctx'> static int __devinit collie_bat_probe(struct ucb1x00_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!machine_is_collie())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	ucb = dev-&gt;ucb;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(gpios); i++) {</div><div class='del'>-		ret = gpio_request(gpios[i].gpio, gpios[i].name);</div><div class='del'>-		if (ret) {</div><div class='del'>-			i--;</div><div class='del'>-			goto err_gpio;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (gpios[i].output)</div><div class='del'>-			ret = gpio_direction_output(gpios[i].gpio,</div><div class='del'>-					gpios[i].value);</div><div class='del'>-		else</div><div class='del'>-			ret = gpio_direction_input(gpios[i].gpio);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err_gpio;</div><div class='del'>-	}</div><div class='add'>+	ret = gpio_request_array(collie_batt_gpios,</div><div class='add'>+				 ARRAY_SIZE(collie_batt_gpios));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;collie_bat_main.work_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -363,19 +345,12 @@ err_psy_reg_main:</div><div class='ctx'> </div><div class='ctx'> 	/* see comment in collie_bat_remove */</div><div class='ctx'> 	cancel_work_sync(&amp;bat_work);</div><div class='del'>-</div><div class='del'>-	i--;</div><div class='del'>-err_gpio:</div><div class='del'>-	for (; i &gt;= 0; i--)</div><div class='del'>-		gpio_free(gpios[i].gpio);</div><div class='del'>-</div><div class='add'>+	gpio_free_array(collie_batt_gpios, ARRAY_SIZE(collie_batt_gpios));</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __devexit collie_bat_remove(struct ucb1x00_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='ctx'> 	free_irq(gpio_to_irq(COLLIE_GPIO_CO), &amp;collie_bat_main);</div><div class='ctx'> </div><div class='ctx'> 	power_supply_unregister(&amp;collie_bat_bu.psy);</div><div class='hunk'>@@ -387,9 +362,7 @@ static void __devexit collie_bat_remove(struct ucb1x00_dev *dev)</div><div class='ctx'> 	 * unregistered now.</div><div class='ctx'> 	 */</div><div class='ctx'> 	cancel_work_sync(&amp;bat_work);</div><div class='del'>-</div><div class='del'>-	for (i = ARRAY_SIZE(gpios) - 1; i &gt;= 0; i--)</div><div class='del'>-		gpio_free(gpios[i].gpio);</div><div class='add'>+	gpio_free_array(collie_batt_gpios, ARRAY_SIZE(collie_batt_gpios));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ucb1x00_driver collie_bat_driver = {</div><div class='head'>diff --git a/drivers/power/da9030_battery.c b/drivers/power/da9030_battery.c<br/>index d2c793cf6765..3fd3e95d2b85 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/da9030_battery.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/da9030_battery.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/da9030_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/da9030_battery.c</a></div><div class='hunk'>@@ -588,18 +588,7 @@ static struct platform_driver da903x_battery_driver = {</div><div class='ctx'> 	.remove = da9030_battery_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int da903x_battery_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;da903x_battery_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void da903x_battery_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;da903x_battery_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(da903x_battery_init);</div><div class='del'>-module_exit(da903x_battery_exit);</div><div class='add'>+module_platform_driver(da903x_battery_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("DA9030 battery charger driver");</div><div class='ctx'> MODULE_AUTHOR("Mike Rapoport, CompuLab");</div><div class='head'>diff --git a/drivers/power/da9052-battery.c b/drivers/power/da9052-battery.c<br/>new file mode 100644<br/>index 000000000000..e8ea47a53dee<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/da9052-battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/da9052-battery.c</a></div><div class='hunk'>@@ -0,0 +1,664 @@</div><div class='add'>+/*</div><div class='add'>+ * Batttery Driver for Dialog DA9052 PMICs</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='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/freezer.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/power_supply.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mfd/da9052/da9052.h&gt;</div><div class='add'>+#include &lt;linux/mfd/da9052/pdata.h&gt;</div><div class='add'>+#include &lt;linux/mfd/da9052/reg.h&gt;</div><div class='add'>+</div><div class='add'>+/* STATIC CONFIGURATION */</div><div class='add'>+#define DA9052_BAT_CUTOFF_VOLT		2800</div><div class='add'>+#define DA9052_BAT_TSH			62000</div><div class='add'>+#define DA9052_BAT_LOW_CAP		4</div><div class='add'>+#define DA9052_AVG_SZ			4</div><div class='add'>+#define DA9052_VC_TBL_SZ		68</div><div class='add'>+#define DA9052_VC_TBL_REF_SZ		3</div><div class='add'>+</div><div class='add'>+#define DA9052_ISET_USB_MASK		0x0F</div><div class='add'>+#define DA9052_CHG_USB_ILIM_MASK	0x40</div><div class='add'>+#define DA9052_CHG_LIM_COLS		16</div><div class='add'>+</div><div class='add'>+#define DA9052_MEAN(x, y)		((x + y) / 2)</div><div class='add'>+</div><div class='add'>+enum charger_type_enum {</div><div class='add'>+	DA9052_NOCHARGER = 1,</div><div class='add'>+	DA9052_CHARGER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u16 da9052_chg_current_lim[2][DA9052_CHG_LIM_COLS] = {</div><div class='add'>+	{70,  80,  90,  100, 110, 120, 400,  450,</div><div class='add'>+	 500, 550, 600, 650, 700, 900, 1100, 1300},</div><div class='add'>+	{80,  90,  100, 110,  120,  400,  450,  500,</div><div class='add'>+	 550, 600, 800, 1000, 1200, 1400, 1600, 1800},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u16 vc_tbl_ref[3] = {10, 25, 40};</div><div class='add'>+/* Lookup table for voltage vs capacity */</div><div class='add'>+static u32 const vc_tbl[3][68][2] = {</div><div class='add'>+	/* For temperature 10 degree Celsius */</div><div class='add'>+	{</div><div class='add'>+	{4082, 100}, {4036, 98},</div><div class='add'>+	{4020, 96}, {4008, 95},</div><div class='add'>+	{3997, 93}, {3983, 91},</div><div class='add'>+	{3964, 90}, {3943, 88},</div><div class='add'>+	{3926, 87}, {3912, 85},</div><div class='add'>+	{3900, 84}, {3890, 82},</div><div class='add'>+	{3881, 80}, {3873, 79},</div><div class='add'>+	{3865, 77}, {3857, 76},</div><div class='add'>+	{3848, 74}, {3839, 73},</div><div class='add'>+	{3829, 71}, {3820, 70},</div><div class='add'>+	{3811, 68}, {3802, 67},</div><div class='add'>+	{3794, 65}, {3785, 64},</div><div class='add'>+	{3778, 62}, {3770, 61},</div><div class='add'>+	{3763, 59}, {3756, 58},</div><div class='add'>+	{3750, 56}, {3744, 55},</div><div class='add'>+	{3738, 53}, {3732, 52},</div><div class='add'>+	{3727, 50}, {3722, 49},</div><div class='add'>+	{3717, 47}, {3712, 46},</div><div class='add'>+	{3708, 44}, {3703, 43},</div><div class='add'>+	{3700, 41}, {3696, 40},</div><div class='add'>+	{3693, 38}, {3691, 37},</div><div class='add'>+	{3688, 35}, {3686, 34},</div><div class='add'>+	{3683, 32}, {3681, 31},</div><div class='add'>+	{3678, 29}, {3675, 28},</div><div class='add'>+	{3672, 26}, {3669, 25},</div><div class='add'>+	{3665, 23}, {3661, 22},</div><div class='add'>+	{3656, 21}, {3651, 19},</div><div class='add'>+	{3645, 18}, {3639, 16},</div><div class='add'>+	{3631, 15}, {3622, 13},</div><div class='add'>+	{3611, 12}, {3600, 10},</div><div class='add'>+	{3587, 9}, {3572, 7},</div><div class='add'>+	{3548, 6}, {3503, 5},</div><div class='add'>+	{3420, 3}, {3268, 2},</div><div class='add'>+	{2992, 1}, {2746, 0}</div><div class='add'>+	},</div><div class='add'>+	/* For temperature 25 degree Celsius */</div><div class='add'>+	{</div><div class='add'>+	{4102, 100}, {4065, 98},</div><div class='add'>+	{4048, 96}, {4034, 95},</div><div class='add'>+	{4021, 93}, {4011, 92},</div><div class='add'>+	{4001, 90}, {3986, 88},</div><div class='add'>+	{3968, 87}, {3952, 85},</div><div class='add'>+	{3938, 84}, {3926, 82},</div><div class='add'>+	{3916, 81}, {3908, 79},</div><div class='add'>+	{3900, 77}, {3892, 76},</div><div class='add'>+	{3883, 74}, {3874, 73},</div><div class='add'>+	{3864, 71}, {3855, 70},</div><div class='add'>+	{3846, 68}, {3836, 67},</div><div class='add'>+	{3827, 65}, {3819, 64},</div><div class='add'>+	{3810, 62}, {3801, 61},</div><div class='add'>+	{3793, 59}, {3786, 58},</div><div class='add'>+	{3778, 56}, {3772, 55},</div><div class='add'>+	{3765, 53}, {3759, 52},</div><div class='add'>+	{3754, 50}, {3748, 49},</div><div class='add'>+	{3743, 47}, {3738, 46},</div><div class='add'>+	{3733, 44}, {3728, 43},</div><div class='add'>+	{3724, 41}, {3720, 40},</div><div class='add'>+	{3716, 38}, {3712, 37},</div><div class='add'>+	{3709, 35}, {3706, 34},</div><div class='add'>+	{3703, 33}, {3701, 31},</div><div class='add'>+	{3698, 30}, {3696, 28},</div><div class='add'>+	{3693, 27}, {3690, 25},</div><div class='add'>+	{3687, 24}, {3683, 22},</div><div class='add'>+	{3680, 21}, {3675, 19},</div><div class='add'>+	{3671, 18}, {3666, 17},</div><div class='add'>+	{3660, 15}, {3654, 14},</div><div class='add'>+	{3647, 12}, {3639, 11},</div><div class='add'>+	{3630, 9}, {3621, 8},</div><div class='add'>+	{3613, 6}, {3606, 5},</div><div class='add'>+	{3597, 4}, {3582, 2},</div><div class='add'>+	{3546, 1}, {2747, 0}</div><div class='add'>+	},</div><div class='add'>+	/* For temperature 40 degree Celsius */</div><div class='add'>+	{</div><div class='add'>+	{4114, 100}, {4081, 98},</div><div class='add'>+	{4065, 96}, {4050, 95},</div><div class='add'>+	{4036, 93}, {4024, 92},</div><div class='add'>+	{4013, 90}, {4002, 88},</div><div class='add'>+	{3990, 87}, {3976, 85},</div><div class='add'>+	{3962, 84}, {3950, 82},</div><div class='add'>+	{3939, 81}, {3930, 79},</div><div class='add'>+	{3921, 77}, {3912, 76},</div><div class='add'>+	{3902, 74}, {3893, 73},</div><div class='add'>+	{3883, 71}, {3874, 70},</div><div class='add'>+	{3865, 68}, {3856, 67},</div><div class='add'>+	{3847, 65}, {3838, 64},</div><div class='add'>+	{3829, 62}, {3820, 61},</div><div class='add'>+	{3812, 59}, {3803, 58},</div><div class='add'>+	{3795, 56}, {3787, 55},</div><div class='add'>+	{3780, 53}, {3773, 52},</div><div class='add'>+	{3767, 50}, {3761, 49},</div><div class='add'>+	{3756, 47}, {3751, 46},</div><div class='add'>+	{3746, 44}, {3741, 43},</div><div class='add'>+	{3736, 41}, {3732, 40},</div><div class='add'>+	{3728, 38}, {3724, 37},</div><div class='add'>+	{3720, 35}, {3716, 34},</div><div class='add'>+	{3713, 33}, {3710, 31},</div><div class='add'>+	{3707, 30}, {3704, 28},</div><div class='add'>+	{3701, 27}, {3698, 25},</div><div class='add'>+	{3695, 24}, {3691, 22},</div><div class='add'>+	{3686, 21}, {3681, 19},</div><div class='add'>+	{3676, 18}, {3671, 17},</div><div class='add'>+	{3666, 15}, {3661, 14},</div><div class='add'>+	{3655, 12}, {3648, 11},</div><div class='add'>+	{3640, 9}, {3632, 8},</div><div class='add'>+	{3622, 6}, {3616, 5},</div><div class='add'>+	{3611, 4}, {3604, 2},</div><div class='add'>+	{3594, 1}, {2747, 0}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct da9052_battery {</div><div class='add'>+	struct da9052 *da9052;</div><div class='add'>+	struct power_supply psy;</div><div class='add'>+	struct notifier_block nb;</div><div class='add'>+	int charger_type;</div><div class='add'>+	int status;</div><div class='add'>+	int health;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int volt_reg_to_mV(int value)</div><div class='add'>+{</div><div class='add'>+	return ((value * 1000) / 512) + 2500;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ichg_reg_to_mA(int value)</div><div class='add'>+{</div><div class='add'>+	return (value * 3900) / 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_read_chgend_current(struct da9052_battery *bat,</div><div class='add'>+				       int *current_mA)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (bat-&gt;status == POWER_SUPPLY_STATUS_DISCHARGING)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = da9052_reg_read(bat-&gt;da9052, DA9052_ICHG_END_REG);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*current_mA = ichg_reg_to_mA(ret &amp; DA9052_ICHGEND_ICHGEND);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_read_chg_current(struct da9052_battery *bat, int *current_mA)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (bat-&gt;status == POWER_SUPPLY_STATUS_DISCHARGING)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = da9052_reg_read(bat-&gt;da9052, DA9052_ICHG_AV_REG);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*current_mA = ichg_reg_to_mA(ret &amp; DA9052_ICHGAV_ICHGAV);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_bat_check_status(struct da9052_battery *bat, int *status)</div><div class='add'>+{</div><div class='add'>+	u8 v[2] = {0, 0};</div><div class='add'>+	u8 bat_status;</div><div class='add'>+	u8 chg_end;</div><div class='add'>+	int ret;</div><div class='add'>+	int chg_current;</div><div class='add'>+	int chg_end_current;</div><div class='add'>+	bool dcinsel;</div><div class='add'>+	bool dcindet;</div><div class='add'>+	bool vbussel;</div><div class='add'>+	bool vbusdet;</div><div class='add'>+	bool dc;</div><div class='add'>+	bool vbus;</div><div class='add'>+</div><div class='add'>+	ret = da9052_group_read(bat-&gt;da9052, DA9052_STATUS_A_REG, 2, v);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	bat_status = v[0];</div><div class='add'>+	chg_end = v[1];</div><div class='add'>+</div><div class='add'>+	dcinsel = bat_status &amp; DA9052_STATUSA_DCINSEL;</div><div class='add'>+	dcindet = bat_status &amp; DA9052_STATUSA_DCINDET;</div><div class='add'>+	vbussel = bat_status &amp; DA9052_STATUSA_VBUSSEL;</div><div class='add'>+	vbusdet = bat_status &amp; DA9052_STATUSA_VBUSDET;</div><div class='add'>+	dc = dcinsel &amp;&amp; dcindet;</div><div class='add'>+	vbus = vbussel &amp;&amp; vbusdet;</div><div class='add'>+</div><div class='add'>+	/* Preference to WALL(DCIN) charger unit */</div><div class='add'>+	if (dc || vbus) {</div><div class='add'>+		bat-&gt;charger_type = DA9052_CHARGER;</div><div class='add'>+</div><div class='add'>+		/* If charging end flag is set and Charging current is greater</div><div class='add'>+		 * than charging end limit then battery is charging</div><div class='add'>+		*/</div><div class='add'>+		if ((chg_end &amp; DA9052_STATUSB_CHGEND) != 0) {</div><div class='add'>+			ret = da9052_read_chg_current(bat, &amp;chg_current);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+			ret = da9052_read_chgend_current(bat, &amp;chg_end_current);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+</div><div class='add'>+			if (chg_current &gt;= chg_end_current)</div><div class='add'>+				bat-&gt;status = POWER_SUPPLY_STATUS_CHARGING;</div><div class='add'>+			else</div><div class='add'>+				bat-&gt;status = POWER_SUPPLY_STATUS_NOT_CHARGING;</div><div class='add'>+		} else {</div><div class='add'>+			/* If Charging end flag is cleared then battery is</div><div class='add'>+			 * charging</div><div class='add'>+			*/</div><div class='add'>+			bat-&gt;status = POWER_SUPPLY_STATUS_CHARGING;</div><div class='add'>+		}</div><div class='add'>+	} else if (dcindet || vbusdet) {</div><div class='add'>+			bat-&gt;charger_type = DA9052_CHARGER;</div><div class='add'>+			bat-&gt;status = POWER_SUPPLY_STATUS_NOT_CHARGING;</div><div class='add'>+	} else {</div><div class='add'>+		bat-&gt;charger_type = DA9052_NOCHARGER;</div><div class='add'>+		bat-&gt;status = POWER_SUPPLY_STATUS_DISCHARGING;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status != NULL)</div><div class='add'>+		*status = bat-&gt;status;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_bat_read_volt(struct da9052_battery *bat, int *volt_mV)</div><div class='add'>+{</div><div class='add'>+	int volt;</div><div class='add'>+</div><div class='add'>+	volt = da9052_adc_manual_read(bat-&gt;da9052, DA9052_ADC_MAN_MUXSEL_VBAT);</div><div class='add'>+	if (volt &lt; 0)</div><div class='add'>+		return volt;</div><div class='add'>+</div><div class='add'>+	*volt_mV = volt_reg_to_mV(volt);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_bat_check_presence(struct da9052_battery *bat, int *illegal)</div><div class='add'>+{</div><div class='add'>+	int bat_temp;</div><div class='add'>+</div><div class='add'>+	bat_temp = da9052_adc_read_temp(bat-&gt;da9052);</div><div class='add'>+	if (bat_temp &lt; 0)</div><div class='add'>+		return bat_temp;</div><div class='add'>+</div><div class='add'>+	if (bat_temp &gt; DA9052_BAT_TSH)</div><div class='add'>+		*illegal = 1;</div><div class='add'>+	else</div><div class='add'>+		*illegal = 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 da9052_bat_interpolate(int vbat_lower, int  vbat_upper,</div><div class='add'>+				   int level_lower, int level_upper,</div><div class='add'>+				   int bat_voltage)</div><div class='add'>+{</div><div class='add'>+	int tmp;</div><div class='add'>+</div><div class='add'>+	tmp = ((level_upper - level_lower) * 1000) / (vbat_upper - vbat_lower);</div><div class='add'>+	tmp = level_lower + (((bat_voltage - vbat_lower) * tmp) / 1000);</div><div class='add'>+</div><div class='add'>+	return tmp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned char da9052_determine_vc_tbl_index(unsigned char adc_temp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (adc_temp &lt;= vc_tbl_ref[0])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (adc_temp &gt; vc_tbl_ref[DA9052_VC_TBL_REF_SZ - 1])</div><div class='add'>+		return DA9052_VC_TBL_REF_SZ - 1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DA9052_VC_TBL_REF_SZ; i++) {</div><div class='add'>+		if ((adc_temp &gt; vc_tbl_ref[i]) &amp;&amp;</div><div class='add'>+		    (adc_temp &lt;= DA9052_MEAN(vc_tbl_ref[i], vc_tbl_ref[i + 1])))</div><div class='add'>+				return i;</div><div class='add'>+		if ((adc_temp &gt; DA9052_MEAN(vc_tbl_ref[i], vc_tbl_ref[i + 1]))</div><div class='add'>+		     &amp;&amp; (adc_temp &lt;= vc_tbl_ref[i]))</div><div class='add'>+				return i + 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_bat_read_capacity(struct da9052_battery *bat, int *capacity)</div><div class='add'>+{</div><div class='add'>+	int adc_temp;</div><div class='add'>+	int bat_voltage;</div><div class='add'>+	int vbat_lower;</div><div class='add'>+	int vbat_upper;</div><div class='add'>+	int level_upper;</div><div class='add'>+	int level_lower;</div><div class='add'>+	int ret;</div><div class='add'>+	int flag;</div><div class='add'>+	int i = 0;</div><div class='add'>+	int j;</div><div class='add'>+</div><div class='add'>+	ret = da9052_bat_read_volt(bat, &amp;bat_voltage);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	adc_temp = da9052_adc_read_temp(bat-&gt;da9052);</div><div class='add'>+	if (adc_temp &lt; 0)</div><div class='add'>+		return adc_temp;</div><div class='add'>+</div><div class='add'>+	i = da9052_determine_vc_tbl_index(adc_temp);</div><div class='add'>+</div><div class='add'>+	if (bat_voltage &gt;= vc_tbl[i][0][0]) {</div><div class='add'>+		*capacity = 100;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (bat_voltage &lt;= vc_tbl[i][DA9052_VC_TBL_SZ - 1][0]) {</div><div class='add'>+		*capacity = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	flag = 0;</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; (DA9052_VC_TBL_SZ-1); j++) {</div><div class='add'>+		if ((bat_voltage &lt;= vc_tbl[i][j][0]) &amp;&amp;</div><div class='add'>+		    (bat_voltage &gt;= vc_tbl[i][j + 1][0])) {</div><div class='add'>+			vbat_upper = vc_tbl[i][j][0];</div><div class='add'>+			vbat_lower = vc_tbl[i][j + 1][0];</div><div class='add'>+			level_upper = vc_tbl[i][j][1];</div><div class='add'>+			level_lower = vc_tbl[i][j + 1][1];</div><div class='add'>+			flag = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (!flag)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	*capacity = da9052_bat_interpolate(vbat_lower, vbat_upper, level_lower,</div><div class='add'>+					   level_upper, bat_voltage);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_bat_check_health(struct da9052_battery *bat, int *health)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	int bat_illegal;</div><div class='add'>+	int capacity;</div><div class='add'>+</div><div class='add'>+	ret = da9052_bat_check_presence(bat, &amp;bat_illegal);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (bat_illegal) {</div><div class='add'>+		bat-&gt;health = POWER_SUPPLY_HEALTH_UNKNOWN;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bat-&gt;health != POWER_SUPPLY_HEALTH_OVERHEAT) {</div><div class='add'>+		ret = da9052_bat_read_capacity(bat, &amp;capacity);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		if (capacity &lt; DA9052_BAT_LOW_CAP)</div><div class='add'>+			bat-&gt;health = POWER_SUPPLY_HEALTH_DEAD;</div><div class='add'>+		else</div><div class='add'>+			bat-&gt;health = POWER_SUPPLY_HEALTH_GOOD;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*health = bat-&gt;health;</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 da9052_bat_irq(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct da9052_battery *bat = data;</div><div class='add'>+</div><div class='add'>+	irq -= bat-&gt;da9052-&gt;irq_base;</div><div class='add'>+</div><div class='add'>+	if (irq == DA9052_IRQ_CHGEND)</div><div class='add'>+		bat-&gt;status = POWER_SUPPLY_STATUS_FULL;</div><div class='add'>+	else</div><div class='add'>+		da9052_bat_check_status(bat, NULL);</div><div class='add'>+</div><div class='add'>+	if (irq == DA9052_IRQ_CHGEND || irq == DA9052_IRQ_DCIN ||</div><div class='add'>+	    irq == DA9052_IRQ_VBUS || irq == DA9052_IRQ_TBAT) {</div><div class='add'>+		power_supply_changed(&amp;bat-&gt;psy);</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 da9052_USB_current_notifier(struct notifier_block *nb,</div><div class='add'>+					unsigned long events, void *data)</div><div class='add'>+{</div><div class='add'>+	u8 row;</div><div class='add'>+	u8 col;</div><div class='add'>+	int *current_mA = data;</div><div class='add'>+	int ret;</div><div class='add'>+	struct da9052_battery *bat = container_of(nb, struct da9052_battery,</div><div class='add'>+						  nb);</div><div class='add'>+</div><div class='add'>+	if (bat-&gt;status == POWER_SUPPLY_STATUS_DISCHARGING)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	ret = da9052_reg_read(bat-&gt;da9052, DA9052_CHGBUCK_REG);</div><div class='add'>+	if (ret &amp; DA9052_CHG_USB_ILIM_MASK)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (bat-&gt;da9052-&gt;chip_id == DA9052)</div><div class='add'>+		row = 0;</div><div class='add'>+	else</div><div class='add'>+		row = 1;</div><div class='add'>+</div><div class='add'>+	if (*current_mA &lt; da9052_chg_current_lim[row][0] ||</div><div class='add'>+	    *current_mA &gt; da9052_chg_current_lim[row][DA9052_CHG_LIM_COLS - 1])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (col = 0; col &lt;= DA9052_CHG_LIM_COLS - 1 ; col++) {</div><div class='add'>+		if (*current_mA &lt;= da9052_chg_current_lim[row][col])</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return da9052_reg_update(bat-&gt;da9052, DA9052_ISET_REG,</div><div class='add'>+				 DA9052_ISET_USB_MASK, col);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_bat_get_property(struct power_supply *psy,</div><div class='add'>+				    enum power_supply_property psp,</div><div class='add'>+				    union power_supply_propval *val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	int illegal;</div><div class='add'>+	struct da9052_battery *bat = container_of(psy, struct da9052_battery,</div><div class='add'>+						  psy);</div><div class='add'>+</div><div class='add'>+	ret = da9052_bat_check_presence(bat, &amp;illegal);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (illegal &amp;&amp; psp != POWER_SUPPLY_PROP_PRESENT)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	switch (psp) {</div><div class='add'>+	case POWER_SUPPLY_PROP_STATUS:</div><div class='add'>+		ret = da9052_bat_check_status(bat, &amp;val-&gt;intval);</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_ONLINE:</div><div class='add'>+		val-&gt;intval =</div><div class='add'>+			(bat-&gt;charger_type == DA9052_NOCHARGER) ? 0 : 1;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_PRESENT:</div><div class='add'>+		ret = da9052_bat_check_presence(bat, &amp;val-&gt;intval);</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_HEALTH:</div><div class='add'>+		ret = da9052_bat_check_health(bat, &amp;val-&gt;intval);</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:</div><div class='add'>+		val-&gt;intval = DA9052_BAT_CUTOFF_VOLT * 1000;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_VOLTAGE_AVG:</div><div class='add'>+		ret = da9052_bat_read_volt(bat, &amp;val-&gt;intval);</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_CURRENT_AVG:</div><div class='add'>+		ret = da9052_read_chg_current(bat, &amp;val-&gt;intval);</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_CAPACITY:</div><div class='add'>+		ret = da9052_bat_read_capacity(bat, &amp;val-&gt;intval);</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_TEMP:</div><div class='add'>+		val-&gt;intval = da9052_adc_read_temp(bat-&gt;da9052);</div><div class='add'>+		ret = val-&gt;intval;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_TECHNOLOGY:</div><div class='add'>+		val-&gt;intval = POWER_SUPPLY_TECHNOLOGY_LION;</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 ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum power_supply_property da9052_bat_props[] = {</div><div class='add'>+	POWER_SUPPLY_PROP_STATUS,</div><div class='add'>+	POWER_SUPPLY_PROP_ONLINE,</div><div class='add'>+	POWER_SUPPLY_PROP_PRESENT,</div><div class='add'>+	POWER_SUPPLY_PROP_HEALTH,</div><div class='add'>+	POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,</div><div class='add'>+	POWER_SUPPLY_PROP_VOLTAGE_AVG,</div><div class='add'>+	POWER_SUPPLY_PROP_CURRENT_AVG,</div><div class='add'>+	POWER_SUPPLY_PROP_CAPACITY,</div><div class='add'>+	POWER_SUPPLY_PROP_TEMP,</div><div class='add'>+	POWER_SUPPLY_PROP_TECHNOLOGY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct power_supply template_battery = {</div><div class='add'>+	.name		= "da9052-bat",</div><div class='add'>+	.type		= POWER_SUPPLY_TYPE_BATTERY,</div><div class='add'>+	.properties	= da9052_bat_props,</div><div class='add'>+	.num_properties	= ARRAY_SIZE(da9052_bat_props),</div><div class='add'>+	.get_property	= da9052_bat_get_property,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *const da9052_bat_irqs[] = {</div><div class='add'>+	"BATT TEMP",</div><div class='add'>+	"DCIN DET",</div><div class='add'>+	"DCIN REM",</div><div class='add'>+	"VBUS DET",</div><div class='add'>+	"VBUS REM",</div><div class='add'>+	"CHG END",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static s32 __devinit da9052_bat_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct da9052_pdata *pdata;</div><div class='add'>+	struct da9052_battery *bat;</div><div class='add'>+	int ret;</div><div class='add'>+	int irq;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bat = kzalloc(sizeof(struct da9052_battery), GFP_KERNEL);</div><div class='add'>+	if (!bat)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	bat-&gt;da9052 = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='add'>+	bat-&gt;psy = template_battery;</div><div class='add'>+	bat-&gt;charger_type = DA9052_NOCHARGER;</div><div class='add'>+	bat-&gt;status = POWER_SUPPLY_STATUS_UNKNOWN;</div><div class='add'>+	bat-&gt;health = POWER_SUPPLY_HEALTH_UNKNOWN;</div><div class='add'>+	bat-&gt;nb.notifier_call = da9052_USB_current_notifier;</div><div class='add'>+</div><div class='add'>+	pdata = bat-&gt;da9052-&gt;dev-&gt;platform_data;</div><div class='add'>+	if (pdata != NULL &amp;&amp; pdata-&gt;use_for_apm)</div><div class='add'>+		bat-&gt;psy.use_for_apm = pdata-&gt;use_for_apm;</div><div class='add'>+	else</div><div class='add'>+		bat-&gt;psy.use_for_apm = 1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(da9052_bat_irqs); i++) {</div><div class='add'>+		irq = platform_get_irq_byname(pdev, da9052_bat_irqs[i]);</div><div class='add'>+		ret = request_threaded_irq(bat-&gt;da9052-&gt;irq_base + irq,</div><div class='add'>+					   NULL, da9052_bat_irq,</div><div class='add'>+					   IRQF_TRIGGER_LOW | IRQF_ONESHOT,</div><div class='add'>+					   da9052_bat_irqs[i], bat);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			dev_err(bat-&gt;da9052-&gt;dev,</div><div class='add'>+				"DA9052 failed to request %s IRQ %d: %d\n",</div><div class='add'>+				da9052_bat_irqs[i], irq, ret);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = power_supply_register(&amp;pdev-&gt;dev, &amp;bat-&gt;psy);</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'>+	for (; i &gt;= 0; i--) {</div><div class='add'>+		irq = platform_get_irq_byname(pdev, da9052_bat_irqs[i]);</div><div class='add'>+		free_irq(bat-&gt;da9052-&gt;irq_base + irq, bat);</div><div class='add'>+	}</div><div class='add'>+	kfree(bat);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+static int __devexit da9052_bat_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int irq;</div><div class='add'>+	struct da9052_battery *bat = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(da9052_bat_irqs); i++) {</div><div class='add'>+		irq = platform_get_irq_byname(pdev, da9052_bat_irqs[i]);</div><div class='add'>+		free_irq(bat-&gt;da9052-&gt;irq_base + irq, bat);</div><div class='add'>+	}</div><div class='add'>+	power_supply_unregister(&amp;bat-&gt;psy);</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 da9052_bat_driver = {</div><div class='add'>+	.probe = da9052_bat_probe,</div><div class='add'>+	.remove = __devexit_p(da9052_bat_remove),</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "da9052-bat",</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init da9052_bat_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;da9052_bat_driver);</div><div class='add'>+}</div><div class='add'>+module_init(da9052_bat_init);</div><div class='add'>+</div><div class='add'>+static void __exit da9052_bat_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;da9052_bat_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(da9052_bat_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DA9052 BAT Device Driver");</div><div class='add'>+MODULE_AUTHOR("David Dajun Chen &lt;dchen@diasemi.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("platform:da9052-bat");</div><div class='head'>diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c<br/>index f2c9cc33c0f9..076e211a40b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/ds2760_battery.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/ds2760_battery.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/ds2760_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/ds2760_battery.c</a></div><div class='hunk'>@@ -64,7 +64,7 @@ static unsigned int cache_time = 1000;</div><div class='ctx'> module_param(cache_time, uint, 0644);</div><div class='ctx'> MODULE_PARM_DESC(cache_time, "cache time in milliseconds");</div><div class='ctx'> </div><div class='del'>-static unsigned int pmod_enabled;</div><div class='add'>+static bool pmod_enabled;</div><div class='ctx'> module_param(pmod_enabled, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(pmod_enabled, "PMOD enable bit");</div><div class='ctx'> </div><div class='hunk'>@@ -95,7 +95,11 @@ static int rated_capacities[] = {</div><div class='ctx'> 	2880,	/* Samsung */</div><div class='ctx'> 	2880,	/* BYD */</div><div class='ctx'> 	2880,	/* Lishen */</div><div class='del'>-	2880	/* NEC */</div><div class='add'>+	2880,	/* NEC */</div><div class='add'>+#ifdef CONFIG_MACH_H4700</div><div class='add'>+	0,</div><div class='add'>+	3600,	/* HP iPAQ hx4700 3.7V 3600mAh (359114-001) */</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* array is level at temps 0°C, 10°C, 20°C, 30°C, 40°C</div><div class='hunk'>@@ -637,18 +641,7 @@ static struct platform_driver ds2760_battery_driver = {</div><div class='ctx'> 	.resume	  = ds2760_battery_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ds2760_battery_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ds2760_battery_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ds2760_battery_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ds2760_battery_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ds2760_battery_init);</div><div class='del'>-module_exit(ds2760_battery_exit);</div><div class='add'>+module_platform_driver(ds2760_battery_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Szabolcs Gyurko &lt;szabolcs.gyurko@tlt.hu&gt;, "</div><div class='head'>diff --git a/drivers/power/ds2780_battery.c b/drivers/power/ds2780_battery.c<br/>index 91a783d72360..de31cae1ba53 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/ds2780_battery.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/ds2780_battery.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/ds2780_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/ds2780_battery.c</a></div><div class='hunk'>@@ -841,29 +841,17 @@ static int __devexit ds2780_battery_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-MODULE_ALIAS("platform:ds2780-battery");</div><div class='del'>-</div><div class='ctx'> static struct platform_driver ds2780_battery_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "ds2780-battery",</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe	  = ds2780_battery_probe,</div><div class='del'>-	.remove   = ds2780_battery_remove,</div><div class='add'>+	.remove   = __devexit_p(ds2780_battery_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ds2780_battery_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ds2780_battery_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ds2780_battery_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ds2780_battery_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ds2780_battery_init);</div><div class='del'>-module_exit(ds2780_battery_exit);</div><div class='add'>+module_platform_driver(ds2780_battery_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Clifton Barnes &lt;cabarnes@indesign-llc.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Maxim/Dallas DS2780 Stand-Alone Fuel Gauage IC driver");</div><div class='add'>+MODULE_ALIAS("platform:ds2780-battery");</div><div class='head'>diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c<br/>index a64b8854cfd5..8672c9177dd7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/gpio-charger.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/gpio-charger.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/gpio-charger.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/gpio-charger.c</a></div><div class='hunk'>@@ -185,17 +185,7 @@ static struct platform_driver gpio_charger_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init gpio_charger_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;gpio_charger_driver);</div><div class='del'>-}</div><div class='del'>-module_init(gpio_charger_init);</div><div class='del'>-</div><div class='del'>-static void __exit gpio_charger_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;gpio_charger_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(gpio_charger_exit);</div><div class='add'>+module_platform_driver(gpio_charger_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Lars-Peter Clausen &lt;lars@metafoo.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for chargers which report their online status through a GPIO");</div><div class='head'>diff --git a/drivers/power/intel_mid_battery.c b/drivers/power/intel_mid_battery.c<br/>index 01fa671ec97f..d09649706bd3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/intel_mid_battery.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/intel_mid_battery.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/intel_mid_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/intel_mid_battery.c</a></div><div class='hunk'>@@ -779,18 +779,7 @@ static struct platform_driver platform_pmic_battery_driver = {</div><div class='ctx'> 	.remove = __devexit_p(platform_pmic_battery_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init platform_pmic_battery_module_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;platform_pmic_battery_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit platform_pmic_battery_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;platform_pmic_battery_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(platform_pmic_battery_module_init);</div><div class='del'>-module_exit(platform_pmic_battery_module_exit);</div><div class='add'>+module_platform_driver(platform_pmic_battery_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Nithish Mahalingam &lt;nithish.mahalingam@intel.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Intel Moorestown PMIC Battery Driver");</div><div class='head'>diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c<br/>index f6d72b402a8e..b806667b59ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/isp1704_charger.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/isp1704_charger.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/isp1704_charger.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/isp1704_charger.c</a></div><div class='hunk'>@@ -79,7 +79,7 @@ static void isp1704_charger_set_power(struct isp1704_charger *isp, bool on)</div><div class='ctx'> {</div><div class='ctx'> 	struct isp1704_charger_data	*board = isp-&gt;dev-&gt;platform_data;</div><div class='ctx'> </div><div class='del'>-	if (board-&gt;set_power)</div><div class='add'>+	if (board &amp;&amp; board-&gt;set_power)</div><div class='ctx'> 		board-&gt;set_power(on);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -494,17 +494,7 @@ static struct platform_driver isp1704_charger_driver = {</div><div class='ctx'> 	.remove = __devexit_p(isp1704_charger_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init isp1704_charger_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;isp1704_charger_driver);</div><div class='del'>-}</div><div class='del'>-module_init(isp1704_charger_init);</div><div class='del'>-</div><div class='del'>-static void __exit isp1704_charger_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;isp1704_charger_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(isp1704_charger_exit);</div><div class='add'>+module_platform_driver(isp1704_charger_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_ALIAS("platform:isp1704_charger");</div><div class='ctx'> MODULE_AUTHOR("Nokia Corporation");</div><div class='head'>diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c<br/>index 763f894ed188..8dbc7bfaab14 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/jz4740-battery.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/jz4740-battery.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/jz4740-battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/jz4740-battery.c</a></div><div class='hunk'>@@ -67,7 +67,7 @@ static irqreturn_t jz_battery_irq_handler(int irq, void *devid)</div><div class='ctx'> </div><div class='ctx'> static long jz_battery_read_voltage(struct jz_battery *battery)</div><div class='ctx'> {</div><div class='del'>-	unsigned long t;</div><div class='add'>+	long t;</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> 	long voltage;</div><div class='ctx'> </div><div class='hunk'>@@ -441,17 +441,7 @@ static struct platform_driver jz_battery_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init jz_battery_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;jz_battery_driver);</div><div class='del'>-}</div><div class='del'>-module_init(jz_battery_init);</div><div class='del'>-</div><div class='del'>-static void __exit jz_battery_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;jz_battery_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(jz_battery_exit);</div><div class='add'>+module_platform_driver(jz_battery_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_ALIAS("platform:jz4740-battery");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c<br/>new file mode 100644<br/>index 000000000000..b15b575c070c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/lp8727_charger.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/lp8727_charger.c</a></div><div class='hunk'>@@ -0,0 +1,494 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for LP8727 Micro/Mini USB IC with intergrated charger</div><div class='add'>+ *</div><div class='add'>+ *			Copyright (C) 2011 National Semiconductor</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 version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/power_supply.h&gt;</div><div class='add'>+#include &lt;linux/lp8727.h&gt;</div><div class='add'>+</div><div class='add'>+#define DEBOUNCE_MSEC	270</div><div class='add'>+</div><div class='add'>+/* Registers */</div><div class='add'>+#define CTRL1		0x1</div><div class='add'>+#define CTRL2		0x2</div><div class='add'>+#define	SWCTRL		0x3</div><div class='add'>+#define INT1		0x4</div><div class='add'>+#define INT2		0x5</div><div class='add'>+#define STATUS1		0x6</div><div class='add'>+#define STATUS2 	0x7</div><div class='add'>+#define CHGCTRL2	0x9</div><div class='add'>+</div><div class='add'>+/* CTRL1 register */</div><div class='add'>+#define CP_EN		(1 &lt;&lt; 0)</div><div class='add'>+#define ADC_EN		(1 &lt;&lt; 1)</div><div class='add'>+#define ID200_EN	(1 &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+/* CTRL2 register */</div><div class='add'>+#define CHGDET_EN	(1 &lt;&lt; 1)</div><div class='add'>+#define INT_EN		(1 &lt;&lt; 6)</div><div class='add'>+</div><div class='add'>+/* SWCTRL register */</div><div class='add'>+#define SW_DM1_DM	(0x0 &lt;&lt; 0)</div><div class='add'>+#define SW_DM1_U1	(0x1 &lt;&lt; 0)</div><div class='add'>+#define SW_DM1_HiZ	(0x7 &lt;&lt; 0)</div><div class='add'>+#define SW_DP2_DP	(0x0 &lt;&lt; 3)</div><div class='add'>+#define SW_DP2_U2	(0x1 &lt;&lt; 3)</div><div class='add'>+#define SW_DP2_HiZ	(0x7 &lt;&lt; 3)</div><div class='add'>+</div><div class='add'>+/* INT1 register */</div><div class='add'>+#define IDNO		(0xF &lt;&lt; 0)</div><div class='add'>+#define VBUS		(1 &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+/* STATUS1 register */</div><div class='add'>+#define CHGSTAT		(3 &lt;&lt; 4)</div><div class='add'>+#define CHPORT		(1 &lt;&lt; 6)</div><div class='add'>+#define DCPORT		(1 &lt;&lt; 7)</div><div class='add'>+</div><div class='add'>+/* STATUS2 register */</div><div class='add'>+#define TEMP_STAT	(3 &lt;&lt; 5)</div><div class='add'>+</div><div class='add'>+enum lp8727_dev_id {</div><div class='add'>+	ID_NONE,</div><div class='add'>+	ID_TA,</div><div class='add'>+	ID_DEDICATED_CHG,</div><div class='add'>+	ID_USB_CHG,</div><div class='add'>+	ID_USB_DS,</div><div class='add'>+	ID_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum lp8727_chg_stat {</div><div class='add'>+	PRECHG,</div><div class='add'>+	CC,</div><div class='add'>+	CV,</div><div class='add'>+	EOC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct lp8727_psy {</div><div class='add'>+	struct power_supply ac;</div><div class='add'>+	struct power_supply usb;</div><div class='add'>+	struct power_supply batt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct lp8727_chg {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct mutex xfer_lock;</div><div class='add'>+	struct delayed_work work;</div><div class='add'>+	struct workqueue_struct *irqthread;</div><div class='add'>+	struct lp8727_platform_data *pdata;</div><div class='add'>+	struct lp8727_psy *psy;</div><div class='add'>+	struct lp8727_chg_param *chg_parm;</div><div class='add'>+	enum lp8727_dev_id devid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int lp8727_i2c_read(struct lp8727_chg *pchg, u8 reg, u8 *data, u8 len)</div><div class='add'>+{</div><div class='add'>+	s32 ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pchg-&gt;xfer_lock);</div><div class='add'>+	ret = i2c_smbus_read_i2c_block_data(pchg-&gt;client, reg, len, data);</div><div class='add'>+	mutex_unlock(&amp;pchg-&gt;xfer_lock);</div><div class='add'>+</div><div class='add'>+	return (ret != len) ? -EIO : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lp8727_i2c_write(struct lp8727_chg *pchg, u8 reg, u8 *data, u8 len)</div><div class='add'>+{</div><div class='add'>+	s32 ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pchg-&gt;xfer_lock);</div><div class='add'>+	ret = i2c_smbus_write_i2c_block_data(pchg-&gt;client, reg, len, data);</div><div class='add'>+	mutex_unlock(&amp;pchg-&gt;xfer_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int lp8727_i2c_read_byte(struct lp8727_chg *pchg, u8 reg,</div><div class='add'>+				       u8 *data)</div><div class='add'>+{</div><div class='add'>+	return lp8727_i2c_read(pchg, reg, data, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int lp8727_i2c_write_byte(struct lp8727_chg *pchg, u8 reg,</div><div class='add'>+					u8 *data)</div><div class='add'>+{</div><div class='add'>+	return lp8727_i2c_write(pchg, reg, data, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lp8727_is_charger_attached(const char *name, int id)</div><div class='add'>+{</div><div class='add'>+	if (name) {</div><div class='add'>+		if (!strcmp(name, "ac"))</div><div class='add'>+			return (id == ID_TA || id == ID_DEDICATED_CHG) ? 1 : 0;</div><div class='add'>+		else if (!strcmp(name, "usb"))</div><div class='add'>+			return (id == ID_USB_CHG) ? 1 : 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (id &gt;= ID_TA &amp;&amp; id &lt;= ID_USB_CHG) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lp8727_init_device(struct lp8727_chg *pchg)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	val = ID200_EN | ADC_EN | CP_EN;</div><div class='add'>+	if (lp8727_i2c_write_byte(pchg, CTRL1, &amp;val))</div><div class='add'>+		dev_err(pchg-&gt;dev, "i2c write err : addr=0x%.2x\n", CTRL1);</div><div class='add'>+</div><div class='add'>+	val = INT_EN | CHGDET_EN;</div><div class='add'>+	if (lp8727_i2c_write_byte(pchg, CTRL2, &amp;val))</div><div class='add'>+		dev_err(pchg-&gt;dev, "i2c write err : addr=0x%.2x\n", CTRL2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lp8727_is_dedicated_charger(struct lp8727_chg *pchg)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+	lp8727_i2c_read_byte(pchg, STATUS1, &amp;val);</div><div class='add'>+	return (val &amp; DCPORT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lp8727_is_usb_charger(struct lp8727_chg *pchg)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+	lp8727_i2c_read_byte(pchg, STATUS1, &amp;val);</div><div class='add'>+	return (val &amp; CHPORT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lp8727_ctrl_switch(struct lp8727_chg *pchg, u8 sw)</div><div class='add'>+{</div><div class='add'>+	u8 val = sw;</div><div class='add'>+	lp8727_i2c_write_byte(pchg, SWCTRL, &amp;val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lp8727_id_detection(struct lp8727_chg *pchg, u8 id, int vbusin)</div><div class='add'>+{</div><div class='add'>+	u8 devid = ID_NONE;</div><div class='add'>+	u8 swctrl = SW_DM1_HiZ | SW_DP2_HiZ;</div><div class='add'>+</div><div class='add'>+	switch (id) {</div><div class='add'>+	case 0x5:</div><div class='add'>+		devid = ID_TA;</div><div class='add'>+		pchg-&gt;chg_parm = &amp;pchg-&gt;pdata-&gt;ac;</div><div class='add'>+		break;</div><div class='add'>+	case 0xB:</div><div class='add'>+		if (lp8727_is_dedicated_charger(pchg)) {</div><div class='add'>+			pchg-&gt;chg_parm = &amp;pchg-&gt;pdata-&gt;ac;</div><div class='add'>+			devid = ID_DEDICATED_CHG;</div><div class='add'>+		} else if (lp8727_is_usb_charger(pchg)) {</div><div class='add'>+			pchg-&gt;chg_parm = &amp;pchg-&gt;pdata-&gt;usb;</div><div class='add'>+			devid = ID_USB_CHG;</div><div class='add'>+			swctrl = SW_DM1_DM | SW_DP2_DP;</div><div class='add'>+		} else if (vbusin) {</div><div class='add'>+			devid = ID_USB_DS;</div><div class='add'>+			swctrl = SW_DM1_DM | SW_DP2_DP;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		devid = ID_NONE;</div><div class='add'>+		pchg-&gt;chg_parm = NULL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pchg-&gt;devid = devid;</div><div class='add'>+	lp8727_ctrl_switch(pchg, swctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lp8727_enable_chgdet(struct lp8727_chg *pchg)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	lp8727_i2c_read_byte(pchg, CTRL2, &amp;val);</div><div class='add'>+	val |= CHGDET_EN;</div><div class='add'>+	lp8727_i2c_write_byte(pchg, CTRL2, &amp;val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lp8727_delayed_func(struct work_struct *_work)</div><div class='add'>+{</div><div class='add'>+	u8 intstat[2], idno, vbus;</div><div class='add'>+	struct lp8727_chg *pchg =</div><div class='add'>+	    container_of(_work, struct lp8727_chg, work.work);</div><div class='add'>+</div><div class='add'>+	if (lp8727_i2c_read(pchg, INT1, intstat, 2)) {</div><div class='add'>+		dev_err(pchg-&gt;dev, "can not read INT registers\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	idno = intstat[0] &amp; IDNO;</div><div class='add'>+	vbus = intstat[0] &amp; VBUS;</div><div class='add'>+</div><div class='add'>+	lp8727_id_detection(pchg, idno, vbus);</div><div class='add'>+	lp8727_enable_chgdet(pchg);</div><div class='add'>+</div><div class='add'>+	power_supply_changed(&amp;pchg-&gt;psy-&gt;ac);</div><div class='add'>+	power_supply_changed(&amp;pchg-&gt;psy-&gt;usb);</div><div class='add'>+	power_supply_changed(&amp;pchg-&gt;psy-&gt;batt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t lp8727_isr_func(int irq, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct lp8727_chg *pchg = ptr;</div><div class='add'>+	unsigned long delay = msecs_to_jiffies(DEBOUNCE_MSEC);</div><div class='add'>+</div><div class='add'>+	queue_delayed_work(pchg-&gt;irqthread, &amp;pchg-&gt;work, delay);</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 lp8727_intr_config(struct lp8727_chg *pchg)</div><div class='add'>+{</div><div class='add'>+	INIT_DELAYED_WORK(&amp;pchg-&gt;work, lp8727_delayed_func);</div><div class='add'>+</div><div class='add'>+	pchg-&gt;irqthread = create_singlethread_workqueue("lp8727-irqthd");</div><div class='add'>+	if (!pchg-&gt;irqthread)</div><div class='add'>+		dev_err(pchg-&gt;dev, "can not create thread for lp8727\n");</div><div class='add'>+</div><div class='add'>+	if (request_threaded_irq(pchg-&gt;client-&gt;irq,</div><div class='add'>+				 NULL,</div><div class='add'>+				 lp8727_isr_func,</div><div class='add'>+				 IRQF_TRIGGER_FALLING, "lp8727_irq", pchg)) {</div><div class='add'>+		dev_err(pchg-&gt;dev, "lp8727 irq can not be registered\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum power_supply_property lp8727_charger_prop[] = {</div><div class='add'>+	POWER_SUPPLY_PROP_ONLINE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum power_supply_property lp8727_battery_prop[] = {</div><div class='add'>+	POWER_SUPPLY_PROP_STATUS,</div><div class='add'>+	POWER_SUPPLY_PROP_HEALTH,</div><div class='add'>+	POWER_SUPPLY_PROP_PRESENT,</div><div class='add'>+	POWER_SUPPLY_PROP_VOLTAGE_NOW,</div><div class='add'>+	POWER_SUPPLY_PROP_CAPACITY,</div><div class='add'>+	POWER_SUPPLY_PROP_TEMP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static char *battery_supplied_to[] = {</div><div class='add'>+	"main_batt",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int lp8727_charger_get_property(struct power_supply *psy,</div><div class='add'>+				       enum power_supply_property psp,</div><div class='add'>+				       union power_supply_propval *val)</div><div class='add'>+{</div><div class='add'>+	struct lp8727_chg *pchg = dev_get_drvdata(psy-&gt;dev-&gt;parent);</div><div class='add'>+</div><div class='add'>+	if (psp == POWER_SUPPLY_PROP_ONLINE)</div><div class='add'>+		val-&gt;intval = lp8727_is_charger_attached(psy-&gt;name,</div><div class='add'>+							 pchg-&gt;devid);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lp8727_battery_get_property(struct power_supply *psy,</div><div class='add'>+				       enum power_supply_property psp,</div><div class='add'>+				       union power_supply_propval *val)</div><div class='add'>+{</div><div class='add'>+	struct lp8727_chg *pchg = dev_get_drvdata(psy-&gt;dev-&gt;parent);</div><div class='add'>+	u8 read;</div><div class='add'>+</div><div class='add'>+	switch (psp) {</div><div class='add'>+	case POWER_SUPPLY_PROP_STATUS:</div><div class='add'>+		if (lp8727_is_charger_attached(psy-&gt;name, pchg-&gt;devid)) {</div><div class='add'>+			lp8727_i2c_read_byte(pchg, STATUS1, &amp;read);</div><div class='add'>+			if (((read &amp; CHGSTAT) &gt;&gt; 4) == EOC)</div><div class='add'>+				val-&gt;intval = POWER_SUPPLY_STATUS_FULL;</div><div class='add'>+			else</div><div class='add'>+				val-&gt;intval = POWER_SUPPLY_STATUS_CHARGING;</div><div class='add'>+		} else {</div><div class='add'>+			val-&gt;intval = POWER_SUPPLY_STATUS_DISCHARGING;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_HEALTH:</div><div class='add'>+		lp8727_i2c_read_byte(pchg, STATUS2, &amp;read);</div><div class='add'>+		read = (read &amp; TEMP_STAT) &gt;&gt; 5;</div><div class='add'>+		if (read &gt;= 0x1 &amp;&amp; read &lt;= 0x3)</div><div class='add'>+			val-&gt;intval = POWER_SUPPLY_HEALTH_OVERHEAT;</div><div class='add'>+		else</div><div class='add'>+			val-&gt;intval = POWER_SUPPLY_HEALTH_GOOD;</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_PRESENT:</div><div class='add'>+		if (pchg-&gt;pdata-&gt;get_batt_present)</div><div class='add'>+			val-&gt;intval = pchg-&gt;pdata-&gt;get_batt_present();</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_VOLTAGE_NOW:</div><div class='add'>+		if (pchg-&gt;pdata-&gt;get_batt_level)</div><div class='add'>+			val-&gt;intval = pchg-&gt;pdata-&gt;get_batt_level();</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_CAPACITY:</div><div class='add'>+		if (pchg-&gt;pdata-&gt;get_batt_capacity)</div><div class='add'>+			val-&gt;intval = pchg-&gt;pdata-&gt;get_batt_capacity();</div><div class='add'>+		break;</div><div class='add'>+	case POWER_SUPPLY_PROP_TEMP:</div><div class='add'>+		if (pchg-&gt;pdata-&gt;get_batt_temp)</div><div class='add'>+			val-&gt;intval = pchg-&gt;pdata-&gt;get_batt_temp();</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lp8727_charger_changed(struct power_supply *psy)</div><div class='add'>+{</div><div class='add'>+	struct lp8727_chg *pchg = dev_get_drvdata(psy-&gt;dev-&gt;parent);</div><div class='add'>+	u8 val;</div><div class='add'>+	u8 eoc_level, ichg;</div><div class='add'>+</div><div class='add'>+	if (lp8727_is_charger_attached(psy-&gt;name, pchg-&gt;devid)) {</div><div class='add'>+		if (pchg-&gt;chg_parm) {</div><div class='add'>+			eoc_level = pchg-&gt;chg_parm-&gt;eoc_level;</div><div class='add'>+			ichg = pchg-&gt;chg_parm-&gt;ichg;</div><div class='add'>+			val = (ichg &lt;&lt; 4) | eoc_level;</div><div class='add'>+			lp8727_i2c_write_byte(pchg, CHGCTRL2, &amp;val);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lp8727_register_psy(struct lp8727_chg *pchg)</div><div class='add'>+{</div><div class='add'>+	struct lp8727_psy *psy;</div><div class='add'>+</div><div class='add'>+	psy = kzalloc(sizeof(*psy), GFP_KERNEL);</div><div class='add'>+	if (!psy)</div><div class='add'>+		goto err_mem;</div><div class='add'>+</div><div class='add'>+	pchg-&gt;psy = psy;</div><div class='add'>+</div><div class='add'>+	psy-&gt;ac.name = "ac";</div><div class='add'>+	psy-&gt;ac.type = POWER_SUPPLY_TYPE_MAINS;</div><div class='add'>+	psy-&gt;ac.properties = lp8727_charger_prop;</div><div class='add'>+	psy-&gt;ac.num_properties = ARRAY_SIZE(lp8727_charger_prop);</div><div class='add'>+	psy-&gt;ac.get_property = lp8727_charger_get_property;</div><div class='add'>+	psy-&gt;ac.supplied_to = battery_supplied_to;</div><div class='add'>+	psy-&gt;ac.num_supplicants = ARRAY_SIZE(battery_supplied_to);</div><div class='add'>+</div><div class='add'>+	if (power_supply_register(pchg-&gt;dev, &amp;psy-&gt;ac))</div><div class='add'>+		goto err_psy;</div><div class='add'>+</div><div class='add'>+	psy-&gt;usb.name = "usb";</div><div class='add'>+	psy-&gt;usb.type = POWER_SUPPLY_TYPE_USB;</div><div class='add'>+	psy-&gt;usb.properties = lp8727_charger_prop;</div><div class='add'>+	psy-&gt;usb.num_properties = ARRAY_SIZE(lp8727_charger_prop);</div><div class='add'>+	psy-&gt;usb.get_property = lp8727_charger_get_property;</div><div class='add'>+	psy-&gt;usb.supplied_to = battery_supplied_to;</div><div class='add'>+	psy-&gt;usb.num_supplicants = ARRAY_SIZE(battery_supplied_to);</div><div class='add'>+</div><div class='add'>+	if (power_supply_register(pchg-&gt;dev, &amp;psy-&gt;usb))</div><div class='add'>+		goto err_psy;</div><div class='add'>+</div><div class='add'>+	psy-&gt;batt.name = "main_batt";</div><div class='add'>+	psy-&gt;batt.type = POWER_SUPPLY_TYPE_BATTERY;</div><div class='add'>+	psy-&gt;batt.properties = lp8727_battery_prop;</div><div class='add'>+	psy-&gt;batt.num_properties = ARRAY_SIZE(lp8727_battery_prop);</div><div class='add'>+	psy-&gt;batt.get_property = lp8727_battery_get_property;</div><div class='add'>+	psy-&gt;batt.external_power_changed = lp8727_charger_changed;</div><div class='add'>+</div><div class='add'>+	if (power_supply_register(pchg-&gt;dev, &amp;psy-&gt;batt))</div><div class='add'>+		goto err_psy;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_mem:</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+err_psy:</div><div class='add'>+	kfree(psy);</div><div class='add'>+	return -EPERM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lp8727_unregister_psy(struct lp8727_chg *pchg)</div><div class='add'>+{</div><div class='add'>+	struct lp8727_psy *psy = pchg-&gt;psy;</div><div class='add'>+</div><div class='add'>+	if (!psy)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	power_supply_unregister(&amp;psy-&gt;ac);</div><div class='add'>+	power_supply_unregister(&amp;psy-&gt;usb);</div><div class='add'>+	power_supply_unregister(&amp;psy-&gt;batt);</div><div class='add'>+	kfree(psy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lp8727_probe(struct i2c_client *cl, const struct i2c_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct lp8727_chg *pchg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!i2c_check_functionality(cl-&gt;adapter, I2C_FUNC_SMBUS_I2C_BLOCK))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	pchg = kzalloc(sizeof(*pchg), GFP_KERNEL);</div><div class='add'>+	if (!pchg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pchg-&gt;client = cl;</div><div class='add'>+	pchg-&gt;dev = &amp;cl-&gt;dev;</div><div class='add'>+	pchg-&gt;pdata = cl-&gt;dev.platform_data;</div><div class='add'>+	i2c_set_clientdata(cl, pchg);</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;pchg-&gt;xfer_lock);</div><div class='add'>+</div><div class='add'>+	lp8727_init_device(pchg);</div><div class='add'>+	lp8727_intr_config(pchg);</div><div class='add'>+</div><div class='add'>+	ret = lp8727_register_psy(pchg);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(pchg-&gt;dev,</div><div class='add'>+			"can not register power supplies. err=%d", 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 __devexit lp8727_remove(struct i2c_client *cl)</div><div class='add'>+{</div><div class='add'>+	struct lp8727_chg *pchg = i2c_get_clientdata(cl);</div><div class='add'>+</div><div class='add'>+	lp8727_unregister_psy(pchg);</div><div class='add'>+	free_irq(pchg-&gt;client-&gt;irq, pchg);</div><div class='add'>+	flush_workqueue(pchg-&gt;irqthread);</div><div class='add'>+	destroy_workqueue(pchg-&gt;irqthread);</div><div class='add'>+	kfree(pchg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id lp8727_ids[] = {</div><div class='add'>+	{"lp8727", 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_driver lp8727_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		   .name = "lp8727",</div><div class='add'>+		   },</div><div class='add'>+	.probe = lp8727_probe,</div><div class='add'>+	.remove = __devexit_p(lp8727_remove),</div><div class='add'>+	.id_table = lp8727_ids,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init lp8727_init(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;lp8727_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit lp8727_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;lp8727_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(lp8727_init);</div><div class='add'>+module_exit(lp8727_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("National Semiconductor LP8727 charger driver");</div><div class='add'>+MODULE_AUTHOR</div><div class='add'>+    ("Woogyom Kim &lt;milo.kim@ti.com&gt;, Daniel Jeong &lt;daniel.jeong@ti.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c<br/>index 9f0183c73076..86acee2f9889 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/max17042_battery.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/max17042_battery.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/max17042_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/max17042_battery.c</a></div><div class='hunk'>@@ -85,55 +85,79 @@ static int max17042_get_property(struct power_supply *psy,</div><div class='ctx'> {</div><div class='ctx'> 	struct max17042_chip *chip = container_of(psy,</div><div class='ctx'> 				struct max17042_chip, battery);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	switch (psp) {</div><div class='ctx'> 	case POWER_SUPPLY_PROP_PRESENT:</div><div class='del'>-		val-&gt;intval = max17042_read_reg(chip-&gt;client,</div><div class='del'>-				MAX17042_STATUS);</div><div class='del'>-		if (val-&gt;intval &amp; MAX17042_STATUS_BattAbsent)</div><div class='add'>+		ret = max17042_read_reg(chip-&gt;client, MAX17042_STATUS);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (ret &amp; MAX17042_STATUS_BattAbsent)</div><div class='ctx'> 			val-&gt;intval = 0;</div><div class='ctx'> 		else</div><div class='ctx'> 			val-&gt;intval = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_CYCLE_COUNT:</div><div class='del'>-		val-&gt;intval = max17042_read_reg(chip-&gt;client,</div><div class='del'>-				MAX17042_Cycles);</div><div class='add'>+		ret = max17042_read_reg(chip-&gt;client, MAX17042_Cycles);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		val-&gt;intval = ret;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_VOLTAGE_MAX:</div><div class='del'>-		val-&gt;intval = max17042_read_reg(chip-&gt;client,</div><div class='del'>-				MAX17042_MinMaxVolt);</div><div class='del'>-		val-&gt;intval &gt;&gt;= 8;</div><div class='add'>+		ret = max17042_read_reg(chip-&gt;client, MAX17042_MinMaxVolt);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		val-&gt;intval = ret &gt;&gt; 8;</div><div class='ctx'> 		val-&gt;intval *= 20000; /* Units of LSB = 20mV */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:</div><div class='del'>-		val-&gt;intval = max17042_read_reg(chip-&gt;client,</div><div class='del'>-				MAX17042_V_empty);</div><div class='del'>-		val-&gt;intval &gt;&gt;= 7;</div><div class='add'>+		ret = max17042_read_reg(chip-&gt;client, MAX17042_V_empty);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		val-&gt;intval = ret &gt;&gt; 7;</div><div class='ctx'> 		val-&gt;intval *= 10000; /* Units of LSB = 10mV */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_VOLTAGE_NOW:</div><div class='del'>-		val-&gt;intval = max17042_read_reg(chip-&gt;client,</div><div class='del'>-				MAX17042_VCELL) * 83; /* 1000 / 12 = 83 */</div><div class='add'>+		ret = max17042_read_reg(chip-&gt;client, MAX17042_VCELL);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		val-&gt;intval = ret * 625 / 8;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_VOLTAGE_AVG:</div><div class='del'>-		val-&gt;intval = max17042_read_reg(chip-&gt;client,</div><div class='del'>-				MAX17042_AvgVCELL) * 83;</div><div class='add'>+		ret = max17042_read_reg(chip-&gt;client, MAX17042_AvgVCELL);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		val-&gt;intval = ret * 625 / 8;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_CAPACITY:</div><div class='del'>-		val-&gt;intval = max17042_read_reg(chip-&gt;client,</div><div class='del'>-				MAX17042_SOC) / 256;</div><div class='add'>+		ret = max17042_read_reg(chip-&gt;client, MAX17042_SOC);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		val-&gt;intval = ret &gt;&gt; 8;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_CHARGE_FULL:</div><div class='del'>-		val-&gt;intval = max17042_read_reg(chip-&gt;client,</div><div class='del'>-				MAX17042_RepSOC);</div><div class='del'>-		if ((val-&gt;intval / 256) &gt;= MAX17042_BATTERY_FULL)</div><div class='add'>+		ret = max17042_read_reg(chip-&gt;client, MAX17042_RepSOC);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if ((ret &gt;&gt; 8) &gt;= MAX17042_BATTERY_FULL)</div><div class='ctx'> 			val-&gt;intval = 1;</div><div class='del'>-		else if (val-&gt;intval &gt;= 0)</div><div class='add'>+		else if (ret &gt;= 0)</div><div class='ctx'> 			val-&gt;intval = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_TEMP:</div><div class='del'>-		val-&gt;intval = max17042_read_reg(chip-&gt;client,</div><div class='del'>-				MAX17042_TEMP);</div><div class='add'>+		ret = max17042_read_reg(chip-&gt;client, MAX17042_TEMP);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		val-&gt;intval = ret;</div><div class='ctx'> 		/* The value is signed. */</div><div class='ctx'> 		if (val-&gt;intval &amp; 0x8000) {</div><div class='ctx'> 			val-&gt;intval = (0x7fff &amp; ~val-&gt;intval) + 1;</div><div class='hunk'>@@ -145,24 +169,30 @@ static int max17042_get_property(struct power_supply *psy,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_CURRENT_NOW:</div><div class='ctx'> 		if (chip-&gt;pdata-&gt;enable_current_sense) {</div><div class='del'>-			val-&gt;intval = max17042_read_reg(chip-&gt;client,</div><div class='del'>-					MAX17042_Current);</div><div class='add'>+			ret = max17042_read_reg(chip-&gt;client, MAX17042_Current);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+</div><div class='add'>+			val-&gt;intval = ret;</div><div class='ctx'> 			if (val-&gt;intval &amp; 0x8000) {</div><div class='ctx'> 				/* Negative */</div><div class='ctx'> 				val-&gt;intval = ~val-&gt;intval &amp; 0x7fff;</div><div class='ctx'> 				val-&gt;intval++;</div><div class='ctx'> 				val-&gt;intval *= -1;</div><div class='ctx'> 			}</div><div class='del'>-			val-&gt;intval &gt;&gt;= 4;</div><div class='del'>-			val-&gt;intval *= 1000000 * 25 / chip-&gt;pdata-&gt;r_sns;</div><div class='add'>+			val-&gt;intval *= 1562500 / chip-&gt;pdata-&gt;r_sns;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case POWER_SUPPLY_PROP_CURRENT_AVG:</div><div class='ctx'> 		if (chip-&gt;pdata-&gt;enable_current_sense) {</div><div class='del'>-			val-&gt;intval = max17042_read_reg(chip-&gt;client,</div><div class='del'>-					MAX17042_AvgCurrent);</div><div class='add'>+			ret = max17042_read_reg(chip-&gt;client,</div><div class='add'>+						MAX17042_AvgCurrent);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+</div><div class='add'>+			val-&gt;intval = ret;</div><div class='ctx'> 			if (val-&gt;intval &amp; 0x8000) {</div><div class='ctx'> 				/* Negative */</div><div class='ctx'> 				val-&gt;intval = ~val-&gt;intval &amp; 0x7fff;</div><div class='hunk'>@@ -210,6 +240,9 @@ static int __devinit max17042_probe(struct i2c_client *client,</div><div class='ctx'> 	if (!chip-&gt;pdata-&gt;enable_current_sense)</div><div class='ctx'> 		chip-&gt;battery.num_properties -= 2;</div><div class='ctx'> </div><div class='add'>+	if (chip-&gt;pdata-&gt;r_sns == 0)</div><div class='add'>+		chip-&gt;pdata-&gt;r_sns = MAX17042_DEFAULT_SNS_RESISTOR;</div><div class='add'>+</div><div class='ctx'> 	ret = power_supply_register(&amp;client-&gt;dev, &amp;chip-&gt;battery);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;client-&gt;dev, "failed: power supply register\n");</div><div class='hunk'>@@ -226,9 +259,6 @@ static int __devinit max17042_probe(struct i2c_client *client,</div><div class='ctx'> 		max17042_write_reg(client, MAX17042_CGAIN, 0x0000);</div><div class='ctx'> 		max17042_write_reg(client, MAX17042_MiscCFG, 0x0003);</div><div class='ctx'> 		max17042_write_reg(client, MAX17042_LearnCFG, 0x0007);</div><div class='del'>-	} else {</div><div class='del'>-		if (chip-&gt;pdata-&gt;r_sns == 0)</div><div class='del'>-			chip-&gt;pdata-&gt;r_sns = MAX17042_DEFAULT_SNS_RESISTOR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/power/max8903_charger.c b/drivers/power/max8903_charger.c<br/>index 2595145f3bff..3e23f43e98af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/max8903_charger.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/max8903_charger.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/max8903_charger.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/max8903_charger.c</a></div><div class='hunk'>@@ -374,19 +374,9 @@ static struct platform_driver max8903_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init max8903_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;max8903_driver);</div><div class='del'>-}</div><div class='del'>-module_init(max8903_init);</div><div class='del'>-</div><div class='del'>-static void __exit max8903_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;max8903_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(max8903_exit);</div><div class='add'>+module_platform_driver(max8903_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("MAX8903 Charger Driver");</div><div class='ctx'> MODULE_AUTHOR("MyungJoo Ham &lt;myungjoo.ham@samsung.com&gt;");</div><div class='del'>-MODULE_ALIAS("max8903-charger");</div><div class='add'>+MODULE_ALIAS("platform:max8903-charger");</div><div class='head'>diff --git a/drivers/power/max8925_power.c b/drivers/power/max8925_power.c<br/>index a70e16d3a3dc..daa333bd7ebb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/max8925_power.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/max8925_power.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/max8925_power.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/max8925_power.c</a></div><div class='hunk'>@@ -78,6 +78,8 @@ struct max8925_power_info {</div><div class='ctx'> 	unsigned		batt_detect:1;	/* detecing MB by ID pin */</div><div class='ctx'> 	unsigned		topoff_threshold:2;</div><div class='ctx'> 	unsigned		fast_charge:3;</div><div class='add'>+	unsigned		no_temp_support:1;</div><div class='add'>+	unsigned		no_insert_detect:1;</div><div class='ctx'> </div><div class='ctx'> 	int (*set_charger) (int);</div><div class='ctx'> };</div><div class='hunk'>@@ -116,17 +118,7 @@ static irqreturn_t max8925_charger_handler(int irq, void *data)</div><div class='ctx'> 	case MAX8925_IRQ_VCHG_DC_F:</div><div class='ctx'> 		info-&gt;ac_online = 0;</div><div class='ctx'> 		__set_charger(info, 0);</div><div class='del'>-		dev_dbg(chip-&gt;dev, "Adapter is removal\n");</div><div class='del'>-		break;</div><div class='del'>-	case MAX8925_IRQ_VCHG_USB_R:</div><div class='del'>-		info-&gt;usb_online = 1;</div><div class='del'>-		__set_charger(info, 1);</div><div class='del'>-		dev_dbg(chip-&gt;dev, "USB inserted\n");</div><div class='del'>-		break;</div><div class='del'>-	case MAX8925_IRQ_VCHG_USB_F:</div><div class='del'>-		info-&gt;usb_online = 0;</div><div class='del'>-		__set_charger(info, 0);</div><div class='del'>-		dev_dbg(chip-&gt;dev, "USB is removal\n");</div><div class='add'>+		dev_dbg(chip-&gt;dev, "Adapter removed\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MAX8925_IRQ_VCHG_THM_OK_F:</div><div class='ctx'> 		/* Battery is not ready yet */</div><div class='hunk'>@@ -168,27 +160,33 @@ static irqreturn_t max8925_charger_handler(int irq, void *data)</div><div class='ctx'> static int start_measure(struct max8925_power_info *info, int type)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf[2] = {0, 0};</div><div class='add'>+	int meas_cmd;</div><div class='ctx'> 	int meas_reg = 0, ret;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case MEASURE_VCHG:</div><div class='add'>+		meas_cmd = MAX8925_CMD_VCHG;</div><div class='ctx'> 		meas_reg = MAX8925_ADC_VCHG;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MEASURE_VBBATT:</div><div class='add'>+		meas_cmd = MAX8925_CMD_VBBATT;</div><div class='ctx'> 		meas_reg = MAX8925_ADC_VBBATT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MEASURE_VMBATT:</div><div class='add'>+		meas_cmd = MAX8925_CMD_VMBATT;</div><div class='ctx'> 		meas_reg = MAX8925_ADC_VMBATT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MEASURE_ISNS:</div><div class='add'>+		meas_cmd = MAX8925_CMD_ISNS;</div><div class='ctx'> 		meas_reg = MAX8925_ADC_ISNS;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	max8925_reg_write(info-&gt;adc, meas_cmd, 0);</div><div class='ctx'> 	max8925_bulk_read(info-&gt;adc, meas_reg, 2, buf);</div><div class='del'>-	ret = (buf[0] &lt;&lt; 4) | (buf[1] &gt;&gt; 4);</div><div class='add'>+	ret = ((buf[0]&lt;&lt;8) | buf[1]) &gt;&gt; 4;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -208,7 +206,7 @@ static int max8925_ac_get_prop(struct power_supply *psy,</div><div class='ctx'> 		if (info-&gt;ac_online) {</div><div class='ctx'> 			ret = start_measure(info, MEASURE_VCHG);</div><div class='ctx'> 			if (ret &gt;= 0) {</div><div class='del'>-				val-&gt;intval = ret &lt;&lt; 1;	/* unit is mV */</div><div class='add'>+				val-&gt;intval = ret * 2000;	/* unit is uV */</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -242,7 +240,7 @@ static int max8925_usb_get_prop(struct power_supply *psy,</div><div class='ctx'> 		if (info-&gt;usb_online) {</div><div class='ctx'> 			ret = start_measure(info, MEASURE_VCHG);</div><div class='ctx'> 			if (ret &gt;= 0) {</div><div class='del'>-				val-&gt;intval = ret &lt;&lt; 1;	/* unit is mV */</div><div class='add'>+				val-&gt;intval = ret * 2000;	/* unit is uV */</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -266,7 +264,6 @@ static int max8925_bat_get_prop(struct power_supply *psy,</div><div class='ctx'> 				union power_supply_propval *val)</div><div class='ctx'> {</div><div class='ctx'> 	struct max8925_power_info *info = dev_get_drvdata(psy-&gt;dev-&gt;parent);</div><div class='del'>-	long long int tmp = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (psp) {</div><div class='hunk'>@@ -277,7 +274,7 @@ static int max8925_bat_get_prop(struct power_supply *psy,</div><div class='ctx'> 		if (info-&gt;bat_online) {</div><div class='ctx'> 			ret = start_measure(info, MEASURE_VMBATT);</div><div class='ctx'> 			if (ret &gt;= 0) {</div><div class='del'>-				val-&gt;intval = ret &lt;&lt; 1;	/* unit is mV */</div><div class='add'>+				val-&gt;intval = ret * 2000;	/* unit is uV */</div><div class='ctx'> 				ret = 0;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -288,8 +285,8 @@ static int max8925_bat_get_prop(struct power_supply *psy,</div><div class='ctx'> 		if (info-&gt;bat_online) {</div><div class='ctx'> 			ret = start_measure(info, MEASURE_ISNS);</div><div class='ctx'> 			if (ret &gt;= 0) {</div><div class='del'>-				tmp = (long long int)ret * 6250 / 4096 - 3125;</div><div class='del'>-				ret = (int)tmp;</div><div class='add'>+				/* assume r_sns is 0.02 */</div><div class='add'>+				ret = ((ret * 6250) - 3125) /* uA */;</div><div class='ctx'> 				val-&gt;intval = 0;</div><div class='ctx'> 				if (ret &gt; 0)</div><div class='ctx'> 					val-&gt;intval = ret; /* unit is mA */</div><div class='hunk'>@@ -365,13 +362,14 @@ static __devinit int max8925_init_charger(struct max8925_chip *chip,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_OVP, "ac-ovp");</div><div class='del'>-	REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_F, "ac-remove");</div><div class='del'>-	REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_R, "ac-insert");</div><div class='del'>-	REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_OVP, "usb-ovp");</div><div class='del'>-	REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_F, "usb-remove");</div><div class='del'>-	REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_R, "usb-insert");</div><div class='del'>-	REQUEST_IRQ(MAX8925_IRQ_VCHG_THM_OK_R, "batt-temp-in-range");</div><div class='del'>-	REQUEST_IRQ(MAX8925_IRQ_VCHG_THM_OK_F, "batt-temp-out-range");</div><div class='add'>+	if (!info-&gt;no_insert_detect) {</div><div class='add'>+		REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_F, "ac-remove");</div><div class='add'>+		REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_R, "ac-insert");</div><div class='add'>+	}</div><div class='add'>+	if (!info-&gt;no_temp_support) {</div><div class='add'>+		REQUEST_IRQ(MAX8925_IRQ_VCHG_THM_OK_R, "batt-temp-in-range");</div><div class='add'>+		REQUEST_IRQ(MAX8925_IRQ_VCHG_THM_OK_F, "batt-temp-out-range");</div><div class='add'>+	}</div><div class='ctx'> 	REQUEST_IRQ(MAX8925_IRQ_VCHG_SYSLOW_F, "vsys-high");</div><div class='ctx'> 	REQUEST_IRQ(MAX8925_IRQ_VCHG_SYSLOW_R, "vsys-low");</div><div class='ctx'> 	REQUEST_IRQ(MAX8925_IRQ_VCHG_RST, "charger-reset");</div><div class='hunk'>@@ -379,9 +377,15 @@ static __devinit int max8925_init_charger(struct max8925_chip *chip,</div><div class='ctx'> 	REQUEST_IRQ(MAX8925_IRQ_VCHG_TOPOFF, "charger-topoff");</div><div class='ctx'> 	REQUEST_IRQ(MAX8925_IRQ_VCHG_TMR_FAULT, "charger-timer-expire");</div><div class='ctx'> </div><div class='del'>-	info-&gt;ac_online = 0;</div><div class='ctx'> 	info-&gt;usb_online = 0;</div><div class='ctx'> 	info-&gt;bat_online = 0;</div><div class='add'>+</div><div class='add'>+	/* check for power - can miss interrupt at boot time */</div><div class='add'>+	if (start_measure(info, MEASURE_VCHG) * 2000 &gt; 500000)</div><div class='add'>+		info-&gt;ac_online = 1;</div><div class='add'>+	else</div><div class='add'>+		info-&gt;ac_online = 0;</div><div class='add'>+</div><div class='ctx'> 	ret = max8925_reg_read(info-&gt;gpm, MAX8925_CHG_STATUS);</div><div class='ctx'> 	if (ret &gt;= 0) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -449,6 +453,8 @@ static __devinit int max8925_power_probe(struct platform_device *pdev)</div><div class='ctx'> 	info-&gt;ac.properties = max8925_ac_props;</div><div class='ctx'> 	info-&gt;ac.num_properties = ARRAY_SIZE(max8925_ac_props);</div><div class='ctx'> 	info-&gt;ac.get_property = max8925_ac_get_prop;</div><div class='add'>+	info-&gt;ac.supplied_to = pdata-&gt;supplied_to;</div><div class='add'>+	info-&gt;ac.num_supplicants = pdata-&gt;num_supplicants;</div><div class='ctx'> 	ret = power_supply_register(&amp;pdev-&gt;dev, &amp;info-&gt;ac);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -459,6 +465,9 @@ static __devinit int max8925_power_probe(struct platform_device *pdev)</div><div class='ctx'> 	info-&gt;usb.properties = max8925_usb_props;</div><div class='ctx'> 	info-&gt;usb.num_properties = ARRAY_SIZE(max8925_usb_props);</div><div class='ctx'> 	info-&gt;usb.get_property = max8925_usb_get_prop;</div><div class='add'>+	info-&gt;usb.supplied_to = pdata-&gt;supplied_to;</div><div class='add'>+	info-&gt;usb.num_supplicants = pdata-&gt;num_supplicants;</div><div class='add'>+</div><div class='ctx'> 	ret = power_supply_register(&amp;pdev-&gt;dev, &amp;info-&gt;usb);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_usb;</div><div class='hunk'>@@ -478,6 +487,8 @@ static __devinit int max8925_power_probe(struct platform_device *pdev)</div><div class='ctx'> 	info-&gt;topoff_threshold = pdata-&gt;topoff_threshold;</div><div class='ctx'> 	info-&gt;fast_charge = pdata-&gt;fast_charge;</div><div class='ctx'> 	info-&gt;set_charger = pdata-&gt;set_charger;</div><div class='add'>+	info-&gt;no_temp_support = pdata-&gt;no_temp_support;</div><div class='add'>+	info-&gt;no_insert_detect = pdata-&gt;no_insert_detect;</div><div class='ctx'> </div><div class='ctx'> 	max8925_init_charger(chip, info);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -512,17 +523,7 @@ static struct platform_driver max8925_power_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init max8925_power_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;max8925_power_driver);</div><div class='del'>-}</div><div class='del'>-module_init(max8925_power_init);</div><div class='del'>-</div><div class='del'>-static void __exit max8925_power_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;max8925_power_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(max8925_power_exit);</div><div class='add'>+module_platform_driver(max8925_power_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("Power supply driver for MAX8925");</div><div class='head'>diff --git a/drivers/power/max8997_charger.c b/drivers/power/max8997_charger.c<br/>index a23317d75c5a..6e88c5d026b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/max8997_charger.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/max8997_charger.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/max8997_charger.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/max8997_charger.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/err.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='hunk'>@@ -98,7 +97,7 @@ static __devinit int max8997_battery_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (pdata-&gt;eoc_mA) {</div><div class='del'>-		u8 val = (pdata-&gt;eoc_mA - 50) / 10;</div><div class='add'>+		int val = (pdata-&gt;eoc_mA - 50) / 10;</div><div class='ctx'> 		if (val &lt; 0)</div><div class='ctx'> 			val = 0;</div><div class='ctx'> 		if (val &gt; 0xf)</div><div class='hunk'>@@ -179,6 +178,7 @@ static int __devexit max8997_battery_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> static const struct platform_device_id max8997_battery_id[] = {</div><div class='ctx'> 	{ "max8997-battery", 0 },</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver max8997_battery_driver = {</div><div class='head'>diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c<br/>index 93e3bb47a3a8..9b3f2bf56e70 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/max8998_charger.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/max8998_charger.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/max8998_charger.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/max8998_charger.c</a></div><div class='hunk'>@@ -154,6 +154,7 @@ static __devinit int max8998_battery_probe(struct platform_device *pdev)</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		dev_dbg(max8998-&gt;dev,</div><div class='ctx'> 			"Full Timeout not set: leave it unchanged.\n");</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_err(max8998-&gt;dev, "Invalid Full Timeout value\n");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='hunk'>@@ -190,6 +191,7 @@ static int __devexit max8998_battery_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> static const struct platform_device_id max8998_battery_id[] = {</div><div class='ctx'> 	{ "max8998-battery", TYPE_MAX8998 },</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver max8998_battery_driver = {</div><div class='hunk'>@@ -202,17 +204,7 @@ static struct platform_driver max8998_battery_driver = {</div><div class='ctx'> 	.id_table = max8998_battery_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init max8998_battery_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;max8998_battery_driver);</div><div class='del'>-}</div><div class='del'>-module_init(max8998_battery_init);</div><div class='del'>-</div><div class='del'>-static void __exit max8998_battery_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;max8998_battery_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(max8998_battery_cleanup);</div><div class='add'>+module_platform_driver(max8998_battery_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("MAXIM 8998 battery control driver");</div><div class='ctx'> MODULE_AUTHOR("MyungJoo Ham &lt;myungjoo.ham@samsung.com&gt;");</div><div class='head'>diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c<br/>index 0b0ff3a936a6..7385092f9bc8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/olpc_battery.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/olpc_battery.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/olpc_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/olpc_battery.c</a></div><div class='hunk'>@@ -519,29 +519,35 @@ static struct device_attribute olpc_bat_error = {</div><div class='ctx'>  *		Initialisation</div><div class='ctx'>  *********************************************************************/</div><div class='ctx'> </div><div class='del'>-static struct platform_device *bat_pdev;</div><div class='del'>-</div><div class='ctx'> static struct power_supply olpc_bat = {</div><div class='add'>+	.name = "olpc-battery",</div><div class='ctx'> 	.get_property = olpc_bat_get_property,</div><div class='ctx'> 	.use_for_apm = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void olpc_battery_trigger_uevent(unsigned long cause)</div><div class='add'>+static int olpc_battery_suspend(struct platform_device *pdev,</div><div class='add'>+				pm_message_t state)</div><div class='ctx'> {</div><div class='del'>-	if (cause &amp; EC_SCI_SRC_ACPWR)</div><div class='del'>-		kobject_uevent(&amp;olpc_ac.dev-&gt;kobj, KOBJ_CHANGE);</div><div class='del'>-	if (cause &amp; (EC_SCI_SRC_BATERR|EC_SCI_SRC_BATSOC|EC_SCI_SRC_BATTERY))</div><div class='del'>-		kobject_uevent(&amp;olpc_bat.dev-&gt;kobj, KOBJ_CHANGE);</div><div class='add'>+	if (device_may_wakeup(olpc_ac.dev))</div><div class='add'>+		olpc_ec_wakeup_set(EC_SCI_SRC_ACPWR);</div><div class='add'>+	else</div><div class='add'>+		olpc_ec_wakeup_clear(EC_SCI_SRC_ACPWR);</div><div class='add'>+</div><div class='add'>+	if (device_may_wakeup(olpc_bat.dev))</div><div class='add'>+		olpc_ec_wakeup_set(EC_SCI_SRC_BATTERY | EC_SCI_SRC_BATSOC</div><div class='add'>+				   | EC_SCI_SRC_BATERR);</div><div class='add'>+	else</div><div class='add'>+		olpc_ec_wakeup_clear(EC_SCI_SRC_BATTERY | EC_SCI_SRC_BATSOC</div><div class='add'>+				     | EC_SCI_SRC_BATERR);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init olpc_bat_init(void)</div><div class='add'>+static int __devinit olpc_battery_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> 	uint8_t status;</div><div class='ctx'> </div><div class='del'>-	if (!olpc_platform_info.ecver)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We've seen a number of EC protocol changes; this driver requires</div><div class='ctx'> 	 * the latest EC protocol, supported by 0x44 and above.</div><div class='hunk'>@@ -558,15 +564,10 @@ static int __init olpc_bat_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Ignore the status. It doesn't actually matter */</div><div class='ctx'> </div><div class='del'>-	bat_pdev = platform_device_register_simple("olpc-battery", 0, NULL, 0);</div><div class='del'>-	if (IS_ERR(bat_pdev))</div><div class='del'>-		return PTR_ERR(bat_pdev);</div><div class='del'>-</div><div class='del'>-	ret = power_supply_register(&amp;bat_pdev-&gt;dev, &amp;olpc_ac);</div><div class='add'>+	ret = power_supply_register(&amp;pdev-&gt;dev, &amp;olpc_ac);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto ac_failed;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	olpc_bat.name = bat_pdev-&gt;name;</div><div class='ctx'> 	if (olpc_board_at_least(olpc_board_pre(0xd0))) { /* XO-1.5 */</div><div class='ctx'> 		olpc_bat.properties = olpc_xo15_bat_props;</div><div class='ctx'> 		olpc_bat.num_properties = ARRAY_SIZE(olpc_xo15_bat_props);</div><div class='hunk'>@@ -575,7 +576,7 @@ static int __init olpc_bat_init(void)</div><div class='ctx'> 		olpc_bat.num_properties = ARRAY_SIZE(olpc_xo1_bat_props);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = power_supply_register(&amp;bat_pdev-&gt;dev, &amp;olpc_bat);</div><div class='add'>+	ret = power_supply_register(&amp;pdev-&gt;dev, &amp;olpc_bat);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto battery_failed;</div><div class='ctx'> </div><div class='hunk'>@@ -587,7 +588,12 @@ static int __init olpc_bat_init(void)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error_failed;</div><div class='ctx'> </div><div class='del'>-	goto success;</div><div class='add'>+	if (olpc_ec_wakeup_available()) {</div><div class='add'>+		device_set_wakeup_capable(olpc_ac.dev, true);</div><div class='add'>+		device_set_wakeup_capable(olpc_bat.dev, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> error_failed:</div><div class='ctx'> 	device_remove_bin_file(olpc_bat.dev, &amp;olpc_bat_eeprom);</div><div class='hunk'>@@ -595,23 +601,36 @@ eeprom_failed:</div><div class='ctx'> 	power_supply_unregister(&amp;olpc_bat);</div><div class='ctx'> battery_failed:</div><div class='ctx'> 	power_supply_unregister(&amp;olpc_ac);</div><div class='del'>-ac_failed:</div><div class='del'>-	platform_device_unregister(bat_pdev);</div><div class='del'>-success:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit olpc_bat_exit(void)</div><div class='add'>+static int __devexit olpc_battery_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	device_remove_file(olpc_bat.dev, &amp;olpc_bat_error);</div><div class='ctx'> 	device_remove_bin_file(olpc_bat.dev, &amp;olpc_bat_eeprom);</div><div class='ctx'> 	power_supply_unregister(&amp;olpc_bat);</div><div class='ctx'> 	power_supply_unregister(&amp;olpc_ac);</div><div class='del'>-	platform_device_unregister(bat_pdev);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(olpc_bat_init);</div><div class='del'>-module_exit(olpc_bat_exit);</div><div class='add'>+static const struct of_device_id olpc_battery_ids[] __devinitconst = {</div><div class='add'>+	{ .compatible = "olpc,xo1-battery" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, olpc_battery_ids);</div><div class='add'>+</div><div class='add'>+static struct platform_driver olpc_battery_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "olpc-battery",</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+		.of_match_table = olpc_battery_ids,</div><div class='add'>+	},</div><div class='add'>+	.probe = olpc_battery_probe,</div><div class='add'>+	.remove = __devexit_p(olpc_battery_remove),</div><div class='add'>+	.suspend = olpc_battery_suspend,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(olpc_battery_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("David Woodhouse &lt;dwmw2@infradead.org&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c<br/>index 4fa52e1781a2..3d1e9efb6f53 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/pcf50633-charger.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/pcf50633-charger.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/pcf50633-charger.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/pcf50633-charger.c</a></div><div class='hunk'>@@ -474,17 +474,7 @@ static struct platform_driver pcf50633_mbc_driver = {</div><div class='ctx'> 	.remove = __devexit_p(pcf50633_mbc_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pcf50633_mbc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pcf50633_mbc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pcf50633_mbc_init);</div><div class='del'>-</div><div class='del'>-static void __exit pcf50633_mbc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pcf50633_mbc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(pcf50633_mbc_exit);</div><div class='add'>+module_platform_driver(pcf50633_mbc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Balaji Rao &lt;balajirrao@openmoko.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("PCF50633 mbc driver");</div><div class='head'>diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c<br/>index 69f8aa3a6a4b..fd49689738af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/pda_power.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/pda_power.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/pda_power.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/pda_power.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.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='add'>+#include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/power_supply.h&gt;</div><div class='ctx'> #include &lt;linux/pda_power.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/consumer.h&gt;</div><div class='hunk'>@@ -40,7 +41,9 @@ static int polling;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_USB_OTG_UTILS</div><div class='ctx'> static struct otg_transceiver *transceiver;</div><div class='add'>+static struct notifier_block otg_nb;</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> static struct regulator *ac_draw;</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -222,7 +225,42 @@ static void polling_timer_func(unsigned long unused)</div><div class='ctx'> #ifdef CONFIG_USB_OTG_UTILS</div><div class='ctx'> static int otg_is_usb_online(void)</div><div class='ctx'> {</div><div class='del'>-	return (transceiver-&gt;state == OTG_STATE_B_PERIPHERAL);</div><div class='add'>+	return (transceiver-&gt;last_event == USB_EVENT_VBUS ||</div><div class='add'>+		transceiver-&gt;last_event == USB_EVENT_ENUMERATED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int otg_is_ac_online(void)</div><div class='add'>+{</div><div class='add'>+	return (transceiver-&gt;last_event == USB_EVENT_CHARGER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int otg_handle_notification(struct notifier_block *nb,</div><div class='add'>+		unsigned long event, void *unused)</div><div class='add'>+{</div><div class='add'>+	switch (event) {</div><div class='add'>+	case USB_EVENT_CHARGER:</div><div class='add'>+		ac_status = PDA_PSY_TO_CHANGE;</div><div class='add'>+		break;</div><div class='add'>+	case USB_EVENT_VBUS:</div><div class='add'>+	case USB_EVENT_ENUMERATED:</div><div class='add'>+		usb_status = PDA_PSY_TO_CHANGE;</div><div class='add'>+		break;</div><div class='add'>+	case USB_EVENT_NONE:</div><div class='add'>+		ac_status = PDA_PSY_TO_CHANGE;</div><div class='add'>+		usb_status = PDA_PSY_TO_CHANGE;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return NOTIFY_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Wait a bit before reading ac/usb line status and setting charger,</div><div class='add'>+	 * because ac/usb status readings may lag from irq.</div><div class='add'>+	 */</div><div class='add'>+	mod_timer(&amp;charger_timer,</div><div class='add'>+		  jiffies + msecs_to_jiffies(pdata-&gt;wait_for_status));</div><div class='add'>+</div><div class='add'>+	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -282,6 +320,16 @@ static int pda_power_probe(struct platform_device *pdev)</div><div class='ctx'> 		ret = PTR_ERR(ac_draw);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_USB_OTG_UTILS</div><div class='add'>+	transceiver = otg_get_transceiver();</div><div class='add'>+	if (transceiver &amp;&amp; !pdata-&gt;is_usb_online) {</div><div class='add'>+		pdata-&gt;is_usb_online = otg_is_usb_online;</div><div class='add'>+	}</div><div class='add'>+	if (transceiver &amp;&amp; !pdata-&gt;is_ac_online) {</div><div class='add'>+		pdata-&gt;is_ac_online = otg_is_ac_online;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (pdata-&gt;is_ac_online) {</div><div class='ctx'> 		ret = power_supply_register(&amp;pdev-&gt;dev, &amp;pda_psy_ac);</div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -303,13 +351,6 @@ static int pda_power_probe(struct platform_device *pdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_USB_OTG_UTILS</div><div class='del'>-	transceiver = otg_get_transceiver();</div><div class='del'>-	if (transceiver &amp;&amp; !pdata-&gt;is_usb_online) {</div><div class='del'>-		pdata-&gt;is_usb_online = otg_is_usb_online;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (pdata-&gt;is_usb_online) {</div><div class='ctx'> 		ret = power_supply_register(&amp;pdev-&gt;dev, &amp;pda_psy_usb);</div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -331,6 +372,18 @@ static int pda_power_probe(struct platform_device *pdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_USB_OTG_UTILS</div><div class='add'>+	if (transceiver &amp;&amp; pdata-&gt;use_otg_notifier) {</div><div class='add'>+		otg_nb.notifier_call = otg_handle_notification;</div><div class='add'>+		ret = otg_register_notifier(transceiver, &amp;otg_nb);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev, "failure to register otg notifier\n");</div><div class='add'>+			goto otg_reg_notifier_failed;</div><div class='add'>+		}</div><div class='add'>+		polling = 0;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (polling) {</div><div class='ctx'> 		dev_dbg(dev, "will poll for status\n");</div><div class='ctx'> 		setup_timer(&amp;polling_timer, polling_timer_func, 0);</div><div class='hunk'>@@ -343,6 +396,11 @@ static int pda_power_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_USB_OTG_UTILS</div><div class='add'>+otg_reg_notifier_failed:</div><div class='add'>+	if (pdata-&gt;is_usb_online &amp;&amp; usb_irq)</div><div class='add'>+		free_irq(usb_irq-&gt;start, &amp;pda_psy_usb);</div><div class='add'>+#endif</div><div class='ctx'> usb_irq_failed:</div><div class='ctx'> 	if (pdata-&gt;is_usb_online)</div><div class='ctx'> 		power_supply_unregister(&amp;pda_psy_usb);</div><div class='hunk'>@@ -440,8 +498,6 @@ static int pda_power_resume(struct platform_device *pdev)</div><div class='ctx'> #define pda_power_resume NULL</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='del'>-MODULE_ALIAS("platform:pda-power");</div><div class='del'>-</div><div class='ctx'> static struct platform_driver pda_power_pdrv = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "pda-power",</div><div class='hunk'>@@ -452,17 +508,8 @@ static struct platform_driver pda_power_pdrv = {</div><div class='ctx'> 	.resume = pda_power_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pda_power_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pda_power_pdrv);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(pda_power_pdrv);</div><div class='ctx'> </div><div class='del'>-static void __exit pda_power_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pda_power_pdrv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(pda_power_init);</div><div class='del'>-module_exit(pda_power_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Anton Vorontsov &lt;cbou@mail.ru&gt;");</div><div class='add'>+MODULE_ALIAS("platform:pda-power");</div><div class='head'>diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c<br/>index 329b46b2327d..6ad612726785 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/power_supply_core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/power_supply_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/power_supply_core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/power_supply_core.c</a></div><div class='hunk'>@@ -98,7 +98,9 @@ static int __power_supply_is_system_supplied(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	union power_supply_propval ret = {0,};</div><div class='ctx'> 	struct power_supply *psy = dev_get_drvdata(dev);</div><div class='add'>+	unsigned int *count = data;</div><div class='ctx'> </div><div class='add'>+	(*count)++;</div><div class='ctx'> 	if (psy-&gt;type != POWER_SUPPLY_TYPE_BATTERY) {</div><div class='ctx'> 		if (psy-&gt;get_property(psy, POWER_SUPPLY_PROP_ONLINE, &amp;ret))</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -111,10 +113,18 @@ static int __power_supply_is_system_supplied(struct device *dev, void *data)</div><div class='ctx'> int power_supply_is_system_supplied(void)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='add'>+	unsigned int count = 0;</div><div class='ctx'> </div><div class='del'>-	error = class_for_each_device(power_supply_class, NULL, NULL,</div><div class='add'>+	error = class_for_each_device(power_supply_class, NULL, &amp;count,</div><div class='ctx'> 				      __power_supply_is_system_supplied);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If no power class device was found at all, most probably we are</div><div class='add'>+	 * running on a desktop system, so assume we are on mains power.</div><div class='add'>+	 */</div><div class='add'>+	if (count == 0)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(power_supply_is_system_supplied);</div><div class='hunk'>@@ -147,6 +157,12 @@ struct power_supply *power_supply_get_by_name(char *name)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(power_supply_get_by_name);</div><div class='ctx'> </div><div class='add'>+int power_supply_powers(struct power_supply *psy, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return sysfs_create_link(&amp;psy-&gt;dev-&gt;kobj, &amp;dev-&gt;kobj, "powers");</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(power_supply_powers);</div><div class='add'>+</div><div class='ctx'> static void power_supply_dev_release(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	pr_debug("device: '%s': %s\n", dev_name(dev), __func__);</div><div class='hunk'>@@ -202,6 +218,7 @@ EXPORT_SYMBOL_GPL(power_supply_register);</div><div class='ctx'> void power_supply_unregister(struct power_supply *psy)</div><div class='ctx'> {</div><div class='ctx'> 	cancel_work_sync(&amp;psy-&gt;changed_work);</div><div class='add'>+	sysfs_remove_link(&amp;psy-&gt;dev-&gt;kobj, "powers");</div><div class='ctx'> 	power_supply_remove_triggers(psy);</div><div class='ctx'> 	device_unregister(psy-&gt;dev);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c<br/>index e15d4c9d3988..b52b57ca3084 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/power_supply_sysfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/power_supply_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/power_supply_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/power_supply_sysfs.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@ static ssize_t power_supply_show_property(struct device *dev,</div><div class='ctx'> 					  struct device_attribute *attr,</div><div class='ctx'> 					  char *buf) {</div><div class='ctx'> 	static char *type_text[] = {</div><div class='del'>-		"Battery", "UPS", "Mains", "USB",</div><div class='add'>+		"Unknown", "Battery", "UPS", "Mains", "USB",</div><div class='ctx'> 		"USB_DCP", "USB_CDP", "USB_ACA"</div><div class='ctx'> 	};</div><div class='ctx'> 	static char *status_text[] = {</div><div class='hunk'>@@ -63,6 +63,9 @@ static ssize_t power_supply_show_property(struct device *dev,</div><div class='ctx'> 	static char *capacity_level_text[] = {</div><div class='ctx'> 		"Unknown", "Critical", "Low", "Normal", "High", "Full"</div><div class='ctx'> 	};</div><div class='add'>+	static char *scope_text[] = {</div><div class='add'>+		"Unknown", "System", "Device"</div><div class='add'>+	};</div><div class='ctx'> 	ssize_t ret = 0;</div><div class='ctx'> 	struct power_supply *psy = dev_get_drvdata(dev);</div><div class='ctx'> 	const ptrdiff_t off = attr - power_supply_attrs;</div><div class='hunk'>@@ -78,8 +81,8 @@ static ssize_t power_supply_show_property(struct device *dev,</div><div class='ctx'> 			dev_dbg(dev, "driver has no data for `%s' property\n",</div><div class='ctx'> 				attr-&gt;attr.name);</div><div class='ctx'> 		else if (ret != -ENODEV)</div><div class='del'>-			dev_err(dev, "driver failed to report `%s' property\n",</div><div class='del'>-				attr-&gt;attr.name);</div><div class='add'>+			dev_err(dev, "driver failed to report `%s' property: %zd\n",</div><div class='add'>+				attr-&gt;attr.name, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -95,6 +98,8 @@ static ssize_t power_supply_show_property(struct device *dev,</div><div class='ctx'> 		return sprintf(buf, "%s\n", capacity_level_text[value.intval]);</div><div class='ctx'> 	else if (off == POWER_SUPPLY_PROP_TYPE)</div><div class='ctx'> 		return sprintf(buf, "%s\n", type_text[value.intval]);</div><div class='add'>+	else if (off == POWER_SUPPLY_PROP_SCOPE)</div><div class='add'>+		return sprintf(buf, "%s\n", scope_text[value.intval]);</div><div class='ctx'> 	else if (off &gt;= POWER_SUPPLY_PROP_MODEL_NAME)</div><div class='ctx'> 		return sprintf(buf, "%s\n", value.strval);</div><div class='ctx'> </div><div class='hunk'>@@ -167,6 +172,7 @@ static struct device_attribute power_supply_attrs[] = {</div><div class='ctx'> 	POWER_SUPPLY_ATTR(time_to_full_now),</div><div class='ctx'> 	POWER_SUPPLY_ATTR(time_to_full_avg),</div><div class='ctx'> 	POWER_SUPPLY_ATTR(type),</div><div class='add'>+	POWER_SUPPLY_ATTR(scope),</div><div class='ctx'> 	/* Properties of type `const char *' */</div><div class='ctx'> 	POWER_SUPPLY_ATTR(model_name),</div><div class='ctx'> 	POWER_SUPPLY_ATTR(manufacturer),</div><div class='hunk'>@@ -176,13 +182,13 @@ static struct device_attribute power_supply_attrs[] = {</div><div class='ctx'> static struct attribute *</div><div class='ctx'> __power_supply_attrs[ARRAY_SIZE(power_supply_attrs) + 1];</div><div class='ctx'> </div><div class='del'>-static mode_t power_supply_attr_is_visible(struct kobject *kobj,</div><div class='add'>+static umode_t power_supply_attr_is_visible(struct kobject *kobj,</div><div class='ctx'> 					   struct attribute *attr,</div><div class='ctx'> 					   int attrno)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = container_of(kobj, struct device, kobj);</div><div class='ctx'> 	struct power_supply *psy = dev_get_drvdata(dev);</div><div class='del'>-	mode_t mode = S_IRUSR | S_IRGRP | S_IROTH;</div><div class='add'>+	umode_t mode = S_IRUSR | S_IRGRP | S_IROTH;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (attrno == POWER_SUPPLY_PROP_TYPE)</div><div class='head'>diff --git a/drivers/power/s3c_adc_battery.c b/drivers/power/s3c_adc_battery.c<br/>index d32d0d70f9ba..8b804a566756 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/s3c_adc_battery.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/s3c_adc_battery.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/s3c_adc_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/s3c_adc_battery.c</a></div><div class='hunk'>@@ -47,6 +47,22 @@ static void s3c_adc_bat_ext_power_changed(struct power_supply *psy)</div><div class='ctx'> 		msecs_to_jiffies(JITTER_DELAY));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int gather_samples(struct s3c_adc_client *client, int num, int channel)</div><div class='add'>+{</div><div class='add'>+	int value, i;</div><div class='add'>+</div><div class='add'>+	/* default to 1 if nothing is set */</div><div class='add'>+	if (num &lt; 1)</div><div class='add'>+		num = 1;</div><div class='add'>+</div><div class='add'>+	value = 0;</div><div class='add'>+	for (i = 0; i &lt; num; i++)</div><div class='add'>+		value += s3c_adc_read(client, channel);</div><div class='add'>+	value /= num;</div><div class='add'>+</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static enum power_supply_property s3c_adc_backup_bat_props[] = {</div><div class='ctx'> 	POWER_SUPPLY_PROP_VOLTAGE_NOW,</div><div class='ctx'> 	POWER_SUPPLY_PROP_VOLTAGE_MIN,</div><div class='hunk'>@@ -67,7 +83,8 @@ static int s3c_adc_backup_bat_get_property(struct power_supply *psy,</div><div class='ctx'> 	if (bat-&gt;volt_value &lt; 0 ||</div><div class='ctx'> 		jiffies_to_msecs(jiffies - bat-&gt;timestamp) &gt;</div><div class='ctx'> 			BAT_POLL_INTERVAL) {</div><div class='del'>-		bat-&gt;volt_value = s3c_adc_read(bat-&gt;client,</div><div class='add'>+		bat-&gt;volt_value = gather_samples(bat-&gt;client,</div><div class='add'>+			bat-&gt;pdata-&gt;backup_volt_samples,</div><div class='ctx'> 			bat-&gt;pdata-&gt;backup_volt_channel);</div><div class='ctx'> 		bat-&gt;volt_value *= bat-&gt;pdata-&gt;backup_volt_mult;</div><div class='ctx'> 		bat-&gt;timestamp = jiffies;</div><div class='hunk'>@@ -139,9 +156,11 @@ static int s3c_adc_bat_get_property(struct power_supply *psy,</div><div class='ctx'> 	if (bat-&gt;volt_value &lt; 0 || bat-&gt;cur_value &lt; 0 ||</div><div class='ctx'> 		jiffies_to_msecs(jiffies - bat-&gt;timestamp) &gt;</div><div class='ctx'> 			BAT_POLL_INTERVAL) {</div><div class='del'>-		bat-&gt;volt_value = s3c_adc_read(bat-&gt;client,</div><div class='add'>+		bat-&gt;volt_value = gather_samples(bat-&gt;client,</div><div class='add'>+			bat-&gt;pdata-&gt;volt_samples,</div><div class='ctx'> 			bat-&gt;pdata-&gt;volt_channel) * bat-&gt;pdata-&gt;volt_mult;</div><div class='del'>-		bat-&gt;cur_value = s3c_adc_read(bat-&gt;client,</div><div class='add'>+		bat-&gt;cur_value = gather_samples(bat-&gt;client,</div><div class='add'>+			bat-&gt;pdata-&gt;current_samples,</div><div class='ctx'> 			bat-&gt;pdata-&gt;current_channel) * bat-&gt;pdata-&gt;current_mult;</div><div class='ctx'> 		bat-&gt;timestamp = jiffies;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -421,17 +440,7 @@ static struct platform_driver s3c_adc_bat_driver = {</div><div class='ctx'> 	.resume		= s3c_adc_bat_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init s3c_adc_bat_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;s3c_adc_bat_driver);</div><div class='del'>-}</div><div class='del'>-module_init(s3c_adc_bat_init);</div><div class='del'>-</div><div class='del'>-static void __exit s3c_adc_bat_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;s3c_adc_bat_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(s3c_adc_bat_exit);</div><div class='add'>+module_platform_driver(s3c_adc_bat_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Vasily Khoruzhick &lt;anarsoul@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("iPAQ H1930/H1940/RX1950 battery controller driver");</div><div class='head'>diff --git a/drivers/power/bq20z75.c b/drivers/power/sbs-battery.c<br/>index 9c5e5beda3a8..9ff8af069da6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/bq20z75.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/bq20z75.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/sbs-battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/sbs-battery.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Gas Gauge driver for TI's BQ20Z75</div><div class='add'>+ * Gas Gauge driver for SBS Compliant Batteries</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2010, NVIDIA Corporation.</div><div class='ctx'>  *</div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/power/bq20z75.h&gt;</div><div class='add'>+#include &lt;linux/power/sbs-battery.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	REG_MANUFACTURER_DATA,</div><div class='hunk'>@@ -53,7 +53,7 @@ enum {</div><div class='ctx'> /* Battery Mode defines */</div><div class='ctx'> #define BATTERY_MODE_OFFSET		0x03</div><div class='ctx'> #define BATTERY_MODE_MASK		0x8000</div><div class='del'>-enum bq20z75_battery_mode {</div><div class='add'>+enum sbs_battery_mode {</div><div class='ctx'> 	BATTERY_MODE_AMPS,</div><div class='ctx'> 	BATTERY_MODE_WATTS</div><div class='ctx'> };</div><div class='hunk'>@@ -67,62 +67,56 @@ enum bq20z75_battery_mode {</div><div class='ctx'> #define BATTERY_FULL_CHARGED		0x20</div><div class='ctx'> #define BATTERY_FULL_DISCHARGED		0x10</div><div class='ctx'> </div><div class='del'>-#define BQ20Z75_DATA(_psp, _addr, _min_value, _max_value) { \</div><div class='add'>+#define SBS_DATA(_psp, _addr, _min_value, _max_value) { \</div><div class='ctx'> 	.psp = _psp, \</div><div class='ctx'> 	.addr = _addr, \</div><div class='ctx'> 	.min_value = _min_value, \</div><div class='ctx'> 	.max_value = _max_value, \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct bq20z75_device_data {</div><div class='add'>+static const struct chip_data {</div><div class='ctx'> 	enum power_supply_property psp;</div><div class='ctx'> 	u8 addr;</div><div class='ctx'> 	int min_value;</div><div class='ctx'> 	int max_value;</div><div class='del'>-} bq20z75_data[] = {</div><div class='add'>+} sbs_data[] = {</div><div class='ctx'> 	[REG_MANUFACTURER_DATA] =</div><div class='del'>-		BQ20Z75_DATA(POWER_SUPPLY_PROP_PRESENT, 0x00, 0, 65535),</div><div class='add'>+		SBS_DATA(POWER_SUPPLY_PROP_PRESENT, 0x00, 0, 65535),</div><div class='ctx'> 	[REG_TEMPERATURE] =</div><div class='del'>-		BQ20Z75_DATA(POWER_SUPPLY_PROP_TEMP, 0x08, 0, 65535),</div><div class='add'>+		SBS_DATA(POWER_SUPPLY_PROP_TEMP, 0x08, 0, 65535),</div><div class='ctx'> 	[REG_VOLTAGE] =</div><div class='del'>-		BQ20Z75_DATA(POWER_SUPPLY_PROP_VOLTAGE_NOW, 0x09, 0, 20000),</div><div class='add'>+		SBS_DATA(POWER_SUPPLY_PROP_VOLTAGE_NOW, 0x09, 0, 20000),</div><div class='ctx'> 	[REG_CURRENT] =</div><div class='del'>-		BQ20Z75_DATA(POWER_SUPPLY_PROP_CURRENT_NOW, 0x0A, -32768,</div><div class='del'>-			32767),</div><div class='add'>+		SBS_DATA(POWER_SUPPLY_PROP_CURRENT_NOW, 0x0A, -32768, 32767),</div><div class='ctx'> 	[REG_CAPACITY] =</div><div class='del'>-		BQ20Z75_DATA(POWER_SUPPLY_PROP_CAPACITY, 0x0E, 0, 100),</div><div class='add'>+		SBS_DATA(POWER_SUPPLY_PROP_CAPACITY, 0x0E, 0, 100),</div><div class='ctx'> 	[REG_REMAINING_CAPACITY] =</div><div class='del'>-		BQ20Z75_DATA(POWER_SUPPLY_PROP_ENERGY_NOW, 0x0F, 0, 65535),</div><div class='add'>+		SBS_DATA(POWER_SUPPLY_PROP_ENERGY_NOW, 0x0F, 0, 65535),</div><div class='ctx'> 	[REG_REMAINING_CAPACITY_CHARGE] =</div><div class='del'>-		BQ20Z75_DATA(POWER_SUPPLY_PROP_CHARGE_NOW, 0x0F, 0, 65535),</div><div class='add'>+		SBS_DATA(POWER_SUPPLY_PROP_CHARGE_NOW, 0x0F, 0, 65535),</div><div class='ctx'> 	[REG_FULL_CHARGE_CAPACITY] =</div><div class='del'>-		BQ20Z75_DATA(POWER_SUPPLY_PROP_ENERGY_FULL, 0x10, 0, 65535),</div><div class='add'>+		SBS_DATA(POWER_SUPPLY_PROP_ENERGY_FULL, 0x10, 0, 65535),</div><div class='ctx'> 	[REG_FULL_CHARGE_CAPACITY_CHARGE] =</div><div class='del'>-		BQ20Z75_DATA(POWER_SUPPLY_PROP_CHARGE_FULL, 0x10, 0, 65535),</div><div class='add'>+		SBS_DATA(POWER_SUPPLY_PROP_CHARGE_FULL, 0x10, 0, 65535),</div><div class='ctx'> 	[REG_TIME_TO_EMPTY] =</div><div class='del'>-		BQ20Z75_DATA(POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG, 0x12, 0,</div><div class='del'>-			65535),</div><div class='add'>+		SBS_DATA(POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG, 0x12, 0, 65535),</div><div class='ctx'> 	[REG_TIME_TO_FULL] =</div><div class='del'>-		BQ20Z75_DATA(POWER_SUPPLY_PROP_TIME_TO_FULL_AVG, 0x13, 0,</div><div class='del'>-			65535),</div><div class='add'>+		SBS_DATA(POWER_SUPPLY_PROP_TIME_TO_FULL_AVG, 0x13, 0, 65535),</div><div class='ctx'> 	[REG_STATUS] =</div><div class='del'>-		BQ20Z75_DATA(POWER_SUPPLY_PROP_STATUS, 0x16, 0, 65535),</div><div class='add'>+		SBS_DATA(POWER_SUPPLY_PROP_STATUS, 0x16, 0, 65535),</div><div class='ctx'> 	[REG_CYCLE_COUNT] =</div><div class='del'>-		BQ20Z75_DATA(POWER_SUPPLY_PROP_CYCLE_COUNT, 0x17, 0, 65535),</div><div class='add'>+		SBS_DATA(POWER_SUPPLY_PROP_CYCLE_COUNT, 0x17, 0, 65535),</div><div class='ctx'> 	[REG_DESIGN_CAPACITY] =</div><div class='del'>-		BQ20Z75_DATA(POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN, 0x18, 0,</div><div class='del'>-			65535),</div><div class='add'>+		SBS_DATA(POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN, 0x18, 0, 65535),</div><div class='ctx'> 	[REG_DESIGN_CAPACITY_CHARGE] =</div><div class='del'>-		BQ20Z75_DATA(POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, 0x18, 0,</div><div class='del'>-			65535),</div><div class='add'>+		SBS_DATA(POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, 0x18, 0, 65535),</div><div class='ctx'> 	[REG_DESIGN_VOLTAGE] =</div><div class='del'>-		BQ20Z75_DATA(POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN, 0x19, 0,</div><div class='del'>-			65535),</div><div class='add'>+		SBS_DATA(POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN, 0x19, 0, 65535),</div><div class='ctx'> 	[REG_SERIAL_NUMBER] =</div><div class='del'>-		BQ20Z75_DATA(POWER_SUPPLY_PROP_SERIAL_NUMBER, 0x1C, 0, 65535),</div><div class='add'>+		SBS_DATA(POWER_SUPPLY_PROP_SERIAL_NUMBER, 0x1C, 0, 65535),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static enum power_supply_property bq20z75_properties[] = {</div><div class='add'>+static enum power_supply_property sbs_properties[] = {</div><div class='ctx'> 	POWER_SUPPLY_PROP_STATUS,</div><div class='ctx'> 	POWER_SUPPLY_PROP_HEALTH,</div><div class='ctx'> 	POWER_SUPPLY_PROP_PRESENT,</div><div class='hunk'>@@ -144,10 +138,10 @@ static enum power_supply_property bq20z75_properties[] = {</div><div class='ctx'> 	POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct bq20z75_info {</div><div class='add'>+struct sbs_info {</div><div class='ctx'> 	struct i2c_client		*client;</div><div class='ctx'> 	struct power_supply		power_supply;</div><div class='del'>-	struct bq20z75_platform_data	*pdata;</div><div class='add'>+	struct sbs_platform_data	*pdata;</div><div class='ctx'> 	bool				is_present;</div><div class='ctx'> 	bool				gpio_detect;</div><div class='ctx'> 	bool				enable_detection;</div><div class='hunk'>@@ -158,14 +152,14 @@ struct bq20z75_info {</div><div class='ctx'> 	int				ignore_changes;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int bq20z75_read_word_data(struct i2c_client *client, u8 address)</div><div class='add'>+static int sbs_read_word_data(struct i2c_client *client, u8 address)</div><div class='ctx'> {</div><div class='del'>-	struct bq20z75_info *bq20z75_device = i2c_get_clientdata(client);</div><div class='add'>+	struct sbs_info *chip = i2c_get_clientdata(client);</div><div class='ctx'> 	s32 ret = 0;</div><div class='ctx'> 	int retries = 1;</div><div class='ctx'> </div><div class='del'>-	if (bq20z75_device-&gt;pdata)</div><div class='del'>-		retries = max(bq20z75_device-&gt;pdata-&gt;i2c_retry_count + 1, 1);</div><div class='add'>+	if (chip-&gt;pdata)</div><div class='add'>+		retries = max(chip-&gt;pdata-&gt;i2c_retry_count + 1, 1);</div><div class='ctx'> </div><div class='ctx'> 	while (retries &gt; 0) {</div><div class='ctx'> 		ret = i2c_smbus_read_word_data(client, address);</div><div class='hunk'>@@ -184,15 +178,15 @@ static int bq20z75_read_word_data(struct i2c_client *client, u8 address)</div><div class='ctx'> 	return le16_to_cpu(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bq20z75_write_word_data(struct i2c_client *client, u8 address,</div><div class='add'>+static int sbs_write_word_data(struct i2c_client *client, u8 address,</div><div class='ctx'> 	u16 value)</div><div class='ctx'> {</div><div class='del'>-	struct bq20z75_info *bq20z75_device = i2c_get_clientdata(client);</div><div class='add'>+	struct sbs_info *chip = i2c_get_clientdata(client);</div><div class='ctx'> 	s32 ret = 0;</div><div class='ctx'> 	int retries = 1;</div><div class='ctx'> </div><div class='del'>-	if (bq20z75_device-&gt;pdata)</div><div class='del'>-		retries = max(bq20z75_device-&gt;pdata-&gt;i2c_retry_count + 1, 1);</div><div class='add'>+	if (chip-&gt;pdata)</div><div class='add'>+		retries = max(chip-&gt;pdata-&gt;i2c_retry_count + 1, 1);</div><div class='ctx'> </div><div class='ctx'> 	while (retries &gt; 0) {</div><div class='ctx'> 		ret = i2c_smbus_write_word_data(client, address,</div><div class='hunk'>@@ -212,44 +206,41 @@ static int bq20z75_write_word_data(struct i2c_client *client, u8 address,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bq20z75_get_battery_presence_and_health(</div><div class='add'>+static int sbs_get_battery_presence_and_health(</div><div class='ctx'> 	struct i2c_client *client, enum power_supply_property psp,</div><div class='ctx'> 	union power_supply_propval *val)</div><div class='ctx'> {</div><div class='ctx'> 	s32 ret;</div><div class='del'>-	struct bq20z75_info *bq20z75_device = i2c_get_clientdata(client);</div><div class='add'>+	struct sbs_info *chip = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	if (psp == POWER_SUPPLY_PROP_PRESENT &amp;&amp;</div><div class='del'>-		bq20z75_device-&gt;gpio_detect) {</div><div class='del'>-		ret = gpio_get_value(</div><div class='del'>-			bq20z75_device-&gt;pdata-&gt;battery_detect);</div><div class='del'>-		if (ret == bq20z75_device-&gt;pdata-&gt;battery_detect_present)</div><div class='add'>+		chip-&gt;gpio_detect) {</div><div class='add'>+		ret = gpio_get_value(chip-&gt;pdata-&gt;battery_detect);</div><div class='add'>+		if (ret == chip-&gt;pdata-&gt;battery_detect_present)</div><div class='ctx'> 			val-&gt;intval = 1;</div><div class='ctx'> 		else</div><div class='ctx'> 			val-&gt;intval = 0;</div><div class='del'>-		bq20z75_device-&gt;is_present = val-&gt;intval;</div><div class='add'>+		chip-&gt;is_present = val-&gt;intval;</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Write to ManufacturerAccess with</div><div class='ctx'> 	 * ManufacturerAccess command and then</div><div class='ctx'> 	 * read the status */</div><div class='del'>-	ret = bq20z75_write_word_data(client,</div><div class='del'>-		bq20z75_data[REG_MANUFACTURER_DATA].addr,</div><div class='del'>-		MANUFACTURER_ACCESS_STATUS);</div><div class='add'>+	ret = sbs_write_word_data(client, sbs_data[REG_MANUFACTURER_DATA].addr,</div><div class='add'>+					MANUFACTURER_ACCESS_STATUS);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		if (psp == POWER_SUPPLY_PROP_PRESENT)</div><div class='ctx'> 			val-&gt;intval = 0; /* battery removed */</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = bq20z75_read_word_data(client,</div><div class='del'>-		bq20z75_data[REG_MANUFACTURER_DATA].addr);</div><div class='add'>+	ret = sbs_read_word_data(client, sbs_data[REG_MANUFACTURER_DATA].addr);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (ret &lt; bq20z75_data[REG_MANUFACTURER_DATA].min_value ||</div><div class='del'>-	    ret &gt; bq20z75_data[REG_MANUFACTURER_DATA].max_value) {</div><div class='add'>+	if (ret &lt; sbs_data[REG_MANUFACTURER_DATA].min_value ||</div><div class='add'>+	    ret &gt; sbs_data[REG_MANUFACTURER_DATA].max_value) {</div><div class='ctx'> 		val-&gt;intval = 0;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -279,24 +270,23 @@ static int bq20z75_get_battery_presence_and_health(</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bq20z75_get_battery_property(struct i2c_client *client,</div><div class='add'>+static int sbs_get_battery_property(struct i2c_client *client,</div><div class='ctx'> 	int reg_offset, enum power_supply_property psp,</div><div class='ctx'> 	union power_supply_propval *val)</div><div class='ctx'> {</div><div class='del'>-	struct bq20z75_info *bq20z75_device = i2c_get_clientdata(client);</div><div class='add'>+	struct sbs_info *chip = i2c_get_clientdata(client);</div><div class='ctx'> 	s32 ret;</div><div class='ctx'> </div><div class='del'>-	ret = bq20z75_read_word_data(client,</div><div class='del'>-		bq20z75_data[reg_offset].addr);</div><div class='add'>+	ret = sbs_read_word_data(client, sbs_data[reg_offset].addr);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* returned values are 16 bit */</div><div class='del'>-	if (bq20z75_data[reg_offset].min_value &lt; 0)</div><div class='add'>+	if (sbs_data[reg_offset].min_value &lt; 0)</div><div class='ctx'> 		ret = (s16)ret;</div><div class='ctx'> </div><div class='del'>-	if (ret &gt;= bq20z75_data[reg_offset].min_value &amp;&amp;</div><div class='del'>-	    ret &lt;= bq20z75_data[reg_offset].max_value) {</div><div class='add'>+	if (ret &gt;= sbs_data[reg_offset].min_value &amp;&amp;</div><div class='add'>+	    ret &lt;= sbs_data[reg_offset].max_value) {</div><div class='ctx'> 		val-&gt;intval = ret;</div><div class='ctx'> 		if (psp != POWER_SUPPLY_PROP_STATUS)</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -310,12 +300,12 @@ static int bq20z75_get_battery_property(struct i2c_client *client,</div><div class='ctx'> 		else</div><div class='ctx'> 			val-&gt;intval = POWER_SUPPLY_STATUS_CHARGING;</div><div class='ctx'> </div><div class='del'>-		if (bq20z75_device-&gt;poll_time == 0)</div><div class='del'>-			bq20z75_device-&gt;last_state = val-&gt;intval;</div><div class='del'>-		else if (bq20z75_device-&gt;last_state != val-&gt;intval) {</div><div class='del'>-			cancel_delayed_work_sync(&amp;bq20z75_device-&gt;work);</div><div class='del'>-			power_supply_changed(&amp;bq20z75_device-&gt;power_supply);</div><div class='del'>-			bq20z75_device-&gt;poll_time = 0;</div><div class='add'>+		if (chip-&gt;poll_time == 0)</div><div class='add'>+			chip-&gt;last_state = val-&gt;intval;</div><div class='add'>+		else if (chip-&gt;last_state != val-&gt;intval) {</div><div class='add'>+			cancel_delayed_work_sync(&amp;chip-&gt;work);</div><div class='add'>+			power_supply_changed(&amp;chip-&gt;power_supply);</div><div class='add'>+			chip-&gt;poll_time = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (psp == POWER_SUPPLY_PROP_STATUS)</div><div class='hunk'>@@ -327,7 +317,7 @@ static int bq20z75_get_battery_property(struct i2c_client *client,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void  bq20z75_unit_adjustment(struct i2c_client *client,</div><div class='add'>+static void  sbs_unit_adjustment(struct i2c_client *client,</div><div class='ctx'> 	enum power_supply_property psp, union power_supply_propval *val)</div><div class='ctx'> {</div><div class='ctx'> #define BASE_UNIT_CONVERSION		1000</div><div class='hunk'>@@ -338,7 +328,7 @@ static void  bq20z75_unit_adjustment(struct i2c_client *client,</div><div class='ctx'> 	case POWER_SUPPLY_PROP_ENERGY_NOW:</div><div class='ctx'> 	case POWER_SUPPLY_PROP_ENERGY_FULL:</div><div class='ctx'> 	case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:</div><div class='del'>-		/* bq20z75 provides energy in units of 10mWh.</div><div class='add'>+		/* sbs provides energy in units of 10mWh.</div><div class='ctx'> 		 * Convert to µWh</div><div class='ctx'> 		 */</div><div class='ctx'> 		val-&gt;intval *= BATTERY_MODE_CAP_MULT_WATT;</div><div class='hunk'>@@ -354,7 +344,7 @@ static void  bq20z75_unit_adjustment(struct i2c_client *client,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case POWER_SUPPLY_PROP_TEMP:</div><div class='del'>-		/* bq20z75 provides battery temperature in 0.1K</div><div class='add'>+		/* sbs provides battery temperature in 0.1K</div><div class='ctx'> 		 * so convert it to 0.1°C</div><div class='ctx'> 		 */</div><div class='ctx'> 		val-&gt;intval -= TEMP_KELVIN_TO_CELSIUS;</div><div class='hunk'>@@ -362,7 +352,7 @@ static void  bq20z75_unit_adjustment(struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 	case POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG:</div><div class='ctx'> 	case POWER_SUPPLY_PROP_TIME_TO_FULL_AVG:</div><div class='del'>-		/* bq20z75 provides time to empty and time to full in minutes.</div><div class='add'>+		/* sbs provides time to empty and time to full in minutes.</div><div class='ctx'> 		 * Convert to seconds</div><div class='ctx'> 		 */</div><div class='ctx'> 		val-&gt;intval *= TIME_UNIT_CONVERSION;</div><div class='hunk'>@@ -374,13 +364,12 @@ static void  bq20z75_unit_adjustment(struct i2c_client *client,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static enum bq20z75_battery_mode</div><div class='del'>-bq20z75_set_battery_mode(struct i2c_client *client,</div><div class='del'>-	enum bq20z75_battery_mode mode)</div><div class='add'>+static enum sbs_battery_mode sbs_set_battery_mode(struct i2c_client *client,</div><div class='add'>+	enum sbs_battery_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, original_val;</div><div class='ctx'> </div><div class='del'>-	original_val = bq20z75_read_word_data(client, BATTERY_MODE_OFFSET);</div><div class='add'>+	original_val = sbs_read_word_data(client, BATTERY_MODE_OFFSET);</div><div class='ctx'> 	if (original_val &lt; 0)</div><div class='ctx'> 		return original_val;</div><div class='ctx'> </div><div class='hunk'>@@ -392,68 +381,67 @@ bq20z75_set_battery_mode(struct i2c_client *client,</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = original_val | BATTERY_MODE_MASK;</div><div class='ctx'> </div><div class='del'>-	ret = bq20z75_write_word_data(client, BATTERY_MODE_OFFSET, ret);</div><div class='add'>+	ret = sbs_write_word_data(client, BATTERY_MODE_OFFSET, ret);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return original_val &amp; BATTERY_MODE_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bq20z75_get_battery_capacity(struct i2c_client *client,</div><div class='add'>+static int sbs_get_battery_capacity(struct i2c_client *client,</div><div class='ctx'> 	int reg_offset, enum power_supply_property psp,</div><div class='ctx'> 	union power_supply_propval *val)</div><div class='ctx'> {</div><div class='ctx'> 	s32 ret;</div><div class='del'>-	enum bq20z75_battery_mode mode = BATTERY_MODE_WATTS;</div><div class='add'>+	enum sbs_battery_mode mode = BATTERY_MODE_WATTS;</div><div class='ctx'> </div><div class='ctx'> 	if (power_supply_is_amp_property(psp))</div><div class='ctx'> 		mode = BATTERY_MODE_AMPS;</div><div class='ctx'> </div><div class='del'>-	mode = bq20z75_set_battery_mode(client, mode);</div><div class='add'>+	mode = sbs_set_battery_mode(client, mode);</div><div class='ctx'> 	if (mode &lt; 0)</div><div class='ctx'> 		return mode;</div><div class='ctx'> </div><div class='del'>-	ret = bq20z75_read_word_data(client, bq20z75_data[reg_offset].addr);</div><div class='add'>+	ret = sbs_read_word_data(client, sbs_data[reg_offset].addr);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (psp == POWER_SUPPLY_PROP_CAPACITY) {</div><div class='del'>-		/* bq20z75 spec says that this can be &gt;100 %</div><div class='add'>+		/* sbs spec says that this can be &gt;100 %</div><div class='ctx'> 		* even if max value is 100 % */</div><div class='ctx'> 		val-&gt;intval = min(ret, 100);</div><div class='ctx'> 	} else</div><div class='ctx'> 		val-&gt;intval = ret;</div><div class='ctx'> </div><div class='del'>-	ret = bq20z75_set_battery_mode(client, mode);</div><div class='add'>+	ret = sbs_set_battery_mode(client, mode);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char bq20z75_serial[5];</div><div class='del'>-static int bq20z75_get_battery_serial_number(struct i2c_client *client,</div><div class='add'>+static char sbs_serial[5];</div><div class='add'>+static int sbs_get_battery_serial_number(struct i2c_client *client,</div><div class='ctx'> 	union power_supply_propval *val)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = bq20z75_read_word_data(client,</div><div class='del'>-		bq20z75_data[REG_SERIAL_NUMBER].addr);</div><div class='add'>+	ret = sbs_read_word_data(client, sbs_data[REG_SERIAL_NUMBER].addr);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = sprintf(bq20z75_serial, "%04x", ret);</div><div class='del'>-	val-&gt;strval = bq20z75_serial;</div><div class='add'>+	ret = sprintf(sbs_serial, "%04x", ret);</div><div class='add'>+	val-&gt;strval = sbs_serial;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bq20z75_get_property_index(struct i2c_client *client,</div><div class='add'>+static int sbs_get_property_index(struct i2c_client *client,</div><div class='ctx'> 	enum power_supply_property psp)</div><div class='ctx'> {</div><div class='ctx'> 	int count;</div><div class='del'>-	for (count = 0; count &lt; ARRAY_SIZE(bq20z75_data); count++)</div><div class='del'>-		if (psp == bq20z75_data[count].psp)</div><div class='add'>+	for (count = 0; count &lt; ARRAY_SIZE(sbs_data); count++)</div><div class='add'>+		if (psp == sbs_data[count].psp)</div><div class='ctx'> 			return count;</div><div class='ctx'> </div><div class='ctx'> 	dev_warn(&amp;client-&gt;dev,</div><div class='hunk'>@@ -462,19 +450,19 @@ static int bq20z75_get_property_index(struct i2c_client *client,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bq20z75_get_property(struct power_supply *psy,</div><div class='add'>+static int sbs_get_property(struct power_supply *psy,</div><div class='ctx'> 	enum power_supply_property psp,</div><div class='ctx'> 	union power_supply_propval *val)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct bq20z75_info *bq20z75_device = container_of(psy,</div><div class='del'>-				struct bq20z75_info, power_supply);</div><div class='del'>-	struct i2c_client *client = bq20z75_device-&gt;client;</div><div class='add'>+	struct sbs_info *chip = container_of(psy,</div><div class='add'>+				struct sbs_info, power_supply);</div><div class='add'>+	struct i2c_client *client = chip-&gt;client;</div><div class='ctx'> </div><div class='ctx'> 	switch (psp) {</div><div class='ctx'> 	case POWER_SUPPLY_PROP_PRESENT:</div><div class='ctx'> 	case POWER_SUPPLY_PROP_HEALTH:</div><div class='del'>-		ret = bq20z75_get_battery_presence_and_health(client, psp, val);</div><div class='add'>+		ret = sbs_get_battery_presence_and_health(client, psp, val);</div><div class='ctx'> 		if (psp == POWER_SUPPLY_PROP_PRESENT)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -490,15 +478,15 @@ static int bq20z75_get_property(struct power_supply *psy,</div><div class='ctx'> 	case POWER_SUPPLY_PROP_CHARGE_FULL:</div><div class='ctx'> 	case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:</div><div class='ctx'> 	case POWER_SUPPLY_PROP_CAPACITY:</div><div class='del'>-		ret = bq20z75_get_property_index(client, psp);</div><div class='add'>+		ret = sbs_get_property_index(client, psp);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		ret = bq20z75_get_battery_capacity(client, ret, psp, val);</div><div class='add'>+		ret = sbs_get_battery_capacity(client, ret, psp, val);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case POWER_SUPPLY_PROP_SERIAL_NUMBER:</div><div class='del'>-		ret = bq20z75_get_battery_serial_number(client, val);</div><div class='add'>+		ret = sbs_get_battery_serial_number(client, val);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case POWER_SUPPLY_PROP_STATUS:</div><div class='hunk'>@@ -509,11 +497,11 @@ static int bq20z75_get_property(struct power_supply *psy,</div><div class='ctx'> 	case POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG:</div><div class='ctx'> 	case POWER_SUPPLY_PROP_TIME_TO_FULL_AVG:</div><div class='ctx'> 	case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:</div><div class='del'>-		ret = bq20z75_get_property_index(client, psp);</div><div class='add'>+		ret = sbs_get_property_index(client, psp);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		ret = bq20z75_get_battery_property(client, ret, psp, val);</div><div class='add'>+		ret = sbs_get_battery_property(client, ret, psp, val);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -522,25 +510,25 @@ static int bq20z75_get_property(struct power_supply *psy,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!bq20z75_device-&gt;enable_detection)</div><div class='add'>+	if (!chip-&gt;enable_detection)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	if (!bq20z75_device-&gt;gpio_detect &amp;&amp;</div><div class='del'>-		bq20z75_device-&gt;is_present != (ret &gt;= 0)) {</div><div class='del'>-		bq20z75_device-&gt;is_present = (ret &gt;= 0);</div><div class='del'>-		power_supply_changed(&amp;bq20z75_device-&gt;power_supply);</div><div class='add'>+	if (!chip-&gt;gpio_detect &amp;&amp;</div><div class='add'>+		chip-&gt;is_present != (ret &gt;= 0)) {</div><div class='add'>+		chip-&gt;is_present = (ret &gt;= 0);</div><div class='add'>+		power_supply_changed(&amp;chip-&gt;power_supply);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		/* Convert units to match requirements for power supply class */</div><div class='del'>-		bq20z75_unit_adjustment(client, psp, val);</div><div class='add'>+		sbs_unit_adjustment(client, psp, val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;client-&gt;dev,</div><div class='ctx'> 		"%s: property = %d, value = %x\n", __func__, psp, val-&gt;intval);</div><div class='ctx'> </div><div class='del'>-	if (ret &amp;&amp; bq20z75_device-&gt;is_present)</div><div class='add'>+	if (ret &amp;&amp; chip-&gt;is_present)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* battery not present, so return NODATA for properties */</div><div class='hunk'>@@ -550,7 +538,7 @@ done:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t bq20z75_irq(int irq, void *devid)</div><div class='add'>+static irqreturn_t sbs_irq(int irq, void *devid)</div><div class='ctx'> {</div><div class='ctx'> 	struct power_supply *battery = devid;</div><div class='ctx'> </div><div class='hunk'>@@ -559,36 +547,35 @@ static irqreturn_t bq20z75_irq(int irq, void *devid)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bq20z75_external_power_changed(struct power_supply *psy)</div><div class='add'>+static void sbs_external_power_changed(struct power_supply *psy)</div><div class='ctx'> {</div><div class='del'>-	struct bq20z75_info *bq20z75_device;</div><div class='add'>+	struct sbs_info *chip;</div><div class='ctx'> </div><div class='del'>-	bq20z75_device = container_of(psy, struct bq20z75_info, power_supply);</div><div class='add'>+	chip = container_of(psy, struct sbs_info, power_supply);</div><div class='ctx'> </div><div class='del'>-	if (bq20z75_device-&gt;ignore_changes &gt; 0) {</div><div class='del'>-		bq20z75_device-&gt;ignore_changes--;</div><div class='add'>+	if (chip-&gt;ignore_changes &gt; 0) {</div><div class='add'>+		chip-&gt;ignore_changes--;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* cancel outstanding work */</div><div class='del'>-	cancel_delayed_work_sync(&amp;bq20z75_device-&gt;work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;chip-&gt;work);</div><div class='ctx'> </div><div class='del'>-	schedule_delayed_work(&amp;bq20z75_device-&gt;work, HZ);</div><div class='del'>-	bq20z75_device-&gt;poll_time = bq20z75_device-&gt;pdata-&gt;poll_retry_count;</div><div class='add'>+	schedule_delayed_work(&amp;chip-&gt;work, HZ);</div><div class='add'>+	chip-&gt;poll_time = chip-&gt;pdata-&gt;poll_retry_count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bq20z75_delayed_work(struct work_struct *work)</div><div class='add'>+static void sbs_delayed_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct bq20z75_info *bq20z75_device;</div><div class='add'>+	struct sbs_info *chip;</div><div class='ctx'> 	s32 ret;</div><div class='ctx'> </div><div class='del'>-	bq20z75_device = container_of(work, struct bq20z75_info, work.work);</div><div class='add'>+	chip = container_of(work, struct sbs_info, work.work);</div><div class='ctx'> </div><div class='del'>-	ret = bq20z75_read_word_data(bq20z75_device-&gt;client,</div><div class='del'>-				     bq20z75_data[REG_STATUS].addr);</div><div class='add'>+	ret = sbs_read_word_data(chip-&gt;client, sbs_data[REG_STATUS].addr);</div><div class='ctx'> 	/* if the read failed, give up on this work */</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		bq20z75_device-&gt;poll_time = 0;</div><div class='add'>+		chip-&gt;poll_time = 0;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -601,62 +588,145 @@ static void bq20z75_delayed_work(struct work_struct *work)</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = POWER_SUPPLY_STATUS_CHARGING;</div><div class='ctx'> </div><div class='del'>-	if (bq20z75_device-&gt;last_state != ret) {</div><div class='del'>-		bq20z75_device-&gt;poll_time = 0;</div><div class='del'>-		power_supply_changed(&amp;bq20z75_device-&gt;power_supply);</div><div class='add'>+	if (chip-&gt;last_state != ret) {</div><div class='add'>+		chip-&gt;poll_time = 0;</div><div class='add'>+		power_supply_changed(&amp;chip-&gt;power_supply);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (bq20z75_device-&gt;poll_time &gt; 0) {</div><div class='del'>-		schedule_delayed_work(&amp;bq20z75_device-&gt;work, HZ);</div><div class='del'>-		bq20z75_device-&gt;poll_time--;</div><div class='add'>+	if (chip-&gt;poll_time &gt; 0) {</div><div class='add'>+		schedule_delayed_work(&amp;chip-&gt;work, HZ);</div><div class='add'>+		chip-&gt;poll_time--;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit bq20z75_probe(struct i2c_client *client,</div><div class='add'>+#if defined(CONFIG_OF)</div><div class='add'>+</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/of_gpio.h&gt;</div><div class='add'>+</div><div class='add'>+static const struct of_device_id sbs_dt_ids[] = {</div><div class='add'>+	{ .compatible = "sbs,sbs-battery" },</div><div class='add'>+	{ .compatible = "ti,bq20z75" },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, sbs_dt_ids);</div><div class='add'>+</div><div class='add'>+static struct sbs_platform_data *sbs_of_populate_pdata(</div><div class='add'>+		struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct device_node *of_node = client-&gt;dev.of_node;</div><div class='add'>+	struct sbs_platform_data *pdata = client-&gt;dev.platform_data;</div><div class='add'>+	enum of_gpio_flags gpio_flags;</div><div class='add'>+	int rc;</div><div class='add'>+	u32 prop;</div><div class='add'>+</div><div class='add'>+	/* verify this driver matches this device */</div><div class='add'>+	if (!of_node)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* if platform data is set, honor it */</div><div class='add'>+	if (pdata)</div><div class='add'>+		return pdata;</div><div class='add'>+</div><div class='add'>+	/* first make sure at least one property is set, otherwise</div><div class='add'>+	 * it won't change behavior from running without pdata.</div><div class='add'>+	 */</div><div class='add'>+	if (!of_get_property(of_node, "sbs,i2c-retry-count", NULL) &amp;&amp;</div><div class='add'>+		!of_get_property(of_node, "sbs,poll-retry-count", NULL) &amp;&amp;</div><div class='add'>+		!of_get_property(of_node, "sbs,battery-detect-gpios", NULL))</div><div class='add'>+		goto of_out;</div><div class='add'>+</div><div class='add'>+	pdata = devm_kzalloc(&amp;client-&gt;dev, sizeof(struct sbs_platform_data),</div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+	if (!pdata)</div><div class='add'>+		goto of_out;</div><div class='add'>+</div><div class='add'>+	rc = of_property_read_u32(of_node, "sbs,i2c-retry-count", &amp;prop);</div><div class='add'>+	if (!rc)</div><div class='add'>+		pdata-&gt;i2c_retry_count = prop;</div><div class='add'>+</div><div class='add'>+	rc = of_property_read_u32(of_node, "sbs,poll-retry-count", &amp;prop);</div><div class='add'>+	if (!rc)</div><div class='add'>+		pdata-&gt;poll_retry_count = prop;</div><div class='add'>+</div><div class='add'>+	if (!of_get_property(of_node, "sbs,battery-detect-gpios", NULL)) {</div><div class='add'>+		pdata-&gt;battery_detect = -1;</div><div class='add'>+		goto of_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdata-&gt;battery_detect = of_get_named_gpio_flags(of_node,</div><div class='add'>+			"sbs,battery-detect-gpios", 0, &amp;gpio_flags);</div><div class='add'>+</div><div class='add'>+	if (gpio_flags &amp; OF_GPIO_ACTIVE_LOW)</div><div class='add'>+		pdata-&gt;battery_detect_present = 0;</div><div class='add'>+	else</div><div class='add'>+		pdata-&gt;battery_detect_present = 1;</div><div class='add'>+</div><div class='add'>+of_out:</div><div class='add'>+	return pdata;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define sbs_dt_ids NULL</div><div class='add'>+static struct sbs_platform_data *sbs_of_populate_pdata(</div><div class='add'>+	struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	return client-&gt;dev.platform_data;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int __devinit sbs_probe(struct i2c_client *client,</div><div class='ctx'> 	const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	struct bq20z75_info *bq20z75_device;</div><div class='del'>-	struct bq20z75_platform_data *pdata = client-&gt;dev.platform_data;</div><div class='add'>+	struct sbs_info *chip;</div><div class='add'>+	struct sbs_platform_data *pdata = client-&gt;dev.platform_data;</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	int irq;</div><div class='add'>+	char *name;</div><div class='ctx'> </div><div class='del'>-	bq20z75_device = kzalloc(sizeof(struct bq20z75_info), GFP_KERNEL);</div><div class='del'>-	if (!bq20z75_device)</div><div class='add'>+	name = kasprintf(GFP_KERNEL, "sbs-%s", dev_name(&amp;client-&gt;dev));</div><div class='add'>+	if (!name) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Failed to allocate device name\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chip = kzalloc(sizeof(struct sbs_info), GFP_KERNEL);</div><div class='add'>+	if (!chip) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto exit_free_name;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	bq20z75_device-&gt;client = client;</div><div class='del'>-	bq20z75_device-&gt;enable_detection = false;</div><div class='del'>-	bq20z75_device-&gt;gpio_detect = false;</div><div class='del'>-	bq20z75_device-&gt;power_supply.name = "battery";</div><div class='del'>-	bq20z75_device-&gt;power_supply.type = POWER_SUPPLY_TYPE_BATTERY;</div><div class='del'>-	bq20z75_device-&gt;power_supply.properties = bq20z75_properties;</div><div class='del'>-	bq20z75_device-&gt;power_supply.num_properties =</div><div class='del'>-		ARRAY_SIZE(bq20z75_properties);</div><div class='del'>-	bq20z75_device-&gt;power_supply.get_property = bq20z75_get_property;</div><div class='add'>+	chip-&gt;client = client;</div><div class='add'>+	chip-&gt;enable_detection = false;</div><div class='add'>+	chip-&gt;gpio_detect = false;</div><div class='add'>+	chip-&gt;power_supply.name = name;</div><div class='add'>+	chip-&gt;power_supply.type = POWER_SUPPLY_TYPE_BATTERY;</div><div class='add'>+	chip-&gt;power_supply.properties = sbs_properties;</div><div class='add'>+	chip-&gt;power_supply.num_properties = ARRAY_SIZE(sbs_properties);</div><div class='add'>+	chip-&gt;power_supply.get_property = sbs_get_property;</div><div class='ctx'> 	/* ignore first notification of external change, it is generated</div><div class='ctx'> 	 * from the power_supply_register call back</div><div class='ctx'> 	 */</div><div class='del'>-	bq20z75_device-&gt;ignore_changes = 1;</div><div class='del'>-	bq20z75_device-&gt;last_state = POWER_SUPPLY_STATUS_UNKNOWN;</div><div class='del'>-	bq20z75_device-&gt;power_supply.external_power_changed =</div><div class='del'>-		bq20z75_external_power_changed;</div><div class='add'>+	chip-&gt;ignore_changes = 1;</div><div class='add'>+	chip-&gt;last_state = POWER_SUPPLY_STATUS_UNKNOWN;</div><div class='add'>+	chip-&gt;power_supply.external_power_changed = sbs_external_power_changed;</div><div class='add'>+</div><div class='add'>+	pdata = sbs_of_populate_pdata(client);</div><div class='ctx'> </div><div class='ctx'> 	if (pdata) {</div><div class='del'>-		bq20z75_device-&gt;gpio_detect =</div><div class='del'>-			gpio_is_valid(pdata-&gt;battery_detect);</div><div class='del'>-		bq20z75_device-&gt;pdata = pdata;</div><div class='add'>+		chip-&gt;gpio_detect = gpio_is_valid(pdata-&gt;battery_detect);</div><div class='add'>+		chip-&gt;pdata = pdata;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	i2c_set_clientdata(client, bq20z75_device);</div><div class='add'>+	i2c_set_clientdata(client, chip);</div><div class='ctx'> </div><div class='del'>-	if (!bq20z75_device-&gt;gpio_detect)</div><div class='add'>+	if (!chip-&gt;gpio_detect)</div><div class='ctx'> 		goto skip_gpio;</div><div class='ctx'> </div><div class='ctx'> 	rc = gpio_request(pdata-&gt;battery_detect, dev_name(&amp;client-&gt;dev));</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_warn(&amp;client-&gt;dev, "Failed to request gpio: %d\n", rc);</div><div class='del'>-		bq20z75_device-&gt;gpio_detect = false;</div><div class='add'>+		chip-&gt;gpio_detect = false;</div><div class='ctx'> 		goto skip_gpio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -664,7 +734,7 @@ static int __devinit bq20z75_probe(struct i2c_client *client,</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_warn(&amp;client-&gt;dev, "Failed to get gpio as input: %d\n", rc);</div><div class='ctx'> 		gpio_free(pdata-&gt;battery_detect);</div><div class='del'>-		bq20z75_device-&gt;gpio_detect = false;</div><div class='add'>+		chip-&gt;gpio_detect = false;</div><div class='ctx'> 		goto skip_gpio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -672,25 +742,25 @@ static int __devinit bq20z75_probe(struct i2c_client *client,</div><div class='ctx'> 	if (irq &lt;= 0) {</div><div class='ctx'> 		dev_warn(&amp;client-&gt;dev, "Failed to get gpio as irq: %d\n", irq);</div><div class='ctx'> 		gpio_free(pdata-&gt;battery_detect);</div><div class='del'>-		bq20z75_device-&gt;gpio_detect = false;</div><div class='add'>+		chip-&gt;gpio_detect = false;</div><div class='ctx'> 		goto skip_gpio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = request_irq(irq, bq20z75_irq,</div><div class='add'>+	rc = request_irq(irq, sbs_irq,</div><div class='ctx'> 		IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='del'>-		dev_name(&amp;client-&gt;dev), &amp;bq20z75_device-&gt;power_supply);</div><div class='add'>+		dev_name(&amp;client-&gt;dev), &amp;chip-&gt;power_supply);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_warn(&amp;client-&gt;dev, "Failed to request irq: %d\n", rc);</div><div class='ctx'> 		gpio_free(pdata-&gt;battery_detect);</div><div class='del'>-		bq20z75_device-&gt;gpio_detect = false;</div><div class='add'>+		chip-&gt;gpio_detect = false;</div><div class='ctx'> 		goto skip_gpio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bq20z75_device-&gt;irq = irq;</div><div class='add'>+	chip-&gt;irq = irq;</div><div class='ctx'> </div><div class='ctx'> skip_gpio:</div><div class='ctx'> </div><div class='del'>-	rc = power_supply_register(&amp;client-&gt;dev, &amp;bq20z75_device-&gt;power_supply);</div><div class='add'>+	rc = power_supply_register(&amp;client-&gt;dev, &amp;chip-&gt;power_supply);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(&amp;client-&gt;dev,</div><div class='ctx'> 			"%s: Failed to register power supply\n", __func__);</div><div class='hunk'>@@ -700,95 +770,100 @@ skip_gpio:</div><div class='ctx'> 	dev_info(&amp;client-&gt;dev,</div><div class='ctx'> 		"%s: battery gas gauge device registered\n", client-&gt;name);</div><div class='ctx'> </div><div class='del'>-	INIT_DELAYED_WORK(&amp;bq20z75_device-&gt;work, bq20z75_delayed_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;chip-&gt;work, sbs_delayed_work);</div><div class='ctx'> </div><div class='del'>-	bq20z75_device-&gt;enable_detection = true;</div><div class='add'>+	chip-&gt;enable_detection = true;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> exit_psupply:</div><div class='del'>-	if (bq20z75_device-&gt;irq)</div><div class='del'>-		free_irq(bq20z75_device-&gt;irq, &amp;bq20z75_device-&gt;power_supply);</div><div class='del'>-	if (bq20z75_device-&gt;gpio_detect)</div><div class='add'>+	if (chip-&gt;irq)</div><div class='add'>+		free_irq(chip-&gt;irq, &amp;chip-&gt;power_supply);</div><div class='add'>+	if (chip-&gt;gpio_detect)</div><div class='ctx'> 		gpio_free(pdata-&gt;battery_detect);</div><div class='ctx'> </div><div class='del'>-	kfree(bq20z75_device);</div><div class='add'>+	kfree(chip);</div><div class='add'>+</div><div class='add'>+exit_free_name:</div><div class='add'>+	kfree(name);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit bq20z75_remove(struct i2c_client *client)</div><div class='add'>+static int __devexit sbs_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	struct bq20z75_info *bq20z75_device = i2c_get_clientdata(client);</div><div class='add'>+	struct sbs_info *chip = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='del'>-	if (bq20z75_device-&gt;irq)</div><div class='del'>-		free_irq(bq20z75_device-&gt;irq, &amp;bq20z75_device-&gt;power_supply);</div><div class='del'>-	if (bq20z75_device-&gt;gpio_detect)</div><div class='del'>-		gpio_free(bq20z75_device-&gt;pdata-&gt;battery_detect);</div><div class='add'>+	if (chip-&gt;irq)</div><div class='add'>+		free_irq(chip-&gt;irq, &amp;chip-&gt;power_supply);</div><div class='add'>+	if (chip-&gt;gpio_detect)</div><div class='add'>+		gpio_free(chip-&gt;pdata-&gt;battery_detect);</div><div class='ctx'> </div><div class='del'>-	power_supply_unregister(&amp;bq20z75_device-&gt;power_supply);</div><div class='add'>+	power_supply_unregister(&amp;chip-&gt;power_supply);</div><div class='ctx'> </div><div class='del'>-	cancel_delayed_work_sync(&amp;bq20z75_device-&gt;work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;chip-&gt;work);</div><div class='ctx'> </div><div class='del'>-	kfree(bq20z75_device);</div><div class='del'>-	bq20z75_device = NULL;</div><div class='add'>+	kfree(chip-&gt;power_supply.name);</div><div class='add'>+	kfree(chip);</div><div class='add'>+	chip = NULL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined CONFIG_PM</div><div class='del'>-static int bq20z75_suspend(struct i2c_client *client,</div><div class='add'>+static int sbs_suspend(struct i2c_client *client,</div><div class='ctx'> 	pm_message_t state)</div><div class='ctx'> {</div><div class='del'>-	struct bq20z75_info *bq20z75_device = i2c_get_clientdata(client);</div><div class='add'>+	struct sbs_info *chip = i2c_get_clientdata(client);</div><div class='ctx'> 	s32 ret;</div><div class='ctx'> </div><div class='del'>-	if (bq20z75_device-&gt;poll_time &gt; 0)</div><div class='del'>-		cancel_delayed_work_sync(&amp;bq20z75_device-&gt;work);</div><div class='add'>+	if (chip-&gt;poll_time &gt; 0)</div><div class='add'>+		cancel_delayed_work_sync(&amp;chip-&gt;work);</div><div class='ctx'> </div><div class='ctx'> 	/* write to manufacturer access with sleep command */</div><div class='del'>-	ret = bq20z75_write_word_data(client,</div><div class='del'>-		bq20z75_data[REG_MANUFACTURER_DATA].addr,</div><div class='add'>+	ret = sbs_write_word_data(client, sbs_data[REG_MANUFACTURER_DATA].addr,</div><div class='ctx'> 		MANUFACTURER_ACCESS_SLEEP);</div><div class='del'>-	if (bq20z75_device-&gt;is_present &amp;&amp; ret &lt; 0)</div><div class='add'>+	if (chip-&gt;is_present &amp;&amp; ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-#define bq20z75_suspend		NULL</div><div class='add'>+#define sbs_suspend		NULL</div><div class='ctx'> #endif</div><div class='del'>-/* any smbus transaction will wake up bq20z75 */</div><div class='del'>-#define bq20z75_resume		NULL</div><div class='add'>+/* any smbus transaction will wake up sbs */</div><div class='add'>+#define sbs_resume		NULL</div><div class='ctx'> </div><div class='del'>-static const struct i2c_device_id bq20z75_id[] = {</div><div class='add'>+static const struct i2c_device_id sbs_id[] = {</div><div class='ctx'> 	{ "bq20z75", 0 },</div><div class='add'>+	{ "sbs-battery", 1 },</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='del'>-MODULE_DEVICE_TABLE(i2c, bq20z75_id);</div><div class='del'>-</div><div class='del'>-static struct i2c_driver bq20z75_battery_driver = {</div><div class='del'>-	.probe		= bq20z75_probe,</div><div class='del'>-	.remove		= __devexit_p(bq20z75_remove),</div><div class='del'>-	.suspend	= bq20z75_suspend,</div><div class='del'>-	.resume		= bq20z75_resume,</div><div class='del'>-	.id_table	= bq20z75_id,</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, sbs_id);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver sbs_battery_driver = {</div><div class='add'>+	.probe		= sbs_probe,</div><div class='add'>+	.remove		= __devexit_p(sbs_remove),</div><div class='add'>+	.suspend	= sbs_suspend,</div><div class='add'>+	.resume		= sbs_resume,</div><div class='add'>+	.id_table	= sbs_id,</div><div class='ctx'> 	.driver = {</div><div class='del'>-		.name	= "bq20z75-battery",</div><div class='add'>+		.name	= "sbs-battery",</div><div class='add'>+		.of_match_table = sbs_dt_ids,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init bq20z75_battery_init(void)</div><div class='add'>+static int __init sbs_battery_init(void)</div><div class='ctx'> {</div><div class='del'>-	return i2c_add_driver(&amp;bq20z75_battery_driver);</div><div class='add'>+	return i2c_add_driver(&amp;sbs_battery_driver);</div><div class='ctx'> }</div><div class='del'>-module_init(bq20z75_battery_init);</div><div class='add'>+module_init(sbs_battery_init);</div><div class='ctx'> </div><div class='del'>-static void __exit bq20z75_battery_exit(void)</div><div class='add'>+static void __exit sbs_battery_exit(void)</div><div class='ctx'> {</div><div class='del'>-	i2c_del_driver(&amp;bq20z75_battery_driver);</div><div class='add'>+	i2c_del_driver(&amp;sbs_battery_driver);</div><div class='ctx'> }</div><div class='del'>-module_exit(bq20z75_battery_exit);</div><div class='add'>+module_exit(sbs_battery_exit);</div><div class='ctx'> </div><div class='del'>-MODULE_DESCRIPTION("BQ20z75 battery monitor driver");</div><div class='add'>+MODULE_DESCRIPTION("SBS battery monitor driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/power/tosa_battery.c b/drivers/power/tosa_battery.c<br/>index 53f0d3524fcd..28bbe7e094e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/tosa_battery.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/tosa_battery.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/tosa_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/tosa_battery.c</a></div><div class='hunk'>@@ -307,25 +307,20 @@ static struct tosa_bat tosa_bat_bu = {</div><div class='ctx'> 	.adc_temp_divider = -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct {</div><div class='del'>-	int gpio;</div><div class='del'>-	char *name;</div><div class='del'>-	bool output;</div><div class='del'>-	int value;</div><div class='del'>-} gpios[] = {</div><div class='del'>-	{ TOSA_GPIO_CHARGE_OFF,		"main charge off",	1, 1 },</div><div class='del'>-	{ TOSA_GPIO_CHARGE_OFF_JC,	"jacket charge off",	1, 1 },</div><div class='del'>-	{ TOSA_GPIO_BAT_SW_ON,		"battery switch",	1, 0 },</div><div class='del'>-	{ TOSA_GPIO_BAT0_V_ON,		"main battery",		1, 0 },</div><div class='del'>-	{ TOSA_GPIO_BAT1_V_ON,		"jacket battery",	1, 0 },</div><div class='del'>-	{ TOSA_GPIO_BAT1_TH_ON,		"main battery temp",	1, 0 },</div><div class='del'>-	{ TOSA_GPIO_BAT0_TH_ON,		"jacket battery temp",	1, 0 },</div><div class='del'>-	{ TOSA_GPIO_BU_CHRG_ON,		"backup battery",	1, 0 },</div><div class='del'>-	{ TOSA_GPIO_BAT0_CRG,		"main battery full",	0, 0 },</div><div class='del'>-	{ TOSA_GPIO_BAT1_CRG,		"jacket battery full",	0, 0 },</div><div class='del'>-	{ TOSA_GPIO_BAT0_LOW,		"main battery low",	0, 0 },</div><div class='del'>-	{ TOSA_GPIO_BAT1_LOW,		"jacket battery low",	0, 0 },</div><div class='del'>-	{ TOSA_GPIO_JACKET_DETECT,	"jacket detect",	0, 0 },</div><div class='add'>+static struct gpio tosa_bat_gpios[] = {</div><div class='add'>+	{ TOSA_GPIO_CHARGE_OFF,	   GPIOF_OUT_INIT_HIGH, "main charge off" },</div><div class='add'>+	{ TOSA_GPIO_CHARGE_OFF_JC, GPIOF_OUT_INIT_HIGH, "jacket charge off" },</div><div class='add'>+	{ TOSA_GPIO_BAT_SW_ON,	   GPIOF_OUT_INIT_LOW,	"battery switch" },</div><div class='add'>+	{ TOSA_GPIO_BAT0_V_ON,	   GPIOF_OUT_INIT_LOW,	"main battery" },</div><div class='add'>+	{ TOSA_GPIO_BAT1_V_ON,	   GPIOF_OUT_INIT_LOW,	"jacket battery" },</div><div class='add'>+	{ TOSA_GPIO_BAT1_TH_ON,	   GPIOF_OUT_INIT_LOW,	"main battery temp" },</div><div class='add'>+	{ TOSA_GPIO_BAT0_TH_ON,	   GPIOF_OUT_INIT_LOW,	"jacket battery temp" },</div><div class='add'>+	{ TOSA_GPIO_BU_CHRG_ON,	   GPIOF_OUT_INIT_LOW,	"backup battery" },</div><div class='add'>+	{ TOSA_GPIO_BAT0_CRG,	   GPIOF_IN,		"main battery full" },</div><div class='add'>+	{ TOSA_GPIO_BAT1_CRG,	   GPIOF_IN,		"jacket battery full" },</div><div class='add'>+	{ TOSA_GPIO_BAT0_LOW,	   GPIOF_IN,		"main battery low" },</div><div class='add'>+	{ TOSA_GPIO_BAT1_LOW,	   GPIOF_IN,		"jacket battery low" },</div><div class='add'>+	{ TOSA_GPIO_JACKET_DETECT, GPIOF_IN,		"jacket detect" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -350,27 +345,13 @@ static int tosa_bat_resume(struct platform_device *dev)</div><div class='ctx'> static int __devinit tosa_bat_probe(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!machine_is_tosa())</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(gpios); i++) {</div><div class='del'>-		ret = gpio_request(gpios[i].gpio, gpios[i].name);</div><div class='del'>-		if (ret) {</div><div class='del'>-			i--;</div><div class='del'>-			goto err_gpio;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (gpios[i].output)</div><div class='del'>-			ret = gpio_direction_output(gpios[i].gpio,</div><div class='del'>-					gpios[i].value);</div><div class='del'>-		else</div><div class='del'>-			ret = gpio_direction_input(gpios[i].gpio);</div><div class='del'>-</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err_gpio;</div><div class='del'>-	}</div><div class='add'>+	ret = gpio_request_array(tosa_bat_gpios, ARRAY_SIZE(tosa_bat_gpios));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;tosa_bat_main.work_lock);</div><div class='ctx'> 	mutex_init(&amp;tosa_bat_jacket.work_lock);</div><div class='hunk'>@@ -424,18 +405,12 @@ err_psy_reg_main:</div><div class='ctx'> 	/* see comment in tosa_bat_remove */</div><div class='ctx'> 	cancel_work_sync(&amp;bat_work);</div><div class='ctx'> </div><div class='del'>-	i--;</div><div class='del'>-err_gpio:</div><div class='del'>-	for (; i &gt;= 0; i--)</div><div class='del'>-		gpio_free(gpios[i].gpio);</div><div class='del'>-</div><div class='add'>+	gpio_free_array(tosa_bat_gpios, ARRAY_SIZE(tosa_bat_gpios));</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __devexit tosa_bat_remove(struct platform_device *dev)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='ctx'> 	free_irq(gpio_to_irq(TOSA_GPIO_JACKET_DETECT), &amp;tosa_bat_jacket);</div><div class='ctx'> 	free_irq(gpio_to_irq(TOSA_GPIO_BAT1_CRG), &amp;tosa_bat_jacket);</div><div class='ctx'> 	free_irq(gpio_to_irq(TOSA_GPIO_BAT0_CRG), &amp;tosa_bat_main);</div><div class='hunk'>@@ -450,10 +425,7 @@ static int __devexit tosa_bat_remove(struct platform_device *dev)</div><div class='ctx'> 	 * unregistered now.</div><div class='ctx'> 	 */</div><div class='ctx'> 	cancel_work_sync(&amp;bat_work);</div><div class='del'>-</div><div class='del'>-	for (i = ARRAY_SIZE(gpios) - 1; i &gt;= 0; i--)</div><div class='del'>-		gpio_free(gpios[i].gpio);</div><div class='del'>-</div><div class='add'>+	gpio_free_array(tosa_bat_gpios, ARRAY_SIZE(tosa_bat_gpios));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -466,18 +438,7 @@ static struct platform_driver tosa_bat_driver = {</div><div class='ctx'> 	.resume		= tosa_bat_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init tosa_bat_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;tosa_bat_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit tosa_bat_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;tosa_bat_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(tosa_bat_init);</div><div class='del'>-module_exit(tosa_bat_exit);</div><div class='add'>+module_platform_driver(tosa_bat_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Dmitry Baryshkov");</div><div class='head'>diff --git a/drivers/power/wm831x_backup.c b/drivers/power/wm831x_backup.c<br/>index e648cbea1e6a..6243e6975126 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/wm831x_backup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/wm831x_backup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/wm831x_backup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/wm831x_backup.c</a></div><div class='hunk'>@@ -226,17 +226,7 @@ static struct platform_driver wm831x_backup_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init wm831x_backup_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;wm831x_backup_driver);</div><div class='del'>-}</div><div class='del'>-module_init(wm831x_backup_init);</div><div class='del'>-</div><div class='del'>-static void __exit wm831x_backup_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;wm831x_backup_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(wm831x_backup_exit);</div><div class='add'>+module_platform_driver(wm831x_backup_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Backup battery charger driver for WM831x PMICs");</div><div class='ctx'> MODULE_AUTHOR("Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;");</div><div class='head'>diff --git a/drivers/power/wm831x_power.c b/drivers/power/wm831x_power.c<br/>index 6cc2ca6427f3..987332b71d8d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/wm831x_power.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/wm831x_power.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/wm831x_power.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/wm831x_power.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@ struct wm831x_power {</div><div class='ctx'> 	char wall_name[20];</div><div class='ctx'> 	char usb_name[20];</div><div class='ctx'> 	char battery_name[20];</div><div class='add'>+	bool have_battery;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int wm831x_power_check_online(struct wm831x *wm831x, int supply,</div><div class='hunk'>@@ -449,7 +450,8 @@ static irqreturn_t wm831x_bat_irq(int irq, void *data)</div><div class='ctx'> </div><div class='ctx'> 	/* The battery charger is autonomous so we don't need to do</div><div class='ctx'> 	 * anything except kick user space */</div><div class='del'>-	power_supply_changed(&amp;wm831x_power-&gt;battery);</div><div class='add'>+	if (wm831x_power-&gt;have_battery)</div><div class='add'>+		power_supply_changed(&amp;wm831x_power-&gt;battery);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -479,7 +481,8 @@ static irqreturn_t wm831x_pwr_src_irq(int irq, void *data)</div><div class='ctx'> 	dev_dbg(wm831x-&gt;dev, "Power source changed\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Just notify for everything - little harm in overnotifying. */</div><div class='del'>-	power_supply_changed(&amp;wm831x_power-&gt;battery);</div><div class='add'>+	if (wm831x_power-&gt;have_battery)</div><div class='add'>+		power_supply_changed(&amp;wm831x_power-&gt;battery);</div><div class='ctx'> 	power_supply_changed(&amp;wm831x_power-&gt;usb);</div><div class='ctx'> 	power_supply_changed(&amp;wm831x_power-&gt;wall);</div><div class='ctx'> </div><div class='hunk'>@@ -537,15 +540,6 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_kmalloc;</div><div class='ctx'> </div><div class='del'>-	battery-&gt;name = power-&gt;battery_name;</div><div class='del'>-	battery-&gt;properties = wm831x_bat_props;</div><div class='del'>-	battery-&gt;num_properties = ARRAY_SIZE(wm831x_bat_props);</div><div class='del'>-	battery-&gt;get_property = wm831x_bat_get_prop;</div><div class='del'>-	battery-&gt;use_for_apm = 1;</div><div class='del'>-	ret = power_supply_register(&amp;pdev-&gt;dev, battery);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_wall;</div><div class='del'>-</div><div class='ctx'> 	usb-&gt;name = power-&gt;usb_name,</div><div class='ctx'> 	usb-&gt;type = POWER_SUPPLY_TYPE_USB;</div><div class='ctx'> 	usb-&gt;properties = wm831x_usb_props;</div><div class='hunk'>@@ -553,7 +547,23 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev)</div><div class='ctx'> 	usb-&gt;get_property = wm831x_usb_get_prop;</div><div class='ctx'> 	ret = power_supply_register(&amp;pdev-&gt;dev, usb);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto err_battery;</div><div class='add'>+		goto err_wall;</div><div class='add'>+</div><div class='add'>+	ret = wm831x_reg_read(wm831x, WM831X_CHARGER_CONTROL_1);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_wall;</div><div class='add'>+	power-&gt;have_battery = ret &amp; WM831X_CHG_ENA;</div><div class='add'>+</div><div class='add'>+	if (power-&gt;have_battery) {</div><div class='add'>+		    battery-&gt;name = power-&gt;battery_name;</div><div class='add'>+		    battery-&gt;properties = wm831x_bat_props;</div><div class='add'>+		    battery-&gt;num_properties = ARRAY_SIZE(wm831x_bat_props);</div><div class='add'>+		    battery-&gt;get_property = wm831x_bat_get_prop;</div><div class='add'>+		    battery-&gt;use_for_apm = 1;</div><div class='add'>+		    ret = power_supply_register(&amp;pdev-&gt;dev, battery);</div><div class='add'>+		    if (ret)</div><div class='add'>+			    goto err_usb;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	irq = platform_get_irq_byname(pdev, "SYSLO");</div><div class='ctx'> 	ret = request_threaded_irq(irq, NULL, wm831x_syslo_irq,</div><div class='hunk'>@@ -562,7 +572,7 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (ret != 0) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Failed to request SYSLO IRQ %d: %d\n",</div><div class='ctx'> 			irq, ret);</div><div class='del'>-		goto err_usb;</div><div class='add'>+		goto err_battery;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	irq = platform_get_irq_byname(pdev, "PWR SRC");</div><div class='hunk'>@@ -601,10 +611,11 @@ err_bat_irq:</div><div class='ctx'> err_syslo:</div><div class='ctx'> 	irq = platform_get_irq_byname(pdev, "SYSLO");</div><div class='ctx'> 	free_irq(irq, power);</div><div class='add'>+err_battery:</div><div class='add'>+	if (power-&gt;have_battery)</div><div class='add'>+		power_supply_unregister(battery);</div><div class='ctx'> err_usb:</div><div class='ctx'> 	power_supply_unregister(usb);</div><div class='del'>-err_battery:</div><div class='del'>-	power_supply_unregister(battery);</div><div class='ctx'> err_wall:</div><div class='ctx'> 	power_supply_unregister(wall);</div><div class='ctx'> err_kmalloc:</div><div class='hunk'>@@ -628,7 +639,8 @@ static __devexit int wm831x_power_remove(struct platform_device *pdev)</div><div class='ctx'> 	irq = platform_get_irq_byname(pdev, "SYSLO");</div><div class='ctx'> 	free_irq(irq, wm831x_power);</div><div class='ctx'> </div><div class='del'>-	power_supply_unregister(&amp;wm831x_power-&gt;battery);</div><div class='add'>+	if (wm831x_power-&gt;have_battery)</div><div class='add'>+		power_supply_unregister(&amp;wm831x_power-&gt;battery);</div><div class='ctx'> 	power_supply_unregister(&amp;wm831x_power-&gt;wall);</div><div class='ctx'> 	power_supply_unregister(&amp;wm831x_power-&gt;usb);</div><div class='ctx'> 	kfree(wm831x_power);</div><div class='hunk'>@@ -643,17 +655,7 @@ static struct platform_driver wm831x_power_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init wm831x_power_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;wm831x_power_driver);</div><div class='del'>-}</div><div class='del'>-module_init(wm831x_power_init);</div><div class='del'>-</div><div class='del'>-static void __exit wm831x_power_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;wm831x_power_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(wm831x_power_exit);</div><div class='add'>+module_platform_driver(wm831x_power_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Power supply driver for WM831x PMICs");</div><div class='ctx'> MODULE_AUTHOR("Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;");</div><div class='head'>diff --git a/drivers/power/wm8350_power.c b/drivers/power/wm8350_power.c<br/>index 0693902d6151..fae04d384657 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/wm8350_power.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/wm8350_power.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/wm8350_power.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/wm8350_power.c</a></div><div class='hunk'>@@ -522,17 +522,7 @@ static struct platform_driver wm8350_power_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init wm8350_power_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;wm8350_power_driver);</div><div class='del'>-}</div><div class='del'>-module_init(wm8350_power_init);</div><div class='del'>-</div><div class='del'>-static void __exit wm8350_power_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;wm8350_power_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(wm8350_power_exit);</div><div class='add'>+module_platform_driver(wm8350_power_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("Power supply driver for WM8350");</div><div class='head'>diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c<br/>index 156559e56fa5..d2d4c08c681c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/wm97xx_battery.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/wm97xx_battery.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/wm97xx_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/wm97xx_battery.c</a></div><div class='hunk'>@@ -25,9 +25,8 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-static DEFINE_MUTEX(bat_lock);</div><div class='ctx'> static struct work_struct bat_work;</div><div class='del'>-static struct mutex work_lock;</div><div class='add'>+static DEFINE_MUTEX(work_lock);</div><div class='ctx'> static int bat_status = POWER_SUPPLY_STATUS_UNKNOWN;</div><div class='ctx'> static enum power_supply_property *prop;</div><div class='ctx'> </div><div class='hunk'>@@ -181,8 +180,6 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)</div><div class='ctx'> 	if (dev-&gt;id != -1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_init(&amp;work_lock);</div><div class='del'>-</div><div class='ctx'> 	if (!pdata) {</div><div class='ctx'> 		dev_err(&amp;dev-&gt;dev, "No platform_data supplied\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -196,7 +193,7 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto err2;</div><div class='ctx'> 		ret = request_irq(gpio_to_irq(pdata-&gt;charge_gpio),</div><div class='del'>-				wm97xx_chrg_irq, IRQF_DISABLED,</div><div class='add'>+				wm97xx_chrg_irq, 0,</div><div class='ctx'> 				"AC Detect", dev);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto err2;</div><div class='hunk'>@@ -291,18 +288,7 @@ static struct platform_driver wm97xx_bat_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(wm97xx_bat_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init wm97xx_bat_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;wm97xx_bat_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit wm97xx_bat_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;wm97xx_bat_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(wm97xx_bat_init);</div><div class='del'>-module_exit(wm97xx_bat_exit);</div><div class='add'>+module_platform_driver(wm97xx_bat_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Marek Vasut &lt;marek.vasut@gmail.com&gt;");</div><div class='head'>diff --git a/drivers/power/z2_battery.c b/drivers/power/z2_battery.c<br/>index d119c38b3ff6..636ebb2a0e80 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/power/z2_battery.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/power/z2_battery.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/power/z2_battery.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/power/z2_battery.c</a></div><div class='hunk'>@@ -218,7 +218,7 @@ static int __devinit z2_batt_probe(struct i2c_client *client,</div><div class='ctx'> 		irq_set_irq_type(gpio_to_irq(info-&gt;charge_gpio),</div><div class='ctx'> 				 IRQ_TYPE_EDGE_BOTH);</div><div class='ctx'> 		ret = request_irq(gpio_to_irq(info-&gt;charge_gpio),</div><div class='del'>-				z2_charge_switch_irq, IRQF_DISABLED,</div><div class='add'>+				z2_charge_switch_irq, 0,</div><div class='ctx'> 				"AC Detect", charger);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto err3;</div><div class='hunk'>@@ -313,7 +313,7 @@ static struct i2c_driver z2_batt_driver = {</div><div class='ctx'> 		.pm	= Z2_BATTERY_PM_OPS</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= z2_batt_probe,</div><div class='del'>-	.remove		= z2_batt_remove,</div><div class='add'>+	.remove		= __devexit_p(z2_batt_remove),</div><div class='ctx'> 	.id_table	= z2_batt_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/88pm8607.c b/drivers/regulator/88pm8607.c<br/>index ca0d608f8248..df33530cec4a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/88pm8607.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/88pm8607.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/88pm8607.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/88pm8607.c</a></div><div class='hunk'>@@ -427,7 +427,7 @@ static int __devinit pm8607_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* replace driver_data with info */</div><div class='ctx'> 	info-&gt;regulator = regulator_register(&amp;info-&gt;desc, &amp;pdev-&gt;dev,</div><div class='del'>-					     pdata, info);</div><div class='add'>+					     pdata, info, NULL);</div><div class='ctx'> 	if (IS_ERR(info-&gt;regulator)) {</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='head'>diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig<br/>index 9713b1b860cb..7a61b17ddd04 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/Kconfig</a></div><div class='hunk'>@@ -93,6 +93,7 @@ config REGULATOR_MAX1586</div><div class='ctx'> config REGULATOR_MAX8649</div><div class='ctx'> 	tristate "Maxim 8649 voltage regulator"</div><div class='ctx'> 	depends on I2C</div><div class='add'>+	select REGMAP_I2C</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver controls a Maxim 8649 voltage output regulator via</div><div class='ctx'> 	  I2C bus.</div><div class='hunk'>@@ -177,6 +178,13 @@ config REGULATOR_DA903X</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='ctx'> </div><div class='add'>+config REGULATOR_DA9052</div><div class='add'>+	tristate "Dialog DA9052/DA9053 regulators"</div><div class='add'>+	depends on PMIC_DA9052</div><div class='add'>+	help</div><div class='add'>+	  This driver supports the voltage regulators of DA9052-BC and</div><div class='add'>+	  DA9053-AA/Bx PMIC.</div><div class='add'>+</div><div class='ctx'> config REGULATOR_PCF50633</div><div class='ctx'> 	tristate "PCF50633 regulator driver"</div><div class='ctx'>         depends on MFD_PCF50633</div><div class='head'>diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile<br/>index 93a6318f5328..503bac87715e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/Makefile</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_REGULATOR) += core.o dummy.o</div><div class='add'>+obj-$(CONFIG_OF) += of_regulator.o</div><div class='ctx'> obj-$(CONFIG_REGULATOR_FIXED_VOLTAGE) += fixed.o</div><div class='ctx'> obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o</div><div class='ctx'> obj-$(CONFIG_REGULATOR_USERSPACE_CONSUMER) += userspace-consumer.o</div><div class='hunk'>@@ -29,6 +30,7 @@ obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o</div><div class='ctx'> obj-$(CONFIG_REGULATOR_WM8994) += wm8994-regulator.o</div><div class='ctx'> obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o</div><div class='ctx'> obj-$(CONFIG_REGULATOR_DA903X)	+= da903x.o</div><div class='add'>+obj-$(CONFIG_REGULATOR_DA9052)	+= da9052-regulator.o</div><div class='ctx'> obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o</div><div class='ctx'> obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o</div><div class='ctx'> obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o</div><div class='head'>diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c<br/>index 298c6c6a2795..685ad43b0749 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/aat2870-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/aat2870-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/aat2870-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/aat2870-regulator.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@ static int aat2870_ldo_set_voltage_sel(struct regulator_dev *rdev,</div><div class='ctx'> 	struct aat2870_data *aat2870 = dev_get_drvdata(ri-&gt;pdev-&gt;dev.parent);</div><div class='ctx'> </div><div class='ctx'> 	return aat2870-&gt;update(aat2870, ri-&gt;voltage_addr, ri-&gt;voltage_mask,</div><div class='del'>-			(selector &lt;&lt; ri-&gt;voltage_shift) &amp; ri-&gt;voltage_mask);</div><div class='add'>+			       selector &lt;&lt; ri-&gt;voltage_shift);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aat2870_ldo_get_voltage_sel(struct regulator_dev *rdev)</div><div class='hunk'>@@ -188,7 +188,7 @@ static int aat2870_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	ri-&gt;pdev = pdev;</div><div class='ctx'> </div><div class='ctx'> 	rdev = regulator_register(&amp;ri-&gt;desc, &amp;pdev-&gt;dev,</div><div class='del'>-				  pdev-&gt;dev.platform_data, ri);</div><div class='add'>+				  pdev-&gt;dev.platform_data, ri, NULL);</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='ctx'> 			ri-&gt;desc.name);</div><div class='head'>diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c<br/>index 585e4946fe0a..042271aace6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/ab3100.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/ab3100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/ab3100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/ab3100.c</a></div><div class='hunk'>@@ -634,7 +634,7 @@ static int __devinit ab3100_regulators_probe(struct platform_device *pdev)</div><div class='ctx'> 		rdev = regulator_register(&amp;ab3100_regulator_desc[i],</div><div class='ctx'> 					  &amp;pdev-&gt;dev,</div><div class='ctx'> 					  &amp;plfdata-&gt;reg_constraints[i],</div><div class='del'>-					  reg);</div><div class='add'>+					  reg, NULL);</div><div class='ctx'> </div><div class='ctx'> 		if (IS_ERR(rdev)) {</div><div class='ctx'> 			err = PTR_ERR(rdev);</div><div class='head'>diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c<br/>index 6e1ae69646b3..c9b92531ae60 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/ab8500.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/ab8500.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/ab8500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/ab8500.c</a></div><div class='hunk'>@@ -16,8 +16,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/mfd/ab8500.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/abx500.h&gt;</div><div class='add'>+#include &lt;linux/mfd/abx500/ab8500.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='ctx'> #include &lt;linux/regulator/ab8500.h&gt;</div><div class='hunk'>@@ -822,7 +822,7 @@ static __devinit int ab8500_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 		/* register regulator with framework */</div><div class='ctx'> 		info-&gt;regulator = regulator_register(&amp;info-&gt;desc, &amp;pdev-&gt;dev,</div><div class='del'>-				&amp;pdata-&gt;regulator[i], info);</div><div class='add'>+				&amp;pdata-&gt;regulator[i], info, NULL);</div><div class='ctx'> 		if (IS_ERR(info-&gt;regulator)) {</div><div class='ctx'> 			err = PTR_ERR(info-&gt;regulator);</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "failed to register regulator %s\n",</div><div class='head'>diff --git a/drivers/regulator/ad5398.c b/drivers/regulator/ad5398.c<br/>index a4be41614eeb..483c80930852 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/ad5398.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/ad5398.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/ad5398.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/ad5398.c</a></div><div class='hunk'>@@ -233,7 +233,7 @@ static int __devinit ad5398_probe(struct i2c_client *client,</div><div class='ctx'> 	chip-&gt;current_mask = (chip-&gt;current_level - 1) &lt;&lt; chip-&gt;current_offset;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;rdev = regulator_register(&amp;ad5398_reg, &amp;client-&gt;dev,</div><div class='del'>-					init_data, chip);</div><div class='add'>+					init_data, chip, NULL);</div><div class='ctx'> 	if (IS_ERR(chip-&gt;rdev)) {</div><div class='ctx'> 		ret = PTR_ERR(chip-&gt;rdev);</div><div class='ctx'> 		dev_err(&amp;client-&gt;dev, "failed to register %s %s\n",</div><div class='head'>diff --git a/drivers/regulator/bq24022.c b/drivers/regulator/bq24022.c<br/>index e24d1b7d97a8..9fab6d1bbe80 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/bq24022.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/bq24022.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/bq24022.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/bq24022.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ static int __init bq24022_probe(struct platform_device *pdev)</div><div class='ctx'> 	ret = gpio_direction_output(pdata-&gt;gpio_nce, 1);</div><div class='ctx'> </div><div class='ctx'> 	bq24022 = regulator_register(&amp;bq24022_desc, &amp;pdev-&gt;dev,</div><div class='del'>-				     pdata-&gt;init_data, pdata);</div><div class='add'>+				     pdata-&gt;init_data, pdata, NULL);</div><div class='ctx'> 	if (IS_ERR(bq24022)) {</div><div class='ctx'> 		dev_dbg(&amp;pdev-&gt;dev, "couldn't register regulator\n");</div><div class='ctx'> 		ret = PTR_ERR(bq24022);</div><div class='head'>diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c<br/>index 938398f3e869..ca86f39a0fdc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/core.c</a></div><div class='hunk'>@@ -25,6 +25,8 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/regulator/of_regulator.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/consumer.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='hunk'>@@ -132,6 +134,33 @@ static struct regulator *get_device_regulator(struct device *dev)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * of_get_regulator - get a regulator device node based on supply name</div><div class='add'>+ * @dev: Device pointer for the consumer (of regulator) device</div><div class='add'>+ * @supply: regulator supply name</div><div class='add'>+ *</div><div class='add'>+ * Extract the regulator device node corresponding to the supply name.</div><div class='add'>+ * retruns the device node corresponding to the regulator if found, else</div><div class='add'>+ * returns NULL.</div><div class='add'>+ */</div><div class='add'>+static struct device_node *of_get_regulator(struct device *dev, const char *supply)</div><div class='add'>+{</div><div class='add'>+	struct device_node *regnode = NULL;</div><div class='add'>+	char prop_name[32]; /* 32 is max size of property name */</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "Looking up %s-supply from device tree\n", supply);</div><div class='add'>+</div><div class='add'>+	snprintf(prop_name, 32, "%s-supply", supply);</div><div class='add'>+	regnode = of_parse_phandle(dev-&gt;of_node, prop_name, 0);</div><div class='add'>+</div><div class='add'>+	if (!regnode) {</div><div class='add'>+		dev_warn(dev, "%s property in node %s references invalid phandle",</div><div class='add'>+				prop_name, dev-&gt;of_node-&gt;full_name);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	return regnode;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Platform voltage constraint check */</div><div class='ctx'> static int regulator_check_voltage(struct regulator_dev *rdev,</div><div class='ctx'> 				   int *min_uV, int *max_uV)</div><div class='hunk'>@@ -883,8 +912,12 @@ static int set_machine_constraints(struct regulator_dev *rdev,</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct regulator_ops *ops = rdev-&gt;desc-&gt;ops;</div><div class='ctx'> </div><div class='del'>-	rdev-&gt;constraints = kmemdup(constraints, sizeof(*constraints),</div><div class='del'>-				    GFP_KERNEL);</div><div class='add'>+	if (constraints)</div><div class='add'>+		rdev-&gt;constraints = kmemdup(constraints, sizeof(*constraints),</div><div class='add'>+					    GFP_KERNEL);</div><div class='add'>+	else</div><div class='add'>+		rdev-&gt;constraints = kzalloc(sizeof(*constraints),</div><div class='add'>+					    GFP_KERNEL);</div><div class='ctx'> 	if (!rdev-&gt;constraints)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -893,7 +926,7 @@ static int set_machine_constraints(struct regulator_dev *rdev,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* do we need to setup our suspend state */</div><div class='del'>-	if (constraints-&gt;initial_state) {</div><div class='add'>+	if (rdev-&gt;constraints-&gt;initial_state) {</div><div class='ctx'> 		ret = suspend_prepare(rdev, rdev-&gt;constraints-&gt;initial_state);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			rdev_err(rdev, "failed to set suspend state\n");</div><div class='hunk'>@@ -901,7 +934,7 @@ static int set_machine_constraints(struct regulator_dev *rdev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (constraints-&gt;initial_mode) {</div><div class='add'>+	if (rdev-&gt;constraints-&gt;initial_mode) {</div><div class='ctx'> 		if (!ops-&gt;set_mode) {</div><div class='ctx'> 			rdev_err(rdev, "no set_mode operation\n");</div><div class='ctx'> 			ret = -EINVAL;</div><div class='hunk'>@@ -952,9 +985,8 @@ static int set_supply(struct regulator_dev *rdev,</div><div class='ctx'> 	rdev_info(rdev, "supplied by %s\n", rdev_get_name(supply_rdev));</div><div class='ctx'> </div><div class='ctx'> 	rdev-&gt;supply = create_regulator(supply_rdev, &amp;rdev-&gt;dev, "SUPPLY");</div><div class='del'>-	if (IS_ERR(rdev-&gt;supply)) {</div><div class='del'>-		err = PTR_ERR(rdev-&gt;supply);</div><div class='del'>-		rdev-&gt;supply = NULL;</div><div class='add'>+	if (rdev-&gt;supply == NULL) {</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1148,6 +1180,30 @@ static int _regulator_get_enable_time(struct regulator_dev *rdev)</div><div class='ctx'> 	return rdev-&gt;desc-&gt;ops-&gt;enable_time(rdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct regulator_dev *regulator_dev_lookup(struct device *dev,</div><div class='add'>+							 const char *supply)</div><div class='add'>+{</div><div class='add'>+	struct regulator_dev *r;</div><div class='add'>+	struct device_node *node;</div><div class='add'>+</div><div class='add'>+	/* first do a dt based lookup */</div><div class='add'>+	if (dev &amp;&amp; dev-&gt;of_node) {</div><div class='add'>+		node = of_get_regulator(dev, supply);</div><div class='add'>+		if (node)</div><div class='add'>+			list_for_each_entry(r, &amp;regulator_list, list)</div><div class='add'>+				if (r-&gt;dev.parent &amp;&amp;</div><div class='add'>+					node == r-&gt;dev.of_node)</div><div class='add'>+					return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if not found, try doing it non-dt way */</div><div class='add'>+	list_for_each_entry(r, &amp;regulator_list, list)</div><div class='add'>+		if (strcmp(rdev_get_name(r), supply) == 0)</div><div class='add'>+			return r;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Internal regulator request function */</div><div class='ctx'> static struct regulator *_regulator_get(struct device *dev, const char *id,</div><div class='ctx'> 					int exclusive)</div><div class='hunk'>@@ -1168,6 +1224,10 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;regulator_list_mutex);</div><div class='ctx'> </div><div class='add'>+	rdev = regulator_dev_lookup(dev, id);</div><div class='add'>+	if (rdev)</div><div class='add'>+		goto found;</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry(map, &amp;regulator_map_list, list) {</div><div class='ctx'> 		/* If the mapping has a device set up it must match */</div><div class='ctx'> 		if (map-&gt;dev_name &amp;&amp;</div><div class='hunk'>@@ -1221,6 +1281,7 @@ found:</div><div class='ctx'> 	if (regulator == NULL) {</div><div class='ctx'> 		regulator = ERR_PTR(-ENOMEM);</div><div class='ctx'> 		module_put(rdev-&gt;owner);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rdev-&gt;open_count++;</div><div class='hunk'>@@ -1726,6 +1787,7 @@ int regulator_is_supported_voltage(struct regulator *regulator,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(regulator_is_supported_voltage);</div><div class='ctx'> </div><div class='ctx'> static int _regulator_do_set_voltage(struct regulator_dev *rdev,</div><div class='ctx'> 				     int min_uV, int max_uV)</div><div class='hunk'>@@ -2429,6 +2491,43 @@ err:</div><div class='ctx'> EXPORT_SYMBOL_GPL(regulator_bulk_disable);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * regulator_bulk_force_disable - force disable multiple regulator consumers</div><div class='add'>+ *</div><div class='add'>+ * @num_consumers: Number of consumers</div><div class='add'>+ * @consumers:     Consumer data; clients are stored here.</div><div class='add'>+ * @return         0 on success, an errno on failure</div><div class='add'>+ *</div><div class='add'>+ * This convenience API allows consumers to forcibly disable multiple regulator</div><div class='add'>+ * clients in a single API call.</div><div class='add'>+ * NOTE: This should be used for situations when device damage will</div><div class='add'>+ * likely occur if the regulators are not disabled (e.g. over temp).</div><div class='add'>+ * Although regulator_force_disable function call for some consumers can</div><div class='add'>+ * return error numbers, the function is called for all consumers.</div><div class='add'>+ */</div><div class='add'>+int regulator_bulk_force_disable(int num_consumers,</div><div class='add'>+			   struct regulator_bulk_data *consumers)</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; num_consumers; i++)</div><div class='add'>+		consumers[i].ret =</div><div class='add'>+			    regulator_force_disable(consumers[i].consumer);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_consumers; i++) {</div><div class='add'>+		if (consumers[i].ret != 0) {</div><div class='add'>+			ret = consumers[i].ret;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(regulator_bulk_force_disable);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * regulator_bulk_free - free multiple regulator consumers</div><div class='ctx'>  *</div><div class='ctx'>  * @num_consumers: Number of consumers</div><div class='hunk'>@@ -2503,7 +2602,8 @@ static int add_regulator_attributes(struct regulator_dev *rdev)</div><div class='ctx'> 	int			status = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* some attributes need specific methods to be displayed */</div><div class='del'>-	if (ops-&gt;get_voltage || ops-&gt;get_voltage_sel) {</div><div class='add'>+	if ((ops-&gt;get_voltage &amp;&amp; ops-&gt;get_voltage(rdev) &gt;= 0) ||</div><div class='add'>+	    (ops-&gt;get_voltage_sel &amp;&amp; ops-&gt;get_voltage_sel(rdev) &gt;= 0)) {</div><div class='ctx'> 		status = device_create_file(dev, &amp;dev_attr_microvolts);</div><div class='ctx'> 		if (status &lt; 0)</div><div class='ctx'> 			return status;</div><div class='hunk'>@@ -2637,11 +2737,13 @@ static void rdev_init_debugfs(struct regulator_dev *rdev)</div><div class='ctx'>  */</div><div class='ctx'> struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,</div><div class='ctx'> 	struct device *dev, const struct regulator_init_data *init_data,</div><div class='del'>-	void *driver_data)</div><div class='add'>+	void *driver_data, struct device_node *of_node)</div><div class='ctx'> {</div><div class='add'>+	const struct regulation_constraints *constraints = NULL;</div><div class='ctx'> 	static atomic_t regulator_no = ATOMIC_INIT(0);</div><div class='ctx'> 	struct regulator_dev *rdev;</div><div class='ctx'> 	int ret, i;</div><div class='add'>+	const char *supply = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (regulator_desc == NULL)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='hunk'>@@ -2653,9 +2755,6 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,</div><div class='ctx'> 	    regulator_desc-&gt;type != REGULATOR_CURRENT)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='ctx'> </div><div class='del'>-	if (!init_data)</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-</div><div class='ctx'> 	/* Only one of each should be implemented */</div><div class='ctx'> 	WARN_ON(regulator_desc-&gt;ops-&gt;get_voltage &amp;&amp;</div><div class='ctx'> 		regulator_desc-&gt;ops-&gt;get_voltage_sel);</div><div class='hunk'>@@ -2688,7 +2787,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;rdev-&gt;disable_work, regulator_disable_work);</div><div class='ctx'> </div><div class='ctx'> 	/* preform any regulator specific init */</div><div class='del'>-	if (init_data-&gt;regulator_init) {</div><div class='add'>+	if (init_data &amp;&amp; init_data-&gt;regulator_init) {</div><div class='ctx'> 		ret = init_data-&gt;regulator_init(rdev-&gt;reg_data);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto clean;</div><div class='hunk'>@@ -2696,6 +2795,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,</div><div class='ctx'> </div><div class='ctx'> 	/* register with sysfs */</div><div class='ctx'> 	rdev-&gt;dev.class = &amp;regulator_class;</div><div class='add'>+	rdev-&gt;dev.of_node = of_node;</div><div class='ctx'> 	rdev-&gt;dev.parent = dev;</div><div class='ctx'> 	dev_set_name(&amp;rdev-&gt;dev, "regulator.%d",</div><div class='ctx'> 		     atomic_inc_return(&amp;regulator_no) - 1);</div><div class='hunk'>@@ -2708,7 +2808,10 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,</div><div class='ctx'> 	dev_set_drvdata(&amp;rdev-&gt;dev, rdev);</div><div class='ctx'> </div><div class='ctx'> 	/* set regulator constraints */</div><div class='del'>-	ret = set_machine_constraints(rdev, &amp;init_data-&gt;constraints);</div><div class='add'>+	if (init_data)</div><div class='add'>+		constraints = &amp;init_data-&gt;constraints;</div><div class='add'>+</div><div class='add'>+	ret = set_machine_constraints(rdev, constraints);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto scrub;</div><div class='ctx'> </div><div class='hunk'>@@ -2717,21 +2820,18 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto scrub;</div><div class='ctx'> </div><div class='del'>-	if (init_data-&gt;supply_regulator) {</div><div class='add'>+	if (init_data &amp;&amp; init_data-&gt;supply_regulator)</div><div class='add'>+		supply = init_data-&gt;supply_regulator;</div><div class='add'>+	else if (regulator_desc-&gt;supply_name)</div><div class='add'>+		supply = regulator_desc-&gt;supply_name;</div><div class='add'>+</div><div class='add'>+	if (supply) {</div><div class='ctx'> 		struct regulator_dev *r;</div><div class='del'>-		int found = 0;</div><div class='ctx'> </div><div class='del'>-		list_for_each_entry(r, &amp;regulator_list, list) {</div><div class='del'>-			if (strcmp(rdev_get_name(r),</div><div class='del'>-				   init_data-&gt;supply_regulator) == 0) {</div><div class='del'>-				found = 1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		r = regulator_dev_lookup(dev, supply);</div><div class='ctx'> </div><div class='del'>-		if (!found) {</div><div class='del'>-			dev_err(dev, "Failed to find supply %s\n",</div><div class='del'>-				init_data-&gt;supply_regulator);</div><div class='add'>+		if (!r) {</div><div class='add'>+			dev_err(dev, "Failed to find supply %s\n", supply);</div><div class='ctx'> 			ret = -ENODEV;</div><div class='ctx'> 			goto scrub;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2739,18 +2839,28 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,</div><div class='ctx'> 		ret = set_supply(rdev, r);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto scrub;</div><div class='add'>+</div><div class='add'>+		/* Enable supply if rail is enabled */</div><div class='add'>+		if (rdev-&gt;desc-&gt;ops-&gt;is_enabled &amp;&amp;</div><div class='add'>+				rdev-&gt;desc-&gt;ops-&gt;is_enabled(rdev)) {</div><div class='add'>+			ret = regulator_enable(rdev-&gt;supply);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				goto scrub;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* add consumers devices */</div><div class='del'>-	for (i = 0; i &lt; init_data-&gt;num_consumer_supplies; i++) {</div><div class='del'>-		ret = set_consumer_device_supply(rdev,</div><div class='del'>-			init_data-&gt;consumer_supplies[i].dev,</div><div class='del'>-			init_data-&gt;consumer_supplies[i].dev_name,</div><div class='del'>-			init_data-&gt;consumer_supplies[i].supply);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			dev_err(dev, "Failed to set supply %s\n",</div><div class='add'>+	if (init_data) {</div><div class='add'>+		for (i = 0; i &lt; init_data-&gt;num_consumer_supplies; i++) {</div><div class='add'>+			ret = set_consumer_device_supply(rdev,</div><div class='add'>+				init_data-&gt;consumer_supplies[i].dev,</div><div class='add'>+				init_data-&gt;consumer_supplies[i].dev_name,</div><div class='ctx'> 				init_data-&gt;consumer_supplies[i].supply);</div><div class='del'>-			goto unset_supplies;</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				dev_err(dev, "Failed to set supply %s\n",</div><div class='add'>+					init_data-&gt;consumer_supplies[i].supply);</div><div class='add'>+				goto unset_supplies;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c<br/>index e23ddfa8b2c6..8dbc54da7d70 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/da903x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/da903x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/da903x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/da903x.c</a></div><div class='hunk'>@@ -537,7 +537,7 @@ static int __devinit da903x_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 		ri-&gt;desc.ops = &amp;da9030_regulator_ldo1_15_ops;</div><div class='ctx'> </div><div class='ctx'> 	rdev = regulator_register(&amp;ri-&gt;desc, &amp;pdev-&gt;dev,</div><div class='del'>-				  pdev-&gt;dev.platform_data, ri);</div><div class='add'>+				  pdev-&gt;dev.platform_data, ri, NULL);</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='ctx'> 				ri-&gt;desc.name);</div><div class='head'>diff --git a/drivers/regulator/da9052-regulator.c b/drivers/regulator/da9052-regulator.c<br/>new file mode 100644<br/>index 000000000000..3767364452fd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/da9052-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/da9052-regulator.c</a></div><div class='hunk'>@@ -0,0 +1,606 @@</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='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'>+</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/init.h&gt;</div><div class='add'>+#include &lt;linux/err.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/machine.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mfd/da9052/da9052.h&gt;</div><div class='add'>+#include &lt;linux/mfd/da9052/reg.h&gt;</div><div class='add'>+#include &lt;linux/mfd/da9052/pdata.h&gt;</div><div class='add'>+</div><div class='add'>+/* Buck step size */</div><div class='add'>+#define DA9052_BUCK_PERI_3uV_STEP		100000</div><div class='add'>+#define DA9052_BUCK_PERI_REG_MAP_UPTO_3uV	24</div><div class='add'>+#define DA9052_CONST_3uV			3000000</div><div class='add'>+</div><div class='add'>+#define DA9052_MIN_UA		0</div><div class='add'>+#define DA9052_MAX_UA		3</div><div class='add'>+#define DA9052_CURRENT_RANGE	4</div><div class='add'>+</div><div class='add'>+/* Bit masks */</div><div class='add'>+#define DA9052_BUCK_ILIM_MASK_EVEN	0x0c</div><div class='add'>+#define DA9052_BUCK_ILIM_MASK_ODD	0xc0</div><div class='add'>+</div><div class='add'>+static const u32 da9052_current_limits[3][4] = {</div><div class='add'>+	{700000, 800000, 1000000, 1200000},	/* DA9052-BC BUCKs */</div><div class='add'>+	{1600000, 2000000, 2400000, 3000000},	/* DA9053-AA/Bx BUCK-CORE */</div><div class='add'>+	{800000, 1000000, 1200000, 1500000},	/* DA9053-AA/Bx BUCK-PRO,</div><div class='add'>+						 * BUCK-MEM and BUCK-PERI</div><div class='add'>+						*/</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct da9052_regulator_info {</div><div class='add'>+	struct regulator_desc reg_desc;</div><div class='add'>+	int step_uV;</div><div class='add'>+	int min_uV;</div><div class='add'>+	int max_uV;</div><div class='add'>+	unsigned char volt_shift;</div><div class='add'>+	unsigned char en_bit;</div><div class='add'>+	unsigned char activate_bit;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct da9052_regulator {</div><div class='add'>+	struct da9052 *da9052;</div><div class='add'>+	struct da9052_regulator_info *info;</div><div class='add'>+	struct regulator_dev *rdev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int verify_range(struct da9052_regulator_info *info,</div><div class='add'>+			 int min_uV, int max_uV)</div><div class='add'>+{</div><div class='add'>+	if (min_uV &gt; info-&gt;max_uV || max_uV &lt; info-&gt;min_uV)</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 da9052_regulator_enable(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct da9052_regulator *regulator = rdev_get_drvdata(rdev);</div><div class='add'>+	struct da9052_regulator_info *info = regulator-&gt;info;</div><div class='add'>+	int offset = rdev_get_id(rdev);</div><div class='add'>+</div><div class='add'>+	return da9052_reg_update(regulator-&gt;da9052,</div><div class='add'>+				 DA9052_BUCKCORE_REG + offset,</div><div class='add'>+				 1 &lt;&lt; info-&gt;en_bit, 1 &lt;&lt; info-&gt;en_bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_regulator_disable(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct da9052_regulator *regulator = rdev_get_drvdata(rdev);</div><div class='add'>+	struct da9052_regulator_info *info = regulator-&gt;info;</div><div class='add'>+	int offset = rdev_get_id(rdev);</div><div class='add'>+</div><div class='add'>+	return da9052_reg_update(regulator-&gt;da9052,</div><div class='add'>+				 DA9052_BUCKCORE_REG + offset,</div><div class='add'>+				 1 &lt;&lt; info-&gt;en_bit, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_regulator_is_enabled(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct da9052_regulator *regulator = rdev_get_drvdata(rdev);</div><div class='add'>+	struct da9052_regulator_info *info = regulator-&gt;info;</div><div class='add'>+	int offset = rdev_get_id(rdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = da9052_reg_read(regulator-&gt;da9052, DA9052_BUCKCORE_REG + offset);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ret &amp; (1 &lt;&lt; info-&gt;en_bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_dcdc_get_current_limit(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct da9052_regulator *regulator = rdev_get_drvdata(rdev);</div><div class='add'>+	int offset = rdev_get_id(rdev);</div><div class='add'>+	int ret, row = 2;</div><div class='add'>+</div><div class='add'>+	ret = da9052_reg_read(regulator-&gt;da9052, DA9052_BUCKA_REG + offset/2);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Determine the even or odd position of the buck current limit</div><div class='add'>+	 * register field</div><div class='add'>+	*/</div><div class='add'>+	if (offset % 2 == 0)</div><div class='add'>+		ret = (ret &amp; DA9052_BUCK_ILIM_MASK_EVEN) &gt;&gt; 2;</div><div class='add'>+	else</div><div class='add'>+		ret = (ret &amp; DA9052_BUCK_ILIM_MASK_ODD) &gt;&gt; 6;</div><div class='add'>+</div><div class='add'>+	/* Select the appropriate current limit range */</div><div class='add'>+	if (regulator-&gt;da9052-&gt;chip_id == DA9052)</div><div class='add'>+		row = 0;</div><div class='add'>+	else if (offset == 0)</div><div class='add'>+		row = 1;</div><div class='add'>+</div><div class='add'>+	return da9052_current_limits[row][ret];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_dcdc_set_current_limit(struct regulator_dev *rdev, int min_uA,</div><div class='add'>+					  int max_uA)</div><div class='add'>+{</div><div class='add'>+	struct da9052_regulator *regulator = rdev_get_drvdata(rdev);</div><div class='add'>+	int offset = rdev_get_id(rdev);</div><div class='add'>+	int reg_val = 0;</div><div class='add'>+	int i, row = 2;</div><div class='add'>+</div><div class='add'>+	/* Select the appropriate current limit range */</div><div class='add'>+	if (regulator-&gt;da9052-&gt;chip_id == DA9052)</div><div class='add'>+		row = 0;</div><div class='add'>+	else if (offset == 0)</div><div class='add'>+		row = 1;</div><div class='add'>+</div><div class='add'>+	if (min_uA &gt; da9052_current_limits[row][DA9052_MAX_UA] ||</div><div class='add'>+	    max_uA &lt; da9052_current_limits[row][DA9052_MIN_UA])</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DA9052_CURRENT_RANGE; i++) {</div><div class='add'>+		if (min_uA &lt;= da9052_current_limits[row][i]) {</div><div class='add'>+			reg_val = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Determine the even or odd position of the buck current limit</div><div class='add'>+	 * register field</div><div class='add'>+	*/</div><div class='add'>+	if (offset % 2 == 0)</div><div class='add'>+		return da9052_reg_update(regulator-&gt;da9052,</div><div class='add'>+					 DA9052_BUCKA_REG + offset/2,</div><div class='add'>+					 DA9052_BUCK_ILIM_MASK_EVEN,</div><div class='add'>+					 reg_val &lt;&lt; 2);</div><div class='add'>+	else</div><div class='add'>+		return da9052_reg_update(regulator-&gt;da9052,</div><div class='add'>+					 DA9052_BUCKA_REG + offset/2,</div><div class='add'>+					 DA9052_BUCK_ILIM_MASK_ODD,</div><div class='add'>+					 reg_val &lt;&lt; 6);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_list_buckperi_voltage(struct regulator_dev *rdev,</div><div class='add'>+					 unsigned int selector)</div><div class='add'>+{</div><div class='add'>+	struct da9052_regulator *regulator = rdev_get_drvdata(rdev);</div><div class='add'>+	struct da9052_regulator_info *info = regulator-&gt;info;</div><div class='add'>+	int volt_uV;</div><div class='add'>+</div><div class='add'>+	if ((regulator-&gt;da9052-&gt;chip_id == DA9052) &amp;&amp;</div><div class='add'>+	    (selector &gt;= DA9052_BUCK_PERI_REG_MAP_UPTO_3uV)) {</div><div class='add'>+		volt_uV = ((DA9052_BUCK_PERI_REG_MAP_UPTO_3uV * info-&gt;step_uV)</div><div class='add'>+			    + info-&gt;min_uV);</div><div class='add'>+		volt_uV += (selector - DA9052_BUCK_PERI_REG_MAP_UPTO_3uV)</div><div class='add'>+			    * (DA9052_BUCK_PERI_3uV_STEP);</div><div class='add'>+	} else</div><div class='add'>+			volt_uV = (selector * info-&gt;step_uV) + info-&gt;min_uV;</div><div class='add'>+</div><div class='add'>+	if (volt_uV &gt; info-&gt;max_uV)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return volt_uV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_list_voltage(struct regulator_dev *rdev,</div><div class='add'>+				unsigned int selector)</div><div class='add'>+{</div><div class='add'>+	struct da9052_regulator *regulator = rdev_get_drvdata(rdev);</div><div class='add'>+	struct da9052_regulator_info *info = regulator-&gt;info;</div><div class='add'>+	int volt_uV;</div><div class='add'>+</div><div class='add'>+	volt_uV = info-&gt;min_uV + info-&gt;step_uV * selector;</div><div class='add'>+</div><div class='add'>+	if (volt_uV &gt; info-&gt;max_uV)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return volt_uV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_regulator_set_voltage_int(struct regulator_dev *rdev,</div><div class='add'>+					     int min_uV, int max_uV,</div><div class='add'>+					     unsigned int *selector)</div><div class='add'>+{</div><div class='add'>+	struct da9052_regulator *regulator = rdev_get_drvdata(rdev);</div><div class='add'>+	struct da9052_regulator_info *info = regulator-&gt;info;</div><div class='add'>+	int offset = rdev_get_id(rdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = verify_range(info, min_uV, max_uV);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (min_uV &lt; info-&gt;min_uV)</div><div class='add'>+		min_uV = info-&gt;min_uV;</div><div class='add'>+</div><div class='add'>+	*selector = (min_uV - info-&gt;min_uV) / info-&gt;step_uV;</div><div class='add'>+</div><div class='add'>+	ret = da9052_list_voltage(rdev, *selector);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return da9052_reg_update(regulator-&gt;da9052,</div><div class='add'>+				 DA9052_BUCKCORE_REG + offset,</div><div class='add'>+				 (1 &lt;&lt; info-&gt;volt_shift) - 1, *selector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_set_ldo_voltage(struct regulator_dev *rdev,</div><div class='add'>+				   int min_uV, int max_uV,</div><div class='add'>+				   unsigned int *selector)</div><div class='add'>+{</div><div class='add'>+	return da9052_regulator_set_voltage_int(rdev, min_uV, max_uV, selector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_set_ldo5_6_voltage(struct regulator_dev *rdev,</div><div class='add'>+				      int min_uV, int max_uV,</div><div class='add'>+				      unsigned int *selector)</div><div class='add'>+{</div><div class='add'>+	struct da9052_regulator *regulator = rdev_get_drvdata(rdev);</div><div class='add'>+	struct da9052_regulator_info *info = regulator-&gt;info;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = da9052_regulator_set_voltage_int(rdev, min_uV, max_uV, selector);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Some LDOs are DVC controlled which requires enabling of</div><div class='add'>+	 * the LDO activate bit to implment the changes on the</div><div class='add'>+	 * LDO output.</div><div class='add'>+	*/</div><div class='add'>+	return da9052_reg_update(regulator-&gt;da9052, DA9052_SUPPLY_REG, 0,</div><div class='add'>+				 info-&gt;activate_bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_set_dcdc_voltage(struct regulator_dev *rdev,</div><div class='add'>+				    int min_uV, int max_uV,</div><div class='add'>+				    unsigned int *selector)</div><div class='add'>+{</div><div class='add'>+	struct da9052_regulator *regulator = rdev_get_drvdata(rdev);</div><div class='add'>+	struct da9052_regulator_info *info = regulator-&gt;info;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = da9052_regulator_set_voltage_int(rdev, min_uV, max_uV, selector);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Some DCDCs are DVC controlled which requires enabling of</div><div class='add'>+	 * the DCDC activate bit to implment the changes on the</div><div class='add'>+	 * DCDC output.</div><div class='add'>+	*/</div><div class='add'>+	return da9052_reg_update(regulator-&gt;da9052, DA9052_SUPPLY_REG, 0,</div><div class='add'>+				 info-&gt;activate_bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_get_regulator_voltage_sel(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct da9052_regulator *regulator = rdev_get_drvdata(rdev);</div><div class='add'>+	struct da9052_regulator_info *info = regulator-&gt;info;</div><div class='add'>+	int offset = rdev_get_id(rdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = da9052_reg_read(regulator-&gt;da9052, DA9052_BUCKCORE_REG + offset);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret &amp;= ((1 &lt;&lt; info-&gt;volt_shift) - 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 da9052_set_buckperi_voltage(struct regulator_dev *rdev, int min_uV,</div><div class='add'>+					int max_uV, unsigned int *selector)</div><div class='add'>+{</div><div class='add'>+	struct da9052_regulator *regulator = rdev_get_drvdata(rdev);</div><div class='add'>+	struct da9052_regulator_info *info = regulator-&gt;info;</div><div class='add'>+	int offset = rdev_get_id(rdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = verify_range(info, min_uV, max_uV);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (min_uV &lt; info-&gt;min_uV)</div><div class='add'>+		min_uV = info-&gt;min_uV;</div><div class='add'>+</div><div class='add'>+	if ((regulator-&gt;da9052-&gt;chip_id == DA9052) &amp;&amp;</div><div class='add'>+	    (min_uV &gt;= DA9052_CONST_3uV))</div><div class='add'>+		*selector = DA9052_BUCK_PERI_REG_MAP_UPTO_3uV +</div><div class='add'>+			    ((min_uV - DA9052_CONST_3uV) /</div><div class='add'>+			    (DA9052_BUCK_PERI_3uV_STEP));</div><div class='add'>+	else</div><div class='add'>+		*selector = (min_uV - info-&gt;min_uV) / info-&gt;step_uV;</div><div class='add'>+</div><div class='add'>+	ret = da9052_list_buckperi_voltage(rdev, *selector);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return da9052_reg_update(regulator-&gt;da9052,</div><div class='add'>+				 DA9052_BUCKCORE_REG + offset,</div><div class='add'>+				 (1 &lt;&lt; info-&gt;volt_shift) - 1, *selector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int da9052_get_buckperi_voltage_sel(struct regulator_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	struct da9052_regulator *regulator = rdev_get_drvdata(rdev);</div><div class='add'>+	struct da9052_regulator_info *info = regulator-&gt;info;</div><div class='add'>+	int offset = rdev_get_id(rdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = da9052_reg_read(regulator-&gt;da9052, DA9052_BUCKCORE_REG + offset);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret &amp;= ((1 &lt;&lt; info-&gt;volt_shift) - 1);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct regulator_ops da9052_buckperi_ops = {</div><div class='add'>+	.list_voltage = da9052_list_buckperi_voltage,</div><div class='add'>+	.get_voltage_sel = da9052_get_buckperi_voltage_sel,</div><div class='add'>+	.set_voltage = da9052_set_buckperi_voltage,</div><div class='add'>+</div><div class='add'>+	.get_current_limit = da9052_dcdc_get_current_limit,</div><div class='add'>+	.set_current_limit = da9052_dcdc_set_current_limit,</div><div class='add'>+</div><div class='add'>+	.is_enabled = da9052_regulator_is_enabled,</div><div class='add'>+	.enable = da9052_regulator_enable,</div><div class='add'>+	.disable = da9052_regulator_disable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct regulator_ops da9052_dcdc_ops = {</div><div class='add'>+	.set_voltage = da9052_set_dcdc_voltage,</div><div class='add'>+	.get_current_limit = da9052_dcdc_get_current_limit,</div><div class='add'>+	.set_current_limit = da9052_dcdc_set_current_limit,</div><div class='add'>+</div><div class='add'>+	.list_voltage = da9052_list_voltage,</div><div class='add'>+	.get_voltage_sel = da9052_get_regulator_voltage_sel,</div><div class='add'>+	.is_enabled = da9052_regulator_is_enabled,</div><div class='add'>+	.enable = da9052_regulator_enable,</div><div class='add'>+	.disable = da9052_regulator_disable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct regulator_ops da9052_ldo5_6_ops = {</div><div class='add'>+	.set_voltage = da9052_set_ldo5_6_voltage,</div><div class='add'>+</div><div class='add'>+	.list_voltage = da9052_list_voltage,</div><div class='add'>+	.get_voltage_sel = da9052_get_regulator_voltage_sel,</div><div class='add'>+	.is_enabled = da9052_regulator_is_enabled,</div><div class='add'>+	.enable = da9052_regulator_enable,</div><div class='add'>+	.disable = da9052_regulator_disable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct regulator_ops da9052_ldo_ops = {</div><div class='add'>+	.set_voltage = da9052_set_ldo_voltage,</div><div class='add'>+</div><div class='add'>+	.list_voltage = da9052_list_voltage,</div><div class='add'>+	.get_voltage_sel = da9052_get_regulator_voltage_sel,</div><div class='add'>+	.is_enabled = da9052_regulator_is_enabled,</div><div class='add'>+	.enable = da9052_regulator_enable,</div><div class='add'>+	.disable = da9052_regulator_disable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DA9052_LDO5_6(_id, step, min, max, sbits, ebits, abits) \</div><div class='add'>+{\</div><div class='add'>+	.reg_desc = {\</div><div class='add'>+		.name = "LDO" #_id,\</div><div class='add'>+		.ops = &amp;da9052_ldo5_6_ops,\</div><div class='add'>+		.type = REGULATOR_VOLTAGE,\</div><div class='add'>+		.id = _id,\</div><div class='add'>+		.owner = THIS_MODULE,\</div><div class='add'>+	},\</div><div class='add'>+	.min_uV = (min) * 1000,\</div><div class='add'>+	.max_uV = (max) * 1000,\</div><div class='add'>+	.step_uV = (step) * 1000,\</div><div class='add'>+	.volt_shift = (sbits),\</div><div class='add'>+	.en_bit = (ebits),\</div><div class='add'>+	.activate_bit = (abits),\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DA9052_LDO(_id, step, min, max, sbits, ebits, abits) \</div><div class='add'>+{\</div><div class='add'>+	.reg_desc = {\</div><div class='add'>+		.name = "LDO" #_id,\</div><div class='add'>+		.ops = &amp;da9052_ldo_ops,\</div><div class='add'>+		.type = REGULATOR_VOLTAGE,\</div><div class='add'>+		.id = _id,\</div><div class='add'>+		.owner = THIS_MODULE,\</div><div class='add'>+	},\</div><div class='add'>+	.min_uV = (min) * 1000,\</div><div class='add'>+	.max_uV = (max) * 1000,\</div><div class='add'>+	.step_uV = (step) * 1000,\</div><div class='add'>+	.volt_shift = (sbits),\</div><div class='add'>+	.en_bit = (ebits),\</div><div class='add'>+	.activate_bit = (abits),\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DA9052_DCDC(_id, step, min, max, sbits, ebits, abits) \</div><div class='add'>+{\</div><div class='add'>+	.reg_desc = {\</div><div class='add'>+		.name = "BUCK" #_id,\</div><div class='add'>+		.ops = &amp;da9052_dcdc_ops,\</div><div class='add'>+		.type = REGULATOR_VOLTAGE,\</div><div class='add'>+		.id = _id,\</div><div class='add'>+		.owner = THIS_MODULE,\</div><div class='add'>+	},\</div><div class='add'>+	.min_uV = (min) * 1000,\</div><div class='add'>+	.max_uV = (max) * 1000,\</div><div class='add'>+	.step_uV = (step) * 1000,\</div><div class='add'>+	.volt_shift = (sbits),\</div><div class='add'>+	.en_bit = (ebits),\</div><div class='add'>+	.activate_bit = (abits),\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DA9052_BUCKPERI(_id, step, min, max, sbits, ebits, abits) \</div><div class='add'>+{\</div><div class='add'>+	.reg_desc = {\</div><div class='add'>+		.name = "BUCK" #_id,\</div><div class='add'>+		.ops = &amp;da9052_buckperi_ops,\</div><div class='add'>+		.type = REGULATOR_VOLTAGE,\</div><div class='add'>+		.id = _id,\</div><div class='add'>+		.owner = THIS_MODULE,\</div><div class='add'>+	},\</div><div class='add'>+	.min_uV = (min) * 1000,\</div><div class='add'>+	.max_uV = (max) * 1000,\</div><div class='add'>+	.step_uV = (step) * 1000,\</div><div class='add'>+	.volt_shift = (sbits),\</div><div class='add'>+	.en_bit = (ebits),\</div><div class='add'>+	.activate_bit = (abits),\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct da9052_regulator_info da9052_regulator_info[] = {</div><div class='add'>+	/* Buck1 - 4 */</div><div class='add'>+	DA9052_DCDC(0, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBCOREGO),</div><div class='add'>+	DA9052_DCDC(1, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBPROGO),</div><div class='add'>+	DA9052_DCDC(2, 25, 925, 2500, 6, 6, DA9052_SUPPLY_VBMEMGO),</div><div class='add'>+	DA9052_BUCKPERI(3, 50, 1800, 3600, 5, 6, 0),</div><div class='add'>+	/* LD01 - LDO10 */</div><div class='add'>+	DA9052_LDO(4, 50, 600, 1800, 5, 6, 0),</div><div class='add'>+	DA9052_LDO5_6(5, 25, 600, 1800, 6, 6, DA9052_SUPPLY_VLDO2GO),</div><div class='add'>+	DA9052_LDO5_6(6, 25, 1725, 3300, 6, 6, DA9052_SUPPLY_VLDO3GO),</div><div class='add'>+	DA9052_LDO(7, 25, 1725, 3300, 6, 6, 0),</div><div class='add'>+	DA9052_LDO(8, 50, 1200, 3600, 6, 6, 0),</div><div class='add'>+	DA9052_LDO(9, 50, 1200, 3600, 6, 6, 0),</div><div class='add'>+	DA9052_LDO(10, 50, 1200, 3600, 6, 6, 0),</div><div class='add'>+	DA9052_LDO(11, 50, 1200, 3600, 6, 6, 0),</div><div class='add'>+	DA9052_LDO(12, 50, 1250, 3650, 6, 6, 0),</div><div class='add'>+	DA9052_LDO(13, 50, 1200, 3600, 6, 6, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct da9052_regulator_info da9053_regulator_info[] = {</div><div class='add'>+	/* Buck1 - 4 */</div><div class='add'>+	DA9052_DCDC(0, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBCOREGO),</div><div class='add'>+	DA9052_DCDC(1, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBPROGO),</div><div class='add'>+	DA9052_DCDC(2, 25, 925, 2500, 6, 6, DA9052_SUPPLY_VBMEMGO),</div><div class='add'>+	DA9052_BUCKPERI(3, 25, 925, 2500, 6, 6, 0),</div><div class='add'>+	/* LD01 - LDO10 */</div><div class='add'>+	DA9052_LDO(4, 50, 600, 1800, 5, 6, 0),</div><div class='add'>+	DA9052_LDO5_6(5, 25, 600, 1800, 6, 6, DA9052_SUPPLY_VLDO2GO),</div><div class='add'>+	DA9052_LDO5_6(6, 25, 1725, 3300, 6, 6, DA9052_SUPPLY_VLDO3GO),</div><div class='add'>+	DA9052_LDO(7, 25, 1725, 3300, 6, 6, 0),</div><div class='add'>+	DA9052_LDO(8, 50, 1200, 3600, 6, 6, 0),</div><div class='add'>+	DA9052_LDO(9, 50, 1200, 3600, 6, 6, 0),</div><div class='add'>+	DA9052_LDO(10, 50, 1200, 3600, 6, 6, 0),</div><div class='add'>+	DA9052_LDO(11, 50, 1200, 3600, 6, 6, 0),</div><div class='add'>+	DA9052_LDO(12, 50, 1250, 3650, 6, 6, 0),</div><div class='add'>+	DA9052_LDO(13, 50, 1200, 3600, 6, 6, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct da9052_regulator_info *find_regulator_info(u8 chip_id,</div><div class='add'>+								 int id)</div><div class='add'>+{</div><div class='add'>+	struct da9052_regulator_info *info;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (chip_id) {</div><div class='add'>+	case DA9052:</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(da9052_regulator_info); i++) {</div><div class='add'>+			info = &amp;da9052_regulator_info[i];</div><div class='add'>+			if (info-&gt;reg_desc.id == id)</div><div class='add'>+				return info;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case DA9053_AA:</div><div class='add'>+	case DA9053_BA:</div><div class='add'>+	case DA9053_BB:</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(da9053_regulator_info); i++) {</div><div class='add'>+			info = &amp;da9053_regulator_info[i];</div><div class='add'>+			if (info-&gt;reg_desc.id == id)</div><div class='add'>+				return info;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit da9052_regulator_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct da9052_regulator *regulator;</div><div class='add'>+	struct da9052 *da9052;</div><div class='add'>+	struct da9052_pdata *pdata;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	regulator = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(struct da9052_regulator),</div><div class='add'>+				 GFP_KERNEL);</div><div class='add'>+	if (!regulator)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	da9052 = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='add'>+	pdata = da9052-&gt;dev-&gt;platform_data;</div><div class='add'>+	regulator-&gt;da9052 = da9052;</div><div class='add'>+</div><div class='add'>+	regulator-&gt;info = find_regulator_info(regulator-&gt;da9052-&gt;chip_id,</div><div class='add'>+					      pdev-&gt;id);</div><div class='add'>+	if (regulator-&gt;info == NULL) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "invalid regulator ID specified\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	regulator-&gt;rdev = regulator_register(&amp;regulator-&gt;info-&gt;reg_desc,</div><div class='add'>+					     &amp;pdev-&gt;dev,</div><div class='add'>+					     pdata-&gt;regulators[pdev-&gt;id],</div><div class='add'>+					     regulator, NULL);</div><div class='add'>+	if (IS_ERR(regulator-&gt;rdev)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to register regulator %s\n",</div><div class='add'>+			regulator-&gt;info-&gt;reg_desc.name);</div><div class='add'>+		ret = PTR_ERR(regulator-&gt;rdev);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, regulator);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	devm_kfree(&amp;pdev-&gt;dev, regulator);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit da9052_regulator_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct da9052_regulator *regulator = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	regulator_unregister(regulator-&gt;rdev);</div><div class='add'>+	devm_kfree(&amp;pdev-&gt;dev, regulator);</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 da9052_regulator_driver = {</div><div class='add'>+	.probe = da9052_regulator_probe,</div><div class='add'>+	.remove = __devexit_p(da9052_regulator_remove),</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "da9052-regulator",</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init da9052_regulator_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;da9052_regulator_driver);</div><div class='add'>+}</div><div class='add'>+subsys_initcall(da9052_regulator_init);</div><div class='add'>+</div><div class='add'>+static void __exit da9052_regulator_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;da9052_regulator_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(da9052_regulator_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("David Dajun Chen &lt;dchen@diasemi.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Power Regulator driver for Dialog DA9052 PMIC");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("platform:da9052-regulator");</div><div class='head'>diff --git a/drivers/regulator/db8500-prcmu.c b/drivers/regulator/db8500-prcmu.c<br/>index 78329751af54..515443fcd26b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/db8500-prcmu.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/db8500-prcmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/db8500-prcmu.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/db8500-prcmu.c</a></div><div class='hunk'>@@ -486,7 +486,7 @@ static int __devinit db8500_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 		/* register with the regulator framework */</div><div class='ctx'> 		info-&gt;rdev = regulator_register(&amp;info-&gt;desc, &amp;pdev-&gt;dev,</div><div class='del'>-				init_data, info);</div><div class='add'>+				init_data, info, NULL);</div><div class='ctx'> 		if (IS_ERR(info-&gt;rdev)) {</div><div class='ctx'> 			err = PTR_ERR(info-&gt;rdev);</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "failed to register %s: err %i\n",</div><div class='head'>diff --git a/drivers/regulator/dummy.c b/drivers/regulator/dummy.c<br/>index b8f520513ce7..0ee00de4be72 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/dummy.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/dummy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/dummy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/dummy.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@ static int __devinit dummy_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dummy_regulator_rdev = regulator_register(&amp;dummy_desc, NULL,</div><div class='del'>-						  &amp;dummy_initdata, NULL);</div><div class='add'>+						  &amp;dummy_initdata, NULL, NULL);</div><div class='ctx'> 	if (IS_ERR(dummy_regulator_rdev)) {</div><div class='ctx'> 		ret = PTR_ERR(dummy_regulator_rdev);</div><div class='ctx'> 		pr_err("Failed to register regulator: %d\n", ret);</div><div class='head'>diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c<br/>index 21ecf212a522..e24e3a174c4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/fixed.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/fixed.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/fixed.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/fixed.c</a></div><div class='hunk'>@@ -27,6 +27,10 @@</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/delay.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/of_gpio.h&gt;</div><div class='add'>+#include &lt;linux/regulator/of_regulator.h&gt;</div><div class='add'>+#include &lt;linux/regulator/machine.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct fixed_voltage_data {</div><div class='ctx'> 	struct regulator_desc desc;</div><div class='hunk'>@@ -38,6 +42,58 @@ struct fixed_voltage_data {</div><div class='ctx'> 	bool is_enabled;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * of_get_fixed_voltage_config - extract fixed_voltage_config structure info</div><div class='add'>+ * @dev: device requesting for fixed_voltage_config</div><div class='add'>+ *</div><div class='add'>+ * Populates fixed_voltage_config structure by extracting data from device</div><div class='add'>+ * tree node, returns a pointer to the populated structure of NULL if memory</div><div class='add'>+ * alloc fails.</div><div class='add'>+ */</div><div class='add'>+static struct fixed_voltage_config *</div><div class='add'>+of_get_fixed_voltage_config(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fixed_voltage_config *config;</div><div class='add'>+	struct device_node *np = dev-&gt;of_node;</div><div class='add'>+	const __be32 *delay;</div><div class='add'>+	struct regulator_init_data *init_data;</div><div class='add'>+</div><div class='add'>+	config = devm_kzalloc(dev, sizeof(struct fixed_voltage_config),</div><div class='add'>+								 GFP_KERNEL);</div><div class='add'>+	if (!config)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	config-&gt;init_data = of_get_regulator_init_data(dev, dev-&gt;of_node);</div><div class='add'>+	if (!config-&gt;init_data)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	init_data = config-&gt;init_data;</div><div class='add'>+	init_data-&gt;constraints.apply_uV = 0;</div><div class='add'>+</div><div class='add'>+	config-&gt;supply_name = init_data-&gt;constraints.name;</div><div class='add'>+	if (init_data-&gt;constraints.min_uV == init_data-&gt;constraints.max_uV) {</div><div class='add'>+		config-&gt;microvolts = init_data-&gt;constraints.min_uV;</div><div class='add'>+	} else {</div><div class='add'>+		dev_err(dev,</div><div class='add'>+			 "Fixed regulator specified with variable voltages\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (init_data-&gt;constraints.boot_on)</div><div class='add'>+		config-&gt;enabled_at_boot = true;</div><div class='add'>+</div><div class='add'>+	config-&gt;gpio = of_get_named_gpio(np, "gpio", 0);</div><div class='add'>+	delay = of_get_property(np, "startup-delay-us", NULL);</div><div class='add'>+	if (delay)</div><div class='add'>+		config-&gt;startup_delay = be32_to_cpu(*delay);</div><div class='add'>+</div><div class='add'>+	if (of_find_property(np, "enable-active-high", NULL))</div><div class='add'>+		config-&gt;enable_high = true;</div><div class='add'>+</div><div class='add'>+	return config;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int fixed_voltage_is_enabled(struct regulator_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fixed_voltage_data *data = rdev_get_drvdata(dev);</div><div class='hunk'>@@ -80,7 +136,10 @@ static int fixed_voltage_get_voltage(struct regulator_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fixed_voltage_data *data = rdev_get_drvdata(dev);</div><div class='ctx'> </div><div class='del'>-	return data-&gt;microvolts;</div><div class='add'>+	if (data-&gt;microvolts)</div><div class='add'>+		return data-&gt;microvolts;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fixed_voltage_list_voltage(struct regulator_dev *dev,</div><div class='hunk'>@@ -105,10 +164,18 @@ static struct regulator_ops fixed_voltage_ops = {</div><div class='ctx'> </div><div class='ctx'> static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct fixed_voltage_config *config = pdev-&gt;dev.platform_data;</div><div class='add'>+	struct fixed_voltage_config *config;</div><div class='ctx'> 	struct fixed_voltage_data *drvdata;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (pdev-&gt;dev.of_node)</div><div class='add'>+		config = of_get_fixed_voltage_config(&amp;pdev-&gt;dev);</div><div class='add'>+	else</div><div class='add'>+		config = pdev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	if (!config)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	drvdata = kzalloc(sizeof(struct fixed_voltage_data), GFP_KERNEL);</div><div class='ctx'> 	if (drvdata == NULL) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Failed to allocate device data\n");</div><div class='hunk'>@@ -180,7 +247,8 @@ static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	drvdata-&gt;dev = regulator_register(&amp;drvdata-&gt;desc, &amp;pdev-&gt;dev,</div><div class='del'>-					  config-&gt;init_data, drvdata);</div><div class='add'>+					  config-&gt;init_data, drvdata,</div><div class='add'>+					  pdev-&gt;dev.of_node);</div><div class='ctx'> 	if (IS_ERR(drvdata-&gt;dev)) {</div><div class='ctx'> 		ret = PTR_ERR(drvdata-&gt;dev);</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Failed to register regulator: %d\n", ret);</div><div class='hunk'>@@ -217,12 +285,23 @@ static int __devexit reg_fixed_voltage_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_OF)</div><div class='add'>+static const struct of_device_id fixed_of_match[] __devinitconst = {</div><div class='add'>+	{ .compatible = "regulator-fixed", },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, fixed_of_match);</div><div class='add'>+#else</div><div class='add'>+#define fixed_of_match NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct platform_driver regulator_fixed_voltage_driver = {</div><div class='ctx'> 	.probe		= reg_fixed_voltage_probe,</div><div class='ctx'> 	.remove		= __devexit_p(reg_fixed_voltage_remove),</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name		= "reg-fixed-voltage",</div><div class='ctx'> 		.owner		= THIS_MODULE,</div><div class='add'>+		.of_match_table = fixed_of_match,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c<br/>index f0acf52498bd..42e1cb1835e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/gpio-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/gpio-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/gpio-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/gpio-regulator.c</a></div><div class='hunk'>@@ -284,7 +284,7 @@ static int __devinit gpio_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	drvdata-&gt;state = state;</div><div class='ctx'> </div><div class='ctx'> 	drvdata-&gt;dev = regulator_register(&amp;drvdata-&gt;desc, &amp;pdev-&gt;dev,</div><div class='del'>-					  config-&gt;init_data, drvdata);</div><div class='add'>+					  config-&gt;init_data, drvdata, NULL);</div><div class='ctx'> 	if (IS_ERR(drvdata-&gt;dev)) {</div><div class='ctx'> 		ret = PTR_ERR(drvdata-&gt;dev);</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Failed to register regulator: %d\n", ret);</div><div class='head'>diff --git a/drivers/regulator/isl6271a-regulator.c b/drivers/regulator/isl6271a-regulator.c<br/>index e4b3592e8176..c1a456c4257c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/isl6271a-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/isl6271a-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/isl6271a-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/isl6271a-regulator.c</a></div><div class='hunk'>@@ -170,7 +170,7 @@ static int __devinit isl6271a_probe(struct i2c_client *i2c,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 3; i++) {</div><div class='ctx'> 		pmic-&gt;rdev[i] = regulator_register(&amp;isl_rd[i], &amp;i2c-&gt;dev,</div><div class='del'>-						init_data, pmic);</div><div class='add'>+						init_data, pmic, NULL);</div><div class='ctx'> 		if (IS_ERR(pmic-&gt;rdev[i])) {</div><div class='ctx'> 			dev_err(&amp;i2c-&gt;dev, "failed to register %s\n", id-&gt;name);</div><div class='ctx'> 			err = PTR_ERR(pmic-&gt;rdev[i]);</div><div class='head'>diff --git a/drivers/regulator/lp3971.c b/drivers/regulator/lp3971.c<br/>index 72b16b5f3db6..0cfabd318a59 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/lp3971.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/lp3971.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/lp3971.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/lp3971.c</a></div><div class='hunk'>@@ -451,7 +451,7 @@ static int __devinit setup_regulators(struct lp3971 *lp3971,</div><div class='ctx'> 	for (i = 0; i &lt; pdata-&gt;num_regulators; i++) {</div><div class='ctx'> 		struct lp3971_regulator_subdev *reg = &amp;pdata-&gt;regulators[i];</div><div class='ctx'> 		lp3971-&gt;rdev[i] = regulator_register(&amp;regulators[reg-&gt;id],</div><div class='del'>-					lp3971-&gt;dev, reg-&gt;initdata, lp3971);</div><div class='add'>+				lp3971-&gt;dev, reg-&gt;initdata, lp3971, NULL);</div><div class='ctx'> </div><div class='ctx'> 		if (IS_ERR(lp3971-&gt;rdev[i])) {</div><div class='ctx'> 			err = PTR_ERR(lp3971-&gt;rdev[i]);</div><div class='head'>diff --git a/drivers/regulator/lp3972.c b/drivers/regulator/lp3972.c<br/>index fbc5e3741bef..49a15eefe5fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/lp3972.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/lp3972.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/lp3972.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/lp3972.c</a></div><div class='hunk'>@@ -555,7 +555,7 @@ static int __devinit setup_regulators(struct lp3972 *lp3972,</div><div class='ctx'> 	for (i = 0; i &lt; pdata-&gt;num_regulators; i++) {</div><div class='ctx'> 		struct lp3972_regulator_subdev *reg = &amp;pdata-&gt;regulators[i];</div><div class='ctx'> 		lp3972-&gt;rdev[i] = regulator_register(&amp;regulators[reg-&gt;id],</div><div class='del'>-					lp3972-&gt;dev, reg-&gt;initdata, lp3972);</div><div class='add'>+				lp3972-&gt;dev, reg-&gt;initdata, lp3972, NULL);</div><div class='ctx'> </div><div class='ctx'> 		if (IS_ERR(lp3972-&gt;rdev[i])) {</div><div class='ctx'> 			err = PTR_ERR(lp3972-&gt;rdev[i]);</div><div class='head'>diff --git a/drivers/regulator/max1586.c b/drivers/regulator/max1586.c<br/>index 3f49512c5134..40e7a4db2853 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/max1586.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/max1586.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/max1586.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/max1586.c</a></div><div class='hunk'>@@ -214,7 +214,7 @@ static int __devinit max1586_pmic_probe(struct i2c_client *client,</div><div class='ctx'> 		}</div><div class='ctx'> 		rdev[i] = regulator_register(&amp;max1586_reg[id], &amp;client-&gt;dev,</div><div class='ctx'> 					     pdata-&gt;subdevs[i].platform_data,</div><div class='del'>-					     max1586);</div><div class='add'>+					     max1586, NULL);</div><div class='ctx'> 		if (IS_ERR(rdev[i])) {</div><div class='ctx'> 			ret = PTR_ERR(rdev[i]);</div><div class='ctx'> 			dev_err(&amp;client-&gt;dev, "failed to register %s\n",</div><div class='head'>diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c<br/>index 1062cf9f02dc..b06a2399587c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/max8649.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/max8649.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/max8649.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/max8649.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/regulator/driver.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/max8649.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MAX8649_DCDC_VMIN	750000		/* uV */</div><div class='ctx'> #define MAX8649_DCDC_VMAX	1380000		/* uV */</div><div class='hunk'>@@ -49,9 +50,8 @@</div><div class='ctx'> </div><div class='ctx'> struct max8649_regulator_info {</div><div class='ctx'> 	struct regulator_dev	*regulator;</div><div class='del'>-	struct i2c_client	*i2c;</div><div class='ctx'> 	struct device		*dev;</div><div class='del'>-	struct mutex		io_lock;</div><div class='add'>+	struct regmap		*regmap;</div><div class='ctx'> </div><div class='ctx'> 	int		vol_reg;</div><div class='ctx'> 	unsigned	mode:2;	/* bit[1:0] = VID1, VID0 */</div><div class='hunk'>@@ -63,71 +63,6 @@ struct max8649_regulator_info {</div><div class='ctx'> </div><div class='ctx'> /* I2C operations */</div><div class='ctx'> </div><div class='del'>-static inline int max8649_read_device(struct i2c_client *i2c,</div><div class='del'>-				      int reg, int bytes, void *dest)</div><div class='del'>-{</div><div class='del'>-	unsigned char data;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	data = (unsigned char)reg;</div><div class='del'>-	ret = i2c_master_send(i2c, &amp;data, 1);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	ret = i2c_master_recv(i2c, dest, bytes);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int max8649_write_device(struct i2c_client *i2c,</div><div class='del'>-				       int reg, int bytes, void *src)</div><div class='del'>-{</div><div class='del'>-	unsigned char buf[bytes + 1];</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	buf[0] = (unsigned char)reg;</div><div class='del'>-	memcpy(&amp;buf[1], src, bytes);</div><div class='del'>-</div><div class='del'>-	ret = i2c_master_send(i2c, buf, bytes + 1);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int max8649_reg_read(struct i2c_client *i2c, int reg)</div><div class='del'>-{</div><div class='del'>-	struct max8649_regulator_info *info = i2c_get_clientdata(i2c);</div><div class='del'>-	unsigned char data;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;info-&gt;io_lock);</div><div class='del'>-	ret = max8649_read_device(i2c, reg, 1, &amp;data);</div><div class='del'>-	mutex_unlock(&amp;info-&gt;io_lock);</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	return (int)data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int max8649_set_bits(struct i2c_client *i2c, int reg,</div><div class='del'>-			    unsigned char mask, unsigned char data)</div><div class='del'>-{</div><div class='del'>-	struct max8649_regulator_info *info = i2c_get_clientdata(i2c);</div><div class='del'>-	unsigned char value;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;info-&gt;io_lock);</div><div class='del'>-	ret = max8649_read_device(i2c, reg, 1, &amp;value);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	value &amp;= ~mask;</div><div class='del'>-	value |= data;</div><div class='del'>-	ret = max8649_write_device(i2c, reg, 1, &amp;value);</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;info-&gt;io_lock);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int check_range(int min_uV, int max_uV)</div><div class='ctx'> {</div><div class='ctx'> 	if ((min_uV &lt; MAX8649_DCDC_VMIN) || (max_uV &gt; MAX8649_DCDC_VMAX)</div><div class='hunk'>@@ -144,13 +79,14 @@ static int max8649_list_voltage(struct regulator_dev *rdev, unsigned index)</div><div class='ctx'> static int max8649_get_voltage(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct max8649_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='add'>+	unsigned int val;</div><div class='ctx'> 	unsigned char data;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = max8649_reg_read(info-&gt;i2c, info-&gt;vol_reg);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	ret = regmap_read(info-&gt;regmap, info-&gt;vol_reg, &amp;val);</div><div class='add'>+	if (ret != 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	data = (unsigned char)ret &amp; MAX8649_VOL_MASK;</div><div class='add'>+	data = (unsigned char)val &amp; MAX8649_VOL_MASK;</div><div class='ctx'> 	return max8649_list_voltage(rdev, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -170,14 +106,14 @@ static int max8649_set_voltage(struct regulator_dev *rdev,</div><div class='ctx'> 	mask = MAX8649_VOL_MASK;</div><div class='ctx'> 	*selector = data &amp; mask;</div><div class='ctx'> </div><div class='del'>-	return max8649_set_bits(info-&gt;i2c, info-&gt;vol_reg, mask, data);</div><div class='add'>+	return regmap_update_bits(info-&gt;regmap, info-&gt;vol_reg, mask, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* EN_PD means pulldown on EN input */</div><div class='ctx'> static int max8649_enable(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct max8649_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='del'>-	return max8649_set_bits(info-&gt;i2c, MAX8649_CONTROL, MAX8649_EN_PD, 0);</div><div class='add'>+	return regmap_update_bits(info-&gt;regmap, MAX8649_CONTROL, MAX8649_EN_PD, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -187,38 +123,40 @@ static int max8649_enable(struct regulator_dev *rdev)</div><div class='ctx'> static int max8649_disable(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct max8649_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='del'>-	return max8649_set_bits(info-&gt;i2c, MAX8649_CONTROL, MAX8649_EN_PD,</div><div class='add'>+	return regmap_update_bits(info-&gt;regmap, MAX8649_CONTROL, MAX8649_EN_PD,</div><div class='ctx'> 				MAX8649_EN_PD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int max8649_is_enabled(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct max8649_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='add'>+	unsigned int val;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = max8649_reg_read(info-&gt;i2c, MAX8649_CONTROL);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	ret = regmap_read(info-&gt;regmap, MAX8649_CONTROL, &amp;val);</div><div class='add'>+	if (ret != 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	return !((unsigned char)ret &amp; MAX8649_EN_PD);</div><div class='add'>+	return !((unsigned char)val &amp; MAX8649_EN_PD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int max8649_enable_time(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct max8649_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='ctx'> 	int voltage, rate, ret;</div><div class='add'>+	unsigned int val;</div><div class='ctx'> </div><div class='ctx'> 	/* get voltage */</div><div class='del'>-	ret = max8649_reg_read(info-&gt;i2c, info-&gt;vol_reg);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	ret = regmap_read(info-&gt;regmap, info-&gt;vol_reg, &amp;val);</div><div class='add'>+	if (ret != 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	ret &amp;= MAX8649_VOL_MASK;</div><div class='add'>+	val &amp;= MAX8649_VOL_MASK;</div><div class='ctx'> 	voltage = max8649_list_voltage(rdev, (unsigned char)ret); /* uV */</div><div class='ctx'> </div><div class='ctx'> 	/* get rate */</div><div class='del'>-	ret = max8649_reg_read(info-&gt;i2c, MAX8649_RAMP);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	ret = regmap_read(info-&gt;regmap, MAX8649_RAMP, &amp;val);</div><div class='add'>+	if (ret != 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	ret = (ret &amp; MAX8649_RAMP_MASK) &gt;&gt; 5;</div><div class='add'>+	ret = (val &amp; MAX8649_RAMP_MASK) &gt;&gt; 5;</div><div class='ctx'> 	rate = (32 * 1000) &gt;&gt; ret;	/* uV/uS */</div><div class='ctx'> </div><div class='ctx'> 	return DIV_ROUND_UP(voltage, rate);</div><div class='hunk'>@@ -230,12 +168,12 @@ static int max8649_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'>-		max8649_set_bits(info-&gt;i2c, info-&gt;vol_reg, MAX8649_FORCE_PWM,</div><div class='del'>-				 MAX8649_FORCE_PWM);</div><div class='add'>+		regmap_update_bits(info-&gt;regmap, info-&gt;vol_reg, MAX8649_FORCE_PWM,</div><div class='add'>+				   MAX8649_FORCE_PWM);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case REGULATOR_MODE_NORMAL:</div><div class='del'>-		max8649_set_bits(info-&gt;i2c, info-&gt;vol_reg,</div><div class='del'>-				 MAX8649_FORCE_PWM, 0);</div><div class='add'>+		regmap_update_bits(info-&gt;regmap, info-&gt;vol_reg,</div><div class='add'>+				   MAX8649_FORCE_PWM, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -246,10 +184,13 @@ static int max8649_set_mode(struct regulator_dev *rdev, unsigned int mode)</div><div class='ctx'> static unsigned int max8649_get_mode(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct max8649_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='add'>+	unsigned int val;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = max8649_reg_read(info-&gt;i2c, info-&gt;vol_reg);</div><div class='del'>-	if (ret &amp; MAX8649_FORCE_PWM)</div><div class='add'>+	ret = regmap_read(info-&gt;regmap, info-&gt;vol_reg, &amp;val);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (val &amp; MAX8649_FORCE_PWM)</div><div class='ctx'> 		return REGULATOR_MODE_FAST;</div><div class='ctx'> 	return REGULATOR_MODE_NORMAL;</div><div class='ctx'> }</div><div class='hunk'>@@ -275,11 +216,17 @@ static struct regulator_desc dcdc_desc = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct regmap_config max8649_regmap_config = {</div><div class='add'>+	.reg_bits = 8,</div><div class='add'>+	.val_bits = 8,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __devinit max8649_regulator_probe(struct i2c_client *client,</div><div class='ctx'> 					     const struct i2c_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct max8649_platform_data *pdata = client-&gt;dev.platform_data;</div><div class='ctx'> 	struct max8649_regulator_info *info = NULL;</div><div class='add'>+	unsigned int val;</div><div class='ctx'> 	unsigned char data;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -289,9 +236,14 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info-&gt;i2c = client;</div><div class='add'>+	info-&gt;regmap = regmap_init_i2c(client, &amp;max8649_regmap_config);</div><div class='add'>+	if (IS_ERR(info-&gt;regmap)) {</div><div class='add'>+		ret = PTR_ERR(info-&gt;regmap);</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "Failed to allocate register map: %d\n", ret);</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	info-&gt;dev = &amp;client-&gt;dev;</div><div class='del'>-	mutex_init(&amp;info-&gt;io_lock);</div><div class='ctx'> 	i2c_set_clientdata(client, info);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;mode = pdata-&gt;mode;</div><div class='hunk'>@@ -312,8 +264,8 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = max8649_reg_read(info-&gt;i2c, MAX8649_CHIP_ID1);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='add'>+	ret = regmap_read(info-&gt;regmap, MAX8649_CHIP_ID1, &amp;val);</div><div class='add'>+	if (ret != 0) {</div><div class='ctx'> 		dev_err(info-&gt;dev, "Failed to detect ID of MAX8649:%d\n",</div><div class='ctx'> 			ret);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -321,33 +273,33 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client,</div><div class='ctx'> 	dev_info(info-&gt;dev, "Detected MAX8649 (ID:%x)\n", ret);</div><div class='ctx'> </div><div class='ctx'> 	/* enable VID0 &amp; VID1 */</div><div class='del'>-	max8649_set_bits(info-&gt;i2c, MAX8649_CONTROL, MAX8649_VID_MASK, 0);</div><div class='add'>+	regmap_update_bits(info-&gt;regmap, MAX8649_CONTROL, MAX8649_VID_MASK, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* enable/disable external clock synchronization */</div><div class='ctx'> 	info-&gt;extclk = pdata-&gt;extclk;</div><div class='ctx'> 	data = (info-&gt;extclk) ? MAX8649_SYNC_EXTCLK : 0;</div><div class='del'>-	max8649_set_bits(info-&gt;i2c, info-&gt;vol_reg, MAX8649_SYNC_EXTCLK, data);</div><div class='add'>+	regmap_update_bits(info-&gt;regmap, info-&gt;vol_reg, MAX8649_SYNC_EXTCLK, data);</div><div class='ctx'> 	if (info-&gt;extclk) {</div><div class='ctx'> 		/* set external clock frequency */</div><div class='ctx'> 		info-&gt;extclk_freq = pdata-&gt;extclk_freq;</div><div class='del'>-		max8649_set_bits(info-&gt;i2c, MAX8649_SYNC, MAX8649_EXT_MASK,</div><div class='del'>-				 info-&gt;extclk_freq &lt;&lt; 6);</div><div class='add'>+		regmap_update_bits(info-&gt;regmap, MAX8649_SYNC, MAX8649_EXT_MASK,</div><div class='add'>+				   info-&gt;extclk_freq &lt;&lt; 6);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pdata-&gt;ramp_timing) {</div><div class='ctx'> 		info-&gt;ramp_timing = pdata-&gt;ramp_timing;</div><div class='del'>-		max8649_set_bits(info-&gt;i2c, MAX8649_RAMP, MAX8649_RAMP_MASK,</div><div class='del'>-				 info-&gt;ramp_timing &lt;&lt; 5);</div><div class='add'>+		regmap_update_bits(info-&gt;regmap, MAX8649_RAMP, MAX8649_RAMP_MASK,</div><div class='add'>+				   info-&gt;ramp_timing &lt;&lt; 5);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;ramp_down = pdata-&gt;ramp_down;</div><div class='ctx'> 	if (info-&gt;ramp_down) {</div><div class='del'>-		max8649_set_bits(info-&gt;i2c, MAX8649_RAMP, MAX8649_RAMP_DOWN,</div><div class='del'>-				 MAX8649_RAMP_DOWN);</div><div class='add'>+		regmap_update_bits(info-&gt;regmap, MAX8649_RAMP, MAX8649_RAMP_DOWN,</div><div class='add'>+				   MAX8649_RAMP_DOWN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;regulator = regulator_register(&amp;dcdc_desc, &amp;client-&gt;dev,</div><div class='del'>-					     pdata-&gt;regulator, info);</div><div class='add'>+					     pdata-&gt;regulator, info, NULL);</div><div class='ctx'> 	if (IS_ERR(info-&gt;regulator)) {</div><div class='ctx'> 		dev_err(info-&gt;dev, "failed to register regulator %s\n",</div><div class='ctx'> 			dcdc_desc.name);</div><div class='hunk'>@@ -358,6 +310,8 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client,</div><div class='ctx'> 	dev_info(info-&gt;dev, "Max8649 regulator device is detected.\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> out:</div><div class='add'>+	regmap_exit(info-&gt;regmap);</div><div class='add'>+fail:</div><div class='ctx'> 	kfree(info);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -369,6 +323,7 @@ static int __devexit max8649_regulator_remove(struct i2c_client *client)</div><div class='ctx'> 	if (info) {</div><div class='ctx'> 		if (info-&gt;regulator)</div><div class='ctx'> 			regulator_unregister(info-&gt;regulator);</div><div class='add'>+		regmap_exit(info-&gt;regmap);</div><div class='ctx'> 		kfree(info);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c<br/>index 33f5d9a492ef..a838e664569f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/max8660.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/max8660.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/max8660.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/max8660.c</a></div><div class='hunk'>@@ -449,7 +449,7 @@ static int __devinit max8660_probe(struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 		rdev[i] = regulator_register(&amp;max8660_reg[id], &amp;client-&gt;dev,</div><div class='ctx'> 					     pdata-&gt;subdevs[i].platform_data,</div><div class='del'>-					     max8660);</div><div class='add'>+					     max8660, NULL);</div><div class='ctx'> 		if (IS_ERR(rdev[i])) {</div><div class='ctx'> 			ret = PTR_ERR(rdev[i]);</div><div class='ctx'> 			dev_err(&amp;client-&gt;dev, "failed to register %s\n",</div><div class='head'>diff --git a/drivers/regulator/max8925-regulator.c b/drivers/regulator/max8925-regulator.c<br/>index cc9ec0e03271..cc290d37c463 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/max8925-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/max8925-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/max8925-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/max8925-regulator.c</a></div><div class='hunk'>@@ -24,9 +24,13 @@</div><div class='ctx'> #define SD1_DVM_SHIFT		5		/* SDCTL1 bit5 */</div><div class='ctx'> #define SD1_DVM_EN		6		/* SDV1 bit 6 */</div><div class='ctx'> </div><div class='del'>-/* bit definitions in SD &amp; LDO control registers */</div><div class='del'>-#define OUT_ENABLE   		0x1f		/* Power U/D sequence as I2C */</div><div class='del'>-#define OUT_DISABLE		0x1e		/* Power U/D sequence as I2C */</div><div class='add'>+/* bit definitions in LDO control registers */</div><div class='add'>+#define LDO_SEQ_I2C		0x7		/* Power U/D by i2c */</div><div class='add'>+#define LDO_SEQ_MASK		0x7		/* Power U/D sequence mask */</div><div class='add'>+#define LDO_SEQ_SHIFT		2		/* Power U/D sequence offset */</div><div class='add'>+#define LDO_I2C_EN		0x1		/* Enable by i2c */</div><div class='add'>+#define LDO_I2C_EN_MASK		0x1		/* Enable mask by i2c */</div><div class='add'>+#define LDO_I2C_EN_SHIFT	0		/* Enable offset by i2c */</div><div class='ctx'> </div><div class='ctx'> struct max8925_regulator_info {</div><div class='ctx'> 	struct regulator_desc	desc;</div><div class='hunk'>@@ -40,7 +44,6 @@ struct max8925_regulator_info {</div><div class='ctx'> 	int	vol_reg;</div><div class='ctx'> 	int	vol_shift;</div><div class='ctx'> 	int	vol_nbits;</div><div class='del'>-	int	enable_bit;</div><div class='ctx'> 	int	enable_reg;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -98,8 +101,10 @@ static int max8925_enable(struct regulator_dev *rdev)</div><div class='ctx'> 	struct max8925_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='ctx'> </div><div class='ctx'> 	return max8925_set_bits(info-&gt;i2c, info-&gt;enable_reg,</div><div class='del'>-				OUT_ENABLE &lt;&lt; info-&gt;enable_bit,</div><div class='del'>-				OUT_ENABLE &lt;&lt; info-&gt;enable_bit);</div><div class='add'>+				LDO_SEQ_MASK &lt;&lt; LDO_SEQ_SHIFT |</div><div class='add'>+				LDO_I2C_EN_MASK &lt;&lt; LDO_I2C_EN_SHIFT,</div><div class='add'>+				LDO_SEQ_I2C &lt;&lt; LDO_SEQ_SHIFT |</div><div class='add'>+				LDO_I2C_EN &lt;&lt; LDO_I2C_EN_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int max8925_disable(struct regulator_dev *rdev)</div><div class='hunk'>@@ -107,20 +112,24 @@ static int max8925_disable(struct regulator_dev *rdev)</div><div class='ctx'> 	struct max8925_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='ctx'> </div><div class='ctx'> 	return max8925_set_bits(info-&gt;i2c, info-&gt;enable_reg,</div><div class='del'>-				OUT_ENABLE &lt;&lt; info-&gt;enable_bit,</div><div class='del'>-				OUT_DISABLE &lt;&lt; info-&gt;enable_bit);</div><div class='add'>+				LDO_SEQ_MASK &lt;&lt; LDO_SEQ_SHIFT |</div><div class='add'>+				LDO_I2C_EN_MASK &lt;&lt; LDO_I2C_EN_SHIFT,</div><div class='add'>+				LDO_SEQ_I2C &lt;&lt; LDO_SEQ_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int max8925_is_enabled(struct regulator_dev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct max8925_regulator_info *info = rdev_get_drvdata(rdev);</div><div class='del'>-	int ret;</div><div class='add'>+	int ldo_seq, ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = max8925_reg_read(info-&gt;i2c, info-&gt;enable_reg);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-</div><div class='del'>-	return ret &amp; (1 &lt;&lt; info-&gt;enable_bit);</div><div class='add'>+	ldo_seq = (ret &gt;&gt; LDO_SEQ_SHIFT) &amp; LDO_SEQ_MASK;</div><div class='add'>+	if (ldo_seq != LDO_SEQ_I2C)</div><div class='add'>+		return 1;</div><div class='add'>+	else</div><div class='add'>+		return ret &amp; (LDO_I2C_EN_MASK &lt;&lt; LDO_I2C_EN_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int max8925_set_dvm_voltage(struct regulator_dev *rdev, int uV)</div><div class='hunk'>@@ -188,7 +197,6 @@ static struct regulator_ops max8925_regulator_ldo_ops = {</div><div class='ctx'> 	.vol_shift	= 0,					\</div><div class='ctx'> 	.vol_nbits	= 6,					\</div><div class='ctx'> 	.enable_reg	= MAX8925_SDCTL##_id,			\</div><div class='del'>-	.enable_bit	= 0,					\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define MAX8925_LDO(_id, min, max, step)			\</div><div class='hunk'>@@ -207,7 +215,6 @@ static struct regulator_ops max8925_regulator_ldo_ops = {</div><div class='ctx'> 	.vol_shift	= 0,					\</div><div class='ctx'> 	.vol_nbits	= 6,					\</div><div class='ctx'> 	.enable_reg	= MAX8925_LDOCTL##_id,			\</div><div class='del'>-	.enable_bit	= 0,					\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct max8925_regulator_info max8925_regulator_info[] = {</div><div class='hunk'>@@ -266,7 +273,7 @@ static int __devinit max8925_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	ri-&gt;chip = chip;</div><div class='ctx'> </div><div class='ctx'> 	rdev = regulator_register(&amp;ri-&gt;desc, &amp;pdev-&gt;dev,</div><div class='del'>-				  pdata-&gt;regulator[pdev-&gt;id], ri);</div><div class='add'>+				  pdata-&gt;regulator[pdev-&gt;id], ri, NULL);</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='ctx'> 				ri-&gt;desc.name);</div><div class='head'>diff --git a/drivers/regulator/max8952.c b/drivers/regulator/max8952.c<br/>index 3883d85c5b88..75d89400c123 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/max8952.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/max8952.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/max8952.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/max8952.c</a></div><div class='hunk'>@@ -208,7 +208,7 @@ static int __devinit max8952_pmic_probe(struct i2c_client *client,</div><div class='ctx'> 	max8952-&gt;pdata = pdata;</div><div class='ctx'> </div><div class='ctx'> 	max8952-&gt;rdev = regulator_register(&amp;regulator, max8952-&gt;dev,</div><div class='del'>-			&amp;pdata-&gt;reg_data, max8952);</div><div class='add'>+			&amp;pdata-&gt;reg_data, max8952, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(max8952-&gt;rdev)) {</div><div class='ctx'> 		ret = PTR_ERR(max8952-&gt;rdev);</div><div class='head'>diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c<br/>index 6176129a27e5..d26e8646277b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/max8997.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/max8997.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/max8997.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/max8997.c</a></div><div class='hunk'>@@ -1146,7 +1146,7 @@ static __devinit int max8997_pmic_probe(struct platform_device *pdev)</div><div class='ctx'> 			regulators[id].n_voltages = 16;</div><div class='ctx'> </div><div class='ctx'> 		rdev[i] = regulator_register(&amp;regulators[id], max8997-&gt;dev,</div><div class='del'>-				pdata-&gt;regulators[i].initdata, max8997);</div><div class='add'>+				pdata-&gt;regulators[i].initdata, max8997, NULL);</div><div class='ctx'> 		if (IS_ERR(rdev[i])) {</div><div class='ctx'> 			ret = PTR_ERR(rdev[i]);</div><div class='ctx'> 			dev_err(max8997-&gt;dev, "regulator init failed for %d\n",</div><div class='head'>diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c<br/>index 41a1495eec2b..2d38c2493a07 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/max8998.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/max8998.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/max8998.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/max8998.c</a></div><div class='hunk'>@@ -847,7 +847,7 @@ static __devinit int max8998_pmic_probe(struct platform_device *pdev)</div><div class='ctx'> 			regulators[index].n_voltages = count;</div><div class='ctx'> 		}</div><div class='ctx'> 		rdev[i] = regulator_register(&amp;regulators[index], max8998-&gt;dev,</div><div class='del'>-				pdata-&gt;regulators[i].initdata, max8998);</div><div class='add'>+				pdata-&gt;regulators[i].initdata, max8998, NULL);</div><div class='ctx'> 		if (IS_ERR(rdev[i])) {</div><div class='ctx'> 			ret = PTR_ERR(rdev[i]);</div><div class='ctx'> 			dev_err(max8998-&gt;dev, "regulator init failed\n");</div><div class='head'>diff --git a/drivers/regulator/mc13783-regulator.c b/drivers/regulator/mc13783-regulator.c<br/>index 8479082e1aea..8e9b90ad88ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/mc13783-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/mc13783-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/mc13783-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/mc13783-regulator.c</a></div><div class='hunk'>@@ -344,7 +344,7 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;pdev-&gt;dev, "%s id %d\n", __func__, pdev-&gt;id);</div><div class='ctx'> </div><div class='del'>-	priv = kzalloc(sizeof(*priv) +</div><div class='add'>+	priv = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*priv) +</div><div class='ctx'> 			pdata-&gt;num_regulators * sizeof(priv-&gt;regulators[0]),</div><div class='ctx'> 			GFP_KERNEL);</div><div class='ctx'> 	if (!priv)</div><div class='hunk'>@@ -357,7 +357,7 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 		init_data = &amp;pdata-&gt;regulators[i];</div><div class='ctx'> 		priv-&gt;regulators[i] = regulator_register(</div><div class='ctx'> 				&amp;mc13783_regulators[init_data-&gt;id].desc,</div><div class='del'>-				&amp;pdev-&gt;dev, init_data-&gt;init_data, priv);</div><div class='add'>+				&amp;pdev-&gt;dev, init_data-&gt;init_data, priv, NULL);</div><div class='ctx'> </div><div class='ctx'> 		if (IS_ERR(priv-&gt;regulators[i])) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "failed to register regulator %s\n",</div><div class='hunk'>@@ -374,8 +374,6 @@ err:</div><div class='ctx'> 	while (--i &gt;= 0)</div><div class='ctx'> 		regulator_unregister(priv-&gt;regulators[i]);</div><div class='ctx'> </div><div class='del'>-	kfree(priv);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -391,7 +389,6 @@ static int __devexit mc13783_regulator_remove(struct platform_device *pdev)</div><div class='ctx'> 	for (i = 0; i &lt; pdata-&gt;num_regulators; i++)</div><div class='ctx'> 		regulator_unregister(priv-&gt;regulators[i]);</div><div class='ctx'> </div><div class='del'>-	kfree(priv);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c<br/>index 023d17d022cf..e8cfc99dd8f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/mc13892-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/mc13892-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/mc13892-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/mc13892-regulator.c</a></div><div class='hunk'>@@ -527,18 +527,27 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct mc13xxx *mc13892 = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='ctx'> 	struct mc13xxx_regulator_platform_data *pdata =</div><div class='ctx'> 		dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='del'>-	struct mc13xxx_regulator_init_data *init_data;</div><div class='add'>+	struct mc13xxx_regulator_init_data *mc13xxx_data;</div><div class='ctx'> 	int i, ret;</div><div class='add'>+	int num_regulators = 0;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	priv = kzalloc(sizeof(*priv) +</div><div class='del'>-		pdata-&gt;num_regulators * sizeof(priv-&gt;regulators[0]),</div><div class='add'>+	num_regulators = mc13xxx_get_num_regulators_dt(pdev);</div><div class='add'>+	if (num_regulators &lt;= 0 &amp;&amp; pdata)</div><div class='add'>+		num_regulators = pdata-&gt;num_regulators;</div><div class='add'>+	if (num_regulators &lt;= 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	priv = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*priv) +</div><div class='add'>+		num_regulators * sizeof(priv-&gt;regulators[0]),</div><div class='ctx'> 		GFP_KERNEL);</div><div class='ctx'> 	if (!priv)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	priv-&gt;num_regulators = num_regulators;</div><div class='ctx'> 	priv-&gt;mc13xxx_regulators = mc13892_regulators;</div><div class='ctx'> 	priv-&gt;mc13xxx = mc13892;</div><div class='add'>+	platform_set_drvdata(pdev, priv);</div><div class='ctx'> </div><div class='ctx'> 	mc13xxx_lock(mc13892);</div><div class='ctx'> 	ret = mc13xxx_reg_read(mc13892, MC13892_REVISION, &amp;val);</div><div class='hunk'>@@ -569,11 +578,27 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 		= mc13892_vcam_set_mode;</div><div class='ctx'> 	mc13892_regulators[MC13892_VCAM].desc.ops-&gt;get_mode</div><div class='ctx'> 		= mc13892_vcam_get_mode;</div><div class='del'>-	for (i = 0; i &lt; pdata-&gt;num_regulators; i++) {</div><div class='del'>-		init_data = &amp;pdata-&gt;regulators[i];</div><div class='add'>+</div><div class='add'>+	mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,</div><div class='add'>+					ARRAY_SIZE(mc13892_regulators));</div><div class='add'>+	for (i = 0; i &lt; num_regulators; i++) {</div><div class='add'>+		struct regulator_init_data *init_data;</div><div class='add'>+		struct regulator_desc *desc;</div><div class='add'>+		struct device_node *node = NULL;</div><div class='add'>+		int id;</div><div class='add'>+</div><div class='add'>+		if (mc13xxx_data) {</div><div class='add'>+			id = mc13xxx_data[i].id;</div><div class='add'>+			init_data = mc13xxx_data[i].init_data;</div><div class='add'>+			node = mc13xxx_data[i].node;</div><div class='add'>+		} else {</div><div class='add'>+			id = pdata-&gt;regulators[i].id;</div><div class='add'>+			init_data = pdata-&gt;regulators[i].init_data;</div><div class='add'>+		}</div><div class='add'>+		desc = &amp;mc13892_regulators[id].desc;</div><div class='add'>+</div><div class='ctx'> 		priv-&gt;regulators[i] = regulator_register(</div><div class='del'>-			&amp;mc13892_regulators[init_data-&gt;id].desc,</div><div class='del'>-			&amp;pdev-&gt;dev, init_data-&gt;init_data, priv);</div><div class='add'>+			desc, &amp;pdev-&gt;dev, init_data, priv, node);</div><div class='ctx'> </div><div class='ctx'> 		if (IS_ERR(priv-&gt;regulators[i])) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "failed to register regulator %s\n",</div><div class='hunk'>@@ -583,8 +608,6 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	platform_set_drvdata(pdev, priv);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> err:</div><div class='ctx'> 	while (--i &gt;= 0)</div><div class='hunk'>@@ -592,7 +615,6 @@ err:</div><div class='ctx'> </div><div class='ctx'> err_free:</div><div class='ctx'> 	mc13xxx_unlock(mc13892);</div><div class='del'>-	kfree(priv);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -600,16 +622,13 @@ err_free:</div><div class='ctx'> static int __devexit mc13892_regulator_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);</div><div class='del'>-	struct mc13xxx_regulator_platform_data *pdata =</div><div class='del'>-		dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; pdata-&gt;num_regulators; i++)</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_regulators; i++)</div><div class='ctx'> 		regulator_unregister(priv-&gt;regulators[i]);</div><div class='ctx'> </div><div class='del'>-	kfree(priv);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c<br/>index 6532853a6ef5..80ecafef1bc3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/mc13xxx-regulator-core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/mc13xxx-regulator-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/mc13xxx-regulator-core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/mc13xxx-regulator-core.c</a></div><div class='hunk'>@@ -18,12 +18,14 @@</div><div class='ctx'> #include &lt;linux/mfd/mc13xxx.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/machine.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/driver.h&gt;</div><div class='add'>+#include &lt;linux/regulator/of_regulator.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include "mc13xxx.h"</div><div class='ctx'> </div><div class='ctx'> static int mc13xxx_regulator_enable(struct regulator_dev *rdev)</div><div class='hunk'>@@ -236,6 +238,61 @@ int mc13xxx_sw_regulator_is_enabled(struct regulator_dev *rdev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(mc13xxx_sw_regulator_is_enabled);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+int __devinit mc13xxx_get_num_regulators_dt(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device_node *parent, *child;</div><div class='add'>+	int num = 0;</div><div class='add'>+</div><div class='add'>+	of_node_get(pdev-&gt;dev.parent-&gt;of_node);</div><div class='add'>+	parent = of_find_node_by_name(pdev-&gt;dev.parent-&gt;of_node, "regulators");</div><div class='add'>+	if (!parent)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	for_each_child_of_node(parent, child)</div><div class='add'>+		num++;</div><div class='add'>+</div><div class='add'>+	return num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct mc13xxx_regulator_init_data * __devinit mc13xxx_parse_regulators_dt(</div><div class='add'>+	struct platform_device *pdev, struct mc13xxx_regulator *regulators,</div><div class='add'>+	int num_regulators)</div><div class='add'>+{</div><div class='add'>+	struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);</div><div class='add'>+	struct mc13xxx_regulator_init_data *data, *p;</div><div class='add'>+	struct device_node *parent, *child;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	of_node_get(pdev-&gt;dev.parent-&gt;of_node);</div><div class='add'>+	parent = of_find_node_by_name(pdev-&gt;dev.parent-&gt;of_node, "regulators");</div><div class='add'>+	if (!parent)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	data = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*data) * priv-&gt;num_regulators,</div><div class='add'>+			    GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return NULL;</div><div class='add'>+	p = data;</div><div class='add'>+</div><div class='add'>+	for_each_child_of_node(parent, child) {</div><div class='add'>+		for (i = 0; i &lt; num_regulators; i++) {</div><div class='add'>+			if (!of_node_cmp(child-&gt;name,</div><div class='add'>+					 regulators[i].desc.name)) {</div><div class='add'>+				p-&gt;id = i;</div><div class='add'>+				p-&gt;init_data = of_get_regulator_init_data(</div><div class='add'>+							&amp;pdev-&gt;dev, child);</div><div class='add'>+				p-&gt;node = child;</div><div class='add'>+				p++;</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'>+	return data;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> MODULE_AUTHOR("Yong Shen &lt;yong.shen@linaro.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Regulator Driver for Freescale MC13xxx PMIC");</div><div class='head'>diff --git a/drivers/regulator/mc13xxx.h b/drivers/regulator/mc13xxx.h<br/>index 27758267e122..b3961c658b05 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/mc13xxx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/mc13xxx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/mc13xxx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/mc13xxx.h</a></div><div class='hunk'>@@ -29,6 +29,7 @@ struct mc13xxx_regulator_priv {</div><div class='ctx'> 	struct mc13xxx *mc13xxx;</div><div class='ctx'> 	u32 powermisc_pwgt_state;</div><div class='ctx'> 	struct mc13xxx_regulator *mc13xxx_regulators;</div><div class='add'>+	int num_regulators;</div><div class='ctx'> 	struct regulator_dev *regulators[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -42,13 +43,32 @@ extern int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev,</div><div class='ctx'> 		int min_uV, int max_uV, unsigned *selector);</div><div class='ctx'> extern int mc13xxx_fixed_regulator_get_voltage(struct regulator_dev *rdev);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+extern int mc13xxx_get_num_regulators_dt(struct platform_device *pdev);</div><div class='add'>+extern struct mc13xxx_regulator_init_data *mc13xxx_parse_regulators_dt(</div><div class='add'>+	struct platform_device *pdev, struct mc13xxx_regulator *regulators,</div><div class='add'>+	int num_regulators);</div><div class='add'>+#else</div><div class='add'>+static inline int mc13xxx_get_num_regulators_dt(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct mc13xxx_regulator_init_data *mc13xxx_parse_regulators_dt(</div><div class='add'>+	struct platform_device *pdev, struct mc13xxx_regulator *regulators,</div><div class='add'>+	int num_regulators)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> extern struct regulator_ops mc13xxx_regulator_ops;</div><div class='ctx'> extern struct regulator_ops mc13xxx_fixed_regulator_ops;</div><div class='ctx'> </div><div class='ctx'> #define MC13xxx_DEFINE(prefix, _name, _reg, _vsel_reg, _voltages, _ops)	\</div><div class='ctx'> 	[prefix ## _name] = {				\</div><div class='ctx'> 		.desc = {						\</div><div class='del'>-			.name = #prefix "_" #_name,			\</div><div class='add'>+			.name = #_name,					\</div><div class='ctx'> 			.n_voltages = ARRAY_SIZE(_voltages),		\</div><div class='ctx'> 			.ops = &amp;_ops,			\</div><div class='ctx'> 			.type = REGULATOR_VOLTAGE,			\</div><div class='hunk'>@@ -66,7 +86,7 @@ extern struct regulator_ops mc13xxx_fixed_regulator_ops;</div><div class='ctx'> #define MC13xxx_FIXED_DEFINE(prefix, _name, _reg, _voltages, _ops)	\</div><div class='ctx'> 	[prefix ## _name] = {				\</div><div class='ctx'> 		.desc = {						\</div><div class='del'>-			.name = #prefix "_" #_name,			\</div><div class='add'>+			.name = #_name,					\</div><div class='ctx'> 			.n_voltages = ARRAY_SIZE(_voltages),		\</div><div class='ctx'> 			.ops = &amp;_ops,		\</div><div class='ctx'> 			.type = REGULATOR_VOLTAGE,			\</div><div class='hunk'>@@ -81,7 +101,7 @@ extern struct regulator_ops mc13xxx_fixed_regulator_ops;</div><div class='ctx'> #define MC13xxx_GPO_DEFINE(prefix, _name, _reg,  _voltages, _ops)	\</div><div class='ctx'> 	[prefix ## _name] = {				\</div><div class='ctx'> 		.desc = {						\</div><div class='del'>-			.name = #prefix "_" #_name,			\</div><div class='add'>+			.name = #_name,					\</div><div class='ctx'> 			.n_voltages = ARRAY_SIZE(_voltages),		\</div><div class='ctx'> 			.ops = &amp;_ops,		\</div><div class='ctx'> 			.type = REGULATOR_VOLTAGE,			\</div><div class='head'>diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c<br/>new file mode 100644<br/>index 000000000000..f1651eb69648<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/of_regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/of_regulator.c</a></div><div class='hunk'>@@ -0,0 +1,87 @@</div><div class='add'>+/*</div><div class='add'>+ * OF helpers for regulator framework</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Texas Instruments, Inc.</div><div class='add'>+ * Rajendra Nayak &lt;rnayak@ti.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 &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/regulator/machine.h&gt;</div><div class='add'>+</div><div class='add'>+static void of_get_regulation_constraints(struct device_node *np,</div><div class='add'>+					struct regulator_init_data **init_data)</div><div class='add'>+{</div><div class='add'>+	const __be32 *min_uV, *max_uV, *uV_offset;</div><div class='add'>+	const __be32 *min_uA, *max_uA;</div><div class='add'>+	struct regulation_constraints *constraints = &amp;(*init_data)-&gt;constraints;</div><div class='add'>+</div><div class='add'>+	constraints-&gt;name = of_get_property(np, "regulator-name", NULL);</div><div class='add'>+</div><div class='add'>+	min_uV = of_get_property(np, "regulator-min-microvolt", NULL);</div><div class='add'>+	if (min_uV)</div><div class='add'>+		constraints-&gt;min_uV = be32_to_cpu(*min_uV);</div><div class='add'>+	max_uV = of_get_property(np, "regulator-max-microvolt", NULL);</div><div class='add'>+	if (max_uV)</div><div class='add'>+		constraints-&gt;max_uV = be32_to_cpu(*max_uV);</div><div class='add'>+</div><div class='add'>+	/* Voltage change possible? */</div><div class='add'>+	if (constraints-&gt;min_uV != constraints-&gt;max_uV)</div><div class='add'>+		constraints-&gt;valid_ops_mask |= REGULATOR_CHANGE_VOLTAGE;</div><div class='add'>+	/* Only one voltage?  Then make sure it's set. */</div><div class='add'>+	if (constraints-&gt;min_uV == constraints-&gt;max_uV)</div><div class='add'>+		constraints-&gt;apply_uV = true;</div><div class='add'>+</div><div class='add'>+	uV_offset = of_get_property(np, "regulator-microvolt-offset", NULL);</div><div class='add'>+	if (uV_offset)</div><div class='add'>+		constraints-&gt;uV_offset = be32_to_cpu(*uV_offset);</div><div class='add'>+	min_uA = of_get_property(np, "regulator-min-microamp", NULL);</div><div class='add'>+	if (min_uA)</div><div class='add'>+		constraints-&gt;min_uA = be32_to_cpu(*min_uA);</div><div class='add'>+	max_uA = of_get_property(np, "regulator-max-microamp", NULL);</div><div class='add'>+	if (max_uA)</div><div class='add'>+		constraints-&gt;max_uA = be32_to_cpu(*max_uA);</div><div class='add'>+</div><div class='add'>+	/* Current change possible? */</div><div class='add'>+	if (constraints-&gt;min_uA != constraints-&gt;max_uA)</div><div class='add'>+		constraints-&gt;valid_ops_mask |= REGULATOR_CHANGE_CURRENT;</div><div class='add'>+</div><div class='add'>+	if (of_find_property(np, "regulator-boot-on", NULL))</div><div class='add'>+		constraints-&gt;boot_on = true;</div><div class='add'>+</div><div class='add'>+	if (of_find_property(np, "regulator-always-on", NULL))</div><div class='add'>+		constraints-&gt;always_on = true;</div><div class='add'>+	else /* status change should be possible if not always on. */</div><div class='add'>+		constraints-&gt;valid_ops_mask |= REGULATOR_CHANGE_STATUS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * of_get_regulator_init_data - extract regulator_init_data structure info</div><div class='add'>+ * @dev: device requesting for regulator_init_data</div><div class='add'>+ *</div><div class='add'>+ * Populates regulator_init_data structure by extracting data from device</div><div class='add'>+ * tree node, returns a pointer to the populated struture or NULL if memory</div><div class='add'>+ * alloc fails.</div><div class='add'>+ */</div><div class='add'>+struct regulator_init_data *of_get_regulator_init_data(struct device *dev,</div><div class='add'>+						struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	struct regulator_init_data *init_data;</div><div class='add'>+</div><div class='add'>+	if (!node)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	init_data = devm_kzalloc(dev, sizeof(*init_data), GFP_KERNEL);</div><div class='add'>+	if (!init_data)</div><div class='add'>+		return NULL; /* Out of memory? */</div><div class='add'>+</div><div class='add'>+	of_get_regulation_constraints(node, &amp;init_data);</div><div class='add'>+	return init_data;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(of_get_regulator_init_data);</div><div class='head'>diff --git a/drivers/regulator/pcap-regulator.c b/drivers/regulator/pcap-regulator.c<br/>index 31f6e11a7f16..a5aab1b08bcf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/pcap-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/pcap-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/pcap-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/pcap-regulator.c</a></div><div class='hunk'>@@ -277,7 +277,7 @@ static int __devinit pcap_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	void *pcap = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='ctx'> </div><div class='ctx'> 	rdev = regulator_register(&amp;pcap_regulators[pdev-&gt;id], &amp;pdev-&gt;dev,</div><div class='del'>-				pdev-&gt;dev.platform_data, pcap);</div><div class='add'>+				pdev-&gt;dev.platform_data, pcap, NULL);</div><div class='ctx'> 	if (IS_ERR(rdev))</div><div class='ctx'> 		return PTR_ERR(rdev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c<br/>index 69a11d9dd87f..1d1c31056297 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/pcf50633-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/pcf50633-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/pcf50633-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/pcf50633-regulator.c</a></div><div class='hunk'>@@ -320,7 +320,7 @@ static int __devinit pcf50633_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	pcf = dev_to_pcf50633(pdev-&gt;dev.parent);</div><div class='ctx'> </div><div class='ctx'> 	rdev = regulator_register(&amp;regulators[pdev-&gt;id], &amp;pdev-&gt;dev,</div><div class='del'>-				  pdev-&gt;dev.platform_data, pcf);</div><div class='add'>+				  pdev-&gt;dev.platform_data, pcf, NULL);</div><div class='ctx'> 	if (IS_ERR(rdev))</div><div class='ctx'> 		return PTR_ERR(rdev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/tps6105x-regulator.c b/drivers/regulator/tps6105x-regulator.c<br/>index 1011873896dc..d9278da18a9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/tps6105x-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/tps6105x-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/tps6105x-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/tps6105x-regulator.c</a></div><div class='hunk'>@@ -151,7 +151,8 @@ static int __devinit tps6105x_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* Register regulator with framework */</div><div class='ctx'> 	tps6105x-&gt;regulator = regulator_register(&amp;tps6105x_regulator_desc,</div><div class='ctx'> 					     &amp;tps6105x-&gt;client-&gt;dev,</div><div class='del'>-					     pdata-&gt;regulator_data, tps6105x);</div><div class='add'>+					     pdata-&gt;regulator_data, tps6105x,</div><div class='add'>+					     NULL);</div><div class='ctx'> 	if (IS_ERR(tps6105x-&gt;regulator)) {</div><div class='ctx'> 		ret = PTR_ERR(tps6105x-&gt;regulator);</div><div class='ctx'> 		dev_err(&amp;tps6105x-&gt;client-&gt;dev,</div><div class='head'>diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c<br/>index 9fb4c7b81753..18d61a0529a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/tps65023-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/tps65023-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/tps65023-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/tps65023-regulator.c</a></div><div class='hunk'>@@ -152,48 +152,21 @@ struct tps_driver_data {</div><div class='ctx'> 	u8 core_regulator;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int tps_65023_set_bits(struct tps_pmic *tps, u8 reg, u8 mask)</div><div class='del'>-{</div><div class='del'>-	return regmap_update_bits(tps-&gt;regmap, reg, mask, mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int tps_65023_clear_bits(struct tps_pmic *tps, u8 reg, u8 mask)</div><div class='del'>-{</div><div class='del'>-	return regmap_update_bits(tps-&gt;regmap, reg, mask, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int tps_65023_reg_read(struct tps_pmic *tps, u8 reg)</div><div class='del'>-{</div><div class='del'>-	unsigned int val;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = regmap_read(tps-&gt;regmap, reg, &amp;val);</div><div class='del'>-</div><div class='del'>-	if (ret != 0)</div><div class='del'>-		return ret;</div><div class='del'>-	else</div><div class='del'>-		return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int tps_65023_reg_write(struct tps_pmic *tps, u8 reg, u8 val)</div><div class='del'>-{</div><div class='del'>-	return regmap_write(tps-&gt;regmap, reg, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int tps65023_dcdc_is_enabled(struct regulator_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct tps_pmic *tps = rdev_get_drvdata(dev);</div><div class='ctx'> 	int data, dcdc = rdev_get_id(dev);</div><div class='add'>+	int ret;</div><div class='ctx'> 	u8 shift;</div><div class='ctx'> </div><div class='ctx'> 	if (dcdc &lt; TPS65023_DCDC_1 || dcdc &gt; TPS65023_DCDC_3)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	shift = TPS65023_NUM_REGULATOR - dcdc;</div><div class='del'>-	data = tps_65023_reg_read(tps, TPS65023_REG_REG_CTRL);</div><div class='add'>+	ret = regmap_read(tps-&gt;regmap, TPS65023_REG_REG_CTRL, &amp;data);</div><div class='ctx'> </div><div class='del'>-	if (data &lt; 0)</div><div class='del'>-		return data;</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='ctx'> 	else</div><div class='ctx'> 		return (data &amp; 1&lt;&lt;shift) ? 1 : 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -202,16 +175,17 @@ static int tps65023_ldo_is_enabled(struct regulator_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct tps_pmic *tps = rdev_get_drvdata(dev);</div><div class='ctx'> 	int data, ldo = rdev_get_id(dev);</div><div class='add'>+	int ret;</div><div class='ctx'> 	u8 shift;</div><div class='ctx'> </div><div class='ctx'> 	if (ldo &lt; TPS65023_LDO_1 || ldo &gt; TPS65023_LDO_2)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	shift = (ldo == TPS65023_LDO_1 ? 1 : 2);</div><div class='del'>-	data = tps_65023_reg_read(tps, TPS65023_REG_REG_CTRL);</div><div class='add'>+	ret = regmap_read(tps-&gt;regmap, TPS65023_REG_REG_CTRL, &amp;data);</div><div class='ctx'> </div><div class='del'>-	if (data &lt; 0)</div><div class='del'>-		return data;</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='ctx'> 	else</div><div class='ctx'> 		return (data &amp; 1&lt;&lt;shift) ? 1 : 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -226,7 +200,7 @@ static int tps65023_dcdc_enable(struct regulator_dev *dev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	shift = TPS65023_NUM_REGULATOR - dcdc;</div><div class='del'>-	return tps_65023_set_bits(tps, TPS65023_REG_REG_CTRL, 1 &lt;&lt; shift);</div><div class='add'>+	return regmap_update_bits(tps-&gt;regmap, TPS65023_REG_REG_CTRL, 1 &lt;&lt; shift, 1 &lt;&lt; shift);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tps65023_dcdc_disable(struct regulator_dev *dev)</div><div class='hunk'>@@ -239,7 +213,7 @@ static int tps65023_dcdc_disable(struct regulator_dev *dev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	shift = TPS65023_NUM_REGULATOR - dcdc;</div><div class='del'>-	return tps_65023_clear_bits(tps, TPS65023_REG_REG_CTRL, 1 &lt;&lt; shift);</div><div class='add'>+	return regmap_update_bits(tps-&gt;regmap, TPS65023_REG_REG_CTRL, 1 &lt;&lt; shift, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tps65023_ldo_enable(struct regulator_dev *dev)</div><div class='hunk'>@@ -252,7 +226,7 @@ static int tps65023_ldo_enable(struct regulator_dev *dev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	shift = (ldo == TPS65023_LDO_1 ? 1 : 2);</div><div class='del'>-	return tps_65023_set_bits(tps, TPS65023_REG_REG_CTRL, 1 &lt;&lt; shift);</div><div class='add'>+	return regmap_update_bits(tps-&gt;regmap, TPS65023_REG_REG_CTRL, 1 &lt;&lt; shift, 1 &lt;&lt; shift);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tps65023_ldo_disable(struct regulator_dev *dev)</div><div class='hunk'>@@ -265,21 +239,22 @@ static int tps65023_ldo_disable(struct regulator_dev *dev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	shift = (ldo == TPS65023_LDO_1 ? 1 : 2);</div><div class='del'>-	return tps_65023_clear_bits(tps, TPS65023_REG_REG_CTRL, 1 &lt;&lt; shift);</div><div class='add'>+	return regmap_update_bits(tps-&gt;regmap, TPS65023_REG_REG_CTRL, 1 &lt;&lt; shift, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tps65023_dcdc_get_voltage(struct regulator_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct tps_pmic *tps = rdev_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='ctx'> 	int data, dcdc = rdev_get_id(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (dcdc &lt; TPS65023_DCDC_1 || dcdc &gt; TPS65023_DCDC_3)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (dcdc == tps-&gt;core_regulator) {</div><div class='del'>-		data = tps_65023_reg_read(tps, TPS65023_REG_DEF_CORE);</div><div class='del'>-		if (data &lt; 0)</div><div class='del'>-			return data;</div><div class='add'>+		ret = regmap_read(tps-&gt;regmap, TPS65023_REG_DEF_CORE, &amp;data);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			return ret;</div><div class='ctx'> 		data &amp;= (tps-&gt;info[dcdc]-&gt;table_len - 1);</div><div class='ctx'> 		return tps-&gt;info[dcdc]-&gt;table[data] * 1000;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -318,13 +293,13 @@ static int tps65023_dcdc_set_voltage(struct regulator_dev *dev,</div><div class='ctx'> 	if (vsel == tps-&gt;info[dcdc]-&gt;table_len)</div><div class='ctx'> 		goto failed;</div><div class='ctx'> </div><div class='del'>-	ret = tps_65023_reg_write(tps, TPS65023_REG_DEF_CORE, vsel);</div><div class='add'>+	ret = regmap_write(tps-&gt;regmap, TPS65023_REG_DEF_CORE, vsel);</div><div class='ctx'> </div><div class='ctx'> 	/* Tell the chip that we have changed the value in DEFCORE</div><div class='ctx'> 	 * and its time to update the core voltage</div><div class='ctx'> 	 */</div><div class='del'>-	tps_65023_set_bits(tps, TPS65023_REG_CON_CTRL2,</div><div class='del'>-						TPS65023_REG_CTRL2_GO);</div><div class='add'>+	regmap_update_bits(tps-&gt;regmap, TPS65023_REG_CON_CTRL2,</div><div class='add'>+			TPS65023_REG_CTRL2_GO, TPS65023_REG_CTRL2_GO);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -336,13 +311,14 @@ static int tps65023_ldo_get_voltage(struct regulator_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct tps_pmic *tps = rdev_get_drvdata(dev);</div><div class='ctx'> 	int data, ldo = rdev_get_id(dev);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (ldo &lt; TPS65023_LDO_1 || ldo &gt; TPS65023_LDO_2)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	data = tps_65023_reg_read(tps, TPS65023_REG_LDO_CTRL);</div><div class='del'>-	if (data &lt; 0)</div><div class='del'>-		return data;</div><div class='add'>+	ret = regmap_read(tps-&gt;regmap, TPS65023_REG_LDO_CTRL, &amp;data);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	data &gt;&gt;= (TPS65023_LDO_CTRL_LDOx_SHIFT(ldo - TPS65023_LDO_1));</div><div class='ctx'> 	data &amp;= (tps-&gt;info[ldo]-&gt;table_len - 1);</div><div class='hunk'>@@ -354,6 +330,7 @@ static int tps65023_ldo_set_voltage(struct regulator_dev *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct tps_pmic *tps = rdev_get_drvdata(dev);</div><div class='ctx'> 	int data, vsel, ldo = rdev_get_id(dev);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (ldo &lt; TPS65023_LDO_1 || ldo &gt; TPS65023_LDO_2)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -377,13 +354,13 @@ static int tps65023_ldo_set_voltage(struct regulator_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	*selector = vsel;</div><div class='ctx'> </div><div class='del'>-	data = tps_65023_reg_read(tps, TPS65023_REG_LDO_CTRL);</div><div class='del'>-	if (data &lt; 0)</div><div class='del'>-		return data;</div><div class='add'>+	ret = regmap_read(tps-&gt;regmap, TPS65023_REG_LDO_CTRL, &amp;data);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	data &amp;= TPS65023_LDO_CTRL_LDOx_MASK(ldo - TPS65023_LDO_1);</div><div class='ctx'> 	data |= (vsel &lt;&lt; (TPS65023_LDO_CTRL_LDOx_SHIFT(ldo - TPS65023_LDO_1)));</div><div class='del'>-	return tps_65023_reg_write(tps, TPS65023_REG_LDO_CTRL, data);</div><div class='add'>+	return regmap_write(tps-&gt;regmap, TPS65023_REG_LDO_CTRL, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tps65023_dcdc_list_voltage(struct regulator_dev *dev,</div><div class='hunk'>@@ -496,7 +473,7 @@ static int __devinit tps_65023_probe(struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> 		/* Register the regulators */</div><div class='ctx'> 		rdev = regulator_register(&amp;tps-&gt;desc[i], &amp;client-&gt;dev,</div><div class='del'>-					  init_data, tps);</div><div class='add'>+					  init_data, tps, NULL);</div><div class='ctx'> 		if (IS_ERR(rdev)) {</div><div class='ctx'> 			dev_err(&amp;client-&gt;dev, "failed to register %s\n",</div><div class='ctx'> 				id-&gt;name);</div><div class='hunk'>@@ -511,12 +488,12 @@ static int __devinit tps_65023_probe(struct i2c_client *client,</div><div class='ctx'> 	i2c_set_clientdata(client, tps);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable setting output voltage by I2C */</div><div class='del'>-	tps_65023_clear_bits(tps, TPS65023_REG_CON_CTRL2,</div><div class='del'>-						TPS65023_REG_CTRL2_CORE_ADJ);</div><div class='add'>+	regmap_update_bits(tps-&gt;regmap, TPS65023_REG_CON_CTRL2,</div><div class='add'>+			TPS65023_REG_CTRL2_CORE_ADJ, TPS65023_REG_CTRL2_CORE_ADJ);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable setting output voltage by I2C */</div><div class='del'>-	tps_65023_clear_bits(tps, TPS65023_REG_CON_CTRL2,</div><div class='del'>-						TPS65023_REG_CTRL2_CORE_ADJ);</div><div class='add'>+	regmap_update_bits(tps-&gt;regmap, TPS65023_REG_CON_CTRL2,</div><div class='add'>+			TPS65023_REG_CTRL2_CORE_ADJ, TPS65023_REG_CTRL2_CORE_ADJ);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/regulator/tps6507x-regulator.c b/drivers/regulator/tps6507x-regulator.c<br/>index bdef70365f52..0b63ef71a5fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/tps6507x-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/tps6507x-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/tps6507x-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/tps6507x-regulator.c</a></div><div class='hunk'>@@ -599,7 +599,7 @@ int tps6507x_pmic_probe(struct platform_device *pdev)</div><div class='ctx'> 		tps-&gt;desc[i].owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 		rdev = regulator_register(&amp;tps-&gt;desc[i],</div><div class='del'>-					tps6507x_dev-&gt;dev, init_data, tps);</div><div class='add'>+					tps6507x_dev-&gt;dev, init_data, tps, NULL);</div><div class='ctx'> 		if (IS_ERR(rdev)) {</div><div class='ctx'> 			dev_err(tps6507x_dev-&gt;dev,</div><div class='ctx'> 				"failed to register %s regulator\n",</div><div class='head'>diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c<br/>index 9166aa0a9df7..70b7b1f4f000 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/tps6524x-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/tps6524x-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/tps6524x-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/tps6524x-regulator.c</a></div><div class='hunk'>@@ -651,7 +651,7 @@ static int __devinit pmic_probe(struct spi_device *spi)</div><div class='ctx'> 			hw-&gt;desc[i].n_voltages = 1;</div><div class='ctx'> </div><div class='ctx'> 		hw-&gt;rdev[i] = regulator_register(&amp;hw-&gt;desc[i], dev,</div><div class='del'>-						 init_data, hw);</div><div class='add'>+						 init_data, hw, NULL);</div><div class='ctx'> 		if (IS_ERR(hw-&gt;rdev[i])) {</div><div class='ctx'> 			ret = PTR_ERR(hw-&gt;rdev[i]);</div><div class='ctx'> 			hw-&gt;rdev[i] = NULL;</div><div class='head'>diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c<br/>index 14b9389dd52a..c75fb20faa57 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/tps6586x-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/tps6586x-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/tps6586x-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/tps6586x-regulator.c</a></div><div class='hunk'>@@ -396,7 +396,7 @@ static int __devinit tps6586x_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	rdev = regulator_register(&amp;ri-&gt;desc, &amp;pdev-&gt;dev,</div><div class='del'>-				  pdev-&gt;dev.platform_data, ri);</div><div class='add'>+				  pdev-&gt;dev.platform_data, ri, NULL);</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='ctx'> 				ri-&gt;desc.name);</div><div class='head'>diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c<br/>index b552aae55b41..5c15ba01e9c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/tps65910-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/tps65910-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/tps65910-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/tps65910-regulator.c</a></div><div class='hunk'>@@ -25,30 +25,6 @@</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/tps65910.h&gt;</div><div class='ctx'> </div><div class='del'>-#define TPS65910_REG_VRTC		0</div><div class='del'>-#define TPS65910_REG_VIO		1</div><div class='del'>-#define TPS65910_REG_VDD1		2</div><div class='del'>-#define TPS65910_REG_VDD2		3</div><div class='del'>-#define TPS65910_REG_VDD3		4</div><div class='del'>-#define TPS65910_REG_VDIG1		5</div><div class='del'>-#define TPS65910_REG_VDIG2		6</div><div class='del'>-#define TPS65910_REG_VPLL		7</div><div class='del'>-#define TPS65910_REG_VDAC		8</div><div class='del'>-#define TPS65910_REG_VAUX1		9</div><div class='del'>-#define TPS65910_REG_VAUX2		10</div><div class='del'>-#define TPS65910_REG_VAUX33		11</div><div class='del'>-#define TPS65910_REG_VMMC		12</div><div class='del'>-</div><div class='del'>-#define TPS65911_REG_VDDCTRL		4</div><div class='del'>-#define TPS65911_REG_LDO1		5</div><div class='del'>-#define TPS65911_REG_LDO2		6</div><div class='del'>-#define TPS65911_REG_LDO3		7</div><div class='del'>-#define TPS65911_REG_LDO4		8</div><div class='del'>-#define TPS65911_REG_LDO5		9</div><div class='del'>-#define TPS65911_REG_LDO6		10</div><div class='del'>-#define TPS65911_REG_LDO7		11</div><div class='del'>-#define TPS65911_REG_LDO8		12</div><div class='del'>-</div><div class='ctx'> #define TPS65910_SUPPLY_STATE_ENABLED	0x1</div><div class='ctx'> </div><div class='ctx'> /* supported VIO voltages in milivolts */</div><div class='hunk'>@@ -885,8 +861,6 @@ static __devinit int tps65910_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (!pmic_plat_data)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	reg_data = pmic_plat_data-&gt;tps65910_pmic_init_data;</div><div class='del'>-</div><div class='ctx'> 	pmic = kzalloc(sizeof(*pmic), GFP_KERNEL);</div><div class='ctx'> 	if (!pmic)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -937,7 +911,16 @@ static __devinit int tps65910_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err_free_info;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; pmic-&gt;num_regulators; i++, info++, reg_data++) {</div><div class='add'>+	for (i = 0; i &lt; pmic-&gt;num_regulators &amp;&amp; i &lt; TPS65910_NUM_REGS;</div><div class='add'>+			i++, info++) {</div><div class='add'>+</div><div class='add'>+		reg_data = pmic_plat_data-&gt;tps65910_pmic_init_data[i];</div><div class='add'>+</div><div class='add'>+		/* Regulator API handles empty constraints but not NULL</div><div class='add'>+		 * constraints */</div><div class='add'>+		if (!reg_data)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		/* Register the regulators */</div><div class='ctx'> 		pmic-&gt;info[i] = info;</div><div class='ctx'> </div><div class='hunk'>@@ -965,7 +948,7 @@ static __devinit int tps65910_probe(struct platform_device *pdev)</div><div class='ctx'> 		pmic-&gt;desc[i].owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 		rdev = regulator_register(&amp;pmic-&gt;desc[i],</div><div class='del'>-				tps65910-&gt;dev, reg_data, pmic);</div><div class='add'>+				tps65910-&gt;dev, reg_data, pmic, NULL);</div><div class='ctx'> 		if (IS_ERR(rdev)) {</div><div class='ctx'> 			dev_err(tps65910-&gt;dev,</div><div class='ctx'> 				"failed to register %s regulator\n",</div><div class='head'>diff --git a/drivers/regulator/tps65912-regulator.c b/drivers/regulator/tps65912-regulator.c<br/>index 39d4a1749e71..da00d88f94b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/tps65912-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/tps65912-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/tps65912-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/tps65912-regulator.c</a></div><div class='hunk'>@@ -727,7 +727,7 @@ static __devinit int tps65912_probe(struct platform_device *pdev)</div><div class='ctx'> 		pmic-&gt;desc[i].owner = THIS_MODULE;</div><div class='ctx'> 		range = tps65912_get_range(pmic, i);</div><div class='ctx'> 		rdev = regulator_register(&amp;pmic-&gt;desc[i],</div><div class='del'>-					tps65912-&gt;dev, reg_data, pmic);</div><div class='add'>+					tps65912-&gt;dev, reg_data, pmic, NULL);</div><div class='ctx'> 		if (IS_ERR(rdev)) {</div><div class='ctx'> 			dev_err(tps65912-&gt;dev,</div><div class='ctx'> 				"failed to register %s regulator\n",</div><div class='head'>diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c<br/>index 11cc308d66e9..181a2cfe180c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/twl-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/twl-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/twl-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/twl-regulator.c</a></div><div class='hunk'>@@ -1112,7 +1112,7 @@ static int __devinit twlreg_probe(struct platform_device *pdev)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rdev = regulator_register(&amp;info-&gt;desc, &amp;pdev-&gt;dev, initdata, info);</div><div class='add'>+	rdev = regulator_register(&amp;info-&gt;desc, &amp;pdev-&gt;dev, initdata, info, NULL);</div><div class='ctx'> 	if (IS_ERR(rdev)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "can't register %s, %ld\n",</div><div class='ctx'> 				info-&gt;desc.name, PTR_ERR(rdev));</div><div class='head'>diff --git a/drivers/regulator/userspace-consumer.c b/drivers/regulator/userspace-consumer.c<br/>index fc6655146999..518667ef9a0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/userspace-consumer.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/userspace-consumer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/userspace-consumer.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/userspace-consumer.c</a></div><div class='hunk'>@@ -185,18 +185,7 @@ static struct platform_driver regulator_userspace_consumer_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init regulator_userspace_consumer_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;regulator_userspace_consumer_driver);</div><div class='del'>-}</div><div class='del'>-module_init(regulator_userspace_consumer_init);</div><div class='del'>-</div><div class='del'>-static void __exit regulator_userspace_consumer_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;regulator_userspace_consumer_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(regulator_userspace_consumer_exit);</div><div class='add'>+module_platform_driver(regulator_userspace_consumer_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Mike Rapoport &lt;mike@compulab.co.il&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Userspace consumer for voltage and current regulators");</div><div class='head'>diff --git a/drivers/regulator/virtual.c b/drivers/regulator/virtual.c<br/>index 858c1f861ba5..ee0b161c998f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/virtual.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/virtual.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/virtual.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/virtual.c</a></div><div class='hunk'>@@ -352,17 +352,7 @@ static struct platform_driver regulator_virtual_consumer_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init regulator_virtual_consumer_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;regulator_virtual_consumer_driver);</div><div class='del'>-}</div><div class='del'>-module_init(regulator_virtual_consumer_init);</div><div class='del'>-</div><div class='del'>-static void __exit regulator_virtual_consumer_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;regulator_virtual_consumer_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(regulator_virtual_consumer_exit);</div><div class='add'>+module_platform_driver(regulator_virtual_consumer_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Virtual regulator consumer");</div><div class='head'>diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c<br/>index bd3531d8b2ac..4904a40b0d46 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/wm831x-dcdc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/wm831x-dcdc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/wm831x-dcdc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/wm831x-dcdc.c</a></div><div class='hunk'>@@ -511,7 +511,8 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (pdata == NULL || pdata-&gt;dcdc[id] == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	dcdc = kzalloc(sizeof(struct wm831x_dcdc), GFP_KERNEL);</div><div class='add'>+	dcdc = devm_kzalloc(&amp;pdev-&gt;dev,  sizeof(struct wm831x_dcdc),</div><div class='add'>+			    GFP_KERNEL);</div><div class='ctx'> 	if (dcdc == NULL) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Unable to allocate private data\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -553,7 +554,7 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)</div><div class='ctx'> 		wm831x_buckv_dvs_init(dcdc, pdata-&gt;dcdc[id]-&gt;driver_data);</div><div class='ctx'> </div><div class='ctx'> 	dcdc-&gt;regulator = regulator_register(&amp;dcdc-&gt;desc, &amp;pdev-&gt;dev,</div><div class='del'>-					     pdata-&gt;dcdc[id], dcdc);</div><div class='add'>+					     pdata-&gt;dcdc[id], dcdc, NULL);</div><div class='ctx'> 	if (IS_ERR(dcdc-&gt;regulator)) {</div><div class='ctx'> 		ret = PTR_ERR(dcdc-&gt;regulator);</div><div class='ctx'> 		dev_err(wm831x-&gt;dev, "Failed to register DCDC%d: %d\n",</div><div class='hunk'>@@ -590,7 +591,6 @@ err_regulator:</div><div class='ctx'> err:</div><div class='ctx'> 	if (dcdc-&gt;dvs_gpio)</div><div class='ctx'> 		gpio_free(dcdc-&gt;dvs_gpio);</div><div class='del'>-	kfree(dcdc);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -605,7 +605,6 @@ static __devexit int wm831x_buckv_remove(struct platform_device *pdev)</div><div class='ctx'> 	regulator_unregister(dcdc-&gt;regulator);</div><div class='ctx'> 	if (dcdc-&gt;dvs_gpio)</div><div class='ctx'> 		gpio_free(dcdc-&gt;dvs_gpio);</div><div class='del'>-	kfree(dcdc);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -722,7 +721,8 @@ static __devinit int wm831x_buckp_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (pdata == NULL || pdata-&gt;dcdc[id] == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	dcdc = kzalloc(sizeof(struct wm831x_dcdc), GFP_KERNEL);</div><div class='add'>+	dcdc = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(struct wm831x_dcdc),</div><div class='add'>+			    GFP_KERNEL);</div><div class='ctx'> 	if (dcdc == NULL) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Unable to allocate private data\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -747,7 +747,7 @@ static __devinit int wm831x_buckp_probe(struct platform_device *pdev)</div><div class='ctx'> 	dcdc-&gt;desc.owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	dcdc-&gt;regulator = regulator_register(&amp;dcdc-&gt;desc, &amp;pdev-&gt;dev,</div><div class='del'>-					     pdata-&gt;dcdc[id], dcdc);</div><div class='add'>+					     pdata-&gt;dcdc[id], dcdc, NULL);</div><div class='ctx'> 	if (IS_ERR(dcdc-&gt;regulator)) {</div><div class='ctx'> 		ret = PTR_ERR(dcdc-&gt;regulator);</div><div class='ctx'> 		dev_err(wm831x-&gt;dev, "Failed to register DCDC%d: %d\n",</div><div class='hunk'>@@ -771,7 +771,6 @@ static __devinit int wm831x_buckp_probe(struct platform_device *pdev)</div><div class='ctx'> err_regulator:</div><div class='ctx'> 	regulator_unregister(dcdc-&gt;regulator);</div><div class='ctx'> err:</div><div class='del'>-	kfree(dcdc);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -783,7 +782,6 @@ static __devexit int wm831x_buckp_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	free_irq(platform_get_irq_byname(pdev, "UV"), dcdc);</div><div class='ctx'> 	regulator_unregister(dcdc-&gt;regulator);</div><div class='del'>-	kfree(dcdc);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -874,7 +872,7 @@ static __devinit int wm831x_boostp_probe(struct platform_device *pdev)</div><div class='ctx'> 	dcdc-&gt;desc.owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	dcdc-&gt;regulator = regulator_register(&amp;dcdc-&gt;desc, &amp;pdev-&gt;dev,</div><div class='del'>-					     pdata-&gt;dcdc[id], dcdc);</div><div class='add'>+					     pdata-&gt;dcdc[id], dcdc, NULL);</div><div class='ctx'> 	if (IS_ERR(dcdc-&gt;regulator)) {</div><div class='ctx'> 		ret = PTR_ERR(dcdc-&gt;regulator);</div><div class='ctx'> 		dev_err(wm831x-&gt;dev, "Failed to register DCDC%d: %d\n",</div><div class='hunk'>@@ -973,7 +971,7 @@ static __devinit int wm831x_epe_probe(struct platform_device *pdev)</div><div class='ctx'> 	dcdc-&gt;desc.owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	dcdc-&gt;regulator = regulator_register(&amp;dcdc-&gt;desc, &amp;pdev-&gt;dev,</div><div class='del'>-					     pdata-&gt;epe[id], dcdc);</div><div class='add'>+					     pdata-&gt;epe[id], dcdc, NULL);</div><div class='ctx'> 	if (IS_ERR(dcdc-&gt;regulator)) {</div><div class='ctx'> 		ret = PTR_ERR(dcdc-&gt;regulator);</div><div class='ctx'> 		dev_err(wm831x-&gt;dev, "Failed to register EPE%d: %d\n",</div><div class='head'>diff --git a/drivers/regulator/wm831x-isink.c b/drivers/regulator/wm831x-isink.c<br/>index 01f27c7f4236..634aac3f2d5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/wm831x-isink.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/wm831x-isink.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/wm831x-isink.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/wm831x-isink.c</a></div><div class='hunk'>@@ -162,7 +162,8 @@ static __devinit int wm831x_isink_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (pdata == NULL || pdata-&gt;isink[id] == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	isink = kzalloc(sizeof(struct wm831x_isink), GFP_KERNEL);</div><div class='add'>+	isink = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(struct wm831x_isink),</div><div class='add'>+			     GFP_KERNEL);</div><div class='ctx'> 	if (isink == NULL) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Unable to allocate private data\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -189,7 +190,7 @@ static __devinit int wm831x_isink_probe(struct platform_device *pdev)</div><div class='ctx'> 	isink-&gt;desc.owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	isink-&gt;regulator = regulator_register(&amp;isink-&gt;desc, &amp;pdev-&gt;dev,</div><div class='del'>-					     pdata-&gt;isink[id], isink);</div><div class='add'>+					     pdata-&gt;isink[id], isink, NULL);</div><div class='ctx'> 	if (IS_ERR(isink-&gt;regulator)) {</div><div class='ctx'> 		ret = PTR_ERR(isink-&gt;regulator);</div><div class='ctx'> 		dev_err(wm831x-&gt;dev, "Failed to register ISINK%d: %d\n",</div><div class='hunk'>@@ -213,7 +214,6 @@ static __devinit int wm831x_isink_probe(struct platform_device *pdev)</div><div class='ctx'> err_regulator:</div><div class='ctx'> 	regulator_unregister(isink-&gt;regulator);</div><div class='ctx'> err:</div><div class='del'>-	kfree(isink);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -226,7 +226,6 @@ static __devexit int wm831x_isink_remove(struct platform_device *pdev)</div><div class='ctx'> 	free_irq(platform_get_irq(pdev, 0), isink);</div><div class='ctx'> </div><div class='ctx'> 	regulator_unregister(isink-&gt;regulator);</div><div class='del'>-	kfree(isink);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c<br/>index 6709710a059e..f1e4ab0f9fda 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/wm831x-ldo.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/wm831x-ldo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/wm831x-ldo.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/wm831x-ldo.c</a></div><div class='hunk'>@@ -326,7 +326,7 @@ static __devinit int wm831x_gp_ldo_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (pdata == NULL || pdata-&gt;ldo[id] == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	ldo = kzalloc(sizeof(struct wm831x_ldo), GFP_KERNEL);</div><div class='add'>+	ldo = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(struct wm831x_ldo), GFP_KERNEL);</div><div class='ctx'> 	if (ldo == NULL) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Unable to allocate private data\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -351,7 +351,7 @@ static __devinit int wm831x_gp_ldo_probe(struct platform_device *pdev)</div><div class='ctx'> 	ldo-&gt;desc.owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	ldo-&gt;regulator = regulator_register(&amp;ldo-&gt;desc, &amp;pdev-&gt;dev,</div><div class='del'>-					     pdata-&gt;ldo[id], ldo);</div><div class='add'>+					     pdata-&gt;ldo[id], ldo, NULL);</div><div class='ctx'> 	if (IS_ERR(ldo-&gt;regulator)) {</div><div class='ctx'> 		ret = PTR_ERR(ldo-&gt;regulator);</div><div class='ctx'> 		dev_err(wm831x-&gt;dev, "Failed to register LDO%d: %d\n",</div><div class='hunk'>@@ -376,7 +376,6 @@ static __devinit int wm831x_gp_ldo_probe(struct platform_device *pdev)</div><div class='ctx'> err_regulator:</div><div class='ctx'> 	regulator_unregister(ldo-&gt;regulator);</div><div class='ctx'> err:</div><div class='del'>-	kfree(ldo);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -388,7 +387,6 @@ static __devexit int wm831x_gp_ldo_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	free_irq(platform_get_irq_byname(pdev, "UV"), ldo);</div><div class='ctx'> 	regulator_unregister(ldo-&gt;regulator);</div><div class='del'>-	kfree(ldo);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -596,7 +594,7 @@ static __devinit int wm831x_aldo_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (pdata == NULL || pdata-&gt;ldo[id] == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	ldo = kzalloc(sizeof(struct wm831x_ldo), GFP_KERNEL);</div><div class='add'>+	ldo = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(struct wm831x_ldo), GFP_KERNEL);</div><div class='ctx'> 	if (ldo == NULL) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Unable to allocate private data\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -621,7 +619,7 @@ static __devinit int wm831x_aldo_probe(struct platform_device *pdev)</div><div class='ctx'> 	ldo-&gt;desc.owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	ldo-&gt;regulator = regulator_register(&amp;ldo-&gt;desc, &amp;pdev-&gt;dev,</div><div class='del'>-					     pdata-&gt;ldo[id], ldo);</div><div class='add'>+					     pdata-&gt;ldo[id], ldo, NULL);</div><div class='ctx'> 	if (IS_ERR(ldo-&gt;regulator)) {</div><div class='ctx'> 		ret = PTR_ERR(ldo-&gt;regulator);</div><div class='ctx'> 		dev_err(wm831x-&gt;dev, "Failed to register LDO%d: %d\n",</div><div class='hunk'>@@ -645,7 +643,6 @@ static __devinit int wm831x_aldo_probe(struct platform_device *pdev)</div><div class='ctx'> err_regulator:</div><div class='ctx'> 	regulator_unregister(ldo-&gt;regulator);</div><div class='ctx'> err:</div><div class='del'>-	kfree(ldo);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -655,7 +652,6 @@ static __devexit int wm831x_aldo_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	free_irq(platform_get_irq_byname(pdev, "UV"), ldo);</div><div class='ctx'> 	regulator_unregister(ldo-&gt;regulator);</div><div class='del'>-	kfree(ldo);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -793,7 +789,7 @@ static __devinit int wm831x_alive_ldo_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (pdata == NULL || pdata-&gt;ldo[id] == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	ldo = kzalloc(sizeof(struct wm831x_ldo), GFP_KERNEL);</div><div class='add'>+	ldo = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(struct wm831x_ldo), GFP_KERNEL);</div><div class='ctx'> 	if (ldo == NULL) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Unable to allocate private data\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -818,7 +814,7 @@ static __devinit int wm831x_alive_ldo_probe(struct platform_device *pdev)</div><div class='ctx'> 	ldo-&gt;desc.owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	ldo-&gt;regulator = regulator_register(&amp;ldo-&gt;desc, &amp;pdev-&gt;dev,</div><div class='del'>-					     pdata-&gt;ldo[id], ldo);</div><div class='add'>+					     pdata-&gt;ldo[id], ldo, NULL);</div><div class='ctx'> 	if (IS_ERR(ldo-&gt;regulator)) {</div><div class='ctx'> 		ret = PTR_ERR(ldo-&gt;regulator);</div><div class='ctx'> 		dev_err(wm831x-&gt;dev, "Failed to register LDO%d: %d\n",</div><div class='hunk'>@@ -831,7 +827,6 @@ static __devinit int wm831x_alive_ldo_probe(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	kfree(ldo);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -840,7 +835,6 @@ static __devexit int wm831x_alive_ldo_remove(struct platform_device *pdev)</div><div class='ctx'> 	struct wm831x_ldo *ldo = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	regulator_unregister(ldo-&gt;regulator);</div><div class='del'>-	kfree(ldo);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c<br/>index 1bcb22c44095..6894009d815a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/wm8350-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/wm8350-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/wm8350-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/wm8350-regulator.c</a></div><div class='hunk'>@@ -1428,7 +1428,7 @@ static int wm8350_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* register regulator */</div><div class='ctx'> 	rdev = regulator_register(&amp;wm8350_reg[pdev-&gt;id], &amp;pdev-&gt;dev,</div><div class='ctx'> 				  pdev-&gt;dev.platform_data,</div><div class='del'>-				  dev_get_drvdata(&amp;pdev-&gt;dev));</div><div class='add'>+				  dev_get_drvdata(&amp;pdev-&gt;dev), NULL);</div><div class='ctx'> 	if (IS_ERR(rdev)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to register %s\n",</div><div class='ctx'> 			wm8350_reg[pdev-&gt;id].name);</div><div class='head'>diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c<br/>index 71632ddc3781..706f39563a7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/wm8400-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/wm8400-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/wm8400-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/wm8400-regulator.c</a></div><div class='hunk'>@@ -326,7 +326,7 @@ static int __devinit wm8400_regulator_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct regulator_dev *rdev;</div><div class='ctx'> </div><div class='ctx'> 	rdev = regulator_register(&amp;regulators[pdev-&gt;id], &amp;pdev-&gt;dev,</div><div class='del'>-				  pdev-&gt;dev.platform_data, wm8400);</div><div class='add'>+				  pdev-&gt;dev.platform_data, wm8400, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(rdev))</div><div class='ctx'> 		return PTR_ERR(rdev);</div><div class='head'>diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c<br/>index b87bf5c841f8..435e335d6e67 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/regulator/wm8994-regulator.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/regulator/wm8994-regulator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/regulator/wm8994-regulator.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/regulator/wm8994-regulator.c</a></div><div class='hunk'>@@ -269,7 +269,7 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev)</div><div class='ctx'> 		ldo-&gt;is_enabled = true;</div><div class='ctx'> </div><div class='ctx'> 	ldo-&gt;regulator = regulator_register(&amp;wm8994_ldo_desc[id], &amp;pdev-&gt;dev,</div><div class='del'>-					     pdata-&gt;ldo[id].init_data, ldo);</div><div class='add'>+					     pdata-&gt;ldo[id].init_data, ldo, NULL);</div><div class='ctx'> 	if (IS_ERR(ldo-&gt;regulator)) {</div><div class='ctx'> 		ret = PTR_ERR(ldo-&gt;regulator);</div><div class='ctx'> 		dev_err(wm8994-&gt;dev, "Failed to register LDO%d: %d\n",</div><div class='head'>diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig<br/>index 53eb4e55b289..e19a4031f45e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/Kconfig</a></div><div class='hunk'>@@ -498,9 +498,9 @@ config RTC_DRV_CMOS</div><div class='ctx'> 	  will be called rtc-cmos.</div><div class='ctx'> </div><div class='ctx'> config RTC_DRV_VRTC</div><div class='del'>-	tristate "Virtual RTC for Moorestown platforms"</div><div class='del'>-	depends on X86_MRST</div><div class='del'>-	default y if X86_MRST</div><div class='add'>+	tristate "Virtual RTC for Intel MID platforms"</div><div class='add'>+	depends on X86_INTEL_MID</div><div class='add'>+	default y if X86_INTEL_MID</div><div class='ctx'> </div><div class='ctx'> 	help</div><div class='ctx'> 	Say "yes" here to get direct support for the real time clock</div><div class='hunk'>@@ -774,7 +774,7 @@ config RTC_DRV_EP93XX</div><div class='ctx'> </div><div class='ctx'> config RTC_DRV_SA1100</div><div class='ctx'> 	tristate "SA11x0/PXA2xx"</div><div class='del'>-	depends on ARCH_SA1100 || ARCH_PXA</div><div class='add'>+	depends on ARCH_SA1100 || ARCH_PXA || ARCH_MMP</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say Y here you will get access to the real time clock</div><div class='ctx'> 	  built into your SA11x0 or PXA2xx CPU.</div><div class='head'>diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c<br/>index 8e286259a007..8a1c031391d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/interface.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/interface.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/interface.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/interface.c</a></div><div class='hunk'>@@ -228,11 +228,11 @@ int __rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)</div><div class='ctx'> 		alarm-&gt;time.tm_hour = now.tm_hour;</div><div class='ctx'> </div><div class='ctx'> 	/* For simplicity, only support date rollover for now */</div><div class='del'>-	if (alarm-&gt;time.tm_mday == -1) {</div><div class='add'>+	if (alarm-&gt;time.tm_mday &lt; 1 || alarm-&gt;time.tm_mday &gt; 31) {</div><div class='ctx'> 		alarm-&gt;time.tm_mday = now.tm_mday;</div><div class='ctx'> 		missing = day;</div><div class='ctx'> 	}</div><div class='del'>-	if (alarm-&gt;time.tm_mon == -1) {</div><div class='add'>+	if ((unsigned)alarm-&gt;time.tm_mon &gt;= 12) {</div><div class='ctx'> 		alarm-&gt;time.tm_mon = now.tm_mon;</div><div class='ctx'> 		if (missing == none)</div><div class='ctx'> 			missing = month;</div><div class='head'>diff --git a/drivers/rtc/rtc-88pm860x.c b/drivers/rtc/rtc-88pm860x.c<br/>index 64b847b7f970..f04761e6622d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-88pm860x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-88pm860x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-88pm860x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-88pm860x.c</a></div><div class='hunk'>@@ -410,17 +410,7 @@ static struct platform_driver pm860x_rtc_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(pm860x_rtc_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pm860x_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pm860x_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pm860x_rtc_init);</div><div class='del'>-</div><div class='del'>-static void __exit pm860x_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pm860x_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(pm860x_rtc_exit);</div><div class='add'>+module_platform_driver(pm860x_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Marvell 88PM860x RTC driver");</div><div class='ctx'> MODULE_AUTHOR("Haojian Zhuang &lt;haojian.zhuang@marvell.com&gt;");</div><div class='head'>diff --git a/drivers/rtc/rtc-ab8500.c b/drivers/rtc/rtc-ab8500.c<br/>index e346705aae92..4bcf9ca2818a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-ab8500.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-ab8500.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-ab8500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-ab8500.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/abx500.h&gt;</div><div class='del'>-#include &lt;linux/mfd/ab8500.h&gt;</div><div class='add'>+#include &lt;linux/mfd/abx500/ab8500.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define AB8500_RTC_SOFF_STAT_REG	0x00</div><div class='hunk'>@@ -90,7 +90,7 @@ static int ab8500_rtc_read_time(struct device *dev, struct rtc_time *tm)</div><div class='ctx'> </div><div class='ctx'> 	/* Early AB8500 chips will not clear the rtc read request bit */</div><div class='ctx'> 	if (abx500_get_chip_id(dev) == 0) {</div><div class='del'>-		msleep(1);</div><div class='add'>+		usleep_range(1000, 1000);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Wait for some cycles after enabling the rtc read in ab8500 */</div><div class='ctx'> 		while (time_before(jiffies, timeout)) {</div><div class='hunk'>@@ -102,7 +102,7 @@ static int ab8500_rtc_read_time(struct device *dev, struct rtc_time *tm)</div><div class='ctx'> 			if (!(value &amp; RTC_READ_REQUEST))</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			msleep(1);</div><div class='add'>+			usleep_range(1000, 5000);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -258,6 +258,109 @@ static int ab8500_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)</div><div class='ctx'> 	return ab8500_rtc_irq_enable(dev, alarm-&gt;enabled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static int ab8500_rtc_set_calibration(struct device *dev, int calibration)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+	u8  rtccal = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check that the calibration value (which is in units of 0.5</div><div class='add'>+	 * parts-per-million) is in the AB8500's range for RtcCalibration</div><div class='add'>+	 * register. -128 (0x80) is not permitted because the AB8500 uses</div><div class='add'>+	 * a sign-bit rather than two's complement, so 0x80 is just another</div><div class='add'>+	 * representation of zero.</div><div class='add'>+	 */</div><div class='add'>+	if ((calibration &lt; -127) || (calibration &gt; 127)) {</div><div class='add'>+		dev_err(dev, "RtcCalibration value outside permitted range\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The AB8500 uses sign (in bit7) and magnitude (in bits0-7)</div><div class='add'>+	 * so need to convert to this sort of representation before writing</div><div class='add'>+	 * into RtcCalibration register...</div><div class='add'>+	 */</div><div class='add'>+	if (calibration &gt;= 0)</div><div class='add'>+		rtccal = 0x7F &amp; calibration;</div><div class='add'>+	else</div><div class='add'>+		rtccal = ~(calibration - 1) | 0x80;</div><div class='add'>+</div><div class='add'>+	retval = abx500_set_register_interruptible(dev, AB8500_RTC,</div><div class='add'>+			AB8500_RTC_CALIB_REG, rtccal);</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ab8500_rtc_get_calibration(struct device *dev, int *calibration)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+	u8  rtccal = 0;</div><div class='add'>+</div><div class='add'>+	retval =  abx500_get_register_interruptible(dev, AB8500_RTC,</div><div class='add'>+			AB8500_RTC_CALIB_REG, &amp;rtccal);</div><div class='add'>+	if (retval &gt;= 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * The AB8500 uses sign (in bit7) and magnitude (in bits0-7)</div><div class='add'>+		 * so need to convert value from RtcCalibration register into</div><div class='add'>+		 * a two's complement signed value...</div><div class='add'>+		 */</div><div class='add'>+		if (rtccal &amp; 0x80)</div><div class='add'>+			*calibration = 0 - (rtccal &amp; 0x7F);</div><div class='add'>+		else</div><div class='add'>+			*calibration = 0x7F &amp; rtccal;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ab8500_sysfs_store_rtc_calibration(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'>+	int retval;</div><div class='add'>+	int calibration = 0;</div><div class='add'>+</div><div class='add'>+	if (sscanf(buf, " %i ", &amp;calibration) != 1) {</div><div class='add'>+		dev_err(dev, "Failed to store RTC calibration attribute\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = ab8500_rtc_set_calibration(dev, calibration);</div><div class='add'>+</div><div class='add'>+	return retval ? retval : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ab8500_sysfs_show_rtc_calibration(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	int  retval = 0;</div><div class='add'>+	int  calibration = 0;</div><div class='add'>+</div><div class='add'>+	retval = ab8500_rtc_get_calibration(dev, &amp;calibration);</div><div class='add'>+	if (retval &lt; 0) {</div><div class='add'>+		dev_err(dev, "Failed to read RTC calibration attribute\n");</div><div class='add'>+		sprintf(buf, "0\n");</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", calibration);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(rtc_calibration, S_IRUGO | S_IWUSR,</div><div class='add'>+		   ab8500_sysfs_show_rtc_calibration,</div><div class='add'>+		   ab8500_sysfs_store_rtc_calibration);</div><div class='add'>+</div><div class='add'>+static int ab8500_sysfs_rtc_register(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return device_create_file(dev, &amp;dev_attr_rtc_calibration);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ab8500_sysfs_rtc_unregister(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	device_remove_file(dev, &amp;dev_attr_rtc_calibration);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static irqreturn_t rtc_alarm_handler(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtc_device *rtc = data;</div><div class='hunk'>@@ -295,7 +398,7 @@ static int __devinit ab8500_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for reset by the PorRtc */</div><div class='del'>-	msleep(1);</div><div class='add'>+	usleep_range(1000, 5000);</div><div class='ctx'> </div><div class='ctx'> 	err = abx500_get_register_interruptible(&amp;pdev-&gt;dev, AB8500_RTC,</div><div class='ctx'> 		AB8500_RTC_STAT_REG, &amp;rtc_ctrl);</div><div class='hunk'>@@ -308,6 +411,8 @@ static int __devinit ab8500_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	device_init_wakeup(&amp;pdev-&gt;dev, true);</div><div class='add'>+</div><div class='ctx'> 	rtc = rtc_device_register("ab8500-rtc", &amp;pdev-&gt;dev, &amp;ab8500_rtc_ops,</div><div class='ctx'> 			THIS_MODULE);</div><div class='ctx'> 	if (IS_ERR(rtc)) {</div><div class='hunk'>@@ -316,8 +421,8 @@ static int __devinit ab8500_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = request_threaded_irq(irq, NULL, rtc_alarm_handler, 0,</div><div class='del'>-				   "ab8500-rtc", rtc);</div><div class='add'>+	err = request_threaded_irq(irq, NULL, rtc_alarm_handler,</div><div class='add'>+		IRQF_NO_SUSPEND, "ab8500-rtc", rtc);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		rtc_device_unregister(rtc);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -325,6 +430,13 @@ static int __devinit ab8500_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, rtc);</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+	err = ab8500_sysfs_rtc_register(&amp;pdev-&gt;dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "sysfs RTC failed to register\n");</div><div class='add'>+		return err;</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'>@@ -333,6 +445,8 @@ static int __devexit ab8500_rtc_remove(struct platform_device *pdev)</div><div class='ctx'> 	struct rtc_device *rtc = platform_get_drvdata(pdev);</div><div class='ctx'> 	int irq = platform_get_irq_byname(pdev, "ALARM");</div><div class='ctx'> </div><div class='add'>+	ab8500_sysfs_rtc_unregister(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	free_irq(irq, rtc);</div><div class='ctx'> 	rtc_device_unregister(rtc);</div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='hunk'>@@ -349,18 +463,8 @@ static struct platform_driver ab8500_rtc_driver = {</div><div class='ctx'> 	.remove = __devexit_p(ab8500_rtc_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ab8500_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ab8500_rtc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ab8500_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ab8500_rtc_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(ab8500_rtc_driver);</div><div class='ctx'> </div><div class='del'>-module_init(ab8500_rtc_init);</div><div class='del'>-module_exit(ab8500_rtc_exit);</div><div class='ctx'> MODULE_AUTHOR("Virupax Sadashivpetimath &lt;virupax.sadashivpetimath@stericsson.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("AB8500 RTC Driver");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c<br/>index e39b77a4609a..dc474bc6522d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-at91rm9200.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-at91rm9200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-at91rm9200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-at91rm9200.c</a></div><div class='hunk'>@@ -32,11 +32,17 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach/at91_rtc.h&gt;</div><div class='ctx'> </div><div class='add'>+#define at91_rtc_read(field) \</div><div class='add'>+	__raw_readl(at91_rtc_regs + field)</div><div class='add'>+#define at91_rtc_write(field, val) \</div><div class='add'>+	__raw_writel((val), at91_rtc_regs + field)</div><div class='ctx'> </div><div class='ctx'> #define AT91_RTC_EPOCH		1900UL	/* just like arch/arm/common/rtctime.c */</div><div class='ctx'> </div><div class='ctx'> static DECLARE_COMPLETION(at91_rtc_updated);</div><div class='ctx'> static unsigned int at91_alarm_year = AT91_RTC_EPOCH;</div><div class='add'>+static void __iomem *at91_rtc_regs;</div><div class='add'>+static int irq;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Decode time/date into rtc_time structure</div><div class='hunk'>@@ -48,10 +54,10 @@ static void at91_rtc_decodetime(unsigned int timereg, unsigned int calreg,</div><div class='ctx'> </div><div class='ctx'> 	/* must read twice in case it changes */</div><div class='ctx'> 	do {</div><div class='del'>-		time = at91_sys_read(timereg);</div><div class='del'>-		date = at91_sys_read(calreg);</div><div class='del'>-	} while ((time != at91_sys_read(timereg)) ||</div><div class='del'>-			(date != at91_sys_read(calreg)));</div><div class='add'>+		time = at91_rtc_read(timereg);</div><div class='add'>+		date = at91_rtc_read(calreg);</div><div class='add'>+	} while ((time != at91_rtc_read(timereg)) ||</div><div class='add'>+			(date != at91_rtc_read(calreg)));</div><div class='ctx'> </div><div class='ctx'> 	tm-&gt;tm_sec  = bcd2bin((time &amp; AT91_RTC_SEC) &gt;&gt; 0);</div><div class='ctx'> 	tm-&gt;tm_min  = bcd2bin((time &amp; AT91_RTC_MIN) &gt;&gt; 8);</div><div class='hunk'>@@ -98,19 +104,19 @@ static int at91_rtc_settime(struct device *dev, struct rtc_time *tm)</div><div class='ctx'> 		tm-&gt;tm_hour, tm-&gt;tm_min, tm-&gt;tm_sec);</div><div class='ctx'> </div><div class='ctx'> 	/* Stop Time/Calendar from counting */</div><div class='del'>-	cr = at91_sys_read(AT91_RTC_CR);</div><div class='del'>-	at91_sys_write(AT91_RTC_CR, cr | AT91_RTC_UPDCAL | AT91_RTC_UPDTIM);</div><div class='add'>+	cr = at91_rtc_read(AT91_RTC_CR);</div><div class='add'>+	at91_rtc_write(AT91_RTC_CR, cr | AT91_RTC_UPDCAL | AT91_RTC_UPDTIM);</div><div class='ctx'> </div><div class='del'>-	at91_sys_write(AT91_RTC_IER, AT91_RTC_ACKUPD);</div><div class='add'>+	at91_rtc_write(AT91_RTC_IER, AT91_RTC_ACKUPD);</div><div class='ctx'> 	wait_for_completion(&amp;at91_rtc_updated);	/* wait for ACKUPD interrupt */</div><div class='del'>-	at91_sys_write(AT91_RTC_IDR, AT91_RTC_ACKUPD);</div><div class='add'>+	at91_rtc_write(AT91_RTC_IDR, AT91_RTC_ACKUPD);</div><div class='ctx'> </div><div class='del'>-	at91_sys_write(AT91_RTC_TIMR,</div><div class='add'>+	at91_rtc_write(AT91_RTC_TIMR,</div><div class='ctx'> 			  bin2bcd(tm-&gt;tm_sec) &lt;&lt; 0</div><div class='ctx'> 			| bin2bcd(tm-&gt;tm_min) &lt;&lt; 8</div><div class='ctx'> 			| bin2bcd(tm-&gt;tm_hour) &lt;&lt; 16);</div><div class='ctx'> </div><div class='del'>-	at91_sys_write(AT91_RTC_CALR,</div><div class='add'>+	at91_rtc_write(AT91_RTC_CALR,</div><div class='ctx'> 			  bin2bcd((tm-&gt;tm_year + 1900) / 100)	/* century */</div><div class='ctx'> 			| bin2bcd(tm-&gt;tm_year % 100) &lt;&lt; 8	/* year */</div><div class='ctx'> 			| bin2bcd(tm-&gt;tm_mon + 1) &lt;&lt; 16		/* tm_mon starts at zero */</div><div class='hunk'>@@ -118,8 +124,8 @@ static int at91_rtc_settime(struct device *dev, struct rtc_time *tm)</div><div class='ctx'> 			| bin2bcd(tm-&gt;tm_mday) &lt;&lt; 24);</div><div class='ctx'> </div><div class='ctx'> 	/* Restart Time/Calendar */</div><div class='del'>-	cr = at91_sys_read(AT91_RTC_CR);</div><div class='del'>-	at91_sys_write(AT91_RTC_CR, cr &amp; ~(AT91_RTC_UPDCAL | AT91_RTC_UPDTIM));</div><div class='add'>+	cr = at91_rtc_read(AT91_RTC_CR);</div><div class='add'>+	at91_rtc_write(AT91_RTC_CR, cr &amp; ~(AT91_RTC_UPDCAL | AT91_RTC_UPDTIM));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -135,7 +141,7 @@ static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm)</div><div class='ctx'> 	tm-&gt;tm_yday = rtc_year_days(tm-&gt;tm_mday, tm-&gt;tm_mon, tm-&gt;tm_year);</div><div class='ctx'> 	tm-&gt;tm_year = at91_alarm_year - 1900;</div><div class='ctx'> </div><div class='del'>-	alrm-&gt;enabled = (at91_sys_read(AT91_RTC_IMR) &amp; AT91_RTC_ALARM)</div><div class='add'>+	alrm-&gt;enabled = (at91_rtc_read(AT91_RTC_IMR) &amp; AT91_RTC_ALARM)</div><div class='ctx'> 			? 1 : 0;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__,</div><div class='hunk'>@@ -160,20 +166,20 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)</div><div class='ctx'> 	tm.tm_min = alrm-&gt;time.tm_min;</div><div class='ctx'> 	tm.tm_sec = alrm-&gt;time.tm_sec;</div><div class='ctx'> </div><div class='del'>-	at91_sys_write(AT91_RTC_IDR, AT91_RTC_ALARM);</div><div class='del'>-	at91_sys_write(AT91_RTC_TIMALR,</div><div class='add'>+	at91_rtc_write(AT91_RTC_IDR, AT91_RTC_ALARM);</div><div class='add'>+	at91_rtc_write(AT91_RTC_TIMALR,</div><div class='ctx'> 		  bin2bcd(tm.tm_sec) &lt;&lt; 0</div><div class='ctx'> 		| bin2bcd(tm.tm_min) &lt;&lt; 8</div><div class='ctx'> 		| bin2bcd(tm.tm_hour) &lt;&lt; 16</div><div class='ctx'> 		| AT91_RTC_HOUREN | AT91_RTC_MINEN | AT91_RTC_SECEN);</div><div class='del'>-	at91_sys_write(AT91_RTC_CALALR,</div><div class='add'>+	at91_rtc_write(AT91_RTC_CALALR,</div><div class='ctx'> 		  bin2bcd(tm.tm_mon + 1) &lt;&lt; 16		/* tm_mon starts at zero */</div><div class='ctx'> 		| bin2bcd(tm.tm_mday) &lt;&lt; 24</div><div class='ctx'> 		| AT91_RTC_DATEEN | AT91_RTC_MTHEN);</div><div class='ctx'> </div><div class='ctx'> 	if (alrm-&gt;enabled) {</div><div class='del'>-		at91_sys_write(AT91_RTC_SCCR, AT91_RTC_ALARM);</div><div class='del'>-		at91_sys_write(AT91_RTC_IER, AT91_RTC_ALARM);</div><div class='add'>+		at91_rtc_write(AT91_RTC_SCCR, AT91_RTC_ALARM);</div><div class='add'>+		at91_rtc_write(AT91_RTC_IER, AT91_RTC_ALARM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__,</div><div class='hunk'>@@ -188,10 +194,10 @@ static int at91_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)</div><div class='ctx'> 	pr_debug("%s(): cmd=%08x\n", __func__, enabled);</div><div class='ctx'> </div><div class='ctx'> 	if (enabled) {</div><div class='del'>-		at91_sys_write(AT91_RTC_SCCR, AT91_RTC_ALARM);</div><div class='del'>-		at91_sys_write(AT91_RTC_IER, AT91_RTC_ALARM);</div><div class='add'>+		at91_rtc_write(AT91_RTC_SCCR, AT91_RTC_ALARM);</div><div class='add'>+		at91_rtc_write(AT91_RTC_IER, AT91_RTC_ALARM);</div><div class='ctx'> 	} else</div><div class='del'>-		at91_sys_write(AT91_RTC_IDR, AT91_RTC_ALARM);</div><div class='add'>+		at91_rtc_write(AT91_RTC_IDR, AT91_RTC_ALARM);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -200,7 +206,7 @@ static int at91_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)</div><div class='ctx'>  */</div><div class='ctx'> static int at91_rtc_proc(struct device *dev, struct seq_file *seq)</div><div class='ctx'> {</div><div class='del'>-	unsigned long imr = at91_sys_read(AT91_RTC_IMR);</div><div class='add'>+	unsigned long imr = at91_rtc_read(AT91_RTC_IMR);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "update_IRQ\t: %s\n",</div><div class='ctx'> 			(imr &amp; AT91_RTC_ACKUPD) ? "yes" : "no");</div><div class='hunk'>@@ -220,7 +226,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	unsigned int rtsr;</div><div class='ctx'> 	unsigned long events = 0;</div><div class='ctx'> </div><div class='del'>-	rtsr = at91_sys_read(AT91_RTC_SR) &amp; at91_sys_read(AT91_RTC_IMR);</div><div class='add'>+	rtsr = at91_rtc_read(AT91_RTC_SR) &amp; at91_rtc_read(AT91_RTC_IMR);</div><div class='ctx'> 	if (rtsr) {		/* this interrupt is shared!  Is it ours? */</div><div class='ctx'> 		if (rtsr &amp; AT91_RTC_ALARM)</div><div class='ctx'> 			events |= (RTC_AF | RTC_IRQF);</div><div class='hunk'>@@ -229,7 +235,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		if (rtsr &amp; AT91_RTC_ACKUPD)</div><div class='ctx'> 			complete(&amp;at91_rtc_updated);</div><div class='ctx'> </div><div class='del'>-		at91_sys_write(AT91_RTC_SCCR, rtsr);	/* clear status reg */</div><div class='add'>+		at91_rtc_write(AT91_RTC_SCCR, rtsr);	/* clear status reg */</div><div class='ctx'> </div><div class='ctx'> 		rtc_update_irq(rtc, 1, events);</div><div class='ctx'> </div><div class='hunk'>@@ -256,22 +262,41 @@ static const struct rtc_class_ops at91_rtc_ops = {</div><div class='ctx'> static int __init at91_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtc_device *rtc;</div><div class='del'>-	int ret;</div><div class='add'>+	struct resource *regs;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	at91_sys_write(AT91_RTC_CR, 0);</div><div class='del'>-	at91_sys_write(AT91_RTC_MR, 0);		/* 24 hour mode */</div><div class='add'>+	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!regs) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "no mmio resource defined\n");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</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'>+		dev_err(&amp;pdev-&gt;dev, "no irq resource defined\n");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at91_rtc_regs = ioremap(regs-&gt;start, resource_size(regs));</div><div class='add'>+	if (!at91_rtc_regs) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to map registers, aborting.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at91_rtc_write(AT91_RTC_CR, 0);</div><div class='add'>+	at91_rtc_write(AT91_RTC_MR, 0);		/* 24 hour mode */</div><div class='ctx'> </div><div class='ctx'> 	/* Disable all interrupts */</div><div class='del'>-	at91_sys_write(AT91_RTC_IDR, AT91_RTC_ACKUPD | AT91_RTC_ALARM |</div><div class='add'>+	at91_rtc_write(AT91_RTC_IDR, AT91_RTC_ACKUPD | AT91_RTC_ALARM |</div><div class='ctx'> 					AT91_RTC_SECEV | AT91_RTC_TIMEV |</div><div class='ctx'> 					AT91_RTC_CALEV);</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(AT91_ID_SYS, at91_rtc_interrupt,</div><div class='add'>+	ret = request_irq(irq, at91_rtc_interrupt,</div><div class='ctx'> 				IRQF_SHARED,</div><div class='ctx'> 				"at91_rtc", pdev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_ERR "at91_rtc: IRQ %d already in use.\n",</div><div class='del'>-				AT91_ID_SYS);</div><div class='add'>+				irq);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -284,7 +309,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> 	rtc = rtc_device_register(pdev-&gt;name, &amp;pdev-&gt;dev,</div><div class='ctx'> 				&amp;at91_rtc_ops, THIS_MODULE);</div><div class='ctx'> 	if (IS_ERR(rtc)) {</div><div class='del'>-		free_irq(AT91_ID_SYS, pdev);</div><div class='add'>+		free_irq(irq, pdev);</div><div class='ctx'> 		return PTR_ERR(rtc);</div><div class='ctx'> 	}</div><div class='ctx'> 	platform_set_drvdata(pdev, rtc);</div><div class='hunk'>@@ -301,10 +326,10 @@ static int __exit at91_rtc_remove(struct platform_device *pdev)</div><div class='ctx'> 	struct rtc_device *rtc = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable all interrupts */</div><div class='del'>-	at91_sys_write(AT91_RTC_IDR, AT91_RTC_ACKUPD | AT91_RTC_ALARM |</div><div class='add'>+	at91_rtc_write(AT91_RTC_IDR, AT91_RTC_ACKUPD | AT91_RTC_ALARM |</div><div class='ctx'> 					AT91_RTC_SECEV | AT91_RTC_TIMEV |</div><div class='ctx'> 					AT91_RTC_CALEV);</div><div class='del'>-	free_irq(AT91_ID_SYS, pdev);</div><div class='add'>+	free_irq(irq, pdev);</div><div class='ctx'> </div><div class='ctx'> 	rtc_device_unregister(rtc);</div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='hunk'>@@ -323,13 +348,13 @@ static int at91_rtc_suspend(struct device *dev)</div><div class='ctx'> 	/* this IRQ is shared with DBGU and other hardware which isn't</div><div class='ctx'> 	 * necessarily doing PM like we are...</div><div class='ctx'> 	 */</div><div class='del'>-	at91_rtc_imr = at91_sys_read(AT91_RTC_IMR)</div><div class='add'>+	at91_rtc_imr = at91_rtc_read(AT91_RTC_IMR)</div><div class='ctx'> 			&amp; (AT91_RTC_ALARM|AT91_RTC_SECEV);</div><div class='ctx'> 	if (at91_rtc_imr) {</div><div class='ctx'> 		if (device_may_wakeup(dev))</div><div class='del'>-			enable_irq_wake(AT91_ID_SYS);</div><div class='add'>+			enable_irq_wake(irq);</div><div class='ctx'> 		else</div><div class='del'>-			at91_sys_write(AT91_RTC_IDR, at91_rtc_imr);</div><div class='add'>+			at91_rtc_write(AT91_RTC_IDR, at91_rtc_imr);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -338,9 +363,9 @@ static int at91_rtc_resume(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (at91_rtc_imr) {</div><div class='ctx'> 		if (device_may_wakeup(dev))</div><div class='del'>-			disable_irq_wake(AT91_ID_SYS);</div><div class='add'>+			disable_irq_wake(irq);</div><div class='ctx'> 		else</div><div class='del'>-			at91_sys_write(AT91_RTC_IER, at91_rtc_imr);</div><div class='add'>+			at91_rtc_write(AT91_RTC_IER, at91_rtc_imr);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c<br/>index 90d866272c8e..abfc1a0c07d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-bfin.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-bfin.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-bfin.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-bfin.c</a></div><div class='hunk'>@@ -456,18 +456,7 @@ static struct platform_driver bfin_rtc_driver = {</div><div class='ctx'> 	.resume		= bfin_rtc_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init bfin_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;bfin_rtc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit bfin_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;bfin_rtc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(bfin_rtc_init);</div><div class='del'>-module_exit(bfin_rtc_exit);</div><div class='add'>+module_platform_driver(bfin_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Blackfin On-Chip Real Time Clock Driver");</div><div class='ctx'> MODULE_AUTHOR("Mike Frysinger &lt;vapier@gentoo.org&gt;");</div><div class='head'>diff --git a/drivers/rtc/rtc-bq4802.c b/drivers/rtc/rtc-bq4802.c<br/>index 128270ce355d..bf612ef22941 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-bq4802.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-bq4802.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-bq4802.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-bq4802.c</a></div><div class='hunk'>@@ -218,15 +218,4 @@ static struct platform_driver bq4802_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(bq4802_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init bq4802_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;bq4802_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit bq4802_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;bq4802_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(bq4802_init);</div><div class='del'>-module_exit(bq4802_exit);</div><div class='add'>+module_platform_driver(bq4802_driver);</div><div class='head'>diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c<br/>index 05beb6c1ca79..d7782aa09943 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-cmos.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-cmos.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-cmos.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-cmos.c</a></div><div class='hunk'>@@ -164,7 +164,7 @@ static inline unsigned char cmos_read_bank2(unsigned char addr)</div><div class='ctx'> static inline void cmos_write_bank2(unsigned char val, unsigned char addr)</div><div class='ctx'> {</div><div class='ctx'> 	outb(addr, RTC_PORT(2));</div><div class='del'>-	outb(val, RTC_PORT(2));</div><div class='add'>+	outb(val, RTC_PORT(3));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='head'>diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c<br/>index 2322c43af201..d4457afcba89 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-dm355evm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-dm355evm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-dm355evm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-dm355evm.c</a></div><div class='hunk'>@@ -161,16 +161,6 @@ static struct platform_driver rtc_dm355evm_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init dm355evm_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;rtc_dm355evm_driver);</div><div class='del'>-}</div><div class='del'>-module_init(dm355evm_rtc_init);</div><div class='del'>-</div><div class='del'>-static void __exit dm355evm_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;rtc_dm355evm_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(dm355evm_rtc_exit);</div><div class='add'>+module_platform_driver(rtc_dm355evm_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/rtc/rtc-ds1286.c b/drivers/rtc/rtc-ds1286.c<br/>index 68e6caf25496..990c3ff489bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-ds1286.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-ds1286.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-ds1286.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-ds1286.c</a></div><div class='hunk'>@@ -396,21 +396,10 @@ static struct platform_driver ds1286_platform_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(ds1286_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ds1286_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ds1286_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ds1286_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ds1286_platform_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(ds1286_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Thomas Bogendoerfer &lt;tsbogend@alpha.franken.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("DS1286 RTC driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> MODULE_ALIAS("platform:rtc-ds1286");</div><div class='del'>-</div><div class='del'>-module_init(ds1286_init);</div><div class='del'>-module_exit(ds1286_exit);</div><div class='head'>diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c<br/>index 586c244a05d8..761f36bc83a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-ds1511.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-ds1511.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-ds1511.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-ds1511.c</a></div><div class='hunk'>@@ -580,20 +580,7 @@ static struct platform_driver ds1511_rtc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>- static int __init</div><div class='del'>-ds1511_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ds1511_rtc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>- static void __exit</div><div class='del'>-ds1511_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ds1511_rtc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ds1511_rtc_init);</div><div class='del'>-module_exit(ds1511_rtc_exit);</div><div class='add'>+module_platform_driver(ds1511_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Andrew Sharp &lt;andy.sharp@lsi.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Dallas DS1511 RTC driver");</div><div class='head'>diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c<br/>index 1350029044e6..6f0a1b530f2e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-ds1553.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-ds1553.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-ds1553.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-ds1553.c</a></div><div class='hunk'>@@ -361,18 +361,7 @@ static struct platform_driver ds1553_rtc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static __init int ds1553_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ds1553_rtc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __exit void ds1553_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ds1553_rtc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ds1553_init);</div><div class='del'>-module_exit(ds1553_exit);</div><div class='add'>+module_platform_driver(ds1553_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Atsushi Nemoto &lt;anemo@mba.ocn.ne.jp&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Dallas DS1553 RTC driver");</div><div class='head'>diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c<br/>index e3e0f92b60f0..76112667c507 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-ds1742.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-ds1742.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-ds1742.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-ds1742.c</a></div><div class='hunk'>@@ -240,18 +240,7 @@ static struct platform_driver ds1742_rtc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static __init int ds1742_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;ds1742_rtc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __exit void ds1742_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ds1742_rtc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ds1742_init);</div><div class='del'>-module_exit(ds1742_exit);</div><div class='add'>+module_platform_driver(ds1742_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Atsushi Nemoto &lt;anemo@mba.ocn.ne.jp&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Dallas DS1742 RTC driver");</div><div class='head'>diff --git a/drivers/rtc/rtc-jz4740.c b/drivers/rtc/rtc-jz4740.c<br/>index b6473631d182..05ab227eeff7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-jz4740.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-jz4740.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-jz4740.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-jz4740.c</a></div><div class='hunk'>@@ -345,7 +345,7 @@ static const struct dev_pm_ops jz4740_pm_ops = {</div><div class='ctx'> #define JZ4740_RTC_PM_OPS NULL</div><div class='ctx'> #endif  /* CONFIG_PM */</div><div class='ctx'> </div><div class='del'>-struct platform_driver jz4740_rtc_driver = {</div><div class='add'>+static struct platform_driver jz4740_rtc_driver = {</div><div class='ctx'> 	.probe	 = jz4740_rtc_probe,</div><div class='ctx'> 	.remove	 = __devexit_p(jz4740_rtc_remove),</div><div class='ctx'> 	.driver	 = {</div><div class='hunk'>@@ -355,17 +355,7 @@ struct platform_driver jz4740_rtc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init jz4740_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;jz4740_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(jz4740_rtc_init);</div><div class='del'>-</div><div class='del'>-static void __exit jz4740_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;jz4740_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(jz4740_rtc_exit);</div><div class='add'>+module_platform_driver(jz4740_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Lars-Peter Clausen &lt;lars@metafoo.de&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/rtc/rtc-lpc32xx.c b/drivers/rtc/rtc-lpc32xx.c<br/>index ae16250c762f..ecc1713b2b4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-lpc32xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-lpc32xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-lpc32xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-lpc32xx.c</a></div><div class='hunk'>@@ -396,17 +396,7 @@ static struct platform_driver lpc32xx_rtc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init lpc32xx_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;lpc32xx_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(lpc32xx_rtc_init);</div><div class='del'>-</div><div class='del'>-static void __exit lpc32xx_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;lpc32xx_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(lpc32xx_rtc_exit);</div><div class='add'>+module_platform_driver(lpc32xx_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Kevin Wells &lt;wellsk40@gmail.com");</div><div class='ctx'> MODULE_DESCRIPTION("RTC driver for the LPC32xx SoC");</div><div class='head'>diff --git a/drivers/rtc/rtc-m41t93.c b/drivers/rtc/rtc-m41t93.c<br/>index 7317d3b9a3d5..ef71132ff205 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-m41t93.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-m41t93.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-m41t93.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-m41t93.c</a></div><div class='hunk'>@@ -200,7 +200,6 @@ static int __devexit m41t93_remove(struct spi_device *spi)</div><div class='ctx'> static struct spi_driver m41t93_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "rtc-m41t93",</div><div class='del'>-		.bus	= &amp;spi_bus_type,</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe	= m41t93_probe,</div><div class='head'>diff --git a/drivers/rtc/rtc-m41t94.c b/drivers/rtc/rtc-m41t94.c<br/>index e259ed76ae85..2a4721f61797 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-m41t94.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-m41t94.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-m41t94.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-m41t94.c</a></div><div class='hunk'>@@ -147,7 +147,6 @@ static int __devexit m41t94_remove(struct spi_device *spi)</div><div class='ctx'> static struct spi_driver m41t94_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "rtc-m41t94",</div><div class='del'>-		.bus	= &amp;spi_bus_type,</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe	= m41t94_probe,</div><div class='head'>diff --git a/drivers/rtc/rtc-m48t35.c b/drivers/rtc/rtc-m48t35.c<br/>index 8e2a24e33ed6..f9e3b3583733 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-m48t35.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-m48t35.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-m48t35.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-m48t35.c</a></div><div class='hunk'>@@ -216,21 +216,10 @@ static struct platform_driver m48t35_platform_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(m48t35_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init m48t35_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;m48t35_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit m48t35_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;m48t35_platform_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(m48t35_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Thomas Bogendoerfer &lt;tsbogend@alpha.franken.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("M48T35 RTC driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> MODULE_ALIAS("platform:rtc-m48t35");</div><div class='del'>-</div><div class='del'>-module_init(m48t35_init);</div><div class='del'>-module_exit(m48t35_exit);</div><div class='head'>diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c<br/>index 28365388fb6c..30ebfec9fd2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-m48t59.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-m48t59.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-m48t59.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-m48t59.c</a></div><div class='hunk'>@@ -530,18 +530,7 @@ static struct platform_driver m48t59_rtc_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(m48t59_rtc_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init m48t59_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;m48t59_rtc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit m48t59_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;m48t59_rtc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(m48t59_rtc_init);</div><div class='del'>-module_exit(m48t59_rtc_exit);</div><div class='add'>+module_platform_driver(m48t59_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Mark Zhan &lt;rongkai.zhan@windriver.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("M48T59/M48T02/M48T08 RTC driver");</div><div class='head'>diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c<br/>index f981287d582b..863fb3363aa6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-m48t86.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-m48t86.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-m48t86.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-m48t86.c</a></div><div class='hunk'>@@ -185,21 +185,10 @@ static struct platform_driver m48t86_rtc_platform_driver = {</div><div class='ctx'> 	.remove		= __devexit_p(m48t86_rtc_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init m48t86_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;m48t86_rtc_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit m48t86_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;m48t86_rtc_platform_driver);</div><div class='del'>-}</div><div class='add'>+module_platform_driver(m48t86_rtc_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Alessandro Zummo &lt;a.zummo@towertech.it&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("M48T86 RTC driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> MODULE_ALIAS("platform:rtc-m48t86");</div><div class='del'>-</div><div class='del'>-module_init(m48t86_rtc_init);</div><div class='del'>-module_exit(m48t86_rtc_exit);</div><div class='head'>diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c<br/>index 0ec3f588a255..1f6b3cc58e8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-max6902.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-max6902.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-max6902.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-max6902.c</a></div><div class='hunk'>@@ -154,7 +154,6 @@ static int __devexit max6902_remove(struct spi_device *spi)</div><div class='ctx'> static struct spi_driver max6902_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "rtc-max6902",</div><div class='del'>-		.bus	= &amp;spi_bus_type,</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe	= max6902_probe,</div><div class='head'>diff --git a/drivers/rtc/rtc-max8925.c b/drivers/rtc/rtc-max8925.c<br/>index 3bc046f427e0..2d71943bc436 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-max8925.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-max8925.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-max8925.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-max8925.c</a></div><div class='hunk'>@@ -261,6 +261,8 @@ static int __devinit max8925_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* XXX - isn't this redundant? */</div><div class='ctx'> 	platform_set_drvdata(pdev, info);</div><div class='ctx'> </div><div class='add'>+	device_init_wakeup(&amp;pdev-&gt;dev, 1);</div><div class='add'>+</div><div class='ctx'> 	info-&gt;rtc_dev = rtc_device_register("max8925-rtc", &amp;pdev-&gt;dev,</div><div class='ctx'> 					&amp;max8925_rtc_ops, THIS_MODULE);</div><div class='ctx'> 	ret = PTR_ERR(info-&gt;rtc_dev);</div><div class='hunk'>@@ -290,26 +292,40 @@ static int __devexit max8925_rtc_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 max8925_rtc_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct max8925_chip *chip = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='add'>+</div><div class='add'>+	if (device_may_wakeup(dev))</div><div class='add'>+		chip-&gt;wakeup_flag |= 1 &lt;&lt; MAX8925_IRQ_RTC_ALARM0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int max8925_rtc_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct max8925_chip *chip = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='add'>+</div><div class='add'>+	if (device_may_wakeup(dev))</div><div class='add'>+		chip-&gt;wakeup_flag &amp;= ~(1 &lt;&lt; MAX8925_IRQ_RTC_ALARM0);</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(max8925_rtc_pm_ops, max8925_rtc_suspend, max8925_rtc_resume);</div><div class='add'>+</div><div class='ctx'> static struct platform_driver max8925_rtc_driver = {</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "max8925-rtc",</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='add'>+		.pm     = &amp;max8925_rtc_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= max8925_rtc_probe,</div><div class='ctx'> 	.remove		= __devexit_p(max8925_rtc_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init max8925_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;max8925_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(max8925_rtc_init);</div><div class='del'>-</div><div class='del'>-static void __exit max8925_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;max8925_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(max8925_rtc_exit);</div><div class='add'>+module_platform_driver(max8925_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Maxim MAX8925 RTC driver");</div><div class='ctx'> MODULE_AUTHOR("Haojian Zhuang &lt;haojian.zhuang@marvell.com&gt;");</div><div class='head'>diff --git a/drivers/rtc/rtc-max8998.c b/drivers/rtc/rtc-max8998.c<br/>index 2e48aa604273..7196f438c089 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-max8998.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-max8998.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-max8998.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-max8998.c</a></div><div class='hunk'>@@ -327,17 +327,7 @@ static struct platform_driver max8998_rtc_driver = {</div><div class='ctx'> 	.id_table	= max8998_rtc_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init max8998_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;max8998_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(max8998_rtc_init);</div><div class='del'>-</div><div class='del'>-static void __exit max8998_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;max8998_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(max8998_rtc_exit);</div><div class='add'>+module_platform_driver(max8998_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Minkyu Kang &lt;mk7.kang@samsung.com&gt;");</div><div class='ctx'> MODULE_AUTHOR("Joonyoung Shim &lt;jy0922.shim@samsung.com&gt;");</div><div class='head'>diff --git a/drivers/rtc/rtc-mc13xxx.c b/drivers/rtc/rtc-mc13xxx.c<br/>index 9d0c3b478d55..546f6850bffb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-mc13xxx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-mc13xxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-mc13xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-mc13xxx.c</a></div><div class='hunk'>@@ -399,7 +399,7 @@ static int __exit mc13xxx_rtc_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct platform_device_id mc13xxx_rtc_idtable[] = {</div><div class='add'>+static const struct platform_device_id mc13xxx_rtc_idtable[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "mc13783-rtc",</div><div class='ctx'> 	}, {</div><div class='head'>diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c<br/>index da60915818b6..9d3caccfc250 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-mpc5121.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-mpc5121.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-mpc5121.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-mpc5121.c</a></div><div class='hunk'>@@ -418,17 +418,7 @@ static struct platform_driver mpc5121_rtc_driver = {</div><div class='ctx'> 	.remove = __devexit_p(mpc5121_rtc_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init mpc5121_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;mpc5121_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(mpc5121_rtc_init);</div><div class='del'>-</div><div class='del'>-static void __exit mpc5121_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;mpc5121_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(mpc5121_rtc_exit);</div><div class='add'>+module_platform_driver(mpc5121_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("John Rigby &lt;jcrigby@gmail.com&gt;");</div><div class='head'>diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c<br/>index bb21f443fb70..6cd6c7235344 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-mrst.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-mrst.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-mrst.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-mrst.c</a></div><div class='hunk'>@@ -537,18 +537,7 @@ static struct platform_driver vrtc_mrst_platform_driver = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init vrtc_mrst_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;vrtc_mrst_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit vrtc_mrst_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;vrtc_mrst_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(vrtc_mrst_init);</div><div class='del'>-module_exit(vrtc_mrst_exit);</div><div class='add'>+module_platform_driver(vrtc_mrst_platform_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jacob Pan; Feng Tang");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for Moorestown virtual RTC");</div><div class='head'>diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c<br/>index 39e41fbdf08b..5e1d64ee5228 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-mxc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-mxc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-mxc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-mxc.c</a></div><div class='hunk'>@@ -155,7 +155,6 @@ static int rtc_update_alarm(struct device *dev, struct rtc_time *alrm)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtc_time alarm_tm, now_tm;</div><div class='ctx'> 	unsigned long now, time;</div><div class='del'>-	int ret;</div><div class='ctx'> 	struct platform_device *pdev = to_platform_device(dev);</div><div class='ctx'> 	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='ctx'> 	void __iomem *ioaddr = pdata-&gt;ioaddr;</div><div class='hunk'>@@ -168,21 +167,33 @@ static int rtc_update_alarm(struct device *dev, struct rtc_time *alrm)</div><div class='ctx'> 	alarm_tm.tm_hour = alrm-&gt;tm_hour;</div><div class='ctx'> 	alarm_tm.tm_min = alrm-&gt;tm_min;</div><div class='ctx'> 	alarm_tm.tm_sec = alrm-&gt;tm_sec;</div><div class='del'>-	rtc_tm_to_time(&amp;now_tm, &amp;now);</div><div class='ctx'> 	rtc_tm_to_time(&amp;alarm_tm, &amp;time);</div><div class='ctx'> </div><div class='del'>-	if (time &lt; now) {</div><div class='del'>-		time += 60 * 60 * 24;</div><div class='del'>-		rtc_time_to_tm(time, &amp;alarm_tm);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = rtc_tm_to_time(&amp;alarm_tm, &amp;time);</div><div class='del'>-</div><div class='ctx'> 	/* clear all the interrupt status bits */</div><div class='ctx'> 	writew(readw(ioaddr + RTC_RTCISR), ioaddr + RTC_RTCISR);</div><div class='ctx'> 	set_alarm_or_time(dev, MXC_RTC_ALARM, time);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mxc_rtc_irq_enable(struct device *dev, unsigned int bit,</div><div class='add'>+				unsigned int enabled)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='add'>+	void __iomem *ioaddr = pdata-&gt;ioaddr;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;pdata-&gt;rtc-&gt;irq_lock);</div><div class='add'>+	reg = readw(ioaddr + RTC_RTCIENR);</div><div class='add'>+</div><div class='add'>+	if (enabled)</div><div class='add'>+		reg |= bit;</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~bit;</div><div class='add'>+</div><div class='add'>+	writew(reg, ioaddr + RTC_RTCIENR);</div><div class='add'>+	spin_unlock_irq(&amp;pdata-&gt;rtc-&gt;irq_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This function is the RTC interrupt service routine. */</div><div class='hunk'>@@ -199,13 +210,12 @@ static irqreturn_t mxc_rtc_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	/* clear interrupt sources */</div><div class='ctx'> 	writew(status, ioaddr + RTC_RTCISR);</div><div class='ctx'> </div><div class='del'>-	/* clear alarm interrupt if it has occurred */</div><div class='del'>-	if (status &amp; RTC_ALM_BIT)</div><div class='del'>-		status &amp;= ~RTC_ALM_BIT;</div><div class='del'>-</div><div class='ctx'> 	/* update irq data &amp; counter */</div><div class='del'>-	if (status &amp; RTC_ALM_BIT)</div><div class='add'>+	if (status &amp; RTC_ALM_BIT) {</div><div class='ctx'> 		events |= (RTC_AF | RTC_IRQF);</div><div class='add'>+		/* RTC alarm should be one-shot */</div><div class='add'>+		mxc_rtc_irq_enable(&amp;pdev-&gt;dev, RTC_ALM_BIT, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; RTC_1HZ_BIT)</div><div class='ctx'> 		events |= (RTC_UF | RTC_IRQF);</div><div class='hunk'>@@ -213,9 +223,6 @@ static irqreturn_t mxc_rtc_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	if (status &amp; PIT_ALL_ON)</div><div class='ctx'> 		events |= (RTC_PF | RTC_IRQF);</div><div class='ctx'> </div><div class='del'>-	if ((status &amp; RTC_ALM_BIT) &amp;&amp; rtc_valid_tm(&amp;pdata-&gt;g_rtc_alarm))</div><div class='del'>-		rtc_update_alarm(&amp;pdev-&gt;dev, &amp;pdata-&gt;g_rtc_alarm);</div><div class='del'>-</div><div class='ctx'> 	rtc_update_irq(pdata-&gt;rtc, 1, events);</div><div class='ctx'> 	spin_unlock_irq(&amp;pdata-&gt;rtc-&gt;irq_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -242,26 +249,6 @@ static void mxc_rtc_release(struct device *dev)</div><div class='ctx'> 	spin_unlock_irq(&amp;pdata-&gt;rtc-&gt;irq_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mxc_rtc_irq_enable(struct device *dev, unsigned int bit,</div><div class='del'>-				unsigned int enabled)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='del'>-	void __iomem *ioaddr = pdata-&gt;ioaddr;</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;pdata-&gt;rtc-&gt;irq_lock);</div><div class='del'>-	reg = readw(ioaddr + RTC_RTCIENR);</div><div class='del'>-</div><div class='del'>-	if (enabled)</div><div class='del'>-		reg |= bit;</div><div class='del'>-	else</div><div class='del'>-		reg &amp;= ~bit;</div><div class='del'>-</div><div class='del'>-	writew(reg, ioaddr + RTC_RTCIENR);</div><div class='del'>-	spin_unlock_irq(&amp;pdata-&gt;rtc-&gt;irq_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int mxc_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)</div><div class='ctx'> {</div><div class='ctx'> 	mxc_rtc_irq_enable(dev, RTC_ALM_BIT, enabled);</div><div class='hunk'>@@ -290,6 +277,17 @@ static int mxc_rtc_read_time(struct device *dev, struct rtc_time *tm)</div><div class='ctx'>  */</div><div class='ctx'> static int mxc_rtc_set_mmss(struct device *dev, unsigned long time)</div><div class='ctx'> {</div><div class='add'>+	/*</div><div class='add'>+	 * TTC_DAYR register is 9-bit in MX1 SoC, save time and day of year only</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_is_mx1()) {</div><div class='add'>+		struct rtc_time tm;</div><div class='add'>+</div><div class='add'>+		rtc_time_to_tm(time, &amp;tm);</div><div class='add'>+		tm.tm_year = 70;</div><div class='add'>+		rtc_tm_to_time(&amp;tm, &amp;time);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Avoid roll-over from reading the different registers */</div><div class='ctx'> 	do {</div><div class='ctx'> 		set_alarm_or_time(dev, MXC_RTC_TIME, time);</div><div class='hunk'>@@ -324,21 +322,7 @@ static int mxc_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)</div><div class='ctx'> 	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (rtc_valid_tm(&amp;alrm-&gt;time)) {</div><div class='del'>-		if (alrm-&gt;time.tm_sec &gt; 59 ||</div><div class='del'>-		    alrm-&gt;time.tm_hour &gt; 23 ||</div><div class='del'>-		    alrm-&gt;time.tm_min &gt; 59)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		ret = rtc_update_alarm(dev, &amp;alrm-&gt;time);</div><div class='del'>-	} else {</div><div class='del'>-		ret = rtc_valid_tm(&amp;alrm-&gt;time);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		ret = rtc_update_alarm(dev, &amp;alrm-&gt;time);</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	ret = rtc_update_alarm(dev, &amp;alrm-&gt;time);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -424,6 +408,9 @@ static int __init mxc_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> 		pdata-&gt;irq = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (pdata-&gt;irq &gt;=0)</div><div class='add'>+		device_init_wakeup(&amp;pdev-&gt;dev, 1);</div><div class='add'>+</div><div class='ctx'> 	rtc = rtc_device_register(pdev-&gt;name, &amp;pdev-&gt;dev, &amp;mxc_rtc_ops,</div><div class='ctx'> 				  THIS_MODULE);</div><div class='ctx'> 	if (IS_ERR(rtc)) {</div><div class='hunk'>@@ -459,9 +446,39 @@ static int __exit mxc_rtc_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</div><div class='add'>+static int mxc_rtc_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct rtc_plat_data *pdata = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (device_may_wakeup(dev))</div><div class='add'>+		enable_irq_wake(pdata-&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 mxc_rtc_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct rtc_plat_data *pdata = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (device_may_wakeup(dev))</div><div class='add'>+		disable_irq_wake(pdata-&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 struct dev_pm_ops mxc_rtc_pm_ops = {</div><div class='add'>+	.suspend	= mxc_rtc_suspend,</div><div class='add'>+	.resume		= mxc_rtc_resume,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct platform_driver mxc_rtc_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		   .name	= "mxc_rtc",</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+		   .pm		= &amp;mxc_rtc_pm_ops,</div><div class='add'>+#endif</div><div class='ctx'> 		   .owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> 	.remove		= __exit_p(mxc_rtc_remove),</div><div class='head'>diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c<br/>index 2ee3bbf7e5ea..b46c4004d8fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-pcf2123.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-pcf2123.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-pcf2123.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-pcf2123.c</a></div><div class='hunk'>@@ -340,7 +340,6 @@ static int __devexit pcf2123_remove(struct spi_device *spi)</div><div class='ctx'> static struct spi_driver pcf2123_driver = {</div><div class='ctx'> 	.driver	= {</div><div class='ctx'> 			.name	= "rtc-pcf2123",</div><div class='del'>-			.bus	= &amp;spi_bus_type,</div><div class='ctx'> 			.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe	= pcf2123_probe,</div><div class='head'>diff --git a/drivers/rtc/rtc-pcf50633.c b/drivers/rtc/rtc-pcf50633.c<br/>index 0c423892923c..a20202f9ee57 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-pcf50633.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-pcf50633.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-pcf50633.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-pcf50633.c</a></div><div class='hunk'>@@ -294,17 +294,7 @@ static struct platform_driver pcf50633_rtc_driver = {</div><div class='ctx'> 	.remove = __devexit_p(pcf50633_rtc_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pcf50633_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pcf50633_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pcf50633_rtc_init);</div><div class='del'>-</div><div class='del'>-static void __exit pcf50633_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pcf50633_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(pcf50633_rtc_exit);</div><div class='add'>+module_platform_driver(pcf50633_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("PCF50633 RTC driver");</div><div class='ctx'> MODULE_AUTHOR("Balaji Rao &lt;balajirrao@openmoko.org&gt;");</div><div class='head'>diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c<br/>index 1d28d4451dae..02111fee077e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-pl030.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-pl030.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-pl030.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-pl030.c</a></div><div class='hunk'>@@ -174,6 +174,8 @@ static struct amba_id pl030_ids[] = {</div><div class='ctx'> 	{ 0, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+MODULE_DEVICE_TABLE(amba, pl030_ids);</div><div class='add'>+</div><div class='ctx'> static struct amba_driver pl030_driver = {</div><div class='ctx'> 	.drv		= {</div><div class='ctx'> 		.name	= "rtc-pl030",</div><div class='head'>diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c<br/>index ff1b84bd9bb5..a952c8de1dd7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-pl031.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-pl031.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-pl031.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-pl031.c</a></div><div class='hunk'>@@ -420,6 +420,8 @@ static struct amba_id pl031_ids[] = {</div><div class='ctx'> 	{0, 0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+MODULE_DEVICE_TABLE(amba, pl031_ids);</div><div class='add'>+</div><div class='ctx'> static struct amba_driver pl031_driver = {</div><div class='ctx'> 	.drv = {</div><div class='ctx'> 		.name = "rtc-pl031",</div><div class='head'>diff --git a/drivers/rtc/rtc-pm8xxx.c b/drivers/rtc/rtc-pm8xxx.c<br/>index d420e9d877e8..9f1d6bcbdf6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-pm8xxx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-pm8xxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-pm8xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-pm8xxx.c</a></div><div class='hunk'>@@ -532,17 +532,7 @@ static struct platform_driver pm8xxx_rtc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pm8xxx_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pm8xxx_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(pm8xxx_rtc_init);</div><div class='del'>-</div><div class='del'>-static void __exit pm8xxx_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pm8xxx_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(pm8xxx_rtc_exit);</div><div class='add'>+module_platform_driver(pm8xxx_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_ALIAS("platform:rtc-pm8xxx");</div><div class='ctx'> MODULE_DESCRIPTION("PMIC8xxx RTC driver");</div><div class='head'>diff --git a/drivers/rtc/rtc-puv3.c b/drivers/rtc/rtc-puv3.c<br/>index e4b6880aabd0..ab0acaeb2371 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-puv3.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-puv3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-puv3.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-puv3.c</a></div><div class='hunk'>@@ -164,7 +164,7 @@ static int puv3_rtc_open(struct device *dev)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = request_irq(puv3_rtc_alarmno, puv3_rtc_alarmirq,</div><div class='del'>-			  IRQF_DISABLED,  "pkunity-rtc alarm", rtc_dev);</div><div class='add'>+			0, "pkunity-rtc alarm", rtc_dev);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "IRQ%d error %d\n", puv3_rtc_alarmno, ret);</div><div class='hunk'>@@ -172,7 +172,7 @@ static int puv3_rtc_open(struct device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = request_irq(puv3_rtc_tickno, puv3_rtc_tickirq,</div><div class='del'>-			  IRQF_DISABLED,  "pkunity-rtc tick", rtc_dev);</div><div class='add'>+			0, "pkunity-rtc tick", rtc_dev);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "IRQ%d error %d\n", puv3_rtc_tickno, ret);</div><div class='hunk'>@@ -326,7 +326,7 @@ static int puv3_rtc_resume(struct platform_device *pdev)</div><div class='ctx'> #define puv3_rtc_resume  NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct platform_driver puv3_rtcdrv = {</div><div class='add'>+static struct platform_driver puv3_rtc_driver = {</div><div class='ctx'> 	.probe		= puv3_rtc_probe,</div><div class='ctx'> 	.remove		= __devexit_p(puv3_rtc_remove),</div><div class='ctx'> 	.suspend	= puv3_rtc_suspend,</div><div class='hunk'>@@ -337,21 +337,7 @@ static struct platform_driver puv3_rtcdrv = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char __initdata banner[] = "PKUnity-v3 RTC, (c) 2009 PKUnity Co.\n";</div><div class='del'>-</div><div class='del'>-static int __init puv3_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	printk(banner);</div><div class='del'>-	return platform_driver_register(&amp;puv3_rtcdrv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit puv3_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;puv3_rtcdrv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(puv3_rtc_init);</div><div class='del'>-module_exit(puv3_rtc_exit);</div><div class='add'>+module_platform_driver(puv3_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("RTC Driver for the PKUnity v3 chip");</div><div class='ctx'> MODULE_AUTHOR("Hu Dongliang");</div><div class='head'>diff --git a/drivers/rtc/rtc-rs5c348.c b/drivers/rtc/rtc-rs5c348.c<br/>index 971bc8e08da6..ce2ca8523ddd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-rs5c348.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-rs5c348.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-rs5c348.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-rs5c348.c</a></div><div class='hunk'>@@ -229,7 +229,6 @@ static int __devexit rs5c348_remove(struct spi_device *spi)</div><div class='ctx'> static struct spi_driver rs5c348_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "rtc-rs5c348",</div><div class='del'>-		.bus	= &amp;spi_bus_type,</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe	= rs5c348_probe,</div><div class='head'>diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c<br/>index 5b979d9cc332..aef40bd2957b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-s3c.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-s3c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-s3c.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-s3c.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/log2.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='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -507,7 +508,13 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err_nortc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	s3c_rtc_cpu_type = platform_get_device_id(pdev)-&gt;driver_data;</div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+	if (pdev-&gt;dev.of_node)</div><div class='add'>+		s3c_rtc_cpu_type = of_device_is_compatible(pdev-&gt;dev.of_node,</div><div class='add'>+			"samsung,s3c6410-rtc") ? TYPE_S3C64XX : TYPE_S3C2410;</div><div class='add'>+	else</div><div class='add'>+#endif</div><div class='add'>+		s3c_rtc_cpu_type = platform_get_device_id(pdev)-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	/* Check RTC Time */</div><div class='ctx'> </div><div class='hunk'>@@ -629,6 +636,17 @@ static int s3c_rtc_resume(struct platform_device *pdev)</div><div class='ctx'> #define s3c_rtc_resume  NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+static const struct of_device_id s3c_rtc_dt_match[] = {</div><div class='add'>+	{ .compatible = "samsung,s3c2410-rtc" },</div><div class='add'>+	{ .compatible = "samsung,s3c6410-rtc" },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, s3c_rtc_dt_match);</div><div class='add'>+#else</div><div class='add'>+#define s3c_rtc_dt_match NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct platform_device_id s3c_rtc_driver_ids[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name		= "s3c2410-rtc",</div><div class='hunk'>@@ -651,24 +669,11 @@ static struct platform_driver s3c_rtc_driver = {</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "s3c-rtc",</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='add'>+		.of_match_table	= s3c_rtc_dt_match,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char __initdata banner[] = "S3C24XX RTC, (c) 2004,2006 Simtec Electronics\n";</div><div class='del'>-</div><div class='del'>-static int __init s3c_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	printk(banner);</div><div class='del'>-	return platform_driver_register(&amp;s3c_rtc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit s3c_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;s3c_rtc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(s3c_rtc_init);</div><div class='del'>-module_exit(s3c_rtc_exit);</div><div class='add'>+module_platform_driver(s3c_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Samsung S3C RTC Driver");</div><div class='ctx'> MODULE_AUTHOR("Ben Dooks &lt;ben@simtec.co.uk&gt;");</div><div class='head'>diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c<br/>index 0b40bb88a884..4595d3e645a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-sa1100.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-sa1100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-sa1100.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-sa1100.c</a></div><div class='hunk'>@@ -27,35 +27,42 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/slab.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='ctx'> </div><div class='ctx'> #include &lt;mach/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARCH_PXA</div><div class='del'>-#include &lt;mach/regs-rtc.h&gt;</div><div class='del'>-#include &lt;mach/regs-ost.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #define RTC_DEF_DIVIDER		(32768 - 1)</div><div class='ctx'> #define RTC_DEF_TRIM		0</div><div class='del'>-</div><div class='del'>-static const unsigned long RTC_FREQ = 1024;</div><div class='del'>-static struct rtc_time rtc_alarm;</div><div class='del'>-static DEFINE_SPINLOCK(sa1100_rtc_lock);</div><div class='del'>-</div><div class='del'>-static inline int rtc_periodic_alarm(struct rtc_time *tm)</div><div class='del'>-{</div><div class='del'>-	return  (tm-&gt;tm_year == -1) ||</div><div class='del'>-		((unsigned)tm-&gt;tm_mon &gt;= 12) ||</div><div class='del'>-		((unsigned)(tm-&gt;tm_mday - 1) &gt;= 31) ||</div><div class='del'>-		((unsigned)tm-&gt;tm_hour &gt; 23) ||</div><div class='del'>-		((unsigned)tm-&gt;tm_min &gt; 59) ||</div><div class='del'>-		((unsigned)tm-&gt;tm_sec &gt; 59);</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+#define RTC_FREQ		1024</div><div class='add'>+</div><div class='add'>+#define RCNR		0x00	/* RTC Count Register */</div><div class='add'>+#define RTAR		0x04	/* RTC Alarm Register */</div><div class='add'>+#define RTSR		0x08	/* RTC Status Register */</div><div class='add'>+#define RTTR		0x0c	/* RTC Timer Trim Register */</div><div class='add'>+</div><div class='add'>+#define RTSR_HZE	(1 &lt;&lt; 3)	/* HZ interrupt enable */</div><div class='add'>+#define RTSR_ALE	(1 &lt;&lt; 2)	/* RTC alarm interrupt enable */</div><div class='add'>+#define RTSR_HZ		(1 &lt;&lt; 1)	/* HZ rising-edge detected */</div><div class='add'>+#define RTSR_AL		(1 &lt;&lt; 0)	/* RTC alarm detected */</div><div class='add'>+</div><div class='add'>+#define rtc_readl(sa1100_rtc, reg)	\</div><div class='add'>+	readl_relaxed((sa1100_rtc)-&gt;base + (reg))</div><div class='add'>+#define rtc_writel(sa1100_rtc, reg, value)	\</div><div class='add'>+	writel_relaxed((value), (sa1100_rtc)-&gt;base + (reg))</div><div class='add'>+</div><div class='add'>+struct sa1100_rtc {</div><div class='add'>+	struct resource		*ress;</div><div class='add'>+	void __iomem		*base;</div><div class='add'>+	struct clk		*clk;</div><div class='add'>+	int			irq_1Hz;</div><div class='add'>+	int			irq_Alrm;</div><div class='add'>+	struct rtc_device	*rtc;</div><div class='add'>+	spinlock_t		lock;		/* Protects this structure */</div><div class='add'>+};</div><div class='ctx'> /*</div><div class='ctx'>  * Calculate the next alarm time given the requested alarm time mask</div><div class='ctx'>  * and the current time.</div><div class='hunk'>@@ -83,46 +90,26 @@ static void rtc_next_alarm_time(struct rtc_time *next, struct rtc_time *now,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rtc_update_alarm(struct rtc_time *alrm)</div><div class='del'>-{</div><div class='del'>-	struct rtc_time alarm_tm, now_tm;</div><div class='del'>-	unsigned long now, time;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		now = RCNR;</div><div class='del'>-		rtc_time_to_tm(now, &amp;now_tm);</div><div class='del'>-		rtc_next_alarm_time(&amp;alarm_tm, &amp;now_tm, alrm);</div><div class='del'>-		ret = rtc_tm_to_time(&amp;alarm_tm, &amp;time);</div><div class='del'>-		if (ret != 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		RTSR = RTSR &amp; (RTSR_HZE|RTSR_ALE|RTSR_AL);</div><div class='del'>-		RTAR = time;</div><div class='del'>-	} while (now != RCNR);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *pdev = to_platform_device(dev_id);</div><div class='del'>-	struct rtc_device *rtc = platform_get_drvdata(pdev);</div><div class='add'>+	struct sa1100_rtc *sa1100_rtc = platform_get_drvdata(pdev);</div><div class='ctx'> 	unsigned int rtsr;</div><div class='ctx'> 	unsigned long events = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;sa1100_rtc_lock);</div><div class='add'>+	spin_lock(&amp;sa1100_rtc-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	rtsr = RTSR;</div><div class='ctx'> 	/* clear interrupt sources */</div><div class='del'>-	RTSR = 0;</div><div class='add'>+	rtsr = rtc_readl(sa1100_rtc, RTSR);</div><div class='add'>+	rtc_writel(sa1100_rtc, RTSR, 0);</div><div class='add'>+</div><div class='ctx'> 	/* Fix for a nasty initialization problem the in SA11xx RTSR register.</div><div class='ctx'> 	 * See also the comments in sa1100_rtc_probe(). */</div><div class='ctx'> 	if (rtsr &amp; (RTSR_ALE | RTSR_HZE)) {</div><div class='ctx'> 		/* This is the original code, before there was the if test</div><div class='ctx'> 		 * above. This code does not clear interrupts that were not</div><div class='ctx'> 		 * enabled. */</div><div class='del'>-		RTSR = (RTSR_AL | RTSR_HZ) &amp; (rtsr &gt;&gt; 2);</div><div class='add'>+		rtc_writel(sa1100_rtc, RTSR, (RTSR_AL | RTSR_HZ) &amp; (rtsr &gt;&gt; 2));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* For some reason, it is possible to enter this routine</div><div class='ctx'> 		 * without interruptions enabled, it has been tested with</div><div class='hunk'>@@ -131,13 +118,13 @@ static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		 * This situation leads to an infinite "loop" of interrupt</div><div class='ctx'> 		 * routine calling and as a result the processor seems to</div><div class='ctx'> 		 * lock on its first call to open(). */</div><div class='del'>-		RTSR = RTSR_AL | RTSR_HZ;</div><div class='add'>+		rtc_writel(sa1100_rtc, RTSR, (RTSR_AL | RTSR_HZ));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* clear alarm interrupt if it has occurred */</div><div class='ctx'> 	if (rtsr &amp; RTSR_AL)</div><div class='ctx'> 		rtsr &amp;= ~RTSR_ALE;</div><div class='del'>-	RTSR = rtsr &amp; (RTSR_ALE | RTSR_HZE);</div><div class='add'>+	rtc_writel(sa1100_rtc, RTSR, rtsr &amp; (RTSR_ALE | RTSR_HZE));</div><div class='ctx'> </div><div class='ctx'> 	/* update irq data &amp; counter */</div><div class='ctx'> 	if (rtsr &amp; RTSR_AL)</div><div class='hunk'>@@ -145,91 +132,100 @@ static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	if (rtsr &amp; RTSR_HZ)</div><div class='ctx'> 		events |= RTC_UF | RTC_IRQF;</div><div class='ctx'> </div><div class='del'>-	rtc_update_irq(rtc, 1, events);</div><div class='add'>+	rtc_update_irq(sa1100_rtc-&gt;rtc, 1, events);</div><div class='ctx'> </div><div class='del'>-	if (rtsr &amp; RTSR_AL &amp;&amp; rtc_periodic_alarm(&amp;rtc_alarm))</div><div class='del'>-		rtc_update_alarm(&amp;rtc_alarm);</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;sa1100_rtc_lock);</div><div class='add'>+	spin_unlock(&amp;sa1100_rtc-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sa1100_rtc_open(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct platform_device *plat_dev = to_platform_device(dev);</div><div class='del'>-	struct rtc_device *rtc = platform_get_drvdata(plat_dev);</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, IRQF_DISABLED,</div><div class='del'>-		"rtc 1Hz", dev);</div><div class='add'>+	ret = request_irq(sa1100_rtc-&gt;irq_1Hz, sa1100_rtc_interrupt,</div><div class='add'>+				IRQF_DISABLED, "rtc 1Hz", dev);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz);</div><div class='add'>+		dev_err(dev, "IRQ %d already in use.\n", sa1100_rtc-&gt;irq_1Hz);</div><div class='ctx'> 		goto fail_ui;</div><div class='ctx'> 	}</div><div class='del'>-	ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, IRQF_DISABLED,</div><div class='del'>-		"rtc Alrm", dev);</div><div class='add'>+	ret = request_irq(sa1100_rtc-&gt;irq_Alrm, sa1100_rtc_interrupt,</div><div class='add'>+				IRQF_DISABLED, "rtc Alrm", dev);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm);</div><div class='add'>+		dev_err(dev, "IRQ %d already in use.\n", sa1100_rtc-&gt;irq_Alrm);</div><div class='ctx'> 		goto fail_ai;</div><div class='ctx'> 	}</div><div class='del'>-	rtc-&gt;max_user_freq = RTC_FREQ;</div><div class='del'>-	rtc_irq_set_freq(rtc, NULL, RTC_FREQ);</div><div class='add'>+	sa1100_rtc-&gt;rtc-&gt;max_user_freq = RTC_FREQ;</div><div class='add'>+	rtc_irq_set_freq(sa1100_rtc-&gt;rtc, NULL, RTC_FREQ);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  fail_ai:</div><div class='del'>-	free_irq(IRQ_RTC1Hz, dev);</div><div class='add'>+	free_irq(sa1100_rtc-&gt;irq_1Hz, dev);</div><div class='ctx'>  fail_ui:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sa1100_rtc_release(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	spin_lock_irq(&amp;sa1100_rtc_lock);</div><div class='del'>-	RTSR = 0;</div><div class='del'>-	OIER &amp;= ~OIER_E1;</div><div class='del'>-	OSSR = OSSR_M1;</div><div class='del'>-	spin_unlock_irq(&amp;sa1100_rtc_lock);</div><div class='del'>-</div><div class='del'>-	free_irq(IRQ_RTCAlrm, dev);</div><div class='del'>-	free_irq(IRQ_RTC1Hz, dev);</div><div class='add'>+	struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;sa1100_rtc-&gt;lock);</div><div class='add'>+	rtc_writel(sa1100_rtc, RTSR, 0);</div><div class='add'>+	spin_unlock_irq(&amp;sa1100_rtc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	free_irq(sa1100_rtc-&gt;irq_Alrm, dev);</div><div class='add'>+	free_irq(sa1100_rtc-&gt;irq_1Hz, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sa1100_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)</div><div class='ctx'> {</div><div class='del'>-	spin_lock_irq(&amp;sa1100_rtc_lock);</div><div class='add'>+	struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);</div><div class='add'>+	unsigned int rtsr;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;sa1100_rtc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	rtsr = rtc_readl(sa1100_rtc, RTSR);</div><div class='ctx'> 	if (enabled)</div><div class='del'>-		RTSR |= RTSR_ALE;</div><div class='add'>+		rtsr |= RTSR_ALE;</div><div class='ctx'> 	else</div><div class='del'>-		RTSR &amp;= ~RTSR_ALE;</div><div class='del'>-	spin_unlock_irq(&amp;sa1100_rtc_lock);</div><div class='add'>+		rtsr &amp;= ~RTSR_ALE;</div><div class='add'>+	rtc_writel(sa1100_rtc, RTSR, rtsr);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;sa1100_rtc-&gt;lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sa1100_rtc_read_time(struct device *dev, struct rtc_time *tm)</div><div class='ctx'> {</div><div class='del'>-	rtc_time_to_tm(RCNR, tm);</div><div class='add'>+	struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	rtc_time_to_tm(rtc_readl(sa1100_rtc, RCNR), tm);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sa1100_rtc_set_time(struct device *dev, struct rtc_time *tm)</div><div class='ctx'> {</div><div class='add'>+	struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);</div><div class='ctx'> 	unsigned long time;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = rtc_tm_to_time(tm, &amp;time);</div><div class='ctx'> 	if (ret == 0)</div><div class='del'>-		RCNR = time;</div><div class='add'>+		rtc_writel(sa1100_rtc, RCNR, time);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sa1100_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)</div><div class='ctx'> {</div><div class='del'>-	u32	rtsr;</div><div class='add'>+	struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);</div><div class='add'>+	unsigned long time;</div><div class='add'>+	unsigned int rtsr;</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;alrm-&gt;time, &amp;rtc_alarm, sizeof(struct rtc_time));</div><div class='del'>-	rtsr = RTSR;</div><div class='add'>+	time = rtc_readl(sa1100_rtc, RCNR);</div><div class='add'>+	rtc_time_to_tm(time, &amp;alrm-&gt;time);</div><div class='add'>+	rtsr = rtc_readl(sa1100_rtc, RTSR);</div><div class='ctx'> 	alrm-&gt;enabled = (rtsr &amp; RTSR_ALE) ? 1 : 0;</div><div class='ctx'> 	alrm-&gt;pending = (rtsr &amp; RTSR_AL) ? 1 : 0;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -237,26 +233,39 @@ static int sa1100_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)</div><div class='ctx'> </div><div class='ctx'> static int sa1100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);</div><div class='add'>+	struct rtc_time now_tm, alarm_tm;</div><div class='add'>+	unsigned long time, alarm;</div><div class='add'>+	unsigned int rtsr;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;sa1100_rtc_lock);</div><div class='del'>-	ret = rtc_update_alarm(&amp;alrm-&gt;time);</div><div class='del'>-	if (ret == 0) {</div><div class='del'>-		if (alrm-&gt;enabled)</div><div class='del'>-			RTSR |= RTSR_ALE;</div><div class='del'>-		else</div><div class='del'>-			RTSR &amp;= ~RTSR_ALE;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irq(&amp;sa1100_rtc_lock);</div><div class='add'>+	spin_lock_irq(&amp;sa1100_rtc-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	time = rtc_readl(sa1100_rtc, RCNR);</div><div class='add'>+	rtc_time_to_tm(time, &amp;now_tm);</div><div class='add'>+	rtc_next_alarm_time(&amp;alarm_tm, &amp;now_tm, &amp;alrm-&gt;time);</div><div class='add'>+	rtc_tm_to_time(&amp;alarm_tm, &amp;alarm);</div><div class='add'>+	rtc_writel(sa1100_rtc, RTAR, alarm);</div><div class='add'>+</div><div class='add'>+	rtsr = rtc_readl(sa1100_rtc, RTSR);</div><div class='add'>+	if (alrm-&gt;enabled)</div><div class='add'>+		rtsr |= RTSR_ALE;</div><div class='add'>+	else</div><div class='add'>+		rtsr &amp;= ~RTSR_ALE;</div><div class='add'>+	rtc_writel(sa1100_rtc, RTSR, rtsr);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;sa1100_rtc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sa1100_rtc_proc(struct device *dev, struct seq_file *seq)</div><div class='ctx'> {</div><div class='del'>-	seq_printf(seq, "trim/divider\t\t: 0x%08x\n", (u32) RTTR);</div><div class='del'>-	seq_printf(seq, "RTSR\t\t\t: 0x%08x\n", (u32)RTSR);</div><div class='add'>+	struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='add'>+	seq_printf(seq, "trim/divider\t\t: 0x%08x\n",</div><div class='add'>+			rtc_readl(sa1100_rtc, RTTR));</div><div class='add'>+	seq_printf(seq, "RTSR\t\t\t: 0x%08x\n",</div><div class='add'>+			rtc_readl(sa1100_rtc, RTSR));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -273,7 +282,51 @@ static const struct rtc_class_ops sa1100_rtc_ops = {</div><div class='ctx'> </div><div class='ctx'> static int sa1100_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct rtc_device *rtc;</div><div class='add'>+	struct sa1100_rtc *sa1100_rtc;</div><div class='add'>+	unsigned int rttr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	sa1100_rtc = kzalloc(sizeof(struct sa1100_rtc), GFP_KERNEL);</div><div class='add'>+	if (!sa1100_rtc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;sa1100_rtc-&gt;lock);</div><div class='add'>+	platform_set_drvdata(pdev, sa1100_rtc);</div><div class='add'>+</div><div class='add'>+	ret = -ENXIO;</div><div class='add'>+	sa1100_rtc-&gt;ress = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!sa1100_rtc-&gt;ress) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "No I/O memory resource defined\n");</div><div class='add'>+		goto err_ress;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sa1100_rtc-&gt;irq_1Hz = platform_get_irq(pdev, 0);</div><div class='add'>+	if (sa1100_rtc-&gt;irq_1Hz &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "No 1Hz IRQ resource defined\n");</div><div class='add'>+		goto err_ress;</div><div class='add'>+	}</div><div class='add'>+	sa1100_rtc-&gt;irq_Alrm = platform_get_irq(pdev, 1);</div><div class='add'>+	if (sa1100_rtc-&gt;irq_Alrm &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "No alarm IRQ resource defined\n");</div><div class='add'>+		goto err_ress;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+	sa1100_rtc-&gt;base = ioremap(sa1100_rtc-&gt;ress-&gt;start,</div><div class='add'>+				resource_size(sa1100_rtc-&gt;ress));</div><div class='add'>+	if (!sa1100_rtc-&gt;base) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Unable to map pxa RTC I/O memory\n");</div><div class='add'>+		goto err_map;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sa1100_rtc-&gt;clk = clk_get(&amp;pdev-&gt;dev, NULL);</div><div class='add'>+	if (IS_ERR(sa1100_rtc-&gt;clk)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to find rtc clock source\n");</div><div class='add'>+		ret = PTR_ERR(sa1100_rtc-&gt;clk);</div><div class='add'>+		goto err_clk;</div><div class='add'>+	}</div><div class='add'>+	clk_prepare(sa1100_rtc-&gt;clk);</div><div class='add'>+	clk_enable(sa1100_rtc-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * According to the manual we should be able to let RTTR be zero</div><div class='hunk'>@@ -282,24 +335,24 @@ static int sa1100_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> 	 * If the clock divider is uninitialized then reset it to the</div><div class='ctx'> 	 * default value to get the 1Hz clock.</div><div class='ctx'> 	 */</div><div class='del'>-	if (RTTR == 0) {</div><div class='del'>-		RTTR = RTC_DEF_DIVIDER + (RTC_DEF_TRIM &lt;&lt; 16);</div><div class='del'>-		dev_warn(&amp;pdev-&gt;dev, "warning: "</div><div class='del'>-			"initializing default clock divider/trim value\n");</div><div class='add'>+	if (rtc_readl(sa1100_rtc, RTTR) == 0) {</div><div class='add'>+		rttr = RTC_DEF_DIVIDER + (RTC_DEF_TRIM &lt;&lt; 16);</div><div class='add'>+		rtc_writel(sa1100_rtc, RTTR, rttr);</div><div class='add'>+		dev_warn(&amp;pdev-&gt;dev, "warning: initializing default clock"</div><div class='add'>+			 " divider/trim value\n");</div><div class='ctx'> 		/* The current RTC value probably doesn't make sense either */</div><div class='del'>-		RCNR = 0;</div><div class='add'>+		rtc_writel(sa1100_rtc, RCNR, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	device_init_wakeup(&amp;pdev-&gt;dev, 1);</div><div class='ctx'> </div><div class='del'>-	rtc = rtc_device_register(pdev-&gt;name, &amp;pdev-&gt;dev, &amp;sa1100_rtc_ops,</div><div class='del'>-		THIS_MODULE);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(rtc))</div><div class='del'>-		return PTR_ERR(rtc);</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, rtc);</div><div class='del'>-</div><div class='add'>+	sa1100_rtc-&gt;rtc = rtc_device_register(pdev-&gt;name, &amp;pdev-&gt;dev,</div><div class='add'>+						&amp;sa1100_rtc_ops, THIS_MODULE);</div><div class='add'>+	if (IS_ERR(sa1100_rtc-&gt;rtc)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to register RTC device -&gt; %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		goto err_rtc_reg;</div><div class='add'>+	}</div><div class='ctx'> 	/* Fix for a nasty initialization problem the in SA11xx RTSR register.</div><div class='ctx'> 	 * See also the comments in sa1100_rtc_interrupt().</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -322,33 +375,46 @@ static int sa1100_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Notice that clearing bit 1 and 0 is accomplished by writting ONES to</div><div class='ctx'> 	 * the corresponding bits in RTSR. */</div><div class='del'>-	RTSR = RTSR_AL | RTSR_HZ;</div><div class='add'>+	rtc_writel(sa1100_rtc, RTSR, (RTSR_AL | RTSR_HZ));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_rtc_reg:</div><div class='add'>+err_clk:</div><div class='add'>+	iounmap(sa1100_rtc-&gt;base);</div><div class='add'>+err_ress:</div><div class='add'>+err_map:</div><div class='add'>+	kfree(sa1100_rtc);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sa1100_rtc_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct rtc_device *rtc = platform_get_drvdata(pdev);</div><div class='del'>-</div><div class='del'>-	if (rtc)</div><div class='del'>-		rtc_device_unregister(rtc);</div><div class='add'>+	struct sa1100_rtc *sa1100_rtc = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='add'>+	rtc_device_unregister(sa1100_rtc-&gt;rtc);</div><div class='add'>+	clk_disable(sa1100_rtc-&gt;clk);</div><div class='add'>+	clk_unprepare(sa1100_rtc-&gt;clk);</div><div class='add'>+	iounmap(sa1100_rtc-&gt;base);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int sa1100_rtc_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='ctx'> 	if (device_may_wakeup(dev))</div><div class='del'>-		enable_irq_wake(IRQ_RTCAlrm);</div><div class='add'>+		enable_irq_wake(sa1100_rtc-&gt;irq_Alrm);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sa1100_rtc_resume(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='ctx'> 	if (device_may_wakeup(dev))</div><div class='del'>-		disable_irq_wake(IRQ_RTCAlrm);</div><div class='add'>+		disable_irq_wake(sa1100_rtc-&gt;irq_Alrm);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -369,18 +435,7 @@ static struct platform_driver sa1100_rtc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sa1100_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sa1100_rtc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sa1100_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sa1100_rtc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sa1100_rtc_init);</div><div class='del'>-module_exit(sa1100_rtc_exit);</div><div class='add'>+module_platform_driver(sa1100_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Richard Purdie &lt;rpurdie@rpsys.net&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("SA11x0/PXA2xx Realtime Clock Driver (RTC)");</div><div class='head'>diff --git a/drivers/rtc/rtc-spear.c b/drivers/rtc/rtc-spear.c<br/>index 893bac2bb21b..19a28a671a8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-spear.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-spear.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-spear.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-spear.c</a></div><div class='hunk'>@@ -516,17 +516,7 @@ static struct platform_driver spear_rtc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;spear_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(rtc_init);</div><div class='del'>-</div><div class='del'>-static void __exit rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;spear_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(rtc_exit);</div><div class='add'>+module_platform_driver(spear_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_ALIAS("platform:rtc-spear");</div><div class='ctx'> MODULE_AUTHOR("Rajeev Kumar &lt;rajeev-dlh.kumar@st.com&gt;");</div><div class='head'>diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c<br/>index ed3e9b599031..7621116bd20d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-stk17ta8.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-stk17ta8.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-stk17ta8.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-stk17ta8.c</a></div><div class='hunk'>@@ -370,18 +370,7 @@ static struct platform_driver stk17ta8_rtc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static __init int stk17ta8_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;stk17ta8_rtc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __exit void stk17ta8_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;stk17ta8_rtc_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(stk17ta8_init);</div><div class='del'>-module_exit(stk17ta8_exit);</div><div class='add'>+module_platform_driver(stk17ta8_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Thomas Hommel &lt;thomas.hommel@ge.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Simtek STK17TA8 RTC driver");</div><div class='head'>diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c<br/>index 7315068daa59..10287865e330 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-stmp3xxx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-stmp3xxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-stmp3xxx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-stmp3xxx.c</a></div><div class='hunk'>@@ -276,18 +276,7 @@ static struct platform_driver stmp3xxx_rtcdrv = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init stmp3xxx_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;stmp3xxx_rtcdrv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit stmp3xxx_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;stmp3xxx_rtcdrv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(stmp3xxx_rtc_init);</div><div class='del'>-module_exit(stmp3xxx_rtc_exit);</div><div class='add'>+module_platform_driver(stmp3xxx_rtcdrv);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("STMP3xxx RTC Driver");</div><div class='ctx'> MODULE_AUTHOR("dmitry pervushin &lt;dpervushin@embeddedalley.com&gt; and "</div><div class='head'>diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c<br/>index 20687d55e7a7..d43b4f6eb4e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-twl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-twl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-twl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-twl.c</a></div><div class='hunk'>@@ -550,6 +550,11 @@ static int twl_rtc_resume(struct platform_device *pdev)</div><div class='ctx'> #define twl_rtc_resume  NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static const struct of_device_id twl_rtc_of_match[] = {</div><div class='add'>+	{.compatible = "ti,twl4030-rtc", },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, twl_rtc_of_match);</div><div class='ctx'> MODULE_ALIAS("platform:twl_rtc");</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver twl4030rtc_driver = {</div><div class='hunk'>@@ -559,8 +564,9 @@ static struct platform_driver twl4030rtc_driver = {</div><div class='ctx'> 	.suspend	= twl_rtc_suspend,</div><div class='ctx'> 	.resume		= twl_rtc_resume,</div><div class='ctx'> 	.driver		= {</div><div class='del'>-		.owner	= THIS_MODULE,</div><div class='del'>-		.name	= "twl_rtc",</div><div class='add'>+		.owner		= THIS_MODULE,</div><div class='add'>+		.name		= "twl_rtc",</div><div class='add'>+		.of_match_table = twl_rtc_of_match,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c<br/>index f71c3ce18036..bca5d677bc85 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-v3020.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-v3020.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-v3020.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-v3020.c</a></div><div class='hunk'>@@ -393,18 +393,7 @@ static struct platform_driver rtc_device_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static __init int v3020_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;rtc_device_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __exit void v3020_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;rtc_device_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(v3020_init);</div><div class='del'>-module_exit(v3020_exit);</div><div class='add'>+module_platform_driver(rtc_device_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("V3020 RTC");</div><div class='ctx'> MODULE_AUTHOR("Raphael Assenat");</div><div class='head'>diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c<br/>index c5698cda366a..fcbfdda2993b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-vr41xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-vr41xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-vr41xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-vr41xx.c</a></div><div class='hunk'>@@ -405,15 +405,4 @@ static struct platform_driver rtc_platform_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init vr41xx_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;rtc_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit vr41xx_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;rtc_platform_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(vr41xx_rtc_init);</div><div class='del'>-module_exit(vr41xx_rtc_exit);</div><div class='add'>+module_platform_driver(rtc_platform_driver);</div><div class='head'>diff --git a/drivers/rtc/rtc-vt8500.c b/drivers/rtc/rtc-vt8500.c<br/>index f93f412423c6..9e94fb147c26 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-vt8500.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-vt8500.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-vt8500.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-vt8500.c</a></div><div class='hunk'>@@ -311,17 +311,7 @@ static struct platform_driver vt8500_rtc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init vt8500_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;vt8500_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(vt8500_rtc_init);</div><div class='del'>-</div><div class='del'>-static void __exit vt8500_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;vt8500_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(vt8500_rtc_exit);</div><div class='add'>+module_platform_driver(vt8500_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Alexey Charkov &lt;alchark@gmail.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("VIA VT8500 SoC Realtime Clock Driver (RTC)");</div><div class='head'>diff --git a/drivers/rtc/rtc-wm831x.c b/drivers/rtc/rtc-wm831x.c<br/>index bdc909bd56da..3b6e6a67e765 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-wm831x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-wm831x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-wm831x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-wm831x.c</a></div><div class='hunk'>@@ -324,15 +324,6 @@ static irqreturn_t wm831x_alm_irq(int irq, void *data)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t wm831x_per_irq(int irq, void *data)</div><div class='del'>-{</div><div class='del'>-	struct wm831x_rtc *wm831x_rtc = data;</div><div class='del'>-</div><div class='del'>-	rtc_update_irq(wm831x_rtc-&gt;rtc, 1, RTC_IRQF | RTC_UF);</div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct rtc_class_ops wm831x_rtc_ops = {</div><div class='ctx'> 	.read_time = wm831x_rtc_readtime,</div><div class='ctx'> 	.set_mmss = wm831x_rtc_set_mmss,</div><div class='hunk'>@@ -405,11 +396,10 @@ static int wm831x_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct wm831x *wm831x = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='ctx'> 	struct wm831x_rtc *wm831x_rtc;</div><div class='del'>-	int per_irq = platform_get_irq_byname(pdev, "PER");</div><div class='ctx'> 	int alm_irq = platform_get_irq_byname(pdev, "ALM");</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	wm831x_rtc = kzalloc(sizeof(*wm831x_rtc), GFP_KERNEL);</div><div class='add'>+	wm831x_rtc = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*wm831x_rtc), GFP_KERNEL);</div><div class='ctx'> 	if (wm831x_rtc == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -433,14 +423,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = request_threaded_irq(per_irq, NULL, wm831x_per_irq,</div><div class='del'>-				   IRQF_TRIGGER_RISING, "RTC period",</div><div class='del'>-				   wm831x_rtc);</div><div class='del'>-	if (ret != 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to request periodic IRQ %d: %d\n",</div><div class='del'>-			per_irq, ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ret = request_threaded_irq(alm_irq, NULL, wm831x_alm_irq,</div><div class='ctx'> 				   IRQF_TRIGGER_RISING, "RTC alarm",</div><div class='ctx'> 				   wm831x_rtc);</div><div class='hunk'>@@ -452,20 +434,16 @@ static int wm831x_rtc_probe(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	kfree(wm831x_rtc);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __devexit wm831x_rtc_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct wm831x_rtc *wm831x_rtc = platform_get_drvdata(pdev);</div><div class='del'>-	int per_irq = platform_get_irq_byname(pdev, "PER");</div><div class='ctx'> 	int alm_irq = platform_get_irq_byname(pdev, "ALM");</div><div class='ctx'> </div><div class='ctx'> 	free_irq(alm_irq, wm831x_rtc);</div><div class='del'>-	free_irq(per_irq, wm831x_rtc);</div><div class='ctx'> 	rtc_device_unregister(wm831x_rtc-&gt;rtc);</div><div class='del'>-	kfree(wm831x_rtc);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -490,17 +468,7 @@ static struct platform_driver wm831x_rtc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init wm831x_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;wm831x_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(wm831x_rtc_init);</div><div class='del'>-</div><div class='del'>-static void __exit wm831x_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;wm831x_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(wm831x_rtc_exit);</div><div class='add'>+module_platform_driver(wm831x_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("RTC driver for the WM831x series PMICs");</div><div class='head'>diff --git a/drivers/rtc/rtc-wm8350.c b/drivers/rtc/rtc-wm8350.c<br/>index 66421426e404..c2e52d15abb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-wm8350.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/rtc/rtc-wm8350.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-wm8350.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/rtc/rtc-wm8350.c</a></div><div class='hunk'>@@ -486,17 +486,7 @@ static struct platform_driver wm8350_rtc_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init wm8350_rtc_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;wm8350_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_init(wm8350_rtc_init);</div><div class='del'>-</div><div class='del'>-static void __exit wm8350_rtc_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;wm8350_rtc_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(wm8350_rtc_exit);</div><div class='add'>+module_platform_driver(wm8350_rtc_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("RTC driver for the WM8350");</div><div class='head'>diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c<br/>index 65894f05a801..eef27a197c00 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/block/dasd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/s390/block/dasd.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/async.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='hunk'>@@ -1073,7 +1072,7 @@ static const struct file_operations dasd_stats_global_fops = {</div><div class='ctx'> static void dasd_profile_init(struct dasd_profile *profile,</div><div class='ctx'> 			      struct dentry *base_dentry)</div><div class='ctx'> {</div><div class='del'>-	mode_t mode;</div><div class='add'>+	umode_t mode;</div><div class='ctx'> 	struct dentry *pde;</div><div class='ctx'> </div><div class='ctx'> 	if (!base_dentry)</div><div class='hunk'>@@ -1112,7 +1111,7 @@ static void dasd_statistics_removeroot(void)</div><div class='ctx'> </div><div class='ctx'> static void dasd_statistics_createroot(void)</div><div class='ctx'> {</div><div class='del'>-	mode_t mode;</div><div class='add'>+	umode_t mode;</div><div class='ctx'> 	struct dentry *pde;</div><div class='ctx'> </div><div class='ctx'> 	dasd_debugfs_root_entry = NULL;</div><div class='head'>diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c<br/>index 87a0cf160fe5..0326571e7ffa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_3990_erp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/block/dasd_3990_erp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_3990_erp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/s390/block/dasd_3990_erp.c</a></div><div class='hunk'>@@ -1718,7 +1718,7 @@ dasd_3990_erp_action_1B_32(struct dasd_ccw_req * default_erp, char *sense)</div><div class='ctx'> 	erp-&gt;startdev = device;</div><div class='ctx'> 	erp-&gt;memdev = device;</div><div class='ctx'> 	erp-&gt;magic = default_erp-&gt;magic;</div><div class='del'>-	erp-&gt;expires = 0;</div><div class='add'>+	erp-&gt;expires = default_erp-&gt;expires;</div><div class='ctx'> 	erp-&gt;retries = 256;</div><div class='ctx'> 	erp-&gt;buildclk = get_clock();</div><div class='ctx'> 	erp-&gt;status = DASD_CQR_FILLED;</div><div class='hunk'>@@ -2363,7 +2363,7 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr)</div><div class='ctx'> 	erp-&gt;memdev   = device;</div><div class='ctx'> 	erp-&gt;block    = cqr-&gt;block;</div><div class='ctx'> 	erp-&gt;magic    = cqr-&gt;magic;</div><div class='del'>-	erp-&gt;expires  = 0;</div><div class='add'>+	erp-&gt;expires  = cqr-&gt;expires;</div><div class='ctx'> 	erp-&gt;retries  = 256;</div><div class='ctx'> 	erp-&gt;buildclk = get_clock();</div><div class='ctx'> 	erp-&gt;status = DASD_CQR_FILLED;</div><div class='head'>diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c<br/>index c388eda1e2b1..553b3c5abb0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_alias.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/block/dasd_alias.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_alias.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/s390/block/dasd_alias.c</a></div><div class='hunk'>@@ -705,6 +705,16 @@ struct dasd_device *dasd_alias_get_start_dev(struct dasd_device *base_device)</div><div class='ctx'> 	if (lcu-&gt;pav == NO_PAV ||</div><div class='ctx'> 	    lcu-&gt;flags &amp; (NEED_UAC_UPDATE | UPDATE_PENDING))</div><div class='ctx'> 		return NULL;</div><div class='add'>+	if (unlikely(!(private-&gt;features.feature[8] &amp; 0x01))) {</div><div class='add'>+		/*</div><div class='add'>+		 * PAV enabled but prefix not, very unlikely</div><div class='add'>+		 * seems to be a lost pathgroup</div><div class='add'>+		 * use base device to do IO</div><div class='add'>+		 */</div><div class='add'>+		DBF_DEV_EVENT(DBF_ERR, base_device, "%s",</div><div class='add'>+			      "Prefix not enabled with PAV enabled\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;lcu-&gt;lock, flags);</div><div class='ctx'> 	alias_device = group-&gt;next;</div><div class='head'>diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c<br/>index 6ab29680586a..bbcd5e9206ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_eckd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/block/dasd_eckd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_eckd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/s390/block/dasd_eckd.c</a></div><div class='hunk'>@@ -752,24 +752,13 @@ dasd_eckd_cdl_reclen(int recid)</div><div class='ctx'> 		return sizes_trk0[recid];</div><div class='ctx'> 	return LABEL_SIZE;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Generate device unique id that specifies the physical device.</div><div class='del'>- */</div><div class='del'>-static int dasd_eckd_generate_uid(struct dasd_device *device)</div><div class='add'>+/* create unique id from private structure. */</div><div class='add'>+static void create_uid(struct dasd_eckd_private *private)</div><div class='ctx'> {</div><div class='del'>-	struct dasd_eckd_private *private;</div><div class='del'>-	struct dasd_uid *uid;</div><div class='ctx'> 	int count;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct dasd_uid *uid;</div><div class='ctx'> </div><div class='del'>-	private = (struct dasd_eckd_private *) device-&gt;private;</div><div class='del'>-	if (!private)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	if (!private-&gt;ned || !private-&gt;gneq)</div><div class='del'>-		return -ENODEV;</div><div class='ctx'> 	uid = &amp;private-&gt;uid;</div><div class='del'>-	spin_lock_irqsave(get_ccwdev_lock(device-&gt;cdev), flags);</div><div class='ctx'> 	memset(uid, 0, sizeof(struct dasd_uid));</div><div class='ctx'> 	memcpy(uid-&gt;vendor, private-&gt;ned-&gt;HDA_manufacturer,</div><div class='ctx'> 	       sizeof(uid-&gt;vendor) - 1);</div><div class='hunk'>@@ -792,6 +781,23 @@ static int dasd_eckd_generate_uid(struct dasd_device *device)</div><div class='ctx'> 				private-&gt;vdsneq-&gt;uit[count]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generate device unique id that specifies the physical device.</div><div class='add'>+ */</div><div class='add'>+static int dasd_eckd_generate_uid(struct dasd_device *device)</div><div class='add'>+{</div><div class='add'>+	struct dasd_eckd_private *private;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	private = (struct dasd_eckd_private *) device-&gt;private;</div><div class='add'>+	if (!private)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (!private-&gt;ned || !private-&gt;gneq)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	spin_lock_irqsave(get_ccwdev_lock(device-&gt;cdev), flags);</div><div class='add'>+	create_uid(private);</div><div class='ctx'> 	spin_unlock_irqrestore(get_ccwdev_lock(device-&gt;cdev), flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -811,6 +817,21 @@ static int dasd_eckd_get_uid(struct dasd_device *device, struct dasd_uid *uid)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * compare device UID with data of a given dasd_eckd_private structure</div><div class='add'>+ * return 0 for match</div><div class='add'>+ */</div><div class='add'>+static int dasd_eckd_compare_path_uid(struct dasd_device *device,</div><div class='add'>+				      struct dasd_eckd_private *private)</div><div class='add'>+{</div><div class='add'>+	struct dasd_uid device_uid;</div><div class='add'>+</div><div class='add'>+	create_uid(private);</div><div class='add'>+	dasd_eckd_get_uid(device, &amp;device_uid);</div><div class='add'>+</div><div class='add'>+	return memcmp(&amp;device_uid, &amp;private-&gt;uid, sizeof(struct dasd_uid));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void dasd_eckd_fill_rcd_cqr(struct dasd_device *device,</div><div class='ctx'> 				   struct dasd_ccw_req *cqr,</div><div class='ctx'> 				   __u8 *rcd_buffer,</div><div class='hunk'>@@ -1005,59 +1026,120 @@ static int dasd_eckd_read_conf(struct dasd_device *device)</div><div class='ctx'> 	int conf_len, conf_data_saved;</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	__u8 lpm, opm;</div><div class='del'>-	struct dasd_eckd_private *private;</div><div class='add'>+	struct dasd_eckd_private *private, path_private;</div><div class='ctx'> 	struct dasd_path *path_data;</div><div class='add'>+	struct dasd_uid *uid;</div><div class='add'>+	char print_path_uid[60], print_device_uid[60];</div><div class='ctx'> </div><div class='ctx'> 	private = (struct dasd_eckd_private *) device-&gt;private;</div><div class='ctx'> 	path_data = &amp;device-&gt;path_data;</div><div class='ctx'> 	opm = ccw_device_get_path_mask(device-&gt;cdev);</div><div class='del'>-	lpm = 0x80;</div><div class='ctx'> 	conf_data_saved = 0;</div><div class='ctx'> 	/* get configuration data per operational path */</div><div class='ctx'> 	for (lpm = 0x80; lpm; lpm&gt;&gt;= 1) {</div><div class='del'>-		if (lpm &amp; opm) {</div><div class='del'>-			rc = dasd_eckd_read_conf_lpm(device, &amp;conf_data,</div><div class='del'>-						     &amp;conf_len, lpm);</div><div class='del'>-			if (rc &amp;&amp; rc != -EOPNOTSUPP) {	/* -EOPNOTSUPP is ok */</div><div class='del'>-				DBF_EVENT_DEVID(DBF_WARNING, device-&gt;cdev,</div><div class='del'>-					  "Read configuration data returned "</div><div class='del'>-					  "error %d", rc);</div><div class='del'>-				return rc;</div><div class='del'>-			}</div><div class='del'>-			if (conf_data == NULL) {</div><div class='del'>-				DBF_EVENT_DEVID(DBF_WARNING, device-&gt;cdev, "%s",</div><div class='del'>-						"No configuration data "</div><div class='del'>-						"retrieved");</div><div class='del'>-				/* no further analysis possible */</div><div class='del'>-				path_data-&gt;opm |= lpm;</div><div class='del'>-				continue;	/* no error */</div><div class='add'>+		if (!(lpm &amp; opm))</div><div class='add'>+			continue;</div><div class='add'>+		rc = dasd_eckd_read_conf_lpm(device, &amp;conf_data,</div><div class='add'>+					     &amp;conf_len, lpm);</div><div class='add'>+		if (rc &amp;&amp; rc != -EOPNOTSUPP) {	/* -EOPNOTSUPP is ok */</div><div class='add'>+			DBF_EVENT_DEVID(DBF_WARNING, device-&gt;cdev,</div><div class='add'>+					"Read configuration data returned "</div><div class='add'>+					"error %d", rc);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+		if (conf_data == NULL) {</div><div class='add'>+			DBF_EVENT_DEVID(DBF_WARNING, device-&gt;cdev, "%s",</div><div class='add'>+					"No configuration data "</div><div class='add'>+					"retrieved");</div><div class='add'>+			/* no further analysis possible */</div><div class='add'>+			path_data-&gt;opm |= lpm;</div><div class='add'>+			continue;	/* no error */</div><div class='add'>+		}</div><div class='add'>+		/* save first valid configuration data */</div><div class='add'>+		if (!conf_data_saved) {</div><div class='add'>+			kfree(private-&gt;conf_data);</div><div class='add'>+			private-&gt;conf_data = conf_data;</div><div class='add'>+			private-&gt;conf_len = conf_len;</div><div class='add'>+			if (dasd_eckd_identify_conf_parts(private)) {</div><div class='add'>+				private-&gt;conf_data = NULL;</div><div class='add'>+				private-&gt;conf_len = 0;</div><div class='add'>+				kfree(conf_data);</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='del'>-			/* save first valid configuration data */</div><div class='del'>-			if (!conf_data_saved) {</div><div class='del'>-				kfree(private-&gt;conf_data);</div><div class='del'>-				private-&gt;conf_data = conf_data;</div><div class='del'>-				private-&gt;conf_len = conf_len;</div><div class='del'>-				if (dasd_eckd_identify_conf_parts(private)) {</div><div class='del'>-					private-&gt;conf_data = NULL;</div><div class='del'>-					private-&gt;conf_len = 0;</div><div class='del'>-					kfree(conf_data);</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-				conf_data_saved++;</div><div class='add'>+			/*</div><div class='add'>+			 * build device UID that other path data</div><div class='add'>+			 * can be compared to it</div><div class='add'>+			 */</div><div class='add'>+			dasd_eckd_generate_uid(device);</div><div class='add'>+			conf_data_saved++;</div><div class='add'>+		} else {</div><div class='add'>+			path_private.conf_data = conf_data;</div><div class='add'>+			path_private.conf_len = DASD_ECKD_RCD_DATA_SIZE;</div><div class='add'>+			if (dasd_eckd_identify_conf_parts(</div><div class='add'>+				    &amp;path_private)) {</div><div class='add'>+				path_private.conf_data = NULL;</div><div class='add'>+				path_private.conf_len = 0;</div><div class='add'>+				kfree(conf_data);</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='del'>-			switch (dasd_eckd_path_access(conf_data, conf_len)) {</div><div class='del'>-			case 0x02:</div><div class='del'>-				path_data-&gt;npm |= lpm;</div><div class='del'>-				break;</div><div class='del'>-			case 0x03:</div><div class='del'>-				path_data-&gt;ppm |= lpm;</div><div class='del'>-				break;</div><div class='add'>+</div><div class='add'>+			if (dasd_eckd_compare_path_uid(</div><div class='add'>+				    device, &amp;path_private)) {</div><div class='add'>+				uid = &amp;path_private.uid;</div><div class='add'>+				if (strlen(uid-&gt;vduit) &gt; 0)</div><div class='add'>+					snprintf(print_path_uid,</div><div class='add'>+						 sizeof(print_path_uid),</div><div class='add'>+						 "%s.%s.%04x.%02x.%s",</div><div class='add'>+						 uid-&gt;vendor, uid-&gt;serial,</div><div class='add'>+						 uid-&gt;ssid, uid-&gt;real_unit_addr,</div><div class='add'>+						 uid-&gt;vduit);</div><div class='add'>+				else</div><div class='add'>+					snprintf(print_path_uid,</div><div class='add'>+						 sizeof(print_path_uid),</div><div class='add'>+						 "%s.%s.%04x.%02x",</div><div class='add'>+						 uid-&gt;vendor, uid-&gt;serial,</div><div class='add'>+						 uid-&gt;ssid,</div><div class='add'>+						 uid-&gt;real_unit_addr);</div><div class='add'>+				uid = &amp;private-&gt;uid;</div><div class='add'>+				if (strlen(uid-&gt;vduit) &gt; 0)</div><div class='add'>+					snprintf(print_device_uid,</div><div class='add'>+						 sizeof(print_device_uid),</div><div class='add'>+						 "%s.%s.%04x.%02x.%s",</div><div class='add'>+						 uid-&gt;vendor, uid-&gt;serial,</div><div class='add'>+						 uid-&gt;ssid, uid-&gt;real_unit_addr,</div><div class='add'>+						 uid-&gt;vduit);</div><div class='add'>+				else</div><div class='add'>+					snprintf(print_device_uid,</div><div class='add'>+						 sizeof(print_device_uid),</div><div class='add'>+						 "%s.%s.%04x.%02x",</div><div class='add'>+						 uid-&gt;vendor, uid-&gt;serial,</div><div class='add'>+						 uid-&gt;ssid,</div><div class='add'>+						 uid-&gt;real_unit_addr);</div><div class='add'>+				dev_err(&amp;device-&gt;cdev-&gt;dev,</div><div class='add'>+					"Not all channel paths lead to "</div><div class='add'>+					"the same device, path %02X leads to "</div><div class='add'>+					"device %s instead of %s\n", lpm,</div><div class='add'>+					print_path_uid, print_device_uid);</div><div class='add'>+				return -EINVAL;</div><div class='ctx'> 			}</div><div class='del'>-			path_data-&gt;opm |= lpm;</div><div class='del'>-			if (conf_data != private-&gt;conf_data)</div><div class='del'>-				kfree(conf_data);</div><div class='add'>+</div><div class='add'>+			path_private.conf_data = NULL;</div><div class='add'>+			path_private.conf_len = 0;</div><div class='ctx'> 		}</div><div class='add'>+		switch (dasd_eckd_path_access(conf_data, conf_len)) {</div><div class='add'>+		case 0x02:</div><div class='add'>+			path_data-&gt;npm |= lpm;</div><div class='add'>+			break;</div><div class='add'>+		case 0x03:</div><div class='add'>+			path_data-&gt;ppm |= lpm;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		path_data-&gt;opm |= lpm;</div><div class='add'>+</div><div class='add'>+		if (conf_data != private-&gt;conf_data)</div><div class='add'>+			kfree(conf_data);</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'>@@ -1090,12 +1172,61 @@ static int verify_fcx_max_data(struct dasd_device *device, __u8 lpm)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rebuild_device_uid(struct dasd_device *device,</div><div class='add'>+			      struct path_verification_work_data *data)</div><div class='add'>+{</div><div class='add'>+	struct dasd_eckd_private *private;</div><div class='add'>+	struct dasd_path *path_data;</div><div class='add'>+	__u8 lpm, opm;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = -ENODEV;</div><div class='add'>+	private = (struct dasd_eckd_private *) device-&gt;private;</div><div class='add'>+	path_data = &amp;device-&gt;path_data;</div><div class='add'>+	opm = device-&gt;path_data.opm;</div><div class='add'>+</div><div class='add'>+	for (lpm = 0x80; lpm; lpm &gt;&gt;= 1) {</div><div class='add'>+		if (!(lpm &amp; opm))</div><div class='add'>+			continue;</div><div class='add'>+		memset(&amp;data-&gt;rcd_buffer, 0, sizeof(data-&gt;rcd_buffer));</div><div class='add'>+		memset(&amp;data-&gt;cqr, 0, sizeof(data-&gt;cqr));</div><div class='add'>+		data-&gt;cqr.cpaddr = &amp;data-&gt;ccw;</div><div class='add'>+		rc = dasd_eckd_read_conf_immediately(device, &amp;data-&gt;cqr,</div><div class='add'>+						     data-&gt;rcd_buffer,</div><div class='add'>+						     lpm);</div><div class='add'>+</div><div class='add'>+		if (rc) {</div><div class='add'>+			if (rc == -EOPNOTSUPP) /* -EOPNOTSUPP is ok */</div><div class='add'>+				continue;</div><div class='add'>+			DBF_EVENT_DEVID(DBF_WARNING, device-&gt;cdev,</div><div class='add'>+					"Read configuration data "</div><div class='add'>+					"returned error %d", rc);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		memcpy(private-&gt;conf_data, data-&gt;rcd_buffer,</div><div class='add'>+		       DASD_ECKD_RCD_DATA_SIZE);</div><div class='add'>+		if (dasd_eckd_identify_conf_parts(private)) {</div><div class='add'>+			rc = -ENODEV;</div><div class='add'>+		} else /* first valid path is enough */</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!rc)</div><div class='add'>+		rc = dasd_eckd_generate_uid(device);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void do_path_verification_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct path_verification_work_data *data;</div><div class='ctx'> 	struct dasd_device *device;</div><div class='add'>+	struct dasd_eckd_private path_private;</div><div class='add'>+	struct dasd_uid *uid;</div><div class='add'>+	__u8 path_rcd_buf[DASD_ECKD_RCD_DATA_SIZE];</div><div class='ctx'> 	__u8 lpm, opm, npm, ppm, epm;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	char print_uid[60];</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	data = container_of(work, struct path_verification_work_data, worker);</div><div class='hunk'>@@ -1112,64 +1243,129 @@ static void do_path_verification_work(struct work_struct *work)</div><div class='ctx'> 	ppm = 0;</div><div class='ctx'> 	epm = 0;</div><div class='ctx'> 	for (lpm = 0x80; lpm; lpm &gt;&gt;= 1) {</div><div class='del'>-		if (lpm &amp; data-&gt;tbvpm) {</div><div class='del'>-			memset(data-&gt;rcd_buffer, 0, sizeof(data-&gt;rcd_buffer));</div><div class='del'>-			memset(&amp;data-&gt;cqr, 0, sizeof(data-&gt;cqr));</div><div class='del'>-			data-&gt;cqr.cpaddr = &amp;data-&gt;ccw;</div><div class='del'>-			rc = dasd_eckd_read_conf_immediately(device, &amp;data-&gt;cqr,</div><div class='del'>-							     data-&gt;rcd_buffer,</div><div class='del'>-							     lpm);</div><div class='del'>-			if (!rc) {</div><div class='del'>-				switch (dasd_eckd_path_access(data-&gt;rcd_buffer,</div><div class='del'>-						     DASD_ECKD_RCD_DATA_SIZE)) {</div><div class='del'>-				case 0x02:</div><div class='del'>-					npm |= lpm;</div><div class='del'>-					break;</div><div class='del'>-				case 0x03:</div><div class='del'>-					ppm |= lpm;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				opm |= lpm;</div><div class='del'>-			} else if (rc == -EOPNOTSUPP) {</div><div class='del'>-				DBF_EVENT_DEVID(DBF_WARNING, device-&gt;cdev, "%s",</div><div class='del'>-				       "path verification: No configuration "</div><div class='del'>-				       "data retrieved");</div><div class='del'>-				opm |= lpm;</div><div class='del'>-			} else if (rc == -EAGAIN) {</div><div class='del'>-				DBF_EVENT_DEVID(DBF_WARNING, device-&gt;cdev, "%s",</div><div class='add'>+		if (!(lpm &amp; data-&gt;tbvpm))</div><div class='add'>+			continue;</div><div class='add'>+		memset(&amp;data-&gt;rcd_buffer, 0, sizeof(data-&gt;rcd_buffer));</div><div class='add'>+		memset(&amp;data-&gt;cqr, 0, sizeof(data-&gt;cqr));</div><div class='add'>+		data-&gt;cqr.cpaddr = &amp;data-&gt;ccw;</div><div class='add'>+		rc = dasd_eckd_read_conf_immediately(device, &amp;data-&gt;cqr,</div><div class='add'>+						     data-&gt;rcd_buffer,</div><div class='add'>+						     lpm);</div><div class='add'>+		if (!rc) {</div><div class='add'>+			switch (dasd_eckd_path_access(data-&gt;rcd_buffer,</div><div class='add'>+						      DASD_ECKD_RCD_DATA_SIZE)</div><div class='add'>+				) {</div><div class='add'>+			case 0x02:</div><div class='add'>+				npm |= lpm;</div><div class='add'>+				break;</div><div class='add'>+			case 0x03:</div><div class='add'>+				ppm |= lpm;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			opm |= lpm;</div><div class='add'>+		} else if (rc == -EOPNOTSUPP) {</div><div class='add'>+			DBF_EVENT_DEVID(DBF_WARNING, device-&gt;cdev, "%s",</div><div class='add'>+					"path verification: No configuration "</div><div class='add'>+					"data retrieved");</div><div class='add'>+			opm |= lpm;</div><div class='add'>+		} else if (rc == -EAGAIN) {</div><div class='add'>+			DBF_EVENT_DEVID(DBF_WARNING, device-&gt;cdev, "%s",</div><div class='ctx'> 					"path verification: device is stopped,"</div><div class='ctx'> 					" try again later");</div><div class='del'>-				epm |= lpm;</div><div class='del'>-			} else {</div><div class='del'>-				dev_warn(&amp;device-&gt;cdev-&gt;dev,</div><div class='del'>-					 "Reading device feature codes failed "</div><div class='del'>-					 "(rc=%d) for new path %x\n", rc, lpm);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			if (verify_fcx_max_data(device, lpm)) {</div><div class='add'>+			epm |= lpm;</div><div class='add'>+		} else {</div><div class='add'>+			dev_warn(&amp;device-&gt;cdev-&gt;dev,</div><div class='add'>+				 "Reading device feature codes failed "</div><div class='add'>+				 "(rc=%d) for new path %x\n", rc, lpm);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (verify_fcx_max_data(device, lpm)) {</div><div class='add'>+			opm &amp;= ~lpm;</div><div class='add'>+			npm &amp;= ~lpm;</div><div class='add'>+			ppm &amp;= ~lpm;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * save conf_data for comparison after</div><div class='add'>+		 * rebuild_device_uid may have changed</div><div class='add'>+		 * the original data</div><div class='add'>+		 */</div><div class='add'>+		memcpy(&amp;path_rcd_buf, data-&gt;rcd_buffer,</div><div class='add'>+		       DASD_ECKD_RCD_DATA_SIZE);</div><div class='add'>+		path_private.conf_data = (void *) &amp;path_rcd_buf;</div><div class='add'>+		path_private.conf_len = DASD_ECKD_RCD_DATA_SIZE;</div><div class='add'>+		if (dasd_eckd_identify_conf_parts(&amp;path_private)) {</div><div class='add'>+			path_private.conf_data = NULL;</div><div class='add'>+			path_private.conf_len = 0;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * compare path UID with device UID only if at least</div><div class='add'>+		 * one valid path is left</div><div class='add'>+		 * in other case the device UID may have changed and</div><div class='add'>+		 * the first working path UID will be used as device UID</div><div class='add'>+		 */</div><div class='add'>+		if (device-&gt;path_data.opm &amp;&amp;</div><div class='add'>+		    dasd_eckd_compare_path_uid(device, &amp;path_private)) {</div><div class='add'>+			/*</div><div class='add'>+			 * the comparison was not successful</div><div class='add'>+			 * rebuild the device UID with at least one</div><div class='add'>+			 * known path in case a z/VM hyperswap command</div><div class='add'>+			 * has changed the device</div><div class='add'>+			 *</div><div class='add'>+			 * after this compare again</div><div class='add'>+			 *</div><div class='add'>+			 * if either the rebuild or the recompare fails</div><div class='add'>+			 * the path can not be used</div><div class='add'>+			 */</div><div class='add'>+			if (rebuild_device_uid(device, data) ||</div><div class='add'>+			    dasd_eckd_compare_path_uid(</div><div class='add'>+				    device, &amp;path_private)) {</div><div class='add'>+				uid = &amp;path_private.uid;</div><div class='add'>+				if (strlen(uid-&gt;vduit) &gt; 0)</div><div class='add'>+					snprintf(print_uid, sizeof(print_uid),</div><div class='add'>+						 "%s.%s.%04x.%02x.%s",</div><div class='add'>+						 uid-&gt;vendor, uid-&gt;serial,</div><div class='add'>+						 uid-&gt;ssid, uid-&gt;real_unit_addr,</div><div class='add'>+						 uid-&gt;vduit);</div><div class='add'>+				else</div><div class='add'>+					snprintf(print_uid, sizeof(print_uid),</div><div class='add'>+						 "%s.%s.%04x.%02x",</div><div class='add'>+						 uid-&gt;vendor, uid-&gt;serial,</div><div class='add'>+						 uid-&gt;ssid,</div><div class='add'>+						 uid-&gt;real_unit_addr);</div><div class='add'>+				dev_err(&amp;device-&gt;cdev-&gt;dev,</div><div class='add'>+					"The newly added channel path %02X "</div><div class='add'>+					"will not be used because it leads "</div><div class='add'>+					"to a different device %s\n",</div><div class='add'>+					lpm, print_uid);</div><div class='ctx'> 				opm &amp;= ~lpm;</div><div class='ctx'> 				npm &amp;= ~lpm;</div><div class='ctx'> 				ppm &amp;= ~lpm;</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * There is a small chance that a path is lost again between</div><div class='add'>+		 * above path verification and the following modification of</div><div class='add'>+		 * the device opm mask. We could avoid that race here by using</div><div class='add'>+		 * yet another path mask, but we rather deal with this unlikely</div><div class='add'>+		 * situation in dasd_start_IO.</div><div class='add'>+		 */</div><div class='add'>+		spin_lock_irqsave(get_ccwdev_lock(device-&gt;cdev), flags);</div><div class='add'>+		if (!device-&gt;path_data.opm &amp;&amp; opm) {</div><div class='add'>+			device-&gt;path_data.opm = opm;</div><div class='add'>+			dasd_generic_path_operational(device);</div><div class='add'>+		} else</div><div class='add'>+			device-&gt;path_data.opm |= opm;</div><div class='add'>+		device-&gt;path_data.npm |= npm;</div><div class='add'>+		device-&gt;path_data.ppm |= ppm;</div><div class='add'>+		device-&gt;path_data.tbvpm |= epm;</div><div class='add'>+		spin_unlock_irqrestore(get_ccwdev_lock(device-&gt;cdev), flags);</div><div class='ctx'> 	}</div><div class='del'>-	/*</div><div class='del'>-	 * There is a small chance that a path is lost again between</div><div class='del'>-	 * above path verification and the following modification of</div><div class='del'>-	 * the device opm mask. We could avoid that race here by using</div><div class='del'>-	 * yet another path mask, but we rather deal with this unlikely</div><div class='del'>-	 * situation in dasd_start_IO.</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irqsave(get_ccwdev_lock(device-&gt;cdev), flags);</div><div class='del'>-	if (!device-&gt;path_data.opm &amp;&amp; opm) {</div><div class='del'>-		device-&gt;path_data.opm = opm;</div><div class='del'>-		dasd_generic_path_operational(device);</div><div class='del'>-	} else</div><div class='del'>-		device-&gt;path_data.opm |= opm;</div><div class='del'>-	device-&gt;path_data.npm |= npm;</div><div class='del'>-	device-&gt;path_data.ppm |= ppm;</div><div class='del'>-	device-&gt;path_data.tbvpm |= epm;</div><div class='del'>-	spin_unlock_irqrestore(get_ccwdev_lock(device-&gt;cdev), flags);</div><div class='ctx'> </div><div class='ctx'> 	dasd_put_device(device);</div><div class='ctx'> 	if (data-&gt;isglobal)</div><div class='hunk'>@@ -1441,11 +1637,6 @@ dasd_eckd_check_characteristics(struct dasd_device *device)</div><div class='ctx'> 			device-&gt;default_expires = value;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Generate device unique id */</div><div class='del'>-	rc = dasd_eckd_generate_uid(device);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto out_err1;</div><div class='del'>-</div><div class='ctx'> 	dasd_eckd_get_uid(device, &amp;temp_uid);</div><div class='ctx'> 	if (temp_uid.type == UA_BASE_DEVICE) {</div><div class='ctx'> 		block = dasd_alloc_block();</div><div class='hunk'>@@ -2206,7 +2397,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_single(</div><div class='ctx'> 					   sizeof(struct PFX_eckd_data));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (define_extent(ccw++, cqr-&gt;data, first_trk,</div><div class='del'>-				  last_trk, cmd, startdev) == -EAGAIN) {</div><div class='add'>+				  last_trk, cmd, basedev) == -EAGAIN) {</div><div class='ctx'> 			/* Clock not in sync and XRC is enabled.</div><div class='ctx'> 			 * Try again later.</div><div class='ctx'> 			 */</div><div class='head'>diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c<br/>index 98f3e4ade924..690c3338a8ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/xpram.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/block/xpram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/xpram.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/s390/block/xpram.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/blkpg.h&gt;</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;  /* HDIO_GETGEO */</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='head'>diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c<br/>index e5cb9248a442..f3b8bb84faf2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/raw3270.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/char/raw3270.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/raw3270.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/s390/char/raw3270.c</a></div><div class='hunk'>@@ -75,7 +75,7 @@ static LIST_HEAD(raw3270_devices);</div><div class='ctx'> static int raw3270_registered;</div><div class='ctx'> </div><div class='ctx'> /* Module parameters */</div><div class='del'>-static int tubxcorrect = 0;</div><div class='add'>+static bool tubxcorrect = 0;</div><div class='ctx'> module_param(tubxcorrect, bool, 0);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/s390/char/sclp_config.c b/drivers/s390/char/sclp_config.c<br/>index 95b909ac2b73..3c03c1060be6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/sclp_config.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/char/sclp_config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/sclp_config.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/s390/char/sclp_config.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -31,14 +31,14 @@ static struct work_struct sclp_cpu_change_work;</div><div class='ctx'> static void sclp_cpu_capability_notify(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='del'>-	struct sys_device *sysdev;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> </div><div class='ctx'> 	s390_adjust_jiffies();</div><div class='ctx'> 	pr_warning("cpu capability changed.\n");</div><div class='ctx'> 	get_online_cpus();</div><div class='ctx'> 	for_each_online_cpu(cpu) {</div><div class='del'>-		sysdev = get_cpu_sysdev(cpu);</div><div class='del'>-		kobject_uevent(&amp;sysdev-&gt;kobj, KOBJ_CHANGE);</div><div class='add'>+		dev = get_cpu_device(cpu);</div><div class='add'>+		kobject_uevent(&amp;dev-&gt;kobj, KOBJ_CHANGE);</div><div class='ctx'> 	}</div><div class='ctx'> 	put_online_cpus();</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/s390/char/tape_class.h b/drivers/s390/char/tape_class.h<br/>index 9e32780c317f..ba2092f741d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/tape_class.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/char/tape_class.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/tape_class.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/s390/char/tape_class.h</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/fs.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/kobj_map.h&gt;</div><div class='ctx'> #include &lt;linux/cdev.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='head'>diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c<br/>index 11312f401c70..2211277a1079 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/vmwatchdog.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/char/vmwatchdog.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/vmwatchdog.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/s390/char/vmwatchdog.c</a></div><div class='hunk'>@@ -28,9 +28,9 @@</div><div class='ctx'> #define MAX_CMDLEN 240</div><div class='ctx'> #define MIN_INTERVAL 15</div><div class='ctx'> static char vmwdt_cmd[MAX_CMDLEN] = "IPL";</div><div class='del'>-static int vmwdt_conceal;</div><div class='add'>+static bool vmwdt_conceal;</div><div class='ctx'> </div><div class='del'>-static int vmwdt_nowayout = WATCHDOG_NOWAYOUT;</div><div class='add'>+static bool vmwdt_nowayout = WATCHDOG_NOWAYOUT;</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Arnd Bergmann &lt;arndb@de.ibm.com&gt;");</div><div class='head'>diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c<br/>index 2985eb439485..204ca728e7fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/cio/cmf.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/cio/cmf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/cio/cmf.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/s390/cio/cmf.c</a></div><div class='hunk'>@@ -98,7 +98,7 @@ enum cmb_format {</div><div class='ctx'>  * enum cmb_format.</div><div class='ctx'>  */</div><div class='ctx'> static int format = CMF_AUTODETECT;</div><div class='del'>-module_param(format, bool, 0444);</div><div class='add'>+module_param(format, bint, 0444);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct cmb_operations - functions to use depending on cmb_format</div><div class='head'>diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c<br/>index 2acc01f90a6a..452989a7ec13 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/cio/qdio_setup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/cio/qdio_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/cio/qdio_setup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/s390/cio/qdio_setup.c</a></div><div class='hunk'>@@ -22,12 +22,9 @@</div><div class='ctx'> static struct kmem_cache *qdio_q_cache;</div><div class='ctx'> static struct kmem_cache *qdio_aob_cache;</div><div class='ctx'> </div><div class='del'>-struct qaob *qdio_allocate_aob()</div><div class='add'>+struct qaob *qdio_allocate_aob(void)</div><div class='ctx'> {</div><div class='del'>-	struct qaob *aob;</div><div class='del'>-</div><div class='del'>-	aob = kmem_cache_zalloc(qdio_aob_cache, GFP_ATOMIC);</div><div class='del'>-	return aob;</div><div class='add'>+	return kmem_cache_zalloc(qdio_aob_cache, GFP_ATOMIC);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(qdio_allocate_aob);</div><div class='ctx'> </div><div class='hunk'>@@ -180,7 +177,8 @@ static void setup_queues(struct qdio_irq *irq_ptr,</div><div class='ctx'> 		setup_queues_misc(q, irq_ptr, qdio_init-&gt;input_handler, i);</div><div class='ctx'> </div><div class='ctx'> 		q-&gt;is_input_q = 1;</div><div class='del'>-		q-&gt;u.in.queue_start_poll = qdio_init-&gt;queue_start_poll[i];</div><div class='add'>+		q-&gt;u.in.queue_start_poll = qdio_init-&gt;queue_start_poll_array ?</div><div class='add'>+				qdio_init-&gt;queue_start_poll_array[i] : NULL;</div><div class='ctx'> </div><div class='ctx'> 		setup_storage_lists(q, irq_ptr, input_sbal_array, i);</div><div class='ctx'> 		input_sbal_array += QDIO_MAX_BUFFERS_PER_Q;</div><div class='head'>diff --git a/drivers/s390/crypto/zcrypt_pcixcc.c b/drivers/s390/crypto/zcrypt_pcixcc.c<br/>index dd4737808e06..077b7d109fde 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/crypto/zcrypt_pcixcc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/crypto/zcrypt_pcixcc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/crypto/zcrypt_pcixcc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/s390/crypto/zcrypt_pcixcc.c</a></div><div class='hunk'>@@ -56,11 +56,6 @@</div><div class='ctx'> #define PCIXCC_MAX_ICA_RESPONSE_SIZE 0x77c /* max size type86 v2 reply	    */</div><div class='ctx'> </div><div class='ctx'> #define PCIXCC_MAX_XCRB_MESSAGE_SIZE (12*1024)</div><div class='del'>-#define PCIXCC_MAX_XCRB_RESPONSE_SIZE PCIXCC_MAX_XCRB_MESSAGE_SIZE</div><div class='del'>-#define PCIXCC_MAX_XCRB_DATA_SIZE (11*1024)</div><div class='del'>-#define PCIXCC_MAX_XCRB_REPLY_SIZE (5*1024)</div><div class='del'>-</div><div class='del'>-#define PCIXCC_MAX_RESPONSE_SIZE PCIXCC_MAX_XCRB_RESPONSE_SIZE</div><div class='ctx'> </div><div class='ctx'> #define PCIXCC_CLEANUP_TIME	(15*HZ)</div><div class='ctx'> </div><div class='hunk'>@@ -265,7 +260,7 @@ static int ICACRT_msg_to_type6CRT_msgX(struct zcrypt_device *zdev,</div><div class='ctx'>  * @ap_msg: pointer to AP message</div><div class='ctx'>  * @xcRB: pointer to user input data</div><div class='ctx'>  *</div><div class='del'>- * Returns 0 on success or -EFAULT.</div><div class='add'>+ * Returns 0 on success or -EFAULT, -EINVAL.</div><div class='ctx'>  */</div><div class='ctx'> struct type86_fmt2_msg {</div><div class='ctx'> 	struct type86_hdr hdr;</div><div class='hunk'>@@ -295,19 +290,12 @@ static int XCRB_msg_to_type6CPRB_msgX(struct zcrypt_device *zdev,</div><div class='ctx'> 		CEIL4(xcRB-&gt;request_control_blk_length) +</div><div class='ctx'> 		xcRB-&gt;request_data_length;</div><div class='ctx'> 	if (ap_msg-&gt;length &gt; PCIXCC_MAX_XCRB_MESSAGE_SIZE)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (CEIL4(xcRB-&gt;reply_control_blk_length) &gt; PCIXCC_MAX_XCRB_REPLY_SIZE)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (CEIL4(xcRB-&gt;reply_data_length) &gt; PCIXCC_MAX_XCRB_DATA_SIZE)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	replylen = CEIL4(xcRB-&gt;reply_control_blk_length) +</div><div class='del'>-		CEIL4(xcRB-&gt;reply_data_length) +</div><div class='del'>-		sizeof(struct type86_fmt2_msg);</div><div class='del'>-	if (replylen &gt; PCIXCC_MAX_XCRB_RESPONSE_SIZE) {</div><div class='del'>-		xcRB-&gt;reply_control_blk_length = PCIXCC_MAX_XCRB_RESPONSE_SIZE -</div><div class='del'>-			(sizeof(struct type86_fmt2_msg) +</div><div class='del'>-			    CEIL4(xcRB-&gt;reply_data_length));</div><div class='del'>-	}</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	replylen = sizeof(struct type86_fmt2_msg) +</div><div class='add'>+		CEIL4(xcRB-&gt;reply_control_blk_length) +</div><div class='add'>+		xcRB-&gt;reply_data_length;</div><div class='add'>+	if (replylen &gt; PCIXCC_MAX_XCRB_MESSAGE_SIZE)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* prepare type6 header */</div><div class='ctx'> 	msg-&gt;hdr = static_type6_hdrX;</div><div class='hunk'>@@ -326,7 +314,7 @@ static int XCRB_msg_to_type6CPRB_msgX(struct zcrypt_device *zdev,</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	if (msg-&gt;cprbx.cprb_len + sizeof(msg-&gt;hdr.function_code) &gt;</div><div class='ctx'> 	    xcRB-&gt;request_control_blk_length)</div><div class='del'>-		return -EFAULT;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	function_code = ((unsigned char *)&amp;msg-&gt;cprbx) + msg-&gt;cprbx.cprb_len;</div><div class='ctx'> 	memcpy(msg-&gt;hdr.function_code, function_code, sizeof(msg-&gt;hdr.function_code));</div><div class='ctx'> </div><div class='hunk'>@@ -678,7 +666,7 @@ static void zcrypt_pcixcc_receive(struct ap_device *ap_dev,</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PCIXCC_RESPONSE_TYPE_XCRB:</div><div class='ctx'> 			length = t86r-&gt;fmt2.offset2 + t86r-&gt;fmt2.count2;</div><div class='del'>-			length = min(PCIXCC_MAX_XCRB_RESPONSE_SIZE, length);</div><div class='add'>+			length = min(PCIXCC_MAX_XCRB_MESSAGE_SIZE, length);</div><div class='ctx'> 			memcpy(msg-&gt;message, reply-&gt;message, length);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -1043,7 +1031,7 @@ static int zcrypt_pcixcc_probe(struct ap_device *ap_dev)</div><div class='ctx'> 	struct zcrypt_device *zdev;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	zdev = zcrypt_device_alloc(PCIXCC_MAX_RESPONSE_SIZE);</div><div class='add'>+	zdev = zcrypt_device_alloc(PCIXCC_MAX_XCRB_MESSAGE_SIZE);</div><div class='ctx'> 	if (!zdev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	zdev-&gt;ap_dev = ap_dev;</div><div class='head'>diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c<br/>index 94f49ffa70ba..7bc1955337ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/kvm/kvm_virtio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/kvm/kvm_virtio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/kvm/kvm_virtio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/s390/kvm/kvm_virtio.c</a></div><div class='hunk'>@@ -198,7 +198,7 @@ static struct virtqueue *kvm_find_vq(struct virtio_device *vdev,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	vq = vring_new_virtqueue(config-&gt;num, KVM_S390_VIRTIO_RING_ALIGN,</div><div class='del'>-				 vdev, (void *) config-&gt;address,</div><div class='add'>+				 vdev, true, (void *) config-&gt;address,</div><div class='ctx'> 				 kvm_notify, callback, name);</div><div class='ctx'> 	if (!vq) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='hunk'>@@ -263,6 +263,11 @@ error:</div><div class='ctx'> 	return PTR_ERR(vqs[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const char *kvm_bus_name(struct virtio_device *vdev)</div><div class='add'>+{</div><div class='add'>+	return "";</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The config ops structure as defined by virtio config</div><div class='ctx'>  */</div><div class='hunk'>@@ -276,6 +281,7 @@ static struct virtio_config_ops kvm_vq_configspace_ops = {</div><div class='ctx'> 	.reset = kvm_reset,</div><div class='ctx'> 	.find_vqs = kvm_find_vqs,</div><div class='ctx'> 	.del_vqs = kvm_del_vqs,</div><div class='add'>+	.bus_name = kvm_bus_name,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c<br/>index b6a6356d09b3..8160591913f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/netiucv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/net/netiucv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/net/netiucv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/s390/net/netiucv.c</a></div><div class='hunk'>@@ -63,6 +63,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/ebcdic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/iucv/iucv.h&gt;</div><div class='ctx'> #include "fsm.h"</div><div class='hunk'>@@ -75,7 +76,7 @@ MODULE_DESCRIPTION ("Linux for S/390 IUCV network driver");</div><div class='ctx'>  * Debug Facility stuff</div><div class='ctx'>  */</div><div class='ctx'> #define IUCV_DBF_SETUP_NAME "iucv_setup"</div><div class='del'>-#define IUCV_DBF_SETUP_LEN 32</div><div class='add'>+#define IUCV_DBF_SETUP_LEN 64</div><div class='ctx'> #define IUCV_DBF_SETUP_PAGES 2</div><div class='ctx'> #define IUCV_DBF_SETUP_NR_AREAS 1</div><div class='ctx'> #define IUCV_DBF_SETUP_LEVEL 3</div><div class='hunk'>@@ -226,6 +227,7 @@ struct iucv_connection {</div><div class='ctx'> 	struct net_device         *netdev;</div><div class='ctx'> 	struct connection_profile prof;</div><div class='ctx'> 	char                      userid[9];</div><div class='add'>+	char			  userdata[17];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -263,7 +265,7 @@ struct ll_header {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define NETIUCV_HDRLEN		 (sizeof(struct ll_header))</div><div class='del'>-#define NETIUCV_BUFSIZE_MAX      32768</div><div class='add'>+#define NETIUCV_BUFSIZE_MAX	 65537</div><div class='ctx'> #define NETIUCV_BUFSIZE_DEFAULT  NETIUCV_BUFSIZE_MAX</div><div class='ctx'> #define NETIUCV_MTU_MAX          (NETIUCV_BUFSIZE_MAX - NETIUCV_HDRLEN)</div><div class='ctx'> #define NETIUCV_MTU_DEFAULT      9216</div><div class='hunk'>@@ -288,7 +290,12 @@ static inline int netiucv_test_and_set_busy(struct net_device *dev)</div><div class='ctx'> 	return test_and_set_bit(0, &amp;priv-&gt;tbusy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 iucvMagic[16] = {</div><div class='add'>+static u8 iucvMagic_ascii[16] = {</div><div class='add'>+	0x30, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,</div><div class='add'>+	0x30, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 iucvMagic_ebcdic[16] = {</div><div class='ctx'> 	0xF0, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,</div><div class='ctx'> 	0xF0, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40</div><div class='ctx'> };</div><div class='hunk'>@@ -301,18 +308,38 @@ static u8 iucvMagic[16] = {</div><div class='ctx'>  *</div><div class='ctx'>  * @returns The printable string (static data!!)</div><div class='ctx'>  */</div><div class='del'>-static char *netiucv_printname(char *name)</div><div class='add'>+static char *netiucv_printname(char *name, int len)</div><div class='ctx'> {</div><div class='del'>-	static char tmp[9];</div><div class='add'>+	static char tmp[17];</div><div class='ctx'> 	char *p = tmp;</div><div class='del'>-	memcpy(tmp, name, 8);</div><div class='del'>-	tmp[8] = '\0';</div><div class='del'>-	while (*p &amp;&amp; (!isspace(*p)))</div><div class='add'>+	memcpy(tmp, name, len);</div><div class='add'>+	tmp[len] = '\0';</div><div class='add'>+	while (*p &amp;&amp; ((p - tmp) &lt; len) &amp;&amp; (!isspace(*p)))</div><div class='ctx'> 		p++;</div><div class='ctx'> 	*p = '\0';</div><div class='ctx'> 	return tmp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static char *netiucv_printuser(struct iucv_connection *conn)</div><div class='add'>+{</div><div class='add'>+	static char tmp_uid[9];</div><div class='add'>+	static char tmp_udat[17];</div><div class='add'>+	static char buf[100];</div><div class='add'>+</div><div class='add'>+	if (memcmp(conn-&gt;userdata, iucvMagic_ebcdic, 16)) {</div><div class='add'>+		tmp_uid[8] = '\0';</div><div class='add'>+		tmp_udat[16] = '\0';</div><div class='add'>+		memcpy(tmp_uid, conn-&gt;userid, 8);</div><div class='add'>+		memcpy(tmp_uid, netiucv_printname(tmp_uid, 8), 8);</div><div class='add'>+		memcpy(tmp_udat, conn-&gt;userdata, 16);</div><div class='add'>+		EBCASC(tmp_udat, 16);</div><div class='add'>+		memcpy(tmp_udat, netiucv_printname(tmp_udat, 16), 16);</div><div class='add'>+		sprintf(buf, "%s.%s", tmp_uid, tmp_udat);</div><div class='add'>+		return buf;</div><div class='add'>+	} else</div><div class='add'>+		return netiucv_printname(conn-&gt;userid, 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * States of the interface statemachine.</div><div class='ctx'>  */</div><div class='hunk'>@@ -563,15 +590,18 @@ static int netiucv_callback_connreq(struct iucv_path *path,</div><div class='ctx'> {</div><div class='ctx'> 	struct iucv_connection *conn = path-&gt;private;</div><div class='ctx'> 	struct iucv_event ev;</div><div class='add'>+	static char tmp_user[9];</div><div class='add'>+	static char tmp_udat[17];</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (memcmp(iucvMagic, ipuser, 16))</div><div class='del'>-		/* ipuser must match iucvMagic. */</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> 	rc = -EINVAL;</div><div class='add'>+	memcpy(tmp_user, netiucv_printname(ipvmid, 8), 8);</div><div class='add'>+	memcpy(tmp_udat, ipuser, 16);</div><div class='add'>+	EBCASC(tmp_udat, 16);</div><div class='ctx'> 	read_lock_bh(&amp;iucv_connection_rwlock);</div><div class='ctx'> 	list_for_each_entry(conn, &amp;iucv_connection_list, list) {</div><div class='del'>-		if (strncmp(ipvmid, conn-&gt;userid, 8))</div><div class='add'>+		if (strncmp(ipvmid, conn-&gt;userid, 8) ||</div><div class='add'>+		    strncmp(ipuser, conn-&gt;userdata, 16))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		/* Found a matching connection for this path. */</div><div class='ctx'> 		conn-&gt;path = path;</div><div class='hunk'>@@ -580,6 +610,8 @@ static int netiucv_callback_connreq(struct iucv_path *path,</div><div class='ctx'> 		fsm_event(conn-&gt;fsm, CONN_EVENT_CONN_REQ, &amp;ev);</div><div class='ctx'> 		rc = 0;</div><div class='ctx'> 	}</div><div class='add'>+	IUCV_DBF_TEXT_(setup, 2, "Connection requested for %s.%s\n",</div><div class='add'>+		       tmp_user, netiucv_printname(tmp_udat, 16));</div><div class='ctx'> 	read_unlock_bh(&amp;iucv_connection_rwlock);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -816,7 +848,7 @@ static void conn_action_connaccept(fsm_instance *fi, int event, void *arg)</div><div class='ctx'> 	conn-&gt;path = path;</div><div class='ctx'> 	path-&gt;msglim = NETIUCV_QUEUELEN_DEFAULT;</div><div class='ctx'> 	path-&gt;flags = 0;</div><div class='del'>-	rc = iucv_path_accept(path, &amp;netiucv_handler, NULL, conn);</div><div class='add'>+	rc = iucv_path_accept(path, &amp;netiucv_handler, conn-&gt;userdata , conn);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		IUCV_DBF_TEXT_(setup, 2, "rc %d from iucv_accept", rc);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -854,7 +886,7 @@ static void conn_action_conntimsev(fsm_instance *fi, int event, void *arg)</div><div class='ctx'> </div><div class='ctx'> 	IUCV_DBF_TEXT(trace, 3, __func__);</div><div class='ctx'> 	fsm_deltimer(&amp;conn-&gt;timer);</div><div class='del'>-	iucv_path_sever(conn-&gt;path, NULL);</div><div class='add'>+	iucv_path_sever(conn-&gt;path, conn-&gt;userdata);</div><div class='ctx'> 	fsm_newstate(fi, CONN_STATE_STARTWAIT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -867,9 +899,9 @@ static void conn_action_connsever(fsm_instance *fi, int event, void *arg)</div><div class='ctx'> 	IUCV_DBF_TEXT(trace, 3, __func__);</div><div class='ctx'> </div><div class='ctx'> 	fsm_deltimer(&amp;conn-&gt;timer);</div><div class='del'>-	iucv_path_sever(conn-&gt;path, NULL);</div><div class='del'>-	dev_info(privptr-&gt;dev, "The peer interface of the IUCV device"</div><div class='del'>-		" has closed the connection\n");</div><div class='add'>+	iucv_path_sever(conn-&gt;path, conn-&gt;userdata);</div><div class='add'>+	dev_info(privptr-&gt;dev, "The peer z/VM guest %s has closed the "</div><div class='add'>+			       "connection\n", netiucv_printuser(conn));</div><div class='ctx'> 	IUCV_DBF_TEXT(data, 2,</div><div class='ctx'> 		      "conn_action_connsever: Remote dropped connection\n");</div><div class='ctx'> 	fsm_newstate(fi, CONN_STATE_STARTWAIT);</div><div class='hunk'>@@ -886,8 +918,6 @@ static void conn_action_start(fsm_instance *fi, int event, void *arg)</div><div class='ctx'> 	IUCV_DBF_TEXT(trace, 3, __func__);</div><div class='ctx'> </div><div class='ctx'> 	fsm_newstate(fi, CONN_STATE_STARTWAIT);</div><div class='del'>-	IUCV_DBF_TEXT_(setup, 2, "%s('%s'): connecting ...\n",</div><div class='del'>-		netdev-&gt;name, conn-&gt;userid);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We must set the state before calling iucv_connect because the</div><div class='hunk'>@@ -897,8 +927,11 @@ static void conn_action_start(fsm_instance *fi, int event, void *arg)</div><div class='ctx'> </div><div class='ctx'> 	fsm_newstate(fi, CONN_STATE_SETUPWAIT);</div><div class='ctx'> 	conn-&gt;path = iucv_path_alloc(NETIUCV_QUEUELEN_DEFAULT, 0, GFP_KERNEL);</div><div class='add'>+	IUCV_DBF_TEXT_(setup, 2, "%s: connecting to %s ...\n",</div><div class='add'>+		netdev-&gt;name, netiucv_printuser(conn));</div><div class='add'>+</div><div class='ctx'> 	rc = iucv_path_connect(conn-&gt;path, &amp;netiucv_handler, conn-&gt;userid,</div><div class='del'>-			       NULL, iucvMagic, conn);</div><div class='add'>+			       NULL, conn-&gt;userdata, conn);</div><div class='ctx'> 	switch (rc) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		netdev-&gt;tx_queue_len = conn-&gt;path-&gt;msglim;</div><div class='hunk'>@@ -908,13 +941,13 @@ static void conn_action_start(fsm_instance *fi, int event, void *arg)</div><div class='ctx'> 	case 11:</div><div class='ctx'> 		dev_warn(privptr-&gt;dev,</div><div class='ctx'> 			"The IUCV device failed to connect to z/VM guest %s\n",</div><div class='del'>-			netiucv_printname(conn-&gt;userid));</div><div class='add'>+			netiucv_printname(conn-&gt;userid, 8));</div><div class='ctx'> 		fsm_newstate(fi, CONN_STATE_STARTWAIT);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 12:</div><div class='ctx'> 		dev_warn(privptr-&gt;dev,</div><div class='ctx'> 			"The IUCV device failed to connect to the peer on z/VM"</div><div class='del'>-			" guest %s\n", netiucv_printname(conn-&gt;userid));</div><div class='add'>+			" guest %s\n", netiucv_printname(conn-&gt;userid, 8));</div><div class='ctx'> 		fsm_newstate(fi, CONN_STATE_STARTWAIT);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 13:</div><div class='hunk'>@@ -927,7 +960,7 @@ static void conn_action_start(fsm_instance *fi, int event, void *arg)</div><div class='ctx'> 		dev_err(privptr-&gt;dev,</div><div class='ctx'> 			"z/VM guest %s has too many IUCV connections"</div><div class='ctx'> 			" to connect with the IUCV device\n",</div><div class='del'>-			netiucv_printname(conn-&gt;userid));</div><div class='add'>+			netiucv_printname(conn-&gt;userid, 8));</div><div class='ctx'> 		fsm_newstate(fi, CONN_STATE_CONNERR);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 15:</div><div class='hunk'>@@ -972,7 +1005,7 @@ static void conn_action_stop(fsm_instance *fi, int event, void *arg)</div><div class='ctx'> 	netiucv_purge_skb_queue(&amp;conn-&gt;collect_queue);</div><div class='ctx'> 	if (conn-&gt;path) {</div><div class='ctx'> 		IUCV_DBF_TEXT(trace, 5, "calling iucv_path_sever\n");</div><div class='del'>-		iucv_path_sever(conn-&gt;path, iucvMagic);</div><div class='add'>+		iucv_path_sever(conn-&gt;path, conn-&gt;userdata);</div><div class='ctx'> 		kfree(conn-&gt;path);</div><div class='ctx'> 		conn-&gt;path = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1090,7 +1123,8 @@ dev_action_connup(fsm_instance *fi, int event, void *arg)</div><div class='ctx'> 			fsm_newstate(fi, DEV_STATE_RUNNING);</div><div class='ctx'> 			dev_info(privptr-&gt;dev,</div><div class='ctx'> 				"The IUCV device has been connected"</div><div class='del'>-				" successfully to %s\n", privptr-&gt;conn-&gt;userid);</div><div class='add'>+				" successfully to %s\n",</div><div class='add'>+				netiucv_printuser(privptr-&gt;conn));</div><div class='ctx'> 			IUCV_DBF_TEXT(setup, 3,</div><div class='ctx'> 				"connection is up and running\n");</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1452,45 +1486,72 @@ static ssize_t user_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct netiucv_priv *priv = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	IUCV_DBF_TEXT(trace, 5, __func__);</div><div class='del'>-	return sprintf(buf, "%s\n", netiucv_printname(priv-&gt;conn-&gt;userid));</div><div class='add'>+	return sprintf(buf, "%s\n", netiucv_printuser(priv-&gt;conn));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t user_write(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			  const char *buf, size_t count)</div><div class='add'>+static int netiucv_check_user(const char *buf, size_t count, char *username,</div><div class='add'>+			      char *userdata)</div><div class='ctx'> {</div><div class='del'>-	struct netiucv_priv *priv = dev_get_drvdata(dev);</div><div class='del'>-	struct net_device *ndev = priv-&gt;conn-&gt;netdev;</div><div class='del'>-	char    *p;</div><div class='del'>-	char    *tmp;</div><div class='del'>-	char 	username[9];</div><div class='del'>-	int 	i;</div><div class='del'>-	struct iucv_connection *cp;</div><div class='add'>+	const char *p;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	IUCV_DBF_TEXT(trace, 3, __func__);</div><div class='del'>-	if (count &gt; 9) {</div><div class='del'>-		IUCV_DBF_TEXT_(setup, 2,</div><div class='del'>-			       "%d is length of username\n", (int) count);</div><div class='add'>+	p = strchr(buf, '.');</div><div class='add'>+	if ((p &amp;&amp; ((count &gt; 26) ||</div><div class='add'>+		   ((p - buf) &gt; 8) ||</div><div class='add'>+		   (buf + count - p &gt; 18))) ||</div><div class='add'>+	    (!p &amp;&amp; (count &gt; 9))) {</div><div class='add'>+		IUCV_DBF_TEXT(setup, 2, "conn_write: too long\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tmp = strsep((char **) &amp;buf, "\n");</div><div class='del'>-	for (i = 0, p = tmp; i &lt; 8 &amp;&amp; *p; i++, p++) {</div><div class='del'>-		if (isalnum(*p) || (*p == '$')) {</div><div class='del'>-			username[i]= toupper(*p);</div><div class='add'>+	for (i = 0, p = buf; i &lt; 8 &amp;&amp; *p &amp;&amp; *p != '.'; i++, p++) {</div><div class='add'>+		if (isalnum(*p) || *p == '$') {</div><div class='add'>+			username[i] = toupper(*p);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		if (*p == '\n') {</div><div class='add'>+		if (*p == '\n')</div><div class='ctx'> 			/* trailing lf, grr */</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> 		IUCV_DBF_TEXT_(setup, 2,</div><div class='del'>-			       "username: invalid character %c\n", *p);</div><div class='add'>+			       "conn_write: invalid character %02x\n", *p);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	while (i &lt; 8)</div><div class='ctx'> 		username[i++] = ' ';</div><div class='ctx'> 	username[8] = '\0';</div><div class='ctx'> </div><div class='add'>+	if (*p == '.') {</div><div class='add'>+		p++;</div><div class='add'>+		for (i = 0; i &lt; 16 &amp;&amp; *p; i++, p++) {</div><div class='add'>+			if (*p == '\n')</div><div class='add'>+				break;</div><div class='add'>+			userdata[i] = toupper(*p);</div><div class='add'>+		}</div><div class='add'>+		while (i &gt; 0 &amp;&amp; i &lt; 16)</div><div class='add'>+			userdata[i++] = ' ';</div><div class='add'>+	} else</div><div class='add'>+		memcpy(userdata, iucvMagic_ascii, 16);</div><div class='add'>+	userdata[16] = '\0';</div><div class='add'>+	ASCEBC(userdata, 16);</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 user_write(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 netiucv_priv *priv = dev_get_drvdata(dev);</div><div class='add'>+	struct net_device *ndev = priv-&gt;conn-&gt;netdev;</div><div class='add'>+	char	username[9];</div><div class='add'>+	char	userdata[17];</div><div class='add'>+	int	rc;</div><div class='add'>+	struct iucv_connection *cp;</div><div class='add'>+</div><div class='add'>+	IUCV_DBF_TEXT(trace, 3, __func__);</div><div class='add'>+	rc = netiucv_check_user(buf, count, username, userdata);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='ctx'> 	if (memcmp(username, priv-&gt;conn-&gt;userid, 9) &amp;&amp;</div><div class='ctx'> 	    (ndev-&gt;flags &amp; (IFF_UP | IFF_RUNNING))) {</div><div class='ctx'> 		/* username changed while the interface is active. */</div><div class='hunk'>@@ -1499,15 +1560,17 @@ static ssize_t user_write(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	}</div><div class='ctx'> 	read_lock_bh(&amp;iucv_connection_rwlock);</div><div class='ctx'> 	list_for_each_entry(cp, &amp;iucv_connection_list, list) {</div><div class='del'>-		if (!strncmp(username, cp-&gt;userid, 9) &amp;&amp; cp-&gt;netdev != ndev) {</div><div class='add'>+		if (!strncmp(username, cp-&gt;userid, 9) &amp;&amp;</div><div class='add'>+		   !strncmp(userdata, cp-&gt;userdata, 17) &amp;&amp; cp-&gt;netdev != ndev) {</div><div class='ctx'> 			read_unlock_bh(&amp;iucv_connection_rwlock);</div><div class='del'>-			IUCV_DBF_TEXT_(setup, 2, "user_write: Connection "</div><div class='del'>-				"to %s already exists\n", username);</div><div class='add'>+			IUCV_DBF_TEXT_(setup, 2, "user_write: Connection to %s "</div><div class='add'>+				"already exists\n", netiucv_printuser(cp));</div><div class='ctx'> 			return -EEXIST;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	read_unlock_bh(&amp;iucv_connection_rwlock);</div><div class='ctx'> 	memcpy(priv-&gt;conn-&gt;userid, username, 9);</div><div class='add'>+	memcpy(priv-&gt;conn-&gt;userdata, userdata, 17);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1537,7 +1600,8 @@ static ssize_t buffer_write (struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	bs1 = simple_strtoul(buf, &amp;e, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (e &amp;&amp; (!isspace(*e))) {</div><div class='del'>-		IUCV_DBF_TEXT_(setup, 2, "buffer_write: invalid char %c\n", *e);</div><div class='add'>+		IUCV_DBF_TEXT_(setup, 2, "buffer_write: invalid char %02x\n",</div><div class='add'>+			*e);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (bs1 &gt; NETIUCV_BUFSIZE_MAX) {</div><div class='hunk'>@@ -1864,7 +1928,8 @@ static void netiucv_unregister_device(struct device *dev)</div><div class='ctx'>  * Add it to the list of netiucv connections;</div><div class='ctx'>  */</div><div class='ctx'> static struct iucv_connection *netiucv_new_connection(struct net_device *dev,</div><div class='del'>-						      char *username)</div><div class='add'>+						      char *username,</div><div class='add'>+						      char *userdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct iucv_connection *conn;</div><div class='ctx'> </div><div class='hunk'>@@ -1893,6 +1958,8 @@ static struct iucv_connection *netiucv_new_connection(struct net_device *dev,</div><div class='ctx'> 	fsm_settimer(conn-&gt;fsm, &amp;conn-&gt;timer);</div><div class='ctx'> 	fsm_newstate(conn-&gt;fsm, CONN_STATE_INVALID);</div><div class='ctx'> </div><div class='add'>+	if (userdata)</div><div class='add'>+		memcpy(conn-&gt;userdata, userdata, 17);</div><div class='ctx'> 	if (username) {</div><div class='ctx'> 		memcpy(conn-&gt;userid, username, 9);</div><div class='ctx'> 		fsm_newstate(conn-&gt;fsm, CONN_STATE_STOPPED);</div><div class='hunk'>@@ -1919,6 +1986,7 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> static void netiucv_remove_connection(struct iucv_connection *conn)</div><div class='ctx'> {</div><div class='add'>+</div><div class='ctx'> 	IUCV_DBF_TEXT(trace, 3, __func__);</div><div class='ctx'> 	write_lock_bh(&amp;iucv_connection_rwlock);</div><div class='ctx'> 	list_del_init(&amp;conn-&gt;list);</div><div class='hunk'>@@ -1926,7 +1994,7 @@ static void netiucv_remove_connection(struct iucv_connection *conn)</div><div class='ctx'> 	fsm_deltimer(&amp;conn-&gt;timer);</div><div class='ctx'> 	netiucv_purge_skb_queue(&amp;conn-&gt;collect_queue);</div><div class='ctx'> 	if (conn-&gt;path) {</div><div class='del'>-		iucv_path_sever(conn-&gt;path, iucvMagic);</div><div class='add'>+		iucv_path_sever(conn-&gt;path, conn-&gt;userdata);</div><div class='ctx'> 		kfree(conn-&gt;path);</div><div class='ctx'> 		conn-&gt;path = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1985,7 +2053,7 @@ static void netiucv_setup_netdevice(struct net_device *dev)</div><div class='ctx'> /**</div><div class='ctx'>  * Allocate and initialize everything of a net device.</div><div class='ctx'>  */</div><div class='del'>-static struct net_device *netiucv_init_netdevice(char *username)</div><div class='add'>+static struct net_device *netiucv_init_netdevice(char *username, char *userdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct netiucv_priv *privptr;</div><div class='ctx'> 	struct net_device *dev;</div><div class='hunk'>@@ -2004,7 +2072,7 @@ static struct net_device *netiucv_init_netdevice(char *username)</div><div class='ctx'> 	if (!privptr-&gt;fsm)</div><div class='ctx'> 		goto out_netdev;</div><div class='ctx'> </div><div class='del'>-	privptr-&gt;conn = netiucv_new_connection(dev, username);</div><div class='add'>+	privptr-&gt;conn = netiucv_new_connection(dev, username, userdata);</div><div class='ctx'> 	if (!privptr-&gt;conn) {</div><div class='ctx'> 		IUCV_DBF_TEXT(setup, 2, "NULL from netiucv_new_connection\n");</div><div class='ctx'> 		goto out_fsm;</div><div class='hunk'>@@ -2022,47 +2090,31 @@ out_netdev:</div><div class='ctx'> static ssize_t conn_write(struct device_driver *drv,</div><div class='ctx'> 			  const char *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	const char *p;</div><div class='ctx'> 	char username[9];</div><div class='del'>-	int i, rc;</div><div class='add'>+	char userdata[17];</div><div class='add'>+	int rc;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct netiucv_priv *priv;</div><div class='ctx'> 	struct iucv_connection *cp;</div><div class='ctx'> </div><div class='ctx'> 	IUCV_DBF_TEXT(trace, 3, __func__);</div><div class='del'>-	if (count&gt;9) {</div><div class='del'>-		IUCV_DBF_TEXT(setup, 2, "conn_write: too long\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0, p = buf; i &lt; 8 &amp;&amp; *p; i++, p++) {</div><div class='del'>-		if (isalnum(*p) || *p == '$') {</div><div class='del'>-			username[i] = toupper(*p);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (*p == '\n')</div><div class='del'>-			/* trailing lf, grr */</div><div class='del'>-			break;</div><div class='del'>-		IUCV_DBF_TEXT_(setup, 2,</div><div class='del'>-			       "conn_write: invalid character %c\n", *p);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	while (i &lt; 8)</div><div class='del'>-		username[i++] = ' ';</div><div class='del'>-	username[8] = '\0';</div><div class='add'>+	rc = netiucv_check_user(buf, count, username, userdata);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	read_lock_bh(&amp;iucv_connection_rwlock);</div><div class='ctx'> 	list_for_each_entry(cp, &amp;iucv_connection_list, list) {</div><div class='del'>-		if (!strncmp(username, cp-&gt;userid, 9)) {</div><div class='add'>+		if (!strncmp(username, cp-&gt;userid, 9) &amp;&amp;</div><div class='add'>+		    !strncmp(userdata, cp-&gt;userdata, 17)) {</div><div class='ctx'> 			read_unlock_bh(&amp;iucv_connection_rwlock);</div><div class='del'>-			IUCV_DBF_TEXT_(setup, 2, "conn_write: Connection "</div><div class='del'>-				"to %s already exists\n", username);</div><div class='add'>+			IUCV_DBF_TEXT_(setup, 2, "conn_write: Connection to %s "</div><div class='add'>+				"already exists\n", netiucv_printuser(cp));</div><div class='ctx'> 			return -EEXIST;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	read_unlock_bh(&amp;iucv_connection_rwlock);</div><div class='ctx'> </div><div class='del'>-	dev = netiucv_init_netdevice(username);</div><div class='add'>+	dev = netiucv_init_netdevice(username, userdata);</div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		IUCV_DBF_TEXT(setup, 2, "NULL from netiucv_init_netdevice\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -2083,8 +2135,9 @@ static ssize_t conn_write(struct device_driver *drv,</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto out_unreg;</div><div class='ctx'> </div><div class='del'>-	dev_info(priv-&gt;dev, "The IUCV interface to %s has been"</div><div class='del'>-		" established successfully\n", netiucv_printname(username));</div><div class='add'>+	dev_info(priv-&gt;dev, "The IUCV interface to %s has been established "</div><div class='add'>+			    "successfully\n",</div><div class='add'>+		netiucv_printuser(priv-&gt;conn));</div><div class='ctx'> </div><div class='ctx'> 	return count;</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 fff57de78943..9c3f38da4c01 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/qeth_core_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/net/qeth_core_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/net/qeth_core_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/s390/net/qeth_core_main.c</a></div><div class='hunk'>@@ -66,7 +66,7 @@ static void qeth_release_skbs(struct qeth_qdio_out_buffer *buf);</div><div class='ctx'> static void qeth_clear_output_buffer(struct qeth_qdio_out_q *queue,</div><div class='ctx'> 		struct qeth_qdio_out_buffer *buf,</div><div class='ctx'> 		enum qeth_qdio_buffer_states newbufstate);</div><div class='del'>-</div><div class='add'>+static int qeth_init_qdio_out_buf(struct qeth_qdio_out_q *, int);</div><div class='ctx'> </div><div class='ctx'> static inline const char *qeth_get_cardname(struct qeth_card *card)</div><div class='ctx'> {</div><div class='hunk'>@@ -363,6 +363,9 @@ static inline enum iucv_tx_notify qeth_compute_cq_notification(int sbalf15,</div><div class='ctx'> static inline void qeth_cleanup_handled_pending(struct qeth_qdio_out_q *q,</div><div class='ctx'> 	int bidx, int forced_cleanup)</div><div class='ctx'> {</div><div class='add'>+	if (q-&gt;card-&gt;options.cq != QETH_CQ_ENABLED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (q-&gt;bufs[bidx]-&gt;next_pending != NULL) {</div><div class='ctx'> 		struct qeth_qdio_out_buffer *head = q-&gt;bufs[bidx];</div><div class='ctx'> 		struct qeth_qdio_out_buffer *c = q-&gt;bufs[bidx]-&gt;next_pending;</div><div class='hunk'>@@ -390,6 +393,13 @@ static inline void qeth_cleanup_handled_pending(struct qeth_qdio_out_q *q,</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	if (forced_cleanup &amp;&amp; (atomic_read(&amp;(q-&gt;bufs[bidx]-&gt;state)) ==</div><div class='add'>+					QETH_QDIO_BUF_HANDLED_DELAYED)) {</div><div class='add'>+		/* for recovery situations */</div><div class='add'>+		q-&gt;bufs[bidx]-&gt;aob = q-&gt;bufstates[bidx].aob;</div><div class='add'>+		qeth_init_qdio_out_buf(q, bidx);</div><div class='add'>+		QETH_CARD_TEXT(q-&gt;card, 2, "clprecov");</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -412,7 +422,6 @@ static inline void qeth_qdio_handle_aob(struct qeth_card *card,</div><div class='ctx'> 		notification = TX_NOTIFY_OK;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		BUG_ON(atomic_read(&amp;buffer-&gt;state) != QETH_QDIO_BUF_PENDING);</div><div class='del'>-</div><div class='ctx'> 		atomic_set(&amp;buffer-&gt;state, QETH_QDIO_BUF_IN_CQ);</div><div class='ctx'> 		notification = TX_NOTIFY_DELAYED_OK;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -425,7 +434,8 @@ static inline void qeth_qdio_handle_aob(struct qeth_card *card,</div><div class='ctx'> </div><div class='ctx'> 	buffer-&gt;aob = NULL;</div><div class='ctx'> 	qeth_clear_output_buffer(buffer-&gt;q, buffer,</div><div class='del'>-				QETH_QDIO_BUF_HANDLED_DELAYED);</div><div class='add'>+				 QETH_QDIO_BUF_HANDLED_DELAYED);</div><div class='add'>+</div><div class='ctx'> 	/* from here on: do not touch buffer anymore */</div><div class='ctx'> 	qdio_release_aob(aob);</div><div class='ctx'> }</div><div class='hunk'>@@ -1113,11 +1123,25 @@ out:</div><div class='ctx'> static void qeth_release_skbs(struct qeth_qdio_out_buffer *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	struct iucv_sock *iucv;</div><div class='add'>+	int notify_general_error = 0;</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;buf-&gt;state) == QETH_QDIO_BUF_PENDING)</div><div class='add'>+		notify_general_error = 1;</div><div class='add'>+</div><div class='add'>+	/* release may never happen from within CQ tasklet scope */</div><div class='add'>+	BUG_ON(atomic_read(&amp;buf-&gt;state) == QETH_QDIO_BUF_IN_CQ);</div><div class='ctx'> </div><div class='ctx'> 	skb = skb_dequeue(&amp;buf-&gt;skb_list);</div><div class='ctx'> 	while (skb) {</div><div class='ctx'> 		QETH_CARD_TEXT(buf-&gt;q-&gt;card, 5, "skbr");</div><div class='ctx'> 		QETH_CARD_TEXT_(buf-&gt;q-&gt;card, 5, "%lx", (long) skb);</div><div class='add'>+		if (notify_general_error &amp;&amp; skb-&gt;protocol == ETH_P_AF_IUCV) {</div><div class='add'>+			if (skb-&gt;sk) {</div><div class='add'>+				iucv = iucv_sk(skb-&gt;sk);</div><div class='add'>+				iucv-&gt;sk_txnotify(skb, TX_NOTIFY_GENERALERROR);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		atomic_dec(&amp;skb-&gt;users);</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='ctx'> 		skb = skb_dequeue(&amp;buf-&gt;skb_list);</div><div class='hunk'>@@ -1160,7 +1184,7 @@ static void qeth_clear_outq_buffers(struct qeth_qdio_out_q *q, int free)</div><div class='ctx'> 	for (j = 0; j &lt; QDIO_MAX_BUFFERS_PER_Q; ++j) {</div><div class='ctx'> 		if (!q-&gt;bufs[j])</div><div class='ctx'> 			continue;</div><div class='del'>-		qeth_cleanup_handled_pending(q, j, free);</div><div class='add'>+		qeth_cleanup_handled_pending(q, j, 1);</div><div class='ctx'> 		qeth_clear_output_buffer(q, q-&gt;bufs[j], QETH_QDIO_BUF_EMPTY);</div><div class='ctx'> 		if (free) {</div><div class='ctx'> 			kmem_cache_free(qeth_qdio_outbuf_cache, q-&gt;bufs[j]);</div><div class='hunk'>@@ -1207,7 +1231,7 @@ static void qeth_free_qdio_buffers(struct qeth_card *card)</div><div class='ctx'> 	qeth_free_cq(card);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;card-&gt;buffer_reclaim_work);</div><div class='ctx'> 	for (j = 0; j &lt; QDIO_MAX_BUFFERS_PER_Q; ++j)</div><div class='del'>-		kfree_skb(card-&gt;qdio.in_q-&gt;bufs[j].rx_skb);</div><div class='add'>+		dev_kfree_skb_any(card-&gt;qdio.in_q-&gt;bufs[j].rx_skb);</div><div class='ctx'> 	kfree(card-&gt;qdio.in_q);</div><div class='ctx'> 	card-&gt;qdio.in_q = NULL;</div><div class='ctx'> 	/* inbound buffer pool */</div><div class='hunk'>@@ -1329,6 +1353,7 @@ static int qeth_do_start_thread(struct qeth_card *card, unsigned long thread)</div><div class='ctx'> </div><div class='ctx'> static void qeth_start_kernel_thread(struct work_struct *work)</div><div class='ctx'> {</div><div class='add'>+	struct task_struct *ts;</div><div class='ctx'> 	struct qeth_card *card = container_of(work, struct qeth_card,</div><div class='ctx'> 					kernel_thread_starter);</div><div class='ctx'> 	QETH_CARD_TEXT(card , 2, "strthrd");</div><div class='hunk'>@@ -1336,9 +1361,15 @@ static void qeth_start_kernel_thread(struct work_struct *work)</div><div class='ctx'> 	if (card-&gt;read.state != CH_STATE_UP &amp;&amp;</div><div class='ctx'> 	    card-&gt;write.state != CH_STATE_UP)</div><div class='ctx'> 		return;</div><div class='del'>-	if (qeth_do_start_thread(card, QETH_RECOVER_THREAD))</div><div class='del'>-		kthread_run(card-&gt;discipline.recover, (void *) card,</div><div class='add'>+	if (qeth_do_start_thread(card, QETH_RECOVER_THREAD)) {</div><div class='add'>+		ts = kthread_run(card-&gt;discipline.recover, (void *)card,</div><div class='ctx'> 				"qeth_recover");</div><div class='add'>+		if (IS_ERR(ts)) {</div><div class='add'>+			qeth_clear_thread_start_bit(card, QETH_RECOVER_THREAD);</div><div class='add'>+			qeth_clear_thread_running_bit(card,</div><div class='add'>+				QETH_RECOVER_THREAD);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int qeth_setup_card(struct qeth_card *card)</div><div class='hunk'>@@ -4521,7 +4552,7 @@ static int qeth_qdio_establish(struct qeth_card *card)</div><div class='ctx'> 	init_data.no_output_qs           = card-&gt;qdio.no_out_queues;</div><div class='ctx'> 	init_data.input_handler          = card-&gt;discipline.input_handler;</div><div class='ctx'> 	init_data.output_handler         = card-&gt;discipline.output_handler;</div><div class='del'>-	init_data.queue_start_poll       = queue_start_poll;</div><div class='add'>+	init_data.queue_start_poll_array = queue_start_poll;</div><div class='ctx'> 	init_data.int_parm               = (unsigned long) card;</div><div class='ctx'> 	init_data.input_sbal_addr_array  = (void **) in_sbal_ptrs;</div><div class='ctx'> 	init_data.output_sbal_addr_array = (void **) out_sbal_ptrs;</div><div class='head'>diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c<br/>index a21ae3d549db..c12967133114 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/qeth_l2_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/net/qeth_l2_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/net/qeth_l2_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/s390/net/qeth_l2_main.c</a></div><div class='hunk'>@@ -301,21 +301,21 @@ static void qeth_l2_process_vlans(struct qeth_card *card)</div><div class='ctx'> 	spin_unlock_bh(&amp;card-&gt;vlanlock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void qeth_l2_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='add'>+static int qeth_l2_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_card *card = dev-&gt;ml_priv;</div><div class='ctx'> 	struct qeth_vlan_vid *id;</div><div class='ctx'> </div><div class='ctx'> 	QETH_CARD_TEXT_(card, 4, "aid:%d", vid);</div><div class='ctx'> 	if (!vid)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	if (card-&gt;info.type == QETH_CARD_TYPE_OSM) {</div><div class='ctx'> 		QETH_CARD_TEXT(card, 3, "aidOSM");</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {</div><div class='ctx'> 		QETH_CARD_TEXT(card, 3, "aidREC");</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	id = kmalloc(sizeof(struct qeth_vlan_vid), GFP_ATOMIC);</div><div class='ctx'> 	if (id) {</div><div class='hunk'>@@ -324,10 +324,13 @@ static void qeth_l2_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> 		spin_lock_bh(&amp;card-&gt;vlanlock);</div><div class='ctx'> 		list_add_tail(&amp;id-&gt;list, &amp;card-&gt;vid_list);</div><div class='ctx'> 		spin_unlock_bh(&amp;card-&gt;vlanlock);</div><div class='add'>+	} else {</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void qeth_l2_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='add'>+static int qeth_l2_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_vlan_vid *id, *tmpid = NULL;</div><div class='ctx'> 	struct qeth_card *card = dev-&gt;ml_priv;</div><div class='hunk'>@@ -335,11 +338,11 @@ static void qeth_l2_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> 	QETH_CARD_TEXT_(card, 4, "kid:%d", vid);</div><div class='ctx'> 	if (card-&gt;info.type == QETH_CARD_TYPE_OSM) {</div><div class='ctx'> 		QETH_CARD_TEXT(card, 3, "kidOSM");</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {</div><div class='ctx'> 		QETH_CARD_TEXT(card, 3, "kidREC");</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_lock_bh(&amp;card-&gt;vlanlock);</div><div class='ctx'> 	list_for_each_entry(id, &amp;card-&gt;vid_list, list) {</div><div class='hunk'>@@ -355,6 +358,7 @@ static void qeth_l2_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> 		kfree(tmpid);</div><div class='ctx'> 	}</div><div class='ctx'> 	qeth_l2_set_multicast_list(card-&gt;dev);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int qeth_l2_stop_card(struct qeth_card *card, int recovery_mode)</div><div class='hunk'>@@ -1169,6 +1173,7 @@ static void __exit qeth_l2_exit(void)</div><div class='ctx'> static void qeth_l2_shutdown(struct ccwgroup_device *gdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_card *card = dev_get_drvdata(&amp;gdev-&gt;dev);</div><div class='add'>+	qeth_set_allowed_threads(card, 0, 1);</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='head'>diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c<br/>index 4d5307ddbe55..9648e4e68337 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/qeth_l3_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/s390/net/qeth_l3_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/net/qeth_l3_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/s390/net/qeth_l3_main.c</a></div><div class='hunk'>@@ -1869,15 +1869,15 @@ static void qeth_l3_free_vlan_addresses(struct qeth_card *card,</div><div class='ctx'> 	qeth_l3_free_vlan_addresses6(card, vid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void qeth_l3_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='add'>+static int qeth_l3_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_card *card = dev-&gt;ml_priv;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(vid, card-&gt;active_vlans);</div><div class='del'>-	return;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void qeth_l3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='add'>+static int qeth_l3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_card *card = dev-&gt;ml_priv;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -1885,7 +1885,7 @@ static void qeth_l3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> 	QETH_CARD_TEXT_(card, 4, "kid:%d", vid);</div><div class='ctx'> 	if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {</div><div class='ctx'> 		QETH_CARD_TEXT(card, 3, "kidREC");</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_lock_irqsave(&amp;card-&gt;vlanlock, flags);</div><div class='ctx'> 	/* unregister IP addresses of vlan device */</div><div class='hunk'>@@ -1893,6 +1893,7 @@ static void qeth_l3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> 	clear_bit(vid, card-&gt;active_vlans);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;card-&gt;vlanlock, flags);</div><div class='ctx'> 	qeth_l3_set_multicast_list(card-&gt;dev);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int qeth_l3_rebuild_skb(struct qeth_card *card,</div><div class='hunk'>@@ -2759,7 +2760,7 @@ int inline qeth_l3_get_cast_type(struct qeth_card *card, struct sk_buff *skb)</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	dst = skb_dst(skb);</div><div class='ctx'> 	if (dst)</div><div class='del'>-		n = dst_get_neighbour(dst);</div><div class='add'>+		n = dst_get_neighbour_noref(dst);</div><div class='ctx'> 	if (n) {</div><div class='ctx'> 		cast_type = n-&gt;type;</div><div class='ctx'> 		rcu_read_unlock();</div><div class='hunk'>@@ -2855,7 +2856,7 @@ static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	dst = skb_dst(skb);</div><div class='ctx'> 	if (dst)</div><div class='del'>-		n = dst_get_neighbour(dst);</div><div class='add'>+		n = dst_get_neighbour_noref(dst);</div><div class='ctx'> 	if (ipv == 4) {</div><div class='ctx'> 		/* IPv4 */</div><div class='ctx'> 		hdr-&gt;hdr.l3.flags = qeth_l3_get_qeth_hdr_flags4(cast_type);</div><div class='hunk'>@@ -3209,7 +3210,8 @@ static int qeth_l3_stop(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 qeth_l3_fix_features(struct net_device *dev, u32 features)</div><div class='add'>+static netdev_features_t qeth_l3_fix_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_card *card = dev-&gt;ml_priv;</div><div class='ctx'> </div><div class='hunk'>@@ -3223,7 +3225,8 @@ static u32 qeth_l3_fix_features(struct net_device *dev, u32 features)</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int qeth_l3_set_features(struct net_device *dev, u32 features)</div><div class='add'>+static int qeth_l3_set_features(struct net_device *dev,</div><div class='add'>+	netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_card *card = dev-&gt;ml_priv;</div><div class='ctx'> 	u32 changed = dev-&gt;features ^ features;</div><div class='hunk'>@@ -3489,14 +3492,13 @@ contin:</div><div class='ctx'> 	else</div><div class='ctx'> 		netif_carrier_off(card-&gt;dev);</div><div class='ctx'> 	if (recover_flag == CARD_STATE_RECOVER) {</div><div class='add'>+		rtnl_lock();</div><div class='ctx'> 		if (recovery_mode)</div><div class='ctx'> 			__qeth_l3_open(card-&gt;dev);</div><div class='del'>-		else {</div><div class='del'>-			rtnl_lock();</div><div class='add'>+		else</div><div class='ctx'> 			dev_open(card-&gt;dev);</div><div class='del'>-			rtnl_unlock();</div><div class='del'>-		}</div><div class='ctx'> 		qeth_l3_set_multicast_list(card-&gt;dev);</div><div class='add'>+		rtnl_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> 	/* let user_space know that device is online */</div><div class='ctx'> 	kobject_uevent(&amp;gdev-&gt;dev.kobj, KOBJ_CHANGE);</div><div class='hunk'>@@ -3542,6 +3544,11 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev,</div><div class='ctx'> 		card-&gt;info.hwtrap = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	qeth_l3_stop_card(card, recovery_mode);</div><div class='add'>+	if ((card-&gt;options.cq == QETH_CQ_ENABLED) &amp;&amp; card-&gt;dev) {</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		call_netdevice_notifiers(NETDEV_REBOOT, card-&gt;dev);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+	}</div><div class='ctx'> 	rc  = ccw_device_set_offline(CARD_DDEV(card));</div><div class='ctx'> 	rc2 = ccw_device_set_offline(CARD_WDEV(card));</div><div class='ctx'> 	rc3 = ccw_device_set_offline(CARD_RDEV(card));</div><div class='hunk'>@@ -3596,6 +3603,7 @@ static int qeth_l3_recover(void *ptr)</div><div class='ctx'> static void qeth_l3_shutdown(struct ccwgroup_device *gdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_card *card = dev_get_drvdata(&amp;gdev-&gt;dev);</div><div class='add'>+	qeth_set_allowed_threads(card, 0, 1);</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='head'>diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig<br/>index 06ea3bcfdd2a..16570aa84aac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/Kconfig</a></div><div class='hunk'>@@ -830,16 +830,11 @@ config SCSI_ISCI</div><div class='ctx'> 	tristate "Intel(R) C600 Series Chipset SAS Controller"</div><div class='ctx'> 	depends on PCI &amp;&amp; SCSI</div><div class='ctx'> 	depends on X86</div><div class='del'>-	# (temporary): known alpha quality driver</div><div class='del'>-	depends on EXPERIMENTAL</div><div class='ctx'> 	select SCSI_SAS_LIBSAS</div><div class='del'>-	select SCSI_SAS_HOST_SMP</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This driver supports the 6Gb/s SAS capabilities of the storage</div><div class='ctx'> 	  control unit found in the Intel(R) C600 series chipset.</div><div class='ctx'> </div><div class='del'>-	  The experimental tag will be removed after the driver exits alpha</div><div class='del'>-</div><div class='ctx'> config SCSI_GENERIC_NCR5380</div><div class='ctx'> 	tristate "Generic NCR5380/53c400 SCSI PIO support"</div><div class='ctx'> 	depends on ISA &amp;&amp; SCSI</div><div class='head'>diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c<br/>index 8a0b33033177..0bd38da4ada0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/commctrl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/aacraid/commctrl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/commctrl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/aacraid/commctrl.c</a></div><div class='hunk'>@@ -650,6 +650,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)</div><div class='ctx'> 				     AAC_OPT_NEW_COMM) ?</div><div class='ctx'> 				      (dev-&gt;scsi_host_ptr-&gt;max_sectors &lt;&lt; 9) :</div><div class='ctx'> 				      65536)) {</div><div class='add'>+					kfree(usg);</div><div class='ctx'> 					rcode = -EINVAL;</div><div class='ctx'> 					goto cleanup;</div><div class='ctx'> 				}</div><div class='head'>diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c<br/>index 195823a51aab..ed119cedaae0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aha1542.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/aha1542.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aha1542.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/aha1542.c</a></div><div class='hunk'>@@ -102,7 +102,7 @@ static int setup_dmaspeed[MAXBOARDS] __initdata = { -1, -1, -1, -1 };</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #if defined(MODULE)</div><div class='del'>-static int isapnp = 0;</div><div class='add'>+static bool isapnp = 0;</div><div class='ctx'> static int aha1542[] = {0x330, 11, 4, -1};</div><div class='ctx'> module_param_array(aha1542, int, NULL, 0);</div><div class='ctx'> module_param(isapnp, bool, 0);</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm.c b/drivers/scsi/aic7xxx/aicasm/aicasm.c<br/>index e4a778720301..2e3117aa382f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aicasm/aicasm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/aic7xxx/aicasm/aicasm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aicasm/aicasm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/aic7xxx/aicasm/aicasm.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Aic7xxx SCSI host adapter firmware asssembler</div><div class='add'>+ * Aic7xxx SCSI host adapter firmware assembler</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 1997, 1998, 2000, 2001 Justin T. Gibbs.</div><div class='ctx'>  * Copyright (c) 2001, 2002 Adaptec Inc.</div><div class='head'>diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c<br/>index 8b002f6db6ca..33c8f09c7ac1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/be2iscsi/be_iscsi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/be2iscsi/be_iscsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/be2iscsi/be_iscsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/be2iscsi/be_iscsi.c</a></div><div class='hunk'>@@ -733,7 +733,7 @@ void beiscsi_ep_disconnect(struct iscsi_endpoint *ep)</div><div class='ctx'> 	iscsi_destroy_endpoint(beiscsi_ep-&gt;openiscsi_ep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-mode_t be2iscsi_attr_is_visible(int param_type, int param)</div><div class='add'>+umode_t be2iscsi_attr_is_visible(int param_type, int param)</div><div class='ctx'> {</div><div class='ctx'> 	switch (param_type) {</div><div class='ctx'> 	case ISCSI_HOST_PARAM:</div><div class='head'>diff --git a/drivers/scsi/be2iscsi/be_iscsi.h b/drivers/scsi/be2iscsi/be_iscsi.h<br/>index 4a1f2e393f31..5c45be134501 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/be2iscsi/be_iscsi.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/be2iscsi/be_iscsi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/be2iscsi/be_iscsi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/be2iscsi/be_iscsi.h</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #define BE2_IPV4  0x1</div><div class='ctx'> #define BE2_IPV6  0x10</div><div class='ctx'> </div><div class='del'>-mode_t be2iscsi_attr_is_visible(int param_type, int param);</div><div class='add'>+umode_t be2iscsi_attr_is_visible(int param_type, int param);</div><div class='ctx'> </div><div class='ctx'> void beiscsi_offload_connection(struct beiscsi_conn *beiscsi_conn,</div><div class='ctx'> 				struct beiscsi_offload_params *params);</div><div class='head'>diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c<br/>index 379c696dac19..375756fa95cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/be2iscsi/be_main.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/be2iscsi/be_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/be2iscsi/be_main.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/be2iscsi/be_main.c</a></div><div class='hunk'>@@ -325,9 +325,9 @@ static ssize_t beiscsi_show_boot_eth_info(void *data, int type, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static mode_t beiscsi_tgt_get_attr_visibility(void *data, int type)</div><div class='add'>+static umode_t beiscsi_tgt_get_attr_visibility(void *data, int type)</div><div class='ctx'> {</div><div class='del'>-	int rc;</div><div class='add'>+	umode_t rc;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case ISCSI_BOOT_TGT_NAME:</div><div class='hunk'>@@ -348,9 +348,9 @@ static mode_t beiscsi_tgt_get_attr_visibility(void *data, int type)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static mode_t beiscsi_ini_get_attr_visibility(void *data, int type)</div><div class='add'>+static umode_t beiscsi_ini_get_attr_visibility(void *data, int type)</div><div class='ctx'> {</div><div class='del'>-	int rc;</div><div class='add'>+	umode_t rc;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case ISCSI_BOOT_INI_INITIATOR_NAME:</div><div class='hunk'>@@ -364,9 +364,9 @@ static mode_t beiscsi_ini_get_attr_visibility(void *data, int type)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static mode_t beiscsi_eth_get_attr_visibility(void *data, int type)</div><div class='add'>+static umode_t beiscsi_eth_get_attr_visibility(void *data, int type)</div><div class='ctx'> {</div><div class='del'>-	int rc;</div><div class='add'>+	umode_t rc;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case ISCSI_BOOT_ETH_FLAGS:</div><div class='hunk'>@@ -1105,7 +1105,6 @@ be_complete_io(struct beiscsi_conn *beiscsi_conn,</div><div class='ctx'> 	struct be_status_bhs *sts_bhs =</div><div class='ctx'> 				(struct be_status_bhs *)io_task-&gt;cmd_bhs;</div><div class='ctx'> 	struct iscsi_conn *conn = beiscsi_conn-&gt;conn;</div><div class='del'>-	unsigned int sense_len;</div><div class='ctx'> 	unsigned char *sense;</div><div class='ctx'> 	u32 resid = 0, exp_cmdsn, max_cmdsn;</div><div class='ctx'> 	u8 rsp, status, flags;</div><div class='hunk'>@@ -1153,9 +1152,11 @@ be_complete_io(struct beiscsi_conn *beiscsi_conn,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (status == SAM_STAT_CHECK_CONDITION) {</div><div class='add'>+		u16 sense_len;</div><div class='ctx'> 		unsigned short *slen = (unsigned short *)sts_bhs-&gt;sense_info;</div><div class='add'>+</div><div class='ctx'> 		sense = sts_bhs-&gt;sense_info + sizeof(unsigned short);</div><div class='del'>-		sense_len =  cpu_to_be16(*slen);</div><div class='add'>+		sense_len = be16_to_cpu(*slen);</div><div class='ctx'> 		memcpy(task-&gt;sc-&gt;sense_buffer, sense,</div><div class='ctx'> 		       min_t(u16, sense_len, SCSI_SENSE_BUFFERSIZE));</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/scsi/bfa/bfa_defs.h b/drivers/scsi/bfa/bfa_defs.h<br/>index 7b3d235d20b4..b5a1595cc0a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfa_defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfa_defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfa_defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/bfa/bfa_defs.h</a></div><div class='hunk'>@@ -902,7 +902,7 @@ struct sfp_mem_s {</div><div class='ctx'> union sfp_xcvr_e10g_code_u {</div><div class='ctx'> 	u8		b;</div><div class='ctx'> 	struct {</div><div class='del'>-#ifdef __BIGENDIAN</div><div class='add'>+#ifdef __BIG_ENDIAN</div><div class='ctx'> 		u8	e10g_unall:1;   /* 10G Ethernet compliance */</div><div class='ctx'> 		u8	e10g_lrm:1;</div><div class='ctx'> 		u8	e10g_lr:1;</div><div class='hunk'>@@ -982,7 +982,7 @@ union sfp_xcvr_fc2_code_u {</div><div class='ctx'> union sfp_xcvr_fc3_code_u {</div><div class='ctx'> 	u8		b;</div><div class='ctx'> 	struct {</div><div class='del'>-#ifdef __BIGENDIAN</div><div class='add'>+#ifdef __BIG_ENDIAN</div><div class='ctx'> 		u8	rsv4:1;</div><div class='ctx'> 		u8	mb800:1;    /* 800 Mbytes/sec */</div><div class='ctx'> 		u8	mb1600:1;   /* 1600 Mbytes/sec */</div><div class='head'>diff --git a/drivers/scsi/bfa/bfa_defs_svc.h b/drivers/scsi/bfa/bfa_defs_svc.h<br/>index 863c6ba7d5eb..cb07c628b2f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfa_defs_svc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfa_defs_svc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfa_defs_svc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/bfa/bfa_defs_svc.h</a></div><div class='hunk'>@@ -34,22 +34,22 @@</div><div class='ctx'> struct bfa_iocfc_intr_attr_s {</div><div class='ctx'> 	u8		coalesce;	/*  enable/disable coalescing */</div><div class='ctx'> 	u8		rsvd[3];</div><div class='del'>-	__be16	latency;	/*  latency in microseconds   */</div><div class='del'>-	__be16	delay;		/*  delay in microseconds     */</div><div class='add'>+	__be16		latency;	/*  latency in microseconds   */</div><div class='add'>+	__be16		delay;		/*  delay in microseconds     */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * IOC firmware configuraton</div><div class='ctx'>  */</div><div class='ctx'> struct bfa_iocfc_fwcfg_s {</div><div class='del'>-	u16        num_fabrics;	/*  number of fabrics		*/</div><div class='del'>-	u16        num_lports;	/*  number of local lports	*/</div><div class='del'>-	u16        num_rports;	/*  number of remote ports	*/</div><div class='del'>-	u16        num_ioim_reqs;	/*  number of IO reqs		*/</div><div class='del'>-	u16        num_tskim_reqs;	/*  task management requests	*/</div><div class='del'>-	u16	   num_fwtio_reqs;	/* number of TM IO reqs in FW */</div><div class='del'>-	u16        num_fcxp_reqs;	/*  unassisted FC exchanges	*/</div><div class='del'>-	u16        num_uf_bufs;	/*  unsolicited recv buffers	*/</div><div class='add'>+	u16		num_fabrics;	/*  number of fabrics		*/</div><div class='add'>+	u16		num_lports;	/*  number of local lports	*/</div><div class='add'>+	u16		num_rports;	/*  number of remote ports	*/</div><div class='add'>+	u16		num_ioim_reqs;	/*  number of IO reqs		*/</div><div class='add'>+	u16		num_tskim_reqs;	/*  task management requests	*/</div><div class='add'>+	u16		num_fwtio_reqs;	/* number of TM IO reqs in FW   */</div><div class='add'>+	u16		num_fcxp_reqs;	/*  unassisted FC exchanges	*/</div><div class='add'>+	u16		num_uf_bufs;	/*  unsolicited recv buffers	*/</div><div class='ctx'> 	u8		num_cqs;</div><div class='ctx'> 	u8		fw_tick_res;	/*  FW clock resolution in ms */</div><div class='ctx'> 	u8		rsvd[2];</div><div class='hunk'>@@ -57,19 +57,19 @@ struct bfa_iocfc_fwcfg_s {</div><div class='ctx'> #pragma pack()</div><div class='ctx'> </div><div class='ctx'> struct bfa_iocfc_drvcfg_s {</div><div class='del'>-	u16        num_reqq_elems;	/*  number of req queue elements */</div><div class='del'>-	u16        num_rspq_elems;	/*  number of rsp queue elements */</div><div class='del'>-	u16        num_sgpgs;	/*  number of total SG pages	  */</div><div class='del'>-	u16        num_sboot_tgts;	/*  number of SAN boot targets	  */</div><div class='del'>-	u16        num_sboot_luns;	/*  number of SAN boot luns	  */</div><div class='del'>-	u16	    ioc_recover;	/*  IOC recovery mode		  */</div><div class='del'>-	u16	    min_cfg;	/*  minimum configuration	  */</div><div class='del'>-	u16        path_tov;	/*  device path timeout	  */</div><div class='del'>-	u16		num_tio_reqs;   /*!&lt; number of TM IO reqs	*/</div><div class='add'>+	u16		num_reqq_elems;	/*  number of req queue elements */</div><div class='add'>+	u16		num_rspq_elems;	/*  number of rsp queue elements */</div><div class='add'>+	u16		num_sgpgs;	/*  number of total SG pages	 */</div><div class='add'>+	u16		num_sboot_tgts;	/*  number of SAN boot targets	 */</div><div class='add'>+	u16		num_sboot_luns;	/*  number of SAN boot luns	 */</div><div class='add'>+	u16		ioc_recover;	/*  IOC recovery mode		 */</div><div class='add'>+	u16		min_cfg;	/*  minimum configuration	 */</div><div class='add'>+	u16		path_tov;	/*  device path timeout		*/</div><div class='add'>+	u16		num_tio_reqs;	/* number of TM IO reqs	*/</div><div class='ctx'> 	u8		port_mode;</div><div class='ctx'> 	u8		rsvd_a;</div><div class='del'>-	bfa_boolean_t   delay_comp; /*  delay completion of</div><div class='del'>-							failed inflight IOs */</div><div class='add'>+	bfa_boolean_t	delay_comp;	/* delay completion of failed</div><div class='add'>+					 * inflight IOs */</div><div class='ctx'> 	u16		num_ttsk_reqs;	 /* TM task management requests */</div><div class='ctx'> 	u32		rsvd;</div><div class='ctx'> };</div><div class='hunk'>@@ -101,8 +101,8 @@ struct bfa_fw_ioim_stats_s {</div><div class='ctx'> 	u32	fw_frm_drop;		/*  f/w drop the frame */</div><div class='ctx'> </div><div class='ctx'> 	u32	rec_timeout;		/*  FW rec timed out */</div><div class='del'>-	u32	error_rec;			/*  FW sending rec on</div><div class='del'>-							* an error condition*/</div><div class='add'>+	u32	error_rec;		/*  FW sending rec on</div><div class='add'>+					 *  an error condition*/</div><div class='ctx'> 	u32	wait_for_si;		/*  FW wait for SI */</div><div class='ctx'> 	u32	rec_rsp_inval;		/*  REC rsp invalid */</div><div class='ctx'> 	u32	seqr_io_abort;		/*  target does not know cmd so abort */</div><div class='hunk'>@@ -124,9 +124,9 @@ struct bfa_fw_ioim_stats_s {</div><div class='ctx'> 	u32	unexp_fcp_rsp;		/*  fcp response in wrong state */</div><div class='ctx'> </div><div class='ctx'> 	u32	fcp_rsp_under_run;	/*  fcp rsp IO underrun */</div><div class='del'>-	u32        fcp_rsp_under_run_wr;   /*  fcp rsp IO underrun for write */</div><div class='add'>+	u32     fcp_rsp_under_run_wr;   /*  fcp rsp IO underrun for write */</div><div class='ctx'> 	u32	fcp_rsp_under_run_err;	/*  fcp rsp IO underrun error */</div><div class='del'>-	u32        fcp_rsp_resid_inval;    /*  invalid residue */</div><div class='add'>+	u32     fcp_rsp_resid_inval;    /*  invalid residue */</div><div class='ctx'> 	u32	fcp_rsp_over_run;	/*  fcp rsp IO overrun */</div><div class='ctx'> 	u32	fcp_rsp_over_run_err;	/*  fcp rsp IO overrun error */</div><div class='ctx'> 	u32	fcp_rsp_proto_err;	/*  protocol error in fcp rsp */</div><div class='hunk'>@@ -142,21 +142,20 @@ struct bfa_fw_ioim_stats_s {</div><div class='ctx'> 	u32	ioh_hit_class2_event;	/*  IOH hit class2 */</div><div class='ctx'> 	u32	ioh_miss_other_event;	/*  IOH miss other */</div><div class='ctx'> 	u32	ioh_seq_cnt_err_event;	/*  IOH seq cnt error */</div><div class='del'>-	u32	ioh_len_err_event;		/*  IOH len error - fcp_dl !=</div><div class='del'>-							* bytes xfered */</div><div class='add'>+	u32	ioh_len_err_event;	/*  IOH len error - fcp_dl !=</div><div class='add'>+					 *  bytes xfered */</div><div class='ctx'> 	u32	ioh_seq_len_err_event;	/*  IOH seq len error */</div><div class='ctx'> 	u32	ioh_data_oor_event;	/*  Data out of range */</div><div class='ctx'> 	u32	ioh_ro_ooo_event;	/*  Relative offset out of range */</div><div class='ctx'> 	u32	ioh_cpu_owned_event;	/*  IOH hit -iost owned by f/w */</div><div class='ctx'> 	u32	ioh_unexp_frame_event;	/*  unexpected frame received</div><div class='del'>-						 *   count */</div><div class='add'>+					 *  count */</div><div class='ctx'> 	u32	ioh_err_int;		/*  IOH error int during data-phase</div><div class='del'>-						 *   for scsi write</div><div class='del'>-						 */</div><div class='add'>+					 *  for scsi write */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bfa_fw_tio_stats_s {</div><div class='del'>-	u32	tio_conf_proc;	/* TIO CONF processed */</div><div class='add'>+	u32	tio_conf_proc;	    /* TIO CONF processed */</div><div class='ctx'> 	u32	tio_conf_drop;      /* TIO CONF dropped */</div><div class='ctx'> 	u32	tio_cleanup_req;    /* TIO cleanup requested */</div><div class='ctx'> 	u32	tio_cleanup_comp;   /* TIO cleanup completed */</div><div class='hunk'>@@ -164,34 +163,36 @@ struct bfa_fw_tio_stats_s {</div><div class='ctx'> 	u32	tio_abort_rsp_comp; /* TIO abort rsp completed */</div><div class='ctx'> 	u32	tio_abts_req;       /* TIO ABTS requested */</div><div class='ctx'> 	u32	tio_abts_ack;       /* TIO ABTS ack-ed */</div><div class='del'>-	u32	tio_abts_ack_nocomp; /* TIO ABTS ack-ed but not completed */</div><div class='add'>+	u32	tio_abts_ack_nocomp;/* TIO ABTS ack-ed but not completed */</div><div class='ctx'> 	u32	tio_abts_tmo;       /* TIO ABTS timeout */</div><div class='ctx'> 	u32	tio_snsdata_dma;    /* TIO sense data DMA */</div><div class='del'>-	u32	tio_rxwchan_wait; /* TIO waiting for RX wait channel */</div><div class='del'>-	u32	tio_rxwchan_avail; /* TIO RX wait channel available */</div><div class='add'>+	u32	tio_rxwchan_wait;   /* TIO waiting for RX wait channel */</div><div class='add'>+	u32	tio_rxwchan_avail;  /* TIO RX wait channel available */</div><div class='ctx'> 	u32	tio_hit_bls;        /* TIO IOH BLS event */</div><div class='ctx'> 	u32	tio_uf_recv;        /* TIO received UF */</div><div class='del'>-	u32	tio_rd_invalid_sm; /* TIO read reqst in wrong state machine */</div><div class='del'>-	u32	tio_wr_invalid_sm;/* TIO write reqst in wrong state machine */</div><div class='add'>+	u32	tio_rd_invalid_sm;  /* TIO read reqst in wrong state machine */</div><div class='add'>+	u32	tio_wr_invalid_sm;  /* TIO write reqst in wrong state machine */</div><div class='ctx'> </div><div class='del'>-	u32	ds_rxwchan_wait; /* DS waiting for RX wait channel */</div><div class='del'>-	u32	ds_rxwchan_avail; /* DS RX wait channel available */</div><div class='add'>+	u32	ds_rxwchan_wait;    /* DS waiting for RX wait channel */</div><div class='add'>+	u32	ds_rxwchan_avail;   /* DS RX wait channel available */</div><div class='ctx'> 	u32	ds_unaligned_rd;    /* DS unaligned read */</div><div class='del'>-	u32	ds_rdcomp_invalid_sm; /* DS read completed in wrong state machine */</div><div class='del'>-	u32	ds_wrcomp_invalid_sm; /* DS write completed in wrong state machine */</div><div class='add'>+	u32	ds_rdcomp_invalid_sm; /* DS read completed in wrong state</div><div class='add'>+				       * machine */</div><div class='add'>+	u32	ds_wrcomp_invalid_sm; /* DS write completed in wrong state</div><div class='add'>+				       * machine */</div><div class='ctx'> 	u32	ds_flush_req;       /* DS flush requested */</div><div class='ctx'> 	u32	ds_flush_comp;      /* DS flush completed */</div><div class='ctx'> 	u32	ds_xfrdy_exp;       /* DS XFER_RDY expired */</div><div class='ctx'> 	u32	ds_seq_cnt_err;     /* DS seq cnt error */</div><div class='ctx'> 	u32	ds_seq_len_err;     /* DS seq len error */</div><div class='ctx'> 	u32	ds_data_oor;        /* DS data out of order */</div><div class='del'>-	u32	ds_hit_bls;     /* DS hit BLS */</div><div class='add'>+	u32	ds_hit_bls;	    /* DS hit BLS */</div><div class='ctx'> 	u32	ds_edtov_timer_exp; /* DS edtov expired */</div><div class='ctx'> 	u32	ds_cpu_owned;       /* DS cpu owned */</div><div class='ctx'> 	u32	ds_hit_class2;      /* DS hit class2 */</div><div class='ctx'> 	u32	ds_length_err;      /* DS length error */</div><div class='ctx'> 	u32	ds_ro_ooo_err;      /* DS relative offset out-of-order error */</div><div class='del'>-	u32	ds_rectov_timer_exp;    /* DS rectov expired */</div><div class='add'>+	u32	ds_rectov_timer_exp;/* DS rectov expired */</div><div class='ctx'> 	u32	ds_unexp_fr_err;    /* DS unexp frame error */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -208,119 +209,119 @@ struct bfa_fw_io_stats_s {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct bfa_fw_port_fpg_stats_s {</div><div class='del'>-    u32    intr_evt;</div><div class='del'>-    u32    intr;</div><div class='del'>-    u32    intr_excess;</div><div class='del'>-    u32    intr_cause0;</div><div class='del'>-    u32    intr_other;</div><div class='del'>-    u32    intr_other_ign;</div><div class='del'>-    u32    sig_lost;</div><div class='del'>-    u32    sig_regained;</div><div class='del'>-    u32    sync_lost;</div><div class='del'>-    u32    sync_to;</div><div class='del'>-    u32    sync_regained;</div><div class='del'>-    u32    div2_overflow;</div><div class='del'>-    u32    div2_underflow;</div><div class='del'>-    u32    efifo_overflow;</div><div class='del'>-    u32    efifo_underflow;</div><div class='del'>-    u32    idle_rx;</div><div class='del'>-    u32    lrr_rx;</div><div class='del'>-    u32    lr_rx;</div><div class='del'>-    u32    ols_rx;</div><div class='del'>-    u32    nos_rx;</div><div class='del'>-    u32    lip_rx;</div><div class='del'>-    u32    arbf0_rx;</div><div class='del'>-    u32    arb_rx;</div><div class='del'>-    u32    mrk_rx;</div><div class='del'>-    u32    const_mrk_rx;</div><div class='del'>-    u32    prim_unknown;</div><div class='add'>+	u32    intr_evt;</div><div class='add'>+	u32    intr;</div><div class='add'>+	u32    intr_excess;</div><div class='add'>+	u32    intr_cause0;</div><div class='add'>+	u32    intr_other;</div><div class='add'>+	u32    intr_other_ign;</div><div class='add'>+	u32    sig_lost;</div><div class='add'>+	u32    sig_regained;</div><div class='add'>+	u32    sync_lost;</div><div class='add'>+	u32    sync_to;</div><div class='add'>+	u32    sync_regained;</div><div class='add'>+	u32    div2_overflow;</div><div class='add'>+	u32    div2_underflow;</div><div class='add'>+	u32    efifo_overflow;</div><div class='add'>+	u32    efifo_underflow;</div><div class='add'>+	u32    idle_rx;</div><div class='add'>+	u32    lrr_rx;</div><div class='add'>+	u32    lr_rx;</div><div class='add'>+	u32    ols_rx;</div><div class='add'>+	u32    nos_rx;</div><div class='add'>+	u32    lip_rx;</div><div class='add'>+	u32    arbf0_rx;</div><div class='add'>+	u32    arb_rx;</div><div class='add'>+	u32    mrk_rx;</div><div class='add'>+	u32    const_mrk_rx;</div><div class='add'>+	u32    prim_unknown;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct bfa_fw_port_lksm_stats_s {</div><div class='del'>-    u32    hwsm_success;       /*  hwsm state machine success          */</div><div class='del'>-    u32    hwsm_fails;         /*  hwsm fails                          */</div><div class='del'>-    u32    hwsm_wdtov;         /*  hwsm timed out                      */</div><div class='del'>-    u32    swsm_success;       /*  swsm success                        */</div><div class='del'>-    u32    swsm_fails;         /*  swsm fails                          */</div><div class='del'>-    u32    swsm_wdtov;         /*  swsm timed out                      */</div><div class='del'>-    u32    busybufs;           /*  link init failed due to busybuf     */</div><div class='del'>-    u32    buf_waits;          /*  bufwait state entries               */</div><div class='del'>-    u32    link_fails;         /*  link failures                       */</div><div class='del'>-    u32    psp_errors;         /*  primitive sequence protocol errors  */</div><div class='del'>-    u32    lr_unexp;           /*  No. of times LR rx-ed unexpectedly  */</div><div class='del'>-    u32    lrr_unexp;          /*  No. of times LRR rx-ed unexpectedly */</div><div class='del'>-    u32    lr_tx;              /*  No. of times LR tx started          */</div><div class='del'>-    u32    lrr_tx;             /*  No. of times LRR tx started         */</div><div class='del'>-    u32    ols_tx;             /*  No. of times OLS tx started         */</div><div class='del'>-    u32    nos_tx;             /*  No. of times NOS tx started         */</div><div class='del'>-    u32    hwsm_lrr_rx;        /*  No. of times LRR rx-ed by HWSM      */</div><div class='del'>-    u32    hwsm_lr_rx;         /*  No. of times LR rx-ed by HWSM      */</div><div class='del'>-	u32	bbsc_lr;	/* LKSM LR tx for credit recovery	*/</div><div class='add'>+	u32    hwsm_success;       /*  hwsm state machine success          */</div><div class='add'>+	u32    hwsm_fails;         /*  hwsm fails                          */</div><div class='add'>+	u32    hwsm_wdtov;         /*  hwsm timed out                      */</div><div class='add'>+	u32    swsm_success;       /*  swsm success                        */</div><div class='add'>+	u32    swsm_fails;         /*  swsm fails                          */</div><div class='add'>+	u32    swsm_wdtov;         /*  swsm timed out                      */</div><div class='add'>+	u32    busybufs;           /*  link init failed due to busybuf     */</div><div class='add'>+	u32    buf_waits;          /*  bufwait state entries               */</div><div class='add'>+	u32    link_fails;         /*  link failures                       */</div><div class='add'>+	u32    psp_errors;         /*  primitive sequence protocol errors  */</div><div class='add'>+	u32    lr_unexp;           /*  No. of times LR rx-ed unexpectedly  */</div><div class='add'>+	u32    lrr_unexp;          /*  No. of times LRR rx-ed unexpectedly */</div><div class='add'>+	u32    lr_tx;              /*  No. of times LR tx started          */</div><div class='add'>+	u32    lrr_tx;             /*  No. of times LRR tx started         */</div><div class='add'>+	u32    ols_tx;             /*  No. of times OLS tx started         */</div><div class='add'>+	u32    nos_tx;             /*  No. of times NOS tx started         */</div><div class='add'>+	u32    hwsm_lrr_rx;        /*  No. of times LRR rx-ed by HWSM      */</div><div class='add'>+	u32    hwsm_lr_rx;         /*  No. of times LR rx-ed by HWSM       */</div><div class='add'>+	u32    bbsc_lr;		   /* LKSM LR tx for credit recovery       */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bfa_fw_port_snsm_stats_s {</div><div class='del'>-    u32    hwsm_success;       /*  Successful hwsm terminations        */</div><div class='del'>-    u32    hwsm_fails;         /*  hwsm fail count                     */</div><div class='del'>-    u32    hwsm_wdtov;         /*  hwsm timed out                      */</div><div class='del'>-    u32    swsm_success;       /*  swsm success                        */</div><div class='del'>-    u32    swsm_wdtov;         /*  swsm timed out                      */</div><div class='del'>-    u32    error_resets;       /*  error resets initiated by upsm      */</div><div class='del'>-    u32    sync_lost;          /*  Sync loss count                     */</div><div class='del'>-    u32    sig_lost;           /*  Signal loss count                   */</div><div class='del'>-	u32	asn8g_attempts;	/* SNSM HWSM at 8Gbps attempts */</div><div class='add'>+	u32    hwsm_success;       /*  Successful hwsm terminations        */</div><div class='add'>+	u32    hwsm_fails;         /*  hwsm fail count                     */</div><div class='add'>+	u32    hwsm_wdtov;         /*  hwsm timed out                      */</div><div class='add'>+	u32    swsm_success;       /*  swsm success                        */</div><div class='add'>+	u32    swsm_wdtov;         /*  swsm timed out                      */</div><div class='add'>+	u32    error_resets;       /*  error resets initiated by upsm      */</div><div class='add'>+	u32    sync_lost;          /*  Sync loss count                     */</div><div class='add'>+	u32    sig_lost;           /*  Signal loss count                   */</div><div class='add'>+	u32    asn8g_attempts;	   /* SNSM HWSM at 8Gbps attempts	   */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bfa_fw_port_physm_stats_s {</div><div class='del'>-    u32    module_inserts;     /*  Module insert count                 */</div><div class='del'>-    u32    module_xtracts;     /*  Module extracts count               */</div><div class='del'>-    u32    module_invalids;    /*  Invalid module inserted count       */</div><div class='del'>-    u32    module_read_ign;    /*  Module validation status ignored    */</div><div class='del'>-    u32    laser_faults;       /*  Laser fault count                   */</div><div class='del'>-    u32    rsvd;</div><div class='add'>+	u32    module_inserts;     /*  Module insert count                 */</div><div class='add'>+	u32    module_xtracts;     /*  Module extracts count               */</div><div class='add'>+	u32    module_invalids;    /*  Invalid module inserted count       */</div><div class='add'>+	u32    module_read_ign;    /*  Module validation status ignored    */</div><div class='add'>+	u32    laser_faults;       /*  Laser fault count                   */</div><div class='add'>+	u32    rsvd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bfa_fw_fip_stats_s {</div><div class='del'>-    u32    vlan_req;           /*  vlan discovery requests             */</div><div class='del'>-    u32    vlan_notify;        /*  vlan notifications                  */</div><div class='del'>-    u32    vlan_err;           /*  vlan response error                 */</div><div class='del'>-    u32    vlan_timeouts;      /*  vlan disvoery timeouts              */</div><div class='del'>-    u32    vlan_invalids;      /*  invalid vlan in discovery advert.   */</div><div class='del'>-    u32    disc_req;           /*  Discovery solicit requests          */</div><div class='del'>-    u32    disc_rsp;           /*  Discovery solicit response          */</div><div class='del'>-    u32    disc_err;           /*  Discovery advt. parse errors        */</div><div class='del'>-    u32    disc_unsol;         /*  Discovery unsolicited               */</div><div class='del'>-    u32    disc_timeouts;      /*  Discovery timeouts                  */</div><div class='del'>-    u32    disc_fcf_unavail;   /*  Discovery FCF Not Avail.            */</div><div class='del'>-    u32    linksvc_unsupp;     /*  Unsupported link service req        */</div><div class='del'>-    u32    linksvc_err;        /*  Parse error in link service req     */</div><div class='del'>-    u32    logo_req;           /*  FIP logos received                  */</div><div class='del'>-    u32    clrvlink_req;       /*  Clear virtual link req              */</div><div class='del'>-    u32    op_unsupp;          /*  Unsupported FIP operation           */</div><div class='del'>-    u32    untagged;           /*  Untagged frames (ignored)           */</div><div class='del'>-    u32    invalid_version;    /*  Invalid FIP version                 */</div><div class='add'>+	u32    vlan_req;           /*  vlan discovery requests             */</div><div class='add'>+	u32    vlan_notify;        /*  vlan notifications                  */</div><div class='add'>+	u32    vlan_err;           /*  vlan response error                 */</div><div class='add'>+	u32    vlan_timeouts;      /*  vlan disvoery timeouts              */</div><div class='add'>+	u32    vlan_invalids;      /*  invalid vlan in discovery advert.   */</div><div class='add'>+	u32    disc_req;           /*  Discovery solicit requests          */</div><div class='add'>+	u32    disc_rsp;           /*  Discovery solicit response          */</div><div class='add'>+	u32    disc_err;           /*  Discovery advt. parse errors        */</div><div class='add'>+	u32    disc_unsol;         /*  Discovery unsolicited               */</div><div class='add'>+	u32    disc_timeouts;      /*  Discovery timeouts                  */</div><div class='add'>+	u32    disc_fcf_unavail;   /*  Discovery FCF Not Avail.            */</div><div class='add'>+	u32    linksvc_unsupp;     /*  Unsupported link service req        */</div><div class='add'>+	u32    linksvc_err;        /*  Parse error in link service req     */</div><div class='add'>+	u32    logo_req;           /*  FIP logos received                  */</div><div class='add'>+	u32    clrvlink_req;       /*  Clear virtual link req              */</div><div class='add'>+	u32    op_unsupp;          /*  Unsupported FIP operation           */</div><div class='add'>+	u32    untagged;           /*  Untagged frames (ignored)           */</div><div class='add'>+	u32    invalid_version;    /*  Invalid FIP version                 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bfa_fw_lps_stats_s {</div><div class='del'>-    u32    mac_invalids;       /*  Invalid mac assigned                */</div><div class='del'>-    u32    rsvd;</div><div class='add'>+	u32    mac_invalids;       /*  Invalid mac assigned                */</div><div class='add'>+	u32    rsvd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bfa_fw_fcoe_stats_s {</div><div class='del'>-    u32    cee_linkups;        /*  CEE link up count                   */</div><div class='del'>-    u32    cee_linkdns;        /*  CEE link down count                 */</div><div class='del'>-    u32    fip_linkups;        /*  FIP link up count                   */</div><div class='del'>-    u32    fip_linkdns;        /*  FIP link up count                   */</div><div class='del'>-    u32    fip_fails;          /*  FIP fail count                      */</div><div class='del'>-    u32    mac_invalids;       /*  Invalid mac assigned                */</div><div class='add'>+	u32    cee_linkups;        /*  CEE link up count                   */</div><div class='add'>+	u32    cee_linkdns;        /*  CEE link down count                 */</div><div class='add'>+	u32    fip_linkups;        /*  FIP link up count                   */</div><div class='add'>+	u32    fip_linkdns;        /*  FIP link up count                   */</div><div class='add'>+	u32    fip_fails;          /*  FIP fail count                      */</div><div class='add'>+	u32    mac_invalids;       /*  Invalid mac assigned                */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * IOC firmware FCoE port stats</div><div class='ctx'>  */</div><div class='ctx'> struct bfa_fw_fcoe_port_stats_s {</div><div class='del'>-	struct bfa_fw_fcoe_stats_s  fcoe_stats;</div><div class='del'>-	struct bfa_fw_fip_stats_s   fip_stats;</div><div class='add'>+	struct bfa_fw_fcoe_stats_s		fcoe_stats;</div><div class='add'>+	struct bfa_fw_fip_stats_s		fip_stats;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -335,8 +336,8 @@ struct bfa_fw_fc_uport_stats_s {</div><div class='ctx'>  * IOC firmware FC port stats</div><div class='ctx'>  */</div><div class='ctx'> union bfa_fw_fc_port_stats_s {</div><div class='del'>-	struct bfa_fw_fc_uport_stats_s	fc_stats;</div><div class='del'>-	struct bfa_fw_fcoe_port_stats_s	fcoe_stats;</div><div class='add'>+	struct bfa_fw_fc_uport_stats_s		fc_stats;</div><div class='add'>+	struct bfa_fw_fcoe_port_stats_s		fcoe_stats;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -366,25 +367,25 @@ struct bfa_fw_lpsm_stats_s {</div><div class='ctx'>  */</div><div class='ctx'> struct bfa_fw_trunk_stats_s {</div><div class='ctx'> 	u32 emt_recvd;		/*  Trunk EMT received		*/</div><div class='del'>-	u32 emt_accepted;		/*  Trunk EMT Accepted		*/</div><div class='del'>-	u32 emt_rejected;		/*  Trunk EMT rejected		*/</div><div class='add'>+	u32 emt_accepted;	/*  Trunk EMT Accepted		*/</div><div class='add'>+	u32 emt_rejected;	/*  Trunk EMT rejected		*/</div><div class='ctx'> 	u32 etp_recvd;		/*  Trunk ETP received		*/</div><div class='del'>-	u32 etp_accepted;		/*  Trunk ETP Accepted		*/</div><div class='del'>-	u32 etp_rejected;		/*  Trunk ETP rejected		*/</div><div class='add'>+	u32 etp_accepted;	/*  Trunk ETP Accepted		*/</div><div class='add'>+	u32 etp_rejected;	/*  Trunk ETP rejected		*/</div><div class='ctx'> 	u32 lr_recvd;		/*  Trunk LR received		*/</div><div class='del'>-	u32 rsvd;			/*  padding for 64 bit alignment */</div><div class='add'>+	u32 rsvd;		/*  padding for 64 bit alignment */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bfa_fw_advsm_stats_s {</div><div class='ctx'> 	u32 flogi_sent;		/*  Flogi sent			*/</div><div class='ctx'> 	u32 flogi_acc_recvd;	/*  Flogi Acc received		*/</div><div class='ctx'> 	u32 flogi_rjt_recvd;	/*  Flogi rejects received	*/</div><div class='del'>-	u32 flogi_retries;		/*  Flogi retries		*/</div><div class='add'>+	u32 flogi_retries;	/*  Flogi retries		*/</div><div class='ctx'> </div><div class='ctx'> 	u32 elp_recvd;		/*  ELP received		*/</div><div class='del'>-	u32 elp_accepted;		/*  ELP Accepted		*/</div><div class='del'>-	u32 elp_rejected;		/*  ELP rejected		*/</div><div class='del'>-	u32 elp_dropped;		/*  ELP dropped		*/</div><div class='add'>+	u32 elp_accepted;	/*  ELP Accepted		*/</div><div class='add'>+	u32 elp_rejected;	/*  ELP rejected		*/</div><div class='add'>+	u32 elp_dropped;	/*  ELP dropped			*/</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -521,7 +522,7 @@ struct bfa_qos_vc_attr_s {</div><div class='ctx'> 	u16  total_vc_count;                    /*  Total VC Count */</div><div class='ctx'> 	u16  shared_credit;</div><div class='ctx'> 	u32  elp_opmode_flags;</div><div class='del'>-	struct bfa_qos_vc_info_s vc_info[BFA_QOS_MAX_VC];  /*   as many as</div><div class='add'>+	struct bfa_qos_vc_info_s vc_info[BFA_QOS_MAX_VC];  /* as many as</div><div class='ctx'> 							    * total_vc_count */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -531,16 +532,16 @@ struct bfa_qos_vc_attr_s {</div><div class='ctx'> struct bfa_qos_stats_s {</div><div class='ctx'> 	u32	flogi_sent;		/*  QoS Flogi sent */</div><div class='ctx'> 	u32	flogi_acc_recvd;	/*  QoS Flogi Acc received */</div><div class='del'>-	u32	flogi_rjt_recvd; /*  QoS Flogi rejects received */</div><div class='add'>+	u32	flogi_rjt_recvd;	/*  QoS Flogi rejects received */</div><div class='ctx'> 	u32	flogi_retries;		/*  QoS Flogi retries */</div><div class='ctx'> </div><div class='ctx'> 	u32	elp_recvd;		/*  QoS ELP received */</div><div class='ctx'> 	u32	elp_accepted;		/*  QoS ELP Accepted */</div><div class='del'>-	u32	elp_rejected;       /*  QoS ELP rejected */</div><div class='del'>-	u32	elp_dropped;        /*  QoS ELP dropped  */</div><div class='add'>+	u32	elp_rejected;		/*  QoS ELP rejected */</div><div class='add'>+	u32	elp_dropped;		/*  QoS ELP dropped  */</div><div class='ctx'> </div><div class='del'>-	u32	qos_rscn_recvd;     /*  QoS RSCN received */</div><div class='del'>-	u32	rsvd;		    /* padding for 64 bit alignment */</div><div class='add'>+	u32	qos_rscn_recvd;		/*  QoS RSCN received */</div><div class='add'>+	u32	rsvd;			/* padding for 64 bit alignment */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -548,9 +549,9 @@ struct bfa_qos_stats_s {</div><div class='ctx'>  */</div><div class='ctx'> struct bfa_fcoe_stats_s {</div><div class='ctx'> 	u64	secs_reset;	/*  Seconds since stats reset	     */</div><div class='del'>-	u64	cee_linkups;	/*  CEE link up		     */</div><div class='add'>+	u64	cee_linkups;	/*  CEE link up			     */</div><div class='ctx'> 	u64	cee_linkdns;	/*  CEE link down		     */</div><div class='del'>-	u64	fip_linkups;	/*  FIP link up		     */</div><div class='add'>+	u64	fip_linkups;	/*  FIP link up			     */</div><div class='ctx'> 	u64	fip_linkdns;	/*  FIP link down		     */</div><div class='ctx'> 	u64	fip_fails;	/*  FIP failures		     */</div><div class='ctx'> 	u64	mac_invalids;	/*  Invalid mac assignments	     */</div><div class='hunk'>@@ -560,38 +561,38 @@ struct bfa_fcoe_stats_s {</div><div class='ctx'> 	u64	vlan_timeouts;	/*  Vlan request timeouts	     */</div><div class='ctx'> 	u64	vlan_invalids;	/*  Vlan invalids		     */</div><div class='ctx'> 	u64	disc_req;	/*  Discovery requests		     */</div><div class='del'>-	u64	disc_rsp;	/*  Discovery responses	     */</div><div class='add'>+	u64	disc_rsp;	/*  Discovery responses		     */</div><div class='ctx'> 	u64	disc_err;	/*  Discovery error frames	     */</div><div class='ctx'> 	u64	disc_unsol;	/*  Discovery unsolicited	     */</div><div class='ctx'> 	u64	disc_timeouts;	/*  Discovery timeouts		     */</div><div class='ctx'> 	u64	disc_fcf_unavail; /*  Discovery FCF not avail	     */</div><div class='del'>-	u64	linksvc_unsupp;	/*  FIP link service req unsupp.    */</div><div class='del'>-	u64	linksvc_err;	/*  FIP link service req errors     */</div><div class='add'>+	u64	linksvc_unsupp;	/*  FIP link service req unsupp	     */</div><div class='add'>+	u64	linksvc_err;	/*  FIP link service req errors	     */</div><div class='ctx'> 	u64	logo_req;	/*  FIP logos received		     */</div><div class='del'>-	u64	clrvlink_req;	/*  Clear virtual link requests     */</div><div class='add'>+	u64	clrvlink_req;	/*  Clear virtual link requests	     */</div><div class='ctx'> 	u64	op_unsupp;	/*  FIP operation unsupp.	     */</div><div class='del'>-	u64	untagged;	/*  FIP untagged frames	     */</div><div class='add'>+	u64	untagged;	/*  FIP untagged frames		     */</div><div class='ctx'> 	u64	txf_ucast;	/*  Tx FCoE unicast frames	     */</div><div class='del'>-	u64	txf_ucast_vlan;	/*  Tx FCoE unicast vlan frames     */</div><div class='add'>+	u64	txf_ucast_vlan;	/*  Tx FCoE unicast vlan frames      */</div><div class='ctx'> 	u64	txf_ucast_octets; /*  Tx FCoE unicast octets	     */</div><div class='ctx'> 	u64	txf_mcast;	/*  Tx FCoE multicast frames	     */</div><div class='del'>-	u64	txf_mcast_vlan;	/*  Tx FCoE multicast vlan frames   */</div><div class='add'>+	u64	txf_mcast_vlan;	/*  Tx FCoE multicast vlan frames    */</div><div class='ctx'> 	u64	txf_mcast_octets; /*  Tx FCoE multicast octets	     */</div><div class='ctx'> 	u64	txf_bcast;	/*  Tx FCoE broadcast frames	     */</div><div class='del'>-	u64	txf_bcast_vlan;	/*  Tx FCoE broadcast vlan frames   */</div><div class='add'>+	u64	txf_bcast_vlan;	/*  Tx FCoE broadcast vlan frames    */</div><div class='ctx'> 	u64	txf_bcast_octets; /*  Tx FCoE broadcast octets	     */</div><div class='del'>-	u64	txf_timeout;	/*  Tx timeouts		     */</div><div class='add'>+	u64	txf_timeout;	  /*  Tx timeouts		     */</div><div class='ctx'> 	u64	txf_parity_errors; /*  Transmit parity err	     */</div><div class='del'>-	u64	txf_fid_parity_errors; /*  Transmit FID parity err  */</div><div class='add'>+	u64	txf_fid_parity_errors; /*  Transmit FID parity err   */</div><div class='ctx'> 	u64	rxf_ucast_octets; /*  Rx FCoE unicast octets	     */</div><div class='ctx'> 	u64	rxf_ucast;	/*  Rx FCoE unicast frames	     */</div><div class='del'>-	u64	rxf_ucast_vlan;	/*  Rx FCoE unicast vlan frames     */</div><div class='add'>+	u64	rxf_ucast_vlan;	/*  Rx FCoE unicast vlan frames	     */</div><div class='ctx'> 	u64	rxf_mcast_octets; /*  Rx FCoE multicast octets	     */</div><div class='ctx'> 	u64	rxf_mcast;	/*  Rx FCoE multicast frames	     */</div><div class='del'>-	u64	rxf_mcast_vlan;	/*  Rx FCoE multicast vlan frames   */</div><div class='add'>+	u64	rxf_mcast_vlan;	/*  Rx FCoE multicast vlan frames    */</div><div class='ctx'> 	u64	rxf_bcast_octets; /*  Rx FCoE broadcast octets	     */</div><div class='ctx'> 	u64	rxf_bcast;	/*  Rx FCoE broadcast frames	     */</div><div class='del'>-	u64	rxf_bcast_vlan;	/*  Rx FCoE broadcast vlan frames   */</div><div class='add'>+	u64	rxf_bcast_vlan;	/*  Rx FCoE broadcast vlan frames    */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -672,12 +673,7 @@ struct bfa_itnim_iostats_s {</div><div class='ctx'> 	u32	tm_iocdowns;		/*  TM cleaned-up due to IOC down   */</div><div class='ctx'> 	u32	tm_cleanups;		/*  TM cleanup requests	*/</div><div class='ctx'> 	u32	tm_cleanup_comps;	/*  TM cleanup completions	*/</div><div class='del'>-	u32	lm_lun_across_sg;	/*  LM lun is across sg data buf */</div><div class='del'>-	u32	lm_lun_not_sup;		/*  LM lun not supported */</div><div class='del'>-	u32	lm_rpl_data_changed;	/*  LM report-lun data changed */</div><div class='del'>-	u32	lm_wire_residue_changed; /* LM report-lun rsp residue changed */</div><div class='del'>-	u32	lm_small_buf_addresidue; /* LM buf smaller than reported cnt */</div><div class='del'>-	u32	lm_lun_not_rdy;		/* LM lun not ready */</div><div class='add'>+	u32	rsvd[6];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Modify char* port_stt[] in bfal_port.c if a new state was added */</div><div class='hunk'>@@ -852,12 +848,12 @@ struct bfa_port_cfg_s {</div><div class='ctx'> 	u8	 tx_bbcredit;	/*  transmit buffer credits	*/</div><div class='ctx'> 	u8	 ratelimit;	/*  ratelimit enabled or not	*/</div><div class='ctx'> 	u8	 trl_def_speed;	/*  ratelimit default speed	*/</div><div class='del'>-	u8	bb_scn;		/*  BB_SCN value from FLOGI Exchg */</div><div class='del'>-	u8	bb_scn_state;	/*  Config state of BB_SCN */</div><div class='del'>-	u8	faa_state;	/*  FAA enabled/disabled        */</div><div class='del'>-	u8	rsvd[1];</div><div class='del'>-	u16 path_tov;	/*  device path timeout	*/</div><div class='del'>-	u16 q_depth;	/*  SCSI Queue depth		*/</div><div class='add'>+	u8	 bb_scn;	/*  BB_SCN value from FLOGI Exchg */</div><div class='add'>+	u8	 bb_scn_state;	/*  Config state of BB_SCN */</div><div class='add'>+	u8	 faa_state;	/*  FAA enabled/disabled        */</div><div class='add'>+	u8	 rsvd[1];</div><div class='add'>+	u16	 path_tov;	/*  device path timeout	*/</div><div class='add'>+	u16	 q_depth;	/*  SCSI Queue depth		*/</div><div class='ctx'> };</div><div class='ctx'> #pragma pack()</div><div class='ctx'> </div><div class='hunk'>@@ -868,20 +864,21 @@ struct bfa_port_attr_s {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Static fields</div><div class='ctx'> 	 */</div><div class='del'>-	wwn_t	   nwwn;		/*  node wwn */</div><div class='del'>-	wwn_t	   pwwn;		/*  port wwn */</div><div class='del'>-	wwn_t	   factorynwwn;	/*  factory node wwn */</div><div class='del'>-	wwn_t	   factorypwwn;	/*  factory port wwn */</div><div class='del'>-	enum fc_cos	cos_supported;	/*  supported class of services */</div><div class='del'>-	u32	rsvd;</div><div class='add'>+	wwn_t			nwwn;		/*  node wwn */</div><div class='add'>+	wwn_t			pwwn;		/*  port wwn */</div><div class='add'>+	wwn_t			factorynwwn;	/*  factory node wwn */</div><div class='add'>+	wwn_t			factorypwwn;	/*  factory port wwn */</div><div class='add'>+	enum fc_cos		cos_supported;	/*  supported class of</div><div class='add'>+						 *  services */</div><div class='add'>+	u32			rsvd;</div><div class='ctx'> 	struct fc_symname_s	port_symname;	/*  port symbolic name */</div><div class='del'>-	enum bfa_port_speed speed_supported; /*  supported speeds */</div><div class='del'>-	bfa_boolean_t   pbind_enabled;</div><div class='add'>+	enum bfa_port_speed	speed_supported; /* supported speeds */</div><div class='add'>+	bfa_boolean_t		pbind_enabled;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Configured values</div><div class='ctx'> 	 */</div><div class='del'>-	struct bfa_port_cfg_s pport_cfg;	/*  pport cfg */</div><div class='add'>+	struct bfa_port_cfg_s	pport_cfg;	/*  pport cfg */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Dynamic field - info from BFA</div><div class='hunk'>@@ -890,19 +887,20 @@ struct bfa_port_attr_s {</div><div class='ctx'> 	enum bfa_port_speed	speed;		/*  current speed */</div><div class='ctx'> 	enum bfa_port_topology	topology;	/*  current topology */</div><div class='ctx'> 	bfa_boolean_t		beacon;		/*  current beacon status */</div><div class='del'>-	bfa_boolean_t		link_e2e_beacon; /*  link beacon is on */</div><div class='del'>-	bfa_boolean_t	bbsc_op_status;	/* fc credit recovery oper state */</div><div class='add'>+	bfa_boolean_t		link_e2e_beacon; /* link beacon is on */</div><div class='add'>+	bfa_boolean_t		bbsc_op_status;	/* fc credit recovery oper</div><div class='add'>+						 * state */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Dynamic field - info from FCS</div><div class='ctx'> 	 */</div><div class='del'>-	u32		pid;		/*  port ID */</div><div class='add'>+	u32			pid;		/*  port ID */</div><div class='ctx'> 	enum bfa_port_type	port_type;	/*  current topology */</div><div class='del'>-	u32		loopback;	/*  external loopback */</div><div class='del'>-	u32		authfail;	/*  auth fail state */</div><div class='add'>+	u32			loopback;	/*  external loopback */</div><div class='add'>+	u32			authfail;	/*  auth fail state */</div><div class='ctx'> </div><div class='ctx'> 	/* FCoE specific  */</div><div class='del'>-	u16		fcoe_vlan;</div><div class='add'>+	u16			fcoe_vlan;</div><div class='ctx'> 	u8			rsvd1[2];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -910,48 +908,48 @@ struct bfa_port_attr_s {</div><div class='ctx'>  *	      Port FCP mappings.</div><div class='ctx'>  */</div><div class='ctx'> struct bfa_port_fcpmap_s {</div><div class='del'>-	char		osdevname[256];</div><div class='add'>+	char	osdevname[256];</div><div class='ctx'> 	u32	bus;</div><div class='ctx'> 	u32	target;</div><div class='ctx'> 	u32	oslun;</div><div class='ctx'> 	u32	fcid;</div><div class='del'>-	wwn_t	   nwwn;</div><div class='del'>-	wwn_t	   pwwn;</div><div class='add'>+	wwn_t	nwwn;</div><div class='add'>+	wwn_t	pwwn;</div><div class='ctx'> 	u64	fcplun;</div><div class='del'>-	char		luid[256];</div><div class='add'>+	char	luid[256];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	      Port RNID info.</div><div class='ctx'>  */</div><div class='ctx'> struct bfa_port_rnid_s {</div><div class='del'>-	wwn_t	     wwn;</div><div class='add'>+	wwn_t	  wwn;</div><div class='ctx'> 	u32	  unittype;</div><div class='ctx'> 	u32	  portid;</div><div class='ctx'> 	u32	  attached_nodes_num;</div><div class='ctx'> 	u16	  ip_version;</div><div class='ctx'> 	u16	  udp_port;</div><div class='del'>-	u8	   ipaddr[16];</div><div class='add'>+	u8	  ipaddr[16];</div><div class='ctx'> 	u16	  rsvd;</div><div class='ctx'> 	u16	  topologydiscoveryflags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #pragma pack(1)</div><div class='ctx'> struct bfa_fcport_fcf_s {</div><div class='del'>-	wwn_t	   name;	   /*  FCF name		 */</div><div class='del'>-	wwn_t	   fabric_name;    /*  Fabric Name	      */</div><div class='del'>-	u8		fipenabled;	/*  FIP enabled or not */</div><div class='del'>-	u8		fipfailed;	/*  FIP failed or not	*/</div><div class='del'>-	u8		resv[2];</div><div class='del'>-	u8	 pri;	    /*  FCF priority	     */</div><div class='del'>-	u8	 version;	/*  FIP version used	 */</div><div class='del'>-	u8	 available;      /*  Available  for  login    */</div><div class='del'>-	u8	 fka_disabled;   /*  FKA is disabled	  */</div><div class='del'>-	u8	 maxsz_verified; /*  FCoE max size verified   */</div><div class='del'>-	u8	 fc_map[3];      /*  FC map		   */</div><div class='del'>-	__be16	 vlan;	   /*  FCoE vlan tag/priority   */</div><div class='del'>-	u32	fka_adv_per;    /*  FIP  ka advert. period   */</div><div class='del'>-	mac_t	   mac;	    /*  FCF mac		  */</div><div class='add'>+	wwn_t	name;		/*  FCF name		   */</div><div class='add'>+	wwn_t	fabric_name;    /*  Fabric Name		   */</div><div class='add'>+	u8	fipenabled;	/*  FIP enabled or not	   */</div><div class='add'>+	u8	fipfailed;	/*  FIP failed or not	   */</div><div class='add'>+	u8	resv[2];</div><div class='add'>+	u8	pri;		/*  FCF priority	   */</div><div class='add'>+	u8	version;	/*  FIP version used	   */</div><div class='add'>+	u8	available;      /*  Available for login    */</div><div class='add'>+	u8	fka_disabled;   /*  FKA is disabled	   */</div><div class='add'>+	u8	maxsz_verified; /*  FCoE max size verified */</div><div class='add'>+	u8	fc_map[3];      /*  FC map		   */</div><div class='add'>+	__be16	vlan;		/*  FCoE vlan tag/priority */</div><div class='add'>+	u32	fka_adv_per;    /*  FIP  ka advert. period */</div><div class='add'>+	mac_t	mac;		/*  FCF mac		   */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -981,7 +979,7 @@ struct bfa_port_link_s {</div><div class='ctx'> 	u8	 linkstate_rsn;	/*  bfa_port_linkstate_rsn_t */</div><div class='ctx'> 	u8	 topology;	/*  P2P/LOOP bfa_port_topology */</div><div class='ctx'> 	u8	 speed;		/*  Link speed (1/2/4/8 G) */</div><div class='del'>-	u32	linkstate_opt;  /*  Linkstate optional data (debug) */</div><div class='add'>+	u32	 linkstate_opt; /*  Linkstate optional data (debug) */</div><div class='ctx'> 	u8	 trunked;	/*  Trunked or not (1 or 0) */</div><div class='ctx'> 	u8	 resvd[3];</div><div class='ctx'> 	struct bfa_qos_attr_s  qos_attr;   /* QoS Attributes */</div><div class='hunk'>@@ -1035,7 +1033,7 @@ struct bfa_rport_hal_stats_s {</div><div class='ctx'> 	u32        sm_fwc_del;	    /*  fw create: delete events   */</div><div class='ctx'> 	u32        sm_fwc_off;	    /*  fw create: offline events  */</div><div class='ctx'> 	u32        sm_fwc_hwf;	    /*  fw create: IOC down        */</div><div class='del'>-	u32        sm_fwc_unexp;	    /*  fw create: exception events*/</div><div class='add'>+	u32        sm_fwc_unexp;    /*  fw create: exception events*/</div><div class='ctx'> 	u32        sm_on_off;	    /*  online: offline events     */</div><div class='ctx'> 	u32        sm_on_del;	    /*  online: delete events      */</div><div class='ctx'> 	u32        sm_on_hwf;	    /*  online: IOC down events    */</div><div class='hunk'>@@ -1043,25 +1041,25 @@ struct bfa_rport_hal_stats_s {</div><div class='ctx'> 	u32        sm_fwd_rsp;	    /*  fw delete: fw responses    */</div><div class='ctx'> 	u32        sm_fwd_del;	    /*  fw delete: delete events   */</div><div class='ctx'> 	u32        sm_fwd_hwf;	    /*  fw delete: IOC down events */</div><div class='del'>-	u32        sm_fwd_unexp;	    /*  fw delete: exception events*/</div><div class='add'>+	u32        sm_fwd_unexp;    /*  fw delete: exception events*/</div><div class='ctx'> 	u32        sm_off_del;	    /*  offline: delete events     */</div><div class='ctx'> 	u32        sm_off_on;	    /*  offline: online events     */</div><div class='ctx'> 	u32        sm_off_hwf;	    /*  offline: IOC down events   */</div><div class='del'>-	u32        sm_off_unexp;	    /*  offline: exception events  */</div><div class='del'>-	u32        sm_del_fwrsp;	    /*  delete: fw responses       */</div><div class='add'>+	u32        sm_off_unexp;    /*  offline: exception events  */</div><div class='add'>+	u32        sm_del_fwrsp;    /*  delete: fw responses       */</div><div class='ctx'> 	u32        sm_del_hwf;	    /*  delete: IOC down events    */</div><div class='del'>-	u32        sm_del_unexp;	    /*  delete: exception events   */</div><div class='del'>-	u32        sm_delp_fwrsp;	    /*  delete pend: fw responses  */</div><div class='add'>+	u32        sm_del_unexp;    /*  delete: exception events   */</div><div class='add'>+	u32        sm_delp_fwrsp;   /*  delete pend: fw responses  */</div><div class='ctx'> 	u32        sm_delp_hwf;	    /*  delete pend: IOC downs     */</div><div class='del'>-	u32        sm_delp_unexp;	    /*  delete pend: exceptions    */</div><div class='del'>-	u32        sm_offp_fwrsp;	    /*  off-pending: fw responses  */</div><div class='add'>+	u32        sm_delp_unexp;   /*  delete pend: exceptions    */</div><div class='add'>+	u32        sm_offp_fwrsp;   /*  off-pending: fw responses  */</div><div class='ctx'> 	u32        sm_offp_del;	    /*  off-pending: deletes       */</div><div class='ctx'> 	u32        sm_offp_hwf;	    /*  off-pending: IOC downs     */</div><div class='del'>-	u32        sm_offp_unexp;	    /*  off-pending: exceptions    */</div><div class='add'>+	u32        sm_offp_unexp;   /*  off-pending: exceptions    */</div><div class='ctx'> 	u32        sm_iocd_off;	    /*  IOC down: offline events   */</div><div class='ctx'> 	u32        sm_iocd_del;	    /*  IOC down: delete events    */</div><div class='ctx'> 	u32        sm_iocd_on;	    /*  IOC down: online events    */</div><div class='del'>-	u32        sm_iocd_unexp;	    /*  IOC down: exceptions       */</div><div class='add'>+	u32        sm_iocd_unexp;   /*  IOC down: exceptions       */</div><div class='ctx'> 	u32        rsvd;</div><div class='ctx'> };</div><div class='ctx'> #pragma pack(1)</div><div class='hunk'>@@ -1069,9 +1067,9 @@ struct bfa_rport_hal_stats_s {</div><div class='ctx'>  *  Rport's QoS attributes</div><div class='ctx'>  */</div><div class='ctx'> struct bfa_rport_qos_attr_s {</div><div class='del'>-	u8			qos_priority;  /*  rport's QoS priority   */</div><div class='del'>-	u8			rsvd[3];</div><div class='del'>-	u32	       qos_flow_id;	  /*  QoS flow Id	 */</div><div class='add'>+	u8		qos_priority;	/*  rport's QoS priority   */</div><div class='add'>+	u8		rsvd[3];</div><div class='add'>+	u32		qos_flow_id;	/*  QoS flow Id	 */</div><div class='ctx'> };</div><div class='ctx'> #pragma pack()</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/bfa/bfa_fc.h b/drivers/scsi/bfa/bfa_fc.h<br/>index 50b6a1c86195..8d0b88f67a38 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfa_fc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfa_fc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfa_fc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/bfa/bfa_fc.h</a></div><div class='hunk'>@@ -56,161 +56,6 @@ struct scsi_cdb_s {</div><div class='ctx'> </div><div class='ctx'> #define SCSI_MAX_ALLOC_LEN      0xFF    /* maximum allocarion length */</div><div class='ctx'> </div><div class='del'>-#define SCSI_SENSE_CUR_ERR	0x70</div><div class='del'>-#define SCSI_SENSE_DEF_ERR	0x71</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SCSI additional sense codes</div><div class='del'>- */</div><div class='del'>-#define SCSI_ASC_LUN_NOT_READY		0x04</div><div class='del'>-#define SCSI_ASC_LUN_NOT_SUPPORTED	0x25</div><div class='del'>-#define SCSI_ASC_TOCC			0x3F</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SCSI additional sense code qualifiers</div><div class='del'>- */</div><div class='del'>-#define SCSI_ASCQ_MAN_INTR_REQ		0x03	/* manual intervention req */</div><div class='del'>-#define SCSI_ASCQ_RL_DATA_CHANGED	0x0E	/* report luns data changed */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Methods of reporting informational exceptions</div><div class='del'>- */</div><div class='del'>-#define SCSI_MP_IEC_UNIT_ATTN		0x2	/* generate unit attention */</div><div class='del'>-</div><div class='del'>-struct scsi_report_luns_data_s {</div><div class='del'>-	u32		lun_list_length;	/* length of LUN list length */</div><div class='del'>-	u32		reserved;</div><div class='del'>-	struct scsi_lun	lun[1];			/* first LUN in lun list */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct scsi_inquiry_vendor_s {</div><div class='del'>-	u8	vendor_id[8];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct scsi_inquiry_prodid_s {</div><div class='del'>-	u8	product_id[16];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct scsi_inquiry_prodrev_s {</div><div class='del'>-	u8	product_rev[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct scsi_inquiry_data_s {</div><div class='del'>-#ifdef __BIG_ENDIAN</div><div class='del'>-	u8		peripheral_qual:3;	/* peripheral qualifier */</div><div class='del'>-	u8		device_type:5;		/* peripheral device type */</div><div class='del'>-	u8		rmb:1;			/* removable medium bit */</div><div class='del'>-	u8		device_type_mod:7;	/* device type modifier */</div><div class='del'>-	u8		version;</div><div class='del'>-	u8		aenc:1;		/* async evt notification capability */</div><div class='del'>-	u8		trm_iop:1;	/* terminate I/O process */</div><div class='del'>-	u8		norm_aca:1;	/* normal ACA supported */</div><div class='del'>-	u8		hi_support:1;	/* SCSI-3: supports REPORT LUNS */</div><div class='del'>-	u8		rsp_data_format:4;</div><div class='del'>-	u8		additional_len;</div><div class='del'>-	u8		sccs:1;</div><div class='del'>-	u8		reserved1:7;</div><div class='del'>-	u8		reserved2:1;</div><div class='del'>-	u8		enc_serv:1;	/* enclosure service component */</div><div class='del'>-	u8		reserved3:1;</div><div class='del'>-	u8		multi_port:1;	/* multi-port device */</div><div class='del'>-	u8		m_chngr:1;	/* device in medium transport element */</div><div class='del'>-	u8		ack_req_q:1;	/* SIP specific bit */</div><div class='del'>-	u8		addr32:1;	/* SIP specific bit */</div><div class='del'>-	u8		addr16:1;	/* SIP specific bit */</div><div class='del'>-	u8		rel_adr:1;	/* relative address */</div><div class='del'>-	u8		w_bus32:1;</div><div class='del'>-	u8		w_bus16:1;</div><div class='del'>-	u8		synchronous:1;</div><div class='del'>-	u8		linked_commands:1;</div><div class='del'>-	u8		trans_dis:1;</div><div class='del'>-	u8		cmd_queue:1;	/* command queueing supported */</div><div class='del'>-	u8		soft_reset:1;	/* soft reset alternative (VS) */</div><div class='del'>-#else</div><div class='del'>-	u8		device_type:5;	/* peripheral device type */</div><div class='del'>-	u8		peripheral_qual:3; /* peripheral qualifier */</div><div class='del'>-	u8		device_type_mod:7; /* device type modifier */</div><div class='del'>-	u8		rmb:1;		/* removable medium bit */</div><div class='del'>-	u8		version;</div><div class='del'>-	u8		rsp_data_format:4;</div><div class='del'>-	u8		hi_support:1;	/* SCSI-3: supports REPORT LUNS */</div><div class='del'>-	u8		norm_aca:1;	/* normal ACA supported */</div><div class='del'>-	u8		terminate_iop:1;/* terminate I/O process */</div><div class='del'>-	u8		aenc:1;		/* async evt notification capability */</div><div class='del'>-	u8		additional_len;</div><div class='del'>-	u8		reserved1:7;</div><div class='del'>-	u8		sccs:1;</div><div class='del'>-	u8		addr16:1;	/* SIP specific bit */</div><div class='del'>-	u8		addr32:1;	/* SIP specific bit */</div><div class='del'>-	u8		ack_req_q:1;	/* SIP specific bit */</div><div class='del'>-	u8		m_chngr:1;	/* device in medium transport element */</div><div class='del'>-	u8		multi_port:1;	/* multi-port device */</div><div class='del'>-	u8		reserved3:1;	/* TBD - Vendor Specific */</div><div class='del'>-	u8		enc_serv:1;	/* enclosure service component */</div><div class='del'>-	u8		reserved2:1;</div><div class='del'>-	u8		soft_seset:1;	/* soft reset alternative (VS) */</div><div class='del'>-	u8		cmd_queue:1;	/* command queueing supported */</div><div class='del'>-	u8		trans_dis:1;</div><div class='del'>-	u8		linked_commands:1;</div><div class='del'>-	u8		synchronous:1;</div><div class='del'>-	u8		w_bus16:1;</div><div class='del'>-	u8		w_bus32:1;</div><div class='del'>-	u8		rel_adr:1;	/* relative address */</div><div class='del'>-#endif</div><div class='del'>-	struct scsi_inquiry_vendor_s	vendor_id;</div><div class='del'>-	struct scsi_inquiry_prodid_s	product_id;</div><div class='del'>-	struct scsi_inquiry_prodrev_s	product_rev;</div><div class='del'>-	u8		vendor_specific[20];</div><div class='del'>-	u8		reserved4[40];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	SCSI sense data format</div><div class='del'>- */</div><div class='del'>-struct scsi_sense_s {</div><div class='del'>-#ifdef __BIG_ENDIAN</div><div class='del'>-	u8		valid:1;</div><div class='del'>-	u8		rsp_code:7;</div><div class='del'>-#else</div><div class='del'>-	u8		rsp_code:7;</div><div class='del'>-	u8		valid:1;</div><div class='del'>-#endif</div><div class='del'>-	u8		seg_num;</div><div class='del'>-#ifdef __BIG_ENDIAN</div><div class='del'>-	u8		file_mark:1;</div><div class='del'>-	u8		eom:1;		/* end of media */</div><div class='del'>-	u8		ili:1;		/* incorrect length indicator */</div><div class='del'>-	u8		reserved:1;</div><div class='del'>-	u8		sense_key:4;</div><div class='del'>-#else</div><div class='del'>-	u8		sense_key:4;</div><div class='del'>-	u8		reserved:1;</div><div class='del'>-	u8		ili:1;		/* incorrect length indicator */</div><div class='del'>-	u8		eom:1;		/* end of media */</div><div class='del'>-	u8		file_mark:1;</div><div class='del'>-#endif</div><div class='del'>-	u8		information[4];	/* device-type or cmd specific info */</div><div class='del'>-	u8		add_sense_length; /* additional sense length */</div><div class='del'>-	u8		command_info[4];/* command specific information */</div><div class='del'>-	u8		asc;		/* additional sense code */</div><div class='del'>-	u8		ascq;		/* additional sense code qualifier */</div><div class='del'>-	u8		fru_code;	/* field replaceable unit code */</div><div class='del'>-#ifdef __BIG_ENDIAN</div><div class='del'>-	u8		sksv:1;		/* sense key specific valid */</div><div class='del'>-	u8		c_d:1;		/* command/data bit */</div><div class='del'>-	u8		res1:2;</div><div class='del'>-	u8		bpv:1;		/* bit pointer valid */</div><div class='del'>-	u8		bpointer:3;	/* bit pointer */</div><div class='del'>-#else</div><div class='del'>-	u8		bpointer:3;	/* bit pointer */</div><div class='del'>-	u8		bpv:1;		/* bit pointer valid */</div><div class='del'>-	u8		res1:2;</div><div class='del'>-	u8		c_d:1;		/* command/data bit */</div><div class='del'>-	u8		sksv:1;		/* sense key specific valid */</div><div class='del'>-#endif</div><div class='del'>-	u8		fpointer[2];	/* field pointer */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Fibre Channel Header Structure (FCHS) definition</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/scsi/bfa/bfa_fcpim.c b/drivers/scsi/bfa/bfa_fcpim.c<br/>index e07bd4745d8b..f0f80e282e39 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfa_fcpim.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfa_fcpim.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfa_fcpim.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/bfa/bfa_fcpim.c</a></div><div class='hunk'>@@ -24,8 +24,6 @@ BFA_TRC_FILE(HAL, FCPIM);</div><div class='ctx'>  *  BFA ITNIM Related definitions</div><div class='ctx'>  */</div><div class='ctx'> static void bfa_itnim_update_del_itn_stats(struct bfa_itnim_s *itnim);</div><div class='del'>-static bfa_boolean_t bfa_ioim_lm_proc_rpl_data(struct bfa_ioim_s *ioim);</div><div class='del'>-static bfa_boolean_t bfa_ioim_lm_proc_inq_data(struct bfa_ioim_s *ioim);</div><div class='ctx'> static void bfa_ioim_lm_init(struct bfa_s *bfa);</div><div class='ctx'> </div><div class='ctx'> #define BFA_ITNIM_FROM_TAG(_fcpim, _tag)                                \</div><div class='hunk'>@@ -60,14 +58,6 @@ static void bfa_ioim_lm_init(struct bfa_s *bfa);</div><div class='ctx'> 	}								\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-#define bfa_ioim_rp_wwn(__ioim)						\</div><div class='del'>-	(((struct bfa_fcs_rport_s *)					\</div><div class='del'>-	 (__ioim)-&gt;itnim-&gt;rport-&gt;rport_drv)-&gt;pwwn)</div><div class='del'>-</div><div class='del'>-#define bfa_ioim_lp_wwn(__ioim)						\</div><div class='del'>-	((BFA_LPS_FROM_TAG(BFA_LPS_MOD((__ioim)-&gt;bfa),			\</div><div class='del'>-	(__ioim)-&gt;itnim-&gt;rport-&gt;rport_info.lp_tag))-&gt;pwwn)		\</div><div class='del'>-</div><div class='ctx'> #define bfa_itnim_sler_cb(__itnim) do {					\</div><div class='ctx'> 	if ((__itnim)-&gt;bfa-&gt;fcs)					\</div><div class='ctx'> 		bfa_cb_itnim_sler((__itnim)-&gt;ditn);      \</div><div class='hunk'>@@ -77,13 +67,6 @@ static void bfa_ioim_lm_init(struct bfa_s *bfa);</div><div class='ctx'> 	}								\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-enum bfa_ioim_lm_status {</div><div class='del'>-	BFA_IOIM_LM_PRESENT = 1,</div><div class='del'>-	BFA_IOIM_LM_LUN_NOT_SUP = 2,</div><div class='del'>-	BFA_IOIM_LM_RPL_DATA_CHANGED = 3,</div><div class='del'>-	BFA_IOIM_LM_LUN_NOT_RDY = 4,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum bfa_ioim_lm_ua_status {</div><div class='ctx'> 	BFA_IOIM_LM_UA_RESET = 0,</div><div class='ctx'> 	BFA_IOIM_LM_UA_SET = 1,</div><div class='hunk'>@@ -145,9 +128,6 @@ enum bfa_ioim_event {</div><div class='ctx'> 	BFA_IOIM_SM_TMDONE	= 16,	/*  IO cleanup from tskim */</div><div class='ctx'> 	BFA_IOIM_SM_HWFAIL	= 17,	/*  IOC h/w failure event */</div><div class='ctx'> 	BFA_IOIM_SM_IOTOV	= 18,	/*  ITN offline TOV */</div><div class='del'>-	BFA_IOIM_SM_LM_LUN_NOT_SUP = 19,/*  lunmask lun not supported */</div><div class='del'>-	BFA_IOIM_SM_LM_RPL_DC = 20,	/*  lunmask report-lun data changed */</div><div class='del'>-	BFA_IOIM_SM_LM_LUN_NOT_RDY = 21,/*  lunmask lun not ready */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -245,9 +225,6 @@ static void __bfa_cb_ioim_abort(void *cbarg, bfa_boolean_t complete);</div><div class='ctx'> static void __bfa_cb_ioim_failed(void *cbarg, bfa_boolean_t complete);</div><div class='ctx'> static void __bfa_cb_ioim_pathtov(void *cbarg, bfa_boolean_t complete);</div><div class='ctx'> static bfa_boolean_t    bfa_ioim_is_abortable(struct bfa_ioim_s *ioim);</div><div class='del'>-static void __bfa_cb_ioim_lm_lun_not_sup(void *cbarg, bfa_boolean_t complete);</div><div class='del'>-static void __bfa_cb_ioim_lm_rpl_dc(void *cbarg, bfa_boolean_t complete);</div><div class='del'>-static void __bfa_cb_ioim_lm_lun_not_rdy(void *cbarg, bfa_boolean_t complete);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * forward declaration of BFA IO state machine</div><div class='hunk'>@@ -445,12 +422,6 @@ bfa_fcpim_add_stats(struct bfa_itnim_iostats_s *lstats,</div><div class='ctx'> 	bfa_fcpim_add_iostats(lstats, rstats, output_reqs);</div><div class='ctx'> 	bfa_fcpim_add_iostats(lstats, rstats, rd_throughput);</div><div class='ctx'> 	bfa_fcpim_add_iostats(lstats, rstats, wr_throughput);</div><div class='del'>-	bfa_fcpim_add_iostats(lstats, rstats, lm_lun_across_sg);</div><div class='del'>-	bfa_fcpim_add_iostats(lstats, rstats, lm_lun_not_sup);</div><div class='del'>-	bfa_fcpim_add_iostats(lstats, rstats, lm_rpl_data_changed);</div><div class='del'>-	bfa_fcpim_add_iostats(lstats, rstats, lm_wire_residue_changed);</div><div class='del'>-	bfa_fcpim_add_iostats(lstats, rstats, lm_small_buf_addresidue);</div><div class='del'>-	bfa_fcpim_add_iostats(lstats, rstats, lm_lun_not_rdy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bfa_status_t</div><div class='hunk'>@@ -1580,27 +1551,6 @@ bfa_ioim_sm_uninit(struct bfa_ioim_s *ioim, enum bfa_ioim_event event)</div><div class='ctx'> 			__bfa_cb_ioim_abort, ioim);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case BFA_IOIM_SM_LM_LUN_NOT_SUP:</div><div class='del'>-		bfa_sm_set_state(ioim, bfa_ioim_sm_hcb);</div><div class='del'>-		bfa_ioim_move_to_comp_q(ioim);</div><div class='del'>-		bfa_cb_queue(ioim-&gt;bfa, &amp;ioim-&gt;hcb_qe,</div><div class='del'>-			__bfa_cb_ioim_lm_lun_not_sup, ioim);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case BFA_IOIM_SM_LM_RPL_DC:</div><div class='del'>-		bfa_sm_set_state(ioim, bfa_ioim_sm_hcb);</div><div class='del'>-		bfa_ioim_move_to_comp_q(ioim);</div><div class='del'>-		bfa_cb_queue(ioim-&gt;bfa, &amp;ioim-&gt;hcb_qe,</div><div class='del'>-				__bfa_cb_ioim_lm_rpl_dc, ioim);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case BFA_IOIM_SM_LM_LUN_NOT_RDY:</div><div class='del'>-		bfa_sm_set_state(ioim, bfa_ioim_sm_hcb);</div><div class='del'>-		bfa_ioim_move_to_comp_q(ioim);</div><div class='del'>-		bfa_cb_queue(ioim-&gt;bfa, &amp;ioim-&gt;hcb_qe,</div><div class='del'>-			__bfa_cb_ioim_lm_lun_not_rdy, ioim);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	default:</div><div class='ctx'> 		bfa_sm_fault(ioim-&gt;bfa, event);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2160,243 +2110,6 @@ bfa_ioim_lm_init(struct bfa_s *bfa)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Validate LUN for LUN masking</div><div class='del'>- */</div><div class='del'>-static enum bfa_ioim_lm_status</div><div class='del'>-bfa_ioim_lm_check(struct bfa_ioim_s *ioim, struct bfa_lps_s *lps,</div><div class='del'>-		struct bfa_rport_s *rp, struct scsi_lun lun)</div><div class='del'>-{</div><div class='del'>-	u8 i;</div><div class='del'>-	struct bfa_lun_mask_s *lun_list = bfa_get_lun_mask_list(ioim-&gt;bfa);</div><div class='del'>-	struct scsi_cmnd *cmnd = (struct scsi_cmnd *)ioim-&gt;dio;</div><div class='del'>-	struct scsi_cdb_s *cdb = (struct scsi_cdb_s *)cmnd-&gt;cmnd;</div><div class='del'>-</div><div class='del'>-	if ((cdb-&gt;scsi_cdb[0] == REPORT_LUNS) &amp;&amp;</div><div class='del'>-	    (scsilun_to_int((struct scsi_lun *)&amp;lun) == 0)) {</div><div class='del'>-		ioim-&gt;proc_rsp_data = bfa_ioim_lm_proc_rpl_data;</div><div class='del'>-		return BFA_IOIM_LM_PRESENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_LUN_MASK_CFG; i++) {</div><div class='del'>-</div><div class='del'>-		if (lun_list[i].state != BFA_IOIM_LUN_MASK_ACTIVE)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if ((scsilun_to_int((struct scsi_lun *)&amp;lun_list[i].lun) ==</div><div class='del'>-		    scsilun_to_int((struct scsi_lun *)&amp;lun))</div><div class='del'>-		    &amp;&amp; (rp-&gt;rport_tag == lun_list[i].rp_tag)</div><div class='del'>-		    &amp;&amp; ((u8)ioim-&gt;itnim-&gt;rport-&gt;rport_info.lp_tag ==</div><div class='del'>-						lun_list[i].lp_tag)) {</div><div class='del'>-			bfa_trc(ioim-&gt;bfa, lun_list[i].rp_tag);</div><div class='del'>-			bfa_trc(ioim-&gt;bfa, lun_list[i].lp_tag);</div><div class='del'>-			bfa_trc(ioim-&gt;bfa, scsilun_to_int(</div><div class='del'>-				(struct scsi_lun *)&amp;lun_list[i].lun));</div><div class='del'>-</div><div class='del'>-			if ((lun_list[i].ua == BFA_IOIM_LM_UA_SET) &amp;&amp;</div><div class='del'>-			    ((cdb-&gt;scsi_cdb[0] != INQUIRY) ||</div><div class='del'>-			    (cdb-&gt;scsi_cdb[0] != REPORT_LUNS))) {</div><div class='del'>-				lun_list[i].ua = BFA_IOIM_LM_UA_RESET;</div><div class='del'>-				return BFA_IOIM_LM_RPL_DATA_CHANGED;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (cdb-&gt;scsi_cdb[0] == REPORT_LUNS)</div><div class='del'>-				ioim-&gt;proc_rsp_data = bfa_ioim_lm_proc_rpl_data;</div><div class='del'>-</div><div class='del'>-			return BFA_IOIM_LM_PRESENT;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((cdb-&gt;scsi_cdb[0] == INQUIRY) &amp;&amp;</div><div class='del'>-	    (scsilun_to_int((struct scsi_lun *)&amp;lun) == 0)) {</div><div class='del'>-		ioim-&gt;proc_rsp_data = bfa_ioim_lm_proc_inq_data;</div><div class='del'>-		return BFA_IOIM_LM_PRESENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cdb-&gt;scsi_cdb[0] == TEST_UNIT_READY)</div><div class='del'>-		return BFA_IOIM_LM_LUN_NOT_RDY;</div><div class='del'>-</div><div class='del'>-	return BFA_IOIM_LM_LUN_NOT_SUP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bfa_boolean_t</div><div class='del'>-bfa_ioim_lm_proc_rsp_data_dummy(struct bfa_ioim_s *ioim)</div><div class='del'>-{</div><div class='del'>-	return BFA_TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-bfa_ioim_lm_fetch_lun(struct bfa_ioim_s *ioim, u8 *rl_data, int offset,</div><div class='del'>-		int buf_lun_cnt)</div><div class='del'>-{</div><div class='del'>-	struct bfa_lun_mask_s *lun_list = bfa_get_lun_mask_list(ioim-&gt;bfa);</div><div class='del'>-	struct scsi_lun *lun_data = (struct scsi_lun *)(rl_data + offset);</div><div class='del'>-	struct scsi_lun lun;</div><div class='del'>-	int i, j;</div><div class='del'>-</div><div class='del'>-	bfa_trc(ioim-&gt;bfa, buf_lun_cnt);</div><div class='del'>-	for (j = 0; j &lt; buf_lun_cnt; j++) {</div><div class='del'>-		lun = *((struct scsi_lun *)(lun_data + j));</div><div class='del'>-		for (i = 0; i &lt; MAX_LUN_MASK_CFG; i++) {</div><div class='del'>-			if (lun_list[i].state != BFA_IOIM_LUN_MASK_ACTIVE)</div><div class='del'>-				continue;</div><div class='del'>-			if ((lun_list[i].rp_wwn == bfa_ioim_rp_wwn(ioim)) &amp;&amp;</div><div class='del'>-			    (lun_list[i].lp_wwn == bfa_ioim_lp_wwn(ioim)) &amp;&amp;</div><div class='del'>-			    (scsilun_to_int((struct scsi_lun *)&amp;lun_list[i].lun)</div><div class='del'>-				== scsilun_to_int((struct scsi_lun *)&amp;lun))) {</div><div class='del'>-				lun_list[i].state = BFA_IOIM_LUN_MASK_FETCHED;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} /* next lun in mask DB */</div><div class='del'>-	} /* next lun in buf */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-bfa_ioim_lm_update_lun_sg(struct bfa_ioim_s *ioim, u32 *pgdlen,</div><div class='del'>-		struct scsi_report_luns_data_s *rl)</div><div class='del'>-{</div><div class='del'>-	struct scsi_cmnd *cmnd = (struct scsi_cmnd *)ioim-&gt;dio;</div><div class='del'>-	struct scatterlist *sg = scsi_sglist(cmnd);</div><div class='del'>-	struct bfa_lun_mask_s *lun_list = bfa_get_lun_mask_list(ioim-&gt;bfa);</div><div class='del'>-	struct scsi_lun *prev_rl_data = NULL, *base_rl_data;</div><div class='del'>-	int i, j, sgeid, lun_fetched_cnt = 0, prev_sg_len = 0, base_count;</div><div class='del'>-	int lun_across_sg_bytes, bytes_from_next_buf;</div><div class='del'>-	u64	last_lun, temp_last_lun;</div><div class='del'>-</div><div class='del'>-	/* fetch luns from the first sg element */</div><div class='del'>-	bfa_ioim_lm_fetch_lun(ioim, (u8 *)(rl-&gt;lun), 0,</div><div class='del'>-			(sg_dma_len(sg) / sizeof(struct scsi_lun)) - 1);</div><div class='del'>-</div><div class='del'>-	/* fetch luns from multiple sg elements */</div><div class='del'>-	scsi_for_each_sg(cmnd, sg, scsi_sg_count(cmnd), sgeid) {</div><div class='del'>-		if (sgeid == 0) {</div><div class='del'>-			prev_sg_len = sg_dma_len(sg);</div><div class='del'>-			prev_rl_data = (struct scsi_lun *)</div><div class='del'>-					phys_to_virt(sg_dma_address(sg));</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* if the buf is having more data */</div><div class='del'>-		lun_across_sg_bytes = prev_sg_len % sizeof(struct scsi_lun);</div><div class='del'>-		if (lun_across_sg_bytes) {</div><div class='del'>-			bfa_trc(ioim-&gt;bfa, lun_across_sg_bytes);</div><div class='del'>-			bfa_stats(ioim-&gt;itnim, lm_lun_across_sg);</div><div class='del'>-			bytes_from_next_buf = sizeof(struct scsi_lun) -</div><div class='del'>-					      lun_across_sg_bytes;</div><div class='del'>-</div><div class='del'>-			/* from next buf take higher bytes */</div><div class='del'>-			temp_last_lun = *((u64 *)</div><div class='del'>-					  phys_to_virt(sg_dma_address(sg)));</div><div class='del'>-			last_lun |= temp_last_lun &gt;&gt;</div><div class='del'>-				    (lun_across_sg_bytes * BITS_PER_BYTE);</div><div class='del'>-</div><div class='del'>-			/* from prev buf take higher bytes */</div><div class='del'>-			temp_last_lun = *((u64 *)(prev_rl_data +</div><div class='del'>-					  (prev_sg_len - lun_across_sg_bytes)));</div><div class='del'>-			temp_last_lun &gt;&gt;= bytes_from_next_buf * BITS_PER_BYTE;</div><div class='del'>-			last_lun = last_lun | (temp_last_lun &lt;&lt;</div><div class='del'>-				   (bytes_from_next_buf * BITS_PER_BYTE));</div><div class='del'>-</div><div class='del'>-			bfa_ioim_lm_fetch_lun(ioim, (u8 *)&amp;last_lun, 0, 1);</div><div class='del'>-		} else</div><div class='del'>-			bytes_from_next_buf = 0;</div><div class='del'>-</div><div class='del'>-		*pgdlen += sg_dma_len(sg);</div><div class='del'>-		prev_sg_len = sg_dma_len(sg);</div><div class='del'>-		prev_rl_data = (struct scsi_lun *)</div><div class='del'>-				phys_to_virt(sg_dma_address(sg));</div><div class='del'>-		bfa_ioim_lm_fetch_lun(ioim, (u8 *)prev_rl_data,</div><div class='del'>-				bytes_from_next_buf,</div><div class='del'>-				sg_dma_len(sg) / sizeof(struct scsi_lun));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* update the report luns data - based on fetched luns */</div><div class='del'>-	sg = scsi_sglist(cmnd);</div><div class='del'>-	base_rl_data = (struct scsi_lun *)rl-&gt;lun;</div><div class='del'>-	base_count = (sg_dma_len(sg) / sizeof(struct scsi_lun)) - 1;</div><div class='del'>-	for (i = 0, j = 0; i &lt; MAX_LUN_MASK_CFG; i++) {</div><div class='del'>-		if (lun_list[i].state == BFA_IOIM_LUN_MASK_FETCHED) {</div><div class='del'>-			base_rl_data[j] = lun_list[i].lun;</div><div class='del'>-			lun_list[i].state = BFA_IOIM_LUN_MASK_ACTIVE;</div><div class='del'>-			j++;</div><div class='del'>-			lun_fetched_cnt++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (j &gt; base_count) {</div><div class='del'>-			j = 0;</div><div class='del'>-			sg = sg_next(sg);</div><div class='del'>-			base_rl_data = (struct scsi_lun *)</div><div class='del'>-					phys_to_virt(sg_dma_address(sg));</div><div class='del'>-			base_count = sg_dma_len(sg) / sizeof(struct scsi_lun);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bfa_trc(ioim-&gt;bfa, lun_fetched_cnt);</div><div class='del'>-	return lun_fetched_cnt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bfa_boolean_t</div><div class='del'>-bfa_ioim_lm_proc_inq_data(struct bfa_ioim_s *ioim)</div><div class='del'>-{</div><div class='del'>-	struct scsi_inquiry_data_s *inq;</div><div class='del'>-	struct scatterlist *sg = scsi_sglist((struct scsi_cmnd *)ioim-&gt;dio);</div><div class='del'>-</div><div class='del'>-	ioim-&gt;proc_rsp_data = bfa_ioim_lm_proc_rsp_data_dummy;</div><div class='del'>-	inq = (struct scsi_inquiry_data_s *)phys_to_virt(sg_dma_address(sg));</div><div class='del'>-</div><div class='del'>-	bfa_trc(ioim-&gt;bfa, inq-&gt;device_type);</div><div class='del'>-	inq-&gt;peripheral_qual = SCSI_INQ_PQ_NOT_CON;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bfa_boolean_t</div><div class='del'>-bfa_ioim_lm_proc_rpl_data(struct bfa_ioim_s *ioim)</div><div class='del'>-{</div><div class='del'>-	struct scsi_cmnd *cmnd = (struct scsi_cmnd *)ioim-&gt;dio;</div><div class='del'>-	struct scatterlist *sg = scsi_sglist(cmnd);</div><div class='del'>-	struct bfi_ioim_rsp_s *m;</div><div class='del'>-	struct scsi_report_luns_data_s *rl = NULL;</div><div class='del'>-	int lun_count = 0, lun_fetched_cnt = 0;</div><div class='del'>-	u32 residue, pgdlen = 0;</div><div class='del'>-</div><div class='del'>-	ioim-&gt;proc_rsp_data = bfa_ioim_lm_proc_rsp_data_dummy;</div><div class='del'>-	if (bfa_get_lun_mask_status(ioim-&gt;bfa) != BFA_LUNMASK_ENABLED)</div><div class='del'>-		return BFA_TRUE;</div><div class='del'>-</div><div class='del'>-	m = (struct bfi_ioim_rsp_s *) &amp;ioim-&gt;iosp-&gt;comp_rspmsg;</div><div class='del'>-	if (m-&gt;scsi_status == SCSI_STATUS_CHECK_CONDITION)</div><div class='del'>-		return BFA_TRUE;</div><div class='del'>-</div><div class='del'>-	pgdlen = sg_dma_len(sg);</div><div class='del'>-	bfa_trc(ioim-&gt;bfa, pgdlen);</div><div class='del'>-	rl = (struct scsi_report_luns_data_s *)phys_to_virt(sg_dma_address(sg));</div><div class='del'>-	lun_count = cpu_to_be32(rl-&gt;lun_list_length) / sizeof(struct scsi_lun);</div><div class='del'>-	lun_fetched_cnt = bfa_ioim_lm_update_lun_sg(ioim, &amp;pgdlen, rl);</div><div class='del'>-</div><div class='del'>-	if (lun_count == lun_fetched_cnt)</div><div class='del'>-		return BFA_TRUE;</div><div class='del'>-</div><div class='del'>-	bfa_trc(ioim-&gt;bfa, lun_count);</div><div class='del'>-	bfa_trc(ioim-&gt;bfa, lun_fetched_cnt);</div><div class='del'>-	bfa_trc(ioim-&gt;bfa, be32_to_cpu(rl-&gt;lun_list_length));</div><div class='del'>-</div><div class='del'>-	if (be32_to_cpu(rl-&gt;lun_list_length) &lt;= pgdlen)</div><div class='del'>-		rl-&gt;lun_list_length = be32_to_cpu(lun_fetched_cnt) *</div><div class='del'>-				      sizeof(struct scsi_lun);</div><div class='del'>-	else</div><div class='del'>-		bfa_stats(ioim-&gt;itnim, lm_small_buf_addresidue);</div><div class='del'>-</div><div class='del'>-	bfa_trc(ioim-&gt;bfa, be32_to_cpu(rl-&gt;lun_list_length));</div><div class='del'>-	bfa_trc(ioim-&gt;bfa, be32_to_cpu(m-&gt;residue));</div><div class='del'>-</div><div class='del'>-	residue = be32_to_cpu(m-&gt;residue);</div><div class='del'>-	residue += (lun_count - lun_fetched_cnt) * sizeof(struct scsi_lun);</div><div class='del'>-	bfa_stats(ioim-&gt;itnim, lm_wire_residue_changed);</div><div class='del'>-	m-&gt;residue = be32_to_cpu(residue);</div><div class='del'>-	bfa_trc(ioim-&gt;bfa, ioim-&gt;nsges);</div><div class='del'>-	return BFA_FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> __bfa_cb_ioim_good_comp(void *cbarg, bfa_boolean_t complete)</div><div class='ctx'> {</div><div class='hunk'>@@ -2454,83 +2167,6 @@ __bfa_cb_ioim_comp(void *cbarg, bfa_boolean_t complete)</div><div class='ctx'> 			  m-&gt;scsi_status, sns_len, snsinfo, residue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-__bfa_cb_ioim_lm_lun_not_sup(void *cbarg, bfa_boolean_t complete)</div><div class='del'>-{</div><div class='del'>-	struct bfa_ioim_s *ioim = cbarg;</div><div class='del'>-	int sns_len = 0xD;</div><div class='del'>-	u32 residue = scsi_bufflen((struct scsi_cmnd *)ioim-&gt;dio);</div><div class='del'>-	struct scsi_sense_s *snsinfo;</div><div class='del'>-</div><div class='del'>-	if (!complete) {</div><div class='del'>-		bfa_sm_send_event(ioim, BFA_IOIM_SM_HCB);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snsinfo = (struct scsi_sense_s *)BFA_SNSINFO_FROM_TAG(</div><div class='del'>-					ioim-&gt;fcpim-&gt;fcp, ioim-&gt;iotag);</div><div class='del'>-	snsinfo-&gt;rsp_code = SCSI_SENSE_CUR_ERR;</div><div class='del'>-	snsinfo-&gt;add_sense_length = 0xa;</div><div class='del'>-	snsinfo-&gt;asc = SCSI_ASC_LUN_NOT_SUPPORTED;</div><div class='del'>-	snsinfo-&gt;sense_key = ILLEGAL_REQUEST;</div><div class='del'>-	bfa_trc(ioim-&gt;bfa, residue);</div><div class='del'>-	bfa_cb_ioim_done(ioim-&gt;bfa-&gt;bfad, ioim-&gt;dio, BFI_IOIM_STS_OK,</div><div class='del'>-			SCSI_STATUS_CHECK_CONDITION, sns_len,</div><div class='del'>-			(u8 *)snsinfo, residue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-__bfa_cb_ioim_lm_rpl_dc(void *cbarg, bfa_boolean_t complete)</div><div class='del'>-{</div><div class='del'>-	struct bfa_ioim_s *ioim = cbarg;</div><div class='del'>-	int sns_len = 0xD;</div><div class='del'>-	u32 residue = scsi_bufflen((struct scsi_cmnd *)ioim-&gt;dio);</div><div class='del'>-	struct scsi_sense_s *snsinfo;</div><div class='del'>-</div><div class='del'>-	if (!complete) {</div><div class='del'>-		bfa_sm_send_event(ioim, BFA_IOIM_SM_HCB);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snsinfo = (struct scsi_sense_s *)BFA_SNSINFO_FROM_TAG(ioim-&gt;fcpim-&gt;fcp,</div><div class='del'>-						       ioim-&gt;iotag);</div><div class='del'>-	snsinfo-&gt;rsp_code = SCSI_SENSE_CUR_ERR;</div><div class='del'>-	snsinfo-&gt;sense_key = SCSI_MP_IEC_UNIT_ATTN;</div><div class='del'>-	snsinfo-&gt;asc = SCSI_ASC_TOCC;</div><div class='del'>-	snsinfo-&gt;add_sense_length = 0x6;</div><div class='del'>-	snsinfo-&gt;ascq = SCSI_ASCQ_RL_DATA_CHANGED;</div><div class='del'>-	bfa_trc(ioim-&gt;bfa, residue);</div><div class='del'>-	bfa_cb_ioim_done(ioim-&gt;bfa-&gt;bfad, ioim-&gt;dio, BFI_IOIM_STS_OK,</div><div class='del'>-			SCSI_STATUS_CHECK_CONDITION, sns_len,</div><div class='del'>-			(u8 *)snsinfo, residue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-__bfa_cb_ioim_lm_lun_not_rdy(void *cbarg, bfa_boolean_t complete)</div><div class='del'>-{</div><div class='del'>-	struct bfa_ioim_s *ioim = cbarg;</div><div class='del'>-	int sns_len = 0xD;</div><div class='del'>-	u32 residue = scsi_bufflen((struct scsi_cmnd *)ioim-&gt;dio);</div><div class='del'>-	struct scsi_sense_s *snsinfo;</div><div class='del'>-</div><div class='del'>-	if (!complete) {</div><div class='del'>-		bfa_sm_send_event(ioim, BFA_IOIM_SM_HCB);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snsinfo = (struct scsi_sense_s *)BFA_SNSINFO_FROM_TAG(</div><div class='del'>-					ioim-&gt;fcpim-&gt;fcp, ioim-&gt;iotag);</div><div class='del'>-	snsinfo-&gt;rsp_code = SCSI_SENSE_CUR_ERR;</div><div class='del'>-	snsinfo-&gt;add_sense_length = 0xa;</div><div class='del'>-	snsinfo-&gt;sense_key = NOT_READY;</div><div class='del'>-	snsinfo-&gt;asc = SCSI_ASC_LUN_NOT_READY;</div><div class='del'>-	snsinfo-&gt;ascq = SCSI_ASCQ_MAN_INTR_REQ;</div><div class='del'>-	bfa_trc(ioim-&gt;bfa, residue);</div><div class='del'>-	bfa_cb_ioim_done(ioim-&gt;bfa-&gt;bfad, ioim-&gt;dio, BFI_IOIM_STS_OK,</div><div class='del'>-			SCSI_STATUS_CHECK_CONDITION, sns_len,</div><div class='del'>-			(u8 *)snsinfo, residue);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void</div><div class='ctx'> bfa_fcpim_lunmask_rp_update(struct bfa_s *bfa, wwn_t lp_wwn, wwn_t rp_wwn,</div><div class='ctx'> 			u16 rp_tag, u8 lp_tag)</div><div class='hunk'>@@ -2647,7 +2283,8 @@ bfa_fcpim_lunmask_add(struct bfa_s *bfa, u16 vf_id, wwn_t *pwwn,</div><div class='ctx'> 	if (port) {</div><div class='ctx'> 		*pwwn = port-&gt;port_cfg.pwwn;</div><div class='ctx'> 		rp_fcs = bfa_fcs_lport_get_rport_by_pwwn(port, rpwwn);</div><div class='del'>-		rp = rp_fcs-&gt;bfa_rport;</div><div class='add'>+		if (rp_fcs)</div><div class='add'>+			rp = rp_fcs-&gt;bfa_rport;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	lunm_list = bfa_get_lun_mask_list(bfa);</div><div class='hunk'>@@ -2715,7 +2352,8 @@ bfa_fcpim_lunmask_delete(struct bfa_s *bfa, u16 vf_id, wwn_t *pwwn,</div><div class='ctx'> 		if (port) {</div><div class='ctx'> 			*pwwn = port-&gt;port_cfg.pwwn;</div><div class='ctx'> 			rp_fcs = bfa_fcs_lport_get_rport_by_pwwn(port, rpwwn);</div><div class='del'>-			rp = rp_fcs-&gt;bfa_rport;</div><div class='add'>+			if (rp_fcs)</div><div class='add'>+				rp = rp_fcs-&gt;bfa_rport;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2757,7 +2395,6 @@ __bfa_cb_ioim_failed(void *cbarg, bfa_boolean_t complete)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ioim-&gt;proc_rsp_data = bfa_ioim_lm_proc_rsp_data_dummy;</div><div class='ctx'> 	bfa_cb_ioim_done(ioim-&gt;bfa-&gt;bfad, ioim-&gt;dio, BFI_IOIM_STS_ABORTED,</div><div class='ctx'> 			  0, 0, NULL, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -2773,7 +2410,6 @@ __bfa_cb_ioim_pathtov(void *cbarg, bfa_boolean_t complete)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ioim-&gt;proc_rsp_data = bfa_ioim_lm_proc_rsp_data_dummy;</div><div class='ctx'> 	bfa_cb_ioim_done(ioim-&gt;bfa-&gt;bfad, ioim-&gt;dio, BFI_IOIM_STS_PATHTOV,</div><div class='ctx'> 			  0, 0, NULL, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -2788,7 +2424,6 @@ __bfa_cb_ioim_abort(void *cbarg, bfa_boolean_t complete)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ioim-&gt;proc_rsp_data = bfa_ioim_lm_proc_rsp_data_dummy;</div><div class='ctx'> 	bfa_cb_ioim_abort(ioim-&gt;bfa-&gt;bfad, ioim-&gt;dio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3132,7 +2767,6 @@ bfa_ioim_attach(struct bfa_fcpim_s *fcpim)</div><div class='ctx'> 		ioim-&gt;bfa     = fcpim-&gt;bfa;</div><div class='ctx'> 		ioim-&gt;fcpim   = fcpim;</div><div class='ctx'> 		ioim-&gt;iosp    = iosp;</div><div class='del'>-		ioim-&gt;proc_rsp_data = bfa_ioim_lm_proc_rsp_data_dummy;</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;ioim-&gt;sgpg_q);</div><div class='ctx'> 		bfa_reqq_winit(&amp;ioim-&gt;iosp-&gt;reqq_wait,</div><div class='ctx'> 				   bfa_ioim_qresume, ioim);</div><div class='hunk'>@@ -3170,7 +2804,6 @@ bfa_ioim_isr(struct bfa_s *bfa, struct bfi_msg_s *m)</div><div class='ctx'> 			evt = BFA_IOIM_SM_DONE;</div><div class='ctx'> 		else</div><div class='ctx'> 			evt = BFA_IOIM_SM_COMP;</div><div class='del'>-		ioim-&gt;proc_rsp_data(ioim);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case BFI_IOIM_STS_TIMEDOUT:</div><div class='hunk'>@@ -3206,7 +2839,6 @@ bfa_ioim_isr(struct bfa_s *bfa, struct bfi_msg_s *m)</div><div class='ctx'> 		if (rsp-&gt;abort_tag != ioim-&gt;abort_tag) {</div><div class='ctx'> 			bfa_trc(ioim-&gt;bfa, rsp-&gt;abort_tag);</div><div class='ctx'> 			bfa_trc(ioim-&gt;bfa, ioim-&gt;abort_tag);</div><div class='del'>-			ioim-&gt;proc_rsp_data = bfa_ioim_lm_proc_rsp_data_dummy;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -3225,7 +2857,6 @@ bfa_ioim_isr(struct bfa_s *bfa, struct bfi_msg_s *m)</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ioim-&gt;proc_rsp_data = bfa_ioim_lm_proc_rsp_data_dummy;</div><div class='ctx'> 	bfa_sm_send_event(ioim, evt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3244,15 +2875,7 @@ bfa_ioim_good_comp_isr(struct bfa_s *bfa, struct bfi_msg_s *m)</div><div class='ctx'> </div><div class='ctx'> 	bfa_ioim_cb_profile_comp(fcpim, ioim);</div><div class='ctx'> </div><div class='del'>-	if (bfa_get_lun_mask_status(bfa) != BFA_LUNMASK_ENABLED)  {</div><div class='del'>-		bfa_sm_send_event(ioim, BFA_IOIM_SM_COMP_GOOD);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ioim-&gt;proc_rsp_data(ioim) == BFA_TRUE)</div><div class='del'>-		bfa_sm_send_event(ioim, BFA_IOIM_SM_COMP_GOOD);</div><div class='del'>-	else</div><div class='del'>-		bfa_sm_send_event(ioim, BFA_IOIM_SM_COMP);</div><div class='add'>+	bfa_sm_send_event(ioim, BFA_IOIM_SM_COMP_GOOD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3364,35 +2987,6 @@ bfa_ioim_free(struct bfa_ioim_s *ioim)</div><div class='ctx'> void</div><div class='ctx'> bfa_ioim_start(struct bfa_ioim_s *ioim)</div><div class='ctx'> {</div><div class='del'>-	struct scsi_cmnd *cmnd = (struct scsi_cmnd *)ioim-&gt;dio;</div><div class='del'>-	struct bfa_lps_s	*lps;</div><div class='del'>-	enum bfa_ioim_lm_status status;</div><div class='del'>-	struct scsi_lun scsilun;</div><div class='del'>-</div><div class='del'>-	if (bfa_get_lun_mask_status(ioim-&gt;bfa) == BFA_LUNMASK_ENABLED) {</div><div class='del'>-		lps = BFA_IOIM_TO_LPS(ioim);</div><div class='del'>-		int_to_scsilun(cmnd-&gt;device-&gt;lun, &amp;scsilun);</div><div class='del'>-		status = bfa_ioim_lm_check(ioim, lps,</div><div class='del'>-				ioim-&gt;itnim-&gt;rport, scsilun);</div><div class='del'>-		if (status == BFA_IOIM_LM_LUN_NOT_RDY) {</div><div class='del'>-			bfa_sm_send_event(ioim, BFA_IOIM_SM_LM_LUN_NOT_RDY);</div><div class='del'>-			bfa_stats(ioim-&gt;itnim, lm_lun_not_rdy);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (status == BFA_IOIM_LM_LUN_NOT_SUP) {</div><div class='del'>-			bfa_sm_send_event(ioim, BFA_IOIM_SM_LM_LUN_NOT_SUP);</div><div class='del'>-			bfa_stats(ioim-&gt;itnim, lm_lun_not_sup);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (status == BFA_IOIM_LM_RPL_DATA_CHANGED) {</div><div class='del'>-			bfa_sm_send_event(ioim, BFA_IOIM_SM_LM_RPL_DC);</div><div class='del'>-			bfa_stats(ioim-&gt;itnim, lm_rpl_data_changed);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	bfa_ioim_cb_profile_start(ioim-&gt;fcpim, ioim);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h<br/>index 1080bcb81cb7..36f26da80f76 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfa_fcpim.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfa_fcpim.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfa_fcpim.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/bfa/bfa_fcpim.h</a></div><div class='hunk'>@@ -110,7 +110,6 @@ struct bfad_ioim_s;</div><div class='ctx'> struct bfad_tskim_s;</div><div class='ctx'> </div><div class='ctx'> typedef void    (*bfa_fcpim_profile_t) (struct bfa_ioim_s *ioim);</div><div class='del'>-typedef bfa_boolean_t (*bfa_ioim_lm_proc_rsp_data_t) (struct bfa_ioim_s *ioim);</div><div class='ctx'> </div><div class='ctx'> struct bfa_fcpim_s {</div><div class='ctx'> 	struct bfa_s		*bfa;</div><div class='hunk'>@@ -124,7 +123,6 @@ struct bfa_fcpim_s {</div><div class='ctx'> 	u32			path_tov;</div><div class='ctx'> 	u16			q_depth;</div><div class='ctx'> 	u8			reqq;		/*  Request queue to be used */</div><div class='del'>-	u8			lun_masking_pending;</div><div class='ctx'> 	struct list_head	itnim_q;	/*  queue of active itnim */</div><div class='ctx'> 	struct list_head	ioim_resfree_q; /*  IOs waiting for f/w */</div><div class='ctx'> 	struct list_head	ioim_comp_q;	/*  IO global comp Q	*/</div><div class='hunk'>@@ -181,7 +179,6 @@ struct bfa_ioim_s {</div><div class='ctx'> 	u8			reqq;		/*  Request queue for I/O */</div><div class='ctx'> 	u8			mode;		/*  IO is passthrough or not */</div><div class='ctx'> 	u64			start_time;	/*  IO's Profile start val */</div><div class='del'>-	bfa_ioim_lm_proc_rsp_data_t proc_rsp_data; /* RSP data adjust */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bfa_ioim_sp_s {</div><div class='hunk'>@@ -261,10 +258,6 @@ struct bfa_itnim_s {</div><div class='ctx'> 	(__ioim)-&gt;iotag |= k &lt;&lt; BFA_IOIM_RETRY_TAG_OFFSET;		\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-#define BFA_IOIM_TO_LPS(__ioim)		\</div><div class='del'>-	BFA_LPS_FROM_TAG(BFA_LPS_MOD(__ioim-&gt;bfa),	\</div><div class='del'>-		__ioim-&gt;itnim-&gt;rport-&gt;rport_info.lp_tag)</div><div class='del'>-</div><div class='ctx'> static inline bfa_boolean_t</div><div class='ctx'> bfa_ioim_maxretry_reached(struct bfa_ioim_s *ioim)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/scsi/bfa/bfa_ioc.c b/drivers/scsi/bfa/bfa_ioc.c<br/>index 1ac5aecf25a6..eca7ab78085b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfa_ioc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfa_ioc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfa_ioc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/bfa/bfa_ioc.c</a></div><div class='hunk'>@@ -3727,11 +3727,11 @@ bfa_sfp_media_get(struct bfa_sfp_s *sfp)</div><div class='ctx'> 			 (xmtr_tech &amp; SFP_XMTR_TECH_SA))</div><div class='ctx'> 			*media = BFA_SFP_MEDIA_SW;</div><div class='ctx'> 		/* Check 10G Ethernet Compilance code */</div><div class='del'>-		else if (e10g.b &amp; 0x10)</div><div class='add'>+		else if (e10g.r.e10g_sr)</div><div class='ctx'> 			*media = BFA_SFP_MEDIA_SW;</div><div class='del'>-		else if (e10g.b &amp; 0x60)</div><div class='add'>+		else if (e10g.r.e10g_lrm &amp;&amp; e10g.r.e10g_lr)</div><div class='ctx'> 			*media = BFA_SFP_MEDIA_LW;</div><div class='del'>-		else if (e10g.r.e10g_unall &amp; 0x80)</div><div class='add'>+		else if (e10g.r.e10g_unall)</div><div class='ctx'> 			*media = BFA_SFP_MEDIA_UNKNOWN;</div><div class='ctx'> 		else</div><div class='ctx'> 			bfa_trc(sfp, 0);</div><div class='head'>diff --git a/drivers/scsi/bfa/bfa_svc.h b/drivers/scsi/bfa/bfa_svc.h<br/>index 95adb86d3769..b52cbb6bcd5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfa_svc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfa_svc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfa_svc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/bfa/bfa_svc.h</a></div><div class='hunk'>@@ -582,11 +582,6 @@ void bfa_cb_rport_qos_scn_prio(void *rport,</div><div class='ctx'> #define BFA_LP_TAG_INVALID	0xff</div><div class='ctx'> void	bfa_rport_set_lunmask(struct bfa_s *bfa, struct bfa_rport_s *rp);</div><div class='ctx'> void	bfa_rport_unset_lunmask(struct bfa_s *bfa, struct bfa_rport_s *rp);</div><div class='del'>-bfa_boolean_t	bfa_rport_lunmask_active(struct bfa_rport_s *rp);</div><div class='del'>-wwn_t	bfa_rport_get_pwwn(struct bfa_s *bfa, struct bfa_rport_s *rp);</div><div class='del'>-struct bfa_rport_s *bfa_rport_get_by_wwn(struct bfa_s *bfa, u16 vf_id,</div><div class='del'>-					 wwn_t *lpwwn, wwn_t rpwwn);</div><div class='del'>-void *bfa_cb_get_rp_by_wwn(void *arg, u16 vf_id, wwn_t *lpwwn, wwn_t rpwwn);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * bfa fcxp API functions</div><div class='head'>diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c<br/>index 66fb72531b34..404fd10ddb21 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfad.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfad.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/bfa/bfad.c</a></div><div class='hunk'>@@ -674,6 +674,7 @@ bfad_vport_create(struct bfad_s *bfad, u16 vf_id,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;bfad-&gt;bfad_lock, flags);</div><div class='ctx'> 	bfa_fcs_vport_start(&amp;vport-&gt;fcs_vport);</div><div class='add'>+	list_add_tail(&amp;vport-&gt;list_entry, &amp;bfad-&gt;vport_list);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bfad-&gt;bfad_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return BFA_STATUS_OK;</div><div class='hunk'>@@ -1404,6 +1405,7 @@ bfad_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pid)</div><div class='ctx'> 	bfad-&gt;ref_count = 0;</div><div class='ctx'> 	bfad-&gt;pport.bfad = bfad;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;bfad-&gt;pbc_vport_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;bfad-&gt;vport_list);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the debugfs node for this bfad */</div><div class='ctx'> 	if (bfa_debugfs_enable)</div><div class='head'>diff --git a/drivers/scsi/bfa/bfad_attr.c b/drivers/scsi/bfa/bfad_attr.c<br/>index 9d95844ab463..1938fe0473e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfad_attr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfad_attr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfad_attr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/bfa/bfad_attr.c</a></div><div class='hunk'>@@ -491,7 +491,7 @@ bfad_im_vport_delete(struct fc_vport *fc_vport)</div><div class='ctx'> </div><div class='ctx'> free_scsi_host:</div><div class='ctx'> 	bfad_scsi_host_free(bfad, im_port);</div><div class='del'>-</div><div class='add'>+	list_del(&amp;vport-&gt;list_entry);</div><div class='ctx'> 	kfree(vport);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/scsi/bfa/bfad_bsg.c b/drivers/scsi/bfa/bfad_bsg.c<br/>index 06fc00caeb41..530de2b1200a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfad_bsg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfad_bsg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfad_bsg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/bfa/bfad_bsg.c</a></div><div class='hunk'>@@ -2394,6 +2394,21 @@ out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Function to reset the LUN SCAN mode */</div><div class='add'>+static void</div><div class='add'>+bfad_iocmd_lunmask_reset_lunscan_mode(struct bfad_s *bfad, int lunmask_cfg)</div><div class='add'>+{</div><div class='add'>+	struct bfad_im_port_s *pport_im = bfad-&gt;pport.im_port;</div><div class='add'>+	struct bfad_vport_s *vport = NULL;</div><div class='add'>+</div><div class='add'>+	/* Set the scsi device LUN SCAN flags for base port */</div><div class='add'>+	bfad_reset_sdev_bflags(pport_im, lunmask_cfg);</div><div class='add'>+</div><div class='add'>+	/* Set the scsi device LUN SCAN flags for the vports */</div><div class='add'>+	list_for_each_entry(vport, &amp;bfad-&gt;vport_list, list_entry)</div><div class='add'>+		bfad_reset_sdev_bflags(vport-&gt;drv_port.im_port, lunmask_cfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int</div><div class='ctx'> bfad_iocmd_lunmask(struct bfad_s *bfad, void *pcmd, unsigned int v_cmd)</div><div class='ctx'> {</div><div class='hunk'>@@ -2401,11 +2416,17 @@ bfad_iocmd_lunmask(struct bfad_s *bfad, void *pcmd, unsigned int v_cmd)</div><div class='ctx'> 	unsigned long	flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;bfad-&gt;bfad_lock, flags);</div><div class='del'>-	if (v_cmd == IOCMD_FCPIM_LUNMASK_ENABLE)</div><div class='add'>+	if (v_cmd == IOCMD_FCPIM_LUNMASK_ENABLE) {</div><div class='ctx'> 		iocmd-&gt;status = bfa_fcpim_lunmask_update(&amp;bfad-&gt;bfa, BFA_TRUE);</div><div class='del'>-	else if (v_cmd == IOCMD_FCPIM_LUNMASK_DISABLE)</div><div class='add'>+		/* Set the LUN Scanning mode to be Sequential scan */</div><div class='add'>+		if (iocmd-&gt;status == BFA_STATUS_OK)</div><div class='add'>+			bfad_iocmd_lunmask_reset_lunscan_mode(bfad, BFA_TRUE);</div><div class='add'>+	} else if (v_cmd == IOCMD_FCPIM_LUNMASK_DISABLE) {</div><div class='ctx'> 		iocmd-&gt;status = bfa_fcpim_lunmask_update(&amp;bfad-&gt;bfa, BFA_FALSE);</div><div class='del'>-	else if (v_cmd == IOCMD_FCPIM_LUNMASK_CLEAR)</div><div class='add'>+		/* Set the LUN Scanning mode to default REPORT_LUNS scan */</div><div class='add'>+		if (iocmd-&gt;status == BFA_STATUS_OK)</div><div class='add'>+			bfad_iocmd_lunmask_reset_lunscan_mode(bfad, BFA_FALSE);</div><div class='add'>+	} else if (v_cmd == IOCMD_FCPIM_LUNMASK_CLEAR)</div><div class='ctx'> 		iocmd-&gt;status = bfa_fcpim_lunmask_clear(&amp;bfad-&gt;bfa);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bfad-&gt;bfad_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/scsi/bfa/bfad_debugfs.c b/drivers/scsi/bfa/bfad_debugfs.c<br/>index dee1a094c2c2..439c012be763 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfad_debugfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfad_debugfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfad_debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/bfa/bfad_debugfs.c</a></div><div class='hunk'>@@ -472,7 +472,7 @@ static const struct file_operations bfad_debugfs_op_regwr = {</div><div class='ctx'> </div><div class='ctx'> struct bfad_debugfs_entry {</div><div class='ctx'> 	const char *name;</div><div class='del'>-	mode_t	mode;</div><div class='add'>+	umode_t	mode;</div><div class='ctx'> 	const struct file_operations *fops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -557,8 +557,7 @@ bfad_debugfs_exit(struct bfad_port_s *port)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Remove the pci_dev debugfs directory for the port */</div><div class='add'>+	/* Remove the pci_dev debugfs directory for the port */</div><div class='ctx'> 	if (port-&gt;port_debugfs_root) {</div><div class='ctx'> 		debugfs_remove(port-&gt;port_debugfs_root);</div><div class='ctx'> 		port-&gt;port_debugfs_root = NULL;</div><div class='head'>diff --git a/drivers/scsi/bfa/bfad_drv.h b/drivers/scsi/bfa/bfad_drv.h<br/>index 5e19a5f820ec..dc5b9d99c450 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfad_drv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfad_drv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfad_drv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/bfa/bfad_drv.h</a></div><div class='hunk'>@@ -43,6 +43,7 @@</div><div class='ctx'> #include &lt;scsi/scsi_transport_fc.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_transport.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_bsg_fc.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_devinfo.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "bfa_modules.h"</div><div class='ctx'> #include "bfa_fcs.h"</div><div class='hunk'>@@ -227,6 +228,7 @@ struct bfad_s {</div><div class='ctx'> 	struct list_head	active_aen_q;</div><div class='ctx'> 	struct bfa_aen_entry_s	aen_list[BFA_AEN_MAX_ENTRY];</div><div class='ctx'> 	spinlock_t		bfad_aen_spinlock;</div><div class='add'>+	struct list_head	vport_list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* BFAD state machine events */</div><div class='head'>diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c<br/>index e5db649e8eb7..3153923f5b60 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfad_im.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfad_im.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfad_im.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/bfa/bfad_im.c</a></div><div class='hunk'>@@ -918,16 +918,70 @@ bfad_get_itnim(struct bfad_im_port_s *im_port, int id)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Function is invoked from the SCSI Host Template slave_alloc() entry point.</div><div class='add'>+ * Has the logic to query the LUN Mask database to check if this LUN needs to</div><div class='add'>+ * be made visible to the SCSI mid-layer or not.</div><div class='add'>+ *</div><div class='add'>+ * Returns BFA_STATUS_OK if this LUN needs to be added to the OS stack.</div><div class='add'>+ * Returns -ENXIO to notify SCSI mid-layer to not add this LUN to the OS stack.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+bfad_im_check_if_make_lun_visible(struct scsi_device *sdev,</div><div class='add'>+				  struct fc_rport *rport)</div><div class='add'>+{</div><div class='add'>+	struct bfad_itnim_data_s *itnim_data =</div><div class='add'>+				(struct bfad_itnim_data_s *) rport-&gt;dd_data;</div><div class='add'>+	struct bfa_s *bfa = itnim_data-&gt;itnim-&gt;bfa_itnim-&gt;bfa;</div><div class='add'>+	struct bfa_rport_s *bfa_rport = itnim_data-&gt;itnim-&gt;bfa_itnim-&gt;rport;</div><div class='add'>+	struct bfa_lun_mask_s *lun_list = bfa_get_lun_mask_list(bfa);</div><div class='add'>+	int i = 0, ret = -ENXIO;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_LUN_MASK_CFG; i++) {</div><div class='add'>+		if (lun_list[i].state == BFA_IOIM_LUN_MASK_ACTIVE &amp;&amp;</div><div class='add'>+		    scsilun_to_int(&amp;lun_list[i].lun) == sdev-&gt;lun &amp;&amp;</div><div class='add'>+		    lun_list[i].rp_tag == bfa_rport-&gt;rport_tag &amp;&amp;</div><div class='add'>+		    lun_list[i].lp_tag == (u8)bfa_rport-&gt;rport_info.lp_tag) {</div><div class='add'>+			ret = BFA_STATUS_OK;</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='ctx'>  * Scsi_Host template entry slave_alloc</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> bfad_im_slave_alloc(struct scsi_device *sdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fc_rport *rport = starget_to_rport(scsi_target(sdev));</div><div class='add'>+	struct bfad_itnim_data_s *itnim_data =</div><div class='add'>+				(struct bfad_itnim_data_s *) rport-&gt;dd_data;</div><div class='add'>+	struct bfa_s *bfa = itnim_data-&gt;itnim-&gt;bfa_itnim-&gt;bfa;</div><div class='ctx'> </div><div class='ctx'> 	if (!rport || fc_remote_port_chkready(rport))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='add'>+	if (bfa_get_lun_mask_status(bfa) == BFA_LUNMASK_ENABLED) {</div><div class='add'>+		/*</div><div class='add'>+		 * We should not mask LUN 0 - since this will translate</div><div class='add'>+		 * to no LUN / TARGET for SCSI ml resulting no scan.</div><div class='add'>+		 */</div><div class='add'>+		if (sdev-&gt;lun == 0) {</div><div class='add'>+			sdev-&gt;sdev_bflags |= BLIST_NOREPORTLUN |</div><div class='add'>+					     BLIST_SPARSELUN;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Query LUN Mask configuration - to expose this LUN</div><div class='add'>+		 * to the SCSI mid-layer or to mask it.</div><div class='add'>+		 */</div><div class='add'>+		if (bfad_im_check_if_make_lun_visible(sdev, rport) !=</div><div class='add'>+							BFA_STATUS_OK)</div><div class='add'>+			return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+done:</div><div class='ctx'> 	sdev-&gt;hostdata = rport-&gt;dd_data;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1037,6 +1091,8 @@ bfad_im_fc_rport_add(struct bfad_im_port_s *im_port, struct bfad_itnim_s *itnim)</div><div class='ctx'> 	    &amp;&amp; (fc_rport-&gt;scsi_target_id &lt; MAX_FCP_TARGET))</div><div class='ctx'> 		itnim-&gt;scsi_tgt_id = fc_rport-&gt;scsi_target_id;</div><div class='ctx'> </div><div class='add'>+	itnim-&gt;channel = fc_rport-&gt;channel;</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/bfa/bfad_im.h b/drivers/scsi/bfa/bfad_im.h<br/>index 004b6cf848d9..0814367ef101 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfad_im.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bfa/bfad_im.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/bfa/bfad_im.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/bfa/bfad_im.h</a></div><div class='hunk'>@@ -91,6 +91,7 @@ struct bfad_itnim_s {</div><div class='ctx'> 	struct fc_rport *fc_rport;</div><div class='ctx'> 	struct bfa_itnim_s *bfa_itnim;</div><div class='ctx'> 	u16        scsi_tgt_id;</div><div class='add'>+	u16	   channel;</div><div class='ctx'> 	u16        queue_work;</div><div class='ctx'> 	unsigned long	last_ramp_up_time;</div><div class='ctx'> 	unsigned long	last_queue_full_time;</div><div class='hunk'>@@ -166,4 +167,30 @@ irqreturn_t bfad_intx(int irq, void *dev_id);</div><div class='ctx'> int bfad_im_bsg_request(struct fc_bsg_job *job);</div><div class='ctx'> int bfad_im_bsg_timeout(struct fc_bsg_job *job);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Macro to set the SCSI device sdev_bflags - sdev_bflags are used by the</div><div class='add'>+ * SCSI mid-layer to choose LUN Scanning mode REPORT_LUNS vs. Sequential Scan</div><div class='add'>+ *</div><div class='add'>+ * Internally iterate's over all the ITNIM's part of the im_port &amp; set's the</div><div class='add'>+ * sdev_bflags for the scsi_device associated with LUN #0.</div><div class='add'>+ */</div><div class='add'>+#define bfad_reset_sdev_bflags(__im_port, __lunmask_cfg) do {		\</div><div class='add'>+	struct scsi_device *__sdev = NULL;				\</div><div class='add'>+	struct bfad_itnim_s *__itnim = NULL;				\</div><div class='add'>+	u32 scan_flags = BLIST_NOREPORTLUN | BLIST_SPARSELUN;		\</div><div class='add'>+	list_for_each_entry(__itnim, &amp;((__im_port)-&gt;itnim_mapped_list),	\</div><div class='add'>+			    list_entry) {				\</div><div class='add'>+		__sdev = scsi_device_lookup((__im_port)-&gt;shost,		\</div><div class='add'>+					    __itnim-&gt;channel,		\</div><div class='add'>+					    __itnim-&gt;scsi_tgt_id, 0);	\</div><div class='add'>+		if (__sdev) {						\</div><div class='add'>+			if ((__lunmask_cfg) == BFA_TRUE)		\</div><div class='add'>+				__sdev-&gt;sdev_bflags |= scan_flags;	\</div><div class='add'>+			else						\</div><div class='add'>+				__sdev-&gt;sdev_bflags &amp;= ~scan_flags;	\</div><div class='add'>+			scsi_device_put(__sdev);			\</div><div class='add'>+		}							\</div><div class='add'>+	}								\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c<br/>index d1e697190970..1a44b45e7bef 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/bnx2i/bnx2i_iscsi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/bnx2i/bnx2i_iscsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/bnx2i/bnx2i_iscsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/bnx2i/bnx2i_iscsi.c</a></div><div class='hunk'>@@ -2177,7 +2177,7 @@ static int bnx2i_nl_set_path(struct Scsi_Host *shost, struct iscsi_path *params)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static mode_t bnx2i_attr_is_visible(int param_type, int param)</div><div class='add'>+static umode_t bnx2i_attr_is_visible(int param_type, int param)</div><div class='ctx'> {</div><div class='ctx'> 	switch (param_type) {</div><div class='ctx'> 	case ISCSI_HOST_PARAM:</div><div class='head'>diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c<br/>index 000294a9df80..36739da8bc15 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/cxgbi/cxgb3i/cxgb3i.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/cxgbi/cxgb3i/cxgb3i.c</a></div><div class='hunk'>@@ -966,7 +966,7 @@ static int init_act_open(struct cxgbi_sock *csk)</div><div class='ctx'> 		csk-&gt;saddr.sin_addr.s_addr = chba-&gt;ipv4addr;</div><div class='ctx'> </div><div class='ctx'> 	csk-&gt;rss_qid = 0;</div><div class='del'>-	csk-&gt;l2t = t3_l2t_get(t3dev, dst_get_neighbour(dst), ndev);</div><div class='add'>+	csk-&gt;l2t = t3_l2t_get(t3dev, dst, ndev);</div><div class='ctx'> 	if (!csk-&gt;l2t) {</div><div class='ctx'> 		pr_err("NO l2t available.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c<br/>index ac7a9b1e3e23..5a4a3bfc60cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/cxgbi/cxgb4i/cxgb4i.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/cxgbi/cxgb4i/cxgb4i.c</a></div><div class='hunk'>@@ -1127,6 +1127,7 @@ static int init_act_open(struct cxgbi_sock *csk)</div><div class='ctx'> 	struct net_device *ndev = cdev-&gt;ports[csk-&gt;port_id];</div><div class='ctx'> 	struct port_info *pi = netdev_priv(ndev);</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='add'>+	struct neighbour *n;</div><div class='ctx'> 	unsigned int step;</div><div class='ctx'> </div><div class='ctx'> 	log_debug(1 &lt;&lt; CXGBI_DBG_TOE | 1 &lt;&lt; CXGBI_DBG_SOCK,</div><div class='hunk'>@@ -1141,7 +1142,12 @@ static int init_act_open(struct cxgbi_sock *csk)</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='del'>-	csk-&gt;l2t = cxgb4_l2t_get(lldi-&gt;l2t, dst_get_neighbour(csk-&gt;dst), ndev, 0);</div><div class='add'>+	n = dst_get_neighbour_noref(csk-&gt;dst);</div><div class='add'>+	if (!n) {</div><div class='add'>+		pr_err("%s, can't get neighbour of csk-&gt;dst.\n", ndev-&gt;name);</div><div class='add'>+		goto rel_resource;</div><div class='add'>+	}</div><div class='add'>+	csk-&gt;l2t = cxgb4_l2t_get(lldi-&gt;l2t, n, ndev, 0);</div><div class='ctx'> 	if (!csk-&gt;l2t) {</div><div class='ctx'> 		pr_err("%s, cannot alloc l2t.\n", ndev-&gt;name);</div><div class='ctx'> 		goto rel_resource;</div><div class='head'>diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c<br/>index c10f74a566f2..d3ff9cd40234 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/cxgbi/libcxgbi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/cxgbi/libcxgbi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/cxgbi/libcxgbi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/cxgbi/libcxgbi.c</a></div><div class='hunk'>@@ -472,6 +472,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> 	struct cxgbi_device *cdev;</div><div class='ctx'> 	struct rtable *rt = NULL;</div><div class='add'>+	struct neighbour *n;</div><div class='ctx'> 	struct flowi4 fl4;</div><div class='ctx'> 	struct cxgbi_sock *csk = NULL;</div><div class='ctx'> 	unsigned int mtu = 0;</div><div class='hunk'>@@ -493,7 +494,12 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> 	dst = &amp;rt-&gt;dst;</div><div class='del'>-	ndev = dst_get_neighbour(dst)-&gt;dev;</div><div class='add'>+	n = dst_get_neighbour_noref(dst);</div><div class='add'>+	if (!n) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto rel_rt;</div><div class='add'>+	}</div><div class='add'>+	ndev = n-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	if (rt-&gt;rt_flags &amp; (RTCF_MULTICAST | RTCF_BROADCAST)) {</div><div class='ctx'> 		pr_info("multi-cast route %pI4, port %u, dev %s.\n",</div><div class='hunk'>@@ -507,7 +513,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)</div><div class='ctx'> 		ndev = ip_dev_find(&amp;init_net, daddr-&gt;sin_addr.s_addr);</div><div class='ctx'> 		mtu = ndev-&gt;mtu;</div><div class='ctx'> 		pr_info("rt dev %s, loopback -&gt; %s, mtu %u.\n",</div><div class='del'>-			dst_get_neighbour(dst)-&gt;dev-&gt;name, ndev-&gt;name, mtu);</div><div class='add'>+			n-&gt;dev-&gt;name, ndev-&gt;name, mtu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cdev = cxgbi_device_find_by_netdev(ndev, &amp;port);</div><div class='hunk'>@@ -1862,8 +1868,9 @@ int cxgbi_conn_alloc_pdu(struct iscsi_task *task, u8 opcode)</div><div class='ctx'> </div><div class='ctx'> 	tdata-&gt;skb = alloc_skb(cdev-&gt;skb_tx_rsvd + headroom, GFP_ATOMIC);</div><div class='ctx'> 	if (!tdata-&gt;skb) {</div><div class='del'>-		pr_warn("alloc skb %u+%u, opcode 0x%x failed.\n",</div><div class='del'>-			cdev-&gt;skb_tx_rsvd, headroom, opcode);</div><div class='add'>+		struct cxgbi_sock *csk = cconn-&gt;cep-&gt;csk;</div><div class='add'>+		struct net_device *ndev = cdev-&gt;ports[csk-&gt;port_id];</div><div class='add'>+		ndev-&gt;stats.tx_dropped++;</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2569,7 +2576,7 @@ void cxgbi_iscsi_cleanup(struct iscsi_transport *itp,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(cxgbi_iscsi_cleanup);</div><div class='ctx'> </div><div class='del'>-mode_t cxgbi_attr_is_visible(int param_type, int param)</div><div class='add'>+umode_t cxgbi_attr_is_visible(int param_type, int param)</div><div class='ctx'> {</div><div class='ctx'> 	switch (param_type) {</div><div class='ctx'> 	case ISCSI_HOST_PARAM:</div><div class='head'>diff --git a/drivers/scsi/cxgbi/libcxgbi.h b/drivers/scsi/cxgbi/libcxgbi.h<br/>index 20c88279c7a6..80fa99b3d384 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/cxgbi/libcxgbi.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/cxgbi/libcxgbi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/cxgbi/libcxgbi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/cxgbi/libcxgbi.h</a></div><div class='hunk'>@@ -709,7 +709,7 @@ int cxgbi_conn_xmit_pdu(struct iscsi_task *);</div><div class='ctx'> </div><div class='ctx'> void cxgbi_cleanup_task(struct iscsi_task *task);</div><div class='ctx'> </div><div class='del'>-mode_t cxgbi_attr_is_visible(int param_type, int param);</div><div class='add'>+umode_t cxgbi_attr_is_visible(int param_type, int param);</div><div class='ctx'> void cxgbi_get_conn_stats(struct iscsi_cls_conn *, struct iscsi_stats *);</div><div class='ctx'> int cxgbi_set_conn_param(struct iscsi_cls_conn *,</div><div class='ctx'> 			enum iscsi_param, char *, int);</div><div class='head'>diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c<br/>index f5b718d3c31b..13aeca3d51f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/dc395x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/dc395x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/dc395x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/dc395x.c</a></div><div class='hunk'>@@ -546,7 +546,7 @@ static struct ParameterData __devinitdata cfg_data[] = {</div><div class='ctx'>  * command line overrides will be used. If set to 1 then safe and</div><div class='ctx'>  * slow settings will be used.</div><div class='ctx'>  */</div><div class='del'>-static int use_safe_settings = 0;</div><div class='add'>+static bool use_safe_settings = 0;</div><div class='ctx'> module_param_named(safe, use_safe_settings, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(safe, "Use safe and slow settings only. Default: false");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/device_handler/scsi_dh.c b/drivers/scsi/device_handler/scsi_dh.c<br/>index 23149b9e297c..48e46f5b77cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/device_handler/scsi_dh.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/device_handler/scsi_dh.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/device_handler/scsi_dh.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/device_handler/scsi_dh.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(list_lock);</div><div class='ctx'> static LIST_HEAD(scsi_dh_list);</div><div class='del'>-static int scsi_dh_list_idx = 1;</div><div class='ctx'> </div><div class='ctx'> static struct scsi_device_handler *get_device_handler(const char *name)</div><div class='ctx'> {</div><div class='hunk'>@@ -45,21 +44,6 @@ static struct scsi_device_handler *get_device_handler(const char *name)</div><div class='ctx'> 	return found;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct scsi_device_handler *get_device_handler_by_idx(int idx)</div><div class='del'>-{</div><div class='del'>-	struct scsi_device_handler *tmp, *found = NULL;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;list_lock);</div><div class='del'>-	list_for_each_entry(tmp, &amp;scsi_dh_list, list) {</div><div class='del'>-		if (tmp-&gt;idx == idx) {</div><div class='del'>-			found = tmp;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;list_lock);</div><div class='del'>-	return found;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * device_handler_match_function - Match a device handler to a device</div><div class='ctx'>  * @sdev - SCSI device to be tested</div><div class='hunk'>@@ -84,23 +68,6 @@ device_handler_match_function(struct scsi_device *sdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * device_handler_match_devlist - Match a device handler to a device</div><div class='del'>- * @sdev - SCSI device to be tested</div><div class='del'>- *</div><div class='del'>- * Tests @sdev against all device_handler registered in the devlist.</div><div class='del'>- * Returns the found device handler or NULL if not found.</div><div class='del'>- */</div><div class='del'>-static struct scsi_device_handler *</div><div class='del'>-device_handler_match_devlist(struct scsi_device *sdev)</div><div class='del'>-{</div><div class='del'>-	int idx;</div><div class='del'>-</div><div class='del'>-	idx = scsi_get_device_flags_keyed(sdev, sdev-&gt;vendor, sdev-&gt;model,</div><div class='del'>-					  SCSI_DEVINFO_DH);</div><div class='del'>-	return get_device_handler_by_idx(idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * device_handler_match - Attach a device handler to a device</div><div class='ctx'>  * @scsi_dh - The device handler to match against or NULL</div><div class='ctx'>  * @sdev - SCSI device to be tested against @scsi_dh</div><div class='hunk'>@@ -116,8 +83,6 @@ device_handler_match(struct scsi_device_handler *scsi_dh,</div><div class='ctx'> 	struct scsi_device_handler *found_dh;</div><div class='ctx'> </div><div class='ctx'> 	found_dh = device_handler_match_function(sdev);</div><div class='del'>-	if (!found_dh)</div><div class='del'>-		found_dh = device_handler_match_devlist(sdev);</div><div class='ctx'> </div><div class='ctx'> 	if (scsi_dh &amp;&amp; found_dh != scsi_dh)</div><div class='ctx'> 		found_dh = NULL;</div><div class='hunk'>@@ -361,25 +326,14 @@ static int scsi_dh_notifier_remove(struct device *dev, void *data)</div><div class='ctx'>  */</div><div class='ctx'> int scsi_register_device_handler(struct scsi_device_handler *scsi_dh)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (get_device_handler(scsi_dh-&gt;name))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;list_lock);</div><div class='del'>-	scsi_dh-&gt;idx = scsi_dh_list_idx++;</div><div class='ctx'> 	list_add(&amp;scsi_dh-&gt;list, &amp;scsi_dh_list);</div><div class='ctx'> 	spin_unlock(&amp;list_lock);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; scsi_dh-&gt;devlist &amp;&amp; scsi_dh-&gt;devlist[i].vendor; i++) {</div><div class='del'>-		scsi_dev_info_list_add_keyed(0,</div><div class='del'>-					scsi_dh-&gt;devlist[i].vendor,</div><div class='del'>-					scsi_dh-&gt;devlist[i].model,</div><div class='del'>-					NULL,</div><div class='del'>-					scsi_dh-&gt;idx,</div><div class='del'>-					SCSI_DEVINFO_DH);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	bus_for_each_dev(&amp;scsi_bus_type, NULL, scsi_dh, scsi_dh_notifier_add);</div><div class='ctx'> 	printk(KERN_INFO "%s: device handler registered\n", scsi_dh-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -396,7 +350,6 @@ EXPORT_SYMBOL_GPL(scsi_register_device_handler);</div><div class='ctx'>  */</div><div class='ctx'> int scsi_unregister_device_handler(struct scsi_device_handler *scsi_dh)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!get_device_handler(scsi_dh-&gt;name))</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -404,12 +357,6 @@ int scsi_unregister_device_handler(struct scsi_device_handler *scsi_dh)</div><div class='ctx'> 	bus_for_each_dev(&amp;scsi_bus_type, NULL, scsi_dh,</div><div class='ctx'> 			 scsi_dh_notifier_remove);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; scsi_dh-&gt;devlist &amp;&amp; scsi_dh-&gt;devlist[i].vendor; i++) {</div><div class='del'>-		scsi_dev_info_list_del_keyed(scsi_dh-&gt;devlist[i].vendor,</div><div class='del'>-					     scsi_dh-&gt;devlist[i].model,</div><div class='del'>-					     SCSI_DEVINFO_DH);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	spin_lock(&amp;list_lock);</div><div class='ctx'> 	list_del(&amp;scsi_dh-&gt;list);</div><div class='ctx'> 	spin_unlock(&amp;list_lock);</div><div class='hunk'>@@ -588,10 +535,6 @@ static int __init scsi_dh_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='del'>-	r = scsi_dev_info_add_list(SCSI_DEVINFO_DH, "SCSI Device Handler");</div><div class='del'>-	if (r)</div><div class='del'>-		return r;</div><div class='del'>-</div><div class='ctx'> 	r = bus_register_notifier(&amp;scsi_bus_type, &amp;scsi_dh_nb);</div><div class='ctx'> </div><div class='ctx'> 	if (!r)</div><div class='hunk'>@@ -606,7 +549,6 @@ static void __exit scsi_dh_exit(void)</div><div class='ctx'> 	bus_for_each_dev(&amp;scsi_bus_type, NULL, NULL,</div><div class='ctx'> 			 scsi_dh_sysfs_attr_remove);</div><div class='ctx'> 	bus_unregister_notifier(&amp;scsi_bus_type, &amp;scsi_dh_nb);</div><div class='del'>-	scsi_dev_info_remove_list(SCSI_DEVINFO_DH);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(scsi_dh_init);</div><div class='head'>diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c<br/>index 4ef021291a4d..04c5cea47a22 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/device_handler/scsi_dh_alua.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/device_handler/scsi_dh_alua.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/device_handler/scsi_dh_alua.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/device_handler/scsi_dh_alua.c</a></div><div class='hunk'>@@ -466,6 +466,11 @@ static int alua_check_sense(struct scsi_device *sdev,</div><div class='ctx'> 			 * Power On, Reset, or Bus Device Reset, just retry.</div><div class='ctx'> 			 */</div><div class='ctx'> 			return ADD_TO_MLQUEUE;</div><div class='add'>+		if (sense_hdr-&gt;asc == 0x2a &amp;&amp; sense_hdr-&gt;ascq == 0x01)</div><div class='add'>+			/*</div><div class='add'>+			 * Mode Parameters Changed</div><div class='add'>+			 */</div><div class='add'>+			return ADD_TO_MLQUEUE;</div><div class='ctx'> 		if (sense_hdr-&gt;asc == 0x2a &amp;&amp; sense_hdr-&gt;ascq == 0x06)</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * ALUA state changed</div><div class='head'>diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c<br/>index 591186cf1896..e1c8be06de9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/device_handler/scsi_dh_emc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/device_handler/scsi_dh_emc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/device_handler/scsi_dh_emc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/device_handler/scsi_dh_emc.c</a></div><div class='hunk'>@@ -629,6 +629,24 @@ static const struct scsi_dh_devlist clariion_dev_list[] = {</div><div class='ctx'> 	{NULL, NULL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static bool clariion_match(struct scsi_device *sdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (scsi_device_tpgs(sdev))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	for (i = 0; clariion_dev_list[i].vendor; i++) {</div><div class='add'>+		if (!strncmp(sdev-&gt;vendor, clariion_dev_list[i].vendor,</div><div class='add'>+			strlen(clariion_dev_list[i].vendor)) &amp;&amp;</div><div class='add'>+		    !strncmp(sdev-&gt;model, clariion_dev_list[i].model,</div><div class='add'>+			strlen(clariion_dev_list[i].model))) {</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 int clariion_bus_attach(struct scsi_device *sdev);</div><div class='ctx'> static void clariion_bus_detach(struct scsi_device *sdev);</div><div class='ctx'> </div><div class='hunk'>@@ -642,6 +660,7 @@ static struct scsi_device_handler clariion_dh = {</div><div class='ctx'> 	.activate	= clariion_activate,</div><div class='ctx'> 	.prep_fn	= clariion_prep_fn,</div><div class='ctx'> 	.set_params	= clariion_set_params,</div><div class='add'>+	.match		= clariion_match,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int clariion_bus_attach(struct scsi_device *sdev)</div><div class='head'>diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c<br/>index 0f86a18b157d..084062bb8ee9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/device_handler/scsi_dh_hp_sw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/device_handler/scsi_dh_hp_sw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/device_handler/scsi_dh_hp_sw.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/device_handler/scsi_dh_hp_sw.c</a></div><div class='hunk'>@@ -320,6 +320,24 @@ static const struct scsi_dh_devlist hp_sw_dh_data_list[] = {</div><div class='ctx'> 	{NULL, NULL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static bool hp_sw_match(struct scsi_device *sdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (scsi_device_tpgs(sdev))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	for (i = 0; hp_sw_dh_data_list[i].vendor; i++) {</div><div class='add'>+		if (!strncmp(sdev-&gt;vendor, hp_sw_dh_data_list[i].vendor,</div><div class='add'>+			strlen(hp_sw_dh_data_list[i].vendor)) &amp;&amp;</div><div class='add'>+		    !strncmp(sdev-&gt;model, hp_sw_dh_data_list[i].model,</div><div class='add'>+			strlen(hp_sw_dh_data_list[i].model))) {</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 int hp_sw_bus_attach(struct scsi_device *sdev);</div><div class='ctx'> static void hp_sw_bus_detach(struct scsi_device *sdev);</div><div class='ctx'> </div><div class='hunk'>@@ -331,6 +349,7 @@ static struct scsi_device_handler hp_sw_dh = {</div><div class='ctx'> 	.detach		= hp_sw_bus_detach,</div><div class='ctx'> 	.activate	= hp_sw_activate,</div><div class='ctx'> 	.prep_fn	= hp_sw_prep_fn,</div><div class='add'>+	.match		= hp_sw_match,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int hp_sw_bus_attach(struct scsi_device *sdev)</div><div class='head'>diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c<br/>index 1d3127920063..53a31c753cb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/device_handler/scsi_dh_rdac.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/device_handler/scsi_dh_rdac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/device_handler/scsi_dh_rdac.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/device_handler/scsi_dh_rdac.c</a></div><div class='hunk'>@@ -820,6 +820,24 @@ static const struct scsi_dh_devlist rdac_dev_list[] = {</div><div class='ctx'> 	{NULL, NULL},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static bool rdac_match(struct scsi_device *sdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (scsi_device_tpgs(sdev))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	for (i = 0; rdac_dev_list[i].vendor; i++) {</div><div class='add'>+		if (!strncmp(sdev-&gt;vendor, rdac_dev_list[i].vendor,</div><div class='add'>+			strlen(rdac_dev_list[i].vendor)) &amp;&amp;</div><div class='add'>+		    !strncmp(sdev-&gt;model, rdac_dev_list[i].model,</div><div class='add'>+			strlen(rdac_dev_list[i].model))) {</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 int rdac_bus_attach(struct scsi_device *sdev);</div><div class='ctx'> static void rdac_bus_detach(struct scsi_device *sdev);</div><div class='ctx'> </div><div class='hunk'>@@ -832,6 +850,7 @@ static struct scsi_device_handler rdac_dh = {</div><div class='ctx'> 	.attach = rdac_bus_attach,</div><div class='ctx'> 	.detach = rdac_bus_detach,</div><div class='ctx'> 	.activate = rdac_activate,</div><div class='add'>+	.match = rdac_match,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int rdac_bus_attach(struct scsi_device *sdev)</div><div class='hunk'>@@ -934,6 +953,8 @@ static int __init rdac_init(void)</div><div class='ctx'> 	if (!kmpath_rdacd) {</div><div class='ctx'> 		scsi_unregister_device_handler(&amp;rdac_dh);</div><div class='ctx'> 		printk(KERN_ERR "kmpath_rdacd creation failed.\n");</div><div class='add'>+</div><div class='add'>+		r = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> done:</div><div class='ctx'> 	return r;</div><div class='head'>diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c<br/>index 8d67467dd9ce..e9599600aa23 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/fcoe/fcoe.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/fcoe/fcoe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/fcoe/fcoe.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/fcoe/fcoe.c</a></div><div class='hunk'>@@ -58,7 +58,11 @@ module_param_named(ddp_min, fcoe_ddp_min, uint, S_IRUGO | S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC(ddp_min, "Minimum I/O size in bytes for "	\</div><div class='ctx'> 		 "Direct Data Placement (DDP).");</div><div class='ctx'> </div><div class='del'>-DEFINE_MUTEX(fcoe_config_mutex);</div><div class='add'>+unsigned int fcoe_debug_logging;</div><div class='add'>+module_param_named(debug_logging, fcoe_debug_logging, int, S_IRUGO|S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(debug_logging, "a bit mask of logging levels");</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(fcoe_config_mutex);</div><div class='ctx'> </div><div class='ctx'> static struct workqueue_struct *fcoe_wq;</div><div class='ctx'> </div><div class='hunk'>@@ -67,8 +71,8 @@ static DECLARE_COMPLETION(fcoe_flush_completion);</div><div class='ctx'> </div><div class='ctx'> /* fcoe host list */</div><div class='ctx'> /* must only by accessed under the RTNL mutex */</div><div class='del'>-LIST_HEAD(fcoe_hostlist);</div><div class='del'>-DEFINE_PER_CPU(struct fcoe_percpu_s, fcoe_percpu);</div><div class='add'>+static LIST_HEAD(fcoe_hostlist);</div><div class='add'>+static DEFINE_PER_CPU(struct fcoe_percpu_s, fcoe_percpu);</div><div class='ctx'> </div><div class='ctx'> /* Function Prototypes */</div><div class='ctx'> static int fcoe_reset(struct Scsi_Host *);</div><div class='hunk'>@@ -157,7 +161,7 @@ static struct libfc_function_template fcoe_libfc_fcn_templ = {</div><div class='ctx'> 	.lport_set_port_id = fcoe_set_port_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct fc_function_template fcoe_nport_fc_functions = {</div><div class='add'>+static struct fc_function_template fcoe_nport_fc_functions = {</div><div class='ctx'> 	.show_host_node_name = 1,</div><div class='ctx'> 	.show_host_port_name = 1,</div><div class='ctx'> 	.show_host_supported_classes = 1,</div><div class='hunk'>@@ -197,7 +201,7 @@ struct fc_function_template fcoe_nport_fc_functions = {</div><div class='ctx'> 	.bsg_request = fc_lport_bsg_request,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct fc_function_template fcoe_vport_fc_functions = {</div><div class='add'>+static struct fc_function_template fcoe_vport_fc_functions = {</div><div class='ctx'> 	.show_host_node_name = 1,</div><div class='ctx'> 	.show_host_port_name = 1,</div><div class='ctx'> 	.show_host_supported_classes = 1,</div><div class='hunk'>@@ -433,7 +437,7 @@ static inline void fcoe_interface_put(struct fcoe_interface *fcoe)</div><div class='ctx'>  *</div><div class='ctx'>  * Caller must be holding the RTNL mutex</div><div class='ctx'>  */</div><div class='del'>-void fcoe_interface_cleanup(struct fcoe_interface *fcoe)</div><div class='add'>+static void fcoe_interface_cleanup(struct fcoe_interface *fcoe)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = fcoe-&gt;netdev;</div><div class='ctx'> 	struct fcoe_ctlr *fip = &amp;fcoe-&gt;ctlr;</div><div class='hunk'>@@ -748,7 +752,7 @@ static int fcoe_shost_config(struct fc_lport *lport, struct device *dev)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: True for read types I/O, otherwise returns false.</div><div class='ctx'>  */</div><div class='del'>-bool fcoe_oem_match(struct fc_frame *fp)</div><div class='add'>+static bool fcoe_oem_match(struct fc_frame *fp)</div><div class='ctx'> {</div><div class='ctx'> 	struct fc_frame_header *fh = fc_frame_header_get(fp);</div><div class='ctx'> 	struct fcp_cmnd *fcp;</div><div class='hunk'>@@ -756,11 +760,12 @@ bool fcoe_oem_match(struct fc_frame *fp)</div><div class='ctx'> 	if (fc_fcp_is_read(fr_fsp(fp)) &amp;&amp;</div><div class='ctx'> 	    (fr_fsp(fp)-&gt;data_len &gt; fcoe_ddp_min))</div><div class='ctx'> 		return true;</div><div class='del'>-	else if (!(ntoh24(fh-&gt;fh_f_ctl) &amp; FC_FC_EX_CTX)) {</div><div class='add'>+	else if ((fr_fsp(fp) == NULL) &amp;&amp;</div><div class='add'>+		 (fh-&gt;fh_r_ctl == FC_RCTL_DD_UNSOL_CMD) &amp;&amp;</div><div class='add'>+		 (ntohs(fh-&gt;fh_rx_id) == FC_XID_UNKNOWN)) {</div><div class='ctx'> 		fcp = fc_frame_payload_get(fp, sizeof(*fcp));</div><div class='del'>-		if (ntohs(fh-&gt;fh_rx_id) == FC_XID_UNKNOWN &amp;&amp;</div><div class='del'>-		    fcp &amp;&amp; (ntohl(fcp-&gt;fc_dl) &gt; fcoe_ddp_min) &amp;&amp;</div><div class='del'>-		    (fcp-&gt;fc_flags &amp; FCP_CFL_WRDATA))</div><div class='add'>+		if ((fcp-&gt;fc_flags &amp; FCP_CFL_WRDATA) &amp;&amp;</div><div class='add'>+		    (ntohl(fcp-&gt;fc_dl) &gt; fcoe_ddp_min))</div><div class='ctx'> 			return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -1106,7 +1111,7 @@ static int __init fcoe_if_init(void)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: 0 on success</div><div class='ctx'>  */</div><div class='del'>-int __exit fcoe_if_exit(void)</div><div class='add'>+static int __exit fcoe_if_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	fc_release_transport(fcoe_nport_scsi_transport);</div><div class='ctx'> 	fc_release_transport(fcoe_vport_scsi_transport);</div><div class='hunk'>@@ -1295,7 +1300,7 @@ static inline unsigned int fcoe_select_cpu(void)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: 0 for success</div><div class='ctx'>  */</div><div class='del'>-int fcoe_rcv(struct sk_buff *skb, struct net_device *netdev,</div><div class='add'>+static int fcoe_rcv(struct sk_buff *skb, struct net_device *netdev,</div><div class='ctx'> 	     struct packet_type *ptype, struct net_device *olddev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fc_lport *lport;</div><div class='hunk'>@@ -1451,7 +1456,7 @@ static int fcoe_alloc_paged_crc_eof(struct sk_buff *skb, int tlen)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 for success</div><div class='ctx'>  */</div><div class='del'>-int fcoe_xmit(struct fc_lport *lport, struct fc_frame *fp)</div><div class='add'>+static int fcoe_xmit(struct fc_lport *lport, struct fc_frame *fp)</div><div class='ctx'> {</div><div class='ctx'> 	int wlen;</div><div class='ctx'> 	u32 crc;</div><div class='hunk'>@@ -1671,8 +1676,7 @@ static void fcoe_recv_frame(struct sk_buff *skb)</div><div class='ctx'> 			skb-&gt;dev ? skb-&gt;dev-&gt;name : "&lt;NULL&gt;");</div><div class='ctx'> </div><div class='ctx'> 	port = lport_priv(lport);</div><div class='del'>-	if (skb_is_nonlinear(skb))</div><div class='del'>-		skb_linearize(skb);	/* not ideal */</div><div class='add'>+	skb_linearize(skb); /* check for skb_is_nonlinear is within skb_linearize */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Frame length checks and setting up the header pointers</div><div class='hunk'>@@ -1728,7 +1732,7 @@ drop:</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 for success</div><div class='ctx'>  */</div><div class='del'>-int fcoe_percpu_receive_thread(void *arg)</div><div class='add'>+static int fcoe_percpu_receive_thread(void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct fcoe_percpu_s *p = arg;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -2146,7 +2150,7 @@ out_nortnl:</div><div class='ctx'>  * Returns: 0 if the ethtool query was successful</div><div class='ctx'>  *          -1 if the ethtool query failed</div><div class='ctx'>  */</div><div class='del'>-int fcoe_link_speed_update(struct fc_lport *lport)</div><div class='add'>+static int fcoe_link_speed_update(struct fc_lport *lport)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = fcoe_netdev(lport);</div><div class='ctx'> 	struct ethtool_cmd ecmd;</div><div class='hunk'>@@ -2180,7 +2184,7 @@ int fcoe_link_speed_update(struct fc_lport *lport)</div><div class='ctx'>  * Returns: 0 if link is UP and OK, -1 if not</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-int fcoe_link_ok(struct fc_lport *lport)</div><div class='add'>+static int fcoe_link_ok(struct fc_lport *lport)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = fcoe_netdev(lport);</div><div class='ctx'> </div><div class='hunk'>@@ -2200,7 +2204,7 @@ int fcoe_link_ok(struct fc_lport *lport)</div><div class='ctx'>  * there no packets that will be handled by the lport, but also that any</div><div class='ctx'>  * threads already handling packet have returned.</div><div class='ctx'>  */</div><div class='del'>-void fcoe_percpu_clean(struct fc_lport *lport)</div><div class='add'>+static void fcoe_percpu_clean(struct fc_lport *lport)</div><div class='ctx'> {</div><div class='ctx'> 	struct fcoe_percpu_s *pp;</div><div class='ctx'> 	struct fcoe_rcv_info *fr;</div><div class='hunk'>@@ -2251,7 +2255,7 @@ void fcoe_percpu_clean(struct fc_lport *lport)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: Always 0 (return value required by FC transport template)</div><div class='ctx'>  */</div><div class='del'>-int fcoe_reset(struct Scsi_Host *shost)</div><div class='add'>+static int fcoe_reset(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='ctx'> 	struct fc_lport *lport = shost_priv(shost);</div><div class='ctx'> 	struct fcoe_port *port = lport_priv(lport);</div><div class='head'>diff --git a/drivers/scsi/fcoe/fcoe.h b/drivers/scsi/fcoe/fcoe.h<br/>index 6c6884bcf840..bcc89e639495 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/fcoe/fcoe.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/fcoe/fcoe.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/fcoe/fcoe.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/fcoe/fcoe.h</a></div><div class='hunk'>@@ -40,9 +40,7 @@</div><div class='ctx'> #define FCOE_MIN_XID		0x0000	/* the min xid supported by fcoe_sw */</div><div class='ctx'> #define FCOE_MAX_XID		0x0FFF	/* the max xid supported by fcoe_sw */</div><div class='ctx'> </div><div class='del'>-unsigned int fcoe_debug_logging;</div><div class='del'>-module_param_named(debug_logging, fcoe_debug_logging, int, S_IRUGO|S_IWUSR);</div><div class='del'>-MODULE_PARM_DESC(debug_logging, "a bit mask of logging levels");</div><div class='add'>+extern unsigned int fcoe_debug_logging;</div><div class='ctx'> </div><div class='ctx'> #define FCOE_LOGGING	    0x01 /* General logging, not categorized */</div><div class='ctx'> #define FCOE_NETDEV_LOGGING 0x02 /* Netdevice logging */</div><div class='head'>diff --git a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h<br/>index d969855ac64a..d3e4d7c6f577 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/gdth.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/gdth.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/gdth.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/gdth.h</a></div><div class='hunk'>@@ -359,7 +359,7 @@ typedef struct {</div><div class='ctx'>     u32     cmd_buff_addr2;     /* physical address of cmd buffer 1 */   </div><div class='ctx'>     u32     cmd_buff_u_addr2;   /* reserved for 64 bit addressing */</div><div class='ctx'>     u32     cmd_buff_indx2;     /* cmd buf addr1 unique identifier */</div><div class='del'>-    u32     cmd_buff_size;      /* size of each cmd bufer in bytes */</div><div class='add'>+    u32     cmd_buff_size;      /* size of each cmd buffer in bytes */</div><div class='ctx'>     u32     reserved1;</div><div class='ctx'>     u32     reserved2;</div><div class='ctx'> } __attribute__((packed)) gdth_perf_modes;</div><div class='head'>diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c<br/>index 865d452542be..b96962c39449 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/hpsa.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/hpsa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/hpsa.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/hpsa.c</a></div><div class='hunk'>@@ -293,12 +293,14 @@ static u32 unresettable_controller[] = {</div><div class='ctx'> 	0x3215103C, /* Smart Array E200i */</div><div class='ctx'> 	0x3237103C, /* Smart Array E500 */</div><div class='ctx'> 	0x323D103C, /* Smart Array P700m */</div><div class='add'>+	0x40800E11, /* Smart Array 5i */</div><div class='ctx'> 	0x409C0E11, /* Smart Array 6400 */</div><div class='ctx'> 	0x409D0E11, /* Smart Array 6400 EM */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* List of controllers which cannot even be soft reset */</div><div class='ctx'> static u32 soft_unresettable_controller[] = {</div><div class='add'>+	0x40800E11, /* Smart Array 5i */</div><div class='ctx'> 	/* Exclude 640x boards.  These are two pci devices in one slot</div><div class='ctx'> 	 * which share a battery backed cache module.  One controls the</div><div class='ctx'> 	 * cache, the other accesses the cache through the one that controls</div><div class='hunk'>@@ -4072,10 +4074,10 @@ static int hpsa_request_irq(struct ctlr_info *h,</div><div class='ctx'> </div><div class='ctx'> 	if (h-&gt;msix_vector || h-&gt;msi_vector)</div><div class='ctx'> 		rc = request_irq(h-&gt;intr[h-&gt;intr_mode], msixhandler,</div><div class='del'>-				IRQF_DISABLED, h-&gt;devname, h);</div><div class='add'>+				0, h-&gt;devname, h);</div><div class='ctx'> 	else</div><div class='ctx'> 		rc = request_irq(h-&gt;intr[h-&gt;intr_mode], intxhandler,</div><div class='del'>-				IRQF_DISABLED, h-&gt;devname, h);</div><div class='add'>+				IRQF_SHARED, h-&gt;devname, h);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(&amp;h-&gt;pdev-&gt;dev, "unable to get irq %d for %s\n",</div><div class='ctx'> 		       h-&gt;intr[h-&gt;intr_mode], h-&gt;devname);</div><div class='hunk'>@@ -4269,7 +4271,9 @@ static void stop_controller_lockup_detector(struct ctlr_info *h)</div><div class='ctx'> 	remove_ctlr_from_lockup_detector_list(h);</div><div class='ctx'> 	/* If the list of ctlr's to monitor is empty, stop the thread */</div><div class='ctx'> 	if (list_empty(&amp;hpsa_ctlr_list)) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;lockup_detector_lock, flags);</div><div class='ctx'> 		kthread_stop(hpsa_lockup_detector);</div><div class='add'>+		spin_lock_irqsave(&amp;lockup_detector_lock, flags);</div><div class='ctx'> 		hpsa_lockup_detector = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lockup_detector_lock, flags);</div><div class='head'>diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c<br/>index fd860d952b28..67b169b7a5be 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/ipr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/ipr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/ipr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/ipr.c</a></div><div class='hunk'>@@ -7638,8 +7638,12 @@ static int ipr_reset_restore_cfg_space(struct ipr_cmnd *ipr_cmd)</div><div class='ctx'>  **/</div><div class='ctx'> static int ipr_reset_bist_done(struct ipr_cmnd *ipr_cmd)</div><div class='ctx'> {</div><div class='add'>+	struct ipr_ioa_cfg *ioa_cfg = ipr_cmd-&gt;ioa_cfg;</div><div class='add'>+</div><div class='ctx'> 	ENTER;</div><div class='del'>-	pci_unblock_user_cfg_access(ipr_cmd-&gt;ioa_cfg-&gt;pdev);</div><div class='add'>+	if (ioa_cfg-&gt;cfg_locked)</div><div class='add'>+		pci_cfg_access_unlock(ioa_cfg-&gt;pdev);</div><div class='add'>+	ioa_cfg-&gt;cfg_locked = 0;</div><div class='ctx'> 	ipr_cmd-&gt;job_step = ipr_reset_restore_cfg_space;</div><div class='ctx'> 	LEAVE;</div><div class='ctx'> 	return IPR_RC_JOB_CONTINUE;</div><div class='hunk'>@@ -7660,8 +7664,6 @@ static int ipr_reset_start_bist(struct ipr_cmnd *ipr_cmd)</div><div class='ctx'> 	int rc = PCIBIOS_SUCCESSFUL;</div><div class='ctx'> </div><div class='ctx'> 	ENTER;</div><div class='del'>-	pci_block_user_cfg_access(ioa_cfg-&gt;pdev);</div><div class='del'>-</div><div class='ctx'> 	if (ioa_cfg-&gt;ipr_chip-&gt;bist_method == IPR_MMIO)</div><div class='ctx'> 		writel(IPR_UPROCI_SIS64_START_BIST,</div><div class='ctx'> 		       ioa_cfg-&gt;regs.set_uproc_interrupt_reg32);</div><div class='hunk'>@@ -7673,7 +7675,9 @@ static int ipr_reset_start_bist(struct ipr_cmnd *ipr_cmd)</div><div class='ctx'> 		ipr_reset_start_timer(ipr_cmd, IPR_WAIT_FOR_BIST_TIMEOUT);</div><div class='ctx'> 		rc = IPR_RC_JOB_RETURN;</div><div class='ctx'> 	} else {</div><div class='del'>-		pci_unblock_user_cfg_access(ipr_cmd-&gt;ioa_cfg-&gt;pdev);</div><div class='add'>+		if (ioa_cfg-&gt;cfg_locked)</div><div class='add'>+			pci_cfg_access_unlock(ipr_cmd-&gt;ioa_cfg-&gt;pdev);</div><div class='add'>+		ioa_cfg-&gt;cfg_locked = 0;</div><div class='ctx'> 		ipr_cmd-&gt;s.ioasa.hdr.ioasc = cpu_to_be32(IPR_IOASC_PCI_ACCESS_ERROR);</div><div class='ctx'> 		rc = IPR_RC_JOB_CONTINUE;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -7716,7 +7720,6 @@ static int ipr_reset_slot_reset(struct ipr_cmnd *ipr_cmd)</div><div class='ctx'> 	struct pci_dev *pdev = ioa_cfg-&gt;pdev;</div><div class='ctx'> </div><div class='ctx'> 	ENTER;</div><div class='del'>-	pci_block_user_cfg_access(pdev);</div><div class='ctx'> 	pci_set_pcie_reset_state(pdev, pcie_warm_reset);</div><div class='ctx'> 	ipr_cmd-&gt;job_step = ipr_reset_slot_reset_done;</div><div class='ctx'> 	ipr_reset_start_timer(ipr_cmd, IPR_PCI_RESET_TIMEOUT);</div><div class='hunk'>@@ -7725,6 +7728,56 @@ static int ipr_reset_slot_reset(struct ipr_cmnd *ipr_cmd)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ipr_reset_block_config_access_wait - Wait for permission to block config access</div><div class='add'>+ * @ipr_cmd:	ipr command struct</div><div class='add'>+ *</div><div class='add'>+ * Description: This attempts to block config access to the IOA.</div><div class='add'>+ *</div><div class='add'>+ * Return value:</div><div class='add'>+ * 	IPR_RC_JOB_CONTINUE / IPR_RC_JOB_RETURN</div><div class='add'>+ **/</div><div class='add'>+static int ipr_reset_block_config_access_wait(struct ipr_cmnd *ipr_cmd)</div><div class='add'>+{</div><div class='add'>+	struct ipr_ioa_cfg *ioa_cfg = ipr_cmd-&gt;ioa_cfg;</div><div class='add'>+	int rc = IPR_RC_JOB_CONTINUE;</div><div class='add'>+</div><div class='add'>+	if (pci_cfg_access_trylock(ioa_cfg-&gt;pdev)) {</div><div class='add'>+		ioa_cfg-&gt;cfg_locked = 1;</div><div class='add'>+		ipr_cmd-&gt;job_step = ioa_cfg-&gt;reset;</div><div class='add'>+	} else {</div><div class='add'>+		if (ipr_cmd-&gt;u.time_left) {</div><div class='add'>+			rc = IPR_RC_JOB_RETURN;</div><div class='add'>+			ipr_cmd-&gt;u.time_left -= IPR_CHECK_FOR_RESET_TIMEOUT;</div><div class='add'>+			ipr_reset_start_timer(ipr_cmd,</div><div class='add'>+					      IPR_CHECK_FOR_RESET_TIMEOUT);</div><div class='add'>+		} else {</div><div class='add'>+			ipr_cmd-&gt;job_step = ioa_cfg-&gt;reset;</div><div class='add'>+			dev_err(&amp;ioa_cfg-&gt;pdev-&gt;dev,</div><div class='add'>+				"Timed out waiting to lock config access. Resetting anyway.\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ipr_reset_block_config_access - Block config access to the IOA</div><div class='add'>+ * @ipr_cmd:	ipr command struct</div><div class='add'>+ *</div><div class='add'>+ * Description: This attempts to block config access to the IOA</div><div class='add'>+ *</div><div class='add'>+ * Return value:</div><div class='add'>+ * 	IPR_RC_JOB_CONTINUE</div><div class='add'>+ **/</div><div class='add'>+static int ipr_reset_block_config_access(struct ipr_cmnd *ipr_cmd)</div><div class='add'>+{</div><div class='add'>+	ipr_cmd-&gt;ioa_cfg-&gt;cfg_locked = 0;</div><div class='add'>+	ipr_cmd-&gt;job_step = ipr_reset_block_config_access_wait;</div><div class='add'>+	ipr_cmd-&gt;u.time_left = IPR_WAIT_FOR_RESET_TIMEOUT;</div><div class='add'>+	return IPR_RC_JOB_CONTINUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ipr_reset_allowed - Query whether or not IOA can be reset</div><div class='ctx'>  * @ioa_cfg:	ioa config struct</div><div class='ctx'>  *</div><div class='hunk'>@@ -7763,7 +7816,7 @@ static int ipr_reset_wait_to_start_bist(struct ipr_cmnd *ipr_cmd)</div><div class='ctx'> 		ipr_cmd-&gt;u.time_left -= IPR_CHECK_FOR_RESET_TIMEOUT;</div><div class='ctx'> 		ipr_reset_start_timer(ipr_cmd, IPR_CHECK_FOR_RESET_TIMEOUT);</div><div class='ctx'> 	} else {</div><div class='del'>-		ipr_cmd-&gt;job_step = ioa_cfg-&gt;reset;</div><div class='add'>+		ipr_cmd-&gt;job_step = ipr_reset_block_config_access;</div><div class='ctx'> 		rc = IPR_RC_JOB_CONTINUE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -7796,7 +7849,7 @@ static int ipr_reset_alert(struct ipr_cmnd *ipr_cmd)</div><div class='ctx'> 		writel(IPR_UPROCI_RESET_ALERT, ioa_cfg-&gt;regs.set_uproc_interrupt_reg32);</div><div class='ctx'> 		ipr_cmd-&gt;job_step = ipr_reset_wait_to_start_bist;</div><div class='ctx'> 	} else {</div><div class='del'>-		ipr_cmd-&gt;job_step = ioa_cfg-&gt;reset;</div><div class='add'>+		ipr_cmd-&gt;job_step = ipr_reset_block_config_access;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ipr_cmd-&gt;u.time_left = IPR_WAIT_FOR_RESET_TIMEOUT;</div><div class='head'>diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h<br/>index ac84736c1b9c..b13f9cc12279 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/ipr.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/ipr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/ipr.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/ipr.h</a></div><div class='hunk'>@@ -1387,6 +1387,7 @@ struct ipr_ioa_cfg {</div><div class='ctx'> 	u8 msi_received:1;</div><div class='ctx'> 	u8 sis64:1;</div><div class='ctx'> 	u8 dump_timeout:1;</div><div class='add'>+	u8 cfg_locked:1;</div><div class='ctx'> </div><div class='ctx'> 	u8 revid;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c<br/>index 218f71a8726e..d77891e5683b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/ips.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/ips.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/ips.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/ips.c</a></div><div class='hunk'>@@ -4494,7 +4494,7 @@ ips_init_scb(ips_ha_t * ha, ips_scb_t * scb)</div><div class='ctx'> /*                                                                          */</div><div class='ctx'> /*   Initialize a CCB to default values                                     */</div><div class='ctx'> /*                                                                          */</div><div class='del'>-/* ASSUMED to be callled from within a lock                                 */</div><div class='add'>+/* ASSUMED to be called from within a lock                                 */</div><div class='ctx'> /*                                                                          */</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> static ips_scb_t *</div><div class='head'>diff --git a/drivers/scsi/isci/firmware/Makefile b/drivers/scsi/isci/firmware/Makefile<br/>deleted file mode 100644<br/>index 5f54461cabc5..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/isci/firmware/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/firmware/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-# Makefile for create_fw</div><div class='del'>-#</div><div class='del'>-CC=gcc</div><div class='del'>-CFLAGS=-c -Wall -O2 -g</div><div class='del'>-LDFLAGS=</div><div class='del'>-SOURCES=create_fw.c</div><div class='del'>-OBJECTS=$(SOURCES:.cpp=.o)</div><div class='del'>-EXECUTABLE=create_fw</div><div class='del'>-</div><div class='del'>-all: $(SOURCES) $(EXECUTABLE)</div><div class='del'>-</div><div class='del'>-$(EXECUTABLE): $(OBJECTS)</div><div class='del'>-	$(CC) $(LDFLAGS) $(OBJECTS) -o $@</div><div class='del'>-</div><div class='del'>-.c.o:</div><div class='del'>-	$(CC) $(CFLAGS) $&lt; -O $@</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	rm -f *.o $(EXECUTABLE)</div><div class='head'>diff --git a/drivers/scsi/isci/firmware/README b/drivers/scsi/isci/firmware/README<br/>deleted file mode 100644<br/>index 8056d2bd233b..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/isci/firmware/README?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/firmware/README</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-This defines the temporary binary blow we are to pass to the SCU</div><div class='del'>-driver to emulate the binary firmware that we will eventually be</div><div class='del'>-able to access via NVRAM on the SCU controller.</div><div class='del'>-</div><div class='del'>-The current size of the binary blob is expected to be 149 bytes or larger</div><div class='del'>-</div><div class='del'>-Header Types:</div><div class='del'>-0x1: Phy Masks</div><div class='del'>-0x2: Phy Gens</div><div class='del'>-0x3: SAS Addrs</div><div class='del'>-0xff: End of Data</div><div class='del'>-</div><div class='del'>-ID string - u8[12]: "#SCU MAGIC#\0"</div><div class='del'>-Version - u8: 1</div><div class='del'>-SubVersion - u8: 0</div><div class='del'>-</div><div class='del'>-Header Type - u8: 0x1</div><div class='del'>-Size - u8: 8</div><div class='del'>-Phy Mask - u32[8]</div><div class='del'>-</div><div class='del'>-Header Type - u8: 0x2</div><div class='del'>-Size - u8: 8</div><div class='del'>-Phy Gen - u32[8]</div><div class='del'>-</div><div class='del'>-Header Type - u8: 0x3</div><div class='del'>-Size - u8: 8</div><div class='del'>-Sas Addr - u64[8]</div><div class='del'>-</div><div class='del'>-Header Type - u8: 0xf</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-==============================================================================</div><div class='del'>-</div><div class='del'>-Place isci_firmware.bin in /lib/firmware</div><div class='del'>-Be sure to recreate the initramfs image to include the firmware.</div><div class='del'>-</div><div class='head'>diff --git a/drivers/scsi/isci/firmware/create_fw.c b/drivers/scsi/isci/firmware/create_fw.c<br/>deleted file mode 100644<br/>index c7a2887a7e95..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/isci/firmware/create_fw.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/firmware/create_fw.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,99 +0,0 @@</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='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;asm/types.h&gt;</div><div class='del'>-#include &lt;strings.h&gt;</div><div class='del'>-#include &lt;stdint.h&gt;</div><div class='del'>-</div><div class='del'>-#include "create_fw.h"</div><div class='del'>-#include "../probe_roms.h"</div><div class='del'>-</div><div class='del'>-int write_blob(struct isci_orom *isci_orom)</div><div class='del'>-{</div><div class='del'>-	FILE *fd;</div><div class='del'>-	int err;</div><div class='del'>-	size_t count;</div><div class='del'>-</div><div class='del'>-	fd = fopen(blob_name, "w+");</div><div class='del'>-	if (!fd) {</div><div class='del'>-		perror("Open file for write failed");</div><div class='del'>-		fclose(fd);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	count = fwrite(isci_orom, sizeof(struct isci_orom), 1, fd);</div><div class='del'>-	if (count != 1) {</div><div class='del'>-		perror("Write data failed");</div><div class='del'>-		fclose(fd);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fclose(fd);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void set_binary_values(struct isci_orom *isci_orom)</div><div class='del'>-{</div><div class='del'>-	int ctrl_idx, phy_idx, port_idx;</div><div class='del'>-</div><div class='del'>-	/* setting OROM signature */</div><div class='del'>-	strncpy(isci_orom-&gt;hdr.signature, sig, strlen(sig));</div><div class='del'>-	isci_orom-&gt;hdr.version = version;</div><div class='del'>-	isci_orom-&gt;hdr.total_block_length = sizeof(struct isci_orom);</div><div class='del'>-	isci_orom-&gt;hdr.hdr_length = sizeof(struct sci_bios_oem_param_block_hdr);</div><div class='del'>-	isci_orom-&gt;hdr.num_elements = num_elements;</div><div class='del'>-</div><div class='del'>-	for (ctrl_idx = 0; ctrl_idx &lt; 2; ctrl_idx++) {</div><div class='del'>-		isci_orom-&gt;ctrl[ctrl_idx].controller.mode_type = mode_type;</div><div class='del'>-		isci_orom-&gt;ctrl[ctrl_idx].controller.max_concurrent_dev_spin_up =</div><div class='del'>-			max_num_concurrent_dev_spin_up;</div><div class='del'>-		isci_orom-&gt;ctrl[ctrl_idx].controller.do_enable_ssc =</div><div class='del'>-			enable_ssc;</div><div class='del'>-</div><div class='del'>-		for (port_idx = 0; port_idx &lt; 4; port_idx++)</div><div class='del'>-			isci_orom-&gt;ctrl[ctrl_idx].ports[port_idx].phy_mask =</div><div class='del'>-				phy_mask[ctrl_idx][port_idx];</div><div class='del'>-</div><div class='del'>-		for (phy_idx = 0; phy_idx &lt; 4; phy_idx++) {</div><div class='del'>-			isci_orom-&gt;ctrl[ctrl_idx].phys[phy_idx].sas_address.high =</div><div class='del'>-				(__u32)(sas_addr[ctrl_idx][phy_idx] &gt;&gt; 32);</div><div class='del'>-			isci_orom-&gt;ctrl[ctrl_idx].phys[phy_idx].sas_address.low =</div><div class='del'>-				(__u32)(sas_addr[ctrl_idx][phy_idx]);</div><div class='del'>-</div><div class='del'>-			isci_orom-&gt;ctrl[ctrl_idx].phys[phy_idx].afe_tx_amp_control0 =</div><div class='del'>-				afe_tx_amp_control0;</div><div class='del'>-			isci_orom-&gt;ctrl[ctrl_idx].phys[phy_idx].afe_tx_amp_control1 =</div><div class='del'>-				afe_tx_amp_control1;</div><div class='del'>-			isci_orom-&gt;ctrl[ctrl_idx].phys[phy_idx].afe_tx_amp_control2 =</div><div class='del'>-				afe_tx_amp_control2;</div><div class='del'>-			isci_orom-&gt;ctrl[ctrl_idx].phys[phy_idx].afe_tx_amp_control3 =</div><div class='del'>-				afe_tx_amp_control3;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct isci_orom *isci_orom;</div><div class='del'>-</div><div class='del'>-	isci_orom = malloc(sizeof(struct isci_orom));</div><div class='del'>-	memset(isci_orom, 0, sizeof(struct isci_orom));</div><div class='del'>-</div><div class='del'>-	set_binary_values(isci_orom);</div><div class='del'>-</div><div class='del'>-	err = write_blob(isci_orom);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		free(isci_orom);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	free(isci_orom);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/scsi/isci/firmware/create_fw.h b/drivers/scsi/isci/firmware/create_fw.h<br/>deleted file mode 100644<br/>index 5f298828d22e..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/isci/firmware/create_fw.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/firmware/create_fw.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +0,0 @@</div><div class='del'>-#ifndef _CREATE_FW_H_</div><div class='del'>-#define _CREATE_FW_H_</div><div class='del'>-#include "../probe_roms.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* we are configuring for 2 SCUs */</div><div class='del'>-static const int num_elements = 2;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For all defined arrays:</div><div class='del'>- * elements 0-3 are for SCU0, ports 0-3</div><div class='del'>- * elements 4-7 are for SCU1, ports 0-3</div><div class='del'>- *</div><div class='del'>- * valid configurations for one SCU are:</div><div class='del'>- *  P0  P1  P2  P3</div><div class='del'>- * ----------------</div><div class='del'>- * 0xF,0x0,0x0,0x0 # 1 x4 port</div><div class='del'>- * 0x3,0x0,0x4,0x8 # Phys 0 and 1 are a x2 port, phy 2 and phy 3 are each x1</div><div class='del'>- *                 # ports</div><div class='del'>- * 0x1,0x2,0xC,0x0 # Phys 0 and 1 are each x1 ports, phy 2 and phy 3 are a x2</div><div class='del'>- *                 # port</div><div class='del'>- * 0x3,0x0,0xC,0x0 # Phys 0 and 1 are a x2 port, phy 2 and phy 3 are a x2 port</div><div class='del'>- * 0x1,0x2,0x4,0x8 # Each phy is a x1 port (this is the default configuration)</div><div class='del'>- *</div><div class='del'>- * if there is a port/phy on which you do not wish to override the default</div><div class='del'>- * values, use the value assigned to UNINIT_PARAM (255).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* discovery mode type (port auto config mode by default ) */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * if there is a port/phy on which you do not wish to override the default</div><div class='del'>- * values, use the value "0000000000000000". SAS address of zero's is</div><div class='del'>- * considered invalid and will not be used.</div><div class='del'>- */</div><div class='del'>-#ifdef MPC</div><div class='del'>-static const int mode_type = SCIC_PORT_MANUAL_CONFIGURATION_MODE;</div><div class='del'>-static const __u8 phy_mask[2][4] = { {1, 2, 4, 8},</div><div class='del'>-				     {1, 2, 4, 8} };</div><div class='del'>-static const unsigned long long sas_addr[2][4] = { { 0x5FCFFFFFF0000001ULL,</div><div class='del'>-						     0x5FCFFFFFF0000002ULL,</div><div class='del'>-						     0x5FCFFFFFF0000003ULL,</div><div class='del'>-						     0x5FCFFFFFF0000004ULL },</div><div class='del'>-						   { 0x5FCFFFFFF0000005ULL,</div><div class='del'>-						     0x5FCFFFFFF0000006ULL,</div><div class='del'>-						     0x5FCFFFFFF0000007ULL,</div><div class='del'>-						     0x5FCFFFFFF0000008ULL } };</div><div class='del'>-#else	/* APC (default) */</div><div class='del'>-static const int mode_type = SCIC_PORT_AUTOMATIC_CONFIGURATION_MODE;</div><div class='del'>-static const __u8 phy_mask[2][4];</div><div class='del'>-static const unsigned long long sas_addr[2][4] = { { 0x5FCFFFFF00000001ULL,</div><div class='del'>-						     0x5FCFFFFF00000001ULL,</div><div class='del'>-						     0x5FCFFFFF00000001ULL,</div><div class='del'>-						     0x5FCFFFFF00000001ULL },</div><div class='del'>-						   { 0x5FCFFFFF00000002ULL,</div><div class='del'>-						     0x5FCFFFFF00000002ULL,</div><div class='del'>-						     0x5FCFFFFF00000002ULL,</div><div class='del'>-						     0x5FCFFFFF00000002ULL } };</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Maximum number of concurrent device spin up */</div><div class='del'>-static const int max_num_concurrent_dev_spin_up = 1;</div><div class='del'>-</div><div class='del'>-/* enable of ssc operation */</div><div class='del'>-static const int enable_ssc;</div><div class='del'>-</div><div class='del'>-/* AFE_TX_AMP_CONTROL */</div><div class='del'>-static const unsigned int afe_tx_amp_control0 = 0x000bdd08;</div><div class='del'>-static const unsigned int afe_tx_amp_control1 = 0x000ffc00;</div><div class='del'>-static const unsigned int afe_tx_amp_control2 = 0x000b7c09;</div><div class='del'>-static const unsigned int afe_tx_amp_control3 = 0x000afc6e;</div><div class='del'>-</div><div class='del'>-static const char blob_name[] = "isci_firmware.bin";</div><div class='del'>-static const char sig[] = "ISCUOEMB";</div><div class='del'>-static const unsigned char version = 0x10;</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c<br/>index e7fe9c4c85b8..1a65d6514237 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/isci/host.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/host.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/isci/host.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/isci/host.c</a></div><div class='hunk'>@@ -899,7 +899,8 @@ static enum sci_status sci_controller_start_next_phy(struct isci_host *ihost)</div><div class='ctx'> 			 */</div><div class='ctx'> 			if ((iphy-&gt;is_in_link_training == false &amp;&amp; state == SCI_PHY_INITIAL) ||</div><div class='ctx'> 			    (iphy-&gt;is_in_link_training == false &amp;&amp; state == SCI_PHY_STOPPED) ||</div><div class='del'>-			    (iphy-&gt;is_in_link_training == true &amp;&amp; is_phy_starting(iphy))) {</div><div class='add'>+			    (iphy-&gt;is_in_link_training == true &amp;&amp; is_phy_starting(iphy)) ||</div><div class='add'>+			    (ihost-&gt;port_agent.phy_ready_mask != ihost-&gt;port_agent.phy_configured_mask)) {</div><div class='ctx'> 				is_controller_start_complete = false;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1666,6 +1667,9 @@ static void sci_controller_set_default_config_parameters(struct isci_host *ihost</div><div class='ctx'> 	/* Default to no SSC operation. */</div><div class='ctx'> 	ihost-&gt;oem_parameters.controller.do_enable_ssc = false;</div><div class='ctx'> </div><div class='add'>+	/* Default to short cables on all phys. */</div><div class='add'>+	ihost-&gt;oem_parameters.controller.cable_selection_mask = 0;</div><div class='add'>+</div><div class='ctx'> 	/* Initialize all of the port parameter information to narrow ports. */</div><div class='ctx'> 	for (index = 0; index &lt; SCI_MAX_PORTS; index++) {</div><div class='ctx'> 		ihost-&gt;oem_parameters.ports[index].phy_mask = 0;</div><div class='hunk'>@@ -1673,8 +1677,9 @@ static void sci_controller_set_default_config_parameters(struct isci_host *ihost</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize all of the phy parameter information. */</div><div class='ctx'> 	for (index = 0; index &lt; SCI_MAX_PHYS; index++) {</div><div class='del'>-		/* Default to 6G (i.e. Gen 3) for now. */</div><div class='del'>-		ihost-&gt;user_parameters.phys[index].max_speed_generation = 3;</div><div class='add'>+		/* Default to 3G (i.e. Gen 2). */</div><div class='add'>+		ihost-&gt;user_parameters.phys[index].max_speed_generation =</div><div class='add'>+			SCIC_SDS_PARM_GEN2_SPEED;</div><div class='ctx'> </div><div class='ctx'> 		/* the frequencies cannot be 0 */</div><div class='ctx'> 		ihost-&gt;user_parameters.phys[index].align_insertion_frequency = 0x7f;</div><div class='hunk'>@@ -1694,7 +1699,7 @@ static void sci_controller_set_default_config_parameters(struct isci_host *ihost</div><div class='ctx'> 	ihost-&gt;user_parameters.ssp_inactivity_timeout = 5;</div><div class='ctx'> 	ihost-&gt;user_parameters.stp_max_occupancy_timeout = 5;</div><div class='ctx'> 	ihost-&gt;user_parameters.ssp_max_occupancy_timeout = 20;</div><div class='del'>-	ihost-&gt;user_parameters.no_outbound_task_timeout = 20;</div><div class='add'>+	ihost-&gt;user_parameters.no_outbound_task_timeout = 2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void controller_timeout(unsigned long data)</div><div class='hunk'>@@ -1759,7 +1764,7 @@ static enum sci_status sci_controller_construct(struct isci_host *ihost,</div><div class='ctx'> 	return sci_controller_reset(ihost);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int sci_oem_parameters_validate(struct sci_oem_params *oem)</div><div class='add'>+int sci_oem_parameters_validate(struct sci_oem_params *oem, u8 version)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1791,18 +1796,61 @@ int sci_oem_parameters_validate(struct sci_oem_params *oem)</div><div class='ctx'> 	    oem-&gt;controller.max_concurr_spin_up &lt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (oem-&gt;controller.do_enable_ssc) {</div><div class='add'>+		if (version &lt; ISCI_ROM_VER_1_1 &amp;&amp; oem-&gt;controller.do_enable_ssc != 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (version &gt;= ISCI_ROM_VER_1_1) {</div><div class='add'>+			u8 test = oem-&gt;controller.ssc_sata_tx_spread_level;</div><div class='add'>+</div><div class='add'>+			switch (test) {</div><div class='add'>+			case 0:</div><div class='add'>+			case 2:</div><div class='add'>+			case 3:</div><div class='add'>+			case 6:</div><div class='add'>+			case 7:</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'>+			test = oem-&gt;controller.ssc_sas_tx_spread_level;</div><div class='add'>+			if (oem-&gt;controller.ssc_sas_tx_type == 0) {</div><div class='add'>+				switch (test) {</div><div class='add'>+				case 0:</div><div class='add'>+				case 2:</div><div class='add'>+				case 3:</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 if (oem-&gt;controller.ssc_sas_tx_type == 1) {</div><div class='add'>+				switch (test) {</div><div class='add'>+				case 0:</div><div class='add'>+				case 3:</div><div class='add'>+				case 6:</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'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static enum sci_status sci_oem_parameters_set(struct isci_host *ihost)</div><div class='ctx'> {</div><div class='ctx'> 	u32 state = ihost-&gt;sm.current_state_id;</div><div class='add'>+	struct isci_pci_info *pci_info = to_pci_info(ihost-&gt;pdev);</div><div class='ctx'> </div><div class='ctx'> 	if (state == SCIC_RESET ||</div><div class='ctx'> 	    state == SCIC_INITIALIZING ||</div><div class='ctx'> 	    state == SCIC_INITIALIZED) {</div><div class='ctx'> </div><div class='del'>-		if (sci_oem_parameters_validate(&amp;ihost-&gt;oem_parameters))</div><div class='add'>+		if (sci_oem_parameters_validate(&amp;ihost-&gt;oem_parameters,</div><div class='add'>+						pci_info-&gt;orom-&gt;hdr.version))</div><div class='ctx'> 			return SCI_FAILURE_INVALID_PARAMETER_VALUE;</div><div class='ctx'> </div><div class='ctx'> 		return SCI_SUCCESS;</div><div class='hunk'>@@ -1857,6 +1905,31 @@ static void power_control_timeout(unsigned long data)</div><div class='ctx'> 		ihost-&gt;power_control.phys_waiting--;</div><div class='ctx'> 		ihost-&gt;power_control.phys_granted_power++;</div><div class='ctx'> 		sci_phy_consume_power_handler(iphy);</div><div class='add'>+</div><div class='add'>+		if (iphy-&gt;protocol == SCIC_SDS_PHY_PROTOCOL_SAS) {</div><div class='add'>+			u8 j;</div><div class='add'>+</div><div class='add'>+			for (j = 0; j &lt; SCI_MAX_PHYS; j++) {</div><div class='add'>+				struct isci_phy *requester = ihost-&gt;power_control.requesters[j];</div><div class='add'>+</div><div class='add'>+				/*</div><div class='add'>+				 * Search the power_control queue to see if there are other phys</div><div class='add'>+				 * attached to the same remote device. If found, take all of</div><div class='add'>+				 * them out of await_sas_power state.</div><div class='add'>+				 */</div><div class='add'>+				if (requester != NULL &amp;&amp; requester != iphy) {</div><div class='add'>+					u8 other = memcmp(requester-&gt;frame_rcvd.iaf.sas_addr,</div><div class='add'>+							  iphy-&gt;frame_rcvd.iaf.sas_addr,</div><div class='add'>+							  sizeof(requester-&gt;frame_rcvd.iaf.sas_addr));</div><div class='add'>+</div><div class='add'>+					if (other == 0) {</div><div class='add'>+						ihost-&gt;power_control.requesters[j] = NULL;</div><div class='add'>+						ihost-&gt;power_control.phys_waiting--;</div><div class='add'>+						sci_phy_consume_power_handler(requester);</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'>@@ -1891,9 +1964,34 @@ void sci_controller_power_control_queue_insert(struct isci_host *ihost,</div><div class='ctx'> 		ihost-&gt;power_control.timer_started = true;</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='del'>-		/* Add the phy in the waiting list */</div><div class='del'>-		ihost-&gt;power_control.requesters[iphy-&gt;phy_index] = iphy;</div><div class='del'>-		ihost-&gt;power_control.phys_waiting++;</div><div class='add'>+		/*</div><div class='add'>+		 * There are phys, attached to the same sas address as this phy, are</div><div class='add'>+		 * already in READY state, this phy don't need wait.</div><div class='add'>+		 */</div><div class='add'>+		u8 i;</div><div class='add'>+		struct isci_phy *current_phy;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; SCI_MAX_PHYS; i++) {</div><div class='add'>+			u8 other;</div><div class='add'>+			current_phy = &amp;ihost-&gt;phys[i];</div><div class='add'>+</div><div class='add'>+			other = memcmp(current_phy-&gt;frame_rcvd.iaf.sas_addr,</div><div class='add'>+				       iphy-&gt;frame_rcvd.iaf.sas_addr,</div><div class='add'>+				       sizeof(current_phy-&gt;frame_rcvd.iaf.sas_addr));</div><div class='add'>+</div><div class='add'>+			if (current_phy-&gt;sm.current_state_id == SCI_PHY_READY &amp;&amp;</div><div class='add'>+			    current_phy-&gt;protocol == SCIC_SDS_PHY_PROTOCOL_SAS &amp;&amp;</div><div class='add'>+			    other == 0) {</div><div class='add'>+				sci_phy_consume_power_handler(iphy);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i == SCI_MAX_PHYS) {</div><div class='add'>+			/* Add the phy in the waiting list */</div><div class='add'>+			ihost-&gt;power_control.requesters[iphy-&gt;phy_index] = iphy;</div><div class='add'>+			ihost-&gt;power_control.phys_waiting++;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1908,162 +2006,250 @@ void sci_controller_power_control_queue_remove(struct isci_host *ihost,</div><div class='ctx'> 	ihost-&gt;power_control.requesters[iphy-&gt;phy_index] = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int is_long_cable(int phy, unsigned char selection_byte)</div><div class='add'>+{</div><div class='add'>+	return !!(selection_byte &amp; (1 &lt;&lt; phy));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int is_medium_cable(int phy, unsigned char selection_byte)</div><div class='add'>+{</div><div class='add'>+	return !!(selection_byte &amp; (1 &lt;&lt; (phy + 4)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum cable_selections decode_selection_byte(</div><div class='add'>+	int phy,</div><div class='add'>+	unsigned char selection_byte)</div><div class='add'>+{</div><div class='add'>+	return ((selection_byte &amp; (1 &lt;&lt; phy)) ? 1 : 0)</div><div class='add'>+		+ (selection_byte &amp; (1 &lt;&lt; (phy + 4)) ? 2 : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned char *to_cable_select(struct isci_host *ihost)</div><div class='add'>+{</div><div class='add'>+	if (is_cable_select_overridden())</div><div class='add'>+		return ((unsigned char *)&amp;cable_selection_override)</div><div class='add'>+			+ ihost-&gt;id;</div><div class='add'>+	else</div><div class='add'>+		return &amp;ihost-&gt;oem_parameters.controller.cable_selection_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum cable_selections decode_cable_selection(struct isci_host *ihost, int phy)</div><div class='add'>+{</div><div class='add'>+	return decode_selection_byte(phy, *to_cable_select(ihost));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char *lookup_cable_names(enum cable_selections selection)</div><div class='add'>+{</div><div class='add'>+	static char *cable_names[] = {</div><div class='add'>+		[short_cable]     = "short",</div><div class='add'>+		[long_cable]      = "long",</div><div class='add'>+		[medium_cable]    = "medium",</div><div class='add'>+		[undefined_cable] = "&lt;undefined, assumed long&gt;" /* bit 0==1 */</div><div class='add'>+	};</div><div class='add'>+	return (selection &lt;= undefined_cable) ? cable_names[selection]</div><div class='add'>+					      : cable_names[undefined_cable];</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define AFE_REGISTER_WRITE_DELAY 10</div><div class='ctx'> </div><div class='del'>-/* Initialize the AFE for this phy index. We need to read the AFE setup from</div><div class='del'>- * the OEM parameters</div><div class='del'>- */</div><div class='ctx'> static void sci_controller_afe_initialization(struct isci_host *ihost)</div><div class='ctx'> {</div><div class='add'>+	struct scu_afe_registers __iomem *afe = &amp;ihost-&gt;scu_registers-&gt;afe;</div><div class='ctx'> 	const struct sci_oem_params *oem = &amp;ihost-&gt;oem_parameters;</div><div class='ctx'> 	struct pci_dev *pdev = ihost-&gt;pdev;</div><div class='ctx'> 	u32 afe_status;</div><div class='ctx'> 	u32 phy_id;</div><div class='add'>+	unsigned char cable_selection_mask = *to_cable_select(ihost);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear DFX Status registers */</div><div class='del'>-	writel(0x0081000f, &amp;ihost-&gt;scu_registers-&gt;afe.afe_dfx_master_control0);</div><div class='add'>+	writel(0x0081000f, &amp;afe-&gt;afe_dfx_master_control0);</div><div class='ctx'> 	udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> </div><div class='del'>-	if (is_b0(pdev)) {</div><div class='add'>+	if (is_b0(pdev) || is_c0(pdev) || is_c1(pdev)) {</div><div class='ctx'> 		/* PM Rx Equalization Save, PM SPhy Rx Acknowledgement</div><div class='del'>-		 * Timer, PM Stagger Timer */</div><div class='del'>-		writel(0x0007BFFF, &amp;ihost-&gt;scu_registers-&gt;afe.afe_pmsn_master_control2);</div><div class='add'>+		 * Timer, PM Stagger Timer</div><div class='add'>+		 */</div><div class='add'>+		writel(0x0007FFFF, &amp;afe-&gt;afe_pmsn_master_control2);</div><div class='ctx'> 		udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Configure bias currents to normal */</div><div class='ctx'> 	if (is_a2(pdev))</div><div class='del'>-		writel(0x00005A00, &amp;ihost-&gt;scu_registers-&gt;afe.afe_bias_control);</div><div class='add'>+		writel(0x00005A00, &amp;afe-&gt;afe_bias_control);</div><div class='ctx'> 	else if (is_b0(pdev) || is_c0(pdev))</div><div class='del'>-		writel(0x00005F00, &amp;ihost-&gt;scu_registers-&gt;afe.afe_bias_control);</div><div class='add'>+		writel(0x00005F00, &amp;afe-&gt;afe_bias_control);</div><div class='add'>+	else if (is_c1(pdev))</div><div class='add'>+		writel(0x00005500, &amp;afe-&gt;afe_bias_control);</div><div class='ctx'> </div><div class='ctx'> 	udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable PLL */</div><div class='del'>-	if (is_b0(pdev) || is_c0(pdev))</div><div class='del'>-		writel(0x80040A08, &amp;ihost-&gt;scu_registers-&gt;afe.afe_pll_control0);</div><div class='del'>-	else</div><div class='del'>-		writel(0x80040908, &amp;ihost-&gt;scu_registers-&gt;afe.afe_pll_control0);</div><div class='add'>+	if (is_a2(pdev))</div><div class='add'>+		writel(0x80040908, &amp;afe-&gt;afe_pll_control0);</div><div class='add'>+	else if (is_b0(pdev) || is_c0(pdev))</div><div class='add'>+		writel(0x80040A08, &amp;afe-&gt;afe_pll_control0);</div><div class='add'>+	else if (is_c1(pdev)) {</div><div class='add'>+		writel(0x80000B08, &amp;afe-&gt;afe_pll_control0);</div><div class='add'>+		udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='add'>+		writel(0x00000B08, &amp;afe-&gt;afe_pll_control0);</div><div class='add'>+		udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='add'>+		writel(0x80000B08, &amp;afe-&gt;afe_pll_control0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for the PLL to lock */</div><div class='ctx'> 	do {</div><div class='del'>-		afe_status = readl(&amp;ihost-&gt;scu_registers-&gt;afe.afe_common_block_status);</div><div class='add'>+		afe_status = readl(&amp;afe-&gt;afe_common_block_status);</div><div class='ctx'> 		udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> 	} while ((afe_status &amp; 0x00001000) == 0);</div><div class='ctx'> </div><div class='ctx'> 	if (is_a2(pdev)) {</div><div class='del'>-		/* Shorten SAS SNW lock time (RxLock timer value from 76 us to 50 us) */</div><div class='del'>-		writel(0x7bcc96ad, &amp;ihost-&gt;scu_registers-&gt;afe.afe_pmsn_master_control0);</div><div class='add'>+		/* Shorten SAS SNW lock time (RxLock timer value from 76</div><div class='add'>+		 * us to 50 us)</div><div class='add'>+		 */</div><div class='add'>+		writel(0x7bcc96ad, &amp;afe-&gt;afe_pmsn_master_control0);</div><div class='ctx'> 		udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (phy_id = 0; phy_id &lt; SCI_MAX_PHYS; phy_id++) {</div><div class='add'>+		struct scu_afe_transceiver *xcvr = &amp;afe-&gt;scu_afe_xcvr[phy_id];</div><div class='ctx'> 		const struct sci_phy_oem_params *oem_phy = &amp;oem-&gt;phys[phy_id];</div><div class='add'>+		int cable_length_long =</div><div class='add'>+			is_long_cable(phy_id, cable_selection_mask);</div><div class='add'>+		int cable_length_medium =</div><div class='add'>+			is_medium_cable(phy_id, cable_selection_mask);</div><div class='ctx'> </div><div class='del'>-		if (is_b0(pdev)) {</div><div class='del'>-			 /* Configure transmitter SSC parameters */</div><div class='del'>-			writel(0x00030000, &amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_tx_ssc_control);</div><div class='add'>+		if (is_a2(pdev)) {</div><div class='add'>+			/* All defaults, except the Receive Word</div><div class='add'>+			 * Alignament/Comma Detect Enable....(0xe800)</div><div class='add'>+			 */</div><div class='add'>+			writel(0x00004512, &amp;xcvr-&gt;afe_xcvr_control0);</div><div class='add'>+			udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='add'>+</div><div class='add'>+			writel(0x0050100F, &amp;xcvr-&gt;afe_xcvr_control1);</div><div class='add'>+			udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='add'>+		} else if (is_b0(pdev)) {</div><div class='add'>+			/* Configure transmitter SSC parameters */</div><div class='add'>+			writel(0x00030000, &amp;xcvr-&gt;afe_tx_ssc_control);</div><div class='ctx'> 			udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> 		} else if (is_c0(pdev)) {</div><div class='del'>-			 /* Configure transmitter SSC parameters */</div><div class='del'>-			writel(0x0003000, &amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_tx_ssc_control);</div><div class='add'>+			/* Configure transmitter SSC parameters */</div><div class='add'>+			writel(0x00010202, &amp;xcvr-&gt;afe_tx_ssc_control);</div><div class='ctx'> 			udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			 * All defaults, except the Receive Word Alignament/Comma Detect</div><div class='del'>-			 * Enable....(0xe800) */</div><div class='del'>-			writel(0x00004500, &amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_xcvr_control0);</div><div class='add'>+			/* All defaults, except the Receive Word</div><div class='add'>+			 * Alignament/Comma Detect Enable....(0xe800)</div><div class='add'>+			 */</div><div class='add'>+			writel(0x00014500, &amp;xcvr-&gt;afe_xcvr_control0);</div><div class='ctx'> 			udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * All defaults, except the Receive Word Alignament/Comma Detect</div><div class='del'>-			 * Enable....(0xe800) */</div><div class='del'>-			writel(0x00004512, &amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_xcvr_control0);</div><div class='add'>+		} else if (is_c1(pdev)) {</div><div class='add'>+			/* Configure transmitter SSC parameters */</div><div class='add'>+			writel(0x00010202, &amp;xcvr-&gt;afe_tx_ssc_control);</div><div class='ctx'> 			udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> </div><div class='del'>-			writel(0x0050100F, &amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_xcvr_control1);</div><div class='add'>+			/* All defaults, except the Receive Word</div><div class='add'>+			 * Alignament/Comma Detect Enable....(0xe800)</div><div class='add'>+			 */</div><div class='add'>+			writel(0x0001C500, &amp;xcvr-&gt;afe_xcvr_control0);</div><div class='ctx'> 			udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Power up TX and RX out from power down (PWRDNTX and PWRDNRX)</div><div class='del'>-		 * &amp; increase TX int &amp; ext bias 20%....(0xe85c) */</div><div class='add'>+		/* Power up TX and RX out from power down (PWRDNTX and</div><div class='add'>+		 * PWRDNRX) &amp; increase TX int &amp; ext bias 20%....(0xe85c)</div><div class='add'>+		 */</div><div class='ctx'> 		if (is_a2(pdev))</div><div class='del'>-			writel(0x000003F0, &amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_channel_control);</div><div class='add'>+			writel(0x000003F0, &amp;xcvr-&gt;afe_channel_control);</div><div class='ctx'> 		else if (is_b0(pdev)) {</div><div class='del'>-			 /* Power down TX and RX (PWRDNTX and PWRDNRX) */</div><div class='del'>-			writel(0x000003D7, &amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_channel_control);</div><div class='add'>+			writel(0x000003D7, &amp;xcvr-&gt;afe_channel_control);</div><div class='ctx'> 			udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			 * Power up TX and RX out from power down (PWRDNTX and PWRDNRX)</div><div class='del'>-			 * &amp; increase TX int &amp; ext bias 20%....(0xe85c) */</div><div class='del'>-			writel(0x000003D4, &amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_channel_control);</div><div class='del'>-		} else {</div><div class='del'>-			writel(0x000001E7, &amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_channel_control);</div><div class='add'>+			writel(0x000003D4, &amp;xcvr-&gt;afe_channel_control);</div><div class='add'>+		} else if (is_c0(pdev)) {</div><div class='add'>+			writel(0x000001E7, &amp;xcvr-&gt;afe_channel_control);</div><div class='ctx'> 			udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			 * Power up TX and RX out from power down (PWRDNTX and PWRDNRX)</div><div class='del'>-			 * &amp; increase TX int &amp; ext bias 20%....(0xe85c) */</div><div class='del'>-			writel(0x000001E4, &amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_channel_control);</div><div class='add'>+			writel(0x000001E4, &amp;xcvr-&gt;afe_channel_control);</div><div class='add'>+		} else if (is_c1(pdev)) {</div><div class='add'>+			writel(cable_length_long ? 0x000002F7 : 0x000001F7,</div><div class='add'>+			       &amp;xcvr-&gt;afe_channel_control);</div><div class='add'>+			udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='add'>+</div><div class='add'>+			writel(cable_length_long ? 0x000002F4 : 0x000001F4,</div><div class='add'>+			       &amp;xcvr-&gt;afe_channel_control);</div><div class='ctx'> 		}</div><div class='ctx'> 		udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> </div><div class='ctx'> 		if (is_a2(pdev)) {</div><div class='ctx'> 			/* Enable TX equalization (0xe824) */</div><div class='del'>-			writel(0x00040000, &amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_tx_control);</div><div class='add'>+			writel(0x00040000, &amp;xcvr-&gt;afe_tx_control);</div><div class='ctx'> 			udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * RDPI=0x0(RX Power On), RXOOBDETPDNC=0x0, TPD=0x0(TX Power On),</div><div class='del'>-		 * RDD=0x0(RX Detect Enabled) ....(0xe800) */</div><div class='del'>-		writel(0x00004100, &amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_xcvr_control0);</div><div class='add'>+		if (is_a2(pdev) || is_b0(pdev))</div><div class='add'>+			/* RDPI=0x0(RX Power On), RXOOBDETPDNC=0x0,</div><div class='add'>+			 * TPD=0x0(TX Power On), RDD=0x0(RX Detect</div><div class='add'>+			 * Enabled) ....(0xe800)</div><div class='add'>+			 */</div><div class='add'>+			writel(0x00004100, &amp;xcvr-&gt;afe_xcvr_control0);</div><div class='add'>+		else if (is_c0(pdev))</div><div class='add'>+			writel(0x00014100, &amp;xcvr-&gt;afe_xcvr_control0);</div><div class='add'>+		else if (is_c1(pdev))</div><div class='add'>+			writel(0x0001C100, &amp;xcvr-&gt;afe_xcvr_control0);</div><div class='ctx'> 		udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> </div><div class='ctx'> 		/* Leave DFE/FFE on */</div><div class='ctx'> 		if (is_a2(pdev))</div><div class='del'>-			writel(0x3F11103F, &amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_rx_ssc_control0);</div><div class='add'>+			writel(0x3F11103F, &amp;xcvr-&gt;afe_rx_ssc_control0);</div><div class='ctx'> 		else if (is_b0(pdev)) {</div><div class='del'>-			writel(0x3F11103F, &amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_rx_ssc_control0);</div><div class='add'>+			writel(0x3F11103F, &amp;xcvr-&gt;afe_rx_ssc_control0);</div><div class='ctx'> 			udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> 			/* Enable TX equalization (0xe824) */</div><div class='del'>-			writel(0x00040000, &amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_tx_control);</div><div class='del'>-		} else {</div><div class='del'>-			writel(0x0140DF0F, &amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_rx_ssc_control1);</div><div class='add'>+			writel(0x00040000, &amp;xcvr-&gt;afe_tx_control);</div><div class='add'>+		} else if (is_c0(pdev)) {</div><div class='add'>+			writel(0x01400C0F, &amp;xcvr-&gt;afe_rx_ssc_control1);</div><div class='add'>+			udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='add'>+</div><div class='add'>+			writel(0x3F6F103F, &amp;xcvr-&gt;afe_rx_ssc_control0);</div><div class='add'>+			udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='add'>+</div><div class='add'>+			/* Enable TX equalization (0xe824) */</div><div class='add'>+			writel(0x00040000, &amp;xcvr-&gt;afe_tx_control);</div><div class='add'>+		} else if (is_c1(pdev)) {</div><div class='add'>+			writel(cable_length_long ? 0x01500C0C :</div><div class='add'>+			       cable_length_medium ? 0x01400C0D : 0x02400C0D,</div><div class='add'>+			       &amp;xcvr-&gt;afe_xcvr_control1);</div><div class='add'>+			udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='add'>+</div><div class='add'>+			writel(0x000003E0, &amp;xcvr-&gt;afe_dfx_rx_control1);</div><div class='ctx'> 			udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> </div><div class='del'>-			writel(0x3F6F103F, &amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_rx_ssc_control0);</div><div class='add'>+			writel(cable_length_long ? 0x33091C1F :</div><div class='add'>+			       cable_length_medium ? 0x3315181F : 0x2B17161F,</div><div class='add'>+			       &amp;xcvr-&gt;afe_rx_ssc_control0);</div><div class='ctx'> 			udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> </div><div class='ctx'> 			/* Enable TX equalization (0xe824) */</div><div class='del'>-			writel(0x00040000, &amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_tx_control);</div><div class='add'>+			writel(0x00040000, &amp;xcvr-&gt;afe_tx_control);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> </div><div class='del'>-		writel(oem_phy-&gt;afe_tx_amp_control0,</div><div class='del'>-			&amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_tx_amp_control0);</div><div class='add'>+		writel(oem_phy-&gt;afe_tx_amp_control0, &amp;xcvr-&gt;afe_tx_amp_control0);</div><div class='ctx'> 		udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> </div><div class='del'>-		writel(oem_phy-&gt;afe_tx_amp_control1,</div><div class='del'>-			&amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_tx_amp_control1);</div><div class='add'>+		writel(oem_phy-&gt;afe_tx_amp_control1, &amp;xcvr-&gt;afe_tx_amp_control1);</div><div class='ctx'> 		udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> </div><div class='del'>-		writel(oem_phy-&gt;afe_tx_amp_control2,</div><div class='del'>-			&amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_tx_amp_control2);</div><div class='add'>+		writel(oem_phy-&gt;afe_tx_amp_control2, &amp;xcvr-&gt;afe_tx_amp_control2);</div><div class='ctx'> 		udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> </div><div class='del'>-		writel(oem_phy-&gt;afe_tx_amp_control3,</div><div class='del'>-			&amp;ihost-&gt;scu_registers-&gt;afe.scu_afe_xcvr[phy_id].afe_tx_amp_control3);</div><div class='add'>+		writel(oem_phy-&gt;afe_tx_amp_control3, &amp;xcvr-&gt;afe_tx_amp_control3);</div><div class='ctx'> 		udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Transfer control to the PEs */</div><div class='del'>-	writel(0x00010f00, &amp;ihost-&gt;scu_registers-&gt;afe.afe_dfx_master_control0);</div><div class='add'>+	writel(0x00010f00, &amp;afe-&gt;afe_dfx_master_control0);</div><div class='ctx'> 	udelay(AFE_REGISTER_WRITE_DELAY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h<br/>index 646051afd3cb..5477f0fa8233 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/isci/host.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/host.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/isci/host.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/isci/host.h</a></div><div class='hunk'>@@ -435,11 +435,36 @@ static inline bool is_b0(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> static inline bool is_c0(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='del'>-	if (pdev-&gt;revision &gt;= 5)</div><div class='add'>+	if (pdev-&gt;revision == 5)</div><div class='ctx'> 		return true;</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool is_c1(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	if (pdev-&gt;revision &gt;= 6)</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum cable_selections {</div><div class='add'>+	short_cable     = 0,</div><div class='add'>+	long_cable      = 1,</div><div class='add'>+	medium_cable    = 2,</div><div class='add'>+	undefined_cable = 3</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CABLE_OVERRIDE_DISABLED (0x10000)</div><div class='add'>+</div><div class='add'>+static inline int is_cable_select_overridden(void)</div><div class='add'>+{</div><div class='add'>+	return cable_selection_override &lt; CABLE_OVERRIDE_DISABLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum cable_selections decode_cable_selection(struct isci_host *ihost, int phy);</div><div class='add'>+void validate_cable_selections(struct isci_host *ihost);</div><div class='add'>+char *lookup_cable_names(enum cable_selections);</div><div class='add'>+</div><div class='ctx'> /* set hw control for 'activity', even though active enclosures seem to drive</div><div class='ctx'>  * the activity led on their own.  Skip setting FSENG control on 'status' due</div><div class='ctx'>  * to unexpected operation and 'error' due to not being a supported automatic</div><div class='head'>diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c<br/>index a97edabcb85a..17c4c2c89c2e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/isci/init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/isci/init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/isci/init.c</a></div><div class='hunk'>@@ -65,7 +65,7 @@</div><div class='ctx'> #include "probe_roms.h"</div><div class='ctx'> </div><div class='ctx'> #define MAJ 1</div><div class='del'>-#define MIN 0</div><div class='add'>+#define MIN 1</div><div class='ctx'> #define BUILD 0</div><div class='ctx'> #define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \</div><div class='ctx'> 	__stringify(BUILD)</div><div class='hunk'>@@ -94,7 +94,7 @@ MODULE_DEVICE_TABLE(pci, isci_id_table);</div><div class='ctx'> </div><div class='ctx'> /* linux isci specific settings */</div><div class='ctx'> </div><div class='del'>-unsigned char no_outbound_task_to = 20;</div><div class='add'>+unsigned char no_outbound_task_to = 2;</div><div class='ctx'> module_param(no_outbound_task_to, byte, 0);</div><div class='ctx'> MODULE_PARM_DESC(no_outbound_task_to, "No Outbound Task Timeout (1us incr)");</div><div class='ctx'> </div><div class='hunk'>@@ -114,7 +114,7 @@ u16 stp_inactive_to = 5;</div><div class='ctx'> module_param(stp_inactive_to, ushort, 0);</div><div class='ctx'> MODULE_PARM_DESC(stp_inactive_to, "STP inactivity timeout (100us incr)");</div><div class='ctx'> </div><div class='del'>-unsigned char phy_gen = 3;</div><div class='add'>+unsigned char phy_gen = SCIC_SDS_PARM_GEN2_SPEED;</div><div class='ctx'> module_param(phy_gen, byte, 0);</div><div class='ctx'> MODULE_PARM_DESC(phy_gen, "PHY generation (1: 1.5Gbps 2: 3.0Gbps 3: 6.0Gbps)");</div><div class='ctx'> </div><div class='hunk'>@@ -122,6 +122,14 @@ unsigned char max_concurr_spinup;</div><div class='ctx'> module_param(max_concurr_spinup, byte, 0);</div><div class='ctx'> MODULE_PARM_DESC(max_concurr_spinup, "Max concurrent device spinup");</div><div class='ctx'> </div><div class='add'>+uint cable_selection_override = CABLE_OVERRIDE_DISABLED;</div><div class='add'>+module_param(cable_selection_override, uint, 0);</div><div class='add'>+</div><div class='add'>+MODULE_PARM_DESC(cable_selection_override,</div><div class='add'>+		 "This field indicates length of the SAS/SATA cable between "</div><div class='add'>+		 "host and device. If any bits &gt; 15 are set (default) "</div><div class='add'>+		 "indicates \"use platform defaults\"");</div><div class='add'>+</div><div class='ctx'> static ssize_t isci_show_id(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct Scsi_Host *shost = container_of(dev, typeof(*shost), shost_dev);</div><div class='hunk'>@@ -412,6 +420,14 @@ static struct isci_host *isci_host_alloc(struct pci_dev *pdev, int id)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	isci_host-&gt;shost = shost;</div><div class='ctx'> </div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "%sSCU controller %d: phy 3-0 cables: "</div><div class='add'>+		 "{%s, %s, %s, %s}\n",</div><div class='add'>+		 (is_cable_select_overridden() ? "* " : ""), isci_host-&gt;id,</div><div class='add'>+		 lookup_cable_names(decode_cable_selection(isci_host, 3)),</div><div class='add'>+		 lookup_cable_names(decode_cable_selection(isci_host, 2)),</div><div class='add'>+		 lookup_cable_names(decode_cable_selection(isci_host, 1)),</div><div class='add'>+		 lookup_cable_names(decode_cable_selection(isci_host, 0)));</div><div class='add'>+</div><div class='ctx'> 	err = isci_host_init(isci_host);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_shost;</div><div class='hunk'>@@ -466,7 +482,8 @@ static int __devinit isci_pci_probe(struct pci_dev *pdev, const struct pci_devic</div><div class='ctx'> 		orom = isci_request_oprom(pdev);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; orom &amp;&amp; i &lt; ARRAY_SIZE(orom-&gt;ctrl); i++) {</div><div class='del'>-		if (sci_oem_parameters_validate(&amp;orom-&gt;ctrl[i])) {</div><div class='add'>+		if (sci_oem_parameters_validate(&amp;orom-&gt;ctrl[i],</div><div class='add'>+						orom-&gt;hdr.version)) {</div><div class='ctx'> 			dev_warn(&amp;pdev-&gt;dev,</div><div class='ctx'> 				 "[%d]: invalid oem parameters detected, falling back to firmware\n", i);</div><div class='ctx'> 			devm_kfree(&amp;pdev-&gt;dev, orom);</div><div class='head'>diff --git a/drivers/scsi/isci/isci.h b/drivers/scsi/isci/isci.h<br/>index 8efeb6b08321..234ab46fce33 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/isci/isci.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/isci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/isci/isci.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/isci/isci.h</a></div><div class='hunk'>@@ -480,6 +480,7 @@ extern u16 ssp_inactive_to;</div><div class='ctx'> extern u16 stp_inactive_to;</div><div class='ctx'> extern unsigned char phy_gen;</div><div class='ctx'> extern unsigned char max_concurr_spinup;</div><div class='add'>+extern uint cable_selection_override;</div><div class='ctx'> </div><div class='ctx'> irqreturn_t isci_msix_isr(int vec, void *data);</div><div class='ctx'> irqreturn_t isci_intx_isr(int vec, void *data);</div><div class='head'>diff --git a/drivers/scsi/isci/phy.c b/drivers/scsi/isci/phy.c<br/>index 35f50c2183e1..fe18acfd6eb3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/isci/phy.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/phy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/isci/phy.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/isci/phy.c</a></div><div class='hunk'>@@ -91,22 +91,23 @@ sci_phy_transport_layer_initialization(struct isci_phy *iphy,</div><div class='ctx'> </div><div class='ctx'> static enum sci_status</div><div class='ctx'> sci_phy_link_layer_initialization(struct isci_phy *iphy,</div><div class='del'>-				  struct scu_link_layer_registers __iomem *reg)</div><div class='add'>+				  struct scu_link_layer_registers __iomem *llr)</div><div class='ctx'> {</div><div class='ctx'> 	struct isci_host *ihost = iphy-&gt;owning_port-&gt;owning_controller;</div><div class='add'>+	struct sci_phy_user_params *phy_user;</div><div class='add'>+	struct sci_phy_oem_params *phy_oem;</div><div class='ctx'> 	int phy_idx = iphy-&gt;phy_index;</div><div class='del'>-	struct sci_phy_user_params *phy_user = &amp;ihost-&gt;user_parameters.phys[phy_idx];</div><div class='del'>-	struct sci_phy_oem_params *phy_oem =</div><div class='del'>-		&amp;ihost-&gt;oem_parameters.phys[phy_idx];</div><div class='del'>-	u32 phy_configuration;</div><div class='ctx'> 	struct sci_phy_cap phy_cap;</div><div class='add'>+	u32 phy_configuration;</div><div class='ctx'> 	u32 parity_check = 0;</div><div class='ctx'> 	u32 parity_count = 0;</div><div class='ctx'> 	u32 llctl, link_rate;</div><div class='ctx'> 	u32 clksm_value = 0;</div><div class='ctx'> 	u32 sp_timeouts = 0;</div><div class='ctx'> </div><div class='del'>-	iphy-&gt;link_layer_registers = reg;</div><div class='add'>+	phy_user = &amp;ihost-&gt;user_parameters.phys[phy_idx];</div><div class='add'>+	phy_oem = &amp;ihost-&gt;oem_parameters.phys[phy_idx];</div><div class='add'>+	iphy-&gt;link_layer_registers = llr;</div><div class='ctx'> </div><div class='ctx'> 	/* Set our IDENTIFY frame data */</div><div class='ctx'> 	#define SCI_END_DEVICE 0x01</div><div class='hunk'>@@ -116,32 +117,26 @@ sci_phy_link_layer_initialization(struct isci_phy *iphy,</div><div class='ctx'> 	       SCU_SAS_TIID_GEN_BIT(STP_INITIATOR) |</div><div class='ctx'> 	       SCU_SAS_TIID_GEN_BIT(DA_SATA_HOST) |</div><div class='ctx'> 	       SCU_SAS_TIID_GEN_VAL(DEVICE_TYPE, SCI_END_DEVICE),</div><div class='del'>-	       &amp;iphy-&gt;link_layer_registers-&gt;transmit_identification);</div><div class='add'>+	       &amp;llr-&gt;transmit_identification);</div><div class='ctx'> </div><div class='ctx'> 	/* Write the device SAS Address */</div><div class='del'>-	writel(0xFEDCBA98,</div><div class='del'>-	       &amp;iphy-&gt;link_layer_registers-&gt;sas_device_name_high);</div><div class='del'>-	writel(phy_idx, &amp;iphy-&gt;link_layer_registers-&gt;sas_device_name_low);</div><div class='add'>+	writel(0xFEDCBA98, &amp;llr-&gt;sas_device_name_high);</div><div class='add'>+	writel(phy_idx, &amp;llr-&gt;sas_device_name_low);</div><div class='ctx'> </div><div class='ctx'> 	/* Write the source SAS Address */</div><div class='del'>-	writel(phy_oem-&gt;sas_address.high,</div><div class='del'>-		&amp;iphy-&gt;link_layer_registers-&gt;source_sas_address_high);</div><div class='del'>-	writel(phy_oem-&gt;sas_address.low,</div><div class='del'>-		&amp;iphy-&gt;link_layer_registers-&gt;source_sas_address_low);</div><div class='add'>+	writel(phy_oem-&gt;sas_address.high, &amp;llr-&gt;source_sas_address_high);</div><div class='add'>+	writel(phy_oem-&gt;sas_address.low, &amp;llr-&gt;source_sas_address_low);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear and Set the PHY Identifier */</div><div class='del'>-	writel(0, &amp;iphy-&gt;link_layer_registers-&gt;identify_frame_phy_id);</div><div class='del'>-	writel(SCU_SAS_TIPID_GEN_VALUE(ID, phy_idx),</div><div class='del'>-		&amp;iphy-&gt;link_layer_registers-&gt;identify_frame_phy_id);</div><div class='add'>+	writel(0, &amp;llr-&gt;identify_frame_phy_id);</div><div class='add'>+	writel(SCU_SAS_TIPID_GEN_VALUE(ID, phy_idx), &amp;llr-&gt;identify_frame_phy_id);</div><div class='ctx'> </div><div class='ctx'> 	/* Change the initial state of the phy configuration register */</div><div class='del'>-	phy_configuration =</div><div class='del'>-		readl(&amp;iphy-&gt;link_layer_registers-&gt;phy_configuration);</div><div class='add'>+	phy_configuration = readl(&amp;llr-&gt;phy_configuration);</div><div class='ctx'> </div><div class='ctx'> 	/* Hold OOB state machine in reset */</div><div class='ctx'> 	phy_configuration |=  SCU_SAS_PCFG_GEN_BIT(OOB_RESET);</div><div class='del'>-	writel(phy_configuration,</div><div class='del'>-		&amp;iphy-&gt;link_layer_registers-&gt;phy_configuration);</div><div class='add'>+	writel(phy_configuration, &amp;llr-&gt;phy_configuration);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure the SNW capabilities */</div><div class='ctx'> 	phy_cap.all = 0;</div><div class='hunk'>@@ -149,15 +144,64 @@ sci_phy_link_layer_initialization(struct isci_phy *iphy,</div><div class='ctx'> 	phy_cap.gen3_no_ssc = 1;</div><div class='ctx'> 	phy_cap.gen2_no_ssc = 1;</div><div class='ctx'> 	phy_cap.gen1_no_ssc = 1;</div><div class='del'>-	if (ihost-&gt;oem_parameters.controller.do_enable_ssc == true) {</div><div class='add'>+	if (ihost-&gt;oem_parameters.controller.do_enable_ssc) {</div><div class='add'>+		struct scu_afe_registers __iomem *afe = &amp;ihost-&gt;scu_registers-&gt;afe;</div><div class='add'>+		struct scu_afe_transceiver *xcvr = &amp;afe-&gt;scu_afe_xcvr[phy_idx];</div><div class='add'>+		struct isci_pci_info *pci_info = to_pci_info(ihost-&gt;pdev);</div><div class='add'>+		bool en_sas = false;</div><div class='add'>+		bool en_sata = false;</div><div class='add'>+		u32 sas_type = 0;</div><div class='add'>+		u32 sata_spread = 0x2;</div><div class='add'>+		u32 sas_spread = 0x2;</div><div class='add'>+</div><div class='ctx'> 		phy_cap.gen3_ssc = 1;</div><div class='ctx'> 		phy_cap.gen2_ssc = 1;</div><div class='ctx'> 		phy_cap.gen1_ssc = 1;</div><div class='add'>+</div><div class='add'>+		if (pci_info-&gt;orom-&gt;hdr.version &lt; ISCI_ROM_VER_1_1)</div><div class='add'>+			en_sas = en_sata = true;</div><div class='add'>+		else {</div><div class='add'>+			sata_spread = ihost-&gt;oem_parameters.controller.ssc_sata_tx_spread_level;</div><div class='add'>+			sas_spread = ihost-&gt;oem_parameters.controller.ssc_sas_tx_spread_level;</div><div class='add'>+</div><div class='add'>+			if (sata_spread)</div><div class='add'>+				en_sata = true;</div><div class='add'>+</div><div class='add'>+			if (sas_spread) {</div><div class='add'>+				en_sas = true;</div><div class='add'>+				sas_type = ihost-&gt;oem_parameters.controller.ssc_sas_tx_type;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (en_sas) {</div><div class='add'>+			u32 reg;</div><div class='add'>+</div><div class='add'>+			reg = readl(&amp;xcvr-&gt;afe_xcvr_control0);</div><div class='add'>+			reg |= (0x00100000 | (sas_type &lt;&lt; 19));</div><div class='add'>+			writel(reg, &amp;xcvr-&gt;afe_xcvr_control0);</div><div class='add'>+</div><div class='add'>+			reg = readl(&amp;xcvr-&gt;afe_tx_ssc_control);</div><div class='add'>+			reg |= sas_spread &lt;&lt; 8;</div><div class='add'>+			writel(reg, &amp;xcvr-&gt;afe_tx_ssc_control);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (en_sata) {</div><div class='add'>+			u32 reg;</div><div class='add'>+</div><div class='add'>+			reg = readl(&amp;xcvr-&gt;afe_tx_ssc_control);</div><div class='add'>+			reg |= sata_spread;</div><div class='add'>+			writel(reg, &amp;xcvr-&gt;afe_tx_ssc_control);</div><div class='add'>+</div><div class='add'>+			reg = readl(&amp;llr-&gt;stp_control);</div><div class='add'>+			reg |= 1 &lt;&lt; 12;</div><div class='add'>+			writel(reg, &amp;llr-&gt;stp_control);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * The SAS specification indicates that the phy_capabilities that</div><div class='del'>-	 * are transmitted shall have an even parity.  Calculate the parity. */</div><div class='add'>+	/* The SAS specification indicates that the phy_capabilities that</div><div class='add'>+	 * are transmitted shall have an even parity.  Calculate the parity.</div><div class='add'>+	 */</div><div class='ctx'> 	parity_check = phy_cap.all;</div><div class='ctx'> 	while (parity_check != 0) {</div><div class='ctx'> 		if (parity_check &amp; 0x1)</div><div class='hunk'>@@ -165,20 +209,20 @@ sci_phy_link_layer_initialization(struct isci_phy *iphy,</div><div class='ctx'> 		parity_check &gt;&gt;= 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If parity indicates there are an odd number of bits set, then</div><div class='del'>-	 * set the parity bit to 1 in the phy capabilities. */</div><div class='add'>+	/* If parity indicates there are an odd number of bits set, then</div><div class='add'>+	 * set the parity bit to 1 in the phy capabilities.</div><div class='add'>+	 */</div><div class='ctx'> 	if ((parity_count % 2) != 0)</div><div class='ctx'> 		phy_cap.parity = 1;</div><div class='ctx'> </div><div class='del'>-	writel(phy_cap.all, &amp;iphy-&gt;link_layer_registers-&gt;phy_capabilities);</div><div class='add'>+	writel(phy_cap.all, &amp;llr-&gt;phy_capabilities);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the enable spinup period but disable the ability to send</div><div class='ctx'> 	 * notify enable spinup</div><div class='ctx'> 	 */</div><div class='ctx'> 	writel(SCU_ENSPINUP_GEN_VAL(COUNT,</div><div class='ctx'> 			phy_user-&gt;notify_enable_spin_up_insertion_frequency),</div><div class='del'>-		&amp;iphy-&gt;link_layer_registers-&gt;notify_enable_spinup_control);</div><div class='add'>+		&amp;llr-&gt;notify_enable_spinup_control);</div><div class='ctx'> </div><div class='ctx'> 	/* Write the ALIGN Insertion Ferequency for connected phy and</div><div class='ctx'> 	 * inpendent of connected state</div><div class='hunk'>@@ -189,11 +233,13 @@ sci_phy_link_layer_initialization(struct isci_phy *iphy,</div><div class='ctx'> 	clksm_value |= SCU_ALIGN_INSERTION_FREQUENCY_GEN_VAL(GENERAL,</div><div class='ctx'> 			phy_user-&gt;align_insertion_frequency);</div><div class='ctx'> </div><div class='del'>-	writel(clksm_value, &amp;iphy-&gt;link_layer_registers-&gt;clock_skew_management);</div><div class='add'>+	writel(clksm_value, &amp;llr-&gt;clock_skew_management);</div><div class='ctx'> </div><div class='del'>-	/* @todo Provide a way to write this register correctly */</div><div class='del'>-	writel(0x02108421,</div><div class='del'>-		&amp;iphy-&gt;link_layer_registers-&gt;afe_lookup_table_control);</div><div class='add'>+	if (is_c0(ihost-&gt;pdev) || is_c1(ihost-&gt;pdev)) {</div><div class='add'>+		writel(0x04210400, &amp;llr-&gt;afe_lookup_table_control);</div><div class='add'>+		writel(0x020A7C05, &amp;llr-&gt;sas_primitive_timeout);</div><div class='add'>+	} else</div><div class='add'>+		writel(0x02108421, &amp;llr-&gt;afe_lookup_table_control);</div><div class='ctx'> </div><div class='ctx'> 	llctl = SCU_SAS_LLCTL_GEN_VAL(NO_OUTBOUND_TASK_TIMEOUT,</div><div class='ctx'> 		(u8)ihost-&gt;user_parameters.no_outbound_task_timeout);</div><div class='hunk'>@@ -210,9 +256,9 @@ sci_phy_link_layer_initialization(struct isci_phy *iphy,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	llctl |= SCU_SAS_LLCTL_GEN_VAL(MAX_LINK_RATE, link_rate);</div><div class='del'>-	writel(llctl, &amp;iphy-&gt;link_layer_registers-&gt;link_layer_control);</div><div class='add'>+	writel(llctl, &amp;llr-&gt;link_layer_control);</div><div class='ctx'> </div><div class='del'>-	sp_timeouts = readl(&amp;iphy-&gt;link_layer_registers-&gt;sas_phy_timeouts);</div><div class='add'>+	sp_timeouts = readl(&amp;llr-&gt;sas_phy_timeouts);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear the default 0x36 (54us) RATE_CHANGE timeout value. */</div><div class='ctx'> 	sp_timeouts &amp;= ~SCU_SAS_PHYTOV_GEN_VAL(RATE_CHANGE, 0xFF);</div><div class='hunk'>@@ -222,20 +268,23 @@ sci_phy_link_layer_initialization(struct isci_phy *iphy,</div><div class='ctx'> 	 */</div><div class='ctx'> 	sp_timeouts |= SCU_SAS_PHYTOV_GEN_VAL(RATE_CHANGE, 0x3B);</div><div class='ctx'> </div><div class='del'>-	writel(sp_timeouts, &amp;iphy-&gt;link_layer_registers-&gt;sas_phy_timeouts);</div><div class='add'>+	writel(sp_timeouts, &amp;llr-&gt;sas_phy_timeouts);</div><div class='ctx'> </div><div class='ctx'> 	if (is_a2(ihost-&gt;pdev)) {</div><div class='del'>-		/* Program the max ARB time for the PHY to 700us so we inter-operate with</div><div class='del'>-		 * the PMC expander which shuts down PHYs if the expander PHY generates too</div><div class='del'>-		 * many breaks.  This time value will guarantee that the initiator PHY will</div><div class='del'>-		 * generate the break.</div><div class='add'>+		/* Program the max ARB time for the PHY to 700us so we</div><div class='add'>+		 * inter-operate with the PMC expander which shuts down</div><div class='add'>+		 * PHYs if the expander PHY generates too many breaks.</div><div class='add'>+		 * This time value will guarantee that the initiator PHY</div><div class='add'>+		 * will generate the break.</div><div class='ctx'> 		 */</div><div class='ctx'> 		writel(SCIC_SDS_PHY_MAX_ARBITRATION_WAIT_TIME,</div><div class='del'>-			&amp;iphy-&gt;link_layer_registers-&gt;maximum_arbitration_wait_timer_timeout);</div><div class='add'>+		       &amp;llr-&gt;maximum_arbitration_wait_timer_timeout);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Disable link layer hang detection, rely on the OS timeout for I/O timeouts. */</div><div class='del'>-	writel(0, &amp;iphy-&gt;link_layer_registers-&gt;link_layer_hang_detection_timeout);</div><div class='add'>+	/* Disable link layer hang detection, rely on the OS timeout for</div><div class='add'>+	 * I/O timeouts.</div><div class='add'>+	 */</div><div class='add'>+	writel(0, &amp;llr-&gt;link_layer_hang_detection_timeout);</div><div class='ctx'> </div><div class='ctx'> 	/* We can exit the initial state to the stopped state */</div><div class='ctx'> 	sci_change_state(&amp;iphy-&gt;sm, SCI_PHY_STOPPED);</div><div class='hunk'>@@ -1049,24 +1098,25 @@ static void scu_link_layer_stop_protocol_engine(</div><div class='ctx'> 	writel(enable_spinup_value, &amp;iphy-&gt;link_layer_registers-&gt;notify_enable_spinup_control);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * This method will start the OOB/SN state machine for this struct isci_phy object.</div><div class='del'>- */</div><div class='del'>-static void scu_link_layer_start_oob(</div><div class='del'>-	struct isci_phy *iphy)</div><div class='add'>+static void scu_link_layer_start_oob(struct isci_phy *iphy)</div><div class='ctx'> {</div><div class='del'>-	u32 scu_sas_pcfg_value;</div><div class='del'>-</div><div class='del'>-	scu_sas_pcfg_value =</div><div class='del'>-		readl(&amp;iphy-&gt;link_layer_registers-&gt;phy_configuration);</div><div class='del'>-	scu_sas_pcfg_value |= SCU_SAS_PCFG_GEN_BIT(OOB_ENABLE);</div><div class='del'>-	scu_sas_pcfg_value &amp;=</div><div class='del'>-		~(SCU_SAS_PCFG_GEN_BIT(OOB_RESET) |</div><div class='del'>-		SCU_SAS_PCFG_GEN_BIT(HARD_RESET));</div><div class='del'>-	writel(scu_sas_pcfg_value,</div><div class='del'>-	       &amp;iphy-&gt;link_layer_registers-&gt;phy_configuration);</div><div class='add'>+	struct scu_link_layer_registers __iomem *ll = iphy-&gt;link_layer_registers;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/** Reset OOB sequence - start */</div><div class='add'>+	val = readl(&amp;ll-&gt;phy_configuration);</div><div class='add'>+	val &amp;= ~(SCU_SAS_PCFG_GEN_BIT(OOB_RESET) |</div><div class='add'>+		 SCU_SAS_PCFG_GEN_BIT(HARD_RESET));</div><div class='add'>+	writel(val, &amp;ll-&gt;phy_configuration);</div><div class='add'>+	readl(&amp;ll-&gt;phy_configuration); /* flush */</div><div class='add'>+	/** Reset OOB sequence - end */</div><div class='add'>+</div><div class='add'>+	/** Start OOB sequence - start */</div><div class='add'>+	val = readl(&amp;ll-&gt;phy_configuration);</div><div class='add'>+	val |= SCU_SAS_PCFG_GEN_BIT(OOB_ENABLE);</div><div class='add'>+	writel(val, &amp;ll-&gt;phy_configuration);</div><div class='add'>+	readl(&amp;ll-&gt;phy_configuration); /* flush */</div><div class='add'>+	/** Start OOB sequence - end */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/scsi/isci/port.c b/drivers/scsi/isci/port.c<br/>index ac7f27749f97..7c6ac58a5c4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/isci/port.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/port.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/isci/port.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/isci/port.c</a></div><div class='hunk'>@@ -114,7 +114,7 @@ static u32 sci_port_get_phys(struct isci_port *iport)</div><div class='ctx'>  * value is returned if the specified port is not valid.  When this value is</div><div class='ctx'>  * returned, no data is copied to the properties output parameter.</div><div class='ctx'>  */</div><div class='del'>-static enum sci_status sci_port_get_properties(struct isci_port *iport,</div><div class='add'>+enum sci_status sci_port_get_properties(struct isci_port *iport,</div><div class='ctx'> 						struct sci_port_properties *prop)</div><div class='ctx'> {</div><div class='ctx'> 	if (!iport || iport-&gt;logical_port_index == SCIC_SDS_DUMMY_PORT)</div><div class='hunk'>@@ -647,19 +647,26 @@ void sci_port_setup_transports(struct isci_port *iport, u32 device_id)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sci_port_activate_phy(struct isci_port *iport, struct isci_phy *iphy,</div><div class='del'>-				  bool do_notify_user)</div><div class='add'>+static void sci_port_resume_phy(struct isci_port *iport, struct isci_phy *iphy)</div><div class='add'>+{</div><div class='add'>+	sci_phy_resume(iphy);</div><div class='add'>+	iport-&gt;enabled_phy_mask |= 1 &lt;&lt; iphy-&gt;phy_index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sci_port_activate_phy(struct isci_port *iport,</div><div class='add'>+				  struct isci_phy *iphy,</div><div class='add'>+				  u8 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct isci_host *ihost = iport-&gt;owning_controller;</div><div class='ctx'> </div><div class='del'>-	if (iphy-&gt;protocol != SCIC_SDS_PHY_PROTOCOL_SATA)</div><div class='add'>+	if (iphy-&gt;protocol != SCIC_SDS_PHY_PROTOCOL_SATA &amp;&amp; (flags &amp; PF_RESUME))</div><div class='ctx'> 		sci_phy_resume(iphy);</div><div class='ctx'> </div><div class='ctx'> 	iport-&gt;active_phy_mask |= 1 &lt;&lt; iphy-&gt;phy_index;</div><div class='ctx'> </div><div class='ctx'> 	sci_controller_clear_invalid_phy(ihost, iphy);</div><div class='ctx'> </div><div class='del'>-	if (do_notify_user == true)</div><div class='add'>+	if (flags &amp; PF_NOTIFY)</div><div class='ctx'> 		isci_port_link_up(ihost, iport, iphy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -669,14 +676,19 @@ void sci_port_deactivate_phy(struct isci_port *iport, struct isci_phy *iphy,</div><div class='ctx'> 	struct isci_host *ihost = iport-&gt;owning_controller;</div><div class='ctx'> </div><div class='ctx'> 	iport-&gt;active_phy_mask &amp;= ~(1 &lt;&lt; iphy-&gt;phy_index);</div><div class='add'>+	iport-&gt;enabled_phy_mask &amp;= ~(1 &lt;&lt; iphy-&gt;phy_index);</div><div class='ctx'> 	if (!iport-&gt;active_phy_mask)</div><div class='ctx'> 		iport-&gt;last_active_phy = iphy-&gt;phy_index;</div><div class='ctx'> </div><div class='ctx'> 	iphy-&gt;max_negotiated_speed = SAS_LINK_RATE_UNKNOWN;</div><div class='ctx'> </div><div class='del'>-	/* Re-assign the phy back to the LP as if it were a narrow port */</div><div class='del'>-	writel(iphy-&gt;phy_index,</div><div class='del'>-		&amp;iport-&gt;port_pe_configuration_register[iphy-&gt;phy_index]);</div><div class='add'>+	/* Re-assign the phy back to the LP as if it were a narrow port for APC</div><div class='add'>+	 * mode. For MPC mode, the phy will remain in the port.</div><div class='add'>+	 */</div><div class='add'>+	if (iport-&gt;owning_controller-&gt;oem_parameters.controller.mode_type ==</div><div class='add'>+		SCIC_PORT_AUTOMATIC_CONFIGURATION_MODE)</div><div class='add'>+		writel(iphy-&gt;phy_index,</div><div class='add'>+			&amp;iport-&gt;port_pe_configuration_register[iphy-&gt;phy_index]);</div><div class='ctx'> </div><div class='ctx'> 	if (do_notify_user == true)</div><div class='ctx'> 		isci_port_link_down(ihost, iphy, iport);</div><div class='hunk'>@@ -701,18 +713,16 @@ static void sci_port_invalid_link_up(struct isci_port *iport, struct isci_phy *i</div><div class='ctx'>  * sci_port_general_link_up_handler - phy can be assigned to port?</div><div class='ctx'>  * @sci_port: sci_port object for which has a phy that has gone link up.</div><div class='ctx'>  * @sci_phy: This is the struct isci_phy object that has gone link up.</div><div class='del'>- * @do_notify_user: This parameter specifies whether to inform the user (via</div><div class='del'>- *    sci_port_link_up()) as to the fact that a new phy as become ready.</div><div class='add'>+ * @flags: PF_RESUME, PF_NOTIFY to sci_port_activate_phy</div><div class='ctx'>  *</div><div class='del'>- * Determine if this phy can be assigned to this</div><div class='del'>- * port . If the phy is not a valid PHY for</div><div class='del'>- * this port then the function will notify the user. A PHY can only be</div><div class='del'>- * part of a port if it's attached SAS ADDRESS is the same as all other PHYs in</div><div class='del'>- * the same port. none</div><div class='add'>+ * Determine if this phy can be assigned to this port . If the phy is</div><div class='add'>+ * not a valid PHY for this port then the function will notify the user.</div><div class='add'>+ * A PHY can only be part of a port if it's attached SAS ADDRESS is the</div><div class='add'>+ * same as all other PHYs in the same port.</div><div class='ctx'>  */</div><div class='ctx'> static void sci_port_general_link_up_handler(struct isci_port *iport,</div><div class='del'>-						  struct isci_phy *iphy,</div><div class='del'>-						  bool do_notify_user)</div><div class='add'>+					     struct isci_phy *iphy,</div><div class='add'>+					     u8 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sci_sas_address port_sas_address;</div><div class='ctx'> 	struct sci_sas_address phy_sas_address;</div><div class='hunk'>@@ -730,7 +740,7 @@ static void sci_port_general_link_up_handler(struct isci_port *iport,</div><div class='ctx'> 	    iport-&gt;active_phy_mask == 0) {</div><div class='ctx'> 		struct sci_base_state_machine *sm = &amp;iport-&gt;sm;</div><div class='ctx'> </div><div class='del'>-		sci_port_activate_phy(iport, iphy, do_notify_user);</div><div class='add'>+		sci_port_activate_phy(iport, iphy, flags);</div><div class='ctx'> 		if (sm-&gt;current_state_id == SCI_PORT_RESETTING)</div><div class='ctx'> 			port_state_machine_change(iport, SCI_PORT_READY);</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -781,11 +791,16 @@ bool sci_port_link_detected(</div><div class='ctx'> 	struct isci_phy *iphy)</div><div class='ctx'> {</div><div class='ctx'> 	if ((iport-&gt;logical_port_index != SCIC_SDS_DUMMY_PORT) &amp;&amp;</div><div class='del'>-	    (iphy-&gt;protocol == SCIC_SDS_PHY_PROTOCOL_SATA) &amp;&amp;</div><div class='del'>-	    sci_port_is_wide(iport)) {</div><div class='del'>-		sci_port_invalid_link_up(iport, iphy);</div><div class='del'>-</div><div class='del'>-		return false;</div><div class='add'>+	    (iphy-&gt;protocol == SCIC_SDS_PHY_PROTOCOL_SATA)) {</div><div class='add'>+		if (sci_port_is_wide(iport)) {</div><div class='add'>+			sci_port_invalid_link_up(iport, iphy);</div><div class='add'>+			return false;</div><div class='add'>+		} else {</div><div class='add'>+			struct isci_host *ihost = iport-&gt;owning_controller;</div><div class='add'>+			struct isci_port *dst_port = &amp;(ihost-&gt;ports[iphy-&gt;phy_index]);</div><div class='add'>+			writel(iphy-&gt;phy_index,</div><div class='add'>+			       &amp;dst_port-&gt;port_pe_configuration_register[iphy-&gt;phy_index]);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -975,6 +990,13 @@ static void sci_port_ready_substate_waiting_enter(struct sci_base_state_machine</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void scic_sds_port_ready_substate_waiting_exit(</div><div class='add'>+					struct sci_base_state_machine *sm)</div><div class='add'>+{</div><div class='add'>+	struct isci_port *iport = container_of(sm, typeof(*iport), sm);</div><div class='add'>+	sci_port_resume_port_task_scheduler(iport);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void sci_port_ready_substate_operational_enter(struct sci_base_state_machine *sm)</div><div class='ctx'> {</div><div class='ctx'> 	u32 index;</div><div class='hunk'>@@ -988,13 +1010,13 @@ static void sci_port_ready_substate_operational_enter(struct sci_base_state_mach</div><div class='ctx'> 			writel(iport-&gt;physical_port_index,</div><div class='ctx'> 				&amp;iport-&gt;port_pe_configuration_register[</div><div class='ctx'> 					iport-&gt;phy_table[index]-&gt;phy_index]);</div><div class='add'>+			if (((iport-&gt;active_phy_mask^iport-&gt;enabled_phy_mask) &amp; (1 &lt;&lt; index)) != 0)</div><div class='add'>+				sci_port_resume_phy(iport, iport-&gt;phy_table[index]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sci_port_update_viit_entry(iport);</div><div class='ctx'> </div><div class='del'>-	sci_port_resume_port_task_scheduler(iport);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Post the dummy task for the port so the hardware can schedule</div><div class='ctx'> 	 * io correctly</div><div class='hunk'>@@ -1061,20 +1083,9 @@ static void sci_port_ready_substate_configuring_enter(struct sci_base_state_mach</div><div class='ctx'> 	if (iport-&gt;active_phy_mask == 0) {</div><div class='ctx'> 		isci_port_not_ready(ihost, iport);</div><div class='ctx'> </div><div class='del'>-		port_state_machine_change(iport,</div><div class='del'>-					  SCI_PORT_SUB_WAITING);</div><div class='del'>-	} else if (iport-&gt;started_request_count == 0)</div><div class='del'>-		port_state_machine_change(iport,</div><div class='del'>-					  SCI_PORT_SUB_OPERATIONAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sci_port_ready_substate_configuring_exit(struct sci_base_state_machine *sm)</div><div class='del'>-{</div><div class='del'>-	struct isci_port *iport = container_of(sm, typeof(*iport), sm);</div><div class='del'>-</div><div class='del'>-	sci_port_suspend_port_task_scheduler(iport);</div><div class='del'>-	if (iport-&gt;ready_exit)</div><div class='del'>-		sci_port_invalidate_dummy_remote_node(iport);</div><div class='add'>+		port_state_machine_change(iport, SCI_PORT_SUB_WAITING);</div><div class='add'>+	} else</div><div class='add'>+		port_state_machine_change(iport, SCI_PORT_SUB_OPERATIONAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum sci_status sci_port_start(struct isci_port *iport)</div><div class='hunk'>@@ -1252,7 +1263,7 @@ enum sci_status sci_port_add_phy(struct isci_port *iport,</div><div class='ctx'> 		if (status != SCI_SUCCESS)</div><div class='ctx'> 			return status;</div><div class='ctx'> </div><div class='del'>-		sci_port_general_link_up_handler(iport, iphy, true);</div><div class='add'>+		sci_port_general_link_up_handler(iport, iphy, PF_NOTIFY|PF_RESUME);</div><div class='ctx'> 		iport-&gt;not_ready_reason = SCIC_PORT_NOT_READY_RECONFIGURING;</div><div class='ctx'> 		port_state_machine_change(iport, SCI_PORT_SUB_CONFIGURING);</div><div class='ctx'> </div><div class='hunk'>@@ -1262,7 +1273,7 @@ enum sci_status sci_port_add_phy(struct isci_port *iport,</div><div class='ctx'> </div><div class='ctx'> 		if (status != SCI_SUCCESS)</div><div class='ctx'> 			return status;</div><div class='del'>-		sci_port_general_link_up_handler(iport, iphy, true);</div><div class='add'>+		sci_port_general_link_up_handler(iport, iphy, PF_NOTIFY);</div><div class='ctx'> </div><div class='ctx'> 		/* Re-enter the configuring state since this may be the last phy in</div><div class='ctx'> 		 * the port.</div><div class='hunk'>@@ -1338,13 +1349,13 @@ enum sci_status sci_port_link_up(struct isci_port *iport,</div><div class='ctx'> 		/* Since this is the first phy going link up for the port we</div><div class='ctx'> 		 * can just enable it and continue</div><div class='ctx'> 		 */</div><div class='del'>-		sci_port_activate_phy(iport, iphy, true);</div><div class='add'>+		sci_port_activate_phy(iport, iphy, PF_NOTIFY|PF_RESUME);</div><div class='ctx'> </div><div class='ctx'> 		port_state_machine_change(iport,</div><div class='ctx'> 					  SCI_PORT_SUB_OPERATIONAL);</div><div class='ctx'> 		return SCI_SUCCESS;</div><div class='ctx'> 	case SCI_PORT_SUB_OPERATIONAL:</div><div class='del'>-		sci_port_general_link_up_handler(iport, iphy, true);</div><div class='add'>+		sci_port_general_link_up_handler(iport, iphy, PF_NOTIFY|PF_RESUME);</div><div class='ctx'> 		return SCI_SUCCESS;</div><div class='ctx'> 	case SCI_PORT_RESETTING:</div><div class='ctx'> 		/* TODO We should  make  sure  that  the phy  that  has gone</div><div class='hunk'>@@ -1361,7 +1372,7 @@ enum sci_status sci_port_link_up(struct isci_port *iport,</div><div class='ctx'> 		/* In the resetting state we don't notify the user regarding</div><div class='ctx'> 		 * link up and link down notifications.</div><div class='ctx'> 		 */</div><div class='del'>-		sci_port_general_link_up_handler(iport, iphy, false);</div><div class='add'>+		sci_port_general_link_up_handler(iport, iphy, PF_RESUME);</div><div class='ctx'> 		return SCI_SUCCESS;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_warn(sciport_to_dev(iport),</div><div class='hunk'>@@ -1584,14 +1595,14 @@ static const struct sci_base_state sci_port_state_table[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	[SCI_PORT_SUB_WAITING] = {</div><div class='ctx'> 		.enter_state = sci_port_ready_substate_waiting_enter,</div><div class='add'>+		.exit_state  = scic_sds_port_ready_substate_waiting_exit,</div><div class='ctx'> 	},</div><div class='ctx'> 	[SCI_PORT_SUB_OPERATIONAL] = {</div><div class='ctx'> 		.enter_state = sci_port_ready_substate_operational_enter,</div><div class='ctx'> 		.exit_state  = sci_port_ready_substate_operational_exit</div><div class='ctx'> 	},</div><div class='ctx'> 	[SCI_PORT_SUB_CONFIGURING] = {</div><div class='del'>-		.enter_state = sci_port_ready_substate_configuring_enter,</div><div class='del'>-		.exit_state  = sci_port_ready_substate_configuring_exit</div><div class='add'>+		.enter_state = sci_port_ready_substate_configuring_enter</div><div class='ctx'> 	},</div><div class='ctx'> 	[SCI_PORT_RESETTING] = {</div><div class='ctx'> 		.exit_state  = sci_port_resetting_state_exit</div><div class='hunk'>@@ -1609,6 +1620,7 @@ void sci_port_construct(struct isci_port *iport, u8 index,</div><div class='ctx'> 	iport-&gt;logical_port_index  = SCIC_SDS_DUMMY_PORT;</div><div class='ctx'> 	iport-&gt;physical_port_index = index;</div><div class='ctx'> 	iport-&gt;active_phy_mask     = 0;</div><div class='add'>+	iport-&gt;enabled_phy_mask    = 0;</div><div class='ctx'> 	iport-&gt;last_active_phy     = 0;</div><div class='ctx'> 	iport-&gt;ready_exit	   = false;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/isci/port.h b/drivers/scsi/isci/port.h<br/>index cb5ffbc38603..08116090eb70 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/isci/port.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/port.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/isci/port.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/isci/port.h</a></div><div class='hunk'>@@ -63,6 +63,9 @@</div><div class='ctx'> </div><div class='ctx'> #define SCIC_SDS_DUMMY_PORT   0xFF</div><div class='ctx'> </div><div class='add'>+#define PF_NOTIFY (1 &lt;&lt; 0)</div><div class='add'>+#define PF_RESUME (1 &lt;&lt; 1)</div><div class='add'>+</div><div class='ctx'> struct isci_phy;</div><div class='ctx'> struct isci_host;</div><div class='ctx'> </div><div class='hunk'>@@ -83,6 +86,8 @@ enum isci_status {</div><div class='ctx'>  * @logical_port_index: software port index</div><div class='ctx'>  * @physical_port_index: hardware port index</div><div class='ctx'>  * @active_phy_mask: identifies phy members</div><div class='add'>+ * @enabled_phy_mask: phy mask for the port</div><div class='add'>+ *                    that are already part of the port</div><div class='ctx'>  * @reserved_tag:</div><div class='ctx'>  * @reserved_rni: reserver for port task scheduler workaround</div><div class='ctx'>  * @started_request_count: reference count for outstanding commands</div><div class='hunk'>@@ -104,6 +109,7 @@ struct isci_port {</div><div class='ctx'> 	u8 logical_port_index;</div><div class='ctx'> 	u8 physical_port_index;</div><div class='ctx'> 	u8 active_phy_mask;</div><div class='add'>+	u8 enabled_phy_mask;</div><div class='ctx'> 	u8 last_active_phy;</div><div class='ctx'> 	u16 reserved_rni;</div><div class='ctx'> 	u16 reserved_tag;</div><div class='hunk'>@@ -250,6 +256,10 @@ bool sci_port_link_detected(</div><div class='ctx'> 	struct isci_port *iport,</div><div class='ctx'> 	struct isci_phy *iphy);</div><div class='ctx'> </div><div class='add'>+enum sci_status sci_port_get_properties(</div><div class='add'>+	struct isci_port *iport,</div><div class='add'>+	struct sci_port_properties *prop);</div><div class='add'>+</div><div class='ctx'> enum sci_status sci_port_link_up(struct isci_port *iport,</div><div class='ctx'> 				      struct isci_phy *iphy);</div><div class='ctx'> enum sci_status sci_port_link_down(struct isci_port *iport,</div><div class='head'>diff --git a/drivers/scsi/isci/port_config.c b/drivers/scsi/isci/port_config.c<br/>index 38a99d281141..6d1e9544cbe5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/isci/port_config.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/port_config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/isci/port_config.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/isci/port_config.c</a></div><div class='hunk'>@@ -57,7 +57,7 @@</div><div class='ctx'> </div><div class='ctx'> #define SCIC_SDS_MPC_RECONFIGURATION_TIMEOUT    (10)</div><div class='ctx'> #define SCIC_SDS_APC_RECONFIGURATION_TIMEOUT    (10)</div><div class='del'>-#define SCIC_SDS_APC_WAIT_LINK_UP_NOTIFICATION  (100)</div><div class='add'>+#define SCIC_SDS_APC_WAIT_LINK_UP_NOTIFICATION  (250)</div><div class='ctx'> </div><div class='ctx'> enum SCIC_SDS_APC_ACTIVITY {</div><div class='ctx'> 	SCIC_SDS_APC_SKIP_PHY,</div><div class='hunk'>@@ -466,6 +466,23 @@ sci_apc_agent_validate_phy_configuration(struct isci_host *ihost,</div><div class='ctx'> 	return sci_port_configuration_agent_validate_ports(ihost, port_agent);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This routine will restart the automatic port configuration timeout</div><div class='add'>+ * timer for the next time period. This could be caused by either a link</div><div class='add'>+ * down event or a link up event where we can not yet tell to which a phy</div><div class='add'>+ * belongs.</div><div class='add'>+ */</div><div class='add'>+static void sci_apc_agent_start_timer(</div><div class='add'>+	struct sci_port_configuration_agent *port_agent,</div><div class='add'>+	u32 timeout)</div><div class='add'>+{</div><div class='add'>+	if (port_agent-&gt;timer_pending)</div><div class='add'>+		sci_del_timer(&amp;port_agent-&gt;timer);</div><div class='add'>+</div><div class='add'>+	port_agent-&gt;timer_pending = true;</div><div class='add'>+	sci_mod_timer(&amp;port_agent-&gt;timer, timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void sci_apc_agent_configure_ports(struct isci_host *ihost,</div><div class='ctx'> 					       struct sci_port_configuration_agent *port_agent,</div><div class='ctx'> 					       struct isci_phy *iphy,</div><div class='hunk'>@@ -565,17 +582,8 @@ static void sci_apc_agent_configure_ports(struct isci_host *ihost,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SCIC_SDS_APC_START_TIMER:</div><div class='del'>-		/*</div><div class='del'>-		 * This can occur for either a link down event, or a link</div><div class='del'>-		 * up event where we cannot yet tell the port to which a</div><div class='del'>-		 * phy belongs.</div><div class='del'>-		 */</div><div class='del'>-		if (port_agent-&gt;timer_pending)</div><div class='del'>-			sci_del_timer(&amp;port_agent-&gt;timer);</div><div class='del'>-</div><div class='del'>-		port_agent-&gt;timer_pending = true;</div><div class='del'>-		sci_mod_timer(&amp;port_agent-&gt;timer,</div><div class='del'>-			      SCIC_SDS_APC_WAIT_LINK_UP_NOTIFICATION);</div><div class='add'>+		sci_apc_agent_start_timer(port_agent,</div><div class='add'>+					  SCIC_SDS_APC_WAIT_LINK_UP_NOTIFICATION);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SCIC_SDS_APC_SKIP_PHY:</div><div class='hunk'>@@ -607,7 +615,8 @@ static void sci_apc_agent_link_up(struct isci_host *ihost,</div><div class='ctx'> 	if (!iport) {</div><div class='ctx'> 		/* the phy is not the part of this port */</div><div class='ctx'> 		port_agent-&gt;phy_ready_mask |= 1 &lt;&lt; phy_index;</div><div class='del'>-		sci_apc_agent_configure_ports(ihost, port_agent, iphy, true);</div><div class='add'>+		sci_apc_agent_start_timer(port_agent,</div><div class='add'>+					  SCIC_SDS_APC_WAIT_LINK_UP_NOTIFICATION);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* the phy is already the part of the port */</div><div class='ctx'> 		u32 port_state = iport-&gt;sm.current_state_id;</div><div class='head'>diff --git a/drivers/scsi/isci/probe_roms.c b/drivers/scsi/isci/probe_roms.c<br/>index b5f4341de243..9b8117b9d756 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/isci/probe_roms.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/probe_roms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/isci/probe_roms.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/isci/probe_roms.c</a></div><div class='hunk'>@@ -147,7 +147,7 @@ struct isci_orom *isci_request_firmware(struct pci_dev *pdev, const struct firmw</div><div class='ctx'> </div><div class='ctx'> 	memcpy(orom, fw-&gt;data, fw-&gt;size);</div><div class='ctx'> </div><div class='del'>-	if (is_c0(pdev))</div><div class='add'>+	if (is_c0(pdev) || is_c1(pdev))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/scsi/isci/probe_roms.h b/drivers/scsi/isci/probe_roms.h<br/>index 2c75248ca326..bb0e9d4d97c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/isci/probe_roms.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/probe_roms.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/isci/probe_roms.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/isci/probe_roms.h</a></div><div class='hunk'>@@ -152,7 +152,7 @@ struct sci_user_parameters {</div><div class='ctx'> #define MAX_CONCURRENT_DEVICE_SPIN_UP_COUNT 4</div><div class='ctx'> </div><div class='ctx'> struct sci_oem_params;</div><div class='del'>-int sci_oem_parameters_validate(struct sci_oem_params *oem);</div><div class='add'>+int sci_oem_parameters_validate(struct sci_oem_params *oem, u8 version);</div><div class='ctx'> </div><div class='ctx'> struct isci_orom;</div><div class='ctx'> struct isci_orom *isci_request_oprom(struct pci_dev *pdev);</div><div class='hunk'>@@ -191,6 +191,11 @@ struct isci_oem_hdr {</div><div class='ctx'> 			0x1a, 0x04, 0xc6)</div><div class='ctx'> #define ISCI_EFI_VAR_NAME	"RstScuO"</div><div class='ctx'> </div><div class='add'>+#define ISCI_ROM_VER_1_0	0x10</div><div class='add'>+#define ISCI_ROM_VER_1_1	0x11</div><div class='add'>+#define ISCI_ROM_VER_1_3	0x13</div><div class='add'>+#define ISCI_ROM_VER_LATEST	ISCI_ROM_VER_1_3</div><div class='add'>+</div><div class='ctx'> /* Allowed PORT configuration modes APC Automatic PORT configuration mode is</div><div class='ctx'>  * defined by the OEM configuration parameters providing no PHY_MASK parameters</div><div class='ctx'>  * for any PORT. i.e. There are no phys assigned to any of the ports at start.</div><div class='hunk'>@@ -220,8 +225,86 @@ struct sci_oem_params {</div><div class='ctx'> 	struct {</div><div class='ctx'> 		uint8_t mode_type;</div><div class='ctx'> 		uint8_t max_concurr_spin_up;</div><div class='del'>-		uint8_t do_enable_ssc;</div><div class='del'>-		uint8_t reserved;</div><div class='add'>+		/*</div><div class='add'>+		 * This bitfield indicates the OEM's desired default Tx</div><div class='add'>+		 * Spread Spectrum Clocking (SSC) settings for SATA and SAS.</div><div class='add'>+		 * NOTE: Default SSC Modulation Frequency is 31.5KHz.</div><div class='add'>+		 */</div><div class='add'>+		union {</div><div class='add'>+			struct {</div><div class='add'>+			/*</div><div class='add'>+			 * NOTE: Max spread for SATA is +0 / -5000 PPM.</div><div class='add'>+			 * Down-spreading SSC (only method allowed for SATA):</div><div class='add'>+			 *  SATA SSC Tx Disabled                    = 0x0</div><div class='add'>+			 *  SATA SSC Tx at +0 / -1419 PPM Spread    = 0x2</div><div class='add'>+			 *  SATA SSC Tx at +0 / -2129 PPM Spread    = 0x3</div><div class='add'>+			 *  SATA SSC Tx at +0 / -4257 PPM Spread    = 0x6</div><div class='add'>+			 *  SATA SSC Tx at +0 / -4967 PPM Spread    = 0x7</div><div class='add'>+			 */</div><div class='add'>+				uint8_t ssc_sata_tx_spread_level:4;</div><div class='add'>+			/*</div><div class='add'>+			 * SAS SSC Tx Disabled                     = 0x0</div><div class='add'>+			 *</div><div class='add'>+			 * NOTE: Max spread for SAS down-spreading +0 /</div><div class='add'>+			 *	 -2300 PPM</div><div class='add'>+			 * Down-spreading SSC:</div><div class='add'>+			 *  SAS SSC Tx at +0 / -1419 PPM Spread     = 0x2</div><div class='add'>+			 *  SAS SSC Tx at +0 / -2129 PPM Spread     = 0x3</div><div class='add'>+			 *</div><div class='add'>+			 * NOTE: Max spread for SAS center-spreading +2300 /</div><div class='add'>+			 *	 -2300 PPM</div><div class='add'>+			 * Center-spreading SSC:</div><div class='add'>+			 *  SAS SSC Tx at +1064 / -1064 PPM Spread  = 0x3</div><div class='add'>+			 *  SAS SSC Tx at +2129 / -2129 PPM Spread  = 0x6</div><div class='add'>+			 */</div><div class='add'>+				uint8_t ssc_sas_tx_spread_level:3;</div><div class='add'>+			/*</div><div class='add'>+			 * NOTE: Refer to the SSC section of the SAS 2.x</div><div class='add'>+			 * Specification for proper setting of this field.</div><div class='add'>+			 * For standard SAS Initiator SAS PHY operation it</div><div class='add'>+			 * should be 0 for Down-spreading.</div><div class='add'>+			 * SAS SSC Tx spread type:</div><div class='add'>+			 *  Down-spreading SSC      = 0</div><div class='add'>+			 *  Center-spreading SSC    = 1</div><div class='add'>+			 */</div><div class='add'>+				uint8_t ssc_sas_tx_type:1;</div><div class='add'>+			};</div><div class='add'>+			uint8_t do_enable_ssc;</div><div class='add'>+		};</div><div class='add'>+		/*</div><div class='add'>+		 * This field indicates length of the SAS/SATA cable between</div><div class='add'>+		 * host and device.</div><div class='add'>+		 * This field is used make relationship between analog</div><div class='add'>+		 * parameters of the phy in the silicon and length of the cable.</div><div class='add'>+		 * Supported cable attenuation levels:</div><div class='add'>+		 * "short"- up to 3m, "medium"-3m to 6m, and "long"- more than</div><div class='add'>+		 * 6m.</div><div class='add'>+		 *</div><div class='add'>+		 * This is bit mask field:</div><div class='add'>+		 *</div><div class='add'>+		 * BIT:      (MSB) 7     6     5     4</div><div class='add'>+		 * ASSIGNMENT:   &lt;phy3&gt;&lt;phy2&gt;&lt;phy1&gt;&lt;phy0&gt;  - Medium cable</div><div class='add'>+		 *                                           length assignment</div><div class='add'>+		 * BIT:            3     2     1     0  (LSB)</div><div class='add'>+		 * ASSIGNMENT:   &lt;phy3&gt;&lt;phy2&gt;&lt;phy1&gt;&lt;phy0&gt;  - Long cable length</div><div class='add'>+		 *                                           assignment</div><div class='add'>+		 *</div><div class='add'>+		 * BITS 7-4 are set when the cable length is assigned to medium</div><div class='add'>+		 * BITS 3-0 are set when the cable length is assigned to long</div><div class='add'>+		 *</div><div class='add'>+		 * The BIT positions are clear when the cable length is</div><div class='add'>+		 * assigned to short.</div><div class='add'>+		 *</div><div class='add'>+		 * Setting the bits for both long and medium cable length is</div><div class='add'>+		 * undefined.</div><div class='add'>+		 *</div><div class='add'>+		 * A value of 0x84 would assign</div><div class='add'>+		 *    phy3 - medium</div><div class='add'>+		 *    phy2 - long</div><div class='add'>+		 *    phy1 - short</div><div class='add'>+		 *    phy0 - short</div><div class='add'>+		 */</div><div class='add'>+		uint8_t cable_selection_mask;</div><div class='ctx'> 	} controller;</div><div class='ctx'> </div><div class='ctx'> 	struct {</div><div class='head'>diff --git a/drivers/scsi/isci/remote_device.c b/drivers/scsi/isci/remote_device.c<br/>index b207cd3b15a0..dd74b6ceeb82 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/isci/remote_device.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/remote_device.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/isci/remote_device.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/isci/remote_device.c</a></div><div class='hunk'>@@ -53,6 +53,7 @@</div><div class='ctx'>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;scsi/sas.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include "isci.h"</div><div class='ctx'> #include "port.h"</div><div class='ctx'> #include "remote_device.h"</div><div class='hunk'>@@ -1101,6 +1102,7 @@ static enum sci_status sci_remote_device_da_construct(struct isci_port *iport,</div><div class='ctx'> 						       struct isci_remote_device *idev)</div><div class='ctx'> {</div><div class='ctx'> 	enum sci_status status;</div><div class='add'>+	struct sci_port_properties properties;</div><div class='ctx'> 	struct domain_device *dev = idev-&gt;domain_dev;</div><div class='ctx'> </div><div class='ctx'> 	sci_remote_device_construct(iport, idev);</div><div class='hunk'>@@ -1110,6 +1112,11 @@ static enum sci_status sci_remote_device_da_construct(struct isci_port *iport,</div><div class='ctx'> 	 * entries will be needed to store the remote node.</div><div class='ctx'> 	 */</div><div class='ctx'> 	idev-&gt;is_direct_attached = true;</div><div class='add'>+</div><div class='add'>+	sci_port_get_properties(iport, &amp;properties);</div><div class='add'>+	/* Get accurate port width from port's phy mask for a DA device. */</div><div class='add'>+	idev-&gt;device_port_width = hweight32(properties.phy_mask);</div><div class='add'>+</div><div class='ctx'> 	status = sci_controller_allocate_remote_node_context(iport-&gt;owning_controller,</div><div class='ctx'> 								  idev,</div><div class='ctx'> 								  &amp;idev-&gt;rnc.remote_node_index);</div><div class='hunk'>@@ -1125,9 +1132,6 @@ static enum sci_status sci_remote_device_da_construct(struct isci_port *iport,</div><div class='ctx'> </div><div class='ctx'> 	idev-&gt;connection_rate = sci_port_get_max_allowed_speed(iport);</div><div class='ctx'> </div><div class='del'>-	/* / @todo Should I assign the port width by reading all of the phys on the port? */</div><div class='del'>-	idev-&gt;device_port_width = 1;</div><div class='del'>-</div><div class='ctx'> 	return SCI_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c<br/>index 66ad3dc89498..f5a3f7d2bdab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/isci/task.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/task.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/isci/task.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/isci/task.c</a></div><div class='hunk'>@@ -496,7 +496,7 @@ static int isci_task_execute_tmf(struct isci_host *ihost,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	isci_print_tmf(tmf);</div><div class='add'>+	isci_print_tmf(ihost, tmf);</div><div class='ctx'> </div><div class='ctx'> 	if (tmf-&gt;status == SCI_SUCCESS)</div><div class='ctx'> 		ret =  TMF_RESP_FUNC_COMPLETE;</div><div class='head'>diff --git a/drivers/scsi/isci/task.h b/drivers/scsi/isci/task.h<br/>index bc78c0a41d5c..1b27b3797c6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/isci/task.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/isci/task.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/isci/task.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/isci/task.h</a></div><div class='hunk'>@@ -106,7 +106,6 @@ struct isci_tmf {</div><div class='ctx'> 	} resp;</div><div class='ctx'> 	unsigned char lun[8];</div><div class='ctx'> 	u16 io_tag;</div><div class='del'>-	struct isci_remote_device *device;</div><div class='ctx'> 	enum isci_tmf_function_codes tmf_code;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='hunk'>@@ -120,10 +119,10 @@ struct isci_tmf {</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline void isci_print_tmf(struct isci_tmf *tmf)</div><div class='add'>+static inline void isci_print_tmf(struct isci_host *ihost, struct isci_tmf *tmf)</div><div class='ctx'> {</div><div class='ctx'> 	if (SAS_PROTOCOL_SATA == tmf-&gt;proto)</div><div class='del'>-		dev_dbg(&amp;tmf-&gt;device-&gt;isci_port-&gt;isci_host-&gt;pdev-&gt;dev,</div><div class='add'>+		dev_dbg(&amp;ihost-&gt;pdev-&gt;dev,</div><div class='ctx'> 			"%s: status = %x\n"</div><div class='ctx'> 			"tmf-&gt;resp.d2h_fis.status = %x\n"</div><div class='ctx'> 			"tmf-&gt;resp.d2h_fis.error = %x\n",</div><div class='hunk'>@@ -132,7 +131,7 @@ static inline void isci_print_tmf(struct isci_tmf *tmf)</div><div class='ctx'> 			tmf-&gt;resp.d2h_fis.status,</div><div class='ctx'> 			tmf-&gt;resp.d2h_fis.error);</div><div class='ctx'> 	else</div><div class='del'>-		dev_dbg(&amp;tmf-&gt;device-&gt;isci_port-&gt;isci_host-&gt;pdev-&gt;dev,</div><div class='add'>+		dev_dbg(&amp;ihost-&gt;pdev-&gt;dev,</div><div class='ctx'> 			"%s: status = %x\n"</div><div class='ctx'> 			"tmf-&gt;resp.resp_iu.data_present = %x\n"</div><div class='ctx'> 			"tmf-&gt;resp.resp_iu.status = %x\n"</div><div class='head'>diff --git a/drivers/scsi/iscsi_boot_sysfs.c b/drivers/scsi/iscsi_boot_sysfs.c<br/>index 89700cbca16e..14c1c8f6a95e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/iscsi_boot_sysfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/iscsi_boot_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/iscsi_boot_sysfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/iscsi_boot_sysfs.c</a></div><div class='hunk'>@@ -112,7 +112,7 @@ static struct attribute *target_attrs[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static mode_t iscsi_boot_tgt_attr_is_visible(struct kobject *kobj,</div><div class='add'>+static umode_t iscsi_boot_tgt_attr_is_visible(struct kobject *kobj,</div><div class='ctx'> 					     struct attribute *attr, int i)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_boot_kobj *boot_kobj =</div><div class='hunk'>@@ -193,7 +193,7 @@ static struct attribute *ethernet_attrs[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static mode_t iscsi_boot_eth_attr_is_visible(struct kobject *kobj,</div><div class='add'>+static umode_t iscsi_boot_eth_attr_is_visible(struct kobject *kobj,</div><div class='ctx'> 					     struct attribute *attr, int i)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_boot_kobj *boot_kobj =</div><div class='hunk'>@@ -265,7 +265,7 @@ static struct attribute *initiator_attrs[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static mode_t iscsi_boot_ini_attr_is_visible(struct kobject *kobj,</div><div class='add'>+static umode_t iscsi_boot_ini_attr_is_visible(struct kobject *kobj,</div><div class='ctx'> 					     struct attribute *attr, int i)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_boot_kobj *boot_kobj =</div><div class='hunk'>@@ -306,7 +306,7 @@ iscsi_boot_create_kobj(struct iscsi_boot_kset *boot_kset,</div><div class='ctx'> 		       struct attribute_group *attr_group,</div><div class='ctx'> 		       const char *name, int index, void *data,</div><div class='ctx'> 		       ssize_t (*show) (void *data, int type, char *buf),</div><div class='del'>-		       mode_t (*is_visible) (void *data, int type),</div><div class='add'>+		       umode_t (*is_visible) (void *data, int type),</div><div class='ctx'> 		       void (*release) (void *data))</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_boot_kobj *boot_kobj;</div><div class='hunk'>@@ -369,7 +369,7 @@ struct iscsi_boot_kobj *</div><div class='ctx'> iscsi_boot_create_target(struct iscsi_boot_kset *boot_kset, int index,</div><div class='ctx'> 			 void *data,</div><div class='ctx'> 			 ssize_t (*show) (void *data, int type, char *buf),</div><div class='del'>-			 mode_t (*is_visible) (void *data, int type),</div><div class='add'>+			 umode_t (*is_visible) (void *data, int type),</div><div class='ctx'> 			 void (*release) (void *data))</div><div class='ctx'> {</div><div class='ctx'> 	return iscsi_boot_create_kobj(boot_kset, &amp;iscsi_boot_target_attr_group,</div><div class='hunk'>@@ -394,7 +394,7 @@ struct iscsi_boot_kobj *</div><div class='ctx'> iscsi_boot_create_initiator(struct iscsi_boot_kset *boot_kset, int index,</div><div class='ctx'> 			    void *data,</div><div class='ctx'> 			    ssize_t (*show) (void *data, int type, char *buf),</div><div class='del'>-			    mode_t (*is_visible) (void *data, int type),</div><div class='add'>+			    umode_t (*is_visible) (void *data, int type),</div><div class='ctx'> 			    void (*release) (void *data))</div><div class='ctx'> {</div><div class='ctx'> 	return iscsi_boot_create_kobj(boot_kset,</div><div class='hunk'>@@ -420,7 +420,7 @@ struct iscsi_boot_kobj *</div><div class='ctx'> iscsi_boot_create_ethernet(struct iscsi_boot_kset *boot_kset, int index,</div><div class='ctx'> 			   void *data,</div><div class='ctx'> 			   ssize_t (*show) (void *data, int type, char *buf),</div><div class='del'>-			   mode_t (*is_visible) (void *data, int type),</div><div class='add'>+			   umode_t (*is_visible) (void *data, int type),</div><div class='ctx'> 			   void (*release) (void *data))</div><div class='ctx'> {</div><div class='ctx'> 	return iscsi_boot_create_kobj(boot_kset,</div><div class='head'>diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c<br/>index 7c34d8e7cc75..db47158e0dde 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/iscsi_tcp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/iscsi_tcp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/iscsi_tcp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/iscsi_tcp.c</a></div><div class='hunk'>@@ -873,7 +873,7 @@ static void iscsi_sw_tcp_session_destroy(struct iscsi_cls_session *cls_session)</div><div class='ctx'> 	iscsi_host_free(shost);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static mode_t iscsi_sw_tcp_attr_is_visible(int param_type, int param)</div><div class='add'>+static umode_t iscsi_sw_tcp_attr_is_visible(int param_type, int param)</div><div class='ctx'> {</div><div class='ctx'> 	switch (param_type) {</div><div class='ctx'> 	case ISCSI_HOST_PARAM:</div><div class='head'>diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c<br/>index 08e26d4e3731..27cfb0cb186c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/jazz_esp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/jazz_esp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/jazz_esp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/jazz_esp.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* jazz_esp.c: ESP front-end for MIPS JAZZ systems.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2007 Thomas Bogendörfer (tsbogend@alpha.frankende)</div><div class='add'>+ * Copyright (C) 2007 Thomas Bogendörfer (tsbogend@alpha.frankende)</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/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c<br/>index 7269e928824a..1d1b0c9da29b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/libfc/fc_disc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/libfc/fc_disc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/libfc/fc_disc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/libfc/fc_disc.c</a></div><div class='hunk'>@@ -61,7 +61,7 @@ static void fc_disc_restart(struct fc_disc *);</div><div class='ctx'>  * Locking Note: This function expects that the lport mutex is locked before</div><div class='ctx'>  * calling it.</div><div class='ctx'>  */</div><div class='del'>-void fc_disc_stop_rports(struct fc_disc *disc)</div><div class='add'>+static void fc_disc_stop_rports(struct fc_disc *disc)</div><div class='ctx'> {</div><div class='ctx'> 	struct fc_lport *lport;</div><div class='ctx'> 	struct fc_rport_priv *rdata;</div><div class='hunk'>@@ -682,7 +682,7 @@ static int fc_disc_single(struct fc_lport *lport, struct fc_disc_port *dp)</div><div class='ctx'>  * fc_disc_stop() - Stop discovery for a given lport</div><div class='ctx'>  * @lport: The local port that discovery should stop on</div><div class='ctx'>  */</div><div class='del'>-void fc_disc_stop(struct fc_lport *lport)</div><div class='add'>+static void fc_disc_stop(struct fc_lport *lport)</div><div class='ctx'> {</div><div class='ctx'> 	struct fc_disc *disc = &amp;lport-&gt;disc;</div><div class='ctx'> </div><div class='hunk'>@@ -698,7 +698,7 @@ void fc_disc_stop(struct fc_lport *lport)</div><div class='ctx'>  * This function will block until discovery has been</div><div class='ctx'>  * completely stopped and all rports have been deleted.</div><div class='ctx'>  */</div><div class='del'>-void fc_disc_stop_final(struct fc_lport *lport)</div><div class='add'>+static void fc_disc_stop_final(struct fc_lport *lport)</div><div class='ctx'> {</div><div class='ctx'> 	fc_disc_stop(lport);</div><div class='ctx'> 	lport-&gt;tt.rport_flush_queue();</div><div class='head'>diff --git a/drivers/scsi/libfc/fc_elsct.c b/drivers/scsi/libfc/fc_elsct.c<br/>index fb9161dc4ca6..e17a28d324d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/libfc/fc_elsct.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/libfc/fc_elsct.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/libfc/fc_elsct.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/libfc/fc_elsct.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;scsi/fc/fc_els.h&gt;</div><div class='ctx'> #include &lt;scsi/libfc.h&gt;</div><div class='ctx'> #include &lt;scsi/fc_encode.h&gt;</div><div class='add'>+#include "fc_libfc.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * fc_elsct_send() - Send an ELS or CT frame</div><div class='head'>diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c<br/>index 9de9db27e874..4d70d96fa5dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/libfc/fc_exch.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/libfc/fc_exch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/libfc/fc_exch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/libfc/fc_exch.c</a></div><div class='hunk'>@@ -91,7 +91,7 @@ struct fc_exch_pool {</div><div class='ctx'>  * It manages the allocation of exchange IDs.</div><div class='ctx'>  */</div><div class='ctx'> struct fc_exch_mgr {</div><div class='del'>-	struct fc_exch_pool *pool;</div><div class='add'>+	struct fc_exch_pool __percpu *pool;</div><div class='ctx'> 	mempool_t	*ep_pool;</div><div class='ctx'> 	enum fc_class	class;</div><div class='ctx'> 	struct kref	kref;</div><div class='head'>diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c<br/>index 221875ec3d7c..f607314810ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/libfc/fc_fcp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/libfc/fc_fcp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/libfc/fc_fcp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/libfc/fc_fcp.c</a></div><div class='hunk'>@@ -155,6 +155,7 @@ static struct fc_fcp_pkt *fc_fcp_pkt_alloc(struct fc_lport *lport, gfp_t gfp)</div><div class='ctx'> 		fsp-&gt;xfer_ddp = FC_XID_UNKNOWN;</div><div class='ctx'> 		atomic_set(&amp;fsp-&gt;ref_cnt, 1);</div><div class='ctx'> 		init_timer(&amp;fsp-&gt;timer);</div><div class='add'>+		fsp-&gt;timer.data = (unsigned long)fsp;</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;fsp-&gt;list);</div><div class='ctx'> 		spin_lock_init(&amp;fsp-&gt;scsi_pkt_lock);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1850,9 +1851,6 @@ int fc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *sc_cmd)</div><div class='ctx'> 	}</div><div class='ctx'> 	put_cpu();</div><div class='ctx'> </div><div class='del'>-	init_timer(&amp;fsp-&gt;timer);</div><div class='del'>-	fsp-&gt;timer.data = (unsigned long)fsp;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * send it to the lower layer</div><div class='ctx'> 	 * if we get -1 return then put the request in the pending</div><div class='head'>diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c<br/>index e77094a587ed..83750ebb527f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/libfc/fc_lport.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/libfc/fc_lport.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/libfc/fc_lport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/libfc/fc_lport.c</a></div><div class='hunk'>@@ -677,7 +677,8 @@ EXPORT_SYMBOL(fc_set_mfs);</div><div class='ctx'>  * @lport: The local port receiving the event</div><div class='ctx'>  * @event: The discovery event</div><div class='ctx'>  */</div><div class='del'>-void fc_lport_disc_callback(struct fc_lport *lport, enum fc_disc_event event)</div><div class='add'>+static void fc_lport_disc_callback(struct fc_lport *lport,</div><div class='add'>+				   enum fc_disc_event event)</div><div class='ctx'> {</div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case DISC_EV_SUCCESS:</div><div class='hunk'>@@ -1568,7 +1569,7 @@ EXPORT_SYMBOL(fc_lport_flogi_resp);</div><div class='ctx'>  * Locking Note: The lport lock is expected to be held before calling</div><div class='ctx'>  * this routine.</div><div class='ctx'>  */</div><div class='del'>-void fc_lport_enter_flogi(struct fc_lport *lport)</div><div class='add'>+static void fc_lport_enter_flogi(struct fc_lport *lport)</div><div class='ctx'> {</div><div class='ctx'> 	struct fc_frame *fp;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c<br/>index b9e434844a69..83aa1efec875 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/libfc/fc_rport.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/libfc/fc_rport.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/libfc/fc_rport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/libfc/fc_rport.c</a></div><div class='hunk'>@@ -391,7 +391,7 @@ static void fc_rport_work(struct work_struct *work)</div><div class='ctx'>  * If it appears we are already logged in, ADISC is used to verify</div><div class='ctx'>  * the setup.</div><div class='ctx'>  */</div><div class='del'>-int fc_rport_login(struct fc_rport_priv *rdata)</div><div class='add'>+static int fc_rport_login(struct fc_rport_priv *rdata)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;rdata-&gt;rp_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -451,7 +451,7 @@ static void fc_rport_enter_delete(struct fc_rport_priv *rdata,</div><div class='ctx'>  * function will hold the rport lock, call an _enter_*</div><div class='ctx'>  * function and then unlock the rport.</div><div class='ctx'>  */</div><div class='del'>-int fc_rport_logoff(struct fc_rport_priv *rdata)</div><div class='add'>+static int fc_rport_logoff(struct fc_rport_priv *rdata)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;rdata-&gt;rp_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -653,8 +653,8 @@ static int fc_rport_login_complete(struct fc_rport_priv *rdata,</div><div class='ctx'>  * @fp:	    The FLOGI response frame</div><div class='ctx'>  * @rp_arg: The remote port that received the FLOGI response</div><div class='ctx'>  */</div><div class='del'>-void fc_rport_flogi_resp(struct fc_seq *sp, struct fc_frame *fp,</div><div class='del'>-			 void *rp_arg)</div><div class='add'>+static void fc_rport_flogi_resp(struct fc_seq *sp, struct fc_frame *fp,</div><div class='add'>+				void *rp_arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct fc_rport_priv *rdata = rp_arg;</div><div class='ctx'> 	struct fc_lport *lport = rdata-&gt;local_port;</div><div class='hunk'>@@ -1520,7 +1520,7 @@ reject:</div><div class='ctx'>  *</div><div class='ctx'>  * Locking Note: Called with the lport lock held.</div><div class='ctx'>  */</div><div class='del'>-void fc_rport_recv_req(struct fc_lport *lport, struct fc_frame *fp)</div><div class='add'>+static void fc_rport_recv_req(struct fc_lport *lport, struct fc_frame *fp)</div><div class='ctx'> {</div><div class='ctx'> 	struct fc_seq_els_data els_data;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h<br/>index bb4c8e0584e2..825f9307417a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc.h</a></div><div class='hunk'>@@ -247,18 +247,6 @@ struct lpfc_stats {</div><div class='ctx'> 	uint32_t fcpLocalErr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum sysfs_mbox_state {</div><div class='del'>-	SMBOX_IDLE,</div><div class='del'>-	SMBOX_WRITING,</div><div class='del'>-	SMBOX_READING</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct lpfc_sysfs_mbox {</div><div class='del'>-	enum sysfs_mbox_state state;</div><div class='del'>-	size_t                offset;</div><div class='del'>-	struct lpfcMboxq *    mbox;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct lpfc_hba;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -783,8 +771,6 @@ struct lpfc_hba {</div><div class='ctx'> 	uint64_t bg_apptag_err_cnt;</div><div class='ctx'> 	uint64_t bg_reftag_err_cnt;</div><div class='ctx'> </div><div class='del'>-	struct lpfc_sysfs_mbox sysfs_mbox;</div><div class='del'>-</div><div class='ctx'> 	/* fastpath list. */</div><div class='ctx'> 	spinlock_t scsi_buf_list_lock;</div><div class='ctx'> 	struct list_head lpfc_scsi_buf_list;</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c<br/>index d0ebaeb7ef60..f6697cb0e216 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_attr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_attr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_attr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_attr.c</a></div><div class='hunk'>@@ -351,10 +351,23 @@ lpfc_fwrev_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='add'>+	uint32_t if_type;</div><div class='add'>+	uint8_t sli_family;</div><div class='ctx'> 	char fwrev[32];</div><div class='add'>+	int len;</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, sli-%d\n", fwrev, phba-&gt;sli_rev);</div><div class='add'>+	if_type = phba-&gt;sli4_hba.pc_sli4_params.if_type;</div><div class='add'>+	sli_family = phba-&gt;sli4_hba.pc_sli4_params.sli_family;</div><div class='add'>+</div><div class='add'>+	if (phba-&gt;sli_rev &lt; LPFC_SLI_REV4)</div><div class='add'>+		len = snprintf(buf, PAGE_SIZE, "%s, sli-%d\n",</div><div class='add'>+			       fwrev, phba-&gt;sli_rev);</div><div class='add'>+	else</div><div class='add'>+		len = snprintf(buf, PAGE_SIZE, "%s, sli-%d:%d:%x\n",</div><div class='add'>+			       fwrev, phba-&gt;sli_rev, if_type, sli_family);</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'>@@ -488,6 +501,34 @@ lpfc_link_state_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * lpfc_sli4_protocol_show - Return the fip mode of the HBA</div><div class='add'>+ * @dev: class unused variable.</div><div class='add'>+ * @attr: device attribute, not used.</div><div class='add'>+ * @buf: on return contains the module description text.</div><div class='add'>+ *</div><div class='add'>+ * Returns: size of formatted string.</div><div class='add'>+ **/</div><div class='add'>+static ssize_t</div><div class='add'>+lpfc_sli4_protocol_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			char *buf)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *shost = class_to_shost(dev);</div><div class='add'>+	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='add'>+	struct lpfc_hba *phba = vport-&gt;phba;</div><div class='add'>+</div><div class='add'>+	if (phba-&gt;sli_rev &lt; LPFC_SLI_REV4)</div><div class='add'>+		return snprintf(buf, PAGE_SIZE, "fc\n");</div><div class='add'>+</div><div class='add'>+	if (phba-&gt;sli4_hba.lnk_info.lnk_dv == LPFC_LNK_DAT_VAL) {</div><div class='add'>+		if (phba-&gt;sli4_hba.lnk_info.lnk_tp == LPFC_LNK_TYPE_GE)</div><div class='add'>+			return snprintf(buf, PAGE_SIZE, "fcoe\n");</div><div class='add'>+		if (phba-&gt;sli4_hba.lnk_info.lnk_tp == LPFC_LNK_TYPE_FC)</div><div class='add'>+			return snprintf(buf, PAGE_SIZE, "fc\n");</div><div class='add'>+	}</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "unknown\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * lpfc_link_state_store - Transition the link_state on an HBA port</div><div class='ctx'>  * @dev: class device that is converted into a Scsi_host.</div><div class='ctx'>  * @attr: device attribute, not used.</div><div class='hunk'>@@ -773,7 +814,12 @@ lpfc_issue_reset(struct device *dev, struct device_attribute *attr,</div><div class='ctx'>  * the readyness after performing a firmware reset.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns:</div><div class='del'>- * zero for success</div><div class='add'>+ * zero for success, -EPERM when port does not have privilage to perform the</div><div class='add'>+ * reset, -EIO when port timeout from recovering from the reset.</div><div class='add'>+ *</div><div class='add'>+ * Note:</div><div class='add'>+ * As the caller will interpret the return code by value, be careful in making</div><div class='add'>+ * change or addition to return codes.</div><div class='ctx'>  **/</div><div class='ctx'> int</div><div class='ctx'> lpfc_sli4_pdev_status_reg_wait(struct lpfc_hba *phba)</div><div class='hunk'>@@ -826,9 +872,11 @@ lpfc_sli4_pdev_reg_request(struct lpfc_hba *phba, uint32_t opcode)</div><div class='ctx'> {</div><div class='ctx'> 	struct completion online_compl;</div><div class='ctx'> 	struct pci_dev *pdev = phba-&gt;pcidev;</div><div class='add'>+	uint32_t before_fc_flag;</div><div class='add'>+	uint32_t sriov_nr_virtfn;</div><div class='ctx'> 	uint32_t reg_val;</div><div class='del'>-	int status = 0;</div><div class='del'>-	int rc;</div><div class='add'>+	int status = 0, rc = 0;</div><div class='add'>+	int job_posted = 1, sriov_err;</div><div class='ctx'> </div><div class='ctx'> 	if (!phba-&gt;cfg_enable_hba_reset)</div><div class='ctx'> 		return -EACCES;</div><div class='hunk'>@@ -838,6 +886,10 @@ lpfc_sli4_pdev_reg_request(struct lpfc_hba *phba, uint32_t opcode)</div><div class='ctx'> 	     LPFC_SLI_INTF_IF_TYPE_2))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='add'>+	/* Keep state if we need to restore back */</div><div class='add'>+	before_fc_flag = phba-&gt;pport-&gt;fc_flag;</div><div class='add'>+	sriov_nr_virtfn = phba-&gt;cfg_sriov_nr_virtfn;</div><div class='add'>+</div><div class='ctx'> 	/* Disable SR-IOV virtual functions if enabled */</div><div class='ctx'> 	if (phba-&gt;cfg_sriov_nr_virtfn) {</div><div class='ctx'> 		pci_disable_sriov(pdev);</div><div class='hunk'>@@ -869,21 +921,44 @@ lpfc_sli4_pdev_reg_request(struct lpfc_hba *phba, uint32_t opcode)</div><div class='ctx'> 	/* delay driver action following IF_TYPE_2 reset */</div><div class='ctx'> 	rc = lpfc_sli4_pdev_status_reg_wait(phba);</div><div class='ctx'> </div><div class='del'>-	if (rc)</div><div class='add'>+	if (rc == -EPERM) {</div><div class='add'>+		/* no privilage for reset, restore if needed */</div><div class='add'>+		if (before_fc_flag &amp; FC_OFFLINE_MODE)</div><div class='add'>+			goto out;</div><div class='add'>+	} else if (rc == -EIO) {</div><div class='add'>+		/* reset failed, there is nothing more we can do */</div><div class='ctx'> 		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* keep the original port state */</div><div class='add'>+	if (before_fc_flag &amp; FC_OFFLINE_MODE)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;online_compl);</div><div class='del'>-	rc = lpfc_workq_post_event(phba, &amp;status, &amp;online_compl,</div><div class='del'>-				   LPFC_EVT_ONLINE);</div><div class='del'>-	if (rc == 0)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	job_posted = lpfc_workq_post_event(phba, &amp;status, &amp;online_compl,</div><div class='add'>+					   LPFC_EVT_ONLINE);</div><div class='add'>+	if (!job_posted)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	wait_for_completion(&amp;online_compl);</div><div class='ctx'> </div><div class='del'>-	if (status != 0)</div><div class='del'>-		return -EIO;</div><div class='add'>+out:</div><div class='add'>+	/* in any case, restore the virtual functions enabled as before */</div><div class='add'>+	if (sriov_nr_virtfn) {</div><div class='add'>+		sriov_err =</div><div class='add'>+			lpfc_sli_probe_sriov_nr_virtfn(phba, sriov_nr_virtfn);</div><div class='add'>+		if (!sriov_err)</div><div class='add'>+			phba-&gt;cfg_sriov_nr_virtfn = sriov_nr_virtfn;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	/* return proper error code */</div><div class='add'>+	if (!rc) {</div><div class='add'>+		if (!job_posted)</div><div class='add'>+			rc = -ENOMEM;</div><div class='add'>+		else if (status)</div><div class='add'>+			rc = -EIO;</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -955,33 +1030,38 @@ lpfc_board_mode_store(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'> 	struct completion online_compl;</div><div class='del'>-	int status=0;</div><div class='add'>+	char *board_mode_str = NULL;</div><div class='add'>+	int status = 0;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (!phba-&gt;cfg_enable_hba_reset)</div><div class='del'>-		return -EACCES;</div><div class='add'>+	if (!phba-&gt;cfg_enable_hba_reset) {</div><div class='add'>+		status = -EACCES;</div><div class='add'>+		goto board_mode_out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='del'>-		"3050 lpfc_board_mode set to %s\n", buf);</div><div class='add'>+			 "3050 lpfc_board_mode set to %s\n", buf);</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;online_compl);</div><div class='ctx'> </div><div class='ctx'> 	if(strncmp(buf, "online", sizeof("online") - 1) == 0) {</div><div class='ctx'> 		rc = lpfc_workq_post_event(phba, &amp;status, &amp;online_compl,</div><div class='ctx'> 				      LPFC_EVT_ONLINE);</div><div class='del'>-		if (rc == 0)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+		if (rc == 0) {</div><div class='add'>+			status = -ENOMEM;</div><div class='add'>+			goto board_mode_out;</div><div class='add'>+		}</div><div class='ctx'> 		wait_for_completion(&amp;online_compl);</div><div class='ctx'> 	} else if (strncmp(buf, "offline", sizeof("offline") - 1) == 0)</div><div class='ctx'> 		status = lpfc_do_offline(phba, LPFC_EVT_OFFLINE);</div><div class='ctx'> 	else if (strncmp(buf, "warm", sizeof("warm") - 1) == 0)</div><div class='ctx'> 		if (phba-&gt;sli_rev == LPFC_SLI_REV4)</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			status = -EINVAL;</div><div class='ctx'> 		else</div><div class='ctx'> 			status = lpfc_do_offline(phba, LPFC_EVT_WARM_START);</div><div class='ctx'> 	else if (strncmp(buf, "error", sizeof("error") - 1) == 0)</div><div class='ctx'> 		if (phba-&gt;sli_rev == LPFC_SLI_REV4)</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			status = -EINVAL;</div><div class='ctx'> 		else</div><div class='ctx'> 			status = lpfc_do_offline(phba, LPFC_EVT_KILL);</div><div class='ctx'> 	else if (strncmp(buf, "dump", sizeof("dump") - 1) == 0)</div><div class='hunk'>@@ -991,12 +1071,21 @@ lpfc_board_mode_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	else if (strncmp(buf, "dv_reset", sizeof("dv_reset") - 1) == 0)</div><div class='ctx'> 		status = lpfc_sli4_pdev_reg_request(phba, LPFC_DV_RESET);</div><div class='ctx'> 	else</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		status = -EINVAL;</div><div class='ctx'> </div><div class='add'>+board_mode_out:</div><div class='ctx'> 	if (!status)</div><div class='ctx'> 		return strlen(buf);</div><div class='del'>-	else</div><div class='add'>+	else {</div><div class='add'>+		board_mode_str = strchr(buf, '\n');</div><div class='add'>+		if (board_mode_str)</div><div class='add'>+			*board_mode_str = '\0';</div><div class='add'>+		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='add'>+				 "3097 Failed \"%s\", status(%d), "</div><div class='add'>+				 "fc_flag(x%x)\n",</div><div class='add'>+				 buf, status, phba-&gt;pport-&gt;fc_flag);</div><div class='ctx'> 		return status;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1942,6 +2031,7 @@ static DEVICE_ATTR(lpfc_fips_rev, S_IRUGO, lpfc_fips_rev_show, NULL);</div><div class='ctx'> static DEVICE_ATTR(lpfc_dss, S_IRUGO, lpfc_dss_show, NULL);</div><div class='ctx'> static DEVICE_ATTR(lpfc_sriov_hw_max_virtfn, S_IRUGO,</div><div class='ctx'> 		   lpfc_sriov_hw_max_virtfn_show, NULL);</div><div class='add'>+static DEVICE_ATTR(protocol, S_IRUGO, lpfc_sli4_protocol_show, NULL);</div><div class='ctx'> </div><div class='ctx'> static char *lpfc_soft_wwn_key = "C99G71SL8032A";</div><div class='ctx'> </div><div class='hunk'>@@ -2687,6 +2777,14 @@ lpfc_topology_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	if (val &gt;= 0 &amp;&amp; val &lt;= 6) {</div><div class='ctx'> 		prev_val = phba-&gt;cfg_topology;</div><div class='ctx'> 		phba-&gt;cfg_topology = val;</div><div class='add'>+		if (phba-&gt;cfg_link_speed == LPFC_USER_LINK_SPEED_16G &amp;&amp;</div><div class='add'>+			val == 4) {</div><div class='add'>+			lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,</div><div class='add'>+				"3113 Loop mode not supported at speed %d\n",</div><div class='add'>+				phba-&gt;cfg_link_speed);</div><div class='add'>+			phba-&gt;cfg_topology = prev_val;</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		if (nolip)</div><div class='ctx'> 			return strlen(buf);</div><div class='ctx'> </div><div class='hunk'>@@ -3132,6 +3230,14 @@ lpfc_link_speed_store(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 				val);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='add'>+	if (val == LPFC_USER_LINK_SPEED_16G &amp;&amp;</div><div class='add'>+		 phba-&gt;fc_topology == LPFC_TOPOLOGY_LOOP) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='add'>+				"3112 lpfc_link_speed attribute cannot be set "</div><div class='add'>+				"to %d. Speed is not supported in loop mode.\n",</div><div class='add'>+				val);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	if ((val &gt;= 0) &amp;&amp; (val &lt;= LPFC_USER_LINK_SPEED_MAX) &amp;&amp;</div><div class='ctx'> 	    (LPFC_USER_LINK_SPEED_BITMAP &amp; (1 &lt;&lt; val))) {</div><div class='ctx'> 		prev_val = phba-&gt;cfg_link_speed;</div><div class='hunk'>@@ -3176,6 +3282,13 @@ lpfc_param_show(link_speed)</div><div class='ctx'> static int</div><div class='ctx'> lpfc_link_speed_init(struct lpfc_hba *phba, int val)</div><div class='ctx'> {</div><div class='add'>+	if (val == LPFC_USER_LINK_SPEED_16G &amp;&amp; phba-&gt;cfg_topology == 4) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='add'>+			"3111 lpfc_link_speed of %d cannot "</div><div class='add'>+			"support loop mode, setting topology to default.\n",</div><div class='add'>+			 val);</div><div class='add'>+		phba-&gt;cfg_topology = 0;</div><div class='add'>+	}</div><div class='ctx'> 	if ((val &gt;= 0) &amp;&amp; (val &lt;= LPFC_USER_LINK_SPEED_MAX) &amp;&amp;</div><div class='ctx'> 	    (LPFC_USER_LINK_SPEED_BITMAP &amp; (1 &lt;&lt; val))) {</div><div class='ctx'> 		phba-&gt;cfg_link_speed = val;</div><div class='hunk'>@@ -3830,6 +3943,7 @@ struct device_attribute *lpfc_hba_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_lpfc_fips_rev,</div><div class='ctx'> 	&amp;dev_attr_lpfc_dss,</div><div class='ctx'> 	&amp;dev_attr_lpfc_sriov_hw_max_virtfn,</div><div class='add'>+	&amp;dev_attr_protocol,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3988,23 +4102,6 @@ static struct bin_attribute sysfs_ctlreg_attr = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * sysfs_mbox_idle - frees the sysfs mailbox</div><div class='del'>- * @phba: lpfc_hba pointer</div><div class='del'>- **/</div><div class='del'>-static void</div><div class='del'>-sysfs_mbox_idle(struct lpfc_hba *phba)</div><div class='del'>-{</div><div class='del'>-	phba-&gt;sysfs_mbox.state = SMBOX_IDLE;</div><div class='del'>-	phba-&gt;sysfs_mbox.offset = 0;</div><div class='del'>-</div><div class='del'>-	if (phba-&gt;sysfs_mbox.mbox) {</div><div class='del'>-		mempool_free(phba-&gt;sysfs_mbox.mbox,</div><div class='del'>-			     phba-&gt;mbox_mem_pool);</div><div class='del'>-		phba-&gt;sysfs_mbox.mbox = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * sysfs_mbox_write - Write method for writing information via mbox</div><div class='ctx'>  * @filp: open sysfs file</div><div class='ctx'>  * @kobj: kernel kobject that contains the kernel class device.</div><div class='hunk'>@@ -4014,71 +4111,18 @@ sysfs_mbox_idle(struct lpfc_hba *phba)</div><div class='ctx'>  * @count: bytes to transfer.</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='del'>- * Accessed via /sys/class/scsi_host/hostxxx/mbox.</div><div class='del'>- * Uses the sysfs mbox to send buf contents to the adapter.</div><div class='add'>+ * Deprecated function. All mailbox access from user space is performed via the</div><div class='add'>+ * bsg interface.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns:</div><div class='del'>- * -ERANGE off and count combo out of range</div><div class='del'>- * -EINVAL off, count or buff address invalid</div><div class='del'>- * zero if count is zero</div><div class='del'>- * -EPERM adapter is offline</div><div class='del'>- * -ENOMEM failed to allocate memory for the mail box</div><div class='del'>- * -EAGAIN offset, state or mbox is NULL</div><div class='del'>- * count number of bytes transferred</div><div class='add'>+ * -EPERM operation not permitted</div><div class='ctx'>  **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> sysfs_mbox_write(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 		 struct bin_attribute *bin_attr,</div><div class='ctx'> 		 char *buf, loff_t off, size_t count)</div><div class='ctx'> {</div><div class='del'>-	struct device *dev = container_of(kobj, struct device, kobj);</div><div class='del'>-	struct Scsi_Host  *shost = class_to_shost(dev);</div><div class='del'>-	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='del'>-	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='del'>-	struct lpfcMboxq  *mbox = NULL;</div><div class='del'>-</div><div class='del'>-	if ((count + off) &gt; MAILBOX_CMD_SIZE)</div><div class='del'>-		return -ERANGE;</div><div class='del'>-</div><div class='del'>-	if (off % 4 ||  count % 4 || (unsigned long)buf % 4)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (count == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (off == 0) {</div><div class='del'>-		mbox = mempool_alloc(phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='del'>-		if (!mbox)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		memset(mbox, 0, sizeof (LPFC_MBOXQ_t));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-</div><div class='del'>-	if (off == 0) {</div><div class='del'>-		if (phba-&gt;sysfs_mbox.mbox)</div><div class='del'>-			mempool_free(mbox, phba-&gt;mbox_mem_pool);</div><div class='del'>-		else</div><div class='del'>-			phba-&gt;sysfs_mbox.mbox = mbox;</div><div class='del'>-		phba-&gt;sysfs_mbox.state = SMBOX_WRITING;</div><div class='del'>-	} else {</div><div class='del'>-		if (phba-&gt;sysfs_mbox.state  != SMBOX_WRITING ||</div><div class='del'>-		    phba-&gt;sysfs_mbox.offset != off           ||</div><div class='del'>-		    phba-&gt;sysfs_mbox.mbox   == NULL) {</div><div class='del'>-			sysfs_mbox_idle(phba);</div><div class='del'>-			spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-			return -EAGAIN;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy((uint8_t *) &amp;phba-&gt;sysfs_mbox.mbox-&gt;u.mb + off,</div><div class='del'>-	       buf, count);</div><div class='del'>-</div><div class='del'>-	phba-&gt;sysfs_mbox.offset = off + count;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='add'>+	return -EPERM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -4091,201 +4135,18 @@ sysfs_mbox_write(struct file *filp, struct kobject *kobj,</div><div class='ctx'>  * @count: bytes to transfer.</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='del'>- * Accessed via /sys/class/scsi_host/hostxxx/mbox.</div><div class='del'>- * Uses the sysfs mbox to receive data from to the adapter.</div><div class='add'>+ * Deprecated function. All mailbox access from user space is performed via the</div><div class='add'>+ * bsg interface.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns:</div><div class='del'>- * -ERANGE off greater than mailbox command size</div><div class='del'>- * -EINVAL off, count or buff address invalid</div><div class='del'>- * zero if off and count are zero</div><div class='del'>- * -EACCES adapter over temp</div><div class='del'>- * -EPERM garbage can value to catch a multitude of errors</div><div class='del'>- * -EAGAIN management IO not permitted, state or off error</div><div class='del'>- * -ETIME mailbox timeout</div><div class='del'>- * -ENODEV mailbox error</div><div class='del'>- * count number of bytes transferred</div><div class='add'>+ * -EPERM operation not permitted</div><div class='ctx'>  **/</div><div class='ctx'> static ssize_t</div><div class='ctx'> sysfs_mbox_read(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 		struct bin_attribute *bin_attr,</div><div class='ctx'> 		char *buf, loff_t off, size_t count)</div><div class='ctx'> {</div><div class='del'>-	struct device *dev = container_of(kobj, struct device, kobj);</div><div class='del'>-	struct Scsi_Host  *shost = class_to_shost(dev);</div><div class='del'>-	struct lpfc_vport *vport = (struct lpfc_vport *) shost-&gt;hostdata;</div><div class='del'>-	struct lpfc_hba   *phba = vport-&gt;phba;</div><div class='del'>-	LPFC_MBOXQ_t *mboxq;</div><div class='del'>-	MAILBOX_t *pmb;</div><div class='del'>-	uint32_t mbox_tmo;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	if (off &gt; MAILBOX_CMD_SIZE)</div><div class='del'>-		return -ERANGE;</div><div class='del'>-</div><div class='del'>-	if ((count + off) &gt; MAILBOX_CMD_SIZE)</div><div class='del'>-		count = MAILBOX_CMD_SIZE - off;</div><div class='del'>-</div><div class='del'>-	if (off % 4 ||  count % 4 || (unsigned long)buf % 4)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (off &amp;&amp; count == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-</div><div class='del'>-	if (phba-&gt;over_temp_state == HBA_OVER_TEMP) {</div><div class='del'>-		sysfs_mbox_idle(phba);</div><div class='del'>-		spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-		return  -EACCES;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (off == 0 &amp;&amp;</div><div class='del'>-	    phba-&gt;sysfs_mbox.state  == SMBOX_WRITING &amp;&amp;</div><div class='del'>-	    phba-&gt;sysfs_mbox.offset &gt;= 2 * sizeof(uint32_t)) {</div><div class='del'>-		mboxq = (LPFC_MBOXQ_t *)&amp;phba-&gt;sysfs_mbox.mbox;</div><div class='del'>-		pmb = &amp;mboxq-&gt;u.mb;</div><div class='del'>-		switch (pmb-&gt;mbxCommand) {</div><div class='del'>-			/* Offline only */</div><div class='del'>-		case MBX_INIT_LINK:</div><div class='del'>-		case MBX_DOWN_LINK:</div><div class='del'>-		case MBX_CONFIG_LINK:</div><div class='del'>-		case MBX_CONFIG_RING:</div><div class='del'>-		case MBX_RESET_RING:</div><div class='del'>-		case MBX_UNREG_LOGIN:</div><div class='del'>-		case MBX_CLEAR_LA:</div><div class='del'>-		case MBX_DUMP_CONTEXT:</div><div class='del'>-		case MBX_RUN_DIAGS:</div><div class='del'>-		case MBX_RESTART:</div><div class='del'>-		case MBX_SET_MASK:</div><div class='del'>-		case MBX_SET_DEBUG:</div><div class='del'>-			if (!(vport-&gt;fc_flag &amp; FC_OFFLINE_MODE)) {</div><div class='del'>-				printk(KERN_WARNING "mbox_read:Command 0x%x "</div><div class='del'>-				       "is illegal in on-line state\n",</div><div class='del'>-				       pmb-&gt;mbxCommand);</div><div class='del'>-				sysfs_mbox_idle(phba);</div><div class='del'>-				spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-				return -EPERM;</div><div class='del'>-			}</div><div class='del'>-		case MBX_WRITE_NV:</div><div class='del'>-		case MBX_WRITE_VPARMS:</div><div class='del'>-		case MBX_LOAD_SM:</div><div class='del'>-		case MBX_READ_NV:</div><div class='del'>-		case MBX_READ_CONFIG:</div><div class='del'>-		case MBX_READ_RCONFIG:</div><div class='del'>-		case MBX_READ_STATUS:</div><div class='del'>-		case MBX_READ_XRI:</div><div class='del'>-		case MBX_READ_REV:</div><div class='del'>-		case MBX_READ_LNK_STAT:</div><div class='del'>-		case MBX_DUMP_MEMORY:</div><div class='del'>-		case MBX_DOWN_LOAD:</div><div class='del'>-		case MBX_UPDATE_CFG:</div><div class='del'>-		case MBX_KILL_BOARD:</div><div class='del'>-		case MBX_LOAD_AREA:</div><div class='del'>-		case MBX_LOAD_EXP_ROM:</div><div class='del'>-		case MBX_BEACON:</div><div class='del'>-		case MBX_DEL_LD_ENTRY:</div><div class='del'>-		case MBX_SET_VARIABLE:</div><div class='del'>-		case MBX_WRITE_WWN:</div><div class='del'>-		case MBX_PORT_CAPABILITIES:</div><div class='del'>-		case MBX_PORT_IOV_CONTROL:</div><div class='del'>-			break;</div><div class='del'>-		case MBX_SECURITY_MGMT:</div><div class='del'>-		case MBX_AUTH_PORT:</div><div class='del'>-			if (phba-&gt;pci_dev_grp == LPFC_PCI_DEV_OC) {</div><div class='del'>-				printk(KERN_WARNING "mbox_read:Command 0x%x "</div><div class='del'>-				       "is not permitted\n", pmb-&gt;mbxCommand);</div><div class='del'>-				sysfs_mbox_idle(phba);</div><div class='del'>-				spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-				return -EPERM;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case MBX_READ_SPARM64:</div><div class='del'>-		case MBX_READ_TOPOLOGY:</div><div class='del'>-		case MBX_REG_LOGIN:</div><div class='del'>-		case MBX_REG_LOGIN64:</div><div class='del'>-		case MBX_CONFIG_PORT:</div><div class='del'>-		case MBX_RUN_BIU_DIAG:</div><div class='del'>-			printk(KERN_WARNING "mbox_read: Illegal Command 0x%x\n",</div><div class='del'>-			       pmb-&gt;mbxCommand);</div><div class='del'>-			sysfs_mbox_idle(phba);</div><div class='del'>-			spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-			return -EPERM;</div><div class='del'>-		default:</div><div class='del'>-			printk(KERN_WARNING "mbox_read: Unknown Command 0x%x\n",</div><div class='del'>-			       pmb-&gt;mbxCommand);</div><div class='del'>-			sysfs_mbox_idle(phba);</div><div class='del'>-			spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-			return -EPERM;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* If HBA encountered an error attention, allow only DUMP</div><div class='del'>-		 * or RESTART mailbox commands until the HBA is restarted.</div><div class='del'>-		 */</div><div class='del'>-		if (phba-&gt;pport-&gt;stopped &amp;&amp;</div><div class='del'>-		    pmb-&gt;mbxCommand != MBX_DUMP_MEMORY &amp;&amp;</div><div class='del'>-		    pmb-&gt;mbxCommand != MBX_RESTART &amp;&amp;</div><div class='del'>-		    pmb-&gt;mbxCommand != MBX_WRITE_VPARMS &amp;&amp;</div><div class='del'>-		    pmb-&gt;mbxCommand != MBX_WRITE_WWN)</div><div class='del'>-			lpfc_printf_log(phba, KERN_WARNING, LOG_MBOX,</div><div class='del'>-					"1259 mbox: Issued mailbox cmd "</div><div class='del'>-					"0x%x while in stopped state.\n",</div><div class='del'>-					pmb-&gt;mbxCommand);</div><div class='del'>-</div><div class='del'>-		phba-&gt;sysfs_mbox.mbox-&gt;vport = vport;</div><div class='del'>-</div><div class='del'>-		/* Don't allow mailbox commands to be sent when blocked</div><div class='del'>-		 * or when in the middle of discovery</div><div class='del'>-		 */</div><div class='del'>-		if (phba-&gt;sli.sli_flag &amp; LPFC_BLOCK_MGMT_IO) {</div><div class='del'>-			sysfs_mbox_idle(phba);</div><div class='del'>-			spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-			return  -EAGAIN;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((vport-&gt;fc_flag &amp; FC_OFFLINE_MODE) ||</div><div class='del'>-		    (!(phba-&gt;sli.sli_flag &amp; LPFC_SLI_ACTIVE))) {</div><div class='del'>-</div><div class='del'>-			spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-			rc = lpfc_sli_issue_mbox (phba,</div><div class='del'>-						  phba-&gt;sysfs_mbox.mbox,</div><div class='del'>-						  MBX_POLL);</div><div class='del'>-			spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-</div><div class='del'>-		} else {</div><div class='del'>-			spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-			mbox_tmo = lpfc_mbox_tmo_val(phba, mboxq);</div><div class='del'>-			rc = lpfc_sli_issue_mbox_wait(phba, mboxq, mbox_tmo);</div><div class='del'>-			spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (rc != MBX_SUCCESS) {</div><div class='del'>-			if (rc == MBX_TIMEOUT) {</div><div class='del'>-				phba-&gt;sysfs_mbox.mbox = NULL;</div><div class='del'>-			}</div><div class='del'>-			sysfs_mbox_idle(phba);</div><div class='del'>-			spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-			return  (rc == MBX_TIMEOUT) ? -ETIME : -ENODEV;</div><div class='del'>-		}</div><div class='del'>-		phba-&gt;sysfs_mbox.state = SMBOX_READING;</div><div class='del'>-	}</div><div class='del'>-	else if (phba-&gt;sysfs_mbox.offset != off ||</div><div class='del'>-		 phba-&gt;sysfs_mbox.state  != SMBOX_READING) {</div><div class='del'>-		printk(KERN_WARNING  "mbox_read: Bad State\n");</div><div class='del'>-		sysfs_mbox_idle(phba);</div><div class='del'>-		spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(buf, (uint8_t *) &amp;pmb + off, count);</div><div class='del'>-</div><div class='del'>-	phba-&gt;sysfs_mbox.offset = off + count;</div><div class='del'>-</div><div class='del'>-	if (phba-&gt;sysfs_mbox.offset == MAILBOX_CMD_SIZE)</div><div class='del'>-		sysfs_mbox_idle(phba);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='add'>+	return -EPERM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct bin_attribute sysfs_mbox_attr = {</div><div class='hunk'>@@ -4429,8 +4290,13 @@ lpfc_get_host_port_state(struct Scsi_Host *shost)</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'>-			/* Links up, beyond this port_type reports state */</div><div class='del'>-			fc_host_port_state(shost) = FC_PORTSTATE_ONLINE;</div><div class='add'>+			/* Links up, reports port state accordingly */</div><div class='add'>+			if (vport-&gt;port_state &lt; LPFC_VPORT_READY)</div><div class='add'>+				fc_host_port_state(shost) =</div><div class='add'>+							FC_PORTSTATE_BYPASSED;</div><div class='add'>+			else</div><div class='add'>+				fc_host_port_state(shost) =</div><div class='add'>+							FC_PORTSTATE_ONLINE;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case LPFC_HBA_ERROR:</div><div class='ctx'> 			fc_host_port_state(shost) = FC_PORTSTATE_ERROR;</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c<br/>index 6760c69f5253..56a86baece5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_bsg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_bsg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_bsg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_bsg.c</a></div><div class='hunk'>@@ -916,9 +916,11 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> 				} else {</div><div class='ctx'> 					switch (cmd) {</div><div class='ctx'> 					case ELX_LOOPBACK_DATA:</div><div class='del'>-						diag_cmd_data_free(phba,</div><div class='del'>-						(struct lpfc_dmabufext *)</div><div class='del'>-							dmabuf);</div><div class='add'>+						if (phba-&gt;sli_rev &lt;</div><div class='add'>+						    LPFC_SLI_REV4)</div><div class='add'>+							diag_cmd_data_free(phba,</div><div class='add'>+							(struct lpfc_dmabufext</div><div class='add'>+							 *)dmabuf);</div><div class='ctx'> 						break;</div><div class='ctx'> 					case ELX_LOOPBACK_XRI_SETUP:</div><div class='ctx'> 						if ((phba-&gt;sli_rev ==</div><div class='hunk'>@@ -1000,7 +1002,8 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,</div><div class='ctx'> error_ct_unsol_exit:</div><div class='ctx'> 	if (!list_empty(&amp;head))</div><div class='ctx'> 		list_del(&amp;head);</div><div class='del'>-	if (evt_req_id == SLI_CT_ELX_LOOPBACK)</div><div class='add'>+	if ((phba-&gt;sli_rev &lt; LPFC_SLI_REV4) &amp;&amp;</div><div class='add'>+	    (evt_req_id == SLI_CT_ELX_LOOPBACK))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -1566,7 +1569,7 @@ lpfc_sli3_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct fc_bsg_job *job)</div><div class='ctx'> 	struct diag_mode_set *loopback_mode;</div><div class='ctx'> 	uint32_t link_flags;</div><div class='ctx'> 	uint32_t timeout;</div><div class='del'>-	LPFC_MBOXQ_t *pmboxq;</div><div class='add'>+	LPFC_MBOXQ_t *pmboxq  = NULL;</div><div class='ctx'> 	int mbxstatus = MBX_SUCCESS;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	int rc = 0;</div><div class='hunk'>@@ -1615,7 +1618,6 @@ lpfc_sli3_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct fc_bsg_job *job)</div><div class='ctx'> 				rc = -ETIMEDOUT;</div><div class='ctx'> 				goto loopback_mode_exit;</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='ctx'> 			msleep(10);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1635,7 +1637,9 @@ lpfc_sli3_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct fc_bsg_job *job)</div><div class='ctx'> 		if ((mbxstatus != MBX_SUCCESS) || (pmboxq-&gt;u.mb.mbxStatus))</div><div class='ctx'> 			rc = -ENODEV;</div><div class='ctx'> 		else {</div><div class='add'>+			spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 			phba-&gt;link_flag |= LS_LOOPBACK_MODE;</div><div class='add'>+			spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 			/* wait for the link attention interrupt */</div><div class='ctx'> 			msleep(100);</div><div class='ctx'> </div><div class='hunk'>@@ -1659,7 +1663,7 @@ loopback_mode_exit:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Let SLI layer release mboxq if mbox command completed after timeout.</div><div class='ctx'> 	 */</div><div class='del'>-	if (mbxstatus != MBX_TIMEOUT)</div><div class='add'>+	if (pmboxq &amp;&amp; mbxstatus != MBX_TIMEOUT)</div><div class='ctx'> 		mempool_free(pmboxq, phba-&gt;mbox_mem_pool);</div><div class='ctx'> </div><div class='ctx'> job_error:</div><div class='hunk'>@@ -1700,11 +1704,16 @@ lpfc_sli4_bsg_set_link_diag_state(struct lpfc_hba *phba, uint32_t diag)</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto link_diag_state_set_out;</div><div class='ctx'> 	}</div><div class='add'>+	lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,</div><div class='add'>+			"3128 Set link to diagnostic state:x%x (x%x/x%x)\n",</div><div class='add'>+			diag, phba-&gt;sli4_hba.lnk_info.lnk_tp,</div><div class='add'>+			phba-&gt;sli4_hba.lnk_info.lnk_no);</div><div class='add'>+</div><div class='ctx'> 	link_diag_state = &amp;pmboxq-&gt;u.mqe.un.link_diag_state;</div><div class='ctx'> 	bf_set(lpfc_mbx_set_diag_state_link_num, &amp;link_diag_state-&gt;u.req,</div><div class='del'>-	       phba-&gt;sli4_hba.link_state.number);</div><div class='add'>+	       phba-&gt;sli4_hba.lnk_info.lnk_no);</div><div class='ctx'> 	bf_set(lpfc_mbx_set_diag_state_link_type, &amp;link_diag_state-&gt;u.req,</div><div class='del'>-	       phba-&gt;sli4_hba.link_state.type);</div><div class='add'>+	       phba-&gt;sli4_hba.lnk_info.lnk_tp);</div><div class='ctx'> 	if (diag)</div><div class='ctx'> 		bf_set(lpfc_mbx_set_diag_state_diag,</div><div class='ctx'> 		       &amp;link_diag_state-&gt;u.req, 1);</div><div class='hunk'>@@ -1727,6 +1736,79 @@ link_diag_state_set_out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * lpfc_sli4_bsg_set_internal_loopback - set sli4 internal loopback diagnostic</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function is responsible for issuing a sli4 mailbox command for setting</div><div class='add'>+ * up internal loopback diagnostic.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+lpfc_sli4_bsg_set_internal_loopback(struct lpfc_hba *phba)</div><div class='add'>+{</div><div class='add'>+	LPFC_MBOXQ_t *pmboxq;</div><div class='add'>+	uint32_t req_len, alloc_len;</div><div class='add'>+	struct lpfc_mbx_set_link_diag_loopback *link_diag_loopback;</div><div class='add'>+	int mbxstatus = MBX_SUCCESS, rc = 0;</div><div class='add'>+</div><div class='add'>+	pmboxq = mempool_alloc(phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='add'>+	if (!pmboxq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	req_len = (sizeof(struct lpfc_mbx_set_link_diag_loopback) -</div><div class='add'>+		   sizeof(struct lpfc_sli4_cfg_mhdr));</div><div class='add'>+	alloc_len = lpfc_sli4_config(phba, pmboxq, LPFC_MBOX_SUBSYSTEM_FCOE,</div><div class='add'>+				LPFC_MBOX_OPCODE_FCOE_LINK_DIAG_LOOPBACK,</div><div class='add'>+				req_len, LPFC_SLI4_MBX_EMBED);</div><div class='add'>+	if (alloc_len != req_len) {</div><div class='add'>+		mempool_free(pmboxq, phba-&gt;mbox_mem_pool);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	link_diag_loopback = &amp;pmboxq-&gt;u.mqe.un.link_diag_loopback;</div><div class='add'>+	bf_set(lpfc_mbx_set_diag_state_link_num,</div><div class='add'>+	       &amp;link_diag_loopback-&gt;u.req, phba-&gt;sli4_hba.lnk_info.lnk_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, phba-&gt;sli4_hba.lnk_info.lnk_tp);</div><div class='add'>+	bf_set(lpfc_mbx_set_diag_lpbk_type, &amp;link_diag_loopback-&gt;u.req,</div><div class='add'>+	       LPFC_DIAG_LOOPBACK_TYPE_SERDES);</div><div class='add'>+</div><div class='add'>+	mbxstatus = lpfc_sli_issue_mbox_wait(phba, pmboxq, LPFC_MBOX_TMO);</div><div class='add'>+	if ((mbxstatus != MBX_SUCCESS) || (pmboxq-&gt;u.mb.mbxStatus)) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_WARNING, LOG_LIBDFC,</div><div class='add'>+				"3127 Failed setup loopback mode mailbox "</div><div class='add'>+				"command, rc:x%x, status:x%x\n", mbxstatus,</div><div class='add'>+				pmboxq-&gt;u.mb.mbxStatus);</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	if (pmboxq &amp;&amp; (mbxstatus != MBX_TIMEOUT))</div><div class='add'>+		mempool_free(pmboxq, phba-&gt;mbox_mem_pool);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli4_diag_fcport_reg_setup - setup port registrations for diagnostic</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ *</div><div class='add'>+ * This function set up SLI4 FC port registrations for diagnostic run, which</div><div class='add'>+ * includes all the rpis, vfi, and also vpi.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+lpfc_sli4_diag_fcport_reg_setup(struct lpfc_hba *phba)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (phba-&gt;pport-&gt;fc_flag &amp; FC_VFI_REGISTERED) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_WARNING, LOG_LIBDFC,</div><div class='add'>+				"3136 Port still had vfi registered: "</div><div class='add'>+				"mydid:x%x, fcfi:%d, vfi:%d, vpi:%d\n",</div><div class='add'>+				phba-&gt;pport-&gt;fc_myDID, phba-&gt;fcf.fcfi,</div><div class='add'>+				phba-&gt;sli4_hba.vfi_ids[phba-&gt;pport-&gt;vfi],</div><div class='add'>+				phba-&gt;vpi_ids[phba-&gt;pport-&gt;vpi]);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	rc = lpfc_issue_reg_vfi(phba-&gt;pport);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * lpfc_sli4_bsg_diag_loopback_mode - process an sli4 bsg vendor command</div><div class='ctx'>  * @phba: Pointer to HBA context object.</div><div class='ctx'>  * @job: LPFC_BSG_VENDOR_DIAG_MODE</div><div class='hunk'>@@ -1738,10 +1820,8 @@ static int</div><div class='ctx'> lpfc_sli4_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct fc_bsg_job *job)</div><div class='ctx'> {</div><div class='ctx'> 	struct diag_mode_set *loopback_mode;</div><div class='del'>-	uint32_t link_flags, timeout, req_len, alloc_len;</div><div class='del'>-	struct lpfc_mbx_set_link_diag_loopback *link_diag_loopback;</div><div class='del'>-	LPFC_MBOXQ_t *pmboxq = NULL;</div><div class='del'>-	int mbxstatus = MBX_SUCCESS, i, rc = 0;</div><div class='add'>+	uint32_t link_flags, timeout;</div><div class='add'>+	int i, rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* no data to return just the return code */</div><div class='ctx'> 	job-&gt;reply-&gt;reply_payload_rcv_len = 0;</div><div class='hunk'>@@ -1762,65 +1842,100 @@ lpfc_sli4_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct fc_bsg_job *job)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto job_error;</div><div class='ctx'> </div><div class='add'>+	/* indicate we are in loobpack diagnostic mode */</div><div class='add'>+	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+	phba-&gt;link_flag |= LS_LOOPBACK_MODE;</div><div class='add'>+	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+</div><div class='add'>+	/* reset port to start frome scratch */</div><div class='add'>+	rc = lpfc_selective_reset(phba);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto job_error;</div><div class='add'>+</div><div class='ctx'> 	/* bring the link to diagnostic mode */</div><div class='add'>+	lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,</div><div class='add'>+			"3129 Bring link to diagnostic state.\n");</div><div class='ctx'> 	loopback_mode = (struct diag_mode_set *)</div><div class='ctx'> 		job-&gt;request-&gt;rqst_data.h_vendor.vendor_cmd;</div><div class='ctx'> 	link_flags = loopback_mode-&gt;type;</div><div class='ctx'> 	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='del'>-	if (rc)</div><div class='add'>+	if (rc) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_WARNING, LOG_LIBDFC,</div><div class='add'>+				"3130 Failed to bring link to diagnostic "</div><div class='add'>+				"state, rc:x%x\n", rc);</div><div class='ctx'> 		goto loopback_mode_exit;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* wait for link down before proceeding */</div><div class='ctx'> 	i = 0;</div><div class='ctx'> 	while (phba-&gt;link_state != LPFC_LINK_DOWN) {</div><div class='ctx'> 		if (i++ &gt; timeout) {</div><div class='ctx'> 			rc = -ETIMEDOUT;</div><div class='add'>+			lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,</div><div class='add'>+					"3131 Timeout waiting for link to "</div><div class='add'>+					"diagnostic mode, timeout:%d ms\n",</div><div class='add'>+					timeout * 10);</div><div class='ctx'> 			goto loopback_mode_exit;</div><div class='ctx'> 		}</div><div class='ctx'> 		msleep(10);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* set up loopback mode */</div><div class='del'>-	pmboxq = mempool_alloc(phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='del'>-	if (!pmboxq) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto loopback_mode_exit;</div><div class='del'>-	}</div><div class='del'>-	req_len = (sizeof(struct lpfc_mbx_set_link_diag_loopback) -</div><div class='del'>-		   sizeof(struct lpfc_sli4_cfg_mhdr));</div><div class='del'>-	alloc_len = lpfc_sli4_config(phba, pmboxq, LPFC_MBOX_SUBSYSTEM_FCOE,</div><div class='del'>-				LPFC_MBOX_OPCODE_FCOE_LINK_DIAG_LOOPBACK,</div><div class='del'>-				req_len, LPFC_SLI4_MBX_EMBED);</div><div class='del'>-	if (alloc_len != req_len) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='add'>+	lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,</div><div class='add'>+			"3132 Set up loopback mode:x%x\n", link_flags);</div><div class='add'>+</div><div class='add'>+	if (link_flags == INTERNAL_LOOP_BACK)</div><div class='add'>+		rc = lpfc_sli4_bsg_set_internal_loopback(phba);</div><div class='add'>+	else if (link_flags == EXTERNAL_LOOP_BACK)</div><div class='add'>+		rc = lpfc_hba_init_link_fc_topology(phba,</div><div class='add'>+						    FLAGS_TOPOLOGY_MODE_PT_PT,</div><div class='add'>+						    MBX_NOWAIT);</div><div class='add'>+	else {</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_LIBDFC,</div><div class='add'>+				"3141 Loopback mode:x%x not supported\n",</div><div class='add'>+				link_flags);</div><div class='ctx'> 		goto loopback_mode_exit;</div><div class='ctx'> 	}</div><div class='del'>-	link_diag_loopback = &amp;pmboxq-&gt;u.mqe.un.link_diag_loopback;</div><div class='del'>-	bf_set(lpfc_mbx_set_diag_state_link_num,</div><div class='del'>-	       &amp;link_diag_loopback-&gt;u.req, phba-&gt;sli4_hba.link_state.number);</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.link_state.type);</div><div class='del'>-	if (link_flags == INTERNAL_LOOP_BACK)</div><div class='del'>-		bf_set(lpfc_mbx_set_diag_lpbk_type,</div><div class='del'>-		       &amp;link_diag_loopback-&gt;u.req,</div><div class='del'>-		       LPFC_DIAG_LOOPBACK_TYPE_INTERNAL);</div><div class='del'>-	else</div><div class='del'>-		bf_set(lpfc_mbx_set_diag_lpbk_type,</div><div class='del'>-		       &amp;link_diag_loopback-&gt;u.req,</div><div class='del'>-		       LPFC_DIAG_LOOPBACK_TYPE_EXTERNAL);</div><div class='ctx'> </div><div class='del'>-	mbxstatus = lpfc_sli_issue_mbox_wait(phba, pmboxq, LPFC_MBOX_TMO);</div><div class='del'>-	if ((mbxstatus != MBX_SUCCESS) || (pmboxq-&gt;u.mb.mbxStatus))</div><div class='del'>-		rc = -ENODEV;</div><div class='del'>-	else {</div><div class='del'>-		phba-&gt;link_flag |= LS_LOOPBACK_MODE;</div><div class='add'>+	if (!rc) {</div><div class='ctx'> 		/* wait for the link attention interrupt */</div><div class='ctx'> 		msleep(100);</div><div class='ctx'> 		i = 0;</div><div class='add'>+		while (phba-&gt;link_state &lt; LPFC_LINK_UP) {</div><div class='add'>+			if (i++ &gt; timeout) {</div><div class='add'>+				rc = -ETIMEDOUT;</div><div class='add'>+				lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,</div><div class='add'>+					"3137 Timeout waiting for link up "</div><div class='add'>+					"in loopback mode, timeout:%d ms\n",</div><div class='add'>+					timeout * 10);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			msleep(10);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* port resource registration setup for loopback diagnostic */</div><div class='add'>+	if (!rc) {</div><div class='add'>+		/* set up a none zero myDID for loopback test */</div><div class='add'>+		phba-&gt;pport-&gt;fc_myDID = 1;</div><div class='add'>+		rc = lpfc_sli4_diag_fcport_reg_setup(phba);</div><div class='add'>+	} else</div><div class='add'>+		goto loopback_mode_exit;</div><div class='add'>+</div><div class='add'>+	if (!rc) {</div><div class='add'>+		/* wait for the port ready */</div><div class='add'>+		msleep(100);</div><div class='add'>+		i = 0;</div><div class='ctx'> 		while (phba-&gt;link_state != LPFC_HBA_READY) {</div><div class='ctx'> 			if (i++ &gt; timeout) {</div><div class='ctx'> 				rc = -ETIMEDOUT;</div><div class='add'>+				lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,</div><div class='add'>+					"3133 Timeout waiting for port "</div><div class='add'>+					"loopback mode ready, timeout:%d ms\n",</div><div class='add'>+					timeout * 10);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			msleep(10);</div><div class='hunk'>@@ -1828,14 +1943,14 @@ lpfc_sli4_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct fc_bsg_job *job)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> loopback_mode_exit:</div><div class='add'>+	/* clear loopback diagnostic mode */</div><div class='add'>+	if (rc) {</div><div class='add'>+		spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+		phba-&gt;link_flag &amp;= ~LS_LOOPBACK_MODE;</div><div class='add'>+		spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+	}</div><div class='ctx'> 	lpfc_bsg_diag_mode_exit(phba);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Let SLI layer release mboxq if mbox command completed after timeout.</div><div class='del'>-	 */</div><div class='del'>-	if (pmboxq &amp;&amp; (mbxstatus != MBX_TIMEOUT))</div><div class='del'>-		mempool_free(pmboxq, phba-&gt;mbox_mem_pool);</div><div class='del'>-</div><div class='ctx'> job_error:</div><div class='ctx'> 	/* make error code available to userspace */</div><div class='ctx'> 	job-&gt;reply-&gt;result = rc;</div><div class='hunk'>@@ -1879,7 +1994,6 @@ lpfc_bsg_diag_loopback_mode(struct fc_bsg_job *job)</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1895,7 +2009,9 @@ lpfc_sli4_bsg_diag_mode_end(struct fc_bsg_job *job)</div><div class='ctx'> 	struct Scsi_Host *shost;</div><div class='ctx'> 	struct lpfc_vport *vport;</div><div class='ctx'> 	struct lpfc_hba *phba;</div><div class='del'>-	int rc;</div><div class='add'>+	struct diag_mode_set *loopback_mode_end_cmd;</div><div class='add'>+	uint32_t timeout;</div><div class='add'>+	int rc, i;</div><div class='ctx'> </div><div class='ctx'> 	shost = job-&gt;shost;</div><div class='ctx'> 	if (!shost)</div><div class='hunk'>@@ -1913,11 +2029,47 @@ lpfc_sli4_bsg_diag_mode_end(struct fc_bsg_job *job)</div><div class='ctx'> 	    LPFC_SLI_INTF_IF_TYPE_2)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='add'>+	/* clear loopback diagnostic mode */</div><div class='add'>+	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+	phba-&gt;link_flag &amp;= ~LS_LOOPBACK_MODE;</div><div class='add'>+	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+	loopback_mode_end_cmd = (struct diag_mode_set *)</div><div class='add'>+			job-&gt;request-&gt;rqst_data.h_vendor.vendor_cmd;</div><div class='add'>+	timeout = loopback_mode_end_cmd-&gt;timeout * 100;</div><div class='add'>+</div><div class='ctx'> 	rc = lpfc_sli4_bsg_set_link_diag_state(phba, 0);</div><div class='add'>+	if (rc) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_WARNING, LOG_LIBDFC,</div><div class='add'>+				"3139 Failed to bring link to diagnostic "</div><div class='add'>+				"state, rc:x%x\n", rc);</div><div class='add'>+		goto loopback_mode_end_exit;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!rc)</div><div class='del'>-		rc = phba-&gt;lpfc_hba_init_link(phba, MBX_NOWAIT);</div><div class='add'>+	/* wait for link down before proceeding */</div><div class='add'>+	i = 0;</div><div class='add'>+	while (phba-&gt;link_state != LPFC_LINK_DOWN) {</div><div class='add'>+		if (i++ &gt; timeout) {</div><div class='add'>+			rc = -ETIMEDOUT;</div><div class='add'>+			lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,</div><div class='add'>+					"3140 Timeout waiting for link to "</div><div class='add'>+					"diagnostic mode_end, timeout:%d ms\n",</div><div class='add'>+					timeout * 10);</div><div class='add'>+			/* there is nothing much we can do here */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		msleep(10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* reset port resource registrations */</div><div class='add'>+	rc = lpfc_selective_reset(phba);</div><div class='add'>+	phba-&gt;pport-&gt;fc_myDID = 0;</div><div class='ctx'> </div><div class='add'>+loopback_mode_end_exit:</div><div class='add'>+	/* make return code available to userspace */</div><div class='add'>+	job-&gt;reply-&gt;result = rc;</div><div class='add'>+	/* complete the job back to userspace if no error */</div><div class='add'>+	if (rc == 0)</div><div class='add'>+		job-&gt;job_done(job);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2012,9 +2164,9 @@ lpfc_sli4_bsg_link_diag_test(struct fc_bsg_job *job)</div><div class='ctx'> 	}</div><div class='ctx'> 	run_link_diag_test = &amp;pmboxq-&gt;u.mqe.un.link_diag_test;</div><div class='ctx'> 	bf_set(lpfc_mbx_run_diag_test_link_num, &amp;run_link_diag_test-&gt;u.req,</div><div class='del'>-	       phba-&gt;sli4_hba.link_state.number);</div><div class='add'>+	       phba-&gt;sli4_hba.lnk_info.lnk_no);</div><div class='ctx'> 	bf_set(lpfc_mbx_run_diag_test_link_type, &amp;run_link_diag_test-&gt;u.req,</div><div class='del'>-	       phba-&gt;sli4_hba.link_state.type);</div><div class='add'>+	       phba-&gt;sli4_hba.lnk_info.lnk_tp);</div><div class='ctx'> 	bf_set(lpfc_mbx_run_diag_test_test_id, &amp;run_link_diag_test-&gt;u.req,</div><div class='ctx'> 	       link_diag_test_cmd-&gt;test_id);</div><div class='ctx'> 	bf_set(lpfc_mbx_run_diag_test_loops, &amp;run_link_diag_test-&gt;u.req,</div><div class='hunk'>@@ -2091,10 +2243,18 @@ static int lpfcdiag_loop_self_reg(struct lpfc_hba *phba, uint16_t *rpi)</div><div class='ctx'> 	if (!mbox)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (phba-&gt;sli_rev == LPFC_SLI_REV4)</div><div class='add'>+	if (phba-&gt;sli_rev &lt; LPFC_SLI_REV4)</div><div class='add'>+		status = lpfc_reg_rpi(phba, 0, phba-&gt;pport-&gt;fc_myDID,</div><div class='add'>+				(uint8_t *)&amp;phba-&gt;pport-&gt;fc_sparam,</div><div class='add'>+				mbox, *rpi);</div><div class='add'>+	else {</div><div class='ctx'> 		*rpi = lpfc_sli4_alloc_rpi(phba);</div><div class='del'>-	status = lpfc_reg_rpi(phba, 0, phba-&gt;pport-&gt;fc_myDID,</div><div class='del'>-			      (uint8_t *)&amp;phba-&gt;pport-&gt;fc_sparam, mbox, *rpi);</div><div class='add'>+		status = lpfc_reg_rpi(phba, phba-&gt;pport-&gt;vpi,</div><div class='add'>+				phba-&gt;pport-&gt;fc_myDID,</div><div class='add'>+				(uint8_t *)&amp;phba-&gt;pport-&gt;fc_sparam,</div><div class='add'>+				mbox, *rpi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (status) {</div><div class='ctx'> 		mempool_free(mbox, phba-&gt;mbox_mem_pool);</div><div class='ctx'> 		if (phba-&gt;sli_rev == LPFC_SLI_REV4)</div><div class='hunk'>@@ -2117,7 +2277,8 @@ static int lpfcdiag_loop_self_reg(struct lpfc_hba *phba, uint16_t *rpi)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*rpi = mbox-&gt;u.mb.un.varWords[0];</div><div class='add'>+	if (phba-&gt;sli_rev &lt; LPFC_SLI_REV4)</div><div class='add'>+		*rpi = mbox-&gt;u.mb.un.varWords[0];</div><div class='ctx'> </div><div class='ctx'> 	lpfc_mbuf_free(phba, dmabuff-&gt;virt, dmabuff-&gt;phys);</div><div class='ctx'> 	kfree(dmabuff);</div><div class='hunk'>@@ -2142,7 +2303,12 @@ static int lpfcdiag_loop_self_unreg(struct lpfc_hba *phba, uint16_t rpi)</div><div class='ctx'> 	if (mbox == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	lpfc_unreg_login(phba, 0, rpi, mbox);</div><div class='add'>+	if (phba-&gt;sli_rev &lt; LPFC_SLI_REV4)</div><div class='add'>+		lpfc_unreg_login(phba, 0, rpi, mbox);</div><div class='add'>+	else</div><div class='add'>+		lpfc_unreg_login(phba, phba-&gt;pport-&gt;vpi,</div><div class='add'>+				 phba-&gt;sli4_hba.rpi_ids[rpi], mbox);</div><div class='add'>+</div><div class='ctx'> 	status = lpfc_sli_issue_mbox_wait(phba, mbox, LPFC_MBOX_TMO);</div><div class='ctx'> </div><div class='ctx'> 	if ((status != MBX_SUCCESS) || (mbox-&gt;u.mb.mbxStatus)) {</div><div class='hunk'>@@ -2630,15 +2796,15 @@ lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job)</div><div class='ctx'> 	uint32_t full_size;</div><div class='ctx'> 	size_t segment_len = 0, segment_offset = 0, current_offset = 0;</div><div class='ctx'> 	uint16_t rpi = 0;</div><div class='del'>-	struct lpfc_iocbq *cmdiocbq, *rspiocbq;</div><div class='del'>-	IOCB_t *cmd, *rsp;</div><div class='add'>+	struct lpfc_iocbq *cmdiocbq, *rspiocbq = NULL;</div><div class='add'>+	IOCB_t *cmd, *rsp = NULL;</div><div class='ctx'> 	struct lpfc_sli_ct_request *ctreq;</div><div class='ctx'> 	struct lpfc_dmabuf *txbmp;</div><div class='ctx'> 	struct ulp_bde64 *txbpl = NULL;</div><div class='ctx'> 	struct lpfc_dmabufext *txbuffer = NULL;</div><div class='ctx'> 	struct list_head head;</div><div class='ctx'> 	struct lpfc_dmabuf  *curr;</div><div class='del'>-	uint16_t txxri, rxxri;</div><div class='add'>+	uint16_t txxri = 0, rxxri;</div><div class='ctx'> 	uint32_t num_bde;</div><div class='ctx'> 	uint8_t *ptr = NULL, *rx_databuf = NULL;</div><div class='ctx'> 	int rc = 0;</div><div class='hunk'>@@ -2665,7 +2831,6 @@ lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job)</div><div class='ctx'> 		rc = -EINVAL;</div><div class='ctx'> 		goto loopback_test_exit;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	diag_mode = (struct diag_mode_test *)</div><div class='ctx'> 		job-&gt;request-&gt;rqst_data.h_vendor.vendor_cmd;</div><div class='ctx'> </div><div class='hunk'>@@ -2720,18 +2885,19 @@ lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto loopback_test_exit;</div><div class='ctx'> </div><div class='del'>-	rc = lpfcdiag_loop_get_xri(phba, rpi, &amp;txxri, &amp;rxxri);</div><div class='del'>-	if (rc) {</div><div class='del'>-		lpfcdiag_loop_self_unreg(phba, rpi);</div><div class='del'>-		goto loopback_test_exit;</div><div class='del'>-	}</div><div class='add'>+	if (phba-&gt;sli_rev &lt; LPFC_SLI_REV4) {</div><div class='add'>+		rc = lpfcdiag_loop_get_xri(phba, rpi, &amp;txxri, &amp;rxxri);</div><div class='add'>+		if (rc) {</div><div class='add'>+			lpfcdiag_loop_self_unreg(phba, rpi);</div><div class='add'>+			goto loopback_test_exit;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	rc = lpfcdiag_loop_post_rxbufs(phba, rxxri, full_size);</div><div class='del'>-	if (rc) {</div><div class='del'>-		lpfcdiag_loop_self_unreg(phba, rpi);</div><div class='del'>-		goto loopback_test_exit;</div><div class='add'>+		rc = lpfcdiag_loop_post_rxbufs(phba, rxxri, full_size);</div><div class='add'>+		if (rc) {</div><div class='add'>+			lpfcdiag_loop_self_unreg(phba, rpi);</div><div class='add'>+			goto loopback_test_exit;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	evt = lpfc_bsg_event_new(FC_REG_CT_EVENT, current-&gt;pid,</div><div class='ctx'> 				SLI_CT_ELX_LOOPBACK);</div><div class='ctx'> 	if (!evt) {</div><div class='hunk'>@@ -2746,7 +2912,8 @@ lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;phba-&gt;ct_ev_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	cmdiocbq = lpfc_sli_get_iocbq(phba);</div><div class='del'>-	rspiocbq = lpfc_sli_get_iocbq(phba);</div><div class='add'>+	if (phba-&gt;sli_rev &lt; LPFC_SLI_REV4)</div><div class='add'>+		rspiocbq = lpfc_sli_get_iocbq(phba);</div><div class='ctx'> 	txbmp = kmalloc(sizeof(struct lpfc_dmabuf), GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (txbmp) {</div><div class='hunk'>@@ -2759,14 +2926,18 @@ lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!cmdiocbq || !rspiocbq || !txbmp || !txbpl || !txbuffer ||</div><div class='del'>-		!txbmp-&gt;virt) {</div><div class='add'>+	if (!cmdiocbq || !txbmp || !txbpl || !txbuffer || !txbmp-&gt;virt) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err_loopback_test_exit;</div><div class='add'>+	}</div><div class='add'>+	if ((phba-&gt;sli_rev &lt; LPFC_SLI_REV4) &amp;&amp; !rspiocbq) {</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto err_loopback_test_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cmd = &amp;cmdiocbq-&gt;iocb;</div><div class='del'>-	rsp = &amp;rspiocbq-&gt;iocb;</div><div class='add'>+	if (phba-&gt;sli_rev &lt; LPFC_SLI_REV4)</div><div class='add'>+		rsp = &amp;rspiocbq-&gt;iocb;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;head);</div><div class='ctx'> 	list_add_tail(&amp;head, &amp;txbuffer-&gt;dma.list);</div><div class='hunk'>@@ -2796,7 +2967,6 @@ lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job)</div><div class='ctx'> 	list_del(&amp;head);</div><div class='ctx'> </div><div class='ctx'> 	/* Build the XMIT_SEQUENCE iocb */</div><div class='del'>-</div><div class='ctx'> 	num_bde = (uint32_t)txbuffer-&gt;flag;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;un.xseq64.bdl.addrHigh = putPaddrHigh(txbmp-&gt;phys);</div><div class='hunk'>@@ -2813,16 +2983,27 @@ lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job)</div><div class='ctx'> 	cmd-&gt;ulpBdeCount = 1;</div><div class='ctx'> 	cmd-&gt;ulpLe = 1;</div><div class='ctx'> 	cmd-&gt;ulpClass = CLASS3;</div><div class='del'>-	cmd-&gt;ulpContext = txxri;</div><div class='ctx'> </div><div class='add'>+	if (phba-&gt;sli_rev &lt; LPFC_SLI_REV4) {</div><div class='add'>+		cmd-&gt;ulpContext = txxri;</div><div class='add'>+	} else {</div><div class='add'>+		cmd-&gt;un.xseq64.bdl.ulpIoTag32 = 0;</div><div class='add'>+		cmd-&gt;un.ulpWord[3] = phba-&gt;sli4_hba.rpi_ids[rpi];</div><div class='add'>+		cmdiocbq-&gt;context3 = txbmp;</div><div class='add'>+		cmdiocbq-&gt;sli4_xritag = NO_XRI;</div><div class='add'>+		cmd-&gt;unsli3.rcvsli3.ox_id = 0xffff;</div><div class='add'>+	}</div><div class='ctx'> 	cmdiocbq-&gt;iocb_flag |= LPFC_IO_LIBDFC;</div><div class='ctx'> 	cmdiocbq-&gt;vport = phba-&gt;pport;</div><div class='del'>-</div><div class='ctx'> 	iocb_stat = lpfc_sli_issue_iocb_wait(phba, LPFC_ELS_RING, cmdiocbq,</div><div class='ctx'> 					     rspiocbq, (phba-&gt;fc_ratov * 2) +</div><div class='ctx'> 					     LPFC_DRVR_TIMEOUT);</div><div class='ctx'> </div><div class='del'>-	if ((iocb_stat != IOCB_SUCCESS) || (rsp-&gt;ulpStatus != IOCB_SUCCESS)) {</div><div class='add'>+	if ((iocb_stat != IOCB_SUCCESS) || ((phba-&gt;sli_rev &lt; LPFC_SLI_REV4) &amp;&amp;</div><div class='add'>+					   (rsp-&gt;ulpStatus != IOCB_SUCCESS))) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_LIBDFC,</div><div class='add'>+				"3126 Failed loopback test issue iocb: "</div><div class='add'>+				"iocb_stat:x%x\n", iocb_stat);</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		goto err_loopback_test_exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2832,9 +3013,12 @@ lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job)</div><div class='ctx'> 		evt-&gt;wq, !list_empty(&amp;evt-&gt;events_to_see),</div><div class='ctx'> 		((phba-&gt;fc_ratov * 2) + LPFC_DRVR_TIMEOUT) * HZ);</div><div class='ctx'> 	evt-&gt;waiting = 0;</div><div class='del'>-	if (list_empty(&amp;evt-&gt;events_to_see))</div><div class='add'>+	if (list_empty(&amp;evt-&gt;events_to_see)) {</div><div class='ctx'> 		rc = (time_left) ? -EINTR : -ETIMEDOUT;</div><div class='del'>-	else {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_LIBDFC,</div><div class='add'>+				"3125 Not receiving unsolicited event, "</div><div class='add'>+				"rc:x%x\n", rc);</div><div class='add'>+	} else {</div><div class='ctx'> 		spin_lock_irqsave(&amp;phba-&gt;ct_ev_lock, flags);</div><div class='ctx'> 		list_move(evt-&gt;events_to_see.prev, &amp;evt-&gt;events_to_get);</div><div class='ctx'> 		evdat = list_entry(evt-&gt;events_to_get.prev,</div><div class='hunk'>@@ -2891,7 +3075,7 @@ loopback_test_exit:</div><div class='ctx'> 	job-&gt;reply-&gt;result = rc;</div><div class='ctx'> 	job-&gt;dd_data = NULL;</div><div class='ctx'> 	/* complete the job back to userspace if no error */</div><div class='del'>-	if (rc == 0)</div><div class='add'>+	if (rc == IOCB_SUCCESS)</div><div class='ctx'> 		job-&gt;job_done(job);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -3078,7 +3262,9 @@ static int lpfc_bsg_check_cmd_access(struct lpfc_hba *phba,</div><div class='ctx'> 			&amp;&amp; (mb-&gt;un.varWords[1] == 1)) {</div><div class='ctx'> 			phba-&gt;wait_4_mlo_maint_flg = 1;</div><div class='ctx'> 		} else if (mb-&gt;un.varWords[0] == SETVAR_MLORST) {</div><div class='add'>+			spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 			phba-&gt;link_flag &amp;= ~LS_LOOPBACK_MODE;</div><div class='add'>+			spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 			phba-&gt;fc_topology = LPFC_TOPOLOGY_PT_PT;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -3140,6 +3326,9 @@ lpfc_bsg_issue_mbox_ext_handle_job(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	uint32_t size;</div><div class='ctx'> 	int rc = 0;</div><div class='add'>+	struct lpfc_dmabuf *dmabuf;</div><div class='add'>+	struct lpfc_sli_config_mbox *sli_cfg_mbx;</div><div class='add'>+	uint8_t *pmbx;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;phba-&gt;ct_ev_lock, flags);</div><div class='ctx'> 	dd_data = pmboxq-&gt;context1;</div><div class='hunk'>@@ -3156,7 +3345,19 @@ lpfc_bsg_issue_mbox_ext_handle_job(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq)</div><div class='ctx'> 	 */</div><div class='ctx'> 	pmb = (uint8_t *)&amp;pmboxq-&gt;u.mb;</div><div class='ctx'> 	pmb_buf = (uint8_t *)dd_data-&gt;context_un.mbox.mb;</div><div class='add'>+	/* Copy the byte swapped response mailbox back to the user */</div><div class='ctx'> 	memcpy(pmb_buf, pmb, sizeof(MAILBOX_t));</div><div class='add'>+	/* if there is any non-embedded extended data copy that too */</div><div class='add'>+	dmabuf = phba-&gt;mbox_ext_buf_ctx.mbx_dmabuf;</div><div class='add'>+	sli_cfg_mbx = (struct lpfc_sli_config_mbox *)dmabuf-&gt;virt;</div><div class='add'>+	if (!bsg_bf_get(lpfc_mbox_hdr_emb,</div><div class='add'>+	    &amp;sli_cfg_mbx-&gt;un.sli_config_emb0_subsys.sli_config_hdr)) {</div><div class='add'>+		pmbx = (uint8_t *)dmabuf-&gt;virt;</div><div class='add'>+		/* byte swap the extended data following the mailbox command */</div><div class='add'>+		lpfc_sli_pcimem_bcopy(&amp;pmbx[sizeof(MAILBOX_t)],</div><div class='add'>+			&amp;pmbx[sizeof(MAILBOX_t)],</div><div class='add'>+			sli_cfg_mbx-&gt;un.sli_config_emb0_subsys.mse[0].buf_len);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	job = dd_data-&gt;context_un.mbox.set_job;</div><div class='ctx'> 	if (job) {</div><div class='hunk'>@@ -3519,6 +3720,18 @@ lpfc_bsg_sli_cfg_read_cmd_ext(struct lpfc_hba *phba, struct fc_bsg_job *job,</div><div class='ctx'> 	/* state change */</div><div class='ctx'> 	phba-&gt;mbox_ext_buf_ctx.state = LPFC_BSG_MBOX_PORT;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Non-embedded mailbox subcommand data gets byte swapped here because</div><div class='add'>+	 * the lower level driver code only does the first 64 mailbox words.</div><div class='add'>+	 */</div><div class='add'>+	if ((!bsg_bf_get(lpfc_mbox_hdr_emb,</div><div class='add'>+	    &amp;sli_cfg_mbx-&gt;un.sli_config_emb0_subsys.sli_config_hdr)) &amp;&amp;</div><div class='add'>+		(nemb_tp == nemb_mse))</div><div class='add'>+		lpfc_sli_pcimem_bcopy(&amp;pmbx[sizeof(MAILBOX_t)],</div><div class='add'>+			&amp;pmbx[sizeof(MAILBOX_t)],</div><div class='add'>+				sli_cfg_mbx-&gt;un.sli_config_emb0_subsys.</div><div class='add'>+					mse[0].buf_len);</div><div class='add'>+</div><div class='ctx'> 	rc = lpfc_sli_issue_mbox(phba, pmboxq, MBX_NOWAIT);</div><div class='ctx'> 	if ((rc == MBX_SUCCESS) || (rc == MBX_BUSY)) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,</div><div class='hunk'>@@ -3575,7 +3788,7 @@ lpfc_bsg_sli_cfg_write_cmd_ext(struct lpfc_hba *phba, struct fc_bsg_job *job,</div><div class='ctx'> 			&amp;sli_cfg_mbx-&gt;un.sli_config_emb0_subsys.sli_config_hdr);</div><div class='ctx'> 		if (ext_buf_cnt &gt; LPFC_MBX_SLI_CONFIG_MAX_MSE) {</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_LIBDFC,</div><div class='del'>-					"2953 Handled SLI_CONFIG(mse) wr, "</div><div class='add'>+					"2953 Failed SLI_CONFIG(mse) wr, "</div><div class='ctx'> 					"ext_buf_cnt(%d) out of range(%d)\n",</div><div class='ctx'> 					ext_buf_cnt,</div><div class='ctx'> 					LPFC_MBX_SLI_CONFIG_MAX_MSE);</div><div class='hunk'>@@ -3593,7 +3806,7 @@ lpfc_bsg_sli_cfg_write_cmd_ext(struct lpfc_hba *phba, struct fc_bsg_job *job,</div><div class='ctx'> 		ext_buf_cnt = sli_cfg_mbx-&gt;un.sli_config_emb1_subsys.hbd_count;</div><div class='ctx'> 		if (ext_buf_cnt &gt; LPFC_MBX_SLI_CONFIG_MAX_HBD) {</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_LIBDFC,</div><div class='del'>-					"2954 Handled SLI_CONFIG(hbd) wr, "</div><div class='add'>+					"2954 Failed SLI_CONFIG(hbd) wr, "</div><div class='ctx'> 					"ext_buf_cnt(%d) out of range(%d)\n",</div><div class='ctx'> 					ext_buf_cnt,</div><div class='ctx'> 					LPFC_MBX_SLI_CONFIG_MAX_HBD);</div><div class='hunk'>@@ -3687,6 +3900,7 @@ lpfc_bsg_sli_cfg_write_cmd_ext(struct lpfc_hba *phba, struct fc_bsg_job *job,</div><div class='ctx'> 				"2956 Failed to issue SLI_CONFIG ext-buffer "</div><div class='ctx'> 				"maibox command, rc:x%x\n", rc);</div><div class='ctx'> 		rc = -EPIPE;</div><div class='add'>+		goto job_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* wait for additoinal external buffers */</div><div class='hunk'>@@ -3721,7 +3935,7 @@ lpfc_bsg_handle_sli_cfg_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job,</div><div class='ctx'> 	uint32_t opcode;</div><div class='ctx'> 	int rc = SLI_CONFIG_NOT_HANDLED;</div><div class='ctx'> </div><div class='del'>-	/* state change */</div><div class='add'>+	/* state change on new multi-buffer pass-through mailbox command */</div><div class='ctx'> 	phba-&gt;mbox_ext_buf_ctx.state = LPFC_BSG_MBOX_HOST;</div><div class='ctx'> </div><div class='ctx'> 	sli_cfg_mbx = (struct lpfc_sli_config_mbox *)dmabuf-&gt;virt;</div><div class='hunk'>@@ -3752,18 +3966,36 @@ lpfc_bsg_handle_sli_cfg_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job,</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='ctx'> 				lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,</div><div class='del'>-						"2959 Not handled SLI_CONFIG "</div><div class='add'>+						"2959 Reject SLI_CONFIG "</div><div class='ctx'> 						"subsys_fcoe, opcode:x%x\n",</div><div class='ctx'> 						opcode);</div><div class='del'>-				rc = SLI_CONFIG_NOT_HANDLED;</div><div class='add'>+				rc = -EPERM;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else if (subsys == SLI_CONFIG_SUBSYS_COMN) {</div><div class='add'>+			switch (opcode) {</div><div class='add'>+			case COMN_OPCODE_GET_CNTL_ADDL_ATTRIBUTES:</div><div class='add'>+				lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,</div><div class='add'>+						"3106 Handled SLI_CONFIG "</div><div class='add'>+						"subsys_fcoe, opcode:x%x\n",</div><div class='add'>+						opcode);</div><div class='add'>+				rc = lpfc_bsg_sli_cfg_read_cmd_ext(phba, job,</div><div class='add'>+							nemb_mse, dmabuf);</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,</div><div class='add'>+						"3107 Reject SLI_CONFIG "</div><div class='add'>+						"subsys_fcoe, opcode:x%x\n",</div><div class='add'>+						opcode);</div><div class='add'>+				rc = -EPERM;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,</div><div class='del'>-					"2977 Handled SLI_CONFIG "</div><div class='add'>+					"2977 Reject SLI_CONFIG "</div><div class='ctx'> 					"subsys:x%d, opcode:x%x\n",</div><div class='ctx'> 					subsys, opcode);</div><div class='del'>-			rc = SLI_CONFIG_NOT_HANDLED;</div><div class='add'>+			rc = -EPERM;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		subsys = bsg_bf_get(lpfc_emb1_subcmnd_subsys,</div><div class='hunk'>@@ -3799,12 +4031,17 @@ lpfc_bsg_handle_sli_cfg_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job,</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,</div><div class='del'>-					"2978 Handled SLI_CONFIG "</div><div class='add'>+					"2978 Not handled SLI_CONFIG "</div><div class='ctx'> 					"subsys:x%d, opcode:x%x\n",</div><div class='ctx'> 					subsys, opcode);</div><div class='ctx'> 			rc = SLI_CONFIG_NOT_HANDLED;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* state reset on not handled new multi-buffer mailbox command */</div><div class='add'>+	if (rc != SLI_CONFIG_HANDLED)</div><div class='add'>+		phba-&gt;mbox_ext_buf_ctx.state = LPFC_BSG_MBOX_IDLE;</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4262,11 +4499,8 @@ lpfc_bsg_issue_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job,</div><div class='ctx'> </div><div class='ctx'> 	/* extended mailbox commands will need an extended buffer */</div><div class='ctx'> 	if (mbox_req-&gt;inExtWLen || mbox_req-&gt;outExtWLen) {</div><div class='del'>-		/* any data for the device? */</div><div class='del'>-		if (mbox_req-&gt;inExtWLen) {</div><div class='del'>-			from = pmbx;</div><div class='del'>-			ext = from + sizeof(MAILBOX_t);</div><div class='del'>-		}</div><div class='add'>+		from = pmbx;</div><div class='add'>+		ext = from + sizeof(MAILBOX_t);</div><div class='ctx'> 		pmboxq-&gt;context2 = ext;</div><div class='ctx'> 		pmboxq-&gt;in_ext_byte_len =</div><div class='ctx'> 			mbox_req-&gt;inExtWLen * sizeof(uint32_t);</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_bsg.h b/drivers/scsi/lpfc/lpfc_bsg.h<br/>index c8c2b47ea886..edfe61fc52b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_bsg.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_bsg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_bsg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_bsg.h</a></div><div class='hunk'>@@ -96,7 +96,7 @@ struct get_mgmt_rev {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MANAGEMENT_MAJOR_REV   1</div><div class='del'>-#define MANAGEMENT_MINOR_REV   0</div><div class='add'>+#define MANAGEMENT_MINOR_REV   1</div><div class='ctx'> </div><div class='ctx'> /* the MgmtRevInfo structure */</div><div class='ctx'> struct MgmtRevInfo {</div><div class='hunk'>@@ -248,6 +248,7 @@ struct lpfc_sli_config_emb1_subsys {</div><div class='ctx'> #define COMN_OPCODE_WRITE_OBJECT	0xAC</div><div class='ctx'> #define COMN_OPCODE_READ_OBJECT_LIST	0xAD</div><div class='ctx'> #define COMN_OPCODE_DELETE_OBJECT	0xAE</div><div class='add'>+#define COMN_OPCODE_GET_CNTL_ADDL_ATTRIBUTES	0x79</div><div class='ctx'> 	uint32_t timeout;</div><div class='ctx'> 	uint32_t request_length;</div><div class='ctx'> 	uint32_t word9;</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_compat.h b/drivers/scsi/lpfc/lpfc_compat.h<br/>index 75e2e569dede..c88e556ea62e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_compat.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_compat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_compat.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_compat.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) 2004-2005 Emulex.  All rights reserved.           *</div><div class='add'>+ * Copyright (C) 2004-2011 Emulex.  All rights reserved.           *</div><div class='ctx'>  * EMULEX and SLI are trademarks of Emulex.                        *</div><div class='ctx'>  * www.emulex.com                                                  *</div><div class='ctx'>  *                                                                 *</div><div class='hunk'>@@ -82,7 +82,8 @@ lpfc_memcpy_from_slim( void *dest, void __iomem *src, unsigned int bytes)</div><div class='ctx'> static inline void</div><div class='ctx'> lpfc_memcpy_to_slim( void __iomem *dest, void *src, unsigned int bytes)</div><div class='ctx'> {</div><div class='del'>-	__iowrite32_copy(dest, src, bytes);</div><div class='add'>+	/* convert bytes in argument list to word count for copy function */</div><div class='add'>+	__iowrite32_copy(dest, src, bytes / sizeof(uint32_t));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h<br/>index 60f95347babf..26924b7a6cde 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_crtn.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_crtn.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_crtn.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_crtn.h</a></div><div class='hunk'>@@ -26,7 +26,7 @@ void lpfc_sli_read_link_ste(struct lpfc_hba *);</div><div class='ctx'> void lpfc_dump_mem(struct lpfc_hba *, LPFC_MBOXQ_t *, uint16_t, uint16_t);</div><div class='ctx'> void lpfc_dump_wakeup_param(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='ctx'> int lpfc_dump_static_vport(struct lpfc_hba *, LPFC_MBOXQ_t *, uint16_t);</div><div class='del'>-int lpfc_dump_fcoe_param(struct lpfc_hba *, struct lpfcMboxq *);</div><div class='add'>+int lpfc_sli4_dump_cfg_rg23(struct lpfc_hba *, struct lpfcMboxq *);</div><div class='ctx'> void lpfc_read_nv(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='ctx'> void lpfc_config_async(struct lpfc_hba *, LPFC_MBOXQ_t *, uint32_t);</div><div class='ctx'> </div><div class='hunk'>@@ -78,6 +78,7 @@ void lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='ctx'> void lpfc_mbx_cmpl_ns_reg_login(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='ctx'> void lpfc_mbx_cmpl_fdmi_reg_login(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='ctx'> void lpfc_mbx_cmpl_reg_vfi(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='add'>+void lpfc_unregister_vfi_cmpl(struct lpfc_hba *, LPFC_MBOXQ_t *);</div><div class='ctx'> void lpfc_enqueue_node(struct lpfc_vport *, struct lpfc_nodelist *);</div><div class='ctx'> void lpfc_dequeue_node(struct lpfc_vport *, struct lpfc_nodelist *);</div><div class='ctx'> struct lpfc_nodelist *lpfc_enable_node(struct lpfc_vport *,</div><div class='hunk'>@@ -106,7 +107,7 @@ void lpfc_cleanup(struct lpfc_vport *);</div><div class='ctx'> void lpfc_disc_timeout(unsigned long);</div><div class='ctx'> </div><div class='ctx'> struct lpfc_nodelist *__lpfc_findnode_rpi(struct lpfc_vport *, uint16_t);</div><div class='del'>-</div><div class='add'>+struct lpfc_nodelist *lpfc_findnode_rpi(struct lpfc_vport *, uint16_t);</div><div class='ctx'> void lpfc_worker_wake_up(struct lpfc_hba *);</div><div class='ctx'> int lpfc_workq_post_event(struct lpfc_hba *, void *, void *, uint32_t);</div><div class='ctx'> int lpfc_do_work(void *);</div><div class='hunk'>@@ -453,3 +454,11 @@ int lpfc_sli_probe_sriov_nr_virtfn(struct lpfc_hba *, int);</div><div class='ctx'> uint16_t lpfc_sli_sriov_nr_virtfn_get(struct lpfc_hba *);</div><div class='ctx'> int lpfc_sli4_queue_create(struct lpfc_hba *);</div><div class='ctx'> void lpfc_sli4_queue_destroy(struct lpfc_hba *);</div><div class='add'>+void lpfc_sli4_abts_err_handler(struct lpfc_hba *, struct lpfc_nodelist *,</div><div class='add'>+				struct sli4_wcqe_xri_aborted *);</div><div class='add'>+int lpfc_hba_init_link_fc_topology(struct lpfc_hba *, uint32_t, uint32_t);</div><div class='add'>+int lpfc_issue_reg_vfi(struct lpfc_vport *);</div><div class='add'>+int lpfc_issue_unreg_vfi(struct lpfc_vport *);</div><div class='add'>+int lpfc_selective_reset(struct lpfc_hba *);</div><div class='add'>+int lpfc_sli4_read_config(struct lpfc_hba *phba);</div><div class='add'>+int lpfc_scsi_buf_update(struct lpfc_hba *phba);</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c<br/>index 28382596fb9a..3587a3fe8fcb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_debugfs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_debugfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_debugfs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_debugfs.c</a></div><div class='hunk'>@@ -1997,7 +1997,8 @@ lpfc_idiag_queinfo_read(struct file *file, char __user *buf, size_t nbytes,</div><div class='ctx'> 	/* Get slow-path event queue information */</div><div class='ctx'> 	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"Slow-path EQ information:\n");</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='add'>+	if (phba-&gt;sli4_hba.sp_eq) {</div><div class='add'>+		len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"\tEQID[%02d], "</div><div class='ctx'> 			"QE-COUNT[%04d], QE-SIZE[%04d], "</div><div class='ctx'> 			"HOST-INDEX[%04d], PORT-INDEX[%04d]\n\n",</div><div class='hunk'>@@ -2006,12 +2007,17 @@ lpfc_idiag_queinfo_read(struct file *file, char __user *buf, size_t nbytes,</div><div class='ctx'> 			phba-&gt;sli4_hba.sp_eq-&gt;entry_size,</div><div class='ctx'> 			phba-&gt;sli4_hba.sp_eq-&gt;host_index,</div><div class='ctx'> 			phba-&gt;sli4_hba.sp_eq-&gt;hba_index);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get fast-path event queue information */</div><div class='ctx'> 	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"Fast-path EQ information:\n");</div><div class='del'>-	for (fcp_qidx = 0; fcp_qidx &lt; phba-&gt;cfg_fcp_eq_count; fcp_qidx++) {</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='add'>+	if (phba-&gt;sli4_hba.fp_eq) {</div><div class='add'>+		for (fcp_qidx = 0; fcp_qidx &lt; phba-&gt;cfg_fcp_eq_count;</div><div class='add'>+		     fcp_qidx++) {</div><div class='add'>+			if (phba-&gt;sli4_hba.fp_eq[fcp_qidx]) {</div><div class='add'>+				len += snprintf(pbuffer+len,</div><div class='add'>+					LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 				"\tEQID[%02d], "</div><div class='ctx'> 				"QE-COUNT[%04d], QE-SIZE[%04d], "</div><div class='ctx'> 				"HOST-INDEX[%04d], PORT-INDEX[%04d]\n",</div><div class='hunk'>@@ -2020,16 +2026,19 @@ lpfc_idiag_queinfo_read(struct file *file, char __user *buf, size_t nbytes,</div><div class='ctx'> 				phba-&gt;sli4_hba.fp_eq[fcp_qidx]-&gt;entry_size,</div><div class='ctx'> 				phba-&gt;sli4_hba.fp_eq[fcp_qidx]-&gt;host_index,</div><div class='ctx'> 				phba-&gt;sli4_hba.fp_eq[fcp_qidx]-&gt;hba_index);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len, "\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Get mailbox complete queue information */</div><div class='ctx'> 	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"Slow-path MBX CQ information:\n");</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='add'>+	if (phba-&gt;sli4_hba.mbx_cq) {</div><div class='add'>+		len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"Associated EQID[%02d]:\n",</div><div class='ctx'> 			phba-&gt;sli4_hba.mbx_cq-&gt;assoc_qid);</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='add'>+		len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"\tCQID[%02d], "</div><div class='ctx'> 			"QE-COUNT[%04d], QE-SIZE[%04d], "</div><div class='ctx'> 			"HOST-INDEX[%04d], PORT-INDEX[%04d]\n\n",</div><div class='hunk'>@@ -2038,14 +2047,16 @@ lpfc_idiag_queinfo_read(struct file *file, char __user *buf, size_t nbytes,</div><div class='ctx'> 			phba-&gt;sli4_hba.mbx_cq-&gt;entry_size,</div><div class='ctx'> 			phba-&gt;sli4_hba.mbx_cq-&gt;host_index,</div><div class='ctx'> 			phba-&gt;sli4_hba.mbx_cq-&gt;hba_index);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get slow-path complete queue information */</div><div class='ctx'> 	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"Slow-path ELS CQ information:\n");</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='add'>+	if (phba-&gt;sli4_hba.els_cq) {</div><div class='add'>+		len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"Associated EQID[%02d]:\n",</div><div class='ctx'> 			phba-&gt;sli4_hba.els_cq-&gt;assoc_qid);</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='add'>+		len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"\tCQID [%02d], "</div><div class='ctx'> 			"QE-COUNT[%04d], QE-SIZE[%04d], "</div><div class='ctx'> 			"HOST-INDEX[%04d], PORT-INDEX[%04d]\n\n",</div><div class='hunk'>@@ -2054,16 +2065,21 @@ lpfc_idiag_queinfo_read(struct file *file, char __user *buf, size_t nbytes,</div><div class='ctx'> 			phba-&gt;sli4_hba.els_cq-&gt;entry_size,</div><div class='ctx'> 			phba-&gt;sli4_hba.els_cq-&gt;host_index,</div><div class='ctx'> 			phba-&gt;sli4_hba.els_cq-&gt;hba_index);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get fast-path complete queue information */</div><div class='ctx'> 	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"Fast-path FCP CQ information:\n");</div><div class='ctx'> 	fcp_qidx = 0;</div><div class='del'>-	do {</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='add'>+	if (phba-&gt;sli4_hba.fcp_cq) {</div><div class='add'>+		do {</div><div class='add'>+			if (phba-&gt;sli4_hba.fcp_cq[fcp_qidx]) {</div><div class='add'>+				len += snprintf(pbuffer+len,</div><div class='add'>+					LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 				"Associated EQID[%02d]:\n",</div><div class='ctx'> 				phba-&gt;sli4_hba.fcp_cq[fcp_qidx]-&gt;assoc_qid);</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='add'>+				len += snprintf(pbuffer+len,</div><div class='add'>+					LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 				"\tCQID[%02d], "</div><div class='ctx'> 				"QE-COUNT[%04d], QE-SIZE[%04d], "</div><div class='ctx'> 				"HOST-INDEX[%04d], PORT-INDEX[%04d]\n",</div><div class='hunk'>@@ -2072,16 +2088,20 @@ lpfc_idiag_queinfo_read(struct file *file, char __user *buf, size_t nbytes,</div><div class='ctx'> 				phba-&gt;sli4_hba.fcp_cq[fcp_qidx]-&gt;entry_size,</div><div class='ctx'> 				phba-&gt;sli4_hba.fcp_cq[fcp_qidx]-&gt;host_index,</div><div class='ctx'> 				phba-&gt;sli4_hba.fcp_cq[fcp_qidx]-&gt;hba_index);</div><div class='del'>-	} while (++fcp_qidx &lt; phba-&gt;cfg_fcp_eq_count);</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len, "\n");</div><div class='add'>+			}</div><div class='add'>+		} while (++fcp_qidx &lt; phba-&gt;cfg_fcp_eq_count);</div><div class='add'>+		len += snprintf(pbuffer+len,</div><div class='add'>+				LPFC_QUE_INFO_GET_BUF_SIZE-len, "\n");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get mailbox queue information */</div><div class='ctx'> 	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"Slow-path MBX MQ information:\n");</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='add'>+	if (phba-&gt;sli4_hba.mbx_wq) {</div><div class='add'>+		len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"Associated CQID[%02d]:\n",</div><div class='ctx'> 			phba-&gt;sli4_hba.mbx_wq-&gt;assoc_qid);</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='add'>+		len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"\tWQID[%02d], "</div><div class='ctx'> 			"QE-COUNT[%04d], QE-SIZE[%04d], "</div><div class='ctx'> 			"HOST-INDEX[%04d], PORT-INDEX[%04d]\n\n",</div><div class='hunk'>@@ -2090,14 +2110,16 @@ lpfc_idiag_queinfo_read(struct file *file, char __user *buf, size_t nbytes,</div><div class='ctx'> 			phba-&gt;sli4_hba.mbx_wq-&gt;entry_size,</div><div class='ctx'> 			phba-&gt;sli4_hba.mbx_wq-&gt;host_index,</div><div class='ctx'> 			phba-&gt;sli4_hba.mbx_wq-&gt;hba_index);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get slow-path work queue information */</div><div class='ctx'> 	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"Slow-path ELS WQ information:\n");</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='add'>+	if (phba-&gt;sli4_hba.els_wq) {</div><div class='add'>+		len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"Associated CQID[%02d]:\n",</div><div class='ctx'> 			phba-&gt;sli4_hba.els_wq-&gt;assoc_qid);</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='add'>+		len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"\tWQID[%02d], "</div><div class='ctx'> 			"QE-COUNT[%04d], QE-SIZE[%04d], "</div><div class='ctx'> 			"HOST-INDEX[%04d], PORT-INDEX[%04d]\n\n",</div><div class='hunk'>@@ -2106,15 +2128,22 @@ lpfc_idiag_queinfo_read(struct file *file, char __user *buf, size_t nbytes,</div><div class='ctx'> 			phba-&gt;sli4_hba.els_wq-&gt;entry_size,</div><div class='ctx'> 			phba-&gt;sli4_hba.els_wq-&gt;host_index,</div><div class='ctx'> 			phba-&gt;sli4_hba.els_wq-&gt;hba_index);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get fast-path work queue information */</div><div class='ctx'> 	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"Fast-path FCP WQ information:\n");</div><div class='del'>-	for (fcp_qidx = 0; fcp_qidx &lt; phba-&gt;cfg_fcp_wq_count; fcp_qidx++) {</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='add'>+	if (phba-&gt;sli4_hba.fcp_wq) {</div><div class='add'>+		for (fcp_qidx = 0; fcp_qidx &lt; phba-&gt;cfg_fcp_wq_count;</div><div class='add'>+		     fcp_qidx++) {</div><div class='add'>+			if (!phba-&gt;sli4_hba.fcp_wq[fcp_qidx])</div><div class='add'>+				continue;</div><div class='add'>+			len += snprintf(pbuffer+len,</div><div class='add'>+					LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 				"Associated CQID[%02d]:\n",</div><div class='ctx'> 				phba-&gt;sli4_hba.fcp_wq[fcp_qidx]-&gt;assoc_qid);</div><div class='del'>-		len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='add'>+			len += snprintf(pbuffer+len,</div><div class='add'>+					LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 				"\tWQID[%02d], "</div><div class='ctx'> 				"QE-COUNT[%04d], WQE-SIZE[%04d], "</div><div class='ctx'> 				"HOST-INDEX[%04d], PORT-INDEX[%04d]\n",</div><div class='hunk'>@@ -2123,16 +2152,19 @@ lpfc_idiag_queinfo_read(struct file *file, char __user *buf, size_t nbytes,</div><div class='ctx'> 				phba-&gt;sli4_hba.fcp_wq[fcp_qidx]-&gt;entry_size,</div><div class='ctx'> 				phba-&gt;sli4_hba.fcp_wq[fcp_qidx]-&gt;host_index,</div><div class='ctx'> 				phba-&gt;sli4_hba.fcp_wq[fcp_qidx]-&gt;hba_index);</div><div class='add'>+		}</div><div class='add'>+		len += snprintf(pbuffer+len,</div><div class='add'>+				LPFC_QUE_INFO_GET_BUF_SIZE-len, "\n");</div><div class='ctx'> 	}</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len, "\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Get receive queue information */</div><div class='ctx'> 	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"Slow-path RQ information:\n");</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='add'>+	if (phba-&gt;sli4_hba.hdr_rq &amp;&amp; phba-&gt;sli4_hba.dat_rq) {</div><div class='add'>+		len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"Associated CQID[%02d]:\n",</div><div class='ctx'> 			phba-&gt;sli4_hba.hdr_rq-&gt;assoc_qid);</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='add'>+		len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"\tHQID[%02d], "</div><div class='ctx'> 			"QE-COUNT[%04d], QE-SIZE[%04d], "</div><div class='ctx'> 			"HOST-INDEX[%04d], PORT-INDEX[%04d]\n",</div><div class='hunk'>@@ -2141,7 +2173,7 @@ lpfc_idiag_queinfo_read(struct file *file, char __user *buf, size_t nbytes,</div><div class='ctx'> 			phba-&gt;sli4_hba.hdr_rq-&gt;entry_size,</div><div class='ctx'> 			phba-&gt;sli4_hba.hdr_rq-&gt;host_index,</div><div class='ctx'> 			phba-&gt;sli4_hba.hdr_rq-&gt;hba_index);</div><div class='del'>-	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='add'>+		len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,</div><div class='ctx'> 			"\tDQID[%02d], "</div><div class='ctx'> 			"QE-COUNT[%04d], QE-SIZE[%04d], "</div><div class='ctx'> 			"HOST-INDEX[%04d], PORT-INDEX[%04d]\n",</div><div class='hunk'>@@ -2150,7 +2182,7 @@ lpfc_idiag_queinfo_read(struct file *file, char __user *buf, size_t nbytes,</div><div class='ctx'> 			phba-&gt;sli4_hba.dat_rq-&gt;entry_size,</div><div class='ctx'> 			phba-&gt;sli4_hba.dat_rq-&gt;host_index,</div><div class='ctx'> 			phba-&gt;sli4_hba.dat_rq-&gt;hba_index);</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> 	return simple_read_from_buffer(buf, nbytes, ppos, pbuffer, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2360,7 +2392,8 @@ lpfc_idiag_queacc_write(struct file *file, const char __user *buf,</div><div class='ctx'> 	switch (quetp) {</div><div class='ctx'> 	case LPFC_IDIAG_EQ:</div><div class='ctx'> 		/* Slow-path event queue */</div><div class='del'>-		if (phba-&gt;sli4_hba.sp_eq-&gt;queue_id == queid) {</div><div class='add'>+		if (phba-&gt;sli4_hba.sp_eq &amp;&amp;</div><div class='add'>+		    phba-&gt;sli4_hba.sp_eq-&gt;queue_id == queid) {</div><div class='ctx'> 			/* Sanity check */</div><div class='ctx'> 			rc = lpfc_idiag_que_param_check(</div><div class='ctx'> 					phba-&gt;sli4_hba.sp_eq, index, count);</div><div class='hunk'>@@ -2370,23 +2403,29 @@ lpfc_idiag_queacc_write(struct file *file, const char __user *buf,</div><div class='ctx'> 			goto pass_check;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Fast-path event queue */</div><div class='del'>-		for (qidx = 0; qidx &lt; phba-&gt;cfg_fcp_eq_count; qidx++) {</div><div class='del'>-			if (phba-&gt;sli4_hba.fp_eq[qidx]-&gt;queue_id == queid) {</div><div class='del'>-				/* Sanity check */</div><div class='del'>-				rc = lpfc_idiag_que_param_check(</div><div class='add'>+		if (phba-&gt;sli4_hba.fp_eq) {</div><div class='add'>+			for (qidx = 0; qidx &lt; phba-&gt;cfg_fcp_eq_count; qidx++) {</div><div class='add'>+				if (phba-&gt;sli4_hba.fp_eq[qidx] &amp;&amp;</div><div class='add'>+				    phba-&gt;sli4_hba.fp_eq[qidx]-&gt;queue_id ==</div><div class='add'>+				    queid) {</div><div class='add'>+					/* Sanity check */</div><div class='add'>+					rc = lpfc_idiag_que_param_check(</div><div class='ctx'> 						phba-&gt;sli4_hba.fp_eq[qidx],</div><div class='ctx'> 						index, count);</div><div class='del'>-				if (rc)</div><div class='del'>-					goto error_out;</div><div class='del'>-				idiag.ptr_private = phba-&gt;sli4_hba.fp_eq[qidx];</div><div class='del'>-				goto pass_check;</div><div class='add'>+					if (rc)</div><div class='add'>+						goto error_out;</div><div class='add'>+					idiag.ptr_private =</div><div class='add'>+						phba-&gt;sli4_hba.fp_eq[qidx];</div><div class='add'>+					goto pass_check;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		goto error_out;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LPFC_IDIAG_CQ:</div><div class='ctx'> 		/* MBX complete queue */</div><div class='del'>-		if (phba-&gt;sli4_hba.mbx_cq-&gt;queue_id == queid) {</div><div class='add'>+		if (phba-&gt;sli4_hba.mbx_cq &amp;&amp;</div><div class='add'>+		    phba-&gt;sli4_hba.mbx_cq-&gt;queue_id == queid) {</div><div class='ctx'> 			/* Sanity check */</div><div class='ctx'> 			rc = lpfc_idiag_que_param_check(</div><div class='ctx'> 					phba-&gt;sli4_hba.mbx_cq, index, count);</div><div class='hunk'>@@ -2396,7 +2435,8 @@ lpfc_idiag_queacc_write(struct file *file, const char __user *buf,</div><div class='ctx'> 			goto pass_check;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* ELS complete queue */</div><div class='del'>-		if (phba-&gt;sli4_hba.els_cq-&gt;queue_id == queid) {</div><div class='add'>+		if (phba-&gt;sli4_hba.els_cq &amp;&amp;</div><div class='add'>+		    phba-&gt;sli4_hba.els_cq-&gt;queue_id == queid) {</div><div class='ctx'> 			/* Sanity check */</div><div class='ctx'> 			rc = lpfc_idiag_que_param_check(</div><div class='ctx'> 					phba-&gt;sli4_hba.els_cq, index, count);</div><div class='hunk'>@@ -2406,25 +2446,30 @@ lpfc_idiag_queacc_write(struct file *file, const char __user *buf,</div><div class='ctx'> 			goto pass_check;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* FCP complete queue */</div><div class='del'>-		qidx = 0;</div><div class='del'>-		do {</div><div class='del'>-			if (phba-&gt;sli4_hba.fcp_cq[qidx]-&gt;queue_id == queid) {</div><div class='del'>-				/* Sanity check */</div><div class='del'>-				rc = lpfc_idiag_que_param_check(</div><div class='add'>+		if (phba-&gt;sli4_hba.fcp_cq) {</div><div class='add'>+			qidx = 0;</div><div class='add'>+			do {</div><div class='add'>+				if (phba-&gt;sli4_hba.fcp_cq[qidx] &amp;&amp;</div><div class='add'>+				    phba-&gt;sli4_hba.fcp_cq[qidx]-&gt;queue_id ==</div><div class='add'>+				    queid) {</div><div class='add'>+					/* Sanity check */</div><div class='add'>+					rc = lpfc_idiag_que_param_check(</div><div class='ctx'> 						phba-&gt;sli4_hba.fcp_cq[qidx],</div><div class='ctx'> 						index, count);</div><div class='del'>-				if (rc)</div><div class='del'>-					goto error_out;</div><div class='del'>-				idiag.ptr_private =</div><div class='add'>+					if (rc)</div><div class='add'>+						goto error_out;</div><div class='add'>+					idiag.ptr_private =</div><div class='ctx'> 						phba-&gt;sli4_hba.fcp_cq[qidx];</div><div class='del'>-				goto pass_check;</div><div class='del'>-			}</div><div class='del'>-		} while (++qidx &lt; phba-&gt;cfg_fcp_eq_count);</div><div class='add'>+					goto pass_check;</div><div class='add'>+				}</div><div class='add'>+			} while (++qidx &lt; phba-&gt;cfg_fcp_eq_count);</div><div class='add'>+		}</div><div class='ctx'> 		goto error_out;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LPFC_IDIAG_MQ:</div><div class='ctx'> 		/* MBX work queue */</div><div class='del'>-		if (phba-&gt;sli4_hba.mbx_wq-&gt;queue_id == queid) {</div><div class='add'>+		if (phba-&gt;sli4_hba.mbx_wq &amp;&amp;</div><div class='add'>+		    phba-&gt;sli4_hba.mbx_wq-&gt;queue_id == queid) {</div><div class='ctx'> 			/* Sanity check */</div><div class='ctx'> 			rc = lpfc_idiag_que_param_check(</div><div class='ctx'> 					phba-&gt;sli4_hba.mbx_wq, index, count);</div><div class='hunk'>@@ -2433,10 +2478,12 @@ lpfc_idiag_queacc_write(struct file *file, const char __user *buf,</div><div class='ctx'> 			idiag.ptr_private = phba-&gt;sli4_hba.mbx_wq;</div><div class='ctx'> 			goto pass_check;</div><div class='ctx'> 		}</div><div class='add'>+		goto error_out;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LPFC_IDIAG_WQ:</div><div class='ctx'> 		/* ELS work queue */</div><div class='del'>-		if (phba-&gt;sli4_hba.els_wq-&gt;queue_id == queid) {</div><div class='add'>+		if (phba-&gt;sli4_hba.els_wq &amp;&amp;</div><div class='add'>+		    phba-&gt;sli4_hba.els_wq-&gt;queue_id == queid) {</div><div class='ctx'> 			/* Sanity check */</div><div class='ctx'> 			rc = lpfc_idiag_que_param_check(</div><div class='ctx'> 					phba-&gt;sli4_hba.els_wq, index, count);</div><div class='hunk'>@@ -2446,24 +2493,30 @@ lpfc_idiag_queacc_write(struct file *file, const char __user *buf,</div><div class='ctx'> 			goto pass_check;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* FCP work queue */</div><div class='del'>-		for (qidx = 0; qidx &lt; phba-&gt;cfg_fcp_wq_count; qidx++) {</div><div class='del'>-			if (phba-&gt;sli4_hba.fcp_wq[qidx]-&gt;queue_id == queid) {</div><div class='del'>-				/* Sanity check */</div><div class='del'>-				rc = lpfc_idiag_que_param_check(</div><div class='add'>+		if (phba-&gt;sli4_hba.fcp_wq) {</div><div class='add'>+			for (qidx = 0; qidx &lt; phba-&gt;cfg_fcp_wq_count; qidx++) {</div><div class='add'>+				if (!phba-&gt;sli4_hba.fcp_wq[qidx])</div><div class='add'>+					continue;</div><div class='add'>+				if (phba-&gt;sli4_hba.fcp_wq[qidx]-&gt;queue_id ==</div><div class='add'>+				    queid) {</div><div class='add'>+					/* Sanity check */</div><div class='add'>+					rc = lpfc_idiag_que_param_check(</div><div class='ctx'> 						phba-&gt;sli4_hba.fcp_wq[qidx],</div><div class='ctx'> 						index, count);</div><div class='del'>-				if (rc)</div><div class='del'>-					goto error_out;</div><div class='del'>-				idiag.ptr_private =</div><div class='del'>-					phba-&gt;sli4_hba.fcp_wq[qidx];</div><div class='del'>-				goto pass_check;</div><div class='add'>+					if (rc)</div><div class='add'>+						goto error_out;</div><div class='add'>+					idiag.ptr_private =</div><div class='add'>+						phba-&gt;sli4_hba.fcp_wq[qidx];</div><div class='add'>+					goto pass_check;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		goto error_out;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LPFC_IDIAG_RQ:</div><div class='ctx'> 		/* HDR queue */</div><div class='del'>-		if (phba-&gt;sli4_hba.hdr_rq-&gt;queue_id == queid) {</div><div class='add'>+		if (phba-&gt;sli4_hba.hdr_rq &amp;&amp;</div><div class='add'>+		    phba-&gt;sli4_hba.hdr_rq-&gt;queue_id == queid) {</div><div class='ctx'> 			/* Sanity check */</div><div class='ctx'> 			rc = lpfc_idiag_que_param_check(</div><div class='ctx'> 					phba-&gt;sli4_hba.hdr_rq, index, count);</div><div class='hunk'>@@ -2473,7 +2526,8 @@ lpfc_idiag_queacc_write(struct file *file, const char __user *buf,</div><div class='ctx'> 			goto pass_check;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* DAT queue */</div><div class='del'>-		if (phba-&gt;sli4_hba.dat_rq-&gt;queue_id == queid) {</div><div class='add'>+		if (phba-&gt;sli4_hba.dat_rq &amp;&amp;</div><div class='add'>+		    phba-&gt;sli4_hba.dat_rq-&gt;queue_id == queid) {</div><div class='ctx'> 			/* Sanity check */</div><div class='ctx'> 			rc = lpfc_idiag_que_param_check(</div><div class='ctx'> 					phba-&gt;sli4_hba.dat_rq, index, count);</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c<br/>index 445826a4c981..7afc757338de 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_els.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_els.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_els.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_els.c</a></div><div class='hunk'>@@ -421,13 +421,13 @@ fail:</div><div class='ctx'>  * @vport: pointer to a host virtual N_Port data structure.</div><div class='ctx'>  *</div><div class='ctx'>  * This routine issues a REG_VFI mailbox for the vfi, vpi, fcfi triplet for</div><div class='del'>- * the @vport. This mailbox command is necessary for FCoE only.</div><div class='add'>+ * the @vport. This mailbox command is necessary for SLI4 port only.</div><div class='ctx'>  *</div><div class='ctx'>  * Return code</div><div class='ctx'>  *   0 - successfully issued REG_VFI for @vport</div><div class='ctx'>  *   A failure code otherwise.</div><div class='ctx'>  **/</div><div class='del'>-static int</div><div class='add'>+int</div><div class='ctx'> lpfc_issue_reg_vfi(struct lpfc_vport *vport)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_hba  *phba = vport-&gt;phba;</div><div class='hunk'>@@ -438,10 +438,14 @@ lpfc_issue_reg_vfi(struct lpfc_vport *vport)</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	sp = &amp;phba-&gt;fc_fabparam;</div><div class='del'>-	ndlp = lpfc_findnode_did(vport, Fabric_DID);</div><div class='del'>-	if (!ndlp || !NLP_CHK_NODE_ACT(ndlp)) {</div><div class='del'>-		rc = -ENODEV;</div><div class='del'>-		goto fail;</div><div class='add'>+	/* move forward in case of SLI4 FC port loopback test */</div><div class='add'>+	if ((phba-&gt;sli_rev == LPFC_SLI_REV4) &amp;&amp;</div><div class='add'>+	    !(phba-&gt;link_flag &amp; LS_LOOPBACK_MODE)) {</div><div class='add'>+		ndlp = lpfc_findnode_did(vport, Fabric_DID);</div><div class='add'>+		if (!ndlp || !NLP_CHK_NODE_ACT(ndlp)) {</div><div class='add'>+			rc = -ENODEV;</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dmabuf = kzalloc(sizeof(struct lpfc_dmabuf), GFP_KERNEL);</div><div class='hunk'>@@ -487,6 +491,54 @@ fail:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * lpfc_issue_unreg_vfi - Unregister VFI for this vport's fabric login</div><div class='add'>+ * @vport: pointer to a host virtual N_Port data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine issues a UNREG_VFI mailbox with the vfi, vpi, fcfi triplet for</div><div class='add'>+ * the @vport. This mailbox command is necessary for SLI4 port only.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *   0 - successfully issued REG_VFI for @vport</div><div class='add'>+ *   A failure code otherwise.</div><div class='add'>+ **/</div><div class='add'>+int</div><div class='add'>+lpfc_issue_unreg_vfi(struct lpfc_vport *vport)</div><div class='add'>+{</div><div class='add'>+	struct lpfc_hba *phba = vport-&gt;phba;</div><div class='add'>+	struct Scsi_Host *shost;</div><div class='add'>+	LPFC_MBOXQ_t *mboxq;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	mboxq = mempool_alloc(phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='add'>+	if (!mboxq) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY|LOG_MBOX,</div><div class='add'>+				"2556 UNREG_VFI mbox allocation failed"</div><div class='add'>+				"HBA state x%x\n", phba-&gt;pport-&gt;port_state);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lpfc_unreg_vfi(mboxq, vport);</div><div class='add'>+	mboxq-&gt;vport = vport;</div><div class='add'>+	mboxq-&gt;mbox_cmpl = lpfc_unregister_vfi_cmpl;</div><div class='add'>+</div><div class='add'>+	rc = lpfc_sli_issue_mbox(phba, mboxq, MBX_NOWAIT);</div><div class='add'>+	if (rc == MBX_NOT_FINISHED) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY|LOG_MBOX,</div><div class='add'>+				"2557 UNREG_VFI issue mbox failed rc x%x "</div><div class='add'>+				"HBA state x%x\n",</div><div class='add'>+				rc, phba-&gt;pport-&gt;port_state);</div><div class='add'>+		mempool_free(mboxq, phba-&gt;mbox_mem_pool);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	shost = lpfc_shost_from_vport(vport);</div><div class='add'>+	spin_lock_irq(shost-&gt;host_lock);</div><div class='add'>+	vport-&gt;fc_flag &amp;= ~FC_VFI_REGISTERED;</div><div class='add'>+	spin_unlock_irq(shost-&gt;host_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * lpfc_check_clean_addr_bit - Check whether assigned FCID is clean.</div><div class='ctx'>  * @vport: pointer to a host virtual N_Port data structure.</div><div class='ctx'>  * @sp: pointer to service parameter data structure.</div><div class='hunk'>@@ -615,7 +667,9 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 					 "1816 FLOGI NPIV supported, "</div><div class='ctx'> 					 "response data 0x%x\n",</div><div class='ctx'> 					 sp-&gt;cmn.response_multiple_NPort);</div><div class='add'>+			spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 			phba-&gt;link_flag |= LS_NPIV_FAB_SUPPORTED;</div><div class='add'>+			spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Because we asked f/w for NPIV it still expects us</div><div class='ctx'> 			to call reg_vnpid atleast for the physcial host */</div><div class='hunk'>@@ -623,7 +677,9 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 					 LOG_ELS | LOG_VPORT,</div><div class='ctx'> 					 "1817 Fabric does not support NPIV "</div><div class='ctx'> 					 "- configuring single port mode.\n");</div><div class='add'>+			spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 			phba-&gt;link_flag &amp;= ~LS_NPIV_FAB_SUPPORTED;</div><div class='add'>+			spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -686,11 +742,16 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 			lpfc_do_scr_ns_plogi(phba, vport);</div><div class='ctx'> 		} else if (vport-&gt;fc_flag &amp; FC_VFI_REGISTERED)</div><div class='ctx'> 			lpfc_issue_init_vpi(vport);</div><div class='del'>-		else</div><div class='add'>+		else {</div><div class='add'>+			lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,</div><div class='add'>+					"3135 Need register VFI: (x%x/%x)\n",</div><div class='add'>+					vport-&gt;fc_prevDID, vport-&gt;fc_myDID);</div><div class='ctx'> 			lpfc_issue_reg_vfi(vport);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * lpfc_cmpl_els_flogi_nport - Completion function for flogi to an N_Port</div><div class='ctx'>  * @vport: pointer to a host virtual N_Port data structure.</div><div class='hunk'>@@ -907,17 +968,16 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 		 * LPFC_MAX_DISC_THREADS (32). Scanning in the case of no</div><div class='ctx'> 		 * alpa map would take too long otherwise.</div><div class='ctx'> 		 */</div><div class='del'>-		if (phba-&gt;alpa_map[0] == 0) {</div><div class='add'>+		if (phba-&gt;alpa_map[0] == 0)</div><div class='ctx'> 			vport-&gt;cfg_discovery_threads = LPFC_MAX_DISC_THREADS;</div><div class='del'>-			if ((phba-&gt;sli_rev == LPFC_SLI_REV4) &amp;&amp;</div><div class='del'>-			    (!(vport-&gt;fc_flag &amp; FC_VFI_REGISTERED) ||</div><div class='del'>-			     (vport-&gt;fc_prevDID != vport-&gt;fc_myDID))) {</div><div class='del'>-				if (vport-&gt;fc_flag &amp; FC_VFI_REGISTERED)</div><div class='del'>-					lpfc_sli4_unreg_all_rpis(vport);</div><div class='del'>-				lpfc_issue_reg_vfi(vport);</div><div class='del'>-				lpfc_nlp_put(ndlp);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='add'>+		if ((phba-&gt;sli_rev == LPFC_SLI_REV4) &amp;&amp;</div><div class='add'>+		    (!(vport-&gt;fc_flag &amp; FC_VFI_REGISTERED) ||</div><div class='add'>+		     (vport-&gt;fc_prevDID != vport-&gt;fc_myDID))) {</div><div class='add'>+			if (vport-&gt;fc_flag &amp; FC_VFI_REGISTERED)</div><div class='add'>+				lpfc_sli4_unreg_all_rpis(vport);</div><div class='add'>+			lpfc_issue_reg_vfi(vport);</div><div class='add'>+			lpfc_nlp_put(ndlp);</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		goto flogifail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1075,6 +1135,7 @@ lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 	/* Setup CSPs accordingly for Fabric */</div><div class='ctx'> 	sp-&gt;cmn.e_d_tov = 0;</div><div class='ctx'> 	sp-&gt;cmn.w2.r_a_tov = 0;</div><div class='add'>+	sp-&gt;cmn.virtual_fabric_support = 0;</div><div class='ctx'> 	sp-&gt;cls1.classValid = 0;</div><div class='ctx'> 	sp-&gt;cls2.seqDelivery = 1;</div><div class='ctx'> 	sp-&gt;cls3.seqDelivery = 1;</div><div class='hunk'>@@ -1163,8 +1224,7 @@ lpfc_els_abort_flogi(struct lpfc_hba *phba)</div><div class='ctx'> 	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 	list_for_each_entry_safe(iocb, next_iocb, &amp;pring-&gt;txcmplq, list) {</div><div class='ctx'> 		icmd = &amp;iocb-&gt;iocb;</div><div class='del'>-		if (icmd-&gt;ulpCommand == CMD_ELS_REQUEST64_CR &amp;&amp;</div><div class='del'>-		    icmd-&gt;un.elsreq64.bdl.ulpIoTag32) {</div><div class='add'>+		if (icmd-&gt;ulpCommand == CMD_ELS_REQUEST64_CR) {</div><div class='ctx'> 			ndlp = (struct lpfc_nodelist *)(iocb-&gt;context1);</div><div class='ctx'> 			if (ndlp &amp;&amp; NLP_CHK_NODE_ACT(ndlp) &amp;&amp;</div><div class='ctx'> 			    (ndlp-&gt;nlp_DID == Fabric_DID))</div><div class='hunk'>@@ -3066,17 +3126,22 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 	if (did == FDMI_DID)</div><div class='ctx'> 		retry = 1;</div><div class='ctx'> </div><div class='del'>-	if (((cmd == ELS_CMD_FLOGI) || (cmd == ELS_CMD_FDISC)) &amp;&amp;</div><div class='add'>+	if ((cmd == ELS_CMD_FLOGI) &amp;&amp;</div><div class='ctx'> 	    (phba-&gt;fc_topology != LPFC_TOPOLOGY_LOOP) &amp;&amp;</div><div class='ctx'> 	    !lpfc_error_lost_link(irsp)) {</div><div class='ctx'> 		/* FLOGI retry policy */</div><div class='ctx'> 		retry = 1;</div><div class='del'>-		/* retry forever */</div><div class='add'>+		/* retry FLOGI forever */</div><div class='ctx'> 		maxretry = 0;</div><div class='ctx'> 		if (cmdiocb-&gt;retry &gt;= 100)</div><div class='ctx'> 			delay = 5000;</div><div class='ctx'> 		else if (cmdiocb-&gt;retry &gt;= 32)</div><div class='ctx'> 			delay = 1000;</div><div class='add'>+	} else if ((cmd == ELS_CMD_FDISC) &amp;&amp; !lpfc_error_lost_link(irsp)) {</div><div class='add'>+		/* retry FDISCs every second up to devloss */</div><div class='add'>+		retry = 1;</div><div class='add'>+		maxretry = vport-&gt;cfg_devloss_tmo;</div><div class='add'>+		delay = 1000;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cmdiocb-&gt;retry++;</div><div class='hunk'>@@ -3389,11 +3454,17 @@ lpfc_cmpl_els_logo_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The driver received a LOGO from the rport and has ACK'd it.</div><div class='del'>-	 * At this point, the driver is done so release the IOCB and</div><div class='del'>-	 * remove the ndlp reference.</div><div class='add'>+	 * At this point, the driver is done so release the IOCB</div><div class='ctx'> 	 */</div><div class='ctx'> 	lpfc_els_free_iocb(phba, cmdiocb);</div><div class='del'>-	lpfc_nlp_put(ndlp);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Remove the ndlp reference if it's a fabric node that has</div><div class='add'>+	 * sent us an unsolicted LOGO.</div><div class='add'>+	 */</div><div class='add'>+	if (ndlp-&gt;nlp_type &amp; NLP_FABRIC)</div><div class='add'>+		lpfc_nlp_put(ndlp);</div><div class='add'>+</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4867,23 +4938,31 @@ lpfc_els_rcv_flogi(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 			    sizeof(struct lpfc_name));</div><div class='ctx'> </div><div class='ctx'> 		if (!rc) {</div><div class='del'>-			mbox = mempool_alloc(phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='del'>-			if (!mbox)</div><div class='add'>+			if (phba-&gt;sli_rev &lt; LPFC_SLI_REV4) {</div><div class='add'>+				mbox = mempool_alloc(phba-&gt;mbox_mem_pool,</div><div class='add'>+						     GFP_KERNEL);</div><div class='add'>+				if (!mbox)</div><div class='add'>+					return 1;</div><div class='add'>+				lpfc_linkdown(phba);</div><div class='add'>+				lpfc_init_link(phba, mbox,</div><div class='add'>+					       phba-&gt;cfg_topology,</div><div class='add'>+					       phba-&gt;cfg_link_speed);</div><div class='add'>+				mbox-&gt;u.mb.un.varInitLnk.lipsr_AL_PA = 0;</div><div class='add'>+				mbox-&gt;mbox_cmpl = lpfc_sli_def_mbox_cmpl;</div><div class='add'>+				mbox-&gt;vport = vport;</div><div class='add'>+				rc = lpfc_sli_issue_mbox(phba, mbox,</div><div class='add'>+							 MBX_NOWAIT);</div><div class='add'>+				lpfc_set_loopback_flag(phba);</div><div class='add'>+				if (rc == MBX_NOT_FINISHED)</div><div class='add'>+					mempool_free(mbox, phba-&gt;mbox_mem_pool);</div><div class='ctx'> 				return 1;</div><div class='del'>-</div><div class='del'>-			lpfc_linkdown(phba);</div><div class='del'>-			lpfc_init_link(phba, mbox,</div><div class='del'>-				       phba-&gt;cfg_topology,</div><div class='del'>-				       phba-&gt;cfg_link_speed);</div><div class='del'>-			mbox-&gt;u.mb.un.varInitLnk.lipsr_AL_PA = 0;</div><div class='del'>-			mbox-&gt;mbox_cmpl = lpfc_sli_def_mbox_cmpl;</div><div class='del'>-			mbox-&gt;vport = vport;</div><div class='del'>-			rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT);</div><div class='del'>-			lpfc_set_loopback_flag(phba);</div><div class='del'>-			if (rc == MBX_NOT_FINISHED) {</div><div class='del'>-				mempool_free(mbox, phba-&gt;mbox_mem_pool);</div><div class='add'>+			} else {</div><div class='add'>+				/* abort the flogi coming back to ourselves</div><div class='add'>+				 * due to external loopback on the port.</div><div class='add'>+				 */</div><div class='add'>+				lpfc_els_abort_flogi(phba);</div><div class='add'>+				return 0;</div><div class='ctx'> 			}</div><div class='del'>-			return 1;</div><div class='ctx'> 		} else if (rc &gt; 0) {	/* greater than */</div><div class='ctx'> 			spin_lock_irq(shost-&gt;host_lock);</div><div class='ctx'> 			vport-&gt;fc_flag |= FC_PT2PT_PLOGI;</div><div class='hunk'>@@ -5838,8 +5917,12 @@ lpfc_els_rcv_fan(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 			vport-&gt;fc_myDID = vport-&gt;fc_prevDID;</div><div class='ctx'> 			if (phba-&gt;sli_rev &lt; LPFC_SLI_REV4)</div><div class='ctx'> 				lpfc_issue_fabric_reglogin(vport);</div><div class='del'>-			else</div><div class='add'>+			else {</div><div class='add'>+				lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,</div><div class='add'>+					"3138 Need register VFI: (x%x/%x)\n",</div><div class='add'>+					vport-&gt;fc_prevDID, vport-&gt;fc_myDID);</div><div class='ctx'> 				lpfc_issue_reg_vfi(vport);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -6596,56 +6679,6 @@ dropit:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lpfc_find_vport_by_vpid - Find a vport on a HBA through vport identifier</div><div class='del'>- * @phba: pointer to lpfc hba data structure.</div><div class='del'>- * @vpi: host virtual N_Port identifier.</div><div class='del'>- *</div><div class='del'>- * This routine finds a vport on a HBA (referred by @phba) through a</div><div class='del'>- * @vpi. The function walks the HBA's vport list and returns the address</div><div class='del'>- * of the vport with the matching @vpi.</div><div class='del'>- *</div><div class='del'>- * Return code</div><div class='del'>- *    NULL - No vport with the matching @vpi found</div><div class='del'>- *    Otherwise - Address to the vport with the matching @vpi.</div><div class='del'>- **/</div><div class='del'>-struct lpfc_vport *</div><div class='del'>-lpfc_find_vport_by_vpid(struct lpfc_hba *phba, uint16_t vpi)</div><div class='del'>-{</div><div class='del'>-	struct lpfc_vport *vport;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='del'>-	/* The physical ports are always vpi 0 - translate is unnecessary. */</div><div class='del'>-	if (vpi &gt; 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * Translate the physical vpi to the logical vpi.  The</div><div class='del'>-		 * vport stores the logical vpi.</div><div class='del'>-		 */</div><div class='del'>-		for (i = 0; i &lt; phba-&gt;max_vpi; i++) {</div><div class='del'>-			if (vpi == phba-&gt;vpi_ids[i])</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (i &gt;= phba-&gt;max_vpi) {</div><div class='del'>-			lpfc_printf_log(phba, KERN_ERR, LOG_ELS,</div><div class='del'>-					 "2936 Could not find Vport mapped "</div><div class='del'>-					 "to vpi %d\n", vpi);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;phba-&gt;hbalock, flags);</div><div class='del'>-	list_for_each_entry(vport, &amp;phba-&gt;port_list, listentry) {</div><div class='del'>-		if (vport-&gt;vpi == i) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;phba-&gt;hbalock, flags);</div><div class='del'>-			return vport;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;phba-&gt;hbalock, flags);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * lpfc_els_unsol_event - Process an unsolicited event from an els sli ring</div><div class='ctx'>  * @phba: pointer to lpfc hba data structure.</div><div class='ctx'>  * @pring: pointer to a SLI ring.</div><div class='hunk'>@@ -7281,6 +7314,7 @@ lpfc_issue_els_fdisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 	/* Setup CSPs accordingly for Fabric */</div><div class='ctx'> 	sp-&gt;cmn.e_d_tov = 0;</div><div class='ctx'> 	sp-&gt;cmn.w2.r_a_tov = 0;</div><div class='add'>+	sp-&gt;cmn.virtual_fabric_support = 0;</div><div class='ctx'> 	sp-&gt;cls1.classValid = 0;</div><div class='ctx'> 	sp-&gt;cls2.seqDelivery = 1;</div><div class='ctx'> 	sp-&gt;cls3.seqDelivery = 1;</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c<br/>index 091f68e5cb70..678a4b11059c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_hbadisc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_hbadisc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_hbadisc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_hbadisc.c</a></div><div class='hunk'>@@ -1074,6 +1074,12 @@ lpfc_mbx_cmpl_local_config_link(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> </div><div class='ctx'> 	mempool_free(pmb, phba-&gt;mbox_mem_pool);</div><div class='ctx'> </div><div class='add'>+	/* don't perform discovery for SLI4 loopback diagnostic test */</div><div class='add'>+	if ((phba-&gt;sli_rev == LPFC_SLI_REV4) &amp;&amp;</div><div class='add'>+	    !(phba-&gt;hba_flag &amp; HBA_FCOE_MODE) &amp;&amp;</div><div class='add'>+	    (phba-&gt;link_flag &amp; LS_LOOPBACK_MODE))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (phba-&gt;fc_topology == LPFC_TOPOLOGY_LOOP &amp;&amp;</div><div class='ctx'> 	    vport-&gt;fc_flag &amp; FC_PUBLIC_LOOP &amp;&amp;</div><div class='ctx'> 	    !(vport-&gt;fc_flag &amp; FC_LBIT)) {</div><div class='hunk'>@@ -2646,9 +2652,14 @@ lpfc_init_vfi_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_vport *vport = mboxq-&gt;vport;</div><div class='ctx'> </div><div class='del'>-	/* VFI not supported on interface type 0, just do the flogi */</div><div class='del'>-	if (mboxq-&gt;u.mb.mbxStatus &amp;&amp; (bf_get(lpfc_sli_intf_if_type,</div><div class='del'>-	    &amp;phba-&gt;sli4_hba.sli_intf) != LPFC_SLI_INTF_IF_TYPE_0)) {</div><div class='add'>+	/*</div><div class='add'>+	 * VFI not supported on interface type 0, just do the flogi</div><div class='add'>+	 * Also continue if the VFI is in use - just use the same one.</div><div class='add'>+	 */</div><div class='add'>+	if (mboxq-&gt;u.mb.mbxStatus &amp;&amp;</div><div class='add'>+	    (bf_get(lpfc_sli_intf_if_type, &amp;phba-&gt;sli4_hba.sli_intf) !=</div><div class='add'>+			LPFC_SLI_INTF_IF_TYPE_0) &amp;&amp;</div><div class='add'>+	    mboxq-&gt;u.mb.mbxStatus != MBX_VFI_IN_USE) {</div><div class='ctx'> 		lpfc_printf_vlog(vport, KERN_ERR,</div><div class='ctx'> 				LOG_MBOX,</div><div class='ctx'> 				"2891 Init VFI mailbox failed 0x%x\n",</div><div class='hunk'>@@ -2842,10 +2853,10 @@ lpfc_mbx_cmpl_reg_vfi(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)</div><div class='ctx'> 			lpfc_disc_list_loopmap(vport);</div><div class='ctx'> 			/* Start discovery */</div><div class='ctx'> 			lpfc_disc_start(vport);</div><div class='del'>-			goto fail_free_mem;</div><div class='add'>+			goto out_free_mem;</div><div class='ctx'> 		}</div><div class='ctx'> 		lpfc_vport_set_state(vport, FC_VPORT_FAILED);</div><div class='del'>-		goto fail_free_mem;</div><div class='add'>+		goto out_free_mem;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* The VPI is implicitly registered when the VFI is registered */</div><div class='ctx'> 	spin_lock_irq(shost-&gt;host_lock);</div><div class='hunk'>@@ -2855,10 +2866,16 @@ lpfc_mbx_cmpl_reg_vfi(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)</div><div class='ctx'> 	vport-&gt;fc_flag &amp;= ~FC_VPORT_NEEDS_INIT_VPI;</div><div class='ctx'> 	spin_unlock_irq(shost-&gt;host_lock);</div><div class='ctx'> </div><div class='add'>+	/* In case SLI4 FC loopback test, we are ready */</div><div class='add'>+	if ((phba-&gt;sli_rev == LPFC_SLI_REV4) &amp;&amp;</div><div class='add'>+	    (phba-&gt;link_flag &amp; LS_LOOPBACK_MODE)) {</div><div class='add'>+		phba-&gt;link_state = LPFC_HBA_READY;</div><div class='add'>+		goto out_free_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (vport-&gt;port_state == LPFC_FABRIC_CFG_LINK) {</div><div class='ctx'> 		/* For private loop just start discovery and we are done. */</div><div class='ctx'> 		if ((phba-&gt;fc_topology == LPFC_TOPOLOGY_LOOP) &amp;&amp;</div><div class='del'>-		    (phba-&gt;alpa_map[0] == 0) &amp;&amp;</div><div class='ctx'> 		    !(vport-&gt;fc_flag &amp; FC_PUBLIC_LOOP)) {</div><div class='ctx'> 			/* Use loop map to make discovery list */</div><div class='ctx'> 			lpfc_disc_list_loopmap(vport);</div><div class='hunk'>@@ -2870,7 +2887,7 @@ lpfc_mbx_cmpl_reg_vfi(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-fail_free_mem:</div><div class='add'>+out_free_mem:</div><div class='ctx'> 	mempool_free(mboxq, phba-&gt;mbox_mem_pool);</div><div class='ctx'> 	lpfc_mbuf_free(phba, dmabuf-&gt;virt, dmabuf-&gt;phys);</div><div class='ctx'> 	kfree(dmabuf);</div><div class='hunk'>@@ -2923,6 +2940,7 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_vport *vport = phba-&gt;pport;</div><div class='ctx'> 	LPFC_MBOXQ_t *sparam_mbox, *cfglink_mbox = NULL;</div><div class='add'>+	struct Scsi_Host *shost;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct lpfc_dmabuf *mp;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -2946,6 +2964,7 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la)</div><div class='ctx'> 	phba-&gt;fc_topology = bf_get(lpfc_mbx_read_top_topology, la);</div><div class='ctx'> 	phba-&gt;link_flag &amp;= ~LS_NPIV_FAB_SUPPORTED;</div><div class='ctx'> </div><div class='add'>+	shost = lpfc_shost_from_vport(vport);</div><div class='ctx'> 	if (phba-&gt;fc_topology == LPFC_TOPOLOGY_LOOP) {</div><div class='ctx'> 		phba-&gt;sli3_options &amp;= ~LPFC_SLI3_NPIV_ENABLED;</div><div class='ctx'> </div><div class='hunk'>@@ -2957,8 +2976,11 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la)</div><div class='ctx'> 				"1309 Link Up Event npiv not supported in loop "</div><div class='ctx'> 				"topology\n");</div><div class='ctx'> 				/* Get Loop Map information */</div><div class='del'>-		if (bf_get(lpfc_mbx_read_top_il, la))</div><div class='add'>+		if (bf_get(lpfc_mbx_read_top_il, la)) {</div><div class='add'>+			spin_lock_irq(shost-&gt;host_lock);</div><div class='ctx'> 			vport-&gt;fc_flag |= FC_LBIT;</div><div class='add'>+			spin_unlock_irq(shost-&gt;host_lock);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		vport-&gt;fc_myDID = bf_get(lpfc_mbx_read_top_alpa_granted, la);</div><div class='ctx'> 		i = la-&gt;lilpBde64.tus.f.bdeSize;</div><div class='hunk'>@@ -3003,11 +3025,13 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!(phba-&gt;sli3_options &amp; LPFC_SLI3_NPIV_ENABLED)) {</div><div class='ctx'> 			if (phba-&gt;max_vpi &amp;&amp; phba-&gt;cfg_enable_npiv &amp;&amp;</div><div class='del'>-			   (phba-&gt;sli_rev == 3))</div><div class='add'>+			   (phba-&gt;sli_rev &gt;= LPFC_SLI_REV3))</div><div class='ctx'> 				phba-&gt;sli3_options |= LPFC_SLI3_NPIV_ENABLED;</div><div class='ctx'> 		}</div><div class='ctx'> 		vport-&gt;fc_myDID = phba-&gt;fc_pref_DID;</div><div class='add'>+		spin_lock_irq(shost-&gt;host_lock);</div><div class='ctx'> 		vport-&gt;fc_flag |= FC_LBIT;</div><div class='add'>+		spin_unlock_irq(shost-&gt;host_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> </div><div class='hunk'>@@ -3224,15 +3248,14 @@ lpfc_mbx_cmpl_read_topology(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 	} else if (bf_get(lpfc_mbx_read_top_att_type, la) ==</div><div class='ctx'> 		   LPFC_ATT_LINK_DOWN) {</div><div class='ctx'> 		phba-&gt;fc_stat.LinkDown++;</div><div class='del'>-		if (phba-&gt;link_flag &amp; LS_LOOPBACK_MODE) {</div><div class='add'>+		if (phba-&gt;link_flag &amp; LS_LOOPBACK_MODE)</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,</div><div class='ctx'> 				"1308 Link Down Event in loop back mode "</div><div class='ctx'> 				"x%x received "</div><div class='ctx'> 				"Data: x%x x%x x%x\n",</div><div class='ctx'> 				la-&gt;eventTag, phba-&gt;fc_eventTag,</div><div class='ctx'> 				phba-&gt;pport-&gt;port_state, vport-&gt;fc_flag);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='add'>+		else</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,</div><div class='ctx'> 				"1305 Link Down Event x%x received "</div><div class='ctx'> 				"Data: x%x x%x x%x x%x x%x\n",</div><div class='hunk'>@@ -3240,7 +3263,6 @@ lpfc_mbx_cmpl_read_topology(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 				phba-&gt;pport-&gt;port_state, vport-&gt;fc_flag,</div><div class='ctx'> 				bf_get(lpfc_mbx_read_top_mm, la),</div><div class='ctx'> 				bf_get(lpfc_mbx_read_top_fa, la));</div><div class='del'>-		}</div><div class='ctx'> 		lpfc_mbx_issue_link_down(phba);</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((bf_get(lpfc_mbx_read_top_mm, la)) &amp;&amp;</div><div class='hunk'>@@ -3594,6 +3616,7 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 	MAILBOX_t *mb = &amp;pmb-&gt;u.mb;</div><div class='ctx'> 	struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *) (pmb-&gt;context1);</div><div class='ctx'> 	struct lpfc_nodelist *ndlp;</div><div class='add'>+	struct Scsi_Host *shost;</div><div class='ctx'> </div><div class='ctx'> 	ndlp = (struct lpfc_nodelist *) pmb-&gt;context2;</div><div class='ctx'> 	pmb-&gt;context1 = NULL;</div><div class='hunk'>@@ -3639,8 +3662,12 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 		 * vport discovery */</div><div class='ctx'> 		if (!(vport-&gt;fc_flag &amp; FC_LOGO_RCVD_DID_CHNG))</div><div class='ctx'> 			lpfc_start_fdiscs(phba);</div><div class='del'>-		else</div><div class='add'>+		else {</div><div class='add'>+			shost = lpfc_shost_from_vport(vport);</div><div class='add'>+			spin_lock_irq(shost-&gt;host_lock);</div><div class='ctx'> 			vport-&gt;fc_flag &amp;= ~FC_LOGO_RCVD_DID_CHNG ;</div><div class='add'>+			spin_unlock_irq(shost-&gt;host_lock);</div><div class='add'>+		}</div><div class='ctx'> 		lpfc_do_scr_ns_plogi(phba, vport);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5353,6 +5380,73 @@ lpfc_findnode_wwpn(struct lpfc_vport *vport, struct lpfc_name *wwpn)</div><div class='ctx'> 	return ndlp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This routine looks up the ndlp lists for the given RPI. If the rpi</div><div class='add'>+ * is found, the routine returns the node element list pointer else</div><div class='add'>+ * return NULL.</div><div class='add'>+ */</div><div class='add'>+struct lpfc_nodelist *</div><div class='add'>+lpfc_findnode_rpi(struct lpfc_vport *vport, uint16_t rpi)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);</div><div class='add'>+	struct lpfc_nodelist *ndlp;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(shost-&gt;host_lock);</div><div class='add'>+	ndlp = __lpfc_findnode_rpi(vport, rpi);</div><div class='add'>+	spin_unlock_irq(shost-&gt;host_lock);</div><div class='add'>+	return ndlp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_find_vport_by_vpid - Find a vport on a HBA through vport identifier</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @vpi: the physical host virtual N_Port identifier.</div><div class='add'>+ *</div><div class='add'>+ * This routine finds a vport on a HBA (referred by @phba) through a</div><div class='add'>+ * @vpi. The function walks the HBA's vport list and returns the address</div><div class='add'>+ * of the vport with the matching @vpi.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *    NULL - No vport with the matching @vpi found</div><div class='add'>+ *    Otherwise - Address to the vport with the matching @vpi.</div><div class='add'>+ **/</div><div class='add'>+struct lpfc_vport *</div><div class='add'>+lpfc_find_vport_by_vpid(struct lpfc_hba *phba, uint16_t vpi)</div><div class='add'>+{</div><div class='add'>+	struct lpfc_vport *vport;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	/* The physical ports are always vpi 0 - translate is unnecessary. */</div><div class='add'>+	if (vpi &gt; 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * Translate the physical vpi to the logical vpi.  The</div><div class='add'>+		 * vport stores the logical vpi.</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; phba-&gt;max_vpi; i++) {</div><div class='add'>+			if (vpi == phba-&gt;vpi_ids[i])</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i &gt;= phba-&gt;max_vpi) {</div><div class='add'>+			lpfc_printf_log(phba, KERN_ERR, LOG_ELS,</div><div class='add'>+					 "2936 Could not find Vport mapped "</div><div class='add'>+					 "to vpi %d\n", vpi);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;phba-&gt;hbalock, flags);</div><div class='add'>+	list_for_each_entry(vport, &amp;phba-&gt;port_list, listentry) {</div><div class='add'>+		if (vport-&gt;vpi == i) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;phba-&gt;hbalock, flags);</div><div class='add'>+			return vport;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;phba-&gt;hbalock, flags);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void</div><div class='ctx'> lpfc_nlp_init(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 	      uint32_t did)</div><div class='hunk'>@@ -5599,7 +5693,7 @@ out:</div><div class='ctx'>  *</div><div class='ctx'>  * This function frees memory associated with the mailbox command.</div><div class='ctx'>  */</div><div class='del'>-static void</div><div class='add'>+void</div><div class='ctx'> lpfc_unregister_vfi_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_vport *vport = mboxq-&gt;vport;</div><div class='hunk'>@@ -5651,7 +5745,6 @@ lpfc_unregister_fcfi_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)</div><div class='ctx'> int</div><div class='ctx'> lpfc_unregister_fcf_prep(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='del'>-	LPFC_MBOXQ_t *mbox;</div><div class='ctx'> 	struct lpfc_vport **vports;</div><div class='ctx'> 	struct lpfc_nodelist *ndlp;</div><div class='ctx'> 	struct Scsi_Host *shost;</div><div class='hunk'>@@ -5687,35 +5780,9 @@ lpfc_unregister_fcf_prep(struct lpfc_hba *phba)</div><div class='ctx'> 	/* Cleanup any outstanding ELS commands */</div><div class='ctx'> 	lpfc_els_flush_all_cmd(phba);</div><div class='ctx'> </div><div class='del'>-	/* Unregister VFI */</div><div class='del'>-	mbox = mempool_alloc(phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='del'>-	if (!mbox) {</div><div class='del'>-		lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY|LOG_MBOX,</div><div class='del'>-				"2556 UNREG_VFI mbox allocation failed"</div><div class='del'>-				"HBA state x%x\n", phba-&gt;pport-&gt;port_state);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lpfc_unreg_vfi(mbox, phba-&gt;pport);</div><div class='del'>-	mbox-&gt;vport = phba-&gt;pport;</div><div class='del'>-	mbox-&gt;mbox_cmpl = lpfc_unregister_vfi_cmpl;</div><div class='del'>-</div><div class='del'>-	rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT);</div><div class='del'>-	if (rc == MBX_NOT_FINISHED) {</div><div class='del'>-		lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY|LOG_MBOX,</div><div class='del'>-				"2557 UNREG_VFI issue mbox failed rc x%x "</div><div class='del'>-				"HBA state x%x\n",</div><div class='del'>-				rc, phba-&gt;pport-&gt;port_state);</div><div class='del'>-		mempool_free(mbox, phba-&gt;mbox_mem_pool);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	shost = lpfc_shost_from_vport(phba-&gt;pport);</div><div class='del'>-	spin_lock_irq(shost-&gt;host_lock);</div><div class='del'>-	phba-&gt;pport-&gt;fc_flag &amp;= ~FC_VFI_REGISTERED;</div><div class='del'>-	spin_unlock_irq(shost-&gt;host_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	/* Unregister the physical port VFI */</div><div class='add'>+	rc = lpfc_issue_unreg_vfi(phba-&gt;pport);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h<br/>index 046edc4ab35f..7245bead3755 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_hw.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_hw.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_hw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_hw.h</a></div><div class='hunk'>@@ -349,6 +349,12 @@ struct csp {</div><div class='ctx'>  * Word 1 Bit 31 in FLOGI response is clean address bit</div><div class='ctx'>  */</div><div class='ctx'> #define clean_address_bit request_multiple_Nport /* Word 1, bit 31 */</div><div class='add'>+/*</div><div class='add'>+ * Word 1 Bit 30 in common service parameter is overloaded.</div><div class='add'>+ * Word 1 Bit 30 in FLOGI request is Virtual Fabrics</div><div class='add'>+ * Word 1 Bit 30 in PLOGI request is random offset</div><div class='add'>+ */</div><div class='add'>+#define virtual_fabric_support randomOffset /* Word 1, bit 30 */</div><div class='ctx'> #ifdef __BIG_ENDIAN_BITFIELD</div><div class='ctx'> 	uint16_t request_multiple_Nport:1;	/* FC Word 1, bit 31 */</div><div class='ctx'> 	uint16_t randomOffset:1;	/* FC Word 1, bit 30 */</div><div class='hunk'>@@ -1852,8 +1858,8 @@ typedef struct {</div><div class='ctx'> 	uint8_t fabric_AL_PA;	/* If using a Fabric Assigned AL_PA */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define FLAGS_LOCAL_LB               0x01 /* link_flags (=1) ENDEC loopback */</div><div class='ctx'> #define FLAGS_TOPOLOGY_MODE_LOOP_PT  0x00 /* Attempt loop then pt-pt */</div><div class='add'>+#define FLAGS_LOCAL_LB               0x01 /* link_flags (=1) ENDEC loopback */</div><div class='ctx'> #define FLAGS_TOPOLOGY_MODE_PT_PT    0x02 /* Attempt pt-pt only */</div><div class='ctx'> #define FLAGS_TOPOLOGY_MODE_LOOP     0x04 /* Attempt loop only */</div><div class='ctx'> #define FLAGS_TOPOLOGY_MODE_PT_LOOP  0x06 /* Attempt pt-pt then loop */</div><div class='hunk'>@@ -2819,7 +2825,8 @@ typedef struct {</div><div class='ctx'> #ifdef __BIG_ENDIAN_BITFIELD</div><div class='ctx'> 	uint32_t rsvd1     : 19;  /* Reserved                             */</div><div class='ctx'> 	uint32_t cdss      :  1;  /* Configure Data Security SLI          */</div><div class='del'>-	uint32_t rsvd2     :  3;  /* Reserved                             */</div><div class='add'>+	uint32_t casabt    :  1;  /* Configure async abts status notice   */</div><div class='add'>+	uint32_t rsvd2     :  2;  /* Reserved                             */</div><div class='ctx'> 	uint32_t cbg       :  1;  /* Configure BlockGuard                 */</div><div class='ctx'> 	uint32_t cmv       :  1;  /* Configure Max VPIs                   */</div><div class='ctx'> 	uint32_t ccrp      :  1;  /* Config Command Ring Polling          */</div><div class='hunk'>@@ -2839,14 +2846,16 @@ typedef struct {</div><div class='ctx'> 	uint32_t ccrp      :  1;  /* Config Command Ring Polling          */</div><div class='ctx'> 	uint32_t cmv	   :  1;  /* Configure Max VPIs                   */</div><div class='ctx'> 	uint32_t cbg       :  1;  /* Configure BlockGuard                 */</div><div class='del'>-	uint32_t rsvd2     :  3;  /* Reserved                             */</div><div class='add'>+	uint32_t rsvd2     :  2;  /* Reserved                             */</div><div class='add'>+	uint32_t casabt    :  1;  /* Configure async abts status notice   */</div><div class='ctx'> 	uint32_t cdss      :  1;  /* Configure Data Security SLI          */</div><div class='ctx'> 	uint32_t rsvd1     : 19;  /* Reserved                             */</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef __BIG_ENDIAN_BITFIELD</div><div class='ctx'> 	uint32_t rsvd3     : 19;  /* Reserved                             */</div><div class='ctx'> 	uint32_t gdss      :  1;  /* Configure Data Security SLI          */</div><div class='del'>-	uint32_t rsvd4     :  3;  /* Reserved                             */</div><div class='add'>+	uint32_t gasabt    :  1;  /* Grant async abts status notice       */</div><div class='add'>+	uint32_t rsvd4     :  2;  /* Reserved                             */</div><div class='ctx'> 	uint32_t gbg       :  1;  /* Grant BlockGuard                     */</div><div class='ctx'> 	uint32_t gmv	   :  1;  /* Grant Max VPIs                       */</div><div class='ctx'> 	uint32_t gcrp	   :  1;  /* Grant Command Ring Polling           */</div><div class='hunk'>@@ -2866,7 +2875,8 @@ typedef struct {</div><div class='ctx'> 	uint32_t gcrp	   :  1;  /* Grant Command Ring Polling           */</div><div class='ctx'> 	uint32_t gmv	   :  1;  /* Grant Max VPIs                       */</div><div class='ctx'> 	uint32_t gbg       :  1;  /* Grant BlockGuard                     */</div><div class='del'>-	uint32_t rsvd4     :  3;  /* Reserved                             */</div><div class='add'>+	uint32_t rsvd4     :  2;  /* Reserved                             */</div><div class='add'>+	uint32_t gasabt    :  1;  /* Grant async abts status notice       */</div><div class='ctx'> 	uint32_t gdss      :  1;  /* Configure Data Security SLI          */</div><div class='ctx'> 	uint32_t rsvd3     : 19;  /* Reserved                             */</div><div class='ctx'> #endif</div><div class='hunk'>@@ -3465,6 +3475,7 @@ typedef struct {</div><div class='ctx'> } ASYNCSTAT_FIELDS;</div><div class='ctx'> #define ASYNC_TEMP_WARN		0x100</div><div class='ctx'> #define ASYNC_TEMP_SAFE		0x101</div><div class='add'>+#define ASYNC_STATUS_CN		0x102</div><div class='ctx'> </div><div class='ctx'> /* IOCB Command template for CMD_IOCB_RCV_ELS64_CX (0xB7)</div><div class='ctx'>    or CMD_IOCB_RCV_SEQ64_CX (0xB5) */</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h<br/>index 98d21521f539..e5bfa7f334e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_hw4.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_hw4.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_hw4.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_hw4.h</a></div><div class='hunk'>@@ -1351,11 +1351,11 @@ struct lpfc_mbx_set_link_diag_loopback {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			uint32_t word0;</div><div class='ctx'> #define lpfc_mbx_set_diag_lpbk_type_SHIFT	0</div><div class='del'>-#define lpfc_mbx_set_diag_lpbk_type_MASK	0x00000001</div><div class='add'>+#define lpfc_mbx_set_diag_lpbk_type_MASK	0x00000003</div><div class='ctx'> #define lpfc_mbx_set_diag_lpbk_type_WORD	word0</div><div class='ctx'> #define LPFC_DIAG_LOOPBACK_TYPE_DISABLE		0x0</div><div class='ctx'> #define LPFC_DIAG_LOOPBACK_TYPE_INTERNAL	0x1</div><div class='del'>-#define LPFC_DIAG_LOOPBACK_TYPE_EXTERNAL	0x2</div><div class='add'>+#define LPFC_DIAG_LOOPBACK_TYPE_SERDES		0x2</div><div class='ctx'> #define lpfc_mbx_set_diag_lpbk_link_num_SHIFT	16</div><div class='ctx'> #define lpfc_mbx_set_diag_lpbk_link_num_MASK	0x0000003F</div><div class='ctx'> #define lpfc_mbx_set_diag_lpbk_link_num_WORD	word0</div><div class='hunk'>@@ -1830,6 +1830,8 @@ struct lpfc_mbx_init_vfi {</div><div class='ctx'> #define lpfc_init_vfi_hop_count_MASK	0x000000FF</div><div class='ctx'> #define lpfc_init_vfi_hop_count_WORD	word4</div><div class='ctx'> };</div><div class='add'>+#define MBX_VFI_IN_USE			0x9F02</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> struct lpfc_mbx_reg_vfi {</div><div class='ctx'> 	uint32_t word1;</div><div class='hunk'>@@ -2104,6 +2106,8 @@ struct lpfc_mbx_read_config {</div><div class='ctx'> #define lpfc_mbx_rd_conf_lnk_type_SHIFT		6</div><div class='ctx'> #define lpfc_mbx_rd_conf_lnk_type_MASK		0x00000003</div><div class='ctx'> #define lpfc_mbx_rd_conf_lnk_type_WORD		word2</div><div class='add'>+#define LPFC_LNK_TYPE_GE	0</div><div class='add'>+#define LPFC_LNK_TYPE_FC	1</div><div class='ctx'> #define lpfc_mbx_rd_conf_lnk_ldv_SHIFT		8</div><div class='ctx'> #define lpfc_mbx_rd_conf_lnk_ldv_MASK		0x00000001</div><div class='ctx'> #define lpfc_mbx_rd_conf_lnk_ldv_WORD		word2</div><div class='hunk'>@@ -3320,6 +3324,9 @@ struct wqe_rctl_dfctl {</div><div class='ctx'> #define wqe_la_SHIFT 3</div><div class='ctx'> #define wqe_la_MASK  0x000000001</div><div class='ctx'> #define wqe_la_WORD  word5</div><div class='add'>+#define wqe_xo_SHIFT	6</div><div class='add'>+#define wqe_xo_MASK	0x000000001</div><div class='add'>+#define wqe_xo_WORD	word5</div><div class='ctx'> #define wqe_ls_SHIFT 7</div><div class='ctx'> #define wqe_ls_MASK  0x000000001</div><div class='ctx'> #define wqe_ls_WORD  word5</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c<br/>index 55bc4fc7376f..dfea2dada02c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_init.c</a></div><div class='hunk'>@@ -62,7 +62,6 @@ static int lpfc_post_rcv_buf(struct lpfc_hba *);</div><div class='ctx'> static int lpfc_sli4_queue_verify(struct lpfc_hba *);</div><div class='ctx'> static int lpfc_create_bootstrap_mbox(struct lpfc_hba *);</div><div class='ctx'> static int lpfc_setup_endian_order(struct lpfc_hba *);</div><div class='del'>-static int lpfc_sli4_read_config(struct lpfc_hba *);</div><div class='ctx'> static void lpfc_destroy_bootstrap_mbox(struct lpfc_hba *);</div><div class='ctx'> static void lpfc_free_sgl_list(struct lpfc_hba *);</div><div class='ctx'> static int lpfc_init_sgl_list(struct lpfc_hba *);</div><div class='hunk'>@@ -475,27 +474,6 @@ lpfc_config_port_post(struct lpfc_hba *phba)</div><div class='ctx'> 	/* Get the default values for Model Name and Description */</div><div class='ctx'> 	lpfc_get_hba_model_desc(phba, phba-&gt;ModelName, phba-&gt;ModelDesc);</div><div class='ctx'> </div><div class='del'>-	if ((phba-&gt;cfg_link_speed &gt; LPFC_USER_LINK_SPEED_16G)</div><div class='del'>-	    || ((phba-&gt;cfg_link_speed == LPFC_USER_LINK_SPEED_1G)</div><div class='del'>-		&amp;&amp; !(phba-&gt;lmt &amp; LMT_1Gb))</div><div class='del'>-	    || ((phba-&gt;cfg_link_speed == LPFC_USER_LINK_SPEED_2G)</div><div class='del'>-		&amp;&amp; !(phba-&gt;lmt &amp; LMT_2Gb))</div><div class='del'>-	    || ((phba-&gt;cfg_link_speed == LPFC_USER_LINK_SPEED_4G)</div><div class='del'>-		&amp;&amp; !(phba-&gt;lmt &amp; LMT_4Gb))</div><div class='del'>-	    || ((phba-&gt;cfg_link_speed == LPFC_USER_LINK_SPEED_8G)</div><div class='del'>-		&amp;&amp; !(phba-&gt;lmt &amp; LMT_8Gb))</div><div class='del'>-	    || ((phba-&gt;cfg_link_speed == LPFC_USER_LINK_SPEED_10G)</div><div class='del'>-		&amp;&amp; !(phba-&gt;lmt &amp; LMT_10Gb))</div><div class='del'>-	    || ((phba-&gt;cfg_link_speed == LPFC_USER_LINK_SPEED_16G)</div><div class='del'>-		&amp;&amp; !(phba-&gt;lmt &amp; LMT_16Gb))) {</div><div class='del'>-		/* Reset link speed to auto */</div><div class='del'>-		lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,</div><div class='del'>-			"1302 Invalid speed for this board: "</div><div class='del'>-			"Reset link speed to auto: x%x\n",</div><div class='del'>-			phba-&gt;cfg_link_speed);</div><div class='del'>-			phba-&gt;cfg_link_speed = LPFC_USER_LINK_SPEED_AUTO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	phba-&gt;link_state = LPFC_LINK_DOWN;</div><div class='ctx'> </div><div class='ctx'> 	/* Only process IOCBs on ELS ring till hba_state is READY */</div><div class='hunk'>@@ -585,28 +563,10 @@ lpfc_config_port_post(struct lpfc_hba *phba)</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (phba-&gt;cfg_suppress_link_up == LPFC_INITIALIZE_LINK) {</div><div class='del'>-		lpfc_init_link(phba, pmb, phba-&gt;cfg_topology,</div><div class='del'>-			phba-&gt;cfg_link_speed);</div><div class='del'>-		pmb-&gt;mbox_cmpl = lpfc_sli_def_mbox_cmpl;</div><div class='del'>-		lpfc_set_loopback_flag(phba);</div><div class='del'>-		rc = lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT);</div><div class='del'>-		if (rc != MBX_SUCCESS) {</div><div class='del'>-			lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='del'>-				"0454 Adapter failed to init, mbxCmd x%x "</div><div class='del'>-				"INIT_LINK, mbxStatus x%x\n",</div><div class='del'>-				mb-&gt;mbxCommand, mb-&gt;mbxStatus);</div><div class='del'>-</div><div class='del'>-			/* Clear all interrupt enable conditions */</div><div class='del'>-			writel(0, phba-&gt;HCregaddr);</div><div class='del'>-			readl(phba-&gt;HCregaddr); /* flush */</div><div class='del'>-			/* Clear all pending interrupts */</div><div class='del'>-			writel(0xffffffff, phba-&gt;HAregaddr);</div><div class='del'>-			readl(phba-&gt;HAregaddr); /* flush */</div><div class='del'>-			phba-&gt;link_state = LPFC_HBA_ERROR;</div><div class='del'>-			if (rc != MBX_BUSY)</div><div class='del'>-				mempool_free(pmb, phba-&gt;mbox_mem_pool);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='add'>+		mempool_free(pmb, phba-&gt;mbox_mem_pool);</div><div class='add'>+		rc = phba-&gt;lpfc_hba_init_link(phba, MBX_NOWAIT);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* MBOX buffer will be freed in mbox compl */</div><div class='ctx'> 	pmb = mempool_alloc(phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='hunk'>@@ -668,6 +628,28 @@ lpfc_config_port_post(struct lpfc_hba *phba)</div><div class='ctx'> int</div><div class='ctx'> lpfc_hba_init_link(struct lpfc_hba *phba, uint32_t flag)</div><div class='ctx'> {</div><div class='add'>+	return lpfc_hba_init_link_fc_topology(phba, phba-&gt;cfg_topology, flag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_hba_init_link_fc_topology - Initialize FC link with desired topology</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @fc_topology: desired fc topology.</div><div class='add'>+ * @flag: mailbox command issue mode - either MBX_POLL or MBX_NOWAIT</div><div class='add'>+ *</div><div class='add'>+ * This routine will issue the INIT_LINK mailbox command call.</div><div class='add'>+ * It is available to other drivers through the lpfc_hba data</div><div class='add'>+ * structure for use as a delayed link up mechanism with the</div><div class='add'>+ * module parameter lpfc_suppress_link_up.</div><div class='add'>+ *</div><div class='add'>+ * Return code</div><div class='add'>+ *              0 - success</div><div class='add'>+ *              Any other value - error</div><div class='add'>+ **/</div><div class='add'>+int</div><div class='add'>+lpfc_hba_init_link_fc_topology(struct lpfc_hba *phba, uint32_t fc_topology,</div><div class='add'>+			       uint32_t flag)</div><div class='add'>+{</div><div class='ctx'> 	struct lpfc_vport *vport = phba-&gt;pport;</div><div class='ctx'> 	LPFC_MBOXQ_t *pmb;</div><div class='ctx'> 	MAILBOX_t *mb;</div><div class='hunk'>@@ -681,9 +663,30 @@ lpfc_hba_init_link(struct lpfc_hba *phba, uint32_t flag)</div><div class='ctx'> 	mb = &amp;pmb-&gt;u.mb;</div><div class='ctx'> 	pmb-&gt;vport = vport;</div><div class='ctx'> </div><div class='del'>-	lpfc_init_link(phba, pmb, phba-&gt;cfg_topology, phba-&gt;cfg_link_speed);</div><div class='add'>+	if ((phba-&gt;cfg_link_speed &gt; LPFC_USER_LINK_SPEED_MAX) ||</div><div class='add'>+	    ((phba-&gt;cfg_link_speed == LPFC_USER_LINK_SPEED_1G) &amp;&amp;</div><div class='add'>+	     !(phba-&gt;lmt &amp; LMT_1Gb)) ||</div><div class='add'>+	    ((phba-&gt;cfg_link_speed == LPFC_USER_LINK_SPEED_2G) &amp;&amp;</div><div class='add'>+	     !(phba-&gt;lmt &amp; LMT_2Gb)) ||</div><div class='add'>+	    ((phba-&gt;cfg_link_speed == LPFC_USER_LINK_SPEED_4G) &amp;&amp;</div><div class='add'>+	     !(phba-&gt;lmt &amp; LMT_4Gb)) ||</div><div class='add'>+	    ((phba-&gt;cfg_link_speed == LPFC_USER_LINK_SPEED_8G) &amp;&amp;</div><div class='add'>+	     !(phba-&gt;lmt &amp; LMT_8Gb)) ||</div><div class='add'>+	    ((phba-&gt;cfg_link_speed == LPFC_USER_LINK_SPEED_10G) &amp;&amp;</div><div class='add'>+	     !(phba-&gt;lmt &amp; LMT_10Gb)) ||</div><div class='add'>+	    ((phba-&gt;cfg_link_speed == LPFC_USER_LINK_SPEED_16G) &amp;&amp;</div><div class='add'>+	     !(phba-&gt;lmt &amp; LMT_16Gb))) {</div><div class='add'>+		/* Reset link speed to auto */</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,</div><div class='add'>+			"1302 Invalid speed for this board:%d "</div><div class='add'>+			"Reset link speed to auto.\n",</div><div class='add'>+			phba-&gt;cfg_link_speed);</div><div class='add'>+			phba-&gt;cfg_link_speed = LPFC_USER_LINK_SPEED_AUTO;</div><div class='add'>+	}</div><div class='add'>+	lpfc_init_link(phba, pmb, fc_topology, phba-&gt;cfg_link_speed);</div><div class='ctx'> 	pmb-&gt;mbox_cmpl = lpfc_sli_def_mbox_cmpl;</div><div class='del'>-	lpfc_set_loopback_flag(phba);</div><div class='add'>+	if (phba-&gt;sli_rev &lt; LPFC_SLI_REV4)</div><div class='add'>+		lpfc_set_loopback_flag(phba);</div><div class='ctx'> 	rc = lpfc_sli_issue_mbox(phba, pmb, flag);</div><div class='ctx'> 	if ((rc != MBX_BUSY) &amp;&amp; (rc != MBX_SUCCESS)) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='hunk'>@@ -1437,7 +1440,10 @@ lpfc_handle_eratt_s4(struct lpfc_hba *phba)</div><div class='ctx'> 	uint32_t event_data;</div><div class='ctx'> 	struct Scsi_Host *shost;</div><div class='ctx'> 	uint32_t if_type;</div><div class='del'>-	struct lpfc_register portstat_reg;</div><div class='add'>+	struct lpfc_register portstat_reg = {0};</div><div class='add'>+	uint32_t reg_err1, reg_err2;</div><div class='add'>+	uint32_t uerrlo_reg, uemasklo_reg;</div><div class='add'>+	uint32_t pci_rd_rc1, pci_rd_rc2;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/* If the pci channel is offline, ignore possible errors, since</div><div class='hunk'>@@ -1449,38 +1455,52 @@ lpfc_handle_eratt_s4(struct lpfc_hba *phba)</div><div class='ctx'> 	if (!phba-&gt;cfg_enable_hba_reset)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* Send an internal error event to mgmt application */</div><div class='del'>-	lpfc_board_errevt_to_mgmt(phba);</div><div class='del'>-</div><div class='del'>-	/* For now, the actual action for SLI4 device handling is not</div><div class='del'>-	 * specified yet, just treated it as adaptor hardware failure</div><div class='del'>-	 */</div><div class='del'>-	event_data = FC_REG_DUMP_EVENT;</div><div class='del'>-	shost = lpfc_shost_from_vport(vport);</div><div class='del'>-	fc_host_post_vendor_event(shost, fc_get_event_number(),</div><div class='del'>-				  sizeof(event_data), (char *) &amp;event_data,</div><div class='del'>-				  SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);</div><div class='del'>-</div><div class='ctx'> 	if_type = bf_get(lpfc_sli_intf_if_type, &amp;phba-&gt;sli4_hba.sli_intf);</div><div class='ctx'> 	switch (if_type) {</div><div class='ctx'> 	case LPFC_SLI_INTF_IF_TYPE_0:</div><div class='add'>+		pci_rd_rc1 = lpfc_readl(</div><div class='add'>+				phba-&gt;sli4_hba.u.if_type0.UERRLOregaddr,</div><div class='add'>+				&amp;uerrlo_reg);</div><div class='add'>+		pci_rd_rc2 = lpfc_readl(</div><div class='add'>+				phba-&gt;sli4_hba.u.if_type0.UEMASKLOregaddr,</div><div class='add'>+				&amp;uemasklo_reg);</div><div class='add'>+		/* consider PCI bus read error as pci_channel_offline */</div><div class='add'>+		if (pci_rd_rc1 == -EIO &amp;&amp; pci_rd_rc2 == -EIO)</div><div class='add'>+			return;</div><div class='ctx'> 		lpfc_sli4_offline_eratt(phba);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LPFC_SLI_INTF_IF_TYPE_2:</div><div class='del'>-		portstat_reg.word0 =</div><div class='del'>-			readl(phba-&gt;sli4_hba.u.if_type2.STATUSregaddr);</div><div class='del'>-</div><div class='add'>+		pci_rd_rc1 = lpfc_readl(</div><div class='add'>+				phba-&gt;sli4_hba.u.if_type2.STATUSregaddr,</div><div class='add'>+				&amp;portstat_reg.word0);</div><div class='add'>+		/* consider PCI bus read error as pci_channel_offline */</div><div class='add'>+		if (pci_rd_rc1 == -EIO)</div><div class='add'>+			return;</div><div class='add'>+		reg_err1 = readl(phba-&gt;sli4_hba.u.if_type2.ERR1regaddr);</div><div class='add'>+		reg_err2 = readl(phba-&gt;sli4_hba.u.if_type2.ERR2regaddr);</div><div class='ctx'> 		if (bf_get(lpfc_sliport_status_oti, &amp;portstat_reg)) {</div><div class='ctx'> 			/* TODO: Register for Overtemp async events. */</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 				"2889 Port Overtemperature event, "</div><div class='del'>-				"taking port\n");</div><div class='add'>+				"taking port offline\n");</div><div class='ctx'> 			spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 			phba-&gt;over_temp_state = HBA_OVER_TEMP;</div><div class='ctx'> 			spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 			lpfc_sli4_offline_eratt(phba);</div><div class='del'>-			return;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='add'>+		if (reg_err1 == SLIPORT_ERR1_REG_ERR_CODE_2 &amp;&amp;</div><div class='add'>+		    reg_err2 == SLIPORT_ERR2_REG_FW_RESTART)</div><div class='add'>+			lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='add'>+					"3143 Port Down: Firmware Restarted\n");</div><div class='add'>+		else if (reg_err1 == SLIPORT_ERR1_REG_ERR_CODE_2 &amp;&amp;</div><div class='add'>+			 reg_err2 == SLIPORT_ERR2_REG_FORCED_DUMP)</div><div class='add'>+			lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='add'>+					"3144 Port Down: Debug Dump\n");</div><div class='add'>+		else if (reg_err1 == SLIPORT_ERR1_REG_ERR_CODE_2 &amp;&amp;</div><div class='add'>+			 reg_err2 == SLIPORT_ERR2_REG_FUNC_PROVISON)</div><div class='add'>+			lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='add'>+					"3145 Port Down: Provisioning\n");</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * On error status condition, driver need to wait for port</div><div class='ctx'> 		 * ready before performing reset.</div><div class='hunk'>@@ -1489,14 +1509,19 @@ lpfc_handle_eratt_s4(struct lpfc_hba *phba)</div><div class='ctx'> 		if (!rc) {</div><div class='ctx'> 			/* need reset: attempt for port recovery */</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='del'>-					"2887 Port Error: Attempting "</div><div class='del'>-					"Port Recovery\n");</div><div class='add'>+					"2887 Reset Needed: Attempting Port "</div><div class='add'>+					"Recovery...\n");</div><div class='ctx'> 			lpfc_offline_prep(phba);</div><div class='ctx'> 			lpfc_offline(phba);</div><div class='ctx'> 			lpfc_sli_brdrestart(phba);</div><div class='ctx'> 			if (lpfc_online(phba) == 0) {</div><div class='ctx'> 				lpfc_unblock_mgmt_io(phba);</div><div class='del'>-				return;</div><div class='add'>+				/* don't report event on forced debug dump */</div><div class='add'>+				if (reg_err1 == SLIPORT_ERR1_REG_ERR_CODE_2 &amp;&amp;</div><div class='add'>+				    reg_err2 == SLIPORT_ERR2_REG_FORCED_DUMP)</div><div class='add'>+					return;</div><div class='add'>+				else</div><div class='add'>+					break;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* fall through for not able to recover */</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1506,6 +1531,16 @@ lpfc_handle_eratt_s4(struct lpfc_hba *phba)</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	lpfc_printf_log(phba, KERN_WARNING, LOG_INIT,</div><div class='add'>+			"3123 Report dump event to upper layer\n");</div><div class='add'>+	/* Send an internal error event to mgmt application */</div><div class='add'>+	lpfc_board_errevt_to_mgmt(phba);</div><div class='add'>+</div><div class='add'>+	event_data = FC_REG_DUMP_EVENT;</div><div class='add'>+	shost = lpfc_shost_from_vport(vport);</div><div class='add'>+	fc_host_post_vendor_event(shost, fc_get_event_number(),</div><div class='add'>+				  sizeof(event_data), (char *) &amp;event_data,</div><div class='add'>+				  SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2674,6 +2709,32 @@ lpfc_offline(struct lpfc_hba *phba)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * lpfc_scsi_buf_update - Update the scsi_buffers that are already allocated.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This routine goes through all the scsi buffers in the system and updates the</div><div class='add'>+ * Physical XRIs assigned to the SCSI buffer because these may change after any</div><div class='add'>+ * firmware reset</div><div class='add'>+ *</div><div class='add'>+ * Return codes</div><div class='add'>+ *   0 - successful (for now, it always returns 0)</div><div class='add'>+ **/</div><div class='add'>+int</div><div class='add'>+lpfc_scsi_buf_update(struct lpfc_hba *phba)</div><div class='add'>+{</div><div class='add'>+	struct lpfc_scsi_buf *sb, *sb_next;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+	spin_lock(&amp;phba-&gt;scsi_buf_list_lock);</div><div class='add'>+	list_for_each_entry_safe(sb, sb_next, &amp;phba-&gt;lpfc_scsi_buf_list, list)</div><div class='add'>+		sb-&gt;cur_iocbq.sli4_xritag =</div><div class='add'>+			phba-&gt;sli4_hba.xri_ids[sb-&gt;cur_iocbq.sli4_lxritag];</div><div class='add'>+	spin_unlock(&amp;phba-&gt;scsi_buf_list_lock);</div><div class='add'>+	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * lpfc_scsi_free - Free all the SCSI buffers and IOCBs from driver lists</div><div class='ctx'>  * @phba: pointer to lpfc hba data structure.</div><div class='ctx'>  *</div><div class='hunk'>@@ -5040,15 +5101,8 @@ lpfc_sli4_init_rpi_hdrs(struct lpfc_hba *phba)</div><div class='ctx'> 	struct lpfc_rpi_hdr *rpi_hdr;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;phba-&gt;sli4_hba.lpfc_rpi_hdr_list);</div><div class='del'>-	/*</div><div class='del'>-	 * If the SLI4 port supports extents, posting the rpi header isn't</div><div class='del'>-	 * required.  Set the expected maximum count and let the actual value</div><div class='del'>-	 * get set when extents are fully allocated.</div><div class='del'>-	 */</div><div class='del'>-	if (!phba-&gt;sli4_hba.rpi_hdrs_in_use) {</div><div class='del'>-		phba-&gt;sli4_hba.next_rpi = phba-&gt;sli4_hba.max_cfg_param.max_rpi;</div><div class='add'>+	if (!phba-&gt;sli4_hba.rpi_hdrs_in_use)</div><div class='ctx'> 		return rc;</div><div class='del'>-	}</div><div class='ctx'> 	if (phba-&gt;sli4_hba.extents_in_use)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='hunk'>@@ -5942,7 +5996,7 @@ lpfc_destroy_bootstrap_mbox(struct lpfc_hba *phba)</div><div class='ctx'>  * 	-ENOMEM - No available memory</div><div class='ctx'>  *      -EIO - The mailbox failed to complete successfully.</div><div class='ctx'>  **/</div><div class='del'>-static int</div><div class='add'>+int</div><div class='ctx'> lpfc_sli4_read_config(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='ctx'> 	LPFC_MBOXQ_t *pmb;</div><div class='hunk'>@@ -5974,6 +6028,20 @@ lpfc_sli4_read_config(struct lpfc_hba *phba)</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rd_config = &amp;pmb-&gt;u.mqe.un.rd_config;</div><div class='add'>+		if (bf_get(lpfc_mbx_rd_conf_lnk_ldv, rd_config)) {</div><div class='add'>+			phba-&gt;sli4_hba.lnk_info.lnk_dv = LPFC_LNK_DAT_VAL;</div><div class='add'>+			phba-&gt;sli4_hba.lnk_info.lnk_tp =</div><div class='add'>+				bf_get(lpfc_mbx_rd_conf_lnk_type, rd_config);</div><div class='add'>+			phba-&gt;sli4_hba.lnk_info.lnk_no =</div><div class='add'>+				bf_get(lpfc_mbx_rd_conf_lnk_numb, rd_config);</div><div class='add'>+			lpfc_printf_log(phba, KERN_INFO, LOG_SLI,</div><div class='add'>+					"3081 lnk_type:%d, lnk_numb:%d\n",</div><div class='add'>+					phba-&gt;sli4_hba.lnk_info.lnk_tp,</div><div class='add'>+					phba-&gt;sli4_hba.lnk_info.lnk_no);</div><div class='add'>+		} else</div><div class='add'>+			lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,</div><div class='add'>+					"3082 Mailbox (x%x) returned ldv:x0\n",</div><div class='add'>+					bf_get(lpfc_mqe_command, &amp;pmb-&gt;u.mqe));</div><div class='ctx'> 		phba-&gt;sli4_hba.extents_in_use =</div><div class='ctx'> 			bf_get(lpfc_mbx_rd_conf_extnts_inuse, rd_config);</div><div class='ctx'> 		phba-&gt;sli4_hba.max_cfg_param.max_xri =</div><div class='hunk'>@@ -6462,6 +6530,7 @@ out_free_fcp_wq:</div><div class='ctx'> 		phba-&gt;sli4_hba.fcp_wq[fcp_wqidx] = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(phba-&gt;sli4_hba.fcp_wq);</div><div class='add'>+	phba-&gt;sli4_hba.fcp_wq = NULL;</div><div class='ctx'> out_free_els_wq:</div><div class='ctx'> 	lpfc_sli4_queue_free(phba-&gt;sli4_hba.els_wq);</div><div class='ctx'> 	phba-&gt;sli4_hba.els_wq = NULL;</div><div class='hunk'>@@ -6474,6 +6543,7 @@ out_free_fcp_cq:</div><div class='ctx'> 		phba-&gt;sli4_hba.fcp_cq[fcp_cqidx] = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(phba-&gt;sli4_hba.fcp_cq);</div><div class='add'>+	phba-&gt;sli4_hba.fcp_cq = NULL;</div><div class='ctx'> out_free_els_cq:</div><div class='ctx'> 	lpfc_sli4_queue_free(phba-&gt;sli4_hba.els_cq);</div><div class='ctx'> 	phba-&gt;sli4_hba.els_cq = NULL;</div><div class='hunk'>@@ -6486,6 +6556,7 @@ out_free_fp_eq:</div><div class='ctx'> 		phba-&gt;sli4_hba.fp_eq[fcp_eqidx] = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(phba-&gt;sli4_hba.fp_eq);</div><div class='add'>+	phba-&gt;sli4_hba.fp_eq = NULL;</div><div class='ctx'> out_free_sp_eq:</div><div class='ctx'> 	lpfc_sli4_queue_free(phba-&gt;sli4_hba.sp_eq);</div><div class='ctx'> 	phba-&gt;sli4_hba.sp_eq = NULL;</div><div class='hunk'>@@ -6519,8 +6590,10 @@ lpfc_sli4_queue_destroy(struct lpfc_hba *phba)</div><div class='ctx'> 	phba-&gt;sli4_hba.els_wq = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Release FCP work queue */</div><div class='del'>-	for (fcp_qidx = 0; fcp_qidx &lt; phba-&gt;cfg_fcp_wq_count; fcp_qidx++)</div><div class='del'>-		lpfc_sli4_queue_free(phba-&gt;sli4_hba.fcp_wq[fcp_qidx]);</div><div class='add'>+	if (phba-&gt;sli4_hba.fcp_wq != NULL)</div><div class='add'>+		for (fcp_qidx = 0; fcp_qidx &lt; phba-&gt;cfg_fcp_wq_count;</div><div class='add'>+		     fcp_qidx++)</div><div class='add'>+			lpfc_sli4_queue_free(phba-&gt;sli4_hba.fcp_wq[fcp_qidx]);</div><div class='ctx'> 	kfree(phba-&gt;sli4_hba.fcp_wq);</div><div class='ctx'> 	phba-&gt;sli4_hba.fcp_wq = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -6540,15 +6613,18 @@ lpfc_sli4_queue_destroy(struct lpfc_hba *phba)</div><div class='ctx'> </div><div class='ctx'> 	/* Release FCP response complete queue */</div><div class='ctx'> 	fcp_qidx = 0;</div><div class='del'>-	do</div><div class='del'>-		lpfc_sli4_queue_free(phba-&gt;sli4_hba.fcp_cq[fcp_qidx]);</div><div class='del'>-	while (++fcp_qidx &lt; phba-&gt;cfg_fcp_eq_count);</div><div class='add'>+	if (phba-&gt;sli4_hba.fcp_cq != NULL)</div><div class='add'>+		do</div><div class='add'>+			lpfc_sli4_queue_free(phba-&gt;sli4_hba.fcp_cq[fcp_qidx]);</div><div class='add'>+		while (++fcp_qidx &lt; phba-&gt;cfg_fcp_eq_count);</div><div class='ctx'> 	kfree(phba-&gt;sli4_hba.fcp_cq);</div><div class='ctx'> 	phba-&gt;sli4_hba.fcp_cq = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Release fast-path event queue */</div><div class='del'>-	for (fcp_qidx = 0; fcp_qidx &lt; phba-&gt;cfg_fcp_eq_count; fcp_qidx++)</div><div class='del'>-		lpfc_sli4_queue_free(phba-&gt;sli4_hba.fp_eq[fcp_qidx]);</div><div class='add'>+	if (phba-&gt;sli4_hba.fp_eq != NULL)</div><div class='add'>+		for (fcp_qidx = 0; fcp_qidx &lt; phba-&gt;cfg_fcp_eq_count;</div><div class='add'>+		     fcp_qidx++)</div><div class='add'>+			lpfc_sli4_queue_free(phba-&gt;sli4_hba.fp_eq[fcp_qidx]);</div><div class='ctx'> 	kfree(phba-&gt;sli4_hba.fp_eq);</div><div class='ctx'> 	phba-&gt;sli4_hba.fp_eq = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -6601,11 +6677,18 @@ lpfc_sli4_queue_setup(struct lpfc_hba *phba)</div><div class='ctx'> 			phba-&gt;sli4_hba.sp_eq-&gt;queue_id);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up fast-path event queue */</div><div class='add'>+	if (phba-&gt;cfg_fcp_eq_count &amp;&amp; !phba-&gt;sli4_hba.fp_eq) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='add'>+				"3147 Fast-path EQs not allocated\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto out_destroy_sp_eq;</div><div class='add'>+	}</div><div class='ctx'> 	for (fcp_eqidx = 0; fcp_eqidx &lt; phba-&gt;cfg_fcp_eq_count; fcp_eqidx++) {</div><div class='ctx'> 		if (!phba-&gt;sli4_hba.fp_eq[fcp_eqidx]) {</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 					"0522 Fast-path EQ (%d) not "</div><div class='ctx'> 					"allocated\n", fcp_eqidx);</div><div class='add'>+			rc = -ENOMEM;</div><div class='ctx'> 			goto out_destroy_fp_eq;</div><div class='ctx'> 		}</div><div class='ctx'> 		rc = lpfc_eq_create(phba, phba-&gt;sli4_hba.fp_eq[fcp_eqidx],</div><div class='hunk'>@@ -6630,6 +6713,7 @@ lpfc_sli4_queue_setup(struct lpfc_hba *phba)</div><div class='ctx'> 	if (!phba-&gt;sli4_hba.mbx_cq) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 				"0528 Mailbox CQ not allocated\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='ctx'> 		goto out_destroy_fp_eq;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = lpfc_cq_create(phba, phba-&gt;sli4_hba.mbx_cq, phba-&gt;sli4_hba.sp_eq,</div><div class='hunk'>@@ -6649,6 +6733,7 @@ lpfc_sli4_queue_setup(struct lpfc_hba *phba)</div><div class='ctx'> 	if (!phba-&gt;sli4_hba.els_cq) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 				"0530 ELS CQ not allocated\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='ctx'> 		goto out_destroy_mbx_cq;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = lpfc_cq_create(phba, phba-&gt;sli4_hba.els_cq, phba-&gt;sli4_hba.sp_eq,</div><div class='hunk'>@@ -6665,12 +6750,20 @@ lpfc_sli4_queue_setup(struct lpfc_hba *phba)</div><div class='ctx'> 			phba-&gt;sli4_hba.sp_eq-&gt;queue_id);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up fast-path FCP Response Complete Queue */</div><div class='add'>+	if (!phba-&gt;sli4_hba.fcp_cq) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='add'>+				"3148 Fast-path FCP CQ array not "</div><div class='add'>+				"allocated\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto out_destroy_els_cq;</div><div class='add'>+	}</div><div class='ctx'> 	fcp_cqidx = 0;</div><div class='ctx'> 	do {</div><div class='ctx'> 		if (!phba-&gt;sli4_hba.fcp_cq[fcp_cqidx]) {</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 					"0526 Fast-path FCP CQ (%d) not "</div><div class='ctx'> 					"allocated\n", fcp_cqidx);</div><div class='add'>+			rc = -ENOMEM;</div><div class='ctx'> 			goto out_destroy_fcp_cq;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (phba-&gt;cfg_fcp_eq_count)</div><div class='hunk'>@@ -6709,6 +6802,7 @@ lpfc_sli4_queue_setup(struct lpfc_hba *phba)</div><div class='ctx'> 	if (!phba-&gt;sli4_hba.mbx_wq) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 				"0538 Slow-path MQ not allocated\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='ctx'> 		goto out_destroy_fcp_cq;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = lpfc_mq_create(phba, phba-&gt;sli4_hba.mbx_wq,</div><div class='hunk'>@@ -6728,6 +6822,7 @@ lpfc_sli4_queue_setup(struct lpfc_hba *phba)</div><div class='ctx'> 	if (!phba-&gt;sli4_hba.els_wq) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 				"0536 Slow-path ELS WQ not allocated\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='ctx'> 		goto out_destroy_mbx_wq;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = lpfc_wq_create(phba, phba-&gt;sli4_hba.els_wq,</div><div class='hunk'>@@ -6744,11 +6839,19 @@ lpfc_sli4_queue_setup(struct lpfc_hba *phba)</div><div class='ctx'> 			phba-&gt;sli4_hba.els_cq-&gt;queue_id);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up fast-path FCP Work Queue */</div><div class='add'>+	if (!phba-&gt;sli4_hba.fcp_wq) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='add'>+				"3149 Fast-path FCP WQ array not "</div><div class='add'>+				"allocated\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto out_destroy_els_wq;</div><div class='add'>+	}</div><div class='ctx'> 	for (fcp_wqidx = 0; fcp_wqidx &lt; phba-&gt;cfg_fcp_wq_count; fcp_wqidx++) {</div><div class='ctx'> 		if (!phba-&gt;sli4_hba.fcp_wq[fcp_wqidx]) {</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 					"0534 Fast-path FCP WQ (%d) not "</div><div class='ctx'> 					"allocated\n", fcp_wqidx);</div><div class='add'>+			rc = -ENOMEM;</div><div class='ctx'> 			goto out_destroy_fcp_wq;</div><div class='ctx'> 		}</div><div class='ctx'> 		rc = lpfc_wq_create(phba, phba-&gt;sli4_hba.fcp_wq[fcp_wqidx],</div><div class='hunk'>@@ -6779,6 +6882,7 @@ lpfc_sli4_queue_setup(struct lpfc_hba *phba)</div><div class='ctx'> 	if (!phba-&gt;sli4_hba.hdr_rq || !phba-&gt;sli4_hba.dat_rq) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='ctx'> 				"0540 Receive Queue not allocated\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='ctx'> 		goto out_destroy_fcp_wq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -6805,18 +6909,21 @@ lpfc_sli4_queue_setup(struct lpfc_hba *phba)</div><div class='ctx'> out_destroy_fcp_wq:</div><div class='ctx'> 	for (--fcp_wqidx; fcp_wqidx &gt;= 0; fcp_wqidx--)</div><div class='ctx'> 		lpfc_wq_destroy(phba, phba-&gt;sli4_hba.fcp_wq[fcp_wqidx]);</div><div class='add'>+out_destroy_els_wq:</div><div class='ctx'> 	lpfc_wq_destroy(phba, phba-&gt;sli4_hba.els_wq);</div><div class='ctx'> out_destroy_mbx_wq:</div><div class='ctx'> 	lpfc_mq_destroy(phba, phba-&gt;sli4_hba.mbx_wq);</div><div class='ctx'> out_destroy_fcp_cq:</div><div class='ctx'> 	for (--fcp_cqidx; fcp_cqidx &gt;= 0; fcp_cqidx--)</div><div class='ctx'> 		lpfc_cq_destroy(phba, phba-&gt;sli4_hba.fcp_cq[fcp_cqidx]);</div><div class='add'>+out_destroy_els_cq:</div><div class='ctx'> 	lpfc_cq_destroy(phba, phba-&gt;sli4_hba.els_cq);</div><div class='ctx'> out_destroy_mbx_cq:</div><div class='ctx'> 	lpfc_cq_destroy(phba, phba-&gt;sli4_hba.mbx_cq);</div><div class='ctx'> out_destroy_fp_eq:</div><div class='ctx'> 	for (--fcp_eqidx; fcp_eqidx &gt;= 0; fcp_eqidx--)</div><div class='ctx'> 		lpfc_eq_destroy(phba, phba-&gt;sli4_hba.fp_eq[fcp_eqidx]);</div><div class='add'>+out_destroy_sp_eq:</div><div class='ctx'> 	lpfc_eq_destroy(phba, phba-&gt;sli4_hba.sp_eq);</div><div class='ctx'> out_error:</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -6853,13 +6960,18 @@ lpfc_sli4_queue_unset(struct lpfc_hba *phba)</div><div class='ctx'> 	/* Unset ELS complete queue */</div><div class='ctx'> 	lpfc_cq_destroy(phba, phba-&gt;sli4_hba.els_cq);</div><div class='ctx'> 	/* Unset FCP response complete queue */</div><div class='del'>-	fcp_qidx = 0;</div><div class='del'>-	do {</div><div class='del'>-		lpfc_cq_destroy(phba, phba-&gt;sli4_hba.fcp_cq[fcp_qidx]);</div><div class='del'>-	} while (++fcp_qidx &lt; phba-&gt;cfg_fcp_eq_count);</div><div class='add'>+	if (phba-&gt;sli4_hba.fcp_cq) {</div><div class='add'>+		fcp_qidx = 0;</div><div class='add'>+		do {</div><div class='add'>+			lpfc_cq_destroy(phba, phba-&gt;sli4_hba.fcp_cq[fcp_qidx]);</div><div class='add'>+		} while (++fcp_qidx &lt; phba-&gt;cfg_fcp_eq_count);</div><div class='add'>+	}</div><div class='ctx'> 	/* Unset fast-path event queue */</div><div class='del'>-	for (fcp_qidx = 0; fcp_qidx &lt; phba-&gt;cfg_fcp_eq_count; fcp_qidx++)</div><div class='del'>-		lpfc_eq_destroy(phba, phba-&gt;sli4_hba.fp_eq[fcp_qidx]);</div><div class='add'>+	if (phba-&gt;sli4_hba.fp_eq) {</div><div class='add'>+		for (fcp_qidx = 0; fcp_qidx &lt; phba-&gt;cfg_fcp_eq_count;</div><div class='add'>+		     fcp_qidx++)</div><div class='add'>+			lpfc_eq_destroy(phba, phba-&gt;sli4_hba.fp_eq[fcp_qidx]);</div><div class='add'>+	}</div><div class='ctx'> 	/* Unset slow-path event queue */</div><div class='ctx'> 	lpfc_eq_destroy(phba, phba-&gt;sli4_hba.sp_eq);</div><div class='ctx'> }</div><div class='hunk'>@@ -7398,22 +7510,25 @@ out:</div><div class='ctx'> static void</div><div class='ctx'> lpfc_sli4_pci_mem_unset(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev;</div><div class='del'>-</div><div class='del'>-	/* Obtain PCI device reference */</div><div class='del'>-	if (!phba-&gt;pcidev)</div><div class='del'>-		return;</div><div class='del'>-	else</div><div class='del'>-		pdev = phba-&gt;pcidev;</div><div class='del'>-</div><div class='del'>-	/* Free coherent DMA memory allocated */</div><div class='del'>-</div><div class='del'>-	/* Unmap I/O memory space */</div><div class='del'>-	iounmap(phba-&gt;sli4_hba.drbl_regs_memmap_p);</div><div class='del'>-	iounmap(phba-&gt;sli4_hba.ctrl_regs_memmap_p);</div><div class='del'>-	iounmap(phba-&gt;sli4_hba.conf_regs_memmap_p);</div><div class='add'>+	uint32_t if_type;</div><div class='add'>+	if_type = bf_get(lpfc_sli_intf_if_type, &amp;phba-&gt;sli4_hba.sli_intf);</div><div class='ctx'> </div><div class='del'>-	return;</div><div class='add'>+	switch (if_type) {</div><div class='add'>+	case LPFC_SLI_INTF_IF_TYPE_0:</div><div class='add'>+		iounmap(phba-&gt;sli4_hba.drbl_regs_memmap_p);</div><div class='add'>+		iounmap(phba-&gt;sli4_hba.ctrl_regs_memmap_p);</div><div class='add'>+		iounmap(phba-&gt;sli4_hba.conf_regs_memmap_p);</div><div class='add'>+		break;</div><div class='add'>+	case LPFC_SLI_INTF_IF_TYPE_2:</div><div class='add'>+		iounmap(phba-&gt;sli4_hba.conf_regs_memmap_p);</div><div class='add'>+		break;</div><div class='add'>+	case LPFC_SLI_INTF_IF_TYPE_1:</div><div class='add'>+	default:</div><div class='add'>+		dev_printk(KERN_ERR, &amp;phba-&gt;pcidev-&gt;dev,</div><div class='add'>+			   "FATAL - unsupported SLI4 interface type - %d\n",</div><div class='add'>+			   if_type);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -9198,12 +9313,15 @@ lpfc_pci_probe_one_s4(struct pci_dev *pdev, const struct pci_device_id *pid)</div><div class='ctx'> 	/* Perform post initialization setup */</div><div class='ctx'> 	lpfc_post_init_setup(phba);</div><div class='ctx'> </div><div class='del'>-	/* check for firmware upgrade or downgrade */</div><div class='del'>-	snprintf(file_name, 16, "%s.grp", phba-&gt;ModelName);</div><div class='del'>-	error = request_firmware(&amp;fw, file_name, &amp;phba-&gt;pcidev-&gt;dev);</div><div class='del'>-	if (!error) {</div><div class='del'>-		lpfc_write_firmware(phba, fw);</div><div class='del'>-		release_firmware(fw);</div><div class='add'>+	/* check for firmware upgrade or downgrade (if_type 2 only) */</div><div class='add'>+	if (bf_get(lpfc_sli_intf_if_type, &amp;phba-&gt;sli4_hba.sli_intf) ==</div><div class='add'>+	    LPFC_SLI_INTF_IF_TYPE_2) {</div><div class='add'>+		snprintf(file_name, 16, "%s.grp", phba-&gt;ModelName);</div><div class='add'>+		error = request_firmware(&amp;fw, file_name, &amp;phba-&gt;pcidev-&gt;dev);</div><div class='add'>+		if (!error) {</div><div class='add'>+			lpfc_write_firmware(phba, fw);</div><div class='add'>+			release_firmware(fw);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check if there are static vports to be created. */</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c<br/>index 2ebc7d2540c0..20336f09fb3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_mbox.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_mbox.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_mbox.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_mbox.c</a></div><div class='hunk'>@@ -1293,6 +1293,10 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)</div><div class='ctx'> 		phba-&gt;sli_rev = LPFC_SLI_REV2;</div><div class='ctx'> 	mb-&gt;un.varCfgPort.sli_mode = phba-&gt;sli_rev;</div><div class='ctx'> </div><div class='add'>+	/* If this is an SLI3 port, configure async status notification. */</div><div class='add'>+	if (phba-&gt;sli_rev == LPFC_SLI_REV3)</div><div class='add'>+		mb-&gt;un.varCfgPort.casabt = 1;</div><div class='add'>+</div><div class='ctx'> 	/* Now setup pcb */</div><div class='ctx'> 	phba-&gt;pcb-&gt;type = TYPE_NATIVE_SLI2;</div><div class='ctx'> 	phba-&gt;pcb-&gt;feature = FEATURE_INITIAL_SLI2;</div><div class='hunk'>@@ -2129,6 +2133,14 @@ lpfc_reg_vfi(struct lpfcMboxq *mbox, struct lpfc_vport *vport, dma_addr_t phys)</div><div class='ctx'> 	reg_vfi-&gt;bde.tus.f.bdeSize = sizeof(vport-&gt;fc_sparam);</div><div class='ctx'> 	reg_vfi-&gt;bde.tus.f.bdeFlags = BUFF_TYPE_BDE_64;</div><div class='ctx'> 	bf_set(lpfc_reg_vfi_nport_id, reg_vfi, vport-&gt;fc_myDID);</div><div class='add'>+	lpfc_printf_vlog(vport, KERN_INFO, LOG_MBOX,</div><div class='add'>+			"3134 Register VFI, mydid:x%x, fcfi:%d, "</div><div class='add'>+			" vfi:%d, vpi:%d, fc_pname:%x%x\n",</div><div class='add'>+			vport-&gt;fc_myDID,</div><div class='add'>+			vport-&gt;phba-&gt;fcf.fcfi,</div><div class='add'>+			vport-&gt;phba-&gt;sli4_hba.vfi_ids[vport-&gt;vfi],</div><div class='add'>+			vport-&gt;phba-&gt;vpi_ids[vport-&gt;vpi],</div><div class='add'>+			reg_vfi-&gt;wwn[0], reg_vfi-&gt;wwn[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2175,16 +2187,15 @@ lpfc_unreg_vfi(struct lpfcMboxq *mbox, struct lpfc_vport *vport)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lpfc_dump_fcoe_param - Dump config region 23 to get FCoe parameters.</div><div class='add'>+ * lpfc_sli4_dump_cfg_rg23 - Dump sli4 port config region 23</div><div class='ctx'>  * @phba: pointer to the hba structure containing.</div><div class='ctx'>  * @mbox: pointer to lpfc mbox command to initialize.</div><div class='ctx'>  *</div><div class='del'>- * This function create a SLI4 dump mailbox command to dump FCoE</div><div class='del'>- * parameters stored in region 23.</div><div class='add'>+ * This function create a SLI4 dump mailbox command to dump configure</div><div class='add'>+ * region 23.</div><div class='ctx'>  **/</div><div class='ctx'> int</div><div class='del'>-lpfc_dump_fcoe_param(struct lpfc_hba *phba,</div><div class='del'>-		struct lpfcMboxq *mbox)</div><div class='add'>+lpfc_sli4_dump_cfg_rg23(struct lpfc_hba *phba, struct lpfcMboxq *mbox)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_dmabuf *mp = NULL;</div><div class='ctx'> 	MAILBOX_t *mb;</div><div class='hunk'>@@ -2198,9 +2209,9 @@ lpfc_dump_fcoe_param(struct lpfc_hba *phba,</div><div class='ctx'> </div><div class='ctx'> 	if (!mp || !mp-&gt;virt) {</div><div class='ctx'> 		kfree(mp);</div><div class='del'>-		/* dump_fcoe_param failed to allocate memory */</div><div class='add'>+		/* dump config region 23 failed to allocate memory */</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_WARNING, LOG_MBOX,</div><div class='del'>-			"2569 lpfc_dump_fcoe_param: memory"</div><div class='add'>+			"2569 lpfc dump config region 23: memory"</div><div class='ctx'> 			" allocation failed\n");</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c<br/>index 10d5b5e41499..ade763d3930a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_mem.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_mem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_mem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_mem.c</a></div><div class='hunk'>@@ -389,7 +389,7 @@ lpfc_els_hbq_alloc(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='ctx'> 	struct hbq_dmabuf *hbqbp;</div><div class='ctx'> </div><div class='del'>-	hbqbp = kmalloc(sizeof(struct hbq_dmabuf), GFP_KERNEL);</div><div class='add'>+	hbqbp = kzalloc(sizeof(struct hbq_dmabuf), GFP_KERNEL);</div><div class='ctx'> 	if (!hbqbp)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -441,7 +441,7 @@ lpfc_sli4_rb_alloc(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='ctx'> 	struct hbq_dmabuf *dma_buf;</div><div class='ctx'> </div><div class='del'>-	dma_buf = kmalloc(sizeof(struct hbq_dmabuf), GFP_KERNEL);</div><div class='add'>+	dma_buf = kzalloc(sizeof(struct hbq_dmabuf), GFP_KERNEL);</div><div class='ctx'> 	if (!dma_buf)</div><div class='ctx'> 		return NULL;</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 2ddd02f7c603..e8bb00559943 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_nportdisc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_nportdisc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_nportdisc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_nportdisc.c</a></div><div class='hunk'>@@ -783,6 +783,14 @@ lpfc_device_rm_unused_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static uint32_t</div><div class='add'>+lpfc_device_recov_unused_node(struct lpfc_vport *vport,</div><div class='add'>+			struct lpfc_nodelist *ndlp,</div><div class='add'>+			   void *arg, uint32_t evt)</div><div class='add'>+{</div><div class='add'>+	return ndlp-&gt;nlp_state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static uint32_t</div><div class='ctx'> lpfc_rcv_plogi_plogi_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,</div><div class='ctx'> 			   void *arg, uint32_t evt)</div><div class='ctx'> {</div><div class='hunk'>@@ -2147,7 +2155,7 @@ static uint32_t (*lpfc_disc_action[NLP_STE_MAX_STATE * NLP_EVT_MAX_EVENT])</div><div class='ctx'> 	lpfc_disc_illegal,		/* CMPL_ADISC      */</div><div class='ctx'> 	lpfc_disc_illegal,		/* CMPL_REG_LOGIN  */</div><div class='ctx'> 	lpfc_device_rm_unused_node,	/* DEVICE_RM       */</div><div class='del'>-	lpfc_disc_illegal,		/* DEVICE_RECOVERY */</div><div class='add'>+	lpfc_device_recov_unused_node,	/* DEVICE_RECOVERY */</div><div class='ctx'> </div><div class='ctx'> 	lpfc_rcv_plogi_plogi_issue,	/* RCV_PLOGI   PLOGI_ISSUE    */</div><div class='ctx'> 	lpfc_rcv_prli_plogi_issue,	/* RCV_PRLI        */</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c<br/>index 2e1e54e5c3ae..c60f5d0b3869 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_scsi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_scsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_scsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_scsi.c</a></div><div class='hunk'>@@ -681,8 +681,10 @@ lpfc_sli4_fcp_xri_aborted(struct lpfc_hba *phba,</div><div class='ctx'> </div><div class='ctx'> 			rrq_empty = list_empty(&amp;phba-&gt;active_rrq_list);</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;phba-&gt;hbalock, iflag);</div><div class='del'>-			if (ndlp)</div><div class='add'>+			if (ndlp) {</div><div class='ctx'> 				lpfc_set_rrq_active(phba, ndlp, xri, rxid, 1);</div><div class='add'>+				lpfc_sli4_abts_err_handler(phba, ndlp, axri);</div><div class='add'>+			}</div><div class='ctx'> 			lpfc_release_scsi_buf_s4(phba, psb);</div><div class='ctx'> 			if (rrq_empty)</div><div class='ctx'> 				lpfc_worker_wake_up(phba);</div><div class='hunk'>@@ -2911,8 +2913,8 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,</div><div class='ctx'> 	int_to_scsilun(lpfc_cmd-&gt;pCmd-&gt;device-&gt;lun,</div><div class='ctx'> 			&amp;lpfc_cmd-&gt;fcp_cmnd-&gt;fcp_lun);</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;fcp_cmnd-&gt;fcpCdb[0], scsi_cmnd-&gt;cmnd, 16);</div><div class='del'>-</div><div class='add'>+	memset(&amp;fcp_cmnd-&gt;fcpCdb[0], 0, LPFC_FCP_CDB_LEN);</div><div class='add'>+	memcpy(&amp;fcp_cmnd-&gt;fcpCdb[0], scsi_cmnd-&gt;cmnd, scsi_cmnd-&gt;cmd_len);</div><div class='ctx'> 	if (scsi_populate_tag_msg(scsi_cmnd, tag)) {</div><div class='ctx'> 		switch (tag[0]) {</div><div class='ctx'> 		case HEAD_OF_QUEUE_TAG:</div><div class='hunk'>@@ -3236,6 +3238,15 @@ lpfc_queuecommand_lck(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))</div><div class='ctx'> 		cmnd-&gt;result = err;</div><div class='ctx'> 		goto out_fail_command;</div><div class='ctx'> 	}</div><div class='add'>+	/*</div><div class='add'>+	 * Do not let the mid-layer retry I/O too fast. If an I/O is retried</div><div class='add'>+	 * without waiting a bit then indicate that the device is busy.</div><div class='add'>+	 */</div><div class='add'>+	if (cmnd-&gt;retries &amp;&amp;</div><div class='add'>+	    time_before(jiffies, (cmnd-&gt;jiffies_at_alloc +</div><div class='add'>+				  msecs_to_jiffies(LPFC_RETRY_PAUSE *</div><div class='add'>+						   cmnd-&gt;retries))))</div><div class='add'>+		return SCSI_MLQUEUE_DEVICE_BUSY;</div><div class='ctx'> 	ndlp = rdata-&gt;pnode;</div><div class='ctx'> </div><div class='ctx'> 	if ((scsi_get_prot_op(cmnd) != SCSI_PROT_NORMAL) &amp;&amp;</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_scsi.h b/drivers/scsi/lpfc/lpfc_scsi.h<br/>index ce645b20a6ad..9075a08cf781 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_scsi.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_scsi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_scsi.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_scsi.h</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct lpfc_hba;</div><div class='add'>+#define LPFC_FCP_CDB_LEN 16</div><div class='ctx'> </div><div class='ctx'> #define list_remove_head(list, entry, type, member)		\</div><div class='ctx'> 	do {							\</div><div class='hunk'>@@ -102,7 +103,7 @@ struct fcp_cmnd {</div><div class='ctx'> #define  WRITE_DATA      0x01	/* Bit 0 */</div><div class='ctx'> #define  READ_DATA       0x02	/* Bit 1 */</div><div class='ctx'> </div><div class='del'>-	uint8_t fcpCdb[16];	/* SRB cdb field is copied here */</div><div class='add'>+	uint8_t fcpCdb[LPFC_FCP_CDB_LEN]; /* SRB cdb field is copied here */</div><div class='ctx'> 	uint32_t fcpDl;		/* Total transfer length */</div><div class='ctx'> </div><div class='ctx'> };</div><div class='hunk'>@@ -153,5 +154,5 @@ struct lpfc_scsi_buf {</div><div class='ctx'> </div><div class='ctx'> #define LPFC_SCSI_DMA_EXT_SIZE 264</div><div class='ctx'> #define LPFC_BPL_SIZE          1024</div><div class='del'>-</div><div class='add'>+#define LPFC_RETRY_PAUSE       300</div><div class='ctx'> #define MDAC_DIRECT_CMD                  0x22</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c<br/>index 4d4104f38c98..23a27592388c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_sli.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_sli.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_sli.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_sli.c</a></div><div class='hunk'>@@ -89,15 +89,20 @@ lpfc_get_iocb_from_iocbq(struct lpfc_iocbq *iocbq)</div><div class='ctx'> static uint32_t</div><div class='ctx'> lpfc_sli4_wq_put(struct lpfc_queue *q, union lpfc_wqe *wqe)</div><div class='ctx'> {</div><div class='del'>-	union lpfc_wqe *temp_wqe = q-&gt;qe[q-&gt;host_index].wqe;</div><div class='add'>+	union lpfc_wqe *temp_wqe;</div><div class='ctx'> 	struct lpfc_register doorbell;</div><div class='ctx'> 	uint32_t host_index;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (unlikely(!q))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	temp_wqe = q-&gt;qe[q-&gt;host_index].wqe;</div><div class='add'>+</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='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	/* set consumption flag every once in a while */</div><div class='del'>-	if (!((q-&gt;host_index + 1) % LPFC_RELEASE_NOTIFICATION_INTERVAL))</div><div class='add'>+	if (!((q-&gt;host_index + 1) % q-&gt;entry_repost))</div><div class='ctx'> 		bf_set(wqe_wqec, &amp;wqe-&gt;generic.wqe_com, 1);</div><div class='ctx'> 	if (q-&gt;phba-&gt;sli3_options &amp; LPFC_SLI4_PHWQ_ENABLED)</div><div class='ctx'> 		bf_set(wqe_wqid, &amp;wqe-&gt;generic.wqe_com, q-&gt;queue_id);</div><div class='hunk'>@@ -134,6 +139,10 @@ lpfc_sli4_wq_release(struct lpfc_queue *q, uint32_t index)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t released = 0;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (unlikely(!q))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (q-&gt;hba_index == index)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	do {</div><div class='hunk'>@@ -158,10 +167,15 @@ lpfc_sli4_wq_release(struct lpfc_queue *q, uint32_t index)</div><div class='ctx'> static uint32_t</div><div class='ctx'> lpfc_sli4_mq_put(struct lpfc_queue *q, struct lpfc_mqe *mqe)</div><div class='ctx'> {</div><div class='del'>-	struct lpfc_mqe *temp_mqe = q-&gt;qe[q-&gt;host_index].mqe;</div><div class='add'>+	struct lpfc_mqe *temp_mqe;</div><div class='ctx'> 	struct lpfc_register doorbell;</div><div class='ctx'> 	uint32_t host_index;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (unlikely(!q))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	temp_mqe = q-&gt;qe[q-&gt;host_index].mqe;</div><div class='add'>+</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='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -195,6 +209,10 @@ lpfc_sli4_mq_put(struct lpfc_queue *q, struct lpfc_mqe *mqe)</div><div class='ctx'> static uint32_t</div><div class='ctx'> lpfc_sli4_mq_release(struct lpfc_queue *q)</div><div class='ctx'> {</div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (unlikely(!q))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* Clear the mailbox pointer for completion */</div><div class='ctx'> 	q-&gt;phba-&gt;mbox = NULL;</div><div class='ctx'> 	q-&gt;hba_index = ((q-&gt;hba_index + 1) % q-&gt;entry_count);</div><div class='hunk'>@@ -213,7 +231,12 @@ lpfc_sli4_mq_release(struct lpfc_queue *q)</div><div class='ctx'> static struct lpfc_eqe *</div><div class='ctx'> lpfc_sli4_eq_get(struct lpfc_queue *q)</div><div class='ctx'> {</div><div class='del'>-	struct lpfc_eqe *eqe = q-&gt;qe[q-&gt;hba_index].eqe;</div><div class='add'>+	struct lpfc_eqe *eqe;</div><div class='add'>+</div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (unlikely(!q))</div><div class='add'>+		return NULL;</div><div class='add'>+	eqe = q-&gt;qe[q-&gt;hba_index].eqe;</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))</div><div class='hunk'>@@ -248,6 +271,10 @@ lpfc_sli4_eq_release(struct lpfc_queue *q, bool arm)</div><div class='ctx'> 	struct lpfc_eqe *temp_eqe;</div><div class='ctx'> 	struct lpfc_register doorbell;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (unlikely(!q))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* while there are valid entries */</div><div class='ctx'> 	while (q-&gt;hba_index != q-&gt;host_index) {</div><div class='ctx'> 		temp_eqe = q-&gt;qe[q-&gt;host_index].eqe;</div><div class='hunk'>@@ -288,6 +315,10 @@ lpfc_sli4_cq_get(struct lpfc_queue *q)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_cqe *cqe;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (unlikely(!q))</div><div class='add'>+		return NULL;</div><div class='add'>+</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, q-&gt;qe[q-&gt;hba_index].cqe))</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -322,6 +353,9 @@ lpfc_sli4_cq_release(struct lpfc_queue *q, bool arm)</div><div class='ctx'> 	struct lpfc_cqe *temp_qe;</div><div class='ctx'> 	struct lpfc_register doorbell;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (unlikely(!q))</div><div class='add'>+		return 0;</div><div class='ctx'> 	/* while there are valid entries */</div><div class='ctx'> 	while (q-&gt;hba_index != q-&gt;host_index) {</div><div class='ctx'> 		temp_qe = q-&gt;qe[q-&gt;host_index].cqe;</div><div class='hunk'>@@ -359,11 +393,17 @@ static int</div><div class='ctx'> lpfc_sli4_rq_put(struct lpfc_queue *hq, struct lpfc_queue *dq,</div><div class='ctx'> 		 struct lpfc_rqe *hrqe, struct lpfc_rqe *drqe)</div><div class='ctx'> {</div><div class='del'>-	struct lpfc_rqe *temp_hrqe = hq-&gt;qe[hq-&gt;host_index].rqe;</div><div class='del'>-	struct lpfc_rqe *temp_drqe = dq-&gt;qe[dq-&gt;host_index].rqe;</div><div class='add'>+	struct lpfc_rqe *temp_hrqe;</div><div class='add'>+	struct lpfc_rqe *temp_drqe;</div><div class='ctx'> 	struct lpfc_register doorbell;</div><div class='ctx'> 	int put_index = hq-&gt;host_index;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (unlikely(!hq) || unlikely(!dq))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	temp_hrqe = hq-&gt;qe[hq-&gt;host_index].rqe;</div><div class='add'>+	temp_drqe = dq-&gt;qe[dq-&gt;host_index].rqe;</div><div class='add'>+</div><div class='ctx'> 	if (hq-&gt;type != LPFC_HRQ || dq-&gt;type != LPFC_DRQ)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (hq-&gt;host_index != dq-&gt;host_index)</div><div class='hunk'>@@ -402,6 +442,10 @@ lpfc_sli4_rq_put(struct lpfc_queue *hq, struct lpfc_queue *dq,</div><div class='ctx'> static uint32_t</div><div class='ctx'> lpfc_sli4_rq_release(struct lpfc_queue *hq, struct lpfc_queue *dq)</div><div class='ctx'> {</div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (unlikely(!hq) || unlikely(!dq))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if ((hq-&gt;type != LPFC_HRQ) || (dq-&gt;type != LPFC_DRQ))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	hq-&gt;hba_index = ((hq-&gt;hba_index + 1) % hq-&gt;entry_count);</div><div class='hunk'>@@ -3575,8 +3619,8 @@ lpfc_sli_brdready(struct lpfc_hba *phba, uint32_t mask)</div><div class='ctx'>  * lpfc_reset_barrier - Make HBA ready for HBA reset</div><div class='ctx'>  * @phba: Pointer to HBA context object.</div><div class='ctx'>  *</div><div class='del'>- * This function is called before resetting an HBA. This</div><div class='del'>- * function requests HBA to quiesce DMAs before a reset.</div><div class='add'>+ * This function is called before resetting an HBA. This function is called</div><div class='add'>+ * with hbalock held and requests HBA to quiesce DMAs before a reset.</div><div class='ctx'>  **/</div><div class='ctx'> void lpfc_reset_barrier(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='hunk'>@@ -3851,7 +3895,6 @@ lpfc_sli4_brdreset(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='ctx'> 	struct lpfc_sli *psli = &amp;phba-&gt;sli;</div><div class='ctx'> 	uint16_t cfg_value;</div><div class='del'>-	uint8_t qindx;</div><div class='ctx'> </div><div class='ctx'> 	/* Reset HBA */</div><div class='ctx'> 	lpfc_printf_log(phba, KERN_INFO, LOG_SLI,</div><div class='hunk'>@@ -3867,19 +3910,6 @@ lpfc_sli4_brdreset(struct lpfc_hba *phba)</div><div class='ctx'> 	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 	psli-&gt;sli_flag &amp;= ~(LPFC_PROCESS_LA);</div><div class='ctx'> 	phba-&gt;fcf.fcf_flag = 0;</div><div class='del'>-	/* Clean up the child queue list for the CQs */</div><div class='del'>-	list_del_init(&amp;phba-&gt;sli4_hba.mbx_wq-&gt;list);</div><div class='del'>-	list_del_init(&amp;phba-&gt;sli4_hba.els_wq-&gt;list);</div><div class='del'>-	list_del_init(&amp;phba-&gt;sli4_hba.hdr_rq-&gt;list);</div><div class='del'>-	list_del_init(&amp;phba-&gt;sli4_hba.dat_rq-&gt;list);</div><div class='del'>-	list_del_init(&amp;phba-&gt;sli4_hba.mbx_cq-&gt;list);</div><div class='del'>-	list_del_init(&amp;phba-&gt;sli4_hba.els_cq-&gt;list);</div><div class='del'>-	for (qindx = 0; qindx &lt; phba-&gt;cfg_fcp_wq_count; qindx++)</div><div class='del'>-		list_del_init(&amp;phba-&gt;sli4_hba.fcp_wq[qindx]-&gt;list);</div><div class='del'>-	qindx = 0;</div><div class='del'>-	do</div><div class='del'>-		list_del_init(&amp;phba-&gt;sli4_hba.fcp_cq[qindx]-&gt;list);</div><div class='del'>-	while (++qindx &lt; phba-&gt;cfg_fcp_eq_count);</div><div class='ctx'> 	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> </div><div class='ctx'> 	/* Now physically reset the device */</div><div class='hunk'>@@ -3892,6 +3922,7 @@ lpfc_sli4_brdreset(struct lpfc_hba *phba)</div><div class='ctx'> 			      ~(PCI_COMMAND_PARITY | PCI_COMMAND_SERR)));</div><div class='ctx'> </div><div class='ctx'> 	/* Perform FCoE PCI function reset */</div><div class='add'>+	lpfc_sli4_queue_destroy(phba);</div><div class='ctx'> 	lpfc_pci_function_reset(phba);</div><div class='ctx'> </div><div class='ctx'> 	/* Restore PCI cmd register */</div><div class='hunk'>@@ -4339,6 +4370,11 @@ lpfc_sli_config_port(struct lpfc_hba *phba, int sli_mode)</div><div class='ctx'> 			phba-&gt;sli.sli_flag &amp;= ~LPFC_SLI_ASYNC_MBX_BLK;</div><div class='ctx'> 			spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 			done = 1;</div><div class='add'>+</div><div class='add'>+			if ((pmb-&gt;u.mb.un.varCfgPort.casabt == 1) &amp;&amp;</div><div class='add'>+			    (pmb-&gt;u.mb.un.varCfgPort.gasabt == 0))</div><div class='add'>+				lpfc_printf_log(phba, KERN_WARNING, LOG_INIT,</div><div class='add'>+					"3110 Port did not grant ASABT\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!done) {</div><div class='hunk'>@@ -4551,9 +4587,9 @@ lpfc_sli_hba_setup_error:</div><div class='ctx'>  * data structure.</div><div class='ctx'>  **/</div><div class='ctx'> static int</div><div class='del'>-lpfc_sli4_read_fcoe_params(struct lpfc_hba *phba,</div><div class='del'>-		LPFC_MBOXQ_t *mboxq)</div><div class='add'>+lpfc_sli4_read_fcoe_params(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='add'>+	LPFC_MBOXQ_t *mboxq;</div><div class='ctx'> 	struct lpfc_dmabuf *mp;</div><div class='ctx'> 	struct lpfc_mqe *mqe;</div><div class='ctx'> 	uint32_t data_length;</div><div class='hunk'>@@ -4565,10 +4601,16 @@ lpfc_sli4_read_fcoe_params(struct lpfc_hba *phba,</div><div class='ctx'> 	phba-&gt;fc_map[1] = LPFC_FCOE_FCF_MAP1;</div><div class='ctx'> 	phba-&gt;fc_map[2] = LPFC_FCOE_FCF_MAP2;</div><div class='ctx'> </div><div class='del'>-	mqe = &amp;mboxq-&gt;u.mqe;</div><div class='del'>-	if (lpfc_dump_fcoe_param(phba, mboxq))</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='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	mqe = &amp;mboxq-&gt;u.mqe;</div><div class='add'>+	if (lpfc_sli4_dump_cfg_rg23(phba, mboxq)) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto out_free_mboxq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mp = (struct lpfc_dmabuf *) mboxq-&gt;context1;</div><div class='ctx'> 	rc = lpfc_sli_issue_mbox(phba, mboxq, MBX_POLL);</div><div class='ctx'> </div><div class='hunk'>@@ -4596,19 +4638,25 @@ lpfc_sli4_read_fcoe_params(struct lpfc_hba *phba,</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		lpfc_mbuf_free(phba, mp-&gt;virt, mp-&gt;phys);</div><div class='ctx'> 		kfree(mp);</div><div class='del'>-		return -EIO;</div><div class='add'>+		rc = -EIO;</div><div class='add'>+		goto out_free_mboxq;</div><div class='ctx'> 	}</div><div class='ctx'> 	data_length = mqe-&gt;un.mb_words[5];</div><div class='ctx'> 	if (data_length &gt; DMP_RGN23_SIZE) {</div><div class='ctx'> 		lpfc_mbuf_free(phba, mp-&gt;virt, mp-&gt;phys);</div><div class='ctx'> 		kfree(mp);</div><div class='del'>-		return -EIO;</div><div class='add'>+		rc = -EIO;</div><div class='add'>+		goto out_free_mboxq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	lpfc_parse_fcoe_conf(phba, mp-&gt;virt, data_length);</div><div class='ctx'> 	lpfc_mbuf_free(phba, mp-&gt;virt, mp-&gt;phys);</div><div class='ctx'> 	kfree(mp);</div><div class='del'>-	return 0;</div><div class='add'>+	rc = 0;</div><div class='add'>+</div><div class='add'>+out_free_mboxq:</div><div class='add'>+	mempool_free(mboxq, phba-&gt;mbox_mem_pool);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -4706,7 +4754,6 @@ static int</div><div class='ctx'> lpfc_sli4_retrieve_pport_name(struct lpfc_hba *phba)</div><div class='ctx'> {</div><div class='ctx'> 	LPFC_MBOXQ_t *mboxq;</div><div class='del'>-	struct lpfc_mbx_read_config *rd_config;</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='ctx'> 	struct lpfc_mbx_get_port_name *get_port_name;</div><div class='hunk'>@@ -4724,33 +4771,11 @@ lpfc_sli4_retrieve_pport_name(struct lpfc_hba *phba)</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'>-</div><div class='ctx'> 	/* obtain link type and link number via READ_CONFIG */</div><div class='del'>-	lpfc_read_config(phba, mboxq);</div><div class='del'>-	rc = lpfc_sli_issue_mbox(phba, mboxq, MBX_POLL);</div><div class='del'>-	if (rc == MBX_SUCCESS) {</div><div class='del'>-		rd_config = &amp;mboxq-&gt;u.mqe.un.rd_config;</div><div class='del'>-		if (bf_get(lpfc_mbx_rd_conf_lnk_ldv, rd_config)) {</div><div class='del'>-			phba-&gt;sli4_hba.lnk_info.lnk_dv = LPFC_LNK_DAT_VAL;</div><div class='del'>-			phba-&gt;sli4_hba.lnk_info.lnk_tp =</div><div class='del'>-				bf_get(lpfc_mbx_rd_conf_lnk_type, rd_config);</div><div class='del'>-			phba-&gt;sli4_hba.lnk_info.lnk_no =</div><div class='del'>-				bf_get(lpfc_mbx_rd_conf_lnk_numb, rd_config);</div><div class='del'>-			lpfc_printf_log(phba, KERN_INFO, LOG_SLI,</div><div class='del'>-					"3081 lnk_type:%d, lnk_numb:%d\n",</div><div class='del'>-					phba-&gt;sli4_hba.lnk_info.lnk_tp,</div><div class='del'>-					phba-&gt;sli4_hba.lnk_info.lnk_no);</div><div class='del'>-			goto retrieve_ppname;</div><div class='del'>-		} else</div><div class='del'>-			lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,</div><div class='del'>-					"3082 Mailbox (x%x) returned ldv:x0\n",</div><div class='del'>-					bf_get(lpfc_mqe_command,</div><div class='del'>-					       &amp;mboxq-&gt;u.mqe));</div><div class='del'>-	} else</div><div class='del'>-		lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,</div><div class='del'>-				"3083 Mailbox (x%x) failed, status:x%x\n",</div><div class='del'>-				bf_get(lpfc_mqe_command, &amp;mboxq-&gt;u.mqe),</div><div class='del'>-				bf_get(lpfc_mqe_status, &amp;mboxq-&gt;u.mqe));</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='ctx'> </div><div class='ctx'> 	/* obtain link type and link number via COMMON_GET_CNTL_ATTRIBUTES */</div><div class='ctx'> 	reqlen = sizeof(struct lpfc_mbx_get_cntl_attributes);</div><div class='hunk'>@@ -4875,14 +4900,19 @@ lpfc_sli4_arm_cqeq_intr(struct lpfc_hba *phba)</div><div class='ctx'> 	lpfc_sli4_cq_release(phba-&gt;sli4_hba.mbx_cq, LPFC_QUEUE_REARM);</div><div class='ctx'> 	lpfc_sli4_cq_release(phba-&gt;sli4_hba.els_cq, LPFC_QUEUE_REARM);</div><div class='ctx'> 	fcp_eqidx = 0;</div><div class='del'>-	do</div><div class='del'>-		lpfc_sli4_cq_release(phba-&gt;sli4_hba.fcp_cq[fcp_eqidx],</div><div class='del'>-				     LPFC_QUEUE_REARM);</div><div class='del'>-	while (++fcp_eqidx &lt; phba-&gt;cfg_fcp_eq_count);</div><div class='add'>+	if (phba-&gt;sli4_hba.fcp_cq) {</div><div class='add'>+		do</div><div class='add'>+			lpfc_sli4_cq_release(phba-&gt;sli4_hba.fcp_cq[fcp_eqidx],</div><div class='add'>+					     LPFC_QUEUE_REARM);</div><div class='add'>+		while (++fcp_eqidx &lt; phba-&gt;cfg_fcp_eq_count);</div><div class='add'>+	}</div><div class='ctx'> 	lpfc_sli4_eq_release(phba-&gt;sli4_hba.sp_eq, LPFC_QUEUE_REARM);</div><div class='del'>-	for (fcp_eqidx = 0; fcp_eqidx &lt; phba-&gt;cfg_fcp_eq_count; fcp_eqidx++)</div><div class='del'>-		lpfc_sli4_eq_release(phba-&gt;sli4_hba.fp_eq[fcp_eqidx],</div><div class='del'>-				     LPFC_QUEUE_REARM);</div><div class='add'>+	if (phba-&gt;sli4_hba.fp_eq) {</div><div class='add'>+		for (fcp_eqidx = 0; fcp_eqidx &lt; phba-&gt;cfg_fcp_eq_count;</div><div class='add'>+		     fcp_eqidx++)</div><div class='add'>+			lpfc_sli4_eq_release(phba-&gt;sli4_hba.fp_eq[fcp_eqidx],</div><div class='add'>+					     LPFC_QUEUE_REARM);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -5457,6 +5487,8 @@ lpfc_sli4_alloc_resource_identifiers(struct lpfc_hba *phba)</div><div class='ctx'> 	uint16_t count, base;</div><div class='ctx'> 	unsigned long longs;</div><div class='ctx'> </div><div class='add'>+	if (!phba-&gt;sli4_hba.rpi_hdrs_in_use)</div><div class='add'>+		phba-&gt;sli4_hba.next_rpi = phba-&gt;sli4_hba.max_cfg_param.max_rpi;</div><div class='ctx'> 	if (phba-&gt;sli4_hba.extents_in_use) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The port supports resource extents. The XRI, VPI, VFI, RPI</div><div class='hunk'>@@ -5538,9 +5570,10 @@ lpfc_sli4_alloc_resource_identifiers(struct lpfc_hba *phba)</div><div class='ctx'> 		 * need any action - just exit.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (bf_get(lpfc_idx_rsrc_rdy, &amp;phba-&gt;sli4_hba.sli4_flags) ==</div><div class='del'>-		    LPFC_IDX_RSRC_RDY)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='add'>+		    LPFC_IDX_RSRC_RDY) {</div><div class='add'>+			lpfc_sli4_dealloc_resource_identifiers(phba);</div><div class='add'>+			lpfc_sli4_remove_rpis(phba);</div><div class='add'>+		}</div><div class='ctx'> 		/* RPIs. */</div><div class='ctx'> 		count = phba-&gt;sli4_hba.max_cfg_param.max_rpi;</div><div class='ctx'> 		base = phba-&gt;sli4_hba.max_cfg_param.rpi_base;</div><div class='hunk'>@@ -5880,14 +5913,6 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)</div><div class='ctx'> 	if (!mboxq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Continue initialization with default values even if driver failed</div><div class='del'>-	 * to read FCoE param config regions</div><div class='del'>-	 */</div><div class='del'>-	if (lpfc_sli4_read_fcoe_params(phba, mboxq))</div><div class='del'>-		lpfc_printf_log(phba, KERN_WARNING, LOG_MBOX | LOG_INIT,</div><div class='del'>-			"2570 Failed to read FCoE parameters\n");</div><div class='del'>-</div><div class='ctx'> 	/* Issue READ_REV to collect vpd and FW information. */</div><div class='ctx'> 	vpd_size = SLI4_PAGE_SIZE;</div><div class='ctx'> 	vpd = kzalloc(vpd_size, GFP_KERNEL);</div><div class='hunk'>@@ -5925,6 +5950,16 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Continue initialization with default values even if driver failed</div><div class='add'>+	 * to read FCoE param config regions, only read parameters if the</div><div class='add'>+	 * board is FCoE</div><div class='add'>+	 */</div><div class='add'>+	if (phba-&gt;hba_flag &amp; HBA_FCOE_MODE &amp;&amp;</div><div class='add'>+	    lpfc_sli4_read_fcoe_params(phba))</div><div class='add'>+		lpfc_printf_log(phba, KERN_WARNING, LOG_MBOX | LOG_INIT,</div><div class='add'>+			"2570 Failed to read FCoE parameters\n");</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Retrieve sli4 device physical port name, failure of doing it</div><div class='ctx'> 	 * is considered as non-fatal.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -6044,6 +6079,8 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)</div><div class='ctx'> 				"rc = x%x\n", rc);</div><div class='ctx'> 		goto out_free_mbox;</div><div class='ctx'> 	}</div><div class='add'>+	/* update physical xri mappings in the scsi buffers */</div><div class='add'>+	lpfc_scsi_buf_update(phba);</div><div class='ctx'> </div><div class='ctx'> 	/* Read the port's service parameters. */</div><div class='ctx'> 	rc = lpfc_read_sparam(phba, mboxq, vport-&gt;vpi);</div><div class='hunk'>@@ -6205,7 +6242,11 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)</div><div class='ctx'> 		rc = 0;</div><div class='ctx'> 		phba-&gt;fcf.fcfi = bf_get(lpfc_reg_fcfi_fcfi,</div><div class='ctx'> 					&amp;mboxq-&gt;u.mqe.un.reg_fcfi);</div><div class='add'>+</div><div class='add'>+		/* Check if the port is configured to be disabled */</div><div class='add'>+		lpfc_sli_read_link_ste(phba);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The port is ready, set the host's link state to LINK_DOWN</div><div class='ctx'> 	 * in preparation for link interrupts.</div><div class='hunk'>@@ -6213,10 +6254,25 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)</div><div class='ctx'> 	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 	phba-&gt;link_state = LPFC_LINK_DOWN;</div><div class='ctx'> 	spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-	if (phba-&gt;cfg_suppress_link_up == LPFC_INITIALIZE_LINK) {</div><div class='del'>-		rc = phba-&gt;lpfc_hba_init_link(phba, MBX_NOWAIT);</div><div class='del'>-		if (rc)</div><div class='add'>+	if (!(phba-&gt;hba_flag &amp; HBA_FCOE_MODE) &amp;&amp;</div><div class='add'>+	    (phba-&gt;hba_flag &amp; LINK_DISABLED)) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_INIT | LOG_SLI,</div><div class='add'>+				"3103 Adapter Link is disabled.\n");</div><div class='add'>+		lpfc_down_link(phba, mboxq);</div><div class='add'>+		rc = lpfc_sli_issue_mbox(phba, mboxq, MBX_POLL);</div><div class='add'>+		if (rc != MBX_SUCCESS) {</div><div class='add'>+			lpfc_printf_log(phba, KERN_ERR, LOG_INIT | LOG_SLI,</div><div class='add'>+					"3104 Adapter failed to issue "</div><div class='add'>+					"DOWN_LINK mbox cmd, rc:x%x\n", rc);</div><div class='ctx'> 			goto out_unset_queue;</div><div class='add'>+		}</div><div class='add'>+	} else if (phba-&gt;cfg_suppress_link_up == LPFC_INITIALIZE_LINK) {</div><div class='add'>+		/* don't perform init_link on SLI4 FC port loopback test */</div><div class='add'>+		if (!(phba-&gt;link_flag &amp; LS_LOOPBACK_MODE)) {</div><div class='add'>+			rc = phba-&gt;lpfc_hba_init_link(phba, MBX_NOWAIT);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto out_unset_queue;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	mempool_free(mboxq, phba-&gt;mbox_mem_pool);</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -7487,6 +7543,7 @@ lpfc_sli4_bpl2sgl(struct lpfc_hba *phba, struct lpfc_iocbq *piocbq,</div><div class='ctx'> 	struct ulp_bde64 *bpl = NULL;</div><div class='ctx'> 	struct ulp_bde64 bde;</div><div class='ctx'> 	struct sli4_sge *sgl  = NULL;</div><div class='add'>+	struct lpfc_dmabuf *dmabuf;</div><div class='ctx'> 	IOCB_t *icmd;</div><div class='ctx'> 	int numBdes = 0;</div><div class='ctx'> 	int i = 0;</div><div class='hunk'>@@ -7505,9 +7562,12 @@ lpfc_sli4_bpl2sgl(struct lpfc_hba *phba, struct lpfc_iocbq *piocbq,</div><div class='ctx'> 		 * have not been byteswapped yet so there is no</div><div class='ctx'> 		 * need to swap them back.</div><div class='ctx'> 		 */</div><div class='del'>-		bpl  = (struct ulp_bde64 *)</div><div class='del'>-			((struct lpfc_dmabuf *)piocbq-&gt;context3)-&gt;virt;</div><div class='add'>+		if (piocbq-&gt;context3)</div><div class='add'>+			dmabuf = (struct lpfc_dmabuf *)piocbq-&gt;context3;</div><div class='add'>+		else</div><div class='add'>+			return xritag;</div><div class='ctx'> </div><div class='add'>+		bpl  = (struct ulp_bde64 *)dmabuf-&gt;virt;</div><div class='ctx'> 		if (!bpl)</div><div class='ctx'> 			return xritag;</div><div class='ctx'> </div><div class='hunk'>@@ -7616,6 +7676,8 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,</div><div class='ctx'> 	int numBdes, i;</div><div class='ctx'> 	struct ulp_bde64 bde;</div><div class='ctx'> 	struct lpfc_nodelist *ndlp;</div><div class='add'>+	uint32_t *pcmd;</div><div class='add'>+	uint32_t if_type;</div><div class='ctx'> </div><div class='ctx'> 	fip = phba-&gt;hba_flag &amp; HBA_FIP_SUPPORT;</div><div class='ctx'> 	/* The fcp commands will set command type */</div><div class='hunk'>@@ -7669,6 +7731,7 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,</div><div class='ctx'> 				iocbq-&gt;iocb.ulpCommand);</div><div class='ctx'> 			return IOCB_ERROR;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		wqe-&gt;els_req.payload_len = xmit_len;</div><div class='ctx'> 		/* Els_reguest64 has a TMO */</div><div class='ctx'> 		bf_set(wqe_tmo, &amp;wqe-&gt;els_req.wqe_com,</div><div class='hunk'>@@ -7683,9 +7746,28 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,</div><div class='ctx'> 		bf_set(wqe_ct, &amp;wqe-&gt;els_req.wqe_com, ct);</div><div class='ctx'> 		bf_set(wqe_pu, &amp;wqe-&gt;els_req.wqe_com, 0);</div><div class='ctx'> 		/* CCP CCPE PV PRI in word10 were set in the memcpy */</div><div class='del'>-		if (command_type == ELS_COMMAND_FIP) {</div><div class='add'>+		if (command_type == ELS_COMMAND_FIP)</div><div class='ctx'> 			els_id = ((iocbq-&gt;iocb_flag &amp; LPFC_FIP_ELS_ID_MASK)</div><div class='ctx'> 					&gt;&gt; LPFC_FIP_ELS_ID_SHIFT);</div><div class='add'>+		pcmd = (uint32_t *) (((struct lpfc_dmabuf *)</div><div class='add'>+					iocbq-&gt;context2)-&gt;virt);</div><div class='add'>+		if_type = bf_get(lpfc_sli_intf_if_type,</div><div class='add'>+					&amp;phba-&gt;sli4_hba.sli_intf);</div><div class='add'>+		if (if_type == LPFC_SLI_INTF_IF_TYPE_2) {</div><div class='add'>+			if (pcmd &amp;&amp; (*pcmd == ELS_CMD_FLOGI ||</div><div class='add'>+				*pcmd == ELS_CMD_SCR ||</div><div class='add'>+				*pcmd == ELS_CMD_PLOGI)) {</div><div class='add'>+				bf_set(els_req64_sp, &amp;wqe-&gt;els_req, 1);</div><div class='add'>+				bf_set(els_req64_sid, &amp;wqe-&gt;els_req,</div><div class='add'>+					iocbq-&gt;vport-&gt;fc_myDID);</div><div class='add'>+				bf_set(wqe_ct, &amp;wqe-&gt;els_req.wqe_com, 1);</div><div class='add'>+				bf_set(wqe_ctxt_tag, &amp;wqe-&gt;els_req.wqe_com,</div><div class='add'>+					phba-&gt;vpi_ids[phba-&gt;pport-&gt;vpi]);</div><div class='add'>+			} else if (iocbq-&gt;context1) {</div><div class='add'>+				bf_set(wqe_ct, &amp;wqe-&gt;els_req.wqe_com, 0);</div><div class='add'>+				bf_set(wqe_ctxt_tag, &amp;wqe-&gt;els_req.wqe_com,</div><div class='add'>+					phba-&gt;sli4_hba.rpi_ids[ndlp-&gt;nlp_rpi]);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		bf_set(wqe_temp_rpi, &amp;wqe-&gt;els_req.wqe_com,</div><div class='ctx'> 		       phba-&gt;sli4_hba.rpi_ids[ndlp-&gt;nlp_rpi]);</div><div class='hunk'>@@ -7704,6 +7786,8 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,</div><div class='ctx'> 		/* The entire sequence is transmitted for this IOCB */</div><div class='ctx'> 		xmit_len = total_len;</div><div class='ctx'> 		cmnd = CMD_XMIT_SEQUENCE64_CR;</div><div class='add'>+		if (phba-&gt;link_flag &amp; LS_LOOPBACK_MODE)</div><div class='add'>+			bf_set(wqe_xo, &amp;wqe-&gt;xmit_sequence.wge_ctl, 1);</div><div class='ctx'> 	case CMD_XMIT_SEQUENCE64_CR:</div><div class='ctx'> 		/* word3 iocb=io_tag32 wqe=reserved */</div><div class='ctx'> 		wqe-&gt;xmit_sequence.rsvd3 = 0;</div><div class='hunk'>@@ -7846,6 +7930,16 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,</div><div class='ctx'> 		bf_set(wqe_ebde_cnt, &amp;wqe-&gt;xmit_els_rsp.wqe_com, 0);</div><div class='ctx'> 		bf_set(wqe_rsp_temp_rpi, &amp;wqe-&gt;xmit_els_rsp,</div><div class='ctx'> 		       phba-&gt;sli4_hba.rpi_ids[ndlp-&gt;nlp_rpi]);</div><div class='add'>+		pcmd = (uint32_t *) (((struct lpfc_dmabuf *)</div><div class='add'>+					iocbq-&gt;context2)-&gt;virt);</div><div class='add'>+		if (phba-&gt;fc_topology == LPFC_TOPOLOGY_LOOP) {</div><div class='add'>+				bf_set(els_req64_sp, &amp;wqe-&gt;els_req, 1);</div><div class='add'>+				bf_set(els_req64_sid, &amp;wqe-&gt;els_req,</div><div class='add'>+					iocbq-&gt;vport-&gt;fc_myDID);</div><div class='add'>+				bf_set(wqe_ct, &amp;wqe-&gt;els_req.wqe_com, 1);</div><div class='add'>+				bf_set(wqe_ctxt_tag, &amp;wqe-&gt;els_req.wqe_com,</div><div class='add'>+					phba-&gt;vpi_ids[phba-&gt;pport-&gt;vpi]);</div><div class='add'>+		}</div><div class='ctx'> 		command_type = OTHER_COMMAND;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CMD_CLOSE_XRI_CN:</div><div class='hunk'>@@ -8037,6 +8131,8 @@ __lpfc_sli_issue_iocb_s4(struct lpfc_hba *phba, uint32_t ring_number,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (piocb-&gt;iocb_flag &amp; LPFC_IO_FCP)</div><div class='ctx'> 			piocb-&gt;fcp_wqidx = lpfc_sli4_scmd_to_wqidx_distr(phba);</div><div class='add'>+		if (unlikely(!phba-&gt;sli4_hba.fcp_wq))</div><div class='add'>+			return IOCB_ERROR;</div><div class='ctx'> 		if (lpfc_sli4_wq_put(phba-&gt;sli4_hba.fcp_wq[piocb-&gt;fcp_wqidx],</div><div class='ctx'> 				     &amp;wqe))</div><div class='ctx'> 			return IOCB_ERROR;</div><div class='hunk'>@@ -8173,6 +8269,137 @@ lpfc_extra_ring_setup( struct lpfc_hba *phba)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* lpfc_sli_abts_recover_port - Recover a port that failed an ABTS.</div><div class='add'>+ * @vport: pointer to virtual port object.</div><div class='add'>+ * @ndlp: nodelist pointer for the impacted rport.</div><div class='add'>+ *</div><div class='add'>+ * The driver calls this routine in response to a XRI ABORT CQE</div><div class='add'>+ * event from the port.  In this event, the driver is required to</div><div class='add'>+ * recover its login to the rport even though its login may be valid</div><div class='add'>+ * from the driver's perspective.  The failed ABTS notice from the</div><div class='add'>+ * port indicates the rport is not responding.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+lpfc_sli_abts_recover_port(struct lpfc_vport *vport,</div><div class='add'>+			   struct lpfc_nodelist *ndlp)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *shost;</div><div class='add'>+	struct lpfc_hba *phba;</div><div class='add'>+	unsigned long flags = 0;</div><div class='add'>+</div><div class='add'>+	shost = lpfc_shost_from_vport(vport);</div><div class='add'>+	phba = vport-&gt;phba;</div><div class='add'>+	if (ndlp-&gt;nlp_state != NLP_STE_MAPPED_NODE) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_INFO,</div><div class='add'>+			LOG_SLI, "3093 No rport recovery needed. "</div><div class='add'>+			"rport in state 0x%x\n",</div><div class='add'>+			ndlp-&gt;nlp_state);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	lpfc_printf_log(phba, KERN_ERR, LOG_SLI,</div><div class='add'>+			"3094 Start rport recovery on shost id 0x%x "</div><div class='add'>+			"fc_id 0x%06x vpi 0x%x rpi 0x%x state 0x%x "</div><div class='add'>+			"flags 0x%x\n",</div><div class='add'>+			shost-&gt;host_no, ndlp-&gt;nlp_DID,</div><div class='add'>+			vport-&gt;vpi, ndlp-&gt;nlp_rpi, ndlp-&gt;nlp_state,</div><div class='add'>+			ndlp-&gt;nlp_flag);</div><div class='add'>+	/*</div><div class='add'>+	 * The rport is not responding.  Don't attempt ADISC recovery.</div><div class='add'>+	 * Remove the FCP-2 flag to force a PLOGI.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(shost-&gt;host_lock, flags);</div><div class='add'>+	ndlp-&gt;nlp_fcp_info &amp;= ~NLP_FCP_2_DEVICE;</div><div class='add'>+	spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='add'>+	lpfc_disc_state_machine(vport, ndlp, NULL,</div><div class='add'>+				NLP_EVT_DEVICE_RECOVERY);</div><div class='add'>+	lpfc_cancel_retry_delay_tmo(vport, ndlp);</div><div class='add'>+	spin_lock_irqsave(shost-&gt;host_lock, flags);</div><div class='add'>+	ndlp-&gt;nlp_flag |= NLP_NPR_2B_DISC;</div><div class='add'>+	spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='add'>+	lpfc_disc_start(vport);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* lpfc_sli_abts_err_handler - handle a failed ABTS request from an SLI3 port.</div><div class='add'>+ * @phba: Pointer to HBA context object.</div><div class='add'>+ * @iocbq: Pointer to iocb object.</div><div class='add'>+ *</div><div class='add'>+ * The async_event handler calls this routine when it receives</div><div class='add'>+ * an ASYNC_STATUS_CN event from the port.  The port generates</div><div class='add'>+ * this event when an Abort Sequence request to an rport fails</div><div class='add'>+ * twice in succession.  The abort could be originated by the</div><div class='add'>+ * driver or by the port.  The ABTS could have been for an ELS</div><div class='add'>+ * or FCP IO.  The port only generates this event when an ABTS</div><div class='add'>+ * fails to complete after one retry.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+lpfc_sli_abts_err_handler(struct lpfc_hba *phba,</div><div class='add'>+			  struct lpfc_iocbq *iocbq)</div><div class='add'>+{</div><div class='add'>+	struct lpfc_nodelist *ndlp = NULL;</div><div class='add'>+	uint16_t rpi = 0, vpi = 0;</div><div class='add'>+	struct lpfc_vport *vport = NULL;</div><div class='add'>+</div><div class='add'>+	/* The rpi in the ulpContext is vport-sensitive. */</div><div class='add'>+	vpi = iocbq-&gt;iocb.un.asyncstat.sub_ctxt_tag;</div><div class='add'>+	rpi = iocbq-&gt;iocb.ulpContext;</div><div class='add'>+</div><div class='add'>+	lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,</div><div class='add'>+			"3092 Port generated ABTS async event "</div><div class='add'>+			"on vpi %d rpi %d status 0x%x\n",</div><div class='add'>+			vpi, rpi, iocbq-&gt;iocb.ulpStatus);</div><div class='add'>+</div><div class='add'>+	vport = lpfc_find_vport_by_vpid(phba, vpi);</div><div class='add'>+	if (!vport)</div><div class='add'>+		goto err_exit;</div><div class='add'>+	ndlp = lpfc_findnode_rpi(vport, rpi);</div><div class='add'>+	if (!ndlp || !NLP_CHK_NODE_ACT(ndlp))</div><div class='add'>+		goto err_exit;</div><div class='add'>+</div><div class='add'>+	if (iocbq-&gt;iocb.ulpStatus == IOSTAT_LOCAL_REJECT)</div><div class='add'>+		lpfc_sli_abts_recover_port(vport, ndlp);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+ err_exit:</div><div class='add'>+	lpfc_printf_log(phba, KERN_INFO, LOG_SLI,</div><div class='add'>+			"3095 Event Context not found, no "</div><div class='add'>+			"action on vpi %d rpi %d status 0x%x, reason 0x%x\n",</div><div class='add'>+			iocbq-&gt;iocb.ulpContext, iocbq-&gt;iocb.ulpStatus,</div><div class='add'>+			vpi, rpi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* lpfc_sli4_abts_err_handler - handle a failed ABTS request from an SLI4 port.</div><div class='add'>+ * @phba: pointer to HBA context object.</div><div class='add'>+ * @ndlp: nodelist pointer for the impacted rport.</div><div class='add'>+ * @axri: pointer to the wcqe containing the failed exchange.</div><div class='add'>+ *</div><div class='add'>+ * The driver calls this routine when it receives an ABORT_XRI_FCP CQE from the</div><div class='add'>+ * port.  The port generates this event when an abort exchange request to an</div><div class='add'>+ * rport fails twice in succession with no reply.  The abort could be originated</div><div class='add'>+ * by the driver or by the port.  The ABTS could have been for an ELS or FCP IO.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+lpfc_sli4_abts_err_handler(struct lpfc_hba *phba,</div><div class='add'>+			   struct lpfc_nodelist *ndlp,</div><div class='add'>+			   struct sli4_wcqe_xri_aborted *axri)</div><div class='add'>+{</div><div class='add'>+	struct lpfc_vport *vport;</div><div class='add'>+</div><div class='add'>+	if (!ndlp || !NLP_CHK_NODE_ACT(ndlp))</div><div class='add'>+		lpfc_printf_log(phba, KERN_INFO, LOG_SLI,</div><div class='add'>+				"3115 Node Context not found, driver "</div><div class='add'>+				"ignoring abts err event\n");</div><div class='add'>+	vport = ndlp-&gt;vport;</div><div class='add'>+	lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,</div><div class='add'>+			"3116 Port generated FCP XRI ABORT event on "</div><div class='add'>+			"vpi %d rpi %d xri x%x status 0x%x\n",</div><div class='add'>+			ndlp-&gt;vport-&gt;vpi, ndlp-&gt;nlp_rpi,</div><div class='add'>+			bf_get(lpfc_wcqe_xa_xri, axri),</div><div class='add'>+			bf_get(lpfc_wcqe_xa_status, axri));</div><div class='add'>+</div><div class='add'>+	if (bf_get(lpfc_wcqe_xa_status, axri) == IOSTAT_LOCAL_REJECT)</div><div class='add'>+		lpfc_sli_abts_recover_port(vport, ndlp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * lpfc_sli_async_event_handler - ASYNC iocb handler function</div><div class='ctx'>  * @phba: Pointer to HBA context object.</div><div class='hunk'>@@ -8192,63 +8419,58 @@ lpfc_sli_async_event_handler(struct lpfc_hba * phba,</div><div class='ctx'> {</div><div class='ctx'> 	IOCB_t *icmd;</div><div class='ctx'> 	uint16_t evt_code;</div><div class='del'>-	uint16_t temp;</div><div class='ctx'> 	struct temp_event temp_event_data;</div><div class='ctx'> 	struct Scsi_Host *shost;</div><div class='ctx'> 	uint32_t *iocb_w;</div><div class='ctx'> </div><div class='ctx'> 	icmd = &amp;iocbq-&gt;iocb;</div><div class='ctx'> 	evt_code = icmd-&gt;un.asyncstat.evt_code;</div><div class='del'>-	temp = icmd-&gt;ulpContext;</div><div class='ctx'> </div><div class='del'>-	if ((evt_code != ASYNC_TEMP_WARN) &amp;&amp;</div><div class='del'>-		(evt_code != ASYNC_TEMP_SAFE)) {</div><div class='add'>+	switch (evt_code) {</div><div class='add'>+	case ASYNC_TEMP_WARN:</div><div class='add'>+	case ASYNC_TEMP_SAFE:</div><div class='add'>+		temp_event_data.data = (uint32_t) icmd-&gt;ulpContext;</div><div class='add'>+		temp_event_data.event_type = FC_REG_TEMPERATURE_EVENT;</div><div class='add'>+		if (evt_code == ASYNC_TEMP_WARN) {</div><div class='add'>+			temp_event_data.event_code = LPFC_THRESHOLD_TEMP;</div><div class='add'>+			lpfc_printf_log(phba, KERN_ERR, LOG_TEMP,</div><div class='add'>+				"0347 Adapter is very hot, please take "</div><div class='add'>+				"corrective action. temperature : %d Celsius\n",</div><div class='add'>+				(uint32_t) icmd-&gt;ulpContext);</div><div class='add'>+		} else {</div><div class='add'>+			temp_event_data.event_code = LPFC_NORMAL_TEMP;</div><div class='add'>+			lpfc_printf_log(phba, KERN_ERR, LOG_TEMP,</div><div class='add'>+				"0340 Adapter temperature is OK now. "</div><div class='add'>+				"temperature : %d Celsius\n",</div><div class='add'>+				(uint32_t) icmd-&gt;ulpContext);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Send temperature change event to applications */</div><div class='add'>+		shost = lpfc_shost_from_vport(phba-&gt;pport);</div><div class='add'>+		fc_host_post_vendor_event(shost, fc_get_event_number(),</div><div class='add'>+			sizeof(temp_event_data), (char *) &amp;temp_event_data,</div><div class='add'>+			LPFC_NL_VENDOR_ID);</div><div class='add'>+		break;</div><div class='add'>+	case ASYNC_STATUS_CN:</div><div class='add'>+		lpfc_sli_abts_err_handler(phba, iocbq);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		iocb_w = (uint32_t *) icmd;</div><div class='del'>-		lpfc_printf_log(phba,</div><div class='del'>-			KERN_ERR,</div><div class='del'>-			LOG_SLI,</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_SLI,</div><div class='ctx'> 			"0346 Ring %d handler: unexpected ASYNC_STATUS"</div><div class='ctx'> 			" evt_code 0x%x\n"</div><div class='ctx'> 			"W0  0x%08x W1  0x%08x W2  0x%08x W3  0x%08x\n"</div><div class='ctx'> 			"W4  0x%08x W5  0x%08x W6  0x%08x W7  0x%08x\n"</div><div class='ctx'> 			"W8  0x%08x W9  0x%08x W10 0x%08x W11 0x%08x\n"</div><div class='ctx'> 			"W12 0x%08x W13 0x%08x W14 0x%08x W15 0x%08x\n",</div><div class='del'>-			pring-&gt;ringno,</div><div class='del'>-			icmd-&gt;un.asyncstat.evt_code,</div><div class='add'>+			pring-&gt;ringno, icmd-&gt;un.asyncstat.evt_code,</div><div class='ctx'> 			iocb_w[0], iocb_w[1], iocb_w[2], iocb_w[3],</div><div class='ctx'> 			iocb_w[4], iocb_w[5], iocb_w[6], iocb_w[7],</div><div class='ctx'> 			iocb_w[8], iocb_w[9], iocb_w[10], iocb_w[11],</div><div class='ctx'> 			iocb_w[12], iocb_w[13], iocb_w[14], iocb_w[15]);</div><div class='ctx'> </div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	temp_event_data.data = (uint32_t)temp;</div><div class='del'>-	temp_event_data.event_type = FC_REG_TEMPERATURE_EVENT;</div><div class='del'>-	if (evt_code == ASYNC_TEMP_WARN) {</div><div class='del'>-		temp_event_data.event_code = LPFC_THRESHOLD_TEMP;</div><div class='del'>-		lpfc_printf_log(phba,</div><div class='del'>-				KERN_ERR,</div><div class='del'>-				LOG_TEMP,</div><div class='del'>-				"0347 Adapter is very hot, please take "</div><div class='del'>-				"corrective action. temperature : %d Celsius\n",</div><div class='del'>-				temp);</div><div class='del'>-	}</div><div class='del'>-	if (evt_code == ASYNC_TEMP_SAFE) {</div><div class='del'>-		temp_event_data.event_code = LPFC_NORMAL_TEMP;</div><div class='del'>-		lpfc_printf_log(phba,</div><div class='del'>-				KERN_ERR,</div><div class='del'>-				LOG_TEMP,</div><div class='del'>-				"0340 Adapter temperature is OK now. "</div><div class='del'>-				"temperature : %d Celsius\n",</div><div class='del'>-				temp);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* Send temperature change event to applications */</div><div class='del'>-	shost = lpfc_shost_from_vport(phba-&gt;pport);</div><div class='del'>-	fc_host_post_vendor_event(shost, fc_get_event_number(),</div><div class='del'>-		sizeof(temp_event_data), (char *) &amp;temp_event_data,</div><div class='del'>-		LPFC_NL_VENDOR_ID);</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -8823,12 +9045,14 @@ lpfc_sli_abort_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> {</div><div class='ctx'> 	IOCB_t *irsp = &amp;rspiocb-&gt;iocb;</div><div class='ctx'> 	uint16_t abort_iotag, abort_context;</div><div class='del'>-	struct lpfc_iocbq *abort_iocb;</div><div class='del'>-	struct lpfc_sli_ring *pring = &amp;phba-&gt;sli.ring[LPFC_ELS_RING];</div><div class='del'>-</div><div class='del'>-	abort_iocb = NULL;</div><div class='add'>+	struct lpfc_iocbq *abort_iocb = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (irsp-&gt;ulpStatus) {</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Assume that the port already completed and returned, or</div><div class='add'>+		 * will return the iocb. Just Log the message.</div><div class='add'>+		 */</div><div class='ctx'> 		abort_context = cmdiocb-&gt;iocb.un.acxri.abortContextTag;</div><div class='ctx'> 		abort_iotag = cmdiocb-&gt;iocb.un.acxri.abortIoTag;</div><div class='ctx'> </div><div class='hunk'>@@ -8846,68 +9070,15 @@ lpfc_sli_abort_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 			 */</div><div class='ctx'> 			abort_iocb = phba-&gt;sli.iocbq_lookup[abort_context];</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 *  If the iocb is not found in Firmware queue the iocb</div><div class='del'>-		 *  might have completed already. Do not free it again.</div><div class='del'>-		 */</div><div class='del'>-		if (irsp-&gt;ulpStatus == IOSTAT_LOCAL_REJECT) {</div><div class='del'>-			if (irsp-&gt;un.ulpWord[4] != IOERR_NO_XRI) {</div><div class='del'>-				spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-				lpfc_sli_release_iocbq(phba, cmdiocb);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			/* For SLI4 the ulpContext field for abort IOCB</div><div class='del'>-			 * holds the iotag of the IOCB being aborted so</div><div class='del'>-			 * the local abort_context needs to be reset to</div><div class='del'>-			 * match the aborted IOCBs ulpContext.</div><div class='del'>-			 */</div><div class='del'>-			if (abort_iocb &amp;&amp; phba-&gt;sli_rev == LPFC_SLI_REV4)</div><div class='del'>-				abort_context = abort_iocb-&gt;iocb.ulpContext;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_WARNING, LOG_ELS | LOG_SLI,</div><div class='ctx'> 				"0327 Cannot abort els iocb %p "</div><div class='ctx'> 				"with tag %x context %x, abort status %x, "</div><div class='ctx'> 				"abort code %x\n",</div><div class='ctx'> 				abort_iocb, abort_iotag, abort_context,</div><div class='ctx'> 				irsp-&gt;ulpStatus, irsp-&gt;un.ulpWord[4]);</div><div class='del'>-		/*</div><div class='del'>-		 * make sure we have the right iocbq before taking it</div><div class='del'>-		 * off the txcmplq and try to call completion routine.</div><div class='del'>-		 */</div><div class='del'>-		if (!abort_iocb ||</div><div class='del'>-		    abort_iocb-&gt;iocb.ulpContext != abort_context ||</div><div class='del'>-		    (abort_iocb-&gt;iocb_flag &amp; LPFC_DRIVER_ABORTED) == 0)</div><div class='del'>-			spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-		else if (phba-&gt;sli_rev &lt; LPFC_SLI_REV4) {</div><div class='del'>-			/*</div><div class='del'>-			 * leave the SLI4 aborted command on the txcmplq</div><div class='del'>-			 * list and the command complete WCQE's XB bit</div><div class='del'>-			 * will tell whether the SGL (XRI) can be released</div><div class='del'>-			 * immediately or to the aborted SGL list for the</div><div class='del'>-			 * following abort XRI from the HBA.</div><div class='del'>-			 */</div><div class='del'>-			list_del_init(&amp;abort_iocb-&gt;list);</div><div class='del'>-			if (abort_iocb-&gt;iocb_flag &amp; LPFC_IO_ON_Q) {</div><div class='del'>-				abort_iocb-&gt;iocb_flag &amp;= ~LPFC_IO_ON_Q;</div><div class='del'>-				pring-&gt;txcmplq_cnt--;</div><div class='del'>-			}</div><div class='ctx'> </div><div class='del'>-			/* Firmware could still be in progress of DMAing</div><div class='del'>-			 * payload, so don't free data buffer till after</div><div class='del'>-			 * a hbeat.</div><div class='del'>-			 */</div><div class='del'>-			abort_iocb-&gt;iocb_flag |= LPFC_DELAY_MEM_FREE;</div><div class='del'>-			abort_iocb-&gt;iocb_flag &amp;= ~LPFC_DRIVER_ABORTED;</div><div class='del'>-			spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='del'>-</div><div class='del'>-			abort_iocb-&gt;iocb.ulpStatus = IOSTAT_LOCAL_REJECT;</div><div class='del'>-			abort_iocb-&gt;iocb.un.ulpWord[4] = IOERR_ABORT_REQUESTED;</div><div class='del'>-			(abort_iocb-&gt;iocb_cmpl)(phba, abort_iocb, abort_iocb);</div><div class='del'>-		} else</div><div class='del'>-			spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='add'>+		spin_unlock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	lpfc_sli_release_iocbq(phba, cmdiocb);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='hunk'>@@ -9258,6 +9429,14 @@ void</div><div class='ctx'> lpfc_sli_abort_fcp_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,</div><div class='ctx'> 			struct lpfc_iocbq *rspiocb)</div><div class='ctx'> {</div><div class='add'>+	lpfc_printf_log(phba, KERN_INFO, LOG_SLI,</div><div class='add'>+			"3096 ABORT_XRI_CN completing on xri x%x "</div><div class='add'>+			"original iotag x%x, abort cmd iotag x%x "</div><div class='add'>+			"status 0x%x, reason 0x%x\n",</div><div class='add'>+			cmdiocb-&gt;iocb.un.acxri.abortContextTag,</div><div class='add'>+			cmdiocb-&gt;iocb.un.acxri.abortIoTag,</div><div class='add'>+			cmdiocb-&gt;iotag, rspiocb-&gt;iocb.ulpStatus,</div><div class='add'>+			rspiocb-&gt;iocb.un.ulpWord[4]);</div><div class='ctx'> 	lpfc_sli_release_iocbq(phba, cmdiocb);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='hunk'>@@ -9771,7 +9950,7 @@ lpfc_sli4_eratt_read(struct lpfc_hba *phba)</div><div class='ctx'> 			phba-&gt;work_status[1] =</div><div class='ctx'> 				readl(phba-&gt;sli4_hba.u.if_type2.ERR2regaddr);</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='del'>-					"2885 Port Error Detected: "</div><div class='add'>+					"2885 Port Status Event: "</div><div class='ctx'> 					"port status reg 0x%x, "</div><div class='ctx'> 					"port smphr reg 0x%x, "</div><div class='ctx'> 					"error 1=0x%x, error 2=0x%x\n",</div><div class='hunk'>@@ -10777,6 +10956,9 @@ static void</div><div class='ctx'> lpfc_sli4_sp_handle_rel_wcqe(struct lpfc_hba *phba,</div><div class='ctx'> 			     struct lpfc_wcqe_release *wcqe)</div><div class='ctx'> {</div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (unlikely(!phba-&gt;sli4_hba.els_wq))</div><div class='add'>+		return;</div><div class='ctx'> 	/* Check for the slow-path ELS work queue */</div><div class='ctx'> 	if (bf_get(lpfc_wcqe_r_wq_id, wcqe) == phba-&gt;sli4_hba.els_wq-&gt;queue_id)</div><div class='ctx'> 		lpfc_sli4_wq_release(phba-&gt;sli4_hba.els_wq,</div><div class='hunk'>@@ -10866,6 +11048,10 @@ lpfc_sli4_sp_handle_rcqe(struct lpfc_hba *phba, struct lpfc_rcqe *rcqe)</div><div class='ctx'> 	uint32_t status, rq_id;</div><div class='ctx'> 	unsigned long iflags;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (unlikely(!hrq) || unlikely(!drq))</div><div class='add'>+		return workposted;</div><div class='add'>+</div><div class='ctx'> 	if (bf_get(lpfc_cqe_code, rcqe) == CQE_CODE_RECEIVE_V1)</div><div class='ctx'> 		rq_id = bf_get(lpfc_rcqe_rq_id_v1, rcqe);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -11000,6 +11186,9 @@ lpfc_sli4_sp_handle_eqe(struct lpfc_hba *phba, struct lpfc_eqe *eqe)</div><div class='ctx'> </div><div class='ctx'> 	/* Search for completion queue pointer matching this cqid */</div><div class='ctx'> 	speq = phba-&gt;sli4_hba.sp_eq;</div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (unlikely(!speq))</div><div class='add'>+		return;</div><div class='ctx'> 	list_for_each_entry(childq, &amp;speq-&gt;child_list, list) {</div><div class='ctx'> 		if (childq-&gt;queue_id == cqid) {</div><div class='ctx'> 			cq = childq;</div><div class='hunk'>@@ -11241,12 +11430,18 @@ lpfc_sli4_fp_handle_eqe(struct lpfc_hba *phba, struct lpfc_eqe *eqe,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (unlikely(!phba-&gt;sli4_hba.fcp_cq)) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,</div><div class='add'>+				"3146 Fast-path completion queues "</div><div class='add'>+				"does not exist\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	cq = phba-&gt;sli4_hba.fcp_cq[fcp_cqidx];</div><div class='ctx'> 	if (unlikely(!cq)) {</div><div class='ctx'> 		if (phba-&gt;sli.sli_flag &amp; LPFC_SLI_ACTIVE)</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_ERR, LOG_SLI,</div><div class='ctx'> 					"0367 Fast-path completion queue "</div><div class='del'>-					"does not exist\n");</div><div class='add'>+					"(%d) does not exist\n", fcp_cqidx);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -11417,6 +11612,8 @@ lpfc_sli4_fp_intr_handler(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	/* Get to the EQ struct associated with this vector */</div><div class='ctx'> 	fpeq = phba-&gt;sli4_hba.fp_eq[fcp_eqidx];</div><div class='add'>+	if (unlikely(!fpeq))</div><div class='add'>+		return IRQ_NONE;</div><div class='ctx'> </div><div class='ctx'> 	/* Check device state for handling interrupt */</div><div class='ctx'> 	if (unlikely(lpfc_intr_state_check(phba))) {</div><div class='hunk'>@@ -11635,6 +11832,9 @@ lpfc_eq_create(struct lpfc_hba *phba, struct lpfc_queue *eq, uint16_t imax)</div><div class='ctx'> 	uint16_t dmult;</div><div class='ctx'> 	uint32_t hw_page_size = phba-&gt;sli4_hba.pc_sli4_params.if_page_sz;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (!eq)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	if (!phba-&gt;sli4_hba.pc_sli4_params.supported)</div><div class='ctx'> 		hw_page_size = SLI4_PAGE_SIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -11751,6 +11951,9 @@ lpfc_cq_create(struct lpfc_hba *phba, struct lpfc_queue *cq,</div><div class='ctx'> 	union lpfc_sli4_cfg_shdr *shdr;</div><div class='ctx'> 	uint32_t hw_page_size = phba-&gt;sli4_hba.pc_sli4_params.if_page_sz;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (!cq || !eq)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	if (!phba-&gt;sli4_hba.pc_sli4_params.supported)</div><div class='ctx'> 		hw_page_size = SLI4_PAGE_SIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -11933,6 +12136,9 @@ lpfc_mq_create(struct lpfc_hba *phba, struct lpfc_queue *mq,</div><div class='ctx'> 	union lpfc_sli4_cfg_shdr *shdr;</div><div class='ctx'> 	uint32_t hw_page_size = phba-&gt;sli4_hba.pc_sli4_params.if_page_sz;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (!mq || !cq)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	if (!phba-&gt;sli4_hba.pc_sli4_params.supported)</div><div class='ctx'> 		hw_page_size = SLI4_PAGE_SIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -12083,6 +12289,9 @@ lpfc_wq_create(struct lpfc_hba *phba, struct lpfc_queue *wq,</div><div class='ctx'> 	uint32_t hw_page_size = phba-&gt;sli4_hba.pc_sli4_params.if_page_sz;</div><div class='ctx'> 	struct dma_address *page;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (!wq || !cq)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	if (!phba-&gt;sli4_hba.pc_sli4_params.supported)</div><div class='ctx'> 		hw_page_size = SLI4_PAGE_SIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -12151,6 +12360,7 @@ lpfc_wq_create(struct lpfc_hba *phba, struct lpfc_queue *wq,</div><div class='ctx'> 	wq-&gt;subtype = subtype;</div><div class='ctx'> 	wq-&gt;host_index = 0;</div><div class='ctx'> 	wq-&gt;hba_index = 0;</div><div class='add'>+	wq-&gt;entry_repost = LPFC_RELEASE_NOTIFICATION_INTERVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* link the wq onto the parent cq child list */</div><div class='ctx'> 	list_add_tail(&amp;wq-&gt;list, &amp;cq-&gt;child_list);</div><div class='hunk'>@@ -12174,6 +12384,9 @@ lpfc_rq_adjust_repost(struct lpfc_hba *phba, struct lpfc_queue *rq, int qno)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t cnt;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (!rq)</div><div class='add'>+		return;</div><div class='ctx'> 	cnt = lpfc_hbq_defs[qno]-&gt;entry_count;</div><div class='ctx'> </div><div class='ctx'> 	/* Recalc repost for RQs based on buffers initially posted */</div><div class='hunk'>@@ -12219,6 +12432,9 @@ lpfc_rq_create(struct lpfc_hba *phba, struct lpfc_queue *hrq,</div><div class='ctx'> 	union lpfc_sli4_cfg_shdr *shdr;</div><div class='ctx'> 	uint32_t hw_page_size = phba-&gt;sli4_hba.pc_sli4_params.if_page_sz;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='add'>+	if (!hrq || !drq || !cq)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	if (!phba-&gt;sli4_hba.pc_sli4_params.supported)</div><div class='ctx'> 		hw_page_size = SLI4_PAGE_SIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -12420,6 +12636,7 @@ lpfc_eq_destroy(struct lpfc_hba *phba, struct lpfc_queue *eq)</div><div class='ctx'> 	uint32_t shdr_status, shdr_add_status;</div><div class='ctx'> 	union lpfc_sli4_cfg_shdr *shdr;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='ctx'> 	if (!eq)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	mbox = mempool_alloc(eq-&gt;phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='hunk'>@@ -12475,6 +12692,7 @@ lpfc_cq_destroy(struct lpfc_hba *phba, struct lpfc_queue *cq)</div><div class='ctx'> 	uint32_t shdr_status, shdr_add_status;</div><div class='ctx'> 	union lpfc_sli4_cfg_shdr *shdr;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='ctx'> 	if (!cq)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	mbox = mempool_alloc(cq-&gt;phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='hunk'>@@ -12528,6 +12746,7 @@ lpfc_mq_destroy(struct lpfc_hba *phba, struct lpfc_queue *mq)</div><div class='ctx'> 	uint32_t shdr_status, shdr_add_status;</div><div class='ctx'> 	union lpfc_sli4_cfg_shdr *shdr;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='ctx'> 	if (!mq)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	mbox = mempool_alloc(mq-&gt;phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='hunk'>@@ -12581,6 +12800,7 @@ lpfc_wq_destroy(struct lpfc_hba *phba, struct lpfc_queue *wq)</div><div class='ctx'> 	uint32_t shdr_status, shdr_add_status;</div><div class='ctx'> 	union lpfc_sli4_cfg_shdr *shdr;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='ctx'> 	if (!wq)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	mbox = mempool_alloc(wq-&gt;phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='hunk'>@@ -12634,6 +12854,7 @@ lpfc_rq_destroy(struct lpfc_hba *phba, struct lpfc_queue *hrq,</div><div class='ctx'> 	uint32_t shdr_status, shdr_add_status;</div><div class='ctx'> 	union lpfc_sli4_cfg_shdr *shdr;</div><div class='ctx'> </div><div class='add'>+	/* sanity check on queue memory */</div><div class='ctx'> 	if (!hrq || !drq)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	mbox = mempool_alloc(hrq-&gt;phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='hunk'>@@ -15252,45 +15473,42 @@ lpfc_sli4_fcf_dead_failthrough(struct lpfc_hba *phba)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * lpfc_sli_read_link_ste - Read region 23 to decide if link is disabled.</div><div class='add'>+ * lpfc_sli_get_config_region23 - Get sli3 port region 23 data.</div><div class='ctx'>  * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @rgn23_data: pointer to configure region 23 data.</div><div class='ctx'>  *</div><div class='del'>- * This function read region 23 and parse TLV for port status to</div><div class='del'>- * decide if the user disaled the port. If the TLV indicates the</div><div class='del'>- * port is disabled, the hba_flag is set accordingly.</div><div class='add'>+ * This function gets SLI3 port configure region 23 data through memory dump</div><div class='add'>+ * mailbox command. When it successfully retrieves data, the size of the data</div><div class='add'>+ * will be returned, otherwise, 0 will be returned.</div><div class='ctx'>  **/</div><div class='del'>-void</div><div class='del'>-lpfc_sli_read_link_ste(struct lpfc_hba *phba)</div><div class='add'>+static uint32_t</div><div class='add'>+lpfc_sli_get_config_region23(struct lpfc_hba *phba, char *rgn23_data)</div><div class='ctx'> {</div><div class='ctx'> 	LPFC_MBOXQ_t *pmb = NULL;</div><div class='ctx'> 	MAILBOX_t *mb;</div><div class='del'>-	uint8_t *rgn23_data = NULL;</div><div class='del'>-	uint32_t offset = 0, data_size, sub_tlv_len, tlv_offset;</div><div class='add'>+	uint32_t offset = 0;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	if (!rgn23_data)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	pmb = mempool_alloc(phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='ctx'> 	if (!pmb) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='del'>-			"2600 lpfc_sli_read_serdes_param failed to"</div><div class='del'>-			" allocate mailbox memory\n");</div><div class='del'>-		goto out;</div><div class='add'>+				"2600 failed to allocate mailbox memory\n");</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	mb = &amp;pmb-&gt;u.mb;</div><div class='ctx'> </div><div class='del'>-	/* Get adapter Region 23 data */</div><div class='del'>-	rgn23_data = kzalloc(DMP_RGN23_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!rgn23_data)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	do {</div><div class='ctx'> 		lpfc_dump_mem(phba, pmb, offset, DMP_REGION_23);</div><div class='ctx'> 		rc = lpfc_sli_issue_mbox(phba, pmb, MBX_POLL);</div><div class='ctx'> </div><div class='ctx'> 		if (rc != MBX_SUCCESS) {</div><div class='ctx'> 			lpfc_printf_log(phba, KERN_INFO, LOG_INIT,</div><div class='del'>-				"2601 lpfc_sli_read_link_ste failed to"</div><div class='del'>-				" read config region 23 rc 0x%x Status 0x%x\n",</div><div class='del'>-				rc, mb-&gt;mbxStatus);</div><div class='add'>+					"2601 failed to read config "</div><div class='add'>+					"region 23, rc 0x%x Status 0x%x\n",</div><div class='add'>+					rc, mb-&gt;mbxStatus);</div><div class='ctx'> 			mb-&gt;un.varDmp.word_cnt = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -15303,13 +15521,96 @@ lpfc_sli_read_link_ste(struct lpfc_hba *phba)</div><div class='ctx'> 			mb-&gt;un.varDmp.word_cnt = DMP_RGN23_SIZE - offset;</div><div class='ctx'> </div><div class='ctx'> 		lpfc_sli_pcimem_bcopy(((uint8_t *)mb) + DMP_RSP_OFFSET,</div><div class='del'>-			rgn23_data + offset,</div><div class='del'>-			mb-&gt;un.varDmp.word_cnt);</div><div class='add'>+				       rgn23_data + offset,</div><div class='add'>+				       mb-&gt;un.varDmp.word_cnt);</div><div class='ctx'> 		offset += mb-&gt;un.varDmp.word_cnt;</div><div class='ctx'> 	} while (mb-&gt;un.varDmp.word_cnt &amp;&amp; offset &lt; DMP_RGN23_SIZE);</div><div class='ctx'> </div><div class='del'>-	data_size = offset;</div><div class='del'>-	offset = 0;</div><div class='add'>+	mempool_free(pmb, phba-&gt;mbox_mem_pool);</div><div class='add'>+	return offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli4_get_config_region23 - Get sli4 port region 23 data.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ * @rgn23_data: pointer to configure region 23 data.</div><div class='add'>+ *</div><div class='add'>+ * This function gets SLI4 port configure region 23 data through memory dump</div><div class='add'>+ * mailbox command. When it successfully retrieves data, the size of the data</div><div class='add'>+ * will be returned, otherwise, 0 will be returned.</div><div class='add'>+ **/</div><div class='add'>+static uint32_t</div><div class='add'>+lpfc_sli4_get_config_region23(struct lpfc_hba *phba, char *rgn23_data)</div><div class='add'>+{</div><div class='add'>+	LPFC_MBOXQ_t *mboxq = NULL;</div><div class='add'>+	struct lpfc_dmabuf *mp = NULL;</div><div class='add'>+	struct lpfc_mqe *mqe;</div><div class='add'>+	uint32_t data_length = 0;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!rgn23_data)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mboxq = mempool_alloc(phba-&gt;mbox_mem_pool, GFP_KERNEL);</div><div class='add'>+	if (!mboxq) {</div><div class='add'>+		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='add'>+				"3105 failed to allocate mailbox memory\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (lpfc_sli4_dump_cfg_rg23(phba, mboxq))</div><div class='add'>+		goto out;</div><div class='add'>+	mqe = &amp;mboxq-&gt;u.mqe;</div><div class='add'>+	mp = (struct lpfc_dmabuf *) mboxq-&gt;context1;</div><div class='add'>+	rc = lpfc_sli_issue_mbox(phba, mboxq, MBX_POLL);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out;</div><div class='add'>+	data_length = mqe-&gt;un.mb_words[5];</div><div class='add'>+	if (data_length == 0)</div><div class='add'>+		goto out;</div><div class='add'>+	if (data_length &gt; DMP_RGN23_SIZE) {</div><div class='add'>+		data_length = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	lpfc_sli_pcimem_bcopy((char *)mp-&gt;virt, rgn23_data, data_length);</div><div class='add'>+out:</div><div class='add'>+	mempool_free(mboxq, phba-&gt;mbox_mem_pool);</div><div class='add'>+	if (mp) {</div><div class='add'>+		lpfc_mbuf_free(phba, mp-&gt;virt, mp-&gt;phys);</div><div class='add'>+		kfree(mp);</div><div class='add'>+	}</div><div class='add'>+	return data_length;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lpfc_sli_read_link_ste - Read region 23 to decide if link is disabled.</div><div class='add'>+ * @phba: pointer to lpfc hba data structure.</div><div class='add'>+ *</div><div class='add'>+ * This function read region 23 and parse TLV for port status to</div><div class='add'>+ * decide if the user disaled the port. If the TLV indicates the</div><div class='add'>+ * port is disabled, the hba_flag is set accordingly.</div><div class='add'>+ **/</div><div class='add'>+void</div><div class='add'>+lpfc_sli_read_link_ste(struct lpfc_hba *phba)</div><div class='add'>+{</div><div class='add'>+	uint8_t *rgn23_data = NULL;</div><div class='add'>+	uint32_t if_type, data_size, sub_tlv_len, tlv_offset;</div><div class='add'>+	uint32_t offset = 0;</div><div class='add'>+</div><div class='add'>+	/* Get adapter Region 23 data */</div><div class='add'>+	rgn23_data = kzalloc(DMP_RGN23_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!rgn23_data)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (phba-&gt;sli_rev &lt; LPFC_SLI_REV4)</div><div class='add'>+		data_size = lpfc_sli_get_config_region23(phba, rgn23_data);</div><div class='add'>+	else {</div><div class='add'>+		if_type = bf_get(lpfc_sli_intf_if_type,</div><div class='add'>+				 &amp;phba-&gt;sli4_hba.sli_intf);</div><div class='add'>+		if (if_type == LPFC_SLI_INTF_IF_TYPE_0)</div><div class='add'>+			goto out;</div><div class='add'>+		data_size = lpfc_sli4_get_config_region23(phba, rgn23_data);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!data_size)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -15373,9 +15674,8 @@ lpfc_sli_read_link_ste(struct lpfc_hba *phba)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> out:</div><div class='del'>-	if (pmb)</div><div class='del'>-		mempool_free(pmb, phba-&gt;mbox_mem_pool);</div><div class='ctx'> 	kfree(rgn23_data);</div><div class='ctx'> 	return;</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 d5cffd8af340..3f266e2c54e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_sli4.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_sli4.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_sli4.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_sli4.h</a></div><div class='hunk'>@@ -291,7 +291,7 @@ struct lpfc_bmbx {</div><div class='ctx'> #define LPFC_RQE_SIZE		8</div><div class='ctx'> </div><div class='ctx'> #define LPFC_EQE_DEF_COUNT	1024</div><div class='del'>-#define LPFC_CQE_DEF_COUNT      256</div><div class='add'>+#define LPFC_CQE_DEF_COUNT      1024</div><div class='ctx'> #define LPFC_WQE_DEF_COUNT      256</div><div class='ctx'> #define LPFC_MQE_DEF_COUNT      16</div><div class='ctx'> #define LPFC_RQE_DEF_COUNT	512</div><div class='hunk'>@@ -420,7 +420,16 @@ struct lpfc_sli4_hba {</div><div class='ctx'> 			void __iomem *STATUSregaddr;</div><div class='ctx'> 			void __iomem *CTRLregaddr;</div><div class='ctx'> 			void __iomem *ERR1regaddr;</div><div class='add'>+#define SLIPORT_ERR1_REG_ERR_CODE_1		0x1</div><div class='add'>+#define SLIPORT_ERR1_REG_ERR_CODE_2		0x2</div><div class='ctx'> 			void __iomem *ERR2regaddr;</div><div class='add'>+#define SLIPORT_ERR2_REG_FW_RESTART		0x0</div><div class='add'>+#define SLIPORT_ERR2_REG_FUNC_PROVISON		0x1</div><div class='add'>+#define SLIPORT_ERR2_REG_FORCED_DUMP		0x2</div><div class='add'>+#define SLIPORT_ERR2_REG_FAILURE_EQ		0x3</div><div class='add'>+#define SLIPORT_ERR2_REG_FAILURE_CQ		0x4</div><div class='add'>+#define SLIPORT_ERR2_REG_FAILURE_BUS		0x5</div><div class='add'>+#define SLIPORT_ERR2_REG_FAILURE_RQ		0x6</div><div class='ctx'> 		} if_type2;</div><div class='ctx'> 	} u;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_version.h b/drivers/scsi/lpfc/lpfc_version.h<br/>index b0630e37f1ef..dd044d01a07f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_version.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_version.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_version.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_version.h</a></div><div class='hunk'>@@ -18,7 +18,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 "8.3.27"</div><div class='add'>+#define LPFC_DRIVER_VERSION "8.3.28"</div><div class='ctx'> #define LPFC_DRIVER_NAME		"lpfc"</div><div class='ctx'> #define LPFC_SP_DRIVER_HANDLER_NAME	"lpfc:sp"</div><div class='ctx'> #define LPFC_FP_DRIVER_HANDLER_NAME	"lpfc:fp"</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_vport.c b/drivers/scsi/lpfc/lpfc_vport.c<br/>index cff6ca67415c..0fe188e66000 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_vport.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/lpfc/lpfc_vport.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_vport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/lpfc/lpfc_vport.c</a></div><div class='hunk'>@@ -774,10 +774,10 @@ lpfc_create_vport_work_array(struct lpfc_hba *phba)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	spin_lock_irq(&amp;phba-&gt;hbalock);</div><div class='ctx'> 	list_for_each_entry(port_iterator, &amp;phba-&gt;port_list, listentry) {</div><div class='add'>+		if (port_iterator-&gt;load_flag &amp; FC_UNLOADING)</div><div class='add'>+			continue;</div><div class='ctx'> 		if (!scsi_host_get(lpfc_shost_from_vport(port_iterator))) {</div><div class='del'>-			if (!(port_iterator-&gt;load_flag &amp; FC_UNLOADING))</div><div class='del'>-				lpfc_printf_vlog(port_iterator, KERN_ERR,</div><div class='del'>-					 LOG_VPORT,</div><div class='add'>+			lpfc_printf_vlog(port_iterator, KERN_ERR, LOG_VPORT,</div><div class='ctx'> 					 "1801 Create vport work array FAILED: "</div><div class='ctx'> 					 "cannot do scsi_host_get\n");</div><div class='ctx'> 			continue;</div><div class='head'>diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c<br/>index 590ce1ef2016..4ceeace80453 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/mac_esp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mac_esp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/mac_esp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/mac_esp.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/macints.h&gt;</div><div class='ctx'> #include &lt;asm/macintosh.h&gt;</div><div class='add'>+#include &lt;asm/mac_via.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -149,7 +150,7 @@ static inline int mac_esp_wait_for_dreq(struct esp *esp)</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		if (mep-&gt;pdma_regs == NULL) {</div><div class='del'>-			if (mac_irq_pending(IRQ_MAC_SCSIDRQ))</div><div class='add'>+			if (via2_scsi_drq_pending())</div><div class='ctx'> 				return 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (nubus_readl(mep-&gt;pdma_regs) &amp; 0x200)</div><div class='head'>diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c<br/>index af3a6af97cc7..ea2bde206f7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/mac_scsi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mac_scsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/mac_scsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/mac_scsi.c</a></div><div class='hunk'>@@ -291,8 +291,7 @@ int __init macscsi_detect(struct scsi_host_template * tpnt)</div><div class='ctx'>     ((struct NCR5380_hostdata *)instance-&gt;hostdata)-&gt;ctrl = 0;</div><div class='ctx'> </div><div class='ctx'>     if (instance-&gt;irq != SCSI_IRQ_NONE)</div><div class='del'>-	if (request_irq(instance-&gt;irq, NCR5380_intr, IRQ_FLG_SLOW, </div><div class='del'>-			"ncr5380", instance)) {</div><div class='add'>+	if (request_irq(instance-&gt;irq, NCR5380_intr, 0, "ncr5380", instance)) {</div><div class='ctx'> 	    printk(KERN_WARNING "scsi%d: IRQ%d not free, interrupts disabled\n",</div><div class='ctx'> 		   instance-&gt;host_no, instance-&gt;irq);</div><div class='ctx'> 	    instance-&gt;irq = SCSI_IRQ_NONE;</div><div class='head'>diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c<br/>index 5c1776406c96..15eefa1d61fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/megaraid.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/megaraid.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/megaraid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/megaraid.c</a></div><div class='hunk'>@@ -306,19 +306,22 @@ mega_query_adapter(adapter_t *adapter)</div><div class='ctx'> 	adapter-&gt;host-&gt;sg_tablesize = adapter-&gt;sglen;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	/* use HP firmware and bios version encoding */</div><div class='add'>+	/* use HP firmware and bios version encoding</div><div class='add'>+	   Note: fw_version[0|1] and bios_version[0|1] were originally shifted</div><div class='add'>+	   right 8 bits making them zero. This 0 value was hardcoded to fix</div><div class='add'>+	   sparse warnings. */</div><div class='ctx'> 	if (adapter-&gt;product_info.subsysvid == HP_SUBSYS_VID) {</div><div class='ctx'> 		sprintf (adapter-&gt;fw_version, "%c%d%d.%d%d",</div><div class='ctx'> 			 adapter-&gt;product_info.fw_version[2],</div><div class='del'>-			 adapter-&gt;product_info.fw_version[1] &gt;&gt; 8,</div><div class='add'>+			 0,</div><div class='ctx'> 			 adapter-&gt;product_info.fw_version[1] &amp; 0x0f,</div><div class='del'>-			 adapter-&gt;product_info.fw_version[0] &gt;&gt; 8,</div><div class='add'>+			 0,</div><div class='ctx'> 			 adapter-&gt;product_info.fw_version[0] &amp; 0x0f);</div><div class='ctx'> 		sprintf (adapter-&gt;bios_version, "%c%d%d.%d%d",</div><div class='ctx'> 			 adapter-&gt;product_info.bios_version[2],</div><div class='del'>-			 adapter-&gt;product_info.bios_version[1] &gt;&gt; 8,</div><div class='add'>+			 0,</div><div class='ctx'> 			 adapter-&gt;product_info.bios_version[1] &amp; 0x0f,</div><div class='del'>-			 adapter-&gt;product_info.bios_version[0] &gt;&gt; 8,</div><div class='add'>+			 0,</div><div class='ctx'> 			 adapter-&gt;product_info.bios_version[0] &amp; 0x0f);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		memcpy(adapter-&gt;fw_version,</div><div class='head'>diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h<br/>index dd94c7d574fb..e5f416f8042d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/megaraid/megaraid_sas.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/megaraid/megaraid_sas.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/megaraid/megaraid_sas.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/megaraid/megaraid_sas.h</a></div><div class='hunk'>@@ -33,9 +33,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * MegaRAID SAS Driver meta data</div><div class='ctx'>  */</div><div class='del'>-#define MEGASAS_VERSION				"00.00.06.12-rc1"</div><div class='del'>-#define MEGASAS_RELDATE				"Oct. 5, 2011"</div><div class='del'>-#define MEGASAS_EXT_VERSION			"Wed. Oct. 5 17:00:00 PDT 2011"</div><div class='add'>+#define MEGASAS_VERSION				"00.00.06.14-rc1"</div><div class='add'>+#define MEGASAS_RELDATE				"Jan. 6, 2012"</div><div class='add'>+#define MEGASAS_EXT_VERSION			"Fri. Jan. 6 17:00:00 PDT 2012"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Device IDs</div><div class='hunk'>@@ -773,7 +773,6 @@ struct megasas_ctrl_info {</div><div class='ctx'> </div><div class='ctx'> #define MFI_OB_INTR_STATUS_MASK			0x00000002</div><div class='ctx'> #define MFI_POLL_TIMEOUT_SECS			60</div><div class='del'>-#define MEGASAS_COMPLETION_TIMER_INTERVAL      (HZ/10)</div><div class='ctx'> </div><div class='ctx'> #define MFI_REPLY_1078_MESSAGE_INTERRUPT	0x80000000</div><div class='ctx'> #define MFI_REPLY_GEN2_MESSAGE_INTERRUPT	0x00000001</div><div class='hunk'>@@ -1353,7 +1352,6 @@ struct megasas_instance {</div><div class='ctx'> 	u32 mfiStatus;</div><div class='ctx'> 	u32 last_seq_num;</div><div class='ctx'> </div><div class='del'>-	struct timer_list io_completion_timer;</div><div class='ctx'> 	struct list_head internal_reset_pending_q;</div><div class='ctx'> </div><div class='ctx'> 	/* Ptr to hba specific information */</div><div class='head'>diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c<br/>index 29a994f9c4f1..8b300be44284 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/megaraid/megaraid_sas_base.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/megaraid/megaraid_sas_base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/megaraid/megaraid_sas_base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/megaraid/megaraid_sas_base.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'>  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='ctx'>  *</div><div class='ctx'>  *  FILE: megaraid_sas_base.c</div><div class='del'>- *  Version : v00.00.06.12-rc1</div><div class='add'>+ *  Version : v00.00.06.14-rc1</div><div class='ctx'>  *</div><div class='ctx'>  *  Authors: LSI Corporation</div><div class='ctx'>  *           Sreenivas Bagalkote</div><div class='hunk'>@@ -59,14 +59,6 @@</div><div class='ctx'> #include "megaraid_sas.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * poll_mode_io:1- schedule complete completion from q cmd</div><div class='del'>- */</div><div class='del'>-static unsigned int poll_mode_io;</div><div class='del'>-module_param_named(poll_mode_io, poll_mode_io, int, 0);</div><div class='del'>-MODULE_PARM_DESC(poll_mode_io,</div><div class='del'>-	"Complete cmds from IO path, (default=0)");</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Number of sectors per IO command</div><div class='ctx'>  * Will be set in megasas_init_mfi if user does not provide</div><div class='ctx'>  */</div><div class='hunk'>@@ -1439,11 +1431,6 @@ megasas_build_and_issue_cmd(struct megasas_instance *instance,</div><div class='ctx'> </div><div class='ctx'> 	instance-&gt;instancet-&gt;fire_cmd(instance, cmd-&gt;frame_phys_addr,</div><div class='ctx'> 				cmd-&gt;frame_count-1, instance-&gt;reg_set);</div><div class='del'>-	/*</div><div class='del'>-	 * Check if we have pend cmds to be completed</div><div class='del'>-	 */</div><div class='del'>-	if (poll_mode_io &amp;&amp; atomic_read(&amp;instance-&gt;fw_outstanding))</div><div class='del'>-		tasklet_schedule(&amp;instance-&gt;isr_tasklet);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> out_return_cmd:</div><div class='hunk'>@@ -3370,47 +3357,6 @@ fail_fw_init:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * megasas_start_timer - Initializes a timer object</div><div class='del'>- * @instance:		Adapter soft state</div><div class='del'>- * @timer:		timer object to be initialized</div><div class='del'>- * @fn:			timer function</div><div class='del'>- * @interval:		time interval between timer function call</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-megasas_start_timer(struct megasas_instance *instance,</div><div class='del'>-			struct timer_list *timer,</div><div class='del'>-			void *fn, unsigned long interval)</div><div class='del'>-{</div><div class='del'>-	init_timer(timer);</div><div class='del'>-	timer-&gt;expires = jiffies + interval;</div><div class='del'>-	timer-&gt;data = (unsigned long)instance;</div><div class='del'>-	timer-&gt;function = fn;</div><div class='del'>-	add_timer(timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * megasas_io_completion_timer - Timer fn</div><div class='del'>- * @instance_addr:	Address of adapter soft state</div><div class='del'>- *</div><div class='del'>- * Schedules tasklet for cmd completion</div><div class='del'>- * if poll_mode_io is set</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-megasas_io_completion_timer(unsigned long instance_addr)</div><div class='del'>-{</div><div class='del'>-	struct megasas_instance *instance =</div><div class='del'>-			(struct megasas_instance *)instance_addr;</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;instance-&gt;fw_outstanding))</div><div class='del'>-		tasklet_schedule(&amp;instance-&gt;isr_tasklet);</div><div class='del'>-</div><div class='del'>-	/* Restart timer */</div><div class='del'>-	if (poll_mode_io)</div><div class='del'>-		mod_timer(&amp;instance-&gt;io_completion_timer,</div><div class='del'>-			jiffies + MEGASAS_COMPLETION_TIMER_INTERVAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static u32</div><div class='ctx'> megasas_init_adapter_mfi(struct megasas_instance *instance)</div><div class='ctx'> {</div><div class='hunk'>@@ -3638,11 +3584,6 @@ static int megasas_init_fw(struct megasas_instance *instance)</div><div class='ctx'> 	tasklet_init(&amp;instance-&gt;isr_tasklet, instance-&gt;instancet-&gt;tasklet,</div><div class='ctx'> 		(unsigned long)instance);</div><div class='ctx'> </div><div class='del'>-	/* Initialize the cmd completion timer */</div><div class='del'>-	if (poll_mode_io)</div><div class='del'>-		megasas_start_timer(instance, &amp;instance-&gt;io_completion_timer,</div><div class='del'>-				megasas_io_completion_timer,</div><div class='del'>-				MEGASAS_COMPLETION_TIMER_INTERVAL);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail_init_adapter:</div><div class='hunk'>@@ -4369,9 +4310,6 @@ megasas_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	host = instance-&gt;host;</div><div class='ctx'> 	instance-&gt;unload = 1;</div><div class='ctx'> </div><div class='del'>-	if (poll_mode_io)</div><div class='del'>-		del_timer_sync(&amp;instance-&gt;io_completion_timer);</div><div class='del'>-</div><div class='ctx'> 	megasas_flush_cache(instance);</div><div class='ctx'> 	megasas_shutdown_controller(instance, MR_DCMD_HIBERNATE_SHUTDOWN);</div><div class='ctx'> </div><div class='hunk'>@@ -4511,12 +4449,6 @@ megasas_resume(struct pci_dev *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	instance-&gt;instancet-&gt;enable_intr(instance-&gt;reg_set);</div><div class='del'>-</div><div class='del'>-	/* Initialize the cmd completion timer */</div><div class='del'>-	if (poll_mode_io)</div><div class='del'>-		megasas_start_timer(instance, &amp;instance-&gt;io_completion_timer,</div><div class='del'>-				megasas_io_completion_timer,</div><div class='del'>-				MEGASAS_COMPLETION_TIMER_INTERVAL);</div><div class='ctx'> 	instance-&gt;unload = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -4570,9 +4502,6 @@ static void __devexit megasas_detach_one(struct pci_dev *pdev)</div><div class='ctx'> 	host = instance-&gt;host;</div><div class='ctx'> 	fusion = instance-&gt;ctrl_context;</div><div class='ctx'> </div><div class='del'>-	if (poll_mode_io)</div><div class='del'>-		del_timer_sync(&amp;instance-&gt;io_completion_timer);</div><div class='del'>-</div><div class='ctx'> 	scsi_remove_host(instance-&gt;host);</div><div class='ctx'> 	megasas_flush_cache(instance);</div><div class='ctx'> 	megasas_shutdown_controller(instance, MR_DCMD_CTRL_SHUTDOWN);</div><div class='hunk'>@@ -4773,6 +4702,8 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance,</div><div class='ctx'> 	memcpy(cmd-&gt;frame, ioc-&gt;frame.raw, 2 * MEGAMFI_FRAME_SIZE);</div><div class='ctx'> 	cmd-&gt;frame-&gt;hdr.context = cmd-&gt;index;</div><div class='ctx'> 	cmd-&gt;frame-&gt;hdr.pad_0 = 0;</div><div class='add'>+	cmd-&gt;frame-&gt;hdr.flags &amp;= ~(MFI_FRAME_IEEE | MFI_FRAME_SGL64 |</div><div class='add'>+				   MFI_FRAME_SENSE64);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The management interface between applications and the fw uses</div><div class='hunk'>@@ -5219,60 +5150,6 @@ megasas_sysfs_set_dbg_lvl(struct device_driver *dd, const char *buf, size_t coun</div><div class='ctx'> static DRIVER_ATTR(dbg_lvl, S_IRUGO|S_IWUSR, megasas_sysfs_show_dbg_lvl,</div><div class='ctx'> 		megasas_sysfs_set_dbg_lvl);</div><div class='ctx'> </div><div class='del'>-static ssize_t</div><div class='del'>-megasas_sysfs_show_poll_mode_io(struct device_driver *dd, char *buf)</div><div class='del'>-{</div><div class='del'>-	return sprintf(buf, "%u\n", poll_mode_io);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-megasas_sysfs_set_poll_mode_io(struct device_driver *dd,</div><div class='del'>-				const char *buf, size_t count)</div><div class='del'>-{</div><div class='del'>-	int retval = count;</div><div class='del'>-	int tmp = poll_mode_io;</div><div class='del'>-	int i;</div><div class='del'>-	struct megasas_instance *instance;</div><div class='del'>-</div><div class='del'>-	if (sscanf(buf, "%u", &amp;poll_mode_io) &lt; 1) {</div><div class='del'>-		printk(KERN_ERR "megasas: could not set poll_mode_io\n");</div><div class='del'>-		retval = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check if poll_mode_io is already set or is same as previous value</div><div class='del'>-	 */</div><div class='del'>-	if ((tmp &amp;&amp; poll_mode_io) || (tmp == poll_mode_io))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (poll_mode_io) {</div><div class='del'>-		/*</div><div class='del'>-		 * Start timers for all adapters</div><div class='del'>-		 */</div><div class='del'>-		for (i = 0; i &lt; megasas_mgmt_info.max_index; i++) {</div><div class='del'>-			instance = megasas_mgmt_info.instance[i];</div><div class='del'>-			if (instance) {</div><div class='del'>-				megasas_start_timer(instance,</div><div class='del'>-					&amp;instance-&gt;io_completion_timer,</div><div class='del'>-					megasas_io_completion_timer,</div><div class='del'>-					MEGASAS_COMPLETION_TIMER_INTERVAL);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Delete timers for all adapters</div><div class='del'>-		 */</div><div class='del'>-		for (i = 0; i &lt; megasas_mgmt_info.max_index; i++) {</div><div class='del'>-			instance = megasas_mgmt_info.instance[i];</div><div class='del'>-			if (instance)</div><div class='del'>-				del_timer_sync(&amp;instance-&gt;io_completion_timer);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> megasas_aen_polling(struct work_struct *work)</div><div class='ctx'> {</div><div class='hunk'>@@ -5502,11 +5379,6 @@ megasas_aen_polling(struct work_struct *work)</div><div class='ctx'> 	kfree(ev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static DRIVER_ATTR(poll_mode_io, S_IRUGO|S_IWUSR,</div><div class='del'>-		megasas_sysfs_show_poll_mode_io,</div><div class='del'>-		megasas_sysfs_set_poll_mode_io);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * megasas_init - Driver load entry point</div><div class='ctx'>  */</div><div class='hunk'>@@ -5566,11 +5438,6 @@ static int __init megasas_init(void)</div><div class='ctx'> 	if (rval)</div><div class='ctx'> 		goto err_dcf_dbg_lvl;</div><div class='ctx'> 	rval = driver_create_file(&amp;megasas_pci_driver.driver,</div><div class='del'>-				  &amp;driver_attr_poll_mode_io);</div><div class='del'>-	if (rval)</div><div class='del'>-		goto err_dcf_poll_mode_io;</div><div class='del'>-</div><div class='del'>-	rval = driver_create_file(&amp;megasas_pci_driver.driver,</div><div class='ctx'> 				&amp;driver_attr_support_device_change);</div><div class='ctx'> 	if (rval)</div><div class='ctx'> 		goto err_dcf_support_device_change;</div><div class='hunk'>@@ -5579,10 +5446,6 @@ static int __init megasas_init(void)</div><div class='ctx'> </div><div class='ctx'> err_dcf_support_device_change:</div><div class='ctx'> 	driver_remove_file(&amp;megasas_pci_driver.driver,</div><div class='del'>-		  &amp;driver_attr_poll_mode_io);</div><div class='del'>-</div><div class='del'>-err_dcf_poll_mode_io:</div><div class='del'>-	driver_remove_file(&amp;megasas_pci_driver.driver,</div><div class='ctx'> 			   &amp;driver_attr_dbg_lvl);</div><div class='ctx'> err_dcf_dbg_lvl:</div><div class='ctx'> 	driver_remove_file(&amp;megasas_pci_driver.driver,</div><div class='hunk'>@@ -5607,8 +5470,6 @@ err_pcidrv:</div><div class='ctx'> static void __exit megasas_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	driver_remove_file(&amp;megasas_pci_driver.driver,</div><div class='del'>-			   &amp;driver_attr_poll_mode_io);</div><div class='del'>-	driver_remove_file(&amp;megasas_pci_driver.driver,</div><div class='ctx'> 			   &amp;driver_attr_dbg_lvl);</div><div class='ctx'> 	driver_remove_file(&amp;megasas_pci_driver.driver,</div><div class='ctx'> 			&amp;driver_attr_support_poll_for_event);</div><div class='head'>diff --git a/drivers/scsi/megaraid/megaraid_sas_fp.c b/drivers/scsi/megaraid/megaraid_sas_fp.c<br/>index 5255dd688aca..294abb0defa6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/megaraid/megaraid_sas_fp.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/megaraid/megaraid_sas_fp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/megaraid/megaraid_sas_fp.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/megaraid/megaraid_sas_fp.c</a></div><div class='hunk'>@@ -282,7 +282,9 @@ u8 MR_GetPhyParams(struct megasas_instance *instance, u32 ld, u64 stripRow,</div><div class='ctx'> 	else {</div><div class='ctx'> 		*pDevHandle = MR_PD_INVALID; /* set dev handle as invalid. */</div><div class='ctx'> 		if ((raid-&gt;level &gt;= 5) &amp;&amp;</div><div class='del'>-		    (instance-&gt;pdev-&gt;device != PCI_DEVICE_ID_LSI_INVADER))</div><div class='add'>+		    ((instance-&gt;pdev-&gt;device != PCI_DEVICE_ID_LSI_INVADER) ||</div><div class='add'>+		     (instance-&gt;pdev-&gt;device == PCI_DEVICE_ID_LSI_INVADER &amp;&amp;</div><div class='add'>+		      raid-&gt;regTypeReqOnRead != REGION_TYPE_UNUSED)))</div><div class='ctx'> 			pRAID_Context-&gt;regLockFlags = REGION_TYPE_EXCLUSIVE;</div><div class='ctx'> 		else if (raid-&gt;level == 1) {</div><div class='ctx'> 			/* Get alternate Pd. */</div><div class='head'>diff --git a/drivers/scsi/mpt2sas/mpi/mpi2.h b/drivers/scsi/mpt2sas/mpi/mpi2.h<br/>index 8dc1b32918dd..a01f0aa66f20 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpi/mpi2.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpi/mpi2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpi/mpi2.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/mpt2sas/mpi/mpi2.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  *                  scatter/gather formats.</div><div class='ctx'>  *  Creation Date:  June 21, 2006</div><div class='ctx'>  *</div><div class='del'>- *  mpi2.h Version:  02.00.20</div><div class='add'>+ *  mpi2.h Version:  02.00.22</div><div class='ctx'>  *</div><div class='ctx'>  *  Version History</div><div class='ctx'>  *  ---------------</div><div class='hunk'>@@ -69,6 +69,8 @@</div><div class='ctx'>  *  02-23-11  02.00.19  Bumped MPI2_HEADER_VERSION_UNIT.</div><div class='ctx'>  *                      Added MPI2_FUNCTION_SEND_HOST_MESSAGE.</div><div class='ctx'>  *  03-09-11  02.00.20  Bumped MPI2_HEADER_VERSION_UNIT.</div><div class='add'>+ *  05-25-11  02.00.21  Bumped MPI2_HEADER_VERSION_UNIT.</div><div class='add'>+ *  08-24-11  02.00.22  Bumped MPI2_HEADER_VERSION_UNIT.</div><div class='ctx'>  *  --------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -94,7 +96,7 @@</div><div class='ctx'> #define MPI2_VERSION_02_00                  (0x0200)</div><div class='ctx'> </div><div class='ctx'> /* versioning for this MPI header set */</div><div class='del'>-#define MPI2_HEADER_VERSION_UNIT            (0x14)</div><div class='add'>+#define MPI2_HEADER_VERSION_UNIT            (0x16)</div><div class='ctx'> #define MPI2_HEADER_VERSION_DEV             (0x00)</div><div class='ctx'> #define MPI2_HEADER_VERSION_UNIT_MASK       (0xFF00)</div><div class='ctx'> #define MPI2_HEADER_VERSION_UNIT_SHIFT      (8)</div><div class='hunk'>@@ -1073,8 +1075,10 @@ typedef struct _MPI2_IEEE_SGE_UNION</div><div class='ctx'> #define MPI2_IEEE_SGE_FLAGS_IOCPLB_ADDR         (0x02)</div><div class='ctx'> #define MPI2_IEEE_SGE_FLAGS_IOCPLBNTA_ADDR      (0x03)</div><div class='ctx'> 						/* IEEE Simple Element only */</div><div class='del'>-#define MPI2_IEEE_SGE_FLAGS_SYSTEMPLBCPI_ADDR   (0x03)</div><div class='add'>+#define MPI2_IEEE_SGE_FLAGS_SYSTEMPLBPCI_ADDR   (0x03)</div><div class='ctx'> 						/* IEEE Chain Element only */</div><div class='add'>+#define MPI2_IEEE_SGE_FLAGS_SYSTEMPLBCPI_ADDR   \</div><div class='add'>+	(MPI2_IEEE_SGE_FLAGS_SYSTEMPLBPCI_ADDR) /* typo in name */</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************</div><div class='ctx'> *  IEEE SGE operation Macros</div><div class='head'>diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h b/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h<br/>index cfd95b4e3004..3a023dad77a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *          Title:  MPI Configuration messages and pages</div><div class='ctx'>  *  Creation Date:  November 10, 2006</div><div class='ctx'>  *</div><div class='del'>- *    mpi2_cnfg.h Version:  02.00.19</div><div class='add'>+ *    mpi2_cnfg.h Version:  02.00.21</div><div class='ctx'>  *</div><div class='ctx'>  *  Version History</div><div class='ctx'>  *  ---------------</div><div class='hunk'>@@ -140,6 +140,13 @@</div><div class='ctx'>  *                      Added SASNotifyPrimitiveMasks field to</div><div class='ctx'>  *                      MPI2_CONFIG_PAGE_IOC_7.</div><div class='ctx'>  *  03-09-11  02.00.19  Fixed IO Unit Page 10 (to match the spec).</div><div class='add'>+ *  05-25-11  02.00.20  Cleaned up a few comments.</div><div class='add'>+ *  08-24-11  02.00.21  Marked the IO Unit Page 7 PowerManagementCapabilities</div><div class='add'>+ *                      for PCIe link as obsolete.</div><div class='add'>+ *                      Added SpinupFlags field containing a Disable Spin-up</div><div class='add'>+ *                      bit to the MPI2_SAS_IOUNIT4_SPINUP_GROUP fields of</div><div class='add'>+ *                      SAS IO Unit Page 4.</div><div class='add'>+</div><div class='ctx'>  *  --------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -904,8 +911,8 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 {</div><div class='ctx'> #define MPI2_IOUNITPAGE7_PMCAP_12_5_PCT_IOCSPEED    (0x00000400)</div><div class='ctx'> #define MPI2_IOUNITPAGE7_PMCAP_25_0_PCT_IOCSPEED    (0x00000200)</div><div class='ctx'> #define MPI2_IOUNITPAGE7_PMCAP_50_0_PCT_IOCSPEED    (0x00000100)</div><div class='del'>-#define MPI2_IOUNITPAGE7_PMCAP_PCIE_WIDTH_CHANGE    (0x00000008)</div><div class='del'>-#define MPI2_IOUNITPAGE7_PMCAP_PCIE_SPEED_CHANGE    (0x00000004)</div><div class='add'>+#define MPI2_IOUNITPAGE7_PMCAP_PCIE_WIDTH_CHANGE    (0x00000008) /* obsolete */</div><div class='add'>+#define MPI2_IOUNITPAGE7_PMCAP_PCIE_SPEED_CHANGE    (0x00000004) /* obsolete */</div><div class='ctx'> </div><div class='ctx'> /* defines for IO Unit Page 7 IOCTemperatureUnits field */</div><div class='ctx'> #define MPI2_IOUNITPAGE7_IOC_TEMP_NOT_PRESENT       (0x00)</div><div class='hunk'>@@ -1970,10 +1977,14 @@ typedef struct _MPI2_SAS_IOUNIT4_SPINUP_GROUP</div><div class='ctx'> {</div><div class='ctx'>     U8          MaxTargetSpinup;            /* 0x00 */</div><div class='ctx'>     U8          SpinupDelay;                /* 0x01 */</div><div class='del'>-    U16         Reserved1;                  /* 0x02 */</div><div class='add'>+	U8          SpinupFlags;                /* 0x02 */</div><div class='add'>+	U8          Reserved1;                  /* 0x03 */</div><div class='ctx'> } MPI2_SAS_IOUNIT4_SPINUP_GROUP, MPI2_POINTER PTR_MPI2_SAS_IOUNIT4_SPINUP_GROUP,</div><div class='ctx'>   Mpi2SasIOUnit4SpinupGroup_t, MPI2_POINTER pMpi2SasIOUnit4SpinupGroup_t;</div><div class='ctx'> </div><div class='add'>+/* defines for SAS IO Unit Page 4 SpinupFlags */</div><div class='add'>+#define MPI2_SASIOUNIT4_SPINUP_DISABLE_FLAG         (0x01)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Host code (drivers, BIOS, utilities, etc.) should leave this define set to</div><div class='ctx'>  * one and check the value returned for NumPhys at runtime.</div><div class='hunk'>@@ -2321,13 +2332,12 @@ typedef struct _MPI2_CONFIG_PAGE_EXPANDER_1</div><div class='ctx'> </div><div class='ctx'> /* use MPI2_SAS_NEG_LINK_RATE_ defines for the NegotiatedLinkRate field */</div><div class='ctx'> </div><div class='del'>-/* use MPI2_SAS_APHYINFO_ defines for AttachedPhyInfo field */</div><div class='del'>-</div><div class='ctx'> /* values for SAS Expander Page 1 DiscoveryInfo field */</div><div class='ctx'> #define MPI2_SAS_EXPANDER1_DISCINFO_BAD_PHY_DISABLED    (0x04)</div><div class='ctx'> #define MPI2_SAS_EXPANDER1_DISCINFO_LINK_STATUS_CHANGE  (0x02)</div><div class='ctx'> #define MPI2_SAS_EXPANDER1_DISCINFO_NO_ROUTING_ENTRIES  (0x01)</div><div class='ctx'> </div><div class='add'>+/* use MPI2_SAS_APHYINFO_ defines for AttachedPhyInfo field */</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************</div><div class='ctx'> *   SAS Device Config Pages</div><div class='hunk'>@@ -2447,6 +2457,8 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_0</div><div class='ctx'> </div><div class='ctx'> #define MPI2_SASPHY0_PAGEVERSION            (0x03)</div><div class='ctx'> </div><div class='add'>+/* use MPI2_SAS_APHYINFO_ defines for AttachedPhyInfo field */</div><div class='add'>+</div><div class='ctx'> /* use MPI2_SAS_PRATE_ defines for the ProgrammedLinkRate field */</div><div class='ctx'> </div><div class='ctx'> /* use MPI2_SAS_HWRATE_ defines for the HwLinkRate field */</div><div class='hunk'>@@ -2454,12 +2466,10 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_0</div><div class='ctx'> /* values for SAS PHY Page 0 Flags field */</div><div class='ctx'> #define MPI2_SAS_PHY0_FLAGS_SGPIO_DIRECT_ATTACH_ENC             (0x01)</div><div class='ctx'> </div><div class='del'>-/* use MPI2_SAS_APHYINFO_ defines for AttachedPhyInfo field */</div><div class='add'>+/* use MPI2_SAS_PHYINFO_ for the PhyInfo field */</div><div class='ctx'> </div><div class='ctx'> /* use MPI2_SAS_NEG_LINK_RATE_ defines for the NegotiatedLinkRate field */</div><div class='ctx'> </div><div class='del'>-/* use MPI2_SAS_PHYINFO_ for the PhyInfo field */</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /* SAS PHY Page 1 */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_ioc.h b/drivers/scsi/mpt2sas/mpi/mpi2_ioc.h<br/>index 93d9b6956d05..9a925c07a9ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpi/mpi2_ioc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpi/mpi2_ioc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpi/mpi2_ioc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/mpt2sas/mpi/mpi2_ioc.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *          Title:  MPI IOC, Port, Event, FW Download, and FW Upload messages</div><div class='ctx'>  *  Creation Date:  October 11, 2006</div><div class='ctx'>  *</div><div class='del'>- *  mpi2_ioc.h Version:  02.00.17</div><div class='add'>+ *  mpi2_ioc.h Version:  02.00.19</div><div class='ctx'>  *</div><div class='ctx'>  *  Version History</div><div class='ctx'>  *  ---------------</div><div class='hunk'>@@ -110,6 +110,13 @@</div><div class='ctx'>  *                      Added Temperature Threshold Event.</div><div class='ctx'>  *                      Added Host Message Event.</div><div class='ctx'>  *                      Added Send Host Message request and reply.</div><div class='add'>+ *  05-25-11  02.00.18  For Extended Image Header, added</div><div class='add'>+ *                      MPI2_EXT_IMAGE_TYPE_MIN_PRODUCT_SPECIFIC and</div><div class='add'>+ *                      MPI2_EXT_IMAGE_TYPE_MAX_PRODUCT_SPECIFIC defines.</div><div class='add'>+ *                      Deprecated MPI2_EXT_IMAGE_TYPE_MAX define.</div><div class='add'>+ *  08-24-11  02.00.19  Added PhysicalPort field to</div><div class='add'>+ *                      MPI2_EVENT_DATA_SAS_DEVICE_STATUS_CHANGE structure.</div><div class='add'>+ *                      Marked MPI2_PM_CONTROL_FEATURE_PCIE_LINK as obsolete.</div><div class='ctx'>  *  --------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -578,7 +585,7 @@ typedef struct _MPI2_EVENT_DATA_SAS_DEVICE_STATUS_CHANGE</div><div class='ctx'> {</div><div class='ctx'>     U16                     TaskTag;                        /* 0x00 */</div><div class='ctx'>     U8                      ReasonCode;                     /* 0x02 */</div><div class='del'>-    U8                      Reserved1;                      /* 0x03 */</div><div class='add'>+	U8                      PhysicalPort;                   /* 0x03 */</div><div class='ctx'>     U8                      ASC;                            /* 0x04 */</div><div class='ctx'>     U8                      ASCQ;                           /* 0x05 */</div><div class='ctx'>     U16                     DevHandle;                      /* 0x06 */</div><div class='hunk'>@@ -1366,16 +1373,18 @@ typedef struct _MPI2_EXT_IMAGE_HEADER</div><div class='ctx'> #define MPI2_EXT_IMAGE_HEADER_SIZE              (0x40)</div><div class='ctx'> </div><div class='ctx'> /* defines for the ImageType field */</div><div class='del'>-#define MPI2_EXT_IMAGE_TYPE_UNSPECIFIED         (0x00)</div><div class='del'>-#define MPI2_EXT_IMAGE_TYPE_FW                  (0x01)</div><div class='del'>-#define MPI2_EXT_IMAGE_TYPE_NVDATA              (0x03)</div><div class='del'>-#define MPI2_EXT_IMAGE_TYPE_BOOTLOADER          (0x04)</div><div class='del'>-#define MPI2_EXT_IMAGE_TYPE_INITIALIZATION      (0x05)</div><div class='del'>-#define MPI2_EXT_IMAGE_TYPE_FLASH_LAYOUT        (0x06)</div><div class='del'>-#define MPI2_EXT_IMAGE_TYPE_SUPPORTED_DEVICES   (0x07)</div><div class='del'>-#define MPI2_EXT_IMAGE_TYPE_MEGARAID            (0x08)</div><div class='del'>-</div><div class='del'>-#define MPI2_EXT_IMAGE_TYPE_MAX                 (MPI2_EXT_IMAGE_TYPE_MEGARAID)</div><div class='add'>+#define MPI2_EXT_IMAGE_TYPE_UNSPECIFIED				(0x00)</div><div class='add'>+#define MPI2_EXT_IMAGE_TYPE_FW						(0x01)</div><div class='add'>+#define MPI2_EXT_IMAGE_TYPE_NVDATA					(0x03)</div><div class='add'>+#define MPI2_EXT_IMAGE_TYPE_BOOTLOADER				(0x04)</div><div class='add'>+#define MPI2_EXT_IMAGE_TYPE_INITIALIZATION			(0x05)</div><div class='add'>+#define MPI2_EXT_IMAGE_TYPE_FLASH_LAYOUT			(0x06)</div><div class='add'>+#define MPI2_EXT_IMAGE_TYPE_SUPPORTED_DEVICES		(0x07)</div><div class='add'>+#define MPI2_EXT_IMAGE_TYPE_MEGARAID				(0x08)</div><div class='add'>+#define MPI2_EXT_IMAGE_TYPE_MIN_PRODUCT_SPECIFIC    (0x80)</div><div class='add'>+#define MPI2_EXT_IMAGE_TYPE_MAX_PRODUCT_SPECIFIC    (0xFF)</div><div class='add'>+#define MPI2_EXT_IMAGE_TYPE_MAX                   \</div><div class='add'>+	(MPI2_EXT_IMAGE_TYPE_MAX_PRODUCT_SPECIFIC)	/* deprecated */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1568,7 +1577,7 @@ typedef struct _MPI2_PWR_MGMT_CONTROL_REQUEST {</div><div class='ctx'> /* defines for the Feature field */</div><div class='ctx'> #define MPI2_PM_CONTROL_FEATURE_DA_PHY_POWER_COND       (0x01)</div><div class='ctx'> #define MPI2_PM_CONTROL_FEATURE_PORT_WIDTH_MODULATION   (0x02)</div><div class='del'>-#define MPI2_PM_CONTROL_FEATURE_PCIE_LINK               (0x03)</div><div class='add'>+#define MPI2_PM_CONTROL_FEATURE_PCIE_LINK               (0x03) /* obsolete */</div><div class='ctx'> #define MPI2_PM_CONTROL_FEATURE_IOC_SPEED               (0x04)</div><div class='ctx'> #define MPI2_PM_CONTROL_FEATURE_MIN_PRODUCT_SPECIFIC    (0x80)</div><div class='ctx'> #define MPI2_PM_CONTROL_FEATURE_MAX_PRODUCT_SPECIFIC    (0xFF)</div><div class='hunk'>@@ -1597,14 +1606,14 @@ typedef struct _MPI2_PWR_MGMT_CONTROL_REQUEST {</div><div class='ctx'> </div><div class='ctx'> /* parameter usage for the MPI2_PM_CONTROL_FEATURE_PCIE_LINK Feature */</div><div class='ctx'> /* Parameter1 indicates desired PCIe link speed using these defines */</div><div class='del'>-#define MPI2_PM_CONTROL_PARAM1_PCIE_2_5_GBPS            (0x00)</div><div class='del'>-#define MPI2_PM_CONTROL_PARAM1_PCIE_5_0_GBPS            (0x01)</div><div class='del'>-#define MPI2_PM_CONTROL_PARAM1_PCIE_8_0_GBPS            (0x02)</div><div class='add'>+#define MPI2_PM_CONTROL_PARAM1_PCIE_2_5_GBPS            (0x00) /* obsolete */</div><div class='add'>+#define MPI2_PM_CONTROL_PARAM1_PCIE_5_0_GBPS            (0x01) /* obsolete */</div><div class='add'>+#define MPI2_PM_CONTROL_PARAM1_PCIE_8_0_GBPS            (0x02) /* obsolete */</div><div class='ctx'> /* Parameter2 indicates desired PCIe link width using these defines */</div><div class='del'>-#define MPI2_PM_CONTROL_PARAM2_WIDTH_X1                 (0x01)</div><div class='del'>-#define MPI2_PM_CONTROL_PARAM2_WIDTH_X2                 (0x02)</div><div class='del'>-#define MPI2_PM_CONTROL_PARAM2_WIDTH_X4                 (0x04)</div><div class='del'>-#define MPI2_PM_CONTROL_PARAM2_WIDTH_X8                 (0x08)</div><div class='add'>+#define MPI2_PM_CONTROL_PARAM2_WIDTH_X1                 (0x01) /* obsolete */</div><div class='add'>+#define MPI2_PM_CONTROL_PARAM2_WIDTH_X2                 (0x02) /* obsolete */</div><div class='add'>+#define MPI2_PM_CONTROL_PARAM2_WIDTH_X4                 (0x04) /* obsolete */</div><div class='add'>+#define MPI2_PM_CONTROL_PARAM2_WIDTH_X8                 (0x08) /* obsolete */</div><div class='ctx'> /* Parameter3 and Parameter4 are reserved */</div><div class='ctx'> </div><div class='ctx'> /* parameter usage for the MPI2_PM_CONTROL_FEATURE_IOC_SPEED Feature */</div><div class='head'>diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_raid.h b/drivers/scsi/mpt2sas/mpi/mpi2_raid.h<br/>index bd61a7b60a2b..0601612b875a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpi/mpi2_raid.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpi/mpi2_raid.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpi/mpi2_raid.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/mpt2sas/mpi/mpi2_raid.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *          Title:  MPI Integrated RAID messages and structures</div><div class='ctx'>  *  Creation Date:  April 26, 2007</div><div class='ctx'>  *</div><div class='del'>- *    mpi2_raid.h Version:  02.00.05</div><div class='add'>+ *    mpi2_raid.h Version:  02.00.06</div><div class='ctx'>  *</div><div class='ctx'>  *  Version History</div><div class='ctx'>  *  ---------------</div><div class='hunk'>@@ -23,6 +23,10 @@</div><div class='ctx'>  *  07-30-09  02.00.04  Added proper define for the Use Default Settings bit of</div><div class='ctx'>  *                      VolumeCreationFlags and marked the old one as obsolete.</div><div class='ctx'>  *  05-12-10  02.00.05  Added MPI2_RAID_VOL_FLAGS_OP_MDC define.</div><div class='add'>+ *  08-24-10  02.00.06  Added MPI2_RAID_ACTION_COMPATIBILITY_CHECK along with</div><div class='add'>+ *                      related structures and defines.</div><div class='add'>+ *                      Added product-specific range to RAID Action values.</div><div class='add'>+</div><div class='ctx'>  *  --------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -176,7 +180,9 @@ typedef struct _MPI2_RAID_ACTION_REQUEST</div><div class='ctx'> #define MPI2_RAID_ACTION_SYSTEM_SHUTDOWN_INITIATED  (0x20)</div><div class='ctx'> #define MPI2_RAID_ACTION_START_RAID_FUNCTION        (0x21)</div><div class='ctx'> #define MPI2_RAID_ACTION_STOP_RAID_FUNCTION         (0x22)</div><div class='del'>-</div><div class='add'>+#define MPI2_RAID_ACTION_COMPATIBILITY_CHECK        (0x23)</div><div class='add'>+#define MPI2_RAID_ACTION_MIN_PRODUCT_SPECIFIC       (0x80)</div><div class='add'>+#define MPI2_RAID_ACTION_MAX_PRODUCT_SPECIFIC       (0xFF)</div><div class='ctx'> </div><div class='ctx'> /* RAID Volume Creation Structure */</div><div class='ctx'> </div><div class='hunk'>@@ -244,6 +250,23 @@ typedef struct _MPI2_RAID_ONLINE_CAPACITY_EXPANSION</div><div class='ctx'>   Mpi2RaidOnlineCapacityExpansion_t,</div><div class='ctx'>   MPI2_POINTER pMpi2RaidOnlineCapacityExpansion_t;</div><div class='ctx'> </div><div class='add'>+/* RAID Compatibility Input Structure */</div><div class='add'>+</div><div class='add'>+typedef struct _MPI2_RAID_COMPATIBILITY_INPUT_STRUCT {</div><div class='add'>+	U16                     SourceDevHandle;               /* 0x00 */</div><div class='add'>+	U16                     CandidateDevHandle;             /* 0x02 */</div><div class='add'>+	U32                     Flags;                          /* 0x04 */</div><div class='add'>+	U32                     Reserved1;                      /* 0x08 */</div><div class='add'>+	U32                     Reserved2;                      /* 0x0C */</div><div class='add'>+} MPI2_RAID_COMPATIBILITY_INPUT_STRUCT,</div><div class='add'>+MPI2_POINTER PTR_MPI2_RAID_COMPATIBILITY_INPUT_STRUCT,</div><div class='add'>+Mpi2RaidCompatibilityInputStruct_t,</div><div class='add'>+MPI2_POINTER pMpi2RaidCompatibilityInputStruct_t;</div><div class='add'>+</div><div class='add'>+/* defines for RAID Compatibility Structure Flags field */</div><div class='add'>+#define MPI2_RAID_COMPAT_SOURCE_IS_VOLUME_FLAG      (0x00000002)</div><div class='add'>+#define MPI2_RAID_COMPAT_REPORT_SOURCE_INFO_FLAG    (0x00000001)</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* RAID Volume Indicator Structure */</div><div class='ctx'> </div><div class='hunk'>@@ -263,15 +286,45 @@ typedef struct _MPI2_RAID_VOL_INDICATOR</div><div class='ctx'> #define MPI2_RAID_VOL_FLAGS_OP_RESYNC               (0x00000003)</div><div class='ctx'> #define MPI2_RAID_VOL_FLAGS_OP_MDC                  (0x00000004)</div><div class='ctx'> </div><div class='add'>+/* RAID Compatibility Result Structure */</div><div class='add'>+</div><div class='add'>+typedef struct _MPI2_RAID_COMPATIBILITY_RESULT_STRUCT {</div><div class='add'>+	U8                      State;                          /* 0x00 */</div><div class='add'>+	U8                      Reserved1;                      /* 0x01 */</div><div class='add'>+	U16                     Reserved2;                      /* 0x02 */</div><div class='add'>+	U32                     GenericAttributes;              /* 0x04 */</div><div class='add'>+	U32                     OEMSpecificAttributes;          /* 0x08 */</div><div class='add'>+	U32                     Reserved3;                      /* 0x0C */</div><div class='add'>+	U32                     Reserved4;                      /* 0x10 */</div><div class='add'>+} MPI2_RAID_COMPATIBILITY_RESULT_STRUCT,</div><div class='add'>+MPI2_POINTER PTR_MPI2_RAID_COMPATIBILITY_RESULT_STRUCT,</div><div class='add'>+Mpi2RaidCompatibilityResultStruct_t,</div><div class='add'>+MPI2_POINTER pMpi2RaidCompatibilityResultStruct_t;</div><div class='add'>+</div><div class='add'>+/* defines for RAID Compatibility Result Structure State field */</div><div class='add'>+#define MPI2_RAID_COMPAT_STATE_COMPATIBLE           (0x00)</div><div class='add'>+#define MPI2_RAID_COMPAT_STATE_NOT_COMPATIBLE       (0x01)</div><div class='add'>+</div><div class='add'>+/* defines for RAID Compatibility Result Structure GenericAttributes field */</div><div class='add'>+#define MPI2_RAID_COMPAT_GENATTRIB_4K_SECTOR            (0x00000010)</div><div class='add'>+</div><div class='add'>+#define MPI2_RAID_COMPAT_GENATTRIB_MEDIA_MASK           (0x0000000C)</div><div class='add'>+#define MPI2_RAID_COMPAT_GENATTRIB_SOLID_STATE_DRIVE    (0x00000008)</div><div class='add'>+#define MPI2_RAID_COMPAT_GENATTRIB_HARD_DISK_DRIVE      (0x00000004)</div><div class='add'>+</div><div class='add'>+#define MPI2_RAID_COMPAT_GENATTRIB_PROTOCOL_MASK        (0x00000003)</div><div class='add'>+#define MPI2_RAID_COMPAT_GENATTRIB_SAS_PROTOCOL         (0x00000002)</div><div class='add'>+#define MPI2_RAID_COMPAT_GENATTRIB_SATA_PROTOCOL        (0x00000001)</div><div class='ctx'> </div><div class='ctx'> /* RAID Action Reply ActionData union */</div><div class='ctx'> typedef union _MPI2_RAID_ACTION_REPLY_DATA</div><div class='ctx'> {</div><div class='del'>-    U32                     Word[5];</div><div class='del'>-    MPI2_RAID_VOL_INDICATOR RaidVolumeIndicator;</div><div class='del'>-    U16                     VolDevHandle;</div><div class='del'>-    U8                      VolumeState;</div><div class='del'>-    U8                      PhysDiskNum;</div><div class='add'>+	U32                                     Word[5];</div><div class='add'>+	MPI2_RAID_VOL_INDICATOR                 RaidVolumeIndicator;</div><div class='add'>+	U16                                     VolDevHandle;</div><div class='add'>+	U8                                      VolumeState;</div><div class='add'>+	U8                                      PhysDiskNum;</div><div class='add'>+	MPI2_RAID_COMPATIBILITY_RESULT_STRUCT   RaidCompatibilityResult;</div><div class='ctx'> } MPI2_RAID_ACTION_REPLY_DATA, MPI2_POINTER PTR_MPI2_RAID_ACTION_REPLY_DATA,</div><div class='ctx'>   Mpi2RaidActionReplyData_t, MPI2_POINTER pMpi2RaidActionReplyData_t;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_tool.h b/drivers/scsi/mpt2sas/mpi/mpi2_tool.h<br/>index 2a4bceda364b..3cbe677c6886 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpi/mpi2_tool.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpi/mpi2_tool.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpi/mpi2_tool.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/mpt2sas/mpi/mpi2_tool.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *          Title:  MPI diagnostic tool structures and definitions</div><div class='ctx'>  *  Creation Date:  March 26, 2007</div><div class='ctx'>  *</div><div class='del'>- *    mpi2_tool.h Version:  02.00.06</div><div class='add'>+ *    mpi2_tool.h Version:  02.00.07</div><div class='ctx'>  *</div><div class='ctx'>  *  Version History</div><div class='ctx'>  *  ---------------</div><div class='hunk'>@@ -25,6 +25,8 @@</div><div class='ctx'>  *  05-12-10  02.00.05  Added Diagnostic Data Upload tool.</div><div class='ctx'>  *  08-11-10  02.00.06  Added defines that were missing for Diagnostic Buffer</div><div class='ctx'>  *                      Post Request.</div><div class='add'>+ *  05-25-11  02.00.07  Added Flags field and related defines to</div><div class='add'>+ *                      MPI2_TOOLBOX_ISTWI_READ_WRITE_REQUEST.</div><div class='ctx'>  *  --------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -181,7 +183,7 @@ typedef struct _MPI2_TOOLBOX_ISTWI_READ_WRITE_REQUEST {</div><div class='ctx'>     U8                      DevIndex;                   /* 0x14 */</div><div class='ctx'>     U8                      Action;                     /* 0x15 */</div><div class='ctx'>     U8                      SGLFlags;                   /* 0x16 */</div><div class='del'>-    U8                      Reserved7;                  /* 0x17 */</div><div class='add'>+	 U8                      Flags;                      /* 0x17 */</div><div class='ctx'>     U16                     TxDataLength;               /* 0x18 */</div><div class='ctx'>     U16                     RxDataLength;               /* 0x1A */</div><div class='ctx'>     U32                     Reserved8;                  /* 0x1C */</div><div class='hunk'>@@ -205,6 +207,9 @@ typedef struct _MPI2_TOOLBOX_ISTWI_READ_WRITE_REQUEST {</div><div class='ctx'> </div><div class='ctx'> /* use MPI2_SGLFLAGS_ defines from mpi2.h for the SGLFlags field */</div><div class='ctx'> </div><div class='add'>+/* values for the Flags field */</div><div class='add'>+#define MPI2_TOOL_ISTWI_FLAG_AUTO_RESERVE_RELEASE   (0x80)</div><div class='add'>+#define MPI2_TOOL_ISTWI_FLAG_PAGE_ADDR_MASK         (0x07)</div><div class='ctx'> </div><div class='ctx'> /* Toolbox ISTWI Read Write Tool reply message */</div><div class='ctx'> typedef struct _MPI2_TOOLBOX_ISTWI_REPLY {</div><div class='head'>diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c<br/>index beda04a8404b..0b2c95583660 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpt2sas_base.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpt2sas_base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpt2sas_base.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/mpt2sas/mpt2sas_base.c</a></div><div class='hunk'>@@ -57,6 +57,7 @@</div><div class='ctx'> #include &lt;linux/sort.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/aer.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mpt2sas_base.h"</div><div class='hunk'>@@ -65,6 +66,8 @@ static MPT_CALLBACK	mpt_callbacks[MPT_MAX_CALLBACKS];</div><div class='ctx'> </div><div class='ctx'> #define FAULT_POLLING_INTERVAL 1000 /* in milliseconds */</div><div class='ctx'> </div><div class='add'>+#define MAX_HBA_QUEUE_DEPTH	30000</div><div class='add'>+#define MAX_CHAIN_DEPTH		100000</div><div class='ctx'> static int max_queue_depth = -1;</div><div class='ctx'> module_param(max_queue_depth, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(max_queue_depth, " max controller queue depth ");</div><div class='hunk'>@@ -89,19 +92,6 @@ static int disable_discovery = -1;</div><div class='ctx'> module_param(disable_discovery, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(disable_discovery, " disable discovery ");</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* diag_buffer_enable is bitwise</div><div class='del'>- * bit 0 set = TRACE</div><div class='del'>- * bit 1 set = SNAPSHOT</div><div class='del'>- * bit 2 set = EXTENDED</div><div class='del'>- *</div><div class='del'>- * Either bit can be set, or both</div><div class='del'>- */</div><div class='del'>-static int diag_buffer_enable;</div><div class='del'>-module_param(diag_buffer_enable, int, 0);</div><div class='del'>-MODULE_PARM_DESC(diag_buffer_enable, " post diag buffers "</div><div class='del'>-    "(TRACE=1/SNAPSHOT=2/EXTENDED=4/default=0)");</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * _scsih_set_fwfault_debug - global setting of ioc-&gt;fwfault_debug.</div><div class='ctx'>  *</div><div class='hunk'>@@ -120,10 +110,34 @@ _scsih_set_fwfault_debug(const char *val, struct kernel_param *kp)</div><div class='ctx'> 		ioc-&gt;fwfault_debug = mpt2sas_fwfault_debug;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> module_param_call(mpt2sas_fwfault_debug, _scsih_set_fwfault_debug,</div><div class='ctx'>     param_get_int, &amp;mpt2sas_fwfault_debug, 0644);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *  mpt2sas_remove_dead_ioc_func - kthread context to remove dead ioc</div><div class='add'>+ * @arg: input argument, used to derive ioc</div><div class='add'>+ *</div><div class='add'>+ * Return 0 if controller is removed from pci subsystem.</div><div class='add'>+ * Return -1 for other case.</div><div class='add'>+ */</div><div class='add'>+static int mpt2sas_remove_dead_ioc_func(void *arg)</div><div class='add'>+{</div><div class='add'>+		struct MPT2SAS_ADAPTER *ioc = (struct MPT2SAS_ADAPTER *)arg;</div><div class='add'>+		struct pci_dev *pdev;</div><div class='add'>+</div><div class='add'>+		if ((ioc == NULL))</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		pdev = ioc-&gt;pdev;</div><div class='add'>+		if ((pdev == NULL))</div><div class='add'>+			return -1;</div><div class='add'>+		pci_remove_bus_device(pdev);</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='ctx'>  * _base_fault_reset_work - workq handling ioc fault conditions</div><div class='ctx'>  * @work: input argument, used to derive ioc</div><div class='ctx'>  * Context: sleep.</div><div class='hunk'>@@ -138,6 +152,7 @@ _base_fault_reset_work(struct work_struct *work)</div><div class='ctx'> 	unsigned long	 flags;</div><div class='ctx'> 	u32 doorbell;</div><div class='ctx'> 	int rc;</div><div class='add'>+	struct task_struct *p;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;ioc-&gt;ioc_reset_in_progress_lock, flags);</div><div class='ctx'> 	if (ioc-&gt;shost_recovery)</div><div class='hunk'>@@ -145,6 +160,39 @@ _base_fault_reset_work(struct work_struct *work)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ioc-&gt;ioc_reset_in_progress_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	doorbell = mpt2sas_base_get_iocstate(ioc, 0);</div><div class='add'>+	if ((doorbell &amp; MPI2_IOC_STATE_MASK) == MPI2_IOC_STATE_MASK) {</div><div class='add'>+		printk(MPT2SAS_INFO_FMT "%s : SAS host is non-operational !!!!\n",</div><div class='add'>+			ioc-&gt;name, __func__);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Call _scsih_flush_pending_cmds callback so that we flush all</div><div class='add'>+		 * pending commands back to OS. This call is required to aovid</div><div class='add'>+		 * deadlock at block layer. Dead IOC will fail to do diag reset,</div><div class='add'>+		 * and this call is safe since dead ioc will never return any</div><div class='add'>+		 * command back from HW.</div><div class='add'>+		 */</div><div class='add'>+		ioc-&gt;schedule_dead_ioc_flush_running_cmds(ioc);</div><div class='add'>+		/*</div><div class='add'>+		 * Set remove_host flag early since kernel thread will</div><div class='add'>+		 * take some time to execute.</div><div class='add'>+		 */</div><div class='add'>+		ioc-&gt;remove_host = 1;</div><div class='add'>+		/*Remove the Dead Host */</div><div class='add'>+		p = kthread_run(mpt2sas_remove_dead_ioc_func, ioc,</div><div class='add'>+		    "mpt2sas_dead_ioc_%d", ioc-&gt;id);</div><div class='add'>+		if (IS_ERR(p)) {</div><div class='add'>+			printk(MPT2SAS_ERR_FMT</div><div class='add'>+			"%s: Running mpt2sas_dead_ioc thread failed !!!!\n",</div><div class='add'>+			ioc-&gt;name, __func__);</div><div class='add'>+		} else {</div><div class='add'>+		    printk(MPT2SAS_ERR_FMT</div><div class='add'>+			"%s: Running mpt2sas_dead_ioc thread success !!!!\n",</div><div class='add'>+			ioc-&gt;name, __func__);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return; /* don't rearm timer */</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if ((doorbell &amp; MPI2_IOC_STATE_MASK) == MPI2_IOC_STATE_FAULT) {</div><div class='ctx'> 		rc = mpt2sas_base_hard_reset_handler(ioc, CAN_SLEEP,</div><div class='ctx'> 		    FORCE_BIG_HAMMER);</div><div class='hunk'>@@ -1346,7 +1394,7 @@ _base_enable_msix(struct MPT2SAS_ADAPTER *ioc)</div><div class='ctx'> 	if (_base_check_enable_msix(ioc) != 0)</div><div class='ctx'> 		goto try_ioapic;</div><div class='ctx'> </div><div class='del'>-	ioc-&gt;reply_queue_count = min_t(u8, ioc-&gt;cpu_count,</div><div class='add'>+	ioc-&gt;reply_queue_count = min_t(int, ioc-&gt;cpu_count,</div><div class='ctx'> 	    ioc-&gt;msix_vector_count);</div><div class='ctx'> </div><div class='ctx'> 	entries = kcalloc(ioc-&gt;reply_queue_count, sizeof(struct msix_entry),</div><div class='hunk'>@@ -1916,6 +1964,10 @@ _base_display_intel_branding(struct MPT2SAS_ADAPTER *ioc)</div><div class='ctx'> 			printk(MPT2SAS_INFO_FMT "%s\n", ioc-&gt;name,</div><div class='ctx'> 			    MPT2SAS_INTEL_RMS2LL040_BRANDING);</div><div class='ctx'> 			break;</div><div class='add'>+		case MPT2SAS_INTEL_RAMSDALE_SSDID:</div><div class='add'>+			printk(MPT2SAS_INFO_FMT "%s\n", ioc-&gt;name,</div><div class='add'>+			    MPT2SAS_INTEL_RAMSDALE_BRANDING);</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1925,6 +1977,22 @@ _base_display_intel_branding(struct MPT2SAS_ADAPTER *ioc)</div><div class='ctx'> 			printk(MPT2SAS_INFO_FMT "%s\n", ioc-&gt;name,</div><div class='ctx'> 			    MPT2SAS_INTEL_RS25GB008_BRANDING);</div><div class='ctx'> 			break;</div><div class='add'>+		case MPT2SAS_INTEL_RMS25JB080_SSDID:</div><div class='add'>+			printk(MPT2SAS_INFO_FMT "%s\n", ioc-&gt;name,</div><div class='add'>+			    MPT2SAS_INTEL_RMS25JB080_BRANDING);</div><div class='add'>+			break;</div><div class='add'>+		case MPT2SAS_INTEL_RMS25JB040_SSDID:</div><div class='add'>+			printk(MPT2SAS_INFO_FMT "%s\n", ioc-&gt;name,</div><div class='add'>+			    MPT2SAS_INTEL_RMS25JB040_BRANDING);</div><div class='add'>+			break;</div><div class='add'>+		case MPT2SAS_INTEL_RMS25KB080_SSDID:</div><div class='add'>+			printk(MPT2SAS_INFO_FMT "%s\n", ioc-&gt;name,</div><div class='add'>+			    MPT2SAS_INTEL_RMS25KB080_BRANDING);</div><div class='add'>+			break;</div><div class='add'>+		case MPT2SAS_INTEL_RMS25KB040_SSDID:</div><div class='add'>+			printk(MPT2SAS_INFO_FMT "%s\n", ioc-&gt;name,</div><div class='add'>+			    MPT2SAS_INTEL_RMS25KB040_BRANDING);</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2311,8 +2379,6 @@ _base_release_memory_pools(struct MPT2SAS_ADAPTER *ioc)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ioc-&gt;chain_dma_pool)</div><div class='ctx'> 			pci_pool_destroy(ioc-&gt;chain_dma_pool);</div><div class='del'>-	}</div><div class='del'>-	if (ioc-&gt;chain_lookup) {</div><div class='ctx'> 		free_pages((ulong)ioc-&gt;chain_lookup, ioc-&gt;chain_pages);</div><div class='ctx'> 		ioc-&gt;chain_lookup = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2330,9 +2396,7 @@ static int</div><div class='ctx'> _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc,  int sleep_flag)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpt2sas_facts *facts;</div><div class='del'>-	u32 queue_size, queue_diff;</div><div class='ctx'> 	u16 max_sge_elements;</div><div class='del'>-	u16 num_of_reply_frames;</div><div class='ctx'> 	u16 chains_needed_per_io;</div><div class='ctx'> 	u32 sz, total_sz, reply_post_free_sz;</div><div class='ctx'> 	u32 retry_sz;</div><div class='hunk'>@@ -2359,7 +2423,8 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc,  int sleep_flag)</div><div class='ctx'> 		max_request_credit = (max_queue_depth &lt; facts-&gt;RequestCredit)</div><div class='ctx'> 		    ? max_queue_depth : facts-&gt;RequestCredit;</div><div class='ctx'> 	else</div><div class='del'>-		max_request_credit = facts-&gt;RequestCredit;</div><div class='add'>+		max_request_credit = min_t(u16, facts-&gt;RequestCredit,</div><div class='add'>+		    MAX_HBA_QUEUE_DEPTH);</div><div class='ctx'> </div><div class='ctx'> 	ioc-&gt;hba_queue_depth = max_request_credit;</div><div class='ctx'> 	ioc-&gt;hi_priority_depth = facts-&gt;HighPriorityCredit;</div><div class='hunk'>@@ -2400,50 +2465,25 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc,  int sleep_flag)</div><div class='ctx'> 	}</div><div class='ctx'> 	ioc-&gt;chains_needed_per_io = chains_needed_per_io;</div><div class='ctx'> </div><div class='del'>-	/* reply free queue sizing - taking into account for events */</div><div class='del'>-	num_of_reply_frames = ioc-&gt;hba_queue_depth + 32;</div><div class='del'>-</div><div class='del'>-	/* number of replies frames can't be a multiple of 16 */</div><div class='del'>-	/* decrease number of reply frames by 1 */</div><div class='del'>-	if (!(num_of_reply_frames % 16))</div><div class='del'>-		num_of_reply_frames--;</div><div class='del'>-</div><div class='del'>-	/* calculate number of reply free queue entries</div><div class='del'>-	 *  (must be multiple of 16)</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* (we know reply_free_queue_depth is not a multiple of 16) */</div><div class='del'>-	queue_size = num_of_reply_frames;</div><div class='del'>-	queue_size += 16 - (queue_size % 16);</div><div class='del'>-	ioc-&gt;reply_free_queue_depth = queue_size;</div><div class='del'>-</div><div class='del'>-	/* reply descriptor post queue sizing */</div><div class='del'>-	/* this size should be the number of request frames + number of reply</div><div class='del'>-	 * frames</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	queue_size = ioc-&gt;hba_queue_depth + num_of_reply_frames + 1;</div><div class='del'>-	/* round up to 16 byte boundary */</div><div class='del'>-	if (queue_size % 16)</div><div class='del'>-		queue_size += 16 - (queue_size % 16);</div><div class='del'>-</div><div class='del'>-	/* check against IOC maximum reply post queue depth */</div><div class='del'>-	if (queue_size &gt; facts-&gt;MaxReplyDescriptorPostQueueDepth) {</div><div class='del'>-		queue_diff = queue_size -</div><div class='del'>-		    facts-&gt;MaxReplyDescriptorPostQueueDepth;</div><div class='add'>+	/* reply free queue sizing - taking into account for 64 FW events */</div><div class='add'>+	ioc-&gt;reply_free_queue_depth = ioc-&gt;hba_queue_depth + 64;</div><div class='ctx'> </div><div class='del'>-		/* round queue_diff up to multiple of 16 */</div><div class='del'>-		if (queue_diff % 16)</div><div class='del'>-			queue_diff += 16 - (queue_diff % 16);</div><div class='del'>-</div><div class='del'>-		/* adjust hba_queue_depth, reply_free_queue_depth,</div><div class='del'>-		 * and queue_size</div><div class='del'>-		 */</div><div class='del'>-		ioc-&gt;hba_queue_depth -= (queue_diff / 2);</div><div class='del'>-		ioc-&gt;reply_free_queue_depth -= (queue_diff / 2);</div><div class='del'>-		queue_size = facts-&gt;MaxReplyDescriptorPostQueueDepth;</div><div class='add'>+	/* align the reply post queue on the next 16 count boundary */</div><div class='add'>+	if (!ioc-&gt;reply_free_queue_depth % 16)</div><div class='add'>+		ioc-&gt;reply_post_queue_depth = ioc-&gt;reply_free_queue_depth + 16;</div><div class='add'>+	else</div><div class='add'>+		ioc-&gt;reply_post_queue_depth = ioc-&gt;reply_free_queue_depth +</div><div class='add'>+				32 - (ioc-&gt;reply_free_queue_depth % 16);</div><div class='add'>+	if (ioc-&gt;reply_post_queue_depth &gt;</div><div class='add'>+	    facts-&gt;MaxReplyDescriptorPostQueueDepth) {</div><div class='add'>+		ioc-&gt;reply_post_queue_depth = min_t(u16,</div><div class='add'>+		    (facts-&gt;MaxReplyDescriptorPostQueueDepth -</div><div class='add'>+		    (facts-&gt;MaxReplyDescriptorPostQueueDepth % 16)),</div><div class='add'>+		    (ioc-&gt;hba_queue_depth - (ioc-&gt;hba_queue_depth % 16)));</div><div class='add'>+		ioc-&gt;reply_free_queue_depth = ioc-&gt;reply_post_queue_depth - 16;</div><div class='add'>+		ioc-&gt;hba_queue_depth = ioc-&gt;reply_free_queue_depth - 64;</div><div class='ctx'> 	}</div><div class='del'>-	ioc-&gt;reply_post_queue_depth = queue_size;</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "scatter gather: "</div><div class='ctx'> 	    "sge_in_main_msg(%d), sge_per_chain(%d), sge_per_io(%d), "</div><div class='hunk'>@@ -2529,15 +2569,12 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc,  int sleep_flag)</div><div class='ctx'> 	    "depth(%d)\n", ioc-&gt;name, ioc-&gt;request,</div><div class='ctx'> 	    ioc-&gt;scsiio_depth));</div><div class='ctx'> </div><div class='del'>-	/* loop till the allocation succeeds */</div><div class='del'>-	do {</div><div class='del'>-		sz = ioc-&gt;chain_depth * sizeof(struct chain_tracker);</div><div class='del'>-		ioc-&gt;chain_pages = get_order(sz);</div><div class='del'>-		ioc-&gt;chain_lookup = (struct chain_tracker *)__get_free_pages(</div><div class='del'>-		    GFP_KERNEL, ioc-&gt;chain_pages);</div><div class='del'>-		if (ioc-&gt;chain_lookup == NULL)</div><div class='del'>-			ioc-&gt;chain_depth -= 100;</div><div class='del'>-	} while (ioc-&gt;chain_lookup == NULL);</div><div class='add'>+	ioc-&gt;chain_depth = min_t(u32, ioc-&gt;chain_depth, MAX_CHAIN_DEPTH);</div><div class='add'>+	sz = ioc-&gt;chain_depth * sizeof(struct chain_tracker);</div><div class='add'>+	ioc-&gt;chain_pages = get_order(sz);</div><div class='add'>+</div><div class='add'>+	ioc-&gt;chain_lookup = (struct chain_tracker *)__get_free_pages(</div><div class='add'>+	    GFP_KERNEL, ioc-&gt;chain_pages);</div><div class='ctx'> 	ioc-&gt;chain_dma_pool = pci_pool_create("chain pool", ioc-&gt;pdev,</div><div class='ctx'> 	    ioc-&gt;request_sz, 16, 0);</div><div class='ctx'> 	if (!ioc-&gt;chain_dma_pool) {</div><div class='hunk'>@@ -3136,8 +3173,8 @@ mpt2sas_base_sas_iounit_control(struct MPT2SAS_ADAPTER *ioc,</div><div class='ctx'> 	if (mpi_request-&gt;Operation == MPI2_SAS_OP_PHY_HARD_RESET ||</div><div class='ctx'> 	    mpi_request-&gt;Operation == MPI2_SAS_OP_PHY_LINK_RESET)</div><div class='ctx'> 		ioc-&gt;ioc_link_reset_in_progress = 1;</div><div class='del'>-	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	init_completion(&amp;ioc-&gt;base_cmds.done);</div><div class='add'>+	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	timeleft = wait_for_completion_timeout(&amp;ioc-&gt;base_cmds.done,</div><div class='ctx'> 	    msecs_to_jiffies(10000));</div><div class='ctx'> 	if ((mpi_request-&gt;Operation == MPI2_SAS_OP_PHY_HARD_RESET ||</div><div class='hunk'>@@ -3238,8 +3275,8 @@ mpt2sas_base_scsi_enclosure_processor(struct MPT2SAS_ADAPTER *ioc,</div><div class='ctx'> 	request = mpt2sas_base_get_msg_frame(ioc, smid);</div><div class='ctx'> 	ioc-&gt;base_cmds.smid = smid;</div><div class='ctx'> 	memcpy(request, mpi_request, sizeof(Mpi2SepReply_t));</div><div class='del'>-	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	init_completion(&amp;ioc-&gt;base_cmds.done);</div><div class='add'>+	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	timeleft = wait_for_completion_timeout(&amp;ioc-&gt;base_cmds.done,</div><div class='ctx'> 	    msecs_to_jiffies(10000));</div><div class='ctx'> 	if (!(ioc-&gt;base_cmds.status &amp; MPT2_CMD_COMPLETE)) {</div><div class='hunk'>@@ -3746,8 +3783,8 @@ _base_event_notification(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)</div><div class='ctx'> 	for (i = 0; i &lt; MPI2_EVENT_NOTIFY_EVENTMASK_WORDS; i++)</div><div class='ctx'> 		mpi_request-&gt;EventMasks[i] =</div><div class='ctx'> 		    cpu_to_le32(ioc-&gt;event_masks[i]);</div><div class='del'>-	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	init_completion(&amp;ioc-&gt;base_cmds.done);</div><div class='add'>+	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	timeleft = wait_for_completion_timeout(&amp;ioc-&gt;base_cmds.done, 30*HZ);</div><div class='ctx'> 	if (!(ioc-&gt;base_cmds.status &amp; MPT2_CMD_COMPLETE)) {</div><div class='ctx'> 		printk(MPT2SAS_ERR_FMT "%s: timeout\n",</div><div class='hunk'>@@ -4062,7 +4099,8 @@ _base_make_ioc_operational(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)</div><div class='ctx'> 		ioc-&gt;reply_free[i] = cpu_to_le32(reply_address);</div><div class='ctx'> </div><div class='ctx'> 	/* initialize reply queues */</div><div class='del'>-	_base_assign_reply_queues(ioc);</div><div class='add'>+	if (ioc-&gt;is_driver_loading)</div><div class='add'>+		_base_assign_reply_queues(ioc);</div><div class='ctx'> </div><div class='ctx'> 	/* initialize Reply Post Free Queue */</div><div class='ctx'> 	reply_post_free = (long)ioc-&gt;reply_post_free;</div><div class='hunk'>@@ -4110,24 +4148,17 @@ _base_make_ioc_operational(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	if (ioc-&gt;is_driver_loading) {</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		ioc-&gt;wait_for_discovery_to_complete =</div><div class='del'>-		    _base_determine_wait_on_discovery(ioc);</div><div class='del'>-		return r; /* scan_start and scan_finished support */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (ioc-&gt;wait_for_discovery_to_complete &amp;&amp; ioc-&gt;is_warpdrive) {</div><div class='del'>-		if (ioc-&gt;manu_pg10.OEMIdentifier  == 0x80) {</div><div class='add'>+		if (ioc-&gt;is_warpdrive &amp;&amp; ioc-&gt;manu_pg10.OEMIdentifier</div><div class='add'>+		    == 0x80) {</div><div class='ctx'> 			hide_flag = (u8) (ioc-&gt;manu_pg10.OEMSpecificFlags0 &amp;</div><div class='ctx'> 			    MFG_PAGE10_HIDE_SSDS_MASK);</div><div class='ctx'> 			if (hide_flag != MFG_PAGE10_HIDE_SSDS_MASK)</div><div class='ctx'> 				ioc-&gt;mfg_pg10_hide_flag = hide_flag;</div><div class='ctx'> 		}</div><div class='add'>+		ioc-&gt;wait_for_discovery_to_complete =</div><div class='add'>+		    _base_determine_wait_on_discovery(ioc);</div><div class='add'>+		return r; /* scan_start and scan_finished support */</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	r = _base_send_port_enable(ioc, sleep_flag);</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='hunk'>@@ -4206,7 +4237,7 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc)</div><div class='ctx'> </div><div class='ctx'> 	r = mpt2sas_base_map_resources(ioc);</div><div class='ctx'> 	if (r)</div><div class='del'>-		return r;</div><div class='add'>+		goto out_free_resources;</div><div class='ctx'> </div><div class='ctx'> 	if (ioc-&gt;is_warpdrive) {</div><div class='ctx'> 		ioc-&gt;reply_post_host_index[0] =</div><div class='head'>diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h<br/>index 3c3babc7d260..c7459fdc06cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpt2sas_base.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpt2sas_base.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpt2sas_base.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/mpt2sas/mpt2sas_base.h</a></div><div class='hunk'>@@ -69,8 +69,8 @@</div><div class='ctx'> #define MPT2SAS_DRIVER_NAME		"mpt2sas"</div><div class='ctx'> #define MPT2SAS_AUTHOR	"LSI Corporation &lt;DL-MPTFusionLinux@lsi.com&gt;"</div><div class='ctx'> #define MPT2SAS_DESCRIPTION	"LSI MPT Fusion SAS 2.0 Device Driver"</div><div class='del'>-#define MPT2SAS_DRIVER_VERSION		"10.100.00.00"</div><div class='del'>-#define MPT2SAS_MAJOR_VERSION		10</div><div class='add'>+#define MPT2SAS_DRIVER_VERSION		"12.100.00.00"</div><div class='add'>+#define MPT2SAS_MAJOR_VERSION		12</div><div class='ctx'> #define MPT2SAS_MINOR_VERSION		100</div><div class='ctx'> #define MPT2SAS_BUILD_VERSION		00</div><div class='ctx'> #define MPT2SAS_RELEASE_VERSION		00</div><div class='hunk'>@@ -157,20 +157,33 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Intel HBA branding</div><div class='ctx'>  */</div><div class='add'>+#define MPT2SAS_INTEL_RMS25JB080_BRANDING    \</div><div class='add'>+				"Intel(R) Integrated RAID Module RMS25JB080"</div><div class='add'>+#define MPT2SAS_INTEL_RMS25JB040_BRANDING    \</div><div class='add'>+				"Intel(R) Integrated RAID Module RMS25JB040"</div><div class='add'>+#define MPT2SAS_INTEL_RMS25KB080_BRANDING    \</div><div class='add'>+				"Intel(R) Integrated RAID Module RMS25KB080"</div><div class='add'>+#define MPT2SAS_INTEL_RMS25KB040_BRANDING    \</div><div class='add'>+				"Intel(R) Integrated RAID Module RMS25KB040"</div><div class='ctx'> #define MPT2SAS_INTEL_RMS2LL080_BRANDING	\</div><div class='ctx'> 				"Intel Integrated RAID Module RMS2LL080"</div><div class='ctx'> #define MPT2SAS_INTEL_RMS2LL040_BRANDING	\</div><div class='ctx'> 				"Intel Integrated RAID Module RMS2LL040"</div><div class='ctx'> #define MPT2SAS_INTEL_RS25GB008_BRANDING       \</div><div class='ctx'> 				"Intel(R) RAID Controller RS25GB008"</div><div class='del'>-</div><div class='add'>+#define MPT2SAS_INTEL_RAMSDALE_BRANDING        \</div><div class='add'>+				"Intel 720 Series SSD"</div><div class='ctx'> /*</div><div class='ctx'>  * Intel HBA SSDIDs</div><div class='ctx'>  */</div><div class='add'>+#define MPT2SAS_INTEL_RMS25JB080_SSDID         0x3516</div><div class='add'>+#define MPT2SAS_INTEL_RMS25JB040_SSDID         0x3517</div><div class='add'>+#define MPT2SAS_INTEL_RMS25KB080_SSDID         0x3518</div><div class='add'>+#define MPT2SAS_INTEL_RMS25KB040_SSDID         0x3519</div><div class='ctx'> #define MPT2SAS_INTEL_RMS2LL080_SSDID          0x350E</div><div class='ctx'> #define MPT2SAS_INTEL_RMS2LL040_SSDID          0x350F</div><div class='ctx'> #define MPT2SAS_INTEL_RS25GB008_SSDID          0x3000</div><div class='del'>-</div><div class='add'>+#define MPT2SAS_INTEL_RAMSDALE_SSDID           0x3700</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * HP HBA branding</div><div class='hunk'>@@ -373,6 +386,7 @@ struct _sas_device {</div><div class='ctx'>  * @percent_complete: resync percent complete</div><div class='ctx'>  * @direct_io_enabled: Whether direct io to PDs are allowed or not</div><div class='ctx'>  * @stripe_exponent: X where 2powX is the stripe sz in blocks</div><div class='add'>+ * @block_exponent: X where 2powX is the block sz in bytes</div><div class='ctx'>  * @max_lba: Maximum number of LBA in the volume</div><div class='ctx'>  * @stripe_sz: Stripe Size of the volume</div><div class='ctx'>  * @device_info: Device info of the volume member disk</div><div class='hunk'>@@ -394,6 +408,7 @@ struct _raid_device {</div><div class='ctx'> 	u8	percent_complete;</div><div class='ctx'> 	u8	direct_io_enabled;</div><div class='ctx'> 	u8	stripe_exponent;</div><div class='add'>+	u8	block_exponent;</div><div class='ctx'> 	u64	max_lba;</div><div class='ctx'> 	u32	stripe_sz;</div><div class='ctx'> 	u32	device_info;</div><div class='hunk'>@@ -623,6 +638,7 @@ enum mutex_type {</div><div class='ctx'> 	TM_MUTEX_ON = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+typedef void (*MPT2SAS_FLUSH_RUNNING_CMDS)(struct MPT2SAS_ADAPTER *ioc);</div><div class='ctx'> /**</div><div class='ctx'>  * struct MPT2SAS_ADAPTER - per adapter struct</div><div class='ctx'>  * @list: ioc_list</div><div class='hunk'>@@ -665,6 +681,7 @@ enum mutex_type {</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'>+ * @schedule_dead_ioc_flush_running_cmds: callback to flush pending commands</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'>@@ -816,6 +833,7 @@ struct MPT2SAS_ADAPTER {</div><div class='ctx'> 	resource_size_t	**reply_post_host_index;</div><div class='ctx'> 	u16		cpu_msix_table_sz;</div><div class='ctx'> 	u32		ioc_reset_count;</div><div class='add'>+	MPT2SAS_FLUSH_RUNNING_CMDS schedule_dead_ioc_flush_running_cmds;</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/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c<br/>index aabcb911706e..7fceb899029e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpt2sas_ctl.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpt2sas_ctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpt2sas_ctl.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/mpt2sas/mpt2sas_ctl.c</a></div><div class='hunk'>@@ -818,6 +818,7 @@ _ctl_do_mpt_command(struct MPT2SAS_ADAPTER *ioc,</div><div class='ctx'> 	_ctl_display_some_debug(ioc, smid, "ctl_request", NULL);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	init_completion(&amp;ioc-&gt;ctl_cmds.done);</div><div class='ctx'> 	switch (mpi_request-&gt;Function) {</div><div class='ctx'> 	case MPI2_FUNCTION_SCSI_IO_REQUEST:</div><div class='ctx'> 	case MPI2_FUNCTION_RAID_SCSI_IO_PASSTHROUGH:</div><div class='hunk'>@@ -903,7 +904,6 @@ _ctl_do_mpt_command(struct MPT2SAS_ADAPTER *ioc,</div><div class='ctx'> 		timeout = MPT2_IOCTL_DEFAULT_TIMEOUT;</div><div class='ctx'> 	else</div><div class='ctx'> 		timeout = karg.timeout;</div><div class='del'>-	init_completion(&amp;ioc-&gt;ctl_cmds.done);</div><div class='ctx'> 	timeleft = wait_for_completion_timeout(&amp;ioc-&gt;ctl_cmds.done,</div><div class='ctx'> 	    timeout*HZ);</div><div class='ctx'> 	if (mpi_request-&gt;Function == MPI2_FUNCTION_SCSI_TASK_MGMT) {</div><div class='hunk'>@@ -1477,8 +1477,8 @@ _ctl_diag_register_2(struct MPT2SAS_ADAPTER *ioc,</div><div class='ctx'> 		mpi_request-&gt;ProductSpecific[i] =</div><div class='ctx'> 			cpu_to_le32(ioc-&gt;product_specific[buffer_type][i]);</div><div class='ctx'> </div><div class='del'>-	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	init_completion(&amp;ioc-&gt;ctl_cmds.done);</div><div class='add'>+	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	timeleft = wait_for_completion_timeout(&amp;ioc-&gt;ctl_cmds.done,</div><div class='ctx'> 	    MPT2_IOCTL_DEFAULT_TIMEOUT*HZ);</div><div class='ctx'> </div><div class='hunk'>@@ -1821,8 +1821,8 @@ _ctl_send_release(struct MPT2SAS_ADAPTER *ioc, u8 buffer_type, u8 *issue_reset)</div><div class='ctx'> 	mpi_request-&gt;VF_ID = 0; /* TODO */</div><div class='ctx'> 	mpi_request-&gt;VP_ID = 0;</div><div class='ctx'> </div><div class='del'>-	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	init_completion(&amp;ioc-&gt;ctl_cmds.done);</div><div class='add'>+	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	timeleft = wait_for_completion_timeout(&amp;ioc-&gt;ctl_cmds.done,</div><div class='ctx'> 	    MPT2_IOCTL_DEFAULT_TIMEOUT*HZ);</div><div class='ctx'> </div><div class='hunk'>@@ -2095,8 +2095,8 @@ _ctl_diag_read_buffer(void __user *arg, enum block_state state)</div><div class='ctx'> 	mpi_request-&gt;VF_ID = 0; /* TODO */</div><div class='ctx'> 	mpi_request-&gt;VP_ID = 0;</div><div class='ctx'> </div><div class='del'>-	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	init_completion(&amp;ioc-&gt;ctl_cmds.done);</div><div class='add'>+	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	timeleft = wait_for_completion_timeout(&amp;ioc-&gt;ctl_cmds.done,</div><div class='ctx'> 	    MPT2_IOCTL_DEFAULT_TIMEOUT*HZ);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c<br/>index d570573b7963..193e33e28e49 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpt2sas_scsih.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpt2sas_scsih.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpt2sas_scsih.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/mpt2sas/mpt2sas_scsih.c</a></div><div class='hunk'>@@ -99,7 +99,7 @@ MODULE_PARM_DESC(logging_level, " bits for enabling additional logging info "</div><div class='ctx'> </div><div class='ctx'> static ushort max_sectors = 0xFFFF;</div><div class='ctx'> module_param(max_sectors, ushort, 0);</div><div class='del'>-MODULE_PARM_DESC(max_sectors, "max sectors, range 64 to 8192  default=8192");</div><div class='add'>+MODULE_PARM_DESC(max_sectors, "max sectors, range 64 to 32767  default=32767");</div><div class='ctx'> </div><div class='ctx'> /* scsi-mid layer global parmeter is max_report_luns, which is 511 */</div><div class='ctx'> #define MPT2SAS_MAX_LUN (16895)</div><div class='hunk'>@@ -612,13 +612,17 @@ _scsih_sas_device_add(struct MPT2SAS_ADAPTER *ioc,</div><div class='ctx'> 	if (!mpt2sas_transport_port_add(ioc, sas_device-&gt;handle,</div><div class='ctx'> 	     sas_device-&gt;sas_address_parent)) {</div><div class='ctx'> 		_scsih_sas_device_remove(ioc, sas_device);</div><div class='del'>-		} else if (!sas_device-&gt;starget) {</div><div class='del'>-			if (!ioc-&gt;is_driver_loading)</div><div class='del'>-				mpt2sas_transport_port_remove(ioc,</div><div class='del'>-				sas_device-&gt;sas_address,</div><div class='del'>-			    sas_device-&gt;sas_address_parent);</div><div class='del'>-			_scsih_sas_device_remove(ioc, sas_device);</div><div class='del'>-		}</div><div class='add'>+	} else if (!sas_device-&gt;starget) {</div><div class='add'>+		/* When asyn scanning is enabled, its not possible to remove</div><div class='add'>+		 * devices while scanning is turned on due to an oops in</div><div class='add'>+		 * scsi_sysfs_add_sdev()-&gt;add_device()-&gt;sysfs_addrm_start()</div><div class='add'>+		 */</div><div class='add'>+		if (!ioc-&gt;is_driver_loading)</div><div class='add'>+			mpt2sas_transport_port_remove(ioc,</div><div class='add'>+			sas_device-&gt;sas_address,</div><div class='add'>+			sas_device-&gt;sas_address_parent);</div><div class='add'>+		_scsih_sas_device_remove(ioc, sas_device);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1007,8 +1011,8 @@ _scsih_get_chain_buffer_tracker(struct MPT2SAS_ADAPTER *ioc, u16 smid)</div><div class='ctx'> 	spin_lock_irqsave(&amp;ioc-&gt;scsi_lookup_lock, flags);</div><div class='ctx'> 	if (list_empty(&amp;ioc-&gt;free_chain_list)) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ioc-&gt;scsi_lookup_lock, flags);</div><div class='del'>-		printk(MPT2SAS_WARN_FMT "chain buffers not available\n",</div><div class='del'>-		    ioc-&gt;name);</div><div class='add'>+		dfailprintk(ioc, printk(MPT2SAS_WARN_FMT "chain buffers not "</div><div class='add'>+			"available\n", ioc-&gt;name));</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	chain_req = list_entry(ioc-&gt;free_chain_list.next,</div><div class='hunk'>@@ -1449,7 +1453,7 @@ _scsih_slave_destroy(struct scsi_device *sdev)</div><div class='ctx'> 		spin_lock_irqsave(&amp;ioc-&gt;sas_device_lock, flags);</div><div class='ctx'> 		sas_device = mpt2sas_scsih_sas_device_find_by_sas_address(ioc,</div><div class='ctx'> 		   sas_target_priv_data-&gt;sas_address);</div><div class='del'>-		if (sas_device)</div><div class='add'>+		if (sas_device &amp;&amp; !sas_target_priv_data-&gt;num_luns)</div><div class='ctx'> 			sas_device-&gt;starget = NULL;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ioc-&gt;sas_device_lock, flags);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1776,11 +1780,9 @@ _scsih_init_warpdrive_properties(struct MPT2SAS_ADAPTER *ioc,</div><div class='ctx'> 	Mpi2ConfigReply_t mpi_reply;</div><div class='ctx'> 	u16 sz;</div><div class='ctx'> 	u8 num_pds, count;</div><div class='del'>-	u64 mb = 1024 * 1024;</div><div class='del'>-	u64 tb_2 = 2 * mb * mb;</div><div class='del'>-	u64 capacity;</div><div class='del'>-	u32 stripe_sz;</div><div class='del'>-	u8 i, stripe_exp;</div><div class='add'>+	unsigned long stripe_sz, block_sz;</div><div class='add'>+	u8 stripe_exp, block_exp;</div><div class='add'>+	u64 dev_max_lba;</div><div class='ctx'> </div><div class='ctx'> 	if (!ioc-&gt;is_warpdrive)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1844,51 +1846,57 @@ _scsih_init_warpdrive_properties(struct MPT2SAS_ADAPTER *ioc,</div><div class='ctx'> 			    vol_pg0-&gt;PhysDisk[count].PhysDiskNum);</div><div class='ctx'> 			goto out_error;</div><div class='ctx'> 		}</div><div class='add'>+		/* Disable direct I/O if member drive lba exceeds 4 bytes */</div><div class='add'>+		dev_max_lba = le64_to_cpu(pd_pg0.DeviceMaxLBA);</div><div class='add'>+		if (dev_max_lba &gt;&gt; 32) {</div><div class='add'>+			printk(MPT2SAS_INFO_FMT "WarpDrive : Direct IO is "</div><div class='add'>+			    "disabled for the drive with handle(0x%04x) member"</div><div class='add'>+			    "handle (0x%04x) unsupported max lba 0x%016llx\n",</div><div class='add'>+			    ioc-&gt;name, raid_device-&gt;handle,</div><div class='add'>+			    le16_to_cpu(pd_pg0.DevHandle),</div><div class='add'>+			    (unsigned long long)dev_max_lba);</div><div class='add'>+			goto out_error;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		raid_device-&gt;pd_handle[count] = le16_to_cpu(pd_pg0.DevHandle);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Assumption for WD: Direct I/O is not supported if the volume is</div><div class='del'>-	 * not RAID0, if the stripe size is not 64KB, if the block size is</div><div class='del'>-	 * not 512 and if the volume size is &gt;2TB</div><div class='add'>+	 * not RAID0</div><div class='ctx'> 	 */</div><div class='del'>-	if (raid_device-&gt;volume_type != MPI2_RAID_VOL_TYPE_RAID0 ||</div><div class='del'>-	    le16_to_cpu(vol_pg0-&gt;BlockSize) != 512) {</div><div class='add'>+	if (raid_device-&gt;volume_type != MPI2_RAID_VOL_TYPE_RAID0) {</div><div class='ctx'> 		printk(MPT2SAS_INFO_FMT "WarpDrive : Direct IO is disabled "</div><div class='ctx'> 		    "for the drive with handle(0x%04x): type=%d, "</div><div class='ctx'> 		    "s_sz=%uK, blk_size=%u\n", ioc-&gt;name,</div><div class='ctx'> 		    raid_device-&gt;handle, raid_device-&gt;volume_type,</div><div class='del'>-		    le32_to_cpu(vol_pg0-&gt;StripeSize)/2,</div><div class='add'>+		    (le32_to_cpu(vol_pg0-&gt;StripeSize) *</div><div class='add'>+		    le16_to_cpu(vol_pg0-&gt;BlockSize)) / 1024,</div><div class='ctx'> 		    le16_to_cpu(vol_pg0-&gt;BlockSize));</div><div class='ctx'> 		goto out_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	capacity = (u64) le16_to_cpu(vol_pg0-&gt;BlockSize) *</div><div class='del'>-	    (le64_to_cpu(vol_pg0-&gt;MaxLBA) + 1);</div><div class='del'>-</div><div class='del'>-	if (capacity &gt; tb_2) {</div><div class='add'>+	stripe_sz = le32_to_cpu(vol_pg0-&gt;StripeSize);</div><div class='add'>+	stripe_exp = find_first_bit(&amp;stripe_sz, 32);</div><div class='add'>+	if (stripe_exp == 32) {</div><div class='ctx'> 		printk(MPT2SAS_INFO_FMT "WarpDrive : Direct IO is disabled "</div><div class='del'>-		"for the drive with handle(0x%04x) since drive sz &gt; 2TB\n",</div><div class='del'>-		ioc-&gt;name, raid_device-&gt;handle);</div><div class='add'>+		"for the drive with handle(0x%04x) invalid stripe sz %uK\n",</div><div class='add'>+		    ioc-&gt;name, raid_device-&gt;handle,</div><div class='add'>+		    (le32_to_cpu(vol_pg0-&gt;StripeSize) *</div><div class='add'>+		    le16_to_cpu(vol_pg0-&gt;BlockSize)) / 1024);</div><div class='ctx'> 		goto out_error;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	stripe_sz = le32_to_cpu(vol_pg0-&gt;StripeSize);</div><div class='del'>-	stripe_exp = 0;</div><div class='del'>-	for (i = 0; i &lt; 32; i++) {</div><div class='del'>-		if (stripe_sz &amp; 1)</div><div class='del'>-			break;</div><div class='del'>-		stripe_exp++;</div><div class='del'>-		stripe_sz &gt;&gt;= 1;</div><div class='del'>-	}</div><div class='del'>-	if (i == 32) {</div><div class='add'>+	raid_device-&gt;stripe_exponent = stripe_exp;</div><div class='add'>+	block_sz = le16_to_cpu(vol_pg0-&gt;BlockSize);</div><div class='add'>+	block_exp = find_first_bit(&amp;block_sz, 16);</div><div class='add'>+	if (block_exp == 16) {</div><div class='ctx'> 		printk(MPT2SAS_INFO_FMT "WarpDrive : Direct IO is disabled "</div><div class='del'>-		    "for the drive with handle(0x%04x) invalid stripe sz %uK\n",</div><div class='add'>+		    "for the drive with handle(0x%04x) invalid block sz %u\n",</div><div class='ctx'> 		    ioc-&gt;name, raid_device-&gt;handle,</div><div class='del'>-		    le32_to_cpu(vol_pg0-&gt;StripeSize)/2);</div><div class='add'>+		    le16_to_cpu(vol_pg0-&gt;BlockSize));</div><div class='ctx'> 		goto out_error;</div><div class='ctx'> 	}</div><div class='del'>-	raid_device-&gt;stripe_exponent = stripe_exp;</div><div class='add'>+	raid_device-&gt;block_exponent = block_exp;</div><div class='ctx'> 	raid_device-&gt;direct_io_enabled = 1;</div><div class='ctx'> </div><div class='ctx'> 	printk(MPT2SAS_INFO_FMT "WarpDrive : Direct IO is Enabled for the drive"</div><div class='hunk'>@@ -3804,8 +3812,9 @@ _scsih_setup_direct_io(struct MPT2SAS_ADAPTER *ioc, struct scsi_cmnd *scmd,</div><div class='ctx'> {</div><div class='ctx'> 	u32 v_lba, p_lba, stripe_off, stripe_unit, column, io_size;</div><div class='ctx'> 	u32 stripe_sz, stripe_exp;</div><div class='del'>-	u8 num_pds, *cdb_ptr, *tmp_ptr, *lba_ptr1, *lba_ptr2;</div><div class='add'>+	u8 num_pds, *cdb_ptr, i;</div><div class='ctx'> 	u8 cdb0 = scmd-&gt;cmnd[0];</div><div class='add'>+	u64 v_llba;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Try Direct I/O to RAID memeber disks</div><div class='hunk'>@@ -3816,15 +3825,11 @@ _scsih_setup_direct_io(struct MPT2SAS_ADAPTER *ioc, struct scsi_cmnd *scmd,</div><div class='ctx'> </div><div class='ctx'> 		if ((cdb0 &lt; READ_16) || !(cdb_ptr[2] | cdb_ptr[3] | cdb_ptr[4]</div><div class='ctx'> 			| cdb_ptr[5])) {</div><div class='del'>-			io_size = scsi_bufflen(scmd) &gt;&gt; 9;</div><div class='add'>+			io_size = scsi_bufflen(scmd) &gt;&gt;</div><div class='add'>+			    raid_device-&gt;block_exponent;</div><div class='add'>+			i = (cdb0 &lt; READ_16) ? 2 : 6;</div><div class='ctx'> 			/* get virtual lba */</div><div class='del'>-			lba_ptr1 = lba_ptr2 = (cdb0 &lt; READ_16) ? &amp;cdb_ptr[2] :</div><div class='del'>-			    &amp;cdb_ptr[6];</div><div class='del'>-			tmp_ptr = (u8 *)&amp;v_lba + 3;</div><div class='del'>-			*tmp_ptr-- = *lba_ptr1++;</div><div class='del'>-			*tmp_ptr-- = *lba_ptr1++;</div><div class='del'>-			*tmp_ptr-- = *lba_ptr1++;</div><div class='del'>-			*tmp_ptr = *lba_ptr1;</div><div class='add'>+			v_lba = be32_to_cpu(*(__be32 *)(&amp;cdb_ptr[i]));</div><div class='ctx'> </div><div class='ctx'> 			if (((u64)v_lba + (u64)io_size - 1) &lt;=</div><div class='ctx'> 			    (u32)raid_device-&gt;max_lba) {</div><div class='hunk'>@@ -3843,11 +3848,39 @@ _scsih_setup_direct_io(struct MPT2SAS_ADAPTER *ioc, struct scsi_cmnd *scmd,</div><div class='ctx'> 					mpi_request-&gt;DevHandle =</div><div class='ctx'> 						cpu_to_le16(raid_device-&gt;</div><div class='ctx'> 						    pd_handle[column]);</div><div class='del'>-					tmp_ptr = (u8 *)&amp;p_lba + 3;</div><div class='del'>-					*lba_ptr2++ = *tmp_ptr--;</div><div class='del'>-					*lba_ptr2++ = *tmp_ptr--;</div><div class='del'>-					*lba_ptr2++ = *tmp_ptr--;</div><div class='del'>-					*lba_ptr2 = *tmp_ptr;</div><div class='add'>+					(*(__be32 *)(&amp;cdb_ptr[i])) =</div><div class='add'>+						cpu_to_be32(p_lba);</div><div class='add'>+					/*</div><div class='add'>+					* WD: To indicate this I/O is directI/O</div><div class='add'>+					*/</div><div class='add'>+					_scsih_scsi_direct_io_set(ioc, smid, 1);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			io_size = scsi_bufflen(scmd) &gt;&gt;</div><div class='add'>+			    raid_device-&gt;block_exponent;</div><div class='add'>+			/* get virtual lba */</div><div class='add'>+			v_llba = be64_to_cpu(*(__be64 *)(&amp;cdb_ptr[2]));</div><div class='add'>+</div><div class='add'>+			if ((v_llba + (u64)io_size - 1) &lt;=</div><div class='add'>+			    raid_device-&gt;max_lba) {</div><div class='add'>+				stripe_sz = raid_device-&gt;stripe_sz;</div><div class='add'>+				stripe_exp = raid_device-&gt;stripe_exponent;</div><div class='add'>+				stripe_off = (u32) (v_llba &amp; (stripe_sz - 1));</div><div class='add'>+</div><div class='add'>+				/* Check whether IO falls within a stripe */</div><div class='add'>+				if ((stripe_off + io_size) &lt;= stripe_sz) {</div><div class='add'>+					num_pds = raid_device-&gt;num_pds;</div><div class='add'>+					p_lba = (u32)(v_llba &gt;&gt; stripe_exp);</div><div class='add'>+					stripe_unit = p_lba / num_pds;</div><div class='add'>+					column = p_lba % num_pds;</div><div class='add'>+					p_lba = (stripe_unit &lt;&lt; stripe_exp) +</div><div class='add'>+					    stripe_off;</div><div class='add'>+					mpi_request-&gt;DevHandle =</div><div class='add'>+						cpu_to_le16(raid_device-&gt;</div><div class='add'>+						    pd_handle[column]);</div><div class='add'>+					(*(__be64 *)(&amp;cdb_ptr[2])) =</div><div class='add'>+					    cpu_to_be64((u64)p_lba);</div><div class='ctx'> 					/*</div><div class='ctx'> 					* WD: To indicate this I/O is directI/O</div><div class='ctx'> 					*/</div><div class='hunk'>@@ -4403,11 +4436,14 @@ _scsih_io_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply)</div><div class='ctx'> 		scmd-&gt;result = DID_NO_CONNECT &lt;&lt; 16;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	ioc_status = le16_to_cpu(mpi_reply-&gt;IOCStatus);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * WARPDRIVE: If direct_io is set then it is directIO,</div><div class='ctx'> 	 * the failed direct I/O should be redirected to volume</div><div class='ctx'> 	 */</div><div class='del'>-	if (_scsih_scsi_direct_io_get(ioc, smid)) {</div><div class='add'>+	if (_scsih_scsi_direct_io_get(ioc, smid) &amp;&amp;</div><div class='add'>+	    ((ioc_status &amp; MPI2_IOCSTATUS_MASK)</div><div class='add'>+	    != MPI2_IOCSTATUS_SCSI_TASK_TERMINATED)) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;ioc-&gt;scsi_lookup_lock, flags);</div><div class='ctx'> 		ioc-&gt;scsi_lookup[smid - 1].scmd = scmd;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ioc-&gt;scsi_lookup_lock, flags);</div><div class='hunk'>@@ -4441,7 +4477,6 @@ _scsih_io_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply)</div><div class='ctx'> </div><div class='ctx'> 	xfer_cnt = le32_to_cpu(mpi_reply-&gt;TransferCount);</div><div class='ctx'> 	scsi_set_resid(scmd, scsi_bufflen(scmd) - xfer_cnt);</div><div class='del'>-	ioc_status = le16_to_cpu(mpi_reply-&gt;IOCStatus);</div><div class='ctx'> 	if (ioc_status &amp; MPI2_IOCSTATUS_FLAG_LOG_INFO_AVAILABLE)</div><div class='ctx'> 		log_info =  le32_to_cpu(mpi_reply-&gt;IOCLogInfo);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -4485,6 +4520,8 @@ _scsih_io_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply)</div><div class='ctx'> 			scmd-&gt;result = DID_TRANSPORT_DISRUPTED &lt;&lt; 16;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='add'>+		scmd-&gt;result = DID_SOFT_ERROR &lt;&lt; 16;</div><div class='add'>+		break;</div><div class='ctx'> 	case MPI2_IOCSTATUS_SCSI_TASK_TERMINATED:</div><div class='ctx'> 	case MPI2_IOCSTATUS_SCSI_EXT_TERMINATED:</div><div class='ctx'> 		scmd-&gt;result = DID_RESET &lt;&lt; 16;</div><div class='hunk'>@@ -6714,6 +6751,7 @@ _scsih_mark_responding_raid_device(struct MPT2SAS_ADAPTER *ioc, u64 wwid,</div><div class='ctx'> 			} else</div><div class='ctx'> 				sas_target_priv_data = NULL;</div><div class='ctx'> 			raid_device-&gt;responding = 1;</div><div class='add'>+			spin_unlock_irqrestore(&amp;ioc-&gt;raid_device_lock, flags);</div><div class='ctx'> 			starget_printk(KERN_INFO, raid_device-&gt;starget,</div><div class='ctx'> 			    "handle(0x%04x), wwid(0x%016llx)\n", handle,</div><div class='ctx'> 			    (unsigned long long)raid_device-&gt;wwid);</div><div class='hunk'>@@ -6724,16 +6762,16 @@ _scsih_mark_responding_raid_device(struct MPT2SAS_ADAPTER *ioc, u64 wwid,</div><div class='ctx'> 			 */</div><div class='ctx'> 			_scsih_init_warpdrive_properties(ioc, raid_device);</div><div class='ctx'> 			if (raid_device-&gt;handle == handle)</div><div class='del'>-				goto out;</div><div class='add'>+				return;</div><div class='ctx'> 			printk(KERN_INFO "\thandle changed from(0x%04x)!!!\n",</div><div class='ctx'> 			    raid_device-&gt;handle);</div><div class='ctx'> 			raid_device-&gt;handle = handle;</div><div class='ctx'> 			if (sas_target_priv_data)</div><div class='ctx'> 				sas_target_priv_data-&gt;handle = handle;</div><div class='del'>-			goto out;</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>- out:</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ioc-&gt;raid_device_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7418,7 +7456,7 @@ static struct scsi_host_template scsih_driver_template = {</div><div class='ctx'> 	.can_queue			= 1,</div><div class='ctx'> 	.this_id			= -1,</div><div class='ctx'> 	.sg_tablesize			= MPT2SAS_SG_DEPTH,</div><div class='del'>-	.max_sectors			= 8192,</div><div class='add'>+	.max_sectors			= 32767,</div><div class='ctx'> 	.cmd_per_lun			= 7,</div><div class='ctx'> 	.use_clustering			= ENABLE_CLUSTERING,</div><div class='ctx'> 	.shost_attrs			= mpt2sas_host_attrs,</div><div class='hunk'>@@ -7928,6 +7966,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	ioc-&gt;tm_tr_volume_cb_idx = tm_tr_volume_cb_idx;</div><div class='ctx'> 	ioc-&gt;tm_sas_control_cb_idx = tm_sas_control_cb_idx;</div><div class='ctx'> 	ioc-&gt;logging_level = logging_level;</div><div class='add'>+	ioc-&gt;schedule_dead_ioc_flush_running_cmds = &amp;_scsih_flush_running_cmds;</div><div class='ctx'> 	/* misc semaphores and spin locks */</div><div class='ctx'> 	mutex_init(&amp;ioc-&gt;reset_in_progress_mutex);</div><div class='ctx'> 	spin_lock_init(&amp;ioc-&gt;ioc_reset_in_progress_lock);</div><div class='hunk'>@@ -7958,11 +7997,11 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 			printk(MPT2SAS_WARN_FMT "Invalid value %d passed "</div><div class='ctx'> 			    "for max_sectors, range is 64 to 8192. Assigning "</div><div class='ctx'> 			    "value of 64.\n", ioc-&gt;name, max_sectors);</div><div class='del'>-		} else if (max_sectors &gt; 8192) {</div><div class='del'>-			shost-&gt;max_sectors = 8192;</div><div class='add'>+		} else if (max_sectors &gt; 32767) {</div><div class='add'>+			shost-&gt;max_sectors = 32767;</div><div class='ctx'> 			printk(MPT2SAS_WARN_FMT "Invalid value %d passed "</div><div class='ctx'> 			    "for max_sectors, range is 64 to 8192. Assigning "</div><div class='del'>-			    "default value of 8192.\n", ioc-&gt;name,</div><div class='add'>+			    "default value of 32767.\n", ioc-&gt;name,</div><div class='ctx'> 			    max_sectors);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			shost-&gt;max_sectors = max_sectors &amp; 0xFFFE;</div><div class='hunk'>@@ -8000,7 +8039,6 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 		goto out_attach_fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	scsi_scan_host(shost);</div><div class='ctx'> 	if (ioc-&gt;is_warpdrive) {</div><div class='ctx'> 		if (ioc-&gt;mfg_pg10_hide_flag ==  MFG_PAGE10_EXPOSE_ALL_DISKS)</div><div class='ctx'> 			ioc-&gt;hide_drives = 0;</div><div class='hunk'>@@ -8014,8 +8052,8 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='ctx'> 		ioc-&gt;hide_drives = 0;</div><div class='add'>+	scsi_scan_host(shost);</div><div class='ctx'> </div><div class='del'>-	_scsih_probe_devices(ioc);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  out_attach_fail:</div><div class='head'>diff --git a/drivers/scsi/mpt2sas/mpt2sas_transport.c b/drivers/scsi/mpt2sas/mpt2sas_transport.c<br/>index 230732241aa2..831047466a5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpt2sas_transport.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/mpt2sas/mpt2sas_transport.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/mpt2sas/mpt2sas_transport.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/mpt2sas/mpt2sas_transport.c</a></div><div class='hunk'>@@ -398,8 +398,8 @@ _transport_expander_report_manufacture(struct MPT2SAS_ADAPTER *ioc,</div><div class='ctx'> 	dtransportprintk(ioc, printk(MPT2SAS_INFO_FMT "report_manufacture - "</div><div class='ctx'> 	    "send to sas_addr(0x%016llx)\n", ioc-&gt;name,</div><div class='ctx'> 	    (unsigned long long)sas_address));</div><div class='del'>-	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	init_completion(&amp;ioc-&gt;transport_cmds.done);</div><div class='add'>+	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	timeleft = wait_for_completion_timeout(&amp;ioc-&gt;transport_cmds.done,</div><div class='ctx'> 	    10*HZ);</div><div class='ctx'> </div><div class='hunk'>@@ -1184,8 +1184,8 @@ _transport_get_expander_phy_error_log(struct MPT2SAS_ADAPTER *ioc,</div><div class='ctx'> 	dtransportprintk(ioc, printk(MPT2SAS_INFO_FMT "phy_error_log - "</div><div class='ctx'> 	    "send to sas_addr(0x%016llx), phy(%d)\n", ioc-&gt;name,</div><div class='ctx'> 	    (unsigned long long)phy-&gt;identify.sas_address, phy-&gt;number));</div><div class='del'>-	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	init_completion(&amp;ioc-&gt;transport_cmds.done);</div><div class='add'>+	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	timeleft = wait_for_completion_timeout(&amp;ioc-&gt;transport_cmds.done,</div><div class='ctx'> 	    10*HZ);</div><div class='ctx'> </div><div class='hunk'>@@ -1509,8 +1509,9 @@ _transport_expander_phy_control(struct MPT2SAS_ADAPTER *ioc,</div><div class='ctx'> 	    "send to sas_addr(0x%016llx), phy(%d), opcode(%d)\n", ioc-&gt;name,</div><div class='ctx'> 	    (unsigned long long)phy-&gt;identify.sas_address, phy-&gt;number,</div><div class='ctx'> 	    phy_operation));</div><div class='del'>-	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='add'>+</div><div class='ctx'> 	init_completion(&amp;ioc-&gt;transport_cmds.done);</div><div class='add'>+	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	timeleft = wait_for_completion_timeout(&amp;ioc-&gt;transport_cmds.done,</div><div class='ctx'> 	    10*HZ);</div><div class='ctx'> </div><div class='hunk'>@@ -1949,8 +1950,8 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,</div><div class='ctx'> 	dtransportprintk(ioc, printk(MPT2SAS_INFO_FMT "%s - "</div><div class='ctx'> 	    "sending smp request\n", ioc-&gt;name, __func__));</div><div class='ctx'> </div><div class='del'>-	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	init_completion(&amp;ioc-&gt;transport_cmds.done);</div><div class='add'>+	mpt2sas_base_put_smid_default(ioc, smid);</div><div class='ctx'> 	timeleft = wait_for_completion_timeout(&amp;ioc-&gt;transport_cmds.done,</div><div class='ctx'> 	    10*HZ);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c<br/>index f6a50c98c36f..002924963cd8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/nsp32.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/nsp32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/nsp32.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/nsp32.c</a></div><div class='hunk'>@@ -59,11 +59,11 @@ MODULE_PARM_DESC(trans_mode, "transfer mode (0: BIOS(default) 1: Async 2: Ultra2</div><div class='ctx'> #define ASYNC_MODE    1</div><div class='ctx'> #define ULTRA20M_MODE 2</div><div class='ctx'> </div><div class='del'>-static int       auto_param = 0;	/* default: ON */</div><div class='add'>+static bool      auto_param = 0;	/* default: ON */</div><div class='ctx'> module_param     (auto_param, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(auto_param, "AutoParameter mode (0: ON(default) 1: OFF)");</div><div class='ctx'> </div><div class='del'>-static int       disc_priv  = 1;	/* default: OFF */</div><div class='add'>+static bool      disc_priv  = 1;	/* default: OFF */</div><div class='ctx'> module_param     (disc_priv, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(disc_priv,  "disconnection privilege mode (0: ON 1: OFF(default))");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c<br/>index ca86721a71b9..b61a753eb896 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/pcmcia/nsp_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/pcmcia/nsp_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/pcmcia/nsp_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/pcmcia/nsp_cs.c</a></div><div class='hunk'>@@ -70,7 +70,7 @@ module_param(nsp_burst_mode, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(nsp_burst_mode, "Burst transfer mode (0=io8, 1=io32, 2=mem32(default))");</div><div class='ctx'> </div><div class='ctx'> /* Release IO ports after configuration? */</div><div class='del'>-static int       free_ports = 0;</div><div class='add'>+static bool       free_ports = 0;</div><div class='ctx'> module_param(free_ports, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(free_ports, "Release IO ports after configuration? (default: 0 (=no))");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c<br/>index 5163edb925cb..ea8a0b47d66d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/pmcraid.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/pmcraid.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/pmcraid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/pmcraid.c</a></div><div class='hunk'>@@ -4105,7 +4105,7 @@ static long pmcraid_chr_ioctl(</div><div class='ctx'> 	hdr = kmalloc(sizeof(struct pmcraid_ioctl_header), GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!hdr) {</div><div class='del'>-		pmcraid_err("faile to allocate memory for ioctl header\n");</div><div class='add'>+		pmcraid_err("failed to allocate memory for ioctl header\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</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 6465dae5883a..a2f1b3043dfb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_attr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_attr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_attr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla2xxx/qla_attr.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ qla2x00_sysfs_write_fw_dump(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 			set_bit(ISP_ABORT_NEEDED, &amp;vha-&gt;dpc_flags);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	return -EINVAL;</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct bin_attribute sysfs_fw_dump_attr = {</div><div class='hunk'>@@ -387,7 +387,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		if (ha-&gt;optrom_state != QLA_SWRITING)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		if (qla2x00_wait_for_hba_online(vha) != QLA_SUCCESS) {</div><div class='ctx'> 			ql_log(ql_log_warn, vha, 0x7068,</div><div class='hunk'>@@ -667,7 +667,7 @@ qla2x00_sysfs_write_edc(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 	    dev, adr, len, opt);</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x7074,</div><div class='del'>-		    "Unable to write EDC (%x) %02x:%04x:%02x:%02hhx\n",</div><div class='add'>+		    "Unable to write EDC (%x) %02x:%04x:%02x:%02x:%02hhx\n",</div><div class='ctx'> 		    rval, dev, adr, opt, len, buf[8]);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -724,7 +724,7 @@ qla2x00_sysfs_write_edc_status(struct file *filp, struct kobject *kobj,</div><div class='ctx'> 			dev, adr, len, opt);</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		ql_log(ql_log_info, vha, 0x7075,</div><div class='del'>-		    "Unable to write EDC status (%x) %02x:%04x:%02x.\n",</div><div class='add'>+		    "Unable to write EDC status (%x) %02x:%04x:%02x:%02x.\n",</div><div class='ctx'> 		    rval, dev, adr, opt, len);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1971,8 +1971,8 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)</div><div class='ctx'> 			    "Queue delete failed.\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	scsi_host_put(vha-&gt;host);</div><div class='ctx'> 	ql_log(ql_log_info, vha, 0x7088, "VP[%d] deleted.\n", id);</div><div class='add'>+	scsi_host_put(vha-&gt;host);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</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 8b641a8a0c74..b1d0f936bf2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_bsg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_bsg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_bsg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla2xxx/qla_bsg.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@ qla2x00_get_ctx_bsg_sp(scsi_qla_host_t *vha, fc_port_t *fcport, size_t size)</div><div class='ctx'> 	memset(sp, 0, sizeof(*sp));</div><div class='ctx'> 	sp-&gt;fcport = fcport;</div><div class='ctx'> 	sp-&gt;ctx = ctx;</div><div class='add'>+	ctx-&gt;iocbs = 1;</div><div class='ctx'> done:</div><div class='ctx'> 	return sp;</div><div class='ctx'> }</div><div class='hunk'>@@ -102,7 +103,7 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job)</div><div class='ctx'> </div><div class='ctx'> 	bsg_job-&gt;reply-&gt;reply_payload_rcv_len = 0;</div><div class='ctx'> </div><div class='del'>-	if (!(IS_QLA24XX_TYPE(ha) || IS_QLA25XX(ha))) {</div><div class='add'>+	if (!(IS_QLA24XX_TYPE(ha) || IS_QLA25XX(ha) || IS_QLA82XX(ha))) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto exit_fcp_prio_cfg;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -389,6 +390,20 @@ done:</div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+inline uint16_t</div><div class='add'>+qla24xx_calc_ct_iocbs(uint16_t dsds)</div><div class='add'>+{</div><div class='add'>+	uint16_t iocbs;</div><div class='add'>+</div><div class='add'>+	iocbs = 1;</div><div class='add'>+	if (dsds &gt; 2) {</div><div class='add'>+		iocbs += (dsds - 2) / 5;</div><div class='add'>+		if ((dsds - 2) % 5)</div><div class='add'>+			iocbs++;</div><div class='add'>+	}</div><div class='add'>+	return iocbs;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> qla2x00_process_ct(struct fc_bsg_job *bsg_job)</div><div class='ctx'> {</div><div class='hunk'>@@ -489,6 +504,7 @@ qla2x00_process_ct(struct fc_bsg_job *bsg_job)</div><div class='ctx'> 	ct = sp-&gt;ctx;</div><div class='ctx'> 	ct-&gt;type = SRB_CT_CMD;</div><div class='ctx'> 	ct-&gt;name = "bsg_ct";</div><div class='add'>+	ct-&gt;iocbs = qla24xx_calc_ct_iocbs(req_sg_cnt + rsp_sg_cnt);</div><div class='ctx'> 	ct-&gt;u.bsg_job = bsg_job;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_user, vha, 0x7016,</div><div class='hunk'>@@ -1653,7 +1669,7 @@ qla24xx_bsg_request(struct fc_bsg_job *bsg_job)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_user, vha, 0x7000,</div><div class='del'>-	    "Entered %s msgcode=%d.\n", __func__, bsg_job-&gt;request-&gt;msgcode);</div><div class='add'>+	    "Entered %s msgcode=0x%x.\n", __func__, bsg_job-&gt;request-&gt;msgcode);</div><div class='ctx'> </div><div class='ctx'> 	switch (bsg_job-&gt;request-&gt;msgcode) {</div><div class='ctx'> 	case FC_BSG_RPT_ELS:</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c<br/>index f3cddd5800c3..7c54624b5b13 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_dbg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_dbg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_dbg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla2xxx/qla_dbg.c</a></div><div class='hunk'>@@ -11,15 +11,17 @@</div><div class='ctx'>  * ----------------------------------------------------------------------</div><div class='ctx'>  * |             Level            |   Last Value Used  |     Holes	|</div><div class='ctx'>  * ----------------------------------------------------------------------</div><div class='del'>- * | Module Init and Probe        |       0x0116       |  		|</div><div class='add'>+ * | Module Init and Probe        |       0x0116       | 0xfa           |</div><div class='ctx'>  * | Mailbox commands             |       0x112b       |		|</div><div class='del'>- * | Device Discovery             |       0x2083       |		|</div><div class='del'>- * | Queue Command and IO tracing |       0x302e       |     0x3008     |</div><div class='add'>+ * | Device Discovery             |       0x2084       |		|</div><div class='add'>+ * | Queue Command and IO tracing |       0x302f       | 0x3008,0x302d, |</div><div class='add'>+ * |                              |                    | 0x302e         |</div><div class='ctx'>  * | DPC Thread                   |       0x401c       |		|</div><div class='del'>- * | Async Events                 |       0x5059       |		|</div><div class='del'>- * | Timer Routines               |       0x6010       | 0x600e,0x600f  |</div><div class='del'>- * | User Space Interactions      |       0x709d       |		|</div><div class='del'>- * | Task Management              |       0x8041       | 0x800b         |</div><div class='add'>+ * | Async Events                 |       0x5057       | 0x5052		|</div><div class='add'>+ * | Timer Routines               |       0x6011       | 0x600e,0x600f  |</div><div class='add'>+ * | User Space Interactions      |       0x709e       |		|</div><div class='add'>+ * | Task Management              |       0x803c       | 0x8025-0x8026  |</div><div class='add'>+ * |                              |                    | 0x800b,0x8039  |</div><div class='ctx'>  * | AER/EEH                      |       0x900f       |		|</div><div class='ctx'>  * | Virtual Port                 |       0xa007       |		|</div><div class='ctx'>  * | ISP82XX Specific             |       0xb052       |    		|</div><div class='hunk'>@@ -368,7 +370,7 @@ qla25xx_copy_fce(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain)</div><div class='ctx'> </div><div class='ctx'> 	memcpy(iter_reg, ha-&gt;fce, ntohl(fcec-&gt;size));</div><div class='ctx'> </div><div class='del'>-	return iter_reg;</div><div class='add'>+	return (char *)iter_reg + ntohl(fcec-&gt;size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void *</div><div class='hunk'>@@ -1650,6 +1652,15 @@ qla81xx_fw_dump_failed:</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> /*                         Driver Debug Functions.                          */</div><div class='ctx'> /****************************************************************************/</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+ql_mask_match(uint32_t level)</div><div class='add'>+{</div><div class='add'>+	if (ql2xextended_error_logging == 1)</div><div class='add'>+		ql2xextended_error_logging = QL_DBG_DEFAULT1_MASK;</div><div class='add'>+	return (level &amp; ql2xextended_error_logging) == level;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This function is for formatting and logging debug information.</div><div class='ctx'>  * It is to be used when vha is available. It formats the message</div><div class='hunk'>@@ -1664,34 +1675,31 @@ qla81xx_fw_dump_failed:</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, char *msg, ...) {</div><div class='del'>-</div><div class='del'>-	char pbuf[QL_DBG_BUF_LEN];</div><div class='del'>-	va_list ap;</div><div class='del'>-	uint32_t len;</div><div class='del'>-	struct pci_dev *pdev = NULL;</div><div class='del'>-</div><div class='del'>-	memset(pbuf, 0, QL_DBG_BUF_LEN);</div><div class='del'>-</div><div class='del'>-	va_start(ap, msg);</div><div class='del'>-</div><div class='del'>-	if ((level &amp; ql2xextended_error_logging) == level) {</div><div class='del'>-		if (vha != NULL) {</div><div class='del'>-			pdev = vha-&gt;hw-&gt;pdev;</div><div class='del'>-			/* &lt;module-name&gt; &lt;pci-name&gt; &lt;msg-id&gt;:&lt;host&gt; Message */</div><div class='del'>-			sprintf(pbuf, "%s [%s]-%04x:%ld: ", QL_MSGHDR,</div><div class='del'>-			    dev_name(&amp;(pdev-&gt;dev)), id + ql_dbg_offset,</div><div class='del'>-			    vha-&gt;host_no);</div><div class='del'>-		} else</div><div class='del'>-			sprintf(pbuf, "%s [%s]-%04x: : ", QL_MSGHDR,</div><div class='del'>-			    "0000:00:00.0", id + ql_dbg_offset);</div><div class='del'>-</div><div class='del'>-		len = strlen(pbuf);</div><div class='del'>-		vsprintf(pbuf+len, msg, ap);</div><div class='del'>-		pr_warning("%s", pbuf);</div><div class='add'>+ql_dbg(uint32_t level, scsi_qla_host_t *vha, int32_t id, const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	va_list va;</div><div class='add'>+	struct va_format vaf;</div><div class='add'>+</div><div class='add'>+	if (!ql_mask_match(level))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	va_start(va, fmt);</div><div class='add'>+</div><div class='add'>+	vaf.fmt = fmt;</div><div class='add'>+	vaf.va = &amp;va;</div><div class='add'>+</div><div class='add'>+	if (vha != NULL) {</div><div class='add'>+		const struct pci_dev *pdev = vha-&gt;hw-&gt;pdev;</div><div class='add'>+		/* &lt;module-name&gt; &lt;pci-name&gt; &lt;msg-id&gt;:&lt;host&gt; Message */</div><div class='add'>+		pr_warn("%s [%s]-%04x:%ld: %pV",</div><div class='add'>+			QL_MSGHDR, dev_name(&amp;(pdev-&gt;dev)), id + ql_dbg_offset,</div><div class='add'>+			vha-&gt;host_no, &amp;vaf);</div><div class='add'>+	} else {</div><div class='add'>+		pr_warn("%s [%s]-%04x: : %pV",</div><div class='add'>+			QL_MSGHDR, "0000:00:00.0", id + ql_dbg_offset, &amp;vaf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	va_end(ap);</div><div class='add'>+	va_end(va);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1710,31 +1718,27 @@ ql_dbg(uint32_t level, scsi_qla_host_t *vha, int32_t id, char *msg, ...) {</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, char *msg, ...) {</div><div class='del'>-</div><div class='del'>-	char pbuf[QL_DBG_BUF_LEN];</div><div class='del'>-	va_list ap;</div><div class='del'>-	uint32_t len;</div><div class='add'>+ql_dbg_pci(uint32_t level, struct pci_dev *pdev, int32_t id,</div><div class='add'>+	   const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	va_list va;</div><div class='add'>+	struct va_format vaf;</div><div class='ctx'> </div><div class='ctx'> 	if (pdev == NULL)</div><div class='ctx'> 		return;</div><div class='add'>+	if (!ql_mask_match(level))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	memset(pbuf, 0, QL_DBG_BUF_LEN);</div><div class='del'>-</div><div class='del'>-	va_start(ap, msg);</div><div class='del'>-</div><div class='del'>-	if ((level &amp; ql2xextended_error_logging) == level) {</div><div class='del'>-		/* &lt;module-name&gt; &lt;dev-name&gt;:&lt;msg-id&gt; Message */</div><div class='del'>-		sprintf(pbuf, "%s [%s]-%04x: : ", QL_MSGHDR,</div><div class='del'>-		    dev_name(&amp;(pdev-&gt;dev)), id + ql_dbg_offset);</div><div class='add'>+	va_start(va, fmt);</div><div class='ctx'> </div><div class='del'>-		len = strlen(pbuf);</div><div class='del'>-		vsprintf(pbuf+len, msg, ap);</div><div class='del'>-		pr_warning("%s", pbuf);</div><div class='del'>-	}</div><div class='add'>+	vaf.fmt = fmt;</div><div class='add'>+	vaf.va = &amp;va;</div><div class='ctx'> </div><div class='del'>-	va_end(ap);</div><div class='add'>+	/* &lt;module-name&gt; &lt;dev-name&gt;:&lt;msg-id&gt; Message */</div><div class='add'>+	pr_warn("%s [%s]-%04x: : %pV",</div><div class='add'>+		QL_MSGHDR, dev_name(&amp;(pdev-&gt;dev)), id + ql_dbg_offset, &amp;vaf);</div><div class='ctx'> </div><div class='add'>+	va_end(va);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1751,47 +1755,47 @@ ql_dbg_pci(uint32_t level, struct pci_dev *pdev, int32_t id, char *msg, ...) {</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, char *msg, ...) {</div><div class='del'>-</div><div class='del'>-	char pbuf[QL_DBG_BUF_LEN];</div><div class='del'>-	va_list ap;</div><div class='del'>-	uint32_t len;</div><div class='del'>-	struct pci_dev *pdev = NULL;</div><div class='del'>-</div><div class='del'>-	memset(pbuf, 0, QL_DBG_BUF_LEN);</div><div class='del'>-</div><div class='del'>-	va_start(ap, msg);</div><div class='del'>-</div><div class='del'>-	if (level &lt;= ql_errlev) {</div><div class='del'>-		if (vha != NULL) {</div><div class='del'>-			pdev = vha-&gt;hw-&gt;pdev;</div><div class='del'>-			/* &lt;module-name&gt; &lt;msg-id&gt;:&lt;host&gt; Message */</div><div class='del'>-			sprintf(pbuf, "%s [%s]-%04x:%ld: ", QL_MSGHDR,</div><div class='del'>-			    dev_name(&amp;(pdev-&gt;dev)), id, vha-&gt;host_no);</div><div class='del'>-		} else</div><div class='del'>-			sprintf(pbuf, "%s [%s]-%04x: : ", QL_MSGHDR,</div><div class='del'>-			    "0000:00:00.0", id);</div><div class='add'>+ql_log(uint32_t level, scsi_qla_host_t *vha, int32_t id, const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	va_list va;</div><div class='add'>+	struct va_format vaf;</div><div class='add'>+	char pbuf[128];</div><div class='ctx'> </div><div class='del'>-		len = strlen(pbuf);</div><div class='del'>-			vsprintf(pbuf+len, msg, ap);</div><div class='add'>+	if (level &gt; ql_errlev)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		switch (level) {</div><div class='del'>-		case 0: /* FATAL LOG */</div><div class='del'>-			pr_crit("%s", pbuf);</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			pr_err("%s", pbuf);</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			pr_warn("%s", pbuf);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			pr_info("%s", pbuf);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	if (vha != NULL) {</div><div class='add'>+		const struct pci_dev *pdev = vha-&gt;hw-&gt;pdev;</div><div class='add'>+		/* &lt;module-name&gt; &lt;msg-id&gt;:&lt;host&gt; Message */</div><div class='add'>+		snprintf(pbuf, sizeof(pbuf), "%s [%s]-%04x:%ld: ",</div><div class='add'>+			QL_MSGHDR, dev_name(&amp;(pdev-&gt;dev)), id, vha-&gt;host_no);</div><div class='add'>+	} else {</div><div class='add'>+		snprintf(pbuf, sizeof(pbuf), "%s [%s]-%04x: : ",</div><div class='add'>+			QL_MSGHDR, "0000:00:00.0", id);</div><div class='add'>+	}</div><div class='add'>+	pbuf[sizeof(pbuf) - 1] = 0;</div><div class='add'>+</div><div class='add'>+	va_start(va, fmt);</div><div class='add'>+</div><div class='add'>+	vaf.fmt = fmt;</div><div class='add'>+	vaf.va = &amp;va;</div><div class='add'>+</div><div class='add'>+	switch (level) {</div><div class='add'>+	case 0: /* FATAL LOG */</div><div class='add'>+		pr_crit("%s%pV", pbuf, &amp;vaf);</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		pr_err("%s%pV", pbuf, &amp;vaf);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		pr_warn("%s%pV", pbuf, &amp;vaf);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_info("%s%pV", pbuf, &amp;vaf);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	va_end(ap);</div><div class='add'>+	va_end(va);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1809,43 +1813,44 @@ ql_log(uint32_t level, scsi_qla_host_t *vha, int32_t id, char *msg, ...) {</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, char *msg, ...) {</div><div class='del'>-</div><div class='del'>-	char pbuf[QL_DBG_BUF_LEN];</div><div class='del'>-	va_list ap;</div><div class='del'>-	uint32_t len;</div><div class='add'>+ql_log_pci(uint32_t level, struct pci_dev *pdev, int32_t id,</div><div class='add'>+	   const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	va_list va;</div><div class='add'>+	struct va_format vaf;</div><div class='add'>+	char pbuf[128];</div><div class='ctx'> </div><div class='ctx'> 	if (pdev == NULL)</div><div class='ctx'> 		return;</div><div class='add'>+	if (level &gt; ql_errlev)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	memset(pbuf, 0, QL_DBG_BUF_LEN);</div><div class='del'>-</div><div class='del'>-	va_start(ap, msg);</div><div class='del'>-</div><div class='del'>-	if (level &lt;= ql_errlev) {</div><div class='del'>-		/* &lt;module-name&gt; &lt;dev-name&gt;:&lt;msg-id&gt; Message */</div><div class='del'>-		sprintf(pbuf, "%s [%s]-%04x: : ", QL_MSGHDR,</div><div class='del'>-		    dev_name(&amp;(pdev-&gt;dev)), id);</div><div class='del'>-</div><div class='del'>-		len = strlen(pbuf);</div><div class='del'>-		vsprintf(pbuf+len, msg, ap);</div><div class='del'>-		switch (level) {</div><div class='del'>-		case 0: /* FATAL LOG */</div><div class='del'>-			pr_crit("%s", pbuf);</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			pr_err("%s", pbuf);</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			pr_warn("%s", pbuf);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			pr_info("%s", pbuf);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	/* &lt;module-name&gt; &lt;dev-name&gt;:&lt;msg-id&gt; Message */</div><div class='add'>+	snprintf(pbuf, sizeof(pbuf), "%s [%s]-%04x: : ",</div><div class='add'>+		 QL_MSGHDR, dev_name(&amp;(pdev-&gt;dev)), id);</div><div class='add'>+	pbuf[sizeof(pbuf) - 1] = 0;</div><div class='add'>+</div><div class='add'>+	va_start(va, fmt);</div><div class='add'>+</div><div class='add'>+	vaf.fmt = fmt;</div><div class='add'>+	vaf.va = &amp;va;</div><div class='add'>+</div><div class='add'>+	switch (level) {</div><div class='add'>+	case 0: /* FATAL LOG */</div><div class='add'>+		pr_crit("%s%pV", pbuf, &amp;vaf);</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		pr_err("%s%pV", pbuf, &amp;vaf);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		pr_warn("%s%pV", pbuf, &amp;vaf);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_info("%s%pV", pbuf, &amp;vaf);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	va_end(ap);</div><div class='add'>+	va_end(va);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -1858,20 +1863,20 @@ ql_dump_regs(uint32_t level, scsi_qla_host_t *vha, int32_t id)</div><div class='ctx'> 	struct device_reg_82xx __iomem *reg82 = &amp;ha-&gt;iobase-&gt;isp82;</div><div class='ctx'> 	uint16_t __iomem *mbx_reg;</div><div class='ctx'> </div><div class='del'>-	if ((level &amp; ql2xextended_error_logging) == level) {</div><div class='del'>-</div><div class='del'>-		if (IS_QLA82XX(ha))</div><div class='del'>-			mbx_reg = &amp;reg82-&gt;mailbox_in[0];</div><div class='del'>-		else if (IS_FWI2_CAPABLE(ha))</div><div class='del'>-			mbx_reg = &amp;reg24-&gt;mailbox0;</div><div class='del'>-		else</div><div class='del'>-			mbx_reg = MAILBOX_REG(ha, reg, 0);</div><div class='add'>+	if (!ql_mask_match(level))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		ql_dbg(level, vha, id, "Mailbox registers:\n");</div><div class='del'>-		for (i = 0; i &lt; 6; i++)</div><div class='del'>-			ql_dbg(level, vha, id,</div><div class='del'>-			    "mbox[%d] 0x%04x\n", i, RD_REG_WORD(mbx_reg++));</div><div class='del'>-	}</div><div class='add'>+	if (IS_QLA82XX(ha))</div><div class='add'>+		mbx_reg = &amp;reg82-&gt;mailbox_in[0];</div><div class='add'>+	else if (IS_FWI2_CAPABLE(ha))</div><div class='add'>+		mbx_reg = &amp;reg24-&gt;mailbox0;</div><div class='add'>+	else</div><div class='add'>+		mbx_reg = MAILBOX_REG(ha, reg, 0);</div><div class='add'>+</div><div class='add'>+	ql_dbg(level, vha, id, "Mailbox registers:\n");</div><div class='add'>+	for (i = 0; i &lt; 6; i++)</div><div class='add'>+		ql_dbg(level, vha, id,</div><div class='add'>+		    "mbox[%d] 0x%04x\n", i, RD_REG_WORD(mbx_reg++));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1881,24 +1886,25 @@ ql_dump_buffer(uint32_t level, scsi_qla_host_t *vha, int32_t id,</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t cnt;</div><div class='ctx'> 	uint8_t c;</div><div class='del'>-	if ((level &amp; ql2xextended_error_logging) == level) {</div><div class='del'>-</div><div class='del'>-		ql_dbg(level, vha, id, " 0   1   2   3   4   5   6   7   8   "</div><div class='del'>-		    "9  Ah  Bh  Ch  Dh  Eh  Fh\n");</div><div class='del'>-		ql_dbg(level, vha, id, "----------------------------------"</div><div class='del'>-		    "----------------------------\n");</div><div class='del'>-</div><div class='del'>-		ql_dbg(level, vha, id, "");</div><div class='del'>-		for (cnt = 0; cnt &lt; size;) {</div><div class='del'>-			c = *b++;</div><div class='del'>-			printk("%02x", (uint32_t) c);</div><div class='del'>-			cnt++;</div><div class='del'>-			if (!(cnt % 16))</div><div class='del'>-				printk("\n");</div><div class='del'>-			else</div><div class='del'>-				printk("  ");</div><div class='del'>-		}</div><div class='del'>-		if (cnt % 16)</div><div class='del'>-			ql_dbg(level, vha, id, "\n");</div><div class='add'>+</div><div class='add'>+	if (!ql_mask_match(level))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ql_dbg(level, vha, id, " 0   1   2   3   4   5   6   7   8   "</div><div class='add'>+	    "9  Ah  Bh  Ch  Dh  Eh  Fh\n");</div><div class='add'>+	ql_dbg(level, vha, id, "----------------------------------"</div><div class='add'>+	    "----------------------------\n");</div><div class='add'>+</div><div class='add'>+	ql_dbg(level, vha, id, " ");</div><div class='add'>+	for (cnt = 0; cnt &lt; size;) {</div><div class='add'>+		c = *b++;</div><div class='add'>+		printk("%02x", (uint32_t) c);</div><div class='add'>+		cnt++;</div><div class='add'>+		if (!(cnt % 16))</div><div class='add'>+			printk("\n");</div><div class='add'>+		else</div><div class='add'>+			printk("  ");</div><div class='ctx'> 	}</div><div class='add'>+	if (cnt % 16)</div><div class='add'>+		ql_dbg(level, vha, id, "\n");</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 98a377b99017..5f1b6d9c3dcb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_dbg.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_dbg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_dbg.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla2xxx/qla_dbg.h</a></div><div class='hunk'>@@ -232,6 +232,7 @@ struct qla2xxx_fw_dump {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define QL_MSGHDR "qla2xxx"</div><div class='add'>+#define QL_DBG_DEFAULT1_MASK    0x1e400000</div><div class='ctx'> </div><div class='ctx'> #define ql_log_fatal		0 /* display fatal errors */</div><div class='ctx'> #define ql_log_warn		1 /* display critical errors */</div><div class='hunk'>@@ -244,15 +245,15 @@ struct qla2xxx_fw_dump {</div><div class='ctx'> </div><div class='ctx'> extern int ql_errlev;</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-ql_dbg(uint32_t, scsi_qla_host_t *vha, int32_t, char *, ...);</div><div class='del'>-void</div><div class='del'>-ql_dbg_pci(uint32_t, struct pci_dev *pdev, int32_t, char *, ...);</div><div class='add'>+void __attribute__((format (printf, 4, 5)))</div><div class='add'>+ql_dbg(uint32_t, scsi_qla_host_t *vha, int32_t, const char *fmt, ...);</div><div class='add'>+void __attribute__((format (printf, 4, 5)))</div><div class='add'>+ql_dbg_pci(uint32_t, struct pci_dev *pdev, int32_t, const char *fmt, ...);</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-ql_log(uint32_t, scsi_qla_host_t *vha, int32_t, char *, ...);</div><div class='del'>-void</div><div class='del'>-ql_log_pci(uint32_t, struct pci_dev *pdev, int32_t, char *, ...);</div><div class='add'>+void __attribute__((format (printf, 4, 5)))</div><div class='add'>+ql_log(uint32_t, scsi_qla_host_t *vha, int32_t, const char *fmt, ...);</div><div class='add'>+void __attribute__((format (printf, 4, 5)))</div><div class='add'>+ql_log_pci(uint32_t, struct pci_dev *pdev, int32_t, const char *fmt, ...);</div><div class='ctx'> </div><div class='ctx'> /* Debug Levels */</div><div class='ctx'> /* The 0x40000000 is the max value any debug level can have</div><div class='hunk'>@@ -275,5 +276,3 @@ ql_log_pci(uint32_t, struct pci_dev *pdev, int32_t, char *, ...);</div><div class='ctx'> #define ql_dbg_misc	0x00010000 /* For dumping everything that is not</div><div class='ctx'> 				    * not covered by upper categories</div><div class='ctx'> 				    */</div><div class='del'>-</div><div class='del'>-#define QL_DBG_BUF_LEN	512</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h<br/>index fcf052c50bf5..a6a4eebce4a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_def.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_def.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_def.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla2xxx/qla_def.h</a></div><div class='hunk'>@@ -271,6 +271,7 @@ struct srb_iocb {</div><div class='ctx'> struct srb_ctx {</div><div class='ctx'> 	uint16_t type;</div><div class='ctx'> 	char *name;</div><div class='add'>+	int iocbs;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct srb_iocb *iocb_cmd;</div><div class='ctx'> 		struct fc_bsg_job *bsg_job;</div><div class='hunk'>@@ -2244,6 +2245,7 @@ struct isp_operations {</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 (*abort_isp) (struct scsi_qla_host *);</div><div class='add'>+	int (*iospace_config)(struct qla_hw_data*);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* MSI-X Support *************************************************************/</div><div class='hunk'>@@ -2978,10 +2980,6 @@ typedef struct scsi_qla_host {</div><div class='ctx'> 	atomic_dec(&amp;__vha-&gt;vref_count);			     \</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define qla_printk(level, ha, format, arg...) \</div><div class='del'>-	dev_printk(level , &amp;((ha)-&gt;pdev-&gt;dev) , format , ## arg)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * qla2x00 local function return status codes</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h<br/>index c0c11afb685c..408679be8fdf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_gbl.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_gbl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_gbl.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla2xxx/qla_gbl.h</a></div><div class='hunk'>@@ -572,7 +572,7 @@ extern void qla2x00_set_model_info(scsi_qla_host_t *, uint8_t *,</div><div class='ctx'>     size_t, char *);</div><div class='ctx'> extern int qla82xx_mbx_intr_enable(scsi_qla_host_t *);</div><div class='ctx'> extern int qla82xx_mbx_intr_disable(scsi_qla_host_t *);</div><div class='del'>-extern void qla82xx_start_iocbs(srb_t *);</div><div class='add'>+extern void qla82xx_start_iocbs(scsi_qla_host_t *);</div><div class='ctx'> extern int qla82xx_fcoe_ctx_reset(scsi_qla_host_t *);</div><div class='ctx'> extern int qla82xx_check_md_needed(scsi_qla_host_t *);</div><div class='ctx'> extern void qla82xx_chip_reset_cleanup(scsi_qla_host_t *);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c<br/>index 37937aa3c3b8..4aea4ae23300 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_gs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_gs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_gs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla2xxx/qla_gs.c</a></div><div class='hunk'>@@ -758,7 +758,7 @@ qla2x00_sns_ga_nxt(scsi_qla_host_t *vha, fc_port_t *fcport)</div><div class='ctx'> 		    "GA_NXT Send SNS failed (%d).\n", rval);</div><div class='ctx'> 	} else if (sns_cmd-&gt;p.gan_data[8] != 0x80 ||</div><div class='ctx'> 	    sns_cmd-&gt;p.gan_data[9] != 0x02) {</div><div class='del'>-		ql_dbg(ql_dbg_disc + ql_dbg_buffer, vha, 0x207d,</div><div class='add'>+		ql_dbg(ql_dbg_disc + ql_dbg_buffer, vha, 0x2084,</div><div class='ctx'> 		    "GA_NXT failed, rejected request ga_nxt_rsp:\n");</div><div class='ctx'> 		ql_dump_buffer(ql_dbg_disc + ql_dbg_buffer, vha, 0x2074,</div><div class='ctx'> 		    sns_cmd-&gt;p.gan_data, 16);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c<br/>index 54ea68cec4c5..1fa067e053d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla2xxx/qla_init.c</a></div><div class='hunk'>@@ -111,6 +111,7 @@ qla2x00_get_ctx_sp(scsi_qla_host_t *vha, fc_port_t *fcport, size_t size,</div><div class='ctx'> 	memset(sp, 0, sizeof(*sp));</div><div class='ctx'> 	sp-&gt;fcport = fcport;</div><div class='ctx'> 	sp-&gt;ctx = ctx;</div><div class='add'>+	ctx-&gt;iocbs = 1;</div><div class='ctx'> 	ctx-&gt;u.iocb_cmd = iocb;</div><div class='ctx'> 	iocb-&gt;free = qla2x00_ctx_sp_free;</div><div class='ctx'> </div><div class='hunk'>@@ -154,8 +155,8 @@ qla2x00_async_iocb_timeout(srb_t *sp)</div><div class='ctx'> 	struct srb_ctx *ctx = sp-&gt;ctx;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_disc, fcport-&gt;vha, 0x2071,</div><div class='del'>-	    "Async-%s timeout - portid=%02x%02x%02x.\n",</div><div class='del'>-	    ctx-&gt;name, fcport-&gt;d_id.b.domain, fcport-&gt;d_id.b.area,</div><div class='add'>+	    "Async-%s timeout - hdl=%x portid=%02x%02x%02x.\n",</div><div class='add'>+	    ctx-&gt;name, sp-&gt;handle, fcport-&gt;d_id.b.domain, fcport-&gt;d_id.b.area,</div><div class='ctx'> 	    fcport-&gt;d_id.b.al_pa);</div><div class='ctx'> </div><div class='ctx'> 	fcport-&gt;flags &amp;= ~FCF_ASYNC_SENT;</div><div class='hunk'>@@ -211,9 +212,10 @@ qla2x00_async_login(struct scsi_qla_host *vha, fc_port_t *fcport,</div><div class='ctx'> 		goto done_free_sp;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_disc, vha, 0x2072,</div><div class='del'>-	    "Async-login - loopid=%x portid=%02x%02x%02x retries=%d.\n",</div><div class='del'>-	    fcport-&gt;loop_id, fcport-&gt;d_id.b.domain, fcport-&gt;d_id.b.area,</div><div class='del'>-	    fcport-&gt;d_id.b.al_pa, fcport-&gt;login_retry);</div><div class='add'>+	    "Async-login - hdl=%x, loopid=%x portid=%02x%02x%02x "</div><div class='add'>+	    "retries=%d.\n", sp-&gt;handle, fcport-&gt;loop_id,</div><div class='add'>+	    fcport-&gt;d_id.b.domain, fcport-&gt;d_id.b.area, fcport-&gt;d_id.b.al_pa,</div><div class='add'>+	    fcport-&gt;login_retry);</div><div class='ctx'> 	return rval;</div><div class='ctx'> </div><div class='ctx'> done_free_sp:</div><div class='hunk'>@@ -258,9 +260,9 @@ qla2x00_async_logout(struct scsi_qla_host *vha, fc_port_t *fcport)</div><div class='ctx'> 		goto done_free_sp;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_disc, vha, 0x2070,</div><div class='del'>-	    "Async-logout - loop-id=%x portid=%02x%02x%02x.\n",</div><div class='del'>-	    fcport-&gt;loop_id, 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='add'>+	    "Async-logout - hdl=%x loop-id=%x portid=%02x%02x%02x.\n",</div><div class='add'>+	    sp-&gt;handle, fcport-&gt;loop_id, 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='ctx'> 	return rval;</div><div class='ctx'> </div><div class='ctx'> done_free_sp:</div><div class='hunk'>@@ -308,9 +310,9 @@ qla2x00_async_adisc(struct scsi_qla_host *vha, fc_port_t *fcport,</div><div class='ctx'> 		goto done_free_sp;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_disc, vha, 0x206f,</div><div class='del'>-	    "Async-adisc - loopid=%x portid=%02x%02x%02x.\n",</div><div class='del'>-	    fcport-&gt;loop_id, 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='add'>+	    "Async-adisc - hdl=%x loopid=%x portid=%02x%02x%02x.\n",</div><div class='add'>+	    sp-&gt;handle, fcport-&gt;loop_id, 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='ctx'> 	return rval;</div><div class='ctx'> </div><div class='ctx'> done_free_sp:</div><div class='hunk'>@@ -360,9 +362,9 @@ qla2x00_async_tm_cmd(fc_port_t *fcport, uint32_t flags, uint32_t lun,</div><div class='ctx'> 		goto done_free_sp;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_taskm, vha, 0x802f,</div><div class='del'>-	    "Async-tmf loop-id=%x portid=%02x%02x%02x.\n",</div><div class='del'>-	    fcport-&gt;loop_id, 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='add'>+	    "Async-tmf hdl=%x loop-id=%x portid=%02x%02x%02x.\n",</div><div class='add'>+	    sp-&gt;handle, fcport-&gt;loop_id, 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='ctx'> 	return rval;</div><div class='ctx'> </div><div class='ctx'> done_free_sp:</div><div class='hunk'>@@ -514,7 +516,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)</div><div class='ctx'> 	set_bit(0, ha-&gt;req_qid_map);</div><div class='ctx'> 	set_bit(0, ha-&gt;rsp_qid_map);</div><div class='ctx'> </div><div class='del'>-	ql_log(ql_log_info, vha, 0x0040,</div><div class='add'>+	ql_dbg(ql_dbg_init, vha, 0x0040,</div><div class='ctx'> 	    "Configuring PCI space...\n");</div><div class='ctx'> 	rval = ha-&gt;isp_ops-&gt;pci_config(vha);</div><div class='ctx'> 	if (rval) {</div><div class='hunk'>@@ -533,7 +535,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;isp_ops-&gt;get_flash_version(vha, req-&gt;ring);</div><div class='del'>-	ql_log(ql_log_info, vha, 0x0061,</div><div class='add'>+	ql_dbg(ql_dbg_init, vha, 0x0061,</div><div class='ctx'> 	    "Configure NVRAM parameters...\n");</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;isp_ops-&gt;nvram_config(vha);</div><div class='hunk'>@@ -550,7 +552,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ql_log(ql_log_info, vha, 0x0078,</div><div class='add'>+	ql_dbg(ql_dbg_init, vha, 0x0078,</div><div class='ctx'> 	    "Verifying loaded RISC code...\n");</div><div class='ctx'> </div><div class='ctx'> 	if (qla2x00_isp_firmware(vha) != QLA_SUCCESS) {</div><div class='hunk'>@@ -1294,7 +1296,7 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *vha)</div><div class='ctx'> 			ha-&gt;flags.fce_enabled = 0;</div><div class='ctx'> 			goto try_eft;</div><div class='ctx'> 		}</div><div class='del'>-		ql_log(ql_log_info, vha, 0x00c0,</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x00c0,</div><div class='ctx'> 		    "Allocate (%d KB) for FCE...\n", FCE_SIZE / 1024);</div><div class='ctx'> </div><div class='ctx'> 		fce_size = sizeof(struct qla2xxx_fce_chain) + FCE_SIZE;</div><div class='hunk'>@@ -1321,7 +1323,7 @@ try_eft:</div><div class='ctx'> 			    tc_dma);</div><div class='ctx'> 			goto cont_alloc;</div><div class='ctx'> 		}</div><div class='del'>-		ql_log(ql_log_info, vha, 0x00c3,</div><div class='add'>+		ql_dbg(ql_dbg_init, vha, 0x00c3,</div><div class='ctx'> 		    "Allocated (%d KB) EFT ...\n", EFT_SIZE / 1024);</div><div class='ctx'> </div><div class='ctx'> 		eft_size = EFT_SIZE;</div><div class='hunk'>@@ -1358,7 +1360,7 @@ cont_alloc:</div><div class='ctx'> 		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	ql_log(ql_log_info, vha, 0x00c5,</div><div class='add'>+	ql_dbg(ql_dbg_init, vha, 0x00c5,</div><div class='ctx'> 	    "Allocated (%d KB) for firmware dump.\n", dump_size / 1024);</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;fw_dump_len = dump_size;</div><div class='hunk'>@@ -1929,7 +1931,7 @@ qla2x00_fw_ready(scsi_qla_host_t *vha)</div><div class='ctx'> 					rval = qla84xx_init_chip(vha);</div><div class='ctx'> 					if (rval != QLA_SUCCESS) {</div><div class='ctx'> 						ql_log(ql_log_warn,</div><div class='del'>-						    vha, 0x8026,</div><div class='add'>+						    vha, 0x8007,</div><div class='ctx'> 						    "Init chip failed.\n");</div><div class='ctx'> 						break;</div><div class='ctx'> 					}</div><div class='hunk'>@@ -1938,7 +1940,7 @@ qla2x00_fw_ready(scsi_qla_host_t *vha)</div><div class='ctx'> 					cs84xx_time = jiffies - cs84xx_time;</div><div class='ctx'> 					wtime += cs84xx_time;</div><div class='ctx'> 					mtime += cs84xx_time;</div><div class='del'>-					ql_dbg(ql_dbg_taskm, vha, 0x8025,</div><div class='add'>+					ql_dbg(ql_dbg_taskm, vha, 0x8008,</div><div class='ctx'> 					    "Increasing wait time by %ld. "</div><div class='ctx'> 					    "New time %ld.\n", cs84xx_time,</div><div class='ctx'> 					    wtime);</div><div class='hunk'>@@ -1981,16 +1983,13 @@ qla2x00_fw_ready(scsi_qla_host_t *vha)</div><div class='ctx'> </div><div class='ctx'> 		/* Delay for a while */</div><div class='ctx'> 		msleep(500);</div><div class='del'>-</div><div class='del'>-		ql_dbg(ql_dbg_taskm, vha, 0x8039,</div><div class='del'>-		    "fw_state=%x curr time=%lx.\n", state[0], jiffies);</div><div class='ctx'> 	} while (1);</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_taskm, vha, 0x803a,</div><div class='ctx'> 	    "fw_state=%x (%x, %x, %x, %x) " "curr time=%lx.\n", state[0],</div><div class='ctx'> 	    state[1], state[2], state[3], state[4], jiffies);</div><div class='ctx'> </div><div class='del'>-	if (rval) {</div><div class='add'>+	if (rval &amp;&amp; !(vha-&gt;device_flags &amp; DFLG_NO_CABLE)) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x803b,</div><div class='ctx'> 		    "Firmware ready **** FAILED ****.\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2386,7 +2385,7 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)</div><div class='ctx'> 	 * internal driver logging.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (nv-&gt;host_p[0] &amp; BIT_7)</div><div class='del'>-		ql2xextended_error_logging = 0x7fffffff;</div><div class='add'>+		ql2xextended_error_logging = QL_DBG_DEFAULT1_MASK;</div><div class='ctx'> 	ha-&gt;flags.disable_risc_code_load = ((nv-&gt;host_p[0] &amp; BIT_4) ? 1 : 0);</div><div class='ctx'> 	/* Always load RISC code on non ISP2[12]00 chips. */</div><div class='ctx'> 	if (!IS_QLA2100(ha) &amp;&amp; !IS_QLA2200(ha))</div><div class='hunk'>@@ -4188,7 +4187,8 @@ qla2x00_abort_isp(scsi_qla_host_t *vha)</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ha-&gt;vport_slock, flags);</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x8023, "%s **** FAILED ****.\n");</div><div class='add'>+		ql_log(ql_log_warn, vha, 0x8023, "%s **** FAILED ****.\n",</div><div class='add'>+		       __func__);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return(status);</div><div class='hunk'>@@ -4638,7 +4638,7 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr,</div><div class='ctx'> 	struct req_que *req = ha-&gt;req_q_map[0];</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_init, vha, 0x008b,</div><div class='del'>-	    "Loading firmware from flash (%x).\n", faddr);</div><div class='add'>+	    "FW: Loading firmware from flash (%x).\n", faddr);</div><div class='ctx'> </div><div class='ctx'> 	rval = QLA_SUCCESS;</div><div class='ctx'> </div><div class='hunk'>@@ -4836,8 +4836,8 @@ qla24xx_load_risc_blob(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'>-	ql_log(ql_log_info, vha, 0x0092,</div><div class='del'>-	    "Loading via request-firmware.\n");</div><div class='add'>+	ql_dbg(ql_dbg_init, vha, 0x0092,</div><div class='add'>+	    "FW: Loading via request-firmware.\n");</div><div class='ctx'> </div><div class='ctx'> 	rval = QLA_SUCCESS;</div><div class='ctx'> </div><div class='hunk'>@@ -5425,7 +5425,7 @@ qla82xx_restart_isp(scsi_qla_host_t *vha)</div><div class='ctx'> 		if ((vha-&gt;device_flags &amp; DFLG_NO_CABLE))</div><div class='ctx'> 			status = 0;</div><div class='ctx'> </div><div class='del'>-		ql_log(ql_log_info, vha, 0x803d,</div><div class='add'>+		ql_log(ql_log_info, vha, 0x8000,</div><div class='ctx'> 		    "Configure loop done, status = 0x%x.\n", status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5458,7 +5458,7 @@ qla82xx_restart_isp(scsi_qla_host_t *vha)</div><div class='ctx'> 			    ha-&gt;fce_dma, ha-&gt;fce_bufs, ha-&gt;fce_mb,</div><div class='ctx'> 			    &amp;ha-&gt;fce_bufs);</div><div class='ctx'> 			if (rval) {</div><div class='del'>-				ql_log(ql_log_warn, vha, 0x803e,</div><div class='add'>+				ql_log(ql_log_warn, vha, 0x8001,</div><div class='ctx'> 				    "Unable to reinitialize FCE (%d).\n",</div><div class='ctx'> 				    rval);</div><div class='ctx'> 				ha-&gt;flags.fce_enabled = 0;</div><div class='hunk'>@@ -5470,7 +5470,7 @@ qla82xx_restart_isp(scsi_qla_host_t *vha)</div><div class='ctx'> 			rval = qla2x00_enable_eft_trace(vha,</div><div class='ctx'> 			    ha-&gt;eft_dma, EFT_NUM_BUFFERS);</div><div class='ctx'> 			if (rval) {</div><div class='del'>-				ql_log(ql_log_warn, vha, 0x803f,</div><div class='add'>+				ql_log(ql_log_warn, vha, 0x8010,</div><div class='ctx'> 				    "Unable to reinitialize EFT (%d).\n",</div><div class='ctx'> 				    rval);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -5478,7 +5478,7 @@ qla82xx_restart_isp(scsi_qla_host_t *vha)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!status) {</div><div class='del'>-		ql_dbg(ql_dbg_taskm, vha, 0x8040,</div><div class='add'>+		ql_dbg(ql_dbg_taskm, vha, 0x8011,</div><div class='ctx'> 		    "qla82xx_restart_isp succeeded.\n");</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irqsave(&amp;ha-&gt;vport_slock, flags);</div><div class='hunk'>@@ -5496,7 +5496,7 @@ qla82xx_restart_isp(scsi_qla_host_t *vha)</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ha-&gt;vport_slock, flags);</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x8041,</div><div class='add'>+		ql_log(ql_log_warn, vha, 0x8016,</div><div class='ctx'> 		    "qla82xx_restart_isp **** FAILED ****.\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5643,13 +5643,26 @@ qla24xx_update_fcport_fcp_prio(scsi_qla_host_t *vha, fc_port_t *fcport)</div><div class='ctx'> 	if (priority &lt; 0)</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> </div><div class='add'>+	if (IS_QLA82XX(vha-&gt;hw)) {</div><div class='add'>+		fcport-&gt;fcp_prio = priority &amp; 0xf;</div><div class='add'>+		return QLA_SUCCESS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = qla24xx_set_fcp_prio(vha, fcport-&gt;loop_id, priority, mb);</div><div class='del'>-	if (ret == QLA_SUCCESS)</div><div class='del'>-		fcport-&gt;fcp_prio = priority;</div><div class='del'>-	else</div><div class='add'>+	if (ret == QLA_SUCCESS) {</div><div class='add'>+		if (fcport-&gt;fcp_prio != priority)</div><div class='add'>+			ql_dbg(ql_dbg_user, vha, 0x709e,</div><div class='add'>+			    "Updated FCP_CMND priority - value=%d loop_id=%d "</div><div class='add'>+			    "port_id=%02x%02x%02x.\n", priority,</div><div class='add'>+			    fcport-&gt;loop_id, 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'>+		fcport-&gt;fcp_prio = priority &amp; 0xf;</div><div class='add'>+	} else</div><div class='ctx'> 		ql_dbg(ql_dbg_user, vha, 0x704f,</div><div class='del'>-		    "Unable to activate fcp priority, ret=0x%x.\n", ret);</div><div class='del'>-</div><div class='add'>+		    "Unable to update FCP_CMND priority - ret=0x%x for "</div><div class='add'>+		    "loop_id=%d port_id=%02x%02x%02x.\n", ret, fcport-&gt;loop_id,</div><div class='add'>+		    fcport-&gt;d_id.b.domain, fcport-&gt;d_id.b.area,</div><div class='add'>+		    fcport-&gt;d_id.b.al_pa);</div><div class='ctx'> 	return  ret;</div><div class='ctx'> }</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 a4b267e60a35..55a96761b5a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_iocb.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_iocb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_iocb.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla2xxx/qla_iocb.c</a></div><div class='hunk'>@@ -11,8 +11,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;scsi/scsi_tcq.h&gt;</div><div class='ctx'> </div><div class='del'>-static void qla2x00_isp_cmd(struct scsi_qla_host *, struct req_que *);</div><div class='del'>-</div><div class='ctx'> static void qla25xx_set_que(srb_t *, struct rsp_que **);</div><div class='ctx'> /**</div><div class='ctx'>  * qla2x00_get_cmd_direction() - Determine control_flag data direction.</div><div class='hunk'>@@ -468,6 +466,42 @@ queuing_error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * qla2x00_start_iocbs() - Execute the IOCB command</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+qla2x00_start_iocbs(struct scsi_qla_host *vha, struct req_que *req)</div><div class='add'>+{</div><div class='add'>+	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	device_reg_t __iomem *reg = ISP_QUE_REG(ha, req-&gt;id);</div><div class='add'>+	struct device_reg_2xxx __iomem *ioreg = &amp;ha-&gt;iobase-&gt;isp;</div><div class='add'>+</div><div class='add'>+	if (IS_QLA82XX(ha)) {</div><div class='add'>+		qla82xx_start_iocbs(vha);</div><div class='add'>+	} else {</div><div class='add'>+		/* Adjust ring index. */</div><div class='add'>+		req-&gt;ring_index++;</div><div class='add'>+		if (req-&gt;ring_index == req-&gt;length) {</div><div class='add'>+			req-&gt;ring_index = 0;</div><div class='add'>+			req-&gt;ring_ptr = req-&gt;ring;</div><div class='add'>+		} else</div><div class='add'>+			req-&gt;ring_ptr++;</div><div class='add'>+</div><div class='add'>+		/* Set chip new ring index. */</div><div class='add'>+		if (ha-&gt;mqenable) {</div><div class='add'>+			WRT_REG_DWORD(&amp;reg-&gt;isp25mq.req_q_in, req-&gt;ring_index);</div><div class='add'>+			RD_REG_DWORD(&amp;ioreg-&gt;hccr);</div><div class='add'>+		} else if (IS_FWI2_CAPABLE(ha)) {</div><div class='add'>+			WRT_REG_DWORD(&amp;reg-&gt;isp24.req_q_in, req-&gt;ring_index);</div><div class='add'>+			RD_REG_DWORD_RELAXED(&amp;reg-&gt;isp24.req_q_in);</div><div class='add'>+		} else {</div><div class='add'>+			WRT_REG_WORD(ISP_REQ_Q_IN(ha, &amp;reg-&gt;isp),</div><div class='add'>+				req-&gt;ring_index);</div><div class='add'>+			RD_REG_WORD_RELAXED(ISP_REQ_Q_IN(ha, &amp;reg-&gt;isp));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * qla2x00_marker() - Send a marker IOCB to the firmware.</div><div class='ctx'>  * @ha: HA context</div><div class='ctx'>  * @loop_id: loop ID</div><div class='hunk'>@@ -489,6 +523,7 @@ __qla2x00_marker(struct scsi_qla_host *vha, struct req_que *req,</div><div class='ctx'> 	scsi_qla_host_t *base_vha = pci_get_drvdata(ha-&gt;pdev);</div><div class='ctx'> </div><div class='ctx'> 	mrk24 = NULL;</div><div class='add'>+	req = ha-&gt;req_q_map[0];</div><div class='ctx'> 	mrk = (mrk_entry_t *)qla2x00_alloc_iocbs(vha, 0);</div><div class='ctx'> 	if (mrk == NULL) {</div><div class='ctx'> 		ql_log(ql_log_warn, base_vha, 0x3026,</div><div class='hunk'>@@ -515,7 +550,7 @@ __qla2x00_marker(struct scsi_qla_host *vha, struct req_que *req,</div><div class='ctx'> 	}</div><div class='ctx'> 	wmb();</div><div class='ctx'> </div><div class='del'>-	qla2x00_isp_cmd(vha, req);</div><div class='add'>+	qla2x00_start_iocbs(vha, req);</div><div class='ctx'> </div><div class='ctx'> 	return (QLA_SUCCESS);</div><div class='ctx'> }</div><div class='hunk'>@@ -536,89 +571,140 @@ qla2x00_marker(struct scsi_qla_host *vha, struct req_que *req,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * qla2x00_isp_cmd() - Modify the request ring pointer.</div><div class='del'>- * @ha: HA context</div><div class='add'>+ * qla24xx_calc_iocbs() - Determine number of Command Type 3 and</div><div class='add'>+ * Continuation Type 1 IOCBs to allocate.</div><div class='add'>+ *</div><div class='add'>+ * @dsds: number of data segment decriptors needed</div><div class='ctx'>  *</div><div class='del'>- * Note: The caller must hold the hardware lock before calling this routine.</div><div class='add'>+ * Returns the number of IOCB entries needed to store @dsds.</div><div class='ctx'>  */</div><div class='del'>-static void</div><div class='del'>-qla2x00_isp_cmd(struct scsi_qla_host *vha, struct req_que *req)</div><div class='add'>+inline uint16_t</div><div class='add'>+qla24xx_calc_iocbs(scsi_qla_host_t *vha, uint16_t dsds)</div><div class='ctx'> {</div><div class='del'>-	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='del'>-	device_reg_t __iomem *reg = ISP_QUE_REG(ha, req-&gt;id);</div><div class='del'>-	struct device_reg_2xxx __iomem *ioreg = &amp;ha-&gt;iobase-&gt;isp;</div><div class='add'>+	uint16_t iocbs;</div><div class='ctx'> </div><div class='del'>-	ql_dbg(ql_dbg_io + ql_dbg_buffer, vha, 0x302d,</div><div class='del'>-	    "IOCB data:\n");</div><div class='del'>-	ql_dump_buffer(ql_dbg_io + ql_dbg_buffer, vha, 0x302e,</div><div class='del'>-	    (uint8_t *)req-&gt;ring_ptr, REQUEST_ENTRY_SIZE);</div><div class='add'>+	iocbs = 1;</div><div class='add'>+	if (dsds &gt; 1) {</div><div class='add'>+		iocbs += (dsds - 1) / 5;</div><div class='add'>+		if ((dsds - 1) % 5)</div><div class='add'>+			iocbs++;</div><div class='add'>+	}</div><div class='add'>+	return iocbs;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Adjust ring index. */</div><div class='del'>-	req-&gt;ring_index++;</div><div class='del'>-	if (req-&gt;ring_index == req-&gt;length) {</div><div class='del'>-		req-&gt;ring_index = 0;</div><div class='del'>-		req-&gt;ring_ptr = req-&gt;ring;</div><div class='del'>-	} else</div><div class='del'>-		req-&gt;ring_ptr++;</div><div class='add'>+static inline int</div><div class='add'>+qla24xx_build_scsi_type_6_iocbs(srb_t *sp, struct cmd_type_6 *cmd_pkt,</div><div class='add'>+	uint16_t tot_dsds)</div><div class='add'>+{</div><div class='add'>+	uint32_t *cur_dsd = NULL;</div><div class='add'>+	scsi_qla_host_t	*vha;</div><div class='add'>+	struct qla_hw_data *ha;</div><div class='add'>+	struct scsi_cmnd *cmd;</div><div class='add'>+	struct	scatterlist *cur_seg;</div><div class='add'>+	uint32_t *dsd_seg;</div><div class='add'>+	void *next_dsd;</div><div class='add'>+	uint8_t avail_dsds;</div><div class='add'>+	uint8_t first_iocb = 1;</div><div class='add'>+	uint32_t dsd_list_len;</div><div class='add'>+	struct dsd_dma *dsd_ptr;</div><div class='add'>+	struct ct6_dsd *ctx;</div><div class='ctx'> </div><div class='del'>-	/* Set chip new ring index. */</div><div class='del'>-	if (IS_QLA82XX(ha)) {</div><div class='del'>-		uint32_t dbval = 0x04 | (ha-&gt;portnum &lt;&lt; 5);</div><div class='add'>+	cmd = sp-&gt;cmd;</div><div class='ctx'> </div><div class='del'>-		/* write, read and verify logic */</div><div class='del'>-		dbval = dbval | (req-&gt;id &lt;&lt; 8) | (req-&gt;ring_index &lt;&lt; 16);</div><div class='del'>-		if (ql2xdbwr)</div><div class='del'>-			qla82xx_wr_32(ha, ha-&gt;nxdb_wr_ptr, dbval);</div><div class='del'>-		else {</div><div class='del'>-			WRT_REG_DWORD(</div><div class='del'>-				(unsigned long __iomem *)ha-&gt;nxdb_wr_ptr,</div><div class='del'>-				dbval);</div><div class='del'>-			wmb();</div><div class='del'>-			while (RD_REG_DWORD(ha-&gt;nxdb_rd_ptr) != dbval) {</div><div class='del'>-				WRT_REG_DWORD((unsigned long __iomem *)</div><div class='del'>-					ha-&gt;nxdb_wr_ptr, dbval);</div><div class='del'>-				wmb();</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (ha-&gt;mqenable) {</div><div class='del'>-		/* Set chip new ring index. */</div><div class='del'>-		WRT_REG_DWORD(&amp;reg-&gt;isp25mq.req_q_in, req-&gt;ring_index);</div><div class='del'>-		RD_REG_DWORD(&amp;ioreg-&gt;hccr);</div><div class='del'>-	} else {</div><div class='del'>-		if (IS_FWI2_CAPABLE(ha)) {</div><div class='del'>-			WRT_REG_DWORD(&amp;reg-&gt;isp24.req_q_in, req-&gt;ring_index);</div><div class='del'>-			RD_REG_DWORD_RELAXED(&amp;reg-&gt;isp24.req_q_in);</div><div class='add'>+	/* Update entry type to indicate Command Type 3 IOCB */</div><div class='add'>+	*((uint32_t *)(&amp;cmd_pkt-&gt;entry_type)) =</div><div class='add'>+		__constant_cpu_to_le32(COMMAND_TYPE_6);</div><div class='add'>+</div><div class='add'>+	/* No data transfer */</div><div class='add'>+	if (!scsi_bufflen(cmd) || cmd-&gt;sc_data_direction == DMA_NONE) {</div><div class='add'>+		cmd_pkt-&gt;byte_count = __constant_cpu_to_le32(0);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vha = sp-&gt;fcport-&gt;vha;</div><div class='add'>+	ha = vha-&gt;hw;</div><div class='add'>+</div><div class='add'>+	/* Set transfer direction */</div><div class='add'>+	if (cmd-&gt;sc_data_direction == DMA_TO_DEVICE) {</div><div class='add'>+		cmd_pkt-&gt;control_flags =</div><div class='add'>+		    __constant_cpu_to_le16(CF_WRITE_DATA);</div><div class='add'>+		ha-&gt;qla_stats.output_bytes += scsi_bufflen(cmd);</div><div class='add'>+	} else if (cmd-&gt;sc_data_direction == DMA_FROM_DEVICE) {</div><div class='add'>+		cmd_pkt-&gt;control_flags =</div><div class='add'>+		    __constant_cpu_to_le16(CF_READ_DATA);</div><div class='add'>+		ha-&gt;qla_stats.input_bytes += scsi_bufflen(cmd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cur_seg = scsi_sglist(cmd);</div><div class='add'>+	ctx = sp-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	while (tot_dsds) {</div><div class='add'>+		avail_dsds = (tot_dsds &gt; QLA_DSDS_PER_IOCB) ?</div><div class='add'>+		    QLA_DSDS_PER_IOCB : tot_dsds;</div><div class='add'>+		tot_dsds -= avail_dsds;</div><div class='add'>+		dsd_list_len = (avail_dsds + 1) * QLA_DSD_SIZE;</div><div class='add'>+</div><div class='add'>+		dsd_ptr = list_first_entry(&amp;ha-&gt;gbl_dsd_list,</div><div class='add'>+		    struct dsd_dma, list);</div><div class='add'>+		next_dsd = dsd_ptr-&gt;dsd_addr;</div><div class='add'>+		list_del(&amp;dsd_ptr-&gt;list);</div><div class='add'>+		ha-&gt;gbl_dsd_avail--;</div><div class='add'>+		list_add_tail(&amp;dsd_ptr-&gt;list, &amp;ctx-&gt;dsd_list);</div><div class='add'>+		ctx-&gt;dsd_use_cnt++;</div><div class='add'>+		ha-&gt;gbl_dsd_inuse++;</div><div class='add'>+</div><div class='add'>+		if (first_iocb) {</div><div class='add'>+			first_iocb = 0;</div><div class='add'>+			dsd_seg = (uint32_t *)&amp;cmd_pkt-&gt;fcp_data_dseg_address;</div><div class='add'>+			*dsd_seg++ = cpu_to_le32(LSD(dsd_ptr-&gt;dsd_list_dma));</div><div class='add'>+			*dsd_seg++ = cpu_to_le32(MSD(dsd_ptr-&gt;dsd_list_dma));</div><div class='add'>+			cmd_pkt-&gt;fcp_data_dseg_len = cpu_to_le32(dsd_list_len);</div><div class='ctx'> 		} else {</div><div class='del'>-			WRT_REG_WORD(ISP_REQ_Q_IN(ha, &amp;reg-&gt;isp),</div><div class='del'>-				req-&gt;ring_index);</div><div class='del'>-			RD_REG_WORD_RELAXED(ISP_REQ_Q_IN(ha, &amp;reg-&gt;isp));</div><div class='add'>+			*cur_dsd++ = cpu_to_le32(LSD(dsd_ptr-&gt;dsd_list_dma));</div><div class='add'>+			*cur_dsd++ = cpu_to_le32(MSD(dsd_ptr-&gt;dsd_list_dma));</div><div class='add'>+			*cur_dsd++ = cpu_to_le32(dsd_list_len);</div><div class='add'>+		}</div><div class='add'>+		cur_dsd = (uint32_t *)next_dsd;</div><div class='add'>+		while (avail_dsds) {</div><div class='add'>+			dma_addr_t	sle_dma;</div><div class='add'>+</div><div class='add'>+			sle_dma = sg_dma_address(cur_seg);</div><div class='add'>+			*cur_dsd++ = cpu_to_le32(LSD(sle_dma));</div><div class='add'>+			*cur_dsd++ = cpu_to_le32(MSD(sle_dma));</div><div class='add'>+			*cur_dsd++ = cpu_to_le32(sg_dma_len(cur_seg));</div><div class='add'>+			cur_seg = sg_next(cur_seg);</div><div class='add'>+			avail_dsds--;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Null termination */</div><div class='add'>+	*cur_dsd++ =  0;</div><div class='add'>+	*cur_dsd++ = 0;</div><div class='add'>+	*cur_dsd++ = 0;</div><div class='add'>+	cmd_pkt-&gt;control_flags |= CF_DATA_SEG_DESCR_ENABLE;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * qla24xx_calc_iocbs() - Determine number of Command Type 3 and</div><div class='del'>- * Continuation Type 1 IOCBs to allocate.</div><div class='add'>+/*</div><div class='add'>+ * qla24xx_calc_dsd_lists() - Determine number of DSD list required</div><div class='add'>+ * for Command Type 6.</div><div class='ctx'>  *</div><div class='ctx'>  * @dsds: number of data segment decriptors needed</div><div class='ctx'>  *</div><div class='del'>- * Returns the number of IOCB entries needed to store @dsds.</div><div class='add'>+ * Returns the number of dsd list needed to store @dsds.</div><div class='ctx'>  */</div><div class='ctx'> inline uint16_t</div><div class='del'>-qla24xx_calc_iocbs(scsi_qla_host_t *vha, uint16_t dsds)</div><div class='add'>+qla24xx_calc_dsd_lists(uint16_t dsds)</div><div class='ctx'> {</div><div class='del'>-	uint16_t iocbs;</div><div class='add'>+	uint16_t dsd_lists = 0;</div><div class='ctx'> </div><div class='del'>-	iocbs = 1;</div><div class='del'>-	if (dsds &gt; 1) {</div><div class='del'>-		iocbs += (dsds - 1) / 5;</div><div class='del'>-		if ((dsds - 1) % 5)</div><div class='del'>-			iocbs++;</div><div class='del'>-	}</div><div class='del'>-	return iocbs;</div><div class='add'>+	dsd_lists = (dsds/QLA_DSDS_PER_IOCB);</div><div class='add'>+	if (dsds % QLA_DSDS_PER_IOCB)</div><div class='add'>+		dsd_lists++;</div><div class='add'>+	return dsd_lists;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * qla24xx_build_scsi_iocbs() - Build IOCB command utilizing Command Type 7</div><div class='ctx'>  * IOCB types.</div><div class='hunk'>@@ -945,6 +1031,7 @@ alloc_and_fill:</div><div class='ctx'> 	*cur_dsd++ = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> qla24xx_walk_and_build_sglist(struct qla_hw_data *ha, srb_t *sp, uint32_t *dsd,</div><div class='ctx'> 	uint16_t tot_dsds)</div><div class='hunk'>@@ -1004,7 +1091,7 @@ qla24xx_walk_and_build_sglist(struct qla_hw_data *ha, srb_t *sp, uint32_t *dsd,</div><div class='ctx'> 		sle_dma = sg_dma_address(sg);</div><div class='ctx'> 		ql_dbg(ql_dbg_io, vha, 0x300a,</div><div class='ctx'> 		    "sg entry %d - addr=0x%x 0x%x, " "len=%d for cmd=%p.\n",</div><div class='del'>-		    cur_dsd, i, LSD(sle_dma), MSD(sle_dma), sg_dma_len(sg),</div><div class='add'>+		    i, LSD(sle_dma), MSD(sle_dma), sg_dma_len(sg),</div><div class='ctx'> 		    sp-&gt;cmd);</div><div class='ctx'> 		*cur_dsd++ = cpu_to_le32(LSD(sle_dma));</div><div class='ctx'> 		*cur_dsd++ = cpu_to_le32(MSD(sle_dma));</div><div class='hunk'>@@ -1731,6 +1818,7 @@ qla2x00_alloc_iocbs(scsi_qla_host_t *vha, srb_t *sp)</div><div class='ctx'> 	uint32_t index, handle;</div><div class='ctx'> 	request_t *pkt;</div><div class='ctx'> 	uint16_t cnt, req_cnt;</div><div class='add'>+	struct srb_ctx *ctx;</div><div class='ctx'> </div><div class='ctx'> 	pkt = NULL;</div><div class='ctx'> 	req_cnt = 1;</div><div class='hunk'>@@ -1759,6 +1847,12 @@ qla2x00_alloc_iocbs(scsi_qla_host_t *vha, srb_t *sp)</div><div class='ctx'> 	req-&gt;outstanding_cmds[handle] = sp;</div><div class='ctx'> 	sp-&gt;handle = handle;</div><div class='ctx'> </div><div class='add'>+	/* Adjust entry-counts as needed. */</div><div class='add'>+	if (sp-&gt;ctx) {</div><div class='add'>+		ctx = sp-&gt;ctx;</div><div class='add'>+		req_cnt = ctx-&gt;iocbs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> skip_cmd_array:</div><div class='ctx'> 	/* Check for room on request queue. */</div><div class='ctx'> 	if (req-&gt;cnt &lt; req_cnt) {</div><div class='hunk'>@@ -1793,42 +1887,6 @@ queuing_error:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-qla2x00_start_iocbs(srb_t *sp)</div><div class='del'>-{</div><div class='del'>-	struct qla_hw_data *ha = sp-&gt;fcport-&gt;vha-&gt;hw;</div><div class='del'>-	struct req_que *req = ha-&gt;req_q_map[0];</div><div class='del'>-	device_reg_t __iomem *reg = ISP_QUE_REG(ha, req-&gt;id);</div><div class='del'>-	struct device_reg_2xxx __iomem *ioreg = &amp;ha-&gt;iobase-&gt;isp;</div><div class='del'>-</div><div class='del'>-	if (IS_QLA82XX(ha)) {</div><div class='del'>-		qla82xx_start_iocbs(sp);</div><div class='del'>-	} else {</div><div class='del'>-		/* Adjust ring index. */</div><div class='del'>-		req-&gt;ring_index++;</div><div class='del'>-		if (req-&gt;ring_index == req-&gt;length) {</div><div class='del'>-			req-&gt;ring_index = 0;</div><div class='del'>-			req-&gt;ring_ptr = req-&gt;ring;</div><div class='del'>-		} else</div><div class='del'>-			req-&gt;ring_ptr++;</div><div class='del'>-</div><div class='del'>-		/* Set chip new ring index. */</div><div class='del'>-		if (ha-&gt;mqenable) {</div><div class='del'>-			WRT_REG_DWORD(&amp;reg-&gt;isp25mq.req_q_in, req-&gt;ring_index);</div><div class='del'>-			RD_REG_DWORD(&amp;ioreg-&gt;hccr);</div><div class='del'>-		} else if (IS_QLA82XX(ha)) {</div><div class='del'>-			qla82xx_start_iocbs(sp);</div><div class='del'>-		} else if (IS_FWI2_CAPABLE(ha)) {</div><div class='del'>-			WRT_REG_DWORD(&amp;reg-&gt;isp24.req_q_in, req-&gt;ring_index);</div><div class='del'>-			RD_REG_DWORD_RELAXED(&amp;reg-&gt;isp24.req_q_in);</div><div class='del'>-		} else {</div><div class='del'>-			WRT_REG_WORD(ISP_REQ_Q_IN(ha, &amp;reg-&gt;isp),</div><div class='del'>-				req-&gt;ring_index);</div><div class='del'>-			RD_REG_WORD_RELAXED(ISP_REQ_Q_IN(ha, &amp;reg-&gt;isp));</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='ctx'> qla24xx_login_iocb(srb_t *sp, struct logio_entry_24xx *logio)</div><div class='ctx'> {</div><div class='ctx'> 	struct srb_ctx *ctx = sp-&gt;ctx;</div><div class='hunk'>@@ -2160,6 +2218,381 @@ qla24xx_ct_iocb(srb_t *sp, struct ct_entry_24xx *ct_iocb)</div><div class='ctx'>         ct_iocb-&gt;entry_count = entry_count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * qla82xx_start_scsi() - Send a SCSI command to the ISP</div><div class='add'>+ * @sp: command to send to the ISP</div><div class='add'>+ *</div><div class='add'>+ * Returns non-zero if a failure occurred, else zero.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+qla82xx_start_scsi(srb_t *sp)</div><div class='add'>+{</div><div class='add'>+	int		ret, nseg;</div><div class='add'>+	unsigned long   flags;</div><div class='add'>+	struct scsi_cmnd *cmd;</div><div class='add'>+	uint32_t	*clr_ptr;</div><div class='add'>+	uint32_t        index;</div><div class='add'>+	uint32_t	handle;</div><div class='add'>+	uint16_t	cnt;</div><div class='add'>+	uint16_t	req_cnt;</div><div class='add'>+	uint16_t	tot_dsds;</div><div class='add'>+	struct device_reg_82xx __iomem *reg;</div><div class='add'>+	uint32_t dbval;</div><div class='add'>+	uint32_t *fcp_dl;</div><div class='add'>+	uint8_t additional_cdb_len;</div><div class='add'>+	struct ct6_dsd *ctx;</div><div class='add'>+	struct scsi_qla_host *vha = sp-&gt;fcport-&gt;vha;</div><div class='add'>+	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	struct req_que *req = NULL;</div><div class='add'>+	struct rsp_que *rsp = NULL;</div><div class='add'>+	char		tag[2];</div><div class='add'>+</div><div class='add'>+	/* Setup device pointers. */</div><div class='add'>+	ret = 0;</div><div class='add'>+	reg = &amp;ha-&gt;iobase-&gt;isp82;</div><div class='add'>+	cmd = sp-&gt;cmd;</div><div class='add'>+	req = vha-&gt;req;</div><div class='add'>+	rsp = ha-&gt;rsp_q_map[0];</div><div class='add'>+</div><div class='add'>+	/* So we know we haven't pci_map'ed anything yet */</div><div class='add'>+	tot_dsds = 0;</div><div class='add'>+</div><div class='add'>+	dbval = 0x04 | (ha-&gt;portnum &lt;&lt; 5);</div><div class='add'>+</div><div class='add'>+	/* Send marker if required */</div><div class='add'>+	if (vha-&gt;marker_needed != 0) {</div><div class='add'>+		if (qla2x00_marker(vha, req,</div><div class='add'>+			rsp, 0, 0, MK_SYNC_ALL) != QLA_SUCCESS) {</div><div class='add'>+			ql_log(ql_log_warn, vha, 0x300c,</div><div class='add'>+			    "qla2x00_marker failed for cmd=%p.\n", cmd);</div><div class='add'>+			return QLA_FUNCTION_FAILED;</div><div class='add'>+		}</div><div class='add'>+		vha-&gt;marker_needed = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Acquire ring specific lock */</div><div class='add'>+	spin_lock_irqsave(&amp;ha-&gt;hardware_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Check for room in outstanding command list. */</div><div class='add'>+	handle = req-&gt;current_outstanding_cmd;</div><div class='add'>+	for (index = 1; index &lt; MAX_OUTSTANDING_COMMANDS; index++) {</div><div class='add'>+		handle++;</div><div class='add'>+		if (handle == MAX_OUTSTANDING_COMMANDS)</div><div class='add'>+			handle = 1;</div><div class='add'>+		if (!req-&gt;outstanding_cmds[handle])</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (index == MAX_OUTSTANDING_COMMANDS)</div><div class='add'>+		goto queuing_error;</div><div class='add'>+</div><div class='add'>+	/* Map the sg table so we have an accurate count of sg entries needed */</div><div class='add'>+	if (scsi_sg_count(cmd)) {</div><div class='add'>+		nseg = dma_map_sg(&amp;ha-&gt;pdev-&gt;dev, scsi_sglist(cmd),</div><div class='add'>+		    scsi_sg_count(cmd), cmd-&gt;sc_data_direction);</div><div class='add'>+		if (unlikely(!nseg))</div><div class='add'>+			goto queuing_error;</div><div class='add'>+	} else</div><div class='add'>+		nseg = 0;</div><div class='add'>+</div><div class='add'>+	tot_dsds = nseg;</div><div class='add'>+</div><div class='add'>+	if (tot_dsds &gt; ql2xshiftctondsd) {</div><div class='add'>+		struct cmd_type_6 *cmd_pkt;</div><div class='add'>+		uint16_t more_dsd_lists = 0;</div><div class='add'>+		struct dsd_dma *dsd_ptr;</div><div class='add'>+		uint16_t i;</div><div class='add'>+</div><div class='add'>+		more_dsd_lists = qla24xx_calc_dsd_lists(tot_dsds);</div><div class='add'>+		if ((more_dsd_lists + ha-&gt;gbl_dsd_inuse) &gt;= NUM_DSD_CHAIN) {</div><div class='add'>+			ql_dbg(ql_dbg_io, vha, 0x300d,</div><div class='add'>+			    "Num of DSD list %d is than %d for cmd=%p.\n",</div><div class='add'>+			    more_dsd_lists + ha-&gt;gbl_dsd_inuse, NUM_DSD_CHAIN,</div><div class='add'>+			    cmd);</div><div class='add'>+			goto queuing_error;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (more_dsd_lists &lt;= ha-&gt;gbl_dsd_avail)</div><div class='add'>+			goto sufficient_dsds;</div><div class='add'>+		else</div><div class='add'>+			more_dsd_lists -= ha-&gt;gbl_dsd_avail;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; more_dsd_lists; i++) {</div><div class='add'>+			dsd_ptr = kzalloc(sizeof(struct dsd_dma), GFP_ATOMIC);</div><div class='add'>+			if (!dsd_ptr) {</div><div class='add'>+				ql_log(ql_log_fatal, vha, 0x300e,</div><div class='add'>+				    "Failed to allocate memory for dsd_dma "</div><div class='add'>+				    "for cmd=%p.\n", cmd);</div><div class='add'>+				goto queuing_error;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			dsd_ptr-&gt;dsd_addr = dma_pool_alloc(ha-&gt;dl_dma_pool,</div><div class='add'>+				GFP_ATOMIC, &amp;dsd_ptr-&gt;dsd_list_dma);</div><div class='add'>+			if (!dsd_ptr-&gt;dsd_addr) {</div><div class='add'>+				kfree(dsd_ptr);</div><div class='add'>+				ql_log(ql_log_fatal, vha, 0x300f,</div><div class='add'>+				    "Failed to allocate memory for dsd_addr "</div><div class='add'>+				    "for cmd=%p.\n", cmd);</div><div class='add'>+				goto queuing_error;</div><div class='add'>+			}</div><div class='add'>+			list_add_tail(&amp;dsd_ptr-&gt;list, &amp;ha-&gt;gbl_dsd_list);</div><div class='add'>+			ha-&gt;gbl_dsd_avail++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+sufficient_dsds:</div><div class='add'>+		req_cnt = 1;</div><div class='add'>+</div><div class='add'>+		if (req-&gt;cnt &lt; (req_cnt + 2)) {</div><div class='add'>+			cnt = (uint16_t)RD_REG_DWORD_RELAXED(</div><div class='add'>+				&amp;reg-&gt;req_q_out[0]);</div><div class='add'>+			if (req-&gt;ring_index &lt; cnt)</div><div class='add'>+				req-&gt;cnt = cnt - req-&gt;ring_index;</div><div class='add'>+			else</div><div class='add'>+				req-&gt;cnt = req-&gt;length -</div><div class='add'>+					(req-&gt;ring_index - cnt);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (req-&gt;cnt &lt; (req_cnt + 2))</div><div class='add'>+			goto queuing_error;</div><div class='add'>+</div><div class='add'>+		ctx = sp-&gt;ctx = mempool_alloc(ha-&gt;ctx_mempool, GFP_ATOMIC);</div><div class='add'>+		if (!sp-&gt;ctx) {</div><div class='add'>+			ql_log(ql_log_fatal, vha, 0x3010,</div><div class='add'>+			    "Failed to allocate ctx for cmd=%p.\n", cmd);</div><div class='add'>+			goto queuing_error;</div><div class='add'>+		}</div><div class='add'>+		memset(ctx, 0, sizeof(struct ct6_dsd));</div><div class='add'>+		ctx-&gt;fcp_cmnd = dma_pool_alloc(ha-&gt;fcp_cmnd_dma_pool,</div><div class='add'>+			GFP_ATOMIC, &amp;ctx-&gt;fcp_cmnd_dma);</div><div class='add'>+		if (!ctx-&gt;fcp_cmnd) {</div><div class='add'>+			ql_log(ql_log_fatal, vha, 0x3011,</div><div class='add'>+			    "Failed to allocate fcp_cmnd for cmd=%p.\n", cmd);</div><div class='add'>+			goto queuing_error_fcp_cmnd;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Initialize the DSD list and dma handle */</div><div class='add'>+		INIT_LIST_HEAD(&amp;ctx-&gt;dsd_list);</div><div class='add'>+		ctx-&gt;dsd_use_cnt = 0;</div><div class='add'>+</div><div class='add'>+		if (cmd-&gt;cmd_len &gt; 16) {</div><div class='add'>+			additional_cdb_len = cmd-&gt;cmd_len - 16;</div><div class='add'>+			if ((cmd-&gt;cmd_len % 4) != 0) {</div><div class='add'>+				/* SCSI command bigger than 16 bytes must be</div><div class='add'>+				 * multiple of 4</div><div class='add'>+				 */</div><div class='add'>+				ql_log(ql_log_warn, vha, 0x3012,</div><div class='add'>+				    "scsi cmd len %d not multiple of 4 "</div><div class='add'>+				    "for cmd=%p.\n", cmd-&gt;cmd_len, cmd);</div><div class='add'>+				goto queuing_error_fcp_cmnd;</div><div class='add'>+			}</div><div class='add'>+			ctx-&gt;fcp_cmnd_len = 12 + cmd-&gt;cmd_len + 4;</div><div class='add'>+		} else {</div><div class='add'>+			additional_cdb_len = 0;</div><div class='add'>+			ctx-&gt;fcp_cmnd_len = 12 + 16 + 4;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cmd_pkt = (struct cmd_type_6 *)req-&gt;ring_ptr;</div><div class='add'>+		cmd_pkt-&gt;handle = MAKE_HANDLE(req-&gt;id, handle);</div><div class='add'>+</div><div class='add'>+		/* Zero out remaining portion of packet. */</div><div class='add'>+		/*    tagged queuing modifier -- default is TSK_SIMPLE (0). */</div><div class='add'>+		clr_ptr = (uint32_t *)cmd_pkt + 2;</div><div class='add'>+		memset(clr_ptr, 0, REQUEST_ENTRY_SIZE - 8);</div><div class='add'>+		cmd_pkt-&gt;dseg_count = cpu_to_le16(tot_dsds);</div><div class='add'>+</div><div class='add'>+		/* Set NPORT-ID and LUN number*/</div><div class='add'>+		cmd_pkt-&gt;nport_handle = cpu_to_le16(sp-&gt;fcport-&gt;loop_id);</div><div class='add'>+		cmd_pkt-&gt;port_id[0] = sp-&gt;fcport-&gt;d_id.b.al_pa;</div><div class='add'>+		cmd_pkt-&gt;port_id[1] = sp-&gt;fcport-&gt;d_id.b.area;</div><div class='add'>+		cmd_pkt-&gt;port_id[2] = sp-&gt;fcport-&gt;d_id.b.domain;</div><div class='add'>+		cmd_pkt-&gt;vp_index = sp-&gt;fcport-&gt;vp_idx;</div><div class='add'>+</div><div class='add'>+		/* Build IOCB segments */</div><div class='add'>+		if (qla24xx_build_scsi_type_6_iocbs(sp, cmd_pkt, tot_dsds))</div><div class='add'>+			goto queuing_error_fcp_cmnd;</div><div class='add'>+</div><div class='add'>+		int_to_scsilun(sp-&gt;cmd-&gt;device-&gt;lun, &amp;cmd_pkt-&gt;lun);</div><div class='add'>+		host_to_fcp_swap((uint8_t *)&amp;cmd_pkt-&gt;lun, sizeof(cmd_pkt-&gt;lun));</div><div class='add'>+</div><div class='add'>+		/* build FCP_CMND IU */</div><div class='add'>+		memset(ctx-&gt;fcp_cmnd, 0, sizeof(struct fcp_cmnd));</div><div class='add'>+		int_to_scsilun(sp-&gt;cmd-&gt;device-&gt;lun, &amp;ctx-&gt;fcp_cmnd-&gt;lun);</div><div class='add'>+		ctx-&gt;fcp_cmnd-&gt;additional_cdb_len = additional_cdb_len;</div><div class='add'>+</div><div class='add'>+		if (cmd-&gt;sc_data_direction == DMA_TO_DEVICE)</div><div class='add'>+			ctx-&gt;fcp_cmnd-&gt;additional_cdb_len |= 1;</div><div class='add'>+		else if (cmd-&gt;sc_data_direction == DMA_FROM_DEVICE)</div><div class='add'>+			ctx-&gt;fcp_cmnd-&gt;additional_cdb_len |= 2;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Update tagged queuing modifier -- default is TSK_SIMPLE (0).</div><div class='add'>+		 */</div><div class='add'>+		if (scsi_populate_tag_msg(cmd, tag)) {</div><div class='add'>+			switch (tag[0]) {</div><div class='add'>+			case HEAD_OF_QUEUE_TAG:</div><div class='add'>+				ctx-&gt;fcp_cmnd-&gt;task_attribute =</div><div class='add'>+				    TSK_HEAD_OF_QUEUE;</div><div class='add'>+				break;</div><div class='add'>+			case ORDERED_QUEUE_TAG:</div><div class='add'>+				ctx-&gt;fcp_cmnd-&gt;task_attribute =</div><div class='add'>+				    TSK_ORDERED;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Populate the FCP_PRIO. */</div><div class='add'>+		if (ha-&gt;flags.fcp_prio_enabled)</div><div class='add'>+			ctx-&gt;fcp_cmnd-&gt;task_attribute |=</div><div class='add'>+			    sp-&gt;fcport-&gt;fcp_prio &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+		memcpy(ctx-&gt;fcp_cmnd-&gt;cdb, cmd-&gt;cmnd, cmd-&gt;cmd_len);</div><div class='add'>+</div><div class='add'>+		fcp_dl = (uint32_t *)(ctx-&gt;fcp_cmnd-&gt;cdb + 16 +</div><div class='add'>+		    additional_cdb_len);</div><div class='add'>+		*fcp_dl = htonl((uint32_t)scsi_bufflen(cmd));</div><div class='add'>+</div><div class='add'>+		cmd_pkt-&gt;fcp_cmnd_dseg_len = cpu_to_le16(ctx-&gt;fcp_cmnd_len);</div><div class='add'>+		cmd_pkt-&gt;fcp_cmnd_dseg_address[0] =</div><div class='add'>+		    cpu_to_le32(LSD(ctx-&gt;fcp_cmnd_dma));</div><div class='add'>+		cmd_pkt-&gt;fcp_cmnd_dseg_address[1] =</div><div class='add'>+		    cpu_to_le32(MSD(ctx-&gt;fcp_cmnd_dma));</div><div class='add'>+</div><div class='add'>+		sp-&gt;flags |= SRB_FCP_CMND_DMA_VALID;</div><div class='add'>+		cmd_pkt-&gt;byte_count = cpu_to_le32((uint32_t)scsi_bufflen(cmd));</div><div class='add'>+		/* Set total data segment count. */</div><div class='add'>+		cmd_pkt-&gt;entry_count = (uint8_t)req_cnt;</div><div class='add'>+		/* Specify response queue number where</div><div class='add'>+		 * completion should happen</div><div class='add'>+		 */</div><div class='add'>+		cmd_pkt-&gt;entry_status = (uint8_t) rsp-&gt;id;</div><div class='add'>+	} else {</div><div class='add'>+		struct cmd_type_7 *cmd_pkt;</div><div class='add'>+		req_cnt = qla24xx_calc_iocbs(vha, tot_dsds);</div><div class='add'>+		if (req-&gt;cnt &lt; (req_cnt + 2)) {</div><div class='add'>+			cnt = (uint16_t)RD_REG_DWORD_RELAXED(</div><div class='add'>+			    &amp;reg-&gt;req_q_out[0]);</div><div class='add'>+			if (req-&gt;ring_index &lt; cnt)</div><div class='add'>+				req-&gt;cnt = cnt - req-&gt;ring_index;</div><div class='add'>+			else</div><div class='add'>+				req-&gt;cnt = req-&gt;length -</div><div class='add'>+					(req-&gt;ring_index - cnt);</div><div class='add'>+		}</div><div class='add'>+		if (req-&gt;cnt &lt; (req_cnt + 2))</div><div class='add'>+			goto queuing_error;</div><div class='add'>+</div><div class='add'>+		cmd_pkt = (struct cmd_type_7 *)req-&gt;ring_ptr;</div><div class='add'>+		cmd_pkt-&gt;handle = MAKE_HANDLE(req-&gt;id, handle);</div><div class='add'>+</div><div class='add'>+		/* Zero out remaining portion of packet. */</div><div class='add'>+		/* tagged queuing modifier -- default is TSK_SIMPLE (0).*/</div><div class='add'>+		clr_ptr = (uint32_t *)cmd_pkt + 2;</div><div class='add'>+		memset(clr_ptr, 0, REQUEST_ENTRY_SIZE - 8);</div><div class='add'>+		cmd_pkt-&gt;dseg_count = cpu_to_le16(tot_dsds);</div><div class='add'>+</div><div class='add'>+		/* Set NPORT-ID and LUN number*/</div><div class='add'>+		cmd_pkt-&gt;nport_handle = cpu_to_le16(sp-&gt;fcport-&gt;loop_id);</div><div class='add'>+		cmd_pkt-&gt;port_id[0] = sp-&gt;fcport-&gt;d_id.b.al_pa;</div><div class='add'>+		cmd_pkt-&gt;port_id[1] = sp-&gt;fcport-&gt;d_id.b.area;</div><div class='add'>+		cmd_pkt-&gt;port_id[2] = sp-&gt;fcport-&gt;d_id.b.domain;</div><div class='add'>+		cmd_pkt-&gt;vp_index = sp-&gt;fcport-&gt;vp_idx;</div><div class='add'>+</div><div class='add'>+		int_to_scsilun(sp-&gt;cmd-&gt;device-&gt;lun, &amp;cmd_pkt-&gt;lun);</div><div class='add'>+		host_to_fcp_swap((uint8_t *)&amp;cmd_pkt-&gt;lun,</div><div class='add'>+			sizeof(cmd_pkt-&gt;lun));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Update tagged queuing modifier -- default is TSK_SIMPLE (0).</div><div class='add'>+		 */</div><div class='add'>+		if (scsi_populate_tag_msg(cmd, tag)) {</div><div class='add'>+			switch (tag[0]) {</div><div class='add'>+			case HEAD_OF_QUEUE_TAG:</div><div class='add'>+				cmd_pkt-&gt;task = TSK_HEAD_OF_QUEUE;</div><div class='add'>+				break;</div><div class='add'>+			case ORDERED_QUEUE_TAG:</div><div class='add'>+				cmd_pkt-&gt;task = TSK_ORDERED;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Populate the FCP_PRIO. */</div><div class='add'>+		if (ha-&gt;flags.fcp_prio_enabled)</div><div class='add'>+			cmd_pkt-&gt;task |= sp-&gt;fcport-&gt;fcp_prio &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+		/* Load SCSI command packet. */</div><div class='add'>+		memcpy(cmd_pkt-&gt;fcp_cdb, cmd-&gt;cmnd, cmd-&gt;cmd_len);</div><div class='add'>+		host_to_fcp_swap(cmd_pkt-&gt;fcp_cdb, sizeof(cmd_pkt-&gt;fcp_cdb));</div><div class='add'>+</div><div class='add'>+		cmd_pkt-&gt;byte_count = cpu_to_le32((uint32_t)scsi_bufflen(cmd));</div><div class='add'>+</div><div class='add'>+		/* Build IOCB segments */</div><div class='add'>+		qla24xx_build_scsi_iocbs(sp, cmd_pkt, tot_dsds);</div><div class='add'>+</div><div class='add'>+		/* Set total data segment count. */</div><div class='add'>+		cmd_pkt-&gt;entry_count = (uint8_t)req_cnt;</div><div class='add'>+		/* Specify response queue number where</div><div class='add'>+		 * completion should happen.</div><div class='add'>+		 */</div><div class='add'>+		cmd_pkt-&gt;entry_status = (uint8_t) rsp-&gt;id;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	/* Build command packet. */</div><div class='add'>+	req-&gt;current_outstanding_cmd = handle;</div><div class='add'>+	req-&gt;outstanding_cmds[handle] = sp;</div><div class='add'>+	sp-&gt;handle = handle;</div><div class='add'>+	sp-&gt;cmd-&gt;host_scribble = (unsigned char *)(unsigned long)handle;</div><div class='add'>+	req-&gt;cnt -= req_cnt;</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	/* Adjust ring index. */</div><div class='add'>+	req-&gt;ring_index++;</div><div class='add'>+	if (req-&gt;ring_index == req-&gt;length) {</div><div class='add'>+		req-&gt;ring_index = 0;</div><div class='add'>+		req-&gt;ring_ptr = req-&gt;ring;</div><div class='add'>+	} else</div><div class='add'>+		req-&gt;ring_ptr++;</div><div class='add'>+</div><div class='add'>+	sp-&gt;flags |= SRB_DMA_VALID;</div><div class='add'>+</div><div class='add'>+	/* Set chip new ring index. */</div><div class='add'>+	/* write, read and verify logic */</div><div class='add'>+	dbval = dbval | (req-&gt;id &lt;&lt; 8) | (req-&gt;ring_index &lt;&lt; 16);</div><div class='add'>+	if (ql2xdbwr)</div><div class='add'>+		qla82xx_wr_32(ha, ha-&gt;nxdb_wr_ptr, dbval);</div><div class='add'>+	else {</div><div class='add'>+		WRT_REG_DWORD(</div><div class='add'>+			(unsigned long __iomem *)ha-&gt;nxdb_wr_ptr,</div><div class='add'>+			dbval);</div><div class='add'>+		wmb();</div><div class='add'>+		while (RD_REG_DWORD(ha-&gt;nxdb_rd_ptr) != dbval) {</div><div class='add'>+			WRT_REG_DWORD(</div><div class='add'>+				(unsigned long __iomem *)ha-&gt;nxdb_wr_ptr,</div><div class='add'>+				dbval);</div><div class='add'>+			wmb();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Manage unprocessed RIO/ZIO commands in response queue. */</div><div class='add'>+	if (vha-&gt;flags.process_response_queue &amp;&amp;</div><div class='add'>+	    rsp-&gt;ring_ptr-&gt;signature != RESPONSE_PROCESSED)</div><div class='add'>+		qla24xx_process_response_queue(vha, rsp);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='add'>+	return QLA_SUCCESS;</div><div class='add'>+</div><div class='add'>+queuing_error_fcp_cmnd:</div><div class='add'>+	dma_pool_free(ha-&gt;fcp_cmnd_dma_pool, ctx-&gt;fcp_cmnd, ctx-&gt;fcp_cmnd_dma);</div><div class='add'>+queuing_error:</div><div class='add'>+	if (tot_dsds)</div><div class='add'>+		scsi_dma_unmap(cmd);</div><div class='add'>+</div><div class='add'>+	if (sp-&gt;ctx) {</div><div class='add'>+		mempool_free(sp-&gt;ctx, ha-&gt;ctx_mempool);</div><div class='add'>+		sp-&gt;ctx = NULL;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='add'>+</div><div class='add'>+	return QLA_FUNCTION_FAILED;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int</div><div class='ctx'> qla2x00_start_sp(srb_t *sp)</div><div class='ctx'> {</div><div class='hunk'>@@ -2196,8 +2629,8 @@ qla2x00_start_sp(srb_t *sp)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SRB_CT_CMD:</div><div class='ctx'> 		IS_FWI2_CAPABLE(ha) ?</div><div class='del'>-		qla24xx_ct_iocb(sp, pkt) :</div><div class='del'>-		qla2x00_ct_iocb(sp, pkt);</div><div class='add'>+		    qla24xx_ct_iocb(sp, pkt) :</div><div class='add'>+		    qla2x00_ct_iocb(sp, pkt);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SRB_ADISC_CMD:</div><div class='ctx'> 		IS_FWI2_CAPABLE(ha) ?</div><div class='hunk'>@@ -2212,7 +2645,7 @@ qla2x00_start_sp(srb_t *sp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wmb();</div><div class='del'>-	qla2x00_start_iocbs(sp);</div><div class='add'>+	qla2x00_start_iocbs(sp-&gt;fcport-&gt;vha, ha-&gt;req_q_map[0]);</div><div class='ctx'> done:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='ctx'> 	return rval;</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c<br/>index 7b91b290ffd6..e804585cc59c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_isr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_isr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_isr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla2xxx/qla_isr.c</a></div><div class='hunk'>@@ -242,32 +242,34 @@ static void</div><div class='ctx'> qla2x00_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0)</div><div class='ctx'> {</div><div class='ctx'> 	uint16_t	cnt;</div><div class='add'>+	uint32_t	mboxes;</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_2xxx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp;</div><div class='ctx'> </div><div class='add'>+	/* Read all mbox registers? */</div><div class='add'>+	mboxes = (1 &lt;&lt; ha-&gt;mbx_count) - 1;</div><div class='add'>+	if (!ha-&gt;mcp)</div><div class='add'>+		ql_dbg(ql_dbg_async, vha, 0x5001, "MBX pointer ERRROR.\n");</div><div class='add'>+	else</div><div class='add'>+		mboxes = ha-&gt;mcp-&gt;in_mb;</div><div class='add'>+</div><div class='ctx'> 	/* Load return mailbox registers. */</div><div class='ctx'> 	ha-&gt;flags.mbox_int = 1;</div><div class='ctx'> 	ha-&gt;mailbox_out[0] = mb0;</div><div class='add'>+	mboxes &gt;&gt;= 1;</div><div class='ctx'> 	wptr = (uint16_t __iomem *)MAILBOX_REG(ha, reg, 1);</div><div class='ctx'> </div><div class='ctx'> 	for (cnt = 1; cnt &lt; ha-&gt;mbx_count; cnt++) {</div><div class='ctx'> 		if (IS_QLA2200(ha) &amp;&amp; cnt == 8)</div><div class='ctx'> 			wptr = (uint16_t __iomem *)MAILBOX_REG(ha, reg, 8);</div><div class='del'>-		if (cnt == 4 || cnt == 5)</div><div class='add'>+		if ((cnt == 4 || cnt == 5) &amp;&amp; (mboxes &amp; BIT_0))</div><div class='ctx'> 			ha-&gt;mailbox_out[cnt] = qla2x00_debounce_register(wptr);</div><div class='del'>-		else</div><div class='add'>+		else if (mboxes &amp; BIT_0)</div><div class='ctx'> 			ha-&gt;mailbox_out[cnt] = RD_REG_WORD(wptr);</div><div class='ctx'> </div><div class='ctx'> 		wptr++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ha-&gt;mcp) {</div><div class='del'>-		ql_dbg(ql_dbg_async, vha, 0x5000,</div><div class='del'>-		    "Got mbx completion. cmd=%x.\n", ha-&gt;mcp-&gt;mb[0]);</div><div class='del'>-	} else {</div><div class='del'>-		ql_dbg(ql_dbg_async, vha, 0x5001,</div><div class='del'>-		    "MBX pointer ERROR.\n");</div><div class='add'>+		mboxes &gt;&gt;= 1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -298,7 +300,7 @@ qla81xx_idc_event(scsi_qla_host_t *vha, uint16_t aen, uint16_t descr)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_async, vha, 0x5022,</div><div class='del'>-	    "Inter-Driver Commucation %s -- ACK timeout=%d.\n",</div><div class='add'>+	    "%lu Inter-Driver Communication %s -- ACK timeout=%d.\n",</div><div class='ctx'> 	    vha-&gt;host_no, event[aen &amp; 0xff], timeout);</div><div class='ctx'> </div><div class='ctx'> 	rval = qla2x00_post_idc_ack_work(vha, mb);</div><div class='hunk'>@@ -453,7 +455,7 @@ skip_rio:</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case MBA_LIP_OCCURRED:		/* Loop Initialization Procedure */</div><div class='del'>-		ql_log(ql_log_info, vha, 0x5009,</div><div class='add'>+		ql_dbg(ql_dbg_async, vha, 0x5009,</div><div class='ctx'> 		    "LIP occurred (%x).\n", mb[1]);</div><div class='ctx'> </div><div class='ctx'> 		if (atomic_read(&amp;vha-&gt;loop_state) != LOOP_DOWN) {</div><div class='hunk'>@@ -487,7 +489,7 @@ skip_rio:</div><div class='ctx'> 			ha-&gt;link_data_rate = mb[1];</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ql_log(ql_log_info, vha, 0x500a,</div><div class='add'>+		ql_dbg(ql_dbg_async, vha, 0x500a,</div><div class='ctx'> 		    "LOOP UP detected (%s Gbps).\n", link_speed);</div><div class='ctx'> </div><div class='ctx'> 		vha-&gt;flags.management_server_logged_in = 0;</div><div class='hunk'>@@ -497,7 +499,7 @@ skip_rio:</div><div class='ctx'> 	case MBA_LOOP_DOWN:		/* Loop Down Event */</div><div class='ctx'> 		mbx = IS_QLA81XX(ha) ? RD_REG_WORD(&amp;reg24-&gt;mailbox4) : 0;</div><div class='ctx'> 		mbx = IS_QLA82XX(ha) ? RD_REG_WORD(&amp;reg82-&gt;mailbox_out[4]) : mbx;</div><div class='del'>-		ql_log(ql_log_info, vha, 0x500b,</div><div class='add'>+		ql_dbg(ql_dbg_async, vha, 0x500b,</div><div class='ctx'> 		    "LOOP DOWN detected (%x %x %x %x).\n",</div><div class='ctx'> 		    mb[1], mb[2], mb[3], mbx);</div><div class='ctx'> </div><div class='hunk'>@@ -519,7 +521,7 @@ skip_rio:</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case MBA_LIP_RESET:		/* LIP reset occurred */</div><div class='del'>-		ql_log(ql_log_info, vha, 0x500c,</div><div class='add'>+		ql_dbg(ql_dbg_async, vha, 0x500c,</div><div class='ctx'> 		    "LIP reset occurred (%x).\n", mb[1]);</div><div class='ctx'> </div><div class='ctx'> 		if (atomic_read(&amp;vha-&gt;loop_state) != LOOP_DOWN) {</div><div class='hunk'>@@ -587,7 +589,7 @@ skip_rio:</div><div class='ctx'> 		if (IS_QLA2100(ha))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		ql_log(ql_log_info, vha, 0x500f,</div><div class='add'>+		ql_dbg(ql_dbg_async, vha, 0x500f,</div><div class='ctx'> 		    "Configuration change detected: value=%x.\n", mb[1]);</div><div class='ctx'> </div><div class='ctx'> 		if (atomic_read(&amp;vha-&gt;loop_state) != LOOP_DOWN) {</div><div class='hunk'>@@ -920,15 +922,15 @@ qla2x00_mbx_iocb_entry(scsi_qla_host_t *vha, struct req_que *req,</div><div class='ctx'> 	    QLA_LOGIO_LOGIN_RETRIED : 0;</div><div class='ctx'> 	if (mbx-&gt;entry_status) {</div><div class='ctx'> 		ql_dbg(ql_dbg_async, vha, 0x5043,</div><div class='del'>-		    "Async-%s error entry - portid=%02x%02x%02x "</div><div class='add'>+		    "Async-%s error entry - hdl=%x portid=%02x%02x%02x "</div><div class='ctx'> 		    "entry-status=%x status=%x state-flag=%x "</div><div class='del'>-		    "status-flags=%x.\n",</div><div class='del'>-		    type, fcport-&gt;d_id.b.domain, fcport-&gt;d_id.b.area,</div><div class='add'>+		    "status-flags=%x.\n", type, sp-&gt;handle,</div><div class='add'>+		    fcport-&gt;d_id.b.domain, fcport-&gt;d_id.b.area,</div><div class='ctx'> 		    fcport-&gt;d_id.b.al_pa, mbx-&gt;entry_status,</div><div class='ctx'> 		    le16_to_cpu(mbx-&gt;status), le16_to_cpu(mbx-&gt;state_flags),</div><div class='ctx'> 		    le16_to_cpu(mbx-&gt;status_flags));</div><div class='ctx'> </div><div class='del'>-		ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5057,</div><div class='add'>+		ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5029,</div><div class='ctx'> 		    (uint8_t *)mbx, sizeof(*mbx));</div><div class='ctx'> </div><div class='ctx'> 		goto logio_done;</div><div class='hunk'>@@ -940,9 +942,10 @@ qla2x00_mbx_iocb_entry(scsi_qla_host_t *vha, struct req_que *req,</div><div class='ctx'> 		status = 0;</div><div class='ctx'> 	if (!status &amp;&amp; le16_to_cpu(mbx-&gt;mb0) == MBS_COMMAND_COMPLETE) {</div><div class='ctx'> 		ql_dbg(ql_dbg_async, vha, 0x5045,</div><div class='del'>-		    "Async-%s complete - portid=%02x%02x%02x mbx1=%x.\n",</div><div class='del'>-		    type, fcport-&gt;d_id.b.domain, fcport-&gt;d_id.b.area,</div><div class='del'>-		    fcport-&gt;d_id.b.al_pa, le16_to_cpu(mbx-&gt;mb1));</div><div class='add'>+		    "Async-%s complete - hdl=%x portid=%02x%02x%02x mbx1=%x.\n",</div><div class='add'>+		    type, sp-&gt;handle, 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'>+		    le16_to_cpu(mbx-&gt;mb1));</div><div class='ctx'> </div><div class='ctx'> 		data[0] = MBS_COMMAND_COMPLETE;</div><div class='ctx'> 		if (ctx-&gt;type == SRB_LOGIN_CMD) {</div><div class='hunk'>@@ -968,11 +971,10 @@ qla2x00_mbx_iocb_entry(scsi_qla_host_t *vha, struct req_que *req,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ql_log(ql_log_warn, vha, 0x5046,</div><div class='del'>-	    "Async-%s failed - portid=%02x%02x%02x status=%x "</div><div class='del'>-	    "mb0=%x mb1=%x mb2=%x mb6=%x mb7=%x.\n",</div><div class='del'>-	    type, fcport-&gt;d_id.b.domain,</div><div class='del'>-	    fcport-&gt;d_id.b.area, fcport-&gt;d_id.b.al_pa, status,</div><div class='del'>-	    le16_to_cpu(mbx-&gt;mb0), le16_to_cpu(mbx-&gt;mb1),</div><div class='add'>+	    "Async-%s failed - hdl=%x portid=%02x%02x%02x status=%x "</div><div class='add'>+	    "mb0=%x mb1=%x mb2=%x mb6=%x mb7=%x.\n", type, sp-&gt;handle,</div><div class='add'>+	    fcport-&gt;d_id.b.domain, fcport-&gt;d_id.b.area, fcport-&gt;d_id.b.al_pa,</div><div class='add'>+	    status, le16_to_cpu(mbx-&gt;mb0), le16_to_cpu(mbx-&gt;mb1),</div><div class='ctx'> 	    le16_to_cpu(mbx-&gt;mb2), le16_to_cpu(mbx-&gt;mb6),</div><div class='ctx'> 	    le16_to_cpu(mbx-&gt;mb7));</div><div class='ctx'> </div><div class='hunk'>@@ -1036,7 +1038,7 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req,</div><div class='ctx'> 			bsg_job-&gt;reply-&gt;result = DID_ERROR &lt;&lt; 16;</div><div class='ctx'> 			bsg_job-&gt;reply-&gt;reply_payload_rcv_len = 0;</div><div class='ctx'> 		}</div><div class='del'>-		ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5058,</div><div class='add'>+		ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5035,</div><div class='ctx'> 		    (uint8_t *)pkt, sizeof(*pkt));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bsg_job-&gt;reply-&gt;result =  DID_OK &lt;&lt; 16;</div><div class='hunk'>@@ -1111,9 +1113,9 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,</div><div class='ctx'> 				le16_to_cpu(((struct els_sts_entry_24xx*)pkt)-&gt;total_byte_count);</div><div class='ctx'> </div><div class='ctx'> 			ql_log(ql_log_info, vha, 0x503f,</div><div class='del'>-			    "ELS-CT pass-through-%s error comp_status-status=0x%x "</div><div class='add'>+			    "ELS-CT pass-through-%s error hdl=%x comp_status-status=0x%x "</div><div class='ctx'> 			    "error subcode 1=0x%x error subcode 2=0x%x total_byte = 0x%x.\n",</div><div class='del'>-			    type, comp_status, fw_status[1], fw_status[2],</div><div class='add'>+			    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='ctx'> 				pkt)-&gt;total_byte_count));</div><div class='ctx'> 			fw_sts_ptr = ((uint8_t*)bsg_job-&gt;req-&gt;sense) + sizeof(struct fc_bsg_reply);</div><div class='hunk'>@@ -1121,9 +1123,9 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,</div><div class='ctx'> 		}</div><div class='ctx'> 		else {</div><div class='ctx'> 			ql_log(ql_log_info, vha, 0x5040,</div><div class='del'>-			    "ELS-CT pass-through-%s error comp_status-status=0x%x "</div><div class='add'>+			    "ELS-CT pass-through-%s error hdl=%x comp_status-status=0x%x "</div><div class='ctx'> 			    "error subcode 1=0x%x error subcode 2=0x%x.\n",</div><div class='del'>-			    type, comp_status,</div><div class='add'>+			    type, sp-&gt;handle, comp_status,</div><div class='ctx'> 			    le16_to_cpu(((struct els_sts_entry_24xx *)</div><div class='ctx'> 				pkt)-&gt;error_subcode_1),</div><div class='ctx'> 			    le16_to_cpu(((struct els_sts_entry_24xx *)</div><div class='hunk'>@@ -1184,11 +1186,12 @@ qla24xx_logio_entry(scsi_qla_host_t *vha, struct req_que *req,</div><div class='ctx'> 		QLA_LOGIO_LOGIN_RETRIED : 0;</div><div class='ctx'> 	if (logio-&gt;entry_status) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x5034,</div><div class='del'>-		    "Async-%s error entry - "</div><div class='add'>+		    "Async-%s error entry - hdl=%x"</div><div class='ctx'> 		    "portid=%02x%02x%02x entry-status=%x.\n",</div><div class='del'>-		    type, fcport-&gt;d_id.b.domain, fcport-&gt;d_id.b.area,</div><div class='del'>-		    fcport-&gt;d_id.b.al_pa, logio-&gt;entry_status);</div><div class='del'>-		ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5059,</div><div class='add'>+		    type, sp-&gt;handle, 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'>+		    logio-&gt;entry_status);</div><div class='add'>+		ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x504d,</div><div class='ctx'> 		    (uint8_t *)logio, sizeof(*logio));</div><div class='ctx'> </div><div class='ctx'> 		goto logio_done;</div><div class='hunk'>@@ -1196,10 +1199,9 @@ qla24xx_logio_entry(scsi_qla_host_t *vha, struct req_que *req,</div><div class='ctx'> </div><div class='ctx'> 	if (le16_to_cpu(logio-&gt;comp_status) == CS_COMPLETE) {</div><div class='ctx'> 		ql_dbg(ql_dbg_async, vha, 0x5036,</div><div class='del'>-		    "Async-%s complete - portid=%02x%02x%02x "</div><div class='del'>-		    "iop0=%x.\n",</div><div class='del'>-		    type, 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='add'>+		    "Async-%s complete - hdl=%x portid=%02x%02x%02x "</div><div class='add'>+		    "iop0=%x.\n", type, sp-&gt;handle, 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='ctx'> 		    le32_to_cpu(logio-&gt;io_parameter[0]));</div><div class='ctx'> </div><div class='ctx'> 		data[0] = MBS_COMMAND_COMPLETE;</div><div class='hunk'>@@ -1238,9 +1240,8 @@ qla24xx_logio_entry(scsi_qla_host_t *vha, struct req_que *req,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_async, vha, 0x5037,</div><div class='del'>-	    "Async-%s failed - portid=%02x%02x%02x comp=%x "</div><div class='del'>-	    "iop0=%x iop1=%x.\n",</div><div class='del'>-	    type, fcport-&gt;d_id.b.domain,</div><div class='add'>+	    "Async-%s failed - hdl=%x portid=%02x%02x%02x comp=%x "</div><div class='add'>+	    "iop0=%x iop1=%x.\n", type, sp-&gt;handle, fcport-&gt;d_id.b.domain,</div><div class='ctx'> 	    fcport-&gt;d_id.b.area, fcport-&gt;d_id.b.al_pa,</div><div class='ctx'> 	    le16_to_cpu(logio-&gt;comp_status),</div><div class='ctx'> 	    le32_to_cpu(logio-&gt;io_parameter[0]),</div><div class='hunk'>@@ -1274,25 +1275,25 @@ qla24xx_tm_iocb_entry(scsi_qla_host_t *vha, struct req_que *req,</div><div class='ctx'> </div><div class='ctx'> 	if (sts-&gt;entry_status) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x5038,</div><div class='del'>-		    "Async-%s error - entry-status(%x).\n",</div><div class='del'>-		    type, sts-&gt;entry_status);</div><div class='add'>+		    "Async-%s error - hdl=%x entry-status(%x).\n",</div><div class='add'>+		    type, sp-&gt;handle, sts-&gt;entry_status);</div><div class='ctx'> 	} else if (sts-&gt;comp_status != __constant_cpu_to_le16(CS_COMPLETE)) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x5039,</div><div class='del'>-		    "Async-%s error - completion status(%x).\n",</div><div class='del'>-		    type, sts-&gt;comp_status);</div><div class='add'>+		    "Async-%s error - hdl=%x completion status(%x).\n",</div><div class='add'>+		    type, sp-&gt;handle, sts-&gt;comp_status);</div><div class='ctx'> 	} else if (!(le16_to_cpu(sts-&gt;scsi_status) &amp;</div><div class='ctx'> 	    SS_RESPONSE_INFO_LEN_VALID)) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x503a,</div><div class='del'>-		    "Async-%s error - no response info(%x).\n",</div><div class='del'>-		    type, sts-&gt;scsi_status);</div><div class='add'>+		    "Async-%s error - hdl=%x no response info(%x).\n",</div><div class='add'>+		    type, sp-&gt;handle, sts-&gt;scsi_status);</div><div class='ctx'> 	} else if (le32_to_cpu(sts-&gt;rsp_data_len) &lt; 4) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x503b,</div><div class='del'>-		    "Async-%s error - not enough response(%d).\n",</div><div class='del'>-		    type, sts-&gt;rsp_data_len);</div><div class='add'>+		    "Async-%s error - hdl=%x not enough response(%d).\n",</div><div class='add'>+		    type, sp-&gt;handle, sts-&gt;rsp_data_len);</div><div class='ctx'> 	} else if (sts-&gt;data[3]) {</div><div class='ctx'> 		ql_log(ql_log_warn, vha, 0x503c,</div><div class='del'>-		    "Async-%s error - response(%x).\n",</div><div class='del'>-		    type, sts-&gt;data[3]);</div><div class='add'>+		    "Async-%s error - hdl=%x response(%x).\n",</div><div class='add'>+		    type, sp-&gt;handle, sts-&gt;data[3]);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		error = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1337,9 +1338,6 @@ qla2x00_process_response_queue(struct rsp_que *rsp)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (pkt-&gt;entry_status != 0) {</div><div class='del'>-			ql_log(ql_log_warn, vha, 0x5035,</div><div class='del'>-			    "Process error entry.\n");</div><div class='del'>-</div><div class='ctx'> 			qla2x00_error_entry(vha, rsp, pkt);</div><div class='ctx'> 			((response_t *)pkt)-&gt;signature = RESPONSE_PROCESSED;</div><div class='ctx'> 			wmb();</div><div class='hunk'>@@ -1391,7 +1389,6 @@ qla2x00_process_response_queue(struct rsp_que *rsp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-</div><div class='ctx'> qla2x00_handle_sense(srb_t *sp, uint8_t *sense_data, uint32_t par_sense_len,</div><div class='ctx'>     uint32_t sense_len, struct rsp_que *rsp)</div><div class='ctx'> {</div><div class='hunk'>@@ -1413,13 +1410,14 @@ qla2x00_handle_sense(srb_t *sp, uint8_t *sense_data, uint32_t par_sense_len,</div><div class='ctx'> 	if (sp-&gt;request_sense_length != 0)</div><div class='ctx'> 		rsp-&gt;status_srb = sp;</div><div class='ctx'> </div><div class='del'>-	ql_dbg(ql_dbg_io, vha, 0x301c,</div><div class='del'>-	    "Check condition Sense data, scsi(%ld:%d:%d:%d) cmd=%p.\n",</div><div class='del'>-	    sp-&gt;fcport-&gt;vha-&gt;host_no, cp-&gt;device-&gt;channel, cp-&gt;device-&gt;id,</div><div class='del'>-	    cp-&gt;device-&gt;lun, cp);</div><div class='del'>-	if (sense_len)</div><div class='add'>+	if (sense_len) {</div><div class='add'>+		ql_dbg(ql_dbg_io + ql_dbg_buffer, vha, 0x301c,</div><div class='add'>+		    "Check condition Sense data, nexus%ld:%d:%d cmd=%p.\n",</div><div class='add'>+		    sp-&gt;fcport-&gt;vha-&gt;host_no, cp-&gt;device-&gt;id, cp-&gt;device-&gt;lun,</div><div class='add'>+		    cp);</div><div class='ctx'> 		ql_dump_buffer(ql_dbg_io + ql_dbg_buffer, vha, 0x302b,</div><div class='ctx'> 		    cp-&gt;sense_buffer, sense_len);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct scsi_dif_tuple {</div><div class='hunk'>@@ -1506,7 +1504,7 @@ qla2x00_handle_dif_error(srb_t *sp, struct sts_entry_24xx *sts24)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (k != blocks_done) {</div><div class='del'>-				qla_printk(KERN_WARNING, sp-&gt;fcport-&gt;vha-&gt;hw,</div><div class='add'>+				ql_log(ql_log_warn, vha, 0x302f,</div><div class='ctx'> 				    "unexpected tag values tag:lba=%x:%llx)\n",</div><div class='ctx'> 				    e_ref_tag, (unsigned long long)lba_s);</div><div class='ctx'> 				return 1;</div><div class='hunk'>@@ -1611,7 +1609,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)</div><div class='ctx'> 		sp = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (sp == NULL) {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x3017,</div><div class='add'>+		ql_dbg(ql_dbg_io, vha, 0x3017,</div><div class='ctx'> 		    "Invalid status handle (0x%x).\n", sts-&gt;handle);</div><div class='ctx'> </div><div class='ctx'> 		if (IS_QLA82XX(ha))</div><div class='hunk'>@@ -1623,7 +1621,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)</div><div class='ctx'> 	}</div><div class='ctx'> 	cp = sp-&gt;cmd;</div><div class='ctx'> 	if (cp == NULL) {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x3018,</div><div class='add'>+		ql_dbg(ql_dbg_io, vha, 0x3018,</div><div class='ctx'> 		    "Command already returned (0x%x/%p).\n",</div><div class='ctx'> 		    sts-&gt;handle, sp);</div><div class='ctx'> </div><div class='hunk'>@@ -1670,7 +1668,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)</div><div class='ctx'> 			par_sense_len -= rsp_info_len;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (rsp_info_len &gt; 3 &amp;&amp; rsp_info[3]) {</div><div class='del'>-			ql_log(ql_log_warn, vha, 0x3019,</div><div class='add'>+			ql_dbg(ql_dbg_io, vha, 0x3019,</div><div class='ctx'> 			    "FCP I/O protocol failure (0x%x/0x%x).\n",</div><div class='ctx'> 			    rsp_info_len, rsp_info[3]);</div><div class='ctx'> </div><div class='hunk'>@@ -1701,7 +1699,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)</div><div class='ctx'> 			if (!lscsi_status &amp;&amp;</div><div class='ctx'> 			    ((unsigned)(scsi_bufflen(cp) - resid) &lt;</div><div class='ctx'> 			     cp-&gt;underflow)) {</div><div class='del'>-				ql_log(ql_log_warn, vha, 0x301a,</div><div class='add'>+				ql_dbg(ql_dbg_io, vha, 0x301a,</div><div class='ctx'> 				    "Mid-layer underflow "</div><div class='ctx'> 				    "detected (0x%x of 0x%x bytes).\n",</div><div class='ctx'> 				    resid, scsi_bufflen(cp));</div><div class='hunk'>@@ -1713,7 +1711,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)</div><div class='ctx'> 		cp-&gt;result = DID_OK &lt;&lt; 16 | lscsi_status;</div><div class='ctx'> </div><div class='ctx'> 		if (lscsi_status == SAM_STAT_TASK_SET_FULL) {</div><div class='del'>-			ql_log(ql_log_warn, vha, 0x301b,</div><div class='add'>+			ql_dbg(ql_dbg_io, vha, 0x301b,</div><div class='ctx'> 			    "QUEUE FULL detected.\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1735,7 +1733,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)</div><div class='ctx'> 		scsi_set_resid(cp, resid);</div><div class='ctx'> 		if (scsi_status &amp; SS_RESIDUAL_UNDER) {</div><div class='ctx'> 			if (IS_FWI2_CAPABLE(ha) &amp;&amp; fw_resid_len != resid_len) {</div><div class='del'>-				ql_log(ql_log_warn, vha, 0x301d,</div><div class='add'>+				ql_dbg(ql_dbg_io, vha, 0x301d,</div><div class='ctx'> 				    "Dropped frame(s) detected "</div><div class='ctx'> 				    "(0x%x of 0x%x bytes).\n",</div><div class='ctx'> 				    resid, scsi_bufflen(cp));</div><div class='hunk'>@@ -1747,7 +1745,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)</div><div class='ctx'> 			if (!lscsi_status &amp;&amp;</div><div class='ctx'> 			    ((unsigned)(scsi_bufflen(cp) - resid) &lt;</div><div class='ctx'> 			    cp-&gt;underflow)) {</div><div class='del'>-				ql_log(ql_log_warn, vha, 0x301e,</div><div class='add'>+				ql_dbg(ql_dbg_io, vha, 0x301e,</div><div class='ctx'> 				    "Mid-layer underflow "</div><div class='ctx'> 				    "detected (0x%x of 0x%x bytes).\n",</div><div class='ctx'> 				    resid, scsi_bufflen(cp));</div><div class='hunk'>@@ -1756,7 +1754,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			ql_log(ql_log_warn, vha, 0x301f,</div><div class='add'>+			ql_dbg(ql_dbg_io, vha, 0x301f,</div><div class='ctx'> 			    "Dropped frame(s) detected (0x%x "</div><div class='ctx'> 			    "of 0x%x bytes).\n", resid, scsi_bufflen(cp));</div><div class='ctx'> </div><div class='hunk'>@@ -1774,7 +1772,7 @@ check_scsi_status:</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (lscsi_status != 0) {</div><div class='ctx'> 			if (lscsi_status == SAM_STAT_TASK_SET_FULL) {</div><div class='del'>-				ql_log(ql_log_warn, vha, 0x3020,</div><div class='add'>+				ql_dbg(ql_dbg_io, vha, 0x3020,</div><div class='ctx'> 				    "QUEUE FULL detected.\n");</div><div class='ctx'> 				logit = 1;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1838,10 +1836,15 @@ out:</div><div class='ctx'> 	if (logit)</div><div class='ctx'> 		ql_dbg(ql_dbg_io, vha, 0x3022,</div><div class='ctx'> 		    "FCP command status: 0x%x-0x%x (0x%x) "</div><div class='del'>-		    "oxid=0x%x cdb=%02x%02x%02x len=0x%x "</div><div class='add'>+		    "nexus=%ld:%d:%d portid=%02x%02x%02x oxid=0x%x "</div><div class='add'>+		    "cdb=%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x len=0x%x "</div><div class='ctx'> 		    "rsp_info=0x%x resid=0x%x fw_resid=0x%x.\n",</div><div class='del'>-		    comp_status, scsi_status, cp-&gt;result, ox_id, cp-&gt;cmnd[0],</div><div class='del'>-		    cp-&gt;cmnd[1], cp-&gt;cmnd[2], scsi_bufflen(cp), rsp_info_len,</div><div class='add'>+		    comp_status, scsi_status, cp-&gt;result, vha-&gt;host_no,</div><div class='add'>+		    cp-&gt;device-&gt;id, cp-&gt;device-&gt;lun, fcport-&gt;d_id.b.domain,</div><div class='add'>+		    fcport-&gt;d_id.b.area, fcport-&gt;d_id.b.al_pa, ox_id,</div><div class='add'>+		    cp-&gt;cmnd[0], cp-&gt;cmnd[1], cp-&gt;cmnd[2], cp-&gt;cmnd[3],</div><div class='add'>+		    cp-&gt;cmnd[4], cp-&gt;cmnd[5], cp-&gt;cmnd[6], cp-&gt;cmnd[7],</div><div class='add'>+		    cp-&gt;cmnd[8], cp-&gt;cmnd[9], scsi_bufflen(cp), rsp_info_len,</div><div class='ctx'> 		    resid_len, fw_resid_len);</div><div class='ctx'> </div><div class='ctx'> 	if (rsp-&gt;status_srb == NULL)</div><div class='hunk'>@@ -1899,6 +1902,45 @@ qla2x00_status_cont_entry(struct rsp_que *rsp, sts_cont_entry_t *pkt)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+qla2x00_free_sp_ctx(scsi_qla_host_t *vha, srb_t *sp)</div><div class='add'>+{</div><div class='add'>+	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='add'>+	struct srb_ctx *ctx;</div><div class='add'>+</div><div class='add'>+	if (!sp-&gt;ctx)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	ctx = sp-&gt;ctx;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;type == SRB_LOGIN_CMD ||</div><div class='add'>+	    ctx-&gt;type == SRB_LOGOUT_CMD ||</div><div class='add'>+	    ctx-&gt;type == SRB_TM_CMD) {</div><div class='add'>+		ctx-&gt;u.iocb_cmd-&gt;done(sp);</div><div class='add'>+		return 0;</div><div class='add'>+	} else if (ctx-&gt;type == SRB_ADISC_CMD) {</div><div class='add'>+		ctx-&gt;u.iocb_cmd-&gt;free(sp);</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		struct fc_bsg_job *bsg_job;</div><div class='add'>+</div><div class='add'>+		bsg_job = ctx-&gt;u.bsg_job;</div><div class='add'>+		if (ctx-&gt;type == SRB_ELS_CMD_HST ||</div><div class='add'>+		    ctx-&gt;type == SRB_CT_CMD)</div><div class='add'>+			kfree(sp-&gt;fcport);</div><div class='add'>+</div><div class='add'>+		bsg_job-&gt;reply-&gt;reply_data.ctels_reply.status =</div><div class='add'>+		    FC_CTELS_STATUS_OK;</div><div class='add'>+		bsg_job-&gt;reply-&gt;result = DID_ERROR &lt;&lt; 16;</div><div class='add'>+		bsg_job-&gt;reply-&gt;reply_payload_rcv_len = 0;</div><div class='add'>+		kfree(sp-&gt;ctx);</div><div class='add'>+		mempool_free(sp, ha-&gt;srb_mempool);</div><div class='add'>+		bsg_job-&gt;job_done(bsg_job);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * qla2x00_error_entry() - Process an error entry.</div><div class='ctx'>  * @ha: SCSI driver HA context</div><div class='hunk'>@@ -1909,7 +1951,7 @@ qla2x00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, sts_entry_t *pkt)</div><div class='ctx'> {</div><div class='ctx'> 	srb_t *sp;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='del'>-	uint32_t handle = LSW(pkt-&gt;handle);</div><div class='add'>+	const char func[] = "ERROR-IOCB";</div><div class='ctx'> 	uint16_t que = MSW(pkt-&gt;handle);</div><div class='ctx'> 	struct req_que *req = ha-&gt;req_q_map[que];</div><div class='ctx'> </div><div class='hunk'>@@ -1932,28 +1974,20 @@ qla2x00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, sts_entry_t *pkt)</div><div class='ctx'> 		ql_dbg(ql_dbg_async, vha, 0x502f,</div><div class='ctx'> 		    "UNKNOWN flag error.\n");</div><div class='ctx'> </div><div class='del'>-	/* Validate handle. */</div><div class='del'>-	if (handle &lt; MAX_OUTSTANDING_COMMANDS)</div><div class='del'>-		sp = req-&gt;outstanding_cmds[handle];</div><div class='del'>-	else</div><div class='del'>-		sp = NULL;</div><div class='del'>-</div><div class='add'>+	sp = qla2x00_get_sp_from_handle(vha, func, req, pkt);</div><div class='ctx'> 	if (sp) {</div><div class='del'>-		/* Free outstanding command slot. */</div><div class='del'>-		req-&gt;outstanding_cmds[handle] = NULL;</div><div class='del'>-</div><div class='del'>-		/* Bad payload or header */</div><div class='del'>-		if (pkt-&gt;entry_status &amp;</div><div class='del'>-		    (RF_INV_E_ORDER | RF_INV_E_COUNT |</div><div class='del'>-		     RF_INV_E_PARAM | RF_INV_E_TYPE)) {</div><div class='del'>-			sp-&gt;cmd-&gt;result = DID_ERROR &lt;&lt; 16;</div><div class='del'>-		} else if (pkt-&gt;entry_status &amp; RF_BUSY) {</div><div class='del'>-			sp-&gt;cmd-&gt;result = DID_BUS_BUSY &lt;&lt; 16;</div><div class='del'>-		} else {</div><div class='del'>-			sp-&gt;cmd-&gt;result = DID_ERROR &lt;&lt; 16;</div><div class='add'>+		if (qla2x00_free_sp_ctx(vha, sp)) {</div><div class='add'>+			if (pkt-&gt;entry_status &amp;</div><div class='add'>+			    (RF_INV_E_ORDER | RF_INV_E_COUNT |</div><div class='add'>+			     RF_INV_E_PARAM | RF_INV_E_TYPE)) {</div><div class='add'>+				sp-&gt;cmd-&gt;result = DID_ERROR &lt;&lt; 16;</div><div class='add'>+			} else if (pkt-&gt;entry_status &amp; RF_BUSY) {</div><div class='add'>+				sp-&gt;cmd-&gt;result = DID_BUS_BUSY &lt;&lt; 16;</div><div class='add'>+			} else {</div><div class='add'>+				sp-&gt;cmd-&gt;result = DID_ERROR &lt;&lt; 16;</div><div class='add'>+			}</div><div class='add'>+			qla2x00_sp_compl(ha, sp);</div><div class='ctx'> 		}</div><div class='del'>-		qla2x00_sp_compl(ha, sp);</div><div class='del'>-</div><div class='ctx'> 	} else if (pkt-&gt;entry_type == COMMAND_A64_TYPE || pkt-&gt;entry_type ==</div><div class='ctx'> 		COMMAND_TYPE || pkt-&gt;entry_type == COMMAND_TYPE_7</div><div class='ctx'> 		|| pkt-&gt;entry_type == COMMAND_TYPE_6) {</div><div class='hunk'>@@ -1977,26 +2011,30 @@ static void</div><div class='ctx'> qla24xx_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0)</div><div class='ctx'> {</div><div class='ctx'> 	uint16_t	cnt;</div><div class='add'>+	uint32_t	mboxes;</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_24xx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp24;</div><div class='ctx'> </div><div class='add'>+	/* Read all mbox registers? */</div><div class='add'>+	mboxes = (1 &lt;&lt; ha-&gt;mbx_count) - 1;</div><div class='add'>+	if (!ha-&gt;mcp)</div><div class='add'>+		ql_dbg(ql_dbg_async, vha, 0x504e, "MBX pointer ERRROR.\n");</div><div class='add'>+	else</div><div class='add'>+		mboxes = ha-&gt;mcp-&gt;in_mb;</div><div class='add'>+</div><div class='ctx'> 	/* Load return mailbox registers. */</div><div class='ctx'> 	ha-&gt;flags.mbox_int = 1;</div><div class='ctx'> 	ha-&gt;mailbox_out[0] = mb0;</div><div class='add'>+	mboxes &gt;&gt;= 1;</div><div class='ctx'> 	wptr = (uint16_t __iomem *)&amp;reg-&gt;mailbox1;</div><div class='ctx'> </div><div class='ctx'> 	for (cnt = 1; cnt &lt; ha-&gt;mbx_count; cnt++) {</div><div class='del'>-		ha-&gt;mailbox_out[cnt] = RD_REG_WORD(wptr);</div><div class='del'>-		wptr++;</div><div class='del'>-	}</div><div class='add'>+		if (mboxes &amp; BIT_0)</div><div class='add'>+			ha-&gt;mailbox_out[cnt] = RD_REG_WORD(wptr);</div><div class='ctx'> </div><div class='del'>-	if (ha-&gt;mcp) {</div><div class='del'>-		ql_dbg(ql_dbg_async, vha, 0x504d,</div><div class='del'>-		    "Got mailbox completion. cmd=%x.\n", ha-&gt;mcp-&gt;mb[0]);</div><div class='del'>-	} else {</div><div class='del'>-		ql_dbg(ql_dbg_async, vha, 0x504e,</div><div class='del'>-		    "MBX pointer ERROR.\n");</div><div class='add'>+		mboxes &gt;&gt;= 1;</div><div class='add'>+		wptr++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2025,9 +2063,6 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (pkt-&gt;entry_status != 0) {</div><div class='del'>-			ql_dbg(ql_dbg_async, vha, 0x5029,</div><div class='del'>-			    "Process error entry.\n");</div><div class='del'>-</div><div class='ctx'> 			qla2x00_error_entry(vha, rsp, (sts_entry_t *) pkt);</div><div class='ctx'> 			((response_t *)pkt)-&gt;signature = RESPONSE_PROCESSED;</div><div class='ctx'> 			wmb();</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c<br/>index 82a33533ed26..34344d3f8658 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_mbx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_mbx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_mbx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla2xxx/qla_mbx.c</a></div><div class='hunk'>@@ -2887,7 +2887,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,</div><div class='ctx'> 		if (vp_idx == 0 &amp;&amp; (MSB(stat) != 1))</div><div class='ctx'> 			goto reg_needed;</div><div class='ctx'> </div><div class='del'>-		if (MSB(stat) == 1) {</div><div class='add'>+		if (MSB(stat) != 0) {</div><div class='ctx'> 			ql_dbg(ql_dbg_mbx, vha, 0x10ba,</div><div class='ctx'> 			    "Could not acquire ID for VP[%d].\n", vp_idx);</div><div class='ctx'> 			return;</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c<br/>index 03554934b0a5..1cd46cd7ff90 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_nx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_nx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_nx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla2xxx/qla_nx.c</a></div><div class='hunk'>@@ -369,7 +369,7 @@ qla82xx_pci_set_crbwindow_2M(struct qla_hw_data *ha, ulong *off)</div><div class='ctx'> 		ql_dbg(ql_dbg_p3p, vha, 0xb000,</div><div class='ctx'> 		    "%s: Written crbwin (0x%x) "</div><div class='ctx'> 		    "!= Read crbwin (0x%x), off=0x%lx.\n",</div><div class='del'>-		    ha-&gt;crb_win, win_read, *off);</div><div class='add'>+		    __func__, ha-&gt;crb_win, win_read, *off);</div><div class='ctx'> 	}</div><div class='ctx'> 	*off = (*off &amp; MASK(16)) + CRB_INDIRECT_2M + ha-&gt;nx_pcibase;</div><div class='ctx'> }</div><div class='hunk'>@@ -409,7 +409,7 @@ qla82xx_pci_set_crbwindow(struct qla_hw_data *ha, u64 off)</div><div class='ctx'> 	}</div><div class='ctx'> 	/* strange address given */</div><div class='ctx'> 	ql_dbg(ql_dbg_p3p, vha, 0xb001,</div><div class='del'>-	    "%x: Warning: unm_nic_pci_set_crbwindow "</div><div class='add'>+	    "%s: Warning: unm_nic_pci_set_crbwindow "</div><div class='ctx'> 	    "called with an unknown address(%llx).\n",</div><div class='ctx'> 	    QLA2XXX_DRIVER_NAME, off);</div><div class='ctx'> 	return off;</div><div class='hunk'>@@ -1055,7 +1055,7 @@ ql82xx_rom_lock_d(struct qla_hw_data *ha)</div><div class='ctx'> 		    "ROM lock failed.\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1711,12 +1711,12 @@ qla82xx_iospace_config(struct qla_hw_data *ha)</div><div class='ctx'> 	ql_dbg_pci(ql_dbg_multiq, ha-&gt;pdev, 0xc006,</div><div class='ctx'> 	    "nx_pci_base=%p iobase=%p "</div><div class='ctx'> 	    "max_req_queues=%d msix_count=%d.\n",</div><div class='del'>-	    ha-&gt;nx_pcibase, ha-&gt;iobase,</div><div class='add'>+	    (void *)ha-&gt;nx_pcibase, ha-&gt;iobase,</div><div class='ctx'> 	    ha-&gt;max_req_queues, ha-&gt;msix_count);</div><div class='ctx'> 	ql_dbg_pci(ql_dbg_init, ha-&gt;pdev, 0x0010,</div><div class='ctx'> 	    "nx_pci_base=%p iobase=%p "</div><div class='ctx'> 	    "max_req_queues=%d msix_count=%d.\n",</div><div class='del'>-	    ha-&gt;nx_pcibase, ha-&gt;iobase,</div><div class='add'>+	    (void *)ha-&gt;nx_pcibase, ha-&gt;iobase,</div><div class='ctx'> 	    ha-&gt;max_req_queues, ha-&gt;msix_count);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1744,7 +1744,7 @@ qla82xx_pci_config(scsi_qla_host_t *vha)</div><div class='ctx'> 	ret = pci_set_mwi(ha-&gt;pdev);</div><div class='ctx'> 	ha-&gt;chip_revision = ha-&gt;pdev-&gt;revision;</div><div class='ctx'> 	ql_dbg(ql_dbg_init, vha, 0x0043,</div><div class='del'>-	    "Chip revision:%ld.\n",</div><div class='add'>+	    "Chip revision:%d.\n",</div><div class='ctx'> 	    ha-&gt;chip_revision);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2023,13 +2023,9 @@ qla82xx_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0)</div><div class='ctx'> 		wptr++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ha-&gt;mcp) {</div><div class='del'>-		ql_dbg(ql_dbg_async, vha, 0x5052,</div><div class='del'>-		    "Got mailbox completion. cmd=%x.\n", ha-&gt;mcp-&gt;mb[0]);</div><div class='del'>-	} else {</div><div class='add'>+	if (!ha-&gt;mcp)</div><div class='ctx'> 		ql_dbg(ql_dbg_async, vha, 0x5053,</div><div class='ctx'> 		    "MBX pointer ERROR.\n");</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2543,484 +2539,6 @@ qla82xx_start_firmware(scsi_qla_host_t *vha)</div><div class='ctx'> 	return qla82xx_check_rcvpeg_state(ha);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-qla2xx_build_scsi_type_6_iocbs(srb_t *sp, struct cmd_type_6 *cmd_pkt,</div><div class='del'>-	uint16_t tot_dsds)</div><div class='del'>-{</div><div class='del'>-	uint32_t *cur_dsd = NULL;</div><div class='del'>-	scsi_qla_host_t	*vha;</div><div class='del'>-	struct qla_hw_data *ha;</div><div class='del'>-	struct scsi_cmnd *cmd;</div><div class='del'>-	struct	scatterlist *cur_seg;</div><div class='del'>-	uint32_t *dsd_seg;</div><div class='del'>-	void *next_dsd;</div><div class='del'>-	uint8_t avail_dsds;</div><div class='del'>-	uint8_t first_iocb = 1;</div><div class='del'>-	uint32_t dsd_list_len;</div><div class='del'>-	struct dsd_dma *dsd_ptr;</div><div class='del'>-	struct ct6_dsd *ctx;</div><div class='del'>-</div><div class='del'>-	cmd = sp-&gt;cmd;</div><div class='del'>-</div><div class='del'>-	/* Update entry type to indicate Command Type 3 IOCB */</div><div class='del'>-	*((uint32_t *)(&amp;cmd_pkt-&gt;entry_type)) =</div><div class='del'>-		__constant_cpu_to_le32(COMMAND_TYPE_6);</div><div class='del'>-</div><div class='del'>-	/* No data transfer */</div><div class='del'>-	if (!scsi_bufflen(cmd) || cmd-&gt;sc_data_direction == DMA_NONE) {</div><div class='del'>-		cmd_pkt-&gt;byte_count = __constant_cpu_to_le32(0);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vha = sp-&gt;fcport-&gt;vha;</div><div class='del'>-	ha = vha-&gt;hw;</div><div class='del'>-</div><div class='del'>-	/* Set transfer direction */</div><div class='del'>-	if (cmd-&gt;sc_data_direction == DMA_TO_DEVICE) {</div><div class='del'>-		cmd_pkt-&gt;control_flags =</div><div class='del'>-		    __constant_cpu_to_le16(CF_WRITE_DATA);</div><div class='del'>-		ha-&gt;qla_stats.output_bytes += scsi_bufflen(cmd);</div><div class='del'>-	} else if (cmd-&gt;sc_data_direction == DMA_FROM_DEVICE) {</div><div class='del'>-		cmd_pkt-&gt;control_flags =</div><div class='del'>-		    __constant_cpu_to_le16(CF_READ_DATA);</div><div class='del'>-		ha-&gt;qla_stats.input_bytes += scsi_bufflen(cmd);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cur_seg = scsi_sglist(cmd);</div><div class='del'>-	ctx = sp-&gt;ctx;</div><div class='del'>-</div><div class='del'>-	while (tot_dsds) {</div><div class='del'>-		avail_dsds = (tot_dsds &gt; QLA_DSDS_PER_IOCB) ?</div><div class='del'>-		    QLA_DSDS_PER_IOCB : tot_dsds;</div><div class='del'>-		tot_dsds -= avail_dsds;</div><div class='del'>-		dsd_list_len = (avail_dsds + 1) * QLA_DSD_SIZE;</div><div class='del'>-</div><div class='del'>-		dsd_ptr = list_first_entry(&amp;ha-&gt;gbl_dsd_list,</div><div class='del'>-		    struct dsd_dma, list);</div><div class='del'>-		next_dsd = dsd_ptr-&gt;dsd_addr;</div><div class='del'>-		list_del(&amp;dsd_ptr-&gt;list);</div><div class='del'>-		ha-&gt;gbl_dsd_avail--;</div><div class='del'>-		list_add_tail(&amp;dsd_ptr-&gt;list, &amp;ctx-&gt;dsd_list);</div><div class='del'>-		ctx-&gt;dsd_use_cnt++;</div><div class='del'>-		ha-&gt;gbl_dsd_inuse++;</div><div class='del'>-</div><div class='del'>-		if (first_iocb) {</div><div class='del'>-			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='del'>-		} 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='del'>-		}</div><div class='del'>-		cur_dsd = (uint32_t *)next_dsd;</div><div class='del'>-		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='del'>-			cur_seg = sg_next(cur_seg);</div><div class='del'>-			avail_dsds--;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 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='del'>-	cmd_pkt-&gt;control_flags |= CF_DATA_SEG_DESCR_ENABLE;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * qla82xx_calc_dsd_lists() - Determine number of DSD list required</div><div class='del'>- * for Command Type 6.</div><div class='del'>- *</div><div class='del'>- * @dsds: number of data segment decriptors needed</div><div class='del'>- *</div><div class='del'>- * Returns the number of dsd list needed to store @dsds.</div><div class='del'>- */</div><div class='del'>-inline uint16_t</div><div class='del'>-qla82xx_calc_dsd_lists(uint16_t dsds)</div><div class='del'>-{</div><div class='del'>-	uint16_t dsd_lists = 0;</div><div class='del'>-</div><div class='del'>-	dsd_lists = (dsds/QLA_DSDS_PER_IOCB);</div><div class='del'>-	if (dsds % QLA_DSDS_PER_IOCB)</div><div class='del'>-		dsd_lists++;</div><div class='del'>-	return dsd_lists;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * qla82xx_start_scsi() - Send a SCSI command to the ISP</div><div class='del'>- * @sp: command to send to the ISP</div><div class='del'>- *</div><div class='del'>- * Returns non-zero if a failure occurred, else zero.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-qla82xx_start_scsi(srb_t *sp)</div><div class='del'>-{</div><div class='del'>-	int		ret, nseg;</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	struct scsi_cmnd *cmd;</div><div class='del'>-	uint32_t	*clr_ptr;</div><div class='del'>-	uint32_t        index;</div><div class='del'>-	uint32_t	handle;</div><div class='del'>-	uint16_t	cnt;</div><div class='del'>-	uint16_t	req_cnt;</div><div class='del'>-	uint16_t	tot_dsds;</div><div class='del'>-	struct device_reg_82xx __iomem *reg;</div><div class='del'>-	uint32_t dbval;</div><div class='del'>-	uint32_t *fcp_dl;</div><div class='del'>-	uint8_t additional_cdb_len;</div><div class='del'>-	struct ct6_dsd *ctx;</div><div class='del'>-	struct scsi_qla_host *vha = sp-&gt;fcport-&gt;vha;</div><div class='del'>-	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='del'>-	struct req_que *req = NULL;</div><div class='del'>-	struct rsp_que *rsp = NULL;</div><div class='del'>-	char		tag[2];</div><div class='del'>-</div><div class='del'>-	/* Setup device pointers. */</div><div class='del'>-	ret = 0;</div><div class='del'>-	reg = &amp;ha-&gt;iobase-&gt;isp82;</div><div class='del'>-	cmd = sp-&gt;cmd;</div><div class='del'>-	req = vha-&gt;req;</div><div class='del'>-	rsp = ha-&gt;rsp_q_map[0];</div><div class='del'>-</div><div class='del'>-	/* So we know we haven't pci_map'ed anything yet */</div><div class='del'>-	tot_dsds = 0;</div><div class='del'>-</div><div class='del'>-	dbval = 0x04 | (ha-&gt;portnum &lt;&lt; 5);</div><div class='del'>-</div><div class='del'>-	/* Send marker if required */</div><div class='del'>-	if (vha-&gt;marker_needed != 0) {</div><div class='del'>-		if (qla2x00_marker(vha, req,</div><div class='del'>-			rsp, 0, 0, MK_SYNC_ALL) != QLA_SUCCESS) {</div><div class='del'>-			ql_log(ql_log_warn, vha, 0x300c,</div><div class='del'>-			    "qla2x00_marker failed for cmd=%p.\n", cmd);</div><div class='del'>-			return QLA_FUNCTION_FAILED;</div><div class='del'>-		}</div><div class='del'>-		vha-&gt;marker_needed = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Acquire ring specific lock */</div><div class='del'>-	spin_lock_irqsave(&amp;ha-&gt;hardware_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Check for room in outstanding command list. */</div><div class='del'>-	handle = req-&gt;current_outstanding_cmd;</div><div class='del'>-	for (index = 1; index &lt; MAX_OUTSTANDING_COMMANDS; index++) {</div><div class='del'>-		handle++;</div><div class='del'>-		if (handle == MAX_OUTSTANDING_COMMANDS)</div><div class='del'>-			handle = 1;</div><div class='del'>-		if (!req-&gt;outstanding_cmds[handle])</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (index == MAX_OUTSTANDING_COMMANDS)</div><div class='del'>-		goto queuing_error;</div><div class='del'>-</div><div class='del'>-	/* Map the sg table so we have an accurate count of sg entries needed */</div><div class='del'>-	if (scsi_sg_count(cmd)) {</div><div class='del'>-		nseg = dma_map_sg(&amp;ha-&gt;pdev-&gt;dev, scsi_sglist(cmd),</div><div class='del'>-		    scsi_sg_count(cmd), cmd-&gt;sc_data_direction);</div><div class='del'>-		if (unlikely(!nseg))</div><div class='del'>-			goto queuing_error;</div><div class='del'>-	} else</div><div class='del'>-		nseg = 0;</div><div class='del'>-</div><div class='del'>-	tot_dsds = nseg;</div><div class='del'>-</div><div class='del'>-	if (tot_dsds &gt; ql2xshiftctondsd) {</div><div class='del'>-		struct cmd_type_6 *cmd_pkt;</div><div class='del'>-		uint16_t more_dsd_lists = 0;</div><div class='del'>-		struct dsd_dma *dsd_ptr;</div><div class='del'>-		uint16_t i;</div><div class='del'>-</div><div class='del'>-		more_dsd_lists = qla82xx_calc_dsd_lists(tot_dsds);</div><div class='del'>-		if ((more_dsd_lists + ha-&gt;gbl_dsd_inuse) &gt;= NUM_DSD_CHAIN) {</div><div class='del'>-			ql_dbg(ql_dbg_io, vha, 0x300d,</div><div class='del'>-			    "Num of DSD list %d is than %d for cmd=%p.\n",</div><div class='del'>-			    more_dsd_lists + ha-&gt;gbl_dsd_inuse, NUM_DSD_CHAIN,</div><div class='del'>-			    cmd);</div><div class='del'>-			goto queuing_error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (more_dsd_lists &lt;= ha-&gt;gbl_dsd_avail)</div><div class='del'>-			goto sufficient_dsds;</div><div class='del'>-		else</div><div class='del'>-			more_dsd_lists -= ha-&gt;gbl_dsd_avail;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; more_dsd_lists; i++) {</div><div class='del'>-			dsd_ptr = kzalloc(sizeof(struct dsd_dma), GFP_ATOMIC);</div><div class='del'>-			if (!dsd_ptr) {</div><div class='del'>-				ql_log(ql_log_fatal, vha, 0x300e,</div><div class='del'>-				    "Failed to allocate memory for dsd_dma "</div><div class='del'>-				    "for cmd=%p.\n", cmd);</div><div class='del'>-				goto queuing_error;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			dsd_ptr-&gt;dsd_addr = dma_pool_alloc(ha-&gt;dl_dma_pool,</div><div class='del'>-				GFP_ATOMIC, &amp;dsd_ptr-&gt;dsd_list_dma);</div><div class='del'>-			if (!dsd_ptr-&gt;dsd_addr) {</div><div class='del'>-				kfree(dsd_ptr);</div><div class='del'>-				ql_log(ql_log_fatal, vha, 0x300f,</div><div class='del'>-				    "Failed to allocate memory for dsd_addr "</div><div class='del'>-				    "for cmd=%p.\n", cmd);</div><div class='del'>-				goto queuing_error;</div><div class='del'>-			}</div><div class='del'>-			list_add_tail(&amp;dsd_ptr-&gt;list, &amp;ha-&gt;gbl_dsd_list);</div><div class='del'>-			ha-&gt;gbl_dsd_avail++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-sufficient_dsds:</div><div class='del'>-		req_cnt = 1;</div><div class='del'>-</div><div class='del'>-		if (req-&gt;cnt &lt; (req_cnt + 2)) {</div><div class='del'>-			cnt = (uint16_t)RD_REG_DWORD_RELAXED(</div><div class='del'>-				&amp;reg-&gt;req_q_out[0]);</div><div class='del'>-			if (req-&gt;ring_index &lt; cnt)</div><div class='del'>-				req-&gt;cnt = cnt - req-&gt;ring_index;</div><div class='del'>-			else</div><div class='del'>-				req-&gt;cnt = req-&gt;length -</div><div class='del'>-					(req-&gt;ring_index - cnt);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (req-&gt;cnt &lt; (req_cnt + 2))</div><div class='del'>-			goto queuing_error;</div><div class='del'>-</div><div class='del'>-		ctx = sp-&gt;ctx = mempool_alloc(ha-&gt;ctx_mempool, GFP_ATOMIC);</div><div class='del'>-		if (!sp-&gt;ctx) {</div><div class='del'>-			ql_log(ql_log_fatal, vha, 0x3010,</div><div class='del'>-			    "Failed to allocate ctx for cmd=%p.\n", cmd);</div><div class='del'>-			goto queuing_error;</div><div class='del'>-		}</div><div class='del'>-		memset(ctx, 0, sizeof(struct ct6_dsd));</div><div class='del'>-		ctx-&gt;fcp_cmnd = dma_pool_alloc(ha-&gt;fcp_cmnd_dma_pool,</div><div class='del'>-			GFP_ATOMIC, &amp;ctx-&gt;fcp_cmnd_dma);</div><div class='del'>-		if (!ctx-&gt;fcp_cmnd) {</div><div class='del'>-			ql_log(ql_log_fatal, vha, 0x3011,</div><div class='del'>-			    "Failed to allocate fcp_cmnd for cmd=%p.\n", cmd);</div><div class='del'>-			goto queuing_error_fcp_cmnd;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Initialize the DSD list and dma handle */</div><div class='del'>-		INIT_LIST_HEAD(&amp;ctx-&gt;dsd_list);</div><div class='del'>-		ctx-&gt;dsd_use_cnt = 0;</div><div class='del'>-</div><div class='del'>-		if (cmd-&gt;cmd_len &gt; 16) {</div><div class='del'>-			additional_cdb_len = cmd-&gt;cmd_len - 16;</div><div class='del'>-			if ((cmd-&gt;cmd_len % 4) != 0) {</div><div class='del'>-				/* SCSI command bigger than 16 bytes must be</div><div class='del'>-				 * multiple of 4</div><div class='del'>-				 */</div><div class='del'>-				ql_log(ql_log_warn, vha, 0x3012,</div><div class='del'>-				    "scsi cmd len %d not multiple of 4 "</div><div class='del'>-				    "for cmd=%p.\n", cmd-&gt;cmd_len, cmd);</div><div class='del'>-				goto queuing_error_fcp_cmnd;</div><div class='del'>-			}</div><div class='del'>-			ctx-&gt;fcp_cmnd_len = 12 + cmd-&gt;cmd_len + 4;</div><div class='del'>-		} else {</div><div class='del'>-			additional_cdb_len = 0;</div><div class='del'>-			ctx-&gt;fcp_cmnd_len = 12 + 16 + 4;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cmd_pkt = (struct cmd_type_6 *)req-&gt;ring_ptr;</div><div class='del'>-		cmd_pkt-&gt;handle = MAKE_HANDLE(req-&gt;id, handle);</div><div class='del'>-</div><div class='del'>-		/* Zero out remaining portion of packet. */</div><div class='del'>-		/*    tagged queuing modifier -- default is TSK_SIMPLE (0). */</div><div class='del'>-		clr_ptr = (uint32_t *)cmd_pkt + 2;</div><div class='del'>-		memset(clr_ptr, 0, REQUEST_ENTRY_SIZE - 8);</div><div class='del'>-		cmd_pkt-&gt;dseg_count = cpu_to_le16(tot_dsds);</div><div class='del'>-</div><div class='del'>-		/* Set NPORT-ID and LUN number*/</div><div class='del'>-		cmd_pkt-&gt;nport_handle = cpu_to_le16(sp-&gt;fcport-&gt;loop_id);</div><div class='del'>-		cmd_pkt-&gt;port_id[0] = sp-&gt;fcport-&gt;d_id.b.al_pa;</div><div class='del'>-		cmd_pkt-&gt;port_id[1] = sp-&gt;fcport-&gt;d_id.b.area;</div><div class='del'>-		cmd_pkt-&gt;port_id[2] = sp-&gt;fcport-&gt;d_id.b.domain;</div><div class='del'>-		cmd_pkt-&gt;vp_index = sp-&gt;fcport-&gt;vp_idx;</div><div class='del'>-</div><div class='del'>-		/* Build IOCB segments */</div><div class='del'>-		if (qla2xx_build_scsi_type_6_iocbs(sp, cmd_pkt, tot_dsds))</div><div class='del'>-			goto queuing_error_fcp_cmnd;</div><div class='del'>-</div><div class='del'>-		int_to_scsilun(sp-&gt;cmd-&gt;device-&gt;lun, &amp;cmd_pkt-&gt;lun);</div><div class='del'>-		host_to_fcp_swap((uint8_t *)&amp;cmd_pkt-&gt;lun, sizeof(cmd_pkt-&gt;lun));</div><div class='del'>-</div><div class='del'>-		/* build FCP_CMND IU */</div><div class='del'>-		memset(ctx-&gt;fcp_cmnd, 0, sizeof(struct fcp_cmnd));</div><div class='del'>-		int_to_scsilun(sp-&gt;cmd-&gt;device-&gt;lun, &amp;ctx-&gt;fcp_cmnd-&gt;lun);</div><div class='del'>-		ctx-&gt;fcp_cmnd-&gt;additional_cdb_len = additional_cdb_len;</div><div class='del'>-</div><div class='del'>-		if (cmd-&gt;sc_data_direction == DMA_TO_DEVICE)</div><div class='del'>-			ctx-&gt;fcp_cmnd-&gt;additional_cdb_len |= 1;</div><div class='del'>-		else if (cmd-&gt;sc_data_direction == DMA_FROM_DEVICE)</div><div class='del'>-			ctx-&gt;fcp_cmnd-&gt;additional_cdb_len |= 2;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Update tagged queuing modifier -- default is TSK_SIMPLE (0).</div><div class='del'>-		 */</div><div class='del'>-		if (scsi_populate_tag_msg(cmd, tag)) {</div><div class='del'>-			switch (tag[0]) {</div><div class='del'>-			case HEAD_OF_QUEUE_TAG:</div><div class='del'>-				ctx-&gt;fcp_cmnd-&gt;task_attribute =</div><div class='del'>-				    TSK_HEAD_OF_QUEUE;</div><div class='del'>-				break;</div><div class='del'>-			case ORDERED_QUEUE_TAG:</div><div class='del'>-				ctx-&gt;fcp_cmnd-&gt;task_attribute =</div><div class='del'>-				    TSK_ORDERED;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy(ctx-&gt;fcp_cmnd-&gt;cdb, cmd-&gt;cmnd, cmd-&gt;cmd_len);</div><div class='del'>-</div><div class='del'>-		fcp_dl = (uint32_t *)(ctx-&gt;fcp_cmnd-&gt;cdb + 16 +</div><div class='del'>-		    additional_cdb_len);</div><div class='del'>-		*fcp_dl = htonl((uint32_t)scsi_bufflen(cmd));</div><div class='del'>-</div><div class='del'>-		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='del'>-</div><div class='del'>-		sp-&gt;flags |= SRB_FCP_CMND_DMA_VALID;</div><div class='del'>-		cmd_pkt-&gt;byte_count = cpu_to_le32((uint32_t)scsi_bufflen(cmd));</div><div class='del'>-		/* Set total data segment count. */</div><div class='del'>-		cmd_pkt-&gt;entry_count = (uint8_t)req_cnt;</div><div class='del'>-		/* Specify response queue number where</div><div class='del'>-		 * completion should happen</div><div class='del'>-		 */</div><div class='del'>-		cmd_pkt-&gt;entry_status = (uint8_t) rsp-&gt;id;</div><div class='del'>-	} else {</div><div class='del'>-		struct cmd_type_7 *cmd_pkt;</div><div class='del'>-		req_cnt = qla24xx_calc_iocbs(vha, tot_dsds);</div><div class='del'>-		if (req-&gt;cnt &lt; (req_cnt + 2)) {</div><div class='del'>-			cnt = (uint16_t)RD_REG_DWORD_RELAXED(</div><div class='del'>-			    &amp;reg-&gt;req_q_out[0]);</div><div class='del'>-			if (req-&gt;ring_index &lt; cnt)</div><div class='del'>-				req-&gt;cnt = cnt - req-&gt;ring_index;</div><div class='del'>-			else</div><div class='del'>-				req-&gt;cnt = req-&gt;length -</div><div class='del'>-					(req-&gt;ring_index - cnt);</div><div class='del'>-		}</div><div class='del'>-		if (req-&gt;cnt &lt; (req_cnt + 2))</div><div class='del'>-			goto queuing_error;</div><div class='del'>-</div><div class='del'>-		cmd_pkt = (struct cmd_type_7 *)req-&gt;ring_ptr;</div><div class='del'>-		cmd_pkt-&gt;handle = MAKE_HANDLE(req-&gt;id, handle);</div><div class='del'>-</div><div class='del'>-		/* Zero out remaining portion of packet. */</div><div class='del'>-		/* tagged queuing modifier -- default is TSK_SIMPLE (0).*/</div><div class='del'>-		clr_ptr = (uint32_t *)cmd_pkt + 2;</div><div class='del'>-		memset(clr_ptr, 0, REQUEST_ENTRY_SIZE - 8);</div><div class='del'>-		cmd_pkt-&gt;dseg_count = cpu_to_le16(tot_dsds);</div><div class='del'>-</div><div class='del'>-		/* Set NPORT-ID and LUN number*/</div><div class='del'>-		cmd_pkt-&gt;nport_handle = cpu_to_le16(sp-&gt;fcport-&gt;loop_id);</div><div class='del'>-		cmd_pkt-&gt;port_id[0] = sp-&gt;fcport-&gt;d_id.b.al_pa;</div><div class='del'>-		cmd_pkt-&gt;port_id[1] = sp-&gt;fcport-&gt;d_id.b.area;</div><div class='del'>-		cmd_pkt-&gt;port_id[2] = sp-&gt;fcport-&gt;d_id.b.domain;</div><div class='del'>-		cmd_pkt-&gt;vp_index = sp-&gt;fcport-&gt;vp_idx;</div><div class='del'>-</div><div class='del'>-		int_to_scsilun(sp-&gt;cmd-&gt;device-&gt;lun, &amp;cmd_pkt-&gt;lun);</div><div class='del'>-		host_to_fcp_swap((uint8_t *)&amp;cmd_pkt-&gt;lun,</div><div class='del'>-			sizeof(cmd_pkt-&gt;lun));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Update tagged queuing modifier -- default is TSK_SIMPLE (0).</div><div class='del'>-		 */</div><div class='del'>-		if (scsi_populate_tag_msg(cmd, tag)) {</div><div class='del'>-			switch (tag[0]) {</div><div class='del'>-			case HEAD_OF_QUEUE_TAG:</div><div class='del'>-				cmd_pkt-&gt;task = TSK_HEAD_OF_QUEUE;</div><div class='del'>-				break;</div><div class='del'>-			case ORDERED_QUEUE_TAG:</div><div class='del'>-				cmd_pkt-&gt;task = TSK_ORDERED;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Load SCSI command packet. */</div><div class='del'>-		memcpy(cmd_pkt-&gt;fcp_cdb, cmd-&gt;cmnd, cmd-&gt;cmd_len);</div><div class='del'>-		host_to_fcp_swap(cmd_pkt-&gt;fcp_cdb, sizeof(cmd_pkt-&gt;fcp_cdb));</div><div class='del'>-</div><div class='del'>-		cmd_pkt-&gt;byte_count = cpu_to_le32((uint32_t)scsi_bufflen(cmd));</div><div class='del'>-</div><div class='del'>-		/* Build IOCB segments */</div><div class='del'>-		qla24xx_build_scsi_iocbs(sp, cmd_pkt, tot_dsds);</div><div class='del'>-</div><div class='del'>-		/* Set total data segment count. */</div><div class='del'>-		cmd_pkt-&gt;entry_count = (uint8_t)req_cnt;</div><div class='del'>-		/* Specify response queue number where</div><div class='del'>-		 * completion should happen.</div><div class='del'>-		 */</div><div class='del'>-		cmd_pkt-&gt;entry_status = (uint8_t) rsp-&gt;id;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	/* Build command packet. */</div><div class='del'>-	req-&gt;current_outstanding_cmd = handle;</div><div class='del'>-	req-&gt;outstanding_cmds[handle] = sp;</div><div class='del'>-	sp-&gt;handle = handle;</div><div class='del'>-	sp-&gt;cmd-&gt;host_scribble = (unsigned char *)(unsigned long)handle;</div><div class='del'>-	req-&gt;cnt -= req_cnt;</div><div class='del'>-	wmb();</div><div class='del'>-</div><div class='del'>-	/* Adjust ring index. */</div><div class='del'>-	req-&gt;ring_index++;</div><div class='del'>-	if (req-&gt;ring_index == req-&gt;length) {</div><div class='del'>-		req-&gt;ring_index = 0;</div><div class='del'>-		req-&gt;ring_ptr = req-&gt;ring;</div><div class='del'>-	} else</div><div class='del'>-		req-&gt;ring_ptr++;</div><div class='del'>-</div><div class='del'>-	sp-&gt;flags |= SRB_DMA_VALID;</div><div class='del'>-</div><div class='del'>-	/* Set chip new ring index. */</div><div class='del'>-	/* write, read and verify logic */</div><div class='del'>-	dbval = dbval | (req-&gt;id &lt;&lt; 8) | (req-&gt;ring_index &lt;&lt; 16);</div><div class='del'>-	if (ql2xdbwr)</div><div class='del'>-		qla82xx_wr_32(ha, ha-&gt;nxdb_wr_ptr, dbval);</div><div class='del'>-	else {</div><div class='del'>-		WRT_REG_DWORD(</div><div class='del'>-			(unsigned long __iomem *)ha-&gt;nxdb_wr_ptr,</div><div class='del'>-			dbval);</div><div class='del'>-		wmb();</div><div class='del'>-		while (RD_REG_DWORD(ha-&gt;nxdb_rd_ptr) != dbval) {</div><div class='del'>-			WRT_REG_DWORD(</div><div class='del'>-				(unsigned long __iomem *)ha-&gt;nxdb_wr_ptr,</div><div class='del'>-				dbval);</div><div class='del'>-			wmb();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Manage unprocessed RIO/ZIO commands in response queue. */</div><div class='del'>-	if (vha-&gt;flags.process_response_queue &amp;&amp;</div><div class='del'>-	    rsp-&gt;ring_ptr-&gt;signature != RESPONSE_PROCESSED)</div><div class='del'>-		qla24xx_process_response_queue(vha, rsp);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='del'>-	return QLA_SUCCESS;</div><div class='del'>-</div><div class='del'>-queuing_error_fcp_cmnd:</div><div class='del'>-	dma_pool_free(ha-&gt;fcp_cmnd_dma_pool, ctx-&gt;fcp_cmnd, ctx-&gt;fcp_cmnd_dma);</div><div class='del'>-queuing_error:</div><div class='del'>-	if (tot_dsds)</div><div class='del'>-		scsi_dma_unmap(cmd);</div><div class='del'>-</div><div class='del'>-	if (sp-&gt;ctx) {</div><div class='del'>-		mempool_free(sp-&gt;ctx, ha-&gt;ctx_mempool);</div><div class='del'>-		sp-&gt;ctx = NULL;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='del'>-</div><div class='del'>-	return QLA_FUNCTION_FAILED;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static uint32_t *</div><div class='ctx'> qla82xx_read_flash_data(scsi_qla_host_t *vha, uint32_t *dwptr, uint32_t faddr,</div><div class='ctx'> 	uint32_t length)</div><div class='hunk'>@@ -3272,9 +2790,9 @@ qla82xx_write_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='del'>-qla82xx_start_iocbs(srb_t *sp)</div><div class='add'>+qla82xx_start_iocbs(scsi_qla_host_t *vha)</div><div class='ctx'> {</div><div class='del'>-	struct qla_hw_data *ha = sp-&gt;fcport-&gt;vha-&gt;hw;</div><div class='add'>+	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 device_reg_82xx __iomem *reg;</div><div class='ctx'> 	uint32_t dbval;</div><div class='hunk'>@@ -3659,11 +3177,10 @@ qla82xx_check_md_needed(scsi_qla_host_t *vha)</div><div class='ctx'> 				qla82xx_md_free(vha);</div><div class='ctx'> 				/* ALlocate MiniDump resources */</div><div class='ctx'> 				qla82xx_md_prep(vha);</div><div class='del'>-			} else</div><div class='del'>-				ql_log(ql_log_info, vha, 0xb02e,</div><div class='del'>-				    "Firmware dump available to retrieve\n",</div><div class='del'>-				    vha-&gt;host_no);</div><div class='del'>-		}</div><div class='add'>+			}</div><div class='add'>+		} else</div><div class='add'>+			ql_log(ql_log_info, vha, 0xb02e,</div><div class='add'>+			    "Firmware dump available to retrieve\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='hunk'>@@ -3758,7 +3275,6 @@ qla82xx_device_state_handler(scsi_qla_host_t *vha)</div><div class='ctx'> </div><div class='ctx'> 		switch (dev_state) {</div><div class='ctx'> 		case QLA82XX_DEV_READY:</div><div class='del'>-			qla82xx_check_md_needed(vha);</div><div class='ctx'> 			ha-&gt;flags.isp82xx_reset_owner = 0;</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		case QLA82XX_DEV_COLD:</div><div class='hunk'>@@ -4067,7 +3583,7 @@ int qla2x00_wait_for_fcoe_ctx_reset(scsi_qla_host_t *vha)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	ql_dbg(ql_dbg_p3p, vha, 0xb027,</div><div class='del'>-	    "%s status=%d.\n", status);</div><div class='add'>+	       "%s: status=%d.\n", __func__, status);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c<br/>index f9e5b85e84d8..4ed1e4a96b95 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_os.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_os.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_os.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla2xxx/qla_os.c</a></div><div class='hunk'>@@ -83,6 +83,9 @@ MODULE_PARM_DESC(ql2xextended_error_logging,</div><div class='ctx'> 		"\t\t0x00080000 - P3P Specific.  0x00040000 - Virtual Port.\n"</div><div class='ctx'> 		"\t\t0x00020000 - Buffer Dump.   0x00010000 - Misc.\n"</div><div class='ctx'> 		"\t\t0x7fffffff - For enabling all logs, can be too many logs.\n"</div><div class='add'>+		"\t\t0x1e400000 - Preferred value for capturing essential "</div><div class='add'>+		"debug information (equivalent to old "</div><div class='add'>+		"ql2xextended_error_logging=1).\n"</div><div class='ctx'> 		"\t\tDo LOGICAL OR of the value to enable more than one level");</div><div class='ctx'> </div><div class='ctx'> int ql2xshiftctondsd = 6;</div><div class='hunk'>@@ -199,7 +202,7 @@ int ql2xmdcapmask = 0x1F;</div><div class='ctx'> module_param(ql2xmdcapmask, int, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(ql2xmdcapmask,</div><div class='ctx'> 		"Set the Minidump driver capture mask level. "</div><div class='del'>-		"Default is 0x7F - Can be set to 0x3, 0x7, 0xF, 0x1F, 0x7F.");</div><div class='add'>+		"Default is 0x1F - Can be set to 0x3, 0x7, 0xF, 0x1F, 0x7F.");</div><div class='ctx'> </div><div class='ctx'> int ql2xmdenable = 1;</div><div class='ctx'> module_param(ql2xmdenable, int, S_IRUGO);</div><div class='hunk'>@@ -847,14 +850,10 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)</div><div class='ctx'> 	int wait = 0;</div><div class='ctx'> 	struct qla_hw_data *ha = vha-&gt;hw;</div><div class='ctx'> </div><div class='del'>-	ql_dbg(ql_dbg_taskm, vha, 0x8000,</div><div class='del'>-	    "Entered %s for cmd=%p.\n", __func__, cmd);</div><div class='ctx'> 	if (!CMD_SP(cmd))</div><div class='ctx'> 		return SUCCESS;</div><div class='ctx'> </div><div class='ctx'> 	ret = fc_block_scsi_eh(cmd);</div><div class='del'>-	ql_dbg(ql_dbg_taskm, vha, 0x8001,</div><div class='del'>-	    "Return value of fc_block_scsi_eh=%d.\n", ret);</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	ret = SUCCESS;</div><div class='hunk'>@@ -870,7 +869,8 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_taskm, vha, 0x8002,</div><div class='del'>-	    "Aborting sp=%p cmd=%p from RISC ", sp, cmd);</div><div class='add'>+	    "Aborting from RISC nexus=%ld:%d:%d sp=%p cmd=%p\n",</div><div class='add'>+	    vha-&gt;host_no, id, lun, sp, cmd);</div><div class='ctx'> </div><div class='ctx'> 	/* Get a reference to the sp and drop the lock.*/</div><div class='ctx'> 	sp_get(sp);</div><div class='hunk'>@@ -878,10 +878,10 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='ctx'> 	if (ha-&gt;isp_ops-&gt;abort_command(sp)) {</div><div class='ctx'> 		ql_dbg(ql_dbg_taskm, vha, 0x8003,</div><div class='del'>-		    "Abort command mbx failed for cmd=%p.\n", cmd);</div><div class='add'>+		    "Abort command mbx failed cmd=%p.\n", cmd);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ql_dbg(ql_dbg_taskm, vha, 0x8004,</div><div class='del'>-		    "Abort command mbx success.\n");</div><div class='add'>+		    "Abort command mbx success cmd=%p.\n", cmd);</div><div class='ctx'> 		wait = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -897,13 +897,14 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)</div><div class='ctx'> 	if (wait) {</div><div class='ctx'> 		if (qla2x00_eh_wait_on_command(cmd) != QLA_SUCCESS) {</div><div class='ctx'> 			ql_log(ql_log_warn, vha, 0x8006,</div><div class='del'>-			    "Abort handler timed out for cmd=%p.\n", cmd);</div><div class='add'>+			    "Abort handler timed out cmd=%p.\n", cmd);</div><div class='ctx'> 			ret = FAILED;</div><div class='ctx'> 		}</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 --  %d %x.\n", wait, ret);</div><div class='add'>+	    "Abort command issued nexus=%ld:%d:%d --  %d %x.\n",</div><div class='add'>+	    vha-&gt;host_no, id, lun, wait, ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -972,19 +973,15 @@ __qla2xxx_eh_generic_reset(char *name, enum nexus_wait_type type,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!fcport) {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x8007,</div><div class='del'>-		    "fcport is NULL.\n");</div><div class='ctx'> 		return FAILED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = fc_block_scsi_eh(cmd);</div><div class='del'>-	ql_dbg(ql_dbg_taskm, vha, 0x8008,</div><div class='del'>-	    "fc_block_scsi_eh ret=%d.\n", err);</div><div class='ctx'> 	if (err != 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	ql_log(ql_log_info, vha, 0x8009,</div><div class='del'>-	    "%s RESET ISSUED for id %d lun %d cmd=%p.\n", name,</div><div class='add'>+	    "%s RESET ISSUED nexus=%ld:%d:%d cmd=%p.\n", name, vha-&gt;host_no,</div><div class='ctx'> 	    cmd-&gt;device-&gt;id, cmd-&gt;device-&gt;lun, cmd);</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='hunk'>@@ -1009,15 +1006,16 @@ __qla2xxx_eh_generic_reset(char *name, enum nexus_wait_type type,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ql_log(ql_log_info, vha, 0x800e,</div><div class='del'>-	    "%s RESET SUCCEEDED for id %d lun %d cmd=%p.\n", name,</div><div class='del'>-	    cmd-&gt;device-&gt;id, cmd-&gt;device-&gt;lun, cmd);</div><div class='add'>+	    "%s RESET SUCCEEDED nexus:%ld:%d:%d cmd=%p.\n", name,</div><div class='add'>+	    vha-&gt;host_no, cmd-&gt;device-&gt;id, cmd-&gt;device-&gt;lun, cmd);</div><div class='ctx'> </div><div class='ctx'> 	return SUCCESS;</div><div class='ctx'> </div><div class='ctx'> eh_reset_failed:</div><div class='ctx'> 	ql_log(ql_log_info, vha, 0x800f,</div><div class='del'>-	    "%s RESET FAILED: %s for id %d lun %d cmd=%p.\n", name,</div><div class='del'>-	    reset_errors[err], cmd-&gt;device-&gt;id, cmd-&gt;device-&gt;lun);</div><div class='add'>+	    "%s RESET FAILED: %s nexus=%ld:%d:%d cmd=%p.\n", name,</div><div class='add'>+	    reset_errors[err], vha-&gt;host_no, cmd-&gt;device-&gt;id, cmd-&gt;device-&gt;lun,</div><div class='add'>+	    cmd);</div><div class='ctx'> 	return FAILED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1068,20 +1066,16 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)</div><div class='ctx'> 	lun = cmd-&gt;device-&gt;lun;</div><div class='ctx'> </div><div class='ctx'> 	if (!fcport) {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x8010,</div><div class='del'>-		    "fcport is NULL.\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = fc_block_scsi_eh(cmd);</div><div class='del'>-	ql_dbg(ql_dbg_taskm, vha, 0x8011,</div><div class='del'>-	    "fc_block_scsi_eh ret=%d.\n", ret);</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	ret = FAILED;</div><div class='ctx'> </div><div class='ctx'> 	ql_log(ql_log_info, vha, 0x8012,</div><div class='del'>-	    "BUS RESET ISSUED for id %d lun %d.\n", id, lun);</div><div class='add'>+	    "BUS RESET ISSUED nexus=%ld:%d%d.\n", vha-&gt;host_no, id, lun);</div><div class='ctx'> </div><div class='ctx'> 	if (qla2x00_wait_for_hba_online(vha) != QLA_SUCCESS) {</div><div class='ctx'> 		ql_log(ql_log_fatal, vha, 0x8013,</div><div class='hunk'>@@ -1105,7 +1099,8 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)</div><div class='ctx'> </div><div class='ctx'> eh_bus_reset_done:</div><div class='ctx'> 	ql_log(ql_log_warn, vha, 0x802b,</div><div class='del'>-	    "BUS RESET %s.\n", (ret == FAILED) ? "FAILED" : "SUCCEDED");</div><div class='add'>+	    "BUS RESET %s nexus=%ld:%d:%d.\n",</div><div class='add'>+	    (ret == FAILED) ? "FAILED" : "SUCCEDED", vha-&gt;host_no, id, lun);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1139,20 +1134,16 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)</div><div class='ctx'> 	lun = cmd-&gt;device-&gt;lun;</div><div class='ctx'> </div><div class='ctx'> 	if (!fcport) {</div><div class='del'>-		ql_log(ql_log_warn, vha, 0x8016,</div><div class='del'>-		    "fcport is NULL.\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = fc_block_scsi_eh(cmd);</div><div class='del'>-	ql_dbg(ql_dbg_taskm, vha, 0x8017,</div><div class='del'>-	    "fc_block_scsi_eh ret=%d.\n", ret);</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	ret = FAILED;</div><div class='ctx'> </div><div class='ctx'> 	ql_log(ql_log_info, vha, 0x8018,</div><div class='del'>-	    "ADAPTER RESET ISSUED for id %d lun %d.\n", id, lun);</div><div class='add'>+	    "ADAPTER RESET ISSUED nexus=%ld:%d:%d.\n", vha-&gt;host_no, id, lun);</div><div class='ctx'> </div><div class='ctx'> 	if (qla2x00_wait_for_reset_ready(vha) != QLA_SUCCESS)</div><div class='ctx'> 		goto eh_host_reset_lock;</div><div class='hunk'>@@ -1193,8 +1184,9 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)</div><div class='ctx'> 		ret = SUCCESS;</div><div class='ctx'> </div><div class='ctx'> eh_host_reset_lock:</div><div class='del'>-	qla_printk(KERN_INFO, ha, "%s: reset %s.\n", __func__,</div><div class='del'>-	    (ret == FAILED) ? "failed" : "succeeded");</div><div class='add'>+	ql_log(ql_log_info, vha, 0x8017,</div><div class='add'>+	    "ADAPTER RESET %s nexus=%ld:%d:%d.\n",</div><div class='add'>+	    (ret == FAILED) ? "FAILED" : "SUCCEEDED", vha-&gt;host_no, id, lun);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1344,10 +1336,8 @@ static void qla2x00_handle_queue_full(struct scsi_device *sdev, int qdepth)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_io, fcport-&gt;vha, 0x3029,</div><div class='del'>-	    "Queue depth adjusted-down "</div><div class='del'>-	    "to %d for scsi(%ld:%d:%d:%d).\n",</div><div class='del'>-	    sdev-&gt;queue_depth, fcport-&gt;vha-&gt;host_no,</div><div class='del'>-	    sdev-&gt;channel, sdev-&gt;id, sdev-&gt;lun);</div><div class='add'>+	    "Queue depth adjusted-down to %d for nexus=%ld:%d:%d.\n",</div><div class='add'>+	    sdev-&gt;queue_depth, fcport-&gt;vha-&gt;host_no, sdev-&gt;id, sdev-&gt;lun);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void qla2x00_adjust_sdev_qdepth_up(struct scsi_device *sdev, int qdepth)</div><div class='hunk'>@@ -1369,10 +1359,8 @@ static void qla2x00_adjust_sdev_qdepth_up(struct scsi_device *sdev, int qdepth)</div><div class='ctx'> 		scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, qdepth);</div><div class='ctx'> </div><div class='ctx'> 	ql_dbg(ql_dbg_io, vha, 0x302a,</div><div class='del'>-	    "Queue depth adjusted-up to %d for "</div><div class='del'>-	    "scsi(%ld:%d:%d:%d).\n",</div><div class='del'>-	    sdev-&gt;queue_depth, fcport-&gt;vha-&gt;host_no,</div><div class='del'>-	    sdev-&gt;channel, sdev-&gt;id, sdev-&gt;lun);</div><div class='add'>+	    "Queue depth adjusted-up to %d for nexus=%ld:%d:%d.\n",</div><div class='add'>+	    sdev-&gt;queue_depth, fcport-&gt;vha-&gt;host_no, sdev-&gt;id, sdev-&gt;lun);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1496,6 +1484,118 @@ qla24xx_disable_intrs(struct qla_hw_data *ha)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+qla2x00_iospace_config(struct qla_hw_data *ha)</div><div class='add'>+{</div><div class='add'>+	resource_size_t pio;</div><div class='add'>+	uint16_t msix;</div><div class='add'>+	int cpus;</div><div class='add'>+</div><div class='add'>+	if (IS_QLA82XX(ha))</div><div class='add'>+		return qla82xx_iospace_config(ha);</div><div class='add'>+</div><div class='add'>+	if (pci_request_selected_regions(ha-&gt;pdev, ha-&gt;bars,</div><div class='add'>+	    QLA2XXX_DRIVER_NAME)) {</div><div class='add'>+		ql_log_pci(ql_log_fatal, ha-&gt;pdev, 0x0011,</div><div class='add'>+		    "Failed to reserve PIO/MMIO regions (%s), aborting.\n",</div><div class='add'>+		    pci_name(ha-&gt;pdev));</div><div class='add'>+		goto iospace_error_exit;</div><div class='add'>+	}</div><div class='add'>+	if (!(ha-&gt;bars &amp; 1))</div><div class='add'>+		goto skip_pio;</div><div class='add'>+</div><div class='add'>+	/* We only need PIO for Flash operations on ISP2312 v2 chips. */</div><div class='add'>+	pio = pci_resource_start(ha-&gt;pdev, 0);</div><div class='add'>+	if (pci_resource_flags(ha-&gt;pdev, 0) &amp; IORESOURCE_IO) {</div><div class='add'>+		if (pci_resource_len(ha-&gt;pdev, 0) &lt; MIN_IOBASE_LEN) {</div><div class='add'>+			ql_log_pci(ql_log_warn, ha-&gt;pdev, 0x0012,</div><div class='add'>+			    "Invalid pci I/O region size (%s).\n",</div><div class='add'>+			    pci_name(ha-&gt;pdev));</div><div class='add'>+			pio = 0;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ql_log_pci(ql_log_warn, ha-&gt;pdev, 0x0013,</div><div class='add'>+		    "Region #0 no a PIO resource (%s).\n",</div><div class='add'>+		    pci_name(ha-&gt;pdev));</div><div class='add'>+		pio = 0;</div><div class='add'>+	}</div><div class='add'>+	ha-&gt;pio_address = pio;</div><div class='add'>+	ql_dbg_pci(ql_dbg_init, ha-&gt;pdev, 0x0014,</div><div class='add'>+	    "PIO address=%llu.\n",</div><div class='add'>+	    (unsigned long long)ha-&gt;pio_address);</div><div class='add'>+</div><div class='add'>+skip_pio:</div><div class='add'>+	/* Use MMIO operations for all accesses. */</div><div class='add'>+	if (!(pci_resource_flags(ha-&gt;pdev, 1) &amp; IORESOURCE_MEM)) {</div><div class='add'>+		ql_log_pci(ql_log_fatal, ha-&gt;pdev, 0x0015,</div><div class='add'>+		    "Region #1 not an MMIO resource (%s), aborting.\n",</div><div class='add'>+		    pci_name(ha-&gt;pdev));</div><div class='add'>+		goto iospace_error_exit;</div><div class='add'>+	}</div><div class='add'>+	if (pci_resource_len(ha-&gt;pdev, 1) &lt; MIN_IOBASE_LEN) {</div><div class='add'>+		ql_log_pci(ql_log_fatal, ha-&gt;pdev, 0x0016,</div><div class='add'>+		    "Invalid PCI mem region size (%s), aborting.\n",</div><div class='add'>+		    pci_name(ha-&gt;pdev));</div><div class='add'>+		goto iospace_error_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ha-&gt;iobase = ioremap(pci_resource_start(ha-&gt;pdev, 1), MIN_IOBASE_LEN);</div><div class='add'>+	if (!ha-&gt;iobase) {</div><div class='add'>+		ql_log_pci(ql_log_fatal, ha-&gt;pdev, 0x0017,</div><div class='add'>+		    "Cannot remap MMIO (%s), aborting.\n",</div><div class='add'>+		    pci_name(ha-&gt;pdev));</div><div class='add'>+		goto iospace_error_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Determine queue resources */</div><div class='add'>+	ha-&gt;max_req_queues = ha-&gt;max_rsp_queues = 1;</div><div class='add'>+	if ((ql2xmaxqueues &lt;= 1 &amp;&amp; !ql2xmultique_tag) ||</div><div class='add'>+		(ql2xmaxqueues &gt; 1 &amp;&amp; ql2xmultique_tag) ||</div><div class='add'>+		(!IS_QLA25XX(ha) &amp;&amp; !IS_QLA81XX(ha)))</div><div class='add'>+		goto mqiobase_exit;</div><div class='add'>+</div><div class='add'>+	ha-&gt;mqiobase = ioremap(pci_resource_start(ha-&gt;pdev, 3),</div><div class='add'>+			pci_resource_len(ha-&gt;pdev, 3));</div><div class='add'>+	if (ha-&gt;mqiobase) {</div><div class='add'>+		ql_dbg_pci(ql_dbg_init, ha-&gt;pdev, 0x0018,</div><div class='add'>+		    "MQIO Base=%p.\n", ha-&gt;mqiobase);</div><div class='add'>+		/* Read MSIX vector size of the board */</div><div class='add'>+		pci_read_config_word(ha-&gt;pdev, QLA_PCI_MSIX_CONTROL, &amp;msix);</div><div class='add'>+		ha-&gt;msix_count = msix;</div><div class='add'>+		/* Max queues are bounded by available msix vectors */</div><div class='add'>+		/* queue 0 uses two msix vectors */</div><div class='add'>+		if (ql2xmultique_tag) {</div><div class='add'>+			cpus = num_online_cpus();</div><div class='add'>+			ha-&gt;max_rsp_queues = (ha-&gt;msix_count - 1 &gt; cpus) ?</div><div class='add'>+				(cpus + 1) : (ha-&gt;msix_count - 1);</div><div class='add'>+			ha-&gt;max_req_queues = 2;</div><div class='add'>+		} else if (ql2xmaxqueues &gt; 1) {</div><div class='add'>+			ha-&gt;max_req_queues = ql2xmaxqueues &gt; QLA_MQ_SIZE ?</div><div class='add'>+			    QLA_MQ_SIZE : ql2xmaxqueues;</div><div class='add'>+			ql_dbg_pci(ql_dbg_multiq, ha-&gt;pdev, 0xc008,</div><div class='add'>+			    "QoS mode set, max no of request queues:%d.\n",</div><div class='add'>+			    ha-&gt;max_req_queues);</div><div class='add'>+			ql_dbg_pci(ql_dbg_init, ha-&gt;pdev, 0x0019,</div><div class='add'>+			    "QoS mode set, max no of request queues:%d.\n",</div><div class='add'>+			    ha-&gt;max_req_queues);</div><div class='add'>+		}</div><div class='add'>+		ql_log_pci(ql_log_info, ha-&gt;pdev, 0x001a,</div><div class='add'>+		    "MSI-X vector count: %d.\n", msix);</div><div class='add'>+	} else</div><div class='add'>+		ql_log_pci(ql_log_info, ha-&gt;pdev, 0x001b,</div><div class='add'>+		    "BAR 3 not enabled.\n");</div><div class='add'>+</div><div class='add'>+mqiobase_exit:</div><div class='add'>+	ha-&gt;msix_count = ha-&gt;max_rsp_queues + 1;</div><div class='add'>+	ql_dbg_pci(ql_dbg_init, ha-&gt;pdev, 0x001c,</div><div class='add'>+	    "MSIX Count:%d.\n", ha-&gt;msix_count);</div><div class='add'>+	return (0);</div><div class='add'>+</div><div class='add'>+iospace_error_exit:</div><div class='add'>+	return (-ENOMEM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static struct isp_operations qla2100_isp_ops = {</div><div class='ctx'> 	.pci_config		= qla2100_pci_config,</div><div class='ctx'> 	.reset_chip		= qla2x00_reset_chip,</div><div class='hunk'>@@ -1530,6 +1630,7 @@ static struct isp_operations qla2100_isp_ops = {</div><div class='ctx'> 	.get_flash_version	= qla2x00_get_flash_version,</div><div class='ctx'> 	.start_scsi		= qla2x00_start_scsi,</div><div class='ctx'> 	.abort_isp		= qla2x00_abort_isp,</div><div class='add'>+	.iospace_config     	= qla2x00_iospace_config,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct isp_operations qla2300_isp_ops = {</div><div class='hunk'>@@ -1566,6 +1667,7 @@ static struct isp_operations qla2300_isp_ops = {</div><div class='ctx'> 	.get_flash_version	= qla2x00_get_flash_version,</div><div class='ctx'> 	.start_scsi		= qla2x00_start_scsi,</div><div class='ctx'> 	.abort_isp		= qla2x00_abort_isp,</div><div class='add'>+	.iospace_config     	= qla2x00_iospace_config,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct isp_operations qla24xx_isp_ops = {</div><div class='hunk'>@@ -1602,6 +1704,7 @@ static struct isp_operations qla24xx_isp_ops = {</div><div class='ctx'> 	.get_flash_version	= qla24xx_get_flash_version,</div><div class='ctx'> 	.start_scsi		= qla24xx_start_scsi,</div><div class='ctx'> 	.abort_isp		= qla2x00_abort_isp,</div><div class='add'>+	.iospace_config     	= qla2x00_iospace_config,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct isp_operations qla25xx_isp_ops = {</div><div class='hunk'>@@ -1638,6 +1741,7 @@ static struct isp_operations qla25xx_isp_ops = {</div><div class='ctx'> 	.get_flash_version	= qla24xx_get_flash_version,</div><div class='ctx'> 	.start_scsi		= qla24xx_dif_start_scsi,</div><div class='ctx'> 	.abort_isp		= qla2x00_abort_isp,</div><div class='add'>+	.iospace_config     	= qla2x00_iospace_config,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct isp_operations qla81xx_isp_ops = {</div><div class='hunk'>@@ -1674,6 +1778,7 @@ static struct isp_operations qla81xx_isp_ops = {</div><div class='ctx'> 	.get_flash_version	= qla24xx_get_flash_version,</div><div class='ctx'> 	.start_scsi		= qla24xx_dif_start_scsi,</div><div class='ctx'> 	.abort_isp		= qla2x00_abort_isp,</div><div class='add'>+	.iospace_config     	= qla2x00_iospace_config,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct isp_operations qla82xx_isp_ops = {</div><div class='hunk'>@@ -1710,6 +1815,7 @@ static struct isp_operations qla82xx_isp_ops = {</div><div class='ctx'> 	.get_flash_version	= qla24xx_get_flash_version,</div><div class='ctx'> 	.start_scsi             = qla82xx_start_scsi,</div><div class='ctx'> 	.abort_isp		= qla82xx_abort_isp,</div><div class='add'>+	.iospace_config     	= qla82xx_iospace_config,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='hunk'>@@ -1819,121 +1925,10 @@ qla2x00_set_isp_flags(struct qla_hw_data *ha)</div><div class='ctx'> 	else</div><div class='ctx'> 		ha-&gt;flags.port0 = 0;</div><div class='ctx'> 	ql_dbg_pci(ql_dbg_init, ha-&gt;pdev, 0x000b,</div><div class='del'>-	    "device_type=0x%x port=%d fw_srisc_address=%p.\n",</div><div class='add'>+	    "device_type=0x%x port=%d fw_srisc_address=0x%x.\n",</div><div class='ctx'> 	    ha-&gt;device_type, ha-&gt;flags.port0, ha-&gt;fw_srisc_address);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-qla2x00_iospace_config(struct qla_hw_data *ha)</div><div class='del'>-{</div><div class='del'>-	resource_size_t pio;</div><div class='del'>-	uint16_t msix;</div><div class='del'>-	int cpus;</div><div class='del'>-</div><div class='del'>-	if (IS_QLA82XX(ha))</div><div class='del'>-		return qla82xx_iospace_config(ha);</div><div class='del'>-</div><div class='del'>-	if (pci_request_selected_regions(ha-&gt;pdev, ha-&gt;bars,</div><div class='del'>-	    QLA2XXX_DRIVER_NAME)) {</div><div class='del'>-		ql_log_pci(ql_log_fatal, ha-&gt;pdev, 0x0011,</div><div class='del'>-		    "Failed to reserve PIO/MMIO regions (%s), aborting.\n",</div><div class='del'>-		    pci_name(ha-&gt;pdev));</div><div class='del'>-		goto iospace_error_exit;</div><div class='del'>-	}</div><div class='del'>-	if (!(ha-&gt;bars &amp; 1))</div><div class='del'>-		goto skip_pio;</div><div class='del'>-</div><div class='del'>-	/* We only need PIO for Flash operations on ISP2312 v2 chips. */</div><div class='del'>-	pio = pci_resource_start(ha-&gt;pdev, 0);</div><div class='del'>-	if (pci_resource_flags(ha-&gt;pdev, 0) &amp; IORESOURCE_IO) {</div><div class='del'>-		if (pci_resource_len(ha-&gt;pdev, 0) &lt; MIN_IOBASE_LEN) {</div><div class='del'>-			ql_log_pci(ql_log_warn, ha-&gt;pdev, 0x0012,</div><div class='del'>-			    "Invalid pci I/O region size (%s).\n",</div><div class='del'>-			    pci_name(ha-&gt;pdev));</div><div class='del'>-			pio = 0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		ql_log_pci(ql_log_warn, ha-&gt;pdev, 0x0013,</div><div class='del'>-		    "Region #0 no a PIO resource (%s).\n",</div><div class='del'>-		    pci_name(ha-&gt;pdev));</div><div class='del'>-		pio = 0;</div><div class='del'>-	}</div><div class='del'>-	ha-&gt;pio_address = pio;</div><div class='del'>-	ql_dbg_pci(ql_dbg_init, ha-&gt;pdev, 0x0014,</div><div class='del'>-	    "PIO address=%p.\n",</div><div class='del'>-	    ha-&gt;pio_address);</div><div class='del'>-</div><div class='del'>-skip_pio:</div><div class='del'>-	/* Use MMIO operations for all accesses. */</div><div class='del'>-	if (!(pci_resource_flags(ha-&gt;pdev, 1) &amp; IORESOURCE_MEM)) {</div><div class='del'>-		ql_log_pci(ql_log_fatal, ha-&gt;pdev, 0x0015,</div><div class='del'>-		    "Region #1 not an MMIO resource (%s), aborting.\n",</div><div class='del'>-		    pci_name(ha-&gt;pdev));</div><div class='del'>-		goto iospace_error_exit;</div><div class='del'>-	}</div><div class='del'>-	if (pci_resource_len(ha-&gt;pdev, 1) &lt; MIN_IOBASE_LEN) {</div><div class='del'>-		ql_log_pci(ql_log_fatal, ha-&gt;pdev, 0x0016,</div><div class='del'>-		    "Invalid PCI mem region size (%s), aborting.\n",</div><div class='del'>-		    pci_name(ha-&gt;pdev));</div><div class='del'>-		goto iospace_error_exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ha-&gt;iobase = ioremap(pci_resource_start(ha-&gt;pdev, 1), MIN_IOBASE_LEN);</div><div class='del'>-	if (!ha-&gt;iobase) {</div><div class='del'>-		ql_log_pci(ql_log_fatal, ha-&gt;pdev, 0x0017,</div><div class='del'>-		    "Cannot remap MMIO (%s), aborting.\n",</div><div class='del'>-		    pci_name(ha-&gt;pdev));</div><div class='del'>-		goto iospace_error_exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Determine queue resources */</div><div class='del'>-	ha-&gt;max_req_queues = ha-&gt;max_rsp_queues = 1;</div><div class='del'>-	if ((ql2xmaxqueues &lt;= 1 &amp;&amp; !ql2xmultique_tag) ||</div><div class='del'>-		(ql2xmaxqueues &gt; 1 &amp;&amp; ql2xmultique_tag) ||</div><div class='del'>-		(!IS_QLA25XX(ha) &amp;&amp; !IS_QLA81XX(ha)))</div><div class='del'>-		goto mqiobase_exit;</div><div class='del'>-</div><div class='del'>-	ha-&gt;mqiobase = ioremap(pci_resource_start(ha-&gt;pdev, 3),</div><div class='del'>-			pci_resource_len(ha-&gt;pdev, 3));</div><div class='del'>-	if (ha-&gt;mqiobase) {</div><div class='del'>-		ql_dbg_pci(ql_dbg_init, ha-&gt;pdev, 0x0018,</div><div class='del'>-		    "MQIO Base=%p.\n", ha-&gt;mqiobase);</div><div class='del'>-		/* Read MSIX vector size of the board */</div><div class='del'>-		pci_read_config_word(ha-&gt;pdev, QLA_PCI_MSIX_CONTROL, &amp;msix);</div><div class='del'>-		ha-&gt;msix_count = msix;</div><div class='del'>-		/* Max queues are bounded by available msix vectors */</div><div class='del'>-		/* queue 0 uses two msix vectors */</div><div class='del'>-		if (ql2xmultique_tag) {</div><div class='del'>-			cpus = num_online_cpus();</div><div class='del'>-			ha-&gt;max_rsp_queues = (ha-&gt;msix_count - 1 &gt; cpus) ?</div><div class='del'>-				(cpus + 1) : (ha-&gt;msix_count - 1);</div><div class='del'>-			ha-&gt;max_req_queues = 2;</div><div class='del'>-		} else if (ql2xmaxqueues &gt; 1) {</div><div class='del'>-			ha-&gt;max_req_queues = ql2xmaxqueues &gt; QLA_MQ_SIZE ?</div><div class='del'>-			    QLA_MQ_SIZE : ql2xmaxqueues;</div><div class='del'>-			ql_dbg_pci(ql_dbg_multiq, ha-&gt;pdev, 0xc008,</div><div class='del'>-			    "QoS mode set, max no of request queues:%d.\n",</div><div class='del'>-			    ha-&gt;max_req_queues);</div><div class='del'>-			ql_dbg_pci(ql_dbg_init, ha-&gt;pdev, 0x0019,</div><div class='del'>-			    "QoS mode set, max no of request queues:%d.\n",</div><div class='del'>-			    ha-&gt;max_req_queues);</div><div class='del'>-		}</div><div class='del'>-		ql_log_pci(ql_log_info, ha-&gt;pdev, 0x001a,</div><div class='del'>-		    "MSI-X vector count: %d.\n", msix);</div><div class='del'>-	} else</div><div class='del'>-		ql_log_pci(ql_log_info, ha-&gt;pdev, 0x001b,</div><div class='del'>-		    "BAR 3 not enabled.\n");</div><div class='del'>-</div><div class='del'>-mqiobase_exit:</div><div class='del'>-	ha-&gt;msix_count = ha-&gt;max_rsp_queues + 1;</div><div class='del'>-	ql_dbg_pci(ql_dbg_init, ha-&gt;pdev, 0x001c,</div><div class='del'>-	    "MSIX Count:%d.\n", ha-&gt;msix_count);</div><div class='del'>-	return (0);</div><div class='del'>-</div><div class='del'>-iospace_error_exit:</div><div class='del'>-	return (-ENOMEM);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> qla2xxx_scan_start(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='hunk'>@@ -2032,14 +2027,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 		pdev-&gt;needs_freset = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Configure PCI I/O space */</div><div class='del'>-	ret = qla2x00_iospace_config(ha);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto probe_hw_failed;</div><div class='del'>-</div><div class='del'>-	ql_log_pci(ql_log_info, pdev, 0x001d,</div><div class='del'>-	    "Found an ISP%04X irq %d iobase 0x%p.\n",</div><div class='del'>-	    pdev-&gt;device, pdev-&gt;irq, ha-&gt;iobase);</div><div class='ctx'> 	ha-&gt;prev_topology = 0;</div><div class='ctx'> 	ha-&gt;init_cb_size = sizeof(init_cb_t);</div><div class='ctx'> 	ha-&gt;link_data_rate = PORT_SPEED_UNKNOWN;</div><div class='hunk'>@@ -2152,6 +2139,15 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	    "flash_data_off=%d, nvram_conf_off=%d, nvram_data_off=%d.\n",</div><div class='ctx'> 	    ha-&gt;isp_ops, ha-&gt;flash_conf_off, ha-&gt;flash_data_off,</div><div class='ctx'> 	    ha-&gt;nvram_conf_off, ha-&gt;nvram_data_off);</div><div class='add'>+</div><div class='add'>+	/* Configure PCI I/O space */</div><div class='add'>+	ret = ha-&gt;isp_ops-&gt;iospace_config(ha);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto probe_hw_failed;</div><div class='add'>+</div><div class='add'>+	ql_log_pci(ql_log_info, pdev, 0x001d,</div><div class='add'>+	    "Found an ISP%04X irq %d iobase 0x%p.\n",</div><div class='add'>+	    pdev-&gt;device, pdev-&gt;irq, ha-&gt;iobase);</div><div class='ctx'> 	mutex_init(&amp;ha-&gt;vport_lock);</div><div class='ctx'> 	init_completion(&amp;ha-&gt;mbx_cmd_comp);</div><div class='ctx'> 	complete(&amp;ha-&gt;mbx_cmd_comp);</div><div class='hunk'>@@ -2227,7 +2223,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	ql_dbg(ql_dbg_init, base_vha, 0x0033,</div><div class='ctx'> 	    "max_id=%d this_id=%d "</div><div class='ctx'> 	    "cmd_per_len=%d unique_id=%d max_cmd_len=%d max_channel=%d "</div><div class='del'>-	    "max_lun=%d transportt=%p, vendor_id=%d.\n", host-&gt;max_id,</div><div class='add'>+	    "max_lun=%d transportt=%p, vendor_id=%llu.\n", host-&gt;max_id,</div><div class='ctx'> 	    host-&gt;this_id, host-&gt;cmd_per_lun, host-&gt;unique_id,</div><div class='ctx'> 	    host-&gt;max_cmd_len, host-&gt;max_channel, host-&gt;max_lun,</div><div class='ctx'> 	    host-&gt;transportt, sht-&gt;vendor_id);</div><div class='hunk'>@@ -2382,9 +2378,6 @@ skip_dpc:</div><div class='ctx'> </div><div class='ctx'> 	qla2x00_dfs_setup(base_vha);</div><div class='ctx'> </div><div class='del'>-	ql_log(ql_log_info, base_vha, 0x00fa,</div><div class='del'>-	    "QLogic Fibre Channed HBA Driver: %s.\n",</div><div class='del'>-	    qla2x00_version_str);</div><div class='ctx'> 	ql_log(ql_log_info, base_vha, 0x00fb,</div><div class='ctx'> 	    "QLogic %s - %s.\n",</div><div class='ctx'> 	    ha-&gt;model_number, ha-&gt;model_desc ? ha-&gt;model_desc : "");</div><div class='hunk'>@@ -2833,7 +2826,7 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len,</div><div class='ctx'> 		if (!ha-&gt;sns_cmd)</div><div class='ctx'> 			goto fail_dma_pool;</div><div class='ctx'> 		ql_dbg_pci(ql_dbg_init, ha-&gt;pdev, 0x0026,</div><div class='del'>-		    "sns_cmd.\n", ha-&gt;sns_cmd);</div><div class='add'>+		    "sns_cmd: %p.\n", ha-&gt;sns_cmd);</div><div class='ctx'> 	} else {</div><div class='ctx'> 	/* Get consistent memory allocated for MS IOCB */</div><div class='ctx'> 		ha-&gt;ms_iocb = dma_pool_alloc(ha-&gt;s_dma_pool, GFP_KERNEL,</div><div class='hunk'>@@ -3460,27 +3453,21 @@ qla2x00_do_dpc(void *data)</div><div class='ctx'> 		schedule();</div><div class='ctx'> 		__set_current_state(TASK_RUNNING);</div><div class='ctx'> </div><div class='del'>-		ql_dbg(ql_dbg_dpc, base_vha, 0x4001,</div><div class='del'>-		    "DPC handler waking up.\n");</div><div class='del'>-		ql_dbg(ql_dbg_dpc, base_vha, 0x4002,</div><div class='del'>-		    "dpc_flags=0x%lx.\n", base_vha-&gt;dpc_flags);</div><div class='del'>-</div><div class='del'>-		/* Initialization not yet finished. Don't do anything yet. */</div><div class='del'>-		if (!base_vha-&gt;flags.init_done)</div><div class='del'>-			continue;</div><div class='add'>+		if (!base_vha-&gt;flags.init_done || ha-&gt;flags.mbox_busy)</div><div class='add'>+			goto end_loop;</div><div class='ctx'> </div><div class='ctx'> 		if (ha-&gt;flags.eeh_busy) {</div><div class='ctx'> 			ql_dbg(ql_dbg_dpc, base_vha, 0x4003,</div><div class='ctx'> 			    "eeh_busy=%d.\n", ha-&gt;flags.eeh_busy);</div><div class='del'>-			continue;</div><div class='add'>+			goto end_loop;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ha-&gt;dpc_active = 1;</div><div class='ctx'> </div><div class='del'>-		if (ha-&gt;flags.mbox_busy) {</div><div class='del'>-			ha-&gt;dpc_active = 0;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='add'>+		ql_dbg(ql_dbg_dpc, base_vha, 0x4001,</div><div class='add'>+		    "DPC handler waking up.\n");</div><div class='add'>+		ql_dbg(ql_dbg_dpc, base_vha, 0x4002,</div><div class='add'>+		    "dpc_flags=0x%lx.\n", base_vha-&gt;dpc_flags);</div><div class='ctx'> </div><div class='ctx'> 		qla2x00_do_work(base_vha);</div><div class='ctx'> </div><div class='hunk'>@@ -3622,6 +3609,7 @@ qla2x00_do_dpc(void *data)</div><div class='ctx'> 		qla2x00_do_dpc_all_vps(base_vha);</div><div class='ctx'> </div><div class='ctx'> 		ha-&gt;dpc_active = 0;</div><div class='add'>+end_loop:</div><div class='ctx'> 		set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> 	} /* End of while(1) */</div><div class='ctx'> 	__set_current_state(TASK_RUNNING);</div><div class='hunk'>@@ -3705,16 +3693,6 @@ qla2x00_sp_free_dma(srb_t *sp)</div><div class='ctx'> 		sp-&gt;flags &amp;= ~SRB_CRC_CTX_DMA_VALID;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	CMD_SP(cmd) = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qla2x00_sp_final_compl(struct qla_hw_data *ha, srb_t *sp)</div><div class='del'>-{</div><div class='del'>-	struct scsi_cmnd *cmd = sp-&gt;cmd;</div><div class='del'>-</div><div class='del'>-	qla2x00_sp_free_dma(sp);</div><div class='del'>-</div><div class='ctx'> 	if (sp-&gt;flags &amp; SRB_FCP_CMND_DMA_VALID) {</div><div class='ctx'> 		struct ct6_dsd *ctx = sp-&gt;ctx;</div><div class='ctx'> 		dma_pool_free(ha-&gt;fcp_cmnd_dma_pool, ctx-&gt;fcp_cmnd,</div><div class='hunk'>@@ -3726,6 +3704,15 @@ qla2x00_sp_final_compl(struct qla_hw_data *ha, srb_t *sp)</div><div class='ctx'> 		sp-&gt;ctx = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	CMD_SP(cmd) = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+qla2x00_sp_final_compl(struct qla_hw_data *ha, srb_t *sp)</div><div class='add'>+{</div><div class='add'>+	struct scsi_cmnd *cmd = sp-&gt;cmd;</div><div class='add'>+</div><div class='add'>+	qla2x00_sp_free_dma(sp);</div><div class='ctx'> 	mempool_free(sp, ha-&gt;srb_mempool);</div><div class='ctx'> 	cmd-&gt;scsi_done(cmd);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c<br/>index eff13563c82d..16bc72844a97 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_sup.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla2xxx/qla_sup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_sup.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla2xxx/qla_sup.c</a></div><div class='hunk'>@@ -904,8 +904,9 @@ no_flash_data:</div><div class='ctx'> 	}</div><div class='ctx'> done:</div><div class='ctx'> 	ql_dbg(ql_dbg_init, vha, 0x004d,</div><div class='del'>-	    "FDT[%x]: (0x%x/0x%x) erase=0x%x "</div><div class='del'>-	    "pr=%x upro=%x wrtd=0x%x blk=0x%x.\n", loc, mid, fid,</div><div class='add'>+	    "FDT[%s]: (0x%x/0x%x) erase=0x%x "</div><div class='add'>+	    "pr=%x wrtd=0x%x blk=0x%x.\n",</div><div class='add'>+	    loc, mid, fid,</div><div class='ctx'> 	    ha-&gt;fdt_erase_cmd, ha-&gt;fdt_protect_sec_cmd,</div><div class='ctx'> 	    ha-&gt;fdt_wrt_disable, ha-&gt;fdt_block_size);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/qla4xxx/ql4_dbg.c b/drivers/scsi/qla4xxx/ql4_dbg.c<br/>index af62c3cf8752..8d58ae274829 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_dbg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_dbg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_dbg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla4xxx/ql4_dbg.c</a></div><div class='hunk'>@@ -20,12 +20,12 @@ void qla4xxx_dump_buffer(void *b, uint32_t size)</div><div class='ctx'> 	printk("------------------------------------------------------------"</div><div class='ctx'> 	       "--\n");</div><div class='ctx'> 	for (cnt = 0; cnt &lt; size; c++) {</div><div class='del'>-		printk(KERN_INFO "%02x", *c);</div><div class='add'>+		printk("%02x", *c);</div><div class='ctx'> 		if (!(++cnt % 16))</div><div class='del'>-			printk(KERN_INFO "\n");</div><div class='add'>+			printk("\n");</div><div class='ctx'> </div><div class='ctx'> 		else</div><div class='del'>-			printk(KERN_INFO "  ");</div><div class='add'>+			printk("  ");</div><div class='ctx'> 	}</div><div class='ctx'> 	printk(KERN_INFO "\n");</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h<br/>index fd5edc6e166d..bfe68545203f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_def.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_def.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_def.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla4xxx/ql4_def.h</a></div><div class='hunk'>@@ -150,6 +150,8 @@</div><div class='ctx'> #define QL4_SESS_RECOVERY_TMO		120	/* iSCSI session */</div><div class='ctx'> 						/* recovery timeout */</div><div class='ctx'> </div><div class='add'>+#define MSB(x) ((uint8_t)((uint16_t)(x) &gt;&gt; 8))</div><div class='add'>+#define LSW(x) ((uint16_t)(x))</div><div class='ctx'> #define LSDW(x) ((u32)((u64)(x)))</div><div class='ctx'> #define MSDW(x) ((u32)((((u64)(x)) &gt;&gt; 16) &gt;&gt; 16))</div><div class='ctx'> </div><div class='hunk'>@@ -177,6 +179,7 @@</div><div class='ctx'> #define LOGIN_TOV			12</div><div class='ctx'> </div><div class='ctx'> #define MAX_RESET_HA_RETRIES		2</div><div class='add'>+#define FW_ALIVE_WAIT_TOV		3</div><div class='ctx'> </div><div class='ctx'> #define CMD_SP(Cmnd)			((Cmnd)-&gt;SCp.ptr)</div><div class='ctx'> </div><div class='hunk'>@@ -670,6 +673,7 @@ struct scsi_qla_host {</div><div class='ctx'> 	uint16_t pri_ddb_idx;</div><div class='ctx'> 	uint16_t sec_ddb_idx;</div><div class='ctx'> 	int is_reset;</div><div class='add'>+	uint16_t temperature;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ql4_task_data {</div><div class='head'>diff --git a/drivers/scsi/qla4xxx/ql4_fw.h b/drivers/scsi/qla4xxx/ql4_fw.h<br/>index 4ac07f882521..7825c141bc1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_fw.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_fw.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_fw.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla4xxx/ql4_fw.h</a></div><div class='hunk'>@@ -752,7 +752,7 @@ struct dev_db_entry {</div><div class='ctx'> 	uint8_t res4[0x36];	/* 8A-BF */</div><div class='ctx'> 	uint8_t iscsi_name[0xE0];	/* C0-19F : xxzzy Make this a</div><div class='ctx'> 					 * pointer to a string so we</div><div class='del'>-					 * don't have to reserve soooo</div><div class='add'>+					 * don't have to reserve so</div><div class='ctx'> 					 * much RAM */</div><div class='ctx'> 	uint8_t link_local_ipv6_addr[0x10]; /* 1A0-1AF */</div><div class='ctx'> 	uint8_t res5[0x10];	/* 1B0-1BF */</div><div class='head'>diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c<br/>index 1bdfa8120ac8..90614f38b55d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_init.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_init.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla4xxx/ql4_init.c</a></div><div class='hunk'>@@ -697,6 +697,9 @@ int qla4xxx_start_firmware(struct scsi_qla_host *ha)</div><div class='ctx'> 			writel(set_rmask(CSR_SCSI_PROCESSOR_INTR),</div><div class='ctx'> 			       &amp;ha-&gt;reg-&gt;ctrl_status);</div><div class='ctx'> 			readl(&amp;ha-&gt;reg-&gt;ctrl_status);</div><div class='add'>+			writel(set_rmask(CSR_SCSI_COMPLETION_INTR),</div><div class='add'>+			       &amp;ha-&gt;reg-&gt;ctrl_status);</div><div class='add'>+			readl(&amp;ha-&gt;reg-&gt;ctrl_status);</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='ctx'> 			if (qla4xxx_get_firmware_state(ha) == QLA_SUCCESS) {</div><div class='ctx'> 				DEBUG2(printk("scsi%ld: %s: Get firmware "</div><div class='head'>diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c<br/>index 827e93078b94..95828862eea0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_isr.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_isr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_isr.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla4xxx/ql4_isr.c</a></div><div class='hunk'>@@ -123,13 +123,13 @@ static void qla4xxx_status_entry(struct scsi_qla_host *ha,</div><div class='ctx'> </div><div class='ctx'> 	srb = qla4xxx_del_from_active_array(ha, le32_to_cpu(sts_entry-&gt;handle));</div><div class='ctx'> 	if (!srb) {</div><div class='del'>-		DEBUG2(printk(KERN_WARNING "scsi%ld: %s: Status Entry invalid "</div><div class='del'>-			      "handle 0x%x, sp=%p. This cmd may have already "</div><div class='del'>-			      "been completed.\n", ha-&gt;host_no, __func__,</div><div class='del'>-			      le32_to_cpu(sts_entry-&gt;handle), srb));</div><div class='del'>-		ql4_printk(KERN_WARNING, ha, "%s invalid status entry:"</div><div class='del'>-		    " handle=0x%0x\n", __func__, sts_entry-&gt;handle);</div><div class='del'>-		set_bit(DPC_RESET_HA, &amp;ha-&gt;dpc_flags);</div><div class='add'>+		ql4_printk(KERN_WARNING, ha, "%s invalid status entry: "</div><div class='add'>+			   "handle=0x%0x, srb=%p\n", __func__,</div><div class='add'>+			   sts_entry-&gt;handle, srb);</div><div class='add'>+		if (is_qla8022(ha))</div><div class='add'>+			set_bit(DPC_RESET_HA_FW_CONTEXT, &amp;ha-&gt;dpc_flags);</div><div class='add'>+		else</div><div class='add'>+			set_bit(DPC_RESET_HA, &amp;ha-&gt;dpc_flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -563,7 +563,11 @@ static void qla4xxx_isr_decode_mailbox(struct scsi_qla_host * ha,</div><div class='ctx'> 		case MBOX_ASTS_DHCP_LEASE_EXPIRED:</div><div class='ctx'> 			DEBUG2(printk("scsi%ld: AEN %04x, ERROR Status, "</div><div class='ctx'> 				      "Reset HA\n", ha-&gt;host_no, mbox_status));</div><div class='del'>-			set_bit(DPC_RESET_HA, &amp;ha-&gt;dpc_flags);</div><div class='add'>+			if (is_qla8022(ha))</div><div class='add'>+				set_bit(DPC_RESET_HA_FW_CONTEXT,</div><div class='add'>+					&amp;ha-&gt;dpc_flags);</div><div class='add'>+			else</div><div class='add'>+				set_bit(DPC_RESET_HA, &amp;ha-&gt;dpc_flags);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case MBOX_ASTS_LINK_UP:</div><div class='hunk'>@@ -617,9 +621,13 @@ static void qla4xxx_isr_decode_mailbox(struct scsi_qla_host * ha,</div><div class='ctx'> 			    (mbox_sts[2] == ACB_STATE_ACQUIRING)))</div><div class='ctx'> 				set_bit(DPC_GET_DHCP_IP_ADDR, &amp;ha-&gt;dpc_flags);</div><div class='ctx'> 			else if ((mbox_sts[3] == ACB_STATE_ACQUIRING) &amp;&amp;</div><div class='del'>-			    (mbox_sts[2] == ACB_STATE_VALID))</div><div class='del'>-				set_bit(DPC_RESET_HA, &amp;ha-&gt;dpc_flags);</div><div class='del'>-			else if ((mbox_sts[3] == ACB_STATE_UNCONFIGURED))</div><div class='add'>+				 (mbox_sts[2] == ACB_STATE_VALID)) {</div><div class='add'>+				if (is_qla8022(ha))</div><div class='add'>+					set_bit(DPC_RESET_HA_FW_CONTEXT,</div><div class='add'>+						&amp;ha-&gt;dpc_flags);</div><div class='add'>+				else</div><div class='add'>+					set_bit(DPC_RESET_HA, &amp;ha-&gt;dpc_flags);</div><div class='add'>+			} else if ((mbox_sts[3] == ACB_STATE_UNCONFIGURED))</div><div class='ctx'> 				complete(&amp;ha-&gt;disable_acb_comp);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c<br/>index c2593782fbbe..e1e66a45e4d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_mbx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_mbx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_mbx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla4xxx/ql4_mbx.c</a></div><div class='hunk'>@@ -219,6 +219,13 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,</div><div class='ctx'> 		ha-&gt;mailbox_timeout_count++;</div><div class='ctx'> 		mbx_sts[0] = (-1);</div><div class='ctx'> 		set_bit(DPC_RESET_HA, &amp;ha-&gt;dpc_flags);</div><div class='add'>+		if (is_qla8022(ha)) {</div><div class='add'>+			ql4_printk(KERN_INFO, ha,</div><div class='add'>+				   "disabling pause transmit on port 0 &amp; 1.\n");</div><div class='add'>+			qla4_8xxx_wr_32(ha, QLA82XX_CRB_NIU + 0x98,</div><div class='add'>+					CRB_NIU_XG_PAUSE_CTL_P0 |</div><div class='add'>+					CRB_NIU_XG_PAUSE_CTL_P1);</div><div class='add'>+		}</div><div class='ctx'> 		goto mbox_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c<br/>index f484ff438199..78f1111158d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_nx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_nx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_nx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla4xxx/ql4_nx.c</a></div><div class='hunk'>@@ -1792,8 +1792,11 @@ int qla4_8xxx_device_state_handler(struct scsi_qla_host *ha)</div><div class='ctx'> 	int rval = QLA_SUCCESS;</div><div class='ctx'> 	unsigned long dev_init_timeout;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(AF_INIT_DONE, &amp;ha-&gt;flags))</div><div class='add'>+	if (!test_bit(AF_INIT_DONE, &amp;ha-&gt;flags)) {</div><div class='add'>+		qla4_8xxx_idc_lock(ha);</div><div class='ctx'> 		qla4_8xxx_set_drv_active(ha);</div><div class='add'>+		qla4_8xxx_idc_unlock(ha);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);</div><div class='ctx'> 	ql4_printk(KERN_INFO, ha, "1:Device state is 0x%x = %s\n", dev_state,</div><div class='hunk'>@@ -1802,8 +1805,8 @@ int qla4_8xxx_device_state_handler(struct scsi_qla_host *ha)</div><div class='ctx'> 	/* wait for 30 seconds for device to go ready */</div><div class='ctx'> 	dev_init_timeout = jiffies + (ha-&gt;nx_dev_init_timeout * HZ);</div><div class='ctx'> </div><div class='add'>+	qla4_8xxx_idc_lock(ha);</div><div class='ctx'> 	while (1) {</div><div class='del'>-		qla4_8xxx_idc_lock(ha);</div><div class='ctx'> </div><div class='ctx'> 		if (time_after_eq(jiffies, dev_init_timeout)) {</div><div class='ctx'> 			ql4_printk(KERN_WARNING, ha, "Device init failed!\n");</div><div class='hunk'>@@ -1819,15 +1822,14 @@ int qla4_8xxx_device_state_handler(struct scsi_qla_host *ha)</div><div class='ctx'> 		/* NOTE: Make sure idc unlocked upon exit of switch statement */</div><div class='ctx'> 		switch (dev_state) {</div><div class='ctx'> 		case QLA82XX_DEV_READY:</div><div class='del'>-			qla4_8xxx_idc_unlock(ha);</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		case QLA82XX_DEV_COLD:</div><div class='ctx'> 			rval = qla4_8xxx_device_bootstrap(ha);</div><div class='del'>-			qla4_8xxx_idc_unlock(ha);</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		case QLA82XX_DEV_INITIALIZING:</div><div class='ctx'> 			qla4_8xxx_idc_unlock(ha);</div><div class='ctx'> 			msleep(1000);</div><div class='add'>+			qla4_8xxx_idc_lock(ha);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case QLA82XX_DEV_NEED_RESET:</div><div class='ctx'> 			if (!ql4xdontresethba) {</div><div class='hunk'>@@ -1836,38 +1838,48 @@ int qla4_8xxx_device_state_handler(struct scsi_qla_host *ha)</div><div class='ctx'> 				 * reset handler */</div><div class='ctx'> 				dev_init_timeout = jiffies +</div><div class='ctx'> 					(ha-&gt;nx_dev_init_timeout * HZ);</div><div class='add'>+			} else {</div><div class='add'>+				qla4_8xxx_idc_unlock(ha);</div><div class='add'>+				msleep(1000);</div><div class='add'>+				qla4_8xxx_idc_lock(ha);</div><div class='ctx'> 			}</div><div class='del'>-			qla4_8xxx_idc_unlock(ha);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case QLA82XX_DEV_NEED_QUIESCENT:</div><div class='del'>-			qla4_8xxx_idc_unlock(ha);</div><div class='ctx'> 			/* idc locked/unlocked in handler */</div><div class='ctx'> 			qla4_8xxx_need_qsnt_handler(ha);</div><div class='del'>-			qla4_8xxx_idc_lock(ha);</div><div class='del'>-			/* fall thru needs idc_locked */</div><div class='add'>+			break;</div><div class='ctx'> 		case QLA82XX_DEV_QUIESCENT:</div><div class='ctx'> 			qla4_8xxx_idc_unlock(ha);</div><div class='ctx'> 			msleep(1000);</div><div class='add'>+			qla4_8xxx_idc_lock(ha);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case QLA82XX_DEV_FAILED:</div><div class='ctx'> 			qla4_8xxx_idc_unlock(ha);</div><div class='ctx'> 			qla4xxx_dead_adapter_cleanup(ha);</div><div class='ctx'> 			rval = QLA_ERROR;</div><div class='add'>+			qla4_8xxx_idc_lock(ha);</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		default:</div><div class='ctx'> 			qla4_8xxx_idc_unlock(ha);</div><div class='ctx'> 			qla4xxx_dead_adapter_cleanup(ha);</div><div class='ctx'> 			rval = QLA_ERROR;</div><div class='add'>+			qla4_8xxx_idc_lock(ha);</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> exit:</div><div class='add'>+	qla4_8xxx_idc_unlock(ha);</div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int qla4_8xxx_load_risc(struct scsi_qla_host *ha)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='add'>+</div><div class='add'>+	/* clear the interrupt */</div><div class='add'>+	writel(0, &amp;ha-&gt;qla4_8xxx_reg-&gt;host_int);</div><div class='add'>+	readl(&amp;ha-&gt;qla4_8xxx_reg-&gt;host_int);</div><div class='add'>+</div><div class='ctx'> 	retval = qla4_8xxx_device_state_handler(ha);</div><div class='ctx'> </div><div class='ctx'> 	if (retval == QLA_SUCCESS &amp;&amp; !test_bit(AF_INIT_DONE, &amp;ha-&gt;flags))</div><div class='head'>diff --git a/drivers/scsi/qla4xxx/ql4_nx.h b/drivers/scsi/qla4xxx/ql4_nx.h<br/>index 35376a1c3f1b..dc45ac923691 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_nx.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_nx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_nx.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla4xxx/ql4_nx.h</a></div><div class='hunk'>@@ -19,12 +19,28 @@</div><div class='ctx'> #define PHAN_PEG_RCV_INITIALIZED	0xff01</div><div class='ctx'> </div><div class='ctx'> /*CRB_RELATED*/</div><div class='del'>-#define QLA82XX_CRB_BASE	QLA82XX_CAM_RAM(0x200)</div><div class='del'>-#define QLA82XX_REG(X)		(QLA82XX_CRB_BASE+(X))</div><div class='del'>-</div><div class='add'>+#define QLA82XX_CRB_BASE		(QLA82XX_CAM_RAM(0x200))</div><div class='add'>+#define QLA82XX_REG(X)			(QLA82XX_CRB_BASE+(X))</div><div class='ctx'> #define CRB_CMDPEG_STATE		QLA82XX_REG(0x50)</div><div class='ctx'> #define CRB_RCVPEG_STATE		QLA82XX_REG(0x13c)</div><div class='ctx'> #define CRB_DMA_SHIFT			QLA82XX_REG(0xcc)</div><div class='add'>+#define CRB_TEMP_STATE			QLA82XX_REG(0x1b4)</div><div class='add'>+</div><div class='add'>+#define qla82xx_get_temp_val(x)		((x) &gt;&gt; 16)</div><div class='add'>+#define qla82xx_get_temp_state(x)	((x) &amp; 0xffff)</div><div class='add'>+#define qla82xx_encode_temp(val, state)	(((val) &lt;&lt; 16) | (state))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Temperature control.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	QLA82XX_TEMP_NORMAL = 0x1,	/* Normal operating range */</div><div class='add'>+	QLA82XX_TEMP_WARN,	/* Sound alert, temperature getting high */</div><div class='add'>+	QLA82XX_TEMP_PANIC	/* Fatal error, hardware has shut down. */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CRB_NIU_XG_PAUSE_CTL_P0		0x1</div><div class='add'>+#define CRB_NIU_XG_PAUSE_CTL_P1		0x8</div><div class='ctx'> </div><div class='ctx'> #define QLA82XX_HW_H0_CH_HUB_ADR	0x05</div><div class='ctx'> #define QLA82XX_HW_H1_CH_HUB_ADR	0x0E</div><div class='head'>diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c<br/>index 4169c8baa112..ce6d3b7f0c61 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_os.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_os.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_os.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla4xxx/ql4_os.c</a></div><div class='hunk'>@@ -35,43 +35,44 @@ static struct kmem_cache *srb_cachep;</div><div class='ctx'> int ql4xdisablesysfsboot = 1;</div><div class='ctx'> module_param(ql4xdisablesysfsboot, int, S_IRUGO | S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC(ql4xdisablesysfsboot,</div><div class='del'>-		"Set to disable exporting boot targets to sysfs\n"</div><div class='del'>-		" 0 - Export boot targets\n"</div><div class='del'>-		" 1 - Do not export boot targets (Default)");</div><div class='add'>+		 " Set to disable exporting boot targets to sysfs.\n"</div><div class='add'>+		 "\t\t  0 - Export boot targets\n"</div><div class='add'>+		 "\t\t  1 - Do not export boot targets (Default)");</div><div class='ctx'> </div><div class='ctx'> int ql4xdontresethba = 0;</div><div class='ctx'> module_param(ql4xdontresethba, int, S_IRUGO | S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC(ql4xdontresethba,</div><div class='del'>-		"Don't reset the HBA for driver recovery \n"</div><div class='del'>-		" 0 - It will reset HBA (Default)\n"</div><div class='del'>-		" 1 - It will NOT reset HBA");</div><div class='add'>+		 " Don't reset the HBA for driver recovery.\n"</div><div class='add'>+		 "\t\t  0 - It will reset HBA (Default)\n"</div><div class='add'>+		 "\t\t  1 - It will NOT reset HBA");</div><div class='ctx'> </div><div class='del'>-int ql4xextended_error_logging = 0; /* 0 = off, 1 = log errors */</div><div class='add'>+int ql4xextended_error_logging;</div><div class='ctx'> module_param(ql4xextended_error_logging, int, S_IRUGO | S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC(ql4xextended_error_logging,</div><div class='del'>-		 "Option to enable extended error logging, "</div><div class='del'>-		 "Default is 0 - no logging, 1 - debug logging");</div><div class='add'>+		 " Option to enable extended error logging.\n"</div><div class='add'>+		 "\t\t  0 - no logging (Default)\n"</div><div class='add'>+		 "\t\t  2 - debug logging");</div><div class='ctx'> </div><div class='ctx'> int ql4xenablemsix = 1;</div><div class='ctx'> module_param(ql4xenablemsix, int, S_IRUGO|S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC(ql4xenablemsix,</div><div class='del'>-		"Set to enable MSI or MSI-X interrupt mechanism.\n"</div><div class='del'>-		" 0 = enable INTx interrupt mechanism.\n"</div><div class='del'>-		" 1 = enable MSI-X interrupt mechanism (Default).\n"</div><div class='del'>-		" 2 = enable MSI interrupt mechanism.");</div><div class='add'>+		 " Set to enable MSI or MSI-X interrupt mechanism.\n"</div><div class='add'>+		 "\t\t  0 = enable INTx interrupt mechanism.\n"</div><div class='add'>+		 "\t\t  1 = enable MSI-X interrupt mechanism (Default).\n"</div><div class='add'>+		 "\t\t  2 = enable MSI interrupt mechanism.");</div><div class='ctx'> </div><div class='ctx'> #define QL4_DEF_QDEPTH 32</div><div class='ctx'> static int ql4xmaxqdepth = QL4_DEF_QDEPTH;</div><div class='ctx'> module_param(ql4xmaxqdepth, int, S_IRUGO | S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC(ql4xmaxqdepth,</div><div class='del'>-		"Maximum queue depth to report for target devices.\n"</div><div class='del'>-		" Default: 32.");</div><div class='add'>+		 " Maximum queue depth to report for target devices.\n"</div><div class='add'>+		 "\t\t  Default: 32.");</div><div class='ctx'> </div><div class='ctx'> static int ql4xsess_recovery_tmo = QL4_SESS_RECOVERY_TMO;</div><div class='ctx'> module_param(ql4xsess_recovery_tmo, int, S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(ql4xsess_recovery_tmo,</div><div class='ctx'> 		"Target Session Recovery Timeout.\n"</div><div class='del'>-		" Default: 120 sec.");</div><div class='add'>+		"\t\t  Default: 120 sec.");</div><div class='ctx'> </div><div class='ctx'> static int qla4xxx_wait_for_hba_online(struct scsi_qla_host *ha);</div><div class='ctx'> /*</div><div class='hunk'>@@ -128,7 +129,7 @@ static int qla4xxx_eh_host_reset(struct scsi_cmnd *cmd);</div><div class='ctx'> static int qla4xxx_slave_alloc(struct scsi_device *device);</div><div class='ctx'> static int qla4xxx_slave_configure(struct scsi_device *device);</div><div class='ctx'> static void qla4xxx_slave_destroy(struct scsi_device *sdev);</div><div class='del'>-static mode_t ql4_attr_is_visible(int param_type, int param);</div><div class='add'>+static umode_t ql4_attr_is_visible(int param_type, int param);</div><div class='ctx'> static int qla4xxx_host_reset(struct Scsi_Host *shost, int reset_type);</div><div class='ctx'> </div><div class='ctx'> static struct qla4_8xxx_legacy_intr_set legacy_intr[] =</div><div class='hunk'>@@ -197,7 +198,7 @@ static struct iscsi_transport qla4xxx_iscsi_transport = {</div><div class='ctx'> </div><div class='ctx'> static struct scsi_transport_template *qla4xxx_scsi_transport;</div><div class='ctx'> </div><div class='del'>-static mode_t ql4_attr_is_visible(int param_type, int param)</div><div class='add'>+static umode_t ql4_attr_is_visible(int param_type, int param)</div><div class='ctx'> {</div><div class='ctx'> 	switch (param_type) {</div><div class='ctx'> 	case ISCSI_HOST_PARAM:</div><div class='hunk'>@@ -935,7 +936,16 @@ qla4xxx_iface_set_param(struct Scsi_Host *shost, void *data, uint32_t len)</div><div class='ctx'> 		goto exit_init_fw_cb;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	qla4xxx_disable_acb(ha);</div><div class='add'>+	rval = qla4xxx_disable_acb(ha);</div><div class='add'>+	if (rval != QLA_SUCCESS) {</div><div class='add'>+		ql4_printk(KERN_ERR, ha, "%s: disable acb mbx failed\n",</div><div class='add'>+			   __func__);</div><div class='add'>+		rval = -EIO;</div><div class='add'>+		goto exit_init_fw_cb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wait_for_completion_timeout(&amp;ha-&gt;disable_acb_comp,</div><div class='add'>+				    DISABLE_ACB_TOV * HZ);</div><div class='ctx'> </div><div class='ctx'> 	qla4xxx_initcb_to_acb(init_fw_cb);</div><div class='ctx'> </div><div class='hunk'>@@ -1621,7 +1631,9 @@ void qla4xxx_update_session_conn_param(struct scsi_qla_host *ha,</div><div class='ctx'> </div><div class='ctx'> 	/* Update timers after login */</div><div class='ctx'> 	ddb_entry-&gt;default_relogin_timeout =</div><div class='del'>-				le16_to_cpu(fw_ddb_entry-&gt;def_timeout);</div><div class='add'>+		(le16_to_cpu(fw_ddb_entry-&gt;def_timeout) &gt; LOGIN_TOV) &amp;&amp;</div><div class='add'>+		 (le16_to_cpu(fw_ddb_entry-&gt;def_timeout) &lt; LOGIN_TOV * 10) ?</div><div class='add'>+		 le16_to_cpu(fw_ddb_entry-&gt;def_timeout) : LOGIN_TOV;</div><div class='ctx'> 	ddb_entry-&gt;default_time2wait =</div><div class='ctx'> 				le16_to_cpu(fw_ddb_entry-&gt;iscsi_def_time2wait);</div><div class='ctx'> </div><div class='hunk'>@@ -1961,14 +1973,51 @@ mem_alloc_error_exit:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * qla4_8xxx_check_temp - Check the ISP82XX temperature.</div><div class='add'>+ * @ha: adapter block pointer.</div><div class='add'>+ *</div><div class='add'>+ * Note: The caller should not hold the idc lock.</div><div class='add'>+ **/</div><div class='add'>+static int qla4_8xxx_check_temp(struct scsi_qla_host *ha)</div><div class='add'>+{</div><div class='add'>+	uint32_t temp, temp_state, temp_val;</div><div class='add'>+	int status = QLA_SUCCESS;</div><div class='add'>+</div><div class='add'>+	temp = qla4_8xxx_rd_32(ha, CRB_TEMP_STATE);</div><div class='add'>+</div><div class='add'>+	temp_state = qla82xx_get_temp_state(temp);</div><div class='add'>+	temp_val = qla82xx_get_temp_val(temp);</div><div class='add'>+</div><div class='add'>+	if (temp_state == QLA82XX_TEMP_PANIC) {</div><div class='add'>+		ql4_printk(KERN_WARNING, ha, "Device temperature %d degrees C"</div><div class='add'>+			   " exceeds maximum allowed. Hardware has been shut"</div><div class='add'>+			   " down.\n", temp_val);</div><div class='add'>+		status = QLA_ERROR;</div><div class='add'>+	} else if (temp_state == QLA82XX_TEMP_WARN) {</div><div class='add'>+		if (ha-&gt;temperature == QLA82XX_TEMP_NORMAL)</div><div class='add'>+			ql4_printk(KERN_WARNING, ha, "Device temperature %d"</div><div class='add'>+				   " degrees C exceeds operating range."</div><div class='add'>+				   " Immediate action needed.\n", temp_val);</div><div class='add'>+	} else {</div><div class='add'>+		if (ha-&gt;temperature == QLA82XX_TEMP_WARN)</div><div class='add'>+			ql4_printk(KERN_INFO, ha, "Device temperature is"</div><div class='add'>+				   " now %d degrees C in normal range.\n",</div><div class='add'>+				   temp_val);</div><div class='add'>+	}</div><div class='add'>+	ha-&gt;temperature = temp_state;</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * qla4_8xxx_check_fw_alive  - Check firmware health</div><div class='ctx'>  * @ha: Pointer to host adapter structure.</div><div class='ctx'>  *</div><div class='ctx'>  * Context: Interrupt</div><div class='ctx'>  **/</div><div class='del'>-static void qla4_8xxx_check_fw_alive(struct scsi_qla_host *ha)</div><div class='add'>+static int qla4_8xxx_check_fw_alive(struct scsi_qla_host *ha)</div><div class='ctx'> {</div><div class='del'>-	uint32_t fw_heartbeat_counter, halt_status;</div><div class='add'>+	uint32_t fw_heartbeat_counter;</div><div class='add'>+	int status = QLA_SUCCESS;</div><div class='ctx'> </div><div class='ctx'> 	fw_heartbeat_counter = qla4_8xxx_rd_32(ha, QLA82XX_PEG_ALIVE_COUNTER);</div><div class='ctx'> 	/* If PEG_ALIVE_COUNTER is 0xffffffff, AER/EEH is in progress, ignore */</div><div class='hunk'>@@ -1976,7 +2025,7 @@ static void qla4_8xxx_check_fw_alive(struct scsi_qla_host *ha)</div><div class='ctx'> 		DEBUG2(printk(KERN_WARNING "scsi%ld: %s: Device in frozen "</div><div class='ctx'> 		    "state, QLA82XX_PEG_ALIVE_COUNTER is 0xffffffff\n",</div><div class='ctx'> 		    ha-&gt;host_no, __func__));</div><div class='del'>-		return;</div><div class='add'>+		return status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;fw_heartbeat_counter == fw_heartbeat_counter) {</div><div class='hunk'>@@ -1984,8 +2033,6 @@ static void qla4_8xxx_check_fw_alive(struct scsi_qla_host *ha)</div><div class='ctx'> 		/* FW not alive after 2 seconds */</div><div class='ctx'> 		if (ha-&gt;seconds_since_last_heartbeat == 2) {</div><div class='ctx'> 			ha-&gt;seconds_since_last_heartbeat = 0;</div><div class='del'>-			halt_status = qla4_8xxx_rd_32(ha,</div><div class='del'>-						      QLA82XX_PEG_HALT_STATUS1);</div><div class='ctx'> </div><div class='ctx'> 			ql4_printk(KERN_INFO, ha,</div><div class='ctx'> 				   "scsi(%ld): %s, Dumping hw/fw registers:\n "</div><div class='hunk'>@@ -1993,7 +2040,9 @@ static void qla4_8xxx_check_fw_alive(struct scsi_qla_host *ha)</div><div class='ctx'> 				   " 0x%x,\n PEG_NET_0_PC: 0x%x, PEG_NET_1_PC:"</div><div class='ctx'> 				   " 0x%x,\n PEG_NET_2_PC: 0x%x, PEG_NET_3_PC:"</div><div class='ctx'> 				   " 0x%x,\n PEG_NET_4_PC: 0x%x\n",</div><div class='del'>-				   ha-&gt;host_no, __func__, halt_status,</div><div class='add'>+				   ha-&gt;host_no, __func__,</div><div class='add'>+				   qla4_8xxx_rd_32(ha,</div><div class='add'>+						   QLA82XX_PEG_HALT_STATUS1),</div><div class='ctx'> 				   qla4_8xxx_rd_32(ha,</div><div class='ctx'> 						   QLA82XX_PEG_HALT_STATUS2),</div><div class='ctx'> 				   qla4_8xxx_rd_32(ha, QLA82XX_CRB_PEG_NET_0 +</div><div class='hunk'>@@ -2006,24 +2055,13 @@ static void qla4_8xxx_check_fw_alive(struct scsi_qla_host *ha)</div><div class='ctx'> 						   0x3c),</div><div class='ctx'> 				   qla4_8xxx_rd_32(ha, QLA82XX_CRB_PEG_NET_4 +</div><div class='ctx'> 						   0x3c));</div><div class='del'>-</div><div class='del'>-			/* Since we cannot change dev_state in interrupt</div><div class='del'>-			 * context, set appropriate DPC flag then wakeup</div><div class='del'>-			 * DPC */</div><div class='del'>-			if (halt_status &amp; HALT_STATUS_UNRECOVERABLE)</div><div class='del'>-				set_bit(DPC_HA_UNRECOVERABLE, &amp;ha-&gt;dpc_flags);</div><div class='del'>-			else {</div><div class='del'>-				printk("scsi%ld: %s: detect abort needed!\n",</div><div class='del'>-				    ha-&gt;host_no, __func__);</div><div class='del'>-				set_bit(DPC_RESET_HA, &amp;ha-&gt;dpc_flags);</div><div class='del'>-			}</div><div class='del'>-			qla4xxx_wake_dpc(ha);</div><div class='del'>-			qla4xxx_mailbox_premature_completion(ha);</div><div class='add'>+			status = QLA_ERROR;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='ctx'> 		ha-&gt;seconds_since_last_heartbeat = 0;</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;fw_heartbeat_counter = fw_heartbeat_counter;</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2034,22 +2072,29 @@ static void qla4_8xxx_check_fw_alive(struct scsi_qla_host *ha)</div><div class='ctx'>  **/</div><div class='ctx'> void qla4_8xxx_watchdog(struct scsi_qla_host *ha)</div><div class='ctx'> {</div><div class='del'>-	uint32_t dev_state;</div><div class='del'>-</div><div class='del'>-	dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);</div><div class='add'>+	uint32_t dev_state, halt_status;</div><div class='ctx'> </div><div class='ctx'> 	/* don't poll if reset is going on */</div><div class='ctx'> 	if (!(test_bit(DPC_RESET_ACTIVE, &amp;ha-&gt;dpc_flags) ||</div><div class='ctx'> 	    test_bit(DPC_RESET_HA, &amp;ha-&gt;dpc_flags) ||</div><div class='ctx'> 	    test_bit(DPC_RETRY_RESET_HA, &amp;ha-&gt;dpc_flags))) {</div><div class='del'>-		if (dev_state == QLA82XX_DEV_NEED_RESET &amp;&amp;</div><div class='add'>+		dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);</div><div class='add'>+</div><div class='add'>+		if (qla4_8xxx_check_temp(ha)) {</div><div class='add'>+			ql4_printk(KERN_INFO, ha, "disabling pause"</div><div class='add'>+				   " transmit on port 0 &amp; 1.\n");</div><div class='add'>+			qla4_8xxx_wr_32(ha, QLA82XX_CRB_NIU + 0x98,</div><div class='add'>+					CRB_NIU_XG_PAUSE_CTL_P0 |</div><div class='add'>+					CRB_NIU_XG_PAUSE_CTL_P1);</div><div class='add'>+			set_bit(DPC_HA_UNRECOVERABLE, &amp;ha-&gt;dpc_flags);</div><div class='add'>+			qla4xxx_wake_dpc(ha);</div><div class='add'>+		} else if (dev_state == QLA82XX_DEV_NEED_RESET &amp;&amp;</div><div class='ctx'> 		    !test_bit(DPC_RESET_HA, &amp;ha-&gt;dpc_flags)) {</div><div class='ctx'> 			if (!ql4xdontresethba) {</div><div class='ctx'> 				ql4_printk(KERN_INFO, ha, "%s: HW State: "</div><div class='ctx'> 				    "NEED RESET!\n", __func__);</div><div class='ctx'> 				set_bit(DPC_RESET_HA, &amp;ha-&gt;dpc_flags);</div><div class='ctx'> 				qla4xxx_wake_dpc(ha);</div><div class='del'>-				qla4xxx_mailbox_premature_completion(ha);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else if (dev_state == QLA82XX_DEV_NEED_QUIESCENT &amp;&amp;</div><div class='ctx'> 		    !test_bit(DPC_HA_NEED_QUIESCENT, &amp;ha-&gt;dpc_flags)) {</div><div class='hunk'>@@ -2059,12 +2104,41 @@ void qla4_8xxx_watchdog(struct scsi_qla_host *ha)</div><div class='ctx'> 			qla4xxx_wake_dpc(ha);</div><div class='ctx'> 		} else  {</div><div class='ctx'> 			/* Check firmware health */</div><div class='del'>-			qla4_8xxx_check_fw_alive(ha);</div><div class='add'>+			if (qla4_8xxx_check_fw_alive(ha)) {</div><div class='add'>+				ql4_printk(KERN_INFO, ha, "disabling pause"</div><div class='add'>+					   " transmit on port 0 &amp; 1.\n");</div><div class='add'>+				qla4_8xxx_wr_32(ha, QLA82XX_CRB_NIU + 0x98,</div><div class='add'>+						CRB_NIU_XG_PAUSE_CTL_P0 |</div><div class='add'>+						CRB_NIU_XG_PAUSE_CTL_P1);</div><div class='add'>+				halt_status = qla4_8xxx_rd_32(ha,</div><div class='add'>+						QLA82XX_PEG_HALT_STATUS1);</div><div class='add'>+</div><div class='add'>+				if (LSW(MSB(halt_status)) == 0x67)</div><div class='add'>+					ql4_printk(KERN_ERR, ha, "%s:"</div><div class='add'>+						   " Firmware aborted with"</div><div class='add'>+						   " error code 0x00006700."</div><div class='add'>+						   " Device is being reset\n",</div><div class='add'>+						   __func__);</div><div class='add'>+</div><div class='add'>+				/* Since we cannot change dev_state in interrupt</div><div class='add'>+				 * context, set appropriate DPC flag then wakeup</div><div class='add'>+				 * DPC */</div><div class='add'>+				if (halt_status &amp; HALT_STATUS_UNRECOVERABLE)</div><div class='add'>+					set_bit(DPC_HA_UNRECOVERABLE,</div><div class='add'>+						&amp;ha-&gt;dpc_flags);</div><div class='add'>+				else {</div><div class='add'>+					ql4_printk(KERN_INFO, ha, "%s: detect "</div><div class='add'>+						   "abort needed!\n", __func__);</div><div class='add'>+					set_bit(DPC_RESET_HA, &amp;ha-&gt;dpc_flags);</div><div class='add'>+				}</div><div class='add'>+				qla4xxx_mailbox_premature_completion(ha);</div><div class='add'>+				qla4xxx_wake_dpc(ha);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)</div><div class='add'>+static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_session *sess;</div><div class='ctx'> 	struct ddb_entry *ddb_entry;</div><div class='hunk'>@@ -2414,6 +2488,8 @@ static int qla4xxx_recover_adapter(struct scsi_qla_host *ha)</div><div class='ctx'> {</div><div class='ctx'> 	int status = QLA_ERROR;</div><div class='ctx'> 	uint8_t reset_chip = 0;</div><div class='add'>+	uint32_t dev_state;</div><div class='add'>+	unsigned long wait;</div><div class='ctx'> </div><div class='ctx'> 	/* Stall incoming I/O until we are done */</div><div class='ctx'> 	scsi_block_requests(ha-&gt;host);</div><div class='hunk'>@@ -2464,8 +2540,29 @@ static int qla4xxx_recover_adapter(struct scsi_qla_host *ha)</div><div class='ctx'> 	 * or if stop_firmware fails for ISP-82xx.</div><div class='ctx'> 	 * This is the default case for ISP-4xxx */</div><div class='ctx'> 	if (!is_qla8022(ha) || reset_chip) {</div><div class='add'>+		if (!is_qla8022(ha))</div><div class='add'>+			goto chip_reset;</div><div class='add'>+</div><div class='add'>+		/* Check if 82XX firmware is alive or not</div><div class='add'>+		 * We may have arrived here from NEED_RESET</div><div class='add'>+		 * detection only */</div><div class='add'>+		if (test_bit(AF_FW_RECOVERY, &amp;ha-&gt;flags))</div><div class='add'>+			goto chip_reset;</div><div class='add'>+</div><div class='add'>+		wait = jiffies + (FW_ALIVE_WAIT_TOV * HZ);</div><div class='add'>+		while (time_before(jiffies, wait)) {</div><div class='add'>+			if (qla4_8xxx_check_fw_alive(ha)) {</div><div class='add'>+				qla4xxx_mailbox_premature_completion(ha);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='add'>+			schedule_timeout(HZ);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (!test_bit(AF_FW_RECOVERY, &amp;ha-&gt;flags))</div><div class='ctx'> 			qla4xxx_cmd_wait(ha);</div><div class='add'>+chip_reset:</div><div class='ctx'> 		qla4xxx_process_aen(ha, FLUSH_DDB_CHANGED_AENS);</div><div class='ctx'> 		qla4xxx_abort_active_cmds(ha, DID_RESET &lt;&lt; 16);</div><div class='ctx'> 		DEBUG2(ql4_printk(KERN_INFO, ha,</div><div class='hunk'>@@ -2501,6 +2598,25 @@ recover_ha_init_adapter:</div><div class='ctx'> 		 * Since we don't want to block the DPC for too long</div><div class='ctx'> 		 * with multiple resets in the same thread,</div><div class='ctx'> 		 * utilize DPC to retry */</div><div class='add'>+		if (is_qla8022(ha)) {</div><div class='add'>+			qla4_8xxx_idc_lock(ha);</div><div class='add'>+			dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);</div><div class='add'>+			qla4_8xxx_idc_unlock(ha);</div><div class='add'>+			if (dev_state == QLA82XX_DEV_FAILED) {</div><div class='add'>+				ql4_printk(KERN_INFO, ha, "%s: don't retry "</div><div class='add'>+					   "recover adapter. H/W is in Failed "</div><div class='add'>+					   "state\n", __func__);</div><div class='add'>+				qla4xxx_dead_adapter_cleanup(ha);</div><div class='add'>+				clear_bit(DPC_RETRY_RESET_HA, &amp;ha-&gt;dpc_flags);</div><div class='add'>+				clear_bit(DPC_RESET_HA, &amp;ha-&gt;dpc_flags);</div><div class='add'>+				clear_bit(DPC_RESET_HA_FW_CONTEXT,</div><div class='add'>+						&amp;ha-&gt;dpc_flags);</div><div class='add'>+				status = QLA_ERROR;</div><div class='add'>+</div><div class='add'>+				goto exit_recover;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (!test_bit(DPC_RETRY_RESET_HA, &amp;ha-&gt;dpc_flags)) {</div><div class='ctx'> 			ha-&gt;retry_reset_ha_cnt = MAX_RESET_HA_RETRIES;</div><div class='ctx'> 			DEBUG2(printk("scsi%ld: recover adapter - retrying "</div><div class='hunk'>@@ -2539,6 +2655,7 @@ recover_ha_init_adapter:</div><div class='ctx'> 		clear_bit(DPC_RETRY_RESET_HA, &amp;ha-&gt;dpc_flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+exit_recover:</div><div class='ctx'> 	ha-&gt;adapter_error_count++;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(AF_ONLINE, &amp;ha-&gt;flags))</div><div class='hunk'>@@ -2806,6 +2923,7 @@ dpc_post_reset_ha:</div><div class='ctx'>  **/</div><div class='ctx'> static void qla4xxx_free_adapter(struct scsi_qla_host *ha)</div><div class='ctx'> {</div><div class='add'>+	qla4xxx_abort_active_cmds(ha, DID_NO_CONNECT &lt;&lt; 16);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(AF_INTERRUPTS_ON, &amp;ha-&gt;flags)) {</div><div class='ctx'> 		/* Turn-off interrupts on the card. */</div><div class='hunk'>@@ -3039,7 +3157,7 @@ static ssize_t qla4xxx_show_boot_eth_info(void *data, int type, char *buf)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static mode_t qla4xxx_eth_get_attr_visibility(void *data, int type)</div><div class='add'>+static umode_t qla4xxx_eth_get_attr_visibility(void *data, int type)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -3073,7 +3191,7 @@ static ssize_t qla4xxx_show_boot_ini_info(void *data, int type, char *buf)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static mode_t qla4xxx_ini_get_attr_visibility(void *data, int type)</div><div class='add'>+static umode_t qla4xxx_ini_get_attr_visibility(void *data, int type)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -3160,7 +3278,7 @@ static ssize_t qla4xxx_show_boot_tgt_sec_info(void *data, int type, char *buf)</div><div class='ctx'> 	return qla4xxx_show_boot_tgt_info(boot_sess, type, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static mode_t qla4xxx_tgt_get_attr_visibility(void *data, int type)</div><div class='add'>+static umode_t qla4xxx_tgt_get_attr_visibility(void *data, int type)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -3768,16 +3886,14 @@ exit_check:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void qla4xxx_free_nt_list(struct list_head *list_nt)</div><div class='add'>+static void qla4xxx_free_ddb_list(struct list_head *list_ddb)</div><div class='ctx'> {</div><div class='del'>-	struct qla_ddb_index  *nt_ddb_idx, *nt_ddb_idx_tmp;</div><div class='add'>+	struct qla_ddb_index  *ddb_idx, *ddb_idx_tmp;</div><div class='ctx'> </div><div class='del'>-	/* Free up the normaltargets list */</div><div class='del'>-	list_for_each_entry_safe(nt_ddb_idx, nt_ddb_idx_tmp, list_nt, list) {</div><div class='del'>-		list_del_init(&amp;nt_ddb_idx-&gt;list);</div><div class='del'>-		vfree(nt_ddb_idx);</div><div class='add'>+	list_for_each_entry_safe(ddb_idx, ddb_idx_tmp, list_ddb, list) {</div><div class='add'>+		list_del_init(&amp;ddb_idx-&gt;list);</div><div class='add'>+		vfree(ddb_idx);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct iscsi_endpoint *qla4xxx_get_ep_fwdb(struct scsi_qla_host *ha,</div><div class='hunk'>@@ -3826,6 +3942,8 @@ static int qla4xxx_verify_boot_idx(struct scsi_qla_host *ha, uint16_t idx)</div><div class='ctx'> static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,</div><div class='ctx'> 					  struct ddb_entry *ddb_entry)</div><div class='ctx'> {</div><div class='add'>+	uint16_t def_timeout;</div><div class='add'>+</div><div class='ctx'> 	ddb_entry-&gt;ddb_type = FLASH_DDB;</div><div class='ctx'> 	ddb_entry-&gt;fw_ddb_index = INVALID_ENTRY;</div><div class='ctx'> 	ddb_entry-&gt;fw_ddb_device_state = DDB_DS_NO_CONNECTION_ACTIVE;</div><div class='hunk'>@@ -3836,9 +3954,10 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,</div><div class='ctx'> 	atomic_set(&amp;ddb_entry-&gt;retry_relogin_timer, INVALID_ENTRY);</div><div class='ctx'> 	atomic_set(&amp;ddb_entry-&gt;relogin_timer, 0);</div><div class='ctx'> 	atomic_set(&amp;ddb_entry-&gt;relogin_retry_count, 0);</div><div class='del'>-</div><div class='add'>+	def_timeout = le16_to_cpu(ddb_entry-&gt;fw_ddb_entry.def_timeout);</div><div class='ctx'> 	ddb_entry-&gt;default_relogin_timeout =</div><div class='del'>-		le16_to_cpu(ddb_entry-&gt;fw_ddb_entry.def_timeout);</div><div class='add'>+		(def_timeout &gt; LOGIN_TOV) &amp;&amp; (def_timeout &lt; LOGIN_TOV * 10) ?</div><div class='add'>+		def_timeout : LOGIN_TOV;</div><div class='ctx'> 	ddb_entry-&gt;default_time2wait =</div><div class='ctx'> 		le16_to_cpu(ddb_entry-&gt;fw_ddb_entry.iscsi_def_time2wait);</div><div class='ctx'> }</div><div class='hunk'>@@ -3876,7 +3995,6 @@ static void qla4xxx_wait_for_ip_configuration(struct scsi_qla_host *ha)</div><div class='ctx'> 			    ip_state == IP_ADDRSTATE_DEPRICATED ||</div><div class='ctx'> 			    ip_state == IP_ADDRSTATE_DISABLING)</div><div class='ctx'> 				ip_idx[idx] = -1;</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Break if all IP states checked */</div><div class='hunk'>@@ -3889,58 +4007,37 @@ static void qla4xxx_wait_for_ip_configuration(struct scsi_qla_host *ha)</div><div class='ctx'> 	} while (time_after(wtime, jiffies));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void qla4xxx_build_ddb_list(struct scsi_qla_host *ha, int is_reset)</div><div class='add'>+static void qla4xxx_build_st_list(struct scsi_qla_host *ha,</div><div class='add'>+				  struct list_head *list_st)</div><div class='ctx'> {</div><div class='add'>+	struct qla_ddb_index  *st_ddb_idx;</div><div class='ctx'> 	int max_ddbs;</div><div class='add'>+	int fw_idx_size;</div><div class='add'>+	struct dev_db_entry *fw_ddb_entry;</div><div class='add'>+	dma_addr_t fw_ddb_dma;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	uint32_t idx = 0, next_idx = 0;</div><div class='ctx'> 	uint32_t state = 0, conn_err = 0;</div><div class='del'>-	uint16_t conn_id;</div><div class='del'>-	struct dev_db_entry *fw_ddb_entry;</div><div class='del'>-	struct ddb_entry *ddb_entry = NULL;</div><div class='del'>-	dma_addr_t fw_ddb_dma;</div><div class='del'>-	struct iscsi_cls_session *cls_sess;</div><div class='del'>-	struct iscsi_session *sess;</div><div class='del'>-	struct iscsi_cls_conn *cls_conn;</div><div class='del'>-	struct iscsi_endpoint *ep;</div><div class='del'>-	uint16_t cmds_max = 32, tmo = 0;</div><div class='del'>-	uint32_t initial_cmdsn = 0;</div><div class='del'>-	struct list_head list_st, list_nt; /* List of sendtargets */</div><div class='del'>-	struct qla_ddb_index  *st_ddb_idx, *st_ddb_idx_tmp;</div><div class='del'>-	int fw_idx_size;</div><div class='del'>-	unsigned long wtime;</div><div class='del'>-	struct qla_ddb_index  *nt_ddb_idx;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(AF_LINK_UP, &amp;ha-&gt;flags)) {</div><div class='del'>-		set_bit(AF_BUILD_DDB_LIST, &amp;ha-&gt;flags);</div><div class='del'>-		ha-&gt;is_reset = is_reset;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	max_ddbs =  is_qla40XX(ha) ? MAX_DEV_DB_ENTRIES_40XX :</div><div class='del'>-				     MAX_DEV_DB_ENTRIES;</div><div class='add'>+	uint16_t conn_id = 0;</div><div class='ctx'> </div><div class='ctx'> 	fw_ddb_entry = dma_pool_alloc(ha-&gt;fw_ddb_dma_pool, GFP_KERNEL,</div><div class='ctx'> 				      &amp;fw_ddb_dma);</div><div class='ctx'> 	if (fw_ddb_entry == NULL) {</div><div class='ctx'> 		DEBUG2(ql4_printk(KERN_ERR, ha, "Out of memory\n"));</div><div class='del'>-		goto exit_ddb_list;</div><div class='add'>+		goto exit_st_list;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;list_st);</div><div class='del'>-	INIT_LIST_HEAD(&amp;list_nt);</div><div class='add'>+	max_ddbs =  is_qla40XX(ha) ? MAX_DEV_DB_ENTRIES_40XX :</div><div class='add'>+				     MAX_DEV_DB_ENTRIES;</div><div class='ctx'> 	fw_idx_size = sizeof(struct qla_ddb_index);</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; max_ddbs; idx = next_idx) {</div><div class='del'>-		ret = qla4xxx_get_fwddb_entry(ha, idx, fw_ddb_entry,</div><div class='del'>-					      fw_ddb_dma, NULL,</div><div class='del'>-					      &amp;next_idx, &amp;state, &amp;conn_err,</div><div class='del'>-					      NULL, &amp;conn_id);</div><div class='add'>+		ret = qla4xxx_get_fwddb_entry(ha, idx, fw_ddb_entry, fw_ddb_dma,</div><div class='add'>+					      NULL, &amp;next_idx, &amp;state,</div><div class='add'>+					      &amp;conn_err, NULL, &amp;conn_id);</div><div class='ctx'> 		if (ret == QLA_ERROR)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (qla4xxx_verify_boot_idx(ha, idx) != QLA_SUCCESS)</div><div class='del'>-			goto continue_next_st;</div><div class='del'>-</div><div class='ctx'> 		/* Check if ST, add to the list_st */</div><div class='ctx'> 		if (strlen((char *) fw_ddb_entry-&gt;iscsi_name) != 0)</div><div class='ctx'> 			goto continue_next_st;</div><div class='hunk'>@@ -3951,59 +4048,155 @@ void qla4xxx_build_ddb_list(struct scsi_qla_host *ha, int is_reset)</div><div class='ctx'> </div><div class='ctx'> 		st_ddb_idx-&gt;fw_ddb_idx = idx;</div><div class='ctx'> </div><div class='del'>-		list_add_tail(&amp;st_ddb_idx-&gt;list, &amp;list_st);</div><div class='add'>+		list_add_tail(&amp;st_ddb_idx-&gt;list, list_st);</div><div class='ctx'> continue_next_st:</div><div class='ctx'> 		if (next_idx == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Before issuing conn open mbox, ensure all IPs states are configured</div><div class='del'>-	 * Note, conn open fails if IPs are not configured</div><div class='add'>+exit_st_list:</div><div class='add'>+	if (fw_ddb_entry)</div><div class='add'>+		dma_pool_free(ha-&gt;fw_ddb_dma_pool, fw_ddb_entry, fw_ddb_dma);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * qla4xxx_remove_failed_ddb - Remove inactive or failed ddb from list</div><div class='add'>+ * @ha: pointer to adapter structure</div><div class='add'>+ * @list_ddb: List from which failed ddb to be removed</div><div class='add'>+ *</div><div class='add'>+ * Iterate over the list of DDBs and find and remove DDBs that are either in</div><div class='add'>+ * no connection active state or failed state</div><div class='add'>+ **/</div><div class='add'>+static void qla4xxx_remove_failed_ddb(struct scsi_qla_host *ha,</div><div class='add'>+				      struct list_head *list_ddb)</div><div class='add'>+{</div><div class='add'>+	struct qla_ddb_index  *ddb_idx, *ddb_idx_tmp;</div><div class='add'>+	uint32_t next_idx = 0;</div><div class='add'>+	uint32_t state = 0, conn_err = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(ddb_idx, ddb_idx_tmp, list_ddb, list) {</div><div class='add'>+		ret = qla4xxx_get_fwddb_entry(ha, ddb_idx-&gt;fw_ddb_idx,</div><div class='add'>+					      NULL, 0, NULL, &amp;next_idx, &amp;state,</div><div class='add'>+					      &amp;conn_err, NULL, NULL);</div><div class='add'>+		if (ret == QLA_ERROR)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (state == DDB_DS_NO_CONNECTION_ACTIVE ||</div><div class='add'>+		    state == DDB_DS_SESSION_FAILED) {</div><div class='add'>+			list_del_init(&amp;ddb_idx-&gt;list);</div><div class='add'>+			vfree(ddb_idx);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qla4xxx_sess_conn_setup(struct scsi_qla_host *ha,</div><div class='add'>+				   struct dev_db_entry *fw_ddb_entry,</div><div class='add'>+				   int is_reset)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_cls_session *cls_sess;</div><div class='add'>+	struct iscsi_session *sess;</div><div class='add'>+	struct iscsi_cls_conn *cls_conn;</div><div class='add'>+	struct iscsi_endpoint *ep;</div><div class='add'>+	uint16_t cmds_max = 32;</div><div class='add'>+	uint16_t conn_id = 0;</div><div class='add'>+	uint32_t initial_cmdsn = 0;</div><div class='add'>+	int ret = QLA_SUCCESS;</div><div class='add'>+</div><div class='add'>+	struct ddb_entry *ddb_entry = NULL;</div><div class='add'>+</div><div class='add'>+	/* Create session object, with INVALID_ENTRY,</div><div class='add'>+	 * the targer_id would get set when we issue the login</div><div class='ctx'> 	 */</div><div class='del'>-	qla4xxx_wait_for_ip_configuration(ha);</div><div class='add'>+	cls_sess = iscsi_session_setup(&amp;qla4xxx_iscsi_transport, ha-&gt;host,</div><div class='add'>+				       cmds_max, sizeof(struct ddb_entry),</div><div class='add'>+				       sizeof(struct ql4_task_data),</div><div class='add'>+				       initial_cmdsn, INVALID_ENTRY);</div><div class='add'>+	if (!cls_sess) {</div><div class='add'>+		ret = QLA_ERROR;</div><div class='add'>+		goto exit_setup;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Go thru the STs and fire the sendtargets by issuing conn open mbx */</div><div class='del'>-	list_for_each_entry_safe(st_ddb_idx, st_ddb_idx_tmp, &amp;list_st, list) {</div><div class='del'>-		qla4xxx_conn_open(ha, st_ddb_idx-&gt;fw_ddb_idx);</div><div class='add'>+	/*</div><div class='add'>+	 * so calling module_put function to decrement the</div><div class='add'>+	 * reference count.</div><div class='add'>+	 **/</div><div class='add'>+	module_put(qla4xxx_iscsi_transport.owner);</div><div class='add'>+	sess = cls_sess-&gt;dd_data;</div><div class='add'>+	ddb_entry = sess-&gt;dd_data;</div><div class='add'>+	ddb_entry-&gt;sess = cls_sess;</div><div class='add'>+</div><div class='add'>+	cls_sess-&gt;recovery_tmo = ql4xsess_recovery_tmo;</div><div class='add'>+	memcpy(&amp;ddb_entry-&gt;fw_ddb_entry, fw_ddb_entry,</div><div class='add'>+	       sizeof(struct dev_db_entry));</div><div class='add'>+</div><div class='add'>+	qla4xxx_setup_flash_ddb_entry(ha, ddb_entry);</div><div class='add'>+</div><div class='add'>+	cls_conn = iscsi_conn_setup(cls_sess, sizeof(struct qla_conn), conn_id);</div><div class='add'>+</div><div class='add'>+	if (!cls_conn) {</div><div class='add'>+		ret = QLA_ERROR;</div><div class='add'>+		goto exit_setup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Wait to ensure all sendtargets are done for min 12 sec wait */</div><div class='del'>-	tmo = ((ha-&gt;def_timeout &lt; LOGIN_TOV) ? LOGIN_TOV : ha-&gt;def_timeout);</div><div class='del'>-	DEBUG2(ql4_printk(KERN_INFO, ha,</div><div class='del'>-			  "Default time to wait for build ddb %d\n", tmo));</div><div class='add'>+	ddb_entry-&gt;conn = cls_conn;</div><div class='ctx'> </div><div class='del'>-	wtime = jiffies + (HZ * tmo);</div><div class='del'>-	do {</div><div class='del'>-		list_for_each_entry_safe(st_ddb_idx, st_ddb_idx_tmp, &amp;list_st,</div><div class='del'>-					 list) {</div><div class='del'>-			ret = qla4xxx_get_fwddb_entry(ha,</div><div class='del'>-						      st_ddb_idx-&gt;fw_ddb_idx,</div><div class='del'>-						      NULL, 0, NULL, &amp;next_idx,</div><div class='del'>-						      &amp;state, &amp;conn_err, NULL,</div><div class='del'>-						      NULL);</div><div class='del'>-			if (ret == QLA_ERROR)</div><div class='del'>-				continue;</div><div class='add'>+	/* Setup ep, for displaying attributes in sysfs */</div><div class='add'>+	ep = qla4xxx_get_ep_fwdb(ha, fw_ddb_entry);</div><div class='add'>+	if (ep) {</div><div class='add'>+		ep-&gt;conn = cls_conn;</div><div class='add'>+		cls_conn-&gt;ep = ep;</div><div class='add'>+	} else {</div><div class='add'>+		DEBUG2(ql4_printk(KERN_ERR, ha, "Unable to get ep\n"));</div><div class='add'>+		ret = QLA_ERROR;</div><div class='add'>+		goto exit_setup;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			if (state == DDB_DS_NO_CONNECTION_ACTIVE ||</div><div class='del'>-			    state == DDB_DS_SESSION_FAILED) {</div><div class='del'>-				list_del_init(&amp;st_ddb_idx-&gt;list);</div><div class='del'>-				vfree(st_ddb_idx);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		schedule_timeout_uninterruptible(HZ / 10);</div><div class='del'>-	} while (time_after(wtime, jiffies));</div><div class='add'>+	/* Update sess/conn params */</div><div class='add'>+	qla4xxx_copy_fwddb_param(ha, fw_ddb_entry, cls_sess, cls_conn);</div><div class='ctx'> </div><div class='del'>-	/* Free up the sendtargets list */</div><div class='del'>-	list_for_each_entry_safe(st_ddb_idx, st_ddb_idx_tmp, &amp;list_st, list) {</div><div class='del'>-		list_del_init(&amp;st_ddb_idx-&gt;list);</div><div class='del'>-		vfree(st_ddb_idx);</div><div class='add'>+	if (is_reset == RESET_ADAPTER) {</div><div class='add'>+		iscsi_block_session(cls_sess);</div><div class='add'>+		/* Use the relogin path to discover new devices</div><div class='add'>+		 *  by short-circuting the logic of setting</div><div class='add'>+		 *  timer to relogin - instead set the flags</div><div class='add'>+		 *  to initiate login right away.</div><div class='add'>+		 */</div><div class='add'>+		set_bit(DPC_RELOGIN_DEVICE, &amp;ha-&gt;dpc_flags);</div><div class='add'>+		set_bit(DF_RELOGIN, &amp;ddb_entry-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+exit_setup:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qla4xxx_build_nt_list(struct scsi_qla_host *ha,</div><div class='add'>+				  struct list_head *list_nt, int is_reset)</div><div class='add'>+{</div><div class='add'>+	struct dev_db_entry *fw_ddb_entry;</div><div class='add'>+	dma_addr_t fw_ddb_dma;</div><div class='add'>+	int max_ddbs;</div><div class='add'>+	int fw_idx_size;</div><div class='add'>+	int ret;</div><div class='add'>+	uint32_t idx = 0, next_idx = 0;</div><div class='add'>+	uint32_t state = 0, conn_err = 0;</div><div class='add'>+	uint16_t conn_id = 0;</div><div class='add'>+	struct qla_ddb_index  *nt_ddb_idx;</div><div class='add'>+</div><div class='add'>+	fw_ddb_entry = dma_pool_alloc(ha-&gt;fw_ddb_dma_pool, GFP_KERNEL,</div><div class='add'>+				      &amp;fw_ddb_dma);</div><div class='add'>+	if (fw_ddb_entry == NULL) {</div><div class='add'>+		DEBUG2(ql4_printk(KERN_ERR, ha, "Out of memory\n"));</div><div class='add'>+		goto exit_nt_list;</div><div class='add'>+	}</div><div class='add'>+	max_ddbs =  is_qla40XX(ha) ? MAX_DEV_DB_ENTRIES_40XX :</div><div class='add'>+				     MAX_DEV_DB_ENTRIES;</div><div class='add'>+	fw_idx_size = sizeof(struct qla_ddb_index);</div><div class='add'>+</div><div class='ctx'> 	for (idx = 0; idx &lt; max_ddbs; idx = next_idx) {</div><div class='del'>-		ret = qla4xxx_get_fwddb_entry(ha, idx, fw_ddb_entry,</div><div class='del'>-					      fw_ddb_dma, NULL,</div><div class='del'>-					      &amp;next_idx, &amp;state, &amp;conn_err,</div><div class='del'>-					      NULL, &amp;conn_id);</div><div class='add'>+		ret = qla4xxx_get_fwddb_entry(ha, idx, fw_ddb_entry, fw_ddb_dma,</div><div class='add'>+					      NULL, &amp;next_idx, &amp;state,</div><div class='add'>+					      &amp;conn_err, NULL, &amp;conn_id);</div><div class='ctx'> 		if (ret == QLA_ERROR)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -4014,107 +4207,113 @@ continue_next_st:</div><div class='ctx'> 		if (strlen((char *) fw_ddb_entry-&gt;iscsi_name) == 0)</div><div class='ctx'> 			goto continue_next_nt;</div><div class='ctx'> </div><div class='del'>-		if (state == DDB_DS_NO_CONNECTION_ACTIVE ||</div><div class='del'>-		    state == DDB_DS_SESSION_FAILED) {</div><div class='del'>-			DEBUG2(ql4_printk(KERN_INFO, ha,</div><div class='del'>-					  "Adding  DDB to session = 0x%x\n",</div><div class='del'>-					  idx));</div><div class='del'>-			if (is_reset == INIT_ADAPTER) {</div><div class='del'>-				nt_ddb_idx = vmalloc(fw_idx_size);</div><div class='del'>-				if (!nt_ddb_idx)</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				nt_ddb_idx-&gt;fw_ddb_idx = idx;</div><div class='del'>-</div><div class='del'>-				memcpy(&amp;nt_ddb_idx-&gt;fw_ddb, fw_ddb_entry,</div><div class='del'>-				       sizeof(struct dev_db_entry));</div><div class='del'>-</div><div class='del'>-				if (qla4xxx_is_flash_ddb_exists(ha, &amp;list_nt,</div><div class='del'>-						fw_ddb_entry) == QLA_SUCCESS) {</div><div class='del'>-					vfree(nt_ddb_idx);</div><div class='del'>-					goto continue_next_nt;</div><div class='del'>-				}</div><div class='del'>-				list_add_tail(&amp;nt_ddb_idx-&gt;list, &amp;list_nt);</div><div class='del'>-			} else if (is_reset == RESET_ADAPTER) {</div><div class='del'>-				if (qla4xxx_is_session_exists(ha,</div><div class='del'>-						   fw_ddb_entry) == QLA_SUCCESS)</div><div class='del'>-					goto continue_next_nt;</div><div class='del'>-			}</div><div class='add'>+		if (!(state == DDB_DS_NO_CONNECTION_ACTIVE ||</div><div class='add'>+		    state == DDB_DS_SESSION_FAILED))</div><div class='add'>+			goto continue_next_nt;</div><div class='ctx'> </div><div class='del'>-			/* Create session object, with INVALID_ENTRY,</div><div class='del'>-			 * the targer_id would get set when we issue the login</div><div class='del'>-			 */</div><div class='del'>-			cls_sess = iscsi_session_setup(&amp;qla4xxx_iscsi_transport,</div><div class='del'>-						ha-&gt;host, cmds_max,</div><div class='del'>-						sizeof(struct ddb_entry),</div><div class='del'>-						sizeof(struct ql4_task_data),</div><div class='del'>-						initial_cmdsn, INVALID_ENTRY);</div><div class='del'>-			if (!cls_sess)</div><div class='del'>-				goto exit_ddb_list;</div><div class='add'>+		DEBUG2(ql4_printk(KERN_INFO, ha,</div><div class='add'>+				  "Adding  DDB to session = 0x%x\n", idx));</div><div class='add'>+		if (is_reset == INIT_ADAPTER) {</div><div class='add'>+			nt_ddb_idx = vmalloc(fw_idx_size);</div><div class='add'>+			if (!nt_ddb_idx)</div><div class='add'>+				break;</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			 * iscsi_session_setup increments the driver reference</div><div class='del'>-			 * count which wouldn't let the driver to be unloaded.</div><div class='del'>-			 * so calling module_put function to decrement the</div><div class='del'>-			 * reference count.</div><div class='del'>-			 **/</div><div class='del'>-			module_put(qla4xxx_iscsi_transport.owner);</div><div class='del'>-			sess = cls_sess-&gt;dd_data;</div><div class='del'>-			ddb_entry = sess-&gt;dd_data;</div><div class='del'>-			ddb_entry-&gt;sess = cls_sess;</div><div class='add'>+			nt_ddb_idx-&gt;fw_ddb_idx = idx;</div><div class='ctx'> </div><div class='del'>-			cls_sess-&gt;recovery_tmo = ql4xsess_recovery_tmo;</div><div class='del'>-			memcpy(&amp;ddb_entry-&gt;fw_ddb_entry, fw_ddb_entry,</div><div class='add'>+			memcpy(&amp;nt_ddb_idx-&gt;fw_ddb, fw_ddb_entry,</div><div class='ctx'> 			       sizeof(struct dev_db_entry));</div><div class='ctx'> </div><div class='del'>-			qla4xxx_setup_flash_ddb_entry(ha, ddb_entry);</div><div class='del'>-</div><div class='del'>-			cls_conn = iscsi_conn_setup(cls_sess,</div><div class='del'>-						    sizeof(struct qla_conn),</div><div class='del'>-						    conn_id);</div><div class='del'>-			if (!cls_conn)</div><div class='del'>-				goto exit_ddb_list;</div><div class='del'>-</div><div class='del'>-			ddb_entry-&gt;conn = cls_conn;</div><div class='del'>-</div><div class='del'>-			/* Setup ep, for displaying attributes in sysfs */</div><div class='del'>-			ep = qla4xxx_get_ep_fwdb(ha, fw_ddb_entry);</div><div class='del'>-			if (ep) {</div><div class='del'>-				ep-&gt;conn = cls_conn;</div><div class='del'>-				cls_conn-&gt;ep = ep;</div><div class='del'>-			} else {</div><div class='del'>-				DEBUG2(ql4_printk(KERN_ERR, ha,</div><div class='del'>-						  "Unable to get ep\n"));</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Update sess/conn params */</div><div class='del'>-			qla4xxx_copy_fwddb_param(ha, fw_ddb_entry, cls_sess,</div><div class='del'>-						 cls_conn);</div><div class='del'>-</div><div class='del'>-			if (is_reset == RESET_ADAPTER) {</div><div class='del'>-				iscsi_block_session(cls_sess);</div><div class='del'>-				/* Use the relogin path to discover new devices</div><div class='del'>-				 *  by short-circuting the logic of setting</div><div class='del'>-				 *  timer to relogin - instead set the flags</div><div class='del'>-				 *  to initiate login right away.</div><div class='del'>-				 */</div><div class='del'>-				set_bit(DPC_RELOGIN_DEVICE, &amp;ha-&gt;dpc_flags);</div><div class='del'>-				set_bit(DF_RELOGIN, &amp;ddb_entry-&gt;flags);</div><div class='add'>+			if (qla4xxx_is_flash_ddb_exists(ha, list_nt,</div><div class='add'>+					fw_ddb_entry) == QLA_SUCCESS) {</div><div class='add'>+				vfree(nt_ddb_idx);</div><div class='add'>+				goto continue_next_nt;</div><div class='ctx'> 			}</div><div class='add'>+			list_add_tail(&amp;nt_ddb_idx-&gt;list, list_nt);</div><div class='add'>+		} else if (is_reset == RESET_ADAPTER) {</div><div class='add'>+			if (qla4xxx_is_session_exists(ha, fw_ddb_entry) ==</div><div class='add'>+								QLA_SUCCESS)</div><div class='add'>+				goto continue_next_nt;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		ret = qla4xxx_sess_conn_setup(ha, fw_ddb_entry, is_reset);</div><div class='add'>+		if (ret == QLA_ERROR)</div><div class='add'>+			goto exit_nt_list;</div><div class='add'>+</div><div class='ctx'> continue_next_nt:</div><div class='ctx'> 		if (next_idx == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-exit_ddb_list:</div><div class='del'>-	qla4xxx_free_nt_list(&amp;list_nt);</div><div class='add'>+</div><div class='add'>+exit_nt_list:</div><div class='ctx'> 	if (fw_ddb_entry)</div><div class='ctx'> 		dma_pool_free(ha-&gt;fw_ddb_dma_pool, fw_ddb_entry, fw_ddb_dma);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * qla4xxx_build_ddb_list - Build ddb list and setup sessions</div><div class='add'>+ * @ha: pointer to adapter structure</div><div class='add'>+ * @is_reset: Is this init path or reset path</div><div class='add'>+ *</div><div class='add'>+ * Create a list of sendtargets (st) from firmware DDBs, issue send targets</div><div class='add'>+ * using connection open, then create the list of normal targets (nt)</div><div class='add'>+ * from firmware DDBs. Based on the list of nt setup session and connection</div><div class='add'>+ * objects.</div><div class='add'>+ **/</div><div class='add'>+void qla4xxx_build_ddb_list(struct scsi_qla_host *ha, int is_reset)</div><div class='add'>+{</div><div class='add'>+	uint16_t tmo = 0;</div><div class='add'>+	struct list_head list_st, list_nt;</div><div class='add'>+	struct qla_ddb_index  *st_ddb_idx, *st_ddb_idx_tmp;</div><div class='add'>+	unsigned long wtime;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(AF_LINK_UP, &amp;ha-&gt;flags)) {</div><div class='add'>+		set_bit(AF_BUILD_DDB_LIST, &amp;ha-&gt;flags);</div><div class='add'>+		ha-&gt;is_reset = is_reset;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;list_st);</div><div class='add'>+	INIT_LIST_HEAD(&amp;list_nt);</div><div class='add'>+</div><div class='add'>+	qla4xxx_build_st_list(ha, &amp;list_st);</div><div class='add'>+</div><div class='add'>+	/* Before issuing conn open mbox, ensure all IPs states are configured</div><div class='add'>+	 * Note, conn open fails if IPs are not configured</div><div class='add'>+	 */</div><div class='add'>+	qla4xxx_wait_for_ip_configuration(ha);</div><div class='add'>+</div><div class='add'>+	/* Go thru the STs and fire the sendtargets by issuing conn open mbx */</div><div class='add'>+	list_for_each_entry_safe(st_ddb_idx, st_ddb_idx_tmp, &amp;list_st, list) {</div><div class='add'>+		qla4xxx_conn_open(ha, st_ddb_idx-&gt;fw_ddb_idx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait to ensure all sendtargets are done for min 12 sec wait */</div><div class='add'>+	tmo = ((ha-&gt;def_timeout &gt; LOGIN_TOV) &amp;&amp;</div><div class='add'>+	       (ha-&gt;def_timeout &lt; LOGIN_TOV * 10) ?</div><div class='add'>+	       ha-&gt;def_timeout : LOGIN_TOV);</div><div class='add'>+</div><div class='add'>+	DEBUG2(ql4_printk(KERN_INFO, ha,</div><div class='add'>+			  "Default time to wait for build ddb %d\n", tmo));</div><div class='add'>+</div><div class='add'>+	wtime = jiffies + (HZ * tmo);</div><div class='add'>+	do {</div><div class='add'>+		if (list_empty(&amp;list_st))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		qla4xxx_remove_failed_ddb(ha, &amp;list_st);</div><div class='add'>+		schedule_timeout_uninterruptible(HZ / 10);</div><div class='add'>+	} while (time_after(wtime, jiffies));</div><div class='add'>+</div><div class='add'>+	/* Free up the sendtargets list */</div><div class='add'>+	qla4xxx_free_ddb_list(&amp;list_st);</div><div class='add'>+</div><div class='add'>+	qla4xxx_build_nt_list(ha, &amp;list_nt, is_reset);</div><div class='add'>+</div><div class='add'>+	qla4xxx_free_ddb_list(&amp;list_nt);</div><div class='ctx'> </div><div class='ctx'> 	qla4xxx_free_ddb_index(ha);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * qla4xxx_probe_adapter - callback function to probe HBA</div><div class='ctx'>  * @pdev: pointer to pci_dev structure</div><div class='hunk'>@@ -4816,6 +5015,20 @@ static int qla4xxx_eh_target_reset(struct scsi_cmnd *cmd)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * qla4xxx_is_eh_active - check if error handler is running</div><div class='add'>+ * @shost: Pointer to SCSI Host struct</div><div class='add'>+ *</div><div class='add'>+ * This routine finds that if reset host is called in EH</div><div class='add'>+ * scenario or from some application like sg_reset</div><div class='add'>+ **/</div><div class='add'>+static int qla4xxx_is_eh_active(struct Scsi_Host *shost)</div><div class='add'>+{</div><div class='add'>+	if (shost-&gt;shost_state == SHOST_RECOVERY)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * qla4xxx_eh_host_reset - kernel callback</div><div class='ctx'>  * @cmd: Pointer to Linux's SCSI command structure</div><div class='ctx'>  *</div><div class='hunk'>@@ -4832,6 +5045,11 @@ static int qla4xxx_eh_host_reset(struct scsi_cmnd *cmd)</div><div class='ctx'> 	if (ql4xdontresethba) {</div><div class='ctx'> 		DEBUG2(printk("scsi%ld: %s: Don't Reset HBA\n",</div><div class='ctx'> 		     ha-&gt;host_no, __func__));</div><div class='add'>+</div><div class='add'>+		/* Clear outstanding srb in queues */</div><div class='add'>+		if (qla4xxx_is_eh_active(cmd-&gt;device-&gt;host))</div><div class='add'>+			qla4xxx_abort_active_cmds(ha, DID_ABORT &lt;&lt; 16);</div><div class='add'>+</div><div class='ctx'> 		return FAILED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/qla4xxx/ql4_version.h b/drivers/scsi/qla4xxx/ql4_version.h<br/>index 5254e57968f5..133989b3a9f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_version.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/qla4xxx/ql4_version.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla4xxx/ql4_version.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/qla4xxx/ql4_version.h</a></div><div class='hunk'>@@ -5,4 +5,4 @@</div><div class='ctx'>  * See LICENSE.qla4xxx for copyright and licensing details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define QLA4XXX_DRIVER_VERSION	"5.02.00-k9"</div><div class='add'>+#define QLA4XXX_DRIVER_VERSION	"5.02.00-k12"</div><div class='head'>diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c<br/>index dc6131e6a1ba..5f84a148eb14 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_error.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsi_error.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_error.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/scsi_error.c</a></div><div class='hunk'>@@ -1812,7 +1812,7 @@ int scsi_error_handler(void *data)</div><div class='ctx'> 		 * what we need to do to get it up and online again (if we can).</div><div class='ctx'> 		 * If we fail, we end up taking the thing offline.</div><div class='ctx'> 		 */</div><div class='del'>-		if (scsi_autopm_get_host(shost) != 0) {</div><div class='add'>+		if (!shost-&gt;eh_noresume &amp;&amp; scsi_autopm_get_host(shost) != 0) {</div><div class='ctx'> 			SCSI_LOG_ERROR_RECOVERY(1,</div><div class='ctx'> 				printk(KERN_ERR "Error handler scsi_eh_%d "</div><div class='ctx'> 						"unable to autoresume\n",</div><div class='hunk'>@@ -1833,7 +1833,8 @@ int scsi_error_handler(void *data)</div><div class='ctx'> 		 * which are still online.</div><div class='ctx'> 		 */</div><div class='ctx'> 		scsi_restart_operations(shost);</div><div class='del'>-		scsi_autopm_put_host(shost);</div><div class='add'>+		if (!shost-&gt;eh_noresume)</div><div class='add'>+			scsi_autopm_put_host(shost);</div><div class='ctx'> 		set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> 	}</div><div class='ctx'> 	__set_current_state(TASK_RUNNING);</div><div class='head'>diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c<br/>index f85cfa6c47b5..b2c95dbe9d65 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_lib.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsi_lib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_lib.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/scsi_lib.c</a></div><div class='hunk'>@@ -1316,15 +1316,10 @@ static inline int scsi_target_queue_ready(struct Scsi_Host *shost,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (scsi_target_is_busy(starget)) {</div><div class='del'>-		if (list_empty(&amp;sdev-&gt;starved_entry))</div><div class='del'>-			list_add_tail(&amp;sdev-&gt;starved_entry,</div><div class='del'>-				      &amp;shost-&gt;starved_list);</div><div class='add'>+		list_move_tail(&amp;sdev-&gt;starved_entry, &amp;shost-&gt;starved_list);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* We're OK to process the command, so we can't be starved */</div><div class='del'>-	if (!list_empty(&amp;sdev-&gt;starved_entry))</div><div class='del'>-		list_del_init(&amp;sdev-&gt;starved_entry);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c<br/>index 44f76e8b58af..c77628afbf9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_netlink.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsi_netlink.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_netlink.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/scsi_netlink.c</a></div><div class='hunk'>@@ -112,7 +112,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)</div><div class='ctx'> 			goto next_msg;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (security_netlink_recv(skb, CAP_SYS_ADMIN)) {</div><div class='add'>+		if (!capable(CAP_SYS_ADMIN)) {</div><div class='ctx'> 			err = -EPERM;</div><div class='ctx'> 			goto next_msg;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c<br/>index d329f8b12e2b..bf8bf79e6a1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_pm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsi_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_pm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/scsi_pm.c</a></div><div class='hunk'>@@ -49,8 +49,22 @@ static int scsi_bus_suspend_common(struct device *dev, pm_message_t msg)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (scsi_is_sdev_device(dev))</div><div class='add'>+	if (scsi_is_sdev_device(dev)) {</div><div class='add'>+		/*</div><div class='add'>+		 * sd is the only high-level SCSI driver to implement runtime</div><div class='add'>+		 * PM, and sd treats runtime suspend, system suspend, and</div><div class='add'>+		 * system hibernate identically (but not system freeze).</div><div class='add'>+		 */</div><div class='add'>+		if (pm_runtime_suspended(dev)) {</div><div class='add'>+			if (msg.event == PM_EVENT_SUSPEND ||</div><div class='add'>+			    msg.event == PM_EVENT_HIBERNATE)</div><div class='add'>+				return 0;	/* already suspended */</div><div class='add'>+</div><div class='add'>+			/* wake up device so that FREEZE will succeed */</div><div class='add'>+			pm_runtime_resume(dev);</div><div class='add'>+		}</div><div class='ctx'> 		err = scsi_dev_type_suspend(dev, msg);</div><div class='add'>+	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -58,8 +72,17 @@ static int scsi_bus_resume_common(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (scsi_is_sdev_device(dev))</div><div class='add'>+	if (scsi_is_sdev_device(dev)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Parent device may have runtime suspended as soon as</div><div class='add'>+		 * it is woken up during the system resume.</div><div class='add'>+		 *</div><div class='add'>+		 * Resume it on behalf of child.</div><div class='add'>+		 */</div><div class='add'>+		pm_runtime_get_sync(dev-&gt;parent);</div><div class='ctx'> 		err = scsi_dev_type_resume(dev);</div><div class='add'>+		pm_runtime_put_sync(dev-&gt;parent);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (err == 0) {</div><div class='ctx'> 		pm_runtime_disable(dev);</div><div class='head'>diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h<br/>index 2a588955423a..68eadd1c67fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_priv.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsi_priv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_priv.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/scsi_priv.h</a></div><div class='hunk'>@@ -45,7 +45,6 @@ static inline void scsi_log_completion(struct scsi_cmnd *cmd, int disposition)</div><div class='ctx'> enum {</div><div class='ctx'> 	SCSI_DEVINFO_GLOBAL = 0,</div><div class='ctx'> 	SCSI_DEVINFO_SPI,</div><div class='del'>-	SCSI_DEVINFO_DH,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern int scsi_get_device_flags(struct scsi_device *sdev,</div><div class='head'>diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c<br/>index b3c6d957fbd8..89da43f73c00 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_scan.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsi_scan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_scan.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/scsi_scan.c</a></div><div class='hunk'>@@ -297,7 +297,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,</div><div class='ctx'> 		kfree(sdev);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	blk_get_queue(sdev-&gt;request_queue);</div><div class='add'>+	WARN_ON_ONCE(!blk_get_queue(sdev-&gt;request_queue));</div><div class='ctx'> 	sdev-&gt;request_queue-&gt;queuedata = sdev;</div><div class='ctx'> 	scsi_adjust_queue_depth(sdev, 0, sdev-&gt;host-&gt;cmd_per_lun);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c<br/>index 1b214910b714..f59d4a05ecd7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_transport_fc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsi_transport_fc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_transport_fc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/scsi_transport_fc.c</a></div><div class='hunk'>@@ -3048,7 +3048,8 @@ fc_remote_port_rolechg(struct fc_rport  *rport, u32 roles)</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irqsave(shost-&gt;host_lock, flags);</div><div class='ctx'> 		rport-&gt;flags &amp;= ~(FC_RPORT_FAST_FAIL_TIMEDOUT |</div><div class='del'>-				  FC_RPORT_DEVLOSS_PENDING);</div><div class='add'>+				  FC_RPORT_DEVLOSS_PENDING |</div><div class='add'>+				  FC_RPORT_DEVLOSS_CALLBK_DONE);</div><div class='ctx'> 		spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 		/* ensure any stgt delete functions are done */</div><div class='head'>diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c<br/>index 96029e6d027f..cfd491437239 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_transport_iscsi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsi_transport_iscsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_transport_iscsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/scsi_transport_iscsi.c</a></div><div class='hunk'>@@ -328,7 +328,7 @@ iscsi_iface_net_attr(iface, vlan_enabled, ISCSI_NET_PARAM_VLAN_ENABLED);</div><div class='ctx'> iscsi_iface_net_attr(iface, mtu, ISCSI_NET_PARAM_MTU);</div><div class='ctx'> iscsi_iface_net_attr(iface, port, ISCSI_NET_PARAM_PORT);</div><div class='ctx'> </div><div class='del'>-static mode_t iscsi_iface_attr_is_visible(struct kobject *kobj,</div><div class='add'>+static umode_t iscsi_iface_attr_is_visible(struct kobject *kobj,</div><div class='ctx'> 					  struct attribute *attr, int i)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = container_of(kobj, struct device, kobj);</div><div class='hunk'>@@ -1030,6 +1030,7 @@ iscsi_alloc_session(struct Scsi_Host *shost, struct iscsi_transport *transport,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	session-&gt;transport = transport;</div><div class='add'>+	session-&gt;creator = -1;</div><div class='ctx'> 	session-&gt;recovery_tmo = 120;</div><div class='ctx'> 	session-&gt;state = ISCSI_SESSION_FREE;</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;session-&gt;recovery_work, session_recovery_timedout);</div><div class='hunk'>@@ -1634,8 +1635,9 @@ EXPORT_SYMBOL_GPL(iscsi_session_event);</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> iscsi_if_create_session(struct iscsi_internal *priv, struct iscsi_endpoint *ep,</div><div class='del'>-			struct iscsi_uevent *ev, uint32_t initial_cmdsn,</div><div class='del'>-			uint16_t cmds_max, uint16_t queue_depth)</div><div class='add'>+			struct iscsi_uevent *ev, pid_t pid,</div><div class='add'>+			uint32_t initial_cmdsn,	uint16_t cmds_max,</div><div class='add'>+			uint16_t queue_depth)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_transport *transport = priv-&gt;iscsi_transport;</div><div class='ctx'> 	struct iscsi_cls_session *session;</div><div class='hunk'>@@ -1646,6 +1648,7 @@ iscsi_if_create_session(struct iscsi_internal *priv, struct iscsi_endpoint *ep,</div><div class='ctx'> 	if (!session)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	session-&gt;creator = pid;</div><div class='ctx'> 	shost = iscsi_session_to_shost(session);</div><div class='ctx'> 	ev-&gt;r.c_session_ret.host_no = shost-&gt;host_no;</div><div class='ctx'> 	ev-&gt;r.c_session_ret.sid = session-&gt;sid;</div><div class='hunk'>@@ -1938,6 +1941,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)</div><div class='ctx'> 	switch (nlh-&gt;nlmsg_type) {</div><div class='ctx'> 	case ISCSI_UEVENT_CREATE_SESSION:</div><div class='ctx'> 		err = iscsi_if_create_session(priv, ep, ev,</div><div class='add'>+					      NETLINK_CREDS(skb)-&gt;pid,</div><div class='ctx'> 					      ev-&gt;u.c_session.initial_cmdsn,</div><div class='ctx'> 					      ev-&gt;u.c_session.cmds_max,</div><div class='ctx'> 					      ev-&gt;u.c_session.queue_depth);</div><div class='hunk'>@@ -1950,6 +1954,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		err = iscsi_if_create_session(priv, ep, ev,</div><div class='add'>+					NETLINK_CREDS(skb)-&gt;pid,</div><div class='ctx'> 					ev-&gt;u.c_bound_session.initial_cmdsn,</div><div class='ctx'> 					ev-&gt;u.c_bound_session.cmds_max,</div><div class='ctx'> 					ev-&gt;u.c_bound_session.queue_depth);</div><div class='hunk'>@@ -2199,7 +2204,7 @@ static struct attribute *iscsi_conn_attrs[] = {</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static mode_t iscsi_conn_attr_is_visible(struct kobject *kobj,</div><div class='add'>+static umode_t iscsi_conn_attr_is_visible(struct kobject *kobj,</div><div class='ctx'> 					 struct attribute *attr, int i)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *cdev = container_of(kobj, struct device, kobj);</div><div class='hunk'>@@ -2298,6 +2303,15 @@ show_priv_session_state(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> }</div><div class='ctx'> static ISCSI_CLASS_ATTR(priv_sess, state, S_IRUGO, show_priv_session_state,</div><div class='ctx'> 			NULL);</div><div class='add'>+static ssize_t</div><div class='add'>+show_priv_session_creator(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			char *buf)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_cls_session *session = iscsi_dev_to_session(dev-&gt;parent);</div><div class='add'>+	return sprintf(buf, "%d\n", session-&gt;creator);</div><div class='add'>+}</div><div class='add'>+static ISCSI_CLASS_ATTR(priv_sess, creator, S_IRUGO, show_priv_session_creator,</div><div class='add'>+			NULL);</div><div class='ctx'> </div><div class='ctx'> #define iscsi_priv_session_attr_show(field, format)			\</div><div class='ctx'> static ssize_t								\</div><div class='hunk'>@@ -2367,10 +2381,11 @@ static struct attribute *iscsi_session_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_sess_targetalias.attr,</div><div class='ctx'> 	&amp;dev_attr_priv_sess_recovery_tmo.attr,</div><div class='ctx'> 	&amp;dev_attr_priv_sess_state.attr,</div><div class='add'>+	&amp;dev_attr_priv_sess_creator.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static mode_t iscsi_session_attr_is_visible(struct kobject *kobj,</div><div class='add'>+static umode_t iscsi_session_attr_is_visible(struct kobject *kobj,</div><div class='ctx'> 					    struct attribute *attr, int i)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *cdev = container_of(kobj, struct device, kobj);</div><div class='hunk'>@@ -2424,6 +2439,8 @@ static mode_t iscsi_session_attr_is_visible(struct kobject *kobj,</div><div class='ctx'> 		return S_IRUGO | S_IWUSR;</div><div class='ctx'> 	else if (attr == &amp;dev_attr_priv_sess_state.attr)</div><div class='ctx'> 		return S_IRUGO;</div><div class='add'>+	else if (attr == &amp;dev_attr_priv_sess_creator.attr)</div><div class='add'>+		return S_IRUGO;</div><div class='ctx'> 	else {</div><div class='ctx'> 		WARN_ONCE(1, "Invalid session attr");</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -2468,7 +2485,7 @@ static struct attribute *iscsi_host_attrs[] = {</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static mode_t iscsi_host_attr_is_visible(struct kobject *kobj,</div><div class='add'>+static umode_t iscsi_host_attr_is_visible(struct kobject *kobj,</div><div class='ctx'> 					 struct attribute *attr, int i)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *cdev = container_of(kobj, struct device, kobj);</div><div class='head'>diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c<br/>index 5fbeadd96819..a2715c31e754 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_transport_spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsi_transport_spi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_transport_spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/scsi_transport_spi.c</a></div><div class='hunk'>@@ -1434,7 +1434,7 @@ static int spi_host_configure(struct transport_container *tc,</div><div class='ctx'> 	(si-&gt;f-&gt;show_##name ? S_IRUGO : 0) | \</div><div class='ctx'> 	(si-&gt;f-&gt;set_##name ? S_IWUSR : 0)</div><div class='ctx'> </div><div class='del'>-static mode_t target_attribute_is_visible(struct kobject *kobj,</div><div class='add'>+static umode_t target_attribute_is_visible(struct kobject *kobj,</div><div class='ctx'> 					  struct attribute *attr, int i)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *cdev = container_of(kobj, struct device, kobj);</div><div class='head'>diff --git a/drivers/scsi/scsicam.c b/drivers/scsi/scsicam.c<br/>index 6803b1e26ecc..92d24d6dcb39 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsicam.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/scsicam.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsicam.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/scsicam.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #include &lt;linux/genhd.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;scsi/scsicam.h&gt;</div><div class='head'>diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c<br/>index fa3a5918009c..c691fb50e6cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sd.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/sd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sd.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/sd.c</a></div><div class='hunk'>@@ -50,6 +50,7 @@</div><div class='ctx'> #include &lt;linux/string_helpers.h&gt;</div><div class='ctx'> #include &lt;linux/async.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -1074,6 +1075,10 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode,</div><div class='ctx'> 	SCSI_LOG_IOCTL(1, sd_printk(KERN_INFO, sdkp, "sd_ioctl: disk=%s, "</div><div class='ctx'> 				    "cmd=0x%x\n", disk-&gt;disk_name, cmd));</div><div class='ctx'> </div><div class='add'>+	error = scsi_verify_blk_ioctl(bdev, cmd);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we are in the middle of error recovery, don't let anyone</div><div class='ctx'> 	 * else try and use this device.  Also, if error recovery fails, it</div><div class='hunk'>@@ -1096,7 +1101,7 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode,</div><div class='ctx'> 			error = scsi_ioctl(sdp, cmd, p);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			error = scsi_cmd_ioctl(disk-&gt;queue, disk, mode, cmd, p);</div><div class='add'>+			error = scsi_cmd_blk_ioctl(bdev, mode, cmd, p);</div><div class='ctx'> 			if (error != -ENOTTY)</div><div class='ctx'> 				break;</div><div class='ctx'> 			error = scsi_ioctl(sdp, cmd, p);</div><div class='hunk'>@@ -1266,6 +1271,11 @@ static int sd_compat_ioctl(struct block_device *bdev, fmode_t mode,</div><div class='ctx'> 			   unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_device *sdev = scsi_disk(bdev-&gt;bd_disk)-&gt;device;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = scsi_verify_blk_ioctl(bdev, cmd);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we are in the middle of error recovery, don't let anyone</div><div class='hunk'>@@ -1277,8 +1287,6 @@ static int sd_compat_ioctl(struct block_device *bdev, fmode_t mode,</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	       </div><div class='ctx'> 	if (sdev-&gt;host-&gt;hostt-&gt;compat_ioctl) {</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='ctx'> 		ret = sdev-&gt;host-&gt;hostt-&gt;compat_ioctl(sdev, cmd, (void __user *)arg);</div><div class='ctx'> </div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -2741,6 +2749,9 @@ static void sd_shutdown(struct device *dev)</div><div class='ctx'> 	if (!sdkp)</div><div class='ctx'> 		return;         /* this can happen */</div><div class='ctx'> </div><div class='add'>+	if (pm_runtime_suspended(dev))</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='ctx'> 	if (sdkp-&gt;WCE) {</div><div class='ctx'> 		sd_printk(KERN_NOTICE, sdkp, "Synchronizing SCSI cache\n");</div><div class='ctx'> 		sd_sync_cache(sdkp);</div><div class='hunk'>@@ -2751,6 +2762,7 @@ static void sd_shutdown(struct device *dev)</div><div class='ctx'> 		sd_start_stop_device(sdkp, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+exit:</div><div class='ctx'> 	scsi_disk_put(sdkp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c<br/>index 441a1c5b8974..eacd46bb36b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/sg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/sg.c</a></div><div class='hunk'>@@ -2325,16 +2325,15 @@ static struct sg_proc_leaf sg_proc_leaf_arr[] = {</div><div class='ctx'> static int</div><div class='ctx'> sg_proc_init(void)</div><div class='ctx'> {</div><div class='del'>-	int k, mask;</div><div class='ctx'> 	int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);</div><div class='del'>-	struct sg_proc_leaf * leaf;</div><div class='add'>+	int k;</div><div class='ctx'> </div><div class='ctx'> 	sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);</div><div class='ctx'> 	if (!sg_proc_sgp)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	for (k = 0; k &lt; num_leaves; ++k) {</div><div class='del'>-		leaf = &amp;sg_proc_leaf_arr[k];</div><div class='del'>-		mask = leaf-&gt;fops-&gt;write ? S_IRUGO | S_IWUSR : S_IRUGO;</div><div class='add'>+		struct sg_proc_leaf *leaf = &amp;sg_proc_leaf_arr[k];</div><div class='add'>+		umode_t mask = leaf-&gt;fops-&gt;write ? S_IRUGO | S_IWUSR : S_IRUGO;</div><div class='ctx'> 		proc_create(leaf-&gt;name, mask, sg_proc_sgp, leaf-&gt;fops);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2369,16 +2368,15 @@ static ssize_t</div><div class='ctx'> sg_proc_write_adio(struct file *filp, const char __user *buffer,</div><div class='ctx'> 		   size_t count, loff_t *off)</div><div class='ctx'> {</div><div class='del'>-	int num;</div><div class='del'>-	char buff[11];</div><div class='add'>+	int err;</div><div class='add'>+	unsigned long num;</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))</div><div class='ctx'> 		return -EACCES;</div><div class='del'>-	num = (count &lt; 10) ? count : 10;</div><div class='del'>-	if (copy_from_user(buff, buffer, num))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	buff[num] = '\0';</div><div class='del'>-	sg_allow_dio = simple_strtoul(buff, NULL, 10) ? 1 : 0;</div><div class='add'>+	err = kstrtoul_from_user(buffer, count, 0, &amp;num);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	sg_allow_dio = num ? 1 : 0;</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2391,17 +2389,15 @@ static ssize_t</div><div class='ctx'> sg_proc_write_dressz(struct file *filp, const char __user *buffer,</div><div class='ctx'> 		     size_t count, loff_t *off)</div><div class='ctx'> {</div><div class='del'>-	int num;</div><div class='add'>+	int err;</div><div class='ctx'> 	unsigned long k = ULONG_MAX;</div><div class='del'>-	char buff[11];</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))</div><div class='ctx'> 		return -EACCES;</div><div class='del'>-	num = (count &lt; 10) ? count : 10;</div><div class='del'>-	if (copy_from_user(buff, buffer, num))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	buff[num] = '\0';</div><div class='del'>-	k = simple_strtoul(buff, NULL, 10);</div><div class='add'>+</div><div class='add'>+	err = kstrtoul_from_user(buffer, count, 0, &amp;k);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> 	if (k &lt;= 1048576) {	/* limit "big buff" to 1 MB */</div><div class='ctx'> 		sg_big_buff = k;</div><div class='ctx'> 		return count;</div><div class='head'>diff --git a/drivers/scsi/sni_53c710.c b/drivers/scsi/sni_53c710.c<br/>index 9acc2b2a3601..cf51432f8e72 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sni_53c710.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/sni_53c710.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sni_53c710.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/sni_53c710.c</a></div><div class='hunk'>@@ -51,7 +51,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "53c700.h"</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Thomas Bogendörfer");</div><div class='add'>+MODULE_AUTHOR("Thomas Bogendörfer");</div><div class='ctx'> MODULE_DESCRIPTION("SNI RM 53c710 SCSI Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS("platform:snirm_53c710");</div><div class='head'>diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c<br/>index b4543f575f46..36d1ed7817eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sym53c8xx_2/sym_glue.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/sym53c8xx_2/sym_glue.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sym53c8xx_2/sym_glue.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/sym53c8xx_2/sym_glue.c</a></div><div class='hunk'>@@ -839,6 +839,10 @@ static void sym53c8xx_slave_destroy(struct scsi_device *sdev)</div><div class='ctx'> 	struct sym_lcb *lp = sym_lp(tp, sdev-&gt;lun);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	/* if slave_alloc returned before allocating a sym_lcb, return */</div><div class='add'>+	if (!lp)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(np-&gt;s.host-&gt;host_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (lp-&gt;busy_itlq || lp-&gt;busy_itl) {</div><div class='head'>diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c<br/>index a18996d24466..7264116185d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/vmw_pvscsi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/scsi/vmw_pvscsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/vmw_pvscsi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/scsi/vmw_pvscsi.c</a></div><div class='hunk'>@@ -1144,7 +1144,7 @@ static void pvscsi_release_resources(struct pvscsi_adapter *adapter)</div><div class='ctx'>  *</div><div class='ctx'>  * These are statically allocated.  Trying to be clever was not worth it.</div><div class='ctx'>  *</div><div class='del'>- * Dynamic allocation can fail, and we can't go deeep into the memory</div><div class='add'>+ * Dynamic allocation can fail, and we can't go deep into the memory</div><div class='ctx'>  * allocator, since we're a SCSI driver, and trying too hard to allocate</div><div class='ctx'>  * memory might generate disk I/O.  We also don't want to fail disk I/O</div><div class='ctx'>  * in that case because we can't get an allocation - the I/O could be</div><div class='head'>diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile<br/>index 67e272ab1623..7139ad2f2086 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sh/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/sh/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sh/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/sh/Makefile</a></div><div class='hunk'>@@ -7,11 +7,4 @@ obj-$(CONFIG_HAVE_CLK)		+= clk/</div><div class='ctx'> obj-$(CONFIG_MAPLE)		+= maple/</div><div class='ctx'> obj-$(CONFIG_SUPERHYWAY)	+= superhyway/</div><div class='ctx'> obj-$(CONFIG_GENERIC_GPIO)	+= pfc.o</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# For the moment we only use this framework for ARM-based SH/R-Mobile</div><div class='del'>-# platforms and generic SH. SH-based SH-Mobile platforms are still using</div><div class='del'>-# an older framework that is pending up-porting, at which point this</div><div class='del'>-# special casing can go away.</div><div class='del'>-#</div><div class='del'>-obj-$(CONFIG_SUPERH)$(CONFIG_ARCH_SHMOBILE)	+= pm_runtime.o</div><div class='add'>+obj-y				+= pm_runtime.o</div><div class='head'>diff --git a/drivers/sh/clk/core.c b/drivers/sh/clk/core.c<br/>index db257a35e71a..7715de2629c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sh/clk/core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/sh/clk/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sh/clk/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/sh/clk/core.c</a></div><div class='hunk'>@@ -355,7 +355,7 @@ static int clk_establish_mapping(struct clk *clk)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!clk-&gt;parent) {</div><div class='ctx'> 			clk-&gt;mapping = &amp;dummy_mapping;</div><div class='del'>-			return 0;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -384,6 +384,9 @@ static int clk_establish_mapping(struct clk *clk)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	clk-&gt;mapping = mapping;</div><div class='add'>+out:</div><div class='add'>+	clk-&gt;mapped_reg = clk-&gt;mapping-&gt;base;</div><div class='add'>+	clk-&gt;mapped_reg += (phys_addr_t)clk-&gt;enable_reg - clk-&gt;mapping-&gt;phys;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -402,10 +405,12 @@ static void clk_teardown_mapping(struct clk *clk)</div><div class='ctx'> </div><div class='ctx'> 	/* Nothing to do */</div><div class='ctx'> 	if (mapping == &amp;dummy_mapping)</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	kref_put(&amp;mapping-&gt;ref, clk_destroy_mapping);</div><div class='ctx'> 	clk-&gt;mapping = NULL;</div><div class='add'>+out:</div><div class='add'>+	clk-&gt;mapped_reg = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int clk_register(struct clk *clk)</div><div class='head'>diff --git a/drivers/sh/clk/cpg.c b/drivers/sh/clk/cpg.c<br/>index 82dd6fb17838..45fee368b092 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sh/clk/cpg.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/sh/clk/cpg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sh/clk/cpg.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/sh/clk/cpg.c</a></div><div class='hunk'>@@ -15,15 +15,15 @@</div><div class='ctx'> </div><div class='ctx'> static int sh_clk_mstp32_enable(struct clk *clk)</div><div class='ctx'> {</div><div class='del'>-	__raw_writel(__raw_readl(clk-&gt;enable_reg) &amp; ~(1 &lt;&lt; clk-&gt;enable_bit),</div><div class='del'>-		     clk-&gt;enable_reg);</div><div class='add'>+	iowrite32(ioread32(clk-&gt;mapped_reg) &amp; ~(1 &lt;&lt; clk-&gt;enable_bit),</div><div class='add'>+		  clk-&gt;mapped_reg);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sh_clk_mstp32_disable(struct clk *clk)</div><div class='ctx'> {</div><div class='del'>-	__raw_writel(__raw_readl(clk-&gt;enable_reg) | (1 &lt;&lt; clk-&gt;enable_bit),</div><div class='del'>-		     clk-&gt;enable_reg);</div><div class='add'>+	iowrite32(ioread32(clk-&gt;mapped_reg) | (1 &lt;&lt; clk-&gt;enable_bit),</div><div class='add'>+		  clk-&gt;mapped_reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct clk_ops sh_clk_mstp32_clk_ops = {</div><div class='hunk'>@@ -72,7 +72,7 @@ static unsigned long sh_clk_div6_recalc(struct clk *clk)</div><div class='ctx'> 	clk_rate_table_build(clk, clk-&gt;freq_table, table-&gt;nr_divisors,</div><div class='ctx'> 			     table, NULL);</div><div class='ctx'> </div><div class='del'>-	idx = __raw_readl(clk-&gt;enable_reg) &amp; 0x003f;</div><div class='add'>+	idx = ioread32(clk-&gt;mapped_reg) &amp; 0x003f;</div><div class='ctx'> </div><div class='ctx'> 	return clk-&gt;freq_table[idx].frequency;</div><div class='ctx'> }</div><div class='hunk'>@@ -98,10 +98,10 @@ static int sh_clk_div6_set_parent(struct clk *clk, struct clk *parent)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	value = __raw_readl(clk-&gt;enable_reg) &amp;</div><div class='add'>+	value = ioread32(clk-&gt;mapped_reg) &amp;</div><div class='ctx'> 		~(((1 &lt;&lt; clk-&gt;src_width) - 1) &lt;&lt; clk-&gt;src_shift);</div><div class='ctx'> </div><div class='del'>-	__raw_writel(value | (i &lt;&lt; clk-&gt;src_shift), clk-&gt;enable_reg);</div><div class='add'>+	iowrite32(value | (i &lt;&lt; clk-&gt;src_shift), clk-&gt;mapped_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* Rebuild the frequency table */</div><div class='ctx'> 	clk_rate_table_build(clk, clk-&gt;freq_table, table-&gt;nr_divisors,</div><div class='hunk'>@@ -119,10 +119,10 @@ static int sh_clk_div6_set_rate(struct clk *clk, unsigned long rate)</div><div class='ctx'> 	if (idx &lt; 0)</div><div class='ctx'> 		return idx;</div><div class='ctx'> </div><div class='del'>-	value = __raw_readl(clk-&gt;enable_reg);</div><div class='add'>+	value = ioread32(clk-&gt;mapped_reg);</div><div class='ctx'> 	value &amp;= ~0x3f;</div><div class='ctx'> 	value |= idx;</div><div class='del'>-	__raw_writel(value, clk-&gt;enable_reg);</div><div class='add'>+	iowrite32(value, clk-&gt;mapped_reg);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -133,9 +133,9 @@ static int sh_clk_div6_enable(struct clk *clk)</div><div class='ctx'> </div><div class='ctx'> 	ret = sh_clk_div6_set_rate(clk, clk-&gt;rate);</div><div class='ctx'> 	if (ret == 0) {</div><div class='del'>-		value = __raw_readl(clk-&gt;enable_reg);</div><div class='add'>+		value = ioread32(clk-&gt;mapped_reg);</div><div class='ctx'> 		value &amp;= ~0x100; /* clear stop bit to enable clock */</div><div class='del'>-		__raw_writel(value, clk-&gt;enable_reg);</div><div class='add'>+		iowrite32(value, clk-&gt;mapped_reg);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -144,10 +144,10 @@ static void sh_clk_div6_disable(struct clk *clk)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long value;</div><div class='ctx'> </div><div class='del'>-	value = __raw_readl(clk-&gt;enable_reg);</div><div class='add'>+	value = ioread32(clk-&gt;mapped_reg);</div><div class='ctx'> 	value |= 0x100; /* stop clock */</div><div class='ctx'> 	value |= 0x3f; /* VDIV bits must be non-zero, overwrite divider */</div><div class='del'>-	__raw_writel(value, clk-&gt;enable_reg);</div><div class='add'>+	iowrite32(value, clk-&gt;mapped_reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct clk_ops sh_clk_div6_clk_ops = {</div><div class='hunk'>@@ -167,6 +167,38 @@ static struct clk_ops sh_clk_div6_reparent_clk_ops = {</div><div class='ctx'> 	.set_parent	= sh_clk_div6_set_parent,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int __init sh_clk_init_parent(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (clk-&gt;parent)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!clk-&gt;parent_table || !clk-&gt;parent_num)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!clk-&gt;src_width) {</div><div class='add'>+		pr_err("sh_clk_init_parent: cannot select parent clock\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val  = (ioread32(clk-&gt;mapped_reg) &gt;&gt; clk-&gt;src_shift);</div><div class='add'>+	val &amp;= (1 &lt;&lt; clk-&gt;src_width) - 1;</div><div class='add'>+</div><div class='add'>+	if (val &gt;= clk-&gt;parent_num) {</div><div class='add'>+		pr_err("sh_clk_init_parent: parent table size failed\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clk-&gt;parent = clk-&gt;parent_table[val];</div><div class='add'>+	if (!clk-&gt;parent) {</div><div class='add'>+		pr_err("sh_clk_init_parent: unable to set parent");</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 __init sh_clk_div6_register_ops(struct clk *clks, int nr,</div><div class='ctx'> 					   struct clk_ops *ops)</div><div class='ctx'> {</div><div class='hunk'>@@ -190,8 +222,11 @@ static int __init sh_clk_div6_register_ops(struct clk *clks, int nr,</div><div class='ctx'> 		clkp-&gt;ops = ops;</div><div class='ctx'> 		clkp-&gt;freq_table = freq_table + (k * freq_table_size);</div><div class='ctx'> 		clkp-&gt;freq_table[nr_divs].frequency = CPUFREQ_TABLE_END;</div><div class='del'>-</div><div class='ctx'> 		ret = clk_register(clkp);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ret = sh_clk_init_parent(clkp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -217,7 +252,7 @@ static unsigned long sh_clk_div4_recalc(struct clk *clk)</div><div class='ctx'> 	clk_rate_table_build(clk, clk-&gt;freq_table, table-&gt;nr_divisors,</div><div class='ctx'> 			     table, &amp;clk-&gt;arch_flags);</div><div class='ctx'> </div><div class='del'>-	idx = (__raw_readl(clk-&gt;enable_reg) &gt;&gt; clk-&gt;enable_bit) &amp; 0x000f;</div><div class='add'>+	idx = (ioread32(clk-&gt;mapped_reg) &gt;&gt; clk-&gt;enable_bit) &amp; 0x000f;</div><div class='ctx'> </div><div class='ctx'> 	return clk-&gt;freq_table[idx].frequency;</div><div class='ctx'> }</div><div class='hunk'>@@ -235,15 +270,15 @@ static int sh_clk_div4_set_parent(struct clk *clk, struct clk *parent)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (parent-&gt;flags &amp; CLK_ENABLE_ON_INIT)</div><div class='del'>-		value = __raw_readl(clk-&gt;enable_reg) &amp; ~(1 &lt;&lt; 7);</div><div class='add'>+		value = ioread32(clk-&gt;mapped_reg) &amp; ~(1 &lt;&lt; 7);</div><div class='ctx'> 	else</div><div class='del'>-		value = __raw_readl(clk-&gt;enable_reg) | (1 &lt;&lt; 7);</div><div class='add'>+		value = ioread32(clk-&gt;mapped_reg) | (1 &lt;&lt; 7);</div><div class='ctx'> </div><div class='ctx'> 	ret = clk_reparent(clk, parent);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	__raw_writel(value, clk-&gt;enable_reg);</div><div class='add'>+	iowrite32(value, clk-&gt;mapped_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* Rebiuld the frequency table */</div><div class='ctx'> 	clk_rate_table_build(clk, clk-&gt;freq_table, table-&gt;nr_divisors,</div><div class='hunk'>@@ -260,10 +295,10 @@ static int sh_clk_div4_set_rate(struct clk *clk, unsigned long rate)</div><div class='ctx'> 	if (idx &lt; 0)</div><div class='ctx'> 		return idx;</div><div class='ctx'> </div><div class='del'>-	value = __raw_readl(clk-&gt;enable_reg);</div><div class='add'>+	value = ioread32(clk-&gt;mapped_reg);</div><div class='ctx'> 	value &amp;= ~(0xf &lt;&lt; clk-&gt;enable_bit);</div><div class='ctx'> 	value |= (idx &lt;&lt; clk-&gt;enable_bit);</div><div class='del'>-	__raw_writel(value, clk-&gt;enable_reg);</div><div class='add'>+	iowrite32(value, clk-&gt;mapped_reg);</div><div class='ctx'> </div><div class='ctx'> 	if (d4t-&gt;kick)</div><div class='ctx'> 		d4t-&gt;kick(clk);</div><div class='hunk'>@@ -273,13 +308,13 @@ static int sh_clk_div4_set_rate(struct clk *clk, unsigned long rate)</div><div class='ctx'> </div><div class='ctx'> static int sh_clk_div4_enable(struct clk *clk)</div><div class='ctx'> {</div><div class='del'>-	__raw_writel(__raw_readl(clk-&gt;enable_reg) &amp; ~(1 &lt;&lt; 8), clk-&gt;enable_reg);</div><div class='add'>+	iowrite32(ioread32(clk-&gt;mapped_reg) &amp; ~(1 &lt;&lt; 8), clk-&gt;mapped_reg);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sh_clk_div4_disable(struct clk *clk)</div><div class='ctx'> {</div><div class='del'>-	__raw_writel(__raw_readl(clk-&gt;enable_reg) | (1 &lt;&lt; 8), clk-&gt;enable_reg);</div><div class='add'>+	iowrite32(ioread32(clk-&gt;mapped_reg) | (1 &lt;&lt; 8), clk-&gt;mapped_reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct clk_ops sh_clk_div4_clk_ops = {</div><div class='head'>diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c<br/>index 8b7a141ff35e..e53e449b4eca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sh/intc/core.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/sh/intc/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sh/intc/core.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/sh/intc/core.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/sh_intc.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/syscore_ops.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -354,6 +354,8 @@ int __init register_intc_controller(struct intc_desc *desc)</div><div class='ctx'> 	if (desc-&gt;force_enable)</div><div class='ctx'> 		intc_enable_disable_enum(desc, d, desc-&gt;force_enable, 1);</div><div class='ctx'> </div><div class='add'>+	d-&gt;skip_suspend = desc-&gt;skip_syscore_suspend;</div><div class='add'>+</div><div class='ctx'> 	nr_intc_controllers++;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -386,6 +388,9 @@ static int intc_suspend(void)</div><div class='ctx'> 	list_for_each_entry(d, &amp;intc_list, list) {</div><div class='ctx'> 		int irq;</div><div class='ctx'> </div><div class='add'>+		if (d-&gt;skip_suspend)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		/* enable wakeup irqs belonging to this intc controller */</div><div class='ctx'> 		for_each_active_irq(irq) {</div><div class='ctx'> 			struct irq_data *data;</div><div class='hunk'>@@ -409,6 +414,9 @@ static void intc_resume(void)</div><div class='ctx'> 	list_for_each_entry(d, &amp;intc_list, list) {</div><div class='ctx'> 		int irq;</div><div class='ctx'> </div><div class='add'>+		if (d-&gt;skip_suspend)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		for_each_active_irq(irq) {</div><div class='ctx'> 			struct irq_data *data;</div><div class='ctx'> 			struct irq_chip *chip;</div><div class='hunk'>@@ -434,46 +442,47 @@ struct syscore_ops intc_syscore_ops = {</div><div class='ctx'> 	.resume		= intc_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct sysdev_class intc_sysdev_class = {</div><div class='add'>+struct bus_type intc_subsys = {</div><div class='ctx'> 	.name		= "intc",</div><div class='add'>+	.dev_name	= "intc",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_intc_name(struct sys_device *dev, struct sysdev_attribute *attr, char *buf)</div><div class='add'>+show_intc_name(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct intc_desc_int *d;</div><div class='ctx'> </div><div class='del'>-	d = container_of(dev, struct intc_desc_int, sysdev);</div><div class='add'>+	d = container_of(dev, struct intc_desc_int, dev);</div><div class='ctx'> </div><div class='ctx'> 	return sprintf(buf, "%s\n", d-&gt;chip.name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_ATTR(name, S_IRUGO, show_intc_name, NULL);</div><div class='add'>+static DEVICE_ATTR(name, S_IRUGO, show_intc_name, NULL);</div><div class='ctx'> </div><div class='del'>-static int __init register_intc_sysdevs(void)</div><div class='add'>+static int __init register_intc_devs(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct intc_desc_int *d;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	register_syscore_ops(&amp;intc_syscore_ops);</div><div class='ctx'> </div><div class='del'>-	error = sysdev_class_register(&amp;intc_sysdev_class);</div><div class='add'>+	error = subsys_system_register(&amp;intc_subsys, NULL);</div><div class='ctx'> 	if (!error) {</div><div class='ctx'> 		list_for_each_entry(d, &amp;intc_list, list) {</div><div class='del'>-			d-&gt;sysdev.id = d-&gt;index;</div><div class='del'>-			d-&gt;sysdev.cls = &amp;intc_sysdev_class;</div><div class='del'>-			error = sysdev_register(&amp;d-&gt;sysdev);</div><div class='add'>+			d-&gt;dev.id = d-&gt;index;</div><div class='add'>+			d-&gt;dev.bus = &amp;intc_subsys;</div><div class='add'>+			error = device_register(&amp;d-&gt;dev);</div><div class='ctx'> 			if (error == 0)</div><div class='del'>-				error = sysdev_create_file(&amp;d-&gt;sysdev,</div><div class='del'>-							   &amp;attr_name);</div><div class='add'>+				error = device_create_file(&amp;d-&gt;dev,</div><div class='add'>+							   &amp;dev_attr_name);</div><div class='ctx'> 			if (error)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (error)</div><div class='del'>-		pr_err("sysdev registration error\n");</div><div class='add'>+		pr_err("device registration error\n");</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='del'>-device_initcall(register_intc_sysdevs);</div><div class='add'>+device_initcall(register_intc_devs);</div><div class='head'>diff --git a/drivers/sh/intc/internals.h b/drivers/sh/intc/internals.h<br/>index 5b934851efa8..b0e9155ff739 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sh/intc/internals.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/sh/intc/internals.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sh/intc/internals.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/sh/intc/internals.h</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/radix-tree.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define _INTC_MK(fn, mode, addr_e, addr_d, width, shift) \</div><div class='ctx'> 	((shift) | ((width) &lt;&lt; 5) | ((fn) &lt;&lt; 9) | ((mode) &lt;&lt; 13) | \</div><div class='hunk'>@@ -51,7 +51,7 @@ struct intc_subgroup_entry {</div><div class='ctx'> </div><div class='ctx'> struct intc_desc_int {</div><div class='ctx'> 	struct list_head list;</div><div class='del'>-	struct sys_device sysdev;</div><div class='add'>+	struct device dev;</div><div class='ctx'> 	struct radix_tree_root tree;</div><div class='ctx'> 	raw_spinlock_t lock;</div><div class='ctx'> 	unsigned int index;</div><div class='hunk'>@@ -67,6 +67,7 @@ struct intc_desc_int {</div><div class='ctx'> 	struct intc_window *window;</div><div class='ctx'> 	unsigned int nr_windows;</div><div class='ctx'> 	struct irq_chip chip;</div><div class='add'>+	bool skip_suspend;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -157,7 +158,7 @@ void _intc_enable(struct irq_data *data, unsigned long handle);</div><div class='ctx'> extern struct list_head intc_list;</div><div class='ctx'> extern raw_spinlock_t intc_big_lock;</div><div class='ctx'> extern unsigned int nr_intc_controllers;</div><div class='del'>-extern struct sysdev_class intc_sysdev_class;</div><div class='add'>+extern struct bus_type intc_subsys;</div><div class='ctx'> </div><div class='ctx'> unsigned int intc_get_dfl_prio_level(void);</div><div class='ctx'> unsigned int intc_get_prio_level(unsigned int irq);</div><div class='head'>diff --git a/drivers/sh/intc/userimask.c b/drivers/sh/intc/userimask.c<br/>index 56bf9336b92b..e649ceaaa410 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sh/intc/userimask.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/sh/intc/userimask.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sh/intc/userimask.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/sh/intc/userimask.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #define pr_fmt(fmt) "intc: " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/device.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/stat.h&gt;</div><div class='hunk'>@@ -20,15 +20,15 @@</div><div class='ctx'> static void __iomem *uimask;</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-show_intc_userimask(struct sysdev_class *cls,</div><div class='del'>-		    struct sysdev_class_attribute *attr, char *buf)</div><div class='add'>+show_intc_userimask(struct device *dev,</div><div class='add'>+		    struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%d\n", (__raw_readl(uimask) &gt;&gt; 4) &amp; 0xf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-store_intc_userimask(struct sysdev_class *cls,</div><div class='del'>-		     struct sysdev_class_attribute *attr,</div><div class='add'>+store_intc_userimask(struct device *dev,</div><div class='add'>+		     struct device_attribute *attr,</div><div class='ctx'> 		     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long level;</div><div class='hunk'>@@ -55,8 +55,8 @@ store_intc_userimask(struct sysdev_class *cls,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SYSDEV_CLASS_ATTR(userimask, S_IRUSR | S_IWUSR,</div><div class='del'>-			 show_intc_userimask, store_intc_userimask);</div><div class='add'>+static DEVICE_ATTR(userimask, S_IRUSR | S_IWUSR,</div><div class='add'>+		   show_intc_userimask, store_intc_userimask);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int __init userimask_sysdev_init(void)</div><div class='hunk'>@@ -64,7 +64,7 @@ static int __init userimask_sysdev_init(void)</div><div class='ctx'> 	if (unlikely(!uimask))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	return sysdev_class_create_file(&amp;intc_sysdev_class, &amp;attr_userimask);</div><div class='add'>+	return device_create_file(intc_subsys.dev_root, &amp;dev_attr_userimask);</div><div class='ctx'> }</div><div class='ctx'> late_initcall(userimask_sysdev_init);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/sh/pfc.c b/drivers/sh/pfc.c<br/>index e67fe170d8d5..522c6c46d1be 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sh/pfc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/sh/pfc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sh/pfc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/sh/pfc.c</a></div><div class='hunk'>@@ -19,6 +19,75 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+</div><div class='add'>+static void pfc_iounmap(struct pinmux_info *pip)</div><div class='add'>+{</div><div class='add'>+	int k;</div><div class='add'>+</div><div class='add'>+	for (k = 0; k &lt; pip-&gt;num_resources; k++)</div><div class='add'>+		if (pip-&gt;window[k].virt)</div><div class='add'>+			iounmap(pip-&gt;window[k].virt);</div><div class='add'>+</div><div class='add'>+	kfree(pip-&gt;window);</div><div class='add'>+	pip-&gt;window = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pfc_ioremap(struct pinmux_info *pip)</div><div class='add'>+{</div><div class='add'>+	struct resource *res;</div><div class='add'>+	int k;</div><div class='add'>+</div><div class='add'>+	if (!pip-&gt;num_resources)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	pip-&gt;window = kzalloc(pip-&gt;num_resources * sizeof(*pip-&gt;window),</div><div class='add'>+			      GFP_NOWAIT);</div><div class='add'>+	if (!pip-&gt;window)</div><div class='add'>+		goto err1;</div><div class='add'>+</div><div class='add'>+	for (k = 0; k &lt; pip-&gt;num_resources; k++) {</div><div class='add'>+		res = pip-&gt;resource + k;</div><div class='add'>+		WARN_ON(resource_type(res) != IORESOURCE_MEM);</div><div class='add'>+		pip-&gt;window[k].phys = res-&gt;start;</div><div class='add'>+		pip-&gt;window[k].size = resource_size(res);</div><div class='add'>+		pip-&gt;window[k].virt = ioremap_nocache(res-&gt;start,</div><div class='add'>+							 resource_size(res));</div><div class='add'>+		if (!pip-&gt;window[k].virt)</div><div class='add'>+			goto err2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err2:</div><div class='add'>+	pfc_iounmap(pip);</div><div class='add'>+err1:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __iomem *pfc_phys_to_virt(struct pinmux_info *pip,</div><div class='add'>+				      unsigned long address)</div><div class='add'>+{</div><div class='add'>+	struct pfc_window *window;</div><div class='add'>+	int k;</div><div class='add'>+</div><div class='add'>+	/* scan through physical windows and convert address */</div><div class='add'>+	for (k = 0; k &lt; pip-&gt;num_resources; k++) {</div><div class='add'>+		window = pip-&gt;window + k;</div><div class='add'>+</div><div class='add'>+		if (address &lt; window-&gt;phys)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (address &gt;= (window-&gt;phys + window-&gt;size))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		return window-&gt;virt + (address - window-&gt;phys);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* no windows defined, register must be 1:1 mapped virt:phys */</div><div class='add'>+	return (void __iomem *)address;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int enum_in_range(pinmux_enum_t enum_id, struct pinmux_range *r)</div><div class='ctx'> {</div><div class='hunk'>@@ -31,41 +100,54 @@ static int enum_in_range(pinmux_enum_t enum_id, struct pinmux_range *r)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned long gpio_read_raw_reg(unsigned long reg,</div><div class='add'>+static unsigned long gpio_read_raw_reg(void __iomem *mapped_reg,</div><div class='ctx'> 				       unsigned long reg_width)</div><div class='ctx'> {</div><div class='ctx'> 	switch (reg_width) {</div><div class='ctx'> 	case 8:</div><div class='del'>-		return __raw_readb(reg);</div><div class='add'>+		return ioread8(mapped_reg);</div><div class='ctx'> 	case 16:</div><div class='del'>-		return __raw_readw(reg);</div><div class='add'>+		return ioread16(mapped_reg);</div><div class='ctx'> 	case 32:</div><div class='del'>-		return __raw_readl(reg);</div><div class='add'>+		return ioread32(mapped_reg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BUG();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void gpio_write_raw_reg(unsigned long reg,</div><div class='add'>+static void gpio_write_raw_reg(void __iomem *mapped_reg,</div><div class='ctx'> 			       unsigned long reg_width,</div><div class='ctx'> 			       unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	switch (reg_width) {</div><div class='ctx'> 	case 8:</div><div class='del'>-		__raw_writeb(data, reg);</div><div class='add'>+		iowrite8(data, mapped_reg);</div><div class='ctx'> 		return;</div><div class='ctx'> 	case 16:</div><div class='del'>-		__raw_writew(data, reg);</div><div class='add'>+		iowrite16(data, mapped_reg);</div><div class='ctx'> 		return;</div><div class='ctx'> 	case 32:</div><div class='del'>-		__raw_writel(data, reg);</div><div class='add'>+		iowrite32(data, mapped_reg);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BUG();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int gpio_read_bit(struct pinmux_data_reg *dr,</div><div class='add'>+			 unsigned long in_pos)</div><div class='add'>+{</div><div class='add'>+	unsigned long pos;</div><div class='add'>+</div><div class='add'>+	pos = dr-&gt;reg_width - (in_pos + 1);</div><div class='add'>+</div><div class='add'>+	pr_debug("read_bit: addr = %lx, pos = %ld, "</div><div class='add'>+		 "r_width = %ld\n", dr-&gt;reg, pos, dr-&gt;reg_width);</div><div class='add'>+</div><div class='add'>+	return (gpio_read_raw_reg(dr-&gt;mapped_reg, dr-&gt;reg_width) &gt;&gt; pos) &amp; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void gpio_write_bit(struct pinmux_data_reg *dr,</div><div class='ctx'> 			   unsigned long in_pos, unsigned long value)</div><div class='ctx'> {</div><div class='hunk'>@@ -82,53 +164,72 @@ static void gpio_write_bit(struct pinmux_data_reg *dr,</div><div class='ctx'> 	else</div><div class='ctx'> 		clear_bit(pos, &amp;dr-&gt;reg_shadow);</div><div class='ctx'> </div><div class='del'>-	gpio_write_raw_reg(dr-&gt;reg, dr-&gt;reg_width, dr-&gt;reg_shadow);</div><div class='add'>+	gpio_write_raw_reg(dr-&gt;mapped_reg, dr-&gt;reg_width, dr-&gt;reg_shadow);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int gpio_read_reg(unsigned long reg, unsigned long reg_width,</div><div class='del'>-			 unsigned long field_width, unsigned long in_pos)</div><div class='add'>+static void config_reg_helper(struct pinmux_info *gpioc,</div><div class='add'>+			      struct pinmux_cfg_reg *crp,</div><div class='add'>+			      unsigned long in_pos,</div><div class='add'>+			      void __iomem **mapped_regp,</div><div class='add'>+			      unsigned long *maskp,</div><div class='add'>+			      unsigned long *posp)</div><div class='ctx'> {</div><div class='del'>-	unsigned long data, mask, pos;</div><div class='add'>+	int k;</div><div class='add'>+</div><div class='add'>+	*mapped_regp = pfc_phys_to_virt(gpioc, crp-&gt;reg);</div><div class='ctx'> </div><div class='del'>-	data = 0;</div><div class='del'>-	mask = (1 &lt;&lt; field_width) - 1;</div><div class='del'>-	pos = reg_width - ((in_pos + 1) * field_width);</div><div class='add'>+	if (crp-&gt;field_width) {</div><div class='add'>+		*maskp = (1 &lt;&lt; crp-&gt;field_width) - 1;</div><div class='add'>+		*posp = crp-&gt;reg_width - ((in_pos + 1) * crp-&gt;field_width);</div><div class='add'>+	} else {</div><div class='add'>+		*maskp = (1 &lt;&lt; crp-&gt;var_field_width[in_pos]) - 1;</div><div class='add'>+		*posp = crp-&gt;reg_width;</div><div class='add'>+		for (k = 0; k &lt;= in_pos; k++)</div><div class='add'>+			*posp -= crp-&gt;var_field_width[k];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	pr_debug("read_reg: addr = %lx, pos = %ld, "</div><div class='add'>+static int read_config_reg(struct pinmux_info *gpioc,</div><div class='add'>+			   struct pinmux_cfg_reg *crp,</div><div class='add'>+			   unsigned long field)</div><div class='add'>+{</div><div class='add'>+	void __iomem *mapped_reg;</div><div class='add'>+	unsigned long mask, pos;</div><div class='add'>+</div><div class='add'>+	config_reg_helper(gpioc, crp, field, &amp;mapped_reg, &amp;mask, &amp;pos);</div><div class='add'>+</div><div class='add'>+	pr_debug("read_reg: addr = %lx, field = %ld, "</div><div class='ctx'> 		 "r_width = %ld, f_width = %ld\n",</div><div class='del'>-		 reg, pos, reg_width, field_width);</div><div class='add'>+		 crp-&gt;reg, field, crp-&gt;reg_width, crp-&gt;field_width);</div><div class='ctx'> </div><div class='del'>-	data = gpio_read_raw_reg(reg, reg_width);</div><div class='del'>-	return (data &gt;&gt; pos) &amp; mask;</div><div class='add'>+	return (gpio_read_raw_reg(mapped_reg, crp-&gt;reg_width) &gt;&gt; pos) &amp; mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void gpio_write_reg(unsigned long reg, unsigned long reg_width,</div><div class='del'>-			   unsigned long field_width, unsigned long in_pos,</div><div class='del'>-			   unsigned long value)</div><div class='add'>+static void write_config_reg(struct pinmux_info *gpioc,</div><div class='add'>+			     struct pinmux_cfg_reg *crp,</div><div class='add'>+			     unsigned long field, unsigned long value)</div><div class='ctx'> {</div><div class='del'>-	unsigned long mask, pos;</div><div class='add'>+	void __iomem *mapped_reg;</div><div class='add'>+	unsigned long mask, pos, data;</div><div class='ctx'> </div><div class='del'>-	mask = (1 &lt;&lt; field_width) - 1;</div><div class='del'>-	pos = reg_width - ((in_pos + 1) * field_width);</div><div class='add'>+	config_reg_helper(gpioc, crp, field, &amp;mapped_reg, &amp;mask, &amp;pos);</div><div class='ctx'> </div><div class='del'>-	pr_debug("write_reg addr = %lx, value = %ld, pos = %ld, "</div><div class='add'>+	pr_debug("write_reg addr = %lx, value = %ld, field = %ld, "</div><div class='ctx'> 		 "r_width = %ld, f_width = %ld\n",</div><div class='del'>-		 reg, value, pos, reg_width, field_width);</div><div class='add'>+		 crp-&gt;reg, value, field, crp-&gt;reg_width, crp-&gt;field_width);</div><div class='ctx'> </div><div class='ctx'> 	mask = ~(mask &lt;&lt; pos);</div><div class='ctx'> 	value = value &lt;&lt; pos;</div><div class='ctx'> </div><div class='del'>-	switch (reg_width) {</div><div class='del'>-	case 8:</div><div class='del'>-		__raw_writeb((__raw_readb(reg) &amp; mask) | value, reg);</div><div class='del'>-		break;</div><div class='del'>-	case 16:</div><div class='del'>-		__raw_writew((__raw_readw(reg) &amp; mask) | value, reg);</div><div class='del'>-		break;</div><div class='del'>-	case 32:</div><div class='del'>-		__raw_writel((__raw_readl(reg) &amp; mask) | value, reg);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	data = gpio_read_raw_reg(mapped_reg, crp-&gt;reg_width);</div><div class='add'>+	data &amp;= mask;</div><div class='add'>+	data |= value;</div><div class='add'>+</div><div class='add'>+	if (gpioc-&gt;unlock_reg)</div><div class='add'>+		gpio_write_raw_reg(pfc_phys_to_virt(gpioc, gpioc-&gt;unlock_reg),</div><div class='add'>+				   32, ~data);</div><div class='add'>+</div><div class='add'>+	gpio_write_raw_reg(mapped_reg, crp-&gt;reg_width, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int setup_data_reg(struct pinmux_info *gpioc, unsigned gpio)</div><div class='hunk'>@@ -147,6 +248,8 @@ static int setup_data_reg(struct pinmux_info *gpioc, unsigned gpio)</div><div class='ctx'> 		if (!data_reg-&gt;reg_width)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		data_reg-&gt;mapped_reg = pfc_phys_to_virt(gpioc, data_reg-&gt;reg);</div><div class='add'>+</div><div class='ctx'> 		for (n = 0; n &lt; data_reg-&gt;reg_width; n++) {</div><div class='ctx'> 			if (data_reg-&gt;enum_ids[n] == gpiop-&gt;enum_id) {</div><div class='ctx'> 				gpiop-&gt;flags &amp;= ~PINMUX_FLAG_DREG;</div><div class='hunk'>@@ -179,7 +282,8 @@ static void setup_data_regs(struct pinmux_info *gpioc)</div><div class='ctx'> 		if (!drp-&gt;reg_width)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		drp-&gt;reg_shadow = gpio_read_raw_reg(drp-&gt;reg, drp-&gt;reg_width);</div><div class='add'>+		drp-&gt;reg_shadow = gpio_read_raw_reg(drp-&gt;mapped_reg,</div><div class='add'>+						    drp-&gt;reg_width);</div><div class='ctx'> 		k++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -201,12 +305,13 @@ static int get_data_reg(struct pinmux_info *gpioc, unsigned gpio,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_config_reg(struct pinmux_info *gpioc, pinmux_enum_t enum_id,</div><div class='del'>-			  struct pinmux_cfg_reg **crp, int *indexp,</div><div class='add'>+			  struct pinmux_cfg_reg **crp,</div><div class='add'>+			  int *fieldp, int *valuep,</div><div class='ctx'> 			  unsigned long **cntp)</div><div class='ctx'> {</div><div class='ctx'> 	struct pinmux_cfg_reg *config_reg;</div><div class='del'>-	unsigned long r_width, f_width;</div><div class='del'>-	int k, n;</div><div class='add'>+	unsigned long r_width, f_width, curr_width, ncomb;</div><div class='add'>+	int k, m, n, pos, bit_pos;</div><div class='ctx'> </div><div class='ctx'> 	k = 0;</div><div class='ctx'> 	while (1) {</div><div class='hunk'>@@ -217,13 +322,27 @@ static int get_config_reg(struct pinmux_info *gpioc, pinmux_enum_t enum_id,</div><div class='ctx'> </div><div class='ctx'> 		if (!r_width)</div><div class='ctx'> 			break;</div><div class='del'>-		for (n = 0; n &lt; (r_width / f_width) * (1 &lt;&lt; f_width); n++) {</div><div class='del'>-			if (config_reg-&gt;enum_ids[n] == enum_id) {</div><div class='del'>-				*crp = config_reg;</div><div class='del'>-				*indexp = n;</div><div class='del'>-				*cntp = &amp;config_reg-&gt;cnt[n / (1 &lt;&lt; f_width)];</div><div class='del'>-				return 0;</div><div class='add'>+</div><div class='add'>+		pos = 0;</div><div class='add'>+		m = 0;</div><div class='add'>+		for (bit_pos = 0; bit_pos &lt; r_width; bit_pos += curr_width) {</div><div class='add'>+			if (f_width)</div><div class='add'>+				curr_width = f_width;</div><div class='add'>+			else</div><div class='add'>+				curr_width = config_reg-&gt;var_field_width[m];</div><div class='add'>+</div><div class='add'>+			ncomb = 1 &lt;&lt; curr_width;</div><div class='add'>+			for (n = 0; n &lt; ncomb; n++) {</div><div class='add'>+				if (config_reg-&gt;enum_ids[pos + n] == enum_id) {</div><div class='add'>+					*crp = config_reg;</div><div class='add'>+					*fieldp = m;</div><div class='add'>+					*valuep = n;</div><div class='add'>+					*cntp = &amp;config_reg-&gt;cnt[m];</div><div class='add'>+					return 0;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='add'>+			pos += ncomb;</div><div class='add'>+			m++;</div><div class='ctx'> 		}</div><div class='ctx'> 		k++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -261,36 +380,6 @@ static int get_gpio_enum_id(struct pinmux_info *gpioc, unsigned gpio,</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void write_config_reg(struct pinmux_info *gpioc,</div><div class='del'>-			     struct pinmux_cfg_reg *crp,</div><div class='del'>-			     int index)</div><div class='del'>-{</div><div class='del'>-	unsigned long ncomb, pos, value;</div><div class='del'>-</div><div class='del'>-	ncomb = 1 &lt;&lt; crp-&gt;field_width;</div><div class='del'>-	pos = index / ncomb;</div><div class='del'>-	value = index % ncomb;</div><div class='del'>-</div><div class='del'>-	gpio_write_reg(crp-&gt;reg, crp-&gt;reg_width, crp-&gt;field_width, pos, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_config_reg(struct pinmux_info *gpioc,</div><div class='del'>-			    struct pinmux_cfg_reg *crp,</div><div class='del'>-			    int index)</div><div class='del'>-{</div><div class='del'>-	unsigned long ncomb, pos, value;</div><div class='del'>-</div><div class='del'>-	ncomb = 1 &lt;&lt; crp-&gt;field_width;</div><div class='del'>-	pos = index / ncomb;</div><div class='del'>-	value = index % ncomb;</div><div class='del'>-</div><div class='del'>-	if (gpio_read_reg(crp-&gt;reg, crp-&gt;reg_width,</div><div class='del'>-			  crp-&gt;field_width, pos) == value)</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='ctx'> enum { GPIO_CFG_DRYRUN, GPIO_CFG_REQ, GPIO_CFG_FREE };</div><div class='ctx'> </div><div class='ctx'> static int pinmux_config_gpio(struct pinmux_info *gpioc, unsigned gpio,</div><div class='hunk'>@@ -299,7 +388,7 @@ static int pinmux_config_gpio(struct pinmux_info *gpioc, unsigned gpio,</div><div class='ctx'> 	struct pinmux_cfg_reg *cr = NULL;</div><div class='ctx'> 	pinmux_enum_t enum_id;</div><div class='ctx'> 	struct pinmux_range *range;</div><div class='del'>-	int in_range, pos, index;</div><div class='add'>+	int in_range, pos, field, value;</div><div class='ctx'> 	unsigned long *cntp;</div><div class='ctx'> </div><div class='ctx'> 	switch (pinmux_type) {</div><div class='hunk'>@@ -330,7 +419,8 @@ static int pinmux_config_gpio(struct pinmux_info *gpioc, unsigned gpio,</div><div class='ctx'> </div><div class='ctx'> 	pos = 0;</div><div class='ctx'> 	enum_id = 0;</div><div class='del'>-	index = 0;</div><div class='add'>+	field = 0;</div><div class='add'>+	value = 0;</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		pos = get_gpio_enum_id(gpioc, gpio, pos, &amp;enum_id);</div><div class='ctx'> 		if (pos &lt;= 0)</div><div class='hunk'>@@ -377,17 +467,19 @@ static int pinmux_config_gpio(struct pinmux_info *gpioc, unsigned gpio,</div><div class='ctx'> 		if (!in_range)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (get_config_reg(gpioc, enum_id, &amp;cr, &amp;index, &amp;cntp) != 0)</div><div class='add'>+		if (get_config_reg(gpioc, enum_id, &amp;cr,</div><div class='add'>+				   &amp;field, &amp;value, &amp;cntp) != 0)</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> </div><div class='ctx'> 		switch (cfg_mode) {</div><div class='ctx'> 		case GPIO_CFG_DRYRUN:</div><div class='del'>-			if (!*cntp || !check_config_reg(gpioc, cr, index))</div><div class='add'>+			if (!*cntp ||</div><div class='add'>+			    (read_config_reg(gpioc, cr, field) != value))</div><div class='ctx'> 				continue;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case GPIO_CFG_REQ:</div><div class='del'>-			write_config_reg(gpioc, cr, index);</div><div class='add'>+			write_config_reg(gpioc, cr, field, value);</div><div class='ctx'> 			*cntp = *cntp + 1;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -564,7 +656,7 @@ static int sh_gpio_get_value(struct pinmux_info *gpioc, unsigned gpio)</div><div class='ctx'> 	if (!gpioc || get_data_reg(gpioc, gpio, &amp;dr, &amp;bit) != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return gpio_read_reg(dr-&gt;reg, dr-&gt;reg_width, 1, bit);</div><div class='add'>+	return gpio_read_bit(dr, bit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sh_gpio_get(struct gpio_chip *chip, unsigned offset)</div><div class='hunk'>@@ -606,10 +698,15 @@ static int sh_gpio_to_irq(struct gpio_chip *chip, unsigned offset)</div><div class='ctx'> int register_pinmux(struct pinmux_info *pip)</div><div class='ctx'> {</div><div class='ctx'> 	struct gpio_chip *chip = &amp;pip-&gt;chip;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("%s handling gpio %d -&gt; %d\n",</div><div class='ctx'> 		pip-&gt;name, pip-&gt;first_gpio, pip-&gt;last_gpio);</div><div class='ctx'> </div><div class='add'>+	ret = pfc_ioremap(pip);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	setup_data_regs(pip);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;request = sh_gpio_request;</div><div class='hunk'>@@ -627,12 +724,16 @@ int register_pinmux(struct pinmux_info *pip)</div><div class='ctx'> 	chip-&gt;base = pip-&gt;first_gpio;</div><div class='ctx'> 	chip-&gt;ngpio = (pip-&gt;last_gpio - pip-&gt;first_gpio) + 1;</div><div class='ctx'> </div><div class='del'>-	return gpiochip_add(chip);</div><div class='add'>+	ret = gpiochip_add(chip);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		pfc_iounmap(pip);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int unregister_pinmux(struct pinmux_info *pip)</div><div class='ctx'> {</div><div class='ctx'> 	pr_info("%s deregistering\n", pip-&gt;name);</div><div class='del'>-</div><div class='add'>+	pfc_iounmap(pip);</div><div class='ctx'> 	return gpiochip_remove(&amp;pip-&gt;chip);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig<br/>index 8ba4510a9519..3f9a47ec67dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/spi/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/spi/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/spi/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/spi/Kconfig</a></div><div class='hunk'>@@ -87,12 +87,12 @@ config SPI_BFIN_SPORT</div><div class='ctx'> 	  Enable support for a SPI bus via the Blackfin SPORT peripheral.</div><div class='ctx'> </div><div class='ctx'> config SPI_AU1550</div><div class='del'>-	tristate "Au1550/Au12x0 SPI Controller"</div><div class='add'>+	tristate "Au1550/Au1200/Au1300 SPI Controller"</div><div class='ctx'> 	depends on MIPS_ALCHEMY &amp;&amp; EXPERIMENTAL</div><div class='ctx'> 	select SPI_BITBANG</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes to this option, support will be included for the</div><div class='del'>-	  Au1550 SPI controller (may also work with Au1200,Au1210,Au1250).</div><div class='add'>+	  PSC SPI controller found on Au1550, Au1200 and Au1300 series.</div><div class='ctx'> </div><div class='ctx'> config SPI_BITBANG</div><div class='ctx'> 	tristate "Utilities for Bitbanging SPI masters"</div><div class='hunk'>@@ -174,8 +174,7 @@ config SPI_LM70_LLP</div><div class='ctx'> </div><div class='ctx'> config SPI_MPC52xx</div><div class='ctx'> 	tristate "Freescale MPC52xx SPI (non-PSC) controller support"</div><div class='del'>-	depends on PPC_MPC52xx &amp;&amp; SPI</div><div class='del'>-	select SPI_MASTER_OF</div><div class='add'>+	depends on PPC_MPC52xx</div><div class='ctx'> 	help</div><div class='ctx'> 	  This drivers supports the MPC52xx SPI controller in master SPI</div><div class='ctx'> 	  mode.</div><div class='hunk'>@@ -333,8 +332,7 @@ config SPI_STMP3XXX</div><div class='ctx'> </div><div class='ctx'> config SPI_TEGRA</div><div class='ctx'> 	tristate "Nvidia Tegra SPI controller"</div><div class='del'>-	depends on ARCH_TEGRA</div><div class='del'>-	select TEGRA_SYSTEM_DMA</div><div class='add'>+	depends on ARCH_TEGRA &amp;&amp; TEGRA_SYSTEM_DMA</div><div class='ctx'> 	help</div><div class='ctx'> 	  SPI driver for NVidia Tegra SoCs</div><div class='ctx'> </div><div class='hunk'>@@ -346,14 +344,14 @@ config SPI_TI_SSP</div><div class='ctx'> 	  serial port.</div><div class='ctx'> </div><div class='ctx'> config SPI_TOPCLIFF_PCH</div><div class='del'>-	tristate "Intel EG20T PCH/OKI SEMICONDUCTOR ML7213 IOH SPI controller"</div><div class='add'>+	tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) SPI"</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	help</div><div class='ctx'> 	  SPI driver for the Topcliff PCH (Platform Controller Hub) SPI bus</div><div class='ctx'> 	  used in some x86 embedded processors.</div><div class='ctx'> </div><div class='del'>-	  This driver also supports the ML7213, a companion chip for the</div><div class='del'>-	  Atom E6xx series and compatible with the Intel EG20T PCH.</div><div class='add'>+	  This driver also supports the ML7213/ML7223/ML7831, a companion chip</div><div class='add'>+	  for the Atom E6xx series and compatible with the Intel EG20T PCH.</div><div class='ctx'> </div><div class='ctx'> config SPI_TXX9</div><div class='ctx'> 	tristate "Toshiba TXx9 SPI controller"</div><div class='head'>diff --git a/drivers/spi/spi-dw-mid.c b/drivers/spi/spi-dw-mid.c<br/>index e743a45ee92c..8418eb036651 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/spi/spi-dw-mid.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/spi/spi-dw-mid.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/spi/spi-dw-mid.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/spi/spi-dw-mid.c</a></div><div class='hunk'>@@ -131,7 +131,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)</div><div class='ctx'> 	rxchan = dws-&gt;rxchan;</div><div class='ctx'> </div><div class='ctx'> 	/* 2. Prepare the TX dma transfer */</div><div class='del'>-	txconf.direction = DMA_TO_DEVICE;</div><div class='add'>+	txconf.direction = DMA_MEM_TO_DEV;</div><div class='ctx'> 	txconf.dst_addr = dws-&gt;dma_addr;</div><div class='ctx'> 	txconf.dst_maxburst = LNW_DMA_MSIZE_16;</div><div class='ctx'> 	txconf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;</div><div class='hunk'>@@ -147,13 +147,13 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)</div><div class='ctx'> 	txdesc = txchan-&gt;device-&gt;device_prep_slave_sg(txchan,</div><div class='ctx'> 				&amp;dws-&gt;tx_sgl,</div><div class='ctx'> 				1,</div><div class='del'>-				DMA_TO_DEVICE,</div><div class='add'>+				DMA_MEM_TO_DEV,</div><div class='ctx'> 				DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_DEST_UNMAP);</div><div class='ctx'> 	txdesc-&gt;callback = dw_spi_dma_done;</div><div class='ctx'> 	txdesc-&gt;callback_param = dws;</div><div class='ctx'> </div><div class='ctx'> 	/* 3. Prepare the RX dma transfer */</div><div class='del'>-	rxconf.direction = DMA_FROM_DEVICE;</div><div class='add'>+	rxconf.direction = DMA_DEV_TO_MEM;</div><div class='ctx'> 	rxconf.src_addr = dws-&gt;dma_addr;</div><div class='ctx'> 	rxconf.src_maxburst = LNW_DMA_MSIZE_16;</div><div class='ctx'> 	rxconf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;</div><div class='hunk'>@@ -169,7 +169,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)</div><div class='ctx'> 	rxdesc = rxchan-&gt;device-&gt;device_prep_slave_sg(rxchan,</div><div class='ctx'> 				&amp;dws-&gt;rx_sgl,</div><div class='ctx'> 				1,</div><div class='del'>-				DMA_FROM_DEVICE,</div><div class='add'>+				DMA_DEV_TO_MEM,</div><div class='ctx'> 				DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_DEST_UNMAP);</div><div class='ctx'> 	rxdesc-&gt;callback = dw_spi_dma_done;</div><div class='ctx'> 	rxdesc-&gt;callback_param = dws;</div><div class='head'>diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c<br/>index 0a282e5fcc9c..d46e55c720b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/spi/spi-ep93xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/spi/spi-ep93xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/spi/spi-ep93xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/spi/spi-ep93xx.c</a></div><div class='hunk'>@@ -551,6 +551,7 @@ ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir)</div><div class='ctx'> 	struct dma_async_tx_descriptor *txd;</div><div class='ctx'> 	enum dma_slave_buswidth buswidth;</div><div class='ctx'> 	struct dma_slave_config conf;</div><div class='add'>+	enum dma_transfer_direction slave_dirn;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	struct sg_table *sgt;</div><div class='ctx'> 	struct dma_chan *chan;</div><div class='hunk'>@@ -573,6 +574,7 @@ ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir)</div><div class='ctx'> </div><div class='ctx'> 		conf.src_addr = espi-&gt;sspdr_phys;</div><div class='ctx'> 		conf.src_addr_width = buswidth;</div><div class='add'>+		slave_dirn = DMA_DEV_TO_MEM;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		chan = espi-&gt;dma_tx;</div><div class='ctx'> 		buf = t-&gt;tx_buf;</div><div class='hunk'>@@ -580,6 +582,7 @@ ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir)</div><div class='ctx'> </div><div class='ctx'> 		conf.dst_addr = espi-&gt;sspdr_phys;</div><div class='ctx'> 		conf.dst_addr_width = buswidth;</div><div class='add'>+		slave_dirn = DMA_MEM_TO_DEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = dmaengine_slave_config(chan, &amp;conf);</div><div class='hunk'>@@ -631,7 +634,7 @@ ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	txd = chan-&gt;device-&gt;device_prep_slave_sg(chan, sgt-&gt;sgl, nents,</div><div class='del'>-						 dir, DMA_CTRL_ACK);</div><div class='add'>+						 slave_dirn, DMA_CTRL_ACK);</div><div class='ctx'> 	if (!txd) {</div><div class='ctx'> 		dma_unmap_sg(chan-&gt;device-&gt;dev, sgt-&gt;sgl, sgt-&gt;nents, dir);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='hunk'>@@ -979,7 +982,7 @@ static int ep93xx_spi_setup_dma(struct ep93xx_spi *espi)</div><div class='ctx'> 	dma_cap_set(DMA_SLAVE, mask);</div><div class='ctx'> </div><div class='ctx'> 	espi-&gt;dma_rx_data.port = EP93XX_DMA_SSP;</div><div class='del'>-	espi-&gt;dma_rx_data.direction = DMA_FROM_DEVICE;</div><div class='add'>+	espi-&gt;dma_rx_data.direction = DMA_DEV_TO_MEM;</div><div class='ctx'> 	espi-&gt;dma_rx_data.name = "ep93xx-spi-rx";</div><div class='ctx'> </div><div class='ctx'> 	espi-&gt;dma_rx = dma_request_channel(mask, ep93xx_spi_dma_filter,</div><div class='hunk'>@@ -990,7 +993,7 @@ static int ep93xx_spi_setup_dma(struct ep93xx_spi *espi)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	espi-&gt;dma_tx_data.port = EP93XX_DMA_SSP;</div><div class='del'>-	espi-&gt;dma_tx_data.direction = DMA_TO_DEVICE;</div><div class='add'>+	espi-&gt;dma_tx_data.direction = DMA_MEM_TO_DEV;</div><div class='ctx'> 	espi-&gt;dma_tx_data.name = "ep93xx-spi-tx";</div><div class='ctx'> </div><div class='ctx'> 	espi-&gt;dma_tx = dma_request_channel(mask, ep93xx_spi_dma_filter,</div><div class='head'>diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c<br/>index 322be7aea8b4..0b0dfb71c640 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/spi/spi-omap2-mcspi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/spi/spi-omap2-mcspi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/spi/spi-omap2-mcspi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/spi/spi-omap2-mcspi.c</a></div><div class='hunk'>@@ -121,6 +121,7 @@ struct omap2_mcspi {</div><div class='ctx'> 	/* SPI1 has 4 channels, while SPI2 has 2 */</div><div class='ctx'> 	struct omap2_mcspi_dma	*dma_channels;</div><div class='ctx'> 	struct  device		*dev;</div><div class='add'>+	struct workqueue_struct *wq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct omap2_mcspi_cs {</div><div class='hunk'>@@ -143,8 +144,6 @@ struct omap2_mcspi_regs {</div><div class='ctx'> </div><div class='ctx'> static struct omap2_mcspi_regs omap2_mcspi_ctx[OMAP2_MCSPI_MAX_CTRL];</div><div class='ctx'> </div><div class='del'>-static struct workqueue_struct *omap2_mcspi_wq;</div><div class='del'>-</div><div class='ctx'> #define MOD_REG_BIT(val, mask, set) do { \</div><div class='ctx'> 	if (set) \</div><div class='ctx'> 		val |= mask; \</div><div class='hunk'>@@ -1043,7 +1042,7 @@ static int omap2_mcspi_transfer(struct spi_device *spi, struct spi_message *m)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;mcspi-&gt;lock, flags);</div><div class='ctx'> 	list_add_tail(&amp;m-&gt;queue, &amp;mcspi-&gt;msg_queue);</div><div class='del'>-	queue_work(omap2_mcspi_wq, &amp;mcspi-&gt;work);</div><div class='add'>+	queue_work(mcspi-&gt;wq, &amp;mcspi-&gt;work);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;mcspi-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1088,6 +1087,7 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct omap2_mcspi	*mcspi;</div><div class='ctx'> 	struct resource		*r;</div><div class='ctx'> 	int			status = 0, i;</div><div class='add'>+	char			wq_name[20];</div><div class='ctx'> </div><div class='ctx'> 	master = spi_alloc_master(&amp;pdev-&gt;dev, sizeof *mcspi);</div><div class='ctx'> 	if (master == NULL) {</div><div class='hunk'>@@ -1111,10 +1111,17 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)</div><div class='ctx'> 	mcspi = spi_master_get_devdata(master);</div><div class='ctx'> 	mcspi-&gt;master = master;</div><div class='ctx'> </div><div class='add'>+	sprintf(wq_name, "omap2_mcspi/%d", master-&gt;bus_num);</div><div class='add'>+	mcspi-&gt;wq = alloc_workqueue(wq_name, WQ_MEM_RECLAIM, 1);</div><div class='add'>+	if (mcspi-&gt;wq == NULL) {</div><div class='add'>+		status = -ENOMEM;</div><div class='add'>+		goto 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'> 	if (r == NULL) {</div><div class='ctx'> 		status = -ENODEV;</div><div class='del'>-		goto err1;</div><div class='add'>+		goto free_master;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	r-&gt;start += pdata-&gt;regs_offset;</div><div class='hunk'>@@ -1123,14 +1130,14 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (!request_mem_region(r-&gt;start, resource_size(r),</div><div class='ctx'> 				dev_name(&amp;pdev-&gt;dev))) {</div><div class='ctx'> 		status = -EBUSY;</div><div class='del'>-		goto err1;</div><div class='add'>+		goto free_master;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mcspi-&gt;base = ioremap(r-&gt;start, resource_size(r));</div><div class='ctx'> 	if (!mcspi-&gt;base) {</div><div class='ctx'> 		dev_dbg(&amp;pdev-&gt;dev, "can't ioremap MCSPI\n");</div><div class='ctx'> 		status = -ENOMEM;</div><div class='del'>-		goto err2;</div><div class='add'>+		goto release_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mcspi-&gt;dev = &amp;pdev-&gt;dev;</div><div class='hunk'>@@ -1145,7 +1152,7 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)</div><div class='ctx'> 			GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (mcspi-&gt;dma_channels == NULL)</div><div class='del'>-		goto err2;</div><div class='add'>+		goto unmap_io;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; master-&gt;num_chipselect; i++) {</div><div class='ctx'> 		char dma_ch_name[14];</div><div class='hunk'>@@ -1175,25 +1182,33 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)</div><div class='ctx'> 		mcspi-&gt;dma_channels[i].dma_tx_sync_dev = dma_res-&gt;start;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		goto dma_chnl_free;</div><div class='add'>+</div><div class='ctx'> 	pm_runtime_enable(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (status || omap2_mcspi_master_setup(mcspi) &lt; 0)</div><div class='del'>-		goto err3;</div><div class='add'>+		goto disable_pm;</div><div class='ctx'> </div><div class='ctx'> 	status = spi_register_master(master);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='del'>-		goto err4;</div><div class='add'>+		goto err_spi_register;</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> </div><div class='del'>-err4:</div><div class='add'>+err_spi_register:</div><div class='ctx'> 	spi_master_put(master);</div><div class='del'>-err3:</div><div class='add'>+disable_pm:</div><div class='add'>+	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='add'>+dma_chnl_free:</div><div class='ctx'> 	kfree(mcspi-&gt;dma_channels);</div><div class='del'>-err2:</div><div class='del'>-	release_mem_region(r-&gt;start, resource_size(r));</div><div class='add'>+unmap_io:</div><div class='ctx'> 	iounmap(mcspi-&gt;base);</div><div class='del'>-err1:</div><div class='add'>+release_region:</div><div class='add'>+	release_mem_region(r-&gt;start, resource_size(r));</div><div class='add'>+free_master:</div><div class='add'>+	kfree(master);</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1210,6 +1225,7 @@ static int __exit omap2_mcspi_remove(struct platform_device *pdev)</div><div class='ctx'> 	dma_channels = mcspi-&gt;dma_channels;</div><div class='ctx'> </div><div class='ctx'> 	omap2_mcspi_disable_clocks(mcspi);</div><div class='add'>+	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='ctx'> 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	release_mem_region(r-&gt;start, resource_size(r));</div><div class='ctx'> </div><div class='hunk'>@@ -1217,6 +1233,8 @@ static int __exit omap2_mcspi_remove(struct platform_device *pdev)</div><div class='ctx'> 	spi_unregister_master(master);</div><div class='ctx'> 	iounmap(base);</div><div class='ctx'> 	kfree(dma_channels);</div><div class='add'>+	destroy_workqueue(mcspi-&gt;wq);</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1275,10 +1293,6 @@ static struct platform_driver omap2_mcspi_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init omap2_mcspi_init(void)</div><div class='ctx'> {</div><div class='del'>-	omap2_mcspi_wq = create_singlethread_workqueue(</div><div class='del'>-				omap2_mcspi_driver.driver.name);</div><div class='del'>-	if (omap2_mcspi_wq == NULL)</div><div class='del'>-		return -1;</div><div class='ctx'> 	return platform_driver_probe(&amp;omap2_mcspi_driver, omap2_mcspi_probe);</div><div class='ctx'> }</div><div class='ctx'> subsys_initcall(omap2_mcspi_init);</div><div class='hunk'>@@ -1287,7 +1301,6 @@ static void __exit omap2_mcspi_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	platform_driver_unregister(&amp;omap2_mcspi_driver);</div><div class='ctx'> </div><div class='del'>-	destroy_workqueue(omap2_mcspi_wq);</div><div class='ctx'> }</div><div class='ctx'> module_exit(omap2_mcspi_exit);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c<br/>index 5559b2299198..2f9cb43a2398 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/spi/spi-pl022.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/spi/spi-pl022.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/spi/spi-pl022.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/spi/spi-pl022.c</a></div><div class='hunk'>@@ -340,6 +340,10 @@ struct vendor_data {</div><div class='ctx'>  * @cur_msg: Pointer to current spi_message being processed</div><div class='ctx'>  * @cur_transfer: Pointer to current spi_transfer</div><div class='ctx'>  * @cur_chip: pointer to current clients chip(assigned from controller_state)</div><div class='add'>+ * @next_msg_cs_active: the next message in the queue has been examined</div><div class='add'>+ *  and it was found that it uses the same chip select as the previous</div><div class='add'>+ *  message, so we left it active after the previous transfer, and it's</div><div class='add'>+ *  active already.</div><div class='ctx'>  * @tx: current position in TX buffer to be read</div><div class='ctx'>  * @tx_end: end position in TX buffer to be read</div><div class='ctx'>  * @rx: current position in RX buffer to be written</div><div class='hunk'>@@ -373,6 +377,7 @@ struct pl022 {</div><div class='ctx'> 	struct spi_message		*cur_msg;</div><div class='ctx'> 	struct spi_transfer		*cur_transfer;</div><div class='ctx'> 	struct chip_data		*cur_chip;</div><div class='add'>+	bool				next_msg_cs_active;</div><div class='ctx'> 	void				*tx;</div><div class='ctx'> 	void				*tx_end;</div><div class='ctx'> 	void				*rx;</div><div class='hunk'>@@ -445,23 +450,9 @@ static void giveback(struct pl022 *pl022)</div><div class='ctx'> 	struct spi_transfer *last_transfer;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct spi_message *msg;</div><div class='del'>-	void (*curr_cs_control) (u32 command);</div><div class='add'>+	pl022-&gt;next_msg_cs_active = false;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * This local reference to the chip select function</div><div class='del'>-	 * is needed because we set curr_chip to NULL</div><div class='del'>-	 * as a step toward termininating the message.</div><div class='del'>-	 */</div><div class='del'>-	curr_cs_control = pl022-&gt;cur_chip-&gt;cs_control;</div><div class='del'>-	spin_lock_irqsave(&amp;pl022-&gt;queue_lock, flags);</div><div class='del'>-	msg = pl022-&gt;cur_msg;</div><div class='del'>-	pl022-&gt;cur_msg = NULL;</div><div class='del'>-	pl022-&gt;cur_transfer = NULL;</div><div class='del'>-	pl022-&gt;cur_chip = NULL;</div><div class='del'>-	queue_work(pl022-&gt;workqueue, &amp;pl022-&gt;pump_messages);</div><div class='del'>-	spin_unlock_irqrestore(&amp;pl022-&gt;queue_lock, flags);</div><div class='del'>-</div><div class='del'>-	last_transfer = list_entry(msg-&gt;transfers.prev,</div><div class='add'>+	last_transfer = list_entry(pl022-&gt;cur_msg-&gt;transfers.prev,</div><div class='ctx'> 					struct spi_transfer,</div><div class='ctx'> 					transfer_list);</div><div class='ctx'> </div><div class='hunk'>@@ -473,18 +464,13 @@ static void giveback(struct pl022 *pl022)</div><div class='ctx'> 		 */</div><div class='ctx'> 		udelay(last_transfer-&gt;delay_usecs);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Drop chip select UNLESS cs_change is true or we are returning</div><div class='del'>-	 * a message with an error, or next message is for another chip</div><div class='del'>-	 */</div><div class='del'>-	if (!last_transfer-&gt;cs_change)</div><div class='del'>-		curr_cs_control(SSP_CHIP_DESELECT);</div><div class='del'>-	else {</div><div class='add'>+	if (!last_transfer-&gt;cs_change) {</div><div class='ctx'> 		struct spi_message *next_msg;</div><div class='ctx'> </div><div class='del'>-		/* Holding of cs was hinted, but we need to make sure</div><div class='del'>-		 * the next message is for the same chip.  Don't waste</div><div class='del'>-		 * time with the following tests unless this was hinted.</div><div class='add'>+		/*</div><div class='add'>+		 * cs_change was not set. We can keep the chip select</div><div class='add'>+		 * enabled if there is message in the queue and it is</div><div class='add'>+		 * for the same spi device.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * We cannot postpone this until pump_messages, because</div><div class='ctx'> 		 * after calling msg-&gt;complete (below) the driver that</div><div class='hunk'>@@ -501,19 +487,29 @@ static void giveback(struct pl022 *pl022)</div><div class='ctx'> 					struct spi_message, queue);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;pl022-&gt;queue_lock, flags);</div><div class='ctx'> </div><div class='del'>-		/* see if the next and current messages point</div><div class='del'>-		 * to the same chip</div><div class='add'>+		/*</div><div class='add'>+		 * see if the next and current messages point</div><div class='add'>+		 * to the same spi device.</div><div class='ctx'> 		 */</div><div class='del'>-		if (next_msg &amp;&amp; next_msg-&gt;spi != msg-&gt;spi)</div><div class='add'>+		if (next_msg &amp;&amp; next_msg-&gt;spi != pl022-&gt;cur_msg-&gt;spi)</div><div class='ctx'> 			next_msg = NULL;</div><div class='del'>-		if (!next_msg || msg-&gt;state == STATE_ERROR)</div><div class='del'>-			curr_cs_control(SSP_CHIP_DESELECT);</div><div class='add'>+		if (!next_msg || pl022-&gt;cur_msg-&gt;state == STATE_ERROR)</div><div class='add'>+			pl022-&gt;cur_chip-&gt;cs_control(SSP_CHIP_DESELECT);</div><div class='add'>+		else</div><div class='add'>+			pl022-&gt;next_msg_cs_active = true;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pl022-&gt;queue_lock, flags);</div><div class='add'>+	msg = pl022-&gt;cur_msg;</div><div class='add'>+	pl022-&gt;cur_msg = NULL;</div><div class='add'>+	pl022-&gt;cur_transfer = NULL;</div><div class='add'>+	pl022-&gt;cur_chip = NULL;</div><div class='add'>+	queue_work(pl022-&gt;workqueue, &amp;pl022-&gt;pump_messages);</div><div class='add'>+	spin_unlock_irqrestore(&amp;pl022-&gt;queue_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	msg-&gt;state = NULL;</div><div class='ctx'> 	if (msg-&gt;complete)</div><div class='ctx'> 		msg-&gt;complete(msg-&gt;context);</div><div class='del'>-	/* This message is completed, so let's turn off the clocks &amp; power */</div><div class='del'>-	pm_runtime_put(&amp;pl022-&gt;adev-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -904,11 +900,11 @@ static int configure_dma(struct pl022 *pl022)</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_slave_config rx_conf = {</div><div class='ctx'> 		.src_addr = SSP_DR(pl022-&gt;phybase),</div><div class='del'>-		.direction = DMA_FROM_DEVICE,</div><div class='add'>+		.direction = DMA_DEV_TO_MEM,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct dma_slave_config tx_conf = {</div><div class='ctx'> 		.dst_addr = SSP_DR(pl022-&gt;phybase),</div><div class='del'>-		.direction = DMA_TO_DEVICE,</div><div class='add'>+		.direction = DMA_MEM_TO_DEV,</div><div class='ctx'> 	};</div><div class='ctx'> 	unsigned int pages;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1045,7 +1041,7 @@ static int configure_dma(struct pl022 *pl022)</div><div class='ctx'> 	rxdesc = rxchan-&gt;device-&gt;device_prep_slave_sg(rxchan,</div><div class='ctx'> 				      pl022-&gt;sgt_rx.sgl,</div><div class='ctx'> 				      rx_sglen,</div><div class='del'>-				      DMA_FROM_DEVICE,</div><div class='add'>+				      DMA_DEV_TO_MEM,</div><div class='ctx'> 				      DMA_PREP_INTERRUPT | DMA_CTRL_ACK);</div><div class='ctx'> 	if (!rxdesc)</div><div class='ctx'> 		goto err_rxdesc;</div><div class='hunk'>@@ -1053,7 +1049,7 @@ static int configure_dma(struct pl022 *pl022)</div><div class='ctx'> 	txdesc = txchan-&gt;device-&gt;device_prep_slave_sg(txchan,</div><div class='ctx'> 				      pl022-&gt;sgt_tx.sgl,</div><div class='ctx'> 				      tx_sglen,</div><div class='del'>-				      DMA_TO_DEVICE,</div><div class='add'>+				      DMA_MEM_TO_DEV,</div><div class='ctx'> 				      DMA_PREP_INTERRUPT | DMA_CTRL_ACK);</div><div class='ctx'> 	if (!txdesc)</div><div class='ctx'> 		goto err_txdesc;</div><div class='hunk'>@@ -1244,9 +1240,9 @@ static irqreturn_t pl022_interrupt_handler(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	if ((pl022-&gt;tx == pl022-&gt;tx_end) &amp;&amp; (flag == 0)) {</div><div class='ctx'> 		flag = 1;</div><div class='del'>-		/* Disable Transmit interrupt */</div><div class='del'>-		writew(readw(SSP_IMSC(pl022-&gt;virtbase)) &amp;</div><div class='del'>-		       (~SSP_IMSC_MASK_TXIM),</div><div class='add'>+		/* Disable Transmit interrupt, enable receive interrupt */</div><div class='add'>+		writew((readw(SSP_IMSC(pl022-&gt;virtbase)) &amp;</div><div class='add'>+		       ~SSP_IMSC_MASK_TXIM) | SSP_IMSC_MASK_RXIM,</div><div class='ctx'> 		       SSP_IMSC(pl022-&gt;virtbase));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1352,7 +1348,7 @@ static void pump_transfers(unsigned long data)</div><div class='ctx'> 			 */</div><div class='ctx'> 			udelay(previous-&gt;delay_usecs);</div><div class='ctx'> </div><div class='del'>-		/* Drop chip select only if cs_change is requested */</div><div class='add'>+		/* Reselect chip select only if cs_change was requested */</div><div class='ctx'> 		if (previous-&gt;cs_change)</div><div class='ctx'> 			pl022-&gt;cur_chip-&gt;cs_control(SSP_CHIP_SELECT);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1379,15 +1375,22 @@ static void pump_transfers(unsigned long data)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err_config_dma:</div><div class='del'>-	writew(ENABLE_ALL_INTERRUPTS, SSP_IMSC(pl022-&gt;virtbase));</div><div class='add'>+	/* enable all interrupts except RX */</div><div class='add'>+	writew(ENABLE_ALL_INTERRUPTS &amp; ~SSP_IMSC_MASK_RXIM, SSP_IMSC(pl022-&gt;virtbase));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void do_interrupt_dma_transfer(struct pl022 *pl022)</div><div class='ctx'> {</div><div class='del'>-	u32 irqflags = ENABLE_ALL_INTERRUPTS;</div><div class='add'>+	/*</div><div class='add'>+	 * Default is to enable all interrupts except RX -</div><div class='add'>+	 * this will be enabled once TX is complete</div><div class='add'>+	 */</div><div class='add'>+	u32 irqflags = ENABLE_ALL_INTERRUPTS &amp; ~SSP_IMSC_MASK_RXIM;</div><div class='add'>+</div><div class='add'>+	/* Enable target chip, if not already active */</div><div class='add'>+	if (!pl022-&gt;next_msg_cs_active)</div><div class='add'>+		pl022-&gt;cur_chip-&gt;cs_control(SSP_CHIP_SELECT);</div><div class='ctx'> </div><div class='del'>-	/* Enable target chip */</div><div class='del'>-	pl022-&gt;cur_chip-&gt;cs_control(SSP_CHIP_SELECT);</div><div class='ctx'> 	if (set_up_next_transfer(pl022, pl022-&gt;cur_transfer)) {</div><div class='ctx'> 		/* Error path */</div><div class='ctx'> 		pl022-&gt;cur_msg-&gt;state = STATE_ERROR;</div><div class='hunk'>@@ -1442,7 +1445,8 @@ static void do_polling_transfer(struct pl022 *pl022)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* STATE_START */</div><div class='ctx'> 			message-&gt;state = STATE_RUNNING;</div><div class='del'>-			pl022-&gt;cur_chip-&gt;cs_control(SSP_CHIP_SELECT);</div><div class='add'>+			if (!pl022-&gt;next_msg_cs_active)</div><div class='add'>+				pl022-&gt;cur_chip-&gt;cs_control(SSP_CHIP_SELECT);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Configuration Changing Per Transfer */</div><div class='hunk'>@@ -1504,14 +1508,28 @@ static void pump_messages(struct work_struct *work)</div><div class='ctx'> 	struct pl022 *pl022 =</div><div class='ctx'> 		container_of(work, struct pl022, pump_messages);</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	bool was_busy = false;</div><div class='ctx'> </div><div class='ctx'> 	/* Lock queue and check for queue work */</div><div class='ctx'> 	spin_lock_irqsave(&amp;pl022-&gt;queue_lock, flags);</div><div class='ctx'> 	if (list_empty(&amp;pl022-&gt;queue) || !pl022-&gt;running) {</div><div class='add'>+		if (pl022-&gt;busy) {</div><div class='add'>+			/* nothing more to do - disable spi/ssp and power off */</div><div class='add'>+			writew((readw(SSP_CR1(pl022-&gt;virtbase)) &amp;</div><div class='add'>+				(~SSP_CR1_MASK_SSE)), SSP_CR1(pl022-&gt;virtbase));</div><div class='add'>+</div><div class='add'>+			if (pl022-&gt;master_info-&gt;autosuspend_delay &gt; 0) {</div><div class='add'>+				pm_runtime_mark_last_busy(&amp;pl022-&gt;adev-&gt;dev);</div><div class='add'>+				pm_runtime_put_autosuspend(&amp;pl022-&gt;adev-&gt;dev);</div><div class='add'>+			} else {</div><div class='add'>+				pm_runtime_put(&amp;pl022-&gt;adev-&gt;dev);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		pl022-&gt;busy = false;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;pl022-&gt;queue_lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* Make sure we are not already running a message */</div><div class='ctx'> 	if (pl022-&gt;cur_msg) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;pl022-&gt;queue_lock, flags);</div><div class='hunk'>@@ -1522,7 +1540,10 @@ static void pump_messages(struct work_struct *work)</div><div class='ctx'> 	    list_entry(pl022-&gt;queue.next, struct spi_message, queue);</div><div class='ctx'> </div><div class='ctx'> 	list_del_init(&amp;pl022-&gt;cur_msg-&gt;queue);</div><div class='del'>-	pl022-&gt;busy = true;</div><div class='add'>+	if (pl022-&gt;busy)</div><div class='add'>+		was_busy = true;</div><div class='add'>+	else</div><div class='add'>+		pl022-&gt;busy = true;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;pl022-&gt;queue_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Initial message state */</div><div class='hunk'>@@ -1532,12 +1553,14 @@ static void pump_messages(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the SPI using the per chip configuration */</div><div class='ctx'> 	pl022-&gt;cur_chip = spi_get_ctldata(pl022-&gt;cur_msg-&gt;spi);</div><div class='del'>-	/*</div><div class='del'>-	 * We enable the core voltage and clocks here, then the clocks</div><div class='del'>-	 * and core will be disabled when giveback() is called in each method</div><div class='del'>-	 * (poll/interrupt/DMA)</div><div class='del'>-	 */</div><div class='del'>-	pm_runtime_get_sync(&amp;pl022-&gt;adev-&gt;dev);</div><div class='add'>+	if (!was_busy)</div><div class='add'>+		/*</div><div class='add'>+		 * We enable the core voltage and clocks here, then the clocks</div><div class='add'>+		 * and core will be disabled when this workqueue is run again</div><div class='add'>+		 * and there is no more work to be done.</div><div class='add'>+		 */</div><div class='add'>+		pm_runtime_get_sync(&amp;pl022-&gt;adev-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	restore_state(pl022);</div><div class='ctx'> 	flush(pl022);</div><div class='ctx'> </div><div class='hunk'>@@ -1582,6 +1605,7 @@ static int start_queue(struct pl022 *pl022)</div><div class='ctx'> 	pl022-&gt;cur_msg = NULL;</div><div class='ctx'> 	pl022-&gt;cur_transfer = NULL;</div><div class='ctx'> 	pl022-&gt;cur_chip = NULL;</div><div class='add'>+	pl022-&gt;next_msg_cs_active = false;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;pl022-&gt;queue_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	queue_work(pl022-&gt;workqueue, &amp;pl022-&gt;pump_messages);</div><div class='hunk'>@@ -1881,7 +1905,7 @@ static int pl022_setup(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	struct pl022_config_chip const *chip_info;</div><div class='ctx'> 	struct chip_data *chip;</div><div class='del'>-	struct ssp_clock_params clk_freq = {0, };</div><div class='add'>+	struct ssp_clock_params clk_freq = { .cpsdvsr = 0, .scr = 0};</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> 	struct pl022 *pl022 = spi_master_get_devdata(spi-&gt;master);</div><div class='ctx'> 	unsigned int bits = spi-&gt;bits_per_word;</div><div class='hunk'>@@ -2231,7 +2255,17 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id)</div><div class='ctx'> 	dev_dbg(dev, "probe succeeded\n");</div><div class='ctx'> </div><div class='ctx'> 	/* let runtime pm put suspend */</div><div class='del'>-	pm_runtime_put(dev);</div><div class='add'>+	if (platform_info-&gt;autosuspend_delay &gt; 0) {</div><div class='add'>+		dev_info(&amp;adev-&gt;dev,</div><div class='add'>+			"will use autosuspend for runtime pm, delay %dms\n",</div><div class='add'>+			platform_info-&gt;autosuspend_delay);</div><div class='add'>+		pm_runtime_set_autosuspend_delay(dev,</div><div class='add'>+			platform_info-&gt;autosuspend_delay);</div><div class='add'>+		pm_runtime_use_autosuspend(dev);</div><div class='add'>+		pm_runtime_put_autosuspend(dev);</div><div class='add'>+	} else {</div><div class='add'>+		pm_runtime_put(dev);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  err_spi_register:</div><div class='hunk'>@@ -2305,11 +2339,6 @@ static int pl022_suspend(struct device *dev)</div><div class='ctx'> 		return status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	amba_vcore_enable(pl022-&gt;adev);</div><div class='del'>-	amba_pclk_enable(pl022-&gt;adev);</div><div class='del'>-	load_ssp_default_config(pl022);</div><div class='del'>-	amba_pclk_disable(pl022-&gt;adev);</div><div class='del'>-	amba_vcore_disable(pl022-&gt;adev);</div><div class='ctx'> 	dev_dbg(dev, "suspended\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2432,6 +2461,8 @@ static struct amba_id pl022_ids[] = {</div><div class='ctx'> 	{ 0, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+MODULE_DEVICE_TABLE(amba, pl022_ids);</div><div class='add'>+</div><div class='ctx'> static struct amba_driver pl022_driver = {</div><div class='ctx'> 	.drv = {</div><div class='ctx'> 		.name	= "ssp-pl022",</div><div class='head'>diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c<br/>index 019a7163572f..dcf7e1006426 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/spi/spi-s3c64xx.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/spi/spi-s3c64xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/spi/spi-s3c64xx.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/spi/spi-s3c64xx.c</a></div><div class='hunk'>@@ -971,6 +971,7 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct s3c64xx_spi_info *sci;</div><div class='ctx'> 	struct spi_master *master;</div><div class='ctx'> 	int ret;</div><div class='add'>+	char clk_name[16];</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;id &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev,</div><div class='hunk'>@@ -984,11 +985,6 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sci = pdev-&gt;dev.platform_data;</div><div class='del'>-	if (!sci-&gt;src_clk_name) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"Board init must call s3c64xx_spi_set_info()\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check for availability of necessary resource */</div><div class='ctx'> </div><div class='hunk'>@@ -1073,17 +1069,17 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sdd-&gt;src_clk = clk_get(&amp;pdev-&gt;dev, sci-&gt;src_clk_name);</div><div class='add'>+	sprintf(clk_name, "spi_busclk%d", sci-&gt;src_clk_nr);</div><div class='add'>+	sdd-&gt;src_clk = clk_get(&amp;pdev-&gt;dev, clk_name);</div><div class='ctx'> 	if (IS_ERR(sdd-&gt;src_clk)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"Unable to acquire clock '%s'\n", sci-&gt;src_clk_name);</div><div class='add'>+			"Unable to acquire clock '%s'\n", clk_name);</div><div class='ctx'> 		ret = PTR_ERR(sdd-&gt;src_clk);</div><div class='ctx'> 		goto err5;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (clk_enable(sdd-&gt;src_clk)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Couldn't enable clock '%s'\n",</div><div class='del'>-							sci-&gt;src_clk_name);</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Couldn't enable clock '%s'\n", clk_name);</div><div class='ctx'> 		ret = -EBUSY;</div><div class='ctx'> 		goto err6;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c<br/>index 6a80749391db..2a6429d8c363 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/spi/spi-topcliff-pch.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/spi/spi-topcliff-pch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/spi/spi-topcliff-pch.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/spi/spi-topcliff-pch.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * SPI bus driver for the Topcliff PCH used by Intel SoCs</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2010 OKI SEMICONDUCTOR Co., LTD.</div><div class='add'>+ * Copyright (C) 2011 LAPIS Semiconductor Co., Ltd.</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'>@@ -95,16 +95,18 @@</div><div class='ctx'> #define PCH_CLOCK_HZ		50000000</div><div class='ctx'> #define PCH_MAX_SPBR		1023</div><div class='ctx'> </div><div class='del'>-/* Definition for ML7213 by OKI SEMICONDUCTOR */</div><div class='add'>+/* Definition for ML7213/ML7223/ML7831 by LAPIS Semiconductor */</div><div class='ctx'> #define PCI_VENDOR_ID_ROHM		0x10DB</div><div class='ctx'> #define PCI_DEVICE_ID_ML7213_SPI	0x802c</div><div class='ctx'> #define PCI_DEVICE_ID_ML7223_SPI	0x800F</div><div class='add'>+#define PCI_DEVICE_ID_ML7831_SPI	0x8816</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Set the number of SPI instance max</div><div class='ctx'>  * Intel EG20T PCH :		1ch</div><div class='del'>- * OKI SEMICONDUCTOR ML7213 IOH :	2ch</div><div class='del'>- * OKI SEMICONDUCTOR ML7223 IOH :	1ch</div><div class='add'>+ * LAPIS Semiconductor ML7213 IOH :	2ch</div><div class='add'>+ * LAPIS Semiconductor ML7223 IOH :	1ch</div><div class='add'>+ * LAPIS Semiconductor ML7831 IOH :	1ch</div><div class='ctx'> */</div><div class='ctx'> #define PCH_SPI_MAX_DEV			2</div><div class='ctx'> </div><div class='hunk'>@@ -218,6 +220,7 @@ static struct pci_device_id pch_spi_pcidev_id[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_GE_SPI),    1, },</div><div class='ctx'> 	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_SPI), 2, },</div><div class='ctx'> 	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_SPI), 1, },</div><div class='add'>+	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_SPI), 1, },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1076,7 +1079,7 @@ static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw)</div><div class='ctx'> 	}</div><div class='ctx'> 	sg = dma-&gt;sg_rx_p;</div><div class='ctx'> 	desc_rx = dma-&gt;chan_rx-&gt;device-&gt;device_prep_slave_sg(dma-&gt;chan_rx, sg,</div><div class='del'>-					num, DMA_FROM_DEVICE,</div><div class='add'>+					num, DMA_DEV_TO_MEM,</div><div class='ctx'> 					DMA_PREP_INTERRUPT | DMA_CTRL_ACK);</div><div class='ctx'> 	if (!desc_rx) {</div><div class='ctx'> 		dev_err(&amp;data-&gt;master-&gt;dev, "%s:device_prep_slave_sg Failed\n",</div><div class='hunk'>@@ -1121,7 +1124,7 @@ static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw)</div><div class='ctx'> 	}</div><div class='ctx'> 	sg = dma-&gt;sg_tx_p;</div><div class='ctx'> 	desc_tx = dma-&gt;chan_tx-&gt;device-&gt;device_prep_slave_sg(dma-&gt;chan_tx,</div><div class='del'>-					sg, num, DMA_TO_DEVICE,</div><div class='add'>+					sg, num, DMA_MEM_TO_DEV,</div><div class='ctx'> 					DMA_PREP_INTERRUPT | DMA_CTRL_ACK);</div><div class='ctx'> 	if (!desc_tx) {</div><div class='ctx'> 		dev_err(&amp;data-&gt;master-&gt;dev, "%s:device_prep_slave_sg Failed\n",</div><div class='hunk'>@@ -1753,4 +1756,4 @@ MODULE_PARM_DESC(use_dma,</div><div class='ctx'> 		 "to use DMA for data transfers pass 1 else 0; default 1");</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("Intel EG20T PCH/OKI SEMICONDUCTOR ML7xxx IOH SPI Driver");</div><div class='add'>+MODULE_DESCRIPTION("Intel EG20T PCH/LAPIS Semiconductor ML7xxx IOH SPI Driver");</div><div class='head'>diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c<br/>index 77eae99af11c..b2ccdea30cb9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/spi/spi.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/spi/spi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/spi/spi.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/spi/spi.c</a></div><div class='hunk'>@@ -319,7 +319,7 @@ struct spi_device *spi_alloc_device(struct spi_master *master)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spi-&gt;master = master;</div><div class='del'>-	spi-&gt;dev.parent = dev;</div><div class='add'>+	spi-&gt;dev.parent = &amp;master-&gt;dev;</div><div class='ctx'> 	spi-&gt;dev.bus = &amp;spi_bus_type;</div><div class='ctx'> 	spi-&gt;dev.release = spidev_release;</div><div class='ctx'> 	device_initialize(&amp;spi-&gt;dev);</div><div class='head'>diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c<br/>index 34c3bab90b9a..973223f5de8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ssb/pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/ssb/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ssb/pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/ssb/pci.c</a></div><div class='hunk'>@@ -607,6 +607,29 @@ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)</div><div class='ctx'> 	memcpy(&amp;out-&gt;antenna_gain.ghz5, &amp;out-&gt;antenna_gain.ghz24,</div><div class='ctx'> 	       sizeof(out-&gt;antenna_gain.ghz5));</div><div class='ctx'> </div><div class='add'>+	/* Extract FEM info */</div><div class='add'>+	SPEX(fem.ghz2.tssipos, SSB_SPROM8_FEM2G,</div><div class='add'>+		SSB_SROM8_FEM_TSSIPOS, SSB_SROM8_FEM_TSSIPOS_SHIFT);</div><div class='add'>+	SPEX(fem.ghz2.extpa_gain, SSB_SPROM8_FEM2G,</div><div class='add'>+		SSB_SROM8_FEM_EXTPA_GAIN, SSB_SROM8_FEM_EXTPA_GAIN_SHIFT);</div><div class='add'>+	SPEX(fem.ghz2.pdet_range, SSB_SPROM8_FEM2G,</div><div class='add'>+		SSB_SROM8_FEM_PDET_RANGE, SSB_SROM8_FEM_PDET_RANGE_SHIFT);</div><div class='add'>+	SPEX(fem.ghz2.tr_iso, SSB_SPROM8_FEM2G,</div><div class='add'>+		SSB_SROM8_FEM_TR_ISO, SSB_SROM8_FEM_TR_ISO_SHIFT);</div><div class='add'>+	SPEX(fem.ghz2.antswlut, SSB_SPROM8_FEM2G,</div><div class='add'>+		SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);</div><div class='add'>+</div><div class='add'>+	SPEX(fem.ghz5.tssipos, SSB_SPROM8_FEM5G,</div><div class='add'>+		SSB_SROM8_FEM_TSSIPOS, SSB_SROM8_FEM_TSSIPOS_SHIFT);</div><div class='add'>+	SPEX(fem.ghz5.extpa_gain, SSB_SPROM8_FEM5G,</div><div class='add'>+		SSB_SROM8_FEM_EXTPA_GAIN, SSB_SROM8_FEM_EXTPA_GAIN_SHIFT);</div><div class='add'>+	SPEX(fem.ghz5.pdet_range, SSB_SPROM8_FEM5G,</div><div class='add'>+		SSB_SROM8_FEM_PDET_RANGE, SSB_SROM8_FEM_PDET_RANGE_SHIFT);</div><div class='add'>+	SPEX(fem.ghz5.tr_iso, SSB_SPROM8_FEM5G,</div><div class='add'>+		SSB_SROM8_FEM_TR_ISO, SSB_SROM8_FEM_TR_ISO_SHIFT);</div><div class='add'>+	SPEX(fem.ghz5.antswlut, SSB_SPROM8_FEM5G,</div><div class='add'>+		SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);</div><div class='add'>+</div><div class='ctx'> 	sprom_extract_r458(out, in);</div><div class='ctx'> </div><div class='ctx'> 	/* TODO - get remaining rev 8 stuff needed */</div><div class='head'>diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig<br/>index 25cdff36a78a..21e2f4b87f14 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/Kconfig?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/Kconfig</a></div><div class='hunk'>@@ -72,8 +72,6 @@ source "drivers/staging/octeon/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/staging/serqt_usb2/Kconfig"</div><div class='ctx'> </div><div class='del'>-source "drivers/staging/spectra/Kconfig"</div><div class='del'>-</div><div class='ctx'> source "drivers/staging/quatech_usb2/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/staging/vt6655/Kconfig"</div><div class='hunk'>@@ -116,8 +114,6 @@ source "drivers/staging/bcm/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/staging/ft1000/Kconfig"</div><div class='ctx'> </div><div class='del'>-source "drivers/staging/intel_sst/Kconfig"</div><div class='del'>-</div><div class='ctx'> source "drivers/staging/speakup/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/staging/cptm1217/Kconfig"</div><div class='hunk'>@@ -132,4 +128,8 @@ source "drivers/staging/nvec/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/staging/media/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "drivers/staging/omapdrm/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/staging/android/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 a25f3f26c7ff..7c5808d7212d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/Makefile?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/Makefile</a></div><div class='hunk'>@@ -21,7 +21,6 @@ obj-$(CONFIG_RTL8192E)		+= rtl8192e/</div><div class='ctx'> obj-$(CONFIG_R8712U)		+= rtl8712/</div><div class='ctx'> obj-$(CONFIG_RTS_PSTOR)		+= rts_pstor/</div><div class='ctx'> obj-$(CONFIG_RTS5139)		+= rts5139/</div><div class='del'>-obj-$(CONFIG_SPECTRA)		+= spectra/</div><div class='ctx'> obj-$(CONFIG_TRANZPORT)		+= frontier/</div><div class='ctx'> obj-$(CONFIG_POHMELFS)		+= pohmelfs/</div><div class='ctx'> obj-$(CONFIG_IDE_PHISON)	+= phison/</div><div class='hunk'>@@ -50,10 +49,11 @@ obj-$(CONFIG_SBE_2T3E3)		+= sbe-2t3e3/</div><div class='ctx'> obj-$(CONFIG_USB_ENESTORAGE)	+= keucr/</div><div class='ctx'> obj-$(CONFIG_BCM_WIMAX)		+= bcm/</div><div class='ctx'> obj-$(CONFIG_FT1000)		+= ft1000/</div><div class='del'>-obj-$(CONFIG_SND_INTEL_SST)	+= intel_sst/</div><div class='ctx'> obj-$(CONFIG_SPEAKUP)		+= speakup/</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217)	+= cptm1217/</div><div class='ctx'> obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)	+= ste_rmi4/</div><div class='ctx'> obj-$(CONFIG_DRM_PSB)		+= gma500/</div><div class='ctx'> obj-$(CONFIG_INTEL_MEI)		+= mei/</div><div class='ctx'> obj-$(CONFIG_MFD_NVEC)		+= nvec/</div><div class='add'>+obj-$(CONFIG_DRM_OMAP)		+= omapdrm/</div><div class='add'>+obj-$(CONFIG_ANDROID)		+= android/</div><div class='head'>diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig<br/>new file mode 100644<br/>index 000000000000..becf711117ef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,110 @@</div><div class='add'>+menu "Android"</div><div class='add'>+</div><div class='add'>+config ANDROID</div><div class='add'>+	bool "Android Drivers"</div><div class='add'>+	default N</div><div class='add'>+	---help---</div><div class='add'>+	  Enable support for various drivers needed on the Android platform</div><div class='add'>+</div><div class='add'>+if ANDROID</div><div class='add'>+</div><div class='add'>+config ANDROID_BINDER_IPC</div><div class='add'>+	bool "Android Binder IPC Driver"</div><div class='add'>+	default n</div><div class='add'>+</div><div class='add'>+config ASHMEM</div><div class='add'>+	bool "Enable the Anonymous Shared Memory Subsystem"</div><div class='add'>+	default n</div><div class='add'>+	depends on SHMEM || TINY_SHMEM</div><div class='add'>+	help</div><div class='add'>+	  The ashmem subsystem is a new shared memory allocator, similar to</div><div class='add'>+	  POSIX SHM but with different behavior and sporting a simpler</div><div class='add'>+	  file-based API.</div><div class='add'>+</div><div class='add'>+config ANDROID_LOGGER</div><div class='add'>+	tristate "Android log driver"</div><div class='add'>+	default n</div><div class='add'>+</div><div class='add'>+config ANDROID_RAM_CONSOLE</div><div class='add'>+	bool "Android RAM buffer console"</div><div class='add'>+	default n</div><div class='add'>+</div><div class='add'>+config ANDROID_RAM_CONSOLE_ENABLE_VERBOSE</div><div class='add'>+	bool "Enable verbose console messages on Android RAM console"</div><div class='add'>+	default y</div><div class='add'>+	depends on ANDROID_RAM_CONSOLE</div><div class='add'>+</div><div class='add'>+menuconfig ANDROID_RAM_CONSOLE_ERROR_CORRECTION</div><div class='add'>+	bool "Android RAM Console Enable error correction"</div><div class='add'>+	default n</div><div class='add'>+	depends on ANDROID_RAM_CONSOLE</div><div class='add'>+	depends on !ANDROID_RAM_CONSOLE_EARLY_INIT</div><div class='add'>+	select REED_SOLOMON</div><div class='add'>+	select REED_SOLOMON_ENC8</div><div class='add'>+	select REED_SOLOMON_DEC8</div><div class='add'>+</div><div class='add'>+if ANDROID_RAM_CONSOLE_ERROR_CORRECTION</div><div class='add'>+</div><div class='add'>+config ANDROID_RAM_CONSOLE_ERROR_CORRECTION_DATA_SIZE</div><div class='add'>+	int "Android RAM Console Data data size"</div><div class='add'>+	default 128</div><div class='add'>+	help</div><div class='add'>+	  Must be a power of 2.</div><div class='add'>+</div><div class='add'>+config ANDROID_RAM_CONSOLE_ERROR_CORRECTION_ECC_SIZE</div><div class='add'>+	int "Android RAM Console ECC size"</div><div class='add'>+	default 16</div><div class='add'>+</div><div class='add'>+config ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE</div><div class='add'>+	int "Android RAM Console Symbol size"</div><div class='add'>+	default 8</div><div class='add'>+</div><div class='add'>+config ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL</div><div class='add'>+	hex "Android RAM Console Polynomial"</div><div class='add'>+	default 0x19 if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 4)</div><div class='add'>+	default 0x29 if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 5)</div><div class='add'>+	default 0x61 if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 6)</div><div class='add'>+	default 0x89 if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 7)</div><div class='add'>+	default 0x11d if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 8)</div><div class='add'>+</div><div class='add'>+endif # ANDROID_RAM_CONSOLE_ERROR_CORRECTION</div><div class='add'>+</div><div class='add'>+config ANDROID_RAM_CONSOLE_EARLY_INIT</div><div class='add'>+	bool "Start Android RAM console early"</div><div class='add'>+	default n</div><div class='add'>+	depends on ANDROID_RAM_CONSOLE</div><div class='add'>+</div><div class='add'>+config ANDROID_RAM_CONSOLE_EARLY_ADDR</div><div class='add'>+	hex "Android RAM console virtual address"</div><div class='add'>+	default 0</div><div class='add'>+	depends on ANDROID_RAM_CONSOLE_EARLY_INIT</div><div class='add'>+</div><div class='add'>+config ANDROID_RAM_CONSOLE_EARLY_SIZE</div><div class='add'>+	hex "Android RAM console buffer size"</div><div class='add'>+	default 0</div><div class='add'>+	depends on ANDROID_RAM_CONSOLE_EARLY_INIT</div><div class='add'>+</div><div class='add'>+config ANDROID_TIMED_OUTPUT</div><div class='add'>+	bool "Timed output class driver"</div><div class='add'>+	default y</div><div class='add'>+</div><div class='add'>+config ANDROID_TIMED_GPIO</div><div class='add'>+	tristate "Android timed gpio driver"</div><div class='add'>+	depends on GENERIC_GPIO &amp;&amp; ANDROID_TIMED_OUTPUT</div><div class='add'>+	default n</div><div class='add'>+</div><div class='add'>+config ANDROID_LOW_MEMORY_KILLER</div><div class='add'>+	bool "Android Low Memory Killer"</div><div class='add'>+	default N</div><div class='add'>+	---help---</div><div class='add'>+	  Register processes to be killed when memory is low</div><div class='add'>+</div><div class='add'>+config ANDROID_PMEM</div><div class='add'>+	bool "Android pmem allocator"</div><div class='add'>+	depends on ARM</div><div class='add'>+</div><div class='add'>+source "drivers/staging/android/switch/Kconfig"</div><div class='add'>+</div><div class='add'>+endif # if ANDROID</div><div class='add'>+</div><div class='add'>+endmenu</div><div class='head'>diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile<br/>new file mode 100644<br/>index 000000000000..eaed1ff64f0f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/Makefile</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o</div><div class='add'>+obj-$(CONFIG_ASHMEM)			+= ashmem.o</div><div class='add'>+obj-$(CONFIG_ANDROID_LOGGER)		+= logger.o</div><div class='add'>+obj-$(CONFIG_ANDROID_RAM_CONSOLE)	+= ram_console.o</div><div class='add'>+obj-$(CONFIG_ANDROID_TIMED_OUTPUT)	+= timed_output.o</div><div class='add'>+obj-$(CONFIG_ANDROID_TIMED_GPIO)	+= timed_gpio.o</div><div class='add'>+obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)	+= lowmemorykiller.o</div><div class='add'>+obj-$(CONFIG_ANDROID_PMEM)		+= pmem.o</div><div class='add'>+obj-$(CONFIG_ANDROID_SWITCH)		+= switch/</div><div class='head'>diff --git a/drivers/staging/android/TODO b/drivers/staging/android/TODO<br/>new file mode 100644<br/>index 000000000000..e59c5be4be2b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/TODO?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/TODO</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+TODO:</div><div class='add'>+	- checkpatch.pl cleanups</div><div class='add'>+	- sparse fixes</div><div class='add'>+	- rename files to be not so "generic"</div><div class='add'>+	- make sure things build as modules properly</div><div class='add'>+	- add proper arch dependancies as needed</div><div class='add'>+	- audit userspace interfaces to make sure they are sane</div><div class='add'>+</div><div class='add'>+Please send patches to Greg Kroah-Hartman &lt;greg@kroah.com&gt; and Cc:</div><div class='add'>+Brian Swetland &lt;swetland@google.com&gt;</div><div class='head'>diff --git a/drivers/staging/android/android_pmem.h b/drivers/staging/android/android_pmem.h<br/>new file mode 100644<br/>index 000000000000..f633621f5be3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/android_pmem.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/android_pmem.h</a></div><div class='hunk'>@@ -0,0 +1,93 @@</div><div class='add'>+/* include/linux/android_pmem.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007 Google, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of </div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ANDROID_PMEM_H_</div><div class='add'>+#define _ANDROID_PMEM_H_</div><div class='add'>+</div><div class='add'>+#define PMEM_IOCTL_MAGIC 'p'</div><div class='add'>+#define PMEM_GET_PHYS		_IOW(PMEM_IOCTL_MAGIC, 1, unsigned int)</div><div class='add'>+#define PMEM_MAP		_IOW(PMEM_IOCTL_MAGIC, 2, unsigned int)</div><div class='add'>+#define PMEM_GET_SIZE		_IOW(PMEM_IOCTL_MAGIC, 3, unsigned int)</div><div class='add'>+#define PMEM_UNMAP		_IOW(PMEM_IOCTL_MAGIC, 4, unsigned int)</div><div class='add'>+/* This ioctl will allocate pmem space, backing the file, it will fail</div><div class='add'>+ * if the file already has an allocation, pass it the len as the argument</div><div class='add'>+ * to the ioctl */</div><div class='add'>+#define PMEM_ALLOCATE		_IOW(PMEM_IOCTL_MAGIC, 5, unsigned int)</div><div class='add'>+/* This will connect a one pmem file to another, pass the file that is already</div><div class='add'>+ * backed in memory as the argument to the ioctl</div><div class='add'>+ */</div><div class='add'>+#define PMEM_CONNECT		_IOW(PMEM_IOCTL_MAGIC, 6, unsigned int)</div><div class='add'>+/* Returns the total size of the pmem region it is sent to as a pmem_region</div><div class='add'>+ * struct (with offset set to 0). </div><div class='add'>+ */</div><div class='add'>+#define PMEM_GET_TOTAL_SIZE	_IOW(PMEM_IOCTL_MAGIC, 7, unsigned int)</div><div class='add'>+#define PMEM_CACHE_FLUSH	_IOW(PMEM_IOCTL_MAGIC, 8, unsigned int)</div><div class='add'>+</div><div class='add'>+struct android_pmem_platform_data</div><div class='add'>+{</div><div class='add'>+	const char* name;</div><div class='add'>+	/* starting physical address of memory region */</div><div class='add'>+	unsigned long start;</div><div class='add'>+	/* size of memory region */</div><div class='add'>+	unsigned long size;</div><div class='add'>+	/* set to indicate the region should not be managed with an allocator */</div><div class='add'>+	unsigned no_allocator;</div><div class='add'>+	/* set to indicate maps of this region should be cached, if a mix of</div><div class='add'>+	 * cached and uncached is desired, set this and open the device with</div><div class='add'>+	 * O_SYNC to get an uncached region */</div><div class='add'>+	unsigned cached;</div><div class='add'>+	/* The MSM7k has bits to enable a write buffer in the bus controller*/</div><div class='add'>+	unsigned buffered;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pmem_region {</div><div class='add'>+	unsigned long offset;</div><div class='add'>+	unsigned long len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ANDROID_PMEM</div><div class='add'>+int is_pmem_file(struct file *file);</div><div class='add'>+int get_pmem_file(int fd, unsigned long *start, unsigned long *vstart,</div><div class='add'>+		  unsigned long *end, struct file **filp);</div><div class='add'>+int get_pmem_user_addr(struct file *file, unsigned long *start,</div><div class='add'>+		       unsigned long *end);</div><div class='add'>+void put_pmem_file(struct file* file);</div><div class='add'>+void flush_pmem_file(struct file *file, unsigned long start, unsigned long len);</div><div class='add'>+int pmem_setup(struct android_pmem_platform_data *pdata,</div><div class='add'>+	       long (*ioctl)(struct file *, unsigned int, unsigned long),</div><div class='add'>+	       int (*release)(struct inode *, struct file *));</div><div class='add'>+int pmem_remap(struct pmem_region *region, struct file *file,</div><div class='add'>+	       unsigned operation);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static inline int is_pmem_file(struct file *file) { return 0; }</div><div class='add'>+static inline int get_pmem_file(int fd, unsigned long *start,</div><div class='add'>+				unsigned long *vstart, unsigned long *end,</div><div class='add'>+				struct file **filp) { return -ENOSYS; }</div><div class='add'>+static inline int get_pmem_user_addr(struct file *file, unsigned long *start,</div><div class='add'>+				     unsigned long *end) { return -ENOSYS; }</div><div class='add'>+static inline void put_pmem_file(struct file* file) { return; }</div><div class='add'>+static inline void flush_pmem_file(struct file *file, unsigned long start,</div><div class='add'>+				   unsigned long len) { return; }</div><div class='add'>+static inline int pmem_setup(struct android_pmem_platform_data *pdata,</div><div class='add'>+	      long (*ioctl)(struct file *, unsigned int, unsigned long),</div><div class='add'>+	      int (*release)(struct inode *, struct file *)) { return -ENOSYS; }</div><div class='add'>+</div><div class='add'>+static inline int pmem_remap(struct pmem_region *region, struct file *file,</div><div class='add'>+			     unsigned operation) { return -ENOSYS; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif //_ANDROID_PPP_H_</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c<br/>new file mode 100644<br/>index 000000000000..99052bfd3a2d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/ashmem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/ashmem.c</a></div><div class='hunk'>@@ -0,0 +1,752 @@</div><div class='add'>+/* mm/ashmem.c</div><div class='add'>+**</div><div class='add'>+** Anonymous Shared Memory Subsystem, ashmem</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2008 Google, Inc.</div><div class='add'>+**</div><div class='add'>+** Robert Love &lt;rlove@google.com&gt;</div><div class='add'>+**</div><div class='add'>+** This software is licensed under the terms of the GNU General Public</div><div class='add'>+** License version 2, as published by the Free Software Foundation, and</div><div class='add'>+** may be copied, distributed, and modified under those terms.</div><div class='add'>+**</div><div class='add'>+** This program is distributed in the hope that it will be useful,</div><div class='add'>+** but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+** GNU General Public License for more details.</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/file.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/security.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/mman.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/personality.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/shmem_fs.h&gt;</div><div class='add'>+#include "ashmem.h"</div><div class='add'>+</div><div class='add'>+#define ASHMEM_NAME_PREFIX "dev/ashmem/"</div><div class='add'>+#define ASHMEM_NAME_PREFIX_LEN (sizeof(ASHMEM_NAME_PREFIX) - 1)</div><div class='add'>+#define ASHMEM_FULL_NAME_LEN (ASHMEM_NAME_LEN + ASHMEM_NAME_PREFIX_LEN)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ashmem_area - anonymous shared memory area</div><div class='add'>+ * Lifecycle: From our parent file's open() until its release()</div><div class='add'>+ * Locking: Protected by `ashmem_mutex'</div><div class='add'>+ * Big Note: Mappings do NOT pin this structure; it dies on close()</div><div class='add'>+ */</div><div class='add'>+struct ashmem_area {</div><div class='add'>+	char name[ASHMEM_FULL_NAME_LEN]; /* optional name in /proc/pid/maps */</div><div class='add'>+	struct list_head unpinned_list;	 /* list of all ashmem areas */</div><div class='add'>+	struct file *file;		 /* the shmem-based backing file */</div><div class='add'>+	size_t size;			 /* size of the mapping, in bytes */</div><div class='add'>+	unsigned long prot_mask;	 /* allowed prot bits, as vm_flags */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ashmem_range - represents an interval of unpinned (evictable) pages</div><div class='add'>+ * Lifecycle: From unpin to pin</div><div class='add'>+ * Locking: Protected by `ashmem_mutex'</div><div class='add'>+ */</div><div class='add'>+struct ashmem_range {</div><div class='add'>+	struct list_head lru;		/* entry in LRU list */</div><div class='add'>+	struct list_head unpinned;	/* entry in its area's unpinned list */</div><div class='add'>+	struct ashmem_area *asma;	/* associated area */</div><div class='add'>+	size_t pgstart;			/* starting page, inclusive */</div><div class='add'>+	size_t pgend;			/* ending page, inclusive */</div><div class='add'>+	unsigned int purged;		/* ASHMEM_NOT or ASHMEM_WAS_PURGED */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* LRU list of unpinned pages, protected by ashmem_mutex */</div><div class='add'>+static LIST_HEAD(ashmem_lru_list);</div><div class='add'>+</div><div class='add'>+/* Count of pages on our LRU list, protected by ashmem_mutex */</div><div class='add'>+static unsigned long lru_count;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ashmem_mutex - protects the list of and each individual ashmem_area</div><div class='add'>+ *</div><div class='add'>+ * Lock Ordering: ashmex_mutex -&gt; i_mutex -&gt; i_alloc_sem</div><div class='add'>+ */</div><div class='add'>+static DEFINE_MUTEX(ashmem_mutex);</div><div class='add'>+</div><div class='add'>+static struct kmem_cache *ashmem_area_cachep __read_mostly;</div><div class='add'>+static struct kmem_cache *ashmem_range_cachep __read_mostly;</div><div class='add'>+</div><div class='add'>+#define range_size(range) \</div><div class='add'>+	((range)-&gt;pgend - (range)-&gt;pgstart + 1)</div><div class='add'>+</div><div class='add'>+#define range_on_lru(range) \</div><div class='add'>+	((range)-&gt;purged == ASHMEM_NOT_PURGED)</div><div class='add'>+</div><div class='add'>+#define page_range_subsumes_range(range, start, end) \</div><div class='add'>+	(((range)-&gt;pgstart &gt;= (start)) &amp;&amp; ((range)-&gt;pgend &lt;= (end)))</div><div class='add'>+</div><div class='add'>+#define page_range_subsumed_by_range(range, start, end) \</div><div class='add'>+	(((range)-&gt;pgstart &lt;= (start)) &amp;&amp; ((range)-&gt;pgend &gt;= (end)))</div><div class='add'>+</div><div class='add'>+#define page_in_range(range, page) \</div><div class='add'>+	(((range)-&gt;pgstart &lt;= (page)) &amp;&amp; ((range)-&gt;pgend &gt;= (page)))</div><div class='add'>+</div><div class='add'>+#define page_range_in_range(range, start, end) \</div><div class='add'>+	(page_in_range(range, start) || page_in_range(range, end) || \</div><div class='add'>+		page_range_subsumes_range(range, start, end))</div><div class='add'>+</div><div class='add'>+#define range_before_page(range, page) \</div><div class='add'>+	((range)-&gt;pgend &lt; (page))</div><div class='add'>+</div><div class='add'>+#define PROT_MASK		(PROT_EXEC | PROT_READ | PROT_WRITE)</div><div class='add'>+</div><div class='add'>+static inline void lru_add(struct ashmem_range *range)</div><div class='add'>+{</div><div class='add'>+	list_add_tail(&amp;range-&gt;lru, &amp;ashmem_lru_list);</div><div class='add'>+	lru_count += range_size(range);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void lru_del(struct ashmem_range *range)</div><div class='add'>+{</div><div class='add'>+	list_del(&amp;range-&gt;lru);</div><div class='add'>+	lru_count -= range_size(range);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * range_alloc - allocate and initialize a new ashmem_range structure</div><div class='add'>+ *</div><div class='add'>+ * 'asma' - associated ashmem_area</div><div class='add'>+ * 'prev_range' - the previous ashmem_range in the sorted asma-&gt;unpinned list</div><div class='add'>+ * 'purged' - initial purge value (ASMEM_NOT_PURGED or ASHMEM_WAS_PURGED)</div><div class='add'>+ * 'start' - starting page, inclusive</div><div class='add'>+ * 'end' - ending page, inclusive</div><div class='add'>+ *</div><div class='add'>+ * Caller must hold ashmem_mutex.</div><div class='add'>+ */</div><div class='add'>+static int range_alloc(struct ashmem_area *asma,</div><div class='add'>+		       struct ashmem_range *prev_range, unsigned int purged,</div><div class='add'>+		       size_t start, size_t end)</div><div class='add'>+{</div><div class='add'>+	struct ashmem_range *range;</div><div class='add'>+</div><div class='add'>+	range = kmem_cache_zalloc(ashmem_range_cachep, GFP_KERNEL);</div><div class='add'>+	if (unlikely(!range))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	range-&gt;asma = asma;</div><div class='add'>+	range-&gt;pgstart = start;</div><div class='add'>+	range-&gt;pgend = end;</div><div class='add'>+	range-&gt;purged = purged;</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;range-&gt;unpinned, &amp;prev_range-&gt;unpinned);</div><div class='add'>+</div><div class='add'>+	if (range_on_lru(range))</div><div class='add'>+		lru_add(range);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void range_del(struct ashmem_range *range)</div><div class='add'>+{</div><div class='add'>+	list_del(&amp;range-&gt;unpinned);</div><div class='add'>+	if (range_on_lru(range))</div><div class='add'>+		lru_del(range);</div><div class='add'>+	kmem_cache_free(ashmem_range_cachep, range);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * range_shrink - shrinks a range</div><div class='add'>+ *</div><div class='add'>+ * Caller must hold ashmem_mutex.</div><div class='add'>+ */</div><div class='add'>+static inline void range_shrink(struct ashmem_range *range,</div><div class='add'>+				size_t start, size_t end)</div><div class='add'>+{</div><div class='add'>+	size_t pre = range_size(range);</div><div class='add'>+</div><div class='add'>+	range-&gt;pgstart = start;</div><div class='add'>+	range-&gt;pgend = end;</div><div class='add'>+</div><div class='add'>+	if (range_on_lru(range))</div><div class='add'>+		lru_count -= pre - range_size(range);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ashmem_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct ashmem_area *asma;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = generic_file_open(inode, file);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	asma = kmem_cache_zalloc(ashmem_area_cachep, GFP_KERNEL);</div><div class='add'>+	if (unlikely(!asma))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;asma-&gt;unpinned_list);</div><div class='add'>+	memcpy(asma-&gt;name, ASHMEM_NAME_PREFIX, ASHMEM_NAME_PREFIX_LEN);</div><div class='add'>+	asma-&gt;prot_mask = PROT_MASK;</div><div class='add'>+	file-&gt;private_data = asma;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ashmem_release(struct inode *ignored, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct ashmem_area *asma = file-&gt;private_data;</div><div class='add'>+	struct ashmem_range *range, *next;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ashmem_mutex);</div><div class='add'>+	list_for_each_entry_safe(range, next, &amp;asma-&gt;unpinned_list, unpinned)</div><div class='add'>+		range_del(range);</div><div class='add'>+	mutex_unlock(&amp;ashmem_mutex);</div><div class='add'>+</div><div class='add'>+	if (asma-&gt;file)</div><div class='add'>+		fput(asma-&gt;file);</div><div class='add'>+	kmem_cache_free(ashmem_area_cachep, asma);</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 ashmem_read(struct file *file, char __user *buf,</div><div class='add'>+			   size_t len, loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	struct ashmem_area *asma = file-&gt;private_data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ashmem_mutex);</div><div class='add'>+</div><div class='add'>+	/* If size is not set, or set to 0, always return EOF. */</div><div class='add'>+	if (asma-&gt;size == 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!asma-&gt;file) {</div><div class='add'>+		ret = -EBADF;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = asma-&gt;file-&gt;f_op-&gt;read(asma-&gt;file, buf, len, pos);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/** Update backing file pos, since f_ops-&gt;read() doesn't */</div><div class='add'>+	asma-&gt;file-&gt;f_pos = *pos;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ashmem_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static loff_t ashmem_llseek(struct file *file, loff_t offset, int origin)</div><div class='add'>+{</div><div class='add'>+	struct ashmem_area *asma = file-&gt;private_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ashmem_mutex);</div><div class='add'>+</div><div class='add'>+	if (asma-&gt;size == 0) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!asma-&gt;file) {</div><div class='add'>+		ret = -EBADF;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = asma-&gt;file-&gt;f_op-&gt;llseek(asma-&gt;file, offset, origin);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/** Copy f_pos from backing file, since f_ops-&gt;llseek() sets it */</div><div class='add'>+	file-&gt;f_pos = asma-&gt;file-&gt;f_pos;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ashmem_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long calc_vm_may_flags(unsigned long prot)</div><div class='add'>+{</div><div class='add'>+	return _calc_vm_trans(prot, PROT_READ,  VM_MAYREAD) |</div><div class='add'>+	       _calc_vm_trans(prot, PROT_WRITE, VM_MAYWRITE) |</div><div class='add'>+	       _calc_vm_trans(prot, PROT_EXEC,  VM_MAYEXEC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ashmem_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	struct ashmem_area *asma = file-&gt;private_data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ashmem_mutex);</div><div class='add'>+</div><div class='add'>+	/* user needs to SET_SIZE before mapping */</div><div class='add'>+	if (unlikely(!asma-&gt;size)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* requested protection bits must match our allowed protection mask */</div><div class='add'>+	if (unlikely((vma-&gt;vm_flags &amp; ~calc_vm_prot_bits(asma-&gt;prot_mask)) &amp;</div><div class='add'>+		     calc_vm_prot_bits(PROT_MASK))) {</div><div class='add'>+		ret = -EPERM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	vma-&gt;vm_flags &amp;= ~calc_vm_may_flags(~asma-&gt;prot_mask);</div><div class='add'>+</div><div class='add'>+	if (!asma-&gt;file) {</div><div class='add'>+		char *name = ASHMEM_NAME_DEF;</div><div class='add'>+		struct file *vmfile;</div><div class='add'>+</div><div class='add'>+		if (asma-&gt;name[ASHMEM_NAME_PREFIX_LEN] != '\0')</div><div class='add'>+			name = asma-&gt;name;</div><div class='add'>+</div><div class='add'>+		/* ... and allocate the backing shmem file */</div><div class='add'>+		vmfile = shmem_file_setup(name, asma-&gt;size, vma-&gt;vm_flags);</div><div class='add'>+		if (unlikely(IS_ERR(vmfile))) {</div><div class='add'>+			ret = PTR_ERR(vmfile);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		asma-&gt;file = vmfile;</div><div class='add'>+	}</div><div class='add'>+	get_file(asma-&gt;file);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * XXX - Reworked to use shmem_zero_setup() instead of </div><div class='add'>+	 * shmem_set_file while we're in staging. -jstultz</div><div class='add'>+	 */</div><div class='add'>+	if (vma-&gt;vm_flags &amp; VM_SHARED) {</div><div class='add'>+		ret = shmem_zero_setup(vma);</div><div class='add'>+		if (ret) {</div><div class='add'>+			fput(asma-&gt;file);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vma-&gt;vm_file)</div><div class='add'>+		fput(vma-&gt;vm_file);</div><div class='add'>+	vma-&gt;vm_file = asma-&gt;file;</div><div class='add'>+	vma-&gt;vm_flags |= VM_CAN_NONLINEAR;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ashmem_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ashmem_shrink - our cache shrinker, called from mm/vmscan.c :: shrink_slab</div><div class='add'>+ *</div><div class='add'>+ * 'nr_to_scan' is the number of objects (pages) to prune, or 0 to query how</div><div class='add'>+ * many objects (pages) we have in total.</div><div class='add'>+ *</div><div class='add'>+ * 'gfp_mask' is the mask of the allocation that got us into this mess.</div><div class='add'>+ *</div><div class='add'>+ * Return value is the number of objects (pages) remaining, or -1 if we cannot</div><div class='add'>+ * proceed without risk of deadlock (due to gfp_mask).</div><div class='add'>+ *</div><div class='add'>+ * We approximate LRU via least-recently-unpinned, jettisoning unpinned partial</div><div class='add'>+ * chunks of ashmem regions LRU-wise one-at-a-time until we hit 'nr_to_scan'</div><div class='add'>+ * pages freed.</div><div class='add'>+ */</div><div class='add'>+static int ashmem_shrink(struct shrinker *s, struct shrink_control *sc)</div><div class='add'>+{</div><div class='add'>+	struct ashmem_range *range, *next;</div><div class='add'>+</div><div class='add'>+	/* We might recurse into filesystem code, so bail out if necessary */</div><div class='add'>+	if (sc-&gt;nr_to_scan &amp;&amp; !(sc-&gt;gfp_mask &amp; __GFP_FS))</div><div class='add'>+		return -1;</div><div class='add'>+	if (!sc-&gt;nr_to_scan)</div><div class='add'>+		return lru_count;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ashmem_mutex);</div><div class='add'>+	list_for_each_entry_safe(range, next, &amp;ashmem_lru_list, lru) {</div><div class='add'>+		struct inode *inode = range-&gt;asma-&gt;file-&gt;f_dentry-&gt;d_inode;</div><div class='add'>+		loff_t start = range-&gt;pgstart * PAGE_SIZE;</div><div class='add'>+		loff_t end = (range-&gt;pgend + 1) * PAGE_SIZE - 1;</div><div class='add'>+</div><div class='add'>+		vmtruncate_range(inode, start, end);</div><div class='add'>+		range-&gt;purged = ASHMEM_WAS_PURGED;</div><div class='add'>+		lru_del(range);</div><div class='add'>+</div><div class='add'>+		sc-&gt;nr_to_scan -= range_size(range);</div><div class='add'>+		if (sc-&gt;nr_to_scan &lt;= 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;ashmem_mutex);</div><div class='add'>+</div><div class='add'>+	return lru_count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct shrinker ashmem_shrinker = {</div><div class='add'>+	.shrink = ashmem_shrink,</div><div class='add'>+	.seeks = DEFAULT_SEEKS * 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int set_prot_mask(struct ashmem_area *asma, unsigned long prot)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ashmem_mutex);</div><div class='add'>+</div><div class='add'>+	/* the user can only remove, not add, protection bits */</div><div class='add'>+	if (unlikely((asma-&gt;prot_mask &amp; prot) != prot)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* does the application expect PROT_READ to imply PROT_EXEC? */</div><div class='add'>+	if ((prot &amp; PROT_READ) &amp;&amp; (current-&gt;personality &amp; READ_IMPLIES_EXEC))</div><div class='add'>+		prot |= PROT_EXEC;</div><div class='add'>+</div><div class='add'>+	asma-&gt;prot_mask = prot;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ashmem_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_name(struct ashmem_area *asma, void __user *name)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ashmem_mutex);</div><div class='add'>+</div><div class='add'>+	/* cannot change an existing mapping's name */</div><div class='add'>+	if (unlikely(asma-&gt;file)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(copy_from_user(asma-&gt;name + ASHMEM_NAME_PREFIX_LEN,</div><div class='add'>+				    name, ASHMEM_NAME_LEN)))</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+	asma-&gt;name[ASHMEM_FULL_NAME_LEN-1] = '\0';</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ashmem_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 get_name(struct ashmem_area *asma, void __user *name)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ashmem_mutex);</div><div class='add'>+	if (asma-&gt;name[ASHMEM_NAME_PREFIX_LEN] != '\0') {</div><div class='add'>+		size_t len;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Copying only `len', instead of ASHMEM_NAME_LEN, bytes</div><div class='add'>+		 * prevents us from revealing one user's stack to another.</div><div class='add'>+		 */</div><div class='add'>+		len = strlen(asma-&gt;name + ASHMEM_NAME_PREFIX_LEN) + 1;</div><div class='add'>+		if (unlikely(copy_to_user(name,</div><div class='add'>+				asma-&gt;name + ASHMEM_NAME_PREFIX_LEN, len)))</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+	} else {</div><div class='add'>+		if (unlikely(copy_to_user(name, ASHMEM_NAME_DEF,</div><div class='add'>+					  sizeof(ASHMEM_NAME_DEF))))</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;ashmem_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ashmem_pin - pin the given ashmem region, returning whether it was</div><div class='add'>+ * previously purged (ASHMEM_WAS_PURGED) or not (ASHMEM_NOT_PURGED).</div><div class='add'>+ *</div><div class='add'>+ * Caller must hold ashmem_mutex.</div><div class='add'>+ */</div><div class='add'>+static int ashmem_pin(struct ashmem_area *asma, size_t pgstart, size_t pgend)</div><div class='add'>+{</div><div class='add'>+	struct ashmem_range *range, *next;</div><div class='add'>+	int ret = ASHMEM_NOT_PURGED;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(range, next, &amp;asma-&gt;unpinned_list, unpinned) {</div><div class='add'>+		/* moved past last applicable page; we can short circuit */</div><div class='add'>+		if (range_before_page(range, pgstart))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The user can ask us to pin pages that span multiple ranges,</div><div class='add'>+		 * or to pin pages that aren't even unpinned, so this is messy.</div><div class='add'>+		 *</div><div class='add'>+		 * Four cases:</div><div class='add'>+		 * 1. The requested range subsumes an existing range, so we</div><div class='add'>+		 *    just remove the entire matching range.</div><div class='add'>+		 * 2. The requested range overlaps the start of an existing</div><div class='add'>+		 *    range, so we just update that range.</div><div class='add'>+		 * 3. The requested range overlaps the end of an existing</div><div class='add'>+		 *    range, so we just update that range.</div><div class='add'>+		 * 4. The requested range punches a hole in an existing range,</div><div class='add'>+		 *    so we have to update one side of the range and then</div><div class='add'>+		 *    create a new range for the other side.</div><div class='add'>+		 */</div><div class='add'>+		if (page_range_in_range(range, pgstart, pgend)) {</div><div class='add'>+			ret |= range-&gt;purged;</div><div class='add'>+</div><div class='add'>+			/* Case #1: Easy. Just nuke the whole thing. */</div><div class='add'>+			if (page_range_subsumes_range(range, pgstart, pgend)) {</div><div class='add'>+				range_del(range);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Case #2: We overlap from the start, so adjust it */</div><div class='add'>+			if (range-&gt;pgstart &gt;= pgstart) {</div><div class='add'>+				range_shrink(range, pgend + 1, range-&gt;pgend);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Case #3: We overlap from the rear, so adjust it */</div><div class='add'>+			if (range-&gt;pgend &lt;= pgend) {</div><div class='add'>+				range_shrink(range, range-&gt;pgstart, pgstart-1);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Case #4: We eat a chunk out of the middle. A bit</div><div class='add'>+			 * more complicated, we allocate a new range for the</div><div class='add'>+			 * second half and adjust the first chunk's endpoint.</div><div class='add'>+			 */</div><div class='add'>+			range_alloc(asma, range, range-&gt;purged,</div><div class='add'>+				    pgend + 1, range-&gt;pgend);</div><div class='add'>+			range_shrink(range, range-&gt;pgstart, pgstart - 1);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ashmem_unpin - unpin the given range of pages. Returns zero on success.</div><div class='add'>+ *</div><div class='add'>+ * Caller must hold ashmem_mutex.</div><div class='add'>+ */</div><div class='add'>+static int ashmem_unpin(struct ashmem_area *asma, size_t pgstart, size_t pgend)</div><div class='add'>+{</div><div class='add'>+	struct ashmem_range *range, *next;</div><div class='add'>+	unsigned int purged = ASHMEM_NOT_PURGED;</div><div class='add'>+</div><div class='add'>+restart:</div><div class='add'>+	list_for_each_entry_safe(range, next, &amp;asma-&gt;unpinned_list, unpinned) {</div><div class='add'>+		/* short circuit: this is our insertion point */</div><div class='add'>+		if (range_before_page(range, pgstart))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The user can ask us to unpin pages that are already entirely</div><div class='add'>+		 * or partially pinned. We handle those two cases here.</div><div class='add'>+		 */</div><div class='add'>+		if (page_range_subsumed_by_range(range, pgstart, pgend))</div><div class='add'>+			return 0;</div><div class='add'>+		if (page_range_in_range(range, pgstart, pgend)) {</div><div class='add'>+			pgstart = min_t(size_t, range-&gt;pgstart, pgstart),</div><div class='add'>+			pgend = max_t(size_t, range-&gt;pgend, pgend);</div><div class='add'>+			purged |= range-&gt;purged;</div><div class='add'>+			range_del(range);</div><div class='add'>+			goto restart;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return range_alloc(asma, range, purged, pgstart, pgend);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ashmem_get_pin_status - Returns ASHMEM_IS_UNPINNED if _any_ pages in the</div><div class='add'>+ * given interval are unpinned and ASHMEM_IS_PINNED otherwise.</div><div class='add'>+ *</div><div class='add'>+ * Caller must hold ashmem_mutex.</div><div class='add'>+ */</div><div class='add'>+static int ashmem_get_pin_status(struct ashmem_area *asma, size_t pgstart,</div><div class='add'>+				 size_t pgend)</div><div class='add'>+{</div><div class='add'>+	struct ashmem_range *range;</div><div class='add'>+	int ret = ASHMEM_IS_PINNED;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(range, &amp;asma-&gt;unpinned_list, unpinned) {</div><div class='add'>+		if (range_before_page(range, pgstart))</div><div class='add'>+			break;</div><div class='add'>+		if (page_range_in_range(range, pgstart, pgend)) {</div><div class='add'>+			ret = ASHMEM_IS_UNPINNED;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ashmem_pin_unpin(struct ashmem_area *asma, unsigned long cmd,</div><div class='add'>+			    void __user *p)</div><div class='add'>+{</div><div class='add'>+	struct ashmem_pin pin;</div><div class='add'>+	size_t pgstart, pgend;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!asma-&gt;file))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(copy_from_user(&amp;pin, p, sizeof(pin))))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	/* per custom, you can pass zero for len to mean "everything onward" */</div><div class='add'>+	if (!pin.len)</div><div class='add'>+		pin.len = PAGE_ALIGN(asma-&gt;size) - pin.offset;</div><div class='add'>+</div><div class='add'>+	if (unlikely((pin.offset | pin.len) &amp; ~PAGE_MASK))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(((__u32) -1) - pin.offset &lt; pin.len))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(PAGE_ALIGN(asma-&gt;size) &lt; pin.offset + pin.len))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pgstart = pin.offset / PAGE_SIZE;</div><div class='add'>+	pgend = pgstart + (pin.len / PAGE_SIZE) - 1;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ashmem_mutex);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case ASHMEM_PIN:</div><div class='add'>+		ret = ashmem_pin(asma, pgstart, pgend);</div><div class='add'>+		break;</div><div class='add'>+	case ASHMEM_UNPIN:</div><div class='add'>+		ret = ashmem_unpin(asma, pgstart, pgend);</div><div class='add'>+		break;</div><div class='add'>+	case ASHMEM_GET_PIN_STATUS:</div><div class='add'>+		ret = ashmem_get_pin_status(asma, pgstart, pgend);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ashmem_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long ashmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct ashmem_area *asma = file-&gt;private_data;</div><div class='add'>+	long ret = -ENOTTY;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case ASHMEM_SET_NAME:</div><div class='add'>+		ret = set_name(asma, (void __user *) arg);</div><div class='add'>+		break;</div><div class='add'>+	case ASHMEM_GET_NAME:</div><div class='add'>+		ret = get_name(asma, (void __user *) arg);</div><div class='add'>+		break;</div><div class='add'>+	case ASHMEM_SET_SIZE:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		if (!asma-&gt;file) {</div><div class='add'>+			ret = 0;</div><div class='add'>+			asma-&gt;size = (size_t) arg;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case ASHMEM_GET_SIZE:</div><div class='add'>+		ret = asma-&gt;size;</div><div class='add'>+		break;</div><div class='add'>+	case ASHMEM_SET_PROT_MASK:</div><div class='add'>+		ret = set_prot_mask(asma, arg);</div><div class='add'>+		break;</div><div class='add'>+	case ASHMEM_GET_PROT_MASK:</div><div class='add'>+		ret = asma-&gt;prot_mask;</div><div class='add'>+		break;</div><div class='add'>+	case ASHMEM_PIN:</div><div class='add'>+	case ASHMEM_UNPIN:</div><div class='add'>+	case ASHMEM_GET_PIN_STATUS:</div><div class='add'>+		ret = ashmem_pin_unpin(asma, cmd, (void __user *) arg);</div><div class='add'>+		break;</div><div class='add'>+	case ASHMEM_PURGE_ALL_CACHES:</div><div class='add'>+		ret = -EPERM;</div><div class='add'>+		if (capable(CAP_SYS_ADMIN)) {</div><div class='add'>+			struct shrink_control sc = {</div><div class='add'>+				.gfp_mask = GFP_KERNEL,</div><div class='add'>+				.nr_to_scan = 0,</div><div class='add'>+			};</div><div class='add'>+			ret = ashmem_shrink(&amp;ashmem_shrinker, &amp;sc);</div><div class='add'>+			sc.nr_to_scan = ret;</div><div class='add'>+			ashmem_shrink(&amp;ashmem_shrinker, &amp;sc);</div><div class='add'>+		}</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 struct file_operations ashmem_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = ashmem_open,</div><div class='add'>+	.release = ashmem_release,</div><div class='add'>+	.read = ashmem_read,</div><div class='add'>+	.llseek = ashmem_llseek,</div><div class='add'>+	.mmap = ashmem_mmap,</div><div class='add'>+	.unlocked_ioctl = ashmem_ioctl,</div><div class='add'>+	.compat_ioctl = ashmem_ioctl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct miscdevice ashmem_misc = {</div><div class='add'>+	.minor = MISC_DYNAMIC_MINOR,</div><div class='add'>+	.name = "ashmem",</div><div class='add'>+	.fops = &amp;ashmem_fops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ashmem_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ashmem_area_cachep = kmem_cache_create("ashmem_area_cache",</div><div class='add'>+					  sizeof(struct ashmem_area),</div><div class='add'>+					  0, 0, NULL);</div><div class='add'>+	if (unlikely(!ashmem_area_cachep)) {</div><div class='add'>+		printk(KERN_ERR "ashmem: failed to create slab cache\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ashmem_range_cachep = kmem_cache_create("ashmem_range_cache",</div><div class='add'>+					  sizeof(struct ashmem_range),</div><div class='add'>+					  0, 0, NULL);</div><div class='add'>+	if (unlikely(!ashmem_range_cachep)) {</div><div class='add'>+		printk(KERN_ERR "ashmem: failed to create slab cache\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = misc_register(&amp;ashmem_misc);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		printk(KERN_ERR "ashmem: failed to register misc device!\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	register_shrinker(&amp;ashmem_shrinker);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "ashmem: 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 void __exit ashmem_exit(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	unregister_shrinker(&amp;ashmem_shrinker);</div><div class='add'>+</div><div class='add'>+	ret = misc_deregister(&amp;ashmem_misc);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		printk(KERN_ERR "ashmem: failed to unregister misc device!\n");</div><div class='add'>+</div><div class='add'>+	kmem_cache_destroy(ashmem_range_cachep);</div><div class='add'>+	kmem_cache_destroy(ashmem_area_cachep);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "ashmem: unloaded\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ashmem_init);</div><div class='add'>+module_exit(ashmem_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/staging/android/ashmem.h b/drivers/staging/android/ashmem.h<br/>new file mode 100644<br/>index 000000000000..1976b10ef93e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/ashmem.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/ashmem.h</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+/*</div><div class='add'>+ * include/linux/ashmem.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008 Google Inc.</div><div class='add'>+ * Author: Robert Love</div><div class='add'>+ *</div><div class='add'>+ * This file is dual licensed.  It may be redistributed and/or modified</div><div class='add'>+ * under the terms of the Apache 2.0 License OR version 2 of the GNU</div><div class='add'>+ * General Public License.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_ASHMEM_H</div><div class='add'>+#define _LINUX_ASHMEM_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/limits.h&gt;</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='add'>+</div><div class='add'>+#define ASHMEM_NAME_LEN		256</div><div class='add'>+</div><div class='add'>+#define ASHMEM_NAME_DEF		"dev/ashmem"</div><div class='add'>+</div><div class='add'>+/* Return values from ASHMEM_PIN: Was the mapping purged while unpinned? */</div><div class='add'>+#define ASHMEM_NOT_PURGED	0</div><div class='add'>+#define ASHMEM_WAS_PURGED	1</div><div class='add'>+</div><div class='add'>+/* Return values from ASHMEM_GET_PIN_STATUS: Is the mapping pinned? */</div><div class='add'>+#define ASHMEM_IS_UNPINNED	0</div><div class='add'>+#define ASHMEM_IS_PINNED	1</div><div class='add'>+</div><div class='add'>+struct ashmem_pin {</div><div class='add'>+	__u32 offset;	/* offset into region, in bytes, page-aligned */</div><div class='add'>+	__u32 len;	/* length forward from offset, in bytes, page-aligned */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define __ASHMEMIOC		0x77</div><div class='add'>+</div><div class='add'>+#define ASHMEM_SET_NAME		_IOW(__ASHMEMIOC, 1, char[ASHMEM_NAME_LEN])</div><div class='add'>+#define ASHMEM_GET_NAME		_IOR(__ASHMEMIOC, 2, char[ASHMEM_NAME_LEN])</div><div class='add'>+#define ASHMEM_SET_SIZE		_IOW(__ASHMEMIOC, 3, size_t)</div><div class='add'>+#define ASHMEM_GET_SIZE		_IO(__ASHMEMIOC, 4)</div><div class='add'>+#define ASHMEM_SET_PROT_MASK	_IOW(__ASHMEMIOC, 5, unsigned long)</div><div class='add'>+#define ASHMEM_GET_PROT_MASK	_IO(__ASHMEMIOC, 6)</div><div class='add'>+#define ASHMEM_PIN		_IOW(__ASHMEMIOC, 7, struct ashmem_pin)</div><div class='add'>+#define ASHMEM_UNPIN		_IOW(__ASHMEMIOC, 8, struct ashmem_pin)</div><div class='add'>+#define ASHMEM_GET_PIN_STATUS	_IO(__ASHMEMIOC, 9)</div><div class='add'>+#define ASHMEM_PURGE_ALL_CACHES	_IO(__ASHMEMIOC, 10)</div><div class='add'>+</div><div class='add'>+#endif	/* _LINUX_ASHMEM_H */</div><div class='head'>diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c<br/>new file mode 100644<br/>index 000000000000..7491801a661c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/binder.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/binder.c</a></div><div class='hunk'>@@ -0,0 +1,3600 @@</div><div class='add'>+/* binder.c</div><div class='add'>+ *</div><div class='add'>+ * Android IPC Subsystem</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007-2008 Google, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;linux/fdtable.h&gt;</div><div class='add'>+#include &lt;linux/file.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/list.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/nsproxy.h&gt;</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include "binder.h"</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(binder_lock);</div><div class='add'>+static DEFINE_MUTEX(binder_deferred_lock);</div><div class='add'>+</div><div class='add'>+static HLIST_HEAD(binder_procs);</div><div class='add'>+static HLIST_HEAD(binder_deferred_list);</div><div class='add'>+static HLIST_HEAD(binder_dead_nodes);</div><div class='add'>+</div><div class='add'>+static struct dentry *binder_debugfs_dir_entry_root;</div><div class='add'>+static struct dentry *binder_debugfs_dir_entry_proc;</div><div class='add'>+static struct binder_node *binder_context_mgr_node;</div><div class='add'>+static uid_t binder_context_mgr_uid = -1;</div><div class='add'>+static int binder_last_id;</div><div class='add'>+static struct workqueue_struct *binder_deferred_workqueue;</div><div class='add'>+</div><div class='add'>+#define BINDER_DEBUG_ENTRY(name) \</div><div class='add'>+static int binder_##name##_open(struct inode *inode, struct file *file) \</div><div class='add'>+{ \</div><div class='add'>+	return single_open(file, binder_##name##_show, inode-&gt;i_private); \</div><div class='add'>+} \</div><div class='add'>+\</div><div class='add'>+static const struct file_operations binder_##name##_fops = { \</div><div class='add'>+	.owner = THIS_MODULE, \</div><div class='add'>+	.open = binder_##name##_open, \</div><div class='add'>+	.read = seq_read, \</div><div class='add'>+	.llseek = seq_lseek, \</div><div class='add'>+	.release = single_release, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int binder_proc_show(struct seq_file *m, void *unused);</div><div class='add'>+BINDER_DEBUG_ENTRY(proc);</div><div class='add'>+</div><div class='add'>+/* This is only defined in include/asm-arm/sizes.h */</div><div class='add'>+#ifndef SZ_1K</div><div class='add'>+#define SZ_1K                               0x400</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef SZ_4M</div><div class='add'>+#define SZ_4M                               0x400000</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define FORBIDDEN_MMAP_FLAGS                (VM_WRITE)</div><div class='add'>+</div><div class='add'>+#define BINDER_SMALL_BUF_SIZE (PAGE_SIZE * 64)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	BINDER_DEBUG_USER_ERROR             = 1U &lt;&lt; 0,</div><div class='add'>+	BINDER_DEBUG_FAILED_TRANSACTION     = 1U &lt;&lt; 1,</div><div class='add'>+	BINDER_DEBUG_DEAD_TRANSACTION       = 1U &lt;&lt; 2,</div><div class='add'>+	BINDER_DEBUG_OPEN_CLOSE             = 1U &lt;&lt; 3,</div><div class='add'>+	BINDER_DEBUG_DEAD_BINDER            = 1U &lt;&lt; 4,</div><div class='add'>+	BINDER_DEBUG_DEATH_NOTIFICATION     = 1U &lt;&lt; 5,</div><div class='add'>+	BINDER_DEBUG_READ_WRITE             = 1U &lt;&lt; 6,</div><div class='add'>+	BINDER_DEBUG_USER_REFS              = 1U &lt;&lt; 7,</div><div class='add'>+	BINDER_DEBUG_THREADS                = 1U &lt;&lt; 8,</div><div class='add'>+	BINDER_DEBUG_TRANSACTION            = 1U &lt;&lt; 9,</div><div class='add'>+	BINDER_DEBUG_TRANSACTION_COMPLETE   = 1U &lt;&lt; 10,</div><div class='add'>+	BINDER_DEBUG_FREE_BUFFER            = 1U &lt;&lt; 11,</div><div class='add'>+	BINDER_DEBUG_INTERNAL_REFS          = 1U &lt;&lt; 12,</div><div class='add'>+	BINDER_DEBUG_BUFFER_ALLOC           = 1U &lt;&lt; 13,</div><div class='add'>+	BINDER_DEBUG_PRIORITY_CAP           = 1U &lt;&lt; 14,</div><div class='add'>+	BINDER_DEBUG_BUFFER_ALLOC_ASYNC     = 1U &lt;&lt; 15,</div><div class='add'>+};</div><div class='add'>+static uint32_t binder_debug_mask = BINDER_DEBUG_USER_ERROR |</div><div class='add'>+	BINDER_DEBUG_FAILED_TRANSACTION | BINDER_DEBUG_DEAD_TRANSACTION;</div><div class='add'>+module_param_named(debug_mask, binder_debug_mask, uint, S_IWUSR | S_IRUGO);</div><div class='add'>+</div><div class='add'>+static int binder_debug_no_lock;</div><div class='add'>+module_param_named(proc_no_lock, binder_debug_no_lock, bool, S_IWUSR | S_IRUGO);</div><div class='add'>+</div><div class='add'>+static DECLARE_WAIT_QUEUE_HEAD(binder_user_error_wait);</div><div class='add'>+static int binder_stop_on_user_error;</div><div class='add'>+</div><div class='add'>+static int binder_set_stop_on_user_error(const char *val,</div><div class='add'>+					 struct kernel_param *kp)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	ret = param_set_int(val, kp);</div><div class='add'>+	if (binder_stop_on_user_error &lt; 2)</div><div class='add'>+		wake_up(&amp;binder_user_error_wait);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+module_param_call(stop_on_user_error, binder_set_stop_on_user_error,</div><div class='add'>+	param_get_int, &amp;binder_stop_on_user_error, S_IWUSR | S_IRUGO);</div><div class='add'>+</div><div class='add'>+#define binder_debug(mask, x...) \</div><div class='add'>+	do { \</div><div class='add'>+		if (binder_debug_mask &amp; mask) \</div><div class='add'>+			printk(KERN_INFO x); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define binder_user_error(x...) \</div><div class='add'>+	do { \</div><div class='add'>+		if (binder_debug_mask &amp; BINDER_DEBUG_USER_ERROR) \</div><div class='add'>+			printk(KERN_INFO x); \</div><div class='add'>+		if (binder_stop_on_user_error) \</div><div class='add'>+			binder_stop_on_user_error = 2; \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+enum binder_stat_types {</div><div class='add'>+	BINDER_STAT_PROC,</div><div class='add'>+	BINDER_STAT_THREAD,</div><div class='add'>+	BINDER_STAT_NODE,</div><div class='add'>+	BINDER_STAT_REF,</div><div class='add'>+	BINDER_STAT_DEATH,</div><div class='add'>+	BINDER_STAT_TRANSACTION,</div><div class='add'>+	BINDER_STAT_TRANSACTION_COMPLETE,</div><div class='add'>+	BINDER_STAT_COUNT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct binder_stats {</div><div class='add'>+	int br[_IOC_NR(BR_FAILED_REPLY) + 1];</div><div class='add'>+	int bc[_IOC_NR(BC_DEAD_BINDER_DONE) + 1];</div><div class='add'>+	int obj_created[BINDER_STAT_COUNT];</div><div class='add'>+	int obj_deleted[BINDER_STAT_COUNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct binder_stats binder_stats;</div><div class='add'>+</div><div class='add'>+static inline void binder_stats_deleted(enum binder_stat_types type)</div><div class='add'>+{</div><div class='add'>+	binder_stats.obj_deleted[type]++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void binder_stats_created(enum binder_stat_types type)</div><div class='add'>+{</div><div class='add'>+	binder_stats.obj_created[type]++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct binder_transaction_log_entry {</div><div class='add'>+	int debug_id;</div><div class='add'>+	int call_type;</div><div class='add'>+	int from_proc;</div><div class='add'>+	int from_thread;</div><div class='add'>+	int target_handle;</div><div class='add'>+	int to_proc;</div><div class='add'>+	int to_thread;</div><div class='add'>+	int to_node;</div><div class='add'>+	int data_size;</div><div class='add'>+	int offsets_size;</div><div class='add'>+};</div><div class='add'>+struct binder_transaction_log {</div><div class='add'>+	int next;</div><div class='add'>+	int full;</div><div class='add'>+	struct binder_transaction_log_entry entry[32];</div><div class='add'>+};</div><div class='add'>+static struct binder_transaction_log binder_transaction_log;</div><div class='add'>+static struct binder_transaction_log binder_transaction_log_failed;</div><div class='add'>+</div><div class='add'>+static struct binder_transaction_log_entry *binder_transaction_log_add(</div><div class='add'>+	struct binder_transaction_log *log)</div><div class='add'>+{</div><div class='add'>+	struct binder_transaction_log_entry *e;</div><div class='add'>+	e = &amp;log-&gt;entry[log-&gt;next];</div><div class='add'>+	memset(e, 0, sizeof(*e));</div><div class='add'>+	log-&gt;next++;</div><div class='add'>+	if (log-&gt;next == ARRAY_SIZE(log-&gt;entry)) {</div><div class='add'>+		log-&gt;next = 0;</div><div class='add'>+		log-&gt;full = 1;</div><div class='add'>+	}</div><div class='add'>+	return e;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct binder_work {</div><div class='add'>+	struct list_head entry;</div><div class='add'>+	enum {</div><div class='add'>+		BINDER_WORK_TRANSACTION = 1,</div><div class='add'>+		BINDER_WORK_TRANSACTION_COMPLETE,</div><div class='add'>+		BINDER_WORK_NODE,</div><div class='add'>+		BINDER_WORK_DEAD_BINDER,</div><div class='add'>+		BINDER_WORK_DEAD_BINDER_AND_CLEAR,</div><div class='add'>+		BINDER_WORK_CLEAR_DEATH_NOTIFICATION,</div><div class='add'>+	} type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct binder_node {</div><div class='add'>+	int debug_id;</div><div class='add'>+	struct binder_work work;</div><div class='add'>+	union {</div><div class='add'>+		struct rb_node rb_node;</div><div class='add'>+		struct hlist_node dead_node;</div><div class='add'>+	};</div><div class='add'>+	struct binder_proc *proc;</div><div class='add'>+	struct hlist_head refs;</div><div class='add'>+	int internal_strong_refs;</div><div class='add'>+	int local_weak_refs;</div><div class='add'>+	int local_strong_refs;</div><div class='add'>+	void __user *ptr;</div><div class='add'>+	void __user *cookie;</div><div class='add'>+	unsigned has_strong_ref:1;</div><div class='add'>+	unsigned pending_strong_ref:1;</div><div class='add'>+	unsigned has_weak_ref:1;</div><div class='add'>+	unsigned pending_weak_ref:1;</div><div class='add'>+	unsigned has_async_transaction:1;</div><div class='add'>+	unsigned accept_fds:1;</div><div class='add'>+	unsigned min_priority:8;</div><div class='add'>+	struct list_head async_todo;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct binder_ref_death {</div><div class='add'>+	struct binder_work work;</div><div class='add'>+	void __user *cookie;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct binder_ref {</div><div class='add'>+	/* Lookups needed: */</div><div class='add'>+	/*   node + proc =&gt; ref (transaction) */</div><div class='add'>+	/*   desc + proc =&gt; ref (transaction, inc/dec ref) */</div><div class='add'>+	/*   node =&gt; refs + procs (proc exit) */</div><div class='add'>+	int debug_id;</div><div class='add'>+	struct rb_node rb_node_desc;</div><div class='add'>+	struct rb_node rb_node_node;</div><div class='add'>+	struct hlist_node node_entry;</div><div class='add'>+	struct binder_proc *proc;</div><div class='add'>+	struct binder_node *node;</div><div class='add'>+	uint32_t desc;</div><div class='add'>+	int strong;</div><div class='add'>+	int weak;</div><div class='add'>+	struct binder_ref_death *death;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct binder_buffer {</div><div class='add'>+	struct list_head entry; /* free and allocated entries by addesss */</div><div class='add'>+	struct rb_node rb_node; /* free entry by size or allocated entry */</div><div class='add'>+				/* by address */</div><div class='add'>+	unsigned free:1;</div><div class='add'>+	unsigned allow_user_free:1;</div><div class='add'>+	unsigned async_transaction:1;</div><div class='add'>+	unsigned debug_id:29;</div><div class='add'>+</div><div class='add'>+	struct binder_transaction *transaction;</div><div class='add'>+</div><div class='add'>+	struct binder_node *target_node;</div><div class='add'>+	size_t data_size;</div><div class='add'>+	size_t offsets_size;</div><div class='add'>+	uint8_t data[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum binder_deferred_state {</div><div class='add'>+	BINDER_DEFERRED_PUT_FILES    = 0x01,</div><div class='add'>+	BINDER_DEFERRED_FLUSH        = 0x02,</div><div class='add'>+	BINDER_DEFERRED_RELEASE      = 0x04,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct binder_proc {</div><div class='add'>+	struct hlist_node proc_node;</div><div class='add'>+	struct rb_root threads;</div><div class='add'>+	struct rb_root nodes;</div><div class='add'>+	struct rb_root refs_by_desc;</div><div class='add'>+	struct rb_root refs_by_node;</div><div class='add'>+	int pid;</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+	struct task_struct *tsk;</div><div class='add'>+	struct files_struct *files;</div><div class='add'>+	struct hlist_node deferred_work_node;</div><div class='add'>+	int deferred_work;</div><div class='add'>+	void *buffer;</div><div class='add'>+	ptrdiff_t user_buffer_offset;</div><div class='add'>+</div><div class='add'>+	struct list_head buffers;</div><div class='add'>+	struct rb_root free_buffers;</div><div class='add'>+	struct rb_root allocated_buffers;</div><div class='add'>+	size_t free_async_space;</div><div class='add'>+</div><div class='add'>+	struct page **pages;</div><div class='add'>+	size_t buffer_size;</div><div class='add'>+	uint32_t buffer_free;</div><div class='add'>+	struct list_head todo;</div><div class='add'>+	wait_queue_head_t wait;</div><div class='add'>+	struct binder_stats stats;</div><div class='add'>+	struct list_head delivered_death;</div><div class='add'>+	int max_threads;</div><div class='add'>+	int requested_threads;</div><div class='add'>+	int requested_threads_started;</div><div class='add'>+	int ready_threads;</div><div class='add'>+	long default_priority;</div><div class='add'>+	struct dentry *debugfs_entry;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	BINDER_LOOPER_STATE_REGISTERED  = 0x01,</div><div class='add'>+	BINDER_LOOPER_STATE_ENTERED     = 0x02,</div><div class='add'>+	BINDER_LOOPER_STATE_EXITED      = 0x04,</div><div class='add'>+	BINDER_LOOPER_STATE_INVALID     = 0x08,</div><div class='add'>+	BINDER_LOOPER_STATE_WAITING     = 0x10,</div><div class='add'>+	BINDER_LOOPER_STATE_NEED_RETURN = 0x20</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct binder_thread {</div><div class='add'>+	struct binder_proc *proc;</div><div class='add'>+	struct rb_node rb_node;</div><div class='add'>+	int pid;</div><div class='add'>+	int looper;</div><div class='add'>+	struct binder_transaction *transaction_stack;</div><div class='add'>+	struct list_head todo;</div><div class='add'>+	uint32_t return_error; /* Write failed, return error code in read buf */</div><div class='add'>+	uint32_t return_error2; /* Write failed, return error code in read */</div><div class='add'>+		/* buffer. Used when sending a reply to a dead process that */</div><div class='add'>+		/* we are also waiting on */</div><div class='add'>+	wait_queue_head_t wait;</div><div class='add'>+	struct binder_stats stats;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct binder_transaction {</div><div class='add'>+	int debug_id;</div><div class='add'>+	struct binder_work work;</div><div class='add'>+	struct binder_thread *from;</div><div class='add'>+	struct binder_transaction *from_parent;</div><div class='add'>+	struct binder_proc *to_proc;</div><div class='add'>+	struct binder_thread *to_thread;</div><div class='add'>+	struct binder_transaction *to_parent;</div><div class='add'>+	unsigned need_reply:1;</div><div class='add'>+	/* unsigned is_dead:1; */	/* not used at the moment */</div><div class='add'>+</div><div class='add'>+	struct binder_buffer *buffer;</div><div class='add'>+	unsigned int	code;</div><div class='add'>+	unsigned int	flags;</div><div class='add'>+	long	priority;</div><div class='add'>+	long	saved_priority;</div><div class='add'>+	uid_t	sender_euid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * copied from get_unused_fd_flags</div><div class='add'>+ */</div><div class='add'>+int task_get_unused_fd_flags(struct binder_proc *proc, int flags)</div><div class='add'>+{</div><div class='add'>+	struct files_struct *files = proc-&gt;files;</div><div class='add'>+	int fd, error;</div><div class='add'>+	struct fdtable *fdt;</div><div class='add'>+	unsigned long rlim_cur;</div><div class='add'>+	unsigned long irqs;</div><div class='add'>+</div><div class='add'>+	if (files == NULL)</div><div class='add'>+		return -ESRCH;</div><div class='add'>+</div><div class='add'>+	error = -EMFILE;</div><div class='add'>+	spin_lock(&amp;files-&gt;file_lock);</div><div class='add'>+</div><div class='add'>+repeat:</div><div class='add'>+	fdt = files_fdtable(files);</div><div class='add'>+	fd = find_next_zero_bit(fdt-&gt;open_fds-&gt;fds_bits, fdt-&gt;max_fds,</div><div class='add'>+				files-&gt;next_fd);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * N.B. For clone tasks sharing a files structure, this test</div><div class='add'>+	 * will limit the total number of files that can be opened.</div><div class='add'>+	 */</div><div class='add'>+	rlim_cur = 0;</div><div class='add'>+	if (lock_task_sighand(proc-&gt;tsk, &amp;irqs)) {</div><div class='add'>+		rlim_cur = proc-&gt;tsk-&gt;signal-&gt;rlim[RLIMIT_NOFILE].rlim_cur;</div><div class='add'>+		unlock_task_sighand(proc-&gt;tsk, &amp;irqs);</div><div class='add'>+	}</div><div class='add'>+	if (fd &gt;= rlim_cur)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Do we need to expand the fd array or fd set?  */</div><div class='add'>+	error = expand_files(files, fd);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (error) {</div><div class='add'>+		/*</div><div class='add'>+		 * If we needed to expand the fs array we</div><div class='add'>+		 * might have blocked - try again.</div><div class='add'>+		 */</div><div class='add'>+		error = -EMFILE;</div><div class='add'>+		goto repeat;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	FD_SET(fd, fdt-&gt;open_fds);</div><div class='add'>+	if (flags &amp; O_CLOEXEC)</div><div class='add'>+		FD_SET(fd, fdt-&gt;close_on_exec);</div><div class='add'>+	else</div><div class='add'>+		FD_CLR(fd, fdt-&gt;close_on_exec);</div><div class='add'>+	files-&gt;next_fd = fd + 1;</div><div class='add'>+#if 1</div><div class='add'>+	/* Sanity check */</div><div class='add'>+	if (fdt-&gt;fd[fd] != NULL) {</div><div class='add'>+		printk(KERN_WARNING "get_unused_fd: slot %d not NULL!\n", fd);</div><div class='add'>+		fdt-&gt;fd[fd] = NULL;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	error = fd;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;files-&gt;file_lock);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * copied from fd_install</div><div class='add'>+ */</div><div class='add'>+static void task_fd_install(</div><div class='add'>+	struct binder_proc *proc, unsigned int fd, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct files_struct *files = proc-&gt;files;</div><div class='add'>+	struct fdtable *fdt;</div><div class='add'>+</div><div class='add'>+	if (files == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;files-&gt;file_lock);</div><div class='add'>+	fdt = files_fdtable(files);</div><div class='add'>+	BUG_ON(fdt-&gt;fd[fd] != NULL);</div><div class='add'>+	rcu_assign_pointer(fdt-&gt;fd[fd], file);</div><div class='add'>+	spin_unlock(&amp;files-&gt;file_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * copied from __put_unused_fd in open.c</div><div class='add'>+ */</div><div class='add'>+static void __put_unused_fd(struct files_struct *files, unsigned int fd)</div><div class='add'>+{</div><div class='add'>+	struct fdtable *fdt = files_fdtable(files);</div><div class='add'>+	__FD_CLR(fd, fdt-&gt;open_fds);</div><div class='add'>+	if (fd &lt; files-&gt;next_fd)</div><div class='add'>+		files-&gt;next_fd = fd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * copied from sys_close</div><div class='add'>+ */</div><div class='add'>+static long task_close_fd(struct binder_proc *proc, unsigned int fd)</div><div class='add'>+{</div><div class='add'>+	struct file *filp;</div><div class='add'>+	struct files_struct *files = proc-&gt;files;</div><div class='add'>+	struct fdtable *fdt;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (files == NULL)</div><div class='add'>+		return -ESRCH;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;files-&gt;file_lock);</div><div class='add'>+	fdt = files_fdtable(files);</div><div class='add'>+	if (fd &gt;= fdt-&gt;max_fds)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	filp = fdt-&gt;fd[fd];</div><div class='add'>+	if (!filp)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	rcu_assign_pointer(fdt-&gt;fd[fd], NULL);</div><div class='add'>+	FD_CLR(fd, fdt-&gt;close_on_exec);</div><div class='add'>+	__put_unused_fd(files, fd);</div><div class='add'>+	spin_unlock(&amp;files-&gt;file_lock);</div><div class='add'>+	retval = filp_close(filp, files);</div><div class='add'>+</div><div class='add'>+	/* can't restart close syscall because file table entry was cleared */</div><div class='add'>+	if (unlikely(retval == -ERESTARTSYS ||</div><div class='add'>+		     retval == -ERESTARTNOINTR ||</div><div class='add'>+		     retval == -ERESTARTNOHAND ||</div><div class='add'>+		     retval == -ERESTART_RESTARTBLOCK))</div><div class='add'>+		retval = -EINTR;</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	spin_unlock(&amp;files-&gt;file_lock);</div><div class='add'>+	return -EBADF;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void binder_set_nice(long nice)</div><div class='add'>+{</div><div class='add'>+	long min_nice;</div><div class='add'>+	if (can_nice(current, nice)) {</div><div class='add'>+		set_user_nice(current, nice);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	min_nice = 20 - current-&gt;signal-&gt;rlim[RLIMIT_NICE].rlim_cur;</div><div class='add'>+	binder_debug(BINDER_DEBUG_PRIORITY_CAP,</div><div class='add'>+		     "binder: %d: nice value %ld not allowed use "</div><div class='add'>+		     "%ld instead\n", current-&gt;pid, nice, min_nice);</div><div class='add'>+	set_user_nice(current, min_nice);</div><div class='add'>+	if (min_nice &lt; 20)</div><div class='add'>+		return;</div><div class='add'>+	binder_user_error("binder: %d RLIMIT_NICE not set\n", current-&gt;pid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t binder_buffer_size(struct binder_proc *proc,</div><div class='add'>+				 struct binder_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	if (list_is_last(&amp;buffer-&gt;entry, &amp;proc-&gt;buffers))</div><div class='add'>+		return proc-&gt;buffer + proc-&gt;buffer_size - (void *)buffer-&gt;data;</div><div class='add'>+	else</div><div class='add'>+		return (size_t)list_entry(buffer-&gt;entry.next,</div><div class='add'>+			struct binder_buffer, entry) - (size_t)buffer-&gt;data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void binder_insert_free_buffer(struct binder_proc *proc,</div><div class='add'>+				      struct binder_buffer *new_buffer)</div><div class='add'>+{</div><div class='add'>+	struct rb_node **p = &amp;proc-&gt;free_buffers.rb_node;</div><div class='add'>+	struct rb_node *parent = NULL;</div><div class='add'>+	struct binder_buffer *buffer;</div><div class='add'>+	size_t buffer_size;</div><div class='add'>+	size_t new_buffer_size;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!new_buffer-&gt;free);</div><div class='add'>+</div><div class='add'>+	new_buffer_size = binder_buffer_size(proc, new_buffer);</div><div class='add'>+</div><div class='add'>+	binder_debug(BINDER_DEBUG_BUFFER_ALLOC,</div><div class='add'>+		     "binder: %d: add free buffer, size %zd, "</div><div class='add'>+		     "at %p\n", proc-&gt;pid, new_buffer_size, new_buffer);</div><div class='add'>+</div><div class='add'>+	while (*p) {</div><div class='add'>+		parent = *p;</div><div class='add'>+		buffer = rb_entry(parent, struct binder_buffer, rb_node);</div><div class='add'>+		BUG_ON(!buffer-&gt;free);</div><div class='add'>+</div><div class='add'>+		buffer_size = binder_buffer_size(proc, buffer);</div><div class='add'>+</div><div class='add'>+		if (new_buffer_size &lt; buffer_size)</div><div class='add'>+			p = &amp;parent-&gt;rb_left;</div><div class='add'>+		else</div><div class='add'>+			p = &amp;parent-&gt;rb_right;</div><div class='add'>+	}</div><div class='add'>+	rb_link_node(&amp;new_buffer-&gt;rb_node, parent, p);</div><div class='add'>+	rb_insert_color(&amp;new_buffer-&gt;rb_node, &amp;proc-&gt;free_buffers);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void binder_insert_allocated_buffer(struct binder_proc *proc,</div><div class='add'>+					   struct binder_buffer *new_buffer)</div><div class='add'>+{</div><div class='add'>+	struct rb_node **p = &amp;proc-&gt;allocated_buffers.rb_node;</div><div class='add'>+	struct rb_node *parent = NULL;</div><div class='add'>+	struct binder_buffer *buffer;</div><div class='add'>+</div><div class='add'>+	BUG_ON(new_buffer-&gt;free);</div><div class='add'>+</div><div class='add'>+	while (*p) {</div><div class='add'>+		parent = *p;</div><div class='add'>+		buffer = rb_entry(parent, struct binder_buffer, rb_node);</div><div class='add'>+		BUG_ON(buffer-&gt;free);</div><div class='add'>+</div><div class='add'>+		if (new_buffer &lt; buffer)</div><div class='add'>+			p = &amp;parent-&gt;rb_left;</div><div class='add'>+		else if (new_buffer &gt; buffer)</div><div class='add'>+			p = &amp;parent-&gt;rb_right;</div><div class='add'>+		else</div><div class='add'>+			BUG();</div><div class='add'>+	}</div><div class='add'>+	rb_link_node(&amp;new_buffer-&gt;rb_node, parent, p);</div><div class='add'>+	rb_insert_color(&amp;new_buffer-&gt;rb_node, &amp;proc-&gt;allocated_buffers);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct binder_buffer *binder_buffer_lookup(struct binder_proc *proc,</div><div class='add'>+						  void __user *user_ptr)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *n = proc-&gt;allocated_buffers.rb_node;</div><div class='add'>+	struct binder_buffer *buffer;</div><div class='add'>+	struct binder_buffer *kern_ptr;</div><div class='add'>+</div><div class='add'>+	kern_ptr = user_ptr - proc-&gt;user_buffer_offset</div><div class='add'>+		- offsetof(struct binder_buffer, data);</div><div class='add'>+</div><div class='add'>+	while (n) {</div><div class='add'>+		buffer = rb_entry(n, struct binder_buffer, rb_node);</div><div class='add'>+		BUG_ON(buffer-&gt;free);</div><div class='add'>+</div><div class='add'>+		if (kern_ptr &lt; buffer)</div><div class='add'>+			n = n-&gt;rb_left;</div><div class='add'>+		else if (kern_ptr &gt; buffer)</div><div class='add'>+			n = n-&gt;rb_right;</div><div class='add'>+		else</div><div class='add'>+			return buffer;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int binder_update_page_range(struct binder_proc *proc, int allocate,</div><div class='add'>+				    void *start, void *end,</div><div class='add'>+				    struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	void *page_addr;</div><div class='add'>+	unsigned long user_page_addr;</div><div class='add'>+	struct vm_struct tmp_area;</div><div class='add'>+	struct page **page;</div><div class='add'>+	struct mm_struct *mm;</div><div class='add'>+</div><div class='add'>+	binder_debug(BINDER_DEBUG_BUFFER_ALLOC,</div><div class='add'>+		     "binder: %d: %s pages %p-%p\n", proc-&gt;pid,</div><div class='add'>+		     allocate ? "allocate" : "free", start, end);</div><div class='add'>+</div><div class='add'>+	if (end &lt;= start)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (vma)</div><div class='add'>+		mm = NULL;</div><div class='add'>+	else</div><div class='add'>+		mm = get_task_mm(proc-&gt;tsk);</div><div class='add'>+</div><div class='add'>+	if (mm) {</div><div class='add'>+		down_write(&amp;mm-&gt;mmap_sem);</div><div class='add'>+		vma = proc-&gt;vma;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (allocate == 0)</div><div class='add'>+		goto free_range;</div><div class='add'>+</div><div class='add'>+	if (vma == NULL) {</div><div class='add'>+		printk(KERN_ERR "binder: %d: binder_alloc_buf failed to "</div><div class='add'>+		       "map pages in userspace, no vma\n", proc-&gt;pid);</div><div class='add'>+		goto err_no_vma;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (page_addr = start; page_addr &lt; end; page_addr += PAGE_SIZE) {</div><div class='add'>+		int ret;</div><div class='add'>+		struct page **page_array_ptr;</div><div class='add'>+		page = &amp;proc-&gt;pages[(page_addr - proc-&gt;buffer) / PAGE_SIZE];</div><div class='add'>+</div><div class='add'>+		BUG_ON(*page);</div><div class='add'>+		*page = alloc_page(GFP_KERNEL | __GFP_ZERO);</div><div class='add'>+		if (*page == NULL) {</div><div class='add'>+			printk(KERN_ERR "binder: %d: binder_alloc_buf failed "</div><div class='add'>+			       "for page at %p\n", proc-&gt;pid, page_addr);</div><div class='add'>+			goto err_alloc_page_failed;</div><div class='add'>+		}</div><div class='add'>+		tmp_area.addr = page_addr;</div><div class='add'>+		tmp_area.size = PAGE_SIZE + PAGE_SIZE /* guard page? */;</div><div class='add'>+		page_array_ptr = page;</div><div class='add'>+		ret = map_vm_area(&amp;tmp_area, PAGE_KERNEL, &amp;page_array_ptr);</div><div class='add'>+		if (ret) {</div><div class='add'>+			printk(KERN_ERR "binder: %d: binder_alloc_buf failed "</div><div class='add'>+			       "to map page at %p in kernel\n",</div><div class='add'>+			       proc-&gt;pid, page_addr);</div><div class='add'>+			goto err_map_kernel_failed;</div><div class='add'>+		}</div><div class='add'>+		user_page_addr =</div><div class='add'>+			(uintptr_t)page_addr + proc-&gt;user_buffer_offset;</div><div class='add'>+		ret = vm_insert_page(vma, user_page_addr, page[0]);</div><div class='add'>+		if (ret) {</div><div class='add'>+			printk(KERN_ERR "binder: %d: binder_alloc_buf failed "</div><div class='add'>+			       "to map page at %lx in userspace\n",</div><div class='add'>+			       proc-&gt;pid, user_page_addr);</div><div class='add'>+			goto err_vm_insert_page_failed;</div><div class='add'>+		}</div><div class='add'>+		/* vm_insert_page does not seem to increment the refcount */</div><div class='add'>+	}</div><div class='add'>+	if (mm) {</div><div class='add'>+		up_write(&amp;mm-&gt;mmap_sem);</div><div class='add'>+		mmput(mm);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_range:</div><div class='add'>+	for (page_addr = end - PAGE_SIZE; page_addr &gt;= start;</div><div class='add'>+	     page_addr -= PAGE_SIZE) {</div><div class='add'>+		page = &amp;proc-&gt;pages[(page_addr - proc-&gt;buffer) / PAGE_SIZE];</div><div class='add'>+		if (vma)</div><div class='add'>+			zap_page_range(vma, (uintptr_t)page_addr +</div><div class='add'>+				proc-&gt;user_buffer_offset, PAGE_SIZE, NULL);</div><div class='add'>+err_vm_insert_page_failed:</div><div class='add'>+		unmap_kernel_range((unsigned long)page_addr, PAGE_SIZE);</div><div class='add'>+err_map_kernel_failed:</div><div class='add'>+		__free_page(*page);</div><div class='add'>+		*page = NULL;</div><div class='add'>+err_alloc_page_failed:</div><div class='add'>+		;</div><div class='add'>+	}</div><div class='add'>+err_no_vma:</div><div class='add'>+	if (mm) {</div><div class='add'>+		up_write(&amp;mm-&gt;mmap_sem);</div><div class='add'>+		mmput(mm);</div><div class='add'>+	}</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct binder_buffer *binder_alloc_buf(struct binder_proc *proc,</div><div class='add'>+					      size_t data_size,</div><div class='add'>+					      size_t offsets_size, int is_async)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *n = proc-&gt;free_buffers.rb_node;</div><div class='add'>+	struct binder_buffer *buffer;</div><div class='add'>+	size_t buffer_size;</div><div class='add'>+	struct rb_node *best_fit = NULL;</div><div class='add'>+	void *has_page_addr;</div><div class='add'>+	void *end_page_addr;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	if (proc-&gt;vma == NULL) {</div><div class='add'>+		printk(KERN_ERR "binder: %d: binder_alloc_buf, no vma\n",</div><div class='add'>+		       proc-&gt;pid);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	size = ALIGN(data_size, sizeof(void *)) +</div><div class='add'>+		ALIGN(offsets_size, sizeof(void *));</div><div class='add'>+</div><div class='add'>+	if (size &lt; data_size || size &lt; offsets_size) {</div><div class='add'>+		binder_user_error("binder: %d: got transaction with invalid "</div><div class='add'>+			"size %zd-%zd\n", proc-&gt;pid, data_size, offsets_size);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_async &amp;&amp;</div><div class='add'>+	    proc-&gt;free_async_space &lt; size + sizeof(struct binder_buffer)) {</div><div class='add'>+		binder_debug(BINDER_DEBUG_BUFFER_ALLOC,</div><div class='add'>+			     "binder: %d: binder_alloc_buf size %zd"</div><div class='add'>+			     "failed, no async space left\n", proc-&gt;pid, size);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (n) {</div><div class='add'>+		buffer = rb_entry(n, struct binder_buffer, rb_node);</div><div class='add'>+		BUG_ON(!buffer-&gt;free);</div><div class='add'>+		buffer_size = binder_buffer_size(proc, buffer);</div><div class='add'>+</div><div class='add'>+		if (size &lt; buffer_size) {</div><div class='add'>+			best_fit = n;</div><div class='add'>+			n = n-&gt;rb_left;</div><div class='add'>+		} else if (size &gt; buffer_size)</div><div class='add'>+			n = n-&gt;rb_right;</div><div class='add'>+		else {</div><div class='add'>+			best_fit = n;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (best_fit == NULL) {</div><div class='add'>+		printk(KERN_ERR "binder: %d: binder_alloc_buf size %zd failed, "</div><div class='add'>+		       "no address space\n", proc-&gt;pid, size);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	if (n == NULL) {</div><div class='add'>+		buffer = rb_entry(best_fit, struct binder_buffer, rb_node);</div><div class='add'>+		buffer_size = binder_buffer_size(proc, buffer);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	binder_debug(BINDER_DEBUG_BUFFER_ALLOC,</div><div class='add'>+		     "binder: %d: binder_alloc_buf size %zd got buff"</div><div class='add'>+		     "er %p size %zd\n", proc-&gt;pid, size, buffer, buffer_size);</div><div class='add'>+</div><div class='add'>+	has_page_addr =</div><div class='add'>+		(void *)(((uintptr_t)buffer-&gt;data + buffer_size) &amp; PAGE_MASK);</div><div class='add'>+	if (n == NULL) {</div><div class='add'>+		if (size + sizeof(struct binder_buffer) + 4 &gt;= buffer_size)</div><div class='add'>+			buffer_size = size; /* no room for other buffers */</div><div class='add'>+		else</div><div class='add'>+			buffer_size = size + sizeof(struct binder_buffer);</div><div class='add'>+	}</div><div class='add'>+	end_page_addr =</div><div class='add'>+		(void *)PAGE_ALIGN((uintptr_t)buffer-&gt;data + buffer_size);</div><div class='add'>+	if (end_page_addr &gt; has_page_addr)</div><div class='add'>+		end_page_addr = has_page_addr;</div><div class='add'>+	if (binder_update_page_range(proc, 1,</div><div class='add'>+	    (void *)PAGE_ALIGN((uintptr_t)buffer-&gt;data), end_page_addr, NULL))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	rb_erase(best_fit, &amp;proc-&gt;free_buffers);</div><div class='add'>+	buffer-&gt;free = 0;</div><div class='add'>+	binder_insert_allocated_buffer(proc, buffer);</div><div class='add'>+	if (buffer_size != size) {</div><div class='add'>+		struct binder_buffer *new_buffer = (void *)buffer-&gt;data + size;</div><div class='add'>+		list_add(&amp;new_buffer-&gt;entry, &amp;buffer-&gt;entry);</div><div class='add'>+		new_buffer-&gt;free = 1;</div><div class='add'>+		binder_insert_free_buffer(proc, new_buffer);</div><div class='add'>+	}</div><div class='add'>+	binder_debug(BINDER_DEBUG_BUFFER_ALLOC,</div><div class='add'>+		     "binder: %d: binder_alloc_buf size %zd got "</div><div class='add'>+		     "%p\n", proc-&gt;pid, size, buffer);</div><div class='add'>+	buffer-&gt;data_size = data_size;</div><div class='add'>+	buffer-&gt;offsets_size = offsets_size;</div><div class='add'>+	buffer-&gt;async_transaction = is_async;</div><div class='add'>+	if (is_async) {</div><div class='add'>+		proc-&gt;free_async_space -= size + sizeof(struct binder_buffer);</div><div class='add'>+		binder_debug(BINDER_DEBUG_BUFFER_ALLOC_ASYNC,</div><div class='add'>+			     "binder: %d: binder_alloc_buf size %zd "</div><div class='add'>+			     "async free %zd\n", proc-&gt;pid, size,</div><div class='add'>+			     proc-&gt;free_async_space);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return buffer;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *buffer_start_page(struct binder_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	return (void *)((uintptr_t)buffer &amp; PAGE_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *buffer_end_page(struct binder_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	return (void *)(((uintptr_t)(buffer + 1) - 1) &amp; PAGE_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void binder_delete_free_buffer(struct binder_proc *proc,</div><div class='add'>+				      struct binder_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct binder_buffer *prev, *next = NULL;</div><div class='add'>+	int free_page_end = 1;</div><div class='add'>+	int free_page_start = 1;</div><div class='add'>+</div><div class='add'>+	BUG_ON(proc-&gt;buffers.next == &amp;buffer-&gt;entry);</div><div class='add'>+	prev = list_entry(buffer-&gt;entry.prev, struct binder_buffer, entry);</div><div class='add'>+	BUG_ON(!prev-&gt;free);</div><div class='add'>+	if (buffer_end_page(prev) == buffer_start_page(buffer)) {</div><div class='add'>+		free_page_start = 0;</div><div class='add'>+		if (buffer_end_page(prev) == buffer_end_page(buffer))</div><div class='add'>+			free_page_end = 0;</div><div class='add'>+		binder_debug(BINDER_DEBUG_BUFFER_ALLOC,</div><div class='add'>+			     "binder: %d: merge free, buffer %p "</div><div class='add'>+			     "share page with %p\n", proc-&gt;pid, buffer, prev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!list_is_last(&amp;buffer-&gt;entry, &amp;proc-&gt;buffers)) {</div><div class='add'>+		next = list_entry(buffer-&gt;entry.next,</div><div class='add'>+				  struct binder_buffer, entry);</div><div class='add'>+		if (buffer_start_page(next) == buffer_end_page(buffer)) {</div><div class='add'>+			free_page_end = 0;</div><div class='add'>+			if (buffer_start_page(next) ==</div><div class='add'>+			    buffer_start_page(buffer))</div><div class='add'>+				free_page_start = 0;</div><div class='add'>+			binder_debug(BINDER_DEBUG_BUFFER_ALLOC,</div><div class='add'>+				     "binder: %d: merge free, buffer"</div><div class='add'>+				     " %p share page with %p\n", proc-&gt;pid,</div><div class='add'>+				     buffer, prev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	list_del(&amp;buffer-&gt;entry);</div><div class='add'>+	if (free_page_start || free_page_end) {</div><div class='add'>+		binder_debug(BINDER_DEBUG_BUFFER_ALLOC,</div><div class='add'>+			     "binder: %d: merge free, buffer %p do "</div><div class='add'>+			     "not share page%s%s with with %p or %p\n",</div><div class='add'>+			     proc-&gt;pid, buffer, free_page_start ? "" : " end",</div><div class='add'>+			     free_page_end ? "" : " start", prev, next);</div><div class='add'>+		binder_update_page_range(proc, 0, free_page_start ?</div><div class='add'>+			buffer_start_page(buffer) : buffer_end_page(buffer),</div><div class='add'>+			(free_page_end ? buffer_end_page(buffer) :</div><div class='add'>+			buffer_start_page(buffer)) + PAGE_SIZE, NULL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void binder_free_buf(struct binder_proc *proc,</div><div class='add'>+			    struct binder_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	size_t size, buffer_size;</div><div class='add'>+</div><div class='add'>+	buffer_size = binder_buffer_size(proc, buffer);</div><div class='add'>+</div><div class='add'>+	size = ALIGN(buffer-&gt;data_size, sizeof(void *)) +</div><div class='add'>+		ALIGN(buffer-&gt;offsets_size, sizeof(void *));</div><div class='add'>+</div><div class='add'>+	binder_debug(BINDER_DEBUG_BUFFER_ALLOC,</div><div class='add'>+		     "binder: %d: binder_free_buf %p size %zd buffer"</div><div class='add'>+		     "_size %zd\n", proc-&gt;pid, buffer, size, buffer_size);</div><div class='add'>+</div><div class='add'>+	BUG_ON(buffer-&gt;free);</div><div class='add'>+	BUG_ON(size &gt; buffer_size);</div><div class='add'>+	BUG_ON(buffer-&gt;transaction != NULL);</div><div class='add'>+	BUG_ON((void *)buffer &lt; proc-&gt;buffer);</div><div class='add'>+	BUG_ON((void *)buffer &gt; proc-&gt;buffer + proc-&gt;buffer_size);</div><div class='add'>+</div><div class='add'>+	if (buffer-&gt;async_transaction) {</div><div class='add'>+		proc-&gt;free_async_space += size + sizeof(struct binder_buffer);</div><div class='add'>+</div><div class='add'>+		binder_debug(BINDER_DEBUG_BUFFER_ALLOC_ASYNC,</div><div class='add'>+			     "binder: %d: binder_free_buf size %zd "</div><div class='add'>+			     "async free %zd\n", proc-&gt;pid, size,</div><div class='add'>+			     proc-&gt;free_async_space);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	binder_update_page_range(proc, 0,</div><div class='add'>+		(void *)PAGE_ALIGN((uintptr_t)buffer-&gt;data),</div><div class='add'>+		(void *)(((uintptr_t)buffer-&gt;data + buffer_size) &amp; PAGE_MASK),</div><div class='add'>+		NULL);</div><div class='add'>+	rb_erase(&amp;buffer-&gt;rb_node, &amp;proc-&gt;allocated_buffers);</div><div class='add'>+	buffer-&gt;free = 1;</div><div class='add'>+	if (!list_is_last(&amp;buffer-&gt;entry, &amp;proc-&gt;buffers)) {</div><div class='add'>+		struct binder_buffer *next = list_entry(buffer-&gt;entry.next,</div><div class='add'>+						struct binder_buffer, entry);</div><div class='add'>+		if (next-&gt;free) {</div><div class='add'>+			rb_erase(&amp;next-&gt;rb_node, &amp;proc-&gt;free_buffers);</div><div class='add'>+			binder_delete_free_buffer(proc, next);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (proc-&gt;buffers.next != &amp;buffer-&gt;entry) {</div><div class='add'>+		struct binder_buffer *prev = list_entry(buffer-&gt;entry.prev,</div><div class='add'>+						struct binder_buffer, entry);</div><div class='add'>+		if (prev-&gt;free) {</div><div class='add'>+			binder_delete_free_buffer(proc, buffer);</div><div class='add'>+			rb_erase(&amp;prev-&gt;rb_node, &amp;proc-&gt;free_buffers);</div><div class='add'>+			buffer = prev;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	binder_insert_free_buffer(proc, buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct binder_node *binder_get_node(struct binder_proc *proc,</div><div class='add'>+					   void __user *ptr)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *n = proc-&gt;nodes.rb_node;</div><div class='add'>+	struct binder_node *node;</div><div class='add'>+</div><div class='add'>+	while (n) {</div><div class='add'>+		node = rb_entry(n, struct binder_node, rb_node);</div><div class='add'>+</div><div class='add'>+		if (ptr &lt; node-&gt;ptr)</div><div class='add'>+			n = n-&gt;rb_left;</div><div class='add'>+		else if (ptr &gt; node-&gt;ptr)</div><div class='add'>+			n = n-&gt;rb_right;</div><div class='add'>+		else</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'>+static struct binder_node *binder_new_node(struct binder_proc *proc,</div><div class='add'>+					   void __user *ptr,</div><div class='add'>+					   void __user *cookie)</div><div class='add'>+{</div><div class='add'>+	struct rb_node **p = &amp;proc-&gt;nodes.rb_node;</div><div class='add'>+	struct rb_node *parent = NULL;</div><div class='add'>+	struct binder_node *node;</div><div class='add'>+</div><div class='add'>+	while (*p) {</div><div class='add'>+		parent = *p;</div><div class='add'>+		node = rb_entry(parent, struct binder_node, rb_node);</div><div class='add'>+</div><div class='add'>+		if (ptr &lt; node-&gt;ptr)</div><div class='add'>+			p = &amp;(*p)-&gt;rb_left;</div><div class='add'>+		else if (ptr &gt; node-&gt;ptr)</div><div class='add'>+			p = &amp;(*p)-&gt;rb_right;</div><div class='add'>+		else</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node = kzalloc(sizeof(*node), GFP_KERNEL);</div><div class='add'>+	if (node == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+	binder_stats_created(BINDER_STAT_NODE);</div><div class='add'>+	rb_link_node(&amp;node-&gt;rb_node, parent, p);</div><div class='add'>+	rb_insert_color(&amp;node-&gt;rb_node, &amp;proc-&gt;nodes);</div><div class='add'>+	node-&gt;debug_id = ++binder_last_id;</div><div class='add'>+	node-&gt;proc = proc;</div><div class='add'>+	node-&gt;ptr = ptr;</div><div class='add'>+	node-&gt;cookie = cookie;</div><div class='add'>+	node-&gt;work.type = BINDER_WORK_NODE;</div><div class='add'>+	INIT_LIST_HEAD(&amp;node-&gt;work.entry);</div><div class='add'>+	INIT_LIST_HEAD(&amp;node-&gt;async_todo);</div><div class='add'>+	binder_debug(BINDER_DEBUG_INTERNAL_REFS,</div><div class='add'>+		     "binder: %d:%d node %d u%p c%p created\n",</div><div class='add'>+		     proc-&gt;pid, current-&gt;pid, node-&gt;debug_id,</div><div class='add'>+		     node-&gt;ptr, node-&gt;cookie);</div><div class='add'>+	return node;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int binder_inc_node(struct binder_node *node, int strong, int internal,</div><div class='add'>+			   struct list_head *target_list)</div><div class='add'>+{</div><div class='add'>+	if (strong) {</div><div class='add'>+		if (internal) {</div><div class='add'>+			if (target_list == NULL &amp;&amp;</div><div class='add'>+			    node-&gt;internal_strong_refs == 0 &amp;&amp;</div><div class='add'>+			    !(node == binder_context_mgr_node &amp;&amp;</div><div class='add'>+			    node-&gt;has_strong_ref)) {</div><div class='add'>+				printk(KERN_ERR "binder: invalid inc strong "</div><div class='add'>+					"node for %d\n", node-&gt;debug_id);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			node-&gt;internal_strong_refs++;</div><div class='add'>+		} else</div><div class='add'>+			node-&gt;local_strong_refs++;</div><div class='add'>+		if (!node-&gt;has_strong_ref &amp;&amp; target_list) {</div><div class='add'>+			list_del_init(&amp;node-&gt;work.entry);</div><div class='add'>+			list_add_tail(&amp;node-&gt;work.entry, target_list);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (!internal)</div><div class='add'>+			node-&gt;local_weak_refs++;</div><div class='add'>+		if (!node-&gt;has_weak_ref &amp;&amp; list_empty(&amp;node-&gt;work.entry)) {</div><div class='add'>+			if (target_list == NULL) {</div><div class='add'>+				printk(KERN_ERR "binder: invalid inc weak node "</div><div class='add'>+					"for %d\n", node-&gt;debug_id);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			list_add_tail(&amp;node-&gt;work.entry, target_list);</div><div 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 binder_dec_node(struct binder_node *node, int strong, int internal)</div><div class='add'>+{</div><div class='add'>+	if (strong) {</div><div class='add'>+		if (internal)</div><div class='add'>+			node-&gt;internal_strong_refs--;</div><div class='add'>+		else</div><div class='add'>+			node-&gt;local_strong_refs--;</div><div class='add'>+		if (node-&gt;local_strong_refs || node-&gt;internal_strong_refs)</div><div class='add'>+			return 0;</div><div class='add'>+	} else {</div><div class='add'>+		if (!internal)</div><div class='add'>+			node-&gt;local_weak_refs--;</div><div class='add'>+		if (node-&gt;local_weak_refs || !hlist_empty(&amp;node-&gt;refs))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	if (node-&gt;proc &amp;&amp; (node-&gt;has_strong_ref || node-&gt;has_weak_ref)) {</div><div class='add'>+		if (list_empty(&amp;node-&gt;work.entry)) {</div><div class='add'>+			list_add_tail(&amp;node-&gt;work.entry, &amp;node-&gt;proc-&gt;todo);</div><div class='add'>+			wake_up_interruptible(&amp;node-&gt;proc-&gt;wait);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (hlist_empty(&amp;node-&gt;refs) &amp;&amp; !node-&gt;local_strong_refs &amp;&amp;</div><div class='add'>+		    !node-&gt;local_weak_refs) {</div><div class='add'>+			list_del_init(&amp;node-&gt;work.entry);</div><div class='add'>+			if (node-&gt;proc) {</div><div class='add'>+				rb_erase(&amp;node-&gt;rb_node, &amp;node-&gt;proc-&gt;nodes);</div><div class='add'>+				binder_debug(BINDER_DEBUG_INTERNAL_REFS,</div><div class='add'>+					     "binder: refless node %d deleted\n",</div><div class='add'>+					     node-&gt;debug_id);</div><div class='add'>+			} else {</div><div class='add'>+				hlist_del(&amp;node-&gt;dead_node);</div><div class='add'>+				binder_debug(BINDER_DEBUG_INTERNAL_REFS,</div><div class='add'>+					     "binder: dead node %d deleted\n",</div><div class='add'>+					     node-&gt;debug_id);</div><div class='add'>+			}</div><div class='add'>+			kfree(node);</div><div class='add'>+			binder_stats_deleted(BINDER_STAT_NODE);</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'>+static struct binder_ref *binder_get_ref(struct binder_proc *proc,</div><div class='add'>+					 uint32_t desc)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *n = proc-&gt;refs_by_desc.rb_node;</div><div class='add'>+	struct binder_ref *ref;</div><div class='add'>+</div><div class='add'>+	while (n) {</div><div class='add'>+		ref = rb_entry(n, struct binder_ref, rb_node_desc);</div><div class='add'>+</div><div class='add'>+		if (desc &lt; ref-&gt;desc)</div><div class='add'>+			n = n-&gt;rb_left;</div><div class='add'>+		else if (desc &gt; ref-&gt;desc)</div><div class='add'>+			n = n-&gt;rb_right;</div><div class='add'>+		else</div><div class='add'>+			return ref;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct binder_ref *binder_get_ref_for_node(struct binder_proc *proc,</div><div class='add'>+						  struct binder_node *node)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *n;</div><div class='add'>+	struct rb_node **p = &amp;proc-&gt;refs_by_node.rb_node;</div><div class='add'>+	struct rb_node *parent = NULL;</div><div class='add'>+	struct binder_ref *ref, *new_ref;</div><div class='add'>+</div><div class='add'>+	while (*p) {</div><div class='add'>+		parent = *p;</div><div class='add'>+		ref = rb_entry(parent, struct binder_ref, rb_node_node);</div><div class='add'>+</div><div class='add'>+		if (node &lt; ref-&gt;node)</div><div class='add'>+			p = &amp;(*p)-&gt;rb_left;</div><div class='add'>+		else if (node &gt; ref-&gt;node)</div><div class='add'>+			p = &amp;(*p)-&gt;rb_right;</div><div class='add'>+		else</div><div class='add'>+			return ref;</div><div class='add'>+	}</div><div class='add'>+	new_ref = kzalloc(sizeof(*ref), GFP_KERNEL);</div><div class='add'>+	if (new_ref == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+	binder_stats_created(BINDER_STAT_REF);</div><div class='add'>+	new_ref-&gt;debug_id = ++binder_last_id;</div><div class='add'>+	new_ref-&gt;proc = proc;</div><div class='add'>+	new_ref-&gt;node = node;</div><div class='add'>+	rb_link_node(&amp;new_ref-&gt;rb_node_node, parent, p);</div><div class='add'>+	rb_insert_color(&amp;new_ref-&gt;rb_node_node, &amp;proc-&gt;refs_by_node);</div><div class='add'>+</div><div class='add'>+	new_ref-&gt;desc = (node == binder_context_mgr_node) ? 0 : 1;</div><div class='add'>+	for (n = rb_first(&amp;proc-&gt;refs_by_desc); n != NULL; n = rb_next(n)) {</div><div class='add'>+		ref = rb_entry(n, struct binder_ref, rb_node_desc);</div><div class='add'>+		if (ref-&gt;desc &gt; new_ref-&gt;desc)</div><div class='add'>+			break;</div><div class='add'>+		new_ref-&gt;desc = ref-&gt;desc + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p = &amp;proc-&gt;refs_by_desc.rb_node;</div><div class='add'>+	while (*p) {</div><div class='add'>+		parent = *p;</div><div class='add'>+		ref = rb_entry(parent, struct binder_ref, rb_node_desc);</div><div class='add'>+</div><div class='add'>+		if (new_ref-&gt;desc &lt; ref-&gt;desc)</div><div class='add'>+			p = &amp;(*p)-&gt;rb_left;</div><div class='add'>+		else if (new_ref-&gt;desc &gt; ref-&gt;desc)</div><div class='add'>+			p = &amp;(*p)-&gt;rb_right;</div><div class='add'>+		else</div><div class='add'>+			BUG();</div><div class='add'>+	}</div><div class='add'>+	rb_link_node(&amp;new_ref-&gt;rb_node_desc, parent, p);</div><div class='add'>+	rb_insert_color(&amp;new_ref-&gt;rb_node_desc, &amp;proc-&gt;refs_by_desc);</div><div class='add'>+	if (node) {</div><div class='add'>+		hlist_add_head(&amp;new_ref-&gt;node_entry, &amp;node-&gt;refs);</div><div class='add'>+</div><div class='add'>+		binder_debug(BINDER_DEBUG_INTERNAL_REFS,</div><div class='add'>+			     "binder: %d new ref %d desc %d for "</div><div class='add'>+			     "node %d\n", proc-&gt;pid, new_ref-&gt;debug_id,</div><div class='add'>+			     new_ref-&gt;desc, node-&gt;debug_id);</div><div class='add'>+	} else {</div><div class='add'>+		binder_debug(BINDER_DEBUG_INTERNAL_REFS,</div><div class='add'>+			     "binder: %d new ref %d desc %d for "</div><div class='add'>+			     "dead node\n", proc-&gt;pid, new_ref-&gt;debug_id,</div><div class='add'>+			      new_ref-&gt;desc);</div><div class='add'>+	}</div><div class='add'>+	return new_ref;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void binder_delete_ref(struct binder_ref *ref)</div><div class='add'>+{</div><div class='add'>+	binder_debug(BINDER_DEBUG_INTERNAL_REFS,</div><div class='add'>+		     "binder: %d delete ref %d desc %d for "</div><div class='add'>+		     "node %d\n", ref-&gt;proc-&gt;pid, ref-&gt;debug_id,</div><div class='add'>+		     ref-&gt;desc, ref-&gt;node-&gt;debug_id);</div><div class='add'>+</div><div class='add'>+	rb_erase(&amp;ref-&gt;rb_node_desc, &amp;ref-&gt;proc-&gt;refs_by_desc);</div><div class='add'>+	rb_erase(&amp;ref-&gt;rb_node_node, &amp;ref-&gt;proc-&gt;refs_by_node);</div><div class='add'>+	if (ref-&gt;strong)</div><div class='add'>+		binder_dec_node(ref-&gt;node, 1, 1);</div><div class='add'>+	hlist_del(&amp;ref-&gt;node_entry);</div><div class='add'>+	binder_dec_node(ref-&gt;node, 0, 1);</div><div class='add'>+	if (ref-&gt;death) {</div><div class='add'>+		binder_debug(BINDER_DEBUG_DEAD_BINDER,</div><div class='add'>+			     "binder: %d delete ref %d desc %d "</div><div class='add'>+			     "has death notification\n", ref-&gt;proc-&gt;pid,</div><div class='add'>+			     ref-&gt;debug_id, ref-&gt;desc);</div><div class='add'>+		list_del(&amp;ref-&gt;death-&gt;work.entry);</div><div class='add'>+		kfree(ref-&gt;death);</div><div class='add'>+		binder_stats_deleted(BINDER_STAT_DEATH);</div><div class='add'>+	}</div><div class='add'>+	kfree(ref);</div><div class='add'>+	binder_stats_deleted(BINDER_STAT_REF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int binder_inc_ref(struct binder_ref *ref, int strong,</div><div class='add'>+			  struct list_head *target_list)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	if (strong) {</div><div class='add'>+		if (ref-&gt;strong == 0) {</div><div class='add'>+			ret = binder_inc_node(ref-&gt;node, 1, 1, target_list);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+		ref-&gt;strong++;</div><div class='add'>+	} else {</div><div class='add'>+		if (ref-&gt;weak == 0) {</div><div class='add'>+			ret = binder_inc_node(ref-&gt;node, 0, 1, target_list);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+		ref-&gt;weak++;</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 binder_dec_ref(struct binder_ref *ref, int strong)</div><div class='add'>+{</div><div class='add'>+	if (strong) {</div><div class='add'>+		if (ref-&gt;strong == 0) {</div><div class='add'>+			binder_user_error("binder: %d invalid dec strong, "</div><div class='add'>+					  "ref %d desc %d s %d w %d\n",</div><div class='add'>+					  ref-&gt;proc-&gt;pid, ref-&gt;debug_id,</div><div class='add'>+					  ref-&gt;desc, ref-&gt;strong, ref-&gt;weak);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		ref-&gt;strong--;</div><div class='add'>+		if (ref-&gt;strong == 0) {</div><div class='add'>+			int ret;</div><div class='add'>+			ret = binder_dec_node(ref-&gt;node, strong, 1);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (ref-&gt;weak == 0) {</div><div class='add'>+			binder_user_error("binder: %d invalid dec weak, "</div><div class='add'>+					  "ref %d desc %d s %d w %d\n",</div><div class='add'>+					  ref-&gt;proc-&gt;pid, ref-&gt;debug_id,</div><div class='add'>+					  ref-&gt;desc, ref-&gt;strong, ref-&gt;weak);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		ref-&gt;weak--;</div><div class='add'>+	}</div><div class='add'>+	if (ref-&gt;strong == 0 &amp;&amp; ref-&gt;weak == 0)</div><div class='add'>+		binder_delete_ref(ref);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void binder_pop_transaction(struct binder_thread *target_thread,</div><div class='add'>+				   struct binder_transaction *t)</div><div class='add'>+{</div><div class='add'>+	if (target_thread) {</div><div class='add'>+		BUG_ON(target_thread-&gt;transaction_stack != t);</div><div class='add'>+		BUG_ON(target_thread-&gt;transaction_stack-&gt;from != target_thread);</div><div class='add'>+		target_thread-&gt;transaction_stack =</div><div class='add'>+			target_thread-&gt;transaction_stack-&gt;from_parent;</div><div class='add'>+		t-&gt;from = NULL;</div><div class='add'>+	}</div><div class='add'>+	t-&gt;need_reply = 0;</div><div class='add'>+	if (t-&gt;buffer)</div><div class='add'>+		t-&gt;buffer-&gt;transaction = NULL;</div><div class='add'>+	kfree(t);</div><div class='add'>+	binder_stats_deleted(BINDER_STAT_TRANSACTION);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void binder_send_failed_reply(struct binder_transaction *t,</div><div class='add'>+				     uint32_t error_code)</div><div class='add'>+{</div><div class='add'>+	struct binder_thread *target_thread;</div><div class='add'>+	BUG_ON(t-&gt;flags &amp; TF_ONE_WAY);</div><div class='add'>+	while (1) {</div><div class='add'>+		target_thread = t-&gt;from;</div><div class='add'>+		if (target_thread) {</div><div class='add'>+			if (target_thread-&gt;return_error != BR_OK &amp;&amp;</div><div class='add'>+			   target_thread-&gt;return_error2 == BR_OK) {</div><div class='add'>+				target_thread-&gt;return_error2 =</div><div class='add'>+					target_thread-&gt;return_error;</div><div class='add'>+				target_thread-&gt;return_error = BR_OK;</div><div class='add'>+			}</div><div class='add'>+			if (target_thread-&gt;return_error == BR_OK) {</div><div class='add'>+				binder_debug(BINDER_DEBUG_FAILED_TRANSACTION,</div><div class='add'>+					     "binder: send failed reply for "</div><div class='add'>+					     "transaction %d to %d:%d\n",</div><div class='add'>+					      t-&gt;debug_id, target_thread-&gt;proc-&gt;pid,</div><div class='add'>+					      target_thread-&gt;pid);</div><div class='add'>+</div><div class='add'>+				binder_pop_transaction(target_thread, t);</div><div class='add'>+				target_thread-&gt;return_error = error_code;</div><div class='add'>+				wake_up_interruptible(&amp;target_thread-&gt;wait);</div><div class='add'>+			} else {</div><div class='add'>+				printk(KERN_ERR "binder: reply failed, target "</div><div class='add'>+					"thread, %d:%d, has error code %d "</div><div class='add'>+					"already\n", target_thread-&gt;proc-&gt;pid,</div><div class='add'>+					target_thread-&gt;pid,</div><div class='add'>+					target_thread-&gt;return_error);</div><div class='add'>+			}</div><div class='add'>+			return;</div><div class='add'>+		} else {</div><div class='add'>+			struct binder_transaction *next = t-&gt;from_parent;</div><div class='add'>+</div><div class='add'>+			binder_debug(BINDER_DEBUG_FAILED_TRANSACTION,</div><div class='add'>+				     "binder: send failed reply "</div><div class='add'>+				     "for transaction %d, target dead\n",</div><div class='add'>+				     t-&gt;debug_id);</div><div class='add'>+</div><div class='add'>+			binder_pop_transaction(target_thread, t);</div><div class='add'>+			if (next == NULL) {</div><div class='add'>+				binder_debug(BINDER_DEBUG_DEAD_BINDER,</div><div class='add'>+					     "binder: reply failed,"</div><div class='add'>+					     " no target thread at root\n");</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+			t = next;</div><div class='add'>+			binder_debug(BINDER_DEBUG_DEAD_BINDER,</div><div class='add'>+				     "binder: reply failed, no target "</div><div class='add'>+				     "thread -- retry %d\n", t-&gt;debug_id);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void binder_transaction_buffer_release(struct binder_proc *proc,</div><div class='add'>+					      struct binder_buffer *buffer,</div><div class='add'>+					      size_t *failed_at)</div><div class='add'>+{</div><div class='add'>+	size_t *offp, *off_end;</div><div class='add'>+	int debug_id = buffer-&gt;debug_id;</div><div class='add'>+</div><div class='add'>+	binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='add'>+		     "binder: %d buffer release %d, size %zd-%zd, failed at %p\n",</div><div class='add'>+		     proc-&gt;pid, buffer-&gt;debug_id,</div><div class='add'>+		     buffer-&gt;data_size, buffer-&gt;offsets_size, failed_at);</div><div class='add'>+</div><div class='add'>+	if (buffer-&gt;target_node)</div><div class='add'>+		binder_dec_node(buffer-&gt;target_node, 1, 0);</div><div class='add'>+</div><div class='add'>+	offp = (size_t *)(buffer-&gt;data + ALIGN(buffer-&gt;data_size, sizeof(void *)));</div><div class='add'>+	if (failed_at)</div><div class='add'>+		off_end = failed_at;</div><div class='add'>+	else</div><div class='add'>+		off_end = (void *)offp + buffer-&gt;offsets_size;</div><div class='add'>+	for (; offp &lt; off_end; offp++) {</div><div class='add'>+		struct flat_binder_object *fp;</div><div class='add'>+		if (*offp &gt; buffer-&gt;data_size - sizeof(*fp) ||</div><div class='add'>+		    buffer-&gt;data_size &lt; sizeof(*fp) ||</div><div class='add'>+		    !IS_ALIGNED(*offp, sizeof(void *))) {</div><div class='add'>+			printk(KERN_ERR "binder: transaction release %d bad"</div><div class='add'>+					"offset %zd, size %zd\n", debug_id,</div><div class='add'>+					*offp, buffer-&gt;data_size);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		fp = (struct flat_binder_object *)(buffer-&gt;data + *offp);</div><div class='add'>+		switch (fp-&gt;type) {</div><div class='add'>+		case BINDER_TYPE_BINDER:</div><div class='add'>+		case BINDER_TYPE_WEAK_BINDER: {</div><div class='add'>+			struct binder_node *node = binder_get_node(proc, fp-&gt;binder);</div><div class='add'>+			if (node == NULL) {</div><div class='add'>+				printk(KERN_ERR "binder: transaction release %d"</div><div class='add'>+				       " bad node %p\n", debug_id, fp-&gt;binder);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='add'>+				     "        node %d u%p\n",</div><div class='add'>+				     node-&gt;debug_id, node-&gt;ptr);</div><div class='add'>+			binder_dec_node(node, fp-&gt;type == BINDER_TYPE_BINDER, 0);</div><div class='add'>+		} break;</div><div class='add'>+		case BINDER_TYPE_HANDLE:</div><div class='add'>+		case BINDER_TYPE_WEAK_HANDLE: {</div><div class='add'>+			struct binder_ref *ref = binder_get_ref(proc, fp-&gt;handle);</div><div class='add'>+			if (ref == NULL) {</div><div class='add'>+				printk(KERN_ERR "binder: transaction release %d"</div><div class='add'>+				       " bad handle %ld\n", debug_id,</div><div class='add'>+				       fp-&gt;handle);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='add'>+				     "        ref %d desc %d (node %d)\n",</div><div class='add'>+				     ref-&gt;debug_id, ref-&gt;desc, ref-&gt;node-&gt;debug_id);</div><div class='add'>+			binder_dec_ref(ref, fp-&gt;type == BINDER_TYPE_HANDLE);</div><div class='add'>+		} break;</div><div class='add'>+</div><div class='add'>+		case BINDER_TYPE_FD:</div><div class='add'>+			binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='add'>+				     "        fd %ld\n", fp-&gt;handle);</div><div class='add'>+			if (failed_at)</div><div class='add'>+				task_close_fd(proc, fp-&gt;handle);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			printk(KERN_ERR "binder: transaction release %d bad "</div><div class='add'>+			       "object type %lx\n", debug_id, fp-&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'>+static void binder_transaction(struct binder_proc *proc,</div><div class='add'>+			       struct binder_thread *thread,</div><div class='add'>+			       struct binder_transaction_data *tr, int reply)</div><div class='add'>+{</div><div class='add'>+	struct binder_transaction *t;</div><div class='add'>+	struct binder_work *tcomplete;</div><div class='add'>+	size_t *offp, *off_end;</div><div class='add'>+	struct binder_proc *target_proc;</div><div class='add'>+	struct binder_thread *target_thread = NULL;</div><div class='add'>+	struct binder_node *target_node = NULL;</div><div class='add'>+	struct list_head *target_list;</div><div class='add'>+	wait_queue_head_t *target_wait;</div><div class='add'>+	struct binder_transaction *in_reply_to = NULL;</div><div class='add'>+	struct binder_transaction_log_entry *e;</div><div class='add'>+	uint32_t return_error;</div><div class='add'>+</div><div class='add'>+	e = binder_transaction_log_add(&amp;binder_transaction_log);</div><div class='add'>+	e-&gt;call_type = reply ? 2 : !!(tr-&gt;flags &amp; TF_ONE_WAY);</div><div class='add'>+	e-&gt;from_proc = proc-&gt;pid;</div><div class='add'>+	e-&gt;from_thread = thread-&gt;pid;</div><div class='add'>+	e-&gt;target_handle = tr-&gt;target.handle;</div><div class='add'>+	e-&gt;data_size = tr-&gt;data_size;</div><div class='add'>+	e-&gt;offsets_size = tr-&gt;offsets_size;</div><div class='add'>+</div><div class='add'>+	if (reply) {</div><div class='add'>+		in_reply_to = thread-&gt;transaction_stack;</div><div class='add'>+		if (in_reply_to == NULL) {</div><div class='add'>+			binder_user_error("binder: %d:%d got reply transaction "</div><div class='add'>+					  "with no transaction stack\n",</div><div class='add'>+					  proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+			return_error = BR_FAILED_REPLY;</div><div class='add'>+			goto err_empty_call_stack;</div><div class='add'>+		}</div><div class='add'>+		binder_set_nice(in_reply_to-&gt;saved_priority);</div><div class='add'>+		if (in_reply_to-&gt;to_thread != thread) {</div><div class='add'>+			binder_user_error("binder: %d:%d got reply transaction "</div><div class='add'>+				"with bad transaction stack,"</div><div class='add'>+				" transaction %d has target %d:%d\n",</div><div class='add'>+				proc-&gt;pid, thread-&gt;pid, in_reply_to-&gt;debug_id,</div><div class='add'>+				in_reply_to-&gt;to_proc ?</div><div class='add'>+				in_reply_to-&gt;to_proc-&gt;pid : 0,</div><div class='add'>+				in_reply_to-&gt;to_thread ?</div><div class='add'>+				in_reply_to-&gt;to_thread-&gt;pid : 0);</div><div class='add'>+			return_error = BR_FAILED_REPLY;</div><div class='add'>+			in_reply_to = NULL;</div><div class='add'>+			goto err_bad_call_stack;</div><div class='add'>+		}</div><div class='add'>+		thread-&gt;transaction_stack = in_reply_to-&gt;to_parent;</div><div class='add'>+		target_thread = in_reply_to-&gt;from;</div><div class='add'>+		if (target_thread == NULL) {</div><div class='add'>+			return_error = BR_DEAD_REPLY;</div><div class='add'>+			goto err_dead_binder;</div><div class='add'>+		}</div><div class='add'>+		if (target_thread-&gt;transaction_stack != in_reply_to) {</div><div class='add'>+			binder_user_error("binder: %d:%d got reply transaction "</div><div class='add'>+				"with bad target transaction stack %d, "</div><div class='add'>+				"expected %d\n",</div><div class='add'>+				proc-&gt;pid, thread-&gt;pid,</div><div class='add'>+				target_thread-&gt;transaction_stack ?</div><div class='add'>+				target_thread-&gt;transaction_stack-&gt;debug_id : 0,</div><div class='add'>+				in_reply_to-&gt;debug_id);</div><div class='add'>+			return_error = BR_FAILED_REPLY;</div><div class='add'>+			in_reply_to = NULL;</div><div class='add'>+			target_thread = NULL;</div><div class='add'>+			goto err_dead_binder;</div><div class='add'>+		}</div><div class='add'>+		target_proc = target_thread-&gt;proc;</div><div class='add'>+	} else {</div><div class='add'>+		if (tr-&gt;target.handle) {</div><div class='add'>+			struct binder_ref *ref;</div><div class='add'>+			ref = binder_get_ref(proc, tr-&gt;target.handle);</div><div class='add'>+			if (ref == NULL) {</div><div class='add'>+				binder_user_error("binder: %d:%d got "</div><div class='add'>+					"transaction to invalid handle\n",</div><div class='add'>+					proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+				return_error = BR_FAILED_REPLY;</div><div class='add'>+				goto err_invalid_target_handle;</div><div class='add'>+			}</div><div class='add'>+			target_node = ref-&gt;node;</div><div class='add'>+		} else {</div><div class='add'>+			target_node = binder_context_mgr_node;</div><div class='add'>+			if (target_node == NULL) {</div><div class='add'>+				return_error = BR_DEAD_REPLY;</div><div class='add'>+				goto err_no_context_mgr_node;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		e-&gt;to_node = target_node-&gt;debug_id;</div><div class='add'>+		target_proc = target_node-&gt;proc;</div><div class='add'>+		if (target_proc == NULL) {</div><div class='add'>+			return_error = BR_DEAD_REPLY;</div><div class='add'>+			goto err_dead_binder;</div><div class='add'>+		}</div><div class='add'>+		if (!(tr-&gt;flags &amp; TF_ONE_WAY) &amp;&amp; thread-&gt;transaction_stack) {</div><div class='add'>+			struct binder_transaction *tmp;</div><div class='add'>+			tmp = thread-&gt;transaction_stack;</div><div class='add'>+			if (tmp-&gt;to_thread != thread) {</div><div class='add'>+				binder_user_error("binder: %d:%d got new "</div><div class='add'>+					"transaction with bad transaction stack"</div><div class='add'>+					", transaction %d has target %d:%d\n",</div><div class='add'>+					proc-&gt;pid, thread-&gt;pid, tmp-&gt;debug_id,</div><div class='add'>+					tmp-&gt;to_proc ? tmp-&gt;to_proc-&gt;pid : 0,</div><div class='add'>+					tmp-&gt;to_thread ?</div><div class='add'>+					tmp-&gt;to_thread-&gt;pid : 0);</div><div class='add'>+				return_error = BR_FAILED_REPLY;</div><div class='add'>+				goto err_bad_call_stack;</div><div class='add'>+			}</div><div class='add'>+			while (tmp) {</div><div class='add'>+				if (tmp-&gt;from &amp;&amp; tmp-&gt;from-&gt;proc == target_proc)</div><div class='add'>+					target_thread = tmp-&gt;from;</div><div class='add'>+				tmp = tmp-&gt;from_parent;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (target_thread) {</div><div class='add'>+		e-&gt;to_thread = target_thread-&gt;pid;</div><div class='add'>+		target_list = &amp;target_thread-&gt;todo;</div><div class='add'>+		target_wait = &amp;target_thread-&gt;wait;</div><div class='add'>+	} else {</div><div class='add'>+		target_list = &amp;target_proc-&gt;todo;</div><div class='add'>+		target_wait = &amp;target_proc-&gt;wait;</div><div class='add'>+	}</div><div class='add'>+	e-&gt;to_proc = target_proc-&gt;pid;</div><div class='add'>+</div><div class='add'>+	/* TODO: reuse incoming transaction for reply */</div><div class='add'>+	t = kzalloc(sizeof(*t), GFP_KERNEL);</div><div class='add'>+	if (t == NULL) {</div><div class='add'>+		return_error = BR_FAILED_REPLY;</div><div class='add'>+		goto err_alloc_t_failed;</div><div class='add'>+	}</div><div class='add'>+	binder_stats_created(BINDER_STAT_TRANSACTION);</div><div class='add'>+</div><div class='add'>+	tcomplete = kzalloc(sizeof(*tcomplete), GFP_KERNEL);</div><div class='add'>+	if (tcomplete == NULL) {</div><div class='add'>+		return_error = BR_FAILED_REPLY;</div><div class='add'>+		goto err_alloc_tcomplete_failed;</div><div class='add'>+	}</div><div class='add'>+	binder_stats_created(BINDER_STAT_TRANSACTION_COMPLETE);</div><div class='add'>+</div><div class='add'>+	t-&gt;debug_id = ++binder_last_id;</div><div class='add'>+	e-&gt;debug_id = t-&gt;debug_id;</div><div class='add'>+</div><div class='add'>+	if (reply)</div><div class='add'>+		binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='add'>+			     "binder: %d:%d BC_REPLY %d -&gt; %d:%d, "</div><div class='add'>+			     "data %p-%p size %zd-%zd\n",</div><div class='add'>+			     proc-&gt;pid, thread-&gt;pid, t-&gt;debug_id,</div><div class='add'>+			     target_proc-&gt;pid, target_thread-&gt;pid,</div><div class='add'>+			     tr-&gt;data.ptr.buffer, tr-&gt;data.ptr.offsets,</div><div class='add'>+			     tr-&gt;data_size, tr-&gt;offsets_size);</div><div class='add'>+	else</div><div class='add'>+		binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='add'>+			     "binder: %d:%d BC_TRANSACTION %d -&gt; "</div><div class='add'>+			     "%d - node %d, data %p-%p size %zd-%zd\n",</div><div class='add'>+			     proc-&gt;pid, thread-&gt;pid, t-&gt;debug_id,</div><div class='add'>+			     target_proc-&gt;pid, target_node-&gt;debug_id,</div><div class='add'>+			     tr-&gt;data.ptr.buffer, tr-&gt;data.ptr.offsets,</div><div class='add'>+			     tr-&gt;data_size, tr-&gt;offsets_size);</div><div class='add'>+</div><div class='add'>+	if (!reply &amp;&amp; !(tr-&gt;flags &amp; TF_ONE_WAY))</div><div class='add'>+		t-&gt;from = thread;</div><div class='add'>+	else</div><div class='add'>+		t-&gt;from = NULL;</div><div class='add'>+	t-&gt;sender_euid = proc-&gt;tsk-&gt;cred-&gt;euid;</div><div class='add'>+	t-&gt;to_proc = target_proc;</div><div class='add'>+	t-&gt;to_thread = target_thread;</div><div class='add'>+	t-&gt;code = tr-&gt;code;</div><div class='add'>+	t-&gt;flags = tr-&gt;flags;</div><div class='add'>+	t-&gt;priority = task_nice(current);</div><div class='add'>+	t-&gt;buffer = binder_alloc_buf(target_proc, tr-&gt;data_size,</div><div class='add'>+		tr-&gt;offsets_size, !reply &amp;&amp; (t-&gt;flags &amp; TF_ONE_WAY));</div><div class='add'>+	if (t-&gt;buffer == NULL) {</div><div class='add'>+		return_error = BR_FAILED_REPLY;</div><div class='add'>+		goto err_binder_alloc_buf_failed;</div><div class='add'>+	}</div><div class='add'>+	t-&gt;buffer-&gt;allow_user_free = 0;</div><div class='add'>+	t-&gt;buffer-&gt;debug_id = t-&gt;debug_id;</div><div class='add'>+	t-&gt;buffer-&gt;transaction = t;</div><div class='add'>+	t-&gt;buffer-&gt;target_node = target_node;</div><div class='add'>+	if (target_node)</div><div class='add'>+		binder_inc_node(target_node, 1, 0, NULL);</div><div class='add'>+</div><div class='add'>+	offp = (size_t *)(t-&gt;buffer-&gt;data + ALIGN(tr-&gt;data_size, sizeof(void *)));</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(t-&gt;buffer-&gt;data, tr-&gt;data.ptr.buffer, tr-&gt;data_size)) {</div><div class='add'>+		binder_user_error("binder: %d:%d got transaction with invalid "</div><div class='add'>+			"data ptr\n", proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+		return_error = BR_FAILED_REPLY;</div><div class='add'>+		goto err_copy_data_failed;</div><div class='add'>+	}</div><div class='add'>+	if (copy_from_user(offp, tr-&gt;data.ptr.offsets, tr-&gt;offsets_size)) {</div><div class='add'>+		binder_user_error("binder: %d:%d got transaction with invalid "</div><div class='add'>+			"offsets ptr\n", proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+		return_error = BR_FAILED_REPLY;</div><div class='add'>+		goto err_copy_data_failed;</div><div class='add'>+	}</div><div class='add'>+	if (!IS_ALIGNED(tr-&gt;offsets_size, sizeof(size_t))) {</div><div class='add'>+		binder_user_error("binder: %d:%d got transaction with "</div><div class='add'>+			"invalid offsets size, %zd\n",</div><div class='add'>+			proc-&gt;pid, thread-&gt;pid, tr-&gt;offsets_size);</div><div class='add'>+		return_error = BR_FAILED_REPLY;</div><div class='add'>+		goto err_bad_offset;</div><div class='add'>+	}</div><div class='add'>+	off_end = (void *)offp + tr-&gt;offsets_size;</div><div class='add'>+	for (; offp &lt; off_end; offp++) {</div><div class='add'>+		struct flat_binder_object *fp;</div><div class='add'>+		if (*offp &gt; t-&gt;buffer-&gt;data_size - sizeof(*fp) ||</div><div class='add'>+		    t-&gt;buffer-&gt;data_size &lt; sizeof(*fp) ||</div><div class='add'>+		    !IS_ALIGNED(*offp, sizeof(void *))) {</div><div class='add'>+			binder_user_error("binder: %d:%d got transaction with "</div><div class='add'>+				"invalid offset, %zd\n",</div><div class='add'>+				proc-&gt;pid, thread-&gt;pid, *offp);</div><div class='add'>+			return_error = BR_FAILED_REPLY;</div><div class='add'>+			goto err_bad_offset;</div><div class='add'>+		}</div><div class='add'>+		fp = (struct flat_binder_object *)(t-&gt;buffer-&gt;data + *offp);</div><div class='add'>+		switch (fp-&gt;type) {</div><div class='add'>+		case BINDER_TYPE_BINDER:</div><div class='add'>+		case BINDER_TYPE_WEAK_BINDER: {</div><div class='add'>+			struct binder_ref *ref;</div><div class='add'>+			struct binder_node *node = binder_get_node(proc, fp-&gt;binder);</div><div class='add'>+			if (node == NULL) {</div><div class='add'>+				node = binder_new_node(proc, fp-&gt;binder, fp-&gt;cookie);</div><div class='add'>+				if (node == NULL) {</div><div class='add'>+					return_error = BR_FAILED_REPLY;</div><div class='add'>+					goto err_binder_new_node_failed;</div><div class='add'>+				}</div><div class='add'>+				node-&gt;min_priority = fp-&gt;flags &amp; FLAT_BINDER_FLAG_PRIORITY_MASK;</div><div class='add'>+				node-&gt;accept_fds = !!(fp-&gt;flags &amp; FLAT_BINDER_FLAG_ACCEPTS_FDS);</div><div class='add'>+			}</div><div class='add'>+			if (fp-&gt;cookie != node-&gt;cookie) {</div><div class='add'>+				binder_user_error("binder: %d:%d sending u%p "</div><div class='add'>+					"node %d, cookie mismatch %p != %p\n",</div><div class='add'>+					proc-&gt;pid, thread-&gt;pid,</div><div class='add'>+					fp-&gt;binder, node-&gt;debug_id,</div><div class='add'>+					fp-&gt;cookie, node-&gt;cookie);</div><div class='add'>+				goto err_binder_get_ref_for_node_failed;</div><div class='add'>+			}</div><div class='add'>+			ref = binder_get_ref_for_node(target_proc, node);</div><div class='add'>+			if (ref == NULL) {</div><div class='add'>+				return_error = BR_FAILED_REPLY;</div><div class='add'>+				goto err_binder_get_ref_for_node_failed;</div><div class='add'>+			}</div><div class='add'>+			if (fp-&gt;type == BINDER_TYPE_BINDER)</div><div class='add'>+				fp-&gt;type = BINDER_TYPE_HANDLE;</div><div class='add'>+			else</div><div class='add'>+				fp-&gt;type = BINDER_TYPE_WEAK_HANDLE;</div><div class='add'>+			fp-&gt;handle = ref-&gt;desc;</div><div class='add'>+			binder_inc_ref(ref, fp-&gt;type == BINDER_TYPE_HANDLE,</div><div class='add'>+				       &amp;thread-&gt;todo);</div><div class='add'>+</div><div class='add'>+			binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='add'>+				     "        node %d u%p -&gt; ref %d desc %d\n",</div><div class='add'>+				     node-&gt;debug_id, node-&gt;ptr, ref-&gt;debug_id,</div><div class='add'>+				     ref-&gt;desc);</div><div class='add'>+		} break;</div><div class='add'>+		case BINDER_TYPE_HANDLE:</div><div class='add'>+		case BINDER_TYPE_WEAK_HANDLE: {</div><div class='add'>+			struct binder_ref *ref = binder_get_ref(proc, fp-&gt;handle);</div><div class='add'>+			if (ref == NULL) {</div><div class='add'>+				binder_user_error("binder: %d:%d got "</div><div class='add'>+					"transaction with invalid "</div><div class='add'>+					"handle, %ld\n", proc-&gt;pid,</div><div class='add'>+					thread-&gt;pid, fp-&gt;handle);</div><div class='add'>+				return_error = BR_FAILED_REPLY;</div><div class='add'>+				goto err_binder_get_ref_failed;</div><div class='add'>+			}</div><div class='add'>+			if (ref-&gt;node-&gt;proc == target_proc) {</div><div class='add'>+				if (fp-&gt;type == BINDER_TYPE_HANDLE)</div><div class='add'>+					fp-&gt;type = BINDER_TYPE_BINDER;</div><div class='add'>+				else</div><div class='add'>+					fp-&gt;type = BINDER_TYPE_WEAK_BINDER;</div><div class='add'>+				fp-&gt;binder = ref-&gt;node-&gt;ptr;</div><div class='add'>+				fp-&gt;cookie = ref-&gt;node-&gt;cookie;</div><div class='add'>+				binder_inc_node(ref-&gt;node, fp-&gt;type == BINDER_TYPE_BINDER, 0, NULL);</div><div class='add'>+				binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='add'>+					     "        ref %d desc %d -&gt; node %d u%p\n",</div><div class='add'>+					     ref-&gt;debug_id, ref-&gt;desc, ref-&gt;node-&gt;debug_id,</div><div class='add'>+					     ref-&gt;node-&gt;ptr);</div><div class='add'>+			} else {</div><div class='add'>+				struct binder_ref *new_ref;</div><div class='add'>+				new_ref = binder_get_ref_for_node(target_proc, ref-&gt;node);</div><div class='add'>+				if (new_ref == NULL) {</div><div class='add'>+					return_error = BR_FAILED_REPLY;</div><div class='add'>+					goto err_binder_get_ref_for_node_failed;</div><div class='add'>+				}</div><div class='add'>+				fp-&gt;handle = new_ref-&gt;desc;</div><div class='add'>+				binder_inc_ref(new_ref, fp-&gt;type == BINDER_TYPE_HANDLE, NULL);</div><div class='add'>+				binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='add'>+					     "        ref %d desc %d -&gt; ref %d desc %d (node %d)\n",</div><div class='add'>+					     ref-&gt;debug_id, ref-&gt;desc, new_ref-&gt;debug_id,</div><div class='add'>+					     new_ref-&gt;desc, ref-&gt;node-&gt;debug_id);</div><div class='add'>+			}</div><div class='add'>+		} break;</div><div class='add'>+</div><div class='add'>+		case BINDER_TYPE_FD: {</div><div class='add'>+			int target_fd;</div><div class='add'>+			struct file *file;</div><div class='add'>+</div><div class='add'>+			if (reply) {</div><div class='add'>+				if (!(in_reply_to-&gt;flags &amp; TF_ACCEPT_FDS)) {</div><div class='add'>+					binder_user_error("binder: %d:%d got reply with fd, %ld, but target does not allow fds\n",</div><div class='add'>+						proc-&gt;pid, thread-&gt;pid, fp-&gt;handle);</div><div class='add'>+					return_error = BR_FAILED_REPLY;</div><div class='add'>+					goto err_fd_not_allowed;</div><div class='add'>+				}</div><div class='add'>+			} else if (!target_node-&gt;accept_fds) {</div><div class='add'>+				binder_user_error("binder: %d:%d got transaction with fd, %ld, but target does not allow fds\n",</div><div class='add'>+					proc-&gt;pid, thread-&gt;pid, fp-&gt;handle);</div><div class='add'>+				return_error = BR_FAILED_REPLY;</div><div class='add'>+				goto err_fd_not_allowed;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			file = fget(fp-&gt;handle);</div><div class='add'>+			if (file == NULL) {</div><div class='add'>+				binder_user_error("binder: %d:%d got transaction with invalid fd, %ld\n",</div><div class='add'>+					proc-&gt;pid, thread-&gt;pid, fp-&gt;handle);</div><div class='add'>+				return_error = BR_FAILED_REPLY;</div><div class='add'>+				goto err_fget_failed;</div><div class='add'>+			}</div><div class='add'>+			target_fd = task_get_unused_fd_flags(target_proc, O_CLOEXEC);</div><div class='add'>+			if (target_fd &lt; 0) {</div><div class='add'>+				fput(file);</div><div class='add'>+				return_error = BR_FAILED_REPLY;</div><div class='add'>+				goto err_get_unused_fd_failed;</div><div class='add'>+			}</div><div class='add'>+			task_fd_install(target_proc, target_fd, file);</div><div class='add'>+			binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='add'>+				     "        fd %ld -&gt; %d\n", fp-&gt;handle, target_fd);</div><div class='add'>+			/* TODO: fput? */</div><div class='add'>+			fp-&gt;handle = target_fd;</div><div class='add'>+		} break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			binder_user_error("binder: %d:%d got transactio"</div><div class='add'>+				"n with invalid object type, %lx\n",</div><div class='add'>+				proc-&gt;pid, thread-&gt;pid, fp-&gt;type);</div><div class='add'>+			return_error = BR_FAILED_REPLY;</div><div class='add'>+			goto err_bad_object_type;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (reply) {</div><div class='add'>+		BUG_ON(t-&gt;buffer-&gt;async_transaction != 0);</div><div class='add'>+		binder_pop_transaction(target_thread, in_reply_to);</div><div class='add'>+	} else if (!(t-&gt;flags &amp; TF_ONE_WAY)) {</div><div class='add'>+		BUG_ON(t-&gt;buffer-&gt;async_transaction != 0);</div><div class='add'>+		t-&gt;need_reply = 1;</div><div class='add'>+		t-&gt;from_parent = thread-&gt;transaction_stack;</div><div class='add'>+		thread-&gt;transaction_stack = t;</div><div class='add'>+	} else {</div><div class='add'>+		BUG_ON(target_node == NULL);</div><div class='add'>+		BUG_ON(t-&gt;buffer-&gt;async_transaction != 1);</div><div class='add'>+		if (target_node-&gt;has_async_transaction) {</div><div class='add'>+			target_list = &amp;target_node-&gt;async_todo;</div><div class='add'>+			target_wait = NULL;</div><div class='add'>+		} else</div><div class='add'>+			target_node-&gt;has_async_transaction = 1;</div><div class='add'>+	}</div><div class='add'>+	t-&gt;work.type = BINDER_WORK_TRANSACTION;</div><div class='add'>+	list_add_tail(&amp;t-&gt;work.entry, target_list);</div><div class='add'>+	tcomplete-&gt;type = BINDER_WORK_TRANSACTION_COMPLETE;</div><div class='add'>+	list_add_tail(&amp;tcomplete-&gt;entry, &amp;thread-&gt;todo);</div><div class='add'>+	if (target_wait)</div><div class='add'>+		wake_up_interruptible(target_wait);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err_get_unused_fd_failed:</div><div class='add'>+err_fget_failed:</div><div class='add'>+err_fd_not_allowed:</div><div class='add'>+err_binder_get_ref_for_node_failed:</div><div class='add'>+err_binder_get_ref_failed:</div><div class='add'>+err_binder_new_node_failed:</div><div class='add'>+err_bad_object_type:</div><div class='add'>+err_bad_offset:</div><div class='add'>+err_copy_data_failed:</div><div class='add'>+	binder_transaction_buffer_release(target_proc, t-&gt;buffer, offp);</div><div class='add'>+	t-&gt;buffer-&gt;transaction = NULL;</div><div class='add'>+	binder_free_buf(target_proc, t-&gt;buffer);</div><div class='add'>+err_binder_alloc_buf_failed:</div><div class='add'>+	kfree(tcomplete);</div><div class='add'>+	binder_stats_deleted(BINDER_STAT_TRANSACTION_COMPLETE);</div><div class='add'>+err_alloc_tcomplete_failed:</div><div class='add'>+	kfree(t);</div><div class='add'>+	binder_stats_deleted(BINDER_STAT_TRANSACTION);</div><div class='add'>+err_alloc_t_failed:</div><div class='add'>+err_bad_call_stack:</div><div class='add'>+err_empty_call_stack:</div><div class='add'>+err_dead_binder:</div><div class='add'>+err_invalid_target_handle:</div><div class='add'>+err_no_context_mgr_node:</div><div class='add'>+	binder_debug(BINDER_DEBUG_FAILED_TRANSACTION,</div><div class='add'>+		     "binder: %d:%d transaction failed %d, size %zd-%zd\n",</div><div class='add'>+		     proc-&gt;pid, thread-&gt;pid, return_error,</div><div class='add'>+		     tr-&gt;data_size, tr-&gt;offsets_size);</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		struct binder_transaction_log_entry *fe;</div><div class='add'>+		fe = binder_transaction_log_add(&amp;binder_transaction_log_failed);</div><div class='add'>+		*fe = *e;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUG_ON(thread-&gt;return_error != BR_OK);</div><div class='add'>+	if (in_reply_to) {</div><div class='add'>+		thread-&gt;return_error = BR_TRANSACTION_COMPLETE;</div><div class='add'>+		binder_send_failed_reply(in_reply_to, return_error);</div><div class='add'>+	} else</div><div class='add'>+		thread-&gt;return_error = return_error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,</div><div class='add'>+			void __user *buffer, int size, signed long *consumed)</div><div class='add'>+{</div><div class='add'>+	uint32_t cmd;</div><div class='add'>+	void __user *ptr = buffer + *consumed;</div><div class='add'>+	void __user *end = buffer + size;</div><div class='add'>+</div><div class='add'>+	while (ptr &lt; end &amp;&amp; thread-&gt;return_error == BR_OK) {</div><div class='add'>+		if (get_user(cmd, (uint32_t __user *)ptr))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		ptr += sizeof(uint32_t);</div><div class='add'>+		if (_IOC_NR(cmd) &lt; ARRAY_SIZE(binder_stats.bc)) {</div><div class='add'>+			binder_stats.bc[_IOC_NR(cmd)]++;</div><div class='add'>+			proc-&gt;stats.bc[_IOC_NR(cmd)]++;</div><div class='add'>+			thread-&gt;stats.bc[_IOC_NR(cmd)]++;</div><div class='add'>+		}</div><div class='add'>+		switch (cmd) {</div><div class='add'>+		case BC_INCREFS:</div><div class='add'>+		case BC_ACQUIRE:</div><div class='add'>+		case BC_RELEASE:</div><div class='add'>+		case BC_DECREFS: {</div><div class='add'>+			uint32_t target;</div><div class='add'>+			struct binder_ref *ref;</div><div class='add'>+			const char *debug_string;</div><div class='add'>+</div><div class='add'>+			if (get_user(target, (uint32_t __user *)ptr))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			ptr += sizeof(uint32_t);</div><div class='add'>+			if (target == 0 &amp;&amp; binder_context_mgr_node &amp;&amp;</div><div class='add'>+			    (cmd == BC_INCREFS || cmd == BC_ACQUIRE)) {</div><div class='add'>+				ref = binder_get_ref_for_node(proc,</div><div class='add'>+					       binder_context_mgr_node);</div><div class='add'>+				if (ref-&gt;desc != target) {</div><div class='add'>+					binder_user_error("binder: %d:"</div><div class='add'>+						"%d tried to acquire "</div><div class='add'>+						"reference to desc 0, "</div><div class='add'>+						"got %d instead\n",</div><div class='add'>+						proc-&gt;pid, thread-&gt;pid,</div><div class='add'>+						ref-&gt;desc);</div><div class='add'>+				}</div><div class='add'>+			} else</div><div class='add'>+				ref = binder_get_ref(proc, target);</div><div class='add'>+			if (ref == NULL) {</div><div class='add'>+				binder_user_error("binder: %d:%d refcou"</div><div class='add'>+					"nt change on invalid ref %d\n",</div><div class='add'>+					proc-&gt;pid, thread-&gt;pid, target);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			switch (cmd) {</div><div class='add'>+			case BC_INCREFS:</div><div class='add'>+				debug_string = "IncRefs";</div><div class='add'>+				binder_inc_ref(ref, 0, NULL);</div><div class='add'>+				break;</div><div class='add'>+			case BC_ACQUIRE:</div><div class='add'>+				debug_string = "Acquire";</div><div class='add'>+				binder_inc_ref(ref, 1, NULL);</div><div class='add'>+				break;</div><div class='add'>+			case BC_RELEASE:</div><div class='add'>+				debug_string = "Release";</div><div class='add'>+				binder_dec_ref(ref, 1);</div><div class='add'>+				break;</div><div class='add'>+			case BC_DECREFS:</div><div class='add'>+			default:</div><div class='add'>+				debug_string = "DecRefs";</div><div class='add'>+				binder_dec_ref(ref, 0);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			binder_debug(BINDER_DEBUG_USER_REFS,</div><div class='add'>+				     "binder: %d:%d %s ref %d desc %d s %d w %d for node %d\n",</div><div class='add'>+				     proc-&gt;pid, thread-&gt;pid, debug_string, ref-&gt;debug_id,</div><div class='add'>+				     ref-&gt;desc, ref-&gt;strong, ref-&gt;weak, ref-&gt;node-&gt;debug_id);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		case BC_INCREFS_DONE:</div><div class='add'>+		case BC_ACQUIRE_DONE: {</div><div class='add'>+			void __user *node_ptr;</div><div class='add'>+			void *cookie;</div><div class='add'>+			struct binder_node *node;</div><div class='add'>+</div><div class='add'>+			if (get_user(node_ptr, (void * __user *)ptr))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			ptr += sizeof(void *);</div><div class='add'>+			if (get_user(cookie, (void * __user *)ptr))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			ptr += sizeof(void *);</div><div class='add'>+			node = binder_get_node(proc, node_ptr);</div><div class='add'>+			if (node == NULL) {</div><div class='add'>+				binder_user_error("binder: %d:%d "</div><div class='add'>+					"%s u%p no match\n",</div><div class='add'>+					proc-&gt;pid, thread-&gt;pid,</div><div class='add'>+					cmd == BC_INCREFS_DONE ?</div><div class='add'>+					"BC_INCREFS_DONE" :</div><div class='add'>+					"BC_ACQUIRE_DONE",</div><div class='add'>+					node_ptr);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (cookie != node-&gt;cookie) {</div><div class='add'>+				binder_user_error("binder: %d:%d %s u%p node %d"</div><div class='add'>+					" cookie mismatch %p != %p\n",</div><div class='add'>+					proc-&gt;pid, thread-&gt;pid,</div><div class='add'>+					cmd == BC_INCREFS_DONE ?</div><div class='add'>+					"BC_INCREFS_DONE" : "BC_ACQUIRE_DONE",</div><div class='add'>+					node_ptr, node-&gt;debug_id,</div><div class='add'>+					cookie, node-&gt;cookie);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (cmd == BC_ACQUIRE_DONE) {</div><div class='add'>+				if (node-&gt;pending_strong_ref == 0) {</div><div class='add'>+					binder_user_error("binder: %d:%d "</div><div class='add'>+						"BC_ACQUIRE_DONE node %d has "</div><div class='add'>+						"no pending acquire request\n",</div><div class='add'>+						proc-&gt;pid, thread-&gt;pid,</div><div class='add'>+						node-&gt;debug_id);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				node-&gt;pending_strong_ref = 0;</div><div class='add'>+			} else {</div><div class='add'>+				if (node-&gt;pending_weak_ref == 0) {</div><div class='add'>+					binder_user_error("binder: %d:%d "</div><div class='add'>+						"BC_INCREFS_DONE node %d has "</div><div class='add'>+						"no pending increfs request\n",</div><div class='add'>+						proc-&gt;pid, thread-&gt;pid,</div><div class='add'>+						node-&gt;debug_id);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				node-&gt;pending_weak_ref = 0;</div><div class='add'>+			}</div><div class='add'>+			binder_dec_node(node, cmd == BC_ACQUIRE_DONE, 0);</div><div class='add'>+			binder_debug(BINDER_DEBUG_USER_REFS,</div><div class='add'>+				     "binder: %d:%d %s node %d ls %d lw %d\n",</div><div class='add'>+				     proc-&gt;pid, thread-&gt;pid,</div><div class='add'>+				     cmd == BC_INCREFS_DONE ? "BC_INCREFS_DONE" : "BC_ACQUIRE_DONE",</div><div class='add'>+				     node-&gt;debug_id, node-&gt;local_strong_refs, node-&gt;local_weak_refs);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		case BC_ATTEMPT_ACQUIRE:</div><div class='add'>+			printk(KERN_ERR "binder: BC_ATTEMPT_ACQUIRE not supported\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		case BC_ACQUIRE_RESULT:</div><div class='add'>+			printk(KERN_ERR "binder: BC_ACQUIRE_RESULT not supported\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		case BC_FREE_BUFFER: {</div><div class='add'>+			void __user *data_ptr;</div><div class='add'>+			struct binder_buffer *buffer;</div><div class='add'>+</div><div class='add'>+			if (get_user(data_ptr, (void * __user *)ptr))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			ptr += sizeof(void *);</div><div class='add'>+</div><div class='add'>+			buffer = binder_buffer_lookup(proc, data_ptr);</div><div class='add'>+			if (buffer == NULL) {</div><div class='add'>+				binder_user_error("binder: %d:%d "</div><div class='add'>+					"BC_FREE_BUFFER u%p no match\n",</div><div class='add'>+					proc-&gt;pid, thread-&gt;pid, data_ptr);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (!buffer-&gt;allow_user_free) {</div><div class='add'>+				binder_user_error("binder: %d:%d "</div><div class='add'>+					"BC_FREE_BUFFER u%p matched "</div><div class='add'>+					"unreturned buffer\n",</div><div class='add'>+					proc-&gt;pid, thread-&gt;pid, data_ptr);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			binder_debug(BINDER_DEBUG_FREE_BUFFER,</div><div class='add'>+				     "binder: %d:%d BC_FREE_BUFFER u%p found buffer %d for %s transaction\n",</div><div class='add'>+				     proc-&gt;pid, thread-&gt;pid, data_ptr, buffer-&gt;debug_id,</div><div class='add'>+				     buffer-&gt;transaction ? "active" : "finished");</div><div class='add'>+</div><div class='add'>+			if (buffer-&gt;transaction) {</div><div class='add'>+				buffer-&gt;transaction-&gt;buffer = NULL;</div><div class='add'>+				buffer-&gt;transaction = NULL;</div><div class='add'>+			}</div><div class='add'>+			if (buffer-&gt;async_transaction &amp;&amp; buffer-&gt;target_node) {</div><div class='add'>+				BUG_ON(!buffer-&gt;target_node-&gt;has_async_transaction);</div><div class='add'>+				if (list_empty(&amp;buffer-&gt;target_node-&gt;async_todo))</div><div class='add'>+					buffer-&gt;target_node-&gt;has_async_transaction = 0;</div><div class='add'>+				else</div><div class='add'>+					list_move_tail(buffer-&gt;target_node-&gt;async_todo.next, &amp;thread-&gt;todo);</div><div class='add'>+			}</div><div class='add'>+			binder_transaction_buffer_release(proc, buffer, NULL);</div><div class='add'>+			binder_free_buf(proc, buffer);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case BC_TRANSACTION:</div><div class='add'>+		case BC_REPLY: {</div><div class='add'>+			struct binder_transaction_data tr;</div><div class='add'>+</div><div class='add'>+			if (copy_from_user(&amp;tr, ptr, sizeof(tr)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			ptr += sizeof(tr);</div><div class='add'>+			binder_transaction(proc, thread, &amp;tr, cmd == BC_REPLY);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case BC_REGISTER_LOOPER:</div><div class='add'>+			binder_debug(BINDER_DEBUG_THREADS,</div><div class='add'>+				     "binder: %d:%d BC_REGISTER_LOOPER\n",</div><div class='add'>+				     proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+			if (thread-&gt;looper &amp; BINDER_LOOPER_STATE_ENTERED) {</div><div class='add'>+				thread-&gt;looper |= BINDER_LOOPER_STATE_INVALID;</div><div class='add'>+				binder_user_error("binder: %d:%d ERROR:"</div><div class='add'>+					" BC_REGISTER_LOOPER called "</div><div class='add'>+					"after BC_ENTER_LOOPER\n",</div><div class='add'>+					proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+			} else if (proc-&gt;requested_threads == 0) {</div><div class='add'>+				thread-&gt;looper |= BINDER_LOOPER_STATE_INVALID;</div><div class='add'>+				binder_user_error("binder: %d:%d ERROR:"</div><div class='add'>+					" BC_REGISTER_LOOPER called "</div><div class='add'>+					"without request\n",</div><div class='add'>+					proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+			} else {</div><div class='add'>+				proc-&gt;requested_threads--;</div><div class='add'>+				proc-&gt;requested_threads_started++;</div><div class='add'>+			}</div><div class='add'>+			thread-&gt;looper |= BINDER_LOOPER_STATE_REGISTERED;</div><div class='add'>+			break;</div><div class='add'>+		case BC_ENTER_LOOPER:</div><div class='add'>+			binder_debug(BINDER_DEBUG_THREADS,</div><div class='add'>+				     "binder: %d:%d BC_ENTER_LOOPER\n",</div><div class='add'>+				     proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+			if (thread-&gt;looper &amp; BINDER_LOOPER_STATE_REGISTERED) {</div><div class='add'>+				thread-&gt;looper |= BINDER_LOOPER_STATE_INVALID;</div><div class='add'>+				binder_user_error("binder: %d:%d ERROR:"</div><div class='add'>+					" BC_ENTER_LOOPER called after "</div><div class='add'>+					"BC_REGISTER_LOOPER\n",</div><div class='add'>+					proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+			}</div><div class='add'>+			thread-&gt;looper |= BINDER_LOOPER_STATE_ENTERED;</div><div class='add'>+			break;</div><div class='add'>+		case BC_EXIT_LOOPER:</div><div class='add'>+			binder_debug(BINDER_DEBUG_THREADS,</div><div class='add'>+				     "binder: %d:%d BC_EXIT_LOOPER\n",</div><div class='add'>+				     proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+			thread-&gt;looper |= BINDER_LOOPER_STATE_EXITED;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case BC_REQUEST_DEATH_NOTIFICATION:</div><div class='add'>+		case BC_CLEAR_DEATH_NOTIFICATION: {</div><div class='add'>+			uint32_t target;</div><div class='add'>+			void __user *cookie;</div><div class='add'>+			struct binder_ref *ref;</div><div class='add'>+			struct binder_ref_death *death;</div><div class='add'>+</div><div class='add'>+			if (get_user(target, (uint32_t __user *)ptr))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			ptr += sizeof(uint32_t);</div><div class='add'>+			if (get_user(cookie, (void __user * __user *)ptr))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			ptr += sizeof(void *);</div><div class='add'>+			ref = binder_get_ref(proc, target);</div><div class='add'>+			if (ref == NULL) {</div><div class='add'>+				binder_user_error("binder: %d:%d %s "</div><div class='add'>+					"invalid ref %d\n",</div><div class='add'>+					proc-&gt;pid, thread-&gt;pid,</div><div class='add'>+					cmd == BC_REQUEST_DEATH_NOTIFICATION ?</div><div class='add'>+					"BC_REQUEST_DEATH_NOTIFICATION" :</div><div class='add'>+					"BC_CLEAR_DEATH_NOTIFICATION",</div><div class='add'>+					target);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			binder_debug(BINDER_DEBUG_DEATH_NOTIFICATION,</div><div class='add'>+				     "binder: %d:%d %s %p ref %d desc %d s %d w %d for node %d\n",</div><div class='add'>+				     proc-&gt;pid, thread-&gt;pid,</div><div class='add'>+				     cmd == BC_REQUEST_DEATH_NOTIFICATION ?</div><div class='add'>+				     "BC_REQUEST_DEATH_NOTIFICATION" :</div><div class='add'>+				     "BC_CLEAR_DEATH_NOTIFICATION",</div><div class='add'>+				     cookie, ref-&gt;debug_id, ref-&gt;desc,</div><div class='add'>+				     ref-&gt;strong, ref-&gt;weak, ref-&gt;node-&gt;debug_id);</div><div class='add'>+</div><div class='add'>+			if (cmd == BC_REQUEST_DEATH_NOTIFICATION) {</div><div class='add'>+				if (ref-&gt;death) {</div><div class='add'>+					binder_user_error("binder: %d:%"</div><div class='add'>+						"d BC_REQUEST_DEATH_NOTI"</div><div class='add'>+						"FICATION death notific"</div><div class='add'>+						"ation already set\n",</div><div class='add'>+						proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				death = kzalloc(sizeof(*death), GFP_KERNEL);</div><div class='add'>+				if (death == NULL) {</div><div class='add'>+					thread-&gt;return_error = BR_ERROR;</div><div class='add'>+					binder_debug(BINDER_DEBUG_FAILED_TRANSACTION,</div><div class='add'>+						     "binder: %d:%d "</div><div class='add'>+						     "BC_REQUEST_DEATH_NOTIFICATION failed\n",</div><div class='add'>+						     proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				binder_stats_created(BINDER_STAT_DEATH);</div><div class='add'>+				INIT_LIST_HEAD(&amp;death-&gt;work.entry);</div><div class='add'>+				death-&gt;cookie = cookie;</div><div class='add'>+				ref-&gt;death = death;</div><div class='add'>+				if (ref-&gt;node-&gt;proc == NULL) {</div><div class='add'>+					ref-&gt;death-&gt;work.type = BINDER_WORK_DEAD_BINDER;</div><div class='add'>+					if (thread-&gt;looper &amp; (BINDER_LOOPER_STATE_REGISTERED | BINDER_LOOPER_STATE_ENTERED)) {</div><div class='add'>+						list_add_tail(&amp;ref-&gt;death-&gt;work.entry, &amp;thread-&gt;todo);</div><div class='add'>+					} else {</div><div class='add'>+						list_add_tail(&amp;ref-&gt;death-&gt;work.entry, &amp;proc-&gt;todo);</div><div class='add'>+						wake_up_interruptible(&amp;proc-&gt;wait);</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				if (ref-&gt;death == NULL) {</div><div class='add'>+					binder_user_error("binder: %d:%"</div><div class='add'>+						"d BC_CLEAR_DEATH_NOTIFI"</div><div class='add'>+						"CATION death notificat"</div><div class='add'>+						"ion not active\n",</div><div class='add'>+						proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				death = ref-&gt;death;</div><div class='add'>+				if (death-&gt;cookie != cookie) {</div><div class='add'>+					binder_user_error("binder: %d:%"</div><div class='add'>+						"d BC_CLEAR_DEATH_NOTIFI"</div><div class='add'>+						"CATION death notificat"</div><div class='add'>+						"ion cookie mismatch "</div><div class='add'>+						"%p != %p\n",</div><div class='add'>+						proc-&gt;pid, thread-&gt;pid,</div><div class='add'>+						death-&gt;cookie, cookie);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				ref-&gt;death = NULL;</div><div class='add'>+				if (list_empty(&amp;death-&gt;work.entry)) {</div><div class='add'>+					death-&gt;work.type = BINDER_WORK_CLEAR_DEATH_NOTIFICATION;</div><div class='add'>+					if (thread-&gt;looper &amp; (BINDER_LOOPER_STATE_REGISTERED | BINDER_LOOPER_STATE_ENTERED)) {</div><div class='add'>+						list_add_tail(&amp;death-&gt;work.entry, &amp;thread-&gt;todo);</div><div class='add'>+					} else {</div><div class='add'>+						list_add_tail(&amp;death-&gt;work.entry, &amp;proc-&gt;todo);</div><div class='add'>+						wake_up_interruptible(&amp;proc-&gt;wait);</div><div class='add'>+					}</div><div class='add'>+				} else {</div><div class='add'>+					BUG_ON(death-&gt;work.type != BINDER_WORK_DEAD_BINDER);</div><div class='add'>+					death-&gt;work.type = BINDER_WORK_DEAD_BINDER_AND_CLEAR;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		} break;</div><div class='add'>+		case BC_DEAD_BINDER_DONE: {</div><div class='add'>+			struct binder_work *w;</div><div class='add'>+			void __user *cookie;</div><div class='add'>+			struct binder_ref_death *death = NULL;</div><div class='add'>+			if (get_user(cookie, (void __user * __user *)ptr))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+</div><div class='add'>+			ptr += sizeof(void *);</div><div class='add'>+			list_for_each_entry(w, &amp;proc-&gt;delivered_death, entry) {</div><div class='add'>+				struct binder_ref_death *tmp_death = container_of(w, struct binder_ref_death, work);</div><div class='add'>+				if (tmp_death-&gt;cookie == cookie) {</div><div class='add'>+					death = tmp_death;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			binder_debug(BINDER_DEBUG_DEAD_BINDER,</div><div class='add'>+				     "binder: %d:%d BC_DEAD_BINDER_DONE %p found %p\n",</div><div class='add'>+				     proc-&gt;pid, thread-&gt;pid, cookie, death);</div><div class='add'>+			if (death == NULL) {</div><div class='add'>+				binder_user_error("binder: %d:%d BC_DEAD"</div><div class='add'>+					"_BINDER_DONE %p not found\n",</div><div class='add'>+					proc-&gt;pid, thread-&gt;pid, cookie);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			list_del_init(&amp;death-&gt;work.entry);</div><div class='add'>+			if (death-&gt;work.type == BINDER_WORK_DEAD_BINDER_AND_CLEAR) {</div><div class='add'>+				death-&gt;work.type = BINDER_WORK_CLEAR_DEATH_NOTIFICATION;</div><div class='add'>+				if (thread-&gt;looper &amp; (BINDER_LOOPER_STATE_REGISTERED | BINDER_LOOPER_STATE_ENTERED)) {</div><div class='add'>+					list_add_tail(&amp;death-&gt;work.entry, &amp;thread-&gt;todo);</div><div class='add'>+				} else {</div><div class='add'>+					list_add_tail(&amp;death-&gt;work.entry, &amp;proc-&gt;todo);</div><div class='add'>+					wake_up_interruptible(&amp;proc-&gt;wait);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		} break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			printk(KERN_ERR "binder: %d:%d unknown command %d\n",</div><div class='add'>+			       proc-&gt;pid, thread-&gt;pid, cmd);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		*consumed = ptr - buffer;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void binder_stat_br(struct binder_proc *proc, struct binder_thread *thread,</div><div class='add'>+		    uint32_t cmd)</div><div class='add'>+{</div><div class='add'>+	if (_IOC_NR(cmd) &lt; ARRAY_SIZE(binder_stats.br)) {</div><div class='add'>+		binder_stats.br[_IOC_NR(cmd)]++;</div><div class='add'>+		proc-&gt;stats.br[_IOC_NR(cmd)]++;</div><div class='add'>+		thread-&gt;stats.br[_IOC_NR(cmd)]++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int binder_has_proc_work(struct binder_proc *proc,</div><div class='add'>+				struct binder_thread *thread)</div><div class='add'>+{</div><div class='add'>+	return !list_empty(&amp;proc-&gt;todo) ||</div><div class='add'>+		(thread-&gt;looper &amp; BINDER_LOOPER_STATE_NEED_RETURN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int binder_has_thread_work(struct binder_thread *thread)</div><div class='add'>+{</div><div class='add'>+	return !list_empty(&amp;thread-&gt;todo) || thread-&gt;return_error != BR_OK ||</div><div class='add'>+		(thread-&gt;looper &amp; BINDER_LOOPER_STATE_NEED_RETURN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int binder_thread_read(struct binder_proc *proc,</div><div class='add'>+			      struct binder_thread *thread,</div><div class='add'>+			      void  __user *buffer, int size,</div><div class='add'>+			      signed long *consumed, int non_block)</div><div class='add'>+{</div><div class='add'>+	void __user *ptr = buffer + *consumed;</div><div class='add'>+	void __user *end = buffer + size;</div><div class='add'>+</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int wait_for_proc_work;</div><div class='add'>+</div><div class='add'>+	if (*consumed == 0) {</div><div class='add'>+		if (put_user(BR_NOOP, (uint32_t __user *)ptr))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		ptr += sizeof(uint32_t);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	wait_for_proc_work = thread-&gt;transaction_stack == NULL &amp;&amp;</div><div class='add'>+				list_empty(&amp;thread-&gt;todo);</div><div class='add'>+</div><div class='add'>+	if (thread-&gt;return_error != BR_OK &amp;&amp; ptr &lt; end) {</div><div class='add'>+		if (thread-&gt;return_error2 != BR_OK) {</div><div class='add'>+			if (put_user(thread-&gt;return_error2, (uint32_t __user *)ptr))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			ptr += sizeof(uint32_t);</div><div class='add'>+			if (ptr == end)</div><div class='add'>+				goto done;</div><div class='add'>+			thread-&gt;return_error2 = BR_OK;</div><div class='add'>+		}</div><div class='add'>+		if (put_user(thread-&gt;return_error, (uint32_t __user *)ptr))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		ptr += sizeof(uint32_t);</div><div class='add'>+		thread-&gt;return_error = BR_OK;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	thread-&gt;looper |= BINDER_LOOPER_STATE_WAITING;</div><div class='add'>+	if (wait_for_proc_work)</div><div class='add'>+		proc-&gt;ready_threads++;</div><div class='add'>+	mutex_unlock(&amp;binder_lock);</div><div class='add'>+	if (wait_for_proc_work) {</div><div class='add'>+		if (!(thread-&gt;looper &amp; (BINDER_LOOPER_STATE_REGISTERED |</div><div class='add'>+					BINDER_LOOPER_STATE_ENTERED))) {</div><div class='add'>+			binder_user_error("binder: %d:%d ERROR: Thread waiting "</div><div class='add'>+				"for process work before calling BC_REGISTER_"</div><div class='add'>+				"LOOPER or BC_ENTER_LOOPER (state %x)\n",</div><div class='add'>+				proc-&gt;pid, thread-&gt;pid, thread-&gt;looper);</div><div class='add'>+			wait_event_interruptible(binder_user_error_wait,</div><div class='add'>+						 binder_stop_on_user_error &lt; 2);</div><div class='add'>+		}</div><div class='add'>+		binder_set_nice(proc-&gt;default_priority);</div><div class='add'>+		if (non_block) {</div><div class='add'>+			if (!binder_has_proc_work(proc, thread))</div><div class='add'>+				ret = -EAGAIN;</div><div class='add'>+		} else</div><div class='add'>+			ret = wait_event_interruptible_exclusive(proc-&gt;wait, binder_has_proc_work(proc, thread));</div><div class='add'>+	} else {</div><div class='add'>+		if (non_block) {</div><div class='add'>+			if (!binder_has_thread_work(thread))</div><div class='add'>+				ret = -EAGAIN;</div><div class='add'>+		} else</div><div class='add'>+			ret = wait_event_interruptible(thread-&gt;wait, binder_has_thread_work(thread));</div><div class='add'>+	}</div><div class='add'>+	mutex_lock(&amp;binder_lock);</div><div class='add'>+	if (wait_for_proc_work)</div><div class='add'>+		proc-&gt;ready_threads--;</div><div class='add'>+	thread-&gt;looper &amp;= ~BINDER_LOOPER_STATE_WAITING;</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		uint32_t cmd;</div><div class='add'>+		struct binder_transaction_data tr;</div><div class='add'>+		struct binder_work *w;</div><div class='add'>+		struct binder_transaction *t = NULL;</div><div class='add'>+</div><div class='add'>+		if (!list_empty(&amp;thread-&gt;todo))</div><div class='add'>+			w = list_first_entry(&amp;thread-&gt;todo, struct binder_work, entry);</div><div class='add'>+		else if (!list_empty(&amp;proc-&gt;todo) &amp;&amp; wait_for_proc_work)</div><div class='add'>+			w = list_first_entry(&amp;proc-&gt;todo, struct binder_work, entry);</div><div class='add'>+		else {</div><div class='add'>+			if (ptr - buffer == 4 &amp;&amp; !(thread-&gt;looper &amp; BINDER_LOOPER_STATE_NEED_RETURN)) /* no data added */</div><div class='add'>+				goto retry;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (end - ptr &lt; sizeof(tr) + 4)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		switch (w-&gt;type) {</div><div class='add'>+		case BINDER_WORK_TRANSACTION: {</div><div class='add'>+			t = container_of(w, struct binder_transaction, work);</div><div class='add'>+		} break;</div><div class='add'>+		case BINDER_WORK_TRANSACTION_COMPLETE: {</div><div class='add'>+			cmd = BR_TRANSACTION_COMPLETE;</div><div class='add'>+			if (put_user(cmd, (uint32_t __user *)ptr))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			ptr += sizeof(uint32_t);</div><div class='add'>+</div><div class='add'>+			binder_stat_br(proc, thread, cmd);</div><div class='add'>+			binder_debug(BINDER_DEBUG_TRANSACTION_COMPLETE,</div><div class='add'>+				     "binder: %d:%d BR_TRANSACTION_COMPLETE\n",</div><div class='add'>+				     proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+</div><div class='add'>+			list_del(&amp;w-&gt;entry);</div><div class='add'>+			kfree(w);</div><div class='add'>+			binder_stats_deleted(BINDER_STAT_TRANSACTION_COMPLETE);</div><div class='add'>+		} break;</div><div class='add'>+		case BINDER_WORK_NODE: {</div><div class='add'>+			struct binder_node *node = container_of(w, struct binder_node, work);</div><div class='add'>+			uint32_t cmd = BR_NOOP;</div><div class='add'>+			const char *cmd_name;</div><div class='add'>+			int strong = node-&gt;internal_strong_refs || node-&gt;local_strong_refs;</div><div class='add'>+			int weak = !hlist_empty(&amp;node-&gt;refs) || node-&gt;local_weak_refs || strong;</div><div class='add'>+			if (weak &amp;&amp; !node-&gt;has_weak_ref) {</div><div class='add'>+				cmd = BR_INCREFS;</div><div class='add'>+				cmd_name = "BR_INCREFS";</div><div class='add'>+				node-&gt;has_weak_ref = 1;</div><div class='add'>+				node-&gt;pending_weak_ref = 1;</div><div class='add'>+				node-&gt;local_weak_refs++;</div><div class='add'>+			} else if (strong &amp;&amp; !node-&gt;has_strong_ref) {</div><div class='add'>+				cmd = BR_ACQUIRE;</div><div class='add'>+				cmd_name = "BR_ACQUIRE";</div><div class='add'>+				node-&gt;has_strong_ref = 1;</div><div class='add'>+				node-&gt;pending_strong_ref = 1;</div><div class='add'>+				node-&gt;local_strong_refs++;</div><div class='add'>+			} else if (!strong &amp;&amp; node-&gt;has_strong_ref) {</div><div class='add'>+				cmd = BR_RELEASE;</div><div class='add'>+				cmd_name = "BR_RELEASE";</div><div class='add'>+				node-&gt;has_strong_ref = 0;</div><div class='add'>+			} else if (!weak &amp;&amp; node-&gt;has_weak_ref) {</div><div class='add'>+				cmd = BR_DECREFS;</div><div class='add'>+				cmd_name = "BR_DECREFS";</div><div class='add'>+				node-&gt;has_weak_ref = 0;</div><div class='add'>+			}</div><div class='add'>+			if (cmd != BR_NOOP) {</div><div class='add'>+				if (put_user(cmd, (uint32_t __user *)ptr))</div><div class='add'>+					return -EFAULT;</div><div class='add'>+				ptr += sizeof(uint32_t);</div><div class='add'>+				if (put_user(node-&gt;ptr, (void * __user *)ptr))</div><div class='add'>+					return -EFAULT;</div><div class='add'>+				ptr += sizeof(void *);</div><div class='add'>+				if (put_user(node-&gt;cookie, (void * __user *)ptr))</div><div class='add'>+					return -EFAULT;</div><div class='add'>+				ptr += sizeof(void *);</div><div class='add'>+</div><div class='add'>+				binder_stat_br(proc, thread, cmd);</div><div class='add'>+				binder_debug(BINDER_DEBUG_USER_REFS,</div><div class='add'>+					     "binder: %d:%d %s %d u%p c%p\n",</div><div class='add'>+					     proc-&gt;pid, thread-&gt;pid, cmd_name, node-&gt;debug_id, node-&gt;ptr, node-&gt;cookie);</div><div class='add'>+			} else {</div><div class='add'>+				list_del_init(&amp;w-&gt;entry);</div><div class='add'>+				if (!weak &amp;&amp; !strong) {</div><div class='add'>+					binder_debug(BINDER_DEBUG_INTERNAL_REFS,</div><div class='add'>+						     "binder: %d:%d node %d u%p c%p deleted\n",</div><div class='add'>+						     proc-&gt;pid, thread-&gt;pid, node-&gt;debug_id,</div><div class='add'>+						     node-&gt;ptr, node-&gt;cookie);</div><div class='add'>+					rb_erase(&amp;node-&gt;rb_node, &amp;proc-&gt;nodes);</div><div class='add'>+					kfree(node);</div><div class='add'>+					binder_stats_deleted(BINDER_STAT_NODE);</div><div class='add'>+				} else {</div><div class='add'>+					binder_debug(BINDER_DEBUG_INTERNAL_REFS,</div><div class='add'>+						     "binder: %d:%d node %d u%p c%p state unchanged\n",</div><div class='add'>+						     proc-&gt;pid, thread-&gt;pid, node-&gt;debug_id, node-&gt;ptr,</div><div class='add'>+						     node-&gt;cookie);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		} break;</div><div class='add'>+		case BINDER_WORK_DEAD_BINDER:</div><div class='add'>+		case BINDER_WORK_DEAD_BINDER_AND_CLEAR:</div><div class='add'>+		case BINDER_WORK_CLEAR_DEATH_NOTIFICATION: {</div><div class='add'>+			struct binder_ref_death *death;</div><div class='add'>+			uint32_t cmd;</div><div class='add'>+</div><div class='add'>+			death = container_of(w, struct binder_ref_death, work);</div><div class='add'>+			if (w-&gt;type == BINDER_WORK_CLEAR_DEATH_NOTIFICATION)</div><div class='add'>+				cmd = BR_CLEAR_DEATH_NOTIFICATION_DONE;</div><div class='add'>+			else</div><div class='add'>+				cmd = BR_DEAD_BINDER;</div><div class='add'>+			if (put_user(cmd, (uint32_t __user *)ptr))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			ptr += sizeof(uint32_t);</div><div class='add'>+			if (put_user(death-&gt;cookie, (void * __user *)ptr))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			ptr += sizeof(void *);</div><div class='add'>+			binder_debug(BINDER_DEBUG_DEATH_NOTIFICATION,</div><div class='add'>+				     "binder: %d:%d %s %p\n",</div><div class='add'>+				      proc-&gt;pid, thread-&gt;pid,</div><div class='add'>+				      cmd == BR_DEAD_BINDER ?</div><div class='add'>+				      "BR_DEAD_BINDER" :</div><div class='add'>+				      "BR_CLEAR_DEATH_NOTIFICATION_DONE",</div><div class='add'>+				      death-&gt;cookie);</div><div class='add'>+</div><div class='add'>+			if (w-&gt;type == BINDER_WORK_CLEAR_DEATH_NOTIFICATION) {</div><div class='add'>+				list_del(&amp;w-&gt;entry);</div><div class='add'>+				kfree(death);</div><div class='add'>+				binder_stats_deleted(BINDER_STAT_DEATH);</div><div class='add'>+			} else</div><div class='add'>+				list_move(&amp;w-&gt;entry, &amp;proc-&gt;delivered_death);</div><div class='add'>+			if (cmd == BR_DEAD_BINDER)</div><div class='add'>+				goto done; /* DEAD_BINDER notifications can cause transactions */</div><div class='add'>+		} break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!t)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		BUG_ON(t-&gt;buffer == NULL);</div><div class='add'>+		if (t-&gt;buffer-&gt;target_node) {</div><div class='add'>+			struct binder_node *target_node = t-&gt;buffer-&gt;target_node;</div><div class='add'>+			tr.target.ptr = target_node-&gt;ptr;</div><div class='add'>+			tr.cookie =  target_node-&gt;cookie;</div><div class='add'>+			t-&gt;saved_priority = task_nice(current);</div><div class='add'>+			if (t-&gt;priority &lt; target_node-&gt;min_priority &amp;&amp;</div><div class='add'>+			    !(t-&gt;flags &amp; TF_ONE_WAY))</div><div class='add'>+				binder_set_nice(t-&gt;priority);</div><div class='add'>+			else if (!(t-&gt;flags &amp; TF_ONE_WAY) ||</div><div class='add'>+				 t-&gt;saved_priority &gt; target_node-&gt;min_priority)</div><div class='add'>+				binder_set_nice(target_node-&gt;min_priority);</div><div class='add'>+			cmd = BR_TRANSACTION;</div><div class='add'>+		} else {</div><div class='add'>+			tr.target.ptr = NULL;</div><div class='add'>+			tr.cookie = NULL;</div><div class='add'>+			cmd = BR_REPLY;</div><div class='add'>+		}</div><div class='add'>+		tr.code = t-&gt;code;</div><div class='add'>+		tr.flags = t-&gt;flags;</div><div class='add'>+		tr.sender_euid = t-&gt;sender_euid;</div><div class='add'>+</div><div class='add'>+		if (t-&gt;from) {</div><div class='add'>+			struct task_struct *sender = t-&gt;from-&gt;proc-&gt;tsk;</div><div class='add'>+			tr.sender_pid = task_tgid_nr_ns(sender,</div><div class='add'>+							current-&gt;nsproxy-&gt;pid_ns);</div><div class='add'>+		} else {</div><div class='add'>+			tr.sender_pid = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tr.data_size = t-&gt;buffer-&gt;data_size;</div><div class='add'>+		tr.offsets_size = t-&gt;buffer-&gt;offsets_size;</div><div class='add'>+		tr.data.ptr.buffer = (void *)t-&gt;buffer-&gt;data +</div><div class='add'>+					proc-&gt;user_buffer_offset;</div><div class='add'>+		tr.data.ptr.offsets = tr.data.ptr.buffer +</div><div class='add'>+					ALIGN(t-&gt;buffer-&gt;data_size,</div><div class='add'>+					    sizeof(void *));</div><div class='add'>+</div><div class='add'>+		if (put_user(cmd, (uint32_t __user *)ptr))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		ptr += sizeof(uint32_t);</div><div class='add'>+		if (copy_to_user(ptr, &amp;tr, sizeof(tr)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		ptr += sizeof(tr);</div><div class='add'>+</div><div class='add'>+		binder_stat_br(proc, thread, cmd);</div><div class='add'>+		binder_debug(BINDER_DEBUG_TRANSACTION,</div><div class='add'>+			     "binder: %d:%d %s %d %d:%d, cmd %d"</div><div class='add'>+			     "size %zd-%zd ptr %p-%p\n",</div><div class='add'>+			     proc-&gt;pid, thread-&gt;pid,</div><div class='add'>+			     (cmd == BR_TRANSACTION) ? "BR_TRANSACTION" :</div><div class='add'>+			     "BR_REPLY",</div><div class='add'>+			     t-&gt;debug_id, t-&gt;from ? t-&gt;from-&gt;proc-&gt;pid : 0,</div><div class='add'>+			     t-&gt;from ? t-&gt;from-&gt;pid : 0, cmd,</div><div class='add'>+			     t-&gt;buffer-&gt;data_size, t-&gt;buffer-&gt;offsets_size,</div><div class='add'>+			     tr.data.ptr.buffer, tr.data.ptr.offsets);</div><div class='add'>+</div><div class='add'>+		list_del(&amp;t-&gt;work.entry);</div><div class='add'>+		t-&gt;buffer-&gt;allow_user_free = 1;</div><div class='add'>+		if (cmd == BR_TRANSACTION &amp;&amp; !(t-&gt;flags &amp; TF_ONE_WAY)) {</div><div class='add'>+			t-&gt;to_parent = thread-&gt;transaction_stack;</div><div class='add'>+			t-&gt;to_thread = thread;</div><div class='add'>+			thread-&gt;transaction_stack = t;</div><div class='add'>+		} else {</div><div class='add'>+			t-&gt;buffer-&gt;transaction = NULL;</div><div class='add'>+			kfree(t);</div><div class='add'>+			binder_stats_deleted(BINDER_STAT_TRANSACTION);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+</div><div class='add'>+	*consumed = ptr - buffer;</div><div class='add'>+	if (proc-&gt;requested_threads + proc-&gt;ready_threads == 0 &amp;&amp;</div><div class='add'>+	    proc-&gt;requested_threads_started &lt; proc-&gt;max_threads &amp;&amp;</div><div class='add'>+	    (thread-&gt;looper &amp; (BINDER_LOOPER_STATE_REGISTERED |</div><div class='add'>+	     BINDER_LOOPER_STATE_ENTERED)) /* the user-space code fails to */</div><div class='add'>+	     /*spawn a new thread if we leave this out */) {</div><div class='add'>+		proc-&gt;requested_threads++;</div><div class='add'>+		binder_debug(BINDER_DEBUG_THREADS,</div><div class='add'>+			     "binder: %d:%d BR_SPAWN_LOOPER\n",</div><div class='add'>+			     proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+		if (put_user(BR_SPAWN_LOOPER, (uint32_t __user *)buffer))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void binder_release_work(struct list_head *list)</div><div class='add'>+{</div><div class='add'>+	struct binder_work *w;</div><div class='add'>+	while (!list_empty(list)) {</div><div class='add'>+		w = list_first_entry(list, struct binder_work, entry);</div><div class='add'>+		list_del_init(&amp;w-&gt;entry);</div><div class='add'>+		switch (w-&gt;type) {</div><div class='add'>+		case BINDER_WORK_TRANSACTION: {</div><div class='add'>+			struct binder_transaction *t;</div><div class='add'>+</div><div class='add'>+			t = container_of(w, struct binder_transaction, work);</div><div class='add'>+			if (t-&gt;buffer-&gt;target_node &amp;&amp; !(t-&gt;flags &amp; TF_ONE_WAY))</div><div class='add'>+				binder_send_failed_reply(t, BR_DEAD_REPLY);</div><div class='add'>+		} break;</div><div class='add'>+		case BINDER_WORK_TRANSACTION_COMPLETE: {</div><div class='add'>+			kfree(w);</div><div class='add'>+			binder_stats_deleted(BINDER_STAT_TRANSACTION_COMPLETE);</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'>+</div><div class='add'>+static struct binder_thread *binder_get_thread(struct binder_proc *proc)</div><div class='add'>+{</div><div class='add'>+	struct binder_thread *thread = NULL;</div><div class='add'>+	struct rb_node *parent = NULL;</div><div class='add'>+	struct rb_node **p = &amp;proc-&gt;threads.rb_node;</div><div class='add'>+</div><div class='add'>+	while (*p) {</div><div class='add'>+		parent = *p;</div><div class='add'>+		thread = rb_entry(parent, struct binder_thread, rb_node);</div><div class='add'>+</div><div class='add'>+		if (current-&gt;pid &lt; thread-&gt;pid)</div><div class='add'>+			p = &amp;(*p)-&gt;rb_left;</div><div class='add'>+		else if (current-&gt;pid &gt; thread-&gt;pid)</div><div class='add'>+			p = &amp;(*p)-&gt;rb_right;</div><div class='add'>+		else</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (*p == NULL) {</div><div class='add'>+		thread = kzalloc(sizeof(*thread), GFP_KERNEL);</div><div class='add'>+		if (thread == NULL)</div><div class='add'>+			return NULL;</div><div class='add'>+		binder_stats_created(BINDER_STAT_THREAD);</div><div class='add'>+		thread-&gt;proc = proc;</div><div class='add'>+		thread-&gt;pid = current-&gt;pid;</div><div class='add'>+		init_waitqueue_head(&amp;thread-&gt;wait);</div><div class='add'>+		INIT_LIST_HEAD(&amp;thread-&gt;todo);</div><div class='add'>+		rb_link_node(&amp;thread-&gt;rb_node, parent, p);</div><div class='add'>+		rb_insert_color(&amp;thread-&gt;rb_node, &amp;proc-&gt;threads);</div><div class='add'>+		thread-&gt;looper |= BINDER_LOOPER_STATE_NEED_RETURN;</div><div class='add'>+		thread-&gt;return_error = BR_OK;</div><div class='add'>+		thread-&gt;return_error2 = BR_OK;</div><div class='add'>+	}</div><div class='add'>+	return thread;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int binder_free_thread(struct binder_proc *proc,</div><div class='add'>+			      struct binder_thread *thread)</div><div class='add'>+{</div><div class='add'>+	struct binder_transaction *t;</div><div class='add'>+	struct binder_transaction *send_reply = NULL;</div><div class='add'>+	int active_transactions = 0;</div><div class='add'>+</div><div class='add'>+	rb_erase(&amp;thread-&gt;rb_node, &amp;proc-&gt;threads);</div><div class='add'>+	t = thread-&gt;transaction_stack;</div><div class='add'>+	if (t &amp;&amp; t-&gt;to_thread == thread)</div><div class='add'>+		send_reply = t;</div><div class='add'>+	while (t) {</div><div class='add'>+		active_transactions++;</div><div class='add'>+		binder_debug(BINDER_DEBUG_DEAD_TRANSACTION,</div><div class='add'>+			     "binder: release %d:%d transaction %d "</div><div class='add'>+			     "%s, still active\n", proc-&gt;pid, thread-&gt;pid,</div><div class='add'>+			     t-&gt;debug_id,</div><div class='add'>+			     (t-&gt;to_thread == thread) ? "in" : "out");</div><div class='add'>+</div><div class='add'>+		if (t-&gt;to_thread == thread) {</div><div class='add'>+			t-&gt;to_proc = NULL;</div><div class='add'>+			t-&gt;to_thread = NULL;</div><div class='add'>+			if (t-&gt;buffer) {</div><div class='add'>+				t-&gt;buffer-&gt;transaction = NULL;</div><div class='add'>+				t-&gt;buffer = NULL;</div><div class='add'>+			}</div><div class='add'>+			t = t-&gt;to_parent;</div><div class='add'>+		} else if (t-&gt;from == thread) {</div><div class='add'>+			t-&gt;from = NULL;</div><div class='add'>+			t = t-&gt;from_parent;</div><div class='add'>+		} else</div><div class='add'>+			BUG();</div><div class='add'>+	}</div><div class='add'>+	if (send_reply)</div><div class='add'>+		binder_send_failed_reply(send_reply, BR_DEAD_REPLY);</div><div class='add'>+	binder_release_work(&amp;thread-&gt;todo);</div><div class='add'>+	kfree(thread);</div><div class='add'>+	binder_stats_deleted(BINDER_STAT_THREAD);</div><div class='add'>+	return active_transactions;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int binder_poll(struct file *filp,</div><div class='add'>+				struct poll_table_struct *wait)</div><div class='add'>+{</div><div class='add'>+	struct binder_proc *proc = filp-&gt;private_data;</div><div class='add'>+	struct binder_thread *thread = NULL;</div><div class='add'>+	int wait_for_proc_work;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;binder_lock);</div><div class='add'>+	thread = binder_get_thread(proc);</div><div class='add'>+</div><div class='add'>+	wait_for_proc_work = thread-&gt;transaction_stack == NULL &amp;&amp;</div><div class='add'>+		list_empty(&amp;thread-&gt;todo) &amp;&amp; thread-&gt;return_error == BR_OK;</div><div class='add'>+	mutex_unlock(&amp;binder_lock);</div><div class='add'>+</div><div class='add'>+	if (wait_for_proc_work) {</div><div class='add'>+		if (binder_has_proc_work(proc, thread))</div><div class='add'>+			return POLLIN;</div><div class='add'>+		poll_wait(filp, &amp;proc-&gt;wait, wait);</div><div class='add'>+		if (binder_has_proc_work(proc, thread))</div><div class='add'>+			return POLLIN;</div><div class='add'>+	} else {</div><div class='add'>+		if (binder_has_thread_work(thread))</div><div class='add'>+			return POLLIN;</div><div class='add'>+		poll_wait(filp, &amp;thread-&gt;wait, wait);</div><div class='add'>+		if (binder_has_thread_work(thread))</div><div class='add'>+			return POLLIN;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct binder_proc *proc = filp-&gt;private_data;</div><div class='add'>+	struct binder_thread *thread;</div><div class='add'>+	unsigned int size = _IOC_SIZE(cmd);</div><div class='add'>+	void __user *ubuf = (void __user *)arg;</div><div class='add'>+</div><div class='add'>+	/*printk(KERN_INFO "binder_ioctl: %d:%d %x %lx\n", proc-&gt;pid, current-&gt;pid, cmd, arg);*/</div><div class='add'>+</div><div class='add'>+	ret = wait_event_interruptible(binder_user_error_wait, binder_stop_on_user_error &lt; 2);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;binder_lock);</div><div class='add'>+	thread = binder_get_thread(proc);</div><div class='add'>+	if (thread == NULL) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case BINDER_WRITE_READ: {</div><div class='add'>+		struct binder_write_read bwr;</div><div class='add'>+		if (size != sizeof(struct binder_write_read)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		if (copy_from_user(&amp;bwr, ubuf, sizeof(bwr))) {</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		binder_debug(BINDER_DEBUG_READ_WRITE,</div><div class='add'>+			     "binder: %d:%d write %ld at %08lx, read %ld at %08lx\n",</div><div class='add'>+			     proc-&gt;pid, thread-&gt;pid, bwr.write_size, bwr.write_buffer,</div><div class='add'>+			     bwr.read_size, bwr.read_buffer);</div><div class='add'>+</div><div class='add'>+		if (bwr.write_size &gt; 0) {</div><div class='add'>+			ret = binder_thread_write(proc, thread, (void __user *)bwr.write_buffer, bwr.write_size, &amp;bwr.write_consumed);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				bwr.read_consumed = 0;</div><div class='add'>+				if (copy_to_user(ubuf, &amp;bwr, sizeof(bwr)))</div><div class='add'>+					ret = -EFAULT;</div><div class='add'>+				goto err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (bwr.read_size &gt; 0) {</div><div class='add'>+			ret = binder_thread_read(proc, thread, (void __user *)bwr.read_buffer, bwr.read_size, &amp;bwr.read_consumed, filp-&gt;f_flags &amp; O_NONBLOCK);</div><div class='add'>+			if (!list_empty(&amp;proc-&gt;todo))</div><div class='add'>+				wake_up_interruptible(&amp;proc-&gt;wait);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				if (copy_to_user(ubuf, &amp;bwr, sizeof(bwr)))</div><div class='add'>+					ret = -EFAULT;</div><div class='add'>+				goto err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		binder_debug(BINDER_DEBUG_READ_WRITE,</div><div class='add'>+			     "binder: %d:%d wrote %ld of %ld, read return %ld of %ld\n",</div><div class='add'>+			     proc-&gt;pid, thread-&gt;pid, bwr.write_consumed, bwr.write_size,</div><div class='add'>+			     bwr.read_consumed, bwr.read_size);</div><div class='add'>+		if (copy_to_user(ubuf, &amp;bwr, sizeof(bwr))) {</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case BINDER_SET_MAX_THREADS:</div><div class='add'>+		if (copy_from_user(&amp;proc-&gt;max_threads, ubuf, sizeof(proc-&gt;max_threads))) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case BINDER_SET_CONTEXT_MGR:</div><div class='add'>+		if (binder_context_mgr_node != NULL) {</div><div class='add'>+			printk(KERN_ERR "binder: BINDER_SET_CONTEXT_MGR already set\n");</div><div class='add'>+			ret = -EBUSY;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		if (binder_context_mgr_uid != -1) {</div><div class='add'>+			if (binder_context_mgr_uid != current-&gt;cred-&gt;euid) {</div><div class='add'>+				printk(KERN_ERR "binder: BINDER_SET_"</div><div class='add'>+				       "CONTEXT_MGR bad uid %d != %d\n",</div><div class='add'>+				       current-&gt;cred-&gt;euid,</div><div class='add'>+				       binder_context_mgr_uid);</div><div class='add'>+				ret = -EPERM;</div><div class='add'>+				goto err;</div><div class='add'>+			}</div><div class='add'>+		} else</div><div class='add'>+			binder_context_mgr_uid = current-&gt;cred-&gt;euid;</div><div class='add'>+		binder_context_mgr_node = binder_new_node(proc, NULL, NULL);</div><div class='add'>+		if (binder_context_mgr_node == NULL) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		binder_context_mgr_node-&gt;local_weak_refs++;</div><div class='add'>+		binder_context_mgr_node-&gt;local_strong_refs++;</div><div class='add'>+		binder_context_mgr_node-&gt;has_strong_ref = 1;</div><div class='add'>+		binder_context_mgr_node-&gt;has_weak_ref = 1;</div><div class='add'>+		break;</div><div class='add'>+	case BINDER_THREAD_EXIT:</div><div class='add'>+		binder_debug(BINDER_DEBUG_THREADS, "binder: %d:%d exit\n",</div><div class='add'>+			     proc-&gt;pid, thread-&gt;pid);</div><div class='add'>+		binder_free_thread(proc, thread);</div><div class='add'>+		thread = NULL;</div><div class='add'>+		break;</div><div class='add'>+	case BINDER_VERSION:</div><div class='add'>+		if (size != sizeof(struct binder_version)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		if (put_user(BINDER_CURRENT_PROTOCOL_VERSION, &amp;((struct binder_version *)ubuf)-&gt;protocol_version)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	ret = 0;</div><div class='add'>+err:</div><div class='add'>+	if (thread)</div><div class='add'>+		thread-&gt;looper &amp;= ~BINDER_LOOPER_STATE_NEED_RETURN;</div><div class='add'>+	mutex_unlock(&amp;binder_lock);</div><div class='add'>+	wait_event_interruptible(binder_user_error_wait, binder_stop_on_user_error &lt; 2);</div><div class='add'>+	if (ret &amp;&amp; ret != -ERESTARTSYS)</div><div class='add'>+		printk(KERN_INFO "binder: %d:%d ioctl %x %lx returned %d\n", proc-&gt;pid, current-&gt;pid, cmd, arg, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void binder_vma_open(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	struct binder_proc *proc = vma-&gt;vm_private_data;</div><div class='add'>+	binder_debug(BINDER_DEBUG_OPEN_CLOSE,</div><div class='add'>+		     "binder: %d open vm area %lx-%lx (%ld K) vma %lx pagep %lx\n",</div><div class='add'>+		     proc-&gt;pid, vma-&gt;vm_start, vma-&gt;vm_end,</div><div class='add'>+		     (vma-&gt;vm_end - vma-&gt;vm_start) / SZ_1K, vma-&gt;vm_flags,</div><div class='add'>+		     (unsigned long)pgprot_val(vma-&gt;vm_page_prot));</div><div class='add'>+	dump_stack();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void binder_vma_close(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	struct binder_proc *proc = vma-&gt;vm_private_data;</div><div class='add'>+	binder_debug(BINDER_DEBUG_OPEN_CLOSE,</div><div class='add'>+		     "binder: %d close vm area %lx-%lx (%ld K) vma %lx pagep %lx\n",</div><div class='add'>+		     proc-&gt;pid, vma-&gt;vm_start, vma-&gt;vm_end,</div><div class='add'>+		     (vma-&gt;vm_end - vma-&gt;vm_start) / SZ_1K, vma-&gt;vm_flags,</div><div class='add'>+		     (unsigned long)pgprot_val(vma-&gt;vm_page_prot));</div><div class='add'>+	proc-&gt;vma = NULL;</div><div class='add'>+	binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct vm_operations_struct binder_vm_ops = {</div><div class='add'>+	.open = binder_vma_open,</div><div class='add'>+	.close = binder_vma_close,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int binder_mmap(struct file *filp, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct vm_struct *area;</div><div class='add'>+	struct binder_proc *proc = filp-&gt;private_data;</div><div class='add'>+	const char *failure_string;</div><div class='add'>+	struct binder_buffer *buffer;</div><div class='add'>+</div><div class='add'>+	if ((vma-&gt;vm_end - vma-&gt;vm_start) &gt; SZ_4M)</div><div class='add'>+		vma-&gt;vm_end = vma-&gt;vm_start + SZ_4M;</div><div class='add'>+</div><div class='add'>+	binder_debug(BINDER_DEBUG_OPEN_CLOSE,</div><div class='add'>+		     "binder_mmap: %d %lx-%lx (%ld K) vma %lx pagep %lx\n",</div><div class='add'>+		     proc-&gt;pid, vma-&gt;vm_start, vma-&gt;vm_end,</div><div class='add'>+		     (vma-&gt;vm_end - vma-&gt;vm_start) / SZ_1K, vma-&gt;vm_flags,</div><div class='add'>+		     (unsigned long)pgprot_val(vma-&gt;vm_page_prot));</div><div class='add'>+</div><div class='add'>+	if (vma-&gt;vm_flags &amp; FORBIDDEN_MMAP_FLAGS) {</div><div class='add'>+		ret = -EPERM;</div><div class='add'>+		failure_string = "bad vm_flags";</div><div class='add'>+		goto err_bad_arg;</div><div class='add'>+	}</div><div class='add'>+	vma-&gt;vm_flags = (vma-&gt;vm_flags | VM_DONTCOPY) &amp; ~VM_MAYWRITE;</div><div class='add'>+</div><div class='add'>+	if (proc-&gt;buffer) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		failure_string = "already mapped";</div><div class='add'>+		goto err_already_mapped;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	area = get_vm_area(vma-&gt;vm_end - vma-&gt;vm_start, VM_IOREMAP);</div><div class='add'>+	if (area == NULL) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		failure_string = "get_vm_area";</div><div class='add'>+		goto err_get_vm_area_failed;</div><div class='add'>+	}</div><div class='add'>+	proc-&gt;buffer = area-&gt;addr;</div><div class='add'>+	proc-&gt;user_buffer_offset = vma-&gt;vm_start - (uintptr_t)proc-&gt;buffer;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_CACHE_VIPT</div><div class='add'>+	if (cache_is_vipt_aliasing()) {</div><div class='add'>+		while (CACHE_COLOUR((vma-&gt;vm_start ^ (uint32_t)proc-&gt;buffer))) {</div><div class='add'>+			printk(KERN_INFO "binder_mmap: %d %lx-%lx maps %p bad alignment\n", proc-&gt;pid, vma-&gt;vm_start, vma-&gt;vm_end, proc-&gt;buffer);</div><div class='add'>+			vma-&gt;vm_start += PAGE_SIZE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	proc-&gt;pages = kzalloc(sizeof(proc-&gt;pages[0]) * ((vma-&gt;vm_end - vma-&gt;vm_start) / PAGE_SIZE), GFP_KERNEL);</div><div class='add'>+	if (proc-&gt;pages == NULL) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		failure_string = "alloc page array";</div><div class='add'>+		goto err_alloc_pages_failed;</div><div class='add'>+	}</div><div class='add'>+	proc-&gt;buffer_size = vma-&gt;vm_end - vma-&gt;vm_start;</div><div class='add'>+</div><div class='add'>+	vma-&gt;vm_ops = &amp;binder_vm_ops;</div><div class='add'>+	vma-&gt;vm_private_data = proc;</div><div class='add'>+</div><div class='add'>+	if (binder_update_page_range(proc, 1, proc-&gt;buffer, proc-&gt;buffer + PAGE_SIZE, vma)) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		failure_string = "alloc small buf";</div><div class='add'>+		goto err_alloc_small_buf_failed;</div><div class='add'>+	}</div><div class='add'>+	buffer = proc-&gt;buffer;</div><div class='add'>+	INIT_LIST_HEAD(&amp;proc-&gt;buffers);</div><div class='add'>+	list_add(&amp;buffer-&gt;entry, &amp;proc-&gt;buffers);</div><div class='add'>+	buffer-&gt;free = 1;</div><div class='add'>+	binder_insert_free_buffer(proc, buffer);</div><div class='add'>+	proc-&gt;free_async_space = proc-&gt;buffer_size / 2;</div><div class='add'>+	barrier();</div><div class='add'>+	proc-&gt;files = get_files_struct(current);</div><div class='add'>+	proc-&gt;vma = vma;</div><div class='add'>+</div><div class='add'>+	/*printk(KERN_INFO "binder_mmap: %d %lx-%lx maps %p\n",</div><div class='add'>+		 proc-&gt;pid, vma-&gt;vm_start, vma-&gt;vm_end, proc-&gt;buffer);*/</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_alloc_small_buf_failed:</div><div class='add'>+	kfree(proc-&gt;pages);</div><div class='add'>+	proc-&gt;pages = NULL;</div><div class='add'>+err_alloc_pages_failed:</div><div class='add'>+	vfree(proc-&gt;buffer);</div><div class='add'>+	proc-&gt;buffer = NULL;</div><div class='add'>+err_get_vm_area_failed:</div><div class='add'>+err_already_mapped:</div><div class='add'>+err_bad_arg:</div><div class='add'>+	printk(KERN_ERR "binder_mmap: %d %lx-%lx %s failed %d\n",</div><div class='add'>+	       proc-&gt;pid, vma-&gt;vm_start, vma-&gt;vm_end, failure_string, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int binder_open(struct inode *nodp, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	struct binder_proc *proc;</div><div class='add'>+</div><div class='add'>+	binder_debug(BINDER_DEBUG_OPEN_CLOSE, "binder_open: %d:%d\n",</div><div class='add'>+		     current-&gt;group_leader-&gt;pid, current-&gt;pid);</div><div class='add'>+</div><div class='add'>+	proc = kzalloc(sizeof(*proc), GFP_KERNEL);</div><div class='add'>+	if (proc == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	get_task_struct(current);</div><div class='add'>+	proc-&gt;tsk = current;</div><div class='add'>+	INIT_LIST_HEAD(&amp;proc-&gt;todo);</div><div class='add'>+	init_waitqueue_head(&amp;proc-&gt;wait);</div><div class='add'>+	proc-&gt;default_priority = task_nice(current);</div><div class='add'>+	mutex_lock(&amp;binder_lock);</div><div class='add'>+	binder_stats_created(BINDER_STAT_PROC);</div><div class='add'>+	hlist_add_head(&amp;proc-&gt;proc_node, &amp;binder_procs);</div><div class='add'>+	proc-&gt;pid = current-&gt;group_leader-&gt;pid;</div><div class='add'>+	INIT_LIST_HEAD(&amp;proc-&gt;delivered_death);</div><div class='add'>+	filp-&gt;private_data = proc;</div><div class='add'>+	mutex_unlock(&amp;binder_lock);</div><div class='add'>+</div><div class='add'>+	if (binder_debugfs_dir_entry_proc) {</div><div class='add'>+		char strbuf[11];</div><div class='add'>+		snprintf(strbuf, sizeof(strbuf), "%u", proc-&gt;pid);</div><div class='add'>+		proc-&gt;debugfs_entry = debugfs_create_file(strbuf, S_IRUGO,</div><div class='add'>+			binder_debugfs_dir_entry_proc, proc, &amp;binder_proc_fops);</div><div 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 binder_flush(struct file *filp, fl_owner_t id)</div><div class='add'>+{</div><div class='add'>+	struct binder_proc *proc = filp-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	binder_defer_work(proc, BINDER_DEFERRED_FLUSH);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void binder_deferred_flush(struct binder_proc *proc)</div><div class='add'>+{</div><div class='add'>+	struct rb_node *n;</div><div class='add'>+	int wake_count = 0;</div><div class='add'>+	for (n = rb_first(&amp;proc-&gt;threads); n != NULL; n = rb_next(n)) {</div><div class='add'>+		struct binder_thread *thread = rb_entry(n, struct binder_thread, rb_node);</div><div class='add'>+		thread-&gt;looper |= BINDER_LOOPER_STATE_NEED_RETURN;</div><div class='add'>+		if (thread-&gt;looper &amp; BINDER_LOOPER_STATE_WAITING) {</div><div class='add'>+			wake_up_interruptible(&amp;thread-&gt;wait);</div><div class='add'>+			wake_count++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	wake_up_interruptible_all(&amp;proc-&gt;wait);</div><div class='add'>+</div><div class='add'>+	binder_debug(BINDER_DEBUG_OPEN_CLOSE,</div><div class='add'>+		     "binder_flush: %d woke %d threads\n", proc-&gt;pid,</div><div class='add'>+		     wake_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int binder_release(struct inode *nodp, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	struct binder_proc *proc = filp-&gt;private_data;</div><div class='add'>+	debugfs_remove(proc-&gt;debugfs_entry);</div><div class='add'>+	binder_defer_work(proc, BINDER_DEFERRED_RELEASE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void binder_deferred_release(struct binder_proc *proc)</div><div class='add'>+{</div><div class='add'>+	struct hlist_node *pos;</div><div class='add'>+	struct binder_transaction *t;</div><div class='add'>+	struct rb_node *n;</div><div class='add'>+	int threads, nodes, incoming_refs, outgoing_refs, buffers, active_transactions, page_count;</div><div class='add'>+</div><div class='add'>+	BUG_ON(proc-&gt;vma);</div><div class='add'>+	BUG_ON(proc-&gt;files);</div><div class='add'>+</div><div class='add'>+	hlist_del(&amp;proc-&gt;proc_node);</div><div class='add'>+	if (binder_context_mgr_node &amp;&amp; binder_context_mgr_node-&gt;proc == proc) {</div><div class='add'>+		binder_debug(BINDER_DEBUG_DEAD_BINDER,</div><div class='add'>+			     "binder_release: %d context_mgr_node gone\n",</div><div class='add'>+			     proc-&gt;pid);</div><div class='add'>+		binder_context_mgr_node = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	threads = 0;</div><div class='add'>+	active_transactions = 0;</div><div class='add'>+	while ((n = rb_first(&amp;proc-&gt;threads))) {</div><div class='add'>+		struct binder_thread *thread = rb_entry(n, struct binder_thread, rb_node);</div><div class='add'>+		threads++;</div><div class='add'>+		active_transactions += binder_free_thread(proc, thread);</div><div class='add'>+	}</div><div class='add'>+	nodes = 0;</div><div class='add'>+	incoming_refs = 0;</div><div class='add'>+	while ((n = rb_first(&amp;proc-&gt;nodes))) {</div><div class='add'>+		struct binder_node *node = rb_entry(n, struct binder_node, rb_node);</div><div class='add'>+</div><div class='add'>+		nodes++;</div><div class='add'>+		rb_erase(&amp;node-&gt;rb_node, &amp;proc-&gt;nodes);</div><div class='add'>+		list_del_init(&amp;node-&gt;work.entry);</div><div class='add'>+		if (hlist_empty(&amp;node-&gt;refs)) {</div><div class='add'>+			kfree(node);</div><div class='add'>+			binder_stats_deleted(BINDER_STAT_NODE);</div><div class='add'>+		} else {</div><div class='add'>+			struct binder_ref *ref;</div><div class='add'>+			int death = 0;</div><div class='add'>+</div><div class='add'>+			node-&gt;proc = NULL;</div><div class='add'>+			node-&gt;local_strong_refs = 0;</div><div class='add'>+			node-&gt;local_weak_refs = 0;</div><div class='add'>+			hlist_add_head(&amp;node-&gt;dead_node, &amp;binder_dead_nodes);</div><div class='add'>+</div><div class='add'>+			hlist_for_each_entry(ref, pos, &amp;node-&gt;refs, node_entry) {</div><div class='add'>+				incoming_refs++;</div><div class='add'>+				if (ref-&gt;death) {</div><div class='add'>+					death++;</div><div class='add'>+					if (list_empty(&amp;ref-&gt;death-&gt;work.entry)) {</div><div class='add'>+						ref-&gt;death-&gt;work.type = BINDER_WORK_DEAD_BINDER;</div><div class='add'>+						list_add_tail(&amp;ref-&gt;death-&gt;work.entry, &amp;ref-&gt;proc-&gt;todo);</div><div class='add'>+						wake_up_interruptible(&amp;ref-&gt;proc-&gt;wait);</div><div class='add'>+					} else</div><div class='add'>+						BUG();</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			binder_debug(BINDER_DEBUG_DEAD_BINDER,</div><div class='add'>+				     "binder: node %d now dead, "</div><div class='add'>+				     "refs %d, death %d\n", node-&gt;debug_id,</div><div class='add'>+				     incoming_refs, death);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	outgoing_refs = 0;</div><div class='add'>+	while ((n = rb_first(&amp;proc-&gt;refs_by_desc))) {</div><div class='add'>+		struct binder_ref *ref = rb_entry(n, struct binder_ref,</div><div class='add'>+						  rb_node_desc);</div><div class='add'>+		outgoing_refs++;</div><div class='add'>+		binder_delete_ref(ref);</div><div class='add'>+	}</div><div class='add'>+	binder_release_work(&amp;proc-&gt;todo);</div><div class='add'>+	buffers = 0;</div><div class='add'>+</div><div class='add'>+	while ((n = rb_first(&amp;proc-&gt;allocated_buffers))) {</div><div class='add'>+		struct binder_buffer *buffer = rb_entry(n, struct binder_buffer,</div><div class='add'>+							rb_node);</div><div class='add'>+		t = buffer-&gt;transaction;</div><div class='add'>+		if (t) {</div><div class='add'>+			t-&gt;buffer = NULL;</div><div class='add'>+			buffer-&gt;transaction = NULL;</div><div class='add'>+			printk(KERN_ERR "binder: release proc %d, "</div><div class='add'>+			       "transaction %d, not freed\n",</div><div class='add'>+			       proc-&gt;pid, t-&gt;debug_id);</div><div class='add'>+			/*BUG();*/</div><div class='add'>+		}</div><div class='add'>+		binder_free_buf(proc, buffer);</div><div class='add'>+		buffers++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	binder_stats_deleted(BINDER_STAT_PROC);</div><div class='add'>+</div><div class='add'>+	page_count = 0;</div><div class='add'>+	if (proc-&gt;pages) {</div><div class='add'>+		int i;</div><div class='add'>+		for (i = 0; i &lt; proc-&gt;buffer_size / PAGE_SIZE; i++) {</div><div class='add'>+			if (proc-&gt;pages[i]) {</div><div class='add'>+				void *page_addr = proc-&gt;buffer + i * PAGE_SIZE;</div><div class='add'>+				binder_debug(BINDER_DEBUG_BUFFER_ALLOC,</div><div class='add'>+					     "binder_release: %d: "</div><div class='add'>+					     "page %d at %p not freed\n",</div><div class='add'>+					     proc-&gt;pid, i,</div><div class='add'>+					     page_addr);</div><div class='add'>+				unmap_kernel_range((unsigned long)page_addr,</div><div class='add'>+					PAGE_SIZE);</div><div class='add'>+				__free_page(proc-&gt;pages[i]);</div><div class='add'>+				page_count++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		kfree(proc-&gt;pages);</div><div class='add'>+		vfree(proc-&gt;buffer);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	put_task_struct(proc-&gt;tsk);</div><div class='add'>+</div><div class='add'>+	binder_debug(BINDER_DEBUG_OPEN_CLOSE,</div><div class='add'>+		     "binder_release: %d threads %d, nodes %d (ref %d), "</div><div class='add'>+		     "refs %d, active transactions %d, buffers %d, "</div><div class='add'>+		     "pages %d\n",</div><div class='add'>+		     proc-&gt;pid, threads, nodes, incoming_refs, outgoing_refs,</div><div class='add'>+		     active_transactions, buffers, page_count);</div><div class='add'>+</div><div class='add'>+	kfree(proc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void binder_deferred_func(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct binder_proc *proc;</div><div class='add'>+	struct files_struct *files;</div><div class='add'>+</div><div class='add'>+	int defer;</div><div class='add'>+	do {</div><div class='add'>+		mutex_lock(&amp;binder_lock);</div><div class='add'>+		mutex_lock(&amp;binder_deferred_lock);</div><div class='add'>+		if (!hlist_empty(&amp;binder_deferred_list)) {</div><div class='add'>+			proc = hlist_entry(binder_deferred_list.first,</div><div class='add'>+					struct binder_proc, deferred_work_node);</div><div class='add'>+			hlist_del_init(&amp;proc-&gt;deferred_work_node);</div><div class='add'>+			defer = proc-&gt;deferred_work;</div><div class='add'>+			proc-&gt;deferred_work = 0;</div><div class='add'>+		} else {</div><div class='add'>+			proc = NULL;</div><div class='add'>+			defer = 0;</div><div class='add'>+		}</div><div class='add'>+		mutex_unlock(&amp;binder_deferred_lock);</div><div class='add'>+</div><div class='add'>+		files = NULL;</div><div class='add'>+		if (defer &amp; BINDER_DEFERRED_PUT_FILES) {</div><div class='add'>+			files = proc-&gt;files;</div><div class='add'>+			if (files)</div><div class='add'>+				proc-&gt;files = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (defer &amp; BINDER_DEFERRED_FLUSH)</div><div class='add'>+			binder_deferred_flush(proc);</div><div class='add'>+</div><div class='add'>+		if (defer &amp; BINDER_DEFERRED_RELEASE)</div><div class='add'>+			binder_deferred_release(proc); /* frees proc */</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;binder_lock);</div><div class='add'>+		if (files)</div><div class='add'>+			put_files_struct(files);</div><div class='add'>+	} while (proc);</div><div class='add'>+}</div><div class='add'>+static DECLARE_WORK(binder_deferred_work, binder_deferred_func);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;binder_deferred_lock);</div><div class='add'>+	proc-&gt;deferred_work |= defer;</div><div class='add'>+	if (hlist_unhashed(&amp;proc-&gt;deferred_work_node)) {</div><div class='add'>+		hlist_add_head(&amp;proc-&gt;deferred_work_node,</div><div class='add'>+				&amp;binder_deferred_list);</div><div class='add'>+		queue_work(binder_deferred_workqueue, &amp;binder_deferred_work);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;binder_deferred_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_binder_transaction(struct seq_file *m, const char *prefix,</div><div class='add'>+				     struct binder_transaction *t)</div><div class='add'>+{</div><div class='add'>+	seq_printf(m,</div><div class='add'>+		   "%s %d: %p from %d:%d to %d:%d code %x flags %x pri %ld r%d",</div><div class='add'>+		   prefix, t-&gt;debug_id, t,</div><div class='add'>+		   t-&gt;from ? t-&gt;from-&gt;proc-&gt;pid : 0,</div><div class='add'>+		   t-&gt;from ? t-&gt;from-&gt;pid : 0,</div><div class='add'>+		   t-&gt;to_proc ? t-&gt;to_proc-&gt;pid : 0,</div><div class='add'>+		   t-&gt;to_thread ? t-&gt;to_thread-&gt;pid : 0,</div><div class='add'>+		   t-&gt;code, t-&gt;flags, t-&gt;priority, t-&gt;need_reply);</div><div class='add'>+	if (t-&gt;buffer == NULL) {</div><div class='add'>+		seq_puts(m, " buffer free\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (t-&gt;buffer-&gt;target_node)</div><div class='add'>+		seq_printf(m, " node %d",</div><div class='add'>+			   t-&gt;buffer-&gt;target_node-&gt;debug_id);</div><div class='add'>+	seq_printf(m, " size %zd:%zd data %p\n",</div><div class='add'>+		   t-&gt;buffer-&gt;data_size, t-&gt;buffer-&gt;offsets_size,</div><div class='add'>+		   t-&gt;buffer-&gt;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_binder_buffer(struct seq_file *m, const char *prefix,</div><div class='add'>+				struct binder_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	seq_printf(m, "%s %d: %p size %zd:%zd %s\n",</div><div class='add'>+		   prefix, buffer-&gt;debug_id, buffer-&gt;data,</div><div class='add'>+		   buffer-&gt;data_size, buffer-&gt;offsets_size,</div><div class='add'>+		   buffer-&gt;transaction ? "active" : "delivered");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_binder_work(struct seq_file *m, const char *prefix,</div><div class='add'>+			      const char *transaction_prefix,</div><div class='add'>+			      struct binder_work *w)</div><div class='add'>+{</div><div class='add'>+	struct binder_node *node;</div><div class='add'>+	struct binder_transaction *t;</div><div class='add'>+</div><div class='add'>+	switch (w-&gt;type) {</div><div class='add'>+	case BINDER_WORK_TRANSACTION:</div><div class='add'>+		t = container_of(w, struct binder_transaction, work);</div><div class='add'>+		print_binder_transaction(m, transaction_prefix, t);</div><div class='add'>+		break;</div><div class='add'>+	case BINDER_WORK_TRANSACTION_COMPLETE:</div><div class='add'>+		seq_printf(m, "%stransaction complete\n", prefix);</div><div class='add'>+		break;</div><div class='add'>+	case BINDER_WORK_NODE:</div><div class='add'>+		node = container_of(w, struct binder_node, work);</div><div class='add'>+		seq_printf(m, "%snode work %d: u%p c%p\n",</div><div class='add'>+			   prefix, node-&gt;debug_id, node-&gt;ptr, node-&gt;cookie);</div><div class='add'>+		break;</div><div class='add'>+	case BINDER_WORK_DEAD_BINDER:</div><div class='add'>+		seq_printf(m, "%shas dead binder\n", prefix);</div><div class='add'>+		break;</div><div class='add'>+	case BINDER_WORK_DEAD_BINDER_AND_CLEAR:</div><div class='add'>+		seq_printf(m, "%shas cleared dead binder\n", prefix);</div><div class='add'>+		break;</div><div class='add'>+	case BINDER_WORK_CLEAR_DEATH_NOTIFICATION:</div><div class='add'>+		seq_printf(m, "%shas cleared death notification\n", prefix);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		seq_printf(m, "%sunknown work: type %d\n", prefix, w-&gt;type);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_binder_thread(struct seq_file *m,</div><div class='add'>+				struct binder_thread *thread,</div><div class='add'>+				int print_always)</div><div class='add'>+{</div><div class='add'>+	struct binder_transaction *t;</div><div class='add'>+	struct binder_work *w;</div><div class='add'>+	size_t start_pos = m-&gt;count;</div><div class='add'>+	size_t header_pos;</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "  thread %d: l %02x\n", thread-&gt;pid, thread-&gt;looper);</div><div class='add'>+	header_pos = m-&gt;count;</div><div class='add'>+	t = thread-&gt;transaction_stack;</div><div class='add'>+	while (t) {</div><div class='add'>+		if (t-&gt;from == thread) {</div><div class='add'>+			print_binder_transaction(m,</div><div class='add'>+						 "    outgoing transaction", t);</div><div class='add'>+			t = t-&gt;from_parent;</div><div class='add'>+		} else if (t-&gt;to_thread == thread) {</div><div class='add'>+			print_binder_transaction(m,</div><div class='add'>+						 "    incoming transaction", t);</div><div class='add'>+			t = t-&gt;to_parent;</div><div class='add'>+		} else {</div><div class='add'>+			print_binder_transaction(m, "    bad transaction", t);</div><div class='add'>+			t = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	list_for_each_entry(w, &amp;thread-&gt;todo, entry) {</div><div class='add'>+		print_binder_work(m, "    ", "    pending transaction", w);</div><div class='add'>+	}</div><div class='add'>+	if (!print_always &amp;&amp; m-&gt;count == header_pos)</div><div class='add'>+		m-&gt;count = start_pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_binder_node(struct seq_file *m, struct binder_node *node)</div><div class='add'>+{</div><div class='add'>+	struct binder_ref *ref;</div><div class='add'>+	struct hlist_node *pos;</div><div class='add'>+	struct binder_work *w;</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='add'>+	count = 0;</div><div class='add'>+	hlist_for_each_entry(ref, pos, &amp;node-&gt;refs, node_entry)</div><div class='add'>+		count++;</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "  node %d: u%p c%p hs %d hw %d ls %d lw %d is %d iw %d",</div><div class='add'>+		   node-&gt;debug_id, node-&gt;ptr, node-&gt;cookie,</div><div class='add'>+		   node-&gt;has_strong_ref, node-&gt;has_weak_ref,</div><div class='add'>+		   node-&gt;local_strong_refs, node-&gt;local_weak_refs,</div><div class='add'>+		   node-&gt;internal_strong_refs, count);</div><div class='add'>+	if (count) {</div><div class='add'>+		seq_puts(m, " proc");</div><div class='add'>+		hlist_for_each_entry(ref, pos, &amp;node-&gt;refs, node_entry)</div><div class='add'>+			seq_printf(m, " %d", ref-&gt;proc-&gt;pid);</div><div class='add'>+	}</div><div class='add'>+	seq_puts(m, "\n");</div><div class='add'>+	list_for_each_entry(w, &amp;node-&gt;async_todo, entry)</div><div class='add'>+		print_binder_work(m, "    ",</div><div class='add'>+				  "    pending async transaction", w);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_binder_ref(struct seq_file *m, struct binder_ref *ref)</div><div class='add'>+{</div><div class='add'>+	seq_printf(m, "  ref %d: desc %d %snode %d s %d w %d d %p\n",</div><div class='add'>+		   ref-&gt;debug_id, ref-&gt;desc, ref-&gt;node-&gt;proc ? "" : "dead ",</div><div class='add'>+		   ref-&gt;node-&gt;debug_id, ref-&gt;strong, ref-&gt;weak, ref-&gt;death);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_binder_proc(struct seq_file *m,</div><div class='add'>+			      struct binder_proc *proc, int print_all)</div><div class='add'>+{</div><div class='add'>+	struct binder_work *w;</div><div class='add'>+	struct rb_node *n;</div><div class='add'>+	size_t start_pos = m-&gt;count;</div><div class='add'>+	size_t header_pos;</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "proc %d\n", proc-&gt;pid);</div><div class='add'>+	header_pos = m-&gt;count;</div><div class='add'>+</div><div class='add'>+	for (n = rb_first(&amp;proc-&gt;threads); n != NULL; n = rb_next(n))</div><div class='add'>+		print_binder_thread(m, rb_entry(n, struct binder_thread,</div><div class='add'>+						rb_node), print_all);</div><div class='add'>+	for (n = rb_first(&amp;proc-&gt;nodes); n != NULL; n = rb_next(n)) {</div><div class='add'>+		struct binder_node *node = rb_entry(n, struct binder_node,</div><div class='add'>+						    rb_node);</div><div class='add'>+		if (print_all || node-&gt;has_async_transaction)</div><div class='add'>+			print_binder_node(m, node);</div><div class='add'>+	}</div><div class='add'>+	if (print_all) {</div><div class='add'>+		for (n = rb_first(&amp;proc-&gt;refs_by_desc);</div><div class='add'>+		     n != NULL;</div><div class='add'>+		     n = rb_next(n))</div><div class='add'>+			print_binder_ref(m, rb_entry(n, struct binder_ref,</div><div class='add'>+						     rb_node_desc));</div><div class='add'>+	}</div><div class='add'>+	for (n = rb_first(&amp;proc-&gt;allocated_buffers); n != NULL; n = rb_next(n))</div><div class='add'>+		print_binder_buffer(m, "  buffer",</div><div class='add'>+				    rb_entry(n, struct binder_buffer, rb_node));</div><div class='add'>+	list_for_each_entry(w, &amp;proc-&gt;todo, entry)</div><div class='add'>+		print_binder_work(m, "  ", "  pending transaction", w);</div><div class='add'>+	list_for_each_entry(w, &amp;proc-&gt;delivered_death, entry) {</div><div class='add'>+		seq_puts(m, "  has delivered dead binder\n");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (!print_all &amp;&amp; m-&gt;count == header_pos)</div><div class='add'>+		m-&gt;count = start_pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *binder_return_strings[] = {</div><div class='add'>+	"BR_ERROR",</div><div class='add'>+	"BR_OK",</div><div class='add'>+	"BR_TRANSACTION",</div><div class='add'>+	"BR_REPLY",</div><div class='add'>+	"BR_ACQUIRE_RESULT",</div><div class='add'>+	"BR_DEAD_REPLY",</div><div class='add'>+	"BR_TRANSACTION_COMPLETE",</div><div class='add'>+	"BR_INCREFS",</div><div class='add'>+	"BR_ACQUIRE",</div><div class='add'>+	"BR_RELEASE",</div><div class='add'>+	"BR_DECREFS",</div><div class='add'>+	"BR_ATTEMPT_ACQUIRE",</div><div class='add'>+	"BR_NOOP",</div><div class='add'>+	"BR_SPAWN_LOOPER",</div><div class='add'>+	"BR_FINISHED",</div><div class='add'>+	"BR_DEAD_BINDER",</div><div class='add'>+	"BR_CLEAR_DEATH_NOTIFICATION_DONE",</div><div class='add'>+	"BR_FAILED_REPLY"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *binder_command_strings[] = {</div><div class='add'>+	"BC_TRANSACTION",</div><div class='add'>+	"BC_REPLY",</div><div class='add'>+	"BC_ACQUIRE_RESULT",</div><div class='add'>+	"BC_FREE_BUFFER",</div><div class='add'>+	"BC_INCREFS",</div><div class='add'>+	"BC_ACQUIRE",</div><div class='add'>+	"BC_RELEASE",</div><div class='add'>+	"BC_DECREFS",</div><div class='add'>+	"BC_INCREFS_DONE",</div><div class='add'>+	"BC_ACQUIRE_DONE",</div><div class='add'>+	"BC_ATTEMPT_ACQUIRE",</div><div class='add'>+	"BC_REGISTER_LOOPER",</div><div class='add'>+	"BC_ENTER_LOOPER",</div><div class='add'>+	"BC_EXIT_LOOPER",</div><div class='add'>+	"BC_REQUEST_DEATH_NOTIFICATION",</div><div class='add'>+	"BC_CLEAR_DEATH_NOTIFICATION",</div><div class='add'>+	"BC_DEAD_BINDER_DONE"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *binder_objstat_strings[] = {</div><div class='add'>+	"proc",</div><div class='add'>+	"thread",</div><div class='add'>+	"node",</div><div class='add'>+	"ref",</div><div class='add'>+	"death",</div><div class='add'>+	"transaction",</div><div class='add'>+	"transaction_complete"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void print_binder_stats(struct seq_file *m, const char *prefix,</div><div class='add'>+			       struct binder_stats *stats)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(stats-&gt;bc) !=</div><div class='add'>+		     ARRAY_SIZE(binder_command_strings));</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(stats-&gt;bc); i++) {</div><div class='add'>+		if (stats-&gt;bc[i])</div><div class='add'>+			seq_printf(m, "%s%s: %d\n", prefix,</div><div class='add'>+				   binder_command_strings[i], stats-&gt;bc[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(stats-&gt;br) !=</div><div class='add'>+		     ARRAY_SIZE(binder_return_strings));</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(stats-&gt;br); i++) {</div><div class='add'>+		if (stats-&gt;br[i])</div><div class='add'>+			seq_printf(m, "%s%s: %d\n", prefix,</div><div class='add'>+				   binder_return_strings[i], stats-&gt;br[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(stats-&gt;obj_created) !=</div><div class='add'>+		     ARRAY_SIZE(binder_objstat_strings));</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(stats-&gt;obj_created) !=</div><div class='add'>+		     ARRAY_SIZE(stats-&gt;obj_deleted));</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(stats-&gt;obj_created); i++) {</div><div class='add'>+		if (stats-&gt;obj_created[i] || stats-&gt;obj_deleted[i])</div><div class='add'>+			seq_printf(m, "%s%s: active %d total %d\n", prefix,</div><div class='add'>+				binder_objstat_strings[i],</div><div class='add'>+				stats-&gt;obj_created[i] - stats-&gt;obj_deleted[i],</div><div class='add'>+				stats-&gt;obj_created[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_binder_proc_stats(struct seq_file *m,</div><div class='add'>+				    struct binder_proc *proc)</div><div class='add'>+{</div><div class='add'>+	struct binder_work *w;</div><div class='add'>+	struct rb_node *n;</div><div class='add'>+	int count, strong, weak;</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "proc %d\n", proc-&gt;pid);</div><div class='add'>+	count = 0;</div><div class='add'>+	for (n = rb_first(&amp;proc-&gt;threads); n != NULL; n = rb_next(n))</div><div class='add'>+		count++;</div><div class='add'>+	seq_printf(m, "  threads: %d\n", count);</div><div class='add'>+	seq_printf(m, "  requested threads: %d+%d/%d\n"</div><div class='add'>+			"  ready threads %d\n"</div><div class='add'>+			"  free async space %zd\n", proc-&gt;requested_threads,</div><div class='add'>+			proc-&gt;requested_threads_started, proc-&gt;max_threads,</div><div class='add'>+			proc-&gt;ready_threads, proc-&gt;free_async_space);</div><div class='add'>+	count = 0;</div><div class='add'>+	for (n = rb_first(&amp;proc-&gt;nodes); n != NULL; n = rb_next(n))</div><div class='add'>+		count++;</div><div class='add'>+	seq_printf(m, "  nodes: %d\n", count);</div><div class='add'>+	count = 0;</div><div class='add'>+	strong = 0;</div><div class='add'>+	weak = 0;</div><div class='add'>+	for (n = rb_first(&amp;proc-&gt;refs_by_desc); n != NULL; n = rb_next(n)) {</div><div class='add'>+		struct binder_ref *ref = rb_entry(n, struct binder_ref,</div><div class='add'>+						  rb_node_desc);</div><div class='add'>+		count++;</div><div class='add'>+		strong += ref-&gt;strong;</div><div class='add'>+		weak += ref-&gt;weak;</div><div class='add'>+	}</div><div class='add'>+	seq_printf(m, "  refs: %d s %d w %d\n", count, strong, weak);</div><div class='add'>+</div><div class='add'>+	count = 0;</div><div class='add'>+	for (n = rb_first(&amp;proc-&gt;allocated_buffers); n != NULL; n = rb_next(n))</div><div class='add'>+		count++;</div><div class='add'>+	seq_printf(m, "  buffers: %d\n", count);</div><div class='add'>+</div><div class='add'>+	count = 0;</div><div class='add'>+	list_for_each_entry(w, &amp;proc-&gt;todo, entry) {</div><div class='add'>+		switch (w-&gt;type) {</div><div class='add'>+		case BINDER_WORK_TRANSACTION:</div><div class='add'>+			count++;</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'>+	seq_printf(m, "  pending transactions: %d\n", count);</div><div class='add'>+</div><div class='add'>+	print_binder_stats(m, "  ", &amp;proc-&gt;stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int binder_state_show(struct seq_file *m, void *unused)</div><div class='add'>+{</div><div class='add'>+	struct binder_proc *proc;</div><div class='add'>+	struct hlist_node *pos;</div><div class='add'>+	struct binder_node *node;</div><div class='add'>+	int do_lock = !binder_debug_no_lock;</div><div class='add'>+</div><div class='add'>+	if (do_lock)</div><div class='add'>+		mutex_lock(&amp;binder_lock);</div><div class='add'>+</div><div class='add'>+	seq_puts(m, "binder state:\n");</div><div class='add'>+</div><div class='add'>+	if (!hlist_empty(&amp;binder_dead_nodes))</div><div class='add'>+		seq_puts(m, "dead nodes:\n");</div><div class='add'>+	hlist_for_each_entry(node, pos, &amp;binder_dead_nodes, dead_node)</div><div class='add'>+		print_binder_node(m, node);</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(proc, pos, &amp;binder_procs, proc_node)</div><div class='add'>+		print_binder_proc(m, proc, 1);</div><div class='add'>+	if (do_lock)</div><div class='add'>+		mutex_unlock(&amp;binder_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int binder_stats_show(struct seq_file *m, void *unused)</div><div class='add'>+{</div><div class='add'>+	struct binder_proc *proc;</div><div class='add'>+	struct hlist_node *pos;</div><div class='add'>+	int do_lock = !binder_debug_no_lock;</div><div class='add'>+</div><div class='add'>+	if (do_lock)</div><div class='add'>+		mutex_lock(&amp;binder_lock);</div><div class='add'>+</div><div class='add'>+	seq_puts(m, "binder stats:\n");</div><div class='add'>+</div><div class='add'>+	print_binder_stats(m, "", &amp;binder_stats);</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(proc, pos, &amp;binder_procs, proc_node)</div><div class='add'>+		print_binder_proc_stats(m, proc);</div><div class='add'>+	if (do_lock)</div><div class='add'>+		mutex_unlock(&amp;binder_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int binder_transactions_show(struct seq_file *m, void *unused)</div><div class='add'>+{</div><div class='add'>+	struct binder_proc *proc;</div><div class='add'>+	struct hlist_node *pos;</div><div class='add'>+	int do_lock = !binder_debug_no_lock;</div><div class='add'>+</div><div class='add'>+	if (do_lock)</div><div class='add'>+		mutex_lock(&amp;binder_lock);</div><div class='add'>+</div><div class='add'>+	seq_puts(m, "binder transactions:\n");</div><div class='add'>+	hlist_for_each_entry(proc, pos, &amp;binder_procs, proc_node)</div><div class='add'>+		print_binder_proc(m, proc, 0);</div><div class='add'>+	if (do_lock)</div><div class='add'>+		mutex_unlock(&amp;binder_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int binder_proc_show(struct seq_file *m, void *unused)</div><div class='add'>+{</div><div class='add'>+	struct binder_proc *proc = m-&gt;private;</div><div class='add'>+	int do_lock = !binder_debug_no_lock;</div><div class='add'>+</div><div class='add'>+	if (do_lock)</div><div class='add'>+		mutex_lock(&amp;binder_lock);</div><div class='add'>+	seq_puts(m, "binder proc state:\n");</div><div class='add'>+	print_binder_proc(m, proc, 1);</div><div class='add'>+	if (do_lock)</div><div class='add'>+		mutex_unlock(&amp;binder_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_binder_transaction_log_entry(struct seq_file *m,</div><div class='add'>+					struct binder_transaction_log_entry *e)</div><div class='add'>+{</div><div class='add'>+	seq_printf(m,</div><div class='add'>+		   "%d: %s from %d:%d to %d:%d node %d handle %d size %d:%d\n",</div><div class='add'>+		   e-&gt;debug_id, (e-&gt;call_type == 2) ? "reply" :</div><div class='add'>+		   ((e-&gt;call_type == 1) ? "async" : "call "), e-&gt;from_proc,</div><div class='add'>+		   e-&gt;from_thread, e-&gt;to_proc, e-&gt;to_thread, e-&gt;to_node,</div><div class='add'>+		   e-&gt;target_handle, e-&gt;data_size, e-&gt;offsets_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int binder_transaction_log_show(struct seq_file *m, void *unused)</div><div class='add'>+{</div><div class='add'>+	struct binder_transaction_log *log = m-&gt;private;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (log-&gt;full) {</div><div class='add'>+		for (i = log-&gt;next; i &lt; ARRAY_SIZE(log-&gt;entry); i++)</div><div class='add'>+			print_binder_transaction_log_entry(m, &amp;log-&gt;entry[i]);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; log-&gt;next; i++)</div><div class='add'>+		print_binder_transaction_log_entry(m, &amp;log-&gt;entry[i]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations binder_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.poll = binder_poll,</div><div class='add'>+	.unlocked_ioctl = binder_ioctl,</div><div class='add'>+	.mmap = binder_mmap,</div><div class='add'>+	.open = binder_open,</div><div class='add'>+	.flush = binder_flush,</div><div class='add'>+	.release = binder_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct miscdevice binder_miscdev = {</div><div class='add'>+	.minor = MISC_DYNAMIC_MINOR,</div><div class='add'>+	.name = "binder",</div><div class='add'>+	.fops = &amp;binder_fops</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+BINDER_DEBUG_ENTRY(state);</div><div class='add'>+BINDER_DEBUG_ENTRY(stats);</div><div class='add'>+BINDER_DEBUG_ENTRY(transactions);</div><div class='add'>+BINDER_DEBUG_ENTRY(transaction_log);</div><div class='add'>+</div><div class='add'>+static int __init binder_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	binder_deferred_workqueue = create_singlethread_workqueue("binder");</div><div class='add'>+	if (!binder_deferred_workqueue)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	binder_debugfs_dir_entry_root = debugfs_create_dir("binder", NULL);</div><div class='add'>+	if (binder_debugfs_dir_entry_root)</div><div class='add'>+		binder_debugfs_dir_entry_proc = debugfs_create_dir("proc",</div><div class='add'>+						 binder_debugfs_dir_entry_root);</div><div class='add'>+	ret = misc_register(&amp;binder_miscdev);</div><div class='add'>+	if (binder_debugfs_dir_entry_root) {</div><div class='add'>+		debugfs_create_file("state",</div><div class='add'>+				    S_IRUGO,</div><div class='add'>+				    binder_debugfs_dir_entry_root,</div><div class='add'>+				    NULL,</div><div class='add'>+				    &amp;binder_state_fops);</div><div class='add'>+		debugfs_create_file("stats",</div><div class='add'>+				    S_IRUGO,</div><div class='add'>+				    binder_debugfs_dir_entry_root,</div><div class='add'>+				    NULL,</div><div class='add'>+				    &amp;binder_stats_fops);</div><div class='add'>+		debugfs_create_file("transactions",</div><div class='add'>+				    S_IRUGO,</div><div class='add'>+				    binder_debugfs_dir_entry_root,</div><div class='add'>+				    NULL,</div><div class='add'>+				    &amp;binder_transactions_fops);</div><div class='add'>+		debugfs_create_file("transaction_log",</div><div class='add'>+				    S_IRUGO,</div><div class='add'>+				    binder_debugfs_dir_entry_root,</div><div class='add'>+				    &amp;binder_transaction_log,</div><div class='add'>+				    &amp;binder_transaction_log_fops);</div><div class='add'>+		debugfs_create_file("failed_transaction_log",</div><div class='add'>+				    S_IRUGO,</div><div class='add'>+				    binder_debugfs_dir_entry_root,</div><div class='add'>+				    &amp;binder_transaction_log_failed,</div><div class='add'>+				    &amp;binder_transaction_log_fops);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+device_initcall(binder_init);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/staging/android/binder.h b/drivers/staging/android/binder.h<br/>new file mode 100644<br/>index 000000000000..25ab6f2759e9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/binder.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/binder.h</a></div><div class='hunk'>@@ -0,0 +1,330 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2008 Google, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Based on, but no longer compatible with, the original</div><div class='add'>+ * OpenBinder.org binder driver interface, which is:</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2005 Palmsource, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_BINDER_H</div><div class='add'>+#define _LINUX_BINDER_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='add'>+</div><div class='add'>+#define B_PACK_CHARS(c1, c2, c3, c4) \</div><div class='add'>+	((((c1)&lt;&lt;24)) | (((c2)&lt;&lt;16)) | (((c3)&lt;&lt;8)) | (c4))</div><div class='add'>+#define B_TYPE_LARGE 0x85</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	BINDER_TYPE_BINDER	= B_PACK_CHARS('s', 'b', '*', B_TYPE_LARGE),</div><div class='add'>+	BINDER_TYPE_WEAK_BINDER	= B_PACK_CHARS('w', 'b', '*', B_TYPE_LARGE),</div><div class='add'>+	BINDER_TYPE_HANDLE	= B_PACK_CHARS('s', 'h', '*', B_TYPE_LARGE),</div><div class='add'>+	BINDER_TYPE_WEAK_HANDLE	= B_PACK_CHARS('w', 'h', '*', B_TYPE_LARGE),</div><div class='add'>+	BINDER_TYPE_FD		= B_PACK_CHARS('f', 'd', '*', B_TYPE_LARGE),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	FLAT_BINDER_FLAG_PRIORITY_MASK = 0xff,</div><div class='add'>+	FLAT_BINDER_FLAG_ACCEPTS_FDS = 0x100,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is the flattened representation of a Binder object for transfer</div><div class='add'>+ * between processes.  The 'offsets' supplied as part of a binder transaction</div><div class='add'>+ * contains offsets into the data where these structures occur.  The Binder</div><div class='add'>+ * driver takes care of re-writing the structure type and data as it moves</div><div class='add'>+ * between processes.</div><div class='add'>+ */</div><div class='add'>+struct flat_binder_object {</div><div class='add'>+	/* 8 bytes for large_flat_header. */</div><div class='add'>+	unsigned long		type;</div><div class='add'>+	unsigned long		flags;</div><div class='add'>+</div><div class='add'>+	/* 8 bytes of data. */</div><div class='add'>+	union {</div><div class='add'>+		void		*binder;	/* local object */</div><div class='add'>+		signed long	handle;		/* remote object */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* extra data associated with local object */</div><div class='add'>+	void			*cookie;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On 64-bit platforms where user code may run in 32-bits the driver must</div><div class='add'>+ * translate the buffer (and local binder) addresses apropriately.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct binder_write_read {</div><div class='add'>+	signed long	write_size;	/* bytes to write */</div><div class='add'>+	signed long	write_consumed;	/* bytes consumed by driver */</div><div class='add'>+	unsigned long	write_buffer;</div><div class='add'>+	signed long	read_size;	/* bytes to read */</div><div class='add'>+	signed long	read_consumed;	/* bytes consumed by driver */</div><div class='add'>+	unsigned long	read_buffer;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Use with BINDER_VERSION, driver fills in fields. */</div><div class='add'>+struct binder_version {</div><div class='add'>+	/* driver protocol version -- increment with incompatible change */</div><div class='add'>+	signed long	protocol_version;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This is the current protocol version. */</div><div class='add'>+#define BINDER_CURRENT_PROTOCOL_VERSION 7</div><div class='add'>+</div><div class='add'>+#define BINDER_WRITE_READ		_IOWR('b', 1, struct binder_write_read)</div><div class='add'>+#define	BINDER_SET_IDLE_TIMEOUT		_IOW('b', 3, int64_t)</div><div class='add'>+#define	BINDER_SET_MAX_THREADS		_IOW('b', 5, size_t)</div><div class='add'>+#define	BINDER_SET_IDLE_PRIORITY	_IOW('b', 6, int)</div><div class='add'>+#define	BINDER_SET_CONTEXT_MGR		_IOW('b', 7, int)</div><div class='add'>+#define	BINDER_THREAD_EXIT		_IOW('b', 8, int)</div><div class='add'>+#define BINDER_VERSION			_IOWR('b', 9, struct binder_version)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NOTE: Two special error codes you should check for when calling</div><div class='add'>+ * in to the driver are:</div><div class='add'>+ *</div><div class='add'>+ * EINTR -- The operation has been interupted.  This should be</div><div class='add'>+ * handled by retrying the ioctl() until a different error code</div><div class='add'>+ * is returned.</div><div class='add'>+ *</div><div class='add'>+ * ECONNREFUSED -- The driver is no longer accepting operations</div><div class='add'>+ * from your process.  That is, the process is being destroyed.</div><div class='add'>+ * You should handle this by exiting from your process.  Note</div><div class='add'>+ * that once this error code is returned, all further calls to</div><div class='add'>+ * the driver from any thread will return this same code.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum transaction_flags {</div><div class='add'>+	TF_ONE_WAY	= 0x01,	/* this is a one-way call: async, no return */</div><div class='add'>+	TF_ROOT_OBJECT	= 0x04,	/* contents are the component's root object */</div><div class='add'>+	TF_STATUS_CODE	= 0x08,	/* contents are a 32-bit status code */</div><div class='add'>+	TF_ACCEPT_FDS	= 0x10,	/* allow replies with file descriptors */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct binder_transaction_data {</div><div class='add'>+	/* The first two are only used for bcTRANSACTION and brTRANSACTION,</div><div class='add'>+	 * identifying the target and contents of the transaction.</div><div class='add'>+	 */</div><div class='add'>+	union {</div><div class='add'>+		size_t	handle;	/* target descriptor of command transaction */</div><div class='add'>+		void	*ptr;	/* target descriptor of return transaction */</div><div class='add'>+	} target;</div><div class='add'>+	void		*cookie;	/* target object cookie */</div><div class='add'>+	unsigned int	code;		/* transaction command */</div><div class='add'>+</div><div class='add'>+	/* General information about the transaction. */</div><div class='add'>+	unsigned int	flags;</div><div class='add'>+	pid_t		sender_pid;</div><div class='add'>+	uid_t		sender_euid;</div><div class='add'>+	size_t		data_size;	/* number of bytes of data */</div><div class='add'>+	size_t		offsets_size;	/* number of bytes of offsets */</div><div class='add'>+</div><div class='add'>+	/* If this transaction is inline, the data immediately</div><div class='add'>+	 * follows here; otherwise, it ends with a pointer to</div><div class='add'>+	 * the data buffer.</div><div class='add'>+	 */</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			/* transaction data */</div><div class='add'>+			const void	*buffer;</div><div class='add'>+			/* offsets from buffer to flat_binder_object structs */</div><div class='add'>+			const void	*offsets;</div><div class='add'>+		} ptr;</div><div class='add'>+		uint8_t	buf[8];</div><div class='add'>+	} data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct binder_ptr_cookie {</div><div class='add'>+	void *ptr;</div><div class='add'>+	void *cookie;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct binder_pri_desc {</div><div class='add'>+	int priority;</div><div class='add'>+	int desc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct binder_pri_ptr_cookie {</div><div class='add'>+	int priority;</div><div class='add'>+	void *ptr;</div><div class='add'>+	void *cookie;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum BinderDriverReturnProtocol {</div><div class='add'>+	BR_ERROR = _IOR('r', 0, int),</div><div class='add'>+	/*</div><div class='add'>+	 * int: error code</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BR_OK = _IO('r', 1),</div><div class='add'>+	/* No parameters! */</div><div class='add'>+</div><div class='add'>+	BR_TRANSACTION = _IOR('r', 2, struct binder_transaction_data),</div><div class='add'>+	BR_REPLY = _IOR('r', 3, struct binder_transaction_data),</div><div class='add'>+	/*</div><div class='add'>+	 * binder_transaction_data: the received command.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BR_ACQUIRE_RESULT = _IOR('r', 4, int),</div><div class='add'>+	/*</div><div class='add'>+	 * not currently supported</div><div class='add'>+	 * int: 0 if the last bcATTEMPT_ACQUIRE was not successful.</div><div class='add'>+	 * Else the remote object has acquired a primary reference.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BR_DEAD_REPLY = _IO('r', 5),</div><div class='add'>+	/*</div><div class='add'>+	 * The target of the last transaction (either a bcTRANSACTION or</div><div class='add'>+	 * a bcATTEMPT_ACQUIRE) is no longer with us.  No parameters.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BR_TRANSACTION_COMPLETE = _IO('r', 6),</div><div class='add'>+	/*</div><div class='add'>+	 * No parameters... always refers to the last transaction requested</div><div class='add'>+	 * (including replies).  Note that this will be sent even for</div><div class='add'>+	 * asynchronous transactions.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BR_INCREFS = _IOR('r', 7, struct binder_ptr_cookie),</div><div class='add'>+	BR_ACQUIRE = _IOR('r', 8, struct binder_ptr_cookie),</div><div class='add'>+	BR_RELEASE = _IOR('r', 9, struct binder_ptr_cookie),</div><div class='add'>+	BR_DECREFS = _IOR('r', 10, struct binder_ptr_cookie),</div><div class='add'>+	/*</div><div class='add'>+	 * void *:	ptr to binder</div><div class='add'>+	 * void *: cookie for binder</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BR_ATTEMPT_ACQUIRE = _IOR('r', 11, struct binder_pri_ptr_cookie),</div><div class='add'>+	/*</div><div class='add'>+	 * not currently supported</div><div class='add'>+	 * int:	priority</div><div class='add'>+	 * void *: ptr to binder</div><div class='add'>+	 * void *: cookie for binder</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BR_NOOP = _IO('r', 12),</div><div class='add'>+	/*</div><div class='add'>+	 * No parameters.  Do nothing and examine the next command.  It exists</div><div class='add'>+	 * primarily so that we can replace it with a BR_SPAWN_LOOPER command.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BR_SPAWN_LOOPER = _IO('r', 13),</div><div class='add'>+	/*</div><div class='add'>+	 * No parameters.  The driver has determined that a process has no</div><div class='add'>+	 * threads waiting to service incomming transactions.  When a process</div><div class='add'>+	 * receives this command, it must spawn a new service thread and</div><div class='add'>+	 * register it via bcENTER_LOOPER.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BR_FINISHED = _IO('r', 14),</div><div class='add'>+	/*</div><div class='add'>+	 * not currently supported</div><div class='add'>+	 * stop threadpool thread</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BR_DEAD_BINDER = _IOR('r', 15, void *),</div><div class='add'>+	/*</div><div class='add'>+	 * void *: cookie</div><div class='add'>+	 */</div><div class='add'>+	BR_CLEAR_DEATH_NOTIFICATION_DONE = _IOR('r', 16, void *),</div><div class='add'>+	/*</div><div class='add'>+	 * void *: cookie</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BR_FAILED_REPLY = _IO('r', 17),</div><div class='add'>+	/*</div><div class='add'>+	 * The the last transaction (either a bcTRANSACTION or</div><div class='add'>+	 * a bcATTEMPT_ACQUIRE) failed (e.g. out of memory).  No parameters.</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum BinderDriverCommandProtocol {</div><div class='add'>+	BC_TRANSACTION = _IOW('c', 0, struct binder_transaction_data),</div><div class='add'>+	BC_REPLY = _IOW('c', 1, struct binder_transaction_data),</div><div class='add'>+	/*</div><div class='add'>+	 * binder_transaction_data: the sent command.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BC_ACQUIRE_RESULT = _IOW('c', 2, int),</div><div class='add'>+	/*</div><div class='add'>+	 * not currently supported</div><div class='add'>+	 * int:  0 if the last BR_ATTEMPT_ACQUIRE was not successful.</div><div class='add'>+	 * Else you have acquired a primary reference on the object.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BC_FREE_BUFFER = _IOW('c', 3, int),</div><div class='add'>+	/*</div><div class='add'>+	 * void *: ptr to transaction data received on a read</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BC_INCREFS = _IOW('c', 4, int),</div><div class='add'>+	BC_ACQUIRE = _IOW('c', 5, int),</div><div class='add'>+	BC_RELEASE = _IOW('c', 6, int),</div><div class='add'>+	BC_DECREFS = _IOW('c', 7, int),</div><div class='add'>+	/*</div><div class='add'>+	 * int:	descriptor</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BC_INCREFS_DONE = _IOW('c', 8, struct binder_ptr_cookie),</div><div class='add'>+	BC_ACQUIRE_DONE = _IOW('c', 9, struct binder_ptr_cookie),</div><div class='add'>+	/*</div><div class='add'>+	 * void *: ptr to binder</div><div class='add'>+	 * void *: cookie for binder</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BC_ATTEMPT_ACQUIRE = _IOW('c', 10, struct binder_pri_desc),</div><div class='add'>+	/*</div><div class='add'>+	 * not currently supported</div><div class='add'>+	 * int: priority</div><div class='add'>+	 * int: descriptor</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BC_REGISTER_LOOPER = _IO('c', 11),</div><div class='add'>+	/*</div><div class='add'>+	 * No parameters.</div><div class='add'>+	 * Register a spawned looper thread with the device.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BC_ENTER_LOOPER = _IO('c', 12),</div><div class='add'>+	BC_EXIT_LOOPER = _IO('c', 13),</div><div class='add'>+	/*</div><div class='add'>+	 * No parameters.</div><div class='add'>+	 * These two commands are sent as an application-level thread</div><div class='add'>+	 * enters and exits the binder loop, respectively.  They are</div><div class='add'>+	 * used so the binder can have an accurate count of the number</div><div class='add'>+	 * of looping threads it has available.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BC_REQUEST_DEATH_NOTIFICATION = _IOW('c', 14, struct binder_ptr_cookie),</div><div class='add'>+	/*</div><div class='add'>+	 * void *: ptr to binder</div><div class='add'>+	 * void *: cookie</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BC_CLEAR_DEATH_NOTIFICATION = _IOW('c', 15, struct binder_ptr_cookie),</div><div class='add'>+	/*</div><div class='add'>+	 * void *: ptr to binder</div><div class='add'>+	 * void *: cookie</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BC_DEAD_BINDER_DONE = _IOW('c', 16, void *),</div><div class='add'>+	/*</div><div class='add'>+	 * void *: cookie</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_BINDER_H */</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c<br/>new file mode 100644<br/>index 000000000000..ffc2d043dd8e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/logger.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/logger.c</a></div><div class='hunk'>@@ -0,0 +1,616 @@</div><div class='add'>+/*</div><div class='add'>+ * drivers/misc/logger.c</div><div class='add'>+ *</div><div class='add'>+ * A Logging Subsystem</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007-2008 Google, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Robert Love &lt;rlove@google.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include "logger.h"</div><div class='add'>+</div><div class='add'>+#include &lt;asm/ioctls.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct logger_log - represents a specific log, such as 'main' or 'radio'</div><div class='add'>+ *</div><div class='add'>+ * This structure lives from module insertion until module removal, so it does</div><div class='add'>+ * not need additional reference counting. The structure is protected by the</div><div class='add'>+ * mutex 'mutex'.</div><div class='add'>+ */</div><div class='add'>+struct logger_log {</div><div class='add'>+	unsigned char		*buffer;/* the ring buffer itself */</div><div class='add'>+	struct miscdevice	misc;	/* misc device representing the log */</div><div class='add'>+	wait_queue_head_t	wq;	/* wait queue for readers */</div><div class='add'>+	struct list_head	readers; /* this log's readers */</div><div class='add'>+	struct mutex		mutex;	/* mutex protecting buffer */</div><div class='add'>+	size_t			w_off;	/* current write head offset */</div><div class='add'>+	size_t			head;	/* new readers start here */</div><div class='add'>+	size_t			size;	/* size of the log */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct logger_reader - a logging device open for reading</div><div class='add'>+ *</div><div class='add'>+ * This object lives from open to release, so we don't need additional</div><div class='add'>+ * reference counting. The structure is protected by log-&gt;mutex.</div><div class='add'>+ */</div><div class='add'>+struct logger_reader {</div><div class='add'>+	struct logger_log	*log;	/* associated log */</div><div class='add'>+	struct list_head	list;	/* entry in logger_log's list */</div><div class='add'>+	size_t			r_off;	/* current read head offset */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* logger_offset - returns index 'n' into the log via (optimized) modulus */</div><div class='add'>+#define logger_offset(n)	((n) &amp; (log-&gt;size - 1))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * file_get_log - Given a file structure, return the associated log</div><div class='add'>+ *</div><div class='add'>+ * This isn't aesthetic. We have several goals:</div><div class='add'>+ *</div><div class='add'>+ *	1) Need to quickly obtain the associated log during an I/O operation</div><div class='add'>+ *	2) Readers need to maintain state (logger_reader)</div><div class='add'>+ *	3) Writers need to be very fast (open() should be a near no-op)</div><div class='add'>+ *</div><div class='add'>+ * In the reader case, we can trivially go file-&gt;logger_reader-&gt;logger_log.</div><div class='add'>+ * For a writer, we don't want to maintain a logger_reader, so we just go</div><div class='add'>+ * file-&gt;logger_log. Thus what file-&gt;private_data points at depends on whether</div><div class='add'>+ * or not the file was opened for reading. This function hides that dirtiness.</div><div class='add'>+ */</div><div class='add'>+static inline struct logger_log *file_get_log(struct file *file)</div><div class='add'>+{</div><div class='add'>+	if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='add'>+		struct logger_reader *reader = file-&gt;private_data;</div><div class='add'>+		return reader-&gt;log;</div><div class='add'>+	} else</div><div class='add'>+		return file-&gt;private_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * get_entry_len - Grabs the length of the payload of the next entry starting</div><div class='add'>+ * from 'off'.</div><div class='add'>+ *</div><div class='add'>+ * Caller needs to hold log-&gt;mutex.</div><div class='add'>+ */</div><div class='add'>+static __u32 get_entry_len(struct logger_log *log, size_t off)</div><div class='add'>+{</div><div class='add'>+	__u16 val;</div><div class='add'>+</div><div class='add'>+	switch (log-&gt;size - off) {</div><div class='add'>+	case 1:</div><div class='add'>+		memcpy(&amp;val, log-&gt;buffer + off, 1);</div><div class='add'>+		memcpy(((char *) &amp;val) + 1, log-&gt;buffer, 1);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		memcpy(&amp;val, log-&gt;buffer + off, 2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sizeof(struct logger_entry) + val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * do_read_log_to_user - reads exactly 'count' bytes from 'log' into the</div><div class='add'>+ * user-space buffer 'buf'. Returns 'count' on success.</div><div class='add'>+ *</div><div class='add'>+ * Caller must hold log-&gt;mutex.</div><div class='add'>+ */</div><div class='add'>+static ssize_t do_read_log_to_user(struct logger_log *log,</div><div class='add'>+				   struct logger_reader *reader,</div><div class='add'>+				   char __user *buf,</div><div class='add'>+				   size_t count)</div><div class='add'>+{</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We read from the log in two disjoint operations. First, we read from</div><div class='add'>+	 * the current read head offset up to 'count' bytes or to the end of</div><div class='add'>+	 * the log, whichever comes first.</div><div class='add'>+	 */</div><div class='add'>+	len = min(count, log-&gt;size - reader-&gt;r_off);</div><div class='add'>+	if (copy_to_user(buf, log-&gt;buffer + reader-&gt;r_off, len))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Second, we read any remaining bytes, starting back at the head of</div><div class='add'>+	 * the log.</div><div class='add'>+	 */</div><div class='add'>+	if (count != len)</div><div class='add'>+		if (copy_to_user(buf + len, log-&gt;buffer, count - len))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+	reader-&gt;r_off = logger_offset(reader-&gt;r_off + count);</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='add'>+ * logger_read - our log's read() method</div><div class='add'>+ *</div><div class='add'>+ * Behavior:</div><div class='add'>+ *</div><div class='add'>+ *	- O_NONBLOCK works</div><div class='add'>+ *	- If there are no log entries to read, blocks until log is written to</div><div class='add'>+ *	- Atomically reads exactly one log entry</div><div class='add'>+ *</div><div class='add'>+ * Optimal read size is LOGGER_ENTRY_MAX_LEN. Will set errno to EINVAL if read</div><div class='add'>+ * buffer is insufficient to hold next entry.</div><div class='add'>+ */</div><div class='add'>+static ssize_t logger_read(struct file *file, char __user *buf,</div><div class='add'>+			   size_t count, loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	struct logger_reader *reader = file-&gt;private_data;</div><div class='add'>+	struct logger_log *log = reader-&gt;log;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	DEFINE_WAIT(wait);</div><div class='add'>+</div><div class='add'>+start:</div><div class='add'>+	while (1) {</div><div class='add'>+		prepare_to_wait(&amp;log-&gt;wq, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;log-&gt;mutex);</div><div class='add'>+		ret = (log-&gt;w_off == reader-&gt;r_off);</div><div class='add'>+		mutex_unlock(&amp;log-&gt;mutex);</div><div class='add'>+		if (!ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (file-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='add'>+			ret = -EAGAIN;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			ret = -EINTR;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		schedule();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	finish_wait(&amp;log-&gt;wq, &amp;wait);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;log-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* is there still something to read or did we race? */</div><div class='add'>+	if (unlikely(log-&gt;w_off == reader-&gt;r_off)) {</div><div class='add'>+		mutex_unlock(&amp;log-&gt;mutex);</div><div class='add'>+		goto start;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get the size of the next entry */</div><div class='add'>+	ret = get_entry_len(log, reader-&gt;r_off);</div><div class='add'>+	if (count &lt; ret) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get exactly one entry from the log */</div><div class='add'>+	ret = do_read_log_to_user(log, reader, buf, ret);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;log-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * get_next_entry - return the offset of the first valid entry at least 'len'</div><div class='add'>+ * bytes after 'off'.</div><div class='add'>+ *</div><div class='add'>+ * Caller must hold log-&gt;mutex.</div><div class='add'>+ */</div><div class='add'>+static size_t get_next_entry(struct logger_log *log, size_t off, size_t len)</div><div class='add'>+{</div><div class='add'>+	size_t count = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		size_t nr = get_entry_len(log, off);</div><div class='add'>+		off = logger_offset(off + nr);</div><div class='add'>+		count += nr;</div><div class='add'>+	} while (count &lt; len);</div><div class='add'>+</div><div class='add'>+	return off;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * clock_interval - is a &lt; c &lt; b in mod-space? Put another way, does the line</div><div class='add'>+ * from a to b cross c?</div><div class='add'>+ */</div><div class='add'>+static inline int clock_interval(size_t a, size_t b, size_t c)</div><div class='add'>+{</div><div class='add'>+	if (b &lt; a) {</div><div class='add'>+		if (a &lt; c || b &gt;= c)</div><div class='add'>+			return 1;</div><div class='add'>+	} else {</div><div class='add'>+		if (a &lt; c &amp;&amp; b &gt;= c)</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * fix_up_readers - walk the list of all readers and "fix up" any who were</div><div class='add'>+ * lapped by the writer; also do the same for the default "start head".</div><div class='add'>+ * We do this by "pulling forward" the readers and start head to the first</div><div class='add'>+ * entry after the new write head.</div><div class='add'>+ *</div><div class='add'>+ * The caller needs to hold log-&gt;mutex.</div><div class='add'>+ */</div><div class='add'>+static void fix_up_readers(struct logger_log *log, size_t len)</div><div class='add'>+{</div><div class='add'>+	size_t old = log-&gt;w_off;</div><div class='add'>+	size_t new = logger_offset(old + len);</div><div class='add'>+	struct logger_reader *reader;</div><div class='add'>+</div><div class='add'>+	if (clock_interval(old, new, log-&gt;head))</div><div class='add'>+		log-&gt;head = get_next_entry(log, log-&gt;head, len);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(reader, &amp;log-&gt;readers, list)</div><div class='add'>+		if (clock_interval(old, new, reader-&gt;r_off))</div><div class='add'>+			reader-&gt;r_off = get_next_entry(log, reader-&gt;r_off, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * do_write_log - writes 'len' bytes from 'buf' to 'log'</div><div class='add'>+ *</div><div class='add'>+ * The caller needs to hold log-&gt;mutex.</div><div class='add'>+ */</div><div class='add'>+static void do_write_log(struct logger_log *log, const void *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	len = min(count, log-&gt;size - log-&gt;w_off);</div><div class='add'>+	memcpy(log-&gt;buffer + log-&gt;w_off, buf, len);</div><div class='add'>+</div><div class='add'>+	if (count != len)</div><div class='add'>+		memcpy(log-&gt;buffer, buf + len, count - len);</div><div class='add'>+</div><div class='add'>+	log-&gt;w_off = logger_offset(log-&gt;w_off + count);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * do_write_log_user - writes 'len' bytes from the user-space buffer 'buf' to</div><div class='add'>+ * the log 'log'</div><div class='add'>+ *</div><div class='add'>+ * The caller needs to hold log-&gt;mutex.</div><div class='add'>+ *</div><div class='add'>+ * Returns 'count' on success, negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+static ssize_t do_write_log_from_user(struct logger_log *log,</div><div class='add'>+				      const void __user *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	len = min(count, log-&gt;size - log-&gt;w_off);</div><div class='add'>+	if (len &amp;&amp; copy_from_user(log-&gt;buffer + log-&gt;w_off, buf, len))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (count != len)</div><div class='add'>+		if (copy_from_user(log-&gt;buffer, buf + len, count - len))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+	log-&gt;w_off = logger_offset(log-&gt;w_off + count);</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='add'>+ * logger_aio_write - our write method, implementing support for write(),</div><div class='add'>+ * writev(), and aio_write(). Writes are our fast path, and we try to optimize</div><div class='add'>+ * them above all else.</div><div class='add'>+ */</div><div class='add'>+ssize_t logger_aio_write(struct kiocb *iocb, const struct iovec *iov,</div><div class='add'>+			 unsigned long nr_segs, loff_t ppos)</div><div class='add'>+{</div><div class='add'>+	struct logger_log *log = file_get_log(iocb-&gt;ki_filp);</div><div class='add'>+	size_t orig = log-&gt;w_off;</div><div class='add'>+	struct logger_entry header;</div><div class='add'>+	struct timespec now;</div><div class='add'>+	ssize_t ret = 0;</div><div class='add'>+</div><div class='add'>+	now = current_kernel_time();</div><div class='add'>+</div><div class='add'>+	header.pid = current-&gt;tgid;</div><div class='add'>+	header.tid = current-&gt;pid;</div><div class='add'>+	header.sec = now.tv_sec;</div><div class='add'>+	header.nsec = now.tv_nsec;</div><div class='add'>+	header.len = min_t(size_t, iocb-&gt;ki_left, LOGGER_ENTRY_MAX_PAYLOAD);</div><div class='add'>+</div><div class='add'>+	/* null writes succeed, return zero */</div><div class='add'>+	if (unlikely(!header.len))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;log-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Fix up any readers, pulling them forward to the first readable</div><div class='add'>+	 * entry after (what will be) the new write offset. We do this now</div><div class='add'>+	 * because if we partially fail, we can end up with clobbered log</div><div class='add'>+	 * entries that encroach on readable buffer.</div><div class='add'>+	 */</div><div class='add'>+	fix_up_readers(log, sizeof(struct logger_entry) + header.len);</div><div class='add'>+</div><div class='add'>+	do_write_log(log, &amp;header, sizeof(struct logger_entry));</div><div class='add'>+</div><div class='add'>+	while (nr_segs-- &gt; 0) {</div><div class='add'>+		size_t len;</div><div class='add'>+		ssize_t nr;</div><div class='add'>+</div><div class='add'>+		/* figure out how much of this vector we can keep */</div><div class='add'>+		len = min_t(size_t, iov-&gt;iov_len, header.len - ret);</div><div class='add'>+</div><div class='add'>+		/* write out this segment's payload */</div><div class='add'>+		nr = do_write_log_from_user(log, iov-&gt;iov_base, len);</div><div class='add'>+		if (unlikely(nr &lt; 0)) {</div><div class='add'>+			log-&gt;w_off = orig;</div><div class='add'>+			mutex_unlock(&amp;log-&gt;mutex);</div><div class='add'>+			return nr;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		iov++;</div><div class='add'>+		ret += nr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;log-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* wake up any blocked readers */</div><div class='add'>+	wake_up_interruptible(&amp;log-&gt;wq);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct logger_log *get_log_from_minor(int);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * logger_open - the log's open() file operation</div><div class='add'>+ *</div><div class='add'>+ * Note how near a no-op this is in the write-only case. Keep it that way!</div><div class='add'>+ */</div><div class='add'>+static int logger_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct logger_log *log;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = nonseekable_open(inode, file);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	log = get_log_from_minor(MINOR(inode-&gt;i_rdev));</div><div class='add'>+	if (!log)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='add'>+		struct logger_reader *reader;</div><div class='add'>+</div><div class='add'>+		reader = kmalloc(sizeof(struct logger_reader), GFP_KERNEL);</div><div class='add'>+		if (!reader)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		reader-&gt;log = log;</div><div class='add'>+		INIT_LIST_HEAD(&amp;reader-&gt;list);</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;log-&gt;mutex);</div><div class='add'>+		reader-&gt;r_off = log-&gt;head;</div><div class='add'>+		list_add_tail(&amp;reader-&gt;list, &amp;log-&gt;readers);</div><div class='add'>+		mutex_unlock(&amp;log-&gt;mutex);</div><div class='add'>+</div><div class='add'>+		file-&gt;private_data = reader;</div><div class='add'>+	} else</div><div class='add'>+		file-&gt;private_data = log;</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'>+ * logger_release - the log's release file operation</div><div class='add'>+ *</div><div class='add'>+ * Note this is a total no-op in the write-only case. Keep it that way!</div><div class='add'>+ */</div><div class='add'>+static int logger_release(struct inode *ignored, struct file *file)</div><div class='add'>+{</div><div class='add'>+	if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='add'>+		struct logger_reader *reader = file-&gt;private_data;</div><div class='add'>+		list_del(&amp;reader-&gt;list);</div><div class='add'>+		kfree(reader);</div><div 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'>+ * logger_poll - the log's poll file operation, for poll/select/epoll</div><div class='add'>+ *</div><div class='add'>+ * Note we always return POLLOUT, because you can always write() to the log.</div><div class='add'>+ * Note also that, strictly speaking, a return value of POLLIN does not</div><div class='add'>+ * guarantee that the log is readable without blocking, as there is a small</div><div class='add'>+ * chance that the writer can lap the reader in the interim between poll()</div><div class='add'>+ * returning and the read() request.</div><div class='add'>+ */</div><div class='add'>+static unsigned int logger_poll(struct file *file, poll_table *wait)</div><div class='add'>+{</div><div class='add'>+	struct logger_reader *reader;</div><div class='add'>+	struct logger_log *log;</div><div class='add'>+	unsigned int ret = POLLOUT | POLLWRNORM;</div><div class='add'>+</div><div class='add'>+	if (!(file-&gt;f_mode &amp; FMODE_READ))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	reader = file-&gt;private_data;</div><div class='add'>+	log = reader-&gt;log;</div><div class='add'>+</div><div class='add'>+	poll_wait(file, &amp;log-&gt;wq, wait);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;log-&gt;mutex);</div><div class='add'>+	if (log-&gt;w_off != reader-&gt;r_off)</div><div class='add'>+		ret |= POLLIN | POLLRDNORM;</div><div class='add'>+	mutex_unlock(&amp;log-&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 long logger_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct logger_log *log = file_get_log(file);</div><div class='add'>+	struct logger_reader *reader;</div><div class='add'>+	long ret = -ENOTTY;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;log-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case LOGGER_GET_LOG_BUF_SIZE:</div><div class='add'>+		ret = log-&gt;size;</div><div class='add'>+		break;</div><div class='add'>+	case LOGGER_GET_LOG_LEN:</div><div class='add'>+		if (!(file-&gt;f_mode &amp; FMODE_READ)) {</div><div class='add'>+			ret = -EBADF;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		reader = file-&gt;private_data;</div><div class='add'>+		if (log-&gt;w_off &gt;= reader-&gt;r_off)</div><div class='add'>+			ret = log-&gt;w_off - reader-&gt;r_off;</div><div class='add'>+		else</div><div class='add'>+			ret = (log-&gt;size - reader-&gt;r_off) + log-&gt;w_off;</div><div class='add'>+		break;</div><div class='add'>+	case LOGGER_GET_NEXT_ENTRY_LEN:</div><div class='add'>+		if (!(file-&gt;f_mode &amp; FMODE_READ)) {</div><div class='add'>+			ret = -EBADF;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		reader = file-&gt;private_data;</div><div class='add'>+		if (log-&gt;w_off != reader-&gt;r_off)</div><div class='add'>+			ret = get_entry_len(log, reader-&gt;r_off);</div><div class='add'>+		else</div><div class='add'>+			ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	case LOGGER_FLUSH_LOG:</div><div class='add'>+		if (!(file-&gt;f_mode &amp; FMODE_WRITE)) {</div><div class='add'>+			ret = -EBADF;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		list_for_each_entry(reader, &amp;log-&gt;readers, list)</div><div class='add'>+			reader-&gt;r_off = log-&gt;w_off;</div><div class='add'>+		log-&gt;head = log-&gt;w_off;</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;log-&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 const struct file_operations logger_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.read = logger_read,</div><div class='add'>+	.aio_write = logger_aio_write,</div><div class='add'>+	.poll = logger_poll,</div><div class='add'>+	.unlocked_ioctl = logger_ioctl,</div><div class='add'>+	.compat_ioctl = logger_ioctl,</div><div class='add'>+	.open = logger_open,</div><div class='add'>+	.release = logger_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Defines a log structure with name 'NAME' and a size of 'SIZE' bytes, which</div><div class='add'>+ * must be a power of two, greater than LOGGER_ENTRY_MAX_LEN, and less than</div><div class='add'>+ * LONG_MAX minus LOGGER_ENTRY_MAX_LEN.</div><div class='add'>+ */</div><div class='add'>+#define DEFINE_LOGGER_DEVICE(VAR, NAME, SIZE) \</div><div class='add'>+static unsigned char _buf_ ## VAR[SIZE]; \</div><div class='add'>+static struct logger_log VAR = { \</div><div class='add'>+	.buffer = _buf_ ## VAR, \</div><div class='add'>+	.misc = { \</div><div class='add'>+		.minor = MISC_DYNAMIC_MINOR, \</div><div class='add'>+		.name = NAME, \</div><div class='add'>+		.fops = &amp;logger_fops, \</div><div class='add'>+		.parent = NULL, \</div><div class='add'>+	}, \</div><div class='add'>+	.wq = __WAIT_QUEUE_HEAD_INITIALIZER(VAR .wq), \</div><div class='add'>+	.readers = LIST_HEAD_INIT(VAR .readers), \</div><div class='add'>+	.mutex = __MUTEX_INITIALIZER(VAR .mutex), \</div><div class='add'>+	.w_off = 0, \</div><div class='add'>+	.head = 0, \</div><div class='add'>+	.size = SIZE, \</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DEFINE_LOGGER_DEVICE(log_main, LOGGER_LOG_MAIN, 256*1024)</div><div class='add'>+DEFINE_LOGGER_DEVICE(log_events, LOGGER_LOG_EVENTS, 256*1024)</div><div class='add'>+DEFINE_LOGGER_DEVICE(log_radio, LOGGER_LOG_RADIO, 256*1024)</div><div class='add'>+DEFINE_LOGGER_DEVICE(log_system, LOGGER_LOG_SYSTEM, 256*1024)</div><div class='add'>+</div><div class='add'>+static struct logger_log *get_log_from_minor(int minor)</div><div class='add'>+{</div><div class='add'>+	if (log_main.misc.minor == minor)</div><div class='add'>+		return &amp;log_main;</div><div class='add'>+	if (log_events.misc.minor == minor)</div><div class='add'>+		return &amp;log_events;</div><div class='add'>+	if (log_radio.misc.minor == minor)</div><div class='add'>+		return &amp;log_radio;</div><div class='add'>+	if (log_system.misc.minor == minor)</div><div class='add'>+		return &amp;log_system;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init init_log(struct logger_log *log)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = misc_register(&amp;log-&gt;misc);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		printk(KERN_ERR "logger: failed to register misc "</div><div class='add'>+		       "device for log '%s'!\n", log-&gt;misc.name);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "logger: created %luK log '%s'\n",</div><div class='add'>+	       (unsigned long) log-&gt;size &gt;&gt; 10, log-&gt;misc.name);</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 logger_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = init_log(&amp;log_main);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = init_log(&amp;log_events);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = init_log(&amp;log_radio);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = init_log(&amp;log_system);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+device_initcall(logger_init);</div><div class='head'>diff --git a/drivers/staging/android/logger.h b/drivers/staging/android/logger.h<br/>new file mode 100644<br/>index 000000000000..2cb06e9d8f98<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/logger.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/logger.h</a></div><div class='hunk'>@@ -0,0 +1,49 @@</div><div class='add'>+/* include/linux/logger.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007-2008 Google, Inc.</div><div class='add'>+ * Author: Robert Love &lt;rlove@android.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_LOGGER_H</div><div class='add'>+#define _LINUX_LOGGER_H</div><div class='add'>+</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 logger_entry {</div><div class='add'>+	__u16		len;	/* length of the payload */</div><div class='add'>+	__u16		__pad;	/* no matter what, we get 2 bytes of padding */</div><div class='add'>+	__s32		pid;	/* generating process's pid */</div><div class='add'>+	__s32		tid;	/* generating process's tid */</div><div class='add'>+	__s32		sec;	/* seconds since Epoch */</div><div class='add'>+	__s32		nsec;	/* nanoseconds */</div><div class='add'>+	char		msg[0];	/* the entry's payload */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define LOGGER_LOG_RADIO	"log_radio"	/* radio-related messages */</div><div class='add'>+#define LOGGER_LOG_EVENTS	"log_events"	/* system/hardware events */</div><div class='add'>+#define LOGGER_LOG_SYSTEM	"log_system"	/* system/framework messages */</div><div class='add'>+#define LOGGER_LOG_MAIN		"log_main"	/* everything else */</div><div class='add'>+</div><div class='add'>+#define LOGGER_ENTRY_MAX_LEN		(4*1024)</div><div class='add'>+#define LOGGER_ENTRY_MAX_PAYLOAD	\</div><div class='add'>+	(LOGGER_ENTRY_MAX_LEN - sizeof(struct logger_entry))</div><div class='add'>+</div><div class='add'>+#define __LOGGERIO	0xAE</div><div class='add'>+</div><div class='add'>+#define LOGGER_GET_LOG_BUF_SIZE		_IO(__LOGGERIO, 1) /* size of log */</div><div class='add'>+#define LOGGER_GET_LOG_LEN		_IO(__LOGGERIO, 2) /* used log len */</div><div class='add'>+#define LOGGER_GET_NEXT_ENTRY_LEN	_IO(__LOGGERIO, 3) /* next entry len */</div><div class='add'>+#define LOGGER_FLUSH_LOG		_IO(__LOGGERIO, 4) /* flush log */</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_LOGGER_H */</div><div class='head'>diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c<br/>new file mode 100644<br/>index 000000000000..2d8d2b796101<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/lowmemorykiller.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/lowmemorykiller.c</a></div><div class='hunk'>@@ -0,0 +1,219 @@</div><div class='add'>+/* drivers/misc/lowmemorykiller.c</div><div class='add'>+ *</div><div class='add'>+ * The lowmemorykiller driver lets user-space specify a set of memory thresholds</div><div class='add'>+ * where processes with a range of oom_adj values will get killed. Specify the</div><div class='add'>+ * minimum oom_adj values in /sys/module/lowmemorykiller/parameters/adj and the</div><div class='add'>+ * number of free pages in /sys/module/lowmemorykiller/parameters/minfree. Both</div><div class='add'>+ * files take a comma separated list of numbers in ascending order.</div><div class='add'>+ *</div><div class='add'>+ * For example, write "0,8" to /sys/module/lowmemorykiller/parameters/adj and</div><div class='add'>+ * "1024,4096" to /sys/module/lowmemorykiller/parameters/minfree to kill</div><div class='add'>+ * processes with a oom_adj value of 8 or higher when the free memory drops</div><div class='add'>+ * below 4096 pages and kill processes with a oom_adj value of 0 or higher</div><div class='add'>+ * when the free memory drops below 1024 pages.</div><div class='add'>+ *</div><div class='add'>+ * The driver considers memory used for caches to be free, but if a large</div><div class='add'>+ * percentage of the cached memory is locked this can be very inaccurate</div><div class='add'>+ * and processes may not get killed until the normal oom killer is triggered.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007-2008 Google, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/oom.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/profile.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+</div><div class='add'>+static uint32_t lowmem_debug_level = 2;</div><div class='add'>+static int lowmem_adj[6] = {</div><div class='add'>+	0,</div><div class='add'>+	1,</div><div class='add'>+	6,</div><div class='add'>+	12,</div><div class='add'>+};</div><div class='add'>+static int lowmem_adj_size = 4;</div><div class='add'>+static size_t lowmem_minfree[6] = {</div><div class='add'>+	3 * 512,	/* 6MB */</div><div class='add'>+	2 * 1024,	/* 8MB */</div><div class='add'>+	4 * 1024,	/* 16MB */</div><div class='add'>+	16 * 1024,	/* 64MB */</div><div class='add'>+};</div><div class='add'>+static int lowmem_minfree_size = 4;</div><div class='add'>+</div><div class='add'>+static struct task_struct *lowmem_deathpending;</div><div class='add'>+</div><div class='add'>+#define lowmem_print(level, x...)			\</div><div class='add'>+	do {						\</div><div class='add'>+		if (lowmem_debug_level &gt;= (level))	\</div><div class='add'>+			printk(x);			\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+task_notify_func(struct notifier_block *self, unsigned long val, void *data);</div><div class='add'>+</div><div class='add'>+static struct notifier_block task_nb = {</div><div class='add'>+	.notifier_call	= task_notify_func,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+task_notify_func(struct notifier_block *self, unsigned long val, void *data)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *task = data;</div><div class='add'>+	if (task == lowmem_deathpending) {</div><div class='add'>+		lowmem_deathpending = NULL;</div><div class='add'>+		task_handoff_unregister(&amp;task_nb);</div><div class='add'>+	}</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *p;</div><div class='add'>+	struct task_struct *selected = NULL;</div><div class='add'>+	int rem = 0;</div><div class='add'>+	int tasksize;</div><div class='add'>+	int i;</div><div class='add'>+	int min_adj = OOM_ADJUST_MAX + 1;</div><div class='add'>+	int selected_tasksize = 0;</div><div class='add'>+	int selected_oom_adj;</div><div class='add'>+	int array_size = ARRAY_SIZE(lowmem_adj);</div><div class='add'>+	int other_free = global_page_state(NR_FREE_PAGES);</div><div class='add'>+	int other_file = global_page_state(NR_FILE_PAGES) -</div><div class='add'>+						global_page_state(NR_SHMEM);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we already have a death outstanding, then</div><div class='add'>+	 * bail out right away; indicating to vmscan</div><div class='add'>+	 * that we have nothing further to offer on</div><div class='add'>+	 * this pass.</div><div class='add'>+	 *</div><div class='add'>+	 * Note: Currently you need CONFIG_PROFILING</div><div class='add'>+	 * for this to work correctly.</div><div class='add'>+	 */</div><div class='add'>+	if (lowmem_deathpending)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (lowmem_adj_size &lt; array_size)</div><div class='add'>+		array_size = lowmem_adj_size;</div><div class='add'>+	if (lowmem_minfree_size &lt; array_size)</div><div class='add'>+		array_size = lowmem_minfree_size;</div><div class='add'>+	for (i = 0; i &lt; array_size; i++) {</div><div class='add'>+		if (other_free &lt; lowmem_minfree[i] &amp;&amp;</div><div class='add'>+		    other_file &lt; lowmem_minfree[i]) {</div><div class='add'>+			min_adj = lowmem_adj[i];</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (sc-&gt;nr_to_scan &gt; 0)</div><div class='add'>+		lowmem_print(3, "lowmem_shrink %lu, %x, ofree %d %d, ma %d\n",</div><div class='add'>+				sc-&gt;nr_to_scan, sc-&gt;gfp_mask, other_free,</div><div class='add'>+				other_file, min_adj);</div><div class='add'>+	rem = global_page_state(NR_ACTIVE_ANON) +</div><div class='add'>+		global_page_state(NR_ACTIVE_FILE) +</div><div class='add'>+		global_page_state(NR_INACTIVE_ANON) +</div><div class='add'>+		global_page_state(NR_INACTIVE_FILE);</div><div class='add'>+	if (sc-&gt;nr_to_scan &lt;= 0 || min_adj == OOM_ADJUST_MAX + 1) {</div><div class='add'>+		lowmem_print(5, "lowmem_shrink %lu, %x, return %d\n",</div><div class='add'>+			     sc-&gt;nr_to_scan, sc-&gt;gfp_mask, rem);</div><div class='add'>+		return rem;</div><div class='add'>+	}</div><div class='add'>+	selected_oom_adj = min_adj;</div><div class='add'>+</div><div class='add'>+	read_lock(&amp;tasklist_lock);</div><div class='add'>+	for_each_process(p) {</div><div class='add'>+		struct mm_struct *mm;</div><div class='add'>+		struct signal_struct *sig;</div><div class='add'>+		int oom_adj;</div><div class='add'>+</div><div class='add'>+		task_lock(p);</div><div class='add'>+		mm = p-&gt;mm;</div><div class='add'>+		sig = p-&gt;signal;</div><div class='add'>+		if (!mm || !sig) {</div><div class='add'>+			task_unlock(p);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		oom_adj = sig-&gt;oom_adj;</div><div class='add'>+		if (oom_adj &lt; min_adj) {</div><div class='add'>+			task_unlock(p);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		tasksize = get_mm_rss(mm);</div><div class='add'>+		task_unlock(p);</div><div class='add'>+		if (tasksize &lt;= 0)</div><div class='add'>+			continue;</div><div class='add'>+		if (selected) {</div><div class='add'>+			if (oom_adj &lt; selected_oom_adj)</div><div class='add'>+				continue;</div><div class='add'>+			if (oom_adj == selected_oom_adj &amp;&amp;</div><div class='add'>+			    tasksize &lt;= selected_tasksize)</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+		selected = p;</div><div class='add'>+		selected_tasksize = tasksize;</div><div class='add'>+		selected_oom_adj = oom_adj;</div><div class='add'>+		lowmem_print(2, "select %d (%s), adj %d, size %d, to kill\n",</div><div class='add'>+			     p-&gt;pid, p-&gt;comm, oom_adj, tasksize);</div><div class='add'>+	}</div><div class='add'>+	if (selected) {</div><div class='add'>+		lowmem_print(1, "send sigkill to %d (%s), adj %d, size %d\n",</div><div class='add'>+			     selected-&gt;pid, selected-&gt;comm,</div><div class='add'>+			     selected_oom_adj, selected_tasksize);</div><div class='add'>+		/*</div><div class='add'>+		 * If CONFIG_PROFILING is off, then task_handoff_register()</div><div class='add'>+		 * is a nop. In that case we don't want to stall the killer</div><div class='add'>+		 * by setting lowmem_deathpending.</div><div class='add'>+		 */</div><div class='add'>+#ifdef CONFIG_PROFILING</div><div class='add'>+		lowmem_deathpending = selected;</div><div class='add'>+		task_handoff_register(&amp;task_nb);</div><div class='add'>+#endif</div><div class='add'>+		force_sig(SIGKILL, selected);</div><div class='add'>+		rem -= selected_tasksize;</div><div class='add'>+	}</div><div class='add'>+	lowmem_print(4, "lowmem_shrink %lu, %x, return %d\n",</div><div class='add'>+		     sc-&gt;nr_to_scan, sc-&gt;gfp_mask, rem);</div><div class='add'>+	read_unlock(&amp;tasklist_lock);</div><div class='add'>+	return rem;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct shrinker lowmem_shrinker = {</div><div class='add'>+	.shrink = lowmem_shrink,</div><div class='add'>+	.seeks = DEFAULT_SEEKS * 16</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init lowmem_init(void)</div><div class='add'>+{</div><div class='add'>+	register_shrinker(&amp;lowmem_shrinker);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit lowmem_exit(void)</div><div class='add'>+{</div><div class='add'>+	unregister_shrinker(&amp;lowmem_shrinker);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_param_named(cost, lowmem_shrinker.seeks, int, S_IRUGO | S_IWUSR);</div><div class='add'>+module_param_array_named(adj, lowmem_adj, int, &amp;lowmem_adj_size,</div><div class='add'>+			 S_IRUGO | S_IWUSR);</div><div class='add'>+module_param_array_named(minfree, lowmem_minfree, uint, &amp;lowmem_minfree_size,</div><div class='add'>+			 S_IRUGO | S_IWUSR);</div><div class='add'>+module_param_named(debug_level, lowmem_debug_level, uint, S_IRUGO | S_IWUSR);</div><div class='add'>+</div><div class='add'>+module_init(lowmem_init);</div><div class='add'>+module_exit(lowmem_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/android/pmem.c b/drivers/staging/android/pmem.c<br/>new file mode 100644<br/>index 000000000000..7d97032c6508<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/pmem.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/pmem.c</a></div><div class='hunk'>@@ -0,0 +1,1345 @@</div><div class='add'>+/* pmem.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007 Google, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/miscdevice.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/file.h&gt;</div><div class='add'>+#include &lt;linux/mm.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/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/mempolicy.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include "android_pmem.h"</div><div class='add'>+</div><div class='add'>+#define PMEM_MAX_DEVICES 10</div><div class='add'>+#define PMEM_MAX_ORDER 128</div><div class='add'>+#define PMEM_MIN_ALLOC PAGE_SIZE</div><div class='add'>+</div><div class='add'>+#define PMEM_DEBUG 1</div><div class='add'>+</div><div class='add'>+/* indicates that a refernce to this file has been taken via get_pmem_file,</div><div class='add'>+ * the file should not be released until put_pmem_file is called */</div><div class='add'>+#define PMEM_FLAGS_BUSY 0x1</div><div class='add'>+/* indicates that this is a suballocation of a larger master range */</div><div class='add'>+#define PMEM_FLAGS_CONNECTED 0x1 &lt;&lt; 1</div><div class='add'>+/* indicates this is a master and not a sub allocation and that it is mmaped */</div><div class='add'>+#define PMEM_FLAGS_MASTERMAP 0x1 &lt;&lt; 2</div><div class='add'>+/* submap and unsubmap flags indicate:</div><div class='add'>+ * 00: subregion has never been mmaped</div><div class='add'>+ * 10: subregion has been mmaped, reference to the mm was taken</div><div class='add'>+ * 11: subretion has ben released, refernece to the mm still held</div><div class='add'>+ * 01: subretion has been released, reference to the mm has been released</div><div class='add'>+ */</div><div class='add'>+#define PMEM_FLAGS_SUBMAP 0x1 &lt;&lt; 3</div><div class='add'>+#define PMEM_FLAGS_UNSUBMAP 0x1 &lt;&lt; 4</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct pmem_data {</div><div class='add'>+	/* in alloc mode: an index into the bitmap</div><div class='add'>+	 * in no_alloc mode: the size of the allocation */</div><div class='add'>+	int index;</div><div class='add'>+	/* see flags above for descriptions */</div><div class='add'>+	unsigned int flags;</div><div class='add'>+	/* protects this data field, if the mm_mmap sem will be held at the</div><div class='add'>+	 * same time as this sem, the mm sem must be taken first (as this is</div><div class='add'>+	 * the order for vma_open and vma_close ops */</div><div class='add'>+	struct rw_semaphore sem;</div><div class='add'>+	/* info about the mmaping process */</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+	/* task struct of the mapping process */</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+	/* process id of teh mapping process */</div><div class='add'>+	pid_t pid;</div><div class='add'>+	/* file descriptor of the master */</div><div class='add'>+	int master_fd;</div><div class='add'>+	/* file struct of the master */</div><div class='add'>+	struct file *master_file;</div><div class='add'>+	/* a list of currently available regions if this is a suballocation */</div><div class='add'>+	struct list_head region_list;</div><div class='add'>+	/* a linked list of data so we can access them for debugging */</div><div class='add'>+	struct list_head list;</div><div class='add'>+#if PMEM_DEBUG</div><div class='add'>+	int ref;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pmem_bits {</div><div class='add'>+	unsigned allocated:1;		/* 1 if allocated, 0 if free */</div><div class='add'>+	unsigned order:7;		/* size of the region in pmem space */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pmem_region_node {</div><div class='add'>+	struct pmem_region region;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PMEM_DEBUG_MSGS 0</div><div class='add'>+#if PMEM_DEBUG_MSGS</div><div class='add'>+#define DLOG(fmt,args...) \</div><div class='add'>+	do { printk(KERN_INFO "[%s:%s:%d] "fmt, __FILE__, __func__, __LINE__, \</div><div class='add'>+		    ##args); } \</div><div class='add'>+	while (0)</div><div class='add'>+#else</div><div class='add'>+#define DLOG(x...) do {} while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct pmem_info {</div><div class='add'>+	struct miscdevice dev;</div><div class='add'>+	/* physical start address of the remaped pmem space */</div><div class='add'>+	unsigned long base;</div><div class='add'>+	/* vitual start address of the remaped pmem space */</div><div class='add'>+	unsigned char __iomem *vbase;</div><div class='add'>+	/* total size of the pmem space */</div><div class='add'>+	unsigned long size;</div><div class='add'>+	/* number of entries in the pmem space */</div><div class='add'>+	unsigned long num_entries;</div><div class='add'>+	/* pfn of the garbage page in memory */</div><div class='add'>+	unsigned long garbage_pfn;</div><div class='add'>+	/* index of the garbage page in the pmem space */</div><div class='add'>+	int garbage_index;</div><div class='add'>+	/* the bitmap for the region indicating which entries are allocated</div><div class='add'>+	 * and which are free */</div><div class='add'>+	struct pmem_bits *bitmap;</div><div class='add'>+	/* indicates the region should not be managed with an allocator */</div><div class='add'>+	unsigned no_allocator;</div><div class='add'>+	/* indicates maps of this region should be cached, if a mix of</div><div class='add'>+	 * cached and uncached is desired, set this and open the device with</div><div class='add'>+	 * O_SYNC to get an uncached region */</div><div class='add'>+	unsigned cached;</div><div class='add'>+	unsigned buffered;</div><div class='add'>+	/* in no_allocator mode the first mapper gets the whole space and sets</div><div class='add'>+	 * this flag */</div><div class='add'>+	unsigned allocated;</div><div class='add'>+	/* for debugging, creates a list of pmem file structs, the</div><div class='add'>+	 * data_list_lock should be taken before pmem_data-&gt;sem if both are</div><div class='add'>+	 * needed */</div><div class='add'>+	struct mutex data_list_lock;</div><div class='add'>+	struct list_head data_list;</div><div class='add'>+	/* pmem_sem protects the bitmap array</div><div class='add'>+	 * a write lock should be held when modifying entries in bitmap</div><div class='add'>+	 * a read lock should be held when reading data from bits or</div><div class='add'>+	 * dereferencing a pointer into bitmap</div><div class='add'>+	 *</div><div class='add'>+	 * pmem_data-&gt;sem protects the pmem data of a particular file</div><div class='add'>+	 * Many of the function that require the pmem_data-&gt;sem have a non-</div><div class='add'>+	 * locking version for when the caller is already holding that sem.</div><div class='add'>+	 *</div><div class='add'>+	 * IF YOU TAKE BOTH LOCKS TAKE THEM IN THIS ORDER:</div><div class='add'>+	 * down(pmem_data-&gt;sem) =&gt; down(bitmap_sem)</div><div class='add'>+	 */</div><div class='add'>+	struct rw_semaphore bitmap_sem;</div><div class='add'>+</div><div class='add'>+	long (*ioctl)(struct file *, unsigned int, unsigned long);</div><div class='add'>+	int (*release)(struct inode *, struct file *);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pmem_info pmem[PMEM_MAX_DEVICES];</div><div class='add'>+static int id_count;</div><div class='add'>+</div><div class='add'>+#define PMEM_IS_FREE(id, index) !(pmem[id].bitmap[index].allocated)</div><div class='add'>+#define PMEM_ORDER(id, index) pmem[id].bitmap[index].order</div><div class='add'>+#define PMEM_BUDDY_INDEX(id, index) (index ^ (1 &lt;&lt; PMEM_ORDER(id, index)))</div><div class='add'>+#define PMEM_NEXT_INDEX(id, index) (index + (1 &lt;&lt; PMEM_ORDER(id, index)))</div><div class='add'>+#define PMEM_OFFSET(index) (index * PMEM_MIN_ALLOC)</div><div class='add'>+#define PMEM_START_ADDR(id, index) (PMEM_OFFSET(index) + pmem[id].base)</div><div class='add'>+#define PMEM_LEN(id, index) ((1 &lt;&lt; PMEM_ORDER(id, index)) * PMEM_MIN_ALLOC)</div><div class='add'>+#define PMEM_END_ADDR(id, index) (PMEM_START_ADDR(id, index) + \</div><div class='add'>+	PMEM_LEN(id, index))</div><div class='add'>+#define PMEM_START_VADDR(id, index) (PMEM_OFFSET(id, index) + pmem[id].vbase)</div><div class='add'>+#define PMEM_END_VADDR(id, index) (PMEM_START_VADDR(id, index) + \</div><div class='add'>+	PMEM_LEN(id, index))</div><div class='add'>+#define PMEM_REVOKED(data) (data-&gt;flags &amp; PMEM_FLAGS_REVOKED)</div><div class='add'>+#define PMEM_IS_PAGE_ALIGNED(addr) (!((addr) &amp; (~PAGE_MASK)))</div><div class='add'>+#define PMEM_IS_SUBMAP(data) ((data-&gt;flags &amp; PMEM_FLAGS_SUBMAP) &amp;&amp; \</div><div class='add'>+	(!(data-&gt;flags &amp; PMEM_FLAGS_UNSUBMAP)))</div><div class='add'>+</div><div class='add'>+static int pmem_release(struct inode *, struct file *);</div><div class='add'>+static int pmem_mmap(struct file *, struct vm_area_struct *);</div><div class='add'>+static int pmem_open(struct inode *, struct file *);</div><div class='add'>+static long pmem_ioctl(struct file *, unsigned int, unsigned long);</div><div class='add'>+</div><div class='add'>+struct file_operations pmem_fops = {</div><div class='add'>+	.release = pmem_release,</div><div class='add'>+	.mmap = pmem_mmap,</div><div class='add'>+	.open = pmem_open,</div><div class='add'>+	.unlocked_ioctl = pmem_ioctl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int get_id(struct file *file)</div><div class='add'>+{</div><div class='add'>+	return MINOR(file-&gt;f_dentry-&gt;d_inode-&gt;i_rdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int is_pmem_file(struct file *file)</div><div class='add'>+{</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!file || !file-&gt;f_dentry || !file-&gt;f_dentry-&gt;d_inode))</div><div class='add'>+		return 0;</div><div class='add'>+	id = get_id(file);</div><div class='add'>+	if (unlikely(id &gt;= PMEM_MAX_DEVICES))</div><div class='add'>+		return 0;</div><div class='add'>+	if (unlikely(file-&gt;f_dentry-&gt;d_inode-&gt;i_rdev !=</div><div class='add'>+	     MKDEV(MISC_MAJOR, pmem[id].dev.minor)))</div><div class='add'>+		return 0;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int has_allocation(struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct pmem_data *data;</div><div class='add'>+	/* check is_pmem_file first if not accessed via pmem_file_ops */</div><div class='add'>+</div><div class='add'>+	if (unlikely(!file-&gt;private_data))</div><div class='add'>+		return 0;</div><div class='add'>+	data = (struct pmem_data *)file-&gt;private_data;</div><div class='add'>+	if (unlikely(data-&gt;index &lt; 0))</div><div class='add'>+		return 0;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int is_master_owner(struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct file *master_file;</div><div class='add'>+	struct pmem_data *data;</div><div class='add'>+	int put_needed, ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!is_pmem_file(file) || !has_allocation(file))</div><div class='add'>+		return 0;</div><div class='add'>+	data = (struct pmem_data *)file-&gt;private_data;</div><div class='add'>+	if (PMEM_FLAGS_MASTERMAP &amp; data-&gt;flags)</div><div class='add'>+		return 1;</div><div class='add'>+	master_file = fget_light(data-&gt;master_fd, &amp;put_needed);</div><div class='add'>+	if (master_file &amp;&amp; data-&gt;master_file == master_file)</div><div class='add'>+		ret = 1;</div><div class='add'>+	fput_light(master_file, put_needed);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pmem_free(int id, int index)</div><div class='add'>+{</div><div class='add'>+	/* caller should hold the write lock on pmem_sem! */</div><div class='add'>+	int buddy, curr = index;</div><div class='add'>+	DLOG("index %d\n", index);</div><div class='add'>+</div><div class='add'>+	if (pmem[id].no_allocator) {</div><div class='add'>+		pmem[id].allocated = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	/* clean up the bitmap, merging any buddies */</div><div class='add'>+	pmem[id].bitmap[curr].allocated = 0;</div><div class='add'>+	/* find a slots buddy Buddy# = Slot# ^ (1 &lt;&lt; order)</div><div class='add'>+	 * if the buddy is also free merge them</div><div class='add'>+	 * repeat until the buddy is not free or end of the bitmap is reached</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		buddy = PMEM_BUDDY_INDEX(id, curr);</div><div class='add'>+		if (PMEM_IS_FREE(id, buddy) &amp;&amp;</div><div class='add'>+				PMEM_ORDER(id, buddy) == PMEM_ORDER(id, curr)) {</div><div class='add'>+			PMEM_ORDER(id, buddy)++;</div><div class='add'>+			PMEM_ORDER(id, curr)++;</div><div class='add'>+			curr = min(buddy, curr);</div><div class='add'>+		} else {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} while (curr &lt; pmem[id].num_entries);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pmem_revoke(struct file *file, struct pmem_data *data);</div><div class='add'>+</div><div class='add'>+static int pmem_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct pmem_data *data = (struct pmem_data *)file-&gt;private_data;</div><div class='add'>+	struct pmem_region_node *region_node;</div><div class='add'>+	struct list_head *elt, *elt2;</div><div class='add'>+	int id = get_id(file), ret = 0;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pmem[id].data_list_lock);</div><div class='add'>+	/* if this file is a master, revoke all the memory in the connected</div><div class='add'>+	 *  files */</div><div class='add'>+	if (PMEM_FLAGS_MASTERMAP &amp; data-&gt;flags) {</div><div class='add'>+		struct pmem_data *sub_data;</div><div class='add'>+		list_for_each(elt, &amp;pmem[id].data_list) {</div><div class='add'>+			sub_data = list_entry(elt, struct pmem_data, list);</div><div class='add'>+			down_read(&amp;sub_data-&gt;sem);</div><div class='add'>+			if (PMEM_IS_SUBMAP(sub_data) &amp;&amp;</div><div class='add'>+			    file == sub_data-&gt;master_file) {</div><div class='add'>+				up_read(&amp;sub_data-&gt;sem);</div><div class='add'>+				pmem_revoke(file, sub_data);</div><div class='add'>+			}  else</div><div class='add'>+				up_read(&amp;sub_data-&gt;sem);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	list_del(&amp;data-&gt;list);</div><div class='add'>+	mutex_unlock(&amp;pmem[id].data_list_lock);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	down_write(&amp;data-&gt;sem);</div><div class='add'>+</div><div class='add'>+	/* if its not a conencted file and it has an allocation, free it */</div><div class='add'>+	if (!(PMEM_FLAGS_CONNECTED &amp; data-&gt;flags) &amp;&amp; has_allocation(file)) {</div><div class='add'>+		down_write(&amp;pmem[id].bitmap_sem);</div><div class='add'>+		ret = pmem_free(id, data-&gt;index);</div><div class='add'>+		up_write(&amp;pmem[id].bitmap_sem);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if this file is a submap (mapped, connected file), downref the</div><div class='add'>+	 * task struct */</div><div class='add'>+	if (PMEM_FLAGS_SUBMAP &amp; data-&gt;flags)</div><div class='add'>+		if (data-&gt;task) {</div><div class='add'>+			put_task_struct(data-&gt;task);</div><div class='add'>+			data-&gt;task = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_safe(elt, elt2, &amp;data-&gt;region_list) {</div><div class='add'>+		region_node = list_entry(elt, struct pmem_region_node, list);</div><div class='add'>+		list_del(elt);</div><div class='add'>+		kfree(region_node);</div><div class='add'>+	}</div><div class='add'>+	BUG_ON(!list_empty(&amp;data-&gt;region_list));</div><div class='add'>+</div><div class='add'>+	up_write(&amp;data-&gt;sem);</div><div class='add'>+	kfree(data);</div><div class='add'>+	if (pmem[id].release)</div><div class='add'>+		ret = pmem[id].release(inode, file);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pmem_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct pmem_data *data;</div><div class='add'>+	int id = get_id(file);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	DLOG("current %u file %p(%d)\n", current-&gt;pid, file, file_count(file));</div><div class='add'>+	/* setup file-&gt;private_data to indicate its unmapped */</div><div class='add'>+	/*  you can only open a pmem device one time */</div><div class='add'>+	if (file-&gt;private_data != NULL)</div><div class='add'>+		return -1;</div><div class='add'>+	data = kmalloc(sizeof(struct pmem_data), GFP_KERNEL);</div><div class='add'>+	if (!data) {</div><div class='add'>+		printk("pmem: unable to allocate memory for pmem metadata.");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	data-&gt;flags = 0;</div><div class='add'>+	data-&gt;index = -1;</div><div class='add'>+	data-&gt;task = NULL;</div><div class='add'>+	data-&gt;vma = NULL;</div><div class='add'>+	data-&gt;pid = 0;</div><div class='add'>+	data-&gt;master_file = NULL;</div><div class='add'>+#if PMEM_DEBUG</div><div class='add'>+	data-&gt;ref = 0;</div><div class='add'>+#endif</div><div class='add'>+	INIT_LIST_HEAD(&amp;data-&gt;region_list);</div><div class='add'>+	init_rwsem(&amp;data-&gt;sem);</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = data;</div><div class='add'>+	INIT_LIST_HEAD(&amp;data-&gt;list);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pmem[id].data_list_lock);</div><div class='add'>+	list_add(&amp;data-&gt;list, &amp;pmem[id].data_list);</div><div class='add'>+	mutex_unlock(&amp;pmem[id].data_list_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long pmem_order(unsigned long len)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	len = (len + PMEM_MIN_ALLOC - 1)/PMEM_MIN_ALLOC;</div><div class='add'>+	len--;</div><div class='add'>+	for (i = 0; i &lt; sizeof(len)*8; i++)</div><div class='add'>+		if (len &gt;&gt; i == 0)</div><div class='add'>+			break;</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pmem_allocate(int id, unsigned long len)</div><div class='add'>+{</div><div class='add'>+	/* caller should hold the write lock on pmem_sem! */</div><div class='add'>+	/* return the corresponding pdata[] entry */</div><div class='add'>+	int curr = 0;</div><div class='add'>+	int end = pmem[id].num_entries;</div><div class='add'>+	int best_fit = -1;</div><div class='add'>+	unsigned long order = pmem_order(len);</div><div class='add'>+</div><div class='add'>+	if (pmem[id].no_allocator) {</div><div class='add'>+		DLOG("no allocator");</div><div class='add'>+		if ((len &gt; pmem[id].size) || pmem[id].allocated)</div><div class='add'>+			return -1;</div><div class='add'>+		pmem[id].allocated = 1;</div><div class='add'>+		return len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (order &gt; PMEM_MAX_ORDER)</div><div class='add'>+		return -1;</div><div class='add'>+	DLOG("order %lx\n", order);</div><div class='add'>+</div><div class='add'>+	/* look through the bitmap:</div><div class='add'>+	 * 	if you find a free slot of the correct order use it</div><div class='add'>+	 * 	otherwise, use the best fit (smallest with size &gt; order) slot</div><div class='add'>+	 */</div><div class='add'>+	while (curr &lt; end) {</div><div class='add'>+		if (PMEM_IS_FREE(id, curr)) {</div><div class='add'>+			if (PMEM_ORDER(id, curr) == (unsigned char)order) {</div><div class='add'>+				/* set the not free bit and clear others */</div><div class='add'>+				best_fit = curr;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (PMEM_ORDER(id, curr) &gt; (unsigned char)order &amp;&amp;</div><div class='add'>+			    (best_fit &lt; 0 ||</div><div class='add'>+			     PMEM_ORDER(id, curr) &lt; PMEM_ORDER(id, best_fit)))</div><div class='add'>+				best_fit = curr;</div><div class='add'>+		}</div><div class='add'>+		curr = PMEM_NEXT_INDEX(id, curr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if best_fit &lt; 0, there are no suitable slots,</div><div class='add'>+	 * return an error</div><div class='add'>+	 */</div><div class='add'>+	if (best_fit &lt; 0) {</div><div class='add'>+		printk("pmem: no space left to allocate!\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* now partition the best fit:</div><div class='add'>+	 * 	split the slot into 2 buddies of order - 1</div><div class='add'>+	 * 	repeat until the slot is of the correct order</div><div class='add'>+	 */</div><div class='add'>+	while (PMEM_ORDER(id, best_fit) &gt; (unsigned char)order) {</div><div class='add'>+		int buddy;</div><div class='add'>+		PMEM_ORDER(id, best_fit) -= 1;</div><div class='add'>+		buddy = PMEM_BUDDY_INDEX(id, best_fit);</div><div class='add'>+		PMEM_ORDER(id, buddy) = PMEM_ORDER(id, best_fit);</div><div class='add'>+	}</div><div class='add'>+	pmem[id].bitmap[best_fit].allocated = 1;</div><div class='add'>+	return best_fit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static pgprot_t pmem_access_prot(struct file *file, pgprot_t vma_prot)</div><div class='add'>+{</div><div class='add'>+	int id = get_id(file);</div><div class='add'>+#ifdef pgprot_noncached</div><div class='add'>+	if (pmem[id].cached == 0 || file-&gt;f_flags &amp; O_SYNC)</div><div class='add'>+		return pgprot_noncached(vma_prot);</div><div class='add'>+#endif</div><div class='add'>+#ifdef pgprot_ext_buffered</div><div class='add'>+	else if (pmem[id].buffered)</div><div class='add'>+		return pgprot_ext_buffered(vma_prot);</div><div class='add'>+#endif</div><div class='add'>+	return vma_prot;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long pmem_start_addr(int id, struct pmem_data *data)</div><div class='add'>+{</div><div class='add'>+	if (pmem[id].no_allocator)</div><div class='add'>+		return PMEM_START_ADDR(id, 0);</div><div class='add'>+	else</div><div class='add'>+		return PMEM_START_ADDR(id, data-&gt;index);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *pmem_start_vaddr(int id, struct pmem_data *data)</div><div class='add'>+{</div><div class='add'>+	return pmem_start_addr(id, data) - pmem[id].base + pmem[id].vbase;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long pmem_len(int id, struct pmem_data *data)</div><div class='add'>+{</div><div class='add'>+	if (pmem[id].no_allocator)</div><div class='add'>+		return data-&gt;index;</div><div class='add'>+	else</div><div class='add'>+		return PMEM_LEN(id, data-&gt;index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pmem_map_garbage(int id, struct vm_area_struct *vma,</div><div class='add'>+			    struct pmem_data *data, unsigned long offset,</div><div class='add'>+			    unsigned long len)</div><div class='add'>+{</div><div class='add'>+	int i, garbage_pages = len &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	vma-&gt;vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP | VM_SHARED | VM_WRITE;</div><div class='add'>+	for (i = 0; i &lt; garbage_pages; i++) {</div><div class='add'>+		if (vm_insert_pfn(vma, vma-&gt;vm_start + offset + (i * PAGE_SIZE),</div><div class='add'>+		    pmem[id].garbage_pfn))</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 int pmem_unmap_pfn_range(int id, struct vm_area_struct *vma,</div><div class='add'>+				struct pmem_data *data, unsigned long offset,</div><div class='add'>+				unsigned long len)</div><div class='add'>+{</div><div class='add'>+	int garbage_pages;</div><div class='add'>+	DLOG("unmap offset %lx len %lx\n", offset, len);</div><div class='add'>+</div><div class='add'>+	BUG_ON(!PMEM_IS_PAGE_ALIGNED(len));</div><div class='add'>+</div><div class='add'>+	garbage_pages = len &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	zap_page_range(vma, vma-&gt;vm_start + offset, len, NULL);</div><div class='add'>+	pmem_map_garbage(id, vma, data, offset, len);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pmem_map_pfn_range(int id, struct vm_area_struct *vma,</div><div class='add'>+			      struct pmem_data *data, unsigned long offset,</div><div class='add'>+			      unsigned long len)</div><div class='add'>+{</div><div class='add'>+	DLOG("map offset %lx len %lx\n", offset, len);</div><div class='add'>+	BUG_ON(!PMEM_IS_PAGE_ALIGNED(vma-&gt;vm_start));</div><div class='add'>+	BUG_ON(!PMEM_IS_PAGE_ALIGNED(vma-&gt;vm_end));</div><div class='add'>+	BUG_ON(!PMEM_IS_PAGE_ALIGNED(len));</div><div class='add'>+	BUG_ON(!PMEM_IS_PAGE_ALIGNED(offset));</div><div class='add'>+</div><div class='add'>+	if (io_remap_pfn_range(vma, vma-&gt;vm_start + offset,</div><div class='add'>+		(pmem_start_addr(id, data) + offset) &gt;&gt; PAGE_SHIFT,</div><div class='add'>+		len, vma-&gt;vm_page_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 int pmem_remap_pfn_range(int id, struct vm_area_struct *vma,</div><div class='add'>+			      struct pmem_data *data, unsigned long offset,</div><div class='add'>+			      unsigned long len)</div><div class='add'>+{</div><div class='add'>+	/* hold the mm semp for the vma you are modifying when you call this */</div><div class='add'>+	BUG_ON(!vma);</div><div class='add'>+	zap_page_range(vma, vma-&gt;vm_start + offset, len, NULL);</div><div class='add'>+	return pmem_map_pfn_range(id, vma, data, offset, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pmem_vma_open(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	struct file *file = vma-&gt;vm_file;</div><div class='add'>+	struct pmem_data *data = file-&gt;private_data;</div><div class='add'>+	int id = get_id(file);</div><div class='add'>+	/* this should never be called as we don't support copying pmem</div><div class='add'>+	 * ranges via fork */</div><div class='add'>+	BUG_ON(!has_allocation(file));</div><div class='add'>+	down_write(&amp;data-&gt;sem);</div><div class='add'>+	/* remap the garbage pages, forkers don't get access to the data */</div><div class='add'>+	pmem_unmap_pfn_range(id, vma, data, 0, vma-&gt;vm_start - vma-&gt;vm_end);</div><div class='add'>+	up_write(&amp;data-&gt;sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pmem_vma_close(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	struct file *file = vma-&gt;vm_file;</div><div class='add'>+	struct pmem_data *data = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	DLOG("current %u ppid %u file %p count %d\n", current-&gt;pid,</div><div class='add'>+	     current-&gt;parent-&gt;pid, file, file_count(file));</div><div class='add'>+	if (unlikely(!is_pmem_file(file) || !has_allocation(file))) {</div><div class='add'>+		printk(KERN_WARNING "pmem: something is very wrong, you are "</div><div class='add'>+		       "closing a vm backing an allocation that doesn't "</div><div class='add'>+		       "exist!\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	down_write(&amp;data-&gt;sem);</div><div class='add'>+	if (data-&gt;vma == vma) {</div><div class='add'>+		data-&gt;vma = NULL;</div><div class='add'>+		if ((data-&gt;flags &amp; PMEM_FLAGS_CONNECTED) &amp;&amp;</div><div class='add'>+		    (data-&gt;flags &amp; PMEM_FLAGS_SUBMAP))</div><div class='add'>+			data-&gt;flags |= PMEM_FLAGS_UNSUBMAP;</div><div class='add'>+	}</div><div class='add'>+	/* the kernel is going to free this vma now anyway */</div><div class='add'>+	up_write(&amp;data-&gt;sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct vm_operations_struct vm_ops = {</div><div class='add'>+	.open = pmem_vma_open,</div><div class='add'>+	.close = pmem_vma_close,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pmem_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	struct pmem_data *data;</div><div class='add'>+	int index;</div><div class='add'>+	unsigned long vma_size =  vma-&gt;vm_end - vma-&gt;vm_start;</div><div class='add'>+	int ret = 0, id = get_id(file);</div><div class='add'>+</div><div class='add'>+	if (vma-&gt;vm_pgoff || !PMEM_IS_PAGE_ALIGNED(vma_size)) {</div><div class='add'>+#if PMEM_DEBUG</div><div class='add'>+		printk(KERN_ERR "pmem: mmaps must be at offset zero, aligned"</div><div class='add'>+				" and a multiple of pages_size.\n");</div><div class='add'>+#endif</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data = (struct pmem_data *)file-&gt;private_data;</div><div class='add'>+	down_write(&amp;data-&gt;sem);</div><div class='add'>+	/* check this file isn't already mmaped, for submaps check this file</div><div class='add'>+	 * has never been mmaped */</div><div class='add'>+	if ((data-&gt;flags &amp; PMEM_FLAGS_SUBMAP) ||</div><div class='add'>+	    (data-&gt;flags &amp; PMEM_FLAGS_UNSUBMAP)) {</div><div class='add'>+#if PMEM_DEBUG</div><div class='add'>+		printk(KERN_ERR "pmem: you can only mmap a pmem file once, "</div><div class='add'>+		       "this file is already mmaped. %x\n", data-&gt;flags);</div><div class='add'>+#endif</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	/* if file-&gt;private_data == unalloced, alloc*/</div><div class='add'>+	if (data &amp;&amp; data-&gt;index == -1) {</div><div class='add'>+		down_write(&amp;pmem[id].bitmap_sem);</div><div class='add'>+		index = pmem_allocate(id, vma-&gt;vm_end - vma-&gt;vm_start);</div><div class='add'>+		up_write(&amp;pmem[id].bitmap_sem);</div><div class='add'>+		data-&gt;index = index;</div><div class='add'>+	}</div><div class='add'>+	/* either no space was available or an error occured */</div><div class='add'>+	if (!has_allocation(file)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		printk("pmem: could not find allocation for map.\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pmem_len(id, data) &lt; vma_size) {</div><div class='add'>+#if PMEM_DEBUG</div><div class='add'>+		printk(KERN_WARNING "pmem: mmap size [%lu] does not match"</div><div class='add'>+		       "size of backing region [%lu].\n", vma_size,</div><div class='add'>+		       pmem_len(id, data));</div><div class='add'>+#endif</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vma-&gt;vm_pgoff = pmem_start_addr(id, data) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	vma-&gt;vm_page_prot = pmem_access_prot(file, vma-&gt;vm_page_prot);</div><div class='add'>+</div><div class='add'>+	if (data-&gt;flags &amp; PMEM_FLAGS_CONNECTED) {</div><div class='add'>+		struct pmem_region_node *region_node;</div><div class='add'>+		struct list_head *elt;</div><div class='add'>+		if (pmem_map_garbage(id, vma, data, 0, vma_size)) {</div><div class='add'>+			printk("pmem: mmap failed in kernel!\n");</div><div class='add'>+			ret = -EAGAIN;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+		list_for_each(elt, &amp;data-&gt;region_list) {</div><div class='add'>+			region_node = list_entry(elt, struct pmem_region_node,</div><div class='add'>+						 list);</div><div class='add'>+			DLOG("remapping file: %p %lx %lx\n", file,</div><div class='add'>+				region_node-&gt;region.offset,</div><div class='add'>+				region_node-&gt;region.len);</div><div class='add'>+			if (pmem_remap_pfn_range(id, vma, data,</div><div class='add'>+						 region_node-&gt;region.offset,</div><div class='add'>+						 region_node-&gt;region.len)) {</div><div class='add'>+				ret = -EAGAIN;</div><div class='add'>+				goto error;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		data-&gt;flags |= PMEM_FLAGS_SUBMAP;</div><div class='add'>+		get_task_struct(current-&gt;group_leader);</div><div class='add'>+		data-&gt;task = current-&gt;group_leader;</div><div class='add'>+		data-&gt;vma = vma;</div><div class='add'>+#if PMEM_DEBUG</div><div class='add'>+		data-&gt;pid = current-&gt;pid;</div><div class='add'>+#endif</div><div class='add'>+		DLOG("submmapped file %p vma %p pid %u\n", file, vma,</div><div class='add'>+		     current-&gt;pid);</div><div class='add'>+	} else {</div><div class='add'>+		if (pmem_map_pfn_range(id, vma, data, 0, vma_size)) {</div><div class='add'>+			printk(KERN_INFO "pmem: mmap failed in kernel!\n");</div><div class='add'>+			ret = -EAGAIN;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+		data-&gt;flags |= PMEM_FLAGS_MASTERMAP;</div><div class='add'>+		data-&gt;pid = current-&gt;pid;</div><div class='add'>+	}</div><div class='add'>+	vma-&gt;vm_ops = &amp;vm_ops;</div><div class='add'>+error:</div><div class='add'>+	up_write(&amp;data-&gt;sem);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* the following are the api for accessing pmem regions by other drivers</div><div class='add'>+ * from inside the kernel */</div><div class='add'>+int get_pmem_user_addr(struct file *file, unsigned long *start,</div><div class='add'>+		   unsigned long *len)</div><div class='add'>+{</div><div class='add'>+	struct pmem_data *data;</div><div class='add'>+	if (!is_pmem_file(file) || !has_allocation(file)) {</div><div class='add'>+#if PMEM_DEBUG</div><div class='add'>+		printk(KERN_INFO "pmem: requested pmem data from invalid"</div><div class='add'>+				  "file.\n");</div><div class='add'>+#endif</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	data = (struct pmem_data *)file-&gt;private_data;</div><div class='add'>+	down_read(&amp;data-&gt;sem);</div><div class='add'>+	if (data-&gt;vma) {</div><div class='add'>+		*start = data-&gt;vma-&gt;vm_start;</div><div class='add'>+		*len = data-&gt;vma-&gt;vm_end - data-&gt;vma-&gt;vm_start;</div><div class='add'>+	} else {</div><div class='add'>+		*start = 0;</div><div class='add'>+		*len = 0;</div><div class='add'>+	}</div><div class='add'>+	up_read(&amp;data-&gt;sem);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int get_pmem_addr(struct file *file, unsigned long *start,</div><div class='add'>+		  unsigned long *vstart, unsigned long *len)</div><div class='add'>+{</div><div class='add'>+	struct pmem_data *data;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	if (!is_pmem_file(file) || !has_allocation(file)) {</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data = (struct pmem_data *)file-&gt;private_data;</div><div class='add'>+	if (data-&gt;index == -1) {</div><div class='add'>+#if PMEM_DEBUG</div><div class='add'>+		printk(KERN_INFO "pmem: requested pmem data from file with no "</div><div class='add'>+		       "allocation.\n");</div><div class='add'>+		return -1;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+	id = get_id(file);</div><div class='add'>+</div><div class='add'>+	down_read(&amp;data-&gt;sem);</div><div class='add'>+	*start = pmem_start_addr(id, data);</div><div class='add'>+	*len = pmem_len(id, data);</div><div class='add'>+	*vstart = (unsigned long)pmem_start_vaddr(id, data);</div><div class='add'>+	up_read(&amp;data-&gt;sem);</div><div class='add'>+#if PMEM_DEBUG</div><div class='add'>+	down_write(&amp;data-&gt;sem);</div><div class='add'>+	data-&gt;ref++;</div><div class='add'>+	up_write(&amp;data-&gt;sem);</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int get_pmem_file(int fd, unsigned long *start, unsigned long *vstart,</div><div class='add'>+		  unsigned long *len, struct file **filp)</div><div class='add'>+{</div><div class='add'>+	struct file *file;</div><div class='add'>+</div><div class='add'>+	file = fget(fd);</div><div class='add'>+	if (unlikely(file == NULL)) {</div><div class='add'>+		printk(KERN_INFO "pmem: requested data from file descriptor "</div><div class='add'>+		       "that doesn't exist.");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (get_pmem_addr(file, start, vstart, len))</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	if (filp)</div><div class='add'>+		*filp = file;</div><div class='add'>+	return 0;</div><div class='add'>+end:</div><div class='add'>+	fput(file);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void put_pmem_file(struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct pmem_data *data;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	if (!is_pmem_file(file))</div><div class='add'>+		return;</div><div class='add'>+	id = get_id(file);</div><div class='add'>+	data = (struct pmem_data *)file-&gt;private_data;</div><div class='add'>+#if PMEM_DEBUG</div><div class='add'>+	down_write(&amp;data-&gt;sem);</div><div class='add'>+	if (data-&gt;ref == 0) {</div><div class='add'>+		printk("pmem: pmem_put &gt; pmem_get %s (pid %d)\n",</div><div class='add'>+		       pmem[id].dev.name, data-&gt;pid);</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+	data-&gt;ref--;</div><div class='add'>+	up_write(&amp;data-&gt;sem);</div><div class='add'>+#endif</div><div class='add'>+	fput(file);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void flush_pmem_file(struct file *file, unsigned long offset, unsigned long len)</div><div class='add'>+{</div><div class='add'>+	struct pmem_data *data;</div><div class='add'>+	int id;</div><div class='add'>+	void *vaddr;</div><div class='add'>+	struct pmem_region_node *region_node;</div><div class='add'>+	struct list_head *elt;</div><div class='add'>+	void *flush_start, *flush_end;</div><div class='add'>+</div><div class='add'>+	if (!is_pmem_file(file) || !has_allocation(file)) {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	id = get_id(file);</div><div class='add'>+	data = (struct pmem_data *)file-&gt;private_data;</div><div class='add'>+	if (!pmem[id].cached || file-&gt;f_flags &amp; O_SYNC)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;data-&gt;sem);</div><div class='add'>+	vaddr = pmem_start_vaddr(id, data);</div><div class='add'>+	/* if this isn't a submmapped file, flush the whole thing */</div><div class='add'>+	if (unlikely(!(data-&gt;flags &amp; PMEM_FLAGS_CONNECTED))) {</div><div class='add'>+		dmac_flush_range(vaddr, vaddr + pmem_len(id, data));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+	/* otherwise, flush the region of the file we are drawing */</div><div class='add'>+	list_for_each(elt, &amp;data-&gt;region_list) {</div><div class='add'>+		region_node = list_entry(elt, struct pmem_region_node, list);</div><div class='add'>+		if ((offset &gt;= region_node-&gt;region.offset) &amp;&amp;</div><div class='add'>+		    ((offset + len) &lt;= (region_node-&gt;region.offset +</div><div class='add'>+			region_node-&gt;region.len))) {</div><div class='add'>+			flush_start = vaddr + region_node-&gt;region.offset;</div><div class='add'>+			flush_end = flush_start + region_node-&gt;region.len;</div><div class='add'>+			dmac_flush_range(flush_start, flush_end);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+end:</div><div class='add'>+	up_read(&amp;data-&gt;sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pmem_connect(unsigned long connect, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct pmem_data *data = (struct pmem_data *)file-&gt;private_data;</div><div class='add'>+	struct pmem_data *src_data;</div><div class='add'>+	struct file *src_file;</div><div class='add'>+	int ret = 0, put_needed;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;data-&gt;sem);</div><div class='add'>+	/* retrieve the src file and check it is a pmem file with an alloc */</div><div class='add'>+	src_file = fget_light(connect, &amp;put_needed);</div><div class='add'>+	DLOG("connect %p to %p\n", file, src_file);</div><div class='add'>+	if (!src_file) {</div><div class='add'>+		printk("pmem: src file not found!\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_no_file;</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(!is_pmem_file(src_file) || !has_allocation(src_file))) {</div><div class='add'>+		printk(KERN_INFO "pmem: src file is not a pmem file or has no "</div><div class='add'>+		       "alloc!\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_bad_file;</div><div class='add'>+	}</div><div class='add'>+	src_data = (struct pmem_data *)src_file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (has_allocation(file) &amp;&amp; (data-&gt;index != src_data-&gt;index)) {</div><div class='add'>+		printk("pmem: file is already mapped but doesn't match this"</div><div class='add'>+		       " src_file!\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_bad_file;</div><div class='add'>+	}</div><div class='add'>+	data-&gt;index = src_data-&gt;index;</div><div class='add'>+	data-&gt;flags |= PMEM_FLAGS_CONNECTED;</div><div class='add'>+	data-&gt;master_fd = connect;</div><div class='add'>+	data-&gt;master_file = src_file;</div><div class='add'>+</div><div class='add'>+err_bad_file:</div><div class='add'>+	fput_light(src_file, put_needed);</div><div class='add'>+err_no_file:</div><div class='add'>+	up_write(&amp;data-&gt;sem);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pmem_unlock_data_and_mm(struct pmem_data *data,</div><div class='add'>+				    struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	up_write(&amp;data-&gt;sem);</div><div class='add'>+	if (mm != NULL) {</div><div class='add'>+		up_write(&amp;mm-&gt;mmap_sem);</div><div class='add'>+		mmput(mm);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pmem_lock_data_and_mm(struct file *file, struct pmem_data *data,</div><div class='add'>+				 struct mm_struct **locked_mm)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct mm_struct *mm = NULL;</div><div class='add'>+	*locked_mm = NULL;</div><div class='add'>+lock_mm:</div><div class='add'>+	down_read(&amp;data-&gt;sem);</div><div class='add'>+	if (PMEM_IS_SUBMAP(data)) {</div><div class='add'>+		mm = get_task_mm(data-&gt;task);</div><div class='add'>+		if (!mm) {</div><div class='add'>+#if PMEM_DEBUG</div><div class='add'>+			printk("pmem: can't remap task is gone!\n");</div><div class='add'>+#endif</div><div class='add'>+			up_read(&amp;data-&gt;sem);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	up_read(&amp;data-&gt;sem);</div><div class='add'>+</div><div class='add'>+	if (mm)</div><div class='add'>+		down_write(&amp;mm-&gt;mmap_sem);</div><div class='add'>+</div><div class='add'>+	down_write(&amp;data-&gt;sem);</div><div class='add'>+	/* check that the file didn't get mmaped before we could take the</div><div class='add'>+	 * data sem, this should be safe b/c you can only submap each file</div><div class='add'>+	 * once */</div><div class='add'>+	if (PMEM_IS_SUBMAP(data) &amp;&amp; !mm) {</div><div class='add'>+		pmem_unlock_data_and_mm(data, mm);</div><div class='add'>+		up_write(&amp;data-&gt;sem);</div><div class='add'>+		goto lock_mm;</div><div class='add'>+	}</div><div class='add'>+	/* now check that vma.mm is still there, it could have been</div><div class='add'>+	 * deleted by vma_close before we could get the data-&gt;sem */</div><div class='add'>+	if ((data-&gt;flags &amp; PMEM_FLAGS_UNSUBMAP) &amp;&amp; (mm != NULL)) {</div><div class='add'>+		/* might as well release this */</div><div class='add'>+		if (data-&gt;flags &amp; PMEM_FLAGS_SUBMAP) {</div><div class='add'>+			put_task_struct(data-&gt;task);</div><div class='add'>+			data-&gt;task = NULL;</div><div class='add'>+			/* lower the submap flag to show the mm is gone */</div><div class='add'>+			data-&gt;flags &amp;= ~(PMEM_FLAGS_SUBMAP);</div><div class='add'>+		}</div><div class='add'>+		pmem_unlock_data_and_mm(data, mm);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	*locked_mm = mm;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pmem_remap(struct pmem_region *region, struct file *file,</div><div class='add'>+		      unsigned operation)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct pmem_region_node *region_node;</div><div class='add'>+	struct mm_struct *mm = NULL;</div><div class='add'>+	struct list_head *elt, *elt2;</div><div class='add'>+	int id = get_id(file);</div><div class='add'>+	struct pmem_data *data = (struct pmem_data *)file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	/* pmem region must be aligned on a page boundry */</div><div class='add'>+	if (unlikely(!PMEM_IS_PAGE_ALIGNED(region-&gt;offset) ||</div><div class='add'>+		 !PMEM_IS_PAGE_ALIGNED(region-&gt;len))) {</div><div class='add'>+#if PMEM_DEBUG</div><div class='add'>+		printk("pmem: request for unaligned pmem suballocation "</div><div class='add'>+		       "%lx %lx\n", region-&gt;offset, region-&gt;len);</div><div class='add'>+#endif</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if userspace requests a region of len 0, there's nothing to do */</div><div class='add'>+	if (region-&gt;len == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* lock the mm and data */</div><div class='add'>+	ret = pmem_lock_data_and_mm(file, data, &amp;mm);</div><div class='add'>+	if (ret)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* only the owner of the master file can remap the client fds</div><div class='add'>+	 * that back in it */</div><div class='add'>+	if (!is_master_owner(file)) {</div><div class='add'>+#if PMEM_DEBUG</div><div class='add'>+		printk("pmem: remap requested from non-master process\n");</div><div class='add'>+#endif</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check that the requested range is within the src allocation */</div><div class='add'>+	if (unlikely((region-&gt;offset &gt; pmem_len(id, data)) ||</div><div class='add'>+		     (region-&gt;len &gt; pmem_len(id, data)) ||</div><div class='add'>+		     (region-&gt;offset + region-&gt;len &gt; pmem_len(id, data)))) {</div><div class='add'>+#if PMEM_DEBUG</div><div class='add'>+		printk(KERN_INFO "pmem: suballoc doesn't fit in src_file!\n");</div><div class='add'>+#endif</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (operation == PMEM_MAP) {</div><div class='add'>+		region_node = kmalloc(sizeof(struct pmem_region_node),</div><div class='add'>+			      GFP_KERNEL);</div><div class='add'>+		if (!region_node) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+#if PMEM_DEBUG</div><div class='add'>+			printk(KERN_INFO "No space to allocate metadata!");</div><div class='add'>+#endif</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		region_node-&gt;region = *region;</div><div class='add'>+		list_add(&amp;region_node-&gt;list, &amp;data-&gt;region_list);</div><div class='add'>+	} else if (operation == PMEM_UNMAP) {</div><div class='add'>+		int found = 0;</div><div class='add'>+		list_for_each_safe(elt, elt2, &amp;data-&gt;region_list) {</div><div class='add'>+			region_node = list_entry(elt, struct pmem_region_node,</div><div class='add'>+				      list);</div><div class='add'>+			if (region-&gt;len == 0 ||</div><div class='add'>+			    (region_node-&gt;region.offset == region-&gt;offset &amp;&amp;</div><div class='add'>+			    region_node-&gt;region.len == region-&gt;len)) {</div><div class='add'>+				list_del(elt);</div><div class='add'>+				kfree(region_node);</div><div class='add'>+				found = 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (!found) {</div><div class='add'>+#if PMEM_DEBUG</div><div class='add'>+			printk("pmem: Unmap region does not map any mapped "</div><div class='add'>+				"region!");</div><div class='add'>+#endif</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;vma &amp;&amp; PMEM_IS_SUBMAP(data)) {</div><div class='add'>+		if (operation == PMEM_MAP)</div><div class='add'>+			ret = pmem_remap_pfn_range(id, data-&gt;vma, data,</div><div class='add'>+						   region-&gt;offset, region-&gt;len);</div><div class='add'>+		else if (operation == PMEM_UNMAP)</div><div class='add'>+			ret = pmem_unmap_pfn_range(id, data-&gt;vma, data,</div><div class='add'>+						   region-&gt;offset, region-&gt;len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	pmem_unlock_data_and_mm(data, mm);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pmem_revoke(struct file *file, struct pmem_data *data)</div><div class='add'>+{</div><div class='add'>+	struct pmem_region_node *region_node;</div><div class='add'>+	struct list_head *elt, *elt2;</div><div class='add'>+	struct mm_struct *mm = NULL;</div><div class='add'>+	int id = get_id(file);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	data-&gt;master_file = NULL;</div><div class='add'>+	ret = pmem_lock_data_and_mm(file, data, &amp;mm);</div><div class='add'>+	/* if lock_data_and_mm fails either the task that mapped the fd, or</div><div class='add'>+	 * the vma that mapped it have already gone away, nothing more</div><div class='add'>+	 * needs to be done */</div><div class='add'>+	if (ret)</div><div class='add'>+		return;</div><div class='add'>+	/* unmap everything */</div><div class='add'>+	/* delete the regions and region list nothing is mapped any more */</div><div class='add'>+	if (data-&gt;vma)</div><div class='add'>+		list_for_each_safe(elt, elt2, &amp;data-&gt;region_list) {</div><div class='add'>+			region_node = list_entry(elt, struct pmem_region_node,</div><div class='add'>+						 list);</div><div class='add'>+			pmem_unmap_pfn_range(id, data-&gt;vma, data,</div><div class='add'>+					     region_node-&gt;region.offset,</div><div class='add'>+					     region_node-&gt;region.len);</div><div class='add'>+			list_del(elt);</div><div class='add'>+			kfree(region_node);</div><div class='add'>+	}</div><div class='add'>+	/* delete the master file */</div><div class='add'>+	pmem_unlock_data_and_mm(data, mm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pmem_get_size(struct pmem_region *region, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct pmem_data *data = (struct pmem_data *)file-&gt;private_data;</div><div class='add'>+	int id = get_id(file);</div><div class='add'>+</div><div class='add'>+	if (!has_allocation(file)) {</div><div class='add'>+		region-&gt;offset = 0;</div><div class='add'>+		region-&gt;len = 0;</div><div class='add'>+		return;</div><div class='add'>+	} else {</div><div class='add'>+		region-&gt;offset = pmem_start_addr(id, data);</div><div class='add'>+		region-&gt;len = pmem_len(id, data);</div><div class='add'>+	}</div><div class='add'>+	DLOG("offset %lx len %lx\n", region-&gt;offset, region-&gt;len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static long pmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct pmem_data *data;</div><div class='add'>+	int id = get_id(file);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case PMEM_GET_PHYS:</div><div class='add'>+		{</div><div class='add'>+			struct pmem_region region;</div><div class='add'>+			DLOG("get_phys\n");</div><div class='add'>+			if (!has_allocation(file)) {</div><div class='add'>+				region.offset = 0;</div><div class='add'>+				region.len = 0;</div><div class='add'>+			} else {</div><div class='add'>+				data = (struct pmem_data *)file-&gt;private_data;</div><div class='add'>+				region.offset = pmem_start_addr(id, data);</div><div class='add'>+				region.len = pmem_len(id, data);</div><div class='add'>+			}</div><div class='add'>+			printk(KERN_INFO "pmem: request for physical address of pmem region "</div><div class='add'>+					"from process %d.\n", current-&gt;pid);</div><div class='add'>+			if (copy_to_user((void __user *)arg, &amp;region,</div><div class='add'>+						sizeof(struct pmem_region)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	case PMEM_MAP:</div><div class='add'>+		{</div><div class='add'>+			struct pmem_region region;</div><div class='add'>+			if (copy_from_user(&amp;region, (void __user *)arg,</div><div class='add'>+						sizeof(struct pmem_region)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			data = (struct pmem_data *)file-&gt;private_data;</div><div class='add'>+			return pmem_remap(&amp;region, file, PMEM_MAP);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case PMEM_UNMAP:</div><div class='add'>+		{</div><div class='add'>+			struct pmem_region region;</div><div class='add'>+			if (copy_from_user(&amp;region, (void __user *)arg,</div><div class='add'>+						sizeof(struct pmem_region)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			data = (struct pmem_data *)file-&gt;private_data;</div><div class='add'>+			return pmem_remap(&amp;region, file, PMEM_UNMAP);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	case PMEM_GET_SIZE:</div><div class='add'>+		{</div><div class='add'>+			struct pmem_region region;</div><div class='add'>+			DLOG("get_size\n");</div><div class='add'>+			pmem_get_size(&amp;region, file);</div><div class='add'>+			if (copy_to_user((void __user *)arg, &amp;region,</div><div class='add'>+						sizeof(struct pmem_region)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	case PMEM_GET_TOTAL_SIZE:</div><div class='add'>+		{</div><div class='add'>+			struct pmem_region region;</div><div class='add'>+			DLOG("get total size\n");</div><div class='add'>+			region.offset = 0;</div><div class='add'>+			get_id(file);</div><div class='add'>+			region.len = pmem[id].size;</div><div class='add'>+			if (copy_to_user((void __user *)arg, &amp;region,</div><div class='add'>+						sizeof(struct pmem_region)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	case PMEM_ALLOCATE:</div><div class='add'>+		{</div><div class='add'>+			if (has_allocation(file))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			data = (struct pmem_data *)file-&gt;private_data;</div><div class='add'>+			data-&gt;index = pmem_allocate(id, arg);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	case PMEM_CONNECT:</div><div class='add'>+		DLOG("connect\n");</div><div class='add'>+		return pmem_connect(arg, file);</div><div class='add'>+		break;</div><div class='add'>+	case PMEM_CACHE_FLUSH:</div><div class='add'>+		{</div><div class='add'>+			struct pmem_region region;</div><div class='add'>+			DLOG("flush\n");</div><div class='add'>+			if (copy_from_user(&amp;region, (void __user *)arg,</div><div class='add'>+					   sizeof(struct pmem_region)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			flush_pmem_file(file, region.offset, region.len);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	default:</div><div class='add'>+		if (pmem[id].ioctl)</div><div class='add'>+			return pmem[id].ioctl(file, cmd, arg);</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'>+#if PMEM_DEBUG</div><div class='add'>+static ssize_t debug_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	file-&gt;private_data = inode-&gt;i_private;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t debug_read(struct file *file, char __user *buf, size_t count,</div><div class='add'>+			  loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct list_head *elt, *elt2;</div><div class='add'>+	struct pmem_data *data;</div><div class='add'>+	struct pmem_region_node *region_node;</div><div class='add'>+	int id = (int)file-&gt;private_data;</div><div class='add'>+	const int debug_bufmax = 4096;</div><div class='add'>+	static char buffer[4096];</div><div class='add'>+	int n = 0;</div><div class='add'>+</div><div class='add'>+	DLOG("debug open\n");</div><div class='add'>+	n = scnprintf(buffer, debug_bufmax,</div><div class='add'>+		      "pid #: mapped regions (offset, len) (offset,len)...\n");</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pmem[id].data_list_lock);</div><div class='add'>+	list_for_each(elt, &amp;pmem[id].data_list) {</div><div class='add'>+		data = list_entry(elt, struct pmem_data, list);</div><div class='add'>+		down_read(&amp;data-&gt;sem);</div><div class='add'>+		n += scnprintf(buffer + n, debug_bufmax - n, "pid %u:",</div><div class='add'>+				data-&gt;pid);</div><div class='add'>+		list_for_each(elt2, &amp;data-&gt;region_list) {</div><div class='add'>+			region_node = list_entry(elt2, struct pmem_region_node,</div><div class='add'>+				      list);</div><div class='add'>+			n += scnprintf(buffer + n, debug_bufmax - n,</div><div class='add'>+					"(%lx,%lx) ",</div><div class='add'>+					region_node-&gt;region.offset,</div><div class='add'>+					region_node-&gt;region.len);</div><div class='add'>+		}</div><div class='add'>+		n += scnprintf(buffer + n, debug_bufmax - n, "\n");</div><div class='add'>+		up_read(&amp;data-&gt;sem);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;pmem[id].data_list_lock);</div><div class='add'>+</div><div class='add'>+	n++;</div><div class='add'>+	buffer[n] = 0;</div><div class='add'>+	return simple_read_from_buffer(buf, count, ppos, buffer, n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_operations debug_fops = {</div><div class='add'>+	.read = debug_read,</div><div class='add'>+	.open = debug_open,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+static struct miscdevice pmem_dev = {</div><div class='add'>+	.name = "pmem",</div><div class='add'>+	.fops = &amp;pmem_fops,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int pmem_setup(struct android_pmem_platform_data *pdata,</div><div class='add'>+	       long (*ioctl)(struct file *, unsigned int, unsigned long),</div><div class='add'>+	       int (*release)(struct inode *, struct file *))</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	int i, index = 0;</div><div class='add'>+	int id = id_count;</div><div class='add'>+	id_count++;</div><div class='add'>+</div><div class='add'>+	pmem[id].no_allocator = pdata-&gt;no_allocator;</div><div class='add'>+	pmem[id].cached = pdata-&gt;cached;</div><div class='add'>+	pmem[id].buffered = pdata-&gt;buffered;</div><div class='add'>+	pmem[id].base = pdata-&gt;start;</div><div class='add'>+	pmem[id].size = pdata-&gt;size;</div><div class='add'>+	pmem[id].ioctl = ioctl;</div><div class='add'>+	pmem[id].release = release;</div><div class='add'>+	init_rwsem(&amp;pmem[id].bitmap_sem);</div><div class='add'>+	mutex_init(&amp;pmem[id].data_list_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;pmem[id].data_list);</div><div class='add'>+	pmem[id].dev.name = pdata-&gt;name;</div><div class='add'>+	pmem[id].dev.minor = id;</div><div class='add'>+	pmem[id].dev.fops = &amp;pmem_fops;</div><div class='add'>+	printk(KERN_INFO "%s: %d init\n", pdata-&gt;name, pdata-&gt;cached);</div><div class='add'>+</div><div class='add'>+	err = misc_register(&amp;pmem[id].dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ALERT "Unable to register pmem driver!\n");</div><div class='add'>+		goto err_cant_register_device;</div><div class='add'>+	}</div><div class='add'>+	pmem[id].num_entries = pmem[id].size / PMEM_MIN_ALLOC;</div><div class='add'>+</div><div class='add'>+	pmem[id].bitmap = kmalloc(pmem[id].num_entries *</div><div class='add'>+				  sizeof(struct pmem_bits), GFP_KERNEL);</div><div class='add'>+	if (!pmem[id].bitmap)</div><div class='add'>+		goto err_no_mem_for_metadata;</div><div class='add'>+</div><div class='add'>+	memset(pmem[id].bitmap, 0, sizeof(struct pmem_bits) *</div><div class='add'>+					  pmem[id].num_entries);</div><div class='add'>+</div><div class='add'>+	for (i = sizeof(pmem[id].num_entries) * 8 - 1; i &gt;= 0; i--) {</div><div class='add'>+		if ((pmem[id].num_entries) &amp;  1&lt;&lt;i) {</div><div class='add'>+			PMEM_ORDER(id, index) = i;</div><div class='add'>+			index = PMEM_NEXT_INDEX(id, index);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pmem[id].cached)</div><div class='add'>+		pmem[id].vbase = ioremap_cached(pmem[id].base,</div><div class='add'>+						pmem[id].size);</div><div class='add'>+#ifdef ioremap_ext_buffered</div><div class='add'>+	else if (pmem[id].buffered)</div><div class='add'>+		pmem[id].vbase = ioremap_ext_buffered(pmem[id].base,</div><div class='add'>+						      pmem[id].size);</div><div class='add'>+#endif</div><div class='add'>+	else</div><div class='add'>+		pmem[id].vbase = ioremap(pmem[id].base, pmem[id].size);</div><div class='add'>+</div><div class='add'>+	if (pmem[id].vbase == 0)</div><div class='add'>+		goto error_cant_remap;</div><div class='add'>+</div><div class='add'>+	pmem[id].garbage_pfn = page_to_pfn(alloc_page(GFP_KERNEL));</div><div class='add'>+	if (pmem[id].no_allocator)</div><div class='add'>+		pmem[id].allocated = 0;</div><div class='add'>+</div><div class='add'>+#if PMEM_DEBUG</div><div class='add'>+	debugfs_create_file(pdata-&gt;name, S_IFREG | S_IRUGO, NULL, (void *)id,</div><div class='add'>+			    &amp;debug_fops);</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+error_cant_remap:</div><div class='add'>+	kfree(pmem[id].bitmap);</div><div class='add'>+err_no_mem_for_metadata:</div><div class='add'>+	misc_deregister(&amp;pmem[id].dev);</div><div class='add'>+err_cant_register_device:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pmem_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct android_pmem_platform_data *pdata;</div><div class='add'>+</div><div class='add'>+	if (!pdev || !pdev-&gt;dev.platform_data) {</div><div class='add'>+		printk(KERN_ALERT "Unable to probe pmem!\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	return pmem_setup(pdata, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pmem_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int id = pdev-&gt;id;</div><div class='add'>+	__free_page(pfn_to_page(pmem[id].garbage_pfn));</div><div class='add'>+	misc_deregister(&amp;pmem[id].dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver pmem_driver = {</div><div class='add'>+	.probe = pmem_probe,</div><div class='add'>+	.remove = pmem_remove,</div><div class='add'>+	.driver = { .name = "android_pmem" }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __init pmem_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;pmem_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit pmem_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;pmem_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(pmem_init);</div><div class='add'>+module_exit(pmem_exit);</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/android/ram_console.c b/drivers/staging/android/ram_console.c<br/>new file mode 100644<br/>index 000000000000..6d4d67924f22<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/ram_console.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/ram_console.c</a></div><div class='hunk'>@@ -0,0 +1,443 @@</div><div class='add'>+/* drivers/android/ram_console.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2007-2008 Google, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/console.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include "ram_console.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION</div><div class='add'>+#include &lt;linux/rslib.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct ram_console_buffer {</div><div class='add'>+	uint32_t    sig;</div><div class='add'>+	uint32_t    start;</div><div class='add'>+	uint32_t    size;</div><div class='add'>+	uint8_t     data[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RAM_CONSOLE_SIG (0x43474244) /* DBGC */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT</div><div class='add'>+static char __initdata</div><div class='add'>+	ram_console_old_log_init_buffer[CONFIG_ANDROID_RAM_CONSOLE_EARLY_SIZE];</div><div class='add'>+#endif</div><div class='add'>+static char *ram_console_old_log;</div><div class='add'>+static size_t ram_console_old_log_size;</div><div class='add'>+</div><div class='add'>+static struct ram_console_buffer *ram_console_buffer;</div><div class='add'>+static size_t ram_console_buffer_size;</div><div class='add'>+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION</div><div class='add'>+static char *ram_console_par_buffer;</div><div class='add'>+static struct rs_control *ram_console_rs_decoder;</div><div class='add'>+static int ram_console_corrected_bytes;</div><div class='add'>+static int ram_console_bad_blocks;</div><div class='add'>+#define ECC_BLOCK_SIZE CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_DATA_SIZE</div><div class='add'>+#define ECC_SIZE CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_ECC_SIZE</div><div class='add'>+#define ECC_SYMSIZE CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE</div><div class='add'>+#define ECC_POLY CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION</div><div class='add'>+static void ram_console_encode_rs8(uint8_t *data, size_t len, uint8_t *ecc)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	uint16_t par[ECC_SIZE];</div><div class='add'>+	/* Initialize the parity buffer */</div><div class='add'>+	memset(par, 0, sizeof(par));</div><div class='add'>+	encode_rs8(ram_console_rs_decoder, data, len, par, 0);</div><div class='add'>+	for (i = 0; i &lt; ECC_SIZE; i++)</div><div class='add'>+		ecc[i] = par[i];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ram_console_decode_rs8(void *data, size_t len, uint8_t *ecc)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	uint16_t par[ECC_SIZE];</div><div class='add'>+	for (i = 0; i &lt; ECC_SIZE; i++)</div><div class='add'>+		par[i] = ecc[i];</div><div class='add'>+	return decode_rs8(ram_console_rs_decoder, data, par, len,</div><div class='add'>+				NULL, 0, NULL, 0, NULL);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void ram_console_update(const char *s, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	struct ram_console_buffer *buffer = ram_console_buffer;</div><div class='add'>+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION</div><div class='add'>+	uint8_t *buffer_end = buffer-&gt;data + ram_console_buffer_size;</div><div class='add'>+	uint8_t *block;</div><div class='add'>+	uint8_t *par;</div><div class='add'>+	int size = ECC_BLOCK_SIZE;</div><div class='add'>+#endif</div><div class='add'>+	memcpy(buffer-&gt;data + buffer-&gt;start, s, count);</div><div class='add'>+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION</div><div class='add'>+	block = buffer-&gt;data + (buffer-&gt;start &amp; ~(ECC_BLOCK_SIZE - 1));</div><div class='add'>+	par = ram_console_par_buffer +</div><div class='add'>+	      (buffer-&gt;start / ECC_BLOCK_SIZE) * ECC_SIZE;</div><div class='add'>+	do {</div><div class='add'>+		if (block + ECC_BLOCK_SIZE &gt; buffer_end)</div><div class='add'>+			size = buffer_end - block;</div><div class='add'>+		ram_console_encode_rs8(block, size, par);</div><div class='add'>+		block += ECC_BLOCK_SIZE;</div><div class='add'>+		par += ECC_SIZE;</div><div class='add'>+	} while (block &lt; buffer-&gt;data + buffer-&gt;start + count);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ram_console_update_header(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION</div><div class='add'>+	struct ram_console_buffer *buffer = ram_console_buffer;</div><div class='add'>+	uint8_t *par;</div><div class='add'>+	par = ram_console_par_buffer +</div><div class='add'>+	      DIV_ROUND_UP(ram_console_buffer_size, ECC_BLOCK_SIZE) * ECC_SIZE;</div><div class='add'>+	ram_console_encode_rs8((uint8_t *)buffer, sizeof(*buffer), par);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ram_console_write(struct console *console, const char *s, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	int rem;</div><div class='add'>+	struct ram_console_buffer *buffer = ram_console_buffer;</div><div class='add'>+</div><div class='add'>+	if (count &gt; ram_console_buffer_size) {</div><div class='add'>+		s += count - ram_console_buffer_size;</div><div class='add'>+		count = ram_console_buffer_size;</div><div class='add'>+	}</div><div class='add'>+	rem = ram_console_buffer_size - buffer-&gt;start;</div><div class='add'>+	if (rem &lt; count) {</div><div class='add'>+		ram_console_update(s, rem);</div><div class='add'>+		s += rem;</div><div class='add'>+		count -= rem;</div><div class='add'>+		buffer-&gt;start = 0;</div><div class='add'>+		buffer-&gt;size = ram_console_buffer_size;</div><div class='add'>+	}</div><div class='add'>+	ram_console_update(s, count);</div><div class='add'>+</div><div class='add'>+	buffer-&gt;start += count;</div><div class='add'>+	if (buffer-&gt;size &lt; ram_console_buffer_size)</div><div class='add'>+		buffer-&gt;size += count;</div><div class='add'>+	ram_console_update_header();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct console ram_console = {</div><div class='add'>+	.name	= "ram",</div><div class='add'>+	.write	= ram_console_write,</div><div class='add'>+	.flags	= CON_PRINTBUFFER | CON_ENABLED,</div><div class='add'>+	.index	= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ram_console_enable_console(int enabled)</div><div class='add'>+{</div><div class='add'>+	if (enabled)</div><div class='add'>+		ram_console.flags |= CON_ENABLED;</div><div class='add'>+	else</div><div class='add'>+		ram_console.flags &amp;= ~CON_ENABLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init</div><div class='add'>+ram_console_save_old(struct ram_console_buffer *buffer, const char *bootinfo,</div><div class='add'>+	char *dest)</div><div class='add'>+{</div><div class='add'>+	size_t old_log_size = buffer-&gt;size;</div><div class='add'>+	size_t bootinfo_size = 0;</div><div class='add'>+	size_t total_size = old_log_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+	const char *bootinfo_label = "Boot info:\n";</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION</div><div class='add'>+	uint8_t *block;</div><div class='add'>+	uint8_t *par;</div><div class='add'>+	char strbuf[80];</div><div class='add'>+	int strbuf_len = 0;</div><div class='add'>+</div><div class='add'>+	block = buffer-&gt;data;</div><div class='add'>+	par = ram_console_par_buffer;</div><div class='add'>+	while (block &lt; buffer-&gt;data + buffer-&gt;size) {</div><div class='add'>+		int numerr;</div><div class='add'>+		int size = ECC_BLOCK_SIZE;</div><div class='add'>+		if (block + size &gt; buffer-&gt;data + ram_console_buffer_size)</div><div class='add'>+			size = buffer-&gt;data + ram_console_buffer_size - block;</div><div class='add'>+		numerr = ram_console_decode_rs8(block, size, par);</div><div class='add'>+		if (numerr &gt; 0) {</div><div class='add'>+#if 0</div><div class='add'>+			printk(KERN_INFO "ram_console: error in block %p, %d\n",</div><div class='add'>+			       block, numerr);</div><div class='add'>+#endif</div><div class='add'>+			ram_console_corrected_bytes += numerr;</div><div class='add'>+		} else if (numerr &lt; 0) {</div><div class='add'>+#if 0</div><div class='add'>+			printk(KERN_INFO "ram_console: uncorrectable error in "</div><div class='add'>+			       "block %p\n", block);</div><div class='add'>+#endif</div><div class='add'>+			ram_console_bad_blocks++;</div><div class='add'>+		}</div><div class='add'>+		block += ECC_BLOCK_SIZE;</div><div class='add'>+		par += ECC_SIZE;</div><div class='add'>+	}</div><div class='add'>+	if (ram_console_corrected_bytes || ram_console_bad_blocks)</div><div class='add'>+		strbuf_len = snprintf(strbuf, sizeof(strbuf),</div><div class='add'>+			"\n%d Corrected bytes, %d unrecoverable blocks\n",</div><div class='add'>+			ram_console_corrected_bytes, ram_console_bad_blocks);</div><div class='add'>+	else</div><div class='add'>+		strbuf_len = snprintf(strbuf, sizeof(strbuf),</div><div class='add'>+				      "\nNo errors detected\n");</div><div class='add'>+	if (strbuf_len &gt;= sizeof(strbuf))</div><div class='add'>+		strbuf_len = sizeof(strbuf) - 1;</div><div class='add'>+	total_size += strbuf_len;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (bootinfo)</div><div class='add'>+		bootinfo_size = strlen(bootinfo) + strlen(bootinfo_label);</div><div class='add'>+	total_size += bootinfo_size;</div><div class='add'>+</div><div class='add'>+	if (dest == NULL) {</div><div class='add'>+		dest = kmalloc(total_size, GFP_KERNEL);</div><div class='add'>+		if (dest == NULL) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "ram_console: failed to allocate buffer\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ram_console_old_log = dest;</div><div class='add'>+	ram_console_old_log_size = total_size;</div><div class='add'>+	memcpy(ram_console_old_log,</div><div class='add'>+	       &amp;buffer-&gt;data[buffer-&gt;start], buffer-&gt;size - buffer-&gt;start);</div><div class='add'>+	memcpy(ram_console_old_log + buffer-&gt;size - buffer-&gt;start,</div><div class='add'>+	       &amp;buffer-&gt;data[0], buffer-&gt;start);</div><div class='add'>+	ptr = ram_console_old_log + old_log_size;</div><div class='add'>+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION</div><div class='add'>+	memcpy(ptr, strbuf, strbuf_len);</div><div class='add'>+	ptr += strbuf_len;</div><div class='add'>+#endif</div><div class='add'>+	if (bootinfo) {</div><div class='add'>+		memcpy(ptr, bootinfo_label, strlen(bootinfo_label));</div><div class='add'>+		ptr += strlen(bootinfo_label);</div><div class='add'>+		memcpy(ptr, bootinfo, bootinfo_size);</div><div class='add'>+		ptr += bootinfo_size;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init ram_console_init(struct ram_console_buffer *buffer,</div><div class='add'>+				   size_t buffer_size, const char *bootinfo,</div><div class='add'>+				   char *old_buf)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION</div><div class='add'>+	int numerr;</div><div class='add'>+	uint8_t *par;</div><div class='add'>+#endif</div><div class='add'>+	ram_console_buffer = buffer;</div><div class='add'>+	ram_console_buffer_size =</div><div class='add'>+		buffer_size - sizeof(struct ram_console_buffer);</div><div class='add'>+</div><div class='add'>+	if (ram_console_buffer_size &gt; buffer_size) {</div><div class='add'>+		pr_err("ram_console: buffer %p, invalid size %zu, "</div><div class='add'>+		       "datasize %zu\n", buffer, buffer_size,</div><div class='add'>+		       ram_console_buffer_size);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION</div><div class='add'>+	ram_console_buffer_size -= (DIV_ROUND_UP(ram_console_buffer_size,</div><div class='add'>+						ECC_BLOCK_SIZE) + 1) * ECC_SIZE;</div><div class='add'>+</div><div class='add'>+	if (ram_console_buffer_size &gt; buffer_size) {</div><div class='add'>+		pr_err("ram_console: buffer %p, invalid size %zu, "</div><div class='add'>+		       "non-ecc datasize %zu\n",</div><div class='add'>+		       buffer, buffer_size, ram_console_buffer_size);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ram_console_par_buffer = buffer-&gt;data + ram_console_buffer_size;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* first consecutive root is 0</div><div class='add'>+	 * primitive element to generate roots = 1</div><div class='add'>+	 */</div><div class='add'>+	ram_console_rs_decoder = init_rs(ECC_SYMSIZE, ECC_POLY, 0, 1, ECC_SIZE);</div><div class='add'>+	if (ram_console_rs_decoder == NULL) {</div><div class='add'>+		printk(KERN_INFO "ram_console: init_rs failed\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ram_console_corrected_bytes = 0;</div><div class='add'>+	ram_console_bad_blocks = 0;</div><div class='add'>+</div><div class='add'>+	par = ram_console_par_buffer +</div><div class='add'>+	      DIV_ROUND_UP(ram_console_buffer_size, ECC_BLOCK_SIZE) * ECC_SIZE;</div><div class='add'>+</div><div class='add'>+	numerr = ram_console_decode_rs8(buffer, sizeof(*buffer), par);</div><div class='add'>+	if (numerr &gt; 0) {</div><div class='add'>+		printk(KERN_INFO "ram_console: error in header, %d\n", numerr);</div><div class='add'>+		ram_console_corrected_bytes += numerr;</div><div class='add'>+	} else if (numerr &lt; 0) {</div><div class='add'>+		printk(KERN_INFO</div><div class='add'>+		       "ram_console: uncorrectable error in header\n");</div><div class='add'>+		ram_console_bad_blocks++;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (buffer-&gt;sig == RAM_CONSOLE_SIG) {</div><div class='add'>+		if (buffer-&gt;size &gt; ram_console_buffer_size</div><div class='add'>+		    || buffer-&gt;start &gt; buffer-&gt;size)</div><div class='add'>+			printk(KERN_INFO "ram_console: found existing invalid "</div><div class='add'>+			       "buffer, size %d, start %d\n",</div><div class='add'>+			       buffer-&gt;size, buffer-&gt;start);</div><div class='add'>+		else {</div><div class='add'>+			printk(KERN_INFO "ram_console: found existing buffer, "</div><div class='add'>+			       "size %d, start %d\n",</div><div class='add'>+			       buffer-&gt;size, buffer-&gt;start);</div><div class='add'>+			ram_console_save_old(buffer, bootinfo, old_buf);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_INFO "ram_console: no valid data in buffer "</div><div class='add'>+		       "(sig = 0x%08x)\n", buffer-&gt;sig);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buffer-&gt;sig = RAM_CONSOLE_SIG;</div><div class='add'>+	buffer-&gt;start = 0;</div><div class='add'>+	buffer-&gt;size = 0;</div><div class='add'>+</div><div class='add'>+	register_console(&amp;ram_console);</div><div class='add'>+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE</div><div class='add'>+	console_verbose();</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT</div><div class='add'>+static int __init ram_console_early_init(void)</div><div class='add'>+{</div><div class='add'>+	return ram_console_init((struct ram_console_buffer *)</div><div class='add'>+		CONFIG_ANDROID_RAM_CONSOLE_EARLY_ADDR,</div><div class='add'>+		CONFIG_ANDROID_RAM_CONSOLE_EARLY_SIZE,</div><div class='add'>+		NULL,</div><div class='add'>+		ram_console_old_log_init_buffer);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int ram_console_driver_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct resource *res = pdev-&gt;resource;</div><div class='add'>+	size_t start;</div><div class='add'>+	size_t buffer_size;</div><div class='add'>+	void *buffer;</div><div class='add'>+	const char *bootinfo = NULL;</div><div class='add'>+	struct ram_console_platform_data *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	if (res == NULL || pdev-&gt;num_resources != 1 ||</div><div class='add'>+	    !(res-&gt;flags &amp; IORESOURCE_MEM)) {</div><div class='add'>+		printk(KERN_ERR "ram_console: invalid resource, %p %d flags "</div><div class='add'>+		       "%lx\n", res, pdev-&gt;num_resources, res ? res-&gt;flags : 0);</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+	buffer_size = res-&gt;end - res-&gt;start + 1;</div><div class='add'>+	start = res-&gt;start;</div><div class='add'>+	printk(KERN_INFO "ram_console: got buffer at %zx, size %zx\n",</div><div class='add'>+	       start, buffer_size);</div><div class='add'>+	buffer = ioremap(res-&gt;start, buffer_size);</div><div class='add'>+	if (buffer == NULL) {</div><div class='add'>+		printk(KERN_ERR "ram_console: failed to map memory\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pdata)</div><div class='add'>+		bootinfo = pdata-&gt;bootinfo;</div><div class='add'>+</div><div class='add'>+	return ram_console_init(buffer, buffer_size, bootinfo, NULL/* allocate */);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver ram_console_driver = {</div><div class='add'>+	.probe = ram_console_driver_probe,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "ram_console",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ram_console_module_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	err = platform_driver_register(&amp;ram_console_driver);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static ssize_t ram_console_read_old(struct file *file, char __user *buf,</div><div class='add'>+				    size_t len, loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	loff_t pos = *offset;</div><div class='add'>+	ssize_t count;</div><div class='add'>+</div><div class='add'>+	if (pos &gt;= ram_console_old_log_size)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	count = min(len, (size_t)(ram_console_old_log_size - pos));</div><div class='add'>+	if (copy_to_user(buf, ram_console_old_log + pos, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	*offset += count;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations ram_console_file_ops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.read = ram_console_read_old,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ram_console_late_init(void)</div><div class='add'>+{</div><div class='add'>+	struct proc_dir_entry *entry;</div><div class='add'>+</div><div class='add'>+	if (ram_console_old_log == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+#ifdef CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT</div><div class='add'>+	ram_console_old_log = kmalloc(ram_console_old_log_size, GFP_KERNEL);</div><div class='add'>+	if (ram_console_old_log == NULL) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ram_console: failed to allocate buffer for old log\n");</div><div class='add'>+		ram_console_old_log_size = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	memcpy(ram_console_old_log,</div><div class='add'>+	       ram_console_old_log_init_buffer, ram_console_old_log_size);</div><div class='add'>+#endif</div><div class='add'>+	entry = create_proc_entry("last_kmsg", S_IFREG | S_IRUGO, NULL);</div><div class='add'>+	if (!entry) {</div><div class='add'>+		printk(KERN_ERR "ram_console: failed to create proc entry\n");</div><div class='add'>+		kfree(ram_console_old_log);</div><div class='add'>+		ram_console_old_log = NULL;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	entry-&gt;proc_fops = &amp;ram_console_file_ops;</div><div class='add'>+	entry-&gt;size = ram_console_old_log_size;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT</div><div class='add'>+console_initcall(ram_console_early_init);</div><div class='add'>+#else</div><div class='add'>+postcore_initcall(ram_console_module_init);</div><div class='add'>+#endif</div><div class='add'>+late_initcall(ram_console_late_init);</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-tegra/include/mach/vmalloc.h b/drivers/staging/android/ram_console.h<br/>index fd6aa65b2dc6..9f1125c11066 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-tegra/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-tegra/include/mach/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/ram_console.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/ram_console.h</a></div><div class='hunk'>@@ -1,12 +1,6 @@</div><div class='ctx'> /*</div><div class='del'>- * arch/arm/mach-tegra/include/mach/vmalloc.h</div><div class='del'>- *</div><div class='ctx'>  * Copyright (C) 2010 Google, Inc.</div><div class='ctx'>  *</div><div class='del'>- * Author:</div><div class='del'>- *	Colin Cross &lt;ccross@google.com&gt;</div><div class='del'>- *	Erik Gilling &lt;konkers@google.com&gt;</div><div class='del'>- *</div><div class='ctx'>  * This software is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2, as published by the Free Software Foundation, and</div><div class='ctx'>  * may be copied, distributed, and modified under those terms.</div><div class='hunk'>@@ -18,11 +12,11 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifndef __MACH_TEGRA_VMALLOC_H</div><div class='del'>-#define __MACH_TEGRA_VMALLOC_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm/sizes.h&gt;</div><div class='add'>+#ifndef _INCLUDE_LINUX_PLATFORM_DATA_RAM_CONSOLE_H_</div><div class='add'>+#define _INCLUDE_LINUX_PLATFORM_DATA_RAM_CONSOLE_H_</div><div class='ctx'> </div><div class='del'>-#define VMALLOC_END        0xFE000000UL</div><div class='add'>+struct ram_console_platform_data {</div><div class='add'>+	const char *bootinfo;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+#endif /* _INCLUDE_LINUX_PLATFORM_DATA_RAM_CONSOLE_H_ */</div><div class='head'>diff --git a/drivers/staging/android/switch/Kconfig b/drivers/staging/android/switch/Kconfig<br/>new file mode 100644<br/>index 000000000000..36846f62f4bc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/switch/Kconfig?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/switch/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+menuconfig ANDROID_SWITCH</div><div class='add'>+	tristate "Android Switch class support"</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to enable Android switch class support. This allows</div><div class='add'>+	  monitoring switches by userspace via sysfs and uevent.</div><div class='add'>+</div><div class='add'>+config ANDROID_SWITCH_GPIO</div><div class='add'>+	tristate "Android GPIO Switch support"</div><div class='add'>+	depends on GENERIC_GPIO &amp;&amp; ANDROID_SWITCH</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to enable GPIO based switch support.</div><div class='head'>diff --git a/drivers/staging/android/switch/Makefile b/drivers/staging/android/switch/Makefile<br/>new file mode 100644<br/>index 000000000000..d76bfdcedfaf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/switch/Makefile?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/switch/Makefile</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+# Android Switch Class Driver</div><div class='add'>+obj-$(CONFIG_ANDROID_SWITCH)		+= switch_class.o</div><div class='add'>+obj-$(CONFIG_ANDROID_SWITCH_GPIO)	+= switch_gpio.o</div><div class='add'>+</div><div class='head'>diff --git a/drivers/staging/android/switch/switch.h b/drivers/staging/android/switch/switch.h<br/>new file mode 100644<br/>index 000000000000..4fcb3109875a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/switch/switch.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/switch/switch.h</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/*</div><div class='add'>+ *  Switch class driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Google, Inc.</div><div class='add'>+ * Author: Mike Lockwood &lt;lockwood@android.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_SWITCH_H__</div><div class='add'>+#define __LINUX_SWITCH_H__</div><div class='add'>+</div><div class='add'>+struct switch_dev {</div><div class='add'>+	const char	*name;</div><div class='add'>+	struct device	*dev;</div><div class='add'>+	int		index;</div><div class='add'>+	int		state;</div><div class='add'>+</div><div class='add'>+	ssize_t	(*print_name)(struct switch_dev *sdev, char *buf);</div><div class='add'>+	ssize_t	(*print_state)(struct switch_dev *sdev, char *buf);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct gpio_switch_platform_data {</div><div class='add'>+	const char *name;</div><div class='add'>+	unsigned	gpio;</div><div class='add'>+</div><div class='add'>+	/* if NULL, switch_dev.name will be printed */</div><div class='add'>+	const char *name_on;</div><div class='add'>+	const char *name_off;</div><div class='add'>+	/* if NULL, "0" or "1" will be printed */</div><div class='add'>+	const char *state_on;</div><div class='add'>+	const char *state_off;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern int switch_dev_register(struct switch_dev *sdev);</div><div class='add'>+extern void switch_dev_unregister(struct switch_dev *sdev);</div><div class='add'>+</div><div class='add'>+static inline int switch_get_state(struct switch_dev *sdev)</div><div class='add'>+{</div><div class='add'>+	return sdev-&gt;state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern void switch_set_state(struct switch_dev *sdev, int state);</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_SWITCH_H__ */</div><div class='head'>diff --git a/drivers/staging/android/switch/switch_class.c b/drivers/staging/android/switch/switch_class.c<br/>new file mode 100644<br/>index 000000000000..74680446fc66<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/switch/switch_class.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/switch/switch_class.c</a></div><div class='hunk'>@@ -0,0 +1,174 @@</div><div class='add'>+/*</div><div class='add'>+ * switch_class.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Google, Inc.</div><div class='add'>+ * Author: Mike Lockwood &lt;lockwood@android.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</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/err.h&gt;</div><div class='add'>+#include "switch.h"</div><div class='add'>+</div><div class='add'>+struct class *switch_class;</div><div class='add'>+static atomic_t device_count;</div><div class='add'>+</div><div class='add'>+static ssize_t state_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		char *buf)</div><div class='add'>+{</div><div class='add'>+	struct switch_dev *sdev = (struct switch_dev *)</div><div class='add'>+		dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (sdev-&gt;print_state) {</div><div class='add'>+		int ret = sdev-&gt;print_state(sdev, buf);</div><div class='add'>+		if (ret &gt;= 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	return sprintf(buf, "%d\n", sdev-&gt;state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t name_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		char *buf)</div><div class='add'>+{</div><div class='add'>+	struct switch_dev *sdev = (struct switch_dev *)</div><div class='add'>+		dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (sdev-&gt;print_name) {</div><div class='add'>+		int ret = sdev-&gt;print_name(sdev, buf);</div><div class='add'>+		if (ret &gt;= 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	return sprintf(buf, "%s\n", sdev-&gt;name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(state, S_IRUGO | S_IWUSR, state_show, NULL);</div><div class='add'>+static DEVICE_ATTR(name, S_IRUGO | S_IWUSR, name_show, NULL);</div><div class='add'>+</div><div class='add'>+void switch_set_state(struct switch_dev *sdev, int state)</div><div class='add'>+{</div><div class='add'>+	char name_buf[120];</div><div class='add'>+	char state_buf[120];</div><div class='add'>+	char *prop_buf;</div><div class='add'>+	char *envp[3];</div><div class='add'>+	int env_offset = 0;</div><div class='add'>+	int length;</div><div class='add'>+</div><div class='add'>+	if (sdev-&gt;state != state) {</div><div class='add'>+		sdev-&gt;state = state;</div><div class='add'>+</div><div class='add'>+		prop_buf = (char *)get_zeroed_page(GFP_KERNEL);</div><div class='add'>+		if (prop_buf) {</div><div class='add'>+			length = name_show(sdev-&gt;dev, NULL, prop_buf);</div><div class='add'>+			if (length &gt; 0) {</div><div class='add'>+				if (prop_buf[length - 1] == '\n')</div><div class='add'>+					prop_buf[length - 1] = 0;</div><div class='add'>+				snprintf(name_buf, sizeof(name_buf),</div><div class='add'>+					"SWITCH_NAME=%s", prop_buf);</div><div class='add'>+				envp[env_offset++] = name_buf;</div><div class='add'>+			}</div><div class='add'>+			length = state_show(sdev-&gt;dev, NULL, prop_buf);</div><div class='add'>+			if (length &gt; 0) {</div><div class='add'>+				if (prop_buf[length - 1] == '\n')</div><div class='add'>+					prop_buf[length - 1] = 0;</div><div class='add'>+				snprintf(state_buf, sizeof(state_buf),</div><div class='add'>+					"SWITCH_STATE=%s", prop_buf);</div><div class='add'>+				envp[env_offset++] = state_buf;</div><div class='add'>+			}</div><div class='add'>+			envp[env_offset] = NULL;</div><div class='add'>+			kobject_uevent_env(&amp;sdev-&gt;dev-&gt;kobj, KOBJ_CHANGE, envp);</div><div class='add'>+			free_page((unsigned long)prop_buf);</div><div class='add'>+		} else {</div><div class='add'>+			printk(KERN_ERR "out of memory in switch_set_state\n");</div><div class='add'>+			kobject_uevent(&amp;sdev-&gt;dev-&gt;kobj, KOBJ_CHANGE);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(switch_set_state);</div><div class='add'>+</div><div class='add'>+static int create_switch_class(void)</div><div class='add'>+{</div><div class='add'>+	if (!switch_class) {</div><div class='add'>+		switch_class = class_create(THIS_MODULE, "switch");</div><div class='add'>+		if (IS_ERR(switch_class))</div><div class='add'>+			return PTR_ERR(switch_class);</div><div class='add'>+		atomic_set(&amp;device_count, 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'>+int switch_dev_register(struct switch_dev *sdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!switch_class) {</div><div class='add'>+		ret = create_switch_class();</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'>+	sdev-&gt;index = atomic_inc_return(&amp;device_count);</div><div class='add'>+	sdev-&gt;dev = device_create(switch_class, NULL,</div><div class='add'>+		MKDEV(0, sdev-&gt;index), NULL, sdev-&gt;name);</div><div class='add'>+	if (IS_ERR(sdev-&gt;dev))</div><div class='add'>+		return PTR_ERR(sdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ret = device_create_file(sdev-&gt;dev, &amp;dev_attr_state);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_create_file_1;</div><div class='add'>+	ret = device_create_file(sdev-&gt;dev, &amp;dev_attr_name);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_create_file_2;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(sdev-&gt;dev, sdev);</div><div class='add'>+	sdev-&gt;state = 0;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_create_file_2:</div><div class='add'>+	device_remove_file(sdev-&gt;dev, &amp;dev_attr_state);</div><div class='add'>+err_create_file_1:</div><div class='add'>+	device_destroy(switch_class, MKDEV(0, sdev-&gt;index));</div><div class='add'>+	printk(KERN_ERR "switch: Failed to register driver %s\n", sdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(switch_dev_register);</div><div class='add'>+</div><div class='add'>+void switch_dev_unregister(struct switch_dev *sdev)</div><div class='add'>+{</div><div class='add'>+	device_remove_file(sdev-&gt;dev, &amp;dev_attr_name);</div><div class='add'>+	device_remove_file(sdev-&gt;dev, &amp;dev_attr_state);</div><div class='add'>+	device_destroy(switch_class, MKDEV(0, sdev-&gt;index));</div><div class='add'>+	dev_set_drvdata(sdev-&gt;dev, NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(switch_dev_unregister);</div><div class='add'>+</div><div class='add'>+static int __init switch_class_init(void)</div><div class='add'>+{</div><div class='add'>+	return create_switch_class();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit switch_class_exit(void)</div><div class='add'>+{</div><div class='add'>+	class_destroy(switch_class);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(switch_class_init);</div><div class='add'>+module_exit(switch_class_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Mike Lockwood &lt;lockwood@android.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Switch class driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/staging/android/switch/switch_gpio.c b/drivers/staging/android/switch/switch_gpio.c<br/>new file mode 100644<br/>index 000000000000..38b2c2f6004e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/switch/switch_gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/switch/switch_gpio.c</a></div><div class='hunk'>@@ -0,0 +1,172 @@</div><div class='add'>+/*</div><div class='add'>+ * switch_gpio.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Google, Inc.</div><div class='add'>+ * Author: Mike Lockwood &lt;lockwood@android.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#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/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include "switch.h"</div><div class='add'>+</div><div class='add'>+struct gpio_switch_data {</div><div class='add'>+	struct switch_dev sdev;</div><div class='add'>+	unsigned gpio;</div><div class='add'>+	const char *name_on;</div><div class='add'>+	const char *name_off;</div><div class='add'>+	const char *state_on;</div><div class='add'>+	const char *state_off;</div><div class='add'>+	int irq;</div><div class='add'>+	struct work_struct work;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void gpio_switch_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	int state;</div><div class='add'>+	struct gpio_switch_data	*data =</div><div class='add'>+		container_of(work, struct gpio_switch_data, work);</div><div class='add'>+</div><div class='add'>+	state = gpio_get_value(data-&gt;gpio);</div><div class='add'>+	switch_set_state(&amp;data-&gt;sdev, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t gpio_irq_handler(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct gpio_switch_data *switch_data =</div><div class='add'>+	    (struct gpio_switch_data *)dev_id;</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;switch_data-&gt;work);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t switch_gpio_print_state(struct switch_dev *sdev, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct gpio_switch_data	*switch_data =</div><div class='add'>+		container_of(sdev, struct gpio_switch_data, sdev);</div><div class='add'>+	const char *state;</div><div class='add'>+	if (switch_get_state(sdev))</div><div class='add'>+		state = switch_data-&gt;state_on;</div><div class='add'>+	else</div><div class='add'>+		state = switch_data-&gt;state_off;</div><div class='add'>+</div><div class='add'>+	if (state)</div><div class='add'>+		return sprintf(buf, "%s\n", state);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gpio_switch_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct gpio_switch_platform_data *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	struct gpio_switch_data *switch_data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!pdata)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	switch_data = kzalloc(sizeof(struct gpio_switch_data), GFP_KERNEL);</div><div class='add'>+	if (!switch_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	switch_data-&gt;sdev.name = pdata-&gt;name;</div><div class='add'>+	switch_data-&gt;gpio = pdata-&gt;gpio;</div><div class='add'>+	switch_data-&gt;name_on = pdata-&gt;name_on;</div><div class='add'>+	switch_data-&gt;name_off = pdata-&gt;name_off;</div><div class='add'>+	switch_data-&gt;state_on = pdata-&gt;state_on;</div><div class='add'>+	switch_data-&gt;state_off = pdata-&gt;state_off;</div><div class='add'>+	switch_data-&gt;sdev.print_state = switch_gpio_print_state;</div><div class='add'>+</div><div class='add'>+	ret = switch_dev_register(&amp;switch_data-&gt;sdev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_switch_dev_register;</div><div class='add'>+</div><div class='add'>+	ret = gpio_request(switch_data-&gt;gpio, pdev-&gt;name);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_request_gpio;</div><div class='add'>+</div><div class='add'>+	ret = gpio_direction_input(switch_data-&gt;gpio);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_set_gpio_input;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;switch_data-&gt;work, gpio_switch_work);</div><div class='add'>+</div><div class='add'>+	switch_data-&gt;irq = gpio_to_irq(switch_data-&gt;gpio);</div><div class='add'>+	if (switch_data-&gt;irq &lt; 0) {</div><div class='add'>+		ret = switch_data-&gt;irq;</div><div class='add'>+		goto err_detect_irq_num_failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = request_irq(switch_data-&gt;irq, gpio_irq_handler,</div><div class='add'>+			  IRQF_TRIGGER_LOW, pdev-&gt;name, switch_data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_request_irq;</div><div class='add'>+</div><div class='add'>+	/* Perform initial detection */</div><div class='add'>+	gpio_switch_work(&amp;switch_data-&gt;work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_request_irq:</div><div class='add'>+err_detect_irq_num_failed:</div><div class='add'>+err_set_gpio_input:</div><div class='add'>+	gpio_free(switch_data-&gt;gpio);</div><div class='add'>+err_request_gpio:</div><div class='add'>+	switch_dev_unregister(&amp;switch_data-&gt;sdev);</div><div class='add'>+err_switch_dev_register:</div><div class='add'>+	kfree(switch_data);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit gpio_switch_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct gpio_switch_data *switch_data = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;switch_data-&gt;work);</div><div class='add'>+	gpio_free(switch_data-&gt;gpio);</div><div class='add'>+	switch_dev_unregister(&amp;switch_data-&gt;sdev);</div><div class='add'>+	kfree(switch_data);</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 gpio_switch_driver = {</div><div class='add'>+	.probe		= gpio_switch_probe,</div><div class='add'>+	.remove		= __devexit_p(gpio_switch_remove),</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "switch-gpio",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init gpio_switch_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;gpio_switch_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit gpio_switch_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;gpio_switch_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(gpio_switch_init);</div><div class='add'>+module_exit(gpio_switch_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Mike Lockwood &lt;lockwood@android.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("GPIO Switch driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/staging/android/timed_gpio.c b/drivers/staging/android/timed_gpio.c<br/>new file mode 100644<br/>index 000000000000..a64481c3e86d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/timed_gpio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/timed_gpio.c</a></div><div class='hunk'>@@ -0,0 +1,176 @@</div><div class='add'>+/* drivers/misc/timed_gpio.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Google, Inc.</div><div class='add'>+ * Author: Mike Lockwood &lt;lockwood@android.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/hrtimer.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include "timed_output.h"</div><div class='add'>+#include "timed_gpio.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct timed_gpio_data {</div><div class='add'>+	struct timed_output_dev dev;</div><div class='add'>+	struct hrtimer timer;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	unsigned 	gpio;</div><div class='add'>+	int 		max_timeout;</div><div class='add'>+	u8 		active_low;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum hrtimer_restart gpio_timer_func(struct hrtimer *timer)</div><div class='add'>+{</div><div class='add'>+	struct timed_gpio_data *data =</div><div class='add'>+		container_of(timer, struct timed_gpio_data, timer);</div><div class='add'>+</div><div class='add'>+	gpio_direction_output(data-&gt;gpio, data-&gt;active_low ? 1 : 0);</div><div class='add'>+	return HRTIMER_NORESTART;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gpio_get_time(struct timed_output_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct timed_gpio_data	*data =</div><div class='add'>+		container_of(dev, struct timed_gpio_data, dev);</div><div class='add'>+</div><div class='add'>+	if (hrtimer_active(&amp;data-&gt;timer)) {</div><div class='add'>+		ktime_t r = hrtimer_get_remaining(&amp;data-&gt;timer);</div><div class='add'>+		struct timeval t = ktime_to_timeval(r);</div><div class='add'>+		return t.tv_sec * 1000 + t.tv_usec / 1000;</div><div class='add'>+	} else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gpio_enable(struct timed_output_dev *dev, int value)</div><div class='add'>+{</div><div class='add'>+	struct timed_gpio_data	*data =</div><div class='add'>+		container_of(dev, struct timed_gpio_data, dev);</div><div class='add'>+	unsigned long	flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;data-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* cancel previous timer and set GPIO according to value */</div><div class='add'>+	hrtimer_cancel(&amp;data-&gt;timer);</div><div class='add'>+	gpio_direction_output(data-&gt;gpio, data-&gt;active_low ? !value : !!value);</div><div class='add'>+</div><div class='add'>+	if (value &gt; 0) {</div><div class='add'>+		if (value &gt; data-&gt;max_timeout)</div><div class='add'>+			value = data-&gt;max_timeout;</div><div class='add'>+</div><div class='add'>+		hrtimer_start(&amp;data-&gt;timer,</div><div class='add'>+			ktime_set(value / 1000, (value % 1000) * 1000000),</div><div class='add'>+			HRTIMER_MODE_REL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;data-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int timed_gpio_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct timed_gpio_platform_data *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	struct timed_gpio *cur_gpio;</div><div class='add'>+	struct timed_gpio_data *gpio_data, *gpio_dat;</div><div class='add'>+	int i, j, ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!pdata)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	gpio_data = kzalloc(sizeof(struct timed_gpio_data) * pdata-&gt;num_gpios,</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+	if (!gpio_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pdata-&gt;num_gpios; i++) {</div><div class='add'>+		cur_gpio = &amp;pdata-&gt;gpios[i];</div><div class='add'>+		gpio_dat = &amp;gpio_data[i];</div><div class='add'>+</div><div class='add'>+		hrtimer_init(&amp;gpio_dat-&gt;timer, CLOCK_MONOTONIC,</div><div class='add'>+				HRTIMER_MODE_REL);</div><div class='add'>+		gpio_dat-&gt;timer.function = gpio_timer_func;</div><div class='add'>+		spin_lock_init(&amp;gpio_dat-&gt;lock);</div><div class='add'>+</div><div class='add'>+		gpio_dat-&gt;dev.name = cur_gpio-&gt;name;</div><div class='add'>+		gpio_dat-&gt;dev.get_time = gpio_get_time;</div><div class='add'>+		gpio_dat-&gt;dev.enable = gpio_enable;</div><div class='add'>+		ret = gpio_request(cur_gpio-&gt;gpio, cur_gpio-&gt;name);</div><div class='add'>+		if (ret &gt;= 0) {</div><div class='add'>+			ret = timed_output_dev_register(&amp;gpio_dat-&gt;dev);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				gpio_free(cur_gpio-&gt;gpio);</div><div class='add'>+		}</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			for (j = 0; j &lt; i; j++) {</div><div class='add'>+				timed_output_dev_unregister(&amp;gpio_data[i].dev);</div><div class='add'>+				gpio_free(gpio_data[i].gpio);</div><div class='add'>+			}</div><div class='add'>+			kfree(gpio_data);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		gpio_dat-&gt;gpio = cur_gpio-&gt;gpio;</div><div class='add'>+		gpio_dat-&gt;max_timeout = cur_gpio-&gt;max_timeout;</div><div class='add'>+		gpio_dat-&gt;active_low = cur_gpio-&gt;active_low;</div><div class='add'>+		gpio_direction_output(gpio_dat-&gt;gpio, gpio_dat-&gt;active_low);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, gpio_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 timed_gpio_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct timed_gpio_platform_data *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	struct timed_gpio_data *gpio_data = platform_get_drvdata(pdev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pdata-&gt;num_gpios; i++) {</div><div class='add'>+		timed_output_dev_unregister(&amp;gpio_data[i].dev);</div><div class='add'>+		gpio_free(gpio_data[i].gpio);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(gpio_data);</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 timed_gpio_driver = {</div><div class='add'>+	.probe		= timed_gpio_probe,</div><div class='add'>+	.remove		= timed_gpio_remove,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name		= TIMED_GPIO_NAME,</div><div class='add'>+		.owner		= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init timed_gpio_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;timed_gpio_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit timed_gpio_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;timed_gpio_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(timed_gpio_init);</div><div class='add'>+module_exit(timed_gpio_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Mike Lockwood &lt;lockwood@android.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("timed gpio driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/arch/arm/mach-msm/include/mach/vmalloc.h b/drivers/staging/android/timed_gpio.h<br/>index d138448eff16..a0e15f8be3f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-msm/include/mach/vmalloc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>arch/arm/mach-msm/include/mach/vmalloc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/timed_gpio.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/timed_gpio.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='del'>-/* arch/arm/mach-msm/include/mach/vmalloc.h</div><div class='add'>+/* include/linux/timed_gpio.h</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2007 Google, Inc.</div><div class='add'>+ * Copyright (C) 2008 Google, Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is licensed under the terms of the GNU General Public</div><div class='ctx'>  * License version 2, as published by the Free Software Foundation, and</div><div class='hunk'>@@ -11,12 +11,23 @@</div><div class='ctx'>  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  * GNU General Public License for more details.</div><div class='ctx'>  *</div><div class='del'>- */</div><div class='add'>+*/</div><div class='ctx'> </div><div class='del'>-#ifndef __ASM_ARCH_MSM_VMALLOC_H</div><div class='del'>-#define __ASM_ARCH_MSM_VMALLOC_H</div><div class='add'>+#ifndef _LINUX_TIMED_GPIO_H</div><div class='add'>+#define _LINUX_TIMED_GPIO_H</div><div class='ctx'> </div><div class='del'>-#define VMALLOC_END	  0xd0000000UL</div><div class='add'>+#define TIMED_GPIO_NAME "timed-gpio"</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+struct timed_gpio {</div><div class='add'>+	const char *name;</div><div class='add'>+	unsigned 	gpio;</div><div class='add'>+	int		max_timeout;</div><div class='add'>+	u8 		active_low;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct timed_gpio_platform_data {</div><div class='add'>+	int 		num_gpios;</div><div class='add'>+	struct timed_gpio *gpios;</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c<br/>new file mode 100644<br/>index 000000000000..f373422308e0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/timed_output.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/timed_output.c</a></div><div class='hunk'>@@ -0,0 +1,123 @@</div><div class='add'>+/* drivers/misc/timed_output.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2009 Google, Inc.</div><div class='add'>+ * Author: Mike Lockwood &lt;lockwood@android.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</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/err.h&gt;</div><div class='add'>+</div><div class='add'>+#include "timed_output.h"</div><div class='add'>+</div><div class='add'>+static struct class *timed_output_class;</div><div class='add'>+static atomic_t device_count;</div><div class='add'>+</div><div class='add'>+static ssize_t enable_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		char *buf)</div><div class='add'>+{</div><div class='add'>+	struct timed_output_dev *tdev = dev_get_drvdata(dev);</div><div class='add'>+	int remaining = tdev-&gt;get_time(tdev);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", remaining);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t enable_store(</div><div class='add'>+		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 timed_output_dev *tdev = dev_get_drvdata(dev);</div><div class='add'>+	int value;</div><div class='add'>+</div><div class='add'>+	if (sscanf(buf, "%d", &amp;value) != 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	tdev-&gt;enable(tdev, value);</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(enable, S_IRUGO | S_IWUSR, enable_show, enable_store);</div><div class='add'>+</div><div class='add'>+static int create_timed_output_class(void)</div><div class='add'>+{</div><div class='add'>+	if (!timed_output_class) {</div><div class='add'>+		timed_output_class = class_create(THIS_MODULE, "timed_output");</div><div class='add'>+		if (IS_ERR(timed_output_class))</div><div class='add'>+			return PTR_ERR(timed_output_class);</div><div class='add'>+		atomic_set(&amp;device_count, 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'>+int timed_output_dev_register(struct timed_output_dev *tdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!tdev || !tdev-&gt;name || !tdev-&gt;enable || !tdev-&gt;get_time)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = create_timed_output_class();</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	tdev-&gt;index = atomic_inc_return(&amp;device_count);</div><div class='add'>+	tdev-&gt;dev = device_create(timed_output_class, NULL,</div><div class='add'>+		MKDEV(0, tdev-&gt;index), NULL, tdev-&gt;name);</div><div class='add'>+	if (IS_ERR(tdev-&gt;dev))</div><div class='add'>+		return PTR_ERR(tdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ret = device_create_file(tdev-&gt;dev, &amp;dev_attr_enable);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_create_file;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(tdev-&gt;dev, tdev);</div><div class='add'>+	tdev-&gt;state = 0;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_create_file:</div><div class='add'>+	device_destroy(timed_output_class, MKDEV(0, tdev-&gt;index));</div><div class='add'>+	printk(KERN_ERR "timed_output: Failed to register driver %s\n",</div><div class='add'>+			tdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(timed_output_dev_register);</div><div class='add'>+</div><div class='add'>+void timed_output_dev_unregister(struct timed_output_dev *tdev)</div><div class='add'>+{</div><div class='add'>+	device_remove_file(tdev-&gt;dev, &amp;dev_attr_enable);</div><div class='add'>+	device_destroy(timed_output_class, MKDEV(0, tdev-&gt;index));</div><div class='add'>+	dev_set_drvdata(tdev-&gt;dev, NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(timed_output_dev_unregister);</div><div class='add'>+</div><div class='add'>+static int __init timed_output_init(void)</div><div class='add'>+{</div><div class='add'>+	return create_timed_output_class();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit timed_output_exit(void)</div><div class='add'>+{</div><div class='add'>+	class_destroy(timed_output_class);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(timed_output_init);</div><div class='add'>+module_exit(timed_output_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Mike Lockwood &lt;lockwood@android.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("timed output class driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/staging/android/timed_output.h b/drivers/staging/android/timed_output.h<br/>new file mode 100644<br/>index 000000000000..ec907ab2ff54<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/android/timed_output.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/android/timed_output.h</a></div><div class='hunk'>@@ -0,0 +1,37 @@</div><div class='add'>+/* include/linux/timed_output.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Google, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This software is licensed under the terms of the GNU General Public</div><div class='add'>+ * License version 2, as published by the Free Software Foundation, and</div><div class='add'>+ * may be copied, distributed, and modified under those terms.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_TIMED_OUTPUT_H</div><div class='add'>+#define _LINUX_TIMED_OUTPUT_H</div><div class='add'>+</div><div class='add'>+struct timed_output_dev {</div><div class='add'>+	const char	*name;</div><div class='add'>+</div><div class='add'>+	/* enable the output and set the timer */</div><div class='add'>+	void	(*enable)(struct timed_output_dev *sdev, int timeout);</div><div class='add'>+</div><div class='add'>+	/* returns the current number of milliseconds remaining on the timer */</div><div class='add'>+	int		(*get_time)(struct timed_output_dev *sdev);</div><div class='add'>+</div><div class='add'>+	/* private data */</div><div class='add'>+	struct device	*dev;</div><div class='add'>+	int		index;</div><div class='add'>+	int		state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern int timed_output_dev_register(struct timed_output_dev *dev);</div><div class='add'>+extern void timed_output_dev_unregister(struct timed_output_dev *dev);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/staging/asus_oled/asus_oled.c b/drivers/staging/asus_oled/asus_oled.c<br/>index 7bb7da7959a2..e77e4e0396cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/asus_oled/asus_oled.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/asus_oled/asus_oled.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/asus_oled/asus_oled.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/asus_oled/asus_oled.c</a></div><div class='hunk'>@@ -201,7 +201,7 @@ static ssize_t set_enabled(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct usb_interface *intf = to_usb_interface(dev);</div><div class='ctx'> 	struct asus_oled_dev *odev = usb_get_intfdata(intf);</div><div class='ctx'> 	unsigned long value;</div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;value))</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;value))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	enable_oled(odev, value);</div><div class='hunk'>@@ -217,7 +217,7 @@ static ssize_t class_set_enabled(struct device *device,</div><div class='ctx'> 		(struct asus_oled_dev *) dev_get_drvdata(device);</div><div class='ctx'> 	unsigned long value;</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;value))</div><div class='add'>+	if (kstrtoul(buf, 10, &amp;value))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	enable_oled(odev, value);</div><div class='head'>diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c<br/>index 2fa658eb74dc..179707b5e7c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/bcm/Bcmchar.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/Bcmchar.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/bcm/Bcmchar.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/bcm/Bcmchar.c</a></div><div class='hunk'>@@ -161,6 +161,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)</div><div class='ctx'> 	INT Status = STATUS_FAILURE;</div><div class='ctx'> 	int timeout = 0;</div><div class='ctx'> 	IOCTL_BUFFER IoBuffer;</div><div class='add'>+	int bytes;</div><div class='ctx'> </div><div class='ctx'> 	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Parameters Passed to control IOCTL cmd=0x%X arg=0x%lX", cmd, arg);</div><div class='ctx'> </div><div class='hunk'>@@ -230,11 +231,16 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)</div><div class='ctx'> 		if (!temp_buff)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		Status = rdmalt(Adapter, (UINT)sRdmBuffer.Register,</div><div class='add'>+		bytes = rdmalt(Adapter, (UINT)sRdmBuffer.Register,</div><div class='ctx'> 				(PUINT)temp_buff, Bufflen);</div><div class='del'>-		if (Status == STATUS_SUCCESS) {</div><div class='del'>-			if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, IoBuffer.OutputLength))</div><div class='del'>-				Status = -EFAULT;</div><div class='add'>+		if (bytes &gt; 0) {</div><div class='add'>+			Status = STATUS_SUCCESS;</div><div class='add'>+			if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, bytes)) {</div><div class='add'>+				kfree(temp_buff);</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			Status = bytes;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		kfree(temp_buff);</div><div class='hunk'>@@ -302,7 +308,11 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)</div><div class='ctx'> 		if (copy_from_user(&amp;sRdmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		/* FIXME: don't trust user supplied length */</div><div class='add'>+		if (IoBuffer.OutputLength &gt; USHRT_MAX ||</div><div class='add'>+			IoBuffer.OutputLength == 0) {</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		temp_buff = kmalloc(IoBuffer.OutputLength, GFP_KERNEL);</div><div class='ctx'> 		if (!temp_buff)</div><div class='ctx'> 			return STATUS_FAILURE;</div><div class='hunk'>@@ -318,11 +328,17 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		uiTempVar = sRdmBuffer.Register &amp; EEPROM_REJECT_MASK;</div><div class='del'>-		Status = rdmaltWithLock(Adapter, (UINT)sRdmBuffer.Register, (PUINT)temp_buff, IoBuffer.OutputLength);</div><div class='add'>+		bytes = rdmaltWithLock(Adapter, (UINT)sRdmBuffer.Register, (PUINT)temp_buff, IoBuffer.OutputLength);</div><div class='ctx'> </div><div class='del'>-		if (Status == STATUS_SUCCESS)</div><div class='del'>-			if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, IoBuffer.OutputLength))</div><div class='del'>-				Status = -EFAULT;</div><div class='add'>+		if (bytes &gt; 0) {</div><div class='add'>+			Status = STATUS_SUCCESS;</div><div class='add'>+			if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, bytes)) {</div><div class='add'>+				kfree(temp_buff);</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			Status = bytes;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		kfree(temp_buff);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -437,12 +453,14 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		Status = rdmaltWithLock(Adapter, (UINT)GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));</div><div class='del'>-</div><div class='del'>-		if (STATUS_SUCCESS != Status) {</div><div class='add'>+		bytes = rdmaltWithLock(Adapter, (UINT)GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));</div><div class='add'>+		if (bytes &lt; 0) {</div><div class='add'>+			Status = bytes;</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,</div><div class='ctx'> 					"GPIO_MODE_REGISTER read failed");</div><div class='ctx'> 			break;</div><div class='add'>+		} else {</div><div class='add'>+			Status = STATUS_SUCCESS;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Set the gpio mode register to output */</div><div class='hunk'>@@ -519,12 +537,15 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)</div><div class='ctx'> 		uiBit = gpio_info.uiGpioNumber;</div><div class='ctx'> </div><div class='ctx'> 		/* Set the gpio output register */</div><div class='del'>-		Status = rdmaltWithLock(Adapter, (UINT)GPIO_PIN_STATE_REGISTER,</div><div class='add'>+		bytes = rdmaltWithLock(Adapter, (UINT)GPIO_PIN_STATE_REGISTER,</div><div class='ctx'> 					(PUINT)ucRead, sizeof(UINT));</div><div class='ctx'> </div><div class='del'>-		if (Status != STATUS_SUCCESS) {</div><div class='add'>+		if (bytes &lt; 0) {</div><div class='add'>+			Status = bytes;</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "RDM Failed\n");</div><div class='ctx'> 			return Status;</div><div class='add'>+		} else {</div><div class='add'>+			Status = STATUS_SUCCESS;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	break;</div><div class='hunk'>@@ -590,11 +611,14 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (pgpio_multi_info[WIMAX_IDX].uiGPIOMask) {</div><div class='del'>-			Status = rdmaltWithLock(Adapter, (UINT)GPIO_PIN_STATE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));</div><div class='add'>+			bytes = rdmaltWithLock(Adapter, (UINT)GPIO_PIN_STATE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));</div><div class='ctx'> </div><div class='del'>-			if (Status != STATUS_SUCCESS) {</div><div class='add'>+			if (bytes &lt; 0) {</div><div class='add'>+				Status = bytes;</div><div class='ctx'> 				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "RDM to GPIO_PIN_STATE_REGISTER Failed.");</div><div class='ctx'> 				return Status;</div><div class='add'>+			} else {</div><div class='add'>+				Status = STATUS_SUCCESS;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			pgpio_multi_info[WIMAX_IDX].uiGPIOValue = (*(UINT *)ucResetValue &amp;</div><div class='hunk'>@@ -605,7 +629,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)</div><div class='ctx'> 		if (Status) {</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,</div><div class='ctx'> 					"Failed while copying Content to IOBufer for user space err:%d", Status);</div><div class='del'>-			break;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	break;</div><div class='hunk'>@@ -629,11 +653,14 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)</div><div class='ctx'> 		if (copy_from_user(&amp;gpio_multi_mode, IoBuffer.InputBuffer, IoBuffer.InputLength))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		Status = rdmaltWithLock(Adapter, (UINT)GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));</div><div class='add'>+		bytes = rdmaltWithLock(Adapter, (UINT)GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));</div><div class='ctx'> </div><div class='del'>-		if (STATUS_SUCCESS != Status) {</div><div class='add'>+		if (bytes &lt; 0) {</div><div class='add'>+			Status = bytes;</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Read of GPIO_MODE_REGISTER failed");</div><div class='ctx'> 			return Status;</div><div class='add'>+		} else {</div><div class='add'>+			Status = STATUS_SUCCESS;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Validating the request */</div><div class='hunk'>@@ -678,7 +705,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)</div><div class='ctx'> 		if (Status) {</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,</div><div class='ctx'> 					"Failed while copying Content to IOBufer for user space err:%d", Status);</div><div class='del'>-			break;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	break;</div><div class='hunk'>@@ -706,9 +733,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 		if (copy_from_user(pvBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength)) {</div><div class='del'>-			Status = -EFAULT;</div><div class='ctx'> 			kfree(pvBuffer);</div><div class='del'>-			break;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		down(&amp;Adapter-&gt;LowPowerModeSync);</div><div class='hunk'>@@ -733,8 +759,7 @@ cntrlEnd:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case IOCTL_BCM_BUFFER_DOWNLOAD_START: {</div><div class='del'>-		INT NVMAccess = down_trylock(&amp;Adapter-&gt;NVMRdmWrmLock);</div><div class='del'>-		if (NVMAccess) {</div><div class='add'>+		if (down_trylock(&amp;Adapter-&gt;NVMRdmWrmLock)) {</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,</div><div class='ctx'> 					"IOCTL_BCM_CHIP_RESET not allowed as EEPROM Read/Write is in progress\n");</div><div class='ctx'> 			return -EACCES;</div><div class='hunk'>@@ -743,157 +768,162 @@ cntrlEnd:</div><div class='ctx'> 		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,</div><div class='ctx'> 				"Starting the firmware download PID =0x%x!!!!\n", current-&gt;pid);</div><div class='ctx'> </div><div class='del'>-		if (!down_trylock(&amp;Adapter-&gt;fw_download_sema)) {</div><div class='del'>-			Adapter-&gt;bBinDownloaded = FALSE;</div><div class='del'>-			Adapter-&gt;fw_download_process_pid = current-&gt;pid;</div><div class='del'>-			Adapter-&gt;bCfgDownloaded = FALSE;</div><div class='del'>-			Adapter-&gt;fw_download_done = FALSE;</div><div class='del'>-			netif_carrier_off(Adapter-&gt;dev);</div><div class='del'>-			netif_stop_queue(Adapter-&gt;dev);</div><div class='del'>-			Status = reset_card_proc(Adapter);</div><div class='del'>-			if (Status) {</div><div class='del'>-				pr_err(PFX "%s: reset_card_proc Failed!\n", Adapter-&gt;dev-&gt;name);</div><div class='del'>-				up(&amp;Adapter-&gt;fw_download_sema);</div><div class='del'>-				up(&amp;Adapter-&gt;NVMRdmWrmLock);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			mdelay(10);</div><div class='del'>-		} else {</div><div class='del'>-			Status = -EBUSY;</div><div class='add'>+		if (down_trylock(&amp;Adapter-&gt;fw_download_sema))</div><div class='add'>+			return -EBUSY;</div><div class='add'>+</div><div class='add'>+		Adapter-&gt;bBinDownloaded = FALSE;</div><div class='add'>+		Adapter-&gt;fw_download_process_pid = current-&gt;pid;</div><div class='add'>+		Adapter-&gt;bCfgDownloaded = FALSE;</div><div class='add'>+		Adapter-&gt;fw_download_done = FALSE;</div><div class='add'>+		netif_carrier_off(Adapter-&gt;dev);</div><div class='add'>+		netif_stop_queue(Adapter-&gt;dev);</div><div class='add'>+		Status = reset_card_proc(Adapter);</div><div class='add'>+		if (Status) {</div><div class='add'>+			pr_err(PFX "%s: reset_card_proc Failed!\n", Adapter-&gt;dev-&gt;name);</div><div class='add'>+			up(&amp;Adapter-&gt;fw_download_sema);</div><div class='add'>+			up(&amp;Adapter-&gt;NVMRdmWrmLock);</div><div class='add'>+			return Status;</div><div class='ctx'> 		}</div><div class='add'>+		mdelay(10);</div><div class='ctx'> </div><div class='ctx'> 		up(&amp;Adapter-&gt;NVMRdmWrmLock);</div><div class='del'>-		break;</div><div class='add'>+		return Status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case IOCTL_BCM_BUFFER_DOWNLOAD: {</div><div class='ctx'> 		FIRMWARE_INFO *psFwInfo = NULL;</div><div class='ctx'> 		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Starting the firmware download PID =0x%x!!!!\n", current-&gt;pid);</div><div class='del'>-		do {</div><div class='del'>-			if (!down_trylock(&amp;Adapter-&gt;fw_download_sema)) {</div><div class='del'>-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,</div><div class='del'>-						"Invalid way to download buffer. Use Start and then call this!!!\n");</div><div class='del'>-				Status = -EINVAL;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Copy Ioctl Buffer structure */</div><div class='del'>-			if (copy_from_user(&amp;IoBuffer, argp, sizeof(IOCTL_BUFFER)))</div><div class='del'>-				return -EFAULT;</div><div class='ctx'> </div><div class='add'>+		if (!down_trylock(&amp;Adapter-&gt;fw_download_sema)) {</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,</div><div class='del'>-					"Length for FW DLD is : %lx\n", IoBuffer.InputLength);</div><div class='add'>+					"Invalid way to download buffer. Use Start and then call this!!!\n");</div><div class='add'>+			up(&amp;Adapter-&gt;fw_download_sema);</div><div class='add'>+			Status = -EINVAL;</div><div class='add'>+			return Status;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			if (IoBuffer.InputLength &gt; sizeof(FIRMWARE_INFO))</div><div class='del'>-				return -EINVAL;</div><div class='add'>+		/* Copy Ioctl Buffer structure */</div><div class='add'>+		if (copy_from_user(&amp;IoBuffer, argp, sizeof(IOCTL_BUFFER))) {</div><div class='add'>+			up(&amp;Adapter-&gt;fw_download_sema);</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			psFwInfo = kmalloc(sizeof(*psFwInfo), GFP_KERNEL);</div><div class='del'>-			if (!psFwInfo)</div><div class='del'>-				return -ENOMEM;</div><div class='add'>+		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,</div><div class='add'>+				"Length for FW DLD is : %lx\n", IoBuffer.InputLength);</div><div class='ctx'> </div><div class='del'>-			if (copy_from_user(psFwInfo, IoBuffer.InputBuffer, IoBuffer.InputLength))</div><div class='del'>-				return -EFAULT;</div><div class='add'>+		if (IoBuffer.InputLength &gt; sizeof(FIRMWARE_INFO)) {</div><div class='add'>+			up(&amp;Adapter-&gt;fw_download_sema);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			if (!psFwInfo-&gt;pvMappedFirmwareAddress ||</div><div class='del'>-				(psFwInfo-&gt;u32FirmwareLength == 0)) {</div><div class='add'>+		psFwInfo = kmalloc(sizeof(*psFwInfo), GFP_KERNEL);</div><div class='add'>+		if (!psFwInfo) {</div><div class='add'>+			up(&amp;Adapter-&gt;fw_download_sema);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Something else is wrong %lu\n",</div><div class='del'>-						psFwInfo-&gt;u32FirmwareLength);</div><div class='del'>-				Status = -EINVAL;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+		if (copy_from_user(psFwInfo, IoBuffer.InputBuffer, IoBuffer.InputLength)) {</div><div class='add'>+			up(&amp;Adapter-&gt;fw_download_sema);</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			Status = bcm_ioctl_fw_download(Adapter, psFwInfo);</div><div class='add'>+		if (!psFwInfo-&gt;pvMappedFirmwareAddress ||</div><div class='add'>+			(psFwInfo-&gt;u32FirmwareLength == 0)) {</div><div class='ctx'> </div><div class='del'>-			if (Status != STATUS_SUCCESS) {</div><div class='del'>-				if (psFwInfo-&gt;u32StartingAddress == CONFIG_BEGIN_ADDR)</div><div class='del'>-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL: Configuration File Upload Failed\n");</div><div class='del'>-				else</div><div class='del'>-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,	"IOCTL: Firmware File Upload Failed\n");</div><div class='add'>+			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Something else is wrong %lu\n",</div><div class='add'>+					psFwInfo-&gt;u32FirmwareLength);</div><div class='add'>+			up(&amp;Adapter-&gt;fw_download_sema);</div><div class='add'>+			Status = -EINVAL;</div><div class='add'>+			return Status;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-				/* up(&amp;Adapter-&gt;fw_download_sema); */</div><div class='add'>+		Status = bcm_ioctl_fw_download(Adapter, psFwInfo);</div><div class='ctx'> </div><div class='del'>-				if (Adapter-&gt;LEDInfo.led_thread_running &amp; BCM_LED_THREAD_RUNNING_ACTIVELY) {</div><div class='del'>-					Adapter-&gt;DriverState = DRIVER_INIT;</div><div class='del'>-					Adapter-&gt;LEDInfo.bLedInitDone = FALSE;</div><div class='del'>-					wake_up(&amp;Adapter-&gt;LEDInfo.notify_led_event);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='add'>+		if (Status != STATUS_SUCCESS) {</div><div class='add'>+			if (psFwInfo-&gt;u32StartingAddress == CONFIG_BEGIN_ADDR)</div><div class='add'>+				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL: Configuration File Upload Failed\n");</div><div class='add'>+			else</div><div class='add'>+				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,	"IOCTL: Firmware File Upload Failed\n");</div><div class='add'>+</div><div class='add'>+			/* up(&amp;Adapter-&gt;fw_download_sema); */</div><div class='ctx'> </div><div class='del'>-		} while (0);</div><div class='add'>+			if (Adapter-&gt;LEDInfo.led_thread_running &amp; BCM_LED_THREAD_RUNNING_ACTIVELY) {</div><div class='add'>+				Adapter-&gt;DriverState = DRIVER_INIT;</div><div class='add'>+				Adapter-&gt;LEDInfo.bLedInitDone = FALSE;</div><div class='add'>+				wake_up(&amp;Adapter-&gt;LEDInfo.notify_led_event);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (Status != STATUS_SUCCESS)</div><div class='ctx'> 			up(&amp;Adapter-&gt;fw_download_sema);</div><div class='ctx'> </div><div class='ctx'> 		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, OSAL_DBG, DBG_LVL_ALL, "IOCTL: Firmware File Uploaded\n");</div><div class='ctx'> 		kfree(psFwInfo);</div><div class='del'>-		break;</div><div class='add'>+		return Status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case IOCTL_BCM_BUFFER_DOWNLOAD_STOP: {</div><div class='del'>-		INT NVMAccess = down_trylock(&amp;Adapter-&gt;NVMRdmWrmLock);</div><div class='add'>+		if (!down_trylock(&amp;Adapter-&gt;fw_download_sema)) {</div><div class='add'>+			up(&amp;Adapter-&gt;fw_download_sema);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (NVMAccess) {</div><div class='add'>+		if (down_trylock(&amp;Adapter-&gt;NVMRdmWrmLock)) {</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,</div><div class='ctx'> 					"FW download blocked as EEPROM Read/Write is in progress\n");</div><div class='ctx'> 			up(&amp;Adapter-&gt;fw_download_sema);</div><div class='ctx'> 			return -EACCES;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (down_trylock(&amp;Adapter-&gt;fw_download_sema)) {</div><div class='del'>-			Adapter-&gt;bBinDownloaded = TRUE;</div><div class='del'>-			Adapter-&gt;bCfgDownloaded = TRUE;</div><div class='del'>-			atomic_set(&amp;Adapter-&gt;CurrNumFreeTxDesc, 0);</div><div class='del'>-			Adapter-&gt;CurrNumRecvDescs = 0;</div><div class='del'>-			Adapter-&gt;downloadDDR = 0;</div><div class='del'>-</div><div class='del'>-			/* setting the Mips to Run */</div><div class='del'>-			Status = run_card_proc(Adapter);</div><div class='add'>+		Adapter-&gt;bBinDownloaded = TRUE;</div><div class='add'>+		Adapter-&gt;bCfgDownloaded = TRUE;</div><div class='add'>+		atomic_set(&amp;Adapter-&gt;CurrNumFreeTxDesc, 0);</div><div class='add'>+		Adapter-&gt;CurrNumRecvDescs = 0;</div><div class='add'>+		Adapter-&gt;downloadDDR = 0;</div><div class='ctx'> </div><div class='del'>-			if (Status) {</div><div class='del'>-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Firm Download Failed\n");</div><div class='del'>-				up(&amp;Adapter-&gt;fw_download_sema);</div><div class='del'>-				up(&amp;Adapter-&gt;NVMRdmWrmLock);</div><div class='del'>-				break;</div><div class='del'>-			} else {</div><div class='del'>-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,</div><div class='del'>-						DBG_LVL_ALL, "Firm Download Over...\n");</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			mdelay(10);</div><div class='del'>-</div><div class='del'>-			/* Wait for MailBox Interrupt */</div><div class='del'>-			if (StartInterruptUrb((PS_INTERFACE_ADAPTER)Adapter-&gt;pvInterfaceAdapter))</div><div class='del'>-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Unable to send interrupt...\n");</div><div class='del'>-</div><div class='del'>-			timeout = 5*HZ;</div><div class='del'>-			Adapter-&gt;waiting_to_fw_download_done = FALSE;</div><div class='del'>-			wait_event_timeout(Adapter-&gt;ioctl_fw_dnld_wait_queue,</div><div class='del'>-					Adapter-&gt;waiting_to_fw_download_done, timeout);</div><div class='del'>-			Adapter-&gt;fw_download_process_pid = INVALID_PID;</div><div class='del'>-			Adapter-&gt;fw_download_done = TRUE;</div><div class='del'>-			atomic_set(&amp;Adapter-&gt;CurrNumFreeTxDesc, 0);</div><div class='del'>-			Adapter-&gt;CurrNumRecvDescs = 0;</div><div class='del'>-			Adapter-&gt;PrevNumRecvDescs = 0;</div><div class='del'>-			atomic_set(&amp;Adapter-&gt;cntrlpktCnt, 0);</div><div class='del'>-			Adapter-&gt;LinkUpStatus = 0;</div><div class='del'>-			Adapter-&gt;LinkStatus = 0;</div><div class='add'>+		/* setting the Mips to Run */</div><div class='add'>+		Status = run_card_proc(Adapter);</div><div class='ctx'> </div><div class='del'>-			if (Adapter-&gt;LEDInfo.led_thread_running &amp; BCM_LED_THREAD_RUNNING_ACTIVELY) {</div><div class='del'>-				Adapter-&gt;DriverState = FW_DOWNLOAD_DONE;</div><div class='del'>-				wake_up(&amp;Adapter-&gt;LEDInfo.notify_led_event);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (!timeout)</div><div class='del'>-				Status = -ENODEV;</div><div class='add'>+		if (Status) {</div><div class='add'>+			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Firm Download Failed\n");</div><div class='add'>+			up(&amp;Adapter-&gt;fw_download_sema);</div><div class='add'>+			up(&amp;Adapter-&gt;NVMRdmWrmLock);</div><div class='add'>+			return Status;</div><div class='ctx'> 		} else {</div><div class='del'>-			Status = -EINVAL;</div><div class='add'>+			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,</div><div class='add'>+					DBG_LVL_ALL, "Firm Download Over...\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mdelay(10);</div><div class='add'>+</div><div class='add'>+		/* Wait for MailBox Interrupt */</div><div class='add'>+		if (StartInterruptUrb((PS_INTERFACE_ADAPTER)Adapter-&gt;pvInterfaceAdapter))</div><div class='add'>+			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Unable to send interrupt...\n");</div><div class='add'>+</div><div class='add'>+		timeout = 5*HZ;</div><div class='add'>+		Adapter-&gt;waiting_to_fw_download_done = FALSE;</div><div class='add'>+		wait_event_timeout(Adapter-&gt;ioctl_fw_dnld_wait_queue,</div><div class='add'>+				Adapter-&gt;waiting_to_fw_download_done, timeout);</div><div class='add'>+		Adapter-&gt;fw_download_process_pid = INVALID_PID;</div><div class='add'>+		Adapter-&gt;fw_download_done = TRUE;</div><div class='add'>+		atomic_set(&amp;Adapter-&gt;CurrNumFreeTxDesc, 0);</div><div class='add'>+		Adapter-&gt;CurrNumRecvDescs = 0;</div><div class='add'>+		Adapter-&gt;PrevNumRecvDescs = 0;</div><div class='add'>+		atomic_set(&amp;Adapter-&gt;cntrlpktCnt, 0);</div><div class='add'>+		Adapter-&gt;LinkUpStatus = 0;</div><div class='add'>+		Adapter-&gt;LinkStatus = 0;</div><div class='add'>+</div><div class='add'>+		if (Adapter-&gt;LEDInfo.led_thread_running &amp; BCM_LED_THREAD_RUNNING_ACTIVELY) {</div><div class='add'>+			Adapter-&gt;DriverState = FW_DOWNLOAD_DONE;</div><div class='add'>+			wake_up(&amp;Adapter-&gt;LEDInfo.notify_led_event);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (!timeout)</div><div class='add'>+			Status = -ENODEV;</div><div class='add'>+</div><div class='ctx'> 		up(&amp;Adapter-&gt;fw_download_sema);</div><div class='ctx'> 		up(&amp;Adapter-&gt;NVMRdmWrmLock);</div><div class='del'>-		break;</div><div class='add'>+		return Status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case IOCTL_BE_BUCKET_SIZE:</div><div class='hunk'>@@ -969,11 +999,15 @@ cntrlEnd:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case IOCTL_BCM_GET_DRIVER_VERSION: {</div><div class='add'>+		ulong len;</div><div class='add'>+</div><div class='ctx'> 		/* Copy Ioctl Buffer structure */</div><div class='ctx'> 		if (copy_from_user(&amp;IoBuffer, argp, sizeof(IOCTL_BUFFER)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		if (copy_to_user(IoBuffer.OutputBuffer, VER_FILEVERSION_STR, IoBuffer.OutputLength))</div><div class='add'>+		len = min_t(ulong, IoBuffer.OutputLength, strlen(VER_FILEVERSION_STR) + 1);</div><div class='add'>+</div><div class='add'>+		if (copy_to_user(IoBuffer.OutputBuffer, VER_FILEVERSION_STR, len))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		Status = STATUS_SUCCESS;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -985,8 +1019,7 @@ cntrlEnd:</div><div class='ctx'> 		/* Copy Ioctl Buffer structure */</div><div class='ctx'> 		if (copy_from_user(&amp;IoBuffer, argp, sizeof(IOCTL_BUFFER))) {</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "copy_from_user failed..\n");</div><div class='del'>-			Status = -EFAULT;</div><div class='del'>-			break;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (IoBuffer.OutputLength != sizeof(link_state)) {</div><div class='hunk'>@@ -1001,8 +1034,7 @@ cntrlEnd:</div><div class='ctx'> </div><div class='ctx'> 		if (copy_to_user(IoBuffer.OutputBuffer, &amp;link_state, min_t(size_t, sizeof(link_state), IoBuffer.OutputLength))) {</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy_to_user Failed..\n");</div><div class='del'>-			Status = -EFAULT;</div><div class='del'>-			break;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 		Status = STATUS_SUCCESS;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1068,8 +1100,10 @@ cntrlEnd:</div><div class='ctx'> 		GetDroppedAppCntrlPktMibs(temp_buff, pTarang);</div><div class='ctx'> </div><div class='ctx'> 		if (Status != STATUS_FAILURE)</div><div class='del'>-			if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, sizeof(S_MIBS_HOST_STATS_MIBS)))</div><div class='del'>-				Status = -EFAULT;</div><div class='add'>+			if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, sizeof(S_MIBS_HOST_STATS_MIBS))) {</div><div class='add'>+				kfree(temp_buff);</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 		kfree(temp_buff);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1103,7 +1137,9 @@ cntrlEnd:</div><div class='ctx'> 		if (copy_from_user(&amp;IoBuffer, argp, sizeof(IOCTL_BUFFER)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		/* FIXME: restrict length */</div><div class='add'>+		if (IoBuffer.InputLength &lt; sizeof(ULONG) * 2)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 		pvBuffer = kmalloc(IoBuffer.InputLength, GFP_KERNEL);</div><div class='ctx'> 		if (!pvBuffer)</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -1111,8 +1147,7 @@ cntrlEnd:</div><div class='ctx'> 		/* Get WrmBuffer structure */</div><div class='ctx'> 		if (copy_from_user(pvBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength)) {</div><div class='ctx'> 			kfree(pvBuffer);</div><div class='del'>-			Status = -EFAULT;</div><div class='del'>-			break;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		pBulkBuffer = (PBULKWRM_BUFFER)pvBuffer;</div><div class='hunk'>@@ -1242,8 +1277,7 @@ cntrlEnd:</div><div class='ctx'> 		memset(&amp;tv1, 0, sizeof(struct timeval));</div><div class='ctx'> 		if ((Adapter-&gt;eNVMType == NVM_FLASH) &amp;&amp; (Adapter-&gt;uiFlashLayoutMajorVersion == 0)) {</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "The Flash Control Section is Corrupted. Hence Rejection on NVM Read/Write\n");</div><div class='del'>-			Status = -EFAULT;</div><div class='del'>-			break;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (IsFlash2x(Adapter)) {</div><div class='hunk'>@@ -1252,7 +1286,7 @@ cntrlEnd:</div><div class='ctx'> 				(Adapter-&gt;eActiveDSD != DSD2)) {</div><div class='ctx'> </div><div class='ctx'> 				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "No DSD is active..hence NVM Command is blocked");</div><div class='del'>-				return STATUS_FAILURE ;</div><div class='add'>+				return STATUS_FAILURE;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1271,8 +1305,7 @@ cntrlEnd:</div><div class='ctx'> </div><div class='ctx'> 		if ((stNVMReadWrite.uiOffset + stNVMReadWrite.uiNumBytes) &gt; Adapter-&gt;uiNVMDSDSize) {</div><div class='ctx'> 			/* BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Can't allow access beyond NVM Size: 0x%x 0x%x\n", stNVMReadWrite.uiOffset, stNVMReadWrite.uiNumBytes); */</div><div class='del'>-			Status = STATUS_FAILURE;</div><div class='del'>-			break;</div><div class='add'>+			return STATUS_FAILURE;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		pReadData = kzalloc(stNVMReadWrite.uiNumBytes, GFP_KERNEL);</div><div class='hunk'>@@ -1280,9 +1313,8 @@ cntrlEnd:</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 		if (copy_from_user(pReadData, stNVMReadWrite.pBuffer, stNVMReadWrite.uiNumBytes)) {</div><div class='del'>-			Status = -EFAULT;</div><div class='ctx'> 			kfree(pReadData);</div><div class='del'>-			break;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		do_gettimeofday(&amp;tv0);</div><div class='hunk'>@@ -1309,7 +1341,7 @@ cntrlEnd:</div><div class='ctx'> </div><div class='ctx'> 			if (copy_to_user(stNVMReadWrite.pBuffer, pReadData, stNVMReadWrite.uiNumBytes)) {</div><div class='ctx'> 				kfree(pReadData);</div><div class='del'>-				Status = -EFAULT;</div><div class='add'>+				return -EFAULT;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			down(&amp;Adapter-&gt;NVMRdmWrmLock);</div><div class='hunk'>@@ -1377,9 +1409,8 @@ cntrlEnd:</div><div class='ctx'> 		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, " timetaken by Write/read :%ld msec\n", (tv1.tv_sec - tv0.tv_sec)*1000 + (tv1.tv_usec - tv0.tv_usec)/1000);</div><div class='ctx'> </div><div class='ctx'> 		kfree(pReadData);</div><div class='del'>-		Status = STATUS_SUCCESS;</div><div class='add'>+		return STATUS_SUCCESS;</div><div class='ctx'> 	}</div><div class='del'>-	break;</div><div class='ctx'> </div><div class='ctx'> 	case IOCTL_BCM_FLASH2X_SECTION_READ: {</div><div class='ctx'> 		FLASH2X_READWRITE sFlash2xRead = {0};</div><div class='hunk'>@@ -1456,7 +1487,9 @@ cntrlEnd:</div><div class='ctx'> 			Status = copy_to_user(OutPutBuff, pReadBuff, ReadBytes);</div><div class='ctx'> 			if (Status) {</div><div class='ctx'> 				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Copy to use failed with status :%d", Status);</div><div class='del'>-				break;</div><div class='add'>+				up(&amp;Adapter-&gt;NVMRdmWrmLock);</div><div class='add'>+				kfree(pReadBuff);</div><div class='add'>+				return -EFAULT;</div><div class='ctx'> 			}</div><div class='ctx'> 			NOB = NOB - ReadBytes;</div><div class='ctx'> 			if (NOB) {</div><div class='hunk'>@@ -1548,7 +1581,9 @@ cntrlEnd:</div><div class='ctx'> 			Status = copy_from_user(pWriteBuff, InputAddr, WriteBytes);</div><div class='ctx'> 			if (Status) {</div><div class='ctx'> 				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy to user failed with status :%d", Status);</div><div class='del'>-				break;</div><div class='add'>+				up(&amp;Adapter-&gt;NVMRdmWrmLock);</div><div class='add'>+				kfree(pWriteBuff);</div><div class='add'>+				return -EFAULT;</div><div class='ctx'> 			}</div><div class='ctx'> 			BCM_DEBUG_PRINT_BUFFER(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, pWriteBuff, WriteBytes);</div><div class='ctx'> </div><div class='hunk'>@@ -1608,8 +1643,10 @@ cntrlEnd:</div><div class='ctx'> </div><div class='ctx'> 		BcmGetFlash2xSectionalBitMap(Adapter, psFlash2xBitMap);</div><div class='ctx'> 		up(&amp;Adapter-&gt;NVMRdmWrmLock);</div><div class='del'>-		if (copy_to_user(IoBuffer.OutputBuffer, psFlash2xBitMap, sizeof(FLASH2X_BITMAP)))</div><div class='del'>-			Status = -EFAULT;</div><div class='add'>+		if (copy_to_user(IoBuffer.OutputBuffer, psFlash2xBitMap, sizeof(FLASH2X_BITMAP))) {</div><div class='add'>+			kfree(psFlash2xBitMap);</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		kfree(psFlash2xBitMap);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1627,13 +1664,13 @@ cntrlEnd:</div><div class='ctx'> 		Status = copy_from_user(&amp;IoBuffer, argp, sizeof(IOCTL_BUFFER));</div><div class='ctx'> 		if (Status) {</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");</div><div class='del'>-			return Status;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		Status = copy_from_user(&amp;eFlash2xSectionVal, IoBuffer.InputBuffer, sizeof(INT));</div><div class='ctx'> 		if (Status) {</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of flash section val failed");</div><div class='del'>-			return Status;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		down(&amp;Adapter-&gt;NVMRdmWrmLock);</div><div class='hunk'>@@ -1677,13 +1714,13 @@ cntrlEnd:</div><div class='ctx'> 		Status = copy_from_user(&amp;IoBuffer, argp, sizeof(IOCTL_BUFFER));</div><div class='ctx'> 		if (Status) {</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed Status :%d", Status);</div><div class='del'>-			return Status;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		Status = copy_from_user(&amp;sCopySectStrut, IoBuffer.InputBuffer, sizeof(FLASH2X_COPY_SECTION));</div><div class='ctx'> 		if (Status) {</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of Copy_Section_Struct failed with Status :%d", Status);</div><div class='del'>-			return Status;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Source SEction :%x", sCopySectStrut.SrcSection);</div><div class='hunk'>@@ -1744,7 +1781,7 @@ cntrlEnd:</div><div class='ctx'> 		Status = copy_from_user(&amp;IoBuffer, argp, sizeof(IOCTL_BUFFER));</div><div class='ctx'> 		if (Status) {</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");</div><div class='del'>-			break;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (Adapter-&gt;eNVMType != NVM_FLASH) {</div><div class='hunk'>@@ -1783,12 +1820,12 @@ cntrlEnd:</div><div class='ctx'> 		Status = copy_from_user(&amp;IoBuffer, argp, sizeof(IOCTL_BUFFER));</div><div class='ctx'> 		if (Status) {</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");</div><div class='del'>-			return Status;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 		Status = copy_from_user(&amp;eFlash2xSectionVal, IoBuffer.InputBuffer, sizeof(INT));</div><div class='ctx'> 		if (Status) {</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of flash section val failed");</div><div class='del'>-			return Status;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Read Section :%d", eFlash2xSectionVal);</div><div class='hunk'>@@ -1830,8 +1867,7 @@ cntrlEnd:</div><div class='ctx'> 		/* Copy Ioctl Buffer structure */</div><div class='ctx'> 		if (copy_from_user(&amp;IoBuffer, argp, sizeof(IOCTL_BUFFER))) {</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "copy_from_user 1 failed\n");</div><div class='del'>-			Status = -EFAULT;</div><div class='del'>-			break;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (copy_from_user(&amp;stNVMRead, IoBuffer.OutputBuffer, sizeof(NVM_READWRITE)))</div><div class='hunk'>@@ -1886,7 +1922,9 @@ cntrlEnd:</div><div class='ctx'> 			Status = copy_to_user(OutPutBuff, pReadBuff, ReadBytes);</div><div class='ctx'> 			if (Status) {</div><div class='ctx'> 				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy to use failed with status :%d", Status);</div><div class='del'>-				break;</div><div class='add'>+				up(&amp;Adapter-&gt;NVMRdmWrmLock);</div><div class='add'>+				kfree(pReadBuff);</div><div class='add'>+				return -EFAULT;</div><div class='ctx'> 			}</div><div class='ctx'> 			NOB = NOB - ReadBytes;</div><div class='ctx'> 			if (NOB) {</div><div class='hunk'>@@ -1907,8 +1945,7 @@ cntrlEnd:</div><div class='ctx'> 		Status = copy_from_user(&amp;IoBuffer, argp, sizeof(IOCTL_BUFFER));</div><div class='ctx'> 		if (Status) {</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "copy of Ioctl buffer is failed from user space");</div><div class='del'>-			Status = -EFAULT;</div><div class='del'>-			break;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (IoBuffer.InputLength != sizeof(unsigned long)) {</div><div class='hunk'>@@ -1919,8 +1956,7 @@ cntrlEnd:</div><div class='ctx'> 		Status = copy_from_user(&amp;RxCntrlMsgBitMask, IoBuffer.InputBuffer, IoBuffer.InputLength);</div><div class='ctx'> 		if (Status) {</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "copy of control bit mask failed from user space");</div><div class='del'>-			Status = -EFAULT;</div><div class='del'>-			break;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\n Got user defined cntrl msg bit mask :%lx", RxCntrlMsgBitMask);</div><div class='ctx'> 		pTarang-&gt;RxCntrlMsgBitMask = RxCntrlMsgBitMask;</div><div class='head'>diff --git a/drivers/staging/bcm/HandleControlPacket.c b/drivers/staging/bcm/HandleControlPacket.c<br/>index 2b1e9e17e11c..b058e30b2ca6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/bcm/HandleControlPacket.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/HandleControlPacket.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/bcm/HandleControlPacket.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/bcm/HandleControlPacket.c</a></div><div class='hunk'>@@ -1,195 +1,208 @@</div><div class='ctx'> /**</div><div class='del'>-@file HandleControlPacket.c</div><div class='del'>-This file contains the routines to deal with</div><div class='del'>-sending and receiving of control packets.</div><div class='del'>-*/</div><div class='add'>+ * @file HandleControlPacket.c</div><div class='add'>+ * This file contains the routines to deal with</div><div class='add'>+ * sending and receiving of control packets.</div><div class='add'>+ */</div><div class='ctx'> #include "headers.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>-When a control packet is received, analyze the</div><div class='del'>-"status" and call appropriate response function.</div><div class='del'>-Enqueue the control packet for Application.</div><div class='del'>-@return None</div><div class='del'>-*/</div><div class='add'>+ * When a control packet is received, analyze the</div><div class='add'>+ * "status" and call appropriate response function.</div><div class='add'>+ * Enqueue the control packet for Application.</div><div class='add'>+ * @return None</div><div class='add'>+ */</div><div class='ctx'> static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	PPER_TARANG_DATA	pTarang = NULL;</div><div class='add'>+	PPER_TARANG_DATA pTarang = NULL;</div><div class='ctx'> 	BOOLEAN HighPriorityMessage = FALSE;</div><div class='del'>-	struct sk_buff * newPacket = NULL;</div><div class='add'>+	struct sk_buff *newPacket = NULL;</div><div class='ctx'> 	CHAR cntrl_msg_mask_bit = 0;</div><div class='del'>-	BOOLEAN drop_pkt_flag = TRUE ;</div><div class='add'>+	BOOLEAN drop_pkt_flag = TRUE;</div><div class='ctx'> 	USHORT usStatus = *(PUSHORT)(skb-&gt;data);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_pktdata(Adapter))</div><div class='ctx'> 		print_hex_dump(KERN_DEBUG, PFX "rx control: ", DUMP_PREFIX_NONE,</div><div class='del'>-			       16, 1, skb-&gt;data, skb-&gt;len, 0);</div><div class='del'>-</div><div class='del'>-	switch(usStatus)</div><div class='del'>-	{</div><div class='del'>-		case CM_RESPONSES:               // 0xA0</div><div class='del'>-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "MAC Version Seems to be Non Multi-Classifier, rejected by Driver");</div><div class='del'>-			HighPriorityMessage = TRUE ;</div><div class='del'>-			break;</div><div class='del'>-		case CM_CONTROL_NEWDSX_MULTICLASSIFIER_RESP:</div><div class='del'>-			HighPriorityMessage = TRUE ;</div><div class='del'>-			if(Adapter-&gt;LinkStatus==LINKUP_DONE)</div><div class='del'>-			{</div><div class='del'>-				CmControlResponseMessage(Adapter,(skb-&gt;data +sizeof(USHORT)));</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case LINK_CONTROL_RESP:          //0xA2</div><div class='del'>-		case STATUS_RSP:          //0xA1</div><div class='del'>-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL,"LINK_CONTROL_RESP");</div><div class='del'>-			HighPriorityMessage = TRUE ;</div><div class='del'>-			LinkControlResponseMessage(Adapter,(skb-&gt;data + sizeof(USHORT)));</div><div class='del'>-			break;</div><div class='del'>-		case STATS_POINTER_RESP:       //0xA6</div><div class='del'>-			HighPriorityMessage = TRUE ;</div><div class='del'>-			StatisticsResponse(Adapter, (skb-&gt;data + sizeof(USHORT)));</div><div class='del'>-			break;</div><div class='del'>-		case IDLE_MODE_STATUS:			//0xA3</div><div class='del'>-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL,"IDLE_MODE_STATUS Type Message Got from F/W");</div><div class='del'>-			InterfaceIdleModeRespond(Adapter, (PUINT)(skb-&gt;data +</div><div class='del'>-						sizeof(USHORT)));</div><div class='del'>-			HighPriorityMessage = TRUE ;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case AUTH_SS_HOST_MSG:</div><div class='del'>-			HighPriorityMessage = TRUE ;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	 	default:</div><div class='del'>-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL,"Got Default Response");</div><div class='del'>-			/* Let the Application Deal with This Packet */</div><div class='del'>-			break;</div><div class='add'>+				16, 1, skb-&gt;data, skb-&gt;len, 0);</div><div class='add'>+</div><div class='add'>+	switch (usStatus) {</div><div class='add'>+	case CM_RESPONSES:               /* 0xA0 */</div><div class='add'>+		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT,</div><div class='add'>+			DBG_LVL_ALL,</div><div class='add'>+			"MAC Version Seems to be Non Multi-Classifier, rejected by Driver");</div><div class='add'>+		HighPriorityMessage = TRUE;</div><div class='add'>+		break;</div><div class='add'>+	case CM_CONTROL_NEWDSX_MULTICLASSIFIER_RESP:</div><div class='add'>+		HighPriorityMessage = TRUE;</div><div class='add'>+		if (Adapter-&gt;LinkStatus == LINKUP_DONE)</div><div class='add'>+			CmControlResponseMessage(Adapter,</div><div class='add'>+				(skb-&gt;data + sizeof(USHORT)));</div><div class='add'>+		break;</div><div class='add'>+	case LINK_CONTROL_RESP:          /* 0xA2 */</div><div class='add'>+	case STATUS_RSP:                 /* 0xA1 */</div><div class='add'>+		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT,</div><div class='add'>+			DBG_LVL_ALL, "LINK_CONTROL_RESP");</div><div class='add'>+		HighPriorityMessage = TRUE;</div><div class='add'>+		LinkControlResponseMessage(Adapter,</div><div class='add'>+			(skb-&gt;data + sizeof(USHORT)));</div><div class='add'>+		break;</div><div class='add'>+	case STATS_POINTER_RESP:         /* 0xA6 */</div><div class='add'>+		HighPriorityMessage = TRUE;</div><div class='add'>+		StatisticsResponse(Adapter, (skb-&gt;data + sizeof(USHORT)));</div><div class='add'>+		break;</div><div class='add'>+	case IDLE_MODE_STATUS:           /* 0xA3 */</div><div class='add'>+		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT,</div><div class='add'>+			DBG_LVL_ALL,</div><div class='add'>+			"IDLE_MODE_STATUS Type Message Got from F/W");</div><div class='add'>+		InterfaceIdleModeRespond(Adapter, (PUINT)(skb-&gt;data +</div><div class='add'>+					sizeof(USHORT)));</div><div class='add'>+		HighPriorityMessage = TRUE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AUTH_SS_HOST_MSG:</div><div class='add'>+		HighPriorityMessage = TRUE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT,</div><div class='add'>+			DBG_LVL_ALL, "Got Default Response");</div><div class='add'>+		/* Let the Application Deal with This Packet */</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	//Queue The Control Packet to The Application Queues</div><div class='add'>+	/* Queue The Control Packet to The Application Queues */</div><div class='ctx'> 	down(&amp;Adapter-&gt;RxAppControlQueuelock);</div><div class='ctx'> </div><div class='del'>-	for (pTarang = Adapter-&gt;pTarangs; pTarang; pTarang = pTarang-&gt;next)</div><div class='del'>-    {</div><div class='del'>-       	if(Adapter-&gt;device_removed)</div><div class='del'>-		{</div><div class='add'>+	for (pTarang = Adapter-&gt;pTarangs; pTarang; pTarang = pTarang-&gt;next) {</div><div class='add'>+		if (Adapter-&gt;device_removed)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		drop_pkt_flag = TRUE ;</div><div class='add'>+		drop_pkt_flag = TRUE;</div><div class='ctx'> 		/*</div><div class='del'>-			There are cntrl msg from A0 to AC. It has been mapped to 0 to C bit in the cntrl mask.</div><div class='del'>-			Also, by default AD to BF has been masked to the rest of the bits... which wil be ON by default.</div><div class='del'>-			if mask bit is enable to particular pkt status, send it out to app else stop it.</div><div class='del'>-		*/</div><div class='add'>+		 * There are cntrl msg from A0 to AC. It has been mapped to 0 to</div><div class='add'>+		 * C bit in the cntrl mask.</div><div class='add'>+		 * Also, by default AD to BF has been masked to the rest of the</div><div class='add'>+		 * bits... which wil be ON by default.</div><div class='add'>+		 * if mask bit is enable to particular pkt status, send it out</div><div class='add'>+		 * to app else stop it.</div><div class='add'>+		 */</div><div class='ctx'> 		cntrl_msg_mask_bit = (usStatus &amp; 0x1F);</div><div class='del'>-		//printk("\ninew  msg  mask bit which is disable in mask:%X", cntrl_msg_mask_bit);</div><div class='del'>-		if(pTarang-&gt;RxCntrlMsgBitMask &amp; (1&lt;&lt;cntrl_msg_mask_bit))</div><div class='del'>-				drop_pkt_flag = FALSE;</div><div class='del'>-</div><div class='del'>-		if ((drop_pkt_flag == TRUE)  || (pTarang-&gt;AppCtrlQueueLen &gt; MAX_APP_QUEUE_LEN) ||</div><div class='del'>-					((pTarang-&gt;AppCtrlQueueLen &gt; MAX_APP_QUEUE_LEN/2) &amp;&amp; (HighPriorityMessage == FALSE)))</div><div class='del'>-		{</div><div class='add'>+		/*</div><div class='add'>+		 * printk("\ninew  msg  mask bit which is disable in mask:%X",</div><div class='add'>+		 *	cntrl_msg_mask_bit);</div><div class='add'>+		 */</div><div class='add'>+		if (pTarang-&gt;RxCntrlMsgBitMask &amp; (1 &lt;&lt; cntrl_msg_mask_bit))</div><div class='add'>+			drop_pkt_flag = FALSE;</div><div class='add'>+</div><div class='add'>+		if ((drop_pkt_flag == TRUE) ||</div><div class='add'>+				(pTarang-&gt;AppCtrlQueueLen &gt; MAX_APP_QUEUE_LEN)</div><div class='add'>+				|| ((pTarang-&gt;AppCtrlQueueLen &gt;</div><div class='add'>+					MAX_APP_QUEUE_LEN / 2) &amp;&amp;</div><div class='add'>+				    (HighPriorityMessage == FALSE))) {</div><div class='ctx'> 			/*</div><div class='del'>-				Assumption:-</div><div class='del'>-				1. every tarang manages it own dropped pkt statitistics</div><div class='del'>-				2. Total packet dropped per tarang will be equal to the sum of all types of dropped</div><div class='del'>-					pkt by that tarang only.</div><div class='del'>-</div><div class='del'>-			*/</div><div class='del'>-			switch(*(PUSHORT)skb-&gt;data)</div><div class='del'>-			{</div><div class='del'>-				case CM_RESPONSES:</div><div class='del'>-					pTarang-&gt;stDroppedAppCntrlMsgs.cm_responses++;</div><div class='del'>-					break;</div><div class='del'>-				case CM_CONTROL_NEWDSX_MULTICLASSIFIER_RESP:</div><div class='del'>-				 pTarang-&gt;stDroppedAppCntrlMsgs.cm_control_newdsx_multiclassifier_resp++;</div><div class='del'>-					 break;</div><div class='del'>-				case LINK_CONTROL_RESP:</div><div class='del'>-					pTarang-&gt;stDroppedAppCntrlMsgs.link_control_resp++;</div><div class='del'>-					break;</div><div class='del'>-				case STATUS_RSP:</div><div class='del'>-					pTarang-&gt;stDroppedAppCntrlMsgs.status_rsp++;</div><div class='del'>-					break;</div><div class='del'>-				case STATS_POINTER_RESP:</div><div class='del'>-					pTarang-&gt;stDroppedAppCntrlMsgs.stats_pointer_resp++;</div><div class='del'>-					break;</div><div class='del'>-				case IDLE_MODE_STATUS:</div><div class='del'>-					pTarang-&gt;stDroppedAppCntrlMsgs.idle_mode_status++ ;</div><div class='del'>-					break;</div><div class='del'>-				case AUTH_SS_HOST_MSG:</div><div class='del'>-					pTarang-&gt;stDroppedAppCntrlMsgs.auth_ss_host_msg++ ;</div><div class='del'>-					break;</div><div class='add'>+			 * Assumption:-</div><div class='add'>+			 * 1. every tarang manages it own dropped pkt</div><div class='add'>+			 *    statitistics</div><div class='add'>+			 * 2. Total packet dropped per tarang will be equal to</div><div class='add'>+			 *    the sum of all types of dropped pkt by that</div><div class='add'>+			 *    tarang only.</div><div class='add'>+			 */</div><div class='add'>+			switch (*(PUSHORT)skb-&gt;data) {</div><div class='add'>+			case CM_RESPONSES:</div><div class='add'>+				pTarang-&gt;stDroppedAppCntrlMsgs.cm_responses++;</div><div class='add'>+				break;</div><div class='add'>+			case CM_CONTROL_NEWDSX_MULTICLASSIFIER_RESP:</div><div class='add'>+				pTarang-&gt;stDroppedAppCntrlMsgs.cm_control_newdsx_multiclassifier_resp++;</div><div class='add'>+				break;</div><div class='add'>+			case LINK_CONTROL_RESP:</div><div class='add'>+				pTarang-&gt;stDroppedAppCntrlMsgs.link_control_resp++;</div><div class='add'>+				break;</div><div class='add'>+			case STATUS_RSP:</div><div class='add'>+				pTarang-&gt;stDroppedAppCntrlMsgs.status_rsp++;</div><div class='add'>+				break;</div><div class='add'>+			case STATS_POINTER_RESP:</div><div class='add'>+				pTarang-&gt;stDroppedAppCntrlMsgs.stats_pointer_resp++;</div><div class='add'>+				break;</div><div class='add'>+			case IDLE_MODE_STATUS:</div><div class='add'>+				pTarang-&gt;stDroppedAppCntrlMsgs.idle_mode_status++;</div><div class='add'>+				break;</div><div class='add'>+			case AUTH_SS_HOST_MSG:</div><div class='add'>+				pTarang-&gt;stDroppedAppCntrlMsgs.auth_ss_host_msg++;</div><div class='add'>+				break;</div><div class='ctx'> 			default:</div><div class='del'>-					pTarang-&gt;stDroppedAppCntrlMsgs.low_priority_message++ ;</div><div class='del'>-					break;</div><div class='add'>+				pTarang-&gt;stDroppedAppCntrlMsgs.low_priority_message++;</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-        newPacket = skb_clone(skb, GFP_KERNEL);</div><div class='del'>-        if (!newPacket)</div><div class='del'>-           break;</div><div class='del'>-        ENQUEUEPACKET(pTarang-&gt;RxAppControlHead,pTarang-&gt;RxAppControlTail,</div><div class='del'>-				newPacket);</div><div class='del'>-        pTarang-&gt;AppCtrlQueueLen++;</div><div class='del'>-    }</div><div class='add'>+		newPacket = skb_clone(skb, GFP_KERNEL);</div><div class='add'>+		if (!newPacket)</div><div class='add'>+			break;</div><div class='add'>+		ENQUEUEPACKET(pTarang-&gt;RxAppControlHead,</div><div class='add'>+				pTarang-&gt;RxAppControlTail, newPacket);</div><div class='add'>+		pTarang-&gt;AppCtrlQueueLen++;</div><div class='add'>+	}</div><div class='ctx'> 	up(&amp;Adapter-&gt;RxAppControlQueuelock);</div><div class='del'>-    wake_up(&amp;Adapter-&gt;process_read_wait_queue);</div><div class='del'>-    dev_kfree_skb(skb);</div><div class='del'>-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "After wake_up_interruptible");</div><div class='add'>+	wake_up(&amp;Adapter-&gt;process_read_wait_queue);</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL,</div><div class='add'>+			"After wake_up_interruptible");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>-@ingroup ctrl_pkt_functions</div><div class='del'>-Thread to handle control pkt reception</div><div class='del'>-*/</div><div class='del'>-int control_packet_handler  (PMINI_ADAPTER Adapter  /**&lt; pointer to adapter object*/</div><div class='del'>-						)</div><div class='add'>+ * @ingroup ctrl_pkt_functions</div><div class='add'>+ * Thread to handle control pkt reception</div><div class='add'>+ */</div><div class='add'>+int control_packet_handler(PMINI_ADAPTER Adapter /* pointer to adapter object*/)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *ctrl_packet= NULL;</div><div class='add'>+	struct sk_buff *ctrl_packet = NULL;</div><div class='ctx'> 	unsigned long flags = 0;</div><div class='del'>-	//struct timeval tv ;</div><div class='del'>-	//int *puiBuffer = NULL ;</div><div class='del'>-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "Entering to make thread wait on control packet event!");</div><div class='del'>-	while(1)</div><div class='del'>-	{</div><div class='add'>+	/* struct timeval tv; */</div><div class='add'>+	/* int *puiBuffer = NULL; */</div><div class='add'>+	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL,</div><div class='add'>+		"Entering to make thread wait on control packet event!");</div><div class='add'>+	while (1) {</div><div class='ctx'> 		wait_event_interruptible(Adapter-&gt;process_rx_cntrlpkt,</div><div class='del'>-								 atomic_read(&amp;Adapter-&gt;cntrlpktCnt) ||</div><div class='del'>-								 Adapter-&gt;bWakeUpDevice ||</div><div class='del'>-								 kthread_should_stop()</div><div class='del'>-								);</div><div class='add'>+			atomic_read(&amp;Adapter-&gt;cntrlpktCnt) ||</div><div class='add'>+			Adapter-&gt;bWakeUpDevice ||</div><div class='add'>+			kthread_should_stop());</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-		if(kthread_should_stop())</div><div class='del'>-		{</div><div class='del'>-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "Exiting \n");</div><div class='add'>+		if (kthread_should_stop()) {</div><div class='add'>+			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT,</div><div class='add'>+				DBG_LVL_ALL, "Exiting\n");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		if(TRUE == Adapter-&gt;bWakeUpDevice)</div><div class='del'>-		{</div><div class='add'>+		if (TRUE == Adapter-&gt;bWakeUpDevice) {</div><div class='ctx'> 			Adapter-&gt;bWakeUpDevice = FALSE;</div><div class='del'>-			if((FALSE == Adapter-&gt;bTriedToWakeUpFromlowPowerMode) &amp;&amp;</div><div class='del'>-				((TRUE == Adapter-&gt;IdleMode)|| (TRUE == Adapter-&gt;bShutStatus)))</div><div class='del'>-			{</div><div class='del'>-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "Calling InterfaceAbortIdlemode\n");</div><div class='del'>-	//			Adapter-&gt;bTriedToWakeUpFromlowPowerMode = TRUE;</div><div class='del'>-				InterfaceIdleModeWakeup (Adapter);</div><div class='add'>+			if ((FALSE == Adapter-&gt;bTriedToWakeUpFromlowPowerMode)</div><div class='add'>+					&amp;&amp; ((TRUE == Adapter-&gt;IdleMode) ||</div><div class='add'>+					    (TRUE == Adapter-&gt;bShutStatus))) {</div><div class='add'>+				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,</div><div class='add'>+					CP_CTRL_PKT, DBG_LVL_ALL,</div><div class='add'>+					"Calling InterfaceAbortIdlemode\n");</div><div class='add'>+				/*</div><div class='add'>+				 * Adapter-&gt;bTriedToWakeUpFromlowPowerMode</div><div class='add'>+				 *					= TRUE;</div><div class='add'>+				 */</div><div class='add'>+				InterfaceIdleModeWakeup(Adapter);</div><div class='ctx'> 			}</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		while(atomic_read(&amp;Adapter-&gt;cntrlpktCnt))</div><div class='del'>-		{</div><div class='add'>+		while (atomic_read(&amp;Adapter-&gt;cntrlpktCnt)) {</div><div class='ctx'> 			spin_lock_irqsave(&amp;Adapter-&gt;control_queue_lock, flags);</div><div class='ctx'> 			ctrl_packet = Adapter-&gt;RxControlHead;</div><div class='del'>-			if(ctrl_packet)</div><div class='del'>-			{</div><div class='del'>-				DEQUEUEPACKET(Adapter-&gt;RxControlHead,Adapter-&gt;RxControlTail);</div><div class='del'>-//				Adapter-&gt;RxControlHead=ctrl_packet-&gt;next;</div><div class='add'>+			if (ctrl_packet) {</div><div class='add'>+				DEQUEUEPACKET(Adapter-&gt;RxControlHead,</div><div class='add'>+					Adapter-&gt;RxControlTail);</div><div class='add'>+				/* Adapter-&gt;RxControlHead=ctrl_packet-&gt;next; */</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			spin_unlock_irqrestore (&amp;Adapter-&gt;control_queue_lock, flags);</div><div class='del'>-		 	handle_rx_control_packet(Adapter, ctrl_packet);</div><div class='add'>+			spin_unlock_irqrestore(&amp;Adapter-&gt;control_queue_lock,</div><div class='add'>+						flags);</div><div class='add'>+			handle_rx_control_packet(Adapter, ctrl_packet);</div><div class='ctx'> 			atomic_dec(&amp;Adapter-&gt;cntrlpktCnt);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -201,22 +214,22 @@ int control_packet_handler  (PMINI_ADAPTER Adapter  /**&lt; pointer to adapter obje</div><div class='ctx'> INT flushAllAppQ(void)</div><div class='ctx'> {</div><div class='ctx'> 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);</div><div class='del'>-	PPER_TARANG_DATA	pTarang = NULL;</div><div class='add'>+	PPER_TARANG_DATA pTarang = NULL;</div><div class='ctx'> 	struct sk_buff *PacketToDrop = NULL;</div><div class='del'>-	for(pTarang = Adapter-&gt;pTarangs; pTarang; pTarang = pTarang-&gt;next)</div><div class='del'>-	{</div><div class='del'>-		while(pTarang-&gt;RxAppControlHead != NULL)</div><div class='del'>-		{</div><div class='del'>-			PacketToDrop=pTarang-&gt;RxAppControlHead;</div><div class='del'>-			DEQUEUEPACKET(pTarang-&gt;RxAppControlHead,pTarang-&gt;RxAppControlTail);</div><div class='add'>+	for (pTarang = Adapter-&gt;pTarangs; pTarang; pTarang = pTarang-&gt;next) {</div><div class='add'>+		while (pTarang-&gt;RxAppControlHead != NULL) {</div><div class='add'>+			PacketToDrop = pTarang-&gt;RxAppControlHead;</div><div class='add'>+			DEQUEUEPACKET(pTarang-&gt;RxAppControlHead,</div><div class='add'>+					pTarang-&gt;RxAppControlTail);</div><div class='ctx'> 			dev_kfree_skb(PacketToDrop);</div><div class='ctx'> 		}</div><div class='ctx'> 		pTarang-&gt;AppCtrlQueueLen = 0;</div><div class='del'>-		//dropped contrl packet statistics also should be reset.</div><div class='del'>-		memset((PVOID)&amp;pTarang-&gt;stDroppedAppCntrlMsgs, 0, sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));</div><div class='add'>+		/* dropped contrl packet statistics also should be reset. */</div><div class='add'>+		memset((PVOID)&amp;pTarang-&gt;stDroppedAppCntrlMsgs, 0,</div><div class='add'>+			sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='del'>-	return STATUS_SUCCESS ;</div><div class='add'>+	return STATUS_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/bcm/InterfaceDld.c b/drivers/staging/bcm/InterfaceDld.c<br/>index bcd86bbef2fd..65c352f35681 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/bcm/InterfaceDld.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/InterfaceDld.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/bcm/InterfaceDld.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/bcm/InterfaceDld.c</a></div><div class='hunk'>@@ -62,6 +62,7 @@ int InterfaceFileReadbackFromChip(PVOID arg, struct file *flp, unsigned int on_c</div><div class='ctx'> 	static int fw_down;</div><div class='ctx'> 	INT Status = STATUS_SUCCESS;</div><div class='ctx'> 	PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)arg;</div><div class='add'>+	int bytes;</div><div class='ctx'> </div><div class='ctx'> 	buff = kmalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_DMA);</div><div class='ctx'> 	buff_readback = kmalloc(MAX_TRANSFER_CTRL_BYTE_USB , GFP_DMA);</div><div class='hunk'>@@ -94,8 +95,9 @@ int InterfaceFileReadbackFromChip(PVOID arg, struct file *flp, unsigned int on_c</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		Status = InterfaceRDM(psIntfAdapter, on_chip_loc, buff_readback, len);</div><div class='del'>-		if (Status) {</div><div class='add'>+		bytes = InterfaceRDM(psIntfAdapter, on_chip_loc, buff_readback, len);</div><div class='add'>+		if (bytes &lt; 0) {</div><div class='add'>+			Status = bytes;</div><div class='ctx'> 			BCM_DEBUG_PRINT(psIntfAdapter-&gt;psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "RDM of len %d Failed! %d", len, reg);</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -302,6 +304,7 @@ static INT buffRdbkVerify(PMINI_ADAPTER Adapter, PUCHAR mappedbuffer, UINT u32Fi</div><div class='ctx'> 	UINT len = u32FirmwareLength;</div><div class='ctx'> 	INT retval = STATUS_SUCCESS;</div><div class='ctx'> 	PUCHAR readbackbuff = kzalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL);</div><div class='add'>+	int bytes;</div><div class='ctx'> </div><div class='ctx'> 	if (NULL == readbackbuff) {</div><div class='ctx'> 		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "MEMORY ALLOCATION FAILED");</div><div class='hunk'>@@ -310,9 +313,10 @@ static INT buffRdbkVerify(PMINI_ADAPTER Adapter, PUCHAR mappedbuffer, UINT u32Fi</div><div class='ctx'> </div><div class='ctx'> 	while (u32FirmwareLength &amp;&amp; !retval) {</div><div class='ctx'> 		len = MIN_VAL(u32FirmwareLength, MAX_TRANSFER_CTRL_BYTE_USB);</div><div class='del'>-		retval = rdm(Adapter, u32StartingAddress, readbackbuff, len);</div><div class='add'>+		bytes = rdm(Adapter, u32StartingAddress, readbackbuff, len);</div><div class='ctx'> </div><div class='del'>-		if (retval) {</div><div class='add'>+		if (bytes &lt; 0) {</div><div class='add'>+			retval = bytes;</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "rdm failed with status %d", retval);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/staging/bcm/InterfaceIdleMode.c b/drivers/staging/bcm/InterfaceIdleMode.c<br/>index 96fa4ead7930..faeb03e62c06 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/bcm/InterfaceIdleMode.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/InterfaceIdleMode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/bcm/InterfaceIdleMode.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/bcm/InterfaceIdleMode.c</a></div><div class='hunk'>@@ -46,6 +46,7 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer)</div><div class='ctx'> {</div><div class='ctx'> 	int	status = STATUS_SUCCESS;</div><div class='ctx'> 	unsigned int	uiRegRead = 0;</div><div class='add'>+	int bytes;</div><div class='ctx'> </div><div class='ctx'> 	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL,"SubType of Message :0x%X", ntohl(*puiBuffer));</div><div class='ctx'> </div><div class='hunk'>@@ -77,16 +78,16 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer)</div><div class='ctx'> 			else if(Adapter-&gt;ulPowerSaveMode != DEVICE_POWERSAVE_MODE_AS_PROTOCOL_IDLE_MODE)</div><div class='ctx'> 			{</div><div class='ctx'> 				//clear on read Register</div><div class='del'>-				status = rdmalt(Adapter, DEVICE_INT_OUT_EP_REG0, &amp;uiRegRead, sizeof(uiRegRead));</div><div class='del'>-				if(status)</div><div class='del'>-				{</div><div class='add'>+				bytes = rdmalt(Adapter, DEVICE_INT_OUT_EP_REG0, &amp;uiRegRead, sizeof(uiRegRead));</div><div class='add'>+				if (bytes &lt; 0) {</div><div class='add'>+					status = bytes;</div><div class='ctx'> 					BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "rdm failed while clearing H/W Abort Reg0");</div><div class='ctx'> 					return status;</div><div class='ctx'> 				}</div><div class='ctx'> 				//clear on read Register</div><div class='del'>-				status = rdmalt (Adapter, DEVICE_INT_OUT_EP_REG1, &amp;uiRegRead, sizeof(uiRegRead));</div><div class='del'>-				if(status)</div><div class='del'>-				{</div><div class='add'>+				bytes = rdmalt(Adapter, DEVICE_INT_OUT_EP_REG1, &amp;uiRegRead, sizeof(uiRegRead));</div><div class='add'>+				if (bytes &lt; 0) {</div><div class='add'>+					status = bytes;</div><div class='ctx'> 					BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "rdm failed while clearing H/W Abort	Reg1");</div><div class='ctx'> 					return status;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -117,9 +118,9 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer)</div><div class='ctx'> 					Adapter-&gt;chip_id== BCS220_3)</div><div class='ctx'> 			{</div><div class='ctx'> </div><div class='del'>-				status = rdmalt(Adapter, HPM_CONFIG_MSW, &amp;uiRegRead, sizeof(uiRegRead));</div><div class='del'>-				if(status)</div><div class='del'>-				{</div><div class='add'>+				bytes = rdmalt(Adapter, HPM_CONFIG_MSW, &amp;uiRegRead, sizeof(uiRegRead));</div><div class='add'>+				if (bytes &lt; 0) {</div><div class='add'>+					status = bytes;</div><div class='ctx'> 					BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL, "rdm failed while Reading HPM_CONFIG_LDO145 Reg 0\n");</div><div class='ctx'> 					return status;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -266,6 +267,8 @@ void InterfaceHandleShutdownModeWakeup(PMINI_ADAPTER Adapter)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int uiRegVal = 0;</div><div class='ctx'> 	INT Status = 0;</div><div class='add'>+	int bytes;</div><div class='add'>+</div><div class='ctx'> 	if(Adapter-&gt;ulPowerSaveMode == DEVICE_POWERSAVE_MODE_AS_MANUAL_CLOCK_GATING)</div><div class='ctx'> 	{</div><div class='ctx'> 		// clear idlemode interrupt.</div><div class='hunk'>@@ -282,16 +285,16 @@ void InterfaceHandleShutdownModeWakeup(PMINI_ADAPTER Adapter)</div><div class='ctx'> 	{</div><div class='ctx'> </div><div class='ctx'>         //clear Interrupt EP registers.</div><div class='del'>-		Status = rdmalt(Adapter,DEVICE_INT_OUT_EP_REG0, &amp;uiRegVal, sizeof(uiRegVal));</div><div class='del'>-		if(Status)</div><div class='del'>-		{</div><div class='add'>+		bytes = rdmalt(Adapter,DEVICE_INT_OUT_EP_REG0, &amp;uiRegVal, sizeof(uiRegVal));</div><div class='add'>+		if (bytes &lt; 0) {</div><div class='add'>+			Status = bytes;</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"RDM of DEVICE_INT_OUT_EP_REG0 failed with Err :%d", Status);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-        Status = rdmalt(Adapter,DEVICE_INT_OUT_EP_REG1, &amp;uiRegVal, sizeof(uiRegVal));</div><div class='del'>-		if(Status)</div><div class='del'>-		{</div><div class='add'>+		bytes = rdmalt(Adapter,DEVICE_INT_OUT_EP_REG1, &amp;uiRegVal, sizeof(uiRegVal));</div><div class='add'>+		if (bytes &lt; 0) {</div><div class='add'>+			Status = bytes;</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"RDM of DEVICE_INT_OUT_EP_REG1 failed with Err :%d", Status);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c<br/>index a09d35108f04..8e3c586a699c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/bcm/InterfaceInit.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/InterfaceInit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/bcm/InterfaceInit.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/bcm/InterfaceInit.c</a></div><div class='hunk'>@@ -68,7 +68,7 @@ static void InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter)</div><div class='ctx'> static void ConfigureEndPointTypesThroughEEPROM(PMINI_ADAPTER Adapter)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ulReg = 0;</div><div class='del'>-	int ret;</div><div class='add'>+	int bytes;</div><div class='ctx'> </div><div class='ctx'> 	/* Program EP2 MAX_PKT_SIZE */</div><div class='ctx'> 	ulReg = ntohl(EP2_MPS_REG);</div><div class='hunk'>@@ -94,8 +94,8 @@ static void ConfigureEndPointTypesThroughEEPROM(PMINI_ADAPTER Adapter)</div><div class='ctx'> 	BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&amp;ulReg, 0x140, 4, TRUE);</div><div class='ctx'> </div><div class='ctx'> 	/* Program TX EP as interrupt(Alternate Setting) */</div><div class='del'>-	ret = rdmalt(Adapter, 0x0F0110F8, (u32 *)&amp;ulReg, sizeof(u32));</div><div class='del'>-	if (ret) {</div><div class='add'>+	bytes = rdmalt(Adapter, 0x0F0110F8, (u32 *)&amp;ulReg, sizeof(u32));</div><div class='add'>+	if (bytes &lt; 0) {</div><div class='ctx'> 		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,</div><div class='ctx'> 			"reading of Tx EP failed\n");</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -430,6 +430,7 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)</div><div class='ctx'> 	int usedIntOutForBulkTransfer = 0 ;</div><div class='ctx'> 	BOOLEAN bBcm16 = FALSE;</div><div class='ctx'> 	UINT uiData = 0;</div><div class='add'>+	int bytes;</div><div class='ctx'> </div><div class='ctx'> 	/* Store the usb dev into interface adapter */</div><div class='ctx'> 	psIntfAdapter-&gt;udev = usb_get_dev(interface_to_usbdev(psIntfAdapter-&gt;interface));</div><div class='hunk'>@@ -438,9 +439,10 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)</div><div class='ctx'> 	psIntfAdapter-&gt;psAdapter-&gt;interface_rdm = BcmRDM;</div><div class='ctx'> 	psIntfAdapter-&gt;psAdapter-&gt;interface_wrm = BcmWRM;</div><div class='ctx'> </div><div class='del'>-	retval = rdmalt(psIntfAdapter-&gt;psAdapter, CHIP_ID_REG,</div><div class='add'>+	bytes = rdmalt(psIntfAdapter-&gt;psAdapter, CHIP_ID_REG,</div><div class='ctx'> 			(u32 *)&amp;(psIntfAdapter-&gt;psAdapter-&gt;chip_id), sizeof(u32));</div><div class='del'>-	if (retval) {</div><div class='add'>+	if (bytes &lt; 0) {</div><div class='add'>+		retval = bytes;</div><div class='ctx'> 		BCM_DEBUG_PRINT(psIntfAdapter-&gt;psAdapter, DBG_TYPE_PRINTK, 0, 0, "CHIP ID Read Failed\n");</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/staging/bcm/InterfaceMisc.c b/drivers/staging/bcm/InterfaceMisc.c<br/>index 61f878b4f56c..2218faeaf8ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/bcm/InterfaceMisc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/InterfaceMisc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/bcm/InterfaceMisc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/bcm/InterfaceMisc.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@ INT InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,</div><div class='ctx'> 		PVOID buff,</div><div class='ctx'> 		INT len)</div><div class='ctx'> {</div><div class='del'>-	int retval = 0;</div><div class='add'>+	int bytes;</div><div class='ctx'> 	USHORT usRetries = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (psIntfAdapter == NULL) {</div><div class='hunk'>@@ -30,7 +30,7 @@ INT InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,</div><div class='ctx'> 	psIntfAdapter-&gt;psAdapter-&gt;DeviceAccess = TRUE;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		retval = usb_control_msg(psIntfAdapter-&gt;udev,</div><div class='add'>+		bytes = usb_control_msg(psIntfAdapter-&gt;udev,</div><div class='ctx'> 					usb_rcvctrlpipe(psIntfAdapter-&gt;udev, 0),</div><div class='ctx'> 					0x02,</div><div class='ctx'> 					0xC2,</div><div class='hunk'>@@ -41,22 +41,20 @@ INT InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,</div><div class='ctx'> 					5000);</div><div class='ctx'> </div><div class='ctx'> 		usRetries++;</div><div class='del'>-		if (-ENODEV == retval) {</div><div class='add'>+		if (-ENODEV == bytes) {</div><div class='ctx'> 			psIntfAdapter-&gt;psAdapter-&gt;device_removed = TRUE;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	} while ((retval &lt; 0) &amp;&amp; (usRetries &lt; MAX_RDM_WRM_RETIRES));</div><div class='add'>+	} while ((bytes &lt; 0) &amp;&amp; (usRetries &lt; MAX_RDM_WRM_RETIRES));</div><div class='ctx'> </div><div class='del'>-	if (retval &lt; 0)	{</div><div class='del'>-		BCM_DEBUG_PRINT(psIntfAdapter-&gt;psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM failed status :%d, retires :%d", retval, usRetries);</div><div class='del'>-		psIntfAdapter-&gt;psAdapter-&gt;DeviceAccess = FALSE;</div><div class='del'>-		return retval;</div><div class='del'>-	} else {</div><div class='del'>-		BCM_DEBUG_PRINT(psIntfAdapter-&gt;psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM sent %d", retval);</div><div class='del'>-		psIntfAdapter-&gt;psAdapter-&gt;DeviceAccess = FALSE;</div><div class='del'>-		return STATUS_SUCCESS;</div><div class='del'>-	}</div><div class='add'>+	if (bytes &lt; 0)</div><div class='add'>+		BCM_DEBUG_PRINT(psIntfAdapter-&gt;psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM failed status :%d, retires :%d", bytes, usRetries);</div><div class='add'>+	else</div><div class='add'>+		BCM_DEBUG_PRINT(psIntfAdapter-&gt;psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM sent %d", bytes);</div><div class='add'>+</div><div class='add'>+	psIntfAdapter-&gt;psAdapter-&gt;DeviceAccess = FALSE;</div><div class='add'>+	return bytes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> INT InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,</div><div class='head'>diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c<br/>index e9f29d597518..c7725e141fd5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/bcm/Misc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/Misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/bcm/Misc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/bcm/Misc.c</a></div><div class='hunk'>@@ -814,6 +814,7 @@ int reset_card_proc(PMINI_ADAPTER ps_adapter)</div><div class='ctx'> 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);</div><div class='ctx'> 	PS_INTERFACE_ADAPTER psIntfAdapter = NULL;</div><div class='ctx'> 	unsigned int value = 0, uiResetValue = 0;</div><div class='add'>+	int bytes;</div><div class='ctx'> </div><div class='ctx'> 	psIntfAdapter = ((PS_INTERFACE_ADAPTER)(ps_adapter-&gt;pvInterfaceAdapter));</div><div class='ctx'> 	ps_adapter-&gt;bDDRInitDone = FALSE;</div><div class='hunk'>@@ -848,8 +849,9 @@ int reset_card_proc(PMINI_ADAPTER ps_adapter)</div><div class='ctx'> 			ps_adapter-&gt;chip_id == BCS250_BC ||</div><div class='ctx'> 			ps_adapter-&gt;chip_id == BCS220_3) {</div><div class='ctx'> </div><div class='del'>-			retval = rdmalt(ps_adapter, HPM_CONFIG_LDO145, &amp;value, sizeof(value));</div><div class='del'>-			if (retval &lt; 0) {</div><div class='add'>+			bytes = rdmalt(ps_adapter, HPM_CONFIG_LDO145, &amp;value, sizeof(value));</div><div class='add'>+			if (bytes &lt; 0) {</div><div class='add'>+				retval = bytes;</div><div class='ctx'> 				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "read failed with status :%d", retval);</div><div class='ctx'> 				goto err_exit;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -862,8 +864,9 @@ int reset_card_proc(PMINI_ADAPTER ps_adapter)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		retval = rdmalt(ps_adapter, 0x0f007018, &amp;value, sizeof(value));</div><div class='del'>-		if (retval &lt; 0) {</div><div class='add'>+		bytes = rdmalt(ps_adapter, 0x0f007018, &amp;value, sizeof(value));</div><div class='add'>+		if (bytes &lt; 0) {</div><div class='add'>+			retval = bytes;</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "read failed with status :%d", retval);</div><div class='ctx'> 			goto err_exit;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -925,11 +928,16 @@ err_exit:</div><div class='ctx'> </div><div class='ctx'> int run_card_proc(PMINI_ADAPTER ps_adapter)</div><div class='ctx'> {</div><div class='add'>+	int status = STATUS_SUCCESS;</div><div class='add'>+	int bytes;</div><div class='add'>+</div><div class='ctx'> 	unsigned int value = 0;</div><div class='ctx'> 	{</div><div class='del'>-		if (rdmalt(ps_adapter, CLOCK_RESET_CNTRL_REG_1, &amp;value, sizeof(value)) &lt; 0) {</div><div class='add'>+		bytes = rdmalt(ps_adapter, CLOCK_RESET_CNTRL_REG_1, &amp;value, sizeof(value));</div><div class='add'>+		if (bytes &lt; 0) {</div><div class='add'>+			status = bytes;</div><div class='ctx'> 			BCM_DEBUG_PRINT(ps_adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "%s:%d\n", __func__, __LINE__);</div><div class='del'>-			return STATUS_FAILURE;</div><div class='add'>+			return status;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ps_adapter-&gt;bFlashBoot)</div><div class='hunk'>@@ -942,7 +950,7 @@ int run_card_proc(PMINI_ADAPTER ps_adapter)</div><div class='ctx'> 			return STATUS_FAILURE;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return STATUS_SUCCESS;</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter)</div><div class='hunk'>@@ -1215,6 +1223,7 @@ static unsigned char *ReadMacAddrEEPROM(PMINI_ADAPTER Adapter, ulong dwAddress)</div><div class='ctx'> 	int status = 0, i = 0;</div><div class='ctx'> 	unsigned int temp = 0;</div><div class='ctx'> 	unsigned char *pucmacaddr = kmalloc(MAC_ADDRESS_SIZE, GFP_KERNEL);</div><div class='add'>+	int bytes;</div><div class='ctx'> </div><div class='ctx'> 	if (!pucmacaddr) {</div><div class='ctx'> 		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "No Buffers to Read the EEPROM Address\n");</div><div class='hunk'>@@ -1231,8 +1240,9 @@ static unsigned char *ReadMacAddrEEPROM(PMINI_ADAPTER Adapter, ulong dwAddress)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MAC_ADDRESS_SIZE; i++) {</div><div class='del'>-		status = rdmalt(Adapter, EEPROM_READ_DATA_Q_REG, &amp;temp, sizeof(temp));</div><div class='del'>-		if (status != STATUS_SUCCESS) {</div><div class='add'>+		bytes = rdmalt(Adapter, EEPROM_READ_DATA_Q_REG, &amp;temp, sizeof(temp));</div><div class='add'>+		if (bytes &lt; 0) {</div><div class='add'>+			status = bytes;</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "rdm Failed..\n");</div><div class='ctx'> 			kfree(pucmacaddr);</div><div class='ctx'> 			pucmacaddr = NULL;</div><div class='hunk'>@@ -1574,11 +1584,13 @@ void update_per_sf_desc_cnts(PMINI_ADAPTER Adapter)</div><div class='ctx'> {</div><div class='ctx'> 	INT iIndex = 0;</div><div class='ctx'> 	u32 uibuff[MAX_TARGET_DSX_BUFFERS];</div><div class='add'>+	int bytes;</div><div class='ctx'> </div><div class='ctx'> 	if (!atomic_read(&amp;Adapter-&gt;uiMBupdate))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (rdmaltWithLock(Adapter, TARGET_SFID_TXDESC_MAP_LOC, (PUINT)uibuff, sizeof(UINT) * MAX_TARGET_DSX_BUFFERS) &lt; 0) {</div><div class='add'>+	bytes = rdmaltWithLock(Adapter, TARGET_SFID_TXDESC_MAP_LOC, (PUINT)uibuff, sizeof(UINT) * MAX_TARGET_DSX_BUFFERS);</div><div class='add'>+	if (bytes &lt; 0) {</div><div class='ctx'> 		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "rdm failed\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c<br/>index c13ea5c9a2aa..101c4e31249e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/bcm/hostmibs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/hostmibs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/bcm/hostmibs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/bcm/hostmibs.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * File Name: hostmibs.c</div><div class='ctx'>  *</div><div class='hunk'>@@ -6,73 +5,72 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Abstract: This file contains the routines to copy the statistics used by</div><div class='ctx'>  * the driver to the Host MIBS structure and giving the same to Application.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='add'>+</div><div class='ctx'> #include "headers.h"</div><div class='ctx'> </div><div class='del'>-INT  ProcessGetHostMibs(PMINI_ADAPTER Adapter, S_MIBS_HOST_STATS_MIBS *pstHostMibs)</div><div class='add'>+INT ProcessGetHostMibs(PMINI_ADAPTER Adapter, S_MIBS_HOST_STATS_MIBS *pstHostMibs)</div><div class='ctx'> {</div><div class='del'>-	S_SERVICEFLOW_ENTRY    *pstServiceFlowEntry = NULL;</div><div class='del'>-	S_PHS_RULE             *pstPhsRule          = NULL;</div><div class='del'>-	S_CLASSIFIER_TABLE     *pstClassifierTable  = NULL;</div><div class='del'>-	S_CLASSIFIER_ENTRY     *pstClassifierRule   = NULL;</div><div class='del'>-	PPHS_DEVICE_EXTENSION  pDeviceExtension     = (PPHS_DEVICE_EXTENSION)&amp;Adapter-&gt;stBCMPhsContext;</div><div class='add'>+	S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;</div><div class='add'>+	S_PHS_RULE *pstPhsRule = NULL;</div><div class='add'>+	S_CLASSIFIER_TABLE *pstClassifierTable = NULL;</div><div class='add'>+	S_CLASSIFIER_ENTRY *pstClassifierRule = NULL;</div><div class='add'>+	PPHS_DEVICE_EXTENSION pDeviceExtension = (PPHS_DEVICE_EXTENSION) &amp;Adapter-&gt;stBCMPhsContext;</div><div class='ctx'> </div><div class='del'>-	UINT nClassifierIndex = 0, nPhsTableIndex = 0,nSfIndex = 0, uiIndex = 0;</div><div class='add'>+	UINT nClassifierIndex = 0, nPhsTableIndex = 0, nSfIndex = 0, uiIndex = 0;</div><div class='ctx'> </div><div class='del'>-	if(pDeviceExtension == NULL)</div><div class='del'>-	{</div><div class='del'>-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, HOST_MIBS, DBG_LVL_ALL, "Invalid Device Extension\n");</div><div class='add'>+	if (pDeviceExtension == NULL) {</div><div class='add'>+		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, HOST_MIBS, DBG_LVL_ALL, "Invalid Device Extension\n");</div><div class='ctx'> 		return STATUS_FAILURE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	//Copy the classifier Table</div><div class='del'>-	for(nClassifierIndex=0; nClassifierIndex &lt; MAX_CLASSIFIERS;</div><div class='del'>-			nClassifierIndex++)</div><div class='del'>-	{</div><div class='del'>-		if(Adapter-&gt;astClassifierTable[nClassifierIndex].bUsed == TRUE)</div><div class='del'>-			memcpy((PVOID)&amp;pstHostMibs-&gt;astClassifierTable[nClassifierIndex],</div><div class='del'>-				(PVOID)&amp;Adapter-&gt;astClassifierTable[nClassifierIndex],</div><div class='del'>-				sizeof(S_MIBS_CLASSIFIER_RULE));</div><div class='add'>+	/* Copy the classifier Table */</div><div class='add'>+	for (nClassifierIndex = 0; nClassifierIndex &lt; MAX_CLASSIFIERS; nClassifierIndex++) {</div><div class='add'>+		if (Adapter-&gt;astClassifierTable[nClassifierIndex].bUsed == TRUE)</div><div class='add'>+			memcpy((PVOID) &amp; pstHostMibs-&gt;</div><div class='add'>+			       astClassifierTable[nClassifierIndex],</div><div class='add'>+			       (PVOID) &amp; Adapter-&gt;</div><div class='add'>+			       astClassifierTable[nClassifierIndex],</div><div class='add'>+			       sizeof(S_MIBS_CLASSIFIER_RULE));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-  //Copy the SF Table</div><div class='del'>-	for(nSfIndex=0; nSfIndex &lt; NO_OF_QUEUES ; nSfIndex++)</div><div class='del'>-	{</div><div class='del'>-	if(Adapter-&gt;PackInfo[nSfIndex].bValid)</div><div class='del'>-	{</div><div class='del'>-			memcpy((PVOID)&amp;pstHostMibs-&gt;astSFtable[nSfIndex],(PVOID)&amp;Adapter-&gt;PackInfo[nSfIndex],sizeof(S_MIBS_SERVICEFLOW_TABLE));</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		//if index in not valid, don't process this for the PHS table. Go For the next entry.</div><div class='del'>-		continue ;</div><div class='del'>-	}</div><div class='add'>+	/* Copy the SF Table */</div><div class='add'>+	for (nSfIndex = 0; nSfIndex &lt; NO_OF_QUEUES; nSfIndex++) {</div><div class='add'>+		if (Adapter-&gt;PackInfo[nSfIndex].bValid) {</div><div class='add'>+			memcpy((PVOID) &amp; pstHostMibs-&gt;astSFtable[nSfIndex],</div><div class='add'>+			       (PVOID) &amp; Adapter-&gt;PackInfo[nSfIndex],</div><div class='add'>+			       sizeof(S_MIBS_SERVICEFLOW_TABLE));</div><div class='add'>+		} else {</div><div class='add'>+			/* If index in not valid,</div><div class='add'>+			 * don't process this for the PHS table.</div><div class='add'>+			 * Go For the next entry.</div><div class='add'>+			 */</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		//Retrieve the SFID Entry Index for requested Service Flow</div><div class='del'>-		if(PHS_INVALID_TABLE_INDEX == GetServiceFlowEntry(pDeviceExtension-&gt;pstServiceFlowPhsRulesTable,</div><div class='del'>-						  Adapter-&gt;PackInfo[nSfIndex].usVCID_Value ,&amp;pstServiceFlowEntry))</div><div class='del'>-		{</div><div class='add'>+		/* Retrieve the SFID Entry Index for requested Service Flow */</div><div class='add'>+		if (PHS_INVALID_TABLE_INDEX ==</div><div class='add'>+		    GetServiceFlowEntry(pDeviceExtension-&gt;</div><div class='add'>+					pstServiceFlowPhsRulesTable,</div><div class='add'>+					Adapter-&gt;PackInfo[nSfIndex].</div><div class='add'>+					usVCID_Value, &amp;pstServiceFlowEntry))</div><div class='ctx'> </div><div class='del'>-		continue;</div><div class='del'>-		}</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='ctx'> 		pstClassifierTable = pstServiceFlowEntry-&gt;pstClassifierTable;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-		for(uiIndex = 0; uiIndex &lt; MAX_PHSRULE_PER_SF; uiIndex++)</div><div class='del'>-		{</div><div class='add'>+		for (uiIndex = 0; uiIndex &lt; MAX_PHSRULE_PER_SF; uiIndex++) {</div><div class='ctx'> 			pstClassifierRule = &amp;pstClassifierTable-&gt;stActivePhsRulesList[uiIndex];</div><div class='ctx'> </div><div class='del'>-		if(pstClassifierRule-&gt;bUsed)</div><div class='del'>-		{</div><div class='del'>-			pstPhsRule = pstClassifierRule-&gt;pstPhsRule;</div><div class='add'>+			if (pstClassifierRule-&gt;bUsed) {</div><div class='add'>+				pstPhsRule = pstClassifierRule-&gt;pstPhsRule;</div><div class='ctx'> </div><div class='del'>-			pstHostMibs-&gt;astPhsRulesTable[nPhsTableIndex].ulSFID = Adapter-&gt;PackInfo[nSfIndex].ulSFID;</div><div class='add'>+				pstHostMibs-&gt;astPhsRulesTable[nPhsTableIndex].</div><div class='add'>+				    ulSFID = Adapter-&gt;PackInfo[nSfIndex].ulSFID;</div><div class='ctx'> </div><div class='del'>-			memcpy(&amp;pstHostMibs-&gt;astPhsRulesTable[nPhsTableIndex].u8PHSI,</div><div class='del'>-						&amp;pstPhsRule-&gt;u8PHSI,</div><div class='del'>-						sizeof(S_PHS_RULE));</div><div class='add'>+				memcpy(&amp;pstHostMibs-&gt;</div><div class='add'>+				       astPhsRulesTable[nPhsTableIndex].u8PHSI,</div><div class='add'>+				       &amp;pstPhsRule-&gt;u8PHSI, sizeof(S_PHS_RULE));</div><div class='ctx'> 				nPhsTableIndex++;</div><div class='ctx'> </div><div class='ctx'> 			}</div><div class='hunk'>@@ -81,65 +79,63 @@ INT  ProcessGetHostMibs(PMINI_ADAPTER Adapter, S_MIBS_HOST_STATS_MIBS *pstHostMi</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	//copy other Host Statistics parameters</div><div class='add'>+	/* Copy other Host Statistics parameters */</div><div class='ctx'> 	pstHostMibs-&gt;stHostInfo.GoodTransmits = Adapter-&gt;dev-&gt;stats.tx_packets;</div><div class='ctx'> 	pstHostMibs-&gt;stHostInfo.GoodReceives = Adapter-&gt;dev-&gt;stats.rx_packets;</div><div class='del'>-	pstHostMibs-&gt;stHostInfo.CurrNumFreeDesc =</div><div class='del'>-			atomic_read(&amp;Adapter-&gt;CurrNumFreeTxDesc);</div><div class='add'>+	pstHostMibs-&gt;stHostInfo.CurrNumFreeDesc = atomic_read(&amp;Adapter-&gt;CurrNumFreeTxDesc);</div><div class='ctx'> 	pstHostMibs-&gt;stHostInfo.BEBucketSize = Adapter-&gt;BEBucketSize;</div><div class='ctx'> 	pstHostMibs-&gt;stHostInfo.rtPSBucketSize = Adapter-&gt;rtPSBucketSize;</div><div class='ctx'> 	pstHostMibs-&gt;stHostInfo.TimerActive = Adapter-&gt;TimerActive;</div><div class='ctx'> 	pstHostMibs-&gt;stHostInfo.u32TotalDSD = Adapter-&gt;u32TotalDSD;</div><div class='ctx'> </div><div class='del'>-	memcpy(pstHostMibs-&gt;stHostInfo.aTxPktSizeHist,Adapter-&gt;aTxPktSizeHist,sizeof(UINT32)*MIBS_MAX_HIST_ENTRIES);</div><div class='del'>-	memcpy(pstHostMibs-&gt;stHostInfo.aRxPktSizeHist,Adapter-&gt;aRxPktSizeHist,sizeof(UINT32)*MIBS_MAX_HIST_ENTRIES);</div><div class='add'>+	memcpy(pstHostMibs-&gt;stHostInfo.aTxPktSizeHist, Adapter-&gt;aTxPktSizeHist, sizeof(UINT32) * MIBS_MAX_HIST_ENTRIES);</div><div class='add'>+	memcpy(pstHostMibs-&gt;stHostInfo.aRxPktSizeHist, Adapter-&gt;aRxPktSizeHist, sizeof(UINT32) * MIBS_MAX_HIST_ENTRIES);</div><div class='ctx'> </div><div class='ctx'> 	return STATUS_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> VOID GetDroppedAppCntrlPktMibs(S_MIBS_HOST_STATS_MIBS *pstHostMibs, const PPER_TARANG_DATA pTarang)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(&amp;(pstHostMibs-&gt;stDroppedAppCntrlMsgs),</div><div class='del'>-	       &amp;(pTarang-&gt;stDroppedAppCntrlMsgs),sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));</div><div class='add'>+	       &amp;(pTarang-&gt;stDroppedAppCntrlMsgs),</div><div class='add'>+	       sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-VOID CopyMIBSExtendedSFParameters(PMINI_ADAPTER Adapter,</div><div class='del'>-		CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex)</div><div class='add'>+VOID CopyMIBSExtendedSFParameters(PMINI_ADAPTER Adapter, CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex)</div><div class='ctx'> {</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfSfid = psfLocalSet-&gt;u32SFID;</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsMaxSustainedRate = psfLocalSet-&gt;u32MaxSustainedTrafficRate;</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsMaxTrafficBurst = psfLocalSet-&gt;u32MaxTrafficBurst;</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsMinReservedRate = psfLocalSet-&gt;u32MinReservedTrafficRate;</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsToleratedJitter = psfLocalSet-&gt;u32ToleratedJitter;</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsMaxLatency = psfLocalSet-&gt;u32MaximumLatency;</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsFixedVsVariableSduInd = psfLocalSet-&gt;u8FixedLengthVSVariableLengthSDUIndicator;</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsFixedVsVariableSduInd = ntohl(Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsFixedVsVariableSduInd);</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsSduSize = psfLocalSet-&gt;u8SDUSize;</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsSduSize = ntohl(Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsSduSize);</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsSfSchedulingType = psfLocalSet-&gt;u8ServiceFlowSchedulingType;</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsSfSchedulingType = ntohl(Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsSfSchedulingType);</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqEnable = psfLocalSet-&gt;u8ARQEnable;</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqEnable = ntohl(Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqEnable);</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqWindowSize = ntohs(psfLocalSet-&gt;u16ARQWindowSize);</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqWindowSize = ntohl(Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqWindowSize);</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqBlockLifetime = ntohs(psfLocalSet-&gt;u16ARQBlockLifeTime);</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqBlockLifetime = ntohl(Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqBlockLifetime);</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqSyncLossTimeout = ntohs(psfLocalSet-&gt;u16ARQSyncLossTimeOut);</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqSyncLossTimeout = ntohl(Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqSyncLossTimeout);</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqDeliverInOrder = psfLocalSet-&gt;u8ARQDeliverInOrder;</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqDeliverInOrder = ntohl(Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqDeliverInOrder);</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqRxPurgeTimeout = ntohs(psfLocalSet-&gt;u16ARQRxPurgeTimeOut);</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqRxPurgeTimeout = ntohl(Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqRxPurgeTimeout);</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqBlockSize = ntohs(psfLocalSet-&gt;u16ARQBlockSize);</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqBlockSize = ntohl(Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqBlockSize);</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsReqTxPolicy = psfLocalSet-&gt;u8RequesttransmissionPolicy;</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsReqTxPolicy = ntohl(Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsReqTxPolicy);</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnSfCsSpecification = psfLocalSet-&gt;u8CSSpecification;</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnSfCsSpecification = ntohl(Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnSfCsSpecification);</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsTargetSaid = ntohs(psfLocalSet-&gt;u16TargetSAID);</div><div class='del'>-	Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsTargetSaid = ntohl(Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsTargetSaid);</div><div class='add'>+	S_MIBS_EXTSERVICEFLOW_PARAMETERS *t = &amp;Adapter-&gt;PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable;</div><div class='add'>+</div><div class='add'>+	t-&gt;wmanIfSfid = psfLocalSet-&gt;u32SFID;</div><div class='add'>+	t-&gt;wmanIfCmnCpsMaxSustainedRate = psfLocalSet-&gt;u32MaxSustainedTrafficRate;</div><div class='add'>+	t-&gt;wmanIfCmnCpsMaxTrafficBurst = psfLocalSet-&gt;u32MaxTrafficBurst;</div><div class='add'>+	t-&gt;wmanIfCmnCpsMinReservedRate = psfLocalSet-&gt;u32MinReservedTrafficRate;</div><div class='add'>+	t-&gt;wmanIfCmnCpsToleratedJitter = psfLocalSet-&gt;u32ToleratedJitter;</div><div class='add'>+	t-&gt;wmanIfCmnCpsMaxLatency = psfLocalSet-&gt;u32MaximumLatency;</div><div class='add'>+	t-&gt;wmanIfCmnCpsFixedVsVariableSduInd = psfLocalSet-&gt;u8FixedLengthVSVariableLengthSDUIndicator;</div><div class='add'>+	t-&gt;wmanIfCmnCpsFixedVsVariableSduInd = ntohl(t-&gt;wmanIfCmnCpsFixedVsVariableSduInd);</div><div class='add'>+	t-&gt;wmanIfCmnCpsSduSize = psfLocalSet-&gt;u8SDUSize;</div><div class='add'>+	t-&gt;wmanIfCmnCpsSduSize = ntohl(t-&gt;wmanIfCmnCpsSduSize);</div><div class='add'>+	t-&gt;wmanIfCmnCpsSfSchedulingType = psfLocalSet-&gt;u8ServiceFlowSchedulingType;</div><div class='add'>+	t-&gt;wmanIfCmnCpsSfSchedulingType = ntohl(t-&gt;wmanIfCmnCpsSfSchedulingType);</div><div class='add'>+	t-&gt;wmanIfCmnCpsArqEnable = psfLocalSet-&gt;u8ARQEnable;</div><div class='add'>+	t-&gt;wmanIfCmnCpsArqEnable = ntohl(t-&gt;wmanIfCmnCpsArqEnable);</div><div class='add'>+	t-&gt;wmanIfCmnCpsArqWindowSize = ntohs(psfLocalSet-&gt;u16ARQWindowSize);</div><div class='add'>+	t-&gt;wmanIfCmnCpsArqWindowSize = ntohl(t-&gt;wmanIfCmnCpsArqWindowSize);</div><div class='add'>+	t-&gt;wmanIfCmnCpsArqBlockLifetime = ntohs(psfLocalSet-&gt;u16ARQBlockLifeTime);</div><div class='add'>+	t-&gt;wmanIfCmnCpsArqBlockLifetime = ntohl(t-&gt;wmanIfCmnCpsArqBlockLifetime);</div><div class='add'>+	t-&gt;wmanIfCmnCpsArqSyncLossTimeout = ntohs(psfLocalSet-&gt;u16ARQSyncLossTimeOut);</div><div class='add'>+	t-&gt;wmanIfCmnCpsArqSyncLossTimeout = ntohl(t-&gt;wmanIfCmnCpsArqSyncLossTimeout);</div><div class='add'>+	t-&gt;wmanIfCmnCpsArqDeliverInOrder = psfLocalSet-&gt;u8ARQDeliverInOrder;</div><div class='add'>+	t-&gt;wmanIfCmnCpsArqDeliverInOrder = ntohl(t-&gt;wmanIfCmnCpsArqDeliverInOrder);</div><div class='add'>+	t-&gt;wmanIfCmnCpsArqRxPurgeTimeout = ntohs(psfLocalSet-&gt;u16ARQRxPurgeTimeOut);</div><div class='add'>+	t-&gt;wmanIfCmnCpsArqRxPurgeTimeout = ntohl(t-&gt;wmanIfCmnCpsArqRxPurgeTimeout);</div><div class='add'>+	t-&gt;wmanIfCmnCpsArqBlockSize = ntohs(psfLocalSet-&gt;u16ARQBlockSize);</div><div class='add'>+	t-&gt;wmanIfCmnCpsArqBlockSize = ntohl(t-&gt;wmanIfCmnCpsArqBlockSize);</div><div class='add'>+	t-&gt;wmanIfCmnCpsReqTxPolicy = psfLocalSet-&gt;u8RequesttransmissionPolicy;</div><div class='add'>+	t-&gt;wmanIfCmnCpsReqTxPolicy = ntohl(t-&gt;wmanIfCmnCpsReqTxPolicy);</div><div class='add'>+	t-&gt;wmanIfCmnSfCsSpecification = psfLocalSet-&gt;u8CSSpecification;</div><div class='add'>+	t-&gt;wmanIfCmnSfCsSpecification = ntohl(t-&gt;wmanIfCmnSfCsSpecification);</div><div class='add'>+	t-&gt;wmanIfCmnCpsTargetSaid = ntohs(psfLocalSet-&gt;u16TargetSAID);</div><div class='add'>+	t-&gt;wmanIfCmnCpsTargetSaid = ntohl(t-&gt;wmanIfCmnCpsTargetSaid);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c<br/>index 16e939fa15d6..c7f488629722 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/bcm/led_control.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/led_control.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/bcm/led_control.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/bcm/led_control.c</a></div><div class='hunk'>@@ -5,65 +5,69 @@</div><div class='ctx'> </div><div class='ctx'> static B_UINT16 CFG_CalculateChecksum(B_UINT8 *pu8Buffer, B_UINT32 u32Size)</div><div class='ctx'> {</div><div class='del'>-	B_UINT16 	u16CheckSum=0;</div><div class='del'>-	while(u32Size--) {</div><div class='add'>+	B_UINT16 u16CheckSum = 0;</div><div class='add'>+	while (u32Size--) {</div><div class='ctx'> 		u16CheckSum += (B_UINT8)~(*pu8Buffer);</div><div class='del'>-	    pu8Buffer++;</div><div class='add'>+		pu8Buffer++;</div><div class='ctx'> 	}</div><div class='ctx'> 	return u16CheckSum;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> BOOLEAN IsReqGpioIsLedInNVM(PMINI_ADAPTER Adapter, UINT gpios)</div><div class='ctx'> {</div><div class='del'>-	INT Status ;</div><div class='del'>-	Status = (Adapter-&gt;gpioBitMap &amp; gpios) ^ gpios ;</div><div class='del'>-	if(Status)</div><div class='add'>+	INT Status;</div><div class='add'>+	Status = (Adapter-&gt;gpioBitMap &amp; gpios) ^ gpios;</div><div class='add'>+	if (Status)</div><div class='ctx'> 		return FALSE;</div><div class='ctx'> 	else</div><div class='ctx'> 		return TRUE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static INT LED_Blink(PMINI_ADAPTER Adapter, UINT GPIO_Num, UCHAR uiLedIndex, ULONG timeout, INT num_of_time, LedEventInfo_t currdriverstate)</div><div class='add'>+static INT LED_Blink(PMINI_ADAPTER Adapter, UINT GPIO_Num, UCHAR uiLedIndex,</div><div class='add'>+		ULONG timeout, INT num_of_time, LedEventInfo_t currdriverstate)</div><div class='ctx'> {</div><div class='ctx'> 	int Status = STATUS_SUCCESS;</div><div class='ctx'> 	BOOLEAN bInfinite = FALSE;</div><div class='ctx'> </div><div class='del'>-	/*Check if num_of_time is -ve. If yes, blink led in infinite loop*/</div><div class='del'>-	if(num_of_time &lt; 0)</div><div class='del'>-	{</div><div class='add'>+	/* Check if num_of_time is -ve. If yes, blink led in infinite loop */</div><div class='add'>+	if (num_of_time &lt; 0) {</div><div class='ctx'> 		bInfinite = TRUE;</div><div class='ctx'> 		num_of_time = 1;</div><div class='ctx'> 	}</div><div class='del'>-	while(num_of_time)</div><div class='del'>-	{</div><div class='del'>-</div><div class='del'>-		if(currdriverstate == Adapter-&gt;DriverState)</div><div class='add'>+	while (num_of_time) {</div><div class='add'>+		if (currdriverstate == Adapter-&gt;DriverState)</div><div class='ctx'> 			TURN_ON_LED(GPIO_Num, uiLedIndex);</div><div class='ctx'> </div><div class='del'>-		/*Wait for timeout after setting on the LED*/</div><div class='del'>-		Status = wait_event_interruptible_timeout(Adapter-&gt;LEDInfo.notify_led_event,</div><div class='del'>-					currdriverstate != Adapter-&gt;DriverState || kthread_should_stop(),</div><div class='del'>-					msecs_to_jiffies(timeout));</div><div class='del'>-</div><div class='del'>-		if(kthread_should_stop())</div><div class='del'>-		{</div><div class='del'>-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL, "Led thread got signal to exit..hence exiting");</div><div class='del'>-			Adapter-&gt;LEDInfo.led_thread_running= BCM_LED_THREAD_DISABLED;</div><div class='add'>+		/* Wait for timeout after setting on the LED */</div><div class='add'>+		Status = wait_event_interruptible_timeout(</div><div class='add'>+				Adapter-&gt;LEDInfo.notify_led_event,</div><div class='add'>+				currdriverstate != Adapter-&gt;DriverState ||</div><div class='add'>+					kthread_should_stop(),</div><div class='add'>+				msecs_to_jiffies(timeout));</div><div class='add'>+</div><div class='add'>+		if (kthread_should_stop()) {</div><div class='add'>+			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,</div><div class='add'>+				DBG_LVL_ALL,</div><div class='add'>+				"Led thread got signal to exit..hence exiting");</div><div class='add'>+			Adapter-&gt;LEDInfo.led_thread_running =</div><div class='add'>+					BCM_LED_THREAD_DISABLED;</div><div class='ctx'> 			TURN_OFF_LED(GPIO_Num, uiLedIndex);</div><div class='del'>-			Status=EVENT_SIGNALED;</div><div class='add'>+			Status = EVENT_SIGNALED;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if(Status)</div><div class='del'>-		{</div><div class='add'>+		if (Status) {</div><div class='ctx'> 			TURN_OFF_LED(GPIO_Num, uiLedIndex);</div><div class='del'>-			Status=EVENT_SIGNALED;</div><div class='add'>+			Status = EVENT_SIGNALED;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		TURN_OFF_LED(GPIO_Num, uiLedIndex);</div><div class='del'>-		Status = wait_event_interruptible_timeout(Adapter-&gt;LEDInfo.notify_led_event,</div><div class='del'>-					currdriverstate!= Adapter-&gt;DriverState || kthread_should_stop(),</div><div class='del'>-					msecs_to_jiffies(timeout));</div><div class='del'>-		if(bInfinite == FALSE)</div><div class='add'>+		Status = wait_event_interruptible_timeout(</div><div class='add'>+				Adapter-&gt;LEDInfo.notify_led_event,</div><div class='add'>+				currdriverstate != Adapter-&gt;DriverState ||</div><div class='add'>+					kthread_should_stop(),</div><div class='add'>+				msecs_to_jiffies(timeout));</div><div class='add'>+		if (bInfinite == FALSE)</div><div class='ctx'> 			num_of_time--;</div><div class='ctx'> 	}</div><div class='ctx'> 	return Status;</div><div class='hunk'>@@ -71,19 +75,19 @@ static INT LED_Blink(PMINI_ADAPTER Adapter, UINT GPIO_Num, UCHAR uiLedIndex, ULO</div><div class='ctx'> </div><div class='ctx'> static INT ScaleRateofTransfer(ULONG rate)</div><div class='ctx'> {</div><div class='del'>-	if(rate &lt;= 3)</div><div class='add'>+	if (rate &lt;= 3)</div><div class='ctx'> 		return rate;</div><div class='del'>-	else if((rate &gt; 3) &amp;&amp; (rate &lt;= 100))</div><div class='add'>+	else if ((rate &gt; 3) &amp;&amp; (rate &lt;= 100))</div><div class='ctx'> 		return 5;</div><div class='del'>-	else if((rate &gt; 100) &amp;&amp; (rate &lt;= 200))</div><div class='add'>+	else if ((rate &gt; 100) &amp;&amp; (rate &lt;= 200))</div><div class='ctx'> 		return 6;</div><div class='del'>-	else if((rate &gt; 200) &amp;&amp; (rate &lt;= 300))</div><div class='add'>+	else if ((rate &gt; 200) &amp;&amp; (rate &lt;= 300))</div><div class='ctx'> 		return 7;</div><div class='del'>-	else if((rate &gt; 300) &amp;&amp; (rate &lt;= 400))</div><div class='add'>+	else if ((rate &gt; 300) &amp;&amp; (rate &lt;= 400))</div><div class='ctx'> 		return 8;</div><div class='del'>-	else if((rate &gt; 400) &amp;&amp; (rate &lt;= 500))</div><div class='add'>+	else if ((rate &gt; 400) &amp;&amp; (rate &lt;= 500))</div><div class='ctx'> 		return 9;</div><div class='del'>-	else if((rate &gt; 500) &amp;&amp; (rate &lt;= 600))</div><div class='add'>+	else if ((rate &gt; 500) &amp;&amp; (rate &lt;= 600))</div><div class='ctx'> 		return 10;</div><div class='ctx'> 	else</div><div class='ctx'> 		return MAX_NUM_OF_BLINKS;</div><div class='hunk'>@@ -92,215 +96,232 @@ static INT ScaleRateofTransfer(ULONG rate)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static INT LED_Proportional_Blink(PMINI_ADAPTER Adapter, UCHAR GPIO_Num_tx,</div><div class='del'>-		UCHAR uiTxLedIndex, UCHAR GPIO_Num_rx, UCHAR uiRxLedIndex, LedEventInfo_t currdriverstate)</div><div class='add'>+		UCHAR uiTxLedIndex, UCHAR GPIO_Num_rx, UCHAR uiRxLedIndex,</div><div class='add'>+		LedEventInfo_t currdriverstate)</div><div class='ctx'> {</div><div class='del'>-	/* Initial values of TX and RX packets*/</div><div class='add'>+	/* Initial values of TX and RX packets */</div><div class='ctx'> 	ULONG64 Initial_num_of_packts_tx = 0, Initial_num_of_packts_rx = 0;</div><div class='del'>-	/*values of TX and RX packets after 1 sec*/</div><div class='add'>+	/* values of TX and RX packets after 1 sec */</div><div class='ctx'> 	ULONG64 Final_num_of_packts_tx = 0, Final_num_of_packts_rx = 0;</div><div class='del'>-	/*Rate of transfer of Tx and Rx in 1 sec*/</div><div class='add'>+	/* Rate of transfer of Tx and Rx in 1 sec */</div><div class='ctx'> 	ULONG64 rate_of_transfer_tx = 0, rate_of_transfer_rx = 0;</div><div class='ctx'> 	int Status = STATUS_SUCCESS;</div><div class='ctx'> 	INT num_of_time = 0, num_of_time_tx = 0, num_of_time_rx = 0;</div><div class='ctx'> 	UINT remDelay = 0;</div><div class='ctx'> 	BOOLEAN bBlinkBothLED = TRUE;</div><div class='del'>-	//UINT GPIO_num = DISABLE_GPIO_NUM;</div><div class='add'>+	/* UINT GPIO_num = DISABLE_GPIO_NUM; */</div><div class='ctx'> 	ulong timeout = 0;</div><div class='ctx'> </div><div class='del'>-	/*Read initial value of packets sent/received */</div><div class='add'>+	/* Read initial value of packets sent/received */</div><div class='ctx'> 	Initial_num_of_packts_tx = Adapter-&gt;dev-&gt;stats.tx_packets;</div><div class='ctx'> 	Initial_num_of_packts_rx = Adapter-&gt;dev-&gt;stats.rx_packets;</div><div class='ctx'> </div><div class='del'>-	/*Scale the rate of transfer to no of blinks.*/</div><div class='del'>-	num_of_time_tx= ScaleRateofTransfer((ULONG)rate_of_transfer_tx);</div><div class='del'>-	num_of_time_rx= ScaleRateofTransfer((ULONG)rate_of_transfer_rx);</div><div class='add'>+	/* Scale the rate of transfer to no of blinks. */</div><div class='add'>+	num_of_time_tx = ScaleRateofTransfer((ULONG)rate_of_transfer_tx);</div><div class='add'>+	num_of_time_rx = ScaleRateofTransfer((ULONG)rate_of_transfer_rx);</div><div class='ctx'> </div><div class='del'>-	while((Adapter-&gt;device_removed == FALSE))</div><div class='del'>-	{</div><div class='add'>+	while ((Adapter-&gt;device_removed == FALSE)) {</div><div class='ctx'> 		timeout = 50;</div><div class='del'>-		/*Blink Tx and Rx LED when both Tx and Rx is in normal bandwidth*/</div><div class='del'>-		if(bBlinkBothLED)</div><div class='del'>-		{</div><div class='del'>-			/*Assign minimum number of blinks of either Tx or Rx.*/</div><div class='del'>-			if(num_of_time_tx &gt; num_of_time_rx)</div><div class='add'>+		/*</div><div class='add'>+		 * Blink Tx and Rx LED when both Tx and Rx is</div><div class='add'>+		 * in normal bandwidth</div><div class='add'>+		 */</div><div class='add'>+		if (bBlinkBothLED) {</div><div class='add'>+			/*</div><div class='add'>+			 * Assign minimum number of blinks of</div><div class='add'>+			 * either Tx or Rx.</div><div class='add'>+			 */</div><div class='add'>+			if (num_of_time_tx &gt; num_of_time_rx)</div><div class='ctx'> 				num_of_time = num_of_time_rx;</div><div class='ctx'> 			else</div><div class='ctx'> 				num_of_time = num_of_time_tx;</div><div class='del'>-			if(num_of_time &gt; 0)</div><div class='del'>-			{</div><div class='del'>-				/*Blink both Tx and Rx LEDs*/</div><div class='del'>-				if(LED_Blink(Adapter, 1&lt;&lt;GPIO_Num_tx, uiTxLedIndex, timeout, num_of_time,currdriverstate)</div><div class='add'>+			if (num_of_time &gt; 0) {</div><div class='add'>+				/* Blink both Tx and Rx LEDs */</div><div class='add'>+				if (LED_Blink(Adapter, 1 &lt;&lt; GPIO_Num_tx,</div><div class='add'>+						uiTxLedIndex, timeout,</div><div class='add'>+						num_of_time, currdriverstate)</div><div class='ctx'> 							== EVENT_SIGNALED)</div><div class='del'>-				{</div><div class='ctx'> 					return EVENT_SIGNALED;</div><div class='del'>-				}</div><div class='del'>-				if(LED_Blink(Adapter, 1&lt;&lt;GPIO_Num_rx, uiRxLedIndex, timeout, num_of_time,currdriverstate)</div><div class='add'>+</div><div class='add'>+				if (LED_Blink(Adapter, 1 &lt;&lt; GPIO_Num_rx,</div><div class='add'>+						uiRxLedIndex, timeout,</div><div class='add'>+						num_of_time, currdriverstate)</div><div class='ctx'> 							== EVENT_SIGNALED)</div><div class='del'>-				{</div><div class='ctx'> 					return EVENT_SIGNALED;</div><div class='del'>-				}</div><div class='ctx'> </div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if(num_of_time == num_of_time_tx)</div><div class='del'>-			{</div><div class='del'>-				/*Blink pending rate of Rx*/</div><div class='del'>-				if(LED_Blink(Adapter, (1 &lt;&lt; GPIO_Num_rx), uiRxLedIndex, timeout,</div><div class='del'>-						num_of_time_rx-num_of_time,currdriverstate) == EVENT_SIGNALED)</div><div class='del'>-				{</div><div class='add'>+			if (num_of_time == num_of_time_tx) {</div><div class='add'>+				/* Blink pending rate of Rx */</div><div class='add'>+				if (LED_Blink(Adapter, (1 &lt;&lt; GPIO_Num_rx),</div><div class='add'>+						uiRxLedIndex, timeout,</div><div class='add'>+						num_of_time_rx-num_of_time,</div><div class='add'>+						currdriverstate)</div><div class='add'>+							== EVENT_SIGNALED)</div><div class='ctx'> 					return EVENT_SIGNALED;</div><div class='del'>-				}</div><div class='add'>+</div><div class='ctx'> 				num_of_time = num_of_time_rx;</div><div class='del'>-			}</div><div class='del'>-			else</div><div class='del'>-			{</div><div class='del'>-				/*Blink pending rate of Tx*/</div><div class='del'>-				if(LED_Blink(Adapter, 1&lt;&lt;GPIO_Num_tx, uiTxLedIndex, timeout,</div><div class='del'>-					num_of_time_tx-num_of_time,currdriverstate) == EVENT_SIGNALED)</div><div class='del'>-				{</div><div class='add'>+			} else {</div><div class='add'>+				/* Blink pending rate of Tx */</div><div class='add'>+				if (LED_Blink(Adapter, 1 &lt;&lt; GPIO_Num_tx,</div><div class='add'>+						uiTxLedIndex, timeout,</div><div class='add'>+						num_of_time_tx-num_of_time,</div><div class='add'>+						currdriverstate)</div><div class='add'>+							== EVENT_SIGNALED)</div><div class='ctx'> 					return EVENT_SIGNALED;</div><div class='del'>-				}</div><div class='add'>+</div><div class='ctx'> 				num_of_time = num_of_time_tx;</div><div class='ctx'> 			}</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			if(num_of_time == num_of_time_tx)</div><div class='del'>-			{</div><div class='del'>-				/*Blink pending rate of Rx*/</div><div class='del'>-				if(LED_Blink(Adapter, 1&lt;&lt;GPIO_Num_tx, uiTxLedIndex, timeout, num_of_time,currdriverstate)</div><div class='add'>+		} else {</div><div class='add'>+			if (num_of_time == num_of_time_tx) {</div><div class='add'>+				/* Blink pending rate of Rx */</div><div class='add'>+				if (LED_Blink(Adapter, 1 &lt;&lt; GPIO_Num_tx,</div><div class='add'>+						uiTxLedIndex, timeout,</div><div class='add'>+						num_of_time, currdriverstate)</div><div class='ctx'> 							== EVENT_SIGNALED)</div><div class='del'>-				{</div><div class='ctx'> 					return EVENT_SIGNALED;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			else</div><div class='del'>-			{</div><div class='del'>-				/*Blink pending rate of Tx*/</div><div class='del'>-				if(LED_Blink(Adapter, 1&lt;&lt;GPIO_Num_rx, uiRxLedIndex, timeout,</div><div class='del'>-						num_of_time,currdriverstate) == EVENT_SIGNALED)</div><div class='del'>-				{</div><div class='add'>+			} else {</div><div class='add'>+				/* Blink pending rate of Tx */</div><div class='add'>+				if (LED_Blink(Adapter, 1 &lt;&lt; GPIO_Num_rx,</div><div class='add'>+						uiRxLedIndex, timeout,</div><div class='add'>+						num_of_time, currdriverstate)</div><div class='add'>+							== EVENT_SIGNALED)</div><div class='ctx'> 					return EVENT_SIGNALED;</div><div class='del'>-				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		/* If Tx/Rx rate is less than maximum blinks per second,</div><div class='del'>-			 * wait till delay completes to 1 second</div><div class='del'>-			 */</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If Tx/Rx rate is less than maximum blinks per second,</div><div class='add'>+		 * wait till delay completes to 1 second</div><div class='add'>+		 */</div><div class='ctx'> 		remDelay = MAX_NUM_OF_BLINKS - num_of_time;</div><div class='del'>-		if(remDelay &gt; 0)</div><div class='del'>-		{</div><div class='del'>-			timeout= 100 * remDelay;</div><div class='del'>-			Status = wait_event_interruptible_timeout(Adapter-&gt;LEDInfo.notify_led_event,</div><div class='del'>-						currdriverstate!= Adapter-&gt;DriverState ||kthread_should_stop() ,</div><div class='del'>-						msecs_to_jiffies (timeout));</div><div class='del'>-</div><div class='del'>-			if(kthread_should_stop())</div><div class='del'>-			{</div><div class='del'>-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL, "Led thread got signal to exit..hence exiting");</div><div class='del'>-				Adapter-&gt;LEDInfo.led_thread_running= BCM_LED_THREAD_DISABLED;</div><div class='add'>+		if (remDelay &gt; 0) {</div><div class='add'>+			timeout = 100 * remDelay;</div><div class='add'>+			Status = wait_event_interruptible_timeout(</div><div class='add'>+					Adapter-&gt;LEDInfo.notify_led_event,</div><div class='add'>+					currdriverstate != Adapter-&gt;DriverState</div><div class='add'>+						|| kthread_should_stop(),</div><div class='add'>+					msecs_to_jiffies(timeout));</div><div class='add'>+</div><div class='add'>+			if (kthread_should_stop()) {</div><div class='add'>+				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,</div><div class='add'>+					LED_DUMP_INFO, DBG_LVL_ALL,</div><div class='add'>+					"Led thread got signal to exit..hence exiting");</div><div class='add'>+				Adapter-&gt;LEDInfo.led_thread_running =</div><div class='add'>+						BCM_LED_THREAD_DISABLED;</div><div class='ctx'> 				return EVENT_SIGNALED;</div><div class='ctx'> 			}</div><div class='del'>-			if(Status)</div><div class='add'>+			if (Status)</div><div class='ctx'> 				return EVENT_SIGNALED;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/*Turn off both Tx and Rx LEDs before next second*/</div><div class='del'>-		TURN_OFF_LED(1&lt;&lt;GPIO_Num_tx, uiTxLedIndex);</div><div class='del'>-		TURN_OFF_LED(1&lt;&lt;GPIO_Num_rx, uiTxLedIndex);</div><div class='add'>+		/* Turn off both Tx and Rx LEDs before next second */</div><div class='add'>+		TURN_OFF_LED(1 &lt;&lt; GPIO_Num_tx, uiTxLedIndex);</div><div class='add'>+		TURN_OFF_LED(1 &lt;&lt; GPIO_Num_rx, uiTxLedIndex);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>- 		 * Read the Tx &amp; Rx packets transmission after 1 second and</div><div class='del'>- 		 * calculate rate of transfer</div><div class='del'>- 		 */</div><div class='add'>+		 * Read the Tx &amp; Rx packets transmission after 1 second and</div><div class='add'>+		 * calculate rate of transfer</div><div class='add'>+		 */</div><div class='ctx'> 		Final_num_of_packts_tx = Adapter-&gt;dev-&gt;stats.tx_packets;</div><div class='ctx'> 		Final_num_of_packts_rx = Adapter-&gt;dev-&gt;stats.rx_packets;</div><div class='ctx'> </div><div class='del'>-		rate_of_transfer_tx = Final_num_of_packts_tx - Initial_num_of_packts_tx;</div><div class='del'>-		rate_of_transfer_rx = Final_num_of_packts_rx - Initial_num_of_packts_rx;</div><div class='add'>+		rate_of_transfer_tx = Final_num_of_packts_tx -</div><div class='add'>+						Initial_num_of_packts_tx;</div><div class='add'>+		rate_of_transfer_rx = Final_num_of_packts_rx -</div><div class='add'>+						Initial_num_of_packts_rx;</div><div class='ctx'> </div><div class='del'>-		/*Read initial value of packets sent/received */</div><div class='add'>+		/* Read initial value of packets sent/received */</div><div class='ctx'> 		Initial_num_of_packts_tx = Final_num_of_packts_tx;</div><div class='del'>-		Initial_num_of_packts_rx = Final_num_of_packts_rx ;</div><div class='add'>+		Initial_num_of_packts_rx = Final_num_of_packts_rx;</div><div class='ctx'> </div><div class='del'>-		/*Scale the rate of transfer to no of blinks.*/</div><div class='del'>-		num_of_time_tx= ScaleRateofTransfer((ULONG)rate_of_transfer_tx);</div><div class='del'>-		num_of_time_rx= ScaleRateofTransfer((ULONG)rate_of_transfer_rx);</div><div class='add'>+		/* Scale the rate of transfer to no of blinks. */</div><div class='add'>+		num_of_time_tx =</div><div class='add'>+			ScaleRateofTransfer((ULONG)rate_of_transfer_tx);</div><div class='add'>+		num_of_time_rx =</div><div class='add'>+			ScaleRateofTransfer((ULONG)rate_of_transfer_rx);</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> 	return Status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='del'>-// Procedure:   ValidateDSDParamsChecksum</div><div class='del'>-//</div><div class='del'>-// Description: Reads DSD Params and validates checkusm.</div><div class='del'>-//</div><div class='del'>-// Arguments:</div><div class='del'>-//      Adapter - Pointer to Adapter structure.</div><div class='del'>-//      ulParamOffset - Start offset of the DSD parameter to be read and validated.</div><div class='del'>-//      usParamLen - Length of the DSD Parameter.</div><div class='del'>-//</div><div class='del'>-// Returns:</div><div class='del'>-//  &lt;OSAL_STATUS_CODE&gt;</div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-static INT ValidateDSDParamsChecksum(</div><div class='del'>-													PMINI_ADAPTER Adapter,</div><div class='del'>-													ULONG  ulParamOffset,</div><div class='del'>-													USHORT usParamLen )</div><div class='add'>+/*</div><div class='add'>+ * -----------------------------------------------------------------------------</div><div class='add'>+ * Procedure:   ValidateDSDParamsChecksum</div><div class='add'>+ *</div><div class='add'>+ * Description: Reads DSD Params and validates checkusm.</div><div class='add'>+ *</div><div class='add'>+ * Arguments:</div><div class='add'>+ *      Adapter - Pointer to Adapter structure.</div><div class='add'>+ *      ulParamOffset - Start offset of the DSD parameter to be read and</div><div class='add'>+ *			validated.</div><div class='add'>+ *      usParamLen - Length of the DSD Parameter.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *  &lt;OSAL_STATUS_CODE&gt;</div><div class='add'>+ * -----------------------------------------------------------------------------</div><div class='add'>+ */</div><div class='add'>+static INT ValidateDSDParamsChecksum(PMINI_ADAPTER Adapter, ULONG ulParamOffset,</div><div class='add'>+					USHORT usParamLen)</div><div class='ctx'> {</div><div class='ctx'> 	INT Status = STATUS_SUCCESS;</div><div class='del'>-	PUCHAR puBuffer 		    = NULL;</div><div class='del'>-	USHORT usChksmOrg		    = 0;</div><div class='add'>+	PUCHAR puBuffer = NULL;</div><div class='add'>+	USHORT usChksmOrg = 0;</div><div class='ctx'> 	USHORT usChecksumCalculated = 0;</div><div class='ctx'> </div><div class='del'>-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread:ValidateDSDParamsChecksum: 0x%lx 0x%X",ulParamOffset, usParamLen);</div><div class='add'>+	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,</div><div class='add'>+		"LED Thread:ValidateDSDParamsChecksum: 0x%lx 0x%X",</div><div class='add'>+		ulParamOffset, usParamLen);</div><div class='ctx'> </div><div class='ctx'> 	puBuffer = kmalloc(usParamLen, GFP_KERNEL);</div><div class='del'>-	if(!puBuffer)</div><div class='del'>-	{</div><div class='del'>-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: ValidateDSDParamsChecksum Allocation failed");</div><div class='add'>+	if (!puBuffer) {</div><div class='add'>+		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,</div><div class='add'>+			DBG_LVL_ALL,</div><div class='add'>+			"LED Thread: ValidateDSDParamsChecksum Allocation failed");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-    //</div><div class='del'>-    //	Read the DSD data from the parameter offset.</div><div class='del'>-    //</div><div class='del'>-	if(STATUS_SUCCESS != BeceemNVMRead(Adapter,(PUINT)puBuffer,ulParamOffset,usParamLen))</div><div class='del'>-	{</div><div class='del'>-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: ValidateDSDParamsChecksum BeceemNVMRead failed");</div><div class='del'>-		Status=STATUS_IMAGE_CHECKSUM_MISMATCH;</div><div class='add'>+	/* Read the DSD data from the parameter offset. */</div><div class='add'>+	if (STATUS_SUCCESS != BeceemNVMRead(Adapter, (PUINT)puBuffer,</div><div class='add'>+			ulParamOffset, usParamLen)) {</div><div class='add'>+		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,</div><div class='add'>+			DBG_LVL_ALL,</div><div class='add'>+			"LED Thread: ValidateDSDParamsChecksum BeceemNVMRead failed");</div><div class='add'>+		Status = STATUS_IMAGE_CHECKSUM_MISMATCH;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	//</div><div class='del'>-	//	Calculate the checksum of the data read from the DSD parameter.</div><div class='del'>-	//</div><div class='del'>-	usChecksumCalculated = CFG_CalculateChecksum(puBuffer,usParamLen);</div><div class='del'>-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: usCheckSumCalculated = 0x%x\n", usChecksumCalculated);</div><div class='del'>-</div><div class='del'>-	//</div><div class='del'>-	//	End of the DSD parameter will have a TWO bytes checksum stored in it. Read it and compare with the calculated</div><div class='del'>-	//	Checksum.</div><div class='del'>-	//</div><div class='del'>-	if(STATUS_SUCCESS != BeceemNVMRead(Adapter,(PUINT)&amp;usChksmOrg,ulParamOffset+usParamLen,2))</div><div class='del'>-	{</div><div class='del'>-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: ValidateDSDParamsChecksum BeceemNVMRead failed");</div><div class='del'>-		Status=STATUS_IMAGE_CHECKSUM_MISMATCH;</div><div class='add'>+	/* Calculate the checksum of the data read from the DSD parameter. */</div><div class='add'>+	usChecksumCalculated = CFG_CalculateChecksum(puBuffer, usParamLen);</div><div class='add'>+	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,</div><div class='add'>+		"LED Thread: usCheckSumCalculated = 0x%x\n",</div><div class='add'>+		usChecksumCalculated);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * End of the DSD parameter will have a TWO bytes checksum stored in it.</div><div class='add'>+	 * Read it and compare with the calculated Checksum.</div><div class='add'>+	 */</div><div class='add'>+	if (STATUS_SUCCESS != BeceemNVMRead(Adapter, (PUINT)&amp;usChksmOrg,</div><div class='add'>+			ulParamOffset+usParamLen, 2)) {</div><div class='add'>+		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,</div><div class='add'>+			DBG_LVL_ALL,</div><div class='add'>+			"LED Thread: ValidateDSDParamsChecksum BeceemNVMRead failed");</div><div class='add'>+		Status = STATUS_IMAGE_CHECKSUM_MISMATCH;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> 	usChksmOrg = ntohs(usChksmOrg);</div><div class='del'>-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: usChksmOrg = 0x%x", usChksmOrg);</div><div class='del'>-</div><div class='del'>-	//</div><div class='del'>-	//  	Compare the checksum calculated with the checksum read from DSD section</div><div class='del'>-	//</div><div class='del'>-	if(usChecksumCalculated ^ usChksmOrg)</div><div class='del'>-	{</div><div class='del'>-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: ValidateDSDParamsChecksum: Checksums don't match");</div><div class='add'>+	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,</div><div class='add'>+		"LED Thread: usChksmOrg = 0x%x", usChksmOrg);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Compare the checksum calculated with the checksum read</div><div class='add'>+	 * from DSD section</div><div class='add'>+	 */</div><div class='add'>+	if (usChecksumCalculated ^ usChksmOrg) {</div><div class='add'>+		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,</div><div class='add'>+			DBG_LVL_ALL,</div><div class='add'>+			"LED Thread: ValidateDSDParamsChecksum: Checksums don't match");</div><div class='ctx'> 		Status = STATUS_IMAGE_CHECKSUM_MISMATCH;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -311,523 +332,526 @@ exit:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='del'>-// Procedure:   ValidateHWParmStructure</div><div class='del'>-//</div><div class='del'>-// Description: Validates HW Parameters.</div><div class='del'>-//</div><div class='del'>-// Arguments:</div><div class='del'>-//      Adapter - Pointer to Adapter structure.</div><div class='del'>-//      ulHwParamOffset - Start offset of the HW parameter Section to be read and validated.</div><div class='del'>-//</div><div class='del'>-// Returns:</div><div class='del'>-//  &lt;OSAL_STATUS_CODE&gt;</div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='del'>-</div><div class='add'>+/*</div><div class='add'>+ * -----------------------------------------------------------------------------</div><div class='add'>+ * Procedure:   ValidateHWParmStructure</div><div class='add'>+ *</div><div class='add'>+ * Description: Validates HW Parameters.</div><div class='add'>+ *</div><div class='add'>+ * Arguments:</div><div class='add'>+ *      Adapter - Pointer to Adapter structure.</div><div class='add'>+ *      ulHwParamOffset - Start offset of the HW parameter Section to be read</div><div class='add'>+ *				and validated.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *  &lt;OSAL_STATUS_CODE&gt;</div><div class='add'>+ * -----------------------------------------------------------------------------</div><div class='add'>+ */</div><div class='ctx'> static INT ValidateHWParmStructure(PMINI_ADAPTER Adapter, ULONG ulHwParamOffset)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	INT Status = STATUS_SUCCESS ;</div><div class='add'>+	INT Status = STATUS_SUCCESS;</div><div class='ctx'> 	USHORT HwParamLen = 0;</div><div class='del'>-	// Add DSD start offset to the hwParamOffset to get the actual address.</div><div class='add'>+	/*</div><div class='add'>+	 * Add DSD start offset to the hwParamOffset to get</div><div class='add'>+	 * the actual address.</div><div class='add'>+	 */</div><div class='ctx'> 	ulHwParamOffset += DSD_START_OFFSET;</div><div class='ctx'> </div><div class='del'>-	/*Read the Length of HW_PARAM structure*/</div><div class='del'>-	BeceemNVMRead(Adapter,(PUINT)&amp;HwParamLen,ulHwParamOffset,2);</div><div class='add'>+	/* Read the Length of HW_PARAM structure */</div><div class='add'>+	BeceemNVMRead(Adapter, (PUINT)&amp;HwParamLen, ulHwParamOffset, 2);</div><div class='ctx'> 	HwParamLen = ntohs(HwParamLen);</div><div class='del'>-	if(0==HwParamLen || HwParamLen &gt; Adapter-&gt;uiNVMDSDSize)</div><div class='del'>-	{</div><div class='add'>+	if (0 == HwParamLen || HwParamLen &gt; Adapter-&gt;uiNVMDSDSize)</div><div class='ctx'> 		return STATUS_IMAGE_CHECKSUM_MISMATCH;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL, "LED Thread:HwParamLen = 0x%x", HwParamLen);</div><div class='del'>-	Status =ValidateDSDParamsChecksum(Adapter,ulHwParamOffset,HwParamLen);</div><div class='add'>+	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,</div><div class='add'>+		"LED Thread:HwParamLen = 0x%x", HwParamLen);</div><div class='add'>+	Status = ValidateDSDParamsChecksum(Adapter, ulHwParamOffset,</div><div class='add'>+						HwParamLen);</div><div class='ctx'> 	return Status;</div><div class='ctx'> } /* ValidateHWParmStructure() */</div><div class='ctx'> </div><div class='del'>-static int ReadLEDInformationFromEEPROM(PMINI_ADAPTER Adapter, UCHAR GPIO_Array[])</div><div class='add'>+static int ReadLEDInformationFromEEPROM(PMINI_ADAPTER Adapter,</div><div class='add'>+					UCHAR GPIO_Array[])</div><div class='ctx'> {</div><div class='ctx'> 	int Status = STATUS_SUCCESS;</div><div class='ctx'> </div><div class='del'>-	ULONG  dwReadValue 		= 0;</div><div class='del'>-	USHORT usHwParamData 	= 0;</div><div class='del'>-	USHORT usEEPROMVersion  = 0;</div><div class='del'>-	UCHAR  ucIndex 			= 0;</div><div class='del'>-	UCHAR  ucGPIOInfo[32] 	= {0};</div><div class='add'>+	ULONG  dwReadValue	= 0;</div><div class='add'>+	USHORT usHwParamData	= 0;</div><div class='add'>+	USHORT usEEPROMVersion	= 0;</div><div class='add'>+	UCHAR  ucIndex		= 0;</div><div class='add'>+	UCHAR  ucGPIOInfo[32]	= {0};</div><div class='ctx'> </div><div class='del'>-	BeceemNVMRead(Adapter,(PUINT)&amp;usEEPROMVersion,EEPROM_VERSION_OFFSET,2);</div><div class='add'>+	BeceemNVMRead(Adapter, (PUINT)&amp;usEEPROMVersion,</div><div class='add'>+			EEPROM_VERSION_OFFSET, 2);</div><div class='ctx'> </div><div class='del'>-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"usEEPROMVersion: Minor:0x%X Major:0x%x",usEEPROMVersion&amp;0xFF, ((usEEPROMVersion&gt;&gt;8)&amp;0xFF));</div><div class='add'>+	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,</div><div class='add'>+		"usEEPROMVersion: Minor:0x%X Major:0x%x",</div><div class='add'>+		usEEPROMVersion&amp;0xFF, ((usEEPROMVersion&gt;&gt;8)&amp;0xFF));</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	if(((usEEPROMVersion&gt;&gt;8)&amp;0xFF) &lt; EEPROM_MAP5_MAJORVERSION)</div><div class='del'>-	{</div><div class='del'>-		BeceemNVMRead(Adapter,(PUINT)&amp;usHwParamData,EEPROM_HW_PARAM_POINTER_ADDRESS,2);</div><div class='add'>+	if (((usEEPROMVersion&gt;&gt;8)&amp;0xFF) &lt; EEPROM_MAP5_MAJORVERSION) {</div><div class='add'>+		BeceemNVMRead(Adapter, (PUINT)&amp;usHwParamData,</div><div class='add'>+			EEPROM_HW_PARAM_POINTER_ADDRESS, 2);</div><div class='ctx'> 		usHwParamData = ntohs(usHwParamData);</div><div class='ctx'> 		dwReadValue   = usHwParamData;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		//</div><div class='del'>-		// Validate Compatibility section and then read HW param if compatibility section is valid.</div><div class='del'>-		//</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Validate Compatibility section and then read HW param</div><div class='add'>+		 * if compatibility section is valid.</div><div class='add'>+		 */</div><div class='ctx'> 		Status = ValidateDSDParamsChecksum(Adapter,</div><div class='del'>-			                   DSD_START_OFFSET,</div><div class='del'>-			                   COMPATIBILITY_SECTION_LENGTH_MAP5);</div><div class='add'>+				DSD_START_OFFSET,</div><div class='add'>+				COMPATIBILITY_SECTION_LENGTH_MAP5);</div><div class='ctx'> </div><div class='del'>-		if(Status != STATUS_SUCCESS)</div><div class='del'>-		{</div><div class='add'>+		if (Status != STATUS_SUCCESS)</div><div class='ctx'> 			return Status;</div><div class='del'>-		}</div><div class='del'>-		BeceemNVMRead(Adapter,(PUINT)&amp;dwReadValue,EEPROM_HW_PARAM_POINTER_ADDRRES_MAP5,4);</div><div class='add'>+</div><div class='add'>+		BeceemNVMRead(Adapter, (PUINT)&amp;dwReadValue,</div><div class='add'>+			EEPROM_HW_PARAM_POINTER_ADDRRES_MAP5, 4);</div><div class='ctx'> 		dwReadValue = ntohl(dwReadValue);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: Start address of HW_PARAM structure = 0x%lx",dwReadValue);</div><div class='add'>+	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,</div><div class='add'>+		"LED Thread: Start address of HW_PARAM structure = 0x%lx",</div><div class='add'>+		dwReadValue);</div><div class='ctx'> </div><div class='del'>-	//</div><div class='del'>-	// Validate if the address read out is within the DSD.</div><div class='del'>-	// Adapter-&gt;uiNVMDSDSize gives whole DSD size inclusive of Autoinit.</div><div class='del'>-	// lower limit should be above DSD_START_OFFSET and</div><div class='del'>-	// upper limit should be below (Adapter-&gt;uiNVMDSDSize-DSD_START_OFFSET)</div><div class='del'>-	//</div><div class='del'>-	if(dwReadValue &lt; DSD_START_OFFSET ||</div><div class='del'>-	   dwReadValue &gt; (Adapter-&gt;uiNVMDSDSize-DSD_START_OFFSET))</div><div class='del'>-	{</div><div class='add'>+	/*</div><div class='add'>+	 * Validate if the address read out is within the DSD.</div><div class='add'>+	 * Adapter-&gt;uiNVMDSDSize gives whole DSD size inclusive of Autoinit.</div><div class='add'>+	 * lower limit should be above DSD_START_OFFSET and</div><div class='add'>+	 * upper limit should be below (Adapter-&gt;uiNVMDSDSize-DSD_START_OFFSET)</div><div class='add'>+	 */</div><div class='add'>+	if (dwReadValue &lt; DSD_START_OFFSET ||</div><div class='add'>+			dwReadValue &gt; (Adapter-&gt;uiNVMDSDSize-DSD_START_OFFSET))</div><div class='ctx'> 		return STATUS_IMAGE_CHECKSUM_MISMATCH;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	Status = ValidateHWParmStructure(Adapter, dwReadValue);</div><div class='del'>-	if(Status){</div><div class='add'>+	if (Status)</div><div class='ctx'> 		return Status;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	  Add DSD_START_OFFSET to the offset read from the EEPROM.</div><div class='del'>-	  This will give the actual start HW Parameters start address.</div><div class='del'>-	  To read GPIO section, add GPIO offset further.</div><div class='del'>-	*/</div><div class='del'>-</div><div class='del'>-	dwReadValue += DSD_START_OFFSET; // = start address of hw param section.</div><div class='del'>-	dwReadValue += GPIO_SECTION_START_OFFSET; // = GPIO start offset within HW Param section.</div><div class='del'>-</div><div class='del'>-	/* Read the GPIO values for 32 GPIOs from EEPROM and map the function</div><div class='del'>- 	 * number to GPIO pin number to GPIO_Array</div><div class='del'>- 	 */</div><div class='del'>-	BeceemNVMRead(Adapter, (UINT *)ucGPIOInfo,dwReadValue,32);</div><div class='del'>-	for(ucIndex = 0; ucIndex &lt; 32; ucIndex++)</div><div class='del'>-	 {</div><div class='del'>-</div><div class='del'>-		 switch(ucGPIOInfo[ucIndex])</div><div class='del'>-			{</div><div class='del'>-				case RED_LED:</div><div class='del'>-				{</div><div class='del'>-				 	GPIO_Array[RED_LED] = ucIndex;</div><div class='del'>-				 	Adapter-&gt;gpioBitMap |= (1&lt;&lt;ucIndex);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				case BLUE_LED:</div><div class='del'>-				{</div><div class='del'>-					GPIO_Array[BLUE_LED] = ucIndex;</div><div class='del'>-					Adapter-&gt;gpioBitMap |= (1&lt;&lt;ucIndex);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				case YELLOW_LED:</div><div class='del'>-				{</div><div class='del'>-					 GPIO_Array[YELLOW_LED] = ucIndex;</div><div class='del'>-					 Adapter-&gt;gpioBitMap |= (1&lt;&lt;ucIndex);</div><div class='del'>-					 break;</div><div class='del'>-				}</div><div class='del'>-				case GREEN_LED:</div><div class='del'>-				{</div><div class='del'>-					GPIO_Array[GREEN_LED] = ucIndex;</div><div class='del'>-				 	Adapter-&gt;gpioBitMap |= (1&lt;&lt;ucIndex);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				default:</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='add'>+	 * Add DSD_START_OFFSET to the offset read from the EEPROM.</div><div class='add'>+	 * This will give the actual start HW Parameters start address.</div><div class='add'>+	 * To read GPIO section, add GPIO offset further.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	dwReadValue +=</div><div class='add'>+		DSD_START_OFFSET; /* = start address of hw param section. */</div><div class='add'>+	dwReadValue += GPIO_SECTION_START_OFFSET;</div><div class='add'>+			/* = GPIO start offset within HW Param section. */</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Read the GPIO values for 32 GPIOs from EEPROM and map the function</div><div class='add'>+	 * number to GPIO pin number to GPIO_Array</div><div class='add'>+	 */</div><div class='add'>+	BeceemNVMRead(Adapter, (UINT *)ucGPIOInfo, dwReadValue, 32);</div><div class='add'>+	for (ucIndex = 0; ucIndex &lt; 32; ucIndex++) {</div><div class='add'>+</div><div class='add'>+		switch (ucGPIOInfo[ucIndex]) {</div><div class='add'>+		case RED_LED:</div><div class='add'>+			GPIO_Array[RED_LED] = ucIndex;</div><div class='add'>+			Adapter-&gt;gpioBitMap |= (1 &lt;&lt; ucIndex);</div><div class='add'>+			break;</div><div class='add'>+		case BLUE_LED:</div><div class='add'>+			GPIO_Array[BLUE_LED] = ucIndex;</div><div class='add'>+			Adapter-&gt;gpioBitMap |= (1 &lt;&lt; ucIndex);</div><div class='add'>+			break;</div><div class='add'>+		case YELLOW_LED:</div><div class='add'>+			GPIO_Array[YELLOW_LED] = ucIndex;</div><div class='add'>+			Adapter-&gt;gpioBitMap |= (1 &lt;&lt; ucIndex);</div><div class='add'>+			break;</div><div class='add'>+		case GREEN_LED:</div><div class='add'>+			GPIO_Array[GREEN_LED] = ucIndex;</div><div class='add'>+			Adapter-&gt;gpioBitMap |= (1 &lt;&lt; ucIndex);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='del'>-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"GPIO's bit map correspond to LED :0x%X",Adapter-&gt;gpioBitMap);</div><div class='del'>-	 return Status;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,</div><div class='add'>+		"GPIO's bit map correspond to LED :0x%X", Adapter-&gt;gpioBitMap);</div><div class='add'>+	return Status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int ReadConfigFileStructure(PMINI_ADAPTER Adapter, BOOLEAN *bEnableThread)</div><div class='add'>+static int ReadConfigFileStructure(PMINI_ADAPTER Adapter,</div><div class='add'>+					BOOLEAN *bEnableThread)</div><div class='ctx'> {</div><div class='ctx'> 	int Status = STATUS_SUCCESS;</div><div class='del'>-	UCHAR GPIO_Array[NUM_OF_LEDS+1]; /*Array to store GPIO numbers from EEPROM*/</div><div class='add'>+	/* Array to store GPIO numbers from EEPROM */</div><div class='add'>+	UCHAR GPIO_Array[NUM_OF_LEDS+1];</div><div class='ctx'> 	UINT uiIndex = 0;</div><div class='ctx'> 	UINT uiNum_of_LED_Type = 0;</div><div class='ctx'> 	PUCHAR puCFGData	= NULL;</div><div class='ctx'> 	UCHAR bData = 0;</div><div class='ctx'> 	memset(GPIO_Array, DISABLE_GPIO_NUM, NUM_OF_LEDS+1);</div><div class='ctx'> </div><div class='del'>-	if(!Adapter-&gt;pstargetparams || IS_ERR(Adapter-&gt;pstargetparams))</div><div class='del'>-	{</div><div class='del'>-		BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL, "Target Params not Avail.\n");</div><div class='add'>+	if (!Adapter-&gt;pstargetparams || IS_ERR(Adapter-&gt;pstargetparams)) {</div><div class='add'>+		BCM_DEBUG_PRINT (Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,</div><div class='add'>+			DBG_LVL_ALL, "Target Params not Avail.\n");</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*Populate GPIO_Array with GPIO numbers for LED functions*/</div><div class='del'>-	/*Read the GPIO numbers from EEPROM*/</div><div class='add'>+	/* Populate GPIO_Array with GPIO numbers for LED functions */</div><div class='add'>+	/* Read the GPIO numbers from EEPROM */</div><div class='ctx'> 	Status = ReadLEDInformationFromEEPROM(Adapter, GPIO_Array);</div><div class='del'>-	if(Status == STATUS_IMAGE_CHECKSUM_MISMATCH)</div><div class='del'>-	{</div><div class='add'>+	if (Status == STATUS_IMAGE_CHECKSUM_MISMATCH) {</div><div class='ctx'> 		*bEnableThread = FALSE;</div><div class='ctx'> 		return STATUS_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-	else if(Status)</div><div class='del'>-	{</div><div class='add'>+	} else if (Status) {</div><div class='ctx'> 		*bEnableThread = FALSE;</div><div class='ctx'> 		return Status;</div><div class='ctx'> 	}</div><div class='del'>-  /*</div><div class='del'>-     * CONFIG file read successfully. Deallocate the memory of</div><div class='del'>-     * uiFileNameBufferSize</div><div class='del'>-     */</div><div class='del'>-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: Config file read successfully\n");</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * CONFIG file read successfully. Deallocate the memory of</div><div class='add'>+	 * uiFileNameBufferSize</div><div class='add'>+	 */</div><div class='add'>+	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,</div><div class='add'>+		"LED Thread: Config file read successfully\n");</div><div class='ctx'> 	puCFGData = (PUCHAR) &amp;Adapter-&gt;pstargetparams-&gt;HostDrvrConfig1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>- 	 * Offset for HostDrvConfig1, HostDrvConfig2, HostDrvConfig3 which</div><div class='del'>- 	 * will have the information of LED type, LED on state for different</div><div class='del'>- 	 * driver state and LED blink state.</div><div class='del'>- 	 */</div><div class='add'>+	 * Offset for HostDrvConfig1, HostDrvConfig2, HostDrvConfig3 which</div><div class='add'>+	 * will have the information of LED type, LED on state for different</div><div class='add'>+	 * driver state and LED blink state.</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='del'>-	for(uiIndex = 0; uiIndex &lt; NUM_OF_LEDS; uiIndex++)</div><div class='del'>-	{</div><div class='add'>+	for (uiIndex = 0; uiIndex &lt; NUM_OF_LEDS; uiIndex++) {</div><div class='ctx'> 		bData = *puCFGData;</div><div class='ctx'> </div><div class='del'>-		/*Check Bit 8 for polarity. If it is set, polarity is reverse polarity*/</div><div class='del'>-		if(bData &amp; 0x80)</div><div class='del'>-		{</div><div class='add'>+		/*</div><div class='add'>+		 * Check Bit 8 for polarity. If it is set,</div><div class='add'>+		 * polarity is reverse polarity</div><div class='add'>+		 */</div><div class='add'>+		if (bData &amp; 0x80) {</div><div class='ctx'> 			Adapter-&gt;LEDInfo.LEDState[uiIndex].BitPolarity = 0;</div><div class='del'>-			/*unset the bit 8*/</div><div class='add'>+			/* unset the bit 8 */</div><div class='ctx'> 			bData = bData &amp; 0x7f;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		Adapter-&gt;LEDInfo.LEDState[uiIndex].LED_Type = bData;</div><div class='del'>-		if(bData &lt;= NUM_OF_LEDS)</div><div class='del'>-			Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num = GPIO_Array[bData];</div><div class='add'>+		if (bData &lt;= NUM_OF_LEDS)</div><div class='add'>+			Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num =</div><div class='add'>+							GPIO_Array[bData];</div><div class='ctx'> 		else</div><div class='del'>-			Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num = DISABLE_GPIO_NUM;</div><div class='add'>+			Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num =</div><div class='add'>+							DISABLE_GPIO_NUM;</div><div class='ctx'> </div><div class='ctx'> 		puCFGData++;</div><div class='ctx'> 		bData = *puCFGData;</div><div class='ctx'> 		Adapter-&gt;LEDInfo.LEDState[uiIndex].LED_On_State = bData;</div><div class='ctx'> 		puCFGData++;</div><div class='ctx'> 		bData = *puCFGData;</div><div class='del'>-		Adapter-&gt;LEDInfo.LEDState[uiIndex].LED_Blink_State= bData;</div><div class='add'>+		Adapter-&gt;LEDInfo.LEDState[uiIndex].LED_Blink_State = bData;</div><div class='ctx'> 		puCFGData++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*Check if all the LED settings are disabled. If it is disabled, dont launch the LED control thread.*/</div><div class='del'>-	for(uiIndex = 0; uiIndex&lt;NUM_OF_LEDS; uiIndex++)</div><div class='del'>-	{</div><div class='del'>-		if((Adapter-&gt;LEDInfo.LEDState[uiIndex].LED_Type == DISABLE_GPIO_NUM) ||</div><div class='del'>-	 		(Adapter-&gt;LEDInfo.LEDState[uiIndex].LED_Type == 0x7f) ||</div><div class='add'>+	/*</div><div class='add'>+	 * Check if all the LED settings are disabled. If it is disabled,</div><div class='add'>+	 * dont launch the LED control thread.</div><div class='add'>+	 */</div><div class='add'>+	for (uiIndex = 0; uiIndex &lt; NUM_OF_LEDS; uiIndex++) {</div><div class='add'>+		if ((Adapter-&gt;LEDInfo.LEDState[uiIndex].LED_Type == DISABLE_GPIO_NUM) ||</div><div class='add'>+			(Adapter-&gt;LEDInfo.LEDState[uiIndex].LED_Type == 0x7f) ||</div><div class='ctx'> 			(Adapter-&gt;LEDInfo.LEDState[uiIndex].LED_Type == 0))</div><div class='ctx'> 			uiNum_of_LED_Type++;</div><div class='ctx'> 	}</div><div class='del'>-	if(uiNum_of_LED_Type &gt;= NUM_OF_LEDS)</div><div class='add'>+	if (uiNum_of_LED_Type &gt;= NUM_OF_LEDS)</div><div class='ctx'> 		*bEnableThread = FALSE;</div><div class='ctx'> </div><div class='ctx'> 	return Status;</div><div class='ctx'> }</div><div class='del'>-//--------------------------------------------------------------------------</div><div class='del'>-// Procedure:   LedGpioInit</div><div class='del'>-//</div><div class='del'>-// Description: Initializes LED GPIOs. Makes the LED GPIOs to OUTPUT mode and make the</div><div class='del'>-//			  initial state to be OFF.</div><div class='del'>-//</div><div class='del'>-// Arguments:</div><div class='del'>-//      Adapter - Pointer to MINI_ADAPTER structure.</div><div class='del'>-//</div><div class='del'>-// Returns: VOID</div><div class='del'>-//</div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * -----------------------------------------------------------------------------</div><div class='add'>+ * Procedure:   LedGpioInit</div><div class='add'>+ *</div><div class='add'>+ * Description: Initializes LED GPIOs. Makes the LED GPIOs to OUTPUT mode</div><div class='add'>+ *			  and make the initial state to be OFF.</div><div class='add'>+ *</div><div class='add'>+ * Arguments:</div><div class='add'>+ *      Adapter - Pointer to MINI_ADAPTER structure.</div><div class='add'>+ *</div><div class='add'>+ * Returns: VOID</div><div class='add'>+ *</div><div class='add'>+ * -----------------------------------------------------------------------------</div><div class='add'>+ */</div><div class='ctx'> static VOID LedGpioInit(PMINI_ADAPTER Adapter)</div><div class='ctx'> {</div><div class='ctx'> 	UINT uiResetValue = 0;</div><div class='ctx'> 	UINT uiIndex      = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Set all LED GPIO Mode to output mode */</div><div class='del'>-	if(rdmalt(Adapter, GPIO_MODE_REGISTER, &amp;uiResetValue, sizeof(uiResetValue)) &lt;0)</div><div class='del'>-		BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: RDM Failed\n");</div><div class='del'>-	for(uiIndex = 0; uiIndex &lt; NUM_OF_LEDS; uiIndex++)</div><div class='del'>-	{</div><div class='del'>-		if(Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num != DISABLE_GPIO_NUM)</div><div class='add'>+	if (rdmalt(Adapter, GPIO_MODE_REGISTER, &amp;uiResetValue,</div><div class='add'>+			sizeof(uiResetValue)) &lt; 0)</div><div class='add'>+		BCM_DEBUG_PRINT (Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,</div><div class='add'>+			DBG_LVL_ALL, "LED Thread: RDM Failed\n");</div><div class='add'>+	for (uiIndex = 0; uiIndex &lt; NUM_OF_LEDS; uiIndex++) {</div><div class='add'>+		if (Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num !=</div><div class='add'>+				DISABLE_GPIO_NUM)</div><div class='ctx'> 			uiResetValue |= (1 &lt;&lt; Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num);</div><div class='del'>-		TURN_OFF_LED(1&lt;&lt;Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num,uiIndex);</div><div class='add'>+		TURN_OFF_LED(1 &lt;&lt; Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num,</div><div class='add'>+				uiIndex);</div><div class='ctx'> 	}</div><div class='del'>-	if(wrmalt(Adapter, GPIO_MODE_REGISTER, &amp;uiResetValue, sizeof(uiResetValue)) &lt; 0)</div><div class='del'>-		BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: WRM Failed\n");</div><div class='add'>+	if (wrmalt(Adapter, GPIO_MODE_REGISTER, &amp;uiResetValue,</div><div class='add'>+			sizeof(uiResetValue)) &lt; 0)</div><div class='add'>+		BCM_DEBUG_PRINT (Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,</div><div class='add'>+			DBG_LVL_ALL, "LED Thread: WRM Failed\n");</div><div class='ctx'> </div><div class='del'>-	Adapter-&gt;LEDInfo.bIdle_led_off =  FALSE;</div><div class='add'>+	Adapter-&gt;LEDInfo.bIdle_led_off = FALSE;</div><div class='ctx'> }</div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>-static INT BcmGetGPIOPinInfo(PMINI_ADAPTER Adapter, UCHAR *GPIO_num_tx, UCHAR *GPIO_num_rx ,UCHAR *uiLedTxIndex, UCHAR *uiLedRxIndex,LedEventInfo_t currdriverstate)</div><div class='add'>+static INT BcmGetGPIOPinInfo(PMINI_ADAPTER Adapter, UCHAR *GPIO_num_tx,</div><div class='add'>+		UCHAR *GPIO_num_rx, UCHAR *uiLedTxIndex, UCHAR *uiLedRxIndex,</div><div class='add'>+		LedEventInfo_t currdriverstate)</div><div class='ctx'> {</div><div class='ctx'> 	UINT uiIndex = 0;</div><div class='ctx'> </div><div class='ctx'> 	*GPIO_num_tx = DISABLE_GPIO_NUM;</div><div class='ctx'> 	*GPIO_num_rx = DISABLE_GPIO_NUM;</div><div class='ctx'> </div><div class='del'>-	for(uiIndex = 0; uiIndex &lt; NUM_OF_LEDS; uiIndex++)</div><div class='del'>-	{</div><div class='add'>+	for (uiIndex = 0; uiIndex &lt; NUM_OF_LEDS; uiIndex++) {</div><div class='ctx'> </div><div class='del'>-		if((currdriverstate == NORMAL_OPERATION)||</div><div class='del'>-			(currdriverstate == IDLEMODE_EXIT)||</div><div class='del'>-			(currdriverstate == FW_DOWNLOAD))</div><div class='del'>-		{</div><div class='del'>-			if(Adapter-&gt;LEDInfo.LEDState[uiIndex].LED_Blink_State &amp; currdriverstate)</div><div class='del'>-			{</div><div class='del'>-				if(Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num != DISABLE_GPIO_NUM)</div><div class='del'>-				{</div><div class='del'>-					if(*GPIO_num_tx == DISABLE_GPIO_NUM)</div><div class='del'>-					{</div><div class='add'>+		if ((currdriverstate == NORMAL_OPERATION) ||</div><div class='add'>+				(currdriverstate == IDLEMODE_EXIT) ||</div><div class='add'>+				(currdriverstate == FW_DOWNLOAD)) {</div><div class='add'>+			if (Adapter-&gt;LEDInfo.LEDState[uiIndex].LED_Blink_State &amp;</div><div class='add'>+					currdriverstate) {</div><div class='add'>+				if (Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num</div><div class='add'>+						!= DISABLE_GPIO_NUM) {</div><div class='add'>+					if (*GPIO_num_tx == DISABLE_GPIO_NUM) {</div><div class='ctx'> 						*GPIO_num_tx = Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num;</div><div class='ctx'> 						*uiLedTxIndex = uiIndex;</div><div class='del'>-					}</div><div class='del'>-					else</div><div class='del'>-					{</div><div class='add'>+					} else {</div><div class='ctx'> 						*GPIO_num_rx = Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num;</div><div class='ctx'> 						*uiLedRxIndex = uiIndex;</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			if(Adapter-&gt;LEDInfo.LEDState[uiIndex].LED_On_State &amp; currdriverstate)</div><div class='del'>-			{</div><div class='del'>-				if(Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num != DISABLE_GPIO_NUM)</div><div class='del'>-				{</div><div class='add'>+		} else {</div><div class='add'>+			if (Adapter-&gt;LEDInfo.LEDState[uiIndex].LED_On_State</div><div class='add'>+					&amp; currdriverstate) {</div><div class='add'>+				if (Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num</div><div class='add'>+						!= DISABLE_GPIO_NUM) {</div><div class='ctx'> 					*GPIO_num_tx = Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num;</div><div class='ctx'> 					*uiLedTxIndex = uiIndex;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return STATUS_SUCCESS ;</div><div class='add'>+	return STATUS_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> static VOID LEDControlThread(PMINI_ADAPTER Adapter)</div><div class='ctx'> {</div><div class='ctx'> 	UINT uiIndex = 0;</div><div class='ctx'> 	UCHAR GPIO_num = 0;</div><div class='del'>-	UCHAR uiLedIndex = 0 ;</div><div class='add'>+	UCHAR uiLedIndex = 0;</div><div class='ctx'> 	UINT uiResetValue = 0;</div><div class='ctx'> 	LedEventInfo_t currdriverstate = 0;</div><div class='ctx'> 	ulong timeout = 0;</div><div class='ctx'> </div><div class='ctx'> 	INT Status = 0;</div><div class='ctx'> </div><div class='del'>-	UCHAR  dummyGPIONum = 0;</div><div class='del'>-	UCHAR  dummyIndex = 0;</div><div class='add'>+	UCHAR dummyGPIONum = 0;</div><div class='add'>+	UCHAR dummyIndex = 0;</div><div class='ctx'> </div><div class='del'>-	//currdriverstate = Adapter-&gt;DriverState;</div><div class='add'>+	/* currdriverstate = Adapter-&gt;DriverState; */</div><div class='ctx'> 	Adapter-&gt;LEDInfo.bIdleMode_tx_from_host = FALSE;</div><div class='ctx'> </div><div class='del'>-	/*Wait till event is triggered*/</div><div class='del'>-	//wait_event(Adapter-&gt;LEDInfo.notify_led_event,</div><div class='del'>-			//	currdriverstate!= Adapter-&gt;DriverState);</div><div class='add'>+	/*</div><div class='add'>+	 * Wait till event is triggered</div><div class='add'>+	 *</div><div class='add'>+	 * wait_event(Adapter-&gt;LEDInfo.notify_led_event,</div><div class='add'>+	 *	currdriverstate!= Adapter-&gt;DriverState);</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='del'>-	GPIO_num = DISABLE_GPIO_NUM ;</div><div class='add'>+	GPIO_num = DISABLE_GPIO_NUM;</div><div class='ctx'> </div><div class='del'>-	while(TRUE)</div><div class='del'>-	{</div><div class='del'>-		/*Wait till event is triggered*/</div><div class='del'>-		if( (GPIO_num == DISABLE_GPIO_NUM)</div><div class='add'>+	while (TRUE) {</div><div class='add'>+		/* Wait till event is triggered */</div><div class='add'>+		if ((GPIO_num == DISABLE_GPIO_NUM)</div><div class='ctx'> 						||</div><div class='del'>-			((currdriverstate != FW_DOWNLOAD) &amp;&amp;</div><div class='del'>-			 (currdriverstate != NORMAL_OPERATION) &amp;&amp;</div><div class='del'>-			 (currdriverstate != LOWPOWER_MODE_ENTER))</div><div class='del'>-			 			||</div><div class='del'>-			 (currdriverstate == LED_THREAD_INACTIVE)	)</div><div class='del'>-		{</div><div class='del'>-			Status = wait_event_interruptible(Adapter-&gt;LEDInfo.notify_led_event,</div><div class='del'>-				currdriverstate != Adapter-&gt;DriverState || kthread_should_stop());</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if(kthread_should_stop() || Adapter-&gt;device_removed )</div><div class='del'>-		{</div><div class='del'>-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL, "Led thread got signal to exit..hence exiting");</div><div class='del'>-			Adapter-&gt;LEDInfo.led_thread_running = BCM_LED_THREAD_DISABLED;</div><div class='del'>-			TURN_OFF_LED(1&lt;&lt;GPIO_num, uiLedIndex);</div><div class='del'>-			return ;//STATUS_FAILURE;</div><div class='add'>+				((currdriverstate != FW_DOWNLOAD) &amp;&amp;</div><div class='add'>+				 (currdriverstate != NORMAL_OPERATION) &amp;&amp;</div><div class='add'>+				 (currdriverstate != LOWPOWER_MODE_ENTER))</div><div class='add'>+						||</div><div class='add'>+				(currdriverstate == LED_THREAD_INACTIVE))</div><div class='add'>+			Status = wait_event_interruptible(</div><div class='add'>+					Adapter-&gt;LEDInfo.notify_led_event,</div><div class='add'>+					currdriverstate != Adapter-&gt;DriverState</div><div class='add'>+						|| kthread_should_stop());</div><div class='add'>+</div><div class='add'>+		if (kthread_should_stop() || Adapter-&gt;device_removed) {</div><div class='add'>+			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,</div><div class='add'>+				DBG_LVL_ALL,</div><div class='add'>+				"Led thread got signal to exit..hence exiting");</div><div class='add'>+			Adapter-&gt;LEDInfo.led_thread_running =</div><div class='add'>+						BCM_LED_THREAD_DISABLED;</div><div class='add'>+			TURN_OFF_LED(1 &lt;&lt; GPIO_num, uiLedIndex);</div><div class='add'>+			return; /* STATUS_FAILURE; */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if(GPIO_num != DISABLE_GPIO_NUM)</div><div class='del'>-		{</div><div class='del'>-			TURN_OFF_LED(1&lt;&lt;GPIO_num, uiLedIndex);</div><div class='del'>-		}</div><div class='add'>+		if (GPIO_num != DISABLE_GPIO_NUM)</div><div class='add'>+			TURN_OFF_LED(1 &lt;&lt; GPIO_num, uiLedIndex);</div><div class='ctx'> </div><div class='del'>-		if(Adapter-&gt;LEDInfo.bLedInitDone == FALSE)</div><div class='del'>-		{</div><div class='add'>+		if (Adapter-&gt;LEDInfo.bLedInitDone == FALSE) {</div><div class='ctx'> 			LedGpioInit(Adapter);</div><div class='ctx'> 			Adapter-&gt;LEDInfo.bLedInitDone = TRUE;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		switch(Adapter-&gt;DriverState)</div><div class='del'>-		{</div><div class='del'>-			case DRIVER_INIT:</div><div class='del'>-			{</div><div class='del'>-				currdriverstate = DRIVER_INIT;//Adapter-&gt;DriverState;</div><div class='del'>-				BcmGetGPIOPinInfo(Adapter, &amp;GPIO_num, &amp;dummyGPIONum, &amp;uiLedIndex, &amp;dummyIndex, currdriverstate);</div><div class='add'>+		switch (Adapter-&gt;DriverState) {</div><div class='add'>+		case DRIVER_INIT:</div><div class='add'>+			currdriverstate = DRIVER_INIT;</div><div class='add'>+					/* Adapter-&gt;DriverState; */</div><div class='add'>+			BcmGetGPIOPinInfo(Adapter, &amp;GPIO_num, &amp;dummyGPIONum,</div><div class='add'>+				&amp;uiLedIndex, &amp;dummyIndex, currdriverstate);</div><div class='add'>+</div><div class='add'>+			if (GPIO_num != DISABLE_GPIO_NUM)</div><div class='add'>+				TURN_ON_LED(1 &lt;&lt; GPIO_num, uiLedIndex);</div><div class='ctx'> </div><div class='del'>-				if(GPIO_num  != DISABLE_GPIO_NUM)</div><div class='del'>-				{</div><div class='del'>-					TURN_ON_LED(1&lt;&lt;GPIO_num, uiLedIndex);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='ctx'> 			break;</div><div class='del'>-			case FW_DOWNLOAD:</div><div class='del'>-			{</div><div class='del'>-				//BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: FW_DN_DONE called\n");</div><div class='del'>-				currdriverstate = FW_DOWNLOAD;</div><div class='del'>-				BcmGetGPIOPinInfo(Adapter, &amp;GPIO_num, &amp;dummyGPIONum,  &amp;uiLedIndex, &amp;dummyIndex, currdriverstate);</div><div class='del'>-</div><div class='del'>-				if(GPIO_num != DISABLE_GPIO_NUM)</div><div class='del'>-				{</div><div class='del'>-					timeout = 50;</div><div class='del'>-					LED_Blink(Adapter, 1&lt;&lt;GPIO_num, uiLedIndex, timeout, -1,currdriverstate);</div><div class='del'>-				}</div><div class='add'>+		case FW_DOWNLOAD:</div><div class='add'>+			/*</div><div class='add'>+			 * BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,</div><div class='add'>+			 *	LED_DUMP_INFO, DBG_LVL_ALL,</div><div class='add'>+			 *	"LED Thread: FW_DN_DONE called\n");</div><div class='add'>+			 */</div><div class='add'>+			currdriverstate = FW_DOWNLOAD;</div><div class='add'>+			BcmGetGPIOPinInfo(Adapter, &amp;GPIO_num, &amp;dummyGPIONum,</div><div class='add'>+				&amp;uiLedIndex, &amp;dummyIndex, currdriverstate);</div><div class='add'>+</div><div class='add'>+			if (GPIO_num != DISABLE_GPIO_NUM) {</div><div class='add'>+				timeout = 50;</div><div class='add'>+				LED_Blink(Adapter, 1 &lt;&lt; GPIO_num, uiLedIndex,</div><div class='add'>+					timeout, -1, currdriverstate);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='del'>-			case FW_DOWNLOAD_DONE:</div><div class='del'>-			{</div><div class='del'>-				currdriverstate = FW_DOWNLOAD_DONE;</div><div class='del'>-				BcmGetGPIOPinInfo(Adapter, &amp;GPIO_num, &amp;dummyGPIONum, &amp;uiLedIndex, &amp;dummyIndex,currdriverstate);</div><div class='del'>-				if(GPIO_num != DISABLE_GPIO_NUM)</div><div class='del'>-				{</div><div class='del'>-					TURN_ON_LED(1&lt;&lt;GPIO_num, uiLedIndex);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='add'>+		case FW_DOWNLOAD_DONE:</div><div class='add'>+			currdriverstate = FW_DOWNLOAD_DONE;</div><div class='add'>+			BcmGetGPIOPinInfo(Adapter, &amp;GPIO_num, &amp;dummyGPIONum,</div><div class='add'>+				&amp;uiLedIndex, &amp;dummyIndex, currdriverstate);</div><div class='add'>+			if (GPIO_num != DISABLE_GPIO_NUM)</div><div class='add'>+				TURN_ON_LED(1 &lt;&lt; GPIO_num, uiLedIndex);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-			case SHUTDOWN_EXIT:</div><div class='del'>-			//no break, continue to NO_NETWORK_ENTRY state as well.</div><div class='del'>-</div><div class='del'>-			case NO_NETWORK_ENTRY:</div><div class='del'>-			{</div><div class='del'>-				currdriverstate = NO_NETWORK_ENTRY;</div><div class='del'>-				BcmGetGPIOPinInfo(Adapter, &amp;GPIO_num, &amp;dummyGPIONum, &amp;uiLedIndex,&amp;dummyGPIONum,currdriverstate);</div><div class='del'>-				if(GPIO_num != DISABLE_GPIO_NUM)</div><div class='del'>-				{</div><div class='del'>-					TURN_ON_LED(1&lt;&lt;GPIO_num, uiLedIndex);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='add'>+		case SHUTDOWN_EXIT:</div><div class='add'>+			/*</div><div class='add'>+			 * no break, continue to NO_NETWORK_ENTRY</div><div class='add'>+			 * state as well.</div><div class='add'>+			 */</div><div class='add'>+		case NO_NETWORK_ENTRY:</div><div class='add'>+			currdriverstate = NO_NETWORK_ENTRY;</div><div class='add'>+			BcmGetGPIOPinInfo(Adapter, &amp;GPIO_num, &amp;dummyGPIONum,</div><div class='add'>+				&amp;uiLedIndex, &amp;dummyGPIONum, currdriverstate);</div><div class='add'>+			if (GPIO_num != DISABLE_GPIO_NUM)</div><div class='add'>+				TURN_ON_LED(1 &lt;&lt; GPIO_num, uiLedIndex);</div><div class='ctx'> 			break;</div><div class='del'>-			case NORMAL_OPERATION:</div><div class='add'>+		case NORMAL_OPERATION:</div><div class='ctx'> 			{</div><div class='ctx'> 				UCHAR GPIO_num_tx = DISABLE_GPIO_NUM;</div><div class='ctx'> 				UCHAR GPIO_num_rx = DISABLE_GPIO_NUM;</div><div class='ctx'> 				UCHAR uiLEDTx = 0;</div><div class='ctx'> 				UCHAR uiLEDRx = 0;</div><div class='ctx'> 				currdriverstate = NORMAL_OPERATION;</div><div class='del'>-				Adapter-&gt;LEDInfo.bIdle_led_off =  FALSE;</div><div class='del'>-</div><div class='del'>-				BcmGetGPIOPinInfo(Adapter, &amp;GPIO_num_tx, &amp;GPIO_num_rx, &amp;uiLEDTx,&amp;uiLEDRx,currdriverstate);</div><div class='del'>-				if((GPIO_num_tx == DISABLE_GPIO_NUM) &amp;&amp; (GPIO_num_rx == DISABLE_GPIO_NUM))</div><div class='del'>-				{</div><div class='del'>-					GPIO_num = DISABLE_GPIO_NUM ;</div><div class='del'>-				}</div><div class='del'>-				else</div><div class='del'>-				{</div><div class='del'>-					/*If single LED is selected, use same for both Tx and Rx*/</div><div class='del'>-					if(GPIO_num_tx == DISABLE_GPIO_NUM)</div><div class='del'>-					{</div><div class='add'>+				Adapter-&gt;LEDInfo.bIdle_led_off = FALSE;</div><div class='add'>+</div><div class='add'>+				BcmGetGPIOPinInfo(Adapter, &amp;GPIO_num_tx,</div><div class='add'>+					&amp;GPIO_num_rx, &amp;uiLEDTx, &amp;uiLEDRx,</div><div class='add'>+					currdriverstate);</div><div class='add'>+				if ((GPIO_num_tx == DISABLE_GPIO_NUM) &amp;&amp;</div><div class='add'>+						(GPIO_num_rx ==</div><div class='add'>+						 DISABLE_GPIO_NUM)) {</div><div class='add'>+					GPIO_num = DISABLE_GPIO_NUM;</div><div class='add'>+				} else {</div><div class='add'>+					/*</div><div class='add'>+					 * If single LED is selected, use same</div><div class='add'>+					 * for both Tx and Rx</div><div class='add'>+					 */</div><div class='add'>+					if (GPIO_num_tx == DISABLE_GPIO_NUM) {</div><div class='ctx'> 						GPIO_num_tx = GPIO_num_rx;</div><div class='ctx'> 						uiLEDTx = uiLEDRx;</div><div class='del'>-					}</div><div class='del'>-					else if(GPIO_num_rx == DISABLE_GPIO_NUM)</div><div class='del'>-					{</div><div class='add'>+					} else if (GPIO_num_rx ==</div><div class='add'>+							DISABLE_GPIO_NUM) {</div><div class='ctx'> 						GPIO_num_rx = GPIO_num_tx;</div><div class='ctx'> 						uiLEDRx = uiLEDTx;</div><div class='ctx'> 					}</div><div class='del'>-				/*Blink the LED in proportionate to Tx and Rx transmissions.*/</div><div class='del'>-					LED_Proportional_Blink(Adapter, GPIO_num_tx, uiLEDTx, GPIO_num_rx, uiLEDRx,currdriverstate);</div><div class='add'>+					/*</div><div class='add'>+					 * Blink the LED in proportionate</div><div class='add'>+					 * to Tx and Rx transmissions.</div><div class='add'>+					 */</div><div class='add'>+					LED_Proportional_Blink(Adapter,</div><div class='add'>+						GPIO_num_tx, uiLEDTx,</div><div class='add'>+						GPIO_num_rx, uiLEDRx,</div><div class='add'>+						currdriverstate);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='del'>-			case LOWPOWER_MODE_ENTER:</div><div class='del'>-			{</div><div class='del'>-				currdriverstate  = LOWPOWER_MODE_ENTER;</div><div class='del'>-				if( DEVICE_POWERSAVE_MODE_AS_MANUAL_CLOCK_GATING == Adapter-&gt;ulPowerSaveMode)</div><div class='del'>-				{</div><div class='del'>-					/* Turn OFF all the LED */</div><div class='del'>-					uiResetValue = 0;</div><div class='del'>-					for(uiIndex =0; uiIndex &lt; NUM_OF_LEDS; uiIndex++)</div><div class='del'>-					{</div><div class='del'>-						if(Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num != DISABLE_GPIO_NUM)</div><div class='del'>-						TURN_OFF_LED((1&lt;&lt;Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num),uiIndex);</div><div class='del'>-					}</div><div class='del'>-</div><div class='add'>+		case LOWPOWER_MODE_ENTER:</div><div class='add'>+			currdriverstate = LOWPOWER_MODE_ENTER;</div><div class='add'>+			if (DEVICE_POWERSAVE_MODE_AS_MANUAL_CLOCK_GATING ==</div><div class='add'>+					Adapter-&gt;ulPowerSaveMode) {</div><div class='add'>+				/* Turn OFF all the LED */</div><div class='add'>+				uiResetValue = 0;</div><div class='add'>+				for (uiIndex = 0; uiIndex &lt; NUM_OF_LEDS; uiIndex++) {</div><div class='add'>+					if (Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num != DISABLE_GPIO_NUM)</div><div class='add'>+						TURN_OFF_LED((1 &lt;&lt; Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num), uiIndex);</div><div class='ctx'> 				}</div><div class='del'>-				/* Turn off LED And WAKE-UP for Sendinf IDLE mode ACK */</div><div class='del'>-				Adapter-&gt;LEDInfo.bLedInitDone = FALSE;</div><div class='del'>-				Adapter-&gt;LEDInfo.bIdle_led_off =  TRUE;</div><div class='del'>-				wake_up(&amp;Adapter-&gt;LEDInfo.idleModeSyncEvent);</div><div class='del'>-				GPIO_num = DISABLE_GPIO_NUM;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			case IDLEMODE_CONTINUE:</div><div class='del'>-			{</div><div class='del'>-				currdriverstate = IDLEMODE_CONTINUE;</div><div class='del'>-				GPIO_num = DISABLE_GPIO_NUM;</div><div class='add'>+</div><div class='ctx'> 			}</div><div class='add'>+			/* Turn off LED And WAKE-UP for Sendinf IDLE mode ACK */</div><div class='add'>+			Adapter-&gt;LEDInfo.bLedInitDone = FALSE;</div><div class='add'>+			Adapter-&gt;LEDInfo.bIdle_led_off = TRUE;</div><div class='add'>+			wake_up(&amp;Adapter-&gt;LEDInfo.idleModeSyncEvent);</div><div class='add'>+			GPIO_num = DISABLE_GPIO_NUM;</div><div class='ctx'> 			break;</div><div class='del'>-			case IDLEMODE_EXIT:</div><div class='del'>-			{</div><div class='del'>-			}</div><div class='add'>+		case IDLEMODE_CONTINUE:</div><div class='add'>+			currdriverstate = IDLEMODE_CONTINUE;</div><div class='add'>+			GPIO_num = DISABLE_GPIO_NUM;</div><div class='ctx'> 			break;</div><div class='del'>-			case DRIVER_HALT:</div><div class='del'>-			{</div><div class='del'>-				currdriverstate = DRIVER_HALT;</div><div class='del'>-				GPIO_num = DISABLE_GPIO_NUM;</div><div class='del'>-				for(uiIndex = 0; uiIndex &lt; NUM_OF_LEDS; uiIndex++)</div><div class='del'>-				{</div><div class='del'>-					if(Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num !=</div><div class='del'>-						DISABLE_GPIO_NUM)</div><div class='del'>-						TURN_OFF_LED((1&lt;&lt;Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num),uiIndex);</div><div class='del'>-				}</div><div class='del'>-				//Adapter-&gt;DriverState = DRIVER_INIT;</div><div class='add'>+		case IDLEMODE_EXIT:</div><div class='add'>+			break;</div><div class='add'>+		case DRIVER_HALT:</div><div class='add'>+			currdriverstate = DRIVER_HALT;</div><div class='add'>+			GPIO_num = DISABLE_GPIO_NUM;</div><div class='add'>+			for (uiIndex = 0; uiIndex &lt; NUM_OF_LEDS; uiIndex++) {</div><div class='add'>+				if (Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num</div><div class='add'>+						!= DISABLE_GPIO_NUM)</div><div class='add'>+					TURN_OFF_LED((1 &lt;&lt; Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num), uiIndex);</div><div class='ctx'> 			}</div><div class='add'>+			/* Adapter-&gt;DriverState = DRIVER_INIT; */</div><div class='ctx'> 			break;</div><div class='del'>-			case LED_THREAD_INACTIVE :</div><div class='del'>-			{</div><div class='del'>-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"InActivating LED thread...");</div><div class='del'>-				currdriverstate = LED_THREAD_INACTIVE;</div><div class='del'>-				Adapter-&gt;LEDInfo.led_thread_running = BCM_LED_THREAD_RUNNING_INACTIVELY ;</div><div class='del'>-				Adapter-&gt;LEDInfo.bLedInitDone = FALSE ;</div><div class='del'>-				//disable ALL LED</div><div class='del'>-				for(uiIndex = 0; uiIndex &lt; NUM_OF_LEDS; uiIndex++)</div><div class='del'>-				{</div><div class='del'>-					if(Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num !=</div><div class='del'>-						DISABLE_GPIO_NUM)</div><div class='del'>-						TURN_OFF_LED((1&lt;&lt;Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num),uiIndex);</div><div class='del'>-				}</div><div class='add'>+		case LED_THREAD_INACTIVE:</div><div class='add'>+			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,</div><div class='add'>+				DBG_LVL_ALL, "InActivating LED thread...");</div><div class='add'>+			currdriverstate = LED_THREAD_INACTIVE;</div><div class='add'>+			Adapter-&gt;LEDInfo.led_thread_running =</div><div class='add'>+					BCM_LED_THREAD_RUNNING_INACTIVELY;</div><div class='add'>+			Adapter-&gt;LEDInfo.bLedInitDone = FALSE;</div><div class='add'>+			/* disable ALL LED */</div><div class='add'>+			for (uiIndex = 0; uiIndex &lt; NUM_OF_LEDS; uiIndex++) {</div><div class='add'>+				if (Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num</div><div class='add'>+						!= DISABLE_GPIO_NUM)</div><div class='add'>+					TURN_OFF_LED((1 &lt;&lt; Adapter-&gt;LEDInfo.LEDState[uiIndex].GPIO_Num), uiIndex);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='del'>-			case LED_THREAD_ACTIVE :</div><div class='del'>-			{</div><div class='del'>-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"Activating LED thread again...");</div><div class='del'>-				if(Adapter-&gt;LinkUpStatus == FALSE)</div><div class='del'>-					Adapter-&gt;DriverState = NO_NETWORK_ENTRY;</div><div class='del'>-				else</div><div class='del'>-					Adapter-&gt;DriverState = NORMAL_OPERATION;</div><div class='add'>+		case LED_THREAD_ACTIVE:</div><div class='add'>+			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,</div><div class='add'>+				DBG_LVL_ALL, "Activating LED thread again...");</div><div class='add'>+			if (Adapter-&gt;LinkUpStatus == FALSE)</div><div class='add'>+				Adapter-&gt;DriverState = NO_NETWORK_ENTRY;</div><div class='add'>+			else</div><div class='add'>+				Adapter-&gt;DriverState = NORMAL_OPERATION;</div><div class='ctx'> </div><div class='del'>-				Adapter-&gt;LEDInfo.led_thread_running = BCM_LED_THREAD_RUNNING_ACTIVELY ;</div><div class='del'>-			}</div><div class='add'>+			Adapter-&gt;LEDInfo.led_thread_running =</div><div class='add'>+					BCM_LED_THREAD_RUNNING_ACTIVELY;</div><div class='add'>+			break;</div><div class='add'>+			/* return; */</div><div class='add'>+		default:</div><div class='ctx'> 			break;</div><div class='del'>-			//return;</div><div class='del'>-			default:</div><div class='del'>-				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	Adapter-&gt;LEDInfo.led_thread_running = BCM_LED_THREAD_DISABLED;</div><div class='hunk'>@@ -839,49 +863,54 @@ int InitLedSettings(PMINI_ADAPTER Adapter)</div><div class='ctx'> 	BOOLEAN bEnableThread = TRUE;</div><div class='ctx'> 	UCHAR uiIndex = 0;</div><div class='ctx'> </div><div class='del'>-	/*Initially set BitPolarity to normal polarity. The bit 8 of LED type</div><div class='del'>- * 	  is used to change the polarity of the LED.*/</div><div class='add'>+	/*</div><div class='add'>+	 * Initially set BitPolarity to normal polarity. The bit 8 of LED type</div><div class='add'>+	 * is used to change the polarity of the LED.</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='del'>-	for(uiIndex = 0; uiIndex &lt; NUM_OF_LEDS; uiIndex++) {</div><div class='add'>+	for (uiIndex = 0; uiIndex &lt; NUM_OF_LEDS; uiIndex++)</div><div class='ctx'> 		Adapter-&gt;LEDInfo.LEDState[uiIndex].BitPolarity = 1;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	/*Read the LED settings of CONFIG file and map it to GPIO numbers in EEPROM*/</div><div class='add'>+	/*</div><div class='add'>+	 * Read the LED settings of CONFIG file and map it</div><div class='add'>+	 * to GPIO numbers in EEPROM</div><div class='add'>+	 */</div><div class='ctx'> 	Status = ReadConfigFileStructure(Adapter, &amp;bEnableThread);</div><div class='del'>-	if(STATUS_SUCCESS != Status)</div><div class='del'>-	{</div><div class='del'>-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: FAILED in ReadConfigFileStructure\n");</div><div class='add'>+	if (STATUS_SUCCESS != Status) {</div><div class='add'>+		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,</div><div class='add'>+			DBG_LVL_ALL,</div><div class='add'>+			"LED Thread: FAILED in ReadConfigFileStructure\n");</div><div class='ctx'> 		return Status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(Adapter-&gt;LEDInfo.led_thread_running)</div><div class='del'>-	{</div><div class='del'>-		if(bEnableThread)</div><div class='add'>+	if (Adapter-&gt;LEDInfo.led_thread_running) {</div><div class='add'>+		if (bEnableThread) {</div><div class='ctx'> 			;</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='add'>+		} else {</div><div class='ctx'> 			Adapter-&gt;DriverState = DRIVER_HALT;</div><div class='ctx'> 			wake_up(&amp;Adapter-&gt;LEDInfo.notify_led_event);</div><div class='del'>-			Adapter-&gt;LEDInfo.led_thread_running = BCM_LED_THREAD_DISABLED;</div><div class='add'>+			Adapter-&gt;LEDInfo.led_thread_running =</div><div class='add'>+						BCM_LED_THREAD_DISABLED;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	else if(bEnableThread)</div><div class='del'>-	{</div><div class='del'>-		/*Create secondary thread to handle the LEDs*/</div><div class='add'>+	} else if (bEnableThread) {</div><div class='add'>+		/* Create secondary thread to handle the LEDs */</div><div class='ctx'> 		init_waitqueue_head(&amp;Adapter-&gt;LEDInfo.notify_led_event);</div><div class='ctx'> 		init_waitqueue_head(&amp;Adapter-&gt;LEDInfo.idleModeSyncEvent);</div><div class='del'>-		Adapter-&gt;LEDInfo.led_thread_running = BCM_LED_THREAD_RUNNING_ACTIVELY;</div><div class='del'>-		Adapter-&gt;LEDInfo.bIdle_led_off =  FALSE;</div><div class='del'>-		Adapter-&gt;LEDInfo.led_cntrl_threadid = kthread_run((int (*)(void *))</div><div class='del'>-            LEDControlThread, Adapter, "led_control_thread");</div><div class='del'>-		if(IS_ERR(Adapter-&gt;LEDInfo.led_cntrl_threadid))</div><div class='del'>-    	{</div><div class='del'>-        	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL, "Not able to spawn Kernel Thread\n");</div><div class='del'>-			Adapter-&gt;LEDInfo.led_thread_running = BCM_LED_THREAD_DISABLED;</div><div class='del'>-        	return PTR_ERR(Adapter-&gt;LEDInfo.led_cntrl_threadid);</div><div class='del'>-    	}</div><div class='add'>+		Adapter-&gt;LEDInfo.led_thread_running =</div><div class='add'>+					BCM_LED_THREAD_RUNNING_ACTIVELY;</div><div class='add'>+		Adapter-&gt;LEDInfo.bIdle_led_off = FALSE;</div><div class='add'>+		Adapter-&gt;LEDInfo.led_cntrl_threadid =</div><div class='add'>+			kthread_run((int (*)(void *)) LEDControlThread,</div><div class='add'>+			Adapter, "led_control_thread");</div><div class='add'>+		if (IS_ERR(Adapter-&gt;LEDInfo.led_cntrl_threadid)) {</div><div class='add'>+			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,</div><div class='add'>+				DBG_LVL_ALL,</div><div class='add'>+				"Not able to spawn Kernel Thread\n");</div><div class='add'>+			Adapter-&gt;LEDInfo.led_thread_running =</div><div class='add'>+				BCM_LED_THREAD_DISABLED;</div><div class='add'>+			return PTR_ERR(Adapter-&gt;LEDInfo.led_cntrl_threadid);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return Status;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c<br/>index 3de0daf5edb2..7d703cb3c5e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/bcm/nvm.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/nvm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/bcm/nvm.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/bcm/nvm.c</a></div><div class='hunk'>@@ -78,7 +78,7 @@ static UCHAR ReadEEPROMStatusRegister( PMINI_ADAPTER Adapter )</div><div class='ctx'> 	{</div><div class='ctx'> 		value=0;</div><div class='ctx'> 		uiStatus = 0 ;</div><div class='del'>-		rdmalt( Adapter, EEPROM_SPI_Q_STATUS1_REG,&amp;uiStatus, sizeof(uiStatus));</div><div class='add'>+		rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &amp;uiStatus, sizeof(uiStatus));</div><div class='ctx'> 		if(Adapter-&gt;device_removed == TRUE)</div><div class='ctx'> 		{</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Modem has got removed hence exiting....");</div><div class='hunk'>@@ -93,7 +93,7 @@ static UCHAR ReadEEPROMStatusRegister( PMINI_ADAPTER Adapter )</div><div class='ctx'> 			wrmalt( Adapter, EEPROM_SPI_Q_STATUS1_REG, &amp;value, sizeof(value));</div><div class='ctx'> </div><div class='ctx'> 			value =0;</div><div class='del'>-			rdmalt(Adapter, EEPROM_READ_DATAQ_REG,&amp;value, sizeof(value));</div><div class='add'>+			rdmalt(Adapter, EEPROM_READ_DATAQ_REG, &amp;value, sizeof(value));</div><div class='ctx'> 			uiData = (UCHAR)value;</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='hunk'>@@ -102,8 +102,8 @@ static UCHAR ReadEEPROMStatusRegister( PMINI_ADAPTER Adapter )</div><div class='ctx'> 		dwRetries-- ;</div><div class='ctx'> 		if ( dwRetries == 0 )</div><div class='ctx'> 		{</div><div class='del'>-			 rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG,&amp;value, sizeof(value));</div><div class='del'>-			 rdmalt(Adapter, EEPROM_SPI_Q_STATUS_REG,&amp;value1, sizeof(value1));</div><div class='add'>+			 rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &amp;value, sizeof(value));</div><div class='add'>+			 rdmalt(Adapter, EEPROM_SPI_Q_STATUS_REG, &amp;value1, sizeof(value1));</div><div class='ctx'> 			 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"0x3004 = %x 0x3008 = %x, retries = %d failed.\n",value,value1,  MAX_EEPROM_RETRIES*RETRIES_PER_DELAY);</div><div class='ctx'> 			return uiData;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -158,7 +158,7 @@ INT ReadBeceemEEPROMBulk( PMINI_ADAPTER Adapter,</div><div class='ctx'> 		{</div><div class='ctx'> </div><div class='ctx'> 		uiStatus = 0;</div><div class='del'>-		rdmalt( Adapter, EEPROM_SPI_Q_STATUS1_REG, &amp;uiStatus, sizeof(uiStatus));</div><div class='add'>+		rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &amp;uiStatus, sizeof(uiStatus));</div><div class='ctx'> 		if(Adapter-&gt;device_removed == TRUE)</div><div class='ctx'> 		{</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Modem has got Removed.hence exiting from loop...");</div><div class='hunk'>@@ -202,8 +202,8 @@ INT ReadBeceemEEPROMBulk( PMINI_ADAPTER Adapter,</div><div class='ctx'> 		{</div><div class='ctx'> 			value=0;</div><div class='ctx'> 			value1=0;</div><div class='del'>-			rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG,&amp;value, sizeof(value));</div><div class='del'>-			rdmalt(Adapter, EEPROM_SPI_Q_STATUS_REG,&amp;value1, sizeof(value1));</div><div class='add'>+			rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &amp;value, sizeof(value));</div><div class='add'>+			rdmalt(Adapter, EEPROM_SPI_Q_STATUS_REG, &amp;value1, sizeof(value1));</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "dwNumWords %d 0x3004 = %x 0x3008 = %x  retries = %d failed.\n", dwNumWords, value,  value1,  MAX_EEPROM_RETRIES*RETRIES_PER_DELAY);</div><div class='ctx'> 			return STATUS_FAILURE;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -217,22 +217,22 @@ INT ReadBeceemEEPROMBulk( PMINI_ADAPTER Adapter,</div><div class='ctx'> 		pvalue = (PUCHAR)(pdwData + dwIndex);</div><div class='ctx'> </div><div class='ctx'> 		value =0;</div><div class='del'>-		rdmalt(Adapter, EEPROM_READ_DATAQ_REG,&amp;value, sizeof(value));</div><div class='add'>+		rdmalt(Adapter, EEPROM_READ_DATAQ_REG, &amp;value, sizeof(value));</div><div class='ctx'> </div><div class='ctx'> 		pvalue[0] = value;</div><div class='ctx'> </div><div class='ctx'> 		value = 0;</div><div class='del'>-		rdmalt(Adapter, EEPROM_READ_DATAQ_REG,&amp;value, sizeof(value));</div><div class='add'>+		rdmalt(Adapter, EEPROM_READ_DATAQ_REG, &amp;value, sizeof(value));</div><div class='ctx'> </div><div class='ctx'> 		pvalue[1] = value;</div><div class='ctx'> </div><div class='ctx'> 		value =0;</div><div class='del'>-		rdmalt(Adapter, EEPROM_READ_DATAQ_REG,&amp;value, sizeof(value));</div><div class='add'>+		rdmalt(Adapter, EEPROM_READ_DATAQ_REG, &amp;value, sizeof(value));</div><div class='ctx'> </div><div class='ctx'> 		pvalue[2] = value;</div><div class='ctx'> </div><div class='ctx'> 		value = 0;</div><div class='del'>-		rdmalt(Adapter, EEPROM_READ_DATAQ_REG,&amp;value, sizeof(value));</div><div class='add'>+		rdmalt(Adapter, EEPROM_READ_DATAQ_REG, &amp;value, sizeof(value));</div><div class='ctx'> </div><div class='ctx'> 		pvalue[3] = value;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -445,6 +445,7 @@ static INT BeceemFlashBulkRead(</div><div class='ctx'> 	UINT uiBytesToRead = uiNumBytes;</div><div class='ctx'> 	INT Status = 0;</div><div class='ctx'> 	UINT uiPartOffset = 0;</div><div class='add'>+	int bytes;</div><div class='ctx'> </div><div class='ctx'> 	if(Adapter-&gt;device_removed )</div><div class='ctx'> 	{</div><div class='hunk'>@@ -469,9 +470,9 @@ static INT BeceemFlashBulkRead(</div><div class='ctx'> 		uiBytesToRead = MAX_RW_SIZE - (uiOffset%MAX_RW_SIZE);</div><div class='ctx'> 		uiBytesToRead = MIN(uiNumBytes,uiBytesToRead);</div><div class='ctx'> </div><div class='del'>-		if(rdm(Adapter,uiPartOffset, (PCHAR)pBuffer+uiIndex,uiBytesToRead))</div><div class='del'>-		{</div><div class='del'>-			Status = -1;</div><div class='add'>+		bytes = rdm(Adapter, uiPartOffset, (PCHAR)pBuffer+uiIndex, uiBytesToRead);</div><div class='add'>+		if (bytes &lt; 0) {</div><div class='add'>+			Status = bytes;</div><div class='ctx'> 			Adapter-&gt;SelectedChip = RESET_CHIP_SELECT;</div><div class='ctx'> 			return Status;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -488,9 +489,9 @@ static INT BeceemFlashBulkRead(</div><div class='ctx'> </div><div class='ctx'> 		uiBytesToRead = MIN(uiNumBytes,MAX_RW_SIZE);</div><div class='ctx'> </div><div class='del'>-		if(rdm(Adapter,uiPartOffset, (PCHAR)pBuffer+uiIndex,uiBytesToRead))</div><div class='del'>-		{</div><div class='del'>-			Status = -1;</div><div class='add'>+		bytes = rdm(Adapter, uiPartOffset, (PCHAR)pBuffer+uiIndex, uiBytesToRead);</div><div class='add'>+		if (bytes &lt; 0) {</div><div class='add'>+			Status = bytes;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -613,6 +614,7 @@ static INT FlashSectorErase(PMINI_ADAPTER Adapter,</div><div class='ctx'> 	UINT iIndex = 0, iRetries = 0;</div><div class='ctx'> 	UINT uiStatus = 0;</div><div class='ctx'> 	UINT value;</div><div class='add'>+	int bytes;</div><div class='ctx'> </div><div class='ctx'> 	for(iIndex=0;iIndex&lt;numOfSectors;iIndex++)</div><div class='ctx'> 	{</div><div class='hunk'>@@ -632,10 +634,11 @@ static INT FlashSectorErase(PMINI_ADAPTER Adapter,</div><div class='ctx'> 				return STATUS_FAILURE;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if(rdmalt(Adapter, FLASH_SPI_READQ_REG, &amp;uiStatus, sizeof(uiStatus)) &lt; 0 )</div><div class='del'>-			{</div><div class='del'>-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Reading status of FLASH_SPI_READQ_REG fails");</div><div class='del'>-				return STATUS_FAILURE;</div><div class='add'>+			bytes = rdmalt(Adapter, FLASH_SPI_READQ_REG, &amp;uiStatus, sizeof(uiStatus));</div><div class='add'>+			if (bytes &lt; 0) {</div><div class='add'>+				uiStatus = bytes;</div><div class='add'>+				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Reading status of FLASH_SPI_READQ_REG fails");</div><div class='add'>+				return uiStatus;</div><div class='ctx'> 			}</div><div class='ctx'> 			iRetries++;</div><div class='ctx'> 			//After every try lets make the CPU free for 10 ms. generally time taken by the</div><div class='hunk'>@@ -679,6 +682,7 @@ static INT flashByteWrite(</div><div class='ctx'> </div><div class='ctx'> 	UINT value;</div><div class='ctx'> 	ULONG ulData = *(PUCHAR)pData;</div><div class='add'>+	int bytes;</div><div class='ctx'> </div><div class='ctx'> //</div><div class='ctx'> // need not write 0xFF because write requires an erase and erase will</div><div class='hunk'>@@ -720,10 +724,11 @@ static INT flashByteWrite(</div><div class='ctx'> 			return STATUS_FAILURE;</div><div class='ctx'> 	  	}</div><div class='ctx'> 	  	//__udelay(1);</div><div class='del'>-	  	if(rdmalt(Adapter, FLASH_SPI_READQ_REG, &amp;uiStatus, sizeof(uiStatus)) &lt; 0)</div><div class='del'>-	  	{</div><div class='del'>-	  		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Reading status of FLASH_SPI_READQ_REG fails");</div><div class='del'>-			return STATUS_FAILURE;</div><div class='add'>+		bytes = rdmalt(Adapter, FLASH_SPI_READQ_REG, &amp;uiStatus, sizeof(uiStatus));</div><div class='add'>+		if (bytes &lt; 0) {</div><div class='add'>+			uiStatus = bytes;</div><div class='add'>+			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Reading status of FLASH_SPI_READQ_REG fails");</div><div class='add'>+			return uiStatus;</div><div class='ctx'> 		}</div><div class='ctx'> 	  	iRetries--;</div><div class='ctx'> 		if( iRetries &amp;&amp; ((iRetries % FLASH_PER_RETRIES_DELAY) == 0))</div><div class='hunk'>@@ -771,6 +776,7 @@ static INT flashWrite(</div><div class='ctx'> </div><div class='ctx'> 	UINT value;</div><div class='ctx'> 	UINT uiErasePattern[4] = {0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF};</div><div class='add'>+	int bytes;</div><div class='ctx'> //</div><div class='ctx'> // need not write 0xFFFFFFFF because write requires an erase and erase will</div><div class='ctx'> // make whole sector 0xFFFFFFFF.</div><div class='hunk'>@@ -803,10 +809,11 @@ static INT flashWrite(</div><div class='ctx'> 			return STATUS_FAILURE;</div><div class='ctx'> 	  	}</div><div class='ctx'> 	  	//__udelay(1);</div><div class='del'>-	  	if(rdmalt(Adapter, FLASH_SPI_READQ_REG, &amp;uiStatus, sizeof(uiStatus)) &lt; 0 )</div><div class='del'>-	  	{</div><div class='del'>-	  		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Reading status of FLASH_SPI_READQ_REG fails");</div><div class='del'>-			return STATUS_FAILURE;</div><div class='add'>+		bytes = rdmalt(Adapter, FLASH_SPI_READQ_REG, &amp;uiStatus, sizeof(uiStatus));</div><div class='add'>+		if (bytes &lt; 0) {</div><div class='add'>+			uiStatus = bytes;</div><div class='add'>+			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Reading status of FLASH_SPI_READQ_REG fails");</div><div class='add'>+			return uiStatus;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		iRetries--;</div><div class='hunk'>@@ -849,6 +856,7 @@ static INT flashByteWriteStatus(</div><div class='ctx'> 	INT  iRetries = MAX_FLASH_RETRIES * FLASH_PER_RETRIES_DELAY; //3</div><div class='ctx'> 	ULONG ulData  = *(PUCHAR)pData;</div><div class='ctx'> 	UINT value;</div><div class='add'>+	int bytes;</div><div class='ctx'> </div><div class='ctx'> //</div><div class='ctx'> // need not write 0xFFFFFFFF because write requires an erase and erase will</div><div class='hunk'>@@ -891,10 +899,11 @@ static INT flashByteWriteStatus(</div><div class='ctx'> 			return STATUS_FAILURE;</div><div class='ctx'> 		}</div><div class='ctx'> 		//__udelay(1);</div><div class='del'>-		if(rdmalt(Adapter, FLASH_SPI_READQ_REG, &amp;uiStatus, sizeof(uiStatus)) &lt; 0)</div><div class='del'>-		{</div><div class='del'>-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Reading status of FLASH_SPI_READQ_REG fails");</div><div class='del'>-			return STATUS_FAILURE;</div><div class='add'>+		bytes = rdmalt(Adapter, FLASH_SPI_READQ_REG, &amp;uiStatus, sizeof(uiStatus));</div><div class='add'>+		if (bytes &lt; 0) {</div><div class='add'>+			uiStatus = bytes;</div><div class='add'>+			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Reading status of FLASH_SPI_READQ_REG fails");</div><div class='add'>+			return uiStatus;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		iRetries--;</div><div class='hunk'>@@ -935,6 +944,7 @@ static INT flashWriteStatus(</div><div class='ctx'> 	//UINT uiReadBack = 0;</div><div class='ctx'> 	UINT value;</div><div class='ctx'> 	UINT uiErasePattern[4] = {0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF};</div><div class='add'>+	int bytes;</div><div class='ctx'> </div><div class='ctx'> //</div><div class='ctx'> // need not write 0xFFFFFFFF because write requires an erase and erase will</div><div class='hunk'>@@ -967,10 +977,11 @@ static INT flashWriteStatus(</div><div class='ctx'> 			return STATUS_FAILURE;</div><div class='ctx'> 	  	}</div><div class='ctx'> 	  	//__udelay(1);</div><div class='del'>-	  	if(rdmalt(Adapter, FLASH_SPI_READQ_REG, &amp;uiStatus, sizeof(uiStatus)) &lt; 0)</div><div class='del'>-	  	{</div><div class='del'>-	  		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Reading status of FLASH_SPI_READQ_REG fails");</div><div class='del'>-			return STATUS_FAILURE;</div><div class='add'>+		bytes = rdmalt(Adapter, FLASH_SPI_READQ_REG, &amp;uiStatus, sizeof(uiStatus));</div><div class='add'>+		if (bytes &lt; 0) {</div><div class='add'>+			uiStatus = bytes;</div><div class='add'>+			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Reading status of FLASH_SPI_READQ_REG fails");</div><div class='add'>+			return uiStatus;</div><div class='ctx'> 		}</div><div class='ctx'> 	  	iRetries--;</div><div class='ctx'> 		//this will ensure that in there will be no changes in the current path.</div><div class='hunk'>@@ -1841,7 +1852,7 @@ static INT BeceemEEPROMWritePage( PMINI_ADAPTER Adapter, UINT uiData[], UINT uiO</div><div class='ctx'> 	 * What we are checking if the previous write has completed, and this</div><div class='ctx'> 	 * may take time. We should wait till the Empty bit is set. */</div><div class='ctx'> 	uiStatus = 0;</div><div class='del'>-	rdmalt( Adapter, EEPROM_SPI_Q_STATUS1_REG,&amp;uiStatus, sizeof(uiStatus)) ;</div><div class='add'>+	rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &amp;uiStatus, sizeof(uiStatus));</div><div class='ctx'> 	while ( ( uiStatus &amp; EEPROM_WRITE_QUEUE_EMPTY ) == 0 )</div><div class='ctx'> 	{</div><div class='ctx'> 		uiRetries--;</div><div class='hunk'>@@ -1855,7 +1866,7 @@ static INT BeceemEEPROMWritePage( PMINI_ADAPTER Adapter, UINT uiData[], UINT uiO</div><div class='ctx'> 					msleep(1);</div><div class='ctx'> </div><div class='ctx'> 		uiStatus = 0;</div><div class='del'>-		rdmalt( Adapter, EEPROM_SPI_Q_STATUS1_REG,&amp;uiStatus, sizeof(uiStatus)) ;</div><div class='add'>+		rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &amp;uiStatus, sizeof(uiStatus));</div><div class='ctx'> 		if(Adapter-&gt;device_removed == TRUE)</div><div class='ctx'> 		{</div><div class='ctx'> 			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Modem got removed hence exiting from loop....");</div><div class='hunk'>@@ -2500,7 +2511,7 @@ static ULONG BcmReadFlashRDID(PMINI_ADAPTER Adapter)</div><div class='ctx'> // Read SPI READQ REG. The output will be WWXXYYZZ.</div><div class='ctx'> // The ID is 3Bytes long and is WWXXYY. ZZ needs to be Ignored.</div><div class='ctx'> //</div><div class='del'>-	rdmalt(Adapter, FLASH_SPI_READQ_REG,(PUINT)&amp;ulRDID, sizeof(ulRDID));</div><div class='add'>+	rdmalt(Adapter, FLASH_SPI_READQ_REG, (PUINT)&amp;ulRDID, sizeof(ulRDID));</div><div class='ctx'> </div><div class='ctx'> 	return (ulRDID &gt;&gt;8);</div><div class='ctx'> </div><div class='hunk'>@@ -4735,8 +4746,8 @@ static INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset)</div><div class='ctx'> 	Adapter-&gt;SelectedChip = ChipNum ;</div><div class='ctx'> </div><div class='ctx'> 	//bit[13..12]  will select the appropriate chip</div><div class='del'>-	rdmalt(Adapter,FLASH_CONFIG_REG, &amp;FlashConfig, 4);</div><div class='del'>-	rdmalt(Adapter,FLASH_GPIO_CONFIG_REG, &amp;GPIOConfig, 4);</div><div class='add'>+	rdmalt(Adapter, FLASH_CONFIG_REG, &amp;FlashConfig, 4);</div><div class='add'>+	rdmalt(Adapter, FLASH_GPIO_CONFIG_REG, &amp;GPIOConfig, 4);</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='ctx'> 		switch(ChipNum)</div><div class='head'>diff --git a/drivers/staging/bcm/target_params.h b/drivers/staging/bcm/target_params.h<br/>index 2d8b8a367b38..14876388b879 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/bcm/target_params.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/bcm/target_params.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/bcm/target_params.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/bcm/target_params.h</a></div><div class='hunk'>@@ -72,8 +72,8 @@ typedef struct _TARGET_PARAMS</div><div class='ctx'> 	// removed SHUT down related 'unused' params from here to sync 4.x and 5.x CFG files..</div><div class='ctx'> </div><div class='ctx'>     //BAMC Related Parameters</div><div class='del'>-    //Bit 0-15 Band AMC signaling configuration: Bit 1 = 1 – Enable Band AMC signaling.</div><div class='del'>-    //bit 16-31 Band AMC Data configuration: Bit 16 = 1 – Band AMC 2x3 support.</div><div class='add'>+    //Bit 0-15 Band AMC signaling configuration: Bit 1 = 1 – Enable Band AMC signaling.</div><div class='add'>+    //bit 16-31 Band AMC Data configuration: Bit 16 = 1 – Band AMC 2x3 support.</div><div class='ctx'> 	B_UINT32 m_u32BandAMCEnable;</div><div class='ctx'> </div><div class='ctx'> } stTargetParams,TARGET_PARAMS,*PTARGET_PARAMS, STARGETPARAMS, *PSTARGETPARAMS;</div><div class='head'>diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c<br/>index 5e78c77d5a08..9bcf87ae4c00 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/comedi_fops.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/comedi_fops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/comedi_fops.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/comedi_fops.c</a></div><div class='hunk'>@@ -61,7 +61,7 @@ EXPORT_SYMBOL(comedi_debug);</div><div class='ctx'> module_param(comedi_debug, int, 0644);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int comedi_autoconfig = 1;</div><div class='add'>+bool comedi_autoconfig = 1;</div><div class='ctx'> module_param(comedi_autoconfig, bool, 0444);</div><div class='ctx'> </div><div class='ctx'> static int comedi_num_legacy_minors;</div><div class='hunk'>@@ -1479,10 +1479,10 @@ static int comedi_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> 	dev_file_info = comedi_get_device_file_info(minor);</div><div class='ctx'> 	if (dev_file_info == NULL)</div><div class='del'>-	        return -ENODEV;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	dev = dev_file_info-&gt;device;</div><div class='ctx'> 	if (dev == NULL)</div><div class='del'>-	        return -ENODEV;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (!dev-&gt;attached) {</div><div class='hunk'>@@ -1556,10 +1556,10 @@ static unsigned int comedi_poll(struct file *file, poll_table * wait)</div><div class='ctx'> 	dev_file_info = comedi_get_device_file_info(minor);</div><div class='ctx'> </div><div class='ctx'> 	if (dev_file_info == NULL)</div><div class='del'>-	        return -ENODEV;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	dev = dev_file_info-&gt;device;</div><div class='ctx'> 	if (dev == NULL)</div><div class='del'>-	        return -ENODEV;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mutex);</div><div class='ctx'> 	if (!dev-&gt;attached) {</div><div class='hunk'>@@ -1610,10 +1610,10 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,</div><div class='ctx'> 	dev_file_info = comedi_get_device_file_info(minor);</div><div class='ctx'> </div><div class='ctx'> 	if (dev_file_info == NULL)</div><div class='del'>-	        return -ENODEV;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	dev = dev_file_info-&gt;device;</div><div class='ctx'> 	if (dev == NULL)</div><div class='del'>-	        return -ENODEV;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;attached) {</div><div class='ctx'> 		DPRINTK("no driver configured on comedi%i\n", dev-&gt;minor);</div><div class='hunk'>@@ -1721,10 +1721,10 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes,</div><div class='ctx'> 	dev_file_info = comedi_get_device_file_info(minor);</div><div class='ctx'> </div><div class='ctx'> 	if (dev_file_info == NULL)</div><div class='del'>-	        return -ENODEV;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	dev = dev_file_info-&gt;device;</div><div class='ctx'> 	if (dev == NULL)</div><div class='del'>-	        return -ENODEV;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;attached) {</div><div class='ctx'> 		DPRINTK("no driver configured on comedi%i\n", dev-&gt;minor);</div><div class='hunk'>@@ -1931,10 +1931,10 @@ static int comedi_close(struct inode *inode, struct file *file)</div><div class='ctx'> 	dev_file_info = comedi_get_device_file_info(minor);</div><div class='ctx'> </div><div class='ctx'> 	if (dev_file_info == NULL)</div><div class='del'>-	        return -ENODEV;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	dev = dev_file_info-&gt;device;</div><div class='ctx'> 	if (dev == NULL)</div><div class='del'>-	        return -ENODEV;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -1973,10 +1973,10 @@ static int comedi_fasync(int fd, struct file *file, int on)</div><div class='ctx'> 	dev_file_info = comedi_get_device_file_info(minor);</div><div class='ctx'> </div><div class='ctx'> 	if (dev_file_info == NULL)</div><div class='del'>-	        return -ENODEV;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	dev = dev_file_info-&gt;device;</div><div class='ctx'> 	if (dev == NULL)</div><div class='del'>-	        return -ENODEV;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	return fasync_helper(fd, file, on, &amp;dev-&gt;async_queue);</div><div class='ctx'> }</div><div class='hunk'>@@ -2479,18 +2479,18 @@ static ssize_t store_max_read_buffer_kb(struct device *dev,</div><div class='ctx'> 					const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct comedi_device_file_info *info = dev_get_drvdata(dev);</div><div class='del'>-	unsigned long new_max_size_kb;</div><div class='del'>-	uint64_t new_max_size;</div><div class='add'>+	unsigned int new_max_size_kb;</div><div class='add'>+	unsigned int new_max_size;</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct comedi_subdevice *const read_subdevice =</div><div class='ctx'> 	    comedi_get_read_subdevice(info);</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;new_max_size_kb))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (new_max_size_kb != (uint32_t) new_max_size_kb)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	new_max_size = ((uint64_t) new_max_size_kb) * bytes_per_kibi;</div><div class='del'>-	if (new_max_size != (uint32_t) new_max_size)</div><div class='add'>+	ret = kstrtouint(buf, 10, &amp;new_max_size_kb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (new_max_size_kb &gt; (UINT_MAX / bytes_per_kibi))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	new_max_size = new_max_size_kb * bytes_per_kibi;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;info-&gt;device-&gt;mutex);</div><div class='ctx'> 	if (read_subdevice == NULL ||</div><div class='hunk'>@@ -2540,19 +2540,19 @@ static ssize_t store_read_buffer_kb(struct device *dev,</div><div class='ctx'> 				    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct comedi_device_file_info *info = dev_get_drvdata(dev);</div><div class='del'>-	unsigned long new_size_kb;</div><div class='del'>-	uint64_t new_size;</div><div class='add'>+	unsigned int new_size_kb;</div><div class='add'>+	unsigned int new_size;</div><div class='ctx'> 	int retval;</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct comedi_subdevice *const read_subdevice =</div><div class='ctx'> 	    comedi_get_read_subdevice(info);</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;new_size_kb))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (new_size_kb != (uint32_t) new_size_kb)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	new_size = ((uint64_t) new_size_kb) * bytes_per_kibi;</div><div class='del'>-	if (new_size != (uint32_t) new_size)</div><div class='add'>+	ret = kstrtouint(buf, 10, &amp;new_size_kb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (new_size_kb &gt; (UINT_MAX / bytes_per_kibi))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	new_size = new_size_kb * bytes_per_kibi;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;info-&gt;device-&gt;mutex);</div><div class='ctx'> 	if (read_subdevice == NULL ||</div><div class='hunk'>@@ -2606,18 +2606,18 @@ static ssize_t store_max_write_buffer_kb(struct device *dev,</div><div class='ctx'> 					 const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct comedi_device_file_info *info = dev_get_drvdata(dev);</div><div class='del'>-	unsigned long new_max_size_kb;</div><div class='del'>-	uint64_t new_max_size;</div><div class='add'>+	unsigned int new_max_size_kb;</div><div class='add'>+	unsigned int new_max_size;</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct comedi_subdevice *const write_subdevice =</div><div class='ctx'> 	    comedi_get_write_subdevice(info);</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;new_max_size_kb))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (new_max_size_kb != (uint32_t) new_max_size_kb)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	new_max_size = ((uint64_t) new_max_size_kb) * bytes_per_kibi;</div><div class='del'>-	if (new_max_size != (uint32_t) new_max_size)</div><div class='add'>+	ret = kstrtouint(buf, 10, &amp;new_max_size_kb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (new_max_size_kb &gt; (UINT_MAX / bytes_per_kibi))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	new_max_size = new_max_size_kb * bytes_per_kibi;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;info-&gt;device-&gt;mutex);</div><div class='ctx'> 	if (write_subdevice == NULL ||</div><div class='hunk'>@@ -2667,19 +2667,19 @@ static ssize_t store_write_buffer_kb(struct device *dev,</div><div class='ctx'> 				     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct comedi_device_file_info *info = dev_get_drvdata(dev);</div><div class='del'>-	unsigned long new_size_kb;</div><div class='del'>-	uint64_t new_size;</div><div class='add'>+	unsigned int new_size_kb;</div><div class='add'>+	unsigned int new_size;</div><div class='ctx'> 	int retval;</div><div class='add'>+	int ret;</div><div class='ctx'> 	struct comedi_subdevice *const write_subdevice =</div><div class='ctx'> 	    comedi_get_write_subdevice(info);</div><div class='ctx'> </div><div class='del'>-	if (strict_strtoul(buf, 10, &amp;new_size_kb))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (new_size_kb != (uint32_t) new_size_kb)</div><div class='add'>+	ret = kstrtouint(buf, 10, &amp;new_size_kb);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (new_size_kb &gt; (UINT_MAX / bytes_per_kibi))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	new_size = ((uint64_t) new_size_kb) * bytes_per_kibi;</div><div class='del'>-	if (new_size != (uint32_t) new_size)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;info-&gt;device-&gt;mutex);</div><div class='ctx'> 	if (write_subdevice == NULL ||</div><div class='head'>diff --git a/drivers/staging/comedi/comedi_fops.h b/drivers/staging/comedi/comedi_fops.h<br/>index da4b4f5553f5..006cf14c577a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/comedi_fops.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/comedi_fops.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/comedi_fops.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/comedi_fops.h</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef _COMEDI_FOPS_H</div><div class='ctx'> #define _COMEDI_FOPS_H</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern struct class *comedi_class;</div><div class='ctx'> extern const struct file_operations comedi_fops;</div><div class='del'>-extern int comedi_autoconfig;</div><div class='add'>+extern bool comedi_autoconfig;</div><div class='ctx'> extern struct comedi_driver *comedi_drivers;</div><div class='ctx'> </div><div class='ctx'> #endif /* _COMEDI_FOPS_H */</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c<br/>index 6fb7594319c6..ca5bd9b8704a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/addi-data/addi_common.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/addi-data/addi_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/addi-data/addi_common.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/addi-data/addi_common.c</a></div><div class='hunk'>@@ -145,78 +145,77 @@ void fpu_end(void)</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {</div><div class='ctx'> #ifdef CONFIG_APCI_3120</div><div class='del'>-	{APCI3120_BOARD_VENDOR_ID, 0x818D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_DEVICE(APCI3120_BOARD_VENDOR_ID, 0x818D)},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_APCI_1032</div><div class='del'>-	{APCI1032_BOARD_VENDOR_ID, 0x1003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_DEVICE(APCI1032_BOARD_VENDOR_ID, 0x1003)},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_APCI_1516</div><div class='del'>-	{APCI1516_BOARD_VENDOR_ID, 0x1001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_DEVICE(APCI1516_BOARD_VENDOR_ID, 0x1001)},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_APCI_2016</div><div class='del'>-	{APCI2016_BOARD_VENDOR_ID, 0x1002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_DEVICE(APCI2016_BOARD_VENDOR_ID, 0x1002)},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_APCI_2032</div><div class='del'>-	{APCI2032_BOARD_VENDOR_ID, 0x1004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_DEVICE(APCI2032_BOARD_VENDOR_ID, 0x1004)},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_APCI_2200</div><div class='del'>-	{APCI2200_BOARD_VENDOR_ID, 0x1005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_DEVICE(APCI2200_BOARD_VENDOR_ID, 0x1005)},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_APCI_1564</div><div class='del'>-	{APCI1564_BOARD_VENDOR_ID, 0x1006, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_DEVICE(APCI1564_BOARD_VENDOR_ID, 0x1006)},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_APCI_1500</div><div class='del'>-	{APCI1500_BOARD_VENDOR_ID, 0x80fc, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_DEVICE(APCI1500_BOARD_VENDOR_ID, 0x80fc)},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_APCI_3001</div><div class='del'>-	{APCI3120_BOARD_VENDOR_ID, 0x828D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_DEVICE(APCI3120_BOARD_VENDOR_ID, 0x828D)},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_APCI_3501</div><div class='del'>-	{APCI3501_BOARD_VENDOR_ID, 0x3001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_DEVICE(APCI3501_BOARD_VENDOR_ID, 0x3001)},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_APCI_035</div><div class='del'>-	{APCI035_BOARD_VENDOR_ID, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_DEVICE(APCI035_BOARD_VENDOR_ID,  0x0300)},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_APCI_3200</div><div class='del'>-	{APCI3200_BOARD_VENDOR_ID, 0x3000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_DEVICE(APCI3200_BOARD_VENDOR_ID, 0x3000)},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_APCI_3300</div><div class='del'>-	{APCI3200_BOARD_VENDOR_ID, 0x3007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_DEVICE(APCI3200_BOARD_VENDOR_ID, 0x3007)},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_APCI_1710</div><div class='del'>-	{APCI1710_BOARD_VENDOR_ID, APCI1710_BOARD_DEVICE_ID,</div><div class='del'>-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_DEVICE(APCI1710_BOARD_VENDOR_ID, APCI1710_BOARD_DEVICE_ID)},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_APCI_16XX</div><div class='del'>-	{0x15B8, 0x1009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x100A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1009)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x100A)},</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_APCI_3XXX</div><div class='del'>-	{0x15B8, 0x3010, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x300F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x300E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x3013, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x3014, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x3015, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x3016, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x3017, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x3018, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x3019, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x301A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x301B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x301C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x301D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x301E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x301F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x3020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x3021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x3023, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x300B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x3002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x3003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x3004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0x15B8, 0x3024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3010)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x300F)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x300E)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3013)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3014)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3015)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3016)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3017)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3018)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3019)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301A)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301B)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301C)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301D)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301E)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301F)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3020)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3021)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3022)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3023)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x300B)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3002)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3003)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3004)},</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3024)},</div><div class='ctx'> #endif</div><div class='ctx'> 	{0}</div><div class='ctx'> };</div><div class='hunk'>@@ -1019,7 +1018,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_APCI_16XX</div><div class='ctx'> 	{"apci1648",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x1009,</div><div class='ctx'> 			128,</div><div class='ctx'> 			0,</div><div class='hunk'>@@ -1075,7 +1074,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI16XX_InsnBitsWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci1696",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x100A,</div><div class='ctx'> 			128,</div><div class='ctx'> 			0,</div><div class='hunk'>@@ -1132,7 +1131,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_APCI_3XXX</div><div class='ctx'> 	{"apci3000-16",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x3010,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -1188,7 +1187,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3000-8",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x300F,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -1244,7 +1243,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3000-4",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x300E,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -1300,7 +1299,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3006-16",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x3013,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -1356,7 +1355,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3006-8",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x3014,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -1412,7 +1411,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3006-4",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x3015,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -1468,7 +1467,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3010-16",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x3016,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -1524,7 +1523,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3010-8",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x3017,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -1580,7 +1579,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3010-4",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x3018,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -1636,7 +1635,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3016-16",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x3019,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -1692,7 +1691,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3016-8",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x301A,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -1748,7 +1747,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3016-4",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x301B,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -1804,7 +1803,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3100-16-4",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x301C,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -1860,7 +1859,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3100-8-4",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x301D,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -1916,7 +1915,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3106-16-4",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x301E,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -1972,7 +1971,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3106-8-4",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x301F,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -2028,7 +2027,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3110-16-4",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x3020,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -2084,7 +2083,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3110-8-4",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x3021,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -2140,7 +2139,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3116-16-4",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x3022,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -2196,7 +2195,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3116-8-4",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x3023,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -2252,7 +2251,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		i_APCI3XXX_InsnWriteTTLIO},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3003",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x300B,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -2307,7 +2306,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		NULL},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3002-16",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x3002,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -2362,7 +2361,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		NULL},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3002-8",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x3003,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -2417,7 +2416,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		NULL},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3002-4",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x3004,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='hunk'>@@ -2472,7 +2471,7 @@ static const struct addi_board boardtypes[] = {</div><div class='ctx'> 		NULL},</div><div class='ctx'> </div><div class='ctx'> 	{"apci3500",</div><div class='del'>-			0x15B8,</div><div class='add'>+			PCI_VENDOR_ID_ADDIDATA,</div><div class='ctx'> 			0x3024,</div><div class='ctx'> 			256,</div><div class='ctx'> 			256,</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c<br/>index c75a1a1fd775..f9545b064eaf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c</a></div><div class='hunk'>@@ -3598,7 +3598,7 @@ int i_APCI3200_InterruptHandleEos(struct comedi_device *dev)</div><div class='ctx'> 			n = comedi_buf_write_alloc(s-&gt;async,</div><div class='ctx'> 				(7 + 12) * sizeof(unsigned int));</div><div class='ctx'> </div><div class='del'>-			/*  If not enougth memory available, event is set to Comedi Buffer Errror */</div><div class='add'>+			/*  If not enough memory available, event is set to Comedi Buffer Error */</div><div class='ctx'> 			if (n &gt; ((7 + 12) * sizeof(unsigned int))) {</div><div class='ctx'> 				printk("\ncomedi_buf_write_alloc n = %i", n);</div><div class='ctx'> 				s-&gt;async-&gt;events |= COMEDI_CB_ERROR;</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/adl_pci7230.c b/drivers/staging/comedi/drivers/adl_pci7230.c<br/>index 72a7258b5b92..20d570554fa4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/adl_pci7230.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/adl_pci7230.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/adl_pci7230.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/adl_pci7230.c</a></div><div class='hunk'>@@ -44,15 +44,7 @@ Configuration Options:</div><div class='ctx'> #define PCI_DEVICE_ID_PCI7230 0x7230</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(adl_pci7230_pci_table) = {</div><div class='del'>-	{</div><div class='del'>-		PCI_VENDOR_ID_ADLINK,</div><div class='del'>-		PCI_DEVICE_ID_PCI7230,</div><div class='del'>-		PCI_ANY_ID,</div><div class='del'>-		PCI_ANY_ID,</div><div class='del'>-		0,</div><div class='del'>-		0,</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7230) },</div><div class='ctx'> 	{0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/comedi/drivers/adl_pci7296.c b/drivers/staging/comedi/drivers/adl_pci7296.c<br/>index f28fe6bec050..9a2320537bdb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/adl_pci7296.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/adl_pci7296.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/adl_pci7296.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/adl_pci7296.c</a></div><div class='hunk'>@@ -49,10 +49,8 @@ Configuration Options:</div><div class='ctx'> #define PCI_DEVICE_ID_PCI7296 0x7296</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(adl_pci7296_pci_table) = {</div><div class='del'>-	{</div><div class='del'>-	PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7296, PCI_ANY_ID,</div><div class='del'>-		    PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	0}</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7296) },</div><div class='add'>+	{0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, adl_pci7296_pci_table);</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/adl_pci7432.c b/drivers/staging/comedi/drivers/adl_pci7432.c<br/>index 262da7b29b28..86ee21976041 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/adl_pci7432.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/adl_pci7432.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/adl_pci7432.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/adl_pci7432.c</a></div><div class='hunk'>@@ -44,10 +44,8 @@ Configuration Options:</div><div class='ctx'> #define PCI_DEVICE_ID_PCI7432 0x7432</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(adl_pci7432_pci_table) = {</div><div class='del'>-	{</div><div class='del'>-	PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7432, PCI_ANY_ID,</div><div class='del'>-		    PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	0}</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7432) },</div><div class='add'>+	{0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, adl_pci7432_pci_table);</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/adl_pci8164.c b/drivers/staging/comedi/drivers/adl_pci8164.c<br/>index 767a594935c7..3b83d65bc1bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/adl_pci8164.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/adl_pci8164.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/adl_pci8164.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/adl_pci8164.c</a></div><div class='hunk'>@@ -57,10 +57,8 @@ Configuration Options:</div><div class='ctx'> #define PCI_DEVICE_ID_PCI8164 0x8164</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(adl_pci8164_pci_table) = {</div><div class='del'>-	{</div><div class='del'>-	PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI8164, PCI_ANY_ID,</div><div class='del'>-		    PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	0}</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI8164) },</div><div class='add'>+	{0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, adl_pci8164_pci_table);</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c<br/>index fc48bae42ab7..2a9bd88a4abb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/adl_pci9111.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/adl_pci9111.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/adl_pci9111.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/adl_pci9111.c</a></div><div class='hunk'>@@ -311,10 +311,8 @@ static const struct comedi_lrange pci9111_hr_ai_range = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(pci9111_pci_table) = {</div><div class='del'>-	{ PCI_VENDOR_ID_ADLINK, PCI9111_HR_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,</div><div class='del'>-	  0, 0, 0 },</div><div class='del'>-	/* { PCI_VENDOR_ID_ADLINK, PCI9111_HG_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,</div><div class='del'>-	 *   0, 0, 0 }, */</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI9111_HR_DEVICE_ID) },</div><div class='add'>+	/* { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI9111_HG_DEVICE_ID) }, */</div><div class='ctx'> 	{ 0 }</div><div class='ctx'> };</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 da2b75b15d4e..8318c82a555a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/adv_pci1710.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/adv_pci1710.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/adv_pci1710.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/adv_pci1710.c</a></div><div class='hunk'>@@ -1382,16 +1382,14 @@ static int pci1710_attach(struct comedi_device *dev,</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int board_index;</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: adv_pci1710: ", dev-&gt;minor);</div><div class='add'>+	dev_info(dev-&gt;hw_dev, "comedi%d: adv_pci1710:\n", dev-&gt;minor);</div><div class='ctx'> </div><div class='ctx'> 	opt_bus = it-&gt;options[0];</div><div class='ctx'> 	opt_slot = it-&gt;options[1];</div><div class='ctx'> </div><div class='ctx'> 	ret = alloc_private(dev, sizeof(struct pci1710_private));</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		printk(" - Allocation failed!\n");</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Look for matching PCI device */</div><div class='ctx'> 	errstr = "not found!";</div><div class='hunk'>@@ -1436,10 +1434,10 @@ static int pci1710_attach(struct comedi_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (!pcidev) {</div><div class='ctx'> 		if (opt_bus || opt_slot) {</div><div class='del'>-			printk(" - Card at b:s %d:%d %s\n",</div><div class='del'>-			       opt_bus, opt_slot, errstr);</div><div class='add'>+			dev_err(dev-&gt;hw_dev, "- Card at b:s %d:%d %s\n",</div><div class='add'>+				opt_bus, opt_slot, errstr);</div><div class='ctx'> 		} else {</div><div class='del'>-			printk(" - Card %s\n", errstr);</div><div class='add'>+			dev_err(dev-&gt;hw_dev, "- Card %s\n", errstr);</div><div class='ctx'> 		}</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1450,8 +1448,8 @@ static int pci1710_attach(struct comedi_device *dev,</div><div class='ctx'> 	irq = pcidev-&gt;irq;</div><div class='ctx'> 	iobase = pci_resource_start(pcidev, 2);</div><div class='ctx'> </div><div class='del'>-	printk(", b:s:f=%d:%d:%d, io=0x%4lx", pci_bus, pci_slot, pci_func,</div><div class='del'>-	       iobase);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "b:s:f=%d:%d:%d, io=0x%4lx\n", pci_bus, pci_slot,</div><div class='add'>+		pci_func, iobase);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;iobase = iobase;</div><div class='ctx'> </div><div class='hunk'>@@ -1471,10 +1469,8 @@ static int pci1710_attach(struct comedi_device *dev,</div><div class='ctx'> 		n_subdevices++;</div><div class='ctx'> </div><div class='ctx'> 	ret = alloc_subdevices(dev, n_subdevices);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		printk(" - Allocation failed!\n");</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'> 	pci1710_reset(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1483,24 +1479,20 @@ static int pci1710_attach(struct comedi_device *dev,</div><div class='ctx'> 			if (request_irq(irq, interrupt_service_pci1710,</div><div class='ctx'> 					IRQF_SHARED, "Advantech PCI-1710",</div><div class='ctx'> 					dev)) {</div><div class='del'>-				printk</div><div class='del'>-				    (", unable to allocate IRQ %d, DISABLING IT",</div><div class='del'>-				     irq);</div><div class='add'>+				dev_dbg(dev-&gt;hw_dev, "unable to allocate IRQ %d, DISABLING IT",</div><div class='add'>+					irq);</div><div class='ctx'> 				irq = 0;	/* Can't use IRQ */</div><div class='ctx'> 			} else {</div><div class='del'>-				printk(", irq=%u", irq);</div><div class='add'>+				dev_dbg(dev-&gt;hw_dev, "irq=%u", irq);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			printk(", IRQ disabled");</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "IRQ disabled");</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		irq = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;irq = irq;</div><div class='del'>-</div><div class='del'>-	printk(".\n");</div><div class='del'>-</div><div class='ctx'> 	subdev = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (this_board-&gt;n_aichan) {</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c<br/>index 69334f6f64e8..537e58534275 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/adv_pci_dio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/adv_pci_dio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/adv_pci_dio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/adv_pci_dio.c</a></div><div class='hunk'>@@ -1106,13 +1106,10 @@ static int pci_dio_attach(struct comedi_device *dev,</div><div class='ctx'> 	unsigned long iobase;</div><div class='ctx'> 	struct pci_dev *pcidev = NULL;</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: adv_pci_dio: ", dev-&gt;minor);</div><div class='ctx'> </div><div class='ctx'> 	ret = alloc_private(dev, sizeof(struct pci_dio_private));</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		printk(", Error: Cann't allocate private memory!\n");</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	for_each_pci_dev(pcidev) {</div><div class='ctx'> 		/*  loop through cards supported by this driver */</div><div class='hunk'>@@ -1140,19 +1137,18 @@ static int pci_dio_attach(struct comedi_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;board_ptr) {</div><div class='del'>-		printk(", Error: Requested type of the card was not found!\n");</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "Error: Requested type of the card was not found!\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (comedi_pci_enable(pcidev, driver_pci_dio.driver_name)) {</div><div class='del'>-		printk</div><div class='del'>-		    (", Error: Can't enable PCI device and request regions!\n");</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "Error: Can't enable PCI device and request regions!\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	iobase = pci_resource_start(pcidev, this_board-&gt;main_pci_region);</div><div class='del'>-	printk(", b:s:f=%d:%d:%d, io=0x%4lx",</div><div class='del'>-	       pcidev-&gt;bus-&gt;number, PCI_SLOT(pcidev-&gt;devfn),</div><div class='del'>-	       PCI_FUNC(pcidev-&gt;devfn), iobase);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "b:s:f=%d:%d:%d, io=0x%4lx\n",</div><div class='add'>+		pcidev-&gt;bus-&gt;number, PCI_SLOT(pcidev-&gt;devfn),</div><div class='add'>+		PCI_FUNC(pcidev-&gt;devfn), iobase);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;iobase = iobase;</div><div class='ctx'> 	dev-&gt;board_name = this_board-&gt;name;</div><div class='hunk'>@@ -1177,15 +1173,10 @@ static int pci_dio_attach(struct comedi_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = alloc_subdevices(dev, n_subdevices);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		printk(", Error: Cann't allocate subdevice memory!\n");</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(".\n");</div><div class='ctx'> </div><div class='ctx'> 	subdev = 0;</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; MAX_DI_SUBDEVS; i++)</div><div class='ctx'> 		if (this_board-&gt;sdi[i].chans) {</div><div class='ctx'> 			s = dev-&gt;subdevices + subdev;</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c<br/>index 93bbe4ec318d..566cc4411452 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/amplc_dio200.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/amplc_dio200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/amplc_dio200.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/amplc_dio200.c</a></div><div class='hunk'>@@ -421,12 +421,9 @@ static const struct dio200_layout_struct dio200_layouts[] = {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMEDI_PCI</div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(dio200_pci_table) = {</div><div class='del'>-	{</div><div class='del'>-	PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI215,</div><div class='del'>-		    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI272,</div><div class='del'>-		    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	0}</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI215) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI272) },</div><div class='add'>+	{0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, dio200_pci_table);</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c<br/>index 48246cd50d47..7972cadd403e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/amplc_pc236.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/amplc_pc236.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/amplc_pc236.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/amplc_pc236.c</a></div><div class='hunk'>@@ -134,10 +134,8 @@ static const struct pc236_board pc236_boards[] = {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMEDI_PCI</div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(pc236_pci_table) = {</div><div class='del'>-	{</div><div class='del'>-	PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI236,</div><div class='del'>-		    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	0}</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI236) },</div><div class='add'>+	{0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, pc236_pci_table);</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c<br/>index 8a3388079094..191ac0d23ce7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/amplc_pc263.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/amplc_pc263.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/amplc_pc263.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/amplc_pc263.c</a></div><div class='hunk'>@@ -101,10 +101,8 @@ static const struct pc263_board pc263_boards[] = {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMEDI_PCI</div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(pc263_pci_table) = {</div><div class='del'>-	{</div><div class='del'>-	PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI263,</div><div class='del'>-		    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	0}</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI263) },</div><div class='add'>+	{0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, pc263_pci_table);</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c<br/>index 1b5ba1c27259..b278917cec25 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/amplc_pci224.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/amplc_pci224.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/amplc_pci224.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/amplc_pci224.c</a></div><div class='hunk'>@@ -384,12 +384,9 @@ static const struct pci224_board pci224_boards[] = {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(pci224_pci_table) = {</div><div class='del'>-	{</div><div class='del'>-	PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI224,</div><div class='del'>-		    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI234,</div><div class='del'>-		    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	0}</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI224) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI234) },</div><div class='add'>+	{0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, pci224_pci_table);</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c<br/>index 7edeb1103dc8..538979551c8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/amplc_pci230.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/amplc_pci230.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/amplc_pci230.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/amplc_pci230.c</a></div><div class='hunk'>@@ -501,12 +501,9 @@ static const struct pci230_board pci230_boards[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(pci230_pci_table) = {</div><div class='del'>-	{</div><div class='del'>-	PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI230, PCI_ANY_ID,</div><div class='del'>-		    PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI260, PCI_ANY_ID,</div><div class='del'>-		    PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	0}</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI230) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI260) },</div><div class='add'>+	{0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, pci230_pci_table);</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c<br/>index e171c56112d8..49404f49f7b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/cb_das16_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/cb_das16_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/cb_das16_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/cb_das16_cs.c</a></div><div class='hunk'>@@ -99,7 +99,7 @@ static struct comedi_driver driver_das16cs = {</div><div class='ctx'> 	.detach = das16cs_detach,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct pcmcia_device *cur_dev = NULL;</div><div class='add'>+static struct pcmcia_device *cur_dev;</div><div class='ctx'> </div><div class='ctx'> static const struct comedi_lrange das16cs_ai_range = { 4, {</div><div class='ctx'> 							   RANGE(-10, 10),</div><div class='hunk'>@@ -150,7 +150,7 @@ static const struct das16cs_board *das16cs_probe(struct comedi_device *dev,</div><div class='ctx'> 			return das16cs_boards + i;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("unknown board!\n");</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "unknown board!\n");</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -163,20 +163,19 @@ static int das16cs_attach(struct comedi_device *dev,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: cb_das16_cs: ", dev-&gt;minor);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "comedi%d: cb_das16_cs: attached\n", dev-&gt;minor);</div><div class='ctx'> </div><div class='ctx'> 	link = cur_dev;		/* XXX hack */</div><div class='ctx'> 	if (!link)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;iobase = link-&gt;resource[0]-&gt;start;</div><div class='del'>-	printk("I/O base=0x%04lx ", dev-&gt;iobase);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "I/O base=0x%04lx\n", dev-&gt;iobase);</div><div class='ctx'> </div><div class='del'>-	printk("fingerprint:\n");</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "fingerprint:\n");</div><div class='ctx'> 	for (i = 0; i &lt; 48; i += 2)</div><div class='del'>-		printk("%04x ", inw(dev-&gt;iobase + i));</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "%04x\n", inw(dev-&gt;iobase + i));</div><div class='ctx'> </div><div class='del'>-	printk("\n");</div><div class='ctx'> </div><div class='ctx'> 	ret = request_irq(link-&gt;irq, das16cs_interrupt,</div><div class='ctx'> 			  IRQF_SHARED, "cb_das16_cs", dev);</div><div class='hunk'>@@ -185,7 +184,7 @@ static int das16cs_attach(struct comedi_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;irq = link-&gt;irq;</div><div class='ctx'> </div><div class='del'>-	printk("irq=%u ", dev-&gt;irq);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "irq=%u\n", dev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;board_ptr = das16cs_probe(dev, link);</div><div class='ctx'> 	if (!dev-&gt;board_ptr)</div><div class='hunk'>@@ -252,14 +251,13 @@ static int das16cs_attach(struct comedi_device *dev,</div><div class='ctx'> 		s-&gt;type = COMEDI_SUBD_UNUSED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("attached\n");</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int das16cs_detach(struct comedi_device *dev)</div><div class='ctx'> {</div><div class='del'>-	printk("comedi%d: das16cs: remove\n", dev-&gt;minor);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "comedi%d: das16cs: remove\n", dev-&gt;minor);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;irq)</div><div class='ctx'> 		free_irq(dev-&gt;irq, dev);</div><div class='hunk'>@@ -312,7 +310,7 @@ static int das16cs_ai_rinsn(struct comedi_device *dev,</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (to == TIMEOUT) {</div><div class='del'>-			printk("cb_das16_cs: ai timeout\n");</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "cb_das16_cs: ai timeout\n");</div><div class='ctx'> 			return -ETIME;</div><div class='ctx'> 		}</div><div class='ctx'> 		data[i] = (unsigned short)inw(dev-&gt;iobase + 0);</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c<br/>index 61968a505f24..7e4ffcfdac62 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/cb_pcidas.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/cb_pcidas.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/cb_pcidas.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/cb_pcidas.c</a></div><div class='hunk'>@@ -565,8 +565,6 @@ static int cb_pcidas_attach(struct comedi_device *dev,</div><div class='ctx'> 	int index;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: cb_pcidas: ", dev-&gt;minor);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Allocate the private structure area.</div><div class='ctx'>  */</div><div class='hunk'>@@ -576,7 +574,6 @@ static int cb_pcidas_attach(struct comedi_device *dev,</div><div class='ctx'> /*</div><div class='ctx'>  * Probe the device to determine what device in the series it is.</div><div class='ctx'>  */</div><div class='del'>-	printk("\n");</div><div class='ctx'> </div><div class='ctx'> 	for_each_pci_dev(pcidev) {</div><div class='ctx'> 		/*  is it not a computer boards card? */</div><div class='hunk'>@@ -600,20 +597,20 @@ static int cb_pcidas_attach(struct comedi_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("No supported ComputerBoards/MeasurementComputing card found on "</div><div class='del'>-	       "requested position\n");</div><div class='add'>+	dev_err(dev-&gt;hw_dev, "No supported ComputerBoards/MeasurementComputing card found on requested position\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> </div><div class='ctx'> found:</div><div class='ctx'> </div><div class='del'>-	printk("Found %s on bus %i, slot %i\n", cb_pcidas_boards[index].name,</div><div class='del'>-	       pcidev-&gt;bus-&gt;number, PCI_SLOT(pcidev-&gt;devfn));</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "Found %s on bus %i, slot %i\n",</div><div class='add'>+		cb_pcidas_boards[index].name, pcidev-&gt;bus-&gt;number,</div><div class='add'>+		PCI_SLOT(pcidev-&gt;devfn));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Enable PCI device and reserve I/O ports.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (comedi_pci_enable(pcidev, "cb_pcidas")) {</div><div class='del'>-		printk(" Failed to enable PCI device and request regions\n");</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "Failed to enable PCI device and request regions\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -639,7 +636,8 @@ found:</div><div class='ctx'> 	/*  get irq */</div><div class='ctx'> 	if (request_irq(devpriv-&gt;pci_dev-&gt;irq, cb_pcidas_interrupt,</div><div class='ctx'> 			IRQF_SHARED, "cb_pcidas", dev)) {</div><div class='del'>-		printk(" unable to allocate irq %d\n", devpriv-&gt;pci_dev-&gt;irq);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "unable to allocate irq %d\n",</div><div class='add'>+			devpriv-&gt;pci_dev-&gt;irq);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;irq = devpriv-&gt;pci_dev-&gt;irq;</div><div class='hunk'>@@ -768,7 +766,6 @@ found:</div><div class='ctx'>  */</div><div class='ctx'> static int cb_pcidas_detach(struct comedi_device *dev)</div><div class='ctx'> {</div><div class='del'>-	printk("comedi%d: cb_pcidas: remove\n", dev-&gt;minor);</div><div class='ctx'> </div><div class='ctx'> 	if (devpriv) {</div><div class='ctx'> 		if (devpriv-&gt;s5933_config) {</div><div class='hunk'>@@ -776,8 +773,8 @@ static int cb_pcidas_detach(struct comedi_device *dev)</div><div class='ctx'> 			outl(INTCSR_INBOX_INTR_STATUS,</div><div class='ctx'> 			     devpriv-&gt;s5933_config + AMCC_OP_REG_INTCSR);</div><div class='ctx'> #ifdef CB_PCIDAS_DEBUG</div><div class='del'>-			printk("detaching, incsr is 0x%x\n",</div><div class='del'>-			       inl(devpriv-&gt;s5933_config + AMCC_OP_REG_INTCSR));</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "detaching, incsr is 0x%x\n",</div><div class='add'>+				inl(devpriv-&gt;s5933_config + AMCC_OP_REG_INTCSR));</div><div class='ctx'> #endif</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -858,7 +855,8 @@ static int ai_config_calibration_source(struct comedi_device *dev,</div><div class='ctx'> 	unsigned int source = data[1];</div><div class='ctx'> </div><div class='ctx'> 	if (source &gt;= num_calibration_sources) {</div><div class='del'>-		printk("invalid calibration source: %i\n", source);</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "invalid calibration source: %i\n",</div><div class='add'>+			source);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1279,7 +1277,7 @@ static int cb_pcidas_ai_cmd(struct comedi_device *dev,</div><div class='ctx'> 	outw(bits, devpriv-&gt;control_status + ADCMUX_CONT);</div><div class='ctx'> </div><div class='ctx'> #ifdef CB_PCIDAS_DEBUG</div><div class='del'>-	printk("comedi: sent 0x%x to adcmux control\n", bits);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "comedi: sent 0x%x to adcmux control\n", bits);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/*  load counters */</div><div class='hunk'>@@ -1306,7 +1304,8 @@ static int cb_pcidas_ai_cmd(struct comedi_device *dev,</div><div class='ctx'> 		devpriv-&gt;adc_fifo_bits |= INT_FHF;	/* interrupt fifo half full */</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CB_PCIDAS_DEBUG</div><div class='del'>-	printk("comedi: adc_fifo_bits are 0x%x\n", devpriv-&gt;adc_fifo_bits);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "comedi: adc_fifo_bits are 0x%x\n",</div><div class='add'>+		devpriv-&gt;adc_fifo_bits);</div><div class='ctx'> #endif</div><div class='ctx'> 	/*  enable (and clear) interrupts */</div><div class='ctx'> 	outw(devpriv-&gt;adc_fifo_bits | EOAI | INT | LADFUL,</div><div class='hunk'>@@ -1332,7 +1331,7 @@ static int cb_pcidas_ai_cmd(struct comedi_device *dev,</div><div class='ctx'> 		bits |= BURSTE;</div><div class='ctx'> 	outw(bits, devpriv-&gt;control_status + TRIG_CONTSTAT);</div><div class='ctx'> #ifdef CB_PCIDAS_DEBUG</div><div class='del'>-	printk("comedi: sent 0x%x to trig control\n", bits);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "comedi: sent 0x%x to trig control\n", bits);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1549,7 +1548,8 @@ static int cb_pcidas_ao_inttrig(struct comedi_device *dev,</div><div class='ctx'> 	spin_lock_irqsave(&amp;dev-&gt;spinlock, flags);</div><div class='ctx'> 	devpriv-&gt;adc_fifo_bits |= DAEMIE | DAHFIE;</div><div class='ctx'> #ifdef CB_PCIDAS_DEBUG</div><div class='del'>-	printk("comedi: adc_fifo_bits are 0x%x\n", devpriv-&gt;adc_fifo_bits);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "comedi: adc_fifo_bits are 0x%x\n",</div><div class='add'>+		devpriv-&gt;adc_fifo_bits);</div><div class='ctx'> #endif</div><div class='ctx'> 	/*  enable and clear interrupts */</div><div class='ctx'> 	outw(devpriv-&gt;adc_fifo_bits | DAEMI | DAHFI,</div><div class='hunk'>@@ -1559,7 +1559,8 @@ static int cb_pcidas_ao_inttrig(struct comedi_device *dev,</div><div class='ctx'> 	devpriv-&gt;ao_control_bits |= DAC_START | DACEN | DAC_EMPTY;</div><div class='ctx'> 	outw(devpriv-&gt;ao_control_bits, devpriv-&gt;control_status + DAC_CSR);</div><div class='ctx'> #ifdef CB_PCIDAS_DEBUG</div><div class='del'>-	printk("comedi: sent 0x%x to dac control\n", devpriv-&gt;ao_control_bits);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "comedi: sent 0x%x to dac control\n",</div><div class='add'>+		devpriv-&gt;ao_control_bits);</div><div class='ctx'> #endif</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;dev-&gt;spinlock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1587,8 +1588,9 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d)</div><div class='ctx'> </div><div class='ctx'> 	s5933_status = inl(devpriv-&gt;s5933_config + AMCC_OP_REG_INTCSR);</div><div class='ctx'> #ifdef CB_PCIDAS_DEBUG</div><div class='del'>-	printk("intcsr 0x%x\n", s5933_status);</div><div class='del'>-	printk("mbef 0x%x\n", inl(devpriv-&gt;s5933_config + AMCC_OP_REG_MBEF));</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "intcsr 0x%x\n", s5933_status);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "mbef 0x%x\n",</div><div class='add'>+		inl(devpriv-&gt;s5933_config + AMCC_OP_REG_MBEF));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if ((INTCSR_INTR_ASSERTED &amp; s5933_status) == 0)</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c<br/>index 1e324198996c..c9e8c4785768 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/cb_pcidas64.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/cb_pcidas64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/cb_pcidas64.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/cb_pcidas64.c</a></div><div class='hunk'>@@ -1739,8 +1739,6 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 	uint32_t local_range, local_decode;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: cb_pcidas64\n", dev-&gt;minor);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Allocate the private structure area.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1781,12 +1779,11 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("Found %s on bus %i, slot %i\n", board(dev)-&gt;name,</div><div class='del'>-	       pcidev-&gt;bus-&gt;number, PCI_SLOT(pcidev-&gt;devfn));</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "Found %s on bus %i, slot %i\n", board(dev)-&gt;name,</div><div class='add'>+		pcidev-&gt;bus-&gt;number, PCI_SLOT(pcidev-&gt;devfn));</div><div class='ctx'> </div><div class='ctx'> 	if (comedi_pci_enable(pcidev, driver_cb_pcidas.driver_name)) {</div><div class='del'>-		printk(KERN_WARNING</div><div class='del'>-		       " failed to enable PCI device and request regions\n");</div><div class='add'>+		dev_warn(dev-&gt;hw_dev, "failed to enable PCI device and request regions\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	pci_set_master(pcidev);</div><div class='hunk'>@@ -1814,7 +1811,7 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> </div><div class='ctx'> 	if (!priv(dev)-&gt;plx9080_iobase || !priv(dev)-&gt;main_iobase</div><div class='ctx'> 	    || !priv(dev)-&gt;dio_counter_iobase) {</div><div class='del'>-		printk(" failed to remap io memory\n");</div><div class='add'>+		dev_warn(dev-&gt;hw_dev, "failed to remap io memory\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1850,17 +1847,19 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> </div><div class='ctx'> 	priv(dev)-&gt;hw_revision =</div><div class='ctx'> 	    hw_revision(dev, readw(priv(dev)-&gt;main_iobase + HW_STATUS_REG));</div><div class='del'>-	printk(" stc hardware revision %i\n", priv(dev)-&gt;hw_revision);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "stc hardware revision %i\n",</div><div class='add'>+		priv(dev)-&gt;hw_revision);</div><div class='ctx'> 	init_plx9080(dev);</div><div class='ctx'> 	init_stc_registers(dev);</div><div class='ctx'> 	/*  get irq */</div><div class='ctx'> 	if (request_irq(pcidev-&gt;irq, handle_interrupt, IRQF_SHARED,</div><div class='ctx'> 			"cb_pcidas64", dev)) {</div><div class='del'>-		printk(" unable to allocate irq %u\n", pcidev-&gt;irq);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "unable to allocate irq %u\n",</div><div class='add'>+			pcidev-&gt;irq);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;irq = pcidev-&gt;irq;</div><div class='del'>-	printk(" irq %u\n", dev-&gt;irq);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "irq %u\n", dev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	retval = setup_subdevices(dev);</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='hunk'>@@ -1882,8 +1881,6 @@ static int detach(struct comedi_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: cb_pcidas: remove\n", dev-&gt;minor);</div><div class='del'>-</div><div class='ctx'> 	if (dev-&gt;irq)</div><div class='ctx'> 		free_irq(dev-&gt;irq, dev);</div><div class='ctx'> 	if (priv(dev)) {</div><div class='hunk'>@@ -2093,7 +2090,8 @@ static int ai_config_calibration_source(struct comedi_device *dev,</div><div class='ctx'> 	else</div><div class='ctx'> 		num_calibration_sources = 8;</div><div class='ctx'> 	if (source &gt;= num_calibration_sources) {</div><div class='del'>-		printk("invalid calibration source: %i\n", source);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "invalid calibration source: %i\n",</div><div class='add'>+			source);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2924,7 +2922,7 @@ static void pio_drain_ai_fifo_16(struct comedi_device *dev)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (num_samples &lt; 0) {</div><div class='del'>-			printk(" cb_pcidas64: bug! num_samples &lt; 0\n");</div><div class='add'>+			dev_err(dev-&gt;hw_dev, "cb_pcidas64: bug! num_samples &lt; 0\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c<br/>index 49102b3a6c4a..abba220a767f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/cb_pcidda.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/cb_pcidda.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/cb_pcidda.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/cb_pcidda.c</a></div><div class='hunk'>@@ -282,7 +282,6 @@ static int cb_pcidda_attach(struct comedi_device *dev,</div><div class='ctx'> 	struct pci_dev *pcidev = NULL;</div><div class='ctx'> 	int index;</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: cb_pcidda: ", dev-&gt;minor);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Allocate the private structure area.</div><div class='hunk'>@@ -293,7 +292,6 @@ static int cb_pcidda_attach(struct comedi_device *dev,</div><div class='ctx'> /*</div><div class='ctx'>  * Probe the device to determine what device in the series it is.</div><div class='ctx'>  */</div><div class='del'>-	printk("\n");</div><div class='ctx'> </div><div class='ctx'> 	for_each_pci_dev(pcidev) {</div><div class='ctx'> 		if (pcidev-&gt;vendor == PCI_VENDOR_ID_CB) {</div><div class='hunk'>@@ -312,22 +310,21 @@ static int cb_pcidda_attach(struct comedi_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!pcidev) {</div><div class='del'>-		printk</div><div class='del'>-		    ("Not a ComputerBoards/MeasurementComputing card on requested position\n");</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "Not a ComputerBoards/MeasurementComputing card on requested position\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> found:</div><div class='ctx'> 	devpriv-&gt;pci_dev = pcidev;</div><div class='ctx'> 	dev-&gt;board_ptr = cb_pcidda_boards + index;</div><div class='ctx'> 	/*  "thisboard" macro can be used from here. */</div><div class='del'>-	printk("Found %s at requested position\n", thisboard-&gt;name);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "Found %s at requested position\n",</div><div class='add'>+		thisboard-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Enable PCI device and request regions.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (comedi_pci_enable(pcidev, thisboard-&gt;name)) {</div><div class='del'>-		printk</div><div class='del'>-		    ("cb_pcidda: failed to enable PCI device and request regions\n");</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "cb_pcidda: failed to enable PCI device and request regions\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -377,12 +374,11 @@ found:</div><div class='ctx'> 	s = dev-&gt;subdevices + 2;</div><div class='ctx'> 	subdev_8255_init(dev, s, NULL, devpriv-&gt;digitalio + PORT2A);</div><div class='ctx'> </div><div class='del'>-	printk(" eeprom:");</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "eeprom:\n");</div><div class='ctx'> 	for (index = 0; index &lt; EEPROM_SIZE; index++) {</div><div class='ctx'> 		devpriv-&gt;eeprom_data[index] = cb_pcidda_read_eeprom(dev, index);</div><div class='del'>-		printk(" %i:0x%x ", index, devpriv-&gt;eeprom_data[index]);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "%i:0x%x\n", index, devpriv-&gt;eeprom_data[index]);</div><div class='ctx'> 	}</div><div class='del'>-	printk("\n");</div><div class='ctx'> </div><div class='ctx'> 	/*  set calibrations dacs */</div><div class='ctx'> 	for (index = 0; index &lt; thisboard-&gt;ao_chans; index++)</div><div class='hunk'>@@ -417,8 +413,6 @@ static int cb_pcidda_detach(struct comedi_device *dev)</div><div class='ctx'> 		subdev_8255_cleanup(dev, dev-&gt;subdevices + 2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: cb_pcidda: remove\n", dev-&gt;minor);</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/staging/comedi/drivers/cb_pcidio.c b/drivers/staging/comedi/drivers/cb_pcidio.c<br/>index 79477a595ef9..8f3215239a15 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/cb_pcidio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/cb_pcidio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/cb_pcidio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/cb_pcidio.c</a></div><div class='hunk'>@@ -184,8 +184,6 @@ static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 	int index;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: cb_pcidio: \n", dev-&gt;minor);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Allocate the private structure area.  alloc_private() is a</div><div class='ctx'>  * convenient macro defined in comedidev.h.</div><div class='hunk'>@@ -223,8 +221,7 @@ static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("No supported ComputerBoards/MeasurementComputing card found on "</div><div class='del'>-	       "requested position\n");</div><div class='add'>+	dev_err(dev-&gt;hw_dev, "No supported ComputerBoards/MeasurementComputing card found on requested position\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> </div><div class='ctx'> found:</div><div class='hunk'>@@ -236,14 +233,12 @@ found:</div><div class='ctx'> 	dev-&gt;board_name = thisboard-&gt;name;</div><div class='ctx'> </div><div class='ctx'> 	devpriv-&gt;pci_dev = pcidev;</div><div class='del'>-	printk("Found %s on bus %i, slot %i\n", thisboard-&gt;name,</div><div class='del'>-	       devpriv-&gt;pci_dev-&gt;bus-&gt;number,</div><div class='del'>-	       PCI_SLOT(devpriv-&gt;pci_dev-&gt;devfn));</div><div class='del'>-	if (comedi_pci_enable(pcidev, thisboard-&gt;name)) {</div><div class='del'>-		printk</div><div class='del'>-		    ("cb_pcidio: failed to enable PCI device and request regions\n");</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "Found %s on bus %i, slot %i\n", thisboard-&gt;name,</div><div class='add'>+		devpriv-&gt;pci_dev-&gt;bus-&gt;number,</div><div class='add'>+		PCI_SLOT(devpriv-&gt;pci_dev-&gt;devfn));</div><div class='add'>+	if (comedi_pci_enable(pcidev, thisboard-&gt;name))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	devpriv-&gt;dio_reg_base</div><div class='ctx'> 	    =</div><div class='ctx'> 	    pci_resource_start(devpriv-&gt;pci_dev,</div><div class='hunk'>@@ -259,11 +254,10 @@ found:</div><div class='ctx'> 	for (i = 0; i &lt; thisboard-&gt;n_8255; i++) {</div><div class='ctx'> 		subdev_8255_init(dev, dev-&gt;subdevices + i,</div><div class='ctx'> 				 NULL, devpriv-&gt;dio_reg_base + i * 4);</div><div class='del'>-		printk(" subdev %d: base = 0x%lx\n", i,</div><div class='del'>-		       devpriv-&gt;dio_reg_base + i * 4);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "subdev %d: base = 0x%lx\n", i,</div><div class='add'>+			devpriv-&gt;dio_reg_base + i * 4);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("attached\n");</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -277,7 +271,6 @@ found:</div><div class='ctx'>  */</div><div class='ctx'> static int pcidio_detach(struct comedi_device *dev)</div><div class='ctx'> {</div><div class='del'>-	printk("comedi%d: cb_pcidio: remove\n", dev-&gt;minor);</div><div class='ctx'> 	if (devpriv) {</div><div class='ctx'> 		if (devpriv-&gt;pci_dev) {</div><div class='ctx'> 			if (devpriv-&gt;dio_reg_base)</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c<br/>index b1b832b65bc1..8ba694263bd3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/cb_pcimdas.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/cb_pcimdas.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/cb_pcimdas.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/cb_pcimdas.c</a></div><div class='hunk'>@@ -212,8 +212,6 @@ static int cb_pcimdas_attach(struct comedi_device *dev,</div><div class='ctx'> 	int index;</div><div class='ctx'> 	/* int i; */</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: cb_pcimdas: ", dev-&gt;minor);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Allocate the private structure area.</div><div class='ctx'>  */</div><div class='hunk'>@@ -223,7 +221,6 @@ static int cb_pcimdas_attach(struct comedi_device *dev,</div><div class='ctx'> /*</div><div class='ctx'>  * Probe the device to determine what device in the series it is.</div><div class='ctx'>  */</div><div class='del'>-	printk("\n");</div><div class='ctx'> </div><div class='ctx'> 	for_each_pci_dev(pcidev) {</div><div class='ctx'> 		/*  is it not a computer boards card? */</div><div class='hunk'>@@ -248,26 +245,26 @@ static int cb_pcimdas_attach(struct comedi_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("No supported ComputerBoards/MeasurementComputing card found on "</div><div class='del'>-	       "requested position\n");</div><div class='add'>+	dev_err(dev-&gt;hw_dev, "No supported ComputerBoards/MeasurementComputing card found on requested position\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> </div><div class='ctx'> found:</div><div class='ctx'> </div><div class='del'>-	printk("Found %s on bus %i, slot %i\n", cb_pcimdas_boards[index].name,</div><div class='del'>-	       pcidev-&gt;bus-&gt;number, PCI_SLOT(pcidev-&gt;devfn));</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "Found %s on bus %i, slot %i\n",</div><div class='add'>+		cb_pcimdas_boards[index].name, pcidev-&gt;bus-&gt;number,</div><div class='add'>+		PCI_SLOT(pcidev-&gt;devfn));</div><div class='ctx'> </div><div class='ctx'> 	/*  Warn about non-tested features */</div><div class='ctx'> 	switch (thisboard-&gt;device_id) {</div><div class='ctx'> 	case 0x56:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk("THIS CARD IS UNSUPPORTED.\n"</div><div class='del'>-		       "PLEASE REPORT USAGE TO &lt;mocelet@sucs.org&gt;\n");</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "THIS CARD IS UNSUPPORTED.\n"</div><div class='add'>+			"PLEASE REPORT USAGE TO &lt;mocelet@sucs.org&gt;\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (comedi_pci_enable(pcidev, "cb_pcimdas")) {</div><div class='del'>-		printk(" Failed to enable PCI device and request regions\n");</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "Failed to enable PCI device and request regions\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -277,13 +274,11 @@ found:</div><div class='ctx'> 	devpriv-&gt;BADR3 = pci_resource_start(devpriv-&gt;pci_dev, 3);</div><div class='ctx'> 	devpriv-&gt;BADR4 = pci_resource_start(devpriv-&gt;pci_dev, 4);</div><div class='ctx'> </div><div class='del'>-#ifdef CBPCIMDAS_DEBUG</div><div class='del'>-	printk("devpriv-&gt;BADR0 = 0x%lx\n", devpriv-&gt;BADR0);</div><div class='del'>-	printk("devpriv-&gt;BADR1 = 0x%lx\n", devpriv-&gt;BADR1);</div><div class='del'>-	printk("devpriv-&gt;BADR2 = 0x%lx\n", devpriv-&gt;BADR2);</div><div class='del'>-	printk("devpriv-&gt;BADR3 = 0x%lx\n", devpriv-&gt;BADR3);</div><div class='del'>-	printk("devpriv-&gt;BADR4 = 0x%lx\n", devpriv-&gt;BADR4);</div><div class='del'>-#endif</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "devpriv-&gt;BADR0 = 0x%lx\n", devpriv-&gt;BADR0);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "devpriv-&gt;BADR1 = 0x%lx\n", devpriv-&gt;BADR1);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "devpriv-&gt;BADR2 = 0x%lx\n", devpriv-&gt;BADR2);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "devpriv-&gt;BADR3 = 0x%lx\n", devpriv-&gt;BADR3);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "devpriv-&gt;BADR4 = 0x%lx\n", devpriv-&gt;BADR4);</div><div class='ctx'> </div><div class='ctx'> /* Dont support IRQ yet */</div><div class='ctx'> /*  get irq */</div><div class='hunk'>@@ -333,8 +328,6 @@ found:</div><div class='ctx'> 	else</div><div class='ctx'> 		s-&gt;type = COMEDI_SUBD_UNUSED;</div><div class='ctx'> </div><div class='del'>-	printk("attached\n");</div><div class='del'>-</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -348,16 +341,19 @@ found:</div><div class='ctx'>  */</div><div class='ctx'> static int cb_pcimdas_detach(struct comedi_device *dev)</div><div class='ctx'> {</div><div class='del'>-#ifdef CBPCIMDAS_DEBUG</div><div class='ctx'> 	if (devpriv) {</div><div class='del'>-		printk("devpriv-&gt;BADR0 = 0x%lx\n", devpriv-&gt;BADR0);</div><div class='del'>-		printk("devpriv-&gt;BADR1 = 0x%lx\n", devpriv-&gt;BADR1);</div><div class='del'>-		printk("devpriv-&gt;BADR2 = 0x%lx\n", devpriv-&gt;BADR2);</div><div class='del'>-		printk("devpriv-&gt;BADR3 = 0x%lx\n", devpriv-&gt;BADR3);</div><div class='del'>-		printk("devpriv-&gt;BADR4 = 0x%lx\n", devpriv-&gt;BADR4);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "devpriv-&gt;BADR0 = 0x%lx\n",</div><div class='add'>+			devpriv-&gt;BADR0);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "devpriv-&gt;BADR1 = 0x%lx\n",</div><div class='add'>+			devpriv-&gt;BADR1);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "devpriv-&gt;BADR2 = 0x%lx\n",</div><div class='add'>+			devpriv-&gt;BADR2);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "devpriv-&gt;BADR3 = 0x%lx\n",</div><div class='add'>+			devpriv-&gt;BADR3);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "devpriv-&gt;BADR4 = 0x%lx\n",</div><div class='add'>+			devpriv-&gt;BADR4);</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='del'>-	printk("comedi%d: cb_pcimdas: remove\n", dev-&gt;minor);</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;irq)</div><div class='ctx'> 		free_irq(dev-&gt;irq, dev);</div><div class='ctx'> 	if (devpriv) {</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c<br/>index 8c981a89ab63..40bddfa22220 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/cb_pcimdda.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/cb_pcimdda.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/cb_pcimdda.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/cb_pcimdda.c</a></div><div class='hunk'>@@ -105,7 +105,8 @@ struct board_struct {</div><div class='ctx'> 	int ao_bits;</div><div class='ctx'> 	int dio_chans;</div><div class='ctx'> 	int dio_method;</div><div class='del'>-	int dio_offset;		/* how many bytes into the BADR are the DIO ports */</div><div class='add'>+	/* how many bytes into the BADR are the DIO ports */</div><div class='add'>+	int dio_offset;</div><div class='ctx'> 	int regs_badrindex;	/* IO Region for the control, analog output,</div><div class='ctx'> 				   and DIO registers */</div><div class='ctx'> 	int reg_sz;		/* number of bytes of registers in io region */</div><div class='hunk'>@@ -144,17 +145,18 @@ static const struct board_struct boards[] = {</div><div class='ctx'> /* Please add your PCI vendor ID to comedidev.h, and it will be forwarded</div><div class='ctx'>  * upstream. */</div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(pci_table) = {</div><div class='del'>-	{</div><div class='del'>-	PCI_VENDOR_ID_COMPUTERBOARDS, PCI_ID_PCIM_DDA06_16, PCI_ANY_ID,</div><div class='del'>-		    PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	0}</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, PCI_ID_PCIM_DDA06_16) },</div><div class='add'>+	{0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, pci_table);</div><div class='ctx'> </div><div class='del'>-/* this structure is for data unique to this hardware driver.  If</div><div class='del'>-   several hardware drivers keep similar information in this structure,</div><div class='del'>-   feel free to suggest moving the variable to the struct comedi_device struct.  */</div><div class='add'>+/*</div><div class='add'>+ * this structure is for data unique to this hardware driver.  If</div><div class='add'>+ * several hardware drivers keep similar information in this structure,</div><div class='add'>+ * feel free to suggest moving the variable to the struct comedi_device</div><div class='add'>+ * struct.</div><div class='add'>+ */</div><div class='ctx'> struct board_private_struct {</div><div class='ctx'> 	unsigned long registers;	/* set by probe */</div><div class='ctx'> 	unsigned long dio_registers;</div><div class='hunk'>@@ -335,7 +337,10 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 	if (thisboard-&gt;dio_chans) {</div><div class='ctx'> 		switch (thisboard-&gt;dio_method) {</div><div class='ctx'> 		case DIO_8255:</div><div class='del'>-			/* this is a straight 8255, so register us with the 8255 driver */</div><div class='add'>+			/*</div><div class='add'>+			 * this is a straight 8255, so register us with</div><div class='add'>+			 * the 8255 driver</div><div class='add'>+			 */</div><div class='ctx'> 			subdev_8255_init(dev, s, NULL, devpriv-&gt;dio_registers);</div><div class='ctx'> 			devpriv-&gt;attached_to_8255 = 1;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -436,8 +441,11 @@ static int ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; insn-&gt;n; i++) {</div><div class='ctx'> 		inw(devpriv-&gt;registers + chan * 2);</div><div class='del'>-		/* should I set data[i] to the result of the actual read on the register</div><div class='del'>-		   or the cached unsigned int in devpriv-&gt;ao_readback[]? */</div><div class='add'>+		/*</div><div class='add'>+		 * should I set data[i] to the result of the actual read</div><div class='add'>+		 * on the register or the cached unsigned int in</div><div class='add'>+		 * devpriv-&gt;ao_readback[]?</div><div class='add'>+		 */</div><div class='ctx'> 		data[i] = devpriv-&gt;ao_readback[chan];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c<br/>index 871f109bcfa3..e3659bd6e85e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/contec_pci_dio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/contec_pci_dio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/contec_pci_dio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/contec_pci_dio.c</a></div><div class='hunk'>@@ -57,10 +57,9 @@ static const struct contec_board contec_boards[] = {</div><div class='ctx'> </div><div class='ctx'> #define PCI_DEVICE_ID_PIO1616L 0x8172</div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(contec_pci_table) = {</div><div class='del'>-	{</div><div class='del'>-	PCI_VENDOR_ID_CONTEC, PCI_DEVICE_ID_PIO1616L, PCI_ANY_ID,</div><div class='del'>-		    PCI_ANY_ID, 0, 0, PIO1616L}, {</div><div class='del'>-	0}</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_CONTEC, PCI_DEVICE_ID_PIO1616L),</div><div class='add'>+		.driver_data = PIO1616L },</div><div class='add'>+	{0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, contec_pci_table);</div><div class='hunk'>@@ -197,8 +196,8 @@ static int contec_do_insn_bits(struct comedi_device *dev,</div><div class='ctx'> 			       struct comedi_insn *insn, unsigned int *data)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	printk("contec_do_insn_bits called\n");</div><div class='del'>-	printk(" data: %d %d\n", data[0], data[1]);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "contec_do_insn_bits called\n");</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "data: %d %d\n", data[0], data[1]);</div><div class='ctx'> </div><div class='ctx'> 	if (insn-&gt;n != 2)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -206,8 +205,8 @@ static int contec_do_insn_bits(struct comedi_device *dev,</div><div class='ctx'> 	if (data[0]) {</div><div class='ctx'> 		s-&gt;state &amp;= ~data[0];</div><div class='ctx'> 		s-&gt;state |= data[0] &amp; data[1];</div><div class='del'>-		printk("  out: %d on %lx\n", s-&gt;state,</div><div class='del'>-		       dev-&gt;iobase + thisboard-&gt;out_offs);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "out: %d on %lx\n", s-&gt;state,</div><div class='add'>+			dev-&gt;iobase + thisboard-&gt;out_offs);</div><div class='ctx'> 		outw(s-&gt;state, dev-&gt;iobase + thisboard-&gt;out_offs);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 2;</div><div class='hunk'>@@ -218,8 +217,8 @@ static int contec_di_insn_bits(struct comedi_device *dev,</div><div class='ctx'> 			       struct comedi_insn *insn, unsigned int *data)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	printk("contec_di_insn_bits called\n");</div><div class='del'>-	printk(" data: %d %d\n", data[0], data[1]);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "contec_di_insn_bits called\n");</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "data: %d %d\n", data[0], data[1]);</div><div class='ctx'> </div><div class='ctx'> 	if (insn-&gt;n != 2)</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c<br/>index 82be77daa7d7..e61c6a8f2857 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/daqboard2000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/daqboard2000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/daqboard2000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/daqboard2000.c</a></div><div class='hunk'>@@ -325,9 +325,8 @@ static const struct daq200_boardtype boardtypes[] = {</div><div class='ctx'> #define this_board ((const struct daq200_boardtype *)dev-&gt;board_ptr)</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(daqboard2000_pci_table) = {</div><div class='del'>-	{</div><div class='del'>-	0x1616, 0x0409, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	0}</div><div class='add'>+	{ PCI_DEVICE(0x1616, 0x0409) },</div><div class='add'>+	{0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, daqboard2000_pci_table);</div><div class='hunk'>@@ -430,16 +429,14 @@ static int daqboard2000_ai_insn_read(struct comedi_device *dev,</div><div class='ctx'> 		/* Enable reading from the scanlist FIFO */</div><div class='ctx'> 		fpga-&gt;acqControl = DAQBOARD2000_SeqStartScanList;</div><div class='ctx'> 		for (timeout = 0; timeout &lt; 20; timeout++) {</div><div class='del'>-			if (fpga-&gt;acqControl &amp; DAQBOARD2000_AcqConfigPipeFull) {</div><div class='add'>+			if (fpga-&gt;acqControl &amp; DAQBOARD2000_AcqConfigPipeFull)</div><div class='ctx'> 				break;</div><div class='del'>-			}</div><div class='ctx'> 			/* udelay(2); */</div><div class='ctx'> 		}</div><div class='ctx'> 		fpga-&gt;acqControl = DAQBOARD2000_AdcPacerEnable;</div><div class='ctx'> 		for (timeout = 0; timeout &lt; 20; timeout++) {</div><div class='del'>-			if (fpga-&gt;acqControl &amp; DAQBOARD2000_AcqLogicScanning) {</div><div class='add'>+			if (fpga-&gt;acqControl &amp; DAQBOARD2000_AcqLogicScanning)</div><div class='ctx'> 				break;</div><div class='del'>-			}</div><div class='ctx'> 			/* udelay(2); */</div><div class='ctx'> 		}</div><div class='ctx'> 		for (timeout = 0; timeout &lt; 20; timeout++) {</div><div class='hunk'>@@ -465,9 +462,8 @@ static int daqboard2000_ao_insn_read(struct comedi_device *dev,</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int chan = CR_CHAN(insn-&gt;chanspec);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; insn-&gt;n; i++) {</div><div class='add'>+	for (i = 0; i &lt; insn-&gt;n; i++)</div><div class='ctx'> 		data[i] = devpriv-&gt;ao_readback[chan];</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='hunk'>@@ -490,9 +486,8 @@ static int daqboard2000_ao_insn_write(struct comedi_device *dev,</div><div class='ctx'> 		/* fpga-&gt;dacControl = (chan + 2) * 0x0010 | 0x0001; udelay(1000); */</div><div class='ctx'> 		fpga-&gt;dacSetting[chan] = data[i];</div><div class='ctx'> 		for (timeout = 0; timeout &lt; 20; timeout++) {</div><div class='del'>-			if ((fpga-&gt;dacControl &amp; ((chan + 1) * 0x0010)) == 0) {</div><div class='add'>+			if ((fpga-&gt;dacControl &amp; ((chan + 1) * 0x0010)) == 0)</div><div class='ctx'> 				break;</div><div class='del'>-			}</div><div class='ctx'> 			/* udelay(2); */</div><div class='ctx'> 		}</div><div class='ctx'> 		devpriv-&gt;ao_readback[chan] = data[i];</div><div class='hunk'>@@ -507,7 +502,7 @@ static int daqboard2000_ao_insn_write(struct comedi_device *dev,</div><div class='ctx'> </div><div class='ctx'> static void daqboard2000_resetLocalBus(struct comedi_device *dev)</div><div class='ctx'> {</div><div class='del'>-	printk("daqboard2000_resetLocalBus\n");</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "daqboard2000_resetLocalBus\n");</div><div class='ctx'> 	writel(DAQBOARD2000_SECRLocalBusHi, devpriv-&gt;plx + 0x6c);</div><div class='ctx'> 	udelay(10000);</div><div class='ctx'> 	writel(DAQBOARD2000_SECRLocalBusLo, devpriv-&gt;plx + 0x6c);</div><div class='hunk'>@@ -516,7 +511,7 @@ static void daqboard2000_resetLocalBus(struct comedi_device *dev)</div><div class='ctx'> </div><div class='ctx'> static void daqboard2000_reloadPLX(struct comedi_device *dev)</div><div class='ctx'> {</div><div class='del'>-	printk("daqboard2000_reloadPLX\n");</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "daqboard2000_reloadPLX\n");</div><div class='ctx'> 	writel(DAQBOARD2000_SECRReloadLo, devpriv-&gt;plx + 0x6c);</div><div class='ctx'> 	udelay(10000);</div><div class='ctx'> 	writel(DAQBOARD2000_SECRReloadHi, devpriv-&gt;plx + 0x6c);</div><div class='hunk'>@@ -527,7 +522,7 @@ static void daqboard2000_reloadPLX(struct comedi_device *dev)</div><div class='ctx'> </div><div class='ctx'> static void daqboard2000_pulseProgPin(struct comedi_device *dev)</div><div class='ctx'> {</div><div class='del'>-	printk("daqboard2000_pulseProgPin 1\n");</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "daqboard2000_pulseProgPin 1\n");</div><div class='ctx'> 	writel(DAQBOARD2000_SECRProgPinHi, devpriv-&gt;plx + 0x6c);</div><div class='ctx'> 	udelay(10000);</div><div class='ctx'> 	writel(DAQBOARD2000_SECRProgPinLo, devpriv-&gt;plx + 0x6c);</div><div class='hunk'>@@ -579,14 +574,14 @@ static int initialize_daqboard2000(struct comedi_device *dev,</div><div class='ctx'> 	secr = readl(devpriv-&gt;plx + 0x6c);</div><div class='ctx'> 	if (!(secr &amp; DAQBOARD2000_EEPROM_PRESENT)) {</div><div class='ctx'> #ifdef DEBUG_EEPROM</div><div class='del'>-		printk("no serial eeprom\n");</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "no serial eeprom\n");</div><div class='ctx'> #endif</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (retry = 0; retry &lt; 3; retry++) {</div><div class='ctx'> #ifdef DEBUG_EEPROM</div><div class='del'>-		printk("Programming EEPROM try %x\n", retry);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "Programming EEPROM try %x\n", retry);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 		daqboard2000_resetLocalBus(dev);</div><div class='hunk'>@@ -597,7 +592,8 @@ static int initialize_daqboard2000(struct comedi_device *dev,</div><div class='ctx'> 				if (cpld_array[i] == 0xff</div><div class='ctx'> 				    &amp;&amp; cpld_array[i + 1] == 0x20) {</div><div class='ctx'> #ifdef DEBUG_EEPROM</div><div class='del'>-					printk("Preamble found at %d\n", i);</div><div class='add'>+					dev_dbg(dev-&gt;hw_dev, "Preamble found at %d\n",</div><div class='add'>+						i);</div><div class='ctx'> #endif</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -605,13 +601,12 @@ static int initialize_daqboard2000(struct comedi_device *dev,</div><div class='ctx'> 			for (; i &lt; len; i += 2) {</div><div class='ctx'> 				int data =</div><div class='ctx'> 				    (cpld_array[i] &lt;&lt; 8) + cpld_array[i + 1];</div><div class='del'>-				if (!daqboard2000_writeCPLD(dev, data)) {</div><div class='add'>+				if (!daqboard2000_writeCPLD(dev, data))</div><div class='ctx'> 					break;</div><div class='del'>-				}</div><div class='ctx'> 			}</div><div class='ctx'> 			if (i &gt;= len) {</div><div class='ctx'> #ifdef DEBUG_EEPROM</div><div class='del'>-				printk("Programmed\n");</div><div class='add'>+				dev_dbg(dev-&gt;hw_dev, "Programmed\n");</div><div class='ctx'> #endif</div><div class='ctx'> 				daqboard2000_resetLocalBus(dev);</div><div class='ctx'> 				daqboard2000_reloadPLX(dev);</div><div class='hunk'>@@ -658,9 +653,8 @@ static void daqboard2000_activateReferenceDacs(struct comedi_device *dev)</div><div class='ctx'> 	/*  Set the + reference dac value in the FPGA */</div><div class='ctx'> 	fpga-&gt;refDacs = 0x80 | DAQBOARD2000_PosRefDacSelect;</div><div class='ctx'> 	for (timeout = 0; timeout &lt; 20; timeout++) {</div><div class='del'>-		if ((fpga-&gt;dacControl &amp; DAQBOARD2000_RefBusy) == 0) {</div><div class='add'>+		if ((fpga-&gt;dacControl &amp; DAQBOARD2000_RefBusy) == 0)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> 		udelay(2);</div><div class='ctx'> 	}</div><div class='ctx'> /*  printk("DAQBOARD2000_PosRefDacSelect %d\n", timeout);*/</div><div class='hunk'>@@ -668,9 +662,8 @@ static void daqboard2000_activateReferenceDacs(struct comedi_device *dev)</div><div class='ctx'> 	/*  Set the - reference dac value in the FPGA */</div><div class='ctx'> 	fpga-&gt;refDacs = 0x80 | DAQBOARD2000_NegRefDacSelect;</div><div class='ctx'> 	for (timeout = 0; timeout &lt; 20; timeout++) {</div><div class='del'>-		if ((fpga-&gt;dacControl &amp; DAQBOARD2000_RefBusy) == 0) {</div><div class='add'>+		if ((fpga-&gt;dacControl &amp; DAQBOARD2000_RefBusy) == 0)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> 		udelay(2);</div><div class='ctx'> 	}</div><div class='ctx'> /*  printk("DAQBOARD2000_NegRefDacSelect %d\n", timeout);*/</div><div class='hunk'>@@ -737,15 +730,13 @@ static int daqboard2000_attach(struct comedi_device *dev,</div><div class='ctx'> 	unsigned int aux_len;</div><div class='ctx'> 	int bus, slot;</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: daqboard2000:", dev-&gt;minor);</div><div class='del'>-</div><div class='ctx'> 	bus = it-&gt;options[0];</div><div class='ctx'> 	slot = it-&gt;options[1];</div><div class='ctx'> </div><div class='ctx'> 	result = alloc_private(dev, sizeof(struct daqboard2000_private));</div><div class='del'>-	if (result &lt; 0) {</div><div class='add'>+	if (result &lt; 0)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	for (card = pci_get_device(0x1616, 0x0409, NULL);</div><div class='ctx'> 	     card != NULL; card = pci_get_device(0x1616, 0x0409, card)) {</div><div class='ctx'> 		if (bus || slot) {</div><div class='hunk'>@@ -759,10 +750,10 @@ static int daqboard2000_attach(struct comedi_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!card) {</div><div class='ctx'> 		if (bus || slot)</div><div class='del'>-			printk(" no daqboard2000 found at bus/slot: %d/%d\n",</div><div class='del'>-			       bus, slot);</div><div class='add'>+			dev_err(dev-&gt;hw_dev, "no daqboard2000 found at bus/slot: %d/%d\n",</div><div class='add'>+				bus, slot);</div><div class='ctx'> 		else</div><div class='del'>-			printk(" no daqboard2000 found\n");</div><div class='add'>+			dev_err(dev-&gt;hw_dev, "no daqboard2000 found\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u32 id;</div><div class='hunk'>@@ -772,7 +763,8 @@ static int daqboard2000_attach(struct comedi_device *dev,</div><div class='ctx'> 		      subsystem_device &lt;&lt; 16) | card-&gt;subsystem_vendor;</div><div class='ctx'> 		for (i = 0; i &lt; n_boardtypes; i++) {</div><div class='ctx'> 			if (boardtypes[i].id == id) {</div><div class='del'>-				printk(" %s", boardtypes[i].name);</div><div class='add'>+				dev_dbg(dev-&gt;hw_dev, "%s\n",</div><div class='add'>+					boardtypes[i].name);</div><div class='ctx'> 				dev-&gt;board_ptr = boardtypes + i;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -786,7 +778,7 @@ static int daqboard2000_attach(struct comedi_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	result = comedi_pci_enable(card, "daqboard2000");</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='del'>-		printk(" failed to enable PCI device and request regions\n");</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "failed to enable PCI device and request regions\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	devpriv-&gt;got_regions = 1;</div><div class='hunk'>@@ -794,9 +786,8 @@ static int daqboard2000_attach(struct comedi_device *dev,</div><div class='ctx'> 	    ioremap(pci_resource_start(card, 0), DAQBOARD2000_PLX_SIZE);</div><div class='ctx'> 	devpriv-&gt;daq =</div><div class='ctx'> 	    ioremap(pci_resource_start(card, 2), DAQBOARD2000_DAQ_SIZE);</div><div class='del'>-	if (!devpriv-&gt;plx || !devpriv-&gt;daq) {</div><div class='add'>+	if (!devpriv-&gt;plx || !devpriv-&gt;daq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	result = alloc_subdevices(dev, 3);</div><div class='ctx'> 	if (result &lt; 0)</div><div class='hunk'>@@ -817,7 +808,7 @@ static int daqboard2000_attach(struct comedi_device *dev,</div><div class='ctx'> 	if (aux_data &amp;&amp; aux_len) {</div><div class='ctx'> 		result = initialize_daqboard2000(dev, aux_data, aux_len);</div><div class='ctx'> 	} else {</div><div class='del'>-		printk("no FPGA initialization code, aborting\n");</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "no FPGA initialization code, aborting\n");</div><div class='ctx'> 		result = -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (result &lt; 0)</div><div class='hunk'>@@ -857,30 +848,26 @@ static int daqboard2000_attach(struct comedi_device *dev,</div><div class='ctx'> 	result = subdev_8255_init(dev, s, daqboard2000_8255_cb,</div><div class='ctx'> 				  (unsigned long)(dev-&gt;iobase + 0x40));</div><div class='ctx'> </div><div class='del'>-	printk("\n");</div><div class='ctx'> out:</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int daqboard2000_detach(struct comedi_device *dev)</div><div class='ctx'> {</div><div class='del'>-	printk("comedi%d: daqboard2000: remove\n", dev-&gt;minor);</div><div class='del'>-</div><div class='ctx'> 	if (dev-&gt;subdevices)</div><div class='ctx'> 		subdev_8255_cleanup(dev, dev-&gt;subdevices + 2);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;irq) {</div><div class='add'>+	if (dev-&gt;irq)</div><div class='ctx'> 		free_irq(dev-&gt;irq, dev);</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	if (devpriv) {</div><div class='ctx'> 		if (devpriv-&gt;daq)</div><div class='ctx'> 			iounmap(devpriv-&gt;daq);</div><div class='ctx'> 		if (devpriv-&gt;plx)</div><div class='ctx'> 			iounmap(devpriv-&gt;plx);</div><div class='ctx'> 		if (devpriv-&gt;pci_dev) {</div><div class='del'>-			if (devpriv-&gt;got_regions) {</div><div class='add'>+			if (devpriv-&gt;got_regions)</div><div class='ctx'> 				comedi_pci_disable(devpriv-&gt;pci_dev);</div><div class='del'>-			}</div><div class='ctx'> 			pci_dev_put(devpriv-&gt;pci_dev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c<br/>index 3141dc80fe74..c2dd0ed36a73 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/das08.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/das08.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/das08.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/das08.c</a></div><div class='hunk'>@@ -506,10 +506,8 @@ struct das08_board_struct das08_cs_boards[NUM_DAS08_CS_BOARDS] = {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMEDI_PCI</div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(das08_pci_table) = {</div><div class='del'>-	{</div><div class='del'>-	PCI_VENDOR_ID_COMPUTERBOARDS, PCI_DEVICE_ID_PCIDAS08,</div><div class='del'>-		    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	0}</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, PCI_DEVICE_ID_PCIDAS08) },</div><div class='add'>+	{0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, das08_pci_table);</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c<br/>index 6d91d3028178..4ad398aad72c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/das08_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/das08_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/das08_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/das08_cs.c</a></div><div class='hunk'>@@ -79,22 +79,20 @@ static int das08_cs_attach(struct comedi_device *dev,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: das08_cs: ", dev-&gt;minor);</div><div class='add'>+	dev_info(dev-&gt;hw_dev, "comedi%d: das08_cs:\n", dev-&gt;minor);</div><div class='ctx'> 	/*  deal with a pci board */</div><div class='ctx'> </div><div class='ctx'> 	if (thisboard-&gt;bustype == pcmcia) {</div><div class='ctx'> 		if (link == NULL) {</div><div class='del'>-			printk(" no pcmcia cards found\n");</div><div class='add'>+			dev_err(dev-&gt;hw_dev, "no pcmcia cards found\n");</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 		iobase = link-&gt;resource[0]-&gt;start;</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(" bug! board does not have PCMCIA bustype\n");</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "bug! board does not have PCMCIA bustype\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("\n");</div><div class='del'>-</div><div class='ctx'> 	return das08_common_attach(dev, iobase);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/comedi/drivers/das16m1.c b/drivers/staging/comedi/drivers/das16m1.c<br/>index a5ce3b2abe4a..5376e718e3d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/das16m1.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/das16m1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/das16m1.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/das16m1.c</a></div><div class='hunk'>@@ -384,20 +384,20 @@ static int das16m1_cmd_exec(struct comedi_device *dev,</div><div class='ctx'> 	byte = 0;</div><div class='ctx'> 	/* if we are using external start trigger (also board dislikes having</div><div class='ctx'> 	 * both start and conversion triggers external simultaneously) */</div><div class='del'>-	if (cmd-&gt;start_src == TRIG_EXT &amp;&amp; cmd-&gt;convert_src != TRIG_EXT) {</div><div class='add'>+	if (cmd-&gt;start_src == TRIG_EXT &amp;&amp; cmd-&gt;convert_src != TRIG_EXT)</div><div class='ctx'> 		byte |= EXT_TRIG_BIT;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	outb(byte, dev-&gt;iobase + DAS16M1_CS);</div><div class='ctx'> 	/* clear interrupt bit */</div><div class='ctx'> 	outb(0, dev-&gt;iobase + DAS16M1_CLEAR_INTR);</div><div class='ctx'> </div><div class='ctx'> 	/* enable interrupts and internal pacer */</div><div class='ctx'> 	devpriv-&gt;control_state &amp;= ~PACER_MASK;</div><div class='del'>-	if (cmd-&gt;convert_src == TRIG_TIMER) {</div><div class='add'>+	if (cmd-&gt;convert_src == TRIG_TIMER)</div><div class='ctx'> 		devpriv-&gt;control_state |= INT_PACER;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		devpriv-&gt;control_state |= EXT_PACER;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	devpriv-&gt;control_state |= INTE;</div><div class='ctx'> 	outb(devpriv-&gt;control_state, dev-&gt;iobase + DAS16M1_INTR_CONTROL);</div><div class='ctx'> </div><div class='hunk'>@@ -531,9 +531,8 @@ static void munge_sample_array(short *array, unsigned int num_elements)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; num_elements; i++) {</div><div class='add'>+	for (i = 0; i &lt; num_elements; i++)</div><div class='ctx'> 		array[i] = munge_sample(array[i]);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void das16m1_handler(struct comedi_device *dev, unsigned int status)</div><div class='hunk'>@@ -668,25 +667,20 @@ static int das16m1_attach(struct comedi_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	iobase = it-&gt;options[0];</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: das16m1:", dev-&gt;minor);</div><div class='del'>-</div><div class='ctx'> 	ret = alloc_private(dev, sizeof(struct das16m1_private_struct));</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;board_name = thisboard-&gt;name;</div><div class='ctx'> </div><div class='del'>-	printk(" io 0x%lx-0x%lx 0x%lx-0x%lx",</div><div class='del'>-	       iobase, iobase + DAS16M1_SIZE,</div><div class='del'>-	       iobase + DAS16M1_82C55, iobase + DAS16M1_82C55 + DAS16M1_SIZE2);</div><div class='ctx'> 	if (!request_region(iobase, DAS16M1_SIZE, driver_das16m1.driver_name)) {</div><div class='del'>-		printk(" I/O port conflict\n");</div><div class='add'>+		comedi_error(dev, "I/O port conflict\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!request_region(iobase + DAS16M1_82C55, DAS16M1_SIZE2,</div><div class='ctx'> 			    driver_das16m1.driver_name)) {</div><div class='ctx'> 		release_region(iobase, DAS16M1_SIZE);</div><div class='del'>-		printk(" I/O port conflict\n");</div><div class='add'>+		comedi_error(dev, "I/O port conflict\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;iobase = iobase;</div><div class='hunk'>@@ -697,17 +691,17 @@ static int das16m1_attach(struct comedi_device *dev,</div><div class='ctx'> 	if (das16m1_irq_bits(irq) &gt;= 0) {</div><div class='ctx'> 		ret = request_irq(irq, das16m1_interrupt, 0,</div><div class='ctx'> 				  driver_das16m1.driver_name, dev);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			printk(", irq unavailable\n");</div><div class='add'>+		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='del'>-		}</div><div class='ctx'> 		dev-&gt;irq = irq;</div><div class='del'>-		printk(", irq %u\n", irq);</div><div class='add'>+		printk</div><div class='add'>+		    ("irq %u\n", irq);</div><div class='ctx'> 	} else if (irq == 0) {</div><div class='del'>-		printk(", no irq\n");</div><div class='add'>+		printk</div><div class='add'>+		    (", no irq\n");</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(", invalid irq\n"</div><div class='del'>-		       " valid irqs are 2, 3, 5, 7, 10, 11, 12, or 15\n");</div><div class='add'>+		comedi_error(dev, "invalid irq\n"</div><div class='add'>+			     " valid irqs are 2, 3, 5, 7, 10, 11, 12, or 15\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -771,7 +765,6 @@ static int das16m1_attach(struct comedi_device *dev,</div><div class='ctx'> </div><div class='ctx'> static int das16m1_detach(struct comedi_device *dev)</div><div class='ctx'> {</div><div class='del'>-	printk("comedi%d: das16m1: remove\n", dev-&gt;minor);</div><div class='ctx'> </div><div class='ctx'> /* das16m1_reset(dev); */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c<br/>index a6df30b7fd7c..99ada5a53b9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/das1800.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/das1800.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/das1800.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/das1800.c</a></div><div class='hunk'>@@ -573,22 +573,23 @@ static int das1800_init_dma(struct comedi_device *dev, unsigned int dma0,</div><div class='ctx'> 			devpriv-&gt;dma_bits |= DMA_CH7_CH5;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			printk(" only supports dma channels 5 through 7\n"</div><div class='del'>-			       " Dual dma only allows the following combinations:\n"</div><div class='del'>-			       " dma 5,6 / 6,7 / or 7,5\n");</div><div class='add'>+			dev_err(dev-&gt;hw_dev, " only supports dma channels 5 through 7\n"</div><div class='add'>+				" Dual dma only allows the following combinations:\n"</div><div class='add'>+				" dma 5,6 / 6,7 / or 7,5\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (request_dma(dma0, driver_das1800.driver_name)) {</div><div class='del'>-			printk(" failed to allocate dma channel %i\n", dma0);</div><div class='add'>+			dev_err(dev-&gt;hw_dev, "failed to allocate dma channel %i\n",</div><div class='add'>+				dma0);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		devpriv-&gt;dma0 = dma0;</div><div class='ctx'> 		devpriv-&gt;dma_current = dma0;</div><div class='ctx'> 		if (dma1) {</div><div class='ctx'> 			if (request_dma(dma1, driver_das1800.driver_name)) {</div><div class='del'>-				printk(" failed to allocate dma channel %i\n",</div><div class='del'>-				       dma1);</div><div class='add'>+				dev_err(dev-&gt;hw_dev, "failed to allocate dma channel %i\n",</div><div class='add'>+					dma1);</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 			devpriv-&gt;dma1 = dma1;</div><div class='hunk'>@@ -631,20 +632,20 @@ static int das1800_attach(struct comedi_device *dev,</div><div class='ctx'> 	if (alloc_private(dev, sizeof(struct das1800_private)) &lt; 0)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: %s: io 0x%lx", dev-&gt;minor, driver_das1800.driver_name,</div><div class='del'>-	       iobase);</div><div class='add'>+	printk(KERN_DEBUG "comedi%d: %s: io 0x%lx", dev-&gt;minor,</div><div class='add'>+	       driver_das1800.driver_name, iobase);</div><div class='ctx'> 	if (irq) {</div><div class='del'>-		printk(", irq %u", irq);</div><div class='add'>+		printk(KERN_CONT ", irq %u", irq);</div><div class='ctx'> 		if (dma0) {</div><div class='del'>-			printk(", dma %u", dma0);</div><div class='add'>+			printk(KERN_CONT ", dma %u", dma0);</div><div class='ctx'> 			if (dma1)</div><div class='del'>-				printk(" and %u", dma1);</div><div class='add'>+				printk(KERN_CONT " and %u", dma1);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	printk("\n");</div><div class='add'>+	printk(KERN_CONT "\n");</div><div class='ctx'> </div><div class='ctx'> 	if (iobase == 0) {</div><div class='del'>-		printk(" io base address required\n");</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "io base address required\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -659,7 +660,7 @@ static int das1800_attach(struct comedi_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	board = das1800_probe(dev);</div><div class='ctx'> 	if (board &lt; 0) {</div><div class='del'>-		printk(" unable to determine board type\n");</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "unable to determine board type\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -683,7 +684,8 @@ static int das1800_attach(struct comedi_device *dev,</div><div class='ctx'> 	if (irq) {</div><div class='ctx'> 		if (request_irq(irq, das1800_interrupt, 0,</div><div class='ctx'> 				driver_das1800.driver_name, dev)) {</div><div class='del'>-			printk(" unable to allocate irq %u\n", irq);</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "unable to allocate irq %u\n",</div><div class='add'>+				irq);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -712,7 +714,7 @@ static int das1800_attach(struct comedi_device *dev,</div><div class='ctx'> 		devpriv-&gt;irq_dma_bits |= 0x38;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk(" irq out of range\n");</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "irq out of range\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -813,8 +815,8 @@ static int das1800_detach(struct comedi_device *dev)</div><div class='ctx'> 		kfree(devpriv-&gt;ai_buf1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: %s: remove\n", dev-&gt;minor,</div><div class='del'>-	       driver_das1800.driver_name);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "comedi%d: %s: remove\n", dev-&gt;minor,</div><div class='add'>+		driver_das1800.driver_name);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> };</div><div class='hunk'>@@ -833,8 +835,8 @@ static int das1800_probe(struct comedi_device *dev)</div><div class='ctx'> 	case 0x3:</div><div class='ctx'> 		if (board == das1801st_da || board == das1802st_da ||</div><div class='ctx'> 		    board == das1701st_da || board == das1702st_da) {</div><div class='del'>-			printk(" Board model: %s\n",</div><div class='del'>-			       das1800_boards[board].name);</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "Board model: %s\n",</div><div class='add'>+				das1800_boards[board].name);</div><div class='ctx'> 			return board;</div><div class='ctx'> 		}</div><div class='ctx'> 		printk</div><div class='hunk'>@@ -843,8 +845,8 @@ static int das1800_probe(struct comedi_device *dev)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x4:</div><div class='ctx'> 		if (board == das1802hr_da || board == das1702hr_da) {</div><div class='del'>-			printk(" Board model: %s\n",</div><div class='del'>-			       das1800_boards[board].name);</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "Board model: %s\n",</div><div class='add'>+				das1800_boards[board].name);</div><div class='ctx'> 			return board;</div><div class='ctx'> 		}</div><div class='ctx'> 		printk</div><div class='hunk'>@@ -854,8 +856,8 @@ static int das1800_probe(struct comedi_device *dev)</div><div class='ctx'> 	case 0x5:</div><div class='ctx'> 		if (board == das1801ao || board == das1802ao ||</div><div class='ctx'> 		    board == das1701ao || board == das1702ao) {</div><div class='del'>-			printk(" Board model: %s\n",</div><div class='del'>-			       das1800_boards[board].name);</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "Board model: %s\n",</div><div class='add'>+				das1800_boards[board].name);</div><div class='ctx'> 			return board;</div><div class='ctx'> 		}</div><div class='ctx'> 		printk</div><div class='hunk'>@@ -864,18 +866,19 @@ static int das1800_probe(struct comedi_device *dev)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x6:</div><div class='ctx'> 		if (board == das1802hr || board == das1702hr) {</div><div class='del'>-			printk(" Board model: %s\n",</div><div class='del'>-			       das1800_boards[board].name);</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "Board model: %s\n",</div><div class='add'>+				das1800_boards[board].name);</div><div class='ctx'> 			return board;</div><div class='ctx'> 		}</div><div class='del'>-		printk(" Board model (probed, not recommended): das-1802hr\n");</div><div class='add'>+		printk</div><div class='add'>+		    (" Board model (probed, not recommended): das-1802hr\n");</div><div class='ctx'> 		return das1802hr;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x7:</div><div class='ctx'> 		if (board == das1801st || board == das1802st ||</div><div class='ctx'> 		    board == das1701st || board == das1702st) {</div><div class='del'>-			printk(" Board model: %s\n",</div><div class='del'>-			       das1800_boards[board].name);</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "Board model: %s\n",</div><div class='add'>+				das1800_boards[board].name);</div><div class='ctx'> 			return board;</div><div class='ctx'> 		}</div><div class='ctx'> 		printk</div><div class='hunk'>@@ -884,8 +887,8 @@ static int das1800_probe(struct comedi_device *dev)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x8:</div><div class='ctx'> 		if (board == das1801hc || board == das1802hc) {</div><div class='del'>-			printk(" Board model: %s\n",</div><div class='del'>-			       das1800_boards[board].name);</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "Board model: %s\n",</div><div class='add'>+				das1800_boards[board].name);</div><div class='ctx'> 			return board;</div><div class='ctx'> 		}</div><div class='ctx'> 		printk</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/das6402.c b/drivers/staging/comedi/drivers/das6402.c<br/>index 6328f5280b66..f25684145e84 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/das6402.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/das6402.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/das6402.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/das6402.c</a></div><div class='hunk'>@@ -171,7 +171,7 @@ static irqreturn_t intr_handler(int irq, void *d)</div><div class='ctx'> 	struct comedi_subdevice *s = dev-&gt;subdevices;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;attached || devpriv-&gt;das6402_ignoreirq) {</div><div class='del'>-		printk("das6402: BUG: spurious interrupt\n");</div><div class='add'>+		dev_warn(dev-&gt;hw_dev, "BUG: spurious interrupt\n");</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef DEBUG</div><div class='hunk'>@@ -228,9 +228,7 @@ static int das6402_ai_cancel(struct comedi_device *dev,</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	devpriv-&gt;das6402_ignoreirq = 1;</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("das6402: Stopping acquisition\n");</div><div class='del'>-#endif</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "Stopping acquisition\n");</div><div class='ctx'> 	devpriv-&gt;das6402_ignoreirq = 1;</div><div class='ctx'> 	outb_p(0x02, dev-&gt;iobase + 10);	/* disable external trigging */</div><div class='ctx'> 	outw_p(SCANL, dev-&gt;iobase + 2);	/* resets the card fifo */</div><div class='hunk'>@@ -246,10 +244,7 @@ static int das6402_ai_mode2(struct comedi_device *dev,</div><div class='ctx'> 			    struct comedi_subdevice *s, comedi_trig * it)</div><div class='ctx'> {</div><div class='ctx'> 	devpriv-&gt;das6402_ignoreirq = 1;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("das6402: Starting acquisition\n");</div><div class='del'>-#endif</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "Starting acquisition\n");</div><div class='ctx'> 	outb_p(0x03, dev-&gt;iobase + 10);	/* enable external trigging */</div><div class='ctx'> 	outw_p(SCANL, dev-&gt;iobase + 2);	/* resets the card fifo */</div><div class='ctx'> 	outb_p(IRQ | CONVSRC | BURSTEN | INTE, dev-&gt;iobase + 9);</div><div class='hunk'>@@ -329,10 +324,8 @@ static int das6402_attach(struct comedi_device *dev,</div><div class='ctx'> 	if (iobase == 0)</div><div class='ctx'> 		iobase = 0x300;</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: das6402: 0x%04lx", dev-&gt;minor, iobase);</div><div class='del'>-</div><div class='ctx'> 	if (!request_region(iobase, DAS6402_SIZE, "das6402")) {</div><div class='del'>-		printk(" I/O port conflict\n");</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "I/O port conflict\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;iobase = iobase;</div><div class='hunk'>@@ -340,14 +333,12 @@ static int das6402_attach(struct comedi_device *dev,</div><div class='ctx'> 	/* should do a probe here */</div><div class='ctx'> </div><div class='ctx'> 	irq = it-&gt;options[0];</div><div class='del'>-	printk(" ( irq = %u )", irq);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "( irq = %u )\n", irq);</div><div class='ctx'> 	ret = request_irq(irq, intr_handler, 0, "das6402", dev);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		printk("irq conflict\n");</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	}</div><div class='del'>-	dev-&gt;irq = irq;</div><div class='ctx'> </div><div class='add'>+	dev-&gt;irq = irq;</div><div class='ctx'> 	ret = alloc_private(dev, sizeof(struct das6402_private));</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c<br/>index 96d41ad76956..6e347b40fe61 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/das800.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/das800.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/das800.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/das800.c</a></div><div class='hunk'>@@ -296,47 +296,47 @@ static int das800_probe(struct comedi_device *dev)</div><div class='ctx'> 	switch (id_bits) {</div><div class='ctx'> 	case 0x0:</div><div class='ctx'> 		if (board == das800) {</div><div class='del'>-			printk(" Board model: DAS-800\n");</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "Board model: DAS-800\n");</div><div class='ctx'> 			return board;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (board == ciodas800) {</div><div class='del'>-			printk(" Board model: CIO-DAS800\n");</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "Board model: CIO-DAS800\n");</div><div class='ctx'> 			return board;</div><div class='ctx'> 		}</div><div class='del'>-		printk(" Board model (probed): DAS-800\n");</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "Board model (probed): DAS-800\n");</div><div class='ctx'> 		return das800;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x2:</div><div class='ctx'> 		if (board == das801) {</div><div class='del'>-			printk(" Board model: DAS-801\n");</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "Board model: DAS-801\n");</div><div class='ctx'> 			return board;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (board == ciodas801) {</div><div class='del'>-			printk(" Board model: CIO-DAS801\n");</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "Board model: CIO-DAS801\n");</div><div class='ctx'> 			return board;</div><div class='ctx'> 		}</div><div class='del'>-		printk(" Board model (probed): DAS-801\n");</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "Board model (probed): DAS-801\n");</div><div class='ctx'> 		return das801;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x3:</div><div class='ctx'> 		if (board == das802) {</div><div class='del'>-			printk(" Board model: DAS-802\n");</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "Board model: DAS-802\n");</div><div class='ctx'> 			return board;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (board == ciodas802) {</div><div class='del'>-			printk(" Board model: CIO-DAS802\n");</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "Board model: CIO-DAS802\n");</div><div class='ctx'> 			return board;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (board == ciodas80216) {</div><div class='del'>-			printk(" Board model: CIO-DAS802/16\n");</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "Board model: CIO-DAS802/16\n");</div><div class='ctx'> 			return board;</div><div class='ctx'> 		}</div><div class='del'>-		printk(" Board model (probed): DAS-802\n");</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "Board model (probed): DAS-802\n");</div><div class='ctx'> 		return das802;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk(" Board model: probe returned 0x%x (unknown)\n",</div><div class='del'>-		       id_bits);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "Board model: probe returned 0x%x (unknown)\n",</div><div class='add'>+			id_bits);</div><div class='ctx'> 		return board;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -466,42 +466,43 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 	unsigned long irq_flags;</div><div class='ctx'> 	int board;</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: das800: io 0x%lx", dev-&gt;minor, iobase);</div><div class='add'>+	dev_info(dev-&gt;hw_dev, "comedi%d: das800: io 0x%lx\n", dev-&gt;minor,</div><div class='add'>+		 iobase);</div><div class='ctx'> 	if (irq)</div><div class='del'>-		printk(", irq %u", irq);</div><div class='del'>-	printk("\n");</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "irq %u\n", irq);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate and initialize dev-&gt;private */</div><div class='ctx'> 	if (alloc_private(dev, sizeof(struct das800_private)) &lt; 0)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (iobase == 0) {</div><div class='del'>-		printk("io base address required for das800\n");</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "io base address required for das800\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* check if io addresses are available */</div><div class='ctx'> 	if (!request_region(iobase, DAS800_SIZE, "das800")) {</div><div class='del'>-		printk("I/O port conflict\n");</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "I/O port conflict\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;iobase = iobase;</div><div class='ctx'> </div><div class='ctx'> 	board = das800_probe(dev);</div><div class='ctx'> 	if (board &lt; 0) {</div><div class='del'>-		printk("unable to determine board type\n");</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "unable to determine board type\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;board_ptr = das800_boards + board;</div><div class='ctx'> </div><div class='ctx'> 	/* grab our IRQ */</div><div class='ctx'> 	if (irq == 1 || irq &gt; 7) {</div><div class='del'>-		printk("irq out of range\n");</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "irq out of range\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (irq) {</div><div class='ctx'> 		if (request_irq(irq, das800_interrupt, 0, "das800", dev)) {</div><div class='del'>-			printk("unable to allocate irq %u\n", irq);</div><div class='add'>+			dev_err(dev-&gt;hw_dev, "unable to allocate irq %u\n",</div><div class='add'>+				irq);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -557,7 +558,7 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> </div><div class='ctx'> static int das800_detach(struct comedi_device *dev)</div><div class='ctx'> {</div><div class='del'>-	printk("comedi%d: das800: remove\n", dev-&gt;minor);</div><div class='add'>+	dev_info(dev-&gt;hw_dev, "comedi%d: das800: remove\n", dev-&gt;minor);</div><div class='ctx'> </div><div class='ctx'> 	/* only free stuff if it has been allocated by _attach */</div><div class='ctx'> 	if (dev-&gt;iobase)</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c<br/>index 6170f7bac46e..0a7979e52999 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/dt3000.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/dt3000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/dt3000.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/dt3000.c</a></div><div class='hunk'>@@ -352,7 +352,8 @@ static int dt3k_send_cmd(struct comedi_device *dev, unsigned int cmd)</div><div class='ctx'> 	if ((status &amp; DT3000_COMPLETION_MASK) == DT3000_NOERROR)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	printk("dt3k_send_cmd() timeout/error status=0x%04x\n", status);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "dt3k_send_cmd() timeout/error status=0x%04x\n",</div><div class='add'>+		status);</div><div class='ctx'> </div><div class='ctx'> 	return -ETIME;</div><div class='ctx'> }</div><div class='hunk'>@@ -383,7 +384,7 @@ static void dt3k_writesingle(struct comedi_device *dev, unsigned int subsys,</div><div class='ctx'> 	dt3k_send_cmd(dev, CMD_WRITESINGLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int debug_n_ints = 0;</div><div class='add'>+static int debug_n_ints;</div><div class='ctx'> </div><div class='ctx'> /* FIXME! Assumes shared interrupt is for this card. */</div><div class='ctx'> /* What's this debug_n_ints stuff? Obviously needs some work... */</div><div class='hunk'>@@ -429,12 +430,12 @@ static char *intr_flags[] = {</div><div class='ctx'> static void debug_intr_flags(unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	printk("dt3k: intr_flags:");</div><div class='add'>+	printk(KERN_DEBUG "dt3k: intr_flags:");</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++) {</div><div class='ctx'> 		if (flags &amp; (1 &lt;&lt; i))</div><div class='del'>-			printk(" %s", intr_flags[i]);</div><div class='add'>+			printk(KERN_CONT " %s", intr_flags[i]);</div><div class='ctx'> 	}</div><div class='del'>-	printk("\n");</div><div class='add'>+	printk(KERN_CONT "\n");</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -452,7 +453,7 @@ static void dt3k_ai_empty_fifo(struct comedi_device *dev,</div><div class='ctx'> 	if (count &lt; 0)</div><div class='ctx'> 		count += AI_FIFO_DEPTH;</div><div class='ctx'> </div><div class='del'>-	printk("reading %d samples\n", count);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "reading %d samples\n", count);</div><div class='ctx'> </div><div class='ctx'> 	rear = devpriv-&gt;ai_rear;</div><div class='ctx'> </div><div class='hunk'>@@ -640,7 +641,7 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned int mode;</div><div class='ctx'> </div><div class='del'>-	printk("dt3k_ai_cmd:\n");</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "dt3k_ai_cmd:\n");</div><div class='ctx'> 	for (i = 0; i &lt; cmd-&gt;chanlist_len; i++) {</div><div class='ctx'> 		chan = CR_CHAN(cmd-&gt;chanlist[i]);</div><div class='ctx'> 		range = CR_RANGE(cmd-&gt;chanlist[i]);</div><div class='hunk'>@@ -651,15 +652,15 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)</div><div class='ctx'> 	aref = CR_AREF(cmd-&gt;chanlist[0]);</div><div class='ctx'> </div><div class='ctx'> 	writew(cmd-&gt;scan_end_arg, devpriv-&gt;io_addr + DPR_Params(0));</div><div class='del'>-	printk("param[0]=0x%04x\n", cmd-&gt;scan_end_arg);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "param[0]=0x%04x\n", cmd-&gt;scan_end_arg);</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;convert_src == TRIG_TIMER) {</div><div class='ctx'> 		divider = dt3k_ns_to_timer(50, &amp;cmd-&gt;convert_arg,</div><div class='ctx'> 					   cmd-&gt;flags &amp; TRIG_ROUND_MASK);</div><div class='ctx'> 		writew((divider &gt;&gt; 16), devpriv-&gt;io_addr + DPR_Params(1));</div><div class='del'>-		printk("param[1]=0x%04x\n", divider &gt;&gt; 16);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "param[1]=0x%04x\n", divider &gt;&gt; 16);</div><div class='ctx'> 		writew((divider &amp; 0xffff), devpriv-&gt;io_addr + DPR_Params(2));</div><div class='del'>-		printk("param[2]=0x%04x\n", divider &amp; 0xffff);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "param[2]=0x%04x\n", divider &amp; 0xffff);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* not supported */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -668,21 +669,21 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)</div><div class='ctx'> 		tscandiv = dt3k_ns_to_timer(100, &amp;cmd-&gt;scan_begin_arg,</div><div class='ctx'> 					    cmd-&gt;flags &amp; TRIG_ROUND_MASK);</div><div class='ctx'> 		writew((tscandiv &gt;&gt; 16), devpriv-&gt;io_addr + DPR_Params(3));</div><div class='del'>-		printk("param[3]=0x%04x\n", tscandiv &gt;&gt; 16);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "param[3]=0x%04x\n", tscandiv &gt;&gt; 16);</div><div class='ctx'> 		writew((tscandiv &amp; 0xffff), devpriv-&gt;io_addr + DPR_Params(4));</div><div class='del'>-		printk("param[4]=0x%04x\n", tscandiv &amp; 0xffff);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "param[4]=0x%04x\n", tscandiv &amp; 0xffff);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* not supported */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mode = DT3000_AD_RETRIG_INTERNAL | 0 | 0;</div><div class='ctx'> 	writew(mode, devpriv-&gt;io_addr + DPR_Params(5));</div><div class='del'>-	printk("param[5]=0x%04x\n", mode);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "param[5]=0x%04x\n", mode);</div><div class='ctx'> 	writew(aref == AREF_DIFF, devpriv-&gt;io_addr + DPR_Params(6));</div><div class='del'>-	printk("param[6]=0x%04x\n", aref == AREF_DIFF);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "param[6]=0x%04x\n", aref == AREF_DIFF);</div><div class='ctx'> </div><div class='ctx'> 	writew(AI_FIFO_DEPTH / 2, devpriv-&gt;io_addr + DPR_Params(7));</div><div class='del'>-	printk("param[7]=0x%04x\n", AI_FIFO_DEPTH / 2);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "param[7]=0x%04x\n", AI_FIFO_DEPTH / 2);</div><div class='ctx'> </div><div class='ctx'> 	writew(SUBS_AI, devpriv-&gt;io_addr + DPR_SubSys);</div><div class='ctx'> 	ret = dt3k_send_cmd(dev, CMD_CONFIG);</div><div class='hunk'>@@ -848,7 +849,7 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 	int bus, slot;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	printk("dt3000:");</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "dt3000:\n");</div><div class='ctx'> 	bus = it-&gt;options[0];</div><div class='ctx'> 	slot = it-&gt;options[1];</div><div class='ctx'> </div><div class='hunk'>@@ -860,7 +861,7 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	if (ret == 0) {</div><div class='del'>-		printk(" no DT board found\n");</div><div class='add'>+		dev_warn(dev-&gt;hw_dev, "no DT board found\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -868,7 +869,8 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(devpriv-&gt;pci_dev-&gt;irq, dt3k_interrupt, IRQF_SHARED,</div><div class='ctx'> 			"dt3000", dev)) {</div><div class='del'>-		printk(" unable to allocate IRQ %u\n", devpriv-&gt;pci_dev-&gt;irq);</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "unable to allocate IRQ %u\n",</div><div class='add'>+			devpriv-&gt;pci_dev-&gt;irq);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;irq = devpriv-&gt;pci_dev-&gt;irq;</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c<br/>index 8d98cf412709..6a79ba10630d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/jr3_pci.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/jr3_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/jr3_pci.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/jr3_pci.c</a></div><div class='hunk'>@@ -71,18 +71,12 @@ static struct comedi_driver driver_jr3_pci = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(jr3_pci_pci_table) = {</div><div class='del'>-	{</div><div class='del'>-	PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL,</div><div class='del'>-		    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL_NEW,</div><div class='del'>-		    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_2_CHANNEL,</div><div class='del'>-		    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_3_CHANNEL,</div><div class='del'>-		    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_4_CHANNEL,</div><div class='del'>-		    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	0}</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL_NEW) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_2_CHANNEL) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_3_CHANNEL) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_4_CHANNEL) },</div><div class='add'>+	{0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, jr3_pci_pci_table);</div><div class='hunk'>@@ -378,14 +372,14 @@ static int jr3_pci_open(struct comedi_device *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct jr3_pci_dev_private *devpriv = dev-&gt;private;</div><div class='ctx'> </div><div class='del'>-	printk("jr3_pci_open\n");</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "jr3_pci_open\n");</div><div class='ctx'> 	for (i = 0; i &lt; devpriv-&gt;n_channels; i++) {</div><div class='ctx'> 		struct jr3_pci_subdev_private *p;</div><div class='ctx'> </div><div class='ctx'> 		p = dev-&gt;subdevices[i].private;</div><div class='ctx'> 		if (p) {</div><div class='del'>-			printk("serial: %p %d (%d)\n", p, p-&gt;serial_no,</div><div class='del'>-			       p-&gt;channel_no);</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "serial: %p %d (%d)\n", p,</div><div class='add'>+				p-&gt;serial_no, p-&gt;channel_no);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -463,8 +457,8 @@ static int jr3_download_firmware(struct comedi_device *dev, const u8 * data,</div><div class='ctx'> 					break;</div><div class='ctx'> 				more = more</div><div class='ctx'> 				    &amp;&amp; read_idm_word(data, size, &amp;pos, &amp;addr);</div><div class='del'>-				printk("Loading#%d %4.4x bytes at %4.4x\n", i,</div><div class='del'>-				       count, addr);</div><div class='add'>+				dev_dbg(dev-&gt;hw_dev, "Loading#%d %4.4x bytes at %4.4x\n",</div><div class='add'>+					i, count, addr);</div><div class='ctx'> 				while (more &amp;&amp; count &gt; 0) {</div><div class='ctx'> 					if (addr &amp; 0x4000) {</div><div class='ctx'> 						/*  16 bit data, never seen in real life!! */</div><div class='hunk'>@@ -599,24 +593,24 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s)</div><div class='ctx'> 					min_full_scale =</div><div class='ctx'> 					    get_min_full_scales(channel);</div><div class='ctx'> 					printk("Obtained Min. Full Scales:\n");</div><div class='del'>-					printk("%i   ", (min_full_scale).fx);</div><div class='del'>-					printk("%i   ", (min_full_scale).fy);</div><div class='del'>-					printk("%i   ", (min_full_scale).fz);</div><div class='del'>-					printk("%i   ", (min_full_scale).mx);</div><div class='del'>-					printk("%i   ", (min_full_scale).my);</div><div class='del'>-					printk("%i   ", (min_full_scale).mz);</div><div class='del'>-					printk("\n");</div><div class='add'>+					printk(KERN_DEBUG "%i ", (min_full_scale).fx);</div><div class='add'>+					printk(KERN_CONT "%i ", (min_full_scale).fy);</div><div class='add'>+					printk(KERN_CONT "%i ", (min_full_scale).fz);</div><div class='add'>+					printk(KERN_CONT "%i ", (min_full_scale).mx);</div><div class='add'>+					printk(KERN_CONT "%i ", (min_full_scale).my);</div><div class='add'>+					printk(KERN_CONT "%i ", (min_full_scale).mz);</div><div class='add'>+					printk(KERN_CONT "\n");</div><div class='ctx'> </div><div class='ctx'> 					max_full_scale =</div><div class='ctx'> 					    get_max_full_scales(channel);</div><div class='ctx'> 					printk("Obtained Max. Full Scales:\n");</div><div class='del'>-					printk("%i   ", (max_full_scale).fx);</div><div class='del'>-					printk("%i   ", (max_full_scale).fy);</div><div class='del'>-					printk("%i   ", (max_full_scale).fz);</div><div class='del'>-					printk("%i   ", (max_full_scale).mx);</div><div class='del'>-					printk("%i   ", (max_full_scale).my);</div><div class='del'>-					printk("%i   ", (max_full_scale).mz);</div><div class='del'>-					printk("\n");</div><div class='add'>+					printk(KERN_DEBUG "%i ", (max_full_scale).fx);</div><div class='add'>+					printk(KERN_CONT "%i ", (max_full_scale).fy);</div><div class='add'>+					printk(KERN_CONT "%i ", (max_full_scale).fz);</div><div class='add'>+					printk(KERN_CONT "%i ", (max_full_scale).mx);</div><div class='add'>+					printk(KERN_CONT "%i ", (max_full_scale).my);</div><div class='add'>+					printk(KERN_CONT "%i ", (max_full_scale).mz);</div><div class='add'>+					printk(KERN_CONT "\n");</div><div class='ctx'> </div><div class='ctx'> 					set_full_scales(channel,</div><div class='ctx'> 							max_full_scale);</div><div class='hunk'>@@ -779,14 +773,12 @@ static int jr3_pci_attach(struct comedi_device *dev,</div><div class='ctx'> 	int opt_bus, opt_slot, i;</div><div class='ctx'> 	struct jr3_pci_dev_private *devpriv;</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: jr3_pci\n", dev-&gt;minor);</div><div class='del'>-</div><div class='ctx'> 	opt_bus = it-&gt;options[0];</div><div class='ctx'> 	opt_slot = it-&gt;options[1];</div><div class='ctx'> </div><div class='ctx'> 	if (sizeof(struct jr3_channel) != 0xc00) {</div><div class='del'>-		printk("sizeof(struct jr3_channel) = %x [expected %x]\n",</div><div class='del'>-		       (unsigned)sizeof(struct jr3_channel), 0xc00);</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "sizeof(struct jr3_channel) = %x [expected %x]\n",</div><div class='add'>+			(unsigned)sizeof(struct jr3_channel), 0xc00);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -840,7 +832,7 @@ static int jr3_pci_attach(struct comedi_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!card) {</div><div class='del'>-		printk(" no jr3_pci found\n");</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "no jr3_pci found\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		devpriv-&gt;pci_dev = card;</div><div class='hunk'>@@ -875,10 +867,10 @@ static int jr3_pci_attach(struct comedi_device *dev,</div><div class='ctx'> </div><div class='ctx'> 			p = dev-&gt;subdevices[i].private;</div><div class='ctx'> 			p-&gt;channel = &amp;devpriv-&gt;iobase-&gt;channel[i].data;</div><div class='del'>-			printk("p-&gt;channel %p %p (%tx)\n",</div><div class='del'>-			       p-&gt;channel, devpriv-&gt;iobase,</div><div class='del'>-			       ((char *)(p-&gt;channel) -</div><div class='del'>-				(char *)(devpriv-&gt;iobase)));</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "p-&gt;channel %p %p (%tx)\n",</div><div class='add'>+				p-&gt;channel, devpriv-&gt;iobase,</div><div class='add'>+				((char *)(p-&gt;channel) -</div><div class='add'>+				 (char *)(devpriv-&gt;iobase)));</div><div class='ctx'> 			p-&gt;channel_no = i;</div><div class='ctx'> 			for (j = 0; j &lt; 8; j++) {</div><div class='ctx'> 				int k;</div><div class='hunk'>@@ -916,7 +908,7 @@ static int jr3_pci_attach(struct comedi_device *dev,</div><div class='ctx'> 	devpriv-&gt;iobase-&gt;channel[0].reset = 0;</div><div class='ctx'> </div><div class='ctx'> 	result = comedi_load_firmware(dev, "jr3pci.idm", jr3_download_firmware);</div><div class='del'>-	printk("Firmare load %d\n", result);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "Firmare load %d\n", result);</div><div class='ctx'> </div><div class='ctx'> 	if (result &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -934,9 +926,9 @@ static int jr3_pci_attach(struct comedi_device *dev,</div><div class='ctx'>  */</div><div class='ctx'> 	msleep_interruptible(25);</div><div class='ctx'> 	for (i = 0; i &lt; 0x18; i++) {</div><div class='del'>-		printk("%c",</div><div class='del'>-		       get_u16(&amp;devpriv-&gt;iobase-&gt;channel[0].</div><div class='del'>-			       data.copyright[i]) &gt;&gt; 8);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "%c\n",</div><div class='add'>+			get_u16(&amp;devpriv-&gt;iobase-&gt;channel[0].</div><div class='add'>+				data.copyright[i]) &gt;&gt; 8);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*  Start card timer */</div><div class='hunk'>@@ -963,7 +955,6 @@ static int jr3_pci_detach(struct comedi_device *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct jr3_pci_dev_private *devpriv = dev-&gt;private;</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: jr3_pci: remove\n", dev-&gt;minor);</div><div class='ctx'> 	if (devpriv) {</div><div class='ctx'> 		del_timer_sync(&amp;devpriv-&gt;timer);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c<br/>index 286093bca3fb..4e9e9a078652 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/ke_counter.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/ke_counter.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/ke_counter.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/ke_counter.c</a></div><div class='hunk'>@@ -52,10 +52,8 @@ static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it);</div><div class='ctx'> static int cnt_detach(struct comedi_device *dev);</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(cnt_pci_table) = {</div><div class='del'>-	{</div><div class='del'>-	PCI_VENDOR_ID_KOLTER, CNT_CARD_DEVICE_ID, PCI_ANY_ID,</div><div class='del'>-		    PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	0}</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_KOLTER, CNT_CARD_DEVICE_ID) },</div><div class='add'>+	{0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, cnt_pci_table);</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c<br/>index cda4b224b30f..8b812e41c52b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/me_daq.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/me_daq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/me_daq.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/me_daq.c</a></div><div class='hunk'>@@ -188,12 +188,9 @@ static const struct comedi_lrange me2600_ao_range = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PCI_DEVICE_TABLE(me_pci_table) = {</div><div class='del'>-	{</div><div class='del'>-	PCI_VENDOR_ID_MEILHAUS, ME2600_DEVICE_ID, PCI_ANY_ID,</div><div class='del'>-		    PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	PCI_VENDOR_ID_MEILHAUS, ME2000_DEVICE_ID, PCI_ANY_ID,</div><div class='del'>-		    PCI_ANY_ID, 0, 0, 0}, {</div><div class='del'>-	0}</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, ME2600_DEVICE_ID) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, ME2000_DEVICE_ID) },</div><div class='add'>+	{0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, me_pci_table);</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c<br/>index 32e675e3f0b9..c25e44c1905e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/ni_at_a2150.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/ni_at_a2150.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/ni_at_a2150.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/ni_at_a2150.c</a></div><div class='hunk'>@@ -731,9 +731,8 @@ static int a2150_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)</div><div class='ctx'> 	outw(trigger_bits, dev-&gt;iobase + TRIGGER_REG);</div><div class='ctx'> </div><div class='ctx'> 	/*  start acquisition for soft trigger */</div><div class='del'>-	if (cmd-&gt;start_src == TRIG_NOW) {</div><div class='add'>+	if (cmd-&gt;start_src == TRIG_NOW)</div><div class='ctx'> 		outw(0, dev-&gt;iobase + FIFO_START_REG);</div><div class='del'>-	}</div><div class='ctx'> #ifdef A2150_DEBUG</div><div class='ctx'> 	ni_dump_regs(dev);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -860,11 +859,10 @@ static int a2150_get_timing(struct comedi_device *dev, unsigned int *period,</div><div class='ctx'> 	case TRIG_ROUND_NEAREST:</div><div class='ctx'> 	default:</div><div class='ctx'> 		/*  if least upper bound is better approximation */</div><div class='del'>-		if (lub - *period &lt; *period - glb) {</div><div class='add'>+		if (lub - *period &lt; *period - glb)</div><div class='ctx'> 			*period = lub;</div><div class='del'>-		} else {</div><div class='add'>+		else</div><div class='ctx'> 			*period = glb;</div><div class='del'>-		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TRIG_ROUND_UP:</div><div class='ctx'> 		*period = lub;</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c<br/>index 49b824c7bd2e..c0423a8c3e36 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/ni_daq_dio24.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/ni_daq_dio24.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/ni_daq_dio24.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/ni_daq_dio24.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@ the PCMCIA interface.</div><div class='ctx'> #include &lt;pcmcia/cisreg.h&gt;</div><div class='ctx'> #include &lt;pcmcia/ds.h&gt;</div><div class='ctx'> </div><div class='del'>-static struct pcmcia_device *pcmcia_cur_dev = NULL;</div><div class='add'>+static struct pcmcia_device *pcmcia_cur_dev;</div><div class='ctx'> </div><div class='ctx'> #define DIO24_SIZE 4		/*  size of io region used by board */</div><div class='ctx'> </div><div class='hunk'>@@ -133,22 +133,19 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> #endif</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk("bug! couldn't determine board type\n");</div><div class='add'>+		pr_err("bug! couldn't determine board type\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	printk("comedi%d: ni_daq_dio24: %s, io 0x%lx", dev-&gt;minor,</div><div class='del'>-	       thisboard-&gt;name, iobase);</div><div class='add'>+	pr_debug("comedi%d: ni_daq_dio24: %s, io 0x%lx", dev-&gt;minor,</div><div class='add'>+		 thisboard-&gt;name, iobase);</div><div class='ctx'> #ifdef incomplete</div><div class='del'>-	if (irq) {</div><div class='del'>-		printk(", irq %u", irq);</div><div class='del'>-	}</div><div class='add'>+	if (irq)</div><div class='add'>+		pr_debug("irq %u\n", irq);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	printk("\n");</div><div class='del'>-</div><div class='ctx'> 	if (iobase == 0) {</div><div class='del'>-		printk("io base address is zero!\n");</div><div class='add'>+		pr_err("io base address is zero!\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -173,7 +170,7 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> </div><div class='ctx'> static int dio24_detach(struct comedi_device *dev)</div><div class='ctx'> {</div><div class='del'>-	printk("comedi%d: ni_daq_dio24: remove\n", dev-&gt;minor);</div><div class='add'>+	dev_info(dev-&gt;hw_dev, "comedi%d: ni_daq_dio24: remove\n", dev-&gt;minor);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;subdevices)</div><div class='ctx'> 		subdev_8255_cleanup(dev, dev-&gt;subdevices + 0);</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c<br/>index 832a5178b638..ff3840544dd4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/ni_labpc_cs.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/ni_labpc_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/ni_labpc_cs.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/ni_labpc_cs.c</a></div><div class='hunk'>@@ -145,7 +145,7 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 		irq = link-&gt;irq;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk("bug! couldn't determine board type\n");</div><div class='add'>+		pr_err("bug! couldn't determine board type\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c<br/>index 9148abdad074..0f0d995f137c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/ni_pcimio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/ni_pcimio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/ni_pcimio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/ni_pcimio.c</a></div><div class='hunk'>@@ -1470,7 +1470,7 @@ static void m_series_stc_writew(struct comedi_device *dev, uint16_t data,</div><div class='ctx'> 		/* FIXME: DIO_Output_Register (16 bit reg) is replaced by M_Offset_Static_Digital_Output (32 bit)</div><div class='ctx'> 		   and M_Offset_SCXI_Serial_Data_Out (8 bit) */</div><div class='ctx'> 	default:</div><div class='del'>-		printk("%s: bug! unhandled register=0x%x in switch.\n",</div><div class='add'>+		printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",</div><div class='ctx'> 		       __func__, reg);</div><div class='ctx'> 		BUG();</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1505,7 +1505,7 @@ static uint16_t m_series_stc_readw(struct comedi_device *dev, int reg)</div><div class='ctx'> 		offset = M_Offset_G01_Status;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk("%s: bug! unhandled register=0x%x in switch.\n",</div><div class='add'>+		printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",</div><div class='ctx'> 		       __func__, reg);</div><div class='ctx'> 		BUG();</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1547,7 +1547,7 @@ static void m_series_stc_writel(struct comedi_device *dev, uint32_t data,</div><div class='ctx'> 		offset = M_Offset_G1_Load_B;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk("%s: bug! unhandled register=0x%x in switch.\n",</div><div class='add'>+		printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",</div><div class='ctx'> 		       __func__, reg);</div><div class='ctx'> 		BUG();</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1573,7 +1573,7 @@ static uint32_t m_series_stc_readl(struct comedi_device *dev, int reg)</div><div class='ctx'> 		offset = M_Offset_G1_Save;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk("%s: bug! unhandled register=0x%x in switch.\n",</div><div class='add'>+		printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",</div><div class='ctx'> 		       __func__, reg);</div><div class='ctx'> 		BUG();</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1632,9 +1632,8 @@ static void m_series_init_eeprom_buffer(struct comedi_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	devpriv-&gt;serial_number = be32_to_cpu(devpriv-&gt;serial_number);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; M_SERIES_EEPROM_SIZE; ++i) {</div><div class='add'>+	for (i = 0; i &lt; M_SERIES_EEPROM_SIZE; ++i)</div><div class='ctx'> 		devpriv-&gt;eeprom_buffer[i] = ni_readb(Start_Cal_EEPROM + i);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	writel(old_iodwbsr1_bits, devpriv-&gt;mite-&gt;mite_io_addr + MITE_IODWBSR_1);</div><div class='ctx'> 	writel(old_iodwbsr_bits, devpriv-&gt;mite-&gt;mite_io_addr + MITE_IODWBSR);</div><div class='hunk'>@@ -1665,9 +1664,9 @@ static void init_6143(struct comedi_device *dev)</div><div class='ctx'> static int pcimio_detach(struct comedi_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	mio_common_detach(dev);</div><div class='del'>-	if (dev-&gt;irq) {</div><div class='add'>+	if (dev-&gt;irq)</div><div class='ctx'> 		free_irq(dev-&gt;irq, dev);</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;private) {</div><div class='ctx'> 		mite_free_ring(devpriv-&gt;ai_mite_ring);</div><div class='ctx'> 		mite_free_ring(devpriv-&gt;ao_mite_ring);</div><div class='hunk'>@@ -1685,7 +1684,7 @@ static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: ni_pcimio:", dev-&gt;minor);</div><div class='add'>+	dev_info(dev-&gt;hw_dev, "comedi%d: ni_pcimio:\n", dev-&gt;minor);</div><div class='ctx'> </div><div class='ctx'> 	ret = ni_alloc_private(dev);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -1695,7 +1694,7 @@ static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	printk(" %s", boardtype.name);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "%s\n", boardtype.name);</div><div class='ctx'> 	dev-&gt;board_name = boardtype.name;</div><div class='ctx'> </div><div class='ctx'> 	if (boardtype.reg_type &amp; ni_reg_m_series_mask) {</div><div class='hunk'>@@ -1712,7 +1711,7 @@ static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> </div><div class='ctx'> 	ret = mite_setup(devpriv-&gt;mite);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		printk(" error setting up mite\n");</div><div class='add'>+		pr_warn("error setting up mite\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	comedi_set_hw_dev(dev, &amp;devpriv-&gt;mite-&gt;pcidev-&gt;dev);</div><div class='hunk'>@@ -1740,13 +1739,13 @@ static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 	dev-&gt;irq = mite_irq(devpriv-&gt;mite);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;irq == 0) {</div><div class='del'>-		printk(" unknown irq (bad)\n");</div><div class='add'>+		pr_warn("unknown irq (bad)\n");</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(" ( irq = %u )", dev-&gt;irq);</div><div class='add'>+		pr_debug("( irq = %u )\n", dev-&gt;irq);</div><div class='ctx'> 		ret = request_irq(dev-&gt;irq, ni_E_interrupt, NI_E_IRQ_FLAGS,</div><div class='ctx'> 				  DRV_NAME, dev);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			printk(" irq not available\n");</div><div class='add'>+			pr_warn("irq not available\n");</div><div class='ctx'> 			dev-&gt;irq = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1787,7 +1786,7 @@ static int pcimio_find_device(struct comedi_device *dev, int bus, int slot)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	printk("no device found\n");</div><div class='add'>+	pr_warn("no device found\n");</div><div class='ctx'> 	mite_list_devices();</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c<br/>index 0b9bee36eb5f..96cd7ec2ad53 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/pcl816.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/pcl816.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/pcl816.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/pcl816.c</a></div><div class='hunk'>@@ -155,8 +155,8 @@ static int pcl816_attach(struct comedi_device *dev,</div><div class='ctx'> static int pcl816_detach(struct comedi_device *dev);</div><div class='ctx'> </div><div class='ctx'> #ifdef unused</div><div class='del'>-static int RTC_lock = 0;	/* RTC lock */</div><div class='del'>-static int RTC_timer_lock = 0;	/* RTC int lock */</div><div class='add'>+static int RTC_lock;	/* RTC lock */</div><div class='add'>+static int RTC_timer_lock;	/* RTC int lock */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct comedi_driver driver_pcl816 = {</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c<br/>index b45a9bd8b489..7344a53a81c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/pcl818.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/pcl818.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/pcl818.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/pcl818.c</a></div><div class='hunk'>@@ -252,8 +252,8 @@ static int pcl818_attach(struct comedi_device *dev,</div><div class='ctx'> static int pcl818_detach(struct comedi_device *dev);</div><div class='ctx'> </div><div class='ctx'> #ifdef unused</div><div class='del'>-static int RTC_lock = 0;	/* RTC lock */</div><div class='del'>-static int RTC_timer_lock = 0;	/* RTC int lock */</div><div class='add'>+static int RTC_lock;	/* RTC lock */</div><div class='add'>+static int RTC_timer_lock;	/* RTC int lock */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct pcl818_board {</div><div class='hunk'>@@ -463,9 +463,8 @@ static int pcl818_ao_insn_read(struct comedi_device *dev,</div><div class='ctx'> 	int n;</div><div class='ctx'> 	int chan = CR_CHAN(insn-&gt;chanspec);</div><div class='ctx'> </div><div class='del'>-	for (n = 0; n &lt; insn-&gt;n; n++) {</div><div class='add'>+	for (n = 0; n &lt; insn-&gt;n; n++)</div><div class='ctx'> 		data[n] = devpriv-&gt;ao_readback[chan];</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='hunk'>@@ -571,9 +570,9 @@ conv_finish:</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> 	devpriv-&gt;act_chanlist_pos++;</div><div class='del'>-	if (devpriv-&gt;act_chanlist_pos &gt;= devpriv-&gt;act_chanlist_len) {</div><div class='add'>+	if (devpriv-&gt;act_chanlist_pos &gt;= devpriv-&gt;act_chanlist_len)</div><div class='ctx'> 		devpriv-&gt;act_chanlist_pos = 0;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	s-&gt;async-&gt;cur_chan++;</div><div class='ctx'> 	if (s-&gt;async-&gt;cur_chan &gt;= devpriv-&gt;ai_n_chan) {</div><div class='ctx'> 		/*  printk("E"); */</div><div class='hunk'>@@ -645,9 +644,9 @@ static irqreturn_t interrupt_pcl818_ai_mode13_dma(int irq, void *d)</div><div class='ctx'> 		comedi_buf_put(s-&gt;async, ptr[bufptr++] &gt;&gt; 4);	/*  get one sample */</div><div class='ctx'> </div><div class='ctx'> 		devpriv-&gt;act_chanlist_pos++;</div><div class='del'>-		if (devpriv-&gt;act_chanlist_pos &gt;= devpriv-&gt;act_chanlist_len) {</div><div class='add'>+		if (devpriv-&gt;act_chanlist_pos &gt;= devpriv-&gt;act_chanlist_len)</div><div class='ctx'> 			devpriv-&gt;act_chanlist_pos = 0;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		s-&gt;async-&gt;cur_chan++;</div><div class='ctx'> 		if (s-&gt;async-&gt;cur_chan &gt;= devpriv-&gt;ai_n_chan) {</div><div class='ctx'> 			s-&gt;async-&gt;cur_chan = 0;</div><div class='hunk'>@@ -805,11 +804,10 @@ static irqreturn_t interrupt_pcl818_ai_mode13_fifo(int irq, void *d)</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (lo &amp; 2) {</div><div class='add'>+	if (lo &amp; 2)</div><div class='ctx'> 		len = 512;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		len = 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; len; i++) {</div><div class='ctx'> 		lo = inb(dev-&gt;iobase + PCL818_FI_DATALO);</div><div class='hunk'>@@ -827,9 +825,9 @@ static irqreturn_t interrupt_pcl818_ai_mode13_fifo(int irq, void *d)</div><div class='ctx'> 		comedi_buf_put(s-&gt;async, (lo &gt;&gt; 4) | (inb(dev-&gt;iobase + PCL818_FI_DATAHI) &lt;&lt; 4));	/*  get one sample */</div><div class='ctx'> </div><div class='ctx'> 		devpriv-&gt;act_chanlist_pos++;</div><div class='del'>-		if (devpriv-&gt;act_chanlist_pos &gt;= devpriv-&gt;act_chanlist_len) {</div><div class='add'>+		if (devpriv-&gt;act_chanlist_pos &gt;= devpriv-&gt;act_chanlist_len)</div><div class='ctx'> 			devpriv-&gt;act_chanlist_pos = 0;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		s-&gt;async-&gt;cur_chan++;</div><div class='ctx'> 		if (s-&gt;async-&gt;cur_chan &gt;= devpriv-&gt;ai_n_chan) {</div><div class='ctx'> 			s-&gt;async-&gt;cur_chan = 0;</div><div class='hunk'>@@ -1009,7 +1007,7 @@ static int pcl818_ai_cmd_mode(int mode, struct comedi_device *dev,</div><div class='ctx'> 	int divisor1 = 0, divisor2 = 0;</div><div class='ctx'> 	unsigned int seglen;</div><div class='ctx'> </div><div class='del'>-	printk("pcl818_ai_cmd_mode()\n");</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "pcl818_ai_cmd_mode()\n");</div><div class='ctx'> 	if ((!dev-&gt;irq) &amp;&amp; (!devpriv-&gt;dma_rtc)) {</div><div class='ctx'> 		comedi_error(dev, "IRQ not defined!");</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1112,7 +1110,7 @@ static int pcl818_ai_cmd_mode(int mode, struct comedi_device *dev,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	printk("pcl818_ai_cmd_mode() end\n");</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "pcl818_ai_cmd_mode() end\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1309,11 +1307,9 @@ static void setup_channel_list(struct comedi_device *dev,</div><div class='ctx'> */</div><div class='ctx'> static int check_single_ended(unsigned int port)</div><div class='ctx'> {</div><div class='del'>-	if (inb(port + PCL818_STATUS) &amp; 0x20) {</div><div class='add'>+	if (inb(port + PCL818_STATUS) &amp; 0x20)</div><div class='ctx'> 		return 1;</div><div class='del'>-	} else {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1352,9 +1348,8 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,</div><div class='ctx'> 	if (!cmd-&gt;stop_src || tmp != cmd-&gt;stop_src)</div><div class='ctx'> 		err++;</div><div class='ctx'> </div><div class='del'>-	if (err) {</div><div class='add'>+	if (err)</div><div class='ctx'> 		return 1;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* step 2: make sure trigger sources are unique and mutually compatible */</div><div class='ctx'> </div><div class='hunk'>@@ -1377,9 +1372,8 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,</div><div class='ctx'> 	if (cmd-&gt;stop_src != TRIG_NONE &amp;&amp; cmd-&gt;stop_src != TRIG_COUNT)</div><div class='ctx'> 		err++;</div><div class='ctx'> </div><div class='del'>-	if (err) {</div><div class='add'>+	if (err)</div><div class='ctx'> 		return 2;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* step 3: make sure arguments are trivially compatible */</div><div class='ctx'> </div><div class='hunk'>@@ -1421,9 +1415,8 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (err) {</div><div class='add'>+	if (err)</div><div class='ctx'> 		return 3;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* step 4: fix up any arguments */</div><div class='ctx'> </div><div class='hunk'>@@ -1438,9 +1431,8 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,</div><div class='ctx'> 			err++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (err) {</div><div class='add'>+	if (err)</div><div class='ctx'> 		return 4;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* step 5: complain about special chanlist considerations */</div><div class='ctx'> </div><div class='hunk'>@@ -1461,7 +1453,7 @@ static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)</div><div class='ctx'> 	struct comedi_cmd *cmd = &amp;s-&gt;async-&gt;cmd;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	printk("pcl818_ai_cmd()\n");</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "pcl818_ai_cmd()\n");</div><div class='ctx'> 	devpriv-&gt;ai_n_chan = cmd-&gt;chanlist_len;</div><div class='ctx'> 	devpriv-&gt;ai_chanlist = cmd-&gt;chanlist;</div><div class='ctx'> 	devpriv-&gt;ai_flags = cmd-&gt;flags;</div><div class='hunk'>@@ -1470,17 +1462,16 @@ static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)</div><div class='ctx'> 	devpriv-&gt;ai_timer1 = 0;</div><div class='ctx'> 	devpriv-&gt;ai_timer2 = 0;</div><div class='ctx'> </div><div class='del'>-	if (cmd-&gt;stop_src == TRIG_COUNT) {</div><div class='add'>+	if (cmd-&gt;stop_src == TRIG_COUNT)</div><div class='ctx'> 		devpriv-&gt;ai_scans = cmd-&gt;stop_arg;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		devpriv-&gt;ai_scans = 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;scan_begin_src == TRIG_FOLLOW) {	/*  mode 1, 3 */</div><div class='ctx'> 		if (cmd-&gt;convert_src == TRIG_TIMER) {	/*  mode 1 */</div><div class='ctx'> 			devpriv-&gt;ai_timer1 = cmd-&gt;convert_arg;</div><div class='ctx'> 			retval = pcl818_ai_cmd_mode(1, dev, s);</div><div class='del'>-			printk("pcl818_ai_cmd() end\n");</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "pcl818_ai_cmd() end\n");</div><div class='ctx'> 			return retval;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (cmd-&gt;convert_src == TRIG_EXT) {	/*  mode 3 */</div><div class='hunk'>@@ -1499,7 +1490,7 @@ static int pcl818_ai_cancel(struct comedi_device *dev,</div><div class='ctx'> 			    struct comedi_subdevice *s)</div><div class='ctx'> {</div><div class='ctx'> 	if (devpriv-&gt;irq_blocked &gt; 0) {</div><div class='del'>-		printk("pcl818_ai_cancel()\n");</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "pcl818_ai_cancel()\n");</div><div class='ctx'> 		devpriv-&gt;irq_was_now_closed = 1;</div><div class='ctx'> </div><div class='ctx'> 		switch (devpriv-&gt;ai_mode) {</div><div class='hunk'>@@ -1549,7 +1540,7 @@ static int pcl818_ai_cancel(struct comedi_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> end:</div><div class='del'>-	printk("pcl818_ai_cancel() end\n");</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "pcl818_ai_cancel() end\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1633,11 +1624,11 @@ static int set_rtc_irq_bit(unsigned char bit)</div><div class='ctx'> 	save_flags(flags);</div><div class='ctx'> 	cli();</div><div class='ctx'> 	val = CMOS_READ(RTC_CONTROL);</div><div class='del'>-	if (bit) {</div><div class='add'>+	if (bit)</div><div class='ctx'> 		val |= RTC_PIE;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		val &amp;= ~RTC_PIE;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	CMOS_WRITE(val, RTC_CONTROL);</div><div class='ctx'> 	CMOS_READ(RTC_INTR_FLAGS);</div><div class='ctx'> 	restore_flags(flags);</div><div class='hunk'>@@ -1754,22 +1745,23 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> </div><div class='ctx'> 	/* claim our I/O space */</div><div class='ctx'> 	iobase = it-&gt;options[0];</div><div class='del'>-	printk("comedi%d: pcl818:  board=%s, ioport=0x%03lx",</div><div class='del'>-	       dev-&gt;minor, this_board-&gt;name, iobase);</div><div class='add'>+	printk</div><div class='add'>+	    ("comedi%d: pcl818:  board=%s, ioport=0x%03lx",</div><div class='add'>+	     dev-&gt;minor, this_board-&gt;name, iobase);</div><div class='ctx'> 	devpriv-&gt;io_range = this_board-&gt;io_range;</div><div class='ctx'> 	if ((this_board-&gt;fifo) &amp;&amp; (it-&gt;options[2] == -1)) {	/*  we've board with FIFO and we want to use FIFO */</div><div class='ctx'> 		devpriv-&gt;io_range = PCLx1xFIFO_RANGE;</div><div class='ctx'> 		devpriv-&gt;usefifo = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!request_region(iobase, devpriv-&gt;io_range, "pcl818")) {</div><div class='del'>-		printk("I/O port conflict\n");</div><div class='add'>+		comedi_error(dev, "I/O port conflict\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;iobase = iobase;</div><div class='ctx'> </div><div class='ctx'> 	if (pcl818_check(iobase)) {</div><div class='del'>-		printk(", I can't detect board. FAIL!\n");</div><div class='add'>+		comedi_error(dev, "I can't detect board. FAIL!\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1793,19 +1785,18 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 					     irq);</div><div class='ctx'> 					irq = 0;	/* Can't use IRQ */</div><div class='ctx'> 				} else {</div><div class='del'>-					printk(", irq=%u", irq);</div><div class='add'>+					printk(KERN_DEBUG "irq=%u", irq);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;irq = irq;</div><div class='del'>-	if (irq) {</div><div class='del'>-		devpriv-&gt;irq_free = 1;</div><div class='del'>-	} /* 1=we have allocated irq */</div><div class='del'>-	else {</div><div class='add'>+	if (irq)</div><div class='add'>+		devpriv-&gt;irq_free = 1;   /* 1=we have allocated irq */</div><div class='add'>+	else</div><div class='ctx'> 		devpriv-&gt;irq_free = 0;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	devpriv-&gt;irq_blocked = 0;	/* number of subdevice which use IRQ */</div><div class='ctx'> 	devpriv-&gt;ai_mode = 0;	/* mode of irq */</div><div class='ctx'> </div><div class='hunk'>@@ -1825,7 +1816,7 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 				 "pcl818 DMA (RTC)", dev)) {</div><div class='ctx'> 			devpriv-&gt;dma_rtc = 1;</div><div class='ctx'> 			devpriv-&gt;rtc_irq = RTC_IRQ;</div><div class='del'>-			printk(", dma_irq=%u", devpriv-&gt;rtc_irq);</div><div class='add'>+			printk(KERN_DEBUG "dma_irq=%u", devpriv-&gt;rtc_irq);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			RTC_lock--;</div><div class='ctx'> 			if (RTC_lock == 0) {</div><div class='hunk'>@@ -1850,34 +1841,26 @@ no_rtc:</div><div class='ctx'> 		if (dma &lt; 1)</div><div class='ctx'> 			goto no_dma;	/* DMA disabled */</div><div class='ctx'> 		if (((1 &lt;&lt; dma) &amp; this_board-&gt;DMAbits) == 0) {</div><div class='del'>-			printk(", DMA is out of allowed range, FAIL!\n");</div><div class='add'>+			printk(KERN_ERR "DMA is out of allowed range, FAIL!\n");</div><div class='ctx'> 			return -EINVAL;	/* Bad DMA */</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = request_dma(dma, "pcl818");</div><div class='del'>-		if (ret) {</div><div class='del'>-			printk(", unable to allocate DMA %u, FAIL!\n", dma);</div><div class='add'>+		if (ret)</div><div class='ctx'> 			return -EBUSY;	/* DMA isn't free */</div><div class='del'>-		}</div><div class='ctx'> 		devpriv-&gt;dma = dma;</div><div class='del'>-		printk(", dma=%u", dma);</div><div class='ctx'> 		pages = 2;	/* we need 16KB */</div><div class='ctx'> 		devpriv-&gt;dmabuf[0] = __get_dma_pages(GFP_KERNEL, pages);</div><div class='del'>-		if (!devpriv-&gt;dmabuf[0]) {</div><div class='del'>-			printk(", unable to allocate DMA buffer, FAIL!\n");</div><div class='add'>+		if (!devpriv-&gt;dmabuf[0])</div><div class='ctx'> 			/* maybe experiment with try_to_free_pages() will help .... */</div><div class='ctx'> 			return -EBUSY;	/* no buffer :-( */</div><div class='del'>-		}</div><div class='ctx'> 		devpriv-&gt;dmapages[0] = pages;</div><div class='ctx'> 		devpriv-&gt;hwdmaptr[0] = virt_to_bus((void *)devpriv-&gt;dmabuf[0]);</div><div class='ctx'> 		devpriv-&gt;hwdmasize[0] = (1 &lt;&lt; pages) * PAGE_SIZE;</div><div class='ctx'> 		/* printk("%d %d %ld, ",devpriv-&gt;dmapages[0],devpriv-&gt;hwdmasize[0],PAGE_SIZE); */</div><div class='ctx'> 		if (devpriv-&gt;dma_rtc == 0) {	/*  we must do duble buff :-( */</div><div class='ctx'> 			devpriv-&gt;dmabuf[1] = __get_dma_pages(GFP_KERNEL, pages);</div><div class='del'>-			if (!devpriv-&gt;dmabuf[1]) {</div><div class='del'>-				printk</div><div class='del'>-				    (", unable to allocate DMA buffer, FAIL!\n");</div><div class='add'>+			if (!devpriv-&gt;dmabuf[1])</div><div class='ctx'> 				return -EBUSY;</div><div class='del'>-			}</div><div class='ctx'> 			devpriv-&gt;dmapages[1] = pages;</div><div class='ctx'> 			devpriv-&gt;hwdmaptr[1] =</div><div class='ctx'> 			    virt_to_bus((void *)devpriv-&gt;dmabuf[1]);</div><div class='hunk'>@@ -2017,11 +2000,10 @@ no_dma:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* select 1/10MHz oscilator */</div><div class='del'>-	if ((it-&gt;options[3] == 0) || (it-&gt;options[3] == 10)) {</div><div class='add'>+	if ((it-&gt;options[3] == 0) || (it-&gt;options[3] == 10))</div><div class='ctx'> 		devpriv-&gt;i8253_osc_base = 100;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		devpriv-&gt;i8253_osc_base = 1000;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* max sampling speed */</div><div class='ctx'> 	devpriv-&gt;ns_min = this_board-&gt;ns_min;</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c<br/>index 3ad04aaa1e3c..eddac00e4e29 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/pcmmio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/pcmmio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/pcmmio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/pcmmio.c</a></div><div class='hunk'>@@ -371,15 +371,15 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 	iobase = it-&gt;options[0];</div><div class='ctx'> 	irq[0] = it-&gt;options[1];</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "comedi%d: %s: io: %lx ", dev-&gt;minor, driver.driver_name,</div><div class='del'>-	       iobase);</div><div class='add'>+	printk(KERN_INFO "comedi%d: %s: io: %lx attaching...\n", dev-&gt;minor,</div><div class='add'>+			driver.driver_name, iobase);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;iobase = iobase;</div><div class='ctx'> </div><div class='ctx'> 	if (!iobase || !request_region(iobase,</div><div class='ctx'> 				       thisboard-&gt;total_iosize,</div><div class='ctx'> 				       driver.driver_name)) {</div><div class='del'>-		printk(KERN_ERR "I/O port conflict\n");</div><div class='add'>+		printk(KERN_ERR "comedi%d: I/O port conflict\n", dev-&gt;minor);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -394,7 +394,8 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'>  * convenient macro defined in comedidev.h.</div><div class='ctx'>  */</div><div class='ctx'> 	if (alloc_private(dev, sizeof(struct pcmmio_private)) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "cannot allocate private data structure\n");</div><div class='add'>+		printk(KERN_ERR "comedi%d: cannot allocate private data structure\n",</div><div class='add'>+				dev-&gt;minor);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -417,7 +418,8 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 	    kcalloc(n_subdevs, sizeof(struct pcmmio_subdev_private),</div><div class='ctx'> 		    GFP_KERNEL);</div><div class='ctx'> 	if (!devpriv-&gt;sprivs) {</div><div class='del'>-		printk(KERN_ERR "cannot allocate subdevice private data structures\n");</div><div class='add'>+		printk(KERN_ERR "comedi%d: cannot allocate subdevice private data structures\n",</div><div class='add'>+				dev-&gt;minor);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -427,7 +429,8 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 	 * Allocate 1 AI + 1 AO + 2 DIO subdevs (24 lines per DIO)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (alloc_subdevices(dev, n_subdevs) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "cannot allocate subdevice data structures\n");</div><div class='add'>+		printk(KERN_ERR "comedi%d: cannot allocate subdevice data structures\n",</div><div class='add'>+				dev-&gt;minor);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -557,14 +560,15 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 				 */</div><div class='ctx'> </div><div class='ctx'> 	if (irq[0]) {</div><div class='del'>-		printk(KERN_DEBUG "irq: %u ", irq[0]);</div><div class='add'>+		printk(KERN_DEBUG "comedi%d: irq: %u\n", dev-&gt;minor, irq[0]);</div><div class='ctx'> 		if (thisboard-&gt;dio_num_asics == 2 &amp;&amp; irq[1])</div><div class='del'>-			printk(KERN_DEBUG "second ASIC irq: %u ", irq[1]);</div><div class='add'>+			printk(KERN_DEBUG "comedi%d: second ASIC irq: %u\n",</div><div class='add'>+					dev-&gt;minor, irq[1]);</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(KERN_INFO "(IRQ mode disabled) ");</div><div class='add'>+		printk(KERN_INFO "comedi%d: (IRQ mode disabled)\n", dev-&gt;minor);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "attached\n");</div><div class='add'>+	printk(KERN_INFO "comedi%d: attached\n", dev-&gt;minor);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -663,7 +667,7 @@ static int pcmmio_dio_insn_bits(struct comedi_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> #ifdef DAMMIT_ITS_BROKEN</div><div class='ctx'> 		/* DEBUG */</div><div class='del'>-		printk(KERN_DEBUG "data_out_byte %02x\n", (unsigned)byte);</div><div class='add'>+		printk("data_out_byte %02x\n", (unsigned)byte);</div><div class='ctx'> #endif</div><div class='ctx'> 		/* save the digital input lines for this byte.. */</div><div class='ctx'> 		s-&gt;state |= ((unsigned int)byte) &lt;&lt; offset;</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c<br/>index b2c2c8971a32..661ba2e03892 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/pcmuio.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/pcmuio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/pcmuio.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/pcmuio.c</a></div><div class='hunk'>@@ -295,15 +295,15 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 	irq[0] = it-&gt;options[1];</div><div class='ctx'> 	irq[1] = it-&gt;options[2];</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: %s: io: %lx ", dev-&gt;minor, driver.driver_name,</div><div class='del'>-	       iobase);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "comedi%d: %s: io: %lx attached\n", dev-&gt;minor,</div><div class='add'>+		driver.driver_name, iobase);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;iobase = iobase;</div><div class='ctx'> </div><div class='ctx'> 	if (!iobase || !request_region(iobase,</div><div class='ctx'> 				       thisboard-&gt;num_asics * ASIC_IOSIZE,</div><div class='ctx'> 				       driver.driver_name)) {</div><div class='del'>-		printk("I/O port conflict\n");</div><div class='add'>+		dev_err(dev-&gt;hw_dev, "I/O port conflict\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -318,7 +318,7 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'>  * convenient macro defined in comedidev.h.</div><div class='ctx'>  */</div><div class='ctx'> 	if (alloc_private(dev, sizeof(struct pcmuio_private)) &lt; 0) {</div><div class='del'>-		printk("cannot allocate private data structure\n");</div><div class='add'>+		dev_warn(dev-&gt;hw_dev, "cannot allocate private data structure\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -337,7 +337,7 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 	    kcalloc(n_subdevs, sizeof(struct pcmuio_subdev_private),</div><div class='ctx'> 		    GFP_KERNEL);</div><div class='ctx'> 	if (!devpriv-&gt;sprivs) {</div><div class='del'>-		printk("cannot allocate subdevice private data structures\n");</div><div class='add'>+		dev_warn(dev-&gt;hw_dev, "cannot allocate subdevice private data structures\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -348,7 +348,7 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 	 * 96-channel version of the board.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (alloc_subdevices(dev, n_subdevs) &lt; 0) {</div><div class='del'>-		printk("cannot allocate subdevice data structures\n");</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "cannot allocate subdevice data structures\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -436,14 +436,13 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)</div><div class='ctx'> 				   irqs.. */</div><div class='ctx'> </div><div class='ctx'> 	if (irq[0]) {</div><div class='del'>-		printk("irq: %u ", irq[0]);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "irq: %u\n", irq[0]);</div><div class='ctx'> 		if (irq[1] &amp;&amp; thisboard-&gt;num_asics == 2)</div><div class='del'>-			printk("second ASIC irq: %u ", irq[1]);</div><div class='add'>+			dev_dbg(dev-&gt;hw_dev, "second ASIC irq: %u\n", irq[1]);</div><div class='ctx'> 	} else {</div><div class='del'>-		printk("(IRQ mode disabled) ");</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "(IRQ mode disabled)\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("attached\n");</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -460,7 +459,8 @@ static int pcmuio_detach(struct comedi_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: %s: remove\n", dev-&gt;minor, driver.driver_name);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "comedi%d: %s: remove\n", dev-&gt;minor,</div><div class='add'>+		driver.driver_name);</div><div class='ctx'> 	if (dev-&gt;iobase)</div><div class='ctx'> 		release_region(dev-&gt;iobase, ASIC_IOSIZE * thisboard-&gt;num_asics);</div><div class='ctx'> </div><div class='hunk'>@@ -501,7 +501,8 @@ static int pcmuio_dio_insn_bits(struct comedi_device *dev,</div><div class='ctx'> </div><div class='ctx'> #ifdef DAMMIT_ITS_BROKEN</div><div class='ctx'> 	/* DEBUG */</div><div class='del'>-	printk("write mask: %08x  data: %08x\n", data[0], data[1]);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "write mask: %08x  data: %08x\n", data[0],</div><div class='add'>+		data[1]);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	s-&gt;state = 0;</div><div class='hunk'>@@ -537,7 +538,7 @@ static int pcmuio_dio_insn_bits(struct comedi_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> #ifdef DAMMIT_ITS_BROKEN</div><div class='ctx'> 		/* DEBUG */</div><div class='del'>-		printk("data_out_byte %02x\n", (unsigned)byte);</div><div class='add'>+		dev_dbg(dev-&gt;hw_dev, "data_out_byte %02x\n", (unsigned)byte);</div><div class='ctx'> #endif</div><div class='ctx'> 		/* save the digital input lines for this byte.. */</div><div class='ctx'> 		s-&gt;state |= ((unsigned int)byte) &lt;&lt; offset;</div><div class='hunk'>@@ -548,7 +549,8 @@ static int pcmuio_dio_insn_bits(struct comedi_device *dev,</div><div class='ctx'> </div><div class='ctx'> #ifdef DAMMIT_ITS_BROKEN</div><div class='ctx'> 	/* DEBUG */</div><div class='del'>-	printk("s-&gt;state %08x data_out %08x\n", s-&gt;state, data[1]);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "s-&gt;state %08x data_out %08x\n", s-&gt;state,</div><div class='add'>+		data[1]);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return 2;</div><div class='hunk'>@@ -951,14 +953,13 @@ pcmuio_inttrig_start_intr(struct comedi_device *dev, struct comedi_subdevice *s,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;subpriv-&gt;intr.spinlock, flags);</div><div class='ctx'> 	s-&gt;async-&gt;inttrig = 0;</div><div class='del'>-	if (subpriv-&gt;intr.active) {</div><div class='add'>+	if (subpriv-&gt;intr.active)</div><div class='ctx'> 		event = pcmuio_start_intr(dev, s);</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;subpriv-&gt;intr.spinlock, flags);</div><div class='ctx'> </div><div class='del'>-	if (event) {</div><div class='add'>+	if (event)</div><div class='ctx'> 		comedi_event(dev, s);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -1000,9 +1001,8 @@ static int pcmuio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;subpriv-&gt;intr.spinlock, flags);</div><div class='ctx'> </div><div class='del'>-	if (event) {</div><div class='add'>+	if (event)</div><div class='ctx'> 		comedi_event(dev, s);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c<br/>index ade2202b6231..d880c2f6fbc1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/serial2002.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/serial2002.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/serial2002.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/serial2002.c</a></div><div class='hunk'>@@ -824,7 +824,7 @@ static int serial2002_attach(struct comedi_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct comedi_subdevice *s;</div><div class='ctx'> </div><div class='del'>-	printk("comedi%d: serial2002: ", dev-&gt;minor);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "comedi%d: attached\n", dev-&gt;minor);</div><div class='ctx'> 	dev-&gt;board_name = thisboard-&gt;name;</div><div class='ctx'> 	if (alloc_private(dev, sizeof(struct serial2002_private)) &lt; 0)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -832,7 +832,8 @@ static int serial2002_attach(struct comedi_device *dev,</div><div class='ctx'> 	dev-&gt;close = serial_2002_close;</div><div class='ctx'> 	devpriv-&gt;port = it-&gt;options[0];</div><div class='ctx'> 	devpriv-&gt;speed = it-&gt;options[1];</div><div class='del'>-	printk("/dev/ttyS%d @ %d\n", devpriv-&gt;port, devpriv-&gt;speed);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "/dev/ttyS%d @ %d\n", devpriv-&gt;port,</div><div class='add'>+		devpriv-&gt;speed);</div><div class='ctx'> </div><div class='ctx'> 	if (alloc_subdevices(dev, 5) &lt; 0)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -891,7 +892,7 @@ static int serial2002_detach(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='del'>-	printk("comedi%d: serial2002: remove\n", dev-&gt;minor);</div><div class='add'>+	dev_dbg(dev-&gt;hw_dev, "comedi%d: remove\n", dev-&gt;minor);</div><div class='ctx'> 	for (i = 0; i &lt; 5; i++) {</div><div class='ctx'> 		s = &amp;dev-&gt;subdevices[i];</div><div class='ctx'> 		kfree(s-&gt;maxdata_list);</div><div class='head'>diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c<br/>index 6144afb8cbaa..ca6bcf8b0231 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/usbduxsigma.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/comedi/drivers/usbduxsigma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/comedi/drivers/usbduxsigma.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/comedi/drivers/usbduxsigma.c</a></div><div class='hunk'>@@ -1524,15 +1524,17 @@ static int usbdux_ao_inttrig(struct comedi_device *dev,</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	down(&amp;this_usbduxsub-&gt;sem);</div><div class='add'>+</div><div class='ctx'> 	if (!(this_usbduxsub-&gt;probed)) {</div><div class='del'>-		up(&amp;this_usbduxsub-&gt;sem);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (trignum != 0) {</div><div class='ctx'> 		dev_err(&amp;this_usbduxsub-&gt;interface-&gt;dev,</div><div class='ctx'> 			"comedi%d: usbdux_ao_inttrig: invalid trignum\n",</div><div class='ctx'> 			dev-&gt;minor);</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'> 	if (!(this_usbduxsub-&gt;ao_cmd_running)) {</div><div class='ctx'> 		this_usbduxsub-&gt;ao_cmd_running = 1;</div><div class='hunk'>@@ -1542,8 +1544,7 @@ static int usbdux_ao_inttrig(struct comedi_device *dev,</div><div class='ctx'> 				"comedi%d: usbdux_ao_inttrig: submitURB: "</div><div class='ctx'> 				"err=%d\n", dev-&gt;minor, ret);</div><div class='ctx'> 			this_usbduxsub-&gt;ao_cmd_running = 0;</div><div class='del'>-			up(&amp;this_usbduxsub-&gt;sem);</div><div class='del'>-			return ret;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		s-&gt;async-&gt;inttrig = NULL;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1551,8 +1552,10 @@ static int usbdux_ao_inttrig(struct comedi_device *dev,</div><div class='ctx'> 			"comedi%d: ao_inttrig but acqu is already running.\n",</div><div class='ctx'> 			dev-&gt;minor);</div><div class='ctx'> 	}</div><div class='add'>+	ret = 1;</div><div class='add'>+out:</div><div class='ctx'> 	up(&amp;this_usbduxsub-&gt;sem);</div><div class='del'>-	return 1;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int usbdux_ao_cmdtest(struct comedi_device *dev,</div><div class='hunk'>@@ -2689,6 +2692,7 @@ static int usbduxsigma_attach(struct comedi_device *dev,</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;udev-&gt;interface-&gt;dev,</div><div class='ctx'> 			"comedi%d: no space for subdev\n", dev-&gt;minor);</div><div class='add'>+		up(&amp;udev-&gt;sem);</div><div class='ctx'> 		up(&amp;start_stop_sem);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/staging/crystalhd/bc_dts_defs.h b/drivers/staging/crystalhd/bc_dts_defs.h<br/>index fde5b0627f6b..8cd51a7aad8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/crystalhd/bc_dts_defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/crystalhd/bc_dts_defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/crystalhd/bc_dts_defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/crystalhd/bc_dts_defs.h</a></div><div class='hunk'>@@ -296,43 +296,79 @@ enum {</div><div class='ctx'> 	vdecColourPrimariesSMPTE240M,</div><div class='ctx'> 	vdecColourPrimariesGenericFilm,</div><div class='ctx'> };</div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * @vdecRESOLUTION_CUSTOM: custom</div><div class='add'>+ * @vdecRESOLUTION_480i: 480i</div><div class='add'>+ * @vdecRESOLUTION_1080i: 1080i (1920x1080, 60i)</div><div class='add'>+ * @vdecRESOLUTION_NTSC: NTSC (720x483, 60i)</div><div class='add'>+ * @vdecRESOLUTION_480p: 480p (720x480, 60p)</div><div class='add'>+ * @vdecRESOLUTION_720p: 720p (1280x720, 60p)</div><div class='add'>+ * @vdecRESOLUTION_PAL1: PAL_1 (720x576, 50i)</div><div class='add'>+ * @vdecRESOLUTION_1080i25: 1080i25 (1920x1080, 50i)</div><div class='add'>+ * @vdecRESOLUTION_720p50: 720p50 (1280x720, 50p)</div><div class='add'>+ * @vdecRESOLUTION_576p: 576p (720x576, 50p)</div><div class='add'>+ * @vdecRESOLUTION_1080i29_97: 1080i (1920x1080, 59.94i)</div><div class='add'>+ * @vdecRESOLUTION_720p59_94: 720p (1280x720, 59.94p)</div><div class='add'>+ * @vdecRESOLUTION_SD_DVD: SD DVD (720x483, 60i)</div><div class='add'>+ * @vdecRESOLUTION_480p656: 480p (720x480, 60p),</div><div class='add'>+ *	output bus width 8 bit, clock 74.25MHz</div><div class='add'>+ * @vdecRESOLUTION_1080p23_976: 1080p23_976 (1920x1080, 23.976p)</div><div class='add'>+ * @vdecRESOLUTION_720p23_976: 720p23_976 (1280x720p, 23.976p)</div><div class='add'>+ * @vdecRESOLUTION_240p29_97: 240p (1440x240, 29.97p )</div><div class='add'>+ * @vdecRESOLUTION_240p30: 240p (1440x240, 30p)</div><div class='add'>+ * @vdecRESOLUTION_288p25: 288p (1440x288p, 25p)</div><div class='add'>+ * @vdecRESOLUTION_1080p29_97: 1080p29_97 (1920x1080, 29.97p)</div><div class='add'>+ * @vdecRESOLUTION_1080p30: 1080p30 (1920x1080, 30p)</div><div class='add'>+ * @vdecRESOLUTION_1080p24: 1080p24 (1920x1080, 24p)</div><div class='add'>+ * @vdecRESOLUTION_1080p25: 1080p25 (1920x1080, 25p)</div><div class='add'>+ * @vdecRESOLUTION_720p24: 720p24 (1280x720, 25p)</div><div class='add'>+ * @vdecRESOLUTION_720p29_97: 720p29.97 (1280x720, 29.97p)</div><div class='add'>+ * @vdecRESOLUTION_480p23_976: 480p23.976 (720*480, 23.976)</div><div class='add'>+ * @vdecRESOLUTION_480p29_97: 480p29.976 (720*480, 29.97p)</div><div class='add'>+ * @vdecRESOLUTION_576p25: 576p25 (720*576, 25p)</div><div class='add'>+ * @vdecRESOLUTION_480p0: 480p (720x480, 0p)</div><div class='add'>+ * @vdecRESOLUTION_480i0: 480i (720x480, 0i)</div><div class='add'>+ * @vdecRESOLUTION_576p0: 576p (720x576, 0p)</div><div class='add'>+ * @vdecRESOLUTION_720p0: 720p (1280x720, 0p)</div><div class='add'>+ * @vdecRESOLUTION_1080p0: 1080p (1920x1080, 0p)</div><div class='add'>+ * @vdecRESOLUTION_1080i0: 1080i (1920x1080, 0i)</div><div class='add'>+ */</div><div class='ctx'> enum {</div><div class='del'>-	vdecRESOLUTION_CUSTOM	= 0x00000000, /* custom */</div><div class='del'>-	vdecRESOLUTION_480i	= 0x00000001, /* 480i */</div><div class='del'>-	vdecRESOLUTION_1080i	= 0x00000002, /* 1080i (1920x1080, 60i) */</div><div class='del'>-	vdecRESOLUTION_NTSC	= 0x00000003, /* NTSC (720x483, 60i) */</div><div class='del'>-	vdecRESOLUTION_480p	= 0x00000004, /* 480p (720x480, 60p) */</div><div class='del'>-	vdecRESOLUTION_720p	= 0x00000005, /* 720p (1280x720, 60p) */</div><div class='del'>-	vdecRESOLUTION_PAL1	= 0x00000006, /* PAL_1 (720x576, 50i) */</div><div class='del'>-	vdecRESOLUTION_1080i25	= 0x00000007, /* 1080i25 (1920x1080, 50i) */</div><div class='del'>-	vdecRESOLUTION_720p50	= 0x00000008, /* 720p50 (1280x720, 50p) */</div><div class='del'>-	vdecRESOLUTION_576p	= 0x00000009, /* 576p (720x576, 50p) */</div><div class='del'>-	vdecRESOLUTION_1080i29_97 = 0x0000000A, /* 1080i (1920x1080, 59.94i) */</div><div class='del'>-	vdecRESOLUTION_720p59_94  = 0x0000000B, /* 720p (1280x720, 59.94p) */</div><div class='del'>-	vdecRESOLUTION_SD_DVD	= 0x0000000C, /* SD DVD (720x483, 60i) */</div><div class='del'>-	vdecRESOLUTION_480p656	= 0x0000000D, /* 480p (720x480, 60p), output bus width 8 bit, clock 74.25MHz */</div><div class='del'>-	vdecRESOLUTION_1080p23_976 = 0x0000000E, /* 1080p23_976 (1920x1080, 23.976p) */</div><div class='del'>-	vdecRESOLUTION_720p23_976  = 0x0000000F, /* 720p23_976 (1280x720p, 23.976p) */</div><div class='del'>-	vdecRESOLUTION_240p29_97   = 0x00000010, /* 240p (1440x240, 29.97p ) */</div><div class='del'>-	vdecRESOLUTION_240p30	= 0x00000011, /* 240p (1440x240, 30p) */</div><div class='del'>-	vdecRESOLUTION_288p25	= 0x00000012, /* 288p (1440x288p, 25p) */</div><div class='del'>-	vdecRESOLUTION_1080p29_97 = 0x00000013, /* 1080p29_97 (1920x1080, 29.97p) */</div><div class='del'>-	vdecRESOLUTION_1080p30	= 0x00000014, /* 1080p30 (1920x1080, 30p) */</div><div class='del'>-	vdecRESOLUTION_1080p24	= 0x00000015, /* 1080p24 (1920x1080, 24p) */</div><div class='del'>-	vdecRESOLUTION_1080p25	= 0x00000016, /* 1080p25 (1920x1080, 25p) */</div><div class='del'>-	vdecRESOLUTION_720p24	= 0x00000017, /* 720p24 (1280x720, 25p) */</div><div class='del'>-	vdecRESOLUTION_720p29_97  = 0x00000018, /* 720p29.97 (1280x720, 29.97p) */</div><div class='del'>-	vdecRESOLUTION_480p23_976 = 0x00000019, /* 480p23.976 (720*480, 23.976) */</div><div class='del'>-	vdecRESOLUTION_480p29_97  = 0x0000001A, /* 480p29.976 (720*480, 29.97p) */</div><div class='del'>-	vdecRESOLUTION_576p25	= 0x0000001B, /* 576p25 (720*576, 25p) */</div><div class='add'>+	vdecRESOLUTION_CUSTOM	= 0x00000000,</div><div class='add'>+	vdecRESOLUTION_480i	= 0x00000001,</div><div class='add'>+	vdecRESOLUTION_1080i	= 0x00000002,</div><div class='add'>+	vdecRESOLUTION_NTSC	= 0x00000003,</div><div class='add'>+	vdecRESOLUTION_480p	= 0x00000004,</div><div class='add'>+	vdecRESOLUTION_720p	= 0x00000005,</div><div class='add'>+	vdecRESOLUTION_PAL1	= 0x00000006,</div><div class='add'>+	vdecRESOLUTION_1080i25	= 0x00000007,</div><div class='add'>+	vdecRESOLUTION_720p50	= 0x00000008,</div><div class='add'>+	vdecRESOLUTION_576p	= 0x00000009,</div><div class='add'>+	vdecRESOLUTION_1080i29_97 = 0x0000000A,</div><div class='add'>+	vdecRESOLUTION_720p59_94  = 0x0000000B,</div><div class='add'>+	vdecRESOLUTION_SD_DVD	= 0x0000000C,</div><div class='add'>+	vdecRESOLUTION_480p656	= 0x0000000D,</div><div class='add'>+	vdecRESOLUTION_1080p23_976 = 0x0000000E,</div><div class='add'>+	vdecRESOLUTION_720p23_976  = 0x0000000F,</div><div class='add'>+	vdecRESOLUTION_240p29_97   = 0x00000010,</div><div class='add'>+	vdecRESOLUTION_240p30	= 0x00000011,</div><div class='add'>+	vdecRESOLUTION_288p25	= 0x00000012,</div><div class='add'>+	vdecRESOLUTION_1080p29_97 = 0x00000013,</div><div class='add'>+	vdecRESOLUTION_1080p30	= 0x00000014,</div><div class='add'>+	vdecRESOLUTION_1080p24	= 0x00000015,</div><div class='add'>+	vdecRESOLUTION_1080p25	= 0x00000016,</div><div class='add'>+	vdecRESOLUTION_720p24	= 0x00000017,</div><div class='add'>+	vdecRESOLUTION_720p29_97  = 0x00000018,</div><div class='add'>+	vdecRESOLUTION_480p23_976 = 0x00000019,</div><div class='add'>+	vdecRESOLUTION_480p29_97  = 0x0000001A,</div><div class='add'>+	vdecRESOLUTION_576p25	= 0x0000001B,</div><div class='ctx'> 	/* For Zero Frame Rate */</div><div class='del'>-	vdecRESOLUTION_480p0	= 0x0000001C, /* 480p (720x480, 0p) */</div><div class='del'>-	vdecRESOLUTION_480i0	= 0x0000001D, /* 480i (720x480, 0i) */</div><div class='del'>-	vdecRESOLUTION_576p0	= 0x0000001E, /* 576p (720x576, 0p) */</div><div class='del'>-	vdecRESOLUTION_720p0	= 0x0000001F, /* 720p (1280x720, 0p) */</div><div class='del'>-	vdecRESOLUTION_1080p0	= 0x00000020, /* 1080p (1920x1080, 0p) */</div><div class='del'>-	vdecRESOLUTION_1080i0	= 0x00000021, /* 1080i (1920x1080, 0i) */</div><div class='add'>+	vdecRESOLUTION_480p0	= 0x0000001C,</div><div class='add'>+	vdecRESOLUTION_480i0	= 0x0000001D,</div><div class='add'>+	vdecRESOLUTION_576p0	= 0x0000001E,</div><div class='add'>+	vdecRESOLUTION_720p0	= 0x0000001F,</div><div class='add'>+	vdecRESOLUTION_1080p0	= 0x00000020,</div><div class='add'>+	vdecRESOLUTION_1080i0	= 0x00000021,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Bit definitions for 'flags' field */</div><div class='hunk'>@@ -359,14 +395,23 @@ enum _BC_OUTPUT_FORMAT {</div><div class='ctx'> 	MODE422_YUY2			= 0x1,</div><div class='ctx'> 	MODE422_UYVY			= 0x2,</div><div class='ctx'> };</div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * struct BC_PIC_INFO_BLOCK</div><div class='add'>+ * @timeStam;: Timestamp</div><div class='add'>+ * @picture_number: Ordinal display number</div><div class='add'>+ * @width:  pixels</div><div class='add'>+ * @height:  pixels</div><div class='add'>+ * @chroma_format:  0x420, 0x422 or 0x444</div><div class='add'>+ * @n_drop;:  number of non-reference frames</div><div class='add'>+ *	remaining to be dropped</div><div class='add'>+ */</div><div class='ctx'> struct BC_PIC_INFO_BLOCK {</div><div class='ctx'> 	/* Common fields. */</div><div class='del'>-	uint64_t	timeStamp;	/* Timestamp */</div><div class='del'>-	uint32_t	picture_number;	/* Ordinal display number  */</div><div class='del'>-	uint32_t	width;		/* pixels	    */</div><div class='del'>-	uint32_t	height;		/* pixels	    */</div><div class='del'>-	uint32_t	chroma_format;	/* 0x420, 0x422 or 0x444 */</div><div class='add'>+	uint64_t	timeStamp;</div><div class='add'>+	uint32_t	picture_number;</div><div class='add'>+	uint32_t	width;</div><div class='add'>+	uint32_t	height;</div><div class='add'>+	uint32_t	chroma_format;</div><div class='ctx'> 	uint32_t	pulldown;</div><div class='ctx'> 	uint32_t	flags;</div><div class='ctx'> 	uint32_t	frame_rate;</div><div class='hunk'>@@ -376,7 +421,8 @@ struct BC_PIC_INFO_BLOCK {</div><div class='ctx'> 	uint32_t	sess_num;</div><div class='ctx'> 	uint32_t	ycom;</div><div class='ctx'> 	uint32_t	custom_aspect_ratio_width_height;</div><div class='del'>-	uint32_t	n_drop;	/* number of non-reference frames remaining to be dropped */</div><div class='add'>+	uint32_t	n_drop;	/* number of non-reference frames</div><div class='add'>+					remaining to be dropped */</div><div class='ctx'> </div><div class='ctx'> 	/* Protocol-specific extensions. */</div><div class='ctx'> 	union {</div><div class='hunk'>@@ -390,43 +436,71 @@ struct BC_PIC_INFO_BLOCK {</div><div class='ctx'> /*------------------------------------------------------*</div><div class='ctx'>  *    ProcOut Info					*</div><div class='ctx'>  *------------------------------------------------------*/</div><div class='del'>-/* Optional flags for ProcOut Interface.*/</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum POUT_OPTIONAL_IN_FLAGS - Optional flags for ProcOut Interface.</div><div class='add'>+ * @BC_POUT_FLAGS_YV12:  Copy Data in YV12 format</div><div class='add'>+ * @BC_POUT_FLAGS_STRIDE:  Stride size is valid.</div><div class='add'>+ * @BC_POUT_FLAGS_SIZE:  Take size information from Application</div><div class='add'>+ * @BC_POUT_FLAGS_INTERLACED:  copy only half the bytes</div><div class='add'>+ * @BC_POUT_FLAGS_INTERLEAVED:  interleaved frame</div><div class='add'>+ * @:  * @BC_POUT_FLAGS_FMT_CHANGE:  Data is not VALID when this flag is set</div><div class='add'>+ * @BC_POUT_FLAGS_PIB_VALID:  PIB Information valid</div><div class='add'>+ * @BC_POUT_FLAGS_ENCRYPTED:  Data is encrypted.</div><div class='add'>+ * @BC_POUT_FLAGS_FLD_BOT:  Bottom Field data</div><div class='add'>+ */</div><div class='ctx'> enum POUT_OPTIONAL_IN_FLAGS_ {</div><div class='ctx'> 	/* Flags from App to Device */</div><div class='del'>-	BC_POUT_FLAGS_YV12	  = 0x01,	/* Copy Data in YV12 format */</div><div class='del'>-	BC_POUT_FLAGS_STRIDE	  = 0x02,	/* Stride size is valid. */</div><div class='del'>-	BC_POUT_FLAGS_SIZE	  = 0x04,	/* Take size information from Application */</div><div class='del'>-	BC_POUT_FLAGS_INTERLACED  = 0x08,	/* copy only half the bytes */</div><div class='del'>-	BC_POUT_FLAGS_INTERLEAVED = 0x10,	/* interleaved frame */</div><div class='add'>+	BC_POUT_FLAGS_YV12	  = 0x01,</div><div class='add'>+	BC_POUT_FLAGS_STRIDE	  = 0x02,</div><div class='add'>+	BC_POUT_FLAGS_SIZE	  = 0x04,</div><div class='add'>+	BC_POUT_FLAGS_INTERLACED  = 0x08,</div><div class='add'>+	BC_POUT_FLAGS_INTERLEAVED = 0x10,</div><div class='ctx'> </div><div class='ctx'> 	/* Flags from Device to APP */</div><div class='del'>-	BC_POUT_FLAGS_FMT_CHANGE  = 0x10000,	/* Data is not VALID when this flag is set */</div><div class='del'>-	BC_POUT_FLAGS_PIB_VALID	  = 0x20000,	/* PIB Information valid */</div><div class='del'>-	BC_POUT_FLAGS_ENCRYPTED	  = 0x40000,	/* Data is encrypted. */</div><div class='del'>-	BC_POUT_FLAGS_FLD_BOT	  = 0x80000,	/* Bottom Field data */</div><div class='add'>+	BC_POUT_FLAGS_FMT_CHANGE  = 0x10000,</div><div class='add'>+	BC_POUT_FLAGS_PIB_VALID	  = 0x20000,</div><div class='add'>+	BC_POUT_FLAGS_ENCRYPTED	  = 0x40000,</div><div class='add'>+	BC_POUT_FLAGS_FLD_BOT	  = 0x80000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-typedef enum BC_STATUS(*dts_pout_callback)(void  *shnd, uint32_t width, uint32_t height, uint32_t stride, void *pOut);</div><div class='add'>+typedef enum BC_STATUS(*dts_pout_callback)(void  *shnd, uint32_t width,</div><div class='add'>+			uint32_t height, uint32_t stride, void *pOut);</div><div class='ctx'> </div><div class='ctx'> /* Line 21 Closed Caption */</div><div class='ctx'> /* User Data */</div><div class='ctx'> #define MAX_UD_SIZE		1792	/* 1920 - 128 */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct BC_DTS_PROC_OUT</div><div class='add'>+ * @Ybuff: Caller Supplied buffer for Y data</div><div class='add'>+ * @YbuffSz: Caller Supplied Y buffer size</div><div class='add'>+ * @YBuffDoneSz: Transferred Y datasize</div><div class='add'>+ * @*UVbuff: Caller Supplied buffer for UV data</div><div class='add'>+ * @UVbuffSz: Caller Supplied UV buffer size</div><div class='add'>+ * @UVBuffDoneSz: Transferred UV data size</div><div class='add'>+ * @StrideSz: Caller supplied Stride Size</div><div class='add'>+ * @PoutFlags: Call IN Flags</div><div class='add'>+ * @discCnt: Picture discontinuity count</div><div class='add'>+ * @PicInfo: Picture Information Block Data</div><div class='add'>+ * @b422Mode: Picture output Mode</div><div class='add'>+ * @bPibEnc: PIB encrypted</div><div class='add'>+ */</div><div class='ctx'> struct BC_DTS_PROC_OUT {</div><div class='del'>-	uint8_t		*Ybuff;			/* Caller Supplied buffer for Y data */</div><div class='del'>-	uint32_t	YbuffSz;		/* Caller Supplied Y buffer size */</div><div class='del'>-	uint32_t	YBuffDoneSz;		/* Transferred Y datasize */</div><div class='add'>+	uint8_t		*Ybuff;</div><div class='add'>+	uint32_t	YbuffSz;</div><div class='add'>+	uint32_t	YBuffDoneSz;</div><div class='ctx'> </div><div class='del'>-	uint8_t		*UVbuff;		/* Caller Supplied buffer for UV data */</div><div class='del'>-	uint32_t	UVbuffSz;		/* Caller Supplied UV buffer size */</div><div class='del'>-	uint32_t	UVBuffDoneSz;		/* Transferred UV data size */</div><div class='add'>+	uint8_t		*UVbuff;</div><div class='add'>+	uint32_t	UVbuffSz;</div><div class='add'>+	uint32_t	UVBuffDoneSz;</div><div class='ctx'> </div><div class='del'>-	uint32_t	StrideSz;		/* Caller supplied Stride Size */</div><div class='del'>-	uint32_t	PoutFlags;		/* Call IN Flags */</div><div class='add'>+	uint32_t	StrideSz;</div><div class='add'>+	uint32_t	PoutFlags;</div><div class='ctx'> </div><div class='del'>-	uint32_t	discCnt;		/* Picture discontinuity count */</div><div class='add'>+	uint32_t	discCnt;</div><div class='ctx'> </div><div class='del'>-	struct BC_PIC_INFO_BLOCK PicInfo;		/* Picture Information Block Data */</div><div class='add'>+	struct BC_PIC_INFO_BLOCK PicInfo;</div><div class='ctx'> </div><div class='ctx'> 	/* Line 21 Closed Caption */</div><div class='ctx'> 	/* User Data */</div><div class='hunk'>@@ -436,39 +510,47 @@ struct BC_DTS_PROC_OUT {</div><div class='ctx'> 	void		*hnd;</div><div class='ctx'> 	dts_pout_callback AppCallBack;</div><div class='ctx'> 	uint8_t		DropFrames;</div><div class='del'>-	uint8_t		b422Mode;		/* Picture output Mode */</div><div class='del'>-	uint8_t		bPibEnc;		/* PIB encrypted */</div><div class='add'>+	uint8_t		b422Mode;</div><div class='add'>+	uint8_t		bPibEnc;</div><div class='ctx'> 	uint8_t		bRevertScramble;</div><div class='ctx'> </div><div class='ctx'> };</div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * struct BC_DTS_STATUS</div><div class='add'>+ * @ReadyListCount: Number of frames in ready list (reported by driver)</div><div class='add'>+ * @PowerStateChange: Number of active state power</div><div class='add'>+ *	transitions (reported by driver)</div><div class='add'>+ * @FramesDropped:  Number of frames dropped.  (reported by DIL)</div><div class='add'>+ * @FramesCaptured: Number of frames captured. (reported by DIL)</div><div class='add'>+ * @FramesRepeated: Number of frames repeated. (reported by DIL)</div><div class='add'>+ * @InputCount:	Times compressed video has been sent to the HW.</div><div class='add'>+ *	i.e. Successful DtsProcInput() calls (reported by DIL)</div><div class='add'>+ * @InputTotalSize: Amount of compressed video that has been sent to the HW.</div><div class='add'>+ *	(reported by DIL)</div><div class='add'>+ * @InputBusyCount: Times compressed video has attempted to be sent to the HW</div><div class='add'>+ *	but the input FIFO was full. (reported by DIL)</div><div class='add'>+ * @PIBMissCount: Amount of times a PIB is invalid. (reported by DIL)</div><div class='add'>+ * @cpbEmptySize: supported only for H.264, specifically changed for</div><div class='add'>+ *	Adobe. Report size of CPB buffer available. (reported by DIL)</div><div class='add'>+ * @NextTimeStamp: TimeStamp of the next picture that will be returned</div><div class='add'>+ *	by a call to ProcOutput. Added for Adobe. Reported</div><div class='add'>+ *	back from the driver</div><div class='add'>+ */</div><div class='ctx'> struct BC_DTS_STATUS {</div><div class='del'>-	uint8_t		ReadyListCount;	/* Number of frames in ready list (reported by driver) */</div><div class='del'>-	uint8_t		FreeListCount;	/* Number of frame buffers free.  (reported by driver) */</div><div class='del'>-	uint8_t		PowerStateChange; /* Number of active state power transitions (reported by driver) */</div><div class='add'>+	uint8_t		ReadyListCount;</div><div class='add'>+	uint8_t		FreeListCount;</div><div class='add'>+	uint8_t		PowerStateChange;</div><div class='ctx'> 	uint8_t		reserved_[1];</div><div class='del'>-</div><div class='del'>-	uint32_t	FramesDropped;	/* Number of frames dropped.  (reported by DIL) */</div><div class='del'>-	uint32_t	FramesCaptured;	/* Number of frames captured. (reported by DIL) */</div><div class='del'>-	uint32_t	FramesRepeated;	/* Number of frames repeated. (reported by DIL) */</div><div class='del'>-</div><div class='del'>-	uint32_t	InputCount;	/* Times compressed video has been sent to the HW.</div><div class='del'>-					 * i.e. Successful DtsProcInput() calls (reported by DIL) */</div><div class='del'>-	uint64_t	InputTotalSize;	/* Amount of compressed video that has been sent to the HW.</div><div class='del'>-					 * (reported by DIL) */</div><div class='del'>-	uint32_t	InputBusyCount;	/* Times compressed video has attempted to be sent to the HW</div><div class='del'>-					 * but the input FIFO was full. (reported by DIL) */</div><div class='del'>-</div><div class='del'>-	uint32_t	PIBMissCount;	/* Amount of times a PIB is invalid. (reported by DIL) */</div><div class='del'>-</div><div class='del'>-	uint32_t	cpbEmptySize;	/* supported only for H.264, specifically changed for</div><div class='del'>-					 * Adobe. Report size of CPB buffer available.</div><div class='del'>-					 * Reported by DIL */</div><div class='del'>-	uint64_t	NextTimeStamp;	/* TimeStamp of the next picture that will be returned</div><div class='del'>-					 * by a call to ProcOutput. Added for Adobe. Reported</div><div class='del'>-					 * back from the driver */</div><div class='add'>+	uint32_t	FramesDropped;</div><div class='add'>+	uint32_t	FramesCaptured;</div><div class='add'>+	uint32_t	FramesRepeated;</div><div class='add'>+	uint32_t	InputCount;</div><div class='add'>+	uint64_t	InputTotalSize;</div><div class='add'>+	uint32_t	InputBusyCount;</div><div class='add'>+	uint32_t	PIBMissCount;</div><div class='add'>+	uint32_t	cpbEmptySize;</div><div class='add'>+	uint64_t	NextTimeStamp;</div><div class='ctx'> 	uint8_t		reserved__[16];</div><div class='del'>-</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BC_SWAP32(_v)			\</div><div class='head'>diff --git a/drivers/staging/cxt1e1/comet.h b/drivers/staging/cxt1e1/comet.h<br/>index 5cb3afda0112..e06da4a6f6f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/comet.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/comet.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/comet.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/cxt1e1/comet.h</a></div><div class='hunk'>@@ -1,7 +1,3 @@</div><div class='del'>-/*</div><div class='del'>- * $Id: comet.h,v 1.3 2005/09/28 00:10:07 rickd PMCC4_3_1B $</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #ifndef _INC_COMET_H_</div><div class='ctx'> #define _INC_COMET_H_</div><div class='ctx'> </div><div class='hunk'>@@ -23,27 +19,9 @@</div><div class='ctx'>  * For further information, contact via email: support@sbei.com</div><div class='ctx'>  * SBE, Inc.  San Ramon, California  U.S.A.</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='del'>- * RCS info:</div><div class='del'>- * RCS revision: $Revision: 1.3 $</div><div class='del'>- * Last changed on $Date: 2005/09/28 00:10:07 $</div><div class='del'>- * Changed by $Author: rickd $</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='del'>- * $Log: comet.h,v $</div><div class='del'>- * Revision 1.3  2005/09/28 00:10:07  rickd</div><div class='del'>- * Add RCS header. Switch to structure usage.</div><div class='del'>- *</div><div class='del'>- * Revision 1.2  2005/04/28 23:43:03  rickd</div><div class='del'>- * Add RCS tracking heading.</div><div class='del'>- *</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#if defined(__FreeBSD__) || defined (__NetBSD__)</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#else</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> #define VINT32  volatile u_int32_t</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/cxt1e1/comet_tables.c b/drivers/staging/cxt1e1/comet_tables.c<br/>index db1293c71a6d..84931117da35 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/comet_tables.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/comet_tables.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/comet_tables.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/cxt1e1/comet_tables.c</a></div><div class='hunk'>@@ -1,7 +1,3 @@</div><div class='del'>-/*</div><div class='del'>- * $Id: comet_tables.c,v 1.2 2005/10/17 23:55:27 rickd PMCC4_3_1B $</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> /*-----------------------------------------------------------------------------</div><div class='ctx'>  * comet_tables.c - waveform tables for the PM4351 'COMET'</div><div class='ctx'>  *</div><div class='hunk'>@@ -20,28 +16,8 @@</div><div class='ctx'>  * For further information, contact via email: support@sbei.com</div><div class='ctx'>  * SBE, Inc.  San Ramon, California  U.S.A.</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='del'>- * RCS info:</div><div class='del'>- * RCS revision: $Revision: 1.2 $</div><div class='del'>- * Last changed on $Date: 2005/10/17 23:55:27 $</div><div class='del'>- * Changed by $Author: rickd $</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='del'>- * $Log: comet_tables.c,v $</div><div class='del'>- * Revision 1.2  2005/10/17 23:55:27  rickd</div><div class='del'>- * Note that 75 Ohm transmit waveform is not supported on PMCC4.</div><div class='del'>- *</div><div class='del'>- * Revision 1.1  2005/09/28 00:10:05  rickd</div><div class='del'>- * Cosmetic alignment of tables for readability.</div><div class='del'>- *</div><div class='del'>- * Revision 1.0  2005/05/10 22:47:53  rickd</div><div class='del'>- * Initial revision</div><div class='del'>- *</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-char SBEid_pmcc4_comet_tblc[] =</div><div class='del'>-  "@(#)comet_tables.c - $Revision: 1.2 $      (c) Copyright 2004-2005 SBE, Inc.";</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='head'>diff --git a/drivers/staging/cxt1e1/comet_tables.h b/drivers/staging/cxt1e1/comet_tables.h<br/>index 80424a26a169..3e2e5badf787 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/comet_tables.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/comet_tables.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/comet_tables.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/cxt1e1/comet_tables.h</a></div><div class='hunk'>@@ -1,7 +1,3 @@</div><div class='del'>-/*</div><div class='del'>- * $Id: comet_tables.h,v 1.5 2006/01/02 22:37:31 rickd PMCC4_3_1B $</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #ifndef _INC_COMET_TBLS_H_</div><div class='ctx'> #define _INC_COMET_TBLS_H_</div><div class='ctx'> </div><div class='hunk'>@@ -23,26 +19,6 @@</div><div class='ctx'>  * For further information, contact via email: support@sbei.com</div><div class='ctx'>  * SBE, Inc.  San Ramon, California  U.S.A.</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='del'>- * RCS info:</div><div class='del'>- * RCS revision: $Revision: 1.5 $</div><div class='del'>- * Last changed on $Date: 2006/01/02 22:37:31 $</div><div class='del'>- * Changed by $Author: rickd $</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='del'>- * $Log: comet_tables.h,v $</div><div class='del'>- * Revision 1.5  2006/01/02 22:37:31  rickd</div><div class='del'>- * Double indexed arrays need sizings to avoid CC errors under</div><div class='del'>- * gcc 4.0.0</div><div class='del'>- *</div><div class='del'>- * Revision 1.4  2005/10/17 23:55:28  rickd</div><div class='del'>- * The 75 Ohm transmit waveform is not supported on PMCC4.</div><div class='del'>- *</div><div class='del'>- * Revision 1.3  2005/09/28 00:10:08  rickd</div><div class='del'>- * Add GNU License info. Structures moved to -C- file.</div><div class='del'>- *</div><div class='del'>- * Revision 1.2  2005/04/28 23:43:04  rickd</div><div class='del'>- * Add RCS tracking heading.</div><div class='del'>- *</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/cxt1e1/libsbew.h b/drivers/staging/cxt1e1/libsbew.h<br/>index 5c99646cd103..4254c0426db9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/libsbew.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/libsbew.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/libsbew.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/cxt1e1/libsbew.h</a></div><div class='hunk'>@@ -1,7 +1,3 @@</div><div class='del'>-/*</div><div class='del'>- * $Id: libsbew.h,v 2.1 2005/10/27 18:54:19 rickd PMCC4_3_1B $</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #ifndef _INC_LIBSBEW_H_</div><div class='ctx'> #define _INC_LIBSBEW_H_</div><div class='ctx'> </div><div class='hunk'>@@ -25,32 +21,8 @@</div><div class='ctx'>  * For further information, contact via email: support@sbei.com</div><div class='ctx'>  * SBE, Inc.  San Ramon, California  U.S.A.</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='del'>- * RCS info:</div><div class='del'>- * RCS revision: $Revision: 2.1 $</div><div class='del'>- * Last changed on $Date: 2005/10/27 18:54:19 $</div><div class='del'>- * Changed by $Author: rickd $</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='del'>- * $Log: libsbew.h,v $</div><div class='del'>- * Revision 2.1  2005/10/27 18:54:19  rickd</div><div class='del'>- * Add E1PLAIN support.</div><div class='del'>- *</div><div class='del'>- * Revision 2.0  2005/09/28 00:10:08  rickd</div><div class='del'>- * Customized for PMCC4 comet-per-port design.</div><div class='del'>- *</div><div class='del'>- * Revision 1.15  2005/03/29 00:51:31  rickd</div><div class='del'>- * File imported from C1T3 port, Revision 1.15</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifndef __KERNEL__</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern      "C"</div><div class='del'>-{</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /********************************/</div><div class='ctx'> /**  set driver logging level  **/</div><div class='ctx'> /********************************/</div><div class='hunk'>@@ -323,7 +295,7 @@ struct sbecom_port_param</div><div class='ctx'> #define CFG_CH_DINV_TX      0x02</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* Posssible resettable chipsets/functions */</div><div class='add'>+/* Possible resettable chipsets/functions */</div><div class='ctx'> #define RESET_DEV_TEMUX     1</div><div class='ctx'> #define RESET_DEV_TECT3     RESET_DEV_TEMUX</div><div class='ctx'> #define RESET_DEV_PLL       2</div><div class='hunk'>@@ -574,8 +546,4 @@ struct sbecom_port_param</div><div class='ctx'>     extern int  wancfg_set_tsioc (wcfg_t *, struct wanc1t3_ts_param *);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #endif                          /*** _INC_LIBSBEW_H_ ***/</div><div class='head'>diff --git a/drivers/staging/cxt1e1/musycc.c b/drivers/staging/cxt1e1/musycc.c<br/>index 5cc3423a6646..90c0f1e30f65 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/musycc.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/musycc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/musycc.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/cxt1e1/musycc.c</a></div><div class='hunk'>@@ -1,7 +1,3 @@</div><div class='del'>-/*</div><div class='del'>- * $Id: musycc.c,v 2.1 2007/08/15 23:32:17 rickd PMCC4_3_1B $</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> unsigned int max_intcnt = 0;</div><div class='ctx'> unsigned int max_bh = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -24,53 +20,8 @@ unsigned int max_bh = 0;</div><div class='ctx'>  * For further information, contact via email: support@onestopsystems.com</div><div class='ctx'>  * One Stop Systems, Inc.  Escondido, California  U.S.A.</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='del'>- * RCS info:</div><div class='del'>- * RCS revision: $Revision: 2.1 $</div><div class='del'>- * Last changed on $Date: 2007/08/15 23:32:17 $</div><div class='del'>- * Changed by $Author: rickd $</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='del'>- * $Log: musycc.c,v $</div><div class='del'>- * Revision 2.1  2007/08/15 23:32:17  rickd</div><div class='del'>- * Use 'if 0' instead of GNU comment delimeter to avoid line wrap induced compiler errors.</div><div class='del'>- *</div><div class='del'>- * Revision 2.0  2007/08/15 22:13:20  rickd</div><div class='del'>- * Update to printf pointer %p usage and correct some UINT to ULONG for</div><div class='del'>- * 64bit comptibility.</div><div class='del'>- *</div><div class='del'>- * Revision 1.7  2006/04/21 00:56:40  rickd</div><div class='del'>- * workqueue files now prefixed with &lt;sbecom&gt; prefix.</div><div class='del'>- *</div><div class='del'>- * Revision 1.6  2005/10/27 18:54:19  rickd</div><div class='del'>- * Clean out old code.  Default to HDLC_FCS16, not TRANS.</div><div class='del'>- *</div><div class='del'>- * Revision 1.5  2005/10/17 23:55:28  rickd</div><div class='del'>- * Initial port of NCOMM support patches from original work found</div><div class='del'>- * in pmc_c4t1e1 as updated by NCOMM.  Ref: CONFIG_SBE_PMCC4_NCOMM.</div><div class='del'>- *</div><div class='del'>- * Revision 1.4  2005/10/13 20:35:25  rickd</div><div class='del'>- * Cleanup warning for unused &lt;flags&gt; variable.</div><div class='del'>- *</div><div class='del'>- * Revision 1.3  2005/10/13 19:19:22  rickd</div><div class='del'>- * Disable redundant driver removal cleanup code.</div><div class='del'>- *</div><div class='del'>- * Revision 1.2  2005/10/11 18:36:16  rickd</div><div class='del'>- * Clean up warning messages caused by de-implemented some &lt;flags&gt; associated</div><div class='del'>- * with spin_lock() removals.</div><div class='del'>- *</div><div class='del'>- * Revision 1.1  2005/10/05 00:45:28  rickd</div><div class='del'>- * Re-enable xmit on flow-controlled and full channel to fix restart hang.</div><div class='del'>- * Add some temp spin-lock debug code (rld_spin_owner).</div><div class='del'>- *</div><div class='del'>- * Revision 1.0  2005/09/28 00:10:06  rickd</div><div class='del'>- * Initial release for C4T1E1 support. Lots of transparent</div><div class='del'>- * mode updates.</div><div class='del'>- *</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-char        SBEid_pmcc4_musyccc[] =</div><div class='del'>-"@(#)musycc.c - $Revision: 2.1 $      (c) Copyright 2004-2006 SBE, Inc.";</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/types.h&gt;</div><div class='head'>diff --git a/drivers/staging/cxt1e1/musycc.h b/drivers/staging/cxt1e1/musycc.h<br/>index 68f3660f4477..cf6b54e15689 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/musycc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/musycc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/musycc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/cxt1e1/musycc.h</a></div><div class='hunk'>@@ -1,7 +1,3 @@</div><div class='del'>-/*</div><div class='del'>- * $Id: musycc.h,v 1.3 2005/09/28 00:10:08 rickd PMCC4_3_1B $</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #ifndef _INC_MUSYCC_H_</div><div class='ctx'> #define _INC_MUSYCC_H_</div><div class='ctx'> </div><div class='hunk'>@@ -24,36 +20,13 @@</div><div class='ctx'>  * For further information, contact via email: support@sbei.com</div><div class='ctx'>  * SBE, Inc.  San Ramon, California  U.S.A.</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='del'>- * RCS info:</div><div class='del'>- * RCS revision: $Revision: 1.3 $</div><div class='del'>- * Last changed on $Date: 2005/09/28 00:10:08 $</div><div class='del'>- * Changed by $Author: rickd $</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='del'>- * $Log: musycc.h,v $</div><div class='del'>- * Revision 1.3  2005/09/28 00:10:08  rickd</div><div class='del'>- * Add GNU license info. Add PMCC4 PCI/DevIDs.  Implement new</div><div class='del'>- * musycc reg&amp;bits namings. Use PORTMAP_0 GCD grouping.</div><div class='del'>- *</div><div class='del'>- * Revision 1.2  2005/04/28 23:43:04  rickd</div><div class='del'>- * Add RCS tracking heading.</div><div class='del'>- *</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#if defined (__FreeBSD__) || defined (__NetBSD__)</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#else</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #define VINT8   volatile u_int8_t</div><div class='ctx'> #define VINT32  volatile u_int32_t</div><div class='ctx'> </div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern      "C"</div><div class='del'>-{</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #include "pmcc4_defs.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -448,10 +421,6 @@ extern      "C"</div><div class='ctx'> /*  This must be defined on an entire channel group (Port) basis */</div><div class='ctx'> #define SUERM_THRESHOLD     0x1f</div><div class='ctx'> </div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #undef VINT32</div><div class='ctx'> #undef VINT8</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/cxt1e1/ossiRelease.c b/drivers/staging/cxt1e1/ossiRelease.c<br/>index a56029866c2d..f17a902e95e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/ossiRelease.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/ossiRelease.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/ossiRelease.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/cxt1e1/ossiRelease.c</a></div><div class='hunk'>@@ -1,7 +1,3 @@</div><div class='del'>-/*</div><div class='del'>- * $Id: ossiRelease.c,v 1.2 2008/05/08 20:14:03 rdobbs PMCC4_3_1B $</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> /*-----------------------------------------------------------------------------</div><div class='ctx'>  * ossiRelease.c -</div><div class='ctx'>  *</div><div class='hunk'>@@ -26,14 +22,8 @@</div><div class='ctx'>  * One Stop Systems, Inc.  Escondido, California  U.S.A.</div><div class='ctx'>  *</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='del'>- * RCS info:</div><div class='del'>- * RCS revision: $Revision: 1.2 $</div><div class='del'>- * Last changed on $Date: 2008/05/08 20:14:03 $</div><div class='del'>- * Changed by $Author: rdobbs $</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> char pmcc4_OSSI_release[] = "$Release: PMCC4_3_1B,  Copyright (c) 2008 One Stop Systems$";</div><div class='ctx'> </div><div class='ctx'> /***  End-of-File  ***/</div><div class='head'>diff --git a/drivers/staging/cxt1e1/pmc93x6_eeprom.h b/drivers/staging/cxt1e1/pmc93x6_eeprom.h<br/>index c3ada87efd26..96c48cb83260 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/pmc93x6_eeprom.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/pmc93x6_eeprom.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/pmc93x6_eeprom.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/cxt1e1/pmc93x6_eeprom.h</a></div><div class='hunk'>@@ -1,7 +1,3 @@</div><div class='del'>-/*</div><div class='del'>- * $Id: pmc93x6_eeprom.h,v 1.1 2005/09/28 00:10:08 rickd PMCC4_3_1B $</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #ifndef _INC_PMC93X6_EEPROM_H_</div><div class='ctx'> #define _INC_PMC93X6_EEPROM_H_</div><div class='ctx'> </div><div class='hunk'>@@ -23,26 +19,9 @@</div><div class='ctx'>  * For further information, contact via email: support@sbei.com</div><div class='ctx'>  * SBE, Inc.  San Ramon, California  U.S.A.</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='del'>- * RCS info:</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='del'>- * $Log: pmc93x6_eeprom.h,v $</div><div class='del'>- * Revision 1.1  2005/09/28 00:10:08  rickd</div><div class='del'>- * pmc_verify_cksum return value is char.</div><div class='del'>- *</div><div class='del'>- * Revision 1.0  2005/05/04 17:20:51  rickd</div><div class='del'>- * Initial revision</div><div class='del'>- *</div><div class='del'>- * Revision 1.0  2005/04/22 23:48:48  rickd</div><div class='del'>- * Initial revision</div><div class='del'>- *</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#if defined (__FreeBSD__) || defined (__NetBSD__)</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#else</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/cxt1e1/pmcc4.h b/drivers/staging/cxt1e1/pmcc4.h<br/>index e046b87763a2..b0ed4ad13011 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/pmcc4.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/pmcc4.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/pmcc4.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/cxt1e1/pmcc4.h</a></div><div class='hunk'>@@ -1,7 +1,3 @@</div><div class='del'>-/*</div><div class='del'>- * $Id: pmcc4.h,v 1.4 2005/11/01 19:24:48 rickd PMCC4_3_1B $</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #ifndef _INC_PMCC4_H_</div><div class='ctx'> #define _INC_PMCC4_H_</div><div class='ctx'> </div><div class='hunk'>@@ -23,49 +19,15 @@</div><div class='ctx'>  * For further information, contact via email: support@sbei.com</div><div class='ctx'>  * SBE, Inc.  San Ramon, California  U.S.A.</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='del'>- * RCS info:</div><div class='del'>- * RCS revision: $Revision: 1.4 $</div><div class='del'>- * Last changed on $Date: 2005/11/01 19:24:48 $</div><div class='del'>- * Changed by $Author: rickd $</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='del'>- * $Log: pmcc4.h,v $</div><div class='del'>- * Revision 1.4  2005/11/01 19:24:48  rickd</div><div class='del'>- * Remove de-implement function prototypes.  Several &lt;int&gt; to</div><div class='del'>- * &lt;status_t&gt; changes for consistent usage of same.</div><div class='del'>- *</div><div class='del'>- * Revision 1.3  2005/09/28 00:10:08  rickd</div><div class='del'>- * Add GNU license info. Use config params from libsbew.h</div><div class='del'>- *</div><div class='del'>- * Revision 1.2  2005/04/28 23:43:03  rickd</div><div class='del'>- * Add RCS tracking heading.</div><div class='del'>- *</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#if defined(__FreeBSD__) || defined(__NetBSD__)</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#else</div><div class='del'>-#ifndef __KERNEL__</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#else</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> typedef int status_t;</div><div class='ctx'> </div><div class='ctx'> #define SBE_DRVR_FAIL     0</div><div class='ctx'> #define SBE_DRVR_SUCCESS  1</div><div class='ctx'> </div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern      "C"</div><div class='del'>-{</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /********************/</div><div class='ctx'> /* PMCC4 memory Map */</div><div class='ctx'> /********************/</div><div class='hunk'>@@ -105,10 +67,6 @@ extern      "C"</div><div class='ctx'> #define sbeE1errSMF    0x02</div><div class='ctx'> #define sbeE1CRC       0x01</div><div class='ctx'> </div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/staging/cxt1e1/pmcc4_cpld.h b/drivers/staging/cxt1e1/pmcc4_cpld.h<br/>index 6d8f0337aa3e..a51209bc5274 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/pmcc4_cpld.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/pmcc4_cpld.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/pmcc4_cpld.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/cxt1e1/pmcc4_cpld.h</a></div><div class='hunk'>@@ -1,7 +1,3 @@</div><div class='del'>-/*</div><div class='del'>- * $Id: pmcc4_cpld.h,v 1.0 2005/09/28 00:10:08 rickd PMCC4_3_1B $</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #ifndef _INC_PMCC4_CPLD_H_</div><div class='ctx'> #define _INC_PMCC4_CPLD_H_</div><div class='ctx'> </div><div class='hunk'>@@ -23,34 +19,9 @@</div><div class='ctx'>  * For further information, contact via email: support@sbei.com</div><div class='ctx'>  * SBE, Inc.  San Ramon, California  U.S.A.</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='del'>- * RCS info:</div><div class='del'>- * RCS revision: $Revision: 1.0 $</div><div class='del'>- * Last changed on $Date: 2005/09/28 00:10:08 $</div><div class='del'>- * Changed by $Author: rickd $</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='del'>- * $Log: pmcc4_cpld.h,v $</div><div class='del'>- * Revision 1.0  2005/09/28 00:10:08  rickd</div><div class='del'>- * Initial revision</div><div class='del'>- *</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#if defined(__FreeBSD__) || defined(__NetBSD__)</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#else</div><div class='del'>-#ifndef __KERNEL__</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#else</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern      "C"</div><div class='del'>-{</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /********************************/</div><div class='ctx'> /* iSPLD control chip registers */</div><div class='hunk'>@@ -117,8 +88,4 @@ extern      "C"</div><div class='ctx'> #define PMCC4_CPLD_INTR_CMT_3   0x04</div><div class='ctx'> #define PMCC4_CPLD_INTR_CMT_4   0x08</div><div class='ctx'> </div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #endif                          /* _INC_PMCC4_CPLD_H_ */</div><div class='head'>diff --git a/drivers/staging/cxt1e1/pmcc4_defs.h b/drivers/staging/cxt1e1/pmcc4_defs.h<br/>index a39505f45c29..83ceae4324b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/pmcc4_defs.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/pmcc4_defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/pmcc4_defs.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/cxt1e1/pmcc4_defs.h</a></div><div class='hunk'>@@ -1,7 +1,3 @@</div><div class='del'>-/*</div><div class='del'>- * $Id: pmcc4_defs.h,v 1.0 2005/09/28 00:10:09 rickd PMCC4_3_1B $</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #ifndef _INC_PMCC4_DEFS_H_</div><div class='ctx'> #define _INC_PMCC4_DEFS_H_</div><div class='ctx'> </div><div class='hunk'>@@ -25,16 +21,6 @@</div><div class='ctx'>  * For further information, contact via email: support@sbei.com</div><div class='ctx'>  * SBE, Inc.  San Ramon, California  U.S.A.</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='del'>- * RCS info:</div><div class='del'>- * RCS revision: $Revision: 1.0 $</div><div class='del'>- * Last changed on $Date: 2005/09/28 00:10:09 $</div><div class='del'>- * Changed by $Author: rickd $</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='del'>- * $Log: pmcc4_defs.h,v $</div><div class='del'>- * Revision 1.0  2005/09/28 00:10:09  rickd</div><div class='del'>- * Initial revision</div><div class='del'>- *</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/cxt1e1/pmcc4_drv.c b/drivers/staging/cxt1e1/pmcc4_drv.c<br/>index e1f07fabd22d..8a7b3a646451 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/pmcc4_drv.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/pmcc4_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/pmcc4_drv.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/cxt1e1/pmcc4_drv.c</a></div><div class='hunk'>@@ -1,8 +1,3 @@</div><div class='del'>-/*</div><div class='del'>- * $Id: pmcc4_drv.c,v 3.1 2007/08/15 23:32:17 rickd PMCC4_3_1B $</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*-----------------------------------------------------------------------------</div><div class='ctx'>  * pmcc4_drv.c -</div><div class='ctx'>  *</div><div class='hunk'>@@ -22,74 +17,10 @@</div><div class='ctx'>  * For further information, contact via email: support@onestopsystems.com</div><div class='ctx'>  * One Stop Systems, Inc.  Escondido, California  U.S.A.</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='del'>- * RCS info:</div><div class='del'>- * RCS revision: $Revision: 3.1 $</div><div class='del'>- * Last changed on $Date: 2007/08/15 23:32:17 $</div><div class='del'>- * Changed by $Author: rickd $</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='del'>- * $Log: pmcc4_drv.c,v $</div><div class='del'>- * Revision 3.1  2007/08/15 23:32:17  rickd</div><div class='del'>- * Use 'if 0' instead of GNU comment delimeter to avoid line wrap induced compiler errors.</div><div class='del'>- *</div><div class='del'>- * Revision 3.0  2007/08/15 22:19:55  rickd</div><div class='del'>- * Correct sizeof() castings and pi-&gt;regram to support 64bit compatibility.</div><div class='del'>- *</div><div class='del'>- * Revision 2.10  2006/04/21 00:56:40  rickd</div><div class='del'>- * workqueue files now prefixed with &lt;sbecom&gt; prefix.</div><div class='del'>- *</div><div class='del'>- * Revision 2.9  2005/11/01 19:22:49  rickd</div><div class='del'>- * Add sanity checks against max_port for ioctl functions.</div><div class='del'>- *</div><div class='del'>- * Revision 2.8  2005/10/27 18:59:25  rickd</div><div class='del'>- * Code cleanup.  Default channel config to HDLC_FCS16.</div><div class='del'>- *</div><div class='del'>- * Revision 2.7  2005/10/18 18:16:30  rickd</div><div class='del'>- * Further NCOMM code repairs - (1) interrupt matrix usage inconsistent</div><div class='del'>- * for indexing into nciInterrupt[][], code missing double parameters.</div><div class='del'>- * (2) check input of ncomm interrupt registration cardID for correct</div><div class='del'>- * boundary values.</div><div class='del'>- *</div><div class='del'>- * Revision 2.6  2005/10/17 23:55:28  rickd</div><div class='del'>- * Initial port of NCOMM support patches from original work found</div><div class='del'>- * in pmc_c4t1e1 as updated by NCOMM.  Ref: CONFIG_SBE_PMCC4_NCOMM.</div><div class='del'>- * Corrected NCOMMs wanpmcC4T1E1_getBaseAddress() to correctly handle</div><div class='del'>- * multiple boards.</div><div class='del'>- *</div><div class='del'>- * Revision 2.5  2005/10/13 23:01:28  rickd</div><div class='del'>- * Correct panic for illegal address reference w/in get_brdinfo on</div><div class='del'>- * first_if/last_if name acquistion under Linux 2.6</div><div class='del'>- *</div><div class='del'>- * Revision 2.4  2005/10/13 21:20:19  rickd</div><div class='del'>- * Correction of c4_cleanup() wherein next should be acquired before</div><div class='del'>- * ci_t structure is free'd.</div><div class='del'>- *</div><div class='del'>- * Revision 2.3  2005/10/13 19:20:10  rickd</div><div class='del'>- * Correct driver removal cleanup code for multiple boards.</div><div class='del'>- *</div><div class='del'>- * Revision 2.2  2005/10/11 18:34:04  rickd</div><div class='del'>- * New routine added to determine number of ports (comets) on board.</div><div class='del'>- *</div><div class='del'>- * Revision 2.1  2005/10/05 00:48:13  rickd</div><div class='del'>- * Add some RX activation trace code.</div><div class='del'>- *</div><div class='del'>- * Revision 2.0  2005/09/28 00:10:06  rickd</div><div class='del'>- * Implement 2.6 workqueue for TX/RX restart.  Correction to</div><div class='del'>- * hardware register boundary checks allows expanded access of MUSYCC.</div><div class='del'>- * Implement new musycc reg&amp;bits namings.</div><div class='del'>- *</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-char        OSSIid_pmcc4_drvc[] =</div><div class='del'>-"@(#)pmcc4_drv.c - $Revision: 3.1 $   (c) Copyright 2002-2007 One Stop Systems, Inc.";</div><div class='del'>-</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='del'>-#if defined (__FreeBSD__) || defined (__NetBSD__)</div><div class='del'>-#include &lt;sys/param.h&gt;</div><div class='del'>-#include &lt;sys/systm.h&gt;</div><div class='del'>-#include &lt;sys/errno.h&gt;</div><div class='del'>-#else</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include "pmcc4_sysdep.h"</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -98,7 +29,6 @@ char        OSSIid_pmcc4_drvc[] =</div><div class='ctx'> #include &lt;linux/timer.h&gt;        /* include for timer */</div><div class='ctx'> #include &lt;linux/hdlc.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #include "sbecom_inline_linux.h"</div><div class='ctx'> #include "libsbew.h"</div><div class='head'>diff --git a/drivers/staging/cxt1e1/pmcc4_ioctls.h b/drivers/staging/cxt1e1/pmcc4_ioctls.h<br/>index 6b8d65673c78..56a1ee39be18 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/pmcc4_ioctls.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/pmcc4_ioctls.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/pmcc4_ioctls.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/cxt1e1/pmcc4_ioctls.h</a></div><div class='hunk'>@@ -1,6 +1,3 @@</div><div class='del'>-/* RCSid: $Header: /home/rickd/projects/pmcc4/include/pmcc4_ioctls.h,v 2.0 2005/09/28 00:10:09 rickd PMCC4_3_1B $</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #ifndef _INC_PMCC4_IOCTLS_H_</div><div class='ctx'> #define _INC_PMCC4_IOCTLS_H_</div><div class='ctx'> </div><div class='hunk'>@@ -22,19 +19,6 @@</div><div class='ctx'>  * For further information, contact via email: support@sbei.com</div><div class='ctx'>  * SBE, Inc.  San Ramon, California  U.S.A.</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='del'>- * RCS info:</div><div class='del'>- * RCS revision: $Revision: 2.0 $</div><div class='del'>- * Last changed on $Date: 2005/09/28 00:10:09 $</div><div class='del'>- * Changed by $Author: rickd $</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='del'>- * $Log: pmcc4_ioctls.h,v $</div><div class='del'>- * Revision 2.0  2005/09/28 00:10:09  rickd</div><div class='del'>- * Add GNU license info. Switch Ioctls to sbe_ioc.h usage.</div><div class='del'>- *</div><div class='del'>- * Revision 1.2  2005/04/28 23:43:03  rickd</div><div class='del'>- * Add RCS tracking heading.</div><div class='del'>- *</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "sbew_ioc.h"</div><div class='head'>diff --git a/drivers/staging/cxt1e1/sbe_bid.h b/drivers/staging/cxt1e1/sbe_bid.h<br/>index 1f49b4061fb7..abc2e55f62fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/sbe_bid.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/sbe_bid.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/sbe_bid.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/cxt1e1/sbe_bid.h</a></div><div class='hunk'>@@ -1,7 +1,3 @@</div><div class='del'>-/*</div><div class='del'>- * $Id: sbe_bid.h,v 1.0 2005/09/28 00:10:09 rickd PMCC4_3_1B $</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #ifndef _INC_SBEBID_H_</div><div class='ctx'> #define _INC_SBEBID_H_</div><div class='ctx'> </div><div class='hunk'>@@ -24,16 +20,6 @@</div><div class='ctx'>  * SBE, Inc.  San Ramon, California  U.S.A.</div><div class='ctx'>  *</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='del'>- * RCS info:</div><div class='del'>- * RCS revision: $Revision: 1.0 $</div><div class='del'>- * Last changed on $Date: 2005/09/28 00:10:09 $</div><div class='del'>- * Changed by $Author: rickd $</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='del'>- * $Log: sbe_bid.h,v $</div><div class='del'>- * Revision 1.0  2005/09/28 00:10:09  rickd</div><div class='del'>- * Initial revision</div><div class='del'>- *</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define SBE_BID_REG        0x00000000   /* Board ID Register */</div><div class='head'>diff --git a/drivers/staging/cxt1e1/sbe_promformat.h b/drivers/staging/cxt1e1/sbe_promformat.h<br/>index 746f81b15c73..aad411d185f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/sbe_promformat.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/sbe_promformat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/sbe_promformat.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/cxt1e1/sbe_promformat.h</a></div><div class='hunk'>@@ -1,7 +1,3 @@</div><div class='del'>-/*</div><div class='del'>- * $Id: sbe_promformat.h,v 2.2 2005/09/28 00:10:09 rickd PMCC4_3_1B $</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #ifndef _INC_SBE_PROMFORMAT_H_</div><div class='ctx'> #define _INC_SBE_PROMFORMAT_H_</div><div class='ctx'> </div><div class='hunk'>@@ -24,19 +20,6 @@</div><div class='ctx'>  * SBE, Inc.  San Ramon, California  U.S.A.</div><div class='ctx'>  *</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='del'>- * RCS info:</div><div class='del'>- * RCS revision: $Revision: 2.2 $</div><div class='del'>- * Last changed on $Date: 2005/09/28 00:10:09 $</div><div class='del'>- * Changed by $Author: rickd $</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='del'>- * $Log: sbe_promformat.h,v $</div><div class='del'>- * Revision 2.2  2005/09/28 00:10:09  rickd</div><div class='del'>- * Add EEPROM sample from C4T1E1 board.</div><div class='del'>- *</div><div class='del'>- * Revision 2.1  2005/05/04 17:18:24  rickd</div><div class='del'>- * Initial CI.</div><div class='del'>- *</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -85,12 +68,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern      "C"</div><div class='del'>-{</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #define STRUCT_OFFSET(type, symbol)  ((long)&amp;(((type *)0)-&gt;symbol))</div><div class='ctx'> </div><div class='ctx'> /*------------------------------------------------------------------------</div><div class='hunk'>@@ -150,8 +127,4 @@ extern      "C"</div><div class='ctx'>         FLD_TYPE2   fldType2;</div><div class='ctx'>     }           PROMFORMAT;</div><div class='ctx'> </div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #endif                          /*** _INC_SBE_PROMFORMAT_H_ ***/</div><div class='head'>diff --git a/drivers/staging/cxt1e1/sbecom_inline_linux.h b/drivers/staging/cxt1e1/sbecom_inline_linux.h<br/>index 9ea2c0c2061f..68ed445ab0cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/sbecom_inline_linux.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/sbecom_inline_linux.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/sbecom_inline_linux.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/cxt1e1/sbecom_inline_linux.h</a></div><div class='hunk'>@@ -1,7 +1,3 @@</div><div class='del'>-/*</div><div class='del'>- * $Id: sbecom_inline_linux.h,v 1.2 2007/08/15 22:51:35 rickd PMCC4_3_1B $</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #ifndef _INC_SBECOM_INLNX_H_</div><div class='ctx'> #define _INC_SBECOM_INLNX_H_</div><div class='ctx'> </div><div class='hunk'>@@ -24,22 +20,6 @@</div><div class='ctx'>  * For further information, contact via email: support@onestopsystems.com</div><div class='ctx'>  * One Stop Systems, Inc.  Escondido, California  U.S.A.</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='del'>- * RCS info:</div><div class='del'>- * RCS revision: $Revision: 1.2 $</div><div class='del'>- * Last changed on $Date: 2007/08/15 22:51:35 $</div><div class='del'>- * Changed by $Author: rickd $</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='del'>- * $Log: sbecom_inline_linux.h,v $</div><div class='del'>- * Revision 1.2  2007/08/15 22:51:35  rickd</div><div class='del'>- * Remove duplicate version.h entry.</div><div class='del'>- *</div><div class='del'>- * Revision 1.1  2007/08/15 22:50:29  rickd</div><div class='del'>- * Update linux/config for 2.6.18 and later.</div><div class='del'>- *</div><div class='del'>- * Revision 1.0  2005/09/28 00:10:09  rickd</div><div class='del'>- * Initial revision</div><div class='del'>- *</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/cxt1e1/sbeproc.h b/drivers/staging/cxt1e1/sbeproc.h<br/>index 4aa53f44ec0b..e82be6afd1e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/sbeproc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/sbeproc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/sbeproc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/cxt1e1/sbeproc.h</a></div><div class='hunk'>@@ -1,7 +1,3 @@</div><div class='del'>-/*</div><div class='del'>- * $Id: sbeproc.h,v 1.2 2005/10/17 23:55:28 rickd PMCC4_3_1B $</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #ifndef _INC_SBEPROC_H_</div><div class='ctx'> #define _INC_SBEPROC_H_</div><div class='ctx'> </div><div class='hunk'>@@ -23,22 +19,6 @@</div><div class='ctx'>  * For further information, contact via email: support@sbei.com</div><div class='ctx'>  * SBE, Inc.  San Ramon, California  U.S.A.</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='del'>- * RCS info:</div><div class='del'>- * RCS revision: $Revision: 1.2 $</div><div class='del'>- * Last changed on $Date: 2005/10/17 23:55:28 $</div><div class='del'>- * Changed by $Author: rickd $</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='del'>- * $Log: sbeproc.h,v $</div><div class='del'>- * Revision 1.2  2005/10/17 23:55:28  rickd</div><div class='del'>- * sbecom_proc_brd_init() is an declared an __init function.</div><div class='del'>- *</div><div class='del'>- * Revision 1.1  2005/09/28 00:10:09  rickd</div><div class='del'>- * Remove unneeded inclusion of c4_private.h.</div><div class='del'>- *</div><div class='del'>- * Revision 1.0  2005/05/10 22:21:46  rickd</div><div class='del'>- * Initial check-in.</div><div class='del'>- *</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/staging/cxt1e1/sbew_ioc.h b/drivers/staging/cxt1e1/sbew_ioc.h<br/>index 14d371904d1f..ce9b15c71894 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/sbew_ioc.h?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/cxt1e1/sbew_ioc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/cxt1e1/sbew_ioc.h?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/cxt1e1/sbew_ioc.h</a></div><div class='hunk'>@@ -1,7 +1,3 @@</div><div class='del'>-/*</div><div class='del'>- * $Id: sbew_ioc.h,v 1.0 2005/09/28 00:10:10 rickd PMCC4_3_1B $</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #ifndef _INC_SBEWIOC_H_</div><div class='ctx'> #define _INC_SBEWIOC_H_</div><div class='ctx'> </div><div class='hunk'>@@ -24,55 +20,9 @@</div><div class='ctx'>  * SBE, Inc.  San Ramon, California  U.S.A.</div><div class='ctx'>  *</div><div class='ctx'>  *-----------------------------------------------------------------------------</div><div class='del'>- * RCS info:</div><div class='del'>- * RCS revision: $Revision: 1.0 $</div><div class='del'>- * Last changed on $Date: 2005/09/28 00:10:10 $</div><div class='del'>- * Changed by $Author: rickd $</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='del'>- * $Log: sbew_ioc.h,v $</div><div class='del'>- * Revision 1.0  2005/09/28 00:10:10  rickd</div><div class='del'>- * Initial revision</div><div class='del'>- *</div><div class='del'>- * Revision 1.6  2005/01/11 18:41:01  rickd</div><div class='del'>- * Add BRDADDR_GET Ioctl.</div><div class='del'>- *</div><div class='del'>- * Revision 1.5  2004/09/16 18:55:59  rickd</div><div class='del'>- * Start setting up for generic framer configuration Ioctl by switch</div><div class='del'>- * from tect3_framer_param[] to sbecom_framer_param[].</div><div class='del'>- *</div><div class='del'>- * Revision 1.4  2004/06/28 17:58:15  rickd</div><div class='del'>- * Rename IOC_TSMAP_[GS] to IOC_TSIOC_[GS] to support need for</div><div class='del'>- * multiple formats of data when setting up TimeSlots.</div><div class='del'>- *</div><div class='del'>- * Revision 1.3  2004/06/22 21:18:13  rickd</div><div class='del'>- * read_vec now() ONLY handles a single common wrt_vec array.</div><div class='del'>- *</div><div class='del'>- * Revision 1.1  2004/06/10 18:11:34  rickd</div><div class='del'>- * Add IID_GET Ioctl reference.</div><div class='del'>- *</div><div class='del'>- * Revision 1.0  2004/06/08 22:59:38  rickd</div><div class='del'>- * Initial revision</div><div class='del'>- *</div><div class='del'>- * Revision 2.0  2004/06/07 17:49:47  rickd</div><div class='del'>- * Initial library release following merge of wanc1t3/wan256 into</div><div class='del'>- * common elements for lib.</div><div class='del'>- *</div><div class='del'>- *-----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifndef __KERNEL__</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#ifdef SunOS</div><div class='del'>-#include &lt;sys/ioccom.h&gt;</div><div class='del'>-#else</div><div class='ctx'> #include &lt;linux/ioctl.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern      "C"</div><div class='del'>-{</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #define SBE_LOCKFILE   "/tmp/.sbewan.LCK"</div><div class='ctx'> </div><div class='hunk'>@@ -128,9 +78,4 @@ extern      "C"</div><div class='ctx'> </div><div class='ctx'> #define SBE_IOC_MAXVEC    1</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #endif                          /*** _INC_SBEWIOC_H_ ***/</div><div class='head'>diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c<br/>index 0c1c6ca8c379..2c4069fcd981 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/staging/et131x/et131x.c?h=v3.6-rc6&amp;id=f7e6746ebae984ea67b0a1a1e23c7e6698240631'>drivers/staging/et131x/et131x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/staging/et131x/et131x.c?h=v3.6-rc6&amp;id=567e47935a7cddd8e823c73bb8ee0b2805cd4940'>drivers/staging/et131x/et131x.c</a></div><div class='hunk'>@@ -155,7 +155,6 @@ MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver "</div><div class='ctx'> #define fMP_ADAPTER_FAIL_SEND_MASK	0x3ff00000</div><div class='ctx'> </div><div class='ctx'> /* Some offsets in PCI config space that are actually used. */</div><div class='del'>-#define ET1310_PCI_MAX_PYLD		0x4C</div><div class='ctx'> #define ET1310_PCI_MAC_ADDRESS		0xA4</div><div class='ctx'> #define ET1310_PCI_EEPROM_STATUS	0xB2</div><div class='ctx'> #define ET1310_PCI_ACK_NACK		0xC0</div><div class='hunk'>@@ -178,9 +177,7 @@ MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver "</div><div class='ctx'> </div><div class='ctx'> /* RX defines */</div><div class='ctx'> #define USE_FBR0 1</div><div class='del'>-</div><div class='ctx'> #define FBR_CHUNKS 32</div><div class='del'>-</div><div class='ctx'> #define MAX_DESC_PER_RING_RX         1024</div><div class='ctx'> </div><div class='ctx'> /* number of RFDs - default and min */</div><div class='hunk'>@@ -195,7 +192,6 @@ MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver "</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define NIC_MIN_NUM_RFD		64</div><div class='del'>-</div><div class='ctx'> #define NUM_PACKETS_HANDLED	256</div><div class='ctx'> </div><div class='ctx'> #define ALCATEL_MULTICAST_PKT	0x01000000</div><div class='hunk'>@@ -303,8 +299,8 @@ struct fbr_lookup {</div><div class='ctx'> 	dma_addr_t	 ring_physaddr;</div><div class='ctx'> 	void		*mem_virtaddrs[MAX_DESC_PER_RING_RX / FBR_CHUNKS];</div><div class='ctx'> 	dma_addr_t	 mem_physaddrs[MAX_DESC_PER_RING_RX / FBR_CHUNKS];</div><div class='del'>-	uint64_t	 real_physaddr;</div><div class='del'>-	uint64_t	 offset;</div><div class='add'>+	u64		 real_physaddr;</div><div class='add'>+	u64		 offset;</div><div class='ctx'> 	u32		 local_full;</div><div class='ctx'> 	u32		 num_entries;</div><div class='ctx'> 	u32		 buffsize;</div><div class='hunk'>@@ -427,7 +423,6 @@ struct tx_ring {</div><div class='ctx'> 	int since_irq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* ADAPTER defines */</div><div class='ctx'> /*</div><div class='ctx'>  * Do not change these values: if changed, then change also in respective</div><div class='ctx'>  * TXdma and Rxdma engines</div><div class='hunk'>@@ -576,8 +571,6 @@ struct et131x_adapter {</div><div class='ctx'> 	struct net_device_stats net_stats;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* EEPROM functions */</div><div class='del'>-</div><div class='ctx'> static int eeprom_wait_ready(struct pci_dev *pdev, u32 *status)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg;</div><div class='hunk'>@@ -795,7 +788,7 @@ static int eeprom_read(struct et131x_adapter *adapter, u32 addr, u8 *pdata)</div><div class='ctx'> 	return (status &amp; LBCIF_STATUS_ACK_ERROR) ? -EIO : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int et131x_init_eeprom(struct et131x_adapter *adapter)</div><div class='add'>+static int et131x_init_eeprom(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	u8 eestatus;</div><div class='hunk'>@@ -868,7 +861,7 @@ int et131x_init_eeprom(struct et131x_adapter *adapter)</div><div class='ctx'>  * et131x_rx_dma_enable - re-start of Rx_DMA on the ET1310.</div><div class='ctx'>  * @adapter: pointer to our adapter structure</div><div class='ctx'>  */</div><div class='del'>-void et131x_rx_dma_enable(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_rx_dma_enable(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	/* Setup the receive dma configuration register for normal operation */</div><div class='ctx'> 	u32 csr =  0x2000;	/* FBR1 enable */</div><div class='hunk'>@@ -906,7 +899,7 @@ void et131x_rx_dma_enable(struct et131x_adapter *adapter)</div><div class='ctx'>  * et131x_rx_dma_disable - Stop of Rx_DMA on the ET1310</div><div class='ctx'>  * @adapter: pointer to our adapter structure</div><div class='ctx'>  */</div><div class='del'>-void et131x_rx_dma_disable(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_rx_dma_disable(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	u32 csr;</div><div class='ctx'> 	/* Setup the receive dma configuration register */</div><div class='hunk'>@@ -928,7 +921,7 @@ void et131x_rx_dma_disable(struct et131x_adapter *adapter)</div><div class='ctx'>  *</div><div class='ctx'>  * Mainly used after a return to the D0 (full-power) state from a lower state.</div><div class='ctx'>  */</div><div class='del'>-void et131x_tx_dma_enable(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_tx_dma_enable(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	/* Setup the transmit dma configuration register for normal</div><div class='ctx'> 	 * operation</div><div class='hunk'>@@ -948,23 +941,10 @@ static inline void add_12bit(u32 *v, int n)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nic_rx_pkts - Checks the hardware for available packets</div><div class='del'>- * @adapter: pointer to our adapter</div><div class='del'>- *</div><div class='del'>- * Returns rfd, a pointer to our MPRFD.</div><div class='del'>- *</div><div class='del'>- * Checks the hardware for available packets, using completion ring</div><div class='del'>- * If packets are available, it gets an RFD from the recv_list, attaches</div><div class='del'>- * the packet to it, puts the RFD in the RecvPendList, and also returns</div><div class='del'>- * the pointer to the RFD.</div><div class='del'>- */</div><div class='del'>-/* MAC functions */</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * et1310_config_mac_regs1 - Initialize the first part of MAC regs</div><div class='ctx'>  * @adapter: pointer to our adapter structure</div><div class='ctx'>  */</div><div class='del'>-void et1310_config_mac_regs1(struct et131x_adapter *adapter)</div><div class='add'>+static void et1310_config_mac_regs1(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct mac_regs __iomem *macregs = &amp;adapter-&gt;regs-&gt;mac;</div><div class='ctx'> 	u32 station1;</div><div class='hunk'>@@ -1024,7 +1004,7 @@ void et1310_config_mac_regs1(struct et131x_adapter *adapter)</div><div class='ctx'>  * et1310_config_mac_regs2 - Initialize the second part of MAC regs</div><div class='ctx'>  * @adapter: pointer to our adapter structure</div><div class='ctx'>  */</div><div class='del'>-void et1310_config_mac_regs2(struct et131x_adapter *adapter)</div><div class='add'>+static void et1310_config_mac_regs2(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	int32_t delay = 0;</div><div class='ctx'> 	struct mac_regs __iomem *mac = &amp;adapter-&gt;regs-&gt;mac;</div><div class='hunk'>@@ -1105,7 +1085,7 @@ void et1310_config_mac_regs2(struct et131x_adapter *adapter)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 if the device is not in phy coma, 1 if it is in phy coma</div><div class='ctx'>  */</div><div class='del'>-int et1310_in_phy_coma(struct et131x_adapter *adapter)</div><div class='add'>+static int et1310_in_phy_coma(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	u32 pmcsr;</div><div class='ctx'> </div><div class='hunk'>@@ -1114,15 +1094,13 @@ int et1310_in_phy_coma(struct et131x_adapter *adapter)</div><div class='ctx'> 	return ET_PM_PHY_SW_COMA &amp; pmcsr ? 1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void et1310_setup_device_for_multicast(struct et131x_adapter *adapter)</div><div class='add'>+static void et1310_setup_device_for_multicast(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct rxmac_regs __iomem *rxmac = &amp;adapter-&gt;regs-&gt;rxmac;</div><div class='del'>-	uint32_t nIndex;</div><div class='del'>-	uint32_t result;</div><div class='del'>-	uint32_t hash1 = 0;</div><div class='del'>-	uint32_t hash2 = 0;</div><div class='del'>-	uint32_t hash3 = 0;</div><div class='del'>-	uint32_t hash4 = 0;</div><div class='add'>+	u32 hash1 = 0;</div><div class='add'>+	u32 hash2 = 0;</div><div class='add'>+	u32 hash3 = 0;</div><div class='add'>+	u32 hash4 = 0;</div><div class='ctx'> 	u32 pm_csr;</div><div class='ctx'> </div><div class='ctx'> 	/* If ET131X_PACKET_TYPE_MULTICAST is specified, then we provision</div><div class='hunk'>@@ -1131,10 +1109,13 @@ void et1310_setup_device_for_multicast(struct et131x_adapter *adapter)</div><div class='ctx'> 	 * driver.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (adapter-&gt;packet_filter &amp; ET131X_PACKET_TYPE_MULTICAST) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='ctx'> 		/* Loop through our multicast array and set up the device */</div><div class='del'>-		for (nIndex = 0; nIndex &lt; adapter-&gt;multicast_addr_count;</div><div class='del'>-		     nIndex++) {</div><div class='del'>-			result = ether_crc(6, adapter-&gt;multicast_list[nIndex]);</div><div class='add'>+		for (i = 0; i &lt; adapter-&gt;multicast_addr_count; i++) {</div><div class='add'>+			u32 result;</div><div class='add'>+</div><div class='add'>+			result = ether_crc(6, adapter-&gt;multicast_list[i]);</div><div class='ctx'> </div><div class='ctx'> 			result = (result &amp; 0x3F800000) &gt;&gt; 23;</div><div class='ctx'> </div><div class='hunk'>@@ -1163,7 +1144,7 @@ void et1310_setup_device_for_multicast(struct et131x_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void et1310_setup_device_for_unicast(struct et131x_adapter *adapter)</div><div class='add'>+static void et1310_setup_device_for_unicast(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct rxmac_regs __iomem *rxmac = &amp;adapter-&gt;regs-&gt;rxmac;</div><div class='ctx'> 	u32 uni_pf1;</div><div class='hunk'>@@ -1203,7 +1184,7 @@ void et1310_setup_device_for_unicast(struct et131x_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void et1310_config_rxmac_regs(struct et131x_adapter *adapter)</div><div class='add'>+static void et1310_config_rxmac_regs(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct rxmac_regs __iomem *rxmac = &amp;adapter-&gt;regs-&gt;rxmac;</div><div class='ctx'> 	struct phy_device *phydev = adapter-&gt;phydev;</div><div class='hunk'>@@ -1334,7 +1315,7 @@ void et1310_config_rxmac_regs(struct et131x_adapter *adapter)</div><div class='ctx'> 	writel(0x9, &amp;rxmac-&gt;ctrl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void et1310_config_txmac_regs(struct et131x_adapter *adapter)</div><div class='add'>+static void et1310_config_txmac_regs(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct txmac_regs __iomem *txmac = &amp;adapter-&gt;regs-&gt;txmac;</div><div class='ctx'> </div><div class='hunk'>@@ -1348,7 +1329,7 @@ void et1310_config_txmac_regs(struct et131x_adapter *adapter)</div><div class='ctx'> 		writel(0x40, &amp;txmac-&gt;cf_param);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void et1310_config_macstat_regs(struct et131x_adapter *adapter)</div><div class='add'>+static void et1310_config_macstat_regs(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct macstat_regs __iomem *macstat =</div><div class='ctx'> 		&amp;adapter-&gt;regs-&gt;macstat;</div><div class='hunk'>@@ -1422,7 +1403,7 @@ void et1310_config_macstat_regs(struct et131x_adapter *adapter)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success, errno on failure (as defined in errno.h)</div><div class='ctx'>  */</div><div class='del'>-int et131x_phy_mii_read(struct et131x_adapter *adapter, u8 addr,</div><div class='add'>+static int et131x_phy_mii_read(struct et131x_adapter *adapter, u8 addr,</div><div class='ctx'> 	      u8 reg, u16 *value)</div><div class='ctx'> {</div><div class='ctx'> 	struct mac_regs __iomem *mac = &amp;adapter-&gt;regs-&gt;mac;</div><div class='hunk'>@@ -1478,7 +1459,7 @@ int et131x_phy_mii_read(struct et131x_adapter *adapter, u8 addr,</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int et131x_mii_read(struct et131x_adapter *adapter, u8 reg, u16 *value)</div><div class='add'>+static int et131x_mii_read(struct et131x_adapter *adapter, u8 reg, u16 *value)</div><div class='ctx'> {</div><div class='ctx'> 	struct phy_device *phydev = adapter-&gt;phydev;</div><div class='ctx'> </div><div class='hunk'>@@ -1498,7 +1479,7 @@ int et131x_mii_read(struct et131x_adapter *adapter, u8 reg, u16 *value)</div><div class='ctx'>  *</div><div class='ctx'>  * Return 0 on success, errno on failure (as defined in errno.h)</div><div class='ctx'>  */</div><div class='del'>-int et131x_mii_write(struct et131x_adapter *adapter, u8 reg, u16 value)</div><div class='add'>+static int et131x_mii_write(struct et131x_adapter *adapter, u8 reg, u16 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct mac_regs __iomem *mac = &amp;adapter-&gt;regs-&gt;mac;</div><div class='ctx'> 	struct phy_device *phydev = adapter-&gt;phydev;</div><div class='hunk'>@@ -1564,8 +1545,9 @@ int et131x_mii_write(struct et131x_adapter *adapter, u8 reg, u16 value)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Still used from _mac for BIT_READ */</div><div class='del'>-void et1310_phy_access_mii_bit(struct et131x_adapter *adapter, u16 action,</div><div class='del'>-			       u16 regnum, u16 bitnum, u8 *value)</div><div class='add'>+static void et1310_phy_access_mii_bit(struct et131x_adapter *adapter,</div><div class='add'>+				      u16 action, u16 regnum, u16 bitnum,</div><div class='add'>+				      u8 *value)</div><div class='ctx'> {</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> 	u16 mask = 0x0001 &lt;&lt; bitnum;</div><div class='hunk'>@@ -1591,7 +1573,7 @@ void et1310_phy_access_mii_bit(struct et131x_adapter *adapter, u16 action,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void et1310_config_flow_control(struct et131x_adapter *adapter)</div><div class='add'>+static void et1310_config_flow_control(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct phy_device *phydev = adapter-&gt;phydev;</div><div class='ctx'> </div><div class='hunk'>@@ -1632,7 +1614,7 @@ void et1310_config_flow_control(struct et131x_adapter *adapter)</div><div class='ctx'>  * et1310_update_macstat_host_counters - Update the local copy of the statistics</div><div class='ctx'>  * @adapter: pointer to the adapter structure</div><div class='ctx'>  */</div><div class='del'>-void et1310_update_macstat_host_counters(struct et131x_adapter *adapter)</div><div class='add'>+static void et1310_update_macstat_host_counters(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct ce_stats *stats = &amp;adapter-&gt;stats;</div><div class='ctx'> 	struct macstat_regs __iomem *macstat =</div><div class='hunk'>@@ -1664,7 +1646,7 @@ void et1310_update_macstat_host_counters(struct et131x_adapter *adapter)</div><div class='ctx'>  * the statistics held in the adapter structure, checking the "wrap"</div><div class='ctx'>  * bit for each counter.</div><div class='ctx'>  */</div><div class='del'>-void et1310_handle_macstat_interrupt(struct et131x_adapter *adapter)</div><div class='add'>+static void et1310_handle_macstat_interrupt(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	u32 carry_reg1;</div><div class='ctx'> 	u32 carry_reg2;</div><div class='hunk'>@@ -1714,9 +1696,7 @@ void et1310_handle_macstat_interrupt(struct et131x_adapter *adapter)</div><div class='ctx'> 		adapter-&gt;stats.tx_collisions	+= COUNTER_WRAP_12_BIT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* PHY functions */</div><div class='del'>-</div><div class='del'>-int et131x_mdio_read(struct mii_bus *bus, int phy_addr, int reg)</div><div class='add'>+static int et131x_mdio_read(struct mii_bus *bus, int phy_addr, int reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = bus-&gt;priv;</div><div class='ctx'> 	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='hunk'>@@ -1731,7 +1711,7 @@ int et131x_mdio_read(struct mii_bus *bus, int phy_addr, int reg)</div><div class='ctx'> 		return value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int et131x_mdio_write(struct mii_bus *bus, int phy_addr, int reg, u16 value)</div><div class='add'>+static int et131x_mdio_write(struct mii_bus *bus, int phy_addr, int reg, u16 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = bus-&gt;priv;</div><div class='ctx'> 	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='hunk'>@@ -1739,7 +1719,7 @@ int et131x_mdio_write(struct mii_bus *bus, int phy_addr, int reg, u16 value)</div><div class='ctx'> 	return et131x_mii_write(adapter, reg, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int et131x_mdio_reset(struct mii_bus *bus)</div><div class='add'>+static int et131x_mdio_reset(struct mii_bus *bus)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = bus-&gt;priv;</div><div class='ctx'> 	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='hunk'>@@ -1759,7 +1739,7 @@ int et131x_mdio_reset(struct mii_bus *bus)</div><div class='ctx'>  *	Can't you see that this code processed</div><div class='ctx'>  *	Phy power, phy power..</div><div class='ctx'>  */</div><div class='del'>-void et1310_phy_power_down(struct et131x_adapter *adapter, bool down)</div><div class='add'>+static void et1310_phy_power_down(struct et131x_adapter *adapter, bool down)</div><div class='ctx'> {</div><div class='ctx'> 	u16 data;</div><div class='ctx'> </div><div class='hunk'>@@ -1775,7 +1755,7 @@ void et1310_phy_power_down(struct et131x_adapter *adapter, bool down)</div><div class='ctx'>  * @adapter: pointer to our private adapter structure</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-void et131x_xcvr_init(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_xcvr_init(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	u16 imr;</div><div class='ctx'> 	u16 isr;</div><div class='hunk'>@@ -1822,7 +1802,7 @@ void et131x_xcvr_init(struct et131x_adapter *adapter)</div><div class='ctx'>  *</div><div class='ctx'>  * Used to configure the global registers on the JAGCore</div><div class='ctx'>  */</div><div class='del'>-void et131x_configure_global_regs(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_configure_global_regs(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct global_regs __iomem *regs = &amp;adapter-&gt;regs-&gt;global;</div><div class='ctx'> </div><div class='hunk'>@@ -1863,13 +1843,11 @@ void et131x_configure_global_regs(struct et131x_adapter *adapter)</div><div class='ctx'> 	writel(0, &amp;regs-&gt;watchdog_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* PM functions */</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * et131x_config_rx_dma_regs - Start of Rx_DMA init sequence</div><div class='ctx'>  * @adapter: pointer to our adapter structure</div><div class='ctx'>  */</div><div class='del'>-void et131x_config_rx_dma_regs(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_config_rx_dma_regs(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct rxdma_regs __iomem *rx_dma = &amp;adapter-&gt;regs-&gt;rxdma;</div><div class='ctx'> 	struct rx_ring *rx_local = &amp;adapter-&gt;rx_ring;</div><div class='hunk'>@@ -1987,7 +1965,7 @@ void et131x_config_rx_dma_regs(struct et131x_adapter *adapter)</div><div class='ctx'>  * Configure the transmit engine with the ring buffers we have created</div><div class='ctx'>  * and prepare it for use.</div><div class='ctx'>  */</div><div class='del'>-void et131x_config_tx_dma_regs(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_config_tx_dma_regs(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct txdma_regs __iomem *txdma = &amp;adapter-&gt;regs-&gt;txdma;</div><div class='ctx'> </div><div class='hunk'>@@ -2017,7 +1995,7 @@ void et131x_config_tx_dma_regs(struct et131x_adapter *adapter)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success, errno on failure (as defined in errno.h)</div><div class='ctx'>  */</div><div class='del'>-void et131x_adapter_setup(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_adapter_setup(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	/* Configure the JAGCore */</div><div class='ctx'> 	et131x_configure_global_regs(adapter);</div><div class='hunk'>@@ -2044,7 +2022,7 @@ void et131x_adapter_setup(struct et131x_adapter *adapter)</div><div class='ctx'>  * et131x_soft_reset - Issue a soft reset to the hardware, complete for ET1310</div><div class='ctx'>  * @adapter: pointer to our private adapter structure</div><div class='ctx'>  */</div><div class='del'>-void et131x_soft_reset(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_soft_reset(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	/* Disable MAC Core */</div><div class='ctx'> 	writel(0xc00f0000, &amp;adapter-&gt;regs-&gt;mac.cfg1);</div><div class='hunk'>@@ -2062,7 +2040,7 @@ void et131x_soft_reset(struct et131x_adapter *adapter)</div><div class='ctx'>  *	Enable the appropriate interrupts on the ET131x according to our</div><div class='ctx'>  *	configuration</div><div class='ctx'>  */</div><div class='del'>-void et131x_enable_interrupts(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_enable_interrupts(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mask;</div><div class='ctx'> </div><div class='hunk'>@@ -2082,7 +2060,7 @@ void et131x_enable_interrupts(struct et131x_adapter *adapter)</div><div class='ctx'>  *</div><div class='ctx'>  *	Block all interrupts from the et131x device at the device itself</div><div class='ctx'>  */</div><div class='del'>-void et131x_disable_interrupts(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_disable_interrupts(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	/* Disable all global interrupts */</div><div class='ctx'> 	writel(INT_MASK_DISABLE, &amp;adapter-&gt;regs-&gt;global.int_mask);</div><div class='hunk'>@@ -2092,7 +2070,7 @@ void et131x_disable_interrupts(struct et131x_adapter *adapter)</div><div class='ctx'>  * et131x_tx_dma_disable - Stop of Tx_DMA on the ET1310</div><div class='ctx'>  * @adapter: pointer to our adapter structure</div><div class='ctx'>  */</div><div class='del'>-void et131x_tx_dma_disable(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_tx_dma_disable(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	/* Setup the tramsmit dma configuration register */</div><div class='ctx'> 	writel(ET_TXDMA_CSR_HALT|ET_TXDMA_SNGL_EPKT,</div><div class='hunk'>@@ -2103,7 +2081,7 @@ void et131x_tx_dma_disable(struct et131x_adapter *adapter)</div><div class='ctx'>  * et131x_enable_txrx - Enable tx/rx queues</div><div class='ctx'>  * @netdev: device to be enabled</div><div class='ctx'>  */</div><div class='del'>-void et131x_enable_txrx(struct net_device *netdev)</div><div class='add'>+static void et131x_enable_txrx(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2123,7 +2101,7 @@ void et131x_enable_txrx(struct net_device *netdev)</div><div class='ctx'>  * et131x_disable_txrx - Disable tx/rx queues</div><div class='ctx'>  * @netdev: device to be disabled</div><div class='ctx'>  */</div><div class='del'>-void et131x_disable_txrx(struct net_device *netdev)</div><div class='add'>+static void et131x_disable_txrx(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2142,7 +2120,7 @@ void et131x_disable_txrx(struct net_device *netdev)</div><div class='ctx'>  * et131x_init_send - Initialize send data structures</div><div class='ctx'>  * @adapter: pointer to our private adapter structure</div><div class='ctx'>  */</div><div class='del'>-void et131x_init_send(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_init_send(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcb *tcb;</div><div class='ctx'> 	u32 ct;</div><div class='hunk'>@@ -2192,7 +2170,7 @@ void et131x_init_send(struct et131x_adapter *adapter)</div><div class='ctx'>  *       indicating linkup status, call the MPDisablePhyComa routine to</div><div class='ctx'>  *             restore JAGCore and gigE PHY</div><div class='ctx'>  */</div><div class='del'>-void et1310_enable_phy_coma(struct et131x_adapter *adapter)</div><div class='add'>+static void et1310_enable_phy_coma(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 pmcsr;</div><div class='hunk'>@@ -2231,7 +2209,7 @@ void et1310_enable_phy_coma(struct et131x_adapter *adapter)</div><div class='ctx'>  * et1310_disable_phy_coma - Disable the Phy Coma Mode</div><div class='ctx'>  * @adapter: pointer to our adapter structure</div><div class='ctx'>  */</div><div class='del'>-void et1310_disable_phy_coma(struct et131x_adapter *adapter)</div><div class='add'>+static void et1310_disable_phy_coma(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	u32 pmcsr;</div><div class='ctx'> </div><div class='hunk'>@@ -2269,8 +2247,6 @@ void et1310_disable_phy_coma(struct et131x_adapter *adapter)</div><div class='ctx'> 	et131x_enable_txrx(adapter-&gt;netdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* RX functions */</div><div class='del'>-</div><div class='ctx'> static inline u32 bump_free_buff_ring(u32 *free_buff_ring, u32 limit)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tmp_free_buff_ring = *free_buff_ring;</div><div class='hunk'>@@ -2296,16 +2272,14 @@ static inline u32 bump_free_buff_ring(u32 *free_buff_ring, u32 limit)</div><div class='ctx'>  * @offset: pointer to the offset variable</div><div class='ctx'>  * @mask: correct mask</div><div class='ctx'>  */</div><div class='del'>-void et131x_align_allocated_memory(struct et131x_adapter *adapter,</div><div class='del'>-				   uint64_t *phys_addr,</div><div class='del'>-				   uint64_t *offset, uint64_t mask)</div><div class='add'>+static void et131x_align_allocated_memory(struct et131x_adapter *adapter,</div><div class='add'>+					  u64 *phys_addr, u64 *offset,</div><div class='add'>+					  u64 mask)</div><div class='ctx'> {</div><div class='del'>-	uint64_t new_addr;</div><div class='add'>+	u64 new_addr = *phys_addr &amp; ~mask;</div><div class='ctx'> </div><div class='ctx'> 	*offset = 0;</div><div class='ctx'> </div><div class='del'>-	new_addr = *phys_addr &amp; ~mask;</div><div class='del'>-</div><div class='ctx'> 	if (new_addr != *phys_addr) {</div><div class='ctx'> 		/* Move to next aligned block */</div><div class='ctx'> 		new_addr += mask + 1;</div><div class='hunk'>@@ -2325,7 +2299,7 @@ void et131x_align_allocated_memory(struct et131x_adapter *adapter,</div><div class='ctx'>  * Allocates Free buffer ring 1 for sure, free buffer ring 0 if required,</div><div class='ctx'>  * and the Packet Status Ring.</div><div class='ctx'>  */</div><div class='del'>-int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)</div><div class='add'>+static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i, j;</div><div class='ctx'> 	u32 bufsize;</div><div class='hunk'>@@ -2454,8 +2428,8 @@ int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)</div><div class='ctx'> 			rx_ring-&gt;fbr[1]-&gt;offset);</div><div class='ctx'> #endif</div><div class='ctx'> 	for (i = 0; i &lt; (rx_ring-&gt;fbr[0]-&gt;num_entries / FBR_CHUNKS); i++) {</div><div class='del'>-		u64 fbr1_offset;</div><div class='ctx'> 		u64 fbr1_tmp_physaddr;</div><div class='add'>+		u64 fbr1_offset;</div><div class='ctx'> 		u32 fbr1_align;</div><div class='ctx'> </div><div class='ctx'> 		/* This code allocates an area of memory big enough for N</div><div class='hunk'>@@ -2520,8 +2494,8 @@ int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)</div><div class='ctx'> #ifdef USE_FBR0</div><div class='ctx'> 	/* Same for FBR0 (if in use) */</div><div class='ctx'> 	for (i = 0; i &lt; (rx_ring-&gt;fbr[1]-&gt;num_entries / FBR_CHUNKS); i++) {</div><div class='del'>-		u64 fbr0_offset;</div><div class='ctx'> 		u64 fbr0_tmp_physaddr;</div><div class='add'>+		u64 fbr0_offset;</div><div class='ctx'> </div><div class='ctx'> 		fbr_chunksize =</div><div class='ctx'> 		    ((FBR_CHUNKS + 1) * rx_ring-&gt;fbr[1]-&gt;buffsize) - 1;</div><div class='hunk'>@@ -2629,7 +2603,7 @@ int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)</div><div class='ctx'>  * et131x_rx_dma_memory_free - Free all memory allocated within this module.</div><div class='ctx'>  * @adapter: pointer to our private adapter structure</div><div class='ctx'>  */</div><div class='del'>-void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	u32 index;</div><div class='ctx'> 	u32 bufsize;</div><div class='hunk'>@@ -2774,7 +2748,7 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success and errno on failure (as defined in errno.h)</div><div class='ctx'>  */</div><div class='del'>-int et131x_init_recv(struct et131x_adapter *adapter)</div><div class='add'>+static int et131x_init_recv(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	int status = -ENOMEM;</div><div class='ctx'> 	struct rfd *rfd = NULL;</div><div class='hunk'>@@ -2824,7 +2798,7 @@ int et131x_init_recv(struct et131x_adapter *adapter)</div><div class='ctx'>  * et131x_set_rx_dma_timer - Set the heartbeat timer according to line rate.</div><div class='ctx'>  * @adapter: pointer to our adapter structure</div><div class='ctx'>  */</div><div class='del'>-void et131x_set_rx_dma_timer(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_set_rx_dma_timer(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct phy_device *phydev = adapter-&gt;phydev;</div><div class='ctx'> </div><div class='hunk'>@@ -2918,6 +2892,17 @@ static void nic_return_rfd(struct et131x_adapter *adapter, struct rfd *rfd)</div><div class='ctx'> 	WARN_ON(rx_local-&gt;num_ready_recv &gt; rx_local-&gt;num_rfd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * nic_rx_pkts - Checks the hardware for available packets</div><div class='add'>+ * @adapter: pointer to our adapter</div><div class='add'>+ *</div><div class='add'>+ * Returns rfd, a pointer to our MPRFD.</div><div class='add'>+ *</div><div class='add'>+ * Checks the hardware for available packets, using completion ring</div><div class='add'>+ * If packets are available, it gets an RFD from the recv_list, attaches</div><div class='add'>+ * the packet to it, puts the RFD in the RecvPendList, and also returns</div><div class='add'>+ * the pointer to the RFD.</div><div class='add'>+ */</div><div class='ctx'> static struct rfd *nic_rx_pkts(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct rx_ring *rx_local = &amp;adapter-&gt;rx_ring;</div><div class='hunk'>@@ -3139,7 +3124,7 @@ static struct rfd *nic_rx_pkts(struct et131x_adapter *adapter)</div><div class='ctx'>  *</div><div class='ctx'>  * Assumption, Rcv spinlock has been acquired.</div><div class='ctx'>  */</div><div class='del'>-void et131x_handle_recv_interrupt(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_handle_recv_interrupt(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct rfd *rfd = NULL;</div><div class='ctx'> 	u32 count = 0;</div><div class='hunk'>@@ -3188,8 +3173,6 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *adapter)</div><div class='ctx'> 		adapter-&gt;rx_ring.unfinished_receives = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* TX functions */</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * et131x_tx_dma_memory_alloc</div><div class='ctx'>  * @adapter: pointer to our private adapter structure</div><div class='hunk'>@@ -3202,7 +3185,7 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *adapter)</div><div class='ctx'>  * memory. The device will update the "status" in memory each time it xmits a</div><div class='ctx'>  * packet.</div><div class='ctx'>  */</div><div class='del'>-int et131x_tx_dma_memory_alloc(struct et131x_adapter *adapter)</div><div class='add'>+static int et131x_tx_dma_memory_alloc(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	int desc_size = 0;</div><div class='ctx'> 	struct tx_ring *tx_ring = &amp;adapter-&gt;tx_ring;</div><div class='hunk'>@@ -3256,7 +3239,7 @@ int et131x_tx_dma_memory_alloc(struct et131x_adapter *adapter)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success and errno on failure (as defined in errno.h).</div><div class='ctx'>  */</div><div class='del'>-void et131x_tx_dma_memory_free(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_tx_dma_memory_free(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	int desc_size = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3578,7 +3561,7 @@ static int send_packet(struct sk_buff *skb, struct et131x_adapter *adapter)</div><div class='ctx'>  *</div><div class='ctx'>  * Return 0 in almost all cases; non-zero value in extreme hard failure only</div><div class='ctx'>  */</div><div class='del'>-int et131x_send_packets(struct sk_buff *skb, struct net_device *netdev)</div><div class='add'>+static int et131x_send_packets(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> 	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='hunk'>@@ -3696,7 +3679,7 @@ static inline void free_send_packet(struct et131x_adapter *adapter,</div><div class='ctx'>  *</div><div class='ctx'>  * Assumption - Send spinlock has been acquired</div><div class='ctx'>  */</div><div class='del'>-void et131x_free_busy_send_packets(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_free_busy_send_packets(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct tcb *tcb;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -3743,7 +3726,7 @@ void et131x_free_busy_send_packets(struct et131x_adapter *adapter)</div><div class='ctx'>  *</div><div class='ctx'>  * Assumption - Send spinlock has been acquired</div><div class='ctx'>  */</div><div class='del'>-void et131x_handle_send_interrupt(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_handle_send_interrupt(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 serviced;</div><div class='hunk'>@@ -3798,8 +3781,6 @@ void et131x_handle_send_interrupt(struct et131x_adapter *adapter)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;adapter-&gt;tcb_send_qlock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* ETHTOOL functions */</div><div class='del'>-</div><div class='ctx'> static int et131x_get_settings(struct net_device *netdev,</div><div class='ctx'> 			       struct ethtool_cmd *cmd)</div><div class='ctx'> {</div><div class='hunk'>@@ -3965,18 +3946,16 @@ static struct ethtool_ops et131x_ethtool_ops = {</div><div class='ctx'> 	.get_link = ethtool_op_get_link,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void et131x_set_ethtool_ops(struct net_device *netdev)</div><div class='add'>+static void et131x_set_ethtool_ops(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	SET_ETHTOOL_OPS(netdev, &amp;et131x_ethtool_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* PCI functions */</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * et131x_hwaddr_init - set up the MAC Address on the ET1310</div><div class='ctx'>  * @adapter: pointer to our private adapter structure</div><div class='ctx'>  */</div><div class='del'>-void et131x_hwaddr_init(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_hwaddr_init(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	/* If have our default mac from init and no mac address from</div><div class='ctx'> 	 * EEPROM then we need to generate the last octet and set it on the</div><div class='hunk'>@@ -4022,24 +4001,31 @@ void et131x_hwaddr_init(struct et131x_adapter *adapter)</div><div class='ctx'> static int et131x_pci_init(struct et131x_adapter *adapter,</div><div class='ctx'> 						struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	u8 max_payload;</div><div class='del'>-	u8 read_size_reg;</div><div class='add'>+	int cap = pci_pcie_cap(pdev);</div><div class='add'>+	u16 max_payload;</div><div class='add'>+	u16 ctl;</div><div class='add'>+	int i, rc;</div><div class='ctx'> </div><div class='del'>-	if (et131x_init_eeprom(adapter) &lt; 0)</div><div class='del'>-		return -EIO;</div><div class='add'>+	rc = et131x_init_eeprom(adapter);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='add'>+	if (!cap) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Missing PCIe capabilities\n");</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+		</div><div class='ctx'> 	/* Let's set up the PORT LOGIC Register.  First we need to know what</div><div class='ctx'> 	 * the max_payload_size is</div><div class='ctx'> 	 */</div><div class='del'>-	if (pci_read_config_byte(pdev, ET1310_PCI_MAX_PYLD, &amp;max_payload)) {</div><div class='add'>+	if (pci_read_config_word(pdev, cap + PCI_EXP_DEVCAP, &amp;max_payload)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 		    "Could not read PCI config space for Max Payload Size\n");</div><div class='del'>-		return -EIO;</div><div class='add'>+		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Program the Ack/Nak latency and replay timers */</div><div class='del'>-	max_payload &amp;= 0x07;	/* Only the lower 3 bits are valid */</div><div class='add'>+	max_payload &amp;= 0x07;</div><div class='ctx'> </div><div class='ctx'> 	if (max_payload &lt; 2) {</div><div class='ctx'> 		static const u16 acknak[2] = { 0x76, 0xD0 };</div><div class='hunk'>@@ -4049,13 +4035,13 @@ static int et131x_pci_init(struct et131x_adapter *adapter,</div><div class='ctx'> 					       acknak[max_payload])) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 			  "Could not write PCI config space for ACK/NAK\n");</div><div class='del'>-			return -EIO;</div><div class='add'>+			goto err_out;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (pci_write_config_word(pdev, ET1310_PCI_REPLAY,</div><div class='ctx'> 					       replay[max_payload])) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 			  "Could not write PCI config space for Replay Timer\n");</div><div class='del'>-			return -EIO;</div><div class='add'>+			goto err_out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4065,23 +4051,22 @@ static int et131x_pci_init(struct et131x_adapter *adapter,</div><div class='ctx'> 	if (pci_write_config_byte(pdev, ET1310_PCI_L0L1LATENCY, 0x11)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 		  "Could not write PCI config space for Latency Timers\n");</div><div class='del'>-		return -EIO;</div><div class='add'>+		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Change the max read size to 2k */</div><div class='del'>-	if (pci_read_config_byte(pdev, 0x51, &amp;read_size_reg)) {</div><div class='add'>+	if (pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &amp;ctl)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 			"Could not read PCI config space for Max read size\n");</div><div class='del'>-		return -EIO;</div><div class='add'>+		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	read_size_reg &amp;= 0x8f;</div><div class='del'>-	read_size_reg |= 0x40;</div><div class='add'>+	ctl = (ctl &amp; ~PCI_EXP_DEVCTL_READRQ) | ( 0x04 &lt;&lt; 12);</div><div class='ctx'> </div><div class='del'>-	if (pci_write_config_byte(pdev, 0x51, read_size_reg)) {</div><div class='add'>+	if (pci_write_config_word(pdev, cap + PCI_EXP_DEVCTL, ctl)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 		      "Could not write PCI config space for Max read size\n");</div><div class='del'>-		return -EIO;</div><div class='add'>+		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get MAC address from config space if an eeprom exists, otherwise</div><div class='hunk'>@@ -4096,11 +4081,15 @@ static int et131x_pci_init(struct et131x_adapter *adapter,</div><div class='ctx'> 		if (pci_read_config_byte(pdev, ET1310_PCI_MAC_ADDRESS + i,</div><div class='ctx'> 					adapter-&gt;rom_addr + i)) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "Could not read PCI config space for MAC address\n");</div><div class='del'>-			return -EIO;</div><div class='add'>+			goto err_out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	memcpy(adapter-&gt;addr, adapter-&gt;rom_addr, ETH_ALEN);</div><div class='del'>-	return 0;</div><div class='add'>+out:</div><div class='add'>+	return rc;</div><div class='add'>+err_out:</div><div class='add'>+	rc = -EIO;</div><div class='add'>+	goto out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -4110,7 +4099,7 @@ static int et131x_pci_init(struct et131x_adapter *adapter,</div><div class='ctx'>  * The routine called when the error timer expires, to track the number of</div><div class='ctx'>  * recurring errors.</div><div class='ctx'>  */</div><div class='del'>-void et131x_error_timer_handler(unsigned long data)</div><div class='add'>+static void et131x_error_timer_handler(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct et131x_adapter *adapter = (struct et131x_adapter *) data;</div><div class='ctx'> 	struct phy_device *phydev = adapter-&gt;phydev;</div><div class='hunk'>@@ -4153,7 +4142,7 @@ void et131x_error_timer_handler(unsigned long data)</div><div class='ctx'>  *</div><div class='ctx'>  * Allocate all the memory blocks for send, receive and others.</div><div class='ctx'>  */</div><div class='del'>-int et131x_adapter_memory_alloc(struct et131x_adapter *adapter)</div><div class='add'>+static int et131x_adapter_memory_alloc(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='hunk'>@@ -4188,7 +4177,7 @@ int et131x_adapter_memory_alloc(struct et131x_adapter *adapter)</div><div class='ctx'>  * et131x_adapter_memory_free - Free all memory allocated for use by Tx &amp; Rx</div><div class='ctx'>  * @adapter: pointer to our private adapter structure</div><div class='ctx'>  */</div><div class='del'>-void et131x_adapter_memory_free(struct et131x_adapter *adapter)</div><div class='add'>+static void et131x_adapter_memory_free(struct et131x_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	/* Free DMA memory */</div><div class='ctx'> 	et131x_tx_dma_memory_free(adapter);</div><div class='hunk'>@@ -4364,10 +4353,6 @@ static struct et131x_adapter *et131x_adapter_init(struct net_device *netdev,</div><div class='ctx'> 	adapter-&gt;pdev = pci_dev_get(pdev);</div><div class='ctx'> 	adapter-&gt;netdev = netdev;</div><div class='ctx'> </div><div class='del'>-	/* Do the same for the netdev struct */</div><div class='del'>-	netdev-&gt;irq = pdev-&gt;irq;</div><div class='del'>-	netdev-&gt;base_addr = pci_resource_start(pdev, 0);</div><div class='del'>-</div><div class='ctx'> 	/* Initialize spinlocks here */</div><div class='ctx'> 	spin_lock_init(&amp;adapter-&gt;lock);</div><div class='ctx'> 	spin_lock_init(&amp;adapter-&gt;tcb_send_qlock);</div><div class='hunk'>@@ -4400,6 +4385,7 @@ static void __devexit et131x_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(netdev);</div><div class='add'>+	phy_disconnect(adapter-&gt;phydev);</div><div class='ctx'> 	mdiobus_unregister(adapter-&gt;mii_bus);</div><div class='ctx'> 	kfree(adapter-&gt;mii_bus-&gt;irq);</div><div class='ctx'> 	mdiobus_free(adapter-&gt;mii_bus);</div><div class='hunk'>@@ -4417,7 +4403,7 @@ static void __devexit et131x_pci_remove(struct pci_dev *pdev)</div><div class='ctx'>  * et131x_up - Bring up a device for use.</div><div class='ctx'>  * @netdev: device to be opened</div><div class='ctx'>  */</div><div class='del'>-void et131x_up(struct net_device *netdev)</div><div class='add'>+static void et131x_up(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -4429,7 +4415,7 @@ void et131x_up(struct net_device *netdev)</div><div class='ctx'>  * et131x_down - Bring down the device</div><div class='ctx'>  * @netdev: device to be broght down</div><div class='ctx'>  */</div><div class='del'>-void et131x_down(struct net_device *netdev)</div><div class='add'>+static void et131x_down(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -4475,8 +4461,6 @@ static SIMPLE_DEV_PM_OPS(et131x_pm_ops, et131x_suspend, et131x_resume);</div><div class='ctx'> #define ET131X_PM_OPS NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* ISR functions */</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * et131x_isr - The Interrupt Service Routine for the driver.</div><div class='ctx'>  * @irq: the IRQ on which the interrupt was received.</div><div class='hunk'>@@ -4573,7 +4557,7 @@ out:</div><div class='ctx'>  * scheduled to run in a deferred context by the ISR. This is where the ISR's</div><div class='ctx'>  * work actually gets done.</div><div class='ctx'>  */</div><div class='del'>-void et131x_isr_handler(struct work_struct *work)</div><div class='add'>+static void et131x_isr_handler(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct et131x_adapter *adapter =</div><div class='ctx'> 		container_of(work, struct et131x_adapter, task);</div><div class='hunk'>@@ -4774,8 +4758,6 @@ void et131x_isr_handler(struct work_struct *work)</div><div class='ctx'> 	et131x_enable_interrupts(adapter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* NETDEV functions */</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * et131x_stats - Return the current device statistics.</div><div class='ctx'>  * @netdev: device whose stats are being queried</div><div class='hunk'>@@ -4829,10 +4811,12 @@ static struct net_device_stats *et131x_stats(struct net_device *netdev)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success, errno on failure (as defined in errno.h)</div><div class='ctx'>  */</div><div class='del'>-int et131x_open(struct net_device *netdev)</div><div class='add'>+static int et131x_open(struct net_device *netdev)</div><div class='ctx'> {</div><div class='del'>-	int result = 0;</div><div class='ctx'> 	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct pci_dev *pdev = adapter-&gt;